diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 8922ab37e1f56..34d3416a238dc 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -163,6 +163,15 @@ fbdcdde04a7caa007e825a8b822c75fab9adb2d6 # step-cli: format package.nix with nixfmt (#331629) fc7a83f8b62e90de5679e993d4d49ca014ea013d +# ndn-cxx: format with nixfmt-rfc-style +160b2b769c3b8a6d1ae9947afa77520fa2887db7 + +# ndn-tools: format with nixfmt-rfc-style +4882ef721ce3d7bb3b5e48ff80125255db515013 + +# nfd: format with nixfmt-rfc-style +548c2377fa81e2abfc192fbf4f521e601251c468 + # darwin.stdenv: format with nixfmt-rfc-style (#333962) 93c10ac9e561c6594d3baaeaff2341907390d9b8 @@ -171,3 +180,6 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9 # nixos/kanidm: inherit lib, nixfmt 8f18393d380079904d072007fb19dc64baef0a3a + +# fetchurl: nixfmt-rfc-style +ce21e97a1f20dee15da85c084f9d1148d84f853b diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e138cd66152af..d8fe943b5863c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -14,9 +14,10 @@ # CI /.github/workflows @NixOS/Security @Mic92 @zowoq /.github/workflows/check-nix-format.yml @infinisil -/ci @infinisil @NixOS/Security +/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron +/ci @infinisil @philiptaron @NixOS/Security -# Develompent support +# Development support /.editorconfig @Mic92 @zowoq /shell.nix @infinisil @NixOS/Security @@ -43,6 +44,7 @@ /pkgs/top-level/stage.nix @Ericson2314 /pkgs/top-level/splice.nix @Ericson2314 /pkgs/top-level/release-cross.nix @Ericson2314 +/pkgs/top-level/by-name-overlay.nix @infinisil @philiptaron /pkgs/stdenv @philiptaron /pkgs/stdenv/generic @Ericson2314 /pkgs/stdenv/generic/check-meta.nix @Ericson2314 @@ -58,12 +60,6 @@ /pkgs/pkgs-lib/formats/libconfig @h7x4 /pkgs/pkgs-lib/formats/hocon @h7x4 -# pkgs/by-name -/pkgs/test/check-by-name @infinisil -/pkgs/by-name/README.md @infinisil -/pkgs/top-level/by-name-overlay.nix @infinisil -/.github/workflows/check-by-name.yml @infinisil - # Nixpkgs build-support /pkgs/build-support/writers @lassulus @Profpatsch @@ -91,6 +87,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza /doc/README.md @infinisil /nixos/README.md @infinisil /pkgs/README.md @infinisil +/pkgs/by-name/README.md @infinisil /maintainers/README.md @infinisil # User-facing development documentation @@ -123,7 +120,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza /nixos/modules/system/boot/loader/systemd-boot @JulienMalka # Images and installer media -/nixos/modules/installer/cd-dvd/ +/nixos/modules/profiles/installation-device.nix @ElvishJerricco +/nixos/modules/installer/cd-dvd/ @ElvishJerricco /nixos/modules/installer/sd-card/ # Updaters @@ -165,7 +163,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza # C compilers /pkgs/development/compilers/gcc -/pkgs/development/compilers/llvm @RossComputerGuy +/pkgs/development/compilers/llvm @alyssais @RossComputerGuy /pkgs/development/compilers/emscripten @raitobezarius /doc/languages-frameworks/emscripten.section.md @raitobezarius @@ -254,6 +252,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # Idris /pkgs/development/idris-modules @Infinisil +/pkgs/development/compilers/idris2 @mattpolzin # Bazel /pkgs/development/tools/build-managers/bazel @Profpatsch @@ -338,9 +337,6 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange /pkgs/build-support/node/fetch-npm-deps @winterqt /doc/languages-frameworks/javascript.section.md @winterqt -# environment.noXlibs option aka NoX -/nixos/modules/config/no-x-libs.nix @SuperSandro2000 - # OCaml /pkgs/build-support/ocaml @ulrikstrid /pkgs/development/compilers/ocaml @ulrikstrid @@ -389,3 +385,8 @@ pkgs/by-name/lx/lxc* @adamcstephens /pkgs/os-specific/linux/checkpolicy @RossComputerGuy /pkgs/os-specific/linux/libselinux @RossComputerGuy /pkgs/os-specific/linux/libsepol @RossComputerGuy + +# installShellFiles +/pkgs/by-name/in/installShellFiles/* @Ericson2314 +/pkgs/test/install-shell-files/* @Ericson2314 +/doc/hooks/installShellFiles.section.md @Ericson2314 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c2351056bf8bc..20e260b408942 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,7 @@ -## Description of changes diff --git a/.github/labeler.yml b/.github/labeler.yml index 9ef1ec30b6e96..eca2a2527037a 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -270,6 +270,12 @@ - changed-files: - any-glob-to-any-file: - .github/**/* + - CONTRIBUTING.md + - pkgs/README.md + - nixos/README.md + - maintainers/README.md + - lib/README.md + - doc/README.md "6.topic: printing": - any: @@ -374,6 +380,17 @@ - any-glob-to-any-file: - pkgs/applications/editors/vscode/**/* +"6.topic: xen-project": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/virtualisation/xen* + - pkgs/applications/virtualization/xen/** + - pkgs/by-name/xe/xen-guest-agent/* + - pkgs/by-name/xt/xtf/* + - pkgs/development/ocaml-modules/xen*/* + - pkgs/development/ocaml-modules/vchan/* + "6.topic: xfce": - any: - changed-files: diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 49ab3fefb64d0..dba5f9bcf319e 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -20,7 +20,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) runs-on: ubuntu-latest steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index fc7df3a1aa8dc..05e8f34c4c879 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -19,8 +19,8 @@ jobs: runs-on: ubuntu-latest # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml deleted file mode 100644 index 59eb6c857f647..0000000000000 --- a/.github/workflows/check-by-name.yml +++ /dev/null @@ -1,125 +0,0 @@ -# Checks pkgs/by-name (see pkgs/by-name/README.md) -# using the nixpkgs-check-by-name tool (see https://github.com/NixOS/nixpkgs-check-by-name) -# -# When you make changes to this workflow, also update pkgs/test/check-by-name/run-local.sh adequately -name: Check pkgs/by-name - -on: - # Using pull_request_target instead of pull_request avoids having to approve first time contributors - pull_request_target: - # This workflow depends on the base branch of the PR, - # but changing the base branch is not included in the default trigger events, - # which would be `opened`, `synchronize` or `reopened`. - # Instead it causes an `edited` event, so we need to add it explicitly here - # While `edited` is also triggered when the PR title/body is changed, - # this PR action is fairly quick, and PR's don't get edited that often, - # so it shouldn't be a problem - # There is a feature request for adding a `base_changed` event: - # https://github.com/orgs/community/discussions/35058 - types: [opened, synchronize, reopened, edited] - -permissions: {} - -# We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit -# trigger), and contributers would get notified on any canceled run. -# There is a feature request for supressing notifications on concurrency-canceled runs: -# https://github.com/orgs/community/discussions/13015 - -jobs: - check: - name: pkgs-by-name-check - # This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases - runs-on: ubuntu-latest - # This should take 1 minute at most, but let's be generous. - # The default of 6 hours is definitely too long - timeout-minutes: 10 - steps: - # This step has to be in this file, - # because it's needed to determine which revision of the repository to fetch, - # and we can only use other files from the repository once it's fetched. - - name: Resolving the merge commit - env: - GH_TOKEN: ${{ github.token }} - run: | - # This checks for mergeability of a pull request as recommended in - # https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests - - # Retry the API query this many times - retryCount=5 - # Start with 5 seconds, but double every retry - retryInterval=5 - while true; do - echo "Checking whether the pull request can be merged" - prInfo=$(gh api \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - /repos/"$GITHUB_REPOSITORY"/pulls/${{ github.event.pull_request.number }}) - mergeable=$(jq -r .mergeable <<< "$prInfo") - mergedSha=$(jq -r .merge_commit_sha <<< "$prInfo") - - if [[ "$mergeable" == "null" ]]; then - if (( retryCount == 0 )); then - echo "Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com/" - exit 1 - else - (( retryCount -= 1 )) || true - - # null indicates that GitHub is still computing whether it's mergeable - # Wait a couple seconds before trying again - echo "GitHub is still computing whether this PR can be merged, waiting $retryInterval seconds before trying again ($retryCount retries left)" - sleep "$retryInterval" - - (( retryInterval *= 2 )) || true - fi - else - break - fi - done - - if [[ "$mergeable" == "true" ]]; then - echo "The PR can be merged, checking the merge commit $mergedSha" - echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" - else - echo "The PR cannot be merged, it has a merge conflict, skipping the rest.." - fi - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - if: env.mergedSha - with: - # pull_request_target checks out the base branch by default - ref: ${{ env.mergedSha }} - # Fetches the merge commit and its parents - fetch-depth: 2 - - name: Checking out base branch - if: env.mergedSha - run: | - base=$(mktemp -d) - git worktree add "$base" "$(git rev-parse HEAD^1)" - echo "base=$base" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 - if: env.mergedSha - - name: Fetching the pinned tool - if: env.mergedSha - # Update the pinned version using pkgs/test/check-by-name/update-pinned-tool.sh - run: | - # The pinned version of the tooling to use - toolVersion=$(> "$GITHUB_ENV" - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml index a3f37d8131c88..f003ba81f1f75 100644 --- a/.github/workflows/check-nixf-tidy.yml +++ b/.github/workflows/check-nixf-tidy.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest if: "!contains(github.event.pull_request.title, '[skip treewide]')" steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge @@ -32,7 +32,7 @@ jobs: # This should not be a URL, because it would allow PRs to run arbitrary code in CI! rev=$(jq -r .rev ci/pinned-nixpkgs.json) echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml index 0ecc3b0c7baf2..6ed60df98e950 100644 --- a/.github/workflows/check-shell.yml +++ b/.github/workflows/check-shell.yml @@ -10,11 +10,11 @@ jobs: name: shell-check-x86_64-linux runs-on: ubuntu-latest steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 - name: Build shell run: nix-build shell.nix @@ -22,10 +22,10 @@ jobs: name: shell-check-aarch64-darwin runs-on: macos-latest steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 - name: Build shell run: nix-build shell.nix diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 26530f30f4683..7d11370973fce 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -25,11 +25,11 @@ jobs: - name: print list of changed files run: | cat "$HOME/changed_files" - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 002d44c8797df..d7a3bd664eb88 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -15,11 +15,11 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 00e84854495a6..c7a1891ff0fe4 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -17,11 +17,11 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/nix-parse.yml b/.github/workflows/nix-parse.yml index 7f55322d85e60..bfafcacfdc088 100644 --- a/.github/workflows/nix-parse.yml +++ b/.github/workflows/nix-parse.yml @@ -25,12 +25,12 @@ jobs: if [[ -s "$HOME/changed_files" ]]; then echo "CHANGED_FILES=$HOME/changed_files" > "$GITHUB_ENV" fi - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }} - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: nix_path: nixpkgs=channel:nixpkgs-unstable - name: Parse all changed or added nix files diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml new file mode 100644 index 0000000000000..807715fc65a0b --- /dev/null +++ b/.github/workflows/nixpkgs-vet.yml @@ -0,0 +1,116 @@ +# `nixpkgs-vet` is a tool to vet Nixpkgs: its architecture, package structure, and more. +# Among other checks, it makes sure that `pkgs/by-name` (see `../../pkgs/by-name/README.md`) follows the validity rules outlined in [RFC 140](https://github.com/NixOS/rfcs/pull/140). +# When you make changes to this workflow, please also update `ci/nixpkgs-vet.sh` to reflect the impact of your work to the CI. +# See https://github.com/NixOS/nixpkgs-vet for details on the tool and its checks. +name: Vet nixpkgs + +on: + # Using pull_request_target instead of pull_request avoids having to approve first time contributors. + pull_request_target: + # This workflow depends on the base branch of the PR, but changing the base branch is not included in the default trigger events, which would be `opened`, `synchronize` or `reopened`. + # Instead it causes an `edited` event, so we need to add it explicitly here. + # While `edited` is also triggered when the PR title/body is changed, this PR action is fairly quick, and PRs don't get edited **that** often, so it shouldn't be a problem. + # There is a feature request for adding a `base_changed` event: https://github.com/orgs/community/discussions/35058 + types: [opened, synchronize, reopened, edited] + +permissions: {} + +# We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit trigger), and contributors would get notified on any canceled run. +# There is a feature request for suppressing notifications on concurrency-canceled runs: https://github.com/orgs/community/discussions/13015 + +jobs: + check: + name: nixpkgs-vet + # This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases. + runs-on: ubuntu-latest + # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long. + timeout-minutes: 10 + steps: + # This step has to be in this file, because it's needed to determine which revision of the repository to fetch, and we can only use other files from the repository once it's fetched. + - name: Resolving the merge commit + env: + GH_TOKEN: ${{ github.token }} + run: | + # This checks for mergeability of a pull request as recommended in + # https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests + + # Retry the API query this many times + retryCount=5 + # Start with 5 seconds, but double every retry + retryInterval=5 + while true; do + echo "Checking whether the pull request can be merged" + prInfo=$(gh api \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + /repos/"$GITHUB_REPOSITORY"/pulls/${{ github.event.pull_request.number }}) + mergeable=$(jq -r .mergeable <<< "$prInfo") + mergedSha=$(jq -r .merge_commit_sha <<< "$prInfo") + + if [[ "$mergeable" == "null" ]]; then + if (( retryCount == 0 )); then + echo "Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com/" + exit 1 + else + (( retryCount -= 1 )) || true + + # null indicates that GitHub is still computing whether it's mergeable + # Wait a couple seconds before trying again + echo "GitHub is still computing whether this PR can be merged, waiting $retryInterval seconds before trying again ($retryCount retries left)" + sleep "$retryInterval" + + (( retryInterval *= 2 )) || true + fi + else + break + fi + done + + if [[ "$mergeable" == "true" ]]; then + echo "The PR can be merged, checking the merge commit $mergedSha" + echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" + else + echo "The PR cannot be merged, it has a merge conflict, skipping the rest.." + fi + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + if: env.mergedSha + with: + # pull_request_target checks out the base branch by default + ref: ${{ env.mergedSha }} + # Fetches the merge commit and its parents + fetch-depth: 2 + - name: Checking out base branch + if: env.mergedSha + run: | + base=$(mktemp -d) + git worktree add "$base" "$(git rev-parse HEAD^1)" + echo "base=$base" >> "$GITHUB_ENV" + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 + if: env.mergedSha + - name: Fetching the pinned tool + if: env.mergedSha + # Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh + run: | + # The pinned version of the tooling to use. + toolVersion=$( Anderson Torres Atemu +Christina Sørensen +Christina Sørensen +Christina Sørensen <89321978+cafkafk@users.noreply.github.com> Daniel Løvbrøtte Olsen Fabian Affolter -goatastronaut0212 +goatastronaut0212 Janne Heß Jörg Thalheim +Lin Jian +Lin Jian <75130626+jian-lin@users.noreply.github.com> Martin Weinelt R. RyanTM Robert Hensing diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8d99e465cc0ee..b09cbaba14cd9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -315,6 +315,22 @@ When reviewing a pull request, please always be nice and polite. Controversial c GitHub provides reactions as a simple and quick way to provide feedback to pull requests or any comments. The thumb-down reaction should be used with care and if possible accompanied with some explanation so the submitter has directions to improve their contribution. +When doing a review: +- Aim to drive the proposal to a timely conclusion. +- Focus on the proposed changes to keep the scope of the discussion narrow. +- Help the contributor prioritise their efforts towards getting their change merged. + +If you find anything related that could be improved but is not immediately required for acceptance, consider +- Implementing the changes yourself in a follow-up pull request (and request review from the person who inspired you) +- Tracking your idea in an issue +- Offering the original contributor to review a follow-up pull request +- Making concrete [suggestions](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request) in the same pull request. + +For example, follow-up changes could involve refactoring code in the affected files. + +But please remember not to make such additional considerations a blocker, and communicate that to the contributor, for example by following the [conventional comments](https://conventionalcomments.org/) pattern. +If the related change is essential for the contribution at hand, make clear why you think it is important to address that first. + Pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review. All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt them to their liking. @@ -354,7 +370,7 @@ The following paragraphs about how to deal with unactive contributors is just a Please note that contributors with commit rights unactive for more than three months will have their commit rights revoked. --> -Please see the discussion in [GitHub nixpkgs issue #50105](https://github.com/NixOS/nixpkgs/issues/50105) for information on how to proceed to be granted this level of access. +Please see the discussion in [GitHub nixpkgs issue #321665](https://github.com/NixOS/nixpkgs/issues/321665) for information on how to proceed to be granted this level of access. In a case a contributor definitively leaves the Nix community, they should create an issue or post on [Discourse](https://discourse.nixos.org) with references of packages and modules they maintain so the maintainership can be taken over by other contributors. diff --git a/ci/README.md b/ci/README.md index 64cd8e5bcea98..40c3d0ed344b5 100644 --- a/ci/README.md +++ b/ci/README.md @@ -1,7 +1,7 @@ # CI support files This directory contains files to support CI, such as [GitHub Actions](https://github.com/NixOS/nixpkgs/tree/master/.github/workflows) and [Ofborg](https://github.com/nixos/ofborg). -This is in contrast with [`maintainers/scripts`](`../maintainers/scripts`) which is for human use instead. +This is in contrast with [`maintainers/scripts`](../maintainers/scripts) which is for human use instead. ## Pinned Nixpkgs @@ -10,3 +10,34 @@ In order to ensure that the needed packages are generally available without buil [`pinned-nixpkgs.json`](./pinned-nixpkgs.json) contains a pinned Nixpkgs version tested by Hydra. Run [`update-pinned-nixpkgs.sh`](./update-pinned-nixpkgs.sh) to update it. + +## `ci/nixpkgs-vet.sh BASE_BRANCH [REPOSITORY]` + +Runs the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) on the HEAD commit, closely matching what CI does. This can't do exactly the same as CI, because CI needs to rely on GitHub's server-side Git history to compute the mergeability of PRs before the check can be started. +In turn, when contributors are running this tool locally, we don't want to have to push commits to test them, and we can also rely on the local Git history to do the mergeability check. + +Arguments: + +- `BASE_BRANCH`: The base branch to use, e.g. master or release-24.05 +- `REPOSITORY`: The repository from which to fetch the base branch. Defaults to . + +## `ci/nixpkgs-vet` + +This directory contains scripts and files used and related to [`nixpkgs-vet`](https://github.com/NixOS/nixpkgs-vet/), which the CI uses to implement `pkgs/by-name` checks, along with many other Nixpkgs architecture rules. +See also the [CI GitHub Action](../.github/workflows/nixpkgs-vet.yml). + +## `ci/nixpkgs-vet/update-pinned-tool.sh` + +Updates the pinned [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) in [`ci/nixpkgs-vet/pinned-version.txt`](./nixpkgs-vet/pinned-version.txt) to the latest [release](https://github.com/NixOS/nixpkgs-vet/releases). + +Each release contains a pre-built `x86_64-linux` version of the tool which is used by CI. + +This script currently needs to be called manually when the CI tooling needs to be updated. + +Why not just build the tooling right from the PRs Nixpkgs version? + +- Because it allows CI to check all PRs, even if they would break the CI tooling. +- Because it makes the CI check very fast, since no Nix builds need to be done, even for mass rebuilds. +- Because it improves security, since we don't have to build potentially untrusted code from PRs. + The tool only needs a very minimal Nix evaluation at runtime, which can work with [readonly-mode](https://nixos.org/manual/nix/stable/command-ref/opt-common.html#opt-readonly-mode) and [restrict-eval](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-restrict-eval). + diff --git a/ci/nixpkgs-vet.sh b/ci/nixpkgs-vet.sh new file mode 100755 index 0000000000000..7aabdfb6b8c56 --- /dev/null +++ b/ci/nixpkgs-vet.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq + +set -o pipefail -o errexit -o nounset + +trace() { echo >&2 "$@"; } + +tmp=$(mktemp -d) +cleanup() { + # Don't exit early if anything fails to cleanup + set +o errexit + + trace -n "Cleaning up.. " + + [[ -e "$tmp/base" ]] && git worktree remove --force "$tmp/base" + [[ -e "$tmp/merged" ]] && git worktree remove --force "$tmp/merged" + + rm -rf "$tmp" + + trace "Done" +} +trap cleanup exit + + +repo=https://github.com/NixOS/nixpkgs.git + +if (( $# != 0 )); then + baseBranch=$1 + shift +else + trace "Usage: $0 BASE_BRANCH [REPOSITORY]" + trace "BASE_BRANCH: The base branch to use, e.g. master or release-23.11" + trace "REPOSITORY: The repository to fetch the base branch from, defaults to $repo" + exit 1 +fi + +if (( $# != 0 )); then + repo=$1 + shift +fi + +if [[ -n "$(git status --porcelain)" ]]; then + trace -e "\e[33mWarning: Dirty tree, uncommitted changes won't be taken into account\e[0m" +fi +headSha=$(git rev-parse HEAD) +trace -e "Using HEAD commit \e[34m$headSha\e[0m" + +trace -n "Creating Git worktree for the HEAD commit in $tmp/merged.. " +git worktree add --detach -q "$tmp/merged" HEAD +trace "Done" + +trace -n "Fetching base branch $baseBranch to compare against.. " +git fetch -q "$repo" refs/heads/"$baseBranch" +baseSha=$(git rev-parse FETCH_HEAD) +trace -e "\e[34m$baseSha\e[0m" + +trace -n "Creating Git worktree for the base branch in $tmp/base.. " +git worktree add -q "$tmp/base" "$baseSha" +trace "Done" + +trace -n "Merging base branch into the HEAD commit in $tmp/merged.. " +git -C "$tmp/merged" merge -q --no-edit "$baseSha" +trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m" +trace -n "Reading pinned nixpkgs-vet version from pinned-version.txt.. " +toolVersion=$(<"$tmp/merged/ci/nixpkgs-vet/pinned-version.txt") +trace -e "\e[34m$toolVersion\e[0m" + +trace -n "Building tool.. " +nix-build https://github.com/NixOS/nixpkgs-vet/tarball/"$toolVersion" -o "$tmp/tool" -A build +trace "Running nixpkgs-vet.." +"$tmp/tool/bin/nixpkgs-vet" --base "$tmp/base" "$tmp/merged" diff --git a/ci/nixpkgs-vet/pinned-version.txt b/ci/nixpkgs-vet/pinned-version.txt new file mode 100644 index 0000000000000..845639eef26c0 --- /dev/null +++ b/ci/nixpkgs-vet/pinned-version.txt @@ -0,0 +1 @@ +0.1.4 diff --git a/pkgs/test/check-by-name/update-pinned-tool.sh b/ci/nixpkgs-vet/update-pinned-tool.sh similarity index 94% rename from pkgs/test/check-by-name/update-pinned-tool.sh rename to ci/nixpkgs-vet/update-pinned-tool.sh index 7240bd597f131..78a9ae2411b81 100755 --- a/pkgs/test/check-by-name/update-pinned-tool.sh +++ b/ci/nixpkgs-vet/update-pinned-tool.sh @@ -7,7 +7,7 @@ trace() { echo >&2 "$@"; } SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -repository=NixOS/nixpkgs-check-by-name +repository=NixOS/nixpkgs-vet pin_file=$SCRIPT_DIR/pinned-version.txt trace -n "Fetching latest release of $repository.. " diff --git a/doc/README.md b/doc/README.md index d7a853d0ec355..534fc92de5a8f 100644 --- a/doc/README.md +++ b/doc/README.md @@ -2,10 +2,20 @@ This directory houses the sources files for the Nixpkgs reference manual. -Going forward, it should only contain [reference](https://nix.dev/contributing/documentation/diataxis#reference) documentation. -For tutorials, guides and explanations, contribute to instead. +> [!IMPORTANT] +> We are actively restructuring our documentation to follow the [Diátaxis framework](https://diataxis.fr/) +> +> 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 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 and code comments in the source code. +For documentation only relevant for contributors, use Markdown files next to the source and regular code comments. + +> [!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. Rendered documentation: - [Unstable (from master)](https://nixos.org/manual/nixpkgs/unstable/) @@ -285,7 +295,7 @@ You, as the writer of documentation, are still in charge of its content. - _optional_ attributes have a _`Default:`_ if it's easily described as a value. - _optional_ attributes have a _`Default behavior:`_ if it's not easily described using a value. - Nix types aren't in code spans, because they are not code - - Nix types are capitalized, to distinguish them from the camelCase [Module System](#module-system) types, which _are_ code and behave like functions. + - Nix types are capitalized, to distinguish them from the camelCase Module System types, which _are_ code and behave like functions. #### Examples diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index 2167df3f1748f..21cadfaa21fa5 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -157,6 +157,12 @@ Here are security considerations for this scenario: In more concrete terms, if you use any other hash, the [`--insecure` flag](https://curl.se/docs/manpage.html#-k) will be passed to the underlying call to `curl` when downloading content. +## Proxy usage {#sec-pkgs-fetchers-proxy} + +Nixpkgs fetchers can make use of a http(s) proxy. Each fetcher will automatically inherit proxy-related environment variables (`http_proxy`, `https_proxy`, etc) via [impureEnvVars](https://nixos.org/manual/nix/stable/language/advanced-attributes#adv-attr-impureEnvVars). + +The environment variable `NIX_SSL_CERT_FILE` is also inherited in fetchers, and can be used to provide a custom certificate bundle to fetchers. This is usually required for a https proxy to work without certificate validation errors. + []{#fetchurl} ## `fetchurl` {#sec-pkgs-fetchers-fetchurl} diff --git a/doc/build-helpers/images/appimagetools.section.md b/doc/build-helpers/images/appimagetools.section.md index 4d00e49c397dd..b1640af9dff90 100644 --- a/doc/build-helpers/images/appimagetools.section.md +++ b/doc/build-helpers/images/appimagetools.section.md @@ -64,7 +64,7 @@ let src = fetchurl { url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI="; + hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI="; }; in appimageTools.wrapType2 { inherit pname version src; @@ -100,7 +100,7 @@ let src = fetchurl { url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI="; + hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI="; }; appimageContents = appimageTools.extract { @@ -141,7 +141,7 @@ let src = fetchurl { url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI="; + hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI="; }; appimageContents = appimageTools.extract { diff --git a/doc/build-helpers/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md index 60342a9d0edcd..26c1d9c14a264 100644 --- a/doc/build-helpers/images/dockertools.section.md +++ b/doc/build-helpers/images/dockertools.section.md @@ -50,6 +50,10 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has If specified, the layer created by `buildImage` will be appended to the layers defined in the base image, resulting in an image with at least two layers (one or more layers from the base image, and the layer created by `buildImage`). Otherwise, the resulting image with contain the single layer created by `buildImage`. + :::{.note} + Only **Env** configuration is inherited from the base image. + ::: + _Default value:_ `null`. `fromImageName` (String or Null; _optional_) @@ -449,7 +453,7 @@ See [](#ex-dockerTools-streamLayeredImage-exploringlayers) to understand how the `streamLayeredImage` allows scripts to be run when creating the additional layer with symlinks, allowing custom behaviour to affect the final results of the image (see the documentation of the `extraCommands` and `fakeRootCommands` attributes). The resulting repository tarball will list a single image as specified by the `name` and `tag` attributes. -By default, that image will use a static creation date (see documentation for the `created` attribute). +By default, that image will use a static creation date (see documentation for the `created` and `mtime` attributes). This allows the function to produce reproducible images. ### Inputs {#ssec-pkgs-dockerTools-streamLayeredImage-inputs} @@ -512,6 +516,7 @@ This allows the function to produce reproducible images. `created` (String; _optional_) : Specifies the time of creation of the generated image. + This date will be used for the image metadata. This should be either a date and time formatted according to [ISO-8601](https://en.wikipedia.org/wiki/ISO_8601) or `"now"`, in which case the current date will be used. :::{.caution} @@ -520,6 +525,18 @@ This allows the function to produce reproducible images. _Default value:_ `"1970-01-01T00:00:01Z"`. +`mtime` (String; _optional_) + +: Specifies the time used for the modification timestamp of files within the layers of the generated image. + This should be either a date and time formatted according to [ISO-8601](https://en.wikipedia.org/wiki/ISO_8601) or `"now"`, in which case the current date will be used. + + :::{.caution} + Using a non-constant date will cause built layers to have a different hash each time, preventing deduplication. + Using `"now"` also means that the generated image will not be reproducible anymore (because the date will always change whenever it's built). + ::: + + _Default value:_ `"1970-01-01T00:00:01Z"`. + `uid` (Number; _optional_) []{#dockerTools-buildLayeredImage-arg-uid} `gid` (Number; _optional_) []{#dockerTools-buildLayeredImage-arg-gid} `uname` (String; _optional_) []{#dockerTools-buildLayeredImage-arg-uname} diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md index 31b42bd774267..ff00548e049ae 100644 --- a/doc/build-helpers/trivial-build-helpers.chapter.md +++ b/doc/build-helpers/trivial-build-helpers.chapter.md @@ -501,7 +501,7 @@ writeTextFile { text = '' Contents of File ''; - destination = "share/my-file"; + destination = "/share/my-file"; } ``` @@ -586,7 +586,7 @@ writeTextFile { echo "hi" ''; executable = true; - destination = "bin/my-script"; + destination = "/bin/my-script"; } ``` @@ -674,7 +674,7 @@ writeTextFile { echo "hi" ''; executable = true; - destination = "bin/my-script"; + destination = "/bin/my-script"; } ``` diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index 8c9673d887bf2..4306fa9262785 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -106,6 +106,7 @@ stdenvNoCC.mkDerivation { --arg nixpkgsPath "./." \ --argstr revision ${nixpkgs.rev or "master"} \ --argstr libsetsJSON ${lib.escapeShellArg (builtins.toJSON libsets)} \ + --store $(mktemp -d) \ > locations.json function docgen { diff --git a/doc/hooks/cernlib.section.md b/doc/hooks/cernlib.section.md new file mode 100644 index 0000000000000..e12b49e127ead --- /dev/null +++ b/doc/hooks/cernlib.section.md @@ -0,0 +1,3 @@ +# CERNLIB {#cernlib-hook} + +This hook sets the `CERN`, `CERN_LEVEL`, and `CERN_ROOT` environment variables. They are part of [CERNLIB's build system](https://cernlib.web.cern.ch/install/install.html), and are are needed for some programs to compile correctly. diff --git a/doc/hooks/haredo.section.md b/doc/hooks/haredo.section.md new file mode 100644 index 0000000000000..e7ec269a7364f --- /dev/null +++ b/doc/hooks/haredo.section.md @@ -0,0 +1,29 @@ +# `haredo` {#haredo-hook} + +This hook uses [the `haredo` command runner](https://sr.ht/~autumnull/haredo/) to build, check, and install the package. It overrides `buildPhase`, `checkPhase`, and `installPhase` by default. + +The hook builds its targets in parallel if [`config.enableParallelBuilding`](#var-stdenv-enableParallelBuilding) is set to `true`. + +## `buildPhase` {#haredo-hook-buildPhase} + +This phase attempts to build the default target. + +[]{#haredo-hook-haredoBuildTargets} Targets can be explicitly set by adding a string to the `haredoBuildTargets` list. + +[]{#haredo-hook-dontUseHaredoBuild} This behavior can be disabled by setting `dontUseHaredoBuild` to `true`. + +## `checkPhase` {#haredo-hook-checkPhase} + +This phase searches for the `check.do` or `test.do` targets, running them if they exist. + +[]{#haredo-hook-haredoCheckTargets} Targets can be explicitly set by adding a string to the `haredoCheckTargets` list. + +[]{#haredo-hook-dontUseHaredoCheck} This behavior can be disabled by setting `dontUseHaredoCheck` to `true`. + +## `installPhase` {#haredo-hook-installPhase} + +This phase attempts to build the `install.do` target, if it exists. + +[]{#haredo-hook-haredoInstallTargets} Targets can be explicitly set by adding a string to the `haredoInstallTargets` list. + +[]{#haredo-hook-dontUseHaredoInstall} This behavior can be disabled by setting `dontUseHaredoInstall` to `true`. diff --git a/doc/hooks/index.md b/doc/hooks/index.md index 6d01c6cbcbe52..e96deb81bd4e8 100644 --- a/doc/hooks/index.md +++ b/doc/hooks/index.md @@ -10,11 +10,14 @@ automake.section.md autopatchelf.section.md bmake.section.md breakpoint.section.md +cernlib.section.md cmake.section.md gdk-pixbuf.section.md ghc.section.md gnome.section.md +haredo.section.md installShellFiles.section.md +just.section.md libiconv.section.md libxml2.section.md meson.section.md @@ -24,8 +27,10 @@ patch-rc-path-hooks.section.md perl.section.md pkg-config.section.md postgresql-test-hook.section.md +premake.section.md python.section.md scons.section.md +tauri.section.md tetex-tex-live.section.md unzip.section.md validatePkgConfig.section.md diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md index 9be67d57bfc6c..edaea5895a3b2 100644 --- a/doc/hooks/installShellFiles.section.md +++ b/doc/hooks/installShellFiles.section.md @@ -1,16 +1,79 @@ # `installShellFiles` {#installshellfiles} -This hook helps with installing manpages and shell completion files. It exposes 2 shell functions `installManPage` and `installShellCompletion` that can be used from your `postInstall` hook. +This hook adds helpers that install artifacts like executable files, manpages +and shell completions. -The `installManPage` function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with `.gz` suffix). This function will place them into the correct `share/man/man
/` directory, in [`outputMan`](#outputman). +It exposes the following functions that can be used from your `postInstall` +hook: -The `installShellCompletion` function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of `--bash`, `--fish`, or `--zsh`. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag `--name NAME` before the path. If this flag is not provided, zsh completions will be renamed automatically such that `foobar.zsh` becomes `_foobar`. A root name may be provided for all paths using the flag `--cmd NAME`; this synthesizes the appropriate name depending on the shell (e.g. `--cmd foo` will synthesize the name `foo.bash` for bash and `_foo` for zsh). +## `installBin` {#installshellfiles-installbin} + +The `installBin` function takes one or more paths to files to install as +executable files. + +This function will place them into [`outputBin`](#outputbin). + +### Example Usage {#installshellfiles-installbin-exampleusage} + +```nix +{ + nativeBuildInputs = [ installShellFiles ]; + + # Sometimes the file has an undersirable name. It should be renamed before + # being installed via installBin + postInstall = '' + mv a.out delmar + installBin foobar delmar + ''; +} +``` + +## `installManPage` {#installshellfiles-installmanpage} + +The `installManPage` function takes one or more paths to manpages to install. + +The manpages must have a section suffix, and may optionally be compressed (with +`.gz` suffix). This function will place them into the correct +`share/man/man
/` directory in [`outputMan`](#outputman). + +### Example Usage {#installshellfiles-installmanpage-exampleusage} + +```nix +{ + nativeBuildInputs = [ installShellFiles ]; + + # Sometimes the manpage file has an undersirable name; e.g. it conflicts with + # another software with an equal name. It should be renamed before being + # installed via installManPage + postInstall = '' + mv fromsea.3 delmar.3 + installManPage foobar.1 delmar.3 + ''; +} +``` + +## `installShellCompletion` {#installshellfiles-installshellcompletion} + +The `installShellCompletion` function takes one or more paths to shell +completion files. + +By default it will autodetect the shell type from the completion file extension, +but you may also specify it by passing one of `--bash`, `--fish`, or +`--zsh`. These flags apply to all paths listed after them (up until another +shell flag is given). Each path may also have a custom installation name +provided by providing a flag `--name NAME` before the path. If this flag is not +provided, zsh completions will be renamed automatically such that `foobar.zsh` +becomes `_foobar`. A root name may be provided for all paths using the flag +`--cmd NAME`; this synthesizes the appropriate name depending on the shell +(e.g. `--cmd foo` will synthesize the name `foo.bash` for bash and `_foo` for +zsh). + +### Example Usage {#installshellfiles-installshellcompletion-exampleusage} ```nix { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installManPage doc/foobar.1 doc/barfoo.3 # explicit behavior installShellCompletion --bash --name foobar.bash share/completions.bash installShellCompletion --fish --name foobar.fish share/completions.fish @@ -21,9 +84,17 @@ The `installShellCompletion` function takes one or more paths to shell completio } ``` -The path may also be a fifo or named fd (such as produced by `<(cmd)`), in which case the shell and name must be provided (see below). +The path may also be a fifo or named fd (such as produced by `<(cmd)`), in which +case the shell and name must be provided (see below). + +If the destination shell completion file is not actually present or consists of +zero bytes after calling `installShellCompletion` this is treated as a build +failure. In particular, if completion files are not vendored but are generated +by running an executable, this is likely to fail in cross compilation +scenarios. The result will be a zero byte completion file and hence a build +failure. To prevent this, guard the completion generation commands. -If the destination shell completion file is not actually present or consists of zero bytes after calling `installShellCompletion` this is treated as a build failure. In particular, if completion files are not vendored but are generated by running an executable, this is likely to fail in cross compilation scenarios. The result will be a zero byte completion file and hence a build failure. To prevent this, guard the completion commands against this, e.g. +### Example Usage {#installshellfiles-installshellcompletion-exampleusage-guarded} ```nix { diff --git a/doc/hooks/just.section.md b/doc/hooks/just.section.md new file mode 100644 index 0000000000000..0eb4864ac74b8 --- /dev/null +++ b/doc/hooks/just.section.md @@ -0,0 +1,23 @@ +# `just` {#just-hook} + +This setup hook attempts to use [the `just` command runner](https://just.systems/man/en/) to build, check, and install the package. The hook overrides `buildPhase`, `checkPhase`, and `installPhase` by default. + +[]{#just-hook-justFlags} The `justFlags` variable can be set to a list of strings to add additional flags passed to all invocations of `just`. + +## `buildPhase` {#just-hook-buildPhase} + +This phase attempts to invoke `just` with [the default recipe](https://just.systems/man/en/chapter_23.html). + +[]{#just-hook-dontUseJustBuild} This behavior can be disabled by setting `dontUseJustBuild` to `true`. + +## `checkPhase` {#just-hook-checkPhase} + +This phase attempts to invoke the `just test` recipe, if it is available. This can be overrided by setting `checkTarget` to a string. + +[]{#just-hook-dontUseJustCheck} This behavior can be disabled by setting `dontUseJustCheck` to `true`. + +## `installPhase` {#just-hook-installPhase} + +This phase attempts to invoke the `just install` recipe. + +[]{#just-hook-dontUseJustInstall} This behavior can be disabled by setting `dontUseJustInstall` to `true`. diff --git a/doc/hooks/premake.section.md b/doc/hooks/premake.section.md new file mode 100644 index 0000000000000..b2c2d8fb637c2 --- /dev/null +++ b/doc/hooks/premake.section.md @@ -0,0 +1,7 @@ +# Premake {#premake-hook} + +This setup hook attempts to configure the package using [the Premake build configuration system](https://premake.github.io/). It overrides the `configurePhase` by default, if none exists. + +[]{#premake-hook-premakefile} The Premakefile to use can be specified by setting `premakefile` in the derivation. + +[]{#premake-hook-premakeFlagsArray} The flags passed to Premake can be configured by adding strings to the `premakeFlags` list. diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md new file mode 100644 index 0000000000000..1f468950580a1 --- /dev/null +++ b/doc/hooks/tauri.section.md @@ -0,0 +1,108 @@ +# cargo-tauri.hook {#tauri-hook} + +[Tauri](https://tauri.app/) is a framework for building smaller, faster, and +more secure desktop applications with a web frontend. + +In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases. + +## Example code snippet {#tauri-hook-example-code-snippet} + +```nix +{ + lib, + stdenv, + rustPlatform, + fetchNpmDeps, + cargo-tauri, + darwin, + glib-networking, + libsoup, + nodejs, + npmHooks, + openssl, + pkg-config, + webkitgtk, + wrapGAppsHook3, +}: + +rustPlatform.buildRustPackage rec { + # . . . + + cargoHash = "..."; + + # Assuming our app's frontend uses `npm` as a package manager + npmDeps = fetchNpmDeps { + name = "${pname}-npm-deps-${version}"; + inherit src; + hash = "..."; + }; + + nativeBuildInputs = [ + # Pull in our main hook + cargo-tauri.hook + + # Setup npm + nodejs + npmHooks.npmConfigHook + + # Make sure we can find our libraries + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isLinux [ + glib-networking # Most Tauri apps need networking + libsoup + webkitgtk + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + CoreServices + Security + WebKit + ] + ); + + # Set our Tauri source directory + cargoRoot = "src-tauri"; + # And make sure we build there too + buildAndTestSubdir = cargoRoot; + + # . . . +} +``` + +## Variables controlling cargo-tauri {#tauri-hook-variables-controlling} + +### Tauri Exclusive Variables {#tauri-hook-exclusive-variables} + +#### `tauriBuildFlags` {#tauri-build-flags} + +Controls the flags passed to `cargo tauri build`. + +#### `tauriBundleType` {#tauri-bundle-type} + +The [bundle type](https://tauri.app/v1/guides/building/) to build. + +#### `dontTauriBuild` {#dont-tauri-build} + +Disables using `tauriBuildHook`. + +#### `dontTauriInstall` {#dont-tauri-install} + +Disables using `tauriInstallPostBuildHook` and `tauriInstallHook`. + +### Honored Variables {#tauri-hook-honored-variables} + +Along with those found in [](#compiling-rust-applications-with-cargo), the +following variables used by `cargoBuildHook` and `cargoInstallHook` are honored +by the cargo-tauri setup hook. + +- `buildAndTestSubdir` +- `cargoBuildType` +- `cargoBuildNoDefaultFeatures` +- `cargoBuildFeatures` diff --git a/doc/languages-frameworks/bower.section.md b/doc/languages-frameworks/bower.section.md index 20c142dad5b91..346852c494267 100644 --- a/doc/languages-frameworks/bower.section.md +++ b/doc/languages-frameworks/bower.section.md @@ -4,7 +4,7 @@ The end result of running Bower is a `bower_components` directory which can be included in the web app's build process. -Bower can be run interactively, by installing `nodePackages.bower`. More interestingly, the Bower components can be declared in a Nix derivation, with the help of `nodePackages.bower2nix`. +Bower can be run interactively, by installing `nodePackages.bower`. More interestingly, the Bower components can be declared in a Nix derivation, with the help of `bower2nix`. ## bower2nix usage {#ssec-bower2nix-usage} diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index 557896074bf03..ca983eec4f0d3 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -23,12 +23,13 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * if it is a string of the form `owner:branch` then it tries to download the `branch` of owner `owner` for a project of the same name using the same vcs, and the `version` attribute of the resulting derivation is set to `"dev"`, additionally if the owner is not provided (i.e. if the `owner:` prefix is missing), it defaults to the original owner of the package (see below), * if it is a string of the form `"#N"`, and the domain is github, then it tries to download the current head of the pull request `#N` from github, * `defaultVersion` (optional). Coq libraries may be compatible with some specific versions of Coq only. The `defaultVersion` attribute is used when no `version` is provided (or if `version = null`) to select the version of the library to use by default, depending on the context. This selection will mainly depend on a `coq` version number but also possibly on other packages versions (e.g. `mathcomp`). If its value ends up to be `null`, the package is marked for removal in end-user `coqPackages` attribute set. -* `release` (optional, defaults to `{}`), lists all the known releases of the library and for each of them provides an attribute set with at least a `sha256` attribute (you may put the empty string `""` in order to automatically insert a fake sha256, this will trigger an error which will allow you to find the correct sha256), each attribute set of the list of releases also takes optional overloading arguments for the fetcher as below (i.e.`domain`, `owner`, `repo`, `rev` assuming the default fetcher is used) and optional overrides for the result of the fetcher (i.e. `version` and `src`). +* `release` (optional, defaults to `{}`), lists all the known releases of the library and for each of them provides an attribute set with at least a `hash` attribute (you may put the empty string `""` in order to automatically insert a fake hash, this will trigger an error which will allow you to find the correct hash), each attribute set of the list of releases also takes optional overloading arguments for the fetcher as below (i.e.`domain`, `owner`, `repo`, `rev`, `artifact` assuming the default fetcher is used) and optional overrides for the result of the fetcher (i.e. `version` and `src`). * `fetcher` (optional, defaults to a generic fetching mechanism supporting github or gitlab based infrastructures), is a function that takes at least an `owner`, a `repo`, a `rev`, and a `hash` and returns an attribute set with a `version` and `src`. * `repo` (optional, defaults to the value of `pname`), * `owner` (optional, defaults to `"coq-community"`). * `domain` (optional, defaults to `"github.com"`), domains including the strings `"github"` or `"gitlab"` in their names are automatically supported, otherwise, one must change the `fetcher` argument to support them (cf `pkgs/development/coq-modules/heq/default.nix` for an example), * `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags, +* `releaseArtifact` (optional, defaults to `(v: null)`), provides a default mapping from release names to artifact names (only works for github artifact for now), * `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers, * `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, * `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune`, `useDuneifVersion` and `mlPlugin` are set). @@ -69,15 +70,15 @@ mkCoqDerivation { { cases = [ (isEq "8.6") (range "1.6" "1.7") ]; out = "1.1"; } ] null; release = { - "1.5.2".sha256 = "15aspf3jfykp1xgsxf8knqkxv8aav2p39c2fyirw7pwsfbsv2c4s"; - "1.5.1".sha256 = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3"; - "1.5.0".sha256 = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw"; - "1.5.0".rev = "1.5"; - "1.4".sha256 = "0vnkirs8iqsv8s59yx1fvg1nkwnzydl42z3scya1xp1b48qkgn0p"; - "1.3".sha256 = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4"; - "1.2".sha256 = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq"; - "1.1".sha256 = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s"; - "1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; + "1.5.2".hash = "sha256-mjCx9XKa38Nz9E6wNK7YSqHdJ7YTua5fD3d6J4e7WpU="; + "1.5.1".hash = "sha256-Q8tm0y2FQAt2V1kZYkDlHWRia/lTvXAMVjdmzEV11I4="; + "1.5.0".hash = "sha256-HIK0f21G69oEW8JG46gSBde/Q2LR3GiBCv680gHbmRg="; + "1.5.0".rev = "1.5"; + "1.4".hash = "sha256-F9g3MSIr3B6UZ3p8QWjz3/Jpw9sudJ+KRlvjiHSO024="; + "1.3".hash = "sha256-BPJTlAL0ETHvLMBslE0KFVt3DNoaGuMrHt2SBGyJe1A="; + "1.2".hash = "sha256-mHXBXSLYO4BN+jfN50y/+XCx0Qq5g4Ac2Y/qlsbgAdY="; + "1.1".hash = "sha256-ejAsMQbB/LtU9j+g160VdGXULrCe9s0gBWzyhKqmCuE="; + "1.0".hash = "sha256-tZTOltEBBKWciDxDMs/Ye4Jnq/33CANrHJ4FBMPtq+I="; }; propagatedBuildInputs = @@ -126,7 +127,7 @@ For example, here is how you could locally add a new release of the `multinomial coqPackages.lib.overrideCoqDerivation { defaultVersion = "2.0"; - release."2.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dbbbhyfkk"; + release."2.0".hash = "sha256-czoP11rtrIM7+OLdMisv2EF7n/IbGuwFxHiPtg3qCNM="; } coqPackages.multinomials ``` diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 546b451f31177..d9e0cbe163518 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -93,7 +93,7 @@ The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given To package Dotnet applications, you can use `buildDotnetModule`. This has similar arguments to `stdenv.mkDerivation`, with the following additions: * `projectFile` is used for specifying the dotnet project file, relative to the source root. These have `.sln` (entire solution) or `.csproj` (single project) file extensions. This can be a list of multiple projects as well. When omitted, will attempt to find and build the solution (`.sln`). If running into problems, make sure to set it to a file (or a list of files) with the `.csproj` extension - building applications as entire solutions is not fully supported by the .NET CLI. -* `nugetDeps` takes either a path to a `deps.nix` file, or a derivation. The `deps.nix` file can be generated using the script attached to `passthru.fetch-deps`. If the argument is a derivation, it will be used directly and assume it has the same output as `mkNugetDeps`. +* `nugetDeps` takes either a path to a `deps.nix` file, or a derivation. The `deps.nix` file can be generated using the script attached to `passthru.fetch-deps`. For compatibility, if the argument is a list of derivations, they will be added to `buildInputs`. ::: {.note} For more detail about managing the `deps.nix` file, see [Generating and updating NuGet dependencies](#generating-and-updating-nuget-dependencies) ::: @@ -118,6 +118,7 @@ For more detail about managing the `deps.nix` file, see [Generating and updating * `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used. You can also set this to the result of `dotnetSdkPackages.combinePackages`, if the project uses multiple SDKs to build. * `dotnet-runtime` is useful in cases where you need to change what dotnet runtime is being used. This can be either a regular dotnet runtime, or an aspnetcore. * `testProjectFile` is useful in cases where the regular project file does not contain the unit tests. It gets restored and build, but not installed. You may need to regenerate your nuget lockfile after setting this. Note that if set, only tests from this project are executed. +* `testFilters` is used to disable running unit tests based on various [filters](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details). This gets passed as: `dotnet test --filter "{}"`, with each filter being concatenated using `"&"`. * `disabledTests` is used to disable running specific unit tests. This gets passed as: `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all unit test frameworks. * `dotnetRestoreFlags` can be used to pass flags to `dotnet restore`. * `dotnetBuildFlags` can be used to pass flags to `dotnet build`. @@ -218,7 +219,7 @@ buildDotnetGlobalTool { ## Generating and updating NuGet dependencies {#generating-and-updating-nuget-dependencies} When writing a new expression, you can use the generated `fetch-deps` script to initialise the lockfile. -After creating a blank `deps.nix` and pointing `nugetDeps` to it, +After setting `nugetDeps` to the desired location of the lockfile (e.g. `./deps.nix`), build the script with `nix-build -A package.fetch-deps` and then run the result. (When the root attr is your package, it's simply `nix-build -A fetch-deps`.) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index e8970b2d03354..247daf8d1dbe8 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -1076,6 +1076,9 @@ benchmark component. `disableLibraryProfiling drv` : Sets the `enableLibraryProfiling` argument to `false` for `drv`. +`disableParallelBuilding drv` +: Sets the `enableParallelBuilding` argument to `false` for `drv`. + #### Library functions in the Haskell package sets {#haskell-package-set-lib-functions} Some library functions depend on packages from the Haskell package sets. Thus they are diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md index 021f4807fb226..c21f73e69a259 100644 --- a/doc/languages-frameworks/index.md +++ b/doc/languages-frameworks/index.md @@ -67,6 +67,7 @@ dotnet.section.md emscripten.section.md gnome.section.md go.section.md +gradle.section.md hare.section.md haskell.section.md hy.section.md diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 8fa0f9a5aaa5b..e68a29b0b3fdf 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -258,26 +258,39 @@ It returns a derivation with all `package-lock.json` dependencies downloaded int #### importNpmLock {#javascript-buildNpmPackage-importNpmLock} -`importNpmLock` is a Nix function that requires the following optional arguments: +This function replaces the npm dependency references in `package.json` and `package-lock.json` with paths to the Nix store. +How each dependency is fetched can be customized with the `fetcherOpts` argument. -- `npmRoot`: Path to package directory containing the source tree +This is a simpler and more convenient alternative to [`fetchNpmDeps`](#javascript-buildNpmPackage-fetchNpmDeps) for managing npm dependencies in Nixpkgs. +There is no need to specify a `hash`, since it relies entirely on the integrity hashes already present in the `package-lock.json` file. + +##### Inputs {#javascript-buildNpmPackage-inputs} + +- `npmRoot`: Path to package directory containing the source tree. + If this is omitted, the `package` and `packageLock` arguments must be specified instead. - `package`: Parsed contents of `package.json` - `packageLock`: Parsed contents of `package-lock.json` - `pname`: Package name - `version`: Package version +- `fetcherOpts`: An attribute set of arguments forwarded to the underlying fetcher. It returns a derivation with a patched `package.json` & `package-lock.json` with all dependencies resolved to Nix store paths. -This function is analogous to using `fetchNpmDeps`, but instead of specifying `hash` it uses metadata from `package.json` & `package-lock.json`. +:::{.note} +`npmHooks.npmConfigHook` cannot be used with `importNpmLock`. +Use `importNpmLock.npmConfigHook` instead. +::: -Note that `npmHooks.npmConfigHook` cannot be used with `importNpmLock`. You will instead need to use `importNpmLock.npmConfigHook`: +:::{.example} +##### `pkgs.importNpmLock` usage example {#javascript-buildNpmPackage-example} ```nix { buildNpmPackage, importNpmLock }: buildNpmPackage { pname = "hello"; version = "0.1.0"; + src = ./.; npmDeps = importNpmLock { npmRoot = ./.; @@ -286,6 +299,38 @@ buildNpmPackage { npmConfigHook = importNpmLock.npmConfigHook; } ``` +::: + +:::{.example} +##### `pkgs.importNpmLock` usage example with `fetcherOpts` {#javascript-buildNpmPackage-example-fetcherOpts} + +`importNpmLock` uses the following fetchers: + +- `pkgs.fetchurl` for `http(s)` dependencies +- `builtins.fetchGit` for `git` dependencies + +It is possible to provide additional arguments to individual fetchers as needed: + +```nix +{ buildNpmPackage, importNpmLock }: + +buildNpmPackage { + pname = "hello"; + version = "0.1.0"; + src = ./.; + + npmDeps = importNpmLock { + npmRoot = ./.; + fetcherOpts = { + # Pass 'curlOptsList' to 'pkgs.fetchurl' while fetching 'axios' + { "node_modules/axios" = { curlOptsList = [ "--verbose" ]; }; } + }; + }; + + npmConfigHook = importNpmLock.npmConfigHook; +} +``` +::: #### importNpmLock.buildNodeModules {#javascript-buildNpmPackage-importNpmLock.buildNodeModules} @@ -467,6 +512,7 @@ Yarn based projects use a `yarn.lock` file instead of a `package-lock.json` to p - `yarnConfigHook`: Fetches the dependencies from the offline cache and installs them into `node_modules`. - `yarnBuildHook`: Runs `yarn build` or a specified `yarn` command that builds the project. +- `yarnInstallHook`: Runs `yarn install --production` to prune dependencies and installs the project into `$out`. An example usage of the above attributes is: @@ -478,8 +524,8 @@ An example usage of the above attributes is: fetchYarnDeps, yarnConfigHook, yarnBuildHook, + yarnInstallHook, nodejs, - npmHooks, }: stdenv.mkDerivation (finalAttrs: { @@ -495,15 +541,15 @@ stdenv.mkDerivation (finalAttrs: { yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-mo8urQaWIHu33+r0Y7mL9mJ/aSe/5CihuIetTeDHEUQ="; + hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; }; nativeBuildInputs = [ yarnConfigHook yarnBuildHook + yarnInstallHook # Needed for executing package.json scripts nodejs - npmHooks.npmInstallHook ]; meta = { @@ -512,8 +558,6 @@ stdenv.mkDerivation (finalAttrs: { }) ``` -Note that there is no setup hook for installing yarn based packages - `npmHooks.npmInstallHook` should fit most cases, but sometimes you may need to override the `installPhase` completely. - #### `yarnConfigHook` arguments {#javascript-yarnconfighook} By default, `yarnConfigHook` relies upon the attribute `${yarnOfflineCache}` (or `${offlineCache}` if the former is not set) to find the location of the offline cache produced by `fetchYarnDeps`. To disable this phase, you can set `dontYarnInstallDeps = true` or override the `configurePhase`. @@ -525,9 +569,15 @@ This script by default runs `yarn --offline build`, and it relies upon the proje - `yarnBuildScript`: Sets a different `yarn --offline` subcommand (defaults to `build`). - `yarnBuildFlags`: Single string list of additional flags to pass the above command, or a Nix list of such additional flags. +#### `yarnInstallHook` arguments {#javascript-yarninstallhook} + +To install the package `yarnInstallHook` uses both `npm` and `yarn` to cleanup project files and dependencies. To disable this phase, you can set `dontYarnInstall = true` or override the `installPhase`. Below is a list of additional `mkDerivation` arguments read by this hook: + +- `yarnKeepDevDeps`: Disables the removal of devDependencies from `node_modules` before installation. + ### yarn2nix {#javascript-yarn2nix} -WARNING: The `yarn2nix` functions have been deprecated in favor of the new `yarnConfigHook` and `yarnBuildHook`. Documentation for them still appears here for the sake of the packages that still use them. See also a tracking issue [#324246](https://github.com/NixOS/nixpkgs/issues/324246). +WARNING: The `yarn2nix` functions have been deprecated in favor of the new `yarnConfigHook`, `yarnBuildHook` and `yarnInstallHook`. Documentation for them still appears here for the sake of the packages that still use them. See also a tracking issue [#324246](https://github.com/NixOS/nixpkgs/issues/324246). #### Preparation {#javascript-yarn2nix-preparation} diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index e56beb1025703..d6c8357785e35 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -219,10 +219,10 @@ stdenv.mkDerivation { # don't do any fixup dontFixup = true; - outputHashAlgo = "sha256"; + outputHashAlgo = null; outputHashMode = "recursive"; # replace this with the correct SHA256 - outputHash = lib.fakeSha256; + outputHash = lib.fakeHash; } ``` diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 8d37b9c7b39bb..77828110cc4f3 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -214,9 +214,6 @@ because their behaviour is different: paths included in this list. Items listed in `install_requires` go here. * `optional-dependencies ? { }`: Optional feature flagged dependencies. Items listed in `extras_requires` go here. -Aside from propagating dependencies, - `buildPythonPackage` also injects code into and wraps executables with the - paths included in this list. Items listed in `extras_requires` go here. ##### Overriding Python packages {#overriding-python-packages} @@ -377,6 +374,50 @@ mkPythonMetaPackage { } ``` +#### `mkPythonEditablePackage` function {#mkpythoneditablepackage-function} + +When developing Python packages it's common to install packages in [editable mode](https://setuptools.pypa.io/en/latest/userguide/development_mode.html). +Like `mkPythonMetaPackage` this function exists to create an otherwise empty package, but also containing a pointer to an impure location outside the Nix store that can be changed without rebuilding. + +The editable root is passed as a string. Normally `.pth` files contains absolute paths to the mutable location. This isn't always ergonomic with Nix, so environment variables are expanded at runtime. +This means that a shell hook setting up something like a `$REPO_ROOT` variable can be used as the relative package root. + +As an implementation detail, the [PEP-518](https://peps.python.org/pep-0518/) `build-system` specified won't be used, but instead the editable package will be built using [hatchling](https://pypi.org/project/hatchling/). +The `build-system`'s provided will instead become runtime dependencies of the editable package. + +Note that overriding packages deeper in the dependency graph _can_ work, but it's not the primary use case and overriding existing packages can make others break in unexpected ways. + +``` nix +{ pkgs ? import { } }: + +let + pyproject = pkgs.lib.importTOML ./pyproject.toml; + + myPython = pkgs.python.override { + self = myPython; + packageOverrides = pyfinal: pyprev: { + # An editable package with a script that loads our mutable location + my-editable = pyfinal.mkPythonEditablePackage { + # Inherit project metadata from pyproject.toml + pname = pyproject.project.name; + inherit (pyproject.project) version; + + # The editable root passed as a string + root = "$REPO_ROOT/src"; # Use environment variable expansion at runtime + + # Inject a script (other PEP-621 entrypoints are also accepted) + inherit (pyproject.project) scripts; + }; + }; + }; + + pythonEnv = testPython.withPackages (ps: [ ps.my-editable ]); + +in pkgs.mkShell { + packages = [ pythonEnv ]; +} +``` + #### `python.buildEnv` function {#python.buildenv-function} Python environments can be created using the low-level `pkgs.buildEnv` function. @@ -2049,8 +2090,8 @@ no maintainer, so maintenance falls back to the package set maintainers. ### Updating packages in bulk {#python-package-bulk-updates} -There is a tool to update alot of python libraries in bulk, it exists at -`maintainers/scripts/update-python-libraries` with this repository. +A tool to bulk-update numerous Python libraries is available in the +repository at `maintainers/scripts/update-python-libraries`. It can quickly update minor or major versions for all packages selected and create update commits, and supports the `fetchPypi`, `fetchurl` and diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index c5cc122394f5e..31f696bd6427d 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/doc/languages-frameworks/ruby.section.md @@ -154,7 +154,7 @@ let defaultGemConfig = pkgs.defaultGemConfig // { pg = attrs: { buildFlags = - [ "--with-pg-config=${pkgs."postgresql_${pg_version}"}/bin/pg_config" ]; + [ "--with-pg-config=${lib.getDev pkgs."postgresql_${pg_version}"}/bin/pg_config" ]; }; }; }; @@ -172,7 +172,7 @@ let gemConfig = pkgs.defaultGemConfig // { pg = attrs: { buildFlags = - [ "--with-pg-config=${pkgs."postgresql_${pg_version}"}/bin/pg_config" ]; + [ "--with-pg-config=${lib.getDev pkgs."postgresql_${pg_version}"}/bin/pg_config" ]; }; }; }; @@ -190,9 +190,7 @@ let defaultGemConfig = super.defaultGemConfig // { pg = attrs: { buildFlags = [ - "--with-pg-config=${ - pkgs."postgresql_${pg_version}" - }/bin/pg_config" + "--with-pg-config=${lib.getDev pkgs."postgresql_${pg_version}"}/bin/pg_config" ]; }; }; diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 15f16879a5b4d..808936f49e60c 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -567,8 +567,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src sourceRoot; - name = "${pname}-${version}"; + inherit pname version src sourceRoot; hash = "sha256-miW//pnOmww2i6SOGbkrAIdc/JMDT4FJLqdMFojZeoY="; }; @@ -611,9 +610,8 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit pname version src; sourceRoot = "${pname}-${version}/${cargoRoot}"; - name = "${pname}-${version}"; hash = "sha256-PS562W4L1NimqDV2H0jl5vYhL08H9est/pbIxSdYVfo="; }; @@ -652,8 +650,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0="; }; @@ -697,8 +694,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-8fa3fa+sFi5H+49B5sr2vYPkp9C9s6CcE0zv4xB8gww="; }; diff --git a/doc/packages/geant4.section.md b/doc/packages/geant4.section.md new file mode 100644 index 0000000000000..3793953d51713 --- /dev/null +++ b/doc/packages/geant4.section.md @@ -0,0 +1,15 @@ +# Geant4 {#geant4} + +[Geant4](https://www.geant4.org/) is a toolkit for simulating how particles pass through matter. It is available through the `geant4` package. + +## Setup hook {#geant4-hook} + +The setup hook included in the package applies the environment variables set by the [`geant4.sh` script](https://github.com/Geant4/geant4/blob/master/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake#L4-L55), which is typically necessary for compiling `make`-based programs that depend on Geant4. + +## Datasets {#geant4-datasets} + +All of [the Geant4 datasets provided by CERN](https://geant4.web.cern.ch/support/download) are available through the `geant4.data` attrset. + +### Setup hook {#geant4-datasets-hook} + +The hook provided by the packages in `geant4.data` will set an appropriate environment variable in the form of `G4[...]DATA`. For example, for the `G4RadioactiveDecay` dataset, the `G4RADIOACTIVEDATA` environment variable is set to the value expected by Geant4. diff --git a/doc/packages/index.md b/doc/packages/index.md index c5aa7dbfa0ee6..89d7e477e76fc 100644 --- a/doc/packages/index.md +++ b/doc/packages/index.md @@ -12,10 +12,12 @@ emacs.section.md firefox.section.md fish.section.md fuse.section.md +geant4.section.md ibus.section.md kakoune.section.md krita.section.md linux.section.md +lhapdf.section.md locales.section.md etc-files.section.md nginx.section.md diff --git a/doc/packages/lhapdf.section.md b/doc/packages/lhapdf.section.md new file mode 100644 index 0000000000000..af07d4edd42ab --- /dev/null +++ b/doc/packages/lhapdf.section.md @@ -0,0 +1,11 @@ +# LHAPDF {#lhapdf} + +[LHAPDF](https://lhapdf.hepforge.org/) is a tool for evaluating parton distribution functions (PDFs) in high-energy physics. LHAPDF is available in the `lhapdf` package. + +## PDF sets {#lhapdf-sets} + +All of [the PDF sets made available by the LHAPDF project](https://lhapdf.hepforge.org/pdfsets.html) are available through the `lhapdf.pdf_sets` attrset. + +### Setup hook {#lhapdf-sets-hook} + +Each package provided in the `lhapdf.pdf_sets` attrset contains a setup hook which adds itself to [the `LHAPDF_DATA_PATH` environment variable](https://lhapdf.hepforge.org/#sets). diff --git a/doc/packages/linux.section.md b/doc/packages/linux.section.md index 90d14772134ba..5c36c593ca74d 100644 --- a/doc/packages/linux.section.md +++ b/doc/packages/linux.section.md @@ -52,7 +52,7 @@ pkgs.linuxPackages_custom { version = "6.1.55"; src = pkgs.fetchurl { url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${version}.tar.xz"; - hash = "sha256:1h0mzx52q9pvdv7rhnvb8g68i7bnlc9rf8gy9qn4alsxq4g28zm8"; + hash = "sha256-qH4kHsFdU0UsTv4hlxOjdp2IzENrW5jPbvsmLEr/FcA="; }; configfile = ./path_to_config_file; } @@ -67,7 +67,7 @@ pkgs.linuxPackages_custom { modDirVersion = "6.1.55"; src = pkgs.fetchurl { url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${modDirVersion}.tar.xz"; - hash = "sha256:1h0mzx52q9pvdv7rhnvb8g68i7bnlc9rf8gy9qn4alsxq4g28zm8"; + hash = "sha256-qH4kHsFdU0UsTv4hlxOjdp2IzENrW5jPbvsmLEr/FcA="; }; configfile = ./path_to_config_file; } diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 35330305f1891..ce4ec2541f34c 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -580,7 +580,7 @@ After unpacking all of `src` and `srcs`, if neither of `sourceRoot` and `setSour If `unpackPhase` produces multiple source directories, you should set `sourceRoot` to the name of the intended directory. You can also set `sourceRoot = ".";` if you want to control it yourself in a later phase. -For example, if your want your build to start in a sub-directory inside your sources, and you are using `fetchzip`-derived `src` (like `fetchFromGitHub` or similar), you need to set `sourceRoot = "${src.name}/my-sub-directory"`. +For example, if you want your build to start in a sub-directory inside your sources, and you are using `fetchzip`-derived `src` (like `fetchFromGitHub` or similar), you need to set `sourceRoot = "${src.name}/my-sub-directory"`. ##### `setSourceRoot` {#var-stdenv-setSourceRoot} @@ -1136,6 +1136,12 @@ Example removing all references to the compiler in the output: } ``` +### `runHook` \ {#fun-runHook} + +Execute \ and the values in the array associated with it. The array's name is determined by removing `Hook` from the end of \ and appending `Hooks`. + +For example, `runHook postHook` would run the hook `postHook` and all of the values contained in the `postHooks` array, if it exists. + ### `substitute` \ \ \ {#fun-substitute} Performs string substitution on the contents of \, writing the result to \. The substitutions in \ are of the following form: diff --git a/flake.nix b/flake.nix index bb7d0d5d4de36..950eb2b5c4d13 100644 --- a/flake.nix +++ b/flake.nix @@ -16,10 +16,44 @@ }); in { + /** + `nixpkgs.lib` is a combination of the [Nixpkgs library](https://nixos.org/manual/nixpkgs/unstable/#id-1.4), and other attributes + that are _not_ part of the Nixpkgs library, but part of the Nixpkgs flake: + + - `lib.nixosSystem` for creating a NixOS system configuration + + - `lib.nixos` for other NixOS-provided functionality, such as [`runTest`](https://nixos.org/manual/nixos/unstable/#sec-call-nixos-test-outside-nixos) + */ lib = lib.extend (final: prev: { + /** + Other NixOS-provided functionality, such as [`runTest`](https://nixos.org/manual/nixos/unstable/#sec-call-nixos-test-outside-nixos). + See also `lib.nixosSystem`. + */ nixos = import ./nixos/lib { lib = final; }; + /** + Create a NixOS system configuration. + + Example: + + lib.nixosSystem { + modules = [ ./configuration.nix ]; + } + + Inputs: + + - `modules` (list of paths or inline modules): The NixOS modules to include in the system configuration. + + - `specialArgs` (attribute set): Extra arguments to pass to all modules, that are available in `imports` but can not be extended or overridden by the `modules`. + + - `modulesLocation` (path): A default location for modules that aren't passed by path, used for error messages. + + Legacy inputs: + + - `system`: Legacy alias for `nixpkgs.hostPlatform`, but this is already set in the generated `hardware-configuration.nix`, included by `configuration.nix`. + - `pkgs`: Legacy alias for `nixpkgs.pkgs`; use `nixpkgs.pkgs` and `nixosModules.readOnlyPkgs` instead. + */ nixosSystem = args: import ./nixos/lib/eval-config.nix ( { @@ -47,7 +81,7 @@ checks = forAllSystems (system: { tarball = jobs.${system}.tarball; # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64 - } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) { + } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.hostPlatform.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) { # Test that ensures that the nixosSystem function can accept a lib argument # Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules # alternatives include: `import` a file, or put a custom library in an option or in `_module.args.` @@ -64,7 +98,7 @@ boot.loader.grub.enable = false; fileSystems."/".device = "nodev"; # See https://search.nixos.org/options?show=system.stateVersion&query=stateversion - system.stateVersion = lib.versions.majorMinor lib.version; # DON'T do this in real configs! + system.stateVersion = lib.trivial.release; # DON'T do this in real configs! }) ]; }).config.system.build.toplevel; @@ -78,28 +112,56 @@ }; devShells = forAllSystems (system: { + /** A shell to get tooling for Nixpkgs development. See nixpkgs/shell.nix. */ default = import ./shell.nix { inherit system; }; }); - # The "legacy" in `legacyPackages` doesn't imply that the packages exposed - # through this attribute are "legacy" packages. Instead, `legacyPackages` - # is used here as a substitute attribute name for `packages`. The problem - # with `packages` is that it makes operations like `nix flake show - # nixpkgs` unusably slow due to the sheer number of packages the Nix CLI - # needs to evaluate. But when the Nix CLI sees a `legacyPackages` - # attribute it displays `omitted` instead of evaluating all packages, - # which keeps `nix flake show` on Nixpkgs reasonably fast, though less - # information rich. + /** + A nested structure of [packages](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) and other values. + + The "legacy" in `legacyPackages` doesn't imply that the packages exposed + through this attribute are "legacy" packages. Instead, `legacyPackages` + is used here as a substitute attribute name for `packages`. The problem + with `packages` is that it makes operations like `nix flake show + nixpkgs` unusably slow due to the sheer number of packages the Nix CLI + needs to evaluate. But when the Nix CLI sees a `legacyPackages` + attribute it displays `omitted` instead of evaluating all packages, + which keeps `nix flake show` on Nixpkgs reasonably fast, though less + information rich. + + The reason why finding the tree structure of `legacyPackages` is slow, + is that for each attribute in the tree, it is necessary to check whether + the attribute value is a package or a package set that needs further + evaluation. Evaluating the attribute value tends to require a significant + amount of computation, even considering lazy evaluation. + */ legacyPackages = forAllSystems (system: (import ./. { inherit system; }).extend (final: prev: { lib = prev.lib.extend libVersionInfoOverlay; }) ); + /** + Optional modules that can be imported into a NixOS configuration. + + Example: + + # flake.nix + outputs = { nixpkgs, ... }: { + nixosConfigurations = { + foo = nixpkgs.lib.nixosSystem { + modules = [ + ./foo/configuration.nix + nixpkgs.nixosModules.notDetected + ]; + }; + }; + }; + */ nixosModules = { notDetected = ./nixos/modules/installer/scan/not-detected.nix; - /* + /** Make the `nixpkgs.*` configuration read-only. Guarantees that `pkgs` is the way you initialize it. diff --git a/lib/default.nix b/lib/default.nix index 0ff3a39807450..4d0035945aaa9 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -79,7 +79,8 @@ let fromHexString toHexString toBaseDigits inPureEvalMode isBool isInt pathExists genericClosure readFile; inherit (self.fixedPoints) fix fix' converge extends composeExtensions - composeManyExtensions makeExtensible makeExtensibleWithCustomName; + composeManyExtensions makeExtensible makeExtensibleWithCustomName + toExtension; inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrNames attrValues getAttrs catAttrs filterAttrs filterAttrsRecursive foldlAttrs foldAttrs collect nameValuePair mapAttrs diff --git a/lib/fetchers.nix b/lib/fetchers.nix index e94c611299bec..cd6d5d7916d3e 100644 --- a/lib/fetchers.nix +++ b/lib/fetchers.nix @@ -1,6 +1,17 @@ # snippets that can be shared by multiple fetchers (pkgs/build-support) { lib }: -{ +let + commonH = hashTypes: rec { + hashNames = [ "hash" ] ++ hashTypes; + hashSet = lib.genAttrs hashNames (lib.const {}); + }; + + fakeH = { + hash = lib.fakeHash; + sha256 = lib.fakeSha256; + sha512 = lib.fakeSha512; + }; +in rec { proxyImpureEnvVars = [ # We borrow these environment variables from the caller to allow @@ -9,6 +20,170 @@ # by definition pure. "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" "HTTP_PROXY" "HTTPS_PROXY" "FTP_PROXY" "ALL_PROXY" "NO_PROXY" + + # https proxies typically need to inject custom root CAs too + "NIX_SSL_CERT_FILE" ]; + /** + Converts an attrset containing one of `hash`, `sha256` or `sha512`, + into one containing `outputHash{,Algo}` as accepted by `mkDerivation`. + + An appropriate “fake hash” is substituted when the hash value is `""`, + as is the [convention for fetchers](#sec-pkgs-fetchers-updating-source-hashes-fakehash-method). + + All other attributes in the set remain as-is. + + # Example + + ```nix + normalizeHash { } { hash = ""; foo = "bar"; } + => + { + outputHash = lib.fakeHash; + outputHashAlgo = null; + foo = "bar"; + } + ``` + + ```nix + normalizeHash { } { sha256 = lib.fakeSha256; } + => + { + outputHash = lib.fakeSha256; + outputHashAlgo = "sha256"; + } + ``` + + ```nix + normalizeHash { } { sha512 = lib.fakeSha512; } + => + { + outputHash = lib.fakeSha512; + outputHashAlgo = "sha512"; + } + ``` + + # Type + ``` + normalizeHash :: { hashTypes :: List String, required :: Bool } -> AttrSet -> AttrSet + ``` + + # Arguments + + hashTypes + : the set of attribute names accepted as hash inputs, in addition to `hash` + + required + : whether to throw if no hash was present in the input; otherwise returns the original input, unmodified + */ + normalizeHash = { + hashTypes ? [ "sha256" ], + required ? true, + }: + let + inherit (lib) concatMapStringsSep head tail throwIf; + inherit (lib.attrsets) attrsToList intersectAttrs removeAttrs optionalAttrs; + + inherit (commonH hashTypes) hashNames hashSet; + in + args: + if args ? "outputHash" then + args + else + let + # The argument hash, as a {name, value} pair + h = + # All hashes passed in arguments (possibly 0 or >1) as a list of {name, value} pairs + let hashesAsNVPairs = attrsToList (intersectAttrs hashSet args); in + if hashesAsNVPairs == [] then + throwIf required "fetcher called without `hash`" null + else if tail hashesAsNVPairs != [] then + throw "fetcher called with mutually-incompatible arguments: ${concatMapStringsSep ", " (a: a.name) hashesAsNVPairs}" + else + head hashesAsNVPairs + ; + in + removeAttrs args hashNames // (optionalAttrs (h != null) { + outputHashAlgo = if h.name == "hash" then null else h.name; + outputHash = + if h.value == "" then + fakeH.${h.name} or (throw "no “fake hash” defined for ${h.name}") + else + h.value; + }) + ; + + /** + Wraps a function which accepts `outputHash{,Algo}` into one which accepts `hash` or `sha{256,512}` + + # Example + ```nix + withNormalizedHash { hashTypes = [ "sha256" "sha512" ]; } ( + { outputHash, outputHashAlgo, ... }: + ... + ) + ``` + is a function which accepts one of `hash`, `sha256`, or `sha512` (or the original's `outputHash` and `outputHashAlgo`). + + Its `functionArgs` metadata only lists `hash` as a parameter, optional iff. `outputHash` was an optional parameter of + the original function. `sha256`, `sha512`, `outputHash`, or `outputHashAlgo` are not mentioned in the `functionArgs` + metadata. + + # Type + ``` + withNormalizedHash :: { hashTypes :: List String } -> (AttrSet -> T) -> (AttrSet -> T) + ``` + + # Arguments + + hashTypes + : the set of attribute names accepted as hash inputs, in addition to `hash` + : they must correspond to a valid value for `outputHashAlgo`, currently one of: `md5`, `sha1`, `sha256`, or `sha512`. + + f + : the function to be wrapped + + ::: {.note} + In nixpkgs, `mkDerivation` rejects MD5 `outputHash`es, and SHA-1 is being deprecated. + + As such, there is no reason to add `md5` to `hashTypes`, and + `sha1` should only ever be included for backwards compatibility. + ::: + + # Output + + `withNormalizedHash { inherit hashTypes; } f` is functionally equivalent to + ```nix + args: f (normalizeHash { + inherit hashTypes; + required = !(lib.functionArgs f).outputHash; + } args) + ``` + + However, `withNormalizedHash` preserves `functionArgs` metadata insofar as possible, + and is implemented somewhat more efficiently. + */ + withNormalizedHash = { + hashTypes ? [ "sha256" ] + }: fetcher: + let + inherit (lib.attrsets) genAttrs intersectAttrs removeAttrs; + inherit (lib.trivial) const functionArgs setFunctionArgs; + + inherit (commonH hashTypes) hashSet; + fArgs = functionArgs fetcher; + + normalize = normalizeHash { + inherit hashTypes; + required = !fArgs.outputHash; + }; + in + # The o.g. fetcher must *only* accept outputHash and outputHashAlgo + assert fArgs ? outputHash && fArgs ? outputHashAlgo; + assert intersectAttrs fArgs hashSet == {}; + + setFunctionArgs + (args: fetcher (normalize args)) + (removeAttrs fArgs [ "outputHash" "outputHashAlgo" ] // { hash = fArgs.outputHash; }); } diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 2a31b44f27c17..ccc897755c110 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -63,7 +63,6 @@ rec { See [`extends`](#function-library-lib.fixedPoints.extends) for an example use case. There `self` is also often called `final`. - # Inputs `f` @@ -90,7 +89,12 @@ rec { ::: */ - fix = f: let x = f x; in x; + fix = + f: + let + x = f x; + in + x; /** A variant of `fix` that records the original recursive attribute set in the @@ -99,14 +103,20 @@ rec { This is useful in combination with the `extends` function to implement deep overriding. - # Inputs `f` : 1\. Function argument */ - fix' = f: let x = f x // { __unfix__ = f; }; in x; + fix' = + f: + let + x = f x // { + __unfix__ = f; + }; + in + x; /** Return the fixpoint that `f` converges to when called iteratively, starting @@ -117,7 +127,6 @@ rec { 0 ``` - # Inputs `f` @@ -134,13 +143,12 @@ rec { (a -> a) -> a -> a ``` */ - converge = f: x: + converge = + f: x: let x' = f x; in - if x' == x - then x - else converge f x'; + if x' == x then x else converge f x'; /** Extend a function using an overlay. @@ -149,7 +157,6 @@ rec { A fixed-point function is a function which is intended to be evaluated by passing the result of itself as the argument. This is possible due to Nix's lazy evaluation. - A fixed-point function returning an attribute set has the form ```nix @@ -257,7 +264,6 @@ rec { ``` ::: - # Inputs `overlay` @@ -299,8 +305,7 @@ rec { ::: */ extends = - overlay: - f: + overlay: f: # The result should be thought of as a function, the argument of that function is not an argument to `extends` itself ( final: @@ -311,63 +316,98 @@ rec { ); /** - Compose two extending functions of the type expected by 'extends' - into one where changes made in the first are available in the - 'super' of the second + Compose two overlay functions and return a single overlay function that combines them. + For more details see: [composeManyExtensions](#function-library-lib.fixedPoints.composeManyExtensions). + */ + composeExtensions = + f: g: final: prev: + let + fApplied = f final prev; + prev' = prev // fApplied; + in + fApplied // g final prev'; + + /** + Composes a list of [`overlays`](#chap-overlays) and returns a single overlay function that combines them. + :::{.note} + The result is produced by using the update operator `//`. + This means nested values of previous overlays are not merged recursively. + In other words, previously defined attributes are replaced, ignoring the previous value, unless referenced by the overlay; for example `final: prev: { foo = final.foo + 1; }`. + ::: # Inputs - `f` + `extensions` - : 1\. Function argument + : A list of overlay functions + :::{.note} + The order of the overlays in the list is important. + ::: - `g` + : Each overlay function takes two arguments, by convention `final` and `prev`, and returns an attribute set. + - `final` is the result of the fixed-point function, with all overlays applied. + - `prev` is the result of the previous overlay function(s). - : 2\. Function argument + # Type - `final` + ``` + # Pseudo code + let + # final prev + # ↓ ↓ + OverlayFn = { ... } -> { ... } -> { ... }; + in + composeManyExtensions :: ListOf OverlayFn -> OverlayFn + ``` - : 3\. Function argument + # Examples + :::{.example} + ## `lib.fixedPoints.composeManyExtensions` usage example - `prev` + ```nix + let + # The "original function" that is extended by the overlays. + # Note that it doesn't have prev: as argument since no overlay function precedes it. + original = final: { a = 1; }; - : 4\. Function argument - */ - composeExtensions = - f: g: final: prev: - let fApplied = f final prev; - prev' = prev // fApplied; - in fApplied // g final prev'; + # Each overlay function has 'final' and 'prev' as arguments. + overlayA = final: prev: { b = final.c; c = 3; }; + overlayB = final: prev: { c = 10; x = prev.c or 5; }; - /** - Compose several extending functions of the type expected by 'extends' into - one where changes made in preceding functions are made available to - subsequent ones. + extensions = composeManyExtensions [ overlayA overlayB ]; + # Caluculate the fixed point of all composed overlays. + fixedpoint = lib.fix (lib.extends extensions original ); + + in fixedpoint + => + { + a = 1; + b = 10; + c = 10; + x = 3; + } ``` - composeManyExtensions : [packageSet -> packageSet -> packageSet] -> packageSet -> packageSet -> packageSet - ^final ^prev ^overrides ^final ^prev ^overrides - ``` + ::: */ - composeManyExtensions = - lib.foldr (x: y: composeExtensions x y) (final: prev: {}); + composeManyExtensions = lib.foldr (x: y: composeExtensions x y) (final: prev: { }); /** Create an overridable, recursive attribute set. For example: ``` - nix-repl> obj = makeExtensible (self: { }) + nix-repl> obj = makeExtensible (final: { }) nix-repl> obj { __unfix__ = «lambda»; extend = «lambda»; } - nix-repl> obj = obj.extend (self: super: { foo = "foo"; }) + nix-repl> obj = obj.extend (final: prev: { foo = "foo"; }) nix-repl> obj { __unfix__ = «lambda»; extend = «lambda»; foo = "foo"; } - nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; }) + nix-repl> obj = obj.extend (final: prev: { foo = prev.foo + " + "; bar = "bar"; foobar = final.foo + final.bar; }) nix-repl> obj { __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; } @@ -379,7 +419,6 @@ rec { Same as `makeExtensible` but the name of the extending attribute is customized. - # Inputs `extenderName` @@ -390,8 +429,85 @@ rec { : 2\. Function argument */ - makeExtensibleWithCustomName = extenderName: rattrs: - fix' (self: (rattrs self) // { - ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs); - }); + makeExtensibleWithCustomName = + extenderName: rattrs: + fix' ( + self: + (rattrs self) + // { + ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs); + } + ); + + /** + Convert to an extending function (overlay). + + `toExtension` is the `toFunction` for extending functions (a.k.a. extensions or overlays). + It converts a non-function or a single-argument function to an extending function, + while returning a two-argument function as-is. + + That is, it takes a value of the shape `x`, `prev: x`, or `final: prev: x`, + and returns `final: prev: x`, assuming `x` is not a function. + + This function takes care of the input to `stdenv.mkDerivation`'s + `overrideAttrs` function. + It bridges the gap between `.overrideAttrs` + before and after the overlay-style support. + + # Inputs + + `f` + : The function or value to convert to an extending function. + + # Type + + ``` + toExtension :: + b' -> Any -> Any -> b' + or + toExtension :: + (a -> b') -> Any -> a -> b' + or + toExtension :: + (a -> a -> b) -> a -> a -> b + where b' = ! Callable + + Set a = b = b' = AttrSet & ! Callable to make toExtension return an extending function. + ``` + + # Examples + :::{.example} + ## `lib.fixedPoints.toExtension` usage example + + ```nix + fix (final: { a = 0; c = final.a; }) + => { a = 0; c = 0; }; + + fix (extends (toExtension { a = 1; b = 2; }) (final: { a = 0; c = final.a; })) + => { a = 1; b = 2; c = 1; }; + + fix (extends (toExtension (prev: { a = 1; b = prev.a; })) (final: { a = 0; c = final.a; })) + => { a = 1; b = 0; c = 1; }; + + fix (extends (toExtension (final: prev: { a = 1; b = prev.a; c = final.a + 1 })) (final: { a = 0; c = final.a; })) + => { a = 1; b = 0; c = 2; }; + ``` + ::: + */ + toExtension = + f: + if lib.isFunction f then + final: prev: + let + fPrev = f prev; + in + if lib.isFunction fPrev then + # f is (final: prev: { ... }) + f final prev + else + # f is (prev: { ... }) + fPrev + else + # f is not a function; probably { ... } + final: prev: f; } diff --git a/lib/licenses.nix b/lib/licenses.nix index 333d32deded3c..b1da1541c21de 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -92,6 +92,11 @@ lib.mapAttrs mkLicense ({ free = false; }; + ampas = { + spdxId = "AMPAS"; + fullName = "Academy of Motion Picture Arts and Sciences BSD"; + }; + aom = { fullName = "Alliance for Open Media Patent License 1.0"; url = "https://aomedia.org/license/patent-license/"; @@ -554,6 +559,13 @@ lib.mapAttrs mkLicense ({ redistributable = true; }; + fsl11Asl20 = { + fullName = "Functional Source License, Version 1.1, Apache 2.0 Future License"; + url = "https://fsl.software/FSL-1.1-Apache-2.0.template.md"; + free = false; + redistributable = true; + }; + ftl = { spdxId = "FTL"; fullName = "Freetype Project License"; @@ -721,10 +733,9 @@ lib.mapAttrs mkLicense ({ fullName = "ISC License"; }; - # Proprietary binaries; free to redistribute without modification. databricks = { - fullName = "Databricks Proprietary License"; - url = "https://pypi.org/project/databricks-connect"; + fullName = "Databricks License"; + url = "https://www.databricks.com/legal/db-license"; free = false; }; diff --git a/lib/modules.nix b/lib/modules.nix index ef0be5b27aaf9..3472085a763b3 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -354,12 +354,7 @@ let else if m._type == "if" || m._type == "override" then loadModule args fallbackFile fallbackKey { config = m; } else - throw ( - "Could not load a value as a module, because it is of type ${lib.strings.escapeNixString m._type}" - + optionalString (fallbackFile != unknownModule) ", in file ${toString fallbackFile}." - + optionalString (m._type == "configuration") " If you do intend to import this configuration, please only import the modules that make up the configuration. You may have to create a `let` binding, file or attribute to give yourself access to the relevant modules.\nWhile loading a configuration into the module system is a very sensible idea, it can not be done cleanly in practice." - # Extended explanation: That's because a finalized configuration is more than just a set of modules. For instance, it has its own `specialArgs` that, by the nature of `specialArgs` can't be loaded through `imports` or the the `modules` argument. So instead, we have to ask you to extract the relevant modules and use those instead. This way, we keep the module system comparatively simple, and hopefully avoid a bad surprise down the line. - ) + throw (messages.not_a_module { inherit fallbackFile; value = m; _type = m._type; expectedClass = class; }) else if isList m then let defs = [{ file = fallbackFile; value = m; }]; in throw "Module imports can't be nested lists. Perhaps you meant to remove one level of lists? Definitions: ${showDefs defs}" @@ -861,7 +856,7 @@ let else # (nixos-option detects this specific error message and gives it special # handling. If changed here, please change it there too.) - throw "The option `${showOption loc}' is used but not defined."; + throw "The option `${showOption loc}' was accessed but has no value defined. Try setting the option."; isDefined = defsFinal != []; @@ -1450,6 +1445,110 @@ let collectModules = collectModules null; }; + /** + Error messages produced by the module system. + + We factor these out to improve the flow when reading the code. + + Functions in `messages` that produce error messages are spelled in + lower_snake_case. This goes against the convention in order to make the + error message implementation more readable, and to visually distinguish + them from other functions in the module system. + */ + messages = let + inherit (lib.strings) concatMapStringsSep escapeNixString trim; + /** "" or ", in file FOO" */ + into_fallback_file_maybe = file: + optionalString + (file != null && file != unknownModule) + ", while trying to load a module into ${toString file}"; + + /** Format text with one line break between each list item. */ + lines = concatMapStringsSep "\n" trim; + + /** Format text with two line break between each list item. */ + paragraphs = concatMapStringsSep "\n\n" trim; + + /** + ``` + optionalMatch + { foo = "Foo result"; + bar = "Bar result"; + } "foo" + == [ "Foo result" ] + + optionalMatch { foo = "Foo"; } "baz" == [ ] + + optionalMatch { foo = "Foo"; } true == [ ] + ``` + */ + optionalMatch = cases: value: + if isString value && cases?${value} + then [ cases.${value} ] + else []; + + # esc = builtins.fromJSON "\"\\u001b\""; + esc = builtins.fromJSON "\"\\u001b\""; + # Bold purple for warnings + warn = s: "${esc}[1;35m${s}${esc}[0m"; + # Bold green for suggestions + good = s: "${esc}[1;32m${s}${esc}[0m"; + # Bold, default color for code + code = s: "${esc}[1m${s}${esc}[0m"; + + in { + + /** When load a value with a (wrong) _type as a module */ + not_a_module = { fallbackFile, value, _type, expectedClass ? null }: + paragraphs ( + [ '' + Expected a module, but found a value of type ${warn (escapeNixString _type)}${into_fallback_file_maybe fallbackFile}. + A module is typically loaded by adding it the ${code "imports = [ ... ];"} attribute of an existing module, or in the ${code "modules = [ ... ];"} argument of various functions. + Please make sure that each of the list items is a module, and not a different kind of value. + '' + ] + ++ (optionalMatch + { + "configuration" = trim '' + If you really mean to import this configuration, instead please only import the modules that make up the configuration. + You may have to create a `let` binding, file or attribute to give yourself access to the relevant modules. + While loading a configuration into the module system is a very sensible idea, it can not be done cleanly in practice. + ''; + # ^^ Extended explanation: That's because a finalized configuration is more than just a set of modules. For instance, it has its own `specialArgs` that, by the nature of `specialArgs` can't be loaded through `imports` or the the `modules` argument. So instead, we have to ask you to extract the relevant modules and use those instead. This way, we keep the module system comparatively simple, and hopefully avoid a bad surprise down the line. + + "flake" = lines + ([(trim '' + Perhaps you forgot to select an attribute name? + Instead of, for example, + ${warn "inputs.someflake"} + you need to write something like + ${warn "inputs.someflake"}${ + if expectedClass == null + then good ".modules.someApp.default" + else good ".modules.${expectedClass}.default" + + } + '')] + ++ optionalMatch + { # We'll no more than 5 custom suggestions here. + # Please switch to `.modules.${class}` in your Module System application. + "nixos" = trim '' + or + ${warn "inputs.someflake"}${good ".nixosModules.default"} + ''; + "darwin" = trim '' + or + ${warn "inputs.someflake"}${good ".darwinModules.default"} + ''; + } + expectedClass + ); + } + _type + ) + ); + }; + in private // { diff --git a/lib/strings.nix b/lib/strings.nix index 54a5b9c674341..ffde541c69583 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -408,7 +408,6 @@ rec { start ? false, end ? false, }: - s: let # Define our own whitespace character class instead of using # `[:space:]`, which is not well-defined. @@ -425,12 +424,14 @@ rec { "(.*[^${chars}])[${chars}]*" else "(.*)"; - + in + s: + let # If the string was empty or entirely whitespace, # then the regex may not match and `res` will be `null`. res = match regex s; in - optionalString (res != null) (head res); + optionalString (res != null) (head res); /** Construct a Unix-style, colon-separated search path consisting of diff --git a/lib/systems/default.nix b/lib/systems/default.nix index cee09791bf542..a6ceef2cc3a11 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -277,33 +277,17 @@ let let selectEmulator = pkgs: let - qemu-user = pkgs.qemu.override { - smartcardSupport = false; - spiceSupport = false; - openGLSupport = false; - virglSupport = false; - vncSupport = false; - gtkSupport = false; - sdlSupport = false; - alsaSupport = false; - pulseSupport = false; - pipewireSupport = false; - jackSupport = false; - smbdSupport = false; - seccompSupport = false; - tpmSupport = false; - capstoneSupport = false; - enableDocs = false; - hostCpuTargets = [ "${final.qemuArch}-linux-user" ]; - }; wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal; in + # Note: we guarantee that the return value is either `null` or a path + # to an emulator program. That is, if an emulator requires additional + # arguments, a wrapper should be used. if pkgs.stdenv.hostPlatform.canExecute final - then "${pkgs.runtimeShell} -c '\"$@\"' --" + then "${pkgs.execline}/bin/exec" else if final.isWindows then "${wine}/bin/wine${optionalString (final.parsed.cpu.bits == 64) "64"}" else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null - then "${qemu-user}/bin/qemu-${final.qemuArch}" + then "${pkgs.qemu-user}/bin/qemu-${final.qemuArch}" else if final.isWasi then "${pkgs.wasmtime}/bin/wasmtime" else if final.isMmix @@ -312,6 +296,10 @@ let in { emulatorAvailable = pkgs: (selectEmulator pkgs) != null; + # whether final.emulator pkgs.pkgsStatic works + staticEmulatorAvailable = pkgs: final.emulatorAvailable pkgs + && (final.isLinux || final.isWasi || final.isMmix); + emulator = pkgs: if (final.emulatorAvailable pkgs) then selectEmulator pkgs @@ -376,12 +364,22 @@ let "armv7l" = "armv7"; "armv6l" = "arm"; "armv5tel" = "armv5te"; + "riscv32" = "riscv32gc"; "riscv64" = "riscv64gc"; }.${cpu.name} or cpu.name; vendor_ = final.rust.platform.vendor; # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL. - in args.rust.rustcTarget or args.rustc.config - or "${cpu_}-${vendor_}-${kernel.name}${optionalString (abi.name != "unknown") "-${abi.name}"}"; + in + args.rust.rustcTarget or + args.rustc.config or ( + # Rust uses `wasm32-wasip?` rather than `wasm32-unknown-wasi`. + # We cannot know which subversion does the user want, and + # currently use WASI 0.1 as default for compatibility. Custom + # users can set `rust.rustcTarget` to override it. + if final.isWasi + then "${cpu_}-wasip1" + else "${cpu_}-${vendor_}-${kernel.name}${optionalString (abi.name != "unknown") "-${abi.name}"}" + ); # The name of the rust target if it is standard, or the json file # containing the custom target spec. diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 971f6b87364b2..5059f6e0c8384 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -256,7 +256,7 @@ rec { iphone64 = { config = "aarch64-apple-ios"; # config = "aarch64-apple-darwin14"; - sdkVer = "14.3"; + darwinSdkVersion = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; @@ -265,7 +265,7 @@ rec { iphone32 = { config = "armv7a-apple-ios"; # config = "arm-apple-darwin10"; - sdkVer = "14.3"; + darwinSdkVersion = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; @@ -274,7 +274,7 @@ rec { iphone64-simulator = { config = "x86_64-apple-ios"; # config = "x86_64-apple-darwin14"; - sdkVer = "14.3"; + darwinSdkVersion = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneSimulator"; darwinPlatform = "ios-simulator"; @@ -284,7 +284,7 @@ rec { iphone32-simulator = { config = "i686-apple-ios"; # config = "i386-apple-darwin11"; - sdkVer = "14.3"; + darwinSdkVersion = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneSimulator"; darwinPlatform = "ios-simulator"; diff --git a/lib/tests/fetchers.nix b/lib/tests/fetchers.nix new file mode 100644 index 0000000000000..c36da35673a71 --- /dev/null +++ b/lib/tests/fetchers.nix @@ -0,0 +1,165 @@ +let + lib = import ./..; + + inherit (lib) + fakeHash + fakeSha256 + fakeSha512 + flip + functionArgs + runTests + ; + inherit (lib.fetchers) normalizeHash withNormalizedHash; + + testingThrow = expr: { + expr = with builtins; tryEval (seq expr "didn't throw"); + expected = { + success = false; + value = false; + }; + }; + + # hashes of empty + sri256 = "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY="; + sri512 = "sha512-AXFyVo7jiZ5we10fxZ5E9qfPjSfqkizY2apCzORKFVYZaNhCIVbooY+J4cYST00ztLf0EjivIBPPdtIYFUMfzQ=="; + + unionOfDisjoints = lib.foldl lib.attrsets.unionOfDisjoint { }; + + genTests = n: f: { + "test${n}AlreadyNormalized" = { + expr = f { } { + outputHash = ""; + outputHashAlgo = "md42"; + }; + expected = { + outputHash = ""; + outputHashAlgo = "md42"; + }; + }; + + "test${n}EmptySha256" = { + expr = f { } { sha256 = ""; }; + expected = { + outputHash = fakeSha256; + outputHashAlgo = "sha256"; + }; + }; + + "test${n}EmptySha512" = { + expr = f { hashTypes = [ "sha512" ]; } { sha512 = ""; }; + expected = { + outputHash = fakeSha512; + outputHashAlgo = "sha512"; + }; + }; + + "test${n}EmptyHash" = { + expr = f { } { hash = ""; }; + expected = { + outputHash = fakeHash; + outputHashAlgo = null; + }; + }; + + "test${n}Sri256" = { + expr = f { } { hash = sri256; }; + expected = { + outputHash = sri256; + outputHashAlgo = null; + }; + }; + + "test${n}Sri512" = { + expr = f { } { hash = sri512; }; + expected = { + outputHash = sri512; + outputHashAlgo = null; + }; + }; + + "test${n}PreservesAttrs" = { + expr = f { } { + hash = "aaaa"; + destination = "Earth"; + }; + expected = { + outputHash = "aaaa"; + outputHashAlgo = null; + destination = "Earth"; + }; + }; + + "test${n}RejectsSha1ByDefault" = testingThrow (f { } { sha1 = ""; }); + "test${n}RejectsSha512ByDefault" = testingThrow (f { } { sha512 = ""; }); + + "test${n}ThrowsOnMissing" = testingThrow (f { } { gibi = false; }); + }; +in +runTests (unionOfDisjoints [ + (genTests "NormalizeHash" normalizeHash) + (genTests "WithNormalized" ( + flip withNormalizedHash ({ outputHash, outputHashAlgo, ... }@args: args) + )) + { + testNormalizeNotRequiredEquivalent = { + expr = normalizeHash { required = false; } { + hash = ""; + prof = "shadoko"; + }; + expected = normalizeHash { } { + hash = ""; + prof = "shadoko"; + }; + }; + + testNormalizeNotRequiredPassthru = { + expr = normalizeHash { required = false; } { "ga bu" = "zo meu"; }; + expected."ga bu" = "zo meu"; + }; + + testOptionalArg = { + expr = withNormalizedHash { } ( + { + outputHash ? "", + outputHashAlgo ? null, + ... + }@args: + args + ) { author = "Jacques Rouxel"; }; + expected.author = "Jacques Rouxel"; + }; + + testOptionalArgMetadata = { + expr = functionArgs ( + withNormalizedHash { } ( + { + outputHash ? "", + outputHashAlgo ? null, + }: + { } + ) + ); + expected.hash = true; + }; + + testPreservesArgsMetadata = { + expr = functionArgs ( + withNormalizedHash { } ( + { + outputHash, + outputHashAlgo, + pumping ? true, + }: + { } + ) + ); + expected = { + hash = false; + pumping = true; + }; + }; + + testRejectsMissingHashArg = testingThrow (withNormalizedHash { } ({ outputHashAlgo }: { })); + testRejectsMissingAlgoArg = testingThrow (withNormalizedHash { } ({ outputHash }: { })); + } +]) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 7445c634558cc..116d86cdfb3fb 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -45,6 +45,7 @@ let const escapeXML evalModules + extends filter fix fold @@ -102,6 +103,7 @@ let take testAllTrue toBaseDigits + toExtension toHexString fromHexString toInt @@ -233,11 +235,6 @@ runTests { ]; }; - testFix = { - expr = fix (x: {a = if x ? a then "a" else "b";}); - expected = {a = "a";}; - }; - testComposeExtensions = { expr = let obj = makeExtensible (self: { foo = self.bar; }); f = self: super: { bar = false; baz = true; }; @@ -1237,6 +1234,28 @@ runTests { attrsToList { someFunc= a: a + 1;} ); +# FIXED-POINTS + + testFix = { + expr = fix (x: {a = if x ? a then "a" else "b";}); + expected = {a = "a";}; + }; + + testToExtension = { + expr = [ + (fix (final: { a = 0; c = final.a; })) + (fix (extends (toExtension { a = 1; b = 2; }) (final: { a = 0; c = final.a; }))) + (fix (extends (toExtension (prev: { a = 1; b = prev.a; })) (final: { a = 0; c = final.a; }))) + (fix (extends (toExtension (final: prev: { a = 1; b = prev.a; c = final.a + 1; })) (final: { a = 0; c = final.a; }))) + ]; + expected = [ + { a = 0; c = 0; } + { a = 1; b = 2; c = 1; } + { a = 1; b = 0; c = 1; } + { a = 1; b = 0; c = 2; } + ]; + }; + # GENERATORS # these tests assume attributes are converted to lists # in alphabetical order diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 09547b2e0e6c2..ad2ea44c361a4 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -294,6 +294,9 @@ checkConfigOutput '^"42"$' config.value ./declare-coerced-value.nix checkConfigOutput '^"24"$' config.value ./declare-coerced-value.nix ./define-value-string.nix checkConfigError 'A definition for option .* is not.*string or signed integer convertible to it.*. Definition values:\n\s*- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix +# Check coerced option merging. +checkConfigError 'The option .value. in .*/declare-coerced-value.nix. is already declared in .*/declare-coerced-value-no-default.nix.' config.value ./declare-coerced-value.nix ./declare-coerced-value-no-default.nix + # Check coerced value with unsound coercion checkConfigOutput '^12$' config.value ./declare-coerced-value-unsound.nix checkConfigError 'A definition for option .* is not of type .*. Definition values:\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix @@ -312,7 +315,7 @@ checkConfigOutput '^".*Hello.*"$' options.namedPackage.description ./declare-mkP checkConfigOutput '^"hello"$' config.pathPackage.pname ./declare-mkPackageOption.nix checkConfigOutput '^"pkgs\.hello\.override \{ stdenv = pkgs\.clangStdenv; \}"$' options.packageWithExample.example.text ./declare-mkPackageOption.nix checkConfigOutput '^".*Example extra description\..*"$' options.packageWithExtraDescription.description ./declare-mkPackageOption.nix -checkConfigError 'The option .undefinedPackage. is used but not defined' config.undefinedPackage ./declare-mkPackageOption.nix +checkConfigError 'The option .undefinedPackage. was accessed but has no value defined. Try setting the option.' config.undefinedPackage ./declare-mkPackageOption.nix checkConfigOutput '^null$' config.nullablePackage ./declare-mkPackageOption.nix checkConfigOutput '^"null or package"$' options.nullablePackageWithDefault.type.description ./declare-mkPackageOption.nix checkConfigOutput '^"myPkgs\.hello"$' options.packageWithPkgsText.defaultText.text ./declare-mkPackageOption.nix @@ -410,7 +413,7 @@ checkConfigOutput '^null$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep- checkConfigOutput '^"24"$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix ./define-value-string.nix # Check whether an freeform-typed value can depend on a declared option, this can only work with lazyAttrsOf checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix -checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix +checkConfigError 'The option .* was accessed but has no value defined. Try setting the option.' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix checkConfigOutput '^"24"$' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix # submodules in freeformTypes should have their locations annotated checkConfigOutput '/freeform-submodules.nix"$' config.fooDeclarations.0 ./freeform-submodules.nix @@ -426,8 +429,8 @@ checkConfigOutput '^null$' config.value.l1.l2.foo ./types-anything/nested-attrs. checkConfigOutput '^null$' config.value.l1.l2.l3.foo ./types-anything/nested-attrs.nix # Attribute sets that are coercible to strings shouldn't be recursed into checkConfigOutput '^"foo"$' config.value.outPath ./types-anything/attrs-coercible.nix -# Multiple lists aren't concatenated together -checkConfigError 'The option .* has conflicting definitions' config.value ./types-anything/lists.nix +# Multiple lists aren't concatenated together if their definitions are not equal +checkConfigError 'The option .* has conflicting definition values' config.value ./types-anything/lists.nix # Check that all equalizable atoms can be used as long as all definitions are equal checkConfigOutput '^0$' config.value.int ./types-anything/equal-atoms.nix checkConfigOutput '^false$' config.value.bool ./types-anything/equal-atoms.nix @@ -435,6 +438,7 @@ checkConfigOutput '^""$' config.value.string ./types-anything/equal-atoms.nix checkConfigOutput '^"/[^"]+"$' config.value.path ./types-anything/equal-atoms.nix checkConfigOutput '^null$' config.value.null ./types-anything/equal-atoms.nix checkConfigOutput '^0.1$' config.value.float ./types-anything/equal-atoms.nix +checkConfigOutput '^\[1,"a",{"x":null}\]$' config.value.list ./types-anything/equal-atoms.nix # Functions can't be merged together checkConfigError "The option .value.multiple-lambdas.. has conflicting option types" config.applied.multiple-lambdas ./types-anything/functions.nix checkConfigOutput '^true$' config.valueIsFunction.single-lambda ./types-anything/functions.nix @@ -469,8 +473,8 @@ checkConfigOutput "{}" config.attrs.a ./emptyValues.nix checkConfigOutput "null" config.null.a ./emptyValues.nix checkConfigOutput "{}" config.submodule.a ./emptyValues.nix # These types don't have empty values -checkConfigError 'The option .int.a. is used but not defined' config.int.a ./emptyValues.nix -checkConfigError 'The option .nonEmptyList.a. is used but not defined' config.nonEmptyList.a ./emptyValues.nix +checkConfigError 'The option .int.a. was accessed but has no value defined. Try setting the option.' config.int.a ./emptyValues.nix +checkConfigError 'The option .nonEmptyList.a. was accessed but has no value defined. Try setting the option.' config.nonEmptyList.a ./emptyValues.nix # types.unique # requires a single definition @@ -530,9 +534,10 @@ checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nix checkConfigError 'A submoduleWith option is declared multiple times with conflicting class values "darwin" and "nixos".' config.sub.mergeFail.config ./class-check.nix # _type check -checkConfigError 'Could not load a value as a module, because it is of type "flake", in file .*/module-imports-_type-check.nix' config.ok.config ./module-imports-_type-check.nix -checkConfigOutput '^true$' "$@" config.enable ./declare-enable.nix ./define-enable-with-top-level-mkIf.nix -checkConfigError 'Could not load a value as a module, because it is of type "configuration", in file .*/import-configuration.nix.*please only import the modules that make up the configuration.*' config ./import-configuration.nix +checkConfigError 'Expected a module, but found a value of type .*"flake".*, while trying to load a module into .*/module-imports-_type-check.nix' config.ok.config ./module-imports-_type-check.nix +checkConfigOutput '^true$' config.enable ./declare-enable.nix ./define-enable-with-top-level-mkIf.nix +checkConfigError 'Expected a module, but found a value of type .*"configuration".*, while trying to load a module into .*/import-configuration.nix.' config ./import-configuration.nix +checkConfigError 'please only import the modules that make up the configuration' config ./import-configuration.nix # doRename works when `warnings` does not exist. checkConfigOutput '^1234$' config.c.d.e ./doRename-basic.nix diff --git a/lib/tests/modules/declare-coerced-value-no-default.nix b/lib/tests/modules/declare-coerced-value-no-default.nix new file mode 100644 index 0000000000000..820913f920c35 --- /dev/null +++ b/lib/tests/modules/declare-coerced-value-no-default.nix @@ -0,0 +1,9 @@ +{ lib, ... }: + +{ + options = { + value = lib.mkOption { + type = lib.types.coercedTo lib.types.int builtins.toString lib.types.str; + }; + }; +} diff --git a/lib/tests/modules/types-anything/equal-atoms.nix b/lib/tests/modules/types-anything/equal-atoms.nix index 9925cfd608928..28d2b53ceee34 100644 --- a/lib/tests/modules/types-anything/equal-atoms.nix +++ b/lib/tests/modules/types-anything/equal-atoms.nix @@ -12,6 +12,7 @@ value.path = ./.; value.null = null; value.float = 0.1; + value.list = [1 "a" {x=null;}]; } { value.int = 0; @@ -20,6 +21,7 @@ value.path = ./.; value.null = null; value.float = 0.1; + value.list = [1 "a" {x=null;}]; } ]; diff --git a/lib/tests/modules/types-anything/lists.nix b/lib/tests/modules/types-anything/lists.nix index bd846afd3d185..21ca9d24f7a85 100644 --- a/lib/tests/modules/types-anything/lists.nix +++ b/lib/tests/modules/types-anything/lists.nix @@ -6,10 +6,10 @@ config = lib.mkMerge [ { - value = [ null ]; + value = [ "a value" ]; } { - value = [ null ]; + value = [ "another value" ]; } ]; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 03c5d68689624..f5e7bdd5b705b 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -96,6 +96,7 @@ lib.runTests ( canExecute = null; emulator = null; emulatorAvailable = null; + staticEmulatorAvailable = null; isCompatible = null; }?${platformAttrName}; }; diff --git a/lib/tests/test-with-nix.nix b/lib/tests/test-with-nix.nix index 63b4b10bae8c4..a6aee9859428a 100644 --- a/lib/tests/test-with-nix.nix +++ b/lib/tests/test-with-nix.nix @@ -17,6 +17,7 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" { buildInputs = [ (import ./check-eval.nix) + (import ./fetchers.nix) (import ./maintainers.nix { inherit pkgs; lib = import ../.; @@ -32,7 +33,7 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" { nativeBuildInputs = [ nix pkgs.gitMinimal - ] ++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools; + ] ++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.inotify-tools; strictDeps = true; } '' datadir="${nix}/share" diff --git a/lib/types.nix b/lib/types.nix index 8b1d19ff2c613..6c4a66c4e3c0b 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -253,12 +253,6 @@ rec { mergeFunction = { # Recursively merge attribute sets set = (attrsOf anything).merge; - # Safe and deterministic behavior for lists is to only accept one definition - # listOf only used to apply mkIf and co. - list = - if length defs > 1 - then throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}." - else (listOf anything).merge; # This is the type of packages, only accept a single definition stringCoercibleSet = mergeOneOption; lambda = loc: defs: arg: anything.merge @@ -1035,7 +1029,7 @@ rec { getSubOptions = finalType.getSubOptions; getSubModules = finalType.getSubModules; substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m); - typeMerge = t1: t2: null; + typeMerge = t: null; functor = (defaultFunctor name) // { wrapped = finalType; }; nestedTypes.coercedType = coercedType; nestedTypes.finalType = finalType; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 493e2848ddf03..a5603aebdca41 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -95,6 +95,11 @@ github = "0x120581f"; githubId = 130835755; }; + _0x3f = { + name = "0x3f"; + github = "0x3fiona"; + githubId = 178507884; + }; _0x4A6F = { email = "mail-maintainer@0x4A6F.dev"; matrix = "@0x4a6f:matrix.org"; @@ -238,6 +243,12 @@ github = "48cf"; githubId = 32851089; }; + _4ever2 = { + email = "eske@cs.au.dk"; + github = "4ever2"; + githubId = 3417013; + name = "Eske Nielsen"; + }; _6543 = { email = "6543@obermui.de"; github = "6543"; @@ -340,6 +351,12 @@ githubId = 22131756; name = "Aaqa Ishtyaq"; }; + aarnphm = { + email = "contact@aarnphm.xyz"; + github = "aarnphm"; + githubId = 29749331; + name = "Aaron Pham"; + }; aaronarinder = { email = "aaronarinder@gmail.com"; github = "aaronArinder"; @@ -731,6 +748,12 @@ githubId = 45179933; name = "Alex Jackson"; }; + ajgon = { + email = "igor@rzegocki.pl"; + github = "ajgon"; + githubId = 150545; + name = "Igor Rzegocki"; + }; ajgrf = { email = "a@ajgrf.com"; github = "ajgrf"; @@ -993,6 +1016,12 @@ githubId = 50754358; name = "Alex Winter"; }; + alfarel = { + email = "alfarelcynthesis@proton.me"; + github = "alfarelcynthesis"; + githubId = 104072649; + name = "Cynth"; + }; algram = { email = "aliasgram@gmail.com"; github = "Algram"; @@ -1005,12 +1034,6 @@ githubId = 30437811; name = "Alex Andrews"; }; - alibabzo = { - email = "alistair.bill@gmail.com"; - github = "alistairbill"; - githubId = 2822871; - name = "Alistair Bill"; - }; alirezameskin = { email = "alireza.meskin@gmail.com"; github = "alirezameskin"; @@ -1083,6 +1106,12 @@ githubId = 169249; name = "Alex Brandt"; }; + alx = { + email = "nix@alexgirard.com"; + github = "alx"; + githubId = 373; + name = "Alexandre Girard Davila"; + }; alxsimon = { email = "alexis.simon@normalesup.org"; github = "alxsimon"; @@ -1205,6 +1234,12 @@ githubId = 37040543; name = "Wroclaw"; }; + amuckstot30 = { + email = "amuckstot30@tutanota.com"; + github = "amuckstot30"; + githubId = 157274630; + name = "amuckstot30"; + }; amyipdev = { email = "amy@amyip.net"; github = "amyipdev"; @@ -1891,6 +1926,13 @@ githubId = 7745457; name = "Astavie"; }; + asterismono = { + email = "cmiki@amono.me"; + github = "AsterisMono"; + githubId = 54884471; + name = "Chatnoir Miki"; + matrix = "@mikiiki:matrix.org"; + }; astro = { email = "astro@spaceboyz.net"; github = "astro"; @@ -1992,12 +2034,25 @@ github = "Atry"; githubId = 601530; }; + attila = { + name = "Attila Oláh"; + email = "attila@dorn.haus"; + github = "attilaolah"; + githubId = 196617; + keys = [ { fingerprint = "BF2E 4759 74D3 88E0 E30C 9604 07E6 C064 3FD1 42C3"; } ]; + }; auchter = { name = "Michael Auchter"; email = "a@phire.org"; github = "auchter"; githubId = 1190483; }; + aucub = { + name = "aucub"; + email = "dr56ekgbb@mozmail.com"; + github = "aucub"; + githubId = 78630225; + }; augustebaum = { email = "auguste.apple@gmail.com"; github = "augustebaum"; @@ -2225,6 +2280,12 @@ github = "Baitinq"; githubId = 30861839; }; + baksa = { + email = "baksa@pm.me"; + name = "Kryštof Baksa"; + github = "Golbinex"; + githubId = 62813600; + }; balodja = { email = "balodja@gmail.com"; github = "balodja"; @@ -2255,6 +2316,12 @@ githubId = 80325; name = "Benjamin Andresen"; }; + banh-canh = { + email = "vhvictorhang@gmail.com"; + github = "Banh-Canh"; + githubId = 66330398; + name = "Victor Hang"; + }; barab-i = { email = "barab_i@outlook.com"; github = "barab-i"; @@ -2273,6 +2340,11 @@ github = "barinov274"; githubId = 54442153; }; + BarrOff = { + name = "BarrOff"; + github = "BarrOff"; + githubId = 58253563; + }; barrucadu = { email = "mike@barrucadu.co.uk"; github = "barrucadu"; @@ -2447,6 +2519,26 @@ github = "beezow"; githubId = 42082156; }; + ben9986 = { + name = "Ben Carmichael"; + email = "ben9986.unvmn@passinbox.com"; + github = "ben9986"; + githubId = 38633150; + keys = [ { fingerprint = "03C7 A587 74B3 F0E8 CE1F 4F8E ABBC DD77 69BC D3B0"; } ]; + }; + benaryorg = { + name = "benaryorg"; + email = "binary@benary.org"; + github = "benaryorg"; + githubId = 6145260; + keys = [ { fingerprint = "804B 6CB8 AED5 61D9 3DAD 4DC5 E2F2 2C5E DF20 119D"; } ]; + }; + benchand = { + name = "Ben Chand"; + email = "BenChand1995@gmail.com"; + github = "BenChand"; + githubId = 3618457; + }; bendlas = { email = "herwig@bendlas.net"; matrix = "@bendlas:matrix.org"; @@ -2594,6 +2686,13 @@ githubId = 7346933; name = "betaboon"; }; + beviu = { + name = "beviu"; + email = "nixpkgs@beviu.com"; + github = "beviu"; + githubId = 56923875; + keys = [ { fingerprint = "30D6 A755 E3C3 5797 CBBB 05B6 CD20 2E66 5CAD 7D06"; } ]; + }; bew = { email = "benoit.dechezelles@gmail.com"; github = "bew"; @@ -2666,6 +2765,13 @@ githubId = 19915050; name = "binarycat"; }; + binary-eater = { + email = "sergeantsagara@protonmail.com"; + github = "Binary-Eater"; + githubId = 10691440; + name = "Rahul Rameshbabu"; + keys = [ { fingerprint = "678A 8DF1 D9F2 B51B 7110 BE53 FF24 7B3E 5411 387B"; } ]; + }; binsky = { email = "timo@binsky.org"; github = "binsky08"; @@ -2683,6 +2789,12 @@ githubId = 10164833; name = "Birk Bohne"; }; + bjesus = { + email = "nixpkgs@yoavmoshe.com"; + github = "bjesus"; + githubId = 55081; + name = "Yo'av Moshe"; + }; bjornfor = { email = "bjorn.forsman@gmail.com"; github = "bjornfor"; @@ -2832,6 +2944,14 @@ githubId = 3229981; name = "Duncan Fairbanks"; }; + BonusPlay = { + name = "Bonus"; + email = "nixos@bonusplay.pl"; + matrix = "@bonus:bonusplay.pl"; + github = "BonusPlay"; + githubId = 8405359; + keys = [ { fingerprint = "8279 6487 A4CA 2A28 E8B3 3CD6 C7F9 9743 6A20 4683"; } ]; + }; booklearner = { name = "booklearner"; email = "booklearner@proton.me"; @@ -3035,7 +3155,7 @@ }; bryanhonof = { name = "Bryan Honof"; - email = "bryanhonof@gmail.com"; + email = "bryanhonof+nixpkgs@gmail.com"; github = "bryanhonof"; githubId = 5932804; }; @@ -3177,6 +3297,21 @@ { fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; } ]; }; + cageyv = { + email = "pingme@cageyv.dev"; + github = "cageyv"; + githubId = 51059484; + name = "Vladmir Samoylov"; + keys = [ + { fingerprint = "8916 F727 734E 77AB 437F A33A 19AB 76F5 CEE1 1392"; } + ]; + }; + CaiqueFigueiredo = { + email = "public@caiquefigueiredo.me"; + github = "caiquefigueiredo"; + githubId = 20440897; + name = "Caique"; + }; CaitlinDavitt = { email = "CaitlinDavitt@gmail.com"; github = "CaitlinDavitt"; @@ -3202,6 +3337,16 @@ githubId = 24193; name = "Dan Callahan"; }; + callumio = { + email = "git@cleslie.uk"; + github = "callumio"; + githubId = 16057677; + name = "Callum Leslie"; + keys = [ + { fingerprint = "BC82 4BB5 1656 D144 285E A0EC D382 C4AF EECE AA90"; } + { fingerprint = "890B 06FB 209A 3E44 9491 C028 03B0 1F42 7831 BCFD"; } + ]; + }; calvertvl = { email = "calvertvl@gmail.com"; github = "calvertvl"; @@ -3220,6 +3365,12 @@ githubId = 141733; name = "Andrew Bruce"; }; + camerondugan = { + email = "cameron.dugan@protonmail.com"; + github = "camerondugan"; + githubId = 54632731; + name = "Cameron Dugan"; + }; cameronfyfe = { email = "cameron.j.fyfe@gmail.com"; github = "cameronfyfe"; @@ -3336,6 +3487,12 @@ githubId = 5241813; name = "Carter Sande"; }; + casaca = { + name = "J McNutt"; + email = "jmacasac@hotmail.com"; + github = "casaca24"; + githubId = 87252279; + }; casey = { email = "casey@rodarmor.net"; github = "casey"; @@ -3536,6 +3693,12 @@ matrix = "@chayleaf:matrix.pavluk.org"; name = "Anna Pavlyuk"; }; + cheeseecake = { + email = "chanelnjw@gmail.com"; + github = "cheeseecake"; + githubId = 34784816; + name = "Chanel"; + }; chekoopa = { email = "chekoopa@mail.ru"; github = "chekoopa"; @@ -3958,6 +4121,12 @@ email = "jupiter@m.rdis.dev"; name = "Scott Little"; }; + codgician = { + email = "codgician@outlook.com"; + github = "codgician"; + githubId = 15964984; + name = "codgician"; + }; codifryed = { email = "gb@guyboldon.com"; name = "Guy Boldon"; @@ -4272,7 +4441,7 @@ keys = [ { fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; } ]; }; Cryolitia = { - name = "Beiyan Cryolitia"; + name = "Cryolitia PukNgae"; email = "Cryolitia@gmail.com"; github = "Cryolitia"; githubId = 23723294; @@ -4341,6 +4510,12 @@ keys = [ { fingerprint = "BBED 1B08 8CED 7F95 8917 FBE8 5004 F0FA D051 576D"; } ]; }; + cyewashish = { + name = "Cyewashish"; + email = "wawashish@cyekaivy.dev"; + github = "cyewashish"; + githubId = 180875322; + }; cynerd = { name = "Karel Kočí"; email = "cynerd@email.cz"; @@ -4467,6 +4642,12 @@ githubId = 24708079; name = "Dan Eads"; }; + danerieber = { + email = "danerieber@gmail.com"; + github = "danerieber"; + githubId = 6487079; + name = "Dane Rieber"; + }; danid3v = { email = "sch220233@spengergasse.at"; github = "DaniD3v"; @@ -4824,6 +5005,12 @@ name = "David Morgan"; keys = [ { fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2"; } ]; }; + deekahy = { + email = "Lennart.Diego.Kahn@gmail.com"; + github = "deekahy"; + githubId = 97156953; + name = "Lennart Diego Kahn"; + }; deemp = { email = "deempleton@gmail.com"; github = "deemp"; @@ -4855,6 +5042,12 @@ github = "definfo"; githubId = 66514911; }; + deftdawg = { + name = "DeftDawg"; + github = "deftdawg"; + email = "deftdawg@gmail.com"; + githubId = 4991612; + }; deifactor = { name = "Ash Zahlen"; email = "ext0l@riseup.net"; @@ -4931,6 +5124,12 @@ githubId = 62989; name = "Demyan Rogozhin"; }; + denperidge = { + email = "contact@denperidge.com"; + github = "denperidge"; + githubId = 27348469; + name = "Cat"; + }; derchris = { email = "derchris@me.com"; github = "derchrisuk"; @@ -5412,6 +5611,12 @@ name = "Misha Gusarov"; keys = [ { fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; } ]; }; + dottybot = { + name = "Scala Organization (dottybot)"; + email = "dottybot@groupes.epfl.ch"; + github = "dottybot"; + githubId = 12519979; + }; dpaetzel = { email = "david.paetzel@posteo.de"; github = "dpaetzel"; @@ -5636,6 +5841,12 @@ githubId = 6689924; name = "David Terry"; }; + dxwil = { + email = "dovydas@kersys.lt"; + github = "dxwil"; + githubId = 90563298; + name = "Dovydas Kersys"; + }; dylan-gonzalez = { email = "dylcg10@gmail.com"; github = "dylan-gonzalez"; @@ -5724,12 +5935,6 @@ githubId = 8146736; name = "Florentin Eckl"; }; - eclairevoyant = { - email = "contactmeongithubinstead@proton.me"; - github = "eclairevoyant"; - githubId = 848000; - name = "éclairevoyant"; - }; edanaher = { email = "nixos@edanaher.net"; github = "edanaher"; @@ -5773,6 +5978,14 @@ githubId = 119483; name = "Matthew Brown"; }; + edgar-vincent = { + name = "Edgar Vincent"; + email = "e-v@posteo.net"; + matrix = "@edgar.vincent:matrix.org"; + github = "edgar-vincent"; + githubId = 63352906; + keys = [ { fingerprint = "922F CA48 5FDB 20B1 ED1B A61F 284D 11D3 33C4 D21B"; } ]; + }; edlimerkaj = { name = "Edli Merkaj"; email = "edli.merkaj@identinet.io"; @@ -6415,6 +6628,13 @@ githubId = 195032; name = "Eric Evenchick"; }; + eveeifyeve = { + name = "Eveeifyeve"; + github = "eveeifyeve"; + githubId = 88671402; + matrix = "@eveeifyeve:matrix.org"; + email = "eveeg1971@gmail.com"; + }; evenbrenden = { email = "packages@anythingexternal.com"; github = "evenbrenden"; @@ -6751,6 +6971,12 @@ { fingerprint = "elY15tXap1tddxbBVoUoAioe1u0RDWti5rc9cauSmwo"; } ]; }; + figboy9 = { + email = "figboy9@tuta.io"; + github = "figboy9"; + githubId = 52276064; + name = "figboy9"; + }; figsoda = { email = "figsoda@pm.me"; matrix = "@figsoda:matrix.org"; @@ -6917,6 +7143,13 @@ githubId = 5918766; name = "Franz Thoma"; }; + fnune = { + email = "fausto.nunez@mailbox.org"; + github = "fnune"; + githubId = 16181067; + name = "Fausto Núñez Alberro"; + keys = [ { fingerprint = "668E 01D1 B129 3F42 0A0F 933A C880 6451 94A2 D562"; } ]; + }; foo-dogsquared = { email = "foodogsquared@foodogsquared.one"; github = "foo-dogsquared"; @@ -6975,6 +7208,12 @@ githubId = 1202014; name = "Falco Peijnenburg"; }; + fqidz = { + email = "faidz.arante@gmail.com"; + github = "fqidz"; + githubId = 82884264; + name = "Faidz Arante"; + }; fragamus = { email = "innovative.engineer@gmail.com"; github = "fragamus"; @@ -7994,6 +8233,12 @@ githubId = 1162118; name = "Harald Gliebe"; }; + hakan-demirli = { + email = "ehdemirli@proton.me"; + github = "hakan-demirli"; + githubId = 78746991; + name = "Emre Hakan Demirli"; + }; hakuch = { email = "hakuch@gmail.com"; github = "hakuch"; @@ -8012,6 +8257,12 @@ githubId = 1742172; name = "Hamish Hutchings"; }; + hamzaremmal = { + email = "hamza.remmal@epfl.ch"; + github = "hamzaremmal"; + githubId = 56235032; + name = "Hamza Remmal"; + }; hanemile = { email = "mail@emile.space"; github = "HanEmile"; @@ -8169,6 +8420,12 @@ githubId = 287769; name = "Sergii Paryzhskyi"; }; + hehongbo = { + name = "Hongbo"; + github = "hehongbo"; + githubId = 665472; + matrix = "@hehongbo:matrix.org"; + }; heijligen = { email = "src@posteo.de"; github = "heijligen"; @@ -8200,6 +8457,11 @@ githubId = 2405974; name = "Sébastian Méric de Bellefon"; }; + hellodword = { + github = "hellodword"; + githubId = 46193371; + name = "hellodword"; + }; hellwolf = { email = "zhicheng.miao@gmail.com"; github = "hellwolf"; @@ -8261,6 +8523,11 @@ githubId = 15121114; name = "Tom Herbers"; }; + herschenglime = { + github = "Herschenglime"; + githubId = 69494718; + name = "Herschenglime"; + }; hexa = { email = "hexa@darmstadt.ccc.de"; matrix = "@hexa:lossy.network"; @@ -8516,6 +8783,12 @@ githubId = 1592375; name = "Walter Huf"; }; + hughmandalidis = { + name = "Hugh Mandalidis"; + email = "mandalidis.hugh@gmail.com"; + github = "ThanePatrol"; + githubId = 23148089; + }; hughobrien = { email = "github@hughobrien.ie"; github = "hughobrien"; @@ -8932,6 +9205,12 @@ githubId = 54999; name = "Ariel Nunez"; }; + interdependence = { + email = "git@williamvandervalk.com"; + github = "interdependence"; + githubId = 45567423; + name = "William Vandervalk"; + }; Intuinewin = { email = "antoinelabarussias@gmail.com"; github = "Intuinewin"; @@ -8963,6 +9242,12 @@ githubId = 1817528; name = "Igor Polyakov"; }; + iosmanthus = { + email = "myosmanthustree@gmail.com"; + github = "iosmanthus"; + githubId = 16307070; + name = "iosmanthus"; + }; iquerejeta = { github = "iquerejeta"; githubId = 31273774; @@ -9007,6 +9292,12 @@ githubId = 13622947; keys = [ { fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293"; } ]; }; + istoph = { + email = "chr@istoph.de"; + name = "Christoph Hüffelmann"; + github = "istoph"; + githubId = 114227790; + }; ius = { email = "j.de.gram@gmail.com"; name = "Joerie de Gram"; @@ -9154,6 +9445,13 @@ github = "jacbart"; githubId = 7909687; }; + jacekpoz = { + name = "Jacek Poziemski"; + email = "jacekpoz@proton.me"; + matrix = "@jacekpoz:jacekpoz.pl"; + github = "jacekpoz"; + githubId = 64381190; + }; jacfal = { name = "Jakub Pravda"; email = "me@jakubpravda.net"; @@ -9694,6 +9992,11 @@ githubId = 1061229; name = "Jiehong Ma"; }; + jigglycrumb = { + github = "jigglycrumb"; + githubId = 1476865; + name = "jigglycrumb"; + }; jirkamarsik = { email = "jiri.marsik89@gmail.com"; github = "jirkamarsik"; @@ -9816,6 +10119,12 @@ { fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30"; } ]; }; + jmendyk = { + email = "jakub@ndyk.me"; + github = "JMendyk"; + githubId = 9089004; + name = "Jakub Mendyk"; + }; jmettes = { email = "jonathan@jmettes.com"; github = "jmettes"; @@ -10060,12 +10369,6 @@ githubId = 57130301; keys = [ { fingerprint = "1CC5 B67C EB9A 13A5 EDF6 F10E 0B4A 3662 FC58 9202"; } ]; }; - jonafato = { - email = "jon@jonafato.com"; - github = "jonafato"; - githubId = 392720; - name = "Jon Banafato"; - }; jonas-w = { email = "nixpkgs@03j.de"; github = "jonas-w"; @@ -10476,6 +10779,13 @@ githubId = 46386452; name = "Jeroen Wijenbergh"; }; + jwillikers = { + email = "jordan@jwillikers.com"; + github = "jwillikers"; + githubId = 19399197; + name = "Jordan Williams"; + keys = [ { fingerprint = "A6AB 406A F5F1 DE02 CEA3 B6F0 9FB4 2B0E 7F65 7D8C"; } ]; + }; jwygoda = { email = "jaroslaw@wygoda.me"; github = "jwygoda"; @@ -10742,13 +11052,6 @@ githubId = 8211181; name = "Kevin Kandlbinder"; }; - kfears = { - email = "kfearsoff@gmail.com"; - github = "KFearsoff"; - githubId = 66781795; - matrix = "@kfears:matrix.org"; - name = "KFears"; - }; kfollesdal = { email = "kfollesdal@gmail.com"; github = "kfollesdal"; @@ -10822,12 +11125,6 @@ githubId = 8798449; name = "kidsan"; }; - kierdavis = { - email = "kierdavis@gmail.com"; - github = "kierdavis"; - githubId = 845652; - name = "Kier Davis"; - }; kiike = { email = "me@enric.me"; github = "kiike"; @@ -11139,6 +11436,12 @@ githubId = 787421; name = "Kevin Quick"; }; + kraanzu = { + name = "Murli Tawari"; + email = "kraanzu@gmail.com"; + github = "kraanzu"; + githubId = 97718086; + }; kradalby = { name = "Kristoffer Dalby"; email = "kristoffer@dalby.cc"; @@ -11175,6 +11478,12 @@ githubId = 4032; name = "Kristoffer Thømt Ravneberg"; }; + kristianan = { + email = "kristian@krined.no"; + github = "KristianAN"; + githubId = 80984519; + name = "Kristian Alvestad Nedevold-Hansen"; + }; kristian-brucaj = { email = "kbrucaj@gmail.com"; github = "Flameslice"; @@ -11671,6 +11980,12 @@ githubId = 13804737; keys = [ { fingerprint = "7FE2 113A A08B 695A C8B8 DDE6 AE53 B4C2 E58E DD45"; } ]; }; + lgbishop = { + email = "lachlan.bishop@hotmail.com"; + github = "lgbishop"; + githubId = 125634066; + name = "Lachlan Bishop"; + }; lgcl = { email = "dev@lgcl.de"; name = "Leon Vack"; @@ -11991,12 +12306,10 @@ githubId = 4969294; name = "Louis Tim Larsen"; }; - loveisgrief = { - name = "LoveIsGrief"; - email = "loveisgrief@tuta.io"; - github = "LoveIsGrief"; - githubId = 2829538; - keys = [ { fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; } ]; + louis-thevenet = { + name = "Louis Thevenet"; + github = "louis-thevenet"; + githubId = 55986107; }; lovek323 = { email = "jason@oconal.id.au"; @@ -12063,6 +12376,12 @@ githubId = 8555953; name = "Laure Tavard"; }; + ltrump = { + email = "ltrump@163.com"; + github = "L-Trump"; + githubId = 37738631; + name = "Luo Chen"; + }; ltstf1re = { email = "ltstf1re@disroot.org"; github = "lsf1re"; @@ -12078,7 +12397,7 @@ name = "Luis Wirth"; }; luc65r = { - email = "lucas@ransan.tk"; + email = "lucas@ransan.fr"; github = "luc65r"; githubId = 59375051; name = "Lucas Ransan"; @@ -12108,6 +12427,12 @@ githubId = 15693688; name = "Lucas Eduardo Wendt"; }; + lucastso10 = { + email = "lucastso10@gmail.com"; + github = "lucastso10"; + githubId = 84486266; + name = "Lucas Teixeira Soares"; + }; lucc = { email = "lucc+nix@posteo.de"; github = "lucc"; @@ -12334,12 +12659,6 @@ githubId = 7910815; name = "Alex McGrath"; }; - lychee = { - email = "itslychee+nixpkgs@protonmail.com"; - githubId = 82718618; - github = "itslychee"; - name = "Lychee"; - }; lyndeno = { name = "Lyndon Sanche"; email = "lsanche@lyndeno.ca"; @@ -13105,6 +13424,12 @@ githubId = 10420834; name = "Mihai-Drosi Caju"; }; + mccartykim = { + email = "mccartykim@zoho.com"; + github = "mccartykim"; + githubId = 9851221; + name = "Kimberly McCarty"; + }; mccurdyc = { email = "mccurdyc22@gmail.com"; github = "mccurdyc"; @@ -13271,6 +13596,12 @@ github = "Mephistophiles"; githubId = 4850908; }; + merrkry = { + email = "merrkry@tsubasa.moe"; + name = "merrkry"; + github = "merrkry"; + githubId = 124278440; + }; mevatron = { email = "mevatron@gmail.com"; name = "mevatron"; @@ -13713,6 +14044,12 @@ githubId = 4587373; name = "Mitchell Nordine"; }; + mithicspirit = { + email = "rpc01234@gmail.com"; + github = "MithicSpirit"; + githubId = 24192522; + name = "MithicSpirit"; + }; mjanczyk = { email = "m@dragonvr.pl"; github = "mjanczyk"; @@ -13751,7 +14088,7 @@ name = "Maciej Kazulak"; }; mkez = { - email = "matias.zwinger+nix@protonmail.com"; + email = "matias+nix@zwinger.fi"; github = "mk3z"; githubId = 52108954; name = "Matias Zwinger"; @@ -13884,6 +14221,12 @@ githubId = 754512; name = "Mogria"; }; + mohe2015 = { + name = "Moritz Hedtke"; + email = "Moritz.Hedtke@t-online.de"; + github = "mohe2015"; + githubId = 13287984; + }; momeemt = { name = "Mutsuha Asada"; email = "me@momee.mt"; @@ -13961,6 +14304,12 @@ githubId = 42215704; name = "Moritz Böhme"; }; + mortenmunk = { + email = "mortenmunk97@gmail.com"; + github = "MortenMunk"; + githubId = 92527083; + name = "Morten Munk"; + }; MostAwesomeDude = { email = "cds@corbinsimpson.com"; github = "MostAwesomeDude"; @@ -14390,6 +14739,12 @@ githubId = 6709831; name = "Jake Hill"; }; + nartsiss = { + name = "Daniil Nartsissov"; + email = "nartsiss@proton.me"; + github = "nartsisss"; + githubId = 54633007; + }; nasageek = { github = "NasaGeek"; githubId = 474937; @@ -14430,6 +14785,13 @@ githubId = 818502; name = "Nathan Yong"; }; + natsukagami = { + email = "natsukagami@gmail.com"; + github = "natsukagami"; + githubId = 9061737; + name = "Natsu Kagami"; + keys = [ { fingerprint = "5581 26DC 886F E14D 501D B0F2 D6AD 7B57 A992 460C"; } ]; + }; natsukium = { email = "nixpkgs@natsukium.com"; github = "natsukium"; @@ -14949,6 +15311,11 @@ github = "noaccOS"; githubId = 24324352; }; + noahgitsham = { + name = "Noah Gitsham"; + github = "noahgitsham"; + githubId = 73707948; + }; nobbz = { name = "Norbert Melzer"; email = "timmelzer+nixpkgs@gmail.com"; @@ -15166,6 +15533,19 @@ githubId = 5047052; name = "Niclas Hirschfeld"; }; + nwjsmith = { + email = "nate@theinternate.com"; + github = "nwjsmith"; + githubId = 1348; + name = "Nate Smith"; + }; + nyabinary = { + name = "Niko Cantero"; + email = "nyanbinary@keemail.me"; + matrix = "@niko:conduit.rs"; + github = "nyabinary"; + githubId = 97130632; + }; nyadiia = { email = "nyadiia@pm.me"; github = "nyadiia"; @@ -15173,13 +15553,6 @@ name = "Nadia"; keys = [ { fingerprint = "6B51 E324 238A F455 2381 313A 9254 1B0C D2A9 3AD8"; } ]; }; - nyanbinary = { - email = "nyanbinary@keemail.me"; - matrix = "@niko:conduit.rs"; - github = "nyabinary"; - githubId = 97130632; - name = "Niko"; - }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; @@ -15231,6 +15604,12 @@ github = "o0th"; githubId = 22490354; }; + oakenshield = { + email = "nix@thorin.theoakenshield.com"; + github = "HritwikSinghal"; + githubId = 29531474; + name = "Hritwik Singhal"; + }; oaksoaj = { email = "oaksoaj@riseup.net"; name = "Oaksoaj"; @@ -15373,6 +15752,12 @@ githubId = 39134647; name = "Oliver Koss"; }; + oliver-ni = { + email = "nixos@oliver.ni"; + github = "oliver-ni"; + githubId = 20295134; + name = "Oliver Ni"; + }; ollieB = { github = "oliverbunting"; githubId = 1237862; @@ -15456,12 +15841,6 @@ github = "ony"; githubId = 11265; }; - oo-infty = { - name = "Justin Chen"; - email = "oo-infty@outlook.com"; - github = "oo-infty"; - githubId = 42143810; - }; ooliver1 = { name = "Oliver Wilkes"; email = "oliverwilkes2006@icloud.com"; @@ -15469,6 +15848,12 @@ githubId = 34910574; keys = [ { fingerprint = "D055 8A23 3947 B7A0 F966 B07F 0B41 0348 9833 7273"; } ]; }; + oosquare = { + name = "Justin Chen"; + email = "oosquare@outlook.com"; + github = "oosquare"; + githubId = 42143810; + }; opeik = { email = "sandro@stikic.com"; github = "opeik"; @@ -15631,6 +16016,12 @@ githubId = 5948762; name = "Berk Özkütük"; }; + ozwaldorf = { + email = "self@ossian.dev"; + github = "ozwaldorf"; + githubId = 8976745; + name = "Ossian Mapes"; + }; p3psi = { name = "Elliot Boo"; email = "p3psi.boo@gmail.com"; @@ -15789,6 +16180,12 @@ githubId = 4580157; name = "Patrick Hobusch"; }; + patka = { + email = "patka@patka.dev"; + github = "patka-123"; + githubId = 69802930; + name = "patka"; + }; patrickdag = { email = "patrick-nixos@failmail.dev"; github = "PatrickDaG"; @@ -16026,6 +16423,12 @@ githubId = 29493551; name = "Josh Peters"; }; + petertriho = { + email = "mail@petertriho.com"; + github = "petertriho"; + githubId = 7420227; + name = "Peter Tri Ho"; + }; peterwilli = { email = "peter@codebuffet.co"; github = "peterwilli"; @@ -16145,6 +16548,11 @@ githubId = 13309623; name = "Philipp Herzog"; }; + PhilVoel = { + github = "PhilVoel"; + githubId = 56931301; + name = "Philipp Völler"; + }; phip1611 = { email = "phip1611@gmail.com"; github = "phip1611"; @@ -16298,6 +16706,18 @@ githubId = 20472367; name = "Peter Hebden"; }; + pixelsergey = { + email = "sergey.ichtchenko@gmail.com"; + github = "PixelSergey"; + githubId = 14542417; + name = "Sergey Ichtchenko"; + }; + pizzapim = { + email = "pim@kunis.nl"; + github = "pizzapim"; + githubId = 23135512; + name = "Pim Kunis"; + }; pjbarnoy = { email = "pjbarnoy@gmail.com"; github = "waaamb"; @@ -16384,6 +16804,12 @@ githubId = 358550; name = "Philip Lykke Carlsen"; }; + plebhash = { + name = "plebhash"; + email = "plebhash@proton.me"; + github = "plebhash"; + githubId = 147345153; + }; pleshevskiy = { email = "dmitriy@pleshevski.ru"; github = "pleshevskiy"; @@ -16723,6 +17149,12 @@ githubId = 406946; name = "Valentin Lorentz"; }; + 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"; @@ -16917,6 +17349,12 @@ githubId = 315234; name = "Serge Bazanski"; }; + qaidvoid = { + email = "contact@qaidvoid.dev"; + github = "qaidvoid"; + githubId = 12017109; + name = "Rabindra Dhakal"; + }; qbit = { name = "Aaron Bieber"; email = "aaron@bolddaemon.com"; @@ -17005,6 +17443,12 @@ githubId = 1332289; name = "Quentin Machu"; }; + quincepie = { + email = "flaky@quincepie.dev"; + github = "Quince-Pie"; + githubId = 127546159; + name = "QuincePie"; + }; quinn-dougherty = { email = "quinnd@riseup.net"; github = "quinn-dougherty"; @@ -17062,6 +17506,12 @@ githubId = 131856; name = "Arnout Engelen"; }; + racci = { + name = "James Draycott"; + email = "me@racci.dev"; + github = "DaRacci"; + githubId = 90304606; + }; raehik = { email = "thefirstmuffinman@gmail.com"; github = "raehik"; @@ -17164,6 +17614,12 @@ githubId = 5653911; name = "Rampoina"; }; + rane = { + email = "rane+nix@junkyard.systems"; + github = "digitalrane"; + githubId = 1829286; + name = "Rane"; + }; ranfdev = { email = "ranfdev@gmail.com"; name = "Lorenzo Miglietta"; @@ -17450,6 +17906,13 @@ github = "renesat"; githubId = 11363539; }; + rennsax = { + name = "Bojun Ren"; + email = "bj.ren.coding@outlook.com"; + github = "rennsax"; + githubId = 93167100; + keys = [ { fingerprint = "9075 CEF8 9850 D261 6599 641A A2C9 36D5 B88C 139C"; } ]; + }; renzo = { email = "renzocarbonara@gmail.com"; github = "k0001"; @@ -17833,6 +18296,12 @@ githubId = 17805516; name = "Rohan Rao"; }; + rolfschr = { + email = "rolf.schr@posteo.de"; + github = "rolfschr"; + githubId = 1188465; + name = "Rolf Schröder"; + }; rollf = { email = "rolf.schroeder@limbus-medtec.com"; github = "rollf"; @@ -17895,12 +18364,6 @@ github = "rosehobgoblin"; githubId = 84164410; }; - roshaen = { - name = "Roshan Kumar"; - email = "roshaen09@gmail.com"; - github = "roshaen"; - githubId = 58213083; - }; RossComputerGuy = { name = "Tristan Ross"; email = "tristan.ross@midstall.com"; @@ -18035,6 +18498,11 @@ githubId = 56157634; name = "Ruben Hönle"; }; + rubikcubed = { + github = "rubikcubed"; + githubId = 91467402; + name = "rubikcubed"; + }; ruby0b = { github = "ruby0b"; githubId = 106119328; @@ -18388,6 +18856,13 @@ githubId = 34161949; keys = [ { fingerprint = "155C F413 0129 C058 9A5F 5524 3658 73F2 F0C6 153B"; } ]; }; + sanana = { + email = "asya@waifu.club"; + github = "AsyaTheAbove"; + githubId = 40492846; + keys = [ { fingerprint = "B766 7717 1644 5ABC DE82 94AA 4679 BF7D CC04 4783"; } ]; + name = "sanana the skenana"; + }; sander = { email = "s.vanderburg@tudelft.nl"; github = "svanderburg"; @@ -18431,6 +18906,13 @@ githubId = 695473; name = "Sascha Grunert"; }; + saturn745 = { + email = "git-commits.rk7uq@aleeas.com"; + github = "saturn745"; + githubId = 90934664; + name = "Saturn745"; + matrix = "@galaxyyy:matrix.org"; + }; saulecabrera = { name = "Saúl Cabrera"; email = "saulecabrera@gmail.com"; @@ -18579,6 +19061,12 @@ githubId = 11320; name = "Sergiu Ivanov"; }; + scraptux = { + email = "git@thomasjasny.de"; + github = "scraptux"; + githubId = 12714892; + name = "Thomas Jasny"; + }; screendriver = { email = "nix@echooff.de"; github = "screendriver"; @@ -19022,6 +19510,12 @@ github = "kf5grd"; githubId = 18297490; }; + shogo = { + email = "shouryagoel10000@gmail.com"; + github = "Sh0g0-1758"; + githubId = 114918019; + name = "Shourya Goel"; + }; shortcord = { name = "Short Cord"; email = "short@shortcord.com"; @@ -19275,6 +19769,13 @@ githubId = 158321; name = "Stewart Mackenzie"; }; + skeuchel = { + name = "Steven Keuchel"; + email = "steven.keuchel@gmail.com"; + github = "skeuchel"; + githubId = 617130; + keys = [ { fingerprint = "C4F7 46C7 B560 38D8 210F 0288 5877 DEE9 7428 557F"; } ]; + }; skovati = { github = "skovati"; githubId = 49844593; @@ -19502,11 +20003,11 @@ name = "Kylie McClain"; }; SomeoneSerge = { - email = "sergei.kozlukov@aalto.fi"; + email = "else+nixpkgs@someonex.net"; matrix = "@ss:someonex.net"; github = "SomeoneSerge"; githubId = 9720532; - name = "Sergei K"; + name = "Else Someone"; }; sontek = { email = "sontek@gmail.com"; @@ -19681,6 +20182,12 @@ github = "srounce"; githubId = 60792; }; + sshine = { + email = "simon@simonshine.dk"; + github = "sshine"; + githubId = 50879; + name = "Simon Shine"; + }; SShrike = { email = "severen@shrike.me"; github = "severen"; @@ -20347,6 +20854,11 @@ githubId = 156964; name = "Thomas Boerger"; }; + tbwanderer = { + github = "tbwanderer"; + githubId = 125365236; + name = "Ice Layer"; + }; tcbravo = { email = "tomas.bravo@protonmail.ch"; github = "tcbravo"; @@ -20514,9 +21026,15 @@ githubId = 27386; name = "Milan Svoboda"; }; + textshell = { + email = "textshell@uchuujin.de"; + github = "textshell"; + githubId = 6579711; + name = "Martin Hostettler"; + }; tfc = { email = "jacek@galowicz.de"; - matrix = "@jonge:ukvly.org"; + matrix = "@tfc:matrix.org"; github = "tfc"; githubId = 29044; name = "Jacek Galowicz"; @@ -20604,6 +21122,13 @@ githubId = 3512122; keys = [ { fingerprint = "5F29 132D EFA8 5DA0 B598 5BF2 5941 754C 1CDE 33BB"; } ]; }; + TheColorman = { + name = "colorman"; + email = "nixpkgs@colorman.me"; + github = "TheColorman"; + githubId = 18369995; + keys = [ { fingerprint = "3D8C A43C FBA2 5D28 0196 19F0 AB11 0475 B417 291D"; } ]; + }; thedavidmeister = { email = "thedavidmeister@gmail.com"; github = "thedavidmeister"; @@ -20927,6 +21452,14 @@ github = "tirimia"; githubId = 11174371; }; + titaniumtown = { + email = "titaniumtown@proton.me"; + name = "Simon Gardling"; + github = "titaniumtown"; + githubId = 11786225; + matrix = "@titaniumtown:envs.net"; + keys = [ { fingerprint = "D15E 4754 FE1A EDA1 5A6D 4702 9AB2 8AC1 0ECE 533D"; } ]; + }; tjni = { email = "43ngvg@masqt.com"; matrix = "@tni:matrix.org"; @@ -21279,12 +21812,25 @@ githubId = 4044033; name = "Thomas Sowell"; }; + ttrei = { + email = "reinis.taukulis@gmail.com"; + github = "ttrei"; + githubId = 27609929; + name = "Reinis Taukulis"; + }; ttuegel = { email = "ttuegel@mailbox.org"; github = "ttuegel"; githubId = 563054; name = "Thomas Tuegel"; }; + tudbut = { + name = "Daniella Hennig"; + email = "nixpkgs@mail.tudbut.de"; + matrix = "@tudbut:matrix.tudbut.de"; + github = "tudbut"; + githubId = 48156391; + }; tu-maurice = { email = "valentin.gehrke+nixpkgs@zom.bi"; github = "tu-maurice"; @@ -21378,6 +21924,11 @@ githubId = 1215104; keys = [ { fingerprint = "B1FD 4E2A 84B2 2379 F4BF 2EF5 FE33 A228 2371 E831"; } ]; }; + tyberius-prime = { + name = "Tyberius Prime"; + github = "TyberiusPrime"; + githubId = 1257580; + }; tylerjl = { email = "tyler+nixpkgs@langlois.to"; github = "tylerjl"; @@ -21433,6 +21984,13 @@ githubId = 12422133; name = "Chromo-residuum-opec"; }; + uku3lig = { + name = "uku"; + email = "hi@uku.moe"; + matrix = "@uku:m.uku.moe"; + github = "uku3lig"; + githubId = 61147779; + }; ulrikstrid = { email = "ulrik.strid@outlook.com"; github = "ulrikstrid"; @@ -21735,6 +22293,12 @@ github = "vector1dev"; githubId = 127302590; }; + vedantmgoyal9 = { + name = "Vedant Mohan Goyal"; + matrix = "@vedantmgoyal:beeper.com"; + github = "vedantmgoyal9"; + githubId = 83997633; + }; veehaitch = { name = "Vincent Haupert"; email = "mail@vincent-haupert.de"; @@ -22200,6 +22764,12 @@ githubId = 24979302; name = "Vladimír Zahradník"; }; + wgunderwood = { + email = "wg.underwood13@gmail.com"; + github = "WGUNDERWOOD"; + githubId = 42812654; + name = "William Underwood"; + }; wheelsandmetal = { email = "jakob@schmutz.co.uk"; github = "wheelsandmetal"; @@ -22564,12 +23134,24 @@ githubId = 529003; name = "Christine Dodrill"; }; + xeals = { + email = "dev@xeal.me"; + github = "xeals"; + githubId = 21125058; + name = "xeals"; + }; xeji = { email = "xeji@cat3.de"; github = "xeji"; githubId = 36407913; name = "Uli Baum"; }; + xelden = { + email = "anpiz@protonmail.com"; + github = "Xelden"; + githubId = 117323435; + name = "Andrés Pico"; + }; xfnw = { email = "xfnw+nixos@riseup.net"; github = "xfnw"; @@ -22890,6 +23472,12 @@ github = "YoshiRulz"; githubId = 13409956; }; + youhaveme9 = { + name = "Roshan Kumar"; + email = "roshaen09@gmail.com"; + github = "youhaveme9"; + githubId = 58213083; + }; yrashk = { email = "yrashk@gmail.com"; github = "yrashk"; @@ -23103,6 +23691,12 @@ github = "zbioe"; githubId = 7332055; }; + zebradil = { + email = "german.lashevich+nixpkgs@gmail.com"; + github = "zebradil"; + githubId = 1475583; + name = "German Lashevich"; + }; zebreus = { matrix = "@lennart:cicen.net"; email = "lennarteichhorn+nixpkgs@gmail.com"; @@ -23206,6 +23800,13 @@ githubId = 1108325; name = "Théo Zimmermann"; }; + zimward = { + name = "zimward"; + github = "zimward"; + githubId = 96021122; + matrix = "@memoryfragmentation:matrix.org"; + keys = [ { fingerprint = "CBF7 FA5E F4B5 8B68 5977 3E3E 4CAC 61D6 A482 FCD9"; } ]; + }; zlepper = { name = "Rasmus Hansen"; github = "zlepper"; diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md index 1af4715b05bec..44a5fc9bc5901 100644 --- a/maintainers/scripts/README.md +++ b/maintainers/scripts/README.md @@ -9,10 +9,6 @@ What follows is a (very incomplete) overview of available scripts. ## Metadata -### `check-by-name.sh` - -An alias for `pkgs/test/check-by-name/run-local.sh`, see [documentation](../../pkgs/test/check-by-name/README.md). - ### `get-maintainer.sh` `get-maintainer.sh [selector] value` returns a JSON object describing @@ -60,3 +56,16 @@ The maintainer is designated by a `selector` which must be one of: see [`maintainer-list.nix`] for the fields' definition. [`maintainer-list.nix`]: ../maintainer-list.nix + + +## Conventions + +### `sha-to-sri.py` + +`sha-to-sri.py path ...` (atomically) rewrites hash attributes (named `hash` or `sha(1|256|512)`) +into the SRI format: `hash = "{hash name}-{base64 encoded value}"`. + +`path` must point to either a nix file, or a directory which will be automatically traversed. + +`sha-to-sri.py` automatically skips files whose first non-empty line contains `generated by` or `do not edit`. +Moreover, when walking a directory tree, the script will skip files whose name is `yarn.nix` or contains `generated`. diff --git a/maintainers/scripts/build.nix b/maintainers/scripts/build.nix index ca401700b4a6e..0783651df8f41 100644 --- a/maintainers/scripts/build.nix +++ b/maintainers/scripts/build.nix @@ -12,7 +12,27 @@ # nix-build build.nix --argstr maintainer --argstr system aarch64-linux let - pkgs = import ./../../default.nix (removeAttrs args [ "maintainer" ]); + # This avoids a common situation for maintainers, where due to Git's behavior of not tracking + # directories, they have an empty directory somewhere in `pkgs/by-name`. Because that directory + # exists, `pkgs/top-level/by-name-overlay.nix` picks it up and attempts to read `package.nix` out + # of it... which doesn't exist, since it's empty. + # + # We don't want to run the code below on every instantiation of `nixpkgs`, as the `pkgs/by-name` + # eval machinery is quite performance sensitive. So we use the internals of the `by-name` overlay + # to implement our own way to avoid an evaluation failure for this script. + # + # See for more motivation for this code block. + overlay = self: super: { + _internalCallByNamePackageFile = + file: if builtins.pathExists file then super._internalCallByNamePackageFile file else null; + }; + + nixpkgsArgs = removeAttrs args [ "maintainer" "overlays" ] // { + overlays = args.overlays or [] ++ [ overlay ]; + }; + + pkgs = import ./../../default.nix nixpkgsArgs; + maintainer_ = pkgs.lib.maintainers.${maintainer}; packagesWith = cond: return: set: (pkgs.lib.flatten diff --git a/maintainers/scripts/check-by-name.sh b/maintainers/scripts/check-by-name.sh index d267ed9352a0c..bb24eb6878c0a 120000 --- a/maintainers/scripts/check-by-name.sh +++ b/maintainers/scripts/check-by-name.sh @@ -1 +1 @@ -../../pkgs/test/check-by-name/run-local.sh \ No newline at end of file +../../ci/nixpkgs-vet.sh \ No newline at end of file diff --git a/maintainers/scripts/convert-to-import-cargo-lock/shell.nix b/maintainers/scripts/convert-to-import-cargo-lock/shell.nix index fc2e2348309d7..2938cf2d0c0b2 100644 --- a/maintainers/scripts/convert-to-import-cargo-lock/shell.nix +++ b/maintainers/scripts/convert-to-import-cargo-lock/shell.nix @@ -13,5 +13,5 @@ mkShell { clippy rustfmt ] - ++ lib.optional stdenv.isDarwin pkgs.libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv; } diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index 4f43710997f44..e107e00fb71d3 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -16,7 +16,7 @@ LEAF_TEMPLATE = jinja2.Template(''' -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "{{ pname }}"; } @@ -25,7 +25,7 @@ ROOT_TEMPLATE = jinja2.Template(''' {callPackage}: { {%- for p in packages %} - {{ p }} = callPackage ./{{ p }} {}; + {{ p }} = callPackage ./{{ p }} { }; {%- endfor %} } '''.strip()); @@ -75,7 +75,7 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st "gear": "releases", "plasma": "plasma", }[set] - sources_url = f"https://kde.org/info/sources/source-{set_url}-{version}.html" + sources_url = f"https://kde.org/info/sources/source-{set_url}-{version}/" sources = httpx.get(sources_url) sources.raise_for_status() diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 8ad34173bb0dc..f502e569aa438 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -45,6 +45,7 @@ lpeglabel,,,,1.6.0,, lrexlib-gnu,,,,,, lrexlib-pcre,,,,,,vyp lrexlib-posix,,,,,, +lsp-progress.nvim,,,,,,gepbird lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, @@ -104,6 +105,7 @@ luv,,,,1.48.0-2,, lush.nvim,,,https://luarocks.org/dev,,,teto lyaml,,,,,,lblasc lz.n,,,,,,mrcjkb +lze,,,,,,birdee lzn-auto-require,,,,,,mrcjkb magick,,,,,5.1,donovanglover markdown,,,,,, @@ -112,6 +114,7 @@ middleclass,,,,,, mimetypes,,,,,, mpack,,,,,, moonscript,https://raw.githubusercontent.com/leafo/moonscript/master/moonscript-dev-1.rockspec,,,,,arobyn +neorg,,,,,,GaetanLepage neotest,,,,,,mrcjkb nlua,,,,,,teto nui.nvim,,,,,,mrcjkb diff --git a/maintainers/scripts/pluginupdate-py/__init__.py b/maintainers/scripts/pluginupdate-py/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate-py/pluginupdate.py similarity index 100% rename from maintainers/scripts/pluginupdate.py rename to maintainers/scripts/pluginupdate-py/pluginupdate.py diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py index 1af7ff215ad33..bb02a84e7cac6 100755 --- a/maintainers/scripts/sha-to-sri.py +++ b/maintainers/scripts/sha-to-sri.py @@ -1,13 +1,13 @@ #!/usr/bin/env nix-shell #! nix-shell -i "python3 -I" -p "python3.withPackages(p: with p; [ rich structlog ])" -from abc import ABC, abstractclassmethod, abstractmethod +from abc import ABC, abstractmethod from contextlib import contextmanager from pathlib import Path from structlog.contextvars import bound_contextvars as log_context from typing import ClassVar, List, Tuple -import hashlib, re, structlog +import hashlib, logging, re, structlog logger = structlog.getLogger("sha-to-SRI") @@ -26,11 +26,12 @@ def toSRI(self, s: str) -> str: assert len(digest) == self.n from base64 import b64encode + return f"{self.hashName}-{b64encode(digest).decode()}" @classmethod - def all(cls, h) -> 'List[Encoding]': - return [ c(h) for c in cls.__subclasses__() ] + def all(cls, h) -> "List[Encoding]": + return [c(h) for c in cls.__subclasses__()] def __init__(self, h): self.n = h.digest_size @@ -38,54 +39,56 @@ def __init__(self, h): @property @abstractmethod - def length(self) -> int: - ... + def length(self) -> int: ... @property def regex(self) -> str: return f"[{self.alphabet}]{{{self.length}}}" @abstractmethod - def decode(self, s: str) -> bytes: - ... + def decode(self, s: str) -> bytes: ... class Nix32(Encoding): alphabet = "0123456789abcdfghijklmnpqrsvwxyz" - inverted = { c: i for i, c in enumerate(alphabet) } + inverted = {c: i for i, c in enumerate(alphabet)} @property def length(self): return 1 + (8 * self.n) // 5 + def decode(self, s: str): assert len(s) == self.length - out = [ 0 for _ in range(self.n) ] - # TODO: Do better than a list of byte-sized ints + out = bytearray(self.n) for n, c in enumerate(reversed(s)): digit = self.inverted[c] i, j = divmod(5 * n, 8) - out[i] = out[i] | (digit << j) & 0xff + out[i] = out[i] | (digit << j) & 0xFF rem = digit >> (8 - j) if rem == 0: continue elif i < self.n: - out[i+1] = rem + out[i + 1] = rem else: raise ValueError(f"Invalid nix32 hash: '{s}'") return bytes(out) + class Hex(Encoding): alphabet = "0-9A-Fa-f" @property def length(self): return 2 * self.n + def decode(self, s: str): from binascii import unhexlify + return unhexlify(s) + class Base64(Encoding): alphabet = "A-Za-z0-9+/" @@ -94,36 +97,39 @@ def format(self) -> Tuple[int, int]: """Number of characters in data and padding.""" i, k = divmod(self.n, 3) return 4 * i + (0 if k == 0 else k + 1), (3 - k) % 3 + @property def length(self): return sum(self.format) + @property def regex(self): data, padding = self.format return f"[{self.alphabet}]{{{data}}}={{{padding}}}" + def decode(self, s): from base64 import b64decode + return b64decode(s, validate = True) -_HASHES = (hashlib.new(n) for n in ('SHA-256', 'SHA-512')) -ENCODINGS = { - h.name: Encoding.all(h) - for h in _HASHES -} +_HASHES = (hashlib.new(n) for n in ("SHA-256", "SHA-512")) +ENCODINGS = {h.name: Encoding.all(h) for h in _HASHES} RE = { h: "|".join( - (f"({h}-)?" if e.name == 'base64' else '') + - f"(?P<{h}_{e.name}>{e.regex})" + (f"({h}-)?" if e.name == "base64" else "") + f"(?P<{h}_{e.name}>{e.regex})" for e in encodings - ) for h, encodings in ENCODINGS.items() + ) + for h, encodings in ENCODINGS.items() } -_DEF_RE = re.compile("|".join( - f"(?P<{h}>{h} = (?P<{h}_quote>['\"])({re})(?P={h}_quote);)" - for h, re in RE.items() -)) +_DEF_RE = re.compile( + "|".join( + f"(?P<{h}>{h} = (?P<{h}_quote>['\"])({re})(?P={h}_quote);)" + for h, re in RE.items() + ) +) def defToSRI(s: str) -> str: @@ -153,7 +159,7 @@ def f(m: re.Match[str]) -> str: @contextmanager def atomicFileUpdate(target: Path): - '''Atomically replace the contents of a file. + """Atomically replace the contents of a file. Guarantees that no temporary files are left behind, and `target` is either left untouched, or overwritten with new content if no exception was raised. @@ -164,18 +170,20 @@ def atomicFileUpdate(target: Path): Upon exiting the context, the files are closed; if no exception was raised, `new` (atomically) replaces the `target`, otherwise it is deleted. - ''' + """ # That's mostly copied from noto-emoji.py, should DRY it out - from tempfile import mkstemp - fd, _p = mkstemp( - dir = target.parent, - prefix = target.name, - ) - tmpPath = Path(_p) + from tempfile import NamedTemporaryFile try: with target.open() as original: - with tmpPath.open('w') as new: + with NamedTemporaryFile( + dir = target.parent, + prefix = target.stem, + suffix = target.suffix, + delete = False, + mode="w", # otherwise the file would be opened in binary mode by default + ) as new: + tmpPath = Path(new.name) yield (original, new) tmpPath.replace(target) @@ -188,37 +196,35 @@ def atomicFileUpdate(target: Path): def fileToSRI(p: Path): with atomicFileUpdate(p) as (og, new): for i, line in enumerate(og): - with log_context(line=i): + with log_context(line = i): new.write(defToSRI(line)) -_SKIP_RE = re.compile( - "(generated by)|(do not edit)", - re.IGNORECASE -) +_SKIP_RE = re.compile("(generated by)|(do not edit)", re.IGNORECASE) +_IGNORE = frozenset({ + "gemset.nix", + "yarn.nix", +}) if __name__ == "__main__": - from sys import argv, stderr + from sys import argv + logger.info("Starting!") - for arg in argv[1:]: - p = Path(arg) - with log_context(path=str(p)): + def handleFile(p: Path, skipLevel = logging.INFO): + with log_context(file = str(p)): try: - if p.name == "yarn.nix" or p.name.find("generated") != -1: - logger.warning("File looks autogenerated, skipping!") - continue - with p.open() as f: for line in f: if line.strip(): break if _SKIP_RE.search(line): - logger.warning("File looks autogenerated, skipping!") - continue + logger.log(skipLevel, "File looks autogenerated, skipping!") + return fileToSRI(p) + except Exception as exn: logger.error( "Unhandled exception, skipping file!", @@ -226,3 +232,19 @@ def fileToSRI(p: Path): ) else: logger.info("Finished processing file") + + for arg in argv[1:]: + p = Path(arg) + with log_context(arg = arg): + if p.is_file(): + handleFile(p, skipLevel = logging.WARNING) + + elif p.is_dir(): + logger.info("Recursing into directory") + for q in p.glob("**/*.nix"): + if q.is_file(): + if q.name in _IGNORE or q.name.find("generated") != -1: + logger.info("File looks autogenerated, skipping!") + continue + + handleFile(q) diff --git a/maintainers/scripts/update-dotnet-lockfiles.nix b/maintainers/scripts/update-dotnet-lockfiles.nix index 22ceff1ffa996..f9db675418d56 100644 --- a/maintainers/scripts/update-dotnet-lockfiles.nix +++ b/maintainers/scripts/update-dotnet-lockfiles.nix @@ -9,36 +9,40 @@ infrastructure. Regular updates should be done through the individual packages update scripts. */ +{ startWith ? null }: let - pkgs = import ../.. {}; + pkgs = import ../.. { config.allowAliases = false; }; inherit (pkgs) lib; packagesWith = cond: pkgs: let packagesWithInner = attrs: - lib.unique ( - lib.concatLists ( - lib.mapAttrsToList (name: elem: - let - result = builtins.tryEval elem; - in - if result.success then - let - value = result.value; - in - if lib.isDerivation value then - lib.optional (cond value) value - else - if lib.isAttrs value && (value.recurseForDerivations or false || value.recurseForRelease or false) then - packagesWithInner value - else [] - else []) attrs)); + lib.concatLists ( + lib.mapAttrsToList (name: elem: + let + result = builtins.tryEval elem; + in + if result.success then + let + value = result.value; + in + if lib.isDerivation value then + lib.optional (cond value) value + else + if lib.isAttrs value && (value.recurseForDerivations or false || value.recurseForRelease or false) then + packagesWithInner value + else [] + else []) attrs); in packagesWithInner pkgs; - packages = - packagesWith (pkgs: pkgs ? fetch-deps) pkgs; + packages = lib.unique + (lib.filter (p: + (builtins.tryEval p.outPath).success || + builtins.trace "warning: skipping ${p.name} because it failed to evaluate" false) + ((pkgs: (lib.drop (lib.lists.findFirstIndex (p: p.name == startWith) 0 pkgs) pkgs)) + (packagesWith (p: p ? fetch-deps) pkgs))); helpText = '' Please run: diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix old mode 100755 new mode 100644 diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index d304498ec5937..546c944e0c53f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -183,6 +183,16 @@ with lib.maintainers; githubTeams = [ "cuda-maintainers" ]; }; + cyberus = { + # Verify additions by approval of an already existing member of the team. + members = [ + xanderio + blitz + ]; + scope = "Team for Cyberus Technology employees who collectively maintain packages."; + shortName = "Cyberus Technology employees"; + }; + darwin = { members = [ toonn ]; githubTeams = [ "darwin-maintainers" ]; @@ -555,6 +565,7 @@ with lib.maintainers; linux-kernel = { members = [ TredwellGit + k900 ma27 nequissimus qyliss @@ -753,6 +764,7 @@ with lib.maintainers; members = [ SuperSandro2000 anthonyroussel + vinetos ]; scope = "Maintain the ecosystem around OpenStack"; shortName = "OpenStack"; @@ -941,7 +953,6 @@ with lib.maintainers; steam = { members = [ atemu - eclairevoyant k900 mkg20001 ]; @@ -1011,6 +1022,19 @@ with lib.maintainers; shortName = "WDZ GmbH"; }; + xen = { + members = [ + hehongbo + lach + rane + sigmasquadron + ]; + scope = "Maintain the Xen Project Hypervisor and the related tooling ecosystem."; + shortName = "Xen Project Hypervisor"; + enableFeatureFreezePing = true; + githubTeams = [ "xen-project" ]; + }; + xfce = { members = [ bobby285271 diff --git a/nixos/README.md b/nixos/README.md index 5f751e10e20a0..2261803f4e7d4 100644 --- a/nixos/README.md +++ b/nixos/README.md @@ -80,6 +80,7 @@ Reviewing process: - Ensure that all file paths [fit the guidelines](../CONTRIBUTING.md#file-naming-and-organisation). - Ensure that the module tests, if any, are succeeding. +- Ensure that new module tests are added to the package `passthru.tests`. - Ensure that the introduced options are correct. - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated). - Description, default and example should be provided. @@ -95,7 +96,8 @@ Sample template for a new module review is provided below. ##### Reviewed points - [ ] module path fits the guidelines -- [ ] module tests succeed on ARCHITECTURE +- [ ] module tests, if any, succeed on ARCHITECTURE +- [ ] module tests, if any, are added to package `passthru.tests` - [ ] options have appropriate types - [ ] options have default - [ ] options have example diff --git a/nixos/doc/manual/configuration/linux-kernel.chapter.md b/nixos/doc/manual/configuration/linux-kernel.chapter.md index 3bc97446f452c..4aeda5f46764e 100644 --- a/nixos/doc/manual/configuration/linux-kernel.chapter.md +++ b/nixos/doc/manual/configuration/linux-kernel.chapter.md @@ -133,20 +133,3 @@ This section was moved to the [Nixpkgs manual](https://nixos.org/nixpkgs/manual# It's a common issue that the latest stable version of ZFS doesn't support the latest available Linux kernel. It is recommended to use the latest available LTS that's compatible with ZFS. Usually this is the default kernel provided by nixpkgs (i.e. `pkgs.linuxPackages`). - -Alternatively, it's possible to pin the system to the latest available kernel -version _that is supported by ZFS_ like this: - -```nix -{ - boot.kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages; -} -``` - -Please note that the version this attribute points to isn't monotonic because the latest kernel -version only refers to kernel versions supported by the Linux developers. In other words, -the latest kernel version that ZFS is compatible with may decrease over time. - -An example: the latest version ZFS is compatible with is 5.19 which is a non-longterm version. When 5.19 -is out of maintenance, the latest supported kernel version is 5.15 because it's longterm and the versions -5.16, 5.17 and 5.18 are already out of maintenance because they're non-longterm. diff --git a/nixos/doc/manual/configuration/profiles/minimal.section.md b/nixos/doc/manual/configuration/profiles/minimal.section.md index 76d9585a0bd3c..5b72112477f71 100644 --- a/nixos/doc/manual/configuration/profiles/minimal.section.md +++ b/nixos/doc/manual/configuration/profiles/minimal.section.md @@ -1,8 +1,6 @@ # Minimal {#sec-profile-minimal} This profile defines a small NixOS configuration. It does not contain any -graphical stuff. It's a very short file that enables -[noXlibs](#opt-environment.noXlibs), sets -[](#opt-i18n.supportedLocales) to -only support the user-selected locale, -and [disables packages' documentation](#opt-documentation.enable). +graphical stuff. It's a very short file that sets [](#opt-i18n.supportedLocales) +to only support the user-selected locale, and +[disables packages' documentation](#opt-documentation.enable). diff --git a/nixos/doc/manual/configuration/profiles/perlless.section.md b/nixos/doc/manual/configuration/profiles/perlless.section.md index bf055971cfc42..9ee70ed3b49c5 100644 --- a/nixos/doc/manual/configuration/profiles/perlless.section.md +++ b/nixos/doc/manual/configuration/profiles/perlless.section.md @@ -1,11 +1,5 @@ # Perlless {#sec-perlless} -::: {.warning} -If you enable this profile, you will NOT be able to switch to a new -configuration and thus you will not be able to rebuild your system with -nixos-rebuild! -::: - Render your system completely perlless (i.e. without the perl interpreter). This includes a mechanism so that your build fails if it contains a Nix store path that references the string "perl". diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index cedc82d32f89a..48cc62bb424c0 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -46,6 +46,237 @@ have a predefined type and string generator already declared under `generate` to build a Java `.properties` file, taking care of the correct escaping, etc. +`pkgs.formats.hocon` { *`generator`* ? ``, *`validator`* ? ``, *`doCheck`* ? true } + +: A function taking an attribute set with values + + `generator` + + : A derivation used for converting the JSON output + from the nix settings into HOCON. This might be + useful if your HOCON variant is slightly different + from the java-based one, or for testing purposes. + + `validator` + + : A derivation used for verifying that the HOCON + output is correct and parsable. This might be + useful if your HOCON variant is slightly different + from the java-based one, or for testing purposes. + + `doCheck` + + : Whether to enable/disable the validator check. + + It returns an attrset with a `type`, `generate` function, + and a `lib` attset, as specified [below](#pkgs-formats-result). + Some of the lib functions will be best understood if you have + read the reference specification. You can find this + specification here: + + + + Inside of `lib`, you will find these functions + + `mkInclude` + + : This is used together with a specially named + attribute `includes`, to include other HOCON + sources into the document. + + The function has a shorthand variant where it + is up to the HOCON parser to figure out what type + of include is being used. The include will default + to being non-required. If you want to be more + explicit about the details of the include, you can + provide an attrset with following arguments + + `required` + + : Whether the parser should fail upon failure + to include the document + + `type` + + : Type of the source of the included document. + Valid values are `file`, `url` and `classpath`. + See upstream documentation for the semantics + behind each value + + `value` + + : The URI/path/classpath pointing to the source of + the document to be included. + + `Example usage:` + + ```nix + let + format = pkgs.formats.hocon { }; + hocon_file = pkgs.writeText "to_include.hocon" '' + a = 1; + ''; + in { + some.nested.hocon.attrset = { + _includes = [ + (format.lib.mkInclude hocon_file) + (format.lib.mkInclude "https://example.com/to_include.hocon") + (format.lib.mkInclude { + required = true; + type = "file"; + value = include_file; + }) + ]; + ... + }; + } + ``` + + `mkAppend` + + : This is used to invoke the `+=` operator. + This can be useful if you need to add something + to a list that is included from outside of nix. + See upstream documentation for the semantics + behind the `+=` operation. + + `Example usage:` + + ```nix + let + format = pkgs.formats.hocon { }; + hocon_file = pkgs.writeText "to_include.hocon" '' + a = [ 1 ]; + b = [ 2 ]; + ''; + in { + _includes = [ + (format.lib.mkInclude hocon_file) + ]; + + c = 3; + a = format.lib.mkAppend 3; + b = format.lib.mkAppend (format.lib.mkSubstitution "c"); + } + ``` + + `mkSubstitution` + + : This is used to make HOCON substitutions. + Similarly to `mkInclude`, this function has + a shorthand variant where you just give it + the string with the substitution value. + The substitution is not optional by default. + Alternatively, you can provide an attrset + with more options + + `optional` + + : Whether the parser should fail upon + failure to fetch the substitution value. + + `value` + + : The name of the variable to use for + substitution. + + See upstream documentation for semantics + behind the substitution functionality. + + `Example usage:` + + ```nix + let + format = pkgs.formats.hocon { }; + in { + a = 1; + b = format.lib.mkSubstitution "a"; + c = format.lib.mkSubstition "SOME_ENVVAR"; + d = format.lib.mkSubstition { + value = "SOME_OPTIONAL_ENVVAR"; + optional = true; + }; + } + ``` + + `Implementation notes:` + + - classpath includes are not implemented in pyhocon, + which is used for validating the HOCON output. This + means that if you are using classpath includes, + you will want to either use an alternative validator + or set `doCheck = false` in the format options. + +`pkgs.formats.libconfig` { *`generator`* ? ``, *`validator`* ? `` } + +: A function taking an attribute set with values + + `generator` + + : A derivation used for converting the JSON output + from the nix settings into libconfig. This might be + useful if your libconfig variant is slightly different + from the original one, or for testing purposes. + + `validator` + + : A derivation used for verifying that the libconfig + output is correct and parsable. This might be + useful if your libconfig variant is slightly different + from the original one, or for testing purposes. + + It returns an attrset with a `type`, `generate` function, + and a `lib` attset, as specified [below](#pkgs-formats-result). + Some of the lib functions will be best understood if you have + read the reference specification. You can find this + specification here: + + + + Inside of `lib`, you will find these functions + + `mkHex`, `mkOctal`, `mkFloat` + + : Use these to specify numbers in other formats. + + `Example usage:` + + ```nix + let + format = pkgs.formats.libconfig { }; + in { + myHexValue = format.lib.mkHex "0x1FC3"; + myOctalValue = format.lib.mkOctal "0027"; + myFloatValue = format.lib.mkFloat "1.2E-3"; + } + ``` + + `mkArray`, `mkList` + + : Use these to differentiate between whether + a nix list should be considered as a libconfig + array or a libconfig list. See the upstream + documentation for the semantics behind these types. + + `Example usage:` + + ```nix + let + format = pkgs.formats.libconfig { }; + in { + myList = format.lib.mkList [ "foo" 1 true ]; + myArray = format.lib.mkArray [ 1 2 3 ]; + } + ``` + + `Implementation notes:` + + - Since libconfig does not allow setting names to start with an underscore, + this is used as a prefix for both special types and include directives. + + - The difference between 32bit and 64bit values became optional in libconfig + 1.5, so we assume 64bit values for all numbers. + `pkgs.formats.json` { } : A function taking an empty attribute set (for future extensibility) diff --git a/nixos/doc/manual/development/testing-installer.chapter.md b/nixos/doc/manual/development/testing-installer.chapter.md index 2eaa01614920e..92c759a8559a5 100644 --- a/nixos/doc/manual/development/testing-installer.chapter.md +++ b/nixos/doc/manual/development/testing-installer.chapter.md @@ -6,13 +6,13 @@ tedious, so here is a quick way to see if the installer works properly: ```ShellSession # mount -t tmpfs none /mnt # nixos-generate-config --root /mnt -$ nix-build '' -A config.system.build.nixos-install +$ nix-build '' -A nixos-install # ./result/bin/nixos-install ``` To start a login shell in the new NixOS installation in `/mnt`: ```ShellSession -$ nix-build '' -A config.system.build.nixos-enter +$ nix-build '' -A nixos-enter # ./result/bin/nixos-enter ``` diff --git a/nixos/doc/manual/installation/changing-config.chapter.md b/nixos/doc/manual/installation/changing-config.chapter.md index 07a0074d17e7b..192696b741719 100644 --- a/nixos/doc/manual/installation/changing-config.chapter.md +++ b/nixos/doc/manual/installation/changing-config.chapter.md @@ -5,12 +5,13 @@ configuration of your machine. Whenever you've [changed something](#ch-configuration) in that file, you should do ```ShellSession -# nixos-rebuild switch +$ nixos-rebuild switch --use-remote-sudo ``` -to build the new configuration, make it the default configuration for -booting, and try to realise the configuration in the running system -(e.g., by restarting system services). +to build the new configuration as your current user, and as the root user, +make it the default configuration for booting. `switch` will also try to +realise the configuration in the running system (e.g., by restarting system +services). ::: {.warning} This command doesn't start/stop [user services](#opt-systemd.user.services) @@ -19,14 +20,23 @@ user services. ::: ::: {.warning} -These commands must be executed as root, so you should either run them -from a root shell or by prefixing them with `sudo -i`. +Applying a configuration is an action that must be done by the root user, so the +`switch`, `boot` and `test` commands should be ran with the `--use-remote-sudo` +flag. Despite its odd name, this flag runs the activation script with elevated +permissions, regardless of whether or not the target system is remote, without +affecting the other stages of the `nixos-rebuild` call. This allows unprivileged +users to rebuild the system and only elevate their permissions when necessary. + +Alternatively, one can run the whole command as root while preserving user +environment variables by prefixing the command with `sudo -E`. However, this +method may create root-owned files in `$HOME/.cache` if Nix decides to use the +cache during evaluation. ::: You can also do ```ShellSession -# nixos-rebuild test +$ nixos-rebuild test --use-remote-sudo ``` to build the configuration and switch the running system to it, but @@ -37,7 +47,7 @@ configuration. There is also ```ShellSession -# nixos-rebuild boot +$ nixos-rebuild boot --use-remote-sudo ``` to build the configuration and make it the boot default, but not switch @@ -47,7 +57,7 @@ You can make your configuration show up in a different submenu of the GRUB 2 boot screen by giving it a different *profile name*, e.g. ```ShellSession -# nixos-rebuild switch -p test +$ nixos-rebuild switch -p test --use-remote-sudo ``` which causes the new configuration (and previous ones created using @@ -58,7 +68,7 @@ configurations. A repl, or read-eval-print loop, is also available. You can inspect your configuration and use the Nix language with ```ShellSession -# nixos-rebuild repl +$ nixos-rebuild repl ``` Your configuration is loaded into the `config` variable. Use tab for autocompletion, use the `:r` command to reload the configuration files. See `:?` or [`nix repl` in the Nix manual](https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-repl.html) to learn more. diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index 9f3ff2ac6bac3..b927c7c0e877b 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -220,6 +220,8 @@ The NixOS installer ships with multiple partitioning tools. The examples below use `parted`, but also provides `fdisk`, `gdisk`, `cfdisk`, and `cgdisk`. +Use the command 'lsblk' to find the name of your 'disk' device. + The recommended partition scheme differs depending if the computer uses *Legacy Boot* or *UEFI*. @@ -496,6 +498,12 @@ Use the following commands: Retype new password: *** ``` + If you have a user account declared in your `configuration.nix` and plan to log in using this user, set a password before rebooting, e.g. for the `alice` user: + + ```ShellSession + # nixos-enter --root /mnt -c 'passwd alice' + ``` + ::: {.note} For unattended installations, it is possible to use `nixos-install --no-root-passwd` in order to disable the password @@ -515,15 +523,13 @@ Use the following commands: menu. This allows you to easily roll back to a previous configuration if something goes wrong. - You should log in and change the `root` password with `passwd`. + Use your declared user account to log in. + If you didn’t declare one, you should still be able to log in using the `root` user. - You'll probably want to create some user accounts as well, which can - be done with `useradd`: - - ```ShellSession - $ useradd -c 'Eelco Dolstra' -m eelco - $ passwd eelco - ``` + ::: {.note} + Some graphical display managers such as SDDM do not allow `root` login by default, so you might need to switch to TTY. + Refer to [](#sec-user-management) for details on declaring user accounts. + ::: You may also want to install some software. This will be covered in [](#sec-package-management). diff --git a/nixos/doc/manual/release-notes/rl-2009.section.md b/nixos/doc/manual/release-notes/rl-2009.section.md index 900c20dbe717d..d128696b25709 100644 --- a/nixos/doc/manual/release-notes/rl-2009.section.md +++ b/nixos/doc/manual/release-notes/rl-2009.section.md @@ -120,7 +120,7 @@ In addition to 1119 new, 118 updated, and 476 removed options; 61 new modules we - Services: - - [services.ankisyncd.enable](options.html#opt-services.ankisyncd.enable) Anki sync server + - `services.ankisyncd.enable` Anki sync server - [services.bazarr.enable](options.html#opt-services.bazarr.enable) Subtitle manager for Sonarr and Radarr diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 0fd5f802d2492..e8879e746a030 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -661,8 +661,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2 Cheese as the default camera application, and Photos will no longer be installed. -- The module [services.ankisyncd](#opt-services.ankisyncd.package) has been - switched to +- The module `services.ankisyncd` has been switched to [anki-sync-server-rs](https://github.com/ankicommunity/anki-sync-server-rs). The former version written in Python was difficult to update, did not receive updates in a while, and did not support recent versions of Anki. diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 3bb993ec33c6f..158257f20a7a7 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -62,7 +62,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [Anki Sync Server](https://docs.ankiweb.net/sync-server.html), the official sync server built into recent versions of Anki. Available as [services.anki-sync-server](#opt-services.anki-sync-server.enable). -The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been marked deprecated and will be dropped after 24.05 due to lack of maintenance of the ankisyncd software. +The pre-existing `services.ankisyncd` has been marked deprecated and will be dropped after 24.05 due to lack of maintenance of the ankisyncd software. - [ALVR](https://github.com/alvr-org/alvr), a VR desktop streamer. Available as [programs.alvr](#opt-programs.alvr.enable). diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 0fea2aa314943..a992008a4e1ba 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -4,6 +4,23 @@ ## Highlights {#sec-release-24.11-highlights} +- **This will be the last release of Nixpkgs to support macOS Sierra 10.12 to macOS Catalina 10.15.** + Starting with release 25.05, the minimum supported version will be macOS Big Sur 11, and we cannot guarantee that packages will continue to work on older versions of macOS. + Users on old macOS versions should consider upgrading to a supported version (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS. + If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports back to Mac OS X Snow Leopard 10.6. +- Nix was updated to 2.24, which brings a lot of improvements and fixes. See the release notes for + [2.19](https://nix.dev/manual/nix/latest/release-notes/rl-2.19), + [2.20](https://nix.dev/manual/nix/latest/release-notes/rl-2.20), + [2.21](https://nix.dev/manual/nix/latest/release-notes/rl-2.21), + [2.22](https://nix.dev/manual/nix/latest/release-notes/rl-2.22), + [2.23](https://nix.dev/manual/nix/latest/release-notes/rl-2.23), + [2.24](https://nix.dev/manual/nix/latest/release-notes/rl-2.24). + Notable changes include improvements to Git fetching, documentation comment support in `nix-repl> :doc`, as well as many quality of life improvements. + +- This will be the last release of Nixpkgs to support versions of CUDA prior to CUDA 12.0. + These versions only work with old compiler versions that will be unsupported by the time of the Nixpkgs 25.05 release. + In future, users should expect CUDA versions to be dropped as the compiler versions they require leave upstream support windows. + - Convenience options for `amdgpu`, open source driver for Radeon cards, is now available under `hardware.amdgpu`. - [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured as `hardware.amdgpu.amdvlk` option. @@ -25,14 +42,39 @@ Users can use it by `services.displayManager.ly.enable` and config it by `services.displayManager.ly.settings` to generate `/etc/ly/config.ini` +- The default sound server for most graphical sessions has been switched from PulseAudio to PipeWire. + Users that want to keep PulseAudio will want to set `services.pipewire.enable = false;` and `hardware.pulseaudio.enable = true;`. + There is currently no plan to fully deprecate and remove PulseAudio, however, PipeWire should generally be preferred for new installs. + +- The Rust rewrite of the `switch-to-configuration` program is now used for system activation by default. + If you experience any issues, please report them. + The original Perl script can still be used for now by setting `system.switch.enableNg` to `false`. + +- Support for mounting filesystems from block devices protected with [dm-verity](https://docs.kernel.org/admin-guide/device-mapper/verity.html) + was added through the `boot.initrd.systemd.dmVerity` option. + +- The [Xen Project Hypervisor](https://xenproject.org) is once again available as a virtualisation option under [`virtualisation.xen`](#opt-virtualisation.xen.enable). + - This release includes Xen [4.17.5](https://wiki.xenproject.org/wiki/Xen_Project_4.17_Release_Notes), [4.18.3](https://wiki.xenproject.org/wiki/Xen_Project_4.18_Release_Notes) and [4.19.0](https://wiki.xenproject.org/wiki/Xen_Project_4.19_Release_Notes), as well as support for booting the hypervisor on EFI systems. + ::: {.warning} + Booting into the Xen Project Hypervisor through a legacy BIOS bootloader or with the legacy script-based Stage 1 initrd have been **deprecated**. Only EFI booting and the new systemd-based Stage 1 initrd are supported. + ::: + - There are two flavours of Xen available by default: `xen`, which includes all built-in components, and `xen-slim`, which replaces the built-in components with their Nixpkgs equivalents. + - The `qemu-xen-traditional` component has been deprecated by the upstream Xen Project, and is no longer available in any of the Xen Project Hypervisor packages. + - The OCaml-based Xen Store can now be configured using [`virtualisation.xen.store.settings`](#opt-virtualisation.xen.store.settings). + - The `virtualisation.xen.bridge` options have been deprecated in this release cycle. Users who need network bridges are encouraged to set up their own networking configurations. + ## New Modules {#sec-release-24.11-new-modules} -- [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwariror 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). +- [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwarrior 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). - [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service. +- [Gancio](https://gancio.org/), a shared agenda for local communities. Available as [services.gancio](#opt-services.gancio.enable). + - [Goatcounter](https://www.goatcounter.com/), Easy web analytics. No tracking of personal data. Available as [services.goatcounter](options.html#opt-services.goatcocunter.enable). +- [Privatebin](https://github.com/PrivateBin/PrivateBin/), A minimalist, open source online pastebin where the server has zero knowledge of pasted data. Available as [services.privatebin](#opt-services.privatebin.enable) + - [UWSM](https://github.com/Vladimir-csp/uwsm), a wayland session manager to wrap Wayland Compositors into useful systemd units such as `graphical-session.target`. Available as [programs.uwsm](#opt-programs.uwsm.enable). - [Open-WebUI](https://github.com/open-webui/open-webui), a user-friendly WebUI @@ -45,9 +87,11 @@ user management. This can be used instead of the `update-users-groups.pl` Perl script and instead of systemd-sysusers. To achieve a system without Perl, this is the now recommended tool over systemd-sysusers because it can - alos create normal users and change passwords. Available as + also create normal users and change passwords. Available as [services.userborn](#opt-services.userborn.enable) +- [Hatsu](https://github.com/importantimport/hatsu), a self-hosted bridge that interacts with Fediverse on behalf of your static site. Available as [services.hatsu](options.html#opt-services.hatsu). + - [Flood](https://flood.js.org/), a beautiful WebUI for various torrent clients. Available as [services.flood](options.html#opt-services.flood). - [Firefly-iii Data Importer](https://github.com/firefly-iii/data-importer), a data importer for Firefly-III. Available as [services.firefly-iii-data-importer](options.html#opt-services.firefly-iii-data-importer) @@ -62,7 +106,9 @@ - [Immersed VR](https://immersed.com/), a closed-source coworking platform. Available as [programs.immersed-vr](#opt-programs.immersed-vr.enable). -- [HomeBox](https://github.com/hay-kot/homebox/): the inventory and organization system built for the Home User. Available as [services.homebox](#opt-services.homebox.enable). +- [HomeBox](https://github.com/sysadminsmedia/homebox): the inventory and organization system built for the Home User. Available as [services.homebox](#opt-services.homebox.enable). + +- [matrix-hookshot](https://matrix-org.github.io/matrix-hookshot), a Matrix bot for connecting to external services. Available as [services.matrix-hookshot](#opt-services.matrix-hookshot.enable). - [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable). @@ -70,6 +116,8 @@ - [zeronsd](https://github.com/zerotier/zeronsd), a DNS server for ZeroTier users. Available with [services.zeronsd.servedNetworks](#opt-services.zeronsd.servedNetworks). +- [Collabora Online](https://www.collaboraonline.com/), a collaborative online office suite based on LibreOffice technology. Available as [services.collabora-online](options.html#opt-services.collabora-online.enable). + - [wg-access-server](https://github.com/freifunkMUC/wg-access-server/), an all-in-one WireGuard VPN solution with a web ui for connecting devices. Available at [services.wg-access-server](#opt-services.wg-access-server.enable). - [Pingvin Share](https://github.com/stonith404/pingvin-share), a self-hosted file sharing platform and an alternative for WeTransfer. Available as [services.pingvin-share](#opt-services.pingvin-share.enable). @@ -78,12 +126,16 @@ - [Localsend](https://localsend.org/), an open source cross-platform alternative to AirDrop. Available as [programs.localsend](#opt-programs.localsend.enable). +- [Gatus](https://github.com/TwiN/gatus), an automated developer-oriented status page. Available as [services.gatus](#opt-services.gatus.enable). + - [cryptpad](https://cryptpad.org/), a privacy-oriented collaborative platform (docs/drive/etc), has been added back. Available as [services.cryptpad](#opt-services.cryptpad.enable). - [realm](https://github.com/zhboner/realm), a simple, high performance relay server written in rust. Available as [services.realm.enable](#opt-services.realm.enable). - [Gotenberg](https://gotenberg.dev), an API server for converting files to PDFs that can be used alongside Paperless-ngx. Available as [services.gotenberg](options.html#opt-services.gotenberg). +- [Suricata](https://suricata.io/), a free and open source, mature, fast and robust network threat detection engine. Available as [services.suricata](options.html#opt-services.suricata). + - [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld). - [MenhirLib](https://gitlab.inria.fr/fpottier/menhir/-/tree/master/coq-menhirlib) A support library for verified Coq parsers produced by Menhir. @@ -109,8 +161,28 @@ - [foot](https://codeberg.org/dnkl/foot), a fast, lightweight and minimalistic Wayland terminal emulator. Available as [programs.foot](#opt-programs.foot.enable). +- [ToDesk](https://www.todesk.com/linux.html), a remote desktop applicaton. Available as [services.todesk.enable](#opt-services.todesk.enable). + +- [Dependency Track](https://dependencytrack.org/), an intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain. Available as [services.dependency-track](option.html#opt-services.dependency-track). + +- [Immich](https://github.com/immich-app/immich), a self-hosted photo and video backup solution. Available as [services.immich](#opt-services.immich.enable). + +- [obs-studio](https://obsproject.com/), Free and open source software for video recording and live streaming. Available as [programs.obs-studio.enable](#opt-programs.obs-studio.enable). + +- [Veilid](https://veilid.com), a headless server that enables privacy-focused data sharing and messaging on a peer-to-peer network. Available as [services.veilid](#opt-services.veilid.enable). + +- [Fedimint](https://github.com/fedimint/fedimint), a module based system for building federated applications (Federated E-Cash Mint). Available as [services.fedimintd](#opt-services.fedimintd). + ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} +- The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details. + +- The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver. + +- All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`). + +- All GNOME packages have been moved to top-level (i.e., `gnome.nautilus` is now `nautilus`). + - `transmission` package has been aliased with a `trace` warning to `transmission_3`. Since [Transmission 4 has been released last year](https://github.com/transmission/transmission/releases/tag/4.0.0), and Transmission 3 will eventually go away, it was decided perform this warning alias to make people aware of the new version. The `services.transmission.package` defaults to `transmission_3` as well because the upgrade can cause data loss in certain specific usage patterns (examples: [#5153](https://github.com/transmission/transmission/issues/5153), [#6796](https://github.com/transmission/transmission/issues/6796)). Please make sure to back up to your data directory per your usage: - `transmission-gtk`: `~/.config/transmission` - `transmission-daemon` using NixOS module: `${config.services.transmission.home}/.config/transmission-daemon` (defaults to `/var/lib/transmission/.config/transmission-daemon`) @@ -119,6 +191,12 @@ - `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected. +- `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes. + +- `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema. + +- `bluemap` has changed the format used to store map tiles, and the database layout has been heavily modified. Upstream recommends a clean reinstallation: . Unless you are using an SQL storage backend, this should only entail deleting the contents of `config.services.bluemap.coreSettings.data` (defaults to `/var/lib/bluemap`) and `config.services.bluemap.webRoot` (defaults to `/var/lib/bluemap/web`). + - `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust. The module was updated to accommodate for breaking changes. Breaking changes to the module API were minimised as much as possible, @@ -142,6 +220,8 @@ To forcibly reenable cgroup v1 support, you can `set boot.kernelParams = [ "systemd.unified_cgroup_hierachy=0" "SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1" ]`. NixOS does not officially support this configuration and might cause your system to be unbootable in future versions. You are on your own. +- `nrfutil` which previously pointed to the now-deprecated `pc-nrfutil` python package, has been repackaged under the same name with the new nrfutil tool. + - `openssh` and `openssh_hpn` are now compiled without Kerberos 5 / GSSAPI support in an effort to reduce the attack surface of the components for the majority of users. Users needing this support can use the new `opensshWithKerberos` and `openssh_hpnWithKerberos` flavors (e.g. `programs.ssh.package = pkgs.openssh_gssapi`). @@ -151,6 +231,11 @@ - The `MSMTP_QUEUE` and `MSMTP_LOG` environment variables accepted by `msmtpq` have now been renamed to `MSMTPQ_Q` and `MSMTPQ_LOG` respectively. +- The logrotate service has received hardening and now requires enabling `allowNetworking`, if logrotate needs to access the network. + +- qBittorrent has been updated to major version 5, which drops support for Qt 5. + The `qbittorrent-qt5` package has been removed. + - The fcgiwrap module now allows multiple instances running as distinct users. The option `services.fgciwrap` now takes an attribute set of the configuration of each individual instance. @@ -161,17 +246,21 @@ Processes also now run as a dynamically allocated user by default instead of root. -- The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver. +- The `mautrix-signal` module was adapted to incorporate the configuration rearrangement that resulted from the update to the mautrix bridgev2 architecture. Pre-0.7.0 configurations should continue to work. + In case you want to update your configuration make sure to check the NixOS manual. - `singularity-tools` have the `storeDir` argument removed from its override interface and use `builtins.storeDir` instead. - Two build helpers in `singularity-tools`, i.e., `mkLayer` and `shellScript`, are deprecated, as they are no longer involved in image-building. Maintainers will remove them in future releases. +- The `rust.toTargetArch`, `rust.toTargetOs`, `rust.toTargetFamily`, `rust.toTargetVendor`, `rust.toRustTarget`, `rust.toRustTargetSpec`, `rust.toRustTargetSpecShort`, and `rust.IsNoStdTarget` functions are deprecated in favour of the `rust.platform.arch`, `rust.platform.os`, `rust.platform.target-family`, `rust.platform.vendor`, `rust.rustcTarget`, `rust.rustcTargetSpec`, `rust.cargoShortTarget`, `rust.cargoEnvVarTarget`, and `rust.isNoStdTarget` platform attributes respectively. + - The `budgie` and `budgiePlugins` scope have been removed and their packages moved into the top level scope (i.e., `budgie.budgie-desktop` is now `budgie-desktop`) -- All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`). +- The method to safely handle secrets in the `networking.wireless` module has been changed to benefit from a [new feature](https://w1.fi/cgit/hostap/commit/?id=e680a51e94a33591f61edb210926bcb71217a21a) of wpa_supplicant. + The syntax to refer to secrets has changed slightly and the option `networking.wireless.environmentFile` has been replaced by `networking.wireless.secretsFile`; see the description of the latter for how to upgrade. - `services.cgit` now runs as the cgit user by default instead of root. This change requires granting access to the repositories to this user or @@ -201,6 +290,9 @@ - `pkgs.nextcloud27` has been removed since it's EOL. +- The `environment.noXlibs` option has been removed. It was a common source of unexpected rebuilds and breakage that was often hard to diagnose. + If you need to disable certain libraries, you're encouraged to add your own overlay to your configuration that targets the packages you care about. + - `frigate` was updated past 0.14.0. This release includes various breaking changes, so please go read the [release notes](https://github.com/blakeblackshear/frigate/releases/tag/v0.14.0). Most prominently access to the webinterface and API are now protected by authentication. Retrieve the auto-created admin account from the `frigate.service` journal after upgrading. @@ -212,7 +304,7 @@ - `forgejo` and `forgejo-lts` no longer support the opt-in feature [PAM (Pluggable Authentication Module)](https://forgejo.org/docs/latest/user/authentication/#pam-pluggable-authentication-module). -- `gitea` no longer supports the opt-in feature [PAM (Pluggable Authentication Module)][https://docs.gitea.com/usage/authentication#pam-pluggable-authentication-module]. +- `gitea` no longer supports the opt-in feature [PAM (Pluggable Authentication Module)](https://docs.gitea.com/usage/authentication#pam-pluggable-authentication-module). - `services.ddclient.use` has been deprecated: `ddclient` now supports separate IPv4 and IPv6 configuration. Use `services.ddclient.usev4` and `services.ddclient.usev6` instead. @@ -224,6 +316,12 @@ - `tests.overriding` has its `passthru.tests` restructured as an attribute set instead of a list, making individual tests accessible by their names. +- Package `skk-dict` was split into multiple packages under `skkDictionaries`. + If in doubt, try `skkDictionaries.l`. As part of this change, the dictionaries + were moved from `$out/share` to `$out/share/skk`. Also, the dictionaries won't + be converted to UTF-8 unless the `useUtf8` package option is enabled. UTF-8 + converted dictionaries will have the .utf8 suffix appended to its filename. + - `vaultwarden` lost the capability to bind to privileged ports. If you rely on this behavior, override the systemd unit to allow `CAP_NET_BIND_SERVICE` in your local configuration. @@ -235,6 +333,15 @@ a static `user` and `group`. The `writablePaths` option has been removed and the models directory is now always exempt from sandboxing. +- The `gns3-server` service now runs under the `gns3` system user + instead of a dynamically created one via `DynamicUser`. + The use of SUID wrappers is incompatible with SystemD's `DynamicUser` setting, + and GNS3 requires calling ubridge through its SUID wrapper to function properly. + This change requires to manually move the following directories: + * from `/var/lib/private/gns3` to `/var/lib/gns3` + * from `/var/log/private/gns3` to `/var/log/gns3` + and to change the ownership of these directories and their contents to `gns3` (including `/etc/gns3`). + - Legacy package `stalwart-mail_0_6` was dropped, please note the [manual upgrade process](https://github.com/stalwartlabs/mail-server/blob/main/UPGRADING.md) before changing the package to `pkgs.stalwart-mail` in @@ -246,6 +353,8 @@ - Android NDK version 26 and SDK version 33 are now the default versions used for cross compilation to android. +- the `ankisyncd` package and its `services.ankisyncd` have been removed, use [`services.anki-sync-server`](#opt-services.anki-sync-server.enable) instead. + - `nodePackages.vscode-css-languageserver-bin`, `nodePackages.vscode-html-languageserver-bin`, and `nodePackages.vscode-json-languageserver-bin` were dropped due to an unmaintained upstream. The `vscode-langservers-extracted` package is a maintained drop-in replacement. @@ -275,6 +384,12 @@ for `stateVersion` ≥ 24.11. (It was previously using SQLite for structured data and the filesystem for blobs). +- The `stargazer` service has been hardened to improve security, but these + changes make break certain setups, particularly around traditional CGI. + + - The `stargazer.allowCgiUser` option has been added, enabling + Stargazer's `cgi-user` option to work, which was previously broken. + - The `shiori` service now requires an HTTP secret value `SHIORI_HTTP_SECRET_KEY` to be provided via environment variable. The nixos module therefore, now provides an environmentFile option: ``` @@ -287,6 +402,8 @@ - PPD files for Utax printers got renamed (spaces replaced by underscores) in newest `foomatic-db` package; users of Utax printers might need to adapt their `hardware.printers.ensurePrinters.*.model` value. +- The `kvdo` kernel module package was removed, because it was upstreamed in kernel version 6.9, where it is called `dm-vdo`. + - `libe57format` has been updated to `>= 3.0.0`, which contains some backward-incompatible API changes. See the [release note](https://github.com/asmaloney/libE57Format/releases/tag/v3.0.0) for more details. - `gitlab` deprecated support for *runner registration tokens* in GitLab 16.0, disabled their support in GitLab 17.0 and will @@ -305,9 +422,19 @@ - The `replay-sorcery` package and module was removed as it unmaintained upstream. Consider using `gpu-screen-recorder` or `obs-studio` instead. +- To follow [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) a few options of `samba` have been moved from `extraConfig` and `configText` to the new freeform option `settings` and renamed, e.g.: + - `services.samba.invalidUsers` to `services.samba.settings.global."invalid users"` + - `services.samba.securityType` to `services.samba.settings.global."security type"` + - `services.samba.shares` to `services.samba.settings` + - `services.samba.enableWinbindd` to `services.samba.winbindd.enable` + - `services.samba.enableNmbd` to `services.samba.nmbd.enable` + - `zx` was updated to v8, which introduces several breaking changes. See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information. +- The `dnscrypt-wrapper` module was removed since the project has been effectively unmaintained since 2018; moreover the NixOS module had to rely on an abandoned version of dnscrypt-proxy v1 for the rotation of keys. + To wrap a resolver with DNSCrypt you can instead use `dnsdist`. See options `services.dnsdist.dnscrypt.*` + - The `portunus` package and service do not support weak password hashes anymore. If you installed Portunus on NixOS 23.11 or earlier, upgrade to NixOS 24.05 first to get support for strong password hashing. Then, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all existing user accounts to strong password hashes. @@ -323,6 +450,8 @@ - Docker now defaults to 27.x, because version 24.x stopped receiving security updates and bug fixes after [February 1, 2024](https://github.com/moby/moby/pull/46772#discussion_r1686464084). +- `postgresql` was split into default and -dev outputs. To make this work without circular dependencies, the output of the `pg_config` system view has been removed. The `pg_config` binary is provided in the -dev output and still works as expected. + - `keycloak` was updated to version 25, which introduces new hostname related options. See [Upgrading Guide](https://www.keycloak.org/docs/25.0.1/upgrading/#migrating-to-25-0-0) for instructions. @@ -345,8 +474,6 @@ - `services.roundcube.maxAttachmentSize` will multiply the value set with `1.37` to offset overhead introduced by the base64 encoding applied to attachments. -- The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details. - - The `services.mxisd` module has been removed as both [mxisd](https://github.com/kamax-matrix/mxisd) and [ma1sd](https://github.com/ma1uta/ma1sd) are not maintained any longer. Consequently the package `pkgs.ma1sd` has also been removed. @@ -357,6 +484,12 @@ - The `services.trust-dns` module has been renamed to `services.hickory-dns`. +- The option `services.prometheus.exporters.pgbouncer.connectionStringFile` has been removed since + it leaked the connection string (and thus potentially the DB password) into the cmdline + of process making it effectively world-readable. + + Use [`services.prometheus.exporters.pgbouncer.connectionEnvFile`](#opt-services.prometheus.exporters.pgbouncer.connectionEnvFile) instead. + - The `lsh` package and the `services.lshd` module have been removed as they had no maintainer in Nixpkgs and hadn’t seen an upstream release in over a decade. It is recommended to migrate to `openssh` and `services.openssh`. - `opencv2` and `opencv3` have been removed, as they are obsolete and @@ -372,6 +505,30 @@ - The `antennas` package and the `services.antennas` module have been removed as they only work with `tvheadend` (see above). +- The `system.build.brightboxImage` image has been removed as It did not build anymore and has not seen any maintenance in over 7 years (excluding tree-wide changes). + +- The `services.syncplay` module now exposes all currently available command-line arguments for `syncplay-server` as options, as well as a `useACMEHost` option for easy TLS setup. + The systemd service now uses `DynamicUser`/`StateDirectory` and the `user` and `group` options have been deprecated. + +- The `openlens` package got removed, suggested replacement `lens-desktop` + +- The `services.dnsmasq.extraConfig` option has been removed, as it had been deprecated for over 2 years. This option has been replaced by `services.dnsmasq.settings`. + +- The NixOS installation media no longer support the ReiserFS or JFS file systems by default. + +- Minimal installer ISOs are no longer built on the small channel. + Please obtain installer images from the full release channels. + +- The `isync` package has been updated to version `1.5.0`, which introduces some breaking changes. See the [compatibility concerns](https://sourceforge.net/projects/isync/files/isync/1.5.0/) for more details. + +- Legacy package `globalprotect-openconnect` 1.x and related module + `globalprotect-vpn` were dropped. Two new packages `gpauth` and `gpclient` + from the 2.x version of the GlobalProtect-openconnect project are added in its + place. The GUI components related to the project are non-free and not + packaged. + +- Compatible string matching for `hardware.deviceTree.overlays` has been changed to a more correct behavior. See [below](#sec-release-24.11-migration-dto-compatible) for details. + ## Other Notable Changes {#sec-release-24.11-notable-changes} @@ -399,16 +556,39 @@ - `lib.misc.mapAttrsFlatten` is now formally deprecated and will be removed in future releases; use the identical [`lib.attrsets.mapAttrsToList`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.mapAttrsToList) instead. +- Tailscale's `authKeyFile` can now have its corresponding parameters set through `config.services.tailscale.authKeyParameters`, allowing for non-ephemeral unsupervised deployment and more. + See [Registering new nodes using OAuth credentials](https://tailscale.com/kb/1215/oauth-clients#registering-new-nodes-using-oauth-credentials) for the supported options. + - `nixosTests` now provide a working IPv6 setup for VLAN 1 by default. - Kanidm can now be provisioned using the new [`services.kanidm.provision`] option, but requires using a patched version available via `pkgs.kanidm.withSecretProvisioning`. - Kanidm previously had an incorrect systemd service type, causing dependent units with an `after` and `requires` directive to start before `kanidm*` finished startup. The module has now been updated in line with upstream recommendations. +- The kubelet configuration file can now be amended with arbitrary additional content using the `services.kubernetes.kubelet.extraConfig` option. + +- The `services.seafile` module was updated to major version 11. + - As part of this upgrade, the database backend will be migrated to MySQL. + This process should be automatic, but in case of a botched migration, + old sqlite files are not removed and can be used to manually migrate the database. + - Additionally, the updated CSRF protection may prevent some users from logging in. + Specific origin addresses can be whitelisted using the `services.seafile.seahubExtraConf` option + (e.g. `services.seafile.seahubExtraConf = ''CSRF_TRUSTED_ORIGINS = ["https://example.com"]'';`). + Note that first solution of the [official FAQ answer](https://cloud.seatable.io/dtable/external-links/7b976c85f504491cbe8e/?tid=0000&vid=0000&row-id=BQhH-2HSQs68Nq2EW91DBA) + is not allowed by the `services.nginx` module's config-checker. + +- The latest available version of Nextcloud is v30 (available as `pkgs.nextcloud30`). 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`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud29` will be installed by default. + - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.11, `pkgs.nextcloud30` will be installed by default. + - Please note that an upgrade from v28 (or older) to v30 directly is not possible. Please upgrade to `nextcloud29` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud29;`](options.html#opt-services.nextcloud.package). + - To facilitate dependency injection, the `imgui` package now builds a static archive using vcpkg' CMake rules. The derivation now installs "impl" headers selectively instead of by a wildcard. Use `imgui.src` if you just want to access the unpacked sources. +- Linux 4.19 has been removed because it will reach its end of life within the lifespan of 24.11 + - Unprivileged access to the kernel syslog via `dmesg` is now restricted by default. Users wanting to keep an unrestricted access to it can set `boot.kernel.sysctl."kernel.dmesg_restrict" = false`. @@ -418,17 +598,34 @@ - `security.pam.u2f` now follows RFC42. All module options are now settable through the freeform `.settings`. +- Mikutter was removed because the package was broken and had no maintainers. + - Gollum was upgraded to major version 6. Read their [migration notes](https://github.com/gollum/gollum/wiki/6.0-Release-Notes). - The hooks `yarnConfigHook` and `yarnBuildHook` were added. These should replace `yarn2nix.mkYarnPackage` and other `yarn2nix` related tools. The motivation to get rid of `yarn2nix` tools is the fact that they are too complex and hard to maintain, and they rely upon too much Nix evaluation which is problematic if import-from-derivation is not allowed (see more details at [#296856](https://github.com/NixOS/nixpkgs/issues/296856). The transition from `mkYarnPackage` to `yarn{Config,Build}Hook` is tracked at [#324246](https://github.com/NixOS/nixpkgs/issues/324246). +- `services.timesyncd.servers` now defaults to `null`, allowing systemd-timesyncd to use NTP servers advertised by DHCP. + +- `services.timesyncd.fallbackServers` was added and defaults to `networking.timeServers`. + - Cinnamon has been updated to 6.2, please check [upstream announcement](https://www.linuxmint.com/rel_wilma_whatsnew.php) for more details. Following Mint 22 defaults, the Cinnamon module no longer ships geary and hexchat by default. +- `zfs.latestCompatibleLinuxPackages` is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention. + - The `shadowstack` hardening flag has been added, though disabled by default. +- `xxd` is now provided by the `tinyxxd` package, rather than `vim.xxd`, to reduce closure size and vulnerability impact. Since it has the same options and semantics as Vim's `xxd` utility, there is no user impact. Vim's `xxd` remains available as the `vim.xxd` package. + +- `prometheus-openldap-exporter` was removed since it was unmaintained upstream and had no nixpkgs maintainers. + - `restic` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.restic.backups..inhibitsSleep`](#opt-services.restic.backups._name_.inhibitsSleep). +- The arguments from [](#opt-services.postgresql.initdbArgs) now get shell-escaped. + +- `cargo-tauri.hook` was introduced to help users build [Tauri](https://tauri.app/) projects. It is meant to be used alongside + `rustPlatform.buildRustPackage` and Node hooks such as `npmConfigHook`, `pnpm.configHook`, and the new `yarnConfig` + - Support for *runner registration tokens* has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872) in `gitlab-runner` 15.6 and is expected to be removed in `gitlab-runner` 18.0. Configuration of existing runners should be changed to using *runner authentication tokens* by configuring @@ -438,7 +635,9 @@ - `iproute2` now has libbpf support. - `nix.channel.enable = false` no longer implies `nix.settings.nix-path = []`. - Since Nix 2.13, a `nix-path` set in `nix.conf` cannot be overriden by the `NIX_PATH` configuration variable. + Since Nix 2.13, a `nix-path` set in `nix.conf` cannot be overridden by the `NIX_PATH` configuration variable. + +- ZFS now imports its pools in `postResumeCommands` rather than `postDeviceCommands`. If you had `postDeviceCommands` scripts that depended on ZFS pools being imported, those now need to be in `postResumeCommands`. ## Detailed migration information {#sec-release-24.11-migration} @@ -482,3 +681,22 @@ in { ]; }; ``` + +### `hardware.deviceTree.overlays` compatible string matching {#sec-release-24.11-migration-dto-compatible} + +The original compatible string implementation in older NixOS versions relied on substring matching, +which is incorrect for overlays with multiple compatible strings and other cases. + +The new behavior is consistent with what other tools already do - the overlay is considered applicable if, +and only if, _any_ of the compatible strings in the overlay match _any_ of the compatible strings in the DT. + +To provide some examples: + +| Overlay `compatible` | DT `compatible` | Pre-24.11 behavior | Correct behavior | Notes | +|----------------------|-----------------|--------------------|------------------|--------------------------------------------| +| `"foo"` | `"foo", "bar"` | match | match | Most common use case does not change | +| `"foo"` | `"foobar"` | match | no match | Substrings should not be matched | +| `"foo bar"` | `"foo", "bar"` | match | no match | Separators should not be matched to spaces | +| `"foo", "bar"` | `"baz", "bar"` | no match | match | One compatible string matching is enough | + +Note that this also allows writing overlays that explicitly apply to multiple boards. diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 208eaf59dc5c0..a943edb7b574e 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -321,7 +321,7 @@ let format' = format; in let e2fsprogs lkl config.system.build.nixos-install - config.system.build.nixos-enter + nixos-enter nix systemdMinimal ] diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix index 077bb8f227075..1dac232e2b8c4 100644 --- a/nixos/lib/make-multi-disk-zfs-image.nix +++ b/nixos/lib/make-multi-disk-zfs-image.nix @@ -124,7 +124,7 @@ let tools = lib.makeBinPath ( with pkgs; [ - config.system.build.nixos-enter + nixos-enter config.system.build.nixos-install dosfstools e2fsprogs diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix index 585fa93b7fa0f..e37b79797dcaa 100644 --- a/nixos/lib/make-single-disk-zfs-image.nix +++ b/nixos/lib/make-single-disk-zfs-image.nix @@ -112,7 +112,7 @@ let tools = lib.makeBinPath ( with pkgs; [ - config.system.build.nixos-enter + nixos-enter config.system.build.nixos-install dosfstools e2fsprogs diff --git a/nixos/lib/testing/nixos-test-base.nix b/nixos/lib/testing/nixos-test-base.nix index d76a25361f8ca..c8b15a0ecce4c 100644 --- a/nixos/lib/testing/nixos-test-base.nix +++ b/nixos/lib/testing/nixos-test-base.nix @@ -3,7 +3,7 @@ # even in `inheritParentConfig = false` specialisations. { lib, ... }: let - inherit (lib) mkForce; + inherit (lib) mkDefault mkForce; in { imports = [ @@ -22,6 +22,11 @@ in label = mkForce "test"; }; } - + ({ config, ... }: { + # Don't pull in switch-to-configuration by default, except when specialisations or early boot shenanigans are involved. + # This is mostly a Hydra optimization, so we don't rebuild all the tests every time switch-to-configuration-ng changes. + key = "no-switch-to-configuration"; + system.switch.enable = mkDefault (config.isSpecialisation || config.specialisation != {} || config.virtualisation.installBootLoader); + }) ]; } diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index a44b1fecd29a4..205fd1fa7b960 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -23,13 +23,10 @@ And do not repeat our mistakes. */ { config, pkgs, lib, ... }: - -with lib; - let cfg = config.fonts.fontconfig; - fcBool = x: "" + (boolToString x) + ""; + fcBool = x: "" + (lib.boolToString x) + ""; pkg = pkgs.fontconfig; # configuration file to read fontconfig cache @@ -51,11 +48,11 @@ let - ${concatStringsSep "\n" (map (font: "${font}") config.fonts.packages)} - ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' + ${lib.concatStringsSep "\n" (map (font: "${font}") config.fonts.packages)} + ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' ${cache} - ${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) '' + ${lib.optionalString (pkgs.stdenv.hostPlatform.isx86_64 && cfg.cache32Bit) '' ${cache32} ''} ''} @@ -89,11 +86,11 @@ let # priority 52 defaultFontsConf = let genDefault = fonts: name: - optionalString (fonts != []) '' + lib.optionalString (fonts != []) '' ${name} - ${concatStringsSep "" + ${lib.concatStringsSep "" (map (font: '' ${font} '') fonts)} @@ -125,7 +122,7 @@ let - ${optionalString (!cfg.allowBitmaps) '' + ${lib.optionalString (!cfg.allowBitmaps) '' @@ -180,14 +177,8 @@ let mkdir -p $dst # fonts.conf - cp ${pkg.out}/etc/fonts/fonts.conf \ + ln -s ${pkg.out}/etc/fonts/fonts.conf \ $dst/../fonts.conf - - # horrible sed hack to add the line that was accidentally removed - # from the default config in #324516 - # FIXME: fix that, revert this - sed "5i /etc/fonts/conf.d" -i $dst/../fonts.conf - # TODO: remove this legacy symlink once people stop using packages built before #95358 was merged mkdir -p $out/etc/fonts/2.11 ln -s /etc/fonts/fonts.conf \ @@ -197,22 +188,22 @@ let ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \ $dst/ - ${optionalString (!cfg.antialias) + ${lib.optionalString (!cfg.antialias) (replaceDefaultConfig "10-yes-antialias.conf" "10-no-antialias.conf") } - ${optionalString (cfg.hinting.style != "slight") + ${lib.optionalString (cfg.hinting.style != "slight") (replaceDefaultConfig "10-hinting-slight.conf" "10-hinting-${cfg.hinting.style}.conf") } - ${optionalString (cfg.subpixel.rgba != "none") + ${lib.optionalString (cfg.subpixel.rgba != "none") (replaceDefaultConfig "10-sub-pixel-none.conf" "10-sub-pixel-${cfg.subpixel.rgba}.conf") } - ${optionalString (cfg.subpixel.lcdfilter != "default") + ${lib.optionalString (cfg.subpixel.lcdfilter != "default") (replaceDefaultConfig "11-lcdfilter-default.conf" "11-lcdfilter-${cfg.subpixel.lcdfilter}.conf") } @@ -224,12 +215,12 @@ let ln -s ${renderConf} $dst/10-nixos-rendering.conf # 50-user.conf - ${optionalString (!cfg.includeUserConf) '' + ${lib.optionalString (!cfg.includeUserConf) '' rm $dst/50-user.conf ''} # local.conf (indirect priority 51) - ${optionalString (cfg.localConf != "") '' + ${lib.optionalString (cfg.localConf != "") '' ln -s ${localConf} $dst/../local.conf ''} @@ -239,7 +230,7 @@ let # 53-no-bitmaps.conf ln -s ${rejectBitmaps} $dst/53-no-bitmaps.conf - ${optionalString (!cfg.allowType1) '' + ${lib.optionalString (!cfg.allowType1) '' # 53-nixos-reject-type1.conf ln -s ${rejectType1} $dst/53-nixos-reject-type1.conf ''} @@ -257,16 +248,16 @@ let in { imports = [ - (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ]) - (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ]) - (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ]) - (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ]) - (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) - (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") - (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") - (mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options") - (mkRemovedOptionModule [ "hardware" "video" "hidpi" "enable" ] fontconfigNote) - (mkRemovedOptionModule [ "fonts" "optimizeForVeryHighDPI" ] fontconfigNote) + (lib.mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ]) + (lib.mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ]) + (lib.mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ]) + (lib.mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ]) + (lib.mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) + (lib.mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") + (lib.mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") + (lib.mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options") + (lib.mkRemovedOptionModule [ "hardware" "video" "hidpi" "enable" ] fontconfigNote) + (lib.mkRemovedOptionModule [ "fonts" "optimizeForVeryHighDPI" ] fontconfigNote) ] ++ lib.forEach [ "enable" "substitutions" "preset" ] (opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] '' The fonts.fontconfig.ultimate module and configuration is obsolete. @@ -281,8 +272,8 @@ in fonts = { fontconfig = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' If enabled, a Fontconfig configuration file will be built @@ -293,17 +284,17 @@ in ''; }; - confPackages = mkOption { + confPackages = lib.mkOption { internal = true; - type = with types; listOf path; + type = with lib.types; listOf path; default = [ ]; description = '' Fontconfig configuration packages. ''; }; - antialias = mkOption { - type = types.bool; + antialias = lib.mkOption { + type = lib.types.bool; default = true; description = '' Enable font antialiasing. At high resolution (> 200 DPI), @@ -312,8 +303,8 @@ in ''; }; - localConf = mkOption { - type = types.lines; + localConf = lib.mkOption { + type = lib.types.lines; default = ""; description = '' System-wide customization file contents, has higher priority than @@ -322,8 +313,8 @@ in }; defaultFonts = { - monospace = mkOption { - type = types.listOf types.str; + monospace = lib.mkOption { + type = lib.types.listOf lib.types.str; default = ["DejaVu Sans Mono"]; description = '' System-wide default monospace font(s). Multiple fonts may be @@ -331,8 +322,8 @@ in ''; }; - sansSerif = mkOption { - type = types.listOf types.str; + sansSerif = lib.mkOption { + type = lib.types.listOf lib.types.str; default = ["DejaVu Sans"]; description = '' System-wide default sans serif font(s). Multiple fonts may be @@ -340,8 +331,8 @@ in ''; }; - serif = mkOption { - type = types.listOf types.str; + serif = lib.mkOption { + type = lib.types.listOf lib.types.str; default = ["DejaVu Serif"]; description = '' System-wide default serif font(s). Multiple fonts may be listed @@ -349,8 +340,8 @@ in ''; }; - emoji = mkOption { - type = types.listOf types.str; + emoji = lib.mkOption { + type = lib.types.listOf lib.types.str; default = ["Noto Color Emoji"]; description = '' System-wide default emoji font(s). Multiple fonts may be listed @@ -366,8 +357,8 @@ in }; hinting = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Enable font hinting. Hinting aligns glyphs to pixel boundaries to @@ -377,8 +368,8 @@ in ''; }; - autohint = mkOption { - type = types.bool; + autohint = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable the autohinter in place of the default interpreter. @@ -387,8 +378,8 @@ in ''; }; - style = mkOption { - type = types.enum ["none" "slight" "medium" "full"]; + style = lib.mkOption { + type = lib.types.enum ["none" "slight" "medium" "full"]; default = "slight"; description = '' Hintstyle is the amount of font reshaping done to line up @@ -410,8 +401,8 @@ in }; }; - includeUserConf = mkOption { - type = types.bool; + includeUserConf = lib.mkOption { + type = lib.types.bool; default = true; description = '' Include the user configuration from @@ -422,9 +413,9 @@ in subpixel = { - rgba = mkOption { + rgba = lib.mkOption { default = "none"; - type = types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"]; + type = lib.types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"]; description = '' Subpixel order. The overwhelming majority of displays are `rgb` in their normal orientation. Select @@ -438,9 +429,9 @@ in ''; }; - lcdfilter = mkOption { + lcdfilter = lib.mkOption { default = "default"; - type = types.enum ["none" "default" "light" "legacy"]; + type = lib.types.enum ["none" "default" "light" "legacy"]; description = '' FreeType LCD filter. At high resolution (> 200 DPI), LCD filtering has no visible effect; users of such displays may want to select @@ -450,16 +441,16 @@ in }; - cache32Bit = mkOption { + cache32Bit = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Generate system fonts cache for 32-bit applications. ''; }; - allowBitmaps = mkOption { - type = types.bool; + allowBitmaps = lib.mkOption { + type = lib.types.bool; default = true; description = '' Allow bitmap fonts. Set to `false` to ban all @@ -467,8 +458,8 @@ in ''; }; - allowType1 = mkOption { - type = types.bool; + allowType1 = lib.mkOption { + type = lib.types.bool; default = false; description = '' Allow Type-1 fonts. Default is `false` because of @@ -476,8 +467,8 @@ in ''; }; - useEmbeddedBitmaps = mkOption { - type = types.bool; + useEmbeddedBitmaps = lib.mkOption { + type = lib.types.bool; default = false; description = "Use embedded bitmaps in fonts like Calibri."; }; @@ -487,8 +478,8 @@ in }; }; - config = mkMerge [ - (mkIf cfg.enable { + config = lib.mkMerge [ + (lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.fontconfig ]; environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; security.apparmor.includes."abstractions/fonts" = '' @@ -505,12 +496,12 @@ in r ${renderConf}, # 50-user.conf - ${optionalString cfg.includeUserConf '' + ${lib.optionalString cfg.includeUserConf '' r ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf, ''} # local.conf (indirect priority 51) - ${optionalString (cfg.localConf != "") '' + ${lib.optionalString (cfg.localConf != "") '' r ${localConf}, ''} @@ -520,13 +511,13 @@ in # 53-no-bitmaps.conf r ${rejectBitmaps}, - ${optionalString (!cfg.allowType1) '' + ${lib.optionalString (!cfg.allowType1) '' # 53-nixos-reject-type1.conf r ${rejectType1}, ''} ''; }) - (mkIf cfg.enable { + (lib.mkIf cfg.enable { fonts.fontconfig.confPackages = [ confPkg ]; }) ]; diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index e94186f19d767..515805ef5b1be 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -13,7 +13,7 @@ }; defaultText = lib.literalExpression '' pkgs.glibcLocales.override { - allLocales = any (x: x == "all") config.i18n.supportedLocales; + allLocales = lib.any (x: x == "all") config.i18n.supportedLocales; locales = config.i18n.supportedLocales; } ''; diff --git a/nixos/modules/config/ldso.nix b/nixos/modules/config/ldso.nix index 60156dd040983..f8d89db0220e3 100644 --- a/nixos/modules/config/ldso.nix +++ b/nixos/modules/config/ldso.nix @@ -32,7 +32,7 @@ in { config = { assertions = [ - { assertion = isNull config.environment.ldso32 || pkgs.stdenv.isx86_64; + { assertion = isNull config.environment.ldso32 || pkgs.stdenv.hostPlatform.isx86_64; message = "Option environment.ldso32 currently only works on x86_64."; } ]; @@ -44,7 +44,7 @@ in { "d /${libDir} 0755 root root - -" "L+ /${libDir}/${ldsoBasename} - - - - ${config.environment.ldso}" ] - ) ++ optionals pkgs.stdenv.isx86_64 ( + ) ++ optionals pkgs.stdenv.hostPlatform.isx86_64 ( if isNull config.environment.ldso32 then [ "r /${libDir32}/${ldsoBasename32} - - - - -" ] else [ diff --git a/nixos/modules/config/nix-flakes.nix b/nixos/modules/config/nix-flakes.nix index d6c31735a6ca9..90e207fd4a61e 100644 --- a/nixos/modules/config/nix-flakes.nix +++ b/nixos/modules/config/nix-flakes.nix @@ -72,7 +72,7 @@ in type = "path"; path = config.flake.outPath; } // filterAttrs - (n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") + (n: _: n == "lastModified" || n == "rev" || n == "narHash") config.flake )); }; diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix deleted file mode 100644 index e3fd0b34ddf4b..0000000000000 --- a/nixos/modules/config/no-x-libs.nix +++ /dev/null @@ -1,91 +0,0 @@ -# This module gets rid of all dependencies on X11 client libraries -# (including fontconfig). -{ config, lib, ... }: -{ - options = { - environment.noXlibs = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Switch off the options in the default configuration that - require X11 libraries. This includes client-side font - configuration and SSH forwarding of X11 authentication - in. Thus, you probably do not want to enable this option if - you want to run X11 programs on this machine via SSH. - ''; - }; - }; - - config = lib.mkIf config.environment.noXlibs { - programs.ssh.setXAuthLocation = false; - security.pam.services.su.forwardXAuth = lib.mkForce false; - - fonts.fontconfig.enable = false; - - nixpkgs.overlays = lib.singleton (lib.const (super: { - beam = super.beam_nox; - cairo = super.cairo.override { x11Support = false; }; - dbus = super.dbus.override { x11Support = false; }; - fastfetch = super.fastfetch.override { vulkanSupport = false; waylandSupport = false; x11Support = false; }; - ffmpeg = super.ffmpeg.override { ffmpegVariant = "headless"; }; - ffmpeg_4 = super.ffmpeg_4.override { ffmpegVariant = "headless"; }; - ffmpeg_6 = super.ffmpeg_6.override { ffmpegVariant = "headless"; }; - ffmpeg_7 = super.ffmpeg_7.override { ffmpegVariant = "headless"; }; - # dep of graphviz, libXpm is optional for Xpm support - gd = super.gd.override { withXorg = false; }; - ghostscript = super.ghostscript.override { cupsSupport = false; x11Support = false; }; - gjs = (super.gjs.override { installTests = false; }).overrideAttrs { doCheck = false; }; # avoid test dependency on gtk3 - gobject-introspection = super.gobject-introspection.override { x11Support = false; }; - gpg-tui = super.gpg-tui.override { x11Support = false; }; - gpsd = super.gpsd.override { guiSupport = false; }; - graphviz = super.graphviz-nox; - gst_all_1 = super.gst_all_1 // { - gst-plugins-bad = super.gst_all_1.gst-plugins-bad.override { guiSupport = false; }; - gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableGl = false; enableWayland = false; enableX11 = false; }; - gst-plugins-good = super.gst_all_1.gst-plugins-good.override { enableWayland = false; enableX11 = false; gtkSupport = false; qt5Support = false; qt6Support = false; }; - gst-plugins-rs = super.gst_all_1.gst-plugins-rs.override { withGtkPlugins = false; }; - }; - imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; - imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; - intel-vaapi-driver = super.intel-vaapi-driver.override { enableGui = false; }; - libdevil = super.libdevil-nox; - libextractor = super.libextractor.override { gtkSupport = false; }; - libplacebo = super.libplacebo.override { vulkanSupport = false; }; - libva = super.libva-minimal; - limesuite = super.limesuite.override { withGui = false; }; - mc = super.mc.override { x11Support = false; }; - mpv-unwrapped = super.mpv-unwrapped.override { drmSupport = false; screenSaverSupport = false; sdl2Support = false; vulkanSupport = false; waylandSupport = false; x11Support = false; }; - msmtp = super.msmtp.override { withKeyring = false; }; - mupdf = super.mupdf.override { enableGL = false; enableX11 = false; }; - neofetch = super.neofetch.override { x11Support = false; }; - networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; - networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; - networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; }; - networkmanager-openconnect = super.networkmanager-openconnect.override { withGnome = false; }; - networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; - networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; }; - networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; - pango = super.pango.override { x11Support = false; }; - pinentry-curses = super.pinentry-curses.override { withLibsecret = false; }; - pinentry-tty = super.pinentry-tty.override { withLibsecret = false; }; - pipewire = super.pipewire.override { vulkanSupport = false; x11Support = false; }; - pythonPackagesExtensions = super.pythonPackagesExtensions ++ [ - (python-final: python-prev: { - # tk feature requires wayland which fails to compile - matplotlib = python-prev.matplotlib.override { enableTk = false; }; - }) - ]; - qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; - qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; }); - qt5 = super.qt5.overrideScope (lib.const (super': { - qtbase = super'.qtbase.override { withGtk3 = false; withQttranslation = false; }; - })); - stoken = super.stoken.override { withGTK3 = false; }; - # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11 - util-linux = super.util-linux.override { translateManpages = false; }; - vim-full = super.vim-full.override { guiSupport = false; }; - vte = super.vte.override { gtkVersion = null; }; - zbar = super.zbar.override { enableVideo = false; withXorg = false; }; - })); - }; -} diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 6a6aeaab6541f..6e6e577e6e204 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -12,7 +12,7 @@ let # Forces 32bit pulseaudio and alsa-plugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = cfg.support32Bit && pkgs.stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null); + enable32BitAlsaPlugins = cfg.support32Bit && pkgs.stdenv.hostPlatform.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null); myConfigFile = diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix index 9fee272410dc0..3609b1ba475b8 100644 --- a/nixos/modules/config/resolvconf.nix +++ b/nixos/modules/config/resolvconf.nix @@ -35,7 +35,7 @@ in (lib.mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ]) (lib.mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ]) (lib.mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ]) - (lib.mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for lib.anything lib.anyways") + (lib.mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for anything anyways") ]; options = { diff --git a/nixos/modules/config/stub-ld.nix b/nixos/modules/config/stub-ld.nix index 87b7bdf07a2d0..05945852ee45c 100644 --- a/nixos/modules/config/stub-ld.nix +++ b/nixos/modules/config/stub-ld.nix @@ -49,7 +49,7 @@ in { config = mkIf cfg.enable { environment.ldso = mkDefault stub-ld; - environment.ldso32 = mkIf pkgs.stdenv.isx86_64 (mkDefault stub-ld32); + environment.ldso32 = mkIf pkgs.stdenv.hostPlatform.isx86_64 (mkDefault stub-ld32); }; meta.maintainers = with lib.maintainers; [ tejing ]; diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix index bf8bc43d6bb57..78d4847092d5d 100644 --- a/nixos/modules/config/terminfo.nix +++ b/nixos/modules/config/terminfo.nix @@ -24,25 +24,35 @@ config = { + # This should not contain packages that are broken or can't build, since it + # will break this expression + # + # Currently broken packages: + # - contour + # # can be generated with: # lib.attrNames (lib.filterAttrs # (_: drv: (builtins.tryEval (lib.isDerivation drv && drv ? terminfo)).value) # pkgs) - environment.systemPackages = lib.mkIf config.environment.enableAllTerminfo (map (x: x.terminfo) (with pkgs.pkgsBuildBuild; [ - alacritty - contour - foot - kitty - mtm - rio - rxvt-unicode-unwrapped - rxvt-unicode-unwrapped-emoji - st - termite - tmux - wezterm - yaft - ])); + environment.systemPackages = lib.mkIf config.environment.enableAllTerminfo ( + map (x: x.terminfo) ( + with pkgs.pkgsBuildBuild; + [ + alacritty + foot + kitty + mtm + rio + rxvt-unicode-unwrapped + rxvt-unicode-unwrapped-emoji + st + termite + tmux + wezterm + yaft + ] + ) + ); environment.pathsToLink = [ "/share/terminfo" diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix index 9e2b3c2e46e08..b0267d21d3eb3 100644 --- a/nixos/modules/config/xdg/icons.nix +++ b/nixos/modules/config/xdg/icons.nix @@ -13,6 +13,14 @@ [XDG Icon Theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html). ''; }; + xdg.icons.fallbackCursorThemes = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = []; + description = '' + Names of the fallback cursor themes, in order of preference, to be used when no other icon source can be found. + Set to `[]` to disable the fallback entirely. + ''; + }; }; config = lib.mkIf config.xdg.icons.enable { @@ -25,6 +33,15 @@ # Empty icon theme that contains index.theme file describing directories # where toolkits should look for icons installed by apps. pkgs.hicolor-icon-theme + ] ++ lib.optionals (config.xdg.icons.fallbackCursorThemes != []) [ + (pkgs.writeTextFile { + name = "fallback-cursor-theme"; + text = '' + [Icon Theme] + Inherits=${lib.concatStringsSep "," config.xdg.icons.fallbackCursorThemes} + ''; + destination = "/share/icons/default/index.theme"; + }) ]; # libXcursor looks for cursors in XCURSOR_PATH diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index ec4e13169fa38..7e66a32c7db20 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -83,7 +83,7 @@ in configPackages = mkOption { type = types.listOf types.package; default = [ ]; - example = lib.literalExpression "[ pkgs.gnome.gnome-session ]"; + example = lib.literalExpression "[ pkgs.gnome-session ]"; description = '' List of packages that provide XDG desktop portal configuration, usually in the form of `share/xdg-desktop-portal/$desktop-portals.conf`. diff --git a/nixos/modules/hardware/cpu/amd-microcode.nix b/nixos/modules/hardware/cpu/amd-microcode.nix index 9633478592e84..25ce70a5811dd 100644 --- a/nixos/modules/hardware/cpu/amd-microcode.nix +++ b/nixos/modules/hardware/cpu/amd-microcode.nix @@ -16,7 +16,7 @@ ###### implementation config = lib.mkIf config.hardware.cpu.amd.updateMicrocode { # Microcode updates must be the first item prepended in the initrd - boot.initrd.prepend = lib.mkOrder 1 [ "${pkgs.microcodeAmd}/amd-ucode.img" ]; + boot.initrd.prepend = lib.mkOrder 1 [ "${pkgs.microcode-amd}/amd-ucode.img" ]; }; } diff --git a/nixos/modules/hardware/cpu/intel-microcode.nix b/nixos/modules/hardware/cpu/intel-microcode.nix index 20e8518bf4104..e708d447910e9 100644 --- a/nixos/modules/hardware/cpu/intel-microcode.nix +++ b/nixos/modules/hardware/cpu/intel-microcode.nix @@ -16,7 +16,7 @@ ###### implementation config = lib.mkIf config.hardware.cpu.intel.updateMicrocode { # Microcode updates must be the first item prepended in the initrd - boot.initrd.prepend = lib.mkOrder 1 [ "${pkgs.microcodeIntel}/intel-ucode.img" ]; + boot.initrd.prepend = lib.mkOrder 1 [ "${pkgs.microcode-intel}/intel-ucode.img" ]; }; } diff --git a/nixos/modules/hardware/graphics.nix b/nixos/modules/hardware/graphics.nix index 99c122f75c2a1..2d6b377ae5fb7 100644 --- a/nixos/modules/hardware/graphics.nix +++ b/nixos/modules/hardware/graphics.nix @@ -14,7 +14,7 @@ let in { imports = [ - (lib.mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ]) + (lib.mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "graphics" "extraPackages" ]) (lib.mkRemovedOptionModule [ "hardware" "opengl" "s3tcSupport" ] "S3TC support is now always enabled in Mesa.") (lib.mkRemovedOptionModule [ "hardware" "opengl" "driSupport"] "The setting can be removed.") @@ -100,7 +100,7 @@ in config = lib.mkIf cfg.enable { assertions = [ { - assertion = cfg.enable32Bit -> pkgs.stdenv.isx86_64; + assertion = cfg.enable32Bit -> pkgs.stdenv.hostPlatform.isx86_64; message = "`hardware.graphics.enable32Bit` only makes sense on a 64-bit system."; } { @@ -112,7 +112,7 @@ in systemd.tmpfiles.settings.graphics-driver = { "/run/opengl-driver"."L+".argument = toString driversEnv; "/run/opengl-driver-32" = - if pkgs.stdenv.isi686 then + if pkgs.stdenv.hostPlatform.isi686 then { "L+".argument = "opengl-driver"; } else if cfg.enable32Bit then { "L+".argument = toString driversEnv32; } diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 8a8cd46cdf5a7..3d3165e44913d 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -10,13 +10,15 @@ let cfg = config.hardware.nvidia; + useOpenModules = cfg.open == true; + pCfg = cfg.prime; syncCfg = pCfg.sync; offloadCfg = pCfg.offload; reverseSyncCfg = pCfg.reverseSync; primeEnabled = syncCfg.enable || reverseSyncCfg.enable || offloadCfg.enable; busIDType = lib.types.strMatching "([[:print:]]+[\:\@][0-9]{1,3}\:[0-9]{1,2}\:[0-9])?"; - ibtSupport = cfg.open || (nvidia_x11.ibtSupport or false); + ibtSupport = useOpenModules || (nvidia_x11.ibtSupport or false); settingsFormat = pkgs.formats.keyValue { }; in { @@ -257,17 +259,19 @@ in open = lib.mkOption { example = true; description = "Whether to enable the open source NVIDIA kernel module."; - type = lib.types.bool; + type = lib.types.nullOr lib.types.bool; + default = if lib.versionOlder nvidia_x11.version "560" then false else null; defaultText = lib.literalExpression '' - lib.mkIf (lib.versionOlder config.hardware.nvidia.package.version "560") false + if lib.versionOlder config.hardware.nvidia.package.version "560" then false else null ''; }; gsp.enable = lib.mkEnableOption '' the GPU System Processor (GSP) on the video card '' // { + default = useOpenModules || lib.versionAtLeast nvidia_x11.version "555"; defaultText = lib.literalExpression '' - config.hardware.nvidia.open || lib.versionAtLeast config.hardware.nvidia.package.version "555" + config.hardware.nvidia.open == true || lib.versionAtLeast config.hardware.nvidia.package.version "555" ''; }; }; @@ -287,6 +291,13 @@ in assertion = !(nvidiaEnabled && cfg.datacenter.enable); message = "You cannot configure both X11 and Data Center drivers at the same time."; } + { + assertion = cfg.open != null; + message = '' + You must configure `hardware.nvidia.open` on NVIDIA driver versions >= 560. + It is suggested to use the open source kernel modules on Turing or later GPUs (RTX series, GTX 16xx), and the closed source modules otherwise. + ''; + } ]; boot = { blacklistedKernelModules = [ @@ -318,9 +329,6 @@ in extraPackages32 = [ nvidia_x11.lib32 ]; }; environment.systemPackages = [ nvidia_x11.bin ]; - - hardware.nvidia.open = lib.mkIf (lib.versionOlder nvidia_x11.version "560") (lib.mkDefault false); - hardware.nvidia.gsp.enable = lib.mkDefault (cfg.open || lib.versionAtLeast nvidia_x11.version "555"); }) # X11 @@ -384,12 +392,12 @@ in } { - assertion = cfg.open -> (cfg.package ? open); + assertion = useOpenModules -> (cfg.package ? open); message = "This version of NVIDIA driver does not provide a corresponding opensource kernel driver."; } { - assertion = cfg.open -> cfg.gsp.enable; + assertion = useOpenModules -> cfg.gsp.enable; message = "The GSP cannot be disabled when using the opensource kernel driver."; } @@ -592,7 +600,7 @@ in "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced"; boot = { - extraModulePackages = if cfg.open then [ nvidia_x11.open ] else [ nvidia_x11.bin ]; + extraModulePackages = if useOpenModules then [ nvidia_x11.open ] else [ nvidia_x11.bin ]; # nvidia-uvm is required by CUDA applications. kernelModules = lib.optionals config.services.xserver.enable [ @@ -603,14 +611,14 @@ in # With the open driver, nvidia-uvm does not automatically load as # a softdep of the nvidia module, so we explicitly load it for now. # See https://github.com/NixOS/nixpkgs/issues/334180 - ++ lib.optionals (config.services.xserver.enable && cfg.open) [ "nvidia_uvm" ]; + ++ lib.optionals (config.services.xserver.enable && useOpenModules) [ "nvidia_uvm" ]; # If requested enable modesetting via kernel parameters. kernelParams = lib.optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" ++ lib.optional ((offloadCfg.enable || cfg.modesetting.enable) && lib.versionAtLeast nvidia_x11.version "545") "nvidia-drm.fbdev=1" ++ lib.optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1" - ++ lib.optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1" + ++ lib.optional useOpenModules "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1" ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off"; # enable finegrained power management diff --git a/nixos/modules/image/assert_uki_repart_match.py b/nixos/modules/image/assert_uki_repart_match.py new file mode 100644 index 0000000000000..e0f266cf15bfb --- /dev/null +++ b/nixos/modules/image/assert_uki_repart_match.py @@ -0,0 +1,78 @@ +import json +import sys + +store_verity_type = "@NIX_STORE_VERITY@" # replaced at import by Nix + + +def extract_uki_cmdline_params(ukify_json: dict) -> dict[str, str]: + """ + Return a dict of the parameters in the .cmdline section of the UKI + Exits early if "usrhash" is not included. + """ + cmdline = ukify_json.get(".cmdline", {}).get("text") + if cmdline is None: + print("Failed to get cmdline from ukify output") + + params = {} + for param in cmdline.split(): + key, val = param.partition("=")[::2] + params[key] = val + + if "usrhash" not in params: + print( + f"UKI cmdline does not contain a usrhash:\n{cmdline}" + ) + exit(1) + + return params + + +def hashes_match(partition: dict[str, str], expected: str) -> bool: + """ + Checks if the value of the "roothash" key in the passed partition object matches `expected`. + """ + if partition.get("roothash") != expected: + pretty_part = json.dumps(partition, indent=2) + print( + f"hash mismatch, expected to find roothash {expected} in:\n{pretty_part}" + ) + return False + else: + return True + + +def check_partitions( + partitions: list[dict], uki_params: dict[str, str] +) -> bool: + """ + Checks if the usrhash from `uki_params` has a matching roothash + for the corresponding partition in `partitions`. + """ + for part in partitions: + if part.get("type") == store_verity_type: + expected = uki_params["usrhash"] + return hashes_match(part, expected) + + return False + + +def main() -> None: + ukify_json = json.load(sys.stdin) + repart_json_output = sys.argv[1] + + with open(repart_json_output, "r") as r: + repart_json = json.load(r) + + uki_params = extract_uki_cmdline_params(ukify_json) + + if check_partitions(repart_json, uki_params): + print("UKI and repart verity hashes match") + else: + print("Compatibility check for UKI and image failed!") + print(f"UKI cmdline parameters:\n{uki_params}") + print(f"repart config: {repart_json_output}") + exit(1) + + +if __name__ == "__main__": + main() diff --git a/nixos/modules/image/repart-image.nix b/nixos/modules/image/repart-image.nix index 41f68a0282ac9..cc4c2211e3d30 100644 --- a/nixos/modules/image/repart-image.nix +++ b/nixos/modules/image/repart-image.nix @@ -30,7 +30,7 @@ , imageFileBasename , compression , fileSystems -, partitionsJSON +, finalPartitions , split , seed , definitionsDirectory @@ -110,7 +110,9 @@ in env = mkfsEnv; - inherit partitionsJSON definitionsDirectory; + inherit finalPartitions definitionsDirectory; + + partitionsJSON = builtins.toJSON finalAttrs.finalPartitions; # relative path to the repart definitions that are read by systemd-repart finalRepartDefinitions = "repart.d"; @@ -136,7 +138,7 @@ in patchPhase = '' runHook prePatch - amendedRepartDefinitionsDir=$(${amendRepartDefinitions} $partitionsJSON $definitionsDirectory) + amendedRepartDefinitionsDir=$(${amendRepartDefinitions} <(echo "$partitionsJSON") $definitionsDirectory) ln -vs $amendedRepartDefinitionsDir $finalRepartDefinitions runHook postPatch diff --git a/nixos/modules/image/repart-verity-store.nix b/nixos/modules/image/repart-verity-store.nix new file mode 100644 index 0000000000000..e8706a5f79d07 --- /dev/null +++ b/nixos/modules/image/repart-verity-store.nix @@ -0,0 +1,226 @@ +# opinionated module that can be used to build nixos images with +# a dm-verity protected nix store +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.image.repart.verityStore; + + verityMatchKey = "store"; + + # TODO: make these and other arch mappings available from systemd-lib for example + partitionTypes = { + usr = + { + "x86_64" = "usr-x86-64"; + "arm64" = "usr-arm64"; + } + ."${pkgs.stdenv.hostPlatform.linuxArch}"; + + usr-verity = + { + "x86_64" = "usr-x86-64-verity"; + "arm64" = "usr-arm64-verity"; + } + ."${pkgs.stdenv.hostPlatform.linuxArch}"; + }; + + verityHashCheck = + pkgs.buildPackages.writers.writePython3Bin "assert_uki_repart_match.py" + { + flakeIgnore = [ "E501" ]; # ignores PEP8's line length limit of 79 (black defaults to 88 characters) + } + ( + builtins.replaceStrings [ "@NIX_STORE_VERITY@" ] [ + partitionTypes.usr-verity + ] (builtins.readFile ./assert_uki_repart_match.py) + ); +in +{ + options.image.repart.verityStore = { + enable = lib.mkEnableOption "building images with a dm-verity protected nix store"; + + ukiPath = lib.mkOption { + type = lib.types.str; + default = "/EFI/Linux/${config.system.boot.loader.ukiFile}"; + defaultText = "/EFI/Linux/\${config.system.boot.loader.ukiFile}"; + description = '' + Specify the location on the ESP where the UKI is placed. + ''; + }; + + partitionIds = { + esp = lib.mkOption { + type = lib.types.str; + default = "00-esp"; + description = '' + Specify the attribute name of the ESP. + ''; + }; + store-verity = lib.mkOption { + type = lib.types.str; + default = "10-store-verity"; + description = '' + Specify the attribute name of the store's dm-verity hash partition. + ''; + }; + store = lib.mkOption { + type = lib.types.str; + default = "20-store"; + description = '' + Specify the attribute name of the store partition. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + boot.initrd.systemd.dmVerity.enable = true; + + image.repart.partitions = { + # dm-verity hash partition + ${cfg.partitionIds.store-verity}.repartConfig = { + Type = partitionTypes.usr-verity; + Verity = "hash"; + VerityMatchKey = lib.mkDefault verityMatchKey; + Label = lib.mkDefault "store-verity"; + }; + # dm-verity data partition that contains the nix store + ${cfg.partitionIds.store} = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = partitionTypes.usr; + Verity = "data"; + Format = lib.mkDefault "erofs"; + VerityMatchKey = lib.mkDefault verityMatchKey; + Label = lib.mkDefault "store"; + }; + }; + + }; + + system.build = { + + # intermediate system image without ESP + intermediateImage = + (config.system.build.image.override { + # always disable compression for the intermediate image + compression.enable = false; + }).overrideAttrs + ( + _: previousAttrs: { + # make it easier to identify the intermediate image in build logs + pname = "${previousAttrs.pname}-intermediate"; + + # do not prepare the ESP, this is done in the final image + systemdRepartFlags = previousAttrs.systemdRepartFlags ++ [ "--defer-partitions=esp" ]; + + # the image will be self-contained so we can drop references + # to the closure that was used to build it + unsafeDiscardReferences.out = true; + } + ); + + # UKI with embedded usrhash from intermediateImage + uki = + let + inherit (config.system.boot.loader) ukiFile; + cmdline = "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}"; + in + # override the default UKI + lib.mkOverride 99 ( + pkgs.runCommand ukiFile + { + nativeBuildInputs = [ + pkgs.jq + pkgs.systemdUkify + ]; + } + '' + mkdir -p $out + + # Extract the usrhash from the output of the systemd-repart invocation for the intermediate image. + usrhash=$(jq -r \ + '.[] | select(.type=="${partitionTypes.usr-verity}") | .roothash' \ + ${config.system.build.intermediateImage}/repart-output.json + ) + + # Build UKI with the embedded usrhash. + ukify build \ + --config=${config.boot.uki.configFile} \ + --cmdline="${cmdline} usrhash=$usrhash" \ + --output="$out/${ukiFile}" + '' + ); + + # final system image that is created from the intermediate image by injecting the UKI from above + finalImage = + (config.system.build.image.override { + # continue building with existing intermediate image + createEmpty = false; + }).overrideAttrs + ( + finalAttrs: previousAttrs: { + # add entry to inject UKI into ESP + finalPartitions = lib.recursiveUpdate previousAttrs.finalPartitions { + ${cfg.partitionIds.esp}.contents = { + "${cfg.ukiPath}".source = "${config.system.build.uki}/${config.system.boot.loader.ukiFile}"; + }; + }; + + nativeBuildInputs = previousAttrs.nativeBuildInputs ++ [ + pkgs.systemdUkify + verityHashCheck + pkgs.jq + ]; + + preBuild = '' + # check that we build the final image with the same intermediate image for + # which the injected UKI was built by comparing the UKI cmdline with the repart output + # of the intermediate image + # + # This is necessary to notice incompatible substitutions of + # non-reproducible store paths, for example when working with distributed + # builds, or when offline-signing the UKI. + ukify --json=short inspect ${config.system.build.uki}/${config.system.boot.loader.ukiFile} \ + | assert_uki_repart_match.py "${config.system.build.intermediateImage}/repart-output.json" + + # copy the uncompressed intermediate image, so that systemd-repart picks it up + cp -v ${config.system.build.intermediateImage}/${config.image.repart.imageFileBasename}.raw . + chmod +w ${config.image.repart.imageFileBasename}.raw + ''; + + # replace "TBD" with the original roothash values + preInstall = '' + mv -v repart-output{.json,_orig.json} + + jq --slurp --indent -1 \ + '.[0] as $intermediate | .[1] as $final + | $intermediate | map(select(.roothash != null) | { "uuid":.uuid,"roothash":.roothash }) as $uuids + | $final + $uuids + | group_by(.uuid) + | map(add) + | sort_by(.offset)' \ + ${config.system.build.intermediateImage}/repart-output.json \ + repart-output_orig.json \ + > repart-output.json + + rm -v repart-output_orig.json + ''; + + # the image will be self-contained so we can drop references + # to the closure that was used to build it + unsafeDiscardReferences.out = true; + } + ); + }; + }; + + meta.maintainers = with lib.maintainers; [ + nikstur + willibutz + ]; +} diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index e471f9485cd03..544779cd6e9b3 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -69,6 +69,10 @@ let }) opts; in { + imports = [ + ./repart-verity-store.nix + ]; + options.image.repart = { name = lib.mkOption { @@ -314,14 +318,12 @@ in format (lib.mapAttrs (_n: v: { Partition = v.repartConfig; }) cfg.finalPartitions); - partitionsJSON = pkgs.writeText "partitions.json" (builtins.toJSON cfg.finalPartitions); - mkfsEnv = mkfsOptionsToEnv cfg.mkfsOptions; in pkgs.callPackage ./repart-image.nix { systemd = cfg.package; - inherit (cfg) name version imageFileBasename compression split seed sectorSize; - inherit fileSystems definitionsDirectory partitionsJSON mkfsEnv; + inherit (cfg) name version imageFileBasename compression split seed sectorSize finalPartitions; + inherit fileSystems definitionsDirectory mkfsEnv; }; meta.maintainers = with lib.maintainers; [ nikstur willibutz ]; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 3f92b779d60a2..d36c90c6254eb 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -1,10 +1,6 @@ # This module contains the basic configuration for building a NixOS # installation CD. - { config, lib, options, pkgs, ... }: - -with lib; - { imports = [ ./iso-image.nix @@ -32,8 +28,8 @@ with lib; # An installation media cannot tolerate a host config defined file # system layout on a fresh machine, before it has been formatted. - swapDevices = mkImageMediaOverride [ ]; - fileSystems = mkImageMediaOverride config.lib.isoFileSystems; + swapDevices = lib.mkImageMediaOverride [ ]; + fileSystems = lib.mkImageMediaOverride config.lib.isoFileSystems; boot.postBootCommands = '' for o in $( $out/EFI/boot/grub.cfg + cat < $out/EFI/BOOT/grub.cfg - set textmode=${boolToString (config.isoImage.forceTextMode)} + set textmode=${lib.boolToString (config.isoImage.forceTextMode)} set timeout=${toString grubEfiTimeout} clear @@ -335,12 +331,12 @@ let ${grubMenuCfg} hiddenentry 'Text mode' --hotkey 't' { - loadfont (\$root)/EFI/boot/unicode.pf2 + loadfont (\$root)/EFI/BOOT/unicode.pf2 set textmode=true terminal_output console } hiddenentry 'GUI mode' --hotkey 'g' { - $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/boot/grub-theme/%P\n") + $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/BOOT/grub-theme/%P\n") set textmode=false terminal_output gfxterm } @@ -415,7 +411,7 @@ let # Force root to be the FAT partition # Otherwise it breaks rEFInd's boot search --set=root --no-floppy --fs-uuid 1234-5678 - chainloader (\$root)/EFI/boot/${refindBinary} + chainloader (\$root)/EFI/BOOT/${refindBinary} } fi ''} @@ -431,7 +427,7 @@ let } EOF - grub-script-check $out/EFI/boot/grub.cfg + grub-script-check $out/EFI/BOOT/grub.cfg ${refind} ''; @@ -444,8 +440,8 @@ let # dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i) '' mkdir ./contents && cd ./contents - mkdir -p ./EFI/boot - cp -rp "${efiDir}"/EFI/boot/{grub.cfg,*.efi} ./EFI/boot + mkdir -p ./EFI/BOOT + cp -rp "${efiDir}"/EFI/BOOT/{grub.cfg,*.EFI,*.efi} ./EFI/BOOT # Rewrite dates for everything in the FS find . -exec touch --date=2000-01-01 {} + @@ -480,7 +476,7 @@ in { options = { - isoImage.isoName = mkOption { + isoImage.isoName = lib.mkOption { default = "${config.isoImage.isoBaseName}.iso"; type = lib.types.str; description = '' @@ -488,7 +484,7 @@ in ''; }; - isoImage.isoBaseName = mkOption { + isoImage.isoBaseName = lib.mkOption { default = config.system.nixos.distroId; type = lib.types.str; description = '' @@ -496,7 +492,7 @@ in ''; }; - isoImage.compressImage = mkOption { + isoImage.compressImage = lib.mkOption { default = false; type = lib.types.bool; description = '' @@ -505,13 +501,8 @@ in ''; }; - isoImage.squashfsCompression = mkOption { - default = with pkgs.stdenv.hostPlatform; "xz -Xdict-size 100% " - + lib.optionalString isx86 "-Xbcj x86" - # Untested but should also reduce size for these platforms - + lib.optionalString isAarch "-Xbcj arm" - + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc" - + lib.optionalString (isSparc) "-Xbcj sparc"; + isoImage.squashfsCompression = lib.mkOption { + default = "zstd -Xcompression-level 19"; type = lib.types.nullOr lib.types.str; description = '' Compression settings to use for the squashfs nix store. @@ -520,7 +511,7 @@ in example = "zstd -Xcompression-level 6"; }; - isoImage.edition = mkOption { + isoImage.edition = lib.mkOption { default = ""; type = lib.types.str; description = '' @@ -529,9 +520,9 @@ in ''; }; - isoImage.volumeID = mkOption { + isoImage.volumeID = lib.mkOption { # nixos-$EDITION-$RELEASE-$ARCH - default = "nixos${optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}"}-${config.system.nixos.release}-${pkgs.stdenv.hostPlatform.uname.processor}"; + default = "nixos${lib.optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}"}-${config.system.nixos.release}-${pkgs.stdenv.hostPlatform.uname.processor}"; type = lib.types.str; description = '' Specifies the label or volume ID of the generated ISO image. @@ -540,8 +531,8 @@ in ''; }; - isoImage.contents = mkOption { - example = literalExpression '' + isoImage.contents = lib.mkOption { + example = lib.literalExpression '' [ { source = pkgs.memtest86 + "/memtest.bin"; target = "boot/memtest.bin"; } @@ -553,15 +544,15 @@ in ''; }; - isoImage.storeContents = mkOption { - example = literalExpression "[ pkgs.stdenv ]"; + isoImage.storeContents = lib.mkOption { + example = lib.literalExpression "[ pkgs.stdenv ]"; description = '' This option lists additional derivations to be included in the Nix store in the generated ISO image. ''; }; - isoImage.includeSystemBuildDependencies = mkOption { + isoImage.includeSystemBuildDependencies = lib.mkOption { default = false; type = lib.types.bool; description = '' @@ -573,7 +564,7 @@ in ''; }; - isoImage.makeBiosBootable = mkOption { + isoImage.makeBiosBootable = lib.mkOption { # Before this option was introduced, images were BIOS-bootable if the # hostPlatform was x86-based. This option is enabled by default for # backwards compatibility. @@ -591,7 +582,7 @@ in ''; }; - isoImage.makeEfiBootable = mkOption { + isoImage.makeEfiBootable = lib.mkOption { default = false; type = lib.types.bool; description = '' @@ -599,7 +590,7 @@ in ''; }; - isoImage.makeUsbBootable = mkOption { + isoImage.makeUsbBootable = lib.mkOption { default = false; type = lib.types.bool; description = '' @@ -607,7 +598,7 @@ in ''; }; - isoImage.efiSplashImage = mkOption { + isoImage.efiSplashImage = lib.mkOption { default = pkgs.fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/a9e05d7deb38a8e005a2b52575a3f59a63a4dba0/bootloader/efi-background.png"; sha256 = "18lfwmp8yq923322nlb9gxrh5qikj1wsk6g5qvdh31c4h5b1538x"; @@ -617,7 +608,7 @@ in ''; }; - isoImage.splashImage = mkOption { + isoImage.splashImage = lib.mkOption { default = pkgs.fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/a9e05d7deb38a8e005a2b52575a3f59a63a4dba0/bootloader/isolinux/bios-boot.png"; sha256 = "1wp822zrhbg4fgfbwkr7cbkr4labx477209agzc0hr6k62fr6rxd"; @@ -627,15 +618,15 @@ in ''; }; - isoImage.grubTheme = mkOption { + isoImage.grubTheme = lib.mkOption { default = pkgs.nixos-grub2-theme; - type = types.nullOr (types.either types.path types.package); + type = lib.types.nullOr (lib.types.either lib.types.path lib.types.package); description = '' The grub2 theme used for UEFI boot. ''; }; - isoImage.syslinuxTheme = mkOption { + isoImage.syslinuxTheme = lib.mkOption { default = '' MENU TITLE ${config.system.nixos.distroName} MENU RESOLUTION 800 600 @@ -660,15 +651,15 @@ in MENU COLOR UNSEL 37;44 #FF000000 #00000000 none MENU COLOR SEL 7;37;40 #FFFFFFFF #FF5277C3 std ''; - type = types.str; + type = lib.types.str; description = '' The syslinux theme used for BIOS boot. ''; }; - isoImage.prependToMenuLabel = mkOption { + isoImage.prependToMenuLabel = lib.mkOption { default = ""; - type = types.str; + type = lib.types.str; example = "Install "; description = '' The string to prepend before the menu label for the NixOS system. @@ -679,9 +670,9 @@ in ''; }; - isoImage.appendToMenuLabel = mkOption { + isoImage.appendToMenuLabel = lib.mkOption { default = " Installer"; - type = types.str; + type = lib.types.str; example = " Live System"; description = '' The string to append after the menu label for the NixOS system. @@ -692,9 +683,9 @@ in ''; }; - isoImage.forceTextMode = mkOption { + isoImage.forceTextMode = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; example = true; description = '' Whether to use text mode instead of graphical grub. @@ -711,7 +702,7 @@ in # store them in lib so we can mkImageMediaOverride the # entire file system layout in installation media (only) config.lib.isoFileSystems = { - "/" = mkImageMediaOverride + "/" = lib.mkImageMediaOverride { fsType = "tmpfs"; options = [ "mode=0755" ]; @@ -720,7 +711,7 @@ in # Note that /dev/root is a symlink to the actual root device # specified on the kernel command line, created in the stage 1 # init script. - "/iso" = mkImageMediaOverride + "/iso" = lib.mkImageMediaOverride { device = "/dev/root"; neededForBoot = true; noCheck = true; @@ -728,20 +719,20 @@ in # In stage 1, mount a tmpfs on top of /nix/store (the squashfs # image) to make this a live CD. - "/nix/.ro-store" = mkImageMediaOverride + "/nix/.ro-store" = lib.mkImageMediaOverride { fsType = "squashfs"; device = "/iso/nix-store.squashfs"; - options = [ "loop" ]; + options = [ "loop" ] ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "threads=multi"; neededForBoot = true; }; - "/nix/.rw-store" = mkImageMediaOverride + "/nix/.rw-store" = lib.mkImageMediaOverride { fsType = "tmpfs"; options = [ "mode=0755" ]; neededForBoot = true; }; - "/nix/store" = mkImageMediaOverride + "/nix/store" = lib.mkImageMediaOverride { fsType = "overlay"; device = "overlay"; options = [ @@ -765,11 +756,11 @@ in message = "BIOS boot is only supported on x86-based architectures."; } { - assertion = !(stringLength config.isoImage.volumeID > 32); + assertion = !(lib.stringLength config.isoImage.volumeID > 32); # https://wiki.osdev.org/ISO_9660#The_Primary_Volume_Descriptor # Volume Identifier can only be 32 bytes message = let - length = stringLength config.isoImage.volumeID; + length = lib.stringLength config.isoImage.volumeID; howmany = toString length; toomany = toString (length - 32); in @@ -781,9 +772,10 @@ in # here and it causes a cyclic dependency. boot.loader.grub.enable = false; - environment.systemPackages = [ grubPkgs.grub2 grubPkgs.grub2_efi ] - ++ optional (config.isoImage.makeBiosBootable) pkgs.syslinux + environment.systemPackages = [ grubPkgs.grub2 ] + ++ lib.optional (config.isoImage.makeBiosBootable) pkgs.syslinux ; + system.extraDependencies = [ grubPkgs.grub2_efi ]; # In stage 1 of the boot, mount the CD as the root FS by label so # that we don't need to know its device. We pass the label of the @@ -808,7 +800,7 @@ in # script and the top-level system configuration directory. isoImage.storeContents = [ config.system.build.toplevel ] ++ - optional config.isoImage.includeSystemBuildDependencies + lib.optional config.isoImage.includeSystemBuildDependencies config.system.build.toplevel.drvPath; # Individual files to be included on the CD, outside of the Nix @@ -824,7 +816,7 @@ in { source = pkgs.writeText "version" config.system.nixos.label; target = "/version.txt"; } - ] ++ optionals (config.isoImage.makeBiosBootable) [ + ] ++ lib.optionals (config.isoImage.makeBiosBootable) [ { source = config.isoImage.splashImage; target = "/isolinux/background.png"; } @@ -838,26 +830,26 @@ in { source = "${pkgs.syslinux}/share/syslinux"; target = "/isolinux"; } - ] ++ optionals config.isoImage.makeEfiBootable [ + ] ++ lib.optionals config.isoImage.makeEfiBootable [ { source = efiImg; target = "/boot/efi.img"; } { source = "${efiDir}/EFI"; target = "/EFI"; } - { source = (pkgs.writeTextDir "grub/loopback.cfg" "source /EFI/boot/grub.cfg") + "/grub"; + { source = (pkgs.writeTextDir "grub/loopback.cfg" "source /EFI/BOOT/grub.cfg") + "/grub"; target = "/boot/grub"; } { source = config.isoImage.efiSplashImage; - target = "/EFI/boot/efi-background.png"; + target = "/EFI/BOOT/efi-background.png"; } - ] ++ optionals (config.boot.loader.grub.memtest86.enable && config.isoImage.makeBiosBootable) [ + ] ++ lib.optionals (config.boot.loader.grub.memtest86.enable && config.isoImage.makeBiosBootable) [ { source = "${pkgs.memtest86plus}/memtest.bin"; target = "/boot/memtest.bin"; } - ] ++ optionals (config.isoImage.grubTheme != null) [ + ] ++ lib.optionals (config.isoImage.grubTheme != null) [ { source = config.isoImage.grubTheme; - target = "/EFI/boot/grub-theme"; + target = "/EFI/BOOT/grub-theme"; } ]; @@ -871,10 +863,10 @@ in syslinux = if config.isoImage.makeBiosBootable then pkgs.syslinux else null; squashfsContents = config.isoImage.storeContents; squashfsCompression = config.isoImage.squashfsCompression; - } // optionalAttrs (config.isoImage.makeUsbBootable && config.isoImage.makeBiosBootable) { + } // lib.optionalAttrs (config.isoImage.makeUsbBootable && config.isoImage.makeBiosBootable) { usbBootable = true; isohybridMbrImage = "${pkgs.syslinux}/share/syslinux/isohdpfx.bin"; - } // optionalAttrs config.isoImage.makeEfiBootable { + } // lib.optionalAttrs config.isoImage.makeEfiBootable { efiBootable = true; efiBootImage = "boot/efi.img"; }); diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 33301c6423db9..167c2b521893e 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -47,7 +47,7 @@ with lib; fileSystems."/nix/.ro-store" = mkImageMediaOverride { fsType = "squashfs"; device = "../nix-store.squashfs"; - options = [ "loop" ]; + options = [ "loop" ] ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "threads=multi"; neededForBoot = true; }; diff --git a/nixos/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix index 5c5fba56f5178..d66ee8983d6b3 100644 --- a/nixos/modules/installer/scan/detected.nix +++ b/nixos/modules/installer/scan/detected.nix @@ -1,11 +1,8 @@ # List all devices which are detected by nixos-generate-config. # Common devices are enabled by default. { lib, ... }: - -with lib; - { - config = mkDefault { + config = lib.mkDefault { # Common firmware, i.e. for wifi cards hardware.enableRedistributableFirmware = true; }; diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix index 42584d88160ac..0e717a2b6a7a6 100644 --- a/nixos/modules/installer/sd-card/sd-image.nix +++ b/nixos/modules/installer/sd-card/sd-image.nix @@ -150,6 +150,15 @@ in Whether to configure the sd image to expand it's partition on boot. ''; }; + + nixPathRegistrationFile = mkOption { + type = types.str; + default = "/nix-path-registration"; + description = '' + Location of the file containing the input for nix-store --load-db once the machine has booted. + If overriding fileSystems."/" then you should to set this to the root mount + /nix-path-registration + ''; + }; }; config = { @@ -255,11 +264,8 @@ in ''; }) {}; - boot.postBootCommands = lib.mkIf config.sdImage.expandOnBoot '' - # On the first boot do some maintenance tasks - if [ -f /nix-path-registration ]; then - set -euo pipefail - set -x + boot.postBootCommands = let + expandOnBoot = lib.optionalString config.sdImage.expandOnBoot '' # Figure out device names for the boot device and root filesystem. rootPart=$(${pkgs.util-linux}/bin/findmnt -n -o SOURCE /) bootDevice=$(lsblk -npo PKNAME $rootPart) @@ -269,16 +275,25 @@ in echo ",+," | sfdisk -N$partNum --no-reread $bootDevice ${pkgs.parted}/bin/partprobe ${pkgs.e2fsprogs}/bin/resize2fs $rootPart + ''; + nixPathRegistrationFile = config.sdImage.nixPathRegistrationFile; + in '' + # On the first boot do some maintenance tasks + if [ -f ${nixPathRegistrationFile} ]; then + set -euo pipefail + set -x + + ${expandOnBoot} # Register the contents of the initial Nix store - ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration + ${config.nix.package.out}/bin/nix-store --load-db < ${nixPathRegistrationFile} # nixos-rebuild also requires a "system" profile and an /etc/NIXOS tag. touch /etc/NIXOS ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system # Prevents this from running on later boots. - rm -f /nix-path-registration + rm -f ${nixPathRegistrationFile} fi ''; }; diff --git a/nixos/modules/installer/tools/get-version-suffix b/nixos/modules/installer/tools/get-version-suffix deleted file mode 100644 index 8d72905cdcb47..0000000000000 --- a/nixos/modules/installer/tools/get-version-suffix +++ /dev/null @@ -1,23 +0,0 @@ -getVersion() { - local dir="$1" - rev= - gitDir="$dir/.git" - if [ -e "$gitDir" ]; then - if [ -z "$(type -P git)" ]; then - echo "warning: Git not found; cannot figure out revision of $dir" >&2 - return - fi - cd "$dir" - rev=$(git --git-dir="$gitDir" rev-parse --short HEAD) - if git --git-dir="$gitDir" describe --always --dirty | grep -q dirty; then - rev+=M - fi - fi -} - -if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then - getVersion $nixpkgs - if [ -n "$rev" ]; then - echo ".git.$rev" - fi -fi diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index f9ea7eb395973..a9ef9b3e31bd3 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/f409bhlpp0xkzvdz95qr2yvfjfi8r9jc-nix-2.18.5"; - i686-linux = "/nix/store/ra39jzrxq3bcpf55aahwv5037akvylf5-nix-2.18.5"; - aarch64-linux = "/nix/store/xiw8a4jbnw18svgdb04hyqzg5bsjspqf-nix-2.18.5"; - x86_64-darwin = "/nix/store/k2gzx7i90x3h2c8g6xdi1jkwbl6ic895-nix-2.18.5"; - aarch64-darwin = "/nix/store/rqwymbndaqxma6p8s5brcl9k32n5xx54-nix-2.18.5"; + x86_64-linux = "/nix/store/vhv7ckr0winivvwfqxd54d6pgq2hx1is-nix-2.18.8"; + i686-linux = "/nix/store/8x7rmgi225r5kygpf17swvk3vll0c61y-nix-2.18.8"; + aarch64-linux = "/nix/store/sbyj0rb1wd314zfxpf834d0clvxrxmv3-nix-2.18.8"; + x86_64-darwin = "/nix/store/vsy1wl865md71qv177nchj0aj5p26pkl-nix-2.18.8"; + aarch64-darwin = "/nix/store/54kqc2da3fjyjgzab4vaszxjmdvii6yk-nix-2.18.8"; } diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 7f16b97440c1c..ee7c3e8c887fc 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -3,8 +3,6 @@ { config, lib, pkgs, ... }: -with lib; - let makeProg = args: pkgs.substituteAll (args // { dir = "bin"; @@ -17,28 +15,6 @@ let ''; }); - nixos-build-vms = makeProg { - name = "nixos-build-vms"; - src = ./nixos-build-vms/nixos-build-vms.sh; - inherit (pkgs) runtimeShell; - manPage = ./manpages/nixos-build-vms.8; - }; - - nixos-install = makeProg { - name = "nixos-install"; - src = ./nixos-install.sh; - inherit (pkgs) runtimeShell; - nix = config.nix.package.out; - path = makeBinPath [ - pkgs.jq - nixos-enter - pkgs.util-linuxMinimal - ]; - manPage = ./manpages/nixos-install.8; - }; - - nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; }; - nixos-generate-config = makeProg { name = "nixos-generate-config"; src = ./nixos-generate-config.pl; @@ -51,8 +27,6 @@ let manPage = ./manpages/nixos-generate-config.8; }; - inherit (pkgs) nixos-option; - nixos-version = makeProg { name = "nixos-version"; src = ./nixos-version.sh; @@ -61,32 +35,141 @@ let inherit (config.system) configurationRevision; json = builtins.toJSON ({ nixosVersion = config.system.nixos.version; - } // optionalAttrs (config.system.nixos.revision != null) { + } // lib.optionalAttrs (config.system.nixos.revision != null) { nixpkgsRevision = config.system.nixos.revision; - } // optionalAttrs (config.system.configurationRevision != null) { + } // lib.optionalAttrs (config.system.configurationRevision != null) { configurationRevision = config.system.configurationRevision; }); manPage = ./manpages/nixos-version.8; }; - nixos-enter = makeProg { - name = "nixos-enter"; - src = ./nixos-enter.sh; - inherit (pkgs) runtimeShell; - path = makeBinPath [ - pkgs.util-linuxMinimal - ]; - manPage = ./manpages/nixos-enter.8; - }; - + nixos-install = pkgs.nixos-install.override { nix = config.nix.package; }; + nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package; }; + + defaultConfigTemplate = '' + # Edit this configuration file to define what should be installed on + # your system. Help is available in the configuration.nix(5) man page, on + # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + + { config, lib, pkgs, ... }: + + { + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + $bootLoaderConfig + # networking.hostName = "nixos"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password\@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkb.options in tty. + # }; + + $xserverConfig + + $desktopConfiguration + # Configure keymap in X11 + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # hardware.pulseaudio.enable = true; + # OR + # services.pipewire = { + # enable = true; + # pulse.enable = true; + # }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.alice = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # firefox + # tree + # ]; + # }; + + # List packages installed in system profile. To search, run: + # \$ nix search wget + # environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + # ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "${config.system.nixos.release}"; # Did you read the comment? + + } + ''; in - { - options.system.nixos-generate-config = { - configuration = mkOption { + configuration = lib.mkOption { internal = true; - type = types.str; + type = lib.types.str; + default = defaultConfigTemplate; description = '' The NixOS module that `nixos-generate-config` saves to `/etc/nixos/configuration.nix`. @@ -100,9 +183,9 @@ in ''; }; - desktopConfiguration = mkOption { + desktopConfiguration = lib.mkOption { internal = true; - type = types.listOf types.lines; + type = lib.types.listOf lib.types.lines; default = []; description = '' Text to preseed the desktop configuration that `nixos-generate-config` @@ -118,9 +201,9 @@ in }; }; - options.system.disableInstallerTools = mkOption { + options.system.disableInstallerTools = lib.mkOption { internal = true; - type = types.bool; + type = lib.types.bool; default = false; description = '' Disable nixos-rebuild, nixos-generate-config, nixos-installer @@ -130,145 +213,48 @@ in ''; }; - config = lib.mkMerge [ (lib.mkIf (config.nix.enable && !config.system.disableInstallerTools) { - - system.nixos-generate-config.configuration = mkDefault '' - # Edit this configuration file to define what should be installed on - # your system. Help is available in the configuration.nix(5) man page, on - # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - - { config, lib, pkgs, ... }: - - { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - $bootLoaderConfig - # networking.hostName = "nixos"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password\@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # useXkbConfig = true; # use xkb.options in tty. - # }; - - $xserverConfig - - $desktopConfiguration - # Configure keymap in X11 - # services.xserver.xkb.layout = "us"; - # services.xserver.xkb.options = "eurosign:e,caps:escape"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # hardware.pulseaudio.enable = true; - # OR - # services.pipewire = { - # enable = true; - # pulse.enable = true; - # }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.alice = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # packages = with pkgs; [ - # firefox - # tree - # ]; - # }; - - # List packages installed in system profile. To search, run: - # \$ nix search wget - # environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - # ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "${config.system.nixos.release}"; # Did you read the comment? - - } - ''; - - environment.systemPackages = - [ nixos-build-vms - nixos-install - nixos-rebuild - nixos-generate-config - nixos-option - nixos-version - nixos-enter - ]; - - documentation.man.man-db.skipPackages = [ nixos-version ]; + imports = let + mkToolModule = { name, package ? pkgs.${name} }: { config, ... }: { + options.system.tools.${name}.enable = lib.mkEnableOption "${name} script" // { + default = config.nix.enable; + internal = true; + }; - }) - - # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally. - ({ - system.build = { - inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter; + config = lib.mkIf config.system.tools.${name}.enable { + environment.systemPackages = [ package ]; + }; }; - })]; - + in [ + (mkToolModule { name = "nixos-build-vms"; }) + (mkToolModule { name = "nixos-enter"; }) + (mkToolModule { name = "nixos-generate-config"; package = nixos-generate-config; }) + (mkToolModule { name = "nixos-install"; package = nixos-install; }) + (mkToolModule { name = "nixos-option"; }) + (mkToolModule { name = "nixos-rebuild"; package = nixos-rebuild; }) + (mkToolModule { name = "nixos-version"; package = nixos-version; }) + ]; + + config = lib.mkMerge [ + (lib.mkIf config.system.disableInstallerTools { + system.tools = { + nixos-build-vms.enable = false; + nixos-enter.enable = false; + nixos-generate-config.enable = false; + nixos-install.enable = false; + nixos-option.enable = false; + nixos-rebuild.enable = false; + nixos-version.enable = false; + }; + }) + { + documentation.man.man-db.skipPackages = [ nixos-version ]; + + # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally. + system.build = { + inherit nixos-generate-config nixos-install nixos-rebuild; + nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option; + nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter; + }; + } + ]; } diff --git a/nixos/modules/misc/nixpkgs-flake.nix b/nixos/modules/misc/nixpkgs-flake.nix index f58c3fbbe2e25..4c91d5e604f26 100644 --- a/nixos/modules/misc/nixpkgs-flake.nix +++ b/nixos/modules/misc/nixpkgs-flake.nix @@ -1,19 +1,16 @@ { config, options, lib, pkgs, ... }: - -with lib; - let cfg = config.nixpkgs.flake; in { options.nixpkgs.flake = { - source = mkOption { + source = lib.mkOption { # In newer Nix versions, particularly with lazy trees, outPath of # flakes becomes a Nix-language path object. We deliberately allow this # to gracefully come through the interface in discussion with @roberth. # # See: https://github.com/NixOS/nixpkgs/pull/278522#discussion_r1460292639 - type = types.nullOr (types.either types.str types.path); + type = lib.types.nullOr (lib.types.either lib.types.str lib.types.path); default = null; defaultText = "if (using nixpkgsFlake.lib.nixosSystem) then self.outPath else null"; @@ -34,8 +31,8 @@ in ''; }; - setNixPath = mkOption { - type = types.bool; + setNixPath = lib.mkOption { + type = lib.types.bool; default = cfg.source != null; defaultText = "config.nixpkgs.flake.source != null"; @@ -54,8 +51,8 @@ in ''; }; - setFlakeRegistry = mkOption { - type = types.bool; + setFlakeRegistry = lib.mkOption { + type = lib.types.bool; default = cfg.source != null; defaultText = "config.nixpkgs.flake.source != null"; @@ -75,7 +72,7 @@ in }; }; - config = mkIf (cfg.source != null) (mkMerge [ + config = lib.mkIf (cfg.source != null) (lib.mkMerge [ { assertions = [ { @@ -87,19 +84,19 @@ in } ]; } - (mkIf cfg.setFlakeRegistry { - nix.registry.nixpkgs.to = mkDefault { + (lib.mkIf cfg.setFlakeRegistry { + nix.registry.nixpkgs.to = lib.mkDefault { type = "path"; path = cfg.source; }; }) - (mkIf cfg.setNixPath { + (lib.mkIf cfg.setNixPath { # N.B. This does not include nixos-config in NIX_PATH unlike modules/config/nix-channel.nix # because we would need some kind of evil shim taking the *calling* flake's self path, # perhaps, to ever make that work (in order to know where the Nix expr for the system came # from and how to call it). - nix.nixPath = mkDefault ([ "nixpkgs=flake:nixpkgs" ] - ++ optional config.nix.channel.enable "/nix/var/nix/profiles/per-user/root/channels"); + nix.nixPath = lib.mkDefault ([ "nixpkgs=flake:nixpkgs" ] + ++ lib.optional config.nix.channel.enable "/nix/var/nix/profiles/per-user/root/channels"); }) ]); } diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 60a6fb57c7a29..4048fd6857378 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -1,7 +1,4 @@ { config, options, lib, pkgs, ... }: - -with lib; - let cfg = config.nixpkgs; opt = options.nixpkgs; @@ -19,19 +16,19 @@ let lhs = optCall lhs_ { inherit pkgs; }; rhs = optCall rhs_ { inherit pkgs; }; in - recursiveUpdate lhs rhs // - optionalAttrs (lhs ? packageOverrides) { + lib.recursiveUpdate lhs rhs // + lib.optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: optCall lhs.packageOverrides pkgs // - optCall (attrByPath [ "packageOverrides" ] { } rhs) pkgs; + optCall (lib.attrByPath [ "packageOverrides" ] { } rhs) pkgs; } // - optionalAttrs (lhs ? perlPackageOverrides) { + lib.optionalAttrs (lhs ? perlPackageOverrides) { perlPackageOverrides = pkgs: optCall lhs.perlPackageOverrides pkgs // - optCall (attrByPath [ "perlPackageOverrides" ] { } rhs) pkgs; + optCall (lib.attrByPath [ "perlPackageOverrides" ] { } rhs) pkgs; }; - configType = mkOptionType { + configType = lib.mkOptionType { name = "nixpkgs-config"; description = "nixpkgs config"; check = x: @@ -39,34 +36,34 @@ let if c x then true else lib.traceSeqN 1 x false; in traceXIfNot isConfig; - merge = args: foldr (def: mergeConfig def.value) {}; + merge = args: lib.foldr (def: mergeConfig def.value) {}; }; - overlayType = mkOptionType { + overlayType = lib.mkOptionType { name = "nixpkgs-overlay"; description = "nixpkgs overlay"; check = lib.isFunction; merge = lib.mergeOneOption; }; - pkgsType = types.pkgs // { + pkgsType = lib.types.pkgs // { # This type is only used by itself, so let's elaborate the description a bit # for the purpose of documentation. description = "An evaluation of Nixpkgs; the top level attribute set of packages"; }; - hasBuildPlatform = opt.buildPlatform.highestPrio < (mkOptionDefault {}).priority; + hasBuildPlatform = opt.buildPlatform.highestPrio < (lib.mkOptionDefault {}).priority; hasHostPlatform = opt.hostPlatform.isDefined; hasPlatform = hasHostPlatform || hasBuildPlatform; # Context for messages - hostPlatformLine = optionalString hasHostPlatform "${showOptionWithDefLocs opt.hostPlatform}"; - buildPlatformLine = optionalString hasBuildPlatform "${showOptionWithDefLocs opt.buildPlatform}"; + hostPlatformLine = lib.optionalString hasHostPlatform "${lib.showOptionWithDefLocs opt.hostPlatform}"; + buildPlatformLine = lib.optionalString hasBuildPlatform "${lib.showOptionWithDefLocs opt.buildPlatform}"; legacyOptionsDefined = - optional (opt.localSystem.highestPrio < (mkDefault {}).priority) opt.system - ++ optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem - ++ optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem + lib.optional (opt.localSystem.highestPrio < (lib.mkDefault {}).priority) opt.system + ++ lib.optional (opt.localSystem.highestPrio < (lib.mkOptionDefault {}).priority) opt.localSystem + ++ lib.optional (opt.crossSystem.highestPrio < (lib.mkOptionDefault {}).priority) opt.crossSystem ; defaultPkgs = @@ -99,19 +96,19 @@ in imports = [ ./assertions.nix ./meta.nix - (mkRemovedOptionModule [ "nixpkgs" "initialSystem" ] "The NixOS options `nesting.clone` and `nesting.children` have been deleted, and replaced with named specialisation. Therefore `nixpgks.initialSystem` has no effect anymore.") + (lib.mkRemovedOptionModule [ "nixpkgs" "initialSystem" ] "The NixOS options `nesting.clone` and `nesting.children` have been deleted, and replaced with named specialisation. Therefore `nixpgks.initialSystem` has no effect anymore.") ]; options.nixpkgs = { - pkgs = mkOption { - defaultText = literalExpression '' + pkgs = lib.mkOption { + defaultText = lib.literalExpression '' import "''${nixos}/.." { inherit (cfg) config overlays localSystem crossSystem; } ''; type = pkgsType; - example = literalExpression "import {}"; + example = lib.literalExpression "import {}"; description = '' If set, the pkgs argument to all NixOS modules is the value of this option, extended with `nixpkgs.overlays`, if @@ -145,9 +142,9 @@ in ''; }; - config = mkOption { + config = lib.mkOption { default = {}; - example = literalExpression + example = lib.literalExpression '' { allowBroken = true; allowUnfree = true; } ''; @@ -160,9 +157,9 @@ in ''; }; - overlays = mkOption { + overlays = lib.mkOption { default = []; - example = literalExpression + example = lib.literalExpression '' [ (self: super: { @@ -173,7 +170,7 @@ in }) ] ''; - type = types.listOf overlayType; + type = lib.types.listOf overlayType; description = '' List of overlays to apply to Nixpkgs. This option allows modifying the Nixpkgs package set accessed through the `pkgs` module argument. @@ -184,13 +181,13 @@ in ''; }; - hostPlatform = mkOption { - type = types.either types.str types.attrs; # TODO utilize lib.systems.parsedPlatform + hostPlatform = lib.mkOption { + type = lib.types.either lib.types.str lib.types.attrs; # TODO utilize lib.systems.parsedPlatform example = { system = "aarch64-linux"; }; # Make sure that the final value has all fields for sake of other modules # referring to this. TODO make `lib.systems` itself use the module system. apply = lib.systems.elaborate; - defaultText = literalExpression + defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; description = '' Specifies the platform where the NixOS configuration will run. @@ -201,8 +198,8 @@ in ''; }; - buildPlatform = mkOption { - type = types.either types.str types.attrs; # TODO utilize lib.systems.parsedPlatform + buildPlatform = lib.mkOption { + type = lib.types.either lib.types.str lib.types.attrs; # TODO utilize lib.systems.parsedPlatform default = cfg.hostPlatform; example = { system = "x86_64-linux"; }; # Make sure that the final value has all fields for sake of other modules @@ -212,7 +209,7 @@ in in if lib.systems.equals elaborated cfg.hostPlatform then cfg.hostPlatform # make identical, so that `==` equality works; see https://github.com/NixOS/nixpkgs/issues/278001 else elaborated; - defaultText = literalExpression + defaultText = lib.literalExpression ''config.nixpkgs.hostPlatform''; description = '' Specifies the platform on which NixOS should be built. @@ -228,14 +225,14 @@ in ''; }; - localSystem = mkOption { - type = types.attrs; # TODO utilize lib.systems.parsedPlatform + localSystem = lib.mkOption { + type = lib.types.attrs; # TODO utilize lib.systems.parsedPlatform default = { inherit (cfg) system; }; example = { system = "aarch64-linux"; }; # Make sure that the final value has all fields for sake of other modules # referring to this. TODO make `lib.systems` itself use the module system. apply = lib.systems.elaborate; - defaultText = literalExpression + defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; description = '' Systems with a recently generated `hardware-configuration.nix` @@ -262,8 +259,8 @@ in # TODO deprecate. "crossSystem" is a nonsense identifier, because "cross" # is a relation between at least 2 systems in the context of a # specific build step, not a single system. - crossSystem = mkOption { - type = types.nullOr types.attrs; # TODO utilize lib.systems.parsedPlatform + crossSystem = lib.mkOption { + type = lib.types.nullOr lib.types.attrs; # TODO utilize lib.systems.parsedPlatform default = null; example = { system = "aarch64-linux"; }; description = '' @@ -283,8 +280,8 @@ in ''; }; - system = mkOption { - type = types.str; + system = lib.mkOption { + type = lib.types.str; example = "i686-linux"; default = if opt.hostPlatform.isDefined @@ -372,12 +369,12 @@ in { assertion = constructedByMe -> hasPlatform -> legacyOptionsDefined == []; message = '' - Your system configures nixpkgs with the platform parameter${optionalString hasBuildPlatform "s"}: + Your system configures nixpkgs with the platform parameter${lib.optionalString hasBuildPlatform "s"}: ${hostPlatformLine }${buildPlatformLine } However, it also defines the legacy options: - ${concatMapStrings showOptionWithDefLocs legacyOptionsDefined} + ${lib.concatMapStrings lib.showOptionWithDefLocs legacyOptionsDefined} For a future proof system configuration, we recommend to remove the legacy definitions. ''; @@ -389,7 +386,10 @@ in `nixpkgs.config` options should be passed when creating the instance instead. Current value: - ${lib.generators.toPretty { multiline = true; } opt.config} + ${lib.generators.toPretty { multiline = true; } cfg.config} + + Defined in: + ${lib.concatMapStringsSep "\n" (file: " - ${file}") opt.config.files} ''; } ]; diff --git a/nixos/modules/misc/nixpkgs/test.nix b/nixos/modules/misc/nixpkgs/test.nix index be9a88a077887..e70b7a12e8dd7 100644 --- a/nixos/modules/misc/nixpkgs/test.nix +++ b/nixos/modules/misc/nixpkgs/test.nix @@ -16,6 +16,11 @@ let nixpkgs.hostPlatform = "aarch64-linux"; nixpkgs.buildPlatform = "aarch64-linux"; }; + externalPkgsWithConfig = { + _file = "ext-pkgs-config.nix"; + nixpkgs.pkgs = pkgs; + nixpkgs.config.allowUnfree = true; + }; ambiguous = { _file = "ambiguous.nix"; nixpkgs.hostPlatform = "aarch64-linux"; @@ -108,6 +113,20 @@ lib.recurseIntoAttrs { For a future proof system configuration, we recommend to remove the legacy definitions. '']; + assert builtins.trace (lib.head (getErrors externalPkgsWithConfig)) + getErrors externalPkgsWithConfig == + ['' + Your system configures nixpkgs with an externally created instance. + `nixpkgs.config` options should be passed when creating the instance instead. + + Current value: + { + allowUnfree = true; + } + + Defined in: + - ext-pkgs-config.nix + '']; assert getErrors { nixpkgs.localSystem = pkgs.stdenv.hostPlatform; nixpkgs.hostPlatform = pkgs.stdenv.hostPlatform; diff --git a/nixos/modules/misc/wordlist.nix b/nixos/modules/misc/wordlist.nix index 988b522d74314..67c83ff2baaae 100644 --- a/nixos/modules/misc/wordlist.nix +++ b/nixos/modules/misc/wordlist.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: -with lib; let concatAndSort = name: files: pkgs.runCommand name {} '' awk 1 ${lib.escapeShellArgs files} | sed '{ /^\s*$/d; s/^\s\+//; s/\s\+$// }' | sort | uniq > $out @@ -8,16 +7,16 @@ in { options = { environment.wordlist = { - enable = mkEnableOption "environment variables for lists of words"; + enable = lib.mkEnableOption "environment variables for lists of words"; - lists = mkOption { - type = types.attrsOf (types.nonEmptyListOf types.path); + lists = lib.mkOption { + type = lib.types.attrsOf (lib.types.nonEmptyListOf lib.types.path); default = { WORDLIST = [ "${pkgs.scowl}/share/dict/words.txt" ]; }; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' { WORDLIST = [ "''${pkgs.scowl}/share/dict/words.txt" ]; } @@ -34,7 +33,7 @@ in task. ''; - example = literalExpression '' + example = lib.literalExpression '' { WORDLIST = [ "''${pkgs.scowl}/share/dict/words.txt" ]; AUGMENTED_WORDLIST = [ @@ -50,7 +49,7 @@ in }; }; - config = mkIf config.environment.wordlist.enable { + config = lib.mkIf config.environment.wordlist.enable { environment.variables = lib.mapAttrs (name: value: "${concatAndSort "wordlist-${name}" value}") diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 88715af4dc0e1..bf9b3db4b9677 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -20,7 +20,6 @@ ./config/nix-channel.nix ./config/nix-flakes.nix ./config/nix-remote-build.nix - ./config/no-x-libs.nix ./config/nsswitch.nix ./config/power-management.nix ./config/pulseaudio.nix @@ -260,11 +259,13 @@ ./programs/oblogout.nix ./programs/oddjobd.nix ./programs/openvpn3.nix + ./programs/obs-studio.nix ./programs/partition-manager.nix ./programs/plotinus.nix ./programs/pqos-wrapper.nix ./programs/projecteur.nix ./programs/proxychains.nix + ./programs/pulseview.nix ./programs/qdmr.nix ./programs/qgroundcontrol.nix ./programs/qt5ct.nix @@ -363,6 +364,7 @@ ./security/systemd-confinement.nix ./security/tpm2.nix ./security/wrappers/default.nix + ./services/accessibility/orca.nix ./services/accessibility/speechd.nix ./services/admin/docuum.nix ./services/admin/meshcentral.nix @@ -697,6 +699,7 @@ ./services/matrix/conduit.nix ./services/matrix/dendrite.nix ./services/matrix/hebbot.nix + ./services/matrix/hookshot.nix ./services/matrix/maubot.nix ./services/matrix/mautrix-facebook.nix ./services/matrix/mautrix-meta.nix @@ -711,7 +714,6 @@ ./services/misc/airsonic.nix ./services/misc/amazon-ssm-agent.nix ./services/misc/ananicy.nix - ./services/misc/ankisyncd.nix ./services/misc/anki-sync-server.nix ./services/misc/apache-kafka.nix ./services/misc/atuin.nix @@ -856,6 +858,7 @@ ./services/misc/tautulli.nix ./services/misc/tiddlywiki.nix ./services/misc/tp-auto-kbbl.nix + ./services/misc/turn-rs.nix ./services/misc/tuxclocker.nix ./services/misc/transfer-sh.nix ./services/misc/tzupdate.nix @@ -880,6 +883,7 @@ ./services/monitoring/datadog-agent.nix ./services/monitoring/do-agent.nix ./services/monitoring/fusion-inventory.nix + ./services/monitoring/gatus.nix ./services/monitoring/goss.nix ./services/monitoring/grafana-agent.nix ./services/monitoring/grafana-image-renderer.nix @@ -928,6 +932,7 @@ ./services/monitoring/teamviewer.nix ./services/monitoring/telegraf.nix ./services/monitoring/thanos.nix + ./services/monitoring/todesk.nix ./services/monitoring/tremor-rs.nix ./services/monitoring/tuptime.nix ./services/monitoring/unpoller.nix @@ -1013,7 +1018,6 @@ ./services/networking/dhcpcd.nix ./services/networking/dnscache.nix ./services/networking/dnscrypt-proxy2.nix - ./services/networking/dnscrypt-wrapper.nix ./services/networking/dnsdist.nix ./services/networking/dnsmasq.nix ./services/networking/dnsproxy.nix @@ -1027,6 +1031,7 @@ ./services/networking/expressvpn.nix ./services/networking/fakeroute.nix ./services/networking/fastnetmon-advanced.nix + ./services/networking/fedimintd.nix ./services/networking/ferm.nix ./services/networking/firefox-syncserver.nix ./services/networking/fireqos.nix @@ -1042,7 +1047,6 @@ ./services/networking/gdomap.nix ./services/networking/ghostunnel.nix ./services/networking/git-daemon.nix - ./services/networking/globalprotect-vpn.nix ./services/networking/gns3-server.nix ./services/networking/gnunet.nix ./services/networking/go-autoconfig.nix @@ -1191,6 +1195,7 @@ ./services/networking/scion/scion-daemon.nix ./services/networking/scion/scion-dispatcher.nix ./services/networking/scion/scion-router.nix + ./services/networking/scion/scion-ip-gateway.nix ./services/networking/seafile.nix ./services/networking/searx.nix ./services/networking/shadowsocks.nix @@ -1249,6 +1254,7 @@ ./services/networking/uptermd.nix ./services/networking/v2ray.nix ./services/networking/v2raya.nix + ./services/networking/veilid.nix ./services/networking/vdirsyncer.nix ./services/networking/vsftpd.nix ./services/networking/wasabibackend.nix @@ -1381,6 +1387,7 @@ ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix ./services/web-apps/audiobookshelf.nix + ./services/web-apps/bluemap.nix ./services/web-apps/bookstack.nix ./services/web-apps/c2fmzq-server.nix ./services/web-apps/calibre-web.nix @@ -1390,11 +1397,13 @@ ./services/web-apps/chatgpt-retrieval-plugin.nix ./services/web-apps/cloudlog.nix ./services/web-apps/code-server.nix + ./services/web-apps/collabora-online.nix ./services/web-apps/commafeed.nix ./services/web-apps/convos.nix ./services/web-apps/crabfit.nix ./services/web-apps/davis.nix ./services/web-apps/cryptpad.nix + ./services/web-apps/dependency-track.nix ./services/web-apps/dex.nix ./services/web-apps/discourse.nix ./services/web-apps/documize.nix @@ -1410,6 +1419,7 @@ ./services/web-apps/fluidd.nix ./services/web-apps/freshrss.nix ./services/web-apps/galene.nix + ./services/web-apps/gancio.nix ./services/web-apps/gerrit.nix ./services/web-apps/glance.nix ./services/web-apps/gotify-server.nix @@ -1419,6 +1429,7 @@ ./services/web-apps/goatcounter.nix ./services/web-apps/guacamole-client.nix ./services/web-apps/guacamole-server.nix + ./services/web-apps/hatsu.nix ./services/web-apps/healthchecks.nix ./services/web-apps/hedgedoc.nix ./services/web-apps/hledger-web.nix @@ -1427,6 +1438,7 @@ ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/ifm.nix + ./services/web-apps/immich.nix ./services/web-apps/invidious.nix ./services/web-apps/invoiceplane.nix ./services/web-apps/isso.nix @@ -1477,8 +1489,10 @@ ./services/web-apps/powerdns-admin.nix ./services/web-apps/pretalx.nix ./services/web-apps/pretix.nix + ./services/web-apps/privatebin.nix ./services/web-apps/prosody-filer.nix ./services/web-apps/rimgo.nix + ./services/web-apps/rutorrent.nix ./services/web-apps/screego.nix ./services/web-apps/sftpgo.nix ./services/web-apps/suwayomi-server.nix @@ -1507,7 +1521,6 @@ ./services/web-apps/zitadel.nix ./services/web-servers/agate.nix ./services/web-servers/apache-httpd/default.nix - ./services/web-servers/bluemap.nix ./services/web-servers/caddy/default.nix ./services/web-servers/darkhttpd.nix ./services/web-servers/fcgiwrap.nix @@ -1620,6 +1633,7 @@ ./system/boot/stage-2.nix ./system/boot/systemd.nix ./system/boot/systemd/coredump.nix + ./system/boot/systemd/dm-verity.nix ./system/boot/systemd/initrd-secrets.nix ./system/boot/systemd/initrd.nix ./system/boot/systemd/journald.nix @@ -1634,6 +1648,7 @@ ./system/boot/systemd/sysupdate.nix ./system/boot/systemd/sysusers.nix ./system/boot/systemd/tmpfiles.nix + ./system/boot/systemd/tpm2.nix ./system/boot/systemd/user.nix ./system/boot/systemd/userdbd.nix ./system/boot/systemd/homed.nix diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 249b767593f2d..970b76cfbfdf1 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -52,7 +52,7 @@ in # VMware support. "mptspi" "vmxnet3" "vsock" ] ++ lib.optional platform.isx86 "vmw_balloon" - ++ lib.optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ + ++ lib.optionals (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) [ "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport" # Hyper-V support. @@ -68,7 +68,7 @@ in # Broadcom "vc4" - ] ++ lib.optionals pkgs.stdenv.isAarch64 [ + ] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [ # Most of the following falls into two categories: # - early KMS / early display # - early storage (e.g. USB) support diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 9f32f85a61ec2..943f9d8e31066 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -19,13 +19,7 @@ pkgs.cryptsetup # needed for dm-crypt volumes # Some text editors. - (pkgs.vim.customize { - name = "vim"; - vimrcConfig.packages.default = { - start = [ pkgs.vimPlugins.vim-nix ]; - }; - vimrcConfig.customRC = "syntax on"; - }) + pkgs.vim # Some networking tools. pkgs.fuse @@ -50,7 +44,7 @@ # Include support for various filesystems and tools to create / manipulate them. boot.supportedFilesystems = - [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ] ++ + [ "btrfs" "cifs" "f2fs" "ntfs" "vfat" "xfs" ] ++ lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs"; # Configure host id for ZFS to work diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index ae8b0895a5ac5..f96b11b353672 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -14,8 +14,5 @@ libinput.enable = true; # for touchpad support on many laptops }; - # Enable sound in virtualbox appliances. - hardware.pulseaudio.enable = true; - environment.systemPackages = [ pkgs.mesa-demos pkgs.firefox ]; } diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 7e5aec053df92..7e22d4b6b684a 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -128,13 +128,13 @@ with lib; nix.settings.trusted-users = [ "nixos" ]; # Install less voices for speechd to save some space - services.speechd.package = pkgs.speechd.override { - mbrola = pkgs.mbrola.override { - mbrola-voices = pkgs.mbrola-voices.override { + nixpkgs.overlays = [ + (_: prev: { + mbrola-voices = prev.mbrola-voices.override { # only ship with one voice per language languages = [ "*1" ]; }; - }; - }; + }) + ]; }; } diff --git a/nixos/modules/profiles/macos-builder.nix b/nixos/modules/profiles/macos-builder.nix index bf8414e1e1087..b65c698d62a1d 100644 --- a/nixos/modules/profiles/macos-builder.nix +++ b/nixos/modules/profiles/macos-builder.nix @@ -196,14 +196,8 @@ in # To prevent gratuitous rebuilds on each change to Nixpkgs nixos.revision = null; - stateVersion = lib.mkDefault (throw '' - The macOS linux builder should not need a stateVersion to be set, but a module - has accessed stateVersion nonetheless. - Please inspect the trace of the following command to figure out which module - has a dependency on stateVersion. - - nix-instantiate --attr darwin.linux-builder --show-trace - ''); + # to be updated by module maintainers, see nixpkgs#325610 + stateVersion = "24.05"; }; users.users."${user}" = { diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index b76740f7cc587..df21b75c82b12 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -6,8 +6,6 @@ with lib; { - environment.noXlibs = mkDefault true; - documentation.enable = mkDefault false; documentation.doc.enable = mkDefault false; @@ -21,7 +19,7 @@ with lib; # Perl is a default package. environment.defaultPackages = mkDefault [ ]; - environment.stub-ld.enable = false; + environment.stub-ld.enable = mkDefault false; # The lessopen package pulls in Perl. programs.less.lessopen = mkDefault null; @@ -31,6 +29,8 @@ with lib; programs.command-not-found.enable = mkDefault false; + programs.ssh.setXAuthLocation = mkDefault false; + services.logrotate.enable = mkDefault false; services.udisks2.enable = mkDefault false; diff --git a/nixos/modules/profiles/perlless.nix b/nixos/modules/profiles/perlless.nix index cb98895743d54..c331a90882676 100644 --- a/nixos/modules/profiles/perlless.nix +++ b/nixos/modules/profiles/perlless.nix @@ -2,13 +2,6 @@ { - # switch-to-configuration-ng reimplements switch-to-configuration, but - # without perl. - system.switch = lib.mkDefault { - enable = false; - enableNg = true; - }; - # Remove perl from activation boot.initrd.systemd.enable = lib.mkDefault true; system.etc.overlay.enable = lib.mkDefault true; diff --git a/nixos/modules/programs/cdemu.nix b/nixos/modules/programs/cdemu.nix index 1aac28af1d2ca..cdfab3ee9f398 100644 --- a/nixos/modules/programs/cdemu.nix +++ b/nixos/modules/programs/cdemu.nix @@ -60,7 +60,7 @@ in { systemd.user.services.cdemu-daemon.serviceConfig = { Type = "dbus"; BusName = "net.sf.cdemu.CDEmuDaemon"; - ExecStart = "${pkgs.cdemu-daemon}/bin/cdemu-daemon --config-file \"%h/.config/cdemu-daemon\""; + ExecStart = "${lib.getExe pkgs.cdemu-daemon} --config-file \"%h/.config/cdemu-daemon\""; Restart = "no"; }; diff --git a/nixos/modules/programs/clash-verge.nix b/nixos/modules/programs/clash-verge.nix index 4425fe1a9fe72..a2912cb1d8e0f 100644 --- a/nixos/modules/programs/clash-verge.nix +++ b/nixos/modules/programs/clash-verge.nix @@ -1,9 +1,22 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { options.programs.clash-verge = { enable = lib.mkEnableOption "Clash Verge"; - package = lib.mkPackageOption pkgs "clash-verge" {}; + package = lib.mkOption { + type = lib.types.package; + description = '' + The clash-verge package to use. Available options are + clash-verge-rev and clash-nyanpasu, both are forks of + the original clash-verge project. + ''; + example = "pkgs.clash-verge-rev"; + }; autoStart = lib.mkEnableOption "Clash Verge auto launch"; tunMode = lib.mkEnableOption "Clash Verge TUN mode"; }; @@ -16,10 +29,12 @@ environment.systemPackages = [ cfg.package - (lib.mkIf cfg.autoStart (pkgs.makeAutostartItem { - name = "clash-verge"; - package = cfg.package; - })) + (lib.mkIf cfg.autoStart ( + pkgs.makeAutostartItem { + name = "clash-verge"; + package = cfg.package; + } + )) ]; security.wrappers.clash-verge = lib.mkIf cfg.tunMode { diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix index 7521708fa94f2..ed874cad74e41 100644 --- a/nixos/modules/programs/firefox.nix +++ b/nixos/modules/programs/firefox.nix @@ -1,4 +1,9 @@ -{ pkgs, config, lib, ... }: +{ + pkgs, + config, + lib, + ... +}: let cfg = config.programs.firefox; @@ -78,7 +83,7 @@ in wrapperConfig = lib.mkOption { type = lib.types.attrs; - default = {}; + default = { }; description = "Arguments to pass to Firefox wrapper"; }; @@ -99,7 +104,13 @@ in }; preferences = lib.mkOption { - type = with lib.types; attrsOf (oneOf [ bool int str ]); + type = + with lib.types; + attrsOf (oneOf [ + bool + int + str + ]); default = { }; description = '' Preferences to set from `about:config`. @@ -112,7 +123,12 @@ in }; preferencesStatus = lib.mkOption { - type = lib.types.enum [ "default" "locked" "user" "clear" ]; + type = lib.types.enum [ + "default" + "locked" + "user" + "clear" + ]; default = "locked"; description = '' The status of `firefox.preferences`. @@ -127,111 +143,113 @@ in languagePacks = lib.mkOption { # Available languages can be found in https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/ - type = lib.types.listOf (lib.types.enum ([ - "ach" - "af" - "an" - "ar" - "ast" - "az" - "be" - "bg" - "bn" - "br" - "bs" - "ca-valencia" - "ca" - "cak" - "cs" - "cy" - "da" - "de" - "dsb" - "el" - "en-CA" - "en-GB" - "en-US" - "eo" - "es-AR" - "es-CL" - "es-ES" - "es-MX" - "et" - "eu" - "fa" - "ff" - "fi" - "fr" - "fur" - "fy-NL" - "ga-IE" - "gd" - "gl" - "gn" - "gu-IN" - "he" - "hi-IN" - "hr" - "hsb" - "hu" - "hy-AM" - "ia" - "id" - "is" - "it" - "ja" - "ka" - "kab" - "kk" - "km" - "kn" - "ko" - "lij" - "lt" - "lv" - "mk" - "mr" - "ms" - "my" - "nb-NO" - "ne-NP" - "nl" - "nn-NO" - "oc" - "pa-IN" - "pl" - "pt-BR" - "pt-PT" - "rm" - "ro" - "ru" - "sat" - "sc" - "sco" - "si" - "sk" - "skr" - "sl" - "son" - "sq" - "sr" - "sv-SE" - "szl" - "ta" - "te" - "tg" - "th" - "tl" - "tr" - "trs" - "uk" - "ur" - "uz" - "vi" - "xh" - "zh-CN" - "zh-TW" - ])); + type = lib.types.listOf ( + lib.types.enum ([ + "ach" + "af" + "an" + "ar" + "ast" + "az" + "be" + "bg" + "bn" + "br" + "bs" + "ca-valencia" + "ca" + "cak" + "cs" + "cy" + "da" + "de" + "dsb" + "el" + "en-CA" + "en-GB" + "en-US" + "eo" + "es-AR" + "es-CL" + "es-ES" + "es-MX" + "et" + "eu" + "fa" + "ff" + "fi" + "fr" + "fur" + "fy-NL" + "ga-IE" + "gd" + "gl" + "gn" + "gu-IN" + "he" + "hi-IN" + "hr" + "hsb" + "hu" + "hy-AM" + "ia" + "id" + "is" + "it" + "ja" + "ka" + "kab" + "kk" + "km" + "kn" + "ko" + "lij" + "lt" + "lv" + "mk" + "mr" + "ms" + "my" + "nb-NO" + "ne-NP" + "nl" + "nn-NO" + "oc" + "pa-IN" + "pl" + "pt-BR" + "pt-PT" + "rm" + "ro" + "ru" + "sat" + "sc" + "sco" + "si" + "sk" + "skr" + "sl" + "son" + "sq" + "sr" + "sv-SE" + "szl" + "ta" + "te" + "tg" + "th" + "tl" + "tr" + "trs" + "uk" + "ur" + "uz" + "vi" + "xh" + "zh-CN" + "zh-TW" + ]) + ); default = [ ]; description = '' The language packs to install. @@ -249,10 +267,23 @@ in ''; }; + autoConfigFiles = lib.mkOption { + type = with lib.types; listOf path; + default = [ ]; + description = '' + AutoConfig files can be used to set and lock preferences that are not covered + by the policies.json for Mac and Linux. This method can be used to automatically + change user preferences or prevent the end user from modifiying specific + preferences by locking them. More info can be found in https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig. + + Files are concated and autoConfig is appended. + ''; + }; + nativeMessagingHosts = ({ packages = lib.mkOption { type = lib.types.listOf lib.types.package; - default = []; + default = [ ]; description = '' Additional packages containing native messaging hosts that should be made available to Firefox extensions. ''; @@ -260,48 +291,64 @@ in }) // (builtins.mapAttrs (k: v: lib.mkEnableOption "${v.name} support") nmhOptions); }; - config = let - forEachEnabledNmh = fn: lib.flatten (lib.mapAttrsToList (k: v: lib.optional cfg.nativeMessagingHosts.${k} (fn k v)) nmhOptions); - in lib.mkIf cfg.enable { - warnings = forEachEnabledNmh (k: v: - "The `programs.firefox.nativeMessagingHosts.${k}` option is deprecated, " + - "please add `${v.package.pname}` to `programs.firefox.nativeMessagingHosts.packages` instead." - ); - programs.firefox.nativeMessagingHosts.packages = forEachEnabledNmh (_: v: v.package); + config = + let + forEachEnabledNmh = + fn: + lib.flatten ( + lib.mapAttrsToList (k: v: lib.optional cfg.nativeMessagingHosts.${k} (fn k v)) nmhOptions + ); + in + lib.mkIf cfg.enable { + warnings = forEachEnabledNmh ( + k: v: + "The `programs.firefox.nativeMessagingHosts.${k}` option is deprecated, " + + "please add `${v.package.pname}` to `programs.firefox.nativeMessagingHosts.packages` instead." + ); + programs.firefox.nativeMessagingHosts.packages = forEachEnabledNmh (_: v: v.package); - environment.systemPackages = [ - (cfg.package.override (old: { - extraPrefsFiles = old.extraPrefsFiles or [] ++ [(pkgs.writeText "firefox-autoconfig.js" cfg.autoConfig)]; - nativeMessagingHosts = old.nativeMessagingHosts or [] ++ cfg.nativeMessagingHosts.packages; - cfg = (old.cfg or {}) // cfg.wrapperConfig; - })) - ]; + environment.systemPackages = [ + (cfg.package.override (old: { + extraPrefsFiles = + old.extraPrefsFiles or [ ] + ++ cfg.autoConfigFiles + ++ [ (pkgs.writeText "firefox-autoconfig.js" cfg.autoConfig) ]; + nativeMessagingHosts = old.nativeMessagingHosts or [ ] ++ cfg.nativeMessagingHosts.packages; + cfg = (old.cfg or { }) // cfg.wrapperConfig; + })) + ]; - environment.etc = - let - policiesJSON = policyFormat.generate "firefox-policies.json" { inherit (cfg) policies; }; - in - lib.mkIf (cfg.policies != { }) { - "firefox/policies/policies.json".source = "${policiesJSON}"; - }; + environment.etc = + let + policiesJSON = policyFormat.generate "firefox-policies.json" { inherit (cfg) policies; }; + in + lib.mkIf (cfg.policies != { }) { + "firefox/policies/policies.json".source = "${policiesJSON}"; + }; - # Preferences are converted into a policy - programs.firefox.policies = { - DisableAppUpdate = true; - Preferences = (builtins.mapAttrs - (_: value: { Value = value; Status = cfg.preferencesStatus; }) - cfg.preferences); - ExtensionSettings = builtins.listToAttrs (builtins.map - (lang: lib.attrsets.nameValuePair - "langpack-${lang}@firefox.mozilla.org" - { - installation_mode = "normal_installed"; - install_url = "https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/${lang}.xpi"; - } - ) - cfg.languagePacks); + # Preferences are converted into a policy + programs.firefox.policies = { + DisableAppUpdate = true; + Preferences = ( + builtins.mapAttrs (_: value: { + Value = value; + Status = cfg.preferencesStatus; + }) cfg.preferences + ); + ExtensionSettings = builtins.listToAttrs ( + builtins.map ( + lang: + lib.attrsets.nameValuePair "langpack-${lang}@firefox.mozilla.org" { + installation_mode = "normal_installed"; + install_url = "https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/${lang}.xpi"; + } + ) cfg.languagePacks + ); + }; }; - }; - meta.maintainers = with lib.maintainers; [ danth ]; + meta.maintainers = with lib.maintainers; [ + danth + linsui + ]; } diff --git a/nixos/modules/programs/foot/bashrc b/nixos/modules/programs/foot/bashrc index 126f547212596..e35bc29f117b0 100644 --- a/nixos/modules/programs/foot/bashrc +++ b/nixos/modules/programs/foot/bashrc @@ -12,16 +12,16 @@ osc7_cwd() { done printf '\e]7;file://%s%s\e\\' "${HOSTNAME}" "${encoded}" } -PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }osc7_cwd +PROMPT_COMMAND=${PROMPT_COMMAND:+${PROMPT_COMMAND%;}; }osc7_cwd prompt_marker() { printf '\e]133;A\e\\' } -PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }prompt_marker +PROMPT_COMMAND=${PROMPT_COMMAND:+${PROMPT_COMMAND%;}; }prompt_marker PS0+='\e]133;C\e\\' command_done() { printf '\e]133;D\e\\' } -PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }command_done +PROMPT_COMMAND=${PROMPT_COMMAND:+${PROMPT_COMMAND%;}; }command_done diff --git a/nixos/modules/programs/mouse-actions.nix b/nixos/modules/programs/mouse-actions.nix index 73dc783e3100b..297cc4d3bfe79 100644 --- a/nixos/modules/programs/mouse-actions.nix +++ b/nixos/modules/programs/mouse-actions.nix @@ -3,13 +3,39 @@ let cfg = config.programs.mouse-actions; in - { - options.programs.mouse-actions = { - enable = lib.mkEnableOption '' - mouse-actions udev rules. This is a prerequisite for using mouse-actions without being root +{ + options.programs.mouse-actions = { + enable = lib.mkEnableOption "" // { + description = '' + Whether to install and set up mouse-actions and it's udev rules. + + 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"; + }; + autorun = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to start a user service to run mouse-actions on startup. ''; }; - config = lib.mkIf cfg.enable { - services.udev.packages = [ pkgs.mouse-actions ]; + }; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + systemd.user.services.mouse-actions = lib.mkIf cfg.autorun { + description = "mouse-actions launcher"; + wantedBy = [ "graphical-session.target" ]; + bindsTo = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + environment.PATH = lib.mkForce null; # don't use the default PATH provided by NixOS + serviceConfig = { + ExecStart = "${lib.getExe cfg.package} start"; + PassEnvironment = "PATH"; # inherit PATH from user environment + }; }; - } + }; +} diff --git a/nixos/modules/programs/nautilus-open-any-terminal.nix b/nixos/modules/programs/nautilus-open-any-terminal.nix index ff0e77607b5e1..41f26e03d3127 100644 --- a/nixos/modules/programs/nautilus-open-any-terminal.nix +++ b/nixos/modules/programs/nautilus-open-any-terminal.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.programs.nautilus-open-any-terminal; @@ -22,15 +27,29 @@ in nautilus-python nautilus-open-any-terminal ]; + + environment.sessionVariables = lib.mkIf (!config.services.xserver.desktopManager.gnome.enable) { + NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4"; + }; + + environment.pathsToLink = [ + "/share/nautilus-python/extensions" + ]; + programs.dconf = lib.optionalAttrs (cfg.terminal != null) { enable = true; - profiles.user.databases = [{ - settings."com/github/stunkymonkey/nautilus-open-any-terminal".terminal = cfg.terminal; - lockAll = true; - }]; + profiles.user.databases = [ + { + settings."com/github/stunkymonkey/nautilus-open-any-terminal".terminal = cfg.terminal; + lockAll = true; + } + ]; }; }; meta = { - maintainers = with lib.maintainers; [ stunkymonkey linsui ]; + maintainers = with lib.maintainers; [ + stunkymonkey + linsui + ]; }; } diff --git a/nixos/modules/programs/obs-studio.nix b/nixos/modules/programs/obs-studio.nix new file mode 100644 index 0000000000000..ee9ec520d1fb2 --- /dev/null +++ b/nixos/modules/programs/obs-studio.nix @@ -0,0 +1,64 @@ +{ + pkgs, + lib, + config, + ... +}: + +let + cfg = config.programs.obs-studio; +in +{ + options.programs.obs-studio = { + enable = lib.mkEnableOption "Free and open source software for video recording and live streaming"; + + package = lib.mkPackageOption pkgs "obs-studio" { example = "obs-studio"; }; + + finalPackage = lib.mkOption { + type = lib.types.package; + visible = false; + readOnly = true; + description = "Resulting customized OBS Studio package."; + }; + + plugins = lib.mkOption { + default = [ ]; + example = lib.literalExpression "[ pkgs.obs-studio-plugins.wlrobs ]"; + description = "Optional OBS plugins."; + type = lib.types.listOf lib.types.package; + }; + + enableVirtualCamera = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Installs and sets up the v4l2loopback kernel module, necessary for OBS + to start a virtual camera. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + programs.obs-studio.finalPackage = pkgs.wrapOBS.override { obs-studio = cfg.package; } { + plugins = cfg.plugins; + }; + + environment.systemPackages = [ cfg.finalPackage ]; + + boot = lib.mkIf cfg.enableVirtualCamera { + kernelModules = [ "v4l2loopback" ]; + extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; + + extraModprobeConfig = '' + options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 + ''; + }; + + security.polkit.enable = lib.mkIf cfg.enableVirtualCamera true; + }; + + meta.maintainers = with lib.maintainers; [ + CaptainJawZ + GaetanLepage + ]; +} diff --git a/nixos/modules/programs/pulseview.nix b/nixos/modules/programs/pulseview.nix new file mode 100644 index 0000000000000..f8db5a467d53c --- /dev/null +++ b/nixos/modules/programs/pulseview.nix @@ -0,0 +1,28 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.pulseview; +in +{ + options.programs.pulseview = { + enable = lib.mkEnableOption "pulseview, a sigrok GUI"; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ + pkgs.pulseview + ]; + + services.udev = { + packages = [ + # Pulseview needs some udev rules provided by libsigrok to access devices + pkgs.libsigrok + ]; + }; + }; +} diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 2ee464dc22d37..92e6f4ccaeb1b 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -196,8 +196,9 @@ in { programs.gamescope.enable = lib.mkDefault cfg.gamescopeSession.enable; services.displayManager.sessionPackages = lib.mkIf cfg.gamescopeSession.enable [ gamescopeSessionFile ]; - # optionally enable 32bit pulseaudio support if pulseaudio is enabled + # enable 32bit pulseaudio/pipewire support if needed hardware.pulseaudio.support32Bit = config.hardware.pulseaudio.enable; + services.pipewire.alsa.support32Bit = config.services.pipewire.alsa.enable; hardware.steam-hardware.enable = true; diff --git a/nixos/modules/programs/tsm-client.nix b/nixos/modules/programs/tsm-client.nix index a010bb6c6d578..1795db5c2470e 100644 --- a/nixos/modules/programs/tsm-client.nix +++ b/nixos/modules/programs/tsm-client.nix @@ -22,7 +22,7 @@ let serverOptions = { name, config, ... }: { freeformType = attrsOf (either scalarType (listOf scalarType)); # Client system-options file directives are explained here: - # https://www.ibm.com/docs/en/storage-protect/8.1.23?topic=commands-processing-options + # https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=commands-processing-options options.servername = mkOption { type = servernameType; default = name; diff --git a/nixos/modules/programs/wayland/cardboard.nix b/nixos/modules/programs/wayland/cardboard.nix index 5a25b5359c245..96089bdf94edb 100644 --- a/nixos/modules/programs/wayland/cardboard.nix +++ b/nixos/modules/programs/wayland/cardboard.nix @@ -19,6 +19,6 @@ in # To make a cardboard session available for certain DMs like SDDM services.displayManager.sessionPackages = [ cfg.package ]; } - (import ./wayland-session.nix { inherit lib; }) + (import ./wayland-session.nix { inherit lib pkgs; }) ]); } diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index f8b70af406001..6e69c1730e57b 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -70,7 +70,7 @@ in } (import ./wayland-session.nix { - inherit lib; + inherit lib pkgs; enableXWayland = cfg.xwayland.enable; enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed }) diff --git a/nixos/modules/programs/wayland/labwc.nix b/nixos/modules/programs/wayland/labwc.nix index 4c74b45bb4a33..c09ab8240d9f2 100644 --- a/nixos/modules/programs/wayland/labwc.nix +++ b/nixos/modules/programs/wayland/labwc.nix @@ -20,6 +20,6 @@ in # To make a labwc session available for certain DMs like SDDM services.displayManager.sessionPackages = [ cfg.package ]; } - (import ./wayland-session.nix { inherit lib; }) + (import ./wayland-session.nix { inherit lib pkgs; }) ]); } diff --git a/nixos/modules/programs/wayland/miracle-wm.nix b/nixos/modules/programs/wayland/miracle-wm.nix index e20b62acb4628..3cee538c8997b 100644 --- a/nixos/modules/programs/wayland/miracle-wm.nix +++ b/nixos/modules/programs/wayland/miracle-wm.nix @@ -30,11 +30,12 @@ in } (import ./wayland-session.nix { - inherit lib; + inherit lib pkgs; # Hardcoded path in Mir, not really possible to disable enableXWayland = true; # No portal support yet: https://github.com/mattkae/miracle-wm/issues/164 enableWlrPortal = false; + enableGtkPortal = false; }) ] ); diff --git a/nixos/modules/programs/wayland/river.nix b/nixos/modules/programs/wayland/river.nix index da793a9ff3441..6391f00e2f626 100644 --- a/nixos/modules/programs/wayland/river.nix +++ b/nixos/modules/programs/wayland/river.nix @@ -56,7 +56,7 @@ in } (import ./wayland-session.nix { - inherit lib; + inherit lib pkgs; enableXWayland = cfg.xwayland.enable; }) ]); diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix index 8d43a3329f417..7c5f49ce6d79c 100644 --- a/nixos/modules/programs/wayland/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -123,12 +123,23 @@ in # Import the most important environment variables into the D-Bus and systemd # user environments (e.g. required for screen sharing and Pinentry prompts): exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP + # enable systemd-integration + exec "systemctl --user import-environment {,WAYLAND_}DISPLAY SWAYSOCK; systemctl --user start sway-session.target" + exec swaymsg -t subscribe '["shutdown"]' && systemctl --user stop sway-session.target ''; } // lib.optionalAttrs (cfg.package != null) { "sway/config".source = lib.mkOptionDefault "${cfg.package}/etc/sway/config"; }; }; + systemd.user.targets.sway-session = { + description = "sway compositor session"; + documentation = [ "man:systemd.special(7)" ]; + bindsTo = [ "graphical-session.target" ]; + wants = [ "graphical-session-pre.target" ]; + after = [ "graphical-session-pre.target" ]; + }; + # To make a Sway session available if a display manager like SDDM is enabled: services.displayManager.sessionPackages = lib.optional (cfg.package != null) cfg.package; @@ -137,7 +148,7 @@ in } (import ./wayland-session.nix { - inherit lib; + inherit lib pkgs; enableXWayland = cfg.xwayland.enable; }) ]); diff --git a/nixos/modules/programs/wayland/waybar.nix b/nixos/modules/programs/wayland/waybar.nix index ab811994be073..074537ea9ed3b 100644 --- a/nixos/modules/programs/wayland/waybar.nix +++ b/nixos/modules/programs/wayland/waybar.nix @@ -1,4 +1,9 @@ -{ lib, pkgs, config, ... }: +{ + lib, + pkgs, + config, + ... +}: let cfg = config.programs.waybar; @@ -6,16 +11,18 @@ in { options.programs.waybar = { enable = lib.mkEnableOption "waybar, a highly customizable Wayland bar for Sway and Wlroots based compositors"; - package = lib.mkPackageOption pkgs "waybar" { }; + package = + lib.mkPackageOption pkgs "waybar" { } + // lib.mkOption { + apply = pkg: pkg.override { systemdSupport = true; }; + }; }; config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - systemd.user.services.waybar = { - description = "Waybar as systemd service"; - wantedBy = [ "graphical-session.target" ]; - partOf = [ "graphical-session.target" ]; - script = "${cfg.package}/bin/waybar"; + systemd = { + packages = [ cfg.package ]; + user.services.waybar.wantedBy = [ "graphical-session.target" ]; }; }; diff --git a/nixos/modules/programs/wayland/wayfire.nix b/nixos/modules/programs/wayland/wayfire.nix index 726300ce53816..1c3950bff47da 100644 --- a/nixos/modules/programs/wayland/wayfire.nix +++ b/nixos/modules/programs/wayland/wayfire.nix @@ -63,7 +63,7 @@ in }; } (import ./wayland-session.nix { - inherit lib; + inherit lib pkgs; enableXWayland = cfg.xwayland.enable; }) ] diff --git a/nixos/modules/programs/wayland/wayland-session.nix b/nixos/modules/programs/wayland/wayland-session.nix index b3d6cc368b20a..1f5dc413d377b 100644 --- a/nixos/modules/programs/wayland/wayland-session.nix +++ b/nixos/modules/programs/wayland/wayland-session.nix @@ -1,7 +1,9 @@ { lib, + pkgs, enableXWayland ? true, enableWlrPortal ? true, + enableGtkPortal ? true, }: { @@ -18,6 +20,9 @@ services.graphical-desktop.enable = true; xdg.portal.wlr.enable = enableWlrPortal; + xdg.portal.extraPortals = lib.mkIf enableGtkPortal [ + pkgs.xdg-desktop-portal-gtk + ]; # Window manager only sessions (unlike DEs) don't handle XDG # autostart files, so force them to run the service diff --git a/nixos/modules/programs/yubikey-touch-detector.nix b/nixos/modules/programs/yubikey-touch-detector.nix index 9a0d107f73c98..42beabbc4e94a 100644 --- a/nixos/modules/programs/yubikey-touch-detector.nix +++ b/nixos/modules/programs/yubikey-touch-detector.nix @@ -1,9 +1,44 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.yubikey-touch-detector; -in { +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) types; + cfg = config.programs.yubikey-touch-detector; +in +{ options = { programs.yubikey-touch-detector = { + enable = lib.mkEnableOption "yubikey-touch-detector"; + + libnotify = lib.mkOption { + # This used to be true previously and using libnotify would be a sane default. + default = true; + type = types.bool; + description = '' + If set to true, yubikey-touch-detctor will send notifications using libnotify + ''; + }; + + unixSocket = lib.mkOption { + default = true; + type = types.bool; + description = '' + If set to true, yubikey-touch-detector will send notifications to a unix socket + ''; + }; + + verbose = lib.mkOption { + default = false; + type = types.bool; + description = '' + Enables verbose logging + ''; + }; + }; }; @@ -12,6 +47,13 @@ in { systemd.user.services.yubikey-touch-detector = { path = [ pkgs.gnupg ]; + + environment = { + YUBIKEY_TOUCH_DETECTOR_LIBNOTIFY = builtins.toString cfg.libnotify; + YUBIKEY_TOUCH_DETECTOR_NOSOCKET = builtins.toString (!cfg.unixSocket); + YUBIKEY_TOUCH_DETECTOR_VERBOSE = builtins.toString cfg.verbose; + }; + wantedBy = [ "graphical-session.target" ]; }; systemd.user.sockets.yubikey-touch-detector = { diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 91ef9b43cd3e1..63f612eec960c 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -21,6 +21,10 @@ in # Completely removed modules (mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed") + (mkRemovedOptionModule [ "environment" "noXlibs" ] '' + The environment.noXlibs option was removed, as it often caused surprising breakages for new users. + If you need its functionality, you can apply similar overlays in your own config. + '') (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.") (mkRemovedOptionModule [ "hardware" "brightnessctl" ] '' The brightnessctl module was removed because newer versions of @@ -52,6 +56,7 @@ in is broken when using cgroups-v2. '') (mkRemovedOptionModule [ "services" "antennas" ] "The antennas package and the corresponding module have been removed as they only work with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version.") + (mkRemovedOptionModule [ "services" "ankisyncd" ] "`services.ankisyncd` has been replaced by `services.anki-sync-server`.") (mkRemovedOptionModule [ "services" "baget" "enable" ] "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") @@ -60,6 +65,12 @@ in (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.") (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") + (mkRemovedOptionModule [ "services" "dnscrypt-wrapper" ] '' + The dnscrypt-wrapper module was removed since the project has been effectively unmaintained since 2018; + moreover the NixOS module had to rely on an abandoned version of dnscrypt-proxy v1 for the rotation of keys. + + To wrap a resolver with DNSCrypt you can instead use dnsdist. See options `services.dnsdist.dnscrypt.*` + '') (mkRemovedOptionModule [ "services" "exhibitor" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") @@ -67,6 +78,7 @@ in (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed") (mkRemovedOptionModule [ "services" "fprot" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed") + (mkRemovedOptionModule [ "services" "globalprotect"] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "homeassistant-satellite"] "The `services.homeassistant-satellite` module has been replaced by `services.wyoming-satellite`.") (mkRemovedOptionModule [ "services" "hydron" ] "The `services.hydron` module has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability.") (mkRemovedOptionModule [ "services" "ihatemoney" ] "The ihatemoney module has been removed for lack of downstream maintainer") diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 83581d02840ed..a9cb396f13fd6 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, options, ... }: -with lib; let @@ -8,11 +7,11 @@ let user = if cfg.useRoot then "root" else "acme"; # Used to calculate timer accuracy for coalescing - numCerts = length (builtins.attrNames cfg.certs); + numCerts = lib.length (builtins.attrNames cfg.certs); _24hSecs = 60 * 60 * 24; # Used to make unique paths for each cert/account config set - mkHash = with builtins; val: substring 0 20 (hashString "sha256" val); + mkHash = with builtins; val: lib.substring 0 20 (hashString "sha256" val); mkAccountHash = acmeServer: data: mkHash "${toString acmeServer} ${data.keyType} ${data.email}"; accountDirRoot = "/var/lib/acme/.lego/accounts/"; @@ -29,7 +28,7 @@ let else [{ fst = head workingBaseList; snd = head needAssignmentList;}] ++ _rrCycler origBaseList (if (tail workingBaseList == []) then origBaseList else tail workingBaseList) (tail needAssignmentList); - attrsToList = mapAttrsToList (attrname: attrval: {name = attrname; value = attrval;}); + attrsToList = lib.mapAttrsToList (attrname: attrval: {name = attrname; value = attrval;}); # for an AttrSet `funcsAttrs` having functions as values, apply single arguments from # `argsList` to them in a round-robin manner. # Returns an attribute set with the applied functions as values. @@ -57,7 +56,7 @@ let commonServiceConfig = { Type = "oneshot"; User = user; - Group = mkDefault "acme"; + Group = lib.mkDefault "acme"; UMask = "0022"; StateDirectoryMode = "750"; ProtectSystem = "strict"; @@ -136,8 +135,8 @@ let userMigrationService = let script = with builtins; '' chown -R ${user} .lego/accounts - '' + (concatStringsSep "\n" (mapAttrsToList (cert: data: '' - for fixpath in ${escapeShellArg cert} .lego/${escapeShellArg cert}; do + '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList (cert: data: '' + for fixpath in ${lib.escapeShellArg cert} .lego/${lib.escapeShellArg cert}; do if [ -d "$fixpath" ]; then chmod -R u=rwX,g=rX,o= "$fixpath" chown -R ${user}:${data.group} "$fixpath" @@ -166,8 +165,8 @@ let # ensure all required lock files exist, but none more script = '' - GLOBIGNORE="${concatStringsSep ":" concurrencyLockfiles}" - rm -f * + GLOBIGNORE="${lib.concatStringsSep ":" concurrencyLockfiles}" + rm -f -- * unset GLOBIGNORE xargs touch <<< "${toString concurrencyLockfiles}" @@ -186,7 +185,7 @@ let useDns = data.dnsProvider != null; useDnsOrS3 = useDns || data.s3Bucket != null; destPath = "/var/lib/acme/${cert}"; - selfsignedDeps = optionals (cfg.preliminarySelfsigned) [ "acme-selfsigned-${cert}.service" ]; + selfsignedDeps = lib.optionals (cfg.preliminarySelfsigned) [ "acme-selfsigned-${cert}.service" ]; # Minica and lego have a "feature" which replaces * with _. We need # to make this substitution to reference the output files from both programs. @@ -196,7 +195,7 @@ let # FIXME when mkChangedOptionModule supports submodules, change to that. # This is a workaround extraDomains = data.extraDomainNames ++ ( - optionals + lib.optionals (data.extraDomains != "_mkMergedOptionModule") (builtins.attrNames data.extraDomains) ); @@ -204,22 +203,22 @@ let # Create hashes for cert data directories based on configuration # Flags are separated to avoid collisions hashData = with builtins; '' - ${concatStringsSep " " data.extraLegoFlags} - - ${concatStringsSep " " data.extraLegoRunFlags} - - ${concatStringsSep " " data.extraLegoRenewFlags} - + ${lib.concatStringsSep " " data.extraLegoFlags} - + ${lib.concatStringsSep " " data.extraLegoRunFlags} - + ${lib.concatStringsSep " " data.extraLegoRenewFlags} - ${toString acmeServer} ${toString data.dnsProvider} ${toString data.ocspMustStaple} ${data.keyType} ''; certDir = mkHash hashData; # TODO remove domainHash usage entirely. Waiting on go-acme/lego#1532 - domainHash = mkHash "${concatStringsSep " " extraDomains} ${data.domain}"; + domainHash = mkHash "${lib.concatStringsSep " " extraDomains} ${data.domain}"; accountHash = (mkAccountHash acmeServer data); accountDir = accountDirRoot + accountHash; protocolOpts = if useDns then ( [ "--dns" data.dnsProvider ] - ++ optionals (!data.dnsPropagationCheck) [ "--dns.disable-cp" ] - ++ optionals (data.dnsResolver != null) [ "--dns.resolvers" data.dnsResolver ] + ++ lib.optionals (!data.dnsPropagationCheck) [ "--dns.disable-cp" ] + ++ lib.optionals (data.dnsResolver != null) [ "--dns.resolvers" data.dnsResolver ] ) else if data.s3Bucket != null then [ "--http" "--http.s3-bucket" data.s3Bucket ] else if data.listenHTTP != null then [ "--http" "--http.port" data.listenHTTP ] else [ "--http" "--http.webroot" data.webroot ]; @@ -231,22 +230,22 @@ let "--email" data.email "--key-type" data.keyType ] ++ protocolOpts - ++ optionals (acmeServer != null) [ "--server" acmeServer ] - ++ concatMap (name: [ "-d" name ]) extraDomains + ++ lib.optionals (acmeServer != null) [ "--server" acmeServer ] + ++ lib.concatMap (name: [ "-d" name ]) extraDomains ++ data.extraLegoFlags; # Although --must-staple is common to both modes, it is not declared as a # mode-agnostic argument in lego and thus must come after the mode. - runOpts = escapeShellArgs ( + runOpts = lib.escapeShellArgs ( commonOpts ++ [ "run" ] - ++ optionals data.ocspMustStaple [ "--must-staple" ] + ++ lib.optionals data.ocspMustStaple [ "--must-staple" ] ++ data.extraLegoRunFlags ); - renewOpts = escapeShellArgs ( + renewOpts = lib.escapeShellArgs ( commonOpts ++ [ "renew" "--no-random-sleep" ] - ++ optionals data.ocspMustStaple [ "--must-staple" ] + ++ lib.optionals data.ocspMustStaple [ "--must-staple" ] ++ data.extraLegoRenewFlags ); @@ -286,8 +285,8 @@ let selfsignService = lockfileName: { description = "Generate self-signed certificate for ${cert}"; - after = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; - requires = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; + after = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ lib.optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; + requires = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ lib.optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; path = with pkgs; [ minica ]; @@ -315,7 +314,7 @@ let minica \ --ca-key ca/key.pem \ --ca-cert ca/cert.pem \ - --domains ${escapeShellArg (builtins.concatStringsSep "," ([ data.domain ] ++ extraDomains))} + --domains ${lib.escapeShellArg (builtins.concatStringsSep "," ([ data.domain ] ++ extraDomains))} # Create files to match directory layout for real certificates cd '${keyName}' @@ -324,28 +323,28 @@ let cat key.pem fullchain.pem > full.pem # Group might change between runs, re-apply it - chown '${user}:${data.group}' * + chown '${user}:${data.group}' -- * # Default permissions make the files unreadable by group + anon # Need to be readable by group - chmod 640 * + chmod 640 -- * ''; }; renewService = lockfileName: { description = "Renew ACME certificate for ${cert}"; - after = [ "network.target" "network-online.target" "acme-fixperms.service" "nss-lookup.target" ] ++ selfsignedDeps ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; - wants = [ "network-online.target" "acme-fixperms.service" ] ++ selfsignedDeps ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; + after = [ "network.target" "network-online.target" "acme-fixperms.service" "nss-lookup.target" ] ++ selfsignedDeps ++ lib.optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; + wants = [ "network-online.target" "acme-fixperms.service" ] ++ selfsignedDeps ++ lib.optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; # https://github.com/NixOS/nixpkgs/pull/81371#issuecomment-605526099 - wantedBy = optionals (!config.boot.isContainer) [ "multi-user.target" ]; + wantedBy = lib.optionals (!config.boot.isContainer) [ "multi-user.target" ]; path = with pkgs; [ lego coreutils diffutils openssl ]; serviceConfig = commonServiceConfig // { Group = data.group; - # Let's Encrypt Failed Validation Limit allows 5 retries per hour, per account, hostname and hour. + # Let's Encrypt Failed Validation Limit allows 5 retries per hour, per account, hostname and hour. # This avoids eating them all up if something is misconfigured upon the first try. RestartSec = 15 * 60; @@ -368,33 +367,33 @@ let "/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates" ]; - EnvironmentFile = mkIf useDnsOrS3 data.environmentFile; + EnvironmentFile = lib.mkIf useDnsOrS3 data.environmentFile; - Environment = mkIf useDnsOrS3 - (mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles); + Environment = lib.mkIf useDnsOrS3 + (lib.mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles); - LoadCredential = mkIf useDnsOrS3 - (mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles); + LoadCredential = lib.mkIf useDnsOrS3 + (lib.mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles); # Run as root (Prefixed with +) ExecStartPost = "+" + (pkgs.writeShellScript "acme-postrun" '' - cd /var/lib/acme/${escapeShellArg cert} + cd /var/lib/acme/${lib.escapeShellArg cert} if [ -e renewed ]; then rm renewed ${data.postRun} - ${optionalString (data.reloadServices != []) - "systemctl --no-block try-reload-or-restart ${escapeShellArgs data.reloadServices}" + ${lib.optionalString (data.reloadServices != []) + "systemctl --no-block try-reload-or-restart ${lib.escapeShellArgs data.reloadServices}" } fi ''); - } // optionalAttrs (data.listenHTTP != null && toInt (last (splitString ":" data.listenHTTP)) < 1024) { + } // lib.optionalAttrs (data.listenHTTP != null && lib.toInt (lib.last (lib.splitString ":" data.listenHTTP)) < 1024) { CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; }; # Working directory will be /tmp script = (if (lockfileName == null) then lib.id else wrapInFlock "${lockdir}${lockfileName}") '' - ${optionalString data.enableDebugLogs "set -x"} + ${lib.optionalString data.enableDebugLogs "set -x"} set -euo pipefail # This reimplements the expiration date check, but without querying @@ -411,7 +410,7 @@ let expiration_line="$( set -euxo pipefail - openssl x509 -noout -enddate <$pem \ + openssl x509 -noout -enddate <"$pem" \ | grep notAfter \ | sed -e 's/^notAfter=//' )" @@ -419,13 +418,13 @@ let expiration_date="$(date -d "$expiration_line" +%s)" now="$(date +%s)" - expiration_s=$[expiration_date - now] - expiration_days=$[expiration_s / (3600 * 24)] # rounds down + expiration_s=$((expiration_date - now)) + expiration_days=$((expiration_s / (3600 * 24))) # rounds down [[ $expiration_days -gt ${toString data.validMinDays} ]] } - ${optionalString (data.webroot != null) '' + ${lib.optionalString (data.webroot != null) '' # Ensure the webroot exists. Fixing group is required in case configuration was changed between runs. # Lego will fail if the webroot does not exist at all. ( @@ -442,7 +441,7 @@ let # Check if we can renew. # We can only renew if the list of domains has not changed. # We also need an account key. Avoids #190493 - if cmp -s domainhash.txt certificates/domainhash.txt && [ -e 'certificates/${keyName}.key' -a -e 'certificates/${keyName}.crt' -a -n "$(find accounts -name '${data.email}.key')" ]; then + if cmp -s domainhash.txt certificates/domainhash.txt && [ -e 'certificates/${keyName}.key' ] && [ -e 'certificates/${keyName}.crt' ] && [ -n "$(find accounts -name '${data.email}.key')" ]; then # Even if a cert is not expired, it may be revoked by the CA. # Try to renew, and silently fail if the cert is not expired. @@ -461,7 +460,7 @@ let # Produce a nice error for those doing their first nixos-rebuild with these certs echo Failed to fetch certificates. \ This may mean your DNS records are set up incorrectly. \ - ${optionalString (cfg.preliminarySelfsigned) "Selfsigned certs are in place and dependant services will still start."} + ${lib.optionalString (cfg.preliminarySelfsigned) "Selfsigned certs are in place and dependant services will still start."} # Exit 10 so that users can potentially amend SuccessExitStatus to ignore this error. # High number to avoid Systemd reserved codes. exit 10 @@ -490,7 +489,7 @@ let }; }; - certConfigs = mapAttrs certToConfig cfg.certs; + certConfigs = lib.mapAttrs certToConfig cfg.certs; # These options can be specified within # security.acme.defaults or security.acme.certs. @@ -504,22 +503,22 @@ let # stay constant. Though notably it wouldn't matter much, because to get # the option information, a submodule with name `` is evaluated # without any definitions. - defaultText = if isDefaults then default else literalExpression "config.security.acme.defaults.${name}"; + defaultText = if isDefaults then default else lib.literalExpression "config.security.acme.defaults.${name}"; }; in { imports = [ - (mkRenamedOptionModule [ "credentialsFile" ] [ "environmentFile" ]) + (lib.mkRenamedOptionModule [ "credentialsFile" ] [ "environmentFile" ]) ]; options = { - validMinDays = mkOption { - type = types.int; + validMinDays = lib.mkOption { + type = lib.types.int; inherit (defaultAndText "validMinDays" 30) default defaultText; description = "Minimum remaining validity before renewal in days."; }; - renewInterval = mkOption { - type = types.str; + renewInterval = lib.mkOption { + type = lib.types.str; inherit (defaultAndText "renewInterval" "daily") default defaultText; description = '' Systemd calendar expression when to check for renewal. See @@ -527,12 +526,12 @@ let ''; }; - enableDebugLogs = mkEnableOption "debug logging for this certificate" // { + enableDebugLogs = lib.mkEnableOption "debug logging for this certificate" // { inherit (defaultAndText "enableDebugLogs" true) default defaultText; }; - webroot = mkOption { - type = types.nullOr types.str; + webroot = lib.mkOption { + type = lib.types.nullOr lib.types.str; inherit (defaultAndText "webroot" null) default defaultText; example = "/var/lib/acme/acme-challenge"; description = '' @@ -544,8 +543,8 @@ let ''; }; - server = mkOption { - type = types.nullOr types.str; + server = lib.mkOption { + type = lib.types.nullOr lib.types.str; inherit (defaultAndText "server" "https://acme-v02.api.letsencrypt.org/directory") default defaultText; example = "https://acme-staging-v02.api.letsencrypt.org/directory"; description = '' @@ -556,8 +555,8 @@ let ''; }; - email = mkOption { - type = types.nullOr types.str; + email = lib.mkOption { + type = lib.types.nullOr lib.types.str; inherit (defaultAndText "email" null) default defaultText; description = '' Email address for account creation and correspondence from the CA. @@ -566,14 +565,14 @@ let ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; inherit (defaultAndText "group" "acme") default defaultText; description = "Group running the ACME client."; }; - reloadServices = mkOption { - type = types.listOf types.str; + reloadServices = lib.mkOption { + type = lib.types.listOf lib.types.str; inherit (defaultAndText "reloadServices" []) default defaultText; description = '' The list of systemd services to call `systemctl try-reload-or-restart` @@ -581,8 +580,8 @@ let ''; }; - postRun = mkOption { - type = types.lines; + postRun = lib.mkOption { + type = lib.types.lines; inherit (defaultAndText "postRun" "") default defaultText; example = "cp full.pem backup.pem"; description = '' @@ -593,8 +592,8 @@ let ''; }; - keyType = mkOption { - type = types.str; + keyType = lib.mkOption { + type = lib.types.str; inherit (defaultAndText "keyType" "ec256") default defaultText; description = '' Key type to use for private keys. @@ -603,8 +602,8 @@ let ''; }; - dnsProvider = mkOption { - type = types.nullOr types.str; + dnsProvider = lib.mkOption { + type = lib.types.nullOr lib.types.str; inherit (defaultAndText "dnsProvider" null) default defaultText; example = "route53"; description = '' @@ -613,8 +612,8 @@ let ''; }; - dnsResolver = mkOption { - type = types.nullOr types.str; + dnsResolver = lib.mkOption { + type = lib.types.nullOr lib.types.str; inherit (defaultAndText "dnsResolver" null) default defaultText; example = "1.1.1.1:53"; description = '' @@ -624,8 +623,8 @@ let ''; }; - environmentFile = mkOption { - type = types.nullOr types.path; + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; inherit (defaultAndText "environmentFile" null) default defaultText; description = '' Path to an EnvironmentFile for the cert's service containing any required and @@ -636,8 +635,8 @@ let example = "/var/src/secrets/example.org-route53-api-token"; }; - credentialFiles = mkOption { - type = types.attrsOf (types.path); + credentialFiles = lib.mkOption { + 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 @@ -647,15 +646,15 @@ let This allows to securely pass credential files to lego by leveraging systemd credentials. ''; - example = literalExpression '' + example = lib.literalExpression '' { "RFC2136_TSIG_SECRET_FILE" = "/run/secrets/tsig-secret-example.org"; } ''; }; - dnsPropagationCheck = mkOption { - type = types.bool; + dnsPropagationCheck = lib.mkOption { + type = lib.types.bool; inherit (defaultAndText "dnsPropagationCheck" true) default defaultText; description = '' Toggles lego DNS propagation check, which is used alongside DNS-01 @@ -663,8 +662,8 @@ let ''; }; - ocspMustStaple = mkOption { - type = types.bool; + ocspMustStaple = lib.mkOption { + type = lib.types.bool; inherit (defaultAndText "ocspMustStaple" false) default defaultText; description = '' Turns on the OCSP Must-Staple TLS extension. @@ -675,24 +674,24 @@ let ''; }; - extraLegoFlags = mkOption { - type = types.listOf types.str; + extraLegoFlags = lib.mkOption { + type = lib.types.listOf lib.types.str; inherit (defaultAndText "extraLegoFlags" []) default defaultText; description = '' Additional global flags to pass to all lego commands. ''; }; - extraLegoRenewFlags = mkOption { - type = types.listOf types.str; + extraLegoRenewFlags = lib.mkOption { + type = lib.types.listOf lib.types.str; inherit (defaultAndText "extraLegoRenewFlags" []) default defaultText; description = '' Additional flags to pass to lego renew. ''; }; - extraLegoRunFlags = mkOption { - type = types.listOf types.str; + extraLegoRunFlags = lib.mkOption { + type = lib.types.listOf lib.types.str; inherit (defaultAndText "extraLegoRunFlags" []) default defaultText; description = '' Additional flags to pass to lego run. @@ -704,40 +703,40 @@ let certOpts = { name, config, ... }: { options = { # user option has been removed - user = mkOption { + user = lib.mkOption { visible = false; default = "_mkRemovedOptionModule"; }; # allowKeysForGroup option has been removed - allowKeysForGroup = mkOption { + allowKeysForGroup = lib.mkOption { visible = false; default = "_mkRemovedOptionModule"; }; # extraDomains was replaced with extraDomainNames - extraDomains = mkOption { + extraDomains = lib.mkOption { visible = false; default = "_mkMergedOptionModule"; }; - directory = mkOption { - type = types.str; + directory = lib.mkOption { + type = lib.types.str; readOnly = true; default = "/var/lib/acme/${name}"; description = "Directory where certificate and other state is stored."; }; - domain = mkOption { - type = types.str; + domain = lib.mkOption { + type = lib.types.str; default = name; description = "Domain to fetch certificate for (defaults to the entry name)."; }; - extraDomainNames = mkOption { - type = types.listOf types.str; + extraDomainNames = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; - example = literalExpression '' + example = lib.literalExpression '' [ "example.org" "mydomain.org" @@ -751,8 +750,8 @@ let # This setting must be different for each configured certificate, otherwise # two or more renewals may fail to bind to the address. Hence, it is not in # the inheritableOpts. - listenHTTP = mkOption { - type = types.nullOr types.str; + listenHTTP = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = ":1360"; description = '' @@ -762,8 +761,8 @@ let ''; }; - s3Bucket = mkOption { - type = types.nullOr types.str; + s3Bucket = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "acme"; description = '' @@ -771,7 +770,7 @@ let ''; }; - inheritDefaults = mkOption { + inheritDefaults = lib.mkOption { default = true; example = true; description = "Whether to inherit values set in `security.acme.defaults` or not."; @@ -784,8 +783,8 @@ in { options = { security.acme = { - preliminarySelfsigned = mkOption { - type = types.bool; + preliminarySelfsigned = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether a preliminary self-signed certificate should be generated before @@ -797,8 +796,8 @@ in { ''; }; - acceptTerms = mkOption { - type = types.bool; + acceptTerms = lib.mkOption { + type = lib.types.bool; default = false; description = '' Accept the CA's terms of service. The default provider is Let's Encrypt, @@ -806,8 +805,8 @@ in { ''; }; - useRoot = mkOption { - type = types.bool; + useRoot = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to use the root user when generating certs. This is not recommended @@ -818,8 +817,8 @@ in { ''; }; - defaults = mkOption { - type = types.submodule (inheritableModule true); + defaults = lib.mkOption { + type = lib.types.submodule (inheritableModule true); description = '' Default values inheritable by all configured certs. You can use this to define options shared by all your certs. These defaults @@ -828,9 +827,9 @@ in { ''; }; - certs = mkOption { + certs = lib.mkOption { default = { }; - type = with types; attrsOf (submodule [ (inheritableModule false) certOpts ]); + type = with lib.types; attrsOf (submodule [ (inheritableModule false) certOpts ]); description = '' Attribute set of certificates to get signed and renewed. Creates `acme-''${cert}.{service,timer}` systemd units for @@ -838,7 +837,7 @@ in { to those units if they rely on the certificates being present, or trigger restarts of the service if certificates get renewed. ''; - example = literalExpression '' + example = lib.literalExpression '' { "example.com" = { webroot = "/var/lib/acme/acme-challenge/"; @@ -852,9 +851,9 @@ in { } ''; }; - maxConcurrentRenewals = mkOption { + maxConcurrentRenewals = lib.mkOption { default = 5; - type = types.int; + type = lib.types.int; description = '' Maximum number of concurrent certificate generation or renewal jobs. All other jobs will queue and wait running jobs to finish. Reduces the system load of @@ -867,39 +866,39 @@ in { }; imports = [ - (mkRemovedOptionModule [ "security" "acme" "production" ] '' + (lib.mkRemovedOptionModule [ "security" "acme" "production" ] '' Use security.acme.server to define your staging ACME server URL instead. To use the let's encrypt staging server, use security.acme.server = "https://acme-staging-v02.api.letsencrypt.org/directory". '') - (mkRemovedOptionModule [ "security" "acme" "directory" ] "ACME Directory is now hardcoded to /var/lib/acme and its permissions are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.") - (mkRemovedOptionModule [ "security" "acme" "preDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") - (mkRemovedOptionModule [ "security" "acme" "activationDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") - (mkChangedOptionModule [ "security" "acme" "validMin" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMin / (24 * 3600))) - (mkChangedOptionModule [ "security" "acme" "validMinDays" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMinDays)) - (mkChangedOptionModule [ "security" "acme" "renewInterval" ] [ "security" "acme" "defaults" "renewInterval" ] (config: config.security.acme.renewInterval)) - (mkChangedOptionModule [ "security" "acme" "email" ] [ "security" "acme" "defaults" "email" ] (config: config.security.acme.email)) - (mkChangedOptionModule [ "security" "acme" "server" ] [ "security" "acme" "defaults" "server" ] (config: config.security.acme.server)) - (mkChangedOptionModule [ "security" "acme" "enableDebugLogs" ] [ "security" "acme" "defaults" "enableDebugLogs" ] (config: config.security.acme.enableDebugLogs)) + (lib.mkRemovedOptionModule [ "security" "acme" "directory" ] "ACME Directory is now hardcoded to /var/lib/acme and its permissions are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.") + (lib.mkRemovedOptionModule [ "security" "acme" "preDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") + (lib.mkRemovedOptionModule [ "security" "acme" "activationDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") + (lib.mkChangedOptionModule [ "security" "acme" "validMin" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMin / (24 * 3600))) + (lib.mkChangedOptionModule [ "security" "acme" "validMinDays" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMinDays)) + (lib.mkChangedOptionModule [ "security" "acme" "renewInterval" ] [ "security" "acme" "defaults" "renewInterval" ] (config: config.security.acme.renewInterval)) + (lib.mkChangedOptionModule [ "security" "acme" "email" ] [ "security" "acme" "defaults" "email" ] (config: config.security.acme.email)) + (lib.mkChangedOptionModule [ "security" "acme" "server" ] [ "security" "acme" "defaults" "server" ] (config: config.security.acme.server)) + (lib.mkChangedOptionModule [ "security" "acme" "enableDebugLogs" ] [ "security" "acme" "defaults" "enableDebugLogs" ] (config: config.security.acme.enableDebugLogs)) ]; - config = mkMerge [ - (mkIf (cfg.certs != { }) { + config = lib.mkMerge [ + (lib.mkIf (cfg.certs != { }) { # FIXME Most of these custom warnings and filters for security.acme.certs.* are required # because using mkRemovedOptionModule/mkChangedOptionModule with attrsets isn't possible. - warnings = filter (w: w != "") (mapAttrsToList (cert: data: optionalString (data.extraDomains != "_mkMergedOptionModule") '' + warnings = lib.filter (w: w != "") (lib.mapAttrsToList (cert: data: lib.optionalString (data.extraDomains != "_mkMergedOptionModule") '' The option definition `security.acme.certs.${cert}.extraDomains` has changed to `security.acme.certs.${cert}.extraDomainNames` and is now a list of strings. Setting a custom webroot for extra domains is not possible, instead use separate certs. '') cfg.certs); assertions = let - certs = attrValues cfg.certs; + certs = lib.attrValues cfg.certs; in [ { - assertion = cfg.defaults.email != null || all (certOpts: certOpts.email != null) certs; + assertion = cfg.defaults.email != null || lib.all (certOpts: certOpts.email != null) certs; message = '' You must define `security.acme.certs..email` or `security.acme.defaults.email` to register with the CA. Note that using @@ -914,7 +913,7 @@ in { to `true`. For Let's Encrypt's ToS see https://letsencrypt.org/repository/ ''; } - ] ++ (builtins.concatLists (mapAttrsToList (cert: data: [ + ] ++ (builtins.concatLists (lib.mapAttrsToList (cert: data: [ { assertion = data.user == "_mkRemovedOptionModule"; message = '' @@ -936,7 +935,7 @@ in { # referencing them as a user quite weird too. Best practice is to use # the domain option. { - assertion = ! hasInfix "*" cert; + assertion = ! lib.hasInfix "*" cert; message = '' The cert option path `security.acme.certs.${cert}.dnsProvider` cannot contain a * character. @@ -959,7 +958,7 @@ in { ''; }) { - assertion = all (hasSuffix "_FILE") (attrNames data.credentialFiles); + assertion = lib.all (lib.hasSuffix "_FILE") (lib.attrNames data.credentialFiles); message = '' Option `security.acme.certs.${cert}.credentialFiles` can only be used for variables suffixed by "_FILE". @@ -982,27 +981,27 @@ in { ]; systemd.services = let - renewServiceFunctions = mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewService) certConfigs; + renewServiceFunctions = lib.mapAttrs' (cert: conf: lib.nameValuePair "acme-${cert}" conf.renewService) certConfigs; renewServices = if cfg.maxConcurrentRenewals > 0 then roundRobinApplyAttrs renewServiceFunctions concurrencyLockfiles - else mapAttrs (_: f: f null) renewServiceFunctions; - selfsignServiceFunctions = mapAttrs' (cert: conf: nameValuePair "acme-selfsigned-${cert}" conf.selfsignService) certConfigs; + else lib.mapAttrs (_: f: f null) renewServiceFunctions; + selfsignServiceFunctions = lib.mapAttrs' (cert: conf: lib.nameValuePair "acme-selfsigned-${cert}" conf.selfsignService) certConfigs; selfsignServices = if cfg.maxConcurrentRenewals > 0 then roundRobinApplyAttrs selfsignServiceFunctions concurrencyLockfiles - else mapAttrs (_: f: f null) selfsignServiceFunctions; + else lib.mapAttrs (_: f: f null) selfsignServiceFunctions; in { "acme-fixperms" = userMigrationService; } - // (optionalAttrs (cfg.maxConcurrentRenewals > 0) {"acme-lockfiles" = lockfilePrepareService; }) + // (lib.optionalAttrs (cfg.maxConcurrentRenewals > 0) {"acme-lockfiles" = lockfilePrepareService; }) // renewServices - // (optionalAttrs (cfg.preliminarySelfsigned) ({ + // (lib.optionalAttrs (cfg.preliminarySelfsigned) ({ "acme-selfsigned-ca" = selfsignCAService; } // selfsignServices)); - systemd.timers = mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewTimer) certConfigs; + systemd.timers = lib.mapAttrs' (cert: conf: lib.nameValuePair "acme-${cert}" conf.renewTimer) certConfigs; systemd.targets = let # Create some targets which can be depended on to be "active" after cert renewals - finishedTargets = mapAttrs' (cert: conf: nameValuePair "acme-finished-${cert}" { + finishedTargets = lib.mapAttrs' (cert: conf: lib.nameValuePair "acme-finished-${cert}" { wantedBy = [ "default.target" ]; requires = [ "acme-${cert}.service" ]; after = [ "acme-${cert}.service" ]; @@ -1017,15 +1016,15 @@ in { # Using a target here is fine - account creation is a one time event. Even if # systemd clean --what=state is used to delete the account, so long as the user # then runs one of the cert services, there won't be any issues. - accountTargets = mapAttrs' (hash: confs: let + accountTargets = lib.mapAttrs' (hash: confs: let leader = "acme-${(builtins.head confs).cert}.service"; dependantServices = map (conf: "acme-${conf.cert}.service") (builtins.tail confs); - in nameValuePair "acme-account-${hash}" { + in lib.nameValuePair "acme-account-${hash}" { requiredBy = dependantServices; before = dependantServices; requires = [ leader ]; after = [ leader ]; - }) (groupBy (conf: conf.accountHash) (attrValues certConfigs)); + }) (lib.groupBy (conf: conf.accountHash) (lib.attrValues certConfigs)); in finishedTargets // accountTargets; }) ]; diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix index cd377c66f86df..e9ffecdfbea5a 100644 --- a/nixos/modules/security/auditd.nix +++ b/nixos/modules/security/auditd.nix @@ -1,19 +1,29 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ + config, + lib, + pkgs, + ... +}: { - options.security.auditd.enable = mkEnableOption "the Linux Audit daemon"; + options.security.auditd.enable = lib.mkEnableOption "the Linux Audit daemon"; - config = mkIf config.security.auditd.enable { + config = lib.mkIf config.security.auditd.enable { boot.kernelParams = [ "audit=1" ]; environment.systemPackages = [ pkgs.audit ]; systemd.services.auditd = { description = "Linux Audit daemon"; - wantedBy = [ "basic.target" ]; - before = [ "shutdown.target" ]; + wantedBy = [ "sysinit.target" ]; + after = [ + "local-fs.target" + "systemd-tmpfiles-setup.service" + ]; + before = [ + "sysinit.target" + "shutdown.target" + ]; conflicts = [ "shutdown.target" ]; unitConfig = { diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 738062c95c475..c501ea70d05ce 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -157,7 +157,7 @@ in { continue fi '') cfg.params)} - rm $file + rm "$file" done # TODO: Ideally this would be removing the *former* cfg.path, though diff --git a/nixos/modules/security/isolate.nix b/nixos/modules/security/isolate.nix index 3cc0176f3db30..11a6af588b5b4 100644 --- a/nixos/modules/security/isolate.nix +++ b/nixos/modules/security/isolate.nix @@ -125,7 +125,7 @@ in }; systemd.slices.isolate = { - description = "Isolate sandbox slice"; + description = "Isolate Sandbox Slice"; }; meta.maintainers = with maintainers; [ virchau13 ]; diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix index 5e13b4caddd86..d3ffefe46fc6f 100644 --- a/nixos/modules/security/misc.nix +++ b/nixos/modules/security/misc.nix @@ -1,10 +1,7 @@ { config, lib, ... }: - -with lib; - { meta = { - maintainers = [ maintainers.joachifm ]; + maintainers = [ lib.maintainers.joachifm ]; }; imports = [ @@ -12,8 +9,8 @@ with lib; ]; options = { - security.allowUserNamespaces = mkOption { - type = types.bool; + security.allowUserNamespaces = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to allow creation of user namespaces. @@ -31,8 +28,8 @@ with lib; ''; }; - security.unprivilegedUsernsClone = mkOption { - type = types.bool; + security.unprivilegedUsernsClone = lib.mkOption { + type = lib.types.bool; default = false; description = '' When disabled, unprivileged users will not be able to create new namespaces. @@ -41,16 +38,16 @@ with lib; ''; }; - security.protectKernelImage = mkOption { - type = types.bool; + security.protectKernelImage = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to prevent replacing the running kernel image. ''; }; - security.allowSimultaneousMultithreading = mkOption { - type = types.bool; + security.allowSimultaneousMultithreading = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to allow SMT/hyperthreading. Disabling SMT means that only @@ -68,8 +65,8 @@ with lib; ''; }; - security.forcePageTableIsolation = mkOption { - type = types.bool; + security.forcePageTableIsolation = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to force-enable the Page Table Isolation (PTI) Linux kernel @@ -80,8 +77,8 @@ with lib; ''; }; - security.virtualisation.flushL1DataCache = mkOption { - type = types.nullOr (types.enum [ "never" "cond" "always" ]); + security.virtualisation.flushL1DataCache = lib.mkOption { + type = lib.types.nullOr (lib.types.enum [ "never" "cond" "always" ]); default = null; description = '' Whether the hypervisor should flush the L1 data cache before @@ -100,8 +97,8 @@ with lib; }; }; - config = mkMerge [ - (mkIf (!config.security.allowUserNamespaces) { + config = lib.mkMerge [ + (lib.mkIf (!config.security.allowUserNamespaces) { # Setting the number of allowed user namespaces to 0 effectively disables # the feature at runtime. Note that root may raise the limit again # at any time. @@ -114,26 +111,26 @@ with lib; ]; }) - (mkIf config.security.unprivilegedUsernsClone { - boot.kernel.sysctl."kernel.unprivileged_userns_clone" = mkDefault true; + (lib.mkIf config.security.unprivilegedUsernsClone { + boot.kernel.sysctl."kernel.unprivileged_userns_clone" = lib.mkDefault true; }) - (mkIf config.security.protectKernelImage { + (lib.mkIf config.security.protectKernelImage { # Disable hibernation (allows replacing the running kernel) boot.kernelParams = [ "nohibernate" ]; # Prevent replacing the running kernel image w/o reboot - boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true; + boot.kernel.sysctl."kernel.kexec_load_disabled" = lib.mkDefault true; }) - (mkIf (!config.security.allowSimultaneousMultithreading) { + (lib.mkIf (!config.security.allowSimultaneousMultithreading) { boot.kernelParams = [ "nosmt" ]; }) - (mkIf config.security.forcePageTableIsolation { + (lib.mkIf config.security.forcePageTableIsolation { boot.kernelParams = [ "pti=on" ]; }) - (mkIf (config.security.virtualisation.flushL1DataCache != null) { + (lib.mkIf (config.security.virtualisation.flushL1DataCache != null) { boot.kernelParams = [ "kvm-intel.vmentry_l1d_flush=${config.security.virtualisation.flushL1DataCache}" ]; }) ]; diff --git a/nixos/modules/security/oath.nix b/nixos/modules/security/oath.nix index 93bdc851117ae..acf9440b9b92c 100644 --- a/nixos/modules/security/oath.nix +++ b/nixos/modules/security/oath.nix @@ -1,32 +1,28 @@ # This module provides configuration for the OATH PAM modules. - { lib, ... }: - -with lib; - { options = { security.pam.oath = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable the OATH (one-time password) PAM module. ''; }; - digits = mkOption { - type = types.enum [ 6 7 8 ]; + digits = lib.mkOption { + type = lib.types.enum [ 6 7 8 ]; default = 6; description = '' - Specify the length of the one-time password in number of + Specify the lib.length of the one-time password in number of digits. ''; }; - window = mkOption { - type = types.int; + window = lib.mkOption { + type = lib.types.int; default = 5; description = '' Specify the number of one-time passwords to check in order @@ -36,8 +32,8 @@ with lib; ''; }; - usersFile = mkOption { - type = types.path; + usersFile = lib.mkOption { + type = lib.types.path; default = "/etc/users.oath"; description = '' Set the path to file where the user's credentials are diff --git a/nixos/modules/services/accessibility/orca.nix b/nixos/modules/services/accessibility/orca.nix new file mode 100644 index 0000000000000..4487afba103c5 --- /dev/null +++ b/nixos/modules/services/accessibility/orca.nix @@ -0,0 +1,25 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.orca; + inherit (lib) + mkEnableOption + mkIf + mkPackageOption + ; +in +{ + options.services.orca = { + enable = mkEnableOption "Orca screen reader"; + package = mkPackageOption pkgs "orca" { }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.speechd.enable = true; + }; +} diff --git a/nixos/modules/services/admin/pgadmin.nix b/nixos/modules/services/admin/pgadmin.nix index 9c430bd05e712..c9da556b763df 100644 --- a/nixos/modules/services/admin/pgadmin.nix +++ b/nixos/modules/services/admin/pgadmin.nix @@ -1,15 +1,12 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.pgadmin; - _base = with types; [ int bool str ]; - base = with types; oneOf ([ (listOf (oneOf _base)) (attrsOf (oneOf _base)) ] ++ _base); + _base = with lib.types; [ int bool str ]; + base = with lib.types; oneOf ([ (listOf (oneOf _base)) (attrsOf (oneOf _base)) ] ++ _base); formatAttrset = attr: - "{${concatStringsSep "\n" (mapAttrsToList (key: value: "${builtins.toJSON key}: ${formatPyValue value},") attr)}}"; + "{${lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: "${builtins.toJSON key}: ${formatPyValue value},") attr)}}"; formatPyValue = value: if builtins.isString value then builtins.toJSON value @@ -17,98 +14,98 @@ let else if builtins.isInt value then toString value else if builtins.isBool value then (if value then "True" else "False") else if builtins.isAttrs value then (formatAttrset value) - else if builtins.isList value then "[${concatStringsSep "\n" (map (v: "${formatPyValue v},") value)}]" + else if builtins.isList value then "[${lib.concatStringsSep "\n" (map (v: "${formatPyValue v},") value)}]" else throw "Unrecognized type"; formatPy = attrs: - concatStringsSep "\n" (mapAttrsToList (key: value: "${key} = ${formatPyValue value}") attrs); + lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: "${key} = ${formatPyValue value}") attrs); - pyType = with types; attrsOf (oneOf [ (attrsOf base) (listOf base) base ]); + pyType = with lib.types; attrsOf (oneOf [ (attrsOf base) (listOf base) base ]); in { options.services.pgadmin = { - enable = mkEnableOption "PostgreSQL Admin 4"; + enable = lib.mkEnableOption "PostgreSQL Admin 4"; - port = mkOption { + port = lib.mkOption { description = "Port for pgadmin4 to run on"; - type = types.port; + type = lib.types.port; default = 5050; }; - package = mkPackageOption pkgs "pgadmin4" { }; + package = lib.mkPackageOption pkgs "pgadmin4" { }; - initialEmail = mkOption { + initialEmail = lib.mkOption { description = "Initial email for the pgAdmin account"; - type = types.str; + type = lib.types.str; }; - initialPasswordFile = mkOption { + initialPasswordFile = lib.mkOption { description = '' Initial password file for the pgAdmin account. Minimum length by default is 6. Please see `services.pgadmin.minimumPasswordLength`. NOTE: Should be string not a store path, to prevent the password from being world readable ''; - type = types.path; + type = lib.types.path; }; - minimumPasswordLength = mkOption { + minimumPasswordLength = lib.mkOption { description = "Minimum length of the password"; - type = types.int; + type = lib.types.int; default = 6; }; emailServer = { - enable = mkOption { + enable = lib.mkOption { description = '' Enable SMTP email server. This is necessary, if you want to use password recovery or change your own password ''; - type = types.bool; + type = lib.types.bool; default = false; }; - address = mkOption { + address = lib.mkOption { description = "SMTP server for email delivery"; - type = types.str; + type = lib.types.str; default = "localhost"; }; - port = mkOption { + port = lib.mkOption { description = "SMTP server port for email delivery"; - type = types.port; + type = lib.types.port; default = 25; }; - useSSL = mkOption { + useSSL = lib.mkOption { description = "SMTP server should use SSL"; - type = types.bool; + type = lib.types.bool; default = false; }; - useTLS = mkOption { + useTLS = lib.mkOption { description = "SMTP server should use TLS"; - type = types.bool; + type = lib.types.bool; default = false; }; - username = mkOption { + username = lib.mkOption { description = "SMTP server username for email delivery"; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; default = null; }; - sender = mkOption { + sender = lib.mkOption { description = '' SMTP server sender email for email delivery. Some servers require this to be a valid email address from that server ''; - type = types.str; + type = lib.types.str; example = "noreply@example.com"; }; - passwordFile = mkOption { + passwordFile = lib.mkOption { description = '' Password for SMTP email account. NOTE: Should be string not a store path, to prevent the password from being world readable ''; - type = types.path; + type = lib.types.path; }; }; - openFirewall = mkEnableOption "firewall passthrough for pgadmin4"; + openFirewall = lib.mkEnableOption "firewall passthrough for pgadmin4"; - settings = mkOption { + settings = lib.mkOption { description = '' Settings for pgadmin4. [Documentation](https://www.pgadmin.org/docs/pgadmin4/development/config_py.html) @@ -118,17 +115,17 @@ in }; }; - config = mkIf (cfg.enable) { - networking.firewall.allowedTCPPorts = mkIf (cfg.openFirewall) [ cfg.port ]; + config = lib.mkIf (cfg.enable) { + networking.firewall.allowedTCPPorts = lib.mkIf (cfg.openFirewall) [ cfg.port ]; services.pgadmin.settings = { DEFAULT_SERVER_PORT = cfg.port; PASSWORD_LENGTH_MIN = cfg.minimumPasswordLength; SERVER_MODE = true; UPGRADE_CHECK_ENABLED = false; - } // (optionalAttrs cfg.openFirewall { - DEFAULT_SERVER = mkDefault "::"; - }) // (optionalAttrs cfg.emailServer.enable { + } // (lib.optionalAttrs cfg.openFirewall { + DEFAULT_SERVER = lib.mkDefault "::"; + }) // (lib.optionalAttrs cfg.emailServer.enable { MAIL_SERVER = cfg.emailServer.address; MAIL_PORT = cfg.emailServer.port; MAIL_USE_SSL = cfg.emailServer.useSSL; @@ -160,7 +157,7 @@ in fi ( # Email address: - echo ${escapeShellArg cfg.initialEmail} + echo ${lib.escapeShellArg cfg.initialEmail} # file might not contain newline. echo hack fixes that. PW=$(cat "$PW_FILE") @@ -183,7 +180,7 @@ in StateDirectory = "pgadmin"; ExecStart = "${cfg.package}/bin/pgadmin4"; LoadCredential = [ "initial_password:${cfg.initialPasswordFile}" ] - ++ optional cfg.emailServer.enable "email_password:${cfg.emailServer.passwordFile}"; + ++ lib.optional cfg.emailServer.enable "email_password:${cfg.emailServer.passwordFile}"; }; }; diff --git a/nixos/modules/services/audio/jack.nix b/nixos/modules/services/audio/jack.nix index a5cb0da29592e..7344fdf4a2186 100644 --- a/nixos/modules/services/audio/jack.nix +++ b/nixos/modules/services/audio/jack.nix @@ -8,7 +8,7 @@ let pcmPlugin = cfg.jackd.enable && cfg.alsa.enable; loopback = cfg.jackd.enable && cfg.loopback.enable; - enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 && pkgs.pkgsi686Linux.alsa-lib != null; + enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.hostPlatform.isx86_64 && pkgs.pkgsi686Linux.alsa-lib != null; umaskNeeded = versionOlder cfg.jackd.package.version "1.9.12"; bridgeNeeded = versionAtLeast cfg.jackd.package.version "1.9.12"; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index b5e33f3c09868..a6cd803845336 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let name = "mpd"; @@ -12,11 +9,11 @@ let credentialsPlaceholder = (creds: let - placeholders = (imap0 - (i: c: ''password "{{password-${toString i}}}@${concatStringsSep "," c.permissions}"'') + placeholders = (lib.imap0 + (i: c: ''password "{{password-${toString i}}}@${lib.concatStringsSep "," c.permissions}"'') creds); in - concatStringsSep "\n" placeholders); + lib.concatStringsSep "\n" placeholders); mpdConf = pkgs.writeText "mpd.conf" '' # This file was automatically generated by NixOS. Edit mpd's configuration @@ -31,16 +28,16 @@ let state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" - ${optionalString (cfg.network.listenAddress != "any") ''bind_to_address "${cfg.network.listenAddress}"''} - ${optionalString (cfg.network.port != 6600) ''port "${toString cfg.network.port}"''} - ${optionalString (cfg.fluidsynth) '' + ${lib.optionalString (cfg.network.listenAddress != "any") ''bind_to_address "${cfg.network.listenAddress}"''} + ${lib.optionalString (cfg.network.port != 6600) ''port "${toString cfg.network.port}"''} + ${lib.optionalString (cfg.fluidsynth) '' decoder { plugin "fluidsynth" soundfont "${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2" } ''} - ${optionalString (cfg.credentials != []) (credentialsPlaceholder cfg.credentials)} + ${lib.optionalString (cfg.credentials != []) (credentialsPlaceholder cfg.credentials)} ${cfg.extraConfig} ''; @@ -53,16 +50,16 @@ in { services.mpd = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable MPD, the music player daemon. ''; }; - startWhenNeeded = mkOption { - type = types.bool; + startWhenNeeded = lib.mkOption { + type = lib.types.bool; default = false; description = '' If set, {command}`mpd` is socket-activated; that @@ -71,10 +68,10 @@ in { ''; }; - musicDirectory = mkOption { - type = with types; either path (strMatching "(http|https|nfs|smb)://.+"); + musicDirectory = lib.mkOption { + type = with lib.types; either path (strMatching "(http|https|nfs|smb)://.+"); default = "${cfg.dataDir}/music"; - defaultText = literalExpression ''"''${dataDir}/music"''; + defaultText = lib.literalExpression ''"''${dataDir}/music"''; description = '' The directory or NFS/SMB network share where MPD reads music from. If left as the default value this directory will automatically be created before @@ -83,10 +80,10 @@ in { ''; }; - playlistDirectory = mkOption { - type = types.path; + playlistDirectory = lib.mkOption { + type = lib.types.path; default = "${cfg.dataDir}/playlists"; - defaultText = literalExpression ''"''${dataDir}/playlists"''; + defaultText = lib.literalExpression ''"''${dataDir}/playlists"''; description = '' The directory where MPD stores playlists. If left as the default value this directory will automatically be created before the MPD server starts, @@ -95,8 +92,8 @@ in { ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra directives added to to the end of MPD's configuration file, @@ -106,8 +103,8 @@ in { ''; }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/${name}"; description = '' The directory where MPD stores its state, tag cache, playlists etc. If @@ -117,22 +114,22 @@ in { ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = name; description = "User account under which MPD runs."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = name; description = "Group account under which MPD runs."; }; network = { - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; example = "any"; description = '' @@ -141,8 +138,8 @@ in { ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 6600; description = '' This setting is the TCP port that is desired for the daemon to get assigned @@ -152,33 +149,33 @@ in { }; - dbFile = mkOption { - type = types.nullOr types.str; + dbFile = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = "${cfg.dataDir}/tag_cache"; - defaultText = literalExpression ''"''${dataDir}/tag_cache"''; + defaultText = lib.literalExpression ''"''${dataDir}/tag_cache"''; description = '' The path to MPD's database. If set to `null` the parameter is omitted from the configuration. ''; }; - credentials = mkOption { - type = types.listOf (types.submodule { + credentials = lib.mkOption { + type = lib.types.listOf (lib.types.submodule { options = { - passwordFile = mkOption { - type = types.path; + passwordFile = lib.mkOption { + type = lib.types.path; description = '' Path to file containing the password. ''; }; permissions = let perms = ["read" "add" "control" "admin"]; - in mkOption { - type = types.listOf (types.enum perms); + in lib.mkOption { + type = lib.types.listOf (lib.types.enum perms); default = [ "read" ]; description = '' List of permissions that are granted with this password. - Permissions can be "${concatStringsSep "\", \"" perms}". + Permissions can be "${lib.concatStringsSep "\", \"" perms}". ''; }; }; @@ -193,8 +190,8 @@ in { ]; }; - fluidsynth = mkOption { - type = types.bool; + fluidsynth = lib.mkOption { + type = lib.types.bool; default = false; description = '' If set, add fluidsynth soundfont and configure the plugin. @@ -207,31 +204,31 @@ in { ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # install mpd units systemd.packages = [ pkgs.mpd ]; - systemd.sockets.mpd = mkIf cfg.startWhenNeeded { + systemd.sockets.mpd = lib.mkIf cfg.startWhenNeeded { wantedBy = [ "sockets.target" ]; listenStreams = [ "" # Note: this is needed to override the upstream unit (if pkgs.lib.hasPrefix "/" cfg.network.listenAddress then cfg.network.listenAddress - else "${optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}") + else "${lib.optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}") ]; }; systemd.services.mpd = { - wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target"; + wantedBy = lib.optional (!cfg.startWhenNeeded) "multi-user.target"; preStart = '' set -euo pipefail install -m 600 ${mpdConf} /run/mpd/mpd.conf - '' + optionalString (cfg.credentials != []) - (concatStringsSep "\n" - (imap0 + '' + lib.optionalString (cfg.credentials != []) + (lib.concatStringsSep "\n" + (lib.imap0 (i: c: ''${pkgs.replace-secret}/bin/replace-secret '{{password-${toString i}}}' '${c.passwordFile}' /run/mpd/mpd.conf'') cfg.credentials)); @@ -242,13 +239,13 @@ in { ExecStart = [ "" "${pkgs.mpd}/bin/mpd --systemd /run/mpd/mpd.conf" ]; RuntimeDirectory = "mpd"; StateDirectory = [] - ++ optionals (cfg.dataDir == "/var/lib/${name}") [ name ] - ++ optionals (cfg.playlistDirectory == "/var/lib/${name}/playlists") [ name "${name}/playlists" ] - ++ optionals (cfg.musicDirectory == "/var/lib/${name}/music") [ name "${name}/music" ]; + ++ lib.optionals (cfg.dataDir == "/var/lib/${name}") [ name ] + ++ lib.optionals (cfg.playlistDirectory == "/var/lib/${name}/playlists") [ name "${name}/playlists" ] + ++ lib.optionals (cfg.musicDirectory == "/var/lib/${name}/music") [ name "${name}/music" ]; }; }; - users.users = optionalAttrs (cfg.user == name) { + users.users = lib.optionalAttrs (cfg.user == name) { ${name} = { inherit uid; group = cfg.group; @@ -258,7 +255,7 @@ in { }; }; - users.groups = optionalAttrs (cfg.group == name) { + users.groups = lib.optionalAttrs (cfg.group == name) { ${name}.gid = gid; }; }; diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index 7f781ee44e361..20186016afd70 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -1,7 +1,4 @@ { config, options, lib, pkgs, ... }: - -with lib; - let name = "snapserver"; @@ -9,8 +6,8 @@ let cfg = config.services.snapserver; # Using types.nullOr to inherit upstream defaults. - sampleFormat = mkOption { - type = with types; nullOr str; + sampleFormat = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' Default sample format. @@ -18,8 +15,8 @@ let example = "48000:16:2"; }; - codec = mkOption { - type = with types; nullOr str; + codec = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' Default audio compression method. @@ -30,20 +27,20 @@ let streamToOption = name: opt: let os = val: - optionalString (val != null) "${val}"; + lib.optionalString (val != null) "${val}"; os' = prefix: val: - optionalString (val != null) (prefix + "${val}"); - flatten = key: value: + lib.optionalString (val != null) (prefix + "${val}"); + toQueryString = key: value: "&${key}=${value}"; in "--stream.stream=\"${opt.type}://" + os opt.location + "?" + os' "name=" name + os' "&sampleformat=" opt.sampleFormat + os' "&codec=" opt.codec - + concatStrings (mapAttrsToList flatten opt.query) + "\""; + + lib.concatStrings (lib.mapAttrsToList toQueryString opt.query) + "\""; optionalNull = val: ret: - optional (val != null) ret; + lib.optional (val != null) ret; - optionString = concatStringsSep " " (mapAttrsToList streamToOption cfg.streams + optionString = lib.concatStringsSep " " (lib.mapAttrsToList streamToOption cfg.streams # global options ++ [ "--stream.bind_to_address=${cfg.listenAddress}" ] ++ [ "--stream.port=${toString cfg.port}" ] @@ -51,22 +48,22 @@ let ++ optionalNull cfg.codec "--stream.codec=${cfg.codec}" ++ optionalNull cfg.streamBuffer "--stream.stream_buffer=${toString cfg.streamBuffer}" ++ optionalNull cfg.buffer "--stream.buffer=${toString cfg.buffer}" - ++ optional cfg.sendToMuted "--stream.send_to_muted" + ++ lib.optional cfg.sendToMuted "--stream.send_to_muted" # tcp json rpc ++ [ "--tcp.enabled=${toString cfg.tcp.enable}" ] - ++ optionals cfg.tcp.enable [ + ++ lib.optionals cfg.tcp.enable [ "--tcp.bind_to_address=${cfg.tcp.listenAddress}" "--tcp.port=${toString cfg.tcp.port}" ] # http json rpc ++ [ "--http.enabled=${toString cfg.http.enable}" ] - ++ optionals cfg.http.enable [ + ++ lib.optionals cfg.http.enable [ "--http.bind_to_address=${cfg.http.listenAddress}" "--http.port=${toString cfg.http.port}" - ] ++ optional (cfg.http.docRoot != null) "--http.doc_root=\"${toString cfg.http.docRoot}\""); + ] ++ lib.optional (cfg.http.docRoot != null) "--http.doc_root=\"${toString cfg.http.docRoot}\""); in { imports = [ - (mkRenamedOptionModule [ "services" "snapserver" "controlPort" ] [ "services" "snapserver" "tcp" "port" ]) + (lib.mkRenamedOptionModule [ "services" "snapserver" "controlPort" ] [ "services" "snapserver" "tcp" "port" ]) ]; ###### interface @@ -75,16 +72,16 @@ in { services.snapserver = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable snapserver. ''; }; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "::"; example = "0.0.0.0"; description = '' @@ -92,16 +89,16 @@ in { ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 1704; description = '' The port that snapclients can connect to. ''; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to automatically open the specified ports in the firewall. @@ -111,8 +108,8 @@ in { inherit sampleFormat; inherit codec; - streamBuffer = mkOption { - type = with types; nullOr int; + streamBuffer = lib.mkOption { + type = with lib.types; nullOr int; default = null; description = '' Stream read (input) buffer in ms. @@ -120,8 +117,8 @@ in { example = 20; }; - buffer = mkOption { - type = with types; nullOr int; + buffer = lib.mkOption { + type = with lib.types; nullOr int; default = null; description = '' Network buffer in ms. @@ -129,24 +126,24 @@ in { example = 1000; }; - sendToMuted = mkOption { - type = types.bool; + sendToMuted = lib.mkOption { + type = lib.types.bool; default = false; description = '' Send audio to muted clients. ''; }; - tcp.enable = mkOption { - type = types.bool; + tcp.enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable the JSON-RPC via TCP. ''; }; - tcp.listenAddress = mkOption { - type = types.str; + tcp.listenAddress = lib.mkOption { + type = lib.types.str; default = "::"; example = "0.0.0.0"; description = '' @@ -154,24 +151,24 @@ in { ''; }; - tcp.port = mkOption { - type = types.port; + tcp.port = lib.mkOption { + type = lib.types.port; default = 1705; description = '' The port where the TCP JSON-RPC listens on. ''; }; - http.enable = mkOption { - type = types.bool; + http.enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable the JSON-RPC via HTTP. ''; }; - http.listenAddress = mkOption { - type = types.str; + http.listenAddress = lib.mkOption { + type = lib.types.str; default = "::"; example = "0.0.0.0"; description = '' @@ -179,27 +176,27 @@ in { ''; }; - http.port = mkOption { - type = types.port; + http.port = lib.mkOption { + type = lib.types.port; default = 1780; description = '' The port where the HTTP JSON-RPC listens on. ''; }; - http.docRoot = mkOption { - type = with types; nullOr path; + http.docRoot = lib.mkOption { + type = with lib.types; nullOr path; default = null; description = '' Path to serve from the HTTP servers root. ''; }; - streams = mkOption { - type = with types; attrsOf (submodule { + streams = lib.mkOption { + type = with lib.types; attrsOf (submodule { options = { - location = mkOption { - type = types.oneOf [ types.path types.str ]; + location = lib.mkOption { + type = lib.types.oneOf [ lib.types.path lib.types.str ]; description = '' For type `pipe` or `file`, the path to the pipe or file. For type `librespot`, `airplay` or `process`, the path to the corresponding binary. @@ -207,27 +204,27 @@ in { For type `meta`, a list of stream names in the form `/one/two/...`. Don't forget the leading slash. For type `alsa`, use an empty string. ''; - example = literalExpression '' + example = lib.literalExpression '' "/path/to/pipe" "/path/to/librespot" "192.168.1.2:4444" "/MyTCP/Spotify/MyPipe" ''; }; - type = mkOption { - type = types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" "meta" ]; + type = lib.mkOption { + type = lib.types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" "meta" ]; default = "pipe"; description = '' The type of input stream. ''; }; - query = mkOption { + query = lib.mkOption { type = attrsOf str; default = {}; description = '' Key-value pairs that convey additional parameters about a stream. ''; - example = literalExpression '' + example = lib.literalExpression '' # for type == "pipe": { mode = "create"; @@ -255,7 +252,7 @@ in { description = '' The definition for an input source. ''; - example = literalExpression '' + example = lib.literalExpression '' { mpd = { type = "pipe"; @@ -272,11 +269,11 @@ in { ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { warnings = # https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85 - filter (w: w != "") (mapAttrsToList (k: v: optionalString (v.type == "spotify") '' + lib.filter (w: w != "") (lib.mapAttrsToList (k: v: lib.optionalString (v.type == "spotify") '' services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead. '') cfg.streams); @@ -305,13 +302,13 @@ in { }; networking.firewall.allowedTCPPorts = - optionals cfg.openFirewall [ cfg.port ] - ++ optional (cfg.openFirewall && cfg.tcp.enable) cfg.tcp.port - ++ optional (cfg.openFirewall && cfg.http.enable) cfg.http.port; + lib.optionals cfg.openFirewall [ cfg.port ] + ++ lib.optional (cfg.openFirewall && cfg.tcp.enable) cfg.tcp.port + ++ lib.optional (cfg.openFirewall && cfg.http.enable) cfg.http.port; }; meta = { - maintainers = with maintainers; [ tobim ]; + maintainers = with lib.maintainers; [ tobim ]; }; } diff --git a/nixos/modules/services/backup/automysqlbackup.nix b/nixos/modules/services/backup/automysqlbackup.nix index cf3b6b8d13a4d..d5efda74f26f9 100644 --- a/nixos/modules/services/backup/automysqlbackup.nix +++ b/nixos/modules/services/backup/automysqlbackup.nix @@ -118,15 +118,6 @@ in name = user; ensurePermissions = { "*.*" = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES, EVENT"; - - # https://forums.mysql.com/read.php?10,668311,668315#msg-668315 - "function sys.extract_table_from_file_name" = "execute"; - "function sys.format_path" = "execute"; - "function sys.format_statement" = "execute"; - "function sys.extract_schema_from_file_name" = "execute"; - "function sys.ps_thread_account" = "execute"; - "function sys.format_time" = "execute"; - "function sys.format_bytes" = "execute"; }; }; diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 94f6e6ba4fd58..0851b5b0bf14f 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -656,6 +656,11 @@ in { }; config = mkIf (fd_cfg.enable || sd_cfg.enable || dir_cfg.enable) { + systemd.slices.system-bacula = { + description = "Bacula Backup System Slice"; + documentation = [ "man:bacula(8)" "https://www.bacula.org/" ]; + }; + systemd.services.bacula-fd = mkIf fd_cfg.enable { after = [ "network.target" ]; description = "Bacula File Daemon"; @@ -666,6 +671,7 @@ in { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; LogsDirectory = "bacula"; StateDirectory = "bacula"; + Slice = "system-bacula.slice"; }; }; @@ -679,6 +685,7 @@ in { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; LogsDirectory = "bacula"; StateDirectory = "bacula"; + Slice = "system-bacula.slice"; }; }; @@ -694,6 +701,7 @@ in { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; LogsDirectory = "bacula"; StateDirectory = "bacula"; + Slice = "system-bacula.slice"; }; preStart = '' if ! test -e "${libDir}/db-created"; then diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index abb7925e0935f..36f2274d5eaac 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let isLocalPath = x: @@ -11,17 +8,17 @@ let mkExcludeFile = cfg: # Write each exclude pattern to a new line - pkgs.writeText "excludefile" (concatMapStrings (s: s + "\n") cfg.exclude); + pkgs.writeText "excludefile" (lib.concatMapStrings (s: s + "\n") cfg.exclude); mkPatternsFile = cfg: # Write each pattern to a new line - pkgs.writeText "patternsfile" (concatMapStrings (s: s + "\n") cfg.patterns); + pkgs.writeText "patternsfile" (lib.concatMapStrings (s: s + "\n") cfg.patterns); mkKeepArgs = cfg: # If cfg.prune.keep e.g. has a yearly attribute, # its content is passed on as --keep-yearly - concatStringsSep " " - (mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep); + lib.concatStringsSep " " + (lib.mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep); mkBackupScript = name: cfg: pkgs.writeShellScript "${name}-script" ('' set -e @@ -44,10 +41,10 @@ let fi } - archiveName="${optionalString (cfg.archiveBaseName != null) (cfg.archiveBaseName + "-")}$(date ${cfg.dateFormat})" - archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}" + archiveName="${lib.optionalString (cfg.archiveBaseName != null) (cfg.archiveBaseName + "-")}$(date ${cfg.dateFormat})" + archiveSuffix="${lib.optionalString cfg.appendFailedSuffix ".failed"}" ${cfg.preHook} - '' + optionalString cfg.doInit '' + '' + lib.optionalString cfg.doInit '' # Run borg init if the repo doesn't exist yet if ! borgWrapper list $extraArgs > /dev/null; then borgWrapper init $extraArgs \ @@ -58,24 +55,24 @@ let '' + '' ( set -o pipefail - ${optionalString (cfg.dumpCommand != null) ''${escapeShellArg cfg.dumpCommand} | \''} + ${lib.optionalString (cfg.dumpCommand != null) ''${lib.escapeShellArg cfg.dumpCommand} | \''} borgWrapper create $extraArgs \ --compression ${cfg.compression} \ --exclude-from ${mkExcludeFile cfg} \ --patterns-from ${mkPatternsFile cfg} \ $extraCreateArgs \ "::$archiveName$archiveSuffix" \ - ${if cfg.paths == null then "-" else escapeShellArgs cfg.paths} + ${if cfg.paths == null then "-" else lib.escapeShellArgs cfg.paths} ) - '' + optionalString cfg.appendFailedSuffix '' + '' + lib.optionalString cfg.appendFailedSuffix '' borgWrapper rename $extraArgs \ "::$archiveName$archiveSuffix" "$archiveName" '' + '' ${cfg.postCreate} - '' + optionalString (cfg.prune.keep != { }) '' + '' + lib.optionalString (cfg.prune.keep != { }) '' borgWrapper prune $extraArgs \ ${mkKeepArgs cfg} \ - ${optionalString (cfg.prune.prefix != null) "--glob-archives ${escapeShellArg "${cfg.prune.prefix}*"}"} \ + ${lib.optionalString (cfg.prune.prefix != null) "--glob-archives ${lib.escapeShellArg "${cfg.prune.prefix}*"}"} \ $extraPruneArgs borgWrapper compact $extraArgs $extraCompactArgs ${cfg.postPrune} @@ -93,18 +90,18 @@ let userHome = config.users.users.${cfg.user}.home; backupJobName = "borgbackup-job-${name}"; backupScript = mkBackupScript backupJobName cfg; - in nameValuePair backupJobName { + in lib.nameValuePair backupJobName { description = "BorgBackup job ${name}"; path = [ config.services.borgbackup.package pkgs.openssh ]; - script = "exec " + optionalString cfg.inhibitsSleep ''\ + script = "exec " + lib.optionalString cfg.inhibitsSleep ''\ ${pkgs.systemd}/bin/systemd-inhibit \ --who="borgbackup" \ --what="sleep" \ --why="Scheduled backup" \ '' + backupScript; - unitConfig = optionalAttrs (isLocalPath cfg.repo) { + unitConfig = lib.optionalAttrs (isLocalPath cfg.repo) { RequiresMountsFor = [ cfg.repo ]; }; serviceConfig = { @@ -118,7 +115,7 @@ let [ "${userHome}/.config/borg" "${userHome}/.cache/borg" ] ++ cfg.readWritePaths # Borg needs write access to repo if it is not remote - ++ optional (isLocalPath cfg.repo) cfg.repo; + ++ lib.optional (isLocalPath cfg.repo) cfg.repo; PrivateTmp = cfg.privateTmp; }; environment = { @@ -128,7 +125,7 @@ let }; mkBackupTimers = name: cfg: - nameValuePair "borgbackup-job-${name}" { + lib.nameValuePair "borgbackup-job-${name}" { description = "BorgBackup job ${name} timer"; wantedBy = [ "timers.target" ]; timerConfig = { @@ -136,8 +133,8 @@ let OnCalendar = cfg.startAt; }; # if remote-backup wait for network - after = optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target"; - wants = optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target"; + after = lib.optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target"; + wants = lib.optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target"; }; # utility function around makeWrapper @@ -148,11 +145,11 @@ let nativeBuildInputs = [ pkgs.makeWrapper ]; } (with lib; '' makeWrapper "${original}" "$out/bin/${name}" \ - ${concatStringsSep " \\\n " (mapAttrsToList (name: value: ''--set ${name} "${value}"'') set)} + ${lib.concatStringsSep " \\\n " (lib.mapAttrsToList (name: value: ''--set ${name} "${value}"'') set)} ''); mkBorgWrapper = name: cfg: mkWrapperDrv { - original = getExe config.services.borgbackup.package; + original = lib.getExe config.services.borgbackup.package; name = "borg-job-${name}"; set = { BORG_REPO = cfg.repo; } // (mkPassEnv cfg) // cfg.environment; }; @@ -167,7 +164,7 @@ let "${config.users.users."${cfg.user}".home}/.cache".d = settings; "${config.users.users."${cfg.user}".home}/.config/borg".d = settings; "${config.users.users."${cfg.user}".home}/.cache/borg".d = settings; - } // optionalAttrs (isLocalPath cfg.repo && !cfg.removableDevice) { + } // lib.optionalAttrs (isLocalPath cfg.repo && !cfg.removableDevice) { "${cfg.repo}".d = settings; }); @@ -180,11 +177,11 @@ let }; mkRepoService = name: cfg: - nameValuePair "borgbackup-repo-${name}" { + lib.nameValuePair "borgbackup-repo-${name}" { description = "Create BorgBackup repository ${name} directory"; script = '' - mkdir -p ${escapeShellArg cfg.path} - chown ${cfg.user}:${cfg.group} ${escapeShellArg cfg.path} + mkdir -p ${lib.escapeShellArg cfg.path} + chown ${cfg.user}:${cfg.group} ${lib.escapeShellArg cfg.path} ''; serviceConfig = { # The service's only task is to ensure that the specified path exists @@ -196,10 +193,10 @@ let mkAuthorizedKey = cfg: appendOnly: key: let # Because of the following line, clients do not need to specify an absolute repo path - cdCommand = "cd ${escapeShellArg cfg.path}"; + cdCommand = "cd ${lib.escapeShellArg cfg.path}"; restrictedArg = "--restrict-to-${if cfg.allowSubRepos then "path" else "repository"} ."; - appendOnlyArg = optionalString appendOnly "--append-only"; - quotaArg = optionalString (cfg.quota != null) "--storage-quota ${cfg.quota}"; + appendOnlyArg = lib.optionalString appendOnly "--append-only"; + quotaArg = lib.optionalString (cfg.quota != null) "--storage-quota ${cfg.quota}"; serveCommand = "borg serve ${restrictedArg} ${appendOnlyArg} ${quotaArg}"; in ''command="${cdCommand} && ${serveCommand}",restrict ${key}''; @@ -224,7 +221,7 @@ let }; mkSourceAssertions = name: cfg: { - assertion = count isNull [ cfg.dumpCommand cfg.paths ] == 1; + assertion = lib.count isNull [ cfg.dumpCommand cfg.paths ] == 1; message = '' Exactly one of borgbackup.jobs.${name}.paths or borgbackup.jobs.${name}.dumpCommand must be set. @@ -239,14 +236,14 @@ let }; in { - meta.maintainers = with maintainers; [ dotlambda ]; + meta.maintainers = with lib.maintainers; [ dotlambda ]; meta.doc = ./borgbackup.md; ###### interface - options.services.borgbackup.package = mkPackageOption pkgs "borgbackup" { }; + options.services.borgbackup.package = lib.mkPackageOption pkgs "borgbackup" { }; - options.services.borgbackup.jobs = mkOption { + options.services.borgbackup.jobs = lib.mkOption { description = '' Deduplicating backups using BorgBackup. Adding a job will cause a borg-job-NAME wrapper to be added @@ -254,7 +251,7 @@ in { See also the chapter about BorgBackup in the NixOS manual. ''; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { # for a local backup rootBackup = { paths = "/"; @@ -286,12 +283,12 @@ in { startAt = "daily"; }; ''; - type = types.attrsOf (types.submodule (let globalConfig = config; in + type = lib.types.attrsOf (lib.types.submodule (let globalConfig = config; in { name, config, ... }: { options = { - paths = mkOption { - type = with types; nullOr (coercedTo str lib.singleton (listOf str)); + paths = lib.mkOption { + type = with lib.types; nullOr (coercedTo str lib.singleton (listOf str)); default = null; description = '' Path(s) to back up. @@ -300,8 +297,8 @@ in { example = "/home/user"; }; - dumpCommand = mkOption { - type = with types; nullOr path; + dumpCommand = lib.mkOption { + type = with lib.types; nullOr path; default = null; description = '' Backup the stdout of this program instead of filesystem paths. @@ -310,22 +307,22 @@ in { example = "/path/to/createZFSsend.sh"; }; - repo = mkOption { - type = types.str; + repo = lib.mkOption { + type = lib.types.str; description = "Remote or local repository to back up to."; example = "user@machine:/path/to/repo"; }; - removableDevice = mkOption { - type = types.bool; + removableDevice = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether the repo (which must be local) is a removable device."; }; - archiveBaseName = mkOption { - type = types.nullOr (types.strMatching "[^/{}]+"); + archiveBaseName = lib.mkOption { + type = lib.types.nullOr (lib.types.strMatching "[^/{}]+"); default = "${globalConfig.networking.hostName}-${name}"; - defaultText = literalExpression ''"''${config.networking.hostName}-"''; + defaultText = lib.literalExpression ''"''${config.networking.hostName}-"''; description = '' How to name the created archives. A timestamp, whose format is determined by {option}`dateFormat`, will be appended. The full @@ -335,8 +332,8 @@ in { ''; }; - dateFormat = mkOption { - type = types.str; + dateFormat = lib.mkOption { + type = lib.types.str; description = '' Arguments passed to {command}`date` to create a timestamp suffix for the archive name. @@ -345,8 +342,8 @@ in { example = "-u +%s"; }; - startAt = mkOption { - type = with types; either str (listOf str); + startAt = lib.mkOption { + type = with lib.types; either str (listOf str); default = "daily"; description = '' When or how often the backup should run. @@ -359,9 +356,9 @@ in { ''; }; - persistentTimer = mkOption { + persistentTimer = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; example = true; description = '' Set the `Persistent` option for the @@ -371,17 +368,17 @@ in { ''; }; - inhibitsSleep = mkOption { + inhibitsSleep = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; example = true; description = '' Prevents the system from sleeping while backing up. ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; description = '' The user {command}`borg` is run as. User or group need read permission @@ -390,8 +387,8 @@ in { default = "root"; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; description = '' The group borg is run as. User or group needs read permission for the specified {option}`paths`. @@ -399,8 +396,8 @@ in { default = "root"; }; - encryption.mode = mkOption { - type = types.enum [ + encryption.mode = lib.mkOption { + type = lib.types.enum [ "repokey" "keyfile" "repokey-blake2" "keyfile-blake2" "authenticated" "authenticated-blake2" @@ -415,8 +412,8 @@ in { example = "repokey-blake2"; }; - encryption.passCommand = mkOption { - type = with types; nullOr str; + encryption.passCommand = lib.mkOption { + type = with lib.types; nullOr str; description = '' A command which prints the passphrase to stdout. Mutually exclusive with {option}`passphrase`. @@ -425,8 +422,8 @@ in { example = "cat /path/to/passphrase_file"; }; - encryption.passphrase = mkOption { - type = with types; nullOr str; + encryption.passphrase = lib.mkOption { + type = with lib.types; nullOr str; description = '' The passphrase the backups are encrypted with. Mutually exclusive with {option}`passCommand`. @@ -436,11 +433,11 @@ in { default = null; }; - compression = mkOption { + compression = lib.mkOption { # "auto" is optional, # compression mode must be given, # compression level is optional - type = types.strMatching "none|(auto,)?(lz4|zstd|zlib|lzma)(,[[:digit:]]{1,2})?"; + type = lib.types.strMatching "none|(auto,)?(lz4|zstd|zlib|lzma)(,[[:digit:]]{1,2})?"; description = '' Compression method to use. Refer to {command}`borg help compression` @@ -450,8 +447,8 @@ in { example = "auto,lzma"; }; - exclude = mkOption { - type = with types; listOf str; + exclude = lib.mkOption { + type = with lib.types; listOf str; description = '' Exclude paths matching any of the given patterns. See {command}`borg help patterns` for pattern syntax. @@ -463,8 +460,8 @@ in { ]; }; - patterns = mkOption { - type = with types; listOf str; + patterns = lib.mkOption { + type = with lib.types; listOf str; description = '' Include/exclude paths matching the given patterns. The first matching patterns is used, so if an include pattern (prefix `+`) @@ -478,8 +475,8 @@ in { ]; }; - readWritePaths = mkOption { - type = with types; listOf path; + readWritePaths = lib.mkOption { + type = with lib.types; listOf path; description = '' By default, borg cannot write anywhere on the system but `$HOME/.config/borg` and `$HOME/.cache/borg`. @@ -492,8 +489,8 @@ in { ]; }; - privateTmp = mkOption { - type = types.bool; + privateTmp = lib.mkOption { + type = lib.types.bool; description = '' Set the `PrivateTmp` option for the systemd-service. Set to false if you need sockets @@ -502,8 +499,8 @@ in { default = true; }; - failOnWarnings = mkOption { - type = types.bool; + failOnWarnings = lib.mkOption { + type = lib.types.bool; description = '' Fail the whole backup job if any borg command returns a warning (exit code 1), for example because a file changed during backup. @@ -511,8 +508,8 @@ in { default = true; }; - doInit = mkOption { - type = types.bool; + doInit = lib.mkOption { + type = lib.types.bool; description = '' Run {command}`borg init` if the specified {option}`repo` does not exist. @@ -523,8 +520,8 @@ in { default = true; }; - appendFailedSuffix = mkOption { - type = types.bool; + appendFailedSuffix = lib.mkOption { + type = lib.types.bool; description = '' Append a `.failed` suffix to the archive name, which is only removed if @@ -533,18 +530,18 @@ in { default = true; }; - prune.keep = mkOption { + prune.keep = lib.mkOption { # Specifying e.g. `prune.keep.yearly = -1` # means there is no limit of yearly archives to keep # The regex is for use with e.g. --keep-within 1y - type = with types; attrsOf (either int (strMatching "[[:digit:]]+[Hdwmy]")); + type = with lib.types; attrsOf (either int (strMatching "[[:digit:]]+[Hdwmy]")); description = '' Prune a repository by deleting all archives not matching any of the specified retention options. See {command}`borg help prune` for the available options. ''; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { within = "1d"; # Keep all archives from the last day daily = 7; @@ -554,19 +551,19 @@ in { ''; }; - prune.prefix = mkOption { - type = types.nullOr (types.str); + prune.prefix = lib.mkOption { + type = lib.types.nullOr (lib.types.str); description = '' Only consider archive names starting with this prefix for pruning. By default, only archives created by this job are considered. Use `""` or `null` to consider all archives. ''; default = config.archiveBaseName; - defaultText = literalExpression "archiveBaseName"; + defaultText = lib.literalExpression "archiveBaseName"; }; - environment = mkOption { - type = with types; attrsOf str; + environment = lib.mkOption { + type = with lib.types; attrsOf str; description = '' Environment variables passed to the backup script. You can for example specify which SSH key to use. @@ -575,8 +572,8 @@ in { example = { BORG_RSH = "ssh -i /path/to/key"; }; }; - preHook = mkOption { - type = types.lines; + preHook = lib.mkOption { + type = lib.types.lines; description = '' Shell commands to run before the backup. This can for example be used to mount file systems. @@ -588,16 +585,16 @@ in { ''; }; - postInit = mkOption { - type = types.lines; + postInit = lib.mkOption { + type = lib.types.lines; description = '' Shell commands to run after {command}`borg init`. ''; default = ""; }; - postCreate = mkOption { - type = types.lines; + postCreate = lib.mkOption { + type = lib.types.lines; description = '' Shell commands to run after {command}`borg create`. The name of the created archive is stored in `$archiveName`. @@ -605,16 +602,16 @@ in { default = ""; }; - postPrune = mkOption { - type = types.lines; + postPrune = lib.mkOption { + type = lib.types.lines; description = '' Shell commands to run after {command}`borg prune`. ''; default = ""; }; - postHook = mkOption { - type = types.lines; + postHook = lib.mkOption { + type = lib.types.lines; description = '' Shell commands to run just before exit. They are executed even if a previous command exits with a non-zero exit code. @@ -623,8 +620,8 @@ in { default = ""; }; - extraArgs = mkOption { - type = with types; coercedTo (listOf str) escapeShellArgs str; + extraArgs = lib.mkOption { + type = with lib.types; coercedTo (listOf str) lib.escapeShellArgs str; description = '' Additional arguments for all {command}`borg` calls the service has. Handle with care. @@ -633,8 +630,8 @@ in { example = [ "--remote-path=/path/to/borg" ]; }; - extraInitArgs = mkOption { - type = with types; coercedTo (listOf str) escapeShellArgs str; + extraInitArgs = lib.mkOption { + type = with lib.types; coercedTo (listOf str) lib.escapeShellArgs str; description = '' Additional arguments for {command}`borg init`. Can also be set at runtime using `$extraInitArgs`. @@ -643,8 +640,8 @@ in { example = [ "--append-only" ]; }; - extraCreateArgs = mkOption { - type = with types; coercedTo (listOf str) escapeShellArgs str; + extraCreateArgs = lib.mkOption { + type = with lib.types; coercedTo (listOf str) lib.escapeShellArgs str; description = '' Additional arguments for {command}`borg create`. Can also be set at runtime using `$extraCreateArgs`. @@ -656,8 +653,8 @@ in { ]; }; - extraPruneArgs = mkOption { - type = with types; coercedTo (listOf str) escapeShellArgs str; + extraPruneArgs = lib.mkOption { + type = with lib.types; coercedTo (listOf str) lib.escapeShellArgs str; description = '' Additional arguments for {command}`borg prune`. Can also be set at runtime using `$extraPruneArgs`. @@ -666,8 +663,8 @@ in { example = [ "--save-space" ]; }; - extraCompactArgs = mkOption { - type = with types; coercedTo (listOf str) escapeShellArgs str; + extraCompactArgs = lib.mkOption { + type = with lib.types; coercedTo (listOf str) lib.escapeShellArgs str; description = '' Additional arguments for {command}`borg compact`. Can also be set at runtime using `$extraCompactArgs`. @@ -680,7 +677,7 @@ in { )); }; - options.services.borgbackup.repos = mkOption { + options.services.borgbackup.repos = lib.mkOption { description = '' Serve BorgBackup repositories to given public SSH keys, restricting their access to the repository only. @@ -689,11 +686,11 @@ in { i.e. `user@machine:.` is enough. (Note colon and dot.) ''; default = { }; - type = types.attrsOf (types.submodule ( + type = lib.types.attrsOf (lib.types.submodule ( { ... }: { options = { - path = mkOption { - type = types.path; + path = lib.mkOption { + type = lib.types.path; description = '' Where to store the backups. Note that the directory is created automatically, with correct permissions. @@ -701,8 +698,8 @@ in { default = "/var/lib/borgbackup"; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; description = '' The user {command}`borg serve` is run as. User or group needs write permission @@ -711,8 +708,8 @@ in { default = "borg"; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; description = '' The group {command}`borg serve` is run as. User or group needs write permission @@ -721,8 +718,8 @@ in { default = "borg"; }; - authorizedKeys = mkOption { - type = with types; listOf str; + authorizedKeys = lib.mkOption { + type = with lib.types; listOf str; description = '' Public SSH keys that are given full write access to this repository. You should use a different SSH key for each repository you write to, because @@ -732,8 +729,8 @@ in { default = [ ]; }; - authorizedKeysAppendOnly = mkOption { - type = with types; listOf str; + authorizedKeysAppendOnly = lib.mkOption { + type = with lib.types; listOf str; description = '' Public SSH keys that can only be used to append new data (archives) to the repository. Note that archives can still be marked as deleted and are subsequently removed from disk @@ -742,8 +739,8 @@ in { default = [ ]; }; - allowSubRepos = mkOption { - type = types.bool; + allowSubRepos = lib.mkOption { + type = lib.types.bool; description = '' Allow clients to create repositories in subdirectories of the specified {option}`path`. These can be accessed using @@ -755,9 +752,9 @@ in { default = false; }; - quota = mkOption { + quota = lib.mkOption { # See the definition of parse_file_size() in src/borg/helpers/parseformat.py - type = with types; nullOr (strMatching "[[:digit:].]+[KMGTP]?"); + type = with lib.types; nullOr (strMatching "[[:digit:].]+[KMGTP]?"); description = '' Storage quota for the repository. This quota is ensured for all sub-repositories if {option}`allowSubRepos` is enabled @@ -774,29 +771,29 @@ in { ###### implementation - config = mkIf (with config.services.borgbackup; jobs != { } || repos != { }) + config = lib.mkIf (with config.services.borgbackup; jobs != { } || repos != { }) (with config.services.borgbackup; { assertions = - mapAttrsToList mkPassAssertion jobs - ++ mapAttrsToList mkKeysAssertion repos - ++ mapAttrsToList mkSourceAssertions jobs - ++ mapAttrsToList mkRemovableDeviceAssertions jobs; + lib.mapAttrsToList mkPassAssertion jobs + ++ lib.mapAttrsToList mkKeysAssertion repos + ++ lib.mapAttrsToList mkSourceAssertions jobs + ++ lib.mapAttrsToList mkRemovableDeviceAssertions jobs; - systemd.tmpfiles.settings = mapAttrs' mkTmpfiles jobs; + systemd.tmpfiles.settings = lib.mapAttrs' mkTmpfiles jobs; systemd.services = # A job named "foo" is mapped to systemd.services.borgbackup-job-foo - mapAttrs' mkBackupService jobs + lib.mapAttrs' mkBackupService jobs # A repo named "foo" is mapped to systemd.services.borgbackup-repo-foo - // mapAttrs' mkRepoService repos; + // lib.mapAttrs' mkRepoService repos; # A job named "foo" is mapped to systemd.timers.borgbackup-job-foo # only generate the timer if interval (startAt) is set - systemd.timers = mapAttrs' mkBackupTimers (filterAttrs (_: cfg: cfg.startAt != []) jobs); + systemd.timers = lib.mapAttrs' mkBackupTimers (lib.filterAttrs (_: cfg: cfg.startAt != []) jobs); - users = mkMerge (mapAttrsToList mkUsersConfig repos); + users = lib.mkMerge (lib.mapAttrsToList mkUsersConfig repos); environment.systemPackages = - [ config.services.borgbackup.package ] ++ (mapAttrsToList mkBorgWrapper jobs); + [ config.services.borgbackup.package ] ++ (lib.mapAttrsToList mkBorgWrapper jobs); }); } diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index e3fa7f45844f1..8ad4f98dce8a3 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let inherit (pkgs) mariadb gzip; @@ -12,7 +9,7 @@ let backupScript = '' set -o pipefail failed="" - ${concatMapStringsSep "\n" backupDatabaseScript cfg.databases} + ${lib.concatMapStringsSep "\n" backupDatabaseScript cfg.databases} if [ -n "$failed" ]; then echo "Backup of database(s) failed:$failed" exit 1 @@ -20,7 +17,7 @@ let ''; backupDatabaseScript = db: '' dest="${cfg.location}/${db}.gz" - if ${mariadb}/bin/mysqldump ${optionalString cfg.singleTransaction "--single-transaction"} ${db} | ${gzip}/bin/gzip -c ${cfg.gzipOptions} > $dest.tmp; then + if ${mariadb}/bin/mysqldump ${lib.optionalString cfg.singleTransaction "--single-transaction"} ${db} | ${gzip}/bin/gzip -c ${cfg.gzipOptions} > $dest.tmp; then mv $dest.tmp $dest echo "Backed up to $dest" else @@ -37,51 +34,51 @@ in services.mysqlBackup = { - enable = mkEnableOption "MySQL backups"; + enable = lib.mkEnableOption "MySQL backups"; - calendar = mkOption { - type = types.str; + calendar = lib.mkOption { + type = lib.types.str; default = "01:15:00"; description = '' Configured when to run the backup service systemd unit (DayOfWeek Year-Month-Day Hour:Minute:Second). ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = defaultUser; description = '' User to be used to perform backup. ''; }; - databases = mkOption { + databases = lib.mkOption { default = []; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = '' List of database names to dump. ''; }; - location = mkOption { - type = types.path; + location = lib.mkOption { + type = lib.types.path; default = "/var/backup/mysql"; description = '' Location to put the gzipped MySQL database dumps. ''; }; - singleTransaction = mkOption { + singleTransaction = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to create database dump in a single transaction ''; }; - gzipOptions = mkOption { + gzipOptions = lib.mkOption { default = "--no-name --rsyncable"; - type = types.str; + type = lib.types.str; description = '' Command line options to use when invoking `gzip`. ''; @@ -90,8 +87,8 @@ in }; - config = mkIf cfg.enable { - users.users = optionalAttrs (cfg.user == defaultUser) { + config = lib.mkIf cfg.enable { + users.users = lib.optionalAttrs (cfg.user == defaultUser) { ${defaultUser} = { isSystemUser = true; createHome = false; @@ -105,9 +102,9 @@ in ensurePermissions = with lib; let privs = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES"; - grant = db: nameValuePair "${db}.*" privs; + grant = db: lib.nameValuePair "${db}.*" privs; in - listToAttrs (map grant cfg.databases); + lib.listToAttrs (map grant cfg.databases); }]; systemd = { diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 5dd9e075862da..3302375c78899 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.postgresqlBackup; @@ -13,9 +10,9 @@ let "gzip" = ".gz"; "zstd" = ".zstd"; }; - compressSuffix = getAttr cfg.compression compressSuffixes; + compressSuffix = lib.getAttr cfg.compression compressSuffixes; - compressCmd = getAttr cfg.compression { + compressCmd = lib.getAttr cfg.compression { "none" = "cat"; "gzip" = "${pkgs.gzip}/bin/gzip -c -${toString cfg.compressionLevel} --rsyncable"; "zstd" = "${pkgs.zstd}/bin/zstd -c -${toString cfg.compressionLevel} --rsyncable"; @@ -24,7 +21,7 @@ let mkSqlPath = prefix: suffix: "${cfg.location}/${db}${prefix}.sql${suffix}"; curFile = mkSqlPath "" compressSuffix; prevFile = mkSqlPath ".prev" compressSuffix; - prevFiles = map (mkSqlPath ".prev") (attrValues compressSuffixes); + prevFiles = map (mkSqlPath ".prev") (lib.attrValues compressSuffixes); inProgressFile = mkSqlPath ".in-progress" compressSuffix; in { enable = true; @@ -63,7 +60,7 @@ let in { imports = [ - (mkRemovedOptionModule [ "services" "postgresqlBackup" "period" ] '' + (lib.mkRemovedOptionModule [ "services" "postgresqlBackup" "period" ] '' A systemd timer is now used instead of cron. The starting time can be configured via services.postgresqlBackup.startAt. '') @@ -71,11 +68,11 @@ in { options = { services.postgresqlBackup = { - enable = mkEnableOption "PostgreSQL dumps"; + enable = lib.mkEnableOption "PostgreSQL dumps"; - startAt = mkOption { + startAt = lib.mkOption { default = "*-*-* 01:15:00"; - type = with types; either (listOf str) str; + type = with lib.types; either (listOf str) str; description = '' This option defines (see `systemd.time` for format) when the databases should be dumped. @@ -83,9 +80,9 @@ in { ''; }; - backupAll = mkOption { + backupAll = lib.mkOption { default = cfg.databases == []; - defaultText = literalExpression "services.postgresqlBackup.databases == []"; + defaultText = lib.literalExpression "services.postgresqlBackup.databases == []"; type = lib.types.bool; description = '' Backup all databases using pg_dumpall. @@ -96,24 +93,24 @@ in { ''; }; - databases = mkOption { + databases = lib.mkOption { default = []; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = '' List of database names to dump. ''; }; - location = mkOption { + location = lib.mkOption { default = "/var/backup/postgresql"; - type = types.path; + type = lib.types.path; description = '' Path of directory where the PostgreSQL database dumps will be placed. ''; }; - pgdumpOptions = mkOption { - type = types.separatedString " "; + pgdumpOptions = lib.mkOption { + type = lib.types.separatedString " "; default = "-C"; description = '' Command line options for pg_dump. This options is not used @@ -123,16 +120,16 @@ in { ''; }; - compression = mkOption { - type = types.enum ["none" "gzip" "zstd"]; + compression = lib.mkOption { + type = lib.types.enum ["none" "gzip" "zstd"]; default = "gzip"; description = '' The type of compression to use on the generated database dump. ''; }; - compressionLevel = mkOption { - type = types.ints.between 1 19; + compressionLevel = lib.mkOption { + type = lib.types.ints.between 1 19; default = 6; description = '' The compression level used when compression is enabled. @@ -143,7 +140,7 @@ in { }; - config = mkMerge [ + config = lib.mkMerge [ { assertions = [ { @@ -158,17 +155,17 @@ in { } ]; } - (mkIf cfg.enable { + (lib.mkIf cfg.enable { systemd.tmpfiles.rules = [ "d '${cfg.location}' 0700 postgres - - -" ]; }) - (mkIf (cfg.enable && cfg.backupAll) { + (lib.mkIf (cfg.enable && cfg.backupAll) { systemd.services.postgresqlBackup = postgresqlBackupService "all" "pg_dumpall"; }) - (mkIf (cfg.enable && !cfg.backupAll) { - systemd.services = listToAttrs (map (db: + (lib.mkIf (cfg.enable && !cfg.backupAll) { + systemd.services = lib.listToAttrs (map (db: let cmd = "pg_dump ${cfg.pgdumpOptions} ${db}"; in { diff --git a/nixos/modules/services/backup/postgresql-wal-receiver.nix b/nixos/modules/services/backup/postgresql-wal-receiver.nix index a8f2cf514d549..b355637ff5a03 100644 --- a/nixos/modules/services/backup/postgresql-wal-receiver.nix +++ b/nixos/modules/services/backup/postgresql-wal-receiver.nix @@ -1,24 +1,21 @@ { config, lib, pkgs, ... }: - -with lib; - let receiverSubmodule = { options = { - postgresqlPackage = mkPackageOption pkgs "postgresql" { + postgresqlPackage = lib.mkPackageOption pkgs "postgresql" { example = "postgresql_15"; }; - directory = mkOption { - type = types.path; - example = literalExpression "/mnt/pg_wal/main/"; + directory = lib.mkOption { + type = lib.types.path; + example = lib.literalExpression "/mnt/pg_wal/main/"; description = '' Directory to write the output to. ''; }; - statusInterval = mkOption { - type = types.int; + statusInterval = lib.mkOption { + type = lib.types.int; default = 10; description = '' Specifies the number of seconds between status packets sent back to the server. @@ -28,8 +25,8 @@ let ''; }; - slot = mkOption { - type = types.str; + slot = lib.mkOption { + type = lib.types.str; default = ""; example = "some_slot_name"; description = '' @@ -45,8 +42,8 @@ let ''; }; - synchronous = mkOption { - type = types.bool; + synchronous = lib.mkOption { + type = lib.types.bool; default = false; description = '' Flush the WAL data to disk immediately after it has been received. @@ -57,8 +54,8 @@ let ''; }; - compress = mkOption { - type = types.ints.between 0 9; + compress = lib.mkOption { + type = lib.types.ints.between 0 9; default = 0; description = '' Enables gzip compression of write-ahead logs, and specifies the compression level @@ -69,8 +66,8 @@ let ''; }; - connection = mkOption { - type = types.str; + connection = lib.mkOption { + type = lib.types.str; example = "postgresql://user@somehost"; description = '' Specifies parameters used to connect to the server, as a connection string. @@ -81,10 +78,10 @@ let ''; }; - extraArgs = mkOption { - type = with types; listOf str; + extraArgs = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; - example = literalExpression '' + example = lib.literalExpression '' [ "--no-sync" ] @@ -94,10 +91,10 @@ let ''; }; - environment = mkOption { - type = with types; attrsOf str; + environment = lib.mkOption { + type = with lib.types; attrsOf str; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { PGPASSFILE = "/private/passfile"; PGSSLMODE = "require"; @@ -114,10 +111,10 @@ let in { options = { services.postgresqlWalReceiver = { - receivers = mkOption { - type = with types; attrsOf (submodule receiverSubmodule); + receivers = lib.mkOption { + type = with lib.types; attrsOf (submodule receiverSubmodule); default = { }; - example = literalExpression '' + example = lib.literalExpression '' { main = { postgresqlPackage = pkgs.postgresql_15; @@ -138,7 +135,7 @@ in { config = let receivers = config.services.postgresqlWalReceiver.receivers; - in mkIf (receivers != { }) { + in lib.mkIf (receivers != { }) { users = { users.postgres = { uid = config.ids.uids.postgres; @@ -151,18 +148,18 @@ in { }; }; - assertions = concatLists (attrsets.mapAttrsToList (name: config: [ + assertions = lib.concatLists (lib.attrsets.mapAttrsToList (name: config: [ { - assertion = config.compress > 0 -> versionAtLeast config.postgresqlPackage.version "10"; + assertion = config.compress > 0 -> lib.versionAtLeast config.postgresqlPackage.version "10"; message = "Invalid configuration for WAL receiver \"${name}\": compress requires PostgreSQL version >= 10."; } ]) receivers); - systemd.tmpfiles.rules = mapAttrsToList (name: config: '' - d ${escapeShellArg config.directory} 0750 postgres postgres - - + systemd.tmpfiles.rules = lib.mapAttrsToList (name: config: '' + d ${lib.escapeShellArg config.directory} 0750 postgres postgres - - '') receivers; - systemd.services = with attrsets; mapAttrs' (name: config: nameValuePair "postgresql-wal-receiver-${name}" { + systemd.services = lib.mapAttrs' (name: config: lib.nameValuePair "postgresql-wal-receiver-${name}" { description = "PostgreSQL WAL receiver (${name})"; wantedBy = [ "multi-user.target" ]; startLimitIntervalSec = 0; # retry forever, useful in case of network disruption @@ -179,22 +176,22 @@ in { script = let receiverCommand = postgresqlPackage: - if (versionAtLeast postgresqlPackage.version "10") + if (lib.versionAtLeast postgresqlPackage.version "10") then "${postgresqlPackage}/bin/pg_receivewal" else "${postgresqlPackage}/bin/pg_receivexlog"; in '' ${receiverCommand config.postgresqlPackage} \ --no-password \ - --directory=${escapeShellArg config.directory} \ + --directory=${lib.escapeShellArg config.directory} \ --status-interval=${toString config.statusInterval} \ - --dbname=${escapeShellArg config.connection} \ - ${optionalString (config.compress > 0) "--compress=${toString config.compress}"} \ - ${optionalString (config.slot != "") "--slot=${escapeShellArg config.slot}"} \ - ${optionalString config.synchronous "--synchronous"} \ - ${concatStringsSep " " config.extraArgs} + --dbname=${lib.escapeShellArg config.connection} \ + ${lib.optionalString (config.compress > 0) "--compress=${toString config.compress}"} \ + ${lib.optionalString (config.slot != "") "--slot=${lib.escapeShellArg config.slot}"} \ + ${lib.optionalString config.synchronous "--synchronous"} \ + ${lib.concatStringsSep " " config.extraArgs} ''; }) receivers; }; - meta.maintainers = with maintainers; [ pacien ]; + meta.maintainers = with lib.maintainers; [ pacien ]; } diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix index eb7b57800333e..333609444da2a 100644 --- a/nixos/modules/services/backup/restic-rest-server.nix +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -1,32 +1,29 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.restic.server; in { - meta.maintainers = [ maintainers.bachp ]; + meta.maintainers = [ lib.maintainers.bachp ]; options.services.restic.server = { - enable = mkEnableOption "Restic REST Server"; + enable = lib.mkEnableOption "Restic REST Server"; - listenAddress = mkOption { + listenAddress = lib.mkOption { default = "8000"; example = "127.0.0.1:8080"; - type = types.str; + type = lib.types.str; description = "Listen on a specific IP address and port or unix socket."; }; - dataDir = mkOption { + dataDir = lib.mkOption { default = "/var/lib/restic"; - type = types.path; + type = lib.types.path; description = "The directory for storing the restic repository."; }; - appendOnly = mkOption { + appendOnly = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Enable append only mode. This mode allows creation of new backups but prevents deletion and modification of existing backups. @@ -34,33 +31,33 @@ in ''; }; - privateRepos = mkOption { + privateRepos = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Enable private repos. Grants access only when a subdirectory with the same name as the user is specified in the repository URL. ''; }; - prometheus = mkOption { + prometheus = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "Enable Prometheus metrics at /metrics."; }; - extraFlags = mkOption { - type = types.listOf types.str; + extraFlags = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = '' Extra commandline options to pass to Restic REST server. ''; }; - package = mkPackageOption pkgs "restic-rest-server" { }; + package = lib.mkPackageOption pkgs "restic-rest-server" { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [{ assertion = lib.substring 0 1 cfg.listenAddress != ":"; message = "The restic-rest-server now uses systemd socket activation, which expects only the Port number: services.restic.server.listenAddress = \"${lib.substring 1 6 cfg.listenAddress}\";"; @@ -75,10 +72,10 @@ in ExecStart = '' ${cfg.package}/bin/rest-server \ --path ${cfg.dataDir} \ - ${optionalString cfg.appendOnly "--append-only"} \ - ${optionalString cfg.privateRepos "--private-repos"} \ - ${optionalString cfg.prometheus "--prometheus"} \ - ${escapeShellArgs cfg.extraFlags} \ + ${lib.optionalString cfg.appendOnly "--append-only"} \ + ${lib.optionalString cfg.privateRepos "--private-repos"} \ + ${lib.optionalString cfg.prometheus "--prometheus"} \ + ${lib.escapeShellArgs cfg.extraFlags} \ ''; Type = "simple"; User = "restic"; @@ -119,7 +116,7 @@ in wantedBy = [ "sockets.target" ]; }; - systemd.tmpfiles.rules = mkIf cfg.privateRepos [ + systemd.tmpfiles.rules = lib.mkIf cfg.privateRepos [ "f ${cfg.dataDir}/.htpasswd 0700 restic restic -" ]; diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index a7c2ef2eacd5b..0fb601cce5892 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -1,28 +1,25 @@ { config, lib, pkgs, utils, ... }: - -with lib; - let # Type for a valid systemd unit option. Needed for correctly passing "timerConfig" to "systemd.timers" inherit (utils.systemdUtils.unitOptions) unitOption; in { - options.services.restic.backups = mkOption { + options.services.restic.backups = lib.mkOption { description = '' Periodic backups to create with Restic. ''; - type = types.attrsOf (types.submodule ({ name, ... }: { + type = lib.types.attrsOf (lib.types.submodule ({ name, ... }: { options = { - passwordFile = mkOption { - type = types.str; + passwordFile = lib.mkOption { + type = lib.types.str; description = '' Read the repository password from a file. ''; example = "/etc/nixos/restic-password"; }; - environmentFile = mkOption { - type = with types; nullOr str; + environmentFile = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' file containing the credentials to access the repository, in the @@ -30,8 +27,8 @@ in ''; }; - rcloneOptions = mkOption { - type = with types; nullOr (attrsOf (oneOf [ str bool ])); + rcloneOptions = lib.mkOption { + type = with lib.types; nullOr (attrsOf (oneOf [ str bool ])); default = null; description = '' Options to pass to rclone to control its behavior. @@ -47,8 +44,8 @@ in }; }; - rcloneConfig = mkOption { - type = with types; nullOr (attrsOf (oneOf [ str bool ])); + rcloneConfig = lib.mkOption { + type = with lib.types; nullOr (attrsOf (oneOf [ str bool ])); default = null; description = '' Configuration for the rclone remote being used for backup. @@ -71,8 +68,8 @@ in }; }; - rcloneConfigFile = mkOption { - type = with types; nullOr path; + rcloneConfigFile = lib.mkOption { + type = with lib.types; nullOr path; default = null; description = '' Path to the file containing rclone configuration. This file @@ -83,17 +80,17 @@ in ''; }; - inhibitsSleep = mkOption { + inhibitsSleep = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; example = true; description = '' Prevents the system from sleeping while backing up. ''; }; - repository = mkOption { - type = with types; nullOr str; + repository = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' repository to backup to. @@ -101,18 +98,18 @@ in example = "sftp:backup@192.168.1.100:/backups/${name}"; }; - repositoryFile = mkOption { - type = with types; nullOr path; + repositoryFile = lib.mkOption { + type = with lib.types; nullOr path; default = null; description = '' Path to the file containing the repository location to backup to. ''; }; - paths = mkOption { + paths = lib.mkOption { # This is nullable for legacy reasons only. We should consider making it a pure listOf # after some time has passed since this comment was added. - type = types.nullOr (types.listOf types.str); + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = [ ]; description = '' Which paths to backup, in addition to ones specified via @@ -126,8 +123,8 @@ in ]; }; - exclude = mkOption { - type = types.listOf types.str; + exclude = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; description = '' Patterns to exclude when backing up. See @@ -141,8 +138,8 @@ in ]; }; - timerConfig = mkOption { - type = types.nullOr (types.attrsOf unitOption); + timerConfig = lib.mkOption { + type = lib.types.nullOr (lib.types.attrsOf unitOption); default = { OnCalendar = "daily"; Persistent = true; @@ -159,8 +156,8 @@ in }; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "root"; description = '' As which user the backup should run. @@ -168,8 +165,8 @@ in example = "postgresql"; }; - extraBackupArgs = mkOption { - type = types.listOf types.str; + extraBackupArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; description = '' Extra arguments passed to restic backup. @@ -179,8 +176,8 @@ in ]; }; - extraOptions = mkOption { - type = types.listOf types.str; + extraOptions = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; description = '' Extra extended options to be passed to the restic --option flag. @@ -190,16 +187,16 @@ in ]; }; - initialize = mkOption { - type = types.bool; + initialize = lib.mkOption { + type = lib.types.bool; default = false; description = '' Create the repository if it doesn't exist. ''; }; - pruneOpts = mkOption { - type = types.listOf types.str; + pruneOpts = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; description = '' A list of options (--keep-\* et al.) for 'restic forget @@ -215,16 +212,16 @@ in ]; }; - runCheck = mkOption { - type = types.bool; + runCheck = lib.mkOption { + type = lib.types.bool; default = (builtins.length config.services.restic.backups.${name}.checkOpts > 0); - defaultText = literalExpression ''builtins.length config.services.backups.${name}.checkOpts > 0''; + defaultText = lib.literalExpression ''builtins.length config.services.backups.${name}.checkOpts > 0''; description = "Whether to run the `check` command with the provided `checkOpts` options."; example = true; }; - checkOpts = mkOption { - type = types.listOf types.str; + checkOpts = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; description = '' A list of options for 'restic check'. @@ -234,8 +231,8 @@ in ]; }; - dynamicFilesFrom = mkOption { - type = with types; nullOr str; + dynamicFilesFrom = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' A script that produces a list of files to back up. The @@ -245,23 +242,23 @@ in example = "find /home/matt/git -type d -name .git"; }; - backupPrepareCommand = mkOption { - type = with types; nullOr str; + backupPrepareCommand = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' A script that must run before starting the backup process. ''; }; - backupCleanupCommand = mkOption { - type = with types; nullOr str; + backupCleanupCommand = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' A script that must run after finishing the backup process. ''; }; - package = mkPackageOption pkgs "restic" { }; + package = lib.mkPackageOption pkgs "restic" { }; createWrapper = lib.mkOption { type = lib.types.bool; @@ -299,54 +296,54 @@ in }; config = { - assertions = mapAttrsToList (n: v: { + assertions = lib.mapAttrsToList (n: v: { assertion = (v.repository == null) != (v.repositoryFile == null); message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set"; }) config.services.restic.backups; systemd.services = - mapAttrs' + lib.mapAttrs' (name: backup: let - extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions; - inhibitCmd = concatStringsSep " " [ + extraOptions = lib.concatMapStrings (arg: " -o ${arg}") backup.extraOptions; + inhibitCmd = lib.concatStringsSep " " [ "${pkgs.systemd}/bin/systemd-inhibit" "--mode='block'" "--who='restic'" "--what='sleep'" - "--why=${escapeShellArg "Scheduled backup ${name}"} " + "--why=${lib.escapeShellArg "Scheduled backup ${name}"} " ]; - resticCmd = "${optionalString backup.inhibitsSleep inhibitCmd}${backup.package}/bin/restic${extraOptions}"; - excludeFlags = optional (backup.exclude != []) "--exclude-file=${pkgs.writeText "exclude-patterns" (concatStringsSep "\n" backup.exclude)}"; + resticCmd = "${lib.optionalString backup.inhibitsSleep inhibitCmd}${backup.package}/bin/restic${extraOptions}"; + excludeFlags = lib.optional (backup.exclude != []) "--exclude-file=${pkgs.writeText "exclude-patterns" (lib.concatStringsSep "\n" backup.exclude)}"; filesFromTmpFile = "/run/restic-backups-${name}/includes"; doBackup = (backup.dynamicFilesFrom != null) || (backup.paths != null && backup.paths != []); - pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [ - (resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts)) + pruneCmd = lib.optionals (builtins.length backup.pruneOpts > 0) [ + (resticCmd + " forget --prune " + (lib.concatStringsSep " " backup.pruneOpts)) ]; - checkCmd = optionals backup.runCheck [ - (resticCmd + " check " + (concatStringsSep " " backup.checkOpts)) + checkCmd = lib.optionals backup.runCheck [ + (resticCmd + " check " + (lib.concatStringsSep " " backup.checkOpts)) ]; # Helper functions for rclone remotes - rcloneRemoteName = builtins.elemAt (splitString ":" backup.repository) 1; - rcloneAttrToOpt = v: "RCLONE_" + toUpper (builtins.replaceStrings [ "-" ] [ "_" ] v); - rcloneAttrToConf = v: "RCLONE_CONFIG_" + toUpper (rcloneRemoteName + "_" + v); + rcloneRemoteName = builtins.elemAt (lib.splitString ":" backup.repository) 1; + rcloneAttrToOpt = v: "RCLONE_" + lib.toUpper (builtins.replaceStrings [ "-" ] [ "_" ] v); + rcloneAttrToConf = v: "RCLONE_CONFIG_" + lib.toUpper (rcloneRemoteName + "_" + v); toRcloneVal = v: if lib.isBool v then lib.boolToString v else v; in - nameValuePair "restic-backups-${name}" ({ + lib.nameValuePair "restic-backups-${name}" ({ environment = { # not %C, because that wouldn't work in the wrapper script RESTIC_CACHE_DIR = "/var/cache/restic-backups-${name}"; RESTIC_PASSWORD_FILE = backup.passwordFile; RESTIC_REPOSITORY = backup.repository; RESTIC_REPOSITORY_FILE = backup.repositoryFile; - } // optionalAttrs (backup.rcloneOptions != null) (mapAttrs' + } // lib.optionalAttrs (backup.rcloneOptions != null) (lib.mapAttrs' (name: value: - nameValuePair (rcloneAttrToOpt name) (toRcloneVal value) + lib.nameValuePair (rcloneAttrToOpt name) (toRcloneVal value) ) - backup.rcloneOptions) // optionalAttrs (backup.rcloneConfigFile != null) { + backup.rcloneOptions) // lib.optionalAttrs (backup.rcloneConfigFile != null) { RCLONE_CONFIG = backup.rcloneConfigFile; - } // optionalAttrs (backup.rcloneConfig != null) (mapAttrs' + } // lib.optionalAttrs (backup.rcloneConfig != null) (lib.mapAttrs' (name: value: - nameValuePair (rcloneAttrToConf name) (toRcloneVal value) + lib.nameValuePair (rcloneAttrToConf name) (toRcloneVal value) ) backup.rcloneConfig); path = [ config.programs.ssh.package ]; @@ -355,37 +352,37 @@ in after = [ "network-online.target" ]; serviceConfig = { Type = "oneshot"; - ExecStart = (optionals doBackup [ "${resticCmd} backup ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} --files-from=${filesFromTmpFile}" ]) + ExecStart = (lib.optionals doBackup [ "${resticCmd} backup ${lib.concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} --files-from=${filesFromTmpFile}" ]) ++ pruneCmd ++ checkCmd; User = backup.user; RuntimeDirectory = "restic-backups-${name}"; CacheDirectory = "restic-backups-${name}"; CacheDirectoryMode = "0700"; PrivateTmp = true; - } // optionalAttrs (backup.environmentFile != null) { + } // lib.optionalAttrs (backup.environmentFile != null) { EnvironmentFile = backup.environmentFile; }; - } // optionalAttrs (backup.initialize || doBackup || backup.backupPrepareCommand != null) { + } // lib.optionalAttrs (backup.initialize || doBackup || backup.backupPrepareCommand != null) { preStart = '' - ${optionalString (backup.backupPrepareCommand != null) '' + ${lib.optionalString (backup.backupPrepareCommand != null) '' ${pkgs.writeScript "backupPrepareCommand" backup.backupPrepareCommand} ''} - ${optionalString (backup.initialize) '' + ${lib.optionalString (backup.initialize) '' ${resticCmd} cat config > /dev/null || ${resticCmd} init ''} - ${optionalString (backup.paths != null && backup.paths != []) '' - cat ${pkgs.writeText "staticPaths" (concatLines backup.paths)} >> ${filesFromTmpFile} + ${lib.optionalString (backup.paths != null && backup.paths != []) '' + cat ${pkgs.writeText "staticPaths" (lib.concatLines backup.paths)} >> ${filesFromTmpFile} ''} - ${optionalString (backup.dynamicFilesFrom != null) '' + ${lib.optionalString (backup.dynamicFilesFrom != null) '' ${pkgs.writeScript "dynamicFilesFromScript" backup.dynamicFilesFrom} >> ${filesFromTmpFile} ''} ''; - } // optionalAttrs (doBackup || backup.backupCleanupCommand != null) { + } // lib.optionalAttrs (doBackup || backup.backupCleanupCommand != null) { postStop = '' - ${optionalString (backup.backupCleanupCommand != null) '' + ${lib.optionalString (backup.backupCleanupCommand != null) '' ${pkgs.writeScript "backupCleanupCommand" backup.backupCleanupCommand} ''} - ${optionalString doBackup '' + ${lib.optionalString doBackup '' rm ${filesFromTmpFile} ''} ''; @@ -393,12 +390,12 @@ in ) config.services.restic.backups; systemd.timers = - mapAttrs' - (name: backup: nameValuePair "restic-backups-${name}" { + lib.mapAttrs' + (name: backup: lib.nameValuePair "restic-backups-${name}" { wantedBy = [ "timers.target" ]; timerConfig = backup.timerConfig; }) - (filterAttrs (_: backup: backup.timerConfig != null) config.services.restic.backups); + (lib.filterAttrs (_: backup: backup.timerConfig != null) config.services.restic.backups); # generate wrapper scripts, as described in the createWrapper option environment.systemPackages = lib.mapAttrsToList (name: backup: let diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix index 6635a51ec2c65..aedb8acd60ac1 100644 --- a/nixos/modules/services/backup/rsnapshot.nix +++ b/nixos/modules/services/backup/rsnapshot.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.rsnapshot; cfgfile = pkgs.writeText "rsnapshot.conf" '' @@ -22,21 +19,21 @@ in { options = { services.rsnapshot = { - enable = mkEnableOption "rsnapshot backups"; - enableManualRsnapshot = mkOption { + enable = lib.mkEnableOption "rsnapshot backups"; + enableManualRsnapshot = lib.mkOption { description = "Whether to enable manual usage of the rsnapshot command with this module."; default = true; - type = types.bool; + type = lib.types.bool; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { default = ""; example = '' retains hourly 24 retain daily 365 backup /home/ localhost/ ''; - type = types.lines; + type = lib.types.lines; description = '' rsnapshot configuration option in addition to the defaults from rsnapshot and this module. @@ -49,10 +46,10 @@ in ''; }; - cronIntervals = mkOption { + cronIntervals = lib.mkOption { default = {}; example = { hourly = "0 * * * *"; daily = "50 21 * * *"; }; - type = types.attrsOf types.str; + type = lib.types.attrsOf lib.types.str; description = '' Periodicity at which intervals should be run by cron. Note that the intervals also have to exist in configuration @@ -62,12 +59,12 @@ in }; }; - config = mkIf cfg.enable (mkMerge [ + config = lib.mkIf cfg.enable (lib.mkMerge [ { services.cron.systemCronJobs = - mapAttrsToList (interval: time: "${time} root ${pkgs.rsnapshot}/bin/rsnapshot -c ${cfgfile} ${interval}") cfg.cronIntervals; + lib.mapAttrsToList (interval: time: "${time} root ${pkgs.rsnapshot}/bin/rsnapshot -c ${cfgfile} ${interval}") cfg.cronIntervals; } - (mkIf cfg.enableManualRsnapshot { + (lib.mkIf cfg.enableManualRsnapshot { environment.systemPackages = [ pkgs.rsnapshot ]; environment.etc."rsnapshot.conf".source = cfgfile; }) diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix index 1b9ace358cabe..823a2ed565e78 100644 --- a/nixos/modules/services/backup/sanoid.nix +++ b/nixos/modules/services/backup/sanoid.nix @@ -1,85 +1,82 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.sanoid; - datasetSettingsType = with types; + datasetSettingsType = with lib.types; (attrsOf (nullOr (oneOf [ str int bool (listOf str) ]))) // { description = "dataset/template options"; }; commonOptions = { - hourly = mkOption { + hourly = lib.mkOption { description = "Number of hourly snapshots."; - type = with types; nullOr ints.unsigned; + type = with lib.types; nullOr ints.unsigned; default = null; }; - daily = mkOption { + daily = lib.mkOption { description = "Number of daily snapshots."; - type = with types; nullOr ints.unsigned; + type = with lib.types; nullOr ints.unsigned; default = null; }; - monthly = mkOption { + monthly = lib.mkOption { description = "Number of monthly snapshots."; - type = with types; nullOr ints.unsigned; + type = with lib.types; nullOr ints.unsigned; default = null; }; - yearly = mkOption { + yearly = lib.mkOption { description = "Number of yearly snapshots."; - type = with types; nullOr ints.unsigned; + type = with lib.types; nullOr ints.unsigned; default = null; }; - autoprune = mkOption { + autoprune = lib.mkOption { description = "Whether to automatically prune old snapshots."; - type = with types; nullOr bool; + type = with lib.types; nullOr bool; default = null; }; - autosnap = mkOption { + autosnap = lib.mkOption { description = "Whether to automatically take snapshots."; - type = with types; nullOr bool; + type = with lib.types; nullOr bool; default = null; }; }; datasetOptions = rec { - use_template = mkOption { + use_template = lib.mkOption { description = "Names of the templates to use for this dataset."; - type = types.listOf (types.str // { - check = (types.enum (attrNames cfg.templates)).check; + type = lib.types.listOf (lib.types.str // { + check = (lib.types.enum (lib.attrNames cfg.templates)).check; description = "configured template name"; }); default = [ ]; }; useTemplate = use_template; - recursive = mkOption { + recursive = lib.mkOption { description = '' Whether to recursively snapshot dataset children. You can also set this to `"zfs"` to handle datasets recursively in an atomic way without the possibility to override settings for child datasets. ''; - type = with types; oneOf [ bool (enum [ "zfs" ]) ]; + type = with lib.types; oneOf [ bool (enum [ "zfs" ]) ]; default = false; }; - process_children_only = mkOption { + process_children_only = lib.mkOption { description = "Whether to only snapshot child datasets if recursing."; - type = types.bool; + type = lib.types.bool; default = false; }; processChildrenOnly = process_children_only; }; # Extract unique dataset names - datasets = unique (attrNames cfg.datasets); + datasets = lib.unique (lib.attrNames cfg.datasets); # Function to build "zfs allow" and "zfs unallow" commands for the # filesystems we've delegated permissions to. @@ -88,23 +85,23 @@ let "-+/run/booted-system/sw/bin/zfs" zfsAction "sanoid" - (concatStringsSep "," permissions) + (lib.concatStringsSep "," permissions) dataset ]; configFile = let mkValueString = v: - if builtins.isList v then concatStringsSep "," v - else generators.mkValueStringDefault { } v; + if lib.isList v then lib.concatStringsSep "," v + else lib.generators.mkValueStringDefault { } v; mkKeyValue = k: v: if v == null then "" else if k == "processChildrenOnly" then "" else if k == "useTemplate" then "" - else generators.mkKeyValueDefault { inherit mkValueString; } "=" k v; + else lib.generators.mkKeyValueDefault { inherit mkValueString; } "=" k v; in - generators.toINI { inherit mkKeyValue; } cfg.settings; + lib.generators.toINI { inherit mkKeyValue; } cfg.settings; in { @@ -112,12 +109,12 @@ in # Interface options.services.sanoid = { - enable = mkEnableOption "Sanoid ZFS snapshotting service"; + enable = lib.mkEnableOption "Sanoid ZFS snapshotting service"; package = lib.mkPackageOption pkgs "sanoid" {}; - interval = mkOption { - type = types.str; + interval = lib.mkOption { + type = lib.types.str; default = "hourly"; example = "daily"; description = '' @@ -128,19 +125,19 @@ in ''; }; - datasets = mkOption { - type = types.attrsOf (types.submodule ({ config, options, ... }: { + datasets = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule ({ config, options, ... }: { freeformType = datasetSettingsType; options = commonOptions // datasetOptions; - config.use_template = modules.mkAliasAndWrapDefsWithPriority id (options.useTemplate or { }); - config.process_children_only = modules.mkAliasAndWrapDefsWithPriority id (options.processChildrenOnly or { }); + config.use_template = lib.modules.mkAliasAndWrapDefsWithPriority lib.id (options.useTemplate or { }); + config.process_children_only = lib.modules.mkAliasAndWrapDefsWithPriority lib.id (options.processChildrenOnly or { }); })); default = { }; description = "Datasets to snapshot."; }; - templates = mkOption { - type = types.attrsOf (types.submodule { + templates = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule { freeformType = datasetSettingsType; options = commonOptions; }); @@ -148,8 +145,8 @@ in description = "Templates for datasets."; }; - settings = mkOption { - type = types.attrsOf datasetSettingsType; + settings = lib.mkOption { + type = lib.types.attrsOf datasetSettingsType; description = '' Free-form settings written directly to the config file. See @@ -157,8 +154,8 @@ in ''; }; - extraArgs = mkOption { - type = types.listOf types.str; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "--verbose" "--readonly" "--debug" ]; description = '' @@ -171,10 +168,10 @@ in # Implementation - config = mkIf cfg.enable { - services.sanoid.settings = mkMerge [ - (mapAttrs' (d: v: nameValuePair ("template_" + d) v) cfg.templates) - (mapAttrs (d: v: v) cfg.datasets) + config = lib.mkIf cfg.enable { + services.sanoid.settings = lib.mkMerge [ + (lib.mapAttrs' (d: v: lib.nameValuePair ("template_" + d) v) cfg.templates) + (lib.mapAttrs (d: v: v) cfg.datasets) ]; systemd.services.sanoid = { @@ -201,5 +198,5 @@ in }; }; - meta.maintainers = with maintainers; [ lopsided98 ]; + meta.maintainers = with lib.maintainers; [ lopsided98 ]; } diff --git a/nixos/modules/services/backup/snapraid.nix b/nixos/modules/services/backup/snapraid.nix index a621c9f62ff79..72b4d9caef3c3 100644 --- a/nixos/modules/services/backup/snapraid.nix +++ b/nixos/modules/services/backup/snapraid.nix @@ -1,18 +1,15 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.snapraid; in { imports = [ # Should have never been on the top-level. - (mkRenamedOptionModule [ "snapraid" ] [ "services" "snapraid" ]) + (lib.mkRenamedOptionModule [ "snapraid" ] [ "services" "snapraid" ]) ]; - options.services.snapraid = with types; { - enable = mkEnableOption "SnapRAID"; - dataDisks = mkOption { + options.services.snapraid = with lib.types; { + enable = lib.mkEnableOption "SnapRAID"; + dataDisks = lib.mkOption { default = { }; example = { d1 = "/mnt/disk1/"; @@ -22,7 +19,7 @@ in description = "SnapRAID data disks."; type = attrsOf str; }; - parityFiles = mkOption { + parityFiles = lib.mkOption { default = [ ]; example = [ "/mnt/diskp/snapraid.parity" @@ -35,7 +32,7 @@ in description = "SnapRAID parity files."; type = listOf str; }; - contentFiles = mkOption { + contentFiles = lib.mkOption { default = [ ]; example = [ "/var/snapraid.content" @@ -45,40 +42,40 @@ in description = "SnapRAID content list files."; type = listOf str; }; - exclude = mkOption { + exclude = lib.mkOption { default = [ ]; example = [ "*.unrecoverable" "/tmp/" "/lost+found/" ]; description = "SnapRAID exclude directives."; type = listOf str; }; - touchBeforeSync = mkOption { + touchBeforeSync = lib.mkOption { default = true; example = false; description = "Whether {command}`snapraid touch` should be run before {command}`snapraid sync`."; type = bool; }; - sync.interval = mkOption { + sync.interval = lib.mkOption { default = "01:00"; example = "daily"; description = "How often to run {command}`snapraid sync`."; type = str; }; scrub = { - interval = mkOption { + interval = lib.mkOption { default = "Mon *-*-* 02:00:00"; example = "weekly"; description = "How often to run {command}`snapraid scrub`."; type = str; }; - plan = mkOption { + plan = lib.mkOption { default = 8; example = 5; description = "Percent of the array that should be checked by {command}`snapraid scrub`."; type = int; }; - olderThan = mkOption { + olderThan = lib.mkOption { default = 10; example = 20; description = @@ -86,7 +83,7 @@ in type = int; }; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { default = ""; example = '' nohidden @@ -105,7 +102,7 @@ in nParity = builtins.length cfg.parityFiles; mkPrepend = pre: s: pre + s; in - mkIf cfg.enable { + lib.mkIf cfg.enable { assertions = [ { assertion = nParity <= 6; @@ -128,11 +125,11 @@ in prependContent = mkPrepend "content "; prependExclude = mkPrepend "exclude "; in - concatStringsSep "\n" + lib.concatStringsSep "\n" (map prependData - ((mapAttrsToList (name: value: name + " " + value)) dataDisks) - ++ zipListsWith (a: b: a + b) - ([ "parity " ] ++ map (i: toString i + "-parity ") (range 2 6)) + ((lib.mapAttrsToList (name: value: name + " " + value)) dataDisks) + ++ lib.zipListsWith (a: b: a + b) + ([ "parity " ] ++ map (i: toString i + "-parity ") (lib.range 2 6)) parityFiles ++ map prependContent contentFiles ++ map prependExclude exclude) + "\n" + extraConfig; }; @@ -179,8 +176,8 @@ in let contentDirs = map dirOf contentFiles; in - unique ( - attrValues dataDisks ++ contentDirs + lib.unique ( + lib.attrValues dataDisks ++ contentDirs ); }; unitConfig.After = "snapraid-sync.service"; @@ -225,12 +222,12 @@ in # Multiple "split" parity files can be specified in a single # "parityFile", separated by a comma. # https://www.snapraid.it/manual#7.1 - splitParityFiles = map (s: splitString "," s) parityFiles; + splitParityFiles = map (s: lib.splitString "," s) parityFiles; in - unique ( - attrValues dataDisks ++ splitParityFiles ++ contentDirs + lib.unique ( + lib.attrValues dataDisks ++ splitParityFiles ++ contentDirs ); - } // optionalAttrs touchBeforeSync { + } // lib.optionalAttrs touchBeforeSync { ExecStartPre = "${pkgs.snapraid}/bin/snapraid touch"; }; }; diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index ec9ccaa46d428..4a59336fbdec5 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -1,14 +1,11 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.syncoid; # Extract local dasaset names (so no datasets containing "@") - localDatasetName = d: optionals (d != null) ( + localDatasetName = d: lib.optionals (d != null) ( let m = builtins.match "([^/@]+[^@]*)" d; in - optionals (m != null) m + lib.optionals (m != null) m ); # Escape as required by: https://www.freedesktop.org/software/systemd/man/systemd.unit.html @@ -35,7 +32,7 @@ let "/run/booted-system/sw/bin/zfs" "allow" cfg.user - (concatStringsSep "," permissions) + (lib.concatStringsSep "," permissions) dataset ]} ${lib.optionalString ((builtins.dirOf dataset) != ".") '' @@ -44,7 +41,7 @@ let "/run/booted-system/sw/bin/zfs" "allow" cfg.user - (concatStringsSep "," permissions) + (lib.concatStringsSep "," permissions) # Remove the last part of the path (builtins.dirOf dataset) ]} @@ -66,14 +63,14 @@ let "/run/booted-system/sw/bin/zfs" "unallow" cfg.user - (concatStringsSep "," permissions) + (lib.concatStringsSep "," permissions) dataset ]} ${lib.optionalString ((builtins.dirOf dataset) != ".") (lib.escapeShellArgs [ "/run/booted-system/sw/bin/zfs" "unallow" cfg.user - (concatStringsSep "," permissions) + (lib.concatStringsSep "," permissions) # Remove the last part of the path (builtins.dirOf dataset) ])} @@ -85,12 +82,12 @@ in # Interface options.services.syncoid = { - enable = mkEnableOption "Syncoid ZFS synchronization service"; + enable = lib.mkEnableOption "Syncoid ZFS synchronization service"; package = lib.mkPackageOption pkgs "sanoid" {}; - interval = mkOption { - type = types.str; + interval = lib.mkOption { + type = lib.types.str; default = "hourly"; example = "*-*-* *:15:00"; description = '' @@ -101,8 +98,8 @@ in ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "syncoid"; example = "backup"; description = '' @@ -115,15 +112,15 @@ in ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "syncoid"; example = "backup"; description = "The group for the service."; }; - sshKey = mkOption { - type = with types; nullOr (coercedTo path toString str); + sshKey = lib.mkOption { + type = with lib.types; nullOr (coercedTo path toString str); default = null; description = '' SSH private key file to use to login to the remote system. Can be @@ -131,8 +128,8 @@ in ''; }; - localSourceAllow = mkOption { - type = types.listOf types.str; + localSourceAllow = lib.mkOption { + type = lib.types.listOf lib.types.str; # Permissions snapshot and destroy are in case --no-sync-snap is not used default = [ "bookmark" "hold" "send" "snapshot" "destroy" "mount" ]; description = '' @@ -143,8 +140,8 @@ in ''; }; - localTargetAllow = mkOption { - type = types.listOf types.str; + localTargetAllow = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ "change-key" "compression" "create" "mount" "mountpoint" "receive" "rollback" ]; example = [ "create" "mount" "receive" "rollback" ]; description = '' @@ -158,8 +155,8 @@ in ''; }; - commonArgs = mkOption { - type = types.listOf types.str; + commonArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "--no-sync-snap" ]; description = '' @@ -170,19 +167,19 @@ in ''; }; - service = mkOption { - type = types.attrs; + service = lib.mkOption { + type = lib.types.attrs; default = { }; description = '' Systemd configuration common to all syncoid services. ''; }; - commands = mkOption { - type = types.attrsOf (types.submodule ({ name, ... }: { + commands = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule ({ name, ... }: { options = { - source = mkOption { - type = types.str; + source = lib.mkOption { + type = lib.types.str; example = "pool/dataset"; description = '' Source ZFS dataset. Can be either local or remote. Defaults to @@ -190,8 +187,8 @@ in ''; }; - target = mkOption { - type = types.str; + target = lib.mkOption { + type = lib.types.str; example = "user@server:pool/dataset"; description = '' Target ZFS dataset. Can be either local @@ -200,18 +197,18 @@ in ''; }; - recursive = mkEnableOption ''the transfer of child datasets''; + recursive = lib.mkEnableOption ''the transfer of child datasets''; - sshKey = mkOption { - type = with types; nullOr (coercedTo path toString str); + sshKey = lib.mkOption { + type = with lib.types; nullOr (coercedTo path toString str); description = '' SSH private key file to use to login to the remote system. Defaults to {option}`services.syncoid.sshKey` option. ''; }; - localSourceAllow = mkOption { - type = types.listOf types.str; + localSourceAllow = lib.mkOption { + type = lib.types.listOf lib.types.str; description = '' Permissions granted for the {option}`services.syncoid.user` user for local source datasets. See @@ -221,8 +218,8 @@ in ''; }; - localTargetAllow = mkOption { - type = types.listOf types.str; + localTargetAllow = lib.mkOption { + type = lib.types.listOf lib.types.str; description = '' Permissions granted for the {option}`services.syncoid.user` user for local target datasets. See @@ -234,8 +231,8 @@ in ''; }; - sendOptions = mkOption { - type = types.separatedString " "; + sendOptions = lib.mkOption { + type = lib.types.separatedString " "; default = ""; example = "Lc e"; description = '' @@ -244,8 +241,8 @@ in ''; }; - recvOptions = mkOption { - type = types.separatedString " "; + recvOptions = lib.mkOption { + type = lib.types.separatedString " "; default = ""; example = "ux recordsize o compression=lz4"; description = '' @@ -254,38 +251,38 @@ in ''; }; - useCommonArgs = mkOption { - type = types.bool; + useCommonArgs = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to add the configured common arguments to this command. ''; }; - service = mkOption { - type = types.attrs; + service = lib.mkOption { + type = lib.types.attrs; default = { }; description = '' Systemd configuration specific to this syncoid service. ''; }; - extraArgs = mkOption { - type = types.listOf types.str; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "--sshport 2222" ]; description = "Extra syncoid arguments for this command."; }; }; config = { - source = mkDefault name; - sshKey = mkDefault cfg.sshKey; - localSourceAllow = mkDefault cfg.localSourceAllow; - localTargetAllow = mkDefault cfg.localTargetAllow; + source = lib.mkDefault name; + sshKey = lib.mkDefault cfg.sshKey; + localSourceAllow = lib.mkDefault cfg.localSourceAllow; + localTargetAllow = lib.mkDefault cfg.localTargetAllow; }; })); default = { }; - example = literalExpression '' + example = lib.literalExpression '' { "pool/test".target = "root@target:pool/test"; } @@ -296,9 +293,9 @@ in # Implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users = { - users = mkIf (cfg.user == "syncoid") { + users = lib.mkIf (cfg.user == "syncoid") { syncoid = { group = cfg.group; isSystemUser = true; @@ -308,14 +305,14 @@ in createHome = false; }; }; - groups = mkIf (cfg.group == "syncoid") { + groups = lib.mkIf (cfg.group == "syncoid") { syncoid = { }; }; }; - systemd.services = mapAttrs' + systemd.services = lib.mapAttrs' (name: c: - nameValuePair "syncoid-${escapeUnitName name}" (mkMerge [ + lib.nameValuePair "syncoid-${escapeUnitName name}" (lib.mkMerge [ { description = "Syncoid ZFS synchronization from ${c.source} to ${c.target}"; after = [ "zfs.target" ]; @@ -330,9 +327,9 @@ in (map (buildUnallowCommand c.localSourceAllow) (localDatasetName c.source)) ++ (map (buildUnallowCommand c.localTargetAllow) (localDatasetName c.target)); ExecStart = lib.escapeShellArgs ([ "${cfg.package}/bin/syncoid" ] - ++ optionals c.useCommonArgs cfg.commonArgs - ++ optional c.recursive "-r" - ++ optionals (c.sshKey != null) [ "--sshkey" c.sshKey ] + ++ lib.optionals c.useCommonArgs cfg.commonArgs + ++ lib.optional c.recursive "-r" + ++ lib.optionals (c.sshKey != null) [ "--sshkey" c.sshKey ] ++ c.extraArgs ++ [ "--sendoptions" @@ -364,7 +361,7 @@ in NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; - PrivateNetwork = mkDefault false; + PrivateNetwork = lib.mkDefault false; PrivateUsers = false; # Enabling this breaks on zfs-2.2.0 ProtectClock = true; ProtectControlGroups = true; @@ -416,5 +413,5 @@ in cfg.commands; }; - meta.maintainers = with maintainers; [ julm lopsided98 ]; + meta.maintainers = with lib.maintainers; [ julm lopsided98 ]; } diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index b8f848451d40b..43493997931c1 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -1,41 +1,38 @@ { config, lib, options, pkgs, utils, ... }: - -with lib; - let gcfg = config.services.tarsnap; opt = options.services.tarsnap; configFile = name: cfg: '' keyfile ${cfg.keyfile} - ${optionalString (cfg.cachedir != null) "cachedir ${cfg.cachedir}"} - ${optionalString cfg.nodump "nodump"} - ${optionalString cfg.printStats "print-stats"} - ${optionalString cfg.printStats "humanize-numbers"} - ${optionalString (cfg.checkpointBytes != null) ("checkpoint-bytes "+cfg.checkpointBytes)} - ${optionalString cfg.aggressiveNetworking "aggressive-networking"} - ${concatStringsSep "\n" (map (v: "exclude ${v}") cfg.excludes)} - ${concatStringsSep "\n" (map (v: "include ${v}") cfg.includes)} - ${optionalString cfg.lowmem "lowmem"} - ${optionalString cfg.verylowmem "verylowmem"} - ${optionalString (cfg.maxbw != null) "maxbw ${toString cfg.maxbw}"} - ${optionalString (cfg.maxbwRateUp != null) "maxbw-rate-up ${toString cfg.maxbwRateUp}"} - ${optionalString (cfg.maxbwRateDown != null) "maxbw-rate-down ${toString cfg.maxbwRateDown}"} + ${lib.optionalString (cfg.cachedir != null) "cachedir ${cfg.cachedir}"} + ${lib.optionalString cfg.nodump "nodump"} + ${lib.optionalString cfg.printStats "print-stats"} + ${lib.optionalString cfg.printStats "humanize-numbers"} + ${lib.optionalString (cfg.checkpointBytes != null) ("checkpoint-bytes "+cfg.checkpointBytes)} + ${lib.optionalString cfg.aggressiveNetworking "aggressive-networking"} + ${lib.concatStringsSep "\n" (map (v: "exclude ${v}") cfg.excludes)} + ${lib.concatStringsSep "\n" (map (v: "include ${v}") cfg.includes)} + ${lib.optionalString cfg.lowmem "lowmem"} + ${lib.optionalString cfg.verylowmem "verylowmem"} + ${lib.optionalString (cfg.maxbw != null) "maxbw ${toString cfg.maxbw}"} + ${lib.optionalString (cfg.maxbwRateUp != null) "maxbw-rate-up ${toString cfg.maxbwRateUp}"} + ${lib.optionalString (cfg.maxbwRateDown != null) "maxbw-rate-down ${toString cfg.maxbwRateDown}"} ''; in { imports = [ - (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives..cachedir") + (lib.mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives..cachedir") ]; options = { services.tarsnap = { - enable = mkEnableOption "periodic tarsnap backups"; + enable = lib.mkEnableOption "periodic tarsnap backups"; - package = mkPackageOption pkgs "tarsnap" { }; + package = lib.mkPackageOption pkgs "tarsnap" { }; - keyfile = mkOption { - type = types.str; + keyfile = lib.mkOption { + type = lib.types.str; default = "/root/tarsnap.key"; description = '' The keyfile which associates this machine with your tarsnap @@ -61,14 +58,14 @@ in ''; }; - archives = mkOption { - type = types.attrsOf (types.submodule ({ config, options, ... }: + archives = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule ({ config, options, ... }: { options = { - keyfile = mkOption { - type = types.str; + keyfile = lib.mkOption { + type = lib.types.str; default = gcfg.keyfile; - defaultText = literalExpression "config.${opt.keyfile}"; + defaultText = lib.literalExpression "config.${opt.keyfile}"; description = '' Set a specific keyfile for this archive. This defaults to `"/root/tarsnap.key"` if left unspecified. @@ -88,10 +85,10 @@ in ''; }; - cachedir = mkOption { - type = types.nullOr types.path; + cachedir = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = "/var/cache/tarsnap/${utils.escapeSystemdPath config.keyfile}"; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' "/var/cache/tarsnap/''${utils.escapeSystemdPath config.${options.keyfile}}" ''; description = '' @@ -106,16 +103,16 @@ in ''; }; - nodump = mkOption { - type = types.bool; + nodump = lib.mkOption { + type = lib.types.bool; default = true; description = '' Exclude files with the `nodump` flag. ''; }; - printStats = mkOption { - type = types.bool; + printStats = lib.mkOption { + type = lib.types.bool; default = true; description = '' Print global archive statistics upon completion. @@ -124,8 +121,8 @@ in ''; }; - checkpointBytes = mkOption { - type = types.nullOr types.str; + checkpointBytes = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = "1GB"; description = '' Create a checkpoint every `checkpointBytes` @@ -138,8 +135,8 @@ in ''; }; - period = mkOption { - type = types.str; + period = lib.mkOption { + type = lib.types.str; default = "01:15"; example = "hourly"; description = '' @@ -150,8 +147,8 @@ in ''; }; - aggressiveNetworking = mkOption { - type = types.bool; + aggressiveNetworking = lib.mkOption { + type = lib.types.bool; default = false; description = '' Upload data over multiple TCP connections, potentially @@ -162,22 +159,22 @@ in ''; }; - directories = mkOption { - type = types.listOf types.path; + directories = lib.mkOption { + type = lib.types.listOf lib.types.path; default = []; description = "List of filesystem paths to archive."; }; - excludes = mkOption { - type = types.listOf types.str; + excludes = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = '' Exclude files and directories matching these patterns. ''; }; - includes = mkOption { - type = types.listOf types.str; + includes = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = '' Include only files and directories matching these @@ -187,8 +184,8 @@ in ''; }; - lowmem = mkOption { - type = types.bool; + lowmem = lib.mkOption { + type = lib.types.bool; default = false; description = '' Reduce memory consumption by not caching small files. @@ -198,8 +195,8 @@ in ''; }; - verylowmem = mkOption { - type = types.bool; + verylowmem = lib.mkOption { + type = lib.types.bool; default = false; description = '' Reduce memory consumption by a factor of 2 beyond what @@ -208,8 +205,8 @@ in ''; }; - maxbw = mkOption { - type = types.nullOr types.int; + maxbw = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; description = '' Abort archival if upstream bandwidth usage in bytes @@ -217,40 +214,40 @@ in ''; }; - maxbwRateUp = mkOption { - type = types.nullOr types.int; + maxbwRateUp = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; - example = literalExpression "25 * 1000"; + example = lib.literalExpression "25 * 1000"; description = '' Upload bandwidth rate limit in bytes. ''; }; - maxbwRateDown = mkOption { - type = types.nullOr types.int; + maxbwRateDown = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; - example = literalExpression "50 * 1000"; + example = lib.literalExpression "50 * 1000"; description = '' Download bandwidth rate limit in bytes. ''; }; - verbose = mkOption { - type = types.bool; + verbose = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to produce verbose logging output. ''; }; - explicitSymlinks = mkOption { - type = types.bool; + explicitSymlinks = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to follow symlinks specified as archives. ''; }; - followSymlinks = mkOption { - type = types.bool; + followSymlinks = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to follow all symlinks in archive trees. @@ -262,7 +259,7 @@ in default = {}; - example = literalExpression '' + example = lib.literalExpression '' { nixos = { directories = [ "/home" "/root/ssl" ]; @@ -292,19 +289,19 @@ in }; }; - config = mkIf gcfg.enable { + config = lib.mkIf gcfg.enable { assertions = - (mapAttrsToList (name: cfg: + (lib.mapAttrsToList (name: cfg: { assertion = cfg.directories != []; message = "Must specify paths for tarsnap to back up"; }) gcfg.archives) ++ - (mapAttrsToList (name: cfg: + (lib.mapAttrsToList (name: cfg: { assertion = !(cfg.lowmem && cfg.verylowmem); message = "You cannot set both lowmem and verylowmem"; }) gcfg.archives); systemd.services = - (mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" { + (lib.mapAttrs' (name: cfg: lib.nameValuePair "tarsnap-${name}" { description = "Tarsnap archive '${name}'"; requires = [ "network-online.target" ]; after = [ "network-online.target" ]; @@ -322,11 +319,11 @@ in script = let tarsnap = ''${lib.getExe gcfg.package} --configfile "/etc/tarsnap/${name}.conf"''; run = ''${tarsnap} -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \ - ${optionalString cfg.verbose "-v"} \ - ${optionalString cfg.explicitSymlinks "-H"} \ - ${optionalString cfg.followSymlinks "-L"} \ - ${concatStringsSep " " cfg.directories}''; - cachedir = escapeShellArg cfg.cachedir; + ${lib.optionalString cfg.verbose "-v"} \ + ${lib.optionalString cfg.explicitSymlinks "-H"} \ + ${lib.optionalString cfg.followSymlinks "-L"} \ + ${lib.concatStringsSep " " cfg.directories}''; + cachedir = lib.escapeShellArg cfg.cachedir; in if (cfg.cachedir != null) then '' mkdir -p ${cachedir} chmod 0700 ${cachedir} @@ -353,7 +350,7 @@ in }; }) gcfg.archives) // - (mapAttrs' (name: cfg: nameValuePair "tarsnap-restore-${name}"{ + (lib.mapAttrs' (name: cfg: lib.nameValuePair "tarsnap-restore-${name}"{ description = "Tarsnap restore '${name}'"; requires = [ "network-online.target" ]; @@ -362,8 +359,8 @@ in script = let tarsnap = ''${lib.getExe gcfg.package} --configfile "/etc/tarsnap/${name}.conf"''; lastArchive = "$(${tarsnap} --list-archives | sort | tail -1)"; - run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}''; - cachedir = escapeShellArg cfg.cachedir; + run = ''${tarsnap} -x -f "${lastArchive}" ${lib.optionalString cfg.verbose "-v"}''; + cachedir = lib.escapeShellArg cfg.cachedir; in if (cfg.cachedir != null) then '' mkdir -p ${cachedir} @@ -393,14 +390,14 @@ in # Note: the timer must be Persistent=true, so that systemd will start it even # if e.g. your laptop was asleep while the latest interval occurred. - systemd.timers = mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" + systemd.timers = lib.mapAttrs' (name: cfg: lib.nameValuePair "tarsnap-${name}" { timerConfig.OnCalendar = cfg.period; timerConfig.Persistent = "true"; wantedBy = [ "timers.target" ]; }) gcfg.archives; environment.etc = - mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf" + lib.mapAttrs' (name: cfg: lib.nameValuePair "tarsnap/${name}.conf" { text = configFile name cfg; }) gcfg.archives; diff --git a/nixos/modules/services/backup/tsm.nix b/nixos/modules/services/backup/tsm.nix index 9e1abb85bfe54..6589fcd9466c1 100644 --- a/nixos/modules/services/backup/tsm.nix +++ b/nixos/modules/services/backup/tsm.nix @@ -90,7 +90,7 @@ in environment.HOME = "/var/lib/tsm-backup"; serviceConfig = { # for exit status description see - # https://www.ibm.com/docs/en/storage-protect/8.1.23?topic=clients-client-return-codes + # https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=clients-client-return-codes SuccessExitStatus = "4 8"; # The `-se` option must come after the command. # The `-optfile` option suppresses a `dsm.opt`-not-found warning. diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix index c89d6fb8ad60b..5aefaa35df509 100644 --- a/nixos/modules/services/backup/zfs-replication.nix +++ b/nixos/modules/services/backup/zfs-replication.nix @@ -1,56 +1,53 @@ { lib, pkgs, config, ... }: - -with lib; - let cfg = config.services.zfs.autoReplication; - recursive = optionalString cfg.recursive " --recursive"; - followDelete = optionalString cfg.followDelete " --follow-delete"; + recursive = lib.optionalString cfg.recursive " --recursive"; + followDelete = lib.optionalString cfg.followDelete " --follow-delete"; in { options = { services.zfs.autoReplication = { - enable = mkEnableOption "ZFS snapshot replication"; + enable = lib.mkEnableOption "ZFS snapshot replication"; - followDelete = mkOption { + followDelete = lib.mkOption { description = "Remove remote snapshots that don't have a local correspondent."; default = true; - type = types.bool; + type = lib.types.bool; }; - host = mkOption { + host = lib.mkOption { description = "Remote host where snapshots should be sent. `lz4` is expected to be installed on this host."; example = "example.com"; - type = types.str; + type = lib.types.str; }; - identityFilePath = mkOption { + identityFilePath = lib.mkOption { description = "Path to SSH key used to login to host."; example = "/home/username/.ssh/id_rsa"; - type = types.path; + type = lib.types.path; }; - localFilesystem = mkOption { + localFilesystem = lib.mkOption { description = "Local ZFS filesystem from which snapshots should be sent. Defaults to the attribute name."; example = "pool/file/path"; - type = types.str; + type = lib.types.str; }; - remoteFilesystem = mkOption { + remoteFilesystem = lib.mkOption { description = "Remote ZFS filesystem where snapshots should be sent."; example = "pool/file/path"; - type = types.str; + type = lib.types.str; }; - recursive = mkOption { + recursive = lib.mkOption { description = "Recursively discover snapshots to send."; default = true; - type = types.bool; + type = lib.types.bool; }; - username = mkOption { + username = lib.mkOption { description = "Username used by SSH to login to remote host."; example = "username"; - type = types.str; + type = lib.types.str; }; }; }; @@ -73,7 +70,7 @@ in { "https://github.com/alunduil/zfs-replicate" ]; restartIfChanged = false; - serviceConfig.ExecStart = "${pkgs.zfs-replicate}/bin/zfs-replicate${recursive} -l ${escapeShellArg cfg.username} -i ${escapeShellArg cfg.identityFilePath}${followDelete} ${escapeShellArg cfg.host} ${escapeShellArg cfg.remoteFilesystem} ${escapeShellArg cfg.localFilesystem}"; + serviceConfig.ExecStart = "${pkgs.zfs-replicate}/bin/zfs-replicate${recursive} -l ${lib.escapeShellArg cfg.username} -i ${lib.escapeShellArg cfg.identityFilePath}${followDelete} ${lib.escapeShellArg cfg.host} ${lib.escapeShellArg cfg.remoteFilesystem} ${lib.escapeShellArg cfg.localFilesystem}"; wantedBy = [ "zfs-snapshot-daily.service" "zfs-snapshot-frequent.service" diff --git a/nixos/modules/services/backup/zrepl.nix b/nixos/modules/services/backup/zrepl.nix index a0e9a0da7e493..d46823adbadbd 100644 --- a/nixos/modules/services/backup/zrepl.nix +++ b/nixos/modules/services/backup/zrepl.nix @@ -1,27 +1,25 @@ { config, pkgs, lib, ... }: - -with lib; let cfg = config.services.zrepl; format = pkgs.formats.yaml { }; configFile = format.generate "zrepl.yml" cfg.settings; in { - meta.maintainers = with maintainers; [ cole-h ]; + meta.maintainers = with lib.maintainers; [ cole-h ]; options = { services.zrepl = { - enable = mkEnableOption "zrepl"; + enable = lib.mkEnableOption "zrepl"; - package = mkPackageOption pkgs "zrepl" { }; + package = lib.mkPackageOption pkgs "zrepl" { }; - settings = mkOption { + settings = lib.mkOption { default = { }; description = '' Configuration for zrepl. See for more information. ''; - type = types.submodule { + type = lib.types.submodule { freeformType = format.type; }; }; @@ -30,7 +28,7 @@ in ### Implementation ### - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; # zrepl looks for its config in this location by default. This diff --git a/nixos/modules/services/blockchain/ethereum/erigon.nix b/nixos/modules/services/blockchain/ethereum/erigon.nix index 24705b3433df4..5ac9523391519 100644 --- a/nixos/modules/services/blockchain/ethereum/erigon.nix +++ b/nixos/modules/services/blockchain/ethereum/erigon.nix @@ -1,6 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; let cfg = config.services.erigon; @@ -11,18 +9,18 @@ in { options = { services.erigon = { - enable = mkEnableOption "Ethereum implementation on the efficiency frontier"; + enable = lib.mkEnableOption "Ethereum implementation on the efficiency frontier"; - package = mkPackageOption pkgs "erigon" { }; + package = lib.mkPackageOption pkgs "erigon" { }; - extraArgs = mkOption { - type = types.listOf types.str; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "Additional arguments passed to Erigon"; default = [ ]; }; - secretJwtPath = mkOption { - type = types.path; + secretJwtPath = lib.mkOption { + type = lib.types.path; description = '' Path to the secret jwt used for the http api authentication. ''; @@ -30,7 +28,7 @@ in { example = "config.age.secrets.ERIGON_JWT.path"; }; - settings = mkOption { + settings = lib.mkOption { description = '' Configuration for Erigon Refer to for details on supported values. @@ -52,7 +50,7 @@ in { "log.console.verbosity" = 3; # info }; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' { datadir = "/var/lib/erigon"; chain = "mainnet"; @@ -71,20 +69,20 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # Default values are the same as in the binary, they are just written here for convenience. services.erigon.settings = { - datadir = mkDefault "/var/lib/erigon"; - chain = mkDefault "mainnet"; - http = mkDefault true; - "http.port" = mkDefault 8545; - "http.api" = mkDefault ["eth" "debug" "net" "trace" "web3" "erigon"]; - ws = mkDefault true; - port = mkDefault 30303; - "authrpc.port" = mkDefault 8551; - "torrent.port" = mkDefault 42069; - "private.api.addr" = mkDefault "localhost:9090"; - "log.console.verbosity" = mkDefault 3; # info + datadir = lib.mkDefault "/var/lib/erigon"; + chain = lib.mkDefault "mainnet"; + http = lib.mkDefault true; + "http.port" = lib.mkDefault 8545; + "http.api" = lib.mkDefault ["eth" "debug" "net" "trace" "web3" "erigon"]; + ws = lib.mkDefault true; + port = lib.mkDefault 30303; + "authrpc.port" = lib.mkDefault 8551; + "torrent.port" = lib.mkDefault 42069; + "private.api.addr" = lib.mkDefault "localhost:9090"; + "log.console.verbosity" = lib.mkDefault 3; # info }; systemd.services.erigon = { diff --git a/nixos/modules/services/blockchain/ethereum/geth.nix b/nixos/modules/services/blockchain/ethereum/geth.nix index f2a7e080ada19..52040f2b9ec57 100644 --- a/nixos/modules/services/blockchain/ethereum/geth.nix +++ b/nixos/modules/services/blockchain/ethereum/geth.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let eachGeth = config.services.geth; @@ -11,28 +8,28 @@ let enable = lib.mkEnableOption "Go Ethereum Node"; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 30303; description = "Port number Go Ethereum will be listening on, both TCP and UDP."; }; http = { enable = lib.mkEnableOption "Go Ethereum HTTP API"; - address = mkOption { - type = types.str; + address = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = "Listen address of Go Ethereum HTTP API."; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 8545; description = "Port number of Go Ethereum HTTP API."; }; - apis = mkOption { - type = types.nullOr (types.listOf types.str); + apis = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = null; description = "APIs to enable over WebSocket"; example = ["net" "eth"]; @@ -41,20 +38,20 @@ let websocket = { enable = lib.mkEnableOption "Go Ethereum WebSocket API"; - address = mkOption { - type = types.str; + address = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = "Listen address of Go Ethereum WebSocket API."; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 8546; description = "Port number of Go Ethereum WebSocket API."; }; - apis = mkOption { - type = types.nullOr (types.listOf types.str); + apis = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = null; description = "APIs to enable over WebSocket"; example = ["net" "eth"]; @@ -63,27 +60,27 @@ let authrpc = { enable = lib.mkEnableOption "Go Ethereum Auth RPC API"; - address = mkOption { - type = types.str; + address = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = "Listen address of Go Ethereum Auth RPC API."; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 8551; description = "Port number of Go Ethereum Auth RPC API."; }; - vhosts = mkOption { - type = types.nullOr (types.listOf types.str); + vhosts = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = ["localhost"]; description = "List of virtual hostnames from which to accept requests."; example = ["localhost" "geth.example.org"]; }; - jwtsecret = mkOption { - type = types.str; + jwtsecret = lib.mkOption { + type = lib.types.str; default = ""; description = "Path to a JWT secret for authenticated RPC endpoint."; example = "/var/run/geth/jwtsecret"; @@ -92,50 +89,50 @@ let metrics = { enable = lib.mkEnableOption "Go Ethereum prometheus metrics"; - address = mkOption { - type = types.str; + address = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = "Listen address of Go Ethereum metrics service."; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 6060; description = "Port number of Go Ethereum metrics service."; }; }; - network = mkOption { - type = types.nullOr (types.enum [ "goerli" "rinkeby" "yolov2" "ropsten" ]); + network = lib.mkOption { + type = lib.types.nullOr (lib.types.enum [ "goerli" "holesky" "rinkeby" "yolov2" "ropsten" ]); default = null; description = "The network to connect to. Mainnet (null) is the default ethereum network."; }; - syncmode = mkOption { - type = types.enum [ "snap" "fast" "full" "light" ]; + syncmode = lib.mkOption { + type = lib.types.enum [ "snap" "fast" "full" "light" ]; default = "snap"; description = "Blockchain sync mode."; }; - gcmode = mkOption { - type = types.enum [ "full" "archive" ]; + gcmode = lib.mkOption { + type = lib.types.enum [ "full" "archive" ]; default = "full"; description = "Blockchain garbage collection mode."; }; - maxpeers = mkOption { - type = types.int; + maxpeers = lib.mkOption { + type = lib.types.int; default = 50; description = "Maximum peers to connect to."; }; - extraArgs = mkOption { - type = types.listOf types.str; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "Additional arguments passed to Go Ethereum."; default = []; }; - package = mkPackageOption pkgs [ "go-ethereum" "geth" ] { }; + package = lib.mkPackageOption pkgs [ "go-ethereum" "geth" ] { }; }; }; in @@ -145,8 +142,8 @@ in ###### interface options = { - services.geth = mkOption { - type = types.attrsOf (types.submodule gethOpts); + services.geth = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule gethOpts); default = {}; description = "Specification of one or more geth instances."; }; @@ -154,17 +151,17 @@ in ###### implementation - config = mkIf (eachGeth != {}) { + config = lib.mkIf (eachGeth != {}) { - environment.systemPackages = flatten (mapAttrsToList (gethName: cfg: [ + environment.systemPackages = lib.flatten (lib.mapAttrsToList (gethName: cfg: [ cfg.package ]) eachGeth); - systemd.services = mapAttrs' (gethName: cfg: let + systemd.services = lib.mapAttrs' (gethName: cfg: let stateDir = "goethereum/${gethName}/${if (cfg.network == null) then "mainnet" else cfg.network}"; dataDir = "/var/lib/${stateDir}"; in ( - nameValuePair "geth-${gethName}" (mkIf cfg.enable { + lib.nameValuePair "geth-${gethName}" (lib.mkIf cfg.enable { description = "Go Ethereum node (${gethName})"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; @@ -186,16 +183,16 @@ in ${cfg.package}/bin/geth \ --nousb \ --ipcdisable \ - ${optionalString (cfg.network != null) ''--${cfg.network}''} \ + ${lib.optionalString (cfg.network != null) ''--${cfg.network}''} \ --syncmode ${cfg.syncmode} \ --gcmode ${cfg.gcmode} \ --port ${toString cfg.port} \ --maxpeers ${toString cfg.maxpeers} \ - ${optionalString cfg.http.enable ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}''} \ - ${optionalString (cfg.http.apis != null) ''--http.api ${lib.concatStringsSep "," cfg.http.apis}''} \ - ${optionalString cfg.websocket.enable ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}''} \ - ${optionalString (cfg.websocket.apis != null) ''--ws.api ${lib.concatStringsSep "," cfg.websocket.apis}''} \ - ${optionalString cfg.metrics.enable ''--metrics --metrics.addr ${cfg.metrics.address} --metrics.port ${toString cfg.metrics.port}''} \ + ${lib.optionalString cfg.http.enable ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}''} \ + ${lib.optionalString (cfg.http.apis != null) ''--http.api ${lib.concatStringsSep "," cfg.http.apis}''} \ + ${lib.optionalString cfg.websocket.enable ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}''} \ + ${lib.optionalString (cfg.websocket.apis != null) ''--ws.api ${lib.concatStringsSep "," cfg.websocket.apis}''} \ + ${lib.optionalString cfg.metrics.enable ''--metrics --metrics.addr ${cfg.metrics.address} --metrics.port ${toString cfg.metrics.port}''} \ --authrpc.addr ${cfg.authrpc.address} --authrpc.port ${toString cfg.authrpc.port} --authrpc.vhosts ${lib.concatStringsSep "," cfg.authrpc.vhosts} \ ${if (cfg.authrpc.jwtsecret != "") then ''--authrpc.jwtsecret ${cfg.authrpc.jwtsecret}'' else ''--authrpc.jwtsecret ${dataDir}/geth/jwtsecret''} \ ${lib.escapeShellArgs cfg.extraArgs} \ diff --git a/nixos/modules/services/blockchain/ethereum/lighthouse.nix b/nixos/modules/services/blockchain/ethereum/lighthouse.nix index a5ace1a9450f3..66a762763cb8c 100644 --- a/nixos/modules/services/blockchain/ethereum/lighthouse.nix +++ b/nixos/modules/services/blockchain/ethereum/lighthouse.nix @@ -1,6 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; let cfg = config.services.lighthouse; @@ -8,47 +6,47 @@ in { options = { services.lighthouse = { - beacon = mkOption { + beacon = lib.mkOption { description = "Beacon node"; default = {}; - type = types.submodule { + type = lib.types.submodule { options = { enable = lib.mkEnableOption "Lightouse Beacon node"; - dataDir = mkOption { - type = types.str; + dataDir = lib.mkOption { + type = lib.types.str; default = "/var/lib/lighthouse-beacon"; description = '' Directory where data will be stored. Each chain will be stored under it's own specific subdirectory. ''; }; - address = mkOption { - type = types.str; + address = lib.mkOption { + type = lib.types.str; default = "0.0.0.0"; description = '' Listen address of Beacon node. ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 9000; description = '' Port number the Beacon node will be listening on. ''; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Open the port in the firewall ''; }; - disableDepositContractSync = mkOption { - type = types.bool; + disableDepositContractSync = lib.mkOption { + type = lib.types.bool; default = false; description = '' Explicitly disables syncing of deposit logs from the execution node. @@ -58,24 +56,24 @@ in { }; execution = { - address = mkOption { - type = types.str; + address = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = '' Listen address for the execution layer. ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 8551; description = '' Port number the Beacon node will be listening on for the execution layer. ''; }; - jwtPath = mkOption { - type = types.str; + jwtPath = lib.mkOption { + type = lib.types.str; default = ""; description = '' Path for the jwt secret required to connect to the execution layer. @@ -85,16 +83,16 @@ in { http = { enable = lib.mkEnableOption "Beacon node http api"; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 5052; description = '' Port number of Beacon node RPC service. ''; }; - address = mkOption { - type = types.str; + address = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = '' Listen address of Beacon node RPC service. @@ -104,16 +102,16 @@ in { metrics = { enable = lib.mkEnableOption "Beacon node prometheus metrics"; - address = mkOption { - type = types.str; + address = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = '' Listen address of Beacon node metrics service. ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 5054; description = '' Port number of Beacon node metrics service. @@ -121,8 +119,8 @@ in { }; }; - extraArgs = mkOption { - type = types.str; + extraArgs = lib.mkOption { + type = lib.types.str; description = '' Additional arguments passed to the lighthouse beacon command. ''; @@ -133,27 +131,27 @@ in { }; }; - validator = mkOption { + validator = lib.mkOption { description = "Validator node"; default = {}; - type = types.submodule { + type = lib.types.submodule { options = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable Lightouse Validator node."; }; - dataDir = mkOption { - type = types.str; + dataDir = lib.mkOption { + type = lib.types.str; default = "/var/lib/lighthouse-validator"; description = '' Directory where data will be stored. Each chain will be stored under it's own specific subdirectory. ''; }; - beaconNodes = mkOption { - type = types.listOf types.str; + beaconNodes = lib.mkOption { + type = lib.types.listOf lib.types.str; default = ["http://localhost:5052"]; description = '' Beacon nodes to connect to. @@ -162,16 +160,16 @@ in { metrics = { enable = lib.mkEnableOption "Validator node prometheus metrics"; - address = mkOption { - type = types.str; + address = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = '' Listen address of Validator node metrics service. ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 5056; description = '' Port number of Validator node metrics service. @@ -179,8 +177,8 @@ in { }; }; - extraArgs = mkOption { - type = types.str; + extraArgs = lib.mkOption { + type = lib.types.str; description = '' Additional arguments passed to the lighthouse validator command. ''; @@ -191,16 +189,16 @@ in { }; }; - network = mkOption { - type = types.enum [ "mainnet" "gnosis" "chiado" "sepolia" "holesky" ]; + network = lib.mkOption { + type = lib.types.enum [ "mainnet" "gnosis" "chiado" "sepolia" "holesky" ]; default = "mainnet"; description = '' The network to connect to. Mainnet is the default ethereum network. ''; }; - extraArgs = mkOption { - type = types.str; + extraArgs = lib.mkOption { + type = lib.types.str; description = '' Additional arguments passed to every lighthouse command. ''; @@ -210,17 +208,17 @@ in { }; }; - config = mkIf (cfg.beacon.enable || cfg.validator.enable) { + config = lib.mkIf (cfg.beacon.enable || cfg.validator.enable) { environment.systemPackages = [ pkgs.lighthouse ] ; - networking.firewall = mkIf cfg.beacon.enable { - allowedTCPPorts = mkIf cfg.beacon.openFirewall [ cfg.beacon.port ]; - allowedUDPPorts = mkIf cfg.beacon.openFirewall [ cfg.beacon.port ]; + networking.firewall = lib.mkIf cfg.beacon.enable { + allowedTCPPorts = lib.mkIf cfg.beacon.openFirewall [ cfg.beacon.port ]; + allowedUDPPorts = lib.mkIf cfg.beacon.openFirewall [ cfg.beacon.port ]; }; - systemd.services.lighthouse-beacon = mkIf cfg.beacon.enable { + systemd.services.lighthouse-beacon = lib.mkIf cfg.beacon.enable { description = "Lighthouse beacon node (connect to P2P nodes and verify blocks)"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; @@ -268,7 +266,7 @@ in { }; }; - systemd.services.lighthouse-validator = mkIf cfg.validator.enable { + systemd.services.lighthouse-validator = lib.mkIf cfg.validator.enable { description = "Lighthouse validtor node (manages validators, using data obtained from the beacon node via a HTTP API)"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; @@ -281,7 +279,7 @@ in { --network ${cfg.network} \ --beacon-nodes ${lib.concatStringsSep "," cfg.validator.beaconNodes} \ --datadir ${cfg.validator.dataDir}/${cfg.network} \ - ${optionalString cfg.validator.metrics.enable ''--metrics --metrics-address ${cfg.validator.metrics.address} --metrics-port ${toString cfg.validator.metrics.port}''} \ + ${lib.optionalString cfg.validator.metrics.enable ''--metrics --metrics-address ${cfg.validator.metrics.address} --metrics-port ${toString cfg.validator.metrics.port}''} \ ${cfg.extraArgs} ${cfg.validator.extraArgs} ''; diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 83dfe20671470..2925745c9e094 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -4,8 +4,6 @@ pkgs, ... }: - -with lib; let cfg = config.services.k3s; removeOption = @@ -98,7 +96,7 @@ let } ); - enabledManifests = with builtins; filter (m: m.enable) (attrValues cfg.manifests); + enabledManifests = lib.filter (m: m.enable) (lib.attrValues cfg.manifests); linkManifestEntry = m: "${pkgs.coreutils-full}/bin/ln -sfn ${m.source} ${manifestDir}/${m.target}"; linkImageEntry = image: "${pkgs.coreutils-full}/bin/ln -sfn ${image} ${imageDir}/${image.name}"; linkChartEntry = @@ -132,11 +130,11 @@ in # interface options.services.k3s = { - enable = mkEnableOption "k3s"; + enable = lib.mkEnableOption "k3s"; - package = mkPackageOption pkgs "k3s" { }; + package = lib.mkPackageOption pkgs "k3s" { }; - role = mkOption { + role = lib.mkOption { description = '' Whether k3s should run as a server or agent. @@ -152,14 +150,14 @@ in - `serverAddr` is required. ''; default = "server"; - type = types.enum [ + type = lib.types.enum [ "server" "agent" ]; }; - serverAddr = mkOption { - type = types.str; + serverAddr = lib.mkOption { + type = lib.types.str; description = '' The k3s server to connect to. @@ -171,8 +169,8 @@ in default = ""; }; - clusterInit = mkOption { - type = types.bool; + clusterInit = lib.mkOption { + type = lib.types.bool; default = false; description = '' Initialize HA cluster using an embedded etcd datastore. @@ -193,8 +191,8 @@ in ''; }; - token = mkOption { - type = types.str; + token = lib.mkOption { + type = lib.types.str; description = '' The k3s token to use when connecting to a server. @@ -204,15 +202,15 @@ in default = ""; }; - tokenFile = mkOption { - type = types.nullOr types.path; + tokenFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; description = "File path containing k3s token to use when connecting to the server."; default = null; }; - extraFlags = mkOption { + extraFlags = lib.mkOption { description = "Extra flags to pass to the k3s command."; - type = with types; either str (listOf str); + type = with lib.types; either str (listOf str); default = [ ]; example = [ "--no-deploy traefik" @@ -220,28 +218,28 @@ in ]; }; - disableAgent = mkOption { - type = types.bool; + disableAgent = lib.mkOption { + type = lib.types.bool; default = false; description = "Only run the server. This option only makes sense for a server."; }; - environmentFile = mkOption { - type = types.nullOr types.path; + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; description = '' File path containing environment variables for configuring the k3s service in the format of an EnvironmentFile. See systemd.exec(5). ''; default = null; }; - configPath = mkOption { - type = types.nullOr types.path; + configPath = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = "File path containing the k3s YAML config. This is useful when the config is generated (for example on boot)."; }; - manifests = mkOption { - type = types.attrsOf manifestModule; + manifests = lib.mkOption { + type = lib.types.attrsOf manifestModule; default = { }; example = lib.literalExpression '' deployment.source = ../manifests/deployment.yaml; @@ -328,8 +326,8 @@ in ''; }; - charts = mkOption { - type = with types; attrsOf (either path package); + charts = lib.mkOption { + type = with lib.types; attrsOf (either path package); default = { }; example = lib.literalExpression '' nginx = ../charts/my-nginx-chart.tgz; @@ -346,8 +344,8 @@ in ''; }; - containerdConfigTemplate = mkOption { - type = types.nullOr types.str; + containerdConfigTemplate = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = lib.literalExpression '' # Base K3s config @@ -366,8 +364,8 @@ in ''; }; - images = mkOption { - type = with types; listOf package; + images = lib.mkOption { + type = with lib.types; listOf package; default = [ ]; example = lib.literalExpression '' [ @@ -440,7 +438,7 @@ in # implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { warnings = (lib.optional (cfg.role != "server" && cfg.manifests != { }) "k3s: Auto deploying manifests are only installed on server nodes (role == server), they will be ignored by this node." @@ -500,7 +498,7 @@ in "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - path = optional config.boot.zfs.enabled config.boot.zfs.package; + path = lib.optional config.boot.zfs.enabled config.boot.zfs.package; serviceConfig = { # See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197 Type = if cfg.role == "agent" then "exec" else "notify"; @@ -514,15 +512,15 @@ in TasksMax = "infinity"; EnvironmentFile = cfg.environmentFile; ExecStartPre = activateK3sContent; - ExecStart = concatStringsSep " \\\n " ( + ExecStart = lib.concatStringsSep " \\\n " ( [ "${cfg.package}/bin/k3s ${cfg.role}" ] - ++ (optional cfg.clusterInit "--cluster-init") - ++ (optional cfg.disableAgent "--disable-agent") - ++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}") - ++ (optional (cfg.token != "") "--token ${cfg.token}") - ++ (optional (cfg.tokenFile != null) "--token-file ${cfg.tokenFile}") - ++ (optional (cfg.configPath != null) "--config ${cfg.configPath}") - ++ (optional (kubeletParams != { }) "--kubelet-arg=config=${kubeletConfig}") + ++ (lib.optional cfg.clusterInit "--cluster-init") + ++ (lib.optional cfg.disableAgent "--disable-agent") + ++ (lib.optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}") + ++ (lib.optional (cfg.token != "") "--token ${cfg.token}") + ++ (lib.optional (cfg.tokenFile != null) "--token-file ${cfg.tokenFile}") + ++ (lib.optional (cfg.configPath != null) "--config ${cfg.configPath}") + ++ (lib.optional (kubeletParams != { }) "--kubelet-arg=config=${kubeletConfig}") ++ (lib.flatten cfg.extraFlags) ); }; diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix index f180035270641..485c6f8e2b5fe 100644 --- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -1,7 +1,4 @@ { config, options, pkgs, lib, ... }: - -with lib; - let version = "1.10.1"; cfg = config.services.kubernetes.addons.dns; @@ -12,37 +9,37 @@ let }; in { options.services.kubernetes.addons.dns = { - enable = mkEnableOption "kubernetes dns addon"; + enable = lib.mkEnableOption "kubernetes dns addon"; - clusterIp = mkOption { + clusterIp = lib.mkOption { description = "Dns addon clusterIP"; # this default is also what kubernetes users default = ( - concatStringsSep "." ( - take 3 (splitString "." config.services.kubernetes.apiserver.serviceClusterIpRange + lib.concatStringsSep "." ( + lib.take 3 (lib.splitString "." config.services.kubernetes.apiserver.serviceClusterIpRange )) ) + ".254"; - defaultText = literalMD '' + defaultText = lib.literalMD '' The `x.y.z.254` IP of `config.${options.services.kubernetes.apiserver.serviceClusterIpRange}`. ''; - type = types.str; + type = lib.types.str; }; - clusterDomain = mkOption { + clusterDomain = lib.mkOption { description = "Dns cluster domain"; default = "cluster.local"; - type = types.str; + type = lib.types.str; }; - replicas = mkOption { + replicas = lib.mkOption { description = "Number of DNS pod replicas to deploy in the cluster."; default = 2; - type = types.int; + type = lib.types.int; }; - reconcileMode = mkOption { + reconcileMode = lib.mkOption { description = '' Controls the addon manager reconciliation mode for the DNS addon. @@ -51,12 +48,12 @@ in { See: . ''; default = "Reconcile"; - type = types.enum [ "Reconcile" "EnsureExists" ]; + type = lib.types.enum [ "Reconcile" "EnsureExists" ]; }; - coredns = mkOption { + coredns = lib.mkOption { description = "Docker image to seed for the CoreDNS container."; - type = types.attrs; + type = lib.types.attrs; default = { imageName = "coredns/coredns"; imageDigest = "sha256:a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e"; @@ -65,13 +62,13 @@ in { }; }; - corefile = mkOption { + corefile = lib.mkOption { description = '' Custom coredns corefile configuration. See: . ''; - type = types.str; + type = lib.types.str; default = '' .:${toString ports.dns} { errors @@ -87,7 +84,7 @@ in { reload loadbalance }''; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' ''' .:${toString ports.dns} { errors @@ -108,9 +105,9 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.kubernetes.kubelet.seedDockerImages = - singleton (pkgs.dockerTools.pullImage cfg.coredns); + lib.singleton (pkgs.dockerTools.pullImage cfg.coredns); services.kubernetes.addonManager.bootstrapAddons = { coredns-cr = { @@ -366,7 +363,7 @@ in { }; }; - services.kubernetes.kubelet.clusterDns = mkDefault cfg.clusterIp; + services.kubernetes.kubelet.clusterDns = lib.mkDefault [ cfg.clusterIp ]; }; meta.buildDocsInSandbox = false; diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index fd9df556e7ec2..8fa820ac44e9e 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -64,8 +64,9 @@ let } // lib.optionalAttrs (cfg.tlsCertFile != null) { tlsCertFile = cfg.tlsCertFile; } // lib.optionalAttrs (cfg.tlsKeyFile != null) { tlsPrivateKeyFile = cfg.tlsKeyFile; } // lib.optionalAttrs (cfg.clusterDomain != "") { clusterDomain = cfg.clusterDomain; } - // lib.optionalAttrs (cfg.clusterDns != "") { clusterDNS = [ cfg.clusterDns ] ; } + // lib.optionalAttrs (cfg.clusterDns != []) { clusterDNS = cfg.clusterDns; } // lib.optionalAttrs (cfg.featureGates != {}) { featureGates = cfg.featureGates; } + // lib.optionalAttrs (cfg.extraConfig != {}) cfg.extraConfig )); manifestPath = "kubernetes/manifests"; @@ -112,8 +113,8 @@ in clusterDns = mkOption { description = "Use alternative DNS."; - default = "10.1.0.1"; - type = str; + default = [ "10.1.0.1" ]; + type = listOf str; }; clusterDomain = mkOption { @@ -184,6 +185,12 @@ in type = separatedString " "; }; + extraConfig = mkOption { + description = "Kubernetes kubelet extra configuration file entries."; + default = {}; + type = attrsOf attrs; + }; + featureGates = mkOption { description = "Attribute set of feature gate"; default = top.featureGates; diff --git a/nixos/modules/services/cluster/pacemaker/default.nix b/nixos/modules/services/cluster/pacemaker/default.nix index 005a952e80254..92cd9311eb7d5 100644 --- a/nixos/modules/services/cluster/pacemaker/default.nix +++ b/nixos/modules/services/cluster/pacemaker/default.nix @@ -1,19 +1,17 @@ { config, lib, pkgs, ... }: - -with lib; let cfg = config.services.pacemaker; in { # interface options.services.pacemaker = { - enable = mkEnableOption "pacemaker"; + enable = lib.mkEnableOption "pacemaker"; - package = mkPackageOption pkgs "pacemaker" { }; + package = lib.mkPackageOption pkgs "pacemaker" { }; }; # implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = config.services.corosync.enable; message = '' diff --git a/nixos/modules/services/cluster/patroni/default.nix b/nixos/modules/services/cluster/patroni/default.nix index 3b563bb89fffb..91eb9214a60e4 100644 --- a/nixos/modules/services/cluster/patroni/default.nix +++ b/nixos/modules/services/cluster/patroni/default.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.services.patroni; defaultUser = "patroni"; @@ -21,20 +20,20 @@ in options.services.patroni = { - enable = mkEnableOption "Patroni"; + enable = lib.mkEnableOption "Patroni"; - postgresqlPackage = mkOption { - type = types.package; - example = literalExpression "pkgs.postgresql_14"; + postgresqlPackage = lib.mkOption { + type = lib.types.package; + example = lib.literalExpression "pkgs.postgresql_14"; description = '' PostgreSQL package to use. Plugins can be enabled like this `pkgs.postgresql_14.withPackages (p: [ p.pg_safeupdate p.postgis ])`. ''; }; - postgresqlDataDir = mkOption { - type = types.path; - defaultText = literalExpression ''"/var/lib/postgresql/''${config.services.patroni.postgresqlPackage.psqlSchema}"''; + postgresqlDataDir = lib.mkOption { + type = lib.types.path; + defaultText = lib.literalExpression ''"/var/lib/postgresql/''${config.services.patroni.postgresqlPackage.psqlSchema}"''; example = "/var/lib/postgresql/14"; default = "/var/lib/postgresql/${cfg.postgresqlPackage.psqlSchema}"; description = '' @@ -45,16 +44,16 @@ in ''; }; - postgresqlPort = mkOption { - type = types.port; + postgresqlPort = lib.mkOption { + type = lib.types.port; default = 5432; description = '' The port on which PostgreSQL listens. ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = defaultUser; example = "postgres"; description = '' @@ -63,8 +62,8 @@ in ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = defaultGroup; example = "postgres"; description = '' @@ -73,64 +72,64 @@ in ''; }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/patroni"; description = '' Folder where Patroni data will be written, this is where the pgpass password file will be written. ''; }; - scope = mkOption { - type = types.str; + scope = lib.mkOption { + type = lib.types.str; example = "cluster1"; description = '' Cluster name. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; example = "node1"; description = '' The name of the host. Must be unique for the cluster. ''; }; - namespace = mkOption { - type = types.str; + namespace = lib.mkOption { + type = lib.types.str; default = "/service"; description = '' Path within the configuration store where Patroni will keep information about the cluster. ''; }; - nodeIp = mkOption { - type = types.str; + nodeIp = lib.mkOption { + type = lib.types.str; example = "192.168.1.1"; description = '' IP address of this node. ''; }; - otherNodesIps = mkOption { - type = types.listOf types.str; + otherNodesIps = lib.mkOption { + type = lib.types.listOf lib.types.str; example = [ "192.168.1.2" "192.168.1.3" ]; description = '' IP addresses of the other nodes. ''; }; - restApiPort = mkOption { - type = types.port; + restApiPort = lib.mkOption { + type = lib.types.port; default = 8008; description = '' The port on Patroni's REST api listens. ''; }; - softwareWatchdog = mkOption { - type = types.bool; + softwareWatchdog = lib.mkOption { + type = lib.types.bool; default = false; description = '' This will configure Patroni to use the software watchdog built into the Linux kernel @@ -138,7 +137,7 @@ in ''; }; - settings = mkOption { + settings = lib.mkOption { type = format.type; default = { }; description = '' @@ -148,8 +147,8 @@ in ''; }; - environmentFiles = mkOption { - type = with types; attrsOf (nullOr (oneOf [ str path package ])); + environmentFiles = lib.mkOption { + type = with lib.types; attrsOf (nullOr (oneOf [ str path package ])); default = { }; example = { PATRONI_REPLICATION_PASSWORD = "/secret/file"; @@ -159,7 +158,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.patroni.settings = { scope = cfg.scope; @@ -179,7 +178,7 @@ in pgpass = "${cfg.dataDir}/pgpass"; }; - watchdog = mkIf cfg.softwareWatchdog { + watchdog = lib.mkIf cfg.softwareWatchdog { mode = "required"; device = "/dev/watchdog"; safety_margin = 5; @@ -188,13 +187,13 @@ in users = { - users = mkIf (cfg.user == defaultUser) { + users = lib.mkIf (cfg.user == defaultUser) { patroni = { group = cfg.group; isSystemUser = true; }; }; - groups = mkIf (cfg.group == defaultGroup) { + groups = lib.mkIf (cfg.group == defaultGroup) { patroni = { }; }; }; @@ -207,11 +206,11 @@ in after = [ "network.target" ]; script = '' - ${concatStringsSep "\n" (attrValues (mapAttrs (name: path: ''export ${name}="$(< ${escapeShellArg path})"'') cfg.environmentFiles))} + ${lib.concatStringsSep "\n" (lib.attrValues (lib.mapAttrs (name: path: ''export ${name}="$(< ${lib.escapeShellArg path})"'') cfg.environmentFiles))} exec ${pkgs.patroni}/bin/patroni ${configFile} ''; - serviceConfig = mkMerge [ + serviceConfig = lib.mkMerge [ { User = cfg.user; Group = cfg.group; @@ -221,7 +220,7 @@ in ExecReload = "${pkgs.coreutils}/bin/kill -s HUP $MAINPID"; KillMode = "process"; } - (mkIf (cfg.postgresqlDataDir == "/var/lib/postgresql/${cfg.postgresqlPackage.psqlSchema}" && cfg.dataDir == "/var/lib/patroni") { + (lib.mkIf (cfg.postgresqlDataDir == "/var/lib/postgresql/${cfg.postgresqlPackage.psqlSchema}" && cfg.dataDir == "/var/lib/patroni") { StateDirectory = "patroni postgresql postgresql/${cfg.postgresqlPackage.psqlSchema}"; StateDirectoryMode = "0750"; }) @@ -229,9 +228,9 @@ in }; }; - boot.kernelModules = mkIf cfg.softwareWatchdog [ "softdog" ]; + boot.kernelModules = lib.mkIf cfg.softwareWatchdog [ "softdog" ]; - services.udev.extraRules = mkIf cfg.softwareWatchdog '' + services.udev.extraRules = lib.mkIf cfg.softwareWatchdog '' KERNEL=="watchdog", OWNER="${cfg.user}", GROUP="${cfg.group}", MODE="0600" ''; @@ -247,5 +246,5 @@ in }; }; - meta.maintainers = [ maintainers.phfroidmont ]; + meta.maintainers = [ lib.maintainers.phfroidmont ]; } diff --git a/nixos/modules/services/cluster/rke2/default.nix b/nixos/modules/services/cluster/rke2/default.nix index 51b849ebcc802..2e6816f43374f 100644 --- a/nixos/modules/services/cluster/rke2/default.nix +++ b/nixos/modules/services/cluster/rke2/default.nix @@ -1,6 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; let cfg = config.services.rke2; in @@ -8,12 +6,12 @@ in imports = [ ]; options.services.rke2 = { - enable = mkEnableOption "rke2"; + enable = lib.mkEnableOption "rke2"; - package = mkPackageOption pkgs "rke2" { }; + package = lib.mkPackageOption pkgs "rke2" { }; - role = mkOption { - type = types.enum [ "server" "agent" ]; + role = lib.mkOption { + type = lib.types.enum [ "server" "agent" ]; description = '' Whether rke2 should run as a server or agent. @@ -31,26 +29,26 @@ in default = "server"; }; - configPath = mkOption { - type = types.path; + configPath = lib.mkOption { + type = lib.types.path; description = "Load configuration from FILE."; default = "/etc/rancher/rke2/config.yaml"; }; - debug = mkOption { - type = types.bool; + debug = lib.mkOption { + type = lib.types.bool; description = "Turn on debug logs."; default = false; }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; description = "The folder to hold state in."; default = "/var/lib/rancher/rke2"; }; - token = mkOption { - type = types.str; + token = lib.mkOption { + type = lib.types.str; description = '' Shared secret used to join a server or agent to a cluster. @@ -60,44 +58,44 @@ in default = ""; }; - tokenFile = mkOption { - type = types.nullOr types.path; + tokenFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; description = "File path containing rke2 token to use when connecting to the server."; default = null; }; - disable = mkOption { - type = types.listOf types.str; + disable = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "Do not deploy packaged components and delete any deployed components."; default = [ ]; }; - nodeName = mkOption { - type = types.nullOr types.str; + nodeName = lib.mkOption { + type = lib.types.nullOr lib.types.str; description = "Node name."; default = null; }; - nodeLabel = mkOption { - type = types.listOf types.str; + nodeLabel = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "Registering and starting kubelet with set of labels."; default = [ ]; }; - nodeTaint = mkOption { - type = types.listOf types.str; + nodeTaint = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "Registering kubelet with set of taints."; default = [ ]; }; - nodeIP = mkOption { - type = types.nullOr types.str; + nodeIP = lib.mkOption { + type = lib.types.nullOr lib.types.str; description = "IPv4/IPv6 addresses to advertise for node."; default = null; }; - agentToken = mkOption { - type = types.str; + agentToken = lib.mkOption { + type = lib.types.str; description = '' Shared secret used to join agents to the cluster, but not servers. @@ -107,27 +105,27 @@ in default = ""; }; - agentTokenFile = mkOption { - type = types.nullOr types.path; + agentTokenFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; description = "File path containing rke2 agent token to use when connecting to the server."; default = null; }; - serverAddr = mkOption { - type = types.str; + serverAddr = lib.mkOption { + type = lib.types.str; description = "The rke2 server to connect to, used to join a cluster."; example = "https://10.0.0.10:6443"; default = ""; }; - selinux = mkOption { - type = types.bool; + selinux = lib.mkOption { + type = lib.types.bool; description = "Enable SELinux in containerd."; default = false; }; - cni = mkOption { - type = types.enum [ "none" "canal" "cilium" "calico" "flannel" ]; + cni = lib.mkOption { + type = lib.types.enum [ "none" "canal" "cilium" "calico" "flannel" ]; description = '' CNI Plugins to deploy, one of `none`, `calico`, `canal`, `cilium` or `flannel`. @@ -141,8 +139,8 @@ in default = "canal"; }; - cisHardening = mkOption { - type = types.bool; + cisHardening = lib.mkOption { + type = lib.types.bool; description = '' Enable CIS Hardening for RKE2. @@ -162,8 +160,8 @@ in default = false; }; - extraFlags = mkOption { - type = types.listOf types.str; + extraFlags = lib.mkOption { + type = lib.types.listOf lib.types.str; description = '' Extra flags to pass to the rke2 service/agent. @@ -176,8 +174,8 @@ in default = [ ]; }; - environmentVars = mkOption { - type = types.attrsOf types.str; + environmentVars = lib.mkOption { + type = lib.types.attrsOf lib.types.str; description = '' Environment variables for configuring the rke2 service/agent. @@ -199,7 +197,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = cfg.role == "agent" -> (builtins.pathExists cfg.configPath || cfg.serverAddr != ""); @@ -234,7 +232,7 @@ in ''; }; # See: https://docs.rke2.io/security/hardening_guide#set-kernel-parameters - boot.kernel.sysctl = mkIf cfg.cisHardening { + boot.kernel.sysctl = lib.mkIf cfg.cisHardening { "vm.panic_on_oom" = 0; "vm.overcommit_memory" = 1; "kernel.panic" = 10; @@ -254,7 +252,7 @@ in "-/etc/sysconfig/%N" "-/usr/local/lib/systemd/system/%N.env" ]; - Environment = mapAttrsToList (k: v: "${k}=${v}") cfg.environmentVars; + Environment = lib.mapAttrsToList (k: v: "${k}=${v}") cfg.environmentVars; KillMode = "process"; Delegate = "yes"; LimitNOFILE = 1048576; @@ -277,23 +275,23 @@ in "-${pkgs.kmod}/bin/modprobe br_netfilter" "-${pkgs.kmod}/bin/modprobe overlay" ]; - ExecStart = "${cfg.package}/bin/rke2 '${cfg.role}' ${escapeShellArgs ( - (optional (cfg.configPath != "/etc/rancher/rke2/config.yaml") "--config=${cfg.configPath}") - ++ (optional cfg.debug "--debug") - ++ (optional (cfg.dataDir != "/var/lib/rancher/rke2") "--data-dir=${cfg.dataDir}") - ++ (optional (cfg.token != "") "--token=${cfg.token}") - ++ (optional (cfg.tokenFile != null) "--token-file=${cfg.tokenFile}") - ++ (optionals (cfg.role == "server" && cfg.disable != [ ]) (map (d: "--disable=${d}") cfg.disable)) - ++ (optional (cfg.nodeName != null) "--node-name=${cfg.nodeName}") - ++ (optionals (cfg.nodeLabel != [ ]) (map (l: "--node-label=${l}") cfg.nodeLabel)) - ++ (optionals (cfg.nodeTaint != [ ]) (map (t: "--node-taint=${t}") cfg.nodeTaint)) - ++ (optional (cfg.nodeIP != null) "--node-ip=${cfg.nodeIP}") - ++ (optional (cfg.role == "server" && cfg.agentToken != "") "--agent-token=${cfg.agentToken}") - ++ (optional (cfg.role == "server" && cfg.agentTokenFile != null) "--agent-token-file=${cfg.agentTokenFile}") - ++ (optional (cfg.serverAddr != "") "--server=${cfg.serverAddr}") - ++ (optional cfg.selinux "--selinux") - ++ (optional (cfg.role == "server" && cfg.cni != "canal") "--cni=${cfg.cni}") - ++ (optional cfg.cisHardening "--profile=${if cfg.package.version >= "1.25" then "cis-1.23" else "cis-1.6"}") + ExecStart = "${cfg.package}/bin/rke2 '${cfg.role}' ${lib.escapeShellArgs ( + (lib.optional (cfg.configPath != "/etc/rancher/rke2/config.yaml") "--config=${cfg.configPath}") + ++ (lib.optional cfg.debug "--debug") + ++ (lib.optional (cfg.dataDir != "/var/lib/rancher/rke2") "--data-dir=${cfg.dataDir}") + ++ (lib.optional (cfg.token != "") "--token=${cfg.token}") + ++ (lib.optional (cfg.tokenFile != null) "--token-file=${cfg.tokenFile}") + ++ (lib.optionals (cfg.role == "server" && cfg.disable != [ ]) (map (d: "--disable=${d}") cfg.disable)) + ++ (lib.optional (cfg.nodeName != null) "--node-name=${cfg.nodeName}") + ++ (lib.optionals (cfg.nodeLabel != [ ]) (map (l: "--node-label=${l}") cfg.nodeLabel)) + ++ (lib.optionals (cfg.nodeTaint != [ ]) (map (t: "--node-taint=${t}") cfg.nodeTaint)) + ++ (lib.optional (cfg.nodeIP != null) "--node-ip=${cfg.nodeIP}") + ++ (lib.optional (cfg.role == "server" && cfg.agentToken != "") "--agent-token=${cfg.agentToken}") + ++ (lib.optional (cfg.role == "server" && cfg.agentTokenFile != null) "--agent-token-file=${cfg.agentTokenFile}") + ++ (lib.optional (cfg.serverAddr != "") "--server=${cfg.serverAddr}") + ++ (lib.optional cfg.selinux "--selinux") + ++ (lib.optional (cfg.role == "server" && cfg.cni != "canal") "--cni=${cfg.cni}") + ++ (lib.optional cfg.cisHardening "--profile=${if cfg.package.version >= "1.25" then "cis-1.23" else "cis-1.6"}") ++ cfg.extraFlags )}"; ExecStopPost = let diff --git a/nixos/modules/services/cluster/spark/default.nix b/nixos/modules/services/cluster/spark/default.nix index 7a3f768471c21..c4ebd34243928 100644 --- a/nixos/modules/services/cluster/spark/default.nix +++ b/nixos/modules/services/cluster/spark/default.nix @@ -2,20 +2,19 @@ let cfg = config.services.spark; in -with lib; { options = { services.spark = { master = { - enable = mkEnableOption "Spark master service"; - bind = mkOption { - type = types.str; + enable = lib.mkEnableOption "Spark master service"; + bind = lib.mkOption { + type = lib.types.str; description = "Address the spark master binds to."; default = "127.0.0.1"; example = "0.0.0.0"; }; - restartIfChanged = mkOption { - type = types.bool; + restartIfChanged = lib.mkOption { + type = lib.types.bool; description = '' Automatically restart master service on config change. This can be set to false to defer restarts on clusters running critical applications. @@ -24,8 +23,8 @@ with lib; ''; default = true; }; - extraEnvironment = mkOption { - type = types.attrsOf types.str; + extraEnvironment = lib.mkOption { + type = lib.types.attrsOf lib.types.str; description = "Extra environment variables to pass to spark master. See spark-standalone documentation."; default = {}; example = { @@ -35,19 +34,19 @@ with lib; }; }; worker = { - enable = mkEnableOption "Spark worker service"; - workDir = mkOption { - type = types.path; + enable = lib.mkEnableOption "Spark worker service"; + workDir = lib.mkOption { + type = lib.types.path; description = "Spark worker work dir."; default = "/var/lib/spark"; }; - master = mkOption { - type = types.str; + master = lib.mkOption { + type = lib.types.str; description = "Address of the spark master."; default = "127.0.0.1:7077"; }; - restartIfChanged = mkOption { - type = types.bool; + restartIfChanged = lib.mkOption { + type = lib.types.bool; description = '' Automatically restart worker service on config change. This can be set to false to defer restarts on clusters running critical applications. @@ -56,8 +55,8 @@ with lib; ''; default = true; }; - extraEnvironment = mkOption { - type = types.attrsOf types.str; + extraEnvironment = lib.mkOption { + type = lib.types.attrsOf lib.types.str; description = "Extra environment variables to pass to spark worker."; default = {}; example = { @@ -66,18 +65,18 @@ with lib; }; }; }; - confDir = mkOption { - type = types.path; + confDir = lib.mkOption { + type = lib.types.path; description = "Spark configuration directory. Spark will use the configuration files (spark-defaults.conf, spark-env.sh, log4j.properties, etc) from this directory."; default = "${cfg.package}/conf"; - defaultText = literalExpression ''"''${package}/conf"''; + defaultText = lib.literalExpression ''"''${package}/conf"''; }; - logDir = mkOption { - type = types.path; + logDir = lib.mkOption { + type = lib.types.path; description = "Spark log directory."; default = "/var/log/spark"; }; - package = mkPackageOption pkgs "spark" { + package = lib.mkPackageOption pkgs "spark" { example = '' spark.overrideAttrs (super: rec { pname = "spark"; diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix index f5d7ab8d8cb25..01608d33d8d1d 100644 --- a/nixos/modules/services/computing/boinc/client.nix +++ b/nixos/modules/services/computing/boinc/client.nix @@ -1,10 +1,7 @@ {config, lib, pkgs, ...}: - -with lib; - let cfg = config.services.boinc; - allowRemoteGuiRpcFlag = optionalString cfg.allowRemoteGuiRpc "--allow_remote_gui_rpc"; + allowRemoteGuiRpcFlag = lib.optionalString cfg.allowRemoteGuiRpc "--allow_remote_gui_rpc"; fhsEnv = pkgs.buildFHSEnv { name = "boinc-fhs-env"; @@ -16,8 +13,8 @@ let in { options.services.boinc = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable the BOINC distributed computing client. If this @@ -27,20 +24,20 @@ in ''; }; - package = mkPackageOption pkgs "boinc" { + package = lib.mkPackageOption pkgs "boinc" { example = "boinc-headless"; }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/boinc"; description = '' The directory in which to store BOINC's configuration and data files. ''; }; - allowRemoteGuiRpc = mkOption { - type = types.bool; + allowRemoteGuiRpc = lib.mkOption { + type = lib.types.bool; default = false; description = '' If set to true, any remote host can connect to and control this BOINC @@ -52,10 +49,10 @@ in ''; }; - extraEnvPackages = mkOption { - type = types.listOf types.package; + extraEnvPackages = lib.mkOption { + type = lib.types.listOf lib.types.package; default = []; - example = literalExpression "[ pkgs.virtualbox ]"; + example = lib.literalExpression "[ pkgs.virtualbox ]"; description = '' Additional packages to make available in the environment in which BOINC will run. Common choices are: @@ -77,7 +74,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [cfg.package]; users.users.boinc = { @@ -108,6 +105,6 @@ in }; meta = { - maintainers = with lib.maintainers; [kierdavis]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixos/modules/services/computing/foldingathome/client.nix b/nixos/modules/services/computing/foldingathome/client.nix index 8d330fd8717be..71fc58669d33b 100644 --- a/nixos/modules/services/computing/foldingathome/client.nix +++ b/nixos/modules/services/computing/foldingathome/client.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.services.foldingathome; @@ -11,19 +10,19 @@ let in { imports = [ - (mkRenamedOptionModule [ "services" "foldingAtHome" ] [ "services" "foldingathome" ]) - (mkRenamedOptionModule [ "services" "foldingathome" "nickname" ] [ "services" "foldingathome" "user" ]) - (mkRemovedOptionModule [ "services" "foldingathome" "config" ] '' + (lib.mkRenamedOptionModule [ "services" "foldingAtHome" ] [ "services" "foldingathome" ]) + (lib.mkRenamedOptionModule [ "services" "foldingathome" "nickname" ] [ "services" "foldingathome" "user" ]) + (lib.mkRemovedOptionModule [ "services" "foldingathome" "config" ] '' Use services.foldingathome.extraArgs instead '') ]; options.services.foldingathome = { - enable = mkEnableOption "Folding@home client"; + enable = lib.mkEnableOption "Folding@home client"; - package = mkPackageOption pkgs "fahclient" { }; + package = lib.mkPackageOption pkgs "fahclient" { }; - user = mkOption { - type = types.nullOr types.str; + user = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' The user associated with the reported computation results. This will @@ -31,8 +30,8 @@ in ''; }; - team = mkOption { - type = types.int; + team = lib.mkOption { + type = lib.types.int; default = 236565; description = '' The team ID associated with the reported computation results. This @@ -42,8 +41,8 @@ in ''; }; - daemonNiceLevel = mkOption { - type = types.ints.between (-20) 19; + daemonNiceLevel = lib.mkOption { + type = lib.types.ints.between (-20) 19; default = 0; description = '' Daemon process priority for FAHClient. @@ -51,8 +50,8 @@ in ''; }; - extraArgs = mkOption { - type = types.listOf types.str; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = '' Extra startup options for the FAHClient. Run @@ -61,7 +60,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.foldingathome = { description = "Folding@home client"; after = [ "network.target" ]; diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 360a72677ce06..f4944d3ce3186 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -1,7 +1,4 @@ { config, lib, options, pkgs, ... }: - -with lib; - let cfg = config.services.slurm; @@ -15,8 +12,8 @@ let ClusterName=${cfg.clusterName} StateSaveLocation=${cfg.stateSaveLocation} SlurmUser=${cfg.user} - ${optionalString (cfg.controlMachine != null) "controlMachine=${cfg.controlMachine}"} - ${optionalString (cfg.controlAddr != null) "controlAddr=${cfg.controlAddr}"} + ${lib.optionalString (cfg.controlMachine != null) "controlMachine=${cfg.controlMachine}"} + ${lib.optionalString (cfg.controlAddr != null) "controlAddr=${cfg.controlAddr}"} ${toString (map (x: "NodeName=${x}\n") cfg.nodeName)} ${toString (map (x: "PartitionName=${x}\n") cfg.partitionName)} PlugStackConfig=${plugStackConfig}/plugstack.conf @@ -26,7 +23,7 @@ let plugStackConfig = pkgs.writeTextDir "plugstack.conf" '' - ${optionalString cfg.enableSrunX11 "optional ${pkgs.slurm-spank-x11}/lib/x11.so"} + ${lib.optionalString cfg.enableSrunX11 "optional ${pkgs.slurm-spank-x11}/lib/x11.so"} ${cfg.extraPlugstackConfig} ''; @@ -56,15 +53,15 @@ in ###### interface - meta.maintainers = [ maintainers.markuskowa ]; + meta.maintainers = [ lib.maintainers.markuskowa ]; options = { services.slurm = { server = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable the slurm control daemon. @@ -76,29 +73,29 @@ in }; dbdserver = { - enable = mkEnableOption "SlurmDBD service"; + enable = lib.mkEnableOption "SlurmDBD service"; - dbdHost = mkOption { - type = types.str; + dbdHost = lib.mkOption { + type = lib.types.str; default = config.networking.hostName; - defaultText = literalExpression "config.networking.hostName"; + defaultText = lib.literalExpression "config.networking.hostName"; description = '' Hostname of the machine where `slurmdbd` is running (i.e. name returned by `hostname -s`). ''; }; - storageUser = mkOption { - type = types.str; + storageUser = lib.mkOption { + type = lib.types.str; default = cfg.user; - defaultText = literalExpression "config.${opt.user}"; + defaultText = lib.literalExpression "config.${opt.user}"; description = '' Database user name. ''; }; - storagePassFile = mkOption { - type = with types; nullOr str; + storagePassFile = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' Path to file with database password. The content of this will be used to @@ -106,8 +103,8 @@ in ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra configuration for `slurmdbd.conf` See also: @@ -117,11 +114,11 @@ in }; client = { - enable = mkEnableOption "slurm client daemon"; + enable = lib.mkEnableOption "slurm client daemon"; }; - enableStools = mkOption { - type = types.bool; + enableStools = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to provide a slurm.conf file. @@ -131,14 +128,14 @@ in ''; }; - package = mkPackageOption pkgs "slurm" { + package = lib.mkPackageOption pkgs "slurm" { example = "slurm-full"; } // { default = pkgs.slurm.override { enableX11 = ! cfg.enableSrunX11; }; }; - controlMachine = mkOption { - type = types.nullOr types.str; + controlMachine = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = null; description = '' @@ -148,10 +145,10 @@ in ''; }; - controlAddr = mkOption { - type = types.nullOr types.str; + controlAddr = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = cfg.controlMachine; - defaultText = literalExpression "config.${opt.controlMachine}"; + defaultText = lib.literalExpression "config.${opt.controlMachine}"; example = null; description = '' Name that ControlMachine should be referred to in establishing a @@ -159,8 +156,8 @@ in ''; }; - clusterName = mkOption { - type = types.str; + clusterName = lib.mkOption { + type = lib.types.str; default = "default"; example = "myCluster"; description = '' @@ -168,10 +165,10 @@ in ''; }; - nodeName = mkOption { - type = types.listOf types.str; + nodeName = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; - example = literalExpression ''[ "linux[1-32] CPUs=1 State=UNKNOWN" ];''; + example = lib.literalExpression ''[ "linux[1-32] CPUs=1 State=UNKNOWN" ];''; description = '' Name that SLURM uses to refer to a node (or base partition for BlueGene systems). Typically this would be the string that "/bin/hostname -s" @@ -179,19 +176,19 @@ in ''; }; - partitionName = mkOption { - type = types.listOf types.str; + partitionName = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; - example = literalExpression ''[ "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP" ];''; + example = lib.literalExpression ''[ "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP" ];''; description = '' Name by which the partition may be referenced. Note that now you have to write the partition's parameters after the name. ''; }; - enableSrunX11 = mkOption { + enableSrunX11 = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' If enabled srun will accept the option "--x11" to allow for X11 forwarding from within an interactive session or a batch job. This activates the @@ -207,8 +204,8 @@ in ''; }; - procTrackType = mkOption { - type = types.str; + procTrackType = lib.mkOption { + type = lib.types.str; default = "proctrack/linuxproc"; description = '' Plugin to be used for process tracking on a job step basis. @@ -217,16 +214,16 @@ in ''; }; - stateSaveLocation = mkOption { - type = types.str; + stateSaveLocation = lib.mkOption { + type = lib.types.str; default = "/var/spool/slurmctld"; description = '' Directory into which the Slurm controller, slurmctld, saves its state. ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = defaultUser; description = '' Set this option when you want to run the slurmctld daemon @@ -236,34 +233,34 @@ in ''; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; description = '' Extra configuration options that will be added verbatim at the end of the slurm configuration file. ''; }; - extraPlugstackConfig = mkOption { + extraPlugstackConfig = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; description = '' Extra configuration that will be added to the end of `plugstack.conf`. ''; }; - extraCgroupConfig = mkOption { + extraCgroupConfig = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; description = '' Extra configuration for `cgroup.conf`. This file is used when `procTrackType=proctrack/cgroup`. ''; }; - extraConfigPaths = mkOption { - type = with types; listOf path; + extraConfigPaths = lib.mkOption { + type = with lib.types; listOf path; default = []; description = '' Slurm expects config files for plugins in the same path @@ -273,11 +270,11 @@ in ''; }; - etcSlurm = mkOption { - type = types.path; + etcSlurm = lib.mkOption { + type = lib.types.path; internal = true; default = etcSlurm; - defaultText = literalMD '' + defaultText = lib.literalMD '' Directory created from generated config files and `config.${opt.extraConfigPaths}`. ''; @@ -292,11 +289,11 @@ in }; imports = [ - (mkRemovedOptionModule [ "services" "slurm" "dbdserver" "storagePass" ] '' + (lib.mkRemovedOptionModule [ "services" "slurm" "dbdserver" "storagePass" ] '' This option has been removed so that the database password is not exposed via the nix store. Use services.slurm.dbdserver.storagePassFile to provide the database password. '') - (mkRemovedOptionModule [ "services" "slurm" "dbdserver" "configFile" ] '' + (lib.mkRemovedOptionModule [ "services" "slurm" "dbdserver" "configFile" ] '' This option has been removed. Use services.slurm.dbdserver.storagePassFile and services.slurm.dbdserver.extraConfig instead. '') @@ -312,7 +309,7 @@ in builder = pkgs.writeText "builder.sh" '' source $stdenv/setup mkdir -p $out/bin - find ${getBin cfg.package}/bin -type f -executable | while read EXE + find ${lib.getBin cfg.package}/bin -type f -executable | while read EXE do exename="$(basename $EXE)" wrappername="$out/bin/$exename" @@ -329,21 +326,21 @@ in done mkdir -p $out/share - ln -s ${getBin cfg.package}/share/man $out/share/man + ln -s ${lib.getBin cfg.package}/share/man $out/share/man ''; }; - in mkIf ( cfg.enableStools || + in lib.mkIf ( cfg.enableStools || cfg.client.enable || cfg.server.enable || cfg.dbdserver.enable ) { environment.systemPackages = [ wrappedSlurm ]; - services.munge.enable = mkDefault true; + services.munge.enable = lib.mkDefault true; # use a static uid as default to ensure it is the same on all nodes - users.users.slurm = mkIf (cfg.user == defaultUser) { + users.users.slurm = lib.mkIf (cfg.user == defaultUser) { name = defaultUser; group = "slurm"; uid = config.ids.uids.slurm; @@ -351,7 +348,7 @@ in users.groups.slurm.gid = config.ids.uids.slurm; - systemd.services.slurmd = mkIf (cfg.client.enable) { + systemd.services.slurmd = lib.mkIf (cfg.client.enable) { path = with pkgs; [ wrappedSlurm coreutils ] ++ lib.optional cfg.enableSrunX11 slurm-spank-x11; @@ -375,13 +372,13 @@ in }; }; - systemd.tmpfiles.rules = mkIf cfg.client.enable [ + systemd.tmpfiles.rules = lib.mkIf cfg.client.enable [ "d /var/spool/slurmd 755 root root -" ]; - services.openssh.settings.X11Forwarding = mkIf cfg.client.enable (mkDefault true); + services.openssh.settings.X11Forwarding = lib.mkIf cfg.client.enable (lib.mkDefault true); - systemd.services.slurmctld = mkIf (cfg.server.enable) { + systemd.services.slurmctld = lib.mkIf (cfg.server.enable) { path = with pkgs; [ wrappedSlurm munge coreutils ] ++ lib.optional cfg.enableSrunX11 slurm-spank-x11; @@ -405,7 +402,7 @@ in systemd.services.slurmdbd = let # slurm strips the last component off the path configPath = "$RUNTIME_DIRECTORY/slurmdbd.conf"; - in mkIf (cfg.dbdserver.enable) { + in lib.mkIf (cfg.dbdserver.enable) { path = with pkgs; [ wrappedSlurm munge coreutils ]; wantedBy = [ "multi-user.target" ]; @@ -414,7 +411,7 @@ in preStart = '' install -m 600 -o ${cfg.user} -T ${slurmdbdConf} ${configPath} - ${optionalString (cfg.dbdserver.storagePassFile != null) '' + ${lib.optionalString (cfg.dbdserver.storagePassFile != null) '' echo "StoragePass=$(cat ${cfg.dbdserver.storagePassFile})" \ >> ${configPath} ''} diff --git a/nixos/modules/services/computing/torque/mom.nix b/nixos/modules/services/computing/torque/mom.nix index 6747bd4b0d5aa..8bc5fc134fcba 100644 --- a/nixos/modules/services/computing/torque/mom.nix +++ b/nixos/modules/services/computing/torque/mom.nix @@ -1,7 +1,4 @@ { config, pkgs, lib, ... }: - -with lib; - let cfg = config.services.torque.mom; @@ -17,10 +14,10 @@ in options = { services.torque.mom = { - enable = mkEnableOption "torque computing node"; + enable = lib.mkEnableOption "torque computing node"; - serverNode = mkOption { - type = types.str; + serverNode = lib.mkOption { + type = lib.types.str; description = "Hostname running pbs server."; }; @@ -28,7 +25,7 @@ in }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.torque ]; systemd.services.torque-mom-init = { diff --git a/nixos/modules/services/computing/torque/server.nix b/nixos/modules/services/computing/torque/server.nix index 8d923fc04d46d..27be2c65b7e0f 100644 --- a/nixos/modules/services/computing/torque/server.nix +++ b/nixos/modules/services/computing/torque/server.nix @@ -1,7 +1,4 @@ { config, pkgs, lib, ... }: - -with lib; - let cfg = config.services.torque.server; torque = pkgs.torque; @@ -11,13 +8,13 @@ in services.torque.server = { - enable = mkEnableOption "torque server"; + enable = lib.mkEnableOption "torque server"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.torque ]; systemd.services.torque-server-init = { diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index a4a9eee672cf4..300e4e72a01ed 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -1,9 +1,5 @@ # NixOS module for Buildbot continuous integration server. - { config, lib, options, pkgs, ... }: - -with lib; - let cfg = config.services.buildbot-master; opt = options.services.buildbot-master; @@ -11,27 +7,27 @@ let package = pkgs.python3.pkgs.toPythonModule cfg.package; python = package.pythonModule; - escapeStr = escape [ "'" ]; + escapeStr = lib.escape [ "'" ]; defaultMasterCfg = pkgs.writeText "master.cfg" '' from buildbot.plugins import * ${cfg.extraImports} factory = util.BuildFactory() c = BuildmasterConfig = dict( - workers = [${concatStringsSep "," cfg.workers}], + workers = [${lib.concatStringsSep "," cfg.workers}], protocols = { 'pb': {'port': ${toString cfg.pbPort} } }, title = '${escapeStr cfg.title}', titleURL = '${escapeStr cfg.titleUrl}', buildbotURL = '${escapeStr cfg.buildbotUrl}', db = dict(db_url='${escapeStr cfg.dbUrl}'), www = dict(port=${toString cfg.port}), - change_source = [ ${concatStringsSep "," cfg.changeSource} ], - schedulers = [ ${concatStringsSep "," cfg.schedulers} ], - builders = [ ${concatStringsSep "," cfg.builders} ], - services = [ ${concatStringsSep "," cfg.reporters} ], - configurators = [ ${concatStringsSep "," cfg.configurators} ], + change_source = [ ${lib.concatStringsSep "," cfg.changeSource} ], + schedulers = [ ${lib.concatStringsSep "," cfg.schedulers} ], + builders = [ ${lib.concatStringsSep "," cfg.builders} ], + services = [ ${lib.concatStringsSep "," cfg.reporters} ], + configurators = [ ${lib.concatStringsSep "," cfg.configurators} ], ) - for step in [ ${concatStringsSep "," cfg.factorySteps} ]: + for step in [ ${lib.concatStringsSep "," cfg.factorySteps} ]: factory.addStep(step) ${cfg.extraConfig} @@ -62,8 +58,8 @@ in { options = { services.buildbot-master = { - factorySteps = mkOption { - type = types.listOf types.str; + factorySteps = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "Factory Steps"; default = []; example = [ @@ -72,8 +68,8 @@ in { ]; }; - changeSource = mkOption { - type = types.listOf types.str; + changeSource = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "List of Change Sources."; default = []; example = [ @@ -81,8 +77,8 @@ in { ]; }; - configurators = mkOption { - type = types.listOf types.str; + configurators = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "Configurator Steps, see https://docs.buildbot.net/latest/manual/configuration/configurators.html"; default = []; example = [ @@ -90,35 +86,35 @@ in { ]; }; - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to enable the Buildbot continuous integration server."; }; - extraConfig = mkOption { - type = types.str; + extraConfig = lib.mkOption { + type = lib.types.str; description = "Extra configuration to append to master.cfg"; default = "c['buildbotNetUsageData'] = None"; }; - extraImports = mkOption { - type = types.str; + extraImports = lib.mkOption { + type = lib.types.str; description = "Extra python imports to prepend to master.cfg"; default = ""; example = "from buildbot.process.project import Project"; }; - masterCfg = mkOption { - type = types.path; + masterCfg = lib.mkOption { + type = lib.types.path; description = "Optionally pass master.cfg path. Other options in this configuration will be ignored."; default = defaultMasterCfg; - defaultText = literalMD ''generated configuration file''; + defaultText = lib.literalMD ''generated configuration file''; example = "/etc/nixos/buildbot/master.cfg"; }; - schedulers = mkOption { - type = types.listOf types.str; + schedulers = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "List of Schedulers."; default = [ "schedulers.SingleBranchScheduler(name='all', change_filter=util.ChangeFilter(branch='master'), treeStableTimer=None, builderNames=['runtests'])" @@ -126,60 +122,60 @@ in { ]; }; - builders = mkOption { - type = types.listOf types.str; + builders = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "List of Builders."; default = [ "util.BuilderConfig(name='runtests',workernames=['example-worker'],factory=factory)" ]; }; - workers = mkOption { - type = types.listOf types.str; + workers = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "List of Workers."; default = [ "worker.Worker('example-worker', 'pass')" ]; }; - reporters = mkOption { + reporters = lib.mkOption { default = []; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = "List of reporter objects used to present build status to various users."; }; - user = mkOption { + user = lib.mkOption { default = "buildbot"; - type = types.str; + type = lib.types.str; description = "User the buildbot server should execute under."; }; - group = mkOption { + group = lib.mkOption { default = "buildbot"; - type = types.str; + type = lib.types.str; description = "Primary group of buildbot user."; }; - extraGroups = mkOption { - type = types.listOf types.str; + extraGroups = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = "List of extra groups that the buildbot user should be a part of."; }; - home = mkOption { + home = lib.mkOption { default = "/home/buildbot"; - type = types.path; + type = lib.types.path; description = "Buildbot home directory."; }; - buildbotDir = mkOption { + buildbotDir = lib.mkOption { default = "${cfg.home}/master"; - defaultText = literalExpression ''"''${config.${opt.home}}/master"''; - type = types.path; + defaultText = lib.literalExpression ''"''${config.${opt.home}}/master"''; + type = lib.types.path; description = "Specifies the Buildbot directory."; }; - pbPort = mkOption { + pbPort = lib.mkOption { default = 9989; - type = types.either types.str types.int; + type = lib.types.either lib.types.str lib.types.int; example = "'tcp:9990:interface=127.0.0.1'"; description = '' The buildmaster will listen on a TCP port of your choosing @@ -193,69 +189,69 @@ in { ''; }; - listenAddress = mkOption { + listenAddress = lib.mkOption { default = "0.0.0.0"; - type = types.str; + type = lib.types.str; description = "Specifies the bind address on which the buildbot HTTP interface listens."; }; - buildbotUrl = mkOption { + buildbotUrl = lib.mkOption { default = "http://localhost:8010/"; - type = types.str; + type = lib.types.str; description = "Specifies the Buildbot URL."; }; - title = mkOption { + title = lib.mkOption { default = "Buildbot"; - type = types.str; + type = lib.types.str; description = "Specifies the Buildbot Title."; }; - titleUrl = mkOption { + titleUrl = lib.mkOption { default = "Buildbot"; - type = types.str; + type = lib.types.str; description = "Specifies the Buildbot TitleURL."; }; - dbUrl = mkOption { + dbUrl = lib.mkOption { default = "sqlite:///state.sqlite"; - type = types.str; + type = lib.types.str; description = "Specifies the database connection string."; }; - port = mkOption { + port = lib.mkOption { default = 8010; - type = types.port; + type = lib.types.port; description = "Specifies port number on which the buildbot HTTP interface listens."; }; - package = mkPackageOption pkgs "buildbot-full" { + package = lib.mkPackageOption pkgs "buildbot-full" { example = "buildbot"; }; - packages = mkOption { + packages = lib.mkOption { default = [ pkgs.git ]; - defaultText = literalExpression "[ pkgs.git ]"; - type = types.listOf types.package; + defaultText = lib.literalExpression "[ pkgs.git ]"; + type = lib.types.listOf lib.types.package; description = "Packages to add to PATH for the buildbot process."; }; - pythonPackages = mkOption { - type = types.functionTo (types.listOf types.package); + pythonPackages = lib.mkOption { + type = lib.types.functionTo (lib.types.listOf lib.types.package); default = pythonPackages: with pythonPackages; [ ]; - defaultText = literalExpression "pythonPackages: with pythonPackages; [ ]"; + defaultText = lib.literalExpression "pythonPackages: with pythonPackages; [ ]"; description = "Packages to add the to the PYTHONPATH of the buildbot process."; - example = literalExpression "pythonPackages: with pythonPackages; [ requests ]"; + example = lib.literalExpression "pythonPackages: with pythonPackages; [ requests ]"; }; }; }; - config = mkIf cfg.enable { - users.groups = optionalAttrs (cfg.group == "buildbot") { + config = lib.mkIf cfg.enable { + users.groups = lib.optionalAttrs (cfg.group == "buildbot") { buildbot = { }; }; - users.users = optionalAttrs (cfg.user == "buildbot") { + users.users = lib.optionalAttrs (cfg.user == "buildbot") { buildbot = { description = "Buildbot User."; isNormalUser = true; @@ -298,8 +294,8 @@ in { }; imports = [ - (mkRenamedOptionModule [ "services" "buildbot-master" "bpPort" ] [ "services" "buildbot-master" "pbPort" ]) - (mkRemovedOptionModule [ "services" "buildbot-master" "status" ] '' + (lib.mkRenamedOptionModule [ "services" "buildbot-master" "bpPort" ] [ "services" "buildbot-master" "pbPort" ]) + (lib.mkRemovedOptionModule [ "services" "buildbot-master" "status" ] '' Since Buildbot 0.9.0, status targets are deprecated and ignored. Review your configuration and migrate to reporters (available at services.buildbot-master.reporters). '') diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix index fccdcc116a21a..4b1fc230c2d3a 100644 --- a/nixos/modules/services/continuous-integration/github-runner/service.nix +++ b/nixos/modules/services/continuous-integration/github-runner/service.nix @@ -151,9 +151,10 @@ with lib; # Always clean workDir find -H "$WORK_DIRECTORY" -mindepth 1 -delete ''; - configureRunner = writeScript "configure" '' + configureRunner = writeScript "configure" /*bash*/'' if [[ -e "${newConfigTokenPath}" ]]; then echo "Configuring GitHub Actions Runner" + # shellcheck disable=SC2054 # don't complain about commas in --labels args=( --unattended --disableupdate diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 6702cec1f4f2c..189aaf86dd2d9 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -15,7 +15,6 @@ let env = { NIX_REMOTE = "daemon"; - SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt"; # Remove in 16.03 PGPASSFILE = "${baseDir}/pgpass"; NIX_REMOTE_SYSTEMS = lib.concatStringsSep ":" cfg.buildMachinesFiles; } // lib.optionalAttrs (cfg.smtpHost != null) { @@ -246,7 +245,7 @@ in } { assertion = cfg.minSpareServers < cfg.maxSpareServers; - message = "services.hydra.minSpareServers cannot be bigger than servives.hydra.maxSpareServers"; + message = "services.hydra.minSpareServers cannot be bigger than services.hydra.maxSpareServers"; } ]; @@ -311,6 +310,11 @@ in ) ]; + systemd.slices.system-hydra = { + description = "Hydra CI Server Slice"; + documentation = [ "file://${cfg.package}/share/doc/hydra/index.html" "https://nixos.org/hydra/manual/" ]; + }; + systemd.services.hydra-init = { wantedBy = [ "multi-user.target" ]; requires = lib.optional haveLocalDB "postgresql.service"; @@ -371,6 +375,7 @@ in serviceConfig.User = "hydra"; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; + serviceConfig.Slice = "system-hydra.slice"; }; systemd.services.hydra-server = @@ -389,6 +394,7 @@ in User = "hydra-www"; PermissionsStartOnly = true; Restart = "always"; + Slice = "system-hydra.slice"; }; }; @@ -408,6 +414,7 @@ in ExecStopPost = "${hydra-package}/bin/hydra-queue-runner --unlock"; User = "hydra-queue-runner"; Restart = "always"; + Slice = "system-hydra.slice"; # Ensure we can get core dumps. LimitCORE = "infinity"; @@ -430,6 +437,7 @@ in User = "hydra"; Restart = "always"; WorkingDirectory = baseDir; + Slice = "system-hydra.slice"; }; }; @@ -442,6 +450,7 @@ in serviceConfig = { ExecStart = "@${hydra-package}/bin/hydra-update-gc-roots hydra-update-gc-roots"; User = "hydra"; + Slice = "system-hydra.slice"; }; startAt = "2,14:15"; }; @@ -455,6 +464,7 @@ in serviceConfig = { ExecStart = "@${hydra-package}/bin/hydra-send-stats hydra-send-stats"; User = "hydra"; + Slice = "system-hydra.slice"; }; }; @@ -474,6 +484,7 @@ in User = "hydra-queue-runner"; Restart = "always"; RestartSec = 5; + Slice = "system-hydra.slice"; }; }; @@ -492,6 +503,7 @@ in fi ''; startAt = "*:0/5"; + serviceConfig.Slice = "system-hydra.slice"; }; # Periodically compress build logs. The queue runner compresses @@ -503,12 +515,15 @@ in '' set -eou pipefail compression=$(sed -nr 's/compress_build_logs_compression = ()/\1/p' ${baseDir}/hydra.conf) - if [[ $compression == zstd ]]; then + if [[ $compression == "" ]]; then + compression="bzip2" + elif [[ $compression == zstd ]]; then compression="zstd --rm" fi - find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r $compression --force --quiet + find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r "$compression" --force --quiet ''; startAt = "Sun 01:45"; + serviceConfig.Slice = "system-hydra.slice"; }; services.postgresql.enable = lib.mkIf haveLocalDB true; diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 95372ec2bbf8f..cba1a07ed7898 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -205,13 +205,13 @@ in { preStart = let replacePlugins = lib.optionalString (cfg.plugins != null) ( - let pluginCmds = lib.attrsets.lib.mapAttrsToList + let pluginCmds = lib.mapAttrsToList (n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi") cfg.plugins; in '' rm -r ${cfg.home}/plugins || true mkdir -p ${cfg.home}/plugins - ${lib.strings.lib.concatStringsSep "\n" pluginCmds} + ${lib.concatStringsSep "\n" pluginCmds} ''); in '' rm -rf ${cfg.home}/war diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix index c0599a65b480a..d5a6b93a6cf8d 100644 --- a/nixos/modules/services/continuous-integration/jenkins/slave.nix +++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: -with lib; + let + inherit (lib) mkIf mkOption types; cfg = config.services.jenkinsSlave; masterCfg = config.services.jenkins; in { @@ -47,16 +48,16 @@ in { ''; }; - javaPackage = mkPackageOption pkgs "jdk" { }; + javaPackage = lib.mkPackageOption pkgs "jdk" { }; }; }; config = mkIf (cfg.enable && !masterCfg.enable) { - users.groups = optionalAttrs (cfg.group == "jenkins") { + users.groups = lib.optionalAttrs (cfg.group == "jenkins") { jenkins.gid = config.ids.gids.jenkins; }; - users.users = optionalAttrs (cfg.user == "jenkins") { + users.users = lib.optionalAttrs (cfg.user == "jenkins") { jenkins = { description = "jenkins user"; createHome = true; diff --git a/nixos/modules/services/databases/etcd.nix b/nixos/modules/services/databases/etcd.nix index ebc905ad08f61..b10fdb801c501 100644 --- a/nixos/modules/services/databases/etcd.nix +++ b/nixos/modules/services/databases/etcd.nix @@ -1,7 +1,4 @@ { config, lib, options, pkgs, ... }: - -with lib; - let cfg = config.services.etcd; opt = options.services.etcd; @@ -9,98 +6,98 @@ let in { options.services.etcd = { - enable = mkOption { + enable = lib.mkOption { description = "Whether to enable etcd."; default = false; - type = types.bool; + type = lib.types.bool; }; - package = mkPackageOption pkgs "etcd" { }; + package = lib.mkPackageOption pkgs "etcd" { }; - name = mkOption { + name = lib.mkOption { description = "Etcd unique node name."; default = config.networking.hostName; - defaultText = literalExpression "config.networking.hostName"; - type = types.str; + defaultText = lib.literalExpression "config.networking.hostName"; + type = lib.types.str; }; - advertiseClientUrls = mkOption { + advertiseClientUrls = lib.mkOption { description = "Etcd list of this member's client URLs to advertise to the rest of the cluster."; default = cfg.listenClientUrls; - defaultText = literalExpression "config.${opt.listenClientUrls}"; - type = types.listOf types.str; + defaultText = lib.literalExpression "config.${opt.listenClientUrls}"; + type = lib.types.listOf lib.types.str; }; - listenClientUrls = mkOption { + listenClientUrls = lib.mkOption { description = "Etcd list of URLs to listen on for client traffic."; default = ["http://127.0.0.1:2379"]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; }; - listenPeerUrls = mkOption { + listenPeerUrls = lib.mkOption { description = "Etcd list of URLs to listen on for peer traffic."; default = ["http://127.0.0.1:2380"]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; }; - initialAdvertisePeerUrls = mkOption { + initialAdvertisePeerUrls = lib.mkOption { description = "Etcd list of this member's peer URLs to advertise to rest of the cluster."; default = cfg.listenPeerUrls; - defaultText = literalExpression "config.${opt.listenPeerUrls}"; - type = types.listOf types.str; + defaultText = lib.literalExpression "config.${opt.listenPeerUrls}"; + type = lib.types.listOf lib.types.str; }; - initialCluster = mkOption { + initialCluster = lib.mkOption { description = "Etcd initial cluster configuration for bootstrapping."; default = ["${cfg.name}=http://127.0.0.1:2380"]; - defaultText = literalExpression ''["''${config.${opt.name}}=http://127.0.0.1:2380"]''; - type = types.listOf types.str; + defaultText = lib.literalExpression ''["''${config.${opt.name}}=http://127.0.0.1:2380"]''; + type = lib.types.listOf lib.types.str; }; - initialClusterState = mkOption { + initialClusterState = lib.mkOption { description = "Etcd initial cluster configuration for bootstrapping."; default = "new"; - type = types.enum ["new" "existing"]; + type = lib.types.enum ["new" "existing"]; }; - initialClusterToken = mkOption { + initialClusterToken = lib.mkOption { description = "Etcd initial cluster token for etcd cluster during bootstrap."; default = "etcd-cluster"; - type = types.str; + type = lib.types.str; }; - discovery = mkOption { + discovery = lib.mkOption { description = "Etcd discovery url"; default = ""; - type = types.str; + type = lib.types.str; }; - clientCertAuth = mkOption { + clientCertAuth = lib.mkOption { description = "Whether to use certs for client authentication"; default = false; - type = types.bool; + type = lib.types.bool; }; - trustedCaFile = mkOption { + trustedCaFile = lib.mkOption { description = "Certificate authority file to use for clients"; default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; }; - certFile = mkOption { + certFile = lib.mkOption { description = "Cert file to use for clients"; default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; }; - keyFile = mkOption { + keyFile = lib.mkOption { description = "Key file to use for clients"; default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Open etcd ports in the firewall. @@ -110,41 +107,41 @@ in { ''; }; - peerCertFile = mkOption { + peerCertFile = lib.mkOption { description = "Cert file to use for peer to peer communication"; default = cfg.certFile; - defaultText = literalExpression "config.${opt.certFile}"; - type = types.nullOr types.path; + defaultText = lib.literalExpression "config.${opt.certFile}"; + type = lib.types.nullOr lib.types.path; }; - peerKeyFile = mkOption { + peerKeyFile = lib.mkOption { description = "Key file to use for peer to peer communication"; default = cfg.keyFile; - defaultText = literalExpression "config.${opt.keyFile}"; - type = types.nullOr types.path; + defaultText = lib.literalExpression "config.${opt.keyFile}"; + type = lib.types.nullOr lib.types.path; }; - peerTrustedCaFile = mkOption { + peerTrustedCaFile = lib.mkOption { description = "Certificate authority file to use for peer to peer communication"; default = cfg.trustedCaFile; - defaultText = literalExpression "config.${opt.trustedCaFile}"; - type = types.nullOr types.path; + defaultText = lib.literalExpression "config.${opt.trustedCaFile}"; + type = lib.types.nullOr lib.types.path; }; - peerClientCertAuth = mkOption { + peerClientCertAuth = lib.mkOption { description = "Whether to check all incoming peer requests from the cluster for valid client certificates signed by the supplied CA"; default = false; - type = types.bool; + type = lib.types.bool; }; - extraConf = mkOption { + extraConf = lib.mkOption { description = '' Etcd extra configuration. See ''; - type = types.attrsOf types.str; + type = lib.types.attrsOf lib.types.str; default = {}; - example = literalExpression '' + example = lib.literalExpression '' { "CORS" = "*"; "NAME" = "default-name"; @@ -155,14 +152,14 @@ in { ''; }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/etcd"; description = "Etcd data directory."; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.tmpfiles.settings."10-etcd".${cfg.dataDir}.d = { user = "etcd"; mode = "0700"; @@ -176,14 +173,14 @@ in { wants = [ "network-online.target" ] ++ lib.optional config.networking.firewall.enable "firewall.service"; - environment = (filterAttrs (n: v: v != null) { + environment = (lib.filterAttrs (n: v: v != null) { ETCD_NAME = cfg.name; ETCD_DISCOVERY = cfg.discovery; ETCD_DATA_DIR = cfg.dataDir; - ETCD_ADVERTISE_CLIENT_URLS = concatStringsSep "," cfg.advertiseClientUrls; - ETCD_LISTEN_CLIENT_URLS = concatStringsSep "," cfg.listenClientUrls; - ETCD_LISTEN_PEER_URLS = concatStringsSep "," cfg.listenPeerUrls; - ETCD_INITIAL_ADVERTISE_PEER_URLS = concatStringsSep "," cfg.initialAdvertisePeerUrls; + ETCD_ADVERTISE_CLIENT_URLS = lib.concatStringsSep "," cfg.advertiseClientUrls; + ETCD_LISTEN_CLIENT_URLS = lib.concatStringsSep "," cfg.listenClientUrls; + ETCD_LISTEN_PEER_URLS = lib.concatStringsSep "," cfg.listenPeerUrls; + ETCD_INITIAL_ADVERTISE_PEER_URLS = lib.concatStringsSep "," cfg.initialAdvertisePeerUrls; ETCD_PEER_CLIENT_CERT_AUTH = toString cfg.peerClientCertAuth; ETCD_PEER_TRUSTED_CA_FILE = cfg.peerTrustedCaFile; ETCD_PEER_CERT_FILE = cfg.peerCertFile; @@ -192,11 +189,11 @@ in { ETCD_TRUSTED_CA_FILE = cfg.trustedCaFile; ETCD_CERT_FILE = cfg.certFile; ETCD_KEY_FILE = cfg.keyFile; - }) // (optionalAttrs (cfg.discovery == ""){ - ETCD_INITIAL_CLUSTER = concatStringsSep "," cfg.initialCluster; + }) // (lib.optionalAttrs (cfg.discovery == ""){ + ETCD_INITIAL_CLUSTER = lib.concatStringsSep "," cfg.initialCluster; ETCD_INITIAL_CLUSTER_STATE = cfg.initialClusterState; ETCD_INITIAL_CLUSTER_TOKEN = cfg.initialClusterToken; - }) // (mapAttrs' (n: v: nameValuePair "ETCD_${n}" v) cfg.extraConf); + }) // (lib.mapAttrs' (n: v: lib.nameValuePair "ETCD_${n}" v) cfg.extraConf); unitConfig = { Documentation = "https://github.com/coreos/etcd"; diff --git a/nixos/modules/services/databases/influxdb2.nix b/nixos/modules/services/databases/influxdb2.nix index a534cdfbe1656..20a94c03994b8 100644 --- a/nixos/modules/services/databases/influxdb2.nix +++ b/nixos/modules/services/databases/influxdb2.nix @@ -67,16 +67,16 @@ let inherit (cfg.provision) organizations users; }); - provisioningScript = pkgs.writeShellScript "post-start-provision" '' - set -euo pipefail - export INFLUX_HOST="http://"${escapeShellArg ( + influxHost = "http://${escapeShellArg ( if ! hasAttr "http-bind-address" cfg.settings || hasInfix "0.0.0.0" cfg.settings.http-bind-address then "localhost:8086" else cfg.settings.http-bind-address - )} + )}"; - # Wait for the influxdb server to come online + waitUntilServiceIsReady = pkgs.writeShellScript "wait-until-service-is-ready" '' + set -euo pipefail + export INFLUX_HOST=${influxHost} count=0 while ! influx ping &>/dev/null; do if [ "$count" -eq 300 ]; then @@ -92,6 +92,11 @@ let sleep 0.1 count=$((count++)) done + ''; + + provisioningScript = pkgs.writeShellScript "post-start-provision" '' + set -euo pipefail + export INFLUX_HOST=${influxHost} # Do the initial database setup. Pass /dev/null as configs-path to # avoid saving the token as the active config. @@ -433,6 +438,7 @@ in ZONEINFO = "${pkgs.tzdata}/share/zoneinfo"; }; serviceConfig = { + Type = "exec"; # When credentials are used with systemd before v257 this is necessary to make the service start reliably (see systemd/systemd#33953) ExecStart = "${cfg.package}/bin/influxd --bolt-path \${STATE_DIRECTORY}/influxd.bolt --engine-path \${STATE_DIRECTORY}/engine"; StateDirectory = "influxdb2"; User = "influxdb2"; @@ -447,11 +453,13 @@ in "admin-token:${cfg.provision.initialSetup.tokenFile}" ]; - ExecStartPost = mkIf cfg.provision.enable ( + ExecStartPost = [ + waitUntilServiceIsReady + ] ++ (lib.optionals cfg.provision.enable ( [provisioningScript] ++ # Only the restarter runs with elevated privileges optional anyAuthDefined "+${restarterScript}" - ); + )); }; path = [ diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index c3f1872e0822a..c4e19a47ac7f0 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -1,34 +1,31 @@ { config, options, lib, pkgs, ... }: - -with lib; - let cfg = config.services.neo4j; opt = options.services.neo4j; certDirOpt = options.services.neo4j.directories.certificates; - isDefaultPathOption = opt: isOption opt && opt.type == types.path && opt.highestPrio >= 1500; + isDefaultPathOption = opt: lib.isOption opt && opt.type == lib.types.path && opt.highestPrio >= 1500; - sslPolicies = mapAttrsToList ( + sslPolicies = lib.mapAttrsToList ( name: conf: '' - dbms.ssl.policy.${name}.allow_key_generation=${boolToString conf.allowKeyGeneration} + dbms.ssl.policy.${name}.allow_key_generation=${lib.boolToString conf.allowKeyGeneration} dbms.ssl.policy.${name}.base_directory=${conf.baseDirectory} - ${optionalString (conf.ciphers != null) '' - dbms.ssl.policy.${name}.ciphers=${concatStringsSep "," conf.ciphers} + ${lib.optionalString (conf.ciphers != null) '' + dbms.ssl.policy.${name}.ciphers=${lib.concatStringsSep "," conf.ciphers} ''} dbms.ssl.policy.${name}.client_auth=${conf.clientAuth} - ${if length (splitString "/" conf.privateKey) > 1 then + ${if lib.length (lib.splitString "/" conf.privateKey) > 1 then "dbms.ssl.policy.${name}.private_key=${conf.privateKey}" else "dbms.ssl.policy.${name}.private_key=${conf.baseDirectory}/${conf.privateKey}" } - ${if length (splitString "/" conf.privateKey) > 1 then + ${if lib.length (lib.splitString "/" conf.privateKey) > 1 then "dbms.ssl.policy.${name}.public_certificate=${conf.publicCertificate}" else "dbms.ssl.policy.${name}.public_certificate=${conf.baseDirectory}/${conf.publicCertificate}" } dbms.ssl.policy.${name}.revoked_dir=${conf.revokedDir} - dbms.ssl.policy.${name}.tls_versions=${concatStringsSep "," conf.tlsVersions} - dbms.ssl.policy.${name}.trust_all=${boolToString conf.trustAll} + dbms.ssl.policy.${name}.tls_versions=${lib.concatStringsSep "," conf.tlsVersions} + dbms.ssl.policy.${name}.trust_all=${lib.boolToString conf.trustAll} dbms.ssl.policy.${name}.trusted_dir=${conf.trustedDir} '' ) cfg.ssl.policies; @@ -36,8 +33,8 @@ let serverConfig = pkgs.writeText "neo4j.conf" '' # General server.default_listen_address=${cfg.defaultListenAddress} - server.databases.default_to_read_only=${boolToString cfg.readOnly} - ${optionalString (cfg.workerCount > 0) '' + server.databases.default_to_read_only=${lib.boolToString cfg.readOnly} + ${lib.optionalString (cfg.workerCount > 0) '' dbms.threads.worker_count=${toString cfg.workerCount} ''} @@ -45,7 +42,7 @@ let # dbms.directories.certificates=${cfg.directories.certificates} server.directories.plugins=${cfg.directories.plugins} server.directories.lib=${cfg.package}/share/neo4j/lib - ${optionalString (cfg.constrainLoadCsv) '' + ${lib.optionalString (cfg.constrainLoadCsv) '' server.directories.import=${cfg.directories.imports} ''} @@ -55,25 +52,23 @@ let server.directories.run=${cfg.directories.home}/run # HTTP Connector - ${optionalString (cfg.http.enable) '' - server.http.enabled=${boolToString cfg.http.enable} - server.http.listen_address=${cfg.http.listenAddress} - server.http.advertised_address=${cfg.http.listenAddress} - ''} + server.http.enabled=${lib.boolToString cfg.http.enable} + server.http.listen_address=${cfg.http.listenAddress} + server.http.advertised_address=${cfg.http.listenAddress} # HTTPS Connector - server.https.enabled=${boolToString cfg.https.enable} + server.https.enabled=${lib.boolToString cfg.https.enable} server.https.listen_address=${cfg.https.listenAddress} server.https.advertised_address=${cfg.https.listenAddress} # BOLT Connector - server.bolt.enabled=${boolToString cfg.bolt.enable} + server.bolt.enabled=${lib.boolToString cfg.bolt.enable} server.bolt.listen_address=${cfg.bolt.listenAddress} server.bolt.advertised_address=${cfg.bolt.listenAddress} server.bolt.tls_level=${cfg.bolt.tlsLevel} # SSL Policies - ${concatStringsSep "\n" sslPolicies} + ${lib.concatStringsSep "\n" sslPolicies} # Default retention policy from neo4j.conf db.tx_log.rotation.retention_policy=1 days @@ -101,33 +96,33 @@ let in { imports = [ - (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ]) - (mkRenamedOptionModule [ "services" "neo4j" "listenAddress" ] [ "services" "neo4j" "defaultListenAddress" ]) - (mkRenamedOptionModule [ "services" "neo4j" "enableBolt" ] [ "services" "neo4j" "bolt" "enable" ]) - (mkRenamedOptionModule [ "services" "neo4j" "enableHttps" ] [ "services" "neo4j" "https" "enable" ]) - (mkRenamedOptionModule [ "services" "neo4j" "certDir" ] [ "services" "neo4j" "directories" "certificates" ]) - (mkRenamedOptionModule [ "services" "neo4j" "dataDir" ] [ "services" "neo4j" "directories" "home" ]) - (mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.") - (mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.") - (mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.") - (mkRemovedOptionModule [ "services" "neo4j" "shell" "enabled" ] "shell.enabled was removed upstream") - (mkRemovedOptionModule [ "services" "neo4j" "udc" "enabled" ] "udc.enabled was removed upstream") + (lib.mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ]) + (lib.mkRenamedOptionModule [ "services" "neo4j" "listenAddress" ] [ "services" "neo4j" "defaultListenAddress" ]) + (lib.mkRenamedOptionModule [ "services" "neo4j" "enableBolt" ] [ "services" "neo4j" "bolt" "enable" ]) + (lib.mkRenamedOptionModule [ "services" "neo4j" "enableHttps" ] [ "services" "neo4j" "https" "enable" ]) + (lib.mkRenamedOptionModule [ "services" "neo4j" "certDir" ] [ "services" "neo4j" "directories" "certificates" ]) + (lib.mkRenamedOptionModule [ "services" "neo4j" "dataDir" ] [ "services" "neo4j" "directories" "home" ]) + (lib.mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.") + (lib.mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.") + (lib.mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.") + (lib.mkRemovedOptionModule [ "services" "neo4j" "shell" "enabled" ] "shell.enabled was removed upstream") + (lib.mkRemovedOptionModule [ "services" "neo4j" "udc" "enabled" ] "udc.enabled was removed upstream") ]; ###### interface options.services.neo4j = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable Neo4j Community Edition. ''; }; - constrainLoadCsv = mkOption { - type = types.bool; + constrainLoadCsv = lib.mkOption { + type = lib.types.bool; default = true; description = '' Sets the root directory for file URLs used with the Cypher @@ -141,8 +136,8 @@ in { ''; }; - defaultListenAddress = mkOption { - type = types.str; + defaultListenAddress = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = '' Default network interface to listen for incoming connections. To @@ -155,8 +150,8 @@ in { ''; }; - extraServerConfig = mkOption { - type = types.lines; + extraServerConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra configuration for Neo4j Community server. Refer to the @@ -165,18 +160,18 @@ in { ''; }; - package = mkPackageOption pkgs "neo4j" { }; + package = lib.mkPackageOption pkgs "neo4j" { }; - readOnly = mkOption { - type = types.bool; + readOnly = lib.mkOption { + type = lib.types.bool; default = false; description = '' Only allow read operations from this Neo4j instance. ''; }; - workerCount = mkOption { - type = types.ints.between 0 44738; + workerCount = lib.mkOption { + type = lib.types.ints.between 0 44738; default = 0; description = '' Number of Neo4j worker threads, where the default of @@ -186,8 +181,8 @@ in { }; bolt = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Enable the BOLT connector for Neo4j. Setting this option to @@ -196,8 +191,8 @@ in { ''; }; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = ":7687"; description = '' Neo4j listen address for BOLT traffic. The listen address is @@ -205,8 +200,8 @@ in { ''; }; - sslPolicy = mkOption { - type = types.str; + sslPolicy = lib.mkOption { + type = lib.types.str; default = "legacy"; description = '' Neo4j SSL policy for BOLT traffic. @@ -223,8 +218,8 @@ in { ''; }; - tlsLevel = mkOption { - type = types.enum [ "REQUIRED" "OPTIONAL" "DISABLED" ]; + tlsLevel = lib.mkOption { + type = lib.types.enum [ "REQUIRED" "OPTIONAL" "DISABLED" ]; default = "OPTIONAL"; description = '' SSL/TSL requirement level for BOLT traffic. @@ -233,10 +228,10 @@ in { }; directories = { - certificates = mkOption { - type = types.path; + certificates = lib.mkOption { + type = lib.types.path; default = "${cfg.directories.home}/certificates"; - defaultText = literalExpression ''"''${config.${opt.directories.home}}/certificates"''; + defaultText = lib.literalExpression ''"''${config.${opt.directories.home}}/certificates"''; description = '' Directory for storing certificates to be used by Neo4j for TLS connections. @@ -256,10 +251,10 @@ in { ''; }; - data = mkOption { - type = types.path; + data = lib.mkOption { + type = lib.types.path; default = "${cfg.directories.home}/data"; - defaultText = literalExpression ''"''${config.${opt.directories.home}}/data"''; + defaultText = lib.literalExpression ''"''${config.${opt.directories.home}}/data"''; description = '' Path of the data directory. You must not configure more than one Neo4j installation to use the same data directory. @@ -270,8 +265,8 @@ in { ''; }; - home = mkOption { - type = types.path; + home = lib.mkOption { + type = lib.types.path; default = "/var/lib/neo4j"; description = '' Path of the Neo4j home directory. Other default directories are @@ -281,10 +276,10 @@ in { ''; }; - imports = mkOption { - type = types.path; + imports = lib.mkOption { + type = lib.types.path; default = "${cfg.directories.home}/import"; - defaultText = literalExpression ''"''${config.${opt.directories.home}}/import"''; + defaultText = lib.literalExpression ''"''${config.${opt.directories.home}}/import"''; description = '' The root directory for file URLs used with the Cypher `LOAD CSV` clause. Only meaningful when @@ -297,10 +292,10 @@ in { ''; }; - plugins = mkOption { - type = types.path; + plugins = lib.mkOption { + type = lib.types.path; default = "${cfg.directories.home}/plugins"; - defaultText = literalExpression ''"''${config.${opt.directories.home}}/plugins"''; + defaultText = lib.literalExpression ''"''${config.${opt.directories.home}}/plugins"''; description = '' Path of the database plugin directory. Compiled Java JAR files that contain database procedures will be loaded if they are placed in @@ -314,8 +309,8 @@ in { }; http = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Enable the HTTP connector for Neo4j. Setting this option to @@ -324,8 +319,8 @@ in { ''; }; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = ":7474"; description = '' Neo4j listen address for HTTP traffic. The listen address is @@ -335,8 +330,8 @@ in { }; https = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Enable the HTTPS connector for Neo4j. Setting this option to @@ -345,8 +340,8 @@ in { ''; }; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = ":7473"; description = '' Neo4j listen address for HTTPS traffic. The listen address is @@ -354,8 +349,8 @@ in { ''; }; - sslPolicy = mkOption { - type = types.str; + sslPolicy = lib.mkOption { + type = lib.types.str; default = "legacy"; description = '' Neo4j SSL policy for HTTPS traffic. @@ -370,8 +365,8 @@ in { }; shell = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable a remote shell server which Neo4j Shell clients can log in to. @@ -380,12 +375,12 @@ in { }; }; - ssl.policies = mkOption { - type = with types; attrsOf (submodule ({ name, config, options, ... }: { + ssl.policies = lib.mkOption { + type = with lib.types; attrsOf (submodule ({ name, config, options, ... }: { options = { - allowKeyGeneration = mkOption { - type = types.bool; + allowKeyGeneration = lib.mkOption { + type = lib.types.bool; default = false; description = '' Allows the generation of a private key and associated self-signed @@ -402,10 +397,10 @@ in { ''; }; - baseDirectory = mkOption { - type = types.path; + baseDirectory = lib.mkOption { + type = lib.types.path; default = "${cfg.directories.certificates}/${name}"; - defaultText = literalExpression ''"''${config.${opt.directories.certificates}}/''${name}"''; + defaultText = lib.literalExpression ''"''${config.${opt.directories.certificates}}/''${name}"''; description = '' The mandatory base directory for cryptographic objects of this policy. This path is only automatically generated when this @@ -420,8 +415,8 @@ in { ''; }; - ciphers = mkOption { - type = types.nullOr (types.listOf types.str); + ciphers = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = null; description = '' Restrict the allowed ciphers of this policy to those defined @@ -429,16 +424,16 @@ in { ''; }; - clientAuth = mkOption { - type = types.enum [ "NONE" "OPTIONAL" "REQUIRE" ]; + clientAuth = lib.mkOption { + type = lib.types.enum [ "NONE" "OPTIONAL" "REQUIRE" ]; default = "REQUIRE"; description = '' The client authentication stance for this policy. ''; }; - privateKey = mkOption { - type = types.str; + privateKey = lib.mkOption { + type = lib.types.str; default = "private.key"; description = '' The name of private PKCS #8 key file for this policy to be found @@ -447,8 +442,8 @@ in { ''; }; - publicCertificate = mkOption { - type = types.str; + publicCertificate = lib.mkOption { + type = lib.types.str; default = "public.crt"; description = '' The name of public X.509 certificate (chain) file in PEM format @@ -462,10 +457,10 @@ in { ''; }; - revokedDir = mkOption { - type = types.path; + revokedDir = lib.mkOption { + type = lib.types.path; default = "${config.baseDirectory}/revoked"; - defaultText = literalExpression ''"''${config.${options.baseDirectory}}/revoked"''; + defaultText = lib.literalExpression ''"''${config.${options.baseDirectory}}/revoked"''; description = '' Path to directory of CRLs (Certificate Revocation Lists) in PEM format. Must be an absolute path. The existence of this @@ -478,8 +473,8 @@ in { ''; }; - tlsVersions = mkOption { - type = types.listOf types.str; + tlsVersions = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ "TLSv1.2" ]; description = '' Restrict the TLS protocol versions of this policy to those @@ -487,8 +482,8 @@ in { ''; }; - trustAll = mkOption { - type = types.bool; + trustAll = lib.mkOption { + type = lib.types.bool; default = false; description = '' Makes this policy trust all remote parties. Enabling this is not @@ -498,10 +493,10 @@ in { ''; }; - trustedDir = mkOption { - type = types.path; + trustedDir = lib.mkOption { + type = lib.types.path; default = "${config.baseDirectory}/trusted"; - defaultText = literalExpression ''"''${config.${options.baseDirectory}}/trusted"''; + defaultText = lib.literalExpression ''"''${config.${options.baseDirectory}}/trusted"''; description = '' Path to directory of X.509 certificates in PEM format for trusted parties. Must be an absolute path. The existence of this @@ -518,8 +513,8 @@ in { ''; }; - directoriesToCreate = mkOption { - type = types.listOf types.path; + directoriesToCreate = lib.mkOption { + type = lib.types.listOf lib.types.path; internal = true; readOnly = true; description = '' @@ -532,9 +527,9 @@ in { }; - config.directoriesToCreate = optionals + config.directoriesToCreate = lib.optionals (certDirOpt.highestPrio >= 1500 && options.baseDirectory.highestPrio >= 1500) - (map (opt: opt.value) (filter isDefaultPathOption (attrValues options))); + (map (opt: opt.value) (lib.filter isDefaultPathOption (lib.attrValues options))); })); default = {}; @@ -555,22 +550,22 @@ in { config = let # Assertion helpers - policyNameList = attrNames cfg.ssl.policies; + policyNameList = lib.attrNames cfg.ssl.policies; validPolicyNameList = [ "legacy" ] ++ policyNameList; - validPolicyNameString = concatStringsSep ", " validPolicyNameList; + validPolicyNameString = lib.concatStringsSep ", " validPolicyNameList; # Capture various directories left at their default so they can be created. - defaultDirectoriesToCreate = map (opt: opt.value) (filter isDefaultPathOption (attrValues options.services.neo4j.directories)); - policyDirectoriesToCreate = concatMap (pol: pol.directoriesToCreate) (attrValues cfg.ssl.policies); + defaultDirectoriesToCreate = map (opt: opt.value) (lib.filter isDefaultPathOption (lib.attrValues options.services.neo4j.directories)); + policyDirectoriesToCreate = lib.concatMap (pol: pol.directoriesToCreate) (lib.attrValues cfg.ssl.policies); in - mkIf cfg.enable { + lib.mkIf cfg.enable { assertions = [ - { assertion = !elem "legacy" policyNameList; + { assertion = !lib.elem "legacy" policyNameList; message = "The policy 'legacy' is special to Neo4j, and its name is reserved."; } - { assertion = elem cfg.bolt.sslPolicy validPolicyNameList; + { assertion = lib.elem cfg.bolt.sslPolicy validPolicyNameList; message = "Invalid policy assigned: `services.neo4j.bolt.sslPolicy = \"${cfg.bolt.sslPolicy}\"`, defined policies are: ${validPolicyNameString}"; } - { assertion = elem cfg.https.sslPolicy validPolicyNameList; + { assertion = lib.elem cfg.https.sslPolicy validPolicyNameList; message = "Invalid policy assigned: `services.neo4j.https.sslPolicy = \"${cfg.https.sslPolicy}\"`, defined policies are: ${validPolicyNameString}"; } ]; @@ -595,7 +590,7 @@ in { mkdir -m 0700 -p ${cfg.directories.home}/{conf,logs} # Create other sub-directories and policy directories that have been left at their default. - ${concatMapStringsSep "\n" ( + ${lib.concatMapStringsSep "\n" ( dir: '' mkdir -m 0700 -p ${dir} '') (defaultDirectoriesToCreate ++ policyDirectoriesToCreate)} diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index e76f127335c7b..5108f040e9684 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -187,7 +187,7 @@ $ nix-instantiate --eval -A postgresql_13.psqlSchema ``` For an upgrade, a script like this can be used to simplify the process: ```nix -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { environment.systemPackages = [ (let @@ -196,6 +196,7 @@ For an upgrade, a script like this can be used to simplify the process: newPostgres = pkgs.postgresql_13.withPackages (pp: [ # pp.plv8 ]); + cfg = config.services.postgresql; in pkgs.writeScriptBin "upgrade-pg-cluster" '' set -eux # XXX it's perhaps advisable to stop all services that depend on postgresql @@ -205,12 +206,12 @@ For an upgrade, a script like this can be used to simplify the process: export NEWBIN="${newPostgres}/bin" - export OLDDATA="${config.services.postgresql.dataDir}" - export OLDBIN="${config.services.postgresql.package}/bin" + export OLDDATA="${cfg.dataDir}" + export OLDBIN="${cfg.package}/bin" install -d -m 0700 -o postgres -g postgres "$NEWDATA" cd "$NEWDATA" - sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" + sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" ${lib.escapeShellArgs cfg.initdbArgs} sudo -u postgres $NEWBIN/pg_upgrade \ --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ @@ -362,3 +363,7 @@ postgresql.withJIT.pname ``` evaluates to `"foobar"`. + +## Notable differences to upstream {#module-services-postgres-upstream-deviation} + +- To avoid circular dependencies between default and -dev outputs, the output of the `pg_config` system view has been removed. diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 55b3dd282ec47..ceaccde813a0a 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -7,6 +7,7 @@ let concatStringsSep const elem + escapeShellArgs filterAttrs isString literalExpression @@ -545,7 +546,7 @@ in rm -f ${cfg.dataDir}/*.conf # Initialise the database. - initdb -U ${cfg.superUser} ${concatStringsSep " " cfg.initdbArgs} + initdb -U ${cfg.superUser} ${escapeShellArgs cfg.initdbArgs} # See postStart! touch "${cfg.dataDir}/.first_startup" diff --git a/nixos/modules/services/databases/tigerbeetle.md b/nixos/modules/services/databases/tigerbeetle.md index 12d920e7bcc77..7cf3bedda5e0a 100644 --- a/nixos/modules/services/databases/tigerbeetle.md +++ b/nixos/modules/services/databases/tigerbeetle.md @@ -35,3 +35,10 @@ Note that the TigerBeetle module won't open any firewall ports automatically, so A complete list of options for TigerBeetle can be found [here](#opt-services.tigerbeetle.enable). +## Upgrading {#module-services-tigerbeetle-upgrading} + +Usually, TigerBeetle's [upgrade process](https://docs.tigerbeetle.com/operating/upgrading) only requires replacing the binary used for the servers. +This is not directly possible with NixOS since the new binary will be located at a different place in the Nix store. + +However, since TigerBeetle is managed through systemd on NixOS, the only action you need to take when upgrading is to make sure the version of TigerBeetle you're upgrading to supports upgrades from the version you're currently running. +This information will be on the [release notes](https://github.com/tigerbeetle/tigerbeetle/releases) for the version you're upgrading to. diff --git a/nixos/modules/services/databases/tigerbeetle.nix b/nixos/modules/services/databases/tigerbeetle.nix index a9c7a24250a69..7b512055e44e5 100644 --- a/nixos/modules/services/databases/tigerbeetle.nix +++ b/nixos/modules/services/databases/tigerbeetle.nix @@ -42,8 +42,8 @@ in }; cacheGridSize = mkOption { - type = types.strMatching "[0-9]+(K|M|G)B"; - default = "1GB"; + type = types.strMatching "[0-9]+(K|M|G)iB"; + default = "1GiB"; description = '' The grid cache size. The grid cache acts like a page cache for TigerBeetle. @@ -97,16 +97,26 @@ in ''; serviceConfig = { - Type = "exec"; - + DevicePolicy = "closed"; DynamicUser = true; + ExecStart = "${lib.getExe cfg.package} start --cache-grid=${cfg.cacheGridSize} --addresses=${lib.escapeShellArg (builtins.concatStringsSep "," cfg.addresses)} ${replicaDataPath}"; + LockPersonality = true; + ProtectClock = true; + ProtectControlGroups = true; ProtectHome = true; - DevicePolicy = "closed"; - + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "noaccess"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; StateDirectory = "tigerbeetle"; StateDirectoryMode = 700; - - ExecStart = "${lib.getExe cfg.package} start --cache-grid=${cfg.cacheGridSize} --addresses=${lib.escapeShellArg (builtins.concatStringsSep "," cfg.addresses)} ${replicaDataPath}"; + Type = "exec"; }; }; diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index b486dd6b30b45..a8b17d2740600 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -50,7 +50,10 @@ in { }; }; - hardware.pulseaudio.enable = lib.mkDefault true; + hardware = { + bluetooth.enable = lib.mkDefault true; + }; + networking.networkmanager.enable = lib.mkDefault true; systemd.packages = with pkgs.lomiri; [ @@ -88,6 +91,8 @@ in { ayatana-indicator-messages ayatana-indicator-power ayatana-indicator-session + ] ++ lib.optionals config.hardware.bluetooth.enable [ + ayatana-indicator-bluetooth ] ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [ ayatana-indicator-sound ]) ++ (with pkgs.lomiri; [ diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 3b36d3a905d06..f5018c4c29ef6 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -58,6 +58,7 @@ in { ]; qt.enable = true; + programs.xwayland.enable = true; environment.systemPackages = with kdePackages; let requiredPackages = [ qtwayland # Hack? To make everything run on Wayland @@ -87,7 +88,6 @@ in { # Core Plasma parts kwin - pkgs.xwayland kscreen libkscreen kscreenlocker @@ -143,10 +143,16 @@ in { kate khelpcenter dolphin + baloo-widgets # baloo information in Dolphin dolphin-plugins spectacle ffmpegthumbs krdp + xwaylandvideobridge # exposes Wayland windows to X11 screen capture + ] ++ lib.optionals config.services.flatpak.enable [ + # Since PackageKit Nix support is not there yet, + # only install discover if flatpak is enabled. + discover ]; in requiredPackages @@ -239,12 +245,19 @@ in { systemd.services."drkonqi-coredump-processor@".wantedBy = ["systemd-coredump@.service"]; xdg.icons.enable = true; + xdg.icons.fallbackCursorThemes = mkDefault ["breeze_cursors"]; xdg.portal.enable = true; - xdg.portal.extraPortals = [kdePackages.xdg-desktop-portal-kde]; + xdg.portal.extraPortals = [ + kdePackages.xdg-desktop-portal-kde + pkgs.xdg-desktop-portal-gtk + ]; xdg.portal.configPackages = mkDefault [kdePackages.xdg-desktop-portal-kde]; services.pipewire.enable = mkDefault true; + # Enable screen reader by default + services.orca.enable = mkDefault true; + services.displayManager = { sessionPackages = [kdePackages.plasma-workspace]; defaultSession = mkDefault "plasma"; diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix index ae2ecb5ffeb71..4c407ca3828a2 100644 --- a/nixos/modules/services/desktops/accountsservice.nix +++ b/nixos/modules/services/desktops/accountsservice.nix @@ -1,23 +1,17 @@ # AccountsService daemon. - { config, lib, pkgs, ... }: - -with lib; - { - meta = { - maintainers = teams.freedesktop.members; + maintainers = lib.teams.freedesktop.members; }; ###### interface - options = { services.accounts-daemon = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable AccountsService, a DBus service for accessing @@ -29,10 +23,8 @@ with lib; }; - ###### implementation - - config = mkIf config.services.accounts-daemon.enable { + config = lib.mkIf config.services.accounts-daemon.enable { environment.systemPackages = [ pkgs.accountsservice ]; @@ -43,14 +35,14 @@ with lib; systemd.packages = [ pkgs.accountsservice ]; - systemd.services.accounts-daemon = recursiveUpdate { + systemd.services.accounts-daemon = lib.recursiveUpdate { wantedBy = [ "graphical.target" ]; # Accounts daemon looks for dbus interfaces in $XDG_DATA_DIRS/accountsservice environment.XDG_DATA_DIRS = "${config.system.path}/share"; - } (optionalAttrs (!config.users.mutableUsers) { + } (lib.optionalAttrs (!config.users.mutableUsers) { environment.NIXOS_USERS_PURE = "true"; }); }; diff --git a/nixos/modules/services/desktops/bamf.nix b/nixos/modules/services/desktops/bamf.nix index 13de3a44328f4..d9c46e94d9e04 100644 --- a/nixos/modules/services/desktops/bamf.nix +++ b/nixos/modules/services/desktops/bamf.nix @@ -1,25 +1,21 @@ # Bamf - { config, lib, pkgs, ... }: - -with lib; - { meta = with lib; { - maintainers = with maintainers; [ ] ++ teams.pantheon.members; + maintainers = with lib.maintainers; [ ] ++ lib.teams.pantheon.members; }; ###### interface options = { services.bamf = { - enable = mkEnableOption "bamf"; + enable = lib.mkEnableOption "bamf"; }; }; ###### implementation - config = mkIf config.services.bamf.enable { + config = lib.mkIf config.services.bamf.enable { services.dbus.packages = [ pkgs.bamf ]; systemd.packages = [ pkgs.bamf ]; diff --git a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix index 30b35f6690921..21e7c3b587134 100644 --- a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix +++ b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix @@ -32,15 +32,15 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ - pkgs.gnome.gnome-settings-daemon + pkgs.gnome-settings-daemon ]; services.udev.packages = [ - pkgs.gnome.gnome-settings-daemon + pkgs.gnome-settings-daemon ]; systemd.packages = [ - pkgs.gnome.gnome-settings-daemon + pkgs.gnome-settings-daemon ]; systemd.user.targets."gnome-session-x11-services".wants = [ diff --git a/nixos/modules/services/desktops/neard.nix b/nixos/modules/services/desktops/neard.nix index 5d67adc09870f..21a69a34001f6 100644 --- a/nixos/modules/services/desktops/neard.nix +++ b/nixos/modules/services/desktops/neard.nix @@ -1,16 +1,69 @@ -# neard service. -{ config, lib, pkgs, ... }: { - ###### interface - options = { - services.neard = { - enable = lib.mkEnableOption "neard, an NFC daemon"; + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + mkEnableOption + mkIf + mkOption + types + ; + cfg = config.services.neard; + format = pkgs.formats.ini { }; + configFile = format.generate "neard.conf" cfg.settings; +in +{ + options.services.neard = { + enable = mkEnableOption "neard, an NFC daemon"; + + settings = mkOption { + type = types.submodule { + freeformType = format.type; + options = { + General = { + ConstantPoll = mkOption { + type = types.bool; + default = false; + description = '' + Enable constant polling. Constant polling will automatically trigger a new + polling loop whenever a tag or a device is no longer in the RF field. + ''; + }; + + DefaultPowered = mkOption { + type = types.bool; + default = true; + description = '' + Automatically turn an adapter on when being discovered. + ''; + }; + + ResetOnError = mkOption { + type = types.bool; + default = true; + description = '' + Power cycle the adapter when getting a driver error from the kernel. + ''; + }; + }; + }; + }; + default = {}; + description = '' + Neard INI-style configuration file as a Nix attribute set. + + See the upstream [configuration file](https://github.com/linux-nfc/neard/blob/master/src/main.conf). + ''; }; }; + config = mkIf cfg.enable { + environment.etc."neard/main.conf".source = configFile; - ###### implementation - config = lib.mkIf config.services.neard.enable { environment.systemPackages = [ pkgs.neard ]; services.dbus.packages = [ pkgs.neard ]; diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index bf57d1255774d..532c64c0f4245 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -19,7 +19,7 @@ let ''; cfg = config.services.pipewire; enable32BitAlsaPlugins = cfg.alsa.support32Bit - && pkgs.stdenv.isx86_64 + && pkgs.stdenv.hostPlatform.isx86_64 && pkgs.pkgsi686Linux.pipewire != null; # The package doesn't output to $out/lib/pipewire directly so that the diff --git a/nixos/modules/services/desktops/pipewire/wireplumber.nix b/nixos/modules/services/desktops/pipewire/wireplumber.nix index c924801bcd8ba..cccb892cecf7a 100644 --- a/nixos/modules/services/desktops/pipewire/wireplumber.nix +++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix @@ -215,17 +215,6 @@ in } ''; - systemwideConfigPkg = pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/90-nixos-systemwide.conf" '' - # When running system-wide, we don't have logind to call ReserveDevice, - # And bluetooth logind integration needs to be disabled - wireplumber.profiles = { - main = { - support.reserve-device = disabled - monitor.bluez.seat-monitoring = disabled - } - } - ''; - extraConfigPkg = pkgs.buildEnv { name = "wireplumber-extra-config"; paths = mapConfigToFiles cfg.extraConfig; @@ -240,8 +229,7 @@ in configPackages = cfg.configPackages ++ [ extraConfigPkg extraScriptsPkg ] - ++ optional (!pwUsedForAudio) pwNotForAudioConfigPkg - ++ optional pwCfg.systemWide systemwideConfigPkg; + ++ optional (!pwUsedForAudio) pwNotForAudioConfigPkg; configs = pkgs.buildEnv { name = "wireplumber-configs"; diff --git a/nixos/modules/services/development/athens.nix b/nixos/modules/services/development/athens.nix index 235d234609c0f..ddd4699fea2ad 100644 --- a/nixos/modules/services/development/athens.nix +++ b/nixos/modules/services/development/athens.nix @@ -168,7 +168,7 @@ in type = lib.types.package; default = pkgs.go; defaultText = lib.literalExpression "pkgs.go"; - example = "pkgs.go_1_21"; + example = "pkgs.go_1_23"; description = '' The Go package used by Athens at runtime. diff --git a/nixos/modules/services/development/livebook.nix b/nixos/modules/services/development/livebook.nix index 3861d18e4ab5e..ca227e2ad22c3 100644 --- a/nixos/modules/services/development/livebook.nix +++ b/nixos/modules/services/development/livebook.nix @@ -46,7 +46,7 @@ in type = with lib.types; nullOr lib.types.path; default = null; description = '' - Additional dnvironment file as defined in {manpage}`systemd.exec(5)`. + Additional environment file as defined in {manpage}`systemd.exec(5)`. Secrets like {env}`LIVEBOOK_PASSWORD` (which is used to specify the password needed to access the livebook site) or {env}`LIVEBOOK_COOKIE` diff --git a/nixos/modules/services/development/zammad.nix b/nixos/modules/services/development/zammad.nix index 0659c48e815e2..43ae9a34b4043 100644 --- a/nixos/modules/services/development/zammad.nix +++ b/nixos/modules/services/development/zammad.nix @@ -1,11 +1,8 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.zammad; settingsFormat = pkgs.formats.yaml { }; - filterNull = filterAttrs (_: v: v != null); + filterNull = lib.filterAttrs (_: v: v != null); serviceConfig = { Type = "simple"; Restart = "always"; @@ -29,88 +26,88 @@ in options = { services.zammad = { - enable = mkEnableOption "Zammad, a web-based, open source user support/ticketing solution"; + enable = lib.mkEnableOption "Zammad, a web-based, open source user support/ticketing solution"; - package = mkPackageOption pkgs "zammad" { }; + package = lib.mkPackageOption pkgs "zammad" { }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/zammad"; description = '' Path to a folder that will contain Zammad working directory. ''; }; - host = mkOption { - type = types.str; + host = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; example = "192.168.23.42"; description = "Host address."; }; - openPorts = mkOption { - type = types.bool; + openPorts = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to open firewall ports for Zammad"; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 3000; description = "Web service port."; }; - websocketPort = mkOption { - type = types.port; + websocketPort = lib.mkOption { + type = lib.types.port; default = 6042; description = "Websocket service port."; }; redis = { - createLocally = mkOption { - type = types.bool; + createLocally = lib.mkOption { + type = lib.types.bool; default = true; description = "Whether to create a local redis automatically."; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "zammad"; description = '' Name of the redis server. Only used if `createLocally` is set to true. ''; }; - host = mkOption { - type = types.str; + host = lib.mkOption { + type = lib.types.str; default = "localhost"; description = '' Redis server address. ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 6379; description = "Port of the redis server."; }; }; database = { - type = mkOption { - type = types.enum [ "PostgreSQL" "MySQL" ]; + type = lib.mkOption { + type = lib.types.enum [ "PostgreSQL" "MySQL" ]; default = "PostgreSQL"; example = "MySQL"; description = "Database engine to use."; }; - host = mkOption { - type = types.nullOr types.str; + host = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = { PostgreSQL = "/run/postgresql"; MySQL = "localhost"; }.${cfg.database.type}; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' { PostgreSQL = "/run/postgresql"; MySQL = "localhost"; @@ -121,28 +118,28 @@ in ''; }; - port = mkOption { - type = types.nullOr types.port; + port = lib.mkOption { + type = lib.types.nullOr lib.types.port; default = null; description = "Database port. Use `null` for default port."; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "zammad"; description = '' Database name. ''; }; - user = mkOption { - type = types.nullOr types.str; + user = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = "zammad"; description = "Database user."; }; - passwordFile = mkOption { - type = types.nullOr types.path; + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; example = "/run/keys/zammad-dbpassword"; description = '' @@ -150,16 +147,16 @@ in ''; }; - createLocally = mkOption { - type = types.bool; + createLocally = lib.mkOption { + type = lib.types.bool; default = true; description = "Whether to create a local database automatically."; }; - settings = mkOption { + settings = lib.mkOption { type = settingsFormat.type; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { } ''; @@ -171,8 +168,8 @@ in }; }; - secretKeyBaseFile = mkOption { - type = types.nullOr types.path; + secretKeyBaseFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; example = "/run/keys/secret_key_base"; description = '' @@ -197,10 +194,10 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.zammad.database.settings = { - production = mapAttrs (_: v: mkDefault v) (filterNull { + production = lib.mapAttrs (_: v: lib.mkDefault v) (filterNull { adapter = { PostgreSQL = "postgresql"; MySQL = "mysql2"; @@ -215,7 +212,7 @@ in }); }; - networking.firewall.allowedTCPPorts = mkIf cfg.openPorts [ + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openPorts [ config.services.zammad.port config.services.zammad.websocketPort ]; @@ -243,9 +240,9 @@ in } ]; - services.mysql = optionalAttrs (cfg.database.createLocally && cfg.database.type == "MySQL") { + services.mysql = lib.optionalAttrs (cfg.database.createLocally && cfg.database.type == "MySQL") { enable = true; - package = mkDefault pkgs.mariadb; + package = lib.mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { @@ -255,7 +252,7 @@ in ]; }; - services.postgresql = optionalAttrs (cfg.database.createLocally && cfg.database.type == "PostgreSQL") { + services.postgresql = lib.optionalAttrs (cfg.database.createLocally && cfg.database.type == "PostgreSQL") { enable = true; ensureDatabases = [ cfg.database.name ]; ensureUsers = [ @@ -266,7 +263,7 @@ in ]; }; - services.redis = optionalAttrs cfg.redis.createLocally { + services.redis = lib.optionalAttrs cfg.redis.createLocally { servers."${cfg.redis.name}" = { enable = true; port = cfg.redis.port; @@ -282,7 +279,7 @@ in after = [ "network.target" "postgresql.service" - ] ++ optionals cfg.redis.createLocally [ + ] ++ lib.optionals cfg.redis.createLocally [ "redis-${cfg.redis.name}.service" ]; requires = [ @@ -301,13 +298,13 @@ in # config file cp ${databaseConfig} ./config/database.yml chmod -R +w . - ${optionalString (cfg.database.passwordFile != null) '' + ${lib.optionalString (cfg.database.passwordFile != null) '' { echo -n " password: " cat ${cfg.database.passwordFile} } >> ./config/database.yml ''} - ${optionalString (cfg.secretKeyBaseFile != null) '' + ${lib.optionalString (cfg.secretKeyBaseFile != null) '' { echo "production: " echo -n " secret_key_base: " @@ -317,7 +314,7 @@ in if [ `${config.services.postgresql.package}/bin/psql \ --host ${cfg.database.host} \ - ${optionalString + ${lib.optionalString (cfg.database.port != null) "--port ${toString cfg.database.port}"} \ --username ${cfg.database.user} \ diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index 5d42467a6cd8a..9475f183a16d3 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -96,6 +96,7 @@ in security.pam.services.ly = { startSession = true; unixAuth = true; + enableGnomeKeyring = lib.mkDefault config.services.gnome.gnome-keyring.enable; }; environment = { diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index c1d9731b842d8..a9a4f386e0609 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -275,7 +275,7 @@ in "--create=${mkSavePath cfg.saveName}" (lib.optionalString (cfg.mods != []) "--mod-directory=${modDir}") ]) - + (lib.optionalString (cfg.extraSettingsFile != null) ("\necho ${lib.strings.lib.escapeShellArg serverSettingsString}" + + (lib.optionalString (cfg.extraSettingsFile != null) ("\necho ${lib.strings.escapeShellArg serverSettingsString}" + " \"$(cat ${cfg.extraSettingsFile})\" | ${lib.getExe pkgs.jq} -s add" + " > ${stateDir}/server-settings.json")); diff --git a/nixos/modules/services/games/teeworlds.nix b/nixos/modules/services/games/teeworlds.nix index b21fe008896a4..f126471495731 100644 --- a/nixos/modules/services/games/teeworlds.nix +++ b/nixos/modules/services/games/teeworlds.nix @@ -368,6 +368,33 @@ in ''; }; }; + + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/var/lib/teeworlds/teeworlds.env"; + description = '' + Environment file as defined in {manpage}`systemd.exec(5)`. + + Secrets may be passed to the service without adding them to the world-readable + Nix store, by specifying placeholder variables as the option value in Nix and + setting these variables accordingly in the environment file. + + ``` + # snippet of teeworlds-related config + services.teeworlds.password = "$TEEWORLDS_PASSWORD"; + ``` + + ``` + # content of the environment file + TEEWORLDS_PASSWORD=verysecretpassword + ``` + + Note that this file needs to be available on the host on which + `teeworlds` is running. + ''; + }; + }; }; @@ -383,7 +410,15 @@ in serviceConfig = { DynamicUser = true; - ExecStart = "${cfg.package}/bin/teeworlds_srv -f ${teeworldsConf}"; + RuntimeDirectory = "teeworlds"; + RuntimeDirectoryMode = "0700"; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + ExecStartPre = '' + ${pkgs.envsubst}/bin/envsubst \ + -i ${teeworldsConf} \ + -o /run/teeworlds/teeworlds.yaml + ''; + ExecStart = "${lib.getExe cfg.package} -f /run/teeworlds/teeworlds.yaml"; # Hardening CapabilityBoundingSet = false; diff --git a/nixos/modules/services/hardware/iptsd.nix b/nixos/modules/services/hardware/iptsd.nix index 3a299c2428df8..bfd4b35227923 100644 --- a/nixos/modules/services/hardware/iptsd.nix +++ b/nixos/modules/services/hardware/iptsd.nix @@ -18,15 +18,15 @@ in { type = lib.types.submodule { freeformType = format.type; options = { - Touch = { + Touchscreen = { DisableOnPalm = lib.mkOption { default = false; - description = "Ignore all touch inputs if a palm was registered on the display."; + description = "Ignore all touchscreen inputs if a palm was registered on the display."; type = lib.types.bool; }; DisableOnStylus = lib.mkOption { default = false; - description = "Ignore all touch inputs if a stylus is in proximity."; + description = "Ignore all touchscreen inputs if a stylus is in proximity."; type = lib.types.bool; }; }; @@ -43,6 +43,10 @@ in { }; config = lib.mkIf cfg.enable { + warnings = lib.optional (lib.hasAttr "Touch" cfg.config) '' + The option `services.iptsd.config.Touch` has been renamed to `services.iptsd.config.Touchscreen`. + ''; + systemd.packages = [ pkgs.iptsd ]; environment.etc."iptsd.conf".source = configFile; systemd.services."iptsd@".restartTriggers = [ configFile ]; diff --git a/nixos/modules/services/hardware/kanata.nix b/nixos/modules/services/hardware/kanata.nix index 67bcac6fe4432..7557b1ae55f90 100644 --- a/nixos/modules/services/hardware/kanata.nix +++ b/nixos/modules/services/hardware/kanata.nix @@ -115,7 +115,7 @@ let --cfg ${keyboard.configFile} \ --symlink-path ''${RUNTIME_DIRECTORY}/${name} \ ${lib.optionalString (keyboard.port != null) "--port ${toString keyboard.port}"} \ - ${utils.lib.escapeSystemdExecArgs keyboard.extraArgs} + ${utils.escapeSystemdExecArgs keyboard.extraArgs} ''; DynamicUser = true; diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 9dd4c54342119..9733fbe5aa15e 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -12,7 +12,7 @@ let tuple = ts: lib.mkOptionType { name = "tuple"; merge = lib.mergeOneOption; - check = xs: all id (zipListsWith (t: x: t.check x) ts xs); + check = xs: lib.all lib.id (lib.zipListsWith (t: x: t.check x) ts xs); description = "tuple of" + lib.concatMapStrings (t: " (${t.description})") ts; }; level = ints.unsigned; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index e3f356ade6788..a532f629efd06 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -434,7 +434,7 @@ in ''; systemd.services.systemd-udevd = - { restartTriggers = cfg.packages; + { restartTriggers = [ config.environment.etc."udev/rules.d".source ]; }; }; diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix index bcc768cc05d3f..43604b17e8486 100644 --- a/nixos/modules/services/hardware/upower.nix +++ b/nixos/modules/services/hardware/upower.nix @@ -85,7 +85,7 @@ in percentageLow = lib.mkOption { type = lib.types.ints.unsigned; - default = 10; + default = 20; description = '' When `usePercentageForPolicy` is `true`, the levels at which UPower will consider the @@ -103,7 +103,7 @@ in percentageCritical = lib.mkOption { type = lib.types.ints.unsigned; - default = 3; + default = 5; description = '' When `usePercentageForPolicy` is `true`, the levels at which UPower will consider the diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 6db1b108cc6cd..1c161e167be8b 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -97,6 +97,8 @@ in defaultText = lib.literalExpression "cfg.settings != {}"; }; + allowNetworking = lib.mkEnableOption "network access for logrotate"; + settings = lib.mkOption { default = { }; description = '' @@ -240,12 +242,58 @@ in config = lib.mkIf cfg.enable { systemd.services.logrotate = { description = "Logrotate Service"; + documentation = [ + "man:logrotate(8)" + "man:logrotate(5)" + ]; startAt = "hourly"; serviceConfig = { - Restart = "no"; - User = "root"; - ExecStart = "${pkgs.logrotate}/sbin/logrotate ${utils.escapeSystemdExecArgs cfg.extraArgs} ${mailOption} ${cfg.configFile}"; + Type = "oneshot"; + ExecStart = "${lib.getExe pkgs.logrotate} ${utils.escapeSystemdExecArgs cfg.extraArgs} ${mailOption} ${cfg.configFile}"; + + # performance + Nice = 19; + IOSchedulingClass = "best-effort"; + IOSchedulingPriority = 7; + + # hardening + CapabilityBoundingSet = [ + "CAP_CHOWN" + "CAP_DAC_OVERRIDE" + "CAP_KILL" + "CAP_SETUID" + "CAP_SETGID" + ]; + 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 = "full"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = false; # can create sgid directories + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged @resources" + "@chown @setuid" + ]; + UMask = "0027"; + } // lib.optionalAttrs (!cfg.allowNetworking) { + PrivateNetwork = true; # e.g. mail delivery + RestrictAddressFamilies = "none"; }; }; systemd.services.logrotate-checkconf = { diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix index 9eccd34cef234..644a93214516c 100644 --- a/nixos/modules/services/logging/promtail.nix +++ b/nixos/modules/services/logging/promtail.nix @@ -80,7 +80,7 @@ in { PrivateUsers = true; SupplementaryGroups = lib.optional (allowSystemdJournal) "systemd-journal"; - } // (optionalAttrs (!pkgs.stdenv.isAarch64) { # FIXME: figure out why this breaks on aarch64 + } // (optionalAttrs (!pkgs.stdenv.hostPlatform.isAarch64) { # FIXME: figure out why this breaks on aarch64 SystemCallFilter = "@system-service"; }); }; diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 75b08bb0593b4..95b77da250b29 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -30,6 +30,10 @@ let ENGINE = "haystack.backends.whoosh_backend.WhooshEngine"; PATH = "/var/lib/mailman-web/fulltext-index"; }; + } // lib.optionalAttrs cfg.enablePostfix { + EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"; + EMAIL_HOST = "127.0.0.1"; + EMAIL_PORT = 25; } // cfg.webSettings; webSettingsJSON = pkgs.writeText "settings.json" (builtins.toJSON webSettings); diff --git a/nixos/modules/services/mail/rspamd-trainer.nix b/nixos/modules/services/mail/rspamd-trainer.nix index 81a0c460f0c30..11c4363cc1d58 100644 --- a/nixos/modules/services/mail/rspamd-trainer.nix +++ b/nixos/modules/services/mail/rspamd-trainer.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.rspamd-trainer; @@ -10,18 +7,18 @@ let in { options.services.rspamd-trainer = { - enable = mkEnableOption "Spam/ham trainer for rspamd"; + enable = lib.mkEnableOption "Spam/ham trainer for rspamd"; - settings = mkOption { + settings = lib.mkOption { default = { }; description = '' IMAP authentication configuration for rspamd-trainer. For supplying the IMAP password, use the `secrets` option. ''; - type = types.submodule { + type = lib.types.submodule { freeformType = format.type; }; - example = literalExpression '' + example = lib.literalExpression '' { HOST = "localhost"; USERNAME = "spam@example.com"; @@ -31,7 +28,7 @@ in { }; secrets = lib.mkOption { - type = with types; listOf path; + type = with lib.types; listOf path; description = '' A list of files containing the various secrets. Should be in the format expected by systemd's `EnvironmentFile` directory. For the @@ -42,7 +39,7 @@ in { }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd = { services.rspamd-trainer = { diff --git a/nixos/modules/services/mail/rss2email.nix b/nixos/modules/services/mail/rss2email.nix index c3327f7b436cd..12553b9d8919a 100644 --- a/nixos/modules/services/mail/rss2email.nix +++ b/nixos/modules/services/mail/rss2email.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.rss2email; in { @@ -12,25 +9,25 @@ in { services.rss2email = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to enable rss2email."; }; - to = mkOption { - type = types.str; + to = lib.mkOption { + type = lib.types.str; description = "Mail address to which to send emails"; }; - interval = mkOption { - type = types.str; + interval = lib.mkOption { + type = lib.types.str; default = "12h"; description = "How often to check the feeds, in systemd interval format"; }; - config = mkOption { - type = with types; attrsOf (oneOf [ str int bool ]); + config = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ str int bool ]); default = {}; description = '' The configuration to give rss2email. @@ -48,17 +45,17 @@ in { ''; }; - feeds = mkOption { + feeds = lib.mkOption { description = "The feeds to watch."; - type = types.attrsOf (types.submodule { + type = lib.types.attrsOf (lib.types.submodule { options = { - url = mkOption { - type = types.str; + url = lib.mkOption { + type = lib.types.str; description = "The URL at which to fetch the feed."; }; - to = mkOption { - type = with types; nullOr str; + to = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' Email address to which to send feed items. @@ -78,7 +75,7 @@ in { ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.groups = { rss2email.gid = config.ids.gids.rss2email; }; @@ -104,7 +101,7 @@ in { systemd.services.rss2email = let conf = pkgs.writeText "rss2email.cfg" (lib.generators.toINI {} ({ DEFAULT = cfg.config; - } // lib.mapAttrs' (name: feed: nameValuePair "feed.${name}" ( + } // lib.mapAttrs' (name: feed: lib.nameValuePair "feed.${name}" ( { inherit (feed) url; } // lib.optionalAttrs (feed.to != null) { inherit (feed) to; } )) cfg.feeds diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix index fe433f9a26621..aabe46d607a8c 100644 --- a/nixos/modules/services/mail/stalwart-mail.nix +++ b/nixos/modules/services/mail/stalwart-mail.nix @@ -73,8 +73,14 @@ in { resolver.public-suffix = lib.mkDefault [ "file://${pkgs.publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" ]; - config.resource = { + config.resource = let + hasHttpListener = builtins.any (listener: listener.protocol == "http") (lib.attrValues cfg.settings.server.listener); + in { spam-filter = lib.mkDefault "file://${cfg.package}/etc/stalwart/spamfilter.toml"; + } // lib.optionalAttrs ( + (builtins.hasAttr "listener" cfg.settings.server) && hasHttpListener + ) { + webadmin = lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip"; }; }; diff --git a/nixos/modules/services/matrix/appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix index 55a04059abe49..ac8d4250b9acf 100644 --- a/nixos/modules/services/matrix/appservice-irc.nix +++ b/nixos/modules/services/matrix/appservice-irc.nix @@ -137,6 +137,40 @@ in { type = submodule { freeformType = jsonType; }; description = "IRC servers to connect to"; }; + + mediaProxy = { + signingKeyPath = lib.mkOption { + type = path; + default = "/var/lib/matrix-appservice-irc/media-signingkey.jwk"; + description = '' + Path to the signing key file for authenticated media. + ''; + }; + ttlSeconds = lib.mkOption { + type = ints.unsigned; + default = 3600; + example = 0; + description = '' + Lifetime in seconds, that generated URLs stay valid. + + Set the lifetime to 0 to prevent URLs from becoming invalid. + ''; + }; + bindPort = lib.mkOption { + type = port; + default = 11111; + description = '' + Port that the media proxy binds to. + ''; + }; + publicUrl = lib.mkOption { + type = str; + example = "https://matrix.example.com/media"; + description = '' + URL under which the media proxy is publicly acccessible. + ''; + }; + }; }; }; }; @@ -144,6 +178,7 @@ in { }; }; }; + config = lib.mkIf cfg.enable { systemd.services.matrix-appservice-irc = { description = "Matrix-IRC bridge"; @@ -181,6 +216,9 @@ in { sed -i "s/^hs_token:.*$/$hs_token/g" ${registrationFile} sed -i "s/^as_token:.*$/$as_token/g" ${registrationFile} fi + if ! [ -f "${cfg.settings.ircService.mediaProxy.signingKeyPath}"]; then + ${lib.getExe pkgs.nodejs} ${pkg}/lib/generate-signing-key.js > "${cfg.settings.ircService.mediaProxy.signingKeyPath}" + fi # Allow synapse access to the registration if ${pkgs.getent}/bin/getent group matrix-synapse > /dev/null; then chgrp matrix-synapse ${registrationFile} diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix index 5152dfadf2e59..fdd91d7762547 100644 --- a/nixos/modules/services/matrix/dendrite.nix +++ b/nixos/modules/services/matrix/dendrite.nix @@ -258,7 +258,7 @@ in default = { }; description = '' Configuration for dendrite, see: - + for available options with which to populate settings. ''; }; diff --git a/nixos/modules/services/matrix/hookshot.nix b/nixos/modules/services/matrix/hookshot.nix new file mode 100644 index 0000000000000..d6329e91459e1 --- /dev/null +++ b/nixos/modules/services/matrix/hookshot.nix @@ -0,0 +1,127 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.services.matrix-hookshot; + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "matrix-hookshot-config.yml" cfg.settings; +in +{ + options = { + services.matrix-hookshot = { + enable = lib.mkEnableOption "matrix-hookshot, a bridge between Matrix and project management services"; + + package = lib.mkPackageOption pkgs "matrix-hookshot" { }; + + registrationFile = lib.mkOption { + type = lib.types.path; + description = '' + Appservice registration file. + As it contains secret tokens, you may not want to add this to the publicly readable Nix store. + ''; + example = lib.literalExpression '' + pkgs.writeText "matrix-hookshot-registration" \'\' + id: matrix-hookshot + as_token: aaaaaaaaaa + hs_token: aaaaaaaaaa + namespaces: + rooms: [] + users: + - regex: "@_webhooks_.*:foobar" + exclusive: true + + sender_localpart: hookshot + url: "http://localhost:9993" + rate_limited: false + \'\' + ''; + }; + + settings = lib.mkOption { + description = '' + {file}`config.yml` configuration as a Nix attribute set. + + For details please see the [documentation](https://matrix-org.github.io/matrix-hookshot/latest/setup/sample-configuration.html). + ''; + example = { + bridge = { + domain = "example.com"; + url = "http://localhost:8008"; + mediaUrl = "https://example.com"; + port = 9993; + bindAddress = "127.0.0.1"; + }; + listeners = [ + { + port = 9000; + bindAddress = "0.0.0.0"; + resources = [ "webhooks" ]; + } + { + port = 9001; + bindAddress = "localhost"; + resources = [ + "metrics" + "provisioning" + ]; + } + ]; + }; + default = { }; + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + passFile = lib.mkOption { + type = lib.types.path; + default = "/var/lib/matrix-hookshot/passkey.pem"; + description = '' + A passkey used to encrypt tokens stored inside the bridge. + File will be generated if not found. + ''; + }; + }; + }; + }; + + 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-hookshot = { + description = "a bridge between Matrix and multiple project management services"; + + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ] ++ cfg.serviceDependencies; + after = [ "network-online.target" ] ++ cfg.serviceDependencies; + + preStart = '' + if [ ! -f '${cfg.settings.passFile}' ]; then + mkdir -p $(dirname '${cfg.settings.passFile}') + ${pkgs.openssl}/bin/openssl genpkey -out '${cfg.settings.passFile}' -outform PEM -algorithm RSA -pkeyopt rsa_keygen_bits:4096 + fi + ''; + + serviceConfig = { + Type = "simple"; + Restart = "always"; + ExecStart = "${cfg.package}/bin/matrix-hookshot ${configFile} ${cfg.registrationFile}"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ flandweber ]; +} diff --git a/nixos/modules/services/matrix/mautrix-signal.md b/nixos/modules/services/matrix/mautrix-signal.md new file mode 100644 index 0000000000000..da65964e15048 --- /dev/null +++ b/nixos/modules/services/matrix/mautrix-signal.md @@ -0,0 +1,32 @@ +# Mautrix-Signal {#module-services-mautrix-signal} + +[Mautrix-Signal](https://github.com/mautrix/signal) is a Matrix-Signal puppeting bridge. + +## Configuration {#module-services-mautrix-signal-configuration} + +1. Set [](#opt-services.mautrix-signal.enable) to `true`. The service will use + SQLite by default. +2. To create your configuration check the default configuration for + [](#opt-services.mautrix-signal.settings). To obtain the complete default + configuration, run + `nix-shell -p mautrix-signal --run "mautrix-signal -c default.yaml -e"`. + +::: {.warning} +Mautrix-Signal allows for some options like `encryption.pickle_key`, +`provisioning.shared_secret`, allow the value `generate` to be set. +Since the configuration file is regenerated on every start of the +service, the generated values would be discarded and might break your +installation. Instead, set those values via +[](#opt-services.mautrix-signal.environmentFile). +::: + +## Migrating from an older configuration {#module-services-mautrix-signal-migrate-configuration} + +With Mautrix-Signal v0.7.0 the configuration has been rearranged. Mautrix-Signal +performs an automatic configuration migration so your pre-0.7.0 configuration +should just continue to work. + +In case you want to update your NixOS configuration, compare the migrated configuration +at `/var/lib/mautrix-signal/config.yaml` with the default configuration +(`nix-shell -p mautrix-signal --run "mautrix-signal -c example.yaml -e"`) and +update your module configuration accordingly. diff --git a/nixos/modules/services/matrix/mautrix-signal.nix b/nixos/modules/services/matrix/mautrix-signal.nix index 0da95b9c8a7b4..b4a838612633b 100644 --- a/nixos/modules/services/matrix/mautrix-signal.nix +++ b/nixos/modules/services/matrix/mautrix-signal.nix @@ -1,7 +1,8 @@ -{ lib -, config -, pkgs -, ... +{ + lib, + config, + pkgs, + ... }: let cfg = config.services.mautrix-signal; @@ -16,12 +17,22 @@ let optOneOf = lib.lists.findFirst (value: value.condition) (lib.mkIf false null); mkDefaults = lib.mapAttrsRecursive (n: v: lib.mkDefault v); defaultConfig = { + network = { + displayname_template = "{{or .ProfileName .PhoneNumber \"Unknown user\"}}"; + }; + bridge = { + command_prefix = "!signal"; + relay.enabled = true; + permissions."*" = "relay"; + }; + database = { + type = "sqlite3"; + uri = "file:${dataDir}/mautrix-signal.db?_txlock=immediate"; + }; homeserver.address = "http://localhost:8448"; appservice = { hostname = "[::]"; port = appservicePort; - database.type = "sqlite3"; - database.uri = "file:${dataDir}/mautrix-signal.db?_txlock=immediate"; id = "signal"; bot = { username = "signalbot"; @@ -29,16 +40,19 @@ let }; as_token = ""; hs_token = ""; - }; - bridge = { username_template = "signal_{{.}}"; - displayname_template = "{{or .ProfileName .PhoneNumber \"Unknown user\"}}"; - double_puppet_server_map = { }; - login_shared_secret_map = { }; - command_prefix = "!signal"; - permissions."*" = "relay"; - relay.enabled = true; }; + double_puppet = { + servers = { }; + secrets = { }; + }; + # By default, the following keys/secrets are set to `generate`. This would break when the service + # is restarted, since the previously generated configuration will be overwritten everytime. + # If encryption is enabled, it's recommended to set those keys via `environmentFile`. + encryption.pickle_key = ""; + provisioning.shared_secret = ""; + public_media.signing_key = ""; + direct_media.server_key = ""; logging = { min_level = "info"; writers = lib.singleton { @@ -60,38 +74,42 @@ in default = defaultConfig; description = '' {file}`config.yaml` configuration as a Nix attribute set. - Configuration options should match those described in - [example-config.yaml](https://github.com/mautrix/signal/blob/master/example-config.yaml). + Configuration options should match those described in the example configuration. + Get an example configuration by executing `mautrix-signal -c example.yaml --generate-example-config` Secret tokens should be specified using {option}`environmentFile` instead of this world-readable attribute set. ''; example = { - appservice = { - database = { - type = "postgres"; - uri = "postgresql:///mautrix_signal?host=/run/postgresql"; - }; - id = "signal"; - ephemeral_events = false; - }; bridge = { - history_sync = { - request_full_sync = true; - }; private_chat_portal_meta = true; - mute_bridging = true; - encryption = { - allow = true; - default = true; - require = true; - }; - provisioning = { - shared_secret = "disable"; - }; + mute_only_on_create = false; permissions = { "example.com" = "user"; }; }; + database = { + type = "postgres"; + uri = "postgresql:///mautrix_signal?host=/run/postgresql"; + }; + homeserver = { + address = "http://[::1]:8008"; + domain = "my-domain.tld"; + }; + appservice = { + id = "signal"; + ephemeral_events = false; + }; + matrix.message_status_events = true; + provisioning = { + shared_secret = "disable"; + }; + backfill.enabled = true; + encryption = { + allow = true; + default = true; + require = true; + pickle_key = "$ENCRYPTION_PICKLE_KEY"; + }; }; }; @@ -102,16 +120,15 @@ in File containing environment variables to be passed to the mautrix-signal service. If an environment variable `MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET` is set, then its value will be used in the configuration file for the option - `login_shared_secret_map` without leaking it to the store, using the configured + `double_puppet.secrets` without leaking it to the store, using the configured `homeserver.domain` as key. - See [here](https://github.com/mautrix/signal/blob/main/example-config.yaml) - for the documentation of `login_shared_secret_map`. ''; }; serviceDependencies = lib.mkOption { type = with lib.types; listOf str; - default = (lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit) + default = + (lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit) ++ (lib.optional config.services.matrix-conduit.enable "conduit.service"); defaultText = lib.literalExpression '' (optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit) @@ -154,15 +171,18 @@ in }; # Note: this is defined here to avoid the docs depending on `config` - services.mautrix-signal.settings.homeserver = optOneOf (with config.services; [ - (lib.mkIf matrix-synapse.enable (mkDefaults { - domain = matrix-synapse.settings.server_name; - })) - (lib.mkIf matrix-conduit.enable (mkDefaults { - domain = matrix-conduit.settings.global.server_name; - address = "http://localhost:${toString matrix-conduit.settings.global.port}"; - })) - ]); + services.mautrix-signal.settings.homeserver = optOneOf ( + with config.services; + [ + (lib.mkIf matrix-synapse.enable (mkDefaults { + domain = matrix-synapse.settings.server_name; + })) + (lib.mkIf matrix-conduit.enable (mkDefaults { + domain = matrix-conduit.settings.global.server_name; + address = "http://localhost:${toString matrix-conduit.settings.global.port}"; + })) + ] + ); systemd.services.mautrix-signal = { description = "mautrix-signal, a Matrix-Signal puppeting bridge."; @@ -201,7 +221,7 @@ in ${pkgs.yq}/bin/yq -s '.[0].appservice.as_token = .[1].as_token | .[0].appservice.hs_token = .[1].hs_token | .[0] - | if env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET then .bridge.login_shared_secret_map.[.homeserver.domain] = env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET else . end' \ + | if env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET then .double_puppet.secrets.[.homeserver.domain] = env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET else . end' \ '${settingsFile}' '${registrationFile}' > '${settingsFile}.tmp' mv '${settingsFile}.tmp' '${settingsFile}' umask $old_umask @@ -240,10 +260,17 @@ in SystemCallErrorNumber = "EPERM"; SystemCallFilter = [ "@system-service" ]; Type = "simple"; - UMask = 0027; + UMask = 27; }; restartTriggers = [ settingsFileUnsubstituted ]; }; }; - meta.maintainers = with lib.maintainers; [ niklaskorz ]; + meta = { + buildDocsInSandbox = false; + doc = ./mautrix-signal.md; + maintainers = with lib.maintainers; [ + niklaskorz + frederictobiasc + ]; + }; } diff --git a/nixos/modules/services/matrix/synapse.md b/nixos/modules/services/matrix/synapse.md index 0ce13550d5b22..62967adddb4b1 100644 --- a/nixos/modules/services/matrix/synapse.md +++ b/nixos/modules/services/matrix/synapse.md @@ -188,7 +188,7 @@ or [OpenID](https://element-hq.github.io/synapse/latest/openid.html). ## Element (formerly known as Riot) Web Client {#module-services-matrix-element-web} -[Element Web](https://github.com/vector-im/riot-web/) is +[Element Web](https://github.com/element-hq/element-web) is the reference web client for Matrix and developed by the core team at matrix.org. Element was formerly known as Riot.im, see the [Element introductory blog post](https://element.io/blog/welcome-to-element/) @@ -228,6 +228,6 @@ the example, this means that you should not reuse the `myhostname.example.org` virtualHost to also serve Element, but instead serve it on a different subdomain, like `element.example.org` in the example. See the -[Element Important Security Notes](https://github.com/vector-im/element-web/tree/v1.10.0#important-security-notes) +[Element Important Security Notes](https://github.com/element-hq/element-web/tree/v1.10.0#important-security-notes) for more information on this subject. ::: diff --git a/nixos/modules/services/misc/amazon-ssm-agent.nix b/nixos/modules/services/misc/amazon-ssm-agent.nix index 89acbf09fea85..8267f9c42f8ce 100644 --- a/nixos/modules/services/misc/amazon-ssm-agent.nix +++ b/nixos/modules/services/misc/amazon-ssm-agent.nix @@ -37,7 +37,12 @@ in { after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ fake-lsb-release pkgs.coreutils ]; + path = [ + fake-lsb-release + pkgs.coreutils + "/run/wrappers" + "/run/current-system/sw" + ]; serviceConfig = { ExecStart = "${cfg.package}/bin/amazon-ssm-agent"; diff --git a/nixos/modules/services/misc/anki-sync-server.md b/nixos/modules/services/misc/anki-sync-server.md index 5482a4aa0e5ff..4796abf25c430 100644 --- a/nixos/modules/services/misc/anki-sync-server.md +++ b/nixos/modules/services/misc/anki-sync-server.md @@ -56,13 +56,3 @@ following options: services.anki-sync-server.openFirewall = true; } ``` - - -## Alternatives {#module-services-anki-sync-server-alternatives} - -The [`ankisyncd` NixOS -module](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/misc/ankisyncd.nix) -provides similar functionality, but using a third-party implementation, -[`anki-sync-server-rs`](https://github.com/ankicommunity/anki-sync-server-rs/). -According to that project's README, it is "no longer maintained", and not -recommended for Anki 2.1.64+. diff --git a/nixos/modules/services/misc/ankisyncd.nix b/nixos/modules/services/misc/ankisyncd.nix deleted file mode 100644 index dd05b49538eb3..0000000000000 --- a/nixos/modules/services/misc/ankisyncd.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.services.ankisyncd; - - name = "ankisyncd"; - - stateDir = "/var/lib/${name}"; - - toml = pkgs.formats.toml {}; - - configFile = toml.generate "ankisyncd.conf" { - listen = { - host = cfg.host; - port = cfg.port; - }; - paths.root_dir = stateDir; - # encryption.ssl_enable / cert_file / key_file - }; -in - { - options.services.ankisyncd = { - enable = lib.mkEnableOption "ankisyncd, a standalone unofficial anky sync server"; - - package = lib.mkPackageOption pkgs "ankisyncd" { }; - - host = lib.mkOption { - type = lib.types.str; - default = "localhost"; - description = "ankisyncd host"; - }; - - port = lib.mkOption { - type = lib.types.port; - default = 27701; - description = "ankisyncd port"; - }; - - openFirewall = lib.mkOption { - default = false; - type = lib.types.bool; - description = "Whether to open the firewall for the specified port."; - }; - }; - - config = lib.mkIf cfg.enable { - warnings = [ - '' - `services.ankisyncd` has been replaced by `services.anki-sync-server` and will be removed after - 24.05 because anki-sync-server(-rs and python) are not maintained. - '' - ]; - networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ]; - - systemd.services.ankisyncd = { - description = "ankisyncd - Anki sync server"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - path = [ cfg.package ]; - - serviceConfig = { - Type = "simple"; - DynamicUser = true; - StateDirectory = name; - ExecStart = "${cfg.package}/bin/ankisyncd --config ${configFile}"; - Restart = "always"; - }; - }; - }; - } diff --git a/nixos/modules/services/misc/bees.nix b/nixos/modules/services/misc/bees.nix index 170f92253c635..0824e0a8835c2 100644 --- a/nixos/modules/services/misc/bees.nix +++ b/nixos/modules/services/misc/bees.nix @@ -23,7 +23,7 @@ let example = "LABEL=MyBulkDataDrive"; }; options.hashTableSizeMB = lib.mkOption { - type = lib.types.addCheck lib.types.int (n: mod n 16 == 0); + type = lib.types.addCheck lib.types.int (n: lib.mod n 16 == 0); default = 1024; # 1GB; default from upstream beesd script description = '' Hash table size in MB; must be a multiple of 16. diff --git a/nixos/modules/services/misc/fstrim.nix b/nixos/modules/services/misc/fstrim.nix index 8ead4a645f7c0..f22505841fa39 100644 --- a/nixos/modules/services/misc/fstrim.nix +++ b/nixos/modules/services/misc/fstrim.nix @@ -8,7 +8,9 @@ in { options = { services.fstrim = { - enable = lib.mkEnableOption "periodic SSD TRIM of mounted partitions in background"; + enable = (lib.mkEnableOption "periodic SSD TRIM of mounted partitions in background" // { + default = true; + }); interval = lib.mkOption { type = lib.types.str; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 9fd6014f2c71c..ecbc087f739fd 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1127,6 +1127,11 @@ in { environment.systemPackages = [ gitlab-rake gitlab-rails cfg.packages.gitlab-shell ]; + systemd.slices.system-gitlab = { + description = "GitLab DevOps Platform Slice"; + documentation = [ "https://docs.gitlab.com/" ]; + }; + systemd.targets.gitlab = { description = "Common target for all GitLab services."; wantedBy = [ "multi-user.target" ]; @@ -1197,6 +1202,7 @@ in { ''; serviceConfig = { + Slice = "system-gitlab.slice"; User = pgsql.superUser; Type = "oneshot"; RemainAfterExit = true; @@ -1220,6 +1226,9 @@ in { unitConfig = { ConditionPathExists = "!${cfg.registry.certFile}"; }; + serviceConfig = { + Slice = "system-gitlab.slice"; + }; }; # Ensure Docker Registry launches after the certificate generation job @@ -1308,6 +1317,7 @@ in { TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; + Slice = "system-gitlab.slice"; RemainAfterExit = true; ExecStartPre = let @@ -1424,6 +1434,7 @@ in { TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; + Slice = "system-gitlab.slice"; RemainAfterExit = true; ExecStart = pkgs.writeShellScript "gitlab-db-config" '' @@ -1480,6 +1491,7 @@ in { TimeoutSec = "infinity"; Restart = "always"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; + Slice = "system-gitlab.slice"; ExecStart = utils.escapeSystemdExecArgs ( [ "${cfg.packages.gitlab}/share/gitlab/bin/sidekiq-cluster" @@ -1512,6 +1524,7 @@ in { Restart = "on-failure"; WorkingDirectory = gitlabEnv.HOME; RuntimeDirectory = "gitaly"; + Slice = "system-gitlab.slice"; ExecStart = "${cfg.packages.gitaly}/bin/gitaly ${gitalyToml}"; }; }; @@ -1573,6 +1586,7 @@ in { WorkingDirectory = gitlabEnv.HOME; RuntimeDirectory = "gitlab-pages"; RuntimeDirectoryMode = "0700"; + Slice = "system-gitlab.slice"; }; }; @@ -1596,6 +1610,7 @@ in { TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = gitlabEnv.HOME; + Slice = "system-gitlab.slice"; ExecStartPre = pkgs.writeShellScript "gitlab-workhorse-pre-start" '' set -o errexit -o pipefail -o nounset shopt -s dotglob nullglob inherit_errexit @@ -1637,6 +1652,7 @@ in { Group = cfg.group; ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec mail_room -c ${cfg.statePath}/config/mail_room.yml"; WorkingDirectory = gitlabEnv.HOME; + Slice = "system-gitlab.slice"; }; }; @@ -1671,6 +1687,7 @@ in { TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; + Slice = "system-gitlab.slice"; ExecStart = concatStringsSep " " [ "${cfg.packages.gitlab.rubyEnv}/bin/bundle" "exec" "puma" "-e production" @@ -1695,6 +1712,7 @@ in { serviceConfig = { User = cfg.user; Group = cfg.group; + Slice = "system-gitlab.slice"; ExecStart = "${gitlab-rake}/bin/gitlab-rake gitlab:backup:create"; }; }; diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index 89f72c046755f..779a9ac9929db 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.gitolite; # Use writeTextDir to not leak Nix store hash into file name @@ -11,8 +8,8 @@ in { options = { services.gitolite = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable gitolite management under the @@ -22,8 +19,8 @@ in ''; }; - dataDir = mkOption { - type = types.str; + dataDir = lib.mkOption { + type = lib.types.str; default = "/var/lib/gitolite"; description = '' The gitolite home directory used to store all repositories. If left as the default value @@ -33,8 +30,8 @@ in ''; }; - adminPubkey = mkOption { - type = types.str; + adminPubkey = lib.mkOption { + type = lib.types.str; description = '' Initial administrative public key for Gitolite. This should be an SSH Public Key. Note that this key will only be used @@ -43,8 +40,8 @@ in ''; }; - enableGitAnnex = mkOption { - type = types.bool; + enableGitAnnex = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable git-annex support. Uses the `extraGitoliteRc` option @@ -52,18 +49,18 @@ in ''; }; - commonHooks = mkOption { - type = types.listOf types.path; + commonHooks = lib.mkOption { + type = lib.types.listOf lib.types.path; default = []; description = '' A list of custom git hooks that get copied to `~/.gitolite/hooks/common`. ''; }; - extraGitoliteRc = mkOption { - type = types.lines; + extraGitoliteRc = lib.mkOption { + type = lib.types.lines; default = ""; - example = literalExpression '' + example = lib.literalExpression '' ''' $RC{UMASK} = 0027; $RC{SITE_INFO} = 'This is our private repository host'; @@ -93,24 +90,24 @@ in ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "gitolite"; description = '' Gitolite user account. This is the username of the gitolite endpoint. ''; }; - description = mkOption { - type = types.str; + description = lib.mkOption { + type = lib.types.str; default = "Gitolite user"; description = '' Gitolite user account's description. ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "gitolite"; description = '' Primary group of the Gitolite user account. @@ -119,7 +116,7 @@ in }; }; - config = mkIf cfg.enable ( + config = lib.mkIf cfg.enable ( let manageGitoliteRc = cfg.extraGitoliteRc != ""; rcDir = pkgs.runCommand "gitolite-rc" { preferLocalBuild = true; } rcDirScript; @@ -136,18 +133,18 @@ in END cat "$out/gitolite.rc.default" >>"$out/gitolite.rc" '' + - optionalString (cfg.extraGitoliteRc != "") '' - echo -n ${escapeShellArg '' + lib.optionalString (cfg.extraGitoliteRc != "") '' + echo -n ${lib.escapeShellArg '' # Added by NixOS: - ${removeSuffix "\n" cfg.extraGitoliteRc} + ${lib.removeSuffix "\n" cfg.extraGitoliteRc} # per perl rules, this should be the last line in such a file: 1; ''} >>"$out/gitolite.rc" ''; in { - services.gitolite.extraGitoliteRc = optionalString cfg.enableGitAnnex '' + services.gitolite.extraGitoliteRc = lib.optionalString cfg.enableGitAnnex '' # Enable git-annex support: push( @{$RC{ENABLE}}, 'git-annex-shell ua'); ''; @@ -171,8 +168,8 @@ in GITOLITE_RC_DEFAULT = "${rcDir}/gitolite.rc.default"; }; - serviceConfig = mkMerge [ - (mkIf (cfg.dataDir == "/var/lib/gitolite") { + serviceConfig = lib.mkMerge [ + (lib.mkIf (cfg.dataDir == "/var/lib/gitolite") { StateDirectory = "gitolite gitolite/.gitolite gitolite/.gitolite/logs"; StateDirectoryMode = "0750"; }) @@ -236,6 +233,6 @@ in }; environment.systemPackages = [ pkgs.gitolite pkgs.git ] - ++ optional cfg.enableGitAnnex pkgs.git-annex; + ++ lib.optional cfg.enableGitAnnex pkgs.git-annex; }); } diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index e4e23d5972377..a2c1ad0779e15 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -1,7 +1,4 @@ { config, lib, options, pkgs, ... }: - -with lib; - let cfg = config.services.gogs; opt = options.services.gogs; @@ -29,7 +26,7 @@ let [session] COOKIE_NAME = session - COOKIE_SECURE = ${boolToString cfg.cookieSecure} + COOKIE_SECURE = ${lib.boolToString cfg.cookieSecure} [security] SECRET_KEY = #secretkey# @@ -45,70 +42,70 @@ in { options = { services.gogs = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "Enable Go Git Service."; }; - useWizard = mkOption { + useWizard = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "Do not generate a configuration and use Gogs' installation wizard instead. The first registered user will be administrator."; }; - stateDir = mkOption { + stateDir = lib.mkOption { default = "/var/lib/gogs"; - type = types.str; + type = lib.types.str; description = "Gogs data directory."; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "gogs"; description = "User account under which Gogs runs."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "gogs"; description = "Group account under which Gogs runs."; }; database = { - type = mkOption { - type = types.enum [ "sqlite3" "mysql" "postgres" ]; + type = lib.mkOption { + type = lib.types.enum [ "sqlite3" "mysql" "postgres" ]; example = "mysql"; default = "sqlite3"; description = "Database engine to use."; }; - host = mkOption { - type = types.str; + host = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = "Database host address."; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 3306; description = "Database host port."; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "gogs"; description = "Database name."; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "gogs"; description = "Database user."; }; - password = mkOption { - type = types.str; + password = lib.mkOption { + type = lib.types.str; default = ""; description = '' The password corresponding to {option}`database.user`. @@ -117,8 +114,8 @@ in ''; }; - passwordFile = mkOption { - type = types.nullOr types.path; + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; example = "/run/keys/gogs-dbpassword"; description = '' @@ -127,53 +124,53 @@ in ''; }; - path = mkOption { - type = types.str; + path = lib.mkOption { + type = lib.types.str; default = "${cfg.stateDir}/data/gogs.db"; - defaultText = literalExpression ''"''${config.${opt.stateDir}}/data/gogs.db"''; + defaultText = lib.literalExpression ''"''${config.${opt.stateDir}}/data/gogs.db"''; description = "Path to the sqlite3 database file."; }; }; - appName = mkOption { - type = types.str; + appName = lib.mkOption { + type = lib.types.str; default = "Gogs: Go Git Service"; description = "Application name."; }; - repositoryRoot = mkOption { - type = types.str; + repositoryRoot = lib.mkOption { + type = lib.types.str; default = "${cfg.stateDir}/repositories"; - defaultText = literalExpression ''"''${config.${opt.stateDir}}/repositories"''; + defaultText = lib.literalExpression ''"''${config.${opt.stateDir}}/repositories"''; description = "Path to the git repositories."; }; - domain = mkOption { - type = types.str; + domain = lib.mkOption { + type = lib.types.str; default = "localhost"; description = "Domain name of your server."; }; - rootUrl = mkOption { - type = types.str; + rootUrl = lib.mkOption { + type = lib.types.str; default = "http://localhost:3000/"; description = "Full public URL of Gogs server."; }; - httpAddress = mkOption { - type = types.str; + httpAddress = lib.mkOption { + type = lib.types.str; default = "0.0.0.0"; description = "HTTP listen address."; }; - httpPort = mkOption { - type = types.port; + httpPort = lib.mkOption { + type = lib.types.port; default = 3000; description = "HTTP listen port."; }; - cookieSecure = mkOption { - type = types.bool; + cookieSecure = lib.mkOption { + type = lib.types.bool; default = false; description = '' Marks session cookies as "secure" as a hint for browsers to only send @@ -181,15 +178,15 @@ in ''; }; - extraConfig = mkOption { - type = types.str; + extraConfig = lib.mkOption { + type = lib.types.str; default = ""; description = "Configuration lines appended to the generated Gogs configuration file."; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.gogs = { description = "Gogs (Go Git Service)"; @@ -204,7 +201,7 @@ in mkdir -p ${cfg.stateDir} # copy custom configuration and generate a random secret key if needed - ${optionalString (cfg.useWizard == false) '' + ${lib.optionalString (cfg.useWizard == false) '' mkdir -p ${cfg.stateDir}/custom/conf cp -f ${configFile} ${runConfig} @@ -248,7 +245,7 @@ in }; }; - users = mkIf (cfg.user == "gogs") { + users = lib.mkIf (cfg.user == "gogs") { users.gogs = { description = "Go Git Service"; uid = config.ids.uids.gogs; @@ -260,13 +257,13 @@ in groups.gogs.gid = config.ids.gids.gogs; }; - warnings = optional (cfg.database.password != "") + warnings = lib.optional (cfg.database.password != "") ''config.services.gogs.database.password will be stored as plaintext in the Nix store. Use database.passwordFile instead.''; # Create database passwordFile default when password is configured. services.gogs.database.passwordFile = - (mkDefault (toString (pkgs.writeTextFile { + (lib.mkDefault (toString (pkgs.writeTextFile { name = "gogs-database-password"; text = cfg.database.password; }))); diff --git a/nixos/modules/services/misc/gotenberg.nix b/nixos/modules/services/misc/gotenberg.nix index 57932c656d632..ed8629a7fa46f 100644 --- a/nixos/modules/services/misc/gotenberg.nix +++ b/nixos/modules/services/misc/gotenberg.nix @@ -244,7 +244,6 @@ in SystemCallFilter = [ "@system-service" - "~@resources" "~@privileged" ]; SystemCallArchitectures = "native"; diff --git a/nixos/modules/services/misc/graphical-desktop.nix b/nixos/modules/services/misc/graphical-desktop.nix index 0b5ef033e38bc..7f1e9b39210c8 100644 --- a/nixos/modules/services/misc/graphical-desktop.nix +++ b/nixos/modules/services/misc/graphical-desktop.nix @@ -55,6 +55,12 @@ in services.speechd.enable = lib.mkDefault true; + services.pipewire = { + enable = lib.mkDefault true; + pulse.enable = lib.mkDefault true; + alsa.enable = lib.mkDefault true; + }; + systemd.defaultUnit = lib.mkIf (xcfg.autorun || dmcfg.enable) "graphical.target"; xdg = { diff --git a/nixos/modules/services/misc/mame.nix b/nixos/modules/services/misc/mame.nix index 054a7803b9c4c..ed98ef3ed8a64 100644 --- a/nixos/modules/services/misc/mame.nix +++ b/nixos/modules/services/misc/mame.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.services.mame; - mame = "mame${lib.optionalString pkgs.stdenv.is64bit "64"}"; + mame = "mame${lib.optionalString pkgs.stdenv.hostPlatform.is64bit "64"}"; in { options = { diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index ce4ecbeb7279e..ae9d1fa31be21 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -36,7 +36,6 @@ let - @@ -52,7 +51,7 @@ let yes yes yes - diff --git a/nixos/modules/services/misc/open-webui.nix b/nixos/modules/services/misc/open-webui.nix index e2ed7080c9223..fd6fa64b9e192 100644 --- a/nixos/modules/services/misc/open-webui.nix +++ b/nixos/modules/services/misc/open-webui.nix @@ -60,6 +60,17 @@ in ''; }; + environmentFile = lib.mkOption { + description = '' + Environment file to be passed to the systemd service. + Useful for passing secrets to the service to prevent them from being + world-readable in the Nix store. + ''; + type = lib.types.nullOr lib.types.path; + default = null; + example = "/var/lib/secrets/openWebuiSecrets"; + }; + openFirewall = lib.mkOption { type = types.bool; default = false; @@ -82,10 +93,12 @@ in DATA_DIR = "."; HF_HOME = "."; SENTENCE_TRANSFORMERS_HOME = "."; + WEBUI_URL = "http://localhost:${toString cfg.port}"; } // cfg.environment; serviceConfig = { ExecStart = "${lib.getExe cfg.package} serve --host ${cfg.host} --port ${toString cfg.port}"; + EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile; WorkingDirectory = cfg.stateDir; StateDirectory = "open-webui"; RuntimeDirectory = "open-webui"; diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index f03d8f5db5519..73f09d804f296 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -40,8 +40,9 @@ let exec ${cfg.package}/bin/paperless-ngx "$@" ''; - # Secure the services defaultServiceConfig = { + Slice = "system-paperless.slice"; + # Secure the services ReadWritePaths = [ cfg.consumptionDir cfg.dataDir @@ -232,6 +233,11 @@ in config = mkIf cfg.enable { services.redis.servers.paperless.enable = mkIf enableRedis true; + systemd.slices.system-paperless = { + description = "Paperless Document Management System Slice"; + documentation = [ "https://docs.paperless-ngx.com" ]; + }; + systemd.tmpfiles.settings."10-paperless" = let defaultRule = { inherit (cfg) user; diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix index a9a069b0c0555..20486f0212f7b 100644 --- a/nixos/modules/services/misc/portunus.nix +++ b/nixos/modules/services/misc/portunus.nix @@ -1,23 +1,20 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.portunus; in { options.services.portunus = { - enable = mkEnableOption "Portunus, a self-contained user/group management and authentication service for LDAP"; + enable = lib.mkEnableOption "Portunus, a self-contained user/group management and authentication service for LDAP"; - domain = mkOption { - type = types.str; + domain = lib.mkOption { + type = lib.types.str; example = "sso.example.com"; description = "Subdomain which gets reverse proxied to Portunus webserver."; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 8080; description = '' Port where the Portunus webserver should listen on. @@ -26,10 +23,10 @@ in ''; }; - package = mkPackageOption pkgs "portunus" { }; + package = lib.mkPackageOption pkgs "portunus" { }; - seedPath = mkOption { - type = types.nullOr types.path; + seedPath = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' Path to a portunus seed file in json format. @@ -46,26 +43,26 @@ in ''; }; - stateDir = mkOption { - type = types.path; + stateDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/portunus"; description = "Path where Portunus stores its state."; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "portunus"; description = "User account under which Portunus runs its webserver."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "portunus"; description = "Group account under which Portunus runs its webserver."; }; dex = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' Dex ldap connector. To activate dex, first a search user must be created in the Portunus web ui @@ -73,15 +70,15 @@ in in the [](#opt-services.dex.environmentFile) setting ''; - oidcClients = mkOption { - type = types.listOf (types.submodule { + oidcClients = lib.mkOption { + type = lib.types.listOf (lib.types.submodule { options = { - callbackURL = mkOption { - type = types.str; + callbackURL = lib.mkOption { + type = lib.types.str; description = "URL where the OIDC client should redirect"; }; - id = mkOption { - type = types.str; + id = lib.mkOption { + type = lib.types.str; description = "ID of the OIDC client"; }; }; @@ -105,23 +102,23 @@ in ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 5556; description = "Port where dex should listen on."; }; }; ldap = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.openldap; defaultText = lib.literalExpression "pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; }"; description = "The OpenLDAP package to use."; }; - searchUserName = mkOption { - type = types.str; + searchUserName = lib.mkOption { + type = lib.types.str; default = ""; example = "admin"; description = '' @@ -130,8 +127,8 @@ in ''; }; - suffix = mkOption { - type = types.str; + suffix = lib.mkOption { + type = lib.types.str; example = "dc=example,dc=org"; description = '' The DN of the topmost entry in your LDAP directory. @@ -139,8 +136,8 @@ in ''; }; - tls = mkOption { - type = types.bool; + tls = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable LDAPS protocol. @@ -151,21 +148,21 @@ in ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "openldap"; description = "User account under which Portunus runs its LDAP server."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "openldap"; description = "Group account under which Portunus runs its LDAP server."; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = cfg.dex.enable -> cfg.ldap.searchUserName != ""; @@ -177,13 +174,13 @@ in environment.systemPackages = [ cfg.ldap.package ]; # allow connecting via ldaps /w certificate without opening ports - networking.hosts = mkIf cfg.ldap.tls { + networking.hosts = lib.mkIf cfg.ldap.tls { "::1" = [ cfg.domain ]; "127.0.0.1" = [ cfg.domain ]; }; services = { - dex = mkIf cfg.dex.enable { + dex = lib.mkIf cfg.dex.enable { enable = true; settings = { issuer = "https://${cfg.domain}/dex"; @@ -219,7 +216,7 @@ in }; }]; - staticClients = forEach cfg.dex.oidcClients (client: { + staticClients = lib.forEach cfg.dex.oidcClients (client: { inherit (client) id; redirectURIs = [ client.callbackURL ]; name = "OIDC for ${client.id}"; @@ -232,7 +229,7 @@ in }; systemd.services = { - dex = mkIf cfg.dex.enable { + dex = lib.mkIf cfg.dex.enable { serviceConfig = { # `dex.service` is super locked down out of the box, but we need some # place to write the SQLite database. This creates $STATE_DIRECTORY below @@ -261,9 +258,9 @@ in PORTUNUS_SLAPD_GROUP = cfg.ldap.group; PORTUNUS_SLAPD_USER = cfg.ldap.user; PORTUNUS_SLAPD_SCHEMA_DIR = "${cfg.ldap.package}/etc/schema"; - } // (optionalAttrs (cfg.seedPath != null) ({ + } // (lib.optionalAttrs (cfg.seedPath != null) ({ PORTUNUS_SEED_PATH = cfg.seedPath; - })) // (optionalAttrs cfg.ldap.tls ( + })) // (lib.optionalAttrs cfg.ldap.tls ( let acmeDirectory = config.security.acme.certs."${cfg.domain}".directory; in @@ -277,14 +274,14 @@ in }; }; - users.users = mkMerge [ - (mkIf (cfg.ldap.user == "openldap") { + users.users = lib.mkMerge [ + (lib.mkIf (cfg.ldap.user == "openldap") { openldap = { group = cfg.ldap.group; isSystemUser = true; }; }) - (mkIf (cfg.user == "portunus") { + (lib.mkIf (cfg.user == "portunus") { portunus = { group = cfg.group; isSystemUser = true; @@ -292,15 +289,15 @@ in }) ]; - users.groups = mkMerge [ - (mkIf (cfg.ldap.user == "openldap") { + users.groups = lib.mkMerge [ + (lib.mkIf (cfg.ldap.user == "openldap") { openldap = { }; }) - (mkIf (cfg.user == "portunus") { + (lib.mkIf (cfg.user == "portunus") { portunus = { }; }) ]; }; - meta.maintainers = [ maintainers.majewsky ] ++ teams.c3d2.members; + meta.maintainers = [ lib.maintainers.majewsky ] ++ lib.teams.c3d2.members; } diff --git a/nixos/modules/services/misc/prowlarr.nix b/nixos/modules/services/misc/prowlarr.nix index c94882a4f72a3..e37f0dc36d146 100644 --- a/nixos/modules/services/misc/prowlarr.nix +++ b/nixos/modules/services/misc/prowlarr.nix @@ -34,6 +34,7 @@ in ExecStart = "${lib.getExe cfg.package} -nobrowser -data=/var/lib/prowlarr"; Restart = "on-failure"; }; + environment.HOME = "/var/empty"; }; networking.firewall = mkIf cfg.openFirewall { diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix index 3a393bf0f1f20..cd7a2452223ac 100644 --- a/nixos/modules/services/misc/radicle.nix +++ b/nixos/modules/services/misc/radicle.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.services.radicle; @@ -14,18 +13,18 @@ let # Convenient wrapper to run `rad` in the namespaces of `radicle-node.service` rad-system = pkgs.writeShellScriptBin "rad-system" '' set -o allexport - ${toShellVars env} + ${lib.toShellVars env} # Note that --env is not used to preserve host's envvars like $TERM - exec ${getExe' pkgs.util-linux "nsenter"} -a \ - -t "$(${getExe' config.systemd.package "systemctl"} show -P MainPID radicle-node.service)" \ - -S "$(${getExe' config.systemd.package "systemctl"} show -P UID radicle-node.service)" \ - -G "$(${getExe' config.systemd.package "systemctl"} show -P GID radicle-node.service)" \ - ${getExe' cfg.package "rad"} "$@" + exec ${lib.getExe' pkgs.util-linux "nsenter"} -a \ + -t "$(${lib.getExe' config.systemd.package "systemctl"} show -P MainPID radicle-node.service)" \ + -S "$(${lib.getExe' config.systemd.package "systemctl"} show -P UID radicle-node.service)" \ + -G "$(${lib.getExe' config.systemd.package "systemctl"} show -P GID radicle-node.service)" \ + ${lib.getExe' cfg.package "rad"} "$@" ''; commonServiceConfig = serviceName: { environment = env // { - RUST_LOG = mkDefault "info"; + RUST_LOG = lib.mkDefault "info"; }; path = [ pkgs.gitMinimal @@ -41,11 +40,11 @@ let "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig = mkMerge [ + serviceConfig = lib.mkMerge [ { BindReadOnlyPaths = [ "${cfg.configFile}:${env.RAD_HOME}/config.json" - "${if types.path.check cfg.publicKey then cfg.publicKey else pkgs.writeText "radicle.pub" cfg.publicKey}:${env.RAD_HOME}/keys/radicle.pub" + "${if lib.types.path.check cfg.publicKey then cfg.publicKey else pkgs.writeText "radicle.pub" cfg.publicKey}:${env.RAD_HOME}/keys/radicle.pub" ]; KillMode = "process"; StateDirectory = [ "radicle" ]; @@ -107,7 +106,7 @@ let pkgs.gitMinimal cfg.package pkgs.iana-etc - (getLib pkgs.nss) + (lib.getLib pkgs.nss) pkgs.tzdata ]; }; @@ -116,11 +115,11 @@ in { options = { services.radicle = { - enable = mkEnableOption "Radicle Seed Node"; - package = mkPackageOption pkgs "radicle-node" { }; - privateKeyFile = mkOption { + enable = lib.mkEnableOption "Radicle Seed Node"; + package = lib.mkPackageOption pkgs "radicle-node" { }; + privateKeyFile = lib.mkOption { # Note that a key encrypted by systemd-creds is not a path but a str. - type = with types; either path str; + type = with lib.types; either path str; description = '' Absolute file path to an SSH private key, usually generated by `rad auth`. @@ -130,44 +129,44 @@ in and the string after as a path encrypted with `systemd-creds`. ''; }; - publicKey = mkOption { - type = with types; either path str; + publicKey = lib.mkOption { + type = with lib.types; either path str; description = '' An SSH public key (as an absolute file path or directly as a string), usually generated by `rad auth`. ''; }; node = { - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "[::]"; example = "127.0.0.1"; description = "The IP address on which `radicle-node` listens."; }; - listenPort = mkOption { - type = types.port; + listenPort = lib.mkOption { + type = lib.types.port; default = 8776; description = "The port on which `radicle-node` listens."; }; - openFirewall = mkEnableOption "opening the firewall for `radicle-node`"; - extraArgs = mkOption { - type = with types; listOf str; + openFirewall = lib.mkEnableOption "opening the firewall for `radicle-node`"; + extraArgs = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; description = "Extra arguments for `radicle-node`"; }; }; - configFile = mkOption { - type = types.package; + configFile = lib.mkOption { + type = lib.types.package; internal = true; default = (json.generate "config.json" cfg.settings).overrideAttrs (previousAttrs: { preferLocalBuild = true; # None of the usual phases are run here because runCommandWith uses buildCommand, # so just append to buildCommand what would usually be a checkPhase. - buildCommand = previousAttrs.buildCommand + optionalString cfg.checkConfig '' + buildCommand = previousAttrs.buildCommand + lib.optionalString cfg.checkConfig '' ln -s $out config.json install -D -m 644 /dev/stdin keys/radicle.pub <<<"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgFMhajUng+Rjj/sCFXI9PzG8BQjru2n7JgUVF1Kbv5 snakeoil" export RAD_HOME=$PWD - ${getExe' pkgs.buildPackages.radicle-node "rad"} config >/dev/null || { + ${lib.getExe' pkgs.buildPackages.radicle-node "rad"} config >/dev/null || { cat -n config.json echo "Invalid config.json according to rad." echo "Please double-check your services.radicle.settings (producing the config.json above)," @@ -177,13 +176,13 @@ in ''; }); }; - checkConfig = mkEnableOption "checking the {file}`config.json` file resulting from {option}`services.radicle.settings`" // { default = true; }; - settings = mkOption { + checkConfig = lib.mkEnableOption "checking the {file}`config.json` file resulting from {option}`services.radicle.settings`" // { default = true; }; + settings = lib.mkOption { description = '' See https://app.radicle.xyz/nodes/seed.radicle.garden/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/radicle/src/node/config.rs#L275 ''; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { web.pinned.repositories = [ "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5" # heartwood @@ -191,27 +190,27 @@ in ]; } ''; - type = types.submodule { + type = lib.types.submodule { freeformType = json.type; }; }; httpd = { - enable = mkEnableOption "Radicle HTTP gateway to radicle-node"; - package = mkPackageOption pkgs "radicle-httpd" { }; - listenAddress = mkOption { - type = types.str; + enable = lib.mkEnableOption "Radicle HTTP gateway to radicle-node"; + package = lib.mkPackageOption pkgs "radicle-httpd" { }; + listenAddress = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = "The IP address on which `radicle-httpd` listens."; }; - listenPort = mkOption { - type = types.port; + listenPort = lib.mkOption { + type = lib.types.port; default = 8080; description = "The port on which `radicle-httpd` listens."; }; - nginx = mkOption { + nginx = lib.mkOption { # Type of a single virtual host, or null. - type = types.nullOr (types.submodule ( - recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { + type = lib.types.nullOr (lib.types.submodule ( + lib.recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { options.serverName = { default = "radicle-${config.networking.hostName}.${config.networking.domain}"; defaultText = "radicle-\${config.networking.hostName}.\${config.networking.domain}"; @@ -219,7 +218,7 @@ in } )); default = null; - example = literalExpression '' + example = lib.literalExpression '' { serverAliases = [ "seed.''${config.networking.domain}" @@ -237,8 +236,8 @@ in If this is set to null (the default), no nginx virtual host will be configured. ''; }; - extraArgs = mkOption { - type = with types; listOf str; + extraArgs = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; description = "Extra arguments for `radicle-httpd`"; }; @@ -246,19 +245,19 @@ in }; }; - config = mkIf cfg.enable (mkMerge [ + config = lib.mkIf cfg.enable (lib.mkMerge [ { - systemd.services.radicle-node = mkMerge [ + systemd.services.radicle-node = lib.mkMerge [ (commonServiceConfig "radicle-node") { description = "Radicle Node"; documentation = [ "man:radicle-node(1)" ]; serviceConfig = { - ExecStart = "${getExe' cfg.package "radicle-node"} --force --listen ${cfg.node.listenAddress}:${toString cfg.node.listenPort} ${escapeShellArgs cfg.node.extraArgs}"; - Restart = mkDefault "on-failure"; + ExecStart = "${lib.getExe' cfg.package "radicle-node"} --force --listen ${cfg.node.listenAddress}:${toString cfg.node.listenPort} ${lib.escapeShellArgs cfg.node.extraArgs}"; + Restart = lib.mkDefault "on-failure"; RestartSec = "30"; SocketBindAllow = [ "tcp:${toString cfg.node.listenPort}" ]; - SystemCallFilter = mkAfter [ + SystemCallFilter = lib.mkAfter [ # Needed by git upload-pack which calls alarm() and setitimer() when providing a rad clone "@timer" ]; @@ -271,11 +270,11 @@ in { serviceConfig = let keyCred = builtins.split ":" "${cfg.privateKeyFile}"; in - if length keyCred > 1 + if lib.length keyCred > 1 then { LoadCredentialEncrypted = [ cfg.privateKeyFile ]; # Note that neither %d nor ${CREDENTIALS_DIRECTORY} works in BindReadOnlyPaths= - BindReadOnlyPaths = [ "/run/credentials/radicle-node.service/${head keyCred}:${env.RAD_HOME}/keys/radicle" ]; + BindReadOnlyPaths = [ "/run/credentials/radicle-node.service/${lib.head keyCred}:${env.RAD_HOME}/keys/radicle" ]; } else { LoadCredential = [ "radicle:${cfg.privateKeyFile}" ]; @@ -288,7 +287,7 @@ in rad-system ]; - networking.firewall = mkIf cfg.node.openFirewall { + networking.firewall = lib.mkIf cfg.node.openFirewall { allowedTCPPorts = [ cfg.node.listenPort ]; }; @@ -304,19 +303,19 @@ in }; } - (mkIf cfg.httpd.enable (mkMerge [ + (lib.mkIf cfg.httpd.enable (lib.mkMerge [ { - systemd.services.radicle-httpd = mkMerge [ + systemd.services.radicle-httpd = lib.mkMerge [ (commonServiceConfig "radicle-httpd") { description = "Radicle HTTP gateway to radicle-node"; documentation = [ "man:radicle-httpd(1)" ]; serviceConfig = { - ExecStart = "${getExe' cfg.httpd.package "radicle-httpd"} --listen ${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort} ${escapeShellArgs cfg.httpd.extraArgs}"; - Restart = mkDefault "on-failure"; + ExecStart = "${lib.getExe' cfg.httpd.package "radicle-httpd"} --listen ${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort} ${lib.escapeShellArgs cfg.httpd.extraArgs}"; + Restart = lib.mkDefault "on-failure"; RestartSec = "10"; SocketBindAllow = [ "tcp:${toString cfg.httpd.listenPort}" ]; - SystemCallFilter = mkAfter [ + SystemCallFilter = lib.mkAfter [ # Needed by git upload-pack which calls alarm() and setitimer() when providing a git clone "@timer" ]; @@ -328,12 +327,12 @@ in ]; } - (mkIf (cfg.httpd.nginx != null) { + (lib.mkIf (cfg.httpd.nginx != null) { services.nginx.virtualHosts.${cfg.httpd.nginx.serverName} = lib.mkMerge [ cfg.httpd.nginx { - forceSSL = mkDefault true; - enableACME = mkDefault true; + forceSSL = lib.mkDefault true; + enableACME = lib.mkDefault true; locations."/" = { proxyPass = "http://${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort}"; recommendedProxySettings = true; @@ -342,8 +341,8 @@ in ]; services.radicle.settings = { - node.alias = mkDefault cfg.httpd.nginx.serverName; - node.externalAddresses = mkDefault [ + node.alias = lib.mkDefault cfg.httpd.nginx.serverName; + node.externalAddresses = lib.mkDefault [ "${cfg.httpd.nginx.serverName}:${toString cfg.node.listenPort}" ]; }; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index af1773dab267c..549228a4dae49 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -74,6 +74,12 @@ in description = "Group under which Redmine is ran."; }; + address = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "IP address Redmine should bind to."; + }; + port = mkOption { type = types.port; default = 3000; @@ -429,7 +435,7 @@ in Group = cfg.group; TimeoutSec = "300"; WorkingDirectory = "${cfg.package}/share/redmine"; - ExecStart="${bundle} exec rails server -u webrick -e production -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} -P '${cfg.stateDir}/redmine.pid'"; }; }; @@ -448,4 +454,5 @@ in }; + meta.maintainers = with lib.maintainers; [ felixsinger ]; } diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 3a906f3e714f9..5f011dbee4a6e 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -1,7 +1,4 @@ { config, lib, options, pkgs, ... }: - -with lib; - let cfg = config.services.rippled; opt = options.services.rippled; @@ -11,28 +8,28 @@ let dbCfg = db: '' type=${db.type} path=${db.path} - ${optionalString (db.compression != null) ("compression=${b2i db.compression}") } - ${optionalString (db.onlineDelete != null) ("online_delete=${toString db.onlineDelete}")} - ${optionalString (db.advisoryDelete != null) ("advisory_delete=${b2i db.advisoryDelete}")} + ${lib.optionalString (db.compression != null) ("compression=${b2i db.compression}") } + ${lib.optionalString (db.onlineDelete != null) ("online_delete=${toString db.onlineDelete}")} + ${lib.optionalString (db.advisoryDelete != null) ("advisory_delete=${b2i db.advisoryDelete}")} ${db.extraOpts} ''; rippledCfg = '' [server] - ${concatMapStringsSep "\n" (n: "port_${n}") (attrNames cfg.ports)} + ${lib.concatMapStringsSep "\n" (n: "port_${n}") (lib.attrNames cfg.ports)} - ${concatMapStrings (p: '' + ${lib.concatMapStrings (p: '' [port_${p.name}] ip=${p.ip} port=${toString p.port} - protocol=${concatStringsSep "," p.protocol} - ${optionalString (p.user != "") "user=${p.user}"} - ${optionalString (p.password != "") "user=${p.password}"} - admin=${concatStringsSep "," p.admin} - ${optionalString (p.ssl.key != null) "ssl_key=${p.ssl.key}"} - ${optionalString (p.ssl.cert != null) "ssl_cert=${p.ssl.cert}"} - ${optionalString (p.ssl.chain != null) "ssl_chain=${p.ssl.chain}"} - '') (attrValues cfg.ports)} + protocol=${lib.concatStringsSep "," p.protocol} + ${lib.optionalString (p.user != "") "user=${p.user}"} + ${lib.optionalString (p.password != "") "user=${p.password}"} + admin=${lib.concatStringsSep "," p.admin} + ${lib.optionalString (p.ssl.key != null) "ssl_key=${p.ssl.key}"} + ${lib.optionalString (p.ssl.cert != null) "ssl_cert=${p.ssl.cert}"} + ${lib.optionalString (p.ssl.chain != null) "ssl_chain=${p.ssl.chain}"} + '') (lib.attrValues cfg.ports)} [database_path] ${cfg.databasePath} @@ -40,22 +37,22 @@ let [node_db] ${dbCfg cfg.nodeDb} - ${optionalString (cfg.tempDb != null) '' + ${lib.optionalString (cfg.tempDb != null) '' [temp_db] ${dbCfg cfg.tempDb}''} - ${optionalString (cfg.importDb != null) '' + ${lib.optionalString (cfg.importDb != null) '' [import_db] ${dbCfg cfg.importDb}''} [ips] - ${concatStringsSep "\n" cfg.ips} + ${lib.concatStringsSep "\n" cfg.ips} [ips_fixed] - ${concatStringsSep "\n" cfg.ipsFixed} + ${lib.concatStringsSep "\n" cfg.ipsFixed} [validators] - ${concatStringsSep "\n" cfg.validators} + ${lib.concatStringsSep "\n" cfg.validators} [node_size] ${cfg.nodeSize} @@ -70,9 +67,9 @@ let ${toString cfg.validationQuorum} [sntp_servers] - ${concatStringsSep "\n" cfg.sntpServers} + ${lib.concatStringsSep "\n" cfg.sntpServers} - ${optionalString cfg.statsd.enable '' + ${lib.optionalString cfg.statsd.enable '' [insight] server=statsd address=${cfg.statsd.address} @@ -85,70 +82,70 @@ let portOptions = { name, ...}: { options = { - name = mkOption { + name = lib.mkOption { internal = true; default = name; }; - ip = mkOption { + ip = lib.mkOption { default = "127.0.0.1"; description = "Ip where rippled listens."; - type = types.str; + type = lib.types.str; }; - port = mkOption { + port = lib.mkOption { description = "Port where rippled listens."; - type = types.port; + type = lib.types.port; }; - protocol = mkOption { + protocol = lib.mkOption { description = "Protocols expose by rippled."; - type = types.listOf (types.enum ["http" "https" "ws" "wss" "peer"]); + type = lib.types.listOf (lib.types.enum ["http" "https" "ws" "wss" "peer"]); }; - user = mkOption { + user = lib.mkOption { description = "When set, these credentials will be required on HTTP/S requests."; - type = types.str; + type = lib.types.str; default = ""; }; - password = mkOption { + password = lib.mkOption { description = "When set, these credentials will be required on HTTP/S requests."; - type = types.str; + type = lib.types.str; default = ""; }; - admin = mkOption { + admin = lib.mkOption { description = "A comma-separated list of admin IP addresses."; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = ["127.0.0.1"]; }; ssl = { - key = mkOption { + key = lib.mkOption { description = '' Specifies the filename holding the SSL key in PEM format. ''; default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; }; - cert = mkOption { + cert = lib.mkOption { description = '' Specifies the path to the SSL certificate file in PEM format. This is not needed if the chain includes it. ''; default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; }; - chain = mkOption { + chain = lib.mkOption { description = '' If you need a certificate chain, specify the path to the certificate chain here. The chain may include the end certificate. ''; default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; }; }; }; @@ -156,44 +153,44 @@ let dbOptions = { options = { - type = mkOption { + type = lib.mkOption { description = "Rippled database type."; - type = types.enum ["rocksdb" "nudb"]; + type = lib.types.enum ["rocksdb" "nudb"]; default = "rocksdb"; }; - path = mkOption { + path = lib.mkOption { description = "Location to store the database."; - type = types.path; + type = lib.types.path; default = cfg.databasePath; - defaultText = literalExpression "config.${opt.databasePath}"; + defaultText = lib.literalExpression "config.${opt.databasePath}"; }; - compression = mkOption { + compression = lib.mkOption { description = "Whether to enable snappy compression."; - type = types.nullOr types.bool; + type = lib.types.nullOr lib.types.bool; default = null; }; - onlineDelete = mkOption { + onlineDelete = lib.mkOption { description = "Enable automatic purging of older ledger information."; - type = types.nullOr (types.addCheck types.int (v: v > 256)); + type = lib.types.nullOr (lib.types.addCheck lib.types.int (v: v > 256)); default = cfg.ledgerHistory; - defaultText = literalExpression "config.${opt.ledgerHistory}"; + defaultText = lib.literalExpression "config.${opt.ledgerHistory}"; }; - advisoryDelete = mkOption { + advisoryDelete = lib.mkOption { description = '' If set, then require administrative RPC call "can_delete" to enable online deletion of ledger records. ''; - type = types.nullOr types.bool; + type = lib.types.nullOr lib.types.bool; default = null; }; - extraOpts = mkOption { + extraOpts = lib.mkOption { description = "Extra database options."; - type = types.lines; + type = lib.types.lines; default = ""; }; }; @@ -207,13 +204,13 @@ in options = { services.rippled = { - enable = mkEnableOption "rippled, a decentralized cryptocurrency blockchain daemon implementing the XRP Ledger protocol in C++"; + enable = lib.mkEnableOption "rippled, a decentralized cryptocurrency blockchain daemon implementing the XRP Ledger protocol in C++"; - package = mkPackageOption pkgs "rippled" { }; + package = lib.mkPackageOption pkgs "rippled" { }; - ports = mkOption { + ports = lib.mkOption { description = "Ports exposed by rippled"; - type = with types; attrsOf (submodule portOptions); + type = with lib.types; attrsOf (submodule portOptions); default = { rpc = { port = 5005; @@ -235,9 +232,9 @@ in }; }; - nodeDb = mkOption { + nodeDb = lib.mkOption { description = "Rippled main database options."; - type = with types; nullOr (submodule dbOptions); + type = with lib.types; nullOr (submodule dbOptions); default = { type = "rocksdb"; extraOpts = '' @@ -250,28 +247,28 @@ in }; }; - tempDb = mkOption { + tempDb = lib.mkOption { description = "Rippled temporary database options."; - type = with types; nullOr (submodule dbOptions); + type = with lib.types; nullOr (submodule dbOptions); default = null; }; - importDb = mkOption { + importDb = lib.mkOption { description = "Settings for performing a one-time import."; - type = with types; nullOr (submodule dbOptions); + type = with lib.types; nullOr (submodule dbOptions); default = null; }; - nodeSize = mkOption { + nodeSize = lib.mkOption { description = '' Rippled size of the node you are running. "tiny", "small", "medium", "large", and "huge" ''; - type = types.enum ["tiny" "small" "medium" "large" "huge"]; + type = lib.types.enum ["tiny" "small" "medium" "large" "huge"]; default = "small"; }; - ips = mkOption { + ips = lib.mkOption { description = '' List of hostnames or ips where the Ripple protocol is served. For a starter list, you can either copy entries from: @@ -282,11 +279,11 @@ in address. By convention, if known, IPs are listed in from most to least trusted. ''; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = ["r.ripple.com 51235"]; }; - ipsFixed = mkOption { + ipsFixed = lib.mkOption { description = '' List of IP addresses or hostnames to which rippled should always attempt to maintain peer connections with. This is useful for @@ -296,16 +293,16 @@ in A port may optionally be specified after adding a space to the address ''; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = []; }; - validators = mkOption { + validators = lib.mkOption { description = '' List of nodes to always accept as validators. Nodes are specified by domain or public key. ''; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = [ "n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7 RL1" "n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj RL2" @@ -315,46 +312,46 @@ in ]; }; - databasePath = mkOption { + databasePath = lib.mkOption { description = '' Path to the ripple database. ''; - type = types.path; + type = lib.types.path; default = "/var/lib/rippled"; }; - validationQuorum = mkOption { + validationQuorum = lib.mkOption { description = '' The minimum number of trusted validations a ledger must have before the server considers it fully validated. ''; - type = types.int; + type = lib.types.int; default = 3; }; - ledgerHistory = mkOption { + ledgerHistory = lib.mkOption { description = '' The number of past ledgers to acquire on server startup and the minimum to maintain while running. ''; - type = types.either types.int (types.enum ["full"]); + type = lib.types.either lib.types.int (lib.types.enum ["full"]); default = 1296000; # 1 month }; - fetchDepth = mkOption { + fetchDepth = lib.mkOption { description = '' The number of past ledgers to serve to other peers that request historical ledger data (or "full" for no limit). ''; - type = types.either types.int (types.enum ["full"]); + type = lib.types.either lib.types.int (lib.types.enum ["full"]); default = "full"; }; - sntpServers = mkOption { + sntpServers = lib.mkOption { description = '' IP address or domain of NTP servers to use for time synchronization.; ''; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = [ "time.windows.com" "time.apple.com" @@ -363,40 +360,40 @@ in ]; }; - logLevel = mkOption { + logLevel = lib.mkOption { description = "Logging verbosity."; - type = types.enum ["debug" "error" "info"]; + type = lib.types.enum ["debug" "error" "info"]; default = "error"; }; statsd = { - enable = mkEnableOption "statsd monitoring for rippled"; + enable = lib.mkEnableOption "statsd monitoring for rippled"; - address = mkOption { + address = lib.mkOption { description = "The UDP address and port of the listening StatsD server."; default = "127.0.0.1:8125"; - type = types.str; + type = lib.types.str; }; - prefix = mkOption { + prefix = lib.mkOption { description = "A string prepended to each collected metric."; default = ""; - type = types.str; + type = lib.types.str; }; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; description = '' Extra lines to be added verbatim to the rippled.cfg configuration file. ''; }; - config = mkOption { + config = lib.mkOption { internal = true; default = pkgs.writeText "rippled.conf" rippledCfg; - defaultText = literalMD "generated config file"; + defaultText = lib.literalMD "generated config file"; }; }; }; @@ -404,7 +401,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.users.rippled = { description = "Ripple server user"; diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix index fc57683de3280..42f782bcd6e18 100644 --- a/nixos/modules/services/misc/snapper.nix +++ b/nixos/modules/services/misc/snapper.nix @@ -4,17 +4,14 @@ lib, ... }: - -with lib; - let cfg = config.services.snapper; mkValue = v: - if isList v then + if lib.isList v then "\"${ - concatMapStringsSep " " (escape [ + lib.concatMapStringsSep " " (lib.escape [ "\\" " " ]) v @@ -23,7 +20,7 @@ let "yes" else if v == false then "no" - else if isString v then + else if lib.isString v then "\"${v}\"" else builtins.toJSON v; @@ -33,14 +30,22 @@ let # "it's recommended to always specify the filesystem type" -- man snapper-configs defaultOf = k: if k == "FSTYPE" then null else configOptions.${k}.default or null; - safeStr = types.strMatching "[^\n\"]*" // { + safeStr = lib.types.strMatching "[^\n\"]*" // { description = "string without line breaks or quotes"; descriptionClass = "conjunction"; }; + intOrNumberOrRange = lib.types.either lib.types.ints.unsigned ( + lib.types.strMatching "[[:digit:]]+(\-[[:digit:]]+)?" + // { + description = "string containing either a number or a range"; + descriptionClass = "conjunction"; + } + ); + configOptions = { - SUBVOLUME = mkOption { - type = types.path; + SUBVOLUME = lib.mkOption { + type = lib.types.path; description = '' Path of the subvolume or mount point. This path is a subvolume and has to contain a subvolume named @@ -49,16 +54,16 @@ let ''; }; - FSTYPE = mkOption { - type = types.enum [ "btrfs" ]; + FSTYPE = lib.mkOption { + type = lib.types.enum [ "btrfs" ]; default = "btrfs"; description = '' Filesystem type. Only btrfs is stable and tested. ''; }; - ALLOW_GROUPS = mkOption { - type = types.listOf safeStr; + ALLOW_GROUPS = lib.mkOption { + type = lib.types.listOf safeStr; default = [ ]; description = '' List of groups allowed to operate with the config. @@ -67,8 +72,8 @@ let ''; }; - ALLOW_USERS = mkOption { - type = types.listOf safeStr; + ALLOW_USERS = lib.mkOption { + type = lib.types.listOf safeStr; default = [ ]; example = [ "alice" ]; description = '' @@ -79,64 +84,64 @@ let ''; }; - TIMELINE_CLEANUP = mkOption { - type = types.bool; + TIMELINE_CLEANUP = lib.mkOption { + type = lib.types.bool; default = false; description = '' Defines whether the timeline cleanup algorithm should be run for the config. ''; }; - TIMELINE_CREATE = mkOption { - type = types.bool; + TIMELINE_CREATE = lib.mkOption { + type = lib.types.bool; default = false; description = '' Defines whether hourly snapshots should be created. ''; }; - TIMELINE_LIMIT_HOURLY = mkOption { - type = types.int; + TIMELINE_LIMIT_HOURLY = lib.mkOption { + type = intOrNumberOrRange; default = 10; description = '' Limits for timeline cleanup. ''; }; - TIMELINE_LIMIT_DAILY = mkOption { - type = types.int; + TIMELINE_LIMIT_DAILY = lib.mkOption { + type = intOrNumberOrRange; default = 10; description = '' Limits for timeline cleanup. ''; }; - TIMELINE_LIMIT_WEEKLY = mkOption { - type = types.int; + TIMELINE_LIMIT_WEEKLY = lib.mkOption { + type = intOrNumberOrRange; default = 0; description = '' Limits for timeline cleanup. ''; }; - TIMELINE_LIMIT_MONTHLY = mkOption { - type = types.int; + TIMELINE_LIMIT_MONTHLY = lib.mkOption { + type = intOrNumberOrRange; default = 10; description = '' Limits for timeline cleanup. ''; }; - TIMELINE_LIMIT_QUARTERLY = mkOption { - type = types.int; + TIMELINE_LIMIT_QUARTERLY = lib.mkOption { + type = intOrNumberOrRange; default = 0; description = '' Limits for timeline cleanup. ''; }; - TIMELINE_LIMIT_YEARLY = mkOption { - type = types.int; + TIMELINE_LIMIT_YEARLY = lib.mkOption { + type = intOrNumberOrRange; default = 10; description = '' Limits for timeline cleanup. @@ -148,16 +153,16 @@ in { options.services.snapper = { - snapshotRootOnBoot = mkOption { - type = types.bool; + snapshotRootOnBoot = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to snapshot root on boot ''; }; - snapshotInterval = mkOption { - type = types.str; + snapshotInterval = lib.mkOption { + type = lib.types.str; default = "hourly"; description = '' Snapshot interval. @@ -167,9 +172,9 @@ in ''; }; - persistentTimer = mkOption { + persistentTimer = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; example = true; description = '' Set the `Persistent` option for the @@ -179,8 +184,8 @@ in ''; }; - cleanupInterval = mkOption { - type = types.str; + cleanupInterval = lib.mkOption { + type = lib.types.str; default = "1d"; description = '' Cleanup interval. @@ -190,17 +195,17 @@ in ''; }; - filters = mkOption { - type = types.nullOr types.lines; + filters = lib.mkOption { + type = lib.types.nullOr lib.types.lines; default = null; description = '' Global display difference filter. See man:snapper(8) for more details. ''; }; - configs = mkOption { + configs = lib.mkOption { default = { }; - example = literalExpression '' + example = lib.literalExpression '' { home = { SUBVOLUME = "/home"; @@ -216,14 +221,14 @@ in is valid here, even if NixOS doesn't document it. ''; - type = types.attrsOf ( - types.submodule { - freeformType = types.attrsOf ( - types.oneOf [ - (types.listOf safeStr) - types.bool + type = lib.types.attrsOf ( + lib.types.submodule { + freeformType = lib.types.attrsOf ( + lib.types.oneOf [ + (lib.types.listOf safeStr) + lib.types.bool safeStr - types.number + lib.types.number ] ); @@ -233,7 +238,7 @@ in }; }; - config = mkIf (cfg.configs != { }) ( + config = lib.mkIf (cfg.configs != { }) ( let documentation = [ "man:snapper(8)" @@ -254,11 +259,11 @@ in SNAPPER_CONFIGS="${lib.concatStringsSep " " (builtins.attrNames cfg.configs)}" ''; } - // (mapAttrs' ( + // (lib.mapAttrs' ( name: subvolume: - nameValuePair "snapper/configs/${name}" ({ + lib.nameValuePair "snapper/configs/${name}" ({ text = lib.generators.toKeyValue { inherit mkKeyValue; } ( - filterAttrs (k: v: v != defaultOf k) subvolume + lib.filterAttrs (k: v: v != defaultOf k) subvolume ); }) ) cfg.configs) @@ -324,7 +329,7 @@ in unitConfig.ConditionPathExists = "/etc/snapper/configs/root"; }; - assertions = concatMap ( + assertions = lib.concatMap ( name: let sub = cfg.configs.${name}; @@ -341,16 +346,16 @@ in ++ map (attr: { - assertion = !(hasAttr attr sub); + assertion = !(lib.hasAttr attr sub); message = '' - The option definition `services.snapper.configs.${name}.${attr}' has been renamed to `services.snapper.configs.${name}.${toUpper attr}'. + The option definition `services.snapper.configs.${name}.${attr}' has been renamed to `services.snapper.configs.${name}.${lib.toUpper attr}'. ''; }) [ "fstype" "subvolume" ] - ) (attrNames cfg.configs); + ) (lib.attrNames cfg.configs); } ); diff --git a/nixos/modules/services/misc/tabby.nix b/nixos/modules/services/misc/tabby.nix index d63a6b24ae3de..8fabd10d90fa0 100644 --- a/nixos/modules/services/misc/tabby.nix +++ b/nixos/modules/services/misc/tabby.nix @@ -71,7 +71,7 @@ in - nixpkgs.config.cudaSupport - nixpkgs.config.rocmSupport - - if stdenv.isDarwin && stdenv.isAarch64 + - if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 IFF multiple acceleration methods are found to be enabled or if you haven't set either `cudaSupport or rocmSupport` you will have to diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 7760f1bdadebb..618d369be21f4 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -1,14 +1,11 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.taskserver; taskd = "${pkgs.taskserver}/bin/taskd"; - mkManualPkiOption = desc: mkOption { - type = types.nullOr types.path; + mkManualPkiOption = desc: lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' ${desc} @@ -46,8 +43,8 @@ let ::: ''; - mkExpireOption = desc: mkOption { - type = types.nullOr types.int; + mkExpireOption = desc: lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; example = 365; apply = val: if val == null then -1 else val; @@ -58,8 +55,8 @@ let }; autoPkiOptions = { - bits = mkOption { - type = types.int; + bits = lib.mkOption { + type = lib.types.int; default = 4096; example = 2048; description = mkAutoDesc "The bit size for generated keys."; @@ -75,20 +72,20 @@ let needToCreateCA = let notFound = path: let - dotted = concatStringsSep "." path; + dotted = lib.concatStringsSep "." path; in throw "Can't find option definitions for path `${dotted}'."; findPkiDefinitions = path: attrs: let mkSublist = key: val: let - newPath = path ++ singleton key; - in if isOption val - then attrByPath newPath (notFound newPath) cfg.pki.manual + newPath = path ++ lib.singleton key; + in if lib.isOption val + then lib.attrByPath newPath (notFound newPath) cfg.pki.manual else findPkiDefinitions newPath val; - in flatten (mapAttrsToList mkSublist attrs); - in all (x: x == null) (findPkiDefinitions [] manualPkiOptions); + in lib.flatten (lib.mapAttrsToList mkSublist attrs); + in lib.all (x: x == null) (findPkiDefinitions [] manualPkiOptions); orgOptions = { ... }: { - options.users = mkOption { - type = types.uniq (types.listOf types.str); + options.users = lib.mkOption { + type = lib.types.uniq (lib.types.listOf lib.types.str); default = []; example = [ "alice" "bob" ]; description = '' @@ -96,8 +93,8 @@ let ''; }; - options.groups = mkOption { - type = types.listOf types.str; + options.groups = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "workers" "slackers" ]; description = '' @@ -137,8 +134,8 @@ let in { options = { services.taskserver = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = let url = "https://nixos.org/manual/nixos/stable/index.html#module-services-taskserver"; @@ -150,26 +147,26 @@ in { ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "taskd"; description = "User for Taskserver."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "taskd"; description = "Group for Taskserver."; }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/taskserver"; description = "Data directory for Taskserver."; }; - ciphers = mkOption { - type = types.nullOr (types.separatedString ":"); + ciphers = lib.mkOption { + type = lib.types.nullOr (lib.types.separatedString ":"); default = null; example = "NORMAL:-VERS-SSL3.0"; description = let @@ -180,8 +177,8 @@ in { ''; }; - organisations = mkOption { - type = types.attrsOf (types.submodule orgOptions); + organisations = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule orgOptions); default = {}; example.myShinyOrganisation.users = [ "alice" "bob" ]; example.myShinyOrganisation.groups = [ "staff" "outsiders" ]; @@ -193,24 +190,24 @@ in { ''; }; - confirmation = mkOption { - type = types.bool; + confirmation = lib.mkOption { + type = lib.types.bool; default = true; description = '' Determines whether certain commands are confirmed. ''; }; - debug = mkOption { - type = types.bool; + debug = lib.mkOption { + type = lib.types.bool; default = false; description = '' Logs debugging information. ''; }; - extensions = mkOption { - type = types.nullOr types.path; + extensions = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' Fully qualified path of the Taskserver extension scripts. @@ -218,32 +215,32 @@ in { ''; }; - ipLog = mkOption { - type = types.bool; + ipLog = lib.mkOption { + type = lib.types.bool; default = false; description = '' Logs the IP addresses of incoming requests. ''; }; - queueSize = mkOption { - type = types.int; + queueSize = lib.mkOption { + type = lib.types.int; default = 10; description = '' Size of the connection backlog, see {manpage}`listen(2)`. ''; }; - requestLimit = mkOption { - type = types.int; + requestLimit = lib.mkOption { + type = lib.types.int; default = 1048576; description = '' Size limit of incoming requests, in bytes. ''; }; - allowedClientIDs = mkOption { - type = with types; either str (listOf str); + allowedClientIDs = lib.mkOption { + type = with lib.types; either str (listOf str); default = []; example = [ "[Tt]ask [2-9]+" ]; description = '' @@ -256,8 +253,8 @@ in { ''; }; - disallowedClientIDs = mkOption { - type = with types; either str (listOf str); + disallowedClientIDs = lib.mkOption { + type = with lib.types; either str (listOf str); default = []; example = [ "[Tt]ask [2-9]+" ]; description = '' @@ -270,8 +267,8 @@ in { ''; }; - listenHost = mkOption { - type = types.str; + listenHost = lib.mkOption { + type = lib.types.str; default = "localhost"; example = "::"; description = '' @@ -279,24 +276,24 @@ in { ''; }; - listenPort = mkOption { - type = types.int; + listenPort = lib.mkOption { + type = lib.types.int; default = 53589; description = '' Port number of the Taskserver. ''; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to open the firewall for the specified Taskserver port. ''; }; - fqdn = mkOption { - type = types.str; + fqdn = lib.mkOption { + type = lib.types.str; default = "localhost"; description = '' The fully qualified domain name of this server, which is also used @@ -304,8 +301,8 @@ in { ''; }; - trust = mkOption { - type = types.enum [ "allow all" "strict" ]; + trust = lib.mkOption { + type = lib.types.enum [ "allow all" "strict" ]; default = "strict"; description = '' Determines how client certificates are validated. @@ -320,8 +317,8 @@ in { pki.manual = manualPkiOptions; pki.auto = autoPkiOptions; - config = mkOption { - type = types.attrs; + config = lib.mkOption { + type = lib.types.attrs; example.client.cert = "/tmp/debugging.cert"; description = '' Configuration options to pass to Taskserver. @@ -340,23 +337,23 @@ in { ''; apply = let mkKey = path: if path == ["server" "listen"] then "server" - else concatStringsSep "." path; + else lib.concatStringsSep "." path; recurse = path: attrs: let mapper = name: val: let newPath = path ++ [ name ]; scalar = if val == true then "true" else if val == false then "false" else toString val; - in if isAttrs val then recurse newPath val + in if lib.isAttrs val then recurse newPath val else [ "${mkKey newPath}=${scalar}" ]; - in concatLists (mapAttrsToList mapper attrs); + in lib.concatLists (lib.mapAttrsToList mapper attrs); in recurse []; }; }; }; imports = [ - (mkRemovedOptionModule ["services" "taskserver" "extraConfig"] '' + (lib.mkRemovedOptionModule ["services" "taskserver" "extraConfig"] '' This option was removed in favor of `services.taskserver.config` with different semantics (it's now a list of attributes instead of lines). @@ -366,11 +363,11 @@ in { '') ]; - config = mkMerge [ - (mkIf cfg.enable { + config = lib.mkMerge [ + (lib.mkIf cfg.enable { environment.systemPackages = [ nixos-taskserver ]; - users.users = optionalAttrs (cfg.user == "taskd") { + users.users = lib.optionalAttrs (cfg.user == "taskd") { taskd = { uid = config.ids.uids.taskd; description = "Taskserver user"; @@ -378,7 +375,7 @@ in { }; }; - users.groups = optionalAttrs (cfg.group == "taskd") { + users.groups = lib.optionalAttrs (cfg.group == "taskd") { taskd.gid = config.ids.gids.taskd; }; @@ -413,7 +410,7 @@ in { } else { cert = "${cfg.pki.manual.server.cert}"; key = "${cfg.pki.manual.server.key}"; - ${mapNullable (_: "crl") cfg.pki.manual.server.crl} = "${cfg.pki.manual.server.crl}"; + ${lib.mapNullable (_: "crl") cfg.pki.manual.server.crl} = "${cfg.pki.manual.server.crl}"; }); ca.cert = if needToCreateCA then "${cfg.dataDir}/keys/ca.cert" @@ -464,8 +461,8 @@ in { serviceConfig = { ExecStart = let - mkCfgFlag = flag: escapeShellArg "--${flag}"; - cfgFlags = concatMapStringsSep " " mkCfgFlag cfg.config; + mkCfgFlag = flag: lib.escapeShellArg "--${flag}"; + cfgFlags = lib.concatMapStringsSep " " mkCfgFlag cfg.config; in "@${taskd} taskd server ${cfgFlags}"; ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; Restart = "on-failure"; @@ -477,7 +474,7 @@ in { }; }; }) - (mkIf (cfg.enable && needToCreateCA) { + (lib.mkIf (cfg.enable && needToCreateCA) { systemd.services.taskserver-ca = { wantedBy = [ "taskserver.service" ]; after = [ "taskserver-init.service" ]; @@ -561,7 +558,7 @@ in { ''; }; }) - (mkIf (cfg.enable && cfg.openFirewall) { + (lib.mkIf (cfg.enable && cfg.openFirewall) { networking.firewall.allowedTCPPorts = [ cfg.listenPort ]; }) ]; diff --git a/nixos/modules/services/misc/turn-rs.nix b/nixos/modules/services/misc/turn-rs.nix new file mode 100644 index 0000000000000..b591205417fb8 --- /dev/null +++ b/nixos/modules/services/misc/turn-rs.nix @@ -0,0 +1,86 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.turn-rs; + format = pkgs.formats.toml { }; +in +{ + options.services.turn-rs = { + enable = lib.mkEnableOption "turn-rs server"; + package = lib.mkPackageOption pkgs "turn-rs" { }; + + secretFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/keys/turn-rs.env"; + description = '' + Environment variables from this file will be interpolated into the + final config file using envsubst with this syntax: `$ENVIRONMENT` or + `''${VARIABLE}`. + The file should contain lines formatted as `SECRET_VAR=SECRET_VALUE`. + This is useful to avoid putting secrets into the nix store. + ''; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = format.type; + }; + description = "Turn-rs server config file"; + default = { }; + example = { + turn = { + realm = "localhost"; + interfaces = [ + { + transport = "udp"; + bind = "127.0.0.1:3478"; + external = "127.0.0.1:3478"; + } + { + transport = "tcp"; + bind = "127.0.0.1:3478"; + external = "127.0.0.1:3478"; + } + ]; + }; + + auth.static_credentials = { + user1 = "test"; + user2 = "test"; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.turn-rs.settings = { + api.bind = lib.mkDefault "127.0.0.1:3000"; + log.level = lib.mkDefault "info"; + }; + + systemd.services.turn-rs = { + enable = true; + wantedBy = [ "multi-user.target" ]; + description = "Turn-rs Server Daemon"; + preStart = + let + configFile = format.generate "turn-rs-config.toml" cfg.settings; + in + '' + ${lib.getExe pkgs.envsubst} -i "${configFile}" -o /run/turn-rs/config.toml + ''; + serviceConfig = { + RuntimeDirectory = "turn-rs"; + EnvironmentFile = lib.optional (cfg.secretFile != null) cfg.secretFile; + ExecStart = "${lib.getExe cfg.package} --config=/run/turn-rs/config.toml"; + DynamicUser = true; + }; + }; + }; +} diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix index be63bb179e423..9e979bb476754 100644 --- a/nixos/modules/services/misc/tzupdate.nix +++ b/nixos/modules/services/misc/tzupdate.nix @@ -30,16 +30,15 @@ in { description = "tzupdate timezone update service"; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; + script = '' + timedatectl set-timezone $(${lib.getExe pkgs.tzupdate} --print-only) + ''; serviceConfig = { Type = "oneshot"; - # We could link directly into pkgs.tzdata, but at least timedatectl seems - # to expect the symlink to point directly to a file in etc. - # Setting the "debian timezone file" to point at /dev/null stops it doing anything. - ExecStart = "${pkgs.tzupdate}/bin/tzupdate -z /etc/zoneinfo -d /dev/null"; }; }; }; - meta.maintainers = [ ]; + meta.maintainers = with lib.maintainers; [ doronbehar ]; } diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index 5ac98bdf0382e..04232b3c93466 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -288,7 +288,7 @@ in { path = [ ]; script = '' export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile}) - ${datadogPkg}/bin/trace-agent -config /etc/datadog-agent/datadog.yaml + ${datadogPkg}/bin/trace-agent --config /etc/datadog-agent/datadog.yaml ''; }); diff --git a/nixos/modules/services/monitoring/gatus.nix b/nixos/modules/services/monitoring/gatus.nix new file mode 100644 index 0000000000000..408115f5d5145 --- /dev/null +++ b/nixos/modules/services/monitoring/gatus.nix @@ -0,0 +1,132 @@ +{ + pkgs, + lib, + config, + ... +}: +let + cfg = config.services.gatus; + + settingsFormat = pkgs.formats.yaml { }; + + inherit (lib) + getExe + literalExpression + maintainers + mkEnableOption + mkIf + mkOption + mkPackageOption + ; + + inherit (lib.types) + bool + int + nullOr + path + submodule + ; +in +{ + options.services.gatus = { + enable = mkEnableOption "Gatus"; + + package = mkPackageOption pkgs "gatus" { }; + + configFile = mkOption { + type = path; + default = settingsFormat.generate "gatus.yaml" cfg.settings; + defaultText = literalExpression '' + let settingsFormat = pkgs.formats.yaml { }; in settingsFormat.generate "gatus.yaml" cfg.settings; + ''; + description = '' + Path to the Gatus configuration file. + Overrides any configuration made using the `settings` option. + ''; + }; + + environmentFile = mkOption { + type = nullOr path; + default = null; + description = '' + File to load as environment file. + Environmental variables from this file can be interpolated in the configuration file using `''${VARIABLE}`. + This is useful to avoid putting secrets into the nix store. + ''; + }; + + settings = mkOption { + type = submodule { + freeformType = settingsFormat.type; + options = { + web.port = mkOption { + type = int; + default = 8080; + description = '' + The TCP port to serve the Gatus service at. + ''; + }; + }; + }; + + default = { }; + + example = literalExpression '' + { + web.port = 8080; + endpoints = [{ + name = "website"; + url = "https://twin.sh/health"; + interval = "5m"; + conditions = [ + "[STATUS] == 200" + "[BODY].status == UP" + "[RESPONSE_TIME] < 300" + ]; + }]; + } + ''; + + description = '' + Configuration for Gatus. + Supported options can be found at the [docs](https://gatus.io/docs). + ''; + }; + + openFirewall = mkOption { + type = bool; + default = false; + description = '' + Whether to open the firewall for the Gatus web interface. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.gatus = { + description = "Automated developer-oriented status page"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + DynamicUser = true; + User = "gatus"; + Group = "gatus"; + Type = "simple"; + Restart = "on-failure"; + ExecStart = getExe cfg.package; + StateDirectory = "gatus"; + SyslogIdentifier = "gatus"; + EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile; + }; + + environment = { + GATUS_CONFIG_PATH = cfg.configFile; + }; + }; + + networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ cfg.settings.web.port ]; + }; + + meta.maintainers = with maintainers; [ pizzapim ]; +} diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 3a8f41f320781..7987f34f1278b 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -1,11 +1,8 @@ { config, lib, options, pkgs, ... }: - -with lib; - let cfg = config.services.graphite; opt = options.services.graphite; - writeTextOrNull = f: t: mapNullable (pkgs.writeTextDir f) t; + writeTextOrNull = f: t: lib.mapNullable (pkgs.writeTextDir f) t; dataDir = cfg.dataDir; staticDir = cfg.dataDir + "/static"; @@ -20,7 +17,7 @@ let graphiteLocalSettings = pkgs.writeText "graphite_local_settings.py" ( "STATIC_ROOT = '${staticDir}'\n" + - optionalString (config.time.timeZone != null) "TIME_ZONE = '${config.time.timeZone}'\n" + lib.optionalString (config.time.timeZone != null) "TIME_ZONE = '${config.time.timeZone}'\n" + cfg.web.extraConfig ); @@ -32,7 +29,7 @@ let configDir = pkgs.buildEnv { name = "graphite-config"; - paths = lists.filter (el: el != null) [ + paths = lib.lists.filter (el: el != null) [ (writeTextOrNull "carbon.conf" cfg.carbon.config) (writeTextOrNull "storage-aggregation.conf" cfg.carbon.storageAggregation) (writeTextOrNull "storage-schemas.conf" cfg.carbon.storageSchemas) @@ -62,16 +59,16 @@ let in { imports = [ - (mkRemovedOptionModule ["services" "graphite" "api"] "") - (mkRemovedOptionModule ["services" "graphite" "beacon"] "") - (mkRemovedOptionModule ["services" "graphite" "pager"] "") + (lib.mkRemovedOptionModule ["services" "graphite" "api"] "") + (lib.mkRemovedOptionModule ["services" "graphite" "beacon"] "") + (lib.mkRemovedOptionModule ["services" "graphite" "pager"] "") ]; ###### interface options.services.graphite = { - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/db/graphite"; description = '' Data directory for graphite. @@ -79,26 +76,26 @@ in { }; web = { - enable = mkOption { + enable = lib.mkOption { description = "Whether to enable graphite web frontend."; default = false; - type = types.bool; + type = lib.types.bool; }; - listenAddress = mkOption { + listenAddress = lib.mkOption { description = "Graphite web frontend listen address."; default = "127.0.0.1"; - type = types.str; + type = lib.types.str; }; - port = mkOption { + port = lib.mkOption { description = "Graphite web frontend port."; default = 8080; - type = types.port; + type = lib.types.port; }; - extraConfig = mkOption { - type = types.str; + extraConfig = lib.mkOption { + type = lib.types.str; default = ""; description = '' Graphite webapp settings. See: @@ -108,7 +105,7 @@ in { }; carbon = { - config = mkOption { + config = lib.mkOption { description = "Content of carbon configuration file."; default = '' [cache] @@ -121,19 +118,19 @@ in { LOG_UPDATES = False LOG_CACHE_HITS = False ''; - type = types.str; + type = lib.types.str; }; - enableCache = mkOption { + enableCache = lib.mkOption { description = "Whether to enable carbon cache, the graphite storage daemon."; default = false; - type = types.bool; + type = lib.types.bool; }; - storageAggregation = mkOption { + storageAggregation = lib.mkOption { description = "Defines how to aggregate data to lower-precision retentions."; default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = '' [all_min] pattern = \.min$ @@ -142,10 +139,10 @@ in { ''; }; - storageSchemas = mkOption { + storageSchemas = lib.mkOption { description = "Defines retention rates for storing metrics."; default = ""; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = '' [apache_busyWorkers] pattern = ^servers\.www.*\.workers\.busyWorkers$ @@ -153,27 +150,27 @@ in { ''; }; - blacklist = mkOption { + blacklist = lib.mkOption { description = "Any metrics received which match one of the expressions will be dropped."; default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = "^some\\.noisy\\.metric\\.prefix\\..*"; }; - whitelist = mkOption { + whitelist = lib.mkOption { description = "Only metrics received which match one of the expressions will be persisted."; default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = ".*"; }; - rewriteRules = mkOption { + rewriteRules = lib.mkOption { description = '' Regular expression patterns that can be used to rewrite metric names in a search and replace fashion. ''; default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = '' [post] _sum$ = @@ -181,16 +178,16 @@ in { ''; }; - enableRelay = mkOption { + enableRelay = lib.mkOption { description = "Whether to enable carbon relay, the carbon replication and sharding service."; default = false; - type = types.bool; + type = lib.types.bool; }; - relayRules = mkOption { + relayRules = lib.mkOption { description = "Relay rules are used to send certain metrics to a certain backend."; default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = '' [example] pattern = ^mydata\.foo\..+ @@ -198,16 +195,16 @@ in { ''; }; - enableAggregator = mkOption { + enableAggregator = lib.mkOption { description = "Whether to enable carbon aggregator, the carbon buffering service."; default = false; - type = types.bool; + type = lib.types.bool; }; - aggregationRules = mkOption { + aggregationRules = lib.mkOption { description = "Defines if and how received metrics will be aggregated."; default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = '' .applications..all.requests (60) = sum .applications..*.requests .applications..all.latency (60) = avg .applications..*.latency @@ -216,47 +213,47 @@ in { }; seyren = { - enable = mkOption { + enable = lib.mkOption { description = "Whether to enable seyren service."; default = false; - type = types.bool; + type = lib.types.bool; }; - port = mkOption { + port = lib.mkOption { description = "Seyren listening port."; default = 8081; - type = types.port; + type = lib.types.port; }; - seyrenUrl = mkOption { + seyrenUrl = lib.mkOption { default = "http://localhost:${toString cfg.seyren.port}/"; - defaultText = literalExpression ''"http://localhost:''${toString config.${opt.seyren.port}}/"''; + defaultText = lib.literalExpression ''"http://localhost:''${toString config.${opt.seyren.port}}/"''; description = "Host where seyren is accessible."; - type = types.str; + type = lib.types.str; }; - graphiteUrl = mkOption { + graphiteUrl = lib.mkOption { default = "http://${cfg.web.listenAddress}:${toString cfg.web.port}"; - defaultText = literalExpression ''"http://''${config.${opt.web.listenAddress}}:''${toString config.${opt.web.port}}"''; + defaultText = lib.literalExpression ''"http://''${config.${opt.web.listenAddress}}:''${toString config.${opt.web.port}}"''; description = "Host where graphite service runs."; - type = types.str; + type = lib.types.str; }; - mongoUrl = mkOption { + mongoUrl = lib.mkOption { default = "mongodb://${config.services.mongodb.bind_ip}:27017/seyren"; - defaultText = literalExpression ''"mongodb://''${config.services.mongodb.bind_ip}:27017/seyren"''; + defaultText = lib.literalExpression ''"mongodb://''${config.services.mongodb.bind_ip}:27017/seyren"''; description = "Mongodb connection string."; - type = types.str; + type = lib.types.str; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { default = {}; description = '' Extra seyren configuration. See ''; - type = types.attrsOf types.str; - example = literalExpression '' + type = lib.types.attrsOf lib.types.str; + example = lib.literalExpression '' { GRAPHITE_USERNAME = "user"; GRAPHITE_PASSWORD = "pass"; @@ -268,14 +265,15 @@ in { ###### implementation - config = mkMerge [ - (mkIf cfg.carbon.enableCache { + config = lib.mkMerge [ + (lib.mkIf cfg.carbon.enableCache { systemd.services.carbonCache = let name = "carbon-cache"; in { description = "Graphite Data Storage Backend"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; environment = carbonEnv; serviceConfig = { + Slice = "system-graphite.slice"; RuntimeDirectory = name; ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; @@ -290,7 +288,7 @@ in { }; }) - (mkIf cfg.carbon.enableAggregator { + (lib.mkIf cfg.carbon.enableAggregator { systemd.services.carbonAggregator = let name = "carbon-aggregator"; in { enable = cfg.carbon.enableAggregator; description = "Carbon Data Aggregator"; @@ -298,6 +296,7 @@ in { after = [ "network.target" ]; environment = carbonEnv; serviceConfig = { + Slice = "system-graphite.slice"; RuntimeDirectory = name; ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; @@ -307,13 +306,14 @@ in { }; }) - (mkIf cfg.carbon.enableRelay { + (lib.mkIf cfg.carbon.enableRelay { systemd.services.carbonRelay = let name = "carbon-relay"; in { description = "Carbon Data Relay"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; environment = carbonEnv; serviceConfig = { + Slice = "system-graphite.slice"; RuntimeDirectory = name; ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; @@ -323,13 +323,13 @@ in { }; }) - (mkIf (cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay) { + (lib.mkIf (cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay) { environment.systemPackages = [ pkgs.python3Packages.carbon ]; }) - (mkIf cfg.web.enable ({ + (lib.mkIf cfg.web.enable ({ systemd.services.graphiteWeb = { description = "Graphite Web Interface"; wantedBy = [ "multi-user.target" ]; @@ -343,7 +343,7 @@ in { ]; }; penvPack = "${penv}/${pkgs.python3.sitePackages}"; - in concatStringsSep ":" [ + in lib.concatStringsSep ":" [ "${graphiteLocalSettingsDir}" "${penvPack}" # explicitly adding pycairo in path because it cannot be imported via buildEnv @@ -363,6 +363,7 @@ in { User = "graphite"; Group = "graphite"; PermissionsStartOnly = true; + Slice = "system-graphite.slice"; }; preStart = '' if ! test -e ${dataDir}/db-created; then @@ -389,7 +390,7 @@ in { environment.systemPackages = [ pkgs.python3Packages.graphite-web ]; })) - (mkIf cfg.seyren.enable { + (lib.mkIf cfg.seyren.enable { systemd.services.seyren = { description = "Graphite Alerting Dashboard"; wantedBy = [ "multi-user.target" ]; @@ -400,6 +401,7 @@ in { WorkingDirectory = dataDir; User = "graphite"; Group = "graphite"; + Slice = "system-graphite.slice"; }; preStart = '' if ! test -e ${dataDir}/db-created; then @@ -409,13 +411,18 @@ in { ''; }; - services.mongodb.enable = mkDefault true; + services.mongodb.enable = lib.mkDefault true; }) - (mkIf ( + (lib.mkIf ( cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay || cfg.web.enable || cfg.seyren.enable ) { + systemd.slices.system-graphite = { + description = "Graphite Graphing System Slice"; + documentation = [ "https://graphite.readthedocs.io/en/latest/overview.html" ]; + }; + users.users.graphite = { uid = config.ids.uids.graphite; group = "graphite"; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index c47da2cc075de..0929b0ab5171c 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -374,14 +374,6 @@ in { permissions = "u+rx,g+x,o-rwx"; }; - "logs-management.plugin" = { - source = "${cfg.package}/libexec/netdata/plugins.d/logs-management.plugin.org"; - capabilities = "cap_dac_read_search,cap_syslog+ep"; - owner = cfg.user; - group = cfg.group; - permissions = "u+rx,g+x,o-rwx"; - }; - "slabinfo.plugin" = { source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org"; capabilities = "cap_dac_override+ep"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 7b02e815cdbb4..29a30e938e75a 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -3,7 +3,7 @@ let inherit (lib) concatStrings foldl foldl' genAttrs literalExpression maintainers mapAttrs mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption - optional types mkOptionDefault flip attrNames; + optional types mkOptionDefault flip attrNames xor; cfg = config.services.prometheus.exporters; @@ -63,7 +63,6 @@ let "nginxlog" "node" "nut" - "openldap" "pgbouncer" "php-fpm" "pihole" @@ -231,14 +230,23 @@ let in mkIf conf.enable { warnings = conf.warnings or []; + assertions = conf.assertions or []; users.users."${name}-exporter" = (mkIf (conf.user == "${name}-exporter" && !enableDynamicUser) { description = "Prometheus ${name} exporter service user"; isSystemUser = true; inherit (conf) group; }); - users.groups = (mkIf (conf.group == "${name}-exporter" && !enableDynamicUser) { - "${name}-exporter" = {}; - }); + users.groups = mkMerge [ + (mkIf (conf.group == "${name}-exporter" && !enableDynamicUser) { + "${name}-exporter" = {}; + }) + (mkIf (name == "smartctl") { + "smartctl-exporter-access" = {}; + }) + ]; + services.udev.extraRules = mkIf (name == "smartctl") '' + ACTION=="add", SUBSYSTEM=="nvme", KERNEL=="nvme[0-9]*", RUN+="${pkgs.acl}/bin/setfacl -m g:smartctl-exporter-access:rw /dev/$kernel" + ''; networking.firewall.extraCommands = mkIf (conf.openFirewall && !nftables) (concatStrings [ "ip46tables -A nixos-fw ${conf.firewallFilter} " "-m comment --comment ${name}-exporter -j nixos-fw-accept" @@ -360,13 +368,6 @@ in Please specify either 'services.prometheus.exporters.nextcloud.passwordFile' or 'services.prometheus.exporters.nextcloud.tokenFile' ''; - } { - assertion = cfg.pgbouncer.enable -> ( - (cfg.pgbouncer.connectionStringFile != null || cfg.pgbouncer.connectionString != "") - ); - message = '' - PgBouncer exporter needs either connectionStringFile or connectionString configured" - ''; } { assertion = cfg.sql.enable -> ( (cfg.sql.configFile == null) != (cfg.sql.configuration == null) @@ -406,7 +407,15 @@ in Please ensure you have either `services.prometheus.exporters.deluge.delugePassword' or `services.prometheus.exporters.deluge.delugePasswordFile' set! ''; - } ] ++ (flip map (attrNames exporterOpts) (exporter: { + } { + assertion = cfg.pgbouncer.enable -> ( + xor (cfg.pgbouncer.connectionEnvFile == null) (cfg.pgbouncer.connectionString == null) + ); + message = '' + Options `services.prometheus.exporters.pgbouncer.connectionEnvFile` and + `services.prometheus.exporters.pgbouncer.connectionString` are mutually exclusive! + ''; + }] ++ (flip map (attrNames exporterOpts) (exporter: { assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall; message = '' The `firewallFilter'-option of exporter ${exporter} doesn't have any effect unless @@ -420,11 +429,6 @@ in Consider using `services.prometheus.exporters.idrac.configuration` instead. '' ) - (mkIf - (cfg.pgbouncer.enable && cfg.pgbouncer.connectionString != "") '' - config.services.prometheus.exporters.pgbouncer.connectionString is insecure. Use connectionStringFile instead. - '' - ) ] ++ config.services.prometheus.exporters.warnings; }] ++ [(mkIf config.services.prometheus.exporters.rtl_433.enable { hardware.rtl-sdr.enable = mkDefault true; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix index ba438ea74a3b6..9028d1fd5a663 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix @@ -21,8 +21,8 @@ in }; leasesPath = mkOption { type = types.path; - default = "/var/lib/misc/dnsmasq.leases"; - example = "/var/lib/dnsmasq/dnsmasq.leases"; + default = "/var/lib/dnsmasq/dnsmasq.leases"; + example = "/var/lib/misc/dnsmasq.leases"; description = '' Path to the `dnsmasq.leases` file. ''; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix b/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix deleted file mode 100644 index bb65bd2709330..0000000000000 --- a/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.services.prometheus.exporters.openldap; - inherit (lib) mkOption types concatStringsSep; -in { - port = 9330; - extraOpts = { - ldapCredentialFile = mkOption { - type = types.path; - example = "/run/keys/ldap_pass"; - description = '' - Environment file to contain the credentials to authenticate against - `openldap`. - - The file should look like this: - ``` - --- - ldapUser: "cn=monitoring,cn=Monitor" - ldapPass: "secret" - ``` - ''; - }; - protocol = mkOption { - default = "tcp"; - example = "udp"; - type = types.str; - description = '' - Which protocol to use to connect against `openldap`. - ''; - }; - ldapAddr = mkOption { - default = "localhost:389"; - type = types.str; - description = '' - Address of the `openldap`-instance. - ''; - }; - metricsPath = mkOption { - default = "/metrics"; - type = types.str; - description = '' - URL path where metrics should be exposed. - ''; - }; - interval = mkOption { - default = "30s"; - type = types.str; - example = "1m"; - description = '' - Scrape interval of the exporter. - ''; - }; - }; - serviceOpts.serviceConfig = { - ExecStart = '' - ${pkgs.prometheus-openldap-exporter}/bin/openldap_exporter \ - --promAddr ${cfg.listenAddress}:${toString cfg.port} \ - --metrPath ${cfg.metricsPath} \ - --ldapNet ${cfg.protocol} \ - --interval ${cfg.interval} \ - --config ${cfg.ldapCredentialFile} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix index 9cd261099a95b..5c111687c1d75 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix @@ -7,11 +7,8 @@ let mkPackageOption types optionals - optionalString getExe - getExe' escapeShellArg - escapeShellArgs concatStringsSep ; in @@ -29,8 +26,8 @@ in }; connectionString = mkOption { - type = types.str; - default = ""; + type = types.nullOr types.str; + default = null; example = "postgres://admin:@localhost:6432/pgbouncer?sslmode=require"; description = '' Connection string for accessing pgBouncer. @@ -43,26 +40,28 @@ in auth_file if auth_type other than "any" is used. WARNING: this secret is stored in the world-readable Nix store! - Use {option}`connectionStringFile` instead. + Use [](#opt-services.prometheus.exporters.pgbouncer.connectionEnvFile) if the + URL contains a secret. ''; }; - connectionStringFile = mkOption { - type = types.nullOr types.path; + connectionEnvFile = mkOption { + type = types.nullOr types.str; default = null; - example = "/run/keys/pgBouncer-connection-string"; description = '' - File that contains pgBouncer connection string in format: - postgres://admin:@localhost:6432/pgbouncer?sslmode=require + File that must contain the environment variable + `PGBOUNCER_EXPORTER_CONNECTION_STRING` which is set to the connection + string used by pgbouncer. I.e. the format is supposed to look like this: - NOTE: You MUST keep pgbouncer as database name (special internal db)!!! + ``` + PGBOUNCER_EXPORTER_CONNECTION_STRING="postgres://admin@localhost:6432/pgbouncer?sslmode=require" + ``` - NOTE: ignore_startup_parameters MUST contain "extra_float_digits". + NOTE: You MUST keep pgbouncer as database name (special internal db)! + NOTE: `services.pgbouncer.settings.pgbouncer.ignore_startup_parameters` + MUST contain "extra_float_digits". - NOTE: Admin user (with password or passwordless) MUST exist in the - auth_file if auth_type other than "any" is used. - - {option}`connectionStringFile` takes precedence over {option}`connectionString` + Mutually exclusive with [](#opt-services.prometheus.exporters.pgbouncer.connectionString). ''; }; @@ -126,16 +125,11 @@ in serviceOpts = { after = [ "pgbouncer.service" ]; - script = optionalString (cfg.connectionStringFile != null) '' - connectionString=$(${escapeShellArgs [ - (getExe' pkgs.coreutils "cat") "--" cfg.connectionStringFile - ]}) - '' + concatStringsSep " " ([ + script = concatStringsSep " " ([ "exec -- ${escapeShellArg (getExe cfg.package)}" "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}" - "--pgBouncer.connectionString ${if cfg.connectionStringFile != null - then "\"$connectionString\"" - else "${escapeShellArg cfg.connectionString}"}" + ] ++ optionals (cfg.connectionString != null) [ + "--pgBouncer.connectionString ${escapeShellArg cfg.connectionString}" ] ++ optionals (cfg.telemetryPath != null) [ "--web.telemetry-path ${escapeShellArg cfg.telemetryPath}" ] ++ optionals (cfg.pidFile != null) [ @@ -151,5 +145,21 @@ in ] ++ cfg.extraFlags); serviceConfig.RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + serviceConfig.EnvironmentFile = lib.mkIf (cfg.connectionEnvFile != null) [ + cfg.connectionEnvFile + ]; }; + + imports = [ + (lib.mkRemovedOptionModule [ "connectionStringFile" ] '' + As replacement, the option `services.prometheus.exporters.pgbouncer.connectionEnvFile` + has been added. In contrast to `connectionStringFile` it must be an environment file + with the connection string being set to `PGBOUNCER_EXPORTER_CONNECTION_STRING`. + + The change was necessary since the former option wrote the contents of the file + into the cmdline of the exporter making the connection string effectively + world-readable. + '') + ({ options.warnings = options.warnings; options.assertions = options.assertions; }) + ]; } diff --git a/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix b/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix index e3dcc6126ff12..90adfe911a737 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix @@ -58,7 +58,7 @@ in PrivateDevices = lib.mkForce false; ProtectProc = "invisible"; ProcSubset = "pid"; - SupplementaryGroups = [ "disk" ]; + SupplementaryGroups = [ "disk" "smartctl-exporter-access" ]; SystemCallFilter = [ "@system-service" "~@privileged" ]; }; }; diff --git a/nixos/modules/services/monitoring/rustdesk-server.nix b/nixos/modules/services/monitoring/rustdesk-server.nix index ea4dd43cbb35b..e757d8fdf0544 100644 --- a/nixos/modules/services/monitoring/rustdesk-server.nix +++ b/nixos/modules/services/monitoring/rustdesk-server.nix @@ -86,7 +86,7 @@ in { systemd.slices.system-rustdesk = { enable = true; - description = "Slice designed to contain RustDesk Signal & RustDesk Relay"; + description = "RustDesk Remote Desktop Slice"; }; systemd.targets.rustdesk = { diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 6fd3b5707ab67..65b6259c12bd8 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -269,7 +269,10 @@ in systemd.services.smartd = { description = "S.M.A.R.T. Daemon"; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}"; + serviceConfig = { + Type = "notify"; + ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}"; + }; }; services.systembus-notify.enable = mkDefault ns.enable; diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index 8c51a2838e05e..dfff80e1bac21 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -61,7 +61,8 @@ in { wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; - path = lib.optional (config.services.telegraf.extraConfig.inputs ? procstat) pkgs.procps; + path = lib.optional (config.services.telegraf.extraConfig.inputs ? procstat) pkgs.procps + ++ lib.optional (config.services.telegraf.extraConfig.inputs ? ping) pkgs.iputils; serviceConfig = { EnvironmentFile = config.services.telegraf.environmentFiles; ExecStartPre = lib.optional (config.services.telegraf.environmentFiles != []) diff --git a/nixos/modules/services/monitoring/todesk.nix b/nixos/modules/services/monitoring/todesk.nix new file mode 100644 index 0000000000000..807d924abfcfb --- /dev/null +++ b/nixos/modules/services/monitoring/todesk.nix @@ -0,0 +1,45 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.todesk; +in +{ + options = { + services.todesk.enable = lib.mkEnableOption "ToDesk daemon"; + services.todesk.package = lib.mkPackageOption pkgs "todesk" { }; + }; + + config = lib.mkIf cfg.enable { + + environment.systemPackages = [ cfg.package ]; + + systemd.services.todeskd = { + description = "ToDesk Daemon Service"; + + wantedBy = [ "multi-user.target" ]; + wants = [ + "network-online.target" + "display-manager.service" + "nss-lookup.target" + ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${cfg.package}/bin/todesk service"; + ExecReload = "${pkgs.coreutils}/bin/kill -SIGINT $MAINPID"; + Restart = "on-failure"; + WorkingDirectory = "/var/lib/todesk"; + PrivateTmp = true; + StateDirectory = "todesk"; + StateDirectoryMode = "0777"; # Desktop application read and write /opt/todesk/config/config.ini. Such a pain! + ProtectSystem = "strict"; + ProtectHome = "read-only"; + RemoveIPC = "yes"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/unpoller.nix b/nixos/modules/services/monitoring/unpoller.nix index 1b4acb5d938f9..1cdd8a78ea8ff 100644 --- a/nixos/modules/services/monitoring/unpoller.nix +++ b/nixos/modules/services/monitoring/unpoller.nix @@ -1,11 +1,8 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.unpoller; - configFile = pkgs.writeText "unpoller.json" (generators.toJSON {} { + configFile = pkgs.writeText "unpoller.json" (lib.generators.toJSON {} { inherit (cfg) poller influxdb loki prometheus unifi; }); @@ -15,26 +12,26 @@ in { ]; options.services.unpoller = { - enable = mkEnableOption "unpoller"; + enable = lib.mkEnableOption "unpoller"; poller = { - debug = mkOption { - type = types.bool; + debug = lib.mkOption { + type = lib.types.bool; default = false; description = '' Turns on line numbers, microsecond logging, and a per-device log. This may be noisy if you have a lot of devices. It adds one line per device. ''; }; - quiet = mkOption { - type = types.bool; + quiet = lib.mkOption { + type = lib.types.bool; default = false; description = '' Turns off per-interval logs. Only startup and error logs will be emitted. ''; }; - plugins = mkOption { - type = with types; listOf str; + plugins = lib.mkOption { + type = with lib.types; listOf str; default = []; description = '' Load additional plugins. @@ -43,22 +40,22 @@ in { }; prometheus = { - disable = mkOption { - type = types.bool; + disable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to disable the prometheus output plugin. ''; }; - http_listen = mkOption { - type = types.str; + http_listen = lib.mkOption { + type = lib.types.str; default = "[::]:9130"; description = '' Bind the prometheus exporter to this IP or hostname. ''; }; - report_errors = mkOption { - type = types.bool; + report_errors = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to report errors. @@ -67,53 +64,53 @@ in { }; influxdb = { - disable = mkOption { - type = types.bool; + disable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to disable the influxdb output plugin. ''; }; - url = mkOption { - type = types.str; + url = lib.mkOption { + type = lib.types.str; default = "http://127.0.0.1:8086"; description = '' URL of the influxdb host. ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "unifipoller"; description = '' Username for the influxdb. ''; }; - pass = mkOption { - type = types.path; + pass = lib.mkOption { + type = lib.types.path; default = pkgs.writeText "unpoller-influxdb-default.password" "unifipoller"; - defaultText = literalExpression "unpoller-influxdb-default.password"; + defaultText = lib.literalExpression "unpoller-influxdb-default.password"; description = '' Path of a file containing the password for influxdb. This file needs to be readable by the unifi-poller user. ''; apply = v: "file://${v}"; }; - db = mkOption { - type = types.str; + db = lib.mkOption { + type = lib.types.str; default = "unifi"; description = '' Database name. Database should exist. ''; }; - verify_ssl = mkOption { - type = types.bool; + verify_ssl = lib.mkOption { + type = lib.types.bool; default = true; description = '' Verify the influxdb's certificate. ''; }; - interval = mkOption { - type = types.str; + interval = lib.mkOption { + type = lib.types.str; default = "30s"; description = '' Setting this lower than the Unifi controller's refresh @@ -123,22 +120,22 @@ in { }; loki = { - url = mkOption { - type = types.str; + url = lib.mkOption { + type = lib.types.str; default = ""; description = '' URL of the Loki host. ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = ""; description = '' Username for Loki. ''; }; - pass = mkOption { - type = types.path; + pass = lib.mkOption { + type = lib.types.path; default = pkgs.writeText "unpoller-loki-default.password" ""; defaultText = "unpoller-influxdb-default.password"; description = '' @@ -147,29 +144,29 @@ in { ''; apply = v: "file://${v}"; }; - verify_ssl = mkOption { - type = types.bool; + verify_ssl = lib.mkOption { + type = lib.types.bool; default = false; description = '' Verify Loki's certificate. ''; }; - tenant_id = mkOption { - type = types.str; + tenant_id = lib.mkOption { + type = lib.types.str; default = ""; description = '' Tenant ID to use in Loki. ''; }; - interval = mkOption { - type = types.str; + interval = lib.mkOption { + type = lib.types.str; default = "2m"; description = '' How often the events are polled and pushed to Loki. ''; }; - timeout = mkOption { - type = types.str; + timeout = lib.mkOption { + type = lib.types.str; default = "10s"; description = '' Should be increased in case of timeout errors. @@ -179,92 +176,92 @@ in { unifi = let controllerOptions = { - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "unifi"; description = '' Unifi service user name. ''; }; - pass = mkOption { - type = types.path; + pass = lib.mkOption { + type = lib.types.path; default = pkgs.writeText "unpoller-unifi-default.password" "unifi"; - defaultText = literalExpression "unpoller-unifi-default.password"; + defaultText = lib.literalExpression "unpoller-unifi-default.password"; description = '' Path of a file containing the password for the unifi service user. This file needs to be readable by the unifi-poller user. ''; apply = v: "file://${v}"; }; - url = mkOption { - type = types.str; + url = lib.mkOption { + type = lib.types.str; default = "https://unifi:8443"; description = '' URL of the Unifi controller. ''; }; - sites = mkOption { - type = with types; either (enum [ "default" "all" ]) (listOf str); + sites = lib.mkOption { + type = with lib.types; either (enum [ "default" "all" ]) (listOf str); default = "all"; description = '' List of site names for which statistics should be exported. Or the string "default" for the default site or the string "all" for all sites. ''; - apply = toList; + apply = lib.toList; }; - save_ids = mkOption { - type = types.bool; + save_ids = lib.mkOption { + type = lib.types.bool; default = false; description = '' Collect and save data from the intrusion detection system to influxdb and Loki. ''; }; - save_events = mkOption { - type = types.bool; + save_events = lib.mkOption { + type = lib.types.bool; default = false; description = '' Collect and save data from UniFi events to influxdb and Loki. ''; }; - save_alarms = mkOption { - type = types.bool; + save_alarms = lib.mkOption { + type = lib.types.bool; default = false; description = '' Collect and save data from UniFi alarms to influxdb and Loki. ''; }; - save_anomalies = mkOption { - type = types.bool; + save_anomalies = lib.mkOption { + type = lib.types.bool; default = false; description = '' Collect and save data from UniFi anomalies to influxdb and Loki. ''; }; - save_dpi = mkOption { - type = types.bool; + save_dpi = lib.mkOption { + type = lib.types.bool; default = false; description = '' Collect and save data from deep packet inspection. Adds around 150 data points and impacts performance. ''; }; - save_sites = mkOption { - type = types.bool; + save_sites = lib.mkOption { + type = lib.types.bool; default = true; description = '' Collect and save site data. ''; }; - hash_pii = mkOption { - type = types.bool; + hash_pii = lib.mkOption { + type = lib.types.bool; default = false; description = '' Hash, with md5, client names and MAC addresses. This attempts to protect personally identifiable information. ''; }; - verify_ssl = mkOption { - type = types.bool; + verify_ssl = lib.mkOption { + type = lib.types.bool; default = true; description = '' Verify the Unifi controller's certificate. @@ -273,8 +270,8 @@ in { }; in { - dynamic = mkOption { - type = types.bool; + dynamic = lib.mkOption { + type = lib.types.bool; default = false; description = '' Let prometheus select which controller to poll when scraping. @@ -284,18 +281,18 @@ in { defaults = controllerOptions; - controllers = mkOption { - type = with types; listOf (submodule { options = controllerOptions; }); + controllers = lib.mkOption { + type = with lib.types; listOf (submodule { options = controllerOptions; }); default = []; description = '' List of Unifi controllers to poll. Use defaults if empty. ''; - apply = map (flip removeAttrs [ "_module" ]); + apply = map (lib.flip removeAttrs [ "_module" ]); }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.groups.unifi-poller = { }; users.users.unifi-poller = { description = "unifi-poller Service User"; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 0d157afd51a0b..9361393d91af7 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -5,6 +5,11 @@ let cfg = config.power.ups; defaultPort = 3493; + envVars = { + NUT_CONFPATH = "/etc/nut"; + NUT_STATEPATH = "/var/lib/nut"; + }; + nutFormat = { type = with lib.types; let @@ -493,7 +498,9 @@ in }) ]; + # For interactive use. environment.systemPackages = [ pkgs.nut ]; + environment.variables = envVars; networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = @@ -502,6 +509,11 @@ in else lib.unique (lib.forEach cfg.upsd.listen (listen: listen.port)); }; + systemd.slices.system-ups = { + description = "Network UPS Tools (NUT) Slice"; + documentation = [ "https://networkupstools.org/" ]; + }; + systemd.services.upsmon = let secrets = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}") cfg.upsmon.monitor; createUpsmonConf = installSecrets upsmonConf "/run/nut/upsmon.conf" secrets; @@ -516,9 +528,9 @@ in ExecStart = "${pkgs.nut}/sbin/upsmon"; ExecReload = "${pkgs.nut}/sbin/upsmon -c reload"; LoadCredential = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}:${monitor.passwordFile}") cfg.upsmon.monitor; + Slice = "system-ups.slice"; }; - environment.NUT_CONFPATH = "/etc/nut"; - environment.NUT_STATEPATH = "/var/lib/nut"; + environment = envVars; }; systemd.services.upsd = let @@ -536,9 +548,9 @@ in ExecStart = "${pkgs.nut}/sbin/upsd -u root"; ExecReload = "${pkgs.nut}/sbin/upsd -c reload"; LoadCredential = lib.mapAttrsToList (name: user: "upsdusers_password_${name}:${user.passwordFile}") cfg.users; + Slice = "system-ups.slice"; }; - environment.NUT_CONFPATH = "/etc/nut"; - environment.NUT_STATEPATH = "/var/lib/nut"; + environment = envVars; restartTriggers = [ config.environment.etc."nut/upsd.conf".source ]; @@ -554,9 +566,9 @@ in RemainAfterExit = true; # TODO: replace 'root' by another username. ExecStart = "${pkgs.nut}/bin/upsdrvctl -u root start"; + Slice = "system-ups.slice"; }; - environment.NUT_CONFPATH = "/etc/nut"; - environment.NUT_STATEPATH = "/var/lib/nut"; + environment = envVars; restartTriggers = [ config.environment.etc."nut/ups.conf".source ]; diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index d375434a1bd47..5961731dbf446 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -1,16 +1,13 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.ceph; # function that translates "camelCaseOptions" to "camel case options", credits to tilpner in #nixos@freenode - expandCamelCase = replaceStrings upperChars (map (s: " ${s}") lowerChars); - expandCamelCaseAttrs = mapAttrs' (name: value: nameValuePair (expandCamelCase name) value); + expandCamelCase = lib.replaceStrings lib.upperChars (map (s: " ${s}") lib.lowerChars); + expandCamelCaseAttrs = lib.mapAttrs' (name: value: lib.nameValuePair (expandCamelCase name) value); makeServices = daemonType: daemonIds: - mkMerge (map (daemonId: + lib.mkMerge (map (daemonId: { "ceph-${daemonType}-${daemonId}" = makeService daemonType daemonId cfg.global.clusterName cfg.${daemonType}.package; }) daemonIds); @@ -18,8 +15,8 @@ let let stateDirectory = "ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}"; in { enable = true; - description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}"; - after = [ "network-online.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target"; + description = "Ceph ${builtins.replaceStrings lib.lowerChars lib.upperChars daemonType} daemon ${daemonId}"; + after = [ "network-online.target" "time-sync.target" ] ++ lib.optional (daemonType == "osd") "ceph-mon.target"; wants = [ "network-online.target" "time-sync.target" ]; partOf = [ "ceph-${daemonType}.target" ]; wantedBy = [ "ceph-${daemonType}.target" ]; @@ -47,11 +44,11 @@ let Group = if daemonType == "osd" then "disk" else "ceph"; ExecStart = ''${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \ -f --cluster ${clusterName} --id ${daemonId}''; - } // optionalAttrs (daemonType == "osd") { + } // lib.optionalAttrs (daemonType == "osd") { ExecStartPre = "${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}"; RestartSec = "20s"; PrivateDevices = "no"; # osd needs disk access - } // optionalAttrs ( daemonType == "mon") { + } // lib.optionalAttrs ( daemonType == "mon") { RestartSec = "10"; }; }; @@ -71,11 +68,11 @@ in options.services.ceph = { # Ceph has a monolithic configuration file but different sections for # each daemon, a separate client section and a global section - enable = mkEnableOption "Ceph global configuration"; + enable = lib.mkEnableOption "Ceph global configuration"; global = { - fsid = mkOption { - type = types.str; + fsid = lib.mkOption { + type = lib.types.str; example = '' 433a2193-4f8a-47a0-95d2-209d7ca2cca5 ''; @@ -85,25 +82,25 @@ in ''; }; - clusterName = mkOption { - type = types.str; + clusterName = lib.mkOption { + type = lib.types.str; default = "ceph"; description = '' Name of cluster ''; }; - mgrModulePath = mkOption { - type = types.path; + mgrModulePath = lib.mkOption { + type = lib.types.path; default = "${pkgs.ceph.lib}/lib/ceph/mgr"; - defaultText = literalExpression ''"''${pkgs.ceph.lib}/lib/ceph/mgr"''; + defaultText = lib.literalExpression ''"''${pkgs.ceph.lib}/lib/ceph/mgr"''; description = '' Path at which to find ceph-mgr modules. ''; }; - monInitialMembers = mkOption { - type = with types; nullOr commas; + monInitialMembers = lib.mkOption { + type = with lib.types; nullOr commas; default = null; example = '' node0, node1, node2 @@ -113,8 +110,8 @@ in ''; }; - monHost = mkOption { - type = with types; nullOr commas; + monHost = lib.mkOption { + type = with lib.types; nullOr commas; default = null; example = '' 10.10.0.1, 10.10.0.2, 10.10.0.3 @@ -124,40 +121,40 @@ in ''; }; - maxOpenFiles = mkOption { - type = types.int; + maxOpenFiles = lib.mkOption { + type = lib.types.int; default = 131072; description = '' Max open files for each OSD daemon. ''; }; - authClusterRequired = mkOption { - type = types.enum [ "cephx" "none" ]; + authClusterRequired = lib.mkOption { + type = lib.types.enum [ "cephx" "none" ]; default = "cephx"; description = '' Enables requiring daemons to authenticate with eachother in the cluster. ''; }; - authServiceRequired = mkOption { - type = types.enum [ "cephx" "none" ]; + authServiceRequired = lib.mkOption { + type = lib.types.enum [ "cephx" "none" ]; default = "cephx"; description = '' Enables requiring clients to authenticate with the cluster to access services in the cluster (e.g. radosgw, mds or osd). ''; }; - authClientRequired = mkOption { - type = types.enum [ "cephx" "none" ]; + authClientRequired = lib.mkOption { + type = lib.types.enum [ "cephx" "none" ]; default = "cephx"; description = '' Enables requiring the cluster to authenticate itself to the client. ''; }; - publicNetwork = mkOption { - type = with types; nullOr commas; + publicNetwork = lib.mkOption { + type = with lib.types; nullOr commas; default = null; example = '' 10.20.0.0/24, 192.168.1.0/24 @@ -167,8 +164,8 @@ in ''; }; - clusterNetwork = mkOption { - type = with types; nullOr commas; + clusterNetwork = lib.mkOption { + type = with lib.types; nullOr commas; default = null; example = '' 10.10.0.0/24, 192.168.0.0/24 @@ -178,18 +175,18 @@ in ''; }; - rgwMimeTypesFile = mkOption { - type = with types; nullOr path; + rgwMimeTypesFile = lib.mkOption { + type = with lib.types; nullOr path; default = "${pkgs.mailcap}/etc/mime.types"; - defaultText = literalExpression ''"''${pkgs.mailcap}/etc/mime.types"''; + defaultText = lib.literalExpression ''"''${pkgs.mailcap}/etc/mime.types"''; description = '' Path to mime types used by radosgw. ''; }; }; - extraConfig = mkOption { - type = with types; attrsOf str; + extraConfig = lib.mkOption { + type = with lib.types; attrsOf str; default = {}; example = { "ms bind ipv6" = "true"; @@ -200,9 +197,9 @@ in }; mgr = { - enable = mkEnableOption "Ceph MGR daemon"; - daemons = mkOption { - type = with types; listOf str; + enable = lib.mkEnableOption "Ceph MGR daemon"; + daemons = lib.mkOption { + type = with lib.types; listOf str; default = []; example = [ "name1" "name2" ]; description = '' @@ -210,9 +207,9 @@ in to the id part in ceph i.e. [ "name1" ] would result in mgr.name1 ''; }; - package = mkPackageOption pkgs "ceph" { }; - extraConfig = mkOption { - type = with types; attrsOf str; + package = lib.mkPackageOption pkgs "ceph" { }; + extraConfig = lib.mkOption { + type = with lib.types; attrsOf str; default = {}; description = '' Extra configuration to add to the global section for manager daemons. @@ -221,9 +218,9 @@ in }; mon = { - enable = mkEnableOption "Ceph MON daemon"; - daemons = mkOption { - type = with types; listOf str; + enable = lib.mkEnableOption "Ceph MON daemon"; + daemons = lib.mkOption { + type = with lib.types; listOf str; default = []; example = [ "name1" "name2" ]; description = '' @@ -231,9 +228,9 @@ in to the id part in ceph i.e. [ "name1" ] would result in mon.name1 ''; }; - package = mkPackageOption pkgs "ceph" { }; - extraConfig = mkOption { - type = with types; attrsOf str; + package = lib.mkPackageOption pkgs "ceph" { }; + extraConfig = lib.mkOption { + type = with lib.types; attrsOf str; default = {}; description = '' Extra configuration to add to the monitor section. @@ -242,9 +239,9 @@ in }; osd = { - enable = mkEnableOption "Ceph OSD daemon"; - daemons = mkOption { - type = with types; listOf str; + enable = lib.mkEnableOption "Ceph OSD daemon"; + daemons = lib.mkOption { + type = with lib.types; listOf str; default = []; example = [ "name1" "name2" ]; description = '' @@ -252,9 +249,9 @@ in to the id part in ceph i.e. [ "name1" ] would result in osd.name1 ''; }; - package = mkPackageOption pkgs "ceph" { }; - extraConfig = mkOption { - type = with types; attrsOf str; + package = lib.mkPackageOption pkgs "ceph" { }; + extraConfig = lib.mkOption { + type = with lib.types; attrsOf str; default = { "osd journal size" = "10000"; "osd pool default size" = "3"; @@ -270,9 +267,9 @@ in }; mds = { - enable = mkEnableOption "Ceph MDS daemon"; - daemons = mkOption { - type = with types; listOf str; + enable = lib.mkEnableOption "Ceph MDS daemon"; + daemons = lib.mkOption { + type = with lib.types; listOf str; default = []; example = [ "name1" "name2" ]; description = '' @@ -280,9 +277,9 @@ in to the id part in ceph i.e. [ "name1" ] would result in mds.name1 ''; }; - package = mkPackageOption pkgs "ceph" { }; - extraConfig = mkOption { - type = with types; attrsOf str; + package = lib.mkPackageOption pkgs "ceph" { }; + extraConfig = lib.mkOption { + type = with lib.types; attrsOf str; default = {}; description = '' Extra configuration to add to the MDS section. @@ -291,10 +288,10 @@ in }; rgw = { - enable = mkEnableOption "Ceph RadosGW daemon"; - package = mkPackageOption pkgs "ceph" { }; - daemons = mkOption { - type = with types; listOf str; + enable = lib.mkEnableOption "Ceph RadosGW daemon"; + package = lib.mkPackageOption pkgs "ceph" { }; + daemons = lib.mkOption { + type = with lib.types; listOf str; default = []; example = [ "name1" "name2" ]; description = '' @@ -307,11 +304,11 @@ in }; client = { - enable = mkEnableOption "Ceph client configuration"; - extraConfig = mkOption { - type = with types; attrsOf (attrsOf str); + enable = lib.mkEnableOption "Ceph client configuration"; + extraConfig = lib.mkOption { + type = with lib.types; attrsOf (attrsOf str); default = {}; - example = literalExpression '' + example = lib.literalExpression '' { # This would create a section for a radosgw daemon named node0 and related # configuration for it @@ -326,7 +323,7 @@ in }; }; - config = mkIf config.services.ceph.enable { + config = lib.mkIf config.services.ceph.enable { assertions = [ { assertion = cfg.global.fsid != ""; message = "fsid has to be set to a valid uuid for the cluster to function"; @@ -345,22 +342,22 @@ in } ]; - warnings = optional (cfg.global.monInitialMembers == null) + warnings = lib.optional (cfg.global.monInitialMembers == null) "Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function"; environment.etc."ceph/ceph.conf".text = let # Merge the extraConfig set for mgr daemons, as mgr don't have their own section - globalSection = expandCamelCaseAttrs (cfg.global // cfg.extraConfig // optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig); + globalSection = expandCamelCaseAttrs (cfg.global // cfg.extraConfig // lib.optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig); # Remove all name-value pairs with null values from the attribute set to avoid making empty sections in the ceph.conf - globalSection' = filterAttrs (name: value: value != null) globalSection; + globalSection' = lib.filterAttrs (name: value: value != null) globalSection; totalConfig = { global = globalSection'; - } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { mon = cfg.mon.extraConfig; } - // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { mds = cfg.mds.extraConfig; } - // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { osd = cfg.osd.extraConfig; } - // optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig; + } // lib.optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { mon = cfg.mon.extraConfig; } + // lib.optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { mds = cfg.mds.extraConfig; } + // lib.optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { osd = cfg.osd.extraConfig; } + // lib.optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig; in - generators.toINI {} totalConfig; + lib.generators.toINI {} totalConfig; users.users.ceph = { uid = config.ids.uids.ceph; @@ -375,13 +372,13 @@ in systemd.services = let services = [] - ++ optional cfg.mon.enable (makeServices "mon" cfg.mon.daemons) - ++ optional cfg.mds.enable (makeServices "mds" cfg.mds.daemons) - ++ optional cfg.osd.enable (makeServices "osd" cfg.osd.daemons) - ++ optional cfg.rgw.enable (makeServices "rgw" cfg.rgw.daemons) - ++ optional cfg.mgr.enable (makeServices "mgr" cfg.mgr.daemons); + ++ lib.optional cfg.mon.enable (makeServices "mon" cfg.mon.daemons) + ++ lib.optional cfg.mds.enable (makeServices "mds" cfg.mds.daemons) + ++ lib.optional cfg.osd.enable (makeServices "osd" cfg.osd.daemons) + ++ lib.optional cfg.rgw.enable (makeServices "rgw" cfg.rgw.daemons) + ++ lib.optional cfg.mgr.enable (makeServices "mgr" cfg.mgr.daemons); in - mkMerge services; + lib.mkMerge services; systemd.targets = let targets = [ @@ -390,13 +387,13 @@ in wantedBy = [ "multi-user.target" ]; unitConfig.StopWhenUnneeded = true; }; } ] - ++ optional cfg.mon.enable (makeTarget "mon") - ++ optional cfg.mds.enable (makeTarget "mds") - ++ optional cfg.osd.enable (makeTarget "osd") - ++ optional cfg.rgw.enable (makeTarget "rgw") - ++ optional cfg.mgr.enable (makeTarget "mgr"); + ++ lib.optional cfg.mon.enable (makeTarget "mon") + ++ lib.optional cfg.mds.enable (makeTarget "mds") + ++ lib.optional cfg.osd.enable (makeTarget "osd") + ++ lib.optional cfg.rgw.enable (makeTarget "rgw") + ++ lib.optional cfg.mgr.enable (makeTarget "mgr"); in - mkMerge targets; + lib.mkMerge targets; systemd.tmpfiles.settings."10-ceph" = let defaultConfig = { @@ -407,9 +404,9 @@ in "/etc/ceph".d = defaultConfig; "/run/ceph".d = defaultConfig // { mode = "0770"; }; "/var/lib/ceph".d = defaultConfig; - "/var/lib/ceph/mgr".d = mkIf (cfg.mgr.enable) defaultConfig; - "/var/lib/ceph/mon".d = mkIf (cfg.mon.enable) defaultConfig; - "/var/lib/ceph/osd".d = mkIf (cfg.osd.enable) defaultConfig; + "/var/lib/ceph/mgr".d = lib.mkIf (cfg.mgr.enable) defaultConfig; + "/var/lib/ceph/mon".d = lib.mkIf (cfg.mon.enable) defaultConfig; + "/var/lib/ceph/osd".d = lib.mkIf (cfg.osd.enable) defaultConfig; }; }; } diff --git a/nixos/modules/services/network-filesystems/kbfs.nix b/nixos/modules/services/network-filesystems/kbfs.nix index 903cae379986d..034fc95765061 100644 --- a/nixos/modules/services/network-filesystems/kbfs.nix +++ b/nixos/modules/services/network-filesystems/kbfs.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: -with lib; let inherit (config.security) wrapperDir; cfg = config.services.kbfs; @@ -12,14 +11,14 @@ in { services.kbfs = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to mount the Keybase filesystem."; }; - enableRedirector = mkOption { - type = types.bool; + enableRedirector = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable the Keybase root redirector service, allowing @@ -28,15 +27,15 @@ in { ''; }; - mountPoint = mkOption { - type = types.str; + mountPoint = lib.mkOption { + type = lib.types.str; default = "%h/keybase"; example = "/keybase"; description = "Mountpoint for the Keybase filesystem."; }; - extraFlags = mkOption { - type = types.listOf types.str; + extraFlags = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "-label kbfs" @@ -52,7 +51,7 @@ in { ###### implementation - config = mkIf cfg.enable (mkMerge [ + config = lib.mkIf cfg.enable (lib.mkMerge [ { # Upstream: https://github.com/keybase/client/blob/master/packaging/linux/systemd/kbfs.service systemd.user.services.kbfs = { @@ -61,7 +60,7 @@ in { # Note that the "Requires" directive will cause a unit to be restarted whenever its dependency is restarted. # Do not issue a hard dependency on keybase, because kbfs can reconnect to a restarted service. # Do not issue a hard dependency on keybase-redirector, because it's ok if it fails (e.g., if it is disabled). - wants = [ "keybase.service" ] ++ optional cfg.enableRedirector "keybase-redirector.service"; + wants = [ "keybase.service" ] ++ lib.optional cfg.enableRedirector "keybase-redirector.service"; path = [ "/run/wrappers" ]; unitConfig.ConditionUser = "!@system"; @@ -89,7 +88,7 @@ in { environment.systemPackages = [ pkgs.kbfs ]; } - (mkIf cfg.enableRedirector { + (lib.mkIf cfg.enableRedirector { security.wrappers."keybase-redirector".source = "${pkgs.kbfs}/bin/redirector"; systemd.tmpfiles.settings."10-kbfs"."/keybase".d = { diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index d4ffda7c374e9..35efd2ba0a576 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, utils, ... }: -with lib; let cfg = config.services.kubo; @@ -35,11 +34,11 @@ let ''; kuboFlags = utils.escapeSystemdExecArgs ( - optional cfg.autoMount "--mount" ++ - optional cfg.enableGC "--enable-gc" ++ - optional (cfg.serviceFdlimit != null) "--manage-fdlimit=false" ++ - optional (cfg.defaultMode == "offline") "--offline" ++ - optional (cfg.defaultMode == "norouting") "--routing=none" ++ + lib.optional cfg.autoMount "--mount" ++ + lib.optional cfg.enableGC "--enable-gc" ++ + lib.optional (cfg.serviceFdlimit != null) "--manage-fdlimit=false" ++ + lib.optional (cfg.defaultMode == "offline") "--offline" ++ + lib.optional (cfg.defaultMode == "norouting") "--routing=none" ++ cfg.extraFlags ); @@ -99,78 +98,78 @@ in services.kubo = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' the Interplanetary File System (WARNING: may cause severe network degradation). NOTE: after enabling this option and rebuilding your system, you need to log out and back in for the `IPFS_PATH` environment variable to be present in your shell. Until you do that, the CLI tools won't be able to talk to the daemon by default ''; - package = mkPackageOption pkgs "kubo" { }; + package = lib.mkPackageOption pkgs "kubo" { }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "ipfs"; description = "User under which the Kubo daemon runs"; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "ipfs"; description = "Group under which the Kubo daemon runs"; }; - dataDir = mkOption { - type = types.str; + dataDir = lib.mkOption { + type = lib.types.str; default = - if versionAtLeast config.system.stateVersion "17.09" + if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/ipfs" else "/var/lib/ipfs/.ipfs"; - defaultText = literalExpression '' - if versionAtLeast config.system.stateVersion "17.09" + defaultText = lib.literalExpression '' + if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/ipfs" else "/var/lib/ipfs/.ipfs" ''; description = "The data dir for Kubo"; }; - defaultMode = mkOption { - type = types.enum [ "online" "offline" "norouting" ]; + defaultMode = lib.mkOption { + type = lib.types.enum [ "online" "offline" "norouting" ]; default = "online"; description = "systemd service that is enabled by default"; }; - autoMount = mkOption { - type = types.bool; + autoMount = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether Kubo should try to mount /ipfs and /ipns at startup."; }; - autoMigrate = mkOption { - type = types.bool; + autoMigrate = lib.mkOption { + type = lib.types.bool; default = true; description = "Whether Kubo should try to run the fs-repo-migration at startup."; }; - enableGC = mkOption { - type = types.bool; + enableGC = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to enable automatic garbage collection"; }; - emptyRepo = mkOption { - type = types.bool; + emptyRepo = lib.mkOption { + type = lib.types.bool; default = true; description = "If set to false, the repo will be initialized with help files"; }; - settings = mkOption { + settings = lib.mkOption { type = lib.types.submodule { freeformType = settingsFormat.type; options = { - Addresses.API = mkOption { - type = types.oneOf [ types.str (types.listOf types.str) ]; + Addresses.API = lib.mkOption { + type = lib.types.oneOf [ lib.types.str (lib.types.listOf lib.types.str) ]; default = [ ]; description = '' Multiaddr or array of multiaddrs describing the address to serve the local HTTP API on. @@ -180,14 +179,14 @@ in ''; }; - Addresses.Gateway = mkOption { - type = types.oneOf [ types.str (types.listOf types.str) ]; + Addresses.Gateway = lib.mkOption { + type = lib.types.oneOf [ lib.types.str (lib.types.listOf lib.types.str) ]; default = "/ip4/127.0.0.1/tcp/8080"; description = "Where the IPFS Gateway can be reached"; }; - Addresses.Swarm = mkOption { - type = types.listOf types.str; + Addresses.Swarm = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ "/ip4/0.0.0.0/tcp/4001" "/ip6/::/tcp/4001" @@ -199,14 +198,14 @@ in description = "Where Kubo listens for incoming p2p connections"; }; - Mounts.IPFS = mkOption { - type = types.str; + Mounts.IPFS = lib.mkOption { + type = lib.types.str; default = "/ipfs"; description = "Where to mount the IPFS namespace to"; }; - Mounts.IPNS = mkOption { - type = types.str; + Mounts.IPNS = lib.mkOption { + type = lib.types.str; default = "/ipns"; description = "Where to mount the IPNS namespace to"; }; @@ -230,29 +229,29 @@ in }; - extraFlags = mkOption { - type = types.listOf types.str; + extraFlags = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "Extra flags passed to the Kubo daemon"; default = [ ]; }; - localDiscovery = mkOption { - type = types.bool; + localDiscovery = lib.mkOption { + type = lib.types.bool; description = ''Whether to enable local discovery for the Kubo daemon. This will allow Kubo to scan ports on your local network. Some hosting services will ban you if you do this. ''; default = false; }; - serviceFdlimit = mkOption { - type = types.nullOr types.int; + serviceFdlimit = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; description = "The fdlimit for the Kubo systemd unit or `null` to have the daemon attempt to manage it"; example = 64 * 1024; }; - startWhenNeeded = mkOption { - type = types.bool; + startWhenNeeded = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to use socket activation to start Kubo when needed."; }; @@ -262,7 +261,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = !builtins.hasAttr "Identity" cfg.settings; @@ -288,14 +287,14 @@ in environment.variables.IPFS_PATH = fakeKuboRepo; # 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" = lib.mkDefault 2500000; + boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 2500000; - programs.fuse = mkIf cfg.autoMount { + programs.fuse = lib.mkIf cfg.autoMount { userAllowOther = true; }; - users.users = mkIf (cfg.user == "ipfs") { + users.users = lib.mkIf (cfg.user == "ipfs") { ipfs = { group = cfg.group; home = cfg.dataDir; @@ -308,7 +307,7 @@ in }; }; - users.groups = mkIf (cfg.group == "ipfs") { + users.groups = lib.mkIf (cfg.group == "ipfs") { ipfs.gid = config.ids.gids.ipfs; }; @@ -316,8 +315,8 @@ in defaultConfig = { inherit (cfg) user group; }; in { ${cfg.dataDir}.d = defaultConfig; - ${cfg.settings.Mounts.IPFS}.d = mkIf (cfg.autoMount) defaultConfig; - ${cfg.settings.Mounts.IPNS}.d = mkIf (cfg.autoMount) defaultConfig; + ${cfg.settings.Mounts.IPFS}.d = lib.mkIf (cfg.autoMount) defaultConfig; + ${cfg.settings.Mounts.IPNS}.d = lib.mkIf (cfg.autoMount) defaultConfig; }; # The hardened systemd unit breaks the fuse-mount function according to documentation in the unit file itself @@ -325,7 +324,7 @@ in then [ cfg.package.systemd_unit ] else [ cfg.package.systemd_unit_hardened ]; - services.kubo.settings = mkIf cfg.autoMount { + services.kubo.settings = lib.mkIf cfg.autoMount { Mounts.FuseAllowOther = lib.mkDefault true; }; @@ -339,7 +338,7 @@ in else # After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open. rm -vf "$IPFS_PATH/api" - '' + optionalString cfg.autoMigrate '' + '' + lib.optionalString cfg.autoMigrate '' ${pkgs.kubo-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y '' + '' fi @@ -356,7 +355,7 @@ in # change when the changes are applied. Whyyyyyy..... ipfs --offline config replace - ''; - postStop = mkIf cfg.autoMount '' + postStop = lib.mkIf cfg.autoMount '' # After an unclean shutdown the fuse mounts at cfg.settings.Mounts.IPFS and cfg.settings.Mounts.IPNS are locked umount --quiet '${cfg.settings.Mounts.IPFS}' '${cfg.settings.Mounts.IPNS}' || true ''; @@ -365,11 +364,11 @@ in User = cfg.user; Group = cfg.group; StateDirectory = ""; - ReadWritePaths = optionals (!cfg.autoMount) [ "" cfg.dataDir ]; + ReadWritePaths = lib.optionals (!cfg.autoMount) [ "" cfg.dataDir ]; # Make sure the socket units are started before ipfs.service Sockets = [ "ipfs-gateway.socket" "ipfs-api.socket" ]; - } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; }; - } // optionalAttrs (!cfg.startWhenNeeded) { + } // lib.optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; }; + } // lib.optionalAttrs (!cfg.startWhenNeeded) { wantedBy = [ "default.target" ]; }; @@ -402,31 +401,31 @@ in }; imports = [ - (mkRenamedOptionModule [ "services" "ipfs" "enable" ] [ "services" "kubo" "enable" ]) - (mkRenamedOptionModule [ "services" "ipfs" "package" ] [ "services" "kubo" "package" ]) - (mkRenamedOptionModule [ "services" "ipfs" "user" ] [ "services" "kubo" "user" ]) - (mkRenamedOptionModule [ "services" "ipfs" "group" ] [ "services" "kubo" "group" ]) - (mkRenamedOptionModule [ "services" "ipfs" "dataDir" ] [ "services" "kubo" "dataDir" ]) - (mkRenamedOptionModule [ "services" "ipfs" "defaultMode" ] [ "services" "kubo" "defaultMode" ]) - (mkRenamedOptionModule [ "services" "ipfs" "autoMount" ] [ "services" "kubo" "autoMount" ]) - (mkRenamedOptionModule [ "services" "ipfs" "autoMigrate" ] [ "services" "kubo" "autoMigrate" ]) - (mkRenamedOptionModule [ "services" "ipfs" "ipfsMountDir" ] [ "services" "kubo" "settings" "Mounts" "IPFS" ]) - (mkRenamedOptionModule [ "services" "ipfs" "ipnsMountDir" ] [ "services" "kubo" "settings" "Mounts" "IPNS" ]) - (mkRenamedOptionModule [ "services" "ipfs" "gatewayAddress" ] [ "services" "kubo" "settings" "Addresses" "Gateway" ]) - (mkRenamedOptionModule [ "services" "ipfs" "apiAddress" ] [ "services" "kubo" "settings" "Addresses" "API" ]) - (mkRenamedOptionModule [ "services" "ipfs" "swarmAddress" ] [ "services" "kubo" "settings" "Addresses" "Swarm" ]) - (mkRenamedOptionModule [ "services" "ipfs" "enableGC" ] [ "services" "kubo" "enableGC" ]) - (mkRenamedOptionModule [ "services" "ipfs" "emptyRepo" ] [ "services" "kubo" "emptyRepo" ]) - (mkRenamedOptionModule [ "services" "ipfs" "extraConfig" ] [ "services" "kubo" "settings" ]) - (mkRenamedOptionModule [ "services" "ipfs" "extraFlags" ] [ "services" "kubo" "extraFlags" ]) - (mkRenamedOptionModule [ "services" "ipfs" "localDiscovery" ] [ "services" "kubo" "localDiscovery" ]) - (mkRenamedOptionModule [ "services" "ipfs" "serviceFdlimit" ] [ "services" "kubo" "serviceFdlimit" ]) - (mkRenamedOptionModule [ "services" "ipfs" "startWhenNeeded" ] [ "services" "kubo" "startWhenNeeded" ]) - (mkRenamedOptionModule [ "services" "kubo" "extraConfig" ] [ "services" "kubo" "settings" ]) - (mkRenamedOptionModule [ "services" "kubo" "gatewayAddress" ] [ "services" "kubo" "settings" "Addresses" "Gateway" ]) - (mkRenamedOptionModule [ "services" "kubo" "apiAddress" ] [ "services" "kubo" "settings" "Addresses" "API" ]) - (mkRenamedOptionModule [ "services" "kubo" "swarmAddress" ] [ "services" "kubo" "settings" "Addresses" "Swarm" ]) - (mkRenamedOptionModule [ "services" "kubo" "ipfsMountDir" ] [ "services" "kubo" "settings" "Mounts" "IPFS" ]) - (mkRenamedOptionModule [ "services" "kubo" "ipnsMountDir" ] [ "services" "kubo" "settings" "Mounts" "IPNS" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "enable" ] [ "services" "kubo" "enable" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "package" ] [ "services" "kubo" "package" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "user" ] [ "services" "kubo" "user" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "group" ] [ "services" "kubo" "group" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "dataDir" ] [ "services" "kubo" "dataDir" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "defaultMode" ] [ "services" "kubo" "defaultMode" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "autoMount" ] [ "services" "kubo" "autoMount" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "autoMigrate" ] [ "services" "kubo" "autoMigrate" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "ipfsMountDir" ] [ "services" "kubo" "settings" "Mounts" "IPFS" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "ipnsMountDir" ] [ "services" "kubo" "settings" "Mounts" "IPNS" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "gatewayAddress" ] [ "services" "kubo" "settings" "Addresses" "Gateway" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "apiAddress" ] [ "services" "kubo" "settings" "Addresses" "API" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "swarmAddress" ] [ "services" "kubo" "settings" "Addresses" "Swarm" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "enableGC" ] [ "services" "kubo" "enableGC" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "emptyRepo" ] [ "services" "kubo" "emptyRepo" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "extraConfig" ] [ "services" "kubo" "settings" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "extraFlags" ] [ "services" "kubo" "extraFlags" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "localDiscovery" ] [ "services" "kubo" "localDiscovery" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "serviceFdlimit" ] [ "services" "kubo" "serviceFdlimit" ]) + (lib.mkRenamedOptionModule [ "services" "ipfs" "startWhenNeeded" ] [ "services" "kubo" "startWhenNeeded" ]) + (lib.mkRenamedOptionModule [ "services" "kubo" "extraConfig" ] [ "services" "kubo" "settings" ]) + (lib.mkRenamedOptionModule [ "services" "kubo" "gatewayAddress" ] [ "services" "kubo" "settings" "Addresses" "Gateway" ]) + (lib.mkRenamedOptionModule [ "services" "kubo" "apiAddress" ] [ "services" "kubo" "settings" "Addresses" "API" ]) + (lib.mkRenamedOptionModule [ "services" "kubo" "swarmAddress" ] [ "services" "kubo" "settings" "Addresses" "Swarm" ]) + (lib.mkRenamedOptionModule [ "services" "kubo" "ipfsMountDir" ] [ "services" "kubo" "settings" "Mounts" "IPFS" ]) + (lib.mkRenamedOptionModule [ "services" "kubo" "ipnsMountDir" ] [ "services" "kubo" "settings" "Mounts" "IPNS" ]) ]; } diff --git a/nixos/modules/services/network-filesystems/litestream/default.nix b/nixos/modules/services/network-filesystems/litestream/default.nix index 87f07b0501beb..f4b0281ebbe20 100644 --- a/nixos/modules/services/network-filesystems/litestream/default.nix +++ b/nixos/modules/services/network-filesystems/litestream/default.nix @@ -1,18 +1,15 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.litestream; settingsFormat = pkgs.formats.yaml {}; in { options.services.litestream = { - enable = mkEnableOption "litestream"; + enable = lib.mkEnableOption "litestream"; - package = mkPackageOption pkgs "litestream" { }; + package = lib.mkPackageOption pkgs "litestream" { }; - settings = mkOption { + settings = lib.mkOption { description = '' See the [documentation](https://litestream.io/reference/config/). ''; @@ -31,8 +28,8 @@ in }; }; - environmentFile = mkOption { - type = types.nullOr types.path; + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; example = "/run/secrets/litestream"; description = '' @@ -61,7 +58,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; environment.etc = { "litestream.yml" = { @@ -74,7 +71,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "networking.target" ]; serviceConfig = { - EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; ExecStart = "${cfg.package}/bin/litestream replicate"; Restart = "always"; User = "litestream"; diff --git a/nixos/modules/services/network-filesystems/moosefs.nix b/nixos/modules/services/network-filesystems/moosefs.nix index 8d29148883ab8..2fef0bec378c2 100644 --- a/nixos/modules/services/network-filesystems/moosefs.nix +++ b/nixos/modules/services/network-filesystems/moosefs.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.moosefs; @@ -9,14 +6,14 @@ let settingsFormat = let listSep = " "; - allowedTypes = with types; [ bool int float str ]; + allowedTypes = with lib.types; [ bool int float str ]; valueToString = val: - if isList val then concatStringsSep listSep (map (x: valueToString x) val) - else if isBool val then (if val then "1" else "0") + if lib.isList val then lib.concatStringsSep listSep (map (x: valueToString x) val) + else if lib.isBool val then (if val then "1" else "0") else toString val; in { - type = with types; let + type = with lib.types; let valueType = oneOf ([ (listOf valueType) ] ++ allowedTypes) // { @@ -72,24 +69,24 @@ in { options = { services.moosefs = { - masterHost = mkOption { - type = types.str; + masterHost = lib.mkOption { + type = lib.types.str; default = null; description = "IP or DNS name of master host."; }; - runAsUser = mkOption { - type = types.bool; + runAsUser = lib.mkOption { + type = lib.types.bool; default = true; example = true; description = "Run daemons as user moosefs instead of root."; }; - client.enable = mkEnableOption "Moosefs client"; + client.enable = lib.mkEnableOption "Moosefs client"; master = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; description = '' Enable Moosefs master daemon. @@ -99,8 +96,8 @@ in { default = false; }; - exports = mkOption { - type = with types; listOf str; + exports = lib.mkOption { + type = with lib.types; listOf str; default = null; description = "Paths to export (see mfsexports.cfg)."; example = [ @@ -109,18 +106,18 @@ in { ]; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; description = "Whether to automatically open the necessary ports in the firewall."; default = false; }; - settings = mkOption { - type = types.submodule { + settings = lib.mkOption { + type = lib.types.submodule { freeformType = settingsFormat.type; - options.DATA_PATH = mkOption { - type = types.str; + options.DATA_PATH = lib.mkOption { + type = lib.types.str; default = "/var/lib/mfs"; description = "Data storage directory."; }; @@ -131,14 +128,14 @@ in { }; metalogger = { - enable = mkEnableOption "Moosefs metalogger daemon"; + enable = lib.mkEnableOption "Moosefs metalogger daemon"; - settings = mkOption { - type = types.submodule { + settings = lib.mkOption { + type = lib.types.submodule { freeformType = settingsFormat.type; - options.DATA_PATH = mkOption { - type = types.str; + options.DATA_PATH = lib.mkOption { + type = lib.types.str; default = "/var/lib/mfs"; description = "Data storage directory"; }; @@ -149,27 +146,27 @@ in { }; chunkserver = { - enable = mkEnableOption "Moosefs chunkserver daemon"; + enable = lib.mkEnableOption "Moosefs chunkserver daemon"; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; description = "Whether to automatically open the necessary ports in the firewall."; default = false; }; - hdds = mkOption { - type = with types; listOf str; + hdds = lib.mkOption { + type = with lib.types; listOf str; default = null; description = "Mount points to be used by chunkserver for storage (see mfshdd.cfg)."; example = [ "/mnt/hdd1" ]; }; - settings = mkOption { - type = types.submodule { + settings = lib.mkOption { + type = lib.types.submodule { freeformType = settingsFormat.type; - options.DATA_PATH = mkOption { - type = types.str; + options.DATA_PATH = lib.mkOption { + type = lib.types.str; default = "/var/lib/mfs"; description = "Directory for lock file."; }; @@ -183,33 +180,33 @@ in { ###### implementation - config = mkIf ( cfg.client.enable || cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable ) { + config = lib.mkIf ( cfg.client.enable || cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable ) { - warnings = [ ( mkIf (!cfg.runAsUser) "Running moosefs services as root is not recommended.") ]; + warnings = [ ( lib.mkIf (!cfg.runAsUser) "Running moosefs services as root is not recommended.") ]; # Service settings services.moosefs = { - master.settings = mkIf cfg.master.enable { + master.settings = lib.mkIf cfg.master.enable { WORKING_USER = mfsUser; EXPORTS_FILENAME = toString ( pkgs.writeText "mfsexports.cfg" - (concatStringsSep "\n" cfg.master.exports)); + (lib.concatStringsSep "\n" cfg.master.exports)); }; - metalogger.settings = mkIf cfg.metalogger.enable { + metalogger.settings = lib.mkIf cfg.metalogger.enable { WORKING_USER = mfsUser; MASTER_HOST = cfg.masterHost; }; - chunkserver.settings = mkIf cfg.chunkserver.enable { + chunkserver.settings = lib.mkIf cfg.chunkserver.enable { WORKING_USER = mfsUser; MASTER_HOST = cfg.masterHost; HDD_CONF_FILENAME = toString ( pkgs.writeText "mfshdd.cfg" - (concatStringsSep "\n" cfg.chunkserver.hdds)); + (lib.concatStringsSep "\n" cfg.chunkserver.hdds)); }; }; # Create system user account for daemons - users = mkIf ( cfg.runAsUser && ( cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable ) ) { + users = lib.mkIf ( cfg.runAsUser && ( cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable ) ) { users.moosefs = { isSystemUser = true; description = "moosefs daemon user"; @@ -228,22 +225,22 @@ in { # Ensure storage directories exist systemd.tmpfiles.rules = - optional cfg.master.enable "d ${cfg.master.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}" - ++ optional cfg.metalogger.enable "d ${cfg.metalogger.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}" - ++ optional cfg.chunkserver.enable "d ${cfg.chunkserver.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}"; + lib.optional cfg.master.enable "d ${cfg.master.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}" + ++ lib.optional cfg.metalogger.enable "d ${cfg.metalogger.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}" + ++ lib.optional cfg.chunkserver.enable "d ${cfg.chunkserver.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}"; # Service definitions - systemd.services.mfs-master = mkIf cfg.master.enable + systemd.services.mfs-master = lib.mkIf cfg.master.enable ( systemdService "master" { TimeoutStartSec = 1800; TimeoutStopSec = 1800; Restart = "no"; } masterCfg ); - systemd.services.mfs-metalogger = mkIf cfg.metalogger.enable + systemd.services.mfs-metalogger = lib.mkIf cfg.metalogger.enable ( systemdService "metalogger" { Restart = "on-abnormal"; } metaloggerCfg ); - systemd.services.mfs-chunkserver = mkIf cfg.chunkserver.enable + systemd.services.mfs-chunkserver = lib.mkIf cfg.chunkserver.enable ( systemdService "chunkserver" { Restart = "on-abnormal"; } chunkserverCfg ); }; } diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix index d7eef33ad96cb..e8c97df3151b2 100644 --- a/nixos/modules/services/network-filesystems/netatalk.nix +++ b/nixos/modules/services/network-filesystems/netatalk.nix @@ -1,7 +1,4 @@ { config, pkgs, lib, ... }: - -with lib; - let cfg = config.services.netatalk; settingsFormat = pkgs.formats.ini { }; @@ -10,15 +7,15 @@ in { options = { services.netatalk = { - enable = mkEnableOption "the Netatalk AFP fileserver"; + enable = lib.mkEnableOption "the Netatalk AFP fileserver"; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 548; description = "TCP port to be used for AFP."; }; - settings = mkOption { + settings = lib.mkOption { inherit (settingsFormat) type; default = { }; example = { @@ -38,8 +35,8 @@ in { ''; }; - extmap = mkOption { - type = types.lines; + extmap = lib.mkOption { + type = lib.types.lines; default = ""; description = '' File name extension mappings. @@ -51,14 +48,14 @@ in { }; imports = (map (option: - mkRemovedOptionModule [ "services" "netatalk" option ] + lib.mkRemovedOptionModule [ "services" "netatalk" option ] "This option was removed in favor of `services.netatalk.settings`.") [ "extraConfig" "homes" "volumes" ]); - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.netatalk.settings.Global = { "afp port" = toString cfg.port; diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix index c40bcf28c28f1..67597d37813fe 100644 --- a/nixos/modules/services/network-filesystems/nfsd.nix +++ b/nixos/modules/services/network-filesystems/nfsd.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.nfs.server; @@ -12,8 +9,8 @@ in { imports = [ - (mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ]) - (mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ]) + (lib.mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ]) + (lib.mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ]) ]; ###### interface @@ -23,24 +20,24 @@ in services.nfs = { server = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable the kernel's NFS server. ''; }; - extraNfsdConfig = mkOption { - type = types.str; + extraNfsdConfig = lib.mkOption { + type = lib.types.str; default = ""; description = '' Extra configuration options for the [nfsd] section of /etc/nfs.conf. ''; }; - exports = mkOption { - type = types.lines; + exports = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Contents of the /etc/exports file. See @@ -48,8 +45,8 @@ in ''; }; - hostName = mkOption { - type = types.nullOr types.str; + hostName = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' Hostname or address on which NFS requests will be accepted. @@ -58,22 +55,22 @@ in ''; }; - nproc = mkOption { - type = types.int; + nproc = lib.mkOption { + type = lib.types.int; default = 8; description = '' Number of NFS server threads. Defaults to the recommended value of 8. ''; }; - createMountPoints = mkOption { - type = types.bool; + createMountPoints = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to create the mount points in the exports file at startup time."; }; - mountdPort = mkOption { - type = types.nullOr types.int; + mountdPort = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; example = 4002; description = '' @@ -81,8 +78,8 @@ in ''; }; - lockdPort = mkOption { - type = types.nullOr types.int; + lockdPort = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; example = 4001; description = '' @@ -92,8 +89,8 @@ in ''; }; - statdPort = mkOption { - type = types.nullOr types.int; + statdPort = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; example = 4000; description = '' @@ -111,7 +108,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.rpcbind.enable = true; @@ -137,7 +134,7 @@ in '' mkdir -p /var/lib/nfs - ${optionalString cfg.createMountPoints + ${lib.optionalString cfg.createMountPoints '' # create export directories: # skip comments, take first col which may either be a quoted diff --git a/nixos/modules/services/network-filesystems/orangefs/client.nix b/nixos/modules/services/network-filesystems/orangefs/client.nix index 0632a9bc95279..3923289e6f641 100644 --- a/nixos/modules/services/network-filesystems/orangefs/client.nix +++ b/nixos/modules/services/network-filesystems/orangefs/client.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ...} : - -with lib; - let cfg = config.services.orangefs.client; @@ -10,15 +7,15 @@ in { options = { services.orangefs.client = { - enable = mkEnableOption "OrangeFS client daemon"; + enable = lib.mkEnableOption "OrangeFS client daemon"; - extraOptions = mkOption { - type = with types; listOf str; + extraOptions = lib.mkOption { + type = with lib.types; listOf str; default = []; description = "Extra command line options for pvfs2-client."; }; - fileSystems = mkOption { + fileSystems = lib.mkOption { description = '' The orangefs file systems to be mounted. This option is preferred over using {option}`fileSystems` directly since @@ -30,23 +27,23 @@ in { target = "tcp://server:3334/orangefs"; }]; - type = with types; listOf (submodule ({ ... } : { + type = with lib.types; listOf (submodule ({ ... } : { options = { - mountPoint = mkOption { - type = types.str; + mountPoint = lib.mkOption { + type = lib.types.str; default = "/orangefs"; description = "Mount point."; }; - options = mkOption { - type = with types; listOf str; + options = lib.mkOption { + type = with lib.types; listOf str; default = []; description = "Mount options"; }; - target = mkOption { - type = types.str; + target = lib.mkOption { + type = lib.types.str; example = "tcp://server:3334/orangefs"; description = "Target URL"; }; @@ -59,7 +56,7 @@ in { ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.orangefs ]; boot.supportedFilesystems = [ "pvfs2" ]; @@ -74,7 +71,7 @@ in { ExecStart = '' ${pkgs.orangefs}/bin/pvfs2-client-core \ - --logtype=syslog ${concatStringsSep " " cfg.extraOptions} + --logtype=syslog ${lib.concatStringsSep " " cfg.extraOptions} ''; TimeoutStopSec = "120"; @@ -87,7 +84,7 @@ in { bindsTo = [ "orangefs-client.service" ]; wantedBy = [ "remote-fs.target" ]; type = "pvfs2"; - options = concatStringsSep "," fs.options; + options = lib.concatStringsSep "," fs.options; what = fs.target; where = fs.mountPoint; }) cfg.fileSystems; diff --git a/nixos/modules/services/network-filesystems/orangefs/server.nix b/nixos/modules/services/network-filesystems/orangefs/server.nix index 9fbf37f0d00a7..c198d47645592 100644 --- a/nixos/modules/services/network-filesystems/orangefs/server.nix +++ b/nixos/modules/services/network-filesystems/orangefs/server.nix @@ -1,19 +1,16 @@ { config, lib, pkgs, ...} : - -with lib; - let cfg = config.services.orangefs.server; - aliases = mapAttrsToList (alias: url: alias) cfg.servers; + aliases = lib.mapAttrsToList (alias: url: alias) cfg.servers; # Maximum handle number is 2^63 maxHandle = 9223372036854775806; # One range of handles for each meta/data instance - handleStep = maxHandle / (length aliases) / 2; + handleStep = maxHandle / (lib.length aliases) / 2; - fileSystems = mapAttrsToList (name: fs: '' + fileSystems = lib.mapAttrsToList (name: fs: '' Name ${name} ID ${toString fs.id} @@ -22,8 +19,8 @@ let ${fs.extraConfig} - ${concatStringsSep "\n" ( - imap0 (i: alias: + ${lib.concatStringsSep "\n" ( + lib.imap0 (i: alias: let begin = i * handleStep + 3; end = begin + handleStep - 1; @@ -32,10 +29,10 @@ let - ${concatStringsSep "\n" ( - imap0 (i: alias: + ${lib.concatStringsSep "\n" ( + lib.imap0 (i: alias: let - begin = i * handleStep + 3 + (length aliases) * handleStep; + begin = i * handleStep + 3 + (lib.length aliases) * handleStep; end = begin + handleStep - 1; in "Range ${alias} ${toString begin}-${toString end}") aliases )} @@ -56,17 +53,17 @@ let DataStorageSpace ${cfg.dataStorageSpace} MetaDataStorageSpace ${cfg.metadataStorageSpace} - BMIModules ${concatStringsSep "," cfg.BMIModules} + BMIModules ${lib.concatStringsSep "," cfg.BMIModules} ${cfg.extraDefaults} ${cfg.extraConfig} - ${concatStringsSep "\n" (mapAttrsToList (alias: url: "Alias ${alias} ${url}") cfg.servers)} + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (alias: url: "Alias ${alias} ${url}") cfg.servers)} - ${concatStringsSep "\n" fileSystems} + ${lib.concatStringsSep "\n" fileSystems} ''; in { @@ -74,49 +71,49 @@ in { options = { services.orangefs.server = { - enable = mkEnableOption "OrangeFS server"; + enable = lib.mkEnableOption "OrangeFS server"; - logType = mkOption { - type = with types; enum [ "file" "syslog" ]; + logType = lib.mkOption { + type = with lib.types; enum [ "file" "syslog" ]; default = "syslog"; description = "Destination for log messages."; }; - dataStorageSpace = mkOption { - type = types.nullOr types.str; + dataStorageSpace = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "/data/storage"; description = "Directory for data storage."; }; - metadataStorageSpace = mkOption { - type = types.nullOr types.str; + metadataStorageSpace = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "/data/meta"; description = "Directory for meta data storage."; }; - BMIModules = mkOption { - type = with types; listOf str; + BMIModules = lib.mkOption { + type = with lib.types; listOf str; default = [ "bmi_tcp" ]; example = [ "bmi_tcp" "bmi_ib"]; description = "List of BMI modules to load."; }; - extraDefaults = mkOption { - type = types.lines; + extraDefaults = lib.mkOption { + type = lib.types.lines; default = ""; description = "Extra config for `` section."; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = "Extra config for the global section."; }; - servers = mkOption { - type = with types; attrsOf types.str; + servers = lib.mkOption { + type = with lib.types; attrsOf lib.types.str; default = {}; example = { node1 = "tcp://node1:3334"; @@ -125,12 +122,12 @@ in { description = "URLs for storage server including port. The attribute names define the server alias."; }; - fileSystems = mkOption { + fileSystems = lib.mkOption { description = '' These options will create the `` sections of config file. ''; default = { orangefs = {}; }; - example = literalExpression '' + example = lib.literalExpression '' { fs1 = { id = 101; @@ -141,40 +138,40 @@ in { }; } ''; - type = with types; attrsOf (submodule ({ ... } : { + type = with lib.types; attrsOf (submodule ({ ... } : { options = { - id = mkOption { - type = types.int; + id = lib.mkOption { + type = lib.types.int; default = 1; description = "File system ID (must be unique within configuration)."; }; - rootHandle = mkOption { - type = types.int; + rootHandle = lib.mkOption { + type = lib.types.int; default = 3; description = "File system root ID."; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = "Extra config for `` section."; }; - troveSyncMeta = mkOption { - type = types.bool; + troveSyncMeta = lib.mkOption { + type = lib.types.bool; default = true; description = "Sync meta data."; }; - troveSyncData = mkOption { - type = types.bool; + troveSyncData = lib.mkOption { + type = lib.types.bool; default = false; description = "Sync data."; }; - extraStorageHints = mkOption { - type = types.lines; + extraStorageHints = lib.mkOption { + type = lib.types.lines; default = ""; description = "Extra config for `` section."; }; @@ -186,7 +183,7 @@ in { ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.orangefs ]; # orangefs daemon will run as user diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index 49bc7caf2ee4a..93dc41c3c956e 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -1,7 +1,4 @@ { config, pkgs, lib, ... }: - -with lib; - let cfg = config.services.rsyncd; settingsFormat = pkgs.formats.ini { }; @@ -10,15 +7,15 @@ in { options = { services.rsyncd = { - enable = mkEnableOption "the rsync daemon"; + enable = lib.mkEnableOption "the rsync daemon"; - port = mkOption { + port = lib.mkOption { default = 873; - type = types.port; + type = lib.types.port; description = "TCP port the daemon will listen on."; }; - settings = mkOption { + settings = lib.mkOption { inherit (settingsFormat) type; default = { }; example = { @@ -45,9 +42,9 @@ in { ''; }; - socketActivated = mkOption { + socketActivated = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "If enabled Rsync will be socket-activated rather than run persistently."; }; @@ -55,7 +52,7 @@ in { }; imports = (map (option: - mkRemovedOptionModule [ "services" "rsyncd" option ] + lib.mkRemovedOptionModule [ "services" "rsyncd" option ] "This option was removed in favor of `services.rsyncd.settings`.") [ "address" "extraConfig" @@ -64,7 +61,7 @@ in { "group" ]); - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.rsyncd.settings.global.port = toString cfg.port; diff --git a/nixos/modules/services/network-filesystems/samba-wsdd.nix b/nixos/modules/services/network-filesystems/samba-wsdd.nix index f46bf802511ae..60ede5a1bda21 100644 --- a/nixos/modules/services/network-filesystems/samba-wsdd.nix +++ b/nixos/modules/services/network-filesystems/samba-wsdd.nix @@ -1,65 +1,62 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.samba-wsdd; in { options = { services.samba-wsdd = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' Web Services Dynamic Discovery host daemon. This enables (Samba) hosts, like your local NAS device, to be found by Web Service Discovery Clients like Windows ''; - interface = mkOption { - type = types.nullOr types.str; + interface = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "eth0"; description = "Interface or address to use."; }; - hoplimit = mkOption { - type = types.nullOr types.int; + hoplimit = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; example = 2; description = "Hop limit for multicast packets (default = 1)."; }; - openFirewall = mkOption { + openFirewall = lib.mkOption { description = '' Whether to open the required firewall ports in the firewall. ''; default = false; type = lib.types.bool; }; - workgroup = mkOption { - type = types.nullOr types.str; + workgroup = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "HOME"; description = "Set workgroup name (default WORKGROUP)."; }; - hostname = mkOption { - type = types.nullOr types.str; + hostname = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "FILESERVER"; description = "Override (NetBIOS) hostname to be used (default hostname)."; }; - domain = mkOption { - type = types.nullOr types.str; + domain = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = "Set domain name (disables workgroup)."; }; - discovery = mkOption { - type = types.bool; + discovery = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable discovery operation mode."; }; - listen = mkOption { - type = types.str; + listen = lib.mkOption { + type = lib.types.str; default = "/run/wsdd/wsdd.sock"; description = "Listen on path or localhost port in discovery mode."; }; - extraOptions = mkOption { - type = types.listOf types.str; + extraOptions = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ "--shortlog" ]; example = [ "--verbose" "--no-http" "--ipv4only" "--no-host" ]; description = "Additional wsdd options."; @@ -67,7 +64,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.wsdd ]; @@ -79,13 +76,13 @@ in { DynamicUser = true; Type = "simple"; ExecStart = '' - ${pkgs.wsdd}/bin/wsdd ${optionalString (cfg.interface != null) "--interface '${cfg.interface}'"} \ - ${optionalString (cfg.hoplimit != null) "--hoplimit '${toString cfg.hoplimit}'"} \ - ${optionalString (cfg.workgroup != null) "--workgroup '${cfg.workgroup}'"} \ - ${optionalString (cfg.hostname != null) "--hostname '${cfg.hostname}'"} \ - ${optionalString (cfg.domain != null) "--domain '${cfg.domain}'"} \ - ${optionalString cfg.discovery "--discovery --listen '${cfg.listen}'"} \ - ${escapeShellArgs cfg.extraOptions} + ${pkgs.wsdd}/bin/wsdd ${lib.optionalString (cfg.interface != null) "--interface '${cfg.interface}'"} \ + ${lib.optionalString (cfg.hoplimit != null) "--hoplimit '${toString cfg.hoplimit}'"} \ + ${lib.optionalString (cfg.workgroup != null) "--workgroup '${cfg.workgroup}'"} \ + ${lib.optionalString (cfg.hostname != null) "--hostname '${cfg.hostname}'"} \ + ${lib.optionalString (cfg.domain != null) "--domain '${cfg.domain}'"} \ + ${lib.optionalString cfg.discovery "--discovery --listen '${cfg.listen}'"} \ + ${lib.escapeShellArgs cfg.extraOptions} ''; # Runtime directory and mode RuntimeDirectory = "wsdd"; @@ -121,7 +118,7 @@ in { }; }; - networking.firewall = mkIf cfg.openFirewall { + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ 5357 ]; allowedUDPPorts = [ 3702 ]; }; diff --git a/nixos/modules/services/network-filesystems/samba.md b/nixos/modules/services/network-filesystems/samba.md new file mode 100644 index 0000000000000..2293202209744 --- /dev/null +++ b/nixos/modules/services/network-filesystems/samba.md @@ -0,0 +1,41 @@ +# Samba {#module-services-samba} + +[Samba](https://www.samba.org/), a SMB/CIFS file, print, and login server for Unix. + +## Basic Usage {#module-services-samba-basic-usage} + +A minimal configuration looks like this: + +```nix +{ + services.samba.enable = true; +} +``` + +This configuration automatically enables `smbd`, `nmbd` and `winbindd` services by default. + +## Configuring {#module-services-samba-configuring} + +Samba configuration is located in the `/etc/samba/smb.conf` file. + +### File share {#module-services-samba-configuring-file-share} + +This configuration will configure Samba to serve a `public` file share +which is read-only and accessible without authentication: + +```nix +{ + services.samba = { + enable = true; + settings = { + "public" = { + "path" = "/public"; + "read only" = "yes"; + "browseable" = "yes"; + "guest ok" = "yes"; + "comment" = "Public samba share."; + }; + }; + }; +} +``` diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index a887f964ca428..e661d3ff33bf8 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -1,234 +1,192 @@ { config, lib, pkgs, ... }: - -with lib; - let - - smbToString = x: if builtins.typeOf x == "bool" - then boolToString x - else toString x; - cfg = config.services.samba; - samba = cfg.package; - - shareConfig = name: - let share = getAttr name cfg.shares; in - "[${name}]\n " + (smbToString ( - map - (key: "${key} = ${smbToString (getAttr key share)}\n") - (attrNames share) - )); - - configFile = pkgs.writeText "smb.conf" - (if cfg.configText != null then cfg.configText else - '' - [global] - security = ${cfg.securityType} - passwd program = /run/wrappers/bin/passwd %u - invalid users = ${smbToString cfg.invalidUsers} - - ${cfg.extraConfig} - - ${smbToString (map shareConfig (attrNames cfg.shares))} - ''); - - # This may include nss_ldap, needed for samba if it has to use ldap. - nssModulesPath = config.system.nssModules.path; - - daemonService = appName: args: - { description = "Samba Service Daemon ${appName}"; - - after = [ (mkIf (cfg.enableNmbd && "${appName}" == "smbd") "samba-nmbd.service") "network.target" ]; - requiredBy = [ "samba.target" ]; - partOf = [ "samba.target" ]; - - environment = { - LD_LIBRARY_PATH = nssModulesPath; - LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; - }; - - serviceConfig = { - ExecStart = "${samba}/sbin/${appName} --foreground --no-process-group ${args}"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - LimitNOFILE = 16384; - PIDFile = "/run/${appName}.pid"; - Type = "notify"; - NotifyAccess = "all"; #may not do anything... - Slice = "system-samba.slice"; - }; - unitConfig.RequiresMountsFor = "/var/lib/samba"; + settingsFormat = pkgs.formats.ini { + listToValue = lib.concatMapStringsSep " " (lib.generators.mkValueStringDefault { }); + }; + # Ensure the global section is always first + globalConfigFile = settingsFormat.generate "smb-global.conf" { global = cfg.settings.global; }; + sharesConfigFile = settingsFormat.generate "smb-shares.conf" (lib.removeAttrs cfg.settings [ "global" ]); - restartTriggers = [ configFile ]; - }; + configFile = pkgs.concatText "smb.conf" [ globalConfigFile sharesConfigFile ]; in { + meta = { + doc = ./samba.md; + maintainers = [ lib.maintainers.anthonyroussel ]; + }; + imports = [ - (mkRemovedOptionModule [ "services" "samba" "defaultShare" ] "") - (mkRemovedOptionModule [ "services" "samba" "syncPasswordsByPam" ] "This option has been removed by upstream, see https://bugzilla.samba.org/show_bug.cgi?id=10669#c10") + (lib.mkRemovedOptionModule [ "services" "samba" "defaultShare" ] "") + (lib.mkRemovedOptionModule [ "services" "samba" "syncPasswordsByPam" ] "This option has been removed by upstream, see https://bugzilla.samba.org/show_bug.cgi?id=10669#c10") + + (lib.mkRemovedOptionModule [ "services" "samba" "configText" ] '' + Use services.samba.settings instead. + + This is part of the general move to use structured settings instead of raw + text for config as introduced by RFC0042: + https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md + '') + (lib.mkRemovedOptionModule [ "services" "samba" "extraConfig" ] "Use services.samba.settings instead.") + (lib.mkRenamedOptionModule [ "services" "samba" "invalidUsers" ] [ "services" "samba" "settings" "global" "invalid users" ]) + (lib.mkRenamedOptionModule [ "services" "samba" "securityType" ] [ "services" "samba" "settings" "global" "security" ]) + (lib.mkRenamedOptionModule [ "services" "samba" "shares" ] [ "services" "samba" "settings" ]) + + (lib.mkRenamedOptionModule [ "services" "samba" "enableWinbindd" ] [ "services" "samba" "winbindd" "enable" ]) + (lib.mkRenamedOptionModule [ "services" "samba" "enableNmbd" ] [ "services" "samba" "nmbd" "enable" ]) ]; ###### interface options = { - - # !!! clean up the descriptions. - services.samba = { + enable = lib.mkEnableOption "Samba, the SMB/CIFS protocol"; - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Samba, which provides file and print - services to Windows clients through the SMB/CIFS protocol. - - ::: {.note} - If you use the firewall consider adding the following: - - services.samba.openFirewall = true; - ::: - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Whether to automatically open the necessary ports in the firewall. - ''; + package = lib.mkPackageOption pkgs "samba" { + example = "samba4Full"; }; - enableNmbd = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable Samba's nmbd, which replies to NetBIOS over IP name - service requests. It also participates in the browsing protocols - which make up the Windows "Network Neighborhood" view. - ''; - }; + openFirewall = lib.mkEnableOption "opening the default ports in the firewall for Samba"; - enableWinbindd = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable Samba's winbindd, which provides a number of services - to the Name Service Switch capability found in most modern C libraries, - to arbitrary applications via PAM and ntlm_auth and to Samba itself. - ''; - }; + smbd = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Whether to enable Samba's smbd daemon."; + }; - package = mkPackageOption pkgs "samba" { - example = "samba4Full"; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "Extra arguments to pass to the smbd service."; + }; }; - invalidUsers = mkOption { - type = types.listOf types.str; - default = [ "root" ]; - description = '' - List of users who are denied to login via Samba. - ''; - }; + nmbd = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to enable Samba's nmbd, which replies to NetBIOS over IP name + service requests. It also participates in the browsing protocols + which make up the Windows "Network Neighborhood" view. + ''; + }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Additional global section and extra section lines go in here. - ''; - example = '' - guest account = nobody - map to guest = bad user - ''; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "Extra arguments to pass to the nmbd service."; + }; }; - configText = mkOption { - type = types.nullOr types.lines; - default = null; - description = '' - Verbatim contents of smb.conf. If null (default), use the - autogenerated file from NixOS instead. - ''; - }; + winbindd = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to enable Samba's winbindd, which provides a number of services + to the Name Service Switch capability found in most modern C libraries, + to arbitrary applications via PAM and ntlm_auth and to Samba itself. + ''; + }; - securityType = mkOption { - type = types.enum [ "auto" "user" "domain" "ads" ]; - default = "user"; - description = "Samba security type"; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "Extra arguments to pass to the winbindd service."; + }; }; - nsswins = mkOption { - default = false; - type = types.bool; + nsswins = lib.mkEnableOption '' + WINS NSS (Name Service Switch) plug-in. + + Enabling it allows applications to resolve WINS/NetBIOS names (a.k.a. + Windows machine names) by transparently querying the winbindd daemon + ''; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + global.security = lib.mkOption { + type = lib.types.enum [ "auto" "user" "domain" "ads" ]; + default = "user"; + description = "Samba security type."; + }; + global."invalid users" = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ "root" ]; + description = "List of users who are denied to login via Samba."; + }; + global."passwd program" = lib.mkOption { + type = lib.types.str; + default = "/run/wrappers/bin/passwd %u"; + description = "Path to a program that can be used to set UNIX user passwords."; + }; + }; + }; + default = { + "global" = { + "security" = "user"; + "passwd program" = "/run/wrappers/bin/passwd %u"; + "invalid users" = [ "root" ]; + }; + }; + example = { + "global" = { + "security" = "user"; + "passwd program" = "/run/wrappers/bin/passwd %u"; + "invalid users" = [ "root" ]; + }; + "public" = { + "path" = "/srv/public"; + "read only" = "yes"; + "browseable" = "yes"; + "guest ok" = "yes"; + "comment" = "Public samba share."; + }; + }; description = '' - Whether to enable the WINS NSS (Name Service Switch) plug-in. - Enabling it allows applications to resolve WINS/NetBIOS names (a.k.a. - Windows machine names) by transparently querying the winbindd daemon. - ''; - }; + Configuration file for the Samba suite in ini format. + This file is located in /etc/samba/smb.conf - shares = mkOption { - default = {}; - description = '' - A set describing shared resources. - See {command}`man smb.conf` for options. - ''; - type = types.attrsOf (types.attrsOf types.unspecified); - example = literalExpression '' - { public = - { path = "/srv/public"; - "read only" = true; - browseable = "yes"; - "guest ok" = "yes"; - comment = "Public samba share."; - }; - } + Refer to + for all available options. ''; }; - }; - }; - ###### implementation - config = mkMerge + config = lib.mkMerge [ { assertions = - [ { assertion = cfg.nsswins -> cfg.enableWinbindd; - message = "If samba.nsswins is enabled, then samba.enableWinbindd must also be enabled"; + [ { assertion = cfg.nsswins -> cfg.winbindd.enable; + message = "If services.samba.nsswins is enabled, then services.samba.winbindd.enable must also be enabled"; } ]; } - (mkIf cfg.enable { + (lib.mkIf cfg.enable { environment.etc."samba/smb.conf".source = configFile; - system.nssModules = optional cfg.nsswins samba; - system.nssDatabases.hosts = optional cfg.nsswins "wins"; + system.nssModules = lib.optional cfg.nsswins cfg.package; + system.nssDatabases.hosts = lib.optional cfg.nsswins "wins"; systemd = { + slices.system-samba = { + description = "Samba (SMB Networking Protocol) Slice"; + }; targets.samba = { description = "Samba Server"; after = [ "network.target" ]; wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; }; - - slices.system-samba = { - description = "Samba slice"; - }; - - # Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd - # for correct use with systemd - services = { - samba-smbd = daemonService "smbd" ""; - samba-nmbd = mkIf cfg.enableNmbd (daemonService "nmbd" ""); - samba-winbindd = mkIf cfg.enableWinbindd (daemonService "winbindd" ""); - }; tmpfiles.rules = [ "d /var/lock/samba - - - - -" "d /var/log/samba - - - - -" @@ -239,10 +197,116 @@ in security.pam.services.samba = {}; environment.systemPackages = [ cfg.package ]; + # Like other mount* related commands that need the setuid bit, this is + # required too. + security.wrappers."mount.cifs" = { + program = "mount.cifs"; + source = "${lib.getBin pkgs.cifs-utils}/bin/mount.cifs"; + owner = "root"; + group = "root"; + setuid = true; + }; - networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ 139 445 ]; - networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ 137 138 ]; + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ 139 445 ]; + networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ 137 138 ]; }) - ]; + (lib.mkIf (cfg.enable && cfg.nmbd.enable) { + systemd.services.samba-nmbd = { + description = "Samba NMB Daemon"; + documentation = [ "man:nmbd(8)" "man:samba(7)" "man:smb.conf(5)" ]; + + after = [ + "network.target" + "network-online.target" + ]; + + partOf = [ "samba.target" ]; + wantedBy = [ "samba.target" ]; + wants = [ "network-online.target" ]; + + environment.LD_LIBRARY_PATH = config.system.nssModules.path; + + serviceConfig = { + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStart = "${cfg.package}/sbin/nmbd --foreground --no-process-group ${lib.escapeShellArgs cfg.nmbd.extraArgs}"; + LimitCORE = "infinity"; + PIDFile = "/run/samba/nmbd.pid"; + Slice = "system-samba.slice"; + Type = "notify"; + }; + + unitConfig.RequiresMountsFor = "/var/lib/samba"; + + restartTriggers = [ configFile ]; + }; + }) + + (lib.mkIf (cfg.enable && cfg.smbd.enable) { + systemd.services.samba-smbd = { + description = "Samba SMB Daemon"; + documentation = [ "man:smbd(8)" "man:samba(7)" "man:smb.conf(5)" ]; + + after = [ + "network.target" + "network-online.target" + ] ++ lib.optionals (cfg.nmbd.enable) [ + "samba-nmbd.service" + ] ++ lib.optionals (cfg.winbindd.enable) [ + "samba-winbindd.service" + ]; + + partOf = [ "samba.target" ]; + wantedBy = [ "samba.target" ]; + wants = [ "network-online.target" ]; + + environment.LD_LIBRARY_PATH = config.system.nssModules.path; + + serviceConfig = { + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStart = "${cfg.package}/sbin/smbd --foreground --no-process-group ${lib.escapeShellArgs cfg.smbd.extraArgs}"; + LimitCORE = "infinity"; + LimitNOFILE = 16384; + PIDFile = "/run/samba/smbd.pid"; + Slice = "system-samba.slice"; + Type = "notify"; + }; + + unitConfig.RequiresMountsFor = "/var/lib/samba"; + + restartTriggers = [ configFile ]; + }; + }) + + (lib.mkIf (cfg.enable && cfg.winbindd.enable) { + systemd.services.samba-winbindd = { + description = "Samba Winbind Daemon"; + documentation = [ "man:winbindd(8)" "man:samba(7)" "man:smb.conf(5)" ]; + + after = [ + "network.target" + ] ++ lib.optionals (cfg.nmbd.enable) [ + "samba-nmbd.service" + ]; + + partOf = [ "samba.target" ]; + wantedBy = [ "samba.target" ]; + + environment.LD_LIBRARY_PATH = config.system.nssModules.path; + + serviceConfig = { + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStart = "${cfg.package}/sbin/winbindd --foreground --no-process-group ${lib.escapeShellArgs cfg.winbindd.extraArgs}"; + LimitCORE = "infinity"; + PIDFile = "/run/samba/winbindd.pid"; + Slice = "system-samba.slice"; + Type = "notify"; + }; + + unitConfig.RequiresMountsFor = "/var/lib/samba"; + + restartTriggers = [ configFile ]; + }; + }) + ]; } diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index cfda62020a1ee..e3296e6f66d54 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -1,57 +1,55 @@ { config, lib, pkgs, ... }: - -with lib; let cfg = config.services.tahoe; in { options.services.tahoe = { - introducers = mkOption { + introducers = lib.mkOption { default = {}; - type = with types; attrsOf (submodule { + type = with lib.types; attrsOf (submodule { options = { - nickname = mkOption { - type = types.str; + nickname = lib.mkOption { + type = lib.types.str; description = '' The nickname of this Tahoe introducer. ''; }; - tub.port = mkOption { + tub.port = lib.mkOption { default = 3458; - type = types.port; + type = lib.types.port; description = '' The port on which the introducer will listen. ''; }; - tub.location = mkOption { + tub.location = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; description = '' The external location that the introducer should listen on. If specified, the port should be included. ''; }; - package = mkPackageOption pkgs "tahoelafs" { }; + package = lib.mkPackageOption pkgs "tahoelafs" { }; }; }); description = '' The Tahoe introducers. ''; }; - nodes = mkOption { + nodes = lib.mkOption { default = {}; - type = with types; attrsOf (submodule { + type = with lib.types; attrsOf (submodule { options = { - nickname = mkOption { - type = types.str; + nickname = lib.mkOption { + type = lib.types.str; description = '' The nickname of this Tahoe node. ''; }; - tub.port = mkOption { + tub.port = lib.mkOption { default = 3457; - type = types.port; + type = lib.types.port; description = '' The port on which the tub will listen. @@ -59,9 +57,9 @@ in system to listen on a different port. ''; }; - tub.location = mkOption { + tub.location = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; description = '' The external location that the node should listen on. @@ -71,9 +69,9 @@ in If specified, the port should be included. ''; }; - web.port = mkOption { + web.port = lib.mkOption { default = 3456; - type = types.port; + type = lib.types.port; description = '' The port on which the Web server will listen. @@ -81,59 +79,59 @@ in listen on a different port. ''; }; - client.introducer = mkOption { + client.introducer = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; description = '' The furl for a Tahoe introducer node. Like all furls, keep this safe and don't share it. ''; }; - client.helper = mkOption { + client.helper = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; description = '' The furl for a Tahoe helper node. Like all furls, keep this safe and don't share it. ''; }; - client.shares.needed = mkOption { + client.shares.needed = lib.mkOption { default = 3; - type = types.int; + type = lib.types.int; description = '' The number of shares required to reconstitute a file. ''; }; - client.shares.happy = mkOption { + client.shares.happy = lib.mkOption { default = 7; - type = types.int; + type = lib.types.int; description = '' The number of distinct storage nodes required to store a file. ''; }; - client.shares.total = mkOption { + client.shares.total = lib.mkOption { default = 10; - type = types.int; + type = lib.types.int; description = '' The number of shares required to store a file. ''; }; - storage.enable = mkEnableOption "storage service"; - storage.reservedSpace = mkOption { + storage.enable = lib.mkEnableOption "storage service"; + storage.reservedSpace = lib.mkOption { default = "1G"; - type = types.str; + type = lib.types.str; description = '' The amount of filesystem space to not use for storage. ''; }; - helper.enable = mkEnableOption "helper service"; - sftpd.enable = mkEnableOption "SFTP service"; - sftpd.port = mkOption { + helper.enable = lib.mkEnableOption "helper service"; + sftpd.enable = lib.mkEnableOption "SFTP service"; + sftpd.port = lib.mkOption { default = null; - type = types.nullOr types.int; + type = lib.types.nullOr lib.types.int; description = '' The port on which the SFTP server will listen. @@ -141,35 +139,35 @@ in daemon to listen on a different port. ''; }; - sftpd.hostPublicKeyFile = mkOption { + sftpd.hostPublicKeyFile = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = '' Path to the SSH host public key. ''; }; - sftpd.hostPrivateKeyFile = mkOption { + sftpd.hostPrivateKeyFile = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = '' Path to the SSH host private key. ''; }; - sftpd.accounts.file = mkOption { + sftpd.accounts.file = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = '' Path to the accounts file. ''; }; - sftpd.accounts.url = mkOption { + sftpd.accounts.url = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; description = '' URL of the accounts server. ''; }; - package = mkPackageOption pkgs "tahoelafs" { }; + package = lib.mkPackageOption pkgs "tahoelafs" { }; }; }); description = '' @@ -177,11 +175,11 @@ in ''; }; }; - config = mkMerge [ - (mkIf (cfg.introducers != {}) { + config = lib.mkMerge [ + (lib.mkIf (cfg.introducers != {}) { environment = { - etc = flip mapAttrs' cfg.introducers (node: settings: - nameValuePair "tahoe-lafs/introducer-${node}.cfg" { + etc = lib.flip lib.mapAttrs' cfg.introducers (node: settings: + lib.nameValuePair "tahoe-lafs/introducer-${node}.cfg" { mode = "0444"; text = '' # This configuration is generated by Nix. Edit at your own @@ -190,25 +188,25 @@ in [node] nickname = ${settings.nickname} tub.port = ${toString settings.tub.port} - ${optionalString (settings.tub.location != null) + ${lib.optionalString (settings.tub.location != null) "tub.location = ${settings.tub.location}"} ''; }); # Actually require Tahoe, so that we will have it installed. - systemPackages = flip mapAttrsToList cfg.introducers (node: settings: + systemPackages = lib.flip lib.mapAttrsToList cfg.introducers (node: settings: settings.package ); }; # Open up the firewall. - # networking.firewall.allowedTCPPorts = flip mapAttrsToList cfg.introducers + # networking.firewall.allowedTCPPorts = lib.flip lib.mapAttrsToList cfg.introducers # (node: settings: settings.tub.port); - systemd.services = flip mapAttrs' cfg.introducers (node: settings: + systemd.services = lib.flip lib.mapAttrs' cfg.introducers (node: settings: let pidfile = "/run/tahoe.introducer-${node}.pid"; # This is a directory, but it has no trailing slash. Tahoe commands # get antsy when there's a trailing slash. nodedir = "/var/db/tahoe-lafs/introducer-${node}"; - in nameValuePair "tahoe.introducer-${node}" { + in lib.nameValuePair "tahoe.introducer-${node}" { description = "Tahoe LAFS node ${node}"; wantedBy = [ "multi-user.target" ]; path = [ settings.package ]; @@ -242,16 +240,16 @@ in cp /etc/tahoe-lafs/introducer-"${node}".cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); - users.users = flip mapAttrs' cfg.introducers (node: _: - nameValuePair "tahoe.introducer-${node}" { + users.users = lib.flip lib.mapAttrs' cfg.introducers (node: _: + lib.nameValuePair "tahoe.introducer-${node}" { description = "Tahoe node user for introducer ${node}"; isSystemUser = true; }); }) - (mkIf (cfg.nodes != {}) { + (lib.mkIf (cfg.nodes != {}) { environment = { - etc = flip mapAttrs' cfg.nodes (node: settings: - nameValuePair "tahoe-lafs/${node}.cfg" { + etc = lib.flip lib.mapAttrs' cfg.nodes (node: settings: + lib.nameValuePair "tahoe-lafs/${node}.cfg" { mode = "0444"; text = '' # This configuration is generated by Nix. Edit at your own @@ -260,16 +258,16 @@ in [node] nickname = ${settings.nickname} tub.port = ${toString settings.tub.port} - ${optionalString (settings.tub.location != null) + ${lib.optionalString (settings.tub.location != null) "tub.location = ${settings.tub.location}"} # This is a Twisted endpoint. Twisted Web doesn't work on # non-TCP. ~ C. web.port = tcp:${toString settings.web.port} [client] - ${optionalString (settings.client.introducer != null) + ${lib.optionalString (settings.client.introducer != null) "introducer.furl = ${settings.client.introducer}"} - ${optionalString (settings.client.helper != null) + ${lib.optionalString (settings.client.helper != null) "helper.furl = ${settings.client.helper}"} shares.needed = ${toString settings.client.shares.needed} @@ -277,41 +275,41 @@ in shares.total = ${toString settings.client.shares.total} [storage] - enabled = ${boolToString settings.storage.enable} + enabled = ${lib.boolToString settings.storage.enable} reserved_space = ${settings.storage.reservedSpace} [helper] - enabled = ${boolToString settings.helper.enable} + enabled = ${lib.boolToString settings.helper.enable} [sftpd] - enabled = ${boolToString settings.sftpd.enable} - ${optionalString (settings.sftpd.port != null) + enabled = ${lib.boolToString settings.sftpd.enable} + ${lib.optionalString (settings.sftpd.port != null) "port = ${toString settings.sftpd.port}"} - ${optionalString (settings.sftpd.hostPublicKeyFile != null) + ${lib.optionalString (settings.sftpd.hostPublicKeyFile != null) "host_pubkey_file = ${settings.sftpd.hostPublicKeyFile}"} - ${optionalString (settings.sftpd.hostPrivateKeyFile != null) + ${lib.optionalString (settings.sftpd.hostPrivateKeyFile != null) "host_privkey_file = ${settings.sftpd.hostPrivateKeyFile}"} - ${optionalString (settings.sftpd.accounts.file != null) + ${lib.optionalString (settings.sftpd.accounts.file != null) "accounts.file = ${settings.sftpd.accounts.file}"} - ${optionalString (settings.sftpd.accounts.url != null) + ${lib.optionalString (settings.sftpd.accounts.url != null) "accounts.url = ${settings.sftpd.accounts.url}"} ''; }); # Actually require Tahoe, so that we will have it installed. - systemPackages = flip mapAttrsToList cfg.nodes (node: settings: + systemPackages = lib.flip lib.mapAttrsToList cfg.nodes (node: settings: settings.package ); }; # Open up the firewall. - # networking.firewall.allowedTCPPorts = flip mapAttrsToList cfg.nodes + # networking.firewall.allowedTCPPorts = lib.flip lib.mapAttrsToList cfg.nodes # (node: settings: settings.tub.port); - systemd.services = flip mapAttrs' cfg.nodes (node: settings: + systemd.services = lib.flip lib.mapAttrs' cfg.nodes (node: settings: let pidfile = "/run/tahoe.${node}.pid"; # This is a directory, but it has no trailing slash. Tahoe commands # get antsy when there's a trailing slash. nodedir = "/var/db/tahoe-lafs/${node}"; - in nameValuePair "tahoe.${node}" { + in lib.nameValuePair "tahoe.${node}" { description = "Tahoe LAFS node ${node}"; wantedBy = [ "multi-user.target" ]; path = [ settings.package ]; @@ -342,8 +340,8 @@ in cp /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); - users.users = flip mapAttrs' cfg.nodes (node: _: - nameValuePair "tahoe.${node}" { + users.users = lib.flip lib.mapAttrs' cfg.nodes (node: _: + lib.nameValuePair "tahoe.${node}" { description = "Tahoe node user for node ${node}"; isSystemUser = true; }); diff --git a/nixos/modules/services/network-filesystems/u9fs.nix b/nixos/modules/services/network-filesystems/u9fs.nix index 2233d6f2a60d2..346705f5e3d00 100644 --- a/nixos/modules/services/network-filesystems/u9fs.nix +++ b/nixos/modules/services/network-filesystems/u9fs.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.u9fs; in @@ -11,14 +8,14 @@ in services.u9fs = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to run the u9fs 9P server for Unix."; }; - listenStreams = mkOption { - type = types.listOf types.str; + listenStreams = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ "564" ]; example = [ "192.168.16.1:564" ]; description = '' @@ -27,14 +24,14 @@ in ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "nobody"; description = "User to run u9fs under."; }; - extraArgs = mkOption { - type = types.str; + extraArgs = lib.mkOption { + type = lib.types.str; default = ""; example = "-a none"; description = '' @@ -47,7 +44,7 @@ in }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd = { sockets.u9fs = { diff --git a/nixos/modules/services/network-filesystems/webdav-server-rs.nix b/nixos/modules/services/network-filesystems/webdav-server-rs.nix index 7e83d78db5b06..31f641a82d797 100644 --- a/nixos/modules/services/network-filesystems/webdav-server-rs.nix +++ b/nixos/modules/services/network-filesystems/webdav-server-rs.nix @@ -1,10 +1,8 @@ { config, lib, pkgs, ... }: - -with lib; let cfg = config.services.webdav-server-rs; format = pkgs.formats.toml { }; - settings = recursiveUpdate + settings = lib.recursiveUpdate { server.uid = config.users.users."${cfg.user}".uid; server.gid = config.users.groups."${cfg.group}".gid; @@ -14,27 +12,27 @@ in { options = { services.webdav-server-rs = { - enable = mkEnableOption "WebDAV server"; + enable = lib.mkEnableOption "WebDAV server"; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "webdav"; description = "User to run under when setuid is not enabled."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "webdav"; description = "Group to run under when setuid is not enabled."; }; - debug = mkOption { - type = types.bool; + debug = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable debug mode."; }; - settings = mkOption { + settings = lib.mkOption { type = format.type; default = { }; description = '' @@ -42,7 +40,7 @@ in options can be found at [here](https://github.com/miquels/webdav-server-rs/blob/master/webdav-server.toml). ''; - example = literalExpression '' + example = lib.literalExpression '' { server.listen = [ "0.0.0.0:4918" "[::]:4918" ]; accounts = { @@ -75,8 +73,8 @@ in ''; }; - configFile = mkOption { - type = types.path; + configFile = lib.mkOption { + type = lib.types.path; default = format.generate "webdav-server.toml" settings; defaultText = "Config file generated from services.webdav-server-rs.settings"; description = '' @@ -88,19 +86,19 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { - assertion = hasAttr cfg.user config.users.users && config.users.users."${cfg.user}".uid != null; + assertion = lib.hasAttr cfg.user config.users.users && config.users.users."${cfg.user}".uid != null; message = "users.users.${cfg.user} and users.users.${cfg.user}.uid must be defined."; } { - assertion = hasAttr cfg.group config.users.groups && config.users.groups."${cfg.group}".gid != null; + assertion = lib.hasAttr cfg.group config.users.groups && config.users.groups."${cfg.group}".gid != null; message = "users.groups.${cfg.group} and users.groups.${cfg.group}.gid must be defined."; } ]; - users.users = optionalAttrs (cfg.user == "webdav") { + users.users = lib.optionalAttrs (cfg.user == "webdav") { webdav = { description = "WebDAV user"; group = cfg.group; @@ -108,7 +106,7 @@ in }; }; - users.groups = optionalAttrs (cfg.group == "webdav") { + users.groups = lib.optionalAttrs (cfg.group == "webdav") { webdav.gid = config.ids.gids.webdav; }; @@ -146,5 +144,5 @@ in }; }; - meta.maintainers = with maintainers; [ pmy ]; + meta.maintainers = with lib.maintainers; [ pmy ]; } diff --git a/nixos/modules/services/network-filesystems/webdav.nix b/nixos/modules/services/network-filesystems/webdav.nix index 7e435fc65253c..28f129fc12d29 100644 --- a/nixos/modules/services/network-filesystems/webdav.nix +++ b/nixos/modules/services/network-filesystems/webdav.nix @@ -1,6 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; let cfg = config.services.webdav; format = pkgs.formats.yaml { }; @@ -8,21 +6,21 @@ in { options = { services.webdav = { - enable = mkEnableOption "WebDAV server"; + enable = lib.mkEnableOption "WebDAV server"; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "webdav"; description = "User account under which WebDAV runs."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "webdav"; description = "Group under which WebDAV runs."; }; - settings = mkOption { + settings = lib.mkOption { type = format.type; default = { }; description = '' @@ -36,7 +34,7 @@ in [EnvironmentFile](https://www.freedesktop.org/software/systemd/man/systemd.exec.html#EnvironmentFile=). This prevents adding secrets to the world-readable Nix store. ''; - example = literalExpression '' + example = lib.literalExpression '' { address = "0.0.0.0"; port = 8080; @@ -53,8 +51,8 @@ in ''; }; - configFile = mkOption { - type = types.path; + configFile = lib.mkOption { + type = lib.types.path; default = format.generate "webdav.yaml" cfg.settings; defaultText = "Config file generated from services.webdav.settings"; description = '' @@ -64,8 +62,8 @@ in example = "/etc/webdav/config.yaml"; }; - environmentFile = mkOption { - type = types.nullOr types.path; + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' Environment file as defined in {manpage}`systemd.exec(5)`. @@ -74,8 +72,8 @@ in }; }; - config = mkIf cfg.enable { - users.users = mkIf (cfg.user == "webdav") { + config = lib.mkIf cfg.enable { + users.users = lib.mkIf (cfg.user == "webdav") { webdav = { description = "WebDAV daemon user"; group = cfg.group; @@ -83,7 +81,7 @@ in }; }; - users.groups = mkIf (cfg.group == "webdav") { + users.groups = lib.mkIf (cfg.group == "webdav") { webdav.gid = config.ids.gids.webdav; }; @@ -96,10 +94,10 @@ in Restart = "on-failure"; User = cfg.user; Group = cfg.group; - EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; }; }; }; - meta.maintainers = with maintainers; [ pmy ]; + meta.maintainers = with lib.maintainers; [ pmy ]; } diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index 78a0272c0567e..e2cde1903edd2 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.xtreemfs; @@ -29,13 +26,13 @@ let dirConfig = pkgs.writeText "xtreemfs-dir-config.properties" '' uuid = ${cfg.dir.uuid} listen.port = ${toString cfg.dir.port} - ${optionalString (cfg.dir.address != "") "listen.address = ${cfg.dir.address}"} + ${lib.optionalString (cfg.dir.address != "") "listen.address = ${cfg.dir.address}"} http_port = ${toString cfg.dir.httpPort} babudb.baseDir = ${home}/dir/database babudb.logDir = ${home}/dir/db-log babudb.sync = ${if cfg.dir.replication.enable then "FDATASYNC" else cfg.dir.syncMode} - ${optionalString cfg.dir.replication.enable "babudb.plugin.0 = ${dirReplicationConfig}"} + ${lib.optionalString cfg.dir.replication.enable "babudb.plugin.0 = ${dirReplicationConfig}"} ${cfg.dir.extraConfig} ''; @@ -51,13 +48,13 @@ let mrcConfig = pkgs.writeText "xtreemfs-mrc-config.properties" '' uuid = ${cfg.mrc.uuid} listen.port = ${toString cfg.mrc.port} - ${optionalString (cfg.mrc.address != "") "listen.address = ${cfg.mrc.address}"} + ${lib.optionalString (cfg.mrc.address != "") "listen.address = ${cfg.mrc.address}"} http_port = ${toString cfg.mrc.httpPort} babudb.baseDir = ${home}/mrc/database babudb.logDir = ${home}/mrc/db-log babudb.sync = ${if cfg.mrc.replication.enable then "FDATASYNC" else cfg.mrc.syncMode} - ${optionalString cfg.mrc.replication.enable "babudb.plugin.0 = ${mrcReplicationConfig}"} + ${lib.optionalString cfg.mrc.replication.enable "babudb.plugin.0 = ${mrcReplicationConfig}"} ${cfg.mrc.extraConfig} ''; @@ -65,14 +62,14 @@ let osdConfig = pkgs.writeText "xtreemfs-osd-config.properties" '' uuid = ${cfg.osd.uuid} listen.port = ${toString cfg.osd.port} - ${optionalString (cfg.osd.address != "") "listen.address = ${cfg.osd.address}"} + ${lib.optionalString (cfg.osd.address != "") "listen.address = ${cfg.osd.address}"} http_port = ${toString cfg.osd.httpPort} object_dir = ${home}/osd/ ${cfg.osd.extraConfig} ''; - optionalDir = optionals cfg.dir.enable ["xtreemfs-dir.service"]; + optionalDir = lib.optionals cfg.dir.enable ["xtreemfs-dir.service"]; systemdOptionalDependencies = { after = [ "network.target" ] ++ optionalDir; @@ -89,10 +86,10 @@ in services.xtreemfs = { - enable = mkEnableOption "XtreemFS"; + enable = lib.mkEnableOption "XtreemFS"; - homeDir = mkOption { - type = types.path; + homeDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/xtreemfs"; description = '' XtreemFS home dir for the xtreemfs user. @@ -100,32 +97,32 @@ in }; dir = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable XtreemFS DIR service. ''; }; - uuid = mkOption { + uuid = lib.mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40"; - type = types.str; + type = lib.types.str; description = '' Must be set to a unique identifier, preferably a UUID according to RFC 4122. UUIDs can be generated with `uuidgen` command, found in the `util-linux` package. ''; }; - port = mkOption { + port = lib.mkOption { default = 32638; - type = types.port; + type = lib.types.port; description = '' The port to listen on for incoming connections (TCP). ''; }; - address = mkOption { - type = types.str; + address = lib.mkOption { + type = lib.types.str; example = "127.0.0.1"; default = ""; description = '' @@ -133,16 +130,16 @@ in specified, the service will listen on all interfaces (any). ''; }; - httpPort = mkOption { + httpPort = lib.mkOption { default = 30638; - type = types.port; + type = lib.types.port; description = '' Specifies the listen port for the HTTP service that returns the status page. ''; }; - syncMode = mkOption { - type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "FSYNC" ]; + syncMode = lib.mkOption { + type = lib.types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "FSYNC" ]; default = "FSYNC"; example = "FDATASYNC"; description = '' @@ -160,8 +157,8 @@ in (If xtreemfs.dir.replication.enable is true then FDATASYNC is forced) ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; example = '' # specify whether SSL is required @@ -180,9 +177,9 @@ in ''; }; replication = { - enable = mkEnableOption "XtreemFS DIR replication plugin"; - extraConfig = mkOption { - type = types.lines; + enable = lib.mkEnableOption "XtreemFS DIR replication plugin"; + extraConfig = lib.mkOption { + type = lib.types.lines; example = '' # participants of the replication including this replica babudb.repl.participant.0 = 192.168.0.10 @@ -225,50 +222,50 @@ in }; mrc = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable XtreemFS MRC service. ''; }; - uuid = mkOption { + uuid = lib.mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41"; - type = types.str; + type = lib.types.str; description = '' Must be set to a unique identifier, preferably a UUID according to RFC 4122. UUIDs can be generated with `uuidgen` command, found in the `util-linux` package. ''; }; - port = mkOption { + port = lib.mkOption { default = 32636; - type = types.port; + type = lib.types.port; description = '' The port to listen on for incoming connections (TCP). ''; }; - address = mkOption { + address = lib.mkOption { example = "127.0.0.1"; - type = types.str; + type = lib.types.str; default = ""; description = '' If specified, it defines the interface to listen on. If not specified, the service will listen on all interfaces (any). ''; }; - httpPort = mkOption { + httpPort = lib.mkOption { default = 30636; - type = types.port; + type = lib.types.port; description = '' Specifies the listen port for the HTTP service that returns the status page. ''; }; - syncMode = mkOption { + syncMode = lib.mkOption { default = "FSYNC"; - type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "FSYNC" ]; + type = lib.types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "FSYNC" ]; example = "FDATASYNC"; description = '' The sync mode influences how operations are committed to the disk @@ -285,8 +282,8 @@ in (If xtreemfs.mrc.replication.enable is true then FDATASYNC is forced) ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; example = '' osd_check_interval = 300 no_atime = true @@ -323,9 +320,9 @@ in ''; }; replication = { - enable = mkEnableOption "XtreemFS MRC replication plugin"; - extraConfig = mkOption { - type = types.lines; + enable = lib.mkEnableOption "XtreemFS MRC replication plugin"; + extraConfig = lib.mkOption { + type = lib.types.lines; example = '' # participants of the replication including this replica babudb.repl.participant.0 = 192.168.0.10 @@ -368,49 +365,49 @@ in }; osd = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable XtreemFS OSD service. ''; }; - uuid = mkOption { + uuid = lib.mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42"; - type = types.str; + type = lib.types.str; description = '' Must be set to a unique identifier, preferably a UUID according to RFC 4122. UUIDs can be generated with `uuidgen` command, found in the `util-linux` package. ''; }; - port = mkOption { + port = lib.mkOption { default = 32640; - type = types.port; + type = lib.types.port; description = '' The port to listen on for incoming connections (TCP and UDP). ''; }; - address = mkOption { + address = lib.mkOption { example = "127.0.0.1"; - type = types.str; + type = lib.types.str; default = ""; description = '' If specified, it defines the interface to listen on. If not specified, the service will listen on all interfaces (any). ''; }; - httpPort = mkOption { + httpPort = lib.mkOption { default = 30640; - type = types.port; + type = lib.types.port; description = '' Specifies the listen port for the HTTP service that returns the status page. ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; example = '' local_clock_renewal = 0 remote_time_sync = 30000 @@ -464,7 +461,7 @@ in { gid = config.ids.gids.xtreemfs; }; - systemd.services.xtreemfs-dir = mkIf cfg.dir.enable { + systemd.services.xtreemfs-dir = lib.mkIf cfg.dir.enable { description = "XtreemFS-DIR Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -474,7 +471,7 @@ in }; }; - systemd.services.xtreemfs-mrc = mkIf cfg.mrc.enable ({ + systemd.services.xtreemfs-mrc = lib.mkIf cfg.mrc.enable ({ description = "XtreemFS-MRC Server"; serviceConfig = { User = "xtreemfs"; @@ -482,7 +479,7 @@ in }; } // systemdOptionalDependencies); - systemd.services.xtreemfs-osd = mkIf cfg.osd.enable ({ + systemd.services.xtreemfs-osd = lib.mkIf cfg.osd.enable ({ description = "XtreemFS-OSD Server"; serviceConfig = { User = "xtreemfs"; diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index de5d42a4bcde8..ee9b58b081a37 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -1,7 +1,4 @@ { config, pkgs, lib, ... }: - -with lib; - let cfg = config.services.yandex-disk; @@ -20,47 +17,47 @@ in services.yandex-disk = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable Yandex-disk client. See https://disk.yandex.ru/ ''; }; - username = mkOption { + username = lib.mkOption { default = ""; - type = types.str; + type = lib.types.str; description = '' Your yandex.com login name. ''; }; - password = mkOption { + password = lib.mkOption { default = ""; - type = types.str; + type = lib.types.str; description = '' Your yandex.com password. Warning: it will be world-readable in /nix/store. ''; }; - user = mkOption { + user = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; description = '' The user the yandex-disk daemon should run as. ''; }; - directory = mkOption { - type = types.path; + directory = lib.mkOption { + type = lib.types.path; default = "/home/Yandex.Disk"; description = "The directory to use for Yandex.Disk storage"; }; - excludes = mkOption { + excludes = lib.mkOption { default = ""; - type = types.commas; + type = lib.types.commas; example = "data,backup"; description = '' Comma-separated list of directories which are excluded from synchronization. @@ -74,9 +71,9 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - users.users = mkIf (cfg.user == null) [ { + users.users = lib.mkIf (cfg.user == null) [ { name = u; uid = config.ids.uids.yandexdisk; group = "nogroup"; diff --git a/nixos/modules/services/networking/3proxy.nix b/nixos/modules/services/networking/3proxy.nix index 865916f7aff5f..03c67ed2f6f8f 100644 --- a/nixos/modules/services/networking/3proxy.nix +++ b/nixos/modules/services/networking/3proxy.nix @@ -1,21 +1,20 @@ { config, lib, pkgs, ... }: -with lib; let pkg = pkgs._3proxy; cfg = config.services._3proxy; - optionalList = list: if list == [ ] then "*" else concatMapStringsSep "," toString list; + optionalList = list: if list == [ ] then "*" else lib.concatMapStringsSep "," toString list; in { options.services._3proxy = { - enable = mkEnableOption "3proxy"; - confFile = mkOption { - type = types.path; + enable = lib.mkEnableOption "3proxy"; + confFile = lib.mkOption { + type = lib.types.path; example = "/var/lib/3proxy/3proxy.conf"; description = '' Ignore all other 3proxy options and load configuration from this file. ''; }; - usersFile = mkOption { - type = types.nullOr types.path; + usersFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; example = "/var/lib/3proxy/3proxy.passwd"; description = '' @@ -40,11 +39,11 @@ in { Consult [documentation](https://github.com/z3APA3A/3proxy/wiki/How-To-%28incomplete%29#USERS) for more information. ''; }; - services = mkOption { - type = types.listOf (types.submodule { + services = lib.mkOption { + type = lib.types.listOf (lib.types.submodule { options = { - type = mkOption { - type = types.enum [ + type = lib.mkOption { + type = lib.types.enum [ "proxy" "socks" "pop3p" @@ -68,32 +67,32 @@ in { - `"udppm"`: UDP portmapper. ''; }; - bindAddress = mkOption { - type = types.str; + bindAddress = lib.mkOption { + type = lib.types.str; default = "[::]"; example = "127.0.0.1"; description = '' Address used for service. ''; }; - bindPort = mkOption { - type = types.nullOr types.int; + bindPort = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; example = 3128; description = '' Override default port used for service. ''; }; - maxConnections = mkOption { - type = types.int; + maxConnections = lib.mkOption { + type = lib.types.int; default = 100; example = 1000; description = '' Maximum number of simulationeous connections to this service. ''; }; - auth = mkOption { - type = types.listOf (types.enum [ "none" "iponly" "strong" ]); + auth = lib.mkOption { + type = lib.types.listOf (lib.types.enum [ "none" "iponly" "strong" ]); example = [ "iponly" "strong" ]; description = '' Authentication type. The following values are valid: @@ -122,11 +121,11 @@ in { In this example strong username authentication is not required to access 192.168.0.0/16. ''; }; - acl = mkOption { - type = types.listOf (types.submodule { + acl = lib.mkOption { + type = lib.types.listOf (lib.types.submodule { options = { - rule = mkOption { - type = types.enum [ "allow" "deny" ]; + rule = lib.mkOption { + type = lib.types.enum [ "allow" "deny" ]; example = "allow"; description = '' ACL rule. The following values are valid: @@ -135,24 +134,24 @@ in { - `"deny"`: connections not allowed. ''; }; - users = mkOption { - type = types.listOf types.str; + users = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "user1" "user2" "user3" ]; description = '' List of users, use empty list for any. ''; }; - sources = mkOption { - type = types.listOf types.str; + sources = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "127.0.0.1" "192.168.1.0/24" ]; description = '' List of source IP range, use empty list for any. ''; }; - targets = mkOption { - type = types.listOf types.str; + targets = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "127.0.0.1" "192.168.1.0/24" ]; description = '' @@ -162,8 +161,8 @@ in { Hostname is only checked if hostname presents in request. ''; }; - targetPorts = mkOption { - type = types.listOf types.int; + targetPorts = lib.mkOption { + type = lib.types.listOf lib.types.int; default = [ ]; example = [ 80 443 ]; description = '' @@ -173,7 +172,7 @@ in { }; }); default = [ ]; - example = literalExpression '' + example = lib.literalExpression '' [ { rule = "allow"; @@ -192,8 +191,8 @@ in { Use this option to limit user access to resources. ''; }; - extraArguments = mkOption { - type = types.nullOr types.str; + extraArguments = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "-46"; description = '' @@ -201,8 +200,8 @@ in { Consult "Options" section in [documentation](https://github.com/z3APA3A/3proxy/wiki/3proxy.cfg) for available arguments. ''; }; - extraConfig = mkOption { - type = types.nullOr types.lines; + extraConfig = lib.mkOption { + type = lib.types.nullOr lib.types.lines; default = null; description = '' Extra configuration for service. Use this to configure things like bandwidth limiter or ACL-based redirection. @@ -212,7 +211,7 @@ in { }; }); default = [ ]; - example = literalExpression '' + example = lib.literalExpression '' [ { type = "proxy"; @@ -238,15 +237,15 @@ in { Use this option to define 3proxy services. ''; }; - denyPrivate = mkOption { - type = types.bool; + denyPrivate = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to deny access to private IP ranges including loopback. ''; }; - privateRanges = mkOption { - type = types.listOf types.str; + privateRanges = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ "0.0.0.0/8" "127.0.0.0/8" @@ -262,11 +261,11 @@ in { What IP ranges to deny access when denyPrivate is set tu true. ''; }; - resolution = mkOption { - type = types.submodule { + resolution = lib.mkOption { + type = lib.types.submodule { options = { - nserver = mkOption { - type = types.listOf types.str; + nserver = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "127.0.0.53" "192.168.1.3:5353/tcp" ]; description = '' @@ -276,20 +275,20 @@ in { default system name resolution functions are used. ''; }; - nscache = mkOption { - type = types.int; + nscache = lib.mkOption { + type = lib.types.int; default = 65535; description = "Set name cache size for IPv4."; }; - nscache6 = mkOption { - type = types.int; + nscache6 = lib.mkOption { + type = lib.types.int; default = 65535; description = "Set name cache size for IPv6."; }; - nsrecord = mkOption { - type = types.attrsOf types.str; + nsrecord = lib.mkOption { + type = lib.types.attrsOf lib.types.str; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { "files.local" = "192.168.1.12"; "site.local" = "192.168.1.43"; @@ -304,8 +303,8 @@ in { Use this option to configure name resolution and DNS caching. ''; }; - extraConfig = mkOption { - type = types.nullOr types.lines; + extraConfig = lib.mkOption { + type = lib.types.nullOr lib.types.lines; default = null; description = '' Extra configuration, appended to the 3proxy configuration file. @@ -314,33 +313,33 @@ in { }; }; - config = mkIf cfg.enable { - services._3proxy.confFile = mkDefault (pkgs.writeText "3proxy.conf" '' + config = lib.mkIf cfg.enable { + services._3proxy.confFile = lib.mkDefault (pkgs.writeText "3proxy.conf" '' # log to stdout log - ${concatMapStringsSep "\n" (x: "nserver " + x) cfg.resolution.nserver} + ${lib.concatMapStringsSep "\n" (x: "nserver " + x) cfg.resolution.nserver} nscache ${toString cfg.resolution.nscache} nscache6 ${toString cfg.resolution.nscache6} - ${concatMapStringsSep "\n" (x: "nsrecord " + x) - (mapAttrsToList (name: value: "${name} ${value}") + ${lib.concatMapStringsSep "\n" (x: "nsrecord " + x) + (lib.mapAttrsToList (name: value: "${name} ${value}") cfg.resolution.nsrecord)} - ${optionalString (cfg.usersFile != null) + ${lib.optionalString (cfg.usersFile != null) ''users $"${cfg.usersFile}"'' } - ${concatMapStringsSep "\n" (service: '' - auth ${concatStringsSep " " service.auth} + ${lib.concatMapStringsSep "\n" (service: '' + auth ${lib.concatStringsSep " " service.auth} - ${optionalString (cfg.denyPrivate) + ${lib.optionalString (cfg.denyPrivate) "deny * * ${optionalList cfg.privateRanges}"} - ${concatMapStringsSep "\n" (acl: + ${lib.concatMapStringsSep "\n" (acl: "${acl.rule} ${ - concatMapStringsSep " " optionalList [ + lib.concatMapStringsSep " " optionalList [ acl.users acl.sources acl.targets @@ -350,18 +349,18 @@ in { maxconn ${toString service.maxConnections} - ${optionalString (service.extraConfig != null) service.extraConfig} + ${lib.optionalString (service.extraConfig != null) service.extraConfig} ${service.type} -i${toString service.bindAddress} ${ - optionalString (service.bindPort != null) + lib.optionalString (service.bindPort != null) "-p${toString service.bindPort}" } ${ - optionalString (service.extraArguments != null) service.extraArguments + lib.optionalString (service.extraArguments != null) service.extraArguments } flush '') cfg.services} - ${optionalString (cfg.extraConfig != null) cfg.extraConfig} + ${lib.optionalString (cfg.extraConfig != null) cfg.extraConfig} ''); systemd.services."3proxy" = { description = "Tiny free proxy server"; @@ -377,5 +376,5 @@ in { }; }; - meta.maintainers = with maintainers; [ misuzu ]; + meta.maintainers = with lib.maintainers; [ misuzu ]; } diff --git a/nixos/modules/services/networking/adguardhome.nix b/nixos/modules/services/networking/adguardhome.nix index 5be3e0bea224a..dab81ce18b299 100644 --- a/nixos/modules/services/networking/adguardhome.nix +++ b/nixos/modules/services/networking/adguardhome.nix @@ -1,12 +1,9 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.adguardhome; settingsFormat = pkgs.formats.yaml { }; - args = concatStringsSep " " ([ + args = lib.concatStringsSep " " ([ "--no-check-update" "--pidfile /run/AdGuardHome/AdGuardHome.pid" "--work-dir /var/lib/AdGuardHome/" @@ -28,19 +25,19 @@ let checkPhase = "${cfg.package}/bin/adguardhome -c $out --check-config"; }); in { - options.services.adguardhome = with types; { - enable = mkEnableOption "AdGuard Home network-wide ad blocker"; + options.services.adguardhome = with lib.types; { + enable = lib.mkEnableOption "AdGuard Home network-wide ad blocker"; - package = mkOption { + package = lib.mkOption { type = package; default = pkgs.adguardhome; - defaultText = literalExpression "pkgs.adguardhome"; + defaultText = lib.literalExpression "pkgs.adguardhome"; description = '' The package that runs adguardhome. ''; }; - openFirewall = mkOption { + openFirewall = lib.mkOption { default = false; type = bool; description = '' @@ -49,9 +46,9 @@ in { ''; }; - allowDHCP = mkOption { + allowDHCP = lib.mkOption { default = settings.dhcp.enabled or false; - defaultText = literalExpression "config.services.adguardhome.settings.dhcp.enabled or false"; + defaultText = lib.literalExpression "config.services.adguardhome.settings.dhcp.enabled or false"; type = bool; description = '' Allows AdGuard Home to open raw sockets (`CAP_NET_RAW`), which is @@ -63,7 +60,7 @@ in { ''; }; - mutableSettings = mkOption { + mutableSettings = lib.mkOption { default = true; type = bool; description = '' @@ -72,7 +69,7 @@ in { ''; }; - host = mkOption { + host = lib.mkOption { default = "0.0.0.0"; type = str; description = '' @@ -80,7 +77,7 @@ in { ''; }; - port = mkOption { + port = lib.mkOption { default = 3000; type = port; description = '' @@ -88,14 +85,14 @@ in { ''; }; - settings = mkOption { + settings = lib.mkOption { default = null; type = nullOr (submodule { freeformType = settingsFormat.type; options = { - schema_version = mkOption { + schema_version = lib.mkOption { default = cfg.package.schema_version; - defaultText = literalExpression "cfg.package.schema_version"; + defaultText = lib.literalExpression "cfg.package.schema_version"; type = int; description = '' Schema version for the configuration. @@ -121,7 +118,7 @@ in { ''; }; - extraArgs = mkOption { + extraArgs = lib.mkOption { default = [ ]; type = listOf str; description = '' @@ -130,27 +127,27 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = cfg.settings != null - -> !(hasAttrByPath [ "bind_host" ] cfg.settings); + -> !(lib.hasAttrByPath [ "bind_host" ] cfg.settings); message = "AdGuard option `settings.bind_host' has been superseded by `services.adguardhome.host'"; } { assertion = cfg.settings != null - -> !(hasAttrByPath [ "bind_port" ] cfg.settings); + -> !(lib.hasAttrByPath [ "bind_port" ] cfg.settings); message = "AdGuard option `settings.bind_port' has been superseded by `services.adguardhome.port'"; } { assertion = settings != null -> cfg.mutableSettings - || hasAttrByPath [ "dns" "bootstrap_dns" ] settings; + || lib.hasAttrByPath [ "dns" "bootstrap_dns" ] settings; message = "AdGuard setting dns.bootstrap_dns needs to be configured for a minimal working configuration"; } { assertion = settings != null -> cfg.mutableSettings - || hasAttrByPath [ "dns" "bootstrap_dns" ] settings - && isList settings.dns.bootstrap_dns; + || lib.hasAttrByPath [ "dns" "bootstrap_dns" ] settings + && lib.isList settings.dns.bootstrap_dns; message = "AdGuard setting dns.bootstrap_dns needs to be a list"; } ]; @@ -164,7 +161,7 @@ in { StartLimitBurst = 10; }; - preStart = optionalString (settings != null) '' + 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 @@ -185,7 +182,7 @@ in { DynamicUser = true; ExecStart = "${lib.getExe cfg.package} ${args}"; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ] - ++ optionals cfg.allowDHCP [ "CAP_NET_RAW" ]; + ++ lib.optionals cfg.allowDHCP [ "CAP_NET_RAW" ]; Restart = "always"; RestartSec = 10; RuntimeDirectory = "AdGuardHome"; @@ -193,6 +190,6 @@ in { }; }; - networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ]; }; } diff --git a/nixos/modules/services/networking/alice-lg.nix b/nixos/modules/services/networking/alice-lg.nix index dab2d38ca353a..c43f898bd7d3d 100644 --- a/nixos/modules/services/networking/alice-lg.nix +++ b/nixos/modules/services/networking/alice-lg.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.alice-lg; settingsFormat = pkgs.formats.ini { }; @@ -9,17 +6,17 @@ in { options = { services.alice-lg = { - enable = mkEnableOption "Alice Looking Glass"; + enable = lib.mkEnableOption "Alice Looking Glass"; - package = mkPackageOption pkgs "alice-lg" { }; + package = lib.mkPackageOption pkgs "alice-lg" { }; - settings = mkOption { + settings = lib.mkOption { type = settingsFormat.type; default = { }; description = '' alice-lg configuration, for configuration options see the example on [github](https://github.com/alice-lg/alice-lg/blob/main/etc/alice-lg/alice.example.conf) ''; - example = literalExpression '' + example = lib.literalExpression '' { server = { # configures the built-in webserver and provides global application settings diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index aa72a047526b0..b41d4d629ec53 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -1,7 +1,4 @@ { config, lib, options, pkgs, ... }: - -with lib; - let cfg = config.services.amule; opt = options.services.amule; @@ -16,18 +13,18 @@ in services.amule = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to run the AMule daemon. You need to manually run "amuled --ec-config" to configure the service for the first time. ''; }; - dataDir = mkOption { - type = types.str; + dataDir = lib.mkOption { + type = lib.types.str; default = "/home/${user}/"; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' "/home/''${config.${opt.user}}/" ''; description = '' @@ -35,8 +32,8 @@ in ''; }; - user = mkOption { - type = types.nullOr types.str; + user = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' The user the AMule daemon should run as. @@ -50,16 +47,16 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - users.users = mkIf (cfg.user == null) [ + users.users = lib.mkIf (cfg.user == null) [ { name = "amule"; description = "AMule daemon"; group = "amule"; uid = config.ids.uids.amule; } ]; - users.groups = mkIf (cfg.user == null) [ + users.groups = lib.mkIf (cfg.user == null) [ { name = "amule"; gid = config.ids.gids.amule; } ]; diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index 187dd5c3ccab3..f165974f2ae72 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.asterisk; @@ -13,7 +10,7 @@ let logdir = "/var/log/asterisk"; # Add filecontents from files of useTheseDefaultConfFiles to confFiles, do not override - defaultConfFiles = subtractLists (attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles; + defaultConfFiles = lib.subtractLists (lib.attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles; allConfFiles = { # Default asterisk.conf file "asterisk.conf".text = '' @@ -48,25 +45,25 @@ let syslog.local0 => notice,warning,error ''; } // - mapAttrs (name: text: { inherit text; }) cfg.confFiles // - listToAttrs (map (x: nameValuePair x { source = cfg.package + "/etc/asterisk/" + x; }) defaultConfFiles); + lib.mapAttrs (name: text: { inherit text; }) cfg.confFiles // + lib.listToAttrs (map (x: lib.nameValuePair x { source = cfg.package + "/etc/asterisk/" + x; }) defaultConfFiles); in { options = { services.asterisk = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable the Asterisk PBX server. ''; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; example = '' [options] verbose=3 @@ -78,10 +75,10 @@ in ''; }; - confFiles = mkOption { + confFiles = lib.mkOption { default = {}; - type = types.attrsOf types.str; - example = literalExpression + type = lib.types.attrsOf lib.types.str; + example = lib.literalExpression '' { "extensions.conf" = ''' @@ -144,9 +141,9 @@ in ''; }; - useTheseDefaultConfFiles = mkOption { + useTheseDefaultConfFiles = lib.mkOption { default = [ "ari.conf" "acl.conf" "agents.conf" "amd.conf" "calendar.conf" "cdr.conf" "cdr_syslog.conf" "cdr_custom.conf" "cel.conf" "cel_custom.conf" "cli_aliases.conf" "confbridge.conf" "dundi.conf" "features.conf" "hep.conf" "iax.conf" "pjsip.conf" "pjsip_wizard.conf" "phone.conf" "phoneprov.conf" "queues.conf" "res_config_sqlite3.conf" "res_parking.conf" "statsd.conf" "udptl.conf" "unistim.conf" ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; example = [ "sip.conf" "dundi.conf" ]; description = ''Sets these config files to the default content. The default value for this option contains all necesscary files to avoid errors at startup. @@ -154,24 +151,24 @@ in ''; }; - extraArguments = mkOption { + extraArguments = lib.mkOption { default = []; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; example = [ "-vvvddd" "-e" "1024" ]; description = '' Additional command line arguments to pass to Asterisk. ''; }; - package = mkPackageOption pkgs "asterisk" { }; + package = lib.mkPackageOption pkgs "asterisk" { }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - environment.etc = mapAttrs' (name: value: - nameValuePair "asterisk/${name}" value + environment.etc = lib.mapAttrs' (name: value: + lib.nameValuePair "asterisk/${name}" value ) allConfFiles; users.users.asterisk = @@ -214,7 +211,7 @@ in ExecStart = let # FIXME: This doesn't account for arguments with spaces - argString = concatStringsSep " " cfg.extraArguments; + argString = lib.concatStringsSep " " cfg.extraArguments; in "${cfg.package}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F"; ExecReload = ''${cfg.package}/bin/asterisk -x "core reload" diff --git a/nixos/modules/services/networking/atftpd.nix b/nixos/modules/services/networking/atftpd.nix index da5e305201f86..ab674d85715c6 100644 --- a/nixos/modules/services/networking/atftpd.nix +++ b/nixos/modules/services/networking/atftpd.nix @@ -1,9 +1,5 @@ # NixOS module for atftpd TFTP server - { config, pkgs, lib, ... }: - -with lib; - let cfg = config.services.atftpd; @@ -16,19 +12,19 @@ in services.atftpd = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to enable the atftpd TFTP server. By default, the server binds to address 0.0.0.0. ''; }; - extraOptions = mkOption { + extraOptions = lib.mkOption { default = []; - type = types.listOf types.str; - example = literalExpression '' + type = lib.types.listOf lib.types.str; + example = lib.literalExpression '' [ "--bind-address 192.168.9.1" "--verbose=7" ] @@ -38,9 +34,9 @@ in ''; }; - root = mkOption { + root = lib.mkOption { default = "/srv/tftp"; - type = types.path; + type = lib.types.path; description = '' Document root directory for the atftpd. ''; @@ -50,7 +46,7 @@ in }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.atftpd = { description = "TFTP Server"; diff --git a/nixos/modules/services/networking/autossh.nix b/nixos/modules/services/networking/autossh.nix index 245f2bfc2cf38..f8934845c28e2 100644 --- a/nixos/modules/services/networking/autossh.nix +++ b/nixos/modules/services/networking/autossh.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.autossh; @@ -16,21 +13,21 @@ in services.autossh = { - sessions = mkOption { - type = types.listOf (types.submodule { + sessions = lib.mkOption { + type = lib.types.listOf (lib.types.submodule { options = { - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; example = "socks-peer"; description = "Name of the local AutoSSH session"; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; example = "bill"; description = "Name of the user the AutoSSH session should run as"; }; - monitoringPort = mkOption { - type = types.int; + monitoringPort = lib.mkOption { + type = lib.types.int; default = 0; example = 20000; description = '' @@ -39,8 +36,8 @@ in style monitoring ''; }; - extraArguments = mkOption { - type = types.separatedString " "; + extraArguments = lib.mkOption { + type = lib.types.separatedString " "; example = "-N -D4343 bill@socks.example.net"; description = '' Arguments to be passed to AutoSSH and retransmitted to SSH @@ -75,7 +72,7 @@ in ###### implementation - config = mkIf (cfg.sessions != []) { + config = lib.mkIf (cfg.sessions != []) { systemd.services = diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 8bb8e71ec3fb3..72ccb910982cb 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.avahi; @@ -13,15 +10,15 @@ let # a host name from DHCP. In that case, let Avahi take whatever the # current host name is; setting `host-name' to the empty string in # `avahi-daemon.conf' would be invalid. - optionalString (hostName != "") "host-name=${hostName}"} - browse-domains=${concatStringsSep ", " browseDomains} + lib.optionalString (hostName != "") "host-name=${hostName}"} + browse-domains=${lib.concatStringsSep ", " browseDomains} use-ipv4=${yesNo ipv4} use-ipv6=${yesNo ipv6} - ${optionalString (allowInterfaces!=null) "allow-interfaces=${concatStringsSep "," allowInterfaces}"} - ${optionalString (denyInterfaces!=null) "deny-interfaces=${concatStringsSep "," denyInterfaces}"} - ${optionalString (domainName!=null) "domain-name=${domainName}"} + ${lib.optionalString (allowInterfaces!=null) "allow-interfaces=${lib.concatStringsSep "," allowInterfaces}"} + ${lib.optionalString (denyInterfaces!=null) "deny-interfaces=${lib.concatStringsSep "," denyInterfaces}"} + ${lib.optionalString (domainName!=null) "domain-name=${domainName}"} allow-point-to-point=${yesNo allowPointToPoint} - ${optionalString (cacheEntriesMax!=null) "cache-entries-max=${toString cacheEntriesMax}"} + ${lib.optionalString (cacheEntriesMax!=null) "cache-entries-max=${toString cacheEntriesMax}"} [wide-area] enable-wide-area=${yesNo wideArea} @@ -46,8 +43,8 @@ in ]; options.services.avahi = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to run the Avahi daemon, which allows Avahi clients @@ -57,28 +54,28 @@ in ''; }; - package = mkPackageOption pkgs "avahi" { }; + package = lib.mkPackageOption pkgs "avahi" { }; - hostName = mkOption { - type = types.str; + hostName = lib.mkOption { + type = lib.types.str; default = config.networking.hostName; - defaultText = literalExpression "config.networking.hostName"; + defaultText = lib.literalExpression "config.networking.hostName"; description = '' Host name advertised on the LAN. If not set, avahi will use the value of {option}`config.networking.hostName`. ''; }; - domainName = mkOption { - type = types.str; + domainName = lib.mkOption { + type = lib.types.str; default = "local"; description = '' Domain name for all advertisements. ''; }; - browseDomains = mkOption { - type = types.listOf types.str; + browseDomains = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "0pointer.de" "zeroconf.org" ]; description = '' @@ -86,20 +83,20 @@ in ''; }; - ipv4 = mkOption { - type = types.bool; + ipv4 = lib.mkOption { + type = lib.types.bool; default = true; description = "Whether to use IPv4."; }; - ipv6 = mkOption { - type = types.bool; + ipv6 = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to use IPv6."; }; - allowInterfaces = mkOption { - type = types.nullOr (types.listOf types.str); + allowInterfaces = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = null; description = '' List of network interfaces that should be used by the {command}`avahi-daemon`. @@ -108,8 +105,8 @@ in ''; }; - denyInterfaces = mkOption { - type = types.nullOr (types.listOf types.str); + denyInterfaces = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = null; description = '' List of network interfaces that should be ignored by the @@ -119,8 +116,8 @@ in ''; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to open the firewall for UDP port 5353. @@ -128,8 +125,8 @@ in ''; }; - allowPointToPoint = mkOption { - type = types.bool; + allowPointToPoint = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to use POINTTOPOINT interfaces. Might make mDNS unreliable due to usually large @@ -138,22 +135,22 @@ in ''; }; - wideArea = mkOption { - type = types.bool; + wideArea = lib.mkOption { + type = lib.types.bool; default = true; description = "Whether to enable wide-area service discovery."; }; - reflector = mkOption { - type = types.bool; + reflector = lib.mkOption { + type = lib.types.bool; default = false; description = "Reflect incoming mDNS requests to all allowed network interfaces."; }; - extraServiceFiles = mkOption { - type = with types; attrsOf (either str path); + extraServiceFiles = lib.mkOption { + type = with lib.types; attrsOf (either str path); default = { }; - example = literalExpression '' + example = lib.literalExpression '' { ssh = "''${pkgs.avahi}/etc/avahi/services/ssh.service"; smb = ''' @@ -176,26 +173,26 @@ in }; publish = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to allow publishing in general."; }; - userServices = mkOption { - type = types.bool; + userServices = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to publish user services. Will set `addresses=true`."; }; - addresses = mkOption { - type = types.bool; + addresses = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to register mDNS address records for all local IP addresses."; }; - hinfo = mkOption { - type = types.bool; + hinfo = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to register a mDNS HINFO record which contains information about the @@ -203,23 +200,23 @@ in ''; }; - workstation = mkOption { - type = types.bool; + workstation = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to register a service of type "_workstation._tcp" on the local LAN. ''; }; - domain = mkOption { - type = types.bool; + domain = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to announce the locally used domain name for browsing by other hosts."; }; }; - nssmdns4 = mkOption { - type = types.bool; + nssmdns4 = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable the mDNS NSS (Name Service Switch) plug-in for IPv4. @@ -228,8 +225,8 @@ in ''; }; - nssmdns6 = mkOption { - type = types.bool; + nssmdns6 = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable the mDNS NSS (Name Service Switch) plug-in for IPv6. @@ -243,8 +240,8 @@ in ''; }; - cacheEntriesMax = mkOption { - type = types.nullOr types.int; + cacheEntriesMax = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; description = '' Number of resource records to be cached per interface. Use 0 to @@ -252,8 +249,8 @@ in ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra config to append to avahi-daemon.conf. @@ -261,7 +258,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.users.avahi = { description = "avahi-daemon privilege separation user"; home = "/var/empty"; @@ -271,7 +268,7 @@ in users.groups.avahi = { }; - system.nssModules = optional (cfg.nssmdns4 || cfg.nssmdns6) pkgs.nssmdns; + system.nssModules = lib.optional (cfg.nssmdns4 || cfg.nssmdns6) pkgs.nssmdns; system.nssDatabases.hosts = let mdns = if (cfg.nssmdns4 && cfg.nssmdns6) then "mdns" @@ -281,17 +278,17 @@ in "mdns4" else ""; - in optionals (cfg.nssmdns4 || cfg.nssmdns6) (mkMerge [ - (mkBefore [ "${mdns}_minimal [NOTFOUND=return]" ]) # before resolve - (mkAfter [ "${mdns}" ]) # after dns + in lib.optionals (cfg.nssmdns4 || cfg.nssmdns6) (lib.mkMerge [ + (lib.mkBefore [ "${mdns}_minimal [NOTFOUND=return]" ]) # before resolve + (lib.mkAfter [ "${mdns}" ]) # after dns ]); environment.systemPackages = [ cfg.package ]; - environment.etc = (mapAttrs' - (n: v: nameValuePair + environment.etc = (lib.mapAttrs' + (n: v: lib.nameValuePair "avahi/services/${n}.service" - { ${if types.path.check v then "source" else "text"} = v; } + { ${if lib.types.path.check v then "source" else "text"} = v; } ) cfg.extraServiceFiles); @@ -326,6 +323,6 @@ in services.dbus.enable = true; services.dbus.packages = [ cfg.package ]; - networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ 5353 ]; + networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ 5353 ]; }; } diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix index 5a3e92d9c813d..538654f90ae4c 100644 --- a/nixos/modules/services/networking/babeld.nix +++ b/nixos/modules/services/networking/babeld.nix @@ -1,20 +1,17 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.babeld; - conditionalBoolToString = value: if (isBool value) then (boolToString value) else (toString value); + conditionalBoolToString = value: if (lib.isBool value) then (lib.boolToString value) else (toString value); paramsString = params: - concatMapStringsSep " " (name: "${name} ${conditionalBoolToString (getAttr name params)}") - (attrNames params); + lib.concatMapStringsSep " " (name: "${name} ${conditionalBoolToString (lib.getAttr name params)}") + (lib.attrNames params); interfaceConfig = name: let - interface = getAttr name cfg.interfaces; + interface = lib.getAttr name cfg.interfaces; in "interface ${name} ${paramsString interface}\n"; @@ -22,17 +19,17 @@ let '' skip-kernel-setup true '' - + (optionalString (cfg.interfaceDefaults != null) '' + + (lib.optionalString (cfg.interfaceDefaults != null) '' default ${paramsString cfg.interfaceDefaults} '') - + (concatMapStrings interfaceConfig (attrNames cfg.interfaces)) + + (lib.concatMapStrings interfaceConfig (lib.attrNames cfg.interfaces)) + extraConfig); in { - meta.maintainers = with maintainers; [ hexa ]; + meta.maintainers = with lib.maintainers; [ hexa ]; ###### interface @@ -40,15 +37,15 @@ in services.babeld = { - enable = mkEnableOption "the babeld network routing daemon"; + enable = lib.mkEnableOption "the babeld network routing daemon"; - interfaceDefaults = mkOption { + interfaceDefaults = lib.mkOption { default = null; description = '' A set describing default parameters for babeld interfaces. See {manpage}`babeld(8)` for options. ''; - type = types.nullOr (types.attrsOf types.unspecified); + type = lib.types.nullOr (lib.types.attrsOf lib.types.unspecified); example = { type = "tunnel"; @@ -56,13 +53,13 @@ in }; }; - interfaces = mkOption { + interfaces = lib.mkOption { default = {}; description = '' A set describing babeld interfaces. See {manpage}`babeld(8)` for options. ''; - type = types.attrsOf (types.attrsOf types.unspecified); + type = lib.types.attrsOf (lib.types.attrsOf lib.types.unspecified); example = { enp0s2 = { type = "wired"; @@ -72,9 +69,9 @@ in }; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; description = '' Options that will be copied to babeld.conf. See {manpage}`babeld(8)` for details. @@ -87,7 +84,7 @@ in ###### implementation - config = mkIf config.services.babeld.enable { + config = lib.mkIf config.services.babeld.enable { boot.kernel.sysctl = { "net.ipv6.conf.all.forwarding" = 1; diff --git a/nixos/modules/services/networking/bee.nix b/nixos/modules/services/networking/bee.nix index 83ce522ba62af..6f3f7af607fbf 100644 --- a/nixos/modules/services/networking/bee.nix +++ b/nixos/modules/services/networking/bee.nix @@ -1,6 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; let cfg = config.services.bee; format = pkgs.formats.yaml {}; @@ -15,13 +13,13 @@ in { options = { services.bee = { - enable = mkEnableOption "Ethereum Swarm Bee"; + enable = lib.mkEnableOption "Ethereum Swarm Bee"; - package = mkPackageOption pkgs "bee" { + package = lib.mkPackageOption pkgs "bee" { example = "bee-unstable"; }; - settings = mkOption { + settings = lib.mkOption { type = format.type; description = '' Ethereum Swarm Bee configuration. Refer to @@ -30,8 +28,8 @@ in { ''; }; - daemonNiceLevel = mkOption { - type = types.int; + daemonNiceLevel = lib.mkOption { + type = lib.types.int; default = 0; description = '' Daemon process priority for bee. @@ -39,16 +37,16 @@ in { ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "bee"; description = '' User the bee binary should execute under. ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "bee"; description = '' Group the bee binary should execute under. @@ -59,14 +57,14 @@ in { ### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ - { assertion = (hasAttr "password" cfg.settings) != true; + { assertion = (lib.hasAttr "password" cfg.settings) != true; message = '' `services.bee.settings.password` is insecure. Use `services.bee.settings.password-file` or `systemd.services.bee.serviceConfig.EnvironmentFile` instead. ''; } - { assertion = (hasAttr "swap-endpoint" cfg.settings) || (cfg.settings.swap-enable or true == false); + { assertion = (lib.hasAttr "swap-endpoint" cfg.settings) || (cfg.settings.swap-enable or true == false); message = '' In a swap-enabled network a working Ethereum blockchain node is required. You must specify one using `services.bee.settings.swap-endpoint`, or disable `services.bee.settings.swap-enable` = false. ''; @@ -119,7 +117,7 @@ After you finish configuration run 'sudo bee-get-addr'." ''; }; - users.users = optionalAttrs (cfg.user == "bee") { + users.users = lib.optionalAttrs (cfg.user == "bee") { bee = { group = cfg.group; home = cfg.settings.data-dir; @@ -128,7 +126,7 @@ After you finish configuration run 'sudo bee-get-addr'." }; }; - users.groups = optionalAttrs (cfg.group == "bee") { + users.groups = lib.optionalAttrs (cfg.group == "bee") { bee = {}; }; }; diff --git a/nixos/modules/services/networking/biboumi.nix b/nixos/modules/services/networking/biboumi.nix index d92290626c316..33cb1d95bc51f 100644 --- a/nixos/modules/services/networking/biboumi.nix +++ b/nixos/modules/services/networking/biboumi.nix @@ -1,62 +1,61 @@ { config, lib, pkgs, options, ... }: -with lib; let cfg = config.services.biboumi; inherit (config.environment) etc; rootDir = "/run/biboumi/mnt-root"; stateDir = "/var/lib/biboumi"; settingsFile = pkgs.writeText "biboumi.cfg" ( - generators.toKeyValue { + lib.generators.toKeyValue { mkKeyValue = k: v: - lib.optionalString (v != null) (generators.mkKeyValueDefault {} "=" k v); + lib.optionalString (v != null) (lib.generators.mkKeyValueDefault {} "=" k v); } cfg.settings); need_CAP_NET_BIND_SERVICE = cfg.settings.identd_port != 0 && cfg.settings.identd_port < 1024; in { options = { services.biboumi = { - enable = mkEnableOption "the Biboumi XMPP gateway to IRC"; + enable = lib.mkEnableOption "the Biboumi XMPP gateway to IRC"; - settings = mkOption { + settings = lib.mkOption { description = '' See [biboumi 8.5](https://lab.louiz.org/louiz/biboumi/blob/8.5/doc/biboumi.1.rst) for documentation. ''; default = {}; - type = types.submodule { - freeformType = with types; + type = lib.types.submodule { + freeformType = with lib.types; (attrsOf (nullOr (oneOf [str int bool]))) // { description = "settings option"; }; - options.admin = mkOption { - type = with types; listOf str; + options.admin = lib.mkOption { + type = with lib.types; listOf str; default = []; example = ["admin@example.org"]; - apply = concatStringsSep ":"; + apply = lib.concatStringsSep ":"; description = '' The bare JID of the gateway administrator. This JID will have more privileges than other standard users, for example some administration ad-hoc commands will only be available to that JID. ''; }; - options.ca_file = mkOption { - type = types.path; + options.ca_file = lib.mkOption { + type = lib.types.path; default = "/etc/ssl/certs/ca-certificates.crt"; description = '' Specifies which file should be used as the list of trusted CA when negotiating a TLS session. ''; }; - options.db_name = mkOption { - type = with types; either path str; + options.db_name = lib.mkOption { + type = with lib.types; either path str; default = "${stateDir}/biboumi.sqlite"; description = '' The name of the database to use. ''; example = "postgresql://user:secret@localhost"; }; - options.hostname = mkOption { - type = types.str; + options.hostname = lib.mkOption { + type = lib.types.str; example = "biboumi.example.org"; description = '' The hostname served by the XMPP gateway. @@ -64,24 +63,24 @@ in as an external component. ''; }; - options.identd_port = mkOption { - type = types.port; + options.identd_port = lib.mkOption { + type = lib.types.port; default = 113; example = 0; description = '' The TCP port on which to listen for identd queries. ''; }; - options.log_level = mkOption { - type = types.ints.between 0 3; + options.log_level = lib.mkOption { + type = lib.types.ints.between 0 3; default = 1; description = '' Indicate what type of log messages to write in the logs. 0 is debug, 1 is info, 2 is warning, 3 is error. ''; }; - options.password = mkOption { - type = with types; nullOr str; + options.password = lib.mkOption { + type = with lib.types; nullOr str; description = '' The password used to authenticate the XMPP component to your XMPP server. This password must be configured in the XMPP server, @@ -92,8 +91,8 @@ in if you do not want this password to go into the Nix store. ''; }; - options.persistent_by_default = mkOption { - type = types.bool; + options.persistent_by_default = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether all rooms will be persistent by default: @@ -103,25 +102,25 @@ in “persistent” configuration option to false in order to override this. ''; }; - options.policy_directory = mkOption { - type = types.path; + options.policy_directory = lib.mkOption { + type = lib.types.path; default = "${pkgs.biboumi}/etc/biboumi"; - defaultText = literalExpression ''"''${pkgs.biboumi}/etc/biboumi"''; + defaultText = lib.literalExpression ''"''${pkgs.biboumi}/etc/biboumi"''; description = '' A directory that should contain the policy files, used to customize Botan’s behaviour when negotiating the TLS connections with the IRC servers. ''; }; - options.port = mkOption { - type = types.port; + options.port = lib.mkOption { + type = lib.types.port; default = 5347; description = '' The TCP port to use to connect to the local XMPP component. ''; }; - options.realname_customization = mkOption { - type = types.bool; + options.realname_customization = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether the users will be able to use @@ -129,8 +128,8 @@ in their realname and username. ''; }; - options.realname_from_jid = mkOption { - type = types.bool; + options.realname_from_jid = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether the realname and username of each biboumi @@ -139,8 +138,8 @@ in they used to connect to the IRC server. ''; }; - options.xmpp_server_ip = mkOption { - type = types.str; + options.xmpp_server_ip = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = '' The IP address to connect to the XMPP server on. @@ -152,8 +151,8 @@ in }; }; - credentialsFile = mkOption { - type = types.path; + credentialsFile = lib.mkOption { + type = lib.types.path; description = '' Path to a configuration file to be merged with the settings. Beware not to surround "=" with spaces when setting biboumi's options in this file. @@ -165,12 +164,12 @@ in example = "/run/keys/biboumi.cfg"; }; - openFirewall = mkEnableOption "opening of the identd port in the firewall"; + openFirewall = lib.mkEnableOption "opening of the identd port in the firewall"; }; }; - config = mkIf cfg.enable { - networking.firewall = mkIf (cfg.openFirewall && cfg.settings.identd_port != 0) + config = lib.mkIf cfg.enable { + networking.firewall = lib.mkIf (cfg.openFirewall && cfg.settings.identd_port != 0) { allowedTCPPorts = [ cfg.settings.identd_port ]; }; systemd.services.biboumi = { @@ -202,7 +201,7 @@ in RootDirectory = rootDir; RootDirectoryStartOnly = true; InaccessiblePaths = [ "-+${rootDir}" ]; - RuntimeDirectory = [ "biboumi" (removePrefix "/run/" rootDir) ]; + RuntimeDirectory = [ "biboumi" (lib.removePrefix "/run/" rootDir) ]; RuntimeDirectoryMode = "700"; StateDirectory = "biboumi"; StateDirectoryMode = "700"; @@ -221,8 +220,8 @@ in ]; # The following options are only for optimizing: # systemd-analyze security biboumi - AmbientCapabilities = [ (optionalString need_CAP_NET_BIND_SERVICE "CAP_NET_BIND_SERVICE") ]; - CapabilityBoundingSet = [ (optionalString need_CAP_NET_BIND_SERVICE "CAP_NET_BIND_SERVICE") ]; + AmbientCapabilities = [ (lib.optionalString need_CAP_NET_BIND_SERVICE "CAP_NET_BIND_SERVICE") ]; + CapabilityBoundingSet = [ (lib.optionalString need_CAP_NET_BIND_SERVICE "CAP_NET_BIND_SERVICE") ]; # ProtectClock= adds DeviceAllow=char-rtc r DeviceAllow = ""; LockPersonality = true; @@ -230,7 +229,7 @@ in NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; - PrivateNetwork = mkDefault false; + PrivateNetwork = lib.mkDefault false; PrivateTmp = true; # PrivateUsers=true breaks AmbientCapabilities=CAP_NET_BIND_SERVICE # See https://bugs.archlinux.org/task/65921 @@ -265,5 +264,5 @@ in }; }; - meta.maintainers = with maintainers; [ julm ]; + meta.maintainers = with lib.maintainers; [ julm ]; } diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 6c5c59a88dec0..225e330ad1841 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.bind; @@ -14,30 +11,30 @@ let bindZoneOptions = { name, config, ... }: { options = { - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = name; description = "Name of the zone."; }; - master = mkOption { + master = lib.mkOption { description = "Master=false means slave server"; - type = types.bool; + type = lib.types.bool; }; - file = mkOption { - type = types.either types.str types.path; + file = lib.mkOption { + type = lib.types.either lib.types.str lib.types.path; description = "Zone file resource records contain columns of data, separated by whitespace, that define the record."; }; - masters = mkOption { - type = types.listOf types.str; + masters = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "List of servers for inclusion in stub and secondary zones."; }; - slaves = mkOption { - type = types.listOf types.str; + slaves = lib.mkOption { + type = lib.types.listOf lib.types.str; description = "Addresses who may request zone transfers."; default = [ ]; }; - allowQuery = mkOption { - type = types.listOf types.str; + allowQuery = lib.mkOption { + type = lib.types.listOf lib.types.str; description = '' List of address ranges allowed to query this zone. Instead of the address(es), this may instead contain the single string "any". @@ -47,8 +44,8 @@ let ''; default = [ "any" ]; }; - extraConfig = mkOption { - type = types.str; + extraConfig = lib.mkOption { + type = lib.types.str; description = "Extra zone config to be appended at the end of the zone section."; default = ""; }; @@ -62,16 +59,16 @@ let inet 127.0.0.1 allow {localhost;} keys {"rndc-key";}; }; - acl cachenetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} }; - acl badnetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} }; + acl cachenetworks { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} }; + acl badnetworks { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} }; options { - listen-on { ${concatMapStrings (entry: " ${entry}; ") cfg.listenOn} }; - listen-on-v6 { ${concatMapStrings (entry: " ${entry}; ") cfg.listenOnIpv6} }; + listen-on { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOn} }; + listen-on-v6 { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOnIpv6} }; allow-query { cachenetworks; }; blackhole { badnetworks; }; forward ${cfg.forward}; - forwarders { ${concatMapStrings (entry: " ${entry}; ") cfg.forwarders} }; + forwarders { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.forwarders} }; directory "${cfg.directory}"; pid-file "/run/named/named.pid"; ${cfg.extraOptions} @@ -79,7 +76,7 @@ let ${cfg.extraConfig} - ${ concatMapStrings + ${ lib.concatMapStrings ({ name, file, master ? true, slaves ? [], masters ? [], allowQuery ? [], extraConfig ? "" }: '' zone "${name}" { @@ -88,21 +85,21 @@ let ${ if master then '' allow-transfer { - ${concatMapStrings (ip: "${ip};\n") slaves} + ${lib.concatMapStrings (ip: "${ip};\n") slaves} }; '' else '' masters { - ${concatMapStrings (ip: "${ip};\n") masters} + ${lib.concatMapStrings (ip: "${ip};\n") masters} }; '' } - allow-query { ${concatMapStrings (ip: "${ip}; ") allowQuery}}; + allow-query { ${lib.concatMapStrings (ip: "${ip}; ") allowQuery}}; ${extraConfig} }; '') - (attrValues cfg.zones) } + (lib.attrValues cfg.zones) } ''; in @@ -115,14 +112,14 @@ in services.bind = { - enable = mkEnableOption "BIND domain name server"; + enable = lib.mkEnableOption "BIND domain name server"; - package = mkPackageOption pkgs "bind" { }; + package = lib.mkPackageOption pkgs "bind" { }; - cacheNetworks = mkOption { + cacheNetworks = lib.mkOption { default = [ "127.0.0.0/24" "::1/128" ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = '' What networks are allowed to use us as a resolver. Note that this is for recursive queries -- all networks are @@ -134,64 +131,64 @@ in ''; }; - blockedNetworks = mkOption { + blockedNetworks = lib.mkOption { default = [ ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = '' What networks are just blocked. ''; }; - ipv4Only = mkOption { + ipv4Only = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Only use ipv4, even if the host supports ipv6. ''; }; - forwarders = mkOption { + forwarders = lib.mkOption { default = config.networking.nameservers; - defaultText = literalExpression "config.networking.nameservers"; - type = types.listOf types.str; + defaultText = lib.literalExpression "config.networking.nameservers"; + type = lib.types.listOf lib.types.str; description = '' List of servers we should forward requests to. ''; }; - forward = mkOption { + forward = lib.mkOption { default = "first"; - type = types.enum ["first" "only"]; + type = lib.types.enum ["first" "only"]; description = '' Whether to forward 'first' (try forwarding but lookup directly if forwarding fails) or 'only'. ''; }; - listenOn = mkOption { + listenOn = lib.mkOption { default = [ "any" ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = '' Interfaces to listen on. ''; }; - listenOnIpv6 = mkOption { + listenOnIpv6 = lib.mkOption { default = [ "any" ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = '' Ipv6 interfaces to listen on. ''; }; - directory = mkOption { - type = types.str; + directory = lib.mkOption { + type = lib.types.str; default = "/run/named"; description = "Working directory of BIND."; }; - zones = mkOption { + zones = lib.mkOption { default = [ ]; - type = with types; coercedTo (listOf attrs) bindZoneCoerce (attrsOf (types.submodule bindZoneOptions)); + type = with lib.types; coercedTo (listOf attrs) bindZoneCoerce (attrsOf (lib.types.submodule bindZoneOptions)); description = '' List of zones we claim authority over. ''; @@ -206,16 +203,16 @@ in }; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra lines to be added verbatim to the generated named configuration file. ''; }; - extraOptions = mkOption { - type = types.lines; + extraOptions = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra lines to be added verbatim to the options section of the @@ -223,10 +220,10 @@ in ''; }; - configFile = mkOption { - type = types.path; + configFile = lib.mkOption { + type = lib.types.path; default = confFile; - defaultText = literalExpression "confFile"; + defaultText = lib.literalExpression "confFile"; description = '' Overridable config file to use for named. By default, that generated by nixos. @@ -240,9 +237,9 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - networking.resolvconf.useLocalResolver = mkDefault true; + networking.resolvconf.useLocalResolver = lib.mkDefault true; users.users.${bindUser} = { @@ -272,7 +269,7 @@ in serviceConfig = { Type = "forking"; # Set type to forking, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900788 - ExecStart = "${bindPkg.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile}"; + ExecStart = "${bindPkg.out}/sbin/named -u ${bindUser} ${lib.optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile}"; ExecReload = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' reload"; ExecStop = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' stop"; }; diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix index 0c69b72fec10f..f73c0b796e6f1 100644 --- a/nixos/modules/services/networking/bird-lg.nix +++ b/nixos/modules/services/networking/bird-lg.nix @@ -1,176 +1,173 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.bird-lg; - stringOrConcat = sep: v: if builtins.isString v then v else concatStringsSep sep v; + stringOrConcat = sep: v: if builtins.isString v then v else lib.concatStringsSep sep v; frontend_args = let fe = cfg.frontend; in { - "--servers" = concatStringsSep "," fe.servers; + "--servers" = lib.concatStringsSep "," fe.servers; "--domain" = fe.domain; "--listen" = fe.listenAddress; "--proxy-port" = fe.proxyPort; "--whois" = fe.whois; "--dns-interface" = fe.dnsInterface; - "--bgpmap-info" = concatStringsSep "," cfg.frontend.bgpMapInfo; + "--bgpmap-info" = lib.concatStringsSep "," cfg.frontend.bgpMapInfo; "--title-brand" = fe.titleBrand; "--navbar-brand" = fe.navbar.brand; "--navbar-brand-url" = fe.navbar.brandURL; "--navbar-all-servers" = fe.navbar.allServers; "--navbar-all-url" = fe.navbar.allServersURL; "--net-specific-mode" = fe.netSpecificMode; - "--protocol-filter" = concatStringsSep "," cfg.frontend.protocolFilter; + "--protocol-filter" = lib.concatStringsSep "," cfg.frontend.protocolFilter; }; proxy_args = let px = cfg.proxy; in { - "--allowed" = concatStringsSep "," px.allowedIPs; + "--allowed" = lib.concatStringsSep "," px.allowedIPs; "--bird" = px.birdSocket; "--listen" = px.listenAddress; "--traceroute_bin" = px.traceroute.binary; - "--traceroute_flags" = concatStringsSep " " px.traceroute.flags; + "--traceroute_flags" = lib.concatStringsSep " " px.traceroute.flags; "--traceroute_raw" = px.traceroute.rawOutput; }; mkArgValue = value: - if isString value - then escapeShellArg value - else if isBool value - then boolToString value + if lib.isString value + then lib.escapeShellArg value + else if lib.isBool value + then lib.boolToString value else toString value; - filterNull = filterAttrs (_: v: v != "" && v != null && v != []); + filterNull = lib.filterAttrs (_: v: v != "" && v != null && v != []); - argsAttrToList = args: mapAttrsToList (name: value: "${name} " + mkArgValue value ) (filterNull args); + argsAttrToList = args: lib.mapAttrsToList (name: value: "${name} " + mkArgValue value ) (filterNull args); in { options = { services.bird-lg = { - package = mkPackageOption pkgs "bird-lg" { }; + package = lib.mkPackageOption pkgs "bird-lg" { }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "bird-lg"; description = "User to run the service."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "bird-lg"; description = "Group to run the service."; }; frontend = { - enable = mkEnableOption "Bird Looking Glass Frontend Webserver"; + enable = lib.mkEnableOption "Bird Looking Glass Frontend Webserver"; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "127.0.0.1:5000"; description = "Address to listen on."; }; - proxyPort = mkOption { - type = types.port; + proxyPort = lib.mkOption { + type = lib.types.port; default = 8000; description = "Port bird-lg-proxy is running on."; }; - domain = mkOption { - type = types.str; + domain = lib.mkOption { + type = lib.types.str; example = "dn42.lantian.pub"; description = "Server name domain suffixes."; }; - servers = mkOption { - type = types.listOf types.str; + servers = lib.mkOption { + type = lib.types.listOf lib.types.str; example = [ "gigsgigscloud" "hostdare" ]; description = "Server name prefixes."; }; - whois = mkOption { - type = types.str; + whois = lib.mkOption { + type = lib.types.str; default = "whois.verisign-grs.com"; description = "Whois server for queries."; }; - dnsInterface = mkOption { - type = types.str; + dnsInterface = lib.mkOption { + type = lib.types.str; default = "asn.cymru.com"; description = "DNS zone to query ASN information."; }; - bgpMapInfo = mkOption { - type = types.listOf types.str; + bgpMapInfo = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ "asn" "as-name" "ASName" "descr" ]; description = "Information displayed in bgpmap."; }; - titleBrand = mkOption { - type = types.str; + titleBrand = lib.mkOption { + type = lib.types.str; default = "Bird-lg Go"; description = "Prefix of page titles in browser tabs."; }; - netSpecificMode = mkOption { - type = types.str; + netSpecificMode = lib.mkOption { + type = lib.types.str; default = ""; example = "dn42"; description = "Apply network-specific changes for some networks."; }; - protocolFilter = mkOption { - type = types.listOf types.str; + protocolFilter = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "ospf" ]; description = "Information displayed in bgpmap."; }; - nameFilter = mkOption { - type = types.str; + nameFilter = lib.mkOption { + type = lib.types.str; default = ""; example = "^ospf"; description = "Protocol names to hide in summary tables (RE2 syntax),"; }; - timeout = mkOption { - type = types.int; + timeout = lib.mkOption { + type = lib.types.int; default = 120; description = "Time before request timed out, in seconds."; }; navbar = { - brand = mkOption { - type = types.str; + brand = lib.mkOption { + type = lib.types.str; default = "Bird-lg Go"; description = "Brand to show in the navigation bar ."; }; - brandURL = mkOption { - type = types.str; + brandURL = lib.mkOption { + type = lib.types.str; default = "/"; description = "URL of the brand to show in the navigation bar."; }; - allServers = mkOption { - type = types.str; + allServers = lib.mkOption { + type = lib.types.str; default = "ALL Servers"; description = "Text of 'All server' button in the navigation bar."; }; - allServersURL = mkOption { - type = types.str; + allServersURL = lib.mkOption { + type = lib.types.str; default = "all"; description = "URL of 'All servers' button."; }; }; - extraArgs = mkOption { - type = with types; either lines (listOf str); + extraArgs = lib.mkOption { + type = with lib.types; either lines (listOf str); default = [ ]; description = '' Extra parameters documented [here](https://github.com/xddxdd/bird-lg-go#frontend). @@ -183,50 +180,50 @@ in }; proxy = { - enable = mkEnableOption "Bird Looking Glass Proxy"; + enable = lib.mkEnableOption "Bird Looking Glass Proxy"; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "127.0.0.1:8000"; description = "Address to listen on."; }; - allowedIPs = mkOption { - type = types.listOf types.str; + allowedIPs = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "192.168.25.52" "192.168.25.53" "192.168.0.0/24" ]; description = "List of IPs or networks to allow (default all allowed)."; }; - birdSocket = mkOption { - type = types.str; + birdSocket = lib.mkOption { + type = lib.types.str; default = "/var/run/bird/bird.ctl"; description = "Bird control socket path."; }; traceroute = { - binary = mkOption { - type = types.str; + binary = lib.mkOption { + type = lib.types.str; default = "${pkgs.traceroute}/bin/traceroute"; - defaultText = literalExpression ''"''${pkgs.traceroute}/bin/traceroute"''; + defaultText = lib.literalExpression ''"''${pkgs.traceroute}/bin/traceroute"''; description = "Traceroute's binary path."; }; - flags = mkOption { - type = with types; listOf str; + flags = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; description = "Flags for traceroute process"; }; - rawOutput = mkOption { - type = types.bool; + rawOutput = lib.mkOption { + type = lib.types.bool; default = false; description = "Display traceroute output in raw format."; }; }; - extraArgs = mkOption { - type = with types; either lines (listOf str); + extraArgs = lib.mkOption { + type = with lib.types; either lines (listOf str); default = [ ]; description = '' Extra parameters documented [here](https://github.com/xddxdd/bird-lg-go#proxy). @@ -254,7 +251,7 @@ in ; systemd.services = { - bird-lg-frontend = mkIf cfg.frontend.enable { + bird-lg-frontend = lib.mkIf cfg.frontend.enable { enable = true; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -270,12 +267,12 @@ in }; script = '' ${cfg.package}/bin/frontend \ - ${concatStringsSep " \\\n " (argsAttrToList frontend_args)} \ + ${lib.concatStringsSep " \\\n " (argsAttrToList frontend_args)} \ ${stringOrConcat " " cfg.frontend.extraArgs} ''; }; - bird-lg-proxy = mkIf cfg.proxy.enable { + bird-lg-proxy = lib.mkIf cfg.proxy.enable { enable = true; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -291,14 +288,14 @@ in }; script = '' ${cfg.package}/bin/proxy \ - ${concatStringsSep " \\\n " (argsAttrToList proxy_args)} \ + ${lib.concatStringsSep " \\\n " (argsAttrToList proxy_args)} \ ${stringOrConcat " " cfg.proxy.extraArgs} ''; }; }; - users = mkIf (cfg.frontend.enable || cfg.proxy.enable) { - groups."bird-lg" = mkIf (cfg.group == "bird-lg") { }; - users."bird-lg" = mkIf (cfg.user == "bird-lg") { + users = lib.mkIf (cfg.frontend.enable || cfg.proxy.enable) { + groups."bird-lg" = lib.mkIf (cfg.group == "bird-lg") { }; + users."bird-lg" = lib.mkIf (cfg.user == "bird-lg") { description = "Bird Looking Glass user"; extraGroups = lib.optionals (config.services.bird2.enable) [ "bird2" ]; group = cfg.group; diff --git a/nixos/modules/services/networking/birdwatcher.nix b/nixos/modules/services/networking/birdwatcher.nix index 4baab1e60a2d7..434f0e2095f30 100644 --- a/nixos/modules/services/networking/birdwatcher.nix +++ b/nixos/modules/services/networking/birdwatcher.nix @@ -1,31 +1,28 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.birdwatcher; in { options = { services.birdwatcher = { - package = mkPackageOption pkgs "birdwatcher" { }; - enable = mkEnableOption "Birdwatcher"; - flags = mkOption { + package = lib.mkPackageOption pkgs "birdwatcher" { }; + enable = lib.mkEnableOption "Birdwatcher"; + flags = lib.mkOption { default = [ ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; example = [ "-worker-pool-size 16" "-6" ]; description = '' Flags to append to the program call ''; }; - settings = mkOption { - type = types.lines; + settings = lib.mkOption { + type = lib.types.lines; default = { }; description = '' birdwatcher configuration, for configuration options see the example on [github](https://github.com/alice-lg/birdwatcher/blob/master/etc/birdwatcher/birdwatcher.conf) ''; - example = literalExpression '' + example = lib.literalExpression '' [server] allow_from = [] allow_uncached = false @@ -72,7 +69,7 @@ in }; config = - let flagsStr = escapeShellArgs cfg.flags; + let flagsStr = lib.escapeShellArgs cfg.flags; in lib.mkIf cfg.enable { environment.etc."birdwatcher/birdwatcher.conf".source = pkgs.writeTextFile { name = "birdwatcher.conf"; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 20488e5f33fea..3ebbab97b68e1 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.bitlbee; @@ -46,8 +43,8 @@ in services.bitlbee = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to run the BitlBee IRC to other chat network gateway. @@ -56,8 +53,8 @@ in ''; }; - interface = mkOption { - type = types.str; + interface = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = '' The interface the BitlBee daemon will be listening to. If `127.0.0.1`, @@ -66,17 +63,17 @@ in ''; }; - portNumber = mkOption { + portNumber = lib.mkOption { default = 6667; - type = types.port; + type = lib.types.port; description = '' Number of the port BitlBee will be listening to. ''; }; - authBackend = mkOption { + authBackend = lib.mkOption { default = "storage"; - type = types.enum [ "storage" "pam" ]; + type = lib.types.enum [ "storage" "pam" ]; description = '' How users are authenticated storage -- save passwords internally @@ -84,9 +81,9 @@ in ''; }; - authMode = mkOption { + authMode = lib.mkOption { default = "Open"; - type = types.enum [ "Open" "Closed" "Registered" ]; + type = lib.types.enum [ "Open" "Closed" "Registered" ]; description = '' The following authentication modes are available: Open -- Accept connections from anyone, use NickServ for user authentication. @@ -95,9 +92,9 @@ in ''; }; - hostName = mkOption { + hostName = lib.mkOption { default = ""; - type = types.str; + type = lib.types.str; description = '' Normally, BitlBee gets a hostname using getsockname(). If you have a nicer alias for your BitlBee daemon, you can set it here and BitlBee will identify @@ -105,53 +102,53 @@ in ''; }; - plugins = mkOption { - type = types.listOf types.package; + plugins = lib.mkOption { + type = lib.types.listOf lib.types.package; default = []; - example = literalExpression "[ pkgs.bitlbee-facebook ]"; + example = lib.literalExpression "[ pkgs.bitlbee-facebook ]"; description = '' The list of bitlbee plugins to install. ''; }; - libpurple_plugins = mkOption { - type = types.listOf types.package; + libpurple_plugins = lib.mkOption { + type = lib.types.listOf lib.types.package; default = []; - example = literalExpression "[ pkgs.purple-matrix ]"; + example = lib.literalExpression "[ pkgs.purple-matrix ]"; description = '' The list of libpurple plugins to install. ''; }; - configDir = mkOption { + configDir = lib.mkOption { default = "/var/lib/bitlbee"; - type = types.path; + type = lib.types.path; description = '' Specify an alternative directory to store all the per-user configuration files. ''; }; - protocols = mkOption { + protocols = lib.mkOption { default = ""; - type = types.str; + type = lib.types.str; description = '' This option allows to remove the support of protocol, even if compiled in. If nothing is given, there are no restrictions. ''; }; - extraSettings = mkOption { + extraSettings = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; description = '' Will be inserted in the Settings section of the config file. ''; }; - extraDefaults = mkOption { + extraDefaults = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; description = '' Will be inserted in the Default section of the config file. ''; @@ -163,8 +160,8 @@ in ###### implementation - config = mkMerge [ - (mkIf config.services.bitlbee.enable { + config = lib.mkMerge [ + (lib.mkIf config.services.bitlbee.enable { systemd.services.bitlbee = { environment.PURPLE_PLUGIN_PATH = purple_plugin_path; description = "BitlBee IRC to other chat networks gateway"; @@ -182,7 +179,7 @@ in environment.systemPackages = [ bitlbeePkg ]; }) - (mkIf (config.services.bitlbee.authBackend == "pam") { + (lib.mkIf (config.services.bitlbee.authBackend == "pam") { security.pam.services.bitlbee = {}; }) ]; diff --git a/nixos/modules/services/networking/blockbook-frontend.nix b/nixos/modules/services/networking/blockbook-frontend.nix index 504c98e9ab8e5..6200a098c34a0 100644 --- a/nixos/modules/services/networking/blockbook-frontend.nix +++ b/nixos/modules/services/networking/blockbook-frontend.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let eachBlockbook = config.services.blockbook-frontend; @@ -10,24 +7,24 @@ let options = { - enable = mkEnableOption "blockbook-frontend application"; + enable = lib.mkEnableOption "blockbook-frontend application"; - package = mkPackageOption pkgs "blockbook" { }; + package = lib.mkPackageOption pkgs "blockbook" { }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "blockbook-frontend-${name}"; description = "The user as which to run blockbook-frontend-${name}."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "${config.user}"; description = "The group as which to run blockbook-frontend-${name}."; }; - certFile = mkOption { - type = types.nullOr types.path; + certFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; example = "/etc/secrets/blockbook-frontend-${name}/certFile"; description = '' @@ -36,15 +33,15 @@ let ''; }; - configFile = mkOption { - type = with types; nullOr path; + configFile = lib.mkOption { + type = with lib.types; nullOr path; default = null; example = "${config.dataDir}/config.json"; description = "Location of the blockbook configuration file."; }; - coinName = mkOption { - type = types.str; + coinName = lib.mkOption { + type = lib.types.str; default = "Bitcoin"; description = '' See @@ -52,68 +49,68 @@ let ''; }; - cssDir = mkOption { - type = types.path; + cssDir = lib.mkOption { + type = lib.types.path; default = "${config.package}/share/css/"; - defaultText = literalExpression ''"''${package}/share/css/"''; - example = literalExpression ''"''${dataDir}/static/css/"''; + defaultText = lib.literalExpression ''"''${package}/share/css/"''; + example = lib.literalExpression ''"''${dataDir}/static/css/"''; description = '' Location of the dir with {file}`main.css` CSS file. By default, the one shipped with the package is used. ''; }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/blockbook-frontend-${name}"; description = "Location of blockbook-frontend-${name} data directory."; }; - debug = mkOption { - type = types.bool; + debug = lib.mkOption { + type = lib.types.bool; default = false; description = "Debug mode, return more verbose errors, reload templates on each request."; }; - internal = mkOption { - type = types.nullOr types.str; + internal = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = ":9030"; description = "Internal http server binding `[address]:port`."; }; - messageQueueBinding = mkOption { - type = types.str; + messageQueueBinding = lib.mkOption { + type = lib.types.str; default = "tcp://127.0.0.1:38330"; description = "Message Queue Binding `address:port`."; }; - public = mkOption { - type = types.nullOr types.str; + public = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = ":9130"; description = "Public http server binding `[address]:port`."; }; rpc = { - url = mkOption { - type = types.str; + url = lib.mkOption { + type = lib.types.str; default = "http://127.0.0.1"; description = "URL for JSON-RPC connections."; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 8030; description = "Port for JSON-RPC connections."; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "rpc"; description = "Username for JSON-RPC connections."; }; - password = mkOption { - type = types.str; + password = lib.mkOption { + type = lib.types.str; default = "rpc"; description = '' RPC password for JSON-RPC connections. @@ -122,8 +119,8 @@ let ''; }; - passwordFile = mkOption { - type = types.nullOr types.path; + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' File containing password of the RPC user. @@ -132,24 +129,24 @@ let }; }; - sync = mkOption { - type = types.bool; + sync = lib.mkOption { + type = lib.types.bool; default = true; description = "Synchronizes until tip, if together with zeromq, keeps index synchronized."; }; - templateDir = mkOption { - type = types.path; + templateDir = lib.mkOption { + type = lib.types.path; default = "${config.package}/share/templates/"; - defaultText = literalExpression ''"''${package}/share/templates/"''; - example = literalExpression ''"''${dataDir}/templates/static/"''; + defaultText = lib.literalExpression ''"''${package}/share/templates/"''; + example = lib.literalExpression ''"''${dataDir}/templates/static/"''; description = "Location of the HTML templates. By default, ones shipped with the package are used."; }; - extraConfig = mkOption { - type = types.attrs; + extraConfig = lib.mkOption { + type = lib.types.attrs; default = {}; - example = literalExpression '' { + example = lib.literalExpression '' { "alternative_estimate_fee" = "whatthefee-disabled"; "alternative_estimate_fee_params" = "{\"url\": \"https://whatthefee.io/data.json\", \"periodSeconds\": 60}"; "fiat_rates" = "coingecko"; @@ -174,8 +171,8 @@ let ''; }; - extraCmdLineOptions = mkOption { - type = types.listOf types.str; + extraCmdLineOptions = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "-workers=1" "-dbcache=0" "-logtosderr" ]; description = '' @@ -190,8 +187,8 @@ in # interface options = { - services.blockbook-frontend = mkOption { - type = types.attrsOf (types.submodule blockbookOpts); + services.blockbook-frontend = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule blockbookOpts); default = {}; description = "Specification of one or more blockbook-frontend instances."; }; @@ -199,10 +196,10 @@ in # implementation - config = mkIf (eachBlockbook != {}) { + config = lib.mkIf (eachBlockbook != {}) { - systemd.services = mapAttrs' (blockbookName: cfg: ( - nameValuePair "blockbook-frontend-${blockbookName}" ( + systemd.services = lib.mapAttrs' (blockbookName: cfg: ( + lib.nameValuePair "blockbook-frontend-${blockbookName}" ( let configFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "config.conf" (builtins.toJSON ( { @@ -220,7 +217,7 @@ in preStart = '' ln -sf ${cfg.templateDir} ${cfg.dataDir}/static/ ln -sf ${cfg.cssDir} ${cfg.dataDir}/static/ - ${optionalString (cfg.rpc.passwordFile != null && cfg.configFile == null) '' + ${lib.optionalString (cfg.rpc.passwordFile != null && cfg.configFile == null) '' CONFIGTMP=$(mktemp) ${pkgs.jq}/bin/jq ".rpc_pass = \"$(cat ${cfg.rpc.passwordFile})\"" ${configFile} > $CONFIGTMP mv $CONFIGTMP ${cfg.dataDir}/${blockbookName}-config.json @@ -237,11 +234,11 @@ in "-blockchaincfg=${configFile}" } \ -datadir=${cfg.dataDir} \ - ${optionalString (cfg.sync != false) "-sync"} \ - ${optionalString (cfg.certFile != null) "-certfile=${toString cfg.certFile}"} \ - ${optionalString (cfg.debug != false) "-debug"} \ - ${optionalString (cfg.internal != null) "-internal=${toString cfg.internal}"} \ - ${optionalString (cfg.public != null) "-public=${toString cfg.public}"} \ + ${lib.optionalString (cfg.sync != false) "-sync"} \ + ${lib.optionalString (cfg.certFile != null) "-certfile=${toString cfg.certFile}"} \ + ${lib.optionalString (cfg.debug != false) "-debug"} \ + ${lib.optionalString (cfg.internal != null) "-internal=${toString cfg.internal}"} \ + ${lib.optionalString (cfg.public != null) "-public=${toString cfg.public}"} \ ${toString cfg.extraCmdLineOptions} ''; Restart = "on-failure"; @@ -251,23 +248,23 @@ in } ) )) eachBlockbook; - systemd.tmpfiles.rules = flatten (mapAttrsToList (blockbookName: cfg: [ + systemd.tmpfiles.rules = lib.flatten (lib.mapAttrsToList (blockbookName: cfg: [ "d ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -" "d ${cfg.dataDir}/static 0750 ${cfg.user} ${cfg.group} - -" ]) eachBlockbook); - users.users = mapAttrs' (blockbookName: cfg: ( - nameValuePair "blockbook-frontend-${blockbookName}" { + users.users = lib.mapAttrs' (blockbookName: cfg: ( + lib.nameValuePair "blockbook-frontend-${blockbookName}" { name = cfg.user; group = cfg.group; home = cfg.dataDir; isSystemUser = true; })) eachBlockbook; - users.groups = mapAttrs' (instanceName: cfg: ( - nameValuePair "${cfg.group}" { })) eachBlockbook; + users.groups = lib.mapAttrs' (instanceName: cfg: ( + lib.nameValuePair "${cfg.group}" { })) eachBlockbook; }; - meta.maintainers = with maintainers; [ _1000101 ]; + meta.maintainers = with lib.maintainers; [ _1000101 ]; } diff --git a/nixos/modules/services/networking/blocky.nix b/nixos/modules/services/networking/blocky.nix index 4bc6ffa3f46ab..1260d9da7ac29 100644 --- a/nixos/modules/services/networking/blocky.nix +++ b/nixos/modules/services/networking/blocky.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.blocky; @@ -10,11 +7,11 @@ let in { options.services.blocky = { - enable = mkEnableOption "blocky, a fast and lightweight DNS proxy as ad-blocker for local network with many features"; + enable = lib.mkEnableOption "blocky, a fast and lightweight DNS proxy as ad-blocker for local network with many features"; - package = mkPackageOption pkgs "blocky" { }; + package = lib.mkPackageOption pkgs "blocky" { }; - settings = mkOption { + settings = lib.mkOption { type = format.type; default = { }; description = '' @@ -25,14 +22,14 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.blocky = { description = "A DNS proxy and ad-blocker for the local network"; wantedBy = [ "multi-user.target" ]; serviceConfig = { DynamicUser = true; - ExecStart = "${getExe cfg.package} --config ${configFile}"; + ExecStart = "${lib.getExe cfg.package} --config ${configFile}"; Restart = "on-failure"; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; diff --git a/nixos/modules/services/networking/cgit.nix b/nixos/modules/services/networking/cgit.nix index 910db84a2641c..208979364684d 100644 --- a/nixos/modules/services/networking/cgit.nix +++ b/nixos/modules/services/networking/cgit.nix @@ -1,14 +1,11 @@ { config, lib, pkgs, ...}: - -with lib; - let cfgs = config.services.cgit; - settingType = with types; oneOf [ bool int str ]; - repeatedSettingType = with types; oneOf [ settingType (listOf settingType) ]; + settingType = with lib.types; oneOf [ bool int str ]; + repeatedSettingType = with lib.types; oneOf [ settingType (listOf settingType) ]; - genAttrs' = names: f: listToAttrs (map f names); + genAttrs' = names: f: lib.listToAttrs (map f names); regexEscape = let @@ -20,9 +17,9 @@ let " " # \f / 0x0C ]; in - replaceStrings special (map (c: "\\${c}") special); + lib.replaceStrings special (map (c: "\\${c}") special); - stripLocation = cfg: removeSuffix "/" cfg.nginx.location; + stripLocation = cfg: lib.removeSuffix "/" cfg.nginx.location; regexLocation = cfg: regexEscape (stripLocation cfg); @@ -47,29 +44,29 @@ let # list value as multiple lines (for "readme" for example) cgitrcEntry = name: value: - if isList value then + if lib.isList value then map (cgitrcLine name) value else [ (cgitrcLine name value) ]; mkCgitrc = cfg: pkgs.writeText "cgitrc" '' # global settings - ${concatStringsSep "\n" ( - flatten (mapAttrsToList + ${lib.concatStringsSep "\n" ( + lib.flatten (lib.mapAttrsToList cgitrcEntry ({ virtual-root = cfg.nginx.location; } // cfg.settings) ) ) } - ${optionalString (cfg.scanPath != null) (cgitrcLine "scan-path" cfg.scanPath)} + ${lib.optionalString (cfg.scanPath != null) (cgitrcLine "scan-path" cfg.scanPath)} # repository settings - ${concatStrings ( - mapAttrsToList + ${lib.concatStrings ( + lib.mapAttrsToList (url: settings: '' ${cgitrcLine "repo.url" url} - ${concatStringsSep "\n" ( - mapAttrsToList (name: cgitrcLine "repo.${name}") settings + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: cgitrcLine "repo.${name}") settings ) } '') @@ -90,32 +87,32 @@ let in { options = { - services.cgit = mkOption { + services.cgit = lib.mkOption { description = "Configure cgit instances."; default = {}; - type = types.attrsOf (types.submodule ({ config, ... }: { + type = lib.types.attrsOf (lib.types.submodule ({ config, ... }: { options = { - enable = mkEnableOption "cgit"; + enable = lib.mkEnableOption "cgit"; - package = mkPackageOption pkgs "cgit" {}; + package = lib.mkPackageOption pkgs "cgit" {}; - nginx.virtualHost = mkOption { + nginx.virtualHost = lib.mkOption { description = "VirtualHost to serve cgit on, defaults to the attribute name."; - type = types.str; + type = lib.types.str; default = config._module.args.name; example = "git.example.com"; }; - nginx.location = mkOption { + nginx.location = lib.mkOption { description = "Location to serve cgit under."; - type = types.str; + type = lib.types.str; default = "/"; example = "/git/"; }; - repos = mkOption { + repos = lib.mkOption { description = "cgit repository settings, see cgitrc(5)"; - type = with types; attrsOf (attrsOf settingType); + type = with lib.types; attrsOf (attrsOf settingType); default = {}; example = { blah = { @@ -125,18 +122,18 @@ in }; }; - scanPath = mkOption { + scanPath = lib.mkOption { description = "A path which will be scanned for repositories."; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; default = null; example = "/var/lib/git"; }; - settings = mkOption { + settings = lib.mkOption { description = "cgit configuration, see cgitrc(5)"; - type = types.attrsOf repeatedSettingType; + type = lib.types.attrsOf repeatedSettingType; default = {}; - example = literalExpression '' + example = lib.literalExpression '' { enable-follow-links = true; source-filter = "''${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py"; @@ -144,21 +141,21 @@ in ''; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { description = "These lines go to the end of cgitrc verbatim."; - type = types.lines; + type = lib.types.lines; default = ""; }; - user = mkOption { + user = lib.mkOption { description = "User to run the cgit service as."; - type = types.str; + type = lib.types.str; default = "cgit"; }; - group = mkOption { + group = lib.mkOption { description = "Group to run the cgit service as."; - type = types.str; + type = lib.types.str; default = "cgit"; }; }; @@ -166,13 +163,13 @@ in }; }; - config = mkIf (any (cfg: cfg.enable) (attrValues cfgs)) { - assertions = mapAttrsToList (vhost: cfg: { + config = lib.mkIf (lib.any (cfg: cfg.enable) (lib.attrValues cfgs)) { + assertions = lib.mapAttrsToList (vhost: cfg: { assertion = !cfg.enable || (cfg.scanPath == null) != (cfg.repos == {}); message = "Exactly one of services.cgit.${vhost}.scanPath or services.cgit.${vhost}.repos must be set."; }) cfgs; - users = mkMerge (flip mapAttrsToList cfgs (_: cfg: { + users = lib.mkMerge (lib.flip lib.mapAttrsToList cfgs (_: cfg: { users.${cfg.user} = { isSystemUser = true; inherit (cfg) group; @@ -180,23 +177,23 @@ in groups.${cfg.group} = { }; })); - services.fcgiwrap.instances = flip mapAttrs' cfgs (name: cfg: - nameValuePair "cgit-${name}" { + services.fcgiwrap.instances = lib.flip lib.mapAttrs' cfgs (name: cfg: + lib.nameValuePair "cgit-${name}" { process = { inherit (cfg) user group; }; socket = { inherit (config.services.nginx) user group; }; } ); - systemd.services = flip mapAttrs' cfgs (name: cfg: - nameValuePair (fcgiwrapUnitName name) - (mkIf (cfg.repos != { }) { + systemd.services = lib.flip lib.mapAttrs' cfgs (name: cfg: + lib.nameValuePair (fcgiwrapUnitName name) + (lib.mkIf (cfg.repos != { }) { serviceConfig.RuntimeDirectory = fcgiwrapUnitName name; preStart = '' - GIT_PROJECT_ROOT=${escapeShellArg (gitProjectRoot name cfg)} + GIT_PROJECT_ROOT=${lib.escapeShellArg (gitProjectRoot name cfg)} mkdir -p "$GIT_PROJECT_ROOT" cd "$GIT_PROJECT_ROOT" - ${concatLines (flip mapAttrsToList cfg.repos (name: repo: '' - ln -s ${escapeShellArg repo.path} ${escapeShellArg name} + ${lib.concatLines (lib.flip lib.mapAttrsToList cfg.repos (name: repo: '' + ln -s ${lib.escapeShellArg repo.path} ${lib.escapeShellArg name} ''))} ''; } @@ -204,12 +201,12 @@ in services.nginx.enable = true; - services.nginx.virtualHosts = mkMerge (mapAttrsToList (name: cfg: { + services.nginx.virtualHosts = lib.mkMerge (lib.mapAttrsToList (name: cfg: { ${cfg.nginx.virtualHost} = { locations = ( genAttrs' [ "cgit.css" "cgit.png" "favicon.ico" "robots.txt" ] - (fileName: nameValuePair "= ${stripLocation cfg}/${fileName}" { + (fileName: lib.nameValuePair "= ${stripLocation cfg}/${fileName}" { extraConfig = '' alias ${cfg.package}/cgit/${fileName}; ''; diff --git a/nixos/modules/services/networking/chisel-server.nix b/nixos/modules/services/networking/chisel-server.nix index 9c6391701fafc..2b585c22f304d 100644 --- a/nixos/modules/services/networking/chisel-server.nix +++ b/nixos/modules/services/networking/chisel-server.nix @@ -1,69 +1,66 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.chisel-server; in { options = { services.chisel-server = { - enable = mkEnableOption "Chisel Tunnel Server"; - host = mkOption { + enable = lib.mkEnableOption "Chisel Tunnel Server"; + host = lib.mkOption { description = "Address to listen on, falls back to 0.0.0.0"; - type = with types; nullOr str; + type = with lib.types; nullOr str; default = null; example = "[::1]"; }; - port = mkOption { + port = lib.mkOption { description = "Port to listen on, falls back to 8080"; - type = with types; nullOr port; + type = with lib.types; nullOr port; default = null; }; - authfile = mkOption { + authfile = lib.mkOption { description = "Path to auth.json file"; - type = with types; nullOr path; + type = with lib.types; nullOr path; default = null; }; - keepalive = mkOption { + keepalive = lib.mkOption { description = "Keepalive interval, falls back to 25s"; - type = with types; nullOr str; + type = with lib.types; nullOr str; default = null; example = "5s"; }; - backend = mkOption { + backend = lib.mkOption { description = "HTTP server to proxy normal requests to"; - type = with types; nullOr str; + type = with lib.types; nullOr str; default = null; example = "http://127.0.0.1:8888"; }; - socks5 = mkOption { + socks5 = lib.mkOption { description = "Allow clients access to internal SOCKS5 proxy"; - type = types.bool; + type = lib.types.bool; default = false; }; - reverse = mkOption { + reverse = lib.mkOption { description = "Allow clients reverse port forwarding"; - type = types.bool; + type = lib.types.bool; default = false; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.chisel-server = { description = "Chisel Tunnel Server"; wantedBy = [ "network-online.target" ]; serviceConfig = { - ExecStart = "${pkgs.chisel}/bin/chisel server " + concatStringsSep " " ( - optional (cfg.host != null) "--host ${cfg.host}" - ++ optional (cfg.port != null) "--port ${builtins.toString cfg.port}" - ++ optional (cfg.authfile != null) "--authfile ${cfg.authfile}" - ++ optional (cfg.keepalive != null) "--keepalive ${cfg.keepalive}" - ++ optional (cfg.backend != null) "--backend ${cfg.backend}" - ++ optional cfg.socks5 "--socks5" - ++ optional cfg.reverse "--reverse" + ExecStart = "${pkgs.chisel}/bin/chisel server " + lib.concatStringsSep " " ( + lib.optional (cfg.host != null) "--host ${cfg.host}" + ++ lib.optional (cfg.port != null) "--port ${builtins.toString cfg.port}" + ++ lib.optional (cfg.authfile != null) "--authfile ${cfg.authfile}" + ++ lib.optional (cfg.keepalive != null) "--keepalive ${cfg.keepalive}" + ++ lib.optional (cfg.backend != null) "--backend ${cfg.backend}" + ++ lib.optional cfg.socks5 "--socks5" + ++ lib.optional cfg.reverse "--reverse" ); # Security Hardening @@ -95,5 +92,5 @@ in { }; }; - meta.maintainers = with maintainers; [ clerie ]; + meta.maintainers = with lib.maintainers; [ clerie ]; } diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index f50031eb2ec4e..6aaaf62950689 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let pkg = pkgs.cjdns; @@ -11,28 +8,28 @@ let connectToSubmodule = { ... }: { options = - { password = mkOption { - type = types.str; + { password = lib.mkOption { + type = lib.types.str; description = "Authorized password to the opposite end of the tunnel."; }; - login = mkOption { + login = lib.mkOption { default = ""; - type = types.str; + type = lib.types.str; description = "(optional) name your peer has for you"; }; - peerName = mkOption { + peerName = lib.mkOption { default = ""; - type = types.str; + type = lib.types.str; description = "(optional) human-readable name for peer"; }; - publicKey = mkOption { - type = types.str; + publicKey = lib.mkOption { + type = lib.types.str; description = "Public key at the opposite end of the tunnel."; }; - hostname = mkOption { + hostname = lib.mkOption { default = ""; example = "foobar.hype"; - type = types.str; + type = lib.types.str; description = "Optional hostname to add to /etc/hosts; prevents reverse lookup failures."; }; }; @@ -41,16 +38,16 @@ let # Additional /etc/hosts entries for peers with an associated hostname cjdnsExtraHosts = pkgs.runCommand "cjdns-hosts" {} '' exec >$out - ${concatStringsSep "\n" (mapAttrsToList (k: v: - optionalString (v.hostname != "") + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (k: v: + lib.optionalString (v.hostname != "") "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}") (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))} ''; parseModules = x: - x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; }; + x // { connectTo = lib.mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; }; - cjdrouteConf = builtins.toJSON ( recursiveUpdate { + cjdrouteConf = builtins.toJSON ( lib.recursiveUpdate { admin = { bind = cfg.admin.bind; password = "@CJDNS_ADMIN_PASSWORD@"; @@ -84,8 +81,8 @@ in services.cjdns = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable the cjdns network encryption @@ -95,8 +92,8 @@ in ''; }; - extraConfig = mkOption { - type = types.attrs; + extraConfig = lib.mkOption { + type = lib.types.attrs; default = {}; example = { router.interface.tunDevice = "tun10"; }; description = '' @@ -105,8 +102,8 @@ in ''; }; - confFile = mkOption { - type = types.nullOr types.path; + confFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; example = "/etc/cjdroute.conf"; description = '' @@ -114,8 +111,8 @@ in ''; }; - authorizedPasswords = mkOption { - type = types.listOf types.str; + authorizedPasswords = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "snyrfgkqsc98qh1y4s5hbu0j57xw5s0" @@ -129,8 +126,8 @@ in }; admin = { - bind = mkOption { - type = types.str; + bind = lib.mkOption { + type = lib.types.str; default = "127.0.0.1:11234"; description = '' Bind the administration port to this address and port. @@ -139,18 +136,18 @@ in }; UDPInterface = { - bind = mkOption { - type = types.str; + bind = lib.mkOption { + type = lib.types.str; default = ""; example = "192.168.1.32:43211"; description = '' Address and port to bind UDP tunnels to. ''; }; - connectTo = mkOption { - type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); + connectTo = lib.mkOption { + type = lib.types.attrsOf ( lib.types.submodule ( connectToSubmodule ) ); default = { }; - example = literalExpression '' + example = lib.literalExpression '' { "192.168.1.1:27313" = { hostname = "homer.hype"; @@ -166,8 +163,8 @@ in }; ETHInterface = { - bind = mkOption { - type = types.str; + bind = lib.mkOption { + type = lib.types.str; default = ""; example = "eth0"; description = '' @@ -176,8 +173,8 @@ in ''; }; - beacon = mkOption { - type = types.int; + beacon = lib.mkOption { + type = lib.types.int; default = 2; description = '' Auto-connect to other cjdns nodes on the same network. @@ -193,10 +190,10 @@ in ''; }; - connectTo = mkOption { - type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); + connectTo = lib.mkOption { + type = lib.types.attrsOf ( lib.types.submodule ( connectToSubmodule ) ); default = { }; - example = literalExpression '' + example = lib.literalExpression '' { "01:02:03:04:05:06" = { hostname = "homer.hype"; @@ -212,8 +209,8 @@ in }; }; - addExtraHosts = mkOption { - type = types.bool; + addExtraHosts = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to add cjdns peers with an associated hostname to @@ -226,7 +223,7 @@ in }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { boot.kernelModules = [ "tun" ]; @@ -238,7 +235,7 @@ in after = [ "network-online.target" ]; bindsTo = [ "network-online.target" ]; - preStart = optionalString (cfg.confFile == null) '' + preStart = lib.optionalString (cfg.confFile == null) '' [ -e /etc/cjdns.keys ] && source /etc/cjdns.keys if [ -z "$CJDNS_PRIVATE_KEY" ]; then @@ -277,13 +274,13 @@ in CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID"; ProtectSystem = true; # Doesn't work on i686, causing service to fail - MemoryDenyWriteExecute = !pkgs.stdenv.isi686; + MemoryDenyWriteExecute = !pkgs.stdenv.hostPlatform.isi686; ProtectHome = true; PrivateTmp = true; }; }; - networking.hostFiles = mkIf cfg.addExtraHosts [ cjdnsExtraHosts ]; + networking.hostFiles = lib.mkIf cfg.addExtraHosts [ cjdnsExtraHosts ]; assertions = [ { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null ); diff --git a/nixos/modules/services/networking/clatd.nix b/nixos/modules/services/networking/clatd.nix index de6cde4e979c0..09f7fdfb6e9e9 100644 --- a/nixos/modules/services/networking/clatd.nix +++ b/nixos/modules/services/networking/clatd.nix @@ -1,6 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; let cfg = config.services.clatd; @@ -11,16 +9,16 @@ in { options = { services.clatd = { - enable = mkEnableOption "clatd"; + enable = lib.mkEnableOption "clatd"; - package = mkPackageOption pkgs "clatd" { }; + package = lib.mkPackageOption pkgs "clatd" { }; - settings = mkOption { - type = types.submodule ({ name, ... }: { + settings = lib.mkOption { + type = lib.types.submodule ({ name, ... }: { freeformType = settingsFormat.type; }); default = { }; - example = literalExpression '' + example = lib.literalExpression '' { plat-prefix = "64:ff9b::/96"; } @@ -32,7 +30,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.clatd = { description = "464XLAT CLAT daemon"; documentation = [ "man:clatd(8)" ]; diff --git a/nixos/modules/services/networking/cloudflare-dyndns.nix b/nixos/modules/services/networking/cloudflare-dyndns.nix index 9495c8dcaf810..0f035362742ef 100644 --- a/nixos/modules/services/networking/cloudflare-dyndns.nix +++ b/nixos/modules/services/networking/cloudflare-dyndns.nix @@ -1,19 +1,16 @@ { config, pkgs, lib, ... }: - -with lib; - let cfg = config.services.cloudflare-dyndns; in { options = { services.cloudflare-dyndns = { - enable = mkEnableOption "Cloudflare Dynamic DNS Client"; + enable = lib.mkEnableOption "Cloudflare Dynamic DNS Client"; - package = mkPackageOption pkgs "cloudflare-dyndns" { }; + package = lib.mkPackageOption pkgs "cloudflare-dyndns" { }; - apiTokenFile = mkOption { - type = types.nullOr types.str; + apiTokenFile = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' The path to a file containing the CloudFlare API token. @@ -22,16 +19,16 @@ in ''; }; - domains = mkOption { - type = types.listOf types.str; + domains = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; description = '' List of domain names to update records for. ''; }; - frequency = mkOption { - type = types.nullOr types.str; + frequency = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = "*:0/5"; description = '' Run cloudflare-dyndns with the given frequency (see @@ -40,32 +37,32 @@ in ''; }; - proxied = mkOption { - type = types.bool; + proxied = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether this is a DNS-only record, or also being proxied through CloudFlare. ''; }; - ipv4 = mkOption { - type = types.bool; + ipv4 = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable setting IPv4 A records. ''; }; - ipv6 = mkOption { - type = types.bool; + ipv6 = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable setting IPv6 AAAA records. ''; }; - deleteMissing = mkOption { - type = types.bool; + deleteMissing = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to delete the record when no IP address is found. @@ -74,7 +71,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.cloudflare-dyndns = { description = "CloudFlare Dynamic DNS Client"; after = [ "network.target" ]; @@ -94,12 +91,12 @@ in args = [ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ] ++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ]) ++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ]) - ++ optional cfg.deleteMissing "--delete-missing" - ++ optional cfg.proxied "--proxied"; + ++ lib.optional cfg.deleteMissing "--delete-missing" + ++ lib.optional cfg.proxied "--proxied"; in - "${getExe cfg.package} ${toString args}"; + "${lib.getExe cfg.package} ${toString args}"; }; - } // optionalAttrs (cfg.frequency != null) { + } // lib.optionalAttrs (cfg.frequency != null) { startAt = cfg.frequency; }; }; diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix index c0d1012ffb80d..7023e79d31f92 100644 --- a/nixos/modules/services/networking/cloudflared.nix +++ b/nixos/modules/services/networking/cloudflared.nix @@ -1,13 +1,10 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.cloudflared; originRequest = { - connectTimeout = mkOption { - type = with types; nullOr str; + connectTimeout = lib.mkOption { + type = with lib.types; nullOr str; default = null; example = "30s"; description = '' @@ -15,8 +12,8 @@ let ''; }; - tlsTimeout = mkOption { - type = with types; nullOr str; + tlsTimeout = lib.mkOption { + type = with lib.types; nullOr str; default = null; example = "10s"; description = '' @@ -24,8 +21,8 @@ let ''; }; - tcpKeepAlive = mkOption { - type = with types; nullOr str; + tcpKeepAlive = lib.mkOption { + type = with lib.types; nullOr str; default = null; example = "30s"; description = '' @@ -33,8 +30,8 @@ let ''; }; - noHappyEyeballs = mkOption { - type = with types; nullOr bool; + noHappyEyeballs = lib.mkOption { + type = with lib.types; nullOr bool; default = null; example = false; description = '' @@ -42,8 +39,8 @@ let ''; }; - keepAliveConnections = mkOption { - type = with types; nullOr int; + keepAliveConnections = lib.mkOption { + type = with lib.types; nullOr int; default = null; example = 100; description = '' @@ -51,8 +48,8 @@ let ''; }; - keepAliveTimeout = mkOption { - type = with types; nullOr str; + keepAliveTimeout = lib.mkOption { + type = with lib.types; nullOr str; default = null; example = "1m30s"; description = '' @@ -60,8 +57,8 @@ let ''; }; - httpHostHeader = mkOption { - type = with types; nullOr str; + httpHostHeader = lib.mkOption { + type = with lib.types; nullOr str; default = null; example = ""; description = '' @@ -69,8 +66,8 @@ let ''; }; - originServerName = mkOption { - type = with types; nullOr str; + originServerName = lib.mkOption { + type = with lib.types; nullOr str; default = null; example = ""; description = '' @@ -78,8 +75,8 @@ let ''; }; - caPool = mkOption { - type = with types; nullOr (either str path); + caPool = lib.mkOption { + type = with lib.types; nullOr (either str path); default = null; example = ""; description = '' @@ -87,8 +84,8 @@ let ''; }; - noTLSVerify = mkOption { - type = with types; nullOr bool; + noTLSVerify = lib.mkOption { + type = with lib.types; nullOr bool; default = null; example = false; description = '' @@ -96,8 +93,8 @@ let ''; }; - disableChunkedEncoding = mkOption { - type = with types; nullOr bool; + disableChunkedEncoding = lib.mkOption { + type = with lib.types; nullOr bool; default = null; example = false; description = '' @@ -105,8 +102,8 @@ let ''; }; - proxyAddress = mkOption { - type = with types; nullOr str; + proxyAddress = lib.mkOption { + type = with lib.types; nullOr str; default = null; example = "127.0.0.1"; description = '' @@ -114,8 +111,8 @@ let ''; }; - proxyPort = mkOption { - type = with types; nullOr int; + proxyPort = lib.mkOption { + type = with lib.types; nullOr int; default = null; example = 0; description = '' @@ -123,8 +120,8 @@ let ''; }; - proxyType = mkOption { - type = with types; nullOr (enum [ "" "socks" ]); + proxyType = lib.mkOption { + type = with lib.types; nullOr (enum [ "" "socks" ]); default = null; example = ""; description = '' @@ -138,32 +135,32 @@ let in { options.services.cloudflared = { - enable = mkEnableOption "Cloudflare Tunnel client daemon (formerly Argo Tunnel)"; + enable = lib.mkEnableOption "Cloudflare Tunnel client daemon (formerly Argo Tunnel)"; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "cloudflared"; description = "User account under which Cloudflared runs."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "cloudflared"; description = "Group under which cloudflared runs."; }; - package = mkPackageOption pkgs "cloudflared" { }; + package = lib.mkPackageOption pkgs "cloudflared" { }; - tunnels = mkOption { + tunnels = lib.mkOption { description = '' Cloudflare tunnels. ''; - type = types.attrsOf (types.submodule ({ name, ... }: { + type = lib.types.attrsOf (lib.types.submodule ({ name, ... }: { options = { inherit originRequest; - credentialsFile = mkOption { - type = types.str; + credentialsFile = lib.mkOption { + type = lib.types.str; description = '' Credential file. @@ -172,8 +169,8 @@ in }; warp-routing = { - enabled = mkOption { - type = with types; nullOr bool; + enabled = lib.mkOption { + type = with lib.types; nullOr bool; default = null; description = '' Enable warp routing. @@ -183,8 +180,8 @@ in }; }; - default = mkOption { - type = types.str; + default = lib.mkOption { + type = lib.types.str; description = '' Catch-all service if no ingress matches. @@ -193,13 +190,13 @@ in example = "http_status:404"; }; - ingress = mkOption { - type = with types; attrsOf (either str (submodule ({ hostname, ... }: { + ingress = lib.mkOption { + type = with lib.types; attrsOf (either str (submodule ({ hostname, ... }: { options = { inherit originRequest; - service = mkOption { - type = with types; nullOr str; + service = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' Service to pass the traffic. @@ -209,8 +206,8 @@ in example = "http://localhost:80, tcp://localhost:8000, unix:/home/production/echo.sock, hello_world or http_status:404"; }; - path = mkOption { - type = with types; nullOr str; + path = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' Path filter. @@ -251,11 +248,11 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.targets = - mapAttrs' + lib.mapAttrs' (name: tunnel: - nameValuePair "cloudflared-tunnel-${name}" { + lib.nameValuePair "cloudflared-tunnel-${name}" { description = "Cloudflare tunnel '${name}' target"; requires = [ "cloudflared-tunnel-${name}.service" ]; after = [ "cloudflared-tunnel-${name}.service" ]; @@ -265,13 +262,13 @@ in config.services.cloudflared.tunnels; systemd.services = - mapAttrs' + lib.mapAttrs' (name: tunnel: let filterConfig = lib.attrsets.filterAttrsRecursive (_: v: ! builtins.elem v [ null [ ] { } ]); - filterIngressSet = filterAttrs (_: v: builtins.typeOf v == "set"); - filterIngressStr = filterAttrs (_: v: builtins.typeOf v == "string"); + filterIngressSet = lib.filterAttrs (_: v: builtins.typeOf v == "set"); + filterIngressStr = lib.filterAttrs (_: v: builtins.typeOf v == "string"); ingressesSet = filterIngressSet tunnel.ingress; ingressesStr = filterIngressStr tunnel.ingress; @@ -285,21 +282,21 @@ in (map (key: { hostname = key; - } // getAttr key (filterConfig (filterConfig ingressesSet))) - (attrNames ingressesSet)) + } // lib.getAttr key (filterConfig (filterConfig ingressesSet))) + (lib.attrNames ingressesSet)) ++ (map (key: { hostname = key; - service = getAttr key ingressesStr; + service = lib.getAttr key ingressesStr; }) - (attrNames ingressesStr)) + (lib.attrNames ingressesStr)) ++ [{ service = tunnel.default; }]; }; mkConfigFile = pkgs.writeText "cloudflared.yml" (builtins.toJSON fullConfig); in - nameValuePair "cloudflared-tunnel-${name}" ({ + lib.nameValuePair "cloudflared-tunnel-${name}" ({ after = [ "network.target" "network-online.target" ]; wants = [ "network.target" "network-online.target" ]; wantedBy = [ "multi-user.target" ]; @@ -313,17 +310,17 @@ in ) config.services.cloudflared.tunnels; - users.users = mkIf (cfg.user == "cloudflared") { + users.users = lib.mkIf (cfg.user == "cloudflared") { cloudflared = { group = cfg.group; isSystemUser = true; }; }; - users.groups = mkIf (cfg.group == "cloudflared") { + users.groups = lib.mkIf (cfg.group == "cloudflared") { cloudflared = { }; }; }; - meta.maintainers = with maintainers; [ bbigras anpin ]; + meta.maintainers = with lib.maintainers; [ bbigras anpin ]; } diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index 16e9c3bb87b5c..4615380c41ebe 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.cntlm; @@ -16,11 +13,11 @@ let Username ${cfg.username} Domain ${cfg.domain} Password ${cfg.password} - ${optionalString (cfg.netbios_hostname != "") "Workstation ${cfg.netbios_hostname}"} - ${concatMapStrings (entry: "Proxy ${entry}\n") cfg.proxy} - ${optionalString (cfg.noproxy != []) "NoProxy ${concatStringsSep ", " cfg.noproxy}"} + ${lib.optionalString (cfg.netbios_hostname != "") "Workstation ${cfg.netbios_hostname}"} + ${lib.concatMapStrings (entry: "Proxy ${entry}\n") cfg.proxy} + ${lib.optionalString (cfg.noproxy != []) "NoProxy ${lib.concatStringsSep ", " cfg.noproxy}"} - ${concatMapStrings (port: '' + ${lib.concatMapStrings (port: '' Listen ${toString port} '') cfg.port} @@ -33,36 +30,36 @@ in options.services.cntlm = { - enable = mkEnableOption "cntlm, which starts a local proxy"; + enable = lib.mkEnableOption "cntlm, which starts a local proxy"; - username = mkOption { - type = types.str; + username = lib.mkOption { + type = lib.types.str; description = '' Proxy account name, without the possibility to include domain name ('at' sign is interpreted literally). ''; }; - domain = mkOption { - type = types.str; + domain = lib.mkOption { + type = lib.types.str; description = "Proxy account domain/workgroup name."; }; - password = mkOption { + password = lib.mkOption { default = "/etc/cntlm.password"; - type = types.str; + type = lib.types.str; description = "Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security."; }; - netbios_hostname = mkOption { - type = types.str; + netbios_hostname = lib.mkOption { + type = lib.types.str; default = ""; description = '' The hostname of your machine. ''; }; - proxy = mkOption { - type = types.listOf types.str; + proxy = lib.mkOption { + type = lib.types.listOf lib.types.str; description = '' A list of NTLM/NTLMv2 authenticating HTTP proxies. @@ -73,29 +70,29 @@ in example = [ "proxy.example.com:81" ]; }; - noproxy = mkOption { + noproxy = lib.mkOption { description = '' A list of domains where the proxy is skipped. ''; default = []; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; example = [ "*.example.com" "example.com" ]; }; - port = mkOption { + port = lib.mkOption { default = [3128]; - type = types.listOf types.port; + type = lib.types.listOf lib.types.port; description = "Specifies on which ports the cntlm daemon listens."; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = "Additional config appended to the end of the generated {file}`cntlm.conf`."; }; - configText = mkOption { - type = types.lines; + configText = lib.mkOption { + type = lib.types.lines; default = ""; description = "Verbatim contents of {file}`cntlm.conf`."; }; @@ -104,7 +101,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.cntlm = { description = "CNTLM is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy"; after = [ "network.target" ]; diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 2d9b10514a722..855d3872aa62e 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -1,6 +1,4 @@ { config, lib, pkgs, utils, ... }: - -with lib; let dataDir = "/var/lib/consul"; @@ -16,8 +14,8 @@ let configFiles = [ "/etc/consul.json" "/etc/consul-addrs.json" ] ++ cfg.extraConfigFiles; - devices = attrValues (filterAttrs (_: i: i != null) cfg.interface); - systemdDevices = forEach devices + devices = lib.attrValues (lib.filterAttrs (_: i: i != null) cfg.interface); + systemdDevices = lib.forEach devices (i: "sys-subsystem-net-devices-${utils.escapeSystemdPath i}.device"); in { @@ -25,26 +23,26 @@ in services.consul = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enables the consul daemon. ''; }; - package = mkPackageOption pkgs "consul" { }; + package = lib.mkPackageOption pkgs "consul" { }; - webUi = mkOption { - type = types.bool; + webUi = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enables the web interface on the consul http port. ''; }; - leaveOnStop = mkOption { - type = types.bool; + leaveOnStop = lib.mkOption { + type = lib.types.bool; default = false; description = '' If enabled, causes a leave action to be sent when closing consul. @@ -57,16 +55,16 @@ in interface = { - advertise = mkOption { - type = types.nullOr types.str; + advertise = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' The name of the interface to pull the advertise_addr from. ''; }; - bind = mkOption { - type = types.nullOr types.str; + bind = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' The name of the interface to pull the bind_addr from. @@ -74,16 +72,16 @@ in }; }; - forceAddrFamily = mkOption { - type = types.enum [ "any" "ipv4" "ipv6" ]; + forceAddrFamily = lib.mkOption { + type = lib.types.enum [ "any" "ipv4" "ipv6" ]; default = "any"; description = '' Whether to bind ipv4/ipv6 or both kind of addresses. ''; }; - forceIpv4 = mkOption { - type = types.nullOr types.bool; + forceIpv4 = lib.mkOption { + type = lib.types.nullOr lib.types.bool; default = null; description = '' Deprecated: Use consul.forceAddrFamily instead. @@ -91,26 +89,26 @@ in ''; }; - dropPrivileges = mkOption { - type = types.bool; + dropPrivileges = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether the consul agent should be run as a non-root consul user. ''; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { default = { }; - type = types.attrsOf types.anything; + type = lib.types.attrsOf lib.types.anything; description = '' Extra configuration options which are serialized to json and added to the config.json file. ''; }; - extraConfigFiles = mkOption { + extraConfigFiles = lib.mkOption { default = [ ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = '' Additional configuration files to pass to consul NOTE: These will not trigger the service to be restarted when altered. @@ -118,32 +116,32 @@ in }; alerts = { - enable = mkEnableOption "consul-alerts"; + enable = lib.mkEnableOption "consul-alerts"; - package = mkPackageOption pkgs "consul-alerts" { }; + package = lib.mkPackageOption pkgs "consul-alerts" { }; - listenAddr = mkOption { + listenAddr = lib.mkOption { description = "Api listening address."; default = "localhost:9000"; - type = types.str; + type = lib.types.str; }; - consulAddr = mkOption { + consulAddr = lib.mkOption { description = "Consul api listening address"; default = "localhost:8500"; - type = types.str; + type = lib.types.str; }; - watchChecks = mkOption { + watchChecks = lib.mkOption { description = "Whether to enable check watcher."; default = true; - type = types.bool; + type = lib.types.bool; }; - watchEvents = mkOption { + watchEvents = lib.mkOption { description = "Whether to enable event watcher."; default = true; - type = types.bool; + type = lib.types.bool; }; }; @@ -151,8 +149,8 @@ in }; - config = mkIf cfg.enable ( - mkMerge [{ + config = lib.mkIf cfg.enable ( + lib.mkMerge [{ users.users.consul = { description = "Consul agent daemon user"; @@ -182,18 +180,18 @@ in after = [ "network.target" ] ++ systemdDevices; bindsTo = systemdDevices; restartTriggers = [ config.environment.etc."consul.json".source ] - ++ mapAttrsToList (_: d: d.source) - (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc); + ++ lib.mapAttrsToList (_: d: d.source) + (lib.filterAttrs (n: _: lib.hasPrefix "consul.d/" n) config.environment.etc); serviceConfig = { ExecStart = "@${lib.getExe cfg.package} consul agent -config-dir /etc/consul.d" - + concatMapStrings (n: " -config-file ${n}") configFiles; + + lib.concatMapStrings (n: " -config-file ${n}") configFiles; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; PermissionsStartOnly = true; User = if cfg.dropPrivileges then "consul" else null; Restart = "on-failure"; TimeoutStartSec = "infinity"; - } // (optionalAttrs (cfg.leaveOnStop) { + } // (lib.optionalAttrs (cfg.leaveOnStop) { ExecStop = "${lib.getExe cfg.package} leave"; }); @@ -231,8 +229,8 @@ in echo "{" > /etc/consul-addrs.json delim=" " '' - + concatStrings (flip mapAttrsToList cfg.interface (name: i: - optionalString (i != null) '' + + lib.concatStrings (lib.flip lib.mapAttrsToList cfg.interface (name: i: + lib.optionalString (i != null) '' echo "$delim \"${name}_addr\": \"$(getAddr "${i}")\"" >> /etc/consul-addrs.json delim="," '')) @@ -243,11 +241,11 @@ in } # deprecated - (mkIf (cfg.forceIpv4 != null && cfg.forceIpv4) { + (lib.mkIf (cfg.forceIpv4 != null && cfg.forceIpv4) { services.consul.forceAddrFamily = "ipv4"; }) - (mkIf (cfg.alerts.enable) { + (lib.mkIf (cfg.alerts.enable) { systemd.services.consul-alerts = { wantedBy = [ "multi-user.target" ]; after = [ "consul.service" ]; @@ -259,8 +257,8 @@ in ${lib.getExe cfg.alerts.package} start \ --alert-addr=${cfg.alerts.listenAddr} \ --consul-addr=${cfg.alerts.consulAddr} \ - ${optionalString cfg.alerts.watchChecks "--watch-checks"} \ - ${optionalString cfg.alerts.watchEvents "--watch-events"} + ${lib.optionalString cfg.alerts.watchChecks "--watch-checks"} \ + ${lib.optionalString cfg.alerts.watchEvents "--watch-events"} ''; User = if cfg.dropPrivileges then "consul" else null; Restart = "on-failure"; diff --git a/nixos/modules/services/networking/coredns.nix b/nixos/modules/services/networking/coredns.nix index 370b9e6e8043f..14602e06fe820 100644 --- a/nixos/modules/services/networking/coredns.nix +++ b/nixos/modules/services/networking/coredns.nix @@ -1,39 +1,36 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.coredns; configFile = pkgs.writeText "Corefile" cfg.config; in { options.services.coredns = { - enable = mkEnableOption "Coredns dns server"; + enable = lib.mkEnableOption "Coredns dns server"; - config = mkOption { + config = lib.mkOption { default = ""; example = '' . { whoami } ''; - type = types.lines; + type = lib.types.lines; description = '' Verbatim Corefile to use. See for details. ''; }; - package = mkPackageOption pkgs "coredns" { }; + package = lib.mkPackageOption pkgs "coredns" { }; - extraArgs = mkOption { + extraArgs = lib.mkOption { default = []; example = [ "-dns.port=53" ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = "Extra arguments to pass to coredns."; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.coredns = { description = "Coredns dns server"; after = [ "network.target" ]; @@ -46,7 +43,7 @@ in { AmbientCapabilities = "cap_net_bind_service"; NoNewPrivileges = true; DynamicUser = true; - ExecStart = "${getBin cfg.package}/bin/coredns -conf=${configFile} ${lib.escapeShellArgs cfg.extraArgs}"; + ExecStart = "${lib.getBin cfg.package}/bin/coredns -conf=${configFile} ${lib.escapeShellArgs cfg.extraArgs}"; ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR1 $MAINPID"; Restart = "on-failure"; }; diff --git a/nixos/modules/services/networking/corerad.nix b/nixos/modules/services/networking/corerad.nix index 2203aa30c1613..edeee881008fc 100644 --- a/nixos/modules/services/networking/corerad.nix +++ b/nixos/modules/services/networking/corerad.nix @@ -1,20 +1,17 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.corerad; settingsFormat = pkgs.formats.toml {}; in { - meta.maintainers = with maintainers; [ mdlayher ]; + meta.maintainers = with lib.maintainers; [ mdlayher ]; options.services.corerad = { - enable = mkEnableOption "CoreRAD IPv6 NDP RA daemon"; + enable = lib.mkEnableOption "CoreRAD IPv6 NDP RA daemon"; - settings = mkOption { + settings = lib.mkOption { type = settingsFormat.type; - example = literalExpression '' + example = lib.literalExpression '' { interfaces = [ # eth0 is an upstream interface monitoring for IPv6 router advertisements. @@ -42,18 +39,18 @@ in { ''; }; - configFile = mkOption { - type = types.path; - example = literalExpression ''"''${pkgs.corerad}/etc/corerad/corerad.toml"''; + configFile = lib.mkOption { + type = lib.types.path; + example = lib.literalExpression ''"''${pkgs.corerad}/etc/corerad/corerad.toml"''; description = "Path to CoreRAD TOML configuration file."; }; - package = mkPackageOption pkgs "corerad" { }; + package = lib.mkPackageOption pkgs "corerad" { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # Prefer the config file over settings if both are set. - services.corerad.configFile = mkDefault (settingsFormat.generate "corerad.toml" cfg.settings); + services.corerad.configFile = lib.mkDefault (settingsFormat.generate "corerad.toml" cfg.settings); systemd.services.corerad = { description = "CoreRAD IPv6 NDP RA daemon"; @@ -68,7 +65,7 @@ in { DynamicUser = true; Type = "notify"; NotifyAccess = "main"; - ExecStart = "${getBin cfg.package}/bin/corerad -c=${cfg.configFile}"; + ExecStart = "${lib.getBin cfg.package}/bin/corerad -c=${cfg.configFile}"; Restart = "on-failure"; RestartKillSignal = "SIGHUP"; }; diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index 3166c0dfb578d..40c157d1006e3 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.services.coturn; pidfile = "/run/turnserver/turnserver.pid"; @@ -8,8 +7,8 @@ listening-port=${toString cfg.listening-port} tls-listening-port=${toString cfg.tls-listening-port} alt-listening-port=${toString cfg.alt-listening-port} alt-tls-listening-port=${toString cfg.alt-tls-listening-port} -${concatStringsSep "\n" (map (x: "listening-ip=${x}") cfg.listening-ips)} -${concatStringsSep "\n" (map (x: "relay-ip=${x}") cfg.relay-ips)} +${lib.concatStringsSep "\n" (map (x: "listening-ip=${x}") cfg.listening-ips)} +${lib.concatStringsSep "\n" (map (x: "relay-ip=${x}") cfg.relay-ips)} min-port=${toString cfg.min-port} max-port=${toString cfg.max-port} ${lib.optionalString cfg.lt-cred-mech "lt-cred-mech"} @@ -40,9 +39,9 @@ ${cfg.extraConfig} in { options = { services.coturn = { - enable = mkEnableOption "coturn TURN server"; - listening-port = mkOption { - type = types.int; + enable = lib.mkEnableOption "coturn TURN server"; + listening-port = lib.mkOption { + type = lib.types.int; default = 3478; description = '' TURN listener port for UDP and TCP. @@ -50,8 +49,8 @@ in { "plain" TCP and UDP port(s), too - if allowed by configuration. ''; }; - tls-listening-port = mkOption { - type = types.int; + tls-listening-port = lib.mkOption { + type = lib.types.int; default = 5349; description = '' TURN listener port for TLS. @@ -65,10 +64,10 @@ in { For secure UDP connections, we support DTLS version 1. ''; }; - alt-listening-port = mkOption { - type = types.int; + alt-listening-port = lib.mkOption { + type = lib.types.int; default = cfg.listening-port + 1; - defaultText = literalExpression "listening-port + 1"; + defaultText = lib.literalExpression "listening-port + 1"; description = '' Alternative listening port for UDP and TCP listeners; default (or zero) value means "listening port plus one". @@ -80,16 +79,16 @@ in { are listening to that endpoint only for "symmetry". ''; }; - alt-tls-listening-port = mkOption { - type = types.int; + alt-tls-listening-port = lib.mkOption { + type = lib.types.int; default = cfg.tls-listening-port + 1; - defaultText = literalExpression "tls-listening-port + 1"; + defaultText = lib.literalExpression "tls-listening-port + 1"; description = '' Alternative listening port for TLS and DTLS protocols. ''; }; - listening-ips = mkOption { - type = types.listOf types.str; + listening-ips = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "203.0.113.42" "2001:DB8::42" ]; description = '' @@ -98,8 +97,8 @@ in { then all IPv4 and IPv6 system IPs will be used for listening. ''; }; - relay-ips = mkOption { - type = types.listOf types.str; + relay-ips = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "203.0.113.42" "2001:DB8::42" ]; description = '' @@ -115,29 +114,29 @@ in { as the family of the client socket). ''; }; - min-port = mkOption { - type = types.int; + min-port = lib.mkOption { + type = lib.types.int; default = 49152; description = '' Lower bound of UDP relay endpoints ''; }; - max-port = mkOption { - type = types.int; + max-port = lib.mkOption { + type = lib.types.int; default = 65535; description = '' Upper bound of UDP relay endpoints ''; }; - lt-cred-mech = mkOption { - type = types.bool; + lt-cred-mech = lib.mkOption { + type = lib.types.bool; default = false; description = '' Use long-term credential mechanism. ''; }; - no-auth = mkOption { - type = types.bool; + no-auth = lib.mkOption { + type = lib.types.bool; default = false; description = '' This option is opposite to lt-cred-mech. @@ -148,8 +147,8 @@ in { lt-cred-mech is default. ''; }; - use-auth-secret = mkOption { - type = types.bool; + use-auth-secret = lib.mkOption { + type = lib.types.bool; default = false; description = '' TURN REST API flag. @@ -172,8 +171,8 @@ in { or can be found in the turn_secret table in the database. ''; }; - static-auth-secret = mkOption { - type = types.nullOr types.str; + static-auth-secret = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' 'Static' authentication secret value (a string) for TURN REST API only. @@ -183,17 +182,17 @@ in { by a separate program, so this is why that other mode is 'dynamic'. ''; }; - static-auth-secret-file = mkOption { - type = types.nullOr types.str; + static-auth-secret-file = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' Path to the file containing the static authentication secret. ''; }; - realm = mkOption { - type = types.str; + realm = lib.mkOption { + type = lib.types.str; default = config.networking.hostName; - defaultText = literalExpression "config.networking.hostName"; + defaultText = lib.literalExpression "config.networking.hostName"; example = "example.com"; description = '' The default realm to be used for the users when no explicit @@ -203,60 +202,60 @@ in { mechanism or with TURN REST API. ''; }; - cert = mkOption { - type = types.nullOr types.str; + cert = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "/var/lib/acme/example.com/fullchain.pem"; description = '' Certificate file in PEM format. ''; }; - pkey = mkOption { - type = types.nullOr types.str; + pkey = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "/var/lib/acme/example.com/key.pem"; description = '' Private key file in PEM format. ''; }; - dh-file = mkOption { - type = types.nullOr types.str; + dh-file = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' Use custom DH TLS key, stored in PEM format in the file. ''; }; - secure-stun = mkOption { - type = types.bool; + secure-stun = lib.mkOption { + type = lib.types.bool; default = false; description = '' Require authentication of the STUN Binding request. By default, the clients are allowed anonymous access to the STUN Binding functionality. ''; }; - no-cli = mkOption { - type = types.bool; + no-cli = lib.mkOption { + type = lib.types.bool; default = false; description = '' Turn OFF the CLI support. ''; }; - cli-ip = mkOption { - type = types.str; + cli-ip = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = '' Local system IP address to be used for CLI server endpoint. ''; }; - cli-port = mkOption { - type = types.int; + cli-port = lib.mkOption { + type = lib.types.int; default = 5766; description = '' CLI server port. ''; }; - cli-password = mkOption { - type = types.nullOr types.str; + cli-password = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' CLI access password. @@ -264,45 +263,45 @@ in { for of the password (see the -P command in the turnadmin utility). ''; }; - no-udp = mkOption { - type = types.bool; + no-udp = lib.mkOption { + type = lib.types.bool; default = false; description = "Disable UDP client listener"; }; - no-tcp = mkOption { - type = types.bool; + no-tcp = lib.mkOption { + type = lib.types.bool; default = false; description = "Disable TCP client listener"; }; - no-tls = mkOption { - type = types.bool; + no-tls = lib.mkOption { + type = lib.types.bool; default = false; description = "Disable TLS client listener"; }; - no-dtls = mkOption { - type = types.bool; + no-dtls = lib.mkOption { + type = lib.types.bool; default = false; description = "Disable DTLS client listener"; }; - no-udp-relay = mkOption { - type = types.bool; + no-udp-relay = lib.mkOption { + type = lib.types.bool; default = false; description = "Disable UDP relay endpoints"; }; - no-tcp-relay = mkOption { - type = types.bool; + no-tcp-relay = lib.mkOption { + type = lib.types.bool; default = false; description = "Disable TCP relay endpoints"; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = "Additional configuration options"; }; }; }; - config = mkIf cfg.enable (mkMerge ([ + config = lib.mkIf cfg.enable (lib.mkMerge ([ { assertions = [ { assertion = cfg.static-auth-secret != null -> cfg.static-auth-secret-file == null ; message = "static-auth-secret and static-auth-secret-file cannot be set at the same time"; @@ -334,7 +333,7 @@ in { preStart = '' cat ${configFile} > ${runConfig} - ${optionalString (cfg.static-auth-secret-file != null) '' + ${lib.optionalString (cfg.static-auth-secret-file != null) '' ${pkgs.replace-secret}/bin/replace-secret \ "#static-auth-secret#" \ ${cfg.static-auth-secret-file} \ @@ -349,7 +348,7 @@ in { User = "turnserver"; Group = "turnserver"; AmbientCapabilities = - mkIf ( + lib.mkIf ( cfg.listening-port < 1024 || cfg.alt-listening-port < 1024 || cfg.tls-listening-port < 1024 || diff --git a/nixos/modules/services/networking/create_ap.nix b/nixos/modules/services/networking/create_ap.nix index 9bdbcee018edc..cebea3c9059cc 100644 --- a/nixos/modules/services/networking/create_ap.nix +++ b/nixos/modules/services/networking/create_ap.nix @@ -1,16 +1,13 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.create_ap; - configFile = pkgs.writeText "create_ap.conf" (generators.toKeyValue { } cfg.settings); + configFile = pkgs.writeText "create_ap.conf" (lib.generators.toKeyValue { } cfg.settings); in { options = { services.create_ap = { - enable = mkEnableOption "setting up wifi hotspots using create_ap"; - settings = mkOption { - type = with types; attrsOf (oneOf [ int bool str ]); + enable = lib.mkEnableOption "setting up wifi hotspots using create_ap"; + settings = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ int bool str ]); default = {}; description = '' Configuration for `create_ap`. @@ -27,7 +24,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd = { services.create_ap = { diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix index d5e76b83986b0..aef518ddbfd97 100644 --- a/nixos/modules/services/networking/dante.nix +++ b/nixos/modules/services/networking/dante.nix @@ -1,6 +1,4 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.services.dante; confFile = pkgs.writeText "dante-sockd.conf" '' @@ -14,15 +12,15 @@ in { meta = { - maintainers = with maintainers; [ arobyn ]; + maintainers = with lib.maintainers; [ arobyn ]; }; options = { services.dante = { - enable = mkEnableOption "Dante SOCKS proxy"; + enable = lib.mkEnableOption "Dante SOCKS proxy"; - config = mkOption { - type = types.lines; + config = lib.mkOption { + type = lib.types.lines; description = '' Contents of Dante's configuration file. NOTE: user.privileged, user.unprivileged and logoutput are set by the service. @@ -31,7 +29,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = cfg.config != ""; message = "please provide Dante configuration file contents"; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 272a50eb92de8..da76ff5153d6c 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -1,5 +1,4 @@ { config, pkgs, lib, ... }: - let cfg = config.services.ddclient; boolToStr = bool: if bool then "yes" else "no"; @@ -39,21 +38,17 @@ let sed -i '/^password=@password_placeholder@$/d' /run/${RuntimeDirectory}/ddclient.conf '')} ''; - in - -with lib; - { imports = [ - (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ] + (lib.mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ] (config: - let value = getAttrFromPath [ "services" "ddclient" "domain" ] config; - in optional (value != "") value)) - (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "") - (mkRemovedOptionModule [ "services" "ddclient" "password" ] "Use services.ddclient.passwordFile instead.") - (mkRemovedOptionModule [ "services" "ddclient" "ipv6" ] "") + let value = lib.getAttrFromPath [ "services" "ddclient" "domain" ] config; + in lib.optional (value != "") value)) + (lib.mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "") + (lib.mkRemovedOptionModule [ "services" "ddclient" "password" ] "Use services.ddclient.passwordFile instead.") + (lib.mkRemovedOptionModule [ "services" "ddclient" "ipv6" ] "") ]; ###### interface @@ -62,7 +57,7 @@ with lib; services.ddclient = with lib.types; { - enable = mkOption { + enable = lib.mkOption { default = false; type = bool; description = '' @@ -70,7 +65,7 @@ with lib; ''; }; - package = mkOption { + package = lib.mkOption { type = package; default = pkgs.ddclient; defaultText = lib.literalExpression "pkgs.ddclient"; @@ -79,7 +74,7 @@ with lib; ''; }; - domains = mkOption { + domains = lib.mkOption { default = [ "" ]; type = listOf str; description = '' @@ -87,7 +82,7 @@ with lib; ''; }; - username = mkOption { + username = lib.mkOption { # For `nsupdate` username contains the path to the nsupdate executable default = lib.optionalString (config.services.ddclient.protocol == "nsupdate") "${pkgs.bind.dnsutils}/bin/nsupdate"; defaultText = ""; @@ -97,7 +92,7 @@ with lib; ''; }; - passwordFile = mkOption { + passwordFile = lib.mkOption { default = null; type = nullOr str; description = '' @@ -105,7 +100,7 @@ with lib; ''; }; - interval = mkOption { + interval = lib.mkOption { default = "10min"; type = str; description = '' @@ -114,7 +109,7 @@ with lib; ''; }; - configFile = mkOption { + configFile = lib.mkOption { default = null; type = nullOr path; description = '' @@ -124,7 +119,7 @@ with lib; example = "/root/nixos/secrets/ddclient.conf"; }; - protocol = mkOption { + protocol = lib.mkOption { default = "dyndns2"; type = str; description = '' @@ -132,7 +127,7 @@ with lib; ''; }; - server = mkOption { + server = lib.mkOption { default = ""; type = str; description = '' @@ -140,7 +135,7 @@ with lib; ''; }; - ssl = mkOption { + ssl = lib.mkOption { default = true; type = bool; description = '' @@ -148,7 +143,7 @@ with lib; ''; }; - quiet = mkOption { + quiet = lib.mkOption { default = false; type = bool; description = '' @@ -156,7 +151,7 @@ with lib; ''; }; - script = mkOption { + script = lib.mkOption { default = ""; type = str; description = '' @@ -164,21 +159,21 @@ with lib; ''; }; - use = mkOption { + use = lib.mkOption { default = ""; type = str; description = '' Method to determine the IP address to send to the dynamic DNS provider. ''; }; - usev4 = mkOption { + usev4 = lib.mkOption { default = "webv4, webv4=checkip.dyndns.com/, webv4-skip='Current IP Address: '"; type = str; description = '' Method to determine the IPv4 address to send to the dynamic DNS provider. Only used if `use` is not set. ''; }; - usev6 = mkOption { + usev6 = lib.mkOption { default = "webv6, webv6=checkipv6.dyndns.com/, webv6-skip='Current IP Address: '"; type = str; description = '' @@ -186,7 +181,7 @@ with lib; ''; }; - verbose = mkOption { + verbose = lib.mkOption { default = false; type = bool; description = '' @@ -194,7 +189,7 @@ with lib; ''; }; - zone = mkOption { + zone = lib.mkOption { default = ""; type = str; description = '' @@ -202,7 +197,7 @@ with lib; ''; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { default = ""; type = lines; description = '' @@ -219,14 +214,14 @@ with lib; ###### implementation - config = mkIf config.services.ddclient.enable { + config = lib.mkIf config.services.ddclient.enable { warnings = lib.optional (cfg.use != "") "Setting `use` is deprecated, ddclient now supports `usev4` and `usev6` for separate IPv4/IPv6 configuration."; systemd.services.ddclient = { description = "Dynamic DNS Client"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - restartTriggers = optional (cfg.configFile != null) cfg.configFile; + restartTriggers = lib.optional (cfg.configFile != null) cfg.configFile; path = lib.optional (lib.hasPrefix "if," cfg.use) pkgs.iproute2; serviceConfig = { diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index a88ce0f1b5a5b..9b3269e965f5b 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -1,28 +1,25 @@ { config, lib, pkgs, ... }: - -with lib; - let dhcpcd = if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd.override { udev = null; }; cfg = config.networking.dhcpcd; - interfaces = attrValues config.networking.interfaces; + interfaces = lib.attrValues config.networking.interfaces; enableDHCP = config.networking.dhcpcd.enable && - (config.networking.useDHCP || any (i: i.useDHCP == true) interfaces); + (config.networking.useDHCP || lib.any (i: i.useDHCP == true) interfaces); enableNTPService = (config.services.ntp.enable || config.services.ntpd-rs.enable || config.services.openntpd.enable || config.services.chrony.enable); # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge, bond or sit device. ignoredInterfaces = - map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) interfaces) - ++ mapAttrsToList (i: _: i) config.networking.sits - ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)) - ++ flatten (concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues config.networking.vswitches)) - ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds)) + map (i: i.name) (lib.filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) interfaces) + ++ lib.mapAttrsToList (i: _: i) config.networking.sits + ++ lib.concatLists (lib.attrValues (lib.mapAttrs (n: v: v.interfaces) config.networking.bridges)) + ++ lib.flatten (lib.concatMap (i: lib.attrNames (lib.filterAttrs (_: config: config.type != "internal") i.interfaces)) (lib.attrValues config.networking.vswitches)) + ++ lib.concatLists (lib.attrValues (lib.mapAttrs (n: v: v.interfaces) config.networking.bonds)) ++ config.networking.dhcpcd.denyInterfaces; arrayAppendOrNull = a1: a2: if a1 == null && a2 == null then null @@ -33,11 +30,11 @@ let # we need to provide dhcp just for those interfaces. allowInterfaces = arrayAppendOrNull cfg.allowInterfaces (if !config.networking.useDHCP && enableDHCP then - map (i: i.name) (filter (i: i.useDHCP == true) interfaces) else null); + map (i: i.name) (lib.filter (i: i.useDHCP == true) interfaces) else null); - staticIPv6Addresses = map (i: i.name) (filter (i: i.ipv6.addresses != [ ]) interfaces); + staticIPv6Addresses = map (i: i.name) (lib.filter (i: i.ipv6.addresses != [ ]) interfaces); - noIPv6rs = concatStringsSep "\n" (map (name: '' + noIPv6rs = lib.concatStringsSep "\n" (map (name: '' interface ${name} noipv6rs '') staticIPv6Addresses); @@ -66,7 +63,7 @@ let denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet* sit* # Use the list of allowed interfaces if specified - ${optionalString (allowInterfaces != null) "allowinterfaces ${toString allowInterfaces}"} + ${lib.optionalString (allowInterfaces != null) "allowinterfaces ${toString allowInterfaces}"} # Immediately fork to background if specified, otherwise wait for IP address to be assigned ${{ @@ -78,13 +75,13 @@ let if-carrier-up = ""; }.${cfg.wait}} - ${optionalString (config.networking.enableIPv6 == false) '' + ${lib.optionalString (config.networking.enableIPv6 == false) '' # Don't solicit or accept IPv6 Router Advertisements and DHCPv6 if disabled IPv6 noipv6 ''} - ${optionalString (config.networking.enableIPv6 && cfg.IPv6rs == null && staticIPv6Addresses != [ ]) noIPv6rs} - ${optionalString (config.networking.enableIPv6 && cfg.IPv6rs == false) '' + ${lib.optionalString (config.networking.enableIPv6 && cfg.IPv6rs == null && staticIPv6Addresses != [ ]) noIPv6rs} + ${lib.optionalString (config.networking.enableIPv6 && cfg.IPv6rs == false) '' noipv6rs ''} @@ -92,16 +89,16 @@ let ''; exitHook = pkgs.writeText "dhcpcd.exit-hook" '' - ${optionalString enableNTPService '' + ${lib.optionalString enableNTPService '' if [ "$reason" = BOUND -o "$reason" = REBOOT ]; then # Restart ntpd. We need to restart it to make sure that it will actually do something: # if ntpd cannot resolve the server hostnames in its config file, then it will never do # anything ever again ("couldn't resolve ..., giving up on it"), so we silently lose # time synchronisation. This also applies to openntpd. - ${optionalString config.services.ntp.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart ntpd.service || true"} - ${optionalString config.services.ntpd-rs.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart ntpd-rs.service || true"} - ${optionalString config.services.openntpd.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart openntpd.service || true"} - ${optionalString config.services.chrony.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart chronyd.service || true"} + ${lib.optionalString config.services.ntp.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart ntpd.service || true"} + ${lib.optionalString config.services.ntpd-rs.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart ntpd-rs.service || true"} + ${lib.optionalString config.services.openntpd.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart openntpd.service || true"} + ${lib.optionalString config.services.chrony.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart chronyd.service || true"} fi ''} @@ -116,8 +113,8 @@ in options = { - networking.dhcpcd.enable = mkOption { - type = types.bool; + networking.dhcpcd.enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable dhcpcd for device configuration. This is mainly to @@ -125,8 +122,8 @@ in ''; }; - networking.dhcpcd.persistent = mkOption { - type = types.bool; + networking.dhcpcd.persistent = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whenever to leave interfaces configured on dhcpcd daemon @@ -137,8 +134,8 @@ in ''; }; - networking.dhcpcd.denyInterfaces = mkOption { - type = types.listOf types.str; + networking.dhcpcd.denyInterfaces = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = '' Disable the DHCP client for any interface whose name matches @@ -148,8 +145,8 @@ in ''; }; - networking.dhcpcd.allowInterfaces = mkOption { - type = types.nullOr (types.listOf types.str); + networking.dhcpcd.allowInterfaces = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = null; description = '' Enable the DHCP client for any interface whose name matches @@ -159,16 +156,16 @@ in ''; }; - networking.dhcpcd.extraConfig = mkOption { - type = types.lines; + networking.dhcpcd.extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Literal string to append to the config file generated for dhcpcd. ''; }; - networking.dhcpcd.IPv6rs = mkOption { - type = types.nullOr types.bool; + networking.dhcpcd.IPv6rs = lib.mkOption { + type = lib.types.nullOr lib.types.bool; default = null; description = '' Force enable or disable solicitation and receipt of IPv6 Router Advertisements. @@ -177,8 +174,8 @@ in ''; }; - networking.dhcpcd.runHook = mkOption { - type = types.lines; + networking.dhcpcd.runHook = lib.mkOption { + type = lib.types.lines; default = ""; example = "if [[ $reason =~ BOUND ]]; then echo $interface: Routers are $new_routers - were $old_routers; fi"; description = '' @@ -187,8 +184,8 @@ in ''; }; - networking.dhcpcd.wait = mkOption { - type = types.enum [ "background" "any" "ipv4" "ipv6" "both" "if-carrier-up" ]; + networking.dhcpcd.wait = lib.mkOption { + type = lib.types.enum [ "background" "any" "ipv4" "ipv6" "both" "if-carrier-up" ]; default = "any"; description = '' This option specifies when the dhcpcd service will fork to background. @@ -207,14 +204,14 @@ in ###### implementation - config = mkIf enableDHCP { + config = lib.mkIf enableDHCP { assertions = [ { # dhcpcd doesn't start properly with malloc ∉ [ libc scudo ] # see https://github.com/NixOS/nixpkgs/issues/151696 assertion = dhcpcd.enablePrivSep - -> elem config.environment.memoryAllocator.provider [ "libc" "scudo" ]; + -> lib.elem config.environment.memoryAllocator.provider [ "libc" "scudo" ]; message = '' dhcpcd with privilege separation is incompatible with chosen system malloc. Currently only the `libc` and `scudo` allocators are known to work. @@ -232,11 +229,11 @@ in in { description = "DHCP Client"; - wantedBy = [ "multi-user.target" ] ++ optional (!hasDefaultGatewaySet) "network-online.target"; + wantedBy = [ "multi-user.target" ] ++ lib.optional (!hasDefaultGatewaySet) "network-online.target"; wants = [ "network.target" ]; before = [ "network-online.target" ]; - restartTriggers = optional (enableNTPService || cfg.runHook != "") [ exitHook ]; + restartTriggers = lib.optional (enableNTPService || cfg.runHook != "") [ exitHook ]; # Stopping dhcpcd during a reconfiguration is undesirable # because it brings down the network interfaces configured by @@ -251,7 +248,7 @@ in { Type = "forking"; PIDFile = "/run/dhcpcd/pid"; RuntimeDirectory = "dhcpcd"; - ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet ${optionalString cfg.persistent "--persistent"} --config ${dhcpcdConf}"; + ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet ${lib.optionalString cfg.persistent "--persistent"} --config ${dhcpcdConf}"; ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind"; Restart = "always"; }; @@ -265,11 +262,11 @@ in environment.systemPackages = [ dhcpcd ]; - environment.etc."dhcpcd.exit-hook" = mkIf (enableNTPService || cfg.runHook != "") { + environment.etc."dhcpcd.exit-hook" = lib.mkIf (enableNTPService || cfg.runHook != "") { source = exitHook; }; - powerManagement.resumeCommands = mkIf config.systemd.services.dhcpcd.enable + powerManagement.resumeCommands = lib.mkIf config.systemd.services.dhcpcd.enable '' # Tell dhcpcd to rebind its interfaces if it's running. /run/current-system/systemd/bin/systemctl reload dhcpcd.service diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index 160c7611c6b83..e743d1c543239 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -1,19 +1,16 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.dnscache; dnscache-root = pkgs.runCommand "dnscache-root" { preferLocalBuild = true; } '' mkdir -p $out/{servers,ip} - ${concatMapStrings (ip: '' + ${lib.concatMapStrings (ip: '' touch "$out/ip/"${lib.escapeShellArg ip} '') cfg.clientIps} - ${concatStrings (mapAttrsToList (host: ips: '' - ${concatMapStrings (ip: '' + ${lib.concatStrings (lib.mapAttrsToList (host: ips: '' + ${lib.concatMapStrings (ip: '' echo ${lib.escapeShellArg ip} >> "$out/servers/"${lib.escapeShellArg host} '') ips} '') cfg.domainServers)} @@ -35,33 +32,33 @@ in { options = { services.dnscache = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "Whether to run the dnscache caching dns server."; }; - ip = mkOption { + ip = lib.mkOption { default = "0.0.0.0"; - type = types.str; + type = lib.types.str; description = "IP address on which to listen for connections."; }; - clientIps = mkOption { + clientIps = lib.mkOption { default = [ "127.0.0.1" ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = "Client IP addresses (or prefixes) from which to accept connections."; example = ["192.168" "172.23.75.82"]; }; - domainServers = mkOption { + domainServers = lib.mkOption { default = { }; - type = types.attrsOf (types.listOf types.str); + type = lib.types.attrsOf (lib.types.listOf lib.types.str); description = '' Table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts). If entry for @ is not specified predefined list of root servers is used. ''; - example = literalExpression '' + example = lib.literalExpression '' { "@" = ["8.8.8.8" "8.8.4.4"]; "example.com" = ["192.168.100.100"]; @@ -69,9 +66,9 @@ in { ''; }; - forwardOnly = mkOption { + forwardOnly = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to treat root servers (for @) as caching servers, requesting addresses the same way a client does. This is @@ -84,7 +81,7 @@ in { ###### implementation - config = mkIf config.services.dnscache.enable { + config = lib.mkIf config.services.dnscache.enable { environment.systemPackages = [ pkgs.djbdns ]; users.users.dnscache = { isSystemUser = true; @@ -104,7 +101,7 @@ in { ''; script = '' cd /var/lib/dnscache/ - ${optionalString cfg.forwardOnly "export FORWARDONLY=1"} + ${lib.optionalString cfg.forwardOnly "export FORWARDONLY=1"} exec ./run ''; }; diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix deleted file mode 100644 index 2a9ae3cfbaad2..0000000000000 --- a/nixos/modules/services/networking/dnscrypt-wrapper.nix +++ /dev/null @@ -1,273 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.services.dnscrypt-wrapper; - dataDir = "/var/lib/dnscrypt-wrapper"; - - mkPath = path: default: - if path != null - then toString path - else default; - - publicKey = mkPath cfg.providerKey.public "${dataDir}/public.key"; - secretKey = mkPath cfg.providerKey.secret "${dataDir}/secret.key"; - - daemonArgs = with cfg; [ - "--listen-address=${address}:${toString port}" - "--resolver-address=${upstream.address}:${toString upstream.port}" - "--provider-name=${providerName}" - "--provider-publickey-file=${publicKey}" - "--provider-secretkey-file=${secretKey}" - "--provider-cert-file=${providerName}.crt" - "--crypt-secretkey-file=${providerName}.key" - ]; - - genKeys = '' - # generates time-limited keypairs - keyGen() { - dnscrypt-wrapper --gen-crypt-keypair \ - --crypt-secretkey-file=${cfg.providerName}.key - - dnscrypt-wrapper --gen-cert-file \ - --crypt-secretkey-file=${cfg.providerName}.key \ - --provider-cert-file=${cfg.providerName}.crt \ - --provider-publickey-file=${publicKey} \ - --provider-secretkey-file=${secretKey} \ - --cert-file-expire-days=${toString cfg.keys.expiration} - } - - cd ${dataDir} - - # generate provider keypair (first run only) - ${lib.optionalString (cfg.providerKey.public == null || cfg.providerKey.secret == null) '' - if [ ! -f ${publicKey} ] || [ ! -f ${secretKey} ]; then - dnscrypt-wrapper --gen-provider-keypair - fi - ''} - - # generate new keys for rotation - if [ ! -f ${cfg.providerName}.key ] || [ ! -f ${cfg.providerName}.crt ]; then - keyGen - fi - ''; - - rotateKeys = '' - # check if keys are not expired - keyValid() { - fingerprint=$(dnscrypt-wrapper \ - --show-provider-publickey \ - --provider-publickey-file=${publicKey} \ - | awk '{print $(NF)}') - dnscrypt-proxy --test=${toString (cfg.keys.checkInterval + 1)} \ - --resolver-address=127.0.0.1:${toString cfg.port} \ - --provider-name=${cfg.providerName} \ - --provider-key=$fingerprint - } - - cd ${dataDir} - - # archive old keys and restart the service - if ! keyValid; then - echo "certificate soon to become invalid; backing up old cert" - mkdir -p oldkeys - mv -v "${cfg.providerName}.key" "oldkeys/${cfg.providerName}-$(date +%F-%T).key" - mv -v "${cfg.providerName}.crt" "oldkeys/${cfg.providerName}-$(date +%F-%T).crt" - kill "$(pidof -s dnscrypt-wrapper)" - fi - ''; - - - # This is the fork of the original dnscrypt-proxy maintained by Dyne.org. - # dnscrypt-proxy2 doesn't provide the `--test` feature that is needed to - # correctly implement key rotation of dnscrypt-wrapper ephemeral keys. - dnscrypt-proxy1 = pkgs.callPackage - ({ stdenv, fetchFromGitHub, autoreconfHook - , pkg-config, libsodium, ldns, openssl, systemd }: - - stdenv.mkDerivation rec { - pname = "dnscrypt-proxy"; - version = "2019-08-20"; - - src = fetchFromGitHub { - owner = "dyne"; - repo = "dnscrypt-proxy"; - rev = "07ac3825b5069adc28e2547c16b1d983a8ed8d80"; - sha256 = "0c4mq741q4rpmdn09agwmxap32kf0vgfz7pkhcdc5h54chc3g3xy"; - }; - - configureFlags = lib.optional stdenv.isLinux "--with-systemd"; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - # depends on - buildInputs = [ libsodium openssl.dev ldns ] ++ lib.optional stdenv.isLinux systemd; - - postInstall = '' - # Previous versions required libtool files to load plugins; they are - # now strictly optional. - rm $out/lib/dnscrypt-proxy/*.la - ''; - - meta = { - description = "A tool for securing communications between a client and a DNS resolver"; - homepage = "https://github.com/dyne/dnscrypt-proxy"; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ rnhmjoj ]; - platforms = lib.platforms.linux; - }; - }) { }; - -in { - - - ###### interface - - options.services.dnscrypt-wrapper = { - enable = lib.mkEnableOption "DNSCrypt wrapper"; - - address = lib.mkOption { - type = lib.types.str; - default = "127.0.0.1"; - description = '' - The DNSCrypt wrapper will bind to this IP address. - ''; - }; - - port = lib.mkOption { - type = lib.types.port; - default = 5353; - description = '' - The DNSCrypt wrapper will listen for DNS queries on this port. - ''; - }; - - providerName = lib.mkOption { - type = lib.types.str; - default = "2.dnscrypt-cert.${config.networking.hostName}"; - defaultText = lib.literalExpression ''"2.dnscrypt-cert.''${config.networking.hostName}"''; - example = "2.dnscrypt-cert.myresolver"; - description = '' - The name that will be given to this DNSCrypt resolver. - Note: the resolver name must start with `2.dnscrypt-cert.`. - ''; - }; - - providerKey.public = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - example = "/etc/secrets/public.key"; - description = '' - The filepath to the provider public key. If not given a new - provider key pair will be generated on the first run. - ''; - }; - - providerKey.secret = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - example = "/etc/secrets/secret.key"; - description = '' - The filepath to the provider secret key. If not given a new - provider key pair will be generated on the first run. - ''; - }; - - upstream.address = lib.mkOption { - type = lib.types.str; - default = "127.0.0.1"; - description = '' - The IP address of the upstream DNS server DNSCrypt will "wrap". - ''; - }; - - upstream.port = lib.mkOption { - type = lib.types.port; - default = 53; - description = '' - The port of the upstream DNS server DNSCrypt will "wrap". - ''; - }; - - keys.expiration = lib.mkOption { - type = lib.types.int; - default = 30; - description = '' - The duration (in days) of the time-limited secret key. - This will be automatically rotated before expiration. - ''; - }; - - keys.checkInterval = lib.mkOption { - type = lib.types.int; - default = 1440; - description = '' - The time interval (in minutes) between key expiration checks. - ''; - }; - - }; - - - ###### implementation - - config = lib.mkIf cfg.enable { - - users.users.dnscrypt-wrapper = { - description = "dnscrypt-wrapper daemon user"; - home = "${dataDir}"; - createHome = true; - isSystemUser = true; - group = "dnscrypt-wrapper"; - }; - users.groups.dnscrypt-wrapper = { }; - - systemd.services.dnscrypt-wrapper = { - description = "dnscrypt-wrapper daemon"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.dnscrypt-wrapper ]; - - serviceConfig = { - User = "dnscrypt-wrapper"; - WorkingDirectory = dataDir; - Restart = "always"; - ExecStart = "${pkgs.dnscrypt-wrapper}/bin/dnscrypt-wrapper ${toString daemonArgs}"; - }; - - preStart = genKeys; - }; - - - systemd.services.dnscrypt-wrapper-rotate = { - after = [ "network.target" ]; - requires = [ "dnscrypt-wrapper.service" ]; - description = "Rotates DNSCrypt wrapper keys if soon to expire"; - - path = with pkgs; [ dnscrypt-wrapper dnscrypt-proxy1 gawk procps ]; - script = rotateKeys; - serviceConfig.User = "dnscrypt-wrapper"; - }; - - - systemd.timers.dnscrypt-wrapper-rotate = { - description = "Periodically check DNSCrypt wrapper keys for expiration"; - wantedBy = [ "multi-user.target" ]; - - timerConfig = { - Unit = "dnscrypt-wrapper-rotate.service"; - OnBootSec = "1min"; - OnUnitActiveSec = cfg.keys.checkInterval * 60; - }; - }; - - assertions = with cfg; [ - { assertion = (providerKey.public == null && providerKey.secret == null) || - (providerKey.secret != null && providerKey.public != null); - message = "The secret and public provider key must be set together."; - } - ]; - - }; - - meta.maintainers = with lib.maintainers; [ rnhmjoj ]; - -} diff --git a/nixos/modules/services/networking/dnsdist.nix b/nixos/modules/services/networking/dnsdist.nix index cf17a87f649f4..cd87abb3d0725 100644 --- a/nixos/modules/services/networking/dnsdist.nix +++ b/nixos/modules/services/networking/dnsdist.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.dnsdist; @@ -80,38 +77,38 @@ let in { options = { services.dnsdist = { - enable = mkEnableOption "dnsdist domain name server"; + enable = lib.mkEnableOption "dnsdist domain name server"; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; description = "Listen IP address"; default = "0.0.0.0"; }; - listenPort = mkOption { - type = types.port; + listenPort = lib.mkOption { + type = lib.types.port; description = "Listen port"; default = 53; }; dnscrypt = { - enable = mkEnableOption "a DNSCrypt endpoint to dnsdist"; + enable = lib.mkEnableOption "a DNSCrypt endpoint to dnsdist"; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; description = "Listen IP address of the endpoint"; default = "0.0.0.0"; }; - listenPort = mkOption { - type = types.port; + listenPort = lib.mkOption { + type = lib.types.port; description = "Listen port of the endpoint"; default = 443; }; - providerName = mkOption { - type = types.str; + providerName = lib.mkOption { + type = lib.types.str; default = "2.dnscrypt-cert.${config.networking.hostName}"; - defaultText = literalExpression "2.dnscrypt-cert.\${config.networking.hostName}"; + defaultText = lib.literalExpression "2.dnscrypt-cert.\${config.networking.hostName}"; example = "2.dnscrypt-cert.myresolver"; description = '' The name that will be given to this DNSCrypt resolver. @@ -122,8 +119,8 @@ in { ''; }; - providerKey = mkOption { - type = types.nullOr types.path; + providerKey = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' The filepath to the provider secret key. @@ -136,8 +133,8 @@ in { ''; }; - certLifetime = mkOption { - type = types.ints.positive; + certLifetime = lib.mkOption { + type = lib.types.ints.positive; default = 15; description = '' The lifetime (in minutes) of the resolver certificate. @@ -147,8 +144,8 @@ in { }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra lines to be added verbatim to dnsdist.conf. @@ -157,7 +154,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.users.dnsdist = { description = "dnsdist daemons user"; isSystemUser = true; diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index e9052cdd3faef..633e37ad25e93 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.dnsmasq; dnsmasq = cfg.package; @@ -9,34 +6,29 @@ let # True values are just put as `name` instead of `name=true`, and false values # are turned to comments (false values are expected to be overrides e.g. - # mkForce) + # lib.mkForce) formatKeyValue = name: value: if value == true then name else if value == false then "# setting `${name}` explicitly set to false" - else generators.mkKeyValueDefault { } "=" name value; + else lib.generators.mkKeyValueDefault { } "=" name value; settingsFormat = pkgs.formats.keyValue { mkKeyValue = formatKeyValue; listsAsDuplicateKeys = true; }; - # Because formats.generate is outputting a file, we use of conf-file. Once - # `extraConfig` is deprecated we can just use - # `dnsmasqConf = format.generate "dnsmasq.conf" cfg.settings` - dnsmasqConf = pkgs.writeText "dnsmasq.conf" '' - conf-file=${settingsFormat.generate "dnsmasq.conf" cfg.settings} - ${cfg.extraConfig} - ''; + dnsmasqConf = settingsFormat.generate "dnsmasq.conf" cfg.settings; in { imports = [ - (mkRenamedOptionModule [ "services" "dnsmasq" "servers" ] [ "services" "dnsmasq" "settings" "server" ]) + (lib.mkRenamedOptionModule [ "services" "dnsmasq" "servers" ] [ "services" "dnsmasq" "settings" "server" ]) + (lib.mkRemovedOptionModule [ "services" "dnsmasq" "extraConfig" ] "This option has been replaced by `services.dnsmasq.settings`") ]; ###### interface @@ -45,18 +37,18 @@ in services.dnsmasq = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to run dnsmasq. ''; }; - package = mkPackageOption pkgs "dnsmasq" {}; + package = lib.mkPackageOption pkgs "dnsmasq" {}; - resolveLocalQueries = mkOption { - type = types.bool; + resolveLocalQueries = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to @@ -64,21 +56,21 @@ in ''; }; - alwaysKeepRunning = mkOption { - type = types.bool; + alwaysKeepRunning = lib.mkOption { + type = lib.types.bool; default = false; description = '' If enabled, systemd will always respawn dnsmasq even if shut down manually. The default, disabled, will only restart it on error. ''; }; - settings = mkOption { - type = types.submodule { + settings = lib.mkOption { + type = lib.types.submodule { freeformType = settingsFormat.type; - options.server = mkOption { - type = types.listOf types.str; + options.server = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "8.8.8.8" "8.8.4.4" ]; description = '' @@ -99,7 +91,7 @@ in resolv-file = optional cfg.resolveLocalQueries "/etc/dnsmasq-resolv.conf"; } ''; - example = literalExpression '' + example = lib.literalExpression '' { domain-needed = true; dhcp-range = [ "192.168.0.2,192.168.0.254" ]; @@ -107,17 +99,6 @@ in ''; }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra configuration directives that should be added to - `dnsmasq.conf`. - - This option is deprecated, please use {option}`settings` instead. - ''; - }; - }; }; @@ -125,18 +106,16 @@ in ###### implementation - config = mkIf cfg.enable { - - warnings = lib.optional (cfg.extraConfig != "") "Text based config is deprecated, dnsmasq now supports `services.dnsmasq.settings` for an attribute-set based config"; + config = lib.mkIf cfg.enable { services.dnsmasq.settings = { - dhcp-leasefile = mkDefault "${stateDir}/dnsmasq.leases"; - conf-file = mkDefault (optional cfg.resolveLocalQueries "/etc/dnsmasq-conf.conf"); - resolv-file = mkDefault (optional cfg.resolveLocalQueries "/etc/dnsmasq-resolv.conf"); + dhcp-leasefile = lib.mkDefault "${stateDir}/dnsmasq.leases"; + conf-file = lib.mkDefault (lib.optional cfg.resolveLocalQueries "/etc/dnsmasq-conf.conf"); + resolv-file = lib.mkDefault (lib.optional cfg.resolveLocalQueries "/etc/dnsmasq-resolv.conf"); }; networking.nameservers = - optional cfg.resolveLocalQueries "127.0.0.1"; + lib.optional cfg.resolveLocalQueries "127.0.0.1"; services.dbus.packages = [ dnsmasq ]; @@ -147,8 +126,8 @@ in }; users.groups.dnsmasq = {}; - networking.resolvconf = mkIf cfg.resolveLocalQueries { - useLocalResolver = mkDefault true; + networking.resolvconf = lib.mkIf cfg.resolveLocalQueries { + useLocalResolver = lib.mkDefault true; extraConfig = '' dnsmasq_conf=/etc/dnsmasq-conf.conf diff --git a/nixos/modules/services/networking/doh-proxy-rust.nix b/nixos/modules/services/networking/doh-proxy-rust.nix index 1f3850a77bf1c..32b7a3750480a 100644 --- a/nixos/modules/services/networking/doh-proxy-rust.nix +++ b/nixos/modules/services/networking/doh-proxy-rust.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.doh-proxy-rust; @@ -10,10 +7,10 @@ in { options.services.doh-proxy-rust = { - enable = mkEnableOption "doh-proxy-rust"; + enable = lib.mkEnableOption "doh-proxy-rust"; - flags = mkOption { - type = types.listOf types.str; + flags = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "--server-address=9.9.9.9:53" ]; description = '' @@ -24,13 +21,13 @@ in { }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.doh-proxy-rust = { description = "doh-proxy-rust"; after = [ "network.target" "nss-lookup.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.doh-proxy-rust}/bin/doh-proxy ${escapeShellArgs cfg.flags}"; + ExecStart = "${pkgs.doh-proxy-rust}/bin/doh-proxy ${lib.escapeShellArgs cfg.flags}"; Restart = "always"; RestartSec = 10; DynamicUser = true; @@ -55,6 +52,6 @@ in { }; }; - meta.maintainers = with maintainers; [ stephank ]; + meta.maintainers = with lib.maintainers; [ stephank ]; } diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix index 3e92a2d3f7eb2..d2ada99cc9219 100644 --- a/nixos/modules/services/networking/ejabberd.nix +++ b/nixos/modules/services/networking/ejabberd.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.ejabberd; @@ -11,7 +8,7 @@ let ${cfg.ctlConfig} ''; - ectl = ''${cfg.package}/bin/ejabberdctl ${optionalString (cfg.configFile != null) "--config ${cfg.configFile}"} --ctl-config "${ctlcfg}" --spool "${cfg.spoolDir}" --logs "${cfg.logsDir}"''; + ectl = ''${cfg.package}/bin/ejabberdctl ${lib.optionalString (cfg.configFile != null) "--config ${cfg.configFile}"} --ctl-config "${ctlcfg}" --spool "${cfg.spoolDir}" --logs "${cfg.logsDir}"''; dumps = lib.escapeShellArgs cfg.loadDumps; @@ -23,59 +20,59 @@ in { services.ejabberd = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to enable ejabberd server"; }; - package = mkPackageOption pkgs "ejabberd" { }; + package = lib.mkPackageOption pkgs "ejabberd" { }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "ejabberd"; description = "User under which ejabberd is ran"; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "ejabberd"; description = "Group under which ejabberd is ran"; }; - spoolDir = mkOption { - type = types.path; + spoolDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/ejabberd"; description = "Location of the spooldir of ejabberd"; }; - logsDir = mkOption { - type = types.path; + logsDir = lib.mkOption { + type = lib.types.path; default = "/var/log/ejabberd"; description = "Location of the logfile directory of ejabberd"; }; - configFile = mkOption { - type = types.nullOr types.path; + configFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; description = "Configuration file for ejabberd in YAML format"; default = null; }; - ctlConfig = mkOption { - type = types.lines; + ctlConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = "Configuration of ejabberdctl"; }; - loadDumps = mkOption { - type = types.listOf types.path; + loadDumps = lib.mkOption { + type = lib.types.listOf lib.types.path; default = []; description = "Configuration dumps that should be loaded on the first startup"; - example = literalExpression "[ ./myejabberd.dump ]"; + example = lib.literalExpression "[ ./myejabberd.dump ]"; }; - imagemagick = mkOption { - type = types.bool; + imagemagick = lib.mkOption { + type = lib.types.bool; default = false; description = "Add ImageMagick to server's path; allows for image thumbnailing"; }; @@ -86,10 +83,10 @@ in { ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - users.users = optionalAttrs (cfg.user == "ejabberd") { + users.users = lib.optionalAttrs (cfg.user == "ejabberd") { ejabberd = { group = cfg.group; home = cfg.spoolDir; @@ -98,7 +95,7 @@ in { }; }; - users.groups = optionalAttrs (cfg.group == "ejabberd") { + users.groups = lib.optionalAttrs (cfg.group == "ejabberd") { ejabberd.gid = config.ids.gids.ejabberd; }; diff --git a/nixos/modules/services/networking/envoy.nix b/nixos/modules/services/networking/envoy.nix index b36c184fe8d53..876c05755936e 100644 --- a/nixos/modules/services/networking/envoy.nix +++ b/nixos/modules/services/networking/envoy.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.envoy; format = pkgs.formats.json { }; @@ -15,12 +12,12 @@ in { options.services.envoy = { - enable = mkEnableOption "Envoy reverse proxy"; + enable = lib.mkEnableOption "Envoy reverse proxy"; - package = mkPackageOption pkgs "envoy" { }; + package = lib.mkPackageOption pkgs "envoy" { }; - requireValidConfig = mkOption { - type = types.bool; + requireValidConfig = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether a failure during config validation at build time is fatal. @@ -29,10 +26,10 @@ in ''; }; - settings = mkOption { + settings = lib.mkOption { type = format.type; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { admin = { access_log_path = "/dev/null"; @@ -56,7 +53,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; systemd.services.envoy = { description = "Envoy reverse proxy"; diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix index b450aa1b62c75..90876a67f74da 100644 --- a/nixos/modules/services/networking/epmd.nix +++ b/nixos/modules/services/networking/epmd.nix @@ -1,15 +1,12 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.epmd; in { ###### interface options.services.epmd = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable socket activation for Erlang Port Mapper Daemon (epmd), @@ -17,10 +14,10 @@ in Erlang computations. ''; }; - package = mkPackageOption pkgs "erlang" { }; - listenStream = mkOption + package = lib.mkPackageOption pkgs "erlang" { }; + listenStream = lib.mkOption { - type = types.str; + type = lib.types.str; default = "[::]:4369"; description = '' the listenStream used by the systemd socket. @@ -32,7 +29,7 @@ in }; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [{ assertion = cfg.listenStream == "[::]:4369" -> config.networking.enableIPv6; message = "epmd listens by default on ipv6, enable ipv6 or change config.services.epmd.listenStream"; @@ -60,5 +57,5 @@ in }; }; - meta.maintainers = teams.beam.members; + meta.maintainers = lib.teams.beam.members; } diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix index d26e26d0c1950..584eafd2962cf 100644 --- a/nixos/modules/services/networking/eternal-terminal.nix +++ b/nixos/modules/services/networking/eternal-terminal.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.eternal-terminal; @@ -16,11 +13,11 @@ in services.eternal-terminal = { - enable = mkEnableOption "Eternal Terminal server"; + enable = lib.mkEnableOption "Eternal Terminal server"; - port = mkOption { + port = lib.mkOption { default = 2022; - type = types.port; + type = lib.types.port; description = '' The port the server should listen on. Will use the server's default (2022) if not specified. @@ -28,25 +25,25 @@ in ''; }; - verbosity = mkOption { + verbosity = lib.mkOption { default = 0; - type = types.enum (lib.range 0 9); + type = lib.types.enum (lib.range 0 9); description = '' The verbosity level (0-9). ''; }; - silent = mkOption { + silent = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' If enabled, disables all logging. ''; }; - logSize = mkOption { + logSize = lib.mkOption { default = 20971520; - type = types.int; + type = lib.types.int; description = '' The maximum log size. ''; @@ -56,7 +53,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # We need to ensure the et package is fully installed because # the (remote) et client runs the `etterminal` binary when it diff --git a/nixos/modules/services/networking/expressvpn.nix b/nixos/modules/services/networking/expressvpn.nix index c1d287f57bc2c..431a1da70b955 100644 --- a/nixos/modules/services/networking/expressvpn.nix +++ b/nixos/modules/services/networking/expressvpn.nix @@ -1,16 +1,14 @@ { config, lib, pkgs, ... }: - -with lib; { - options.services.expressvpn.enable = mkOption { - type = types.bool; + options.services.expressvpn.enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable the ExpressVPN daemon. ''; }; - config = mkIf config.services.expressvpn.enable { + config = lib.mkIf config.services.expressvpn.enable { boot.kernelModules = [ "tun" ]; systemd.services.expressvpn = { @@ -26,5 +24,5 @@ with lib; }; }; - meta.maintainers = with maintainers; [ yureien ]; + meta.maintainers = with lib.maintainers; [ yureien ]; } diff --git a/nixos/modules/services/networking/fedimintd.nix b/nixos/modules/services/networking/fedimintd.nix new file mode 100644 index 0000000000000..1ede3a50553d3 --- /dev/null +++ b/nixos/modules/services/networking/fedimintd.nix @@ -0,0 +1,304 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) + concatLists + filterAttrs + mapAttrs' + mapAttrsToList + mkEnableOption + mkIf + mkOption + mkOverride + mkPackageOption + nameValuePair + recursiveUpdate + types + ; + + fedimintdOpts = + { + config, + lib, + name, + ... + }: + { + options = { + enable = mkEnableOption "fedimintd"; + + package = mkPackageOption pkgs "fedimint" { }; + + environment = mkOption { + type = types.attrsOf types.str; + description = "Extra Environment variables to pass to the fedimintd."; + default = { + RUST_BACKTRACE = "1"; + }; + example = { + RUST_LOG = "info,fm=debug"; + RUST_BACKTRACE = "1"; + }; + }; + + p2p = { + openFirewall = mkOption { + type = types.bool; + default = true; + description = "Opens port in firewall for fedimintd's p2p port"; + }; + port = mkOption { + type = types.port; + default = 8173; + description = "Port to bind on for p2p connections from peers"; + }; + bind = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "Address to bind on for p2p connections from peers"; + }; + url = mkOption { + type = types.str; + example = "fedimint://p2p.myfedimint.com"; + description = '' + Public address for p2p connections from peers + ''; + }; + }; + api = { + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Opens port in firewall for fedimintd's api port"; + }; + port = mkOption { + type = types.port; + default = 8174; + description = "Port to bind on for API connections relied by the reverse proxy/tls terminator."; + }; + bind = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Address to bind on for API connections relied by the reverse proxy/tls terminator."; + }; + url = mkOption { + type = types.str; + description = '' + Public URL of the API address of the reverse proxy/tls terminator. Usually starting with `wss://`. + ''; + }; + }; + bitcoin = { + network = mkOption { + type = types.str; + default = "signet"; + example = "bitcoin"; + description = "Bitcoin network to participate in."; + }; + rpc = { + url = mkOption { + type = types.str; + default = "http://127.0.0.1:38332"; + example = "signet"; + description = "Bitcoin node (bitcoind/electrum/esplora) address to connect to"; + }; + + kind = mkOption { + type = types.str; + default = "bitcoind"; + example = "electrum"; + description = "Kind of a bitcoin node."; + }; + + secretFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + If set the URL specified in `bitcoin.rpc.url` will get the content of this file added + as an URL password, so `http://user@example.com` will turn into `http://user:SOMESECRET@example.com`. + + Example: + + `/etc/nix-bitcoin-secrets/bitcoin-rpcpassword-public` (for nix-bitcoin default) + ''; + }; + }; + }; + + consensus.finalityDelay = mkOption { + type = types.ints.unsigned; + default = 10; + description = "Consensus peg-in finality delay."; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/fedimintd-${name}/"; + readOnly = true; + description = '' + Path to the data dir fedimintd will use to store its data. + Note that due to using the DynamicUser feature of systemd, this value should not be changed + and is set to be read only. + ''; + }; + + nginx = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to configure nginx for fedimintd + ''; + }; + fqdn = mkOption { + type = types.str; + example = "api.myfedimint.com"; + description = "Public domain of the API address of the reverse proxy/tls terminator."; + }; + config = mkOption { + type = types.submodule ( + recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { + inherit config lib; + }) { } + ); + default = { }; + description = "Overrides to the nginx vhost section for api"; + }; + }; + }; + }; +in +{ + options = { + services.fedimintd = mkOption { + type = types.attrsOf (types.submodule fedimintdOpts); + default = { }; + description = "Specification of one or more fedimintd instances."; + }; + }; + + config = + let + eachFedimintd = filterAttrs (fedimintdName: cfg: cfg.enable) config.services.fedimintd; + eachFedimintdNginx = filterAttrs (fedimintdName: cfg: cfg.nginx.enable) eachFedimintd; + in + mkIf (eachFedimintd != { }) { + + networking.firewall.allowedTCPPorts = concatLists ( + mapAttrsToList ( + fedimintdName: cfg: + (lib.optional cfg.api.openFirewall cfg.api.port ++ lib.optional cfg.p2p.openFirewall cfg.p2p.port) + ) eachFedimintd + ); + + systemd.services = mapAttrs' ( + fedimintdName: cfg: + (nameValuePair "fedimintd-${fedimintdName}" ( + let + startScript = pkgs.writeShellScript "fedimintd-start" ( + ( + if cfg.bitcoin.rpc.secretFile != null then + '' + secret=$(${pkgs.coreutils}/bin/head -n 1 "${cfg.bitcoin.rpc.secretFile}") + prefix="''${FM_BITCOIN_RPC_URL%*@*}" # Everything before the last '@' + suffix="''${FM_BITCOIN_RPC_URL##*@}" # Everything after the last '@' + FM_BITCOIN_RPC_URL="''${prefix}:''${secret}@''${suffix}" + '' + else + "" + ) + + '' + exec ${cfg.package}/bin/fedimintd + '' + ); + in + { + description = "Fedimint Server"; + documentation = [ "https://github.com/fedimint/fedimint/" ]; + wantedBy = [ "multi-user.target" ]; + environment = lib.mkMerge [ + { + FM_BIND_P2P = "${cfg.p2p.bind}:${toString cfg.p2p.port}"; + FM_BIND_API = "${cfg.api.bind}:${toString cfg.api.port}"; + FM_P2P_URL = cfg.p2p.url; + FM_API_URL = cfg.api.url; + FM_DATA_DIR = cfg.dataDir; + FM_BITCOIN_NETWORK = cfg.bitcoin.network; + FM_BITCOIN_RPC_URL = cfg.bitcoin.rpc.url; + FM_BITCOIN_RPC_KIND = cfg.bitcoin.rpc.kind; + } + cfg.environment + ]; + serviceConfig = { + DynamicUser = true; + + StateDirectory = "fedimintd-${fedimintdName}"; + StateDirectoryMode = "0700"; + ExecStart = startScript; + + Restart = "always"; + RestartSec = 10; + StartLimitBurst = 5; + UMask = "007"; + LimitNOFILE = "100000"; + + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "full"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + }; + } + )) + ) eachFedimintd; + + services.nginx.virtualHosts = mapAttrs' ( + fedimintdName: cfg: + (nameValuePair cfg.nginx.fqdn ( + lib.mkMerge [ + cfg.nginx.config + + { + # Note: we want by default to enable OpenSSL, but it seems anything 100 and above is + # overriden by default value from vhost-options.nix + enableACME = mkOverride 99 true; + forceSSL = mkOverride 99 true; + # Currently Fedimint API only support JsonRPC on `/ws/` endpoint, so no need to handle `/` + locations."/ws/" = { + proxyPass = "http://127.0.0.1:${toString cfg.api.port}/"; + proxyWebsockets = true; + extraConfig = '' + proxy_pass_header Authorization; + ''; + }; + } + ] + )) + ) eachFedimintdNginx; + }; + + meta.maintainers = with lib.maintainers; [ dpc ]; +} diff --git a/nixos/modules/services/networking/ferm.nix b/nixos/modules/services/networking/ferm.nix index 91412f53009c1..1fc982d8e9c8e 100644 --- a/nixos/modules/services/networking/ferm.nix +++ b/nixos/modules/services/networking/ferm.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.ferm; @@ -17,9 +14,9 @@ let in { options = { services.ferm = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to enable Ferm Firewall. *Warning*: Enabling this service WILL disable the existing NixOS @@ -27,17 +24,17 @@ in { considered at the moment. ''; }; - config = mkOption { + config = lib.mkOption { description = "Verbatim ferm.conf configuration."; default = ""; - defaultText = literalMD "empty firewall, allows any traffic"; - type = types.lines; + defaultText = lib.literalMD "empty firewall, allows any traffic"; + type = lib.types.lines; }; - package = mkPackageOption pkgs "ferm" { }; + package = lib.mkPackageOption pkgs "ferm" { }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.firewall.enable = false; systemd.services.ferm = { description = "Ferm Firewall"; diff --git a/nixos/modules/services/networking/fireqos.nix b/nixos/modules/services/networking/fireqos.nix index 0b34f0b6b8b48..aa7d8c2c03efb 100644 --- a/nixos/modules/services/networking/fireqos.nix +++ b/nixos/modules/services/networking/fireqos.nix @@ -1,14 +1,11 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.fireqos; fireqosConfig = pkgs.writeText "fireqos.conf" "${cfg.config}"; in { options.services.fireqos = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' If enabled, FireQOS will be launched with the specified @@ -16,8 +13,8 @@ in { ''; }; - config = mkOption { - type = types.str; + config = lib.mkOption { + type = lib.types.str; default = ""; example = '' interface wlp3s0 world-in input rate 10mbit ethernet @@ -34,7 +31,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.fireqos = { description = "FireQOS"; after = [ "network.target" ]; diff --git a/nixos/modules/services/networking/firewall-iptables.nix b/nixos/modules/services/networking/firewall-iptables.nix index 68895189bcaee..e4fa7676fd077 100644 --- a/nixos/modules/services/networking/firewall-iptables.nix +++ b/nixos/modules/services/networking/firewall-iptables.nix @@ -29,11 +29,7 @@ complete firewall (in the default configuration). */ - { config, lib, pkgs, ... }: - -with lib; - let cfg = config.networking.firewall; @@ -89,17 +85,17 @@ let # jumps to the "nixos-fw-refuse" chain. ip46tables -N nixos-fw-log-refuse - ${optionalString cfg.logRefusedConnections '' + ${lib.optionalString cfg.logRefusedConnections '' ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "refused connection: " ''} - ${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) '' + ${lib.optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) '' ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type broadcast \ -j LOG --log-level info --log-prefix "refused broadcast: " ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type multicast \ -j LOG --log-level info --log-prefix "refused multicast: " ''} ip46tables -A nixos-fw-log-refuse -m pkttype ! --pkt-type unicast -j nixos-fw-refuse - ${optionalString cfg.logRefusedPackets '' + ${lib.optionalString cfg.logRefusedPackets '' ip46tables -A nixos-fw-log-refuse \ -j LOG --log-level info --log-prefix "refused packet: " ''} @@ -114,22 +110,19 @@ let ip46tables -t mangle -F nixos-fw-rpfilter 2> /dev/null || true ip46tables -t mangle -X nixos-fw-rpfilter 2> /dev/null || true - ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) '' + ${lib.optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) '' # Perform a reverse-path test to refuse spoofers # For now, we just drop, as the mangle table doesn't have a log-refuse yet ip46tables -t mangle -N nixos-fw-rpfilter 2> /dev/null || true - ip46tables -t mangle -A nixos-fw-rpfilter -m rpfilter --validmark ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN + ip46tables -t mangle -A nixos-fw-rpfilter -m rpfilter --validmark ${lib.optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN # Allows this host to act as a DHCP4 client without first having to use APIPA iptables -t mangle -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN - # Allows decrypted packets from an IPsec VPN - ip46tables -t mangle -A nixos-fw-rpfilter -m policy --dir in --pol ipsec -j RETURN - # Allows this host to act as a DHCPv4 server iptables -t mangle -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN - ${optionalString cfg.logReversePathDrops '' + ${lib.optionalString cfg.logReversePathDrops '' ip46tables -t mangle -A nixos-fw-rpfilter -j LOG --log-level info --log-prefix "rpfilter drop: " ''} ip46tables -t mangle -A nixos-fw-rpfilter -j DROP @@ -138,7 +131,7 @@ let ''} # Accept all traffic on the trusted interfaces. - ${flip concatMapStrings cfg.trustedInterfaces (iface: '' + ${lib.flip lib.concatMapStrings cfg.trustedInterfaces (iface: '' ip46tables -A nixos-fw -i ${iface} -j nixos-fw-accept '')} @@ -146,51 +139,51 @@ let ip46tables -A nixos-fw -m conntrack --ctstate ESTABLISHED,RELATED -j nixos-fw-accept # Accept connections to the allowed TCP ports. - ${concatStrings (mapAttrsToList (iface: cfg: - concatMapStrings (port: + ${lib.concatStrings (lib.mapAttrsToList (iface: cfg: + lib.concatMapStrings (port: '' - ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} + ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept ${lib.optionalString (iface != "default") "-i ${iface}"} '' ) cfg.allowedTCPPorts ) cfg.allInterfaces)} # Accept connections to the allowed TCP port ranges. - ${concatStrings (mapAttrsToList (iface: cfg: - concatMapStrings (rangeAttr: + ${lib.concatStrings (lib.mapAttrsToList (iface: cfg: + lib.concatMapStrings (rangeAttr: let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in '' - ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} + ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept ${lib.optionalString (iface != "default") "-i ${iface}"} '' ) cfg.allowedTCPPortRanges ) cfg.allInterfaces)} # Accept packets on the allowed UDP ports. - ${concatStrings (mapAttrsToList (iface: cfg: - concatMapStrings (port: + ${lib.concatStrings (lib.mapAttrsToList (iface: cfg: + lib.concatMapStrings (port: '' - ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} + ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept ${lib.optionalString (iface != "default") "-i ${iface}"} '' ) cfg.allowedUDPPorts ) cfg.allInterfaces)} # Accept packets on the allowed UDP port ranges. - ${concatStrings (mapAttrsToList (iface: cfg: - concatMapStrings (rangeAttr: + ${lib.concatStrings (lib.mapAttrsToList (iface: cfg: + lib.concatMapStrings (rangeAttr: let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in '' - ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"} + ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept ${lib.optionalString (iface != "default") "-i ${iface}"} '' ) cfg.allowedUDPPortRanges ) cfg.allInterfaces)} # Optionally respond to ICMPv4 pings. - ${optionalString cfg.allowPing '' - iptables -w -A nixos-fw -p icmp --icmp-type echo-request ${optionalString (cfg.pingLimit != null) + ${lib.optionalString cfg.allowPing '' + iptables -w -A nixos-fw -p icmp --icmp-type echo-request ${lib.optionalString (cfg.pingLimit != null) "-m limit ${cfg.pingLimit} " }-j nixos-fw-accept ''} - ${optionalString config.networking.enableIPv6 '' + ${lib.optionalString config.networking.enableIPv6 '' # Accept all ICMPv6 messages except redirects and node # information queries (type 139). See RFC 4890, section # 4.4. @@ -221,7 +214,7 @@ let # Clean up after added ruleset ip46tables -D INPUT -j nixos-fw 2>/dev/null || true - ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) '' + ${lib.optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) '' ip46tables -t mangle -D PREROUTING -j nixos-fw-rpfilter 2>/dev/null || true ''} @@ -259,8 +252,8 @@ in options = { networking.firewall = { - extraCommands = mkOption { - type = types.lines; + extraCommands = lib.mkOption { + type = lib.types.lines; default = ""; example = "iptables -A INPUT -p icmp -j ACCEPT"; description = '' @@ -273,8 +266,8 @@ in ''; }; - extraStopCommands = mkOption { - type = types.lines; + extraStopCommands = lib.mkOption { + type = lib.types.lines; default = ""; example = "iptables -P INPUT ACCEPT"; description = '' @@ -292,7 +285,7 @@ in # FIXME: Maybe if `enable' is false, the firewall should still be # built but not started by default? - config = mkIf (cfg.enable && config.networking.nftables.enable == false) { + config = lib.mkIf (cfg.enable && config.networking.nftables.enable == false) { assertions = [ # This is approximately "checkReversePath -> kernelHasRPFilter", @@ -305,7 +298,7 @@ in ]; environment.systemPackages = [ pkgs.nixos-firewall-tool ]; - networking.firewall.checkReversePath = mkIf (!kernelHasRPFilter) (mkDefault false); + networking.firewall.checkReversePath = lib.mkIf (!kernelHasRPFilter) (lib.mkDefault false); systemd.services.firewall = { description = "Firewall"; diff --git a/nixos/modules/services/networking/firewall-nftables.nix b/nixos/modules/services/networking/firewall-nftables.nix index 661d5c9fb1a6e..f954a52841033 100644 --- a/nixos/modules/services/networking/firewall-nftables.nix +++ b/nixos/modules/services/networking/firewall-nftables.nix @@ -1,16 +1,13 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.networking.firewall; - ifaceSet = concatStringsSep ", " ( + ifaceSet = lib.concatStringsSep ", " ( map (x: ''"${x}"'') cfg.trustedInterfaces ); - portsToNftSet = ports: portRanges: concatStringsSep ", " ( + portsToNftSet = ports: portRanges: lib.concatStringsSep ", " ( map (x: toString x) ports ++ map (x: "${toString x.from}-${toString x.to}") portRanges ); @@ -22,8 +19,8 @@ in options = { networking.firewall = { - extraInputRules = mkOption { - type = types.lines; + extraInputRules = lib.mkOption { + type = lib.types.lines; default = ""; example = "ip6 saddr { fc00::/7, fe80::/10 } tcp dport 24800 accept"; description = '' @@ -34,8 +31,8 @@ in ''; }; - extraForwardRules = mkOption { - type = types.lines; + extraForwardRules = lib.mkOption { + type = lib.types.lines; default = ""; example = "iifname wg0 accept"; description = '' @@ -46,8 +43,8 @@ in ''; }; - extraReversePathFilterRules = mkOption { - type = types.lines; + extraReversePathFilterRules = lib.mkOption { + type = lib.types.lines; default = ""; example = "fib daddr . mark . iif type local accept"; description = '' @@ -61,7 +58,7 @@ in }; - config = mkIf (cfg.enable && config.networking.nftables.enable) { + config = lib.mkIf (cfg.enable && config.networking.nftables.enable) { assertions = [ { @@ -73,7 +70,7 @@ in message = "extraStopCommands is incompatible with the nftables based firewall: ${cfg.extraStopCommands}"; } { - assertion = cfg.pingLimit == null || !(hasPrefix "--" cfg.pingLimit); + assertion = cfg.pingLimit == null || !(lib.hasPrefix "--" cfg.pingLimit); message = "nftables syntax like \"2/second\" should be used in networking.firewall.pingLimit"; } { @@ -82,24 +79,18 @@ in } ]; - networking.nftables.preCheckRuleset = '' - # can't validate IPsec rules - sed '/meta ipsec/d' -i ruleset.conf - ''; - networking.nftables.tables."nixos-fw".family = "inet"; networking.nftables.tables."nixos-fw".content = '' - ${optionalString (cfg.checkReversePath != false) '' + ${lib.optionalString (cfg.checkReversePath != false) '' chain rpfilter { type filter hook prerouting priority mangle + 10; policy drop; meta nfproto ipv4 udp sport . udp dport { 67 . 68, 68 . 67 } accept comment "DHCPv4 client/server" - meta ipsec exists accept comment "decrypted packets from an IPsec VPN" - fib saddr . mark ${optionalString (cfg.checkReversePath != "loose") ". iif"} oif exists accept + fib saddr . mark ${lib.optionalString (cfg.checkReversePath != "loose") ". iif"} oif exists accept jump rpfilter-allow - ${optionalString cfg.logReversePathDrops '' + ${lib.optionalString cfg.logReversePathDrops '' log level info prefix "rpfilter drop: " ''} @@ -113,7 +104,7 @@ in chain input { type filter hook input priority filter; policy drop; - ${optionalString (ifaceSet != "") ''iifname { ${ifaceSet} } accept comment "trusted interfaces"''} + ${lib.optionalString (ifaceSet != "") ''iifname { ${ifaceSet} } accept comment "trusted interfaces"''} # Some ICMPv6 types like NDP is untracked ct state vmap { @@ -124,18 +115,18 @@ in untracked: jump input-allow, } - ${optionalString cfg.logRefusedConnections '' + ${lib.optionalString cfg.logRefusedConnections '' tcp flags syn / fin,syn,rst,ack log level info prefix "refused connection: " ''} - ${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) '' + ${lib.optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) '' pkttype broadcast log level info prefix "refused broadcast: " pkttype multicast log level info prefix "refused multicast: " ''} - ${optionalString cfg.logRefusedPackets '' + ${lib.optionalString cfg.logRefusedPackets '' pkttype host log level info prefix "refused packet: " ''} - ${optionalString cfg.rejectPackets '' + ${lib.optionalString cfg.rejectPackets '' meta l4proto tcp reject with tcp reset reject ''} @@ -144,20 +135,20 @@ in chain input-allow { - ${concatStrings (mapAttrsToList (iface: cfg: + ${lib.concatStrings (lib.mapAttrsToList (iface: cfg: let - ifaceExpr = optionalString (iface != "default") "iifname ${iface}"; + ifaceExpr = lib.optionalString (iface != "default") "iifname ${iface}"; tcpSet = portsToNftSet cfg.allowedTCPPorts cfg.allowedTCPPortRanges; udpSet = portsToNftSet cfg.allowedUDPPorts cfg.allowedUDPPortRanges; in '' - ${optionalString (tcpSet != "") "${ifaceExpr} tcp dport { ${tcpSet} } accept"} - ${optionalString (udpSet != "") "${ifaceExpr} udp dport { ${udpSet} } accept"} + ${lib.optionalString (tcpSet != "") "${ifaceExpr} tcp dport { ${tcpSet} } accept"} + ${lib.optionalString (udpSet != "") "${ifaceExpr} udp dport { ${udpSet} } accept"} '' ) cfg.allInterfaces)} - ${optionalString cfg.allowPing '' - icmp type echo-request ${optionalString (cfg.pingLimit != null) "limit rate ${cfg.pingLimit}"} accept comment "allow ping" + ${lib.optionalString cfg.allowPing '' + icmp type echo-request ${lib.optionalString (cfg.pingLimit != null) "limit rate ${cfg.pingLimit}"} accept comment "allow ping" ''} icmpv6 type != { nd-redirect, 139 } accept comment "Accept all ICMPv6 messages except redirects and node information queries (type 139). See RFC 4890, section 4.4." @@ -167,7 +158,7 @@ in } - ${optionalString cfg.filterForward '' + ${lib.optionalString cfg.filterForward '' chain forward { type filter hook forward priority filter; policy drop; diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index a35cc51a38705..27e17c464ba9c 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.networking.firewall; @@ -10,8 +7,8 @@ let ports: lib.unique (builtins.sort builtins.lessThan ports); commonOptions = { - allowedTCPPorts = mkOption { - type = types.listOf types.port; + allowedTCPPorts = lib.mkOption { + type = lib.types.listOf lib.types.port; default = [ ]; apply = canonicalizePortList; example = [ 22 80 ]; @@ -21,8 +18,8 @@ let ''; }; - allowedTCPPortRanges = mkOption { - type = types.listOf (types.attrsOf types.port); + allowedTCPPortRanges = lib.mkOption { + type = lib.types.listOf (lib.types.attrsOf lib.types.port); default = [ ]; example = [{ from = 8999; to = 9003; }]; description = '' @@ -31,8 +28,8 @@ let ''; }; - allowedUDPPorts = mkOption { - type = types.listOf types.port; + allowedUDPPorts = lib.mkOption { + type = lib.types.listOf lib.types.port; default = [ ]; apply = canonicalizePortList; example = [ 53 ]; @@ -41,8 +38,8 @@ let ''; }; - allowedUDPPortRanges = mkOption { - type = types.listOf (types.attrsOf types.port); + allowedUDPPortRanges = lib.mkOption { + type = lib.types.listOf (lib.types.attrsOf lib.types.port); default = [ ]; example = [{ from = 60000; to = 61000; }]; description = '' @@ -58,8 +55,8 @@ in options = { networking.firewall = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable the firewall. This is a simple stateful @@ -68,18 +65,18 @@ in ''; }; - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = if config.networking.nftables.enable then pkgs.nftables else pkgs.iptables; - defaultText = literalExpression ''if config.networking.nftables.enable then "pkgs.nftables" else "pkgs.iptables"''; - example = literalExpression "pkgs.iptables-legacy"; + defaultText = lib.literalExpression ''if config.networking.nftables.enable then "pkgs.nftables" else "pkgs.iptables"''; + example = lib.literalExpression "pkgs.iptables-legacy"; description = '' The package to use for running the firewall service. ''; }; - logRefusedConnections = mkOption { - type = types.bool; + logRefusedConnections = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to log rejected or dropped incoming connections. @@ -88,8 +85,8 @@ in ''; }; - logRefusedPackets = mkOption { - type = types.bool; + logRefusedPackets = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to log all rejected or dropped incoming packets. @@ -100,8 +97,8 @@ in ''; }; - logRefusedUnicastsOnly = mkOption { - type = types.bool; + logRefusedUnicastsOnly = lib.mkOption { + type = lib.types.bool; default = true; description = '' If {option}`networking.firewall.logRefusedPackets` @@ -111,8 +108,8 @@ in ''; }; - rejectPackets = mkOption { - type = types.bool; + rejectPackets = lib.mkOption { + type = lib.types.bool; default = false; description = '' If set, refused packets are rejected rather than dropped @@ -123,8 +120,8 @@ in ''; }; - trustedInterfaces = mkOption { - type = types.listOf types.str; + trustedInterfaces = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "enp0s2" ]; description = '' @@ -134,8 +131,8 @@ in ''; }; - allowPing = mkOption { - type = types.bool; + allowPing = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to respond to incoming ICMPv4 echo requests @@ -145,8 +142,8 @@ in ''; }; - pingLimit = mkOption { - type = types.nullOr (types.separatedString " "); + pingLimit = lib.mkOption { + type = lib.types.nullOr (lib.types.separatedString " "); default = null; example = "--limit 1/minute --limit-burst 5"; description = '' @@ -160,10 +157,10 @@ in ''; }; - checkReversePath = mkOption { - type = types.either types.bool (types.enum [ "strict" "loose" ]); + checkReversePath = lib.mkOption { + type = lib.types.either lib.types.bool (lib.types.enum [ "strict" "loose" ]); default = true; - defaultText = literalMD "`true` except if the iptables based firewall is in use and the kernel lacks rpfilter support"; + defaultText = lib.literalMD "`true` except if the iptables based firewall is in use and the kernel lacks rpfilter support"; example = "loose"; description = '' Performs a reverse path filter test on a packet. If a reply @@ -180,8 +177,8 @@ in ''; }; - logReversePathDrops = mkOption { - type = types.bool; + logReversePathDrops = lib.mkOption { + type = lib.types.bool; default = false; description = '' Logs dropped packets failing the reverse path filter test if @@ -189,8 +186,8 @@ in ''; }; - filterForward = mkOption { - type = types.bool; + filterForward = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable filtering in IP forwarding. @@ -199,8 +196,8 @@ in ''; }; - connectionTrackingModules = mkOption { - type = types.listOf types.str; + connectionTrackingModules = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ]; description = '' @@ -219,8 +216,8 @@ in ''; }; - autoLoadConntrackHelpers = mkOption { - type = types.bool; + autoLoadConntrackHelpers = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to auto-load connection-tracking helpers. @@ -230,29 +227,29 @@ in ''; }; - extraPackages = mkOption { - type = types.listOf types.package; + extraPackages = lib.mkOption { + type = lib.types.listOf lib.types.package; default = [ ]; - example = literalExpression "[ pkgs.ipset ]"; + example = lib.literalExpression "[ pkgs.ipset ]"; description = '' Additional packages to be included in the environment of the system as well as the path of networking.firewall.extraCommands. ''; }; - interfaces = mkOption { + interfaces = lib.mkOption { default = { }; - type = with types; attrsOf (submodule [{ options = commonOptions; }]); + type = with lib.types; attrsOf (submodule [{ options = commonOptions; }]); description = '' Interface-specific open ports. ''; }; - allInterfaces = mkOption { + allInterfaces = lib.mkOption { internal = true; visible = false; - default = { default = mapAttrs (name: value: cfg.${name}) commonOptions; } // cfg.interfaces; - type = with types; attrsOf (submodule [{ options = commonOptions; }]); + default = { default = lib.mapAttrs (name: value: cfg.${name}) commonOptions; } // cfg.interfaces; + type = with lib.types; attrsOf (submodule [{ options = commonOptions; }]); description = '' All open ports. ''; @@ -262,7 +259,7 @@ in }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { @@ -279,9 +276,9 @@ in environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages; - boot.kernelModules = (optional cfg.autoLoadConntrackHelpers "nf_conntrack") + boot.kernelModules = (lib.optional cfg.autoLoadConntrackHelpers "nf_conntrack") ++ map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules; - boot.extraModprobeConfig = optionalString cfg.autoLoadConntrackHelpers '' + boot.extraModprobeConfig = lib.optionalString cfg.autoLoadConntrackHelpers '' options nf_conntrack nf_conntrack_helper=1 ''; diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index c55557b668b84..05987df88c187 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -1,11 +1,8 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.flannel; - networkConfig = filterAttrs (n: v: v != null) { + networkConfig = lib.filterAttrs (n: v: v != null) { Network = cfg.network; SubnetLen = cfg.subnetLen; SubnetMin = cfg.subnetMin; @@ -14,128 +11,128 @@ let }; in { options.services.flannel = { - enable = mkEnableOption "flannel"; + enable = lib.mkEnableOption "flannel"; - package = mkPackageOption pkgs "flannel" { }; + package = lib.mkPackageOption pkgs "flannel" { }; - publicIp = mkOption { + publicIp = lib.mkOption { description = '' IP accessible by other nodes for inter-host communication. Defaults to the IP of the interface being used for communication. ''; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; default = null; }; - iface = mkOption { + iface = lib.mkOption { description = '' Interface to use (IP or name) for inter-host communication. Defaults to the interface for the default route on the machine. ''; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; default = null; }; etcd = { - endpoints = mkOption { + endpoints = lib.mkOption { description = "Etcd endpoints"; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = ["http://127.0.0.1:2379"]; }; - prefix = mkOption { + prefix = lib.mkOption { description = "Etcd key prefix"; - type = types.str; + type = lib.types.str; default = "/coreos.com/network"; }; - caFile = mkOption { + caFile = lib.mkOption { description = "Etcd certificate authority file"; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; default = null; }; - certFile = mkOption { + certFile = lib.mkOption { description = "Etcd cert file"; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; default = null; }; - keyFile = mkOption { + keyFile = lib.mkOption { description = "Etcd key file"; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; default = null; }; }; - kubeconfig = mkOption { + kubeconfig = lib.mkOption { description = '' Path to kubeconfig to use for storing flannel config using the Kubernetes API ''; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; default = null; }; - network = mkOption { + network = lib.mkOption { description = " IPv4 network in CIDR format to use for the entire flannel network."; - type = types.str; + type = lib.types.str; }; - nodeName = mkOption { + nodeName = lib.mkOption { description = '' Needed when running with Kubernetes as backend as this cannot be auto-detected"; ''; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; default = config.networking.fqdnOrHostName; - defaultText = literalExpression "config.networking.fqdnOrHostName"; + defaultText = lib.literalExpression "config.networking.fqdnOrHostName"; example = "node1.example.com"; }; - storageBackend = mkOption { + storageBackend = lib.mkOption { description = "Determines where flannel stores its configuration at runtime"; - type = types.enum ["etcd" "kubernetes"]; + type = lib.types.enum ["etcd" "kubernetes"]; default = "etcd"; }; - subnetLen = mkOption { + subnetLen = lib.mkOption { description = '' The size of the subnet allocated to each host. Defaults to 24 (i.e. /24) unless the Network was configured to be smaller than a /24 in which case it is one less than the network. ''; - type = types.int; + type = lib.types.int; default = 24; }; - subnetMin = mkOption { + subnetMin = lib.mkOption { description = '' The beginning of IP range which the subnet allocation should start with. Defaults to the first subnet of Network. ''; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; default = null; }; - subnetMax = mkOption { + subnetMax = lib.mkOption { description = '' The end of IP range which the subnet allocation should start with. Defaults to the last subnet of Network. ''; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; default = null; }; - backend = mkOption { + backend = lib.mkOption { description = "Type of backend to use and specific configurations for that backend."; - type = types.attrs; + type = lib.types.attrs; default = { Type = "vxlan"; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.flannel = { description = "Flannel Service"; wantedBy = [ "multi-user.target" ]; @@ -143,23 +140,23 @@ in { environment = { FLANNELD_PUBLIC_IP = cfg.publicIp; FLANNELD_IFACE = cfg.iface; - } // optionalAttrs (cfg.storageBackend == "etcd") { - FLANNELD_ETCD_ENDPOINTS = concatStringsSep "," cfg.etcd.endpoints; + } // lib.optionalAttrs (cfg.storageBackend == "etcd") { + FLANNELD_ETCD_ENDPOINTS = lib.concatStringsSep "," cfg.etcd.endpoints; FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile; FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile; FLANNELD_ETCD_CAFILE = cfg.etcd.caFile; ETCDCTL_CERT = cfg.etcd.certFile; ETCDCTL_KEY = cfg.etcd.keyFile; ETCDCTL_CACERT = cfg.etcd.caFile; - ETCDCTL_ENDPOINTS = concatStringsSep "," cfg.etcd.endpoints; + ETCDCTL_ENDPOINTS = lib.concatStringsSep "," cfg.etcd.endpoints; ETCDCTL_API = "3"; - } // optionalAttrs (cfg.storageBackend == "kubernetes") { + } // lib.optionalAttrs (cfg.storageBackend == "kubernetes") { FLANNELD_KUBE_SUBNET_MGR = "true"; FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig; NODE_NAME = cfg.nodeName; }; path = [ pkgs.iptables ]; - preStart = optionalString (cfg.storageBackend == "etcd") '' + preStart = lib.optionalString (cfg.storageBackend == "etcd") '' echo "setting network configuration" until ${pkgs.etcd}/bin/etcdctl put /coreos.com/network/config '${builtins.toJSON networkConfig}' do @@ -175,11 +172,11 @@ in { }; }; - services.etcd.enable = mkDefault (cfg.storageBackend == "etcd" && cfg.etcd.endpoints == ["http://127.0.0.1:2379"]); + services.etcd.enable = lib.mkDefault (cfg.storageBackend == "etcd" && cfg.etcd.endpoints == ["http://127.0.0.1:2379"]); # for some reason, flannel doesn't let you configure this path # see: https://github.com/coreos/flannel/blob/master/Documentation/configuration.md#configuration - environment.etc."kube-flannel/net-conf.json" = mkIf (cfg.storageBackend == "kubernetes") { + environment.etc."kube-flannel/net-conf.json" = lib.mkIf (cfg.storageBackend == "kubernetes") { source = pkgs.writeText "net-conf.json" (builtins.toJSON networkConfig); }; }; diff --git a/nixos/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix index 3da3ab0c7df48..4323b98d67075 100644 --- a/nixos/modules/services/networking/freenet.nix +++ b/nixos/modules/services/networking/freenet.nix @@ -1,9 +1,5 @@ # NixOS module for Freenet daemon - { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.freenet; @@ -19,14 +15,14 @@ in services.freenet = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable the Freenet daemon"; }; - nice = mkOption { - type = types.int; + nice = lib.mkOption { + type = lib.types.int; default = 10; description = "Set the nice level for the Freenet daemon"; }; @@ -37,7 +33,7 @@ in ### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.freenet = { description = "Freenet daemon"; diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix index 7fa3a8fa17fa7..d747219b29cb6 100644 --- a/nixos/modules/services/networking/freeradius.nix +++ b/nixos/modules/services/networking/freeradius.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.freeradius; @@ -13,14 +10,14 @@ let after = ["network.target"]; wants = ["network.target"]; preStart = '' - ${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout + ${cfg.package}/bin/radiusd -C -d ${cfg.configDir} -l stdout ''; serviceConfig = { - ExecStart = "${pkgs.freeradius}/bin/radiusd -f -d ${cfg.configDir} -l stdout" + - optionalString cfg.debug " -xx"; + ExecStart = "${cfg.package}/bin/radiusd -f -d ${cfg.configDir} -l stdout" + + lib.optionalString cfg.debug " -xx"; ExecReload = [ - "${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout" + "${cfg.package}/bin/radiusd -C -d ${cfg.configDir} -l stdout" "${pkgs.coreutils}/bin/kill -HUP $MAINPID" ]; User = "radius"; @@ -33,18 +30,20 @@ let }; freeradiusConfig = { - enable = mkEnableOption "the freeradius server"; + enable = lib.mkEnableOption "the freeradius server"; + + package = lib.mkPackageOption pkgs "freeradius" { }; - configDir = mkOption { - type = types.path; + configDir = lib.mkOption { + type = lib.types.path; default = "/etc/raddb"; description = '' The path of the freeradius server configuration directory. ''; }; - debug = mkOption { - type = types.bool; + debug = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable debug logging for freeradius (-xx @@ -68,18 +67,20 @@ in ###### implementation - config = mkIf (cfg.enable) { + config = lib.mkIf (cfg.enable) { users = { users.radius = { /*uid = config.ids.uids.radius;*/ description = "Radius daemon user"; isSystemUser = true; + group = "radius"; }; + groups.radius = {}; }; systemd.services.freeradius = freeradiusService cfg; - warnings = optional cfg.debug "Freeradius debug logging is enabled. This will log passwords in plaintext to the journal!"; + warnings = lib.optional cfg.debug "Freeradius debug logging is enabled. This will log passwords in plaintext to the journal!"; }; diff --git a/nixos/modules/services/networking/frp.nix b/nixos/modules/services/networking/frp.nix index fc15efe5642db..56af543b845ba 100644 --- a/nixos/modules/services/networking/frp.nix +++ b/nixos/modules/services/networking/frp.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.frp; settingsFormat = pkgs.formats.toml { }; @@ -12,12 +9,12 @@ in { options = { services.frp = { - enable = mkEnableOption "frp"; + enable = lib.mkEnableOption "frp"; - package = mkPackageOption pkgs "frp" { }; + package = lib.mkPackageOption pkgs "frp" { }; - role = mkOption { - type = types.enum [ "server" "client" ]; + role = lib.mkOption { + type = lib.types.enum [ "server" "client" ]; description = '' The frp consists of `client` and `server`. The server is usually deployed on the machine with a public IP address, and @@ -26,7 +23,7 @@ in ''; }; - settings = mkOption { + settings = lib.mkOption { type = settingsFormat.type; default = { }; description = '' @@ -44,13 +41,13 @@ in config = let - serviceCapability = optionals isServer [ "CAP_NET_BIND_SERVICE" ]; + serviceCapability = lib.optionals isServer [ "CAP_NET_BIND_SERVICE" ]; executableFile = if isClient then "frpc" else "frps"; in - mkIf cfg.enable { + lib.mkIf cfg.enable { systemd.services = { frp = { - wants = optionals isClient [ "network-online.target" ]; + wants = lib.optionals isClient [ "network-online.target" ]; after = if isClient then [ "network-online.target" ] else [ "network.target" ]; wantedBy = [ "multi-user.target" ]; description = "A fast reverse proxy frp ${cfg.role}"; @@ -59,10 +56,10 @@ in Restart = "on-failure"; RestartSec = 15; ExecStart = "${cfg.package}/bin/${executableFile} --strict_config -c ${configFile}"; - StateDirectoryMode = optionalString isServer "0700"; + StateDirectoryMode = lib.optionalString isServer "0700"; DynamicUser = true; # Hardening - UMask = optionalString isServer "0007"; + UMask = lib.optionalString isServer "0007"; CapabilityBoundingSet = serviceCapability; AmbientCapabilities = serviceCapability; PrivateDevices = true; @@ -72,7 +69,7 @@ in ProtectKernelModules = true; ProtectKernelLogs = true; ProtectControlGroups = true; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ] ++ optionals isClient [ "AF_UNIX" ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ] ++ lib.optionals isClient [ "AF_UNIX" ]; LockPersonality = true; MemoryDenyWriteExecute = true; RestrictRealtime = true; @@ -85,5 +82,5 @@ in }; }; - meta.maintainers = with maintainers; [ zaldnoay ]; + meta.maintainers = with lib.maintainers; [ zaldnoay ]; } diff --git a/nixos/modules/services/networking/frr.nix b/nixos/modules/services/networking/frr.nix index df2b4035d2f07..fd5673651f36b 100644 --- a/nixos/modules/services/networking/frr.nix +++ b/nixos/modules/services/networking/frr.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.frr; @@ -51,10 +48,10 @@ let serviceOptions = service: { - enable = mkEnableOption "the FRR ${toUpper service} routing protocol"; + enable = lib.mkEnableOption "the FRR ${lib.toUpper service} routing protocol"; - configFile = mkOption { - type = types.nullOr types.path; + configFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; example = "/etc/frr/${daemonName service}.conf"; description = '' @@ -63,8 +60,8 @@ let ''; }; - config = mkOption { - type = types.lines; + config = lib.mkOption { + type = lib.types.lines; default = ""; example = let @@ -91,24 +88,24 @@ let ''; }; - vtyListenAddress = mkOption { - type = types.str; + vtyListenAddress = lib.mkOption { + type = lib.types.str; default = "localhost"; description = '' Address to bind to for the VTY interface. ''; }; - vtyListenPort = mkOption { - type = types.nullOr types.int; + vtyListenPort = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; description = '' TCP Port to bind to for the VTY interface. ''; }; - extraOptions = mkOption { - type = types.listOf types.str; + extraOptions = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = '' Extra options for the daemon. @@ -125,9 +122,9 @@ in { options.services.frr = { zebra = (serviceOptions "zebra") // { - enable = mkOption { - type = types.bool; - default = any isEnabled services; + enable = lib.mkOption { + type = lib.types.bool; + default = lib.any isEnabled services; description = '' Whether to enable the Zebra routing manager. @@ -137,8 +134,8 @@ in }; }; mgmt = (serviceOptions "mgmt") // { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = isEnabled "static"; defaultText = lib.literalExpression "config.services.frr.static.enable"; description = '' @@ -152,12 +149,12 @@ in }; }; } - { options.services.frr = (genAttrs services serviceOptions); } + { options.services.frr = (lib.genAttrs services serviceOptions); } ]; ###### implementation - config = mkIf (any isEnabled allServices) { + config = lib.mkIf (lib.any isEnabled allServices) { environment.systemPackages = [ pkgs.frr # for the vtysh tool @@ -182,7 +179,7 @@ in }; in (builtins.listToAttrs - (map mkEtcLink (filter isEnabled allServices))) // { + (map mkEtcLink (lib.filter isEnabled allServices))) // { "frr/vtysh.conf".text = ""; }; @@ -197,19 +194,19 @@ in scfg = cfg.${service}; daemon = daemonName service; in - nameValuePair daemon ({ + lib.nameValuePair daemon ({ wantedBy = [ "multi-user.target" ]; after = [ "network-pre.target" "systemd-sysctl.service" ] ++ lib.optionals (service != "zebra") [ "zebra.service" ]; bindsTo = lib.optionals (service != "zebra") [ "zebra.service" ]; wants = [ "network.target" ]; description = if service == "zebra" then "FRR Zebra routing manager" - else "FRR ${toUpper service} routing daemon"; + else "FRR ${lib.toUpper service} routing daemon"; unitConfig.Documentation = if service == "zebra" then "man:zebra(8)" else "man:${daemon}(8) man:zebra(8)"; - restartTriggers = mkIf (service != "mgmt") [ + restartTriggers = lib.mkIf (service != "mgmt") [ (configFile service) ]; reloadIfChanged = (service != "mgmt"); @@ -217,15 +214,15 @@ in serviceConfig = { PIDFile = "frr/${daemon}.pid"; ExecStart = "${pkgs.frr}/libexec/frr/${daemon}" - + optionalString (scfg.vtyListenAddress != "") " -A ${scfg.vtyListenAddress}" - + optionalString (scfg.vtyListenPort != null) " -P ${toString scfg.vtyListenPort}" - + " " + (concatStringsSep " " scfg.extraOptions); - ExecReload = mkIf (service != "mgmt") "${pkgs.python3.interpreter} ${pkgs.frr}/libexec/frr/frr-reload.py --reload --daemon ${daemon} --bindir ${pkgs.frr}/bin --rundir /run/frr /etc/frr/${daemon}.conf"; + + lib.optionalString (scfg.vtyListenAddress != "") " -A ${scfg.vtyListenAddress}" + + lib.optionalString (scfg.vtyListenPort != null) " -P ${toString scfg.vtyListenPort}" + + " " + (lib.concatStringsSep " " scfg.extraOptions); + ExecReload = lib.mkIf (service != "mgmt") "${pkgs.python3.interpreter} ${pkgs.frr}/libexec/frr/frr-reload.py --reload --daemon ${daemon} --bindir ${pkgs.frr}/bin --rundir /run/frr /etc/frr/${daemon}.conf"; Restart = "on-abnormal"; }; }); in - listToAttrs (map frrService (filter isEnabled allServices)); + lib.listToAttrs (map frrService (lib.filter isEnabled allServices)); }; diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix index e68f8a47d5c0d..83a7ea2485943 100644 --- a/nixos/modules/services/networking/gateone.nix +++ b/nixos/modules/services/networking/gateone.nix @@ -1,25 +1,24 @@ { config, lib, pkgs, ...}: -with lib; let cfg = config.services.gateone; in { options = { services.gateone = { - enable = mkEnableOption "GateOne server"; - pidDir = mkOption { + enable = lib.mkEnableOption "GateOne server"; + pidDir = lib.mkOption { default = "/run/gateone"; - type = types.path; + type = lib.types.path; description = "Path of pid files for GateOne."; }; - settingsDir = mkOption { + settingsDir = lib.mkOption { default = "/var/lib/gateone"; - type = types.path; + type = lib.types.path; description = "Path of configuration files for GateOne."; }; }; }; -config = mkIf cfg.enable { +config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs.pythonPackages; [ gateone pkgs.openssh pkgs.procps pkgs.coreutils pkgs.cacert]; diff --git a/nixos/modules/services/networking/gdomap.nix b/nixos/modules/services/networking/gdomap.nix index 3d829cb691353..b7d6e2a2b690f 100644 --- a/nixos/modules/services/networking/gdomap.nix +++ b/nixos/modules/services/networking/gdomap.nix @@ -1,21 +1,18 @@ { config, lib, pkgs, ... }: - -with lib; - { # # interface # options = { services.gdomap = { - enable = mkEnableOption "GNUstep Distributed Objects name server"; + enable = lib.mkEnableOption "GNUstep Distributed Objects name server"; }; }; # # implementation # - config = mkIf config.services.gdomap.enable { + config = lib.mkIf config.services.gdomap.enable { # NOTE: gdomap runs as root # TODO: extra user for gdomap? systemd.services.gdomap = { diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix index 522e6b14f868f..215d7f79a52cf 100644 --- a/nixos/modules/services/networking/git-daemon.nix +++ b/nixos/modules/services/networking/git-daemon.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.services.gitDaemon; @@ -12,8 +11,8 @@ in options = { services.gitDaemon = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable Git daemon, which allows public hosting of git repositories @@ -27,10 +26,10 @@ in ''; }; - package = mkPackageOption pkgs "git" { }; + package = lib.mkPackageOption pkgs "git" { }; - basePath = mkOption { - type = types.str; + basePath = lib.mkOption { + type = lib.types.str; default = ""; example = "/srv/git/"; description = '' @@ -40,8 +39,8 @@ in ''; }; - exportAll = mkOption { - type = types.bool; + exportAll = lib.mkOption { + type = lib.types.bool; default = false; description = '' Publish all directories that look like Git repositories (have the objects @@ -55,8 +54,8 @@ in ''; }; - repositories = mkOption { - type = types.listOf types.str; + repositories = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "/srv/git" "/home/user/git/repo2" ]; description = '' @@ -68,33 +67,33 @@ in ''; }; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = ""; example = "example.com"; description = "Listen on a specific IP address or hostname."; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 9418; description = "Port to listen on."; }; - options = mkOption { - type = types.str; + options = lib.mkOption { + type = lib.types.str; default = ""; description = "Extra configuration options to be passed to Git daemon."; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "git"; description = "User under which Git daemon would be running."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "git"; description = "Group under which Git daemon would be running."; }; @@ -104,9 +103,9 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - users.users = optionalAttrs (cfg.user == "git") { + users.users = lib.optionalAttrs (cfg.user == "git") { git = { uid = config.ids.uids.git; group = "git"; @@ -114,18 +113,18 @@ in }; }; - users.groups = optionalAttrs (cfg.group == "git") { + users.groups = lib.optionalAttrs (cfg.group == "git") { git.gid = config.ids.gids.git; }; systemd.services.git-daemon = { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${getExe cfg.package} daemon --reuseaddr " - + (optionalString (cfg.basePath != "") "--base-path=${cfg.basePath} ") - + (optionalString (cfg.listenAddress != "") "--listen=${cfg.listenAddress} ") + script = "${lib.getExe cfg.package} daemon --reuseaddr " + + (lib.optionalString (cfg.basePath != "") "--base-path=${cfg.basePath} ") + + (lib.optionalString (cfg.listenAddress != "") "--listen=${cfg.listenAddress} ") + "--port=${toString cfg.port} --user=${cfg.user} --group=${cfg.group} ${cfg.options} " - + "--verbose " + (optionalString cfg.exportAll "--export-all ") + concatStringsSep " " cfg.repositories; + + "--verbose " + (lib.optionalString cfg.exportAll "--export-all ") + lib.concatStringsSep " " cfg.repositories; }; }; diff --git a/nixos/modules/services/networking/globalprotect-vpn.nix b/nixos/modules/services/networking/globalprotect-vpn.nix deleted file mode 100644 index 4292bba78f767..0000000000000 --- a/nixos/modules/services/networking/globalprotect-vpn.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.globalprotect; - - execStart = - if cfg.csdWrapper == null then - "${pkgs.globalprotect-openconnect}/bin/gpservice" - else - "${pkgs.globalprotect-openconnect}/bin/gpservice --csd-wrapper=${cfg.csdWrapper}"; -in - -{ - options.services.globalprotect = { - enable = mkEnableOption "globalprotect"; - - settings = mkOption { - description = '' - GlobalProtect-openconnect configuration. For more information, visit - . - ''; - default = { }; - example = { - "vpn1.company.com" = { - openconnect-args = "--script=/path/to/vpnc-script"; - }; - }; - type = types.attrs; - }; - - csdWrapper = mkOption { - description = '' - A script that will produce a Host Integrity Protection (HIP) report, - as described at - ''; - default = null; - example = literalExpression ''"''${pkgs.openconnect}/libexec/openconnect/hipreport.sh"''; - type = types.nullOr types.path; - }; - }; - - config = mkIf cfg.enable { - services.dbus.packages = [ pkgs.globalprotect-openconnect ]; - - environment.etc."gpservice/gp.conf".text = lib.generators.toINI { } cfg.settings; - - systemd.services.gpservice = { - description = "GlobalProtect openconnect DBus service"; - serviceConfig = { - Type = "dbus"; - BusName = "com.yuezk.qt.GPService"; - ExecStart = execStart; - }; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - }; - }; -} diff --git a/nixos/modules/services/networking/gns3-server.nix b/nixos/modules/services/networking/gns3-server.nix index ec6a53dddc709..71980f52df2d4 100644 --- a/nixos/modules/services/networking/gns3-server.nix +++ b/nixos/modules/services/networking/gns3-server.nix @@ -129,8 +129,15 @@ in { } ]; + users.groups.gns3 = { }; + users.groups.ubridge = lib.mkIf cfg.ubridge.enable { }; + users.users.gns3 = { + group = "gns3"; + isSystemUser = true; + }; + security.wrappers.ubridge = lib.mkIf cfg.ubridge.enable { capabilities = "cap_net_raw,cap_net_admin=eip"; group = "ubridge"; @@ -150,7 +157,7 @@ in { }; } (lib.mkIf (cfg.ubridge.enable) { - Server.ubridge_path = lib.mkDefault (lib.getExe cfg.ubridge.package); + Server.ubridge_path = lib.mkDefault "/run/wrappers/bin/ubridge"; }) (lib.mkIf (cfg.auth.enable) { Server = { @@ -206,7 +213,6 @@ in { serviceConfig = { ConfigurationDirectory = "gns3"; ConfigurationDirectoryMode = "0750"; - DynamicUser = true; Environment = "HOME=%S/gns3"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecStart = "${lib.getExe cfg.package} ${commandArgs}"; @@ -227,14 +233,27 @@ in { User = "gns3"; WorkingDirectory = "%S/gns3"; + # Required for ubridge integration to work + # + # GNS3 needs to run SUID binaries (ubridge) + # but NoNewPrivileges breaks execution of SUID binaries + DynamicUser = false; + NoNewPrivileges = false; + RestrictSUIDSGID = false; + PrivateUsers = false; + # Hardening - DeviceAllow = lib.optional flags.enableLibvirtd "/dev/kvm"; + DeviceAllow = [ + # ubridge needs access to tun/tap devices + "/dev/net/tap rw" + "/dev/net/tun rw" + ] ++ lib.optionals flags.enableLibvirtd [ + "/dev/kvm" + ]; DevicePolicy = "closed"; LockPersonality = true; MemoryDenyWriteExecute = true; - NoNewPrivileges = true; PrivateTmp = true; - PrivateUsers = true; # Don't restrict ProcSubset because python3Packages.psutil requires read access to /proc/stat # ProcSubset = "pid"; ProtectClock = true; @@ -255,8 +274,7 @@ in { ]; RestrictNamespaces = true; RestrictRealtime = true; - RestrictSUIDSGID = true; - UMask = "0077"; + UMask = "0022"; }; }; }; diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index cfe1e1709142e..7380f22c13f2f 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.gnunet; @@ -44,8 +41,8 @@ in services.gnunet = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to run the GNUnet daemon. GNUnet is GNU's anonymous @@ -54,8 +51,8 @@ in }; fileSharing = { - quota = mkOption { - type = types.int; + quota = lib.mkOption { + type = lib.types.int; default = 1024; description = '' Maximum file system usage (in MiB) for file sharing. @@ -64,8 +61,8 @@ in }; udp = { - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 2086; # assigned by IANA description = '' The UDP port for use by GNUnet. @@ -74,8 +71,8 @@ in }; tcp = { - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 2086; # assigned by IANA description = '' The TCP port for use by GNUnet. @@ -84,8 +81,8 @@ in }; load = { - maxNetDownBandwidth = mkOption { - type = types.int; + maxNetDownBandwidth = lib.mkOption { + type = lib.types.int; default = 50000; description = '' Maximum bandwidth usage (in bits per second) for GNUnet @@ -93,8 +90,8 @@ in ''; }; - maxNetUpBandwidth = mkOption { - type = types.int; + maxNetUpBandwidth = lib.mkOption { + type = lib.types.int; default = 50000; description = '' Maximum bandwidth usage (in bits per second) for GNUnet @@ -102,8 +99,8 @@ in ''; }; - hardNetUpBandwidth = mkOption { - type = types.int; + hardNetUpBandwidth = lib.mkOption { + type = lib.types.int; default = 0; description = '' Hard bandwidth limit (in bits per second) when uploading @@ -112,12 +109,12 @@ in }; }; - package = mkPackageOption pkgs "gnunet" { + package = lib.mkPackageOption pkgs "gnunet" { example = "gnunet_git"; }; - extraOptions = mkOption { - type = types.lines; + extraOptions = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Additional options that will be copied verbatim in `gnunet.conf`. @@ -131,7 +128,7 @@ in ###### implementation - config = mkIf config.services.gnunet.enable { + config = lib.mkIf config.services.gnunet.enable { users.users.gnunet = { group = "gnunet"; diff --git a/nixos/modules/services/networking/go-autoconfig.nix b/nixos/modules/services/networking/go-autoconfig.nix index 2fc7c53218ca4..b31ef227c587f 100644 --- a/nixos/modules/services/networking/go-autoconfig.nix +++ b/nixos/modules/services/networking/go-autoconfig.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.go-autoconfig; @@ -12,19 +9,19 @@ in { options = { services.go-autoconfig = { - enable = mkEnableOption "IMAP/SMTP autodiscover feature for mail clients"; + enable = lib.mkEnableOption "IMAP/SMTP autodiscover feature for mail clients"; - settings = mkOption { + settings = lib.mkOption { default = { }; description = '' Configuration for go-autoconfig. See for more information. ''; - type = types.submodule { + type = lib.types.submodule { freeformType = format.type; }; - example = literalExpression '' + example = lib.literalExpression '' { service_addr = ":1323"; domain = "autoconfig.example.org"; @@ -43,7 +40,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd = { services.go-autoconfig = { diff --git a/nixos/modules/services/networking/go-neb.nix b/nixos/modules/services/networking/go-neb.nix index ae414509162b2..4a43c574ff530 100644 --- a/nixos/modules/services/networking/go-neb.nix +++ b/nixos/modules/services/networking/go-neb.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.go-neb; @@ -9,16 +6,16 @@ let configFile = settingsFormat.generate "config.yaml" cfg.config; in { options.services.go-neb = { - enable = mkEnableOption "an extensible matrix bot written in Go"; + enable = lib.mkEnableOption "an extensible matrix bot written in Go"; - bindAddress = mkOption { - type = types.str; + bindAddress = lib.mkOption { + type = lib.types.str; description = "Port (and optionally address) to listen on."; default = ":4050"; }; - secretFile = mkOption { - type = types.nullOr types.path; + secretFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; example = "/run/keys/go-neb.env"; description = '' @@ -30,12 +27,12 @@ in { ''; }; - baseUrl = mkOption { - type = types.str; + baseUrl = lib.mkOption { + type = lib.types.str; description = "Public-facing endpoint that can receive webhooks."; }; - config = mkOption { + config = lib.mkOption { inherit (settingsFormat) type; description = '' Your {file}`config.yaml` as a Nix attribute set. @@ -45,7 +42,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.go-neb = let finalConfigFile = if cfg.secretFile == null then configFile else "/var/run/go-neb/config.yaml"; in { @@ -74,5 +71,5 @@ in { }; }; - meta.maintainers = with maintainers; [ hexa maralorn ]; + meta.maintainers = with lib.maintainers; [ hexa maralorn ]; } diff --git a/nixos/modules/services/networking/go-shadowsocks2.nix b/nixos/modules/services/networking/go-shadowsocks2.nix index afbd7ea27c65c..438d3fb1c0a60 100644 --- a/nixos/modules/services/networking/go-shadowsocks2.nix +++ b/nixos/modules/services/networking/go-shadowsocks2.nix @@ -1,20 +1,18 @@ { config, lib, pkgs, ... }: - -with lib; let cfg = config.services.go-shadowsocks2.server; in { options.services.go-shadowsocks2.server = { - enable = mkEnableOption "go-shadowsocks2 server"; + enable = lib.mkEnableOption "go-shadowsocks2 server"; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; description = "Server listen address or URL"; example = "ss://AEAD_CHACHA20_POLY1305:your-password@:8488"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.go-shadowsocks2-server = { description = "go-shadowsocks2 server"; diff --git a/nixos/modules/services/networking/gobgpd.nix b/nixos/modules/services/networking/gobgpd.nix index e5d8c190b9118..79f1adf4e314d 100644 --- a/nixos/modules/services/networking/gobgpd.nix +++ b/nixos/modules/services/networking/gobgpd.nix @@ -1,16 +1,13 @@ { config, pkgs, lib, ... }: - -with lib; - let cfg = config.services.gobgpd; format = pkgs.formats.toml { }; confFile = format.generate "gobgpd.conf" cfg.settings; in { options.services.gobgpd = { - enable = mkEnableOption "GoBGP Routing Daemon"; + enable = lib.mkEnableOption "GoBGP Routing Daemon"; - settings = mkOption { + settings = lib.mkOption { type = format.type; default = { }; description = '' @@ -18,7 +15,7 @@ in { for details on supported values. ''; - example = literalExpression '' + example = lib.literalExpression '' { global = { config = { @@ -45,7 +42,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.gobgpd ]; systemd.services.gobgpd = { wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix index 0d0e2c340ebf1..b1cb37158a043 100644 --- a/nixos/modules/services/networking/hans.nix +++ b/nixos/modules/services/networking/hans.nix @@ -1,9 +1,5 @@ # NixOS module for hans, ip over icmp daemon - { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.hans; @@ -17,7 +13,7 @@ in options = { services.hans = { - clients = mkOption { + clients = lib.mkOption { default = {}; description = '' Each attribute of this option defines a systemd service that @@ -27,7 +23,7 @@ in where «name» is the name of the corresponding attribute name. ''; - example = literalExpression '' + example = lib.literalExpression '' { foo = { server = "192.0.2.1"; @@ -35,25 +31,25 @@ in } } ''; - type = types.attrsOf (types.submodule ( + type = lib.types.attrsOf (lib.types.submodule ( { options = { - server = mkOption { - type = types.str; + server = lib.mkOption { + type = lib.types.str; default = ""; description = "IP address of server running hans"; example = "192.0.2.1"; }; - extraConfig = mkOption { - type = types.str; + extraConfig = lib.mkOption { + type = lib.types.str; default = ""; description = "Additional command line parameters"; example = "-v"; }; - passwordFile = mkOption { - type = types.str; + passwordFile = lib.mkOption { + type = lib.types.str; default = ""; description = "File that contains password"; }; @@ -63,34 +59,34 @@ in }; server = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "enable hans server"; }; - ip = mkOption { - type = types.str; + ip = lib.mkOption { + type = lib.types.str; default = ""; description = "The assigned ip range"; example = "198.51.100.0"; }; - respondToSystemPings = mkOption { - type = types.bool; + respondToSystemPings = lib.mkOption { + type = lib.types.bool; default = false; description = "Force hans respond to ordinary pings"; }; - extraConfig = mkOption { - type = types.str; + extraConfig = lib.mkOption { + type = lib.types.str; default = ""; description = "Additional command line parameters"; example = "-v"; }; - passwordFile = mkOption { - type = types.str; + passwordFile = lib.mkOption { + type = lib.types.str; default = ""; description = "File that contains password"; }; @@ -101,8 +97,8 @@ in ### implementation - config = mkIf (cfg.server.enable || cfg.clients != {}) { - boot.kernel.sysctl = optionalAttrs cfg.server.respondToSystemPings { + config = lib.mkIf (cfg.server.enable || cfg.clients != {}) { + boot.kernel.sysctl = lib.optionalAttrs cfg.server.respondToSystemPings { "net.ipv4.icmp_echo_ignore_all" = 1; }; @@ -115,23 +111,23 @@ in description = "hans client - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}"; + script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server} ${lib.optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}"; serviceConfig = { RestartSec = "30s"; Restart = "always"; }; }; in - listToAttrs ( - mapAttrsToList - (name: value: nameValuePair "hans-${name}" (createHansClientService name value)) + lib.listToAttrs ( + lib.mapAttrsToList + (name: value: lib.nameValuePair "hans-${name}" (createHansClientService name value)) cfg.clients ) // { - hans = mkIf (cfg.server.enable) { + hans = lib.mkIf (cfg.server.enable) { description = "hans, ip over icmp server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.respondToSystemPings "-r"} ${optionalString (cfg.server.passwordFile != "") "-p $(cat \"${cfg.server.passwordFile}\")"}"; + script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${lib.optionalString cfg.server.respondToSystemPings "-r"} ${lib.optionalString (cfg.server.passwordFile != "") "-p $(cat \"${cfg.server.passwordFile}\")"}"; }; }; diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix index 19b096bf49069..23c06f2949808 100644 --- a/nixos/modules/services/networking/haproxy.nix +++ b/nixos/modules/services/networking/haproxy.nix @@ -1,40 +1,35 @@ { config, lib, pkgs, ... }: - let cfg = config.services.haproxy; - haproxyCfg = pkgs.writeText "haproxy.conf" '' global # needed for hot-reload to work without dropping packets in multi-worker mode stats socket /run/haproxy/haproxy.sock mode 600 expose-fd listeners level user - ${cfg.config} ''; - in -with lib; { options = { services.haproxy = { - enable = mkEnableOption "HAProxy, the reliable, high performance TCP/HTTP load balancer"; + enable = lib.mkEnableOption "HAProxy, the reliable, high performance TCP/HTTP load balancer"; - package = mkPackageOption pkgs "haproxy" { }; + package = lib.mkPackageOption pkgs "haproxy" { }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "haproxy"; description = "User account under which haproxy runs."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "haproxy"; description = "Group account under which haproxy runs."; }; - config = mkOption { - type = types.nullOr types.lines; + config = lib.mkOption { + type = lib.types.nullOr lib.types.lines; default = null; description = '' Contents of the HAProxy configuration file, @@ -44,7 +39,7 @@ with lib; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [{ assertion = cfg.config != null; @@ -93,14 +88,14 @@ with lib; }; }; - users.users = optionalAttrs (cfg.user == "haproxy") { + users.users = lib.optionalAttrs (cfg.user == "haproxy") { haproxy = { group = cfg.group; isSystemUser = true; }; }; - users.groups = optionalAttrs (cfg.group == "haproxy") { + users.groups = lib.optionalAttrs (cfg.group == "haproxy") { haproxy = {}; }; }; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index b678656f2e046..3a3f14523d41a 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -235,7 +235,7 @@ in { }; channel = mkOption { - default = 7; + default = 0; example = 11; type = types.int; description = '' diff --git a/nixos/modules/services/networking/htpdate.nix b/nixos/modules/services/networking/htpdate.nix index 6954e5b060c4c..fa422854872c6 100644 --- a/nixos/modules/services/networking/htpdate.nix +++ b/nixos/modules/services/networking/htpdate.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let inherit (pkgs) htpdate; @@ -16,32 +13,32 @@ in services.htpdate = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable htpdate daemon. ''; }; - extraOptions = mkOption { - type = types.str; + extraOptions = lib.mkOption { + type = lib.types.str; default = ""; description = '' Additional command line arguments to pass to htpdate. ''; }; - servers = mkOption { - type = types.listOf types.str; + servers = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ "www.google.com" ]; description = '' HTTP servers to use for time synchronization. ''; }; - proxy = mkOption { - type = types.str; + proxy = lib.mkOption { + type = lib.types.str; default = ""; example = "127.0.0.1:8118"; description = '' @@ -55,7 +52,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.htpdate = { description = "htpdate daemon"; @@ -63,14 +60,14 @@ in serviceConfig = { Type = "forking"; PIDFile = "/run/htpdate.pid"; - ExecStart = concatStringsSep " " [ + ExecStart = lib.concatStringsSep " " [ "${htpdate}/bin/htpdate" "-D -u nobody" "-a -s" "-l" - "${optionalString (cfg.proxy != "") "-P ${cfg.proxy}"}" + "${lib.optionalString (cfg.proxy != "") "-P ${cfg.proxy}"}" "${cfg.extraOptions}" - "${concatStringsSep " " cfg.servers}" + "${lib.concatStringsSep " " cfg.servers}" ]; }; }; diff --git a/nixos/modules/services/networking/i2p.nix b/nixos/modules/services/networking/i2p.nix index 2b38697b1f471..5d7b339dc01b5 100644 --- a/nixos/modules/services/networking/i2p.nix +++ b/nixos/modules/services/networking/i2p.nix @@ -1,17 +1,14 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.i2p; homeDir = "/var/lib/i2p"; in { ###### interface - options.services.i2p.enable = mkEnableOption "I2P router"; + options.services.i2p.enable = lib.mkEnableOption "I2P router"; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.users.i2p = { group = "i2p"; description = "i2p User"; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 2bb9df15de2c3..72069e609ac28 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -1,17 +1,17 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkIf mkOption mkDefault mkEnableOption types optional optionals; + inherit (lib.types) nullOr bool listOf str attrsOf submodule; cfg = config.services.i2pd; homeDir = "/var/lib/i2pd"; strOpt = k: v: k + " = " + v; - boolOpt = k: v: k + " = " + boolToString v; + boolOpt = k: v: k + " = " + lib.boolToString v; intOpt = k: v: k + " = " + toString v; - lstOpt = k: xs: k + " = " + concatStringsSep "," xs; + lstOpt = k: xs: k + " = " + lib.concatStringsSep "," xs; optionalNullString = o: s: optional (s != null) (strOpt o s); optionalNullBool = o: b: optional (b != null) (boolOpt o b); optionalNullInt = o: i: optional (i != null) (intOpt o i); @@ -54,7 +54,7 @@ let mkKeyedEndpointOpt = name: addr: port: keyloc: (mkEndpointOpt name addr port) // { keys = mkOption { - type = with types; nullOr str; + type = nullOr str; default = keyloc; description = '' File to persist ${lib.toUpper name} keys. @@ -162,8 +162,8 @@ let (sec "meshnets") (boolOpt "yggdrasil" cfg.yggdrasil.enable) ] ++ (optionalNullString "yggaddress" cfg.yggdrasil.address) - ++ (flip map - (collect (proto: proto ? port && proto ? address) cfg.proto) + ++ (lib.flip map + (lib.collect (proto: proto ? port && proto ? address) cfg.proto) (proto: let protoOpts = [ (sec proto.name) (boolOpt "enabled" proto.enable) @@ -178,10 +178,10 @@ let ++ (optionals (proto ? outproxy) (optionalNullString "outproxy" proto.outproxy)) ++ (optionals (proto ? outproxyPort) (optionalNullInt "outproxyport" proto.outproxyPort)) ++ (optionals (proto ? outproxyEnable) (optionalNullBool "outproxy.enabled" proto.outproxyEnable)); - in (concatStringsSep "\n" protoOpts) + in (lib.concatStringsSep "\n" protoOpts) )); in - pkgs.writeText "i2pd.conf" (concatStringsSep "\n" opts); + pkgs.writeText "i2pd.conf" (lib.concatStringsSep "\n" opts); tunnelConf = let mkOutTunnel = tun: @@ -200,7 +200,7 @@ let ++ (optionals (tun ? outbound.quantity) (optionalNullInt "outbound.quantity" tun.outbound.quantity)) ++ (optionals (tun ? crypto.tagsToSend) (optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend)); in - concatStringsSep "\n" outTunOpts; + lib.concatStringsSep "\n" outTunOpts; mkInTunnel = tun: let @@ -214,16 +214,16 @@ let ++ (optionals (tun ? inPort) (optionalNullInt "inport" tun.inPort)) ++ (optionals (tun ? accessList) (optionalEmptyList "accesslist" tun.accessList)); in - concatStringsSep "\n" inTunOpts; + lib.concatStringsSep "\n" inTunOpts; - allOutTunnels = collect (tun: tun ? port && tun ? destination) cfg.outTunnels; - allInTunnels = collect (tun: tun ? port && tun ? address) cfg.inTunnels; + allOutTunnels = lib.collect (tun: tun ? port && tun ? destination) cfg.outTunnels; + allInTunnels = lib.collect (tun: tun ? port && tun ? address) cfg.inTunnels; opts = [ notice ] ++ (map mkOutTunnel allOutTunnels) ++ (map mkInTunnel allInTunnels); in - pkgs.writeText "i2pd-tunnels.conf" (concatStringsSep "\n" opts); + pkgs.writeText "i2pd-tunnels.conf" (lib.concatStringsSep "\n" opts); - i2pdFlags = concatStringsSep " " ( + i2pdFlags = lib.concatStringsSep " " ( optional (cfg.address != null) ("--host=" + cfg.address) ++ [ "--service" ("--conf=" + i2pdConf) @@ -235,7 +235,7 @@ in { imports = [ - (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ]) + (lib.mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ]) ]; ###### interface @@ -252,7 +252,7 @@ in ''; }; - package = mkPackageOption pkgs "i2pd" { }; + package = lib.mkPackageOption pkgs "i2pd" { }; logLevel = mkOption { type = types.enum ["debug" "info" "warn" "error"]; @@ -269,7 +269,7 @@ in logCLFTime = mkEnableOption "full CLF-formatted date and time to log"; address = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Your external IP or hostname. @@ -277,7 +277,7 @@ in }; family = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Specify a family the router belongs to. @@ -285,7 +285,7 @@ in }; dataDir = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Alternative path to storage of i2pd data (RI, keys, peer profiles, ...) @@ -301,7 +301,7 @@ in }; ifname = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Network interface to bind to. @@ -309,7 +309,7 @@ in }; ifname4 = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' IPv4 interface to bind to. @@ -317,7 +317,7 @@ in }; ifname6 = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' IPv6 interface to bind to. @@ -325,7 +325,7 @@ in }; ntcpProxy = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Proxy URL for NTCP transport. @@ -399,7 +399,7 @@ in reseed.verify = mkEnableOption "SU3 signature verification"; reseed.file = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Full path to SU3 file to reseed from. @@ -407,7 +407,7 @@ in }; reseed.urls = mkOption { - type = with types; listOf str; + type = listOf str; default = []; description = '' Reseed URLs. @@ -415,7 +415,7 @@ in }; reseed.floodfill = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Path to router info of floodfill to reseed from. @@ -423,7 +423,7 @@ in }; reseed.zipfile = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Path to local .zip file to reseed from. @@ -431,7 +431,7 @@ in }; reseed.proxy = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' URL for reseed proxy, supports http/socks. @@ -446,7 +446,7 @@ in ''; }; addressbook.subscriptions = mkOption { - type = with types; listOf str; + type = listOf str; default = [ "http://inr.i2p/export/alive-hosts.txt" "http://i2p-projekt.i2p/hosts.txt" @@ -460,7 +460,7 @@ in trust.enable = mkEnableOption "explicit trust options"; trust.family = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Router Family to trust for first hops. @@ -468,7 +468,7 @@ in }; trust.routers = mkOption { - type = with types; listOf str; + type = listOf str; default = []; description = '' Only connect to the listed routers. @@ -543,7 +543,7 @@ in yggdrasil.enable = mkEnableOption "Yggdrasil"; yggdrasil.address = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Your local yggdrasil address. Specify it if you want to bind your router to a @@ -572,7 +572,7 @@ in }; strictHeaders = mkOption { - type = with types; nullOr bool; + type = nullOr bool; default = null; description = '' Enable strict host checking on WebUI. @@ -580,7 +580,7 @@ in }; hostname = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Expected hostname for WebUI. @@ -591,7 +591,7 @@ in proto.httpProxy = (mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 "httpproxy-keys.dat") // { outproxy = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = "Upstream outproxy bind address."; }; @@ -618,7 +618,7 @@ in outTunnels = mkOption { default = {}; - type = with types; attrsOf (submodule ( + type = attrsOf (submodule ( { name, ... }: { options = { destinationPort = mkOption { @@ -639,7 +639,7 @@ in inTunnels = mkOption { default = {}; - type = with types; attrsOf (submodule ( + type = attrsOf (submodule ( { name, ... }: { options = { inPort = mkOption { @@ -648,7 +648,7 @@ in description = "Service port. Default to the tunnel's listen port."; }; accessList = mkOption { - type = with types; listOf str; + type = listOf str; default = []; description = "I2P nodes that are allowed to connect to this service."; }; diff --git a/nixos/modules/services/networking/inadyn.nix b/nixos/modules/services/networking/inadyn.nix index 7022673538c8a..c98d6a2315061 100644 --- a/nixos/modules/services/networking/inadyn.nix +++ b/nixos/modules/services/networking/inadyn.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.inadyn; @@ -11,10 +8,10 @@ let renderOption = k: v: if builtins.elem k [ "provider" "custom" ] then lib.concatStringsSep "\n" - (mapAttrsToList + (lib.mapAttrsToList (name: config: '' ${k} ${name} { - ${lib.concatStringsSep "\n " (mapAttrsToList renderOption (filterAttrs nonEmptyValue config))} + ${lib.concatStringsSep "\n " (lib.mapAttrsToList renderOption (lib.filterAttrs nonEmptyValue config))} }'') v) else if k == "include" then @@ -22,7 +19,7 @@ let else if k == "hostname" && builtins.isList v then "${k} = { ${builtins.concatStringsSep ", " (map (s: "\"${s}\"") v)} }" else if builtins.isBool v then - "${k} = ${boolToString v}" + "${k} = ${lib.boolToString v}" else if builtins.isString v then "${k} = \"${v}\"" else @@ -33,32 +30,32 @@ let # This file was generated by nix # do not edit - ${(lib.concatStringsSep "\n" (mapAttrsToList renderOption (filterAttrs nonEmptyValue cfg.settings)))} + ${(lib.concatStringsSep "\n" (lib.mapAttrsToList renderOption (lib.filterAttrs nonEmptyValue cfg.settings)))} ''; configFile = if (cfg.configFile != null) then cfg.configFile else configFile'; in { - options.services.inadyn = with types; + options.services.inadyn = with lib.types; let providerOptions = { - include = mkOption { + include = lib.mkOption { default = null; description = "File to include additional settings for this provider from."; type = nullOr path; }; - ssl = mkOption { + ssl = lib.mkOption { default = true; description = "Whether to use HTTPS for this DDNS provider."; type = bool; }; - username = mkOption { + username = lib.mkOption { default = null; description = "Username for this DDNS provider."; type = nullOr str; }; - password = mkOption { + password = lib.mkOption { default = null; description = '' Password for this DDNS provider. @@ -68,7 +65,7 @@ in ''; type = nullOr str; }; - hostname = mkOption { + hostname = lib.mkOption { default = "*"; example = "your.cool-domain.com"; description = "Hostname alias(es)."; @@ -77,12 +74,12 @@ in }; in { - enable = mkEnableOption ('' + enable = lib.mkEnableOption ('' synchronise your machine's IP address with a dynamic DNS provider using inadyn ''); - user = mkOption { + user = lib.mkOption { default = "inadyn"; - type = types.str; + type = lib.types.str; description = '' User account under which inadyn runs. @@ -93,9 +90,9 @@ in ::: ''; }; - group = mkOption { + group = lib.mkOption { default = "inadyn"; - type = types.str; + type = lib.types.str; description = '' Group account under which inadyn runs. @@ -106,7 +103,7 @@ in ::: ''; }; - interval = mkOption { + interval = lib.mkOption { default = "*-*-* *:*:00"; description = '' How often to check the current IP. @@ -119,24 +116,24 @@ in default = "notice"; description = "Set inadyn's log level."; }; - settings = mkOption { + settings = lib.mkOption { default = { }; description = "See `inadyn.conf (5)`"; type = submodule { freeformType = attrs; options = { - allow-ipv6 = mkOption { + allow-ipv6 = lib.mkOption { default = config.networking.enableIPv6; defaultText = "`config.networking.enableIPv6`"; description = "Whether to get IPv6 addresses from interfaces."; type = bool; }; - forced-update = mkOption { + forced-update = lib.mkOption { default = 2592000; description = "Duration (in seconds) after which an update is forced."; type = ints.positive; }; - provider = mkOption { + provider = lib.mkOption { default = { }; description = '' Settings for DDNS providers built-in to inadyn. @@ -148,7 +145,7 @@ in options = providerOptions; }); }; - custom = mkOption { + custom = lib.mkOption { default = { }; description = '' Settings for custom DNS providers. @@ -156,11 +153,11 @@ in type = attrsOf (submodule { freeformType = attrs; options = providerOptions // { - ddns-server = mkOption { + ddns-server = lib.mkOption { description = "DDNS server name."; type = str; }; - ddns-path = mkOption { + ddns-path = lib.mkOption { description = '' DDNS server path. @@ -175,7 +172,7 @@ in }; }; }; - configFile = mkOption { + configFile = lib.mkOption { default = null; description = '' Configuration file for inadyn. @@ -238,12 +235,12 @@ in timers.inadyn.timerConfig.Persistent = true; }; - users.users.inadyn = mkIf (cfg.user == "inadyn") { + users.users.inadyn = lib.mkIf (cfg.user == "inadyn") { group = cfg.group; isSystemUser = true; }; - users.groups = mkIf (cfg.group == "inadyn") { + users.groups = lib.mkIf (cfg.group == "inadyn") { inadyn = { }; }; }; diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix index c474f5f278bf8..2bdfa6f1b844a 100644 --- a/nixos/modules/services/networking/iodine.nix +++ b/nixos/modules/services/networking/iodine.nix @@ -1,24 +1,20 @@ # NixOS module for iodine, ip over dns daemon - { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.iodine; iodinedUser = "iodined"; /* is this path made unreadable by ProtectHome = true ? */ - isProtected = x: hasPrefix "/root" x || hasPrefix "/home" x; + isProtected = x: lib.hasPrefix "/root" x || lib.hasPrefix "/home" x; in { imports = [ - (mkRenamedOptionModule [ "services" "iodined" "enable" ] [ "services" "iodine" "server" "enable" ]) - (mkRenamedOptionModule [ "services" "iodined" "domain" ] [ "services" "iodine" "server" "domain" ]) - (mkRenamedOptionModule [ "services" "iodined" "ip" ] [ "services" "iodine" "server" "ip" ]) - (mkRenamedOptionModule [ "services" "iodined" "extraConfig" ] [ "services" "iodine" "server" "extraConfig" ]) - (mkRemovedOptionModule [ "services" "iodined" "client" ] "") + (lib.mkRenamedOptionModule [ "services" "iodined" "enable" ] [ "services" "iodine" "server" "enable" ]) + (lib.mkRenamedOptionModule [ "services" "iodined" "domain" ] [ "services" "iodine" "server" "domain" ]) + (lib.mkRenamedOptionModule [ "services" "iodined" "ip" ] [ "services" "iodine" "server" "ip" ]) + (lib.mkRenamedOptionModule [ "services" "iodined" "extraConfig" ] [ "services" "iodine" "server" "extraConfig" ]) + (lib.mkRemovedOptionModule [ "services" "iodined" "client" ] "") ]; ### configuration @@ -26,7 +22,7 @@ in options = { services.iodine = { - clients = mkOption { + clients = lib.mkOption { default = {}; description = '' Each attribute of this option defines a systemd service that @@ -36,7 +32,7 @@ in where «name» is the name of the corresponding attribute name. ''; - example = literalExpression '' + example = lib.literalExpression '' { foo = { server = "tunnel.mdomain.com"; @@ -45,33 +41,33 @@ in } } ''; - type = types.attrsOf ( - types.submodule ( + type = lib.types.attrsOf ( + lib.types.submodule ( { options = { - server = mkOption { - type = types.str; + server = lib.mkOption { + type = lib.types.str; default = ""; description = "Hostname of server running iodined"; example = "tunnel.mydomain.com"; }; - relay = mkOption { - type = types.str; + relay = lib.mkOption { + type = lib.types.str; default = ""; description = "DNS server to use as an intermediate relay to the iodined server"; example = "8.8.8.8"; }; - extraConfig = mkOption { - type = types.str; + extraConfig = lib.mkOption { + type = lib.types.str; default = ""; description = "Additional command line parameters"; example = "-l 192.168.1.10 -p 23"; }; - passwordFile = mkOption { - type = types.str; + passwordFile = lib.mkOption { + type = lib.types.str; default = ""; description = "Path to a file containing the password."; }; @@ -82,35 +78,35 @@ in }; server = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "enable iodined server"; }; - ip = mkOption { - type = types.str; + ip = lib.mkOption { + type = lib.types.str; default = ""; description = "The assigned ip address or ip range"; example = "172.16.10.1/24"; }; - domain = mkOption { - type = types.str; + domain = lib.mkOption { + type = lib.types.str; default = ""; description = "Domain or subdomain of which nameservers point to us"; example = "tunnel.mydomain.com"; }; - extraConfig = mkOption { - type = types.str; + extraConfig = lib.mkOption { + type = lib.types.str; default = ""; description = "Additional command line parameters"; example = "-l 192.168.1.10 -p 23"; }; - passwordFile = mkOption { - type = types.str; + passwordFile = lib.mkOption { + type = lib.types.str; default = ""; description = "File that contains password"; }; @@ -121,7 +117,7 @@ in ### implementation - config = mkIf (cfg.server.enable || cfg.clients != {}) { + config = lib.mkIf (cfg.server.enable || cfg.clients != {}) { environment.systemPackages = [ pkgs.iodine ]; boot.kernelModules = [ "tun" ]; @@ -132,7 +128,7 @@ in description = "iodine client - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "exec ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "< \"${builtins.toString cfg.passwordFile}\""} ${cfg.relay} ${cfg.server}"; + script = "exec ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${lib.optionalString (cfg.passwordFile != "") "< \"${builtins.toString cfg.passwordFile}\""} ${cfg.relay} ${cfg.server}"; serviceConfig = { RestartSec = "30s"; Restart = "always"; @@ -157,16 +153,16 @@ in }; }; in - listToAttrs ( - mapAttrsToList - (name: value: nameValuePair "iodine-${name}" (createIodineClientService name value)) + lib.listToAttrs ( + lib.mapAttrsToList + (name: value: lib.nameValuePair "iodine-${name}" (createIodineClientService name value)) cfg.clients ) // { - iodined = mkIf (cfg.server.enable) { + iodined = lib.mkIf (cfg.server.enable) { description = "iodine, ip over dns server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "exec ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "< \"${builtins.toString cfg.server.passwordFile}\""} ${cfg.server.ip} ${cfg.server.domain}"; + script = "exec ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${lib.optionalString (cfg.server.passwordFile != "") "< \"${builtins.toString cfg.server.passwordFile}\""} ${cfg.server.ip} ${cfg.server.domain}"; serviceConfig = { # Filesystem access ProtectSystem = "strict"; diff --git a/nixos/modules/services/networking/ivpn.nix b/nixos/modules/services/networking/ivpn.nix index 535510f4e8134..6482bbadaeb2a 100644 --- a/nixos/modules/services/networking/ivpn.nix +++ b/nixos/modules/services/networking/ivpn.nix @@ -2,11 +2,10 @@ let cfg = config.services.ivpn; in -with lib; { options.services.ivpn = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' This option enables iVPN daemon. @@ -15,7 +14,7 @@ with lib; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { boot.kernelModules = [ "tun" ]; environment.systemPackages = with pkgs; [ ivpn ivpn-service ]; @@ -47,5 +46,5 @@ with lib; }; }; - meta.maintainers = with maintainers; [ ataraxiasjel ]; + meta.maintainers = with lib.maintainers; [ ataraxiasjel ]; } diff --git a/nixos/modules/services/networking/jicofo.nix b/nixos/modules/services/networking/jicofo.nix index d4199c10fa2e3..91906e417361d 100644 --- a/nixos/modules/services/networking/jicofo.nix +++ b/nixos/modules/services/networking/jicofo.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.jicofo; @@ -10,10 +7,10 @@ let configFile = format.generate "jicofo.conf" cfg.config; in { - options.services.jicofo = with types; { - enable = mkEnableOption "Jitsi Conference Focus - component of Jitsi Meet"; + options.services.jicofo = with lib.types; { + enable = lib.mkEnableOption "Jitsi Conference Focus - component of Jitsi Meet"; - xmppHost = mkOption { + xmppHost = lib.mkOption { type = str; example = "localhost"; description = '' @@ -21,7 +18,7 @@ in ''; }; - xmppDomain = mkOption { + xmppDomain = lib.mkOption { type = nullOr str; example = "meet.example.org"; description = '' @@ -31,7 +28,7 @@ in ''; }; - componentPasswordFile = mkOption { + componentPasswordFile = lib.mkOption { type = str; example = "/run/keys/jicofo-component"; description = '' @@ -39,7 +36,7 @@ in ''; }; - userName = mkOption { + userName = lib.mkOption { type = str; default = "focus"; description = '' @@ -47,7 +44,7 @@ in ''; }; - userDomain = mkOption { + userDomain = lib.mkOption { type = str; example = "auth.meet.example.org"; description = '' @@ -55,7 +52,7 @@ in ''; }; - userPasswordFile = mkOption { + userPasswordFile = lib.mkOption { type = str; example = "/run/keys/jicofo-user"; description = '' @@ -63,7 +60,7 @@ in ''; }; - bridgeMuc = mkOption { + bridgeMuc = lib.mkOption { type = str; example = "jvbbrewery@internal.meet.example.org"; description = '' @@ -71,10 +68,10 @@ in ''; }; - config = mkOption { + config = lib.mkOption { type = format.type; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { jicofo.bridge.max-bridge-participants = 42; } @@ -85,7 +82,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.jicofo.config = { jicofo = { bridge.brewery-jid = cfg.bridgeMuc; @@ -120,7 +117,7 @@ in restartTriggers = [ configFile ]; - environment.JAVA_SYS_PROPS = concatStringsSep " " (mapAttrsToList (k: v: "${k}=${toString v}") jicofoProps); + environment.JAVA_SYS_PROPS = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "${k}=${toString v}") jicofoProps); script = '' export JICOFO_AUTH_PASS="$(<${cfg.userPasswordFile})" @@ -154,7 +151,7 @@ in environment.etc."jitsi/jicofo/sip-communicator.properties".text = ""; environment.etc."jitsi/jicofo/logging.properties".source = - mkDefault "${pkgs.jicofo}/etc/jitsi/jicofo/logging.properties-journal"; + lib.mkDefault "${pkgs.jicofo}/etc/jitsi/jicofo/logging.properties-journal"; }; meta.maintainers = lib.teams.jitsi.members; diff --git a/nixos/modules/services/networking/jigasi.nix b/nixos/modules/services/networking/jigasi.nix index e701689031b14..d69d905788f40 100644 --- a/nixos/modules/services/networking/jigasi.nix +++ b/nixos/modules/services/networking/jigasi.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.jigasi; homeDirName = "jigasi-home"; @@ -10,10 +7,10 @@ let sipCommunicatorPropertiesFileUnsubstituted = "${pkgs.jigasi}/etc/jitsi/jigasi/sip-communicator.properties"; in { - options.services.jigasi = with types; { - enable = mkEnableOption "Jitsi Gateway to SIP - component of Jitsi Meet"; + options.services.jigasi = with lib.types; { + enable = lib.mkEnableOption "Jitsi Gateway to SIP - component of Jitsi Meet"; - xmppHost = mkOption { + xmppHost = lib.mkOption { type = str; example = "localhost"; description = '' @@ -21,7 +18,7 @@ in ''; }; - xmppDomain = mkOption { + xmppDomain = lib.mkOption { type = nullOr str; example = "meet.example.org"; description = '' @@ -31,7 +28,7 @@ in ''; }; - componentPasswordFile = mkOption { + componentPasswordFile = lib.mkOption { type = str; example = "/run/keys/jigasi-component"; description = '' @@ -39,7 +36,7 @@ in ''; }; - userName = mkOption { + userName = lib.mkOption { type = str; default = "callcontrol"; description = '' @@ -47,7 +44,7 @@ in ''; }; - userDomain = mkOption { + userDomain = lib.mkOption { type = str; example = "internal.meet.example.org"; description = '' @@ -55,7 +52,7 @@ in ''; }; - userPasswordFile = mkOption { + userPasswordFile = lib.mkOption { type = str; example = "/run/keys/jigasi-user"; description = '' @@ -63,7 +60,7 @@ in ''; }; - bridgeMuc = mkOption { + bridgeMuc = lib.mkOption { type = str; example = "jigasibrewery@internal.meet.example.org"; description = '' @@ -71,7 +68,7 @@ in ''; }; - defaultJvbRoomName = mkOption { + defaultJvbRoomName = lib.mkOption { type = str; default = ""; example = "siptest"; @@ -80,8 +77,8 @@ in ''; }; - environmentFile = mkOption { - type = types.nullOr types.path; + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' File containing environment variables to be passed to the jigasi service, @@ -93,10 +90,10 @@ in ''; }; - config = mkOption { + config = lib.mkOption { type = attrsOf str; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { "org.jitsi.jigasi.auth.URL" = "XMPP:jitsi-meet.example.com"; } @@ -107,12 +104,12 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.jicofo.config = { "org.jitsi.jicofo.jigasi.BREWERY" = "${cfg.bridgeMuc}"; }; - services.jigasi.config = mapAttrs (_: v: mkDefault v) { + services.jigasi.config = lib.mapAttrs (_: v: lib.mkDefault v) { "org.jitsi.jigasi.BRIDGE_MUC" = cfg.bridgeMuc; }; @@ -186,7 +183,7 @@ in restartTriggers = [ config.environment.etc."jitsi/jigasi/sip-communicator.properties".source ]; - environment.JAVA_SYS_PROPS = concatStringsSep " " (mapAttrsToList (k: v: "${k}=${toString v}") jigasiProps); + environment.JAVA_SYS_PROPS = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "${k}=${toString v}") jigasiProps); script = '' ${pkgs.jigasi}/bin/jigasi \ @@ -228,9 +225,9 @@ in }; environment.etc."jitsi/jigasi/sip-communicator.properties".source = - mkDefault "${sipCommunicatorPropertiesFile}"; + lib.mkDefault "${sipCommunicatorPropertiesFile}"; environment.etc."jitsi/jigasi/logging.properties".source = - mkDefault "${stateDir}/logging.properties-journal"; + lib.mkDefault "${stateDir}/logging.properties-journal"; }; meta.maintainers = lib.teams.jitsi.members; diff --git a/nixos/modules/services/networking/jitsi-videobridge.nix b/nixos/modules/services/networking/jitsi-videobridge.nix index d73a9f256dfb9..14eb64eae2535 100644 --- a/nixos/modules/services/networking/jitsi-videobridge.nix +++ b/nixos/modules/services/networking/jitsi-videobridge.nix @@ -1,16 +1,13 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.jitsi-videobridge; - attrsToArgs = a: concatStringsSep " " (mapAttrsToList (k: v: "${k}=${toString v}") a); + attrsToArgs = a: lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "${k}=${toString v}") a); format = pkgs.formats.hocon { }; # We're passing passwords in environment variables that have names generated # from an attribute name, which may not be a valid bash identifier. - toVarName = s: "XMPP_PASSWORD_" + stringAsChars (c: if builtins.match "[A-Za-z0-9]" c != null then c else "_") s; + toVarName = s: "XMPP_PASSWORD_" + lib.stringAsChars (c: if builtins.match "[A-Za-z0-9]" c != null then c else "_") s; defaultJvbConfig = { videobridge = { @@ -25,7 +22,7 @@ let enabled = true; transports = [ { type = "muc"; } ]; }; - apis.xmpp-client.configs = flip mapAttrs cfg.xmppConfigs (name: xmppConfig: { + apis.xmpp-client.configs = lib.flip lib.mapAttrs cfg.xmppConfigs (name: xmppConfig: { hostname = xmppConfig.hostName; domain = xmppConfig.domain; username = xmppConfig.userName; @@ -39,21 +36,21 @@ let }; # Allow overriding leaves of the default config despite types.attrs not doing any merging. - jvbConfig = recursiveUpdate defaultJvbConfig cfg.config; + jvbConfig = lib.recursiveUpdate defaultJvbConfig cfg.config; in { imports = [ - (mkRemovedOptionModule [ "services" "jitsi-videobridge" "apis" ] + (lib.mkRemovedOptionModule [ "services" "jitsi-videobridge" "apis" ] "services.jitsi-videobridge.apis was broken and has been migrated into the boolean option services.jitsi-videobridge.colibriRestApi. It is set to false by default, setting it to true will correctly enable the private /colibri rest API." ) ]; - options.services.jitsi-videobridge = with types; { - enable = mkEnableOption "Jitsi Videobridge, a WebRTC compatible video router"; + options.services.jitsi-videobridge = with lib.types; { + enable = lib.mkEnableOption "Jitsi Videobridge, a WebRTC compatible video router"; - config = mkOption { + config = lib.mkOption { type = attrs; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { videobridge = { ice.udp.port = 5000; @@ -72,14 +69,14 @@ in ''; }; - xmppConfigs = mkOption { + xmppConfigs = lib.mkOption { description = '' XMPP servers to connect to. See for more information. ''; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { "localhost" = { hostName = "localhost"; @@ -92,14 +89,14 @@ in ''; type = attrsOf (submodule ({ name, ... }: { options = { - hostName = mkOption { + hostName = lib.mkOption { type = str; example = "xmpp.example.org"; description = '' Hostname of the XMPP server to connect to. Name of the attribute set is used by default. ''; }; - domain = mkOption { + domain = lib.mkOption { type = nullOr str; default = null; example = "auth.xmpp.example.org"; @@ -107,28 +104,28 @@ in Domain part of JID of the XMPP user, if it is different from hostName. ''; }; - userName = mkOption { + userName = lib.mkOption { type = str; default = "jvb"; description = '' User part of the JID. ''; }; - passwordFile = mkOption { + passwordFile = lib.mkOption { type = str; example = "/run/keys/jitsi-videobridge-xmpp1"; description = '' File containing the password for the user. ''; }; - mucJids = mkOption { + mucJids = lib.mkOption { type = str; example = "jvbbrewery@internal.xmpp.example.org"; description = '' JID of the MUC to join. JiCoFo needs to be configured to join the same MUC. ''; }; - mucNickname = mkOption { + mucNickname = lib.mkOption { # Upstream DEBs use UUID, let's use hostname instead. type = str; description = '' @@ -136,7 +133,7 @@ in nickname (aka resource part of the JID). By default, system hostname is used. ''; }; - disableCertificateVerification = mkOption { + disableCertificateVerification = lib.mkOption { type = bool; default = false; description = '' @@ -145,8 +142,8 @@ in }; }; config = { - hostName = mkDefault name; - mucNickname = mkDefault (builtins.replaceStrings [ "." ] [ "-" ] ( + hostName = lib.mkDefault name; + mucNickname = lib.mkDefault (builtins.replaceStrings [ "." ] [ "-" ] ( config.networking.fqdnOrHostName )); }; @@ -154,26 +151,44 @@ in }; nat = { - localAddress = mkOption { + localAddress = lib.mkOption { type = nullOr str; default = null; example = "192.168.1.42"; description = '' - Local address when running behind NAT. + Local address to assume when running behind NAT. ''; }; - publicAddress = mkOption { + publicAddress = lib.mkOption { type = nullOr str; default = null; example = "1.2.3.4"; description = '' - Public address when running behind NAT. + Public address to assume when running behind NAT. + ''; + }; + + harvesterAddresses = lib.mkOption { + type = listOf str; + default = [ + "stunserver.stunprotocol.org:3478" + "stun.framasoft.org:3478" + "meet-jit-si-turnrelay.jitsi.net:443" + ]; + example = []; + description = '' + Addresses of public STUN services to use to automatically find + the public and local addresses of this Jitsi-Videobridge instance + without the need for manual configuration. + + This option is ignored if {option}`services.jitsi-videobridge.nat.localAddress` + and {option}`services.jitsi-videobridge.nat.publicAddress` are set. ''; }; }; - extraProperties = mkOption { + extraProperties = lib.mkOption { type = attrsOf str; default = { }; description = '' @@ -181,7 +196,7 @@ in ''; }; - openFirewall = mkOption { + openFirewall = lib.mkOption { type = bool; default = false; description = '' @@ -189,7 +204,7 @@ in ''; }; - colibriRestApi = mkOption { + colibriRestApi = lib.mkOption { type = bool; description = '' Whether to enable the private rest API for the COLIBRI control interface. @@ -199,13 +214,16 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.groups.jitsi-meet = {}; - services.jitsi-videobridge.extraProperties = optionalAttrs (cfg.nat.localAddress != null) { - "org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS" = cfg.nat.localAddress; - "org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS" = cfg.nat.publicAddress; - }; + services.jitsi-videobridge.extraProperties = + if (cfg.nat.localAddress != null) then { + "org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS" = cfg.nat.localAddress; + "org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS" = cfg.nat.publicAddress; + } else { + "org.ice4j.ice.harvest.STUN_MAPPING_HARVESTER_ADDRESSES" = lib.concatStringsSep "," cfg.nat.harvesterAddresses; + }; systemd.services.jitsi-videobridge2 = let jvbProps = { @@ -215,7 +233,7 @@ in "-Dconfig.file" = format.generate "jvb.conf" jvbConfig; # Mitigate CVE-2021-44228 "-Dlog4j2.formatMsgNoLookups" = true; - } // (mapAttrs' (k: v: nameValuePair "-D${k}" v) cfg.extraProperties); + } // (lib.mapAttrs' (k: v: lib.nameValuePair "-D${k}" v) cfg.extraProperties); in { aliases = [ "jitsi-videobridge.service" ]; @@ -225,7 +243,7 @@ in environment.JAVA_SYS_PROPS = attrsToArgs jvbProps; - script = (concatStrings (mapAttrsToList (name: xmppConfig: + script = (lib.concatStrings (lib.mapAttrsToList (name: xmppConfig: "export ${toVarName name}=$(cat ${xmppConfig.passwordFile})\n" ) cfg.xmppConfigs)) + '' @@ -262,16 +280,16 @@ in }; environment.etc."jitsi/videobridge/logging.properties".source = - mkDefault "${pkgs.jitsi-videobridge}/etc/jitsi/videobridge/logging.properties-journal"; + lib.mkDefault "${pkgs.jitsi-videobridge}/etc/jitsi/videobridge/logging.properties-journal"; # (from videobridge2 .deb) # this sets the max, so that we can bump the JVB UDP single port buffer size. - boot.kernel.sysctl."net.core.rmem_max" = mkDefault 10485760; - boot.kernel.sysctl."net.core.netdev_max_backlog" = mkDefault 100000; + boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 10485760; + boot.kernel.sysctl."net.core.netdev_max_backlog" = lib.mkDefault 100000; - networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ jvbConfig.videobridge.ice.tcp.port ]; - networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall + networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ jvbConfig.videobridge.ice.udp.port ]; assertions = [{ diff --git a/nixos/modules/services/networking/jotta-cli.nix b/nixos/modules/services/networking/jotta-cli.nix index e0fa1ef332fe6..566e7fc503a6d 100644 --- a/nixos/modules/services/networking/jotta-cli.nix +++ b/nixos/modules/services/networking/jotta-cli.nix @@ -1,25 +1,22 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.jotta-cli; in { options = { services.jotta-cli = { - enable = mkEnableOption "Jottacloud Command-line Tool"; + enable = lib.mkEnableOption "Jottacloud Command-line Tool"; - options = mkOption { + options = lib.mkOption { default = [ "stdoutlog" "datadir" "%h/.jottad/" ]; example = [ ]; - type = with types; listOf str; + type = with lib.types; listOf str; description = "Command-line options passed to jottad."; }; package = lib.mkPackageOption pkgs "jotta-cli" { }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.user.services.jottad = { description = "Jottacloud Command-line Tool daemon"; @@ -27,7 +24,7 @@ in { serviceConfig = { Type = "notify"; EnvironmentFile = "-%h/.config/jotta-cli/jotta-cli.env"; - ExecStart = "${lib.getExe' cfg.package "jottad"} ${concatStringsSep " " cfg.options}"; + ExecStart = "${lib.getExe' cfg.package "jottad"} ${lib.concatStringsSep " " cfg.options}"; Restart = "on-failure"; }; diff --git a/nixos/modules/services/networking/keybase.nix b/nixos/modules/services/networking/keybase.nix index 495102cb7eeee..9bb7ad3844a06 100644 --- a/nixos/modules/services/networking/keybase.nix +++ b/nixos/modules/services/networking/keybase.nix @@ -1,8 +1,6 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.services.keybase; - in { ###### interface @@ -11,8 +9,8 @@ in { services.keybase = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to start the Keybase service."; }; @@ -22,7 +20,7 @@ in { ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # Upstream: https://github.com/keybase/client/blob/master/packaging/linux/systemd/keybase.service systemd.user.services.keybase = { diff --git a/nixos/modules/services/networking/lambdabot.nix b/nixos/modules/services/networking/lambdabot.nix index a141962f512ff..8c8e5648450c4 100644 --- a/nixos/modules/services/networking/lambdabot.nix +++ b/nixos/modules/services/networking/lambdabot.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.lambdabot; @@ -18,16 +15,16 @@ in services.lambdabot = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable the Lambdabot IRC bot"; }; - package = mkPackageOption pkgs "lambdabot" { }; + package = lib.mkPackageOption pkgs "lambdabot" { }; - script = mkOption { - type = types.str; + script = lib.mkOption { + type = lib.types.str; default = ""; description = "Lambdabot script"; }; @@ -38,7 +35,7 @@ in ### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.lambdabot = { description = "Lambdabot daemon"; diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix index d5de9c45d84b7..98a4cff265f14 100644 --- a/nixos/modules/services/networking/lldpd.nix +++ b/nixos/modules/services/networking/lldpd.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.lldpd; @@ -9,17 +6,17 @@ in { options.services.lldpd = { - enable = mkEnableOption "Link Layer Discovery Protocol Daemon"; + enable = lib.mkEnableOption "Link Layer Discovery Protocol Daemon"; - extraArgs = mkOption { - type = types.listOf types.str; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "-c" "-k" "-I eth0" ]; description = "List of command line parameters for lldpd"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.users._lldpd = { description = "lldpd user"; group = "_lldpd"; @@ -33,7 +30,7 @@ in systemd.services.lldpd = { wantedBy = [ "multi-user.target" ]; - environment.LLDPD_OPTIONS = concatStringsSep " " cfg.extraArgs; + environment.LLDPD_OPTIONS = lib.concatStringsSep " " cfg.extraArgs; }; }; } diff --git a/nixos/modules/services/networking/logmein-hamachi.nix b/nixos/modules/services/networking/logmein-hamachi.nix index b7d960264d21d..852101f09dffc 100644 --- a/nixos/modules/services/networking/logmein-hamachi.nix +++ b/nixos/modules/services/networking/logmein-hamachi.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.logmein-hamachi; @@ -14,8 +11,8 @@ in options = { - services.logmein-hamachi.enable = mkOption { - type = types.bool; + services.logmein-hamachi.enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable LogMeIn Hamachi, a proprietary @@ -28,7 +25,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.logmein-hamachi = { description = "LogMeIn Hamachi Daemon"; diff --git a/nixos/modules/services/networking/lxd-image-server.nix b/nixos/modules/services/networking/lxd-image-server.nix index 93374a385a90c..4712a3c1b3db9 100644 --- a/nixos/modules/services/networking/lxd-image-server.nix +++ b/nixos/modules/services/networking/lxd-image-server.nix @@ -1,7 +1,4 @@ { config, pkgs, lib, ... }: - -with lib; - let cfg = config.services.lxd-image-server; format = pkgs.formats.toml {}; @@ -11,16 +8,16 @@ in { options = { services.lxd-image-server = { - enable = mkEnableOption "lxd-image-server"; + enable = lib.mkEnableOption "lxd-image-server"; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; description = "Group assigned to the user and the webroot directory."; default = "nginx"; example = "www-data"; }; - settings = mkOption { + settings = lib.mkOption { type = format.type; description = '' Configuration for lxd-image-server. @@ -31,9 +28,9 @@ in }; nginx = { - enable = mkEnableOption "nginx"; - domain = mkOption { - type = types.str; + enable = lib.mkEnableOption "nginx"; + domain = lib.mkOption { + type = lib.types.str; description = "Domain to use for nginx virtual host."; example = "images.example.org"; }; @@ -41,8 +38,8 @@ in }; }; - config = mkMerge [ - (mkIf (cfg.enable) { + config = lib.mkMerge [ + (lib.mkIf (cfg.enable) { users.users.lxd-image-server = { isSystemUser = true; group = cfg.group; @@ -88,12 +85,12 @@ in }; }) # this is separate so it can be enabled on mirrored hosts - (mkIf (cfg.nginx.enable) { + (lib.mkIf (cfg.nginx.enable) { # https://github.com/Avature/lxd-image-server/blob/master/resources/nginx/includes/lxd-image-server.pkg.conf services.nginx.virtualHosts = { "${cfg.nginx.domain}" = { forceSSL = true; - enableACME = mkDefault true; + enableACME = lib.mkDefault true; root = location; diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix index cdcb69070dfb7..74b388d684085 100644 --- a/nixos/modules/services/networking/matterbridge.nix +++ b/nixos/modules/services/networking/matterbridge.nix @@ -1,7 +1,4 @@ { options, config, pkgs, lib, ... }: - -with lib; - let cfg = config.services.matterbridge; @@ -17,10 +14,12 @@ in { options = { services.matterbridge = { - enable = mkEnableOption "Matterbridge chat platform bridge"; + enable = lib.mkEnableOption "Matterbridge chat platform bridge"; + + package = lib.mkPackageOption pkgs "matterbridge" { }; - configPath = mkOption { - type = with types; nullOr str; + configPath = lib.mkOption { + type = with lib.types; nullOr str; default = null; example = "/etc/nixos/matterbridge.toml"; description = '' @@ -28,8 +27,8 @@ in ''; }; - configFile = mkOption { - type = types.str; + configFile = lib.mkOption { + type = lib.types.str; example = '' # WARNING: as this file contains credentials, do not use this option! # It is kept only for backwards compatibility, and would cause your @@ -70,16 +69,16 @@ in The matterbridge configuration file in the TOML file format. ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "matterbridge"; description = '' User which runs the matterbridge service. ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "matterbridge"; description = '' Group which runs the matterbridge service. @@ -88,18 +87,18 @@ in }; }; - config = mkIf cfg.enable { - warnings = optional options.services.matterbridge.configFile.isDefined + config = lib.mkIf cfg.enable { + warnings = lib.optional options.services.matterbridge.configFile.isDefined "The option services.matterbridge.configFile is insecure and should be replaced with services.matterbridge.configPath"; - users.users = optionalAttrs (cfg.user == "matterbridge") + users.users = lib.optionalAttrs (cfg.user == "matterbridge") { matterbridge = { group = "matterbridge"; isSystemUser = true; }; }; - users.groups = optionalAttrs (cfg.group == "matterbridge") + users.groups = lib.optionalAttrs (cfg.group == "matterbridge") { matterbridge = { }; }; @@ -111,7 +110,7 @@ in serviceConfig = { User = cfg.user; Group = cfg.group; - ExecStart = "${pkgs.matterbridge}/bin/matterbridge -conf ${matterbridgeConfToml}"; + ExecStart = "${cfg.package}/bin/matterbridge -conf ${matterbridgeConfToml}"; Restart = "always"; RestartSec = "10"; }; diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix index 37a687f524b97..5cb418a9f1e62 100644 --- a/nixos/modules/services/networking/monero.nix +++ b/nixos/modules/services/networking/monero.nix @@ -1,12 +1,10 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.services.monero; listToConf = option: list: - concatMapStrings (value: "${option}=${value}\n") list; + lib.concatMapStrings (value: "${option}=${value}\n") list; login = (cfg.rpc.user != null && cfg.rpc.password != null); @@ -14,17 +12,17 @@ let log-file=/dev/stdout data-dir=${dataDir} - ${optionalString mining.enable '' + ${lib.optionalString mining.enable '' start-mining=${mining.address} mining-threads=${toString mining.threads} ''} rpc-bind-ip=${rpc.address} rpc-bind-port=${toString rpc.port} - ${optionalString login '' + ${lib.optionalString login '' rpc-login=${rpc.user}:${rpc.password} ''} - ${optionalString rpc.restricted '' + ${lib.optionalString rpc.restricted '' restricted-rpc=1 ''} @@ -50,34 +48,34 @@ in services.monero = { - enable = mkEnableOption "Monero node daemon"; + enable = lib.mkEnableOption "Monero node daemon"; - dataDir = mkOption { - type = types.str; + dataDir = lib.mkOption { + type = lib.types.str; default = "/var/lib/monero"; description = '' The directory where Monero stores its data files. ''; }; - mining.enable = mkOption { - type = types.bool; + mining.enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to mine monero. ''; }; - mining.address = mkOption { - type = types.str; + mining.address = lib.mkOption { + type = lib.types.str; default = ""; description = '' Monero address where to send mining rewards. ''; }; - mining.threads = mkOption { - type = types.addCheck types.int (x: x>=0); + mining.threads = lib.mkOption { + type = lib.types.addCheck lib.types.int (x: x>=0); default = 0; description = '' Number of threads used for mining. @@ -85,48 +83,48 @@ in ''; }; - rpc.user = mkOption { - type = types.nullOr types.str; + rpc.user = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' User name for RPC connections. ''; }; - rpc.password = mkOption { - type = types.nullOr types.str; + rpc.password = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' Password for RPC connections. ''; }; - rpc.address = mkOption { - type = types.str; + rpc.address = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = '' IP address the RPC server will bind to. ''; }; - rpc.port = mkOption { - type = types.port; + rpc.port = lib.mkOption { + type = lib.types.port; default = 18081; description = '' Port the RPC server will bind to. ''; }; - rpc.restricted = mkOption { - type = types.bool; + rpc.restricted = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to restrict RPC to view only commands. ''; }; - limits.upload = mkOption { - type = types.addCheck types.int (x: x>=-1); + limits.upload = lib.mkOption { + type = lib.types.addCheck lib.types.int (x: x>=-1); default = -1; description = '' Limit of the upload rate in kB/s. @@ -134,8 +132,8 @@ in ''; }; - limits.download = mkOption { - type = types.addCheck types.int (x: x>=-1); + limits.download = lib.mkOption { + type = lib.types.addCheck lib.types.int (x: x>=-1); default = -1; description = '' Limit of the download rate in kB/s. @@ -143,8 +141,8 @@ in ''; }; - limits.threads = mkOption { - type = types.addCheck types.int (x: x>=0); + limits.threads = lib.mkOption { + type = lib.types.addCheck lib.types.int (x: x>=0); default = 0; description = '' Maximum number of threads used for a parallel job. @@ -152,8 +150,8 @@ in ''; }; - limits.syncSize = mkOption { - type = types.addCheck types.int (x: x>=0); + limits.syncSize = lib.mkOption { + type = lib.types.addCheck lib.types.int (x: x>=0); default = 0; description = '' Maximum number of blocks to sync at once. @@ -161,16 +159,16 @@ in ''; }; - extraNodes = mkOption { - type = types.listOf types.str; + extraNodes = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; description = '' List of additional peer IP addresses to add to the local list. ''; }; - priorityNodes = mkOption { - type = types.listOf types.str; + priorityNodes = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; description = '' List of peer IP addresses to connect to and @@ -178,8 +176,8 @@ in ''; }; - exclusiveNodes = mkOption { - type = types.listOf types.str; + exclusiveNodes = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; description = '' List of peer IP addresses to connect to *only*. @@ -187,8 +185,8 @@ in ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra lines to be added verbatim to monerod configuration. @@ -202,7 +200,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.users.monero = { isSystemUser = true; @@ -228,7 +226,7 @@ in }; }; - assertions = singleton { + assertions = lib.singleton { assertion = cfg.mining.enable -> cfg.mining.address != ""; message = '' You need a Monero address to receive mining rewards: diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 41d8ab4058bcc..85676d29f2b1c 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -406,4 +406,6 @@ in } ''; }; + + meta.maintainers = with lib.maintainers; [ felixsinger ]; } diff --git a/nixos/modules/services/networking/nar-serve.nix b/nixos/modules/services/networking/nar-serve.nix index 5a5cefe86d29f..ea5be25a4d26b 100644 --- a/nixos/modules/services/networking/nar-serve.nix +++ b/nixos/modules/services/networking/nar-serve.nix @@ -1,18 +1,18 @@ { config, pkgs, lib, ... }: -with lib; let + inherit (lib) mkOption types; cfg = config.services.nar-serve; in { meta = { - maintainers = [ maintainers.rizary maintainers.zimbatm ]; + maintainers = with lib.maintainers; [ rizary zimbatm ]; }; options = { services.nar-serve = { - enable = mkEnableOption "serving NAR file contents via HTTP"; + enable = lib.mkEnableOption "serving NAR file contents via HTTP"; - package = mkPackageOption pkgs "nar-serve" { }; + package = lib.mkPackageOption pkgs "nar-serve" { }; port = mkOption { type = types.port; @@ -48,7 +48,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.nar-serve = { description = "NAR server"; after = [ "network.target" ]; diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix index e68c39946fe3b..d39c373dbc94c 100644 --- a/nixos/modules/services/networking/netbird.nix +++ b/nixos/modules/services/networking/netbird.nix @@ -35,9 +35,7 @@ let cfg = config.services.netbird; in { - meta.maintainers = with maintainers; [ - misuzu - ]; + meta.maintainers = with maintainers; [ ]; meta.doc = ./netbird.md; options.services.netbird = { diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index fda8245ba97d1..dedd53e345fe5 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -514,6 +514,12 @@ in environment.etc = { "NetworkManager/NetworkManager.conf".source = configFile; + + # The networkmanager-l2tp plugin expects /etc/ipsec.secrets to include /etc/ipsec.d/ipsec.nm-l2tp.secrets; + # see https://github.com/NixOS/nixpkgs/issues/64965 + "ipsec.secrets".text = '' + include ipsec.d/ipsec.nm-l2tp.secrets + ''; } // builtins.listToAttrs (map (pkg: nameValuePair "NetworkManager/${pkg.networkManagerPlugin}" { diff --git a/nixos/modules/services/networking/nixops-dns.nix b/nixos/modules/services/networking/nixops-dns.nix index 5e33d872ea452..5d009d6d30845 100644 --- a/nixos/modules/services/networking/nixops-dns.nix +++ b/nixos/modules/services/networking/nixops-dns.nix @@ -68,10 +68,10 @@ in servers = [ "/${cfg.domain}/127.0.0.1#5300" ]; - extraConfig = '' - bind-interfaces - listen-address=127.0.0.1 - ''; + settings = { + bind-interfaces = true; + listen-address = "127.0.0.1"; + }; }; }; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index b17416c1e3d34..fe878ddbe05f1 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -603,8 +603,8 @@ in reuseport = mkOption { type = types.bool; - default = pkgs.stdenv.isLinux; - defaultText = literalExpression "pkgs.stdenv.isLinux"; + default = pkgs.stdenv.hostPlatform.isLinux; + defaultText = literalExpression "pkgs.stdenv.hostPlatform.isLinux"; description = '' Whether to enable SO_REUSEPORT on all used sockets. This lets multiple processes bind to the same port. This speeds up operation especially diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index a152b72143dae..01baa58879da1 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -1,7 +1,13 @@ -{ config, options, lib, pkgs, stdenv, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.services.pleroma; -in { +in +{ options = { services.pleroma = with lib; { enable = mkEnableOption "pleroma"; @@ -48,7 +54,7 @@ in { Have a look to Pleroma section in the NixOS manual for more information. - ''; + ''; }; secretConfigFile = mkOption { @@ -73,7 +79,7 @@ in { group = cfg.group; isSystemUser = true; }; - groups."${cfg.group}" = {}; + groups."${cfg.group}" = { }; }; environment.systemPackages = [ cfg.package ]; @@ -90,57 +96,79 @@ in { import_config "${cfg.secretConfigFile}" ''; - systemd.services.pleroma = { - description = "Pleroma social network"; - wants = [ "network-online.target" ]; - after = [ "network-online.target" "postgresql.service" ]; - wantedBy = [ "multi-user.target" ]; - restartTriggers = [ config.environment.etc."/pleroma/config.exs".source ]; - environment.RELEASE_COOKIE = "/var/lib/pleroma/.cookie"; - serviceConfig = { - User = cfg.user; - Group = cfg.group; - Type = "exec"; - WorkingDirectory = "~"; - StateDirectory = "pleroma pleroma/static pleroma/uploads"; - StateDirectoryMode = "700"; - - # Checking the conf file is there then running the database - # migration before each service start, just in case there are - # some pending ones. - # - # It's sub-optimal as we'll always run this, even if pleroma - # has not been updated. But the no-op process is pretty fast. - # Better be safe than sorry migration-wise. - ExecStartPre = - let preScript = pkgs.writers.writeBashBin "pleromaStartPre" '' - if [ ! -f /var/lib/pleroma/.cookie ] - then - echo "Creating cookie file" - dd if=/dev/urandom bs=1 count=16 | hexdump -e '16/1 "%02x"' > /var/lib/pleroma/.cookie - fi - ${cfg.package}/bin/pleroma_ctl migrate - ''; - in "${preScript}/bin/pleromaStartPre"; - - ExecStart = "${cfg.package}/bin/pleroma start"; - ExecStop = "${cfg.package}/bin/pleroma stop"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - - # Systemd sandboxing directives. - # Taken from the upstream contrib systemd service at - # pleroma/installation/pleroma.service - PrivateTmp = true; - ProtectHome = true; - ProtectSystem = "full"; - PrivateDevices = false; - NoNewPrivileges = true; - CapabilityBoundingSet = "~CAP_SYS_ADMIN"; + systemd.services = + let + commonSystemdServiceConfig = { + User = cfg.user; + Group = cfg.group; + WorkingDirectory = "~"; + StateDirectory = "pleroma pleroma/static pleroma/uploads"; + StateDirectoryMode = "700"; + # Systemd sandboxing directives. + # Taken from the upstream contrib systemd service at + # pleroma/installation/pleroma.service + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "full"; + PrivateDevices = false; + NoNewPrivileges = true; + CapabilityBoundingSet = "~CAP_SYS_ADMIN"; + }; + + in + { + pleroma-migrations = { + description = "Pleroma social network migrations"; + wants = [ "network-online.target" ]; + after = [ + "network-online.target" + "postgresql.service" + ]; + wantedBy = [ "pleroma.service" ]; + environment.RELEASE_COOKIE = "/var/lib/pleroma/.cookie"; + serviceConfig = commonSystemdServiceConfig // { + Type = "oneshot"; + # Checking the conf file is there then running the database + # migration before each service start, just in case there are + # some pending ones. + # + # It's sub-optimal as we'll always run this, even if pleroma + # has not been updated. But the no-op process is pretty fast. + # Better be safe than sorry migration-wise. + ExecStart = + let + preScript = pkgs.writers.writeBashBin "pleroma-migrations" '' + if [ ! -f /var/lib/pleroma/.cookie ] + then + echo "Creating cookie file" + dd if=/dev/urandom bs=1 count=16 | hexdump -e '16/1 "%02x"' > /var/lib/pleroma/.cookie + fi + ${cfg.package}/bin/pleroma_ctl migrate + ''; + in + "${preScript}/bin/pleroma-migrations"; + }; + # disksup requires bash + path = [ pkgs.bash ]; + }; + + pleroma = { + description = "Pleroma social network"; + wants = [ "pleroma-migrations.service" ]; + after = [ "pleroma-migrations.service" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."/pleroma/config.exs".source ]; + environment.RELEASE_COOKIE = "/var/lib/pleroma/.cookie"; + serviceConfig = commonSystemdServiceConfig // { + Type = "exec"; + ExecStart = "${cfg.package}/bin/pleroma start"; + ExecStop = "${cfg.package}/bin/pleroma stop"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + # disksup requires bash + path = [ pkgs.bash ]; + }; }; - # disksup requires bash - path = [ pkgs.bash ]; - }; - }; meta.maintainers = with lib.maintainers; [ picnoir ]; meta.doc = ./pleroma.md; diff --git a/nixos/modules/services/networking/scion/scion-ip-gateway.nix b/nixos/modules/services/networking/scion/scion-ip-gateway.nix new file mode 100644 index 0000000000000..1801828c8ad0e --- /dev/null +++ b/nixos/modules/services/networking/scion/scion-ip-gateway.nix @@ -0,0 +1,92 @@ +{ + config, + lib, + pkgs, + ... +}: + +with lib; + +let + globalCfg = config.services.scion; + cfg = config.services.scion.scion-ip-gateway; + toml = pkgs.formats.toml { }; + json = pkgs.formats.json { }; + connectionDir = if globalCfg.stateless then "/run" else "/var/lib"; + defaultConfig = { + tunnel = { }; + gateway = { + traffic_policy_file = "${trafficConfigFile}"; + }; + }; + defaultTrafficConfig = { + ASes = { }; + ConfigVersion = 9001; + }; + configFile = toml.generate "scion-ip-gateway.toml" (recursiveUpdate defaultConfig cfg.config); + trafficConfigFile = json.generate "scion-ip-gateway-traffic.json" ( + recursiveUpdate defaultTrafficConfig cfg.trafficConfig + ); +in +{ + options.services.scion.scion-ip-gateway = { + enable = mkEnableOption "the scion-ip-gateway service"; + config = mkOption { + default = { }; + type = toml.type; + example = literalExpression '' + { + tunnel = { + src_ipv4 = "172.16.100.1"; + }; + } + ''; + description = '' + scion-ip-gateway daemon configuration + ''; + }; + trafficConfig = mkOption { + default = { }; + type = json.type; + example = literalExpression '' + { + ASes = { + "2-ffaa:0:b" = { + Nets = [ + "172.16.1.0/24" + ]; + }; + }; + ConfigVersion = 9001; + } + ''; + description = '' + scion-ip-gateway traffic configuration + ''; + }; + }; + config = mkIf cfg.enable { + systemd.services.scion-ip-gateway = { + description = "SCION IP Gateway Service"; + after = [ + "network-online.target" + "scion-dispatcher.service" + ]; + wants = [ + "network-online.target" + "scion-dispatcher.service" + ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + Group = if (config.services.scion.scion-dispatcher.enable == true) then "scion" else null; + ExecStart = "${globalCfg.package}/bin/scion-ip-gateway --config ${configFile}"; + DynamicUser = true; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + Restart = "on-failure"; + KillMode = "control-group"; + RemainAfterExit = false; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/scion/scion.nix b/nixos/modules/services/networking/scion/scion.nix index efab97f7cd8da..0b26f24e7ed02 100644 --- a/nixos/modules/services/networking/scion/scion.nix +++ b/nixos/modules/services/networking/scion/scion.nix @@ -42,6 +42,7 @@ in scion-daemon.enable = true; scion-router.enable = true; scion-control.enable = true; + scion-ip-gateway.enable = true; }; assertions = [ { assertion = cfg.bypassBootstrapWarning == true; diff --git a/nixos/modules/services/networking/seafile.nix b/nixos/modules/services/networking/seafile.nix index 486bc145cd5d6..356bcfe04419d 100644 --- a/nixos/modules/services/networking/seafile.nix +++ b/nixos/modules/services/networking/seafile.nix @@ -1,19 +1,42 @@ -{ config, lib, pkgs, ... }: -with lib; +{ + config, + lib, + pkgs, + ... +}: let cfg = config.services.seafile; settingsFormat = pkgs.formats.ini { }; - ccnetConf = settingsFormat.generate "ccnet.conf" cfg.ccnetSettings; + ccnetConf = settingsFormat.generate "ccnet.conf" ( + lib.attrsets.recursiveUpdate { + Database = { + ENGINE = "mysql"; + UNIX_SOCKET = "/var/run/mysqld/mysqld.sock"; + DB = "ccnet_db"; + CONNECTION_CHARSET = "utf8"; + }; + } cfg.ccnetSettings + ); - seafileConf = settingsFormat.generate "seafile.conf" cfg.seafileSettings; + seafileConf = settingsFormat.generate "seafile.conf" ( + lib.attrsets.recursiveUpdate { + database = { + type = "mysql"; + unix_socket = "/var/run/mysqld/mysqld.sock"; + db_name = "seafile_db"; + connection_charset = "utf8"; + }; + } cfg.seafileSettings + ); seahubSettings = pkgs.writeText "seahub_settings.py" '' FILE_SERVER_ROOT = '${cfg.ccnetSettings.General.SERVICE_URL}/seafhttp' DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': '${seahubDir}/seahub.db', + 'ENGINE': 'django.db.backends.mysql', + 'NAME' : 'seahub_db', + 'HOST' : '/var/run/mysqld/mysqld.sock', } } MEDIA_ROOT = '${seahubDir}/media/' @@ -21,23 +44,25 @@ let SERVICE_URL = '${cfg.ccnetSettings.General.SERVICE_URL}' + CSRF_TRUSTED_ORIGINS = ["${cfg.ccnetSettings.General.SERVICE_URL}"] + with open('${seafRoot}/.seahubSecret') as f: SECRET_KEY = f.readline().rstrip() ${cfg.seahubExtraConf} ''; - seafRoot = "/var/lib/seafile"; # hardcode it due to dynamicuser + seafRoot = "/var/lib/seafile"; ccnetDir = "${seafRoot}/ccnet"; - dataDir = "${seafRoot}/data"; seahubDir = "${seafRoot}/seahub"; + defaultUser = "seafile"; in { ###### Interface - options.services.seafile = { + options.services.seafile = with lib; { enable = mkEnableOption "Seafile server"; ccnetSettings = mkOption { @@ -47,7 +72,7 @@ in options = { General = { SERVICE_URL = mkOption { - type = types.str; + type = types.singleLineStr; example = "https://www.example.com"; description = '' Seahub public URL. @@ -78,11 +103,17 @@ in ''; }; host = mkOption { - type = types.str; - default = "127.0.0.1"; - example = "0.0.0.0"; + type = types.singleLineStr; + default = "ipv4:127.0.0.1"; + example = "unix:/run/seafile/server.sock"; description = '' - The binding address used by seafile fileserver. + The bind address used by seafile fileserver. + + The addr can be defined as one of the following: + - ipv6: for binding to an IPv6 address. + - unix: for binding to a unix named socket + - ipv4: for binding to an ipv4 address + Otherwise the addr is assumed to be ipv4. ''; }; }; @@ -96,6 +127,19 @@ in ''; }; + seahubAddress = mkOption { + type = types.singleLineStr; + default = "unix:/run/seahub/gunicorn.sock"; + example = "[::1]:8083"; + description = '' + Which address to bind the seahub server to, of the form: + - HOST + - HOST:PORT + - unix:PATH. + IPv6 HOSTs must be wrapped in brackets. + ''; + }; + workers = mkOption { type = types.int; default = 4; @@ -107,7 +151,7 @@ in adminEmail = mkOption { example = "john@example.com"; - type = types.str; + type = types.singleLineStr; description = '' Seafile Seahub Admin Account Email. ''; @@ -115,17 +159,79 @@ in initialAdminPassword = mkOption { example = "someStrongPass"; - type = types.str; + type = types.singleLineStr; description = '' Seafile Seahub Admin Account initial password. - Should be change via Seahub web front-end. + Should be changed via Seahub web front-end. ''; }; - seafilePackage = mkPackageOption pkgs "seafile-server" { }; + seahubPackage = mkPackageOption pkgs "seahub" { }; + + user = mkOption { + type = types.singleLineStr; + default = defaultUser; + description = "User account under which seafile runs."; + }; + + group = mkOption { + type = types.singleLineStr; + default = defaultUser; + description = "Group under which seafile runs."; + }; + + dataDir = mkOption { + type = types.path; + default = "${seafRoot}/data"; + description = "Path in which to store user data"; + }; + + gc = { + enable = mkEnableOption "automatic garbage collection on stored data blocks"; + + dates = mkOption { + type = types.listOf types.singleLineStr; + default = [ "Sun 03:00:00" ]; + description = '' + When to run garbage collection on stored data blocks. + The time format is described in {manpage}`systemd.time(7)`. + ''; + }; + + randomizedDelaySec = mkOption { + default = "0"; + type = types.singleLineStr; + example = "45min"; + description = '' + Add a randomized delay before each garbage collection. + The delay will be chosen between zero and this value. + This value must be a time span in the format specified by + {manpage}`systemd.time(7)` + ''; + }; + + persistent = mkOption { + default = true; + type = types.bool; + example = false; + description = '' + Takes a boolean argument. If true, the time when the service + unit was last triggered is stored on disk. When the timer is + activated, the service unit is triggered immediately if it + would have been triggered at least once during the time when + the timer was inactive. Such triggering is nonetheless + subject to the delay imposed by RandomizedDelaySec=. This is + useful to catch up on missed runs of the service when the + system was powered down. + ''; + }; + }; seahubExtraConf = mkOption { default = ""; + example = '' + CSRF_TRUSTED_ORIGINS = ["https://example.com"] + ''; type = types.lines; description = '' Extra config to append to `seahub_settings.py` file. @@ -137,12 +243,40 @@ in ###### Implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { + services.mysql = { + enable = true; + package = lib.mkDefault pkgs.mariadb; + ensureDatabases = [ + "ccnet_db" + "seafile_db" + "seahub_db" + ]; + ensureUsers = [ + { + name = cfg.user; + ensurePermissions = { + "ccnet_db.*" = "ALL PRIVILEGES"; + "seafile_db.*" = "ALL PRIVILEGES"; + "seahub_db.*" = "ALL PRIVILEGES"; + }; + } + ]; + }; environment.etc."seafile/ccnet.conf".source = ccnetConf; environment.etc."seafile/seafile.conf".source = seafileConf; environment.etc."seafile/seahub_settings.py".source = seahubSettings; + users.users = lib.optionalAttrs (cfg.user == defaultUser) { + "${defaultUser}" = { + group = cfg.group; + isSystemUser = true; + }; + }; + + users.groups = lib.optionalAttrs (cfg.group == defaultUser) { "${defaultUser}" = { }; }; + systemd.targets.seafile = { wantedBy = [ "multi-user.target" ]; description = "Seafile components"; @@ -150,10 +284,12 @@ in systemd.services = let - securityOptions = { + serviceOptions = { ProtectHome = true; PrivateUsers = true; PrivateDevices = true; + PrivateTmp = true; + ProtectSystem = "strict"; ProtectClock = true; ProtectHostname = true; ProtectProc = "invisible"; @@ -162,36 +298,49 @@ in ProtectKernelLogs = true; ProtectControlGroups = true; RestrictNamespaces = true; + RemoveIPC = true; LockPersonality = true; RestrictRealtime = true; RestrictSUIDSGID = true; + NoNewPrivileges = true; MemoryDenyWriteExecute = true; SystemCallArchitectures = "native"; - RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" ]; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + ]; + + User = cfg.user; + Group = cfg.group; + StateDirectory = "seafile"; + RuntimeDirectory = "seafile"; + LogsDirectory = "seafile"; + ConfigurationDirectory = "seafile"; + ReadWritePaths = lib.lists.optional (cfg.dataDir != "${seafRoot}/data") cfg.dataDir; }; in { seaf-server = { description = "Seafile server"; partOf = [ "seafile.target" ]; - after = [ "network.target" ]; + unitConfig.RequiresMountsFor = lib.lists.optional (cfg.dataDir != "${seafRoot}/data") cfg.dataDir; + requires = [ "mysql.service" ]; + after = [ + "network.target" + "mysql.service" + ]; wantedBy = [ "seafile.target" ]; - restartTriggers = [ ccnetConf seafileConf ]; - path = [ pkgs.sqlite ]; - serviceConfig = securityOptions // { - User = "seafile"; - Group = "seafile"; - DynamicUser = true; - StateDirectory = "seafile"; - RuntimeDirectory = "seafile"; - LogsDirectory = "seafile"; - ConfigurationDirectory = "seafile"; + restartTriggers = [ + ccnetConf + seafileConf + ]; + serviceConfig = serviceOptions // { ExecStart = '' - ${cfg.seafilePackage}/bin/seaf-server \ + ${lib.getExe cfg.seahubPackage.seafile-server} \ --foreground \ -F /etc/seafile \ -c ${ccnetDir} \ - -d ${dataDir} \ + -d ${cfg.dataDir} \ -l /var/log/seafile/server.log \ -P /run/seafile/server.pid \ -p /run/seafile @@ -199,100 +348,201 @@ in }; preStart = '' if [ ! -f "${seafRoot}/server-setup" ]; then - mkdir -p ${dataDir}/library-template - mkdir -p ${ccnetDir}/{GroupMgr,misc,OrgMgr,PeerMgr} - sqlite3 ${ccnetDir}/GroupMgr/groupmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/groupmgr.sql" - sqlite3 ${ccnetDir}/misc/config.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/config.sql" - sqlite3 ${ccnetDir}/OrgMgr/orgmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/org.sql" - sqlite3 ${ccnetDir}/PeerMgr/usermgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/user.sql" - sqlite3 ${dataDir}/seafile.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/seafile.sql" - echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup + mkdir -p ${cfg.dataDir}/library-template + # Load schema on first install + ${pkgs.mariadb.client}/bin/mysql --database=ccnet_db < ${cfg.seahubPackage.seafile-server}/share/seafile/sql/mysql/ccnet.sql + ${pkgs.mariadb.client}/bin/mysql --database=seafile_db < ${cfg.seahubPackage.seafile-server}/share/seafile/sql/mysql/seafile.sql + echo "${cfg.seahubPackage.seafile-server.version}-mysql" > "${seafRoot}"/server-setup + echo Loaded MySQL schemas for first install fi # checking for upgrades and handling them installedMajor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f1) installedMinor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f2) - pkgMajor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f1) - pkgMinor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f2) + pkgMajor=$(echo "${cfg.seahubPackage.seafile-server.version}" | cut -d"." -f1) + pkgMinor=$(echo "${cfg.seahubPackage.seafile-server.version}" | cut -d"." -f2) if [[ $installedMajor == $pkgMajor && $installedMinor == $pkgMinor ]]; then : - elif [[ $installedMajor == 8 && $installedMinor == 0 && $pkgMajor == 9 && $pkgMinor == 0 ]]; then - # Upgrade from 8.0 to 9.0 - sqlite3 ${dataDir}/seafile.db ".read ${pkgs.seahub}/scripts/upgrade/sql/9.0.0/sqlite3/seafile.sql" - echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup - elif [[ $installedMajor == 9 && $installedMinor == 0 && $pkgMajor == 10 && $pkgMinor == 0 ]]; then - # Upgrade from 9.0 to 10.0 - sqlite3 ${dataDir}/seafile.db ".read ${pkgs.seahub}/scripts/upgrade/sql/10.0.0/sqlite3/seafile.sql" - echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup + elif [[ $installedMajor == 10 && $installedMinor == 0 && $pkgMajor == 11 && $pkgMinor == 0 ]]; then + # Upgrade from 10.0 to 11.0: migrate to mysql + echo Migrating from version 10 to 11 + + # From https://github.com/haiwen/seahub/blob/e12f941bfef7191795d8c72a7d339c01062964b2/scripts/sqlite2mysql.sh + + echo Migrating ccnet database to MySQL + ${lib.getExe pkgs.sqlite} ${ccnetDir}/PeerMgr/usermgr.db ".dump" | \ + ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/scripts/sqlite2mysql.py > ${ccnetDir}/ccnet.sql + ${lib.getExe pkgs.sqlite} ${ccnetDir}/GroupMgr/groupmgr.db ".dump" | \ + ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/scripts/sqlite2mysql.py >> ${ccnetDir}/ccnet.sql + sed 's/ctime INTEGER/ctime BIGINT/g' -i ${ccnetDir}/ccnet.sql + sed 's/email TEXT, role TEXT/email VARCHAR(255), role TEXT/g' -i ${ccnetDir}/ccnet.sql + ${pkgs.mariadb.client}/bin/mysql --database=ccnet_db < ${ccnetDir}/ccnet.sql + + echo Migrating seafile database to MySQL + ${lib.getExe pkgs.sqlite} ${cfg.dataDir}/seafile.db ".dump" | \ + ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/scripts/sqlite2mysql.py > ${cfg.dataDir}/seafile.sql + sed 's/owner_id TEXT/owner_id VARCHAR(255)/g' -i ${cfg.dataDir}/seafile.sql + sed 's/user_name TEXT/user_name VARCHAR(255)/g' -i ${cfg.dataDir}/seafile.sql + ${pkgs.mariadb.client}/bin/mysql --database=seafile_db < ${cfg.dataDir}/seafile.sql + + echo Migrating seahub database to MySQL + echo 'SET FOREIGN_KEY_CHECKS=0;' > ${seahubDir}/seahub.sql + ${lib.getExe pkgs.sqlite} ${seahubDir}/seahub.db ".dump" | \ + ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/scripts/sqlite2mysql.py >> ${seahubDir}/seahub.sql + sed 's/`permission` , `reporter` text NOT NULL/`permission` longtext NOT NULL/g' -i ${seahubDir}/seahub.sql + sed 's/varchar(256) NOT NULL UNIQUE/varchar(255) NOT NULL UNIQUE/g' -i ${seahubDir}/seahub.sql + sed 's/, UNIQUE (`user_email`, `contact_email`)//g' -i ${seahubDir}/seahub.sql + sed '/INSERT INTO `base_dirfileslastmodifiedinfo`/d' -i ${seahubDir}/seahub.sql + sed '/INSERT INTO `notifications_usernotification`/d' -i ${seahubDir}/seahub.sql + sed 's/DEFERRABLE INITIALLY DEFERRED//g' -i ${seahubDir}/seahub.sql + ${pkgs.mariadb.client}/bin/mysql --database=seahub_db < ${seahubDir}/seahub.sql + + echo "${cfg.seahubPackage.seafile-server.version}-mysql" > "${seafRoot}"/server-setup + echo Migration complete else - echo "Unsupported upgrade" >&2 + echo "Unsupported upgrade: $installedMajor.$installedMinor to $pkgMajor.$pkgMinor" >&2 exit 1 fi ''; + + # Fix unix socket permissions + postStart = ( + lib.strings.optionalString (lib.strings.hasPrefix "unix:" cfg.seafileSettings.fileserver.host) '' + while [[ ! -S "${lib.strings.removePrefix "unix:" cfg.seafileSettings.fileserver.host}" ]]; do + sleep 1 + done + chmod 666 "${lib.strings.removePrefix "unix:" cfg.seafileSettings.fileserver.host}" + '' + ); }; seahub = { description = "Seafile Server Web Frontend"; wantedBy = [ "seafile.target" ]; partOf = [ "seafile.target" ]; - after = [ "network.target" "seaf-server.service" ]; - requires = [ "seaf-server.service" ]; + unitConfig.RequiresMountsFor = lib.lists.optional (cfg.dataDir != "${seafRoot}/data") cfg.dataDir; + requires = [ + "mysql.service" + "seaf-server.service" + ]; + after = [ + "network.target" + "mysql.service" + "seaf-server.service" + ]; restartTriggers = [ seahubSettings ]; environment = { - PYTHONPATH = "${pkgs.seahub.pythonPath}:${pkgs.seahub}/thirdpart:${pkgs.seahub}"; + PYTHONPATH = "${cfg.seahubPackage.pythonPath}:${cfg.seahubPackage}/thirdpart:${cfg.seahubPackage}"; DJANGO_SETTINGS_MODULE = "seahub.settings"; CCNET_CONF_DIR = ccnetDir; - SEAFILE_CONF_DIR = dataDir; + SEAFILE_CONF_DIR = cfg.dataDir; SEAFILE_CENTRAL_CONF_DIR = "/etc/seafile"; SEAFILE_RPC_PIPE_PATH = "/run/seafile"; SEAHUB_LOG_DIR = "/var/log/seafile"; }; - serviceConfig = securityOptions // { - User = "seafile"; - Group = "seafile"; - DynamicUser = true; + serviceConfig = serviceOptions // { RuntimeDirectory = "seahub"; - StateDirectory = "seafile"; - LogsDirectory = "seafile"; - ConfigurationDirectory = "seafile"; ExecStart = '' - ${pkgs.seahub.python.pkgs.gunicorn}/bin/gunicorn seahub.wsgi:application \ + ${lib.getExe cfg.seahubPackage.python3.pkgs.gunicorn} seahub.wsgi:application \ --name seahub \ --workers ${toString cfg.workers} \ --log-level=info \ --preload \ --timeout=1200 \ --limit-request-line=8190 \ - --bind unix:/run/seahub/gunicorn.sock + --bind ${cfg.seahubAddress} ''; }; preStart = '' mkdir -p ${seahubDir}/media # Link all media except avatars - for m in `find ${pkgs.seahub}/media/ -maxdepth 1 -not -name "avatars"`; do + for m in `find ${cfg.seahubPackage}/media/ -maxdepth 1 -not -name "avatars"`; do ln -sf $m ${seahubDir}/media/ done if [ ! -e "${seafRoot}/.seahubSecret" ]; then - ${pkgs.seahub.python}/bin/python ${pkgs.seahub}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret - chmod 400 ${seafRoot}/.seahubSecret + ( + umask 377 && + ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret + ) fi if [ ! -f "${seafRoot}/seahub-setup" ]; then # avatars directory should be writable - install -D -t ${seahubDir}/media/avatars/ ${pkgs.seahub}/media/avatars/default.png - install -D -t ${seahubDir}/media/avatars/groups ${pkgs.seahub}/media/avatars/groups/default.png + install -D -t ${seahubDir}/media/avatars/ ${cfg.seahubPackage}/media/avatars/default.png + install -D -t ${seahubDir}/media/avatars/groups ${cfg.seahubPackage}/media/avatars/groups/default.png # init database - ${pkgs.seahub}/manage.py migrate + ${cfg.seahubPackage}/manage.py migrate # create admin account - ${pkgs.expect}/bin/expect -c 'spawn ${pkgs.seahub}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' - echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" + ${lib.getExe pkgs.expect} -c 'spawn ${cfg.seahubPackage}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' + echo "${cfg.seahubPackage.version}-mysql" > "${seafRoot}/seahub-setup" fi if [ $(cat "${seafRoot}/seahub-setup" | cut -d"-" -f1) != "${pkgs.seahub.version}" ]; then - # update database - ${pkgs.seahub}/manage.py migrate - echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" + # run django migrations + ${cfg.seahubPackage}/manage.py migrate + echo "${cfg.seahubPackage.version}-mysql" > "${seafRoot}/seahub-setup" + fi + ''; + }; + + seaf-gc = { + description = "Seafile storage garbage collection"; + conflicts = [ + "seaf-server.service" + "seahub.service" + ]; + after = [ + "seaf-server.service" + "seahub.service" + ]; + unitConfig.RequiresMountsFor = lib.lists.optional (cfg.dataDir != "${seafRoot}/data") cfg.dataDir; + onSuccess = [ + "seaf-server.service" + "seahub.service" + ]; + onFailure = [ + "seaf-server.service" + "seahub.service" + ]; + startAt = lib.lists.optionals cfg.gc.enable cfg.gc.dates; + serviceConfig = serviceOptions // { + Type = "oneshot"; + }; + script = '' + if [ ! -f "${seafRoot}/server-setup" ]; then + echo "Server not setup yet, GC not needed" >&2 + exit + fi + + # checking for pending upgrades + installedMajor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f1) + installedMinor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f2) + pkgMajor=$(echo "${cfg.seahubPackage.seafile-server.version}" | cut -d"." -f1) + pkgMinor=$(echo "${cfg.seahubPackage.seafile-server.version}" | cut -d"." -f2) + + if [[ $installedMajor != $pkgMajor || $installedMinor != $pkgMinor ]]; then + echo "Server not upgraded yet" >&2 + exit fi + + # Clean up user-deleted blocks and libraries + ${cfg.seahubPackage.seafile-server}/bin/seafserv-gc \ + -F /etc/seafile \ + -c ${ccnetDir} \ + -d ${cfg.dataDir} \ + --rm-fs ''; }; }; + + systemd.timers.seaf-gc = lib.mkIf cfg.gc.enable { + timerConfig = { + randomizedDelaySec = cfg.gc.randomizedDelaySec; + Persistent = cfg.gc.persistent; + }; + }; }; + + meta.maintainers = with lib.maintainers; [ + greizgh + schmittlauch + ]; } diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index eb61663e4d922..df7e143bb41f4 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -82,7 +82,7 @@ in createHome = true; home = "/var/lib/shairport-sync"; group = cfg.group; - extraGroups = [ "audio" ] ++ optional config.hardware.pulseaudio.enable "pulse"; + extraGroups = [ "audio" ] ++ optional (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) "pulse"; }; groups.${cfg.group} = {}; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 1e4e34a4f1675..26ca39f73d390 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let # The splicing information needed for nativeBuildInputs isn't available @@ -17,8 +14,8 @@ let let # reports boolean as yes / no mkValueString = with lib; v: - if isInt v then toString v - else if isString v then v + if lib.isInt v then toString v + else if lib.isString v then v else if true == v then "yes" else if false == v then "no" else throw "unsupported type ${builtins.typeOf v}: ${(lib.generators.toPretty {}) v}"; @@ -37,10 +34,10 @@ let in { inherit (base) type; generate = name: value: - let transformedValue = mapAttrs (key: val: - if isList val then - if elem key commaSeparated then concatStringsSep "," val - else if elem key spaceSeparated then concatStringsSep " " val + let transformedValue = lib.mapAttrs (key: val: + if lib.isList val then + if lib.elem key commaSeparated then lib.concatStringsSep "," val + else if lib.elem key spaceSeparated then lib.concatStringsSep " " val else throw "list value for unknown key ${key}: ${(lib.generators.toPretty {}) val}" else val @@ -49,7 +46,7 @@ let base.generate name transformedValue; }; - configFile = settingsFormat.generate "sshd.conf-settings" (filterAttrs (n: v: v != null) cfg.settings); + configFile = settingsFormat.generate "sshd.conf-settings" (lib.filterAttrs (n: v: v != null) cfg.settings); sshconf = pkgs.runCommand "sshd.conf-final" { } '' cat ${configFile} - >$out < ''; }; - Macs = mkOption { - type = types.nullOr (types.listOf types.str); + Macs = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = [ "hmac-sha2-512-etm@openssh.com" "hmac-sha2-256-etm@openssh.com" @@ -448,15 +445,15 @@ in ''; }; - StrictModes = mkOption { - type = types.nullOr (types.bool); + StrictModes = lib.mkOption { + type = lib.types.nullOr (lib.types.bool); default = true; description = '' Whether sshd should check file modes and ownership of directories ''; }; - Ciphers = mkOption { - type = types.nullOr (types.listOf types.str); + Ciphers = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = [ "chacha20-poly1305@openssh.com" "aes256-gcm@openssh.com" @@ -474,16 +471,16 @@ in ''; }; - AllowUsers = mkOption { - type = with types; nullOr (listOf str); + AllowUsers = lib.mkOption { + type = with lib.types; nullOr (listOf str); default = null; description = '' If specified, login is allowed only for the listed users. See {manpage}`sshd_config(5)` for details. ''; }; - DenyUsers = mkOption { - type = with types; nullOr (listOf str); + DenyUsers = lib.mkOption { + type = with lib.types; nullOr (listOf str); default = null; description = '' If specified, login is denied for all listed users. Takes @@ -491,8 +488,8 @@ in See {manpage}`sshd_config(5)` for details. ''; }; - AllowGroups = mkOption { - type = with types; nullOr (listOf str); + AllowGroups = lib.mkOption { + type = with lib.types; nullOr (listOf str); default = null; description = '' If specified, login is allowed only for users part of the @@ -500,8 +497,8 @@ in See {manpage}`sshd_config(5)` for details. ''; }; - DenyGroups = mkOption { - type = with types; nullOr (listOf str); + DenyGroups = lib.mkOption { + type = with lib.types; nullOr (listOf str); default = null; description = '' If specified, login is denied for all users part of the listed @@ -512,21 +509,21 @@ in }; # Disabled by default, since pam_motd handles this. PrintMotd = - mkEnableOption "printing /etc/motd when a user logs in interactively" - // { type = types.nullOr types.bool; }; + lib.mkEnableOption "printing /etc/motd when a user logs in interactively" + // { type = lib.types.nullOr lib.types.bool; }; }; }); }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = "Verbatim contents of {file}`sshd_config`."; }; - moduliFile = mkOption { + moduliFile = lib.mkOption { example = "/etc/my-local-ssh-moduli;"; - type = types.path; + type = lib.types.path; description = '' Path to `moduli` file to install in `/etc/ssh/moduli`. If this option is unset, then @@ -536,8 +533,8 @@ in }; - users.users = mkOption { - type = with types; attrsOf (submodule userOptions); + users.users = lib.mkOption { + type = with lib.types; attrsOf (submodule userOptions); }; }; @@ -545,7 +542,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.users.sshd = { @@ -555,8 +552,8 @@ in }; users.groups.sshd = {}; - services.openssh.moduliFile = mkDefault "${cfg.package}/etc/ssh/moduli"; - services.openssh.sftpServerExecutable = mkDefault "${cfg.package}/libexec/sftp-server"; + 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; @@ -567,13 +564,13 @@ in let service = { description = "SSH Daemon"; - wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target"; + wantedBy = lib.optional (!cfg.startWhenNeeded) "multi-user.target"; after = [ "network.target" ]; stopIfChanged = false; path = [ cfg.package pkgs.gawk ]; environment.LD_LIBRARY_PATH = nssModulesPath; - restartTriggers = optionals (!cfg.startWhenNeeded) [ + restartTriggers = lib.optionals (!cfg.startWhenNeeded) [ config.environment.etc."ssh/sshd_config".source ]; @@ -583,18 +580,19 @@ in # socket activation, it goes to the remote side (#19589). exec >&2 - ${flip concatMapStrings cfg.hostKeys (k: '' + ${lib.flip lib.concatMapStrings cfg.hostKeys (k: '' if ! [ -s "${k.path}" ]; then if ! [ -h "${k.path}" ]; then rm -f "${k.path}" fi - mkdir -m 0755 -p "$(dirname '${k.path}')" + mkdir -p "$(dirname '${k.path}')" + chmod 0755 "$(dirname '${k.path}')" ssh-keygen \ -t "${k.type}" \ - ${optionalString (k ? bits) "-b ${toString k.bits}"} \ - ${optionalString (k ? rounds) "-a ${toString k.rounds}"} \ - ${optionalString (k ? comment) "-C '${k.comment}'"} \ - ${optionalString (k ? openSSHFormat && k.openSSHFormat) "-o"} \ + ${lib.optionalString (k ? bits) "-b ${toString k.bits}"} \ + ${lib.optionalString (k ? rounds) "-a ${toString k.rounds}"} \ + ${lib.optionalString (k ? comment) "-C '${k.comment}'"} \ + ${lib.optionalString (k ? openSSHFormat && k.openSSHFormat) "-o"} \ -f "${k.path}" \ -N "" fi @@ -603,8 +601,8 @@ in serviceConfig = { ExecStart = - (optionalString cfg.startWhenNeeded "-") + - "${cfg.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") + + (lib.optionalString cfg.startWhenNeeded "-") + + "${cfg.package}/bin/sshd " + (lib.optionalString cfg.startWhenNeeded "-i ") + "-D " + # don't detach into a daemon process "-f /etc/ssh/sshd_config"; KillMode = "process"; @@ -625,7 +623,7 @@ in { description = "SSH Socket"; wantedBy = [ "sockets.target" ]; socketConfig.ListenStream = if cfg.listenAddresses != [] then - concatMap + lib.concatMap ({ addr, port }: if port != null then [ "${addr}:${toString port}" ] else map (p: "${addr}:${toString p}") cfg.ports) @@ -645,7 +643,7 @@ in }; - networking.firewall.allowedTCPPorts = optionals cfg.openFirewall cfg.ports; + networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall cfg.ports; security.pam.services.sshd = lib.mkIf cfg.settings.UsePAM { startSession = true; @@ -662,34 +660,34 @@ in services.openssh.authorizedKeysFiles = lib.optional cfg.authorizedKeysInHomedir "%h/.ssh/authorized_keys" ++ [ "/etc/ssh/authorized_keys.d/%u" ]; - services.openssh.settings.AuthorizedPrincipalsFile = mkIf (authPrincipalsFiles != {}) "/etc/ssh/authorized_principals.d/%u"; + services.openssh.settings.AuthorizedPrincipalsFile = lib.mkIf (authPrincipalsFiles != {}) "/etc/ssh/authorized_principals.d/%u"; - services.openssh.extraConfig = mkOrder 0 + services.openssh.extraConfig = lib.mkOrder 0 '' Banner ${if cfg.banner == null then "none" else pkgs.writeText "ssh_banner" cfg.banner} AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"} - ${concatMapStrings (port: '' + ${lib.concatMapStrings (port: '' Port ${toString port} '') cfg.ports} - ${concatMapStrings ({ port, addr, ... }: '' - ListenAddress ${addr}${optionalString (port != null) (":" + toString port)} + ${lib.concatMapStrings ({ port, addr, ... }: '' + ListenAddress ${addr}${lib.optionalString (port != null) (":" + toString port)} '') cfg.listenAddresses} - ${optionalString cfgc.setXAuthLocation '' + ${lib.optionalString cfgc.setXAuthLocation '' XAuthLocation ${pkgs.xorg.xauth}/bin/xauth ''} - ${optionalString cfg.allowSFTP '' - Subsystem sftp ${cfg.sftpServerExecutable} ${concatStringsSep " " cfg.sftpFlags} + ${lib.optionalString cfg.allowSFTP '' + Subsystem sftp ${cfg.sftpServerExecutable} ${lib.concatStringsSep " " cfg.sftpFlags} ''} AuthorizedKeysFile ${toString cfg.authorizedKeysFiles} - ${optionalString (cfg.authorizedKeysCommand != "none") '' + ${lib.optionalString (cfg.authorizedKeysCommand != "none") '' AuthorizedKeysCommand ${cfg.authorizedKeysCommand} AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser} ''} - ${flip concatMapStrings cfg.hostKeys (k: '' + ${lib.flip lib.concatMapStrings cfg.hostKeys (k: '' HostKey ${k.path} '')} ''; @@ -699,13 +697,13 @@ in { nativeBuildInputs = [ validationPackage ]; } '' - ${concatMapStringsSep "\n" + ${lib.concatMapStringsSep "\n" (lport: "sshd -G -T -C lport=${toString lport} -f ${sshconf} > /dev/null") cfg.ports} - ${concatMapStringsSep "\n" + ${lib.concatMapStringsSep "\n" (la: - concatMapStringsSep "\n" - (port: "sshd -G -T -C ${escapeShellArg "laddr=${la.addr},lport=${toString port}"} -f ${sshconf} > /dev/null") + lib.concatMapStringsSep "\n" + (port: "sshd -G -T -C ${lib.escapeShellArg "laddr=${la.addr},lport=${toString port}"} -f ${sshconf} > /dev/null") (if la.port != null then [ la.port ] else cfg.ports) ) cfg.listenAddresses} @@ -726,7 +724,7 @@ in # Grab the groups, we don't care about the group identifiers lib.attrValues ( # Group the settings that are the same in lower case - lib.groupBy lib.strings.toLower (attrNames cfg.settings) + lib.groupBy lib.strings.toLower (lib.attrNames cfg.settings) ) ); formattedDuplicates = lib.concatMapStringsSep ", " (dupl: "(${lib.concatStringsSep ", " dupl})") duplicates; @@ -735,7 +733,7 @@ in assertion = lib.length duplicates == 0; message = ''Duplicate sshd config key; does your capitalization match the option's? Duplicate keys: ${formattedDuplicates}''; })] - ++ forEach cfg.listenAddresses ({ addr, ... }: { + ++ lib.forEach cfg.listenAddresses ({ addr, ... }: { assertion = addr != null; message = "addr must be specified in each listenAddresses entry"; }); diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 0c04a9c853960..1cb9f4e1fc5aa 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -3,14 +3,12 @@ let inherit (builtins) toFile; - inherit (lib) concatMapStringsSep concatStringsSep mapAttrsToList + inherit (lib) concatMapStrings concatStringsSep mapAttrsToList mkIf mkEnableOption mkOption types literalExpression optionalString; cfg = config.services.strongswan; - ipsecSecrets = secrets: toFile "ipsec.secrets" ( - concatMapStringsSep "\n" (f: "include ${f}") secrets - ); + ipsecSecrets = secrets: concatMapStrings (f: "include ${f}\n") secrets; ipsecConf = {setup, connections, ca}: let @@ -138,16 +136,12 @@ in }; - config = with cfg; - let - secretsFile = ipsecSecrets cfg.secrets; - in - mkIf enable + config = with cfg; mkIf enable { # here we should use the default strongswan ipsec.secrets and # append to it (default one is empty so not a pb for now) - environment.etc."ipsec.secrets".source = secretsFile; + environment.etc."ipsec.secrets".text = ipsecSecrets cfg.secrets; systemd.services.strongswan = { description = "strongSwan IPSec Service"; @@ -156,7 +150,10 @@ in wants = [ "network-online.target" ]; after = [ "network-online.target" ]; environment = { - STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; + STRONGSWAN_CONF = strongswanConf { + inherit setup connections ca managePlugins enabledPlugins; + secretsFile = "/etc/ipsec.secrets"; + }; }; serviceConfig = { ExecStart = "${pkgs.strongswan}/sbin/ipsec start --nofork"; diff --git a/nixos/modules/services/networking/suricata/default.nix b/nixos/modules/services/networking/suricata/default.nix new file mode 100644 index 0000000000000..5473fc913ebc6 --- /dev/null +++ b/nixos/modules/services/networking/suricata/default.nix @@ -0,0 +1,282 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.services.suricata; + pkg = cfg.package; + yaml = pkgs.formats.yaml { }; + inherit (lib) + mkEnableOption + mkPackageOption + mkOption + types + literalExpression + filterAttrsRecursive + concatStringsSep + strings + lists + mkIf + ; +in +{ + meta.maintainers = with lib.maintainers; [ felbinger ]; + + options.services.suricata = { + enable = mkEnableOption "Suricata"; + + package = mkPackageOption pkgs "suricata" { }; + + configFile = mkOption { + type = types.path; + visible = false; + default = pkgs.writeTextFile { + name = "suricata.yaml"; + text = '' + %YAML 1.1 + --- + ${builtins.readFile ( + yaml.generate "suricata-settings-raw.yaml" ( + filterAttrsRecursive (name: value: value != null) cfg.settings + ) + )} + ''; + }; + description = '' + Configuration file for suricata. + + It is not usual to override the default values; it is recommended to use `settings`. + If you want to include extra configuration to the file, use the `settings.includes`. + ''; + }; + + settings = mkOption { + type = types.submodule (import ./settings.nix { inherit config lib yaml; }); + example = literalExpression '' + vars.address-groups.HOME_NET = "192.168.178.0/24"; + outputs = [ + { + fast = { + enabled = true; + filename = "fast.log"; + append = "yes"; + }; + } + { + eve-log = { + enabled = true; + filetype = "regular"; + filename = "eve.json"; + community-id = true; + types = [ + { + alert.tagged-packets = "yes"; + } + ]; + }; + } + ]; + af-packet = [ + { + interface = "eth0"; + cluster-id = "99"; + cluster-type = "cluster_flow"; + defrag = "yes"; + } + { + interface = "default"; + } + ]; + af-xdp = [ + { + interface = "eth1"; + } + ]; + dpdk.interfaces = [ + { + interface = "eth2"; + } + ]; + pcap = [ + { + interface = "eth3"; + } + ]; + app-layer.protocols = { + telnet.enabled = "yes"; + dnp3.enabled = "yes"; + modbus.enabled = "yes"; + }; + ''; + description = "Suricata settings"; + }; + + enabledSources = mkOption { + type = types.listOf types.str; + # see: nix-shell -p suricata python3Packages.pyyaml --command 'suricata-update list-sources' + default = [ + "et/open" + "etnetera/aggressive" + "stamus/lateral" + "oisf/trafficid" + "tgreen/hunting" + "sslbl/ja3-fingerprints" + "sslbl/ssl-fp-blacklist" + "malsilo/win-malware" + "pawpatrules" + ]; + description = '' + List of sources that should be enabled. + Currently sources which require a secret-code are not supported. + ''; + }; + + disabledRules = mkOption { + type = types.listOf types.str; + # protocol dnp3 seams to be disabled, which causes the signature evaluation to fail, so we disable the + # dnp3 rules, see https://github.com/OISF/suricata/blob/master/rules/dnp3-events.rules for more details + default = [ + "2270000" + "2270001" + "2270002" + "2270003" + "2270004" + ]; + description = '' + List of rules that should be disabled. + ''; + }; + }; + + config = + let + captureInterfaces = + let + inherit (lists) unique optionals; + in + unique ( + map (e: e.interface) ( + (optionals (cfg.settings.af-packet != null) cfg.settings.af-packet) + ++ (optionals (cfg.settings.af-xdp != null) cfg.settings.af-xdp) + ++ (optionals ( + cfg.settings.dpdk != null && cfg.settings.dpdk.interfaces != null + ) cfg.settings.dpdk.interfaces) + ++ (optionals (cfg.settings.pcap != null) cfg.settings.pcap) + ) + ); + in + mkIf cfg.enable { + assertions = [ + { + assertion = (builtins.length captureInterfaces) > 0; + message = '' + At least one capture interface must be configured: + - `services.suricata.settings.af-packet` + - `services.suricata.settings.af-xdp` + - `services.suricata.settings.dpdk.interfaces` + - `services.suricata.settings.pcap` + ''; + } + ]; + + boot.kernelModules = mkIf (cfg.settings.af-packet != null) [ "af_packet" ]; + + users = { + groups.${cfg.settings.run-as.group} = { }; + users.${cfg.settings.run-as.user} = { + group = cfg.settings.run-as.group; + isSystemUser = true; + }; + }; + + systemd.tmpfiles.rules = [ + "d ${cfg.settings."default-log-dir"} 755 ${cfg.settings.run-as.user} ${cfg.settings.run-as.group}" + "d /var/lib/suricata 755 ${cfg.settings.run-as.user} ${cfg.settings.run-as.group}" + "d ${cfg.settings."default-rule-path"} 755 ${cfg.settings.run-as.user} ${cfg.settings.run-as.group}" + ]; + + systemd.services = { + suricata-update = { + description = "Update Suricata Rules"; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + + script = + let + python = pkgs.python3.withPackages (ps: with ps; [ pyyaml ]); + enabledSourcesCmds = map ( + src: "${python.interpreter} ${pkg}/bin/suricata-update enable-source ${src}" + ) cfg.enabledSources; + in + '' + ${concatStringsSep "\n" enabledSourcesCmds} + ${python.interpreter} ${pkg}/bin/suricata-update update-sources + ${python.interpreter} ${pkg}/bin/suricata-update update --suricata-conf ${cfg.configFile} --no-test \ + --disable-conf ${pkgs.writeText "suricata-disable-conf" "${concatStringsSep "\n" cfg.disabledRules}"} + ''; + serviceConfig = { + Type = "oneshot"; + + PrivateTmp = true; + PrivateDevices = true; + PrivateIPC = true; + + DynamicUser = true; + User = cfg.settings.run-as.user; + Group = cfg.settings.run-as.group; + + ReadOnlyPaths = cfg.configFile; + ReadWritePaths = [ + "/var/lib/suricata" + cfg.settings."default-rule-path" + ]; + }; + }; + suricata = { + description = "Suricata"; + wantedBy = [ "multi-user.target" ]; + after = [ "suricata-update.service" ]; + serviceConfig = + let + interfaceOptions = strings.concatMapStrings (interface: " -i ${interface}") captureInterfaces; + in + { + ExecStartPre = "!${pkg}/bin/suricata -c ${cfg.configFile} -T"; + ExecStart = "!${pkg}/bin/suricata -c ${cfg.configFile}${interfaceOptions}"; + Restart = "on-failure"; + + User = cfg.settings.run-as.user; + Group = cfg.settings.run-as.group; + + NoNewPrivileges = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateIPC = true; + ProtectSystem = "strict"; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + ProtectHostname = true; + ProtectProc = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProcSubset = "pid"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + RemoveIPC = true; + + ReadOnlyPaths = cfg.configFile; + ReadWritePaths = cfg.settings."default-log-dir"; + RuntimeDirectory = "suricata"; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/suricata/settings.nix b/nixos/modules/services/networking/suricata/settings.nix new file mode 100644 index 0000000000000..f96d78ca66d53 --- /dev/null +++ b/nixos/modules/services/networking/suricata/settings.nix @@ -0,0 +1,625 @@ +{ + lib, + config, + yaml, + ... +}: +let + cfg = config.services.suricata; + inherit (lib) + mkEnableOption + mkOption + types + literalExpression + ; + mkDisableOption = + name: + mkEnableOption name + // { + default = true; + example = false; + }; +in +{ + freeformType = yaml.type; + options = { + vars = mkOption { + type = types.nullOr ( + types.submodule { + options = { + address-groups = mkOption { + type = ( + types.submodule { + options = { + HOME_NET = mkOption { default = "[192.168.0.0/16,10.0.0.0/8,172.16.0.0/12]"; }; + EXTERNAL_NET = mkOption { default = "!$HOME_NET"; }; + HTTP_SERVERS = mkOption { default = "$HOME_NET"; }; + SMTP_SERVERS = mkOption { default = "$HOME_NET"; }; + SQL_SERVERS = mkOption { default = "$HOME_NET"; }; + DNS_SERVERS = mkOption { default = "$HOME_NET"; }; + TELNET_SERVERS = mkOption { default = "$HOME_NET"; }; + AIM_SERVERS = mkOption { default = "$EXTERNAL_NET"; }; + DC_SERVERS = mkOption { default = "$HOME_NET"; }; + DNP3_SERVER = mkOption { default = "$HOME_NET"; }; + DNP3_CLIENT = mkOption { default = "$HOME_NET"; }; + MODBUS_CLIENT = mkOption { default = "$HOME_NET"; }; + MODBUS_SERVER = mkOption { default = "$HOME_NET"; }; + ENIP_CLIENT = mkOption { default = "$HOME_NET"; }; + ENIP_SERVER = mkOption { default = "$HOME_NET"; }; + }; + } + ); + default = { }; + example = { + HOME_NET = "[192.168.0.0/16,10.0.0.0/8,172.16.0.0/12]"; + EXTERNAL_NET = "!$HOME_NET"; + HTTP_SERVERS = "$HOME_NET"; + SMTP_SERVERS = "$HOME_NET"; + SQL_SERVERS = "$HOME_NET"; + DNS_SERVERS = "$HOME_NET"; + TELNET_SERVERS = "$HOME_NET"; + AIM_SERVERS = "$EXTERNAL_NET"; + DC_SERVERS = "$HOME_NET"; + DNP3_SERVER = "$HOME_NET"; + DNP3_CLIENT = "$HOME_NET"; + MODBUS_CLIENT = "$HOME_NET"; + MODBUS_SERVER = "$HOME_NET"; + ENIP_CLIENT = "$HOME_NET"; + ENIP_SERVER = "$HOME_NET"; + }; + description = '' + The address group variables for suricata, if not defined the + default value of suricata (see example) will be used. + Your settings will extend the predefined values in example. + ''; + }; + + port-groups = mkOption { + type = with types; nullOr (attrsOf str); + default = { + HTTP_PORTS = "80"; + SHELLCODE_PORTS = "!80"; + ORACLE_PORTS = "1521"; + SSH_PORTS = "22"; + DNP3_PORTS = "20000"; + MODBUS_PORTS = "502"; + FILE_DATA_PORTS = "[$HTTP_PORTS,110,143]"; + FTP_PORTS = "21"; + GENEVE_PORTS = "6081"; + VXLAN_PORTS = "4789"; + TEREDO_PORTS = "3544"; + }; + description = '' + The port group variables for suricata. + ''; + }; + }; + } + ); + default = { }; # add default values to config + }; + + stats = mkOption { + type = + with types; + nullOr (submodule { + options = { + enable = mkEnableOption "suricata global stats"; + + interval = mkOption { + type = types.str; + default = "8"; + description = '' + The interval field (in seconds) controls the interval at + which stats are updated in the log. + ''; + }; + + decoder-events = mkOption { + type = types.bool; + default = true; + description = '' + Add decode events to stats + ''; + }; + + decoder-events-prefix = mkOption { + type = types.str; + default = "decoder.event"; + description = '' + Decoder event prefix in stats. Has been 'decoder' before, but that leads + to missing events in the eve.stats records. + ''; + }; + + stream-events = mkOption { + type = types.bool; + default = false; + description = '' + Add stream events as stats. + ''; + }; + }; + }); + default = null; # do not add to config unless specified + }; + + plugins = mkOption { + type = with types; nullOr (listOf path); + default = null; + description = '' + Plugins -- Experimental -- specify the filename for each plugin shared object + ''; + }; + + outputs = mkOption { + type = + with types; + nullOr ( + listOf ( + attrsOf (submodule { + freeformType = yaml.type; + options = { + enabled = mkEnableOption ""; + }; + }) + ) + ); + default = null; + example = literalExpression '' + [ + { + fast = { + enabled = "yes"; + filename = "fast.log"; + append = "yes"; + }; + } + { + eve-log = { + enabled = "yes"; + filetype = "regular"; + filename = "eve.json"; + community-id = true; + types = [ + { + alert.tagged-packets = "yes"; + } + ]; + }; + } + ]; + ''; + description = '' + Configure the type of alert (and other) logging you would like. + + Valid values for are e. g. `fast`, `eve-log`, `syslog`, `file-store`, ... + - `fast`: a line based alerts log similar to Snort's fast.log + - `eve-log`: Extensible Event Format (nicknamed EVE) event log in JSON format + + For more details regarding the configuration, checkout the shipped suricata.yaml + ```shell + nix-shell -p suricata yq coreutils-full --command 'yq < $(dirname $(which suricata))/../etc/suricata/suricata.yaml' + ``` + and the [suricata documentation](https://docs.suricata.io/en/latest/output/index.html). + ''; + }; + + "default-log-dir" = mkOption { + type = types.str; + default = "/var/log/suricata"; + description = '' + The default logging directory. Any log or output file will be placed here if it's + not specified with a full path name. This can be overridden with the -l command + line parameter. + ''; + }; + + logging = { + "default-log-level" = mkOption { + type = types.enum [ + "error" + "warning" + "notice" + "info" + "perf" + "config" + "debug" + ]; + default = "notice"; + description = '' + The default log level: can be overridden in an output section. + Note that debug level logging will only be emitted if Suricata was + compiled with the --enable-debug configure option. + ''; + }; + + "default-log-format" = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The default output format. Optional parameter, should default to + something reasonable if not provided. Can be overridden in an + output section. You can leave this out to get the default. + ''; + }; + + "default-output-filter" = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + A regex to filter output. Can be overridden in an output section. + Defaults to empty (no filter). + ''; + }; + + "stacktrace-on-signal" = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Requires libunwind to be available when Suricata is configured and built. + If a signal unexpectedly terminates Suricata, displays a brief diagnostic + message with the offending stacktrace if enabled. + ''; + }; + + outputs = { + console = { + enable = mkDisableOption "logging to console"; + }; + file = { + enable = mkDisableOption "logging to file"; + + level = mkOption { + type = types.enum [ + "error" + "warning" + "notice" + "info" + "perf" + "config" + "debug" + ]; + default = "info"; + description = '' + Loglevel for logs written to the logfile + ''; + }; + + filename = mkOption { + type = types.str; + default = "suricata.log"; + description = '' + Filename of the logfile + ''; + }; + + format = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Logformat for logs written to the logfile + ''; + }; + + type = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Type of logfile + ''; + }; + }; + syslog = { + enable = mkEnableOption "logging to syslog"; + + facility = mkOption { + type = types.str; + default = "local5"; + description = '' + Facility to log to + ''; + }; + + format = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Logformat for logs send to syslog + ''; + }; + + type = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Type of logs send to syslog + ''; + }; + }; + }; + }; + + "af-packet" = mkOption { + type = + with types; + nullOr ( + listOf (submodule { + freeformType = yaml.type; + options = { + interface = mkOption { + type = types.str; + default = null; + }; + }; + }) + ); + default = null; + description = '' + Linux high speed capture support + ''; + }; + + "af-xdp" = mkOption { + type = + with types; + nullOr ( + listOf (submodule { + freeformType = yaml.type; + options = { + interface = mkOption { + type = types.str; + default = null; + }; + }; + }) + ); + default = null; + description = '' + Linux high speed af-xdp capture support, see + [docs/capture-hardware/af-xdp](https://docs.suricata.io/en/suricata-7.0.3/capture-hardware/af-xdp.html) + ''; + }; + + "dpdk" = mkOption { + type = + with types; + nullOr (submodule { + options = { + eal-params.proc-type = mkOption { + type = with types; nullOr str; + default = null; + }; + interfaces = mkOption { + type = + with types; + nullOr ( + listOf (submodule { + freeformType = yaml.type; + options = { + interface = mkOption { + type = types.str; + default = null; + }; + }; + }) + ); + default = null; + }; + }; + }); + default = null; + description = '' + DPDK capture support, see + [docs/capture-hardware/dpdk](https://docs.suricata.io/en/suricata-7.0.3/capture-hardware/dpdk.html) + ''; + }; + + "pcap" = mkOption { + type = + with types; + nullOr ( + listOf (submodule { + freeformType = yaml.type; + options = { + interface = mkOption { + type = types.str; + default = null; + }; + }; + }) + ); + default = null; + description = '' + Cross platform libpcap capture support + ''; + }; + + "pcap-file".checksum-checks = mkOption { + type = types.enum [ + "yes" + "no" + "auto" + ]; + default = "auto"; + description = '' + Possible values are: + - yes: checksum validation is forced + - no: checksum validation is disabled + - auto: Suricata uses a statistical approach to detect when + checksum off-loading is used. (default) + Warning: 'checksum-validation' must be set to yes to have checksum tested + ''; + }; + + "app-layer" = mkOption { + type = + with types; + nullOr (submodule { + options = { + "error-policy" = mkOption { + type = types.enum [ + "drop-flow" + "pass-flow" + "bypass" + "drop-packet" + "pass-packet" + "reject" + "ignore" + ]; + default = "ignore"; + description = '' + The error-policy setting applies to all app-layer parsers. Values can be + "drop-flow", "pass-flow", "bypass", "drop-packet", "pass-packet", "reject" or + "ignore" (the default). + ''; + }; + protocols = mkOption { + type = + with types; + nullOr ( + attrsOf (submodule { + freeformType = yaml.type; + options = { + enabled = mkOption { + type = types.enum [ + "yes" + "no" + "detection-only" + ]; + default = "no"; + description = '' + The option "enabled" takes 3 values - "yes", "no", "detection-only". + "yes" enables both detection and the parser, "no" disables both, and + "detection-only" enables protocol detection only (parser disabled). + ''; + }; + }; + }) + ); + default = null; + }; + }; + }); + default = null; # do not add to config unless specified + }; + + "run-as" = { + user = mkOption { + type = types.str; + default = "suricata"; + description = "Run Suricata with a specific user-id"; + }; + group = mkOption { + type = types.str; + default = "suricata"; + description = "Run Suricata with a specific group-id"; + }; + }; + + "host-mode" = mkOption { + type = types.enum [ + "router" + "sniffer-only" + "auto" + ]; + default = "auto"; + description = '' + If the Suricata box is a router for the sniffed networks, set it to 'router'. If + it is a pure sniffing setup, set it to 'sniffer-only'. If set to auto, the variable + is internally switched to 'router' in IPS mode and 'sniffer-only' in IDS mode. + This feature is currently only used by the reject* keywords. + ''; + }; + + "unix-command" = mkOption { + type = + with types; + nullOr (submodule { + options = { + enabled = mkOption { + type = types.either types.bool (types.enum [ "auto" ]); + default = "auto"; + }; + filename = mkOption { + type = types.path; + default = "/run/suricata/suricata-command.socket"; + }; + }; + }); + default = { }; + description = '' + Unix command socket that can be used to pass commands to Suricata. + An external tool can then connect to get information from Suricata + or trigger some modifications of the engine. Set enabled to yes + to activate the feature. In auto mode, the feature will only be + activated in live capture mode. You can use the filename variable to set + the file name of the socket. + ''; + }; + + "exception-policy" = mkOption { + type = types.enum [ + "auto" + "drop-packet" + "drop-flow" + "reject" + "bypass" + "pass-packet" + "pass-flow" + "ignore" + ]; + default = "auto"; + description = '' + Define a common behavior for all exception policies. + In IPS mode, the default is drop-flow. For cases when that's not possible, the + engine will fall to drop-packet. To fallback to old behavior (setting each of + them individually, or ignoring all), set this to ignore. + All values available for exception policies can be used, and there is one + extra option: auto - which means drop-flow or drop-packet (as explained above) + in IPS mode, and ignore in IDS mode. Exception policy values are: drop-packet, + drop-flow, reject, bypass, pass-packet, pass-flow, ignore (disable). + ''; + }; + + "default-rule-path" = mkOption { + type = types.path; + default = "/var/lib/suricata/rules"; + description = "Path in which suricata-update managed rules are stored by default"; + }; + + "rule-files" = mkOption { + type = types.listOf types.str; + default = [ "suricata.rules" ]; + description = "Files to load suricata-update managed rules, relative to 'default-rule-path'"; + }; + + "classification-file" = mkOption { + type = types.str; + default = "/var/lib/suricata/rules/classification.config"; + description = "Suricata classification configuration file"; + }; + + "reference-config-file" = mkOption { + type = types.str; + default = "${cfg.package}/etc/suricata/reference.config"; + description = "Suricata reference configuration file"; + }; + + "threshold-file" = mkOption { + type = types.str; + default = "${cfg.package}/etc/suricata/threshold.config"; + description = "Suricata threshold configuration file"; + }; + + includes = mkOption { + type = with types; nullOr (listOf path); + default = null; + description = '' + Files to include in the suricata configuration. See + [docs/configuration/suricata-yaml](https://docs.suricata.io/en/suricata-7.0.3/configuration/suricata-yaml.html) + for available options. + ''; + }; + }; +} diff --git a/nixos/modules/services/networking/syncplay.nix b/nixos/modules/services/networking/syncplay.nix index b56754ea3f2e4..22808248abbc4 100644 --- a/nixos/modules/services/networking/syncplay.nix +++ b/nixos/modules/services/networking/syncplay.nix @@ -7,18 +7,41 @@ let cmdArgs = [ "--port" cfg.port ] + ++ optionals (cfg.isolateRooms) [ "--isolate-rooms" ] + ++ optionals (!cfg.ready) [ "--disable-ready" ] + ++ optionals (!cfg.chat) [ "--disable-chat" ] ++ optionals (cfg.salt != null) [ "--salt" cfg.salt ] + ++ optionals (cfg.motdFile != null) [ "--motd-file" cfg.motdFile ] + ++ optionals (cfg.roomsDBFile != null) [ "--rooms-db-file" cfg.roomsDBFile ] + ++ optionals (cfg.permanentRoomsFile != null) [ "--permanent-rooms-file" cfg.permanentRoomsFile ] + ++ [ "--max-chat-message-length" cfg.maxChatMessageLength ] + ++ [ "--max-username-length" cfg.maxUsernameLength ] + ++ optionals (cfg.statsDBFile != null) [ "--stats-db-file" cfg.statsDBFile ] ++ optionals (cfg.certDir != null) [ "--tls" cfg.certDir ] + ++ optionals cfg.ipv4Only [ "--ipv4-only" ] + ++ optionals cfg.ipv6Only [ "--ipv6-only" ] + ++ optionals (cfg.interfaceIpv4 != "") [ "--interface-ipv4" cfg.interfaceIpv4 ] + ++ optionals (cfg.interfaceIpv6 != "") [ "--interface-ipv6" cfg.interfaceIpv6 ] ++ cfg.extraArgs; + useACMEHostDir = optionalString (cfg.useACMEHost != null) config.security.acme.certs.${cfg.useACMEHost}.directory; in { + imports = [ + (mkRemovedOptionModule [ "services" "syncplay" "user" ] + "The syncplay service now uses DynamicUser, override the systemd unit settings if you need the old functionality.") + (mkRemovedOptionModule [ "services" "syncplay" "group" ] + "The syncplay service now uses DynamicUser, override the systemd unit settings if you need the old functionality.") + ]; + options = { services.syncplay = { enable = mkOption { type = types.bool; default = false; - description = "If enabled, start the Syncplay server."; + description = '' + If enabled, start the Syncplay server. + ''; }; port = mkOption { @@ -29,6 +52,39 @@ in ''; }; + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to the file that contains the server password. If + `null`, the server doesn't require a password. + ''; + }; + + isolateRooms = mkOption { + type = types.bool; + default = false; + description = '' + Enable room isolation. + ''; + }; + + ready = mkOption { + type = types.bool; + default = true; + description = '' + Check readiness of users. + ''; + }; + + chat = mkOption { + type = types.bool; + default = true; + description = '' + Chat with users in the same room. + ''; + }; + salt = mkOption { type = types.nullOr types.str; default = null; @@ -37,7 +93,7 @@ in instance to still work when the server is restarted. The salt will be readable in the nix store and the processlist. If this is not intended use `saltFile` instead. Mutually exclusive with - . + {option}`services.syncplay.saltFile`. ''; }; @@ -49,7 +105,83 @@ in operator passwords generated by this server instance to still work when the server is restarted. `null`, the server doesn't load the salt from a file. Mutually exclusive with - . + {option}`services.syncplay.salt`. + ''; + }; + + motd = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Text to display when users join. The motd will be readable in the nix store + and the processlist. If this is not intended use `motdFile` instead. + Will be overriden by {option}`services.syncplay.motdFile`. + ''; + }; + + motdFile = mkOption { + type = types.nullOr types.str; + default = if cfg.motd != null then (builtins.toFile "motd" cfg.motd) else null; + defaultText = literalExpression ''if services.syncplay.motd != null then (builtins.toFile "motd" services.syncplay.motd) else null''; + description = '' + Path to text to display when users join. + Will override {option}`services.syncplay.motd`. + ''; + }; + + roomsDBFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "rooms.db"; + description = '' + Path to SQLite database file to store room states. + Relative to the working directory provided by systemd. + ''; + }; + + permanentRooms = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of rooms that will be listed even if the room is empty. + Will be overriden by {option}`services.syncplay.permanentRoomsFile`. + ''; + }; + + permanentRoomsFile = mkOption { + type = types.nullOr types.str; + default = if cfg.permanentRooms != [ ] then (builtins.toFile "perm" (builtins.concatStringsSep "\n" cfg.permanentRooms)) else null; + defaultText = literalExpression ''if services.syncplay.permanentRooms != [ ] then (builtins.toFile "perm" (builtins.concatStringsSep "\n" services.syncplay.permanentRooms)) else null''; + description = '' + File with list of rooms that will be listed even if the room is empty, + newline delimited. + Will override {option}`services.syncplay.permanentRooms`. + ''; + }; + + maxChatMessageLength = mkOption { + type = types.ints.unsigned; + default = 150; + description = '' + Maximum number of characters in a chat message. + ''; + }; + + maxUsernameLength = mkOption { + type = types.ints.unsigned; + default = 16; + description = '' + Maximum number of characters in a username. + ''; + }; + + statsDBFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "stats.db"; + description = '' + Path to SQLite database file to store stats. + Relative to the working directory provided by systemd. ''; }; @@ -62,36 +194,63 @@ in ''; }; - extraArgs = mkOption { - type = types.listOf types.str; - default = [ ]; + useACMEHost = mkOption { + type = types.nullOr types.str; + default = null; + example = "syncplay.example.com"; description = '' - Additional arguments to be passed to the service. + If set, use NixOS-generated ACME certificate with the specified name for TLS. + + Note that it requires {option}`security.acme` to be setup, e.g., credentials provided if using DNS-01 validation. + ''; + }; + + ipv4Only = mkOption { + type = types.bool; + default = false; + description = '' + Listen only on IPv4 when strting the server. ''; }; - user = mkOption { + ipv6Only = mkOption { + type = types.bool; + default = false; + description = '' + Listen only on IPv6 when strting the server. + ''; + }; + + interfaceIpv4 = mkOption { type = types.str; - default = "nobody"; + default = ""; description = '' - User to use when running Syncplay. + The IP address to bind to for IPv4. Leaving it empty defaults to using all. ''; }; - group = mkOption { + interfaceIpv6 = mkOption { type = types.str; - default = "nogroup"; + default = ""; description = '' - Group to use when running Syncplay. + The IP address to bind to for IPv6. Leaving it empty defaults to using all. ''; }; - passwordFile = mkOption { - type = types.nullOr types.path; - default = null; + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; description = '' - Path to the file that contains the server password. If - `null`, the server doesn't require a password. + Additional arguments to be passed to the service. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.syncplay-nogui; + defaultText = literalExpression "pkgs.syncplay-nogui"; + description = '' + Package to use for syncplay. ''; }; }; @@ -103,7 +262,24 @@ in assertion = cfg.salt == null || cfg.saltFile == null; message = "services.syncplay.salt and services.syncplay.saltFile are mutually exclusive."; } + { + assertion = cfg.certDir == null || cfg.useACMEHost == null; + message = "services.syncplay.certDir and services.syncplay.useACMEHost are mutually exclusive."; + } + { + assertion = !cfg.ipv4Only || !cfg.ipv6Only; + message = "services.syncplay.ipv4Only and services.syncplay.ipv6Only are mutually exclusive."; + } ]; + + warnings = optional (cfg.interfaceIpv4 != "" && cfg.ipv6Only) "You have specified services.syncplay.interfaceIpv4 but IPv4 is disabled by services.syncplay.ipv6Only." + ++ optional (cfg.interfaceIpv6 != "" && cfg.ipv4Only) "You have specified services.syncplay.interfaceIpv6 but IPv6 is disabled by services.syncplay.ipv4Only."; + + security.acme.certs = mkIf (cfg.useACMEHost != null) { + "${cfg.useACMEHost}".reloadServices = [ "syncplay.service" ]; + }; + + networking.firewall.allowedTCPPorts = [ cfg.port ]; systemd.services.syncplay = { description = "Syncplay Service"; wantedBy = [ "multi-user.target" ]; @@ -111,20 +287,26 @@ in after = [ "network-online.target" ]; serviceConfig = { - User = cfg.user; - Group = cfg.group; - LoadCredential = lib.optional (cfg.passwordFile != null) "password:${cfg.passwordFile}" - ++ lib.optional (cfg.saltFile != null) "salt:${cfg.saltFile}"; + DynamicUser = true; + StateDirectory = "syncplay"; + WorkingDirectory = "%S/syncplay"; + LoadCredential = optional (cfg.passwordFile != null) "password:${cfg.passwordFile}" + ++ optional (cfg.saltFile != null) "salt:${cfg.saltFile}" + ++ optionals (cfg.useACMEHost != null) [ + "cert.pem:${useACMEHostDir}/cert.pem" + "privkey.pem:${useACMEHostDir}/key.pem" + "chain.pem:${useACMEHostDir}/chain.pem" + ]; }; script = '' - ${lib.optionalString (cfg.passwordFile != null) '' + ${optionalString (cfg.passwordFile != null) '' export SYNCPLAY_PASSWORD=$(cat "''${CREDENTIALS_DIRECTORY}/password") ''} - ${lib.optionalString (cfg.saltFile != null) '' + ${optionalString (cfg.saltFile != null) '' export SYNCPLAY_SALT=$(cat "''${CREDENTIALS_DIRECTORY}/salt") ''} - exec ${pkgs.syncplay-nogui}/bin/syncplay-server ${escapeShellArgs cmdArgs} + exec ${cfg.package}/bin/syncplay-server ${escapeShellArgs cmdArgs} ${optionalString (cfg.useACMEHost != null) "--tls $CREDENTIALS_DIRECTORY"} ''; }; }; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 94ff838b50e04..2d32cf4517062 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -714,10 +714,6 @@ in { ExecStart = updateConfig; }; }; - - syncthing-resume = { - wantedBy = [ "suspend.target" ]; - }; }; }; } diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index a690dc610e825..859da5be81dd8 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -60,6 +60,33 @@ in { ''; }; + authKeyParameters = mkOption { + type = types.submodule { + options = { + ephemeral = mkOption { + type = types.nullOr types.bool; + default = null; + description = "Whether to register as an ephemeral node."; + }; + preauthorized = mkOption { + type = types.nullOr types.bool; + default = null; + description = "Whether to skip manual device approval."; + }; + baseURL = mkOption { + type = types.nullOr types.str; + default = null; + description = "Base URL for the Tailscale API."; + }; + }; + }; + default = { }; + description = '' + Extra parameters to pass after the auth key. + See https://tailscale.com/kb/1215/oauth-clients#registering-new-nodes-using-oauth-credentials + ''; + }; + extraUpFlags = mkOption { description = '' Extra flags to pass to {command}`tailscale up`. Only applied if `authKeyFile` is specified."; @@ -88,8 +115,10 @@ in { environment.systemPackages = [ cfg.package ]; # for the CLI systemd.packages = [ cfg.package ]; systemd.services.tailscaled = { + after = lib.mkIf (config.networking.networkmanager.enable) [ "NetworkManager-wait-online.service" ]; wantedBy = [ "multi-user.target" ]; path = [ + (builtins.dirOf config.security.wrapperDir) # for `su` to use taildrive with correct access rights pkgs.procps # for collecting running services (opt-in feature) pkgs.getent # for `getent` to look up user shells pkgs.kmod # required to pass tailscale's v6nat check @@ -121,10 +150,25 @@ in { serviceConfig = { Type = "oneshot"; }; - script = '' - status=$(${config.systemd.package}/bin/systemctl show -P StatusText tailscaled.service) - if [[ $status != Connected* ]]; then - ${cfg.package}/bin/tailscale up --auth-key 'file:${cfg.authKeyFile}' ${escapeShellArgs cfg.extraUpFlags} + # https://github.com/tailscale/tailscale/blob/v1.72.1/ipn/backend.go#L24-L32 + script = let + statusCommand = "${lib.getExe cfg.package} status --json --peers=false | ${lib.getExe pkgs.jq} -r '.BackendState'"; + paramToString = v: + if (builtins.isBool v) then (lib.boolToString v) + else (toString v); + params = lib.pipe cfg.authKeyParameters [ + (lib.filterAttrs (_: v: v != null)) + (lib.mapAttrsToList (k: v: "${k}=${paramToString v}")) + (builtins.concatStringsSep "&") + (params: if params != "" then "?${params}" else "") + ]; + in '' + while [[ "$(${statusCommand})" == "NoState" ]]; do + sleep 0.5 + done + status=$(${statusCommand}) + if [[ "$status" == "NeedsLogin" || "$status" == "NeedsMachineAuth" ]]; then + ${lib.getExe cfg.package} up --auth-key "$(cat ${cfg.authKeyFile})${params}" ${escapeShellArgs cfg.extraUpFlags} fi ''; }; @@ -137,7 +181,7 @@ in { Type = "oneshot"; }; script = '' - ${cfg.package}/bin/tailscale set ${escapeShellArgs cfg.extraSetFlags} + ${lib.getExe cfg.package} set ${escapeShellArgs cfg.extraSetFlags} ''; }; diff --git a/nixos/modules/services/networking/veilid.nix b/nixos/modules/services/networking/veilid.nix new file mode 100644 index 0000000000000..d471a5f61952f --- /dev/null +++ b/nixos/modules/services/networking/veilid.nix @@ -0,0 +1,227 @@ +{ + config, + pkgs, + lib, + ... +}: +with lib; +let + cfg = config.services.veilid; + dataDir = "/var/db/veilid-server"; + + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "veilid-server.conf" cfg.settings; +in +{ + config = mkIf cfg.enable { + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 5150 ]; + allowedUDPPorts = [ 5150 ]; + }; + + # Based on https://gitlab.com/veilid/veilid/-/blob/main/package/systemd/veilid-server.service?ref_type=heads + systemd.services.veilid = { + enable = true; + description = "Veilid Headless Node"; + wants = [ "network-online.target" ]; + before = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ configFile ]; + environment = { + RUST_BACKTRACE = "1"; + }; + serviceConfig = { + ExecStart = "${pkgs.veilid}/bin/veilid-server -c ${configFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -s HUP $MAINPID"; + KillSignal = "SIGQUIT"; + TimeoutStopSec = 5; + WorkingDirectory = "/"; + User = "veilid"; + Group = "veilid"; + UMask = "0002"; + + CapabilityBoundingSet = ""; + SystemCallFilter = [ "@system-service" ]; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectHome = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ReadWritePaths = dataDir; + + RestrictRealtime = true; + SystemCallArchitectures = "native"; + LockPersonality = true; + RestrictSUIDSGID = true; + }; + }; + users.users.veilid = { + isSystemUser = true; + group = "veilid"; + home = dataDir; + createHome = true; + }; + users.groups.veilid = { }; + + environment = { + systemPackages = [ pkgs.veilid ]; + }; + services.veilid.settings = { }; + }; + + options.services.veilid = { + enable = mkEnableOption "Veilid Headless Node"; + openFirewall = mkOption { + default = false; + type = types.bool; + description = "Whether to open firewall on ports 5150/tcp, 5150/udp"; + }; + settings = mkOption { + description = '' + Build veilid-server.conf with nix expression. + Check Configuration Keys. + ''; + type = types.submodule { + freeformType = settingsFormat.type; + + options = { + client_api = { + ipc_enabled = mkOption { + type = types.bool; + default = true; + description = "veilid-server will respond to Python and other JSON client requests."; + }; + ipc_directory = mkOption { + type = types.str; + default = "${dataDir}/ipc"; + description = "IPC directory where file sockets are stored."; + }; + }; + logging = { + system = { + enabled = mkOption { + type = types.bool; + default = true; + description = "Events of type 'system' will be logged."; + }; + level = mkOption { + type = types.str; + default = "info"; + example = "debug"; + description = "The minimum priority of system events to be logged."; + }; + }; + terminal = { + enabled = mkOption { + type = types.bool; + default = false; + description = "Events of type 'terminal' will be logged."; + }; + level = mkOption { + type = types.str; + default = "info"; + example = "debug"; + description = "The minimum priority of terminal events to be logged."; + }; + }; + api = { + enabled = mkOption { + type = types.bool; + default = false; + description = "Events of type 'api' will be logged."; + }; + level = mkOption { + type = types.str; + default = "info"; + example = "debug"; + description = "The minimum priority of api events to be logged."; + }; + }; + }; + core = { + capabilities = { + disable = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "APPM" ]; + description = "A list of capabilities to disable (for example, DHTV to say you cannot store DHT information)."; + }; + }; + protected_store = { + allow_insecure_fallback = mkOption { + type = types.bool; + default = true; + description = "If we can't use system-provided secure storage, should we proceed anyway?"; + }; + always_use_insecure_storage = mkOption { + type = types.bool; + default = true; + description = "Should we bypass any attempt to use system-provided secure storage?"; + }; + directory = mkOption { + type = types.str; + default = "${dataDir}/protected_store"; + description = "The filesystem directory to store your protected store in."; + }; + }; + table_store = { + directory = mkOption { + type = types.str; + default = "${dataDir}/table_store"; + description = "The filesystem directory to store your table store within."; + }; + }; + block_store = { + directory = mkOption { + type = types.nullOr types.str; + default = "${dataDir}/block_store"; + description = "The filesystem directory to store blocks for the block store."; + }; + }; + network = { + routing_table = { + bootstrap = mkOption { + type = types.listOf types.str; + default = [ "bootstrap.veilid.net" ]; + description = "Host name of existing well-known Veilid bootstrap servers for the network to connect to."; + }; + node_id = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = "Base64-encoded public key for the node, used as the node's ID."; + }; + }; + dht = { + min_peer_count = mkOption { + type = types.number; + default = 20; + description = "Minimum number of nodes to keep in the peer table."; + }; + }; + upnp = mkOption { + type = types.bool; + default = true; + description = "Should the app try to improve its incoming network connectivity using UPnP?"; + }; + detect_address_changes = mkOption { + type = types.bool; + default = true; + description = "Should veilid-core detect and notify on network address changes?"; + }; + }; + }; + }; + }; + }; + }; + + meta.maintainers = with maintainers; [ figboy9 ]; +} diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index b068f22273102..4fec023a23684 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -45,6 +45,8 @@ let "update_config=1" ]) ++ [ "pmf=1" ] + ++ optional (cfg.secretsFile != null) + "ext_password_backend=file:${cfg.secretsFile}" ++ optional cfg.scanOnLowSignal ''bgscan="simple:30:-70:3600"'' ++ optional (cfg.extraConfig != "") cfg.extraConfig); @@ -56,8 +58,6 @@ let if configIsGenerated then pkgs.writeText "wpa_supplicant.conf" generatedConfig else "/etc/wpa_supplicant.conf"; - # the config file with environment variables replaced - finalConfig = ''"$RUNTIME_DIRECTORY"/wpa_supplicant.conf''; # Creates a network block for wpa_supplicant.conf mkNetwork = opts: @@ -90,8 +90,8 @@ let let deviceUnit = optional (iface != null) "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device"; configStr = if cfg.allowAuxiliaryImperativeNetworks - then "-c /etc/wpa_supplicant.conf -I ${finalConfig}" - else "-c ${finalConfig}"; + then "-c /etc/wpa_supplicant.conf -I ${configFile}" + else "-c ${configFile}"; in { description = "WPA Supplicant instance" + optionalString (iface != null) " for interface ${iface}"; @@ -109,8 +109,6 @@ let serviceConfig.UMask = "066"; serviceConfig.RuntimeDirectory = "wpa_supplicant"; serviceConfig.RuntimeDirectoryMode = "700"; - serviceConfig.EnvironmentFile = mkIf (cfg.environmentFile != null) - (builtins.toString cfg.environmentFile); script = '' @@ -125,21 +123,6 @@ let touch /etc/wpa_supplicant.conf ''} - # substitute environment variables - if [ -f "${configFile}" ]; then - ${pkgs.gawk}/bin/awk '{ - for(varname in ENVIRON) { - find = "@"varname"@" - repl = ENVIRON[varname] - if (i = index($0, find)) - $0 = substr($0, 1, i-1) repl substr($0, i+length(find)) - } - print - }' "${configFile}" > ${finalConfig} - else - touch ${finalConfig} - fi - iface_args="-s ${optionalString cfg.dbusControlled "-u"} -D${cfg.driver} ${configStr}" ${if iface == null then '' @@ -231,36 +214,34 @@ in { ''; }; - environmentFile = mkOption { + secretsFile = mkOption { type = types.nullOr types.path; default = null; - example = "/run/secrets/wireless.env"; + example = "/run/secrets/wireless.conf"; description = '' File consisting of lines of the form `varname=value` to define variables for the wireless configuration. - See section "EnvironmentFile=" in {manpage}`systemd.exec(5)` for a syntax reference. - Secrets (PSKs, passwords, etc.) can be provided without adding them to - the world-readable Nix store by defining them in the environment file and - referring to them in option {option}`networking.wireless.networks` - with the syntax `@varname@`. Example: + the world-readable Nix store by defining them in the secrets file and + referring to them in option [](#opt-networking.wireless.networks) + with the syntax `ext:secretname`. Example: ``` - # content of /run/secrets/wireless.env - PSK_HOME=mypassword - PASS_WORK=myworkpassword - ``` + # content of /run/secrets/wireless.conf + psk_home=mypassword + psk_other=6a381cea59c7a2d6b30736ba0e6f397f7564a044bcdb7a327a1d16a1ed91b327 + pass_work=myworkpassword - ``` # wireless-related configuration - networking.wireless.environmentFile = "/run/secrets/wireless.env"; + networking.wireless.secretsFile = "/run/secrets/wireless.conf"; networking.wireless.networks = { - home.psk = "@PSK_HOME@"; + home.pskRaw = "ext:psk_home"; + other.pskRaw = "ext:psk_other"; work.auth = ''' eap=PEAP identity="my-user@example.com" - password="@PASS_WORK@" + password=ext:pass_work '''; }; ``` @@ -271,15 +252,16 @@ in { type = types.attrsOf (types.submodule { options = { psk = mkOption { - type = types.nullOr types.str; + type = types.nullOr (types.strMatching "[[:print:]]{8,63}"); default = null; description = '' The network's pre-shared key in plaintext defaulting to being a network without any authentication. ::: {.warning} - Be aware that this will be written to the nix store - in plaintext! Use an environment variable instead. + Be aware that this will be written to the Nix store + in plaintext! Use {var}`pskRaw` with an external + reference to keep it safe. ::: ::: {.note} @@ -289,19 +271,28 @@ in { }; pskRaw = mkOption { - type = types.nullOr types.str; + type = types.nullOr + (types.strMatching "([[:xdigit:]]{64})|(ext:[^=]+)"); default = null; + example = "ext:name_of_the_secret_here"; description = '' - The network's pre-shared key in hex defaulting - to being a network without any authentication. + Either the raw pre-shared key in hexadecimal format + or the name of the secret (as defined inside + [](#opt-networking.wireless.secretsFile) and prefixed + with `ext:`) containing the network pre-shared key. ::: {.warning} - Be aware that this will be written to the nix store - in plaintext! Use an environment variable instead. + Be aware that this will be written to the Nix store + in plaintext! Always use an external reference. ::: ::: {.note} - Mutually exclusive with {var}`psk`. + The external secret can be either the plaintext + passphrase or the raw pre-shared key. + ::: + + ::: {.note} + Mutually exclusive with {var}`psk` and {var}`auth`. ::: ''; }; @@ -354,22 +345,21 @@ in { example = '' eap=PEAP identity="user@example.com" - password="@EXAMPLE_PASSWORD@" + password=ext:example_password ''; description = '' - Use this option to configure advanced authentication methods like EAP. - See - {manpage}`wpa_supplicant.conf(5)` - for example configurations. + Use this option to configure advanced authentication methods + like EAP. See {manpage}`wpa_supplicant.conf(5)` for example + configurations. ::: {.warning} - Be aware that this will be written to the nix store - in plaintext! Use an environment variable for secrets. + Be aware that this will be written to the Nix store + in plaintext! Use an external reference like + `ext:secretname` for secrets. ::: ::: {.note} - Mutually exclusive with {var}`psk` and - {var}`pskRaw`. + Mutually exclusive with {var}`psk` and {var}`pskRaw`. ::: ''; }; @@ -393,13 +383,14 @@ in { type = types.nullOr types.int; default = null; description = '' - By default, all networks will get same priority group (0). If some of the - networks are more desirable, this field can be used to change the order in - which wpa_supplicant goes through the networks when selecting a BSS. The - priority groups will be iterated in decreasing priority (i.e., the larger the - priority value, the sooner the network is matched against the scan results). - Within each priority group, networks will be selected based on security - policy, signal strength, etc. + By default, all networks will get same priority group (0). If + some of the networks are more desirable, this field can be used + to change the order in which wpa_supplicant goes through the + networks when selecting a BSS. The priority groups will be + iterated in decreasing priority (i.e., the larger the priority + value, the sooner the network is matched against the scan + results). Within each priority group, networks will be selected + based on security policy, signal strength, etc. ''; }; @@ -411,9 +402,7 @@ in { ''; description = '' Extra configuration lines appended to the network block. - See - {manpage}`wpa_supplicant.conf(5)` - for available options. + See {manpage}`wpa_supplicant.conf(5)` for available options. ''; }; @@ -432,7 +421,7 @@ in { }; echelon = { # safe version of the above: read PSK from the - psk = "@PSK_ECHELON@"; # variable PSK_ECHELON, defined in environmentFile, + pskRaw = "ext:psk_echelon"; # variable psk_echelon, defined in secretsFile, }; # this won't leak into /nix/store "echelon's AP" = { # SSID with spaces and/or special characters @@ -493,6 +482,31 @@ in { }; }; + imports = [ + (mkRemovedOptionModule [ "networking" "wireless" "environmentFile" ] + '' + Secrets are now handled by the `networking.wireless.secretsFile` and + `networking.wireless.networks..pskRaw` options. + The change is motivated by a mechanism recently added by wpa_supplicant + itself to separate secrets from configuration, making the previous + method obsolete. + + The syntax of the `secretsFile` is the same as before, except the + values are interpreted literally, unlike environment variables. + To update, remove quotes or character escapes, if necessary, and + apply the following changes to your configuration: + { + home.psk = "@psk_home@"; → home.pskRaw = "ext:psk_home"; + other.pskRaw = "@psk_other@"; → other.pskRaw = "ext:psk_other"; + work.auth = ''' + eap=PEAP + identity="my-user@example.com" + password=@pass_work@ → password=ext:pass_work + '''; + } + '') + ]; + config = mkIf cfg.enable { assertions = flip mapAttrsToList cfg.networks (name: cfg: { assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1; diff --git a/nixos/modules/services/networking/wstunnel.nix b/nixos/modules/services/networking/wstunnel.nix index 941e3e7366de3..bf56858a190fc 100644 --- a/nixos/modules/services/networking/wstunnel.nix +++ b/nixos/modules/services/networking/wstunnel.nix @@ -48,6 +48,13 @@ let }; }; + # The original argument name `websocketPingFrequency` is a misnomer, as the frequency is the inverse of the interval. + websocketPingInterval = lib.mkOption { + description = "Frequency at which the client will send websocket ping to the server."; + type = lib.types.nullOr lib.types.ints.unsigned; + default = null; + }; + loggingLevel = lib.mkOption { description = '' Passed to --log-lvl @@ -232,13 +239,6 @@ let default = true; }; - # The original argument name `websocketPingFrequency` is a misnomer, as the frequency is the inverse of the interval. - websocketPingInterval = lib.mkOption { - description = "Frequency at which the client will send websocket ping to the server."; - type = lib.types.nullOr lib.types.ints.unsigned; - default = null; - }; - upgradeCredentials = lib.mkOption { description = '' Use these credentials to authenticate during the HTTP upgrade request @@ -318,9 +318,21 @@ let lib.cli.toGNUCommandLineShell { } ( lib.recursiveUpdate { restrict-to = map hostPortToString restrictTo; + websocket-ping-frequency-sec = websocketPingInterval; tls-certificate = - if useACMEHost != null then "${certConfig.directory}/fullchain.pem" else "${tlsCertificate}"; - tls-private-key = if useACMEHost != null then "${certConfig.directory}/key.pem" else "${tlsKey}"; + if !enableHTTPS then + null + else if useACMEHost != null then + "${certConfig.directory}/fullchain.pem" + else + "${tlsCertificate}"; + tls-private-key = + if !enableHTTPS then + null + else if useACMEHost != null then + "${certConfig.directory}/key.pem" + else + "${tlsKey}"; } extraArgs ) } \ @@ -474,6 +486,7 @@ in meta.maintainers = with lib.maintainers; [ alyaeanyx + raylas rvdp neverbehave ]; diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index c1c952adac390..0fb51400d666b 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -1,6 +1,8 @@ { config, lib, pkgs, ... }: -with lib; + let + inherit (lib) mkIf mkOption; + inherit (lib.types) nullOr path bool listOf str; keysPath = "/var/lib/yggdrasil/keys.json"; cfg = config.services.yggdrasil; @@ -11,14 +13,14 @@ let in { imports = [ - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "yggdrasil" "config" ] [ "services" "yggdrasil" "settings" ]) ]; - options = with types; { + options = { services.yggdrasil = { - enable = mkEnableOption "the yggdrasil system service"; + enable = lib.mkEnableOption "the yggdrasil system service"; settings = mkOption { type = format.type; @@ -73,7 +75,7 @@ in }; group = mkOption { - type = types.nullOr types.str; + type = nullOr str; default = null; example = "wheel"; description = "Group to grant access to the Yggdrasil control socket. If `null`, only root can access the socket."; @@ -108,9 +110,9 @@ in ''; }; - package = mkPackageOption pkgs "yggdrasil" { }; + package = lib.mkPackageOption pkgs "yggdrasil" { }; - persistentKeys = mkEnableOption '' + persistentKeys = lib.mkEnableOption '' persistent keys. If enabled then keys will be generated once and Yggdrasil will retain the same IPv6 address when the service is restarted. Keys are stored at ${keysPath} @@ -232,6 +234,6 @@ in ); meta = { doc = ./yggdrasil.md; - maintainers = with lib.maintainers; [ gazally ehmry ]; + maintainers = with lib.maintainers; [ gazally ehmry nagy ]; }; } diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 668bccab2e2d2..ef80ffe0ad41f 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -9,7 +9,6 @@ let cfg = config.services.printing; cups = cfg.package; - avahiEnabled = config.services.avahi.enable; polkitEnabled = config.security.polkit.enable; additionalBackends = pkgs.runCommand "additional-cups-backends" { @@ -99,7 +98,7 @@ let cupsdFile (writeConf "client.conf" cfg.clientConf) (writeConf "snmp.conf" cfg.snmpConf) - ] ++ optional avahiEnabled browsedFile + ] ++ optional cfg.browsed.enable browsedFile ++ cfg.drivers; pathsToLink = [ "/etc/cups" ]; ignoreCollisions = true; @@ -270,6 +269,15 @@ in ''; }; + browsed.enable = mkOption { + type = types.bool; + default = config.services.avahi.enable; + defaultText = literalExpression "config.services.avahi.enable"; + description = '' + Whether to enable the CUPS Remote Printer Discovery (browsed) daemon. + ''; + }; + browsedConf = mkOption { type = types.lines; default = ""; @@ -339,7 +347,7 @@ in services.dbus.packages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper; services.udev.packages = cfg.drivers; - # Allow asswordless printer admin for members of wheel group + # Allow passwordless printer admin for members of wheel group security.polkit.extraConfig = mkIf polkitEnabled '' polkit.addRule(function(action, subject) { if (action.id == "org.opensuse.cupspkhelper.mechanism.all-edit" && @@ -419,7 +427,7 @@ in serviceConfig.PrivateTmp = true; }; - systemd.services.cups-browsed = mkIf avahiEnabled + systemd.services.cups-browsed = mkIf cfg.browsed.enable { description = "CUPS Remote Printer Discovery"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix index f73c1ce41e5b9..1cc137341e113 100644 --- a/nixos/modules/services/security/authelia.nix +++ b/nixos/modules/services/security/authelia.nix @@ -165,10 +165,10 @@ let log = { level = mkOption { - type = types.enum [ "info" "debug" "trace" ]; + type = types.enum [ "trace" "debug" "info" "warn" "error" ]; default = "debug"; example = "info"; - description = "Level of verbosity for logs: info, debug, trace."; + description = "Level of verbosity for logs."; }; format = mkOption { diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 90b69df2d4a3d..2b0929599723a 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -165,7 +165,7 @@ in environment.etc."clamav/clamd.conf".source = clamdConfigFile; systemd.slices.system-clamav = { - description = "ClamAV slice"; + description = "ClamAV Antivirus Slice"; }; systemd.services.clamav-daemon = mkIf cfg.daemon.enable { diff --git a/nixos/modules/services/security/endlessh-go.nix b/nixos/modules/services/security/endlessh-go.nix index 480bfc8cb9ef0..9f9225994c7ff 100644 --- a/nixos/modules/services/security/endlessh-go.nix +++ b/nixos/modules/services/security/endlessh-go.nix @@ -9,6 +9,8 @@ in options.services.endlessh-go = { enable = mkEnableOption "endlessh-go service"; + package = mkPackageOption pkgs "endlessh-go" { }; + listenAddress = mkOption { type = types.str; default = "0.0.0.0"; @@ -86,7 +88,7 @@ in { Restart = "always"; ExecStart = with cfg; concatStringsSep " " ([ - "${pkgs.endlessh-go}/bin/endlessh-go" + (lib.getExe cfg.package) "-logtostderr" "-host=${listenAddress}" "-port=${toString port}" @@ -131,7 +133,7 @@ in }; networking.firewall.allowedTCPPorts = with cfg; - optionals openFirewall [ port prometheus.port ]; + optionals openFirewall [ port ]; }; meta.maintainers = with maintainers; [ azahi ]; diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix index 3d44bdac34bf6..adadce4f88d6d 100644 --- a/nixos/modules/services/system/nix-daemon.nix +++ b/nixos/modules/services/system/nix-daemon.nix @@ -198,6 +198,7 @@ in IOSchedulingClass = cfg.daemonIOSchedClass; IOSchedulingPriority = cfg.daemonIOSchedPriority; LimitNOFILE = 1048576; + Delegate = "yes"; }; restartTriggers = [ config.environment.etc."nix/nix.conf".source ]; diff --git a/nixos/modules/services/system/userborn.nix b/nixos/modules/services/system/userborn.nix index d73bd2646c80e..07e8be34266ea 100644 --- a/nixos/modules/services/system/userborn.nix +++ b/nixos/modules/services/system/userborn.nix @@ -97,14 +97,14 @@ in # home. tmpfiles.settings.home-directories = lib.mapAttrs' ( username: opts: - lib.nameValuePair opts.home { + lib.nameValuePair (toString opts.home) { d = { mode = opts.homeMode; user = username; inherit (opts) group; }; } - ) (lib.filterAttrs (_username: opts: opts.home != "/var/empty") userCfg.users); + ) (lib.filterAttrs (_username: opts: opts.createHome && opts.home != "/var/empty") userCfg.users); services.userborn = { wantedBy = [ "sysinit.target" ]; diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index 5c259b7fa14d0..b3f38eba66429 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -518,7 +518,7 @@ in libva-utils procps radeontop - ] ++ lib.optionals (!stdenv.isAarch64) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isAarch64) [ # not available on aarch64-linux intel-gpu-tools ]; diff --git a/nixos/modules/services/web-servers/bluemap.nix b/nixos/modules/services/web-apps/bluemap.nix similarity index 88% rename from nixos/modules/services/web-servers/bluemap.nix rename to nixos/modules/services/web-apps/bluemap.nix index 731468fd9a0ec..0b45501980e6c 100644 --- a/nixos/modules/services/web-servers/bluemap.nix +++ b/nixos/modules/services/web-apps/bluemap.nix @@ -13,6 +13,9 @@ let (format.generate "${name}.conf" value)) cfg.maps); + addonsFolder = pkgs.linkFarm "addons" + (lib.attrsets.mapAttrs' (name: value: lib.nameValuePair "${name}.jar" value) cfg.addons); + storageFolder = pkgs.linkFarm "storage" (lib.attrsets.mapAttrs' (name: value: lib.nameValuePair "${name}.conf" @@ -25,11 +28,16 @@ let "core.conf" = coreConfig; "webapp.conf" = webappConfig; "webserver.conf" = webserverConfig; - "resourcepacks" = pkgs.linkFarm "resourcepacks" cfg.resourcepacks; + "packs" = pkgs.linkFarm "packs" cfg.resourcepacks; + "addons" = addonsFolder; }; inherit (lib) mkOption; in { + imports = [ + (lib.mkRenamedOptionModule [ "services" "bluemap" "resourcepacks" ] [ "services" "bluemap" "packs" ]) + ]; + options.services.bluemap = { enable = lib.mkEnableOption "bluemap"; @@ -219,6 +227,26 @@ in { ''; }; + addons = mkOption { + type = lib.types.attrsOf lib.types.pathInStore; + default = { }; + description = '' + A set of jar addons to be loaded. + + See for a list of officially recognized addons. + ''; + + example = lib.literalExpression '' + { + blueBridge = ./blueBridge.jar; + blueBorder = pkgs.fetchurl { + url = "https://github.com/pop4959/BlueBorder/releases/download/1.1.1/BlueBorder-1.1.1.jar"; + hash = "..."; + }; + } + ''; + }; + storage = mkOption { type = lib.types.attrsOf (lib.types.submodule { freeformType = format.type; @@ -249,10 +277,13 @@ in { ''; }; - resourcepacks = mkOption { + packs = mkOption { type = lib.types.attrsOf lib.types.pathInStore; default = { }; - description = "A set of resourcepacks to use, loaded in alphabetical order"; + description = '' + A set of resourcepacks, datapacks, and mods to extract resources from, + loaded in alphabetical order. + ''; }; }; @@ -293,11 +324,12 @@ in { "${cfg.host}" = { root = config.services.bluemap.webRoot; locations = { - "~* ^/maps/[^/]*/tiles/[^/]*.json$".extraConfig = '' - error_page 404 =200 /assets/emptyTile.json; + "@empty".return = "204"; + + "~* ^/maps/[^/]*/tiles/".extraConfig = '' + error_page 404 = @empty; gzip_static always; ''; - "~* ^/maps/[^/]*/tiles/[^/]*.png$".tryFiles = "$uri =204"; }; }; }; diff --git a/nixos/modules/services/web-apps/collabora-online.nix b/nixos/modules/services/web-apps/collabora-online.nix new file mode 100644 index 0000000000000..122674b67110c --- /dev/null +++ b/nixos/modules/services/web-apps/collabora-online.nix @@ -0,0 +1,200 @@ +{ + config, + lib, + pkgs, + utils, + ... +}: + +let + cfg = config.services.collabora-online; + + freeformType = lib.types.attrsOf ((pkgs.formats.json { }).type) // { + description = '' + `coolwsd.xml` configuration type, used to override values in the default configuration. + + Attribute names correspond to XML tags unless prefixed with `@`. Nested attribute sets + correspond to nested XML tags. Attribute prefixed with `@` correspond to XML attributes. E.g., + `{ storage.wopi."@allow" = true; }` in Nix corresponds to + `` in `coolwsd.xml`, or `--o:storage.wopi[@allow]=true` + in the command line. + + Arrays correspond to multiple elements with the same tag name. E.g. + `{ host = [ '''127\.0\.0\.1''' "::1" ]; }` in Nix corresponds to + ```xml + + 127\.0\.0\.1 + ::1 + + ``` + in `coolwsd.xml`, or + `--o:net.post_allow.host[0]='127\.0\.0\.1 --o:net.post_allow.host[1]=::1` in the command line. + + Null values could be used to remove an element from the default configuration. + ''; + }; + + configFile = + pkgs.runCommandLocal "coolwsd.xml" + { + nativeBuildInputs = [ + pkgs.jq + pkgs.yq-go + ]; + userConfig = builtins.toJSON { config = cfg.settings; }; + passAsFile = [ "userConfig" ]; + } + # Merge the cfg.settings into the default coolwsd.xml. + # See https://github.com/CollaboraOnline/online/issues/10049. + '' + yq --input-format=xml \ + --xml-attribute-prefix=@ \ + --output-format=json \ + ${cfg.package}/etc/coolwsd/coolwsd.xml \ + > ./default_coolwsd.json + + jq '.[0] * .[1] | del(..|nulls)' \ + --slurp \ + ./default_coolwsd.json \ + $userConfigPath \ + > ./merged.json + + yq --output-format=xml \ + --xml-attribute-prefix=@ \ + ./merged.json \ + > $out + ''; +in +{ + options.services.collabora-online = { + enable = lib.mkEnableOption "collabora-online"; + + package = lib.mkPackageOption pkgs "Collabora Online" { default = "collabora-online"; }; + + port = lib.mkOption { + type = lib.types.port; + default = 9980; + description = "Listening port"; + }; + + settings = lib.mkOption { + type = freeformType; + default = { }; + description = '' + Configuration for Collabora Online WebSocket Daemon, see + , or + for the default + configuration. + ''; + }; + + aliasGroups = lib.mkOption { + type = lib.types.listOf ( + lib.types.submodule { + options = { + host = lib.mkOption { + type = lib.types.str; + example = "scheme://hostname:port"; + description = "Hostname to allow or deny."; + }; + + aliases = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ + "scheme://aliasname1:port" + "scheme://aliasname2:port" + ]; + description = "A list of regex pattern of aliasname."; + }; + }; + } + ); + default = [ ]; + description = "Alias groups to use."; + }; + + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "Extra arguments to pass to the service."; + }; + }; + + config = lib.mkIf cfg.enable { + services.collabora-online.settings = { + child_root_path = lib.mkDefault "/var/lib/cool/child-roots"; + sys_template_path = lib.mkDefault "/var/lib/cool/systemplate"; + + file_server_root_path = lib.mkDefault "${config.services.collabora-online.package}/share/coolwsd"; + + # Use mount namespaces instead of setcap'd coolmount/coolforkit. + mount_namespaces = lib.mkDefault true; + + # By default, use dummy self-signed certificates provided for testing. + ssl.ca_file_path = lib.mkDefault "${config.services.collabora-online.package}/etc/coolwsd/ca-chain.cert.pem"; + ssl.cert_file_path = lib.mkDefault "${config.services.collabora-online.package}/etc/coolwsd/cert.pem"; + ssl.key_file_path = lib.mkDefault "${config.services.collabora-online.package}/etc/coolwsd/key.pem"; + }; + + users.users.cool = { + isSystemUser = true; + group = "cool"; + }; + users.groups.cool = { }; + + systemd.services.coolwsd-systemplate-setup = { + description = "Collabora Online WebSocket Daemon Setup"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = utils.escapeSystemdExecArgs [ + "${cfg.package}/bin/coolwsd-systemplate-setup" + "/var/lib/cool/systemplate" + "${cfg.package.libreoffice}/lib/collaboraoffice" + ]; + RemainAfterExit = true; + StateDirectory = "cool"; + Type = "oneshot"; + User = "cool"; + }; + }; + + systemd.services.coolwsd = { + description = "Collabora Online WebSocket Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + "coolwsd-systemplate-setup.service" + ]; + + environment = builtins.listToAttrs ( + lib.imap1 (n: ag: { + name = "aliasgroup${toString n}"; + value = lib.concatStringsSep "," ([ ag.host ] ++ ag.aliases); + }) cfg.aliasGroups + ); + + serviceConfig = { + ExecStart = utils.escapeSystemdExecArgs ( + [ + "${cfg.package}/bin/coolwsd" + "--config-file=${configFile}" + "--port=${toString cfg.port}" + "--use-env-vars" + "--version" + ] + ++ cfg.extraArgs + ); + KillMode = "mixed"; + KillSignal = "SIGINT"; + LimitNOFILE = "infinity:infinity"; + Restart = "always"; + StateDirectory = "cool"; + TimeoutStopSec = 120; + User = "cool"; + }; + }; + }; + + meta.maintainers = [ lib.maintainers.xzfc ]; +} diff --git a/nixos/modules/services/web-apps/davis.nix b/nixos/modules/services/web-apps/davis.nix index d9b28020dc2d8..621f2ff20e2bb 100644 --- a/nixos/modules/services/web-apps/davis.nix +++ b/nixos/modules/services/web-apps/davis.nix @@ -493,7 +493,7 @@ in }; "~* ^/.well-known/(caldav|carddav)$" = { extraConfig = '' - return 302 $http_x_forwarded_proto://$host/dav/; + return 302 https://$host/dav/; ''; }; "~ ^(.+\.php)(.*)$" = { @@ -505,7 +505,7 @@ in fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_param X-Forwarded-Proto $http_x_forwarded_proto; + fastcgi_param X-Forwarded-Proto https; fastcgi_param X-Forwarded-Port $http_x_forwarded_port; ''; }; diff --git a/nixos/modules/services/web-apps/dependency-track.nix b/nixos/modules/services/web-apps/dependency-track.nix new file mode 100644 index 0000000000000..ba3dbee972889 --- /dev/null +++ b/nixos/modules/services/web-apps/dependency-track.nix @@ -0,0 +1,608 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.services.dependency-track; + + settingsFormat = pkgs.formats.javaProperties { }; + + frontendConfigFormat = pkgs.formats.json { }; + frontendConfigFile = frontendConfigFormat.generate "config.json" { + API_BASE_URL = cfg.frontend.baseUrl; + OIDC_ISSUER = cfg.oidc.issuer; + OIDC_CLIENT_ID = cfg.oidc.clientId; + OIDC_SCOPE = cfg.oidc.scope; + OIDC_FLOW = cfg.oidc.flow; + OIDC_LOGIN_BUTTON_TEXT = cfg.oidc.loginButtonText; + }; + + sslEnabled = + config.services.nginx.virtualHosts.${cfg.nginx.domain}.addSSL + || config.services.nginx.virtualHosts.${cfg.nginx.domain}.forceSSL + || config.services.nginx.virtualHosts.${cfg.nginx.domain}.onlySSL + || config.services.nginx.virtualHosts.${cfg.nginx.domain}.enableACME; + + assertStringPath = + optionName: value: + if lib.isPath value then + throw '' + services.dependency-track.${optionName}: + ${toString value} + is a Nix path, but should be a string, since Nix + paths are copied into the world-readable Nix store. + '' + else + value; + + filterNull = lib.filterAttrs (_: v: v != null); + + renderSettings = + settings: + lib.mapAttrs' ( + n: v: + lib.nameValuePair (lib.toUpper (lib.replaceStrings [ "." ] [ "_" ] n)) ( + if lib.isBool v then lib.boolToString v else v + ) + ) (filterNull settings); +in +{ + options.services.dependency-track = { + enable = lib.mkEnableOption "dependency-track"; + + package = lib.mkPackageOption pkgs "dependency-track" { }; + + logLevel = lib.mkOption { + type = lib.types.enum [ + "INFO" + "WARN" + "ERROR" + "DEBUG" + "TRACE" + ]; + default = "INFO"; + description = "Log level for dependency-track"; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 8080; + description = '' + On which port dependency-track should listen for new HTTP connections. + ''; + }; + + javaArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ "-Xmx4G" ]; + description = "Java options passed to JVM"; + }; + + database = { + type = lib.mkOption { + type = lib.types.enum [ + "h2" + "postgresql" + "manual" + ]; + default = "postgresql"; + description = '' + `h2` database is not recommended for a production setup. + `postgresql` this settings it recommended for production setups. + `manual` the module doesn't handle database settings. + ''; + }; + + createLocally = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether a database should be automatically created on the + local host. Set this to false if you plan on provisioning a + local database yourself. + ''; + }; + + databaseName = lib.mkOption { + type = lib.types.str; + default = "dependency-track"; + description = '' + Database name to use when connecting to an external or + manually provisioned database; has no effect when a local + database is automatically provisioned. + + To use this with a local database, set {option}`services.dependency-track.database.createLocally` + to `false` and create the database and user. + ''; + }; + + username = lib.mkOption { + type = lib.types.str; + default = "dependency-track"; + description = '' + Username to use when connecting to an external or manually + provisioned database; has no effect when a local database is + automatically provisioned. + + To use this with a local database, set {option}`services.dependency-track.database.createLocally` + to `false` and create the database and user. + ''; + }; + + passwordFile = lib.mkOption { + type = lib.types.path; + example = "/run/keys/db_password"; + apply = assertStringPath "passwordFile"; + description = '' + The path to a file containing the database password. + ''; + }; + }; + + ldap.bindPasswordFile = lib.mkOption { + type = lib.types.path; + example = "/run/keys/ldap_bind_password"; + apply = assertStringPath "bindPasswordFile"; + description = '' + The path to a file containing the LDAP bind password. + ''; + }; + + frontend = { + baseUrl = lib.mkOption { + type = lib.types.str; + default = lib.optionalString cfg.nginx.enable "${ + if sslEnabled then "https" else "http" + }://${cfg.nginx.domain}"; + defaultText = lib.literalExpression '' + lib.optionalString config.services.dependency-track.nginx.enable "''${ + if sslEnabled then "https" else "http" + }://''${config.services.dependency-track.nginx.domain}"; + ''; + description = '' + The base URL of the API server. + + NOTE: + * This URL must be reachable by the browsers of your users. + * The frontend container itself does NOT communicate with the API server directly, it just serves static files. + * When deploying to dedicated servers, please use the external IP or domain of the API server. + ''; + }; + }; + + oidc = { + enable = lib.mkEnableOption "oidc support"; + issuer = lib.mkOption { + type = lib.types.str; + default = ""; + description = '' + Defines the issuer URL to be used for OpenID Connect. + See alpine.oidc.issuer property of the API server. + ''; + }; + clientId = lib.mkOption { + type = lib.types.str; + default = ""; + description = '' + Defines the client ID for OpenID Connect. + ''; + }; + scope = lib.mkOption { + type = lib.types.str; + default = "openid profile email"; + description = '' + Defines the scopes to request for OpenID Connect. + See also: https://openid.net/specs/openid-connect-basic-1_0.html#Scopes + ''; + }; + flow = lib.mkOption { + type = lib.types.enum [ + "code" + "implicit" + ]; + default = "code"; + description = '' + Specifies the OpenID Connect flow to use. + Values other than "implicit" will result in the Code+PKCE flow to be used. + Usage of the implicit flow is strongly discouraged, but may be necessary when + the IdP of choice does not support the Code+PKCE flow. + See also: + - https://oauth.net/2/grant-types/implicit/ + - https://oauth.net/2/pkce/ + ''; + }; + loginButtonText = lib.mkOption { + type = lib.types.str; + default = "Login with OpenID Connect"; + description = '' + Defines the scopes to request for OpenID Connect. + See also: https://openid.net/specs/openid-connect-basic-1_0.html#Scopes + ''; + }; + usernameClaim = lib.mkOption { + type = lib.types.str; + default = "name"; + example = "preferred_username"; + description = '' + Defines the name of the claim that contains the username in the provider's userinfo endpoint. + Common claims are "name", "username", "preferred_username" or "nickname". + See also: https://openid.net/specs/openid-connect-core-1_0.html#UserInfoResponse + ''; + }; + userProvisioning = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + Specifies if mapped OpenID Connect accounts are automatically created upon successful + authentication. When a user logs in with a valid access token but an account has + not been previously provisioned, an authentication failure will be returned. + This allows admins to control specifically which OpenID Connect users can access the + system and which users cannot. When this value is set to true, a local OpenID Connect + user will be created and mapped to the OpenID Connect account automatically. This + automatic provisioning only affects authentication, not authorization. + ''; + }; + teamSynchronization = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + This option will ensure that team memberships for OpenID Connect users are dynamic and + synchronized with membership of OpenID Connect groups or assigned roles. When a team is + mapped to an OpenID Connect group, all local OpenID Connect users will automatically be + assigned to the team if they are a member of the group the team is mapped to. If the user + is later removed from the OpenID Connect group, they will also be removed from the team. This + option provides the ability to dynamically control user permissions via the identity provider. + Note that team synchronization is only performed during user provisioning and after successful + authentication. + ''; + }; + teams = { + claim = lib.mkOption { + type = lib.types.str; + default = "groups"; + description = '' + Defines the name of the claim that contains group memberships or role assignments in the provider's userinfo endpoint. + The claim must be an array of strings. Most public identity providers do not support group or role management. + When using a customizable / on-demand hosted identity provider, name, content, and inclusion in the userinfo endpoint + will most likely need to be configured. + ''; + }; + default = lib.mkOption { + type = lib.types.nullOr lib.types.commas; + default = null; + description = '' + Defines one or more team names that auto-provisioned OIDC users shall be added to. + Multiple team names may be provided as comma-separated list. + + Has no effect when {option}`services.dependency-track.oidc.userProvisioning`=false, + or {option}`services.dependency-track.oidc.teamSynchronization`=true. + ''; + }; + }; + }; + + nginx = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + example = false; + description = '' + Whether to set up an nginx virtual host. + ''; + }; + + domain = lib.mkOption { + type = lib.types.str; + example = "dtrack.example.com"; + description = '' + The domain name under which to set up the virtual host. + ''; + }; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + "alpine.data.directory" = lib.mkOption { + type = lib.types.path; + default = "/var/lib/dependency-track"; + description = '' + Defines the path to the data directory. This directory will hold logs, keys, + and any database or index files along with application-specific files or + directories. + ''; + }; + "alpine.database.mode" = lib.mkOption { + type = lib.types.enum [ + "server" + "embedded" + "external" + ]; + default = + if cfg.database.type == "h2" then + "embedded" + else if cfg.database.type == "postgresql" then + "external" + else + null; + defaultText = lib.literalExpression '' + if config.services.dependency-track.database.type == "h2" then "embedded" + else if config.services.dependency-track.database.type == "postgresql" then "external" + else null + ''; + description = '' + Defines the database mode of operation. Valid choices are: + 'server', 'embedded', and 'external'. + In server mode, the database will listen for connections from remote hosts. + In embedded mode, the system will be more secure and slightly faster. + External mode should be used when utilizing an external database server + (i.e. mysql, postgresql, etc). + ''; + }; + "alpine.database.url" = lib.mkOption { + type = lib.types.str; + default = + if cfg.database.type == "h2" then + "jdbc:h2:/var/lib/dependency-track/db" + else if cfg.database.type == "postgresql" then + "jdbc:postgresql:${cfg.database.databaseName}?socketFactory=org.newsclub.net.unix.AFUNIXSocketFactory$FactoryArg&socketFactoryArg=/run/postgresql/.s.PGSQL.5432" + else + null; + + defaultText = lib.literalExpression '' + if config.services.dependency-track.database.type == "h2" then "jdbc:h2:/var/lib/dependency-track/db" + else if config.services.dependency-track.database.type == "postgresql" then "jdbc:postgresql:''${config.services.dependency-track.database.name}?socketFactory=org.newsclub.net.unix.AFUNIXSocketFactory$FactoryArg&socketFactoryArg=/run/postgresql/.s.PGSQL.5432" + else null + ''; + description = "Specifies the JDBC URL to use when connecting to the database."; + }; + "alpine.database.driver" = lib.mkOption { + type = lib.types.enum [ + "org.h2.Driver" + "org.postgresql.Driver" + "com.microsoft.sqlserver.jdbc.SQLServerDriver" + "com.mysql.cj.jdbc.Driver" + ]; + default = + if cfg.database.type == "h2" then + "org.h2.Driver" + else if cfg.database.type == "postgresql" then + "org.postgresql.Driver" + else + null; + defaultText = lib.literalExpression '' + if config.services.dependency-track.database.type == "h2" then "org.h2.Driver" + else if config.services.dependency-track.database.type == "postgresql" then "org.postgresql.Driver" + else null; + ''; + description = "Specifies the JDBC driver class to use."; + }; + "alpine.database.username" = lib.mkOption { + type = lib.types.str; + default = if cfg.database.createLocally then "dependency-track" else cfg.database.username; + defaultText = lib.literalExpression '' + if config.services.dependency-track.database.createLocally then "dependency-track" + else config.services.dependency-track.database.username + ''; + description = "Specifies the username to use when authenticating to the database."; + }; + "alpine.ldap.enabled" = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Defines if LDAP will be used for user authentication. If enabled, + alpine.ldap.* properties should be set accordingly. + ''; + }; + "alpine.oidc.enabled" = lib.mkOption { + type = lib.types.bool; + default = cfg.oidc.enable; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.enable"; + description = '' + Defines if OpenID Connect will be used for user authentication. + If enabled, alpine.oidc.* properties should be set accordingly. + ''; + }; + "alpine.oidc.client.id" = lib.mkOption { + type = lib.types.str; + default = cfg.oidc.clientId; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.clientId"; + description = '' + Defines the client ID to be used for OpenID Connect. + The client ID should be the same as the one configured for the frontend, + and will only be used to validate ID tokens. + ''; + }; + "alpine.oidc.issuer" = lib.mkOption { + type = lib.types.str; + default = cfg.oidc.issuer; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.issuer"; + description = '' + Defines the issuer URL to be used for OpenID Connect. + This issuer MUST support provider configuration via the /.well-known/openid-configuration endpoint. + See also: + - https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata + - https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfig + ''; + }; + "alpine.oidc.username.claim" = lib.mkOption { + type = lib.types.str; + default = cfg.oidc.usernameClaim; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.usernameClaim"; + description = '' + Defines the name of the claim that contains the username in the provider's userinfo endpoint. + Common claims are "name", "username", "preferred_username" or "nickname". + See also: https://openid.net/specs/openid-connect-core-1_0.html#UserInfoResponse + ''; + }; + "alpine.oidc.user.provisioning" = lib.mkOption { + type = lib.types.bool; + default = cfg.oidc.userProvisioning; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.userProvisioning"; + description = '' + Specifies if mapped OpenID Connect accounts are automatically created upon successful + authentication. When a user logs in with a valid access token but an account has + not been previously provisioned, an authentication failure will be returned. + This allows admins to control specifically which OpenID Connect users can access the + system and which users cannot. When this value is set to true, a local OpenID Connect + user will be created and mapped to the OpenID Connect account automatically. This + automatic provisioning only affects authentication, not authorization. + ''; + }; + "alpine.oidc.team.synchronization" = lib.mkOption { + type = lib.types.bool; + default = cfg.oidc.teamSynchronization; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.teamSynchronization"; + description = '' + This option will ensure that team memberships for OpenID Connect users are dynamic and + synchronized with membership of OpenID Connect groups or assigned roles. When a team is + mapped to an OpenID Connect group, all local OpenID Connect users will automatically be + assigned to the team if they are a member of the group the team is mapped to. If the user + is later removed from the OpenID Connect group, they will also be removed from the team. This + option provides the ability to dynamically control user permissions via the identity provider. + Note that team synchronization is only performed during user provisioning and after successful + authentication. + ''; + }; + "alpine.oidc.teams.claim" = lib.mkOption { + type = lib.types.str; + default = cfg.oidc.teams.claim; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.teams.claim"; + description = '' + Defines the name of the claim that contains group memberships or role assignments in the provider's userinfo endpoint. + The claim must be an array of strings. Most public identity providers do not support group or role management. + When using a customizable / on-demand hosted identity provider, name, content, and inclusion in the userinfo endpoint + will most likely need to be configured. + ''; + }; + "alpine.oidc.teams.default" = lib.mkOption { + type = lib.types.nullOr lib.types.commas; + default = cfg.oidc.teams.default; + defaultText = lib.literalExpression "config.services.dependency-track.oidc.teams.default"; + description = '' + Defines one or more team names that auto-provisioned OIDC users shall be added to. + Multiple team names may be provided as comma-separated list. + + Has no effect when {option}`services.dependency-track.oidc.userProvisioning`=false, + or {option}`services.dependency-track.oidc.teamSynchronization`=true. + ''; + }; + }; + }; + default = { }; + description = "See https://docs.dependencytrack.org/getting-started/configuration/#default-configuration for possible options"; + }; + }; + + config = lib.mkIf cfg.enable { + services.nginx = lib.mkIf cfg.nginx.enable { + enable = true; + recommendedGzipSettings = lib.mkDefault true; + recommendedOptimisation = lib.mkDefault true; + recommendedProxySettings = lib.mkDefault true; + recommendedTlsSettings = lib.mkDefault true; + upstreams.dependency-track.servers."localhost:${toString cfg.port}" = { }; + virtualHosts.${cfg.nginx.domain} = { + locations = { + "/".proxyPass = "http://dependency-track"; + "= /static/config.json".alias = frontendConfigFile; + }; + }; + }; + + systemd.services.dependency-track-postgresql-init = lib.mkIf cfg.database.createLocally { + after = [ "postgresql.service" ]; + before = [ "dependency-track.service" ]; + bindsTo = [ "postgresql.service" ]; + path = [ config.services.postgresql.package ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = "postgres"; + Group = "postgres"; + LoadCredential = [ "db_password:${cfg.database.passwordFile}" ]; + PrivateTmp = true; + }; + script = '' + set -eou pipefail + shopt -s inherit_errexit + + # Read the password from the credentials directory and + # escape any single quotes by adding additional single + # quotes after them, following the rules laid out here: + # https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-CONSTANTS + db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")" + db_password="''${db_password//\'/\'\'}" + + echo "CREATE ROLE \"dependency-track\" WITH LOGIN PASSWORD '$db_password' CREATEDB" > /tmp/create_role.sql + psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='dependency-track'" | grep -q 1 || psql -tA --file="/tmp/create_role.sql" + psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'dependency-track'" | grep -q 1 || psql -tAc 'CREATE DATABASE "dependency-track" OWNER "dependency-track"' + ''; + }; + + services.postgresql.enable = lib.mkIf cfg.database.createLocally (lib.mkDefault true); + + systemd.services."dependency-track" = + let + databaseServices = + if cfg.database.createLocally then + [ + "dependency-track-postgresql-init.service" + "postgresql.service" + ] + else + [ ]; + in + { + description = "Dependency Track"; + wantedBy = [ "multi-user.target" ]; + requires = databaseServices; + after = databaseServices; + # provide settings via env vars to allow overriding default settings. + environment = { + HOME = "%S/dependency-track"; + } // renderSettings cfg.settings; + serviceConfig = { + User = "dependency-track"; + Group = "dependency-track"; + DynamicUser = true; + StateDirectory = "dependency-track"; + LoadCredential = + [ "db_password:${cfg.database.passwordFile}" ] + ++ lib.optional cfg.settings."alpine.ldap.enabled" + "ldap_bind_password:${cfg.ldap.bindPasswordFile}"; + }; + script = '' + set -eou pipefail + shopt -s inherit_errexit + + export ALPINE_DATABASE_PASSWORD_FILE="$CREDENTIALS_DIRECTORY/db_password" + ${lib.optionalString cfg.settings."alpine.ldap.enabled" '' + export ALPINE_LDAP_BIND_PASSWORD="$(<"$CREDENTIALS_DIRECTORY/ldap_bind_password")" + ''} + + exec ${lib.getExe pkgs.jre_headless} ${ + lib.escapeShellArgs ( + cfg.javaArgs + ++ [ + "-DdependencyTrack.logging.level=${cfg.logLevel}" + "-jar" + "${cfg.package}/share/dependency-track/dependency-track.jar" + "-port" + "${toString cfg.port}" + ] + ) + } + ''; + }; + }; + + meta = { + maintainers = lib.teams.cyberus.members; + }; +} diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index c5ea809c8d592..a075070f38b2b 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -17,6 +17,10 @@ let extraConfig = mkPhpIni cfg.phpOptions; }; + # "you're escaped" -> "'you\'re escaped'" + # https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single + toPhpString = s: "'${escape [ "'" "\\" ] s}'"; + dokuwikiAclAuthConfig = hostName: cfg: let inherit (cfg) acl; acl_gen = concatMapStringsSep "\n" (l: "${l.page} \t ${l.actor} \t ${toString l.level}"); @@ -43,12 +47,12 @@ let mkPhpValue = v: let isHasAttr = s: isAttrs v && hasAttr s v; in - if isString v then escapeShellArg v + if isString v then toPhpString v # NOTE: If any value contains a , (comma) this will not get escaped - else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v) + else if isList v && any lib.strings.isCoercibleToString v then toPhpString (concatMapStringsSep "," toString v) else if isInt v then toString v else if isBool v then toString (if v then 1 else 0) - else if isHasAttr "_file" then "trim(file_get_contents(${lib.escapeShellArg v._file}))" + else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString v._file}))" else if isHasAttr "_raw" then v._raw else abort "The dokuwiki localConf value ${lib.generators.toPretty {} v} can not be encoded." ; @@ -59,7 +63,7 @@ let [" = ${mkPhpValue v};"] else mkPhpAttrVals v; - in map (e: "[${escapeShellArg k}]${e}") (flatten values); + in map (e: "[${toPhpString k}]${e}") (flatten values); dokuwikiLocalConfig = hostName: cfg: let conf_gen = c: map (v: "$conf${v}") (mkPhpAttrVals c); diff --git a/nixos/modules/services/web-apps/flarum.nix b/nixos/modules/services/web-apps/flarum.nix index a967c3b121bd6..129f5a2826816 100644 --- a/nixos/modules/services/web-apps/flarum.nix +++ b/nixos/modules/services/web-apps/flarum.nix @@ -106,8 +106,14 @@ in { createDatabaseLocally = mkOption { type = types.bool; - default = true; - description = "Create the database and database user locally, and run installation."; + default = false; + description = '' + Create the database and database user locally, and run installation. + + WARNING: Due to https://github.com/flarum/framework/issues/4018, this option is set + to false by default. The 'flarum install' command may delete existing database tables. + Only set this to true if you are certain you are working with a fresh, empty database. + ''; }; }; @@ -116,6 +122,7 @@ in { isSystemUser = true; home = cfg.stateDir; createHome = true; + homeMode = "755"; group = cfg.group; }; users.groups.${cfg.group} = {}; @@ -194,14 +201,15 @@ in { cp -f ${cfg.package}/share/php/flarum/{extend.php,site.php,flarum} . ln -sf ${cfg.package}/share/php/flarum/vendor . ln -sf ${cfg.package}/share/php/flarum/public/index.php public/ - chmod a+x . public - chmod +x site.php extend.php flarum '' + optionalString (cfg.createDatabaseLocally && cfg.database.driver == "mysql") '' if [ ! -f config.php ]; then - php flarum install --file=${flarumInstallConfig} + php flarum install --file=${flarumInstallConfig} + fi + '' + '' + if [ -f config.php ]; then + php flarum migrate + php flarum cache:clear fi - php flarum migrate - php flarum cache:clear ''; }; }; diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix new file mode 100644 index 0000000000000..fa55db762c467 --- /dev/null +++ b/nixos/modules/services/web-apps/gancio.nix @@ -0,0 +1,287 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.gancio; + settingsFormat = pkgs.formats.json { }; + inherit (lib) + mkEnableOption + mkPackageOption + mkOption + types + literalExpression + mkIf + optional + mapAttrsToList + concatStringsSep + concatMapStringsSep + getExe + mkMerge + mkDefault + ; +in +{ + options.services.gancio = { + enable = mkEnableOption "Gancio, a shared agenda for local communities"; + + package = mkPackageOption pkgs "gancio" { }; + + plugins = mkOption { + type = with types; listOf package; + default = [ ]; + example = literalExpression "[ pkgs.gancioPlugins.telegram-bridge ]"; + description = '' + Paths of gancio plugins to activate (linked under $WorkingDirectory/plugins/). + ''; + }; + + user = mkOption { + type = types.str; + description = "The user (and PostgreSQL database name) used to run the gancio server"; + default = "gancio"; + }; + + settings = mkOption rec { + type = types.submodule { + freeformType = settingsFormat.type; + options = { + hostname = mkOption { + type = types.str; + description = "The domain name under which the server is reachable."; + }; + baseurl = mkOption { + type = types.str; + default = "http${ + lib.optionalString config.services.nginx.virtualHosts."${cfg.settings.hostname}".enableACME "s" + }://${cfg.settings.hostname}"; + defaultText = lib.literalExpression ''"https://''${cfg.settings.hostname}"''; + example = "https://demo.gancio.org/gancio"; + description = "The full URL under which the server is reachable."; + }; + server = { + socket = mkOption { + type = types.path; + readOnly = true; + default = "/run/gancio/socket"; + description = '' + The unix socket for the gancio server to listen on. + ''; + }; + }; + db = { + dialect = mkOption { + type = types.enum [ + "sqlite" + "postgres" + ]; + default = "sqlite"; + description = '' + The database dialect to use + ''; + }; + storage = mkOption { + description = '' + Location for the SQLite database. + ''; + readOnly = true; + type = types.nullOr types.str; + default = if cfg.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null; + defaultText = '' + if cfg.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null + ''; + }; + host = mkOption { + description = '' + Connection string for the PostgreSQL database + ''; + readOnly = true; + type = types.nullOr types.str; + default = if cfg.settings.db.dialect == "postgres" then "/run/postgresql" else null; + defaultText = '' + if cfg.settings.db.dialect == "postgres" then "/run/postgresql" else null + ''; + }; + database = mkOption { + description = '' + Name of the PostgreSQL database + ''; + readOnly = true; + type = types.nullOr types.str; + default = if cfg.settings.db.dialect == "postgres" then cfg.user else null; + defaultText = '' + if cfg.settings.db.dialect == "postgres" then cfg.user else null + ''; + }; + }; + log_level = mkOption { + description = "Gancio log level."; + type = types.enum [ + "debug" + "info" + "warning" + "error" + ]; + default = "info"; + }; + # FIXME upstream proper journald logging + log_path = mkOption { + description = "Directory Gancio logs into"; + readOnly = true; + type = types.str; + default = "/var/log/gancio"; + }; + }; + }; + description = '' + Configuration for Gancio, see for supported values. + ''; + }; + + userLocale = mkOption { + type = with types; attrsOf (attrsOf (attrsOf str)); + default = { }; + example = { + en.register.description = "My new registration page description"; + }; + description = '' + Override default locales within gancio. + See [https://framagit.org/les/gancio/tree/master/locales](default languages and locales). + ''; + }; + + nginx = mkOption { + type = types.submodule ( + lib.recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { + # enable encryption by default, + # as sensitive login credentials should not be transmitted in clear text. + options.forceSSL.default = true; + options.enableACME.default = true; + } + ); + default = { }; + example = { + enableACME = false; + forceSSL = false; + }; + description = "Extra configuration for the nginx virtual host of gancio."; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + users.users.gancio = lib.mkIf (cfg.user == "gancio") { + isSystemUser = true; + group = cfg.user; + home = "/var/lib/gancio"; + }; + users.groups.gancio = lib.mkIf (cfg.user == "gancio") { }; + + systemd.tmpfiles.settings."10-gancio" = + let + rules = { + mode = "0755"; + user = cfg.user; + group = config.users.users.${cfg.user}.group; + }; + in + { + "/var/lib/gancio/user_locale".d = rules; + "/var/lib/gancio/plugins".d = rules; + }; + + systemd.services.gancio = + let + configFile = settingsFormat.generate "gancio-config.json" cfg.settings; + in + { + description = "Gancio server"; + documentation = [ "https://gancio.org/" ]; + + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + ] ++ optional (cfg.settings.db.dialect == "postgres") "postgresql.service"; + + environment = { + NODE_ENV = "production"; + }; + + preStart = '' + # We need this so the gancio executable run by the user finds the right settings. + ln -sf ${configFile} config.json + + rm -f user_locale/* + ${concatStringsSep "\n" ( + mapAttrsToList ( + l: c: "ln -sf ${settingsFormat.generate "gancio-${l}-locale.json" c} user_locale/${l}.json" + ) cfg.userLocale + )} + + rm -f plugins/* + ${concatMapStringsSep "\n" (p: "ln -sf ${p} plugins/") cfg.plugins} + ''; + + serviceConfig = { + ExecStart = "${getExe cfg.package} start ${configFile}"; + # set umask so that nginx can write to the server socket + # FIXME: upstream socket permission configuration in Nuxt + UMask = "0002"; + RuntimeDirectory = "gancio"; + StateDirectory = "gancio"; + WorkingDirectory = "/var/lib/gancio"; + LogsDirectory = "gancio"; + User = cfg.user; + # hardening + RestrictRealtime = true; + RestrictNamespaces = true; + LockPersonality = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + ProtectClock = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + CapabilityBoundingSet = ""; + ProtectProc = "invisible"; + }; + }; + + services.postgresql = mkIf (cfg.settings.db.dialect == "postgres") { + enable = true; + ensureDatabases = [ cfg.user ]; + ensureUsers = [ + { + name = cfg.user; + ensureDBOwnership = true; + } + ]; + }; + + services.nginx = { + enable = true; + virtualHosts."${cfg.settings.hostname}" = mkMerge [ + cfg.nginx + { + locations = { + "/" = { + index = "index.html"; + tryFiles = "$uri $uri @proxy"; + }; + "@proxy" = { + proxyWebsockets = true; + proxyPass = "http://unix:${cfg.settings.server.socket}"; + recommendedProxySettings = true; + }; + }; + } + ]; + }; + # for nginx to access gancio socket + users.users."${config.services.nginx.user}".extraGroups = [ config.users.users.${cfg.user}.group ]; + }; +} diff --git a/nixos/modules/services/web-apps/hatsu.md b/nixos/modules/services/web-apps/hatsu.md new file mode 100644 index 0000000000000..e2c61d00f121e --- /dev/null +++ b/nixos/modules/services/web-apps/hatsu.md @@ -0,0 +1,23 @@ +# Hatsu {#module-services-hatsu} + +[Hatsu](https://github.com/importantimport/hatsu) is an fully-automated ActivityPub bridge for static sites. + +## Quickstart {#module-services-hatsu-quickstart} + +the minimum configuration to start hatsu server would look like this: + +```nix +{ + services.hatsu = { + enable = true; + settings = { + HATSU_DOMAIN = "hatsu.local"; + HATSU_PRIMARY_ACCOUNT = "example.com"; + }; + }; +} +``` + +this will start the hatsu server on port 3939 and save the database in `/var/lib/hatsu/hatsu.sqlite3`. + +Please refer to the [Hatsu Documentation](https://hatsu.cli.rs) for additional configuration options. diff --git a/nixos/modules/services/web-apps/hatsu.nix b/nixos/modules/services/web-apps/hatsu.nix new file mode 100644 index 0000000000000..093ae150cfdc6 --- /dev/null +++ b/nixos/modules/services/web-apps/hatsu.nix @@ -0,0 +1,97 @@ +{ + lib, + pkgs, + config, + ... +}: +let + cfg = config.services.hatsu; +in +{ + meta.doc = ./hatsu.md; + meta.maintainers = with lib.maintainers; [ kwaa ]; + + options.services.hatsu = { + enable = lib.mkEnableOption "Self-hosted and fully-automated ActivityPub bridge for static sites"; + + package = lib.mkPackageOption pkgs "hatsu" { }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = + with lib.types; + attrsOf ( + nullOr (oneOf [ + bool + int + port + str + ]) + ); + + options = { + HATSU_DATABASE_URL = lib.mkOption { + type = lib.types.str; + default = "sqlite:///var/lib/hatsu/hatsu.sqlite?mode=rwc"; + example = "postgres://username:password@host/database"; + description = "Database URL."; + }; + + HATSU_DOMAIN = lib.mkOption { + type = lib.types.str; + description = "The domain name of your instance (eg 'hatsu.local')."; + }; + + HATSU_LISTEN_HOST = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = "Host where hatsu should listen for incoming requests."; + }; + + HATSU_LISTEN_PORT = lib.mkOption { + type = lib.types.port; + apply = toString; + default = 3939; + description = "Port where hatsu should listen for incoming requests."; + }; + + HATSU_PRIMARY_ACCOUNT = lib.mkOption { + type = lib.types.str; + description = "The primary account of your instance (eg 'example.com')."; + }; + }; + }; + + default = { }; + + description = '' + Configuration for Hatsu, see + + for supported values. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.hatsu = { + environment = cfg.settings; + + description = "Hatsu server"; + documentation = [ "https://hatsu.cli.rs/" ]; + + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${lib.getExe cfg.package}"; + Restart = "on-failure"; + StateDirectory = "hatsu"; + Type = "simple"; + WorkingDirectory = "%S/hatsu"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index 919d870b3a2cb..36d79a4153ece 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -26,7 +26,7 @@ in (lib.mkRemovedOptionModule [ "services" "hedgedoc" "workDir" ] '' This option has been removed in favor of systemd managing the state directory. - If you have set this option without specifying `services.settings.uploadsDir`, + If you have set this option without specifying `services.hedgedoc.settings.uploadsPath`, please move these files to `/var/lib/hedgedoc/uploads`, or set the option to point at the correct location. '') diff --git a/nixos/modules/services/web-apps/homebox.nix b/nixos/modules/services/web-apps/homebox.nix index ab5a927f6191e..9b72a45e7d341 100644 --- a/nixos/modules/services/web-apps/homebox.nix +++ b/nixos/modules/services/web-apps/homebox.nix @@ -28,7 +28,7 @@ in ''; description = '' The homebox configuration as Environment variables. For definitions and available options see the upstream - [documentation](https://hay-kot.github.io/homebox/quick-start/#env-variables-configuration). + [documentation](https://homebox.software/en/quick-start.html#env-variables-configuration). ''; }; }; diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix new file mode 100644 index 0000000000000..c1a30c6ff2b3c --- /dev/null +++ b/nixos/modules/services/web-apps/immich.nix @@ -0,0 +1,316 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.immich; + isPostgresUnixSocket = lib.hasPrefix "/" cfg.database.host; + isRedisUnixSocket = lib.hasPrefix "/" cfg.redis.host; + + commonServiceConfig = { + Type = "simple"; + Restart = "on-failure"; + RestartSec = 3; + + # 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" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + }; + inherit (lib) + types + mkIf + mkOption + mkEnableOption + ; +in +{ + options.services.immich = { + enable = mkEnableOption "Immich"; + package = lib.mkPackageOption pkgs "immich" { }; + + mediaLocation = mkOption { + type = types.path; + default = "/var/lib/immich"; + description = "Directory used to store media files. If it is not the default, the directory has to be created manually such that the immich user is able to read and write to it."; + }; + environment = mkOption { + type = types.submodule { freeformType = types.attrsOf types.str; }; + default = { }; + example = { + IMMICH_LOG_LEVEL = "verbose"; + }; + description = '' + Extra configuration environment variables. Refer to the [documentation](https://immich.app/docs/install/environment-variables) for options tagged with 'server', 'api' or 'microservices'. + ''; + }; + secretsFile = mkOption { + type = 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; + } + ); + default = null; + example = "/run/secrets/immich"; + 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 immich. Refer to the [documentation](https://immich.app/docs/install/environment-variables) for options. + + To set a database password set this to a file containing: + ``` + DB_PASSWORD= + ``` + ''; + }; + host = mkOption { + type = types.str; + default = "localhost"; + description = "The host that immich will listen on."; + }; + port = mkOption { + type = types.port; + default = 3001; + description = "The port that immich will listen on."; + }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Whether to open the immich port in the firewall"; + }; + user = mkOption { + type = types.str; + default = "immich"; + description = "The user immich should run as."; + }; + group = mkOption { + type = types.str; + default = "immich"; + description = "The group immich should run as."; + }; + + machine-learning = { + enable = + mkEnableOption "immich's machine-learning functionality to detect faces and search for objects" + // { + default = true; + }; + environment = mkOption { + type = types.submodule { freeformType = types.attrsOf types.str; }; + default = { }; + example = { + MACHINE_LEARNING_MODEL_TTL = "600"; + }; + description = '' + Extra configuration environment variables. Refer to the [documentation](https://immich.app/docs/install/environment-variables) for options tagged with 'machine-learning'. + ''; + }; + }; + + database = { + enable = + mkEnableOption "the postgresql database for use with immich. See {option}`services.postgresql`" + // { + default = true; + }; + createDB = mkEnableOption "the automatic creation of the database for immich." // { + default = true; + }; + name = mkOption { + type = types.str; + default = "immich"; + description = "The name of the immich database."; + }; + host = mkOption { + type = types.str; + default = "/run/postgresql"; + example = "127.0.0.1"; + description = "Hostname or address of the postgresql server. If an absolute path is given here, it will be interpreted as a unix socket path."; + }; + port = mkOption { + type = types.port; + default = 5432; + description = "Port of the postgresql server."; + }; + user = mkOption { + type = types.str; + default = "immich"; + description = "The database user for immich."; + }; + }; + redis = { + enable = mkEnableOption "a redis cache for use with immich" // { + default = true; + }; + host = mkOption { + type = types.str; + default = config.services.redis.servers.immich.unixSocket; + defaultText = lib.literalExpression "config.services.redis.servers.immich.unixSocket"; + description = "The host that redis will listen on."; + }; + port = mkOption { + type = types.port; + default = 0; + description = "The port that redis will listen on. Set to zero to disable TCP."; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = !isPostgresUnixSocket -> cfg.secretsFile != null; + message = "A secrets file containing at least the database password must be provided when unix sockets are not used."; + } + ]; + + services.postgresql = mkIf cfg.database.enable { + enable = true; + ensureDatabases = mkIf cfg.database.createDB [ cfg.database.name ]; + ensureUsers = mkIf cfg.database.createDB [ + { + name = cfg.database.user; + ensureDBOwnership = true; + ensureClauses.login = true; + } + ]; + extraPlugins = ps: with ps; [ pgvecto-rs ]; + settings = { + shared_preload_libraries = [ "vectors.so" ]; + search_path = "\"$user\", public, vectors"; + }; + }; + systemd.services.postgresql.serviceConfig.ExecStartPost = + let + sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" '' + CREATE EXTENSION IF NOT EXISTS unaccent; + CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + CREATE EXTENSION IF NOT EXISTS vectors; + CREATE EXTENSION IF NOT EXISTS cube; + CREATE EXTENSION IF NOT EXISTS earthdistance; + CREATE EXTENSION IF NOT EXISTS pg_trgm; + + ALTER SCHEMA public OWNER TO ${cfg.database.user}; + ALTER SCHEMA vectors OWNER TO ${cfg.database.user}; + GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user}; + + ALTER EXTENSION vectors UPDATE; + ''; + in + [ + '' + ${lib.getExe' config.services.postgresql.package "psql"} -d "${cfg.database.name}" -f "${sqlFile}" + '' + ]; + + services.redis.servers = mkIf cfg.redis.enable { + immich = { + enable = true; + user = cfg.user; + port = cfg.redis.port; + bind = mkIf (!isRedisUnixSocket) cfg.redis.host; + }; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + services.immich.environment = + let + postgresEnv = + if isPostgresUnixSocket then + { DB_URL = "socket://${cfg.database.host}?dbname=${cfg.database.name}"; } + else + { + DB_HOSTNAME = cfg.database.host; + DB_PORT = toString cfg.database.port; + DB_DATABASE_NAME = cfg.database.name; + DB_USERNAME = cfg.database.user; + }; + redisEnv = + if isRedisUnixSocket then + { REDIS_SOCKET = cfg.redis.host; } + else + { + REDIS_PORT = toString cfg.redis.port; + REDIS_HOSTNAME = cfg.redis.host; + }; + in + postgresEnv + // redisEnv + // { + HOST = cfg.host; + IMMICH_PORT = toString cfg.port; + IMMICH_MEDIA_LOCATION = cfg.mediaLocation; + IMMICH_MACHINE_LEARNING_URL = "http://localhost:3003"; + }; + + services.immich.machine-learning.environment = { + MACHINE_LEARNING_WORKERS = "1"; + MACHINE_LEARNING_WORKER_TIMEOUT = "120"; + MACHINE_LEARNING_CACHE_FOLDER = "/var/cache/immich"; + IMMICH_HOST = "localhost"; + IMMICH_PORT = "3003"; + }; + + systemd.services.immich-server = { + description = "Immich backend server (Self-hosted photo and video backup solution)"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + inherit (cfg) environment; + + serviceConfig = commonServiceConfig // { + ExecStart = lib.getExe cfg.package; + EnvironmentFile = mkIf (cfg.secretsFile != null) cfg.secretsFile; + StateDirectory = "immich"; + RuntimeDirectory = "immich"; + User = cfg.user; + Group = cfg.group; + }; + }; + + systemd.services.immich-machine-learning = mkIf cfg.machine-learning.enable { + description = "immich machine learning"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + inherit (cfg.machine-learning) environment; + serviceConfig = commonServiceConfig // { + ExecStart = lib.getExe (cfg.package.machine-learning.override { immich = cfg.package; }); + CacheDirectory = "immich"; + User = cfg.user; + Group = cfg.group; + }; + }; + + users.users = mkIf (cfg.user == "immich") { + immich = { + name = "immich"; + group = cfg.group; + isSystemUser = true; + }; + }; + users.groups = mkIf (cfg.group == "immich") { immich = { }; }; + + meta.maintainers = with lib.maintainers; [ jvanbruegge ]; + }; +} diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix index 7997ea1f36308..e4223cf1e8b12 100644 --- a/nixos/modules/services/web-apps/invidious.nix +++ b/nixos/modules/services/web-apps/invidious.nix @@ -199,6 +199,41 @@ let }; }; + sigHelperConfig = lib.mkIf cfg.sig-helper.enable { + services.invidious.settings.signature_server = "tcp://${cfg.sig-helper.listenAddress}"; + systemd.services.invidious-sig-helper = { + script = '' + exec ${lib.getExe cfg.sig-helper.package} --tcp "${cfg.sig-helper.listenAddress}" + ''; + wantedBy = [ "multi-user.target" ]; + before = [ "invidious.service" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + serviceConfig = { + User = "invidious-sig-helper"; + DynamicUser = true; + Restart = "always"; + + PrivateTmp = true; + PrivateUsers = true; + ProtectSystem = true; + ProtectProc = "invisible"; + ProtectHome = true; + PrivateDevices = true; + NoNewPrivileges = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; + CapabilityBoundingSet = ""; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" "@network-io" ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + }; + }; + }; + nginxConfig = lib.mkIf cfg.nginx.enable { services.invidious.settings = { https_only = config.services.nginx.virtualHosts.${cfg.domain}.forceSSL; @@ -392,6 +427,30 @@ in package = lib.mkPackageOption pkgs "http3-ytproxy" { }; }; + + sig-helper = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable and configure inv-sig-helper to emulate the youtube client's javascript. This is required + to make certain videos playable. + + This will download and run completely untrusted javascript from youtube! While this service is sandboxed, + this may still be an issue! + ''; + }; + + package = lib.mkPackageOption pkgs "inv-sig-helper" { }; + + listenAddress = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1:2999"; + description = '' + The IP address/port where inv-sig-helper should listen. + ''; + }; + }; }; config = lib.mkIf cfg.enable (lib.mkMerge [ @@ -399,5 +458,6 @@ in localDatabaseConfig nginxConfig ytproxyConfig + sigHelperConfig ]); } diff --git a/nixos/modules/services/web-apps/jitsi-meet.md b/nixos/modules/services/web-apps/jitsi-meet.md index 577f82e315be5..705cf69274ca3 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.md +++ b/nixos/modules/services/web-apps/jitsi-meet.md @@ -19,6 +19,13 @@ A minimal configuration using Let's Encrypt for TLS certificates looks like this } ``` +Jitsi Meet depends on the Prosody XMPP server only for message passing from +the web browser while the default Prosody configuration is intended for use +with standalone XMPP clients and XMPP federation. If you only use Prosody as +a backend for Jitsi Meet it is therefore recommended to also enable +{option}`services.jitsi-meet.prosody.lockdown` option to disable unnecessary +Prosody features such as federation or the file proxy. + ## Configuration {#module-services-jitsi-configuration} Here is the minimal configuration with additional configurations: @@ -27,6 +34,7 @@ Here is the minimal configuration with additional configurations: services.jitsi-meet = { enable = true; hostName = "jitsi.example.com"; + prosody.lockdown = true; config = { enableWelcomePage = false; prejoinPageEnabled = true; diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index 39aa7379c0edf..f880691b55e9c 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -175,11 +175,26 @@ in prosody.enable = mkOption { type = bool; default = true; + example = false; description = '' Whether to configure Prosody to relay XMPP messages between Jitsi Meet components. Turn this off if you want to configure it manually. ''; }; + prosody.lockdown = mkOption { + type = bool; + default = false; + example = true; + description = '' + Whether to disable Prosody features not needed by Jitsi Meet. + + The default Prosody configuration assumes that it will be used as a + general-purpose XMPP server rather than as a companion service for + Jitsi Meet. This option reconfigures Prosody to only listen on + localhost without support for TLS termination, XMPP federation or + the file transfer proxy. + ''; + }; excalidraw.enable = mkEnableOption "Excalidraw collaboration backend for Jitsi"; excalidraw.port = mkOption { @@ -211,7 +226,10 @@ in smacks = mkDefault true; tls = mkDefault true; websocket = mkDefault true; + proxy65 = mkIf cfg.prosody.lockdown (mkDefault false); }; + httpInterfaces = mkIf cfg.prosody.lockdown (mkDefault [ "127.0.0.1" ]); + httpsPorts = mkIf cfg.prosody.lockdown (mkDefault []); muc = [ { domain = "conference.${cfg.hostName}"; @@ -232,7 +250,7 @@ in extraConfig = '' restrict_room_creation = true storage = "memory" - admins = { "focus@auth.${cfg.hostName}" } + admins = { "focus@auth.${cfg.hostName}", "jvb@auth.${cfg.hostName}" } ''; } { @@ -300,7 +318,7 @@ in muc_component = "conference.${cfg.hostName}" breakout_rooms_component = "breakout.${cfg.hostName}" '') - (mkBefore '' + (mkBefore ('' muc_mapper_domain_base = "${cfg.hostName}" cross_domain_websocket = true; @@ -310,7 +328,10 @@ in "focus@auth.${cfg.hostName}", "jvb@auth.${cfg.hostName}" } - '') + '' + optionalString cfg.prosody.lockdown '' + c2s_interfaces = { "127.0.0.1" }; + modules_disabled = { "s2s" }; + '')) ]; virtualHosts.${cfg.hostName} = { enabled = true; @@ -444,7 +465,29 @@ in Type = "simple"; ExecStart = "${pkgs.jitsi-excalidraw}/bin/jitsi-excalidraw-backend"; Restart = "on-failure"; + + DynamicUser = true; Group = "jitsi-meet"; + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + ProtectSystem = "strict"; + ProtectClock = true; + ProtectHome = true; + ProtectProc = true; + ProtectKernelLogs = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectHostname = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + LockPersonality = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallFilter = [ "@system-service @pkey" "~@privileged" ]; }; }; @@ -513,7 +556,11 @@ in cp ${overrideJs "${pkgs.jitsi-meet}/interface_config.js" "interfaceConfig" cfg.interfaceConfig ""} $out/interface_config.js cp ./libs/external_api.min.js $out/external_api.js ''; - in '' + in (optionalString cfg.excalidraw.enable '' + handle /socket.io/ { + reverse_proxy 127.0.0.1:${toString cfg.excalidraw.port} + } + '') + '' handle /http-bind { header Host ${cfg.hostName} reverse_proxy 127.0.0.1:5280 diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md index c433be5350b53..8d9aa878c2877 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 `nextcloud29` which is also the latest +The current default by NixOS is `nextcloud30` which is also the latest major version available. ## Basic usage {#module-services-nextcloud-basic-usage} @@ -144,6 +144,42 @@ Auto updates for Nextcloud apps can be enabled using To work around that, please make sure that all directories in question are owned by `nextcloud:nextcloud`. + - **`Failed to open stream: No such file or directory` after deploys** + + Symptoms are errors like this after a deployment that disappear after + a few minutes: + + ``` + Warning: file_get_contents(/run/secrets/nextcloud_db_password): Failed to open stream: No such file or directory in /nix/store/lqw657xbh6h67ccv9cgv104qhcs1i2vw-nextcloud-config.php on line 11 + + Warning: http_response_code(): Cannot set response code - headers already sent (output started at /nix/store/lqw657xbh6h67ccv9cgv104qhcs1i2vw-nextcloud-config.php:11) in /nix/store/ikxpaq7kjdhpr4w7cgl1n28kc2gvlhg6-nextcloud-29.0.7/lib/base.php on line 639 + Cannot decode /run/secrets/nextcloud_secrets, because: Syntax error + ``` + + This can happen if [](#opt-services.nextcloud.secretFile) or + [](#opt-services.nextcloud.config.dbpassFile) are managed by + [sops-nix](https://github.com/Mic92/sops-nix/). + + Here, `/run/secrets/nextcloud_secrets` is a symlink to + `/run/secrets.d/N/nextcloud_secrets`. The `N` will be incremented + when the sops-nix activation script runs, i.e. + `/run/secrets.d/N` doesn't exist anymore after a deploy, + only `/run/secrets.d/N+1`. + + PHP maintains a [cache for `realpath`](https://www.php.net/manual/en/ini.core.php#ini.realpath-cache-size) + that still resolves to the old path which is causing + the `No such file or directory` error. Interestingly, + the cache isn't used for `file_exists` which is why this warning + comes instead of the error from `nix_read_secret` in + `override.config.php`. + + One option to work around this is to turn off the cache by setting + the cache size to zero: + + ```nix + services.nextcloud.phpOptions."realpath_cache_size" = "0"; + ``` + ## Using an alternative webserver as reverse-proxy (e.g. `httpd`) {#module-services-nextcloud-httpd} By default, `nginx` is used as reverse-proxy for `nextcloud`. diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index c8c4fe4b4d612..fcaca9244c76f 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -300,7 +300,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud28" "nextcloud29" ]; + relatedPackages = [ "nextcloud28" "nextcloud29" "nextcloud30" ]; }; phpPackage = mkPackageOption pkgs "php" { example = "php82"; @@ -821,7 +821,7 @@ in { config = mkIf cfg.enable (mkMerge [ { warnings = let - latest = 29; + latest = 30; upgradeWarning = major: nixos: '' A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. @@ -847,11 +847,11 @@ in { If you have an existing installation with a custom table prefix, make sure it is set correctly in `config.php` and remove the option from your NixOS config. '') - ++ (optional (versionOlder cfg.package.version "25") (upgradeWarning 24 "22.11")) ++ (optional (versionOlder cfg.package.version "26") (upgradeWarning 25 "23.05")) ++ (optional (versionOlder cfg.package.version "27") (upgradeWarning 26 "23.11")) ++ (optional (versionOlder cfg.package.version "28") (upgradeWarning 27 "24.05")) - ++ (optional (versionOlder cfg.package.version "29") (upgradeWarning 28 "24.11")); + ++ (optional (versionOlder cfg.package.version "29") (upgradeWarning 28 "24.11")) + ++ (optional (versionOlder cfg.package.version "30") (upgradeWarning 29 "24.11")); services.nextcloud.package = with pkgs; mkDefault ( @@ -862,7 +862,8 @@ in { `pkgs.nextcloud`. '' else if versionOlder stateVersion "24.05" then nextcloud27 - else nextcloud29 + else if versionOlder stateVersion "24.11" then nextcloud29 + else nextcloud30 ); services.nextcloud.phpPackage = @@ -1019,7 +1020,7 @@ in { ''; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; - # On Nextcloud ≥ 26, it is not necessary to patch the database files to prevent + # On Nextcloud ≥ 26, it is not necessary to patch the database files to prevent # an automatic creation of the database user. environment.NC_setup_create_db_user = lib.mkIf (nextcloudGreaterOrEqualThan "26") "false"; }; diff --git a/nixos/modules/services/web-apps/openwebrx.nix b/nixos/modules/services/web-apps/openwebrx.nix index 614eb963b4a36..2ac187dc88c9d 100644 --- a/nixos/modules/services/web-apps/openwebrx.nix +++ b/nixos/modules/services/web-apps/openwebrx.nix @@ -18,7 +18,7 @@ in codec2 js8call m17-cxx-demod - alsaUtils + alsa-utils netcat ]; serviceConfig = { diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix index 46d671f8504b6..62db479da3d41 100644 --- a/nixos/modules/services/web-apps/pixelfed.nix +++ b/nixos/modules/services/web-apps/pixelfed.nix @@ -406,7 +406,7 @@ in { # is unnecessary as it's part of the installPhase of pixelfed. # Install Horizon - # FIXME: require write access to public/ — should be done as part of install — pixelfed-manage horizon:publish + # FIXME: require write access to public/ — should be done as part of install — pixelfed-manage horizon:publish # Perform the first migration. [[ ! -f ${cfg.dataDir}/.initial-migration ]] && pixelfed-manage migrate --force && touch ${cfg.dataDir}/.initial-migration diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 1f909bbd67a36..188b80ca43a1d 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -329,6 +329,6 @@ in { ]; }; - meta.maintainers = with maintainers; [ xanderio ]; + meta.maintainers = teams.cyberus.members; meta.doc = ./plausible.md; } diff --git a/nixos/modules/services/web-apps/pretalx.nix b/nixos/modules/services/web-apps/pretalx.nix index 2280d9165b40b..35af8c26482c7 100644 --- a/nixos/modules/services/web-apps/pretalx.nix +++ b/nixos/modules/services/web-apps/pretalx.nix @@ -294,6 +294,15 @@ in '') ]; + services.logrotate.settings.pretalx = { + files = "${cfg.settings.filesystem.logs}/*.log"; + su = "${cfg.user} ${cfg.group}"; + frequency = "weekly"; + rotate = "12"; + copytruncate = true; + compress = true; + }; + services = { nginx = lib.mkIf cfg.nginx.enable { enable = true; diff --git a/nixos/modules/services/web-apps/pretix.nix b/nixos/modules/services/web-apps/pretix.nix index d298caab5b862..f521c49668c87 100644 --- a/nixos/modules/services/web-apps/pretix.nix +++ b/nixos/modules/services/web-apps/pretix.nix @@ -249,7 +249,7 @@ in }; host = mkOption { - type = with types; nullOr path; + type = with types; nullOr str; default = if cfg.settings.database.backend == "postgresql" then "/run/postgresql" else null; defaultText = literalExpression '' if config.services.pretix.settings..database.backend == "postgresql" then "/run/postgresql" @@ -403,6 +403,15 @@ in '') ]; + services.logrotate.settings.pretix = { + files = "${cfg.settings.pretix.logdir}/*.log"; + su = "${cfg.user} ${cfg.group}"; + frequency = "weekly"; + rotate = "12"; + copytruncate = true; + compress = true; + }; + services = { nginx = mkIf cfg.nginx.enable { enable = true; diff --git a/nixos/modules/services/web-apps/privatebin.nix b/nixos/modules/services/web-apps/privatebin.nix new file mode 100644 index 0000000000000..6f6f9c27e3898 --- /dev/null +++ b/nixos/modules/services/web-apps/privatebin.nix @@ -0,0 +1,228 @@ +{ + pkgs, + config, + lib, + ... +}: + +let + cfg = config.services.privatebin; + + customToINI = lib.generators.toINI { + mkKeyValue = lib.generators.mkKeyValueDefault { + mkValueString = + v: + if v == true then + ''true'' + else if v == false then + ''false'' + else if builtins.isInt v then + ''${builtins.toString v}'' + else if builtins.isPath v then + ''"${builtins.toString v}"'' + else if builtins.isString v then + ''"${v}"'' + else + lib.generators.mkValueStringDefault { } v; + } "="; + }; + + privatebinSettings = pkgs.writeTextDir "conf.php" (customToINI cfg.settings); + + user = cfg.user; + group = cfg.group; + + defaultUser = "privatebin"; + defaultGroup = "privatebin"; + +in +{ + + options.services.privatebin = { + + enable = lib.mkEnableOption "Privatebin: A minimalist, open source online + pastebin where the server has zero knowledge of pasted data."; + + user = lib.mkOption { + type = lib.types.str; + default = defaultUser; + description = "User account under which privatebin runs."; + }; + + group = lib.mkOption { + type = lib.types.str; + default = if cfg.enableNginx then "nginx" else defaultGroup; + defaultText = "If `services.privatebin.enableNginx` is true then `nginx` else ${defaultGroup}"; + description = '' + Group under which privatebin runs. It is best to set this to the group + of whatever webserver is being used as the frontend. + ''; + }; + + dataDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/privatebin"; + description = '' + The place where privatebin stores its state. + ''; + }; + + package = lib.mkPackageOption pkgs "privatebin" { }; + + enableNginx = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable nginx or not. If enabled, an nginx virtual host will + be created for access to firefly-iii. If not enabled, then you may use + `''${config.services.firefly-iii.package}` as your document root in + whichever webserver you wish to setup. + ''; + }; + + virtualHost = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = '' + The hostname at which you wish privatebin to be served. If you have + enabled nginx using `services.privatebin.enableNginx` then this will + be used. + ''; + }; + + poolConfig = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.oneOf [ + lib.types.str + lib.types.int + lib.types.bool + ] + ); + defaultText = lib.literalExpression '' + { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + } + ''; + default = { }; + description = '' + Options for the PrivateBin PHP pool. See the documentation on php-fpm.conf + for details on configuration directives. + ''; + }; + + settings = lib.mkOption { + default = { }; + description = '' + Options for privatebin configuration. Refer to + for + details on supported values. + ''; + example = lib.literalExpression '' + { + main = { + name = "NixOS Based Privatebin"; + discussion = false; + defaultformatter = "plalib.types.intext"; + qrcode = true + }; + model.class = "Filesystem"; + model_options.dir = "/var/lib/privatebin/data"; + } + ''; + type = lib.types.submodule { freeformType = lib.types.attrsOf lib.types.anything; }; + }; + }; + + config = lib.mkIf cfg.enable { + + services.privatebin.settings = { + main = lib.mkDefault { }; + model.class = lib.mkDefault "Filesystem"; + model_options.dir = lib.mkDefault "${cfg.dataDir}/data"; + purge.dir = lib.mkDefault "${cfg.dataDir}/purge"; + traffic = { + dir = lib.mkDefault "${cfg.dataDir}/traffic"; + header = "X_FORWARDED_FOR"; + }; + }; + + services.phpfpm.pools.privatebin = { + inherit user group; + phpPackage = pkgs.php83; + phpOptions = '' + log_errors = on + ''; + settings = { + "listen.mode" = lib.mkDefault "0660"; + "listen.owner" = lib.mkDefault user; + "listen.group" = lib.mkDefault group; + "pm" = lib.mkDefault "dynamic"; + "pm.max_children" = lib.mkDefault 32; + "pm.start_servers" = lib.mkDefault 2; + "pm.min_spare_servers" = lib.mkDefault 2; + "pm.max_spare_servers" = lib.mkDefault 4; + "pm.max_requests" = lib.mkDefault 500; + }; + phpEnv.CONFIG_PATH = lib.strings.removeSuffix "/conf.php" (builtins.toString privatebinSettings); + }; + + services.nginx = lib.mkIf cfg.enableNginx { + enable = true; + recommendedTlsSettings = lib.mkDefault true; + recommendedOptimisation = lib.mkDefault true; + recommendedGzipSettings = lib.mkDefault true; + virtualHosts.${cfg.virtualHost} = { + root = "${cfg.package}"; + locations = { + "/" = { + tryFiles = "$uri $uri/ /index.php?$query_string"; + index = "index.php"; + extraConfig = '' + sendfile off; + ''; + }; + "~ \.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 + fastcgi_pass unix:${config.services.phpfpm.pools.privatebin.socket}; + ''; + }; + }; + }; + }; + + systemd.tmpfiles.settings."10-privatebin" = + lib.attrsets.genAttrs + [ + "${cfg.dataDir}/data" + "${cfg.dataDir}/traffic" + "${cfg.dataDir}/purge" + ] + (n: { + d = { + group = group; + mode = "0750"; + user = user; + }; + }); + + users = { + users = lib.mkIf (user == defaultUser) { + ${defaultUser} = { + description = "Privatebin service user"; + inherit group; + isSystemUser = true; + home = cfg.dataDir; + }; + }; + groups = lib.mkIf (group == defaultGroup) { ${defaultGroup} = { }; }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/rutorrent.nix b/nixos/modules/services/web-apps/rutorrent.nix new file mode 100644 index 0000000000000..cce701fef4978 --- /dev/null +++ b/nixos/modules/services/web-apps/rutorrent.nix @@ -0,0 +1,302 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.rutorrent; + + rtorrentPluginDependencies = with pkgs; { + _task = [ procps ]; + unpack = [ unzip unrar ]; + rss = [ curl ]; + mediainfo = [ mediainfo ]; + spectrogram = [ sox ]; + screenshots = [ ffmpeg ]; + }; + + phpPluginDependencies = with pkgs; { + _cloudflare = [ python3 ]; + }; + + getPluginDependencies = dependencies: concatMap (p: attrByPath [ p ] [] dependencies); + +in { + options = { + services.rutorrent = { + enable = mkEnableOption "ruTorrent"; + + hostName = mkOption { + type = types.str; + description = "FQDN for the ruTorrent instance."; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/rutorrent"; + description = "Storage path of ruTorrent."; + }; + + user = mkOption { + type = types.str; + default = "rutorrent"; + description = '' + User which runs the ruTorrent service. + ''; + }; + + group = mkOption { + type = types.str; + default = "rutorrent"; + description = '' + Group which runs the ruTorrent service. + ''; + }; + + rpcSocket = mkOption { + type = types.str; + default = config.services.rtorrent.rpcSocket; + defaultText = "config.services.rtorrent.rpcSocket"; + description = '' + Path to rtorrent rpc socket. + ''; + }; + + plugins = mkOption { + type = with types; listOf (either str package); + 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. + ''; + }; + + poolSettings = mkOption { + type = with types; attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; + description = '' + Options for ruTorrent's PHP pool. See the documentation on php-fpm.conf for details on configuration directives. + ''; + }; + + nginx = { + enable = mkOption { + type = types.bool; + 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. + ''; + }; + + exposeInsecureRPC2mount = mkOption { + 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. + ''; + }; + }; + }; + }; + + config = mkIf cfg.enable (mkMerge [ + { assertions = let + usedRpcPlugins = intersectLists cfg.plugins [ "httprpc" "rpc" ]; + in [ + { assertion = (length usedRpcPlugins < 2); + message = "Please specify only one of httprpc or rpc plugins"; + } + { assertion = !(length usedRpcPlugins > 0 && cfg.nginx.exposeInsecureRPC2mount); + message = "Please do not use exposeInsecureRPC2mount if you use one of httprpc or rpc plugins"; + } + ]; + + warnings = let + nginxVhostCfg = config.services.nginx.virtualHosts."${cfg.hostName}"; + in [] + ++ (optional (cfg.nginx.exposeInsecureRPC2mount && (nginxVhostCfg.basicAuth == {} || nginxVhostCfg.basicAuthFile == null )) '' + You are using exposeInsecureRPC2mount without using basic auth on the virtual host. The exposed rpc mount allow for remote command execution. + + Please make sure it is not accessible from the outside. + ''); + + systemd = { + services = { + rtorrent.path = getPluginDependencies rtorrentPluginDependencies cfg.plugins; + rutorrent-setup = let + rutorrentConfig = pkgs.writeText "rutorrent-config.php" '' + false, + 'proto' => 'http', // 'http' or 'https' + 'host' => 'PROXY_HOST_HERE', + 'port' => 3128 + ); + + @define('RPC_TIME_OUT', 5, true); // in seconds + + @define('LOG_RPC_CALLS', false, true); + @define('LOG_RPC_FAULTS', true, true); + + // for php + @define('PHP_USE_GZIP', false, true); + @define('PHP_GZIP_LEVEL', 2, true); + + $schedule_rand = 10; // rand for schedulers start, +0..X seconds + + $do_diagnostic = true; + $log_file = '${cfg.dataDir}/logs/errors.log'; // path to log file (comment or leave blank to disable logging) + + $saveUploadedTorrents = true; // Save uploaded torrents to profile/torrents directory or not + $overwriteUploadedTorrents = false; // Overwrite existing uploaded torrents in profile/torrents directory or make unique name + + $topDirectory = '/'; // Upper available directory. Absolute path with trail slash. + $forbidUserSettings = false; + + $scgi_port = 0; + $scgi_host = "unix://${cfg.rpcSocket}"; + + $XMLRPCMountPoint = "/RPC2"; // DO NOT DELETE THIS LINE!!! DO NOT COMMENT THIS LINE!!! + + $throttleMaxSpeed = 327625*1024; + + $pathToExternals = array( + "php" => "${pkgs.php}/bin/php", // Something like /usr/bin/php. If empty, will be found in PATH. + "curl" => "${pkgs.curl}/bin/curl", // Something like /usr/bin/curl. If empty, will be found in PATH. + "gzip" => "${pkgs.gzip}/bin/gzip", // Something like /usr/bin/gzip. If empty, will be found in PATH. + "id" => "${pkgs.coreutils}/bin/id", // Something like /usr/bin/id. If empty, will be found in PATH. + "stat" => "${pkgs.coreutils}/bin/stat", // Something like /usr/bin/stat. If empty, will be found in PATH. + "pgrep" => "${pkgs.procps}/bin/pgrep", // TODO why can't we use phpEnv.PATH + ); + + $localhosts = array( // list of local interfaces + "127.0.0.1", + "localhost", + ); + + $profilePath = '${cfg.dataDir}/share'; // Path to user profiles + $profileMask = 0770; // Mask for files and directory creation in user profiles. + // Both Webserver and rtorrent users must have read-write access to it. + // For example, if Webserver and rtorrent users are in the same group then the value may be 0770. + + $tempDirectory = null; // Temp directory. Absolute path with trail slash. If null, then autodetect will be used. + + $canUseXSendFile = false; // If true then use X-Sendfile feature if it exist + + $locale = "UTF8"; + ''; + in { + wantedBy = [ "multi-user.target" ]; + before = [ "phpfpm-rutorrent.service" ]; + script = '' + ln -sf ${pkgs.rutorrent}/{css,images,js,lang,index.html} ${cfg.dataDir}/ + mkdir -p ${cfg.dataDir}/{conf,logs,plugins} ${cfg.dataDir}/share/{settings,torrents,users} + ln -sf ${pkgs.rutorrent}/conf/{access.ini,plugins.ini} ${cfg.dataDir}/conf/ + ln -sf ${rutorrentConfig} ${cfg.dataDir}/conf/config.php + + cp -r ${pkgs.rutorrent}/php ${cfg.dataDir}/ + + ${optionalString (cfg.plugins != []) + ''cp -r ${concatMapStringsSep " " (p: "${pkgs.rutorrent}/plugins/${p}") cfg.plugins} ${cfg.dataDir}/plugins/''} + + chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}/{conf,share,logs,plugins} + chmod -R 755 ${cfg.dataDir}/{conf,share,logs,plugins} + ''; + serviceConfig.Type = "oneshot"; + }; + }; + + tmpfiles.rules = [ "d '${cfg.dataDir}' 0775 ${cfg.user} ${cfg.group} -" ]; + }; + + users.groups."${cfg.group}" = {}; + + users.users = { + "${cfg.user}" = { + home = cfg.dataDir; + group = cfg.group; + extraGroups = [ config.services.rtorrent.group ]; + description = "ruTorrent Daemon user"; + isSystemUser = true; + }; + + "${config.services.rtorrent.user}" = { + extraGroups = [ cfg.group ]; + }; + }; + } + + (mkIf cfg.nginx.enable (mkMerge [ + { services = { + phpfpm.pools.rutorrent = let + envPath = lib.makeBinPath (getPluginDependencies phpPluginDependencies cfg.plugins); + pool = { + user = cfg.user; + group = config.services.rtorrent.group; + settings = mapAttrs (name: mkDefault) { + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; + } // cfg.poolSettings; + }; + in if (envPath == "") then pool else pool // { phpEnv.PATH = envPath; }; + + nginx = { + enable = true; + virtualHosts = { + ${cfg.hostName} = { + root = cfg.dataDir; + locations = { + "~ [^/]\.php(/|$)" = { + extraConfig = '' + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + # Mitigate https://httpoxy.org/ vulnerabilities + fastcgi_param HTTP_PROXY ""; + + fastcgi_pass unix:${config.services.phpfpm.pools.rutorrent.socket}; + fastcgi_index index.php; + + include ${pkgs.nginx}/conf/fastcgi.conf; + ''; + }; + }; + }; + }; + }; + }; + } + + (mkIf cfg.nginx.exposeInsecureRPC2mount { + services.nginx.virtualHosts."${cfg.hostName}".locations."/RPC2" = { + extraConfig = '' + include ${pkgs.nginx}/conf/scgi_params; + scgi_pass unix:${cfg.rpcSocket}; + ''; + }; + + services.rtorrent.group = "nginx"; + }) + ])) + ]); +} diff --git a/nixos/modules/services/web-apps/stirling-pdf.nix b/nixos/modules/services/web-apps/stirling-pdf.nix index ea7d7fbf54e59..48fe744b60144 100644 --- a/nixos/modules/services/web-apps/stirling-pdf.nix +++ b/nixos/modules/services/web-apps/stirling-pdf.nix @@ -59,6 +59,7 @@ in pngquant tesseract python3Packages.weasyprint + ghostscript_headless ] ++ lib.optional (cfg.environment.INSTALL_BOOK_AND_ADVANCED_HTML_OPS or "false" == "true") calibre; diff --git a/nixos/modules/services/web-apps/weblate.nix b/nixos/modules/services/web-apps/weblate.nix index 4f13ad87ee03b..24995009b1189 100644 --- a/nixos/modules/services/web-apps/weblate.nix +++ b/nixos/modules/services/web-apps/weblate.nix @@ -132,6 +132,7 @@ let weblatePath = with pkgs; [ gitSVN + borgbackup #optional git-review diff --git a/nixos/modules/services/web-apps/windmill.nix b/nixos/modules/services/web-apps/windmill.nix index f5ec7f70e8772..2571740ebbf15 100644 --- a/nixos/modules/services/web-apps/windmill.nix +++ b/nixos/modules/services/web-apps/windmill.nix @@ -34,13 +34,24 @@ in description = "Database user."; }; + url = lib.mkOption { + type = lib.types.str; + default = "postgres://${config.services.windmill.database.name}?host=/var/run/postgresql"; + defaultText = lib.literalExpression '' + "postgres://\$\{config.services.windmill.database.name}?host=/var/run/postgresql"; + ''; + description = "Database url. Note that any secret here would be world-readable. Use `services.windmill.database.urlPath` unstead to include secrets in the url."; + }; + urlPath = lib.mkOption { - type = lib.types.path; + type = lib.types.nullOr lib.types.path; description = '' Path to the file containing the database url windmill should connect to. This is not deducted from database user and name as it might contain a secret ''; + default = null; example = "config.age.secrets.DATABASE_URL_FILE.path"; }; + createLocally = lib.mkOption { type = lib.types.bool; default = true; @@ -50,6 +61,10 @@ in baseUrl = lib.mkOption { type = lib.types.str; + default = "https://localhost:${toString config.services.windmill.serverPort}"; + defaultText = lib.literalExpression '' + "https://localhost:\$\{toString config.services.windmill.serverPort}"; + ''; description = '' The base url that windmill will be served on. ''; @@ -79,6 +94,7 @@ in systemd.services = let + useUrlPath = (cfg.database.urlPath != null); serviceConfig = { DynamicUser = true; # using the same user to simplify db connection @@ -86,10 +102,16 @@ in ExecStart = "${pkgs.windmill}/bin/windmill"; Restart = "always"; + } // lib.optionalAttrs useUrlPath { LoadCredential = [ "DATABASE_URL_FILE:${cfg.database.urlPath}" ]; }; + db_url_envs = lib.optionalAttrs useUrlPath { + DATABASE_URL_FILE = "%d/DATABASE_URL_FILE"; + } // lib.optionalAttrs (!useUrlPath) { + DATABASE_URL = cfg.database.url; + }; in { @@ -132,12 +154,11 @@ EOF serviceConfig = serviceConfig // { StateDirectory = "windmill";}; environment = { - DATABASE_URL_FILE = "%d/DATABASE_URL_FILE"; PORT = builtins.toString cfg.serverPort; WM_BASE_URL = cfg.baseUrl; RUST_LOG = cfg.logLevel; MODE = "server"; - }; + } // db_url_envs; }; windmill-worker = { @@ -148,13 +169,12 @@ EOF serviceConfig = serviceConfig // { StateDirectory = "windmill-worker";}; environment = { - DATABASE_URL_FILE = "%d/DATABASE_URL_FILE"; WM_BASE_URL = cfg.baseUrl; RUST_LOG = cfg.logLevel; MODE = "worker"; WORKER_GROUP = "default"; KEEP_JOB_DIR = "false"; - }; + } // db_url_envs; }; windmill-worker-native = { @@ -165,12 +185,11 @@ EOF serviceConfig = serviceConfig // { StateDirectory = "windmill-worker-native";}; environment = { - DATABASE_URL_FILE = "%d/DATABASE_URL_FILE"; WM_BASE_URL = cfg.baseUrl; RUST_LOG = cfg.logLevel; MODE = "worker"; WORKER_GROUP = "native"; - }; + } // db_url_envs; }; }; }; diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index ea771c358814d..c0863a3fe7a90 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -75,13 +75,16 @@ let mkPhpValue = v: let isHasAttr = s: isAttrs v && hasAttr s v; + # "you're escaped" -> "'you\'re escaped'" + # https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single + toPhpString = s: "'${escape [ "'" "\\" ] s}'"; in - if isString v then escapeShellArg v + if isString v then toPhpString v # NOTE: If any value contains a , (comma) this will not get escaped - else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v) + else if isList v && any lib.strings.isCoercibleToString v then toPhpString (concatMapStringsSep "," toString v) else if isInt v then toString v else if isBool v then boolToString v - else if isHasAttr "_file" then "trim(file_get_contents(${lib.escapeShellArg v._file}))" + else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString v._file}))" else if isHasAttr "_raw" then v._raw else abort "The Wordpress config value ${lib.generators.toPretty {} v} can not be encoded." ; @@ -151,8 +154,8 @@ let (l: warn "setting this option with a list is deprecated" listToAttrs (map (p: nameValuePair (p.name or (throw "${p} does not have a name")) p) l)) (attrsOf path); - default = { inherit (pkgs.wordpressPackages.themes) twentytwentythree; }; - defaultText = literalExpression "{ inherit (pkgs.wordpressPackages.themes) twentytwentythree; }"; + default = { inherit (pkgs.wordpressPackages.themes) twentytwentyfour; }; + defaultText = literalExpression "{ inherit (pkgs.wordpressPackages.themes) twentytwentyfour; }"; description = '' Path(s) to respective theme(s) which are copied from the 'theme' directory. diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 59c0ab13de19b..496705beff7bb 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -356,6 +356,7 @@ in startLimitIntervalSec = 14400; startLimitBurst = 10; reloadTriggers = optional cfg.enableReload cfg.configFile; + restartTriggers = optional (! cfg.enableReload) cfg.configFile; serviceConfig = let runOptions = ''--config ${configPath} ${optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}"}''; diff --git a/nixos/modules/services/web-servers/darkhttpd.nix b/nixos/modules/services/web-servers/darkhttpd.nix index f6b693139a1ef..ab647b11de5d1 100644 --- a/nixos/modules/services/web-servers/darkhttpd.nix +++ b/nixos/modules/services/web-servers/darkhttpd.nix @@ -1,11 +1,11 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkIf mkOption optional; + inherit (lib.types) path bool listOf str port; cfg = config.services.darkhttpd; - args = concatStringsSep " " ([ + args = lib.concatStringsSep " " ([ cfg.rootDir "--port ${toString cfg.port}" "--addr ${cfg.address}" @@ -14,12 +14,12 @@ let ++ optional config.networking.enableIPv6 "--ipv6"); in { - options.services.darkhttpd = with types; { - enable = mkEnableOption "DarkHTTPd web server"; + options.services.darkhttpd = { + enable = lib.mkEnableOption "DarkHTTPd web server"; port = mkOption { default = 80; - type = types.port; + type = port; description = '' Port to listen on. Pass 0 to let the system choose any free port for you. diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 7cf71ff6ff06f..05c92b1a387b7 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; @@ -6,11 +11,18 @@ let cfg = config.services.garage; toml = pkgs.formats.toml { }; configFile = toml.generate "garage.toml" cfg.settings; + + anyHasPrefix = + prefix: strOrList: + if isString strOrList then + hasPrefix prefix strOrList + else + any ({ path, ... }: hasPrefix prefix path) strOrList; in { meta = { doc = ./garage.md; - maintainers = [ ]; + maintainers = [ maintainers.mjm ]; }; options.services.garage = { @@ -20,7 +32,9 @@ in type = types.attrsOf types.str; description = "Extra environment variables to pass to the Garage server."; default = { }; - example = { RUST_BACKTRACE = "yes"; }; + example = { + RUST_BACKTRACE = "yes"; + }; }; environmentFile = mkOption { @@ -30,7 +44,13 @@ in }; logLevel = mkOption { - type = types.enum ([ "error" "warn" "info" "debug" "trace" ]); + type = types.enum ([ + "error" + "warn" + "info" + "debug" + "trace" + ]); default = "info"; example = "debug"; description = "Garage log level, see for examples."; @@ -49,10 +69,12 @@ in data_dir = mkOption { default = "/var/lib/garage/data"; - example = [ { - path = "/var/lib/garage/data"; - capacity = "2T"; - } ]; + example = [ + { + path = "/var/lib/garage/data"; + capacity = "2T"; + } + ]; type = with types; either path (listOf attrs); description = '' The directory in which Garage will store the data blocks of objects. This folder can be placed on an HDD. @@ -83,7 +105,9 @@ in # These assertions can be removed in NixOS 24.11, when all users have been # warned once. { - assertion = (cfg.settings ? replication_factor || cfg.settings ? replication_mode) || lib.versionOlder cfg.package.version "1.0.0"; + assertion = + (cfg.settings ? replication_factor || cfg.settings ? replication_mode) + || lib.versionOlder cfg.package.version "1.0.0"; message = '' Garage 1.0.0 requires an explicit replication factor to be set. Please set replication_factor to 1 explicitly to preserve the previous behavior. @@ -129,14 +153,25 @@ in systemd.services.garage = { description = "Garage Object Storage (S3 compatible)"; - after = [ "network.target" "network-online.target" ]; - wants = [ "network.target" "network-online.target" ]; + after = [ + "network.target" + "network-online.target" + ]; + wants = [ + "network.target" + "network-online.target" + ]; wantedBy = [ "multi-user.target" ]; - restartTriggers = [ configFile ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile); + restartTriggers = [ + configFile + ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile); serviceConfig = { ExecStart = "${cfg.package}/bin/garage server"; - StateDirectory = mkIf (hasPrefix "/var/lib/garage" cfg.settings.data_dir || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir) "garage"; + StateDirectory = mkIf ( + anyHasPrefix "/var/lib/garage" cfg.settings.data_dir + || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir + ) "garage"; DynamicUser = lib.mkDefault true; ProtectHome = true; NoNewPrivileges = true; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index b5ff630a4d484..a7efd69adac39 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -129,12 +129,9 @@ let '')); commonHttpConfig = '' - # Load mime types. + # Load mime types and configure maximum size of the types hash tables. include ${cfg.defaultMimeTypes}; - # When recommendedOptimisation is disabled nginx fails to start because the mailmap mime.types database - # contains 1026 entries and the default is only 1024. Setting to a higher number to remove the need to - # overwrite it because nginx does not allow duplicated settings. - types_hash_max_size 4096; + types_hash_max_size ${toString cfg.typesHashMaxSize}; include ${cfg.package}/conf/fastcgi.conf; include ${cfg.package}/conf/uwsgi_params; @@ -896,6 +893,19 @@ in ''; }; + typesHashMaxSize = mkOption { + type = types.ints.positive; + default = if cfg.defaultMimeTypes == "${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024; + defaultText = literalExpression ''if cfg.defaultMimeTypes == "''${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024''; + description = '' + Sets the maximum size of the types hash tables (`types_hash_max_size`). + It is recommended that the minimum size possible size is used. + If {option}`recommendedOptimisation` is disabled, nginx would otherwise + fail to start since the mailmap `mime.types` database has more entries + than the nginx default value 1024. + ''; + }; + proxyCachePath = mkOption { type = types.attrsOf (types.submodule ({ ... }: { options = { diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index ca77a0838f550..2312fab2702be 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -239,8 +239,8 @@ in { daemonize = false; }; - systemd.slices.phpfpm = { - description = "PHP FastCGI Process manager pools slice"; + systemd.slices.system-phpfpm = { + description = "PHP FastCGI Process Manager Slice"; }; systemd.targets.phpfpm = { @@ -258,7 +258,7 @@ in { cfgFile = fpmCfgFile pool poolOpts; iniFile = phpIni poolOpts; in { - Slice = "phpfpm.slice"; + Slice = "system-phpfpm.slice"; PrivateDevices = true; PrivateTmp = true; ProtectSystem = "full"; diff --git a/nixos/modules/services/web-servers/stargazer.nix b/nixos/modules/services/web-servers/stargazer.nix index da39c8172c8bf..249fd30bf6001 100644 --- a/nixos/modules/services/web-servers/stargazer.nix +++ b/nixos/modules/services/web-servers/stargazer.nix @@ -83,6 +83,21 @@ in ''; }; + allowCgiUser = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + When enabled, the stargazer process will be given `CAP_SETGID` + and `CAP_SETUID` so that it can run cgi processes as a different + user. This is required if the `cgi-user` option is used for a route. + Note that these capabilities could allow privilege escalation so be + careful. For that reason, this is disabled by default. + + You will need to create the user mentioned `cgi-user` if it does not + already exist. + ''; + }; + store = lib.mkOption { type = lib.types.path; default = /var/lib/gemini/certs; @@ -206,6 +221,48 @@ in # User and group User = cfg.user; Group = cfg.group; + AmbientCapabilities = lib.mkIf cfg.allowCgiUser [ + "CAP_SETGID" + "CAP_SETUID" + ]; + + # Hardening + UMask = "0077"; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "full"; + ProtectClock = true; + ProtectHostname = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + PrivateDevices = true; + NoNewPrivileges = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + MemoryDenyWriteExecute = true; + LockPersonality = true; + RestrictRealtime = true; + RemoveIPC = true; + CapabilityBoundingSet = [ + "~CAP_SYS_PTRACE" + "~CAP_SYS_ADMIN" + "~CAP_SETPCAP" + "~CAP_SYS_TIME" + "~CAP_SYS_PACCT" + "~CAP_SYS_TTY_CONFIG " + "~CAP_SYS_CHROOT" + "~CAP_SYS_BOOT" + "~CAP_NET_ADMIN" + ] ++ lib.lists.optional (!cfg.allowCgiUser) [ + "~CAP_SETGID" + "~CAP_SETUID" + ]; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete" ] + ++ lib.lists.optional (!cfg.allowCgiUser) [ "@privileged @setuid" ]; }; }; diff --git a/nixos/modules/services/web-servers/ttyd.nix b/nixos/modules/services/web-servers/ttyd.nix index 14361df2bb663..e3cf92e179138 100644 --- a/nixos/modules/services/web-servers/ttyd.nix +++ b/nixos/modules/services/web-servers/ttyd.nix @@ -7,8 +7,6 @@ let inherit (lib) optionals types - concatLists - mapAttrsToList mkOption ; @@ -17,16 +15,17 @@ let ++ optionals (cfg.socket != null) [ "--interface" cfg.socket ] ++ optionals (cfg.interface != null) [ "--interface" cfg.interface ] ++ [ "--signal" (toString cfg.signal) ] - ++ (concatLists (mapAttrsToList (_k: _v: [ "--client-option" "${_k}=${_v}" ]) cfg.clientOptions)) + ++ (lib.concatLists (lib.mapAttrsToList (_k: _v: [ "--client-option" "${_k}=${_v}" ]) cfg.clientOptions)) ++ [ "--terminal-type" cfg.terminalType ] ++ optionals cfg.checkOrigin [ "--check-origin" ] ++ optionals cfg.writeable [ "--writable" ] # the typo is correct ++ [ "--max-clients" (toString cfg.maxClients) ] ++ optionals (cfg.indexFile != null) [ "--index" cfg.indexFile ] ++ optionals cfg.enableIPv6 [ "--ipv6" ] - ++ optionals cfg.enableSSL [ "--ssl-cert" cfg.certFile - "--ssl-key" cfg.keyFile - "--ssl-ca" cfg.caFile ] + ++ optionals cfg.enableSSL [ "--ssl" + "--ssl-cert" cfg.certFile + "--ssl-key" cfg.keyFile ] + ++ optionals ( cfg.enableSSL && cfg.caFile != null ) [ "--ssl-ca" cfg.caFile ] ++ [ "--debug" (toString cfg.logLevel) ]; in @@ -197,8 +196,8 @@ in assertions = [ { assertion = cfg.enableSSL - -> cfg.certFile != null && cfg.keyFile != null && cfg.caFile != null; - message = "SSL is enabled for ttyd, but no certFile, keyFile or caFile has been specified."; } + -> cfg.certFile != null && cfg.keyFile != null; + message = "SSL is enabled for ttyd, but no certFile or keyFile has been specified."; } { assertion = cfg.writeable != null; message = "services.ttyd.writeable must be set"; } { assertion = ! (cfg.interface != null && cfg.socket != null); diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 8e36b8cc39479..42a828bcbcbc1 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -204,7 +204,6 @@ in { programs.nm-applet.indicator = true; # Budgie uses AppIndicators. hardware.bluetooth.enable = mkDefault true; # for Budgie's Status Indicator and BCC's Bluetooth panel. - hardware.pulseaudio.enable = mkDefault true; # for Budgie's Status Indicator and BCC's Sound panel. xdg.portal.enable = mkDefault true; # for BCC's Applications panel. xdg.portal.extraPortals = with pkgs; [ diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 70fa4f0f3a5a4..7f824680b92e3 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -97,7 +97,6 @@ in # Default services services.blueman.enable = mkDefault (notExcluded pkgs.blueman); hardware.bluetooth.enable = mkDefault true; - hardware.pulseaudio.enable = mkDefault true; security.polkit.enable = true; services.accounts-daemon.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); @@ -173,7 +172,6 @@ in ] ++ utils.removePackagesByName [ # accessibility onboard - orca # theme sound-theme-freedesktop @@ -194,12 +192,11 @@ in xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-xapp - (pkgs.xdg-desktop-portal-gtk.override { - # Do not build portals that we already have. - buildPortalsInGnome = false; - }) + pkgs.xdg-desktop-portal-gtk ]; + services.orca.enable = mkDefault (notExcluded pkgs.orca); + xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ]; # Override GSettings schemas diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index 1151178a8824e..4829990acc4f1 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -47,7 +47,6 @@ in ''; hardware.bluetooth.enable = mkDefault true; - hardware.pulseaudio.enable = mkDefault true; security.polkit.enable = true; services.deepin.dde-daemon.enable = mkForce true; @@ -75,9 +74,7 @@ in xdg.icons.enable = true; xdg.portal.enable = mkDefault true; xdg.portal.extraPortals = mkDefault [ - (pkgs.xdg-desktop-portal-gtk.override { - buildPortalsInGnome = false; - }) + pkgs.xdg-desktop-portal-gtk ]; # https://github.com/NixOS/nixpkgs/pull/247766#issuecomment-1722839259 @@ -156,8 +153,6 @@ in deepin-desktop-base startdde - # TODO: should remove dde-dock, but dde-shell still need it's dconfig - dde-dock dde-shell dde-launchpad dde-session-ui @@ -178,6 +173,8 @@ in dde-application-manager deepin-service-manager dde-grand-search + dde-api-proxy + dde-tray-loader ]; optionalPackages = [ onboard # dde-dock plugin @@ -217,6 +214,7 @@ in dde-application-manager deepin-service-manager dde-grand-search + dde-api-proxy ]; systemd.packages = with pkgs.deepin; [ @@ -231,6 +229,7 @@ in dde-session dde-application-manager deepin-service-manager + dde-api-proxy ]; }; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome.md b/nixos/modules/services/x11/desktop-managers/gnome.md index 9943f138dc60c..6641bc9ff43be 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.md +++ b/nixos/modules/services/x11/desktop-managers/gnome.md @@ -167,7 +167,7 @@ You can use `dconf-editor` tool to explore which GSettings you can set. extraGSettingsOverridePackages = [ pkgs.gsettings-desktop-schemas # for org.gnome.desktop - pkgs.gnome.gnome-shell # for org.gnome.shell + pkgs.gnome-shell # for org.gnome.shell ]; }; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 678ba1b12307d..372300f349502 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -108,7 +108,7 @@ in favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ] ''' ''; - description = "List of desktop files to put as favorite apps into gnome-shell. These need to be installed somehow globally."; + description = "List of desktop files to put as favorite apps into pkgs.gnome-shell. These need to be installed somehow globally."; }; extraGSettingsOverrides = mkOption { @@ -123,7 +123,7 @@ in description = "List of packages for which gsettings are overridden."; }; - debug = mkEnableOption "gnome-session debug messages"; + debug = mkEnableOption "pkgs.gnome-session debug messages"; flashback = { enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity"; @@ -162,11 +162,11 @@ in }; panelModulePackages = mkOption { - default = [ pkgs.gnome.gnome-applets ]; - defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]"; + default = [ pkgs.gnome-applets ]; + defaultText = literalExpression "[ pkgs.gnome-applets ]"; type = types.listOf types.package; description = '' - Packages containing modules that should be made available to `gnome-panel` (usually for applets). + Packages containing modules that should be made available to `pkgs.gnome-panel` (usually for applets). If you're packaging something to use here, please install the modules in `$out/lib/gnome-panel/modules`. ''; @@ -196,7 +196,7 @@ in services.gnome.core-shell.enable = true; services.gnome.core-utilities.enable = mkDefault true; - services.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ]; + services.displayManager.sessionPackages = [ pkgs.gnome-session.sessions ]; environment.extraInit = '' ${lib.concatMapStrings (p: '' @@ -228,7 +228,7 @@ in assert (lib.assertMsg namesAreUnique "Flashback WM names must be unique."); map (wm: - pkgs.gnome.gnome-flashback.mkSessionForWm { + pkgs.gnome-flashback.mkSessionForWm { inherit (wm) wmName wmLabel wmCommand; } ) flashbackWms; @@ -237,25 +237,24 @@ in enableGnomeKeyring = true; }; - systemd.packages = with pkgs.gnome; [ - gnome-flashback - ] ++ map gnome-flashback.mkSystemdTargetForWm flashbackWms; + systemd.packages = [ + pkgs.gnome-flashback + ] ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms; - environment.systemPackages = with pkgs.gnome; [ - gnome-flashback - (gnome-panel-with-modules.override { + environment.systemPackages = [ + pkgs.gnome-flashback + (pkgs.gnome-panel-with-modules.override { panelModulePackages = cfg.flashback.panelModulePackages; }) ] # For /share/applications/${wmName}.desktop - ++ (map (wm: gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms) - # For /share/gnome-session/sessions/gnome-flashback-${wmName}.session - ++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms); + ++ (map (wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms) + # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session + ++ (map (wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms); }) (lib.mkIf serviceCfg.core-os-services.enable { hardware.bluetooth.enable = mkDefault true; - hardware.pulseaudio.enable = mkDefault true; programs.dconf.enable = true; security.polkit.enable = true; services.accounts-daemon.enable = true; @@ -282,12 +281,9 @@ in xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gnome - (pkgs.xdg-desktop-portal-gtk.override { - # Do not build portals that we already have. - buildPortalsInGnome = false; - }) + pkgs.xdg-desktop-portal-gtk ]; - xdg.portal.configPackages = mkDefault [ pkgs.gnome.gnome-session ]; + xdg.portal.configPackages = mkDefault [ pkgs.gnome-session ]; networking.networkmanager.enable = mkDefault true; @@ -309,7 +305,7 @@ in services.xserver.desktopManager.gnome.sessionPath = let mandatoryPackages = [ - pkgs.gnome.gnome-shell + pkgs.gnome-shell ]; optionalPackages = [ pkgs.gnome-shell-extensions @@ -329,15 +325,15 @@ in services.gvfs.enable = true; services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (mkDefault true)); - systemd.packages = with pkgs.gnome; [ - gnome-session - gnome-shell + systemd.packages = [ + pkgs.gnome-session + pkgs.gnome-shell ]; - services.udev.packages = with pkgs.gnome; [ + services.udev.packages = [ # Force enable KMS modifiers for devices that require them. - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 - mutter + # https://gitlab.gnome.org/GNOME/pkgs.mutter/-/merge_requests/1443 + pkgs.mutter ]; services.avahi.enable = mkDefault true; @@ -358,6 +354,8 @@ in isSystem = true; }; + services.orca.enable = notExcluded pkgs.orca; + fonts.packages = with pkgs; [ cantarell-fonts dejavu_fonts @@ -368,20 +366,19 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst environment.systemPackages = let - mandatoryPackages = with pkgs.gnome; [ - gnome-shell + mandatoryPackages = [ + pkgs.gnome-shell ]; - optionalPackages = with pkgs.gnome; [ + optionalPackages = [ pkgs.adwaita-icon-theme nixos-background-info pkgs.gnome-backgrounds - gnome-bluetooth + pkgs.gnome-bluetooth pkgs.gnome-color-manager - gnome-control-center + pkgs.gnome-control-center pkgs.gnome-shell-extensions pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. pkgs.gnome-user-docs - pkgs.orca pkgs.glib # for gsettings program pkgs.gnome-menus pkgs.gtk3.out # for gtk-launch program diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index a401af9b7e18c..1ab898d35bc2a 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -130,7 +130,6 @@ in # Default services hardware.bluetooth.enable = mkDefault true; - hardware.pulseaudio.enable = mkDefault true; security.polkit.enable = true; services.accounts-daemon.enable = true; services.bamf.enable = true; @@ -176,8 +175,9 @@ in # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 pkgs.pantheon.mutter ]; + services.orca.enable = mkDefault (notExcluded pkgs.orca); systemd.packages = with pkgs; [ - gnome.gnome-session + gnome-session pantheon.gala pantheon.gnome-settings-daemon pantheon.elementary-session-settings @@ -212,7 +212,6 @@ in adwaita-icon-theme gtk3.out # for gtk-launch program onboard - orca # elementary/greeter#668 sound-theme-freedesktop xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ]) ++ (with pkgs.pantheon; [ diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix index 12b39f927c012..e16eace5407ca 100644 --- a/nixos/modules/services/x11/desktop-managers/phosh.nix +++ b/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.xserver.desktopManager.phosh; @@ -21,29 +18,29 @@ let }; }; - phocConfigType = types.submodule { + phocConfigType = lib.types.submodule { options = { - xwayland = mkOption { + xwayland = lib.mkOption { description = '' Whether to enable XWayland support. To start XWayland immediately, use `immediate`. ''; - type = types.enum [ "true" "false" "immediate" ]; + type = lib.types.enum [ "true" "false" "immediate" ]; default = "false"; }; - cursorTheme = mkOption { + cursorTheme = lib.mkOption { description = '' Cursor theme to use in Phosh. ''; - type = types.str; + type = lib.types.str; default = "default"; }; - outputs = mkOption { + outputs = lib.mkOption { description = '' Output configurations. ''; - type = types.attrsOf phocOutputType; + type = lib.types.attrsOf phocOutputType; default = { DSI-1 = { scale = 2; @@ -53,34 +50,34 @@ let }; }; - phocOutputType = types.submodule { + phocOutputType = lib.types.submodule { options = { - modeline = mkOption { + modeline = lib.mkOption { description = '' One or more modelines. ''; - type = types.either types.str (types.listOf types.str); + type = lib.types.either lib.types.str (lib.types.listOf lib.types.str); default = []; example = [ "87.25 720 776 848 976 1440 1443 1453 1493 -hsync +vsync" "65.13 768 816 896 1024 1024 1025 1028 1060 -HSync +VSync" ]; }; - mode = mkOption { + mode = lib.mkOption { description = '' Default video mode. ''; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; default = null; example = "768x1024"; }; - scale = mkOption { + scale = lib.mkOption { description = '' Display scaling factor. ''; - type = types.nullOr ( - types.addCheck - (types.either types.int types.float) + type = lib.types.nullOr ( + lib.types.addCheck + (lib.types.either lib.types.int lib.types.float) (x : x > 0) ) // { description = "null or positive integer or float"; @@ -88,11 +85,11 @@ let default = null; example = 2; }; - rotate = mkOption { + rotate = lib.mkOption { description = '' Screen transformation. ''; - type = types.enum [ + type = lib.types.enum [ "90" "180" "270" "flipped" "flipped-90" "flipped-180" "flipped-270" null ]; default = null; @@ -100,7 +97,7 @@ let }; }; - optionalKV = k: v: optionalString (v != null) "${k} = ${builtins.toString v}"; + optionalKV = k: v: lib.optionalString (v != null) "${k} = ${builtins.toString v}"; renderPhocOutput = name: output: let modelines = if builtins.isList output.modeline @@ -109,18 +106,18 @@ let renderModeline = l: "modeline = ${l}"; in '' [output:${name}] - ${concatStringsSep "\n" (map renderModeline modelines)} + ${lib.concatStringsSep "\n" (map renderModeline modelines)} ${optionalKV "mode" output.mode} ${optionalKV "scale" output.scale} ${optionalKV "rotate" output.rotate} ''; renderPhocConfig = phoc: let - outputs = mapAttrsToList renderPhocOutput phoc.outputs; + outputs = lib.mapAttrsToList renderPhocOutput phoc.outputs; in '' [core] xwayland = ${phoc.xwayland} - ${concatStringsSep "\n" outputs} + ${lib.concatStringsSep "\n" outputs} [cursor] theme = ${phoc.cursorTheme} ''; @@ -129,37 +126,37 @@ in { options = { services.xserver.desktopManager.phosh = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable the Phone Shell."; }; - package = mkPackageOption pkgs "phosh" { }; + package = lib.mkPackageOption pkgs "phosh" { }; - user = mkOption { + user = lib.mkOption { description = "The user to run the Phosh service."; - type = types.str; + type = lib.types.str; example = "alice"; }; - group = mkOption { + group = lib.mkOption { description = "The group to run the Phosh service."; - type = types.str; + type = lib.types.str; example = "users"; }; - phocConfig = mkOption { + phocConfig = lib.mkOption { description = '' Configurations for the Phoc compositor. ''; - type = types.oneOf [ types.lines types.path phocConfigType ]; + type = lib.types.oneOf [ lib.types.lines lib.types.path phocConfigType ]; default = {}; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.defaultUnit = "graphical.target"; # Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service systemd.services.phosh = { @@ -216,7 +213,7 @@ in security.pam.services.phosh = {}; - hardware.graphics.enable = mkDefault true; + hardware.graphics.enable = lib.mkDefault true; services.gnome.core-shell.enable = true; services.gnome.core-os-services.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 0092a1f3693b9..90a1596d57e69 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -357,6 +357,9 @@ in pkgs.media-player-info ]; + # Enable screen reader by default + services.orca.enable = mkDefault true; + services.displayManager.sddm = { theme = mkDefault "breeze"; }; @@ -380,7 +383,6 @@ in xdg.portal.extraPortals = [ pkgs.plasma5Packages.xdg-desktop-portal-kde ]; xdg.portal.configPackages = mkDefault [ pkgs.plasma5Packages.xdg-desktop-portal-kde ]; # xdg-desktop-portal-kde expects PipeWire to be running. - # This does not, by default, replace PulseAudio. services.pipewire.enable = mkDefault true; # Update the start menu for each user that is currently logged in @@ -476,7 +478,7 @@ in { # The user interface breaks without pulse assertion = config.hardware.pulseaudio.enable || (config.services.pipewire.enable && config.services.pipewire.pulse.enable); - message = "Plasma Mobile requires pulseaudio."; + message = "Plasma Mobile requires a Pulseaudio compatible sound server."; } ]; @@ -512,7 +514,6 @@ in # The following services are needed or the UI is broken. hardware.bluetooth.enable = true; - hardware.pulseaudio.enable = true; networking.networkmanager.enable = true; # Required for autorotate hardware.sensor.iio.enable = lib.mkDefault true; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 98d3555ccbc5e..8810b5f8c8b0e 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -80,7 +80,7 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = utils.removePackagesByName (with pkgs.xfce // pkgs; [ + environment.systemPackages = utils.removePackagesByName (with pkgs; [ glib # for gsettings gtk3.out # gtk-update-icon-cache @@ -88,7 +88,7 @@ in adwaita-icon-theme hicolor-icon-theme tango-icon-theme - xfce4-icon-theme + xfce.xfce4-icon-theme desktop-file-utils shared-mime-info # for update-mime-database @@ -99,37 +99,37 @@ in # Needed by Xfce's xinitrc script xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ - exo - garcon - libxfce4ui - - mousepad - parole - ristretto - xfce4-appfinder - xfce4-notifyd - xfce4-screenshooter - xfce4-session - xfce4-settings - xfce4-taskmanager - xfce4-terminal + xfce.exo + xfce.garcon + xfce.libxfce4ui + + xfce.mousepad + xfce.parole + xfce.ristretto + xfce.xfce4-appfinder + xfce.xfce4-notifyd + xfce.xfce4-screenshooter + xfce.xfce4-session + xfce.xfce4-settings + xfce.xfce4-taskmanager + xfce.xfce4-terminal ] # TODO: NetworkManager doesn't belong here ++ optional config.networking.networkmanager.enable networkmanagerapplet - ++ optional config.powerManagement.enable xfce4-power-manager + ++ optional config.powerManagement.enable xfce.xfce4-power-manager ++ optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [ pavucontrol # volume up/down keys support: # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse # but can only be used with xfce4-panel, so for no-desktop usage we still include # xfce4-volumed-pulse - (if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin) + (if cfg.noDesktop then xfce.xfce4-volumed-pulse else xfce.xfce4-pulseaudio-plugin) ] ++ optionals cfg.enableXfwm [ - xfwm4 - xfwm4-themes + xfce.xfwm4 + xfce.xfwm4-themes ] ++ optionals (!cfg.noDesktop) [ - xfce4-panel - xfdesktop - ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages; + xfce.xfce4-panel + xfce.xfdesktop + ] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages; programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2; programs.xfconf.enable = true; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index c4987f1b63223..c454b110776b8 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -153,7 +153,7 @@ in XDG_DATA_DIRS = lib.makeSearchPath "share" [ gdm # for gnome-login.session config.services.displayManager.sessionData.desktops - pkgs.gnome.gnome-control-center # for accessibility icon + pkgs.gnome-control-center # for accessibility icon pkgs.adwaita-icon-theme pkgs.hicolor-icon-theme # empty icon theme as a base ]; @@ -181,7 +181,11 @@ in ]; # Otherwise GDM will not be able to start correctly and display Wayland sessions - systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ]; + systemd.packages = with pkgs.gnome; [ + gdm + pkgs.gnome-session + pkgs.gnome-shell + ]; environment.systemPackages = [ pkgs.adwaita-icon-theme ]; # We dont use the upstream gdm service @@ -232,7 +236,7 @@ in EnvironmentFile = "-/etc/locale.conf"; }; - systemd.services.display-manager.path = [ pkgs.gnome.gnome-session ]; + systemd.services.display-manager.path = [ pkgs.gnome-session ]; # Allow choosing an user account services.accounts-daemon.enable = true; diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 195ad31b1e56c..140d453589b86 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -170,7 +170,7 @@ in apply = set: { script = '' - unset PATH + export PATH= for i in ${toString path}; do PATH=$PATH:$i/bin:$i/sbin done diff --git a/nixos/modules/system/activation/no-clone.nix b/nixos/modules/system/activation/no-clone.nix index 912420347dc0f..32ff54688bd9e 100644 --- a/nixos/modules/system/activation/no-clone.nix +++ b/nixos/modules/system/activation/no-clone.nix @@ -5,4 +5,5 @@ with lib; { boot.loader.grub.device = mkOverride 0 "nodev"; specialisation = mkOverride 0 {}; + isSpecialisation = mkOverride 0 true; } diff --git a/nixos/modules/system/activation/specialisation.nix b/nixos/modules/system/activation/specialisation.nix index fdab287802fa5..41491b67ff039 100644 --- a/nixos/modules/system/activation/specialisation.nix +++ b/nixos/modules/system/activation/specialisation.nix @@ -23,6 +23,12 @@ let in { options = { + isSpecialisation = mkOption { + type = lib.types.bool; + internal = true; + default = false; + description = "Whether this system is a specialisation of another."; + }; specialisation = mkOption { default = { }; diff --git a/nixos/modules/system/activation/switchable-system.nix b/nixos/modules/system/activation/switchable-system.nix index d70fefd0920b4..883584a32ce21 100644 --- a/nixos/modules/system/activation/switchable-system.nix +++ b/nixos/modules/system/activation/switchable-system.nix @@ -4,14 +4,6 @@ let perlWrapped = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]); - description = extra: '' - Whether to include the capability to switch configurations. - - Disabling this makes the system unable to be reconfigured via `nixos-rebuild`. - - ${extra} - ''; - in { @@ -20,7 +12,11 @@ in enable = lib.mkOption { type = lib.types.bool; default = true; - description = description '' + description = '' + Whether to include the capability to switch configurations. + + Disabling this makes the system unable to be reconfigured via `nixos-rebuild`. + This is good for image based appliances where updates are handled outside the image. Reducing features makes the image lighter and slightly more secure. @@ -29,23 +25,17 @@ in enableNg = lib.mkOption { type = lib.types.bool; - default = false; - description = description '' - Whether to use `switch-to-configuration-ng`, an experimental - re-implementation of `switch-to-configuration` with the goal of - replacing the original. + default = config.system.switch.enable; + defaultText = lib.literalExpression "config.system.switch.enable"; + description = '' + Whether to use `switch-to-configuration-ng`, the Rust-based + re-implementation of the original Perl `switch-to-configuration`. ''; }; }; config = lib.mkMerge [ - { - assertions = [{ - assertion = with config.system.switch; enable -> !enableNg; - message = "Only one of system.switch.enable and system.switch.enableNg may be enabled at a time"; - }]; - } - (lib.mkIf config.system.switch.enable { + (lib.mkIf (config.system.switch.enable && !config.system.switch.enableNg) { system.activatableSystemBuilderCommands = '' mkdir $out/bin substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \ diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index ed0ece19f2fa2..1b0a62c2e8e7d 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -68,9 +68,19 @@ let else showWarnings config.warnings baseSystem; # Replace runtime dependencies - system = foldr ({ oldDependency, newDependency }: drv: - pkgs.replaceDependency { inherit oldDependency newDependency drv; } - ) baseSystemAssertWarn config.system.replaceRuntimeDependencies; + system = let inherit (config.system.replaceDependencies) replacements cutoffPackages; in + if replacements == [] then + # Avoid IFD if possible, by sidestepping replaceDependencies if no replacements are specified. + baseSystemAssertWarn + else + (pkgs.replaceDependencies.override { + replaceDirectDependencies = pkgs.replaceDirectDependencies.override { + nix = config.nix.package; + }; + }) { + drv = baseSystemAssertWarn; + inherit replacements cutoffPackages; + }; systemWithBuildDeps = system.overrideAttrs (o: { systemBuildClosure = pkgs.closureInfo { rootPaths = [ system.drvPath ]; }; @@ -87,6 +97,7 @@ in (mkRemovedOptionModule [ "nesting" "clone" ] "Use `specialisation.«name» = { inheritParentConfig = true; configuration = { ... }; }` instead.") (mkRemovedOptionModule [ "nesting" "children" ] "Use `specialisation.«name».configuration = { ... }` instead.") (mkRenamedOptionModule [ "system" "forbiddenDependenciesRegex" ] [ "system" "forbiddenDependenciesRegexes" ]) + (mkRenamedOptionModule [ "system" "replaceRuntimeDependencies" ] [ "system" "replaceDependencies" "replacements" ]) ]; options = { @@ -205,31 +216,47 @@ in ''; }; - system.replaceRuntimeDependencies = mkOption { - default = []; - example = lib.literalExpression "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { }; }) ]"; - type = types.listOf (types.submodule ( - { ... }: { - options.original = mkOption { - type = types.package; - description = "The original package to override."; - }; - - options.replacement = mkOption { - type = types.package; - description = "The replacement package."; - }; - }) - ); - apply = map ({ original, replacement, ... }: { - oldDependency = original; - newDependency = replacement; - }); - description = '' - List of packages to override without doing a full rebuild. - The original derivation and replacement derivation must have the same - name length, and ideally should have close-to-identical directory layout. - ''; + system.replaceDependencies = { + replacements = mkOption { + default = []; + example = lib.literalExpression "[ ({ oldDependency = pkgs.openssl; newDependency = pkgs.callPackage /path/to/openssl { }; }) ]"; + type = types.listOf (types.submodule ( + { ... }: { + imports = [ + (mkRenamedOptionModule [ "original" ] [ "oldDependency" ]) + (mkRenamedOptionModule [ "replacement" ] [ "newDependency" ]) + ]; + + options.oldDependency = mkOption { + type = types.package; + description = "The original package to override."; + }; + + options.newDependency = mkOption { + type = types.package; + description = "The replacement package."; + }; + }) + ); + apply = map ({ oldDependency, newDependency, ... }: { + inherit oldDependency newDependency; + }); + description = '' + List of packages to override without doing a full rebuild. + The original derivation and replacement derivation must have the same + name length, and ideally should have close-to-identical directory layout. + ''; + }; + + cutoffPackages = mkOption { + default = [ config.system.build.initialRamdisk ]; + defaultText = literalExpression "[ config.system.build.initialRamdisk ]"; + type = types.listOf types.package; + description = '' + Packages to which no replacements should be applied. + The initrd is matched by default, because its structure renders the replacement process ineffective and prone to breakage. + ''; + }; }; system.name = mkOption { diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index a0ef92c0505f4..5a4ee29dadfe6 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -28,8 +28,6 @@ let '' else interpreter; - getEmulator = system: (lib.systems.elaborate { inherit system; }).emulator pkgs; - getQemuArch = system: (lib.systems.elaborate { inherit system; }).qemuArch; # Mapping of systems to “magicOrExtension” and “mask”. Mostly taken from: # - https://github.com/cleverca22/nixos-configs/blob/master/qemu.nix @@ -280,28 +278,50 @@ in { ''; type = types.listOf (types.enum (builtins.attrNames magics)); }; + + preferStaticEmulators = mkOption { + default = false; + description = '' + Whether to use static emulators when available. + + This enables the kernel to preload the emulator binaries when + the binfmt registrations are added, obviating the need to make + the emulator binaries available inside chroots and chroot-like + sandboxes. + ''; + type = types.bool; + }; }; }; config = { + assertions = lib.mapAttrsToList (name: reg: { + assertion = reg.fixBinary -> !reg.wrapInterpreterInShell; + message = "boot.binfmt.registrations.\"${name}\" cannot have fixBinary when the interpreter is invoked through a shell."; + }) cfg.registrations; + boot.binfmt.registrations = builtins.listToAttrs (map (system: assert system != pkgs.stdenv.hostPlatform.system; { name = system; value = { config, ... }: let - interpreter = getEmulator system; - qemuArch = getQemuArch system; + elaborated = lib.systems.elaborate { inherit system; }; + useStaticEmulator = cfg.preferStaticEmulators && elaborated.staticEmulatorAvailable pkgs; + interpreter = elaborated.emulator (if useStaticEmulator then pkgs.pkgsStatic else pkgs); + + inherit (elaborated) qemuArch; + isQemu = "qemu-${qemuArch}" == baseNameOf interpreter; - preserveArgvZero = "qemu-${qemuArch}" == baseNameOf interpreter; interpreterReg = let wrapperName = "qemu-${qemuArch}-binfmt-P"; wrapper = pkgs.wrapQemuBinfmtP wrapperName interpreter; in - if preserveArgvZero then "${wrapper}/bin/${wrapperName}" + if isQemu && !useStaticEmulator then "${wrapper}/bin/${wrapperName}" else interpreter; in ({ - preserveArgvZero = mkDefault preserveArgvZero; + preserveArgvZero = mkDefault isQemu; interpreter = mkDefault interpreterReg; - wrapInterpreterInShell = mkDefault (!config.preserveArgvZero); + fixBinary = mkDefault useStaticEmulator; + wrapInterpreterInShell = mkDefault (!config.preserveArgvZero && !config.fixBinary); interpreterSandboxPath = mkDefault (dirOf (dirOf config.interpreter)); } // (magics.${system} or (throw "Cannot create binfmt registration for system ${system}"))); }) cfg.emulatedSystems); diff --git a/nixos/modules/system/boot/clevis.nix b/nixos/modules/system/boot/clevis.nix index ac881e9535767..36328f19e7c65 100644 --- a/nixos/modules/system/boot/clevis.nix +++ b/nixos/modules/system/boot/clevis.nix @@ -1,54 +1,51 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.boot.initrd.clevis; systemd = config.boot.initrd.systemd; supportedFs = [ "zfs" "bcachefs" ]; in { - meta.maintainers = with maintainers; [ julienmalka camillemndn ]; + meta.maintainers = with lib.maintainers; [ julienmalka camillemndn ]; meta.doc = ./clevis.md; options = { - boot.initrd.clevis.enable = mkEnableOption "Clevis in initrd"; + boot.initrd.clevis.enable = lib.mkEnableOption "Clevis in initrd"; - boot.initrd.clevis.package = mkOption { - type = types.package; + boot.initrd.clevis.package = lib.mkOption { + type = lib.types.package; default = pkgs.clevis; defaultText = "pkgs.clevis"; description = "Clevis package"; }; - boot.initrd.clevis.devices = mkOption { + boot.initrd.clevis.devices = lib.mkOption { description = "Encrypted devices that need to be unlocked at boot using Clevis"; default = { }; - type = types.attrsOf (types.submodule ({ - options.secretFile = mkOption { + type = lib.types.attrsOf (lib.types.submodule ({ + options.secretFile = lib.mkOption { description = "Clevis JWE file used to decrypt the device at boot, in concert with the chosen pin (one of TPM2, Tang server, or SSS)."; - type = types.path; + type = lib.types.path; }; })); }; - boot.initrd.clevis.useTang = mkOption { + boot.initrd.clevis.useTang = lib.mkOption { description = "Whether the Clevis JWE file used to decrypt the devices uses a Tang server as a pin."; default = false; - type = types.bool; + type = lib.types.bool; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # Implementation of clevis unlocking for the supported filesystems are located directly in the respective modules. - assertions = (attrValues (mapAttrs + assertions = (lib.attrValues (lib.mapAttrs (device: _: { - assertion = (any (fs: fs.device == device && (elem fs.fsType supportedFs) || (fs.fsType == "zfs" && hasPrefix "${device}/" fs.device)) config.system.build.fileSystems) || (hasAttr device config.boot.initrd.luks.devices); + assertion = (lib.any (fs: fs.device == device && (lib.elem fs.fsType supportedFs) || (fs.fsType == "zfs" && lib.hasPrefix "${device}/" fs.device)) config.system.build.fileSystems) || (lib.hasAttr device config.boot.initrd.luks.devices); message = '' No filesystem or LUKS device with the name ${device} is declared in your configuration.''; }) @@ -61,7 +58,7 @@ in else [ ]; boot.initrd = { - extraUtilsCommands = mkIf (!systemd.enable) '' + extraUtilsCommands = lib.mkIf (!systemd.enable) '' copy_bin_and_libs ${pkgs.jose}/bin/jose copy_bin_and_libs ${pkgs.curl}/bin/curl copy_bin_and_libs ${pkgs.bash}/bin/bash @@ -84,15 +81,15 @@ in sed -i $out/bin/clevis-decrypt-tpm2 -e 's,tpm2_,tpm2 ,' ''; - secrets = lib.mapAttrs' (name: value: nameValuePair "/etc/clevis/${name}.jwe" value.secretFile) cfg.devices; + secrets = lib.mapAttrs' (name: value: lib.nameValuePair "/etc/clevis/${name}.jwe" value.secretFile) cfg.devices; systemd = { - extraBin = mkIf systemd.enable { + extraBin = lib.mkIf systemd.enable { clevis = "${cfg.package}/bin/clevis"; curl = "${pkgs.curl}/bin/curl"; }; - storePaths = mkIf systemd.enable [ + storePaths = lib.mkIf systemd.enable [ cfg.package "${pkgs.jose}/bin/jose" "${pkgs.curl}/bin/curl" diff --git a/nixos/modules/system/boot/emergency-mode.nix b/nixos/modules/system/boot/emergency-mode.nix index 717ab08f2534d..11195dc13d102 100644 --- a/nixos/modules/system/boot/emergency-mode.nix +++ b/nixos/modules/system/boot/emergency-mode.nix @@ -1,16 +1,13 @@ { config, lib, ... }: - -with lib; - { ###### interface options = { - systemd.enableEmergencyMode = mkOption { + systemd.enableEmergencyMode = lib.mkOption { default = true; - type = types.bool; + type = lib.types.bool; description = '' Whether to enable emergency mode, which is an {command}`sulogin` shell started on the console if @@ -27,7 +24,7 @@ with lib; config = { - systemd.additionalUpstreamSystemUnits = optionals + systemd.additionalUpstreamSystemUnits = lib.optionals config.systemd.enableEmergencyMode [ "emergency.target" "emergency.service" ]; diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix index 4f8a2273a7ace..1910ff52eac8f 100644 --- a/nixos/modules/system/boot/grow-partition.nix +++ b/nixos/modules/system/boot/grow-partition.nix @@ -43,7 +43,7 @@ with lib; while [ "''${parentDevice%[0-9]}" != "''${parentDevice}" ]; do parentDevice="''${parentDevice%[0-9]}"; done - partNum="''${rootDevice#''${parentDevice}}" + partNum="''${rootDevice#"''${parentDevice}"}" if [ "''${parentDevice%[0-9]p}" != "''${parentDevice}" ] && [ -b "''${parentDevice%p}" ]; then parentDevice="''${parentDevice%p}" fi diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix index 02c2713ede11c..f9071cef91292 100644 --- a/nixos/modules/system/boot/kexec.nix +++ b/nixos/modules/system/boot/kexec.nix @@ -25,7 +25,7 @@ exit 1 fi echo "Loading NixOS system via kexec." - exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init" + exec kexec --load "$p/kernel" --initrd="$p/initrd" --append="$(cat "$p/kernel-params") init=$p/init" ''; }; }; diff --git a/nixos/modules/system/boot/loader/efi.nix b/nixos/modules/system/boot/loader/efi.nix index 6043c904c4504..2725d3678d523 100644 --- a/nixos/modules/system/boot/loader/efi.nix +++ b/nixos/modules/system/boot/loader/efi.nix @@ -1,19 +1,16 @@ { lib, ... }: - -with lib; - { options.boot.loader.efi = { - canTouchEfiVariables = mkOption { + canTouchEfiVariables = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "Whether the installation process is allowed to modify EFI boot variables."; }; - efiSysMountPoint = mkOption { + efiSysMountPoint = lib.mkOption { default = "/boot"; - type = types.str; + type = lib.types.str; description = "Where the EFI System Partition is mounted."; }; }; diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix index 2b75707ad99ed..797f0d81f14ca 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix @@ -54,6 +54,30 @@ in ''; }; + mirroredBoots = mkOption { + default = [ { path = "/boot"; } ]; + example = [ + { path = "/boot1"; } + { path = "/boot2"; } + ]; + description = '' + Mirror the boot configuration to multiple paths. + ''; + + type = with types; listOf (submodule { + options = { + path = mkOption { + example = "/boot1"; + type = types.str; + description = '' + The path to the boot directory where the extlinux-compatible + configuration files will be written. + ''; + }; + }; + }); + }; + populateCmd = mkOption { type = types.str; readOnly = true; @@ -72,11 +96,27 @@ in builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}" + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}" + lib.optionalString (!cfg.useGenerationDeviceTree) " -r"; + installBootLoader = pkgs.writeScript "install-extlinux-conf.sh" ('' + #!${pkgs.runtimeShell} + set -e + '' + flip concatMapStrings cfg.mirroredBoots (args: '' + ${builder} ${builderArgs} -d '${args.path}' -c "$@" + '')); in mkIf cfg.enable { - system.build.installBootLoader = "${builder} ${builderArgs} -c"; + system.build.installBootLoader = installBootLoader; system.boot.loader.id = "generic-extlinux-compatible"; boot.loader.generic-extlinux-compatible.populateCmd = "${populateBuilder} ${builderArgs}"; + + assertions = [ + { + assertion = cfg.mirroredBoots != [ ]; + message = '' + You must not remove all elements from option 'boot.loader.generic-extlinux-compatible.mirroredBoots', + otherwise the system will not be bootable. + ''; + } + ]; }; } diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 9c36651d68747..81f94e8639d9d 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -712,9 +712,9 @@ in (mkIf cfg.enable { - boot.loader.grub.devices = optional (cfg.device != "") cfg.device; + boot.loader.grub.devices = mkIf (cfg.device != "") [ cfg.device ]; - boot.loader.grub.mirroredBoots = optionals (cfg.devices != [ ]) [ + boot.loader.grub.mirroredBoots = mkIf (cfg.devices != [ ]) [ { path = "/boot"; inherit (cfg) devices; inherit (efi) efiSysMountPoint; } ]; @@ -752,7 +752,7 @@ in # set at once. system.boot.loader.id = "grub"; - environment.systemPackages = optional (grub != null) grub; + environment.systemPackages = mkIf (grub != null) [ grub ]; boot.loader.grub.extraPrepareConfig = concatStrings (mapAttrsToList (n: v: '' diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 2d5c7cc9caa04..6cab35820c88c 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -24,6 +24,8 @@ let systemdBootBuilder = pkgs.substituteAll rec { name = "systemd-boot"; + dir = "bin"; + src = checkedSource; isExecutable = true; @@ -86,7 +88,7 @@ let finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" '' #!${pkgs.runtimeShell} - ${systemdBootBuilder} "$@" + ${systemdBootBuilder}/bin/systemd-boot "$@" ${cfg.extraInstallCommands} ''; in { @@ -216,7 +218,7 @@ in { consoleMode = mkOption { default = "keep"; - type = types.enum [ "0" "1" "2" "auto" "max" "keep" ]; + type = types.enum [ "0" "1" "2" "5" "auto" "max" "keep" ]; description = '' The resolution of the console. The following values are valid: @@ -224,6 +226,7 @@ in { - `"0"`: Standard UEFI 80x25 mode - `"1"`: 80x50 mode, not supported by all devices - `"2"`: The first non-standard mode provided by the device firmware, if any + - `"5"`: Applicable for SteamDeck where this mode represent horizontal mode - `"auto"`: Pick a suitable mode automatically using heuristics - `"max"`: Pick the highest-numbered available mode - `"keep"`: Keep the mode selected by firmware (the default) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 65190e65d9b98..70b455871b4b3 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -1088,6 +1088,8 @@ in storePaths = [ "${config.boot.initrd.systemd.package}/bin/systemd-cryptsetup" "${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-cryptsetup-generator" + ] ++ lib.optionals config.boot.initrd.systemd.tpm2.enable [ + "${config.boot.initrd.systemd.package}/lib/cryptsetup/libcryptsetup-token-systemd-tpm2.so" ]; }; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index e000d99cfb480..94a5de7e2bd40 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -855,6 +855,7 @@ let "UseGateway" "UseRoutes" "UseTimezone" + "IPv6OnlyMode" "ClientIdentifier" "VendorClassIdentifier" "UserClass" @@ -888,6 +889,7 @@ let (assertValueOneOf "UseGateway" boolValues) (assertValueOneOf "UseRoutes" boolValues) (assertValueOneOf "UseTimezone" boolValues) + (assertValueOneOf "IPv6OnlyMode" boolValues) (assertValueOneOf "ClientIdentifier" ["mac" "duid" "duid-only"]) (assertInt "IAID") (assertValueOneOf "RequestBroadcast" boolValues) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index b658a7a2dc05e..65c00b694e0ff 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -205,11 +205,12 @@ in boot.initrd.systemd = { contents = { - "/etc/tmpfiles.d/resolv.conf".text = - "L /etc/resolv.conf - - - - /run/systemd/resolve/stub-resolv.conf"; "/etc/systemd/resolved.conf".text = resolvedConf; }; + tmpfiles.settings.systemd-resolved-stub."/etc/resolv.conf".L.argument = + "/run/systemd/resolve/stub-resolv.conf"; + additionalUpstreamUnits = ["systemd-resolved.service"]; users.systemd-resolve = {}; groups.systemd-resolve = {}; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 082380216d2a7..b3237aa7f04e6 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -327,7 +327,7 @@ let setHostId = optionalString (config.networking.hostId != null) '' hi="${config.networking.hostId}" - ${if pkgs.stdenv.isBigEndian then '' + ${if pkgs.stdenv.hostPlatform.isBigEndian then '' echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > /etc/hostid '' else '' echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > /etc/hostid diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index a89e3d8176374..b5627ec8e5717 100755 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -125,14 +125,6 @@ ln -sfn "$systemConfig" /run/booted-system @shell@ @postBootCommands@ -# Ensure systemd doesn't try to populate /etc, by forcing its first-boot -# heuristic off. It doesn't matter what's in /etc/machine-id for this purpose, -# and systemd will immediately fill in the file when it starts, so just -# creating it is enough. This `: >>` pattern avoids forking and avoids changing -# the mtime if the file already exists. -: >> /etc/machine-id - - # No need to restore the stdout/stderr streams we never redirected and # especially no need to start systemd if [ "${IN_NIXOS_SYSTEMD_STAGE1:-}" != true ]; then diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index bb6fcc1d38ce9..98ff9b0d88d97 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -33,12 +33,11 @@ let "nss-lookup.target" "nss-user-lookup.target" "time-sync.target" + "first-boot-complete.target" ] ++ optionals cfg.package.withCryptsetup [ "cryptsetup.target" "cryptsetup-pre.target" "remote-cryptsetup.target" - ] ++ optionals cfg.package.withTpm2Tss [ - "tpm2.target" ] ++ [ "sigpwr.target" "timers.target" @@ -570,6 +569,15 @@ in "systemd/user-generators" = { source = hooks "user-generators" cfg.user.generators; }; "systemd/system-generators" = { source = hooks "system-generators" cfg.generators; }; "systemd/system-shutdown" = { source = hooks "system-shutdown" cfg.shutdown; }; + + # Ignore all other preset files so systemd doesn't try to enable/disable + # units during runtime. + "systemd/system-preset/00-nixos.preset".text = '' + ignore * + ''; + "systemd/user-preset/00-nixos.preset".text = '' + ignore * + ''; }); services.dbus.enable = true; @@ -679,7 +687,7 @@ in # Increase numeric PID range (set directly instead of copying a one-line file from systemd) # https://github.com/systemd/systemd/pull/12226 - boot.kernel.sysctl."kernel.pid_max" = mkIf pkgs.stdenv.is64bit (lib.mkDefault 4194304); + boot.kernel.sysctl."kernel.pid_max" = mkIf pkgs.stdenv.hostPlatform.is64bit (lib.mkDefault 4194304); services.logrotate.settings = { "/var/log/btmp" = mapAttrs (_: mkDefault) { diff --git a/nixos/modules/system/boot/systemd/dm-verity.nix b/nixos/modules/system/boot/systemd/dm-verity.nix new file mode 100644 index 0000000000000..d800777558013 --- /dev/null +++ b/nixos/modules/system/boot/systemd/dm-verity.nix @@ -0,0 +1,61 @@ +{ config, lib, ... }: + +let + cfg = config.boot.initrd.systemd.dmVerity; +in +{ + options = { + boot.initrd.systemd.dmVerity = { + enable = lib.mkEnableOption "dm-verity" // { + description = '' + Mount verity-protected block devices in the initrd. + + Enabling this option allows to use `systemd-veritysetup` and + `systemd-veritysetup-generator` in the initrd. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = config.boot.initrd.systemd.enable; + message = '' + 'boot.initrd.systemd.dmVerity.enable' requires 'boot.initrd.systemd.enable' to be enabled. + ''; + } + ]; + + boot.initrd = { + availableKernelModules = [ + "dm_mod" + "dm_verity" + ]; + + # dm-verity needs additional udev rules from LVM to work. + services.lvm.enable = true; + + # The additional targets and store paths allow users to integrate verity-protected devices + # through the systemd tooling. + systemd = { + additionalUpstreamUnits = [ + "veritysetup-pre.target" + "veritysetup.target" + "remote-veritysetup.target" + ]; + + storePaths = [ + "${config.boot.initrd.systemd.package}/lib/systemd/systemd-veritysetup" + "${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-veritysetup-generator" + ]; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ + msanft + nikstur + willibutz + ]; +} diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 2ccc964820fe0..fc2e5ddab1595 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -38,6 +38,7 @@ let "kmod-static-nodes.service" "local-fs-pre.target" "local-fs.target" + "modprobe@.service" "multi-user.target" "paths.target" "poweroff.target" @@ -68,7 +69,6 @@ let "systemd-reboot.service" "systemd-sysctl.service" "timers.target" - "tpm2.target" "umount.target" "systemd-bsod.service" ] ++ cfg.additionalUpstreamUnits; @@ -349,15 +349,6 @@ in { visible = "shallow"; description = "Definition of slice configurations."; }; - - enableTpm2 = mkOption { - default = cfg.package.withTpm2Tss; - defaultText = "boot.initrd.systemd.package.withTpm2Tss"; - type = types.bool; - description = '' - Whether to enable TPM2 support in the initrd. - ''; - }; }; config = mkIf (config.boot.initrd.enable && cfg.enable) { @@ -394,9 +385,7 @@ in { # systemd needs this for some features "autofs" # systemd-cryptenroll - ] ++ lib.optional cfg.enableTpm2 "tpm-tis" - ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb" - ++ lib.optional cfg.package.withEfi "efivarfs"; + ] ++ lib.optional cfg.package.withEfi "efivarfs"; boot.kernelParams = [ "root=${config.boot.initrd.systemd.root}" @@ -495,10 +484,6 @@ in { # so NSS can look up usernames "${pkgs.glibc}/lib/libnss_files.so.2" - ] ++ optionals (cfg.package.withCryptsetup && cfg.enableTpm2) [ - # tpm2 support - "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-tpm2.so" - pkgs.tpm2-tss ] ++ optionals cfg.package.withCryptsetup [ # fido2 support "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so" @@ -538,7 +523,7 @@ in { for o in $(< /proc/cmdline); do case $o in init=*) - IFS== read -r -a initParam <<< "$o" + IFS="=" read -r -a initParam <<< "$o" closure="''${initParam[1]}" ;; esac @@ -574,7 +559,7 @@ in { # Initialize the system export IN_NIXOS_SYSTEMD_STAGE1=true - exec chroot /sysroot $closure/prepare-root + exec chroot /sysroot "$closure/prepare-root" ''; }; diff --git a/nixos/modules/system/boot/systemd/sysusers.nix b/nixos/modules/system/boot/systemd/sysusers.nix index 98f93f25c54de..d0af52e0ae9e4 100644 --- a/nixos/modules/system/boot/systemd/sysusers.nix +++ b/nixos/modules/system/boot/systemd/sysusers.nix @@ -68,14 +68,10 @@ in assertion = config.system.activationScripts.users == ""; message = "system.activationScripts.users has to be empty to use systemd-sysusers"; } - { - assertion = config.users.mutableUsers -> config.system.etc.overlay.enable; - message = "config.users.mutableUsers requires config.system.etc.overlay.enable."; - } ] ++ (lib.mapAttrsToList - (_username: opts: { + (username: opts: { assertion = !opts.isNormalUser; - message = "systemd-sysusers doesn't create normal users. You can currently only use it to create system users."; + message = "${username} is a normal user. systemd-sysusers doesn't create normal users, only system users."; }) userCfg.users) ++ lib.mapAttrsToList diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix index f609da314c866..44c72f2768ccc 100644 --- a/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -163,6 +163,20 @@ in }; config = { + warnings = + let + paths = lib.filter (path: + path != null && lib.hasPrefix "/etc/tmpfiles.d/" path + ) (map (path: path.target) config.boot.initrd.systemd.storePaths); + in + lib.optional (lib.length paths > 0) (lib.concatStringsSep " " [ + "Files inside /etc/tmpfiles.d in the initrd need to be created with" + "boot.initrd.systemd.tmpfiles.settings." + "Creating them by hand using boot.initrd.systemd.contents or" + "boot.initrd.systemd.storePaths will lead to errors in the future." + "Found these problematic files: ${lib.concatStringsSep ", " paths}" + ]); + systemd.additionalUpstreamSystemUnits = [ "systemd-tmpfiles-clean.service" "systemd-tmpfiles-clean.timer" diff --git a/nixos/modules/system/boot/systemd/tpm2.nix b/nixos/modules/system/boot/systemd/tpm2.nix new file mode 100644 index 0000000000000..6b6c9fb23f246 --- /dev/null +++ b/nixos/modules/system/boot/systemd/tpm2.nix @@ -0,0 +1,80 @@ +{ + lib, + config, + pkgs, + ... +}: +{ + meta.maintainers = [ lib.maintainers.elvishjerricco ]; + + imports = [ + (lib.mkRenamedOptionModule + [ + "boot" + "initrd" + "systemd" + "enableTpm2" + ] + [ + "boot" + "initrd" + "systemd" + "tpm2" + "enable" + ] + ) + ]; + + options = { + systemd.tpm2.enable = lib.mkEnableOption "systemd TPM2 support" // { + default = config.systemd.package.withTpm2Tss; + defaultText = "systemd.package.withTpm2Tss"; + }; + + boot.initrd.systemd.tpm2.enable = lib.mkEnableOption "systemd initrd TPM2 support" // { + default = config.boot.initrd.systemd.package.withTpm2Tss; + defaultText = "boot.initrd.systemd.package.withTpm2Tss"; + }; + }; + + # TODO: pcrphase, pcrextend, pcrfs, pcrmachine + config = lib.mkMerge [ + # Stage 2 + ( + let + cfg = config.systemd; + in + lib.mkIf cfg.tpm2.enable { + systemd.additionalUpstreamSystemUnits = [ + "tpm2.target" + "systemd-tpm2-setup-early.service" + "systemd-tpm2-setup.service" + ]; + } + ) + + # Stage 1 + ( + let + cfg = config.boot.initrd.systemd; + in + lib.mkIf (cfg.enable && cfg.tpm2.enable) { + boot.initrd.systemd.additionalUpstreamUnits = [ + "tpm2.target" + "systemd-tpm2-setup-early.service" + ]; + + boot.initrd.availableKernelModules = + [ "tpm-tis" ] + ++ lib.optional ( + !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7) + ) "tpm-crb"; + boot.initrd.systemd.storePaths = [ + pkgs.tpm2-tss + "${cfg.package}/lib/systemd/systemd-tpm2-setup" + "${cfg.package}/lib/systemd/system-generators/systemd-tpm2-generator" + ]; + } + ) + ]; +} diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index f93064569bf68..117ced1f59ddc 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -2,33 +2,52 @@ with lib; +let + cfg = config.services.timesyncd; +in { options = { - services.timesyncd = { + services.timesyncd = with types; { enable = mkOption { default = !config.boot.isContainer; defaultText = literalExpression "!config.boot.isContainer"; - type = types.bool; + type = bool; description = '' Enables the systemd NTP client daemon. ''; }; servers = mkOption { + default = null; + type = nullOr (listOf str); + description = '' + The set of NTP servers from which to synchronise. + + Setting this option to an empty list will write `NTP=` to the + `timesyncd.conf` file as opposed to setting this option to null which + will remove `NTP=` entirely. + + See man:timesyncd.conf(5) for details. + ''; + }; + fallbackServers = mkOption { default = config.networking.timeServers; defaultText = literalExpression "config.networking.timeServers"; - type = types.listOf types.str; + type = nullOr (listOf str); description = '' - The set of NTP servers from which to synchronise. - Note if this is set to an empty list, the defaults systemd itself is - compiled with ({0..4}.nixos.pool.ntp.org) apply, - In case you want to disable timesyncd altogether, use the `enable` option. + The set of fallback NTP servers from which to synchronise. + + Setting this option to an empty list will write `FallbackNTP=` to the + `timesyncd.conf` file as opposed to setting this option to null which + will remove `FallbackNTP=` entirely. + + See man:timesyncd.conf(5) for details. ''; }; extraConfig = mkOption { default = ""; - type = types.lines; + type = lines; example = '' PollIntervalMaxSec=180 ''; @@ -41,7 +60,7 @@ with lib; }; }; - config = mkIf config.services.timesyncd.enable { + config = mkIf cfg.enable { systemd.additionalUpstreamSystemUnits = [ "systemd-timesyncd.service" ]; @@ -82,9 +101,14 @@ with lib; environment.etc."systemd/timesyncd.conf".text = '' [Time] - NTP=${concatStringsSep " " config.services.timesyncd.servers} - ${config.services.timesyncd.extraConfig} - ''; + '' + + optionalString (cfg.servers != null) '' + NTP=${concatStringsSep " " cfg.servers} + '' + + optionalString (cfg.fallbackServers != null) '' + FallbackNTP=${concatStringsSep " " cfg.fallbackServers} + '' + + cfg.extraConfig; users.users.systemd-timesync = { uid = config.ids.uids.systemd-timesync; diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix index 150f4adaf3ee6..8287fa5f872f4 100644 --- a/nixos/modules/system/boot/tmp.nix +++ b/nixos/modules/system/boot/tmp.nix @@ -1,29 +1,26 @@ { config, lib, ... }: - -with lib; - let cfg = config.boot.tmp; in { imports = [ - (mkRenamedOptionModule [ "boot" "cleanTmpDir" ] [ "boot" "tmp" "cleanOnBoot" ]) - (mkRenamedOptionModule [ "boot" "tmpOnTmpfs" ] [ "boot" "tmp" "useTmpfs" ]) - (mkRenamedOptionModule [ "boot" "tmpOnTmpfsSize" ] [ "boot" "tmp" "tmpfsSize" ]) + (lib.mkRenamedOptionModule [ "boot" "cleanTmpDir" ] [ "boot" "tmp" "cleanOnBoot" ]) + (lib.mkRenamedOptionModule [ "boot" "tmpOnTmpfs" ] [ "boot" "tmp" "useTmpfs" ]) + (lib.mkRenamedOptionModule [ "boot" "tmpOnTmpfsSize" ] [ "boot" "tmp" "tmpfsSize" ]) ]; options = { boot.tmp = { - cleanOnBoot = mkOption { - type = types.bool; + cleanOnBoot = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to delete all files in {file}`/tmp` during boot. ''; }; - tmpfsSize = mkOption { - type = types.oneOf [ types.str types.types.ints.positive ]; + tmpfsSize = lib.mkOption { + type = lib.types.oneOf [ lib.types.str lib.types.ints.positive ]; default = "50%"; description = '' Size of tmpfs in percentage. @@ -31,8 +28,8 @@ in ''; }; - useTmpfs = mkOption { - type = types.bool; + useTmpfs = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to mount a tmpfs on {file}`/tmp` during boot. @@ -48,12 +45,12 @@ in config = { # When changing remember to update /tmp mount in virtualisation/qemu-vm.nix - systemd.mounts = mkIf cfg.useTmpfs [ + systemd.mounts = lib.mkIf cfg.useTmpfs [ { what = "tmpfs"; where = "/tmp"; type = "tmpfs"; - mountConfig.Options = concatStringsSep "," [ + mountConfig.Options = lib.concatStringsSep "," [ "mode=1777" "strictatime" "rw" @@ -64,6 +61,6 @@ in } ]; - systemd.tmpfiles.rules = optional cfg.cleanOnBoot "D! /tmp 1777 root root"; + systemd.tmpfiles.rules = lib.optional cfg.cleanOnBoot "D! /tmp 1777 root root"; }; } diff --git a/nixos/modules/system/boot/unl0kr.nix b/nixos/modules/system/boot/unl0kr.nix index f5ce693c2de41..bb3916ed45993 100644 --- a/nixos/modules/system/boot/unl0kr.nix +++ b/nixos/modules/system/boot/unl0kr.nix @@ -13,7 +13,7 @@ in }; config = lib.mkIf cfg.enable { - meta.maintainers = with lib.maintainers; [ tomfitzhenry ]; + meta.maintainers = []; assertions = [ { assertion = cfg.enable -> config.boot.initrd.systemd.enable; diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix index 9b43d76e87467..6c6352b0419d5 100644 --- a/nixos/modules/system/etc/etc-activation.nix +++ b/nixos/modules/system/etc/etc-activation.nix @@ -26,13 +26,6 @@ assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.6"; message = "`system.etc.overlay.enable requires a newer kernel, at least version 6.6"; } - { - assertion = config.systemd.sysusers.enable -> (config.users.mutableUsers == config.system.etc.overlay.mutable); - message = '' - When using systemd-sysusers and mounting `/etc` via an overlay, users - can only be mutable when `/etc` is mutable and vice versa. - ''; - } ]; boot.initrd.availableKernelModules = [ "loop" "erofs" "overlay" ]; diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix index 32a52041e57ab..c995016d85c76 100644 --- a/nixos/modules/tasks/auto-upgrade.nix +++ b/nixos/modules/tasks/auto-upgrade.nix @@ -168,7 +168,7 @@ in { assertions = [{ assertion = !((cfg.channel != null) && (cfg.flake != null)); message = '' - The options 'system.autoUpgrade.channels' and 'system.autoUpgrade.flake' cannot both be set. + The options 'system.autoUpgrade.channel' and 'system.autoUpgrade.flake' cannot both be set. ''; }]; diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index 765f10d33bfe8..f5e205e26e946 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let inInitrd = config.boot.initrd.supportedFilesystems.nfs or false; @@ -16,15 +13,15 @@ let # merge parameters from services.nfs.server nfsConfSettings = - optionalAttrs (cfg.server.nproc != null) { + lib.optionalAttrs (cfg.server.nproc != null) { nfsd.threads = cfg.server.nproc; - } // optionalAttrs (cfg.server.hostName != null) { - nfsd.host= cfg.hostName; - } // optionalAttrs (cfg.server.mountdPort != null) { + } // lib.optionalAttrs (cfg.server.hostName != null) { + nfsd.host = cfg.server.hostName; + } // lib.optionalAttrs (cfg.server.mountdPort != null) { mountd.port = cfg.server.mountdPort; - } // optionalAttrs (cfg.server.statdPort != null) { + } // lib.optionalAttrs (cfg.server.statdPort != null) { statd.port = cfg.server.statdPort; - } // optionalAttrs (cfg.server.lockdPort != null) { + } // lib.optionalAttrs (cfg.server.lockdPort != null) { lockd.port = cfg.server.lockdPort; lockd.udp-port = cfg.server.lockdPort; }; @@ -32,17 +29,17 @@ let nfsConfDeprecated = cfg.extraConfig + '' [nfsd] threads=${toString cfg.server.nproc} - ${optionalString (cfg.server.hostName != null) "host=${cfg.server.hostName}"} + ${lib.optionalString (cfg.server.hostName != null) "host=${cfg.server.hostName}"} ${cfg.server.extraNfsdConfig} [mountd] - ${optionalString (cfg.server.mountdPort != null) "port=${toString cfg.server.mountdPort}"} + ${lib.optionalString (cfg.server.mountdPort != null) "port=${toString cfg.server.mountdPort}"} [statd] - ${optionalString (cfg.server.statdPort != null) "port=${toString cfg.server.statdPort}"} + ${lib.optionalString (cfg.server.statdPort != null) "port=${toString cfg.server.statdPort}"} [lockd] - ${optionalString (cfg.server.lockdPort != null) '' + ${lib.optionalString (cfg.server.lockdPort != null) '' port=${toString cfg.server.lockdPort} udp-port=${toString cfg.server.lockdPort} ''} @@ -50,7 +47,7 @@ let nfsConfFile = if cfg.settings != {} - then format.generate "nfs.conf" (recursiveUpdate nfsConfSettings cfg.settings) + then format.generate "nfs.conf" (lib.recursiveUpdate nfsConfSettings cfg.settings) else pkgs.writeText "nfs.conf" nfsConfDeprecated; requestKeyConfFile = pkgs.writeText "request-key.conf" '' @@ -66,7 +63,7 @@ in options = { services.nfs = { - idmapd.settings = mkOption { + idmapd.settings = lib.mkOption { type = format.type; default = {}; description = '' @@ -74,7 +71,7 @@ in for details. ''; - example = literalExpression '' + example = lib.literalExpression '' { Translation = { GSS-Methods = "static,nsswitch"; @@ -85,21 +82,21 @@ in } ''; }; - settings = mkOption { + settings = lib.mkOption { type = format.type; default = {}; description = '' General configuration for NFS daemons and tools. See nfs.conf(5) and related man pages for details. ''; - example = literalExpression '' + example = lib.literalExpression '' { mountd.manage-gids = true; } ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra nfs-utils configuration. @@ -110,12 +107,12 @@ in ###### implementation - config = mkIf (config.boot.supportedFilesystems.nfs or config.boot.supportedFilesystems.nfs4 or false) { + config = lib.mkIf (config.boot.supportedFilesystems.nfs or config.boot.supportedFilesystems.nfs4 or false) { warnings = - (optional (cfg.extraConfig != "") '' + (lib.optional (cfg.extraConfig != "") '' `services.nfs.extraConfig` is deprecated. Use `services.nfs.settings` instead. - '') ++ (optional (cfg.server.extraNfsdConfig != "") '' + '') ++ (lib.optional (cfg.server.extraNfsdConfig != "") '' `services.nfs.server.extraNfsdConfig` is deprecated. Use `services.nfs.settings` instead. ''); assertions = [{ @@ -126,9 +123,9 @@ in services.rpcbind.enable = true; services.nfs.idmapd.settings = { - General = mkMerge [ + General = lib.mkMerge [ { Pipefs-Directory = rpcMountpoint; } - (mkIf (config.networking.domain != null) { Domain = config.networking.domain; }) + (lib.mkIf (config.networking.domain != null) { Domain = config.networking.domain; }) ]; Mapping = { Nobody-User = "nobody"; @@ -141,7 +138,7 @@ in system.fsPackages = [ pkgs.nfs-utils ]; - boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ]; + boot.initrd.kernelModules = lib.mkIf inInitrd [ "nfs" ]; systemd.packages = [ pkgs.nfs-utils ]; @@ -167,12 +164,12 @@ in systemd.services.nfs-mountd = { restartTriggers = [ nfsConfFile ]; - enable = mkDefault false; + enable = lib.mkDefault false; }; systemd.services.nfs-server = { restartTriggers = [ nfsConfFile ]; - enable = mkDefault false; + enable = lib.mkDefault false; }; systemd.services.auth-rpcgss-module = diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 7861a4b946b4b..03b67438d7b62 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -1,14 +1,10 @@ -{ config, lib, options, pkgs, utils, ... }: +{ config, lib, pkgs, utils, ... }: # # TODO: zfs tunables -with utils; -with lib; - let cfgZfs = config.boot.zfs; - optZfs = options.boot.zfs; cfgExpandOnBoot = config.services.zfs.expandOnBoot; cfgSnapshots = config.services.zfs.autoSnapshot; cfgSnapFlags = cfgSnapshots.flags; @@ -17,7 +13,7 @@ let cfgZED = config.services.zfs.zed; selectModulePackage = package: config.boot.kernelPackages.${package.kernelModuleAttribute}; - clevisDatasets = attrNames (filterAttrs (device: _: any (e: e.fsType == "zfs" && (fsNeededForBoot e) && (e.device == device || hasPrefix "${device}/" e.device)) config.system.build.fileSystems) config.boot.initrd.clevis.devices); + clevisDatasets = lib.attrNames (lib.filterAttrs (device: _: lib.any (e: e.fsType == "zfs" && (utils.fsNeededForBoot e) && (e.device == device || lib.hasPrefix "${device}/" e.device)) config.system.build.fileSystems) config.boot.initrd.clevis.devices); inInitrd = config.boot.initrd.supportedFilesystems.zfs or false; inSystem = config.boot.supportedFilesystems.zfs or false; @@ -28,17 +24,17 @@ let zfsAutoSnap = "${autosnapPkg}/bin/zfs-auto-snapshot"; - datasetToPool = x: elemAt (splitString "/" x) 0; + datasetToPool = x: lib.elemAt (lib.splitString "/" x) 0; fsToPool = fs: datasetToPool fs.device; - zfsFilesystems = filter (x: x.fsType == "zfs") config.system.build.fileSystems; + zfsFilesystems = lib.filter (x: x.fsType == "zfs") config.system.build.fileSystems; - allPools = unique ((map fsToPool zfsFilesystems) ++ cfgZfs.extraPools); + allPools = lib.unique ((map fsToPool zfsFilesystems) ++ cfgZfs.extraPools); - rootPools = unique (map fsToPool (filter fsNeededForBoot zfsFilesystems)); + rootPools = lib.unique (map fsToPool (lib.filter utils.fsNeededForBoot zfsFilesystems)); - dataPools = unique (filter (pool: !(elem pool rootPools)) allPools); + dataPools = lib.unique (lib.filter (pool: !(lib.elem pool rootPools)) allPools); snapshotNames = [ "frequent" "hourly" "daily" "weekly" "monthly" ]; @@ -89,7 +85,7 @@ let ''; getPoolFilesystems = pool: - filter (x: x.fsType == "zfs" && (fsToPool x) == pool) config.system.build.fileSystems; + lib.filter (x: x.fsType == "zfs" && (fsToPool x) == pool) config.system.build.fileSystems; getPoolMounts = prefix: pool: let @@ -98,36 +94,36 @@ let # Remove the "/" suffix because even though most mountpoints # won't have it, the "/" mountpoint will, and we can't have the # trailing slash in "/sysroot/" in stage 1. - mountPoint = fs: escapeSystemdPath (prefix + (lib.removeSuffix "/" fs.mountPoint)); + mountPoint = fs: utils.escapeSystemdPath (prefix + (lib.removeSuffix "/" fs.mountPoint)); hasUsr = lib.any (fs: fs.mountPoint == "/usr") poolFSes; in map (x: "${mountPoint x}.mount") poolFSes ++ lib.optional hasUsr "sysusr-usr.mount"; - getKeyLocations = pool: if isBool cfgZfs.requestEncryptionCredentials then { + getKeyLocations = pool: if lib.isBool cfgZfs.requestEncryptionCredentials then { hasKeys = cfgZfs.requestEncryptionCredentials; command = "${cfgZfs.package}/sbin/zfs list -rHo name,keylocation,keystatus -t volume,filesystem ${pool}"; } else let - keys = filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials; + keys = lib.filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials; in { hasKeys = keys != []; command = "${cfgZfs.package}/sbin/zfs list -Ho name,keylocation,keystatus -t volume,filesystem ${toString keys}"; }; createImportService = { pool, systemd, force, prefix ? "" }: - nameValuePair "zfs-import-${pool}" { + lib.nameValuePair "zfs-import-${pool}" { description = "Import ZFS pool \"${pool}\""; # We wait for systemd-udev-settle to ensure devices are available, # but don't *require* it, because mounts shouldn't be killed if it's stopped. # In the future, hopefully someone will complete this: # https://github.com/zfsonlinux/zfs/pull/4943 - wants = [ "systemd-udev-settle.service" ] ++ optional (config.boot.initrd.clevis.useTang) "network-online.target"; + wants = [ "systemd-udev-settle.service" ] ++ lib.optional (config.boot.initrd.clevis.useTang) "network-online.target"; after = [ "systemd-udev-settle.service" "systemd-modules-load.service" "systemd-ask-password-console.service" - ] ++ optional (config.boot.initrd.clevis.useTang) "network-online.target"; + ] ++ lib.optional (config.boot.initrd.clevis.useTang) "network-online.target"; requiredBy = getPoolMounts prefix pool ++ [ "zfs-import.target" ]; before = getPoolMounts prefix pool ++ [ "shutdown.target" "zfs-import.target" ]; conflicts = [ "shutdown.target" ]; @@ -138,7 +134,7 @@ let Type = "oneshot"; RemainAfterExit = true; }; - environment.ZFS_FORCE = optionalString force "-f"; + environment.ZFS_FORCE = lib.optionalString force "-f"; script = let keyLocations = getKeyLocations pool; in (importLib { @@ -157,10 +153,10 @@ let poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. fi if poolImported "${pool}"; then - ${optionalString config.boot.initrd.clevis.enable (concatMapStringsSep "\n" (elem: "clevis decrypt < /etc/clevis/${elem}.jwe | zfs load-key ${elem} || true ") (filter (p: (elemAt (splitString "/" p) 0) == pool) clevisDatasets))} + ${lib.optionalString config.boot.initrd.clevis.enable (lib.concatMapStringsSep "\n" (elem: "clevis decrypt < /etc/clevis/${elem}.jwe | zfs load-key ${elem} || true ") (lib.filter (p: (lib.elemAt (lib.splitString "/" p) 0) == pool) clevisDatasets))} - ${optionalString keyLocations.hasKeys '' + ${lib.optionalString keyLocations.hasKeys '' ${keyLocations.command} | while IFS=$'\t' read ds kl ks; do { if [[ "$ks" != unavailable ]]; then @@ -193,15 +189,15 @@ let ''; }; - zedConf = generators.toKeyValue { - mkKeyValue = generators.mkKeyValueDefault { + zedConf = lib.generators.toKeyValue { + mkKeyValue = lib.generators.mkKeyValueDefault { mkValueString = v: - if isInt v then toString v - else if isString v then "\"${v}\"" + if lib.isInt v then toString v + else if lib.isString v then "\"${v}\"" else if true == v then "1" else if false == v then "0" - else if isList v then "\"" + (concatStringsSep " " v) + "\"" - else err "this value is" (toString v); + else if lib.isList v then "\"" + (lib.concatStringsSep " " v) + "\"" + else lib.err "this value is" (toString v); } "="; } cfgZED.settings; in @@ -209,38 +205,38 @@ in { imports = [ - (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.") - (mkRemovedOptionModule [ "boot" "zfs" "enableUnstable" ] "Instead set `boot.zfs.package = pkgs.zfs_unstable;`") + (lib.mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.") + (lib.mkRemovedOptionModule [ "boot" "zfs" "enableUnstable" ] "Instead set `boot.zfs.package = pkgs.zfs_unstable;`") ]; ###### interface options = { boot.zfs = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.zfs; - defaultText = literalExpression "pkgs.zfs"; + defaultText = lib.literalExpression "pkgs.zfs"; description = "Configured ZFS userland tools package, use `pkgs.zfs_unstable` if you want to track the latest staging ZFS branch."; }; - modulePackage = mkOption { + modulePackage = lib.mkOption { internal = true; # It is supposed to be selected automatically, but can be overridden by expert users. default = selectModulePackage cfgZfs.package; - type = types.package; + type = lib.types.package; description = "Configured ZFS kernel module package."; }; - enabled = mkOption { + enabled = lib.mkOption { readOnly = true; - type = types.bool; + type = lib.types.bool; default = inInitrd || inSystem; - defaultText = literalMD "`true` if ZFS filesystem support is enabled"; + defaultText = lib.literalMD "`true` if ZFS filesystem support is enabled"; description = "True if ZFS filesystem support is enabled"; }; - allowHibernation = mkOption { - type = types.bool; + allowHibernation = lib.mkOption { + type = lib.types.bool; default = false; description = '' Allow hibernation support, this may be a unsafe option depending on your @@ -248,8 +244,8 @@ in ''; }; - extraPools = mkOption { - type = types.listOf types.str; + extraPools = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "tank" "data" ]; description = '' @@ -267,8 +263,8 @@ in ''; }; - devNodes = mkOption { - type = types.path; + devNodes = lib.mkOption { + type = lib.types.path; default = "/dev/disk/by-id"; description = '' Name of directory from which to import ZFS devices. @@ -278,8 +274,8 @@ in ''; }; - forceImportRoot = mkOption { - type = types.bool; + forceImportRoot = lib.mkOption { + type = lib.types.bool; default = true; description = '' Forcibly import the ZFS root pool(s) during early boot. @@ -296,8 +292,8 @@ in ''; }; - forceImportAll = mkOption { - type = types.bool; + forceImportAll = lib.mkOption { + type = lib.types.bool; default = false; description = '' Forcibly import all ZFS pool(s). @@ -309,8 +305,8 @@ in ''; }; - requestEncryptionCredentials = mkOption { - type = types.either types.bool (types.listOf types.str); + requestEncryptionCredentials = lib.mkOption { + type = lib.types.either lib.types.bool (lib.types.listOf lib.types.str); default = true; example = [ "tank" "data" ]; description = '' @@ -321,8 +317,8 @@ in ''; }; - passwordTimeout = mkOption { - type = types.int; + passwordTimeout = lib.mkOption { + type = lib.types.int; default = 0; description = '' Timeout in seconds to wait for password entry for decrypt at boot. @@ -332,7 +328,7 @@ in }; removeLinuxDRM = lib.mkOption { - type = types.bool; + type = lib.types.bool; default = false; description = '' Patch the kernel to change symbols needed by ZFS from @@ -345,9 +341,9 @@ in }; services.zfs.autoSnapshot = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Enable the (OpenSolaris-compatible) ZFS auto-snapshotting service. Note that you must set the `com.sun:auto-snapshot` @@ -360,10 +356,10 @@ in ''; }; - flags = mkOption { + flags = lib.mkOption { default = "-k -p"; example = "-k -p --utc"; - type = types.str; + type = lib.types.str; description = '' Flags to pass to the zfs-auto-snapshot command. @@ -379,41 +375,41 @@ in ''; }; - frequent = mkOption { + frequent = lib.mkOption { default = 4; - type = types.int; + type = lib.types.int; description = '' Number of frequent (15-minute) auto-snapshots that you wish to keep. ''; }; - hourly = mkOption { + hourly = lib.mkOption { default = 24; - type = types.int; + type = lib.types.int; description = '' Number of hourly auto-snapshots that you wish to keep. ''; }; - daily = mkOption { + daily = lib.mkOption { default = 7; - type = types.int; + type = lib.types.int; description = '' Number of daily auto-snapshots that you wish to keep. ''; }; - weekly = mkOption { + weekly = lib.mkOption { default = 4; - type = types.int; + type = lib.types.int; description = '' Number of weekly auto-snapshots that you wish to keep. ''; }; - monthly = mkOption { + monthly = lib.mkOption { default = 12; - type = types.int; + type = lib.types.int; description = '' Number of monthly auto-snapshots that you wish to keep. ''; @@ -421,16 +417,16 @@ in }; services.zfs.trim = { - enable = mkOption { + enable = lib.mkOption { description = "Whether to enable periodic TRIM on all ZFS pools."; default = true; example = false; - type = types.bool; + type = lib.types.bool; }; - interval = mkOption { + interval = lib.mkOption { default = "weekly"; - type = types.str; + type = lib.types.str; example = "daily"; description = '' How often we run trim. For most desktop and server systems @@ -441,9 +437,9 @@ in ''; }; - randomizedDelaySec = mkOption { + randomizedDelaySec = lib.mkOption { default = "6h"; - type = types.str; + type = lib.types.str; example = "12h"; description = '' Add a randomized delay before each ZFS trim. @@ -455,11 +451,11 @@ in }; services.zfs.autoScrub = { - enable = mkEnableOption "periodic scrubbing of ZFS pools"; + enable = lib.mkEnableOption "periodic scrubbing of ZFS pools"; - interval = mkOption { + interval = lib.mkOption { default = "monthly"; - type = types.str; + type = lib.types.str; example = "quarterly"; description = '' Systemd calendar expression when to scrub ZFS pools. See @@ -467,9 +463,9 @@ in ''; }; - randomizedDelaySec = mkOption { + randomizedDelaySec = lib.mkOption { default = "6h"; - type = types.str; + type = lib.types.str; example = "12h"; description = '' Add a randomized delay before each ZFS autoscrub. @@ -479,9 +475,9 @@ in ''; }; - pools = mkOption { + pools = lib.mkOption { default = []; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; example = [ "tank" ]; description = '' List of ZFS pools to periodically scrub. If empty, all pools @@ -490,8 +486,8 @@ in }; }; - services.zfs.expandOnBoot = mkOption { - type = types.either (types.enum [ "disabled" "all" ]) (types.listOf types.str); + services.zfs.expandOnBoot = lib.mkOption { + type = lib.types.either (lib.types.enum [ "disabled" "all" ]) (lib.types.listOf lib.types.str); default = "disabled"; example = [ "tank" "dozer" ]; description = '' @@ -508,10 +504,10 @@ in }; services.zfs.zed = { - enableMail = mkOption { - type = types.bool; + enableMail = lib.mkOption { + type = lib.types.bool; default = config.services.mail.sendmailSetuidWrapper != null; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' config.services.mail.sendmailSetuidWrapper != null ''; description = '' @@ -519,9 +515,9 @@ in ''; }; - settings = mkOption { - type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); - example = literalExpression '' + settings = lib.mkOption { + type = let t = lib.types; in t.attrsOf (t.oneOf [ t.str t.int t.bool (t.listOf t.str) ]); + example = lib.literalExpression '' { ZED_DEBUG_LOG = "/tmp/zed.debug.log"; @@ -549,8 +545,8 @@ in ###### implementation - config = mkMerge [ - (mkIf cfgZfs.enabled { + config = lib.mkMerge [ + (lib.mkIf cfgZfs.enabled { assertions = [ { assertion = cfgZfs.modulePackage.version == cfgZfs.package.version; @@ -569,7 +565,7 @@ in message = "boot.zfs.allowHibernation while force importing is enabled will cause data corruption"; } { - assertion = !(elem "" allPools); + assertion = !(lib.elem "" allPools); message = '' Automatic pool detection found an empty pool name, which can't be used. Hint: for `fileSystems` entries with `fsType = zfs`, the `device` attribute @@ -591,11 +587,10 @@ in ]; }; - boot.initrd = mkIf inInitrd { - # spl has been removed in ≥ 2.2.0. - kernelModules = [ "zfs" ] ++ lib.optional (lib.versionOlder "2.2.0" version) "spl"; + boot.initrd = lib.mkIf inInitrd { + kernelModules = [ "zfs" ]; extraUtilsCommands = - mkIf (!config.boot.initrd.systemd.enable) '' + lib.mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${cfgZfs.package}/sbin/zfs copy_bin_and_libs ${cfgZfs.package}/sbin/zdb copy_bin_and_libs ${cfgZfs.package}/sbin/zpool @@ -603,12 +598,12 @@ in copy_bin_and_libs ${cfgZfs.package}/lib/udev/zvol_id ''; extraUtilsCommandsTest = - mkIf (!config.boot.initrd.systemd.enable) '' + lib.mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/zfs --help >/dev/null 2>&1 $out/bin/zpool --help >/dev/null 2>&1 ''; - postDeviceCommands = mkIf (!config.boot.initrd.systemd.enable) (concatStringsSep "\n" (['' - ZFS_FORCE="${optionalString cfgZfs.forceImportRoot "-f"}" + postResumeCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (lib.concatStringsSep "\n" (['' + ZFS_FORCE="${lib.optionalString cfgZfs.forceImportRoot "-f"}" ''] ++ [(importLib { # See comments at importLib definition. zpoolCmd = "zpool"; @@ -630,21 +625,21 @@ in poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. fi - ${optionalString config.boot.initrd.clevis.enable (concatMapStringsSep "\n" (elem: "clevis decrypt < /etc/clevis/${elem}.jwe | zfs load-key ${elem}") (filter (p: (elemAt (splitString "/" p) 0) == pool) clevisDatasets))} + ${lib.optionalString config.boot.initrd.clevis.enable (lib.concatMapStringsSep "\n" (elem: "clevis decrypt < /etc/clevis/${elem}.jwe | zfs load-key ${elem}") (lib.filter (p: (lib.elemAt (lib.splitString "/" p) 0) == pool) clevisDatasets))} - ${if isBool cfgZfs.requestEncryptionCredentials - then optionalString cfgZfs.requestEncryptionCredentials '' + ${if lib.isBool cfgZfs.requestEncryptionCredentials + then lib.optionalString cfgZfs.requestEncryptionCredentials '' zfs load-key -a '' - else concatMapStrings (fs: '' - zfs load-key -- ${escapeShellArg fs} - '') (filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials)} + else lib.concatMapStrings (fs: '' + zfs load-key -- ${lib.escapeShellArg fs} + '') (lib.filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials)} '') rootPools))); # Systemd in stage 1 - systemd = mkIf config.boot.initrd.systemd.enable { + systemd = lib.mkIf config.boot.initrd.systemd.enable { packages = [cfgZfs.package]; - services = listToAttrs (map (pool: createImportService { + services = lib.listToAttrs (map (pool: createImportService { inherit pool; systemd = config.boot.initrd.systemd.package; force = cfgZfs.forceImportRoot; @@ -671,18 +666,18 @@ in systemd.shutdownRamfs.storePaths = ["${cfgZfs.package}/bin/zpool"]; # TODO FIXME See https://github.com/NixOS/nixpkgs/pull/99386#issuecomment-798813567. To not break people's bootloader and as probably not everybody would read release notes that thoroughly add inSystem. - boot.loader.grub = mkIf (inInitrd || inSystem) { + boot.loader.grub = lib.mkIf (inInitrd || inSystem) { zfsSupport = true; zfsPackage = cfgZfs.package; }; services.zfs.zed.settings = { - ZED_EMAIL_PROG = mkIf cfgZED.enableMail (mkDefault ( + ZED_EMAIL_PROG = lib.mkIf cfgZED.enableMail (lib.mkDefault ( config.security.wrapperDir + "/" + config.services.mail.sendmailSetuidWrapper.program )); # subject in header for sendmail - ZED_EMAIL_OPTS = mkIf cfgZED.enableMail (mkDefault "@ADDRESS@"); + ZED_EMAIL_OPTS = lib.mkIf cfgZED.enableMail (lib.mkDefault "@ADDRESS@"); PATH = lib.makeBinPath [ cfgZfs.package @@ -701,7 +696,7 @@ in ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ENV{ID_FS_TYPE}=="zfs_member", ATTR{../queue/scheduler}="none" ''; - environment.etc = genAttrs + environment.etc = lib.genAttrs (map (file: "zfs/zed.d/${file}") [ @@ -726,7 +721,7 @@ in system.fsPackages = [ cfgZfs.package ]; # XXX: needed? zfs doesn't have (need) a fsck environment.systemPackages = [ cfgZfs.package ] - ++ optional cfgSnapshots.enable autosnapPkg; # so the user can run the command to see flags + ++ lib.optional cfgSnapshots.enable autosnapPkg; # so the user can run the command to see flags services.udev.packages = [ cfgZfs.package ]; # to hook zvol naming, etc. systemd.packages = [ cfgZfs.package ]; @@ -741,7 +736,7 @@ in # This forces a sync of any ZFS pools prior to poweroff, even if they're set # to sync=disabled. createSyncService = pool: - nameValuePair "zfs-sync-${pool}" { + lib.nameValuePair "zfs-sync-${pool}" { description = "Sync ZFS pool \"${pool}\""; wantedBy = [ "shutdown.target" ]; unitConfig = { @@ -757,12 +752,12 @@ in }; createZfsService = serv: - nameValuePair serv { + lib.nameValuePair serv { after = [ "systemd-modules-load.service" ]; wantedBy = [ "zfs.target" ]; }; - in listToAttrs (map createImportService' dataPools ++ + in lib.listToAttrs (map createImportService' dataPools ++ map createSyncService allPools ++ map createZfsService [ "zfs-mount" "zfs-share" "zfs-zed" ]); @@ -771,7 +766,7 @@ in systemd.targets.zfs.wantedBy = [ "multi-user.target" ]; }) - (mkIf (cfgZfs.enabled && cfgExpandOnBoot != "disabled") { + (lib.mkIf (cfgZfs.enabled && cfgExpandOnBoot != "disabled") { systemd.services."zpool-expand@" = { description = "Expand ZFS pools"; after = [ "zfs.target" ]; @@ -824,7 +819,7 @@ in }; }) - (mkIf (cfgZfs.enabled && cfgSnapshots.enable) { + (lib.mkIf (cfgZfs.enabled && cfgSnapshots.enable) { systemd.services = let descr = name: if name == "frequent" then "15 mins" else if name == "hourly" then "hour" @@ -862,7 +857,7 @@ in }) snapshotNames); }) - (mkIf (cfgZfs.enabled && cfgScrub.enable) { + (lib.mkIf (cfgZfs.enabled && cfgScrub.enable) { systemd.services.zfs-scrub = { description = "ZFS pools scrubbing"; after = [ "zfs-import.target" ]; @@ -872,7 +867,7 @@ in script = '' ${cfgZfs.package}/bin/zpool scrub -w ${ if cfgScrub.pools != [] then - (concatStringsSep " " cfgScrub.pools) + (lib.concatStringsSep " " cfgScrub.pools) else "$(${cfgZfs.package}/bin/zpool list -H -o name)" } @@ -890,7 +885,7 @@ in }; }) - (mkIf (cfgZfs.enabled && cfgTrim.enable) { + (lib.mkIf (cfgZfs.enabled && cfgTrim.enable) { systemd.services.zpool-trim = { description = "ZFS pools trim"; after = [ "zfs-import.target" ]; diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix index 9607218ec069f..0b628725969a8 100644 --- a/nixos/modules/tasks/lvm.nix +++ b/nixos/modules/tasks/lvm.nix @@ -87,9 +87,14 @@ in { environment.systemPackages = [ pkgs.thin-provisioning-tools ]; }) (mkIf cfg.boot.vdo.enable { + assertions = [{ + assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.9"; + message = "boot.vdo.enable requires at least kernel version 6.9"; + }]; + boot = { initrd = { - kernelModules = [ "kvdo" ]; + kernelModules = [ "dm-vdo" ]; systemd.initrdBin = lib.mkIf config.boot.initrd.services.lvm.enable [ pkgs.vdo ]; @@ -98,16 +103,15 @@ in { copy_bin_and_libs ${pkgs.vdo}/bin/$BIN done substituteInPlace $out/bin/vdorecover --replace "${pkgs.bash}/bin/bash" "/bin/sh" - substituteInPlace $out/bin/adaptLVMVDO.sh --replace "${pkgs.bash}/bin/bash" "/bin/sh" + substituteInPlace $out/bin/adaptlvm --replace "${pkgs.bash}/bin/bash" "/bin/sh" ''; extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable)'' - ls ${pkgs.vdo}/bin/ | grep -vE '(adaptLVMVDO|vdorecover)' | while read BIN; do + ls ${pkgs.vdo}/bin/ | grep -vE '(adaptlvm|vdorecover)' | while read BIN; do $out/bin/$(basename $BIN) --help > /dev/null done ''; }; - extraModulePackages = [ config.boot.kernelPackages.kvdo ]; }; services.lvm.package = mkOverride 999 pkgs.lvm2_vdo; # this overrides mkDefault diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index bbf2d337aac64..83c0dc27885e3 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -447,7 +447,7 @@ let (let deps = deviceDependency v.interface; in - { description = "Vlan Interface ${n}"; + { description = "MACVLAN Interface ${n}"; wantedBy = [ "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; partOf = [ "network-setup.service" ]; @@ -567,7 +567,7 @@ let (let deps = deviceDependency v.interface; in - { description = "Vlan Interface ${n}"; + { description = "VLAN Interface ${n}"; wantedBy = [ "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; partOf = [ "network-setup.service" ]; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 7e3e24c727b20..c9ea31a85beef 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -438,7 +438,7 @@ let hostidFile = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } '' hi="${cfg.hostId}" - ${if pkgs.stdenv.isBigEndian then '' + ${if pkgs.stdenv.hostPlatform.isBigEndian then '' echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out '' else '' echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > $out diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 00b6b28eb6537..0f551dcbd63bd 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -162,6 +162,7 @@ in boot.kernelParams = [ "console=${qemu-common.qemuSerialDevice}" + "console=tty0" # Panic if an error occurs in stage 1 (rather than waiting for # user intervention). "panic=1" "boot.panic_on_fail" @@ -180,6 +181,7 @@ in services.journald.extraConfig = '' ForwardToConsole=yes + TTYPath=/dev/${qemu-common.qemuSerialDevice} MaxLevelConsole=debug ''; diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index 612f6c5bc765a..1a65686af37cc 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -75,6 +75,11 @@ in { after = [ "multi-user.target" ]; requires = [ "network-online.target" ]; + path = [ + "/run/wrappers" + "/run/current-system/sw" + ]; + restartIfChanged = false; unitConfig.X-StopOnRemoval = false; diff --git a/nixos/modules/virtualisation/azure-images.nix b/nixos/modules/virtualisation/azure-images.nix deleted file mode 100644 index 22c82fc14f653..0000000000000 --- a/nixos/modules/virtualisation/azure-images.nix +++ /dev/null @@ -1,5 +0,0 @@ -let self = { - "16.09" = "https://nixos.blob.core.windows.net/images/nixos-image-16.09.1694.019dcc3-x86_64-linux.vhd"; - - latest = self."16.09"; -}; in self diff --git a/nixos/modules/virtualisation/brightbox-config.nix b/nixos/modules/virtualisation/brightbox-config.nix deleted file mode 100644 index 0a018e4cd6954..0000000000000 --- a/nixos/modules/virtualisation/brightbox-config.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ modulesPath, ... }: - -{ - imports = [ "${modulesPath}/virtualisation/brightbox-image.nix" ]; -} diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix deleted file mode 100644 index 15f8fd6d8f7da..0000000000000 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ /dev/null @@ -1,166 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -let - diskSize = "20G"; -in -{ - imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; - - system.build.brightboxImage = - pkgs.vmTools.runInLinuxVM ( - pkgs.runCommand "brightbox-image" - { preVM = - '' - mkdir $out - diskImage=$out/$diskImageBase - truncate $diskImage --size ${diskSize} - mv closure xchg/ - ''; - - postVM = - '' - PATH=$PATH:${lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]} - pushd $out - ${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2 - rm $diskImageBase - popd - ''; - diskImageBase = "nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw"; - buildInputs = [ pkgs.util-linux pkgs.perl ]; - exportReferencesGraph = - [ "closure" config.system.build.toplevel ]; - } - '' - # Create partition table - ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos - ${pkgs.parted}/sbin/parted --script /dev/vda mkpart primary ext4 1 ${diskSize} - ${pkgs.parted}/sbin/parted --script /dev/vda print - . /sys/class/block/vda1/uevent - mknod /dev/vda1 b $MAJOR $MINOR - - # Create an empty filesystem and mount it. - ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1 - ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 - - mkdir /mnt - mount /dev/vda1 /mnt - - # The initrd expects these directories to exist. - mkdir /mnt/dev /mnt/proc /mnt/sys - - mount --bind /proc /mnt/proc - mount --bind /dev /mnt/dev - mount --bind /sys /mnt/sys - - # Copy all paths in the closure to the filesystem. - storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) - - mkdir -p /mnt/nix/store - echo "copying everything (will take a while)..." - cp -prd $storePaths /mnt/nix/store/ - - # Register the paths in the Nix database. - printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group "" - - # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.nix.package.out}/bin/nix-env \ - -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \ - --option build-users-group "" - - # `nixos-rebuild' requires an /etc/NIXOS. - mkdir -p /mnt/etc - touch /mnt/etc/NIXOS - - # `switch-to-configuration' requires a /bin/sh - mkdir -p /mnt/bin - ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh - - # Install a configuration.nix. - mkdir -p /mnt/etc/nixos /mnt/boot/grub - cp ${./brightbox-config.nix} /mnt/etc/nixos/configuration.nix - - # Generate the GRUB menu. - ln -s vda /dev/sda - chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot - - umount /mnt/proc /mnt/dev /mnt/sys - umount /mnt - '' - ); - - fileSystems."/".label = "nixos"; - - # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. - boot.loader.grub.device = "/dev/vda"; - boot.loader.timeout = 0; - - # Don't put old configurations in the GRUB menu. The user has no - # way to select them anyway. - boot.loader.grub.configurationLimit = 0; - - # Allow root logins only using the SSH key that the user specified - # at instance creation time. - services.openssh.enable = true; - services.openssh.settings.PermitRootLogin = "prohibit-password"; - - # Force getting the hostname from Google Compute. - networking.hostName = mkDefault ""; - - # Always include cryptsetup so that NixOps can use it. - environment.systemPackages = [ pkgs.cryptsetup ]; - - systemd.services.fetch-ec2-data = - { description = "Fetch EC2 Data"; - - wantedBy = [ "multi-user.target" "sshd.service" ]; - before = [ "sshd.service" ]; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; - - path = [ pkgs.wget pkgs.iproute2 ]; - - script = - '' - wget="wget -q --retry-connrefused -O -" - - ${optionalString (config.networking.hostName == "") '' - echo "setting host name..." - ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/latest/meta-data/hostname) - ''} - - # Don't download the SSH key if it has already been injected - # into the image (a Nova feature). - if ! [ -e /root/.ssh/authorized_keys ]; then - echo "obtaining SSH key..." - mkdir -m 0700 -p /root/.ssh - $wget http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /root/key.pub - if [ $? -eq 0 -a -e /root/key.pub ]; then - if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then - cat /root/key.pub >> /root/.ssh/authorized_keys - echo "new key added to authorized_keys" - fi - chmod 600 /root/.ssh/authorized_keys - rm -f /root/key.pub - fi - fi - - # Extract the intended SSH host key for this machine from - # the supplied user data, if available. Otherwise sshd will - # generate one normally. - $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true - key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)" - key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)" - if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then - mkdir -m 0755 -p /etc/ssh - (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key) - echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub - fi - ''; - - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - }; - -} diff --git a/nixos/modules/virtualisation/docker-rootless.nix b/nixos/modules/virtualisation/docker-rootless.nix index bad9136afd298..15b9f16eefefc 100644 --- a/nixos/modules/virtualisation/docker-rootless.nix +++ b/nixos/modules/virtualisation/docker-rootless.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.virtualisation.docker.rootless; @@ -15,8 +12,8 @@ in ###### interface options.virtualisation.docker.rootless = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' This option enables docker in a rootless mode, a daemon that manages @@ -25,8 +22,8 @@ in ''; }; - setSocketVariable = mkOption { - type = types.bool; + setSocketVariable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Point {command}`DOCKER_HOST` to rootless Docker instance for @@ -34,7 +31,7 @@ in ''; }; - daemon.settings = mkOption { + daemon.settings = lib.mkOption { type = settingsFormat.type; default = { }; example = { @@ -47,15 +44,15 @@ in ''; }; - package = mkPackageOption pkgs "docker" { }; + package = lib.mkPackageOption pkgs "docker" { }; }; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - environment.extraInit = optionalString cfg.setSocketVariable '' + environment.extraInit = lib.optionalString cfg.setSocketVariable '' if [ -z "$DOCKER_HOST" -a -n "$XDG_RUNTIME_DIR" ]; then export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" fi diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index d6d7759981197..4f38bc0b94d6c 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -244,7 +244,7 @@ in }; assertions = [ - { assertion = cfg.enableNvidia && pkgs.stdenv.isx86_64 -> config.hardware.graphics.enable32Bit or false; + { assertion = cfg.enableNvidia && pkgs.stdenv.hostPlatform.isx86_64 -> config.hardware.graphics.enable32Bit or false; message = "Option enableNvidia on x86_64 requires 32-bit support libraries"; }]; diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index f4c904ff670c8..777e3b28f2007 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -112,12 +112,11 @@ let environment = lib.mkMerge [ { + INCUS_EDK2_PATH = ovmf; INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; PATH = lib.mkForce serverBinPath; } - (lib.mkIf (lib.versionOlder cfg.package.version "6.3.0") { INCUS_OVMF_PATH = ovmf; }) - (lib.mkIf (lib.versionAtLeast cfg.package.version "6.3.0") { INCUS_EDK2_PATH = ovmf; }) (lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; }) ]; diff --git a/nixos/modules/virtualisation/lxc-instance-common.nix b/nixos/modules/virtualisation/lxc-instance-common.nix index 77285e5297263..1a9ee7a2680b1 100644 --- a/nixos/modules/virtualisation/lxc-instance-common.nix +++ b/nixos/modules/virtualisation/lxc-instance-common.nix @@ -27,7 +27,6 @@ services.openssh.startWhenNeeded = lib.mkDefault true; # As this is intended as a standalone image, undo some of the minimal profile stuff - environment.noXlibs = false; documentation.enable = true; documentation.nixos.enable = true; services.logrotate.enable = true; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index ba5112aa6cec1..812d22d773e1c 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -85,8 +85,13 @@ let startScript = cfg: '' - mkdir -p -m 0755 "$root/etc" "$root/var/lib" - mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/nixos-containers + # Declare root explicitly to avoid shellcheck warnings, it comes from the env + declare root + + mkdir -p "$root/etc" "$root/var/lib" + chmod 0755 "$root/etc" "$root/var/lib" + mkdir -p "$root/var/lib/private" "$root/root" /run/nixos-containers + chmod 0700 "$root/var/lib/private" "$root/root" /run/nixos-containers if ! [ -e "$root/etc/os-release" ]; then touch "$root/etc/os-release" fi @@ -95,19 +100,24 @@ let touch "$root/etc/machine-id" fi - mkdir -p -m 0755 \ + mkdir -p \ + "/nix/var/nix/profiles/per-container/$INSTANCE" \ + "/nix/var/nix/gcroots/per-container/$INSTANCE" + chmod 0755 \ "/nix/var/nix/profiles/per-container/$INSTANCE" \ "/nix/var/nix/gcroots/per-container/$INSTANCE" cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf" + declare -a extraFlags + if [ "$PRIVATE_NETWORK" = 1 ]; then - extraFlags+=" --private-network" + extraFlags+=("--private-network") fi if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then - extraFlags+=" --network-veth" + extraFlags+=("--network-veth") fi if [ -n "$HOST_PORT" ]; then @@ -115,30 +125,30 @@ let IFS="," for i in $HOST_PORT do - extraFlags+=" --port=$i" + extraFlags+=("--port=$i") done IFS=$OIFS fi if [ -n "$HOST_BRIDGE" ]; then - extraFlags+=" --network-bridge=$HOST_BRIDGE" + extraFlags+=("--network-bridge=$HOST_BRIDGE") fi - extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}" + extraFlags+=(${lib.escapeShellArgs (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}) for iface in $INTERFACES; do - extraFlags+=" --network-interface=$iface" + extraFlags+=("--network-interface=$iface") done for iface in $MACVLANS; do - extraFlags+=" --network-macvlan=$iface" + extraFlags+=("--network-macvlan=$iface") done # If the host is 64-bit and the container is 32-bit, add a # --personality flag. ${optionalString (pkgs.stdenv.hostPlatform.system == "x86_64-linux") '' - if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then - extraFlags+=" --personality=x86" + if [ "$(< "''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system")" = i686-linux ]; then + extraFlags+=("--personality=x86") fi ''} @@ -149,9 +159,11 @@ let # Kill signal handling means systemd-nspawn will pass a system-halt signal # to the container systemd when it receives SIGTERM for container shutdown; # containerInit and stage2 have to handle this as well. + # TODO: fix shellcheck issue properly + # shellcheck disable=SC2086 exec ${config.systemd.package}/bin/systemd-nspawn \ --keep-unit \ - -M "$INSTANCE" -D "$root" $extraFlags \ + -M "$INSTANCE" -D "$root" "''${extraFlags[@]}" \ $EXTRA_NSPAWN_FLAGS \ --notify-ready=yes \ --kill-signal=SIGRTMIN+3 \ @@ -203,33 +215,33 @@ let if cfg.${attribute} == null then '' if [ -n "${variable}" ]; then - ${ipcmd} add ${variable} dev $ifaceHost + ${ipcmd} add "${variable}" dev "$ifaceHost" fi '' else - "${ipcmd} add ${cfg.${attribute}} dev $ifaceHost"; + ''${ipcmd} add ${cfg.${attribute}} dev "$ifaceHost"''; renderExtraVeth = name: cfg: if cfg.hostBridge != null then '' # Add ${name} to bridge ${cfg.hostBridge} - ip link set dev ${name} master ${cfg.hostBridge} up + ip link set dev "${name}" master "${cfg.hostBridge}" up '' else '' echo "Bring ${name} up" - ip link set dev ${name} up + ip link set dev "${name}" up # Set IPs and routes for ${name} ${optionalString (cfg.hostAddress != null) '' - ip addr add ${cfg.hostAddress} dev ${name} + ip addr add ${cfg.hostAddress} dev "${name}" ''} ${optionalString (cfg.hostAddress6 != null) '' - ip -6 addr add ${cfg.hostAddress6} dev ${name} + ip -6 addr add ${cfg.hostAddress6} dev "${name}" ''} ${optionalString (cfg.localAddress != null) '' - ip route add ${cfg.localAddress} dev ${name} + ip route add ${cfg.localAddress} dev "${name}" ''} ${optionalString (cfg.localAddress6 != null) '' - ip -6 route add ${cfg.localAddress6} dev ${name} + ip -6 route add ${cfg.localAddress6} dev "${name}" ''} ''; in @@ -238,7 +250,7 @@ let [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then if [ -z "$HOST_BRIDGE" ]; then ifaceHost=ve-$INSTANCE - ip link set dev $ifaceHost up + ip link set dev "$ifaceHost" up ${ipcall cfg "ip addr" "$HOST_ADDRESS" "hostAddress"} ${ipcall cfg "ip -6 addr" "$HOST_ADDRESS6" "hostAddress6"} diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index b92d30dcc0e2b..91a0532fbaab7 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -8,6 +8,10 @@ in { + imports = [ + (mkRemovedOptionModule [ "hardware" "parallels" "autoMountShares" ] "Shares are always automatically mounted since Parallels Desktop 20.") + ]; + options = { hardware.parallels = { @@ -20,17 +24,6 @@ in ''; }; - autoMountShares = mkOption { - type = types.bool; - default = true; - description = '' - Control prlfsmountd service. When this service is running, shares can not be manually - mounted through `mount -t prl_fs ...` as this service will remount and trample any set options. - Recommended to enable for simple file sharing, but extended share use such as for code should - disable this to manually mount shares. - ''; - }; - package = mkOption { type = types.nullOr types.package; default = config.boot.kernelPackages.prl-tools; @@ -68,19 +61,6 @@ in }; }; - systemd.services.prlfsmountd = mkIf config.hardware.parallels.autoMountShares { - description = "Parallels Guest File System Sharing Tool"; - wantedBy = [ "multi-user.target" ]; - path = [ prl-tools ]; - serviceConfig = rec { - ExecStart = "${prl-tools}/sbin/prlfsmountd ${PIDFile}"; - ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /media"; - ExecStopPost = "${prl-tools}/sbin/prlfsmountd -u"; - PIDFile = "/run/prlfsmountd.pid"; - WorkingDirectory = "${prl-tools}/bin"; - }; - }; - systemd.services.prlshprint = { description = "Parallels Printing Tool"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index bc77292ffee90..aa1d383738ad6 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -5,18 +5,23 @@ let inherit (lib) mkOption types; - podmanPackage = (pkgs.podman.override { + podmanPackage = pkgs.podman.override { extraPackages = cfg.extraPackages # setuid shadow ++ [ "/run/wrappers" ] ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package; - }); + extraRuntimes = [ pkgs.runc ] + ++ lib.optionals (config.virtualisation.containers.containersConf.settings.network.default_rootless_network_cmd or "" == "slirp4netns") (with pkgs; [ + slirp4netns + ]); + }; # Provides a fake "docker" binary mapping to podman dockerCompat = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { outputs = [ "out" "man" ]; inherit (podmanPackage) meta; + preferLocalBuild = true; } '' mkdir -p $out/bin ln -s ${podmanPackage}/bin/podman $out/bin/docker @@ -231,7 +236,10 @@ in systemd.tmpfiles.packages = [ # The /run/podman rule interferes with our podman group, so we remove # it and let the systemd socket logic take care of it. - (pkgs.runCommand "podman-tmpfiles-nixos" { package = cfg.package; } '' + (pkgs.runCommand "podman-tmpfiles-nixos" { + package = cfg.package; + preferLocalBuild = true; + } '' mkdir -p $out/lib/tmpfiles.d/ grep -v 'D! /run/podman 0700 root root' \ <$package/lib/tmpfiles.d/podman.conf \ diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index a1aed8c4e917a..edefb4c227f03 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -276,15 +276,7 @@ let onlyNixStore = false; label = rootFilesystemLabel; partitionTableType = selectPartitionTableLayout { inherit (cfg) useDefaultFilesystems useEFIBoot; }; - # Bootloader should be installed on the system image only if we are booting through bootloaders. - # Though, if a user is not using our default filesystems, it is possible to not have any ESP - # or a strange partition table that's incompatible with GRUB configuration. - # As a consequence, this may lead to disk image creation failures. - # To avoid this, we prefer to let the user find out about how to install the bootloader on its ESP/disk. - # Usually, this can be through building your own disk image. - # TODO: If a user is interested into a more fine grained heuristic for `installBootLoader` - # by examining the actual contents of `cfg.fileSystems`, please send a PR. - installBootLoader = cfg.useBootLoader && cfg.useDefaultFilesystems; + installBootLoader = cfg.installBootLoader; touchEFIVars = cfg.useEFIBoot; diskSize = "auto"; additionalSpace = "0M"; @@ -329,7 +321,7 @@ in virtualisation.diskSize = mkOption { - type = types.nullOr types.ints.positive; + type = types.ints.positive; default = 1024; description = '' The disk size in megabytes of the virtual machine. @@ -840,6 +832,19 @@ in ''; }; + virtualisation.installBootLoader = + mkOption { + type = types.bool; + default = cfg.useBootLoader && cfg.useDefaultFilesystems; + defaultText = "cfg.useBootLoader && cfg.useDefaultFilesystems"; + description = '' + Install boot loader to target image. + + This is best-effort and may break with unconventional partition setups. + Use `virtualisation.useDefaultFilesystems` for a known-working configuration. + ''; + }; + virtualisation.useEFIBoot = mkOption { type = types.bool; @@ -999,6 +1004,13 @@ in If you have a more advanced usecase, please open an issue or a pull request. ''; } + { + assertion = cfg.installBootLoader -> config.system.switch.enable; + message = '' + `system.switch.enable` must be enabled for `virtualisation.installBootLoader` to work. + Please enable it in your configuration. + ''; + } ]; warnings = @@ -1157,7 +1169,7 @@ in value.fsType = "9p"; value.neededForBoot = true; value.options = - [ "trans=virtio" "version=9p2000.L" "msize=${toString cfg.msize}" ] + [ "trans=virtio" "version=9p2000.L" "msize=${toString cfg.msize}" "x-systemd.requires=modprobe@9pnet_virtio.service" ] ++ lib.optional (tag == "nix-store") "cache=loose"; }; in lib.mkMerge [ diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index b4933cffa2c0c..31222d553a345 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -1,9 +1,5 @@ # Module for VirtualBox guests. - { config, lib, pkgs, ... }: - -with lib; - let cfg = config.virtualisation.virtualbox.guest; kernel = config.boot.kernelPackages; @@ -32,38 +28,38 @@ let in { imports = [ - (mkRenamedOptionModule [ "virtualisation" "virtualbox" "guest" "draganddrop" ] [ "virtualisation" "virtualbox" "guest" "dragAndDrop" ]) + (lib.mkRenamedOptionModule [ "virtualisation" "virtualbox" "guest" "draganddrop" ] [ "virtualisation" "virtualbox" "guest" "dragAndDrop" ]) ]; options.virtualisation.virtualbox.guest = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "Whether to enable the VirtualBox service and other guest additions."; }; - clipboard = mkOption { + clipboard = lib.mkOption { default = true; - type = types.bool; + type = lib.types.bool; description = "Whether to enable clipboard support."; }; - seamless = mkOption { + seamless = lib.mkOption { default = true; - type = types.bool; + type = lib.types.bool; description = "Whether to enable seamless mode. When activated windows from the guest appear next to the windows of the host."; }; - dragAndDrop = mkOption { + dragAndDrop = lib.mkOption { default = true; - type = types.bool; + type = lib.types.bool; description = "Whether to enable drag and drop support."; }; }; ###### implementation - config = mkIf cfg.enable (mkMerge [ + config = lib.mkIf cfg.enable (lib.mkMerge [ { assertions = [{ assertion = pkgs.stdenv.hostPlatform.isx86; @@ -104,17 +100,17 @@ in systemd.user.services.virtualboxClientVmsvga = mkVirtualBoxUserService "--vmsvga-session"; } ( - mkIf cfg.clipboard { + lib.mkIf cfg.clipboard { systemd.user.services.virtualboxClientClipboard = mkVirtualBoxUserService "--clipboard"; } ) ( - mkIf cfg.seamless { + lib.mkIf cfg.seamless { systemd.user.services.virtualboxClientSeamless = mkVirtualBoxUserService "--seamless"; } ) ( - mkIf cfg.dragAndDrop { + lib.mkIf cfg.dragAndDrop { systemd.user.services.virtualboxClientDragAndDrop = mkVirtualBoxUserService "--draganddrop"; } ) diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 4808652a542ad..8820b4ff5a837 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.virtualisation.virtualbox.host; @@ -18,7 +15,7 @@ in { options.virtualisation.virtualbox.host = { - enable = mkEnableOption "VirtualBox" // { + enable = lib.mkEnableOption "VirtualBox" // { description = '' Whether to enable VirtualBox. @@ -29,7 +26,7 @@ in ''; }; - enableExtensionPack = mkEnableOption "VirtualBox extension pack" // { + enableExtensionPack = lib.mkEnableOption "VirtualBox extension pack" // { description = '' Whether to install the Oracle Extension Pack for VirtualBox. @@ -40,18 +37,18 @@ in ''; }; - package = mkPackageOption pkgs "virtualbox" { }; + package = lib.mkPackageOption pkgs "virtualbox" { }; - addNetworkInterface = mkOption { - type = types.bool; + addNetworkInterface = lib.mkOption { + type = lib.types.bool; default = true; description = '' Automatically set up a vboxnet0 host-only network interface. ''; }; - enableHardening = mkOption { - type = types.bool; + enableHardening = lib.mkOption { + type = lib.types.bool; default = true; description = '' Enable hardened VirtualBox, which ensures that only the binaries in the @@ -65,8 +62,8 @@ in ''; }; - headless = mkOption { - type = types.bool; + headless = lib.mkOption { + type = lib.types.bool; default = false; description = '' Use VirtualBox installation without GUI and Qt dependency. Useful to enable on servers @@ -74,16 +71,16 @@ in ''; }; - enableWebService = mkOption { - type = types.bool; + enableWebService = lib.mkOption { + type = lib.types.bool; default = false; description = '' Build VirtualBox web service tool (vboxwebsrv) to allow managing VMs via other webpage frontend tools. Useful for headless servers. ''; }; - enableKvm = mkOption { - type = types.bool; + enableKvm = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable KVM support for VirtualBox. This increases compatibility with Linux kernel versions, because the VirtualBox kernel modules @@ -96,8 +93,8 @@ in }; }; - config = mkIf cfg.enable (mkMerge [{ - warnings = mkIf (pkgs.config.virtualbox.enableExtensionPack or false) + config = lib.mkIf cfg.enable (lib.mkMerge [{ + warnings = lib.mkIf (pkgs.config.virtualbox.enableExtensionPack or false) ["'nixpkgs.virtualbox.enableExtensionPack' has no effect, please use 'virtualisation.virtualbox.host.enableExtensionPack'"]; environment.systemPackages = [ virtualbox ]; @@ -118,7 +115,7 @@ in "VBoxSDL" "VirtualBoxVM" ]); - in mkIf cfg.enableHardening + in lib.mkIf cfg.enableHardening (builtins.listToAttrs (map (x: { name = x; value = mkSuid x; }) executables)); users.groups.vboxusers.gid = config.ids.gids.vboxusers; @@ -130,14 +127,14 @@ in SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" ''; - } (mkIf cfg.enableKvm { + } (lib.mkIf cfg.enableKvm { assertions = [ { assertion = !cfg.addNetworkInterface; message = "VirtualBox KVM only supports standard NAT networking for VMs. Please turn off virtualisation.virtualbox.host.addNetworkInterface."; } ]; - }) (mkIf (!cfg.enableKvm) { + }) (lib.mkIf (!cfg.enableKvm) { boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; boot.extraModulePackages = [ kernelModules ]; @@ -149,7 +146,7 @@ in ''; # Since we lack the right setuid/setcap binaries, set up a host-only network by default. - }) (mkIf cfg.addNetworkInterface { + }) (lib.mkIf cfg.addNetworkInterface { systemd.services.vboxnet0 = { description = "VirtualBox vboxnet0 Interface"; requires = [ "dev-vboxnetctl.device" ]; @@ -177,7 +174,7 @@ in # Make sure NetworkManager won't assume this interface being up # means we have internet access. networking.networkmanager.unmanaged = ["vboxnet0"]; - }) (mkIf config.networking.useNetworkd { + }) (lib.mkIf config.networking.useNetworkd { systemd.network.networks."40-vboxnet0".extraConfig = '' [Link] RequiredForOnline=no diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 1c8b9b99c01ca..4ab5d17ecd495 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.virtualbox; @@ -10,51 +7,51 @@ in { options = { virtualbox = { - baseImageSize = mkOption { - type = with types; either (enum [ "auto" ]) int; + baseImageSize = lib.mkOption { + type = with lib.types; either (enum [ "auto" ]) int; default = "auto"; example = 50 * 1024; description = '' The size of the VirtualBox base image in MiB. ''; }; - baseImageFreeSpace = mkOption { - type = with types; int; + baseImageFreeSpace = lib.mkOption { + type = with lib.types; int; default = 30 * 1024; description = '' Free space in the VirtualBox base image in MiB. ''; }; - memorySize = mkOption { - type = types.int; + memorySize = lib.mkOption { + type = lib.types.int; default = 1536; description = '' The amount of RAM the VirtualBox appliance can use in MiB. ''; }; - vmDerivationName = mkOption { - type = types.str; + vmDerivationName = lib.mkOption { + type = lib.types.str; default = "nixos-ova-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}"; description = '' The name of the derivation for the VirtualBox appliance. ''; }; - vmName = mkOption { - type = types.str; + vmName = lib.mkOption { + type = lib.types.str; default = "${config.system.nixos.distroName} ${config.system.nixos.label} (${pkgs.stdenv.hostPlatform.system})"; description = '' The name of the VirtualBox appliance. ''; }; - vmFileName = mkOption { - type = types.str; + vmFileName = lib.mkOption { + type = lib.types.str; default = "nixos-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.ova"; description = '' The file name of the VirtualBox appliance. ''; }; - params = mkOption { - type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); + params = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ str int bool (listOf str) ]); example = { audio = "alsa"; rtcuseutc = "on"; @@ -66,8 +63,8 @@ in { Run `VBoxManage modifyvm --help` to see more options. ''; }; - exportParams = mkOption { - type = with types; listOf (oneOf [ str int bool (listOf str) ]); + exportParams = lib.mkOption { + type = with lib.types; listOf (oneOf [ str int bool (listOf str) ]); example = [ "--vsys" "0" "--vendor" "ACME Inc." ]; @@ -78,7 +75,7 @@ in { Run `VBoxManage export --help` to see more options. ''; }; - extraDisk = mkOption { + extraDisk = lib.mkOption { description = '' Optional extra disk/hdd configuration. The disk will be an 'ext4' partition on a separate file. @@ -89,26 +86,26 @@ in { mountPoint = "/home/demo/storage"; size = 100 * 1024; }; - type = types.nullOr (types.submodule { + type = lib.types.nullOr (lib.types.submodule { options = { - size = mkOption { - type = types.int; + size = lib.mkOption { + type = lib.types.int; description = "Size in MiB"; }; - label = mkOption { - type = types.str; + label = lib.mkOption { + type = lib.types.str; default = "vm-extra-storage"; description = "Label for the disk partition"; }; - mountPoint = mkOption { - type = types.str; + mountPoint = lib.mkOption { + type = lib.types.str; description = "Path where to mount this disk."; }; }; }); }; - postExportCommands = mkOption { - type = types.lines; + postExportCommands = lib.mkOption { + type = lib.types.lines; default = ""; example = '' ${pkgs.cot}/bin/cot edit-hardware "$fn" \ @@ -124,8 +121,8 @@ in { Extra commands to run after exporting the OVA to `$fn`. ''; }; - storageController = mkOption { - type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); + storageController = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ str int bool (listOf str) ]); example = { name = "SCSI"; add = "scsi"; @@ -152,8 +149,8 @@ in { config = { - virtualbox.params = mkMerge [ - (mapAttrs (name: mkDefault) { + virtualbox.params = lib.mkMerge [ + (lib.mapAttrs (name: lib.mkDefault) { acpi = "on"; vram = 32; nictype1 = "virtio"; @@ -167,7 +164,7 @@ in { usbehci = "on"; mouse = "usbtablet"; }) - (mkIf (pkgs.stdenv.hostPlatform.system == "i686-linux") { pae = "on"; }) + (lib.mkIf (pkgs.stdenv.hostPlatform.system == "i686-linux") { pae = "on"; }) ]; system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix { @@ -186,7 +183,7 @@ in { echo "converting image to VirtualBox format..." VBoxManage convertfromraw $diskImage disk.vdi - ${optionalString (cfg.extraDisk != null) '' + ${lib.optionalString (cfg.extraDisk != null) '' echo "creating extra disk: data-disk.raw" dataDiskImage=data-disk.raw truncate -s ${toString cfg.extraDisk.size}M $dataDiskImage @@ -210,7 +207,7 @@ in { VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController} VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \ --medium disk.vdi - ${optionalString (cfg.extraDisk != null) '' + ${lib.optionalString (cfg.extraDisk != null) '' VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \ --medium data-disk.vdi ''} @@ -218,7 +215,7 @@ in { echo "exporting VirtualBox VM..." mkdir -p $out fn="$out/${cfg.vmFileName}" - VBoxManage export "$vmName" --output "$fn" --options manifest ${escapeShellArgs cfg.exportParams} + VBoxManage export "$vmName" --output "$fn" --options manifest ${lib.escapeShellArgs cfg.exportParams} ${cfg.postExportCommands} rm -v $diskImage diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index 9bd8f41096438..c80181f287b32 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.virtualisation.vmware.guest; open-vm-tools = if cfg.headless then pkgs.open-vm-tools-headless else pkgs.open-vm-tools; @@ -9,20 +6,20 @@ let in { imports = [ - (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ]) + (lib.mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ]) ]; options.virtualisation.vmware.guest = { - enable = mkEnableOption "VMWare Guest Support"; - headless = mkOption { - type = types.bool; + enable = lib.mkEnableOption "VMWare Guest Support"; + headless = lib.mkOption { + type = lib.types.bool; default = !config.services.xserver.enable; defaultText = "!config.services.xserver.enable"; description = "Whether to disable X11-related features."; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isAarch64; message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}"; @@ -42,7 +39,7 @@ in }; # Mount the vmblock for drag-and-drop and copy-and-paste. - systemd.mounts = mkIf (!cfg.headless) [ + systemd.mounts = lib.mkIf (!cfg.headless) [ { description = "VMware vmblock fuse mount"; documentation = [ "https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/vmblock-fuse/design.txt" ]; @@ -55,7 +52,7 @@ in } ]; - security.wrappers.vmware-user-suid-wrapper = mkIf (!cfg.headless) { + security.wrappers.vmware-user-suid-wrapper = lib.mkIf (!cfg.headless) { setuid = true; owner = "root"; group = "root"; @@ -64,10 +61,10 @@ in environment.etc.vmware-tools.source = "${open-vm-tools}/etc/vmware-tools/*"; - services.xserver = mkIf (!cfg.headless) { - modules = [ xf86inputvmmouse ]; + services.xserver = lib.mkIf (!cfg.headless) { + modules = lib.optionals pkgs.stdenv.hostPlatform.isx86 [ xf86inputvmmouse ]; - config = '' + config = lib.optionalString (pkgs.stdenv.hostPlatform.isx86) '' Section "InputClass" Identifier "VMMouse" MatchDevicePath "/dev/input/event*" diff --git a/nixos/modules/virtualisation/xe-guest-utilities.nix b/nixos/modules/virtualisation/xe-guest-utilities.nix index 9bc68c0a3d7d6..14dd25e878cf1 100644 --- a/nixos/modules/virtualisation/xe-guest-utilities.nix +++ b/nixos/modules/virtualisation/xe-guest-utilities.nix @@ -4,7 +4,7 @@ let in { options = { services.xe-guest-utilities = { - enable = lib.mkEnableOption "the Xen guest utilities daemon"; + enable = lib.mkEnableOption "the XenServer guest utilities daemon"; }; }; config = lib.mkIf cfg.enable { diff --git a/nixos/modules/virtualisation/xen-boot-builder.sh b/nixos/modules/virtualisation/xen-boot-builder.sh new file mode 100755 index 0000000000000..1b7c1470f6eb4 --- /dev/null +++ b/nixos/modules/virtualisation/xen-boot-builder.sh @@ -0,0 +1,165 @@ +# This script is called by ./xen-dom0.nix to create the Xen boot entries. +# shellcheck shell=bash + +# Handle input argument and exit if the flag is invalid. See virtualisation.xen.efi.bootBuilderVerbosity below. +[[ $# -ne 1 ]] && echo -e "\e[1;31merror:\e[0m xenBootBuilder must be called with exactly one verbosity argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option." && exit 1 +case "$1" in + "quiet") true ;; + "default" | "info") echo -n "Installing Xen Project Hypervisor boot entries..." ;; + "debug") echo -e "\e[1;34mxenBootBuilder:\e[0m called with the '$1' flag" ;; + *) + echo -e "\e[1;31merror:\e[0m xenBootBuilder was called with an invalid argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option." + exit 2 + ;; +esac + +# Get the current Xen generations and store them in an array. This will be used +# for displaying the diff later, if xenBootBuilder was called with `info`. +# We also delete the current Xen entries here, as they'll be rebuilt later if +# the corresponding NixOS generation still exists. +mapfile -t preGenerations < <(find "$efiMountPoint"/loader/entries -type f -name 'xen-*.conf' | sort -V | sed 's_/loader/entries/nixos_/loader/entries/xen_g;s_^.*/xen_xen_g;s_.conf$__g') +if [ "$1" = "debug" ]; then + if ((${#preGenerations[@]} == 0)); then + echo -e "\e[1;34mxenBootBuilder:\e[0m no previous Xen entries." + else + echo -e "\e[1;34mxenBootBuilder:\e[0m deleting the following stale xen entries:" && for debugGen in "${preGenerations[@]}"; do echo " - $debugGen"; done + fi +fi + +# Cleanup all Xen entries. +rm -f "$efiMountPoint"/{loader/entries/xen-*.conf,efi/nixos/xen-*.efi} + +# Main array for storing which generations exist in $efiMountPoint after +# systemd-boot-builder.py builds the main entries. +mapfile -t gens < <(find "$efiMountPoint"/loader/entries -type f -name 'nixos-*.conf' | sort -V) +[ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m found the following NixOS boot entries:" && for debugGen in "${gens[@]}"; do echo " - $debugGen"; done + +# This is the main loop that installs the Xen entries. +for gen in "${gens[@]}"; do + + # We discover the path to Bootspec through the init attribute in the entries, + # as it is equivalent to $toplevel/init. + bootspecFile="$(sed -nr 's/^options init=(.*)\/init.*$/\1/p' "$gen")/boot.json" + [ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m processing bootspec file $bootspecFile" + + # We do nothing if the Bootspec for the current $gen does not contain the Xen + # extension, which is added as a configuration attribute below. + if grep -sq '"org.xenproject.bootspec.v1"' "$bootspecFile"; then + [ "$1" = "debug" ] && echo -e " \e[1;32msuccess:\e[0m found Xen entries in $gen." + + # TODO: Support DeviceTree booting. Xen has some special handling for DeviceTree + # attributes, which will need to be translated in a boot script similar to this + # one. Having a DeviceTree entry is rare, and it is not always required for a + # successful boot, so we don't fail here, only warn with `debug`. + if grep -sq '"devicetree"' "$bootspecFile"; then + echo -e "\n\e[1;33mwarning:\e[0m $gen has a \e[1;34morg.nixos.systemd-boot.devicetree\e[0m Bootspec entry. Xen currently does not support DeviceTree, so this value will be ignored in the Xen boot entries, which may cause them to \e[1;31mfail to boot\e[0m." + else + [ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m no DeviceTree entries found in $gen." + fi + + # Prepare required attributes for `xen.cfg/xen.conf`. It inherits the name of + # the corresponding nixos generation, substituting `nixos` with `xen`: + # `xen-$profile-generation-$number-specialisation-$specialisation.{cfg,conf}` + xenGen=$(echo "$gen" | sed 's_/loader/entries/nixos_/loader/entries/xen_g;s_^.*/xen_xen_g;s_.conf$__g') + bootParams=$(jq -re '."org.xenproject.bootspec.v1".xenParams | join(" ")' "$bootspecFile") + kernel=$(jq -re '."org.nixos.bootspec.v1".kernel | sub("^/nix/store/"; "") | sub("/bzImage"; "-bzImage.efi")' "$bootspecFile") + kernelParams=$(jq -re '."org.nixos.bootspec.v1".kernelParams | join(" ")' "$bootspecFile") + initrd=$(jq -re '."org.nixos.bootspec.v1".initrd | sub("^/nix/store/"; "") | sub("/initrd"; "-initrd.efi")' "$bootspecFile") + init=$(jq -re '."org.nixos.bootspec.v1".init' "$bootspecFile") + title=$(sed -nr 's/^title (.*)$/\1/p' "$gen") + version=$(sed -nr 's/^version (.*)$/\1/p' "$gen") + machineID=$(sed -nr 's/^machine-id (.*)$/\1/p' "$gen") + sortKey=$(sed -nr 's/^sort-key (.*)$/\1/p' "$gen") + + # Write `xen.cfg` to a temporary location prior to UKI creation. + tmpCfg=$(mktemp) + [ "$1" = "debug" ] && echo -ne "\e[1;34mxenBootBuilder:\e[0m writing $xenGen.cfg to temporary file..." + cat > "$tmpCfg" << EOF +[global] +default=xen + +[xen] +options=$bootParams +kernel=$kernel init=$init $kernelParams +ramdisk=$initrd +EOF + [ "$1" = "debug" ] && echo -e "done." + + # Create Xen UKI for $generation. Most of this is lifted from + # https://xenbits.xenproject.org/docs/unstable/misc/efi.html. + [ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m making Xen UKI..." + xenEfi=$(jq -re '."org.xenproject.bootspec.v1".xen' "$bootspecFile") + padding=$(objdump --header --section=".pad" "$xenEfi" | awk '/\.pad/ { printf("0x%016x\n", strtonum("0x"$3) + strtonum("0x"$4))};') + [ "$1" = "debug" ] && echo " - padding: $padding" + objcopy \ + --add-section .config="$tmpCfg" \ + --change-section-vma .config="$padding" \ + "$xenEfi" \ + "$efiMountPoint"/EFI/nixos/"$xenGen".efi + [ "$1" = "debug" ] && echo -e " - \e[1;32msuccessfully built\e[0m $xenGen.efi" + rm -f "$tmpCfg" + + # Write `xen.conf`. + [ "$1" = "debug" ] && echo -ne "\e[1;34mxenBootBuilder:\e[0m writing $xenGen.conf to EFI System Partition..." + cat > "$efiMountPoint"/loader/entries/"$xenGen".conf << EOF +title $title (with Xen Hypervisor) +version $version +efi /EFI/nixos/$xenGen.efi +machine-id $machineID +sort-key $sortKey +EOF + [ "$1" = "debug" ] && echo -e "done." + + # Sometimes, garbage collection weirdness causes a generation to still exist in + # the loader entries, but its Bootspec file was deleted. We consider such a + # generation to be invalid, but we don't write extra code to handle this + # situation, as supressing grep's error messages above is quite enough, and the + # error message below is still technically correct, as no Xen can be found in + # something that does not exist. + else + [ "$1" = "debug" ] && echo -e " \e[1;33mwarning:\e[0m \e[1;31mno Xen found\e[0m in $gen." + fi +done + +# Counterpart to the preGenerations array above. We use it to diff the +# generations created/deleted when callled with the `info` argument. +mapfile -t postGenerations < <(find "$efiMountPoint"/loader/entries -type f -name 'xen-*.conf' | sort -V | sed 's_/loader/entries/nixos_/loader/entries/xen_g;s_^.*/xen_xen_g;s_.conf$__g') + +# In the event the script does nothing, guide the user to debug, as it'll only +# ever run when Xen is enabled, and it makes no sense to enable Xen and not have +# any hypervisor boot entries. +if ((${#postGenerations[@]} == 0)); then + case "$1" in + "default" | "info") echo "none found." && echo -e "If you believe this is an error, set the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option to \e[1;34m\"debug\"\e[0m and rebuild to print debug logs." ;; + "debug") echo -e "\e[1;34mxenBootBuilder:\e[0m wrote \e[1;31mno generations\e[0m. Most likely, there were no generations with a valid \e[1;34morg.xenproject.bootspec.v1\e[0m entry." ;; + esac + +# If the script is successful, change the default boot, say "done.", write a +# diff, or print the total files written, depending on the argument this script +# was called with. We use some dumb dependencies here, like `diff` or `bat` for +# colourisation, but they're only included with the `info` argument. +# +# It's also fine to change the default here, as this runs after the +# `systemd-boot-builder.py` script, which overwrites the file, and this script +# does not run after an user disables the Xen module. +else + sed --in-place 's/^default nixos-/default xen-/g' "$efiMountPoint"/loader/loader.conf + case "$1" in + "default" | "info") echo "done." ;; + "debug") echo -e "\e[1;34mxenBootBuilder:\e[0m \e[1;32msuccessfully wrote\e[0m the following generations:" && for debugGen in "${postGenerations[@]}"; do echo " - $debugGen"; done ;; + esac + if [ "$1" = "info" ]; then + if [[ ${#preGenerations[@]} == "${#postGenerations[@]}" ]]; then + echo -e "\e[1;33mNo Change:\e[0m Xen Project Hypervisor boot entries were refreshed, but their contents are identical." + else + echo -e "\e[1;32mSuccess:\e[0m Changed the following boot entries:" + # We briefly unset errexit and pipefail here, as GNU diff has no option to not fail when files differ. + set +o errexit + set +o pipefail + diff <(echo "${preGenerations[*]}" | tr ' ' '\n') <(echo "${postGenerations[*]}" | tr ' ' '\n') -U 0 | grep --invert-match --extended-regexp '^(@@|---|\+\+\+).*' | sed '1{/^-$/d}' | bat --language diff --theme ansi --paging=never --plain + true + set -o errexit + set -o pipefail + fi + fi +fi diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 2fb8c6cd45664..9b6ec543dae59 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -1,452 +1,874 @@ -# Xen hypervisor (Dom0) support. +# Xen Project Hypervisor (Dom0) support. -{ config, lib, pkgs, ... }: - -with lib; +{ + config, + lib, + pkgs, + ... +}: let cfg = config.virtualisation.xen; + + xenBootBuilder = pkgs.writeShellApplication { + name = "xenBootBuilder"; + runtimeInputs = + (with pkgs; [ + binutils + coreutils + findutils + gawk + gnugrep + gnused + jq + ]) + ++ lib.lists.optionals (cfg.efi.bootBuilderVerbosity == "info") ( + with pkgs; + [ + bat + diffutils + ] + ); + runtimeEnv = { + efiMountPoint = config.boot.loader.efi.efiSysMountPoint; + }; + + # We disable SC2016 because we don't want to expand the regexes in the sed commands. + excludeShellChecks = [ "SC2016" ]; + + text = builtins.readFile ./xen-boot-builder.sh; + }; in { - imports = [ - (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") - (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ]) + imports = with lib.modules; [ + (mkRemovedOptionModule + [ + "virtualisation" + "xen" + "bridge" + "name" + ] + "The Xen Network Bridge options are currently unavailable. Please set up your own bridge manually." + ) + (mkRemovedOptionModule + [ + "virtualisation" + "xen" + "bridge" + "address" + ] + "The Xen Network Bridge options are currently unavailable. Please set up your own bridge manually." + ) + (mkRemovedOptionModule + [ + "virtualisation" + "xen" + "bridge" + "prefixLength" + ] + "The Xen Network Bridge options are currently unavailable. Please set up your own bridge manually." + ) + (mkRemovedOptionModule + [ + "virtualisation" + "xen" + "bridge" + "forwardDns" + ] + "The Xen Network Bridge options are currently unavailable. Please set up your own bridge manually." + ) + (mkRenamedOptionModule + [ + "virtualisation" + "xen" + "qemu-package" + ] + [ + "virtualisation" + "xen" + "qemu" + "package" + ] + ) + (mkRenamedOptionModule + [ + "virtualisation" + "xen" + "package-qemu" + ] + [ + "virtualisation" + "xen" + "qemu" + "package" + ] + ) + (mkRenamedOptionModule + [ + "virtualisation" + "xen" + "stored" + ] + [ + "virtualisation" + "xen" + "store" + "path" + ] + ) ]; - ###### interface + ## Interface ## - options = { + options.virtualisation.xen = { - virtualisation.xen.enable = - mkOption { - default = false; - type = types.bool; - description = '' - Setting this option enables the Xen hypervisor, a - virtualisation technology that allows multiple virtual - machines, known as *domains*, to run - concurrently on the physical machine. NixOS runs as the - privileged *Domain 0*. This option - requires a reboot to take effect. - ''; - }; + enable = lib.options.mkEnableOption "the Xen Project Hypervisor, a virtualisation technology defined as a *type-1 hypervisor*, which allows multiple virtual machines, known as *domains*, to run concurrently on the physical machine. NixOS runs as the privileged *Domain 0*. This option requires a reboot into a Xen kernel to take effect"; - virtualisation.xen.package = mkOption { - type = types.package; - defaultText = literalExpression "pkgs.xen"; - example = literalExpression "pkgs.xen-light"; - description = '' - The package used for Xen binary. - ''; - relatedPackages = [ "xen" "xen-light" ]; + debug = lib.options.mkEnableOption "Xen debug features for Domain 0. This option enables some hidden debugging tests and features, and should not be used in production"; + + trace = lib.options.mkOption { + type = lib.types.bool; + default = cfg.debug; + defaultText = lib.options.literalExpression "false"; + example = true; + description = "Whether to enable Xen debug tracing and logging for Domain 0."; }; - virtualisation.xen.package-qemu = mkOption { - type = types.package; - defaultText = literalExpression "pkgs.xen"; - example = literalExpression "pkgs.qemu_xen-light"; + package = lib.options.mkOption { + type = lib.types.package; + default = pkgs.xen; + defaultText = lib.options.literalExpression "pkgs.xen"; + example = lib.options.literalExpression "pkgs.xen-slim"; description = '' - The package with qemu binaries for dom0 qemu and xendomains. + The package used for Xen Project Hypervisor. ''; - relatedPackages = [ "xen" - { name = "qemu_xen-light"; comment = "For use with pkgs.xen-light."; } - ]; + relatedPackages = [ + "xen" + "xen-slim" + ]; }; - virtualisation.xen.bootParams = - mkOption { - default = []; - type = types.listOf types.str; - description = - '' - Parameters passed to the Xen hypervisor at boot time. - ''; + qemu = { + package = lib.options.mkOption { + type = lib.types.package; + default = pkgs.xen; + defaultText = lib.options.literalExpression "pkgs.xen"; + example = lib.options.literalExpression "pkgs.qemu_xen"; + description = '' + The package with QEMU binaries that runs in Domain 0 + and virtualises the unprivileged domains. + ''; + relatedPackages = [ + "xen" + { + name = "qemu_xen"; + comment = "For use with `pkgs.xen-slim`."; + } + ]; }; - - virtualisation.xen.domain0MemorySize = - mkOption { - default = 0; - example = 512; - type = types.addCheck types.int (n: n >= 0); - description = - '' - Amount of memory (in MiB) allocated to Domain 0 on boot. - If set to 0, all memory is assigned to Domain 0. - ''; + pidFile = lib.options.mkOption { + type = lib.types.path; + default = "/run/xen/qemu-dom0.pid"; + example = "/var/run/xen/qemu-dom0.pid"; + description = "Path to the QEMU PID file."; }; + }; - virtualisation.xen.bridge = { - name = mkOption { - default = "xenbr0"; - type = types.str; - description = '' - Name of bridge the Xen domUs connect to. - ''; - }; + bootParams = lib.options.mkOption { + default = [ ]; + example = '' + [ + "iommu=force:true,qinval:true,debug:true" + "noreboot=true" + "vga=ask" + ] + ''; + type = lib.types.listOf lib.types.str; + description = '' + Xen Command Line parameters passed to Domain 0 at boot time. + Note: these are different from `boot.kernelParams`. See + the [Xen documentation](https://xenbits.xenproject.org/docs/unstable/misc/xen-command-line.html) for more information. + ''; + }; - address = mkOption { - type = types.str; - default = "172.16.0.1"; - description = '' - IPv4 address of the bridge. - ''; - }; + efi = { + bootBuilderVerbosity = lib.options.mkOption { + type = lib.types.enum [ + "default" + "info" + "debug" + "quiet" + ]; + default = "default"; + example = "info"; + description = '' + The EFI boot entry builder script should be called with exactly one of the following arguments in order to specify its verbosity: - prefixLength = mkOption { - type = types.addCheck types.int (n: n >= 0 && n <= 32); - default = 16; - description = '' - Subnet mask of the bridge interface, specified as the number of - bits in the prefix (`24`). - A DHCP server will provide IP addresses for the whole, remaining - subnet. - ''; - }; + - `quiet` supresses all messages. - forwardDns = mkOption { - type = types.bool; - default = false; - description = '' - If set to `true`, the DNS queries from the - hosts connected to the bridge will be forwarded to the DNS - servers specified in /etc/resolv.conf . - ''; - }; + - `default` adds a simple "Installing Xen Project Hypervisor boot entries...done." message to the script. - }; + - `info` is the same as `default`, but it also prints a diff with information on which generations were altered. + - This option adds two extra dependencies to the script: `diffutils` and `bat`. - virtualisation.xen.stored = - mkOption { - type = types.path; - description = - '' - Xen Store daemon to use. Defaults to oxenstored of the xen package. - ''; + - `debug` prints information messages for every single step of the script. + + This option does not alter the actual functionality of the script, just the number of messages printed when rebuilding the system. + ''; }; - virtualisation.xen.domains = { - extraConfig = mkOption { - type = types.lines; - default = ""; - description = - '' - Options defined here will override the defaults for xendomains. - The default options can be seen in the file included from - /etc/default/xendomains. - ''; - }; + path = lib.options.mkOption { + type = lib.types.path; + default = "${cfg.package.boot}/${cfg.package.efi}"; + defaultText = lib.options.literalExpression "\${config.virtualisation.xen.package.boot}/\${config.virtualisation.xen.package.efi}"; + example = lib.options.literalExpression "\${config.virtualisation.xen.package}/boot/efi/efi/nixos/xen-\${config.virtualisation.xen.package.version}.efi"; + description = '' + Path to xen.efi. `pkgs.xen` is patched to install the xen.efi file + on `$boot/boot/xen.efi`, but an unpatched Xen build may install it + somewhere else, such as `$out/boot/efi/efi/nixos/xen.efi`. Unless + you're building your own Xen derivation, you should leave this + option as the default value. + ''; }; + }; - virtualisation.xen.trace = mkEnableOption "Xen tracing"; + dom0Resources = { + maxVCPUs = lib.options.mkOption { + default = 0; + example = 4; + type = lib.types.ints.unsigned; + description = '' + Amount of virtual CPU cores allocated to Domain 0 on boot. + If set to 0, all cores are assigned to Domain 0, and + unprivileged domains will compete with Domain 0 for CPU time. + ''; + }; - }; + memory = lib.options.mkOption { + default = 0; + example = 512; + type = lib.types.ints.unsigned; + description = '' + Amount of memory (in MiB) allocated to Domain 0 on boot. + If set to 0, all memory is assigned to Domain 0, and + unprivileged domains will compete with Domain 0 for free RAM. + ''; + }; + maxMemory = lib.options.mkOption { + default = cfg.dom0Resources.memory; + defaultText = lib.options.literalExpression "config.virtualisation.xen.dom0Resources.memory"; + example = 1024; + type = lib.types.ints.unsigned; + description = '' + Maximum amount of memory (in MiB) that Domain 0 can + dynamically allocate to itself. Does nothing if set + to the same amount as virtualisation.xen.memory, or + if that option is set to 0. + ''; + }; + }; - ###### implementation + domains = { + extraConfig = lib.options.mkOption { + type = lib.types.lines; + default = ""; + example = '' + XENDOMAINS_SAVE=/persist/xen/save + XENDOMAINS_RESTORE=false + XENDOMAINS_CREATE_USLEEP=10000000 + ''; + description = '' + Options defined here will override the defaults for xendomains. + The default options can be seen in the file included from + /etc/default/xendomains. + ''; + }; + }; - config = mkIf cfg.enable { - assertions = [ { - assertion = pkgs.stdenv.isx86_64; - message = "Xen currently not supported on ${pkgs.stdenv.hostPlatform.system}"; - } { - assertion = config.boot.loader.grub.enable && (config.boot.loader.grub.efiSupport == false); - message = "Xen currently does not support EFI boot"; - } ]; + store = { + path = lib.options.mkOption { + type = lib.types.path; + default = "${cfg.package}/bin/oxenstored"; + defaultText = lib.options.literalExpression "\${config.virtualisation.xen.package}/bin/oxenstored"; + example = lib.options.literalExpression "\${config.virtualisation.xen.package}/bin/xenstored"; + description = '' + Path to the Xen Store Daemon. This option is useful to + switch between the legacy C-based Xen Store Daemon, and + the newer OCaml-based Xen Store Daemon, `oxenstored`. + ''; + }; + type = lib.options.mkOption { + type = lib.types.enum [ + "c" + "ocaml" + ]; + default = if (lib.strings.hasSuffix "oxenstored" cfg.store.path) then "ocaml" else "c"; + internal = true; + readOnly = true; + description = "Helper internal option that determines the type of the Xen Store Daemon based on cfg.store.path."; + }; + settings = lib.options.mkOption { + default = { }; + example = { + enableMerge = false; + quota.maxWatchEvents = 2048; + quota.enable = true; + conflict.maxHistorySeconds = 0.12; + conflict.burstLimit = 15.0; + xenstored.log.file = "/dev/null"; + xenstored.log.level = "info"; + }; + description = '' + The OCaml-based Xen Store Daemon configuration. This + option does nothing with the C-based `xenstored`. + ''; + type = lib.types.submodule { + options = { + pidFile = lib.options.mkOption { + default = "/run/xen/xenstored.pid"; + example = "/var/run/xen/xenstored.pid"; + type = lib.types.path; + description = "Path to the Xen Store Daemon PID file."; + }; + testEAGAIN = lib.options.mkOption { + default = cfg.debug; + defaultText = lib.options.literalExpression "config.virtualisation.xen.debug"; + example = true; + type = lib.types.bool; + visible = false; + description = "Randomly fail a transaction with EAGAIN. This option is used for debugging purposes only."; + }; + enableMerge = lib.options.mkOption { + default = true; + example = false; + type = lib.types.bool; + description = "Whether to enable transaction merge support."; + }; + conflict = { + burstLimit = lib.options.mkOption { + default = 5.0; + example = 15.0; + type = lib.types.addCheck ( + lib.types.float + // { + name = "nonnegativeFloat"; + description = "nonnegative floating point number, meaning >=0"; + descriptionClass = "nonRestrictiveClause"; + } + ) (n: n >= 0); + description = '' + Limits applied to domains whose writes cause other domains' transaction + commits to fail. Must include decimal point. + + The burst limit is the number of conflicts a domain can cause to + fail in a short period; this value is used for both the initial and + the maximum value of each domain's conflict-credit, which falls by + one point for each conflict caused, and when it reaches zero the + domain's requests are ignored. + ''; + }; + maxHistorySeconds = lib.options.mkOption { + default = 5.0e-2; + example = 1.0; + type = lib.types.addCheck ( + lib.types.float // { description = "nonnegative floating point number, meaning >=0"; } + ) (n: n >= 0); + description = '' + Limits applied to domains whose writes cause other domains' transaction + commits to fail. Must include decimal point. + + The conflict-credit is replenished over time: + one point is issued after each conflict.maxHistorySeconds, so this + is the minimum pause-time during which a domain will be ignored. + ''; + }; + rateLimitIsAggregate = lib.options.mkOption { + default = true; + example = false; + type = lib.types.bool; + description = '' + If the conflict.rateLimitIsAggregate option is `true`, then after each + tick one point of conflict-credit is given to just one domain: the + one at the front of the queue. If `false`, then after each tick each + domain gets a point of conflict-credit. + + In environments where it is known that every transaction will + involve a set of nodes that is writable by at most one other domain, + then it is safe to set this aggregate limit flag to `false` for better + performance. (This can be determined by considering the layout of + the xenstore tree and permissions, together with the content of the + transactions that require protection.) + + A transaction which involves a set of nodes which can be modified by + multiple other domains can suffer conflicts caused by any of those + domains, so the flag must be set to `true`. + ''; + }; + }; + perms = { + enable = lib.options.mkOption { + default = true; + example = false; + type = lib.types.bool; + description = "Whether to enable the node permission system."; + }; + enableWatch = lib.options.mkOption { + default = true; + example = false; + type = lib.types.bool; + description = '' + Whether to enable the watch permission system. + + When this is set to `true`, unprivileged guests can only get watch events + for xenstore entries that they would've been able to read. + + When this is set to `false`, unprivileged guests may get watch events + for xenstore entries that they cannot read. The watch event contains + only the entry name, not the value. + This restores behaviour prior to [XSA-115](https://xenbits.xenproject.org/xsa/advisory-115.html). + ''; + }; + }; + quota = { + enable = lib.options.mkOption { + default = true; + example = false; + type = lib.types.bool; + description = "Whether to enable the quota system."; + }; + maxEntity = lib.options.mkOption { + default = 1000; + example = 1024; + type = lib.types.ints.positive; + description = "Entity limit for transactions."; + }; + maxSize = lib.options.mkOption { + default = 2048; + example = 4096; + type = lib.types.ints.positive; + description = "Size limit for transactions."; + }; + maxWatch = lib.options.mkOption { + default = 100; + example = 256; + type = lib.types.ints.positive; + description = "Maximum number of watches by the Xenstore Watchdog."; + }; + transaction = lib.options.mkOption { + default = 10; + example = 50; + type = lib.types.ints.positive; + description = "Maximum number of transactions."; + }; + maxRequests = lib.options.mkOption { + default = 1024; + example = 1024; + type = lib.types.ints.positive; + description = "Maximum number of requests per transaction."; + }; + maxPath = lib.options.mkOption { + default = 1024; + example = 1024; + type = lib.types.ints.positive; + description = "Path limit for the quota system."; + }; + maxOutstanding = lib.options.mkOption { + default = 1024; + example = 1024; + type = lib.types.ints.positive; + description = "Maximum outstanding requests, i.e. in-flight requests / domain."; + }; + maxWatchEvents = lib.options.mkOption { + default = 1024; + example = 2048; + type = lib.types.ints.positive; + description = "Maximum number of outstanding watch events per watch."; + }; + }; + persistent = lib.options.mkOption { + default = false; + example = true; + type = lib.types.bool; + description = "Whether to activate the filed base backend."; + }; + xenstored = { + log = { + file = lib.options.mkOption { + default = "/var/log/xen/xenstored.log"; + example = "/dev/null"; + type = lib.types.path; + description = "Path to the Xen Store log file."; + }; + level = lib.options.mkOption { + default = if cfg.trace then "debug" else null; + defaultText = lib.options.literalExpression "if (config.virtualisation.xen.trace == true) then \"debug\" else null"; + example = "error"; + type = lib.types.nullOr ( + lib.types.enum [ + "debug" + "info" + "warn" + "error" + ] + ); + description = "Logging level for the Xen Store."; + }; + # The hidden options below have no upstream documentation whatsoever. + # The nb* options appear to alter the log rotation behaviour, and + # the specialOps option appears to affect the Xenbus logging logic. + nbFiles = lib.options.mkOption { + default = 10; + example = 16; + type = lib.types.int; + visible = false; + description = "Set `xenstored-log-nb-files`."; + }; + }; + accessLog = { + file = lib.options.mkOption { + default = "/var/log/xen/xenstored-access.log"; + example = "/var/log/security/xenstored-access.log"; + type = lib.types.path; + description = "Path to the Xen Store access log file."; + }; + nbLines = lib.options.mkOption { + default = 13215; + example = 16384; + type = lib.types.int; + visible = false; + description = "Set `access-log-nb-lines`."; + }; + nbChars = lib.options.mkOption { + default = 180; + example = 256; + type = lib.types.int; + visible = false; + description = "Set `acesss-log-nb-chars`."; + }; + specialOps = lib.options.mkOption { + default = false; + example = true; + type = lib.types.bool; + visible = false; + description = "Set `access-log-special-ops`."; + }; + }; + xenfs = { + kva = lib.options.mkOption { + default = "/proc/xen/xsd_kva"; + example = cfg.store.settings.xenstored.xenfs.kva; + type = lib.types.path; + visible = false; + description = '' + Path to the Xen Store Daemon KVA location inside the XenFS pseudo-filesystem. + While it is possible to alter this value, some drivers may be hardcoded to follow the default paths. + ''; + }; + port = lib.options.mkOption { + default = "/proc/xen/xsd_port"; + example = cfg.store.settings.xenstored.xenfs.port; + type = lib.types.path; + visible = false; + description = '' + Path to the Xen Store Daemon userspace port inside the XenFS pseudo-filesystem. + While it is possible to alter this value, some drivers may be hardcoded to follow the default paths. + ''; + }; + }; + }; + ringScanInterval = lib.options.mkOption { + default = 20; + example = 30; + type = lib.types.addCheck ( + lib.types.int + // { + name = "nonzeroInt"; + description = "nonzero signed integer, meaning !=0"; + descriptionClass = "nonRestrictiveClause"; + } + ) (n: n != 0); + description = '' + Perodic scanning for all the rings as a safenet for lazy clients. + Define the interval in seconds; set to a negative integer to disable. + ''; + }; + }; + }; + }; + }; + }; - virtualisation.xen.package = mkDefault pkgs.xen; - virtualisation.xen.package-qemu = mkDefault pkgs.xen; - virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored"; + ## Implementation ## - environment.systemPackages = [ cfg.package ]; + config = lib.modules.mkIf cfg.enable { + assertions = [ + { + assertion = pkgs.stdenv.hostPlatform.isx86_64; + message = "Xen is currently not supported on ${pkgs.stdenv.hostPlatform.system}."; + } + { + assertion = + config.boot.loader.systemd-boot.enable + || (config.boot ? lanzaboote) && config.boot.lanzaboote.enable; + message = "Xen only supports booting on systemd-boot or Lanzaboote."; + } + { + assertion = config.boot.initrd.systemd.enable; + message = "Xen does not support the legacy script-based Stage 1 initrd."; + } + { + assertion = cfg.dom0Resources.maxMemory >= cfg.dom0Resources.memory; + message = '' + You have allocated more memory to dom0 than virtualisation.xen.dom0Resources.maxMemory + allows for. Please increase the maximum memory limit, or decrease the default memory allocation. + ''; + } + { + assertion = cfg.debug -> cfg.trace; + message = "Xen's debugging features are enabled, but logging is disabled. This is most likely not what you want."; + } + { + assertion = cfg.store.settings.quota.maxWatchEvents >= cfg.store.settings.quota.maxOutstanding; + message = '' + Upstream Xen recommends that maxWatchEvents be equal to or greater than maxOutstanding, + in order to mitigate denial of service attacks from malicious frontends. + ''; + } + ]; - boot.kernelModules = - [ "xen-evtchn" "xen-gntdev" "xen-gntalloc" "xen-blkback" "xen-netback" - "xen-pciback" "evtchn" "gntdev" "netbk" "blkbk" "xen-scsibk" - "usbbk" "pciback" "xen-acpi-processor" "blktap2" "tun" "netxen_nic" - "xen_wdt" "xen-acpi-processor" "xen-privcmd" "xen-scsiback" + virtualisation.xen.bootParams = + lib.lists.optionals cfg.trace [ + "loglvl=all" + "guest_loglvl=all" + ] + ++ + lib.lists.optional (cfg.dom0Resources.memory != 0) + "dom0_mem=${toString cfg.dom0Resources.memory}M${ + lib.strings.optionalString ( + cfg.dom0Resources.memory != cfg.dom0Resources.maxMemory + ) ",max:${toString cfg.dom0Resources.maxMemory}M" + }" + ++ lib.lists.optional ( + cfg.dom0Resources.maxVCPUs != 0 + ) "dom0_max_vcpus=${toString cfg.dom0Resources.maxVCPUs}"; + + boot = { + kernelModules = [ + "xen-evtchn" + "xen-gntdev" + "xen-gntalloc" + "xen-blkback" + "xen-netback" + "xen-pciback" + "evtchn" + "gntdev" + "netbk" + "blkbk" + "xen-scsibk" + "usbbk" + "pciback" + "xen-acpi-processor" + "blktap2" + "tun" + "netxen_nic" + "xen_wdt" + "xen-acpi-processor" + "xen-privcmd" + "xen-scsiback" "xenfs" ]; - # The xenfs module is needed in system.activationScripts.xen, but - # the modprobe command there fails silently. Include xenfs in the - # initrd as a work around. - boot.initrd.kernelModules = [ "xenfs" ]; - - # The radeonfb kernel module causes the screen to go black as soon - # as it's loaded, so don't load it. - boot.blacklistedKernelModules = [ "radeonfb" ]; + # The xenfs module is needed to mount /proc/xen. + initrd.kernelModules = [ "xenfs" ]; - # Increase the number of loopback devices from the default (8), - # which is way too small because every VM virtual disk requires a - # loopback device. - boot.extraModprobeConfig = - '' + # Increase the number of loopback devices from the default (8), + # which is way too small because every VM virtual disk requires a + # loopback device. + extraModprobeConfig = '' options loop max_loop=64 ''; - virtualisation.xen.bootParams = [] ++ - optionals cfg.trace [ "loglvl=all" "guest_loglvl=all" ] ++ - optional (cfg.domain0MemorySize != 0) "dom0_mem=${toString cfg.domain0MemorySize}M"; - - system.extraSystemBuilderCmds = - '' - ln -s ${cfg.package}/boot/xen.gz $out/xen.gz - echo "${toString cfg.bootParams}" > $out/xen-params - ''; + # Xen Bootspec extension. This extension allows NixOS bootloaders to + # fetch the `xen.efi` path and access the `cfg.bootParams` option. + bootspec.extensions = { + "org.xenproject.bootspec.v1" = { + xen = cfg.efi.path; + xenParams = cfg.bootParams; + }; + }; - # Mount the /proc/xen pseudo-filesystem. - system.activationScripts.xen = - '' - if [ -d /proc/xen ]; then - ${pkgs.kmod}/bin/modprobe xenfs 2> /dev/null - ${pkgs.util-linux}/bin/mountpoint -q /proc/xen || \ - ${pkgs.util-linux}/bin/mount -t xenfs none /proc/xen - fi + # See the `xenBootBuilder` script in the main `let...in` statement of this file. + loader.systemd-boot.extraInstallCommands = '' + ${lib.meta.getExe xenBootBuilder} ${cfg.efi.bootBuilderVerbosity} ''; + }; # Domain 0 requires a pvops-enabled kernel. - system.requiredKernelConfig = with config.lib.kernelConfig; - [ (isYes "XEN") - (isYes "X86_IO_APIC") - (isYes "ACPI") - (isYes "XEN_DOM0") - (isYes "PCI_XEN") - (isYes "XEN_DEV_EVTCHN") - (isYes "XENFS") - (isYes "XEN_COMPAT_XENFS") - (isYes "XEN_SYS_HYPERVISOR") - (isYes "XEN_GNTDEV") - (isYes "XEN_BACKEND") - (isModule "XEN_NETDEV_BACKEND") - (isModule "XEN_BLKDEV_BACKEND") - (isModule "XEN_PCIDEV_BACKEND") - (isYes "XEN_BALLOON") - (isYes "XEN_SCRUB_PAGES") + # All NixOS kernels come with this enabled by default; this is merely a sanity check. + system.requiredKernelConfig = with config.lib.kernelConfig; [ + (isYes "XEN") + (isYes "X86_IO_APIC") + (isYes "ACPI") + (isYes "XEN_DOM0") + (isYes "PCI_XEN") + (isYes "XEN_DEV_EVTCHN") + (isYes "XENFS") + (isYes "XEN_COMPAT_XENFS") + (isYes "XEN_SYS_HYPERVISOR") + (isYes "XEN_GNTDEV") + (isYes "XEN_BACKEND") + (isModule "XEN_NETDEV_BACKEND") + (isModule "XEN_BLKDEV_BACKEND") + (isModule "XEN_PCIDEV_BACKEND") + (isYes "XEN_BALLOON") + (isYes "XEN_SCRUB_PAGES") + ]; + + environment = { + systemPackages = [ + cfg.package + cfg.qemu.package ]; + etc = + # Set up Xen Domain 0 configuration files. + { + "xen/xl.conf".source = "${cfg.package}/etc/xen/xl.conf"; # TODO: Add options to configure xl.conf declaratively. It's worth considering making a new "xl value" type, as it could be reused to produce xl.cfg (domain definition) files. + "xen/scripts-xen" = { + source = "${cfg.package}/etc/xen/scripts/*"; + target = "xen/scripts"; + }; + "default/xencommons".text = '' + source ${cfg.package}/etc/default/xencommons + + XENSTORED="${cfg.store.path}" + QEMU_XEN="${cfg.qemu.package}/${cfg.qemu.package.qemu-system-i386}" + ${lib.strings.optionalString cfg.trace '' + XENSTORED_TRACE=yes + XENCONSOLED_TRACE=all + ''} + ''; + "default/xendomains".text = '' + source ${cfg.package}/etc/default/xendomains - - environment.etc = - { - "xen/xl.conf".source = "${cfg.package}/etc/xen/xl.conf"; - "xen/scripts".source = "${cfg.package}/etc/xen/scripts"; - "default/xendomains".text = '' - source ${cfg.package}/etc/default/xendomains - - ${cfg.domains.extraConfig} - ''; - } - // optionalAttrs (builtins.compareVersions cfg.package.version "4.10" >= 0) { - # in V 4.10 oxenstored requires /etc/xen/oxenstored.conf to start - "xen/oxenstored.conf".source = "${cfg.package}/etc/xen/oxenstored.conf"; - }; + ${cfg.domains.extraConfig} + ''; + } + # The OCaml-based Xen Store Daemon requires /etc/xen/oxenstored.conf to start. + // lib.attrsets.optionalAttrs (cfg.store.type == "ocaml") { + "xen/oxenstored.conf".text = '' + pid-file = ${cfg.store.settings.pidFile} + test-eagain = ${lib.trivial.boolToString cfg.store.settings.testEAGAIN} + merge-activate = ${toString cfg.store.settings.enableMerge} + conflict-burst-limit = ${toString cfg.store.settings.conflict.burstLimit} + conflict-max-history-seconds = ${toString cfg.store.settings.conflict.maxHistorySeconds} + conflict-rate-limit-is-aggregate = ${toString cfg.store.settings.conflict.rateLimitIsAggregate} + perms-activate = ${toString cfg.store.settings.perms.enable} + perms-watch-activate = ${toString cfg.store.settings.perms.enableWatch} + quota-activate = ${toString cfg.store.settings.quota.enable} + quota-maxentity = ${toString cfg.store.settings.quota.maxEntity} + quota-maxsize = ${toString cfg.store.settings.quota.maxSize} + quota-maxwatch = ${toString cfg.store.settings.quota.maxWatch} + quota-transaction = ${toString cfg.store.settings.quota.transaction} + quota-maxrequests = ${toString cfg.store.settings.quota.maxRequests} + quota-path-max = ${toString cfg.store.settings.quota.maxPath} + quota-maxoutstanding = ${toString cfg.store.settings.quota.maxOutstanding} + quota-maxwatchevents = ${toString cfg.store.settings.quota.maxWatchEvents} + persistent = ${lib.trivial.boolToString cfg.store.settings.persistent} + xenstored-log-file = ${cfg.store.settings.xenstored.log.file} + xenstored-log-level = ${ + if isNull cfg.store.settings.xenstored.log.level then + "null" + else + cfg.store.settings.xenstored.log.level + } + xenstored-log-nb-files = ${toString cfg.store.settings.xenstored.log.nbFiles} + access-log-file = ${cfg.store.settings.xenstored.accessLog.file} + access-log-nb-lines = ${toString cfg.store.settings.xenstored.accessLog.nbLines} + acesss-log-nb-chars = ${toString cfg.store.settings.xenstored.accessLog.nbChars} + access-log-special-ops = ${lib.trivial.boolToString cfg.store.settings.xenstored.accessLog.specialOps} + ring-scan-interval = ${toString cfg.store.settings.ringScanInterval} + xenstored-kva = ${cfg.store.settings.xenstored.xenfs.kva} + xenstored-port = ${cfg.store.settings.xenstored.xenfs.port} + ''; + }; + }; # Xen provides udev rules. services.udev.packages = [ cfg.package ]; - services.udev.path = [ pkgs.bridge-utils pkgs.iproute2 ]; - - systemd.services.xen-store = { - description = "Xen Store Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "xen-store.socket" ]; - requires = [ "xen-store.socket" ]; - preStart = '' - export XENSTORED_ROOTDIR="/var/lib/xenstored" - rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null - - mkdir -p /var/run - mkdir -p /var/log/xen # Running xl requires /var/log/xen and /var/lib/xen, - mkdir -p /var/lib/xen # so we create them here unconditionally. - grep -q control_d /proc/xen/capabilities - ''; - serviceConfig = if (builtins.compareVersions cfg.package.version "4.8" < 0) then - { ExecStart = '' - ${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork - ''; - } else { - ExecStart = '' - ${cfg.package}/etc/xen/scripts/launch-xenstore - ''; - Type = "notify"; - RemainAfterExit = true; - NotifyAccess = "all"; - }; - postStart = '' - ${optionalString (builtins.compareVersions cfg.package.version "4.8" < 0) '' - time=0 - timeout=30 - # Wait for xenstored to actually come up, timing out after 30 seconds - while [ $time -lt $timeout ] && ! `${cfg.package}/bin/xenstore-read -s / >/dev/null 2>&1` ; do - time=$(($time+1)) - sleep 1 - done - - # Exit if we timed out - if ! [ $time -lt $timeout ] ; then - echo "Could not start Xenstore Daemon" - exit 1 - fi - ''} - echo "executing xen-init-dom0" - ${cfg.package}/lib/xen/bin/xen-init-dom0 - ''; - }; + systemd = { + # Xen provides systemd units. + packages = [ cfg.package ]; + + mounts = [ + { + description = "Mount /proc/xen files"; + what = "xenfs"; + where = "/proc/xen"; + type = "xenfs"; + unitConfig = { + ConditionPathExists = "/proc/xen"; + RefuseManualStop = "true"; + }; + } + ]; - systemd.sockets.xen-store = { - description = "XenStore Socket for userspace API"; - wantedBy = [ "sockets.target" ]; - socketConfig = { - ListenStream = [ "/var/run/xenstored/socket" "/var/run/xenstored/socket_ro" ]; - SocketMode = "0660"; - SocketUser = "root"; - SocketGroup = "root"; - }; - }; + services = { + # While this service is installed by the `xen` package, it shouldn't be used in dom0. + xendriverdomain.enable = false; - systemd.services.xen-console = { - description = "Xen Console Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "xen-store.service" ]; - requires = [ "xen-store.service" ]; - preStart = '' - mkdir -p /var/run/xen - ${optionalString cfg.trace "mkdir -p /var/log/xen"} - grep -q control_d /proc/xen/capabilities - ''; - serviceConfig = { - ExecStart = '' - ${cfg.package}/bin/xenconsoled\ - ${optionalString ((builtins.compareVersions cfg.package.version "4.8" >= 0)) " -i"}\ - ${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"} + xenstored = { + wantedBy = [ "multi-user.target" ]; + preStart = '' + export XENSTORED_ROOTDIR="/var/lib/xenstored" + rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null + mkdir -p /var/{run,log,lib}/xen ''; - }; - }; - - - systemd.services.xen-qemu = { - description = "Xen Qemu Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "xen-console.service" ]; - requires = [ "xen-store.service" ]; - serviceConfig.ExecStart = '' - ${cfg.package-qemu}/${cfg.package-qemu.qemu-system-i386} \ - -xen-attach -xen-domid 0 -name dom0 -M xenpv \ - -nographic -monitor /dev/null -serial /dev/null -parallel /dev/null - ''; - }; + }; + xen-init-dom0 = { + restartIfChanged = false; + wantedBy = [ "multi-user.target" ]; + }; - systemd.services.xen-watchdog = { - description = "Xen Watchdog Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "xen-qemu.service" "xen-domains.service" ]; - serviceConfig.ExecStart = "${cfg.package}/bin/xenwatchdogd 30 15"; - serviceConfig.Type = "forking"; - serviceConfig.RestartSec = "1"; - serviceConfig.Restart = "on-failure"; - }; + xen-qemu-dom0-disk-backend = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + PIDFile = cfg.qemu.pidFile; + ExecStart = '' + ${cfg.qemu.package}/${cfg.qemu.package.qemu-system-i386} \ + -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv \ + -daemonize -monitor /dev/null -serial /dev/null -parallel \ + /dev/null -nodefaults -no-user-config -pidfile \ + ${cfg.qemu.pidFile} + ''; + }; + }; + xenconsoled.wantedBy = [ "multi-user.target" ]; - systemd.services.xen-bridge = { - description = "Xen bridge"; - wantedBy = [ "multi-user.target" ]; - before = [ "xen-domains.service" ]; - preStart = '' - mkdir -p /var/run/xen - touch /var/run/xen/dnsmasq.pid - touch /var/run/xen/dnsmasq.etherfile - touch /var/run/xen/dnsmasq.leasefile - - IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Usable\ range` - export XEN_BRIDGE_IP_RANGE_START="${"\${data[1]//[[:blank:]]/}"}" - export XEN_BRIDGE_IP_RANGE_END="${"\${data[2]//[[:blank:]]/}"}" - - IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ address` - export XEN_BRIDGE_NETWORK_ADDRESS="${"\${data[1]//[[:blank:]]/}"}" - - IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ mask` - export XEN_BRIDGE_NETMASK="${"\${data[1]//[[:blank:]]/}"}" - - echo "${cfg.bridge.address} host gw dns" > /var/run/xen/dnsmasq.hostsfile - - cat < /var/run/xen/dnsmasq.conf - no-daemon - pid-file=/var/run/xen/dnsmasq.pid - interface=${cfg.bridge.name} - except-interface=lo - bind-interfaces - auth-zone=xen.local,$XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} - domain=xen.local - addn-hosts=/var/run/xen/dnsmasq.hostsfile - expand-hosts - strict-order - no-hosts - bogus-priv - ${optionalString (!cfg.bridge.forwardDns) '' - no-resolv - no-poll - auth-server=dns.xen.local,${cfg.bridge.name} - ''} - filterwin2k - clear-on-reload - domain-needed - dhcp-hostsfile=/var/run/xen/dnsmasq.etherfile - dhcp-authoritative - dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END - dhcp-no-override - no-ping - dhcp-leasefile=/var/run/xen/dnsmasq.leasefile - EOF - - # DHCP - ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p tcp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT - ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p udp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT - # DNS - ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT - ${pkgs.iptables}/bin/iptables -w -I INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT - - ${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge.name} - ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} ${cfg.bridge.address} - ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} netmask $XEN_BRIDGE_NETMASK - ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} up - ''; - serviceConfig.ExecStart = "${pkgs.dnsmasq}/bin/dnsmasq --conf-file=/var/run/xen/dnsmasq.conf"; - postStop = '' - IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ address` - export XEN_BRIDGE_NETWORK_ADDRESS="${"\${data[1]//[[:blank:]]/}"}" - - ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} down - ${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge.name} - - # DNS - ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT - ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT - # DHCP - ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT - ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT - ''; - }; - + xen-watchdog = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + RestartSec = "1"; + Restart = "on-failure"; + }; + }; - systemd.services.xen-domains = { - description = "Xen domains - automatically starts, saves and restores Xen domains"; - wantedBy = [ "multi-user.target" ]; - after = [ "xen-bridge.service" "xen-qemu.service" ]; - requires = [ "xen-bridge.service" "xen-qemu.service" ]; - ## To prevent a race between dhcpcd and xend's bridge setup script - ## (which renames eth* to peth* and recreates eth* as a virtual - ## device), start dhcpcd after xend. - before = [ "dhcpd.service" ]; - restartIfChanged = false; - serviceConfig.RemainAfterExit = "yes"; - path = [ cfg.package cfg.package-qemu ]; - environment.XENDOM_CONFIG = "${cfg.package}/etc/sysconfig/xendomains"; - preStart = "mkdir -p /var/lock/subsys -m 755"; - serviceConfig.ExecStart = "${cfg.package}/etc/init.d/xendomains start"; - serviceConfig.ExecStop = "${cfg.package}/etc/init.d/xendomains stop"; + xendomains = { + restartIfChanged = false; + path = [ + cfg.package + cfg.qemu.package + ]; + preStart = "mkdir -p /var/lock/subsys -m 755"; + wantedBy = [ "multi-user.target" ]; + }; + }; }; - }; + meta.maintainers = lib.teams.xen.members; } diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 00ab7efb03b4c..0724d51b1971c 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -82,10 +82,9 @@ in rec { (onFullSupported "nixos.tests.gitlab") (onFullSupported "nixos.tests.gnome") (onFullSupported "nixos.tests.gnome-xorg") - # FIXME: broken by QEMU 8.2.3 upgrade, reenable when fixed - # Upstream issue: https://gitlab.com/qemu-project/qemu/-/issues/2321 - # (onSystems ["x86_64-linux"] "nixos.tests.hibernate") + (onSystems ["x86_64-linux"] "nixos.tests.hibernate") (onFullSupported "nixos.tests.i3wm") + (onSystems ["aarch64-linux"] "nixos.tests.installer.simpleUefiSystemdBoot") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolDefault") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolEscape") diff --git a/nixos/release-small.nix b/nixos/release-small.nix index d4d7b7b4149b4..d3a70506ddecb 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -32,7 +32,7 @@ let in rec { nixos = { - inherit (nixos') channel manual options iso_minimal dummy; + inherit (nixos') channel manual options dummy; tests = { inherit (nixos'.tests) acme @@ -53,12 +53,8 @@ in rec { inherit (nixos'.tests.installer) lvm separateBoot - simple; - }; - boot = { - inherit (nixos'.tests.boot) - biosCdrom - uefiCdrom; + simple + simpleUefiSystemdBoot; }; }; }; @@ -108,21 +104,19 @@ in rec { "nixpkgs.release-checks" ] (map (onSystems [ "x86_64-linux" ]) [ - "nixos.tests.boot.biosCdrom" "nixos.tests.installer.lvm" "nixos.tests.installer.separateBoot" "nixos.tests.installer.simple" ]) (map onSupported [ "nixos.dummy" - "nixos.iso_minimal" "nixos.manual" "nixos.tests.acme" - "nixos.tests.boot.uefiCdrom" "nixos.tests.containers-imperative" "nixos.tests.containers-ip" "nixos.tests.firewall" "nixos.tests.ipv6" + "nixos.tests.installer.simpleUefiSystemdBoot" "nixos.tests.login" "nixos.tests.misc" "nixos.tests.nat.firewall" diff --git a/nixos/release.nix b/nixos/release.nix index eeca73ea4c550..8a8c45f8f8425 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -49,7 +49,7 @@ let system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev; # At creation time we do not have state yet, so just default to latest. - system.stateVersion = config.system.nixos.version; + system.stateVersion = config.system.nixos.release; }; makeModules = module: rest: [ configuration versionModule module rest ]; diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index a4f00be887be2..710a5cb729106 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -407,7 +407,6 @@ in { '' import time - TOTAL_RETRIES = 20 @@ -428,6 +427,16 @@ in { return retries + 1 + def protect(self, func): + def wrapper(*args, retries: int = 0, **kwargs): + try: + return func(*args, **kwargs) + except Exception as err: + retries = self.handle_fail(retries, err.args) + return wrapper(*args, retries=retries, **kwargs) + + return wrapper + backoff = BackoffTracker() @@ -437,11 +446,13 @@ in { # quickly switch between derivations root_specs = "/tmp/specialisation" node.execute( - f"test -e {root_specs}" - f" || ln -s $(readlink /run/current-system)/specialisation {root_specs}" + f"test -e {root_specs}" + f" || ln -s $(readlink /run/current-system)/specialisation {root_specs}" ) - switcher_path = f"/run/current-system/specialisation/{name}/bin/switch-to-configuration" + switcher_path = ( + f"/run/current-system/specialisation/{name}/bin/switch-to-configuration" + ) rc, _ = node.execute(f"test -e '{switcher_path}'") if rc > 0: switcher_path = f"/tmp/specialisation/{name}/bin/switch-to-configuration" @@ -465,38 +476,45 @@ in { actual_issuer = node.succeed( f"openssl x509 -noout -issuer -in /var/lib/acme/{cert_name}/{fname}" ).partition("=")[2] - print(f"{fname} issuer: {actual_issuer}") - assert issuer.lower() in actual_issuer.lower() + assert ( + issuer.lower() in actual_issuer.lower() + ), f"{fname} issuer mismatch. Expected {issuer} got {actual_issuer}" # Ensure cert comes before chain in fullchain.pem def check_fullchain(node, cert_name): - subject_data = node.succeed( - f"openssl crl2pkcs7 -nocrl -certfile /var/lib/acme/{cert_name}/fullchain.pem" - " | openssl pkcs7 -print_certs -noout" + cert_file = f"/var/lib/acme/{cert_name}/fullchain.pem" + num_certs = node.succeed(f"grep -o 'END CERTIFICATE' {cert_file}") + assert len(num_certs.strip().split("\n")) > 1, "Insufficient certs in fullchain.pem" + + first_cert_data = node.succeed( + f"grep -m1 -B50 'END CERTIFICATE' {cert_file}" + " | openssl x509 -noout -text" ) - for line in subject_data.lower().split("\n"): - if "subject" in line: - print(f"First subject in fullchain.pem: {line}") - assert cert_name.lower() in line + for line in first_cert_data.lower().split("\n"): + if "dns:" in line: + print(f"First DNSName in fullchain.pem: {line}") + assert cert_name.lower() in line, f"{cert_name} not found in {line}" return assert False - def check_connection(node, domain, retries=0): + @backoff.protect + def check_connection(node, domain): result = node.succeed( "openssl s_client -brief -verify 2 -CAfile /tmp/ca.crt" f" -servername {domain} -connect {domain}:443 < /dev/null 2>&1" ) for line in result.lower().split("\n"): - if "verification" in line and "error" in line: - retries = backoff.handle_fail(retries, f"Failed to connect to https://{domain}") - return check_connection(node, domain, retries) + assert not ( + "verification" in line and "error" in line + ), f"Failed to connect to https://{domain}" - def check_connection_key_bits(node, domain, bits, retries=0): + @backoff.protect + def check_connection_key_bits(node, domain, bits): result = node.succeed( "openssl s_client -CAfile /tmp/ca.crt" f" -servername {domain} -connect {domain}:443 < /dev/null" @@ -504,12 +522,11 @@ in { ) print("Key type:", result) - if bits not in result: - retries = backoff.handle_fail(retries, f"Did not find expected number of bits ({bits}) in key") - return check_connection_key_bits(node, domain, bits, retries) + assert bits in result, f"Did not find expected number of bits ({bits}) in key" - def check_stapling(node, domain, retries=0): + @backoff.protect + def check_stapling(node, domain): # Pebble doesn't provide a full OCSP responder, so just check the URL result = node.succeed( "openssl s_client -CAfile /tmp/ca.crt" @@ -518,20 +535,20 @@ in { ) print("OCSP Responder URL:", result) - if "${caDomain}:4002" not in result.lower(): - retries = backoff.handle_fail(retries, "OCSP Stapling check failed") - return check_stapling(node, domain, retries) + assert "${caDomain}:4002" in result.lower(), "OCSP Stapling check failed" - def download_ca_certs(node, retries=0): - exit_code, _ = node.execute("curl https://${caDomain}:15000/roots/0 > /tmp/ca.crt") - exit_code_2, _ = node.execute( - "curl https://${caDomain}:15000/intermediate-keys/0 >> /tmp/ca.crt" - ) + @backoff.protect + def download_ca_certs(node): + node.succeed("curl https://${caDomain}:15000/roots/0 > /tmp/ca.crt") + node.succeed("curl https://${caDomain}:15000/intermediate-keys/0 >> /tmp/ca.crt") - if exit_code + exit_code_2 > 0: - retries = backoff.handle_fail(retries, "Failed to connect to pebble to download root CA certs") - return download_ca_certs(node, retries) + + @backoff.protect + def set_a_record(node): + node.succeed( + 'curl --data \'{"host": "${caDomain}", "addresses": ["${nodes.acme.networking.primaryIPAddress}"]}\' http://${dnsServerIP nodes}:8055/add-a' + ) start_all() @@ -539,9 +556,7 @@ in { dnsserver.wait_for_unit("pebble-challtestsrv.service") client.wait_for_unit("default.target") - client.succeed( - 'curl --data \'{"host": "${caDomain}", "addresses": ["${nodes.acme.networking.primaryIPAddress}"]}\' http://${dnsServerIP nodes}:8055/add-a' - ) + set_a_record(client) acme.systemctl("start network-online.target") acme.wait_for_unit("network-online.target") @@ -638,7 +653,7 @@ in { webserver.wait_for_unit("acme-finished-lego.example.test.target") webserver.wait_for_unit("nginx.service") webserver.succeed("echo HENLO && systemctl cat nginx.service") - webserver.succeed("test \"$(stat -c '%U' /var/lib/acme/* | uniq)\" = \"root\"") + webserver.succeed('test "$(stat -c \'%U\' /var/lib/acme/* | uniq)" = "root"') check_connection(client, "a.example.test") check_connection(client, "lego.example.test") diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 76c70e2c3fc84..0e2a21803c2e3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -128,6 +128,7 @@ in { apcupsd = handleTest ./apcupsd.nix {}; apfs = runTest ./apfs.nix; appliance-repart-image = runTest ./appliance-repart-image.nix; + appliance-repart-image-verity-store = runTest ./appliance-repart-image-verity-store.nix; apparmor = handleTest ./apparmor.nix {}; archi = handleTest ./archi.nix {}; aria2 = handleTest ./aria2.nix {}; @@ -254,13 +255,13 @@ in { deepin = handleTest ./deepin.nix {}; deluge = handleTest ./deluge.nix {}; dendrite = handleTest ./matrix/dendrite.nix {}; + dependency-track = handleTest ./dependency-track.nix {}; devpi-server = handleTest ./devpi-server.nix {}; dex-oidc = handleTest ./dex-oidc.nix {}; dhparams = handleTest ./dhparams.nix {}; disable-installer-tools = handleTest ./disable-installer-tools.nix {}; discourse = handleTest ./discourse.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; - dnscrypt-wrapper = runTestOn ["x86_64-linux"] ./dnscrypt-wrapper; dnsdist = import ./dnsdist.nix { inherit pkgs runTest; }; doas = handleTest ./doas.nix {}; docker = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker.nix {}; @@ -321,6 +322,7 @@ in { fancontrol = handleTest ./fancontrol.nix {}; fanout = handleTest ./fanout.nix {}; fcitx5 = handleTest ./fcitx5 {}; + fedimintd = runTest ./fedimintd.nix; fenics = handleTest ./fenics.nix {}; ferm = handleTest ./ferm.nix {}; ferretdb = handleTest ./ferretdb.nix {}; @@ -364,7 +366,9 @@ in { ft2-clone = handleTest ./ft2-clone.nix {}; legit = handleTest ./legit.nix {}; mimir = handleTest ./mimir.nix {}; + gancio = handleTest ./gancio.nix {}; garage = handleTest ./garage {}; + gatus = runTest ./gatus.nix; gemstash = handleTest ./gemstash.nix {}; geoserver = runTest ./geoserver.nix; gerrit = handleTest ./gerrit.nix {}; @@ -443,7 +447,6 @@ in { hibernate-systemd-stage-1 = handleTestOn ["x86_64-linux"] ./hibernate.nix { systemdStage1 = true; }; hitch = handleTest ./hitch {}; hledger-web = handleTest ./hledger-web.nix {}; - hocker-fetchdocker = handleTest ./hocker-fetchdocker {}; hockeypuck = handleTest ./hockeypuck.nix { }; home-assistant = handleTest ./home-assistant.nix {}; hostname = handleTest ./hostname.nix {}; @@ -454,6 +457,7 @@ in { icingaweb2 = handleTest ./icingaweb2.nix {}; ifm = handleTest ./ifm.nix {}; iftop = handleTest ./iftop.nix {}; + immich = handleTest ./web-apps/immich.nix {}; incron = handleTest ./incron.nix {}; incus = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; inherit (pkgs) incus; }); incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; }); @@ -570,7 +574,7 @@ in { mate-wayland = handleTest ./mate-wayland.nix {}; matter-server = handleTest ./matter-server.nix {}; matomo = handleTest ./matomo.nix {}; - matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {}; + matrix-appservice-irc = runTest ./matrix/appservice-irc.nix; matrix-conduit = handleTest ./matrix/conduit.nix {}; matrix-synapse = handleTest ./matrix/synapse.nix {}; matrix-synapse-workers = handleTest ./matrix/synapse-workers.nix {}; @@ -656,6 +660,7 @@ in { # TODO: put in networking.nix after the test becomes more complete networkingProxy = handleTest ./networking-proxy.nix {}; nextcloud = handleTest ./nextcloud {}; + nextflow = handleTestOn ["x86_64-linux"] ./nextflow.nix {}; nextjs-ollama-llm-ui = runTest ./web-apps/nextjs-ollama-llm-ui.nix; nexus = handleTest ./nexus.nix {}; # TODO: Test nfsv3 + Kerberos @@ -668,6 +673,7 @@ in { nginx-etag-compression = handleTest ./nginx-etag-compression.nix {}; nginx-globalredirect = handleTest ./nginx-globalredirect.nix {}; nginx-http3 = handleTest ./nginx-http3.nix {}; + nginx-mime = handleTest ./nginx-mime.nix {}; nginx-modsecurity = handleTest ./nginx-modsecurity.nix {}; nginx-moreheaders = handleTest ./nginx-moreheaders.nix {}; nginx-njs = handleTest ./nginx-njs.nix {}; @@ -686,7 +692,7 @@ in { nix-misc = handleTest ./nix/misc.nix {}; nix-upgrade = handleTest ./nix/upgrade.nix {inherit (pkgs) nixVersions;}; nix-required-mounts = runTest ./nix-required-mounts; - nix-serve = handleTest ./nix-serve.nix {}; + nix-serve = runTest ./nix-serve.nix; nix-serve-ssh = handleTest ./nix-serve-ssh.nix {}; nixops = handleTest ./nixops/default.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; @@ -714,6 +720,7 @@ in { nzbhydra2 = handleTest ./nzbhydra2.nix {}; ocis = handleTest ./ocis.nix {}; oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix {}; + obs-studio = handleTest ./obs-studio.nix {}; oh-my-zsh = handleTest ./oh-my-zsh.nix {}; ollama = runTest ./ollama.nix; ollama-cuda = runTestOn ["x86_64-linux" "aarch64-linux"] ./ollama-cuda.nix; @@ -738,6 +745,7 @@ in { image-contents = handleTest ./image-contents.nix {}; openvscode-server = handleTest ./openvscode-server.nix {}; open-webui = runTest ./open-webui.nix; + openvswitch = runTest ./openvswitch.nix; orangefs = handleTest ./orangefs.nix {}; os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {}; osquery = handleTestOn ["x86_64-linux"] ./osquery.nix {}; @@ -786,6 +794,7 @@ in { plasma6 = handleTest ./plasma6.nix {}; plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {}; plausible = handleTest ./plausible.nix {}; + playwright-python = handleTest ./playwright-python.nix {}; please = handleTest ./please.nix {}; pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {}; plikd = handleTest ./plikd.nix {}; @@ -805,6 +814,7 @@ in { postgresql-jit = handleTest ./postgresql-jit.nix {}; postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; postgresql-tls-client-cert = handleTest ./postgresql-tls-client-cert.nix {}; + postgresql-wal2json = handleTest ./postgresql-wal2json.nix {}; powerdns = handleTest ./powerdns.nix {}; powerdns-admin = handleTest ./powerdns-admin.nix {}; power-profiles-daemon = handleTest ./power-profiles-daemon.nix {}; @@ -815,6 +825,7 @@ in { printing-socket = handleTest ./printing.nix { socket = true; }; printing-service = handleTest ./printing.nix { socket = false; }; private-gpt = handleTest ./private-gpt.nix {}; + privatebin = runTest ./privatebin.nix; privoxy = handleTest ./privoxy.nix {}; prometheus = handleTest ./prometheus {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; @@ -853,6 +864,7 @@ in { redlib = handleTest ./redlib.nix {}; redmine = handleTest ./redmine.nix {}; renovate = handleTest ./renovate.nix {}; + replace-dependencies = handleTest ./replace-dependencies {}; restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; restic-rest-server = handleTest ./restic-rest-server.nix {}; restic = handleTest ./restic.nix {}; @@ -865,6 +877,7 @@ in { rshim = handleTest ./rshim.nix {}; rspamd = handleTest ./rspamd.nix {}; rspamd-trainer = handleTest ./rspamd-trainer.nix {}; + rss-bridge = handleTest ./web-apps/rss-bridge.nix {}; rss2email = handleTest ./rss2email.nix {}; rstudio-server = handleTest ./rstudio-server.nix {}; rsyncd = handleTest ./rsyncd.nix {}; @@ -931,6 +944,7 @@ in { sudo = handleTest ./sudo.nix {}; sudo-rs = handleTest ./sudo-rs.nix {}; sunshine = handleTest ./sunshine.nix {}; + suricata = handleTest ./suricata.nix {}; suwayomi-server = handleTest ./suwayomi-server.nix {}; swap-file-btrfs = handleTest ./swap-file-btrfs.nix {}; swap-partition = handleTest ./swap-partition.nix {}; @@ -1046,6 +1060,7 @@ in { txredisapi = handleTest ./txredisapi.nix {}; tuptime = handleTest ./tuptime.nix {}; turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {}; + turn-rs = handleTest ./turn-rs.nix {}; tuxguitar = handleTest ./tuxguitar.nix {}; twingate = runTest ./twingate.nix; typesense = handleTest ./typesense.nix {}; @@ -1101,7 +1116,7 @@ in { without-nix = handleTest ./without-nix.nix {}; wmderland = handleTest ./wmderland.nix {}; workout-tracker = handleTest ./workout-tracker.nix {}; - wpa_supplicant = handleTest ./wpa_supplicant.nix {}; + wpa_supplicant = import ./wpa_supplicant.nix { inherit pkgs runTest; }; wordpress = handleTest ./wordpress.nix {}; wrappers = handleTest ./wrappers.nix {}; writefreely = handleTest ./web-apps/writefreely.nix {}; diff --git a/nixos/tests/apfs.nix b/nixos/tests/apfs.nix index 15ed5aa7f5736..3e79fa11dc049 100644 --- a/nixos/tests/apfs.nix +++ b/nixos/tests/apfs.nix @@ -18,6 +18,10 @@ with subtest("mkapfs works with the maximum label length"): machine.succeed("mkapfs -L '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7' /dev/vdb") + with subtest("apfs-label works"): + machine.succeed("mkapfs -L 'myLabel' /dev/vdb") + machine.succeed("apfs-label /dev/vdb | grep -q myLabel") + with subtest("Enable case sensitivity and normalization sensitivity"): machine.succeed( "mkapfs -s -z /dev/vdb", diff --git a/nixos/tests/appliance-repart-image-verity-store.nix b/nixos/tests/appliance-repart-image-verity-store.nix new file mode 100644 index 0000000000000..3834d0a468ab3 --- /dev/null +++ b/nixos/tests/appliance-repart-image-verity-store.nix @@ -0,0 +1,130 @@ +# similar to the appliance-repart-image test but with a dm-verity +# protected nix store and tmpfs as rootfs +{ lib, ... }: + +{ + name = "appliance-repart-image-verity-store"; + + meta.maintainers = with lib.maintainers; [ + nikstur + willibutz + ]; + + nodes.machine = + { + config, + lib, + pkgs, + ... + }: + let + inherit (config.image.repart.verityStore) partitionIds; + in + { + imports = [ ../modules/image/repart.nix ]; + + virtualisation.fileSystems = lib.mkVMOverride { + "/" = { + fsType = "tmpfs"; + options = [ "mode=0755" ]; + }; + + "/usr" = { + device = "/dev/mapper/usr"; + # explicitly mount it read-only otherwise systemd-remount-fs will fail + options = [ "ro" ]; + fsType = config.image.repart.partitions.${partitionIds.store}.repartConfig.Format; + }; + + # bind-mount the store + "/nix/store" = { + device = "/usr/nix/store"; + options = [ "bind" ]; + }; + }; + + image.repart = { + verityStore = { + enable = true; + # by default the module works with systemd-boot, for simplicity this test directly boots the UKI + ukiPath = "/EFI/BOOT/BOOT${lib.toUpper config.nixpkgs.hostPlatform.efiArch}.EFI"; + }; + + name = "appliance-verity-store-image"; + + partitions = { + ${partitionIds.esp} = { + # the UKI is injected into this partition by the verityStore module + repartConfig = { + Type = "esp"; + Format = "vfat"; + SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M"; + }; + }; + ${partitionIds.store-verity}.repartConfig = { + Minimize = "best"; + }; + ${partitionIds.store}.repartConfig = { + Minimize = "best"; + }; + }; + }; + + virtualisation = { + directBoot.enable = false; + mountHostNixStore = false; + useEFIBoot = true; + }; + + boot = { + loader.grub.enable = false; + initrd.systemd.enable = true; + }; + + system.image = { + id = "nixos-appliance"; + version = "1"; + }; + + # don't create /usr/bin/env + # this would require some extra work on read-only /usr + # and it is not a strict necessity + system.activationScripts.usrbinenv = lib.mkForce ""; + }; + + testScript = + { nodes, ... }: # python + '' + import os + import subprocess + import tempfile + + tmp_disk_image = tempfile.NamedTemporaryFile() + + subprocess.run([ + "${nodes.machine.virtualisation.qemu.package}/bin/qemu-img", + "create", + "-f", + "qcow2", + "-b", + "${nodes.machine.system.build.finalImage}/${nodes.machine.image.repart.imageFile}", + "-F", + "raw", + tmp_disk_image.name, + ]) + + os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name + + machine.wait_for_unit("default.target") + + with subtest("Running with volatile root"): + machine.succeed("findmnt --kernel --type tmpfs /") + + with subtest("/nix/store is backed by dm-verity protected fs"): + verity_info = machine.succeed("dmsetup info --target verity usr") + assert "ACTIVE" in verity_info,f"unexpected verity info: {verity_info}" + + backing_device = machine.succeed("df --output=source /nix/store | tail -n1").strip() + assert "/dev/mapper/usr" == backing_device,"unexpected backing device: {backing_device}" + ''; +} diff --git a/nixos/tests/atop.nix b/nixos/tests/atop.nix index f9335eecc20e5..f2c488c591703 100644 --- a/nixos/tests/atop.nix +++ b/nixos/tests/atop.nix @@ -24,7 +24,7 @@ let assertions = rec { with subtest("binary should report the correct version"): pkgver = "${pkgs.atop.version}" - ver = re.sub(r'(?s)^Version: (\d\.\d\.\d).*', r'\1', machine.succeed("atop -V")) + ver = re.sub(r'(?s)^Version: (\d+\.\d+\.\d+).*', r'\1', machine.succeed("atop -V")) assert ver == pkgver, f"Version is `{ver}`, expected `{pkgver}`" ''; atoprc = contents: @@ -103,6 +103,9 @@ let assertions = rec { machine.fail("type -p atopgpud") ''; }; +meta = { + timeout = 600; +}; in { justThePackage = makeTest { @@ -120,6 +123,7 @@ in (netatop false) (atopgpu false) ]; + inherit meta; }; defaults = makeTest { name = "atop-defaults"; @@ -138,6 +142,7 @@ in (netatop false) (atopgpu false) ]; + inherit meta; }; minimal = makeTest { name = "atop-minimal"; @@ -159,6 +164,7 @@ in (netatop false) (atopgpu false) ]; + inherit meta; }; netatop = makeTest { name = "atop-netatop"; @@ -178,6 +184,7 @@ in (netatop true) (atopgpu false) ]; + inherit meta; }; atopgpu = makeTest { name = "atop-atopgpu"; @@ -197,6 +204,7 @@ in (netatop false) (atopgpu true) ]; + inherit meta; }; everything = makeTest { name = "atop-everything"; @@ -222,5 +230,6 @@ in (netatop true) (atopgpu true) ]; + inherit meta; }; } diff --git a/nixos/tests/ayatana-indicators.nix b/nixos/tests/ayatana-indicators.nix index 2d2a9f7167a7e..8d134e1af2eec 100644 --- a/nixos/tests/ayatana-indicators.nix +++ b/nixos/tests/ayatana-indicators.nix @@ -33,6 +33,7 @@ in packages = with pkgs; [ + ayatana-indicator-bluetooth ayatana-indicator-datetime ayatana-indicator-display ayatana-indicator-messages @@ -50,8 +51,6 @@ in services.accounts-daemon.enable = true; # messages - hardware.pulseaudio.enable = true; # sound - # Lomiri-ish setup for Lomiri indicators # TODO move into a Lomiri module, once the package set is far enough for the DE to start diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 565e37cf0e56d..83d9168a6fa59 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -6,163 +6,199 @@ # which only works if the first client successfully uses the UPnP-IGD # protocol to poke a hole in the NAT. -import ./make-test-python.nix ({ pkgs, ... }: - -let - - # Some random file to serve. - file = pkgs.hello.src; - - internalRouterAddress = "192.168.3.1"; - internalClient1Address = "192.168.3.2"; - externalRouterAddress = "80.100.100.1"; - externalClient2Address = "80.100.100.2"; - externalTrackerAddress = "80.100.100.3"; - - download-dir = "/var/lib/transmission/Downloads"; - transmissionConfig = { ... }: { - environment.systemPackages = [ pkgs.transmission_3 ]; - services.transmission = { - enable = true; - settings = { - dht-enabled = false; - message-level = 2; - inherit download-dir; - }; - }; - }; -in - -{ - name = "bittorrent"; - meta = with pkgs.lib.maintainers; { - maintainers = [ domenkozar rob bobvanderlinden ]; - }; - - nodes = { - tracker = { pkgs, ... }: { - imports = [ transmissionConfig ]; - - virtualisation.vlans = [ 1 ]; - networking.firewall.enable = false; - networking.interfaces.eth1.ipv4.addresses = [ - { address = externalTrackerAddress; prefixLength = 24; } - ]; - - # We need Apache on the tracker to serve the torrents. - services.httpd = { - enable = true; - virtualHosts = { - "torrentserver.org" = { - adminAddr = "foo@example.org"; - documentRoot = "/tmp"; +import ./make-test-python.nix ( + { pkgs, ... }: + + let + + # Some random file to serve. + file = pkgs.hello.src; + + internalRouterAddress = "192.168.3.1"; + internalClient1Address = "192.168.3.2"; + externalRouterAddress = "80.100.100.1"; + externalClient2Address = "80.100.100.2"; + externalTrackerAddress = "80.100.100.3"; + + download-dir = "/var/lib/transmission/Downloads"; + transmissionConfig = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.transmission_3 ]; + services.transmission = { + enable = true; + settings = { + dht-enabled = false; + message-level = 2; + inherit download-dir; }; }; }; - services.opentracker.enable = true; - }; - - router = { pkgs, nodes, ... }: { - virtualisation.vlans = [ 1 2 ]; - networking.nat.enable = true; - networking.nat.internalInterfaces = [ "eth2" ]; - networking.nat.externalInterface = "eth1"; - networking.firewall.enable = true; - networking.firewall.trustedInterfaces = [ "eth2" ]; - networking.interfaces.eth0.ipv4.addresses = []; - networking.interfaces.eth1.ipv4.addresses = [ - { address = externalRouterAddress; prefixLength = 24; } - ]; - networking.interfaces.eth2.ipv4.addresses = [ - { address = internalRouterAddress; prefixLength = 24; } + in + + { + name = "bittorrent"; + meta = with pkgs.lib.maintainers; { + maintainers = [ + domenkozar + rob + bobvanderlinden ]; - services.miniupnpd = { - enable = true; - externalInterface = "eth1"; - internalIPs = [ "eth2" ]; - appendConfig = '' - ext_ip=${externalRouterAddress} - ''; - }; }; - client1 = { pkgs, nodes, ... }: { - imports = [ transmissionConfig ]; - environment.systemPackages = [ pkgs.miniupnpc ]; + nodes = { + tracker = + { pkgs, ... }: + { + imports = [ transmissionConfig ]; + + virtualisation.vlans = [ 1 ]; + networking.firewall.enable = false; + networking.interfaces.eth1.ipv4.addresses = [ + { + address = externalTrackerAddress; + prefixLength = 24; + } + ]; + + # We need Apache on the tracker to serve the torrents. + services.httpd = { + enable = true; + virtualHosts = { + "torrentserver.org" = { + adminAddr = "foo@example.org"; + documentRoot = "/tmp"; + }; + }; + }; + services.opentracker.enable = true; + }; - virtualisation.vlans = [ 2 ]; - networking.interfaces.eth0.ipv4.addresses = []; - networking.interfaces.eth1.ipv4.addresses = [ - { address = internalClient1Address; prefixLength = 24; } - ]; - networking.defaultGateway = internalRouterAddress; - networking.firewall.enable = false; - }; + router = + { pkgs, nodes, ... }: + { + virtualisation.vlans = [ + 1 + 2 + ]; + networking.nat.enable = true; + networking.nat.internalInterfaces = [ "eth2" ]; + networking.nat.externalInterface = "eth1"; + networking.firewall.enable = true; + networking.firewall.trustedInterfaces = [ "eth2" ]; + networking.interfaces.eth0.ipv4.addresses = [ ]; + networking.interfaces.eth1.ipv4.addresses = [ + { + address = externalRouterAddress; + prefixLength = 24; + } + ]; + networking.interfaces.eth2.ipv4.addresses = [ + { + address = internalRouterAddress; + prefixLength = 24; + } + ]; + services.miniupnpd = { + enable = true; + externalInterface = "eth1"; + internalIPs = [ "eth2" ]; + appendConfig = '' + ext_ip=${externalRouterAddress} + ''; + }; + }; - client2 = { pkgs, ... }: { - imports = [ transmissionConfig ]; + client1 = + { pkgs, nodes, ... }: + { + imports = [ transmissionConfig ]; + environment.systemPackages = [ pkgs.miniupnpc ]; + + virtualisation.vlans = [ 2 ]; + networking.interfaces.eth0.ipv4.addresses = [ ]; + networking.interfaces.eth1.ipv4.addresses = [ + { + address = internalClient1Address; + prefixLength = 24; + } + ]; + networking.defaultGateway = internalRouterAddress; + networking.firewall.enable = false; + }; - virtualisation.vlans = [ 1 ]; - networking.interfaces.eth0.ipv4.addresses = []; - networking.interfaces.eth1.ipv4.addresses = [ - { address = externalClient2Address; prefixLength = 24; } - ]; - networking.firewall.enable = false; + client2 = + { pkgs, ... }: + { + imports = [ transmissionConfig ]; + + virtualisation.vlans = [ 1 ]; + networking.interfaces.eth0.ipv4.addresses = [ ]; + networking.interfaces.eth1.ipv4.addresses = [ + { + address = externalClient2Address; + prefixLength = 24; + } + ]; + networking.firewall.enable = false; + }; }; - }; - - testScript = { nodes, ... }: '' - start_all() - - # Wait for network and miniupnpd. - router.systemctl("start network-online.target") - router.wait_for_unit("network-online.target") - router.wait_for_unit("miniupnpd") - - # Create the torrent. - tracker.succeed("mkdir ${download-dir}/data") - tracker.succeed( - "cp ${file} ${download-dir}/data/test.tar.bz2" - ) - tracker.succeed( - "transmission-create ${download-dir}/data/test.tar.bz2 --private --tracker http://${externalTrackerAddress}:6969/announce --outfile /tmp/test.torrent" - ) - tracker.succeed("chmod 644 /tmp/test.torrent") - - # Start the tracker. !!! use a less crappy tracker - tracker.systemctl("start network-online.target") - tracker.wait_for_unit("network-online.target") - tracker.wait_for_unit("opentracker.service") - tracker.wait_for_open_port(6969) - - # Start the initial seeder. - tracker.succeed( - "transmission-remote --add /tmp/test.torrent --no-portmap --no-dht --download-dir ${download-dir}/data" - ) - - # Now we should be able to download from the client behind the NAT. - tracker.wait_for_unit("httpd") - client1.systemctl("start network-online.target") - client1.wait_for_unit("network-online.target") - client1.succeed("transmission-remote --add http://${externalTrackerAddress}/test.torrent >&2 &") - client1.wait_for_file("${download-dir}/test.tar.bz2") - client1.succeed( - "cmp ${download-dir}/test.tar.bz2 ${file}" - ) - - # Bring down the initial seeder. - tracker.stop_job("transmission") - - # Now download from the second client. This can only succeed if - # the first client created a NAT hole in the router. - client2.systemctl("start network-online.target") - client2.wait_for_unit("network-online.target") - client2.succeed( - "transmission-remote --add http://${externalTrackerAddress}/test.torrent --no-portmap --no-dht >&2 &" - ) - client2.wait_for_file("${download-dir}/test.tar.bz2") - client2.succeed( - "cmp ${download-dir}/test.tar.bz2 ${file}" - ) - ''; -}) + + testScript = + { nodes, ... }: + '' + start_all() + + # Wait for network and miniupnpd. + router.systemctl("start network-online.target") + router.wait_for_unit("network-online.target") + router.wait_for_unit("miniupnpd") + + # Create the torrent. + tracker.succeed("mkdir ${download-dir}/data") + tracker.succeed( + "cp ${file} ${download-dir}/data/test.tar.bz2" + ) + tracker.succeed( + "transmission-create ${download-dir}/data/test.tar.bz2 --private --tracker http://${externalTrackerAddress}:6969/announce --outfile /tmp/test.torrent" + ) + tracker.succeed("chmod 644 /tmp/test.torrent") + + # Start the tracker. !!! use a less crappy tracker + tracker.systemctl("start network-online.target") + tracker.wait_for_unit("network-online.target") + tracker.wait_for_unit("opentracker.service") + tracker.wait_for_open_port(6969) + + # Start the initial seeder. + tracker.succeed( + "transmission-remote --add /tmp/test.torrent --no-portmap --no-dht --download-dir ${download-dir}/data" + ) + + # Now we should be able to download from the client behind the NAT. + tracker.wait_for_unit("httpd") + client1.systemctl("start network-online.target") + client1.wait_for_unit("network-online.target") + client1.succeed("transmission-remote --add http://${externalTrackerAddress}/test.torrent >&2 &") + client1.wait_for_file("${download-dir}/test.tar.bz2") + client1.succeed( + "cmp ${download-dir}/test.tar.bz2 ${file}" + ) + + # Bring down the initial seeder. + tracker.stop_job("transmission") + + # Now download from the second client. This can only succeed if + # the first client created a NAT hole in the router. + client2.systemctl("start network-online.target") + client2.wait_for_unit("network-online.target") + client2.succeed( + "transmission-remote --add http://${externalTrackerAddress}/test.torrent --no-portmap --no-dht >&2 &" + ) + client2.wait_for_file("${download-dir}/test.tar.bz2") + client2.succeed( + "cmp ${download-dir}/test.tar.bz2 ${file}" + ) + ''; + } +) diff --git a/nixos/tests/ceph-single-node-bluestore-dmcrypt.nix b/nixos/tests/ceph-single-node-bluestore-dmcrypt.nix index 3c6f0e59fe411..13407f054931b 100644 --- a/nixos/tests/ceph-single-node-bluestore-dmcrypt.nix +++ b/nixos/tests/ceph-single-node-bluestore-dmcrypt.nix @@ -16,8 +16,11 @@ import ./make-test-python.nix ( in { name = "basic-single-node-ceph-cluster-bluestore-dmcrypt"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nh2 ]; + meta = { + maintainers = with lib.maintainers; [ + benaryorg + nh2 + ]; }; nodes = { diff --git a/nixos/tests/chrony.nix b/nixos/tests/chrony.nix index 578b1e32d50c9..2dcc363728beb 100644 --- a/nixos/tests/chrony.nix +++ b/nixos/tests/chrony.nix @@ -7,25 +7,24 @@ import ./make-test-python.nix ({ lib, ... }: }; nodes = { - default = { + machine = { services.chrony.enable = true; - }; - graphene-hardened = { - services.chrony.enable = true; - services.chrony.enableMemoryLocking = true; - environment.memoryAllocator.provider = "graphene-hardened"; - # dhcpcd privsep is incompatible with graphene-hardened - networking.useNetworkd = true; + + specialisation.hardened.configuration = { + services.chrony.enableMemoryLocking = true; + environment.memoryAllocator.provider = "graphene-hardened"; + # dhcpcd privsep is incompatible with graphene-hardened + networking.useNetworkd = true; + }; }; }; - testScript = {nodes, ...} : let - graphene-hardened = nodes.graphene-hardened.system.build.toplevel; - in '' - default.start() - default.wait_for_unit('multi-user.target') - default.succeed('systemctl is-active chronyd.service') - default.succeed('${graphene-hardened}/bin/switch-to-configuration test') - default.succeed('systemctl is-active chronyd.service') + testScript = '' + machine.start() + machine.wait_for_unit('multi-user.target') + machine.succeed('systemctl is-active chronyd.service') + machine.succeed('/run/booted-system/specialisation/hardened/bin/switch-to-configuration test') + machine.succeed('systemctl restart chronyd.service') + machine.wait_for_unit('chronyd.service') ''; }) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index ea1046b40354e..c654c43788078 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -33,6 +33,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { stdenv stdenvNoCC emptyContainer.config.containers.foo.path libxslt desktop-file-utils texinfo docbook5 libxml2 docbook_xsl_ns xorg.lndir documentation-highlighter + perlPackages.ConfigIniFiles ]; }; diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix index 876e62c1da9ea..00d850cae2a17 100644 --- a/nixos/tests/containers-reloadable.nix +++ b/nixos/tests/containers-reloadable.nix @@ -1,71 +1,57 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: -let - client_base = { - containers.test1 = { - autoStart = true; - config = { - environment.etc.check.text = "client_base"; - }; - }; - - # prevent make-test-python.nix to change IP - networking.interfaces = { - eth1.ipv4.addresses = lib.mkOverride 0 [ ]; - }; - }; -in { +{ name = "containers-reloadable"; meta = { maintainers = with lib.maintainers; [ danbst ]; }; nodes = { - client = { ... }: { - imports = [ client_base ]; - }; + machine = { lib, ... }: { + containers.test1 = { + autoStart = true; + config.environment.etc.check.text = "client_base"; + }; - client_c1 = { lib, ... }: { - imports = [ client_base ]; + # prevent make-test-python.nix to change IP + networking.interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [ ]; - containers.test1.config = { - environment.etc.check.text = lib.mkForce "client_c1"; - services.httpd.enable = true; - services.httpd.adminAddr = "nixos@example.com"; + specialisation.c1.configuration = { + containers.test1.config = { + environment.etc.check.text = lib.mkForce "client_c1"; + services.httpd.enable = true; + services.httpd.adminAddr = "nixos@example.com"; + }; }; - }; - client_c2 = { lib, ... }: { - imports = [ client_base ]; - containers.test1.config = { - environment.etc.check.text = lib.mkForce "client_c2"; - services.nginx.enable = true; + specialisation.c2.configuration = { + containers.test1.config = { + environment.etc.check.text = lib.mkForce "client_c2"; + services.nginx.enable = true; + }; }; }; }; - testScript = {nodes, ...}: let - c1System = nodes.client_c1.config.system.build.toplevel; - c2System = nodes.client_c2.config.system.build.toplevel; - in '' - client.start() - client.wait_for_unit("default.target") + testScript = '' + machine.start() + machine.wait_for_unit("default.target") - assert "client_base" in client.succeed("nixos-container run test1 cat /etc/check") + assert "client_base" in machine.succeed("nixos-container run test1 cat /etc/check") with subtest("httpd is available after activating config1"): - client.succeed( - "${c1System}/bin/switch-to-configuration test >&2", + machine.succeed( + "/run/booted-system/specialisation/c1/bin/switch-to-configuration test >&2", "[[ $(nixos-container run test1 cat /etc/check) == client_c1 ]] >&2", "systemctl status httpd -M test1 >&2", ) with subtest("httpd is not available any longer after switching to config2"): - client.succeed( - "${c2System}/bin/switch-to-configuration test >&2", + machine.succeed( + "/run/booted-system/specialisation/c2/bin/switch-to-configuration test >&2", "[[ $(nixos-container run test1 cat /etc/check) == client_c2 ]] >&2", "systemctl status nginx -M test1 >&2", ) - client.fail("systemctl status httpd -M test1 >&2") + machine.fail("systemctl status httpd -M test1 >&2") ''; }) diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix index e1ad8157b2883..568ca5ee3fede 100644 --- a/nixos/tests/containers-restart_networking.nix +++ b/nixos/tests/containers-restart_networking.nix @@ -1,20 +1,4 @@ -let - client_base = { - networking.firewall.enable = false; - - containers.webserver = { - autoStart = true; - privateNetwork = true; - hostBridge = "br0"; - config = { - networking.firewall.enable = false; - networking.interfaces.eth0.ipv4.addresses = [ - { address = "192.168.1.122"; prefixLength = 24; } - ]; - }; - }; - }; -in import ./make-test-python.nix ({ pkgs, lib, ... }: +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-restart_networking"; meta = { @@ -22,46 +6,55 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: }; nodes = { - client = { lib, ... }: client_base // { + client = { virtualisation.vlans = [ 1 ]; - networking.bridges.br0 = { - interfaces = []; - rstp = false; - }; - networking.interfaces = { - eth1.ipv4.addresses = lib.mkOverride 0 [ ]; - br0.ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ]; + networking.firewall.enable = false; + + containers.webserver = { + autoStart = true; + privateNetwork = true; + hostBridge = "br0"; + config = { + networking.firewall.enable = false; + networking.interfaces.eth0.ipv4.addresses = [ + { address = "192.168.1.122"; prefixLength = 24; } + ]; + }; }; - }; - client_eth1 = { lib, ... }: client_base // { networking.bridges.br0 = { - interfaces = [ "eth1" ]; + interfaces = []; rstp = false; }; - networking.interfaces = { - eth1.ipv4.addresses = lib.mkOverride 0 [ ]; - br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; - }; - }; - client_eth1_rstp = { lib, ... }: client_base // { - networking.bridges.br0 = { - interfaces = [ "eth1" ]; - rstp = true; + + networking.interfaces.br0.ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ]; + + specialisation.eth1.configuration = { + networking.bridges.br0.interfaces = [ "eth1" ]; + networking.interfaces = { + eth1.ipv4.addresses = lib.mkForce [ ]; + eth1.ipv6.addresses = lib.mkForce [ ]; + br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; + }; }; - networking.interfaces = { - eth1.ipv4.addresses = lib.mkOverride 0 [ ]; - br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; + + specialisation.eth1-rstp.configuration = { + networking.bridges.br0 = { + interfaces = [ "eth1" ]; + rstp = lib.mkForce true; + }; + + networking.interfaces = { + eth1.ipv4.addresses = lib.mkForce [ ]; + eth1.ipv6.addresses = lib.mkForce [ ]; + br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; + }; }; }; }; - testScript = {nodes, ...}: let - originalSystem = nodes.client.config.system.build.toplevel; - eth1_bridged = nodes.client_eth1.config.system.build.toplevel; - eth1_rstp = nodes.client_eth1_rstp.config.system.build.toplevel; - in '' + testScript = '' client.start() client.wait_for_unit("default.target") @@ -75,7 +68,7 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: with subtest("Bridged configuration without STP preserves connectivity"): client.succeed( - "${eth1_bridged}/bin/switch-to-configuration test >&2" + "/run/booted-system/specialisation/eth1/bin/switch-to-configuration test >&2" ) client.succeed( @@ -87,7 +80,7 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: # activating rstp needs another service, therefore the bridge will restart and the container will lose its connectivity # with subtest("Bridged configuration with STP"): - # client.succeed("${eth1_rstp}/bin/switch-to-configuration test >&2") + # client.succeed("/run/booted-system/specialisation/eth1-rstp/bin/switch-to-configuration test >&2") # client.execute("ip -4 a >&2") # client.execute("ip l >&2") # @@ -100,7 +93,7 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: with subtest("Reverting to initial configuration preserves connectivity"): client.succeed( - "${originalSystem}/bin/switch-to-configuration test >&2" + "/run/booted-system/bin/switch-to-configuration test >&2" ) client.succeed("ping 192.168.1.122 -c 1 -n >&2") diff --git a/nixos/tests/curl-impersonate.nix b/nixos/tests/curl-impersonate.nix index 97143951d4b0e..13eb54b5b2d0d 100644 --- a/nixos/tests/curl-impersonate.nix +++ b/nixos/tests/curl-impersonate.nix @@ -97,6 +97,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let pyyaml pytest-asyncio dpkt + ts1-signatures ]}" # Prepare test root prefix diff --git a/nixos/tests/dependency-track.nix b/nixos/tests/dependency-track.nix new file mode 100644 index 0000000000000..ab0d78827286d --- /dev/null +++ b/nixos/tests/dependency-track.nix @@ -0,0 +1,65 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + let + dependencyTrackPort = 8081; + in + { + name = "dependency-track"; + meta = { + maintainers = pkgs.lib.teams.cyberus.members; + }; + + nodes = { + server = + { pkgs, ... }: + { + virtualisation = { + cores = 2; + diskSize = 4096; + }; + + environment.systemPackages = with pkgs; [ curl ]; + systemd.services.dependency-track = { + # source: https://github.com/DependencyTrack/dependency-track/blob/37e0ba59e8057c18a87a7a76e247a8f75677a56c/dev/scripts/data-nist-generate-dummy.sh + preStart = '' + set -euo pipefail + + NIST_DIR="$HOME/.dependency-track/nist" + + rm -rf "$NIST_DIR" + mkdir -p "$NIST_DIR" + + for feed in $(seq "2024" "2002"); do + touch "$NIST_DIR/nvdcve-1.1-$feed.json.gz" + echo "9999999999999" > "$NIST_DIR/nvdcve-1.1-$feed.json.gz.ts" + done + ''; + }; + services.dependency-track = { + enable = true; + port = dependencyTrackPort; + nginx.domain = "localhost"; + database.passwordFile = "${pkgs.writeText "dbPassword" ''hunter2'THE'''H''''E''}"; + }; + }; + }; + + testScript = '' + import json + + start_all() + + server.wait_for_unit("dependency-track.service") + server.wait_until_succeeds( + "journalctl -o cat -u dependency-track.service | grep 'Dependency-Track is ready'" + ) + server.wait_for_open_port(${toString dependencyTrackPort}) + + with subtest("version api returns correct version"): + version = json.loads( + server.succeed("curl http://localhost/api/version") + ) + assert version["version"] == "${pkgs.dependency-track.version}" + ''; + } +) diff --git a/nixos/tests/dex-oidc.nix b/nixos/tests/dex-oidc.nix index e54ae18ca9373..d3baa4fbf2455 100644 --- a/nixos/tests/dex-oidc.nix +++ b/nixos/tests/dex-oidc.nix @@ -57,15 +57,16 @@ import ./make-test-python.nix ({ lib, ... }: { testScript = '' with subtest("Web server gets ready"): - machine.wait_for_unit("dex.service") + machine.wait_for_unit("dex.service", timeout=120) # Wait until server accepts connections - machine.wait_until_succeeds("curl -fs 'localhost:8080/dex/auth/mock?client_id=oidcclient&response_type=code&redirect_uri=https://example.com/callback&scope=openid'") + machine.wait_until_succeeds("curl -fs 'localhost:8080/dex/auth/mock?client_id=oidcclient&response_type=code&redirect_uri=https://example.com/callback&scope=openid'", timeout=120) with subtest("Login"): state = machine.succeed("curl -fs 'localhost:8080/dex/auth/mock?client_id=oidcclient&response_type=code&redirect_uri=https://example.com/callback&scope=openid' | sed -n 's/.*state=\\(.*\\)\">.*/\\1/p'").strip() print(f"Got state {state}") - machine.succeed(f"curl -fs 'localhost:8080/dex/auth/mock/login?back=&state={state}' -d 'login=admin&password=password'") - code = machine.succeed(f"curl -fs localhost:8080/dex/approval?req={state} | sed -n 's/.*code=\\(.*\\)&.*/\\1/p'").strip() + # Login request returns 303 with redirect_url that has code as query parameter: + # https://example.com/callback?code=kibsamwdupuy2iwqnlbqei3u6&state= + code = machine.succeed(f"curl -fs 'localhost:8080/dex/auth/mock/login?back=&state={state}' -d 'login=admin&password=password' -w '%{{redirect_url}}' | sed -n 's/.*code=\\(.*\\)&.*/\\1/p'") print(f"Got approval code {code}") bearer = machine.succeed(f"curl -fs localhost:8080/dex/token -u oidcclient:oidcclientsecret -d 'grant_type=authorization_code&redirect_uri=https://example.com/callback&code={code}' | jq .access_token -r").strip() print(f"Got access token {bearer}") diff --git a/nixos/tests/dnscrypt-wrapper/default.nix b/nixos/tests/dnscrypt-wrapper/default.nix deleted file mode 100644 index 1a794931dc500..0000000000000 --- a/nixos/tests/dnscrypt-wrapper/default.nix +++ /dev/null @@ -1,148 +0,0 @@ - -{ lib, pkgs, ... }: - -let - snakeoil = import ../common/acme/server/snakeoil-certs.nix; - - hosts = lib.mkForce - { "fd::a" = [ "server" snakeoil.domain ]; - "fd::b" = [ "client" ]; - }; -in - -{ - name = "dnscrypt-wrapper"; - meta = with pkgs.lib.maintainers; { - maintainers = [ rnhmjoj ]; - }; - - nodes = { - server = { - networking.hosts = hosts; - networking.interfaces.eth1.ipv6.addresses = lib.singleton - { address = "fd::a"; prefixLength = 64; }; - - services.dnscrypt-wrapper = - { enable = true; - address = "[::]"; - port = 5353; - keys.expiration = 5; # days - keys.checkInterval = 2; # min - # The keypair was generated by the command: - # dnscrypt-wrapper --gen-provider-keypair \ - # --provider-name=2.dnscrypt-cert.server \ - providerKey.public = "${./public.key}"; - providerKey.secret = "${./secret.key}"; - }; - - # nameserver - services.bind.enable = true; - services.bind.zones = lib.singleton - { name = "."; - master = true; - file = pkgs.writeText "root.zone" '' - $TTL 3600 - . IN SOA example.org. admin.example.org. ( 1 3h 1h 1w 1d ) - . IN NS example.org. - example.org. IN AAAA 2001:db8::1 - ''; - }; - - # webserver - services.nginx.enable = true; - services.nginx.virtualHosts.${snakeoil.domain} = - { onlySSL = true; - listenAddresses = [ "localhost" ]; - sslCertificate = snakeoil.${snakeoil.domain}.cert; - sslCertificateKey = snakeoil.${snakeoil.domain}.key; - locations."/ip".extraConfig = '' - default_type text/plain; - return 200 "Ciao $remote_addr!\n"; - ''; - }; - - # demultiplex HTTP and DNS from port 443 - services.sslh = - { enable = true; - method = "ev"; - settings.transparent = true; - settings.listen = lib.mkForce - [ { host = "server"; port = "443"; is_udp = false; } - { host = "server"; port = "443"; is_udp = true; } - ]; - settings.protocols = - [ # Send TLS to webserver (TCP) - { name = "tls"; host= "localhost"; port= "443"; } - # Send DNSCrypt to dnscrypt-wrapper (TCP or UDP) - { name = "anyprot"; host = "localhost"; port = "5353"; } - { name = "anyprot"; host = "localhost"; port = "5353"; is_udp = true;} - ]; - }; - - networking.firewall.allowedTCPPorts = [ 443 ]; - networking.firewall.allowedUDPPorts = [ 443 ]; - }; - - client = { - networking.hosts = hosts; - networking.interfaces.eth1.ipv6.addresses = lib.singleton - { address = "fd::b"; prefixLength = 64; }; - - services.dnscrypt-proxy2.enable = true; - services.dnscrypt-proxy2.upstreamDefaults = false; - services.dnscrypt-proxy2.settings = - { server_names = [ "server" ]; - listen_addresses = [ "[::1]:53" ]; - cache = false; - # Computed using https://dnscrypt.info/stamps/ - static.server.stamp = - "sdns://AQAAAAAAAAAADzE5Mi4xNjguMS4yOjQ0MyAUQdg6" - +"_RIIpK6pHkINhrv7nxwIG5c7b_m5NJVT3A1AXRYyLmRuc2NyeXB0LWNlcnQuc2VydmVy"; - }; - networking.nameservers = [ "::1" ]; - security.pki.certificateFiles = [ snakeoil.ca.cert ]; - }; - - }; - - testScript = '' - with subtest("The server can generate the ephemeral keypair"): - server.wait_for_unit("dnscrypt-wrapper") - server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.key") - server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.crt") - almost_expiration = server.succeed("date --date '4days 23 hours 56min'").strip() - - with subtest("The DNSCrypt client can connect to the server"): - server.wait_for_unit("sslh") - client.wait_until_succeeds("journalctl -u dnscrypt-proxy2 --grep '\[server\] OK'") - - with subtest("HTTP client can connect to the server"): - server.wait_for_unit("nginx") - client.succeed("curl -s --fail https://${snakeoil.domain}/ip | grep -q fd::b") - - with subtest("DNS queries over UDP are working"): - server.wait_for_unit("bind") - client.wait_for_open_port(53) - assert "2001:db8::1" in client.wait_until_succeeds( - "host -U example.org" - ), "The IP address of 'example.org' does not match 2001:db8::1" - - with subtest("DNS queries over TCP are working"): - server.wait_for_unit("bind") - client.wait_for_open_port(53) - assert "2001:db8::1" in client.wait_until_succeeds( - "host -T example.org" - ), "The IP address of 'example.org' does not match 2001:db8::1" - - with subtest("The server rotates the ephemeral keys"): - # advance time by a little less than 5 days - server.succeed(f"date -s '{almost_expiration}'") - client.succeed(f"date -s '{almost_expiration}'") - server.wait_for_file("/var/lib/dnscrypt-wrapper/oldkeys") - - with subtest("The client can still connect to the server"): - client.systemctl("restart dnscrypt-proxy2") - client.wait_until_succeeds("host -T example.org") - client.wait_until_succeeds("host -U example.org") - ''; -} diff --git a/nixos/tests/dnscrypt-wrapper/public.key b/nixos/tests/dnscrypt-wrapper/public.key deleted file mode 100644 index 80232b97f529d..0000000000000 --- a/nixos/tests/dnscrypt-wrapper/public.key +++ /dev/null @@ -1 +0,0 @@ -A:B ;o4S @] \ No newline at end of file diff --git a/nixos/tests/dnscrypt-wrapper/secret.key b/nixos/tests/dnscrypt-wrapper/secret.key deleted file mode 100644 index 01fbf8e08b7a3..0000000000000 --- a/nixos/tests/dnscrypt-wrapper/secret.key +++ /dev/null @@ -1 +0,0 @@ -G>Ʃ>(J=lA:B ;o4S @] \ No newline at end of file diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index e649761d029df..4511a37854eae 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -22,6 +22,8 @@ let ln -s vda1 /dev/xvda1 ''; + amazonImage.format = "qcow2"; + # In a NixOS test the serial console is occupied by the "backdoor" # (see testing/test-instrumentation.nix) and is incompatible with # the configuration in virtualisation/amazon-image.nix. @@ -53,7 +55,7 @@ let } ]; }).config; - image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.vhd"; + image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.qcow2"; sshKeys = import ./ssh-keys.nix pkgs; snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text; @@ -63,6 +65,7 @@ let in { boot-ec2-nixops = makeEc2Test { name = "nixops-userdata"; + meta.timeout = 600; inherit image; sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key! @@ -95,7 +98,7 @@ in { machine.succeed( "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts" ) - machine.succeed("ssh -o BatchMode=yes localhost exit") + machine.succeed("ssh -o BatchMode=yes localhost exit", timeout=120) # Test whether the root disk was resized. blocks, block_size = map(int, machine.succeed("stat -c %b:%S -f /").split(":")) diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix index b82f09a07ed83..ba917e18c09f4 100644 --- a/nixos/tests/enlightenment.nix +++ b/nixos/tests/enlightenment.nix @@ -21,7 +21,6 @@ import ./make-test-python.nix ({ pkgs, ...} : user = "alice"; }; }; - hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then environment.systemPackages = [ pkgs.xdotool ]; services.acpid.enable = true; services.connman.enable = true; diff --git a/nixos/tests/fedimintd.nix b/nixos/tests/fedimintd.nix new file mode 100644 index 0000000000000..19e92b43da653 --- /dev/null +++ b/nixos/tests/fedimintd.nix @@ -0,0 +1,37 @@ +# This test runs the fedimintd and verifies that it starts + +{ pkgs, ... }: + +{ + name = "fedimintd"; + + meta = with pkgs.lib.maintainers; { + maintainers = [ dpc ]; + }; + + nodes.machine = + { ... }: + { + services.fedimintd."mainnet" = { + enable = true; + p2p = { + url = "fedimint://example.com"; + }; + api = { + url = "wss://example.com"; + }; + environment = { + "FM_REL_NOTES_ACK" = "0_4_xyz"; + }; + }; + }; + + testScript = + { nodes, ... }: + '' + start_all() + + machine.wait_for_unit("fedimintd-mainnet.service") + machine.wait_for_open_port(${toString nodes.machine.services.fedimintd.mainnet.api.port}) + ''; +} diff --git a/nixos/tests/filesender.nix b/nixos/tests/filesender.nix index 9274ddbf7e90e..346e315956fb9 100644 --- a/nixos/tests/filesender.nix +++ b/nixos/tests/filesender.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "filesender"; meta = { maintainers = with lib.maintainers; [ nhnn ]; - broken = pkgs.stdenv.isAarch64; # selenium.common.exceptions.WebDriverException: Message: Unsupported platform/architecture combination: linux/aarch64 + broken = pkgs.stdenv.hostPlatform.isAarch64; # selenium.common.exceptions.WebDriverException: Message: Unsupported platform/architecture combination: linux/aarch64 }; nodes.filesender = { ... }: let diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix index ad418bb3341f0..139bc31177402 100644 --- a/nixos/tests/firewall.nix +++ b/nixos/tests/firewall.nix @@ -14,17 +14,10 @@ import ./make-test-python.nix ( { pkgs, nftables, ... } : { networking.nftables.enable = nftables; services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; - }; - # Dummy configuration to check whether firewall.service will be honored - # during system activation. This only needs to be different to the - # original walled configuration so that there is a change in the service - # file. - walled2 = - { ... }: - { networking.firewall.enable = true; - networking.firewall.rejectPackets = true; - networking.nftables.enable = nftables; + specialisation.different-config.configuration = { + networking.firewall.rejectPackets = true; + }; }; attacker = @@ -36,7 +29,6 @@ import ./make-test-python.nix ( { pkgs, nftables, ... } : { }; testScript = { nodes, ... }: let - newSystem = nodes.walled2.system.build.toplevel; unit = if nftables then "nftables" else "firewall"; in '' start_all() @@ -62,7 +54,7 @@ import ./make-test-python.nix ( { pkgs, nftables, ... } : { # Check whether activation of a new configuration reloads the firewall. walled.succeed( - "${newSystem}/bin/switch-to-configuration test 2>&1 | grep -qF ${unit}.service" + "/run/booted-system/specialisation/different-config/bin/switch-to-configuration test 2>&1 | grep -qF ${unit}.service" ) ''; }) diff --git a/nixos/tests/freetube.nix b/nixos/tests/freetube.nix index 10f0773cb884c..4b5b2ed343f11 100644 --- a/nixos/tests/freetube.nix +++ b/nixos/tests/freetube.nix @@ -24,7 +24,7 @@ let nodes = { "${name}" = machine; }; meta.maintainers = with pkgs.lib.maintainers; [ kirillrdy ]; # time-out on ofborg - meta.broken = pkgs.stdenv.isAarch64; + meta.broken = pkgs.stdenv.hostPlatform.isAarch64; enableOCR = true; testScript = '' @@ -35,7 +35,7 @@ let machine.wait_for_text('Your Subscription list is currently empty') machine.screenshot("main.png") machine.send_key("ctrl-comma") - machine.wait_for_text('General Settings', timeout=30) + machine.wait_for_text('Data Settings', timeout=60) machine.screenshot("preferences.png") ''; }); diff --git a/nixos/tests/frr.nix b/nixos/tests/frr.nix index 0d1a6a694a82c..edd702dc60e6f 100644 --- a/nixos/tests/frr.nix +++ b/nixos/tests/frr.nix @@ -99,6 +99,6 @@ import ./make-test-python.nix ({ pkgs, ... }: gw.wait_until_succeeds("vtysh -c 'show ip route' | grep '^O>'") with subtest("Test ICMP"): - client.wait_until_succeeds("ping -c 3 server >&2") + client.wait_until_succeeds("ping -4 -c 3 server >&2") ''; }) diff --git a/nixos/tests/gancio.nix b/nixos/tests/gancio.nix new file mode 100644 index 0000000000000..8f4696d6f6cc4 --- /dev/null +++ b/nixos/tests/gancio.nix @@ -0,0 +1,87 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + let + extraHosts = '' + 192.168.13.12 agenda.example.com + ''; + in + { + name = "gancio"; + meta.maintainers = with pkgs.lib.maintainers; [ jbgi ]; + + nodes = { + server = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { + address = "192.168.13.12"; + prefixLength = 24; + } + ]; + }; + inherit extraHosts; + firewall.allowedTCPPorts = [ 80 ]; + }; + environment.systemPackages = [ pkgs.gancio ]; + services.gancio = { + enable = true; + settings = { + hostname = "agenda.example.com"; + db.dialect = "postgres"; + }; + plugins = [ pkgs.gancioPlugins.telegram-bridge ]; + userLocale = { + en = { + register = { + description = "My new registration page description"; + }; + }; + }; + nginx = { + enableACME = false; + forceSSL = false; + }; + }; + }; + + client = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { + address = "192.168.13.1"; + prefixLength = 24; + } + ]; + }; + inherit extraHosts; + }; + }; + }; + + testScript = '' + start_all() + + server.wait_for_unit("postgresql") + server.wait_for_unit("gancio") + server.wait_for_unit("nginx") + server.wait_for_file("/run/gancio/socket") + server.wait_for_open_port(80) + + # Check can create user via cli + server.succeed("cd /var/lib/gancio && sudo -u gancio gancio users create admin dummy admin") + + # Check event list is returned + client.wait_until_succeeds("curl --verbose --fail-with-body http://agenda.example.com/api/events", timeout=30) + + server.shutdown() + client.shutdown() + ''; + } +) diff --git a/nixos/tests/gatus.nix b/nixos/tests/gatus.nix new file mode 100644 index 0000000000000..5bb146540fbac --- /dev/null +++ b/nixos/tests/gatus.nix @@ -0,0 +1,34 @@ +{ pkgs, ... }: +{ + name = "gatus"; + meta.maintainers = with pkgs.lib.maintainers; [ pizzapim ]; + + nodes.machine = + { ... }: + { + services.gatus = { + enable = true; + + settings = { + web.port = 8080; + metrics = true; + + endpoints = [ + { + name = "metrics"; + url = "http://localhost:8080/metrics"; + interval = "1s"; + conditions = [ + "[STATUS] == 200" + ]; + } + ]; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("gatus.service") + machine.succeed("curl -s http://localhost:8080/metrics | grep go_info") + ''; +} diff --git a/nixos/tests/geth.nix b/nixos/tests/geth.nix index dc6490db57c9c..7f7315271088e 100644 --- a/nixos/tests/geth.nix +++ b/nixos/tests/geth.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { services.geth."testnet" = { enable = true; port = 30304; - network = "goerli"; + network = "holesky"; http = { enable = true; port = 18545; diff --git a/nixos/tests/gitdaemon.nix b/nixos/tests/gitdaemon.nix index 052fa902b4504..2211960b457f8 100644 --- a/nixos/tests/gitdaemon.nix +++ b/nixos/tests/gitdaemon.nix @@ -20,7 +20,7 @@ in { systemd.tmpfiles.rules = [ # type path mode user group age arg - " d /git 0755 root root - -" + " d /git 0755 git git - -" ]; services.gitDaemon = { @@ -56,6 +56,10 @@ in { "rm -r /project", ) + # Change user/group to default daemon user/group from module + # to avoid "fatal: detected dubious ownership in repository at '/git/project.git'" + server.succeed("chown git:git -R /git/project.git") + with subtest("git daemon starts"): server.wait_for_unit("git-daemon.service") diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix index 332cf44b0ed4f..109fdf6b0846c 100644 --- a/nixos/tests/gnome-extensions.nix +++ b/nixos/tests/gnome-extensions.nix @@ -45,7 +45,7 @@ import ./make-test-python.nix ( # Eval API is now internal so Shell needs to run in unsafe mode. # TODO: improve test driver so that it supports openqa-like manipulation # that would allow us to drop this mess. - "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode" ]; }; }; diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix index c8ffb459edece..45538ef4eab40 100644 --- a/nixos/tests/gnome-xorg.nix +++ b/nixos/tests/gnome-xorg.nix @@ -35,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { # Eval API is now internal so Shell needs to run in unsafe mode. # TODO: improve test driver so that it supports openqa-like manipulation # that would allow us to drop this mess. - "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode" ]; }; }; diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index 98d61c7ea1723..9a296b93682c4 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -31,7 +31,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { # Eval API is now internal so Shell needs to run in unsafe mode. # TODO: improve test driver so that it supports openqa-like manipulation # that would allow us to drop this mess. - "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode" ]; }; }; diff --git a/nixos/tests/gnupg.nix b/nixos/tests/gnupg.nix index 65a9a93007fd9..68110c9d6d549 100644 --- a/nixos/tests/gnupg.nix +++ b/nixos/tests/gnupg.nix @@ -69,9 +69,11 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: machine.wait_until_tty_matches("1", "Change") machine.send_chars("O\n") machine.wait_until_tty_matches("1", "Please enter") - machine.send_chars("pgp_p4ssphrase\n") - machine.wait_until_tty_matches("1", "Please re-enter") - machine.send_chars("pgp_p4ssphrase\n") + machine.send_chars("pgp_p4ssphrase") + machine.send_key("tab") + machine.send_chars("pgp_p4ssphrase") + machine.wait_until_tty_matches("1", "Passphrases match") + machine.send_chars("\n") machine.wait_until_tty_matches("1", "public and secret key created") with subtest("Confirm the key is in the keyring"): @@ -90,9 +92,11 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: machine.wait_until_tty_matches("1", "Enter passphrase") machine.send_chars("ssh_p4ssphrase\n") machine.wait_until_tty_matches("1", "Please enter") - machine.send_chars("ssh_agent_p4ssphrase\n") - machine.wait_until_tty_matches("1", "Please re-enter") - machine.send_chars("ssh_agent_p4ssphrase\n") + machine.send_chars("ssh_agent_p4ssphrase") + machine.send_key("tab") + machine.send_chars("ssh_agent_p4ssphrase") + machine.wait_until_tty_matches("1", "Passphrases match") + machine.send_chars("\n") with subtest("Confirm the SSH key has been registered"): machine.wait_until_succeeds(as_alice("ssh-add -l | grep -q alice@machine")) diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 775fae9b71baa..4a137638800b6 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -162,7 +162,7 @@ in { name = "grafana-provision"; meta = with maintainers; { - maintainers = [ kfears willibutz ]; + maintainers = [ willibutz ]; }; inherit nodes; diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixos/tests/hocker-fetchdocker/default.nix deleted file mode 100644 index b5c06126c2e80..0000000000000 --- a/nixos/tests/hocker-fetchdocker/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -import ../make-test-python.nix ({ pkgs, ...} : { - name = "test-hocker-fetchdocker"; - meta = with pkgs.lib.maintainers; { - maintainers = [ ixmatus ]; - broken = true; # tries to download from registry-1.docker.io - how did this ever work? - }; - - nodes.machine = import ./machine.nix; - - testScript = '' - start_all() - - machine.wait_for_unit("sockets.target") - machine.wait_until_succeeds("docker run registry-1.docker.io/v2/library/hello-world:latest") - ''; -}) diff --git a/nixos/tests/hocker-fetchdocker/hello-world-container.nix b/nixos/tests/hocker-fetchdocker/hello-world-container.nix deleted file mode 100644 index a127875264e95..0000000000000 --- a/nixos/tests/hocker-fetchdocker/hello-world-container.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ fetchDockerConfig, fetchDockerLayer, fetchdocker }: -fetchdocker rec { - name = "hello-world"; - registry = "https://registry-1.docker.io/v2/"; - repository = "library"; - imageName = "hello-world"; - tag = "latest"; - imageConfig = fetchDockerConfig { - inherit tag registry repository imageName; - sha256 = "1ivbd23hyindkahzfw4kahgzi6ibzz2ablmgsz6340vc6qr1gagj"; - }; - imageLayers = let - layer0 = fetchDockerLayer { - inherit registry repository imageName; - layerDigest = "ca4f61b1923c10e9eb81228bd46bee1dfba02b9c7dac1844527a734752688ede"; - sha256 = "1plfd194fwvsa921ib3xkhms1yqxxrmx92r2h7myj41wjaqn2kya"; - }; - in [ layer0 ]; - } diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix deleted file mode 100644 index 885adebe14985..0000000000000 --- a/nixos/tests/hocker-fetchdocker/machine.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, ... }: -{ nixpkgs.config.packageOverrides = pkgs': { - hello-world-container = pkgs'.callPackage ./hello-world-container.nix { }; - }; - - virtualisation.docker = { - enable = true; - package = pkgs.docker; - }; - - systemd.services.docker-load-fetchdocker-image = { - description = "Docker load hello-world-container"; - wantedBy = [ "multi-user.target" ]; - wants = [ "docker.service" ]; - after = [ "docker.service" ]; - - script = '' - ${pkgs.hello-world-container}/compositeImage.sh | ${pkgs.docker}/bin/docker load - ''; - - serviceConfig = { - Type = "oneshot"; - }; - }; -} - diff --git a/nixos/tests/installed-tests/gdk-pixbuf.nix b/nixos/tests/installed-tests/gdk-pixbuf.nix index 110efdbf710f2..a86c20b0fbeb0 100644 --- a/nixos/tests/installed-tests/gdk-pixbuf.nix +++ b/nixos/tests/installed-tests/gdk-pixbuf.nix @@ -6,7 +6,7 @@ makeInstalledTest { testConfig = { # Tests allocate a lot of memory trying to exploit a CVE # but qemu-system-i386 has a 2047M memory limit - virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096; + virtualisation.memorySize = if pkgs.stdenv.hostPlatform.isi686 then 2047 else 4096; }; testRunnerFlags = [ "--timeout" "1800" ]; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index d57866c9f52c6..d4caf3ceaf1fb 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -626,12 +626,16 @@ let libxslt.bin nixos-artwork.wallpapers.simple-dark-gray-bottom ntp + perlPackages.ConfigIniFiles + perlPackages.FileSlurp + perlPackages.JSON perlPackages.ListCompare perlPackages.XMLLibXML # make-options-doc/default.nix (python3.withPackages (p: [ p.mistune ])) shared-mime-info sudo + switch-to-configuration-ng texinfo unionfs-fuse xorg.lndir @@ -645,6 +649,10 @@ let in [ (pkgs.grub2.override { inherit zfsSupport; }) (pkgs.grub2_efi.override { inherit zfsSupport; }) + pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader + pkgs.perlPackages.FileCopyRecursive + pkgs.perlPackages.XMLSAX + pkgs.perlPackages.XMLSAXBase ]) ++ optionals (bootLoader == "systemd-boot") [ pkgs.zstd.bin diff --git a/nixos/tests/invidious.nix b/nixos/tests/invidious.nix index c042b1065c261..05b43c5556060 100644 --- a/nixos/tests/invidious.nix +++ b/nixos/tests/invidious.nix @@ -37,6 +37,19 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; networking.hosts."127.0.0.1" = [ "invidious.example.com" ]; }; + nginx-sig-helper.configuration = { + services.invidious = { + nginx.enable = true; + domain = "invidious.example.com"; + sig-helper.enable = true; + settings.log_level = "Trace"; + }; + services.nginx.virtualHosts."invidious.example.com" = { + forceSSL = false; + enableACME = false; + }; + networking.hosts."127.0.0.1" = [ "invidious.example.com" ]; + }; nginx-scale.configuration = { services.invidious = { nginx.enable = true; @@ -116,6 +129,14 @@ import ./make-test-python.nix ({ pkgs, ... }: { curl_assert_status_code("http://invidious.example.com/vi/dQw4w9WgXcQ/mqdefault.jpg", 502) machine.succeed("journalctl -eu http3-ytproxy.service | grep -o 'dQw4w9WgXcQ'") + activate_specialisation("nginx-sig-helper") + machine.wait_for_unit("invidious-sig-helper.service") + # we can't really test the sig helper that well without internet connection... + # invidious does connect to the sig helper though and crashes when the sig helper is not available + machine.wait_for_open_port(80) + curl_assert_status_code("http://invidious.example.com/search", 200) + machine.succeed("journalctl -eu invidious.service | grep -o \"SigHelper: Using helper at 'tcp://127.0.0.1:2999'\"") + postgres_tcp.wait_for_unit("postgresql.service") activate_specialisation("postgres-tcp") machine.wait_for_open_port(port) diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index 5fe106453f308..58b98b2a18532 100644 --- a/nixos/tests/k3s/multi-node.nix +++ b/nixos/tests/k3s/multi-node.nix @@ -189,15 +189,13 @@ import ../make-test-python.nix ( m.start() m.wait_for_unit("k3s") - is_aarch64 = "${toString pkgs.stdenv.isAarch64}" == "1" + is_aarch64 = "${toString pkgs.stdenv.hostPlatform.isAarch64}" == "1" # wait for the agent to show up server.wait_until_succeeds("k3s kubectl get node agent") for m in machines: - # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" - if not is_aarch64: - m.succeed("k3s check-config") + m.succeed("k3s check-config") m.succeed( "${pauseImage} | k3s ctr image import -" ) diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index 145bce3242999..55a15324c88f5 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -76,44 +76,40 @@ import ../make-test-python.nix ( }; }; - testScript = - '' - start_all() + testScript = '' + start_all() - machine.wait_for_unit("k3s") - machine.succeed("kubectl cluster-info") - machine.fail("sudo -u noprivs kubectl cluster-info") - '' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" - + lib.optionalString (!pkgs.stdenv.isAarch64) ''machine.succeed("k3s check-config")'' - + '' + machine.wait_for_unit("k3s") + machine.succeed("kubectl cluster-info") + machine.fail("sudo -u noprivs kubectl cluster-info") + machine.succeed("k3s check-config") + machine.succeed( + "${pauseImage} | ctr image import -" + ) - machine.succeed( - "${pauseImage} | ctr image import -" - ) + # Also wait for our service account to show up; it takes a sec + machine.wait_until_succeeds("kubectl get serviceaccount default") + machine.succeed("kubectl apply -f ${testPodYaml}") + machine.succeed("kubectl wait --for 'condition=Ready' pod/test") + machine.succeed("kubectl delete -f ${testPodYaml}") - # Also wait for our service account to show up; it takes a sec - machine.wait_until_succeeds("kubectl get serviceaccount default") - machine.succeed("kubectl apply -f ${testPodYaml}") - machine.succeed("kubectl wait --for 'condition=Ready' pod/test") - machine.succeed("kubectl delete -f ${testPodYaml}") + # regression test for #176445 + machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'") - # regression test for #176445 - machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'") + with subtest("Run k3s-killall"): + # Call the killall script with a clean path to assert that + # all required commands are wrapped + output = machine.succeed("PATH= ${k3s}/bin/k3s-killall.sh 2>&1 | tee /dev/stderr") + assert "command not found" not in output, "killall script contains unknown command" - with subtest("Run k3s-killall"): - # Call the killall script with a clean path to assert that - # all required commands are wrapped - output = machine.succeed("PATH= ${k3s}/bin/k3s-killall.sh 2>&1 | tee /dev/stderr") - assert "command not found" not in output, "killall script contains unknown command" + # Check that killall cleaned up properly + machine.fail("systemctl is-active k3s.service") + machine.fail("systemctl list-units | grep containerd") + machine.fail("ip link show | awk -F': ' '{print $2}' | grep -e flannel -e cni0") + machine.fail("ip netns show | grep cni-") - # Check that killall cleaned up properly - machine.fail("systemctl is-active k3s.service") - machine.fail("systemctl list-units | grep containerd") - machine.fail("ip link show | awk -F': ' '{print $2}' | grep -e flannel -e cni0") - machine.fail("ip netns show | grep cni-") - - machine.shutdown() - ''; + machine.shutdown() + ''; meta.maintainers = lib.teams.k3s.members; } diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 3e2302810ef04..e5d3b36642e72 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -25,7 +25,6 @@ let }) args); kernels = pkgs.linuxKernel.vanillaPackages // { inherit (pkgs.linuxKernel.packages) - linux_4_19_hardened linux_5_4_hardened linux_5_10_hardened linux_5_15_hardened diff --git a/nixos/tests/libreswan.nix b/nixos/tests/libreswan.nix index 6dd9a845d19af..1a25c1e6d9af7 100644 --- a/nixos/tests/libreswan.nix +++ b/nixos/tests/libreswan.nix @@ -37,6 +37,8 @@ let useDHCP = false; interfaces.eth1.ipv4.addresses = lib.mkVMOverride []; interfaces.eth2.ipv4.addresses = lib.mkVMOverride []; + interfaces.eth1.ipv6.addresses = lib.mkVMOverride []; + interfaces.eth2.ipv6.addresses = lib.mkVMOverride []; # open a port for testing firewall.allowedUDPPorts = [ 1234 ]; }; diff --git a/nixos/tests/libvirtd.nix b/nixos/tests/libvirtd.nix index 27ffaac3e62d1..0b068d5a2f08b 100644 --- a/nixos/tests/libvirtd.nix +++ b/nixos/tests/libvirtd.nix @@ -30,7 +30,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = let nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.stdenv.hostPlatform.system}; - virshShutdownCmd = if pkgs.stdenv.isx86_64 then "shutdown" else "destroy"; + virshShutdownCmd = if pkgs.stdenv.hostPlatform.isx86_64 then "shutdown" else "destroy"; in '' start_all() diff --git a/nixos/tests/logrotate.nix b/nixos/tests/logrotate.nix index f9c5e90609709..8d5887abec941 100644 --- a/nixos/tests/logrotate.nix +++ b/nixos/tests/logrotate.nix @@ -127,5 +127,7 @@ import ./make-test-python.nix ({ pkgs, ... }: rec { if info["ActiveState"] != "failed": raise Exception('logrotate-checkconf.service was not failed') + machine.log(machine.execute("systemd-analyze security logrotate.service | grep -v ✓")[1]) + ''; }) diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 328d9656b5f53..b146cba93fe62 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -654,6 +654,7 @@ in machine.send_key("left") machine.send_key("left") machine.send_key("left") + machine.send_key("left") # Notifications are usually empty, nothing to check there with subtest("ayatana indicator display works"): @@ -661,6 +662,11 @@ in wait_for_text("Lock") machine.screenshot("indicators_display") + with subtest("ayatana indicator bluetooth works"): + machine.send_key("right") + wait_for_text("Bluetooth settings") + machine.screenshot("indicators_bluetooth") + with subtest("lomiri indicator network works"): machine.send_key("right") wait_for_text(r"(Flight|Wi-Fi)") diff --git a/nixos/tests/lvm2/default.nix b/nixos/tests/lvm2/default.nix index ba1bdb5de5454..346ec6739501d 100644 --- a/nixos/tests/lvm2/default.nix +++ b/nixos/tests/lvm2/default.nix @@ -10,7 +10,7 @@ let tests = let callTest = p: lib.flip (import p) { inherit system pkgs; }; in { thinpool = { test = callTest ./thinpool.nix; kernelFilter = lib.id; }; # we would like to test all versions, but the kernel module currently does not compile against the other versions - vdo = { test = callTest ./vdo.nix; kernelFilter = lib.filter (v: v == "6.1"); }; + vdo = { test = callTest ./vdo.nix; kernelFilter = lib.filter (v: v == "latest"); }; # systemd in stage 1 @@ -26,7 +26,7 @@ let }; vdo-sd-stage-1 = { test = callTest ./systemd-stage-1.nix; - kernelFilter = lib.filter (v: v == "6.1"); + kernelFilter = lib.filter (v: v == "latest"); flavour = "vdo"; }; }; diff --git a/nixos/tests/mate-wayland.nix b/nixos/tests/mate-wayland.nix index e5c96d2af7470..73f94ababc493 100644 --- a/nixos/tests/mate-wayland.nix +++ b/nixos/tests/mate-wayland.nix @@ -20,8 +20,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; services.xserver.desktopManager.mate.enableWaylandSession = true; - hardware.pulseaudio.enable = true; - # Need to switch to a different GPU driver than the default one (-vga std) so that wayfire can launch: virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; }; @@ -41,7 +39,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest("Check if MATE session components actually start"): for i in ["wayfire", "mate-panel", "mate-wayland.sh", "mate-wayland-components.sh"]: machine.wait_until_succeeds(f"pgrep -f {i}") - machine.wait_for_text('(Applications|Places|System)') # It is expected that this applet doesn't work in Wayland machine.wait_for_text('WorkspaceSwitcherApplet') diff --git a/nixos/tests/mate.nix b/nixos/tests/mate.nix index 1252ec43cf3d5..0cadd6d0d5bff 100644 --- a/nixos/tests/mate.nix +++ b/nixos/tests/mate.nix @@ -21,10 +21,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; services.xserver.desktopManager.mate.enable = true; - - # Silence log spam due to no sound drivers loaded: - # ALSA lib confmisc.c:855:(parse_card) cannot find card '0' - hardware.pulseaudio.enable = true; }; enableOCR = true; diff --git a/nixos/tests/matrix/appservice-irc.nix b/nixos/tests/matrix/appservice-irc.nix index 78c53024ca6c4..41a6b005064fd 100644 --- a/nixos/tests/matrix/appservice-irc.nix +++ b/nixos/tests/matrix/appservice-irc.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, ... }: +{ pkgs, ... }: let homeserverUrl = "http://homeserver:8008"; in @@ -9,7 +9,7 @@ import ../make-test-python.nix ({ pkgs, ... }: }; nodes = { - homeserver = { pkgs, ... }: { + homeserver = { # We'll switch to this once the config is copied into place specialisation.running.configuration = { services.matrix-synapse = { @@ -46,7 +46,7 @@ import ../make-test-python.nix ({ pkgs, ... }: }; }; - ircd = { pkgs, ... }: { + ircd = { services.ngircd = { enable = true; config = '' @@ -75,12 +75,18 @@ import ../make-test-python.nix ({ pkgs, ... }: homeserver.url = homeserverUrl; homeserver.domain = "homeserver"; - ircService.servers."ircd" = { - name = "IRCd"; - port = 6667; - dynamicChannels = { - enabled = true; - aliasTemplate = "#irc_$CHANNEL"; + ircService = { + servers."ircd" = { + name = "IRCd"; + port = 6667; + dynamicChannels = { + enabled = true; + aliasTemplate = "#irc_$CHANNEL"; + }; + }; + mediaProxy = { + publicUrl = "http://localhost:11111/media"; + ttl = 0; }; }; }; @@ -203,6 +209,8 @@ import ../make-test-python.nix ({ pkgs, ... }: with subtest("start the appservice"): appservice.wait_for_unit("matrix-appservice-irc.service") appservice.wait_for_open_port(8009) + appservice.wait_for_file("/var/lib/matrix-appservice-irc/media-signingkey.jwk") + appservice.wait_for_open_port(11111) with subtest("copy the registration file"): appservice.copy_from_vm("/var/lib/matrix-appservice-irc/registration.yml") @@ -222,4 +230,4 @@ import ../make-test-python.nix ({ pkgs, ... }: with subtest("ensure messages can be exchanged"): client.succeed("do_test ${homeserverUrl} >&2") ''; - }) + } diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index 8a888b17a3d7c..265b13821ebd8 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/nixos/tests/matrix/mjolnir.nix @@ -109,8 +109,8 @@ import ../make-test-python.nix ( environment.systemPackages = [ (pkgs.writers.writePython3Bin "create_management_room_and_invite_mjolnir" { libraries = with pkgs.python3Packages; [ - matrix-nio - ] ++ matrix-nio.optional-dependencies.e2e; + (matrix-nio.override { withOlm = true; }) + ]; } '' import asyncio diff --git a/nixos/tests/mutable-users.nix b/nixos/tests/mutable-users.nix index ebe32e6487ef4..ef83923f3e232 100644 --- a/nixos/tests/mutable-users.nix +++ b/nixos/tests/mutable-users.nix @@ -7,19 +7,19 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; nodes = { - machine = { ... }: { - users.mutableUsers = false; - }; - mutable = { ... }: { - users.mutableUsers = true; - users.users.dry-test.isNormalUser = true; + machine = { + specialisation.immutable.configuration = { + users.mutableUsers = false; + }; + + specialisation.mutable.configuration = { + users.mutableUsers = true; + users.users.dry-test.isNormalUser = true; + }; }; }; - testScript = {nodes, ...}: let - immutableSystem = nodes.machine.config.system.build.toplevel; - mutableSystem = nodes.mutable.config.system.build.toplevel; - in '' + testScript = '' machine.start() machine.wait_for_unit("default.target") @@ -30,7 +30,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { machine.succeed("sudo useradd foobar") assert "foobar" in machine.succeed("cat /etc/passwd") machine.succeed( - "${immutableSystem}/bin/switch-to-configuration test" + "/run/booted-system/specialisation/immutable/bin/switch-to-configuration test" ) assert "foobar" not in machine.succeed("cat /etc/passwd") @@ -39,7 +39,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { with subtest("Password is wrapped in mutable mode"): assert "/run/current-system/" in machine.succeed("which passwd") machine.succeed( - "${mutableSystem}/bin/switch-to-configuration test" + "/run/booted-system/specialisation/mutable/bin/switch-to-configuration test" ) assert "/run/wrappers/" in machine.succeed("which passwd") @@ -63,7 +63,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { expected_hashes[file] = machine.succeed(f"sha256sum {file}") expected_stats[file] = machine.succeed(f"stat {file}") - machine.succeed("/run/current-system/bin/switch-to-configuration dry-activate") + machine.succeed("/run/booted-system/specialisation/mutable/bin/switch-to-configuration dry-activate") machine.fail('test -e /home/dry-test') # home was not recreated for file in files_to_check: diff --git a/nixos/tests/mysql/mariadb-galera.nix b/nixos/tests/mysql/mariadb-galera.nix index 7455abbce5fb0..65705afbf82cd 100644 --- a/nixos/tests/mysql/mariadb-galera.nix +++ b/nixos/tests/mysql/mariadb-galera.nix @@ -1,8 +1,8 @@ { system ? builtins.currentSystem, - config ? {}, + config ? { }, pkgs ? import ../../.. { inherit system config; }, - lib ? pkgs.lib + lib ? pkgs.lib, }: let @@ -11,240 +11,263 @@ let makeTest = import ./../make-test-python.nix; # Common user configuration - makeGaleraTest = { - mariadbPackage, - name ? mkTestName mariadbPackage, - galeraPackage ? pkgs.mariadb-galera - }: makeTest { - name = "${name}-galera-mariabackup"; - meta = { - maintainers = with lib.maintainers; [ izorkin ] ++ lib.teams.helsinki-systems.members; - }; + makeGaleraTest = + { + mariadbPackage, + name ? mkTestName mariadbPackage, + galeraPackage ? pkgs.mariadb-galera, + }: + makeTest { + name = "${name}-galera-mariabackup"; + meta = { + maintainers = with lib.maintainers; [ izorkin ] ++ lib.teams.helsinki-systems.members; + }; - # The test creates a Galera cluster with 3 nodes and is checking if mariabackup-based SST works. The cluster is tested by creating a DB and an empty table on one node, - # and checking the table's presence on the other node. - nodes = let - mkGaleraNode = { - id, - method - }: let - address = "192.168.1.${toString id}"; - isFirstClusterNode = id == 1 || id == 4; - in { - users = { - users.testuser = { - isSystemUser = true; - group = "testusers"; - }; - groups.testusers = { }; - }; + # The test creates a Galera cluster with 3 nodes and is checking if mariabackup-based SST works. The cluster is tested by creating a DB and an empty table on one node, + # and checking the table's presence on the other node. + nodes = + let + mkGaleraNode = + { + id, + method, + }: + let + address = "192.168.1.${toString id}"; + isFirstClusterNode = id == 1 || id == 4; + in + { + users = { + users.testuser = { + isSystemUser = true; + group = "testusers"; + }; + groups.testusers = { }; + }; - networking = { - interfaces.eth1 = { - ipv4.addresses = [ - { inherit address; prefixLength = 24; } - ]; - }; - extraHosts = lib.concatMapStringsSep "\n" (i: "192.168.1.${toString i} galera_0${toString i}") (lib.range 1 6); - firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; - firewall.allowedUDPPorts = [ 4567 ]; - }; - systemd.services.mysql = with pkgs; { - path = with pkgs; [ - bash - gawk - gnutar - gzip - inetutils - iproute2 - netcat - procps - pv - rsync - socat - stunnel - which - ]; - }; - services.mysql = { - enable = true; - package = mariadbPackage; - ensureDatabases = lib.mkIf isFirstClusterNode [ "testdb" ]; - ensureUsers = lib.mkIf isFirstClusterNode [{ - name = "testuser"; - ensurePermissions = { - "testdb.*" = "ALL PRIVILEGES"; - }; - }]; - initialScript = lib.mkIf isFirstClusterNode (pkgs.writeText "mariadb-init.sql" '' - GRANT ALL PRIVILEGES ON *.* TO 'check_repl'@'localhost' IDENTIFIED BY 'check_pass' WITH GRANT OPTION; - FLUSH PRIVILEGES; - ''); - settings = { - mysqld = { - bind_address = "0.0.0.0"; - }; - galera = { - wsrep_on = "ON"; - wsrep_debug = "NONE"; - wsrep_retry_autocommit = "3"; - wsrep_provider = "${galeraPackage}/lib/galera/libgalera_smm.so"; - wsrep_cluster_address = "gcomm://" - + lib.optionalString (id == 2 || id == 3) "galera_01,galera_02,galera_03" - + lib.optionalString (id == 5 || id == 6) "galera_04,galera_05,galera_06"; - wsrep_cluster_name = "galera"; - wsrep_node_address = address; - wsrep_node_name = "galera_0${toString id}"; - wsrep_sst_method = method; - wsrep_sst_auth = "check_repl:check_pass"; - binlog_format = "ROW"; - enforce_storage_engine = "InnoDB"; - innodb_autoinc_lock_mode = "2"; + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { + inherit address; + prefixLength = 24; + } + ]; + ipv6.addresses = lib.mkForce [ ]; + }; + extraHosts = lib.concatMapStringsSep "\n" (i: "192.168.1.${toString i} galera_0${toString i}") ( + lib.range 1 6 + ); + firewall.allowedTCPPorts = [ + 3306 + 4444 + 4567 + 4568 + ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + systemd.services.mysql = with pkgs; { + path = with pkgs; [ + bash + gawk + gnutar + gzip + inetutils + iproute2 + netcat + procps + pv + rsync + socat + stunnel + which + ]; + }; + services.mysql = { + enable = true; + package = mariadbPackage; + ensureDatabases = lib.mkIf isFirstClusterNode [ "testdb" ]; + ensureUsers = lib.mkIf isFirstClusterNode [ + { + name = "testuser"; + ensurePermissions = { + "testdb.*" = "ALL PRIVILEGES"; + }; + } + ]; + initialScript = lib.mkIf isFirstClusterNode ( + pkgs.writeText "mariadb-init.sql" '' + GRANT ALL PRIVILEGES ON *.* TO 'check_repl'@'localhost' IDENTIFIED BY 'check_pass' WITH GRANT OPTION; + FLUSH PRIVILEGES; + '' + ); + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "NONE"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${galeraPackage}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = + "gcomm://" + + lib.optionalString (id == 2 || id == 3) "galera_01,galera_02,galera_03" + + lib.optionalString (id == 5 || id == 6) "galera_04,galera_05,galera_06"; + wsrep_cluster_name = "galera"; + wsrep_node_address = address; + wsrep_node_name = "galera_0${toString id}"; + wsrep_sst_method = method; + wsrep_sst_auth = "check_repl:check_pass"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; }; + in + { + galera_01 = mkGaleraNode { + id = 1; + method = "mariabackup"; }; - }; - }; - in { - galera_01 = mkGaleraNode { - id = 1; - method = "mariabackup"; - }; - galera_02 = mkGaleraNode { - id = 2; - method = "mariabackup"; - }; + galera_02 = mkGaleraNode { + id = 2; + method = "mariabackup"; + }; - galera_03 = mkGaleraNode { - id = 3; - method = "mariabackup"; - }; + galera_03 = mkGaleraNode { + id = 3; + method = "mariabackup"; + }; - galera_04 = mkGaleraNode { - id = 4; - method = "rsync"; - }; + galera_04 = mkGaleraNode { + id = 4; + method = "rsync"; + }; - galera_05 = mkGaleraNode { - id = 5; - method = "rsync"; - }; + galera_05 = mkGaleraNode { + id = 5; + method = "rsync"; + }; - galera_06 = mkGaleraNode { - id = 6; - method = "rsync"; - }; + galera_06 = mkGaleraNode { + id = 6; + method = "rsync"; + }; - }; + }; - testScript = '' - galera_01.start() - galera_01.wait_for_unit("mysql") - galera_01.wait_for_open_port(3306) - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (37);'" - ) - galera_02.start() - galera_02.wait_for_unit("mysql") - galera_02.wait_for_open_port(3306) - galera_03.start() - galera_03.wait_for_unit("mysql") - galera_03.wait_for_open_port(3306) - galera_02.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" - ) - galera_02.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_02.succeed("systemctl stop mysql") - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (38);'" - ) - galera_03.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (39);'" - ) - galera_02.succeed("systemctl start mysql") - galera_02.wait_for_open_port(3306) - galera_02.succeed( - "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" - ) - galera_03.succeed( - "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" - ) - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 39" - ) - galera_02.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 38" - ) - galera_03.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" - ) - galera_01.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") - galera_02.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") - galera_03.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") - galera_01.crash() - galera_02.crash() - galera_03.crash() + testScript = '' + galera_01.start() + galera_01.wait_for_unit("mysql") + galera_01.wait_for_open_port(3306) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (37);'" + ) + galera_02.start() + galera_02.wait_for_unit("mysql") + galera_02.wait_for_open_port(3306) + galera_03.start() + galera_03.wait_for_unit("mysql") + galera_03.wait_for_open_port(3306) + galera_02.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" + ) + galera_02.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_02.succeed("systemctl stop mysql") + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (38);'" + ) + galera_03.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (39);'" + ) + galera_02.succeed("systemctl start mysql") + galera_02.wait_for_open_port(3306) + galera_02.succeed( + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + ) + galera_03.succeed( + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 39" + ) + galera_02.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 38" + ) + galera_03.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" + ) + galera_01.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") + galera_02.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") + galera_03.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") + galera_01.crash() + galera_02.crash() + galera_03.crash() - galera_04.start() - galera_04.wait_for_unit("mysql") - galera_04.wait_for_open_port(3306) - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (41);'" - ) - galera_05.start() - galera_05.wait_for_unit("mysql") - galera_05.wait_for_open_port(3306) - galera_06.start() - galera_06.wait_for_unit("mysql") - galera_06.wait_for_open_port(3306) - galera_05.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" - ) - galera_05.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_05.succeed("systemctl stop mysql") - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (42);'" - ) - galera_06.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (43);'" - ) - galera_05.succeed("systemctl start mysql") - galera_05.wait_for_open_port(3306) - galera_05.succeed( - "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" - ) - galera_06.succeed( - "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" - ) - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 43" - ) - galera_05.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 42" - ) - galera_06.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" - ) - galera_04.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") - galera_05.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") - galera_06.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") - ''; - }; + galera_04.start() + galera_04.wait_for_unit("mysql") + galera_04.wait_for_open_port(3306) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (41);'" + ) + galera_05.start() + galera_05.wait_for_unit("mysql") + galera_05.wait_for_open_port(3306) + galera_06.start() + galera_06.wait_for_unit("mysql") + galera_06.wait_for_open_port(3306) + galera_05.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" + ) + galera_05.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_05.succeed("systemctl stop mysql") + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (42);'" + ) + galera_06.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (43);'" + ) + galera_05.succeed("systemctl start mysql") + galera_05.wait_for_open_port(3306) + galera_05.succeed( + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + ) + galera_06.succeed( + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 43" + ) + galera_05.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 42" + ) + galera_06.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" + ) + galera_04.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") + galera_05.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") + galera_06.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") + ''; + }; in - lib.mapAttrs (_: mariadbPackage: makeGaleraTest { inherit mariadbPackage; }) mariadbPackages +lib.mapAttrs (_: mariadbPackage: makeGaleraTest { inherit mariadbPackage; }) mariadbPackages diff --git a/nixos/tests/mysql/mysql-autobackup.nix b/nixos/tests/mysql/mysql-autobackup.nix index b49466db0a9ce..80dbb47adcd29 100644 --- a/nixos/tests/mysql/mysql-autobackup.nix +++ b/nixos/tests/mysql/mysql-autobackup.nix @@ -1,8 +1,8 @@ { system ? builtins.currentSystem, - config ? {}, + config ? { }, pkgs ? import ../../.. { inherit system config; }, - lib ? pkgs.lib + lib ? pkgs.lib, }: let @@ -10,44 +10,52 @@ let makeTest = import ./../make-test-python.nix; - makeAutobackupTest = { - package, - name ? mkTestName package, - }: makeTest { - name = "${name}-automysqlbackup"; - meta.maintainers = [ lib.maintainers.aanderse ]; - - nodes.machine = { - services.mysql = { - inherit package; - enable = true; - initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + makeAutobackupTest = + { + package, + name ? mkTestName package, + }: + makeTest { + name = "${name}-automysqlbackup"; + meta.maintainers = [ lib.maintainers.aanderse ]; + + nodes.machine = { + services.mysql = { + inherit package; + enable = true; + initialDatabases = [ + { + name = "testdb"; + schema = ./testdb.sql; + } + ]; + }; + + services.automysqlbackup.enable = true; + automysqlbackup.settings.mysql_dump_port = ""; }; - services.automysqlbackup.enable = true; - }; - - testScript = '' - start_all() + testScript = '' + start_all() - # Need to have mysql started so that it can be populated with data. - machine.wait_for_unit("mysql.service") + # Need to have mysql started so that it can be populated with data. + machine.wait_for_unit("mysql.service") - with subtest("Wait for testdb to be fully populated (5 rows)."): - machine.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" - ) + with subtest("Wait for testdb to be fully populated (5 rows)."): + machine.wait_until_succeeds( + "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + ) - with subtest("Do a backup and wait for it to start"): - machine.start_job("automysqlbackup.service") - machine.wait_for_job("automysqlbackup.service") + with subtest("Do a backup and wait for it to start"): + machine.start_job("automysqlbackup.service") + machine.wait_for_job("automysqlbackup.service") - with subtest("wait for backup file and check that data appears in backup"): - machine.wait_for_file("/var/backup/mysql/daily/testdb") - machine.succeed( - "${pkgs.gzip}/bin/zcat /var/backup/mysql/daily/testdb/daily_testdb_*.sql.gz | grep hello" - ) + with subtest("wait for backup file and check that data appears in backup"): + machine.wait_for_file("/var/backup/mysql/daily/testdb") + machine.succeed( + "${pkgs.gzip}/bin/zcat /var/backup/mysql/daily/testdb/daily_testdb_*.sql.gz | grep hello" + ) ''; - }; + }; in - lib.mapAttrs (_: package: makeAutobackupTest { inherit package; }) mariadbPackages +lib.mapAttrs (_: package: makeAutobackupTest { inherit package; }) mariadbPackages diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 550c5a2d14f31..507e0fd72e2ac 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -6,17 +6,6 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, nftables ? false, ... }: let unit = if nftables then "nftables" else (if withFirewall then "firewall" else "nat"); - - routerBase = - lib.mkMerge [ - { virtualisation.vlans = [ 2 1 ]; - networking.firewall.enable = withFirewall; - networking.firewall.filterForward = nftables; - networking.nftables.enable = nftables; - networking.nat.internalIPs = [ "192.168.1.0/24" ]; - networking.nat.externalInterface = "eth1"; - } - ]; in { name = "nat" + (lib.optionalString nftables "Nftables") @@ -26,27 +15,27 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, nftables ? false, ... }; nodes = - { client = - { pkgs, nodes, ... }: - lib.mkMerge [ - { virtualisation.vlans = [ 1 ]; - networking.defaultGateway = - (pkgs.lib.head nodes.router.networking.interfaces.eth2.ipv4.addresses).address; - networking.nftables.enable = nftables; - } - ]; + { + client = { lib, nodes, ... }: { + virtualisation.vlans = [ 1 ]; + networking.defaultGateway = + (lib.head nodes.router.networking.interfaces.eth2.ipv4.addresses).address; + networking.nftables.enable = nftables; + }; - router = - { ... }: lib.mkMerge [ - routerBase - { networking.nat.enable = true; } - ]; + router = { lib, ... }: { + virtualisation.vlans = [ 2 1 ]; + networking.firewall.enable = withFirewall; + networking.firewall.filterForward = nftables; + networking.nftables.enable = nftables; + networking.nat.enable = true; + networking.nat.internalIPs = [ "192.168.1.0/24" ]; + networking.nat.externalInterface = "eth1"; - routerDummyNoNat = - { ... }: lib.mkMerge [ - routerBase - { networking.nat.enable = false; } - ]; + specialisation.no-nat.configuration = { + networking.nat.enable = lib.mkForce false; + }; + }; server = { ... }: @@ -59,11 +48,7 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, nftables ? false, ... }; }; - testScript = - { nodes, ... }: let - routerDummyNoNatClosure = nodes.routerDummyNoNat.system.build.toplevel; - routerClosure = nodes.router.system.build.toplevel; - in '' + testScript = '' client.start() router.start() server.start() @@ -94,14 +79,14 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, nftables ? false, ... # If we turn off NAT, the client shouldn't be able to reach the server. router.succeed( - "${routerDummyNoNatClosure}/bin/switch-to-configuration test 2>&1" + "/run/booted-system/specialisation/no-nat/bin/switch-to-configuration test 2>&1" ) client.fail("curl -4 --fail --connect-timeout 5 http://server/ >&2") client.fail("ping -4 -c 1 server >&2") # And make sure that reloading the NAT job works. router.succeed( - "${routerClosure}/bin/switch-to-configuration test 2>&1" + "/run/booted-system/bin/switch-to-configuration test 2>&1" ) # FIXME: this should not be necessary, but nat.service is not started because # network.target is not triggered diff --git a/nixos/tests/netbird.nix b/nixos/tests/netbird.nix index 7342e8d04a39c..887747437c22c 100644 --- a/nixos/tests/netbird.nix +++ b/nixos/tests/netbird.nix @@ -2,9 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "netbird"; - meta = with pkgs.lib.maintainers; { - maintainers = [ misuzu ]; - }; + meta.maintainers = with pkgs.lib.maintainers; [ ]; nodes = { node = { ... }: { diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 9f8b06561b074..a1aba5c1ab649 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -44,13 +44,13 @@ let nodes = { client = { ... }: {}; - nextcloud = { + nextcloud = { lib, ... }: { networking.firewall.allowedTCPPorts = [ 80 ]; services.nextcloud = { enable = true; hostName = "nextcloud"; https = false; - database.createLocally = true; + database.createLocally = lib.mkDefault true; config = { adminpassFile = "${pkgs.writeText "adminpass" config.adminpass}"; # Don't try this at home! }; @@ -104,9 +104,10 @@ let }); in map callNextcloudTest [ ./basic.nix + ./with-declarative-redis-and-secrets.nix ./with-mysql-and-memcached.nix ./with-postgresql-and-redis.nix ./with-objectstore.nix ]; in -listToAttrs (concatMap genTests [ 28 29 ]) +listToAttrs (concatMap genTests [ 28 29 30 ]) diff --git a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix index b09ee1276a136..80041ed481b45 100644 --- a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix +++ b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix @@ -1,29 +1,18 @@ -args@{ nextcloudVersion ? 27, ... }: -(import ../make-test-python.nix ({ pkgs, ...}: let - adminuser = "custom_admin_username"; - # This will be used both for redis and postgresql - pass = "hunter2"; - # Don't do this at home, use a file outside of the nix store instead - passFile = toString (pkgs.writeText "pass-file" '' - ${pass} - ''); -in { - name = "nextcloud-with-declarative-redis"; +{ name, pkgs, testBase, system, ... }: + +with import ../../lib/testing-python.nix { inherit system pkgs; }; +runTest ({ config, ... }: let inherit (config) adminuser; in { + inherit name; meta = with pkgs.lib.maintainers; { maintainers = [ eqyiel ma27 ]; }; - nodes = { - # The only thing the client needs to do is download a file. - client = { ... }: {}; + imports = [ testBase ]; + nodes = { nextcloud = { config, pkgs, ... }: { - networking.firewall.allowedTCPPorts = [ 80 ]; - + environment.systemPackages = [ pkgs.jq ]; services.nextcloud = { - enable = true; - hostName = "nextcloud"; - package = pkgs.${"nextcloud" + (toString nextcloudVersion)}; caching = { apcu = false; redis = true; @@ -35,10 +24,9 @@ in { dbtype = "pgsql"; dbname = "nextcloud"; dbuser = adminuser; - dbpassFile = passFile; - adminuser = adminuser; - adminpassFile = passFile; + dbpassFile = config.services.nextcloud.config.adminpassFile; }; + secretFile = "/etc/nextcloud-secrets.json"; settings = { @@ -68,7 +56,7 @@ in { package = pkgs.postgresql_14; }; systemd.services.postgresql.postStart = pkgs.lib.mkAfter '' - password=$(cat ${passFile}) + password=$(cat ${config.services.nextcloud.config.dbpassFile}) ${config.services.postgresql.package}/bin/psql < nextflow.config + cat nextflow.config + nextflow run -ansi-log false ${hello} + done + ''; + }; + in + { + name = "nextflow"; + + nodes.machine = + { ... }: + { + environment.systemPackages = [ + run-nextflow-pipeline + pkgs.nextflow + ]; + virtualisation = { + docker.enable = true; + }; + }; + + testScript = + { nodes, ... }: + '' + start_all() + machine.wait_for_unit("docker.service") + machine.succeed("docker load < ${bash}") + machine.succeed("run-nextflow-pipeline >&2") + ''; + } +) diff --git a/nixos/tests/nginx-mime.nix b/nixos/tests/nginx-mime.nix new file mode 100644 index 0000000000000..157b9f13f1423 --- /dev/null +++ b/nixos/tests/nginx-mime.nix @@ -0,0 +1,26 @@ +import ./make-test-python.nix ( + { lib, pkgs, ... }: + { + name = "nginx-mime"; + meta.maintainers = with pkgs.lib.maintainers; [ izorkin ]; + + nodes = { + server = + { pkgs, ... }: + { + services.nginx = { + enable = true; + virtualHosts."localhost" = { }; + }; + }; + }; + + testScript = '' + server.start() + server.wait_for_unit("nginx") + # Check optimal size of types_hash + server.fail("journalctl --unit nginx --grep 'could not build optimal types_hash'") + server.shutdown() + ''; + } +) diff --git a/nixos/tests/nix-serve.nix b/nixos/tests/nix-serve.nix index 3aa913f81107a..c41bc505e9635 100644 --- a/nixos/tests/nix-serve.nix +++ b/nixos/tests/nix-serve.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +{ config, ... }: { name = "nix-serve"; nodes.machine = { pkgs, ... }: { @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: }; testScript = let pkgHash = builtins.head ( - builtins.match "${builtins.storeDir}/([^-]+).+" (toString pkgs.hello) + builtins.match "${builtins.storeDir}/([^-]+).+" (toString config.node.pkgs.hello) ); in '' start_all() @@ -19,4 +19,4 @@ import ./make-test-python.nix ({ pkgs, ... }: "curl --fail -g http://0.0.0.0:5000/nar/${pkgHash}.nar -o /tmp/hello.nar" ) ''; -}) +} diff --git a/nixos/tests/nixos-rebuild-specialisations.nix b/nixos/tests/nixos-rebuild-specialisations.nix index 9192b8a8a030b..ab67bbaba6762 100644 --- a/nixos/tests/nixos-rebuild-specialisations.nix +++ b/nixos/tests/nixos-rebuild-specialisations.nix @@ -21,6 +21,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { pkgs.grub2 ]; + system.switch.enable = true; + virtualisation = { cores = 2; memorySize = 4096; diff --git a/nixos/tests/obs-studio.nix b/nixos/tests/obs-studio.nix new file mode 100644 index 0000000000000..a1b5bacf04283 --- /dev/null +++ b/nixos/tests/obs-studio.nix @@ -0,0 +1,40 @@ +import ./make-test-python.nix ( + { ... }: + + { + name = "obs-studio"; + + nodes.machine = + { pkgs, ... }: + { + imports = [ + ./common/x11.nix + ./common/user-account.nix + ]; + + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-vkcapture + ]; + enableVirtualCamera = true; + }; + }; + + testScript = '' + machine.wait_for_x() + machine.succeed("obs --version") + + # virtual camera tests + machine.succeed("lsmod | grep v4l2loopback") + machine.succeed("ls /dev/video1") + machine.succeed("obs --startvirtualcam >&2 &") + machine.wait_for_window("OBS") + machine.sleep(5) + + # test plugins + machine.succeed("which obs-vkcapture") + ''; + } +) diff --git a/nixos/tests/open-webui.nix b/nixos/tests/open-webui.nix index f10ef1ad98fb0..27f913dbffd53 100644 --- a/nixos/tests/open-webui.nix +++ b/nixos/tests/open-webui.nix @@ -1,6 +1,7 @@ -{ lib, ... }: +{ config, lib, ... }: let mainPort = "8080"; + webuiName = "NixOS Test"; in { name = "open-webui"; @@ -18,16 +19,45 @@ in # Requires network connection RAG_EMBEDDING_MODEL = ""; }; + + # Test that environment variables can be + # overridden through a file. + environmentFile = config.node.pkgs.writeText "test.env" '' + WEBUI_NAME="${webuiName}" + ''; }; }; }; testScript = '' + import json + import xml.etree.ElementTree as xml + machine.start() machine.wait_for_unit("open-webui.service") machine.wait_for_open_port(${mainPort}) machine.succeed("curl http://127.0.0.1:${mainPort}") + + # Load the Web UI config JSON and parse it. + webui_config_json = machine.succeed("curl http://127.0.0.1:${mainPort}/api/config") + webui_config = json.loads(webui_config_json) + + # Check that the name was overridden via the environmentFile option. + assert webui_config["name"] == "${webuiName} (Open WebUI)" + + webui_opensearch_xml = machine.succeed("curl http://127.0.0.1:${mainPort}/opensearch.xml") + webui_opensearch = xml.fromstring(webui_opensearch_xml) + + webui_opensearch_url = webui_opensearch.find( + ".//{http://a9.com/-/spec/opensearch/1.1/}Url" + ) + assert ( + webui_opensearch_url is not None + ), f"no url tag found in {webui_opensearch_xml}" + assert ( + webui_opensearch_url.get("template") == "http://localhost:8080/?q={searchTerms}" + ), "opensearch url doesn't match the configured port" ''; } diff --git a/nixos/tests/opentelemetry-collector.nix b/nixos/tests/opentelemetry-collector.nix index 9a56a22ca47eb..98e597cf807b5 100644 --- a/nixos/tests/opentelemetry-collector.nix +++ b/nixos/tests/opentelemetry-collector.nix @@ -12,7 +12,9 @@ in { enable = true; settings = { exporters.logging.verbosity = "detailed"; - receivers.otlp.protocols.http = {}; + receivers.otlp.protocols = { + http.endpoint = "0.0.0.0:${toString port}"; + }; service = { pipelines.logs = { receivers = [ "otlp" ]; diff --git a/nixos/tests/openvswitch.nix b/nixos/tests/openvswitch.nix new file mode 100644 index 0000000000000..679641717a1ff --- /dev/null +++ b/nixos/tests/openvswitch.nix @@ -0,0 +1,62 @@ +{ + name = "openvswitch"; + + nodes = { + node1 = { + virtualisation.vlans = [ 1 ]; + + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + + vswitches.vs0 = { + interfaces = { + eth1 = { }; + }; + }; + + }; + + systemd.network.networks."40-vs0" = { + name = "vs0"; + networkConfig.Address = "10.0.0.1/24"; + }; + + }; + + node2 = { + virtualisation.vlans = [ 1 ]; + + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + + vswitches.vs0 = { + interfaces = { + eth1 = { }; + }; + }; + + }; + + systemd.network.networks."40-vs0" = { + name = "vs0"; + networkConfig.Address = "10.0.0.2/24"; + }; + }; + }; + + testScript = # python + '' + start_all() + node1.wait_for_unit("ovsdb.service") + node1.wait_for_unit("ovs-vswitchd.service") + node2.wait_for_unit("ovsdb.service") + node2.wait_for_unit("ovs-vswitchd.service") + + node1.succeed("ping -c3 10.0.0.2") + node2.succeed("ping -c3 10.0.0.1") + ''; +} diff --git a/nixos/tests/outline.nix b/nixos/tests/outline.nix index e45be37f5d3b0..c7a34c5d6f85e 100644 --- a/nixos/tests/outline.nix +++ b/nixos/tests/outline.nix @@ -13,7 +13,7 @@ in { name = "outline"; - meta.maintainers = with lib.maintainers; [ xanderio ]; + meta.maintainers = lib.teams.cyberus.members; nodes = { outline = { pkgs, config, ... }: { diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index 1bff37981da3f..b4e10581219cd 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -19,7 +19,6 @@ import ./make-test-python.nix ({ pkgs, ...} : enable = true; user = "alice"; }; - hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then }; testScript = { nodes, ... }: let diff --git a/nixos/tests/playwright-python.nix b/nixos/tests/playwright-python.nix new file mode 100644 index 0000000000000..0a5deecbb508b --- /dev/null +++ b/nixos/tests/playwright-python.nix @@ -0,0 +1,58 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + { + name = "playwright-python"; + + meta = with pkgs.lib.maintainers; { + maintainers = [ phaer ]; + }; + + nodes.machine = + { pkgs, ... }: + { + environment.variables = { + NIX_MANUAL_DOCROOT = "file://${pkgs.nix.doc}/share/doc/nix/manual/index.html"; + PLAYWRIGHT_BROWSERS_PATH = pkgs.playwright-driver.browsers; + }; + environment.systemPackages = [ + (pkgs.writers.writePython3Bin "test_playwright" + { + libraries = [ pkgs.python3Packages.playwright ]; + } + '' + import sys + from playwright.sync_api import sync_playwright + from playwright.sync_api import expect + + browsers = { + "chromium": ["--headless", "--disable-gpu"], + "firefox": [], + "webkit": [] + } + 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) + browser_name = sys.argv[1] + url = sys.argv[2] + browser_args = browsers.get(browser_name) + print(f"Running test on {browser_name} {' '.join(browser_args)}") + with sync_playwright() as p: + browser = getattr(p, browser_name).launch(args=browser_args) + context = browser.new_context() + page = context.new_page() + page.goto(url) + expect(page.get_by_text("Nix Reference Manual")).to_be_visible() + '' + ) + ]; + }; + + testScript = '' + # FIXME: Webkit segfaults + for browser in ["firefox", "chromium"]: + with subtest(f"Render Nix Manual in {browser}"): + machine.succeed(f"test_playwright {browser} $NIX_MANUAL_DOCROOT") + ''; + + } +) diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index 08a01585f8778..9e1bc1ccefbf3 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -32,18 +32,18 @@ import ./make-test-python.nix ({ pkgs, ... }: # system one. Overriding this pretty bad default behaviour. export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - echo "jamy-password" | toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" + toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" -p 'jamy-password' echo "Login OK" # Send a toot then verify it's part of the public timeline - echo "y" | toot post "hello world Jamy here" + toot post "hello world Jamy here" echo "Send toot OK" - echo "y" | toot timeline | grep -c "hello world Jamy here" + toot timeline -1 | grep -F -q "hello world Jamy here" echo "Get toot from timeline OK" # Test file upload - echo "y" | toot upload ${db-seed} | grep -c "https://pleroma.nixos.test/media" - echo "File upload OK" + echo "y" | ${pkgs.toot}/bin/toot upload <(dd if=/dev/zero bs=1024 count=1024 status=none) \ + | grep -F -q "https://pleroma.nixos.test/media" echo "=====================================================" echo "= SUCCESS =" @@ -182,7 +182,7 @@ import ./make-test-python.nix ({ pkgs, ... }: client = { nodes, pkgs, config, ... }: { security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; networking.extraHosts = hosts nodes; - environment.systemPackages = with pkgs; [ + environment.systemPackages = [ pkgs.toot send-toot ]; @@ -191,7 +191,7 @@ import ./make-test-python.nix ({ pkgs, ... }: security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; networking.extraHosts = hosts nodes; networking.firewall.enable = false; - environment.systemPackages = with pkgs; [ + environment.systemPackages = [ provision-db provision-secrets provision-user @@ -244,11 +244,15 @@ import ./make-test-python.nix ({ pkgs, ... }: testScript = { nodes, ... }: '' pleroma.wait_for_unit("postgresql.service") + pleroma.wait_until_succeeds("ls /var/lib/pleroma") pleroma.succeed("provision-db") + pleroma.wait_for_file("/var/lib/pleroma") pleroma.succeed("provision-secrets") pleroma.systemctl("restart pleroma.service") pleroma.wait_for_unit("pleroma.service") pleroma.succeed("provision-user") client.succeed("send-toot") ''; + + meta.timeout = 600; }) diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix index 5c52abf9c720d..2bb2b705eb7e9 100644 --- a/nixos/tests/plotinus.nix +++ b/nixos/tests/plotinus.nix @@ -2,6 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "plotinus"; meta = { maintainers = pkgs.plotinus.meta.maintainers; + timeout = 600; }; nodes.machine = @@ -9,20 +10,23 @@ import ./make-test-python.nix ({ pkgs, ... }: { { imports = [ ./common/x11.nix ]; programs.plotinus.enable = true; - environment.systemPackages = [ pkgs.gnome-calculator pkgs.xdotool ]; + environment.systemPackages = [ + pkgs.gnome-pomodoro + pkgs.xdotool + ]; }; testScript = '' machine.wait_for_x() - machine.succeed("gnome-calculator >&2 &") - machine.wait_for_window("gnome-calculator") + machine.succeed("gnome-pomodoro >&2 &") + machine.wait_for_window("Pomodoro", timeout=120) machine.succeed( - "xdotool search --sync --onlyvisible --class gnome-calculator " + "xdotool search --sync --onlyvisible --class gnome-pomodoro " + "windowfocus --sync key --clearmodifiers --delay 1 'ctrl+shift+p'" ) machine.sleep(5) # wait for the popup + machine.screenshot("popup") machine.succeed("xdotool key --delay 100 p r e f e r e n c e s Return") - machine.wait_for_window("Preferences") - machine.screenshot("screen") + machine.wait_for_window("Preferences", timeout=120) ''; }) diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index dacf4e576c071..5b63e2ba73eb1 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -26,5 +26,13 @@ import ./make-test-python.nix ({ pkgs, ...} : { master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'") master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_raster;'") master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'") + master.succeed("sudo -u postgres psql -c 'select postgis_version();'") + master.succeed("[ \"$(sudo -u postgres psql --no-psqlrc --tuples-only -c 'select postgis_version();')\" = \" ${ + pkgs.lib.versions.major pkgs.postgis.version + }.${ + pkgs.lib.versions.minor pkgs.postgis.version + } USE_GEOS=1 USE_PROJ=1 USE_STATS=1\" ]") + # st_makepoint goes through c code + master.succeed("sudo -u postgres psql --no-psqlrc --tuples-only -c 'select st_makepoint(1, 1)'") ''; }) diff --git a/nixos/tests/postgresql-wal2json.nix b/nixos/tests/postgresql-wal2json.nix new file mode 100644 index 0000000000000..043ad48cbc6ec --- /dev/null +++ b/nixos/tests/postgresql-wal2json.nix @@ -0,0 +1,60 @@ +{ + system ? builtins.currentSystem, + config ? { }, + pkgs ? import ../.. { inherit system config; }, + postgresql ? null, +}: + +let + makeTest = import ./make-test-python.nix; + # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`. + makeTestAttribute = name: { + inherit name; + value = makePostgresqlWal2jsonTest pkgs."${name}"; + }; + + makePostgresqlWal2jsonTest = + postgresqlPackage: + makeTest { + name = "postgresql-wal2json-${postgresqlPackage.name}"; + meta.maintainers = with pkgs.lib.maintainers; [ euank ]; + + nodes.machine = { + services.postgresql = { + package = postgresqlPackage; + enable = true; + extraPlugins = with postgresqlPackage.pkgs; [ wal2json ]; + settings = { + wal_level = "logical"; + max_replication_slots = "10"; + max_wal_senders = "10"; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("postgresql") + machine.succeed( + "sudo -u postgres psql -qAt -f ${./postgresql/wal2json/example2.sql} postgres > /tmp/example2.out" + ) + machine.succeed( + "diff ${./postgresql/wal2json/example2.out} /tmp/example2.out" + ) + machine.succeed( + "sudo -u postgres psql -qAt -f ${./postgresql/wal2json/example3.sql} postgres > /tmp/example3.out" + ) + machine.succeed( + "diff ${./postgresql/wal2json/example3.out} /tmp/example3.out" + ) + ''; + }; + +in +# By default, create one test per postgresql version +if postgresql == null then + builtins.listToAttrs ( + map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs)) + ) +# but if postgresql is set, we're being made as a passthru test for a specific postgres + wal2json version, just run one +else + makePostgresqlWal2jsonTest postgresql diff --git a/nixos/tests/postgresql/wal2json/LICENSE b/nixos/tests/postgresql/wal2json/LICENSE new file mode 100644 index 0000000000000..e3e82163fc091 --- /dev/null +++ b/nixos/tests/postgresql/wal2json/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2013-2024, Euler Taveira de Oliveira +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + +* Neither the name of the Euler Taveira de Oliveira nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/nixos/tests/postgresql/wal2json/README.md b/nixos/tests/postgresql/wal2json/README.md new file mode 100644 index 0000000000000..796bf810d757b --- /dev/null +++ b/nixos/tests/postgresql/wal2json/README.md @@ -0,0 +1,11 @@ +Data in this folder taken from the wal2json README's examples [here](https://github.com/eulerto/wal2json/tree/75629c2e1e81a12350cc9d63782fc53252185d8d#sql-functions) + +They are used under the terms of the BSD-3 License, a copy of which is included +in this directory. + +These files have been lightly modified in order to make their output more reproducible. + +Changes: +- `\o /dev/null` has been added before commands that print LSNs since LSNs aren't reproducible +- `now()` has been replaced with a hardcoded timestamp string for reproducibility +- The test is run with `--quiet`, and the expected output has been trimmed accordingly diff --git a/nixos/tests/postgresql/wal2json/example2.out b/nixos/tests/postgresql/wal2json/example2.out new file mode 100644 index 0000000000000..0a089e1122706 --- /dev/null +++ b/nixos/tests/postgresql/wal2json/example2.out @@ -0,0 +1,74 @@ +init +{ + "change": [ + { + "kind": "message", + "transactional": false, + "prefix": "wal2json", + "content": "this non-transactional message will be delivered even if you rollback the transaction" + } + ] +} +{ + "change": [ + { + "kind": "insert", + "schema": "public", + "table": "table2_with_pk", + "columnnames": ["a", "b", "c"], + "columntypes": ["integer", "character varying(30)", "timestamp without time zone"], + "columnvalues": [1, "Backup and Restore", "2018-03-27 12:05:29.914496"] + } + ,{ + "kind": "insert", + "schema": "public", + "table": "table2_with_pk", + "columnnames": ["a", "b", "c"], + "columntypes": ["integer", "character varying(30)", "timestamp without time zone"], + "columnvalues": [2, "Tuning", "2018-03-27 12:05:29.914496"] + } + ,{ + "kind": "insert", + "schema": "public", + "table": "table2_with_pk", + "columnnames": ["a", "b", "c"], + "columntypes": ["integer", "character varying(30)", "timestamp without time zone"], + "columnvalues": [3, "Replication", "2018-03-27 12:05:29.914496"] + } + ,{ + "kind": "message", + "transactional": true, + "prefix": "wal2json", + "content": "this message will be delivered" + } + ,{ + "kind": "delete", + "schema": "public", + "table": "table2_with_pk", + "oldkeys": { + "keynames": ["a", "c"], + "keytypes": ["integer", "timestamp without time zone"], + "keyvalues": [1, "2018-03-27 12:05:29.914496"] + } + } + ,{ + "kind": "delete", + "schema": "public", + "table": "table2_with_pk", + "oldkeys": { + "keynames": ["a", "c"], + "keytypes": ["integer", "timestamp without time zone"], + "keyvalues": [2, "2018-03-27 12:05:29.914496"] + } + } + ,{ + "kind": "insert", + "schema": "public", + "table": "table2_without_pk", + "columnnames": ["a", "b", "c"], + "columntypes": ["integer", "numeric(5,2)", "text"], + "columnvalues": [1, 2.34, "Tapir"] + } + ] +} +stop diff --git a/nixos/tests/postgresql/wal2json/example2.sql b/nixos/tests/postgresql/wal2json/example2.sql new file mode 100644 index 0000000000000..ec474381bb4d9 --- /dev/null +++ b/nixos/tests/postgresql/wal2json/example2.sql @@ -0,0 +1,31 @@ +CREATE TABLE table2_with_pk (a SERIAL, b VARCHAR(30), c TIMESTAMP NOT NULL, PRIMARY KEY(a, c)); +CREATE TABLE table2_without_pk (a SERIAL, b NUMERIC(5,2), c TEXT); + +SELECT 'init' FROM pg_create_logical_replication_slot('test_slot', 'wal2json'); + +BEGIN; +INSERT INTO table2_with_pk (b, c) VALUES('Backup and Restore', '2018-03-27 12:05:29.914496'); +INSERT INTO table2_with_pk (b, c) VALUES('Tuning', '2018-03-27 12:05:29.914496'); +INSERT INTO table2_with_pk (b, c) VALUES('Replication', '2018-03-27 12:05:29.914496'); + +-- Avoid printing wal LSNs since they're not reproducible, so harder to assert on +\o /dev/null +SELECT pg_logical_emit_message(true, 'wal2json', 'this message will be delivered'); +SELECT pg_logical_emit_message(true, 'pgoutput', 'this message will be filtered'); +\o + +DELETE FROM table2_with_pk WHERE a < 3; +\o /dev/null +SELECT pg_logical_emit_message(false, 'wal2json', 'this non-transactional message will be delivered even if you rollback the transaction'); +\o + +INSERT INTO table2_without_pk (b, c) VALUES(2.34, 'Tapir'); +-- it is not added to stream because there isn't a pk or a replica identity +UPDATE table2_without_pk SET c = 'Anta' WHERE c = 'Tapir'; +COMMIT; + +SELECT data FROM pg_logical_slot_get_changes('test_slot', NULL, NULL, 'pretty-print', '1', 'add-msg-prefixes', 'wal2json'); +SELECT 'stop' FROM pg_drop_replication_slot('test_slot'); + +DROP TABLE table2_with_pk; +DROP TABLE table2_without_pk; diff --git a/nixos/tests/postgresql/wal2json/example3.out b/nixos/tests/postgresql/wal2json/example3.out new file mode 100644 index 0000000000000..e20d2a8aefd7d --- /dev/null +++ b/nixos/tests/postgresql/wal2json/example3.out @@ -0,0 +1,12 @@ +init +{"action":"M","transactional":false,"prefix":"wal2json","content":"this non-transactional message will be delivered even if you rollback the transaction"} +{"action":"B"} +{"action":"I","schema":"public","table":"table3_with_pk","columns":[{"name":"a","type":"integer","value":1},{"name":"b","type":"character varying(30)","value":"Backup and Restore"},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]} +{"action":"I","schema":"public","table":"table3_with_pk","columns":[{"name":"a","type":"integer","value":2},{"name":"b","type":"character varying(30)","value":"Tuning"},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]} +{"action":"I","schema":"public","table":"table3_with_pk","columns":[{"name":"a","type":"integer","value":3},{"name":"b","type":"character varying(30)","value":"Replication"},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]} +{"action":"M","transactional":true,"prefix":"wal2json","content":"this message will be delivered"} +{"action":"D","schema":"public","table":"table3_with_pk","identity":[{"name":"a","type":"integer","value":1},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]} +{"action":"D","schema":"public","table":"table3_with_pk","identity":[{"name":"a","type":"integer","value":2},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]} +{"action":"I","schema":"public","table":"table3_without_pk","columns":[{"name":"a","type":"integer","value":1},{"name":"b","type":"numeric(5,2)","value":2.34},{"name":"c","type":"text","value":"Tapir"}]} +{"action":"C"} +stop diff --git a/nixos/tests/postgresql/wal2json/example3.sql b/nixos/tests/postgresql/wal2json/example3.sql new file mode 100644 index 0000000000000..6d94e261f51ae --- /dev/null +++ b/nixos/tests/postgresql/wal2json/example3.sql @@ -0,0 +1,26 @@ +CREATE TABLE table3_with_pk (a SERIAL, b VARCHAR(30), c TIMESTAMP NOT NULL, PRIMARY KEY(a, c)); +CREATE TABLE table3_without_pk (a SERIAL, b NUMERIC(5,2), c TEXT); + +SELECT 'init' FROM pg_create_logical_replication_slot('test_slot', 'wal2json'); + +BEGIN; +INSERT INTO table3_with_pk (b, c) VALUES('Backup and Restore', '2019-12-29 04:58:34.806671'); +INSERT INTO table3_with_pk (b, c) VALUES('Tuning', '2019-12-29 04:58:34.806671'); +INSERT INTO table3_with_pk (b, c) VALUES('Replication', '2019-12-29 04:58:34.806671'); +\o /dev/null +SELECT pg_logical_emit_message(true, 'wal2json', 'this message will be delivered'); +SELECT pg_logical_emit_message(true, 'pgoutput', 'this message will be filtered'); +DELETE FROM table3_with_pk WHERE a < 3; +SELECT pg_logical_emit_message(false, 'wal2json', 'this non-transactional message will be delivered even if you rollback the transaction'); +\o + +INSERT INTO table3_without_pk (b, c) VALUES(2.34, 'Tapir'); +-- it is not added to stream because there isn't a pk or a replica identity +UPDATE table3_without_pk SET c = 'Anta' WHERE c = 'Tapir'; +COMMIT; + +SELECT data FROM pg_logical_slot_get_changes('test_slot', NULL, NULL, 'format-version', '2', 'add-msg-prefixes', 'wal2json'); +SELECT 'stop' FROM pg_drop_replication_slot('test_slot'); + +DROP TABLE table3_with_pk; +DROP TABLE table3_without_pk; diff --git a/nixos/tests/privatebin.nix b/nixos/tests/privatebin.nix new file mode 100644 index 0000000000000..c920b6220084f --- /dev/null +++ b/nixos/tests/privatebin.nix @@ -0,0 +1,21 @@ +{ lib, ... }: + +{ + name = "privatebin"; + meta.maintainers = [ lib.maintainers.savyajha ]; + + nodes.dataImporter = + { ... }: + { + services.privatebin = { + enable = true; + enableNginx = true; + }; + }; + + testScript = '' + dataImporter.wait_for_unit("phpfpm-privatebin.service") + dataImporter.wait_for_unit("nginx.service") + dataImporter.succeed("curl -fvvv -Ls http://localhost/ | grep 'PrivateBin'") + ''; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 6a4abab7cc126..71eef72df6f3a 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -482,7 +482,6 @@ let json = { exporterConfig = { enable = true; - url = "http://localhost"; configFile = pkgs.writeText "json-exporter-conf.json" (builtins.toJSON { modules = { default = { @@ -530,9 +529,6 @@ let global-module: mod-stats dnssec-signing: off zonefile-sync: -1 - journal-db: /var/lib/knot/journal - kasp-db: /var/lib/knot/kasp - timer-db: /var/lib/knot/timer zonefile-load: difference storage: ${pkgs.buildEnv { name = "foo"; @@ -932,70 +928,12 @@ let ''; }; - openldap = { - exporterConfig = { - enable = true; - ldapCredentialFile = "${pkgs.writeText "exporter.yml" '' - ldapUser: "cn=root,dc=example" - ldapPass: "notapassword" - ''}"; - }; - metricProvider = { - services.openldap = { - enable = true; - settings.children = { - "cn=schema".includes = [ - "${pkgs.openldap}/etc/schema/core.ldif" - "${pkgs.openldap}/etc/schema/cosine.ldif" - "${pkgs.openldap}/etc/schema/inetorgperson.ldif" - "${pkgs.openldap}/etc/schema/nis.ldif" - ]; - "olcDatabase={1}mdb" = { - attrs = { - objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ]; - olcDatabase = "{1}mdb"; - olcDbDirectory = "/var/lib/openldap/db"; - olcSuffix = "dc=example"; - olcRootDN = { - # cn=root,dc=example - base64 = "Y249cm9vdCxkYz1leGFtcGxl"; - }; - olcRootPW = { - path = "${pkgs.writeText "rootpw" "notapassword"}"; - }; - }; - }; - "olcDatabase={2}monitor".attrs = { - objectClass = [ "olcDatabaseConfig" ]; - olcDatabase = "{2}monitor"; - olcAccess = [ "to dn.subtree=cn=monitor by users read" ]; - }; - }; - declarativeContents."dc=example" = '' - dn: dc=example - objectClass: domain - dc: example - - dn: ou=users,dc=example - objectClass: organizationalUnit - ou: users - ''; - }; - }; - exporterTest = '' - wait_for_unit("prometheus-openldap-exporter.service") - wait_for_open_port(389) - wait_for_open_port(9330) - wait_until_succeeds( - "curl -sSf http://localhost:9330/metrics | grep 'openldap_scrape{result=\"ok\"} 1'" - ) - ''; - }; - pgbouncer = { exporterConfig = { enable = true; - connectionStringFile = pkgs.writeText "connection.conf" "postgres://admin:@localhost:6432/pgbouncer?sslmode=disable"; + connectionEnvFile = "${pkgs.writeText "connstr-env" '' + PGBOUNCER_EXPORTER_CONNECTION_STRING=postgres://admin@localhost:6432/pgbouncer?sslmode=disable + ''}"; }; metricProvider = { diff --git a/nixos/tests/pulseaudio.nix b/nixos/tests/pulseaudio.nix index dc8e33ccd559c..ccc33f28bc6d5 100644 --- a/nixos/tests/pulseaudio.nix +++ b/nixos/tests/pulseaudio.nix @@ -40,7 +40,7 @@ let }; environment.systemPackages = [ testers.testPlay pkgs.pavucontrol ] - ++ lib.optional pkgs.stdenv.isx86_64 testers.testPlay32; + ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 testers.testPlay32; } // lib.optionalAttrs systemWide { users.users.alice.extraGroups = [ "pulse-access" ]; systemd.services.pulseaudio.wantedBy = [ "multi-user.target" ]; @@ -54,7 +54,7 @@ let machine.send_chars("testPlay \n") machine.wait_for_file("/tmp/testPlay_success") - ${lib.optionalString pkgs.stdenv.isx86_64 '' + ${lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 '' machine.send_chars("testPlay32 \n") machine.wait_for_file("/tmp/testPlay32_success") ''} diff --git a/nixos/tests/replace-dependencies/default.nix b/nixos/tests/replace-dependencies/default.nix new file mode 100644 index 0000000000000..ce0013a868c7a --- /dev/null +++ b/nixos/tests/replace-dependencies/default.nix @@ -0,0 +1,19 @@ +import ../make-test-python.nix ( + { pkgs, ... }: + { + name = "replace-dependencies"; + meta.maintainers = with pkgs.lib.maintainers; [ alois31 ]; + + nodes.machine = + { ... }: + { + nix.settings.experimental-features = [ "ca-derivations" ]; + system.extraDependencies = [ pkgs.stdenvNoCC ]; + }; + + testScript = '' + start_all() + machine.succeed("nix-build --option substitute false ${pkgs.path}/nixos/tests/replace-dependencies/guest.nix") + ''; + } +) diff --git a/nixos/tests/replace-dependencies/guest.nix b/nixos/tests/replace-dependencies/guest.nix new file mode 100644 index 0000000000000..f022f17285995 --- /dev/null +++ b/nixos/tests/replace-dependencies/guest.nix @@ -0,0 +1,149 @@ +# This needs to be run in a NixOS test, because Hydra cannot do IFD. +let + pkgs = import ../../.. { }; + inherit (pkgs) + runCommand + writeShellScriptBin + replaceDependency + replaceDependencies + ; + inherit (pkgs.lib) escapeShellArg; + mkCheckOutput = + name: test: output: + runCommand name { } '' + actualOutput="$(${escapeShellArg "${test}/bin/test"})" + if [ "$(${escapeShellArg "${test}/bin/test"})" != ${escapeShellArg output} ]; then + echo >&2 "mismatched output: expected \""${escapeShellArg output}"\", got \"$actualOutput\"" + exit 1 + fi + touch "$out" + ''; + oldDependency = writeShellScriptBin "dependency" '' + echo "got old dependency" + ''; + oldDependency-ca = oldDependency.overrideAttrs { __contentAddressed = true; }; + newDependency = writeShellScriptBin "dependency" '' + echo "got new dependency" + ''; + newDependency-ca = newDependency.overrideAttrs { __contentAddressed = true; }; + basic = writeShellScriptBin "test" '' + ${oldDependency}/bin/dependency + ''; + basic-ca = writeShellScriptBin "test" '' + ${oldDependency-ca}/bin/dependency + ''; + transitive = writeShellScriptBin "test" '' + ${basic}/bin/test + ''; + weirdDependency = writeShellScriptBin "dependency" '' + echo "got weird dependency" + ${basic}/bin/test + ''; + oldDependency1 = writeShellScriptBin "dependency1" '' + echo "got old dependency 1" + ''; + newDependency1 = writeShellScriptBin "dependency1" '' + echo "got new dependency 1" + ''; + oldDependency2 = writeShellScriptBin "dependency2" '' + ${oldDependency1}/bin/dependency1 + echo "got old dependency 2" + ''; + newDependency2 = writeShellScriptBin "dependency2" '' + ${oldDependency1}/bin/dependency1 + echo "got new dependency 2" + ''; + deep = writeShellScriptBin "test" '' + ${oldDependency2}/bin/dependency2 + ''; +in +{ + replacedependency-basic = mkCheckOutput "replacedependency-basic" (replaceDependency { + drv = basic; + inherit oldDependency newDependency; + }) "got new dependency"; + + replacedependency-basic-old-ca = mkCheckOutput "replacedependency-basic" (replaceDependency { + drv = basic-ca; + oldDependency = oldDependency-ca; + inherit newDependency; + }) "got new dependency"; + + replacedependency-basic-new-ca = mkCheckOutput "replacedependency-basic" (replaceDependency { + drv = basic; + inherit oldDependency; + newDependency = newDependency-ca; + }) "got new dependency"; + + replacedependency-transitive = mkCheckOutput "replacedependency-transitive" (replaceDependency { + drv = transitive; + inherit oldDependency newDependency; + }) "got new dependency"; + + replacedependency-weird = + mkCheckOutput "replacedependency-weird" + (replaceDependency { + drv = basic; + inherit oldDependency; + newDependency = weirdDependency; + }) + '' + got weird dependency + got old dependency''; + + replacedependencies-precedence = mkCheckOutput "replacedependencies-precedence" (replaceDependencies + { + drv = basic; + replacements = [ { inherit oldDependency newDependency; } ]; + cutoffPackages = [ oldDependency ]; + } + ) "got new dependency"; + + replacedependencies-self = mkCheckOutput "replacedependencies-self" (replaceDependencies { + drv = basic; + replacements = [ + { + inherit oldDependency; + newDependency = oldDependency; + } + ]; + }) "got old dependency"; + + replacedependencies-deep-order1 = + mkCheckOutput "replacedependencies-deep-order1" + (replaceDependencies { + drv = deep; + replacements = [ + { + oldDependency = oldDependency1; + newDependency = newDependency1; + } + { + oldDependency = oldDependency2; + newDependency = newDependency2; + } + ]; + }) + '' + got new dependency 1 + got new dependency 2''; + + replacedependencies-deep-order2 = + mkCheckOutput "replacedependencies-deep-order2" + (replaceDependencies { + drv = deep; + replacements = [ + { + oldDependency = oldDependency2; + newDependency = newDependency2; + } + { + oldDependency = oldDependency1; + newDependency = newDependency1; + } + ]; + }) + '' + got new dependency 1 + got new dependency 2''; +} diff --git a/nixos/tests/restart-by-activation-script.nix b/nixos/tests/restart-by-activation-script.nix index 0ac079e0101e0..fdab892b72183 100644 --- a/nixos/tests/restart-by-activation-script.nix +++ b/nixos/tests/restart-by-activation-script.nix @@ -7,6 +7,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { nodes.machine = { pkgs, ... }: { imports = [ ../modules/profiles/minimal.nix ]; + system.switch.enable = true; + systemd.services.restart-me = { wantedBy = [ "multi-user.target" ]; serviceConfig = { diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix index 53cdbbe1c40f1..2501fea2d3768 100644 --- a/nixos/tests/samba.nix +++ b/nixos/tests/samba.nix @@ -1,46 +1,47 @@ -import ./make-test-python.nix ({ pkgs, ... }: - -{ +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "samba"; - meta.maintainers = [ ]; + meta.maintainers = [ lib.maintainers.anthonyroussel ]; - nodes = - { client = - { pkgs, ... }: - { virtualisation.fileSystems = - { "/public" = { - fsType = "cifs"; - device = "//server/public"; - options = [ "guest" ]; - }; - }; + nodes = { + client = + { ... }: + { + virtualisation.fileSystems = { + "/public" = { + fsType = "cifs"; + device = "//server/public"; + options = [ "guest" ]; + }; }; + }; - server = - { ... }: - { services.samba.enable = true; - services.samba.openFirewall = true; - services.samba.shares.public = - { path = "/public"; + server = + { ... }: + { + services.samba = { + enable = true; + openFirewall = true; + settings = { + "public" = { + "path" = "/public"; "read only" = true; - browseable = "yes"; + "browseable" = "yes"; "guest ok" = "yes"; - comment = "Public samba share."; + "comment" = "Public samba share."; }; + }; }; - }; - - # client# [ 4.542997] mount[777]: sh: systemd-ask-password: command not found + }; + }; - testScript = - '' - server.start() - server.wait_for_unit("samba.target") - server.succeed("mkdir -p /public; echo bar > /public/foo") + testScript = '' + server.start() + server.wait_for_unit("samba.target") + server.succeed("mkdir -p /public; echo bar > /public/foo") - client.start() - client.wait_for_unit("remote-fs.target") - client.succeed("[[ $(cat /public/foo) = bar ]]") - ''; + client.start() + client.wait_for_unit("remote-fs.target") + client.succeed("[[ $(cat /public/foo) = bar ]]") + ''; }) diff --git a/nixos/tests/scion/freestanding-deployment/bootstrap.sh b/nixos/tests/scion/freestanding-deployment/bootstrap.sh new file mode 100644 index 0000000000000..3e2f7da07443f --- /dev/null +++ b/nixos/tests/scion/freestanding-deployment/bootstrap.sh @@ -0,0 +1,73 @@ +set -euo pipefail + +mkdir /tmp/tutorial-scion-certs && cd /tmp/tutorial-scion-certs +mkdir AS{1..5} + +# Create voting and root keys and (self-signed) certificates for core ASes +pushd AS1 +scion-pki certificate create --not-after=3650d --profile=sensitive-voting <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 sensitive voting cert"}') sensitive-voting.pem sensitive-voting.key +scion-pki certificate create --not-after=3650d --profile=regular-voting <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 regular voting cert"}') regular-voting.pem regular-voting.key +scion-pki certificate create --not-after=3650d --profile=cp-root <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 cp root cert"}') cp-root.pem cp-root.key +popd + +pushd AS2 +scion-pki certificate create --not-after=3650d --profile=cp-root <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 cp root cert"}') cp-root.pem cp-root.key +popd + +pushd AS3 +scion-pki certificate create --not-after=3650d --profile=sensitive-voting <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 sensitive voting cert"}') sensitive-voting.pem sensitive-voting.key +scion-pki certificate create --not-after=3650d --profile=regular-voting <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 regular voting cert"}') regular-voting.pem regular-voting.key +popd + +# Create the TRC (Trust Root Configuration) +mkdir tmp +echo ' +isd = 42 +description = "Demo ISD 42" +serial_version = 1 +base_version = 1 +voting_quorum = 2 + +core_ases = ["ffaa:1:1", "ffaa:1:2", "ffaa:1:3"] +authoritative_ases = ["ffaa:1:1", "ffaa:1:2", "ffaa:1:3"] +cert_files = ["AS1/sensitive-voting.pem", "AS1/regular-voting.pem", "AS1/cp-root.pem", "AS2/cp-root.pem", "AS3/sensitive-voting.pem", "AS3/regular-voting.pem"] + +[validity] +not_before = '$(date +%s)' +validity = "365d"' \ +> trc-B1-S1-pld.tmpl + +scion-pki trc payload --out=tmp/ISD42-B1-S1.pld.der --template trc-B1-S1-pld.tmpl +rm trc-B1-S1-pld.tmpl + +# Sign and bundle the TRC +scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS1/sensitive-voting.{pem,key} --out tmp/ISD42-B1-S1.AS1-sensitive.trc +scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS1/regular-voting.{pem,key} --out tmp/ISD42-B1-S1.AS1-regular.trc +scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS3/sensitive-voting.{pem,key} --out tmp/ISD42-B1-S1.AS3-sensitive.trc +scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS3/regular-voting.{pem,key} --out tmp/ISD42-B1-S1.AS3-regular.trc + +scion-pki trc combine tmp/ISD42-B1-S1.AS{1,3}-{sensitive,regular}.trc --payload tmp/ISD42-B1-S1.pld.der --out ISD42-B1-S1.trc +rm tmp -r + +# Create CA key and certificate for issuing ASes +pushd AS1 +scion-pki certificate create --profile=cp-ca <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 CA cert"}') cp-ca.pem cp-ca.key --ca cp-root.pem --ca-key cp-root.key +popd +pushd AS2 +scion-pki certificate create --profile=cp-ca <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 CA cert"}') cp-ca.pem cp-ca.key --ca cp-root.pem --ca-key cp-root.key +popd + +# Create AS key and certificate chains +scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 AS cert"}') AS1/cp-as.pem AS1/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle +scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 AS cert"}') AS2/cp-as.pem AS2/cp-as.key --ca AS2/cp-ca.pem --ca-key AS2/cp-ca.key --bundle +scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 AS cert"}') AS3/cp-as.pem AS3/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle +scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:4", "common_name": "42-ffaa:1:4 AS cert"}') AS4/cp-as.pem AS4/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle +scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:5", "common_name": "42-ffaa:1:5 AS cert"}') AS5/cp-as.pem AS5/cp-as.key --ca AS2/cp-ca.pem --ca-key AS2/cp-ca.key --bundle + +for i in {1..5} +do + mkdir -p $out/AS$i + cp AS$i/cp-as.{key,pem} $out/AS$i +done + +mv *.trc $out diff --git a/nixos/tests/scion/freestanding-deployment/default.nix b/nixos/tests/scion/freestanding-deployment/default.nix index e060f9c312709..55b2322ab02da 100644 --- a/nixos/tests/scion/freestanding-deployment/default.nix +++ b/nixos/tests/scion/freestanding-deployment/default.nix @@ -5,81 +5,8 @@ let buildInputs = [ pkgs.scion ]; - } '' - set -euo pipefail + } (builtins.readFile ./bootstrap.sh); - mkdir /tmp/tutorial-scion-certs && cd /tmp/tutorial-scion-certs - mkdir AS{1..5} - - # Create voting and root keys and (self-signed) certificates for core ASes - pushd AS1 - scion-pki certificate create --not-after=3650d --profile=sensitive-voting <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 sensitive voting cert"}') sensitive-voting.pem sensitive-voting.key - scion-pki certificate create --not-after=3650d --profile=regular-voting <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 regular voting cert"}') regular-voting.pem regular-voting.key - scion-pki certificate create --not-after=3650d --profile=cp-root <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 cp root cert"}') cp-root.pem cp-root.key - popd - - pushd AS2 - scion-pki certificate create --not-after=3650d --profile=cp-root <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 cp root cert"}') cp-root.pem cp-root.key - popd - - pushd AS3 - scion-pki certificate create --not-after=3650d --profile=sensitive-voting <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 sensitive voting cert"}') sensitive-voting.pem sensitive-voting.key - scion-pki certificate create --not-after=3650d --profile=regular-voting <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 regular voting cert"}') regular-voting.pem regular-voting.key - popd - - # Create the TRC (Trust Root Configuration) - mkdir tmp - echo ' - isd = 42 - description = "Demo ISD 42" - serial_version = 1 - base_version = 1 - voting_quorum = 2 - - core_ases = ["ffaa:1:1", "ffaa:1:2", "ffaa:1:3"] - authoritative_ases = ["ffaa:1:1", "ffaa:1:2", "ffaa:1:3"] - cert_files = ["AS1/sensitive-voting.pem", "AS1/regular-voting.pem", "AS1/cp-root.pem", "AS2/cp-root.pem", "AS3/sensitive-voting.pem", "AS3/regular-voting.pem"] - - [validity] - not_before = '$(date +%s)' - validity = "365d"' \ - > trc-B1-S1-pld.tmpl - - scion-pki trc payload --out=tmp/ISD42-B1-S1.pld.der --template trc-B1-S1-pld.tmpl - rm trc-B1-S1-pld.tmpl - - # Sign and bundle the TRC - scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS1/sensitive-voting.{pem,key} --out tmp/ISD42-B1-S1.AS1-sensitive.trc - scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS1/regular-voting.{pem,key} --out tmp/ISD42-B1-S1.AS1-regular.trc - scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS3/sensitive-voting.{pem,key} --out tmp/ISD42-B1-S1.AS3-sensitive.trc - scion-pki trc sign tmp/ISD42-B1-S1.pld.der AS3/regular-voting.{pem,key} --out tmp/ISD42-B1-S1.AS3-regular.trc - - scion-pki trc combine tmp/ISD42-B1-S1.AS{1,3}-{sensitive,regular}.trc --payload tmp/ISD42-B1-S1.pld.der --out ISD42-B1-S1.trc - rm tmp -r - - # Create CA key and certificate for issuing ASes - pushd AS1 - scion-pki certificate create --profile=cp-ca <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 CA cert"}') cp-ca.pem cp-ca.key --ca cp-root.pem --ca-key cp-root.key - popd - pushd AS2 - scion-pki certificate create --profile=cp-ca <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 CA cert"}') cp-ca.pem cp-ca.key --ca cp-root.pem --ca-key cp-root.key - popd - - # Create AS key and certificate chains - scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:1", "common_name": "42-ffaa:1:1 AS cert"}') AS1/cp-as.pem AS1/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle - scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:2", "common_name": "42-ffaa:1:2 AS cert"}') AS2/cp-as.pem AS2/cp-as.key --ca AS2/cp-ca.pem --ca-key AS2/cp-ca.key --bundle - scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:3", "common_name": "42-ffaa:1:3 AS cert"}') AS3/cp-as.pem AS3/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle - scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:4", "common_name": "42-ffaa:1:4 AS cert"}') AS4/cp-as.pem AS4/cp-as.key --ca AS1/cp-ca.pem --ca-key AS1/cp-ca.key --bundle - scion-pki certificate create --profile=cp-as <(echo '{"isd_as": "42-ffaa:1:5", "common_name": "42-ffaa:1:5 AS cert"}') AS5/cp-as.pem AS5/cp-as.key --ca AS2/cp-ca.pem --ca-key AS2/cp-ca.key --bundle - - for i in {1..5} - do - mkdir -p $out/AS$i - cp AS$i/cp-as.{key,pem} $out/AS$i - done - - mv *.trc $out - ''; imports = hostId: [ ({ services.scion = { @@ -121,9 +48,47 @@ in }; scion04 = { ... }: { imports = (imports 4); + networking.interfaces."lo".ipv4.addresses = [{ address = "172.16.1.1"; prefixLength = 32; }]; + services.scion.scion-ip-gateway = { + enable = true; + config = { + tunnel = { + src_ipv4 = "172.16.1.1"; + }; + }; + trafficConfig = { + ASes = { + "42-ffaa:1:5" = { + Nets = [ + "172.16.100.0/24" + ]; + }; + }; + ConfigVersion = 9001; + }; + }; }; scion05 = { ... }: { imports = (imports 5); + networking.interfaces."lo".ipv4.addresses = [{ address = "172.16.100.1"; prefixLength = 32; }]; + services.scion.scion-ip-gateway = { + enable = true; + config = { + tunnel = { + src_ipv4 = "172.16.100.1"; + }; + }; + trafficConfig = { + ASes = { + "42-ffaa:1:4" = { + Nets = [ + "172.16.1.0/24" + ]; + }; + }; + ConfigVersion = 9001; + }; + }; }; }; testScript = let @@ -131,25 +96,35 @@ in addresses="42-ffaa:1:1 42-ffaa:1:2 42-ffaa:1:3 42-ffaa:1:4 42-ffaa:1:5" timeout=100 wait_for_all() { + ret=0 for as in "$@" do scion showpaths $as --no-probe > /dev/null - return 1 + ret=$? + if [ "$ret" -ne "0" ]; then + break + fi done - return 0 + return $ret } ping_all() { + ret=0 for as in "$@" do scion ping "$as,127.0.0.1" -c 3 + ret=$? + if [ "$ret" -ne "0" ]; then + break + fi done - return 0 + return $ret } for i in $(seq 0 $timeout); do - wait_for_all $addresses && exit 0 - ping_all $addresses && exit 0 sleep 1 + wait_for_all $addresses || continue + ping_all $addresses && exit 0 done + exit 1 ''; in '' @@ -183,9 +158,16 @@ in # Wait for scion-control.service on all instances wait_for_unit("scion-control.service") + # Ensure cert is valid against TRC + succeed("scion-pki certificate verify --trc /etc/scion/certs/*.trc /etc/scion/crypto/as/*.pem >&2") + # Execute pingAll command on all instances succeed("${pingAll} >&2") + # Execute ICMP pings across scion-ip-gateway + scion04.succeed("ping -c 3 172.16.100.1 >&2") + scion05.succeed("ping -c 3 172.16.1.1 >&2") + # Restart all scion services and ping again to test robustness succeed("systemctl restart scion-* >&2") succeed("${pingAll} >&2") diff --git a/nixos/tests/scion/freestanding-deployment/topology4.json b/nixos/tests/scion/freestanding-deployment/topology4.json index 03c507a4daf58..0526c1f1edd62 100644 --- a/nixos/tests/scion/freestanding-deployment/topology4.json +++ b/nixos/tests/scion/freestanding-deployment/topology4.json @@ -36,5 +36,11 @@ } } } + }, + "sigs": { + "sig-1": { + "ctrl_addr": "127.0.0.1:30256", + "data_addr": "127.0.0.1:30056" + } } } diff --git a/nixos/tests/scion/freestanding-deployment/topology5.json b/nixos/tests/scion/freestanding-deployment/topology5.json index 6114c1f73c2a7..1326bd3c29559 100644 --- a/nixos/tests/scion/freestanding-deployment/topology5.json +++ b/nixos/tests/scion/freestanding-deployment/topology5.json @@ -36,5 +36,11 @@ } } } + }, + "sigs": { + "sig-1": { + "ctrl_addr": "127.0.0.1:30256", + "data_addr": "127.0.0.1:30056" + } } } diff --git a/nixos/tests/scrutiny.nix b/nixos/tests/scrutiny.nix index 33160a6b30880..4ac1b47952e08 100644 --- a/nixos/tests/scrutiny.nix +++ b/nixos/tests/scrutiny.nix @@ -49,10 +49,6 @@ import ./make-test-python.nix ({ lib, ... }: testScript = '' start_all() - # Wait for InfluxDB to be available - machine.wait_for_unit("influxdb2") - machine.wait_for_open_port(8086) - # Wait for Scrutiny to be available machine.wait_for_unit("scrutiny") machine.wait_for_open_port(8080) diff --git a/nixos/tests/seafile.nix b/nixos/tests/seafile.nix index 78e735f4fed73..7784d5fddaedd 100644 --- a/nixos/tests/seafile.nix +++ b/nixos/tests/seafile.nix @@ -14,6 +14,7 @@ import ./make-test-python.nix ({ pkgs, ... }: services.seafile = { enable = true; ccnetSettings.General.SERVICE_URL = "http://server"; + seafileSettings.fileserver.host = "unix:/run/seafile/server.sock"; adminEmail = "admin@example.com"; initialAdminPassword = "seafile_password"; }; @@ -22,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: virtualHosts."server" = { locations."/".proxyPass = "http://unix:/run/seahub/gunicorn.sock"; locations."/seafhttp" = { - proxyPass = "http://127.0.0.1:8082"; + proxyPass = "http://unix:/run/seafile/server.sock"; extraConfig = '' rewrite ^/seafhttp(.*)$ $1 break; client_max_body_size 0; diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix index 582d594be3fdb..2693d9275fc10 100644 --- a/nixos/tests/sing-box.nix +++ b/nixos/tests/sing-box.nix @@ -1,48 +1,539 @@ -import ./make-test-python.nix ({ lib, pkgs, ... }: { +import ./make-test-python.nix ( + { lib, pkgs, ... }: + let + wg-keys = import ./wireguard/snakeoil-keys.nix; - name = "sing-box"; + target_host = "acme.test"; + server_host = "sing-box.test"; - meta = { - maintainers = with lib.maintainers; [ nickcao ]; - }; + hosts = { + "${target_host}" = "1.1.1.1"; + "${server_host}" = "1.1.1.2"; + }; + hostsEntries = lib.mapAttrs' (k: v: { + name = v; + value = lib.singleton k; + }) hosts; + + vmessPort = 1080; + vmessUUID = "bf000d23-0752-40b4-affe-68f7707a9661"; + vmessInbound = { + type = "vmess"; + tag = "inbound:vmess"; + listen = "0.0.0.0"; + listen_port = vmessPort; + users = [ + { + name = "sekai"; + uuid = vmessUUID; + alterId = 0; + } + ]; + }; + vmessOutbound = { + type = "vmess"; + tag = "outbound:vmess"; + server = server_host; + server_port = vmessPort; + uuid = vmessUUID; + security = "auto"; + alter_id = 0; + }; + + tunInbound = { + type = "tun"; + tag = "inbound:tun"; + interface_name = "tun0"; + inet4_address = "172.16.0.1/30"; + inet6_address = "fd00::1/126"; + auto_route = true; + inet4_route_address = [ + "${hosts."${target_host}"}/32" + ]; + inet4_route_exclude_address = [ + "${hosts."${server_host}"}/32" + ]; + strict_route = false; + sniff = true; + sniff_override_destination = false; + }; + + tproxyPort = 1081; + tproxyPost = pkgs.writeShellApplication { + name = "exe"; + runtimeInputs = with pkgs; [ + iproute2 + iptables + ]; + text = '' + ip route add local default dev lo table 100 + ip rule add fwmark 1 table 100 + + iptables -t mangle -N SING_BOX + iptables -t mangle -A SING_BOX -d 100.64.0.0/10 -j RETURN + iptables -t mangle -A SING_BOX -d 127.0.0.0/8 -j RETURN + iptables -t mangle -A SING_BOX -d 169.254.0.0/16 -j RETURN + iptables -t mangle -A SING_BOX -d 172.16.0.0/12 -j RETURN + iptables -t mangle -A SING_BOX -d 192.0.0.0/24 -j RETURN + iptables -t mangle -A SING_BOX -d 224.0.0.0/4 -j RETURN + iptables -t mangle -A SING_BOX -d 240.0.0.0/4 -j RETURN + iptables -t mangle -A SING_BOX -d 255.255.255.255/32 -j RETURN + + iptables -t mangle -A SING_BOX -d ${hosts."${server_host}"}/32 -p tcp -j RETURN + iptables -t mangle -A SING_BOX -d ${hosts."${server_host}"}/32 -p udp -j RETURN + + iptables -t mangle -A SING_BOX -d ${hosts."${target_host}"}/32 -p tcp -j TPROXY --on-port ${toString tproxyPort} --tproxy-mark 1 + iptables -t mangle -A SING_BOX -d ${hosts."${target_host}"}/32 -p udp -j TPROXY --on-port ${toString tproxyPort} --tproxy-mark 1 + iptables -t mangle -A PREROUTING -j SING_BOX + + iptables -t mangle -N SING_BOX_SELF + iptables -t mangle -A SING_BOX_SELF -d 100.64.0.0/10 -j RETURN + iptables -t mangle -A SING_BOX_SELF -d 127.0.0.0/8 -j RETURN + iptables -t mangle -A SING_BOX_SELF -d 169.254.0.0/16 -j RETURN + iptables -t mangle -A SING_BOX_SELF -d 172.16.0.0/12 -j RETURN + iptables -t mangle -A SING_BOX_SELF -d 192.0.0.0/24 -j RETURN + iptables -t mangle -A SING_BOX_SELF -d 224.0.0.0/4 -j RETURN + iptables -t mangle -A SING_BOX_SELF -d 240.0.0.0/4 -j RETURN + iptables -t mangle -A SING_BOX_SELF -d 255.255.255.255/32 -j RETURN + iptables -t mangle -A SING_BOX_SELF -j RETURN -m mark --mark 1234 + + iptables -t mangle -A SING_BOX_SELF -d ${hosts."${server_host}"}/32 -p tcp -j RETURN + iptables -t mangle -A SING_BOX_SELF -d ${hosts."${server_host}"}/32 -p udp -j RETURN + iptables -t mangle -A SING_BOX_SELF -p tcp -j MARK --set-mark 1 + iptables -t mangle -A SING_BOX_SELF -p udp -j MARK --set-mark 1 + iptables -t mangle -A OUTPUT -j SING_BOX_SELF + ''; + }; + in + { + + name = "sing-box"; - nodes.machine = { pkgs, ... }: { - environment.systemPackages = [ pkgs.curl ]; - services.nginx = { - enable = true; - statusPage = true; + meta = { + maintainers = with lib.maintainers; [ nickcao ]; }; - services.sing-box = { - enable = true; - settings = { - inbounds = [{ - type = "mixed"; - tag = "inbound"; - listen = "127.0.0.1"; - listen_port = 1080; - users = [{ - username = "user"; - password = { _secret = pkgs.writeText "password" "supersecret"; }; - }]; - }]; - outbounds = [{ - type = "direct"; - tag = "outbound"; - }]; - }; + + nodes = { + target = + { pkgs, ... }: + { + networking = { + firewall.enable = false; + hosts = hostsEntries; + useDHCP = false; + interfaces.eth1 = { + ipv4.addresses = [ + { + address = hosts."${target_host}"; + prefixLength = 24; + } + ]; + }; + }; + + services.dnsmasq.enable = true; + + services.nginx = { + enable = true; + package = pkgs.nginxQuic; + + virtualHosts."${target_host}" = { + onlySSL = true; + sslCertificate = ./common/acme/server/acme.test.cert.pem; + sslCertificateKey = ./common/acme/server/acme.test.key.pem; + http2 = true; + http3 = true; + http3_hq = false; + quic = true; + reuseport = true; + locations."/" = { + extraConfig = '' + default_type text/plain; + return 200 "$server_protocol $remote_addr"; + allow ${hosts."${server_host}"}/32; + deny all; + ''; + }; + }; + }; + }; + + server = + { pkgs, ... }: + { + boot.kernel.sysctl = { + "net.ipv4.conf.all.forwarding" = 1; + }; + + networking = { + firewall.enable = false; + hosts = hostsEntries; + useDHCP = false; + interfaces.eth1 = { + ipv4.addresses = [ + { + address = hosts."${server_host}"; + prefixLength = 24; + } + ]; + }; + }; + + systemd.network.wait-online.ignoredInterfaces = [ "wg0" ]; + + networking.wg-quick.interfaces.wg0 = { + address = [ + "10.23.42.1/24" + ]; + listenPort = 2408; + mtu = 1500; + + inherit (wg-keys.peer0) privateKey; + + peers = lib.singleton { + allowedIPs = [ + "10.23.42.2/32" + ]; + + inherit (wg-keys.peer1) publicKey; + }; + + postUp = '' + ${pkgs.iptables}/bin/iptables -A FORWARD -i wg0 -j ACCEPT + ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.23.42.0/24 -o eth1 -j MASQUERADE + ''; + }; + + services.sing-box = { + enable = true; + settings = { + inbounds = [ + vmessInbound + ]; + outbounds = [ + { + type = "direct"; + tag = "outbound:direct"; + } + ]; + }; + }; + }; + + tun = + { pkgs, ... }: + { + networking = { + firewall.enable = false; + hosts = hostsEntries; + useDHCP = false; + interfaces.eth1 = { + ipv4.addresses = [ + { + address = "1.1.1.3"; + prefixLength = 24; + } + ]; + }; + }; + + security.pki.certificates = [ + (builtins.readFile ./common/acme/server/ca.cert.pem) + ]; + + environment.systemPackages = [ + pkgs.curlHTTP3 + pkgs.iproute2 + ]; + + services.sing-box = { + enable = true; + settings = { + inbounds = [ + tunInbound + ]; + outbounds = [ + { + type = "block"; + tag = "outbound:block"; + } + { + type = "direct"; + tag = "outbound:direct"; + } + vmessOutbound + ]; + route = { + final = "outbound:block"; + rules = [ + { + inbound = [ + "inbound:tun" + ]; + outbound = "outbound:vmess"; + } + ]; + }; + }; + }; + }; + + wireguard = + { pkgs, ... }: + { + networking = { + firewall.enable = false; + hosts = hostsEntries; + useDHCP = false; + interfaces.eth1 = { + ipv4.addresses = [ + { + address = "1.1.1.4"; + prefixLength = 24; + } + ]; + }; + }; + + security.pki.certificates = [ + (builtins.readFile ./common/acme/server/ca.cert.pem) + ]; + + environment.systemPackages = [ + pkgs.curlHTTP3 + pkgs.iproute2 + ]; + + services.sing-box = { + enable = true; + settings = { + outbounds = [ + { + type = "block"; + tag = "outbound:block"; + } + { + type = "direct"; + tag = "outbound:direct"; + } + { + detour = "outbound:direct"; + type = "wireguard"; + tag = "outbound:wireguard"; + interface_name = "wg0"; + local_address = [ "10.23.42.2/32" ]; + mtu = 1280; + private_key = wg-keys.peer1.privateKey; + peer_public_key = wg-keys.peer0.publicKey; + server = server_host; + server_port = 2408; + system_interface = true; + } + ]; + route = { + final = "outbound:block"; + }; + }; + }; + }; + + tproxy = + { pkgs, ... }: + { + networking = { + firewall.enable = false; + hosts = hostsEntries; + useDHCP = false; + interfaces.eth1 = { + ipv4.addresses = [ + { + address = "1.1.1.5"; + prefixLength = 24; + } + ]; + }; + }; + + security.pki.certificates = [ + (builtins.readFile ./common/acme/server/ca.cert.pem) + ]; + + environment.systemPackages = [ pkgs.curlHTTP3 ]; + + systemd.services.sing-box.serviceConfig.ExecStartPost = [ + "+${tproxyPost}/bin/exe" + ]; + + services.sing-box = { + enable = true; + settings = { + inbounds = [ + { + tag = "inbound:tproxy"; + type = "tproxy"; + listen = "0.0.0.0"; + listen_port = tproxyPort; + udp_fragment = true; + sniff = true; + sniff_override_destination = false; + } + ]; + outbounds = [ + { + type = "block"; + tag = "outbound:block"; + } + { + type = "direct"; + tag = "outbound:direct"; + } + vmessOutbound + ]; + route = { + final = "outbound:block"; + rules = [ + { + inbound = [ + "inbound:tproxy" + ]; + outbound = "outbound:vmess"; + } + ]; + }; + }; + }; + }; + + fakeip = + { pkgs, ... }: + { + networking = { + firewall.enable = false; + hosts = hostsEntries; + useDHCP = false; + interfaces.eth1 = { + ipv4.addresses = [ + { + address = "1.1.1.6"; + prefixLength = 24; + } + ]; + }; + }; + + environment.systemPackages = [ pkgs.dnsutils ]; + + services.sing-box = { + enable = true; + settings = { + dns = { + final = "dns:default"; + independent_cache = true; + fakeip = { + enabled = true; + "inet4_range" = "198.18.0.0/16"; + }; + servers = [ + { + detour = "outbound:direct"; + tag = "dns:default"; + address = hosts."${target_host}"; + } + { + tag = "dns:fakeip"; + address = "fakeip"; + } + ]; + rules = [ + { + outbound = [ "any" ]; + server = "dns:default"; + } + { + query_type = [ + "A" + "AAAA" + ]; + server = "dns:fakeip"; + + } + ]; + }; + inbounds = [ + tunInbound + ]; + outbounds = [ + { + type = "block"; + tag = "outbound:block"; + } + { + type = "direct"; + tag = "outbound:direct"; + } + { + type = "dns"; + tag = "outbound:dns"; + } + ]; + route = { + final = "outbound:direct"; + rules = [ + { + protocol = "dns"; + outbound = "outbound:dns"; + } + ]; + }; + }; + }; + }; }; - }; - testScript = '' - machine.wait_for_unit("nginx.service") - machine.wait_for_unit("sing-box.service") + testScript = '' + target.wait_for_unit("nginx.service") + target.wait_for_open_port(443) + target.wait_for_unit("dnsmasq.service") + target.wait_for_open_port(53) + + server.wait_for_unit("sing-box.service") + server.wait_for_open_port(1080) + server.wait_for_unit("wg-quick-wg0.service") + server.wait_for_file("/sys/class/net/wg0") + + def test_curl(machine, extra_args=""): + assert ( + machine.succeed(f"curl --fail --max-time 10 --http2 https://${target_host} {extra_args}") + == "HTTP/2.0 ${hosts.${server_host}}" + ) + assert ( + machine.succeed(f"curl --fail --max-time 10 --http3-only https://${target_host} {extra_args}") + == "HTTP/3.0 ${hosts.${server_host}}" + ) + + with subtest("tun"): + tun.wait_for_unit("sing-box.service") + tun.wait_for_unit("sys-devices-virtual-net-tun0.device") + tun.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev tun0'") + tun.succeed("ip addr show tun0") + test_curl(tun) + + with subtest("wireguard"): + wireguard.wait_for_unit("sing-box.service") + wireguard.wait_for_unit("sys-devices-virtual-net-wg0.device") + wireguard.succeed("ip addr show wg0") + test_curl(wireguard, "--interface wg0") - machine.wait_for_open_port(80) - machine.wait_for_open_port(1080) + with subtest("tproxy"): + tproxy.wait_for_unit("sing-box.service") + test_curl(tproxy) - machine.succeed("curl --fail --max-time 10 --proxy http://user:supersecret@localhost:1080 http://localhost") - machine.fail("curl --fail --max-time 10 --proxy http://user:supervillain@localhost:1080 http://localhost") - machine.succeed("curl --fail --max-time 10 --proxy socks5://user:supersecret@localhost:1080 http://localhost") - ''; + with subtest("fakeip"): + fakeip.wait_for_unit("sing-box.service") + fakeip.wait_for_unit("sys-devices-virtual-net-tun0.device") + fakeip.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev tun0'") + fakeip.succeed("dig +short A ${target_host} @${target_host} | grep '^198.18.'") + ''; -}) + } +) diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index ad516b6e8d2b5..f35eaf9c8e784 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -154,7 +154,7 @@ in { with subtest("run_distributed_command"): # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes). - # The output must contain the 3 different names + # The output must contain the 3 different names submit.succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq") with subtest("check_slurm_dbd"): diff --git a/nixos/tests/sourcehut/nodes/common.nix b/nixos/tests/sourcehut/nodes/common.nix index f0a81358f9721..1326a9e900576 100644 --- a/nixos/tests/sourcehut/nodes/common.nix +++ b/nixos/tests/sourcehut/nodes/common.nix @@ -44,37 +44,37 @@ in pgp-privkey = toString (pkgs.writeText "sourcehut.pgp-privkey" '' -----BEGIN PGP PRIVATE KEY BLOCK----- - lFgEYqDRORYJKwYBBAHaRw8BAQdAehGoy36FUx2OesYm07be2rtLyvR5Pb/ltstd - Gk7hYQoAAP9X4oPmxxrHN8LewBpWITdBomNqlHoiP7mI0nz/BOPJHxEktDZuaXhv + lFgEZrFBKRYJKwYBBAHaRw8BAQdAS1Ffiytk0h0z0jfaT3qyiDUV/plVIUwOg1Yr + AXP2YmsAAP0W6QMC3G2G41rzCGLeSHeGibor1+XuxvcwUpVdW7ge+BH/tDZuaXhv cy90ZXN0cy9zb3VyY2VodXQgPHJvb3QraHV0QHNvdXJjZWh1dC5sb2NhbGRvbWFp - bj6IlwQTFgoAPxYhBPqjgjnL8RHN4JnADNicgXaYm0jJBQJioNE5AhsDBQkDwmcA - BgsJCAcDCgUVCgkICwUWAwIBAAIeBQIXgAAKCRDYnIF2mJtIySVCAP9e2nHsVHSi - 2B1YGZpVG7Xf36vxljmMkbroQy+0gBPwRwEAq+jaiQqlbGhQ7R/HMFcAxBIVsq8h - Aw1rngsUd0o3dAicXQRioNE5EgorBgEEAZdVAQUBAQdAXZV2Sd5ZNBVTBbTGavMv - D6ORrUh8z7TI/3CsxCE7+yADAQgHAAD/c1RU9xH+V/uI1fE7HIn/zL0LUPpsuce2 - cH++g4u3kBgTOYh+BBgWCgAmFiEE+qOCOcvxEc3gmcAM2JyBdpibSMkFAmKg0TkC - GwwFCQPCZwAACgkQ2JyBdpibSMlKagD/cTre6p1m8QuJ7kwmCFRSz5tBzIuYMMgN - xtT7dmS91csA/35fWsOykSiFRojQ7ccCSUTHL7ApF2EbL968tP/D2hIG - =Hjoc + bj6IkwQTFgoAOxYhBMISh2Z08FCi969cq9R2wSP9QF2bBQJmsUEpAhsDBQsJCAcC + AiICBhUKCQgLAgQWAgMBAh4HAheAAAoJENR2wSP9QF2b4JMA+wQLdxVcod/ppyvH + QguGqqhkpk8KquCddOuFnQVAfHFWAQCK5putVk4mGzsoLTbOJCSGRC4pjEktZawQ + MTqJmnOuC5xdBGaxQSkSCisGAQQBl1UBBQEBB0Aed6UYJyighTY+KuPNQ439st3x + x04T1j58sx3AnKgYewMBCAcAAP9WLB79HO1zFRqTCnk7GIEWWogMFKVpazeBUNu9 + h9rzCA2+iHgEGBYKACAWIQTCEodmdPBQovevXKvUdsEj/UBdmwUCZrFBKQIbDAAK + CRDUdsEj/UBdmwgJAQDVk/px/pSzqreSeDLzxlb6dOo+N1KcicsJ0akhSJUcvwD9 + EPhpEDZu/UBKchAutOhWwz+y6pyoF4Vt7XG+jbJQtA4= + =KaQc -----END PGP PRIVATE KEY BLOCK----- ''); pgp-pubkey = pkgs.writeText "sourcehut.pgp-pubkey" '' -----BEGIN PGP PUBLIC KEY BLOCK----- - mDMEYqDRORYJKwYBBAHaRw8BAQdAehGoy36FUx2OesYm07be2rtLyvR5Pb/ltstd - Gk7hYQq0Nm5peG9zL3Rlc3RzL3NvdXJjZWh1dCA8cm9vdCtodXRAc291cmNlaHV0 - LmxvY2FsZG9tYWluPoiXBBMWCgA/FiEE+qOCOcvxEc3gmcAM2JyBdpibSMkFAmKg - 0TkCGwMFCQPCZwAGCwkIBwMKBRUKCQgLBRYDAgEAAh4FAheAAAoJENicgXaYm0jJ - JUIA/17acexUdKLYHVgZmlUbtd/fq/GWOYyRuuhDL7SAE/BHAQCr6NqJCqVsaFDt - H8cwVwDEEhWyryEDDWueCxR3Sjd0CLg4BGKg0TkSCisGAQQBl1UBBQEBB0BdlXZJ - 3lk0FVMFtMZq8y8Po5GtSHzPtMj/cKzEITv7IAMBCAeIfgQYFgoAJhYhBPqjgjnL - 8RHN4JnADNicgXaYm0jJBQJioNE5AhsMBQkDwmcAAAoJENicgXaYm0jJSmoA/3E6 - 3uqdZvELie5MJghUUs+bQcyLmDDIDcbU+3ZkvdXLAP9+X1rDspEohUaI0O3HAklE - xy+wKRdhGy/evLT/w9oSBg== - =pJD7 + mDMEZrFBKRYJKwYBBAHaRw8BAQdAS1Ffiytk0h0z0jfaT3qyiDUV/plVIUwOg1Yr + AXP2Ymu0Nm5peG9zL3Rlc3RzL3NvdXJjZWh1dCA8cm9vdCtodXRAc291cmNlaHV0 + LmxvY2FsZG9tYWluPoiTBBMWCgA7FiEEwhKHZnTwUKL3r1yr1HbBI/1AXZsFAmax + QSkCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQ1HbBI/1AXZvgkwD7 + BAt3FVyh3+mnK8dCC4aqqGSmTwqq4J1064WdBUB8cVYBAIrmm61WTiYbOygtNs4k + JIZELimMSS1lrBAxOomac64LuDgEZrFBKRIKKwYBBAGXVQEFAQEHQB53pRgnKKCF + Nj4q481Djf2y3fHHThPWPnyzHcCcqBh7AwEIB4h4BBgWCgAgFiEEwhKHZnTwUKL3 + r1yr1HbBI/1AXZsFAmaxQSkCGwwACgkQ1HbBI/1AXZsICQEA1ZP6cf6Us6q3kngy + 88ZW+nTqPjdSnInLCdGpIUiVHL8A/RD4aRA2bv1ASnIQLrToVsM/suqcqBeFbe1x + vo2yULQO + =luxZ -----END PGP PUBLIC KEY BLOCK----- ''; - pgp-key-id = "0xFAA38239CBF111CDE099C00CD89C8176989B48C9"; + pgp-key-id = "0xC212876674F050A2F7AF5CABD476C123FD405D9B"; }; }; diff --git a/nixos/tests/stub-ld.nix b/nixos/tests/stub-ld.nix index 72b0aebf3e6ce..f34e082cfd228 100644 --- a/nixos/tests/stub-ld.nix +++ b/nixos/tests/stub-ld.nix @@ -18,7 +18,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { libDir = pkgs.stdenv.hostPlatform.libDir; ldsoBasename = lib.last (lib.splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker); - check32 = pkgs.stdenv.isx86_64; + check32 = pkgs.stdenv.hostPlatform.isx86_64; pkgs32 = pkgs.pkgsi686Linux; libDir32 = pkgs32.stdenv.hostPlatform.libDir; diff --git a/nixos/tests/sunshine.nix b/nixos/tests/sunshine.nix index 7c7e86de203a0..a1207bfa49f76 100644 --- a/nixos/tests/sunshine.nix +++ b/nixos/tests/sunshine.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "sunshine"; meta = { # test is flaky on aarch64 - broken = pkgs.stdenv.isAarch64; + broken = pkgs.stdenv.hostPlatform.isAarch64; maintainers = [ lib.maintainers.devusb ]; }; diff --git a/nixos/tests/suricata.nix b/nixos/tests/suricata.nix new file mode 100644 index 0000000000000..e1cdd91aaaa21 --- /dev/null +++ b/nixos/tests/suricata.nix @@ -0,0 +1,86 @@ +import ./make-test-python.nix ( + { lib, pkgs, ... }: + { + name = "suricata"; + meta.maintainers = with lib.maintainers; [ felbinger ]; + + nodes = { + ids = { + imports = [ + ../modules/profiles/minimal.nix + ../modules/services/networking/suricata/default.nix + ]; + + networking.interfaces.eth1 = { + useDHCP = false; + ipv4.addresses = [ + { + address = "192.168.1.2"; + prefixLength = 24; + } + ]; + }; + + # disable suricata-update because this requires an Internet connection + systemd.services.suricata-update.enable = false; + + # install suricata package to make suricatasc program available + environment.systemPackages = with pkgs; [ suricata ]; + + services.suricata = { + enable = true; + settings = { + vars.address-groups.HOME_NET = "192.168.1.0/24"; + unix-command.enabled = true; + outputs = [ { fast.enabled = true; } ]; + af-packet = [ { interface = "eth1"; } ]; + classification-file = "${pkgs.suricata}/etc/suricata/classification.config"; + }; + }; + + # create suricata.rules with the rule to detect the output of the id command + systemd.tmpfiles.rules = [ + ''f /var/lib/suricata/rules/suricata.rules 644 suricata suricata 0 alert ip any any -> any any (msg:"GPL ATTACK_RESPONSE id check returned root"; content:"uid=0|28|root|29|"; classtype:bad-unknown; sid:2100498; rev:7; metadata:created_at 2010_09_23, updated_at 2019_07_26;)'' + ]; + }; + helper = { + imports = [ ../modules/profiles/minimal.nix ]; + + networking.interfaces.eth1 = { + useDHCP = false; + ipv4.addresses = [ + { + address = "192.168.1.1"; + prefixLength = 24; + } + ]; + }; + + services.nginx = { + enable = true; + virtualHosts."localhost".locations = { + "/id/".return = "200 'uid=0(root) gid=0(root) groups=0(root)'"; + }; + }; + networking.firewall.allowedTCPPorts = [ 80 ]; + }; + }; + + testScript = '' + start_all() + + # check that configuration has been applied correctly with suricatasc + with subtest("suricata configuration test"): + ids.wait_for_unit("suricata.service") + assert '1' in ids.succeed("suricatasc -c 'iface-list' | ${pkgs.jq}/bin/jq .message.count") + + # test detection of events based on a static ruleset (output of id command) + with subtest("suricata rule test"): + helper.wait_for_unit("nginx.service") + ids.wait_for_unit("suricata.service") + + ids.succeed("curl http://192.168.1.1/id/") + assert "id check returned root [**] [Classification: Potentially Bad Traffic]" in ids.succeed("tail -n 1 /var/log/suricata/fast.log"), "Suricata didn't detect the output of id comment" + ''; + } +) diff --git a/nixos/tests/swayfx.nix b/nixos/tests/swayfx.nix index 77844ec80ae1d..fe1caf8fffa8b 100644 --- a/nixos/tests/swayfx.nix +++ b/nixos/tests/swayfx.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ( { name = "swayfx"; meta = { - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; }; # testScriptWithTypes:49: error: Cannot call function of unknown type diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index d90e5bb088cee..e00c22b816820 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -48,10 +48,7 @@ in { nodes = { machine = { pkgs, lib, ... }: { - system.switch = { - enable = !ng; - enableNg = ng; - }; + system.switch.enableNg = ng; environment.systemPackages = [ pkgs.socat ]; # for the socket activation stuff users.mutableUsers = false; @@ -263,6 +260,15 @@ in { systemd.services."escaped\\x2ddash".serviceConfig.X-Test = "test"; }; + unitWithMultilineValue.configuration = { + systemd.services.test.serviceConfig.ExecStart = '' + ${pkgs.coreutils}/bin/true \ + # ignored + ; ignored + blah blah + ''; + }; + unitStartingWithDash.configuration = { systemd.services."-" = { wantedBy = [ "multi-user.target" ]; @@ -594,6 +600,7 @@ in { }; other = { + system.switch.enable = true; users.mutableUsers = true; }; }; @@ -876,9 +883,16 @@ in { machine.succeed("! test -e /run/current-system/dry-activate") machine.succeed("! test -e /run/current-system/bin/switch-to-configuration") + # Ensure units with multiline values work + out = switch_to_specialisation("${machine}", "unitWithMultilineValue") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "restarting the following units:") + assert_lacks(out, "the following new units were started:") + assert_contains(out, "starting the following units: test.service") + # Ensure \ works in unit names out = switch_to_specialisation("${machine}", "unitWithBackslash") - assert_contains(out, "stopping the following units: test.service\n") assert_lacks(out, "NOT restarting the following changed units:") assert_lacks(out, "reloading the following units:") assert_lacks(out, "\nrestarting the following units:") diff --git a/nixos/tests/systemd-binfmt.nix b/nixos/tests/systemd-binfmt.nix index b16fda0ddb1a6..a5e46a455d325 100644 --- a/nixos/tests/systemd-binfmt.nix +++ b/nixos/tests/systemd-binfmt.nix @@ -87,4 +87,29 @@ in { ).lower() ''; }; + + chroot = makeTest { + name = "systemd-binfmt-chroot"; + nodes.machine = { pkgs, lib, ... }: { + boot.binfmt.emulatedSystems = [ + "aarch64-linux" "wasm32-wasi" + ]; + boot.binfmt.preferStaticEmulators = true; + + environment.systemPackages = [ + (pkgs.writeShellScriptBin "test-chroot" '' + set -euo pipefail + mkdir -p /tmp/chroot + cp ${lib.getExe' pkgs.pkgsCross.aarch64-multiplatform.pkgsStatic.busybox "busybox"} /tmp/chroot/busybox + cp ${lib.getExe pkgs.pkgsCross.wasi32.yaml2json} /tmp/chroot/yaml2json # wasi binaries that build are hard to come by + chroot /tmp/chroot /busybox uname -m | grep aarch64 + echo 42 | chroot /tmp/chroot /yaml2json | grep 42 + '') + ]; + }; + testScript = '' + machine.start() + machine.succeed("test-chroot") + ''; + }; } diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 17edfb06f670e..79bfcb84ebd76 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -13,6 +13,7 @@ let boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; environment.systemPackages = [ pkgs.efibootmgr ]; + system.switch.enable = true; }; commonXbootldr = { config, lib, pkgs, ... }: diff --git a/nixos/tests/systemd-initrd-luks-fido2.nix b/nixos/tests/systemd-initrd-luks-fido2.nix index 207f51f4dd9b4..4441ad061ee42 100644 --- a/nixos/tests/systemd-initrd-luks-fido2.nix +++ b/nixos/tests/systemd-initrd-luks-fido2.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { # Booting off the encrypted disk requires having a Nix store available for the init script mountHostNixStore = true; useEFIBoot = true; - qemu.options = [ "-device canokey,file=/tmp/canokey-file" ]; + qemu.options = [ "-device pci-ohci,id=usb-bus" "-device canokey,bus=usb-bus.0,file=/tmp/canokey-file" ]; }; boot.loader.systemd-boot.enable = true; diff --git a/nixos/tests/systemd-initrd-luks-unl0kr.nix b/nixos/tests/systemd-initrd-luks-unl0kr.nix index 0658a098cfa2b..83b52646d112d 100644 --- a/nixos/tests/systemd-initrd-luks-unl0kr.nix +++ b/nixos/tests/systemd-initrd-luks-unl0kr.nix @@ -2,8 +2,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let passphrase = "secret"; in { name = "systemd-initrd-luks-unl0kr"; - meta = with pkgs.lib.maintainers; { - maintainers = [ tomfitzhenry ]; + meta = { + maintainers = []; }; enableOCR = true; diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix index 555a8bb43b30e..40ea4905ec67b 100644 --- a/nixos/tests/systemd-machinectl.nix +++ b/nixos/tests/systemd-machinectl.nix @@ -16,7 +16,7 @@ let imports = [ ../modules/profiles/minimal.nix ]; - system.stateVersion = config.system.nixos.version; + system.stateVersion = config.system.nixos.release; }; containerSystem = (import ../lib/eval-config.nix { diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index 3430eb9398cb4..0742af6aa8406 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -75,12 +75,19 @@ import ./make-test-python.nix ({ pkgs, ... }: { rebootTime = "10min"; kexecTime = "5min"; }; + + environment.etc."systemd/system-preset/10-testservice.preset".text = '' + disable ${config.systemd.services.testservice1.name} + ''; }; - testScript = '' + testScript = { nodes, ... }: '' import re import subprocess + # Will not succeed unless ConditionFirstBoot=yes + machine.wait_for_unit("first-boot-complete.target") + machine.wait_for_x() # wait for user services machine.wait_for_unit("default.target", "alice") @@ -209,5 +216,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { with subtest("systemd environment is properly set"): machine.systemctl("daemon-reexec") # Rewrites /proc/1/environ machine.succeed("grep -q TZDIR=/etc/zoneinfo /proc/1/environ") + + with subtest("systemd presets are ignored"): + machine.succeed("systemctl preset ${nodes.machine.systemd.services.testservice1.name}") + machine.succeed("test -e /etc/systemd/system/${nodes.machine.systemd.services.testservice1.name}") ''; }) diff --git a/nixos/tests/tandoor-recipes-script-name.nix b/nixos/tests/tandoor-recipes-script-name.nix index 9010ffa3ccfa1..6216d67b8084a 100644 --- a/nixos/tests/tandoor-recipes-script-name.nix +++ b/nixos/tests/tandoor-recipes-script-name.nix @@ -78,7 +78,7 @@ import ./make-test-python.nix ( elif value.startswith("/"): self.urls.append(f"{origin_url}{value}") else: - print("Ignoring external URL: {value}") + print(f"Ignoring non-path URL: {value}") break diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix index c3cdb1645213a..2ccad7af3f555 100644 --- a/nixos/tests/telegraf.nix +++ b/nixos/tests/telegraf.nix @@ -19,6 +19,12 @@ import ./make-test-python.nix ({ pkgs, ...} : { timeout = "5s"; data_format = "influx"; }; + inputs.ping = { + urls = ["127.0.0.1"]; + count = 4; + interval = "10s"; + timeout = 1.0; + }; outputs.file.files = ["/tmp/metrics.out"]; outputs.file.data_format = "influx"; }; @@ -29,5 +35,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { machine.wait_for_unit("telegraf.service") machine.wait_until_succeeds("grep -q example /tmp/metrics.out") + machine.wait_until_succeeds("grep -q ping /tmp/metrics.out") ''; }) diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index 3cf99fe7fc2f3..9195f619c8d21 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -62,6 +62,9 @@ let tests = { konsole.pkg = p: p.plasma5Packages.konsole; lomiri-terminal-app.pkg = p: p.lomiri.lomiri-terminal-app; + # after recent Mesa change, borked software rendering config under x86_64 icewm? + # BGR colour display on x86_64, RGB on aarch64 + lomiri-terminal-app.colourTest = false; lxterminal.pkg = p: p.lxterminal; @@ -117,6 +120,8 @@ let tests = { xfce4-terminal.pkg = p: p.xfce.xfce4-terminal; xterm.pkg = p: p.xterm; + + zutty.pkg = p: p.zutty; }; in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable}", colourTest ? true, pinkValue ? "#FF0087", kill ? false }: makeTest { diff --git a/nixos/tests/turn-rs.nix b/nixos/tests/turn-rs.nix new file mode 100644 index 0000000000000..750a141c224a3 --- /dev/null +++ b/nixos/tests/turn-rs.nix @@ -0,0 +1,65 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + { + name = "turn-rs"; + + nodes = { + server = { + virtualisation.vlans = [ 1 ]; + + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + }; + + systemd.network.networks."01-eth1" = { + name = "eth1"; + networkConfig.Address = "10.0.0.1/24"; + }; + + services.turn-rs = { + enable = true; + secretFile = pkgs.writeText "secret" '' + USER_1_CREDS="foobar" + ''; + settings = { + turn = { + realm = "localhost"; + interfaces = [ + { + transport = "udp"; + bind = "127.0.0.1:3478"; + external = "127.0.0.1:3478"; + } + { + transport = "tcp"; + bind = "127.0.0.1:3478"; + external = "127.0.0.1:3478"; + } + ]; + }; + + auth.static_credentials.user1 = "$USER_1_CREDS"; + }; + }; + }; + }; + + testScript = # python + '' + import json + + start_all() + server.wait_for_unit('turn-rs.service') + server.wait_for_open_port(3000, "127.0.0.1") + + info = server.succeed('curl http://localhost:3000/info') + jsonInfo = json.loads(info) + assert len(jsonInfo['interfaces']) == 2, f'Interfaces doesn\'t contain two entries:\n{json.dumps(jsonInfo, indent=2)}' + + config = server.succeed('cat /run/turn-rs/config.toml') + assert 'foobar' in config, f'Secrets are not properly injected:\n{config}' + ''; + } +) diff --git a/nixos/tests/user-activation-scripts.nix b/nixos/tests/user-activation-scripts.nix index ebd96b019e920..2e1840a8460f6 100644 --- a/nixos/tests/user-activation-scripts.nix +++ b/nixos/tests/user-activation-scripts.nix @@ -3,6 +3,7 @@ import ./make-test-python.nix ({ lib, ... }: { meta = with lib.maintainers; { maintainers = [ chkno ]; }; nodes.machine = { + system.switch.enable = true; system.userActivationScripts.foo = "mktemp ~/user-activation-ran.XXXXXX"; users.users.alice = { initialPassword = "pass1"; diff --git a/nixos/tests/userborn.nix b/nixos/tests/userborn.nix index c89880a14a5c3..2c4f44b93ca54 100644 --- a/nixos/tests/userborn.nix +++ b/nixos/tests/userborn.nix @@ -99,6 +99,10 @@ in with subtest("sysusers group is created"): print(machine.succeed("getent group sysusers")) + with subtest("Check files"): + print(machine.succeed("grpck -r")) + print(machine.succeed("pwck -r")) + machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch") @@ -123,5 +127,9 @@ in with subtest("new-group group is created after switching to new generation"): print(machine.succeed("getent group new-group")) + + with subtest("Check files"): + print(machine.succeed("grpck -r")) + print(machine.succeed("pwck -r")) ''; } diff --git a/nixos/tests/vscode-remote-ssh.nix b/nixos/tests/vscode-remote-ssh.nix index 2b2630ef87d2f..278f2308cc165 100644 --- a/nixos/tests/vscode-remote-ssh.nix +++ b/nixos/tests/vscode-remote-ssh.nix @@ -14,7 +14,11 @@ import ./make-test-python.nix ({ lib, ... }@args: let inherit (pkgs.vscode.passthru) rev vscodeServer; in { name = "vscode-remote-ssh"; - meta.maintainers = [ ]; + + meta = { + maintainers = [ ]; + timeout = 600; + }; nodes = let serverAddress = "192.168.0.2"; @@ -70,7 +74,11 @@ in { client.succeed("sudo -u alice code --remote=ssh-remote+root@server /root") client.wait_for_window("Visual Studio Code") - client.wait_for_text("Do you trust the authors" if should_succeed else "Disconnected from SSH") + if should_succeed: + ocr_text = "Do you trust" + else: + ocr_text = "Could not establish connection" + client.wait_for_text(ocr_text) client.screenshot(screenshot) if should_succeed: diff --git a/nixos/tests/web-apps/healthchecks.nix b/nixos/tests/web-apps/healthchecks.nix index 41c40cd5dd8d4..cb81c8b736516 100644 --- a/nixos/tests/web-apps/healthchecks.nix +++ b/nixos/tests/web-apps/healthchecks.nix @@ -24,7 +24,7 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: { with subtest("Home screen loads"): machine.succeed( - "curl -sSfL http://localhost:8000 | grep 'Sign In'" + "curl -sSfL http://localhost:8000 | grep '<title>Log In'" ) with subtest("Setting SITE_NAME via freeform option works"): diff --git a/nixos/tests/web-apps/immich.nix b/nixos/tests/web-apps/immich.nix new file mode 100644 index 0000000000000..f03b9290f7a59 --- /dev/null +++ b/nixos/tests/web-apps/immich.nix @@ -0,0 +1,51 @@ +import ../make-test-python.nix ( + { ... }: + { + name = "immich-nixos"; + + nodes.machine = + { pkgs, ... }: + { + # These tests need a little more juice + virtualisation = { + cores = 2; + memorySize = 2048; + diskSize = 4096; + }; + + environment.systemPackages = with pkgs; [ immich-cli ]; + + services.immich = { + enable = true; + environment.IMMICH_LOG_LEVEL = "verbose"; + }; + }; + + testScript = '' + import json + + machine.wait_for_unit("immich-server.service") + + machine.wait_for_open_port(3001) # Server + machine.wait_for_open_port(3003) # Machine learning + machine.succeed("curl --fail http://localhost:3001/") + + machine.succeed(""" + curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' -X POST http://localhost:3001/api/auth/admin-sign-up + """) + res = machine.succeed(""" + curl -H 'Content-Type: application/json' --data '{ "email": "test@example.com", "password": "admin" }' -X POST http://localhost:3001/api/auth/login + """) + token = json.loads(res)['accessToken'] + + res = machine.succeed(""" + curl -H 'Content-Type: application/json' -H 'Cookie: immich_access_token=%s' --data '{ "name": "API Key", "permissions": ["all"] }' -X POST http://localhost:3001/api/api-keys + """ % token) + key = json.loads(res)['secret'] + + machine.succeed(f"immich login http://localhost:3001/api {key}") + res = machine.succeed("immich server-info") + print(res) + ''; + } +) diff --git a/nixos/tests/web-apps/rss-bridge.nix b/nixos/tests/web-apps/rss-bridge.nix new file mode 100644 index 0000000000000..16ab6cd8b5849 --- /dev/null +++ b/nixos/tests/web-apps/rss-bridge.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: +{ + name = "rss-bridge"; + meta.maintainers = with pkgs.lib.maintainers; [ mynacol ]; + + nodes.machine = + { ... }: + { + services.rss-bridge = { + enable = true; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("nginx.service") + machine.wait_for_unit("phpfpm-rss-bridge.service") + + # check for successful feed download + machine.succeed("curl -sS -f 'http://localhost/?action=display&bridge=DemoBridge&context=testCheckbox&format=Atom'") + ''; +} diff --git a/nixos/tests/web-servers/stargazer.nix b/nixos/tests/web-servers/stargazer.nix index 52bc93af17194..b687f2046a044 100644 --- a/nixos/tests/web-servers/stargazer.nix +++ b/nixos/tests/web-servers/stargazer.nix @@ -117,16 +117,41 @@ in }; }; }; + cgiTestServer = { ... }: { + users.users.cgi = { + isSystemUser = true; + group = "cgi"; + }; + users.groups.cgi = { }; + services.stargazer = { + enable = true; + connectionLogging = false; + requestTimeout = 1; + allowCgiUser = true; + routes = [ + { + route = "localhost:/cgi-bin"; + root = "${test_env}/test_data"; + cgi = true; + cgi-timeout = 5; + cgi-user = "cgi"; + } + ]; + }; + }; }; testScript = { nodes, ... }: '' geminiserver.wait_for_unit("scgi_server") geminiserver.wait_for_open_port(1099) geminiserver.wait_for_unit("stargazer") - geminiserver.wait_for_open_port(1965) + cgiTestServer.wait_for_open_port(1965) with subtest("stargazer test suite"): response = geminiserver.succeed("sh -c 'cd ${test_env}; ${test_script}/bin/test'") print(response) + with subtest("stargazer cgi-user test"): + response = cgiTestServer.succeed("sh -c 'cd ${test_env}; ${test_script}/bin/test --checks CGIVars'") + print(response) ''; } diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index 7cbe7ac94f1e7..7fc98c23c0423 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -43,7 +43,7 @@ let in listToAttrs ( map (makeWineTest "winePackages" [ hello32 ]) variants - ++ optionals pkgs.stdenv.is64bit + ++ optionals pkgs.stdenv.hostPlatform.is64bit (map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) # This wayland combination times out after spending many hours. # https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.wine.wineWowPackages-wayland.x86_64-linux diff --git a/nixos/tests/wireguard/default.nix b/nixos/tests/wireguard/default.nix index c30f1b74770b8..fc22f06b778b1 100644 --- a/nixos/tests/wireguard/default.nix +++ b/nixos/tests/wireguard/default.nix @@ -1,7 +1,8 @@ { system ? builtins.currentSystem , config ? { } , pkgs ? import ../../.. { inherit system config; } -, kernelVersionsToTest ? [ "5.4" "latest" ] + # Test current default (LTS) and latest kernel +, kernelVersionsToTest ? [ (pkgs.lib.versions.majorMinor pkgs.linuxPackages.kernel.version) "latest" ] }: with pkgs.lib; diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index 592af9a094f1d..a2cd480302986 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -11,7 +11,7 @@ rec { }; nodes = lib.foldl (a: version: let - package = pkgs."wordpress${version}"; + package = pkgs."wordpress_${version}"; in a // { "wp${version}_httpd" = _: { services.httpd.adminAddr = "webmaster@site.local"; @@ -67,7 +67,7 @@ rec { networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; }) {} [ - "6_3" "6_4" + "6_5" "6_6" ]; testScript = '' diff --git a/nixos/tests/wpa_supplicant.nix b/nixos/tests/wpa_supplicant.nix index 5e3b39f27ecf3..7ca70864b8371 100644 --- a/nixos/tests/wpa_supplicant.nix +++ b/nixos/tests/wpa_supplicant.nix @@ -1,17 +1,18 @@ -import ./make-test-python.nix ({ pkgs, lib, ...}: -{ - name = "wpa_supplicant"; +{ pkgs, runTest }: + +let + + inherit (pkgs) lib; + meta = with lib.maintainers; { maintainers = [ oddlama rnhmjoj ]; }; - nodes = let - machineWithHostapd = extraConfigModule: { ... }: { - imports = [ - ../modules/profiles/minimal.nix - extraConfigModule - ]; + runConnectionTest = name: extraConfig: runTest { + name = "wpa_supplicant-${name}"; + inherit meta; + nodes.machine = { # add a virtual wlan interface boot.kernelModules = [ "mac80211_hwsim" ]; @@ -20,6 +21,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: enable = true; radios.wlan0 = { band = "2g"; + channel = 6; countryCode = "US"; networks = { wlan0 = { @@ -53,27 +55,49 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: }; # wireless client - networking.wireless = { - # the override is needed because the wifi is - # disabled with mkVMOverride in qemu-vm.nix. - enable = lib.mkOverride 0 true; - userControlled.enable = true; - interfaces = [ "wlan1" ]; - fallbackToWPA2 = lib.mkDefault true; + networking.wireless = lib.mkMerge [ + { + # the override is needed because the wifi is + # disabled with mkVMOverride in qemu-vm.nix. + enable = lib.mkOverride 0 true; + userControlled.enable = true; + interfaces = [ "wlan1" ]; + fallbackToWPA2 = lib.mkDefault true; + + # secrets + secretsFile = pkgs.writeText "wpa-secrets" '' + psk_nixos_test=reproducibility + ''; + } + extraConfig + ]; + }; - # networks will be added on-demand below for the specific - # network that should be tested + testScript = '' + # save hostapd config file for manual inspection + machine.wait_for_unit("hostapd.service") + machine.copy_from_vm("/run/hostapd/wlan0.hostapd.conf") - # secrets - environmentFile = pkgs.writeText "wpa-secrets" '' - PSK_NIXOS_TEST="reproducibility" - ''; - }; - }; - in { - basic = { ... }: { - imports = [ ../modules/profiles/minimal.nix ]; + with subtest("Daemon can connect to the access point"): + machine.wait_for_unit("wpa_supplicant-wlan1.service") + machine.wait_until_succeeds( + "wpa_cli -i wlan1 status | grep -q wpa_state=COMPLETED" + ) + ''; + }; + +in +{ + # Test the basic setup: + # - automatic interface discovery + # - WPA2 fallbacks + # - connecting to the daemon + basic = runTest { + name = "wpa_supplicant-basic"; + inherit meta; + + nodes.machine = { # add a virtual wlan interface boot.kernelModules = [ "mac80211_hwsim" ]; @@ -83,7 +107,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: # disabled with mkVMOverride in qemu-vm.nix. enable = lib.mkOverride 0 true; userControlled.enable = true; - interfaces = [ "wlan1" ]; fallbackToWPA2 = true; networks = { @@ -96,28 +119,36 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: psk = "password"; authProtocols = [ "SAE" ]; }; - - # secrets substitution test cases - test1.psk = "@PSK_VALID@"; # should be replaced - test2.psk = "@PSK_SPECIAL@"; # should be replaced - test3.psk = "@PSK_MISSING@"; # should not be replaced - test4.psk = "P@ssowrdWithSome@tSymbol"; # should not be replaced - test5.psk = "@PSK_AWK_REGEX@"; # should be replaced }; - - # secrets - environmentFile = pkgs.writeText "wpa-secrets" '' - PSK_VALID="S0m3BadP4ssw0rd"; - # taken from https://github.com/minimaxir/big-list-of-naughty-strings - PSK_SPECIAL=",./;'[]\/\-= <>?:\"{}|_+ !@#$%^&*()`~"; - PSK_AWK_REGEX="PassowrdWith&symbol"; - ''; }; }; - imperative = { ... }: { - imports = [ ../modules/profiles/minimal.nix ]; + testScript = '' + with subtest("Daemon is running and accepting connections"): + machine.wait_for_unit("wpa_supplicant.service") + status = machine.wait_until_succeeds("wpa_cli status") + assert "Failed to connect" not in status, \ + "Failed to connect to the daemon" + + # get the configuration file + cmdline = machine.succeed("cat /proc/$(pgrep wpa)/cmdline").split('\x00') + config_file = cmdline[cmdline.index("-c") + 1] + with subtest("WPA2 fallbacks have been generated"): + assert int(machine.succeed(f"grep -c sae-only {config_file}")) == 1 + assert int(machine.succeed(f"grep -c mixed-wpa {config_file}")) == 2 + + # save file for manual inspection + machine.copy_from_vm(config_file) + ''; + }; + + # Test configuring the daemon imperatively + imperative = runTest { + name = "wpa_supplicant-imperative"; + inherit meta; + + nodes.machine = { # add a virtual wlan interface boot.kernelModules = [ "mac80211_hwsim" ]; @@ -130,108 +161,55 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: }; }; - # Test connecting to the SAE-only hotspot using SAE - machineSae = machineWithHostapd { - networking.wireless = { - fallbackToWPA2 = false; - networks.nixos-test-sae = { - psk = "@PSK_NIXOS_TEST@"; - authProtocols = [ "SAE" ]; - }; - }; - }; - - # Test connecting to the SAE and WPA2 mixed hotspot using SAE - machineMixedUsingSae = machineWithHostapd { - networking.wireless = { - fallbackToWPA2 = false; - networks.nixos-test-mixed = { - psk = "@PSK_NIXOS_TEST@"; - authProtocols = [ "SAE" ]; - }; - }; - }; - - # Test connecting to the SAE and WPA2 mixed hotspot using WPA2 - machineMixedUsingWpa2 = machineWithHostapd { - networking.wireless = { - fallbackToWPA2 = true; - networks.nixos-test-mixed = { - psk = "@PSK_NIXOS_TEST@"; - authProtocols = [ "WPA-PSK-SHA256" ]; - }; - }; - }; - - # Test connecting to the WPA2 legacy hotspot using WPA2 - machineWpa2 = machineWithHostapd { - networking.wireless = { - fallbackToWPA2 = true; - networks.nixos-test-wpa2 = { - psk = "@PSK_NIXOS_TEST@"; - authProtocols = [ "WPA-PSK-SHA256" ]; - }; - }; - }; - }; - - testScript = - '' - config_file = "/run/wpa_supplicant/wpa_supplicant.conf" - - with subtest("Configuration file is inaccessible to other users"): - basic.wait_for_file(config_file) - basic.fail(f"sudo -u nobody ls {config_file}") - - with subtest("Secrets variables have been substituted"): - basic.fail(f"grep -q @PSK_VALID@ {config_file}") - basic.fail(f"grep -q @PSK_SPECIAL@ {config_file}") - basic.succeed(f"grep -q @PSK_MISSING@ {config_file}") - basic.succeed(f"grep -q P@ssowrdWithSome@tSymbol {config_file}") - basic.succeed(f"grep -q 'PassowrdWith&symbol' {config_file}") - - with subtest("WPA2 fallbacks have been generated"): - assert int(basic.succeed(f"grep -c sae-only {config_file}")) == 1 - assert int(basic.succeed(f"grep -c mixed-wpa {config_file}")) == 2 - - # save file for manual inspection - basic.copy_from_vm(config_file) - + testScript = '' with subtest("Daemon is running and accepting connections"): - basic.wait_for_unit("wpa_supplicant-wlan1.service") - status = basic.succeed("wpa_cli -i wlan1 status") + machine.wait_for_unit("wpa_supplicant-wlan1.service") + status = machine.wait_until_succeeds("wpa_cli -i wlan1 status") assert "Failed to connect" not in status, \ "Failed to connect to the daemon" with subtest("Daemon can be configured imperatively"): - imperative.wait_for_unit("wpa_supplicant-wlan1.service") - imperative.wait_until_succeeds("wpa_cli -i wlan1 status") - imperative.succeed("wpa_cli -i wlan1 add_network") - imperative.succeed("wpa_cli -i wlan1 set_network 0 ssid '\"nixos-test\"'") - imperative.succeed("wpa_cli -i wlan1 set_network 0 psk '\"reproducibility\"'") - imperative.succeed("wpa_cli -i wlan1 save_config") - imperative.succeed("grep -q nixos-test /etc/wpa_supplicant.conf") - - machineSae.wait_for_unit("hostapd.service") - machineSae.copy_from_vm("/run/hostapd/wlan0.hostapd.conf") - with subtest("Daemon can connect to the SAE access point using SAE"): - machineSae.wait_until_succeeds( - "wpa_cli -i wlan1 status | grep -q wpa_state=COMPLETED" - ) + machine.succeed("wpa_cli -i wlan1 add_network") + machine.succeed("wpa_cli -i wlan1 set_network 0 ssid '\"nixos-test\"'") + machine.succeed("wpa_cli -i wlan1 set_network 0 psk '\"reproducibility\"'") + machine.succeed("wpa_cli -i wlan1 save_config") + machine.succeed("grep -q nixos-test /etc/wpa_supplicant.conf") + ''; + }; - with subtest("Daemon can connect to the SAE and WPA2 mixed access point using SAE"): - machineMixedUsingSae.wait_until_succeeds( - "wpa_cli -i wlan1 status | grep -q wpa_state=COMPLETED" - ) + # Test connecting to a SAE-only hotspot using SAE + saeOnly = runConnectionTest "sae-only" { + fallbackToWPA2 = false; + networks.nixos-test-sae = { + pskRaw = "ext:psk_nixos_test"; + authProtocols = [ "SAE" ]; + }; + }; - with subtest("Daemon can connect to the SAE and WPA2 mixed access point using WPA2"): - machineMixedUsingWpa2.wait_until_succeeds( - "wpa_cli -i wlan1 status | grep -q wpa_state=COMPLETED" - ) + # Test connecting to a mixed SAE/WPA2 hotspot using SAE + mixedUsingSae = runConnectionTest "mixed-using-sae" { + fallbackToWPA2 = false; + networks.nixos-test-mixed = { + pskRaw = "ext:psk_nixos_test"; + authProtocols = [ "SAE" ]; + }; + }; - with subtest("Daemon can connect to the WPA2 access point using WPA2"): - machineWpa2.wait_until_succeeds( - "wpa_cli -i wlan1 status | grep -q wpa_state=COMPLETED" - ) - ''; -}) + # Test connecting to a mixed SAE/WPA2 hotspot using WPA2 + mixedUsingWpa2 = runConnectionTest "mixed-using-wpa2" { + fallbackToWPA2 = true; + networks.nixos-test-mixed = { + pskRaw = "ext:psk_nixos_test"; + authProtocols = [ "WPA-PSK-SHA256" ]; + }; + }; + + # Test connecting to a legacy WPA2-only hotspot using WPA2 + legacy = runConnectionTest "legacy" { + fallbackToWPA2 = true; + networks.nixos-test-wpa2 = { + pskRaw = "ext:psk_nixos_test"; + authProtocols = [ "WPA-PSK-SHA256" ]; + }; + }; +} diff --git a/nixos/tests/wstunnel.nix b/nixos/tests/wstunnel.nix index 7a0a8ce3496ad..753f78061e7bc 100644 --- a/nixos/tests/wstunnel.nix +++ b/nixos/tests/wstunnel.nix @@ -1,3 +1,5 @@ +{ lib, ... }: + let certs = import ./common/acme/server/snakeoil-certs.nix; domain = certs.domain; @@ -6,6 +8,8 @@ in { name = "wstunnel"; + meta.platforms = lib.platforms.linux; + nodes = { server = { virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index d97f07d752712..1cef8daf3d49f 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -19,9 +19,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { services.xserver.desktopManager.xfce.enable = true; environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ]; - - hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then - }; enableOCR = true; diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 851fced2c5e1e..13db2c8e06be6 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -45,13 +45,13 @@ let specialisation.samba.configuration = { services.samba = { enable = true; - extraConfig = '' - registry shares = yes - usershare path = ${usersharePath} - usershare allow guests = yes - usershare max shares = 100 - usershare owner only = no - ''; + settings.global = { + "registry shares" = true; + "usershare path" = "${usersharePath}"; + "usershare allow guests" = true; + "usershare max shares" = "100"; + "usershare owner only" = false; + }; }; systemd.services.samba-smbd.serviceConfig.ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m +t -p ${usersharePath}"; @@ -204,17 +204,17 @@ in { unstable = makeZfsTest rec { zfsPackage = pkgs.zfs_unstable; - kernelPackages = zfsPackage.latestCompatibleLinuxPackages; + kernelPackages = pkgs.linuxPackages; }; unstableWithSystemdStage1 = makeZfsTest rec { zfsPackage = pkgs.zfs_unstable; - kernelPackages = zfsPackage.latestCompatibleLinuxPackages; + kernelPackages = pkgs.linuxPackages; enableSystemdStage1 = true; }; - installerBoot = (import ./installer.nix { }).separateBootZfs; - installer = (import ./installer.nix { }).zfsroot; + installerBoot = (import ./installer.nix { inherit system; }).separateBootZfs; + installer = (import ./installer.nix { inherit system; }).zfsroot; expand-partitions = makeTest { name = "multi-disk-zfs"; diff --git a/nixos/tests/zigbee2mqtt.nix b/nixos/tests/zigbee2mqtt.nix index 9d6d03a4b9bbe..3311bb11eb1a2 100644 --- a/nixos/tests/zigbee2mqtt.nix +++ b/nixos/tests/zigbee2mqtt.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: machine.wait_for_unit("multi-user.target") machine.wait_until_fails("systemctl status zigbee2mqtt.service") machine.succeed( - "journalctl -eu zigbee2mqtt | grep 'Failed to connect to the adapter'" + "journalctl -eu zigbee2mqtt | grep 'Error: Inappropriate ioctl for device, cannot set'" ) machine.log(machine.succeed("systemd-analyze security zigbee2mqtt.service")) diff --git a/pkgs/README.md b/pkgs/README.md index ab7cfd897f13e..1e565f1b587b8 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -327,43 +327,71 @@ A (typically large) program with a distinct user interface, primarily used inter # Conventions -## Package naming - The key words _must_, _must not_, _required_, _shall_, _shall not_, _should_, _should not_, _recommended_, _may_, and _optional_ in this section are to be interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). Only _emphasized_ words are to be interpreted in this way. +## Package naming + In Nixpkgs, there are generally three different names associated with a package: - The `pname` attribute of the derivation. This is what most users see, in particular when using `nix-env`. -- The variable name used for the instantiated package in `all-packages.nix`, and when passing it as a dependency to other functions. Typically this is called the _package attribute name_. This is what Nix expression authors see. It can also be used when installing using `nix-env -iA`. +- The attribute name used for the package in the [`pkgs/by-name` structure](./pkgs/by-name/README.md) or in [`all-packages.nix`](./pkgs/top-level/all-packages.nix), and when passing it as a dependency in recipes. - The filename for (the directory containing) the Nix expression. -Most of the time, these are the same. For instance, the package `e2fsprogs` has a `pname` attribute `"e2fsprogs"`, is bound to the variable name `e2fsprogs` in `all-packages.nix`, and the Nix expression is in `pkgs/os-specific/linux/e2fsprogs/default.nix`. +Most of the time, these are the same. For instance, the package `e2fsprogs` has a `pname` attribute `"e2fsprogs"`, is bound to the attribute name `e2fsprogs` in `all-packages.nix`, and the Nix expression is in `pkgs/os-specific/linux/e2fsprogs/default.nix`. -There are a few naming guidelines: +Follow these guidelines: -- The `pname` attribute _should_ be identical to the upstream package name. +- For the `pname` attribute: -- The `pname` and the `version` attribute _must not_ contain uppercase letters — e.g., `"mplayer"` instead of `"MPlayer"`. + - It _should_ be identical to the upstream package name. -- The `version` attribute _must_ start with a digit e.g., `"0.3.1rc2"` or `"0-unstable-1970-01-01"`. + - It _must not_ contain uppercase letters. -- If a package is a commit from a repository without a version assigned, then the `version` attribute _should_ be the latest upstream version preceding that commit, followed by `-unstable-` and the date of the (fetched) commit. The date _must_ be in `"YYYY-MM-DD"` format. + Example: Use `"mplayer"` instead of `"MPlayer"` + +- For the package attribute name: + + - It _must_ be a valid identifier in Nix. + + - If the `pname` starts with a digit, the attribute name _should_ be prefixed with an underscore. Otherwise the attribute name _should not_ be prefixed with an underline. + + Example: The corresponding attribute name for `0ad` should be `_0ad`. + + - New attribute names _should_ be the same as the value in `pname`. -Example: Given a project had its latest releases `2.2` in November 2021, and `3.0` in January 2022, a commit authored on March 15, 2022 for an upcoming bugfix release `2.2.1` would have `version = "2.2-unstable-2022-03-15"`. + Hyphenated names _should not_ be converted to [snake case](https://en.wikipedia.org/wiki/Snake_case) or [camel case](https://en.wikipedia.org/wiki/Camel_case). + This was done historically, but is not necessary any more. + [The Nix language allows dashes in identifiers since 2012](https://github.com/NixOS/nix/commit/95c74eae269b2b9e4bc514581b5caa1d80b54acc). -- If a project has no suitable preceding releases - e.g., no versions at all, or an incompatible versioning / tagging schema - then the latest upstream version in the above schema should be `0`. + - If there are multiple versions of a package, this _should_ be reflected in the attribute names in `all-packages.nix`. -Example: Given a project that has no tags / released versions at all, or applies versionless tags like `latest` or `YYYY-MM-DD-Build`, a commit authored on March 15, 2022 would have `version = "0-unstable-2022-03-15"`. + Example: `json-c_0_9` and `json-c_0_11` -- Dashes in the package `pname` _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names. + If there is an obvious “default” version, make an extra attribute. -- If there are multiple versions of a package, this _should_ be reflected in the variable names in `all-packages.nix`, e.g. `json-c_0_9` and `json-c_0_11`. If there is an obvious “default” version, make an attribute like `json-c = json-c_0_9;`. See also [versioning][versioning]. + Example: `json-c = json-c_0_9;` + + See also [versioning][versioning]. ## Versioning [versioning]: #versioning +These are the guidelines the `version` attribute of a package: + +- It _must_ start with a digit. This is required for backwards-compatibility with [how `nix-env` parses derivation names](https://nix.dev/manual/nix/latest/command-ref/nix-env#selectors). + + Example: `"0.3.1rc2"` or `"0-unstable-1970-01-01"` + +- If a package is a commit from a repository without a version assigned, then the `version` attribute _should_ be the latest upstream version preceding that commit, followed by `-unstable-` and the date of the (fetched) commit. The date _must_ be in `"YYYY-MM-DD"` format. + + Example: Given a project had its latest releases `2.2` in November 2021 and `3.0` in January 2022, a commit authored on March 15, 2022 for an upcoming bugfix release `2.2.1` would have `version = "2.2-unstable-2022-03-15"`. + +- If a project has no suitable preceding releases - e.g., no versions at all, or an incompatible versioning or tagging scheme - then the latest upstream version in the above schema should be `0`. + + Example: Given a project that has no tags or released versions at all, or applies versionless tags like `latest` or `YYYY-MM-DD-Build`, a commit authored on March 15, 2022 would have `version = "0-unstable-2022-03-15"`. + Because every version of a package in Nixpkgs creates a potential maintenance burden, old versions of a package should not be kept unless there is a good reason to do so. For instance, Nixpkgs contains several versions of GCC because other packages don’t build with the latest version of GCC. Other examples are having both the latest stable and latest pre-release version of a package, or to keep several major releases of an application that differ significantly in functionality. If there is only one version of a package, its Nix expression should be named (e.g) `pkgs/by-name/xy/xyz/package.nix`. If there are multiple versions, this should be reflected in the attribute name. If you wish to share code between the Nix expressions of each version, you cannot rely upon `pkgs/by-name`'s automatic attribute creation, and must create the attributes yourself in `all-packages.nix`. See also [`pkgs/by-name/README.md`'s section on this topic](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/README.md#recommendation-for-new-packages-with-multiple-versions). @@ -689,7 +717,7 @@ Here are examples of package tests: - [Lobster compile test](development/compilers/lobster/test-can-run-hello-world.nix) - [Spacy annotation test](development/python-modules/spacy/annotation-test/default.nix) - [Libtorch test](development/libraries/science/math/libtorch/test/default.nix) -- [Multiple tests for nanopb](development/libraries/nanopb/default.nix) +- [Multiple tests for nanopb](./by-name/na/nanopb/package.nix) ### Linking NixOS module tests to a package @@ -717,7 +745,7 @@ stdenv.mkDerivation { Nixpkgs periodically tries to update all packages that have a `passthru.updateScript` attribute. > [!Note] -> A common pattern is to use the [`nix-update-script`](../pkgs/common-updater/nix-update.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) attribute provided in Nixpkgs, which runs [`nix-update`](https://github.com/Mic92/nix-update): > > ```nix > { stdenv, nix-update-script }: @@ -727,7 +755,7 @@ 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://ryantm.github.io/nixpkgs-update) when a new version is released. +> 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). diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix deleted file mode 100644 index 8ec6c3e6b1ab7..0000000000000 --- a/pkgs/applications/audio/amberol/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, rustPlatform -, cargo -, desktop-file-utils -, appstream-glib -, meson -, ninja -, pkg-config -, reuse -, rustc -, m4 -, wrapGAppsHook4 -, glib -, gtk4 -, gst_all_1 -, libadwaita -, dbus -}: - -stdenv.mkDerivation rec { - pname = "amberol"; - version = "0.10.3"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "World"; - repo = pname; - rev = version; - hash = "sha256-nAoUO0bGToNGD2W8qJmTegrETOJDdM04hI1jjiYkZXI="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-4ZoliqQ665KPDFl+1eBCE+1fZgr+FA7vesPstoRs0RU="; - }; - - postPatch = '' - patchShebangs build-aux - ''; - - nativeBuildInputs = [ - appstream-glib - desktop-file-utils - meson - ninja - pkg-config - reuse - m4 - wrapGAppsHook4 - rustPlatform.cargoSetupHook - cargo - rustc - ]; - - buildInputs = [ - glib - gtk4 - libadwaita - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav - dbus - ]; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/World/amberol"; - description = "Small and simple sound and music player"; - maintainers = with maintainers; [ linsui ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - mainProgram = "amberol"; - }; -} diff --git a/pkgs/applications/audio/ardour/default-plugin-search-paths.patch b/pkgs/applications/audio/ardour/default-plugin-search-paths.patch index 8cd3118b95733..68d67ce8b9bcb 100644 --- a/pkgs/applications/audio/ardour/default-plugin-search-paths.patch +++ b/pkgs/applications/audio/ardour/default-plugin-search-paths.patch @@ -21,7 +21,7 @@ index a572ed55dd..3dd6c2fda6 100644 lxvst_path = "/usr/local/lib64/lxvst:/usr/local/lib/lxvst:/usr/lib64/lxvst:/usr/lib/lxvst:" "/usr/local/lib64/linux_vst:/usr/local/lib/linux_vst:/usr/lib64/linux_vst:/usr/lib/linux_vst:" - "/usr/lib/vst:/usr/local/lib/vst"; -+ "/usr/lib/vst:/usr/local/lib/vst:" ++ "/usr/lib/vst:/usr/local/lib/vst:$HOME/.nix-profile/lib/vst:" + "$HOME/.lxvst:$HOME/.nix-profile/lib/lxvst:/run/current-system/sw/lib/lxvst:/etc/profiles/per-user/$USER/lib/lxvst"; } diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index f34ff19ea04ce..2231031d04816 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { taglib ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/ario/plugins/*.dylib; do ln -s $file $out/lib/ario/plugins/$(basename $file .dylib).so done diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index 8318a4936ed94..45daafa88d791 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ cmake pkg-config meson ninja ]; buildInputs = [ libmpdclient yaml-cpp ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ]; diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/applications/audio/aucatctl/default.nix index b5d52dce18560..051a1494fd9f5 100644 --- a/pkgs/applications/audio/aucatctl/default.nix +++ b/pkgs/applications/audio/aucatctl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ sndio ] - ++ lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isBSD) + ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isBSD) libbsd; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' makeFlagsArray+=("PREFIX=$out") '' + lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isBSD) '' + (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isBSD) '' makeFlagsArray+=(LDADD="-lsndio -lbsd") # Fix warning about implicit declaration of function 'strlcpy' diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index cfb296ccff608..00764831c2dec 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "audacious"; - version = "4.4"; + version = "4.4.1"; src = fetchFromGitHub { owner = "audacious-media-player"; repo = "audacious"; rev = "${pname}-${version}"; - hash = "sha256-qAJztvNI3uGmQfECJJ7tJ/xLLgMU5OiW0O3ZSJhvt0k="; + hash = "sha256-Bz/OI38+IFTHlBH3p2NTzSj8YD/7Xd4JeWpHgCSpMXw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix index b313bc04782ef..429d0bce74c3b 100644 --- a/pkgs/applications/audio/audacious/plugins.nix +++ b/pkgs/applications/audio/audacious/plugins.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation rec { pname = "audacious-plugins"; - version = "4.4"; + version = "4.4.1"; src = fetchFromGitHub { owner = "audacious-media-player"; repo = "audacious-plugins"; rev = "${pname}-${version}"; - hash = "sha256-J9jgBl8J4W9Yvrlg1KlzYgGTmdxUZM9L11rCftKFSlE="; + hash = "sha256-F2kcGc6VCaBsL5Zx7qtZjPvqzaxmR87Q9LTFEU+nqmo="; }; patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ]; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index bdedb3b9579b1..85ceb93f48fe1 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -62,23 +62,23 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.6.1"; + version = "3.6.4"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-MZ/u4wUUhDo1Mm9jxOY4MtzeV2797meT4HjYi5bCSM0="; + hash = "sha256-72k79UFxhk8JUCnMzbU9lZ0Ua3Ui41EkhPGSnGkf9mE="; }; postPatch = '' mkdir src/private substituteInPlace scripts/build/macOS/fix_bundle.py \ --replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h - '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm ''; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { python3 makeWrapper wrapGAppsHook3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ linuxHeaders ]; @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { portaudio wavpack wxGTK32 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # for portaudio at-spi2-core dbus @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { libsepol libuuid util-linux - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreAudioKit # for portaudio libpng @@ -176,13 +176,13 @@ stdenv.mkDerivation rec { # Replace audacity's wrapper, to: # - put it in the right place, it shouldn't be in "$out/audacity" # - Add the ffmpeg dynamic dependency - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram "$out/bin/audacity" \ "''${gappsWrapperArgs[@]}" \ --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_7 ]} \ --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ --suffix AUDACITY_PATH : "$out/share/audacity" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/Audacity.app $out/Applications/ makeWrapper $out/Applications/Audacity.app/Contents/MacOS/Audacity $out/bin/audacity diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix deleted file mode 100644 index ef0560fdc2ad1..0000000000000 --- a/pkgs/applications/audio/aumix/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, gettext -, ncurses -, gtkGUI ? false -, pkg-config -, gtk2 -}: - -stdenv.mkDerivation rec { - pname = "aumix"; - version = "2.9.1"; - - src = fetchurl { - url = "http://www.jpj.net/~trevor/aumix/releases/aumix-${version}.tar.bz2"; - sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj"; - }; - - patches = [ - # Pull Gentoo fix for -fno-common toolchains. Upstream does not - # seem to have the contacts - (fetchpatch { - name = "fno-common.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/aumix/files/aumix-2.9.1-fno-common.patch?id=496c9ec7355f06f6d1d19be780a6981503e6df1f"; - sha256 = "0qwylhx1hawsmx1pc7ykrjq9phksc73dq9rss6ggq15n3ggnc95y"; - }) - ]; - - nativeBuildInputs = lib.optionals gtkGUI [ pkg-config ]; - - buildInputs = [ gettext ncurses ] - ++ lib.optionals gtkGUI [ gtk2 ]; - - configureFlags = lib.optionals (!gtkGUI) ["--without-gtk"]; - - meta = with lib; { - description = "Audio mixer for X and the console"; - longDescription = '' - Aumix adjusts an audio mixer from X, the console, a terminal, - the command line or a script. - ''; - homepage = "http://www.jpj.net/~trevor/aumix.html"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 4aab7dface2a0..841570a619190 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.2"; + version = "5.2.4"; src = fetchurl { url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/"; - hash = "sha256:0cnjwgjbpyrb4pd0841zbhy84ps7gkmq3j148ga826nrxnw082pi"; + hash = "sha256-/JEJthaFSdad5Hj5sdBQLLyDdp2Rp4ZAlhIA+RgwXRw="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ]; diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 654d22233a3b4..74c7708a05880 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "24.05"; + version = "24.09"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - hash = "sha256-ZUJI5utUtST+idlL7WKBIs850EpK98cnmO47g8/iZcI="; + hash = "sha256-vJxKtZ0rVjf0RJfTNRxpzps1F2k0hHuiPnd1OwpULhQ="; }; prePatch = '' @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { mainProgram = "Cardinal"; platforms = lib.platforms.all; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 51f8144ae5c25..68016e4a16bee 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -26,13 +26,13 @@ assert withQt -> wrapQtAppsHook != null; stdenv.mkDerivation (finalAttrs: { pname = "carla"; - version = "2.5.8"; + version = "2.5.9"; src = fetchFromGitHub { owner = "falkTX"; repo = "carla"; rev = "v${finalAttrs.version}"; - hash = "sha256-H15T/z/IRfgWdqToTzq2eJ7q3n9Kj44IZXsd4uaipuU="; + hash = "sha256-FM/6TtNhDml1V9C5VisjLcZ3CzXsuwCZrsoz4yP3kI8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index e13a64e4bd839..a30ebc8fbe394 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; buildInputs = [] - ++ lib.optional stdenv.isDarwin IOKit; + ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; meta = with lib; { homepage = "http://linukz.org/cd-discid.shtml"; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 4c861a177846d..bdeb8eec896d7 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; sha256 = "0hq3lvfr0h1m3p0r33jij0s1aspiqlpy533rwv19zrfllb39qvr8"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Carbon IOKit ]; diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 6b975b3c6b957..db42e60730eab 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -12,16 +12,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ flex bison which ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools xcbuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools xcbuild ]; buildInputs = [ libsndfile ] - ++ lib.optional (!stdenv.isDarwin) alsa-lib - ++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport ]; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport ]; patches = [ ./darwin-limits.patch ]; makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ]; - buildFlags = [ (if stdenv.isDarwin then "mac" else "linux-alsa") ]; + buildFlags = [ (if stdenv.hostPlatform.isDarwin then "mac" else "linux-alsa") ]; meta = with lib; { description = "Programming language for real-time sound synthesis and music creation"; diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/applications/audio/cider/default.nix index 21dd14ddc7ce5..48289d6d37d39 100644 --- a/pkgs/applications/audio/cider/default.nix +++ b/pkgs/applications/audio/cider/default.nix @@ -9,10 +9,11 @@ appimageTools.wrapType2 rec { sha256 = "sha256-NwoV1eeAN0u9VXWpu5mANXhmgqe8u3h7BlsREP1f/pI="; }; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 75394a4afcfdc..c0f7c3cbc82a8 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -47,15 +47,16 @@ let withMTP = config.clementine.mtp or true; withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; -in mkDerivation { +in +mkDerivation { pname = "clementine"; - version = "unstable-2022-04-11"; + version = "1.4.rc2-unstable-2024-05-12"; src = fetchFromGitHub { owner = "clementine-player"; repo = "Clementine"; - rev = "250024e117fbe5fae7c62b9c8e655d66412a6ed7"; - sha256 = "06fcbs3wig3mh711iypyj49qm5246f7qhvgvv8brqfrd8cqyh6qf"; + rev = "7607ddcb96e79d373c4b60d9de21f3315719c7d8"; + sha256 = "sha256-yOG/Je6N8YEsu5AOtxOFgDl3iqb97assYMZYMSwQqqk="; }; nativeBuildInputs = [ @@ -117,6 +118,7 @@ in mkDerivation { ''; cmakeFlags = [ + "-DFORCE_GIT_REVISION=1.3.1" "-DUSE_SYSTEM_PROJECTM=ON" "-DSPOTIFY_BLOB=OFF" ]; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index db32f8548517b..bef7d46a53e41 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,15 +1,15 @@ { config, lib, stdenv, fetchFromGitHub, ncurses, pkg-config , libiconv, CoreAudio, AudioUnit, VideoToolbox -, alsaSupport ? stdenv.isLinux, alsa-lib ? null +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib ? null # simple fallback for everyone else -, aoSupport ? !stdenv.isLinux, libao ? null +, aoSupport ? !stdenv.hostPlatform.isLinux, libao ? null , jackSupport ? false, libjack ? null , samplerateSupport ? jackSupport, libsamplerate ? null , ossSupport ? false, alsa-oss ? null , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null , sndioSupport ? false, sndio ? null -, mprisSupport ? stdenv.isLinux, systemd ? null +, mprisSupport ? stdenv.hostPlatform.isLinux, systemd ? null # TODO: add these #, artsSupport @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] - ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] ++ lib.flatten (lib.concatMap (a: a.deps) opts); prefixKey = "prefix="; diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 5d3a62bd2a562..117356bf948e7 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, libnotify -, gdk-pixbuf, libnotifySupport ? stdenv.isLinux, debug ? false }: +, gdk-pixbuf, libnotifySupport ? stdenv.hostPlatform.isLinux, debug ? false }: stdenv.mkDerivation rec { pname = "cmusfm"; diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index 6777893460877..22ebd11c77253 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -24,6 +24,14 @@ python3Packages.buildPythonApplication rec { hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw"; }; + # FIX: The "Support Debian non-standard python paths" resolves to store path of python + postPatch = '' + substituteInPlace meson.build \ + --replace-fail \ + 'from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix=""))' \ + "print(\"$out/${python3Packages.python.sitePackages}\")" + ''; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index c2c9432eaeb0b..a747cb2e14d74 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "csound-qt"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "CsoundQt"; repo = "CsoundQt"; rev = "v${version}"; - hash = "sha256-PdylVOnunbB36dbZX/wzd9A8CJPDv/xH5HPLAUkRu28="; + hash = "sha256-ufjZQnO3H5pwdeEwGqunbXCfx7nvWTzak4cwVYWqvz4="; }; patches = [ diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index ccaacf189faea..c6359103593ff 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -31,21 +31,21 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp - ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib" + ++ lib.optional stdenv.hostPlatform.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib" # Ignore gettext in CMAKE_PREFIX_PATH on cross to prevent find_program picking up the wrong gettext ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin"; nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate AudioUnit CoreAudio CoreMIDI portaudio - ] ++ lib.optionals stdenv.isLinux (builtins.filter (optional: optional != null) [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux (builtins.filter (optional: optional != null) [ alsa-lib libpulseaudio libjack2 liblo ladspa-sdk fluidsynth eigen curl tcltk fltk ]); - postInstall = lib.optional stdenv.isDarwin '' + postInstall = lib.optional stdenv.hostPlatform.isDarwin '' mkdir -p $out/Library/Frameworks ln -s $out/lib/CsoundLib64.framework $out/Library/Frameworks ''; diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/applications/audio/eartag/default.nix index 11bd27953f12d..d3df0295802c6 100644 --- a/pkgs/applications/audio/eartag/default.nix +++ b/pkgs/applications/audio/eartag/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { gobject-introspection wrapGAppsHook4 blueprint-compiler - ] ++ lib.optional stdenv.isDarwin gtk4; # for gtk4-update-icon-cache + ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk4; # for gtk4-update-icon-cache buildInputs = [ librsvg diff --git a/pkgs/applications/audio/easyaudiosync/default.nix b/pkgs/applications/audio/easyaudiosync/default.nix index 0b910dfb573b8..38fe6b15d9378 100644 --- a/pkgs/applications/audio/easyaudiosync/default.nix +++ b/pkgs/applications/audio/easyaudiosync/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cmake pkg-config wrapQtAppsHook - ] ++ lib.optional stdenv.isLinux copyDesktopItems; + ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ qtbase @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv "easyaudiosync.app" "Easy Audio Sync.app" cp -r "Easy Audio Sync.app" $out/Applications - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm755 easyaudiosync $out/bin/easyaudiosync for RES in 48 64 128 256; do diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix deleted file mode 100644 index 4808f94882694..0000000000000 --- a/pkgs/applications/audio/eflite/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, flite, alsa-lib, debug ? false }: - -stdenv.mkDerivation rec { - pname = "eflite"; - version = "0.4.1"; - - src = fetchurl { - url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${pname}-${version}.tar.gz"; - sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci"; - }; - - buildInputs = [ flite alsa-lib ]; - - configureFlags = [ - "flite_dir=${flite}" - "--with-audio=alsa" - "--with-vox=cmu_us_kal16" - ]; - - patches = [ - (fetchpatch { - url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/cvs-update"; - sha256 = "0r631vzmky7b7qyhm152557y4fr0xqrpi3y4w66fcn6p4rj03j05"; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/buf-overflow"; - sha256 = "071qk133kb7n7bq6kxgh3p9bba6hcl1ixsn4lx8vp8klijgrvkmx"; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/link"; - sha256 = "0p833dp4pdsya72bwh3syvkq85927pm6snxvx13lvcppisbhj0fc"; - }) - ./format.patch - ]; - - CFLAGS = lib.optionalString debug " -DDEBUG=2"; - - meta = { - homepage = "https://eflite.sourceforge.net"; - description = "Speech server for screen readers"; - longDescription = '' - EFlite is a speech server for Emacspeak and other screen - readers that allows them to interface with Festival Lite, - a free text-to-speech engine developed at the CMU Speech - Center as an off-shoot of Festival. - ''; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = [ ]; - mainProgram = "eflite"; - }; -} diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix deleted file mode 100644 index c0cde8aaf9a1e..0000000000000 --- a/pkgs/applications/audio/ekho/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, autoconf -, automake -, libtool -, libsndfile -, libpulseaudio -, espeak-ng -, sonic -, utf8cpp -, AudioUnit -}: - -stdenv.mkDerivation rec { - pname = "ekho"; - version = "9.0"; - - src = fetchFromGitHub { - owner = "hgneng"; - repo = "ekho"; - rev = "v${version}"; - hash = "sha256-VYN9tR3BJXd3UA0V5vqQJNItJe1e1knZ+S7tLeaeYYk="; - }; - - preConfigure = '' - ./autogen.sh - ''; - - CXXFLAGS = [ - "-O0" - "-I${lib.getDev utf8cpp}/include/utf8cpp" - ]; - - nativeBuildInputs = [ pkg-config autoconf automake libtool ]; - - buildInputs = [ libsndfile libpulseaudio espeak-ng sonic utf8cpp ] - ++ lib.optionals stdenv.isDarwin [ AudioUnit ]; - - meta = with lib; { - description = "Chinese text-to-speech software"; - homepage = "http://www.eguidedog.net/ekho.php"; - longDescription = '' - Ekho (余音) is a free, open source and multilingual text-to-speech (TTS) - software. It supports Cantonese (Chinese dialect spoken in Hong Kong and - part of Guangdong province), Mandarin (standard Chinese), Zhaoan Hakka - (a dialect in Taiwan), Tibetan, Ngangien (an ancient Chinese before - Yuan Dynasty) and Korean (in trial). - ''; - license = licenses.gpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ aaronjheng ]; - }; -} diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 84c8333d18575..5be1594343545 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "LV2 EQ plugins and more, with 64 bit processing"; longDescription = '' Up to 10-Bands parametric equalizer with mono and stereo versions. diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index f0aebf4e4a32a..7eabadec04c22 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional mbrolaSupport mbrola ++ lib.optional pcaudiolibSupport pcaudiolib ++ lib.optional sonicSupport sonic - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio AudioToolbox AudioUnit @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # touch ChangeLog to avoid below error on darwin: # Makefile.am: error: required file './ChangeLog.md' not found - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' touch ChangeLog '' + '' ./autogen.sh @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { --replace '../src/espeak-ng --compile' "${lib.getExe buildPackages.espeak-ng} --compile" ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng wrapProgram $out/bin/espeak-ng \ --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index 8b00ca2252a69..1b7372d5d904c 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.74.6"; + version = "2.75.7"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-2qgw7pauDZBvEb5iySNiq2Fq+T+qw+AjVTwxaSQ9Eko="; + sha256 = "sha256-j5Qg/H7aMBZ6A8gh6v6+ICxmCZ7ya2tVF2FjueVtvHo="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index ff81d76892275..d02f87642f3fb 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; buildInputs = [ glib libsndfile libjack2 ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] - ++ lib.optionals stdenv.isDarwin [ AppKit AudioUnit CoreAudio CoreMIDI CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit AudioUnit CoreAudio CoreMIDI CoreServices ]; cmakeFlags = [ "-Denable-framework=off" diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index fdcf944220488..c22fe3ab0977a 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -36,17 +36,6 @@ mkDerivation rec { PREFIXSHORTCUT=$out" ''; - postInstall = '' - mkdir -p $out/share/applications - ln -s $out/fmit.desktop $out/share/applications/fmit.desktop - - mkdir -p $out/share/icons/hicolor/128x128/apps - ln -s $out/fmit.png $out/share/icons/hicolor/128x128/apps/fmit.png - - mkdir -p $out/share/icons/hicolor/scalable/apps - ln -s $out/fmit.svg $out/share/icons/hicolor/scalable/apps/fmit.svg - ''; - meta = with lib; { description = "Free Musical Instrument Tuner"; longDescription = '' @@ -55,6 +44,7 @@ mkDerivation rec { ''; homepage = "http://gillesdegottex.github.io/fmit/"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index aac0eacad0d45..84de0229497d2 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,19 +13,19 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.84"; + version = "1.86"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-RPrNpm+0N//CpVtG6cJD+m+0G6ca75hZwdEdHsGadEg="; + hash = "sha256-/sdMBRCZvuKTp8ygCrLmIy0DiWJC6lLWdsY+ZxRY+pY="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] - ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreAudio CoreMIDI diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/applications/audio/galaxy-buds-client/default.nix index 6dd2256d7c8a4..a1ac12d00757a 100644 --- a/pkgs/applications/audio/galaxy-buds-client/default.nix +++ b/pkgs/applications/audio/galaxy-buds-client/default.nix @@ -44,17 +44,19 @@ buildDotnetModule rec { gm convert $src/GalaxyBudsClient/Resources/icon_white.ico $out/share/icons/hicolor/256x256/apps/${meta.mainProgram}.png ''; - desktopItems = makeDesktopItem { - name = meta.mainProgram; - exec = meta.mainProgram; - icon = meta.mainProgram; - desktopName = meta.mainProgram; - genericName = "Galaxy Buds Client"; - comment = meta.description; - type = "Application"; - categories = [ "Settings" ]; - startupNotify = true; - }; + desktopItems = [ + (makeDesktopItem { + name = meta.mainProgram; + exec = meta.mainProgram; + icon = meta.mainProgram; + desktopName = meta.mainProgram; + genericName = "Galaxy Buds Client"; + comment = meta.description; + type = "Application"; + categories = [ "Settings" ]; + startupNotify = true; + }) + ]; meta = with lib; { mainProgram = "GalaxyBudsClient"; diff --git a/pkgs/applications/audio/glicol-cli/default.nix b/pkgs/applications/audio/glicol-cli/default.nix index b549b6ac4fbec..8279bfc6b30db 100644 --- a/pkgs/applications/audio/glicol-cli/default.nix +++ b/pkgs/applications/audio/glicol-cli/default.nix @@ -25,9 +25,9 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix deleted file mode 100644 index e3f5f4580d6fa..0000000000000 --- a/pkgs/applications/audio/gmpc/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libtool -, intltool -, pkg-config -, glib -, gtk2 -, curl -, libmpdclient -, libsoup -, gob2 -, vala -, libunique -, libSM -, libICE -, sqlite -, hicolor-icon-theme -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "gmpc"; - version = "11.8.16"; - - libmpd = stdenv.mkDerivation { - pname = "libmpd"; - version = "11.8.17"; - src = fetchurl { - url = "https://download.sarine.nl/Programs/gmpc/${lib.versions.majorMinor version}/libmpd-${version}.tar.gz"; - sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; - }; - patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ]; - }; - - src = fetchurl { - url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz"; - sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; - }; - - nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook3 ]; - buildInputs = [ - glib - gtk2 - curl - libmpdclient - libsoup - libunique - libmpd - libSM - libICE - sqlite - hicolor-icon-theme - ]; - - meta = with lib; { - homepage = "https://gmpclient.org"; - description = "GTK2 frontend for Music Player Daemon"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} -# TODO: what is this libmpd derivation embedded above? diff --git a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch b/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch deleted file mode 100644 index ad4fdc02ef3e1..0000000000000 --- a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/libmpd-internal.h b/src/libmpd-internal.h -index c84c3a4..51be441 100644 ---- a/src/libmpd-internal.h -+++ b/src/libmpd-internal.h -@@ -206,10 +206,6 @@ int mpd_unlock_conn(MpdObj *mi); - MpdData * mpd_misc_sort_tag_list(MpdData *data); - - --#ifndef HAVE_STRNDUP --char * strndup (const char *s, size_t n); --#endif -- - int mpd_server_get_allowed_commands(MpdObj *mi); - typedef enum _MpdSearchType { - MPD_SEARCH_TYPE_NONE, diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index f5e53a1c7c66a..5625f15e3a232 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit pname version src; + inherit src; hash = "sha256-XTfKqKs7874ak7Lzscxw8E2qcnJOWMZaaol8TpIB6Vw="; }; @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = lib.teams.gnome.members; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin }; } diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index 243fa8fa1a2a1..d0da4ce048b15 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { buildInputs = [ flac - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 9e519510eb721..771bef276221e 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.14.2-1"; + version = "3.15.1-1"; src = fetchFromGitHub { owner = "GrandOrgue"; - repo = pname; + repo = "grandorgue"; rev = version; fetchSubmodules = true; - hash = "sha256-FHM8fFUga9poGhojKBTF4gsJ6L4XEksueVxfMbngvks="; + hash = "sha256-5uAA878OBc04PkUgCwoRtc6lIASivq3YcfFffTae6uM="; }; postPatch = '' @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config imagemagick libicns makeWrapper ]; buildInputs = [ fftwFloat zlib wavpack wxGTK32 yaml-cpp ] - ++ lib.optionals stdenv.isLinux [ alsa-lib udev ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optionals (!jackaudioSupport) [ @@ -52,12 +52,12 @@ stdenv.mkDerivation rec { "-DINSTALL_DEPEND=OFF" ] ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_IPHONE=0"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin,lib} mv $out/GrandOrgue.app $out/Applications/ - for lib in $out/Applications/GrandOrgue.app/Contents/MacOS/lib*; do + for lib in $out/Applications/GrandOrgue.app/Contents/Frameworks/lib*; do ln -s $lib $out/lib/ done makeWrapper $out/{Applications/GrandOrgue.app/Contents/MacOS,bin}/GrandOrgue diff --git a/pkgs/applications/audio/gst123/default.nix b/pkgs/applications/audio/gst123/default.nix index 65d925342be2c..d988983dcae5f 100644 --- a/pkgs/applications/audio/gst123/default.nix +++ b/pkgs/applications/audio/gst123/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GStreamer based command line media player"; homepage = "https://space.twc.de/~stefan/gst123.php"; license = lib.licenses.lgpl2Plus; diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/applications/audio/hivelytracker/default.nix index 8ad62eb81a5a4..49cd0a78ed751 100644 --- a/pkgs/applications/audio/hivelytracker/default.nix +++ b/pkgs/applications/audio/hivelytracker/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; mainProgram = "hivelytracker"; maintainers = with maintainers; [ fgaz ]; - broken = stdenv.isDarwin; # TODO: try to use xcbuild + broken = stdenv.hostPlatform.isDarwin; # TODO: try to use xcbuild }; }) diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/applications/audio/indicator-sound-switcher/default.nix index 5b6cdf7e79046..cb8439305c681 100644 --- a/pkgs/applications/audio/indicator-sound-switcher/default.nix +++ b/pkgs/applications/audio/indicator-sound-switcher/default.nix @@ -14,13 +14,13 @@ python3Packages.buildPythonApplication rec { pname = "indicator-sound-switcher"; - version = "2.3.9"; + version = "2.3.10.1"; src = fetchFromGitHub { owner = "yktoo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-qJ1lg9A1aCM+/v/JbQAVpYGX25qA5ULqsM8k7uH1uvQ="; + sha256 = "sha256-Benhlhz81EgL6+pmjzyruKBOS6O7ce5PPmIIzk2Zong="; }; postPatch = '' diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix index e54828e3cdcf9..4d20e7a66b39e 100644 --- a/pkgs/applications/audio/jacktrip/default.nix +++ b/pkgs/applications/audio/jacktrip/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.4.0"; pname = "jacktrip"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { repo = "jacktrip"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-p5NXGmWIzi8M177bPzMKfXMmyMgS1qZuWHdCtBBLeDA="; + hash = "sha256-sTCzmQ/dq12ZmkbarVX1jpSODlBf9OuSB1XwKUnfV64="; }; preConfigure = '' diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index 11fb94dc0815e..20c40d5d9d9b4 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Audio effect processor for PipeWire clients"; mainProgram = "jamesdsp"; homepage = "https://github.com/Audio4Linux/JDSP4Linux"; diff --git a/pkgs/applications/audio/jellycli/default.nix b/pkgs/applications/audio/jellycli/default.nix index ddaa6721dfb7e..15d69211e1eff 100644 --- a/pkgs/applications/audio/jellycli/default.nix +++ b/pkgs/applications/audio/jellycli/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { buildInputs = [ alsa-lib ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Jellyfin terminal client"; longDescription = '' Terminal music player, works with Jellyfin (>= 10.6) , Emby (>= 4.4), and diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 9fe910d857691..1a4ac86cc2139 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, ffmpeg, libkeyfinder }: +{ lib, stdenv, fetchFromGitHub, ffmpeg_7, libkeyfinder, fftw }: stdenv.mkDerivation rec { pname = "keyfinder-cli"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { repo = "keyfinder-cli"; owner = "EvanPurkhiser"; rev = "v${version}"; - sha256 = "1mlcygbj3gqii3cz8jd6ks1lz612i4jp0343qjg293xm39fg47ns"; + hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA="; }; - buildInputs = [ ffmpeg libkeyfinder ]; + buildInputs = [ ffmpeg_7 libkeyfinder fftw ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index 593fd72c6d0ce..1a42bdc45819c 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.99"; + version = "2.0.100"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pwrAVcIwZ3RDYFMDk80q5aVSqLTQ5weZqgB3GRRu2ig="; + hash = "sha256-IRwzm0ODeT+umLvIjNURdTE9igpJ03r+ArjNN3y//z0="; }; pythonRelaxDeps = true; diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 46ece80638f6a..c6c274f60da19 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -5,7 +5,7 @@ , pkg-config , stdenv , openssl -, withALSA ? stdenv.isLinux +, withALSA ? stdenv.hostPlatform.isLinux , alsa-lib , alsa-plugins , withPortAudio ? false @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw="; - nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix index 0c7ea944a8bf4..900839081e717 100644 --- a/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; - buildInputs = [ sqlite ] ++ (if stdenv.isDarwin then [ + buildInputs = [ sqlite ] ++ (if stdenv.hostPlatform.isDarwin then [ libiconv Security SystemConfiguration @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "shell_completion" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "systemd" ]; diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index fad1d3f15cac6..754bf7865f77b 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation { buildInputs = [ SDL ] - ++ lib.optional stdenv.isDarwin Foundation - ++ lib.optional stdenv.isLinux jack2; + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation + ++ lib.optional stdenv.hostPlatform.isLinux jack2; patches = [ # Remove outdated (pre-64bit) checks that would fail on modern platforms @@ -32,15 +32,15 @@ stdenv.mkDerivation { preBuild = "cd projects"; makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ] - ++ lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ] - ++ lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ "PLATFORM=DEB" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "PLATFORM=OSX" ]; env.NIX_CFLAGS_COMPILE = toString ([ "-fpermissive" ] ++ lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"); - NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework Foundation"; + NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isDarwin "-framework Foundation"; - installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe"; + installPhase = let extension = if stdenv.hostPlatform.isDarwin then "app" else "deb-exe"; in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; passthru.updateScript = unstableGitUpdater { @@ -69,7 +69,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # https://github.com/NixOS/nixpkgs/pull/91766#issuecomment-688751821 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "lgpt"; }; } diff --git a/pkgs/applications/audio/master_me/default.nix b/pkgs/applications/audio/master_me/default.nix index 6ed4a2efef60b..4d8a35588e7e6 100644 --- a/pkgs/applications/audio/master_me/default.nix +++ b/pkgs/applications/audio/master_me/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGL python3 ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ] - ++ lib.optionals stdenv.isLinux [ libX11 libXext libXrandr ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXext libXrandr ]; enableParallelBuilding = true; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "automatic mastering plugin for live streaming, podcasts and internet radio"; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.all; - broken = stdenv.isDarwin; # error: no type or protocol named 'NSPasteboardType' + broken = stdenv.hostPlatform.isDarwin; # error: no type or protocol named 'NSPasteboardType' license = licenses.gpl3Plus; mainProgram = "master_me"; }; diff --git a/pkgs/applications/audio/mbrola/voices.nix b/pkgs/applications/audio/mbrola/voices.nix index 4244a9b62ae9c..df4521acd6097 100644 --- a/pkgs/applications/audio/mbrola/voices.nix +++ b/pkgs/applications/audio/mbrola/voices.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - unstableGitUpdater, mbrola, languages ? [ ], }: diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix index 9551e0dda3b23..2bffd43b7b957 100644 --- a/pkgs/applications/audio/mellowplayer/default.nix +++ b/pkgs/applications/audio/mellowplayer/default.nix @@ -62,7 +62,7 @@ mkDerivation rec { meta = with lib; { inherit (qtbase.meta) platforms; - broken = stdenv.isDarwin; # test build fails, but the project is not maintained anymore + broken = stdenv.hostPlatform.isDarwin; # test build fails, but the project is not maintained anymore description = "Cloud music integration for your desktop"; mainProgram = "MellowPlayer"; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix deleted file mode 100644 index 5714de0ee7b43..0000000000000 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsa-lib, autoreconfHook, gtk2, libjack2, ladspaH -, ladspaPlugins, libsamplerate, libsndfile, pkg-config, libpulseaudio, lame -, vorbis-tools }: - -stdenv.mkDerivation rec { - pname = "mhwaveedit"; - version = "1.4.24"; - - src = fetchFromGitHub { - owner = "magnush"; - repo = "mhwaveedit"; - rev = "v${version}"; - sha256 = "037pbq23kh8hsih994x2sv483imglwcrqrx6m8visq9c46fi0j1y"; - }; - - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - - preAutoreconf = "(cd docgen && sh gendocs.sh)"; - - buildInputs = [ - SDL alsa-lib gtk2 libjack2 ladspaH libsamplerate libsndfile libpulseaudio - ]; - - configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ]; - - postInstall = '' - wrapProgram $out/bin/mhwaveedit \ - --prefix PATH : ${lame}/bin/ \ - --prefix PATH : ${vorbis-tools}/bin/ - ''; - - meta = with lib; { - description = "Graphical program for editing, playing and recording sound files"; - mainProgram = "mhwaveedit"; - homepage = "https://github.com/magnush/mhwaveedit"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/audio/midivisualizer/default.nix b/pkgs/applications/audio/midivisualizer/default.nix index 10a2a5de6a096..54f13d3e628a7 100644 --- a/pkgs/applications/audio/midivisualizer/default.nix +++ b/pkgs/applications/audio/midivisualizer/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glfw ffmpeg-full - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor gtk3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon Cocoa @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { Kernel ]; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications $out/bin cp -r MIDIVisualizer.app $out/Applications/ ln -s ../Applications/MIDIVisualizer.app/Contents/MacOS/MIDIVisualizer $out/bin/ diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix index f3cd335b47be6..25ab4f7c6b71c 100644 --- a/pkgs/applications/audio/miniaudicle/default.nix +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - broken = stdenv.isDarwin; # not attempted + broken = stdenv.hostPlatform.isDarwin; # not attempted }; }) diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix index 1ba98f0034813..6691d3e9507e4 100644 --- a/pkgs/applications/audio/minidsp/default.nix +++ b/pkgs/applications/audio/minidsp/default.nix @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = ["-p minidsp -p minidsp-daemon"]; buildInputs = - lib.optionals stdenv.isLinux [libusb1] - ++ lib.optionals stdenv.isDarwin [AppKit IOKit]; + lib.optionals stdenv.hostPlatform.isLinux [libusb1] + ++ lib.optionals stdenv.hostPlatform.isDarwin [AppKit IOKit]; - nativeBuildInputs = lib.optionals stdenv.isLinux [pkg-config]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [pkg-config]; meta = with lib; { description = "Control interface for some MiniDSP products"; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 8ef52e90f7909..90bc036103180 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -132,7 +132,7 @@ mkDerivation rec { "-DINSTALL_USER_UDEV_RULES=OFF" ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' rules="$src/res/linux/mixxx-usb-uaccess.rules" if [ ! -f "$rules" ]; then echo "$rules is missing, must update the Nix file." diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index a7ad6590aa6bb..6039654d76dcd 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -3,7 +3,7 @@ , ncurses, db , popt, libtool , libiconv, CoreServices # Sound sub-systems -, alsaSupport ? (!stdenv.isDarwin), alsa-lib +, alsaSupport ? (!stdenv.hostPlatform.isDarwin), alsa-lib , pulseSupport ? true, libpulseaudio , jackSupport ? true, libjack2 , ossSupport ? true @@ -80,7 +80,7 @@ stdenv.mkDerivation { # Misc ++ lib.optional curlSupport curl ++ lib.optional samplerateSupport libsamplerate - ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices ]; configureFlags = [ # Sound sub-systems diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index ef604a6b41502..12eab45c52a22 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { requests setuptools tornado - ] ++ lib.optional (!stdenv.isDarwin) dbus-python + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python ); propagatedNativeBuildInputs = [ diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index 1faeddb4d8e0b..02711ab4e1314 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libvorbis - ] ++ lib.optional stdenv.isDarwin SDL; + ] ++ lib.optional stdenv.hostPlatform.isDarwin SDL; env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix deleted file mode 100644 index 86c1f87f5227f..0000000000000 --- a/pkgs/applications/audio/mp3info/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ fetchurl, lib, stdenv, ncurses, pkg-config, gtk2 }: - -stdenv.mkDerivation rec { - pname = "mp3info"; - version = "0.8.5a"; - - src = fetchurl { - url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/${pname}/${pname}-${version}.tgz"; - sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses gtk2 ]; - - hardeningDisable = [ "format" ]; - - configurePhase = - '' sed -i Makefile \ - -e "s|^prefix=.*$|prefix=$out|g ; - s|/bin/rm|rm|g ; - s|/usr/bin/install|install|g" - ''; - - preInstall = - '' mkdir -p "$out/bin" - mkdir -p "$out/man/man1" - ''; - - meta = { - description = "MP3 technical info viewer and ID3 1.x tag editor"; - - longDescription = - '' MP3Info is a little utility used to read and modify the ID3 tags of - MP3 files. MP3Info can also display various techincal aspects of an - MP3 file including playing time, bit-rate, sampling frequency and - other attributes in a pre-defined or user-specifiable output format. - ''; - - homepage = "http://www.ibiblio.org/mp3info/"; - - license = lib.licenses.gpl2Plus; - - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index b0dcbfa18c595..c58c6831edf46 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmpdclient ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 479e8850872c5..6f28bf98a1b15 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,7 +1,9 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake +, wrapGAppsHook3 , wrapQtAppsHook , pkg-config , ninja @@ -18,27 +20,25 @@ , portmidi , qtbase , qtdeclarative -, qtgraphicaleffects , flac , libopusenc , libopus , tinyxml-2 -, qtquickcontrols -, qtquickcontrols2 -, qtscript +, qt5compat +, qtwayland , qtsvg -, qtxmlpatterns +, qtscxml , qtnetworkauth -, qtx11extras +, qttools , nixosTests , darwin }: let - stdenv' = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; # portaudio propagates Darwin frameworks. Rebuild it using the 11.0 stdenv # from Qt and the 11.0 SDK frameworks. - portaudio' = if stdenv.isDarwin then portaudio.override { + portaudio' = if stdenv.hostPlatform.isDarwin then portaudio.override { stdenv = stdenv'; inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit @@ -50,52 +50,75 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.3.2"; + version = "4.4.2"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-QjvY8R2nq/DeFDikHn9qr4aCEwzAcogQXM5vdZqhoMM="; + sha256 = "sha256-wgujiFvaWejSEXTbq/Re/7Ca1jIqso2uZej3Lb3V4I8="; }; + patches = [ + # https://github.com/musescore/MuseScore/pull/24326 + (fetchpatch { + name = "fix-menubar-with-qt6.5+.patch"; + url = "https://github.com/musescore/MuseScore/pull/24326/commits/b274f13311ad0b2bce339634a006ba22fbd3379e.patch"; + hash = "sha256-ZGmjRa01CBEIxJdJYQMhdg4A9yjWdlgn0pCPmENBTq0="; + }) + (fetchpatch { + name = "fix-crash-accessing-uninitialized-properties.patch"; + url = "https://github.com/musescore/MuseScore/pull/24714.patch"; + hash = "sha256-ErrCU/U+wyfD7R8kiZTifGIeuCAdKi1q7uxYsoE/OLA="; + }) + ]; cmakeFlags = [ - "-DMUSESCORE_BUILD_MODE=release" + "-DMUSE_APP_BUILD_MODE=release" # Disable the build and usage of the `/bin/crashpad_handler` utility - it's # not useful on NixOS, see: # https://github.com/musescore/MuseScore/issues/15571 - "-DMUE_BUILD_CRASHPAD_CLIENT=OFF" + "-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF" # Use our versions of system libraries "-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON" + "-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON" "-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON" # Implies also -DMUE_COMPILE_USE_SYSTEM_OPUS=ON "-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON" "-DMUE_COMPILE_USE_SYSTEM_FLAC=ON" - # From some reason, in $src/build/cmake/SetupBuildEnvironment.cmake, - # upstream defaults to compiling to x86_64 only, unless this cmake flag is - # set - "-DMUE_COMPILE_BUILD_MACOS_APPLE_SILICON=ON" # Don't bundle qt qml files, relevant really only for darwin, but we set # this for all platforms anyway. "-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF" + # Don't build unit tests unless we are going to run them. + (lib.cmakeBool "MUSE_ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ]; qtWrapperArgs = [ # MuseScore JACK backend loads libjack at runtime. - "--prefix ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}" - ] ++ lib.optionals (stdenv.isLinux) [ + "--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.isDarwin) [ + ] ++ 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" ]; + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + dontWrapGApps = true; + nativeBuildInputs = [ wrapQtAppsHook cmake + qttools pkg-config ninja + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + # Since https://github.com/musescore/MuseScore/pull/13847/commits/685ac998 + # GTK3 is needed for file dialogs. Fixes crash with No GSettings schemas error. + wrapGAppsHook3 ]; buildInputs = [ @@ -114,28 +137,50 @@ in stdenv'.mkDerivation (finalAttrs: { tinyxml-2 qtbase qtdeclarative - qtgraphicaleffects - qtquickcontrols - qtquickcontrols2 - qtscript + qt5compat qtsvg - qtxmlpatterns + qtscxml qtnetworkauth - qtx11extras - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib + qtwayland + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Cocoa ]; postInstall = '' # Remove unneeded bundled libraries and headers rm -r $out/{include,lib} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" mv "$out/mscore.app" "$out/Applications/mscore.app" mkdir -p $out/bin ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore ''; + # muse-sounds-manager installs Muse Sounds sampler libMuseSamplerCoreLib.so. + # It requires that argv0 of the calling process ends with "/mscore" or "/MuseScore-4". + # We need to ensure this in two cases: + # + # 1) when the user invokes MuseScore as "mscore" on the command line or from + # the .desktop file, and the normal argv0 is "mscore" (no "/"); + # 2) when MuseScore invokes itself via File -> New, and the normal argv0 is + # the target of /proc/self/exe, which in Nixpkgs was "{...}/.mscore-wrapped" + # + # In order to achieve (2) we install the final binary as $out/libexec/mscore, and + # in order to achieve (1) we use makeWrapper without --inherit-argv0. + # + # wrapQtAppsHook uses wrapQtApp -> wrapProgram -> makeBinaryWrapper --inherit-argv0 + # so we disable it and explicitly use makeQtWrapper. + # + # TODO: check if something like this is also needed for macOS. + dontWrapQtApps = stdenv.hostPlatform.isLinux; + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + mkdir -p $out/libexec + mv $out/bin/mscore $out/libexec + makeQtWrapper $out/libexec/mscore $out/bin/mscore + ''; + # Don't run bundled upstreams tests, as they require a running X window system. doCheck = false; @@ -145,7 +190,7 @@ in stdenv'.mkDerivation (finalAttrs: { description = "Music notation and composition software"; homepage = "https://musescore.org/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ vandenoever doronbehar ]; + maintainers = with maintainers; [ vandenoever doronbehar orivej ]; mainProgram = "mscore"; platforms = platforms.unix; }; diff --git a/pkgs/applications/audio/music-player/default.nix b/pkgs/applications/audio/music-player/default.nix deleted file mode 100644 index 137c463437756..0000000000000 --- a/pkgs/applications/audio/music-player/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, alsa-lib -, darwin -, fetchFromGitHub -, pkg-config -, protobuf -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "music-player"; - version = "0.2.0-alpha.14"; - - src = fetchFromGitHub { - owner = "tsirysndr"; - repo = "music-player"; - rev = "v${version}"; - hash = "sha256-l8Y1fc5v0YDm87b+d3DuMgKFiem6WFfJEASplHoqva0="; - }; - - cargoHash = "sha256-nnOHuAn+eGf+iiX3QbDTH4zHMQ6KV4QP6RnyBhLMrEc="; - - nativeBuildInputs = [ - protobuf - rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.isLinux [ - pkg-config - ]; - - buildInputs = lib.optionals stdenv.isLinux [ - alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AudioUnit - ]; - - meta = with lib; { - description = "Extensible music player daemon written in Rust"; - homepage = "https://github.com/tsirysndr/music-player"; - changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "music-player"; - }; -} diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index ba235b5157a51..97d897d5fcb39 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; preConfigure = '' substituteInPlace lib/utils.rs \ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+UVUejKCfjC6zdW315wmu7f3A5GmnoQ3rIk8SK6LIRI="; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Automatic music sorter (based on ID3 tags)"; mainProgram = "muso"; homepage = "https://github.com/quebin31/muso"; diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index f87e83f2128f4..c756b2a58c80a 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "17.0.3"; + version = "17.0.4"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-DtGNwxlXYCorD/c61nqtcocMqt4IG+LuTAdwbKlvp/Y="; + sha256 = "sha256-mtAMvaC8W9/o+ccHyvJRZ5Stq82m6IgXk/jOcxaGSXA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index e2ecb813f5528..ebe6eb1530f32 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,53 +1,88 @@ -{ lib -, stdenv -, fetchurl -, boost -, libmpdclient -, ncurses -, pkg-config -, readline -, libiconv -, icu -, curl -, outputsSupport ? true # outputs screen -, visualizerSupport ? false, fftw # visualizer screen -, clockSupport ? true # clock screen -, taglibSupport ? true, taglib # tag editor +{ + lib, + stdenv, + fetchFromGitHub, + boost, + libmpdclient, + ncurses, + pkg-config, + readline, + libiconv, + icu, + curl, + autoconf, + automake, + libtool, + outputsSupport ? true, # outputs screen + visualizerSupport ? false, + fftw, # visualizer screen + clockSupport ? true, # clock screen + taglibSupport ? true, + taglib, # tag editor }: stdenv.mkDerivation rec { pname = "ncmpcpp"; - version = "0.9.2"; + version = "0.10"; - src = fetchurl { - url = "https://rybczak.net/ncmpcpp/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-+qv2FXyMsbJKBZryduFi+p+aO5zTgQxDuRKIYMk4Ohs="; + src = fetchFromGitHub { + owner = "ncmpcpp"; + repo = "ncmpcpp"; + rev = "refs/tags/${version}"; + sha256 = "sha256-HRJQ+IOQ8xP1QkPlLI+VtDUWaI2m0Aw0fCDWHhgsOLY="; }; enableParallelBuilding = true; strictDeps = true; - configureFlags = [ "BOOST_LIB_SUFFIX=" ] - ++ lib.optional outputsSupport "--enable-outputs" - ++ lib.optional visualizerSupport "--enable-visualizer --with-fftw" - ++ lib.optional clockSupport "--enable-clock" - ++ lib.optional taglibSupport "--with-taglib"; + configureFlags = [ + "BOOST_LIB_SUFFIX=" + (lib.enableFeature outputsSupport "outputs") + (lib.enableFeature visualizerSupport "visualizer") + (lib.withFeature visualizerSupport "fftw") + (lib.enableFeature clockSupport "clock") + (lib.withFeature taglibSupport "taglib") + ]; - nativeBuildInputs = [ pkg-config ] - ++ lib.optional taglibSupport taglib; + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + ]; - buildInputs = [ boost libmpdclient ncurses readline libiconv icu curl ] - ++ lib.optional visualizerSupport fftw + buildInputs = [ + boost + libmpdclient + ncurses + readline + libiconv + icu + curl + ] ++ lib.optional visualizerSupport fftw ++ lib.optional taglibSupport taglib; - meta = with lib; { + preConfigure = + '' + ./autogen.sh + '' + + lib.optionalString stdenv.isDarwin '' + # std::result_of was removed in c++20 and unusable for clang16 + substituteInPlace ./configure \ + --replace-fail "std=c++20" "std=c++17" + ''; + + meta = { description = "Featureful ncurses based MPD client inspired by ncmpc"; - homepage = "https://rybczak.net/ncmpcpp/"; - changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ koral lovek323 ]; - platforms = platforms.all; + homepage = "https://rybczak.net/ncmpcpp/"; + changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + koral + lovek323 + ]; + platforms = lib.platforms.all; mainProgram = "ncmpcpp"; }; } diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 4053a1a88f6b1..d2d428963badc 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -35,16 +35,16 @@ rustPlatform.buildRustPackage rec { ++ lib.optional withClipboard python3; buildInputs = [ ncurses ] - ++ lib.optional stdenv.isLinux openssl + ++ lib.optional stdenv.hostPlatform.isLinux openssl ++ lib.optional withALSA alsa-lib ++ lib.optional withClipboard libxcb ++ lib.optional withCover ueberzug ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio ++ lib.optional (withMPRIS || withNotify) dbus - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DNCURSES_UNCTRL_H_incl"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DNCURSES_UNCTRL_H_incl"; buildNoDefaultFeatures = true; diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix index 0184934ff2208..bf2c115758c48 100644 --- a/pkgs/applications/audio/noson/default.nix +++ b/pkgs/applications/audio/noson/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "noson"; - version = "5.6.7"; + version = "5.6.8"; src = fetchFromGitHub { owner = "janbar"; repo = "noson-app"; rev = finalAttrs.version; - hash = "sha256-lroQYO+Ab7uPQmsrUFK6uWdCoGQp1klyfLw6eAxdzjg="; + hash = "sha256-hCVGi+++6CcTRMXeRKH8xRncm/Gl83GgU3aAIPI/yGU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/open-music-kontrollers/generic.nix b/pkgs/applications/audio/open-music-kontrollers/generic.nix index 5c48f08dcd7ce..4c4211e49f0ae 100644 --- a/pkgs/applications/audio/open-music-kontrollers/generic.nix +++ b/pkgs/applications/audio/open-music-kontrollers/generic.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ] ++ additionalBuildInputs; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = description; homepage = "https://open-music-kontrollers.ch/lv2/${pname}:"; license = licenses.artistic2; diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/applications/audio/openutau/default.nix index 3e16c7b512de8..df53f4a49644a 100644 --- a/pkgs/applications/audio/openutau/default.nix +++ b/pkgs/applications/audio/openutau/default.nix @@ -5,9 +5,6 @@ , dotnetCorePackages , dbus , fontconfig -, libICE -, libSM -, libX11 , portaudio }: @@ -25,6 +22,10 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.runtime_7_0; + # [...]/Microsoft.NET.Sdk.targets(157,5): error MSB4018: The "GenerateDepsFile" task failed unexpectedly. [[...]/OpenUtau.Core.csproj] + # [...]/Microsoft.NET.Sdk.targets(157,5): error MSB4018: System.IO.IOException: The process cannot access the file '[...]/OpenUtau.Core.deps.json' because it is being used by another process. [[...]/OpenUtau.Core.csproj] + enableParallelBuilding = false; + projectFile = "OpenUtau.sln"; nugetDeps = ./deps.nix; @@ -32,17 +33,13 @@ buildDotnetModule rec { runtimeDeps = [ dbus - fontconfig - libICE - libSM - libX11 portaudio ]; dotnetInstallFlags = [ "-p:PublishReadyToRun=false" ]; # socket cannot bind to localhost on darwin for tests - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # net7.0 replacement needed until upstream bumps to dotnet 7 postPatch = '' @@ -57,9 +54,9 @@ buildDotnetModule rec { # need to make sure proprietary worldline resampler is copied postInstall = let - runtime = if (stdenv.isLinux && stdenv.isx86_64) then "linux-x64" - else if (stdenv.isLinux && stdenv.isAarch64) then "linux-arm64" - else if stdenv.isDarwin then "osx" + runtime = if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) then "linux-x64" + else if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then "linux-arm64" + else if stdenv.hostPlatform.isDarwin then "osx" else null; in lib.optionalString (runtime != null) '' cp runtimes/${runtime}/native/libworldline${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/OpenUtau/ diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index 9bafacc2e30ec..9f306a3de1b46 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildInputs = [ libogg ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fmang/opustags"; description = "Ogg Opus tags editor"; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ kmein ]; license = licenses.bsd3; mainProgram = "opustags"; diff --git a/pkgs/applications/audio/parrot/default.nix b/pkgs/applications/audio/parrot/default.nix index a0b2972ca0375..d7da9213bce85 100644 --- a/pkgs/applications/audio/parrot/default.nix +++ b/pkgs/applications/audio/parrot/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ cmake makeBinaryWrapper pkg-config ]; buildInputs = [ libopus openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' wrapProgram $out/bin/parrot \ diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 50455328f3a40..a82007c375bd9 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Time domain pitch tracker for Pure Data"; homepage = "http://www.katjaas.nl/helmholtz/helmholtz.html"; license = lib.licenses.bsd3; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 7854203d89396..11116c7ffa5fd 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,17 +1,19 @@ -{ fetchurl, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg, curl }: +{ fetchFromGitHub, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg_7, curl }: stdenv.mkDerivation rec { pname = "pianobar"; - version = "2022.04.01"; + version = "2022.04.01-unstable-2024-08-16"; - src = fetchurl { - url = "https://6xq.net/projects/pianobar/${pname}-${version}.tar.bz2"; - sha256 = "sha256-FnCyiGWouCpXu23+p/FuL6QUXS81SRC7FzgLMsm5R2M="; + src = fetchFromGitHub { + owner = "PromyLOPh"; + repo = "pianobar"; + rev = "41ac06c8585dc535c4b1737b4c2943bb3fe7beb0"; + hash = "sha256-5LTZ6J9bvfsnpD/bGuojekutFVdH9feWLF+nLFvkeOA="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libao json_c libgcrypt ffmpeg curl + libao json_c libgcrypt ffmpeg_7 curl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index fda7485736162..e43e39e5a47d0 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -21,14 +21,14 @@ in pythonPackages.buildPythonApplication rec { pname = "picard"; # nix-update --commit picard --version-regex 'release-(.*)' - version = "2.12.1"; + version = "2.12.3"; format = "setuptools"; src = fetchFromGitHub { owner = "metabrainz"; repo = "picard"; rev = "refs/tags/release-${version}"; - hash = "sha256-wKPE4lj3DIlY+X5A/MqhnwyrhPTXGjmUnLK1VWXUOas="; + hash = "sha256-ysHOiX8b9tlUaQDGl4qHUVLrLUF9MUDc4+vOQB76cj4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 933d173614593..a9ea4096859c7 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib, glib , wrapGAppsHook3, pythonPackages, gtk3, adwaita-icon-theme, gobject-introspection , libnotify, libsecret, gst_all_1 }: @@ -20,19 +20,17 @@ pythonPackages.buildPythonApplication rec { patchShebangs meson_post_install.py ''; - nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook3 ]; + nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook3 gobject-introspection ]; - propagatedNativeBuildInputs = [ - gobject-introspection - ]; + buildInputs = [ gtk3 libnotify libsecret glib ] + ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); propagatedBuildInputs = - [ gtk3 gobject-introspection libnotify libsecret adwaita-icon-theme ] ++ - (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ + [ adwaita-icon-theme ] ++ (with pythonPackages; [ pygobject3 pylast ]); meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Pandora Internet Radio player for GNOME"; mainProgram = "pithos"; homepage = "https://pithos.github.io/"; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 2e1b7b7bc2a19..78077512363c4 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.11.1"; + version = "4.11.2"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha512-miZACuT5kswIgdaYSFnYeoIUFtF6IRXKbLLrpOVga4UULgwnzinGehSNDd6feSyuDoKQhXIbDB/8eI4jERTS1A=="; + hash = "sha512-cNBupLFHhq7GDoj/QYGsS0UShTKmDpf/JxBZS92VwTCuuBjScTMGF0cETGEYYnvxqv4vf9MSKNY0/HW9CuguaA=="; }; appimageContents = appimageTools.extractType2 { @@ -30,7 +30,7 @@ appimageTools.wrapType2 { meta = with lib; { description = "Beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/75"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/76"; license = licenses.unfree; maintainers = with maintainers; [ killercup redhawk synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index b3f671adc4b2a..4b5f0c4acd2f9 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/cth103/plugin-torture"; description = "Tool to test LADSPA and LV2 plugins"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index f9e33dc94a801..2a38222949f6c 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -1,55 +1,74 @@ -{ stdenv, lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg, qttools }: +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + qmake, + qttools, + wrapQtAppsHook, + alsa-lib, + flac, + libjack2, + libogg, + libvorbis, + qtsvg, + qtwayland, + rtmidi, +}: -mkDerivation rec { - version = "2.3.0"; +stdenv.mkDerivation rec { + version = "2.4.0"; pname = "polyphone"; src = fetchFromGitHub { owner = "davy7125"; repo = "polyphone"; rev = version; - sha256 = "09habv51pw71wrb39shqi80i2w39dx5a39klzswsald5j9sia0ir"; + hash = "sha256-cPHLmqsS4ReqOCcsgOf77V/ShIkk7chGoJ6bU4W5ejs="; }; + nativeBuildInputs = [ + pkg-config + qmake + qttools + wrapQtAppsHook + ]; + buildInputs = [ alsa-lib + flac libjack2 - portaudio libogg - flac libvorbis - rtmidi qtsvg + qtwayland + rtmidi ]; - nativeBuildInputs = [ qmake qttools pkg-config ]; - preConfigure = '' cd ./sources/ ''; - installPhase = '' - runHook preInstall - install -d $out/bin - install -m755 bin/polyphone $out/bin/ - - install -Dm444 ./contrib/com.polyphone_soundfonts.polyphone.desktop -t $out/share/applications/ - install -Dm444 ./contrib/polyphone.svg -t $out/share/icons/hicolor/scalable/apps/ - runHook postInstall + postConfigure = '' + # Work around https://github.com/NixOS/nixpkgs/issues/214765 + substituteInPlace Makefile \ + --replace-fail "$(dirname $QMAKE)/lrelease" "${lib.getBin qttools}/bin/lrelease" ''; qmakeFlags = [ "DEFINES+=USE_LOCAL_STK" - "DEFINES+=USE_LOCAL_QCUSTOMPLOT" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Soundfont editor for creating musical instruments"; mainProgram = "polyphone"; homepage = "https://www.polyphone-soundfonts.com/"; license = licenses.gpl3; - maintainers = [ maintainers.maxdamantus ]; + maintainers = with maintainers; [ + maxdamantus + orivej + ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 119983971be3c..16f9283282980 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.4.14"; + version = "6.4.20"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-AY/OSoCWlWSjtLcve16nL72HidPlJqJgAOvUubMqvj0="; + hash = "sha256-qal7eIKht0XkRDEsAfNkNDwmDYrr/cLQV4pMMWE+kFk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index d00a0e841ba69..0cbb64e6dcad6 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsa-lib; + buildInputs = [ SDL2 ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; postInstall = '' install -Dm444 "$src/release/other/Freedesktop.org Resources/ProTracker 2 clone.desktop" \ diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index a335dabf4abc0..5d1b11c4ef29e 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { buildInputs = [ fftw libjack2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ portaudio ]; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { "--enable-universal" "--enable-fftw" "--enable-jack" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-alsa" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-portaudio" "--without-local-portaudio" "--disable-jack-framework" diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix deleted file mode 100644 index 6e07d531514ce..0000000000000 --- a/pkgs/applications/audio/pyradio/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, python3Packages -, fetchFromGitHub -, installShellFiles -}: - -python3Packages.buildPythonApplication rec { - pname = "pyradio"; - version = "0.9.3.9"; - - src = fetchFromGitHub { - owner = "coderholic"; - repo = "pyradio"; - rev = "refs/tags/${version}"; - hash = "sha256-EoHCOg4nPkKRSFX/3AUKJaXzS6J1quwtv+mKeKBu5Ns="; - }; - - nativeBuildInputs = [ - installShellFiles - ]; - - propagatedBuildInputs = with python3Packages; [ - dnspython - netifaces - psutil - python-dateutil - requests - rich - ]; - - postPatch = '' - # Disable update check - substituteInPlace pyradio/config \ - --replace-fail "distro = None" "distro = NixOS" - ''; - - checkPhase = '' - $out/bin/pyradio --help - ''; - - postInstall = '' - installManPage *.1 - ''; - - meta = with lib; { - homepage = "http://www.coderholic.com/pyradio/"; - description = "Curses based internet radio player"; - mainProgram = "pyradio"; - changelog = "https://github.com/coderholic/pyradio/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ contrun yayayayaka ]; - }; -} diff --git a/pkgs/applications/audio/quadrafuzz/default.nix b/pkgs/applications/audio/quadrafuzz/default.nix index 4f0ea946832e5..e2156b391007e 100644 --- a/pkgs/applications/audio/quadrafuzz/default.nix +++ b/pkgs/applications/audio/quadrafuzz/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/jpcima/quadrafuzz"; description = "Multi-band fuzz distortion plugin"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index ee994b56efb0a..6577f33baba0c 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; nativeCheckInputs = [ gtest ]; - doCheck = !stdenv.isAarch64; # single failure that I can't explain + doCheck = !stdenv.hostPlatform.isAarch64; # single failure that I can't explain preFixup = '' gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ dbus ]}) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index f020e68baab4d..ff8d32b907805 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -15,49 +15,49 @@ , xdotool , which -, jackSupport ? stdenv.isLinux +, jackSupport ? stdenv.hostPlatform.isLinux , jackLibrary -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio }: let - url_for_platform = version: arch: if stdenv.isDarwin + url_for_platform = version: arch: if stdenv.hostPlatform.isDarwin then "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_universal.dmg" else "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz"; in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.20"; + version = "7.22"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-RtGGGbiEEPXYUqK5qpKcCEfIwhlP7/0bAOPMCG7tqZw=" else { - x86_64-linux = "sha256-/6Ee8YCHM9nJhyelEfH62jhkbDwypKXljM305mWY2io="; - aarch64-linux = "sha256-YnKlONKCmXeV19oREJnXD5t3nEQZ5hVOOvDPtUIFw1A="; + hash = if stdenv.hostPlatform.isDarwin then "sha256-dIRZCUIfqnGTxBaLzczwzD6hA/PyAxPqfa+FfCRKdu0=" else { + x86_64-linux = "sha256-aa2KcL8yZYG+Dki7J6U473E2BQgdACAIzRLtD9zuHV0="; + aarch64-linux = "sha256-NECEEUKtTQajl0MZK8/NsbhcuyihHOo0Q5Y5UpAAgrM="; }.${stdenv.hostPlatform.system}; }; nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ which autoPatchelfHook xdg-utils # Required for desktop integration - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg ]; - sourceRoot = lib.optionalString stdenv.isDarwin "Reaper.app"; + sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "Reaper.app"; buildInputs = [ stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 alsa-lib ]; - runtimeDependencies = lib.optionals stdenv.isLinux [ + runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ gtk3 # libSwell needs libgdk-3.so.0 ] ++ lib.optional jackSupport jackLibrary @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { dontBuild = true; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' runHook preInstall mkdir -p "$out/Applications/Reaper.app" cp -r * "$out/Applications/Reaper.app/" @@ -92,7 +92,6 @@ stdenv.mkDerivation rec { mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ - ln -s $out/opt/REAPER/reamote-server $out/bin/ runHook postInstall ''; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index f09a663454b95..eb4d9629fbb80 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -21,7 +21,7 @@ , libgpod , libmtp , lirc -, brasero +, brasero-unwrapped # libdvdcss is not needed for rhythmbox , grilo , tdb , json-glib @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { libgpod libmtp lirc - brasero + brasero-unwrapped grilo python3.pkgs.pygobject3 diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 19fca6af988da..fa62fcfa47ac6 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.joelmo ]; platforms = platforms.unix; - broken = stdenv.isAarch64; # g++: error: unrecognized command line option '-mfpmath=sse' + broken = stdenv.hostPlatform.isAarch64; # g++: error: unrecognized command line option '-mfpmath=sse' }; } diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix index 9ea7eed77a182..cd67e3ad14406 100644 --- a/pkgs/applications/audio/roomeqwizard/default.nix +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "roomeqwizard"; - version = "5.31.2"; + version = "5.31.3"; src = fetchurl { url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; - sha256 = "sha256-B4qP+qNNPMB/EkW/C2kfcx+h9YH8Md1lM9yUh5YT13s="; + sha256 = "sha256-qaGkKVoiBJ2UWVKAMqbuqNFi6FGcblMxAbYwhf/71CY="; }; dontUnpack = true; diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index eef3c083b5a10..e937cd6ea7790 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -22,15 +22,21 @@ let in mkDerivation rec { pname = "sayonara"; - version = "1.7.0-stable3"; + version = "1.10.0-stable1"; src = fetchFromGitLab { owner = "luciocarreras"; repo = "sayonara-player"; rev = version; - hash = "sha256-tJ/8tGNkmTwWRCpPy/h85SP/6QDAgcaKWJdM5MSAXJw="; + hash = "sha256-ZcuWe1dsLJS4/nLXSSKB7wzPU9COFyE4vPSwZIo0bgI="; }; + # error: no matching function for call to 'max' + postPatch = '' + substituteInPlace src/Components/Playlist/PlaylistModifiers.cpp \ + --replace-fail "std::max" "std::max<MilliSeconds>" + ''; + nativeBuildInputs = [ cmake ninja pkg-config qttools ]; buildInputs = [ diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index bc6a406ba2f5c..6147973f14931 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -21,18 +21,18 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--enable-dependency-tracking" ] - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-sdltest"; nativeBuildInputs = [ autoreconfHook python3 ]; buildInputs = [ SDL2 ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libXext ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libXext ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; enableParallelBuilding = true; # Our Darwin SDL2 doesn't have a SDL2main to link against - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.ac \ --replace '-lSDL2main' '-lSDL2' ''; diff --git a/pkgs/applications/audio/scream/default.nix b/pkgs/applications/audio/scream/default.nix index 3c0b83d46c193..cc09b21875353 100644 --- a/pkgs/applications/audio/scream/default.nix +++ b/pkgs/applications/audio/scream/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, config, fetchFromGitHub, cmake, pkg-config -, alsaSupport ? stdenv.isLinux, alsa-lib -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio , jackSupport ? false, libjack2, soxr , pcapSupport ? false, libpcap }: diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 898373cb1320e..500e85d68416a 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "seq66"; - version = "0.99.13"; + version = "0.99.14"; src = fetchFromGitHub { owner = "ahlstromcj"; repo = "seq66"; rev = version; - hash = "sha256-hR8kEt3tKnH96JmmkMuY0WWxxp9YTcSvsJvICKNjvyQ="; + hash = "sha256-0xexKu8qQd0HzEHYKMomeoBE1s/tC5T1jzUl+AkhTqY="; }; nativeBuildInputs = [ autoreconfHook pkg-config qttools which wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/applications/audio/sfxr/default.nix index d3314facb6920..03813ff35248d 100644 --- a/pkgs/applications/audio/sfxr/default.nix +++ b/pkgs/applications/audio/sfxr/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "http://www.drpetter.se/project_sfxr.html"; description = "Videogame sound effect generator"; mainProgram = "sfxr"; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index ff58b64cee64b..821cda32e9779 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { asio avahi flac libogg libvorbis libopus aixlog popl soxr ] ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ IOKit AudioToolbox ]; + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit AudioToolbox ]; - TARGET=lib.optionalString stdenv.isDarwin "MACOS"; + TARGET=lib.optionalString stdenv.hostPlatform.isDarwin "MACOS"; # Upstream systemd unit files are pretty awful, so we provide our own in a # NixOS module. It might make sense to get that upstreamed... diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index ad935b09ed16a..8bb0bf1387e22 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftw gsl motif ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ CoreServices CoreMIDI ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices CoreMIDI ] ++ (with xorg; [ libXext libXft libXpm libXt ]); configureFlags = [ "--with-motif" ]; diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/applications/audio/songrec/default.nix index 37d69bcd48a19..a682c2b0df3c1 100644 --- a/pkgs/applications/audio/songrec/default.nix +++ b/pkgs/applications/audio/songrec/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "songrec"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "marin-m"; repo = pname; rev = version; - hash = "sha256-S44gtyz6L6uaLm3q75y8S4NJb77Vfy+Sd+J06IroHIM="; + hash = "sha256-pTonrxlYvfuLRKMXW0Lao4KCoNFlMzE9rH+hwpa60JY="; }; - cargoHash = "sha256-f2xAWh+y0Jw7QVLZBkajMLN3ocCyRsR480ai7+07LM4="; + cargoHash = "sha256-2BXUZD63xzHpUi8lk2fV5qBmeq6Gzpq0uEcKfbReANI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/sonobus/default.nix b/pkgs/applications/audio/sonobus/default.nix index fc0c5977360f8..d8a69ecd9a0b7 100644 --- a/pkgs/applications/audio/sonobus/default.nix +++ b/pkgs/applications/audio/sonobus/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${lib.makeLibraryPath (finalAttrs.runtimeDependencies)}"; dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath - postPatch = lib.optionalString (stdenv.isLinux) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isLinux) '' # needs special setup on Linux, dunno if it can work on Darwin # Also, I get issues with linking without that, not sure why sed -i -e '/juce::juce_recommended_lto_flags/d' CMakeLists.txt @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # The program does not provide any CMake install instructions - installPhase = lib.optionalString (stdenv.isLinux) '' + installPhase = lib.optionalString (stdenv.hostPlatform.isLinux) '' runHook preInstall cd ../linux ./install.sh "$out" @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ PowerUser64 ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "sonobus"; }; }) diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index 6c28d540458f5..bcca16089a27c 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "http://openavproductions.com/sorcer/"; description = "Wavetable LV2 plugin synth, targeted at the electronic / dubstep genre"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/soundsource/default.nix b/pkgs/applications/audio/soundsource/default.nix index cc7a5b3d7ce9f..c76d0c0999d6b 100644 --- a/pkgs/applications/audio/soundsource/default.nix +++ b/pkgs/applications/audio/soundsource/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenvNoCC -, fetchurl -, unzip +{ + lib, + stdenvNoCC, + fetchurl, + unzip, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "soundsource"; - version = "5.6.3"; + version = "5.7.1"; src = fetchurl { - url = "https://web.archive.org/web/20240505002011/https://rogueamoeba.com/soundsource/download/SoundSource.zip"; - sha256 = "sha256-uXQw4MEV4hkrd7tjNCxtuXpbfmdW8bilI5ZmXwn9BLM="; + url = "https://web.archive.org/web/20240924103013/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; + sha256 = "sha256-02+Jb+3GSirypBISjdFg89Dp3LtkgPKho8OCVS+GGcQ="; }; dontUnpack = true; @@ -29,7 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://rogueamoeba.com/soundsource"; license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau ]; + maintainers = with maintainers; [ + emilytrau + donteatoreo + ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index 02c4813e03703..36f90e67a6394 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { goocanvas libxml2 libsndfile - ] ++ lib.optional stdenv.isLinux alsa-lib; + ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; meta = with lib; { description = "Music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker"; diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 415bf352cae9f..a0c3d2d257061 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Speech denoise lv2 plugin based on RNNoise library"; homepage = "https://github.com/lucianodato/speech-denoiser"; license = licenses.lgpl3; diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index dcce24d173cec..a3c51cfaaba2c 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { pkg-config cmake rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ]; @@ -61,14 +61,14 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals withSixel [ libsixel ] ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ] ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ] - ++ lib.optionals (withAudioBackend == "rodio" && stdenv.isLinux) [ alsa-lib ] + ++ lib.optionals (withAudioBackend == "rodio" && stdenv.hostPlatform.isLinux) [ alsa-lib ] ++ lib.optionals (withAudioBackend == "portaudio") [ portaudio ] ++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ] ++ lib.optionals (withAudioBackend == "rodiojack") [ alsa-lib libjack2 ] ++ lib.optionals (withAudioBackend == "sdl") [ SDL2 ] ++ lib.optionals (withAudioBackend == "gstreamer") [ gst_all_1.gstreamer gst_all_1.gst-devtools gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ] - ++ lib.optionals (stdenv.isDarwin && withMediaControl) [ darwin.apple_sdk.frameworks.MediaPlayer ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && withMediaControl) [ darwin.apple_sdk.frameworks.MediaPlayer ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit AudioUnit Cocoa @@ -88,7 +88,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals withFuzzy [ "fzf" ]; # sixel-sys is dynamically linked to libsixel - postInstall = lib.optionals (stdenv.isDarwin && withSixel) '' + postInstall = lib.optionals (stdenv.hostPlatform.isDarwin && withSixel) '' wrapProgram $out/bin/spotify_player \ --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}" ''; diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/applications/audio/spotify-qt/default.nix index 0fbf7c9438427..cbe252bc2b946 100644 --- a/pkgs/applications/audio/spotify-qt/default.nix +++ b/pkgs/applications/audio/spotify-qt/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; - postInstall = lib.optionalString stdenvNoCC.isDarwin '' + postInstall = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/spotify-qt.app $out/Applications ln $out/Applications/spotify-qt.app/Contents/MacOS/spotify-qt $out/bin/spotify-qt diff --git a/pkgs/applications/audio/spotify/darwin.nix b/pkgs/applications/audio/spotify/darwin.nix index 8304bdf3a15d9..bc643d4f1b6ee 100644 --- a/pkgs/applications/audio/spotify/darwin.nix +++ b/pkgs/applications/audio/spotify/darwin.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = "1.2.40.599.g606b7f29"; - src = if stdenv.isAarch64 then ( + src = if stdenv.hostPlatform.isAarch64 then ( fetchurl { url = "https://web.archive.org/web/20240622065234/https://download.scdn.co/SpotifyARM64.dmg"; hash = "sha256-mmjxKYmsX0rFlIU19JOfPbNgOhlcZs5slLUhDhlON1c="; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index df6d762c65efd..fe49e680908f0 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -18,6 +18,6 @@ let mainProgram = "spotify"; }; -in if stdenv.isDarwin +in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix (extraArgs // { inherit pname meta; }) else callPackage ./linux.nix (extraArgs // { inherit pname meta; }) diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 1f0ef0760112a..3383e47cb8fe6 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -14,14 +14,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.42.290.g242057a2"; + version = "1.2.45.454.gc16ec9f6"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "78"; + rev = "79"; deps = [ alsa-lib @@ -88,7 +88,7 @@ stdenv.mkDerivation { src = fetchurl { name = "spotify-${version}-${rev}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - hash = "sha512-3kT7SA2Q1OxgDa5duivIiHaxcROBAFjDnTx6rw2ya6o5yOVygseS02zBgWg2Qd8jq0721KbYC83u9M+MWtWhhA=="; + hash = "sha512-F1Npz/oKCsMKaQx2M5dm1dhWhaSlt8422tpRWnwuk2yjwLWrOYDY2uKYph8YFXfOdS3mV6u5yVlzgFdDqAFmCQ=="; }; nativeBuildInputs = [ wrapGAppsHook3 makeShellWrapper squashfsTools ]; diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix index 6bef356172cd5..f581ae1b1cb64 100644 --- a/pkgs/applications/audio/stone-phaser/default.nix +++ b/pkgs/applications/audio/stone-phaser/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/jpcima/stone-phaser"; description = "Classic analog phaser effect, made with DPF and Faust"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index f46ba519951b7..7fedaf3c2fd8d 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-REoki+8rneQ+4rL9rC7Md5Hrj6ftd7RePEF1fK4FnKY="; + hash = "sha256-86AMmp8R9/NibTsMFTTFcMeIqZ5x8din9RcBvhGO9xg="; fetchSubmodules = true; }; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { taglib qtbase qtx11extras - ] ++ optionals stdenv.isLinux [ + ] ++ optionals stdenv.hostPlatform.isLinux [ libgpod libpulseaudio libselinux @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { pkg-config qttools wrapQtAppsHook - ] ++ optionals stdenv.isLinux [ + ] ++ optionals stdenv.hostPlatform.isLinux [ util-linux ]; diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 3fd4f9ecf6af4..173ced9ca525f 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.9.2"; + version = "3.9.3"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-Bmi1U/SmYENlwsysAHsgFODU7R1RnU3xqbwhPEwsGcM="; + hash = "sha256-KAtOnTf3foOILDfTjVpkCOG6jsyS5fv0/Wv9Zcut2oE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/tagger/deps.nix b/pkgs/applications/audio/tagger/deps.nix index 76ab54d970960..231c388ebe678 100644 --- a/pkgs/applications/audio/tagger/deps.nix +++ b/pkgs/applications/audio/tagger/deps.nix @@ -28,10 +28,7 @@ (fetchNuGet { pname = "MetaBrainz.MusicBrainz"; version = "6.1.0"; hash = "sha256-wZBTTSQNPll/5/sZPPxa6d0QBjwA8FLA2vFE/838VWs="; }) (fetchNuGet { pname = "MetaBrainz.MusicBrainz.CoverArt"; version = "6.0.0"; hash = "sha256-yN+godNeB6l8ihNupq9cNe+PaYaPTngHJzwkMH9ySbE="; }) (fetchNuGet { pname = "Meziantou.Framework.Win32.CredentialManager"; version = "1.4.5"; hash = "sha256-aJyLlVg6jKY2Van0hwAC5JEF/j+YtEq5ZFLkyI3scsY="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.6"; hash = "sha256-wvudYblAZ5vOdQ/3Ssl24exAXRkhOG7KBZUjquLGo5o="; }) (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.0"; hash = "sha256-aew8/vRyzCc7MMNHziR8tsg66EFkJC+Snst3F+a3Ehc="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.6"; hash = "sha256-7kLTos2RiNJOmxg6NcM8QieifWMHgxHgd5e+DBNQI0Q="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.6"; hash = "sha256-oAQI/uV0G/uEFp+2yAyhILZ6hr9t+oWh9TEY646Vphk="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; hash = "sha256-5rFBJ8Fkw7+11iCG9nMVhOqPCpyVIrbUzrFQhc/2eHw="; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; hash = "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="; }) (fetchNuGet { pname = "Nickvision.Aura"; version = "2023.11.4"; hash = "sha256-us9K5RayuZGe2fkhk/c2Qw45gKmrfvyNBvHdcOnzWj0="; }) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index b7e954abc4df0..3ed875b668bae 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.8.2"; + version = "7.8.3"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "Tauon"; rev = "v${finalAttrs.version}"; - hash = "sha256-fVp3RWRNIBSeALbYNRIYjyWNH9An+YnS7neQt0x33yI="; + hash = "sha256-A7JRJ0Eh0ynuwPYZFLEeqWLf6OKdN59jM2vozdpSZC8="; }; postUnpack = '' @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { setproctitle ] ++ lib.optional withDiscordRPC pypresence - ++ lib.optional stdenv.isLinux pulsectl; + ++ lib.optional stdenv.hostPlatform.isLinux pulsectl; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index 160a032fd648b..0ef4ed73787bc 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { makeWrapper pkg-config python3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ linuxHeaders ]; @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { twolame wxGTK32 gtk3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ at-spi2-core dbus libepoxy diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index c36240558b722..c4a42aa3837c7 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -6,11 +6,13 @@ , dbus , Foundation , fetchFromGitHub +, fetchpatch , glib , gst_all_1 , IOKit , lib , MediaPlayer +, mpv-unwrapped , openssl , pkg-config , protobuf @@ -22,26 +24,42 @@ rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "tramhao"; repo = "termusic"; rev = "v${version}"; - hash = "sha256-FOFZg32hrWpKVsjkMDkiqah7jmUZw0HRWGqOvsN0t8Q="; + hash = "sha256-aEkg1j6R86QGn21HBimtZwmjmW1K9Wo+67G4DlpY960="; }; + cargoPatches = [ + # both following patches can be removed with the follow up release to 0.9.1 as they are cherry-picked from `termusic/master` branch + # fix build issue with 0.9.1 release and vendoring producing wrong hash for soundtouch-ffi + (fetchpatch { + url = "https://github.com/tramhao/termusic/commit/211fc3fe008932d052d31d3b836e8a80eade3cfe.patch"; + hash = "sha256-11kSI28YonoTe5W31+R76lGhNiN1ZLAg94FrfYiZUAY="; + }) + # fix a bug through previous patch + (fetchpatch { + url = "https://github.com/tramhao/termusic/commit/2a40b2f366dfa5c1f008c79a3ff5c1bbf53fe10f.patch"; + hash = "sha256-b7CJ5SqxrU1Jr4GDaJe9sFutDHMqIQxGhXbBFGB6y84="; + }) + ]; + postPatch = '' pushd $cargoDepsCopy/stream-download oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) substituteInPlace $cargoDepsCopy/stream-download/src/lib.rs \ --replace-warn '#![doc = include_str!("../README.md")]' "" substituteInPlace .cargo-checksum.json \ - --replace $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) + --replace-warn $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) popd ''; - cargoHash = "sha256-r5FOl3Bp3GYhOhvWj/y6FXsuG2wvuFcMcYKBzVBVqiM="; + cargoHash = "sha256-4PprZdTIcYa8y7FwQVrG0ZBg7N/Xe6HDt/z6ZmaHd5Y="; + + useNextest = true; nativeBuildInputs = [ pkg-config @@ -53,9 +71,10 @@ rustPlatform.buildRustPackage rec { dbus glib gst_all_1.gstreamer + mpv-unwrapped openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreAudio CoreGraphics @@ -63,7 +82,7 @@ rustPlatform.buildRustPackage rec { IOKit MediaPlayer Security - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index c76c6c6a4f869..1a5b41808a752 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -4,6 +4,7 @@ , autoPatchelfHook , dpkg , makeWrapper +, wrapGAppsHook3 , alsa-lib , at-spi2-atk , at-spi2-core @@ -37,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.15.0"; + version = "5.16.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-0OXNynf56On+emLO0ZfNIcoT3GEhSXdoQhfxapLYYic="; + sha256 = "sha256-gDinm7kILm4SKlWmaJ1grwRuketGs/aWlJfNEF+AIRo="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook3 ]; buildInputs = [ alsa-lib diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index 9e83c0472ff53..e63be43fe6b5d 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.3.4.209"; + version = "1.3.5.212"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-dAyZ/x6ZUYst+3Hz8RL4+FW1oeb+652Zndpqp0JnGgs="; - armv7l-linux = "sha256-ub+qcWrpv+LiXbEq6YQczJN1E4c2i/ZtKbh5e2PMuH0="; - x86_64-linux = "sha256-c8hPbJo4MUqS0Ev5QzLujJJB3hqN3KMsLVdKb6MKNts="; + aarch64-linux = "sha256-eaZNiZsmPHKvgvcfs8LcJjbHas+AlnRniBhAet1ld0E="; + armv7l-linux = "sha256-/ZIUen0qYRcfG6WmO3K3n1xIhUY3JqZFO7Pwnw3c/9c="; + x86_64-linux = "sha256-5KBrelfElsnGHcJObIj8CJ5L3jJO54tSjlEUcXhH/lE="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index 4bec1952e03eb..22e18502866ae 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { ln -s $out/${startScript} $out/bin/virtual-ans ''; - startScript = if stdenv.isx86_32 then "START_LINUX_X86" - else if stdenv.isx86_64 then "START_LINUX_X86_64" - #else if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin + startScript = if stdenv.hostPlatform.isx86_32 then "START_LINUX_X86" + else if stdenv.hostPlatform.isx86_64 then "START_LINUX_X86_64" + #else if stdenv.hostPlatform.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin else abort "Unsupported platform: ${stdenv.hostPlatform.linuxArch}."; - linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86" - else if stdenv.isx86_64 then "pixilang_linux_x86_64" + linuxExecutable = if stdenv.hostPlatform.isx86_32 then "pixilang_linux_x86" + else if stdenv.hostPlatform.isx86_64 then "pixilang_linux_x86_64" else ""; meta = with lib; { diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 877f670d68617..4325d934e84b5 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libogg libvorbis libao curl speex flac ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { description = "Extra tools for Ogg-Vorbis audio codec"; diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index 93dd7bf6fb235..49c66b07a91c6 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "ReplayGain for wave files"; homepage = "https://github.com/MestreLion/wavegain"; license = lib.licenses.lgpl21; diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/applications/audio/waylyrics/default.nix index e3cf437258df9..ca43d76b55812 100644 --- a/pkgs/applications/audio/waylyrics/default.nix +++ b/pkgs/applications/audio/waylyrics/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.3.13"; + version = "0.3.15"; src = fetchFromGitHub { owner = "waylyrics"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-hx0g5JBf0v7B26GCcU5BkmxVvbHQNPSQ2d+ohDk3080="; + hash = "sha256-iW3NIPdnMoardC95kgU/jgzHy7qu/7wpJrkMdJE/r9U="; }; - cargoHash = "sha256-v1+1ivbJAZLqnnFaR6vmpcZ7vd5j3afZliggXaHiwWM="; + cargoHash = "sha256-3nPLi7/F8AG5pqHHPHzLCbXKZFeV/Z+LR3nK2BbrlEE="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ openssl dbus ]; diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index 3234a719e3c00..4a802a324e8a0 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Drum sample player LV2 plugin dedicated to Glen MacArthur's AVLdrums"; homepage = "https://x42-plugins.com/x42/x42-avldrums"; maintainers = with maintainers; [ magnetophon orivej ]; diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/applications/audio/x42-gmsynth/default.nix index 8f83263d0a000..1d31211ec80d6 100644 --- a/pkgs/applications/audio/x42-gmsynth/default.nix +++ b/pkgs/applications/audio/x42-gmsynth/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Chris Colins' General User soundfont player LV2 plugin"; homepage = "https://x42-plugins.com/x42/x42-gmsynth"; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index efd5fb9caa60d..8abce73aff1ff 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxmp ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit CoreAudio ]; meta = with lib; { description = "Extended module player"; diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index 59d33a00511b4..046203416a032 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -27,30 +27,30 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ makeWrapper python3 nodejs pnpm.configHook ] - ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ]; ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - postBuild = lib.optionalString stdenv.isDarwin '' + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' cp -R ${electron.dist}/Electron.app Electron.app chmod -R u+w Electron.app '' + '' pnpm build ./node_modules/.bin/electron-builder \ --dir \ - -c.electronDist=${if stdenv.isDarwin then "." else electron.dist} \ + -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \ -c.electronVersion=${electron.version} ''; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv pack/mac*/YouTube\ Music.app $out/Applications makeWrapper $out/Applications/YouTube\ Music.app/Contents/MacOS/YouTube\ Music $out/bin/youtube-music - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/share/lib/youtube-music" cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/youtube-music" @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' makeWrapper ${electron}/bin/electron $out/bin/youtube-music \ --add-flags $out/share/lib/youtube-music/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index e99ef4225cc80..28315b0a3701b 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -206,7 +206,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Automated and intuitive digital audio workstation"; maintainers = with maintainers; [ tshaynik magnetophon yuu astavie PowerUser64 ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; license = licenses.agpl3Plus; }; }) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 6f5512d4fa33b..59f0310263a4d 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -16,7 +16,7 @@ , zlib # Optional dependencies -, alsaSupport ? stdenv.isLinux +, alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib , dssiSupport ? false , dssi @@ -28,7 +28,7 @@ , ossSupport ? true , portaudioSupport ? true , portaudio -, sndioSupport ? stdenv.isOpenBSD +, sndioSupport ? stdenv.hostPlatform.isOpenBSD , sndio # Optional GUI dependencies @@ -122,7 +122,7 @@ in stdenv.mkDerivation rec { lib.optionals lashSupport [ "PortChecker" ] # Tests fail on aarch64 - ++ lib.optionals stdenv.isAarch64 [ "MessageTest" "UnisonTest" ]; + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "MessageTest" "UnisonTest" ]; in '' runHook preCheck ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' @@ -168,6 +168,6 @@ in stdenv.mkDerivation rec { # - ZynAddSubFX LV2 & VST plugin fail to compile (not setup to use ObjC version of pugl) # - TTL generation crashes (`pointer being freed was not allocated`) for all VST plugins using AbstractFX # - Zest UI fails to start on pulg_setup: Could not open display, aborting. - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index 3d919449be3ee..f446dc47fffb3 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-Z9vRuz5PwOhJ3DQD9zvCilgTMww7bRL4aR6fRoHIayI="; + hash = "sha256-DtLGD7+Ydj2fvEHU+bDQDMC/E/9VgrlVNMCG6OlPmfg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-hcfkwxwLOUBMj6rvhI5F4OO9UaSP7CAE0JNOGlh2lVY="; + hash = "sha256-8nFkc77FiLxMA1hMm8k5VB84l+pQeL0JSzYDytXrNUE="; }; patches = [ diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index fdac36e492f25..1ffdeca5b38db 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -1,25 +1,11 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + fetchpatch, + python3, }: -let - python = python3.override { - packageOverrides = self: super: { - pyunifiprotect = super.pyunifiprotect.overridePythonAttrs { - version = "unstable-2024-06-08"; - src = fetchFromGitHub { - owner = "ep1cman"; - repo = "pyunifiprotect"; - rev = "d967bca2c65e0aa6a7363afb6367c3745c076747"; - hash = "sha256-gSAK/T9cjIiRC/WjwrdLP+LHzEEUsNbwpXClYqpnMio="; - }; - }; - }; - }; -in - -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; version = "0.11.0"; pyproject = true; @@ -31,18 +17,25 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-t4AgPFqKS6u9yITIkUUB19/SxVwR7X8Cc01oPx3M+E0="; }; + patches = [ + # Switch to using UIProtect library, https://github.com/ep1cman/unifi-protect-backup/pull/160 + (fetchpatch { + name = "switch-uiprotect.patch"; + url = "https://github.com/ep1cman/unifi-protect-backup/commit/ccf2cde27229ade5c70ebfa902f289bf1a439f64.patch"; + hash = "sha256-kogl/crvLE+7t9DLTuZqeW3/WB5/sytWDgbndoBw+RQ="; + }) + ]; + pythonRelaxDeps = [ "aiorun" "aiosqlite" "click" - "pyunifiprotect" + "uiprotect" ]; - nativeBuildInputs = with python.pkgs; [ - poetry-core - ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiocron aiolimiter aiorun @@ -52,12 +45,10 @@ python.pkgs.buildPythonApplication rec { click expiring-dict python-dateutil - pyunifiprotect + uiprotect ]; - nativeCheckInputs = with python.pkgs; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; meta = with lib; { description = "Python tool to backup unifi event clips in realtime"; diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index b620459f3c738..8bc6e719718ad 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { wrapQtAppsHook ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 776aa155a2fef..7e9981cc39ec2 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -38,9 +38,9 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; buildInputs = - lib.optional stdenv.isDarwin Security - ++ lib.optional (withGui && stdenv.isLinux) webkitgtk - ++ lib.optionals (withGui && stdenv.isDarwin) [ + lib.optional stdenv.hostPlatform.isDarwin Security + ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk + ++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [ Cocoa WebKit ]; @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { "--skip=dns::client::tests::test_udp_client" ]; - postInstall = lib.optionalString (withGui && stdenv.isLinux) '' + postInstall = lib.optionalString (withGui && stdenv.hostPlatform.isLinux) '' wrapProgram $out/bin/alfis \ --prefix PATH : ${lib.makeBinPath [ zenity ]} ''; @@ -62,10 +62,11 @@ rustPlatform.buildRustPackage rec { meta = { description = "Alternative Free Identity System"; homepage = "https://alfis.name"; + changelog = "https://github.com/Revertron/Alfis/releases/tag/v${version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ misuzu ]; platforms = lib.platforms.unix; mainProgram = "alfis"; - broken = withGui && stdenv.isDarwin; + broken = withGui && stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/blockchains/aperture/default.nix b/pkgs/applications/blockchains/aperture/default.nix index 90591889df5d7..043b0311cca89 100644 --- a/pkgs/applications/blockchains/aperture/default.nix +++ b/pkgs/applications/blockchains/aperture/default.nix @@ -21,6 +21,7 @@ buildGoModule rec { meta = with lib; { description = "L402 (Lightning HTTP 402) Reverse Proxy"; homepage = "https://github.com/lightninglabs/aperture"; + changelog = "https://github.com/lightninglabs/aperture/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sputn1ck HannahMR ]; mainProgram = "aperture"; diff --git a/pkgs/applications/blockchains/atomic-swap/default.nix b/pkgs/applications/blockchains/atomic-swap/default.nix index a2e2e9efbffb9..f652f74be27fd 100644 --- a/pkgs/applications/blockchains/atomic-swap/default.nix +++ b/pkgs/applications/blockchains/atomic-swap/default.nix @@ -35,6 +35,7 @@ buildGoModule { meta = with lib; { homepage = "https://github.com/AthanorLabs/atomic-swap"; + changelog = "https://github.com/AthanorLabs/atomic-swap/releases/tag/v${version}"; description = "ETH-XMR atomic swap implementation"; license = with licenses; [ lgpl3Only ]; maintainers = with maintainers; [ happysalada lord-valen ]; diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index ef985a2806b7b..4c61c75a4f07c 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: rec { sha256 = "sha256-CC24z0+2dSeqDddX5dJUs7SX9QJ8Iyh/nAp0pqdDvwg="; }; - buildInputs = lib.optionals stdenv.isLinux [ jemalloc ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ jemalloc ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: rec { cp -r lib $out/ wrapProgram $out/bin/${pname} \ --set JAVA_HOME "${jre}" \ - --suffix ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} : ${lib.makeLibraryPath buildInputs} + --suffix ${if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} : ${lib.makeLibraryPath buildInputs} ''; passthru.tests = { @@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = with lib; { description = "Enterprise-grade Java-based, Apache 2.0 licensed Ethereum client"; homepage = "https://www.hyperledger.org/projects/besu"; + changelog = "https://github.com/hyperledger/besu/blob/${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 097acda8e8e90..e7e5f0f5a2c4d 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Decentralized bitcoin exchange network"; homepage = "https://bisq.network"; + changelog = "https://github.com/bisq-network/bisq/releases/tag/v${version}"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ juaningan emmanuelrosa ]; diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 8ead5982b8555..8ae8a998b76c4 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -79,9 +79,10 @@ mkDerivation rec { Bitcoin ABC is a fork of the Bitcoin Core software project. ''; homepage = "https://bitcoinabc.org/"; + changelog = "https://www.bitcoinabc.org/doc/release-notes/release-notes-${version}.html"; maintainers = with maintainers; [ lassulus ]; license = licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; platforms = platforms.unix; mainProgram = "bitcoin-cli"; }; diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index c6838e0a0f65f..e0db12dc167c1 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -42,14 +42,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ lib.optionals stdenv.isLinux [ util-linux ] - ++ lib.optionals stdenv.isDarwin [ hexdump ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] ++ lib.optionals withWallet [ sqlite ] - ++ lib.optionals (withWallet && !stdenv.isDarwin) [ db48 ] + ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; configureFlags = [ @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Derivative of Bitcoin Core with a collection of improvements"; homepage = "https://bitcoinknots.org/"; + changelog = "https://github.com/bitcoinknots/bitcoin/blob/v${version}/doc/release-notes.md"; maintainers = with maintainers; [ prusnak mmahut ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 960ccf4183064..e3eb1cf3bc31b 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -54,15 +54,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] - ++ lib.optionals stdenv.isLinux [ util-linux ] - ++ lib.optionals stdenv.isDarwin [ hexdump ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] ++ lib.optionals withWallet [ sqlite ] # building with db48 (for legacy descriptor wallet support) is broken on Darwin - ++ lib.optionals (withWallet && !stdenv.isDarwin) [ db48 ] + ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; postInstall = '' @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png ''; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export MACOSX_DEPLOYMENT_TARGET=10.13 ''; diff --git a/pkgs/applications/blockchains/btcd/default.nix b/pkgs/applications/blockchains/btcd/default.nix index 75b14613b8ae0..aeda8019c10dd 100644 --- a/pkgs/applications/blockchains/btcd/default.nix +++ b/pkgs/applications/blockchains/btcd/default.nix @@ -25,6 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Alternative full node bitcoin implementation written in Go (golang)"; homepage = "https://github.com/btcsuite/btcd"; + changelog = "https://github.com/btcsuite/btcd/releases/tag/v${version}"; license = licenses.isc; maintainers = with maintainers; [ _0xB10C ]; }; diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index 9e7c0f26c6248..81f9241453f57 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Bitcoin Script Debugger"; homepage = "https://github.com/bitcoin-core/btcdeb"; + changelog = "https://github.com/bitcoin-core/btcdeb/releases"; license = licenses.mit; maintainers = with maintainers; [ akru ]; platforms = platforms.unix; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 3d97da4895cb9..b8cf51b73feb8 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -31,6 +31,7 @@ buildDotnetModule rec { meta = with lib; { description = "Self-hosted, open-source cryptocurrency payment processor"; homepage = "https://btcpayserver.org"; + changelog = "https://github.com/btcpayserver/btcpayserver/blob/v${version}/Changelog.md"; maintainers = with maintainers; [ kcalvinalvin erikarvstedt ]; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index ac9595ce4123d..9f84685e8c105 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -20,28 +20,28 @@ , jq }: let - py3 = python3.withPackages (p: [ p.mako ]); + py3 = python3.withPackages (p: [ p.distutils p.mako ]); in stdenv.mkDerivation rec { pname = "clightning"; - version = "24.05"; + version = "24.08.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - hash = "sha256-FD7JFM80wrruqBWjYnJHZh2f2GZJ6XDQmUQ0XetnWBg="; + hash = "sha256-2ZKvhNuzGftKwSdmMkHOwE9UEI5Ewn5HHSyyZUcCwB4="; }; # when building on darwin we need cctools to provide the correct libtool # as libwally-core detects the host as darwin and tries to add the -static # option to libtool, also we have to add the modified gsed package. nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ] - ++ lib.optionals stdenv.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ]; buildInputs = [ gmp libsodium sqlite zlib jq ]; # this causes some python trouble on a darwin host so we skip this step. # also we have to tell libwally-core to use sed instead of gsed. - postPatch = if !stdenv.isDarwin then '' + postPatch = if !stdenv.hostPlatform.isDarwin then '' patchShebangs \ tools/generate-wire.py \ tools/update-mocks.sh \ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { # workaround for build issue, happens only x86_64-darwin, not aarch64-darwin # ccan/ccan/fdpass/fdpass.c:16:8: error: variable length array folded to constant array as an extension [-Werror,-Wgnu-folding-constant] # char buf[CMSG_SPACE(sizeof(fd))]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-Wno-error=gnu-folding-constant"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "-Wno-error=gnu-folding-constant"; # The `clnrest` plugin requires a Python environment to run postInstall = '' diff --git a/pkgs/applications/blockchains/dcrwallet/default.nix b/pkgs/applications/blockchains/dcrwallet/default.nix index 07dc5b24bc987..1773d45157ce1 100644 --- a/pkgs/applications/blockchains/dcrwallet/default.nix +++ b/pkgs/applications/blockchains/dcrwallet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dcrwallet"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "decred"; repo = "dcrwallet"; rev = "release-v${version}"; - hash = "sha256-sRwGpOVydfZjgo7W+4RsHC4JElPyilbV5xhcHxPh2Wc="; + hash = "sha256-JKux64ANtoBumfVU2OyAyLgHDNZMe/bn+SMuQ8qV43M="; }; - vendorHash = "sha256-lVVIS3FL8XwthCpzRKdw59NVtHVxXQ0ouD7jYQzOecM="; + vendorHash = "sha256-ic8328r3BpycC2NiErTiFtRIkQaBhYcBwRgq/t9hmT8="; subPackages = [ "." ]; diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index f89b340977942..868ffaf6e0cdc 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -11,16 +11,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-tAHN5HWI9XsiCQzqLNtiib9wMskjfogc44+b4Bsjpog="; + hash = "sha256-yp9fKD7zH9Ne2+WQUupaxvUx39RWE8RdY4U6lHuDGSc="; }; - cargoHash = "sha256-M0DIKt41K3BcP43+fBhv3HbRcIh8U9nhQYA/sm+bNow="; + cargoHash = "sha256-J+6aek1PcW7G6f4h6cQcx5CyliryZeSxkSIQUX3yz6s="; # needed for librocksdb-sys nativeBuildInputs = [ rustPlatform.bindgenHook ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; passthru.updateScript = ./update.sh; diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index 90bc9195f9b56..01abe7c2974e3 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -44,9 +44,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ lib.optionals stdenv.isLinux [ util-linux ] - ++ lib.optionals stdenv.isDarwin [ hexdump ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { # fix "Killed: 9 test/test_bitcoin" # https://github.com/NixOS/nixpkgs/issues/179474 - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "fortify" "stackprotector" ]; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/applications/blockchains/framesh/default.nix b/pkgs/applications/blockchains/framesh/default.nix index 6c39d9d212d66..b4673ca4cff90 100644 --- a/pkgs/applications/blockchains/framesh/default.nix +++ b/pkgs/applications/blockchains/framesh/default.nix @@ -14,13 +14,12 @@ let in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/frame.desktop $out/share/applications/frame.desktop install -m 444 -D ${appimageContents}/frame.png \ $out/share/icons/hicolor/512x512/apps/frame.png - - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/${pname}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index 189af6c028691..8c45ab4857028 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-VY6yUdmU8MLwSH3VeAWCGbdouOxGrhDc1usYj70jrd8="; + sha256 = "sha256-+hBc7jW1MVLVjYXNOV7QvFJJpZ5RzW5/c9NdqOXrsj0="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index e3acd14a5a9ee..18861f0214319 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] - ++ lib.optionals stdenv.isLinux [ util-linux ] - ++ lib.optionals stdenv.isDarwin [ hexdump ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { install -Dm644 share/pixmaps/groestlcoin256.png $out/share/pixmaps/groestlcoin.png ''; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export MACOSX_DEPLOYMENT_TARGET=10.13 ''; diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index 32ec63a3f8cc0..e433aa562cf66 100644 --- a/pkgs/applications/blockchains/haven-cli/default.nix +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "haven-cli"; - version = "4.0.2"; + version = "4.1.0"; src = fetchFromGitHub { owner = "haven-protocol-org"; repo = "haven-main"; rev = "v${version}"; - hash = "sha256-XjRxpUW7NC12T5G7fol4avWLJDOOawxJbAHOp5eZ0Fk="; + hash = "sha256-UPDhvARXatqvxwsuSfxdasVcLbjkXOpK8yY7GoEPxxw="; fetchSubmodules = true; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { zeromq pcsclite readline libsodium hidapi randomx rapidjson protobuf readline easyloggingpp - ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit CoreData PCSC ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "-DReadline_ROOT_DIR=${readline.dev}" "-DReadline_INCLUDE_DIR=${readline.dev}/include/readline" "-DRandomX_ROOT_DIR=${randomx}" - ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF" ++ lib.optional (!trezorSupport) "-DUSE_DEVICE_TREZOR=OFF"; outputs = [ "out" "source" ]; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index ce40616c5e40b..cfd9193f08be5 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -16,13 +16,14 @@ in appimageTools.wrapType2 rec { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = '' install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/${pname}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 83dd93effb150..2afce895da6e5 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -6,7 +6,7 @@ , lighthouse , nix-update-script , nodePackages -, perl +, openssl , pkg-config , postgresql , protobuf @@ -57,7 +57,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook cmake - perl pkg-config protobuf ]; @@ -65,7 +64,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security SystemConfiguration @@ -84,6 +85,8 @@ rustPlatform.buildRustPackage rec { LIGHTHOUSE_DEPOSIT_CONTRACT_SPEC_URL = "file://${depositContractSpec}"; LIGHTHOUSE_DEPOSIT_CONTRACT_TESTNET_URL = "file://${testnetDepositContractSpec}"; + OPENSSL_NO_VENDOR = true; + cargoBuildFlags = [ "--package lighthouse" ]; @@ -121,7 +124,7 @@ rustPlatform.buildRustPackage rec { "--skip persist::test_persist_caches" "--skip service::tests::tests::test_dht_persistence" "--skip time::test::test_reinsertion_updates_timeout" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "--skip subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart" "--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch" "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" diff --git a/pkgs/applications/blockchains/litecoin/default.nix b/pkgs/applications/blockchains/litecoin/default.nix index 8a3c6a2657aae..0f923fb8f6b8e 100644 --- a/pkgs/applications/blockchains/litecoin/default.nix +++ b/pkgs/applications/blockchains/litecoin/default.nix @@ -46,7 +46,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib zeromq fmt miniupnpc glib protobuf util-linux libevent ] - ++ lib.optionals stdenv.isDarwin [ AppKit ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] ++ lib.optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] @@ -62,7 +62,7 @@ mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Lite version of Bitcoin using scrypt as a proof-of-work algorithm"; longDescription= '' Litecoin is a peer-to-peer Internet currency that enables instant payments diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index 87bc32bd1af5a..e015a5ceea1b6 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -1,21 +1,37 @@ { buildGoModule , fetchFromGitHub , lib -, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ] +, tags ? [ + # `RELEASE_TAGS` from https://github.com/lightningnetwork/lnd/blob/master/make/release_flags.mk + "autopilotrpc" + "chainrpc" + "invoicesrpc" + "kvdb_etcd" + "kvdb_postgres" + "kvdb_sqlite" + "monitoring" + "neutrinorpc" + "peersrpc" + "signrpc" + "walletrpc" + "watchtowerrpc" + # Extra tags useful for testing + "routerrpc" + ] }: buildGoModule rec { pname = "lnd"; - version = "0.18.2-beta"; + version = "0.18.3-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - hash = "sha256-qqvLnJlFGeCizm6T9iUwvYLjWpAeZwbuzQlUUopwrjc="; + hash = "sha256-CNCMVYuLUVmNgW5YTTn3TR1+2UCLbF3/gXXZWiREj/E="; }; - vendorHash = "sha256-BxNtZzwmKJ/kZk7ndtEUC4bMGpd8LEhFFu4Z49bKydE="; + vendorHash = "sha256-dr8Ra8ywy+Zow8JF3K21XZ7lDIIdxvjRz+OD3E+348o="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/applications/blockchains/miniscript/default.nix index 8a842d507b0cb..0c3ad55ab4405 100644 --- a/pkgs/applications/blockchains/miniscript/default.nix +++ b/pkgs/applications/blockchains/miniscript/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-qkYDzsl2Y4WEDDXs9cE/jIXm01jclkYUQbDGe1S0wYs="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Replace hardcoded g++ with c++ so clang can be used # on darwin substituteInPlace Makefile \ diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index 50d5d1b109a3e..7e87695e78c87 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -1,9 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch2, cmake, ninja, pkg-config -, boost, miniupnpc, openssl, unbound -, zeromq, pcsclite, readline, libsodium, hidapi -, randomx, rapidjson -, CoreData, IOKit, PCSC -, trezorSupport ? true, libusb1, protobuf, python3 +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + boost, + libsodium, + miniupnpc, + openssl, + python3, + randomx, + rapidjson, + readline, + unbound, + zeromq, + + # darwin + CoreData, + IOKit, + + trezorSupport ? true, + hidapi, + libusb1, + protobuf_21, + udev, }: let @@ -25,40 +45,16 @@ in stdenv.mkDerivation rec { pname = "monero-cli"; - version = "0.18.3.3"; + version = "0.18.3.4"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - hash = "sha256-1LkKIrud317BEE+713t5wiJV6FcDlJdj4ypXPR0bKTs="; + hash = "sha256-nDiFJjhsISYM8kTgJUaPYL44iyccnz5+Pd5beBh+lsM="; }; - patches = [ - # cmake: remove unused/extera cmake/FindMiniupnpc.cmake and only rely on external/miniupnpc - # https://github.com/monero-project/monero/pull/9366 - (fetchpatch2 { - url = "https://github.com/monero-project/monero/commit/5074a543a49f7e23fb39b6462fd4c4c9741c3693.patch?full_index=1"; - hash = "sha256-dS2hhEU6m2of0ULlsf+/tZMHUmq3vGGXJPGHvtnpQnY="; - }) - - # cmake: add different parameters to add_monero_library. - # https://github.com/monero-project/monero/pull/9367 - (fetchpatch2 { - url = "https://github.com/monero-project/monero/commit/b91ead90254ac6d6daf908f689c38e372a44c615.patch?full_index=1"; - hash = "sha256-DL2YqkvEONbeEDqLOAo2eSF5JF5gOzKcLKeNlUXBY1w="; - }) - - # external: update miniupnpc to 2.2.8 - # https://github.com/monero-project/monero/pull/9367 - (fetchpatch2 { - url = "https://github.com/monero-project/monero/commit/d81da086ec5088a04b3f7b34831e72910300e2f7.patch?full_index=1"; - hash = "sha256-ZJGiDMk5DMmEXwzoUYPC+DIoebluFh54kMQtQU78ckI="; - excludes = [ "external/miniupnp" ]; - }) - - ./use-system-libraries.patch - ]; + patches = [ ./use-system-libraries.patch ]; postPatch = '' # manually install submodules @@ -69,31 +65,60 @@ stdenv.mkDerivation rec { cp -r . $source ''; - nativeBuildInputs = [ cmake ninja pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ - boost miniupnpc openssl unbound - zeromq pcsclite readline - libsodium hidapi randomx rapidjson - protobuf - ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ] - ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; + buildInputs = + [ + boost + libsodium + miniupnpc + openssl + randomx + rapidjson + readline + unbound + zeromq + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + IOKit + CoreData + ] + ++ lib.optionals trezorSupport [ + python3 + hidapi + libusb1 + protobuf_21 + ] + ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ + udev + ]; - cmakeFlags = [ - "-DUSE_DEVICE_TREZOR=ON" - "-DBUILD_GUI_DEPS=ON" - "-DReadline_ROOT_DIR=${readline.dev}" - "-DRandomX_ROOT_DIR=${randomx}" - ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + cmakeFlags = + [ + # skip submodules init + "-DMANUAL_SUBMODULES=ON" + # required by monero-gui + "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" + ] + ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF" + ++ lib.optional trezorSupport [ + "-DUSE_DEVICE_TREZOR=ON" + # fix build on recent gcc versions + "-DCMAKE_CXX_FLAGS=-fpermissive" + ]; outputs = [ "out" "source" ]; - meta = with lib; { + meta = { description = "Private, secure, untraceable currency"; - homepage = "https://getmonero.org/"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ rnhmjoj ]; + homepage = "https://getmonero.org/"; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ rnhmjoj ]; mainProgram = "monero-wallet-cli"; }; } diff --git a/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch b/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch index f8629d47553c6..adb41fb4ac25a 100644 --- a/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch +++ b/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch @@ -1,14 +1,15 @@ diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index f8b834ac17...520e148428 100644 +index 5b7f69a56..cc4b0a346 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt -@@ -39,23 +39,12 @@ - add_compile_options(-D_GNU_SOURCE) - endif() +@@ -35,25 +35,14 @@ + # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with + # others. +-find_package(Miniupnpc REQUIRED) +- -message(STATUS "Using in-tree miniupnpc") -set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) --set(UPNPC_BUILD_TESTS FALSE CACHE BOOL "Disable miniupnp internal tests." FORCE) -add_subdirectory(miniupnp/miniupnpc) -set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") -set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -20,19 +21,58 @@ index f8b834ac17...520e148428 100644 -if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") -endif() -+include(FindPkgConfig) -+pkg_check_modules(MINIUPNPC REQUIRED IMPORTED_TARGET GLOBAL miniupnpc) -+get_target_property(MINIUPNPC_INCLUDE_DIR PkgConfig::MINIUPNPC INTERFACE_INCLUDE_DIRECTORIES) -+set_target_properties(PkgConfig::MINIUPNPC PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${MINIUPNPC_INCLUDE_DIR}/miniupnpc") -+set(UPNP_LIBRARIES PkgConfig::MINIUPNPC PARENT_SCOPE) - --set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) - +-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(MINIUPNPC REQUIRED miniupnpc) ++link_libraries(${MINIUPNPC_LIBRARIES}) ++include_directories(${MINIUPNPC_INCLUDE_DIRS}) + ++find_package(RapidJSON) find_package(Unbound) ++find_library(RANDOMX_LIBRARY randomx) if(NOT UNBOUND_INCLUDE_DIR) -@@ -72,4 +61,3 @@ + die("Could not find libunbound") +@@ -69,4 +58,3 @@ endif() add_subdirectory(db_drivers) add_subdirectory(easylogging++) add_subdirectory(qrcodegen) -add_subdirectory(randomx EXCLUDE_FROM_ALL) +diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl +index 71f5393e8..bb48083d0 100644 +--- a/src/p2p/net_node.inl ++++ b/src/p2p/net_node.inl +@@ -60,9 +60,9 @@ + #include "cryptonote_core/cryptonote_core.h" + #include "net/parse.h" + +-#include <miniupnp/miniupnpc/miniupnpc.h> +-#include <miniupnp/miniupnpc/upnpcommands.h> +-#include <miniupnp/miniupnpc/upnperrors.h> ++#include <miniupnpc/miniupnpc.h> ++#include <miniupnpc/upnpcommands.h> ++#include <miniupnpc/upnperrors.h> + + #undef MONERO_DEFAULT_LOG_CATEGORY + #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" +@@ -2989,7 +2989,8 @@ namespace nodetool + UPNPUrls urls; + IGDdatas igdData; + char lanAddress[64]; +- result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress); ++ char wanAddress[64]; ++ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, wanAddress, sizeof wanAddress); + freeUPNPDevlist(deviceList); + if (result > 0) { + if (result == 1) { +@@ -3057,7 +3058,8 @@ namespace nodetool + UPNPUrls urls; + IGDdatas igdData; + char lanAddress[64]; +- result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress); ++ char wanAddress[64]; ++ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, wanAddress, sizeof wanAddress); + freeUPNPDevlist(deviceList); + if (result > 0) { + if (result == 1) { diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index d72cad5c53673..7e8a5fe73dcd2 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,43 +1,88 @@ -{ lib, stdenv, wrapQtAppsHook, makeDesktopItem -, fetchFromGitHub -, cmake, qttools, pkg-config -, qtbase, qtdeclarative, qtgraphicaleffects -, qtmultimedia, qtxmlpatterns -, qtquickcontrols, qtquickcontrols2 -, qtmacextras -, monero-cli, miniupnpc, unbound, readline -, boost, libunwind, libsodium, pcsclite -, randomx, zeromq, libgcrypt, libgpg-error -, hidapi, rapidjson, quirc -, trezorSupport ? true, libusb1, protobuf, python3 +{ + lib, + fetchFromGitHub, + makeDesktopItem, + boost, + cmake, + libgcrypt, + libgpg-error, + libsodium, + miniupnpc, + monero-cli, + pkg-config, + qtbase, + qtdeclarative, + qtgraphicaleffects, + qtmacextras, + qtmultimedia, + qtquickcontrols, + qtquickcontrols2, + qttools, + qtxmlpatterns, + quirc, + randomx, + rapidjson, + stdenv, + unbound, + wrapQtAppsHook, + zeromq, + + trezorSupport ? true, + hidapi, + libusb1, + protobuf_21, + python3, + udev, }: stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.18.3.3"; + version = "0.18.3.4"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - hash = "sha256-6qadBm4bPui11OVY1tLFcHsfswXWBFiJvutIsF6EfX8="; + hash = "sha256-wnU24EmZig2W/psy4OhaQVy2WwR0CgljlyYwOg4bzwM="; }; nativeBuildInputs = [ - cmake pkg-config wrapQtAppsHook + cmake + pkg-config + wrapQtAppsHook (lib.getDev qttools) ]; - buildInputs = [ - qtbase qtdeclarative qtgraphicaleffects - qtmultimedia qtquickcontrols qtquickcontrols2 - qtxmlpatterns - monero-cli miniupnpc unbound readline - randomx libgcrypt libgpg-error - boost libunwind libsodium pcsclite - zeromq hidapi rapidjson quirc - ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ] - ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; + buildInputs = + [ + boost + libgcrypt + libgpg-error + libsodium + miniupnpc + qtbase + qtdeclarative + qtgraphicaleffects + qtmultimedia + qtquickcontrols + qtquickcontrols2 + qtxmlpatterns + quirc + randomx + rapidjson + unbound + zeromq + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ] + ++ lib.optionals trezorSupport [ + hidapi + libusb1 + protobuf_21 + python3 + ] + ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ + udev + ]; postUnpack = '' # copy monero sources here @@ -68,7 +113,12 @@ stdenv.mkDerivation rec { --replace 'add_subdirectory(external)' "" ''; - cmakeFlags = [ "-DARCH=default" ]; + cmakeFlags = + [ "-DARCH=default" ] + ++ lib.optional trezorSupport [ + # fix build on recent gcc versions + "-DCMAKE_CXX_FLAGS=-fpermissive" + ]; desktopItem = makeDesktopItem { name = "monero-wallet-gui"; @@ -76,7 +126,7 @@ stdenv.mkDerivation rec { icon = "monero"; desktopName = "Monero"; genericName = "Wallet"; - categories = [ "Network" "Utility" ]; + categories = [ "Network" "Utility" ]; }; postInstall = '' @@ -93,12 +143,12 @@ stdenv.mkDerivation rec { done; ''; - meta = with lib; { - description = "Private, secure, untraceable currency"; - homepage = "https://getmonero.org/"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ rnhmjoj ]; - mainProgram = "monero-wallet-gui"; + meta = { + description = "Private, secure, untraceable currency"; + homepage = "https://getmonero.org/"; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ rnhmjoj ]; + mainProgram = "monero-wallet-gui"; }; } diff --git a/pkgs/applications/blockchains/optimism/geth.nix b/pkgs/applications/blockchains/optimism/geth.nix index 722402e704d3e..473ee254d08fe 100644 --- a/pkgs/applications/blockchains/optimism/geth.nix +++ b/pkgs/applications/blockchains/optimism/geth.nix @@ -37,7 +37,7 @@ buildGoModule rec { # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = - lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit ]; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/applications/blockchains/particl-core/default.nix index cacb8f5f46198..12e86358c9544 100644 --- a/pkgs/applications/blockchains/particl-core/default.nix +++ b/pkgs/applications/blockchains/particl-core/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Privacy-Focused Marketplace & Decentralized Application Platform"; longDescription = '' An open source, decentralized privacy platform built for global person to person eCommerce. diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 5384966db3a69..5b5faf69a831d 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -3654,7 +3654,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" -version = "0.17.0" +version = "0.17.1" dependencies = [ "async-trait", "cumulus-client-collator", @@ -11507,7 +11507,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "36.0.0" +version = "36.0.1" dependencies = [ "docify", "frame-benchmarking", @@ -12833,7 +12833,7 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "17.0.0" +version = "17.0.1" dependencies = [ "assert_matches", "async-channel", @@ -13862,7 +13862,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "16.0.1" +version = "16.0.2" dependencies = [ "assert_matches", "bitflags 1.3.2", diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 9a1aba5de6eb0..65e945d77d306 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -17,13 +17,13 @@ let in rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "stable2407-1"; + version = "stable2407-2"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-${version}"; - hash = "sha256-IYRkXmFBjRAYSROL37EgEjC7wM1N97HabuSHtcSUxdg="; + hash = "sha256-4WOoFjihzErc6lIgiWvLg6fqDOxs1A+A0ERvu/D8btw="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -69,8 +69,8 @@ rustPlatform.buildRustPackage rec { # NOTE: jemalloc is used by default on Linux with unprefixed enabled buildInputs = [ openssl ] ++ - lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] ++ - lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] ++ + lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; # NOTE: disable building `core`/`std` in wasm environment since rust-src isn't # available for `rustc-wasm32` diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index e4dc85f3c4d5e..0cebbecc03095 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { # buildAndTestSubdir = "cli"; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config rustPlatform.bindgenHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config rustPlatform.bindgenHook ]; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; @@ -35,11 +35,11 @@ rustPlatform.buildRustPackage rec { # ROCKSDB_INCLUDE_DIR="${rocksdb}/include"; # ROCKSDB_LIB_DIR="${rocksdb}/lib"; - buildInputs = lib.optionals stdenv.isDarwin [ Security curl ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security curl ]; # some tests are flaky and some need network access # TODO finish filtering the tests to enable them - doCheck = !stdenv.isLinux; + doCheck = !stdenv.hostPlatform.isLinux; # checkFlags = [ # # tries to make a network access # "--skip=rpc::rpc::tests::test_send_transaction_large" diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix index 0d664374efa0b..5b18f5fc4cc45 100644 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ b/pkgs/applications/blockchains/solana-validator/default.nix @@ -75,8 +75,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config protobuf rustfmt perl rustPlatform.bindgenHook ]; buildInputs = - [ openssl zlib libclang hidapi ] ++ (lib.optionals stdenv.isLinux [ udev ]) - ++ lib.optionals stdenv.isDarwin [ Security System Libsystem libcxx ]; + [ openssl zlib libclang hidapi ] ++ (lib.optionals stdenv.hostPlatform.isLinux [ udev ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security System Libsystem libcxx ]; strictDeps = true; doCheck = false; @@ -88,7 +88,7 @@ rustPlatform.buildRustPackage rec { # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = "1"; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Require this on darwin otherwise the compiler starts rambling about missing # cmath functions CPPFLAGS = "-isystem ${lib.getDev libcxx}/include/c++/v1"; diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix index c2e4fb01384d9..61299621e0fb5 100644 --- a/pkgs/applications/blockchains/teos/default.nix +++ b/pkgs/applications/blockchains/teos/default.nix @@ -40,7 +40,7 @@ in rustfmt ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -69,7 +69,7 @@ in buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index 517e18ff941e5..c4014a0127237 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ton"; - version = "2024.08"; + version = "2024.09"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - hash = "sha256-OV/1//zIHebc3eLUxtUVV0TMuDdB25M7TT5y58x2Z68="; + hash = "sha256-IzDftvPwsKWEVn4R8QL6j1ceA26BksKSrlr0CkFZlrU="; fetchSubmodules = true; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { # The build fails on darwin as: # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Fully decentralized layer-1 blockchain designed by Telegram"; homepage = "https://ton.org/"; changelog = "https://github.com/ton-blockchain/ton/blob/v${version}/Changelog.md"; diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/applications/blockchains/wownero/default.nix index 836532c00badd..7ec9f8d83ed82 100644 --- a/pkgs/applications/blockchains/wownero/default.nix +++ b/pkgs/applications/blockchains/wownero/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { readline unbound zeromq - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index dbada09c1b6e9..35a3bdb91e8aa 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { hash = "sha256-XGq/cYUo43FcpmRDO2YiNLCuEQLsTFLBFC4M1wM29l8="; }; - prePatch = lib.optionalString stdenv.isAarch64 '' + prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace .cargo/config.offline \ --replace "[target.aarch64-unknown-linux-gnu]" "" \ --replace "linker = \"aarch64-linux-gnu-gcc\"" "" @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { tl-expected utf8cpp zeromq - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/applications/display-managers/emptty/default.nix b/pkgs/applications/display-managers/emptty/default.nix index eb25c1b109050..b4a55ece76757 100644 --- a/pkgs/applications/display-managers/emptty/default.nix +++ b/pkgs/applications/display-managers/emptty/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "emptty"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "tvrzna"; repo = pname; rev = "v${version}"; - hash = "sha256-9qNAQBmcFKPpJ+AqfOy3emA1fvqI/XaT39KwI5fpXHU="; + hash = "sha256-xZfR4sn20fDaTNAxuxVflpr+8AFg5Z7vesO7P8Jxw6A="; }; buildInputs = [ pam libX11 ]; @@ -27,7 +27,7 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ urandom ]; # many undefined functions - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "emptty"; }; } diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix deleted file mode 100644 index e559ceb73ec73..0000000000000 --- a/pkgs/applications/editors/amp/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, python3, xorg, cmake, libgit2, darwin -, curl }: - -rustPlatform.buildRustPackage rec { - pname = "amp"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "jmacdonald"; - repo = pname; - rev = version; - sha256 = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M="; - }; - - cargoHash = "sha256-4c72l3R9OyxvslKC4RrIu/Ka3grGxIUCY6iF/NHS5X8="; - - nativeBuildInputs = [ cmake pkg-config python3 ]; - buildInputs = [ openssl xorg.libxcb libgit2 ] ++ lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]); - - # Tests need to write to the theme directory in HOME. - preCheck = "export HOME=`mktemp -d`"; - - meta = with lib; { - description = "Modern text editor inspired by Vim"; - homepage = "https://amp.rs"; - license = [ licenses.gpl3 ]; - maintainers = [ maintainers.sb0 ]; - platforms = platforms.unix; - mainProgram = "amp"; - }; -} diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 68c5b6799f6d1..a7345f26f1518 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,16 +9,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2024.1.2.12"; # "Android Studio Koala Feature Drop | 2024.1.2" - sha256Hash = "sha256-dFFogg6YmpCF/4QtR85UFAfbCd97irIHcPbqieQabpI="; + version = "2024.1.2.13"; # "Android Studio Koala Feature Drop | 2024.1.2 Patch 1" + sha256Hash = "sha256-aIxlXCMPKYZ6Eq44LMJuxnBr9/ML1Nl/LxXI+WDLG5s="; }; betaVersion = { - version = "2024.1.2.11"; # "Android Studio Koala Feature Drop | 2024.1.2 RC 1" - sha256Hash = "sha256-Qn5NNW2Rt6f9QiEUamIumme45uUVeTiMJ/9niAC6ilM="; + version = "2024.2.1.8"; # "Android Studio Ladybug | 2024.2.1 RC 1" + sha256Hash = "sha256-Kb/1+g9rIuU/pAO1ue5h0+BU7OCE09QqV9XFoiJxBL4="; }; latestVersion = { - version = "2024.2.1.4"; # "Android Studio Ladybug | 2024.2.1 Canary 8" - sha256Hash = "sha256-H2NN6/ywQCMunX1mk0gbgEoY75gHV+fpru+mZNe9fpk="; + version = "2024.2.2.4"; # "Android Studio Ladybug Feature Drop | 2024.2.2 Canary 4" + sha256Hash = "sha256-Rw+smKU2F11ZpK6lWb3VyLGTKt3qWFoUqnfcs5OXBcU="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix deleted file mode 100644 index 2ac885683eb17..0000000000000 --- a/pkgs/applications/editors/bless/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, mono -, meson -, ninja -, gtk-sharp-2_0 -, gettext -, makeWrapper -, glib -, gtk2-x11 -, libxslt -, docbook_xsl -, python3 -, itstool -}: - -stdenv.mkDerivation rec { - pname = "bless"; - version = "0.6.3"; - - src = fetchFromGitHub { - owner = "afrantzis"; - repo = pname; - rev = "v${version}"; - hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM="; - }; - - buildInputs = [ - gtk-sharp-2_0 - mono - # runtime only deps - glib - gtk2-x11 - ]; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - makeWrapper - libxslt - docbook_xsl - python3 - itstool - ]; - - mesonFlags = [ - "-Dtests=false" # requires NUnit - ]; - - postPatch = '' - patchShebangs . - ''; - - preFixup = '' - MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gtk-sharp-2_0}/lib" - wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" --prefix PATH : ${lib.makeBinPath [ mono ]} - ''; - - meta = with lib; { - homepage = "https://github.com/afrantzis/bless"; - description = "Gtk# Hex Editor"; - maintainers = [ maintainers.mkg20001 ]; - license = licenses.gpl2; - platforms = platforms.linux; - mainProgram = "bless"; - }; -} diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 235fef97d0836..80fbe5674635d 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK32, gtk3 -, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook3 +, contribPlugins ? false, hunspell, boost, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file zip wrapGAppsHook3 ]; buildInputs = [ wxGTK32 gtk3 ] - ++ lib.optionals contribPlugins [ hunspell gamin boost ]; + ++ lib.optionals contribPlugins [ hunspell boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch @@ -117,12 +117,12 @@ stdenv.mkDerivation rec { }) ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - postConfigure = lib.optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; + postConfigure = lib.optionalString stdenv.hostPlatform.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; configureFlags = [ "--enable-pch=no" ] ++ lib.optionals contribPlugins [ - ("--with-contrib-plugins" + lib.optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") + ("--with-contrib-plugins=all,-FileManager" + lib.optionalString stdenv.hostPlatform.isDarwin ",-NassiShneiderman") "--with-boost-libdir=${boost}/lib" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/codeblocks/plugins $out/share/codeblocks/plugins ''; diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix index d0ded7ae72bdc..d809348b3f522 100644 --- a/pkgs/applications/editors/dit/default.nix +++ b/pkgs/applications/editors/dit/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses lua ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; # fix paths prePatch = '' diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix deleted file mode 100644 index 046aac459b53c..0000000000000 --- a/pkgs/applications/editors/elvis/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ fetchurl, fetchpatch, lib, stdenv, ncurses }: - -stdenv.mkDerivation rec { - pname = "elvis"; - version = "2.2_0"; - - src = fetchurl { - url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${version}.tar.gz"; - sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s"; - }; - - buildInputs = [ ncurses ]; - - patches = [ - (fetchpatch { - url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; - sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc"; - }) - ]; - - postPatch = '' - substituteInPlace configure \ - --replace '-lcurses' '-lncurses' - ''; - - preConfigure = '' - mkdir -p $out/share/man/man1 - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/elvis $out/share/elvis/doc - cp elvis ref elvtags elvfmt $out/bin - cp -R data/* $out/share/elvis - cp doc/* $out/share/elvis/doc - - mkdir -p $out/share/man/man1 - for a in doc/*.man; do - cp $a $out/share/man/man1/`basename $a .man`.1 - done - ''; - - configureFlags = [ "--ioctl=termios" ]; - - meta = { - homepage = "http://elvis.the-little-red-haired-girl.org/"; - description = "Vi clone for Unix and other operating systems"; - license = lib.licenses.free; - }; -} diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix index aeaf1d3882ab9..e129e3ebdeb09 100644 --- a/pkgs/applications/editors/emacs/build-support/melpa.nix +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -63,11 +63,10 @@ libBuildHelper.extendMkDerivation' genericBuild (finalAttrs: /* recipe: Optional MELPA recipe. Default: a minimally functional recipe + This can be a path of a recipe file, a string of the recipe content or an empty string. + The default value is used if it is an empty string. */ -, recipe ? (writeText "${finalAttrs.pname}-recipe" '' - (${finalAttrs.ename} :fetcher git :url "" - ${lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}"}) - '') +, recipe ? "" , preUnpack ? "" , postUnpack ? "" , meta ? {} @@ -98,9 +97,21 @@ libBuildHelper.extendMkDerivation' genericBuild (finalAttrs: preUnpack = '' mkdir -p "$NIX_BUILD_TOP/recipes" - if [ -n "$recipe" ]; then - cp "$recipe" "$NIX_BUILD_TOP/recipes/$ename" + recipeFile="$NIX_BUILD_TOP/recipes/$ename" + if [ -r "$recipe" ]; then + ln -s "$recipe" "$recipeFile" + nixInfoLog "link recipe" + elif [ -n "$recipe" ]; then + printf "%s" "$recipe" > "$recipeFile" + nixInfoLog "write recipe" + else + cat > "$recipeFile" <<'EOF' +(${finalAttrs.ename} :fetcher git :url "" ${lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}"}) +EOF + nixInfoLog "use default recipe" fi + nixInfoLog "recipe content:" "$(< $recipeFile)" + unset -v recipeFile ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" @@ -115,6 +126,11 @@ libBuildHelper.extendMkDerivation' genericBuild (finalAttrs: buildPhase = args.buildPhase or '' runHook preBuild + # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. + if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then + foundMakefile=1 + fi + pushd "$NIX_BUILD_TOP" emacs --batch -Q \ diff --git a/pkgs/applications/editors/emacs/build-support/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix index 2c20b0567c68d..8c515363f427b 100644 --- a/pkgs/applications/editors/emacs/build-support/trivial.nix +++ b/pkgs/applications/editors/emacs/build-support/trivial.nix @@ -14,6 +14,11 @@ args: buildPhase = args.buildPhase or '' runHook preBuild + # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. + if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then + foundMakefile=1 + fi + emacs -L . --batch -f batch-byte-compile *.el runHook postBuild diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 8181b69d335d2..faf06ca843c7f 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -2,11 +2,8 @@ lib.makeScope pkgs.newScope (self: let - gconf = pkgs.gnome2.GConf; inherit (self) callPackage; inheritedArgs = { - inherit gconf; - inherit (pkgs.darwin) sigtool; inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit @@ -23,10 +20,6 @@ lib.makeScope pkgs.newScope (self: emacs28 = callPackage (self.sources.emacs28) inheritedArgs; - emacs28-gtk2 = self.emacs28.override { - withGTK2 = true; - }; - emacs28-gtk3 = self.emacs28.override { withGTK3 = true; }; @@ -49,6 +42,20 @@ lib.makeScope pkgs.newScope (self: withPgtk = true; }; + emacs30 = callPackage (self.sources.emacs30) inheritedArgs; + + emacs30-gtk3 = self.emacs30.override { + withGTK3 = true; + }; + + emacs30-nox = self.emacs30.override { + noGui = true; + }; + + emacs30-pgtk = self.emacs30.override { + withPgtk = true; + }; + emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs; emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix new file mode 100644 index 0000000000000..56cdd8ad733ed --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix @@ -0,0 +1,156 @@ +pkgs: lib: buildPackages: + +self: super: + +let + libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; +in +{ + cl-lib = null; # builtin + cl-print = null; # builtin + tle = null; # builtin + advice = null; # builtin + + # Compilation instructions for the Ada executables: + # https://www.nongnu.org/ada-mode/ + ada-mode = super.ada-mode.overrideAttrs ( + finalAttrs: previousAttrs: { + # actually unpack source of ada-mode and wisi + # which are both needed to compile the tools + # we need at runtime + dontUnpack = false; + srcs = [ + super.ada-mode.src + self.wisi.src + ]; + + sourceRoot = "ada-mode-${finalAttrs.version}"; + + nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [ + buildPackages.gnat + buildPackages.gprbuild + buildPackages.dos2unix + buildPackages.re2c + ]; + + buildInputs = previousAttrs.buildInputs or [ ] ++ [ pkgs.gnatPackages.gnatcoll-xref ]; + + buildPhase = '' + runHook preBuild + ./build.sh -j$NIX_BUILD_CORES + runHook postBuild + ''; + + postInstall = + previousAttrs.postInstall or "" + + "\n" + + '' + ./install.sh "$out" + ''; + + meta = previousAttrs.meta // { + maintainers = [ lib.maintainers.sternenseemann ]; + }; + } + ); + + eglot = super.eglot.overrideAttrs ( + finalAttrs: previousAttrs: { + postInstall = + previousAttrs.postInstall or "" + # old versions do not include an info manual + + lib.optionalString (lib.versionAtLeast "1.17.0.20240829.5352" finalAttrs.version) '' + local info_file=eglot.info + pushd $out/share/emacs/site-lisp/elpa/eglot-* + # specify output info file to override the one defined in eglot.texi + makeinfo --output=$info_file eglot.texi + install-info $info_file dir + popd + ''; + } + ); + + jinx = super.jinx.overrideAttrs (old: { + dontUnpack = false; + + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.pkg-config ]; + + buildInputs = old.buildInputs or [ ] ++ [ pkgs.enchant2 ]; + + postBuild = + old.postBuild or "" + + "\n" + + '' + NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE" + $CC -shared -o jinx-mod${libExt} jinx-mod.c -lenchant-2 + ''; + + postInstall = + old.postInstall or "" + + "\n" + + '' + outd=$out/share/emacs/site-lisp/elpa/jinx-* + install -m444 -t $outd jinx-mod${libExt} + rm $outd/jinx-mod.c $outd/emacs-module.h + ''; + + meta = old.meta // { + maintainers = [ lib.maintainers.DamienCassou ]; + }; + }); + + plz = super.plz.overrideAttrs (old: { + dontUnpack = false; + postPatch = + old.postPatch or "" + + "\n" + + '' + substituteInPlace plz.el \ + --replace-fail 'plz-curl-program "curl"' 'plz-curl-program "${lib.getExe pkgs.curl}"' + ''; + preInstall = + old.preInstall or "" + + "\n" + + '' + tar -cf "$ename-$version.tar" --transform "s,^,$ename-$version/," * .[!.]* + src="$ename-$version.tar" + ''; + }); + + pq = super.pq.overrideAttrs (old: { + buildInputs = old.buildInputs or [ ] ++ [ pkgs.postgresql ]; + }); + + # native compilation for tests/seq-tests.el never ends + # delete tests/seq-tests.el to workaround this + seq = super.seq.overrideAttrs (old: { + dontUnpack = false; + postUnpack = + old.postUnpack or "" + + "\n" + + '' + local content_directory=$(echo seq-*) + rm --verbose $content_directory/tests/seq-tests.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + ''; + }); + + xeft = super.xeft.overrideAttrs (old: { + dontUnpack = false; + buildInputs = old.buildInputs or [ ] ++ [ pkgs.xapian ]; + buildPhase = + old.buildPhase or "" + + '' + $CXX -shared -o xapian-lite${libExt} xapian-lite.cc -lxapian + ''; + postInstall = + old.postInstall or "" + + "\n" + + '' + outd=$out/share/emacs/site-lisp/elpa/xeft-* + install -m444 -t $outd xapian-lite${libExt} + rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile + ''; + }); +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index a0fdf0e1cbc72..5744eaa4e5a15 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -26,11 +26,9 @@ formats commits for you. self: let - markBroken = pkg: pkg.override { - elpaBuild = args: self.elpaBuild (args // { - meta = (args.meta or {}) // { broken = true; }; - }); - }; + inherit (import ./lib-override-helper.nix pkgs) + markBroken + ; # Use custom elpa url fetcher with fallback/uncompress fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; @@ -45,54 +43,15 @@ self: let }); }; - super = removeAttrs imported [ "dash" ]; - - overrides = { - eglot = super.eglot.overrideAttrs (old: { - postInstall = (old.postInstall or "") + '' - local info_file=eglot.info - pushd $out/share/emacs/site-lisp/elpa/eglot-* - # specify output info file to override the one defined in eglot.texi - makeinfo --output=$info_file eglot.texi - install-info $info_file dir - popd - ''; - }); + super = imported; - pq = super.pq.overrideAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ]; - }); + commonOverrides = import ./elpa-common-overrides.nix pkgs lib buildPackages; - xeft = super.xeft.overrideAttrs (old: let - libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; - in { - dontUnpack = false; - - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.xapian ]; - buildPhase = (old.buildPhase or "") + '' - $CXX -shared -o xapian-lite${libExt} xapian-lite.cc $NIX_CFLAGS_COMPILE -lxapian - ''; - postInstall = (old.postInstall or "") + "\n" + '' - outd=$out/share/emacs/site-lisp/elpa/xeft-* - install -m444 -t $outd xapian-lite${libExt} - rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile - ''; - }); - - # native compilation for tests/seq-tests.el never ends - # delete tests/seq-tests.el to workaround this - seq = super.seq.overrideAttrs (old: { - dontUnpack = false; - postUnpack = (old.postUnpack or "") + "\n" + '' - local content_directory=$(echo seq-*) - rm --verbose $content_directory/tests/seq-tests.el - src=$PWD/$content_directory.tar - tar --create --verbose --file=$src $content_directory - ''; - }); + overrides = self: super: { }; - elpaDevelPackages = super // overrides; + elpaDevelPackages = + let super' = super // (commonOverrides self super); in super' // (overrides self super'); in elpaDevelPackages); diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 3a1a5c97a94fb..d20a2249703b6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -26,11 +26,9 @@ formats commits for you. self: let - markBroken = pkg: pkg.override { - elpaBuild = args: self.elpaBuild (args // { - meta = (args.meta or {}) // { broken = true; }; - }); - }; + inherit (import ./lib-override-helper.nix pkgs) + markBroken + ; # Use custom elpa url fetcher with fallback/uncompress fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; @@ -45,143 +43,23 @@ self: let }); }; - super = removeAttrs imported [ "dash" ]; + super = imported; - overrides = { + commonOverrides = import ./elpa-common-overrides.nix pkgs lib buildPackages; + + overrides = self: super: { # upstream issue: Wrong type argument: arrayp, nil org-transclusion = if super.org-transclusion.version == "1.2.0" then markBroken super.org-transclusion else super.org-transclusion; rcirc-menu = markBroken super.rcirc-menu; # Missing file header - cl-lib = null; # builtin - cl-print = null; # builtin - tle = null; # builtin - advice = null; # builtin - # Compilation instructions for the Ada executables: - # https://www.nongnu.org/ada-mode/ - ada-mode = super.ada-mode.overrideAttrs (old: { - # actually unpack source of ada-mode and wisi - # which are both needed to compile the tools - # we need at runtime - dontUnpack = false; - srcs = [ - super.ada-mode.src - self.wisi.src - ]; - - sourceRoot = "ada-mode-${self.ada-mode.version}"; - - nativeBuildInputs = old.nativeBuildInputs ++ [ - buildPackages.gnat - buildPackages.gprbuild - buildPackages.dos2unix - buildPackages.re2c - ]; - - buildInputs = old.buildInputs ++ [ - pkgs.gnatPackages.gnatcoll-xref - ]; - - buildPhase = '' - runHook preBuild - ./build.sh -j$NIX_BUILD_CORES - runHook postBuild - ''; - - postInstall = (old.postInstall or "") + "\n" + '' - ./install.sh "$out" - ''; - - meta = old.meta // { - maintainers = [ lib.maintainers.sternenseemann ]; - }; - }); - - eglot = super.eglot.overrideAttrs (old: { - postInstall = (old.postInstall or "") + '' - local info_file=eglot.info - pushd $out/share/emacs/site-lisp/elpa/eglot-* - # specify output info file to override the one defined in eglot.texi - makeinfo --output=$info_file eglot.texi - install-info $info_file dir - popd - ''; - }); - - jinx = super.jinx.overrideAttrs (old: let - libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; - in { - dontUnpack = false; - - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.pkg-config - ]; - - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ]; - - postBuild = '' - NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE" - $CC -shared -o jinx-mod${libExt} jinx-mod.c -lenchant-2 - ''; - - postInstall = (old.postInstall or "") + "\n" + '' - outd=$out/share/emacs/site-lisp/elpa/jinx-* - install -m444 -t $outd jinx-mod${libExt} - rm $outd/jinx-mod.c $outd/emacs-module.h - ''; - - meta = old.meta // { - maintainers = [ lib.maintainers.DamienCassou ]; - }; - }); - - plz = super.plz.overrideAttrs ( - old: { - dontUnpack = false; - postPatch = old.postPatch or "" + '' - substituteInPlace ./plz.el \ - --replace 'plz-curl-program "curl"' 'plz-curl-program "${pkgs.curl}/bin/curl"' - ''; - preInstall = '' - tar -cf "$pname-$version.tar" --transform "s,^,$pname-$version/," * .[!.]* - src="$pname-$version.tar" - ''; - } - ); - - xeft = super.xeft.overrideAttrs (old: let - libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; - in { - dontUnpack = false; - - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.xapian ]; - buildPhase = (old.buildPhase or "") + '' - $CXX -shared -o xapian-lite${libExt} xapian-lite.cc $NIX_CFLAGS_COMPILE -lxapian - ''; - postInstall = (old.postInstall or "") + "\n" + '' - outd=$out/share/emacs/site-lisp/elpa/xeft-* - install -m444 -t $outd xapian-lite${libExt} - rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile - ''; - }); - - # native compilation for tests/seq-tests.el never ends - # delete tests/seq-tests.el to workaround this - seq = super.seq.overrideAttrs (old: { - dontUnpack = false; - postUnpack = (old.postUnpack or "") + "\n" + '' - local content_directory=$(echo seq-*) - rm --verbose $content_directory/tests/seq-tests.el - src=$PWD/$content_directory.tar - tar --create --verbose --file=$src $content_directory - ''; - }); }; - elpaPackages = super // overrides; + elpaPackages = + let super' = super // (commonOverrides self super); in super' // (overrides self super'); in elpaPackages); diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix index 2879985e4b869..3838271d4924c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchFromGitHub { owner = "nix-community"; repo = "emacs2nix"; - rev = "8454f2857252f32621b8022f797fef9b96862204"; - hash = "sha256-UHHEkY+t/IzWe8jC8bm+p275sKfnL5/v5wbwRDw6FZw="; + rev = "9458961fc433a6c4cd91e7763f0aa1ef15f7b4aa"; + hash = "sha256-NJVKrYSF/22hrUJNJ3/znbcfHi/FtTePQ8Xzfp2eKAk="; fetchSubmodules = true; }; in diff --git a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix new file mode 100644 index 0000000000000..74d185641e3d6 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix @@ -0,0 +1,28 @@ +pkgs: + +rec { + buildWithGit = + pkg: + pkg.overrideAttrs (previousAttrs: { + nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [ pkgs.git ]; + }); + + dontConfigure = pkg: pkg.overrideAttrs { dontConfigure = true; }; + + externalSrc = + pkg: epkg: + pkg.overrideAttrs (previousAttrs: { + inherit (epkg) src version; + propagatedUserEnvPkgs = previousAttrs.propagatedUserEnvPkgs or [ ] ++ [ epkg ]; + }); + + fix-rtags = pkg: dontConfigure (externalSrc pkg pkgs.rtags); + + markBroken = + pkg: + pkg.overrideAttrs (previousAttrs: { + meta = previousAttrs.meta or { } // { + broken = true; + }; + }); +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 77365da2b5966..5981faab2d1c9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -29,6 +29,8 @@ lib.packagesFromDirectoryRecursive { tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; }; + zstd = callPackage ./manual-packages/zstd { inherit (pkgs) zstd; }; + # From old emacsPackages (pre emacsPackagesNg) cedille = callPackage ./manual-packages/cedille { inherit (pkgs) cedille; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff new file mode 100644 index 0000000000000..7737594179ecf --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff @@ -0,0 +1,43 @@ +diff -Naur cask-source-0.9.0-old/bin/cask cask-source-0.9.0-new/bin/cask +--- cask-source-0.9.0-old/bin/cask 1969-12-31 21:00:01.000000000 -0300 ++++ cask-source-0.9.0-new/bin/cask 2024-09-02 12:46:48.316364621 -0300 +@@ -21,8 +21,6 @@ + set -euo pipefail + CASK=$0 + EMACS=${CASK_EMACS:-${EMACS:-emacs}} +-READLINK=${READLINK:-readlink} +-GREADLINK=${GREADLINK:-greadlink} + + if [ "$#" -eq "0" ] ; then + subcommand=install +@@ -31,21 +29,10 @@ + shift + fi + +-set +eu +-SRCDIR__=$($READLINK -f "$CASK" 2>/dev/null) +-if [ -z "$SRCDIR__" ] ; then +- SRCDIR__=$($GREADLINK -f "$CASK" 2>/dev/null) +-fi +-set -eu +-if [ -z "$SRCDIR__" ]; then +- SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK") +-fi +-SRCDIR_=$(dirname "$SRCDIR__") +-SRCDIR=$(dirname "$SRCDIR_") + case $subcommand in + emacs) + EMACS="$EMACS" \ +- "$EMACS" -Q -L "$SRCDIR" -l "$SRCDIR/cask" \ ++ "$EMACS" -Q -L "@lispdir@" -l "@lispdir@/cask" \ + --eval "(cask--initialize (expand-file-name default-directory))" \ + "$@" + ;; +@@ -53,6 +40,6 @@ + EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$@" + ;; + *) +- "$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@" ++ "$EMACS" -Q --script "@lispdir@/cask-cli.el" -- $subcommand "$@" + ;; + esac diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix index 3ab796bcbd196..4334fce6ecbb3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix @@ -1,77 +1,80 @@ -{ lib -, stdenv -, fetchFromGitHub -, bash -, emacs -, python3 +{ + lib, + ansi, + cl-generic, + cl-lib, + commander, + + epl, + f, + fetchFromGitHub, + git, + gitUpdater, + melpaBuild, + package-build, + s, + shut-up, }: -stdenv.mkDerivation (finalAttrs: { +melpaBuild (finalAttrs: { pname = "cask"; - version = "0.8.8"; + version = "0.9.0"; src = fetchFromGitHub { + name = "cask-source-${finalAttrs.version}"; owner = "cask"; repo = "cask"; rev = "v${finalAttrs.version}"; - hash = "sha256-TlReq5sLVJj+pXmJSnepKQkNEWVhnh30iq4egM1HJMU="; + hash = "sha256-91rJFsp2SLk/JY+v6G5JmXH5bg9QnT+qhI8ccNJlI4A="; }; - doCheck = true; + patches = [ + # Uses LISPDIR substitution var + ./0000-cask-lispdir.diff + ]; - nativeBuildInputs = [ emacs ]; - buildInputs = [ - bash - python3 - ] - ++ (with emacs.pkgs; [ + packageRequires = [ ansi - dash - ecukes - el-mock - ert-async - ert-runner + cl-generic + cl-lib + commander + epl f git - noflet package-build s - servant - shell-split-string - ]); - - strictDeps = true; + shut-up + ]; - buildPhase = '' - runHook preBuild + ignoreCompilationError = false; - emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el + strictDeps = true; - runHook postBuild + # use melpaVersion so that it works for unstable releases too + postPatch = '' + lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.melpaVersion} \ + substituteAllInPlace bin/cask ''; - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - install -Dm444 -t $out/share/emacs/site-lisp/cask *.el *.elc - install -Dm555 -t $out/share/emacs/site-lisp/cask/bin bin/cask - ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask - - runHook postInstall + # TODO: use installBin as soon as installBin arrives Master branch + postInstall = '' + install -D -t $out/bin bin/cask ''; - meta = with lib; { + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = { + homepage = "https://github.com/cask/cask"; description = "Project management for Emacs"; - mainProgram = "cask"; longDescription = '' Cask is a project management tool for Emacs that helps automate the package development cycle; development, dependencies, testing, building, packaging and more. ''; - homepage = "https://cask.readthedocs.io/en/latest/index.html"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - inherit (emacs.meta) platforms; + license = lib.licenses.gpl3Plus; + mainProgram = "cask"; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; }) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix new file mode 100644 index 0000000000000..8b554081d1fd9 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix @@ -0,0 +1,28 @@ +{ + lib, + gn, + melpaBuild, +}: + +melpaBuild { + pname = "gn-mode-from-sources"; + ename = "gn-mode"; + version = "0-unstable-${gn.version}"; + inherit (gn) src; + + files = ''("misc/emacs/gn-mode.el")''; + + # Fixes the malformed header error + postPatch = '' + substituteInPlace misc/emacs/gn-mode.el \ + --replace-fail ";;; gn-mode.el - " ";;; gn-mode.el --- " + ''; + + ignoreCompilationError = false; + + meta = { + inherit (gn.meta) homepage license; + maintainers = with lib.maintainers; [ rennsax ]; + description = "Major mode for editing GN files; taken from GN sources"; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix deleted file mode 100644 index b54282207b97b..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - stdenv, - lib, - melpaBuild, - fetchFromGitLab, - unstableGitUpdater, -}: - -melpaBuild { - pname = "ligo-mode"; - version = "1.7.0-unstable-2024-08-22"; - - src = fetchFromGitLab { - owner = "ligolang"; - repo = "ligo"; - rev = "47128d41a9329356cbad40a982d8144da19a9218"; - hash = "sha256-IrxPnbWrhqe3TxELsqa2y4NdcfEJMGUcGCdNuDG+rfs="; - }; - - files = ''("tools/emacs/ligo-mode.el")''; - - ignoreCompilationError = false; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - description = "Major mode for editing LIGO source code"; - homepage = "https://gitlab.com/ligolang/ligo"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; - broken = stdenv.isDarwin; # different src hash on darwin - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 67becac274f5b..e34f1fd725cbb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -29,13 +29,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "0-unstable-2024-08-17"; + version = "0-unstable-2024-09-27"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; - rev = "fe7a0729f9f46a0713b7049d20b25bb78d93f68f"; - hash = "sha256-lbtg1n72xNePs1DNpjy6Hvg4OhACk9vSfVwFffkeb0I="; + rev = "f9d540ff451d9a0ee92819b84472820f16be15d5"; + hash = "sha256-YqUC2Z24ORwIMNZUsAJrAnSaDovccnGMg2OSYY1mYoQ="; }; patches = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix index 99cd5c6aa9e3d..b1c378cf31c4f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix @@ -1,11 +1,12 @@ -{ elpaBuild, mu }: +{ + lib, + elpaBuild, + mu, +}: -let +elpaBuild { pname = "mu4e"; version = mu.mu4e.version; -in -elpaBuild { - inherit pname version; src = mu.mu4e; @@ -15,21 +16,20 @@ elpaBuild { # prepare a multi-file package tar archive according to info # "(elisp) Multi-file Packages" for elpaBuild to install - postUnpack = '' - pushd mu-*-mu4e - local content_directory=${pname}-${version} + postBuild = '' + local content_directory=$pname-$version mkdir $content_directory cp --verbose share/emacs/site-lisp/mu4e/*.el $content_directory/ rm --verbose --force $content_directory/mu4e-autoloads.el cp --verbose share/info/* $content_directory/ src=$PWD/$content_directory.tar tar --create --verbose --file=$src $content_directory - popd ''; ignoreCompilationError = false; - meta = mu.meta // { + meta = removeAttrs mu.meta [ "mainProgram" ] // { description = "Full-featured e-mail client"; + maintainers = mu.meta.maintainers ++ (with lib.maintainers; [ linj ]); }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/zstd/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/zstd/default.nix new file mode 100644 index 0000000000000..4dfe2484dbfdd --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/zstd/default.nix @@ -0,0 +1,37 @@ +{ + lib, + melpaBuild, + stdenv, + fetchFromGitHub, + zstd, +}: + +let + libExt = stdenv.hostPlatform.extensions.sharedLibrary; +in +melpaBuild { + pname = "zstd"; + version = "0-unstable-2020-06-03"; + + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-zstd"; + rev = "072b264e2cbd5c05be06a1208ebccc2dab44be39"; + hash = "sha256-p8bxefytTOSV6vIG8PAPBXfVKA2rfmWdRtVwjE42mAw="; + }; + + buildInputs = [ zstd ]; + + preBuild = '' + $CC -std=gnu99 -shared -o zstd-core${libExt} zstd-core.c -lzstd + ''; + + files = ''(:defaults "zstd-core${libExt}")''; + + meta = { + homepage = "https://github.com/syohex/emacs-zstd"; + description = "Zstd binding for Emacs Lisp"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ nagy ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 8d24a2d8e0cb0..e680e1f7e63e4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -30,37 +30,13 @@ in { lib, pkgs }: variant: self: let - dontConfigure = pkg: - if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - dontConfigure = true; - }); - }) else null; - - markBroken = pkg: - if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - meta = (drv.meta or { }) // { broken = true; }; - }); - }) else null; - - externalSrc = pkg: epkg: - if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - inherit (epkg) src version; - - propagatedUserEnvPkgs = [ epkg ]; - }); - }) else null; - - buildWithGit = pkg: pkg.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; - }); - - fix-rtags = pkg: - if pkg != null then dontConfigure (externalSrc pkg pkgs.rtags) - else null; + inherit (import ./lib-override-helper.nix pkgs) + buildWithGit + dontConfigure + externalSrc + fix-rtags + markBroken + ; generateMelpa = lib.makeOverridable ({ archiveJson ? defaultArchive }: @@ -130,7 +106,7 @@ let ligo-mode = if super.ligo-mode.version == "0.3" then markBroken super.ligo-mode - else null; # auto-updater is failing; use manual one + else super.ligo-mode; # upstream issue: missing file header link = markBroken super.link; @@ -157,6 +133,13 @@ let # Expects bash to be at /bin/bash ac-rtags = fix-rtags super.ac-rtags; + age = super.age.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace age.el \ + --replace-fail 'age-program (executable-find "age")' 'age-program "${lib.getExe pkgs.age}"' + ''; + }); + airline-themes = super.airline-themes.override { inherit (self.melpaPackages) powerline; }; @@ -270,7 +253,7 @@ let pkgs.zlib.dev pkgs.cairo.dev ] - ++ lib.optional pkgs.stdenv.isLinux pkgs.stdenv.cc.libc.dev + ++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.stdenv.cc.libc.dev ) )} server/epdfinfo ''; @@ -320,7 +303,7 @@ let rm -rf $out/share/emacs/site-lisp/elpa/*/server ''; dontUseCmakeBuildDir = true; - doCheck = pkgs.stdenv.isLinux; + doCheck = pkgs.stdenv.hostPlatform.isLinux; buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.llvmPackages.llvm ]; }); @@ -381,6 +364,20 @@ let forge = buildWithGit super.forge; + gnuplot = super.gnuplot.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace gnuplot.el \ + --replace-fail 'gnuplot-program "gnuplot"' 'gnuplot-program "${lib.getExe pkgs.gnuplot}"' + ''; + }); + + gnuplot-mode = super.gnuplot-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace gnuplot-mode.el \ + --replace-fail 'gnuplot-program "gnuplot"' 'gnuplot-program "${lib.getExe pkgs.gnuplot}"' + ''; + }); + magit = buildWithGit super.magit; magit-find-file = buildWithGit super.magit-find-file; @@ -451,6 +448,13 @@ let orgit-forge = buildWithGit super.orgit-forge; + ormolu = super.ormolu.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace ormolu.el \ + --replace-fail 'ormolu-process-path "ormolu"' 'ormolu-process-path "${lib.getExe pkgs.ormolu}"' + ''; + }); + ox-rss = buildWithGit super.ox-rss; python-isort = super.python-isort.overrideAttrs (attrs: { @@ -544,11 +548,25 @@ let ''; }); + units-mode = super.units-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace units-mode.el \ + --replace-fail 'units-binary-path "units"' 'units-binary-path "${lib.getExe pkgs.units}"' + ''; + }); + vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; }); + zig-mode = super.zig-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace zig-mode.el \ + --replace-fail 'zig-zig-bin "zig"' 'zig-zig-bin "${lib.getExe pkgs.zig}"' + ''; + }); + zmq = super.zmq.overrideAttrs (old: { stripDebugList = [ "share" ]; preBuild = '' @@ -684,7 +702,7 @@ let # Build a helper executable that interacts with the macOS Dictionary.app osx-dictionary = - if pkgs.stdenv.isDarwin + if pkgs.stdenv.hostPlatform.isDarwin then super.osx-dictionary.overrideAttrs (old: { buildInputs = old.buildInputs ++ diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix new file mode 100644 index 0000000000000..d6ac00a3a817c --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix @@ -0,0 +1,21 @@ +pkgs: + +self: super: + +{ + p4-16-mode = super.p4-16-mode.overrideAttrs { + # workaround https://github.com/NixOS/nixpkgs/issues/301795 + prePatch = '' + mkdir tmp-untar-dir + pushd tmp-untar-dir + + tar --extract --verbose --file=$src + content_directory=$(echo p4-16-mode-*) + cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + + popd + ''; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix index 7b156aeaaa498..8cbcd0a711195 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix @@ -10,7 +10,11 @@ 3. Run `git commit -m "nongnu-devel-packages $(date -Idate)" -- nongnu-devel-generated.nix` */ -{ lib, buildPackages }: +{ + lib, + pkgs, + buildPackages, +}: self: let @@ -35,26 +39,15 @@ let super = imported; - overrides = { - p4-16-mode = super.p4-16-mode.overrideAttrs { - # workaround https://github.com/NixOS/nixpkgs/issues/301795 - prePatch = '' - mkdir tmp-untar-dir - pushd tmp-untar-dir - - tar --extract --verbose --file=$src - content_directory=$(echo p4-16-mode-*) - cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el - src=$PWD/$content_directory.tar - tar --create --verbose --file=$src $content_directory - - popd - ''; - }; - }; + commonOverrides = import ./nongnu-common-overrides.nix pkgs; + + overrides = self: super: { }; in - super // overrides + let + super' = super // (commonOverrides self super); + in + super' // (overrides self super') ); in diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix index ce13179ca1ea1..4466621b39261 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -12,7 +12,7 @@ To update the list of packages from nongnu (ELPA), */ -{ lib, buildPackages }: +{ lib, pkgs, buildPackages }: self: let @@ -29,24 +29,11 @@ self: let super = imported; - overrides = { - p4-16-mode = super.p4-16-mode.overrideAttrs { - # workaround https://github.com/NixOS/nixpkgs/issues/301795 - prePatch = '' - mkdir tmp-untar-dir - pushd tmp-untar-dir - - tar --extract --verbose --file=$src - content_directory=$(echo p4-16-mode-*) - cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el - src=$PWD/$content_directory.tar - tar --create --verbose --file=$src $content_directory - - popd - ''; - }; - }; + commonOverrides = import ./nongnu-common-overrides.nix pkgs; + + overrides = self: super: { }; - in super // overrides); + in + let super' = super // (commonOverrides self super); in super' // (overrides self super')); in generateNongnu { } diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index f995b073d3777..8c53805978340 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -16,14 +16,12 @@ , dbus , emacsPackagesFor , fetchpatch -, gconf , gettext , giflib , glib-networking , gnutls , gpm , gsettings-desktop-schemas -, gtk2-x11 , gtk3 , gtk3-x11 , harfbuzz @@ -31,7 +29,6 @@ , jansson , libXaw , libXcursor -, libXft , libXi , libXpm , libgccjit @@ -70,34 +67,33 @@ , withAlsaLib ? false , withAthena ? false , withCsrc ? true -, withDbus ? stdenv.isLinux -, withGTK2 ? false +, withDbus ? stdenv.hostPlatform.isLinux , withGTK3 ? withPgtk && !noGui -, withGconf ? false , withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets) -, withGpm ? stdenv.isLinux +, withGpm ? stdenv.hostPlatform.isLinux , withImageMagick ? lib.versionOlder version "27" && (withX || withNS) +# Emacs 30+ has native JSON support +, withJansson ? lib.versionOlder version "30" , withMailutils ? true , withMotif ? false -, withNS ? stdenv.isDarwin && !(variant == "macport" || noGui) +, withNS ? stdenv.hostPlatform.isDarwin && !(variant == "macport" || noGui) , withPgtk ? false -, withSelinux ? stdenv.isLinux +, withSelinux ? stdenv.hostPlatform.isLinux , withSQLite3 ? lib.versionAtLeast version "29" , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withToolkitScrollBars ? true , withTreeSitter ? lib.versionAtLeast version "29" , withWebP ? lib.versionAtLeast version "29" -, withX ? !(stdenv.isDarwin || noGui || withPgtk) +, withX ? !(stdenv.hostPlatform.isDarwin || noGui || withPgtk) , withXinput2 ? withX && lib.versionAtLeast version "29" -, withXwidgets ? !stdenv.isDarwin && !noGui && (withGTK3 || withPgtk) +, withXwidgets ? !stdenv.hostPlatform.isDarwin && !noGui && (withGTK3 || withPgtk) && (lib.versionOlder version "30") # XXX: upstream bug 66068 precludes newer versions of webkit2gtk (https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html) , withSmallJaDic ? false , withCompressInstall ? true # Options , siteStart ? ./site-start.el , toolkit ? ( - if withGTK2 then "gtk2" - else if withGTK3 then "gtk3" + if withGTK3 then "gtk3" else if withMotif then "motif" else if withAthena then "athena" else "lucid") @@ -118,17 +114,13 @@ , WebKit }: -assert (withGTK2 && !withNS && variant != "macport") -> withX; assert (withGTK3 && !withNS && variant != "macport") -> withX || withPgtk; -assert noGui -> !(withX || withGTK2 || withGTK3 || withNS || variant == "macport"); -assert withAcl -> stdenv.isLinux; -assert withAlsaLib -> stdenv.isLinux; -assert withGTK2 -> !(withGTK3 || withPgtk); -assert withGTK3 -> !withGTK2 || withPgtk; -assert withGconf -> withX; -assert withGpm -> stdenv.isLinux; -assert withNS -> stdenv.isDarwin && !(withX || variant == "macport"); +assert noGui -> !(withX || withGTK3 || withNS || variant == "macport"); +assert withAcl -> stdenv.hostPlatform.isLinux; +assert withAlsaLib -> stdenv.hostPlatform.isLinux; +assert withGpm -> stdenv.hostPlatform.isLinux; +assert withNS -> stdenv.hostPlatform.isDarwin && !(withX || variant == "macport"); assert withPgtk -> withGTK3 && !withX; assert withXwidgets -> !noGui && (withGTK3 || withPgtk); @@ -150,7 +142,6 @@ mkDerivation (finalAttrs: { else if variant == "macport" then "-macport" else if withPgtk then "-pgtk" else if withGTK3 then "-gtk3" - else if withGTK2 then "-gtk2" else ""); inherit version; @@ -160,7 +151,9 @@ mkDerivation (finalAttrs: { (substituteAll { src = if lib.versionOlder finalAttrs.version "29" then ./native-comp-driver-options-28.patch - else ./native-comp-driver-options.patch; + else if lib.versionOlder finalAttrs.version "30" + then ./native-comp-driver-options.patch + else ./native-comp-driver-options-30.patch; backendPath = (lib.concatStringsSep " " (builtins.map (x: ''"-B${x}"'') ([ # Paths necessary so the JIT compiler finds its libraries: @@ -215,17 +208,17 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals srcRepo [ autoreconfHook texinfo - ] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook3; + ] ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ]; buildInputs = [ gettext gnutls - harfbuzz.dev + (lib.getDev harfbuzz) + ] ++ lib.optionals withJansson [ jansson + ] ++ [ libxml2 ncurses - ] ++ lib.optionals withGconf [ - gconf ] ++ lib.optionals withAcl [ acl ] ++ lib.optionals withAlsaLib [ @@ -236,13 +229,11 @@ mkDerivation (finalAttrs: { dbus ] ++ lib.optionals withSelinux [ libselinux - ] ++ lib.optionals (!stdenv.isDarwin && withGTK3) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && withGTK3) [ gsettings-desktop-schemas - ] ++ lib.optionals (stdenv.isLinux && withX) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withX) [ libotf m17n_lib - ] ++ lib.optionals (withX && withGTK2) [ - gtk2-x11 ] ++ lib.optionals (withX && withGTK3) [ gtk3-x11 ] ++ lib.optionals (withX && withMotif) [ @@ -284,7 +275,7 @@ mkDerivation (finalAttrs: { libXi ] ++ lib.optionals withXwidgets [ webkitgtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ] ++ lib.optionals withNS [ librsvg @@ -341,7 +332,7 @@ mkDerivation (finalAttrs: { (lib.withFeature true "mac") (lib.withFeature true "xml2") ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.withFeature withNS "ns") ] ++ [ @@ -408,7 +399,7 @@ mkDerivation (finalAttrs: { -f batch-native-compile $out/share/emacs/site-lisp/site-start.el ''; - postFixup = lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' + postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && withX && toolkit == "lucid") '' patchelf --add-rpath ${lib.makeLibraryPath [ libXcursor ]} $out/bin/emacs patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" ''; diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch b/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch new file mode 100644 index 0000000000000..bd3ff2adf77c1 --- /dev/null +++ b/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch @@ -0,0 +1,16 @@ +diff -Naur a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el +--- old/lisp/emacs-lisp/comp.el 1969-12-31 21:00:01.000000000 -0300 ++++ source/lisp/emacs-lisp/comp.el 2024-09-13 14:26:37.246614196 -0300 +@@ -101,8 +101,10 @@ + :version "28.1") + + (defcustom native-comp-driver-options +- (cond ((eq system-type 'darwin) '("-Wl,-w")) +- ((eq system-type 'cygwin) '("-Wl,-dynamicbase"))) ++ (append ++ (cond ((eq system-type 'darwin) '("-Wl,-w")) ++ ((eq system-type 'cygwin) '("-Wl,-dynamicbase"))) ++ '(@backendPath@)) + "Options passed verbatim to the native compiler's back-end driver. + Note that not all options are meaningful; typically only the options + affecting the assembler and linker are likely to be useful. diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index da243044b689a..ae93a2ed019a1 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -110,6 +110,14 @@ in hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s="; }); + emacs30 = import ./make-emacs.nix (mkArgs { + pname = "emacs"; + version = "30.0.91"; + variant = "mainline"; + rev = "30.0.91"; + hash = "sha256-X5J34BUY42JgA1s76eVeGA9WNtesU2c+JyndIHFbONQ="; + }); + emacs28-macport = import ./make-emacs.nix (mkArgs { pname = "emacs-mac"; version = "28.2"; diff --git a/pkgs/applications/editors/gedit/correct-gir-lib-path.patch b/pkgs/applications/editors/gedit/correct-gir-lib-path.patch index b3689e4206693..3243243760007 100644 --- a/pkgs/applications/editors/gedit/correct-gir-lib-path.patch +++ b/pkgs/applications/editors/gedit/correct-gir-lib-path.patch @@ -1,13 +1,16 @@ diff --git a/gedit/meson.build b/gedit/meson.build -index a8683e61a..fc48669f7 100644 +index bc689e5..e3b90d8 100644 --- a/gedit/meson.build +++ b/gedit/meson.build -@@ -191,7 +191,7 @@ libgedit_shared_lib = shared_library( - c_args: libgedit_c_args, - link_args: libgedit_link_args, - install: true, -- install_dir: get_option('libdir') / 'gedit', -+ install_dir: get_option('prefix') / get_option('libdir') / 'gedit', - ) +@@ -165,9 +165,9 @@ libgedit_private_headers += 'gedit-enum-types-private.h' + subdir('resources') - # GObject Introspection + if host_machine.system() == 'windows' +- libgedit_shared_lib_install_dir = get_option('libdir') ++ libgedit_shared_lib_install_dir = get_option('prefix') / get_option('libdir') + else +- libgedit_shared_lib_install_dir = get_option('libdir') / 'gedit' ++ libgedit_shared_lib_install_dir = get_option('prefix') / get_option('libdir') / 'gedit' + endif + + libgedit_shared_lib = shared_library( diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index c3fc6fae2dcf1..7a1edc7294b11 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -4,7 +4,6 @@ , mesonEmulatorHook , fetchurl , python3 -, python3Packages , pkg-config , gtk3 , gtk-mac-integration @@ -30,13 +29,13 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "47.0"; + version = "48.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - sha256 = "+kpZfjTHbUrJFDG1rm4ZHJbGsK8XAuCJmrNRme36G/o="; + sha256 = "/g/vm3sHmRINuGrok6BgA2oTRFNS3tkWm6so04rPDoA="; }; patches = [ @@ -54,7 +53,6 @@ stdenv.mkDerivation rec { perl pkg-config python3 - python3Packages.wrapPython vala wrapGAppsHook3 gtk-doc @@ -73,7 +71,7 @@ stdenv.mkDerivation rec { libgedit-gtksourceview libgedit-tepl libpeas - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gtk-mac-integration ]; @@ -87,16 +85,6 @@ stdenv.mkDerivation rec { # Reliably fails to generate gedit-file-browser-enum-types.h in time enableParallelBuilding = false; - pythonPath = with python3Packages; [ - # https://github.com/NixOS/nixpkgs/issues/298716 - pycairo - ]; - - postFixup = '' - buildPythonPath "$pythonPath" - patchPythonScript $out/lib/gedit/plugins/snippets/document.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = "gedit"; @@ -104,7 +92,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://gedit-technology.github.io/apps/gedit/"; + homepage = "https://gitlab.gnome.org/World/gedit/gedit"; description = "Former GNOME text editor"; maintainers = with maintainers; [ bobby285271 ]; license = licenses.gpl2Plus; diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 79e871561c075..5da1e6e2f07a8 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -3,34 +3,27 @@ , fetchFromGitHub , installShellFiles , stdenv -, fetchpatch }: buildGoModule rec { pname = "glow"; - version = "1.5.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - hash = "sha256-12UziCf3BO1z+W02slNCCvXhIkvZuVgXk++BdHG3gDI="; + hash = "sha256-gPy3MnQHmBJl06oVOpwQB4qIpJ10kUNMNMPkpsIujeI="; }; - vendorHash = "sha256-xxFC87t12bZKea9Snscul+xx8IGFAcoIr9Z8wxHL7nM="; + vendorHash = "sha256-vxw8yqY6MxIIWeSX1D+unb0VbBmIpz1431N7UNORJP0="; - # Remove whenever a release with it is available - patches = [(fetchpatch { - url = "https://github.com/charmbracelet/glow/commit/f0734709f0be19a34e648caaf63340938a50caa2.patch"; - name = "go-1-17-patch"; - hash = "sha256-vpMiVb/7SFT9xcSpVGQriEjkexh1F/ljpfpIswdBx2Y="; - })]; - - doCheck = false; + nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; - nativeBuildInputs = [ installShellFiles ]; + doCheck = false; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd glow \ --bash <($out/bin/glow completion bash) \ diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix deleted file mode 100644 index efa6aaf4cbdbd..0000000000000 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, autoreconfHook -, gtk-doc -, vala -, gobject-introspection -, wrapGAppsHook3 -, gsettings-desktop-schemas -, gspell -, libgedit-gtksourceview -, libgedit-tepl -, libgee -, adwaita-icon-theme -, gnome -, glib -, pkg-config -, gettext -, itstool -, libxml2 -}: - -stdenv.mkDerivation rec { - version = "3.46.0"; - pname = "gnome-latex"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nVVY5sqFaiuvVTzNTVORP40MxQ648s8ynqOJvgRKto="; - }; - - patches = [ - # Adapt for Tepl -> libgedit-tepl rename - (fetchpatch { - url = "https://gitlab.gnome.org/swilmet/gnome-latex/-/commit/41e532c427f43a5eed9081766963d6e29a9975a1.patch"; - hash = "sha256-gu8o/er4mP92dE5gWg9lGx5JwTHB8ytk3EMNlwlIpq4="; - }) - ]; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - gtk-doc - vala - gobject-introspection - wrapGAppsHook3 - itstool - gettext - ]; - - buildInputs = [ - adwaita-icon-theme - glib - gsettings-desktop-schemas - gspell - libgedit-gtksourceview - libgedit-tepl - libgee - libxml2 - ]; - - configureFlags = [ - "--disable-dconf-migration" - ]; - - doCheck = true; - - env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - passthru.updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/swilmet/gnome-latex"; - description = "LaTeX editor for the GNOME desktop"; - maintainers = with maintainers; [ manveru bobby285271 ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - mainProgram = "gnome-latex"; - }; -} diff --git a/pkgs/applications/editors/heh/default.nix b/pkgs/applications/editors/heh/default.nix index bd7907f7682c9..f89ee5a76a0a5 100644 --- a/pkgs/applications/editors/heh/default.nix +++ b/pkgs/applications/editors/heh/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w="; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit ]); diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index de428ae5775c4..4c89a63a41fae 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -3,66 +3,66 @@ "aqua": { "update-channel": "Aqua RELEASE", "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.tar.gz", - "version": "2024.2", - "sha256": "63a6357cef1bb3772939abd8d13c05e265b5492643b080dd235d170584e0b636", - "url": "https://download.jetbrains.com/aqua/aqua-2024.2.tar.gz", - "build_number": "242.20224.331" + "version": "2024.2.1", + "sha256": "847b7658843dd06b9d6f2689fa4030e54473b6e5e234f23b6e17a6c646fad07c", + "url": "https://download.jetbrains.com/aqua/aqua-2024.2.1.tar.gz", + "build_number": "242.22855.128" }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.2.0.1", - "sha256": "1363dcf718597aefacf2beca887e71a19c9b733cc044b24ff8b8db1253b643cd", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.0.1.tar.gz", - "build_number": "242.20224.413" + "version": "2024.2.2", + "sha256": "1658fb15d41dfb804ab0ea3ed4781d4ae0f41d25cc9df17c3f536a565423aa5b", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2.tar.gz", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "dc6bae6c5ca4daa6d3eefd131d48f20810540f75ac635ed56eea7d00de9c0ee1", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.1.tar.gz", - "build_number": "242.20224.385" + "version": "2024.2.2", + "sha256": "989599d5f2c900219d3cac75557655927f0b2f95224c9cf3b1ec9ba3167bfc07", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.2.tar.gz", + "build_number": "242.21829.162" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2024.2", - "sha256": "fcf6d8269ef1e652da003b3cdb212b4bd06a66d6432c574b0b99f47c27eea950", - "url": "https://download.jetbrains.com/python/dataspell-2024.2.tar.gz", - "build_number": "242.20224.354" + "version": "2024.2.2", + "sha256": "9b3dd8185f805d8d968f5a515dbe74d3672e0cd1b2cb052cf81382bd63ddb3b8", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2.tar.gz", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2024.2", - "sha256": "a397ec10b27ed309ddc7287d43c89f6cddb55f129ea5bd5c298483dd2c33bffb", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.tar.gz", - "build_number": "242.20224.368" + "version": "2024.2.1", + "sha256": "bc4027c3322004d041571ede49f1dc3656d7abcecf6bdeb9caab191264e60fcb", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.1.tar.gz", + "build_number": "242.21829.203" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.2.0.1", - "sha256": "d55c87c1bd1b886841e807098d4c3c2575ad21f838f6920c86f84c647915f62e", - "url": "https://download.jetbrains.com/go/goland-2024.2.0.1.tar.gz", - "build_number": "242.20224.424" + "version": "2024.2.3", + "sha256": "e42565be2df79b8765b1c4ec5db737a4ab36bdaed418cd3a9e340e2c2d92a561", + "url": "https://download.jetbrains.com/go/goland-2024.2.3.tar.gz", + "build_number": "242.23339.24" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.2.0.2", - "sha256": "acca1c3dde049895a11069f1c3245f69cfe64fdfc520ab0a0ea8b684b53b50cd", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.0.2.tar.gz", - "build_number": "242.20224.419" + "version": "2024.2.3", + "sha256": "2698adf2f0c4239f21b997faf9fc85954fd654a58d52ff630613fed70fb9699d", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.3.tar.gz", + "build_number": "242.23339.11" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.2.0.2", - "sha256": "cf2159b9ea61ea910d27ad0e661cdd93575f65cdb443f99bd15600f5960b7f4b", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.0.2.tar.gz", - "build_number": "242.20224.419" + "version": "2024.2.3", + "sha256": "579021f82d31dceb0dd8581fe5c12d7481e52c24a10688898ed00af1a0295eb3", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.3.tar.gz", + "build_number": "242.23339.11" }, "mps": { "update-channel": "MPS RELEASE", @@ -75,133 +75,133 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2024.2.0.1", - "sha256": "182392496510eed42c7b1f4616e6c9e5b546348ea8c235cc74da131bcbd56d29", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.0.1.tar.gz", - "build_number": "242.20224.427", + "version": "2024.2.3", + "sha256": "8b3b1ba19c4d5f0cc1d6775bff58d38313414eae75976ca99915102c02368eea", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.3.tar.gz", + "build_number": "242.23339.16", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2024.2.0.1", - "sha256": "d9befc260f48b9809f84cefd05761848ee8be643b49c595e13fd1443c967eb25", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.0.1.tar.gz", - "build_number": "242.20224.428" + "version": "2024.2.3", + "sha256": "448f6c48a51bb419c68c763b0e4eefc0449ad7bbad534de3f93b2f1a40308833", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.3.tar.gz", + "build_number": "242.23339.19" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2024.2.0.1", - "sha256": "7d2bfb2449e85ca66ffaf40901a2c4b1498d43c16229bdad08c51a5b0571dc02", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.0.1.tar.gz", - "build_number": "242.20224.428" + "version": "2024.2.3", + "sha256": "837876f0d4db2d6fc0c319e88fa6e24fbe81b80809d529d600ef86a524aa8312", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.3.tar.gz", + "build_number": "242.23339.19" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "2d14917d527120a98c1d71b94ba430fe9bb7f2358290710d74fd121426cffa4e", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.1.tar.gz", - "build_number": "242.20224.418" + "version": "2024.2.5", + "sha256": "7c8b3fc459f0a6314ebf2b7da0a202cb0cbbc7df432fa047673f34fbad9f9dfe", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.5.tar.gz", + "build_number": "242.22855.90" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.2.0.1", - "sha256": "9e3ca43d2cd0c22b254033c9fea4c54707310a39a2b4b1ff270a480b53fd3518", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.0.1.tar.gz", - "build_number": "242.20224.425" + "version": "2024.2.3", + "sha256": "54991cb37fd6495ad52a1b2b6bc1d6d7ab4fff20a1bd393cab72ac57ca4e31a5", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.3.tar.gz", + "build_number": "242.23339.18" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2024.1.8", - "sha256": "c4b6a3f1eb23a17c4a09344073f4039d0cd51c5a6991fe7bdfd761edc422b703", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.8.tar.gz", - "build_number": "241.18968.39" + "version": "2024.2.2", + "sha256": "ac2046c415906ba8f802a0b94119ff899efde41547a9fdd63b3c5e46bf9d42d1", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.2.tar.gz", + "build_number": "242.22855.126" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.2.0.1", - "sha256": "52a196f8f144b1445e3345285762acb1d2f87c29cb7f4a9005bcde4289443258", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.0.1.tar.gz", - "build_number": "242.20224.426" + "version": "2024.2.3", + "sha256": "b3c861e440a6747b87e329009910858a2a21661dd09e53b1b2b5d835b3bb76b6", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.3.tar.gz", + "build_number": "242.23339.15" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz", - "version": "2024.1 EAP", - "sha256": "7da1531fc7f1f3995957729b412bf43e5757b0029ffcdf858270e64ae30ee462", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101.tar.gz", - "build_number": "241.18775.101" + "version": "2024.2 EAP", + "sha256": "89d1f4bda404bb81c315600f6b673f89e2798066f68b661a904c9e30db45b4e8", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138.tar.gz", + "build_number": "242.21870.138" } }, "aarch64-linux": { "aqua": { "update-channel": "Aqua RELEASE", "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.tar.gz", - "version": "2024.2", - "sha256": "5a28826c97c2c09988d57eefe1e2c1b0cdb746399844a7a207d289c2c4d4922e", - "url": "https://download.jetbrains.com/aqua/aqua-2024.2-aarch64.tar.gz", - "build_number": "242.20224.331" + "version": "2024.2.1", + "sha256": "8136b8a13edc9d7cf35eb0bbac685e74a76b52b0f15541f0289ed0968b316c2c", + "url": "https://download.jetbrains.com/aqua/aqua-2024.2.1-aarch64.tar.gz", + "build_number": "242.22855.128" }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.2.0.1", - "sha256": "9a8d26655b264cfbbf25fe4a20d9fdf36e1f091420407f9e367983165dec0068", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.0.1-aarch64.tar.gz", - "build_number": "242.20224.413" + "version": "2024.2.2", + "sha256": "35e089b8d8bf5f32c80022f394fe525b8aa37540d26c27e861db0df9e34716a4", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "6ca837be2f61e1db0d1a84b6c2a98d963d3625aa70fbdf6dfa9f73a9eb0c0b4d", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.1-aarch64.tar.gz", - "build_number": "242.20224.385" + "version": "2024.2.2", + "sha256": "1d915eb7426693fe490cfcd5b484f0e1c9d45c21a4050242101dbe33905a42ee", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.2-aarch64.tar.gz", + "build_number": "242.21829.162" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2024.2", - "sha256": "aa9fda7ffdd7348bd34b98fee8f4d0904edf30ea08ae57e64ac7b6e247b567a8", - "url": "https://download.jetbrains.com/python/dataspell-2024.2-aarch64.tar.gz", - "build_number": "242.20224.354" + "version": "2024.2.2", + "sha256": "e529c27d3c5eeabec02c7ff2e3c0a682d60b962923054cb9dca2e46bf1ec9104", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2024.2", - "sha256": "b184c5f06755fcd849071da93f2046fec20f8183691663cbac817f52ae418e76", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2-aarch64.tar.gz", - "build_number": "242.20224.368" + "version": "2024.2.1", + "sha256": "9dfe0228b651421e0972915472ea34a80940bf4b13a922b405d88207c4140c47", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.1-aarch64.tar.gz", + "build_number": "242.21829.203" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.2.0.1", - "sha256": "52756190f5c26d82a2ed17168483aaddc11ae052c12bae5055faeac6b2230e5a", - "url": "https://download.jetbrains.com/go/goland-2024.2.0.1-aarch64.tar.gz", - "build_number": "242.20224.424" + "version": "2024.2.3", + "sha256": "f2d858aa433b452d2158eb4f2a0f7946b0be2568500f241e7a6b2575c22ba204", + "url": "https://download.jetbrains.com/go/goland-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.24" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.2.0.2", - "sha256": "1f8bc10d63e0878fcc95aa787f7859e106f144fae2334bc71b2514a5189f7b45", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.0.2-aarch64.tar.gz", - "build_number": "242.20224.419" + "version": "2024.2.3", + "sha256": "97d5b585b9c7d5465ef7a0e99a41c35c405a7658fe61ece64be84c6ed6e45e4c", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.11" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.2.0.2", - "sha256": "0da7909451157394d190b5041aaa61475ab30afd7af16a77651b40b90b78ef0e", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.0.2-aarch64.tar.gz", - "build_number": "242.20224.419" + "version": "2024.2.3", + "sha256": "c6bf5a8183fb1c3422dec061e5198fa18bb6edaf2c64724efecf77fddaf747e1", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.11" }, "mps": { "update-channel": "MPS RELEASE", @@ -214,133 +214,133 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2024.2.0.1", - "sha256": "727e654db648da159e9f2ff013fc612cb2b2034dc8090af6b12b22ddc39e53f4", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.0.1-aarch64.tar.gz", - "build_number": "242.20224.427", + "version": "2024.2.3", + "sha256": "25fbd433eb53904efba7c05ad0a28cbd7a9e7c8e08cbf8aa81913cd8ca4db1cf", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.16", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2024.2.0.1", - "sha256": "3c954950fb616dc85dc0da6475feee6d67363a537df451ee8fe25aeb6e473b86", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.0.1-aarch64.tar.gz", - "build_number": "242.20224.428" + "version": "2024.2.3", + "sha256": "fd398923379f340d9454e00a23dabc141af1120c5a294a8fd899c2f542b00a57", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.19" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2024.2.0.1", - "sha256": "84cb34fd2ae9d96dc544f7e326015081e6186dbf7fc3f67a271d76107494f933", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.0.1-aarch64.tar.gz", - "build_number": "242.20224.428" + "version": "2024.2.3", + "sha256": "2f15216657b1b7b3083aaded473b992e22fbe38704e0ebe8057aecc7ef37d78b", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.19" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "cd969fc84eaa87dfa1de2587b3ba974e6d8961895541732e9c1617c260ce8450", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.1-aarch64.tar.gz", - "build_number": "242.20224.418" + "version": "2024.2.5", + "sha256": "1a3a4cfe64525b3d744fe82378fd86d84ac87b66a69a37f930ae05bdaaecb010", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.5-aarch64.tar.gz", + "build_number": "242.22855.90" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.2.0.1", - "sha256": "41f71e86c944ad6d5111402afdd4567387ce6099a3c8000739919dc58199f259", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.0.1-aarch64.tar.gz", - "build_number": "242.20224.425" + "version": "2024.2.3", + "sha256": "2be5fa28bd5313b9a043818207b9f76f3f38513ec400dfd76b01b543ff8013cf", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.18" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2024.1.8", - "sha256": "1dc44db7d7f83c1e41dfd7739ac58743e0201d0a348e601248fe6ec59e4a9834", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.8-aarch64.tar.gz", - "build_number": "241.18968.39" + "version": "2024.2.2", + "sha256": "7d3dc3d35f56f5948c294742a06a8e1cc7fc55dae7455b5bb8f99eb244ab7a20", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.126" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.2.0.1", - "sha256": "c83491b11662beeda45df0fb333034a9e875d61e6bb6790f102186d218934ca0", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.0.1-aarch64.tar.gz", - "build_number": "242.20224.426" + "version": "2024.2.3", + "sha256": "c57647c5c77770f76468a2aacb62655e27f6590b48967d5eafd37e468bd25437", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.15" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz", - "version": "2024.1 EAP", - "sha256": "2f8d90582f19eee4c1b83d9c61846baa7ec3f4e75dde10ba069712e9677b2a60", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101-aarch64.tar.gz", - "build_number": "241.18775.101" + "version": "2024.2 EAP", + "sha256": "28a7504a29ba573632e300fbe845d3b2fe3f2c689a853abf83e32ae161e476da", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138-aarch64.tar.gz", + "build_number": "242.21870.138" } }, "x86_64-darwin": { "aqua": { "update-channel": "Aqua RELEASE", "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.dmg", - "version": "2024.2", - "sha256": "0ea9875335a53d60722f91a7059847d1da857788fe3362685bf1e66dfe9aafed", - "url": "https://download.jetbrains.com/aqua/aqua-2024.2.dmg", - "build_number": "242.20224.331" + "version": "2024.2.1", + "sha256": "e65135897e988eb01e2f78e18a92953f592ac0de07c6626780fab544affcd64e", + "url": "https://download.jetbrains.com/aqua/aqua-2024.2.1.dmg", + "build_number": "242.22855.128" }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.2.0.1", - "sha256": "3f5c90de4ed523bc090ec6ab7bb199c5609f9dc58146c7c164fc716a4aeca20c", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.0.1.dmg", - "build_number": "242.20224.413" + "version": "2024.2.2", + "sha256": "35e1a0348353bc8c741c2dea429d0554c7d2a201e9c69b3bfc11c67accab2c52", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2.dmg", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2024.2.1", - "sha256": "2053c1305fbabee20cf8a26aee2b939ff8965b2f7402639c09652798ebd37da6", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.1.dmg", - "build_number": "242.20224.385" + "version": "2024.2.2", + "sha256": "bc6247f976dfc216c86f9ff05a8401172af213230464bcff247ee432ce3140f4", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.2.dmg", + "build_number": "242.21829.162" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2024.2", - "sha256": "3e066588e8123c1842a03a0030c8d5a72c60a9710a759d5f10f89ae1a9633772", - "url": "https://download.jetbrains.com/python/dataspell-2024.2.dmg", - "build_number": "242.20224.354" + "version": "2024.2.2", + "sha256": "2afdedae414e62077580c88c76093ea608b49aa3e4c9c9f1ec8aef7d467a7285", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2.dmg", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2024.2", - "sha256": "630ee3bfb6537c5da26aa7907027788f287d4e42fe24ba1f6eca037eb6afea42", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.dmg", - "build_number": "242.20224.368" + "version": "2024.2.1", + "sha256": "4fabb5e9ea13fc1380779502915f0d6741ee75742a535ced679f68d72d40a41c", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.1.dmg", + "build_number": "242.21829.203" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.2.0.1", - "sha256": "5454717fe28e3b8377b4d58844e039717c1fd3a5b9eaa430c30185dce5280c19", - "url": "https://download.jetbrains.com/go/goland-2024.2.0.1.dmg", - "build_number": "242.20224.424" + "version": "2024.2.3", + "sha256": "e9cedcee2365db7eeeded75fafab8f25931819dc5ae111195e040354b3cc07f9", + "url": "https://download.jetbrains.com/go/goland-2024.2.3.dmg", + "build_number": "242.23339.24" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.2.0.2", - "sha256": "3b5d0f9de135e681cbbe06fc3e1ed00a798102174a7baba6edf7061582ea8d7b", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.0.2.dmg", - "build_number": "242.20224.419" + "version": "2024.2.3", + "sha256": "015db6b1a9b57b55db005d6eff8752e4155d52841f03dbd679e204d8ae9289e9", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.3.dmg", + "build_number": "242.23339.11" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.2.0.2", - "sha256": "fde5ffcba501bd94139115266b71dff76ec199ea35ff0673e7b7afea73aeb80b", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.0.2.dmg", - "build_number": "242.20224.419" + "version": "2024.2.3", + "sha256": "bc47dc27e81f0fd15a9b62132912e68051b5b9f31bef6faadfcf27a48db8ffa7", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.3.dmg", + "build_number": "242.23339.11" }, "mps": { "update-channel": "MPS RELEASE", @@ -353,133 +353,133 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2024.2.0.1", - "sha256": "4913211a8e2b52407b003f5fab5b268b7211d57df96cc17ae64f87293184698e", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.0.1.dmg", - "build_number": "242.20224.427", + "version": "2024.2.3", + "sha256": "e4824a57ba7bff5806c11c1eabe6f3615a4ae082cd83549631823fec0ca03b2f", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.3.dmg", + "build_number": "242.23339.16", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2024.2.0.1", - "sha256": "2735841aa3d5544a53bcc2d9bac86e1a452c8e29b434b0591c0db13f40347868", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.0.1.dmg", - "build_number": "242.20224.428" + "version": "2024.2.3", + "sha256": "8750abd7c24b26d8e226a1ba20f69174173e7e76cb6198c1ccc89117201417d5", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.3.dmg", + "build_number": "242.23339.19" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2024.2.0.1", - "sha256": "e98c3d13f67ed3ad3abf512189a1d3e331ee48ac1beefb2843e652f2c4b59878", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.0.1.dmg", - "build_number": "242.20224.428" + "version": "2024.2.3", + "sha256": "a6252501f10a73151cba714080e7bb54197469de1be83b217b3479d5d0b7bc33", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.3.dmg", + "build_number": "242.23339.19" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2024.2.1", - "sha256": "5631e697ed41713df06c1fe71d6d5e0b39360afb2a1babd103b876f83dff7aa1", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.1.dmg", - "build_number": "242.20224.418" + "version": "2024.2.5", + "sha256": "0161a1eb2d1e99ed88bebf26e7d1646434924a0878ab4c8e5ec1fc34b0998a5e", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.5.dmg", + "build_number": "242.22855.90" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.2.0.1", - "sha256": "bb51be85686deef7cf665a5bf8a461a846e2b69d64817d43c9c47a184ad98a24", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.0.1.dmg", - "build_number": "242.20224.425" + "version": "2024.2.3", + "sha256": "abb6c51d39c3132f60f0f5d8fd5038f908247c0c029b34ef63821ef2fc79b7fa", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.3.dmg", + "build_number": "242.23339.18" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2024.1.8", - "sha256": "1bfada79e7ec2166c43a6dcc65bf2387f70422e35b6511623e48ed66bbbdcdb1", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.8.dmg", - "build_number": "241.18968.39" + "version": "2024.2.2", + "sha256": "b9c3959e7680c4b3ae341688597ac70606cb2179272440d9ee31d06633665fe2", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.2.dmg", + "build_number": "242.22855.126" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.2.0.1", - "sha256": "2533f260a7ac04ffc4e0711a21e6cdb2819ab2e1e99f3d02ce447efd3c4dc5b6", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.0.1.dmg", - "build_number": "242.20224.426" + "version": "2024.2.3", + "sha256": "f092871d04fbd5c8cfd8fac7c47d84453c7134ffb937137a7d4b916c10ba5ece", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.3.dmg", + "build_number": "242.23339.15" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg", - "version": "2024.1 EAP", - "sha256": "fad7fbf6fec147556b53b75adb02f22df038822f4cb0662dd4748dcc1ffd0969", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101.dmg", - "build_number": "241.18775.101" + "version": "2024.2 EAP", + "sha256": "bcf989440a220fff70600d38333bc99feef0453779e60caae0d05d1168cfffb0", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138.dmg", + "build_number": "242.21870.138" } }, "aarch64-darwin": { "aqua": { "update-channel": "Aqua RELEASE", "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.dmg", - "version": "2024.2", - "sha256": "2da73b2896cf8c7114291f7ab64730d494ed1adca83542b56702a6fb2fcaa92d", - "url": "https://download.jetbrains.com/aqua/aqua-2024.2-aarch64.dmg", - "build_number": "242.20224.331" + "version": "2024.2.1", + "sha256": "f91c189a05b98e0e0ad0ddc9d08345e80b5cd6b784689b8e75bcbc74cc61d1ff", + "url": "https://download.jetbrains.com/aqua/aqua-2024.2.1-aarch64.dmg", + "build_number": "242.22855.128" }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.2.0.1", - "sha256": "92f17a4cad5f027f940e59146fe626c421ad5be585e1f37c0e9879b49e99834e", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.0.1-aarch64.dmg", - "build_number": "242.20224.413" + "version": "2024.2.2", + "sha256": "428d557d4b5eb7687c7c8142b61591ef4fe7825891d91616019292280696180e", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2-aarch64.dmg", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "6b8505ef67de19f312ce78bdbc067093aa95f78407a863b6baa16c7df98a6a98", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.1-aarch64.dmg", - "build_number": "242.20224.385" + "version": "2024.2.2", + "sha256": "9f92c4ba7d60a9df1e4450278125733ba1fed499d4a27bbd753d8c0d33a57dcb", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.2-aarch64.dmg", + "build_number": "242.21829.162" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2024.2", - "sha256": "a575b901eb706e197d05d2523f74a66528a225eb50ead1d43c2fbbc2231584b0", - "url": "https://download.jetbrains.com/python/dataspell-2024.2-aarch64.dmg", - "build_number": "242.20224.354" + "version": "2024.2.2", + "sha256": "3d153a2813dd5b1527a0e5c429a390cdcb7d921774c369818283a6706bb47375", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2-aarch64.dmg", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2024.2", - "sha256": "a66f93350e9251ba34a1d3cf6061fc9ad5c5351b328a15be906a8706b8be2ded", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2-aarch64.dmg", - "build_number": "242.20224.368" + "version": "2024.2.1", + "sha256": "8a8242c53ddc85304922552fdf424fbe31b729f549feda30b8e6a982c5447f4d", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.1-aarch64.dmg", + "build_number": "242.21829.203" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.2.0.1", - "sha256": "100cbfc7ac2955869f933ff61c73001d6255b69dc3f8cd36d2018a9ba939b367", - "url": "https://download.jetbrains.com/go/goland-2024.2.0.1-aarch64.dmg", - "build_number": "242.20224.424" + "version": "2024.2.3", + "sha256": "dd664944c119f01e81e9a864187510813521b1c2afab39ed57332b29cff9da61", + "url": "https://download.jetbrains.com/go/goland-2024.2.3-aarch64.dmg", + "build_number": "242.23339.24" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.2.0.2", - "sha256": "fbf6e1f8dd19d5a467426c1ca174b21cb71deaaf1f4dd5a3cfdf6cf2a54ba5ce", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.0.2-aarch64.dmg", - "build_number": "242.20224.419" + "version": "2024.2.3", + "sha256": "67f71e9f2fd1401c46794e12cd660906fc4e667d68454f36807923dc5e5ffd42", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.3-aarch64.dmg", + "build_number": "242.23339.11" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.2.0.2", - "sha256": "03866cf637bc0698e6764fe18d2af98a7065c9c9ca0b847953df0ccc42d65b3d", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.0.2-aarch64.dmg", - "build_number": "242.20224.419" + "version": "2024.2.3", + "sha256": "985a90d418ecef8758b466a245c3170df95dd2024922fcf9195be74465d77fe4", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.3-aarch64.dmg", + "build_number": "242.23339.11" }, "mps": { "update-channel": "MPS RELEASE", @@ -492,67 +492,67 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2024.2.0.1", - "sha256": "fa6e248516f3936abca873d9c99783d7fc826e36995bd9c0b57b407bf7144463", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.0.1-aarch64.dmg", - "build_number": "242.20224.427", + "version": "2024.2.3", + "sha256": "9e406b15359c5ccc0f49cd66be0142fbe1a77dc979052943b2f54f1502acce5c", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.3-aarch64.dmg", + "build_number": "242.23339.16", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2024.2.0.1", - "sha256": "53ed528b86e7f0eeeefbbe590fb5918ad6b4a1b9f750843c2ac0dbebc7a96d5c", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.0.1-aarch64.dmg", - "build_number": "242.20224.428" + "version": "2024.2.3", + "sha256": "ac8c4fe330ef670f7f6dde424b4c2218a1cdb8eb58773ce73510829e99d259df", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.3-aarch64.dmg", + "build_number": "242.23339.19" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2024.2.0.1", - "sha256": "f3ecb2fc630d357e5e3879c6ba1361d78fd45714cc9311a19ac754f70fd79e68", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.0.1-aarch64.dmg", - "build_number": "242.20224.428" + "version": "2024.2.3", + "sha256": "c7550781611e6a9701295f76fd9e9572b767b6969dd28f52d872a1a1bccf3a7f", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.3-aarch64.dmg", + "build_number": "242.23339.19" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "2e6307f1d4f5456ce8660331f16127111b819d41c907f9cd1134180828edc4a4", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.1-aarch64.dmg", - "build_number": "242.20224.418" + "version": "2024.2.5", + "sha256": "bd89a85ccfbb019916fb4536d84a61b8013fcf67e12e13fd2855e27165a3b1d8", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.5-aarch64.dmg", + "build_number": "242.22855.90" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.2.0.1", - "sha256": "982773ca00ef81795b71137db98fce476fd554e13ef226ed86eb4d5abfc47f3c", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.0.1-aarch64.dmg", - "build_number": "242.20224.425" + "version": "2024.2.3", + "sha256": "79ac4f9fb54f7049c2bb5ab3ec78280fe4991e3aaa4cc608cb06ce980c76a05a", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.3-aarch64.dmg", + "build_number": "242.23339.18" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2024.1.8", - "sha256": "533bb27ab515989b946bd5c72d0fa36417b248a8d2ec9f16a6ca32cc98e56048", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.8-aarch64.dmg", - "build_number": "241.18968.39" + "version": "2024.2.2", + "sha256": "9f04b137505dea34f71c8d37a9598fdc2f688dd1482dec2f554a5068a857b94a", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.2-aarch64.dmg", + "build_number": "242.22855.126" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.2.0.1", - "sha256": "6d7a12184f46f3693b9f33ececeed0dde272fdd5ba8e06107869ae1731b694ff", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.0.1-aarch64.dmg", - "build_number": "242.20224.426" + "version": "2024.2.3", + "sha256": "581f60423d4d89275efe5c6744c7a72ebcda50edbac5ed9c876f7d7c18bc41a4", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.3-aarch64.dmg", + "build_number": "242.23339.15" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg", - "version": "2024.1 EAP", - "sha256": "dc1d01915ff31d14828b668b71cfc92529d389af122adca06d785f7cc3a9d784", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101-aarch64.dmg", - "build_number": "241.18775.101" + "version": "2024.2 EAP", + "sha256": "cb815cfe2fa9fd69675a31cb870ccf5037ac429a954cb950141074668f250014", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138-aarch64.dmg", + "build_number": "242.21870.138" } } } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 8188a82c2c809..0e3241a0397c1 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -39,7 +39,7 @@ let products = versions.${system} or (throw "Unsupported system: ${system}"); - package = if stdenv.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; + package = if stdenv.hostPlatform.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; mkJetBrainsProductCore = callPackage package { inherit vmopts; }; mkMeta = meta: fromSource: { inherit (meta) homepage longDescription; @@ -47,7 +47,7 @@ let maintainers = map (x: lib.maintainers."${x}") meta.maintainers; license = if meta.isOpenSource then lib.licenses.asl20 else lib.licenses.unfree; sourceProvenance = if fromSource then [ lib.sourceTypes.fromSource ] else - (if stdenv.isDarwin then [ lib.sourceTypes.binaryNativeCode ] else [ lib.sourceTypes.binaryBytecode ]); + (if stdenv.hostPlatform.isDarwin then [ lib.sourceTypes.binaryNativeCode ] else [ lib.sourceTypes.binaryBytecode ]); }; mkJetBrainsProduct = @@ -85,7 +85,7 @@ let }); buildPycharm = args: - (mkJetBrainsProduct args).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs stdenv.isLinux { + (mkJetBrainsProduct args).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs stdenv.hostPlatform.isLinux { buildInputs = with python3.pkgs; (previousAttrs.buildInputs or []) ++ [ python3 setuptools ]; preInstall = '' echo "compiling cython debug speedups" @@ -106,7 +106,7 @@ rec { clion = (mkJetBrainsProduct { pname = "clion"; - extraBuildInputs = lib.optionals (stdenv.isLinux) [ + extraBuildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ fontconfig python3 stdenv.cc.cc @@ -114,13 +114,13 @@ rec { libxcrypt-legacy lttng-ust_2_12 musl - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ expat libxml2 xz ]; }).overrideAttrs (attrs: { - postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.isLinux) '' + postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.hostPlatform.isLinux) '' ( cd $out/clion @@ -131,7 +131,7 @@ rec { ) ''; - postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.hostPlatform.isLinux) '' ( cd $out/clion @@ -175,7 +175,7 @@ rec { extraBuildInputs = [ libgcc stdenv.cc.cc ]; }).overrideAttrs (attrs: { - postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' + postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.hostPlatform.isLinux '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv @@ -186,7 +186,7 @@ rec { idea-community-src = buildIdea { pname = "idea-community"; extraBuildInputs = [ stdenv.cc.cc ]; fromSource = true; }; - idea-community = if stdenv.isDarwin || stdenv.isAarch64 then idea-community-bin else idea-community-src; + idea-community = if stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64 then idea-community-bin else idea-community-src; idea-ultimate = buildIdea { pname = "idea-ultimate"; extraBuildInputs = [ stdenv.cc.cc lldb musl ]; }; @@ -198,7 +198,7 @@ rec { pycharm-community-src = buildPycharm { pname = "pycharm-community"; fromSource = true; }; - pycharm-community = if stdenv.isDarwin then pycharm-community-bin else pycharm-community-src; + pycharm-community = if stdenv.hostPlatform.isDarwin then pycharm-community-bin else pycharm-community-src; pycharm-professional = buildPycharm { pname = "pycharm-professional"; extraBuildInputs = [ musl ]; }; @@ -211,14 +211,14 @@ rec { libxcrypt lttng-ust_2_12 musl - ]++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ]++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ expat libxml2 xz ]; }).overrideAttrs (attrs: { - postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.isLinux) '' + postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.hostPlatform.isLinux) '' ( cd $out/rider @@ -240,20 +240,20 @@ rec { rust-rover = (mkJetBrainsProduct { pname = "rust-rover"; - extraBuildInputs = lib.optionals (stdenv.isLinux) [ + extraBuildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ python3 openssl libxcrypt-legacy fontconfig xorg.libX11 libGL - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ expat libxml2 xz ]; }).overrideAttrs (attrs: { - postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.hostPlatform.isLinux) '' ( cd $out/rust-rover diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 62c1df4963621..6d13dfb586cd5 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -18,16 +18,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip" }, "name": "ideavim" }, @@ -36,7 +36,7 @@ "idea-ultimate" ], "builds": { - "242.20224.419": "https://plugins.jetbrains.com/files/631/590930/python-242.20224.419.zip" + "242.23339.11": "https://plugins.jetbrains.com/files/631/608464/python-242.23339.11.zip" }, "name": "python" }, @@ -46,7 +46,7 @@ "idea-ultimate" ], "builds": { - "242.20224.419": "https://plugins.jetbrains.com/files/1347/581524/scala-intellij-bin-2024.2.20.zip" + "242.23339.11": "https://plugins.jetbrains.com/files/1347/606389/scala-intellij-bin-2024.2.28.zip" }, "name": "scala" }, @@ -68,16 +68,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" }, "name": "string-manipulation" }, @@ -99,16 +99,16 @@ ], "builds": { "241.18034.1093": null, - "241.18968.39": null, - "242.20224.385": null, - "242.20224.413": null, - "242.20224.418": null, - "242.20224.419": null, - "242.20224.424": null, - "242.20224.425": null, - "242.20224.426": null, - "242.20224.427": null, - "242.20224.428": null + "242.21829.162": null, + "242.22855.126": null, + "242.22855.75": null, + "242.22855.90": null, + "242.23339.11": null, + "242.23339.15": null, + "242.23339.16": null, + "242.23339.18": null, + "242.23339.19": null, + "242.23339.24": null }, "name": "kotlin" }, @@ -130,16 +130,16 @@ ], "builds": { "241.18034.1093": null, - "241.18968.39": "https://plugins.jetbrains.com/files/6981/582754/ini-241.18968.32.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/6981/608006/ini-242.22855.126.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/6981/608006/ini-242.22855.126.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/6981/608006/ini-242.22855.126.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip" }, "name": "ini" }, @@ -161,16 +161,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" }, "name": "acejump" }, @@ -180,8 +180,8 @@ "phpstorm" ], "builds": { - "242.20224.419": "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip" + "242.23339.11": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" }, "name": "symfony-support" }, @@ -191,8 +191,8 @@ "phpstorm" ], "builds": { - "242.20224.419": "https://plugins.jetbrains.com/files/7320/586859/PHP_Annotations-11.0.2.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/7320/586859/PHP_Annotations-11.0.2.zip" + "242.23339.11": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip" }, "name": "php-annotations" }, @@ -205,16 +205,18 @@ "idea-ultimate", "pycharm-community", "rider", - "rust-rover" + "rust-rover", + "webstorm" ], "builds": { - "241.18968.39": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip" }, "name": "python-community-edition" }, @@ -236,16 +238,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip" }, "name": "asciidoc" }, @@ -266,15 +268,15 @@ ], "builds": { "241.18034.1093": null, - "242.20224.385": null, - "242.20224.413": null, - "242.20224.418": null, - "242.20224.419": null, - "242.20224.424": null, - "242.20224.425": null, - "242.20224.426": null, - "242.20224.427": null, - "242.20224.428": null + "242.21829.162": null, + "242.22855.75": null, + "242.22855.90": null, + "242.23339.11": null, + "242.23339.15": null, + "242.23339.16": null, + "242.23339.18": null, + "242.23339.19": null, + "242.23339.24": null }, "name": "-deprecated-rust" }, @@ -295,15 +297,15 @@ ], "builds": { "241.18034.1093": null, - "242.20224.385": null, - "242.20224.413": null, - "242.20224.418": null, - "242.20224.419": null, - "242.20224.424": null, - "242.20224.425": null, - "242.20224.426": null, - "242.20224.427": null, - "242.20224.428": null + "242.21829.162": null, + "242.22855.75": null, + "242.22855.90": null, + "242.23339.11": null, + "242.23339.15": null, + "242.23339.16": null, + "242.23339.18": null, + "242.23339.19": null, + "242.23339.24": null }, "name": "-deprecated-rust-beta" }, @@ -317,10 +319,10 @@ "ruby-mine" ], "builds": { - "242.20224.419": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip" + "242.23339.11": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip" }, "name": "ide-features-trainer" }, @@ -341,17 +343,17 @@ "webstorm" ], "builds": { - "241.18034.1093": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip" }, "name": "nixidea" }, @@ -361,8 +363,8 @@ "idea-ultimate" ], "builds": { - "242.20224.419": "https://plugins.jetbrains.com/files/9568/583036/go-plugin-242.20224.300.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/9568/583036/go-plugin-242.20224.300.zip" + "242.23339.11": "https://plugins.jetbrains.com/files/9568/608453/go-plugin-242.23339.11.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/9568/608453/go-plugin-242.23339.11.zip" }, "name": "go" }, @@ -384,16 +386,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip" }, "name": "csv-editor" }, @@ -414,17 +416,17 @@ "webstorm" ], "builds": { - "241.18034.1093": "https://plugins.jetbrains.com/files/11349/589129/aws-toolkit-jetbrains-standalone-3.23-241.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/11349/589129/aws-toolkit-jetbrains-standalone-3.23-241.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/11349/605838/aws-toolkit-jetbrains-standalone-3.29-241.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip" }, "name": "aws-toolkit" }, @@ -446,16 +448,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip" }, "name": "vscode-keymap" }, @@ -477,16 +479,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip" }, "name": "eclipse-keymap" }, @@ -508,16 +510,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip" }, "name": "visual-studio-keymap" }, @@ -539,16 +541,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip" }, "name": "protocol-buffers" }, @@ -570,16 +572,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18968.39": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.20224.385": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.20224.413": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.20224.418": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.20224.419": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.20224.424": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.20224.425": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.20224.426": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.20224.427": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.20224.428": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "242.21829.162": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.126": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.75": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.90": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.23339.11": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.23339.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.23339.16": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.23339.18": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.23339.19": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.23339.24": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -600,17 +602,17 @@ "webstorm" ], "builds": { - "241.18034.1093": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip" }, "name": "github-copilot" }, @@ -632,16 +634,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -663,16 +665,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18968.39": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.20224.385": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.20224.418": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.20224.424": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.20224.425": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.20224.426": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.20224.427": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.20224.428": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" }, "name": "mermaid" }, @@ -683,9 +685,9 @@ "rust-rover" ], "builds": { - "241.18968.39": "https://plugins.jetbrains.com/files/22407/591052/intellij-rust-241.38968.39.zip", - "242.20224.413": "https://plugins.jetbrains.com/files/22407/591053/intellij-rust-242.20224.421.zip", - "242.20224.419": "https://plugins.jetbrains.com/files/22407/591053/intellij-rust-242.20224.421.zip" + "242.22855.126": "https://plugins.jetbrains.com/files/22407/608018/intellij-rust-242.22855.126.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/22407/608018/intellij-rust-242.22855.126.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/22407/608018/intellij-rust-242.22855.126.zip" }, "name": "rust" } @@ -693,37 +695,39 @@ "files": { "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip": "sha256-QwguD4ENrL7GxmX+CGEyCPowbAPNpYgntVGAbHxOlyQ=", "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip": "sha256-CpIsmOIblkC5xMnKidbI+G+2QcZtXczu0rOSMtUcJPs=", - "https://plugins.jetbrains.com/files/11349/589129/aws-toolkit-jetbrains-standalone-3.23-241.zip": "sha256-0aom3D5qpgh4Z1wicsK8881JVt+0r/vTocm/ysxzJZs=", - "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip": "sha256-g2LhztIyWeG4u7HtOTPLeoY8B0K+LRJgFVNoSWdrAfI=", + "https://plugins.jetbrains.com/files/11349/605838/aws-toolkit-jetbrains-standalone-3.29-241.zip": "sha256-rMgAPGqgERLKmMNafg17h//WR9Z+etkawd/OdDse4eI=", + "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip": "sha256-bIj7qOW4CBCwNiBK700Zh90Ijy2I+78rwN5zhUeMwuw=", "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip": "sha256-LeQ5vi9PCJYmWNmT/sutWjSlwZaAYYuEljVJBYG2VpY=", "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip": "sha256-LpooujwYaX339yZJVe7HPYIOw+YdJLeEtRgwPxLJ9eI=", "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip": "sha256-/hEx0gIFvUXD799tRmMHAt9Z5ziFgaQs1RX0zQwTJIA=", "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip": "sha256-bAN0ifNiUqj51TYc7RLKwTMtv9OxjzqEQwXa6KtFlsU=", "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=", - "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip": "sha256-xpH8/hUkz73t3q/F5AgWaZpMi7QEBu/gyGMPC/Gkkfo=", - "https://plugins.jetbrains.com/files/1347/581524/scala-intellij-bin-2024.2.20.zip": "sha256-lBj8IKW1dC586hd/Z9happeoj2rV4x4Y/hbtrw/xCxQ=", + "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip": "sha256-aIwiMT30L3KCvbrkMUdgDdUdyBqGmT4w6c4pZEnMGNo=", + "https://plugins.jetbrains.com/files/1347/606389/scala-intellij-bin-2024.2.28.zip": "sha256-N5Hp9w/5aTYsZCRjdGCg0g1IlmRX/Lgi7Fx9OUJGz14=", "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip": "sha256-cltbHY5OOvf29otDNsF9Q2shJHDdW6UMbzDdZ6OATtI=", - "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip": "sha256-z3y3mcQRScZY4VD/9onMCvgHD/xECldBogX5VxMiR0c=", + "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip": "sha256-Y6xplTjA9bmhwLS9clcu/4znltSgDsga8Na5BmOWX5E=", + "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip": "sha256-gI3sY4jDXsY6pUhzqejJnvGJwLj6bNMs45UR8ekrZcs=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=", - "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip": "sha256-QNVo6sLKwj+jJ2PMcJ3P5cAr1LwhFpH2+uglWO9ncQE=", + "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip": "sha256-2jcTuQruuUJUKEnomzl4DmqYZelk8Gygh8NT0PRwuOw=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=", "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip": "sha256-OqeQCqFe8iW/8NPg+9i+UKh+twIPQ9uLZrItMukCi7k=", - "https://plugins.jetbrains.com/files/22407/591052/intellij-rust-241.38968.39.zip": "sha256-Pgtj1czuScTmog7oh/2aME9jv4KlhT/ep6hwjSB73Ak=", - "https://plugins.jetbrains.com/files/22407/591053/intellij-rust-242.20224.421.zip": "sha256-Ux89pA9Gi9iVC3AWfVunW3vrzRbFc1Oyk9plFgo9ync=", - "https://plugins.jetbrains.com/files/631/590930/python-242.20224.419.zip": "sha256-zZIHP2qhUy6uG506H05/zBGHEdQhS+dVRRvtmoPjgnQ=", - "https://plugins.jetbrains.com/files/6981/582754/ini-241.18968.32.zip": "sha256-GrWML6iPJ9Vp20T5ftNaPqAzhrqsDiV7zkWQDevSXFY=", - "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip": "sha256-jE51Cj9R2DcKm0aT2O8Kbq8MEDHlfr60D5vJdfXt+Cc=", + "https://plugins.jetbrains.com/files/22407/608018/intellij-rust-242.22855.126.zip": "sha256-mIiNKoSmkHxoKdHiDPN19wH8ejhRS2F0Cb63E7PDXP0=", + "https://plugins.jetbrains.com/files/631/608464/python-242.23339.11.zip": "sha256-qXKW4C5/XMw1MgZxUZt2RlmycNN4zRcKMsTbkKS/lTU=", + "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip": "sha256-J6v5zHD7n1uqp3p2TptZpkPbGtkdFZdNCA+Xw4aHKDE=", + "https://plugins.jetbrains.com/files/6981/608006/ini-242.22855.126.zip": "sha256-TtBD4NuLhPbhod56wYtg4jY1yNSK+mTp6mEhDgtidBU=", + "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip": "sha256-WucgAKBoKxnZvRfN2g8in8LjOOKAtECEN0sGcz28j4c=", "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", - "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip": "sha256-2E3Hk8JdhZH+JFHF725Z9vGncx6HSKgd+LYlCpmh1KY=", - "https://plugins.jetbrains.com/files/7320/586859/PHP_Annotations-11.0.2.zip": "sha256-zQ/nEESHNiNyXwKyohy8ENWVkRavDVJpqmHvkzD3VjE=", - "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip": "sha256-e+MewymlNWzbut8eADe8jwqco921ULe83eLEGpDf1GY=", - "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip": "sha256-bkjB/o5gnDAuyuGxtMQsr1lH9fohwVbDV27gRj1rCr0=", + "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip": "sha256-drNmhJMe+kuY2fcHjY+SQmkACvFk0rVI4vAhyZ/bgLc=", + "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip": "sha256-kRqgAW0bYEWLTCC6q2hhPmDwnOx3kiuqPhriZWizxTw=", + "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip": "sha256-DwQNhbNO1zk75lcf35spNnzo0u103UAhXignhO+grek=", + "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip": "sha256-As1MgvssBg+45DLRtNbirT5HyXPcabzt3ulKYBIiWj8=", + "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip": "sha256-tWsshZfm5czxBtF4ZfPHzi843Oztx2i0JEHcpnlLcSo=", "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=", "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip": "sha256-AGP8YY6NG/hy7xIDoiJy3GZHRB9stVNYYoHtqOmYCx0=", - "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip": "sha256-5gYFQjYWFro/nDxCn8q51GkLLv3JkJDS7jr70xhM0Q0=", - "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip": "sha256-j5/LgTrFJ4OEIlocX4jcjgYzHlBId1nh1NfE2qLc1HQ=", - "https://plugins.jetbrains.com/files/9568/583036/go-plugin-242.20224.300.zip": "sha256-cbbAfatj1KkByLrLKZVNoIZSLjaSregK+0eany4pYWY=" + "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip": "sha256-pL+j0K6U0DZibnmcIE6kY9Kj/+5g8akuHeuppuZiEII=", + "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip": "sha256-9GMqs/hSavcw1E4ZJTLDH1lx3HEeQ5NR8BT+Q9pN3io=", + "https://plugins.jetbrains.com/files/9568/608453/go-plugin-242.23339.11.zip": "sha256-eEZw5q0+IHlf1Re3M6RwZOF7AXMn99a7n4nF54x5yew=" } } diff --git a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix index dcd6554c791d4..574938eef0d32 100644 --- a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix +++ b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix @@ -27,7 +27,7 @@ buildInputs = [ delve ]; buildPhase = let - arch = (if stdenv.isLinux then "linux" else "mac") + (if stdenv.isAarch64 then "arm" else ""); + arch = (if stdenv.hostPlatform.isLinux then "linux" else "mac") + (if stdenv.hostPlatform.isAarch64 then "arm" else ""); in '' runHook preBuild ln -sf ${delve}/bin/dlv lib/dlv/${arch}/dlv diff --git a/pkgs/applications/editors/jove/default.nix b/pkgs/applications/editors/jove/default.nix deleted file mode 100644 index 82c3f9056d351..0000000000000 --- a/pkgs/applications/editors/jove/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, groff -, makeWrapper -, ncurses -, runtimeShell -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "jove"; - version = "4.17.5.3"; - - src = fetchFromGitHub { - owner = "jonmacs"; - repo = "jove"; - rev = finalAttrs.version; - hash = "sha256-ZBq2zCml637p9VgedpOrUn2jSc5L0pthdgRS7YsB3zs="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ - groff - ncurses - ]; - - postPatch = '' - patchShebangs testbuild.sh testmailer.sh teachjove jmake.sh - ''; - - dontConfigure = true; - - preBuild = '' - makeFlagsArray+=(SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \ - JTMPDIR=$TMPDIR - TERMCAPLIB=-lncurses \ - SHELL=${runtimeShell} \ - DFLTSHELL=${runtimeShell} \ - JOVEHOME=${placeholder "out"}) - ''; - - postInstall = '' - wrapProgram $out/bin/teachjove \ - --prefix PATH ":" "$out/bin" - ''; - - meta = { - homepage = "https://github.com/jonmacs/jove"; - description = "Jonathan's Own Version of Emacs"; - changelog = "https://github.com/jonmacs/jove/releases/tag/${finalAttrs.version}"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix; - # never built on Hydra: https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin - broken = stdenv.isDarwin; - }; -}) diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix index 943a7e49e9cdc..4158fc3dff0a2 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix @@ -1,11 +1,6 @@ { callPackage -, clangStdenv , cling , fetchurl -, lib -, llvmPackages_13 -, makeWrapper -, runCommand , stdenv }: diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix index ec1def8469773..b944569ff4a7b 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix @@ -68,9 +68,7 @@ clangStdenv.mkDerivation rec { zlib ]; - cmakeFlags = lib.optionals debug [ - "-DCMAKE_BUILD_TYPE=Debug" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; postPatch = '' substituteInPlace src/xmagics/executable.cpp \ diff --git a/pkgs/applications/editors/jupyter/default.nix b/pkgs/applications/editors/jupyter/default.nix index 57122d173a441..08c33982364da 100644 --- a/pkgs/applications/editors/jupyter/default.nix +++ b/pkgs/applications/editors/jupyter/default.nix @@ -9,7 +9,7 @@ let jupyterPath = (jupyter-kernel.create { inherit definitions; }); jupyter-notebook = (python3.buildEnv.override { extraLibs = [ python3.pkgs.notebook ]; - makeWrapperArgs = ["--set JUPYTER_PATH ${jupyterPath}"]; + makeWrapperArgs = ["--prefix JUPYTER_PATH : ${jupyterPath}"]; }).overrideAttrs(oldAttrs: { meta = oldAttrs.meta // { mainProgram = "jupyter-notebook"; }; }); diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix deleted file mode 100644 index bcf20e4af55de..0000000000000 --- a/pkgs/applications/editors/l3afpad/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, intltool, pkg-config, gtk3, fetchFromGitHub -, autoreconfHook, wrapGAppsHook3 }: - -stdenv.mkDerivation rec { - version = "unstable-2022-02-14"; - pname = "l3afpad"; - - src = fetchFromGitHub { - owner = "stevenhoneyman"; - repo = pname; - rev = "16f22222116b78b7f6a6fd83289937cdaabed624"; - sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 intltool ]; - buildInputs = [ gtk3 ]; - - meta = with lib; { - description = "Simple text editor forked from Leafpad using GTK+ 3.x"; - homepage = "https://github.com/stevenhoneyman/l3afpad"; - platforms = platforms.linux; - maintainers = [ ]; - license = licenses.gpl2; - mainProgram = "l3afpad"; - }; -} diff --git a/pkgs/applications/editors/lapce/Cargo.lock b/pkgs/applications/editors/lapce/Cargo.lock index 8627ad1830225..512e479805832 100644 --- a/pkgs/applications/editors/lapce/Cargo.lock +++ b/pkgs/applications/editors/lapce/Cargo.lock @@ -1684,7 +1684,7 @@ checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" [[package]] name = "floem" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=54f0d1bcf0e1a91d82492ee7300a526adb60eb5c#54f0d1bcf0e1a91d82492ee7300a526adb60eb5c" +source = "git+https://github.com/lapce/floem?rev=157631a49d6ba13a3467dcb994eb46a98c52eb76#157631a49d6ba13a3467dcb994eb46a98c52eb76" dependencies = [ "bitflags 2.6.0", "copypasta", @@ -1702,7 +1702,6 @@ dependencies = [ "image", "indexmap", "lapce-xi-rope", - "once_cell", "parking_lot", "peniko", "raw-window-handle 0.6.0", @@ -1722,13 +1721,12 @@ dependencies = [ [[package]] name = "floem-editor-core" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=54f0d1bcf0e1a91d82492ee7300a526adb60eb5c#54f0d1bcf0e1a91d82492ee7300a526adb60eb5c" +source = "git+https://github.com/lapce/floem?rev=157631a49d6ba13a3467dcb994eb46a98c52eb76#157631a49d6ba13a3467dcb994eb46a98c52eb76" dependencies = [ "bitflags 2.6.0", "itertools 0.12.1", "lapce-xi-rope", "memchr", - "once_cell", "serde", "strum", "strum_macros", @@ -1800,7 +1798,7 @@ dependencies = [ [[package]] name = "floem_reactive" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=54f0d1bcf0e1a91d82492ee7300a526adb60eb5c#54f0d1bcf0e1a91d82492ee7300a526adb60eb5c" +source = "git+https://github.com/lapce/floem?rev=157631a49d6ba13a3467dcb994eb46a98c52eb76#157631a49d6ba13a3467dcb994eb46a98c52eb76" dependencies = [ "smallvec", ] @@ -1808,7 +1806,7 @@ dependencies = [ [[package]] name = "floem_renderer" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=54f0d1bcf0e1a91d82492ee7300a526adb60eb5c#54f0d1bcf0e1a91d82492ee7300a526adb60eb5c" +source = "git+https://github.com/lapce/floem?rev=157631a49d6ba13a3467dcb994eb46a98c52eb76#157631a49d6ba13a3467dcb994eb46a98c52eb76" dependencies = [ "cosmic-text", "image", @@ -1821,7 +1819,7 @@ dependencies = [ [[package]] name = "floem_tiny_skia_renderer" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=54f0d1bcf0e1a91d82492ee7300a526adb60eb5c#54f0d1bcf0e1a91d82492ee7300a526adb60eb5c" +source = "git+https://github.com/lapce/floem?rev=157631a49d6ba13a3467dcb994eb46a98c52eb76#157631a49d6ba13a3467dcb994eb46a98c52eb76" dependencies = [ "anyhow", "bytemuck", @@ -1838,7 +1836,7 @@ dependencies = [ [[package]] name = "floem_vger_renderer" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=54f0d1bcf0e1a91d82492ee7300a526adb60eb5c#54f0d1bcf0e1a91d82492ee7300a526adb60eb5c" +source = "git+https://github.com/lapce/floem?rev=157631a49d6ba13a3467dcb994eb46a98c52eb76#157631a49d6ba13a3467dcb994eb46a98c52eb76" dependencies = [ "anyhow", "floem-vger", @@ -2906,7 +2904,7 @@ dependencies = [ [[package]] name = "lapce" -version = "0.4.1" +version = "0.4.2" dependencies = [ "lapce-app", "lapce-proxy", @@ -2914,7 +2912,7 @@ dependencies = [ [[package]] name = "lapce-app" -version = "0.4.1" +version = "0.4.2" dependencies = [ "Inflector", "alacritty_terminal", @@ -2978,7 +2976,7 @@ dependencies = [ [[package]] name = "lapce-core" -version = "0.4.1" +version = "0.4.2" dependencies = [ "ahash", "anyhow", @@ -3006,7 +3004,7 @@ dependencies = [ [[package]] name = "lapce-proxy" -version = "0.4.1" +version = "0.4.2" dependencies = [ "alacritty_terminal", "anyhow", @@ -3055,7 +3053,7 @@ dependencies = [ [[package]] name = "lapce-rpc" -version = "0.4.1" +version = "0.4.2" dependencies = [ "anyhow", "crossbeam-channel", diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index 2a80d416195e1..68ff13a0212a1 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -25,7 +25,7 @@ , xorg }: let - rpathLibs = lib.optionals stdenv.isLinux [ + rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [ libGL libxkbcommon xorg.libX11 @@ -39,20 +39,20 @@ let in rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "lapce"; repo = "lapce"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Bwo6twEi9m3T5OybWkWGAyTRumusCWW7mkx/OAJkfXs="; + sha256 = "sha256-vBBYNHgZiW5JfGeUG6YZObf4oK0hHxTbsZNTfnIX95Y="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI="; - "floem-0.1.1" = "sha256-zV2nk3cvmw8lzqL4Xx5SCTX156tiN6sUAEdfy0dJvDY="; + "floem-0.1.1" = "sha256-/4Y38VXx7wFVVEzjqZ2D6+jiXCXPfzK44rDiNOR1lAk="; "human-sort-0.2.2" = "sha256-tebgIJGXOY7pwWRukboKAzXY47l4Cn//0xMKQTaGu8w="; "locale_config-0.3.1-alpha.0" = "sha256-cCEO+dmU05TKkpH6wVK6tiH94b7k2686xyGxlhkcmAM="; "lsp-types-0.95.1" = "sha256-+tWqDBM5x/gvQOG7V3m2tFBZB7smgnnZHikf9ja2FfE="; @@ -89,9 +89,9 @@ rustPlatform.buildRustPackage rec { glib gtk3 openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fontconfig - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Security CoreServices @@ -100,7 +100,7 @@ rustPlatform.buildRustPackage rec { AppKit ]; - postInstall = if stdenv.isLinux then '' + postInstall = if stdenv.hostPlatform.isLinux then '' install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop @@ -125,6 +125,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ elliot ]; mainProgram = "lapce"; # Undefined symbols for architecture x86_64: "_NSPasteboardTypeFileURL" - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix index 02e225a5ffe04..5d4031b064ecc 100644 --- a/pkgs/applications/editors/libresprite/default.nix +++ b/pkgs/applications/editors/libresprite/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2_image lua # no v8 due to missing libplatform and libbase - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_WEBP_SUPPORT=ON" ]; - hardeningDisable = lib.optional stdenv.isDarwin "format"; + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "format"; # Install mime icons. Note that the mimetype is still "x-aseprite" postInstall = '' @@ -116,6 +116,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # https://github.com/LibreSprite/LibreSprite/issues/308 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 55fce51ac9f7c..ac13fc3bf5665 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { lua5_4 pcre2 SDL2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index c54cd01dbf281..121d62219db03 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mg"; - version = "7.3"; + version = "7.3-unstable-2024-06-04"; src = fetchFromGitHub { owner = "ibara"; repo = "mg"; - rev = "mg-${version}"; - sha256 = "sha256-88FrXN7h5uRLY8YMKSzUjBF4n18DEiiiDyoYr+7qXdQ="; + rev = "4d4abcfc793554dbd4effdba8a3cc28ce2654c33"; + hash = "sha256-+sp8Edu5UWv73TCNVZTeH5rl2Q5XarYrlTYHuQsroVs="; }; postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index bd8a4b0c648e6..db4d65de7959e 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "CONFIG+=mfwebengine" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir "$out"/Applications mv app/mindforger.app "$out"/Applications/ ''; diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/applications/editors/molsketch/default.nix index abbedff17c16f..dd3ee9bcdbb1c 100644 --- a/pkgs/applications/editors/molsketch/default.nix +++ b/pkgs/applications/editors/molsketch/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { --replace "CXX_STANDARD 14" "CXX_STANDARD 17" ''; - preConfigure = '' - cmakeFlags="$cmakeFlags -DMSK_PREFIX=$out" - ''; + cmakeFlags = [ + "-DMSK_PREFIX=${placeholder "out"}" + ]; postFixup = '' ln -s $out/lib/molsketch/* $out/lib/. diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index e2defc9f83254..432d297aea5e8 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "8.1"; + version = "8.2"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - hash = "sha256-k7Pj6RVa44n+nM+ct6s4DqwpYCg1ujB3si9k0PDL6Ms="; + hash = "sha256-1a0H3YYvrK4DBRxUxlNeVMftdAcxh4P8rRrS1wdv/+s="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 374c5ee28c84a..d329220409c3e 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ motif libXpm libXt ]; # the linux config works fine on darwin too! - buildFlags = lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux"; + buildFlags = lib.optional (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) "linux"; env.NIX_CFLAGS_COMPILE = "-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; diff --git a/pkgs/applications/editors/neovim/build-neovim-plugin.nix b/pkgs/applications/editors/neovim/build-neovim-plugin.nix index 9d9778c1fe3b5..6f9bda5b108bd 100644 --- a/pkgs/applications/editors/neovim/build-neovim-plugin.nix +++ b/pkgs/applications/editors/neovim/build-neovim-plugin.nix @@ -11,13 +11,15 @@ in # function to create vim plugin from lua packages that are already packaged in # luaPackages { - # the lua attribute name that matches this vim plugin. Both should be equal - # in the majority of cases but we make it possible to have different attribute names - luaAttr ? (normalizeName attrs.pname) + # the lua derivation to convert into a neovim plugin + luaAttr ? (lua.pkgs.${normalizeName attrs.pname}) , ... }@attrs: let - originalLuaDrv = lua.pkgs.${luaAttr}; + originalLuaDrv = if (lib.typeOf luaAttr == "string") then + lib.warn "luaAttr as string is deprecated since September 2024. Pass a lua derivation directly ( e.g., `buildNeovimPlugin { luaAttr = lua.pkgs.plenary-nvim; }`)" lua.pkgs.${normalizeName luaAttr} + else luaAttr; + luaDrv = originalLuaDrv.overrideAttrs (oa: { version = attrs.version or oa.version; diff --git a/pkgs/applications/editors/neovim/gnvim/wrapper.nix b/pkgs/applications/editors/neovim/gnvim/wrapper.nix index 1cf02746f9ae8..7869885d1b749 100644 --- a/pkgs/applications/editors/neovim/gnvim/wrapper.nix +++ b/pkgs/applications/editors/neovim/gnvim/wrapper.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { makeWrapper '${gnvim-unwrapped}/bin/gnvim' "$out/bin/gnvim" \ --prefix PATH : "${neovim}/bin" \ --set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/share" ln -s '${gnvim-unwrapped}/share/icons' "$out/share/icons" diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 9152d93c15444..14d682e14e431 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -1,4 +1,13 @@ -# run tests by building `neovim.tests` +/* +run tests with `nix-build -A neovim.tests` + +The attrset exposes both the wrapped neovim and the associated test for easier debugging + +Here are some common neovim flags used in the tests: +-e runs neovim in `:h Ex-mode` which returns an exit code != 0 when hitting an error +-i NONE gets rid of shada warnings + +*/ { vimUtils, writeText, neovim, vimPlugins , neovimUtils, wrapNeovimUnstable , neovim-unwrapped @@ -43,7 +52,7 @@ let ''; }; - nvim-with-luasnip = wrapNeovim2 "-with-lua-packages" (makeNeovimConfig { + nvim-with-luasnip = wrapNeovim2 "-with-luasnip" (makeNeovimConfig { plugins = [ { plugin = vimPlugins.luasnip; @@ -65,15 +74,6 @@ let sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc"; }; - # this plugin checks that it's ftplugin/vim.tex is loaded before $VIMRUNTIME/ftplugin/vim.tex - # $VIMRUNTIME/ftplugin/vim.tex sources $VIMRUNTIME/ftplugin/initex.vim which sets b:did_ftplugin - # we save b:did_ftplugin's value in a `plugin_was_loaded_too_late` file - texFtplugin = (pkgs.runCommandLocal "tex-ftplugin" {} '' - mkdir -p $out/ftplugin - echo 'call system("echo ". exists("b:did_ftplugin") . " > plugin_was_loaded_too_late")' >> $out/ftplugin/tex.vim - echo ':q!' >> $out/ftplugin/tex.vim - '') // { pname = "test-ftplugin"; }; - # neovim-drv must be a wrapped neovim runTest = neovim-drv: buildCommand: runCommandLocal "test-${neovim-drv.name}" ({ @@ -81,18 +81,21 @@ let meta.platforms = neovim-drv.meta.platforms; }) ('' source ${nmt}/bash-lib/assertions.sh - vimrc="${writeText "init.vim" neovim-drv.initRc}" - luarc="${writeText "init.lua" neovim-drv.luaRcContent}" + vimrc="${writeText "test-${neovim-drv.name}-init.vim" neovim-drv.initRc}" + luarc="${writeText "test-${neovim-drv.name}-init.lua" neovim-drv.luaRcContent}" luarcGeneric="$out/patched.lua" vimrcGeneric="$out/patched.vim" mkdir $out + export HOME=$TMPDIR ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric" ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$luarc" > "$luarcGeneric" '' + buildCommand); in - pkgs.recurseIntoAttrs ( -rec { + pkgs.recurseIntoAttrs (rec { + + inherit nmt; + vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; ### neovim tests @@ -138,11 +141,21 @@ rec { }; run_nvim_with_plug = runTest nvim_with_plug '' - export HOME=$TMPDIR - ${nvim_with_plug}/bin/nvim -i NONE -c 'color base16-tomorrow-night' +quit! -e + ${nvim_with_plug}/bin/nvim -V3log.txt -i NONE -c 'color base16-tomorrow-night' +quit! -e ''; - nvim_with_ftplugin = neovim.override { + nvim_with_ftplugin = let + # this plugin checks that it's ftplugin/vim.tex is loaded before $VIMRUNTIME/ftplugin/vim.tex + # $VIMRUNTIME/ftplugin/vim.tex sources $VIMRUNTIME/ftplugin/initex.vim which sets b:did_ftplugin + # we save b:did_ftplugin's value in a `plugin_was_loaded_too_late` file + texFtplugin = (pkgs.runCommandLocal "tex-ftplugin" {} '' + mkdir -p $out/ftplugin + echo 'call system("echo ". exists("b:did_ftplugin") . " > plugin_was_loaded_too_late")' >> $out/ftplugin/tex.vim + echo ':q!' >> $out/ftplugin/tex.vim + '') // { pname = "test-ftplugin"; }; + in + + neovim.override { extraName = "-with-ftplugin"; configure.packages.plugins = { start = [ @@ -154,13 +167,14 @@ rec { # regression test that ftplugin files from plugins are loaded before the ftplugin # files from $VIMRUNTIME run_nvim_with_ftplugin = runTest nvim_with_ftplugin '' - export HOME=$TMPDIR echo '\documentclass{article}' > main.tex - ${nvim_with_ftplugin}/bin/nvim main.tex -c "set ft?" -c quit + ${nvim_with_ftplugin}/bin/nvim -i NONE -V3log.txt main.tex -c "set ft?" -c quit ls -l $TMPDIR - # if the file exists, then our plugin has been loaded instead of neovim's - [ ! -f plugin_was_loaded_too_late ] + # check the saved value b:did_ftplugin then our plugin has been loaded instead of neovim's + result="$(cat plugin_was_loaded_too_late)" + echo $result + [ "$result" = 0 ] ''; @@ -191,8 +205,8 @@ rec { ]; }; }; + checkHelpLuaPackages = runTest nvim_with_gitsigns_plugin '' - export HOME=$TMPDIR ${nvim_with_gitsigns_plugin}/bin/nvim -i NONE -c 'help gitsigns' +quitall! -e ''; @@ -220,8 +234,8 @@ rec { checkAliases = runTest nvim_with_aliases '' folder=${nvim_with_aliases}/bin - assertFileExists "$folder/vi" - assertFileExists "$folder/vim" + assertFileIsExecutable "$folder/vi" + assertFileIsExecutable "$folder/vim" ''; # having no RC generated should autodisable init.vim wrapping @@ -247,8 +261,7 @@ rec { }); nvim_with_lua_packages = runTest nvimWithLuaPackages '' - export HOME=$TMPDIR - ${nvimWithLuaPackages}/bin/nvim -i NONE --noplugin -es + ${nvimWithLuaPackages}/bin/nvim -V3log.txt -i NONE --noplugin +quitall! -e ''; # nixpkgs should install optional packages in the opt folder @@ -286,7 +299,6 @@ rec { }; run_nvim_with_opt_plugin = runTest nvim_with_opt_plugin '' - export HOME=$TMPDIR ${nvim_with_opt_plugin}/bin/nvim -i NONE +quit! -e ''; @@ -296,9 +308,8 @@ rec { # for instance luasnip has a dependency on jsregexp can_require_transitive_deps = runTest nvim-with-luasnip '' - export HOME=$TMPDIR cat ${nvim-with-luasnip}/bin/nvim - ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e + ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e +quitall! ''; }) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 02d6ad85b3677..8bcd1b5ebbd66 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -2,10 +2,8 @@ , writeText , nodePackages , python3 -, python3Packages , callPackage , neovimUtils -, vimUtils , perl , lndir }: @@ -107,7 +105,7 @@ let luaRcContent = rcContent; # Remove the symlinks created by symlinkJoin which we need to perform # extra actions upon - postBuild = lib.optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.hostPlatform.isLinux '' rm $out/share/applications/nvim.desktop substitute ${neovim-unwrapped}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace-warn 'Name=Neovim' 'Name=Neovim wrapper' diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index 45004d470281c..2a20691351d10 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { --replace '$$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm' "" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mv $out/bin $out/Applications rm -fr $out/share ''; @@ -38,7 +38,7 @@ mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.sebtm ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "NotepadNext"; }; } diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index 2001ba2497d17..c5ef872bffff1 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "Berkeley Vi Editor"; license = licenses.free; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/nvi.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/nvi.x86_64-darwin }; } diff --git a/pkgs/applications/editors/ox/default.nix b/pkgs/applications/editors/ox/default.nix index dd213f8460737..c752c62f120a0 100644 --- a/pkgs/applications/editors/ox/default.nix +++ b/pkgs/applications/editors/ox/default.nix @@ -1,17 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "ox"; - version = "0.3.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "curlpipe"; repo = pname; rev = version; - hash = "sha256-g5M/d6pts4Y17CpWJAsWFL5KCq1YFaACJq6n6BQw7mo="; + hash = "sha256-37o8Ak+8LPeGny7JBLc2STpRjfWBCwOrRyP3HJbD25o="; }; - cargoHash = "sha256-6+W/guijsb9+ip1cvke8JLVa4h1nU2zQJCrLv64vsa0="; + cargoHash = "sha256-c7XhMYfhMCxyidZJemnu5f9KwQmPmbun6mrI3v2EpZ4="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; meta = with lib; { description = "Independent Rust text editor that runs in your terminal"; diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix deleted file mode 100644 index 6bd5786089ab2..0000000000000 --- a/pkgs/applications/editors/poke/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib -, stdenv -, fetchurl -, help2man -, pkg-config -, texinfo -, boehmgc -, readline -, nbdSupport ? !stdenv.isDarwin, libnbd -, textStylingSupport ? true, gettext -, dejagnu - - # update script only -, writeScript -}: - -let - isCross = stdenv.hostPlatform != stdenv.buildPlatform; -in -stdenv.mkDerivation (finalAttrs: { - pname = "poke"; - version = "4.2"; - - src = fetchurl { - url = "mirror://gnu/poke/poke-${finalAttrs.version}.tar.gz"; - hash = "sha256-iq825h42elMUDqQOJVnp7FEud5xCvuNOesJLNLoRm94="; - }; - - outputs = [ "out" "dev" "info" "lib" ] - # help2man can't cross compile because it runs `poke --help` to - # generate the man page - ++ lib.optional (!isCross) "man"; - - postPatch = '' - patchShebangs . - ''; - - strictDeps = true; - - nativeBuildInputs = [ - pkg-config - texinfo - ] ++ lib.optionals (!isCross) [ - help2man - ]; - - buildInputs = [ boehmgc readline ] - ++ lib.optional nbdSupport libnbd - ++ lib.optional textStylingSupport gettext - ++ lib.optional finalAttrs.finalPackage.doCheck dejagnu; - - configureFlags = [ - # libpoke depends on $datadir/poke, so we specify the datadir in - # $lib, and later move anything else it doesn't depend on to $out - "--datadir=${placeholder "lib"}/share" - ]; - - enableParallelBuilding = true; - - doCheck = true; - nativeCheckInputs = [ dejagnu ]; - - postInstall = '' - moveToOutput share/emacs "$out" - moveToOutput share/vim "$out" - ''; - - passthru = { - updateScript = writeScript "update-poke" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl pcre common-updater-scripts - - set -eu -o pipefail - - # Expect the text in format of '<a href="...">poke 2.0</a>' - new_version="$(curl -s https://www.jemarch.net/poke | - pcregrep -o1 '>poke ([0-9.]+)</a>')" - update-source-version poke "$new_version" - ''; - }; - - meta = { - description = "Interactive, extensible editor for binary data"; - homepage = "http://www.jemarch.net/poke"; - changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${finalAttrs.version}"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres kira-bruneau ]; - platforms = lib.platforms.unix; - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -}) diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index b50d505e2dbb8..a5d39818639eb 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -1,5 +1,5 @@ { lib, buildFHSEnv, callPackage, makeDesktopItem, runtimeShell -, runCommand, unstick, quartus-prime-lite +, runCommand, unstick, quartus-prime-lite, libfaketime, pkgsi686Linux , withQuesta ? true , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] , unwrapped ? callPackage ./quartus.nix { inherit unstick supportedDevices withQuesta; } @@ -85,15 +85,28 @@ in buildFHSEnv rec { progs_wrapped=() for prog in ''${progs_to_wrap[@]}; do relname="''${prog#"${unwrapped}/"}" + bname="$(basename "$relname")" wrapped="$out/$relname" progs_wrapped+=("$wrapped") mkdir -p "$(dirname "$wrapped")" echo "#!${runtimeShell}" >> "$wrapped" + NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=1 case "$relname" in questa_fse/*) echo "export NIXPKGS_IS_QUESTA_WRAPPER=1" >> "$wrapped" + # Any use of LD_PRELOAD breaks Questa, so disable the + # SOURCE_DATE_EPOCH code path. + NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=0 ;; esac + # SOURCE_DATE_EPOCH blocklist for programs that are known to hang/break + # with fixed/static clock. + case "$bname" in + jtagd|quartus_pgm|quartus) + NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=0 + ;; + esac + echo "export NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=$NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK" >> "$wrapped" echo "exec $wrapper $prog \"\$@\"" >> "$wrapped" done @@ -116,6 +129,17 @@ in buildFHSEnv rec { if [ "$NIXPKGS_IS_QUESTA_WRAPPER" != 1 ]; then export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0 fi + + # Implement the SOURCE_DATE_EPOCH specification for reproducible builds + # (https://reproducible-builds.org/specs/source-date-epoch). + # Require opt-in with NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD=1 for now, in case + # the blocklist is incomplete. + if [ -n "$SOURCE_DATE_EPOCH" ] && [ "$NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD" = 1 ] && [ "$NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK" = 1 ]; then + export LD_LIBRARY_PATH="${lib.makeLibraryPath [ libfaketime pkgsi686Linux.libfaketime ]}''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + export LD_PRELOAD=libfaketime.so.1''${LD_PRELOAD:+:$LD_PRELOAD} + export FAKETIME_FMT="%s" + export FAKETIME="$SOURCE_DATE_EPOCH" + fi '' + extraProfile; # Run the wrappers directly, instead of going via bash. @@ -126,6 +150,7 @@ in buildFHSEnv rec { tests = { buildSof = runCommand "quartus-prime-lite-test-build-sof" { nativeBuildInputs = [ quartus-prime-lite ]; + env.NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD = "1"; } '' cat >mydesign.vhd <<EOF @@ -153,12 +178,15 @@ in buildFHSEnv rec { exit 1 fi - touch "$out" + sha1sum mydesign.sof > "$out" ''; - questaEncryptedModel = runCommand "quartus-prime-lite-test-questa-encrypted-model" {} '' - "${quartus-prime-lite}/bin/vlog" "${quartus-prime-lite.unwrapped}/questa_fse/intel/verilog/src/arriav_atoms_ncrypt.v" - touch "$out" - ''; + questaEncryptedModel = runCommand "quartus-prime-lite-test-questa-encrypted-model" + { env.NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD = "1"; + } + '' + "${quartus-prime-lite}/bin/vlog" "${quartus-prime-lite.unwrapped}/questa_fse/intel/verilog/src/arriav_atoms_ncrypt.v" + touch "$out" + ''; }; }; diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index 1991b2a7bc77c..946a56917d630 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Simple XML editor based on qt libraries"; homepage = "https://sourceforge.net/projects/qxmledit"; license = licenses.lgpl2; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 8cf715c51f2e1..2fb1ca4d1333e 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.33"; + version = "2.34"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-K4uEZZZXU2mZ61t6Ak5mpiCsm/mcNhm+xJSzfJPiuwo="; + sha256 = "sha256-2Z9zYfMAJPcKN5eakooIv4lQ140yjgQuUVlaWcsEu28="; }; # We have not packaged tests. diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 55e737a780395..f6f1bf2b28b1f 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -30,19 +30,19 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config which zip ] - ++ lib.optionals stdenv.isDarwin [ libicns ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; buildInputs = [ botan3 capstone jansson libunistring wxGTK32 ] ++ (with lua53Packages; [ lua busted ]) ++ (with perlPackages; [ perl TemplateToolkit ]) - ++ lib.optionals stdenv.isLinux [ gtk3 ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit ]; makeFlags = [ "prefix=${placeholder "out"}" "BOTAN_PKG=botan-3" "CXXSTD=-std=c++20" - ] ++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-f Makefile.osx" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 4d606904e2f68..55998bcbe3c99 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -212,7 +212,7 @@ in ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); inherit description; homepage = "https://www.rstudio.com/"; license = lib.licenses.agpl3Only; diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 6c9a43779f763..a57fc8d7de906 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { echo ${libPath} patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $out/sublime/sublime_text mkdir -p $out/share/icons diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index ad89c80fc8e43..7eff7d9bf4df7 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -65,7 +65,7 @@ let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done @@ -92,7 +92,7 @@ let postFixup = '' wrapProgram $out/sublime_bash \ - --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1" + --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1" wrapProgram $out/${primaryBinary} \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ @@ -101,7 +101,7 @@ let "''${gappsWrapperArgs[@]}" # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation (rec { diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 730f9c10b8f52..b594633ea3cb1 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -88,7 +88,7 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index 9bfbbd1c1d695..50588587f5996 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -5,15 +5,15 @@ let in { sublime4 = common { - buildVersion = "4169"; - x64sha256 = "jk9wKC0QgfhiHDYUcnDhsmgJsBPOUmCkyvQeI54IJJ4="; - aarch64sha256 = "/W/xGbE+8gGu1zNh6lERZrfG9Dh9QUGkYiqTzp216JI="; + buildVersion = "4180"; + x64sha256 = "pl42AR4zWF3vx3wPSZkfIP7Oksune5nsbmciyJUv8D4="; + aarch64sha256 = "zRg2jfhi+g6iLrMF1TGAYT+QQKSNI1W4Yv1bz9oEXHg="; } { }; sublime4-dev = common { - buildVersion = "4175"; + buildVersion = "4178"; dev = true; - x64sha256 = "xncyxAaFJLLMko/iF6fhnpkOEHzD3nzWWGQCRK9srq4="; - aarch64sha256 = "oqz1HASwmv0B1T3ZQBdIOZD9wYcHbni8tovW7jGp3KM="; + x64sha256 = "2eTdb5MzXK3QbAEzl1yxURj4m/PqGHPVnHZV2WzD6Jc="; + aarch64sha256 = "NLLOB4WnujMx3+wf6Evi+yBWM6463EZoNL2wEdJA8BA="; } { }; } diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index cf19ea5a8cca1..92d162cdc3003 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -21,7 +21,7 @@ let pname = "texmacs"; - version = "2.1.2"; + version = "2.1.4"; common = callPackage ./common.nix { inherit extraFonts chineseFonts japaneseFonts koreanFonts; tex = texliveSmall; @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - hash = "sha256-Ds9gxOwMYSttEWrawgxLHGxHyMBvt8WmyPIwBP2g/CM="; + hash = "sha256-h6aSLuDdrAtVzOnNVPqMEWX9WLDHtkCjPy9JXWnBgYY="; }; postPatch = common.postPatch + '' @@ -58,18 +58,18 @@ stdenv.mkDerivation { sqlite git python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeFeature "TEXMACS_GUI" "Qt") (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "./TeXmacs.app/Contents/Resources") ]; env.NIX_LDFLAGS = "-lz"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv TeXmacs.app $out/Applications/ makeWrapper $out/Applications/TeXmacs.app/Contents/MacOS/TeXmacs $out/bin/texmacs @@ -87,7 +87,7 @@ stdenv.mkDerivation { ]) ]; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapQtApp $out/bin/texmacs ''; diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 427948822fbcf..57757746cba32 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,17 +1,40 @@ -{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook3 }: +{ + lib, + stdenv, + fetchurl, + cmake, + pkg-config, + wrapQtAppsHook, + poppler, + qtbase, + qttools, + qtwebengine, + qt5compat, + zlib +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "texmaker"; - version = "5.1.4"; + version = "6.0.0"; src = fetchurl { - url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2"; - sha256 = "sha256-MgUE1itxtZHAa30LEgKsdQoxEv4soyjjBYAFXrMI/qY="; + url = "http://www.xm1math.net/texmaker/texmaker-${version}.tar.bz2"; + hash = "sha256-l3zlgOJcGrbgvD2hA74LQ+v2C4zg0nJzEE/df1hhd/w="; }; - buildInputs = [ qtbase qtscript poppler zlib qtwebengine ]; - nativeBuildInputs = [ pkg-config poppler qmake wrapGAppsHook3 ]; - env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; + buildInputs = [ + poppler + qtbase + qtwebengine + qt5compat + qttools + zlib + ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; qmakeFlags = [ "DESKTOPDIR=${placeholder "out"}/share/applications" @@ -19,15 +42,9 @@ mkDerivation rec { "METAINFODIR=${placeholder "out"}/share/metainfo" ]; - dontWrapGApps = true; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - meta = with lib; { description = "TeX and LaTeX editor"; - longDescription='' + longDescription = '' This editor is a full fledged IDE for TeX and LaTeX editing with completion, structure viewer, preview, spell checking and support of any compilation chain. @@ -35,7 +52,10 @@ mkDerivation rec { homepage = "http://www.xm1math.net/texmaker/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ cfouche markuskowa ]; + maintainers = with maintainers; [ + cfouche + markuskowa + ]; mainProgram = "texmaker"; }; } diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index c3d4eb682477b..bdd8fab7a9a6f 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.8.1"; + version = "4.8.4"; src = fetchFromGitHub { owner = "texstudio-org"; repo = "texstudio"; rev = finalAttrs.version; - hash = "sha256-gW7LXfXeZ0nXyWchVRyVDDJi725xa4tgYWYnSIhi5Bo="; + hash = "sha256-gGL9eM0OsUg34GXFsz5LJ738WSl8L8mGfOcZZPNceT4="; }; nativeBuildInputs = [ @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { qttools quazip zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" mv "$out/bin/texstudio.app" "$out/Applications" rm -d "$out/bin" @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { spell checking and support of any compilation chain. ''; homepage = "https://texstudio.org"; - changelog = "https://github.com/texstudio-org/texstudio/blob/${finalAttrs.version}/utilities/manual/CHANGELOG.txt"; + changelog = "https://github.com/texstudio-org/texstudio/blob/${finalAttrs.version}/utilities/manual/source/CHANGELOG.md"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ ajs124 cfouche ]; diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index 4ddd4c9cb6c11..a20bc426b3ca2 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { qttools ] ++ lib.optional withLua lua ++ lib.optional withPython python3 - ++ lib.optional stdenv.isLinux qtwayland; + ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; cmakeFlags = [ "-DQT_DEFAULT_MAJOR_VERSION=6" diff --git a/pkgs/applications/editors/thiefmd/default.nix b/pkgs/applications/editors/thiefmd/default.nix index 59e28a75ad138..b626ca6fb8a62 100644 --- a/pkgs/applications/editors/thiefmd/default.nix +++ b/pkgs/applications/editors/thiefmd/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { mainProgram = "com.github.kmwallio.thiefmd"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ aleksana ]; }; } diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix deleted file mode 100644 index d2aabf5a92f80..0000000000000 --- a/pkgs/applications/editors/thonny/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, fetchFromGitHub, python3, makeDesktopItem, copyDesktopItems }: - -with python3.pkgs; - -buildPythonApplication rec { - pname = "thonny"; - version = "4.1.4"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-f4wR5OPzWbtSqE+hSW2zD8u3pPl5nPTtGvf2LzOXjI4="; - }; - - nativeBuildInputs = [ copyDesktopItems ]; - - desktopItems = [ (makeDesktopItem { - name = "Thonny"; - exec = "thonny"; - icon = "thonny"; - desktopName = "Thonny"; - comment = "Python IDE for beginners"; - categories = [ "Development" "IDE" ]; - }) ]; - - propagatedBuildInputs = with python3.pkgs; [ - jedi - pyserial - tkinter - docutils - pylint - mypy - pyperclip - asttokens - send2trash - dbus-next - ]; - - preInstall = '' - export HOME=$(mktemp -d) - ''; - - preFixup = '' - wrapProgram "$out/bin/thonny" \ - --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3.pkgs.jedi}) - ''; - - postInstall = '' - install -Dm644 ./packaging/icons/thonny-48x48.png $out/share/icons/hicolor/48x48/apps/thonny.png - ''; - - # Tests need a DISPLAY - doCheck = false; - - meta = with lib; { - description = "Python IDE for beginners"; - longDescription = '' - Thonny is a Python IDE for beginners. It supports different ways - of stepping through the code, step-by-step expression - evaluation, detailed visualization of the call stack and a mode - for explaining the concepts of references and heap. - ''; - homepage = "https://www.thonny.org/"; - license = licenses.mit; - maintainers = with maintainers; [ leenaars ]; - platforms = platforms.unix; - mainProgram = "thonny"; - }; -} diff --git a/pkgs/applications/editors/tijolo/default.nix b/pkgs/applications/editors/tijolo/default.nix index 060c30a171a63..54f0f154ab371 100644 --- a/pkgs/applications/editors/tijolo/default.nix +++ b/pkgs/applications/editors/tijolo/default.nix @@ -38,7 +38,7 @@ crystal.buildCrystalPackage rec { ''; nativeBuildInputs = [ wrapGAppsHook4 gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ gtk4 libadwaita vte-gtk4 libgit2 gtksourceview5 editorconfig-core-c ]; buildTargets = [ "all" ]; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 4113157d4f24b..5b9cfec4cb326 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0689"; + version = "9.1.0707"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-87y/STnGB2Yf64TMwCd6VCFF2kvy+DmNyaXVKPIc86E="; + hash = "sha256-iHOLABPk5B7Sh7EBYnM7wdxnK2Wv7q4WS3FEp780SV4="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix index 663dc5b688c7d..5183ee5d39f20 100644 --- a/pkgs/applications/editors/vim/full.nix +++ b/pkgs/applications/editors/vim/full.nix @@ -11,7 +11,7 @@ , features ? "huge" # One of tiny, small, normal, big or huge , wrapPythonDrv ? false -, guiSupport ? config.vim.gui or (if stdenv.isDarwin then "gtk2" else "gtk3") +, guiSupport ? config.vim.gui or (if stdenv.hostPlatform.isDarwin then "gtk2" else "gtk3") , luaSupport ? config.vim.lua or true , perlSupport ? config.vim.perl or false # Perl interpreter , pythonSupport ? config.vim.python or true # Python interpreter @@ -104,7 +104,7 @@ in stdenv.mkDerivation { "vim_cv_memmove_handles_overlap=yes" ] ++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}" - ++ lib.optional stdenv.isDarwin + ++ lib.optional stdenv.hostPlatform.isDarwin (if darwinSupport then "--enable-darwin" else "--disable-darwin") ++ lib.optionals luaSupport [ "--with-lua-prefix=${lua}" @@ -163,7 +163,7 @@ in stdenv.mkDerivation { ++ lib.optional sodiumSupport libsodium; # error: '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec"; preConfigure = lib.optionalString ftNixSupport '' cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim @@ -176,7 +176,7 @@ in stdenv.mkDerivation { postInstall = '' ln -s $out/bin/vim $out/bin/vi - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc ''; diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock b/pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock new file mode 100644 index 0000000000000..571e3d9080cf8 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock @@ -0,0 +1,1778 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.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 = "avante-repo-map" +version = "0.1.0" +dependencies = [ + "cc", + "minijinja", + "mlua", + "serde", + "tree-sitter", + "tree-sitter-c", + "tree-sitter-cpp", + "tree-sitter-go", + "tree-sitter-javascript", + "tree-sitter-language", + "tree-sitter-lua", + "tree-sitter-python", + "tree-sitter-ruby", + "tree-sitter-rust", + "tree-sitter-typescript", + "tree-sitter-zig", +] + +[[package]] +name = "avante-templates" +version = "0.1.0" +dependencies = [ + "minijinja", + "mlua", + "serde", +] + +[[package]] +name = "avante-tokenizers" +version = "0.1.0" +dependencies = [ + "mlua", + "tiktoken-rs", + "tokenizers", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "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.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cc" +version = "1.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[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 = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "derive_builder" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" +dependencies = [ + "derive_builder_core", + "syn", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "erased-serde" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" +dependencies = [ + "serde", + "typeid", +] + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] + +[[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 = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "flate2" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "hf-hub" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" +dependencies = [ + "dirs", + "indicatif", + "log", + "native-tls", + "rand", + "serde", + "serde_json", + "thiserror", + "ureq", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[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 = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memo-map" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d1115007560874e373613744c6fba374c17688327a71c1476d1a5954cc857b" + +[[package]] +name = "minijinja" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7d3e3a3eece1fa4618237ad41e1de855ced47eab705cec1c9a920e1d1c5aad" +dependencies = [ + "aho-corasick", + "memo-map", + "self_cell", + "serde", + "serde_json", + "unicase", + "unicode-ident", + "v_htmlescape", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mlua" +version = "0.10.0-beta.1" +source = "git+https://github.com/mlua-rs/mlua.git?branch=main#1634c43f0afaf7a71dc555cb6b3624250e5ff209" +dependencies = [ + "bstr", + "erased-serde", + "mlua-sys", + "mlua_derive", + "num-traits", + "parking_lot", + "rustc-hash 2.0.0", + "serde", + "serde-value", +] + +[[package]] +name = "mlua-sys" +version = "0.6.2" +source = "git+https://github.com/mlua-rs/mlua.git?branch=main#1634c43f0afaf7a71dc555cb6b3624250e5ff209" +dependencies = [ + "cc", + "cfg-if", + "pkg-config", +] + +[[package]] +name = "mlua_derive" +version = "0.9.3" +source = "git+https://github.com/mlua-rs/mlua.git?branch=main#1634c43f0afaf7a71dc555cb6b3624250e5ff209" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "monostate" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[package]] +name = "rustix" +version = "0.38.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.102.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "self_cell" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.127" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tiktoken-rs" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bstr", + "fancy-regex 0.12.0", + "lazy_static", + "parking_lot", + "rustc-hash 1.1.0", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokenizers" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8a24d7f7d6be5b9d1377418b893ab1808af0074f5d1bb2c64784452ddd2aa70" +dependencies = [ + "aho-corasick", + "derive_builder", + "esaxx-rs", + "fancy-regex 0.13.0", + "getrandom", + "hf-hub", + "itertools 0.12.1", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] +name = "tree-sitter" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20f4cd3642c47a85052a887d86704f4eac272969f61b686bdd3f772122aabaff" +dependencies = [ + "cc", + "regex", + "regex-syntax", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-c" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8b3fb515e498e258799a31d78e6603767cd6892770d9e2290ec00af5c3ad80b" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-cpp" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d67e862242878d6ee50e1e5814f267ee3eea0168aea2cdbd700ccfb4c74b6d3" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-go" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caf57626e4c9b6d6efaf8a8d5ee1241c5f178ae7bfdf693713ae6a774f01424e" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-javascript" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e1f62f8babb640b909f30675d1addeb1f17802f2a4d2af287569753b243977" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-language" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2545046bd1473dac6c626659cc2567c6c0ff302fc8b84a56c4243378276f7f57" + +[[package]] +name = "tree-sitter-lua" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb9adf0965fec58e7660cbb3a059dbb12ebeec9459e6dcbae3db004739641e" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-python" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65661b1a3e24139e2e54207e47d910ab07e28790d78efc7d5dc3a11ce2a110eb" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-ruby" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ec5ee842e27791e0adffa0b2a177614de51d2a26e5c7e84d014ed7f097e5ed0" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-rust" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cffbbcb780348fbae8395742ae5b34c1fd794e4085d43aac9f259387f9a84dc8" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-typescript" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aecf1585ae2a9dddc2b1d4c0e2140b2ec9876e2a25fd79de47fcf7dae0384685" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-zig" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2994e37b8ef1f715b931a5ff084a1b1713b1bc56e7aaebd148cc3efe0bf29ad9" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "typeid" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-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-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "v_htmlescape" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" + +[[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 = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "webpki-roots" +version = "0.26.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix new file mode 100644 index 0000000000000..936d12af04349 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix @@ -0,0 +1,76 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + vimUtils, + darwin, +}: + +let + version = "2024-09-30"; + + src = fetchFromGitHub { + owner = "yetone"; + repo = "avante.nvim"; + rev = "0705234991d03170a72582085dc508600a03a779"; + hash = "sha256-tAigYqS3ZAtZJp7RaarbXrDxrjiYu2wjNHq6GP/BMfk="; + }; + + meta = with lib; { + description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE"; + homepage = "https://github.com/yetone/avante.nvim"; + license = licenses.asl20; + maintainers = with lib.maintainers; [ + ttrei + aarnphm + ]; + }; + + avante-nvim-lib = rustPlatform.buildRustPackage { + pname = "avante-nvim-lib"; + inherit version src meta; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "mlua-0.10.0-beta.1" = "sha256-ZEZFATVldwj0pmlmi0s5VT0eABA15qKhgjmganrhGBY="; + }; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + buildFeatures = [ "luajit" ]; + }; +in + +vimUtils.buildVimPlugin { + pname = "avante.nvim"; + inherit version src meta; + + postInstall = + let + 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} + ''; + + doInstallCheck = true; + # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged + # nvimRequireCheck = "avante"; +} diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index e557cd7effe3a..fd821bbec9701 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -1,7 +1,7 @@ # TODO check that no license information gets lost { callPackage, config, lib, vimUtils, vim, darwin, llvmPackages +, neovim-unwrapped , neovimUtils -, luaPackages }: let @@ -27,7 +27,7 @@ let overrides = callPackage ./overrides.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; inherit buildVimPlugin; - inherit llvmPackages luaPackages; + inherit llvmPackages; }; aliases = if config.allowAliases then (import ./aliases.nix lib) else final: prev: {}; diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index c637246c92ad3..05678e61362b5 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -1,22 +1,18 @@ { "TrueZen-nvim": { - "date": "2022-09-02", + "date": "2022-07-27", "new": "true-zen-nvim" }, "compe-tmux": { - "date": "2021-12-21", + "date": "2021-12-07", "new": "cmp-tmux" }, - "taskwarrior": { - "date": "2024-08-13", - "new": "taskwarrior3 or taskwarrior2" - }, "fern-vim": { - "date": "2024-05-28", + "date": "2024-05-12", "new": "vim-fern" }, "gina-vim": { - "date": "2024-08-05", + "date": "2024-05-12", "new": "vim-gina" }, "gist-vim": { @@ -28,7 +24,7 @@ "new": "lspsaga-nvim" }, "lua-dev-nvim": { - "date": "2022-10-20", + "date": "2022-10-14", "new": "neodev-nvim" }, "nvchad-extensions": { @@ -36,7 +32,7 @@ "new": "nvchad-ui" }, "nvim-base16": { - "date": "2024-03-16", + "date": "2024-02-15", "new": "base16-nvim" }, "nvim-bufferline-lua": { @@ -55,6 +51,10 @@ "date": "2021-11-28", "new": "orgmode" }, + "render-markdown": { + "date": "2024-09-16", + "new": "render-markdown-nvim" + }, "sql-nvim": { "date": "2021-09-03", "new": "sqlite-lua" @@ -63,8 +63,12 @@ "date": "2024-05-12", "new": "vim-suda" }, + "taskwarrior": { + "date": "2024-08-13", + "new": "taskwarrior3 or taskwarrior2" + }, "vim-fsharp": { - "date": "2024-08-05", + "date": "2024-03-16", "new": "zarchive-vim-fsharp" }, "vim-jade": { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c053f5c669c14..3cd4bb6dfbc82 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2024-06-22"; + version = "2024-08-26"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "f081338f07216a46d3915ce46c1fcb083bcb5016"; - sha256 = "1hgwdahp5h2nfzwfgjjgdbki5jnyg5gmapvz1kd1zmcycslb85di"; + rev = "4d9d297c2409c8ebc715da7f1d7705a221564555"; + sha256 = "0i4ras7n66i4h64bb0v70v85b70d0rw33hy16kgyr20b6qkm53vm"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -65,24 +65,24 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2024-07-29"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "4a5e07185b37d3132e5541d8fa42aa874b774476"; - sha256 = "0hddx5yip9r5asm21gwrcflnlhpj07f3sp90157alnmsvmsjbcwb"; + rev = "9333944fde3c65868818e245c73aa29eef826e9b"; + sha256 = "1dgm5xz0l5y3kgr6rr6v5b0y5b11949z8p1qs5m68vd10m5hkgvg"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; }; Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-08-03"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "ac6e91f72c43ea5b7734daca160f8072b6e98799"; - sha256 = "1hg44rg94bv1wblpghff8m4zkkprmfsjmcvm7azismpf3f71hcdx"; + rev = "299d0acdb9b697fd951df81a5d67e3f5cb6ed4f9"; + sha256 = "1z7gwpy14h1icsxfz67nzj56fn2gwxa0bf49rw24kfwnr1zbw75r"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -137,12 +137,12 @@ final: prev: Ionide-vim = buildVimPlugin { pname = "Ionide-vim"; - version = "2024-05-24"; + version = "2024-09-03"; src = fetchFromGitHub { owner = "ionide"; repo = "Ionide-vim"; - rev = "00099c3cf53cba28a1d8084ab8d21639c62bd747"; - sha256 = "1c3fzc87468zcl2fk6av0fl848sp82wpr9rdc4yc3l33p2mxqqy9"; + rev = "268955cc106f8328a232b160a7360cf331c0a323"; + sha256 = "0lyd719p621v0n9pm7c1nvrfccfmssdipn9fzxcds0hw4janhjml"; }; meta.homepage = "https://github.com/ionide/Ionide-vim/"; }; @@ -185,24 +185,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-07-25"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "12818a6cb499456f4903c5d8e68af43753ebc869"; - sha256 = "16zdahzb3mfjpr3s6lk9754a6nqq1kjcw5p3f0qh12h6zkb2w8v4"; + rev = "a1c3ec4cd43fe61e3b614237a46ac92771191c81"; + sha256 = "1d7iqdfyqg09m0mxixz4lya669ys4gvplls8x3k4a7c2rad93gp3"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-07-31"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "10ad367e4b523ccb4fe2953078d0affcddb1f1a7"; - sha256 = "1gwzjrmr0sf7nhlpviscnnsz2lfjyrxk14bgp1yfx297sb529acj"; + rev = "ed349b76f3feff7dc68a1e478d51e59cb41e1e6f"; + sha256 = "1cyhgc7hh73gnn5k41xryndfxxnan0f1vpl4fndbwslxyfmilvy0"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -329,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-08-01"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "a86e7a0ecaf09fdb0b58ca09f34cd1e2b2b1fd75"; - sha256 = "0yidgx3z5dims64gdzvln8rji7qqbaxrg9jwbxa7w7vqhy3s7b99"; + rev = "63836d8d9e17755c67919f5840ead0efd0bc0098"; + sha256 = "0gpw82xgn9fbxvf9p3wn1imjcxfbmqg1m697j6g3d8yskx7zr1mh"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -401,12 +401,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2024-08-04"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "f15e9ec6789c8ddb95da39f346489b26ed6193ff"; - sha256 = "0xmx1qffkl3dbqbaawdgnjs1cxdc60v0035q569bqldghfv6pv9h"; + rev = "533c40395c2073340a613f9569b4d20ab84d498a"; + sha256 = "0750hgh193avdwlnm4k9sa2rg27vsirrn79dda48hbiss1x8sn69"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -473,12 +473,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-06-20"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "b5fe27bb82cc375d66a9a006cf30390bdb215ed2"; - sha256 = "1fm8dbdr26zknxcyiah7jz1v0h9cx0g4dg9c9vrm3w3ibbpy2jf0"; + rev = "63ab13e95141c252c545f9a6c7144ced6790d68f"; + sha256 = "0v7xb149q9wvmd7arin397415bl6rrscgipwcb46wmjm08qzwjyp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -534,12 +534,12 @@ final: prev: advanced-git-search-nvim = buildVimPlugin { pname = "advanced-git-search.nvim"; - version = "2024-06-03"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "aaronhallaert"; repo = "advanced-git-search.nvim"; - rev = "198cc402af1790ab26830fdbf24a28c336a20ba6"; - sha256 = "0xyhbqvbfdbd73awizn8zyq9qqrrdqpmrgdj20xv61kak5pd6ar3"; + rev = "1c5a10f5c838cfad2c17d7464311d6fb416cb319"; + sha256 = "0yhp2szjm62x27iprz50pxfp048m71xj1pwdg41z07vhf4vxqpv0"; }; meta.homepage = "https://github.com/aaronhallaert/advanced-git-search.nvim/"; }; @@ -558,12 +558,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-07-24"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "e75a3df2c20b3a98c786f5e61587d74a7a6b61d6"; - sha256 = "06jg1z0lyvyq1k7hai059jj7h19r2psrya1n035ricj5j39n8i3x"; + rev = "140f48fb068d21c02e753c63f7443649e55576f0"; + sha256 = "0ba4xd4jqn34vm5n2327awmxv2xz060mfi6zzwja89z5jrkzna7d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -605,6 +605,18 @@ final: prev: meta.homepage = "https://github.com/aduros/ai.vim/"; }; + aider-nvim = buildVimPlugin { + pname = "aider.nvim"; + version = "2023-10-22"; + src = fetchFromGitHub { + owner = "joshuavial"; + repo = "aider.nvim"; + rev = "74a01227271d0ea211f2edafa82028b22d4c2022"; + sha256 = "jkco90IF948LuRILP3Bog3GelUGOQzsEw2jP4f9Ghbw="; + }; + meta.homepage = "https://github.com/joshuavial/aider.nvim/"; + }; + alchemist-vim = buildVimPlugin { pname = "alchemist.vim"; version = "2023-09-01"; @@ -619,12 +631,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-07-12"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "48d73c87c3c321e6298755abc5449267192d07e6"; - sha256 = "0zrwv58w4hjznjp6b4vpipamgb7ad05vv5il0xbjckxp3dq1p3nb"; + rev = "a7ef1817b7aa06d0f80952ad530be87ad3c8f6e2"; + sha256 = "0sd8ygz6g1l80h108lhzjl6cmv5wl490z69ybzlxp9xywkhp5nah"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -643,12 +655,12 @@ final: prev: alpha-nvim = buildVimPlugin { pname = "alpha-nvim"; - version = "2024-02-25"; + version = "2024-08-19"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "41283fb402713fc8b327e60907f74e46166f4cfd"; - sha256 = "1a3spwcypcrjv9md58h4vxh4bjfz25fc1lkpp0zypmnykwllydci"; + rev = "b6f4129302db197a7249e67a90de3f2b676de13e"; + sha256 = "1zvzavhvpdf5xm4lcz43d7zqkpicam3gydxgy389xs9p6fdc9ww2"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -667,12 +679,12 @@ final: prev: aniseed = buildVimPlugin { pname = "aniseed"; - version = "2024-07-14"; + version = "2024-08-09"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "9531eb0dae5a9347eda8f0fc04af7b2b7c908eb0"; - sha256 = "10qgcy29mgmdpnrdf1k9wip5glmzzhw8ikkx48p7b6qdmgfkg1c6"; + rev = "d558a68329c465bced901adf3238a6f946d62483"; + sha256 = "0dwzxbf0xdlspwynx37y7zwfzi5ng09crlywpymbj9lpdpyfy14p"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -727,24 +739,24 @@ final: prev: arrow-nvim = buildVimPlugin { pname = "arrow.nvim"; - version = "2024-05-28"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "otavioschwanck"; repo = "arrow.nvim"; - rev = "0b0191d967d9fd837a850f2ccaa95d5917239404"; - sha256 = "13brj1c482nag37wik4c61y2cb771yg9vkshqi3irqlzbyf1bhqb"; + rev = "8b54450ae537564f809ee6883157c82c4f82e6ae"; + sha256 = "095cqvlp38y8v1b41b0qfklvr68kp8vbhnw91jp5xqqbzf5sxgb9"; }; meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/"; }; astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-07-24"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "41b7d8430a55fd771e41bd763af4c3fd1c2fc0b5"; - sha256 = "0lp8wym0ck7jfdrhwymhh1g9cas5ljmlydggy0c9qa64ildyr5ab"; + rev = "53d093f172c7beb72bae5c0a350880223c2735de"; + sha256 = "0vfzvbk4k5gawv3q9924sr5yydjxbfw4qdn3qk1jgph7p3iw64z8"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -847,24 +859,24 @@ final: prev: asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2024-07-26"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "641de260966924a8ddd280af1b30209408497b52"; - sha256 = "1r5mz66qqq05wfrqg3jfd050j7flwg7gqwd03bxj4hr4dbvv0n4r"; + rev = "09b8117fe607941c0abff39b194074e40a3dee88"; + sha256 = "1ipq20nk1npx5krpjs2rf6fda9sc1lxr69pnm8afbjhfj1c7sqhj"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; asynctasks-vim = buildVimPlugin { pname = "asynctasks.vim"; - version = "2024-06-18"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "2604a6dd7348cff5bbca869ba68170f67b48159a"; - sha256 = "033x1z1jr2s6cv0ff98qjqn62vz82isajbxbb4hbyihhk4d0zka5"; + rev = "9020fdb8a59d4cc7887f7e0ae724741bbc46e08f"; + sha256 = "09i5x5wrnc73s7wivqnp16f765684cq538p3a3ijraaz41glyfac"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -907,12 +919,12 @@ final: prev: auto-hlsearch-nvim = buildVimPlugin { pname = "auto-hlsearch.nvim"; - version = "2023-03-04"; + version = "2024-08-23"; src = fetchFromGitHub { owner = "asiryk"; repo = "auto-hlsearch.nvim"; - rev = "8f28246d53e9478717ca3b51c8112083fbebd7e3"; - sha256 = "1v6d15swvbxzq0rqx543bbpy64jm7w2vj6di8qad0a58s9v68aq2"; + rev = "77502069b22e48ab7736fe9cf53e1fdac1923bca"; + sha256 = "1lvr0129fgadjavw9nwmxfvba90sqim3np7nankrk7wb6rziwss9"; }; meta.homepage = "https://github.com/asiryk/auto-hlsearch.nvim/"; }; @@ -943,12 +955,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-08-04"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "a6e692fadbe385b28ba8e98b67747a7e2f381f91"; - sha256 = "1nlnh4ikr8mnk87694hyblrpmisc06bx1yiqrp6mv409vcafbw1j"; + rev = "21e33854fb3e561cb738dfefcd9d1d84fe6faaef"; + sha256 = "1fa8bskvbd4nysn051fb3w8ir3bmlcrk9amd28sn6gvyipbphvk2"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1064,36 +1076,36 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-08-05"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "49c0737fd76303f1294206f898680c6b9b174260"; - sha256 = "17aghspa3mdyqdxxz8726wv6kxf82bwqrp3mff4j4klmb1wxc6ja"; + rev = "c245d90c490c681470389e28782b161491bec97c"; + sha256 = "1nycgf8lrvjsswr0z60kbi6s1c14fgzmichmyymm4100ywyp4k6s"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2024-07-17"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "53b5a2f34b68875898f0531032fbf090e3952ad7"; - sha256 = "0vzjgk5w55wbhf26dsk9m0ffdvwmkmsb3rgpwf989vbxcqmw8haw"; + rev = "a3ebfe0c382fc5393b3c0cef96d58c6c49492562"; + sha256 = "1ig2s8zglqkca934ikij17jbblfrzpsrfbjsxs46a3rdgf51pr18"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPlugin { pname = "barbecue.nvim"; - version = "2023-09-13"; + version = "2024-08-20"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "d38a2a023dfb1073dd0e8fee0c9be08855d3688f"; - sha256 = "0z1m3myl14g91nnamqa72yxq6pspaffn0zpfi78vy6y0ygzam51x"; + rev = "3e31404f0b93a2c30d151abf0648650ac811c664"; + sha256 = "0pw2jx616zanjrh0njw69l4x4xrgsdz4q5q0b4vi8nfl0lvqdvsi"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1124,12 +1136,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-08-03"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "be43be136eeab321c8cb201bf72c7db44d97b15f"; - sha256 = "04amnhxbdydl5x7h4vvirj2xj4kgv61gjqxkpc0ryk0v2w3zvdxv"; + rev = "82d71bc6def6a752cbf5fbd0e496aea5f088d940"; + sha256 = "065zg8m7mlhv68145yf7ar3afj3p6q959b0jrb6j93lkvfrhdzwj"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1172,12 +1184,12 @@ final: prev: better-escape-nvim = buildVimPlugin { pname = "better-escape.nvim"; - version = "2024-08-02"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "d337e02b140d909345441392de47a42d283747c1"; - sha256 = "02bm6kfqds02y95qqcxhy54wlw1ra6zg0p5m6x4900178r37bfw9"; + rev = "bb197e51a91a635deb88630813c3bfc284413697"; + sha256 = "12nn87w12v9b2l86x2q55kqw5nqixyz6qqpcy8vb7d1rmj5v7j2j"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -1304,12 +1316,12 @@ final: prev: bufexplorer = buildVimPlugin { pname = "bufexplorer"; - version = "2024-05-30"; + version = "2024-08-13"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "2308e87960c05bd8da7bbf62c903e1f42d6cc9b9"; - sha256 = "1ss3vshlsrfyrnn3fadhfp49zc0w70r6wzjaww2d8jqw7afwlx5x"; + rev = "fcf3a65a69020f0f54be8fa925f841874a5f3a01"; + sha256 = "0nbskarlk7byghv3w852hlsmc3rylw43x873a4n2nszywc50zahk"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; @@ -1400,12 +1412,12 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2024-06-23"; + version = "2024-08-30"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "4fb5abaef2f2e0540fe22d4d74a9841205fff9e4"; - sha256 = "00916cwvdg3rccmf4vg811gi03gpdrpsndpr9ady29dii2alb6pb"; + rev = "790aa881d7f47bc7cc07ad03f1216bb7caf9ef67"; + sha256 = "0xq64akzb1pl4cf1w73a73q1wg4d9b48k35lddg2kmm86abmsb62"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1424,12 +1436,12 @@ final: prev: chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-07-25"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "7334155c68acd932e275fbf203f05eebf7f741ed"; - sha256 = "15ddriks3ffyz8q0g8nkb35dmm2apclw04dkivjbbm21dg5nym11"; + rev = "b1000e87298c31452fe9fa43397fd955daa70cd4"; + sha256 = "0gbw2i6989my9582ap79dfqiwkhlv5nm65sywvrz0sxr4nq4fsp2"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1472,12 +1484,12 @@ final: prev: cinnamon-nvim = buildVimPlugin { pname = "cinnamon.nvim"; - version = "2024-07-25"; + version = "2024-08-07"; src = fetchFromGitHub { owner = "declancm"; repo = "cinnamon.nvim"; - rev = "ecd211e46a1d4fb0efffbdb2c2bbd59785605870"; - sha256 = "0pf9bx2xrv8kkg4339w7cqns4v8gkg4jppsccbymhbp4gj9xhw7s"; + rev = "450cb3247765fed7871b41ef4ce5fa492d834215"; + sha256 = "1vq0cab139gyix2qhmivp86fq6l4fhzn7qafphj0yjac47i11iwi"; }; meta.homepage = "https://github.com/declancm/cinnamon.nvim/"; }; @@ -1496,12 +1508,12 @@ final: prev: citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-07-11"; + version = "2024-08-28"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "7ad0e43e0098ae8aecdce81e920688afca95631c"; - sha256 = "0x54vbip7saswfqypcfh4hw8yrn59msz196hi92gc8ldg77ana0k"; + rev = "d12c99f937114b908e935a9cda1953bb8f16bcc8"; + sha256 = "19ng4ig8jjllz8c8ji3b2qljbc53bnkrcilqpyk0rzyfpfcp81i6"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; }; @@ -1520,12 +1532,12 @@ final: prev: clangd_extensions-nvim = buildVimPlugin { pname = "clangd_extensions.nvim"; - version = "2024-06-06"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "a8500531c4ed3a207e744a374ea038744a0f93eb"; - sha256 = "1y42abwy5ax64ccr90pk31gycja1yv3c6qgi0wmkfi6smmn25g0g"; + rev = "385a44f133f4145e3a3da1a2a557225dccc3e1f8"; + sha256 = "1fsc5ggzzf3gcgn87pv70wrlakl32dh5kz492m1djgr6c7gzpnnn"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1592,12 +1604,12 @@ final: prev: cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2024-06-25"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "4be3c229fe932043fd83ad52fdf0ba9af7297789"; - sha256 = "12cyls7vsz852b2x8vhs7qwi20kcml4z7zc5b6zaamw2h74an6sm"; + rev = "f1f917b584127b673c25138233cebf1d61a19f35"; + sha256 = "1f7rg7ya307bpjnj7ymsj9q9m0pqhd3dql269hn1a3klpgh853f8"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -1616,23 +1628,23 @@ final: prev: cmp-ai = buildVimPlugin { pname = "cmp-ai"; - version = "2024-08-01"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-ai"; - rev = "61d86ffc5863833aa30c6098f95a1e56670a6c64"; - sha256 = "1f629agggkxsdfp7gmw8j60q7szd9lvrazyy8d35avyn0npmp64n"; + rev = "4424e71bde8acc522ab68a122fa54b14dff3d408"; + sha256 = "0zljcdghyqwhkalir0fcy2q1zp3866qr9j2z9cj8v8z1b54rlax3"; }; meta.homepage = "https://github.com/tzachar/cmp-ai/"; }; cmp-async-path = buildVimPlugin { pname = "cmp-async-path"; - version = "2024-03-25"; + version = "2024-08-27"; src = fetchgit { url = "https://codeberg.org/FelipeLema/cmp-async-path/"; - rev = "7df7f3721c45aac26b6e0474087538f4681c9c7a"; - sha256 = "15k6q1hfv9bggzz8vh9pd5mz9vay2cr6xp7bb4iqhahsgyr9c99d"; + rev = "03fac5dfd6f7880be2c059d58bebe007f0d6d8ee"; + sha256 = "1dycqym1n4i5cxah2a151ih5k3h238vipf54d7jcr3jgx1ad8glv"; }; meta.homepage = "https://codeberg.org/FelipeLema/cmp-async-path/"; }; @@ -1831,12 +1843,12 @@ final: prev: cmp-git = buildVimPlugin { pname = "cmp-git"; - version = "2024-07-17"; + version = "2024-08-20"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "3d83031c4b63f9b10703e32e070cda0700a81992"; - sha256 = "1vnd05v6ni7kn3qkrmm75ns2p29liyl1b1xl56whijp0r0v26s89"; + rev = "50d526dff0f6bc441b51fc269d9fdc99a50c76af"; + sha256 = "084mka6ar0bz7sqd8iv9nhz1y552fab6imjxzb4ak3aagzlml5r7"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -2071,12 +2083,12 @@ final: prev: cmp-tabnine = buildVimPlugin { pname = "cmp-tabnine"; - version = "2024-03-26"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "d52aae40ee86b62960c31a003352ddfc9e31c8d2"; - sha256 = "155v6pqwdvqnivbm23wx3a554sy5sryb14dd8v01kp3pjydbkqqz"; + rev = "c0167cdc86c15e782c5461ee62aebee89231c2ed"; + sha256 = "0z0p8n3nmykn05d7p0kcxir5w2wybkjf6dibinaq8zcjxxsgmcc3"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -2179,24 +2191,24 @@ final: prev: cmp_yanky = buildVimPlugin { pname = "cmp_yanky"; - version = "2023-11-16"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "cmp_yanky"; - rev = "c3d089186ccead26eba01023502f3eeadd7a92d2"; - sha256 = "sha256-jWNoKzY0x5GPFP7JsQi4nqgg1YFJV4DqxwJRqsg6KaQ="; + rev = "c9cc4824327096ca9c78c275c722a42fd89062c9"; + sha256 = "0d9xmqj30lpgd6bgrkdnwvh3gg6l1hzn8mcxcxhgjk8fy1hl63nq"; }; meta.homepage = "https://github.com/chrisgrieser/cmp_yanky/"; }; cobalt2-nvim = buildVimPlugin { pname = "cobalt2.nvim"; - version = "2024-08-03"; + version = "2024-09-09"; src = fetchFromGitHub { owner = "lalitmee"; repo = "cobalt2.nvim"; - rev = "f9bcbf6d73c065b95cdf891195e825d918412a3f"; - sha256 = "0v6rss8sgzig08x23x329alpyixx510m5mf3b4v8g6nsv06ldxn0"; + rev = "32a2b8d0742bc5d0fb778d25a23c59ce31589e75"; + sha256 = "045lg1r66qcq3cjlzl78042511ab5cip0wnw6wr7daknwj36nqzs"; }; meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/"; }; @@ -2287,12 +2299,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-08-01"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "ae1a5576936f78ae46a51964db1b2293b40ff27f"; - sha256 = "09m4zrs33msjc0ifqh5xk4pzlm8ws5xd3043k1xfvaw6m3ic18d2"; + rev = "69b16f8651b4d92d9ea5d6b000c084f275ed7928"; + sha256 = "1fw1jridm31gw41xq6cx2k51nkxk8jv3b26idbkynm4isr02g0ig"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2311,36 +2323,36 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-07-09"; + version = "2024-09-28"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "f6a2ef32a9e923cb0104a19d3e426b0e40e49505"; - sha256 = "0cijady83i5wixjfsgv979h9iggw76d5fwr6vrrnijwdkx7im6zi"; + rev = "17bbefff02be8fd66931f366bd4ed76a76e4a57e"; + sha256 = "1p280kh39msb3anvmq53yyl6si07cxxp1dgy71nhc07gxjlzcwh0"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-07-11"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "e0342fde9474fdd0a36ff9692fe0031b7611a19f"; - sha256 = "1s2k680k274pkn6ikw5z924847s72f8r6lhfxf32q55mc5id709y"; + rev = "dfe75c688a8ee9c3d192c51b6e7d315a3ca37d74"; + sha256 = "0fh0ksd18b4zxbqsdnblvz852r4fm42ilpj33mnj2wmj4z43hpyb"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; codesnap-nvim = buildVimPlugin { pname = "codesnap.nvim"; - version = "2024-07-30"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; - rev = "c2924bf6c9a2c2c03318fae9b7fe0706412b9d9c"; - sha256 = "0xvixdcplkmysxfrlfz3sjkhzh4bswgk86jvrpvhq1c4kvyg53lp"; + rev = "6400480aa6cc366cbd931146c429aaa64680dab9"; + sha256 = "1kdqh5vn837pxygz141n01zw08apcxi39xzdn5a0zhddimqn16z1"; }; meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; }; @@ -2407,16 +2419,28 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2024-07-11"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "e2a0513c91a7ebdde23cab0b6724ba05292551ff"; - sha256 = "13i1ap2g5sg5ldky4y14m7lq8y9nb697gyvicl5n8hga535ah9wm"; + rev = "af25c000153843a15d1de46a1f82423281fcfb0e"; + sha256 = "1fj06rqqbdp2gwx5iy0nvi0hl489qclijp7msak37qlw19xlc5sf"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; + comment-box-nvim = buildVimPlugin { + pname = "comment-box.nvim"; + version = "2024-02-03"; + src = fetchFromGitHub { + owner = "LudoPinelli"; + repo = "comment-box.nvim"; + rev = "06bb771690bc9df0763d14769b779062d8f12bc5"; + sha256 = "182wfx8q30ingkkrr0xs4r9zf1rf0b8wp2l8pi8hds0cpzc8vfvx"; + }; + meta.homepage = "https://github.com/LudoPinelli/comment-box.nvim/"; + }; + comment-nvim = buildVimPlugin { pname = "comment.nvim"; version = "2024-06-09"; @@ -2429,18 +2453,6 @@ final: prev: meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; - comment-box-nvim = buildVimPlugin { - pname = "comment-box.nvim"; - version = "v1.0.2"; - src = fetchFromGitHub { - owner = "LudoPinelli"; - repo = "comment-box.nvim"; - rev = "e04635ed2b423448b87ddb2f35c26d1a7b7b3f1c"; - sha256 = "sha256-2P8Zyd5ucOvihZdjgSmr7YlV0yuCn+LyHkCj9gPx/CY="; - }; - meta.homepage = "https://github.com/LudoPinelli/comment-box.nvim/"; - }; - committia-vim = buildVimPlugin { pname = "committia.vim"; version = "2023-11-25"; @@ -2503,12 +2515,12 @@ final: prev: competitest-nvim = buildVimPlugin { pname = "competitest.nvim"; - version = "2024-01-23"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "xeluxee"; repo = "competitest.nvim"; - rev = "c3cb0e2b0916a879c4d3dcb5737e6c046dd0afc5"; - sha256 = "16mycxnxa425rnl1xdk740ng6mg693ywzx5wsa56xr8nvxkms700"; + rev = "4ef440c20eec0be407f455f5db4bfad4acb2641e"; + sha256 = "1s8akxwws2z2kvw6xw8qpmfdv5bryblfwbw32jri83dk6iijkir6"; }; meta.homepage = "https://github.com/xeluxee/competitest.nvim/"; }; @@ -2527,12 +2539,12 @@ final: prev: compiler-nvim = buildVimPlugin { pname = "compiler.nvim"; - version = "2024-07-16"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "Zeioth"; repo = "compiler.nvim"; - rev = "892c1aac059b7df16dc636eea9e34be53f53ff96"; - sha256 = "07dzl4zyhxf2y2pv4wijs597807jznnrd15gzl48snsnkdrx252s"; + rev = "48b3fdc89e815528424290f38aad3b32f000eae2"; + sha256 = "15nryqhr1b07nhg8wjw60hfii7x7i79gdzbaqf9hv4gwdvvm8v3k"; }; meta.homepage = "https://github.com/Zeioth/compiler.nvim/"; }; @@ -2611,12 +2623,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-07-23"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "25d48271e3d4404ba017cb92a37d3a681c1ad149"; - sha256 = "0dbw1b25g83iy6yvc725k7il0l7yli4qd9s4wylcbqgacss2nz3h"; + rev = "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c"; + sha256 = "0r6isycbgi6n55c5sn5kqbs35i11ib4yym2awxpgr1w1bvxhcs01"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2624,12 +2636,12 @@ final: prev: conjure = buildVimPlugin { pname = "conjure"; - version = "2024-07-19"; + version = "2024-08-09"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "1157614e1c757cdbe062b08d617d162fb34ed3a3"; - sha256 = "03rrfba6z47sy4x1a7wrmnlfysz20zn8z1wxinbf60dkaiyjsfgp"; + rev = "6d2bc7f7b24c2c43d54f263bee7b9b08aef5d1a1"; + sha256 = "0gfk2b4cz8wisp5lpjlncf79may4c0sykgn7n9ibrmd8729ks43k"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2670,50 +2682,62 @@ final: prev: meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; + copilot-lualine = buildVimPlugin { + pname = "copilot-lualine"; + version = "2024-09-03"; + src = fetchFromGitHub { + owner = "AndreM222"; + repo = "copilot-lualine"; + rev = "f40450c3e138766026327e7807877ea860618258"; + sha256 = "0qx9x28f0c20cz2ax1631rd7qzzkzvhbnv9ivmyw44v5nzp8jy1x"; + }; + meta.homepage = "https://github.com/AndreM222/copilot-lualine/"; + }; + copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2024-06-15"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "86537b286f18783f8b67bccd78a4ef4345679625"; - sha256 = "13ri0rj0bgs3s5hkh0hc9blk9xv9knv8q97zrx0y90w4b9k50b8w"; + rev = "1a237cf50372830a61d92b0adf00d3b23882e0e1"; + sha256 = "0cjsygqvv2k8lrngln70x1ilb7fmsp812yayxvg3qhc7krc5cz4h"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-07-10"; + version = "2024-08-29"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "25f73977033c597d530c7ab0e211d99b60927d2d"; - sha256 = "1s1jf98kvv7rfiyxyhj3ba091rissc7n953dshpikbj2n85inlma"; + rev = "782461159655b259cff10ecff05efa761e3d4764"; + sha256 = "0f0iszaphi1p411wgpn8r4slqrxlwdcy03raqypdg5f40jmiad9c"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPlugin { pname = "coq.artifacts"; - version = "2024-03-01"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "9c5067a471322c6bb866545e88e5b28c82511865"; - sha256 = "0c0l259qyywck43hgs09qznrw1wm72idprlfk4ddcdj8g99vny84"; + rev = "a1ffcee295905171d87b40ee456001d45b10329b"; + sha256 = "0ag8ryq7figzvf0693077ifwj38jwig09521v04h9jyivickiq6w"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; - version = "2024-07-25"; + version = "2024-08-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "6a53363555bd483818ef2a3103db8ddc8d98a41d"; - sha256 = "0c5l8zwrcyab36l3diwb6zpncisl0nn0d993vwrzf2430nak59cy"; + rev = "a827c2ab76d7c803976765cac597c79a2a5b34f6"; + sha256 = "0f9r16kkqhm6pr78v0iq87g1jqkn2acz5ll90xjdi1qg6h16dmc8"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2732,12 +2756,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-07-26"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "bdcc65c4636a8894ad4c66aec3192d9da4ee760f"; - sha256 = "0arq12fcr3yfnl8smk2klv3wf81bq4l8ban5rr0acsh03skpwajl"; + rev = "f3ac90a86f891889ebff9b29e8056ccfb2d43b7f"; + sha256 = "0bl8x9pznjcsi6rjmwak1jsp3h7c04zlr2kb31gpqq33mvq28pbk"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2780,12 +2804,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-08-02"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "1c924d5a9ea3496c4e1a02d0d51388ba809f8468"; - sha256 = "1aig0p82q7sy3291671msh6yk945dnxczw6qg59n5w98aw8848cp"; + rev = "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785"; + sha256 = "088yi9z0wj2ackg3hh5zm66yg31b2c5rc2ss24idx2jkfhqv908c"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2804,24 +2828,24 @@ final: prev: csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; - version = "2024-06-10"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "csharpls-extended-lsp.nvim"; - rev = "5a474b06743bb20a90191994457f5e62f444976b"; - sha256 = "0h98968hhd6zs3j6kpsycvgcvwkfp6bffr5114yr9i9j6s0hxcs9"; + rev = "15f885e1a92cc8abd3ba28c5984d9e5920f1603c"; + sha256 = "1xjvpzsifh6k9vvkrfgynngafcjg8nln1r3480bbl7sd1dmwm9lq"; }; meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; }; csv-vim = buildVimPlugin { pname = "csv.vim"; - version = "2024-06-09"; + version = "2024-08-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "4d5255829afe3b6badb0c8a040116704c0d3213c"; - sha256 = "1zkiv887rajmidl8jrk2mz6qmdq1378ivklwam6hxfa027wwigi2"; + rev = "bddfcbadd788ab11eb3dbba4550a38a412fe3705"; + sha256 = "127kzcxxazmpaw5qni7nqh3n9q1qcnnv0svlpp9ad4wizpqvz8k8"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -2864,36 +2888,36 @@ final: prev: ctrlp-vim = buildVimPlugin { pname = "ctrlp.vim"; - version = "2023-07-16"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "7c972cb19c8544c681ca345c64ec39e04f4651cc"; - sha256 = "15li2j26xxa90z6ci675whljym2sc6br6jxs2x4in5m1gv3qj36x"; + rev = "31be4c36b713a9637c7b530ee52127000a05ea39"; + sha256 = "19jz2vbj4m95w4zdgbmx2c5prmflz3wpg3rf9glcfwi2j5zz1ynx"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-08-03"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "59feb56373c368c3d865fb8fc744e7484250a30f"; - sha256 = "14svzd0kpfycfbnksiizjsl6v150cl4v83010jlfckylcg75h63f"; + rev = "57fc3af9a8adcf1655fa4e70164bddd2ed898f60"; + sha256 = "1dq7n30h1qqyipgickpcjwc4jzixdhb8bqsqpp16maq2rnjwd9xr"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; darkearth-nvim = buildVimPlugin { pname = "darkearth-nvim"; - version = "2024-07-19"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "ptdewey"; repo = "darkearth-nvim"; - rev = "d53cc2384d0a84889bd44361cee33019bac02c58"; - sha256 = "0m04m4mi8f7pzsx9d92xy20b4yw10gyqk4gmxdlr46y6byfwwlyj"; + rev = "14369f828f4b09ee89b18bfa3f58b02720e8e20a"; + sha256 = "0wccpw7hssb4nb28pcnl5565g4s8s24ibc5r9wv1byygxn80gwha"; }; meta.homepage = "https://github.com/ptdewey/darkearth-nvim/"; }; @@ -2934,26 +2958,98 @@ final: prev: meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; + ddc-filter-matcher_head = buildVimPlugin { + pname = "ddc-filter-matcher_head"; + version = "2024-09-03"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-filter-matcher_head"; + rev = "2be49f0c547fc224f70bd4a0b354b1c1dd9c9eac"; + sha256 = "0liglv3rlag29bivsx2m5m6xnqxc6d7z5ar88zyqmrwrzs20f83h"; + }; + meta.homepage = "https://github.com/Shougo/ddc-filter-matcher_head/"; + }; + + ddc-filter-sorter_rank = buildVimPlugin { + pname = "ddc-filter-sorter_rank"; + version = "2024-09-24"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-filter-sorter_rank"; + rev = "98d1beaa3a94c7a1198c1d6b0440bd9bde7be212"; + sha256 = "18y3bkifvww8g9jx650mazxjvdbng6264x39wlz8lqdmxv8k95ry"; + }; + meta.homepage = "https://github.com/Shougo/ddc-filter-sorter_rank/"; + }; + + ddc-source-lsp = buildVimPlugin { + pname = "ddc-source-lsp"; + version = "2024-09-15"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-source-lsp"; + rev = "23b69013f2948c80b3938165a0cb414f58e26ada"; + sha256 = "0h5f3i5v647ah1bxcwx6ap18qhb6b36jwi2mk89clnww6anaghh7"; + }; + meta.homepage = "https://github.com/Shougo/ddc-source-lsp/"; + }; + + ddc-ui-native = buildVimPlugin { + pname = "ddc-ui-native"; + version = "2024-09-03"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-ui-native"; + rev = "7169980a4beaa672b8e2c5fe38da542e37a16dc1"; + sha256 = "0yin7n0060f9zcahf3dkq9nfvsgznvbqhqf971r3xnbc9cl83gfa"; + }; + meta.homepage = "https://github.com/Shougo/ddc-ui-native/"; + }; + + ddc-ui-pum = buildVimPlugin { + pname = "ddc-ui-pum"; + version = "2024-09-03"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-ui-pum"; + rev = "7e568274b3c22ca8d1742ddec43ea3a63d6ab7e9"; + sha256 = "1h9q23pyha6mzllcd3pk9025gb35y0gxnwrj9g07hsxp8mics2jj"; + }; + meta.homepage = "https://github.com/Shougo/ddc-ui-pum/"; + }; + + ddc-vim = buildVimPlugin { + pname = "ddc.vim"; + version = "2024-09-25"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc.vim"; + rev = "29bdd147e0241e0b1f11fc51c990d6302f19155d"; + sha256 = "1ml83vgsahzlmniv3232fv54mfrc433qvxlpl1bkxvis24spq1gf"; + }; + meta.homepage = "https://github.com/Shougo/ddc.vim/"; + }; + debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-07-28"; + version = "2024-08-30"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "07b3b4fd4b807c77b65f57d3d6a484a74a76bb00"; - sha256 = "0j8yv53595m05725qlal4h3j28ld6g870ra0bkrrbar4a6nq2w30"; + rev = "6de2df56b505aaea35cb16d09a6bc208eebeeabe"; + sha256 = "05ybwnijrirkg4fi3fsdb115s7jgh9x74hwnlfvg6r3mxkqx149x"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; deepwhite-nvim = buildVimPlugin { pname = "deepwhite.nvim"; - version = "2024-05-22"; + version = "2024-09-30"; src = fetchFromGitHub { owner = "Verf"; repo = "deepwhite.nvim"; - rev = "f1db7888f0a7cf84d6d802c17c074bccca0a72a5"; - sha256 = "1zjs2h6kln346sw2p7msrqv6h451i8b4n7kbmdjncvxmf8b9jw1l"; + rev = "ccad56bb5eb7d29258980cfc0a716eb87bcad69e"; + sha256 = "0xdb33iga8zw7zwvpzdc3fqbw1zkgc1vy71kri78ja2d2m45agfy"; }; meta.homepage = "https://github.com/Verf/deepwhite.nvim/"; }; @@ -2996,12 +3092,12 @@ final: prev: delimitMate = buildVimPlugin { pname = "delimitMate"; - version = "2020-12-14"; + version = "2024-08-06"; src = fetchFromGitHub { owner = "Raimondi"; repo = "delimitMate"; - rev = "537a1da0fa5eeb88640425c37e545af933c56e1b"; - sha256 = "0vjs11bx5zp6xqny5fd3lhqqvqaz6xjgncyga7hb0x5v6zng7gaj"; + rev = "becbd2d353a2366171852387288ebb4b33a02487"; + sha256 = "0kyxfkb6mkxy3skip6lzgrczwxl5p749n3rrvdr6psvyj3732zmm"; }; meta.homepage = "https://github.com/Raimondi/delimitMate/"; }; @@ -3044,24 +3140,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-08-04"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "fcc579be1f11d24b56d4d0180bd6ca8a8b919cdb"; - sha256 = "0ps0ki7k3354dj6zspjmf8390jymp9949nr66fzp7cwvmyqvn5f3"; + rev = "08146a5ba9b0d79ddba46af5f6b3bff2260c4441"; + sha256 = "167h2rs9p87sgnghylzgfs4dwrd8nh6arjlrkkfnyvxfvcqhn65y"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-07-31"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "0289c480eda61e53665e1765d7a0580e937a8ace"; - sha256 = "0ph1v14y6fnp3mskqhr3c58hfhbp0xwdhdnq1aifavq6bkqv791b"; + rev = "e0123ab93325e20a0bdc1105d9879fd2afa6c0ee"; + sha256 = "0wjzr537lx6xydlfnhan3psaqhimzld3130mmcwqnvhb8grm8sps"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3332,6 +3428,18 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; + diagram-nvim = buildVimPlugin { + pname = "diagram.nvim"; + version = "2024-09-22"; + src = fetchFromGitHub { + owner = "3rd"; + repo = "diagram.nvim"; + rev = "7e86bc292982db1a77ffb2a85912199476ea2712"; + sha256 = "1axcm67ggmrvipqdwhg3vqsa7nwfhx6s1g7xfkzymxichl6n1dm4"; + }; + meta.homepage = "https://github.com/3rd/diagram.nvim/"; + }; + dial-nvim = buildVimPlugin { pname = "dial.nvim"; version = "2024-07-15"; @@ -3406,12 +3514,12 @@ final: prev: doom-one-nvim = buildVimPlugin { pname = "doom-one.nvim"; - version = "2024-03-07"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "NTBBloodbath"; repo = "doom-one.nvim"; - rev = "76595eec15896a5da7f4e39ceeded6ffb0f4dc38"; - sha256 = "0ir882521yc9ir9n8kqpra9nyc232f4gnsywvzjkbm98qdrpjvy2"; + rev = "2d15798d1eccdaf12c2cb7dda571c5b0ae65a257"; + sha256 = "1p6cn0m47l367i0qv94rgcx66y0p7sf7nnzk80qdasvyqij5rjg1"; }; meta.homepage = "https://github.com/NTBBloodbath/doom-one.nvim/"; }; @@ -3430,28 +3538,40 @@ final: prev: dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2024-06-19"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "6741f1062d3dc6e4755367a7e9b347b553623f04"; - sha256 = "0mwg7z7gns6gw3b6iq2xs0hynn846k7r4q4fzqba8ky8bzzh8mrf"; + rev = "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2"; + sha256 = "04zjfisknbdaaydv9qhfr2lw53rgb02irar13br82ji81j2dilhj"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-07-25"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36"; - sha256 = "0awd7qjnx6gnvisjagsm25fg5wl5kfzcxiqf2jvfs8i550rd54rk"; + rev = "669e325489202ae4da5a951314bbf8dbb20e7cff"; + sha256 = "056iyj4l3rjb6w5vg0h8w7mn930dj74fknra1282xdiz5qf70myx"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; + earthly-vim = buildVimPlugin { + pname = "earthly.vim"; + version = "2024-04-02"; + src = fetchFromGitHub { + owner = "earthly"; + repo = "earthly.vim"; + rev = "cb0440a357a09fb9234ece56a6b09e04d25c1b1d"; + sha256 = "038g9sjik2jn5la06k7i5xfnzc28faibskn2fikgrxwlx240c8wv"; + }; + meta.homepage = "https://github.com/earthly/earthly.vim/"; + }; + echodoc-vim = buildVimPlugin { pname = "echodoc.vim"; version = "2022-11-27"; @@ -3466,12 +3586,12 @@ final: prev: edge = buildVimPlugin { pname = "edge"; - version = "2024-07-13"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "2de1aede94569f643de438391f6c8b1712038d35"; - sha256 = "0mm428spxbpknzf9s6r3sjh3xj13b4j0ymxg7sm9c9f9jqa3zdv9"; + rev = "31a1bfeb5ec90e7016e711d744669d2ed0fe94be"; + sha256 = "0js727inl50mnmbm4cm17kc2qz34rrgjxc2dkw5dpvnx57cgcfxm"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3490,12 +3610,12 @@ final: prev: edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2024-07-22"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "ebb77fde6f5cb2745431c6c0fe57024f66471728"; - sha256 = "1psavlldajgfvwx0jjhwdilccrhz38p880jsrddmrmfx9yq3yl5s"; + rev = "7e8dedc39abebe40c289b8012cc89b11c69aa7a0"; + sha256 = "0f95wadg6dgkaj25vyq7nrzmpbkbmw9q38h3wrbippylw41jbzr8"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3527,12 +3647,12 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2024-07-31"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "fe560e3c6c878a682f437d8adff34f5f8a53876d"; - sha256 = "1zmsw26jn1q9a5bbpzhg3di483qsy2dj2gvwcmwgaks5dp6p3p60"; + rev = "8474cdc5a8fc21091828487c3f7781d0b19c66fb"; + sha256 = "1b57l8b5m19p8bf5an67z595zcz9adandz5g4v0yj4b3kbw2azc3"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -3575,12 +3695,12 @@ final: prev: emmet-vim = buildVimPlugin { pname = "emmet-vim"; - version = "2024-06-14"; + version = "2024-08-10"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "3fb2f63799e1922f7647ed9ff3b32154031a76ee"; - sha256 = "03rlfwfnghqp6bjnpi2mb4f0ki7fyj2im718f51mpfv6wr5c5gac"; + rev = "6c511a8d7d2863066f32e25543e2bb99d505172c"; + sha256 = "11mmk70xk5jlbbc1mpga7rxpjnhyjdz534yr41yndzvkq1gp72lb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mattn/emmet-vim/"; @@ -3624,12 +3744,12 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2024-07-13"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "b49ba81e79b20d2b47bb71e98fa984bae90731be"; - sha256 = "11wvr3vrz45y2d1v7h2jm7bhbbkjjx4jzjc2qgsgcvs3m68fiyrr"; + rev = "e5b9e2fb676a9ded3e86ae51924f7962fa4fb0ac"; + sha256 = "0ifc74d090wagwkanzagp3zs2bcr0cn0hag9rkcsyv0v7jbdlvh6"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3648,12 +3768,12 @@ final: prev: eyeliner-nvim = buildVimPlugin { pname = "eyeliner.nvim"; - version = "2024-08-05"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "jinh0"; repo = "eyeliner.nvim"; - rev = "2ee9e64d4c8133da1131edf0e64641e32dd16396"; - sha256 = "057hkbd5ab1xm2x47b0wvd4qafwinlwhwixqbl6dgdnhbi8my6d0"; + rev = "8f197eb30cecdf4c2cc9988a5eecc6bc34c0c7d6"; + sha256 = "09rsmbgj0pb2v3r26y6nnkxy6h92kyasyi2nfik7yxs1kfhi7qx8"; }; meta.homepage = "https://github.com/jinh0/eyeliner.nvim/"; }; @@ -3792,12 +3912,12 @@ final: prev: firenvim = buildVimPlugin { pname = "firenvim"; - version = "2024-08-04"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "bb70728c13c305ff35193586d5f6ce68668af063"; - sha256 = "0vfghlqaj9hy5q4hcjvyksqb45dfyvwmlz3ns63jmwn25hbzs9h3"; + rev = "64f9389b88c8b0c7667d45c171a5f25c42d852fb"; + sha256 = "11c5fxpnmfqan5rjwzljz23n47g4iik4rphsknb05hycl4baapfs"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3853,12 +3973,12 @@ final: prev: flit-nvim = buildVimPlugin { pname = "flit.nvim"; - version = "2024-06-18"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "a9be4e76c30a128f1e51af448c8321bf8366bcd4"; - sha256 = "0fx2jrnfmr5bl537ha02w3wmkmx89n938h2a4vgc2771kwpb1cy5"; + rev = "1ef72de6a02458d31b10039372c8a15ab8989e0d"; + sha256 = "04v1idfwz5lh7hz456591bl3841jr7kcspf62c7krbhvz5vmmfcl"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3913,14 +4033,14 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-06-25"; + version = "2024-09-26"; src = fetchFromGitHub { - owner = "akinsho"; + owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "5aa227fa083fd740184b55b5220dfabc24a25cc7"; - sha256 = "0ga9ipycmklxcbqz8pnan1sli49qwc8wx034drmrvfpbriw3bc73"; + rev = "ce18f5da5f9c458cd26eef5c3accb0c37b2263c2"; + sha256 = "17w7hz2nxwq57k25canbfy11i6fy8vpf435jbd8fdq578a1jcwmj"; }; - meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; + meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; }; fold-preview-nvim = buildVimPlugin { @@ -3937,12 +4057,12 @@ final: prev: formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; - version = "2024-03-18"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "ad246d34ce7a32f752071ed81b09b94e6b127fad"; - sha256 = "0qjcpxm0q9667wi0qm1bh4pyi1jyp7s5ns0p3arcknfgygr9mlm4"; + rev = "73c1968c8da9fb635485cc6064b4ff2af9bc4452"; + sha256 = "12z0fqhi7ciqdnncwyznmddgjgwkfm3l4sfhyirqarynn4qhp69f"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -3973,12 +4093,12 @@ final: prev: friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-07-15"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4"; - sha256 = "1jkm5hxgpa0l6qmr0mspykcndl4nh50lk13q4b7rv3byfryv40ck"; + rev = "00ba9dd3df89509f95437b8d595553707c46d5ea"; + sha256 = "0nc6pflj81qldg4yjywzww4md0315kdj0jv8sbcfi8m7kdbjwfy9"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -4081,24 +4201,24 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-08-03"; + version = "2024-09-30"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "73bdec9ac5da578376bdc5a705ea80a19baa4942"; - sha256 = "1b4izbp8vc2mfa8qahlkna15j66dmsmv7r7g8y3q656hgnc2lwig"; + rev = "d76cc35a2945beb4d916050a8ad34b7daf1b4054"; + sha256 = "0yb43z20hwqg2q3k7xmbnl2r2mj50ng6f61dq9c7blxpcgp6l5rf"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2024-08-01"; + version = "2024-08-28"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "6f28c8c7bb551161a0315a76488522204f39c1f4"; - sha256 = "1dbinqfsdi7sqbdb39cis74xk44vc51j3gzqwjcms9dkwbh8sbcy"; + rev = "c5ce7908ee86af7d4090d2007086444afb6ec1c9"; + sha256 = "1vllxqnk8qvbyzqplh9ms7rpk36kwj2mc35r868rkjgg8z4mkbc3"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -4163,50 +4283,38 @@ final: prev: meta.homepage = "https://github.com/eagletmt/ghcmod-vim/"; }; - gina-vim = buildVimPlugin { - pname = "gina.vim"; - version = "2022-03-30"; - src = fetchFromGitHub { - owner = "lambdalisue"; - repo = "vim-gina"; - rev = "ff6c2ddeca98f886b57fb42283c12e167d6ab575"; - sha256 = "09jlnpix2dy6kggiz96mrm5l1f9x1gl5afpdmfrxgkighn2rwpzq"; - }; - meta.homepage = "https://github.com/lambdalisue/vim-gina/"; - }; - git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2024-07-28"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "50543e3993f4b996eea01ff5ccc8fe2a354c5388"; - sha256 = "1bn45k9w3g93srmr7dwymq90av5zx1zr21kki7fq3xpc5c9vmrwf"; + rev = "2883a7460f611c2705b23f12d58d398d5ce6ec00"; + sha256 = "0km0wcwd8jlv5lbvh11kdj58kq55s1x3k917vyi2glhf379fcp4q"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; git-conflict-nvim = buildVimPlugin { pname = "git-conflict.nvim"; - version = "2024-06-26"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "45cde6f0acf26d0e4b64acfa45349dd1da01e577"; - sha256 = "10gsqny5wbqyz7grvnn4c02wib06b4594rffa8bmdydvg09fb9j9"; + rev = "ed1ca6dfd60bf609714f791cfa63aee33aef64ed"; + sha256 = "1qybpjynbmw341asjmc93mkc2k4jp054jh0zq620vc0vplhhx2wz"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; git-messenger-vim = buildVimPlugin { pname = "git-messenger.vim"; - version = "2022-08-30"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "8a61bdfa351d4df9a9118ee1d3f45edbed617072"; - sha256 = "0p4pj11sxl3bb2dqsnxwrpn0pf76df1r98wwj9lhjvy7514wc2a8"; + rev = "edc603d4cda7894a743e383e16c638e206d03148"; + sha256 = "0b9wkjxlc2d91wrjhqkpph9mcix3ndpqy3bdr1xajxnjz9lsy22a"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -4273,12 +4381,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-08-04"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "58bd9e98d8e3c5a1c98af312e85247ee1afd3ed2"; - sha256 = "0yx3vs0fc0qlgy9f2dndbaxpaw0izja5nxnv3zdwkn7nwknxnmfa"; + rev = "863903631e676b33e8be2acb17512fdc1b80b4fb"; + sha256 = "15mp1yh989njsj6fmklr4vxgzkbj4lmwzrgjqayqdf687vpkjrm3"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4297,12 +4405,12 @@ final: prev: glance-nvim = buildVimPlugin { pname = "glance.nvim"; - version = "2024-03-31"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "51059bcf21016387b6233c89eed220cf47fca752"; - sha256 = "189si3pw3cri28lfkfs7p79wrkrnm043shx8k8frirpgsjz9slv6"; + rev = "cdf1ec8136cfbdf73edbe1163097223c763a84b7"; + sha256 = "0x2aiiy5h3wbg42gw6ahn1070ci6hzi6dv9g2ldk8h7xgbk1dc42"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -4333,12 +4441,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-07-31"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "e66c3240d26936428cd0f320dc5ffa1eb01538b8"; - sha256 = "1vgzi24a518dn1x2lp4fysfdy62nj0rykl3s5iww75ckfssvxlic"; + rev = "6d908ccc391fb500c45e4f32d73a1965567d28bc"; + sha256 = "1qfx48axgyfya8vzyx9njma2684zlik259xfmd2pl4rf75633pjv"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4429,12 +4537,12 @@ final: prev: grapple-nvim = buildVimPlugin { pname = "grapple.nvim"; - version = "2024-05-18"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "cbochs"; repo = "grapple.nvim"; - rev = "7aedc261b05a6c030397c4bc26416efbe746ebf1"; - sha256 = "0cc5qxgm4v2z5p2q3famwi3k7qw8x11mzlhryd95g32p90f8m5ba"; + rev = "b41ddfc1c39f87f3d1799b99c2f0f1daa524c5f7"; + sha256 = "0x9pd0rvckfi1485h1qy5h53p10krhhkvhgdm29wv2fhrpkv8ghg"; }; meta.homepage = "https://github.com/cbochs/grapple.nvim/"; }; @@ -4453,12 +4561,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2024-08-04"; + version = "2024-09-30"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "3e491ca05c50f87d02543adb010aed9dfb1e12c1"; - sha256 = "0vl0c5dl2fg90mly0qpranf9a22iisgswx856rjzlz0jan6pxsvr"; + rev = "b7c2b28e49d55ff71cd9bb3ad19a2021316510d8"; + sha256 = "0cxvza1f45h07zms30wsnx8m5mklpfhgb9x7rw1v8jcvlsgx2dm8"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; }; @@ -4501,24 +4609,24 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2024-07-13"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "91f8170a31ae6e31670629cd339df297dbd5fd5f"; - sha256 = "0xpi8h8p19dlfpq3a5xfhwpcv6z5a7cdpc2ml1yxc7d0hk1k6b7x"; + rev = "25425c4feea270951c33de67c595ab3bbe8b0e7e"; + sha256 = "17238xkpidzibpymkqdxm1l41mdhhj5j9sf6p33gkwjrkfc8jli4"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-material-nvim = buildVimPlugin { pname = "gruvbox-material.nvim"; - version = "2024-08-05"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "f4z3r"; repo = "gruvbox-material.nvim"; - rev = "e9f1616bc00a994e7e135297876df1143bf1efc6"; - sha256 = "1qbdbfpzrd2pc2d1j0yklhl7d9907wx2w54vwvd2cqwa91hm7dhm"; + rev = "4f48b72656c2c3eaefd3764d5c8a19bff0c6ab19"; + sha256 = "0bzmhv5m7rn1zpv7pn8mxwk4jmvjfpmbia077j2bzqciyxphl7nf"; }; meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/"; }; @@ -4537,24 +4645,24 @@ final: prev: guard-collection = buildVimPlugin { pname = "guard-collection"; - version = "2024-06-26"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard-collection"; - rev = "de6587e99371aeb92cfda3415b6a696c1f55d397"; - sha256 = "0fqynfal7vk55mh13p5v5gh3fhpf26a7kajyrl79hdsr9shv5s4g"; + rev = "fe25ff07fa451112b0e47825e98e7b6b8b771680"; + sha256 = "1s0pdarlf6vpbyhxzjwn2yzh6bp44lsr05nw9s2684lwnr5g46bg"; }; meta.homepage = "https://github.com/nvimdev/guard-collection/"; }; guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2024-07-30"; + version = "2024-08-09"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "14a8e35993c4513da1c93719234de09e7d3a91a2"; - sha256 = "1ycvq5yp08ald5g16vdbyfqlx9kscl5syl2hwp6czn6644cdgasq"; + rev = "8b34592089f56502a7757fd563f2743a446f6334"; + sha256 = "1z49ykazvm1kf6dk5d0agh0iliykdwqzz9ndpy4l7aya4gilmmn2"; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; }; @@ -4597,24 +4705,24 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-07-28"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "86363dea69e00cbc48f02579cb6108b283876548"; - sha256 = "0gdhm1acq83r6b0jylxlwa7ifvxa98ywl27z7bhad0gb11rnmpma"; + rev = "c096f5e6c8501b3b695e7e36642005f4de3a9a8e"; + sha256 = "0b07i9iawn3386kv04zv7q52ibkx8ag4w4aymd14gz313d4mmwwy"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2024-07-26"; + version = "2024-08-20"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "91c6be1a54fa057002e21ae209a49436bd215355"; - sha256 = "0i3ih3i162v6lkm9l3406j5322vyjilvhl1qvpc9d67ajs355cm4"; + rev = "6513bf42cd9261669d1ee41ff8b4065dfdc53a09"; + sha256 = "0v522mzz7cp62hjf9bqnfrpnadapywb56r5d888kjvc4gcy9kzrv"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4632,12 +4740,12 @@ final: prev: harpoon = buildVimPlugin { pname = "harpoon"; - version = "2023-12-26"; + version = "2024-08-29"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "ccae1b9bec717ae284906b0bf83d720e59d12b91"; - sha256 = "10ldyz368j3kh7h7r877wbsa2y88v191415ic4slr7ldzfrar2j8"; + rev = "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3"; + sha256 = "0q7lcww2y1x8s6r5g6wbdlnv3dvc8pj1g7wq6yxvl5fsi40wvhwj"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -4656,12 +4764,12 @@ final: prev: haskell-snippets-nvim = buildVimPlugin { pname = "haskell-snippets.nvim"; - version = "2024-06-24"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "e430927cb222718e14ac32116011b5e3df39ab51"; - sha256 = "1drsis1521x31r389j9d2gxcclbc9cfg6f0w3qgbz7yd4cyxmxnm"; + rev = "efc74b75345151c8348a16f3e9f508b5bb7c3c92"; + sha256 = "1w347krahhqwycg04f58c3j1iba8fa61ih9jyy7rniksmfm01dz0"; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; }; @@ -4704,36 +4812,36 @@ final: prev: headlines-nvim = buildVimPlugin { pname = "headlines.nvim"; - version = "2024-02-29"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "headlines.nvim"; - rev = "618ef1b2502c565c82254ef7d5b04402194d9ce3"; - sha256 = "1fq7f4i8pskj592lr0620j5chgczhlag6zph49zpm9zziqyak5ak"; + rev = "bf17c96a836ea27c0a7a2650ba385a7783ed322e"; + sha256 = "1y3hffh9kb5x35a0bjggjjgyhna14nvx5rzghj1hx0yrf9b1hrid"; }; meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/"; }; heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; - version = "2024-05-21"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "0d797435e54645a5f98bad7ad6046aac1ef95c1e"; - sha256 = "0payyx0j0s4wgk5xvczdnjqkj5nymlhw4f7hcw3sl9m334vnxshb"; + rev = "7a79753c1a42c3f52e89a6c42429e7f871e560cd"; + sha256 = "065llk3pbmyrgapa2k835rcf2k7s7b8qfx94jcbqg8v30r6s6ah3"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; helpview-nvim = buildVimPlugin { pname = "helpview.nvim"; - version = "2024-08-12"; + version = "2024-08-26"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "helpview.nvim"; - rev = "49398d628d74283c5a389a6ced40bd8d2daaf56c"; - sha256 = "0b1z3gz1jpqzf71kjpkw9q3fxbjcdykxi65an6npci0acia49ga2"; + rev = "857aec1dab331252910da158ab6cbfbc65239c71"; + sha256 = "1n3n6zy61iplgffny2fylilvb7sdijfr83bqhchyi2f0hfmjcr8x"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/helpview.nvim/"; @@ -4741,12 +4849,12 @@ final: prev: hex-nvim = buildVimPlugin { pname = "hex.nvim"; - version = "2024-03-03"; + version = "2024-09-03"; src = fetchFromGitHub { owner = "RaafatTurki"; repo = "hex.nvim"; - rev = "cbffd2ce4b8be089360e3c95d5909cd511d8840c"; - sha256 = "0dvhgdab3f2w7irh164qglj44h4hqba15yq223ckhka7l9r8nggq"; + rev = "d0f553dcd2c08d226026d769119b2eb6b09b8dfd"; + sha256 = "0dqv23i08ng4g7mm35g484p39i4b3vr6xnz3m7ij7n3d6bpfc8c3"; }; meta.homepage = "https://github.com/RaafatTurki/hex.nvim/"; }; @@ -4765,25 +4873,26 @@ final: prev: highlight-undo-nvim = buildVimPlugin { pname = "highlight-undo.nvim"; - version = "2024-05-06"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "tzachar"; repo = "highlight-undo.nvim"; - rev = "1ea1c79372d7d93c88fd97543880927b7635e3d2"; - sha256 = "1lzml5yj3ak0rc4r2fmb1zpb9a01i5j6yk58m0qn960l2x5kav68"; + rev = "9cf8f052e86a5a323b16d17bad12f7cb73b248eb"; + sha256 = "1rkmp5v7862yg9dxxpy2jizf39fpas0ig00vxpidkswa7wqbrkgc"; }; meta.homepage = "https://github.com/tzachar/highlight-undo.nvim/"; }; himalaya-vim = buildVimPlugin { pname = "himalaya-vim"; - version = "2024-05-27"; - src = fetchgit { - url = "https://git.sr.ht/~soywod/himalaya-vim"; - rev = "cea041c927a04a841aea53abcedd4a0d153d4ca8"; - sha256 = "0yrilhvqklfbfknkdskywf95mfhbr9rfjs2gmppnzgfs7fg6jn63"; + version = "2024-09-10"; + src = fetchFromGitHub { + owner = "pimalaya"; + repo = "himalaya-vim"; + rev = "f25c003e8fe532348b4080bf8d738cfa1bbf1f5f"; + sha256 = "0dv6mxwq6yv6if1lfb45j49rl6bghyr1hn1xfbz9g9cbb7fna2x1"; }; - meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; + meta.homepage = "https://github.com/pimalaya/himalaya-vim/"; }; hlint-refactor-vim = buildVimPlugin { @@ -4800,12 +4909,12 @@ final: prev: hmts-nvim = buildVimPlugin { pname = "hmts.nvim"; - version = "2024-05-07"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "calops"; repo = "hmts.nvim"; - rev = "19a91816c123173a4551a6a04f2882338f20db1d"; - sha256 = "1qw3b7zsp467bg8npingba5jsiiywyr0mgjhk8khvjnb1hjyld5w"; + rev = "1ecb68b9f89abdb23d2754f9d69f90eab2d33eaa"; + sha256 = "15s0vxihhcqapvdr8y9h41h1vp0kjhfi4c9gxln980jb1qpnalph"; }; meta.homepage = "https://github.com/calops/hmts.nvim/"; }; @@ -4836,24 +4945,24 @@ final: prev: hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2024-05-26"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "smoka7"; repo = "hop.nvim"; - rev = "036462a345792279c58f2f6445756efab706f04a"; - sha256 = "0das4rci4p3zfmjxkm8rax5pwp81bvssz0cnyzgjqjbzxfijd6px"; + rev = "8f51ef02700bb3cdcce94e92eff16170a6343c4f"; + sha256 = "07py0rhr6wx1nbq8i20a71iv0arp7ym75ffyb3d3n5icmf53inl4"; }; meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2024-07-03"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "5462d3eb5c191ab380ca911e1e931836d27f6a79"; - sha256 = "1dxdy80447ncjrj74rvrpxwx44ygbsxblv27q3lzrk6ycbjl51hs"; + rev = "8ffe314cc7d762983dc3690d8dab30342483548a"; + sha256 = "1azkh04zs6g6n0fpxb6qydk45iqllkngvxn2xkyxbjyk3zb5jls0"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4884,12 +4993,12 @@ final: prev: hydra-nvim = buildVimPlugin { pname = "hydra.nvim"; - version = "2024-03-14"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "nvimtools"; repo = "hydra.nvim"; - rev = "8578056a2226ed49fc608167edc143a87f75d809"; - sha256 = "sha256-Qxp2FigXlupAw/ZwZRVJ+hRKzVRtupV6L4a6jOslwI0="; + rev = "7f5341643107d05a8d7d4fdea00b29af28517380"; + sha256 = "0f9vxv0lxzd4qpikdjinh62vfxg55dm0drcm2ms17igsfjn4myd0"; }; meta.homepage = "https://github.com/nvimtools/hydra.nvim/"; }; @@ -4956,24 +5065,24 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-08-02"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "6fb2b84a739d92b781bba5f59f2678ea047332a9"; - sha256 = "1x5c2fmp3n7xvxq76r1na8zmbz0y92bsi0vnkvixa1wgirra5nym"; + rev = "c4e826027e0428e3a5d7a95700be7a3ce49c2587"; + sha256 = "0qw3jipi1fqklxgdi3k4pfb89f6wg6knbgd7qysn5kx2qkvpjy5d"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; img-clip-nvim = buildVimPlugin { pname = "img-clip.nvim"; - version = "2024-06-05"; + version = "2024-08-26"; src = fetchFromGitHub { owner = "HakonHarnes"; repo = "img-clip.nvim"; - rev = "1924e20ab19afec9779109d083b6e5f8bee8fb17"; - sha256 = "0q4bv6bca8bhkc98gc4lmlp3b2nrh6bj7yyb99bk3lnccr0jmj6g"; + rev = "28a32d811d69042f4fa5c3d5fa35571df2bc1623"; + sha256 = "0yi94bsr3yja619lrh9npsqrzvbk2207j3wnzdvidbbb1nix2dsd"; }; meta.homepage = "https://github.com/HakonHarnes/img-clip.nvim/"; }; @@ -5052,12 +5161,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2024-06-28"; + version = "2024-09-03"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "65e20ab94a26d0e14acac5049b8641336819dfc7"; - sha256 = "14v9mglm2zykylga0lzh9w1vcmxixya7xg2k4z4m6f4a3l21farx"; + rev = "18603eb949eba08300799f64027af11ef922283f"; + sha256 = "0jai4zh4xf9h981419k5k7dvvwkcippcyc6arfv06pqjy2b6xr77"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -5245,12 +5354,13 @@ final: prev: jinja-vim = buildVimPlugin { pname = "jinja.vim"; - version = "2024-06-24"; + version = "2024-09-09"; src = fetchFromGitHub { owner = "HiPhish"; repo = "jinja.vim"; - rev = "ca97dafc82c012b3a9005a12a673d2cfa854376d"; - sha256 = "14g85r90860a4n7ggh29s1k6brgcyycm4j1ll4y7h872v8d5265p"; + rev = "d112541c062122969c6c0bc3df7e3cab3595c253"; + sha256 = "0xcvzjnhgwjw42mm0j5ikw2yqsm4w7ibgmkfxf61fn23npzjalf7"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/HiPhish/jinja.vim/"; }; @@ -5318,12 +5428,12 @@ final: prev: kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2024-07-03"; + version = "2024-08-27"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "e5f7b8a804360f0a48e40d0083a97193ee4fcc87"; - sha256 = "1066495w73a11kdpm8iah3k0pjf766ylf21jk8gjid73byl2lz0n"; + rev = "f491b0fe68fffbece7030181073dfe51f45cda81"; + sha256 = "0zfgynkk2jpdkdh30zjazb2i32d2h3iz7xg3v2aviqfg4dcazqjj"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -5388,6 +5498,18 @@ final: prev: meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; + kulala-nvim = buildVimPlugin { + pname = "kulala.nvim"; + version = "2024-09-30"; + src = fetchFromGitHub { + owner = "mistweaverco"; + repo = "kulala.nvim"; + rev = "3b53dbb5677b144f372ecb25cb7841fba0c85a60"; + sha256 = "sha256-Sbeby+N8bmkof8B8BsCWzZzWhot1wjQuRwqABI2/V3M="; + }; + meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; + }; + lalrpop-vim = buildVimPlugin { pname = "lalrpop.vim"; version = "2017-11-22"; @@ -5426,24 +5548,24 @@ final: prev: lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2024-06-26"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "3ce514080931ca6c35036dd9f90da879e9ab3204"; - sha256 = "1jfkvhlr70d8c6m413r74q4qi1kwk9ll5n48scrqk4fvpsgx8777"; + rev = "faedf30d6e858a32e635a9640d10f7b44a878847"; + sha256 = "1mk6klyg6nfpm8dr5fiz6n0drp2mvdqyjyy6n3d5yad58d57d25h"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-07-25"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "077102c5bfc578693f12377846d427f49bc50076"; - sha256 = "0yj0z62cr5ddzdl4ba2ppj1j102qfx1qfbwbh1z84p8x0zn6ppj5"; + rev = "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb"; + sha256 = "0xgc39xir6i0z4i9hm8sp2ldfzza630rz1bk9vwh277v64cvgnq2"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -5462,24 +5584,24 @@ final: prev: lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; - version = "2024-07-08"; + version = "2024-08-10"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "dc56df433bfbf107fee0139e187eb9750878fa84"; - sha256 = "0wvbr14yv4bgb91zns60rcb6r4fl97jdhqsx8flwq3naqj5qayq6"; + rev = "2432b447483f42ff2e18b2d392cb2bb27e495c08"; + sha256 = "0mwx0vdsid6crzwv30wayhw2qszynr6xyrmkbpxik26ghgwcpzb0"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-08-04"; + version = "2024-09-28"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "539a4f5944edb58ed3fbf72416396fd4014fbd3c"; - sha256 = "1qqhg570sbwcfbxaax89r608rgqdvi4jpi96mjlhrwxqmhlgxxvf"; + rev = "c9ea0f9c3857cc7e89e18725595e79cd883ee441"; + sha256 = "12sqq39qfc60fmkjn915a321s0fi5a9p2qniba491qdjxf7qx707"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5522,12 +5644,12 @@ final: prev: legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-08-02"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "c89be94fe96dc5eaba67ad9371263bc1eac75044"; - sha256 = "1mq197p33ywp9cz2h38zx37nmgnqa0azz7c0c2s7n6mjxr6ych8h"; + rev = "4195d2446a925b25d6b8f1d8460a2f0188c04736"; + sha256 = "1zbgjdcfriahdd745d47kibmgcw2fw3lz67acparna93v1qpqygy"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5582,24 +5704,24 @@ final: prev: lh-brackets = buildVimPlugin { pname = "lh-brackets"; - version = "2024-06-23"; + version = "2024-08-29"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "e7852490097ed1bb2ea95fb08fd0fdc4d2a7ef20"; - sha256 = "1gg5hxss85bcsjrfqamiir571c8xqs03rqaiigfhbs7lhp2l7ffd"; + rev = "40af9b67424003a03e8384eab81256bfe535db0b"; + sha256 = "0sbxvmdrhjc85srl98gzn1gwllnjy8q50w5ryj49c94s9l2pj54l"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPlugin { pname = "lh-vim-lib"; - version = "2024-02-28"; + version = "2024-08-18"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "612538b5dede34e1b4e1a152b6b50516ef658ae5"; - sha256 = "05d2n4hq7xfsw88abbi3b60407rxaf04za85zainw2xr2gvw4zsa"; + rev = "db1c7b4261be24a79f62dc22c8061b8bdd9f2333"; + sha256 = "1vfphkvkfydw69hp7rhm7h3nm2na75cq4vrlk8qxxqphxn51g9jr"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -5654,12 +5776,12 @@ final: prev: lightline-vim = buildVimPlugin { pname = "lightline.vim"; - version = "2024-01-13"; + version = "2024-09-28"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "58c97bc21c6f657d3babdd4eefce7593e30e75ce"; - sha256 = "1g6yqaibf6khskhdxd3amcs7azmsb3cvz9nx4bgxrv7r6vb8bjg0"; + rev = "d6a07ea376a4b7372aa59e7ea6a051c9470bb4d0"; + sha256 = "0n7ljlczy70ra12hf6szz2997i46iadjy67lad3avk9ybzzn5fmi"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -5678,12 +5800,12 @@ final: prev: limelight-vim = buildVimPlugin { pname = "limelight.vim"; - version = "2024-04-30"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "junegunn"; repo = "limelight.vim"; - rev = "785c1e17fe90c587ebca88920baa3146cd6e30fa"; - sha256 = "0r97jh94r09a1c2vap7ybdn5kqpm24xwfsl9fxhvfhj6mlf1n2hm"; + rev = "0c8cc7f503a775c505dc9c67f1f5041ab4d5f1fd"; + sha256 = "0qdll4x01912ldlv9ixh5z4zn8fddybc9mv53c8dx2advkglb6cg"; }; meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; @@ -5726,12 +5848,12 @@ final: prev: litee-calltree-nvim = buildVimPlugin { pname = "litee-calltree.nvim"; - version = "2024-04-02"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "3908f52f2e69438cdeca32771d449f8ef3ee3bcc"; - sha256 = "1x1100r11k0g0nkc6a2l1hsjciav5df6k9qv8bxj051wkwawzg0g"; + rev = "89fd050e782328196520f5f1c0be85b25b065779"; + sha256 = "0l8mqz3jwr7mn1ij40vvpw0ng2h3bmahnxwg9v9v0f84wbp3813v"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; @@ -5774,12 +5896,12 @@ final: prev: live-command-nvim = buildVimPlugin { pname = "live-command.nvim"; - version = "2023-06-05"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "smjonas"; repo = "live-command.nvim"; - rev = "d460067d47948725a6f25b20f31ea8bbfdfe4622"; - sha256 = "0l7g7yjx4hz35nnz04k7qpjkd9z1rrp2n047p2k7zifjihiqbf3v"; + rev = "b0723697bf60d89ede953c4a5fedce3157784c15"; + sha256 = "08fmcj5r1l80bi6gqsm8g6px4zfqr9sq4kck89y5rfs99j6janyk"; }; meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; @@ -5810,12 +5932,12 @@ final: prev: lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; - version = "2024-08-05"; + version = "2024-08-29"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "0d1b6e3317ff64719e8e6a4f534eebeddae70582"; - sha256 = "01g3xqn981k20a9qa2jz89vkj55hagzd75avq5zs8c0jzdlm1g2f"; + rev = "47de35b54ec95bb049f52016632394b914d4d9e9"; + sha256 = "1mvdgsbx1qls0iks87k9d7xrz2p06sc1vz8rz8q64s0gvfpc5n67"; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; }; @@ -5905,12 +6027,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2024-06-15"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "a38da0a61c172bb59e34befc12efe48359884793"; - sha256 = "1p6fznwg6pxr39x08lf9qhjkcvfysd58k1as6d4lwibkav7rfkki"; + rev = "fc38521ea4d9ec8dbd4c2819ba8126cea743943b"; + sha256 = "0ag79vvjz1dqyw9358ijdkckr1rqshxkpk5fl0kww1vl3pfwv9jv"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5928,25 +6050,25 @@ final: prev: }; lspkind-nvim = buildVimPlugin { - pname = "lspkind-nvim"; - version = "2024-07-25"; + pname = "lspkind.nvim"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind.nvim"; - rev = "cff4ae321a91ee3473a92ea1a8c637e3a9510aec"; - sha256 = "0l66zyawfjy0r7rhi80skk6x156ybr72jlh4qxk0xd0l2hkbm8nl"; + rev = "59c3f419af48a2ffb2320cea85e44e5a95f71664"; + sha256 = "18wwvclabimlhn8c4l4jp63waarm5vql1qmzg1s6y6lfbq1zss7g"; }; meta.homepage = "https://github.com/onsails/lspkind.nvim/"; }; lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-08-04"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "a751b92b5d765a99fe3a42b9e51c046f81385e15"; - sha256 = "0k112zrw3zjxx9m8pcpmv644vl25sv0mpa4hjx75q76i53yyhz54"; + rev = "e64351d0e6335eadf089aa2b9f17221e54ca10a4"; + sha256 = "0n8jmfg7rg23skdd4qlqyx78acww6ahskd3j6l5k2lvh5jlxjc4r"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5977,24 +6099,24 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2024-07-15"; + version = "2024-08-12"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "544dd1583f9bb27b393f598475c89809c4d5e86b"; - sha256 = "0a7m6g7gzsxzgs4vhsfsznvdx06n6zqjmi9h1z1zbvdcfp5d3l5q"; + rev = "b431d228b7bbcdaea818bdc3e25b8cdbe861f056"; + sha256 = "1q8f0vl60hllxkmmras05cliklzqvi3yrb9rhamrr4cgvsdvnac0"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-08-01"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "7552e6504ee95a9c8cfc6db53e389122ded46cd4"; - sha256 = "12gf4q7nmw0psj8m2hx55a0nlxafzvlabf9g4644ay1p74hj07ij"; + rev = "e808bee352d1a6fcf902ca1a71cee76e60e24071"; + sha256 = "1yf50bwcg94bprbczcki7c1n318m6ar99m8h1yrmn6m0w4cbvf8r"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -6014,12 +6136,12 @@ final: prev: lush-nvim = buildNeovimPlugin { pname = "lush.nvim"; - version = "2024-07-26"; + version = "2024-08-16"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "6a254139d077ad53be7e4f3602c8da0c84447fd9"; - sha256 = "0skbhprgxc8mpny0gc6c97gz9ng65y6kcqv4qr1lnil9lpgnpsw2"; + rev = "45a79ec4acb5af783a6a29673a999ce37f00497e"; + sha256 = "0ac93sdhsi41hpwpshffpkvj5c3kklflsy0pln77743x69g05rcr"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -6110,24 +6232,24 @@ final: prev: marks-nvim = buildVimPlugin { pname = "marks.nvim"; - version = "2024-01-07"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "chentoast"; repo = "marks.nvim"; - rev = "74e8d01b2a2131b6e46354cffc553aa7f81bcf5b"; - sha256 = "0hi4sp39gxj62swm325a5s25qv310wxj9amkdghdqmrg6nlcwyz2"; + rev = "bb25ae3f65f504379e3d08c8a02560b76eaf91e8"; + sha256 = "0hf2w5js47sa67f23pkcgkgz4m1x96fwh460zs95sqk1yn9a2zfm"; }; meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2024-07-31"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "d0ccc97b5c988fb28e5033abdf7b832b9dfaf897"; - sha256 = "0mln2ll82gkw0icswgf6ya5g6ndr4d1cn0lfx06gz00xp0h1fh2p"; + rev = "f16486e49561740f33b6773df43c9bc2c3c34c7b"; + sha256 = "1249agw6vfd2p3d3h5lm2ipyif3mgvmmzgix6mz08pipmvq2spx7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -6135,12 +6257,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-08-04"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "62360f061d45177dda8afc1b0fd1327328540301"; - sha256 = "0q722qxwcsvs6bp5f3hvagsdz71l2ffd5g9yhsjjqy452lqynjai"; + rev = "25c11854aa25558ee6c03432edfa0df0217324be"; + sha256 = "0wqbb6a6p5iq7h47snbcbrh1x7nqf9v959a2zq08pw5b9f7qclal"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -6183,12 +6305,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2024-06-26"; + version = "2024-09-03"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "b5d0ff3ad37ba00cea3dc3dce0b0f555b481c6f4"; - sha256 = "1vlv9n8hy7lcjz3xa48pry9by41pfjv73vyjinyj91bjs7x4ln7p"; + rev = "ac8f02e97e359b7d258c0a00ec0949fe880790ad"; + sha256 = "1yjgl6rbcb90vghs3wq5rifws7n0caq12l3qfqxc7q2c8ap36ym6"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -6231,12 +6353,12 @@ final: prev: melange-nvim = buildVimPlugin { pname = "melange-nvim"; - version = "2024-06-29"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "f626d41b9110e6ab853538d8b939979a0f1adfeb"; - sha256 = "19xak308004015avjarqdrmwwwfkyam72kjav7g7v8pg27rqckzr"; + rev = "706a33f0a883fae9ec00ad648586792248a0575e"; + sha256 = "14jbkr4j4s2kg4b0bp0d2whjrj633dlhglqzg672aiyagcrbw7bm"; }; meta.homepage = "https://github.com/savq/melange-nvim/"; }; @@ -6255,12 +6377,12 @@ final: prev: miasma-nvim = buildVimPlugin { pname = "miasma.nvim"; - version = "2023-10-24"; + version = "2024-08-23"; src = fetchFromGitHub { owner = "xero"; repo = "miasma.nvim"; - rev = "c672feec07d4e77ac485ee58e3432a96ebe51953"; - sha256 = "187d35g6s53rs7zi3p8c4d8sy23qdpzy22i2vmr8apzgc2hirvx7"; + rev = "37818b190e291c75a2d78118dc7dd8d69d311a8c"; + sha256 = "12ng6y9c9a35gr2ak3fhwgxial53ryhkaspvby30kz31vr6p0a9m"; }; meta.homepage = "https://github.com/xero/miasma.nvim/"; }; @@ -6289,18 +6411,510 @@ final: prev: meta.homepage = "https://github.com/hadronized/mind.nvim/"; }; + mini-git = buildVimPlugin { + pname = "mini-git"; + version = "2024-09-07"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini-git"; + rev = "f75ae3855f595e55e1a8a96521ffa01012632b28"; + sha256 = "1d7yy9lbz5ysk5519j25y1gciyq1a2kidzppn7vg0bzwcf6302qg"; + }; + meta.homepage = "https://github.com/echasnovski/mini-git/"; + }; + + mini-ai = buildVimPlugin { + pname = "mini.ai"; + version = "2024-09-28"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.ai"; + rev = "9b9b7cfa38b4871c3e44cfe89cf6d53fd40684d9"; + sha256 = "0l2y5njrgnlcsdazhgkjb02qz2wj4q225n5qa2r88d9nvbjp1b9a"; + }; + meta.homepage = "https://github.com/echasnovski/mini.ai/"; + }; + + mini-align = buildVimPlugin { + pname = "mini.align"; + version = "2024-09-05"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.align"; + rev = "26111a737494bc39576ad67b52bbc2638ca23553"; + sha256 = "1cx3xavcgna5x05mzjc254cv3cwhjckmg1j38vqn4dw9naadb6pb"; + }; + meta.homepage = "https://github.com/echasnovski/mini.align/"; + }; + + mini-animate = buildVimPlugin { + pname = "mini.animate"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.animate"; + rev = "d33ddf0eefee6338bbd95805c4595c1b34e6bfe2"; + sha256 = "1fn5vsz5m3v63gmg1i03zi9qbmlbbjgm24k3j9lmwlin75cnxizh"; + }; + meta.homepage = "https://github.com/echasnovski/mini.animate/"; + }; + + mini-base16 = buildVimPlugin { + pname = "mini.base16"; + version = "2024-09-10"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.base16"; + rev = "aaa564b9c6d34466d542494393ab51efc99b9d0b"; + sha256 = "1sj97196vi3qkfkxpdr4ajd3li42pvzmd1zpcr0ggab05rnpawrq"; + }; + meta.homepage = "https://github.com/echasnovski/mini.base16/"; + }; + + mini-basics = buildVimPlugin { + pname = "mini.basics"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.basics"; + rev = "7d4c6982be471e902c034bea6b3fe348058196d9"; + sha256 = "039jdbjjp713rh0yaa503khwxz6dya28h6arksyj52mfmzajnwrq"; + }; + meta.homepage = "https://github.com/echasnovski/mini.basics/"; + }; + + mini-bracketed = buildVimPlugin { + pname = "mini.bracketed"; + version = "2024-09-27"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.bracketed"; + rev = "daf2bff8172bc84bfb934f765275618f5e7844a8"; + sha256 = "0ijyjb0x5nd5hyal9iy2vzidf14px1jcrsgmw48m47hbkrw37dr6"; + }; + meta.homepage = "https://github.com/echasnovski/mini.bracketed/"; + }; + + mini-bufremove = buildVimPlugin { + pname = "mini.bufremove"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.bufremove"; + rev = "1ee294a97e091d3cf967974df622c0d887890dc2"; + sha256 = "0jhhh2f4zzbixcqbp7540bzgbzgwwipi37knqj1ykpf5py4kp0dm"; + }; + meta.homepage = "https://github.com/echasnovski/mini.bufremove/"; + }; + + mini-clue = buildVimPlugin { + pname = "mini.clue"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.clue"; + rev = "8e329f586a7cfd06085859066a4b60965fc4ecce"; + sha256 = "0s6n4bd5naq50pdyl3ibmk0788823iii6gapqqcnqkvsyi39rp5g"; + }; + meta.homepage = "https://github.com/echasnovski/mini.clue/"; + }; + + mini-colors = buildVimPlugin { + pname = "mini.colors"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.colors"; + rev = "9fa904dd46da5d84028478b9cc689be021732fab"; + sha256 = "1n81am3b3lphq75vs3fwwl14ajk58hqr5znjd4dbcdpr7mz94bzc"; + }; + meta.homepage = "https://github.com/echasnovski/mini.colors/"; + }; + + mini-comment = buildVimPlugin { + pname = "mini.comment"; + version = "2024-09-28"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.comment"; + rev = "a56581c40c19fa26f2b39da72504398de3173c5a"; + sha256 = "1gnhwfdg1wxi008lmyhwmdrwc6hnknqvwqqzzsn16b3sxp84mrpp"; + }; + meta.homepage = "https://github.com/echasnovski/mini.comment/"; + }; + + mini-completion = buildVimPlugin { + pname = "mini.completion"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.completion"; + rev = "2b877876ec7c77973a512083e2aa3f13c61c2abe"; + sha256 = "1ryp0qjb82p93afk5rvsrzv6rajr70z9d32n5wxvm6hz2nryzzx3"; + }; + meta.homepage = "https://github.com/echasnovski/mini.completion/"; + }; + + mini-cursorword = buildVimPlugin { + pname = "mini.cursorword"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.cursorword"; + rev = "7d1b38a17834acbbc4feff8e42aedc4ed0c6ff06"; + sha256 = "0vqr4hkzq13ap6giyyp8asn5g6nnm406piq1a07a5nmkfxiskp9v"; + }; + meta.homepage = "https://github.com/echasnovski/mini.cursorword/"; + }; + + mini-deps = buildVimPlugin { + pname = "mini.deps"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.deps"; + rev = "203dd6d947e3415711c732530a82f9c3f2f046a4"; + sha256 = "1xydh3l41hifwmns6aqnrch545h1hqsq4a7mgk915wzp1g843qfs"; + }; + meta.homepage = "https://github.com/echasnovski/mini.deps/"; + }; + + mini-diff = buildVimPlugin { + pname = "mini.diff"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.diff"; + rev = "24d46798be8a358d38d3adc92c7ebcbb2d6f67e0"; + sha256 = "0hbr36s75aa6qhr0lhsqk6fwswd919ixd0jlrfj6paiynh00331r"; + }; + meta.homepage = "https://github.com/echasnovski/mini.diff/"; + }; + + mini-doc = buildVimPlugin { + pname = "mini.doc"; + version = "2024-08-10"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.doc"; + rev = "bb73a3d1ff390f7e2740027ea2567017099a237c"; + sha256 = "1jsamvgdk6zxaimn9v949gbghf92d0ii8jhn2sjjy7arbl8w0w23"; + }; + meta.homepage = "https://github.com/echasnovski/mini.doc/"; + }; + + mini-extra = buildVimPlugin { + pname = "mini.extra"; + version = "2024-09-28"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.extra"; + rev = "67b38cb3a1b9523c0fae96ced6cdf06e00c1cbee"; + sha256 = "1l5s55sk6y2231rm45kbd6054v1rqlpbg4mc91s2vby97v2mclpz"; + }; + meta.homepage = "https://github.com/echasnovski/mini.extra/"; + }; + + mini-files = buildVimPlugin { + pname = "mini.files"; + version = "2024-09-28"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.files"; + rev = "1b5ada9d3a0df36cfbf7f50a314646c0673b8c87"; + sha256 = "0hjsvp3lhby2qcl88bawykdvy4fplrh9gr81wjkmy47fiq9y2n9r"; + }; + meta.homepage = "https://github.com/echasnovski/mini.files/"; + }; + + mini-fuzzy = buildVimPlugin { + pname = "mini.fuzzy"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.fuzzy"; + rev = "ea9d1380ad925c4d0e890f68dbf830d2b19bae5d"; + sha256 = "10ng6rq4ig0ijvbj2bbm428dg3asf40x9b7dsvndk33ikfrlbazz"; + }; + meta.homepage = "https://github.com/echasnovski/mini.fuzzy/"; + }; + + mini-hipatterns = buildVimPlugin { + pname = "mini.hipatterns"; + version = "2024-09-27"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.hipatterns"; + rev = "797cbdc893cdcc2f0fbc05a23b4dae238a1fb0ae"; + sha256 = "0j4a7c03km0q7wlh0g9x0652bfll0valh2fbvyc32n2k6v2f978v"; + }; + meta.homepage = "https://github.com/echasnovski/mini.hipatterns/"; + }; + + mini-hues = buildVimPlugin { + pname = "mini.hues"; + version = "2024-09-10"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.hues"; + rev = "221260589ab28c29af444a0809248a1369f733ca"; + sha256 = "1pi6wmvhbr89xgj2vhmy1rwlb5znwc20nr9c66c40lbabzvxa815"; + }; + meta.homepage = "https://github.com/echasnovski/mini.hues/"; + }; + + mini-icons = buildVimPlugin { + pname = "mini.icons"; + version = "2024-09-26"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.icons"; + rev = "a2742459f0ee32806c2438ca06b4d8b331f3f4d4"; + sha256 = "0dw6kdq8c5zsry252mv4jz0hg0x76ni1229s65fbkc7m59553aac"; + }; + meta.homepage = "https://github.com/echasnovski/mini.icons/"; + }; + + mini-indentscope = buildVimPlugin { + pname = "mini.indentscope"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.indentscope"; + rev = "da9af64649e114aa79480c238fd23f6524bc0903"; + sha256 = "1pbhic4q9ikbdgmmvlhpil4aykpf0ryx7dckb36q3xc0ai2gwc6g"; + }; + meta.homepage = "https://github.com/echasnovski/mini.indentscope/"; + }; + + mini-jump = buildVimPlugin { + pname = "mini.jump"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.jump"; + rev = "cd429d8d631a2fa766e60b72ee6fbff78afa3fda"; + sha256 = "1qxddzdnkhzj8dx7wrm3abf5h161l3drvbfpw4638vx3bz5v504q"; + }; + meta.homepage = "https://github.com/echasnovski/mini.jump/"; + }; + + mini-jump2d = buildVimPlugin { + pname = "mini.jump2d"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.jump2d"; + rev = "b0963aa2ec80b4b1ed1c7f93d9c969bb3f4b65b6"; + sha256 = "1r0vqpa803yqmb0s1phpm1lf5xm94qsrmjc8gghdspxpk5iszv4d"; + }; + meta.homepage = "https://github.com/echasnovski/mini.jump2d/"; + }; + + mini-map = buildVimPlugin { + pname = "mini.map"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.map"; + rev = "4c58e755d75f9999abcd3b3c6e934734b6a8b098"; + sha256 = "1407jgrzk0pvnhsssm3hdgjw3vd1n182adgh8c5h4b46dzvrvgvl"; + }; + meta.homepage = "https://github.com/echasnovski/mini.map/"; + }; + + mini-misc = buildVimPlugin { + pname = "mini.misc"; + version = "2024-09-09"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.misc"; + rev = "428da688126b320194a944233f9f8dfc46669307"; + sha256 = "1iiv5v3n7aynsk75bdp6b098n6ny6fg5iccdkw6psg0gyni6fq0r"; + }; + meta.homepage = "https://github.com/echasnovski/mini.misc/"; + }; + + mini-move = buildVimPlugin { + pname = "mini.move"; + version = "2024-08-15"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.move"; + rev = "4caa1c212f5ca3d1633d21cfb184808090ed74b1"; + sha256 = "0f4nrg9n8air507h6bd61dmb1rjjhykyl36qgr0ai72cb011wzcx"; + }; + meta.homepage = "https://github.com/echasnovski/mini.move/"; + }; + + mini-notify = buildVimPlugin { + pname = "mini.notify"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.notify"; + rev = "1c901d62581439f3d17382a5bf7001a282d6468b"; + sha256 = "1vi3nsclkx9myglb0mxizhmzil02pglh96jf4291cblkgycs6zil"; + }; + meta.homepage = "https://github.com/echasnovski/mini.notify/"; + }; + mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-08-04"; + version = "2024-09-28"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "af673d8523c5c2c5ff0a53b1e42a296ca358dcc7"; - sha256 = "0rky24war90avndgm9fji0f20d24bgyc3s1spgw5lw443wh9vizl"; + rev = "848c5e8f428faf843051768e0d56104cd02aea1f"; + sha256 = "1n14lygrbkimqncg752c5znm48lm3hizvbsswq0z5q8q6c7ww8fm"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; + mini-operators = buildVimPlugin { + pname = "mini.operators"; + version = "2024-09-09"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.operators"; + rev = "35b12f54bd5acb860f4297fd6d12fd07b1b065e2"; + sha256 = "1h3kf7ri8ip8as7kcb86q5lq56v7iqz731g4pyn020ymyxmyp75n"; + }; + meta.homepage = "https://github.com/echasnovski/mini.operators/"; + }; + + mini-pairs = buildVimPlugin { + pname = "mini.pairs"; + version = "2024-09-27"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.pairs"; + rev = "919a89ed3c9f4142215a44c9fffca72fa8c8e792"; + sha256 = "14dm1jch4fnj0a2q33ibznj4gx718984crn62a7gkp7fqfb5mw8d"; + }; + meta.homepage = "https://github.com/echasnovski/mini.pairs/"; + }; + + mini-pick = buildVimPlugin { + pname = "mini.pick"; + version = "2024-09-28"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.pick"; + rev = "6d66ae9eb0b75261f1842788dda611285b6f065f"; + sha256 = "0j60nbyk9nrgfmjg6p7chnhc5vmpg997kkn6rkjkpyrrz8ybi181"; + }; + meta.homepage = "https://github.com/echasnovski/mini.pick/"; + }; + + mini-sessions = buildVimPlugin { + pname = "mini.sessions"; + version = "2024-09-12"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.sessions"; + rev = "62f2e3823f98673fcf1b79322cc06d8a1f453d30"; + sha256 = "1js9ma0i7a4lil6h4bzbxjx6s63hj4z7qy5ixf737x34ba5d0ipr"; + }; + meta.homepage = "https://github.com/echasnovski/mini.sessions/"; + }; + + mini-splitjoin = buildVimPlugin { + pname = "mini.splitjoin"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.splitjoin"; + rev = "3e92f6764e770ba392325cad3a4497adcada695f"; + sha256 = "126z8rsyg3849ijix1siwq77f9slwr93l61rwg499flzja3incic"; + }; + meta.homepage = "https://github.com/echasnovski/mini.splitjoin/"; + }; + + mini-starter = buildVimPlugin { + pname = "mini.starter"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.starter"; + rev = "3e0af795938ee800846708bed92fbe4e8583141a"; + sha256 = "15353wihsk5fzfajidsqyrqpa6sy251kprzwd486v5wr1ww99nax"; + }; + meta.homepage = "https://github.com/echasnovski/mini.starter/"; + }; + + mini-statusline = buildVimPlugin { + pname = "mini.statusline"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.statusline"; + rev = "813854243156472c9d0bc9c64ea0af159b9b37ca"; + sha256 = "0c66wx3qvq4yd156j7n6x7iwyfggyxz4ss658a3n3rjnv35w3j5r"; + }; + meta.homepage = "https://github.com/echasnovski/mini.statusline/"; + }; + + mini-surround = buildVimPlugin { + pname = "mini.surround"; + version = "2024-09-28"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.surround"; + rev = "e1ac1ce5c7499aa4cc2ca9fb1adec9e730dd9394"; + sha256 = "01r2crm4x1jxcxkiy4w31z6198xc44kvlql12ii1bh7hraz6bzhw"; + }; + meta.homepage = "https://github.com/echasnovski/mini.surround/"; + }; + + mini-tabline = buildVimPlugin { + pname = "mini.tabline"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.tabline"; + rev = "2316dd47e1e1f4a8e9255c9060acbee89bb26e59"; + sha256 = "1lbh0qzjdhx7vkycl799byjn3a62frrfgdczyzj2xdyfxv6823h9"; + }; + meta.homepage = "https://github.com/echasnovski/mini.tabline/"; + }; + + mini-test = buildVimPlugin { + pname = "mini.test"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.test"; + rev = "011e14293baa8ebdfde83b756b435403281153fb"; + sha256 = "07marlkan507bx1x71xqil4im644fy04ydy65ax2q6rihrzmgzvf"; + }; + meta.homepage = "https://github.com/echasnovski/mini.test/"; + }; + + mini-trailspace = buildVimPlugin { + pname = "mini.trailspace"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.trailspace"; + rev = "3a328e62559c33014e422fb9ae97afc4208208b1"; + sha256 = "1314bmb8zk3gdpg1wpr1935d0xd0f0cf2f0ipxclbwi07wbjz9i4"; + }; + meta.homepage = "https://github.com/echasnovski/mini.trailspace/"; + }; + + mini-visits = buildVimPlugin { + pname = "mini.visits"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.visits"; + rev = "ef2f388158f3651e4b45faac2897d1bacbb0c398"; + sha256 = "1rizwl2dyvj1iz7sqn5sfdaalcjpmhg4zklhjijvpmkylw3da4nh"; + }; + meta.homepage = "https://github.com/echasnovski/mini.visits/"; + }; + minimap-vim = buildVimPlugin { pname = "minimap.vim"; version = "2024-03-17"; @@ -6327,12 +6941,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-07-29"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "faf013f7ee254f52b88f57b088f650150409cb24"; - sha256 = "0s5yxgr2xsr7n25fh588g6hr83ps5b53blg88156lxg5rjkj460i"; + rev = "d459bd7ce68910272038ed037c028180161fd14d"; + sha256 = "1z41pb80dikww4mzvvjcdw97z9mk6x90r7k1pawp842lkkkjj658"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6363,12 +6977,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-07-09"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "f978043c34f4e967a5496b4fa78c2ad092315b00"; - sha256 = "137pzp3i2yldarz6ynygfkm3yif1r76ahs5l9cy5bml817rhyshi"; + rev = "162bc34b4d670fa4d8d1407924c0f855985fcc2c"; + sha256 = "0d6jf6041lwkm4saxmh0zlfd0427z1vcxj9xdfl138b082csnfds"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -6387,24 +7001,24 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-07-12"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "eb6d0fe33e14989b0f1fbe25d9732889ee57bd1a"; - sha256 = "0prm7i4fl5lbfgdk9s9n9sn05a0hrbfdjgb5g393hjjkid8f4haf"; + rev = "92b2599ef813b188391d5f00f5f94ce22ecd2598"; + sha256 = "1m3ydc34r9a5md6bfrp6zvp67dlvqyg076mygifly2iqfvq43n5a"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2024-05-25"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "2bad2a92fe0ff6c8581d33a853a1b17592b83239"; - sha256 = "0kbr165ifkn3g131chmn6c4ishfsjikninndscpcp8dq0gv81d4h"; + rev = "18dc13ad653477b75590ea5bab18ba673fb4a398"; + sha256 = "14bxxxb948axd5q16dgy0has1jj6raiq9zzcabbiycw9652kwcgz"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -6435,12 +7049,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2024-06-25"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "782820896b1691ed664e4c24f1cd9793dcb33dfb"; - sha256 = "171aysqsyapw434xkibxv69p5fkwha4addkqfdssdm0wq9n9cm4q"; + rev = "562809aaf203b4c65482a75199166d360f2b9298"; + sha256 = "1jxjksd341gs64kvsac0ir9n7idhfvy69s3nx0agpm3i0hzlm4dp"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -6699,12 +7313,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2024-06-11"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "206241e451c12f78969ff5ae53af45616ffc9b72"; - sha256 = "17l55gbsls8s2hp7a3hrmqzsclq9ckgc76ii8kpc6an0910axlbq"; + rev = "a77af2e764c5ed4038d27d1c463fa49cd4794e07"; + sha256 = "02ag3h40p5ga12y1fwbcd06nnl3rb0l5hs064ylpkx2kjcl79arf"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -6723,12 +7337,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-08-05"; + version = "2024-09-28"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "17a3367bc4751859cd50e05f38fea0b7a4b7ed42"; - sha256 = "1vrqiz4cy2fzx61js80dz1ns2lxfm927wmybi613azrxkhz7jy66"; + rev = "3b6db0a913258a91951f96b09c005522cca98f1f"; + sha256 = "0jmzlz0vkbs9vvmd4lbwha0w1fkydlxjhgy42a1n37gv4j31gih1"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6783,24 +7397,24 @@ final: prev: neogen = buildVimPlugin { pname = "neogen"; - version = "2024-08-02"; + version = "2024-08-22"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "4b22542b96712a5a901fa909b7dc749251ae1625"; - sha256 = "1258d2qqnf0qc07fj18601wfanwccpb8jmvz8nv3vw5fn6pj0l76"; + rev = "e932ba918b56723436b77aa3efb844a11b2851ab"; + sha256 = "1mwa20fvj6k7jzaw0lv0h2b9hr62i48i487mrxqf2nnwxiad7xfk"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; neogit = buildVimPlugin { pname = "neogit"; - version = "2024-07-23"; + version = "2024-09-28"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "2b74a777b963dfdeeabfabf84d5ba611666adab4"; - sha256 = "1kbzw9z83rh210r7kgx9r6q0phji539zvrdj963g4gf438nrplib"; + rev = "75ee709d18625a94aef90d94ccac4e562c9a0046"; + sha256 = "0l45k7bkgr0s932y8ddlsqj09kr0j2qfiqw11yl5x3wrcgrscf2x"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6865,18 +7479,6 @@ final: prev: meta.homepage = "https://github.com/ii14/neorepl.nvim/"; }; - neorg = buildVimPlugin { - pname = "neorg"; - version = "2024-07-28"; - src = fetchFromGitHub { - owner = "nvim-neorg"; - repo = "neorg"; - rev = "e5e797e6eddcb6efb1d2c3fc2612b31ad9a76cef"; - sha256 = "0439h307zphrz67s3mvcjwk2ixn1vrxas62lrcp2v07w8gln59m1"; - }; - meta.homepage = "https://github.com/nvim-neorg/neorg/"; - }; - neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; version = "2024-07-30"; @@ -6891,12 +7493,12 @@ final: prev: neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2024-08-01"; + version = "2024-09-07"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "532dcc8cea4287c4cad6bb77532989a8217cfc7b"; - sha256 = "1kcy17jccbhc4ha81fcxcch60hdlwzywd88ghx8r0j18m2wngb95"; + rev = "4e0428a41c6ec191df543fc95349f6e1c598e53f"; + sha256 = "19aw68ci0wx0alv8w9j6qn4zj6s1bbf737xa4jbsxkhkwczm5689"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6939,12 +7541,12 @@ final: prev: neotest = buildNeovimPlugin { pname = "neotest"; - version = "2024-07-13"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "32ff2ac21135a372a42b38ae131e531e64833bd3"; - sha256 = "144wzzadhrg48fkihffk6jf9c0ij8dg9gng6mcxq5z8mdcvz0124"; + rev = "48f8b5fce704594eb0ff94338e080defca14f0dc"; + sha256 = "0cr3qbds7g5ybndaaiafh758v6igzjz65l81mqragk9kcajkwkip"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6964,12 +7566,12 @@ final: prev: neotest-dart = buildVimPlugin { pname = "neotest-dart"; - version = "2024-02-28"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "sidlatau"; repo = "neotest-dart"; - rev = "33b9335cd8c2be4dcf9dd8f196b24325e7c2e8e7"; - sha256 = "1g3xa33p2n5j3w1rpc8zf0dl7wkwnai2f9fs8dr8xanqp22vpl3i"; + rev = "ad0fbcd0bfb45999fb78f3d14f6b6ae7ee70b88c"; + sha256 = "1431b9izn4kr5rsc06kpwizd41nkkglcy3yl7p0wls3pfr0v1rxp"; }; meta.homepage = "https://github.com/sidlatau/neotest-dart/"; }; @@ -7037,12 +7639,12 @@ final: prev: neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2024-08-01"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "f71d2494726c529c5d5c43813b24b3dd91ade981"; - sha256 = "04k5g7m1vab11362grl1c755zkdw16xz92dpl4a39h5py6wgfzp3"; + rev = "33077c3662866a04af5f03d1dc6042d929fef037"; + sha256 = "1l6011752wwfvz4iqcfpw6l69ky9kg8g1rkay39sawwprr52vzcw"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; }; @@ -7061,12 +7663,12 @@ final: prev: neotest-gtest = buildVimPlugin { pname = "neotest-gtest"; - version = "2024-06-12"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "alfaix"; repo = "neotest-gtest"; - rev = "b44c8afc26cea75ffc80617ce07b4e745a56e589"; - sha256 = "09h94w4s1yp3qx0n342qkksixgilkfmqiqp65jayfxiwa3jpkgya"; + rev = "16989561a6356878ec4ecd6afed4f0d7a471d1db"; + sha256 = "0i95b07zxj69q5h7xwfml39jln9413f6c6hfw0k9vz19dhzinfc7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/alfaix/neotest-gtest/"; @@ -7074,24 +7676,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-08-04"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "dc8884ba9ed12433f4d2f13a6cc127a6339b4825"; - sha256 = "1mkw66jwlqiyzf971ygxks0r9zlddqfjfw5v5vyr1qvbfs049mm2"; + rev = "5429318dc128db73f8022a45fb46ab00a90937d8"; + sha256 = "10ljfnklkbss26ki1mr19aw02ar0yq9hagk8v83d8l3xzix034p0"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-07-11"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "b48bd1621b532106ab8d1ba18e8a7bda4463ccc6"; - sha256 = "1biqiv7l8p8ml0fslwpwrb7h2lfjh1h5dj3dw9ns27kzmd7f92i1"; + rev = "ad447b4e072a7db6be4722cffc942b138abb00ea"; + sha256 = "1lkzvqsnl94l09d51im72drq6ymy0q2d1mplj6x5pmc8k9jj186f"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -7110,12 +7712,12 @@ final: prev: neotest-minitest = buildVimPlugin { pname = "neotest-minitest"; - version = "2024-04-29"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "zidhuss"; repo = "neotest-minitest"; - rev = "0543bf4e997b2c970707cb297e2f74c438eb0653"; - sha256 = "053j4xm84i5z2a2qpka7vgq462928mg81gwkwvr2jbxjm4h4sk2r"; + rev = "5623b9a7b2b27314e5c336b385315d2ab7d4ccba"; + sha256 = "0rv4nhvlxl693d4q9jd9a6ym3ib1fwsjzl0911pqjwf9kmnqx4w7"; }; meta.homepage = "https://github.com/zidhuss/neotest-minitest/"; }; @@ -7158,36 +7760,36 @@ final: prev: neotest-plenary = buildVimPlugin { pname = "neotest-plenary"; - version = "2023-09-29"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-plenary"; - rev = "dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584"; - sha256 = "01dg3n3bnhc1ppai24syq48n5xkm1a3vm731xrah2y0qi390q0l3"; + rev = "3523adcf9ffaad1911960c5813b0136c1b63a2ec"; + sha256 = "12nsn035npdz5hyc9w6jdhx3wv2ixvdbqr78w2znn1p2a6mqc09m"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-plenary/"; }; neotest-python = buildVimPlugin { pname = "neotest-python"; - version = "2024-01-15"; + version = "2024-08-19"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-python"; - rev = "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50"; - sha256 = "1xpd08mrw7jlgl7ciph9nxni98pa6x27va7ys7xapkkzc1bym1r2"; + rev = "72603dfdbaad5695160268cb10531a14cc37236e"; + sha256 = "1d8rcpvgr4x2p3bg37kzsnfydibhb7rpyqb10sgxsjz0ylgmv7jr"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; }; neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2024-05-15"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "48573d5882cbe8d8bcd3b735d9ee7705168b1b87"; - sha256 = "00l3v77d3zgq47gbsgjl916yp735kyr9s0jizi1sr5yg7wypx2cx"; + rev = "53fc108a06ae43d7f873d42ee5189c2301e33623"; + sha256 = "0z8vh5miw3ysn4y45i4ckyc7s1k104l4m4yrpf7rx2wbd5gmkshw"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -7230,36 +7832,36 @@ final: prev: neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "2024-06-22"; + version = "2024-08-23"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "353364aa05b94b09409cbef21b79c97c5564e2ce"; - sha256 = "1sv5i68pc24zl1gbqa94gy5wccaii2glx0bgkincpyhfycf2ydz0"; + rev = "9e30dca989a2287cf3fde86b3e138ea7fa4de935"; + sha256 = "16l4i6jh8y2563062k2n5xcj4lxs9cyb2z8xvzb63il5n526mivi"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; neotest-zig = buildVimPlugin { pname = "neotest-zig"; - version = "2024-07-28"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "lawrence-laz"; repo = "neotest-zig"; - rev = "b3e6246c07d3d4f06075f33aea896affd25f0de9"; - sha256 = "0v75jp4rr35fnm4ksdgskpdvjay86y28c5ibbfjckn4zajf7w8nz"; + rev = "fc160b277126cb21a1486d48fc298d06803c3f88"; + sha256 = "0xwzib7lf3n5v1a09rnwwl6ibd61kl33ppn13c0smzpkgnybi0wp"; }; meta.homepage = "https://github.com/lawrence-laz/neotest-zig/"; }; neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-07-24"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "6993189dd0ee38299879a1a0064718a8392e8713"; - sha256 = "1fj0k6fkyk73jdjps8660nsvplwj2wasf302rbwbpbzmdvw46q6v"; + rev = "2839c88cd297a069e93df1aab542c087e8f6e8c0"; + sha256 = "1jzr8zfxblr92ipz0b02nvh7q44yba8f64c2lkq5qfn49cqx9lwh"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -7302,12 +7904,12 @@ final: prev: nerdcommenter = buildVimPlugin { pname = "nerdcommenter"; - version = "2024-05-13"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "7bb1f72e802a80e37bdda5f6906c69b5a93de1eb"; - sha256 = "0rjgriqfkikcbsns1ridd5kx3msaak2632zng8jajxlslbcga1r3"; + rev = "3f860f2d981547c18f2c9599e3c358ea488c3be4"; + sha256 = "0z5fbzyfplljjbzsj84xp323b0hgiz5asizgsny9kjzx0b4m96ns"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -7350,12 +7952,12 @@ final: prev: netrw-nvim = buildVimPlugin { pname = "netrw.nvim"; - version = "2024-03-12"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "prichrd"; repo = "netrw.nvim"; - rev = "c64f60b8a613900aad82ef1c285b892eb43e9e15"; - sha256 = "1ng0lm2774ghgq9lk2104s6qy21qgwzz2pqkvd706b34vckbb2q3"; + rev = "90501c62b9b816ed3ed1e912ae9db9af5671a1b2"; + sha256 = "1m8pnhy9si734k0i95fyn0yn4swwmavpj1s22qp2ss75djibwhxl"; }; meta.homepage = "https://github.com/prichrd/netrw.nvim/"; }; @@ -7386,12 +7988,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-07-26"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "608d39bb102e6bdda76ee450b042f74668184ad7"; - sha256 = "07k0z08gq7pyadqxh2lwk3zgvxwnr7m4mgag9z2ys25449c18qkp"; + rev = "60b2ab7051cf2f631bc03274b56061136d1f9177"; + sha256 = "0wajfvl6n0y7wbp4ip45mhiq67ybqvk7w3jcpzabjy2cyxpfa96w"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -7410,24 +8012,24 @@ final: prev: night-owl-nvim = buildVimPlugin { pname = "night-owl.nvim"; - version = "2024-06-26"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "oxfist"; repo = "night-owl.nvim"; - rev = "131641a516085c5b3cacc8022581902e9f2f14af"; - sha256 = "1ni6213wixgfbg8cq2w4p0nfl5rhmrwvxhyifmvwf4x37lkhsx4l"; + rev = "86ed124c2f7e118670649701288e024444bf91e5"; + sha256 = "1zgi9m85z5pnfsh7p3rdnyz7rvrn44lfg5p6l005g3411h32pgiv"; }; meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2024-07-22"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "d3e8b1acc095baf57af81bb5e89fe7c4359eb619"; - sha256 = "0z81af970w1rllh2abdvlyx63z4xkcf5jw3wy4xv99gvqa1fxryr"; + rev = "7557f26defd093c4e9bc17f28b08403f706f5a44"; + sha256 = "14hzq2mvhl79121zqqy163sy9128ifcjlk0xnjc12yf6azfc4lbx"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -7470,12 +8072,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-08-04"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "4ba23d18fb321f45700025945f159d2fe06506b4"; - sha256 = "16n286r7l9j5kwz8cp50xvxch72w2jfi09sw91gy4djdf1qh7v0p"; + rev = "369b1da0a6f4defab5e404bf293185c93f44b02d"; + sha256 = "0bgz4429z0bcjqim97fg1lxqwgrd3wnn9dyas1hjxgbggzyxp61y"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7494,24 +8096,24 @@ final: prev: no-clown-fiesta-nvim = buildVimPlugin { pname = "no-clown-fiesta.nvim"; - version = "2024-07-22"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "aktersnurra"; repo = "no-clown-fiesta.nvim"; - rev = "b63937a5ebba1ece32f56256c46d166e62aca7fc"; - sha256 = "07h118j4y34bb8hpljrd9n6v2iz0n0vp8ijy2vfpkm4jnm1bh02b"; + rev = "1685bbb47a409253f9145db56dd83ae117f9c382"; + sha256 = "03k8z2r6csckfx193yzcqj83w8ykikihpx19zi6qb1m1qybjznca"; }; meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/"; }; no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2024-06-26"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "ecc584150f5c8a2a82f2e1d43201df0f65c63d0e"; - sha256 = "1rxj6sq1v0j0q4cj4js2xb3c36m38xgiqsr6bgyc6ri7xz8zxayx"; + rev = "c0d8061f18bccceff0991e096c8f864a720e1ebf"; + sha256 = "0mbz4r1aafjqibzzw7y11fl5zacww17x75vf2zzc49gir4wnyyk3"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -7530,24 +8132,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-07-25"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "448bb9c524a7601035449210838e374a30153172"; - sha256 = "1pxnfgcqh6b14z699akvzbq2vcvk4glfjpk5d5hybfn6fnbidapk"; + rev = "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65"; + sha256 = "0qq9rc8frviz96j1xb70pkdwhvynaz63pkwdh3jlkkmjk5iv0jm4"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-07-28"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "cfa65d86e21eeb60544d5e823f6db43941322a53"; - sha256 = "1hdlrgvllsqhmdd2wnmr529pz1vq1cd6jayp7zfxk8hik154q3v4"; + rev = "68a39ec218a9f15ebb2bb36c8c245681d5e61144"; + sha256 = "10iiqq5c3fpmk6bmgifa06qcgjrfg5i10j7cmh5cpikgp481xca2"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7602,12 +8204,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-06-26"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "61574ce6e60c815b0a0c4b5655b8486ba58089a1"; - sha256 = "1vllq6lkk7karc3n8h9wj2ax6sc99h26r96h18lbvi0nsy98ss53"; + rev = "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f"; + sha256 = "0klz9wy09jk74f39v6f7s5gn98nf3vq4lgv5d29mkszpykxaligp"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -7638,12 +8240,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-08-01"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "c40c5116c4c091f4da620abcd9c58bd5ee4b8497"; - sha256 = "1wry827rk2j5kj8a2mch9dqcb4ky0ggh5x3n76yg96p8mxgglypi"; + rev = "8d2bb359e47d816e67ff86b5ce2d8f5abfe2b631"; + sha256 = "0l1r7vsa02d9fb0fxkl6dn7nr1m4iflify6vh1ffdvcnlmri8ann"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7686,12 +8288,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-07-23"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "e38c5d837e755ce186ae51d2c48e1b387c4425c6"; - sha256 = "16wm535ihr8gxngx6a5xj4phz6qjshxi4nrcx2ks4bmd815gdsnv"; + rev = "f158dcb865c36f72c92358f87787dab2c272eaf3"; + sha256 = "0phizncx5kafr75nl0ii6nfb8jh8rmx052lw1x7cdfr6918vvxdj"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -7794,12 +8396,12 @@ final: prev: nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; - version = "2024-07-24"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "194ec600488f7c7229668d0e80bd197f3a2b84ff"; - sha256 = "19142fnhvmdaasmxjgh9bksg6c5kq71w816zjzkfwdrpydqwh3j3"; + rev = "0671e0eabc6842676d3310370e8fae4e1c51d7f9"; + sha256 = "1ilxfiq76a7wzh4nvhds5b7k6q2shrnfmyb4icnfc8w0kx1vby0m"; }; meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; @@ -7878,60 +8480,84 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-08-01"; + version = "2024-09-28"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "dcc85d12d6e2c18c5fa0f9a304d9f5e767e1401a"; - sha256 = "12bxs0dh6h1rkb45xb0cb7fccgm1an96yy28rcf2jddsfhgfzw32"; + rev = "7ff6936010b7222fea2caea0f67ed77f1b7c60dd"; + sha256 = "13c7c81yy7rqawjkavxafs9vy1df07cpg6grkb93f16lr56hdpfc"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2024-07-19"; + version = "2024-08-06"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "5030d53097fed7b75524a04048d8dbf417fa0140"; - sha256 = "1s1g9s2gyfy3s4xnrzd980qpjigzdf4l9dp11kzlk7h26h5mhmqr"; + rev = "5511788255c92bdd845f8d9690f88e2e0f0ff9f2"; + sha256 = "08gmabyn7d5scqjicpjkp7h55fb8s1vwi8zyfcf7iwzzrpanm12m"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2024-06-26"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "d777c2b32ed39f61209c09bede28d7491621a631"; - sha256 = "1fsfnir1af847hmxgc6ca3hxqpnik9dv1s7ag28kzmvy0wj8clav"; + rev = "db72bf6ab9f75fe841e8e11e772ee7fef6f484f1"; + sha256 = "1m2bs71l4wdk6kippwkmsvw4978qcqh8lnkx7h9sa82l87wb76mp"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; + nvim-dap-rego = buildVimPlugin { + pname = "nvim-dap-rego"; + version = "2024-09-28"; + src = fetchFromGitHub { + owner = "rinx"; + repo = "nvim-dap-rego"; + rev = "ab13103327b5e336a0d059ec2d9f1022c26ffadf"; + sha256 = "05ainkya2z6hm02glz2xcnd39y3fvkdmsgnl6la7kchin227l6w4"; + }; + meta.homepage = "https://github.com/rinx/nvim-dap-rego/"; + }; + + nvim-dap-rr = buildVimPlugin { + pname = "nvim-dap-rr"; + version = "2024-07-10"; + src = fetchFromGitHub { + owner = "jonboh"; + repo = "nvim-dap-rr"; + rev = "1682c13a2096a4a6394c803e14f009f121400acf"; + sha256 = "sha256-QtOY6gg2grsxF6KTn75hZ+BZGWK2ahzVu9k2SIIFeJU="; + }; + meta.homepage = "https://github.com/jonboh/nvim-dap-rr/"; + }; + nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2024-07-13"; + version = "2024-08-26"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "a5606bc5958db86f8d92803bea7400ee26a8d7e4"; - sha256 = "1wwh70bj2798nyv5md1s2a1h3ayni8lajwzm6jby4ddx51x9fvi9"; + rev = "1c351e4e417d4691da12948b6ecf966936a56d28"; + sha256 = "0hg95ws4b6hrjgp28bccbyimmizyijd9li2vhh8axszn4m70nayv"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPlugin { pname = "nvim-dap-virtual-text"; - version = "2024-07-02"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "484995d573c0f0563f6a66ebdd6c67b649489615"; - sha256 = "0p889jkyia04l4nhndmg4yl88mc10hf0fzgyyqj08ybzws5z9zgr"; + rev = "3497eb39bf413a57ab5b7e7e2e192683e462148c"; + sha256 = "1nv58ds5cxkbwcip1kd7s6kzhn0h33869qmkmjhn3ibykszhz0d4"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -7950,12 +8576,12 @@ final: prev: nvim-docs-view = buildVimPlugin { pname = "nvim-docs-view"; - version = "2024-01-20"; + version = "2024-08-16"; src = fetchFromGitHub { owner = "amrbashir"; repo = "nvim-docs-view"; - rev = "78d88bca16f32a430572758677f9246f6d7f7b94"; - sha256 = "1sqg4bh6xkq5d2rg97g2350iil9mcl4wh12ygbj93sj5m0jfp4rp"; + rev = "365593534e0acd762bfddce6e8313315ffa4fa36"; + sha256 = "0k6w26jc5c6lmb1022d5nvs0lmvh42zw7dgagfc6gvq3dchpfiza"; }; meta.homepage = "https://github.com/amrbashir/nvim-docs-view/"; }; @@ -7998,24 +8624,24 @@ final: prev: nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "2024-04-23"; + version = "2024-08-12"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "9b149e6d215870e31a3712de93152c5b4febe23f"; - sha256 = "0rnihq0dz8n60cii5hpd00xam51k5m5jj7lx5s6y4sa7v7dl7amc"; + rev = "2ab24b3ea99ff8a66490a1bb53a730eb7fafc14d"; + sha256 = "0qp0h2qk9zclcy989mg0sjgmjrqxvxsvfhi8cn378iz66wslb003"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-07-27"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "8df00d9ec00e31a2280a3cfb795a30f85d1a5c2e"; - sha256 = "0synn533v1zy87gk8762p8j9hdica9jyg9rgmwamx5yd5zg8xgcb"; + rev = "ca258b1e466d131e17eacf0c632abe932bce20ab"; + sha256 = "0l8qpj143s3csav39ixzhag6pyk6jfajvf469m9hg19m6wfbfg1v"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -8046,24 +8672,24 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-07-23"; + version = "2024-09-04"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "31f52d52a618aa16d2576da85992ee9b2d10babb"; - sha256 = "10hm4xv9kds9sxz9302mg6ik4dhsxfzvhwm0w2qqq0y8smrnjgy7"; + rev = "0dd4a4ab5892b02661ad18ceb9071428c3391a89"; + sha256 = "0rn2crlih3wmxpq0c0c9j1cksvlzn687wx8v88jdn5a643jbaxvp"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; - version = "2024-06-14"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "1db56afda3e85791a14b096e483dfda699dd9163"; - sha256 = "13mx0p3ia7wajvjk1gvyhnv2v5z900bjr4c82b1wbdpmv68z69yv"; + rev = "07afd4dd14405ad14b142a501a3abea6ae44b21b"; + sha256 = "12nf1jj7z4h7nqi6gmk768z8hcl4qdgi4rpwj0y8frawc2f75ixv"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -8082,12 +8708,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2024-08-01"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "be5c8d49e0f5c01978aed2314ec47fa8eae759ca"; - sha256 = "11lb2ayr0l5mdhg69vmx3ks7yixljyhw81fd3dij9z2drw344z5h"; + rev = "efe813854432a314b472226dca813f0f2598d44a"; + sha256 = "0pz51axh4z1g5wjs2q3pprhb0r5irdk78h5mi4m65ss9f6x9pnmg"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -8129,12 +8755,12 @@ final: prev: nvim-lightbulb = buildVimPlugin { pname = "nvim-lightbulb"; - version = "2023-07-20"; + version = "2024-08-16"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9"; - sha256 = "0i0lppncxz7nmd683sz79063nr9yds46lyhkkxjxj853mskjisii"; + rev = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49"; + sha256 = "1wf5pfjpvn7hvm9p9mc7w9j7wz2rr7ppdys8cx4jcqib9ja5vy99"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; @@ -8153,24 +8779,24 @@ final: prev: nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2024-06-07"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "939bbb26be3e52c41364c04b31bcab4552cb7b92"; - sha256 = "00yaam9mg9fc9wkvzf0mq6yrkl3mpm1s0z042xi67m05gk78lsxi"; + rev = "74f7c5b412490d83bd08eb7e7094cba50df29b57"; + sha256 = "1hnjj6s48gpif1mdb50mizl8cbclq94xj9bmswv9gnr5khjzfl8c"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-06-26"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "efc6fc83f0772283e064c53a8f9fb5645bde0bc0"; - sha256 = "1garyyavgg2xfdkw8s9jjq4p5mv5i6m54m8dszdhvkad5ni1zlvb"; + rev = "968a35d54b3a4c1ce66609cf80b14d4ae44fe77f"; + sha256 = "1fccdcrjsrszmfdin72kp3mk31mzd8liw166dak6hyf8sylch3cs"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -8201,12 +8827,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-08-02"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "e6528f4613c8db2e04be908eb2b5886d63f62a98"; - sha256 = "0b4p41kv6m0hi1rh2z0711s8mklrnjsdddx9fgvmjm2ajh3qcfh3"; + rev = "0678aa439b82965daf03679cd146e84f10e299c3"; + sha256 = "184qchilj66m6qrzrzkk8xyhf10cvrwm475viqs6dxdnzlazi2ms"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -8261,12 +8887,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2024-05-25"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "1b87e6bfa4174b5fbaee9ca7ec79d8eae8df7f18"; - sha256 = "13yi6wby4ybdh536ghjsvp2svzszzc08wi2lxx9rsqcm22aah0sm"; + rev = "c2aed7519b93f4151b6dbb2378793c00096e1aa1"; + sha256 = "0rgjh62w2dpv78rzy41r70ckx83b98235qg3c42dxff2p1ix17mv"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -8309,12 +8935,12 @@ final: prev: nvim-neoclip-lua = buildVimPlugin { pname = "nvim-neoclip.lua"; - version = "2024-06-01"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "709c97fabec9da7d04f7d2f5e207423af8c02871"; - sha256 = "0sh5a680jr9390hdn7h6j72h2148089is506qk4khxrqag2yd4zi"; + rev = "32e05f2d23dc5b6a284a688c0535a83d1bfc633f"; + sha256 = "0z6rfbl02ddazfrmczb34hspgshqvxpi3ga4q7srhpz0cch16y8q"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -8345,24 +8971,24 @@ final: prev: nvim-notify = buildVimPlugin { pname = "nvim-notify"; - version = "2024-05-17"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "d333b6f167900f6d9d42a59005d82919830626bf"; - sha256 = "0000a56y6xp2hzb5pf0in9336s9r29w590kxqdxdl5gfpz08f763"; + rev = "fbef5d32be8466dd76544a257d3f3dce20082a07"; + sha256 = "0wbsib27kgrk632c094ivjbc8rw51kbalq9c8j576p78k93wipj9"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; nvim-nu = buildVimPlugin { pname = "nvim-nu"; - version = "2024-04-21"; + version = "2024-08-23"; src = fetchFromGitHub { owner = "LhKipp"; repo = "nvim-nu"; - rev = "64e1677db3319ec5900afa666a2c85c31adc0705"; - sha256 = "0cgdky2zai7mfshac2szfq346i0ql9c4miax10hz76kb2nq8v7wx"; + rev = "ca92d6defc08dbfa3b27ab36bfc99d97a259c3de"; + sha256 = "03nybdgdx7yswn5ybyhwdvjckdv4qz7pi8whgcqdlnqrpmh51sdm"; }; meta.homepage = "https://github.com/LhKipp/nvim-nu/"; }; @@ -8451,6 +9077,18 @@ final: prev: meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; }; + nvim-rip-substitute = buildVimPlugin { + pname = "nvim-rip-substitute"; + version = "2024-09-20"; + src = fetchFromGitHub { + owner = "chrisgrieser"; + repo = "nvim-rip-substitute"; + rev = "7a09242bf2cdc4f27326cc5f13c141110db62d46"; + sha256 = "166hsfszpc9kkhljwigb9bnhl9m85hlr36p7rbma06skf1cgms0i"; + }; + meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; + }; + nvim-scrollbar = buildVimPlugin { pname = "nvim-scrollbar"; version = "2024-06-03"; @@ -8465,12 +9103,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-07-21"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "401c0498689dcaa54b2e7483d823e33cdc051e72"; - sha256 = "1j6y0mv56ykip6cf9n4pragqxbcb73p3zmj6n7h3ppsncs5993ma"; + rev = "2a0ba552442638d1746379d8b8f3ba2df7d0bdf0"; + sha256 = "057lyn26q7hzb8h22xqpk0flv56zal7lgcjhw70qn6bs97v4jwm4"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -8501,12 +9139,12 @@ final: prev: nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2024-07-13"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "02a0ac1e16a7190a22bb6e31b15d484442bd2fdd"; - sha256 = "1cvvzkd87piydlqik6wswwlpfr84p2alwhg61xf9iss9zphyi52a"; + rev = "87b9a4fc514a789fca833bf540484fbda6a946b3"; + sha256 = "1xj1i17685ck259psam0qzd5hrk4ywrz1dpmrzdxbyj9m6dh906d"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -8549,12 +9187,12 @@ final: prev: nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2024-07-21"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "508b3504a350fb9a93bd0b7c0d41b8b5fc732b5e"; - sha256 = "0bgz7jgjwv08c48fb3blzqxi68lhhj8qpw60pipcapzjhv6qxds5"; + rev = "b1c542a78522d59432a827f6ec2b28f9422c7e7f"; + sha256 = "1b9ccj6qycxlcy84fdd7n7b20bmfpwyc8x4wzcakj3xymrp469d9"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -8609,36 +9247,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-07-28"; + version = "2024-09-30"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "48d0e82f9434691cc50d970898142a8c084a49d6"; - sha256 = "1j59d696dn87bqllawn2l0n0092f20ih99a69sgjaqw31fz4cq3h"; + rev = "4a9e82d10a3715d0c3845e1d2f66ddfb8b711253"; + sha256 = "1l4l2svccimi0597hfbzfg5gphy5nbx5h9m82smlrk6jb6a2gm0d"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-08-04"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "d7353a6b72008b38aa873ace49aa97bea257941b"; - sha256 = "151yrgddjaym52jwc65z036m8jncf7ndfycdj899xc2raw3qac5s"; + rev = "140f534ce9c02189921b80f5c8a68ab9e3f92ce8"; + sha256 = "0wy98j0rvpybd13jw398yk7x82lrqkgwcs92k6g3lpq75kacfn7n"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-07-14"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "2aba92ceb1479485953007f4d5adf34d0b66917e"; - sha256 = "06lrkpsqdy56i4m82q4jlz5nlbrcn77pm8fcbvks3vyzykpwid58"; + rev = "0dd00bb6423b4c655e6a0f9dd2f5332167bb6d33"; + sha256 = "0yl6ld7398m24m3cr564lr0gpz3xi154ddwdgyzm03lisbjs2c8f"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -8669,24 +9307,24 @@ final: prev: nvim-treesitter-refactor = buildVimPlugin { pname = "nvim-treesitter-refactor"; - version = "2023-04-04"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "65ad2eca822dfaec2a3603119ec3cc8826a7859e"; - sha256 = "14vg4iykl56ii4m5jrbrw95yjzkqn53vyqpqm82a5lmxgsha8d6b"; + rev = "d8b74fa87afc6a1e97b18da23e762efb032dc270"; + sha256 = "0n5aygram7wfmhsy3sb68g4adpkx6z1z31cl0780zbdgs5k3785b"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2024-08-04"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "d45a1150580745a1905d74185b544af3ea6f709d"; - sha256 = "0gbb4hdwypffrxk2g7h09f7rd050g9knbzlwnr55sals5xhf1ngc"; + rev = "4a2d05ec24eaa6b655c7d19092a3b6c0219d46b9"; + sha256 = "1a41b8klxz9rassb2v2ij74d719knj2c4zxi3ppkr1m5l533lnzc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -8705,36 +9343,36 @@ final: prev: nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; - version = "2024-07-23"; + version = "2024-08-27"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3"; - sha256 = "0x39c86cf84ap4zmk5lb1bflcrq2zqr2p3pcfd2mjbslzcdqkasp"; + rev = "e239a560f338be31337e7abc3ee42515daf23f5e"; + sha256 = "1qk3pij5m9hxksyyj9bk8a7x5vn3rc6wwy6idc91c2pyyhmd8k20"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2024-07-10"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "6b5f95aa4d24f2c629a74f2c935c702b08dbde62"; - sha256 = "1fqncyiw747s6dq9kjkz4d463ni18liik8c559alx0avhfsrrp5i"; + rev = "44fd461b879d80a21d5041f312f070f22551c0bc"; + sha256 = "1h45x3hw4qxvq65qfq8bqy4npjsny71v4k7azx2zxc45ddcd8s78"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-08-01"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "4cc3ba9303c0708b81fd681786a4835fd31518ac"; - sha256 = "00v2rxfrj8xjgrk41hz6kan66358byxccyyz6nxyjxa4f0bd77c4"; + rev = "203c9f434feec57909ab4b1e028abeb3349b7847"; + sha256 = "1w4d7h53p4xpx8pz2shn253900xhqgw5r7y103y60ywf53cr2k03"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -8751,14 +9389,26 @@ final: prev: meta.homepage = "https://github.com/samjwill/nvim-unception/"; }; + nvim-various-textobjs = buildVimPlugin { + pname = "nvim-various-textobjs"; + version = "2024-09-24"; + src = fetchFromGitHub { + owner = "chrisgrieser"; + repo = "nvim-various-textobjs"; + rev = "c2e4038d187a576d99fadd38a2f58aae5bfda294"; + sha256 = "0n3as90b30bs9ak599x4ji98j4kwrf0a8w2kpk6g5q58fd20xxwv"; + }; + meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; + }; + nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-08-04"; + version = "2024-09-30"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "3722e3d1fb5fe1896a104eb489e8f8651260b520"; - sha256 = "1hb7qm3z5m20m4lyq57pb8jmydsssmj0zfpsi2nry0skyfaqrrad"; + rev = "6b53401918a9033a41159d012160c5fb5eb249ae"; + sha256 = "1bncyvmx5x0ic8xi2bw533lvgzkghiwfkiy4ir2rbhcq4c579j1g"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -8873,24 +9523,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-07-04"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "aa5dfa573220a0a511a25ee14ce1570b6c23e56a"; - sha256 = "17n2c9arihdy1qh7wn133h03wm12n7jbz09gg85s29c63w6sic4x"; + rev = "d192850101d2d87bb570cea1b04eec22d784846d"; + sha256 = "0w0fgby1mz8zjmvplagwh3fj75v1mya2ir3z2lsydgipgwvanc56"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-07-30"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "fcca212c2e966fc3dec1d4baf888e670631d25d1"; - sha256 = "1lr5zll5662x4clzkf4a6ak2izgwla53vf5vsabcpdhm862qc7i0"; + rev = "1360be5fda9c67338331abfcd80de2afbb395bcd"; + sha256 = "17jb7s7syzl2bwk6m888kibs88qb3hh13l2sksyxd733m7lnzb8f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8982,12 +9632,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-07-27"; + version = "2024-08-22"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "c825a3490dc3f6fb413607ed2602c1280a127756"; - sha256 = "01wzw4cykgq8mwg4yi5smfcpkg0q1zvbvmbdk0gyck3cg09s9mfs"; + rev = "ada0798b1bf6d0bde1fbf239c22de778bf5efbd1"; + sha256 = "065f1cvdkaphdpqnslyaj7bk4wqkwa5rk8a2xh39j00migqw9p09"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -9006,12 +9656,12 @@ final: prev: onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2024-06-01"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "70b716fd36a18284ad768402523b79ccdadafedf"; - sha256 = "18vrjaw60225q3phxm7lzf0fvfa3ii9gr2zdgyfvxa85iyzcfqqn"; + rev = "7f8a7482a1145c1286ee05d46ef4d028a4f7264a"; + sha256 = "17c1kvqkh483h7hxpxyn3xc0cwhxlmjs5pvav6gf5rbq88ddc2kk"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -9066,60 +9716,60 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-07-29"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "de02a0cfbe3484accb73025b6dd71b2cc4ae3eff"; - sha256 = "05jj52dz4436cygy5iqhayma24bnafbchjz172cdcm0bivnh7vdg"; + rev = "8ead368a78c7e1df0c15432dfb41d95dd4365f5c"; + sha256 = "1pmdzgb23d3hynaszmdh3fkdgsfbav84vazg7amj4fy372m8dcsa"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; other-nvim = buildVimPlugin { pname = "other.nvim"; - version = "2024-06-10"; + version = "2024-08-26"; src = fetchFromGitHub { owner = "rgroli"; repo = "other.nvim"; - rev = "63f587dde62149bd2ed3e31edceb49d5c4097a26"; - sha256 = "0chlpvz1y1w52s3cqhf5f1pnj0h451qsylfhr33qvg1nf1qmxckg"; + rev = "252cc279eb3d76685ef48aaeced1c3cf9793581f"; + sha256 = "1jcibj2gdhzqwy6rsgv0x246qv2z4maxd6yawymbs9pmxr05lf3v"; }; meta.homepage = "https://github.com/rgroli/other.nvim/"; }; otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-07-22"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "837f258040d0174ff8495584088046f98499b1ac"; - sha256 = "00hfsnpzc9lkxb35grlxf7xzh4m3v83n8am32g2mb8qn1xa9l1cy"; + rev = "ca9ce67d0399380b659923381b58d174344c9ee7"; + sha256 = "1dlqb6ihif3s5w2pydw1iinwhsn8z1in7jxqhrzv274nmnhg1qbs"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; outline-nvim = buildVimPlugin { pname = "outline.nvim"; - version = "2024-07-05"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "hedyhli"; repo = "outline.nvim"; - rev = "2175b6da5b7b5be9de14fd3f54383a17f5e4609c"; - sha256 = "1mlk5i8xrw32038g7s67pl3xy1647ns7nb2ax59my8a9nw1ndhak"; + rev = "6c44527837ff7ac1cd054dc365a721e881020a2e"; + sha256 = "1nxcmdq04qqs57dy6wfjl81hkwcylvkpiqfx2k1176a86p8lldn3"; }; meta.homepage = "https://github.com/hedyhli/outline.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-07-23"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "cbcdcbae3704c21d3ff96a1927d952b8a966b08a"; - sha256 = "0fn57csqmj946rjr5dypcngbpbjh0pay1b1ncc7ij310invgf7kq"; + rev = "e93373531dec5b1cc6d7ae6b7c786da44936a5b3"; + sha256 = "10rc7yxbk3wa8gf2g4lvjrxpxvkhsdw7jsv03s48g2ch3qc6vrmp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -9127,24 +9777,24 @@ final: prev: oxocarbon-nvim = buildVimPlugin { pname = "oxocarbon.nvim"; - version = "2023-11-27"; + version = "2024-08-28"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "c5846d10cbe4131cc5e32c6d00beaf59cb60f6a2"; - sha256 = "1789b010h8yz0yg60xjssl6fz02dbpkq90ldalyqk5p4ncn41qpv"; + rev = "004777819ba294423b638a35a75c9f0c7be758ed"; + sha256 = "1qllk870nqc9nhkdgmqm8km2rar6dsmyhfhpcfx8crrg640yfbqy"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; - version = "2024-07-08"; + version = "2024-08-12"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "018bc10e28b00e28e239b1fff7c497304f8b1bf5"; - sha256 = "0i7hvr8gp4jf7jrds7fa8h09gs8763802j515f8l8q9pa5nnh4s6"; + rev = "268f4669fc29546726009ad665d26901dbf62c3b"; + sha256 = "16lj1x11lp1fiq9ncvcrn3r6mr3s5ailwxs4hgvyvydr4smv1giy"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -9247,12 +9897,12 @@ final: prev: persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2024-07-02"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "4df3f8a03690add1bc2f9a79b31e1c43f5e0dd05"; - sha256 = "1l2a2ilavshxczjwb2rf405zzladsraawby7z1gflw1m3g9qgiq1"; + rev = "3006e641e2892b58fe51511c31595515e1a7dc00"; + sha256 = "19zp691z8lbxyg1fisqz8lf3jgra4sww6c6qj270im8kqc4h2spp"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; }; @@ -9307,24 +9957,24 @@ final: prev: plantuml-previewer-vim = buildVimPlugin { pname = "plantuml-previewer.vim"; - version = "2023-03-07"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "weirongxu"; repo = "plantuml-previewer.vim"; - rev = "1dd4d0f2b09cd80a217f76d82f93830dbbe689b3"; - sha256 = "0pvdiyyqd9j65q9wf3y6jxgry4lxvnbd2ah1761a4vbn02zdrr2v"; + rev = "555347700382c97b347bace57b7a9f764ed556b1"; + sha256 = "0vlx6zbdaw71vlwgs46274af60cazv6d9pa5dn9afm99vls57avq"; }; meta.homepage = "https://github.com/weirongxu/plantuml-previewer.vim/"; }; plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; - version = "2024-07-25"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "8fb95a3ae4354ca2322ef24803d8960fce519eb0"; - sha256 = "1wgr7847fhhq5m062cprdxpnbq3ldsywysa3hbsrvs36r63cxvm5"; + rev = "9d4900aa16674bf5bb8296a72b975317d573b547"; + sha256 = "13m41yyax1sfmg7kwpxmx06rrvlyixnlayazdrn0pfnmiv23jsma"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -9343,12 +9993,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2024-05-20"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"; - sha256 = "0n2p8krzwiw682f0yb6n8faamffpp336rjy50pbqf3jmc6czd5z4"; + rev = "2d9b06177a975543726ce5c73fca176cedbffe9d"; + sha256 = "1blmh0qr010jhydw61kiynll2m7q4xyrvrva8b5ipf1g81x8ysbf"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -9404,12 +10054,12 @@ final: prev: precognition-nvim = buildVimPlugin { pname = "precognition.nvim"; - version = "2024-07-31"; + version = "2024-08-13"; src = fetchFromGitHub { owner = "tris203"; repo = "precognition.nvim"; - rev = "6772d3a6aa98f6e68b53fd7d4dfd7762bf3ae3bf"; - sha256 = "0g7vp64x7ip46n44q2j3d8xprs8slkwj85ar3x09ki5d4mp1kzjb"; + rev = "8a81c310b4e76b4884fc5350a5741cf683c645c7"; + sha256 = "1x6h94jcpyqdqg5ranrmsp2di4lh8kchi03bp80600r54f5sgqf3"; }; meta.homepage = "https://github.com/tris203/precognition.nvim/"; }; @@ -9512,12 +10162,12 @@ final: prev: pum-vim = buildVimPlugin { pname = "pum.vim"; - version = "2024-08-17"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "pum.vim"; - rev = "d9995c8f134ee84322d3dc6f12ea7f061dcacf3f"; - sha256 = "19akkaqja5khb3nqcm7yj84735vzkwqlr37k18bj34ncm60z9knw"; + rev = "fd14ce2c1d4a378d50b6532bb05e7ad7935930c1"; + sha256 = "0cjn0wnn5dnnxgsplsdqj6zfkd5q9jsw17pr284dwj22wbn1p781"; }; meta.homepage = "https://github.com/Shougo/pum.vim/"; }; @@ -9573,12 +10223,12 @@ final: prev: qmk-nvim = buildVimPlugin { pname = "qmk.nvim"; - version = "2024-04-17"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "codethread"; repo = "qmk.nvim"; - rev = "cfa6cecae362d23778cd97317d33ab12671e157c"; - sha256 = "0p44i25iyryrvy1sf3bp10as39mgd6da1gai332rv2ky3zgc3lbh"; + rev = "ad51cb15e607da0983fcf9882d38a2aafac32149"; + sha256 = "14b8mx7hxv06cnh6xb1z0nrkhlj7xaxdky6lcmajn9bp9spdzlmq"; }; meta.homepage = "https://github.com/codethread/qmk.nvim/"; }; @@ -9657,11 +10307,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-07-29"; + version = "2024-09-26"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "a727bd368e70808125b7cf589328cc595faf3d5a"; - sha256 = "1x5bw1kb1nqbz07jjj07bp3vqcr2h9sn61xrr86v3im37akzlg2f"; + rev = "d227e6c9879bb50af35cd733461198666981d482"; + sha256 = "1mp902laz3cq4ysqpxlhyknwja39gs8yjy5ccj82a58v4r86rhmf"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -9798,6 +10448,18 @@ final: prev: meta.homepage = "https://github.com/filipdutescu/renamer.nvim/"; }; + render-markdown-nvim = buildVimPlugin { + pname = "render-markdown.nvim"; + version = "2024-09-30"; + src = fetchFromGitHub { + owner = "MeanderingProgrammer"; + repo = "render-markdown.nvim"; + rev = "cfb8bdddaf52785b80d0805ddb3bfca923256fd4"; + sha256 = "12wk6fppzrjjrcrnd1i7nzss8yqwj2fs6vfwln1wa42c196jqbd4"; + }; + meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; + }; + replacer-nvim = buildVimPlugin { pname = "replacer.nvim"; version = "2023-07-29"; @@ -9812,12 +10474,13 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-06-19"; + version = "2024-09-28"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "e7843c55f9df6a9db9f97dac180035c6ff895a90"; - sha256 = "02iksjxamy83zix1gr495bvigvyzpv466wz6529nydhwkv8vjnbd"; + rev = "e9f923784fbc1c6b69ec1f3d520f5b49d1ea6318"; + sha256 = "0y9ikzillz14dn16lp3vjhgck89v6kj6fdd2hdz6i6g98hvijxbn"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -9956,48 +10619,48 @@ final: prev: satellite-nvim = buildVimPlugin { pname = "satellite.nvim"; - version = "2024-06-11"; + version = "2024-09-04"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "777ed56e1ef45ec808df701730b6597fc4fb0fbc"; - sha256 = "16byf6fa7amxad3gkwi2xyb2i5q5g7c6q0phmf15pqc1skxnr0nk"; + rev = "dfc2b220f4969ebc49b0f2a94ab6faae240705bd"; + sha256 = "1vw3r5mxqwr7imdjsa47kpzqcvr19yafcn99pg9xjyxxqh90lqz5"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; scnvim = buildVimPlugin { pname = "scnvim"; - version = "2024-05-15"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "de0fbc35ddbe023622371211f5cf599a4a960087"; - sha256 = "04gr03bpg6ja3hwfb68lhn3a7m6p2022k3138vcdazzy1gbw6r23"; + rev = "cb6a968b3de9b9a176f4012dd18efcb8d9d34f71"; + sha256 = "1z1jg201q0k6lkywkgl5phxkndklz3yw4cw4h0hp8v7whjh5yn9p"; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; scope-nvim = buildVimPlugin { pname = "scope.nvim"; - version = "2024-07-30"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "5e3f5ead970317b2f276d38dc031cb4bc5742cd4"; - sha256 = "0l4xkjbw42vwmj3j7dgca3pwlv78dsscbxrdz1jz0i381s2inar6"; + rev = "932102696ead2b7ab9ff65017767b57e2722fdde"; + sha256 = "1ma6rrh8dhbm8wwky6pybczy19ziy98wsy55flfamsq5gclkxqyr"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; scrollbar-nvim = buildVimPlugin { pname = "scrollbar.nvim"; - version = "2022-06-16"; + version = "2024-08-18"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "scrollbar.nvim"; - rev = "bc97c132e8367efecb2ecb937d385e7dc04eb5a1"; - sha256 = "14g2q9nzdh9ffp2b8z3sdicrn4xq3ksq8mjxdi7cm44rlfyzfs04"; + rev = "d7e6966c258cb30c29f50012543d687aec707b9e"; + sha256 = "1va53c2l86qwy1cmv77hc8iki4734f760lm4m36hj71m0bdlwkwx"; }; meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; }; @@ -10016,12 +10679,12 @@ final: prev: searchbox-nvim = buildVimPlugin { pname = "searchbox.nvim"; - version = "2024-05-17"; + version = "2024-09-04"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "searchbox.nvim"; - rev = "5cbf11fbaa24da8810f467736cef7dde2410dfb2"; - sha256 = "01nqlfw4l9zncqip5xwvlisqgmqxlkrz6pvgvgiv7p7vbj2kxg1n"; + rev = "8dde416cabb63f6d68c8755365dcd20c65b7b3b0"; + sha256 = "0q0wv2nlvrk8k46lm096sscljmrsj7ccch7il7dp1l4fs67dl1h4"; }; meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/"; }; @@ -10088,12 +10751,12 @@ final: prev: sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2024-05-25"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "8bdd4d19da2268072708d5fe18fda9c23e16509d"; - sha256 = "03qkd7xxi4q7mw1sgnsa9pmkk8012ndg9ij5ssw8l689v5dx6377"; + rev = "76c97d91f8d8818a4fcf14817fadd98412aa44c8"; + sha256 = "sha256-MxFr59crdc9WlYwydM1dI1NU+5qB06xh+hFnNUuBc4c="; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -10112,12 +10775,12 @@ final: prev: sideways-vim = buildVimPlugin { pname = "sideways.vim"; - version = "2024-07-30"; + version = "2024-08-30"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "0ce899109de52c9af1c78abeab945b74dd81904f"; - sha256 = "1xgwcrs2f4wj1scj08a7zrg8jbm2c8ic9yk0jamh82sjxv8cqhdj"; + rev = "5eb971a030a1b5fac7c976582e6cfbe378181f6e"; + sha256 = "1bfdl6k8nfhqn885k7n3yamy17a54yh7qryc1p239li0mqpxa9rl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -10149,19 +10812,19 @@ final: prev: slimv = buildVimPlugin { pname = "slimv"; - version = "2024-06-17"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "e2c2bbb698c89de8c8aa91ad9ab1fd40ef6add00"; - sha256 = "0da4hcqb2936jby7zx84i0i2qxxg4wfkcfx4xx1fa92bgv79s0mx"; + rev = "c6df167f1073e5691d3da9f66632f127e17a128f"; + sha256 = "1zy2xxr6h0lfpcfg98v6jvmfly76hcyg0xrxxp979qz8fn1h20m4"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; }; smart-open-nvim = buildVimPlugin { pname = "smart-open.nvim"; - version = "2024-08-17"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "danielfalk"; repo = "smart-open.nvim"; @@ -10173,12 +10836,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-08-02"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "dbd4d7212d6e9d180ab4197a52cee2ba31b2b749"; - sha256 = "124f84x62aa49jj1bkwadgqzakc2mllc7vpmcixb8dzsmhqwhdkh"; + rev = "22ca8bf770965306082fe23dd22822134bf3b70a"; + sha256 = "0z8d2af5lx1ahly0f00y1gbd533shf9x4zinfkad8g5naajhls32"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10257,12 +10920,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2024-07-13"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "598d29bef1cdea1eef4749c96824af0ae2f9350c"; - sha256 = "12q9zi5vn5mvs4kl8r6wfsk4l66f7lmk9yx0acyvszl3isgyq085"; + rev = "96bc67d0de80110fc5b3854005468fd31395bb54"; + sha256 = "0m113gc03cjpgkrp60xl8fjssrb241n0ynk3ws47pkmhx1mgls73"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -10389,12 +11052,12 @@ final: prev: splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2024-08-01"; + version = "2024-08-19"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "cab1e6331a170403d227a31b5e63759214c37a8d"; - sha256 = "0wy9v1cw4dhmvgnp6g3vrlm6wjmhkz8md6n38qf5ma7brz63qidi"; + rev = "f72d59c9f5d4c8b865e0abfeee98f85b47fe5a3a"; + sha256 = "1vi88nbchsrgwjkmc2a8lra8j0fs3w4g47fs82v5qra7rxikwqcl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -10414,12 +11077,12 @@ final: prev: srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2024-05-31"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "c7398b0b32009406cf3918a655c364c44d7ab99b"; - sha256 = "1bn5jbzs4rv3n8kz00mgvmkk6f9z7m7ki1ayynhlmkknqmf8izmq"; + rev = "fa2242a3dd81804468241c0a8ebb32266c33fa60"; + sha256 = "13qq617i6cv0kzr2hsz2qn2r9hvm4hyj7pq0bc5x3nq94g4kzaal"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -10438,12 +11101,12 @@ final: prev: ssr-nvim = buildVimPlugin { pname = "ssr.nvim"; - version = "2023-10-28"; + version = "2024-09-07"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "bb323ba621ac647b4ac5638b47666e3ef3c279e1"; - sha256 = "0w578iy0m0vvfyawjpfpi2yl51acay4alwm3g7pgf8h8rcya3pv8"; + rev = "7c95cfa5836508f08ae833a4b31d2ed265560f64"; + sha256 = "0dn6k7jd12ddgyrx580lygqv48xzn5pnh71xi7iaf1sr2f5r8ff2"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -10510,24 +11173,24 @@ final: prev: startup-nvim = buildVimPlugin { pname = "startup.nvim"; - version = "2023-12-20"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "max397574"; repo = "startup.nvim"; - rev = "c6ba324f9eba0c23b675b53af431346aab893268"; - sha256 = "0vp4vfrlb39z4s4617v1xkzjkx6l5sxfravfj2wkkwzpjrqfs2bl"; + rev = "81222a9956148eebf10363726d8bccf8793aa41f"; + sha256 = "1z5gv2qr3q82hmk8vjdxk37q4nm928j3vbq91vw4nary90va8q46"; }; meta.homepage = "https://github.com/max397574/startup.nvim/"; }; statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2024-07-31"; + version = "2024-08-20"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "93d8bcda516fc86e11c03f9ef577bae9a72fba0e"; - sha256 = "0cc0v0jfdgw9pd27l2kn5fargpcgw6vp3qlg0vbyknizhy1a6326"; + rev = "1022f922b77b44c36f8057ac29adbfd89ce86958"; + sha256 = "17pj9qlpigwdizrz62w36hndd1zr9iwmzxrr5whm2fz3dd1zwkg6"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; @@ -10594,12 +11257,12 @@ final: prev: supermaven-nvim = buildVimPlugin { pname = "supermaven-nvim"; - version = "2024-07-17"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "supermaven-inc"; repo = "supermaven-nvim"; - rev = "d71257f431e190d9236d7f30da4c2d659389e91f"; - sha256 = "00wmbl3882j2nydy38mgcar73x7im8qyiw7svi0dcdb108yqi4xz"; + rev = "40bde487fe31723cdd180843b182f70c6a991226"; + sha256 = "1786iga78xlbzpn895b85g8kkj717xi8v9c2bmf1bb4gw5w5m0k6"; }; meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/"; }; @@ -10701,14 +11364,26 @@ final: prev: meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; + syntax-tree-surfer = buildVimPlugin { + pname = "syntax-tree-surfer"; + version = "2023-10-06"; + src = fetchFromGitHub { + owner = "ziontee113"; + repo = "syntax-tree-surfer"; + rev = "732ea6d0f868bcccd2f526be73afa46997d5a2fb"; + sha256 = "0x7kpmxq3n8531ca2bz506swww92wd3x16d125wrk54rxp1lv1cd"; + }; + meta.homepage = "https://github.com/ziontee113/syntax-tree-surfer/"; + }; + tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2024-07-31"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "43d61e7418c062c18b67b2136fcc564426f08db2"; - sha256 = "1snhf1shnqc4ybx19f1vf1jz09vwsjn5flqbjq1g65nm03m176kk"; + rev = "c58d9803f9526b0c8c8b7bfd43822764e33b30ba"; + sha256 = "1jx0z3hi9ic80l50a0qz8pffv258mdi6whlfy2x680qb5hm8p74h"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -10764,12 +11439,12 @@ final: prev: tabout-nvim = buildVimPlugin { pname = "tabout.nvim"; - version = "2024-05-18"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "abecodes"; repo = "tabout.nvim"; - rev = "3d7fbc7f5e91ef0f96b4d787c78ad9f8820de3ec"; - sha256 = "1v5bjy8d4y5yiyccijdqcsw61dvvbqdd7c54cvc5v0l5rlhbp20d"; + rev = "923aea2613c9e7abf81e099d46086f62c7e54896"; + sha256 = "0d6v5xqx3bck6h17cbnkllyyfflwjjz24vzcijjz6733igh48q22"; }; meta.homepage = "https://github.com/abecodes/tabout.nvim/"; }; @@ -10812,12 +11487,12 @@ final: prev: tagbar = buildVimPlugin { pname = "tagbar"; - version = "2024-07-27"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "bc087d88defc0a63df3cd9284c2ecf4fcae42ce9"; - sha256 = "0hr777yshkvkyj4bvlpz8iz3zv53lh6v84bfdkvkfz8dnsn6vhk7"; + rev = "d55d454bd3d5b027ebf0e8c75b8f88e4eddad8d8"; + sha256 = "0yyscdzdh1mrgcr3w0727byqvvavd9r5a7728j717wvg139r0h9r"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -10834,6 +11509,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/taglist.vim/"; }; + tailwind-tools-nvim = buildVimPlugin { + pname = "tailwind-tools.nvim"; + version = "2024-09-26"; + src = fetchFromGitHub { + owner = "luckasRanarison"; + repo = "tailwind-tools.nvim"; + rev = "4b2d88cc7d49a92f28b9942712f1a53d2c3d5b27"; + sha256 = "05mnbrzfsrkxnv9fz3f0bzwrw833rgcvj0wxgf8pvjjvdjnpl1ax"; + }; + meta.homepage = "https://github.com/luckasRanarison/tailwind-tools.nvim/"; + }; + tailwindcss-colors-nvim = buildVimPlugin { pname = "tailwindcss-colors.nvim"; version = "2021-12-24"; @@ -10884,12 +11571,12 @@ final: prev: telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2024-04-22"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "nvim-telekasten"; repo = "telekasten.nvim"; - rev = "319276a7853ff996b7bb1ed4250d8047c84ad29d"; - sha256 = "05b8a9h8ni5pmj0x9r3pc8j4h77nbj2s6wmlx20w4h2vmwwp7k26"; + rev = "ae6473da3d7ee7ca5cd7df413d3934169a857a75"; + sha256 = "1sqgzhhqwvl6549rv97r2r75bw4k010jrwjj2d3p6ajk803m8yrg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/nvim-telekasten/telekasten.nvim/"; @@ -10945,24 +11632,24 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-08-04"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "a46780830b576049c675680650f773bedfa8677a"; - sha256 = "0z0brmjymb0gcfmmlyiiq9ixd4hvf93h856g0g2hl37b19n2mdax"; + rev = "3b8a1e17187cfeedb31decbd625da62398a8ff34"; + sha256 = "1vll5da8k1a0wqs44f7kcn6i0iwrzisiyja2z44x48b3maqkr2p3"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-08-02"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "25d01edae8a2d74bcaa706c003b2712bce1e3301"; - sha256 = "01c9j4z8ihksr4cz3fhdk78bc392sybk3nhm254x95cbkzmdrfky"; + rev = "f67baca08423a6fd00167801a54db38e0b878063"; + sha256 = "197ijmyjqb27hfrxsa53x265qgfpka8997m1ndlql1wxgyz8as0g"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -11042,12 +11729,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-08-04"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "284fcbcf67a39df45288582625689db2d2ae400d"; - sha256 = "0mikidw4n6dg3vxa7vfakqvjkbhih8hj4qscwpf051l7dkbmf0lj"; + rev = "2d8d592b99afef0aff0e91c3935a826853290316"; + sha256 = "1a86frhz7c13ga8g3z191wyngb75qd4cpjsp40yzxk679zvrclpa"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -11066,12 +11753,12 @@ final: prev: telescope-project-nvim = buildVimPlugin { pname = "telescope-project.nvim"; - version = "2023-12-01"; + version = "2024-09-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "1aaf16580a614601a7f7077d9639aeb457dc5559"; - sha256 = "1g03lnl79245d0vn7ydda4aixd2qbv9kcxc584msk7jwbc58r2xn"; + rev = "796200876bb0fe8157b8eb1ce03d927d3827a052"; + sha256 = "1ib4i83x24xg1jmxbzk0h6d24if3pa75zhmz2qhvvm6kjfdxrvy0"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -11174,12 +11861,12 @@ final: prev: telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; - version = "2024-07-05"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "natecraddock"; repo = "telescope-zf-native.nvim"; - rev = "9c23e2fce1c0c7445f68f7765e5f3e512920184b"; - sha256 = "1cf2pwkbdnsm8qaqizjcidn12sfgn7yamxxr87h13cy5jl9v861x"; + rev = "5721be27df11a19b9cd95e6a4887f16f26599802"; + sha256 = "1h4id0qb3b764y528hgf6a0mr9wm9vnl1yhw8kn8dc8qmg65wap5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; @@ -11187,24 +11874,24 @@ final: prev: telescope-zoxide = buildVimPlugin { pname = "telescope-zoxide"; - version = "2024-08-02"; + version = "2024-08-28"; src = fetchFromGitHub { owner = "jvgrootveld"; repo = "telescope-zoxide"; - rev = "76386e0f8ea417f69ed42751d2008471a88e5ff8"; - sha256 = "025lmm6mhzjj3d1ph05cd51xmk5jkn7whdhd8mx4gz6k4s6894n7"; + rev = "54bfe630bad08dc9891ec78c7cf8db38dd725c97"; + sha256 = "06rgpid2z8hwxmpwly9sz4p0g200fnf32sa3mdvh2060hq0g4rrc"; }; meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; }; telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-08-02"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "3b1600d0fd5172ad9fae00987362ca0ef3d8895d"; - sha256 = "16lnbb8cazvfb69vg71gcj8f60dkmms0vnpc00z0c3fjyg6wd50p"; + rev = "cb3f98d935842836cc115e8c9e4b38c1380fbb6b"; + sha256 = "05d8ziw6y8530rd8gal0shija3cb3d9bm7yhy6k1jh5m5ni1rpkg"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -11247,12 +11934,12 @@ final: prev: tender-vim = buildVimPlugin { pname = "tender.vim"; - version = "2024-04-21"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "f361e9d907d2e5df703ee995f9032021ef674f2f"; - sha256 = "0fx7cc3xh5bpd1c6jlgp4qxlh6bfzgja7mf9mp84lhd6gj9mfqy6"; + rev = "a5b769250d5c62b6a794d5cd397998699278be57"; + sha256 = "1nkkqk8xm20alv60z7gl68j2qh3s4xmwfc7j074kv8yy9rpvk810"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -11343,12 +12030,12 @@ final: prev: themed-tabs-nvim = buildVimPlugin { pname = "themed-tabs.nvim"; - version = "2023-11-09"; + version = "2024-09-01"; src = fetchFromGitHub { owner = "vhsconnect"; repo = "themed-tabs.nvim"; - rev = "2ab0e463b929d717b58d10d600589e1ef642f7a4"; - sha256 = "04i76ndixdi2vpavqb6dy0pf72a7gya4dsr6l1vyjmray45jbda0"; + rev = "90a967a4537bb4d13fd6fd33eb14b3cb3a8a1c4f"; + sha256 = "03bzrdyli84aa2qnj7a5haglq1vbvlpxz6scd0zjqwr1wlj8qgl3"; }; meta.homepage = "https://github.com/vhsconnect/themed-tabs.nvim/"; }; @@ -11403,12 +12090,12 @@ final: prev: tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2024-08-10"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "7b212b214aed37d8ae1a26ac6ca9593223a23ddb"; - sha256 = "0zf3l8fx7vbq352ip3lrvvhrkkwp8n7n5i2lh5ps8j0jqaxswr33"; + rev = "1a83e7ce5c9d0ae4d89fc5c812b55ff8ed1d39e7"; + sha256 = "1bjf996ria9sghf51wmck7gn2x57vdabrzradpjn94x78iai85rl"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; }; @@ -11463,12 +12150,12 @@ final: prev: todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2024-07-22"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "8f45f353dc3649cb9b44cecda96827ea88128584"; - sha256 = "0f6ranmfx33cvymigxyvrz4f8jb8k2k9mhlq7fqi5bl1ash0add7"; + rev = "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0"; + sha256 = "0v6vn3f9svj756ds8cp0skpw65xixlx1f3aj0fh374wdpb5i4zhh"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -11488,24 +12175,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-07-17"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "8ed0f52006d3207ec6c94de7db62da840937ef2a"; - sha256 = "0w57bwci2fjm1a2z65d9dd3pj4fq90a7qj1pcf209j24xzni9sqv"; + rev = "137d06fb103952a0fb567882bb8527e2f92d327d"; + sha256 = "1bmmz7ypzs4yfsky0z8d9pda8r3imlxf2f0k8n3fw327f7kc8lan"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-07-24"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "b0e7c7382a7e8f6456f2a95655983993ffda745e"; - sha256 = "0l61q9mardc0p0pg6vrmp08man2mah385ldq1kpkc19y7s9s85hp"; + rev = "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839"; + sha256 = "0xvdhq7400rh1450ybvw6pg4kdqfrs6k3408ibb9asw2l6mv6j3p"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -11536,24 +12223,24 @@ final: prev: transparent-nvim = buildVimPlugin { pname = "transparent.nvim"; - version = "2023-11-12"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "xiyaowong"; repo = "transparent.nvim"; - rev = "fd35a46f4b7c1b244249266bdcb2da3814f01724"; - sha256 = "sha256-wT+7rmp08r0XYGp+MhjJX8dsFTar8+nf10CV9OdkOSk="; + rev = "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21"; + sha256 = "14d9jy9lzybr49i287n9ijcphrppb3l0kgixdpd5r7daqn0qncza"; }; meta.homepage = "https://github.com/xiyaowong/transparent.nvim/"; }; treesj = buildVimPlugin { pname = "treesj"; - version = "2024-07-14"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "275f83c81a5a1f5ae23c1eac30c4ac28beebbca2"; - sha256 = "0wjhhzs65myl3hrwi12v4vqgjcqdmkh5cczpx164vcxkqa0zz06p"; + rev = "0d81326b5afd36babe7dd480aabbb0b05f33e688"; + sha256 = "0r2njhwbvia4rw919ncblyf9rgq3n1mqlsyl76jqjwiw6bccvzmr"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -11584,12 +12271,12 @@ final: prev: triptych-nvim = buildVimPlugin { pname = "triptych.nvim"; - version = "2024-06-02"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "simonmclean"; repo = "triptych.nvim"; - rev = "d7ced78687c2ab203743edf0725761f6664f66cb"; - sha256 = "0ciz9j262z7ijarpyg1yxb3vcqvm8fhar6245fj7wliirnrs7jaz"; + rev = "7fae7598870f5010696fb79427a475ab0232f175"; + sha256 = "1p2x86msjmr3zdamrqwmy1zqlv6nig08fwqj8ddwl4r123dq4ima"; fetchSubmodules = true; }; meta.homepage = "https://github.com/simonmclean/triptych.nvim/"; @@ -11655,6 +12342,18 @@ final: prev: meta.homepage = "https://github.com/jgdavey/tslime.vim/"; }; + tssorter-nvim = buildVimPlugin { + pname = "tssorter.nvim"; + version = "2024-08-16"; + src = fetchFromGitHub { + owner = "mtrajano"; + repo = "tssorter.nvim"; + rev = "74fa4102cb3272dcc8fd5696fd3240358f19c090"; + sha256 = "1y64w5aggh0k5xf0y8xsjbkzinn8gx2qhhqlww89k43dblq07pa4"; + }; + meta.homepage = "https://github.com/mtrajano/tssorter.nvim/"; + }; + tsuquyomi = buildVimPlugin { pname = "tsuquyomi"; version = "2023-10-03"; @@ -11729,12 +12428,12 @@ final: prev: ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-08-01"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "1420fb9e07b1d80cc6d87e7d90827fb2c1109cb3"; - sha256 = "1g1mpgkjxla0lhdsn6z81zcm66zf56zps6na3f6r36jn2ii1rm18"; + rev = "ff21db642847840db183b9421ab3d89795a7fbba"; + sha256 = "0rkxfmacwwpzifpnqfbizla425b7gfay0jfgw84bfidspvc33vab"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; @@ -11753,12 +12452,12 @@ final: prev: undotree = buildVimPlugin { pname = "undotree"; - version = "2024-04-16"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "56c684a805fe948936cda0d1b19505b84ad7e065"; - sha256 = "1yy7y344b906z04rrnvy2hkrgsrxjm6ij399qmfw8b20rxdyi2jh"; + rev = "78b5241191852ffa9bb5da5ff2ee033160798c3b"; + sha256 = "1w4sdbcvlicb3n4dpzv8l9g41xl3pqslni227lf88b4p5pjsfkax"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -11777,12 +12476,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-08-03"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "f63cfbeadb199bf5426e24457e20d869ccc4e1b9"; - sha256 = "187hrd6pp1pa9p8vd3r271x5yanjvj94149pih8hqld07ian6ai5"; + rev = "d9725278fe9078ffd692886d7f5b251b4f149b59"; + sha256 = "1arris70l44z3wkxvwlfgf0n3iyvrwqbgx2k8n1h7gdm65h756sj"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11885,12 +12584,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-07-12"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "d44bb199ed3a47891051a1d4cdd4d33b9d1267f9"; - sha256 = "0kfl7z86vzlbhvyilf8s6bdc3ppz9ab7gjiv29bpkwggaqavlc1m"; + rev = "b1fe33e532aa360203e8015a557ba79dd38e07e4"; + sha256 = "0gwcn7r43143k95k5gzni6g9gj20kf5k4yy0gax8kdmdfc6660k1"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -11921,12 +12620,12 @@ final: prev: vim-LanguageTool = buildVimPlugin { pname = "vim-LanguageTool"; - version = "2021-02-08"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "dpelle"; repo = "vim-LanguageTool"; - rev = "0372ffae78aa3eac3bfa48ba3bf2f4015a86385a"; - sha256 = "00476l49lczj1rw5gb6vs7s9r0zi1khw0g1v6bsfwl5r32699l7r"; + rev = "a1034c0d904217d4dd14479fee69dba09e77ef19"; + sha256 = "0ckin319m93v9mj4l63jhmk7gm3ssy7yk8dh595kagnc0ylj8jjr"; }; meta.homepage = "https://github.com/dpelle/vim-LanguageTool/"; }; @@ -12077,24 +12776,24 @@ final: prev: vim-addon-manager = buildVimPlugin { pname = "vim-addon-manager"; - version = "2023-11-01"; + version = "2024-08-29"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-manager"; - rev = "6b194728345dcd3e5eae9ee1f30e03c09c254d7f"; - sha256 = "11z1654h1pgndrykwjzll0f95pk9sx5cqad5dqpmfx66msxm9pff"; + rev = "585197500a4920c031467196e41335ca997aca6d"; + sha256 = "1g5la0qhimh8aqdnwgrr6hlvcjx8wy06hmvwydfidp0dn4ngh2mg"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; vim-addon-mru = buildVimPlugin { pname = "vim-addon-mru"; - version = "2013-08-08"; + version = "2024-08-15"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-mru"; - rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; - sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; + rev = "d7e4fe31a882e4ad48b599b51f6a9cf671f77a05"; + sha256 = "17k943dw9rp8wdn3m6zp9zlq7l2l7kn6508xcx4bd3rr1wnddrij"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-mru/"; }; @@ -12185,12 +12884,12 @@ final: prev: vim-addon-toggle-buffer = buildVimPlugin { pname = "vim-addon-toggle-buffer"; - version = "2012-01-13"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-toggle-buffer"; - rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; - sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; + rev = "0cfeea3dbbfe181c16ddc51d91c79d28920789ae"; + sha256 = "04wpbkmd0pdmpwdm5fihs4l3ig0q7rj8fa8zn34a0h5168mf1w6x"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-toggle-buffer/"; }; @@ -12233,12 +12932,12 @@ final: prev: vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2024-07-23"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "d25c049e617775eb2eb26c580e5dec591c94d480"; - sha256 = "0pq63f30cqsbq4q669h6ps64hxz05a2b7z3i09lfj0fpa1a27p0h"; + rev = "81eca994860645acbb58442285cdd70df5c71d2b"; + sha256 = "1q2wgavd2ff3iqkq8khzp1h5r651vjz5z90xlz7fyl10lmfm4j10"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -12281,12 +12980,12 @@ final: prev: vim-android = buildVimPlugin { pname = "vim-android"; - version = "2023-09-30"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "26990f9fa27b23ca5faf83e14d56711c0fec40ea"; - sha256 = "1iy9ap2i9lmqcjaqb38syb240m834ifacv79cjiwzxcpr23vq4r1"; + rev = "62192c9079b942aa3c9f6d34a1bc312bf54d0301"; + sha256 = "0d1miihh7f7kghp88a8q38b19hfhlnwg821rd6yc2w7yvkzfh7bx"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -12737,12 +13436,12 @@ final: prev: vim-codefmt = buildVimPlugin { pname = "vim-codefmt"; - version = "2024-01-13"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "6fa1616adebeffe26fadf5a1a61996ccdcbe46a1"; - sha256 = "0qjy8jr5d6kx880nj3vh5p769c2v729dy19pnw0dn57qzwvi142d"; + rev = "ff464a478202df40ae484e6e94a1d56587fcc69e"; + sha256 = "05hkn0vkaybrv6pz6xgvbyvzcc9hl0mpykfv32jamgwkdrfm9in1"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -12953,24 +13652,24 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2024-07-30"; + version = "2024-08-15"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "c3ab458fb7c94c2fc4baae4e2cd5601eec9d27bc"; - sha256 = "0kjawhzipwqk8cwbna5frh1mvj026affp1bky2crifvx981zls00"; + rev = "880f7e9f2959e567c718d52550f9fae1aa07aa81"; + sha256 = "046nia4fkgjyip2i5q6dz3023znn3avc7n04hy8zji0jr29brj4i"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-07-22"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "0f51d8de368c8c6220973e8acd156d17da746f4c"; - sha256 = "1pb61wwm7vma4dilxryyf1bzq05yh35chlnqfng0wxr9b9hj8r7r"; + rev = "f29c85ab42861c6ef683289b0c6a51e0d436dcf6"; + sha256 = "04k271jzbgfxfr3c88fgkpfrgwaxqzdy45yw9sximwpgbayky1ls"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -13049,12 +13748,12 @@ final: prev: vim-dirvish = buildVimPlugin { pname = "vim-dirvish"; - version = "2024-04-03"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "3851bedb7f191b9a4a5531000b6fc0a8795cc9bb"; - sha256 = "1b5fg5d1rvnh9ipl4q1sh4xwgkn55hip303mm13h3ckmcy1cyilk"; + rev = "2ddd8ee63d6066ae910b29285d9786cbd0226657"; + sha256 = "0vjnr6rq27g9aamqdvyg4yszbs0jr4zlp3lvb0n109nbdma680rb"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -13073,12 +13772,12 @@ final: prev: vim-dispatch = buildVimPlugin { pname = "vim-dispatch"; - version = "2024-02-18"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "4c695bc052cad2ae6b980aebbe48d046466e27ae"; - sha256 = "13c63n7gylny2s84k05cpl4cjn070d3qk6yagxny23yanz29hc15"; + rev = "a2ff28abdb2d89725192db5b8562977d392a4d3f"; + sha256 = "07z8vvsydl6p5ss6ipg2g0igihn92x4jyjmmb43z1d6vimra7pgv"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -13193,12 +13892,12 @@ final: prev: vim-elixir = buildVimPlugin { pname = "vim-elixir"; - version = "2024-07-22"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "753fc863e488bd09580221d7829c3e4735a99fdb"; - sha256 = "0bzhbsnpabln2p6r1ns6dmxb6x01jy002y60w8ah49qjn6qnmk1n"; + rev = "39cfaec9ea71c22a82c459ecd64860c8850f1215"; + sha256 = "12j1gqkm3dhcfx1axi8cl2zzj20z9a3xf5ggyqlr41f1bzpmprdh"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -13215,6 +13914,18 @@ final: prev: meta.homepage = "https://github.com/andys8/vim-elm-syntax/"; }; + vim-emacs-bindings = buildVimPlugin { + pname = "vim-emacs-bindings"; + version = "2016-10-07"; + src = fetchFromGitHub { + owner = "kentarosasaki"; + repo = "vim-emacs-bindings"; + rev = "a8037ef1b0cc0eca9aca15d4e2cab6d462aa57ee"; + sha256 = "18bhcvs5vnrr394waz9mg2fdnrycsc2ng589s2jw892pap9zxq36"; + }; + meta.homepage = "https://github.com/kentarosasaki/vim-emacs-bindings/"; + }; + vim-emoji = buildVimPlugin { pname = "vim-emoji"; version = "2018-01-30"; @@ -13457,12 +14168,12 @@ final: prev: vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2024-08-02"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "dd7a1cf09d034ffa063bedfef4f13891eff06f3a"; - sha256 = "0w3p2vxc3rk1zc4ka4yhv9rxpn57c5x5a82w0257sawhxy0jqbji"; + rev = "6f80c1ffa7068ca8cc0e29af7af4f6ed0717e65e"; + sha256 = "10y1dycyfzqrcm47yihvgbvbvm49d77lm51s3rya4q7zplr5mqzg"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -13479,18 +14190,6 @@ final: prev: meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; - vim-fsharp = buildVimPlugin { - pname = "vim-fsharp"; - version = "2018-11-13"; - src = fetchFromGitHub { - owner = "fsharp"; - repo = "zarchive-vim-fsharp"; - rev = "012d98c981139976551a4d9779f5cce7f8d84d5c"; - sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw"; - }; - meta.homepage = "https://github.com/fsharp/zarchive-vim-fsharp/"; - }; - vim-ft-diff_fold = buildVimPlugin { pname = "vim-ft-diff_fold"; version = "2013-02-10"; @@ -13517,12 +14216,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-07-18"; + version = "2024-09-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "0444df68cd1cdabc7453d6bd84099458327e5513"; - sha256 = "0sx67lwz1f6kd2751qbbzpgq0hjik1g8x4svp788yvzbjdgdmc9l"; + rev = "d4877e54cef67f5af4f950935b1ade19ed6b7370"; + sha256 = "17cf21k77fwsl67m4f1ln17dadz5i5g8fjhsw1cc1y1c3jn1xdh2"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13575,6 +14274,18 @@ final: prev: meta.homepage = "https://github.com/raghur/vim-ghost/"; }; + vim-gina = buildVimPlugin { + pname = "vim-gina"; + version = "2022-03-30"; + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "vim-gina"; + rev = "ff6c2ddeca98f886b57fb42283c12e167d6ab575"; + sha256 = "09jlnpix2dy6kggiz96mrm5l1f9x1gl5afpdmfrxgkighn2rwpzq"; + }; + meta.homepage = "https://github.com/lambdalisue/vim-gina/"; + }; + vim-gist = buildVimPlugin { pname = "vim-gist"; version = "2022-10-09"; @@ -13673,24 +14384,24 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2024-06-20"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "a64d097a1af1772c24d13f34529b9be2a34b7721"; - sha256 = "13g79hgfqaismmd74751v3c5nhv8dmmrv5qpqbx7ghh3zd7h65kv"; + rev = "ac1fb9611de435d80a6badcf8482cb1428449b10"; + sha256 = "199zz6b4yj757hy7vygsy9mjws00j0k8vgcy90ndcrl774jpjqfh"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; vim-godot = buildVimPlugin { pname = "vim-godot"; - version = "2024-02-17"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "habamax"; repo = "vim-godot"; - rev = "f9c0b36b299efcc4aa4cb119a2be36a83fe10388"; - sha256 = "sha256-HKp3CQwAOs+7TL8MjWZ2EHLHMZ3Ss7AckAZ5eOjTDEg="; + rev = "d21e110ee09b5030e55adda660a4ff58db40a329"; + sha256 = "0fx6j7q9cyspghpnv9iy4ba99pcyjkq23rbyrd95i5dxlhzgj5q3"; }; meta.homepage = "https://github.com/habamax/vim-godot/"; }; @@ -13709,12 +14420,12 @@ final: prev: vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2024-08-03"; + version = "2024-08-06"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "1653be93f32ea529a03eac04ed2bfe46533ac8e8"; - sha256 = "1pv7g2ggjilvgjfnkldp07wdwfv4z3j46qb0pfnf53xn71qk25w9"; + rev = "9caa247f88991ebfa45df21cbe1c8bec50039f6b"; + sha256 = "0903may6c1yna3nqjib9x9zapd3qpq7p9inaxkb9173a5laksgfv"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -13733,12 +14444,12 @@ final: prev: vim-gruvbox8 = buildVimPlugin { pname = "vim-gruvbox8"; - version = "2024-06-29"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "008b7773e5f2cba625a5fcc5acc543b28b19cd26"; - sha256 = "0qligdiaxa7liikgm4hpda8i51y1dyzd1xq7c2kwk4ysxadlvk5k"; + rev = "60bb03df34fd6f22aed9dcb71f5cb297b6cceb3f"; + sha256 = "0xbjs441xx9sjvqfbp7nrfiw8cqgsbccy3xgq1rklkvxib9gdbyp"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -13950,12 +14661,12 @@ final: prev: vim-html-template-literals = buildVimPlugin { pname = "vim-html-template-literals"; - version = "2021-06-03"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "jonsmithers"; repo = "vim-html-template-literals"; - rev = "e6f3f8ffaae9c2f9deea2bbb596b64468041616c"; - sha256 = "1lrkby9m60ccgm35y1z82llgzjd5vmdwfscy7byjd5ycnkhyangi"; + rev = "54edc719402c08b409d192e97f77325c418fb12e"; + sha256 = "11pfzsizvkzkhjivlfgjjzajyr4cb93wqrhh6862q50ib6kxkv05"; }; meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; @@ -14106,12 +14817,12 @@ final: prev: vim-jack-in = buildVimPlugin { pname = "vim-jack-in"; - version = "2023-04-17"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "clojure-vim"; repo = "vim-jack-in"; - rev = "4cefab20f02c44249499f43200442a3176315acd"; - sha256 = "1jvqfqf11gv8ww5gh4xxxdrpflaw1pw8f10p1y8slc63var5i8vd"; + rev = "7fed7961a8b59265dc34c27c4cdbc410b3c25a73"; + sha256 = "09x7n0xc9bigyxj2rnalqqsg1ajkvlx9nk4gl3kdp9qpcksdbabz"; }; meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; }; @@ -14188,6 +14899,18 @@ final: prev: meta.homepage = "https://github.com/seirl/vim-jinja-languages/"; }; + vim-jjdescription = buildVimPlugin { + pname = "vim-jjdescription"; + version = "2024-05-28"; + src = fetchFromGitHub { + owner = "avm99963"; + repo = "vim-jjdescription"; + rev = "ca14325202f3cd894d01ba833451017624249222"; + sha256 = "1y83fdih991ivlvgcwp0sx97icmf9k6px7mr26vb77izjlf011w2"; + }; + meta.homepage = "https://github.com/avm99963/vim-jjdescription/"; + }; + vim-jsbeautify = buildVimPlugin { pname = "vim-jsbeautify"; version = "2020-12-11"; @@ -14287,12 +15010,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-08-04"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "b6952c89dde3687202cd397db37dc96344a444e0"; - sha256 = "1mr9pdzvd1fd30wwgz72i8xsi76rycib1xnc8gin0ns6x6795xa7"; + rev = "8ed1e472b72b739bd852d2b9a2d688b3da015cf5"; + sha256 = "0946xpb35vl38bvbzn6dbqy22819qw0d5z1q5xacqqyh8sp9hqb4"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -14455,12 +15178,12 @@ final: prev: vim-llvm = buildVimPlugin { pname = "vim-llvm"; - version = "2023-05-31"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-llvm"; - rev = "c5d6c6a9ef21df2a32aad0f3b5ca5389f92d06d1"; - sha256 = "1gnamw4whrvw3qbs8bkr45akzwkzinnkyhjpwgzza90w8a99nds6"; + rev = "7bb02ef3c6c41aa5510d4aa9817fd40936be8209"; + sha256 = "0z61dx7x2g1mw6rs7vix0wgwm1bf5nhgnfr25vkgwwjbjd3d5dkh"; }; meta.homepage = "https://github.com/rhysd/vim-llvm/"; }; @@ -14515,12 +15238,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2024-08-05"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "356254d6388298017589114a8eff15d20def90aa"; - sha256 = "0pkca4bm0cskwka45l6rn2mfy6cqmab8hs2cay2dlfi9h52w72jc"; + rev = "04428c920002ac7cfacbecacb070a8af57b455d0"; + sha256 = "18naarfr01ljlkl37x3l5y2sd9j9xxdz1gkcvz7ylvspyxjmx7fa"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -14539,24 +15262,24 @@ final: prev: vim-lsp-cxx-highlight = buildVimPlugin { pname = "vim-lsp-cxx-highlight"; - version = "2021-10-20"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "jackguo380"; repo = "vim-lsp-cxx-highlight"; - rev = "0e7476ff41cd65e55f92fdbc7326335ec33b59b0"; - sha256 = "02gyxhx39zqphqybsj8sgg70ilgcp0jaj9lcmyyivljg0qirnxhf"; + rev = "e0c749e955446b4e9e4cc33833fa45e30d8a15fe"; + sha256 = "153p37lhyvhr0702iz50s0rh41xp78vr8ksc61cwvipb0sf3xnrk"; }; meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; }; vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-07-25"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "65749446c8c8556d0c287bcd724084a625913d02"; - sha256 = "1lzxbb8yz92h3fkbsc9ccim6pdnjfj4hdxs6b0iiqi8qq7a87wf1"; + rev = "02cd145c223ddf1dfb3069303400946d1907ccec"; + sha256 = "1853ngvr86366dr38c3b9rv0246ybvw6gg16025rrfvlbi2wbcxl"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -14635,12 +15358,12 @@ final: prev: vim-markdown = buildVimPlugin { pname = "vim-markdown"; - version = "2024-03-01"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "a657e697376909c41475a686eeef7fc7a4972d94"; - sha256 = "11f26n433fvsih2b31b7ffanxfhgjnjvdkjvviav2ryc5dvidb3q"; + rev = "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51"; + sha256 = "14x6jfla4921jyx4xxqng9vzmb0iaj2nn7wckhmlx8jpks6r4834"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -14660,12 +15383,12 @@ final: prev: vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; - version = "2024-07-08"; + version = "2024-09-01"; src = fetchFromGitHub { owner = "mzlogin"; repo = "vim-markdown-toc"; - rev = "9b6ff787fdd50299e18c8b5bf1b5dc319fdbf435"; - sha256 = "1j9xysvwhvp087ak3vvdcbkskkp78hlrr20jbldfx53vys4syagh"; + rev = "aa9cc3b07791db5cbe5f29d661763bc0eb4fb7c1"; + sha256 = "1pssg8idbzqln68qbr9z1fkiw7z2a5jjvpvl3q73hycfw5z5xm0l"; }; meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; @@ -14684,12 +15407,12 @@ final: prev: vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2024-05-29"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "1535a769d5dca851fe7d41b0be95f7c7203a4bef"; - sha256 = "0vw4fwyzkhg0fqavp90mq5smh95qcksjbld7cfpyrzqcj678h3fk"; + rev = "1975afe63198ab6a0dff7200919828e5cd4330b9"; + sha256 = "05gwlf5fmkvs4p92n7l397brb8g6g62pvxcd93kffv289vmx7rzk"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -14768,12 +15491,12 @@ final: prev: vim-monokai = buildVimPlugin { pname = "vim-monokai"; - version = "2022-12-09"; + version = "2024-09-30"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "6b6c2b698e94d0af8d8f2307be01571ab8b7b74f"; - sha256 = "1pa1fylfzammcy7xvl2wlgg2qw8yzrzr7yf0vdalqfmxkakma1z8"; + rev = "9db250617c625d3265b54a500d9774debcdf4749"; + sha256 = "18fj5m39amap98g8p3qbqw3h0wrir57g8qkgp8bxv16bwlxdlj9k"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -15284,12 +16007,12 @@ final: prev: vim-pets = buildVimPlugin { pname = "vim-pets"; - version = "2024-07-26"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "MeF0504"; repo = "vim-pets"; - rev = "17d33f160c8fd3fb6492e7cd76f397ddaa26ad8d"; - sha256 = "0zn6kf088kqfdf5y0x6sd8rr3skrjwppsdfxmf044qk1h07lcgcc"; + rev = "bc97ede44da9ce6551bbd57146ba4f98e5421b8b"; + sha256 = "1gcz58mrglxrd4cd1k1mr4xhys5l8qs4wg7a66q7m50j5rzz5nyc"; }; meta.homepage = "https://github.com/MeF0504/vim-pets/"; }; @@ -15488,12 +16211,12 @@ final: prev: vim-puppet = buildVimPlugin { pname = "vim-puppet"; - version = "2022-05-21"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "81943d532dee24f8518f855dfb17160809abfdfb"; - sha256 = "0h2gxif4zmba7728p1w2yh1zakfj7phjnzaca5sv16aw9cihzq5g"; + rev = "10bf0b27c5be81ee26c3a0d32e39b270f95329ce"; + sha256 = "0a6gvzz27f2121hdnzszcs6haw8pysp1k1wzq3ygjq0nzrddnlk1"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -15596,12 +16319,12 @@ final: prev: vim-rails = buildVimPlugin { pname = "vim-rails"; - version = "2024-06-23"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "2fba7907f585819a8653f0bc7dd7f437a822d9c6"; - sha256 = "0a2m0mszy2n8xi1c47a7w0kmrnxpzfirxnzjghkdm5nc2fn3rxgn"; + rev = "d3954dfe3946c9330dc91b4fbf79ccacb2c626c0"; + sha256 = "0b64a05vcw16amszl52whzm52wdclc42bg9wpaypd3j7fy97qxd7"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -15644,12 +16367,12 @@ final: prev: vim-rooter = buildVimPlugin { pname = "vim-rooter"; - version = "2024-07-02"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "4a0df2f1b0f3d69e8f7e19afe464a7c3a7af89a2"; - sha256 = "07a5543ms7r129bb5d7iwhy4pdzy5ygz9w2gziczpcwj40b5932w"; + rev = "51402fb77c4d6ae94994e37dc7ca13bec8f4afcc"; + sha256 = "0fdb8z9f65mz0718l35bz3mqk7ksk9b64v1ppha089g61xqmifi6"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -15812,12 +16535,12 @@ final: prev: vim-shellcheck = buildVimPlugin { pname = "vim-shellcheck"; - version = "2024-06-04"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "itspriddle"; repo = "vim-shellcheck"; - rev = "52aaa9c0d976756923ee8bd5f02f7d6a4a7f1bcc"; - sha256 = "1749wi96gj9qzkws3hs494mnmc9w99s8gcmi35qzwng77jp7jvqm"; + rev = "35bccea0c566f9f005679d02fed07e96092e100b"; + sha256 = "140r70q9dy7l2v7zxxrv45gswr5i3hbvbazaz2cgmj2g3if4d91h"; }; meta.homepage = "https://github.com/itspriddle/vim-shellcheck/"; }; @@ -15884,24 +16607,24 @@ final: prev: vim-sleuth = buildVimPlugin { pname = "vim-sleuth"; - version = "2023-01-10"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "1cc4557420f215d02c4d2645a748a816c220e99b"; - sha256 = "0l8mw3r6lb6q1p3afvf5psp6cg8vdi84b5j8whmdm83f4mynsn8a"; + rev = "be69bff86754b1aa5adcbb527d7fcd1635a84080"; + sha256 = "0wqxdjgplf04nq428ialw1w03f8nh5vb629a17vl5gc9gf3zfanq"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2024-05-22"; + version = "2024-08-23"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "ca59df2570e1a12f9ddfa90b6118df4d87453fcd"; - sha256 = "06c2j7a97al2pyj2immjba3h7bv0ldlw7dly3halikxn01qdznr9"; + rev = "f6bbbeb8f18393f2177cdcef764f3e0e1d7e9328"; + sha256 = "186j2f4il5ayz3ff9d5ay94ff0kjmj03dzwsp3rj4v6wgacc1q46"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -16004,12 +16727,12 @@ final: prev: vim-snippets = buildVimPlugin { pname = "vim-snippets"; - version = "2024-06-10"; + version = "2024-08-13"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "96d79529edc3dee1ccf2ce7b75a88cb546ec2501"; - sha256 = "0b23p9yqbix0b2vxsh9g9la369540b1281x4qb7ysddivmf2jp5p"; + rev = "f0a3184d9f90b96b044d5914625a25c554d7f301"; + sha256 = "19n9p1fzx0vb1l09gff50p8vzhp4bank9m8smrq1ngw1innrd9wc"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -16052,24 +16775,24 @@ final: prev: vim-speeddating = buildVimPlugin { pname = "vim-speeddating"; - version = "2022-10-10"; + version = "2024-08-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-speeddating"; - rev = "5a36fd29df63ea3f65562bd2bb837be48a5ec90b"; - sha256 = "0zwhynknkcf9zpsl7ddsrihh351fy9k75ylfrzzl222i88g17d14"; + rev = "c17eb01ebf5aaf766c53bab1f6592710e5ffb796"; + sha256 = "1pibhqvd5wicw20vxsrqzirmi0y8rzsgfzn4cmws1nvjf72gkh10"; }; meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2024-07-30"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "4a76fb65b4255258b3530eea77be24d4d5cc4a4e"; - sha256 = "0af3k752br47s1xiwf3gssq0wxim2hd5j4a50zbns0rz69sn84r5"; + rev = "4e9f4ccd1d8cc35cc913d70b74f13c99f0d3ed55"; + sha256 = "1wlbk9n772wg8r37d7qvxpz5jw1slqwhqaq9vq01a1fixrn0j2i9"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -16305,12 +17028,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-07-30"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "75b64f23c923d34b56e47846a026210feb57146a"; - sha256 = "0pz2gh1qhakbshpgsnc6rqvk8wg9n2sdchnkgklpm1s8qfibkhyj"; + rev = "c090bfd93919888bb0b86e1ab707bc6a3095097f"; + sha256 = "1qkgzazxj6f94ivnrd3cjlvfa2pn4hsbkf6v64fanck4m68x1jpb"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -16389,12 +17112,12 @@ final: prev: vim-textobj-variable-segment = buildVimPlugin { pname = "vim-textobj-variable-segment"; - version = "2022-07-16"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "Julian"; repo = "vim-textobj-variable-segment"; - rev = "51c323dca5c44f7a8e5a689b9156ef818d02188e"; - sha256 = "1fvy3il883b7czwsai1pq80hslra23c7ff23ydhvzxgfip9qrkxc"; + rev = "12e07590db6c90586ae5b750d6123c0779f6b35b"; + sha256 = "0p8jaxd4vz5vzv9008cdhhmbb1hn5b382axnrazxixwalhd7pk23"; }; meta.homepage = "https://github.com/Julian/vim-textobj-variable-segment/"; }; @@ -16449,12 +17172,12 @@ final: prev: vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2024-05-26"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "5b3c701686fb4e6629c100ed32e827edf8dad01e"; - sha256 = "0kcrz2hlv672v0967n7zz1f5xl8vh41nmps0pvms9bplw1p5nzx3"; + rev = "a9b52e7d36114d40350099f254b5f299a35df978"; + sha256 = "0sfsyf2jk57511pba6g31zfp0qi6v02np78sq6pzgny8qv40rj11"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -16485,12 +17208,12 @@ final: prev: vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2024-06-13"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "f59f144b73e79aae7a73bb86bf527e79ad86de8f"; - sha256 = "0h16bs65ic5iwry8mq22v4xkn1wc2a6xin0vqn5qnlg38q7fgpn1"; + rev = "72a624f97730059bab359cb0b58a23433bfec308"; + sha256 = "1sz3mqsji14yrrrkvnx00dgaf908zkwq9m2myb5jk2gyj3z1dgib"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -16629,12 +17352,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2024-07-05"; + version = "2024-09-01"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "38b0e8d94a5499ccc17d6159763d32c79f53417b"; - sha256 = "03gn3wdi1gk3z8nki6cgcsad2xyabwwczxiip6dxmzmwfbg0s34y"; + rev = "a6975e7c1ee157615bbc80fc25e4392f71c344d4"; + sha256 = "15jrxvaip6mncl8b8q8c1i82m20m1mld11gv75x9hqng3y85cc1b"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -16725,12 +17448,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-07-20"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "53bba6bb8342de9cbdafc82142a9b5e82008d858"; - sha256 = "02q2fyinapfr8y0fndv3q7x6ri42nlvpy6qc7cklszx77q4y0a89"; + rev = "f699e30ca1ba0c7f316847316fd0ba19d3ee51c1"; + sha256 = "0v21r1yj6s28vhqym200n33qgdrjwxjrpzjzkax81cbmmp6a6fbc"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -16821,12 +17544,12 @@ final: prev: vim-xkbswitch = buildVimPlugin { pname = "vim-xkbswitch"; - version = "2024-06-19"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "bcd79dd6a1b74efe1a16c70fe6a06bfc6a99e543"; - sha256 = "1ym08zy9lbqakflbif48kvgirfd4fajpaynmx8wgp6q2xhks6xvd"; + rev = "39914ff3aa3a5678285ba4b740524351d9f5ae18"; + sha256 = "1v4q17wp2bifiz7pp379nizvskfy2fk87hhc4qd9fib81fvshf80"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -16869,16 +17592,28 @@ final: prev: vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2024-07-30"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "121a95905452c59c04f04e9055aa246913650e2c"; - sha256 = "0wbm85adrjqljk1jfad4kydbr5aiv7hq39fs41ka4vr0hxbqd33f"; + rev = "207290f8c60ca4f31e52f53e221e1e50aee7e5d7"; + sha256 = "15y6jjmmvrkqdrc1fa0p5nzi89hw8252gf3cywd3pa0d1a8lspi0"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; + vim-zscript = buildVimPlugin { + pname = "vim-zscript"; + version = "2023-10-02"; + src = fetchFromGitHub { + owner = "marrub--"; + repo = "vim-zscript"; + rev = "8c9352effb0847f838dbe32dc946ab38937b3d26"; + sha256 = "1q619ial566gbf93d8v13njkhqx6blmcp402cpa3may4npf3qric"; + }; + meta.homepage = "https://github.com/marrub--/vim-zscript/"; + }; + vim2hs = buildVimPlugin { pname = "vim2hs"; version = "2014-04-16"; @@ -16929,12 +17664,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2023-12-12"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "31dd31c96fc03fb158e1f40f72f3661ef5a9152d"; - sha256 = "0wph29fkp5hcziy3ym9854dds9lrm0g7w4b98bx1ks05lgx6wxzq"; + rev = "3f447b01fc9cb759b34d01773087f646119fbed8"; + sha256 = "1lm26hxw1mi6gfp0qq6bwmnjkzmjsz8fn2ai7ianxcmhc5zz2paf"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -17001,12 +17736,12 @@ final: prev: vimproc-vim = buildVimPlugin { pname = "vimproc.vim"; - version = "2023-01-05"; + version = "2024-09-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "bf06f3f9bb1b60542fccde1ed7499798d1154db6"; - sha256 = "1nd6wrwwgz499inl42gih99da0nbpgwak6mswavs3ra906d3nsy3"; + rev = "63a4ce0768c7af434ac53d37bdc1e7ff7fd2bece"; + sha256 = "06ylhf544861far7sfkyngsn6hsnfp24ha2xhzqsh0q8qww9z3wk"; }; meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; @@ -17037,12 +17772,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2024-08-02"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "6dfbe470866c9ddc41288c4463a1389bfa6efa74"; - sha256 = "1h8cy8dkfzs3j72ygvcl2hlv71jp0q7h4gz2k1krsqngxk355s45"; + rev = "8d497913d4fc311cc6884889eb4aed062ef9c177"; + sha256 = "170kqy9ndqs656ccrjna8ygpcgz55app8bqbkm288spvcnacs9lr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -17050,24 +17785,24 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-07-24"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "5ac62e0315c6f54f53a7d6da7c485cf8e9cf7240"; - sha256 = "0kj1nc86qib6n58ds18aiszbnfgqbjk92d5lcpypf1fcfjvyvv84"; + rev = "b9cc11536a4e726c58c4776e9bcecff26fc454cb"; + sha256 = "17fl1gyax3ia0jk15n0c5863njcprg3zjicw87kb95vkx0gy5wzw"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPlugin { pname = "vimux"; - version = "2024-07-27"; + version = "2024-09-26"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "c4ffa0b992798f3362b27642088dccb251aaef1e"; - sha256 = "1n8xlym81442ak4r442k9prc69a2y92nwid2kbynj2v05r8fa0sx"; + rev = "7db6b2f79d432ee3820668b1d4625311dbe1d0ad"; + sha256 = "1q3kbi7kkhvp12l9skl263sa63zgy30hzl97jifia1llwsjjzg2p"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -17146,12 +17881,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-07-28"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "f6c88cdf9d37d5c0bb1e492a13a3b4b4cc4dd13e"; - sha256 = "0v4izydhq4jc6jaw7a38d0w2mlw93jdijaql7y2hk8fp44sn51q1"; + rev = "7de58b7a6d55fe48475d0ba2fddbcec871717761"; + sha256 = "0daq565dmy027qlzfqx08gr9zwjcp4n1cppjpz2ri4gxbjhvgak4"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -17194,24 +17929,24 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2024-07-24"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "6c1584eb76b55629702716995cca4ae2798a9cca"; - sha256 = "0qwwj4r5hvsmsjz352aqa4hv3f9pms6r67c4yh5imn5iyvinrzwy"; + rev = "fb070344402cfc662299d9914f5546d840a22126"; + sha256 = "0p66gn3cxmkx6ldp38gnwqnwy3d3qdhhl1gr1xaw8gliry0jwx9z"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; whitespace-nvim = buildVimPlugin { pname = "whitespace.nvim"; - version = "2024-07-08"; + version = "2024-08-18"; src = fetchFromGitHub { owner = "johnfrankmorgan"; repo = "whitespace.nvim"; - rev = "e196282cd6b01ff0ce736751146fd4db49a42205"; - sha256 = "15b5f4fcxn837gxhza4dkfa2sm01iay6d1janbp31pl81q0lhacl"; + rev = "f7d14be0f23a9c1e8021aca70d280aea26649b68"; + sha256 = "0c2im0qjzxw6mflc23w3m00qwnsbyqxlqllmia5d4akhzagjsdy4"; }; meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/"; }; @@ -17230,12 +17965,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-07-27"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "d58c97290d75ac594198a4647cbbb0c5094ce9c6"; - sha256 = "1x1279d19gkn27zx6rqj1c5bmpbqawz8zmadld0k5l4h43m8wz2s"; + rev = "8188ff7b62b7695eae44257bd6202d8494fee655"; + sha256 = "0w7h0xdhdxn7lniyx4qrxhfnq892z4p4p2pf2jgbsnhzj3dhhv87"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -17338,12 +18073,12 @@ final: prev: wrapping-nvim = buildVimPlugin { pname = "wrapping.nvim"; - version = "2024-05-25"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "wrapping.nvim"; - rev = "3a823200c297885b70515fa8d974e1763c578e26"; - sha256 = "1srk34zppj7lyw69yh5w7014s1mh5bdn7k74yacifwrwnwwdxj5n"; + rev = "a5210c29be19ed736eb3333677e08a57efebce78"; + sha256 = "02fvg2rrbklr3dns2x726icgv6ilmdwkz25q4nf9mnwr4bbrd212"; }; meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/"; }; @@ -17362,12 +18097,12 @@ final: prev: wtf-nvim = buildVimPlugin { pname = "wtf.nvim"; - version = "2024-07-10"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "piersolenski"; repo = "wtf.nvim"; - rev = "7aefcc970ea56dc0a89dafdf9f5eb0de7b1ee58c"; - sha256 = "157vdbbrqqal1jhh68bzwvgv3wn12yfmhkjkvwp3jb4h40m974zs"; + rev = "16eec1f32c3608bd8519e9e520041fe34201abb0"; + sha256 = "1clpik3z79mvxxph5z4ghiwrq560jy0zdr0yxmp9byl2r0ggfa64"; }; meta.homepage = "https://github.com/piersolenski/wtf.nvim/"; }; @@ -17410,12 +18145,12 @@ final: prev: yats-vim = buildVimPlugin { pname = "yats.vim"; - version = "2024-05-31"; + version = "2024-08-17"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "9b16b86f7be4603b416ab18a9e57a34e86e7bec2"; - sha256 = "0j9am39pdgl1swbxax1kjn57fni0z41y8gdw8m8hmmmqam9va6dh"; + rev = "b325c449a2db4d9ee38aa441afa850a815982e8b"; + sha256 = "1czjq0zf00jhfrq182diy3z7vpsb2w16jwbijinb1dpjgq6klh0h"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -17423,12 +18158,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2024-08-04"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "54ad21d33c329c4dfa33a327257dcdc1048ba586"; - sha256 = "0qka292h4a68mfqk630j9p7skgxqnb998d60p0w1h0508lz66ahz"; + rev = "1f8bcc422956e347d2fe5e2f1e323d45130ae399"; + sha256 = "1xwl3k5l40z2wz6frgr4bg5pi1v0107nhljz6mwbldzxpfzjakyh"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; @@ -17457,6 +18192,18 @@ final: prev: meta.homepage = "https://github.com/elkowar/yuck.vim/"; }; + zarchive-vim-fsharp = buildVimPlugin { + pname = "zarchive-vim-fsharp"; + version = "2018-11-13"; + src = fetchFromGitHub { + owner = "fsharp"; + repo = "zarchive-vim-fsharp"; + rev = "012d98c981139976551a4d9779f5cce7f8d84d5c"; + sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw"; + }; + meta.homepage = "https://github.com/fsharp/zarchive-vim-fsharp/"; + }; + zeavim-vim = buildVimPlugin { pname = "zeavim.vim"; version = "2019-06-07"; @@ -17471,12 +18218,12 @@ final: prev: zellij-nav-nvim = buildVimPlugin { pname = "zellij-nav.nvim"; - version = "2024-01-29"; + version = "2024-09-03"; src = fetchFromGitHub { owner = "swaits"; repo = "zellij-nav.nvim"; - rev = "25930804397ef540bd2de62f9897bc2db61f9baa"; - sha256 = "07x3z5a1wgil0cmhr0hw7xacgj9cyj6qyf1mb2c9p9dh87ll0j2d"; + rev = "511e9b7bb7165ef817dbfb40169cea9b4d3c3d44"; + sha256 = "0cvdxzbz45ac46s1i811l67g1hg5wgsb8hy7rrzbw52mq8qbkliw"; }; meta.homepage = "https://github.com/swaits/zellij-nav.nvim/"; }; @@ -17507,12 +18254,12 @@ final: prev: zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2024-06-16"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "zenbones-theme"; repo = "zenbones.nvim"; - rev = "e9ba8305f65524f9355515cdd8704b2c6ba2def6"; - sha256 = "0bmj5b4n0rj7i1nh9lccszqv3jbcdcjw5gi6v010d3cf312rkda6"; + rev = "12daea796d5079a65dd7032bb85540443e8b30e8"; + sha256 = "1a4b1zr3kpf1mcqq9zssa9hs75l5v8f4x18abh20q4v0x0ad59mi"; }; meta.homepage = "https://github.com/zenbones-theme/zenbones.nvim/"; }; @@ -17543,24 +18290,24 @@ final: prev: zig-vim = buildVimPlugin { pname = "zig.vim"; - version = "2024-07-24"; + version = "2024-08-28"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "ad75bb5752f3556d8bde5b0e69cb69a98058030e"; - sha256 = "0wgjasakkcdzr5zv553gc2x2kzg0778y6qi7rswqbfxxadlkl5xj"; + rev = "15d6510b77a4efbb6ffcb151ed7e2ce4de4d06f6"; + sha256 = "1f45d75df822djcsyxmg3v4ddh78nc1ii8mcwrjcwjqxlh6vm16y"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2024-07-23"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "dbf4eeab55b08856c9d6b6722dbff39630bb35eb"; - sha256 = "1d6qz2yi4d0ccpibjh3c366qh32hd9r646m1b99vy16r27ydffcs"; + rev = "8942fcc7ba2477e3e0d8097c806eec41cd844fd1"; + sha256 = "14psk650j0n39n5dnz14idxkwywls5dspbaz0bpsvq5qzfdxm0bq"; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; }; @@ -17591,24 +18338,24 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-08-02"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "ba5f4153a5dad99505baba936bd0373534400ac3"; - sha256 = "0wfs4zff1q1dxblj9imfbvbkxywc193kg2kmfrfqqfg9x24ih47r"; + rev = "63685e1562ef53873c9764b483d7ac5c7a608922"; + sha256 = "1b283i43p1i49mql84s6njfnf4mdf9csknp9hdkjjagwfi509wgm"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPlugin { pname = "catppuccin-vim"; - version = "2024-05-28"; + version = "2024-08-14"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "43771ad2a9ee18b276fb2c388906b904be361dde"; - sha256 = "0bj1g4lliayia561gfxv6hk12hig68fq3vwi5n3brxi0li7gjm40"; + rev = "060000804cf50315ac6dd986bc4d84fbc40cbc9c"; + sha256 = "1faxniddq6zcsb93bsm93lkf01mc4jfzxls5vyxmac6rc5v2k1n4"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; @@ -17627,24 +18374,24 @@ final: prev: embark-vim = buildVimPlugin { pname = "embark-vim"; - version = "2024-06-25"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "dcc90e04ac9c9392bf32c1e5f701353d8c5290c7"; - sha256 = "0a5lb5a4c5c39nhwy6vyb2d8qkjpwxdmlff84m4z116q332rc9b1"; + rev = "530e361aa81a8665c3a909a787b918aaf7d702e2"; + sha256 = "1fyjri2i8cg4kykx64xf4i6xwyfdgzhimmr2mpwhjwgkjh8mhlph"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; gbprod-nord = buildVimPlugin { pname = "gbprod-nord"; - version = "2024-07-13"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "gbprod"; repo = "nord.nvim"; - rev = "6d6bae56a002a4da507ba263776e9691f47deb5f"; - sha256 = "103j8jcj82pdzjj06bn0avkm2ng2k83fm95ivc31fjbcd5gp1dmp"; + rev = "b3d53bffd87a9aef6ff7e3976f6953f615c0d357"; + sha256 = "0ifa0vmk14isn9bj73gfxqhr2wfg7d0kd0z0k2607z9p0lm2qimw"; }; meta.homepage = "https://github.com/gbprod/nord.nvim/"; }; @@ -17687,12 +18434,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-07-25"; + version = "2024-09-29"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "19efaf31cbe15a429cb3ca6ac9c9fce13275045b"; - sha256 = "1kpg8bkjdcna8327pb212dgh5rxij0ahvc30qn7bb5cwjcrfzbp5"; + rev = "f4f932d3129fee10a0e944445fe6be5abf76465c"; + sha256 = "1kpba0yk6zkzws3221pmsyyaq467j3a7iqa1rjzzcgd47sf237az"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -17711,12 +18458,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-08-02"; + version = "2024-09-25"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "967d8b27811f3b2a2ac3fd2de27e5a4992dc0770"; - sha256 = "19ah7rxbrjl92vqa195labbc8kphq3nh4cc84i6n5cykhzv4jskw"; + rev = "eaed6e10c5d59dd355165bf1384e1597aee640ba"; + sha256 = "1w2xrgdss5l7q5963z7amlyz1agwrmbgb5nfbn6rmhxw4m0zvrki"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17745,18 +18492,6 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; }; - render-markdown = buildVimPlugin { - pname = "render-markdown"; - version = "2024-08-05"; - src = fetchFromGitHub { - owner = "MeanderingProgrammer"; - repo = "render-markdown.nvim"; - rev = "af67ac5f95bc7a31e5d2aba5527c2ed14fb8be2c"; - sha256 = "115xfcn9d6v7rim780xhf7a2dx5cx7wbca1lsgy45msm4x9i18ar"; - }; - meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; - }; - restore-view-vim = buildVimPlugin { pname = "restore-view-vim"; version = "2014-11-21"; @@ -17771,12 +18506,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-07-25"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "e4b08d74b7272cb21e4e9c71b8b9e0830fd722fe"; - sha256 = "1wlr2hm8818f5cdy757kir6vwnh777vrji4hsnzhbbdj3zk9w115"; + rev = "8b1fd252255a7f2c41b4192a787ab62660b29f72"; + sha256 = "0djiabbm8c9kxwaz2awb5a9a20qiy5xap9r9prwiak4apk96v299"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -17807,28 +18542,16 @@ final: prev: vim-advanced-sorters = buildVimPlugin { pname = "vim-advanced-sorters"; - version = "2021-11-21"; + version = "2024-08-16"; src = fetchFromGitHub { owner = "inkarkat"; repo = "vim-AdvancedSorters"; - rev = "079856080d42e5ea91fadabc39c2906b2d0a0a67"; - sha256 = "1phzragsq4pflvhjzqlxvdsmiyp7z5b68d2a0frn2rj07av0bn91"; + rev = "f6d29af8a2291895973bf98c2630cc68a8115068"; + sha256 = "09p0qmwvswz3hxca6nakqszplpb1mffv5y9bwnlxab1xm17id6df"; }; meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/"; }; - vim-emacs-bindings = buildVimPlugin { - pname = "vim-emacs-bindings"; - version = "2016-10-07"; - src = fetchFromGitHub { - owner = "kentarosasaki"; - repo = "vim-emacs-bindings"; - rev = "a8037ef1b0cc0eca9aca15d4e2cab6d462aa57ee"; - sha256 = "18bhcvs5vnrr394waz9mg2fdnrycsc2ng589s2jw892pap9zxq36"; - }; - meta.homepage = "https://github.com/kentarosasaki/vim-emacs-bindings/"; - }; - vim-docbk-snippets = buildVimPlugin { pname = "vim-docbk-snippets"; version = "2023-09-29"; @@ -17841,17 +18564,5 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; - nvim-dap-rr = buildVimPlugin { - pname = "nvim-dap-rr"; - version = "2024-07-10"; - src = fetchFromGitHub { - owner = "jonboh"; - repo = "nvim-dap-rr"; - rev = "1682c13a2096a4a6394c803e14f009f121400acf"; - sha256 = "sha256-QtOY6gg2grsxF6KTn75hZ+BZGWK2ahzVu9k2SIIFeJU="; - }; - meta.homepage = "https://github.com/jonboh/nvim-dap-rr/"; - }; - } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 4c995c70da184..a42e09834187b 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,46 +27,46 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=31182d4"; + version = "0.0.0+rev=745d3c6"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "31182d43b062a350d4bd2449f2fc0d5654972be9"; - hash = "sha256-E+MrOQJIUsAGPMIIM43gROs1yIiokCHXJB2pmWGe0i0="; + rev = "745d3c65c2294aca1110b6b6ad6805124be605c9"; + hash = "sha256-4i1B4r+V5QgBIPVJepQ7V2pJDQfafLxRG1sk4XZVrco="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=c99ad4b"; + version = "0.0.0+rev=69330ef"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "c99ad4b16d112fea91745e3f1b769754239fdaba"; - hash = "sha256-tl/MajAsdu7YxQcdFZmupZldhCl6QB//4FwiBR44nm4="; + rev = "69330ef89fb6b7b2dd16b639d86811e9262c7369"; + hash = "sha256-OO+KttgnPk18EtYmxNphn3if2p3QRNRrXQTYZOmmglc="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=afb34b2"; + version = "0.0.0+rev=415ebc8"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f"; - hash = "sha256-iccyGSsbNDhvkrT20/bqx9s5tkghl6DONzJz5UEtTJ8="; + rev = "415ebc8f75eb02a748faa03f5af199f08ced120f"; + hash = "sha256-cgmlrAeuCnocdjI/zvafMxmXPmOE7GnrC+HlNJcT1Y0="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; asm = buildGrammar { language = "asm"; - version = "0.0.0+rev=b0306e9"; + version = "0.0.0+rev=55b2b91"; src = fetchFromGitHub { owner = "RubixDev"; repo = "tree-sitter-asm"; - rev = "b0306e9bb2ebe01c6562f1aef265cc42ccc53070"; - hash = "sha256-xmuusYIDpttr97ZJrouW0VB02pZG8usQ9kMsARRHeJI="; + rev = "55b2b913f1e71136027d6fce8212e760c64f3532"; + hash = "sha256-DJhnC+kbKK6ibmg7DgkSCbZoTBnH7q7yYfSxI/flsHE="; }; meta.homepage = "https://github.com/RubixDev/tree-sitter-asm"; }; @@ -94,23 +94,23 @@ }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=ba74721"; + version = "0.0.0+rev=553fdc4"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "ba7472152d79a8c916550c80fdbfd5724d07a0c9"; - hash = "sha256-ywrd9wCdrQ9UZPXvB8fUkelFaZzHxL+hDAPSecMueFs="; + rev = "553fdc4afb3b603332c3f4baf50c711506f4e797"; + hash = "sha256-LJ+jRomCepFH8QbHTgecaDZ3dlO1kgjs5i71kIWi1bg="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=2fbd860"; + version = "0.0.0+rev=c8713e5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "2fbd860f802802ca76a6661ce025b3a3bca2d3ed"; - hash = "sha256-rCuQbnQAOnQWKYreNH80nlL+0A1qbWbjMvtczcoWPrY="; + rev = "c8713e50f0bd77d080832fc61ad128bc8f2934e9"; + hash = "sha256-xqiUJhl7nfOlS6wBYWpmrGLCvWoJCA5fz8DCX85Lxog="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -127,12 +127,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=384c55e"; + version = "0.0.0+rev=01c0da2"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "384c55ede2a1f13e83d8e18dbef8f11304c379c2"; - hash = "sha256-OEfiJWF3+wxwaqk4kyMSvJG9c6NbyphHG2hnf7fCiOQ="; + rev = "01c0da29e0fc7130420a09d939ecc524e09b6ba6"; + hash = "sha256-obIGlAXe+Y1vffXTGgFRpiqof+F9bSRLq9NJGZcvhVE="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -193,23 +193,23 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=be23d2c"; + version = "0.0.0+rev=f4c2115"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "be23d2c9d8e5b550e713ef0f86126a248462ca6e"; - hash = "sha256-6R9bx0UMjln8W1DrHG1AyA+Ziq9XGuLti2m/bC6lPgg="; + rev = "f4c21152f1952a99f4744e8c41d3ffb8038ae78c"; + hash = "sha256-DcW6KZVTjJtPx0iNXvizeAXWW8iaShKGF4+sHrwXPvs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=31a64b2"; + version = "0.0.0+rev=fd7f740"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "31a64b28292aac6adf44071e449fa03fb80eaf4e"; - hash = "sha256-WBOA6CIW56RuiHhwiuP9R+K2kK6Chfx05TP3mdjMxo0="; + rev = "fd7f7402db6e66afd70b402fb2e367b2d71c10d6"; + hash = "sha256-kj3YWtpitPgPas02I+FAZKtHBVqX7yAy8Ldi0b8IPqk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -270,12 +270,12 @@ }; comment = buildGrammar { language = "comment"; - version = "0.0.0+rev=5d8b29f"; + version = "0.0.0+rev=3555706"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-comment"; - rev = "5d8b29f6ef3bf64d59430dcfe76b31cc44b5abfd"; - hash = "sha256-19jxH6YK3Rn0fOGSiWen5/eNKPKUSXVsIYB/QAPEA1I="; + rev = "3555706cef8b98d3e4c7379d7260548ff03ad363"; + hash = "sha256-7iY7D7wz+rYRWhi+429a2pcF0mUMBCnnecIssxlqvt0="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-comment"; }; @@ -325,23 +325,23 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=0b4aa47"; + version = "0.0.0+rev=30d2fa3"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "0b4aa47f07d958a49260aadc87e8474b03897c23"; - hash = "sha256-z2cG/woWbpvLJdmlN7ZuPiDwWhHnmwr3speMDFz3cEk="; + rev = "30d2fa385735378388a55917e2910965fce19748"; + hash = "sha256-O7EVmGvkMCLTzoxNc+Qod6eCTWs6y8DYVpQqw+ziqGo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { language = "css"; - version = "0.0.0+rev=f6be52c"; + version = "0.0.0+rev=a68fcd1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; - rev = "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af"; - hash = "sha256-V1KrNM5C03RcRYcRIPxxfyWlnQkbyAevTHuZINn3Bdc="; + rev = "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7"; + hash = "sha256-o78Od04Ss4S7hbJG41eTN7Mw/i6Dh+AVfENYnPO9/qo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; @@ -359,12 +359,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=7c97acb"; + version = "0.0.0+rev=635e8aa"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "7c97acb8398734d790c86210c53c320df61ff66b"; - hash = "sha256-E5bXdBfCE1lP5GngZBZ4qn9kKPQYVDvdvE5UPMoUsas="; + rev = "635e8aa3747823a0c4e9660c07cef76fe8d3ef93"; + hash = "sha256-+KHenEgo9wMncjEIJZoqS0x089hjdR3J1t+x663qy1M="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -381,34 +381,34 @@ }; d = buildGrammar { language = "d"; - version = "0.0.0+rev=ac58458"; + version = "0.0.0+rev=45e5f1e"; src = fetchFromGitHub { owner = "gdamore"; repo = "tree-sitter-d"; - rev = "ac584585a15c4cacd6cda8e6bfe7cb1ca7b3898e"; - hash = "sha256-+6+9x+5pyjv252X3XzpN2CnrUXVzMvaCrCPVhhjEELo="; + rev = "45e5f1e9d6de2c68591bc8e5ec662cf18e950b4a"; + hash = "sha256-q96RgJWrMop2HBBsQloVTspe3EaMtUL3wmVuT9xnE/g="; }; meta.homepage = "https://github.com/gdamore/tree-sitter-d"; }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=ac0bb84"; + version = "0.0.0+rev=9ac03bb"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "ac0bb849ccd1a923963af47573b5e396736ff582"; - hash = "sha256-yEI0a+YlEdjlmSTWZFdVUr7lwuK4wNsE9WycOkXzoG4="; + rev = "9ac03bb2154316624fb4c41fe0f372a5f1597b43"; + hash = "sha256-8bSlsDi1QU0Z9sLxrTfqOi6aB1fe+jP9lHuIjIGNx1o="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=fb07e60"; + version = "0.0.0+rev=07a647c"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "fb07e6044ffd36932c57a5be01ba5d6b8a9337bb"; - hash = "sha256-DKC+aUkdz2eGrXCXzW751aleG4Fxwmjn2KetTCOQRDY="; + rev = "07a647c8fb70e6b06379a60526721e3141aa2fd2"; + hash = "sha256-2uJEItLwoBoiB49r2XuO216Dhu9AnAa0p7Plmm4JNY8="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; @@ -503,12 +503,12 @@ }; earthfile = buildGrammar { language = "earthfile"; - version = "0.0.0+rev=b0a9bc5"; + version = "0.0.0+rev=1d637f2"; src = fetchFromGitHub { owner = "glehmann"; repo = "tree-sitter-earthfile"; - rev = "b0a9bc5737340a9b80b489fe9ae93d7b2fe78cd7"; - hash = "sha256-dIpoLqfIb+vsxe2DszOAKztL+YTDAVGlNccYhYe170U="; + rev = "1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce"; + hash = "sha256-KzswtiuFyT1xFDDHGhQi+cT/VfGVOgHn7nfUm4ZB9M8="; }; meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; }; @@ -526,12 +526,12 @@ }; editorconfig = buildGrammar { language = "editorconfig"; - version = "0.0.0+rev=fd0d64d"; + version = "0.0.0+rev=a761198"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-editorconfig"; - rev = "fd0d64d2fc91eab903bed4c11ce280b62e46f16e"; - hash = "sha256-7Q8+XEGWqOnkLW7b9Vnubr2LhvdTK48at45k/Gsm9Us="; + rev = "a761198025448c77ea11bcf22505b395a77fc0d0"; + hash = "sha256-KuaXFJGp1kxn0hqssiAFYL36zb0HY22warBb/40Ftzg="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; }; @@ -559,23 +559,23 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=c7ae8b7"; + version = "0.0.0+rev=ef124b8"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "c7ae8b77e2749826dcf23df6514f08fdd68c66a3"; - hash = "sha256-1B3jVMJs1WNU3K7t42mv9Ab85KEaa8vn8zURksNts+E="; + rev = "ef124b83a3f3572b0af23db4efae3f8de06a15e1"; + hash = "sha256-5fZK8dP+ldw3Uvi1wbD5Wq4jOK3CH/iUSGsQVjik2CI="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=09dbf22"; + version = "0.0.0+rev=27f502e"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "09dbf221d7491dc8d8839616b27c21b9c025c457"; - hash = "sha256-Bq2oWtqEAsKyV0iHNKC+hXW4fh4yUwbfUhPtZWg5pug="; + rev = "27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc"; + hash = "sha256-o5ou/9/TCzc9HuGzvSSZE2iyWCOwYk0c28KEgGrOiiI="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -603,23 +603,23 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "0.0.0+rev=38d5004"; + version = "0.0.0+rev=62b0a6e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "38d5004a797298dc42c85e7706c5ceac46a3f29f"; - hash = "sha256-IPPCexaq42Em5A+kmrj5e/SFrXoKdWCTYAL/TWvbDJ0="; + rev = "62b0a6e45900a7dff7c37da95fec20a09968ba52"; + hash = "sha256-F0colhLIN7+1uPAa+z5kBaXIWx/ZxFB28uqNt24QyGo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=8f41b58"; + version = "0.0.0+rev=0dfcdf1"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "8f41b588fe38b981156651ef56b192ed3d158efd"; - hash = "sha256-B/SF86W+0t6rVzo/QpQ6QQPsD7pH5dHGLCqxzoIhNTg="; + rev = "0dfcdf18b35dd9cfcf92be42659794d07d819d88"; + hash = "sha256-vGJrlugqmDHKMQtoDoFIyPMzWWZE8kUySBKEMDd8Kw0="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -713,12 +713,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=6b63343"; + version = "0.0.0+rev=4a593dd"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "6b633433fb3f132f21250cf8e8be76d5a6389b7e"; - hash = "sha256-0P3fY7DVnBqzBIg+e5E5i80jZl/GEYO8SIdxf/ZdkfI="; + rev = "4a593dda9cbc050a6686187249f8350ceea292ce"; + hash = "sha256-HsGDyjUymJHpaQ7ZlcTOg/fg4avVicnPf3zF9OoWQes="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -733,6 +733,18 @@ }; meta.homepage = "https://github.com/mgramigna/tree-sitter-fsh"; }; + fsharp = buildGrammar { + language = "fsharp"; + version = "0.0.0+rev=f920105"; + src = fetchFromGitHub { + owner = "ionide"; + repo = "tree-sitter-fsharp"; + rev = "f920105eec2d574eb911d7a25c81cdaa079a3f72"; + hash = "sha256-iBuxpTtVkd9KiVLiTWrPgTbkZP7Go5V8KhZVsCCUimE="; + }; + location = "fsharp"; + meta.homepage = "https://github.com/ionide/tree-sitter-fsharp"; + }; func = buildGrammar { language = "func"; version = "0.0.0+rev=f780ca5"; @@ -755,6 +767,28 @@ }; meta.homepage = "https://gitlab.com/jirgn/tree-sitter-fusion.git"; }; + gap = buildGrammar { + language = "gap"; + version = "0.0.0+rev=141b063"; + src = fetchFromGitHub { + owner = "gap-system"; + repo = "tree-sitter-gap"; + rev = "141b063335e85299bde3f61b4888d02d674a1abc"; + hash = "sha256-vl0bqJXTxpAfaMOIgQpX60I4dfPOJF6wpt10GiftuR0="; + }; + meta.homepage = "https://github.com/gap-system/tree-sitter-gap"; + }; + gaptst = buildGrammar { + language = "gaptst"; + version = "0.0.0+rev=e0723dc"; + src = fetchFromGitHub { + owner = "gap-system"; + repo = "tree-sitter-gaptst"; + rev = "e0723dc6136309b3d5904dad2c73ef71267428c1"; + hash = "sha256-m8lxSM/c99KLnu5hbxaTol645DFqFwjTSzdaRUtHDAI="; + }; + meta.homepage = "https://github.com/gap-system/tree-sitter-gaptst"; + }; gdscript = buildGrammar { language = "gdscript"; version = "0.0.0+rev=1f1e782"; @@ -834,34 +868,56 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=426e670"; + version = "0.0.0+rev=57c9951"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "426e67087fd62be5f4533581b5916b2cf010fb5b"; - hash = "sha256-SI3/gUksiRgUpCabsll6g0mUcm5iiNMTzxlxQxCujpY="; + rev = "57c9951b290c8084d7c60b0aee7a2b30986ea031"; + hash = "sha256-ieOvtZvOUwiJwJN6AtHVK91GTh+RKge9FMo+mYCtisk="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; glimmer = buildGrammar { language = "glimmer"; - version = "0.0.0+rev=6b25d26"; + version = "0.0.0+rev=da605af"; src = fetchFromGitHub { - owner = "alexlafroscia"; + owner = "ember-tooling"; repo = "tree-sitter-glimmer"; - rev = "6b25d265c990139353e1f7f97baf84987ebb7bf0"; - hash = "sha256-azLagXPC659Ee0UwqtW0XgpxGLqMSrwmKZy8htsp4xU="; + rev = "da605af8c5999b43e6839b575eae5e6cafabb06f"; + hash = "sha256-2ofCBhp/Trj5ivZpMGFm6dvAGic+w8Tl0osRk+IRLL4="; + }; + meta.homepage = "https://github.com/ember-tooling/tree-sitter-glimmer"; + }; + glimmer_javascript = buildGrammar { + language = "glimmer_javascript"; + version = "0.0.0+rev=a260911"; + src = fetchFromGitHub { + owner = "NullVoxPopuli"; + repo = "tree-sitter-glimmer-javascript"; + rev = "a260911201684f80cf815418b3771e6c39309f81"; + hash = "sha256-fpVlfYjVI1ricwNfuzI5AV3RV4ijFTYOf/2NhCirCvU="; + }; + meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript"; + }; + glimmer_typescript = buildGrammar { + language = "glimmer_typescript"; + version = "0.0.0+rev=9d018a0"; + src = fetchFromGitHub { + owner = "NullVoxPopuli"; + repo = "tree-sitter-glimmer-typescript"; + rev = "9d018a0f93417e6951264a26093b89ee63df7315"; + hash = "sha256-ZV6q4OEwj0ulGh5PO5XEMvT4WJQHkMmMXFJs8mcJqXk="; }; - meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; + meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript"; }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=ddc3137"; + version = "0.0.0+rev=66aec57"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "ddc3137a2d775aca93084ff997fa13cc1691058a"; - hash = "sha256-q1xL3/4W442z1wjYL0HQNdz4sPZqqEijyLSvECHugXw="; + rev = "66aec57f7119c7e8e40665b723cd7af5594f15ee"; + hash = "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -889,23 +945,23 @@ }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=7ee8d92"; + version = "0.0.0+rev=ecc2086"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "7ee8d928db5202f6831a78f8112fd693bf69f98b"; - hash = "sha256-ARfpfMSXy+DpvUMJvUgjgReoyvGbrVwYutZD91JA4qc="; + rev = "ecc20866d1bd4d80f3aef06456ed3014d4d598e6"; + hash = "sha256-elPqkvVYs0vADOuN/umDteWP5hqcXhQAoSkqYDtTxaU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; goctl = buildGrammar { language = "goctl"; - version = "0.0.0+rev=f107937"; + version = "0.0.0+rev=49c4353"; src = fetchFromGitHub { owner = "chaozwn"; repo = "tree-sitter-goctl"; - rev = "f107937259c7ec4bb05f7e3d2c24b89ac36d4cc3"; - hash = "sha256-4I0T+CoMCo3e7hkpdR+ipMol0THbJYg+UXAnIa0o5Ns="; + rev = "49c43532689fe1f53e8b9e009d0521cab02c432b"; + hash = "sha256-HYPj95Kg+C5Ax++Z83yUnhrf2iIVTuwOBhVVLlYQaGs="; }; meta.homepage = "https://github.com/chaozwn/tree-sitter-goctl"; }; @@ -922,12 +978,12 @@ }; gomod = buildGrammar { language = "gomod"; - version = "0.0.0+rev=1f55029"; + version = "0.0.0+rev=3b01edc"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; - rev = "1f55029bacd0a6a11f6eb894c4312d429dcf735c"; - hash = "sha256-/sjC117YAFniFws4F/8+Q5Wrd4l4v4nBUaO9IdkixSE="; + rev = "3b01edce2b9ea6766ca19328d1850e456fde3103"; + hash = "sha256-C3pPBgm68mmaPmstyIpIvvDHsx29yZ0ZX/QoUqwjb+0="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; @@ -944,12 +1000,12 @@ }; gotmpl = buildGrammar { language = "gotmpl"; - version = "0.0.0+rev=9d3f6e5"; + version = "0.0.0+rev=fd9e1c6"; src = fetchFromGitHub { owner = "ngalaiko"; repo = "tree-sitter-go-template"; - rev = "9d3f6e526dd074b9edae9070b7bb778f00e87a5b"; - hash = "sha256-ndd85YVO2brK7JVBFOg6bbKV66qVPjo4DVi7GaT/eZA="; + rev = "fd9e1c6647e5e9b23918d00d1e48710d0f703e19"; + hash = "sha256-DGeaKT1uqvXiYwL4g5kZNX6f5TwLPbb5qbhI4amdl98="; }; meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template"; }; @@ -988,12 +1044,12 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=105ee34"; + version = "0.0.0+rev=0d88845"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "105ee343682b7eee86b38ec6858a269e16474a72"; - hash = "sha256-HYb3TXMSC+Zfss+vqgdSxsB35tqPmc6GNMWuFof9e5g="; + rev = "0d8884514fe10c4fa47527d9a0284d207f38ddea"; + hash = "sha256-Dv7FxfHA+2VM60iFZGaytmDVCUEoCJY3bpOJrw5Q8ik="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; @@ -1032,12 +1088,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=a50070d"; + version = "0.0.0+rev=558b997"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19"; - hash = "sha256-huO0Ly9JYQbT64o/AjdZrE9vghQ5vT+/iQl50o4TJ0I="; + rev = "558b997049fddcb07fc513528189c57d6129a260"; + hash = "sha256-BvnCHdHJwhCH3wQnA8JA2RgOUUpigJv7f88pRMW1U8o="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -1076,12 +1132,12 @@ }; helm = buildGrammar { language = "helm"; - version = "0.0.0+rev=9d3f6e5"; + version = "0.0.0+rev=fd9e1c6"; src = fetchFromGitHub { owner = "ngalaiko"; repo = "tree-sitter-go-template"; - rev = "9d3f6e526dd074b9edae9070b7bb778f00e87a5b"; - hash = "sha256-ndd85YVO2brK7JVBFOg6bbKV66qVPjo4DVi7GaT/eZA="; + rev = "fd9e1c6647e5e9b23918d00d1e48710d0f703e19"; + hash = "sha256-DGeaKT1uqvXiYwL4g5kZNX6f5TwLPbb5qbhI4amdl98="; }; location = "dialects/helm"; meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template"; @@ -1099,23 +1155,23 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=81dbfa4"; + version = "0.0.0+rev=5439302"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "81dbfa44a2e0f9e36d16f449fc792020e2f38426"; - hash = "sha256-uhCBhS68J6gxWxv/Ehk6OOo3/UMakf9Rrr3JnYAUD/s="; + rev = "543930235970a04c2f0d549c9e88815847c7a74a"; + hash = "sha256-MElmidivJtIywWm4dRslrmtc/vVwGDO1f6k/0P3gb4E="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; hlsplaylist = buildGrammar { language = "hlsplaylist"; - version = "0.0.0+rev=64f1902"; + version = "0.0.0+rev=3bfda92"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-hlsplaylist"; - rev = "64f19029339e75d6762feae39e7878595860c980"; - hash = "sha256-rJZo17tAbDbnnx6PTOlzgJYClnGrRNfQ6fLJqIVMMCw="; + rev = "3bfda9271e3adb08d35f47a2102fe957009e1c55"; + hash = "sha256-BvLT+BbnJgM14a896p39dywYy/4S45xOBtBukYTbW6E="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist"; }; @@ -1143,12 +1199,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=e4d834e"; + version = "0.0.0+rev=14bdaf0"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "e4d834eb4918df01dcad5c27d1b15d56e3bd94cd"; - hash = "sha256-sHy3fVWemJod18HCQ8zBC/LpeCCPH0nzhI1wrkCg8nw="; + rev = "14bdaf0da9e26e2de9b30178c2242539d2b0b285"; + hash = "sha256-vSiIabzhhTpvt+1Zh+tCad2TR5hG572hRmX2fTjfC7s="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1165,23 +1221,23 @@ }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=5ae6c7c"; + version = "0.0.0+rev=231f1b1"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "5ae6c7cfa62a7d7325c26171a1de4f6b866702b5"; - hash = "sha256-C1U0vyW237XB8eFNYcn7/FBsGlCLuIQoUSlFV8K5TsM="; + rev = "231f1b1bafd12e46c8ed8c21dbbdd940d9f15e94"; + hash = "sha256-q8g7u3ctpfl0vq+RVBw7g7js/4SwAIkHg4CCRCuQ28w="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; hurl = buildGrammar { language = "hurl"; - version = "0.0.0+rev=fba6ed8"; + version = "0.0.0+rev=ff07a42"; src = fetchFromGitHub { owner = "pfeiferj"; repo = "tree-sitter-hurl"; - rev = "fba6ed8db3a009b9e7d656511931b181a3ee5b08"; - hash = "sha256-JWFEk1R19YIeDNm3LkBmdL+mmfhtBDhHfg6GESwruU0="; + rev = "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"; + hash = "sha256-9uRRlJWT0knZ3vvzGEq9CjyffQnYF53rnoBnsQ68zyE="; }; meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl"; }; @@ -1198,34 +1254,34 @@ }; idl = buildGrammar { language = "idl"; - version = "0.0.0+rev=1a6683f"; + version = "0.0.0+rev=5573b29"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "1a6683f6809f7bc630f10fcad7d9ac6471deb706"; - hash = "sha256-eDoERNfSMzpbccX438H2c1AWQMXNm9tJBnCREYqMvic="; + rev = "5573b295410201ed22771776b34d636900eba368"; + hash = "sha256-Pf9Wtmza6bKQsZ54EzVhSnUFkEcHuTgPGNZuH8jh42o="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; ini = buildGrammar { language = "ini"; - version = "0.0.0+rev=87176e5"; + version = "0.0.0+rev=962568c"; src = fetchFromGitHub { owner = "justinmk"; repo = "tree-sitter-ini"; - rev = "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"; - hash = "sha256-IyHrIxcmuzs60zUiJv4E3nSkhSkgbcaLDUdeDx5mlHk="; + rev = "962568c9efa71d25720ab42c5d36e222626ef3a6"; + hash = "sha256-G11Aynq2rnkRwdkhspjYqtBD/h5k4aD+NvuE0QfploU="; }; meta.homepage = "https://github.com/justinmk/tree-sitter-ini"; }; inko = buildGrammar { language = "inko"; - version = "0.0.0+rev=234c87b"; + version = "0.0.0+rev=6f9c072"; src = fetchFromGitHub { owner = "inko-lang"; repo = "tree-sitter-inko"; - rev = "234c87be1dac20f766ddf6f486a7bde2a4bc5594"; - hash = "sha256-7BADt6NjH9chOzCDtJSLjBZaRqeLvOH006q0hI4pZaI="; + rev = "6f9c072d023c3886aabcd8012274461b35d2d0a9"; + hash = "sha256-yZ4F5tREEgoiI7Q9MFVH9HIM6bYxb/qdd0lqZREZkIo="; }; meta.homepage = "https://github.com/inko-lang/tree-sitter-inko"; }; @@ -1242,34 +1298,34 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=ea842cb"; + version = "0.0.0+rev=12bfab7"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "ea842cb57a90865c8f50bcb4499de1a94860f3a4"; - hash = "sha256-0gy4kylOoaC5BigpppAN1va3eRZaS6UmxNcQkbxz1Ag="; + rev = "12bfab7db8a5f5b1d774ef84b5831acd34936071"; + hash = "sha256-ndxhGmfz0wYxsOeBJv/OJndj3pORQoWpRTfBuMcprhU="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=953abfc"; + version = "0.0.0+rev=245b05c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "953abfc8bb3eb2f578e1f461edba4a9885f974b8"; - hash = "sha256-COrEPsdTI6MJeb5iIZtyNHHe6nMsD/EnHDRVDTSKFTg="; + rev = "245b05c6ba900fa708242835f6168ef76f9d951e"; + hash = "sha256-C87uMEIoqXr6bYLCJAq6aiXsfH4+srVbNx7bMV9rseM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=12e4537"; + version = "0.0.0+rev=b6f0624"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "12e45374422f6051648717be62f0ffc40a279ee2"; - hash = "sha256-KBEJFpOIP4MFbkxcIF2HsHvwblTdb2UuisKMn4Pnm1w="; + rev = "b6f0624c1447bc209830b195999b78a56b10a579"; + hash = "sha256-xen4zzDwlCXbvgYwckDE0Jw3rDpKUwmr4DHB47nGng4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1286,23 +1342,23 @@ }; jsdoc = buildGrammar { language = "jsdoc"; - version = "0.0.0+rev=49fde20"; + version = "0.0.0+rev=bc09606"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; - rev = "49fde205b59a1d9792efc21ee0b6d50bbd35ff14"; - hash = "sha256-Mfau8071UiotdSS+/W9kQWhKF7BCRI8WtRxss/U0GQw="; + rev = "bc09606fc786ead131a301e4b7524888f2d5c517"; + hash = "sha256-tVCYa2N3h+Wf1vPL7/C3rqY6WiR6n9b6VXofUk7+DSA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc"; }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=94f5c52"; + version = "0.0.0+rev=8bfdb43"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "94f5c527b2965465956c2000ed6134dd24daf2a7"; - hash = "sha256-16/ZRjRolUC/iN7ASrNnXNSkfohBlSqyyYAz4nka6pM="; + rev = "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571"; + hash = "sha256-zEuPynGi11vr7UvxC+mgZ+zOJBEVDjxvMwx0dozANn0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; @@ -1330,23 +1386,23 @@ }; jsonnet = buildGrammar { language = "jsonnet"; - version = "0.0.0+rev=d34615f"; + version = "0.0.0+rev=ddd075f"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "tree-sitter-jsonnet"; - rev = "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"; - hash = "sha256-jjDjntNm0YAsG6Ec2n0eB8BjpgEQEAjV8LAZ3GGYhG8="; + rev = "ddd075f1939aed8147b7aa67f042eda3fce22790"; + hash = "sha256-ODGRkirfUG8DqV6ZcGRjKeCyEtsU0r+ICK0kCG6Xza0="; }; meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet"; }; julia = buildGrammar { language = "julia"; - version = "0.0.0+rev=f1baa5f"; + version = "0.0.0+rev=3520b57"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "f1baa5f8e271109d01cc8ff7473c11df2d8a9aee"; - hash = "sha256-a0yLJMnXllHPij8fBjwqYgKRc6GxHHCQjSbPOKdLh9I="; + rev = "3520b57e418f734f582215181ecd926a6178c90f"; + hash = "sha256-IPtEDuYMMZ/0ARvO/Cs8RCofJJE9S/30StvV2oSW41I="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; @@ -1385,23 +1441,23 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=8d9d372"; + version = "0.0.0+rev=ec98567"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "8d9d372b09fa4c3735657c5fc2ad03e53a5f05f5"; - hash = "sha256-uaoFBA8rLhlzmDQ9sCbBU5KRSb63k1DSa6VvmioRSNw="; + rev = "ec985672ff21f7fd7f835869d8021e8f87304bb4"; + hash = "sha256-ThttqJxC3yaGufY2H9H5KgUu2bSTp+BKInyi0vucrS8="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; koto = buildGrammar { language = "koto"; - version = "0.0.0+rev=d410987"; + version = "0.0.0+rev=cbf637e"; src = fetchFromGitHub { owner = "koto-lang"; repo = "tree-sitter-koto"; - rev = "d4109879ba1387d19095269a7473bd7d274ab848"; - hash = "sha256-PKbxUSlLHBQBhOzQpaGpP24zmfxjRD9rO5I4OIeeL4g="; + rev = "cbf637e5163065934c827d254b293f4d2f08f523"; + hash = "sha256-/yeC7pAk0QsPcuMfdp2l1MLGZlQ7CwgdMWNZe/hCfXU="; }; meta.homepage = "https://github.com/koto-lang/tree-sitter-koto"; }; @@ -1418,23 +1474,23 @@ }; lalrpop = buildGrammar { language = "lalrpop"; - version = "0.0.0+rev=854a40e"; + version = "0.0.0+rev=194c255"; src = fetchFromGitHub { owner = "traxys"; repo = "tree-sitter-lalrpop"; - rev = "854a40e99f7c70258e522bdb8ab584ede6196e2e"; - hash = "sha256-rVWmYF26DbPHoNRBv9FKEeacSbgw93PHy/wrQDGzlWk="; + rev = "194c25539f435de415ee0551a5f07058833da915"; + hash = "sha256-I2Kozd0N8R0CCOVl4xTAL4fhZ5BIzSzW+MRQOfZ3cMY="; }; meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop"; }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=efe5afd"; + version = "0.0.0+rev=1e4e303"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "efe5afdbb59b70214e6d70db5197dc945d5b213e"; - hash = "sha256-4sFqboyE94yvkZYKw5wgQjdVkNaIGLif3qB8GMCEBE0="; + rev = "1e4e30342b7a3b3a24886a632fbac53035d98871"; + hash = "sha256-A2uvHRoe9xtgsHSLYdZiztGLXdqXzsfw4BYeZ/Cmr4k="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1452,12 +1508,12 @@ }; leo = buildGrammar { language = "leo"; - version = "0.0.0+rev=304611b"; + version = "0.0.0+rev=6ca11a9"; src = fetchFromGitHub { owner = "r001"; repo = "tree-sitter-leo"; - rev = "304611b5eaf53aca07459a0a03803b83b6dfd3b3"; - hash = "sha256-D3jtNBYLgN2/0TnbOMJrsuZrP+PMr835aDYlCwIPPrk="; + rev = "6ca11a96fc2cab51217e0cf4a2f9ed3ea63e28fb"; + hash = "sha256-ye2zzLNZC2ZJqnXtBl7fdSC78kph3rs7j4whIdfDYAE="; }; meta.homepage = "https://github.com/r001/tree-sitter-leo"; }; @@ -1474,12 +1530,12 @@ }; liquid = buildGrammar { language = "liquid"; - version = "0.0.0+rev=7862a34"; + version = "0.0.0+rev=23ac814"; src = fetchFromGitHub { owner = "hankthetank27"; repo = "tree-sitter-liquid"; - rev = "7862a3424832c3a9d45eb21143b375837bd6573b"; - hash = "sha256-F/nP+zXySjKHX9Y9zqexhwn02sZejUXMPDcWRh6s7Yo="; + rev = "23ac814111e2b4b4b083e2c92219af2d5b74d13d"; + hash = "sha256-WZSvUiX1bKEfzXHVHC0AvzHpgyPD9JL+NgsoBx9mktQ="; }; meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid"; }; @@ -1507,12 +1563,12 @@ }; lua = buildGrammar { language = "lua"; - version = "0.0.0+rev=a24dab1"; + version = "0.0.0+rev=99fc677"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; - rev = "a24dab177e58c9c6832f96b9a73102a0cfbced4a"; - hash = "sha256-uFaEptW4wPrqgHfB1mYmVltf+4no61L2cPgpsr5qBIU="; + rev = "99fc677e6971c425e8d407f59c77ab897e585c92"; + hash = "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M="; }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; @@ -1573,36 +1629,36 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=7fe453b"; + version = "0.0.0+rev=b7eba93"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "7fe453beacecf02c86f7736439f238f5bb8b5c9b"; - hash = "sha256-Ai8w5fVtN6NofEGG3VQNd8pNPVijYw6nDzrhedKMOe4="; + rev = "b7eba93e6a3e588e259e831416ac11abdaa8616a"; + hash = "sha256-lOLLHHMmNAtK+RLOSIt0GpeNRiMj3eu9jhSKS0HT370="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=7fe453b"; + version = "0.0.0+rev=b7eba93"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "7fe453beacecf02c86f7736439f238f5bb8b5c9b"; - hash = "sha256-Ai8w5fVtN6NofEGG3VQNd8pNPVijYw6nDzrhedKMOe4="; + rev = "b7eba93e6a3e588e259e831416ac11abdaa8616a"; + hash = "sha256-lOLLHHMmNAtK+RLOSIt0GpeNRiMj3eu9jhSKS0HT370="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=0d5a05e"; + version = "0.0.0+rev=306c43a"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "0d5a05e543af2de60cdb5e71f0f5888c95ab936f"; - hash = "sha256-B5BoHezwfUW156S5ixOGukjX+qFGLmS0WqxpT0MVNG8="; + rev = "306c43ab28b7b8a4976e40ff0a7c26b019ad52df"; + hash = "sha256-hueZg7hoZb11+ukrZgK1+da0w9J22jsj1BexlF4USXY="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1641,24 +1697,24 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=affbd6f"; + version = "0.0.0+rev=02af5a1"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "affbd6f3b08155826a22cfa8373147acbf60f1f1"; - hash = "sha256-zIbtvtpLQmXhFj5KDQRwsUJfUi6AkZjfp55n0X5lN4o="; + rev = "02af5a1a1cfa69a094e3136b10dfb602f968232e"; + hash = "sha256-zCv47UvUIzdoJwQwKMrFyR1eMdU6ScSGfODdXomBapY="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; muttrc = buildGrammar { language = "muttrc"; - version = "0.0.0+rev=90ef608"; + version = "0.0.0+rev=173b0ab"; src = fetchFromGitHub { owner = "neomutt"; repo = "tree-sitter-muttrc"; - rev = "90ef60852c410bd964cd3b954366e4c403c17314"; - hash = "sha256-GiM9jXtaL/GEUmBuiMB7pZP0VnHVzRETwwCHQsHyaTM="; + rev = "173b0ab53a9c07962c9777189c4c70e90f1c1837"; + hash = "sha256-zma/oyMFI+r+/616yXV9b4ptC1FNYpHlpqY/Fez++n0="; }; meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc"; }; @@ -1686,12 +1742,12 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=3039ad9"; + version = "0.0.0+rev=88d836a"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "3039ad9e9af3c1ffe049a04ee83a2b489915b0b9"; - hash = "sha256-a4NU9tzQ+g9dxF3/LAkEm83QnEJcAoNcIrrQwXSSTPE="; + rev = "88d836a24b3b11c8720874a1a9286b8ae838d30a"; + hash = "sha256-IvlUwNO/wLLPuqCZf0NtSxMdDx+4ASYYOobklY/97aQ="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -1730,23 +1786,23 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=68d3b79"; + version = "0.0.0+rev=fcf1857"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "68d3b7999ad89d31690461884270e5658e0a22c4"; - hash = "sha256-EMkhmAGi2NPTeliGZyWo/UtYJnNJAkp04/LMs4DDF8s="; + rev = "fcf1857e254ab654e0fb73fe9706e33c52e79a5c"; + hash = "sha256-ayiScuocBvhus3OUbQCSTxCdm/7+a61ATMpl3jFvCfY="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; norg = buildGrammar { language = "norg"; - version = "0.0.0+rev=aa1a1a7"; + version = "0.0.0+rev=d89d95a"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"; - hash = "sha256-baJdvWfwUx1U2RX0G6ECaGPGZBFbWsVUhh3kYPaYeiE="; + rev = "d89d95af13d409f30a6c7676387bde311ec4a2c8"; + hash = "sha256-z3h5qMuNKnpQgV62xZ02F5vWEq4VEnm5lxwEnIFu+Rw="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; @@ -1785,24 +1841,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=036226e"; + version = "0.0.0+rev=5f7a97e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "036226e5edb410aec004cc7ac0f4b2014dd04a0e"; - hash = "sha256-p8e4xfcGXDzpgheAWG+fSUKCpqEsSrHw9waoTRNnrnI="; + rev = "5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e"; + hash = "sha256-jBWNJpLtBHJ13g4c30W6YqGN9O7UoX7iqvz7ThtHi5A="; }; location = "grammars/ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=036226e"; + version = "0.0.0+rev=5f7a97e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "036226e5edb410aec004cc7ac0f4b2014dd04a0e"; - hash = "sha256-p8e4xfcGXDzpgheAWG+fSUKCpqEsSrHw9waoTRNnrnI="; + rev = "5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e"; + hash = "sha256-jBWNJpLtBHJ13g4c30W6YqGN9O7UoX7iqvz7ThtHi5A="; }; location = "grammars/interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1821,12 +1877,12 @@ }; odin = buildGrammar { language = "odin"; - version = "0.0.0+rev=d37b8f2"; + version = "0.0.0+rev=3fee796"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-odin"; - rev = "d37b8f24f653378b268ec18404e9c14ad355b128"; - hash = "sha256-QZn+XgVQXEaMZF4XkMfS4bHf/tQIersI8982JQyiXms="; + rev = "3fee7964bbfb2554deef12c224344f3870d15375"; + hash = "sha256-skMbtAjulJXGpaAfi1Q/WgeiimWE/qlwsWmq6lWXaU8="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-odin"; }; @@ -1843,12 +1899,12 @@ }; pascal = buildGrammar { language = "pascal"; - version = "0.0.0+rev=a9ee969"; + version = "0.0.0+rev=d0ebabe"; src = fetchFromGitHub { owner = "Isopod"; repo = "tree-sitter-pascal"; - rev = "a9ee969dec5b2e3b2ccccc5954fec04100c7619e"; - hash = "sha256-U45RkRpE1EdX2ijGyjTKVNRcSu6E6Dh9Z7G9bp24T80="; + rev = "d0ebabefaea9ac3f6fc3004cf08cd121b66da9e4"; + hash = "sha256-T47xDjEbcDLg1IOu2HsIGA7j/CFMCagfV4xKdFYYoec="; }; meta.homepage = "https://github.com/Isopod/tree-sitter-pascal"; }; @@ -1876,47 +1932,47 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=3a21d9c"; + version = "0.0.0+rev=81c57e2"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "3a21d9cb2a20a062c17f8f53d5983fd473c4673c"; - hash = "sha256-cBF3wvAl5PJCzjlTn1wx9+Q81xsitKW3+TwD0yAoWM4="; + rev = "81c57e274c541c30d6c204c8dbceb90ec647ed8d"; + hash = "sha256-xtsLJx9tzj3KNhlCDuXnAGBz3EYnJ/J+EJ0UKHVN4g4="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=c07d697"; + version = "0.0.0+rev=74c6b0d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "c07d69739ba71b5a449bdbb7735991f8aabf8546"; - hash = "sha256-It3UC98PZn1jXJ/LQfPdJ5e/dRdADPMgAawBzvlJfQE="; + rev = "74c6b0d560c2660db4d9e8c76b681f538d494160"; + hash = "sha256-mJh8MILlVSjG3bOvYPw2Wc7XFhL+ozrdvcnr1qR6pZE="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=c07d697"; + version = "0.0.0+rev=74c6b0d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "c07d69739ba71b5a449bdbb7735991f8aabf8546"; - hash = "sha256-It3UC98PZn1jXJ/LQfPdJ5e/dRdADPMgAawBzvlJfQE="; + rev = "74c6b0d560c2660db4d9e8c76b681f538d494160"; + hash = "sha256-mJh8MILlVSjG3bOvYPw2Wc7XFhL+ozrdvcnr1qR6pZE="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; phpdoc = buildGrammar { language = "phpdoc"; - version = "0.0.0+rev=1d0e255"; + version = "0.0.0+rev=df5e7da"; src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; - rev = "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"; - hash = "sha256-EWj/Av8+Ri7KiC9LzH73ytufjkp3MxBPwfm6mF3IGD8="; + rev = "df5e7da4b83da072f99135079ac3436550b8d67d"; + hash = "sha256-LIqu5+DaybdxY57IPwVACtgrGTiCXIiIIqUK45ISzYw="; }; meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc"; }; @@ -1944,12 +2000,12 @@ }; pod = buildGrammar { language = "pod"; - version = "0.0.0+rev=39da859"; + version = "0.0.0+rev=0bf8387"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-pod"; - rev = "39da859947b94abdee43e431368e1ae975c0a424"; - hash = "sha256-sMUlAtl0IaykKlEhOiAkdrLNNJiCS0L7gj7+2WHwO5U="; + rev = "0bf8387987c21bf2f8ed41d2575a8f22b139687f"; + hash = "sha256-yV2kVAxWxdyIJ3g2oivDc01SAQF0lc7UMT2sfv9lKzI="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod"; }; @@ -1977,12 +2033,12 @@ }; powershell = buildGrammar { language = "powershell"; - version = "0.0.0+rev=fc15514"; + version = "0.0.0+rev=ebe2ab2"; src = fetchFromGitHub { owner = "airbus-cert"; repo = "tree-sitter-powershell"; - rev = "fc15514b2f1dbba9c58528d15a3708f89eda6a01"; - hash = "sha256-StVnRNM0HPevLSRDIDr+Sakjo+NqXYWPPUFjI29Cowo="; + rev = "ebe2ab2f642eda2072c68c8de02e83973c26f33c"; + hash = "sha256-zWJUB0lbjJGGhi3ko4fSzay9n9P8nYhVOkKLrkyr0G0="; }; meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell"; }; @@ -2134,23 +2190,23 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=0dee05e"; + version = "0.0.0+rev=8c65e25"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "0dee05ef958ba2eae88d1e65f24b33cad70d4367"; - hash = "sha256-H6t98tuXJW2VD5Ay+rOfnp9p5ZljyPxvtIy60PycMUQ="; + rev = "8c65e256f971812276ff2a69a2f515c218ed7f82"; + hash = "sha256-8mdBN1vP64PJKxN2y0GoaObLs6j/lcsU47sr+8/8oTQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; ql = buildGrammar { language = "ql"; - version = "0.0.0+rev=42becd6"; + version = "0.0.0+rev=c73c31c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ql"; - rev = "42becd6f8f7bae82c818fa3abb1b6ff34b552310"; - hash = "sha256-OFqBI9u5Ik6AoG88v7qTVnol5H9O/n1vaZhoxQ7Sj70="; + rev = "c73c31c89cb0019ef56fe8bc1723e7c36e0be607"; + hash = "sha256-C/FGCN1JAThAAyMgSt8o0yf+qfYKF98jPTitfXrUytI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql"; }; @@ -2167,12 +2223,12 @@ }; qmljs = buildGrammar { language = "qmljs"; - version = "0.0.0+rev=febf48a"; + version = "0.0.0+rev=cc4186f"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "febf48a5b6928600cd8fb2a01254743af550780d"; - hash = "sha256-bRb5h6gBBxbzhxpCxJK8CsQ5BCtPTuKtuZesE/+mDY0="; + rev = "cc4186f15e2829385be33440561fdd17b1c40cf7"; + hash = "sha256-g05fmFG/+DiW8VOCfH+8//ksFNYZ8V9RAn7hGJ7Jl6w="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; @@ -2189,23 +2245,23 @@ }; r = buildGrammar { language = "r"; - version = "0.0.0+rev=b1e211f"; + version = "0.0.0+rev=2097fa5"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; - rev = "b1e211f52ad8f8e1e182bbbcc16dcd5e3688eb7d"; - hash = "sha256-fgK8UGNaoJf3+lao/q1Vfd+2U/YNgrZu3kbyZ1qOIus="; + rev = "2097fa502efa21349d26af0ffee55d773015e481"; + hash = "sha256-a7vgmOY9K8w8vwMlOLBmUnXpWpVP+YlOilGODaI07y4="; }; meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=171f52a"; + version = "0.0.0+rev=5b211bf"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"; - hash = "sha256-iuigtcakpqm5vPuxsSV5PR32pwzyPMmldYXaJmzO3d0="; + rev = "5b211bf93021d1c45f39aa96898be9f794f087e4"; + hash = "sha256-ry9j5nEcXiSD+xJYzT0mY37hGeDlVRYq7egUeuw1PfU="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -2244,12 +2300,12 @@ }; re2c = buildGrammar { language = "re2c"; - version = "0.0.0+rev=47aa19c"; + version = "0.0.0+rev=c18a3c2"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-re2c"; - rev = "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"; - hash = "sha256-Mwnm8kN0xfAdGG00aUYrqPU0zyWbc6QH9Zlgb4on+do="; + rev = "c18a3c2f4b6665e35b7e50d6048ea3cff770c572"; + hash = "sha256-2htX4730fNAO2NKEurDOXH1OIXFd0OfuIbH1ou3a20A="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-re2c"; }; @@ -2266,12 +2322,12 @@ }; regex = buildGrammar { language = "regex"; - version = "0.0.0+rev=47007f1"; + version = "0.0.0+rev=f70251e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; - rev = "47007f195752d8e57bda80b0b6cdb2d173a9f7d7"; - hash = "sha256-X1CEk4nLxXY1a3PHG+4uSDKAXmsJIhd0nVYieTaHOkk="; + rev = "f70251e1f1d72bd6dc1f897f956f9112f8668441"; + hash = "sha256-G0I71WXSBHttsLfD18W/9RIrNAJN79kMPOcYt/k7KSI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex"; }; @@ -2376,34 +2432,34 @@ }; ruby = buildGrammar { language = "ruby"; - version = "0.0.0+rev=0ffe457"; + version = "0.0.0+rev=a66579f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "0ffe457fb6aabf064f173fd30ea356845cef2513"; - hash = "sha256-E46Y++kaipMWZwyfQ40tWj3CTIP25XQ90x2FsQaQ63s="; + rev = "a66579f70d6f50ffd81a16fc3d3358e2ac173c88"; + hash = "sha256-ApuNco5q0hq4/36D7yWv87+d3h33Y9pKtdTUox4tIiw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=9c84af0"; + version = "0.0.0+rev=6b7d1fc"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "9c84af007b0f144954adb26b3f336495cbb320a7"; - hash = "sha256-mwnikq3s7Ien68DYT3p9oVGy7xjBgtiJMHAwMj5HXHI="; + rev = "6b7d1fc73ded57f73b1619bcf4371618212208b1"; + hash = "sha256-cK3dswI0lgsuXp8CDOj/mjgnuWsCUvT3DX++kpWJoCI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=a13f2d1"; + version = "0.0.0+rev=ec13dd6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8"; - hash = "sha256-KaELrU+4XMHsSacNZnPlWvfNcQRZizQNhxfbsFpsBdw="; + rev = "ec13dd674bb8dd89213e0d6b1fe45efb68d5878f"; + hash = "sha256-ireSo04kG2RMlCZD1hf6BJcjT7eXjYdOqOsoMtQAwKQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2421,12 +2477,12 @@ }; scheme = buildGrammar { language = "scheme"; - version = "0.0.0+rev=8f9dff3"; + version = "0.0.0+rev=63e25a4"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "8f9dff3d038f09934db5ea113cebc59c74447743"; - hash = "sha256-QECZQVhWntN+3wnIA+U3JesuoLZiSU7pOrsKRdVPLtk="; + rev = "63e25a4a84142ae7ee0ee01fe3a32c985ca16745"; + hash = "sha256-FK3F7v2LqAtXZM/CKCijWfXTF6TUhLmiVXScZqt46Io="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; @@ -2441,25 +2497,37 @@ }; meta.homepage = "https://github.com/serenadeai/tree-sitter-scss"; }; + sflog = buildGrammar { + language = "sflog"; + version = "0.0.0+rev=69330ef"; + src = fetchFromGitHub { + owner = "aheber"; + repo = "tree-sitter-sfapex"; + rev = "69330ef89fb6b7b2dd16b639d86811e9262c7369"; + hash = "sha256-OO+KttgnPk18EtYmxNphn3if2p3QRNRrXQTYZOmmglc="; + }; + location = "sflog"; + meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; + }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=d84b43d"; + version = "0.0.0+rev=dd991eb"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "d84b43d75d65bbc4ba57166ce17555f32c0b8983"; - hash = "sha256-KcFntOBXADBu7nSFQ5XVY6/nfSl2uLJfhsfVFFjudd8="; + rev = "dd991eb3b6957a33d9044e0f5914588f7f449a78"; + hash = "sha256-Kt396lw3O3X4I3sEadfhoRVi598UCknOmdCPIMpqgdA="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=4a0558c"; + version = "0.0.0+rev=34ccfd5"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74"; - hash = "sha256-F+DtGNXc00lv08EnR6sQgTQVYkttgf/xw3bq3IdsQMA="; + rev = "34ccfd58d3baee7636f62d9326f32092264e8407"; + hash = "sha256-2R+TxjM3Pd2a9pyr2SwZd9+YYj1o8KsS+4n5dFxEMMM="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; @@ -2487,12 +2555,12 @@ }; snakemake = buildGrammar { language = "snakemake"; - version = "0.0.0+rev=46d4de8"; + version = "0.0.0+rev=e909815"; src = fetchFromGitHub { owner = "osthomas"; repo = "tree-sitter-snakemake"; - rev = "46d4de8e6cfca8a97c0489aea936bb15beeaf666"; - hash = "sha256-MNJLveFI5oybM9QE8wgYT7k3GK1E4lIOm3xWJmJazls="; + rev = "e909815acdbe37e69440261ebb1091ed52e1dec6"; + hash = "sha256-d2n1fsdt4+1hv4In+o6GpGyfeyVHpn39Njm7tQ2zyYQ="; }; meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake"; }; @@ -2509,24 +2577,24 @@ }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=c99ad4b"; + version = "0.0.0+rev=69330ef"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "c99ad4b16d112fea91745e3f1b769754239fdaba"; - hash = "sha256-tl/MajAsdu7YxQcdFZmupZldhCl6QB//4FwiBR44nm4="; + rev = "69330ef89fb6b7b2dd16b639d86811e9262c7369"; + hash = "sha256-OO+KttgnPk18EtYmxNphn3if2p3QRNRrXQTYZOmmglc="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=c99ad4b"; + version = "0.0.0+rev=69330ef"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "c99ad4b16d112fea91745e3f1b769754239fdaba"; - hash = "sha256-tl/MajAsdu7YxQcdFZmupZldhCl6QB//4FwiBR44nm4="; + rev = "69330ef89fb6b7b2dd16b639d86811e9262c7369"; + hash = "sha256-OO+KttgnPk18EtYmxNphn3if2p3QRNRrXQTYZOmmglc="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2555,12 +2623,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=b817500"; + version = "0.0.0+rev=a8b10c7"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "b8175006d9c8120d41cf40a4ef3711bbbbc08973"; - hash = "sha256-idQB8Wqw7lvU192y7+UgFvcwlmY71/mu9jJ4hRc4ud4="; + rev = "a8b10c76759a372d0f92bb070b4f5c993e0ce5f9"; + hash = "sha256-wfoov9KfIadouF3HTJ9hOpnIouCHvDffgSrXow8zQ5I="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2610,23 +2678,23 @@ }; styled = buildGrammar { language = "styled"; - version = "0.0.0+rev=65835cc"; + version = "0.0.0+rev=b729198"; src = fetchFromGitHub { owner = "mskelton"; repo = "tree-sitter-styled"; - rev = "65835cca33a5f033bcde580ed66cde01c1fabbbe"; - hash = "sha256-pcvt3ow6rVYCYbcVzIz3FGWpqoVCPX7zuOj3vKpkOfU="; + rev = "b729198642b3058d4ea0f864d86efb271d594595"; + hash = "sha256-9hj6l3eI5p7q1XQihM19deb7+TdLVscIM31TbDRcqo8="; }; meta.homepage = "https://github.com/mskelton/tree-sitter-styled"; }; supercollider = buildGrammar { language = "supercollider"; - version = "0.0.0+rev=affa438"; + version = "0.0.0+rev=1a8ee0d"; src = fetchFromGitHub { owner = "madskjeldgaard"; repo = "tree-sitter-supercollider"; - rev = "affa4389186b6939d89673e1e9d2b28364f5ca6f"; - hash = "sha256-j4CTKkSdKnSGdgC3zGglmZ6uQvbC2ObQ+WWlY0afSwo="; + rev = "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"; + hash = "sha256-G23AZO1zvTvRE9ciV7qMuSoaCYulhyOkwiRwgK06NRQ="; }; meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider"; }; @@ -2643,23 +2711,23 @@ }; svelte = buildGrammar { language = "svelte"; - version = "0.0.0+rev=7ab8221"; + version = "0.0.0+rev=774a65a"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-svelte"; - rev = "7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8"; - hash = "sha256-ooeQNwFgDZrn+Vj6nFOS8TJMknl/DgbEghfm0e1EJDE="; + rev = "774a65aea563accc35f5d45fafa4d96ec5761f57"; + hash = "sha256-mkw3s0pZQ6ry+fiTk2fJeKVA7Nqyv2Z2R1AFZknzpFM="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte"; }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=769bb83"; + version = "0.0.0+rev=032930d"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "769bb834feb2947f2c706d82830b0a05958727de"; - hash = "sha256-Rqvk1dBEBAnQV/51MUSzgzX0J/pecwA5o8SBOfrvu+I="; + rev = "032930d6218d8ae23bde074cf29ce8d276b87533"; + hash = "sha256-VhQ+OwkqOVJH9/R2eDVkCJbmh50EmZjVGX8Pk4uMGBw="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2677,12 +2745,12 @@ }; systemtap = buildGrammar { language = "systemtap"; - version = "0.0.0+rev=1af543a"; + version = "0.0.0+rev=f2b378a"; src = fetchFromGitHub { owner = "ok-ryoko"; repo = "tree-sitter-systemtap"; - rev = "1af543a96d060b1f808982037bfc54cc02218edd"; - hash = "sha256-KCsISHv9yglW+63UY/9Dhb0yVz7Ha76EyHo65Si6SpY="; + rev = "f2b378a9af0b7e1192cff67a5fb45508c927205d"; + hash = "sha256-HzV6RZMTSa41Q5hMiM1FwiHLbho62fuywtKzqrwjNDQ="; }; meta.homepage = "https://github.com/ok-ryoko/tree-sitter-systemtap"; }; @@ -2721,23 +2789,23 @@ }; tact = buildGrammar { language = "tact"; - version = "0.0.0+rev=91cc49a"; + version = "0.0.0+rev=d168040"; src = fetchFromGitHub { owner = "tact-lang"; repo = "tree-sitter-tact"; - rev = "91cc49a83f4f0b3a756bf7d0e65403a9cf757003"; - hash = "sha256-/u1ZLk9e7uowTnSkxrwXOOmcesqp3uDTRJOshKNc8lQ="; + rev = "d16804029968f53f26f5afc695166a55bb0b68b2"; + hash = "sha256-naug7uJeMQ8mFje6ZgOJ/3AbPlCOrCUak0u1RQ25Ky4="; }; meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; }; tcl = buildGrammar { language = "tcl"; - version = "0.0.0+rev=8784024"; + version = "0.0.0+rev=cdba4ab"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-tcl"; - rev = "8784024358c233efd0f3a6fd9e7a3c5852e628bc"; - hash = "sha256-/uw+Nb5A+DklN+BxMpufSCMb/VOE/zqJNnLZVFwjWtc="; + rev = "cdba4ab96a9896492d0d5219b70300c8783ca4e7"; + hash = "sha256-NEaB52q2GEEy25JMZwbbyE1Aj4UkO17K9KBB2KqmVHQ="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tcl"; }; @@ -2755,12 +2823,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=de0d0ee"; + version = "0.0.0+rev=80d1a04"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "de0d0ee129cf643872e8e0d5c4a6589b5a3aae23"; - hash = "sha256-eH2QXynJLM2dBtW4UPXsk+RYFUp+z2SFWaN7KO5cpE0="; + rev = "80d1a04e6bf3ced1c924bcb05527aa2eaf3f6239"; + hash = "sha256-BY+j+0kMWxGbtwFk96SWHZA9ugRz6E7pRZOOM5j1XKA="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -2811,23 +2879,23 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=bba02e7"; + version = "0.0.0+rev=b9e3978"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "bba02e79f85e335f310fc95e21c677e49f2c4439"; - hash = "sha256-FbOBkEtsFFD9jIWM2+fETstnvQyIj2DAF81v0dXjouo="; + rev = "b9e3978f363b3f8884c886a01d15e41bd14d30bd"; + hash = "sha256-xC0iA7QvU/72RoqyW5oPmbVkTszPNraacwW6N8TELwo="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; tmux = buildGrammar { language = "tmux"; - version = "0.0.0+rev=9138ea5"; + version = "0.0.0+rev=0252ecd"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-tmux"; - rev = "9138ea508410e0f34da2666609f600f65e944f22"; - hash = "sha256-aoKrrDvOM4yOgE7rulGBoN1GeBBHN+dPfyNytC4oMC4="; + rev = "0252ecd080016e45e6305ef1a943388f5ae2f4b4"; + hash = "sha256-8f78qYxqoiOAnl3HzEbF4Rci3rFy0SnELoU+QP7pUlk="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux"; }; @@ -2867,12 +2935,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=198d035"; + version = "0.0.0+rev=9951831"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "198d03553f43a45b92ac5d0ee167db3fec6a6fd6"; - hash = "sha256-U597+o8gakd4nU9H2FE2aVhGqSG/eRh6BUhtEmwMzrU="; + rev = "9951831c5f05be434514dce38b30eef213667601"; + hash = "sha256-CFEYTfEqJdAQMaKRB1wThDTiqPcq5u53WAQhgI2+PN0="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2901,12 +2969,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=198d035"; + version = "0.0.0+rev=9951831"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "198d03553f43a45b92ac5d0ee167db3fec6a6fd6"; - hash = "sha256-U597+o8gakd4nU9H2FE2aVhGqSG/eRh6BUhtEmwMzrU="; + rev = "9951831c5f05be434514dce38b30eef213667601"; + hash = "sha256-CFEYTfEqJdAQMaKRB1wThDTiqPcq5u53WAQhgI2+PN0="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -3002,12 +3070,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=7f80a04"; + version = "0.0.0+rev=4f93826"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "7f80a0441ff2ca6aa8ced8e1ee87cead9dd26515"; - hash = "sha256-eTYqzdhxVI8jQXZ4FopReVYZJle2D0b31PjkZ2xC4f4="; + rev = "4f93826aeb31066eb241f4ccbca61f052239803f"; + hash = "sha256-Tl4q6QksNu7Pm0Pt8rJka6o55LNN2GN6zK732XmLXb8="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3047,23 +3115,23 @@ }; vhdl = buildGrammar { language = "vhdl"; - version = "0.0.0+rev=4ab3e25"; + version = "0.0.0+rev=3f13cd1"; src = fetchFromGitHub { owner = "jpt13653903"; repo = "tree-sitter-vhdl"; - rev = "4ab3e251eae8890a020d083d00acd1b8c2653c07"; - hash = "sha256-egNgZ1GgRNvIdH08cf6V83bMeOECs23yiV5RzcXZENg="; + rev = "3f13cd14952b39ccf6817f58880834b84565ca54"; + hash = "sha256-bChHzBGWlfJpSUpUqQW8L1y4CiM1Qqen3MaGcUT9lh0="; }; meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; }; vhs = buildGrammar { language = "vhs"; - version = "0.0.0+rev=90028bb"; + version = "0.0.0+rev=09f8fbf"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; - rev = "90028bbadb267ead5b87830380f6a825147f0c0f"; - hash = "sha256-yxUVca44z4wtYsxQKaJQjMm0fFeKAOWFnIX+5k6+SJk="; + rev = "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6"; + hash = "sha256-TUA94sJVWGK0KdvMueyQDmU+AlhdCOg0mlwcfL0XG8E="; }; meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; @@ -3135,12 +3203,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=bd1d35c"; + version = "0.0.0+rev=76e0c25"; src = fetchFromGitHub { owner = "winglang"; repo = "tree-sitter-wing"; - rev = "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"; - hash = "sha256-jygMTswZ8r4tUJQ0lUH8GHz56dyGd6rV1wL5i75Ni88="; + rev = "76e0c25844a66ebc6e866d690fcc5f4e90698947"; + hash = "sha256-N16cZK1dERqFd1FR35AfrsBy5EeeOPSp0FaZ83pMt7I="; }; meta.homepage = "https://github.com/winglang/tree-sitter-wing"; }; @@ -3213,24 +3281,24 @@ }; zathurarc = buildGrammar { language = "zathurarc"; - version = "0.0.0+rev=6e7c8ed"; + version = "0.0.0+rev=0554b4a"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-zathurarc"; - rev = "6e7c8edfcd6f5f7c12b2fa9ffc6d042f1b6d7068"; - hash = "sha256-tr9igIwfxXJJZAanRmDAhG3uu1vdT2nfW3Ng3EZ0094="; + rev = "0554b4a5d313244b7fc000cbb41c04afae4f4e31"; + hash = "sha256-edwLcz1WlcRJOoV2Unpho8wmi7TmcpwysBOAdRKprNw="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc"; }; zig = buildGrammar { language = "zig"; - version = "0.0.0+rev=2bac4cc"; + version = "0.0.0+rev=eb7d58c"; src = fetchFromGitHub { - owner = "maxxnino"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-zig"; - rev = "2bac4cc6c697d46a193905fef6d003bfa0bfabfd"; - hash = "sha256-IK9kCajZGwEiASa6Mv0oxuz85+QmI3S7Rl9lgHkApMc="; + rev = "eb7d58c2dc4fbeea4745019dee8df013034ae66b"; + hash = "sha256-iyb79SiMsV94RrWH/1Oi2aKBiX5io0Dp+zZf8qWZHwg="; }; - meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-zig"; }; } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 710528c3561ce..137d364e54729 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -4,9 +4,17 @@ self: super: let inherit (neovimUtils) grammarToPlugin; - generatedGrammars = callPackage ./generated.nix { + + initialGeneratedGrammars = callPackage ./generated.nix { inherit (tree-sitter) buildGrammar; }; + grammarOverrides = final: prev: { + nix = prev.nix.overrideAttrs { + # workaround for https://github.com/NixOS/nixpkgs/issues/332580 + prePatch = "rm queries/highlights.scm"; + }; + }; + generatedGrammars = lib.fix (lib.extends grammarOverrides (_: initialGeneratedGrammars)); generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars; @@ -36,22 +44,8 @@ let # pkgs.vimPlugins.nvim-treesitter.withAllGrammars withPlugins = f: self.nvim-treesitter.overrideAttrs { - passthru.dependencies = - let - grammars = map grammarToPlugin - (f (tree-sitter.builtGrammars // builtGrammars)); - copyGrammar = grammar: - let name = lib.last (lib.splitString "-" grammar.name); in - "ln -s ${grammar}/parser/${name}.so $out/parser/${name}.so"; - in - [ - (runCommand "vimplugin-treesitter-grammars" - { meta.platforms = lib.platforms.all; } - '' - mkdir -p $out/parser - ${lib.concatMapStringsSep "\n" copyGrammar grammars} - '') - ]; + passthru.dependencies = map grammarToPlugin + (f (tree-sitter.builtGrammars // builtGrammars)); }; withAllGrammars = withPlugins (_: allGrammars); diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index fe85fcf4b567a..8c6fdb18d1e1c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -17,7 +17,9 @@ , # Misc dependencies arrow-cpp , Cocoa +, coc-clangd , coc-diagnostic +, coc-pyright , code-minimap , dasht , deno @@ -34,6 +36,7 @@ , languagetool , llvmPackages , meson +, neovim-unwrapped , nim1 , nodePackages , openscad @@ -127,19 +130,19 @@ , # hurl dependencies hurl , # must be lua51Packages - luaPackages -, luajitPackages + luajitPackages +, aider-chat , }: self: super: +let + luaPackages = neovim-unwrapped.lua.pkgs; +in { alpha-nvim = super.alpha-nvim.overrideAttrs { - dependencies = [ - self.nvim-web-devicons # required by the startify theme - ]; nvimRequireCheck = "alpha"; }; - advanced-git-search-nvim = super.autosave-nvim.overrideAttrs { + advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs { dependencies = with super; [ telescope-nvim vim-fugitive vim-rhubarb ]; }; @@ -152,8 +155,17 @@ dependencies = with super; [ plenary-nvim ]; }; + avante-nvim = (callPackage ./avante-nvim { }).overrideAttrs { + dependencies = with self; [ + dressing-nvim + nui-nvim + nvim-treesitter + plenary-nvim + ]; + }; + barbecue-nvim = super.barbecue-nvim.overrideAttrs { - dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ]; + dependencies = with self; [ nvim-lspconfig nvim-navic ]; meta = { description = "VS Code like winbar for Neovim"; homepage = "https://github.com/utilyre/barbecue.nvim"; @@ -344,11 +356,22 @@ dependencies = with self; [ nvim-cmp zsh ]; }; + coc-clangd = buildVimPlugin { + inherit (coc-clangd) pname version meta; + src = "${coc-clangd}/lib/node_modules/coc-clangd"; + }; + coc-diagnostic = buildVimPlugin { inherit (coc-diagnostic) pname version meta; src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic"; }; + coc-pyright = buildVimPlugin { + pname = "coc-pyright"; + inherit (coc-pyright) version meta; + src = "${coc-pyright}/lib/node_modules/coc-pyright"; + }; + coc-nginx = buildVimPlugin { pname = "coc-nginx"; inherit (nodePackages."@yaegassy/coc-nginx") version meta; @@ -357,12 +380,12 @@ codeium-nvim = let # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json - codeiumVersion = "1.8.80"; + codeiumVersion = "1.16.18"; codeiumHashes = { - x86_64-linux = "sha256-ULHO7NrbW0DDlOYiSHGXwJ+NOa68Ma+HMHgq2WyAKBA="; - aarch64-linux = "sha256-WVqPV/D9jPADkxt5XmydqXjSG8461URPsk1+W/kyZV0="; - x86_64-darwin = "sha256-0P/eYZp0Wieza0btOA+yxqKtoIYlUN6MhN0dI6R8GEg="; - aarch64-darwin = "sha256-2Cv22+Ii+otKLDQ404l9R/x42PkKTEzPB72/gc9wfig="; + x86_64-linux = "sha256-/m+t4abPgVWeGpfDkPm5DGCIXm1LoM5znHfES9lotAo="; + aarch64-linux = "sha256-0kR799yuxSFmyedJ14f5/EqOiFHs9cWjeJKvDIpIRl0="; + x86_64-darwin = "sha256-7Go5qZVAe2UHn547HZG4fmh84iF2r15+0IIlJK72Fqg="; + aarch64-darwin = "sha256-fe4GrgLRr66Qmme3p0X5BEwvKZhqG1aiE8xs5A1Dt6E="; }; codeium' = codeium.overrideAttrs rec { @@ -431,12 +454,12 @@ codesnap-nvim = let - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; rev = "refs/tags/v${version}"; - hash = "sha256-3z0poNmS6LOS7/qGTBhvz1Q9WpYC7Wu4rNvHsUXB5ZY="; + hash = "sha256-OmSgrTYDtNb2plMyzjVvxGrfXB/lGKDpUQhpRqKfAMA="; }; codesnap-lib = rustPlatform.buildRustPackage { pname = "codesnap-lib"; @@ -444,7 +467,7 @@ sourceRoot = "${src.name}/generator"; - cargoHash = "sha256-u0NvChN50LIxUhmsT4mvWs5xB/TwJkMabggFePA/b1E="; + cargoHash = "sha256-6n37n8oHIHrz3S1+40nuD0Ud3l0iNgXig1ZwrgsnYTI="; nativeBuildInputs = [ pkg-config @@ -453,7 +476,7 @@ buildInputs = [ libuv.dev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; }; @@ -467,7 +490,7 @@ # Note: the destination should be generator.so, even on darwin # https://github.com/mistricky/codesnap.nvim/blob/main/scripts/build_generator.sh postInstall = let - extension = if stdenv.isDarwin then "dylib" else "so"; + extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; in '' rm -r $out/lua/*.so cp ${codesnap-lib}/lib/libgenerator.${extension} $out/lua/generator.so @@ -539,6 +562,12 @@ dependencies = with self; [ copilot-lua plenary-nvim ]; }; + copilot-lualine = super.copilot-lualine.overrideAttrs { + dependencies = with self; [ copilot-lua lualine-nvim ]; + doInstallCheck = true; + nvimRequireCheck = "copilot-lualine"; + }; + copilot-vim = super.copilot-vim.overrideAttrs (old: { postInstall = '' substituteInPlace $out/autoload/copilot/client.vim \ @@ -565,19 +594,19 @@ cord-nvim = let - version = "2024-07-19"; + version = "0-unstable-2024-09-26"; src = fetchFromGitHub { owner = "vyfor"; repo = "cord.nvim"; - rev = "cd97c25320fb0a672b11bcd95d8332bb3088ecce"; - hash = "sha256-66NtKteM1mvHP5wAU4e9JbsF+bq91lmCDcTh/6RPhoo="; + rev = "a26b00d58c42174aadf975917b49cec67650545f"; + hash = "sha256-jUxBvWnj0+axuw2SZ2zLzlhZS0tu+Bk8+wHtXENofkw="; }; - extension = if stdenv.isDarwin then "dylib" else "so"; + extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; rustPackage = rustPlatform.buildRustPackage { pname = "cord.nvim-rust"; inherit version src; - cargoHash = "sha256-6FYf4pHEPxvhKHHPmkjQ40zPxaiypnpDxF8kNH+h+tg="; + cargoHash = "sha256-M5mTdBACTaUVZhPpMOf1KQ3BcQpEoD2isAKRn+iAWjc="; installPhase = let cargoTarget = stdenv.hostPlatform.rust.cargoShortTarget; @@ -662,6 +691,30 @@ ''; }; + ddc-filter-matcher_head = super.ddc-filter-matcher_head.overrideAttrs { + dependencies = with self; [ ddc-vim ]; + }; + + ddc-source-lsp = super.ddc-source-lsp.overrideAttrs { + dependencies = with self; [ ddc-vim ]; + }; + + ddc-vim = super.ddc-vim.overrideAttrs { + dependencies = with self; [ denops-vim ]; + }; + + ddc-filter-sorter_rank = super.ddc-filter-sorter_rank.overrideAttrs { + dependencies = with self; [ ddc-vim ]; + }; + + ddc-ui-native = super.ddc-ui-native.overrideAttrs { + dependencies = with self; [ ddc-vim ]; + }; + + ddc-ui-pum = super.ddc-ui-pum.overrideAttrs { + dependencies = with self; [ ddc-vim pum-vim ]; + }; + defx-nvim = super.defx-nvim.overrideAttrs { dependencies = with self; [ nvim-yarp ]; }; @@ -698,6 +751,10 @@ }; }; + diagram-nvim = super.diagram-nvim.overrideAttrs { + dependencies = with self; [ image-nvim ]; + }; + diffview-nvim = super.diffview-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; @@ -835,6 +892,10 @@ dependencies = with self; [ plenary-nvim ]; }; + git-worktree-nvim = super.git-worktree-nvim.overrideAttrs { + dependencies = with super; [ plenary-nvim ]; + }; + guard-nvim = super.guard-nvim.overrideAttrs { dependencies = with self; [ guard-collection ]; }; @@ -862,7 +923,7 @@ dependencies = with self; [ nvim-treesitter ]; }; - haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "haskell-tools-nvim"; }; + haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.haskell-tools-nvim; }; hex-nvim = super.hex-nvim.overrideAttrs { postPatch = '' @@ -931,6 +992,18 @@ passthru.python3Dependencies = ps: [ ps.jupytext ]; }; + kulala-nvim = super.kulala-nvim.overrideAttrs { + dependencies = with self; [ + nvim-treesitter + nvim-treesitter-parsers.http + ]; + buildInputs = [ curl ]; + postPatch = '' + substituteInPlace lua/kulala/config/init.lua \ + --replace 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"' + ''; + }; + LanguageClient-neovim = let version = "0.1.161"; @@ -946,11 +1019,11 @@ src = LanguageClient-neovim-src; cargoHash = "sha256-H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" ''; }; @@ -1004,13 +1077,20 @@ dependencies = with self; [ plenary-nvim ]; }; + lsp-progress-nvim = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.lsp-progress-nvim; + nvimRequireCheck = "lsp-progress"; + }; + luasnip = super.luasnip.overrideAttrs { dependencies = with self; [ luaPackages.jsregexp ]; }; - lz-n = neovimUtils.buildNeovimPlugin { luaAttr = "lz-n"; }; + lz-n = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lz-n; }; - lzn-auto-require = neovimUtils.buildNeovimPlugin { luaAttr = "lzn-auto-require"; }; + lze = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lze; }; + + lzn-auto-require = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lzn-auto-require; }; magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; @@ -1067,10 +1147,6 @@ ''; }; - markview-nvim = super.markview-nvim.overrideAttrs { - dependencies = with self; [ nvim-web-devicons ]; - }; - mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs { dependencies = with self; [ mason-nvim nvim-lspconfig ]; }; @@ -1086,7 +1162,7 @@ }; middleclass = neovimUtils.buildNeovimPlugin { - luaAttr = "middleclass"; + luaAttr = luaPackages.middleclass; nvimRequireCheck = "middleclass"; }; @@ -1175,8 +1251,11 @@ dependencies = with self; [ plenary-nvim ]; }; - neorg = super.neorg.overrideAttrs { - dependencies = with self; [ plenary-nvim ]; + neorg = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.neorg; + + doInstallCheck = true; + nvimRequireCheck = "neorg"; }; neotest = super.neotest.overrideAttrs { @@ -1223,6 +1302,10 @@ dependencies = with self; [ nvim-dap ]; }; + nvim-dap-rego = super.nvim-dap-rego.overrideAttrs { + dependencies = with self; [ nvim-dap ]; + }; + nvim-dap-ui = super.nvim-dap-ui.overrideAttrs { dependencies = with self; [ nvim-dap nvim-nio ]; @@ -1430,7 +1513,16 @@ patches = [ ./patches/ranger.nvim/fix-paths.patch ]; postPatch = '' - substituteInPlace lua/ranger-nvim.lua --replace '@ranger@' ${ranger} + substituteInPlace lua/ranger-nvim.lua --replace '@ranger@' ${ranger}/bin/ranger + ''; + }; + + aider-nvim = super.aider-nvim.overrideAttrs { + patches = [ ./patches/aider.nvim/fix-paths.patch ]; + + postPatch = '' + substituteInPlace lua/aider.lua --replace '@aider@' ${aider-chat}/bin/aider + substituteInPlace lua/helpers.lua --replace '@aider@' ${aider-chat}/bin/aider ''; }; @@ -1446,17 +1538,17 @@ ]; }; - rocks-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "rocks-nvim"; }; + rocks-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-nvim; }; - rocks-config-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "rocks-config-nvim"; }; + rocks-config-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-config-nvim; }; roslyn-nvim = super.roslyn-nvim.overrideAttrs { dependencies = with self; [ nvim-lspconfig ]; }; - rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "rtp-nvim"; }; + rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rtp-nvim; }; - rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = "rustaceanvim"; }; + rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rustaceanvim; }; sg-nvim = super.sg-nvim.overrideAttrs (old: let @@ -1464,13 +1556,13 @@ pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-dqa5Rd3NeOSqv18F1QdkrWEypJ0bvVwIDwrMOyBVsDM="; + cargoHash = "sha256-7Bo0DSRqxA7kgNuyuWw24r3PsP92y9h98SHFtIhG+Gs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -1493,10 +1585,6 @@ mkdir -p $out/target/debug ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug ''; - - # Build fails with rust > 1.80 - # https://github.com/sourcegraph/sg.nvim/issues/259 - meta.broken = true; }); skim = buildVimPlugin { @@ -1515,22 +1603,22 @@ sniprun = let - version = "1.3.15"; + version = "1.3.16"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "refs/tags/v${version}"; - hash = "sha256-8N+KUawQ6RI6sG8m9wpvJTMQyJ5j/43PRkrTPrWAREQ="; + hash = "sha256-2rVeBUkdLXUiHkd8slyiLTYQBKwgMQvIi/uyCToVBYA="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-bLki+6uMKJtk/bu+LNf2E1m/HpEG8zmnM3JI89IjmNs="; + cargoHash = "sha256-eZcWS+DWec0V9G6hBnZRUNcb3uZeSiBhn4Ed9KodFV8="; nativeBuildInputs = [ makeWrapper ]; @@ -1555,7 +1643,7 @@ meta = { homepage = "https://github.com/michaelb/sniprun/"; - changelog = "https://github.com/michaelb/sniprun/releases/tag/v${version}"; + changelog = "https://github.com/michaelb/sniprun/blob/v${version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ GaetanLepage ]; }; }; @@ -1653,6 +1741,11 @@ }; }; + syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs { + dependencies = with self; [ nvim-treesitter ]; + meta.maintainers = with lib.maintainers; [ callumio ]; + }; + taskwarrior3 = buildVimPlugin { inherit (taskwarrior3) version pname; src = "${taskwarrior3.src}/scripts/vim"; @@ -1741,6 +1834,10 @@ nvimRequireCheck = "todo-comments"; }; + tssorter-nvim = super.tssorter-nvim.overrideAttrs { + dependencies = with self; [ nvim-treesitter ]; + }; + tup = let # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim @@ -1819,7 +1916,7 @@ }; vim-addon-manager = super.vim-addon-manager.overrideAttrs { - buildInputs = lib.optional stdenv.isDarwin Cocoa; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Cocoa; }; vim-addon-mru = super.vim-addon-mru.overrideAttrs { @@ -1880,7 +1977,7 @@ src = old.src.overrideAttrs (srcOld: { postFetch = (srcOld.postFetch or "") - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' rm $out/colors/darkBlue.vim ''; }); @@ -2212,7 +2309,6 @@ // ( let nodePackageNames = [ - "coc-clangd" "coc-cmake" "coc-css" "coc-docker" @@ -2234,7 +2330,6 @@ "coc-metals" "coc-pairs" "coc-prettier" - "coc-pyright" "coc-python" "coc-r-lsp" "coc-rls" diff --git a/pkgs/applications/editors/vim/plugins/patches/aider.nvim/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/aider.nvim/fix-paths.patch new file mode 100644 index 0000000000000..63995f0636dd8 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/aider.nvim/fix-paths.patch @@ -0,0 +1,26 @@ +diff --git a/lua/aider.lua b/lua/aider.lua +index 38db0d1..d1ad6d5 100644 +--- a/lua/aider.lua ++++ b/lua/aider.lua +@@ -26,7 +26,7 @@ function M.AiderOpen(args, window_type) + if M.aider_buf and vim.api.nvim_buf_is_valid(M.aider_buf) then + helpers.open_buffer_in_new_window(window_type, M.aider_buf) + else +- command = 'aider ' .. (args or '') ++ command = '@aider@ ' .. (args or '') + helpers.open_window(window_type) + command = helpers.add_buffers_to_command(command) + M.aider_job_id = vim.fn.termopen(command, {on_exit = OnExit}) +diff --git a/lua/helpers.lua b/lua/helpers.lua +index 152182b..aa21584 100644 +--- a/lua/helpers.lua ++++ b/lua/helpers.lua +@@ -63,7 +63,7 @@ end + + local function build_background_command(args, prompt) + prompt = prompt or "Complete as many todo items as you can and remove the comment for any item you complete." +- local command = 'aider --msg "' .. prompt .. '" ' .. (args or '') ++ local command = '@aider@ --msg "' .. prompt .. '" ' .. (args or '') + command = add_buffers_to_command(command) + return command + end diff --git a/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch index 97f1824ea623b..f444a80437bc7 100644 --- a/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch +++ b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch @@ -1,15 +1,15 @@ diff --git a/lua/sniprun.lua b/lua/sniprun.lua -index fe29d1e..92d4729 100644 +index 49be442..1834566 100644 --- a/lua/sniprun.lua +++ b/lua/sniprun.lua -@@ -4,9 +4,7 @@ M.custom_highlight=false +@@ -3,9 +3,7 @@ M.ping_anwsered = 0 M.info_floatwin = {} -- See https://github.com/tjdevries/rofl.nvim/blob/632c10f2ec7c56882a3f7eda8849904bcac6e8af/lua/rofl.lua -local binary_path = vim.fn.fnamemodify( -- vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h") -- .. "/target/release/sniprun" +- vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h") +- .. "/target/release/sniprun" +local binary_path = "@sniprun_bin@/bin/sniprun" - local sniprun_path = vim.fn.fnamemodify( vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.." + local sniprun_path = vim.fn.fnamemodify(vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.." diff --git a/pkgs/applications/editors/vim/plugins/updater.nix b/pkgs/applications/editors/vim/plugins/updater.nix index 00fb8b8dedc54..1a62f13a04086 100644 --- a/pkgs/applications/editors/vim/plugins/updater.nix +++ b/pkgs/applications/editors/vim/plugins/updater.nix @@ -33,12 +33,12 @@ buildPythonApplication { # wrap python scripts makeWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ - nix nix-prefetch-git neovim-unwrapped nurl ]}" --prefix PYTHONPATH : "${./.}:${../../../../../maintainers/scripts}" ) + nix nix-prefetch-git neovim-unwrapped nurl ]}" --prefix PYTHONPATH : "${./.}:${../../../../../maintainers/scripts/pluginupdate-py}" ) wrapPythonPrograms ''; shellHook = '' - export PYTHONPATH=pkgs/applications/editors/vim/plugins:maintainers/scripts:$PYTHONPATH + export PYTHONPATH=pkgs/applications/editors/vim/plugins:maintainers/scripts/pluginupdate-py:$PYTHONPATH ''; meta.mainProgram = "vim-plugins-updater"; diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index 84a906b9e8823..391370c54efda 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -49,7 +49,7 @@ let buildInputs = [ libgit2 zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 9bd304b4d3845..c94388161d62f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -49,6 +49,7 @@ https://github.com/stevearc/aerial.nvim/,, https://github.com/Numkil/ag.nvim/,, https://github.com/derekelkins/agda-vim/,, https://github.com/aduros/ai.vim/,HEAD, +https://github.com/joshuavial/aider.nvim/,HEAD, https://github.com/slashmili/alchemist.vim/,, https://github.com/dense-analysis/ale/,, https://github.com/vim-scripts/align/,, @@ -111,7 +112,7 @@ https://github.com/jlanzarotta/bufexplorer/,, https://github.com/AndrewRadev/bufferize.vim/,HEAD, https://github.com/akinsho/bufferline.nvim/,, https://github.com/kwkarlwang/bufjump.nvim/,HEAD, -https://github.com/dkarter/bullets.vim/,, +https://github.com/bullets-vim/bullets.vim/,, https://github.com/mattn/calendar-vim/,,mattn-calendar-vim https://github.com/itchyny/calendar.vim/,, https://github.com/bkad/camelcasemotion/,, @@ -201,8 +202,8 @@ https://github.com/tjdevries/colorbuddy.nvim/,, https://github.com/lilydjwg/colorizer/,, https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD, https://github.com/wincent/command-t/,, -https://github.com/numtostr/comment.nvim/,, https://github.com/LudoPinelli/comment-box.nvim/,HEAD, +https://github.com/numtostr/comment.nvim/,, https://github.com/rhysd/committia.vim/,, https://github.com/hrsh7th/compe-conjure/,, https://github.com/GoldsteinE/compe-latex-symbols/,, @@ -222,6 +223,7 @@ https://github.com/Olical/conjure/,, https://github.com/wellle/context.vim/,, https://github.com/Shougo/context_filetype.vim/,, https://github.com/zbirenbaum/copilot-cmp/,HEAD, +https://github.com/AndreM222/copilot-lualine/,HEAD, https://github.com/zbirenbaum/copilot.lua/,HEAD, https://github.com/github/copilot.vim/,, https://github.com/ms-jpq/coq.artifacts/,HEAD, @@ -243,7 +245,13 @@ https://github.com/scottmckendry/cyberdream.nvim/,, https://github.com/ptdewey/darkearth-nvim/,HEAD, https://github.com/dart-lang/dart-vim-plugin/,, https://github.com/rizzatti/dash.vim/,HEAD, -https://github.com/glepnir/dashboard-nvim/,, +https://github.com/nvimdev/dashboard-nvim/,, +https://github.com/Shougo/ddc-filter-matcher_head/,HEAD, +https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD, +https://github.com/Shougo/ddc-source-lsp/,HEAD, +https://github.com/Shougo/ddc-ui-native/,HEAD, +https://github.com/Shougo/ddc-ui-pum/,HEAD, +https://github.com/Shougo/ddc.vim/,HEAD, https://github.com/andrewferrier/debugprint.nvim/,HEAD, https://github.com/Verf/deepwhite.nvim/,, https://github.com/kristijanhusak/defx-git/,, @@ -277,6 +285,7 @@ https://github.com/rhysd/devdocs.vim/,, https://github.com/vmchale/dhall-vim/,, https://github.com/onsails/diaglist.nvim/,, https://github.com/nvim-lua/diagnostic-nvim/,, +https://github.com/3rd/diagram.nvim/,HEAD, https://github.com/monaqa/dial.nvim/,HEAD, https://github.com/sindrets/diffview.nvim/,, https://github.com/elihunter173/dirbuf.nvim/,HEAD, @@ -287,6 +296,7 @@ https://github.com/NTBBloodbath/doom-one.nvim/,, https://github.com/Mofiqul/dracula.nvim/,HEAD, https://github.com/stevearc/dressing.nvim/,, https://github.com/Bekaboo/dropbar.nvim/,HEAD, +https://github.com/earthly/earthly.vim/,HEAD, https://github.com/Shougo/echodoc.vim/,, https://github.com/sainnhe/edge/,, https://github.com/edgedb/edgedb-vim/,, @@ -346,7 +356,6 @@ https://github.com/jsfaint/gen_tags.vim/,, https://github.com/gentoo/gentoo-syntax/,, https://github.com/ndmitchell/ghcid/,, https://github.com/eagletmt/ghcmod-vim/,, -https://github.com/lambdalisue/gina.vim/,, https://github.com/f-person/git-blame.nvim/,, https://github.com/akinsho/git-conflict.nvim/,HEAD, https://github.com/rhysd/git-messenger.vim/,, @@ -399,7 +408,7 @@ https://github.com/OXY2DEV/helpview.nvim/,HEAD, https://github.com/RaafatTurki/hex.nvim/,HEAD, https://github.com/Yggdroot/hiPairs/,, https://github.com/tzachar/highlight-undo.nvim/,HEAD, -https://git.sr.ht/~soywod/himalaya-vim,, +https://github.com/pimalaya/himalaya-vim/,, https://github.com/mpickering/hlint-refactor-vim/,, https://github.com/calops/hmts.nvim/,, https://github.com/edluffy/hologram.nvim/,, @@ -451,6 +460,7 @@ https://github.com/kmonad/kmonad-vim/,, https://github.com/frabjous/knap/,HEAD, https://github.com/b3nj5m1n/kommentary/,, https://github.com/udalov/kotlin-vim/,, +https://github.com/mistweaverco/kulala.nvim/,HEAD, https://github.com/qnighy/lalrpop.vim/,, https://github.com/sk1418/last256/,, https://github.com/latex-box-team/latex-box/,, @@ -478,7 +488,7 @@ https://github.com/ggandor/lightspeed.nvim/,, https://github.com/junegunn/limelight.vim/,, https://github.com/lf-lang/lingua-franca.vim/,, https://github.com/tamago324/lir.nvim/,, -https://github.com/tami5/lispdocs.nvim/,, +https://github.com/kkharji/lispdocs.nvim/,, https://github.com/ldelossa/litee-calltree.nvim/,, https://github.com/ldelossa/litee-filetree.nvim/,, https://github.com/ldelossa/litee-symboltree.nvim/,, @@ -496,7 +506,7 @@ https://github.com/nvim-lua/lsp_extensions.nvim/,, https://git.sr.ht/~whynothugo/lsp_lines.nvim,, https://github.com/ray-x/lsp_signature.nvim/,, https://github.com/lspcontainers/lspcontainers.nvim/,, -https://github.com/onsails/lspkind-nvim/,, +https://github.com/onsails/lspkind.nvim/,, https://github.com/nvimdev/lspsaga.nvim/,, https://github.com/barreiroleo/ltex_extra.nvim/,HEAD, https://github.com/arkav/lualine-lsp-progress/,, @@ -509,7 +519,6 @@ https://github.com/Bilal2453/luvit-meta/,HEAD, https://github.com/WhiteBlackGoose/magma-nvim-goose/,HEAD, https://github.com/winston0410/mark-radar.nvim/,HEAD, https://github.com/iamcco/markdown-preview.nvim/,, -https://github.com/MeanderingProgrammer/markdown.nvim/,,render-markdown https://github.com/tadmccorkle/markdown.nvim/,HEAD, https://github.com/David-Kunz/markid/,HEAD, https://github.com/chentoast/marks.nvim/,, @@ -526,8 +535,49 @@ https://github.com/savq/melange-nvim/,, https://github.com/lsig/messenger.nvim/,HEAD, https://github.com/xero/miasma.nvim/,, https://github.com/dasupradyumna/midnight.nvim/,, -https://github.com/phaazon/mind.nvim/,HEAD, +https://github.com/hadronized/mind.nvim/,HEAD, +https://github.com/echasnovski/mini-git/,HEAD, +https://github.com/echasnovski/mini.ai/,HEAD, +https://github.com/echasnovski/mini.align/,HEAD, +https://github.com/echasnovski/mini.animate/,HEAD, +https://github.com/echasnovski/mini.base16/,HEAD, +https://github.com/echasnovski/mini.basics/,HEAD, +https://github.com/echasnovski/mini.bracketed/,HEAD, +https://github.com/echasnovski/mini.bufremove/,HEAD, +https://github.com/echasnovski/mini.clue/,HEAD, +https://github.com/echasnovski/mini.colors/,HEAD, +https://github.com/echasnovski/mini.comment/,HEAD, +https://github.com/echasnovski/mini.completion/,HEAD, +https://github.com/echasnovski/mini.cursorword/,HEAD, +https://github.com/echasnovski/mini.deps/,HEAD, +https://github.com/echasnovski/mini.diff/,HEAD, +https://github.com/echasnovski/mini.doc/,HEAD, +https://github.com/echasnovski/mini.extra/,HEAD, +https://github.com/echasnovski/mini.files/,HEAD, +https://github.com/echasnovski/mini.fuzzy/,HEAD, +https://github.com/echasnovski/mini.hipatterns/,HEAD, +https://github.com/echasnovski/mini.hues/,HEAD, +https://github.com/echasnovski/mini.icons/,HEAD, +https://github.com/echasnovski/mini.indentscope/,HEAD, +https://github.com/echasnovski/mini.jump/,HEAD, +https://github.com/echasnovski/mini.jump2d/,HEAD, +https://github.com/echasnovski/mini.map/,HEAD, +https://github.com/echasnovski/mini.misc/,HEAD, +https://github.com/echasnovski/mini.move/,HEAD, +https://github.com/echasnovski/mini.notify/,HEAD, https://github.com/echasnovski/mini.nvim/,, +https://github.com/echasnovski/mini.operators/,HEAD, +https://github.com/echasnovski/mini.pairs/,HEAD, +https://github.com/echasnovski/mini.pick/,HEAD, +https://github.com/echasnovski/mini.sessions/,HEAD, +https://github.com/echasnovski/mini.splitjoin/,HEAD, +https://github.com/echasnovski/mini.starter/,HEAD, +https://github.com/echasnovski/mini.statusline/,HEAD, +https://github.com/echasnovski/mini.surround/,HEAD, +https://github.com/echasnovski/mini.tabline/,HEAD, +https://github.com/echasnovski/mini.test/,HEAD, +https://github.com/echasnovski/mini.trailspace/,HEAD, +https://github.com/echasnovski/mini.visits/,HEAD, https://github.com/wfxr/minimap.vim/,, https://github.com/jghauser/mkdir.nvim/,main, https://github.com/jakewvincent/mkdnflow.nvim/,HEAD, @@ -576,7 +626,6 @@ https://github.com/neomake/neomake/,, https://github.com/Shougo/neomru.vim/,, https://github.com/rafamadriz/neon/,, https://github.com/ii14/neorepl.nvim/,HEAD, -https://github.com/nvim-neorg/neorg/,, https://github.com/nvim-neorg/neorg-telescope/,HEAD, https://github.com/karb94/neoscroll.nvim/,, https://github.com/Shougo/neosnippet-snippets/,, @@ -595,7 +644,7 @@ https://github.com/weilbith/neotest-gradle/,HEAD, https://github.com/alfaix/neotest-gtest/,HEAD, https://github.com/MrcJkb/neotest-haskell/,HEAD, https://github.com/rcasia/neotest-java/,HEAD, -https://github.com/haydenmeade/neotest-jest/,HEAD, +https://github.com/nvim-neotest/neotest-jest/,HEAD, https://github.com/zidhuss/neotest-minitest/,HEAD, https://github.com/theutz/neotest-pest/,HEAD, https://github.com/olimorris/neotest-phpunit/,HEAD, @@ -617,8 +666,8 @@ https://github.com/preservim/nerdcommenter/,, https://github.com/preservim/nerdtree/,, https://github.com/Xuyuanp/nerdtree-git-plugin/,, https://github.com/miversen33/netman.nvim/,HEAD, -https://github.com/oberblastmeister/neuron.nvim/,, https://github.com/prichrd/netrw.nvim/,HEAD, +https://github.com/oberblastmeister/neuron.nvim/,, https://github.com/fiatjaf/neuron.vim/,, https://github.com/Olical/nfnl/,main, https://github.com/chr4/nginx.vim/,, @@ -655,7 +704,7 @@ https://github.com/ojroques/nvim-bufdel/,, https://github.com/roxma/nvim-cm-racer/,, https://github.com/hrsh7th/nvim-cmp/,, https://github.com/weilbith/nvim-code-action-menu/,, -https://github.com/noib3/nvim-cokeline/,HEAD, +https://github.com/willothy/nvim-cokeline/,HEAD, https://github.com/nvchad/nvim-colorizer.lua/,, https://github.com/terrortylor/nvim-comment/,, https://github.com/hrsh7th/nvim-compe/,, @@ -666,6 +715,7 @@ https://github.com/yamatsum/nvim-cursorline/,, https://github.com/mfussenegger/nvim-dap/,, https://github.com/leoluz/nvim-dap-go/,HEAD, https://github.com/mfussenegger/nvim-dap-python/,HEAD, +https://github.com/rinx/nvim-dap-rego/,HEAD, https://github.com/jonboh/nvim-dap-rr/,HEAD, https://github.com/rcarriga/nvim-dap-ui/,, https://github.com/theHamsta/nvim-dap-virtual-text/,, @@ -712,6 +762,7 @@ https://github.com/gennaro-tedesco/nvim-peekup/,, https://github.com/yorickpeterse/nvim-pqf/,HEAD, https://github.com/jamestthompson3/nvim-remote-containers/,HEAD, https://github.com/olrtg/nvim-rename-state/,HEAD, +https://github.com/chrisgrieser/nvim-rip-substitute/,, https://github.com/petertriho/nvim-scrollbar/,HEAD, https://github.com/dstein64/nvim-scrollview/,, https://github.com/s1n7ax/nvim-search-and-replace/,HEAD, @@ -725,7 +776,7 @@ https://github.com/kylechui/nvim-surround/,main, https://github.com/svermeulen/nvim-teal-maker/,HEAD, https://github.com/norcalli/nvim-terminal.lua/,, https://github.com/klen/nvim-test/,, -https://github.com/kyazdani42/nvim-tree.lua/,, +https://github.com/nvim-tree/nvim-tree.lua/,, https://github.com/nvim-treesitter/nvim-treesitter/,, https://github.com/nvim-treesitter/nvim-treesitter-context/,, https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, @@ -737,15 +788,16 @@ https://github.com/windwp/nvim-ts-autotag/,, https://github.com/joosepalviste/nvim-ts-context-commentstring/,, https://github.com/kevinhwang91/nvim-ufo/,HEAD, https://github.com/samjwill/nvim-unception/,HEAD, -https://github.com/kyazdani42/nvim-web-devicons/,, +https://github.com/chrisgrieser/nvim-various-textobjs/,HEAD, +https://github.com/nvim-tree/nvim-web-devicons/,, https://github.com/AckslD/nvim-whichkey-setup.lua/,, https://github.com/s1n7ax/nvim-window-picker/,HEAD, https://github.com/roxma/nvim-yarp/,, -https://github.com/haringsrob/nvim_context_vt/,, +https://github.com/andersevenrud/nvim_context_vt/,, https://github.com/neovim/nvimdev.nvim/,, -https://github.com/nvchad/nvterm/,HEAD, +https://github.com/zbirenbaum/nvterm/,HEAD, https://github.com/epwalsh/obsidian.nvim/,HEAD, -https://github.com/glepnir/oceanic-material/,, +https://github.com/nvimdev/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, https://github.com/stevearc/oil.nvim/,HEAD, @@ -824,6 +876,7 @@ https://github.com/theprimeagen/refactoring.nvim/,, https://github.com/tversteeg/registers.nvim/,, https://github.com/vladdoster/remember.nvim/,, https://github.com/filipdutescu/renamer.nvim/,, +https://github.com/MeanderingProgrammer/render-markdown.nvim/,, https://github.com/gabrielpoca/replacer.nvim/,HEAD, https://github.com/NTBBloodbath/rest.nvim/,, https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim @@ -849,13 +902,13 @@ https://github.com/megaannum/self/,, https://github.com/jaxbot/semantic-highlight.vim/,, https://github.com/numirias/semshi/,, https://github.com/junegunn/seoul256.vim/,, -https://github.com/tjdevries/sg.nvim/,HEAD, +https://github.com/sourcegraph/sg.nvim/,HEAD, https://github.com/osyo-manga/shabadou.vim/,, https://github.com/AndrewRadev/sideways.vim/,, https://github.com/lotabout/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, https://github.com/kovisoft/slimv/,, -https://github.com/danielfalk/smart-open.nvim,0.2.x, +https://github.com/danielfalk/smart-open.nvim/,0.2.x, https://github.com/mrjones2014/smart-splits.nvim/,, https://github.com/m4xshen/smartcolumn.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, @@ -875,7 +928,7 @@ https://github.com/stsewd/sphinx.nvim/,, https://github.com/sjl/splice.vim/,, https://github.com/vimlab/split-term.vim/,, https://github.com/AndrewRadev/splitjoin.vim/,, -https://github.com/tami5/sqlite.lua/,, +https://github.com/kkharji/sqlite.lua/,, https://github.com/srcery-colors/srcery-vim/,, https://github.com/chr4/sslsecure.vim/,, https://github.com/cshuaimin/ssr.nvim/,HEAD, @@ -884,7 +937,7 @@ https://github.com/tamton-aquib/staline.nvim/,main, https://github.com/eigenfoo/stan-vim/,, https://github.com/josegamez82/starrynight/,HEAD, https://github.com/darfink/starsearch.vim/,, -https://github.com/startup-nvim/startup.nvim/,HEAD, +https://github.com/max397574/startup.nvim/,HEAD, https://github.com/luukvbaal/statuscol.nvim/,, https://github.com/arnamak/stay-centered.nvim/,HEAD, https://github.com/folke/styler.nvim/,, @@ -900,6 +953,7 @@ https://github.com/keith/swift.vim/,, https://github.com/AndrewRadev/switch.vim/,, https://github.com/simrat39/symbols-outline.nvim/,, https://github.com/vim-syntastic/syntastic/,, +https://github.com/ziontee113/syntax-tree-surfer/,HEAD, https://github.com/nanozuki/tabby.nvim/,HEAD, https://github.com/kdheepak/tabline.nvim/,, https://github.com/vim-scripts/tabmerge/,, @@ -911,11 +965,12 @@ https://github.com/godlygeek/tabular/,, https://github.com/AndrewRadev/tagalong.vim/,, https://github.com/preservim/tagbar/,, https://github.com/vim-scripts/taglist.vim/,, +https://github.com/luckasRanarison/tailwind-tools.nvim/,HEAD, https://github.com/themaxmarchuk/tailwindcss-colors.nvim/,HEAD, https://github.com/wellle/targets.vim/,, https://github.com/tools-life/taskwiki/,, https://github.com/tomtom/tcomment_vim/,, -https://github.com/renerocksai/telekasten.nvim/,, +https://github.com/nvim-telekasten/telekasten.nvim/,, https://github.com/GustavoKatel/telescope-asynctasks.nvim/,, https://github.com/nvim-telescope/telescope-cheat.nvim/,, https://github.com/fannheyward/telescope-coc.nvim/,, @@ -943,6 +998,7 @@ https://github.com/natecraddock/telescope-zf-native.nvim/,HEAD, https://github.com/jvgrootveld/telescope-zoxide/,, https://github.com/nvim-telescope/telescope.nvim/,, https://github.com/luc-tielen/telescope_hoogle/,HEAD, +https://github.com/joerdav/templ.vim/,HEAD, https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, https://github.com/chomosuke/term-edit.nvim/,HEAD, @@ -979,6 +1035,7 @@ https://github.com/Pocco81/true-zen.nvim/,, https://github.com/tesaguri/trust.vim/,HEAD, https://github.com/folke/ts-comments.nvim/,HEAD, https://github.com/jgdavey/tslime.vim/,, +https://github.com/mtrajano/tssorter.nvim/,HEAD, https://github.com/Quramy/tsuquyomi/,, https://github.com/folke/twilight.nvim/,, https://github.com/pmizio/typescript-tools.nvim/,, @@ -1138,14 +1195,14 @@ https://github.com/dcharbon/vim-flatbuffers/,, https://github.com/voldikss/vim-floaterm/,, https://github.com/rbong/vim-flog/,, https://github.com/thosakwe/vim-flutter/,, -https://github.com/fsharp/vim-fsharp/,, https://github.com/thinca/vim-ft-diff_fold/,, https://github.com/tommcdo/vim-fubitive/,, https://github.com/tpope/vim-fugitive/,, https://github.com/maxjacobson/vim-fzf-coauthorship/,, -https://github.com/Shirk/vim-gas/,, +https://github.com/HealsCodes/vim-gas/,, https://github.com/ruanyl/vim-gh-line/,, https://github.com/raghur/vim-ghost/,, +https://github.com/lambdalisue/vim-gina/,, https://github.com/mattn/vim-gist/,, https://github.com/lambdalisue/vim-gista/,, https://github.com/tpope/vim-git/,, @@ -1184,7 +1241,7 @@ https://github.com/w0ng/vim-hybrid/,, https://github.com/kristijanhusak/vim-hybrid-material/,, https://github.com/noc7c9/vim-iced-coffee-script/,, https://github.com/RRethy/vim-illuminate/,, -https://github.com/nathanaelkane/vim-indent-guides/,, +https://github.com/preservim/vim-indent-guides/,, https://github.com/michaeljsmith/vim-indent-object/,, https://github.com/jeetsukumaran/vim-indentwise/,, https://github.com/henrik/vim-indexed-search/,, @@ -1197,6 +1254,7 @@ https://github.com/pangloss/vim-javascript/,, https://github.com/jelera/vim-javascript-syntax/,, https://github.com/lepture/vim-jinja/,, https://github.com/seirl/vim-jinja-languages/,HEAD, +https://github.com/avm99963/vim-jjdescription/,HEAD, https://github.com/maksimr/vim-jsbeautify/,, https://github.com/heavenshell/vim-jsdoc/,, https://github.com/elzr/vim-json/,, @@ -1214,7 +1272,7 @@ https://github.com/ludovicchabant/vim-lawrencium/,, https://github.com/hecal3/vim-leader-guide/,, https://github.com/mk12/vim-lean/,, https://github.com/ledger/vim-ledger/,, -https://github.com/reedes/vim-lexical/,HEAD, +https://github.com/preservim/vim-lexical/,HEAD, https://github.com/lfe-support/vim-lfe/,, https://github.com/josa42/vim-lightline-coc/,, https://github.com/tommcdo/vim-lion/,, @@ -1285,7 +1343,7 @@ https://github.com/vim-pandoc/vim-pandoc-after/,, https://github.com/vim-pandoc/vim-pandoc-syntax/,, https://github.com/yorickpeterse/vim-paper/,HEAD, https://github.com/bhurlow/vim-parinfer/,, -https://github.com/sickill/vim-pasta/,, +https://github.com/ku1ik/vim-pasta/,, https://github.com/tpope/vim-pathogen/,, https://github.com/junegunn/vim-peekaboo/,, https://github.com/preservim/vim-pencil/,, @@ -1300,7 +1358,7 @@ https://github.com/haya14busa/vim-poweryank/,, https://github.com/prettier/vim-prettier/,, https://github.com/thinca/vim-prettyprint/,, https://github.com/meain/vim-printer/,HEAD, -https://github.com/pantharshit00/vim-prisma/,, +https://github.com/prisma/vim-prisma/,, https://github.com/tpope/vim-projectionist/,, https://github.com/dhruvasagar/vim-prosession/,, https://github.com/uarun/vim-protobuf/,, @@ -1361,7 +1419,7 @@ https://github.com/dstein64/vim-startuptime/,, https://github.com/axelf4/vim-strip-trailing-whitespace/,, https://github.com/nbouscal/vim-stylish-haskell/,, https://github.com/alx741/vim-stylishask/,, -https://github.com/arzg/vim-substrata/,HEAD, +https://github.com/lunacookies/vim-substrata/,HEAD, https://github.com/svermeulen/vim-subversive/,, https://github.com/lambdalisue/vim-suda/,, https://github.com/tpope/vim-surround/,, @@ -1421,8 +1479,9 @@ https://github.com/joonty/vim-xdebug/,, https://github.com/lyokha/vim-xkbswitch/,, https://github.com/mg979/vim-xtabline/,, https://github.com/stephpy/vim-yaml/,, -https://github.com/mindriot101/vim-yapf/,, +https://github.com/simonrw/vim-yapf/,, https://github.com/michal-h21/vim-zettel/,HEAD, +https://github.com/marrub--/vim-zscript/,HEAD, https://github.com/dag/vim2hs/,, https://github.com/monkoose/vim9-stargate/,HEAD, https://github.com/dominikduda/vim_current_word/,, @@ -1471,16 +1530,16 @@ https://github.com/HerringtonDarkholme/yats.vim/,, https://github.com/mikavilpas/yazi.nvim/,HEAD, https://github.com/lucasew/yescapsquit.vim/,HEAD, https://github.com/elkowar/yuck.vim/,HEAD, +https://github.com/fsharp/zarchive-vim-fsharp/,, https://github.com/KabbAmine/zeavim.vim/,, https://github.com/swaits/zellij-nav.nvim/,HEAD, https://github.com/Lilja/zellij.nvim/,HEAD, https://github.com/folke/zen-mode.nvim/,, -https://github.com/mcchrish/zenbones.nvim/,HEAD, +https://github.com/zenbones-theme/zenbones.nvim/,HEAD, https://github.com/jnurmine/zenburn/,, https://github.com/phha/zenburn.nvim/,,phha-zenburn -https://github.com/glepnir/zephyr-nvim/,, +https://github.com/nvimdev/zephyr-nvim/,, https://github.com/ziglang/zig.vim/,, -https://github.com/mickael-menu/zk-nvim/,HEAD, +https://github.com/zk-org/zk-nvim/,HEAD, https://github.com/troydm/zoomwintab.vim/,, https://github.com/nanotee/zoxide.vim/,, -https://github.com/joerdav/templ.vim,HEAD, diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix index e65439df5236e..e54ac39b2ae49 100644 --- a/pkgs/applications/editors/vim/vimacs.nix +++ b/pkgs/applications/editors/vim/vimacs.nix @@ -1,5 +1,5 @@ { lib, stdenv, config, vim-full, macvim, vimPlugins -, useMacvim ? stdenv.isDarwin && (config.vimacs.macvim or true) +, useMacvim ? stdenv.hostPlatform.isDarwin && (config.vimacs.macvim or true) , vimacsExtraArgs ? "" }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index d0b27457b68a0..508d2ce2c5a4c 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -5,12 +5,12 @@ callPackage, }: let - version = "1.54.0"; + version = "1.58.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then "darwin" else throw "Unsupported system: ${stdenv.system}"; @@ -21,7 +21,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - hash = "sha256-c7TJED5YpHRwn7Ooq8sG+N99b7tH6TOgeC9TTYdb4JA="; + hash = "sha256-EuEBbtdCaS4l8ykkxyLLMjEnUMs0IsXoc994a8Pw1Ws="; }; postPatch = '' rm -r ${analysisDir} diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index 7b2452a814bf8..b4763dc417a18 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "rescript-lang"; repo = "rescript-vscode"; rev = version; - hash = "sha256-+Ht8qWwxtFWHFMiV/aoZIs2S3SxkOWgdwSKN+akp/LU="; + hash = "sha256-v+qCVge57wvA97mtzbxAX9Fvi7ruo6ZyIC14O8uWl9Y="; }; nativeBuildInputs = [ @@ -25,16 +25,12 @@ stdenv.mkDerivation { ocamlPackages.cppo ]; - # Skip testing phases because they need to download and install node modules - postPatch = '' - cd analysis - substituteInPlace Makefile \ - --replace "build: build-analysis-binary build-reanalyze build-tests" "build: build-analysis-binary" \ - --replace "test: test-analysis-binary test-reanalyze" "test: test-analysis-binary" + buildPhase = '' + dune build -p analysis ''; installPhase = '' - install -D -m0555 rescript-editor-analysis.exe $out/bin/rescript-editor-analysis.exe + install -D -m0555 _build/default/analysis/bin/main.exe $out/bin/rescript-editor-analysis.exe ''; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b1ccc6c098c87..c697b132534fb 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -313,8 +313,8 @@ let mktplcRef = { name = "vscode-apollo"; publisher = "apollographql"; - version = "1.19.11"; - hash = "sha256-EixefDuJiw/p5yAR/UQLK1a1RXJLXlTmOlD34qpAN+U="; + version = "2.3.3"; + hash = "sha256-pxj3BM+LJPS9KxxniEtBLT3x1FERGr4yPndxOSVLgR8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; @@ -406,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.18.7"; - hash = "sha256-ltgygZBWLG79FNxKqloOm8NNSDBbXU2bNkmd+9ksuOg="; + version = "1.18.12"; + hash = "sha256-3Nmk0MFIMFYQHrRyZ7ioFk9KfHSk0CSF7FwNaEJbsyg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -735,8 +735,8 @@ let mktplcRef = { name = "vscode-intelephense-client"; publisher = "bmewburn"; - version = "1.10.4"; - hash = "sha256-bD7AL4x0yL5S+MzQXMBrSZs1pVclfvsTfUbImP1oQok="; + version = "1.12.5"; + hash = "sha256-2Tamwag4KovIOKTe/g4qePVDFxm0mgsLtPNdWcKzigI="; }; meta = { description = "PHP code intelligence for Visual Studio Code"; @@ -873,8 +873,8 @@ let mktplcRef = { name = "catppuccin-vsc-icons"; publisher = "catppuccin"; - version = "1.13.0"; - hash = "sha256-4gsblUMcN7a7UgoklBjc+2uiaSERq1vmi0exLht+Xi0="; + version = "1.16.0"; + hash = "sha256-caIOQ2/NafUFp2J4odIM55kzOS3Of+WO84M5xNfkhf4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc-icons/changelog"; @@ -1069,7 +1069,7 @@ let version = "0.8.44"; } // sources.${stdenv.system}; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; meta = { description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE"; @@ -1234,8 +1234,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.55.0"; - hash = "sha256-slfHfRPcuRu+649n6kAr2bv9H6J+DvYVN/ysq1QpPQM="; + version = "0.56.0"; + hash = "sha256-ITSpPe032XcGIlfRQtJSR0iNTizs85qwfRaTtKwNn50="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -1816,8 +1816,8 @@ let mktplcRef = { name = "dependi"; publisher = "fill-labs"; - version = "0.7.7"; - hash = "sha256-tskNhHWjfItmUAKPYvqB1knUcqoEmTzYasJSzw5KwTI="; + version = "0.7.10"; + hash = "sha256-m8W21ztTmEOjDI1KCymeBgQzg9jdgKG9dCFp+U1D818="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/fill-labs.dependi/changelog"; @@ -2037,8 +2037,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.219.1028"; # compatible with vscode ^1.92.0 - hash = "sha256-5f1P/CV6+Rp2kS9oSz5Ko5jMUt/Q6pWa9a+3nPyin6k="; + version = "1.234.1133"; # compatible with vscode ^1.93.1 + hash = "sha256-kRQIB4ozN8f+JPG2U6tA/u0r3/J05kYfMuksaJrumZM="; }; meta = { @@ -2054,8 +2054,8 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.19.2024073102"; # compatible with vscode ^1.92.0 - hash = "sha256-ekRBmJiAav1gITWlqBOuWtZMt1YZeseF+3fw326db/s="; + version = "0.21.2024090602"; # latest compatible with vscode ^1.93 + hash = "sha256-9wl/orFbf1OFwGnF1uLfyOOtO2v5k2H1aUMBtngXDfs="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; @@ -2119,8 +2119,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "5.6.0"; - hash = "sha256-K4oCMQBH5jrt61f/C3DDZC61RuDvOApnPEF3AsOrE20="; + version = "5.13.0"; + hash = "sha256-A9QFW6Vk+g0pJfpXmZdUWJ/+WJBFXG79NXpCBuTjjok="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -2675,6 +2675,22 @@ let }; }; + jgclark.vscode-todo-highlight = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-todo-highlight"; + publisher = "jgclark"; + version = "2.0.8"; + hash = "sha256-/CctaLcG+dA2Cf69/ACeDKdRLsu/VUGbAxUbyhI0VyA="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/wayou.vscode-todo-highlight/changelog"; + description = "highlight TODOs, FIXMEs, and any keywords, annotations..."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jgclark.vscode-todo-highlight"; + homepage = "https://github.com/jgclark/vscode-todo-highlight"; + license = lib.licenses.mit; + }; + }; + julialang.language-julia = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-julia"; @@ -3207,7 +3223,7 @@ let version = "2.1.11"; } // sources.${stdenv.system}; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib zlib @@ -3351,8 +3367,8 @@ let mktplcRef = { name = "datawrangler"; publisher = "ms-toolsai"; - version = "0.29.6"; - hash = "sha256-9MR2+hb9YdjIGDfUkdLW41HOxhjeS/San49C8QRZ/YY="; + version = "1.7.2"; + hash = "sha256-3UK87MhDBCT4La8jRgmkRJJQPZbgvOu0+VBea7ho9hs="; }; meta = { @@ -3766,8 +3782,8 @@ let mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "1.12.2"; - hash = "sha256-dj8UFbYgAl6dt/1MuIBawTVUbBDTTedZEcHtKZjEcew="; + version = "1.20.0"; + hash = "sha256-lHTnyObWWhMIXipqdII9GYLGQDFPMFP5y/L/ai9325o="; }; }; @@ -3887,6 +3903,8 @@ let }; }; + pylyzer.pylyzer = callPackage ./pylyzer.pylyzer { }; + pythagoratechnologies.gpt-pilot-vs-code = buildVscodeMarketplaceExtension { mktplcRef = { name = "gpt-pilot-vs-code"; @@ -4057,8 +4075,8 @@ let mktplcRef = { name = "wikitext"; publisher = "RoweWilsonFrederiskHolme"; - version = "3.8.1"; - hash = "sha256-piwS3SPjx10nsjN5axC+EN0MEDf0r2lVFllqQzciOfc="; + version = "3.8.2"; + hash = "sha256-rWifSoJSN37xPIaCQgPyXRz9tCX2Akahl/3CuqzXq94="; }; meta = { description = "Extension that helps users view and write MediaWiki's Wikitext files"; @@ -4150,6 +4168,23 @@ let }; }; + sas.sas-lsp = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "sas-lsp"; + publisher = "SAS"; + version = "1.10.2"; + hash = "sha256-mf0q80UX4FxqHAHJBQlhkF/nqvTnfgTR8GuYBoWSswU="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog"; + description = "Official SAS Language Extension"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=SAS.sas-lsp"; + homepage = "https://github.com/sassoftware/vscode-sas-extension"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.scraptux ]; + }; + }; + scala-lang.scala = buildVscodeMarketplaceExtension { mktplcRef = { name = "scala"; @@ -4203,10 +4238,11 @@ let mktplcRef = { publisher = "seatonjiang"; name = "gitmoji-vscode"; - version = "1.2.2"; - hash = "sha256-+lwbCLV62y1IHrjCygBphQZJUu+ZApYTwBQld5uu12w="; + version = "1.2.5"; + hash = "sha256-lWd7SyYNxoDauMecJq11akTiwEKBeXuR4htDYCbb6n4="; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/seatonjiang.gitmoji-vscode/changelog"; description = "Gitmoji tool for git commit messages in VSCode"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=seatonjiang.gitmoji-vscode"; homepage = "https://github.com/seatonjiang/gitmoji-vscode/"; @@ -4245,8 +4281,8 @@ let mktplcRef = { publisher = "shd101wyy"; name = "markdown-preview-enhanced"; - version = "0.8.13"; - hash = "sha256-DxM7oWAbIonsKTvJjxX4oTaBwvRcxNT2y10ljYAzVeI="; + version = "0.8.14"; + hash = "sha256-vCuuPB/GTkM2xCBn1UF3CZwP49Ge/8eelHhg67EG7tQ="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; @@ -4851,8 +4887,8 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.53"; - hash = "sha256-5CHAX1jGyJ2VVEBTh5G1JM8+L9paryBa2zJoTkZ+G7Q="; + version = "0.0.54"; + hash = "sha256-oY8z3q4LOLhiTttm9Rtcy/CnhaSHkjyCBjwqYnuNBQA="; }; meta = { description = "VSCode language extension for Uiua"; diff --git a/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix b/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix index c85d7c271280b..79d080cb13e88 100644 --- a/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix +++ b/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix @@ -4,22 +4,16 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vsc-material-theme"; publisher = "Equinusocio"; - version = "34.3.1"; - hash = "sha256-3yxFTMtjJR1b4EzBDfm55HF9chrya5OUF5wN+KHEduE="; + version = "34.7.5"; + hash = "sha256-6YMr64MTtJrmMMMPW/s6hMh/IilDqLMrspKRPT4uSpM="; }; - # extensions wants to write at the /nix/store path, so we patch it to use the globalStorageUri instead. - prePatch = '' - substituteInPlace ./build/core/extension-manager.js \ - --replace-fail "path_1.posix.join(extensionFolderUri.path, env_1.USER_CONFIG_FILE_NAME)" "path_1.posix.join(ExtensionContext.globalStorageUri.fsPath, env_1.USER_CONFIG_FILE_NAME)" - ''; - meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Equinusocio.vsc-material-theme/changelog"; description = "Most epic theme now for Visual Studio Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme"; - homepage = "https://github.com/material-theme/vsc-material-theme"; - license = licenses.asl20; + homepage = "https://www.material-theme.dev/"; + license = licenses.unfree; maintainers = with maintainers; [ stunkymonkey ]; }; } 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 001e7e60f8226..56fffc0080cd8 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.8.0"; - hash = "sha256-KtpXhDRf9vFS0iSQCJzywmIlRMhWLOlSuK7DPc0ddnw="; + version = "1.9.1"; + hash = "sha256-XWWBk/QW37Dg0RJJwJ65w1r9WGC6iAGCgigsnGm/ilc="; }; 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 8d665025bba29..68a3673134ce4 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -106,7 +106,7 @@ buildVscodeMarketplaceExtension { chmod +x "${bin}" '') extInfo.binaries )) - + lib.optionalString stdenv.isLinux ( + + lib.optionalString stdenv.hostPlatform.isLinux ( lib.concatStringsSep "\n" ( map (bin: '' patchelf_common "${bin}" 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 9c26f92ca9615..3e988c6272192 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -99,7 +99,7 @@ buildVscodeMarketplaceExtension { chmod +x "${bin}" '') extInfo.binaries )) - + lib.optionalString stdenv.isLinux ( + + lib.optionalString stdenv.hostPlatform.isLinux ( lib.concatStringsSep "\n" ( map (bin: '' patchelf_common "${bin}" 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 5d56759f08615..ae836457db1e3 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -21,8 +21,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2024.5.11021008"; - hash = "sha256-UnI0leRKqCtFLBdGS/UvLuCcxQhibyY0ChmzQ9uytoY="; + version = "2024.15.2024091301"; + hash = "sha256-MB8Vq2rjO37yW3Zh+f8ek/yz0qT+ZYHn/JnF5ZA6CXQ="; }; buildInputs = [ icu ]; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index d1aca87dc4966..9fc9a29c1b229 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2024.8.1"; - hash = "sha256-UfbhvEWZVAQ/3xg57JpNqURTx/+g6zsWZ0WOzRHtrOU="; + version = "2024.8.2"; + hash = "sha256-EwxQjCBSmJ78L06EtKB8twIz5x51Jo/DHNlpD31pIKA="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix index b74faf6413c81..6d393833277de 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix @@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2024.7.0"; - hash = "sha256-hf6Y1SjKfLGe5LQ9swbPzbOCtohQ43DzHXMZwRt2d90="; + version = "2024.9.0"; + hash = "sha256-44L7K8JGpmKmH3aoNCalse8QRKJ/2wvA76gs0Z18zpc="; }; nativeBuildInputs = [ 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 55ed38a10130c..fd3358e99f6d4 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -41,11 +41,11 @@ let isx86Linux = stdenv.hostPlatform.system == "x86_64-linux"; supported = { x86_64-linux = { - hash = "sha256-jibImnpRtshbHu21JeS4VxL1jETm3Ein8S/M73UXc2w="; + hash = "sha256-ek4WBr9ZJ87TXlKQowA68YNt3WNOXymLcVfz1g+Be2o="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-7UagRO7qHyT1JIvvTSx9+USYrnDRXJ2wnXPLaBHRc3k="; + hash = "sha256-2+JqosgyoMRFnl8fnCrKljkdF3eU72mXy30ZUnaIerA="; arch = "linux-arm64"; }; }; @@ -58,7 +58,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "cpptools"; publisher = "ms-vscode"; - version = "1.21.4"; + version = "1.22.2"; }; nativeBuildInputs = [ 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 fc359311b4fe7..17cd91ea752e1 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-m5wq1F2sjiBacdyTFtLoqrJ/B6nwoaUjiNbc+zfpJoU="; + hash = "sha256-XkpoSf2UO3OoEMMpXBMkY1peQPR/4QoQ4LrY81IsHT0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix b/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix new file mode 100644 index 0000000000000..c060c2c2982fb --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix @@ -0,0 +1,18 @@ +{ lib, vscode-utils }: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pylyzer"; + publisher = "pylyzer"; + version = "0.1.8"; + hash = "sha256-GoY4cobxL64bREtgl7q/iR66axSM3tBrle/b9h3ED8Q="; + }; + + meta = { + description = "A VS Code extension for Pylyzer, a fast static code analyzer & language server for Python"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=pylyzer.pylyzer"; + homepage = "https://github.com/mtshiba/pylyzer/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index a53fc7b8ca5b8..e937da9c44b32 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -52,7 +52,7 @@ let pkg-config libsecret ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index d9c3ee2358e24..c6b0f26aa5c65 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -10,17 +10,17 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.22.0"; - hash = "sha256-G2sBH7qfMcoPoR7uz3D0xhfIsmvHkJgNRjcy58y7QeI="; + version = "1.23.0"; + hash = "sha256-wMky9whajltZYD3PUG+LCzuK9S5t55+3tRjTyA8kFcY="; }; postPatch = '' pushd sourcery_binaries/install - rm -r win ${if stdenv.isLinux then "mac" else "linux"} + rm -r win ${if stdenv.hostPlatform.isLinux then "mac" else "linux"} popd ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib 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 f56f477c8560d..8f3ba7cfad613 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -13,19 +13,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-fvDzsFOG1pdmpC3RDY8zGP0yL/TzX6i00LnIX+yceVU="; + hash = "sha256-NdVSQQ5OeBPGSLbynUArNbfm+a2HCc/gwJMKfEDgzDM="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-3yRZzOTuiTbkUUz1D3mZo7G5vayM6W9YBbJxTiVou9g="; + hash = "sha256-4FjA3mUz+DVBiMUJAlGkUbpDtZuDYuUHPWA4QUiqd5w="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-fKvR2bea4UxvnZ+LlWR/ahpKe8mk5f4mZrjqTFpsC5A="; + hash = "sha256-aexe9hrUxb3ZnrgJrvEXu2PZPmxOGdkk9exrfDaXA7s="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-nkK3BH+MRi6KdThq4kYR9ZAfnuSkC2r/lKWpEtmD7Ak="; + hash = "sha256-ijmKU+eU3R3mxeFxFr5AtVwGYVBuYWecD8W+0gHzP5w="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -37,7 +37,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.19"; + version = "0.1.26"; inherit (extInfo) hash arch; }; 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 0d55381e6597a..20b81c3c70cdf 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -41,11 +41,11 @@ let cargoHash = "sha256-e/Jki/4pCs0qzaBVR4iiUhdBFmWlTZYREQkuFSoWYFo="; - buildInputs = lib.optionals stdenv.isDarwin [ lldb ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ lldb ]; nativeBuildInputs = [ makeWrapper ]; - env = lib.optionalAttrs stdenv.isDarwin { NIX_LDFLAGS = "-llldb -lc++abi"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-llldb -lc++abi"; }; buildAndTestSubdir = "adapter"; @@ -90,7 +90,7 @@ let buildInputs = [ libsecret ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security @@ -114,7 +114,7 @@ let # entitlement which nixpkgs' lldb-server does not yet provide; see # <https://github.com/NixOS/nixpkgs/pull/38624> for details lldbServer = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver" else "${lldb.out}/bin/lldb-server"; @@ -150,7 +150,7 @@ stdenv.mkDerivation { '' cp -r ${nodeDeps}/lib/node_modules . '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME="$TMPDIR/home" mkdir $HOME ''; @@ -161,7 +161,7 @@ stdenv.mkDerivation { ]; makeFlags = [ "vsix_bootstrap" ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME=$TMPDIR ''; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index f2807a1b592d1..1c5fe1a56a424 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -157,17 +157,18 @@ in ]; buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; - runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; + runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; nativeBuildInputs = [ unzip ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook asar copyDesktopItems # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 - (buildPackages.wrapGAppsHook3.override { inherit (buildPackages) makeWrapper; }) + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; dontBuild = true; @@ -176,7 +177,7 @@ in installPhase = '' runHook preInstall - '' + (if stdenv.isDarwin then '' + '' + (if stdenv.hostPlatform.isDarwin then '' mkdir -p "$out/Applications/${longName}.app" "$out/bin" cp -r ./* "$out/Applications/${longName}.app" ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" "$out/bin/${executableName}" @@ -205,7 +206,7 @@ in preFixup = '' gappsWrapperArgs+=( ${ # we cannot use runtimeDependencies otherwise libdbusmenu do not work on kde - lib.optionalString stdenv.isLinux + lib.optionalString stdenv.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libdbusmenu ]}"} # Add gio to PATH so that moving files to the trash works when not using a desktop environment --prefix PATH : ${glib.bin}/bin @@ -216,7 +217,7 @@ in # See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897 # linux only because of https://github.com/NixOS/nixpkgs/issues/138729 - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' # this is a fix for "save as root" functionality packed="resources/app/node_modules.asar" unpacked="resources/app/node_modules" @@ -234,7 +235,7 @@ in '' + ( let vscodeRipgrep = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg" else "resources/app/node_modules/@vscode/ripgrep/bin/rg"; @@ -247,7 +248,7 @@ in '' ); - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --add-needed ${libglvnd}/lib/libGLESv2.so.2 \ --add-needed ${libglvnd}/lib/libGL.so.1 \ diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index c4ef3e4302059..7f1b667143645 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -10,9 +10,9 @@ # documented in https://wiki.nixos.org/wiki/Visual_Studio_Code#Insiders_Build # On MacOS the insider binary is still called code instead of code-insiders as # of 2023-08-06. -, sourceExecutableName ? "code" + lib.optionalString (isInsiders && stdenv.isLinux) "-insiders" +, sourceExecutableName ? "code" + lib.optionalString (isInsiders && stdenv.hostPlatform.isLinux) "-insiders" , commandLineArgs ? "" -, useVSCodeRipgrep ? stdenv.isDarwin +, useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin }: let @@ -27,24 +27,24 @@ let armv7l-linux = "linux-armhf"; }.${system} or throwSystem; - archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; + archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0kfkn40a44ql6j4c8a1rsw5bqysj0i5k3qllq1rl2zglfx7v4vkk"; - x86_64-darwin = "1iwl64wn5by6a4qdimxah76j90sv9as1908vgqxwhzj7plfcn6x5"; - aarch64-linux = "02r8yl767cf972xyi0qky2yxli4jid3r474wg4lvhk7px4ajh4zj"; - aarch64-darwin = "0d64dxm079v1v5c46c8brvmcdxawv70jyzp4hqnlxki1hpjxwbff"; - armv7l-linux = "0ra50i827asq3y4d3qk9b3gnrrrq9vi5z14nw5wphgz139gqbxwj"; + x86_64-linux = "1adwsm4n934a5z3hnsj9k7mi2l4npl499q8jzk2xhbbpqhkvd96a"; + x86_64-darwin = "04cvhhxx7s14z5794gn3pwd482cswpqyrmb1qcwm797cz1rz29z5"; + aarch64-linux = "1fca5rir2bkf4wqrs56qhv3kwrxivx17pa5brxp1k4k8a9jmhy7k"; + aarch64-darwin = "1mwymizy2a6m9fj3r00h762283fwrkhl9kv5607r0q7widggfg0j"; + armv7l-linux = "16ndp0mcfb05wfarpq3nxp3bnac1s1yay596mwjmwbwv44qcq40b"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.92.2"; + version = "1.94.0"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "fee1edb8d6d72a0ddff41e5f71a671c23ed924b9"; + rev = "d78a74bcdfad14d5d3b1b782f87255d802b57511"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "0n54l0s3p7nq3kc7jwdfsdq1k7p1v2ds17cwbfh3v9jifxqwws11"; + sha256 = "1iqglh4wx4wc80ihzcw4is7hd49s6kxpg9fz357r57a2679q0qw6"; }; }; @@ -79,7 +79,7 @@ in # Editing the `code` binary within the app bundle causes the bundle's signature # to be invalidated, which prevents launching starting with macOS Ventura, because VS Code is notarized. # See https://eclecticlight.co/2022/06/17/app-security-changes-coming-in-ventura/ for more information. - dontFixup = stdenv.isDarwin; + dontFixup = stdenv.hostPlatform.isDarwin; meta = with lib; { description = '' diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 9b1a3642615a6..54a1a98ad7c6d 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "", useVSCodeRipgrep ? stdenv.isDarwin }: +{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "", useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin }: let inherit (stdenv.hostPlatform) system; @@ -12,24 +12,24 @@ let armv7l-linux = "linux-armhf"; }.${system} or throwSystem; - archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; + archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1qddnqjq61c8m9klzkf4ic2zjgcwzpa0mjmraqfyga8njqham8z5"; - x86_64-darwin = "1fkpijnm1z84x1bv9w4qvwrydcv9i2jsldvp96gby7f3gp69asaw"; - aarch64-linux = "1k8whwqk0di2knld4gxyjwngh5kfa4pa4fr1scg7pfwfx9dnkljd"; - aarch64-darwin = "0wgag225ji108zdrfbmp3iviyl3ha6gblcxp5ilc39pi50dms4gv"; - armv7l-linux = "00w4238av273qznbnxdw4vvjj0iv8rrzb15aazvirb22d2slk9hr"; + x86_64-linux = "14pqi5l7zbkhpsl8hd7mqss4xkqnxf0f0h5bs710iadpcscgpndf"; + x86_64-darwin = "10k4qgck48xh12xq80y8x3jf9qp5fn15n995mn8gbid39907ars0"; + aarch64-linux = "0jk33jw5rj98qr6fhi4r3vz5f1673m5v1g28jdyn3prs20hp0msg"; + aarch64-darwin = "1sw39iyz5m0hdy875b3ygzvpl7vz9j3d1w6fpmf30a3iyl3ndh66"; + armv7l-linux = "1rjv5c85ffy5szxhf71kjmvxiahyyvx2dl6183v5q7apv9pa64hj"; }.${system} or throwSystem; - sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; + sourceRoot = lib.optionalString (!stdenv.hostPlatform.isDarwin) "."; in callPackage ./generic.nix rec { inherit sourceRoot commandLineArgs useVSCodeRipgrep; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.92.2.24228"; + version = "1.93.1.24256"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index bbe5fec19d91d..25c97f52d765e 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -68,7 +68,7 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { dontPatchELF = true; dontStrip = true; meta = vscode.meta; -} (if stdenv.isDarwin then '' +} (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/bin/ mkdir -p "$out/Applications/${longName}.app/Contents/MacOS" diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 23ef7a0ef567a..eee370d174e02 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.cc.isClang [ openmp - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/applications/editors/xedit/default.nix b/pkgs/applications/editors/xedit/default.nix index 6fa4a67dfd6bc..eb8f2ee925926 100644 --- a/pkgs/applications/editors/xedit/default.nix +++ b/pkgs/applications/editors/xedit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; # ./lisp/mathimp.c:493:10: error: implicitly declaring library function 'finite' with type 'int (double)' - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' for i in $(find . -type f -name "*.c"); do substituteInPlace $i --replace "finite" "isfinite" done @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ shamilton ]; platforms = platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "xedit"; }; } diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/applications/editors/xmlcopyeditor/default.nix index fe3a12a37c20f..0c58d35042aea 100644 --- a/pkgs/applications/editors/xmlcopyeditor/default.nix +++ b/pkgs/applications/editors/xmlcopyeditor/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pcre2 wxGTK32 xercesc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 80f8374c378f6..7ca6cd4b4fc5a 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1600"; + version = "1601"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-bSW0ZAPIBDh3+VhAJlp16W1z4fEIPUkI73grJE/KUx4="; + sha256 = "sha256-pa9ibXyuWq7jRYsn3bGdqvLWbwQO2VYsP6Bk+BayQ8o="; }; installPhase = '' diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix index 38ca48ee4056a..cea97686072c5 100644 --- a/pkgs/applications/editors/zee/default.nix +++ b/pkgs/applications/editors/zee/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; # disable downloading and building the tree-sitter grammars at build time # grammars can be configured in a config file and installed with `zee --build` diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix deleted file mode 100644 index bafb1aa303853..0000000000000 --- a/pkgs/applications/editors/zile/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib -, stdenv -, fetchurl -, boehmgc -, glib -, help2man -, libgee -, ncurses -, perl -, pkg-config -, vala -}: - -stdenv.mkDerivation rec { - pname = "zile"; - version = "2.6.2"; - - src = fetchurl { - url = "mirror://gnu/zile/${pname}-${version}.tar.gz"; - hash = "sha256-d+t9r/PJi9yI2qGsBA3MynK4HcMvwxZuB53Xpj5Cx0E="; - }; - - buildInputs = [ - boehmgc - glib - libgee - ncurses - ]; - nativeBuildInputs = [ - perl - pkg-config - vala - ] - # `help2man' wants to run Zile, which won't work when the - # newly-produced binary can't be run at build-time. - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) help2man; - - # Tests can't be run because most of them rely on the ability to - # fiddle with the terminal. - doCheck = false; - - # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro. - gl_cv_func_fstatat_zero_flag="yes"; - - meta = with lib; { - homepage = "https://www.gnu.org/software/zile/"; - description = "Zile Implements Lua Editors"; - longDescription = '' - GNU Zile is a text editor development kit, so that you can (relatively) - quickly develop your own ideal text editor without reinventing the wheel - for many of the common algorithms and data-structures needed to do so. - - It comes with an example implementation of a lightweight Emacs clone, - called Zemacs. Every Emacs user should feel at home with Zemacs. Zemacs is - aimed at small footprint systems and quick editing sessions (it starts up - and shuts down instantly). - - More editors implemented over the Zile frameworks are forthcoming as the - data-structures and interfaces improve: Zz an emacs inspired editor using - Lua as an extension language; Zee a minimalist non-modal editor; Zi a - lightweight vi clone; and more... - - Zile is a collection of algorithms and data-structures that currently - support all basic Emacs-like editing features: it is 8-bit clean (though - Unicode support is not ready yet), and the number of editing buffers and - windows is only limited by available memoryand screen space - respectively. Registers, minibuffer completion and auto fill are - available. - - Zemacs implements a subset of Emacs with identical function and variable - names, continuing the spirit of the earlier Zile editor implemented in C. - GNU Zile, which is a lightweight Emacs clone. Zile is short for Zile Is - Lossy Emacs. Zile has been written to be as similar as possible to Emacs; - every Emacs user should feel at home. - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ pSub AndersonTorres ]; - platforms = platforms.unix; - mainProgram = "zile"; - }; -} diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index 76db6f7e3a120..efdc4ff0d8606 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -33,20 +33,20 @@ enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch, enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch, enableVncRenderer ? false, - enableWayland ? stdenv.isLinux, + enableWayland ? stdenv.hostPlatform.isLinux, unfreeEnableDiscord ? false, unfreeEnableRoms ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "86Box"; - version = "4.2"; + version = "4.2.1"; src = fetchFromGitHub { owner = "86Box"; repo = "86Box"; rev = "v${finalAttrs.version}"; - hash = "sha256-hXupMQ+i27sw3XOweZGatdRCUlp7weGR/PqCLAw/8fo="; + hash = "sha256-ue5Coy2MpP7Iwl81KJPQPC7eD53/Db5a0PGIR+DdPYI="; }; patches = [ ./darwin.patch ]; @@ -88,20 +88,20 @@ stdenv.mkDerivation (finalAttrs: { libopus.dev libmpg123.dev ] - ++ lib.optional stdenv.isLinux alsa-lib + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional enableWayland wayland ++ lib.optional enableVncRenderer libvncserver - ++ lib.optional stdenv.isDarwin darwin.apple_sdk_11_0.libs.xpc; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk_11_0.libs.xpc; cmakeFlags = - lib.optional stdenv.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" + lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" ++ lib.optional enableNewDynarec "-DNEW_DYNAREC=ON" ++ lib.optional enableVncRenderer "-DVNC=ON" ++ lib.optional (!enableDynarec) "-DDYNAREC=OFF" ++ lib.optional (!unfreeEnableDiscord) "-DDISCORD=OFF"; postInstall = - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 -t $out/share/applications $src/src/unix/assets/net.86box.86Box.desktop for size in 48 64 72 96 128 192 256 512; do @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "86Box"; repo = "roms"; rev = "v${finalAttrs.version}"; - hash = "sha256-WdQebSBuw2Wtz8ggMnGuxGoi2EKtNub3S8JKa6ZmdU8="; + hash = "sha256-p3djn950mTUIchFCEg56JbJtIsUuxmqRdYFRl50kI5Y="; }; updateScript = ./update.sh; }; @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = let libPath = lib.makeLibraryPath ([ libpcap ] ++ lib.optional unfreeEnableDiscord discord-gamesdk); - libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libPathVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' makeWrapperArgs+=(--prefix ${libPathVar} : "${libPath}") @@ -139,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Emulator of x86-based machines based on PCem"; mainProgram = "86Box"; homepage = "https://86box.net/"; + changelog = "https://github.com/86Box/86Box/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ gpl2Only ] ++ lib.optional (unfreeEnableDiscord || unfreeEnableRoms) unfree; diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index f7fd332c7a336..df08235529e5a 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -44,14 +44,14 @@ stdenv.mkDerivation (finalAttrs: { pkg-config which wrapGAppsHook3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; buildInputs = [ SDL2 libao - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib gtk3 gtksourceview3 @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio openal udev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa darwin.apple_sdk_11_0.frameworks.OpenAL ]; @@ -71,9 +71,9 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - makeFlags = lib.optionals stdenv.isLinux [ + makeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "hiro=gtk3" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "hiro=cocoa" "lto=false" "vulkan=false" @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { "prefix=$(out)" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.14"; meta = { homepage = "https://ares-emu.net"; @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.isc; maintainers = with lib.maintainers; [ Madouura AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) # TODO: select between Qt and GTK3 diff --git a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix index 354437e7c7b0b..046192df920f4 100644 --- a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix @@ -47,26 +47,26 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isLinux [ wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ libicns makeWrapper ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns makeWrapper ]; buildInputs = [ SDL2 libao ] - ++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk3 gtksourceview3 alsa-lib openal libpulseaudio ] - ++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXv udev gtk3 gtksourceview3 alsa-lib openal libpulseaudio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenAL ]; enableParallelBuilding = true; makeFlags = [ "-C" "bsnes" "prefix=$(out)" ] - ++ lib.optionals stdenv.isLinux [ "hiro=gtk3" ] - ++ lib.optionals stdenv.isDarwin [ "hiro=cocoa" ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ "hiro=gtk3" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "hiro=cocoa" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin makeWrapper $out/{Applications/bsnes.app/Contents/MacOS,bin}/bsnes ''; # https://github.com/bsnes-emu/bsnes/issues/107 - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' gappsWrapperArgs+=( --prefix GDK_BACKEND : x11 ) diff --git a/pkgs/applications/emulators/bsnes/higan/default.nix b/pkgs/applications/emulators/bsnes/higan/default.nix index 17700859ca3a4..3eb9a9a310ecf 100644 --- a/pkgs/applications/emulators/bsnes/higan/default.nix +++ b/pkgs/applications/emulators/bsnes/higan/default.nix @@ -33,14 +33,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; buildInputs = [ SDL2 libao - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib gtk3 gtksourceview3 @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { openal udev ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa OpenAL @@ -72,13 +72,13 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = let platform = - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin + else if stdenv.hostPlatform.isDarwin then "macos" - else if stdenv.isBSD + else if stdenv.hostPlatform.isBSD then "bsd" - else if stdenv.isWindows + else if stdenv.hostPlatform.isWindows then "windows" else throw "Unknown platform for higan: ${stdenv.hostPlatform.system}"; in '' @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - '' + (if stdenv.isDarwin then '' + '' + (if stdenv.hostPlatform.isDarwin then '' mkdir ${placeholder "out"} mv higan/out/higan.app ${placeholder "out"}/ mv icarus/out/icarus.app ${placeholder "out"}/ @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { # we create a first-run script to populate # $HOME with all the stuff needed at runtime let - dest = if stdenv.isDarwin + dest = if stdenv.hostPlatform.isDarwin then "\\$HOME/Library/Application Support/higan" else "\\$HOME/higan"; in '' @@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) # TODO: select between Qt and GTK3 diff --git a/pkgs/applications/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix index 5382efbff2376..0100ea5321d63 100644 --- a/pkgs/applications/emulators/cdemu/daemon.nix +++ b/pkgs/applications/emulators/cdemu/daemon.nix @@ -1,11 +1,14 @@ { stdenv, callPackage, cmake, pkg-config, glib, libao, intltool, libmirage, coreutils }: -stdenv.mkDerivation { +let inherit (callPackage ./common-drv-attrs.nix { - version = "3.2.6"; + version = "3.2.7"; pname = "cdemu-daemon"; - hash = "sha256-puQE4+91xhRuNjVPZYgN/WO0uO8fVAOdxQWOGQ+FfY8="; + hash = "sha256-EKh2G6RA9Yq46BpTAqN2s6TpLJb8gwDuEpGiwdGcelc="; }) pname version src meta; +in +stdenv.mkDerivation { + inherit pname version src; nativeBuildInputs = [ cmake pkg-config intltool ]; buildInputs = [ glib libao libmirage ]; @@ -17,4 +20,16 @@ stdenv.mkDerivation { $out/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service \ --replace /bin/true ${coreutils}/bin/true ''; + + meta = { + inherit (meta) + description + license + longDescription + maintainers + platforms + ; + homepage = "https://cdemu.sourceforge.io/about/daemon/"; + mainProgram = "cdemu-daemon"; + }; } diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix index bbc013be18a0d..2cad367259978 100644 --- a/pkgs/applications/emulators/cdemu/libmirage.nix +++ b/pkgs/applications/emulators/cdemu/libmirage.nix @@ -2,13 +2,15 @@ , glib, libsndfile, zlib, bzip2, xz, libsamplerate, intltool , pcre, util-linux, libselinux, libsepol }: -stdenv.mkDerivation { - +let inherit (callPackage ./common-drv-attrs.nix { - version = "3.2.7"; + version = "3.2.9"; pname = "libmirage"; - hash = "sha256-+okkgNeVS8yoKSrQDy4It7PiPlTSiOsUoFxQ1FS9s9M="; + hash = "sha256-JBd+wHSZRyRW1SZsaAaRO2dNUFkpwRCr3s1f39KyWIs="; }) pname version src meta; +in +stdenv.mkDerivation { + inherit pname version src; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; @@ -16,4 +18,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config intltool gobject-introspection ]; propagatedBuildInputs = [ pcre util-linux libselinux libsepol ]; + meta = { + inherit (meta) + maintainers + license + platforms + ; + description = "CD-ROM image access library"; + homepage = "https://cdemu.sourceforge.io/about/libmirage/"; + }; } diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix index 15b69500f3d20..e1d251a763923 100644 --- a/pkgs/applications/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vhba"; - version = "20240202"; + version = "20240917"; src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.xz"; - hash = "sha256-v1hQ1Lj1AiHKh9c0OpKe2oexkfb1roxhQXRUO1ut3oM="; + hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg="; }; makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/applications/emulators/darling/default.nix b/pkgs/applications/emulators/darling/default.nix index 3d396e07e3597..6747f8781fb91 100644 --- a/pkgs/applications/emulators/darling/default.nix +++ b/pkgs/applications/emulators/darling/default.nix @@ -3,6 +3,7 @@ , runCommandWith , writeShellScript , fetchFromGitHub +, fetchpatch , nixosTests , freetype @@ -114,11 +115,27 @@ in stdenv.mkDerivation { repo = "darling"; rev = "25afbc76428c39c3909e9efcf5caef1140425211"; fetchSubmodules = true; - hash = "sha256-T0g38loUFv3jHvUu3R3QH9hwP8JVe2al4g4VhXnBDMc="; + hash = "sha256-z9IMgc5hH2Upn8wHl1OgP42q9HTSkeHnxB3N812A+Kc="; + # Remove 500MB of dependency test files to get under Hydra output limit + postFetch = '' + rm -r $out/src/external/openjdk/test + rm -r $out/src/external/libmalloc/tests + rm -r $out/src/external/libarchive/libarchive/tar/test + ''; }; outputs = [ "out" "sdk" ]; + patches = [ + # Fix 'clang: error: no such file or directory: .../signal/mach_excUser.c' + # https://github.com/darlinghq/darling/issues/1511 + # https://github.com/darlinghq/darling/commit/f46eb721c11d32addd807f092f4b3a6ea515bb6d + (fetchpatch { + url = "https://github.com/darlinghq/darling/commit/f46eb721c11d32addd807f092f4b3a6ea515bb6d.patch?full_index=1"; + hash = "sha256-FnLcHnK4cNto+E3OQSxE3iK+FHSU8y459FcpMvrzd6o="; + }) + ]; + postPatch = '' # We have to be careful - Patching everything indiscriminately # would affect Darwin scripts as well @@ -226,6 +243,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Open-source Darwin/macOS emulation layer for Linux"; homepage = "https://www.darlinghq.org"; + changelog = "https://github.com/darlinghq/darling/releases"; license = licenses.gpl3Plus; maintainers = with maintainers; [ zhaofengli ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 3ba6288a98878..91ad4b876eb9a 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -50,17 +50,18 @@ , moltenvk , OpenGL , VideoToolbox +, xcbuild }: stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu"; - version = "2407"; + version = "2409"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-8W4KyIj+rhDkWnQogjpzlEJVo3HJenfpWKimSyMGN7c="; + hash = "sha256-x4ZtV/5bwUjcmdYneG7n7uFVyPmYj0sD8TXEqsqbUFU="; fetchSubmodules = true; }; @@ -70,6 +71,8 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config wrapQtAppsHook + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + xcbuild # for plutil ]; buildInputs = [ @@ -101,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { xz # Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838 #zlib-ng - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib bluez libevdev @@ -112,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { #mgba # Derivation doesn't support Darwin udev vulkan-loader - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreBluetooth ForceFeedback IOBluetooth @@ -127,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { "-DDOLPHIN_WC_REVISION=${finalAttrs.src.rev}" "-DDOLPHIN_WC_DESCRIBE=${finalAttrs.version}" "-DDOLPHIN_WC_BRANCH=master" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" "-DUSE_BUNDLED_MOLTENVK=OFF" "-DMACOS_CODE_SIGNING=OFF" @@ -138,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_AUTOUPDATE=OFF" ]; - qtWrapperArgs = lib.optionals stdenv.isLinux [ + qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" # https://bugs.dolphin-emu.org/issues/11807 # The .desktop file should already set this, but Dolphin may be launched in other ways diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index 6a2727478389e..c35700856b60e 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake - ] ++ lib.optional stdenv.isLinux wrapQtAppsHook; + ] ++ lib.optional stdenv.hostPlatform.isLinux wrapQtAppsHook; buildInputs = [ curl @@ -93,13 +93,13 @@ stdenv.mkDerivation rec { fmt xz qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez udev libevdev alsa-lib vulkan-loader - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreBluetooth OpenGL ForceFeedback @@ -109,11 +109,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SHARED_ENET=ON" "-DENABLE_LTO=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ]; - qtWrapperArgs = lib.optionals stdenv.isLinux [ + qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" # https://bugs.dolphin-emu.org/issues/11807 # The .desktop file should already set this, but Dolphin may be launched in other ways @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { # - Allow Dolphin to use nix-provided libraries instead of building them postPatch = '' substituteInPlace CMakeLists.txt --replace 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt --replace 'if(NOT APPLE)' 'if(true)' substituteInPlace CMakeLists.txt --replace 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)' ''; @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; maintainers = with maintainers; [ Madouura ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; platforms = platforms.unix; }; } diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index 855e4cd18b3ea..dc12dc2da62e5 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2024.07.01"; + version = "2024.10.01"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-mOoOvmsBW6igi5BiLNcmTSKmTeEkBK9WwPu/WKBSJC4="; + hash = "sha256-qfrEy7OndhJ/UnfFDCp7qlIhYWANkUBy2ejYVvRrG3k="; }; # 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/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index 2a1171ccf3b78..cda07d42423cc 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--disable-sdltest"; desktopItems = [ (makeDesktopItem { @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.dosbox.com/"; + changelog = "https://www.dosbox.com/wiki/Releases"; description = "DOS emulator"; longDescription = '' DOSBox is an emulator that recreates a MS-DOS compatible environment diff --git a/pkgs/applications/emulators/dynamips/default.nix b/pkgs/applications/emulators/dynamips/default.nix deleted file mode 100644 index 1abc0dcf52365..0000000000000 --- a/pkgs/applications/emulators/dynamips/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libelf -, libpcap -, nix-update-script -}: - -stdenv.mkDerivation rec { - pname = "dynamips"; - version = "0.2.23"; - - src = fetchFromGitHub { - owner = "GNS3"; - repo = pname; - rev = "v${version}"; - hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libelf libpcap ]; - - cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Cisco router emulator"; - longDescription = '' - Dynamips is an emulator computer program that was written to emulate Cisco - routers. - ''; - license = licenses.gpl2Plus; - mainProgram = "dynamips"; - maintainers = with maintainers; [ primeos ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/applications/emulators/firebird-emu/default.nix b/pkgs/applications/emulators/firebird-emu/default.nix index 48f3647514271..28d6c182c7606 100644 --- a/pkgs/applications/emulators/firebird-emu/default.nix +++ b/pkgs/applications/emulators/firebird-emu/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/nspire-emus/firebird"; + changelog = "https://github.com/nspire-emus/firebird/releases/tag/v${version}"; description = "Third-party multi-platform emulator of the ARM-based TI-Nspire™ calculators"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ pneumaticat ]; diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/applications/emulators/goldberg-emu/default.nix index 8b1e92b5963a5..e165a36b317b9 100644 --- a/pkgs/applications/emulators/goldberg-emu/default.nix +++ b/pkgs/applications/emulators/goldberg-emu/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://gitlab.com/Mr_Goldberg/goldberg_emulator"; changelog = "https://gitlab.com/Mr_Goldberg/goldberg_emulator/-/releases"; description = "Program that emulates steam online features"; diff --git a/pkgs/applications/emulators/maiko/default.nix b/pkgs/applications/emulators/maiko/default.nix index 27f2a38f77a0c..924bd2db48551 100644 --- a/pkgs/applications/emulators/maiko/default.nix +++ b/pkgs/applications/emulators/maiko/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Medley Interlisp virtual machine"; homepage = "https://interlisp.org/"; + changelog = "https://github.com/Interlisp/maiko/releases"; license = licenses.mit; maintainers = with maintainers; [ ehmry ]; inherit (xorg.libX11.meta) platforms; diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index e16bd97c2cd78..763e4a59de5dc 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.268"; + version = "0.270"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-zH/82WC4xXa/NMJ2W4U57Uv8+5994U5YcMbRvPiAtTI="; + hash = "sha256-l1mgkPhYO/U/77veC0Mpyzr6hzz/FSkn+4GMAdLSfOk="; }; outputs = [ "out" "tools" ]; @@ -90,8 +90,8 @@ stdenv.mkDerivation rec { sqlite qtbase ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio libXinerama libXi fontconfig ] - ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio libXinerama libXi fontconfig ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libpcap CoreAudioKit ForceFeedback ]; nativeBuildInputs = [ copyDesktopItems @@ -195,7 +195,7 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd3 gpl2Plus ]; maintainers = with maintainers; [ thiagokokada ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "mame"; }; } diff --git a/pkgs/applications/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix deleted file mode 100644 index c05b882b9634a..0000000000000 --- a/pkgs/applications/emulators/openmsx/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, SDL2 -, SDL2_image -, SDL2_ttf -, alsa-lib -, freetype -, glew -, libGL -, libogg -, libpng -, libtheora -, libvorbis -, python3 -, tcl -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "openmsx"; - version = "19.1"; - - src = fetchFromGitHub { - owner = "openMSX"; - repo = "openMSX"; - rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; - hash = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - pkg-config - python3 - ]; - - buildInputs = [ - SDL2 - SDL2_image - SDL2_ttf - alsa-lib - freetype - glew - libGL - libogg - libpng - libtheora - libvorbis - tcl - zlib - ]; - - postPatch = '' - cp ${./custom-nix.mk} build/custom.mk - ''; - - dontAddPrefix = true; - - # Many thanks @mthuurne from OpenMSX project for providing support to - # Nixpkgs! :) - TCL_CONFIG="${tcl}/lib/"; - - meta = with lib; { - homepage = "https://openmsx.org"; - description = "MSX emulator that aims for perfection"; - longDescription = '' - OpenMSX is an emulator for the MSX home computer system. Its goal is - to emulate all aspects of the MSX with 100% accuracy. - ''; - license = with licenses; [ bsd2 boost gpl2Plus ]; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - mainProgram = "openmsx"; - }; -}) diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 532109eefa6d8..18c510b8465b2 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -267,7 +267,7 @@ in let # linux = bsd # https://github.com/DerKoun/bsnes-hd/blob/f0b6cf34e9780d53516977ed2de64137a8bcc3c5/bsnes/GNUmakefile#L37 - platform = if stdenv.isDarwin then "macos" else "linux"; + platform = if stdenv.hostPlatform.isDarwin then "macos" else "linux"; in [ "-C" diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 83cb0b2bbc63f..b23a5e3c9bb3a 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -2,9 +2,9 @@ , stdenv , nixosTests , enableNvidiaCgToolkit ? false -, withGamemode ? stdenv.isLinux -, withVulkan ? stdenv.isLinux -, withWayland ? stdenv.isLinux +, withGamemode ? stdenv.hostPlatform.isLinux +, withVulkan ? stdenv.hostPlatform.isLinux +, withWayland ? stdenv.hostPlatform.isLinux , alsa-lib , dbus , fetchFromGitHub @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ lib.optional withVulkan vulkan-loader ++ lib.optional withWayland wayland ++ - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib dbus libX11 @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { "--disable-update_assets" "--disable-update_core_info" ] ++ - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ "--enable-dbus" "--enable-egl" "--enable-kms" @@ -142,6 +142,6 @@ stdenv.mkDerivation rec { # https://docs.libretro.com/development/retroarch/compilation/osx/ # and # https://github.com/libretro/RetroArch/blob/71eb74d256cb4dc5b8b43991aec74980547c5069/.gitlab-ci.yml#L330 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0aa52a28c6c2f..7bddba7537e85 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -15,10 +15,10 @@ "src": { "owner": "libretro", "repo": "libretro-atari800", - "rev": "50141a6bf1a069abd86dd8c53aa4031f3f7cfbd1", - "hash": "sha256-pS5nvU+2eZ7We0ySN+Te6+Y3uuro5bz2FTPuLgvNCl4=" + "rev": "39380a6e028589e850ecdfd2a5a19307b475d667", + "hash": "sha256-Rw6eTaKHZaCEgvnIqctaKCYQ+W8cHLtckLK8U5Ugck4=" }, - "version": "unstable-2024-07-25" + "version": "unstable-2024-09-24" }, "beetle-gba": { "fetcher": "fetchFromGitHub", @@ -55,20 +55,20 @@ "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "3260947537deb14c4b464fd80a132dc9d3f80a4f", - "hash": "sha256-2RJnXdkcyCrNK6Y2sT9PHfXtNXB4KUdsWh43G3yZrGU=" + "rev": "e6c21fdf7d1aeae411f08272121213fa4de96bbc", + "hash": "sha256-ZeBoLTsr1A+IPQJ+oIGNADrgKySDHczXY6uriLmeHV4=" }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-27" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "f2b4d9b24175348ca48bffd6fd4bb203d08e01d9", - "hash": "sha256-ulGGr215WJIb1uF1G8sGsu/693KKLDpjBuMNRLKQMZI=" + "rev": "6aaabc8e18279ac8a7c6facf26aa67e58375d177", + "hash": "sha256-lhpAnDofOLqyr8j43zTjzbPbcbntEt0DMY6aGtckDmc=" }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-20" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "3b6aa830f1345a588c6217f0bf8f5da2f8e08c29", - "hash": "sha256-XrE9Ms6yypZWy1M0dfUD2O2zXR409or5VKLCVsiZW7U=" + "rev": "261e52b7dd35e8fd2c8b1f760a3ba4cf7fce60c5", + "hash": "sha256-HV/O7zJscLJAzhAoch44kKwBKavasdvf1VDvudLU2q0=" }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-16" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "4376f838433134dbeaa14f4a7e926d68d6f89457", - "hash": "sha256-gKVx9EBVQXiR6z9hhA+6DYm7zbHsoKMDG+v/tAK3c+I=" + "rev": "6c76ef9e83f7f3bed3aa747b01fd2d6c54687c65", + "hash": "sha256-LapGHFPSM/I+73oRhxW+gfc1SrEZ1MxscmpGujr6p9Y=" }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-06" }, "beetle-vb": { "fetcher": "fetchFromGitHub", @@ -165,10 +165,10 @@ "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "d47f5d162e879fddf117583e7cc391989359c009", - "hash": "sha256-0tVXa+valyBbHFqXGG8jmargBdqgJafLrFuZ4ym7i8I=" + "rev": "20c55eb6333a11395ba637df8583066483e58cb2", + "hash": "sha256-IP00xtxS3wwnQSmYltrX8GEHZX/65xnx2EsmQlE1VZM=" }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-06" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", @@ -246,10 +246,10 @@ "src": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "dd8d2989a652d56a7a1588b65a42cc58477638c2", - "hash": "sha256-XA6hBJa/GFUaRG/+PSUBXaFJedjsRVLfR7Z5pmEwY0k=" + "rev": "ea7b947a8ed156a1ce2ce49329a5686c69f80075", + "hash": "sha256-aqNyYG7H+YBLhQlnkfBfmX3PkBF8GeYXc+KHkvkxlRo=" }, - "version": "unstable-2024-08-25" + "version": "unstable-2024-09-16" }, "easyrpg": { "fetcher": "fetchFromGitHub", @@ -287,31 +287,31 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "5ea732a897919b9d4059a09146f45f4e91f5fe0d", - "hash": "sha256-w8XTOQlffUKDvZSEQXQYsHDhE4/2bRHNwfJRHSfpnf4=" + "rev": "3d69bc5519c4382b3d5da2763ae42e3b6a3d019e", + "hash": "sha256-Tf5nLy9G9h/qBrwdBFO3OUYl3n81NPw4slEeCfLzMjI=" }, - "version": "unstable-2024-08-29" + "version": "unstable-2024-09-26" }, "fceumm": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "744f5d9c8b976a431dcb5417a520c0c709b17fbe", - "hash": "sha256-ENkG4H2PiZFHRBbX5GRN/kCFTCZDzbJAV5CplThqaEE=" + "rev": "e226068f979cd8fbfc3be9780d16cfb1405095b0", + "hash": "sha256-2G5EzcDJkEhaN+nXi/wu3+Ejim04ZzOr+LW69cLAEuM=" }, - "version": "unstable-2024-07-20" + "version": "unstable-2024-09-23" }, "flycast": { "fetcher": "fetchFromGitHub", "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "9691fe962228ab0c08f3a4801e6fa0a3c47218ef", - "hash": "sha256-pRrc5EAZQ6fz9JAzOa2mPVByplQ66On2KMqGPVhmA4A=", + "rev": "343021a8c507f4723b3f56a3bb817206912fcb36", + "hash": "sha256-DMbhCHW2VHEle0oihaz1GEPOGDCXxfdZoL8MdPZT4d0=", "fetchSubmodules": true }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-27" }, "fmsx": { "fetcher": "fetchFromGitHub", @@ -338,30 +338,30 @@ "src": { "owner": "libretro", "repo": "fuse-libretro", - "rev": "4d511d7fc3faa7714fa5de2e824793d35d5f4da8", - "hash": "sha256-mfCv7PvroPqzJ/nXCa74h0c7lHlbTVnJM3rNIj3UvQI=" + "rev": "6fd07d90acc38a1b8835bf16539b833f21aaa38f", + "hash": "sha256-q5vcFNr1RBeTaw1R2LDY9xLU1oGeWtPemTdliWR+39s=" }, - "version": "unstable-2024-06-28" + "version": "unstable-2024-09-20" }, "gambatte": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "1fbeee0a46b12d3ab28c4795172929ebb31808ea", - "hash": "sha256-EusFBTtJheGNfbA3lXHGt1IlSbvT6uAY/J/XkIaLJag=" + "rev": "e9a1941276e932813dc742796ffd1d0939c5d1d5", + "hash": "sha256-4FFYocOa2fuBT8UFKM87Fn5E6pjkfe4tUVDtpEchtJo=" }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-27" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "f0a21a7b30e033cef8e4870f7ab3781dad3606db", - "hash": "sha256-h9QJVlAoztlObYKqOWWRxxJ18+VhgmpMRUQOE+/PCI0=" + "rev": "7de0f0b6cde9bda1235b448aa607044b3f80ab3c", + "hash": "sha256-W06vSrGKbXMcXIouW9/fD93sBfwREqIL8HvB3kan0tM=" }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-18" }, "gpsp": { "fetcher": "fetchFromGitHub", @@ -408,11 +408,11 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "dc299d16818b40f123ad9507e0244f608224f621", - "hash": "sha256-XiZTL3umGKg4CbVCX6q4wA26JEvEPS5FyXJw6l0kDFQ=", + "rev": "231b5e6d621ed93168ad19eed6c0e3390d4e81ff", + "hash": "sha256-UD1kNQ6KXEa60ZA+65XXqgihLu/XJxTLvbM4Wt9y2vs=", "fetchSubmodules": true }, - "version": "unstable-2024-08-29" + "version": "unstable-2024-09-27" }, "mame2000": { "fetcher": "fetchFromGitHub", @@ -429,20 +429,20 @@ "src": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "b2fbe7d4724d781572111f12176b5b38126bcf16", - "hash": "sha256-E+ln1isbslzMhT8THZO9MDd6dGN/+mRj1oKzfMz0t5Y=" + "rev": "1a268a709d611f6a84d473754ee2dbcaf1c37a2e", + "hash": "sha256-jFzFQVB0uiSRa82sq1fiMEXyzzDJqRANNgq5hj/ZAl4=" }, - "version": "unstable-2024-08-22" + "version": "unstable-2024-09-04" }, "mame2003-plus": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "7d4e2ccc0143451969e0efbcb207acc690249d4c", - "hash": "sha256-YMbCJNP//PKUsONfNMn80nGW+lTMHXpwBybdphWCaKU=" + "rev": "9221b2f66dbc7a08b22a7365e2431e027e382322", + "hash": "sha256-mm4g1JX98yW/6Us1k5DwaYQQbhmfiBSxxXFvwgvB5yE=" }, - "version": "unstable-2024-08-28" + "version": "unstable-2024-09-26" }, "mame2010": { "fetcher": "fetchFromGitHub", @@ -519,10 +519,10 @@ "src": { "owner": "libretro", "repo": "mgba", - "rev": "b2564482c86378581a7a43ef4e254b2a75167bc7", - "hash": "sha256-9qHk4V7wb9YISpZ2xO2NWCGCFMRWpE8lAKTzIldsC9M=" + "rev": "3e349d52f42151085639aed9550967b88cde4f43", + "hash": "sha256-gTviFmJF+7n0SFUL6PZovLTMyrEeQyAyAJY2i40GEao=" }, - "version": "unstable-2024-02-28" + "version": "unstable-2024-09-24" }, "mrboom": { "fetcher": "fetchFromGitHub", @@ -631,53 +631,53 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "8847df50c67c19c605f60a109d30556b74d08eee", - "hash": "sha256-5Od39zhtkmWBbesHDLBcm2/7Oa91vhsqflDfUKFzST4=" + "rev": "237887e817e23800997466632deb8ba63797a4cb", + "hash": "sha256-AhyCkQzgppCnwcX+qpKcSEJ58hosJwL9wwn80HOHpvg=" }, - "version": "unstable-2024-08-22" + "version": "unstable-2024-09-03" }, "picodrive": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "picodrive", - "rev": "479f120b928153815a4543b7c4104c0aa355a660", - "hash": "sha256-FhixFmIPerXWLNzMDMRka5xWwN/pt0tKqvSbZpmLyPI=", + "rev": "6508730c524420e05626b0b06dbc603e02d3af64", + "hash": "sha256-iL6eKG2O6ePYo6NK0VsTVLaRKgwuapXotvSOy7KipgI=", "fetchSubmodules": true }, - "version": "unstable-2024-08-09" + "version": "unstable-2024-09-06" }, "play": { "fetcher": "fetchFromGitHub", "src": { "owner": "jpd002", "repo": "Play-", - "rev": "663a1d9a75f72c34befc304901ad6063f34dc9d3", - "hash": "sha256-j3lqwp2qKkt2ytHQvs4IuzpFfA++uVwgz1mupOuCzH8=", + "rev": "e70ee1608f9bc3a075c85ce1aab0cf9074201f12", + "hash": "sha256-hD+QgvPXPJ4cVqkk15bY9lZIytCiiuSwNK1MYJzP9T0=", "fetchSubmodules": true }, - "version": "unstable-2024-08-27" + "version": "unstable-2024-09-23" }, "ppsspp": { "fetcher": "fetchFromGitHub", "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "5fd8fae8b5bedafc97487d7bc004533d9612a6c7", - "hash": "sha256-bSbe9qVdrXU778fheqZuXENlJRBYD/k24BC2ZT2UnwM=", + "rev": "64ce72e81df48f78db5d5b192bd68eca218bd0a1", + "hash": "sha256-DRodUtFcHt+t8GAHI+3+WDltbUzkWZ/ahunOPELabTI=", "fetchSubmodules": true }, - "version": "unstable-2024-08-27" + "version": "unstable-2024-09-28" }, "prboom": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-prboom", - "rev": "2972aa92e0490194a37c9fb849ffc420abeb0ce4", - "hash": "sha256-VXrhSZpGNjfxU34b2gzxaPe0YKXv4K7+vB7MrC7/bkY=" + "rev": "0b43954c75760d00737120db9d5009813778c7ae", + "hash": "sha256-mb7hggdwOjWgKNykeOv+0IDYpKLHy9dJqA4+c/8R6Ss=" }, - "version": "unstable-2024-06-28" + "version": "unstable-2024-09-07" }, "prosystem": { "fetcher": "fetchFromGitHub", @@ -694,10 +694,10 @@ "src": { "owner": "libretro", "repo": "libretro-uae", - "rev": "3ef950be5b45b89d09e05bdc1f8f2f4a794dd7a6", - "hash": "sha256-364KIt7LoJqW3nsdy30CDwctWgqH+tgtWUjsmf8AswA=" + "rev": "527564f2748901068a5fef891c5073a4d6cd089b", + "hash": "sha256-tzZVG4B+rzHqhw28cmvjMFiyFfbrU3xOOEU+OCUaa+M=" }, - "version": "unstable-2024-08-26" + "version": "unstable-2024-09-25" }, "quicknes": { "fetcher": "fetchFromGitHub", @@ -754,10 +754,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "85591435763dede7ef111aab8070cdf2d5a7da49", - "hash": "sha256-hF+k9OQX/MPF3DLo2qCvsmJ/9NbnuxBigE6iu0iG9E0=" + "rev": "72e4946410bff2a09ff327599f014e9f6e855c54", + "hash": "sha256-srPtEMIjsaFdmOkymGhb6vMuY5EBnTVhzJnpsCE/fMQ=" }, - "version": "unstable-2024-08-10" + "version": "unstable-2024-09-27" }, "snes9x2002": { "fetcher": "fetchFromGitHub", @@ -794,10 +794,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "59f82b1fe159a508528a0b40e541d2abdb15d67c", - "hash": "sha256-GIkxwon6qnzQzy0TE2w0j5KAQmuEoRr7OvtFrcutuSo=" + "rev": "cb61f676ec78cd3f76cbd233bfd91575abde13be", + "hash": "sha256-t+QBWIE5+rEzdv4bbk6MqIQh3XsUgviX69RKe/zMb4Q=" }, - "version": "unstable-2024-08-29" + "version": "unstable-2024-09-26" }, "stella2014": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/emulators/retroarch/retroarch-assets.nix b/pkgs/applications/emulators/retroarch/retroarch-assets.nix index 77930d3fabd61..e9f2cb9379f2a 100644 --- a/pkgs/applications/emulators/retroarch/retroarch-assets.nix +++ b/pkgs/applications/emulators/retroarch/retroarch-assets.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "retroarch-assets"; - version = "1.19.0-unstable-2024-08-08"; + version = "1.19.0-unstable-2024-09-22"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-assets"; - rev = "8a74442fabfc6f72c623dbf1f7a59bfeba771b9f"; - hash = "sha256-rlIxKciCZK0UDAHsnEcUpFlKT0Y7vd1WqN8UfUOn7cA="; + rev = "1b138de1023272b039273d7bbc8f57573073bd25"; + hash = "sha256-ZePPjNQtzO3e7d9ZqbkfXX+0saus2X77It2l1e7WDWc="; }; makeFlags = [ diff --git a/pkgs/applications/emulators/ripes/default.nix b/pkgs/applications/emulators/ripes/default.nix index 92b7aca0a1444..312c25a020076 100644 --- a/pkgs/applications/emulators/ripes/default.nix +++ b/pkgs/applications/emulators/ripes/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r Ripes.app $out/Applications/ makeBinaryWrapper $out/Applications/Ripes.app/Contents/MacOS/Ripes $out/bin/Ripes - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -D Ripes $out/bin/Ripes '' + '' cp -r ${src}/appdir/usr/share $out/share diff --git a/pkgs/applications/emulators/ruffle/Cargo.lock b/pkgs/applications/emulators/ruffle/Cargo.lock index 434b93688151a..1c52ff074d547 100644 --- a/pkgs/applications/emulators/ruffle/Cargo.lock +++ b/pkgs/applications/emulators/ruffle/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.25" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f90148830dac590fac7ccfe78ec4a8ea404c60f75a24e16407a71f0f40de775" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -18,21 +18,11 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" -[[package]] -name = "accesskit" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b" -dependencies = [ - "enumn", - "serde", -] - [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -44,10 +34,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "adler32" -version = "1.2.0" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" @@ -58,7 +48,6 @@ dependencies = [ "cfg-if", "getrandom", "once_cell", - "serde", "version_check", "zerocopy", ] @@ -80,12 +69,13 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alsa" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" dependencies = [ "alsa-sys", - "bitflags 2.5.0", + "bitflags 2.6.0", + "cfg-if", "libc", ] @@ -101,21 +91,21 @@ dependencies = [ [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", "jni-sys", "libc", "log", - "ndk", + "ndk 0.9.0", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -143,47 +133,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -191,9 +182,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" [[package]] name = "approx" @@ -215,40 +206,30 @@ dependencies = [ [[package]] name = "arboard" -version = "3.3.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ "clipboard-win", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", - "thiserror", "x11rb", ] -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -dependencies = [ - "serde", -] +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-raw-xcb-connection" @@ -258,18 +239,18 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] name = "ashpd" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "async-fs", "async-net", @@ -277,42 +258,45 @@ dependencies = [ "futures-channel", "futures-util", "rand", + "raw-window-handle", "serde", "serde_repr", "url", + "wayland-backend", + "wayland-client", + "wayland-protocols", "zbus", ] [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -323,9 +307,9 @@ dependencies = [ [[package]] name = "async-fs" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ "async-lock", "blocking", @@ -334,9 +318,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock", "cfg-if", @@ -348,17 +332,17 @@ dependencies = [ "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener", + "event-listener-strategy", "pin-project-lite", ] @@ -375,9 +359,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.2" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ "async-channel", "async-io", @@ -386,29 +370,29 @@ dependencies = [ "async-task", "blocking", "cfg-if", - "event-listener 5.3.0", + "event-listener", "futures-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ "async-io", "async-lock", @@ -419,24 +403,24 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -447,36 +431,30 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" @@ -484,10 +462,10 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools", + "itertools 0.12.1", "lazy_static", "lazycell", "log", @@ -495,26 +473,26 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", - "syn 2.0.60", + "syn 2.0.77", "which", ] [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bitflags" @@ -524,18 +502,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" -dependencies = [ - "serde", -] +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitstream-io" -version = "2.2.0" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "block" @@ -552,46 +527,33 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - [[package]] name = "block2" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "block-sys", "objc2", ] [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock", "async-task", - "fastrand", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -618,22 +580,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -642,19 +604,46 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "bzip2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] [[package]] name = "calloop" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", "polling", "rustix", @@ -664,9 +653,9 @@ dependencies = [ [[package]] name = "calloop-wayland-source" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop", "rustix", @@ -676,9 +665,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.6" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -708,13 +697,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.95" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -744,6 +733,23 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chardetng" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b8f0b65b7b08ae3c8187e8d77174de20cb6777864c6b832d8ad365999cf1ea" +dependencies = [ + "cfg-if", + "encoding_rs", + "memchr", +] + [[package]] name = "chrono" version = "0.4.38" @@ -755,25 +761,25 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.3", + "libloading", ] [[package]] name = "clap" -version = "4.5.4" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -781,9 +787,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -793,27 +799,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -836,9 +842,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "com" @@ -883,9 +889,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -924,32 +930,23 @@ dependencies = [ [[package]] name = "cookie" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ "percent-encoding", "time", "version_check", ] -[[package]] -name = "cookie-factory" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" -dependencies = [ - "futures", -] - [[package]] name = "cookie_store" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" +checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa" dependencies = [ "cookie", - "idna 0.3.0", + "idna 0.5.0", "log", "publicsuffix", "serde", @@ -971,9 +968,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -1000,12 +997,12 @@ dependencies = [ ] [[package]] -name = "core2" -version = "0.4.0" +name = "core_maths" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" dependencies = [ - "memchr", + "libm", ] [[package]] @@ -1042,7 +1039,7 @@ dependencies = [ "js-sys", "libc", "mach2", - "ndk", + "ndk 0.8.0", "ndk-context", "oboe", "wasm-bindgen", @@ -1053,9 +1050,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -1077,18 +1074,18 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1114,9 +1111,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -1157,20 +1154,20 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.19.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", + "bitflags 2.6.0", + "libloading", "winapi", ] [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -1178,34 +1175,28 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.77", ] -[[package]] -name = "dary_heap" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" - [[package]] name = "dasp" version = "0.11.0" @@ -1325,12 +1316,6 @@ dependencies = [ "dasp_sample", ] -[[package]] -name = "data-encoding" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - [[package]] name = "deranged" version = "0.3.11" @@ -1340,17 +1325,6 @@ dependencies = [ "powerfmt", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_arbitrary" version = "1.3.2" @@ -1359,7 +1333,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -1407,13 +1381,13 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -1422,14 +1396,14 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading", ] [[package]] name = "document-features" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" dependencies = [ "litrs", ] @@ -1441,98 +1415,97 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] -name = "ecolor" -version = "0.27.2" +name = "dpi" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + +[[package]] +name = "ecolor" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ "bytemuck", - "serde", + "emath", ] [[package]] name = "egui" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ - "accesskit", "ahash", + "emath", "epaint", "log", "nohash-hasher", - "serde", ] [[package]] name = "egui-wgpu" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469ff65843f88a702b731a1532b7d03b0e8e96d283e70f3a22b0e06c46cb9b37" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ + "ahash", "bytemuck", "document-features", "egui", "epaint", "log", "thiserror", - "type-map 0.5.0", - "web-time 0.2.4", + "type-map", + "web-time", "wgpu", "winit", ] [[package]] name = "egui-winit" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e3da0cbe020f341450c599b35b92de4af7b00abde85624fd16f09c885573609" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ + "ahash", "arboard", "egui", "log", - "raw-window-handle 0.6.1", + "raw-window-handle", "smithay-clipboard", - "web-time 0.2.4", + "web-time", "webbrowser", "winit", ] [[package]] name = "egui_extras" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b78779f35ded1a853786c9ce0b43fe1053e10a21ea3b23ebea411805ce41593" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ + "ahash", "egui", "enum-map", - "image 0.24.9", + "image", "log", - "mime_guess2", - "serde", ] [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "emath" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ "bytemuck", - "serde", ] [[package]] name = "embed-resource" -version = "2.4.2" +version = "2.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602" dependencies = [ "cc", "memchr", @@ -1581,14 +1554,14 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -1596,52 +1569,41 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.60", -] - -[[package]] -name = "enumn" -version = "0.1.13" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "enumset" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" dependencies = [ "enumset_derive", ] [[package]] name = "enumset_derive" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -1649,9 +1611,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -1662,21 +1624,25 @@ dependencies = [ [[package]] name = "epaint" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ "ab_glyph", "ahash", "bytemuck", "ecolor", "emath", + "epaint_default_fonts", "log", "nohash-hasher", "parking_lot", - "serde", ] +[[package]] +name = "epaint_default_fonts" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" + [[package]] name = "equivalent" version = "1.0.1" @@ -1685,9 +1651,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1701,38 +1667,24 @@ checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "escape8259" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4911e3666fcd7826997b4745c8224295a6f3072f1418c3067b97a67557ee" -dependencies = [ - "rustversion", -] +checksum = "5692dd7b5a1978a5aeb0ce83b7655c58ca8efdcb79d21036ea249da95afec2c6" [[package]] name = "euclid" -version = "0.22.9" +version = "0.22.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" dependencies = [ "num-traits", ] [[package]] name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1741,21 +1693,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener", "pin-project-lite", ] @@ -1766,7 +1708,7 @@ dependencies = [ "anyhow", "clap", "futures", - "image 0.25.1", + "image", "indicatif", "rayon", "ruffle_core", @@ -1776,9 +1718,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1791,22 +1733,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox 0.1.3", + "windows-sys 0.59.0", ] [[package]] name = "flash-lso" version = "0.6.0" -source = "git+https://github.com/ruffle-rs/rust-flash-lso?rev=2f770555ea49c6db49c57c1dd46c7cc686e8dacc#2f770555ea49c6db49c57c1dd46c7cc686e8dacc" +source = "git+https://github.com/ruffle-rs/rust-flash-lso?rev=98679aa0cdcad5fecc5c7321b2eac35b69dbcd5f#98679aa0cdcad5fecc5c7321b2eac35b69dbcd5f" dependencies = [ - "cookie-factory", "enumset", "nom", "thiserror", @@ -1814,12 +1755,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1837,27 +1778,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" -[[package]] -name = "fluent" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" -dependencies = [ - "fluent-bundle", - "unic-langid", -] - [[package]] name = "fluent-bundle" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" dependencies = [ "fluent-langneg", "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash", + "rustc-hash 1.1.0", "self_cell 0.10.3", "smallvec", "unic-langid", @@ -1874,47 +1805,43 @@ dependencies = [ [[package]] name = "fluent-syntax" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" dependencies = [ "thiserror", ] [[package]] name = "fluent-template-macros" -version = "0.9.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d2bcae1f3ec390c50161fcf130d3228750e9ecf965618584e046d884199b83" +checksum = "b86ebacac709a063f57ee83d37c451d60dc873554f9bd828531fd1ec43209c80" dependencies = [ "flume", "ignore", "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", "unic-langid", ] [[package]] name = "fluent-templates" -version = "0.9.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197feb1e37209c6b3d29f0754b11fc070890efb2b1d761caac4e5287a200e9db" +checksum = "f339cc149c01ba2f7b0feba2acde6dd6e4a48472daffe2ddfdd6073e564c60b3" dependencies = [ - "arc-swap", - "fluent", "fluent-bundle", "fluent-langneg", "fluent-syntax", "fluent-template-macros", "flume", - "heck", "ignore", "intl-memoizer", "log", "once_cell", - "serde_json", "thiserror", "unic-langid", ] @@ -1932,7 +1859,7 @@ dependencies = [ name = "flv-rs" version = "0.1.0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "thiserror", ] @@ -1944,18 +1871,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ "roxmltree", ] [[package]] name = "fontdb" -version = "0.16.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb" dependencies = [ "fontconfig-parser", "log", @@ -1983,7 +1910,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -2070,7 +1997,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -2105,9 +2032,9 @@ dependencies = [ [[package]] name = "gc-arena" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d4a9d8c3c1ef4301b8afc383e53e102a13f9947da2181bf82828480dcc5165" +checksum = "3cd70cf88a32937834aae9614ff2569b5d9467fa0c42c5d7762fd94a8de88266" dependencies = [ "gc-arena-derive", "hashbrown", @@ -2116,13 +2043,13 @@ dependencies = [ [[package]] name = "gc-arena-derive" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c952d28a64896b1c4ac382dcd7beeaeaabc13e8c7c7f800ea2938abd828ed30" +checksum = "c612a69f5557a11046b77a7408d2836fe77077f842171cd211c5ef504bd3cddd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", "synstructure", ] @@ -2162,9 +2089,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -2185,9 +2112,9 @@ dependencies = [ [[package]] name = "gilrs" -version = "0.10.7" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b54e5e39844ab5cddaf3bbbdfdc2923a6cb34e36818b95618da4e3f26302c24c" +checksum = "dfb8c78963a8856a5b10015c9349176ff5edbc8095384d52aada467a848bc03a" dependencies = [ "fnv", "gilrs-core", @@ -2198,9 +2125,9 @@ dependencies = [ [[package]] name = "gilrs-core" -version = "0.5.11" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c132270a155f2548e67d66e731075c336c39098afc555752f3df8f882c720e" +checksum = "732dadc05170599ddec9a89653f10d7a2af54da9181b3fa6e2bd49907ec8f7e4" dependencies = [ "core-foundation", "inotify", @@ -2219,9 +2146,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gl_generator" @@ -2249,21 +2176,21 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] name = "gloo-net" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" +checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580" dependencies = [ "futures-channel", "futures-core", "futures-sink", "gloo-utils", - "http 0.2.12", + "http", "js-sys", "pin-project", "thiserror", @@ -2297,9 +2224,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] @@ -2310,7 +2237,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -2320,14 +2247,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -2338,36 +2265,36 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", "hashbrown", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "h2" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", - "http 1.1.0", + "http", "indexmap", "slab", "tokio", @@ -2378,9 +2305,9 @@ dependencies = [ [[package]] name = "h263-rs" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/h263-rs?rev=5c8d9d7d86f62b70ca484df006a75a9c8ff1985c#5c8d9d7d86f62b70ca484df006a75a9c8ff1985c" +source = "git+https://github.com/ruffle-rs/h263-rs?rev=f0fa94c366a1d0383df99aa835add175658d6bad#f0fa94c366a1d0383df99aa835add175658d6bad" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "lazy_static", "num-traits", "thiserror", @@ -2389,16 +2316,16 @@ dependencies = [ [[package]] name = "h263-rs-deblock" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/h263-rs?rev=5c8d9d7d86f62b70ca484df006a75a9c8ff1985c#5c8d9d7d86f62b70ca484df006a75a9c8ff1985c" +source = "git+https://github.com/ruffle-rs/h263-rs?rev=f0fa94c366a1d0383df99aa835add175658d6bad#f0fa94c366a1d0383df99aa835add175658d6bad" dependencies = [ - "itertools", + "itertools 0.13.0", "wide", ] [[package]] name = "h263-rs-yuv" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/h263-rs?rev=5c8d9d7d86f62b70ca484df006a75a9c8ff1985c#5c8d9d7d86f62b70ca484df006a75a9c8ff1985c" +source = "git+https://github.com/ruffle-rs/h263-rs?rev=f0fa94c366a1d0383df99aa835add175658d6bad#f0fa94c366a1d0383df99aa835add175658d6bad" dependencies = [ "bytemuck", "wide", @@ -2420,10 +2347,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", - "libloading 0.8.3", + "libloading", "thiserror", "widestring", "winapi", @@ -2462,17 +2389,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" version = "1.1.0" @@ -2486,32 +2402,32 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http", ] [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", - "http 1.1.0", + "futures-util", + "http", "http-body", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "humantime" @@ -2521,15 +2437,15 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", "futures-util", "h2", - "http 1.1.0", + "http", "http-body", "httparse", "itoa", @@ -2541,12 +2457,12 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", - "http 1.1.0", + "http", "hyper", "hyper-util", "rustls", @@ -2554,18 +2470,19 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", + "webpki-roots", ] [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http", "http-body", "hyper", "pin-project-lite", @@ -2599,24 +2516,13 @@ dependencies = [ "cc", ] -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2", - "dispatch", - "objc2", -] - [[package]] name = "id3" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f41f7e5ad125c63d55b112a98afb753742fa7f97692bfbbc52544b89e1ff1f" +checksum = "55f4e785f2c700217ee82a1c727c720449421742abd5fcb2f1df04e1244760e9" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "flate2", ] @@ -2657,7 +2563,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.7", "same-file", "walkdir", "winapi-util", @@ -2665,24 +2571,12 @@ dependencies = [ [[package]] name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-traits", -] - -[[package]] -name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "num-traits", "png", "tiff", @@ -2690,13 +2584,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", - "serde", ] [[package]] @@ -2734,9 +2627,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "lazy_static", @@ -2746,20 +2639,20 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] [[package]] name = "intl-memoizer" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda" dependencies = [ - "type-map 0.4.0", + "type-map", "unic-langid", ] @@ -2788,6 +2681,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.12.1" @@ -2797,6 +2696,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2827,9 +2735,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -2843,7 +2751,7 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "jpegxr" version = "0.3.1" -source = "git+https://github.com/ruffle-rs/jpegxr?branch=ruffle#688021cb0a4935295f9aa8b488ca05bb4f1e9b34" +source = "git+https://github.com/ruffle-rs/jpegxr?rev=db88651220688d2883a90d5477048071507b0493#db88651220688d2883a90d5477048071507b0493" dependencies = [ "bindgen", "cc", @@ -2853,9 +2761,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2867,7 +2775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.3", + "libloading", "pkg-config", ] @@ -2879,9 +2787,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -2891,52 +2799,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libflate" -version = "2.1.0" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e" -dependencies = [ - "adler32", - "core2", - "crc32fast", - "dary_heap", - "libflate_lz77", -] - -[[package]] -name = "libflate_lz77" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d" -dependencies = [ - "core2", - "hashbrown", - "rle-decode-fast", -] +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2951,7 +2825,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -2962,15 +2836,16 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall 0.5.1", ] [[package]] name = "libtest-mimic" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fefdf21230d6143476a28adbee3d930e2b68a3d56443c777cae3fe9340eebff9" +checksum = "cc0bda45ed5b3a2904262c1bb91e526127aa70e7ef3758aba2ef93cf896b9b58" dependencies = [ "clap", "escape8259", @@ -2996,29 +2871,29 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linkme" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cfee0de9bd869589fb9a015e155946d1be5ff415cb844c2caccc6cc4b5db9" +checksum = "3c943daedff228392b791b33bba32e75737756e80a613e32e246c6ce9cbab20a" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf157a4dc5a29b7b464aa8fe7edeff30076e07e13646a1c3874f58477dc99f8" +checksum = "cb26336e6dc7cc76e7927d2c9e7e3bb376d7af65a6f56a0b16c47d18a9b1abc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litrs" @@ -3028,19 +2903,25 @@ checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "loom" @@ -3057,9 +2938,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ "hashbrown", ] @@ -3097,9 +2978,9 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7" dependencies = [ "lyon_geom", "num-traits", @@ -3107,9 +2988,9 @@ dependencies = [ [[package]] name = "lyon_tessellation" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4470bd0b1f29eda66068ab1fd47719facda0a136b829bcca69287ed0ac40a134" +checksum = "579d42360a4b09846eff2feef28f538696c7d6c7439bfa65874ff3cbe0951b2c" dependencies = [ "float_next_after", "lyon_path", @@ -3171,9 +3052,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -3195,11 +3076,11 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types", @@ -3214,16 +3095,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess2" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a3333bb1609500601edc766a39b4c1772874a4ce26022f4d866854dc020c41" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -3232,23 +3103,33 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3264,20 +3145,19 @@ dependencies = [ [[package]] name = "naga" -version = "0.19.2" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ + "arrayvec", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", - "pp-rs", - "rustc-hash", - "serde", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -3288,7 +3168,7 @@ dependencies = [ name = "naga-agal" version = "0.1.0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "insta", "naga", "num-derive", @@ -3301,42 +3181,35 @@ version = "0.1.0" dependencies = [ "anyhow", "naga", - "naga_oil", "ruffle_render", ] [[package]] -name = "naga_oil" -version = "0.13.0" +name = "ndk" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ea62ae0f2787456afca7209ca180522b41f00cbe159ee369eba1e07d365cd1" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bit-set", - "codespan-reporting", - "data-encoding", - "indexmap", - "naga", - "once_cell", - "regex", - "regex-syntax 0.8.3", - "rustc-hash", + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum", "thiserror", - "tracing", - "unicode-ident", ] [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", - "raw-window-handle 0.6.1", + "raw-window-handle", "thiserror", ] @@ -3355,6 +3228,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + [[package]] name = "nellymoser-rs" version = "0.1.2" @@ -3389,13 +3271,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.2.1", "libc", "memoffset", ] @@ -3428,20 +3310,19 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -3460,7 +3341,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3474,9 +3355,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -3494,23 +3375,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3535,65 +3416,216 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] -name = "objc-foundation" -version = "0.1.1" +name = "objc-sys" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ - "block", - "objc", - "objc_id", + "objc-sys", + "objc2-encode", ] [[package]] -name = "objc-sys" -version = "0.3.3" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] [[package]] -name = "objc2" -version = "0.4.1" +name = "objc2-cloud-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" dependencies = [ - "objc-sys", - "objc2-encode", + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", ] [[package]] name = "objc2-encode" -version = "3.0.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc2-foundation" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "cc", + "bitflags 2.6.0", + "block2", + "dispatch", + "libc", + "objc2", ] [[package]] -name = "objc_id" -version = "0.1.1" +name = "objc2-link-presentation" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" dependencies = [ - "objc", + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -3605,7 +3637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ "jni", - "ndk", + "ndk 0.8.0", "ndk-context", "num-derive", "num-traits", @@ -3670,9 +3702,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.20.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ "ttf-parser", ] @@ -3685,9 +3717,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3695,22 +3727,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "path-slash" @@ -3741,7 +3773,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3758,9 +3790,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand", @@ -3783,14 +3815,14 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "polling" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" dependencies = [ "cfg-if", "concurrent-queue", @@ -3809,9 +3841,9 @@ checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "powerfmt" @@ -3820,20 +3852,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] -name = "pp-rs" -version = "0.2.1" +name = "ppv-lite86" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "unicode-xid", + "zerocopy", ] -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - [[package]] name = "presser" version = "0.3.1" @@ -3852,30 +3878,30 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.19" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "primal-check" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0" +checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08" dependencies = [ "num-integer", ] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -3886,18 +3912,18 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "profiling" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" dependencies = [ "profiling-procmacros", "tracy-client", @@ -3905,12 +3931,12 @@ dependencies = [ [[package]] name = "profiling-procmacros" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce97fecd27bc49296e5e20518b5a1bb54a14f7d5fe6228bc9686ee2a74915cc8" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3931,18 +3957,65 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" dependencies = [ "memchr", ] +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 1.1.0", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash 2.0.0", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3985,15 +4058,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "raw-window-handle" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rayon" @@ -4026,20 +4093,20 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] @@ -4055,14 +4122,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -4076,13 +4143,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -4093,15 +4160,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "regress" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eae2a1ebfecc58aff952ef8ccd364329abe627762f5bf09ff42eb9d98522479" +checksum = "1541daf4e4ed43a0922b7969bdc2170178bcacc5dabf7e39bc508a9fa3953a7a" dependencies = [ "hashbrown", "memchr", @@ -4113,9 +4180,9 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac633a08f39bf3268714799bd8c4a1a19c19c203d817d3448bb8b91c97817cf0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "float-cmp", - "libloading 0.8.3", + "libloading", "once_cell", "renderdoc-sys", "winapi", @@ -4130,19 +4197,20 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "base64 0.22.0", + "base64", "bytes", "cookie", "cookie_store", "encoding_rs", + "futures-channel", "futures-core", "futures-util", "h2", - "http 1.1.0", + "http", "http-body", "http-body-util", "hyper", @@ -4155,6 +4223,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", "rustls", "rustls-pemfile", "rustls-pki-types", @@ -4171,25 +4240,23 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots", - "winreg", + "windows-registry", ] [[package]] name = "rfd" version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +source = "git+https://github.com/PolyMeilex/rfd.git?rev=e0e725ec9a426acf7c93d9877c41e230fcee3fac#e0e725ec9a426acf7c93d9877c41e230fcee3fac" dependencies = [ "ashpd", - "block", - "dispatch", + "block2", "js-sys", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2", + "objc2-app-kit", + "objc2-foundation", "pollster", - "raw-window-handle 0.6.1", + "raw-window-handle", "urlencoding", "wasm-bindgen", "wasm-bindgen-futures", @@ -4212,40 +4279,23 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rle-decode-fast" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" - -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64 0.21.7", - "bitflags 2.5.0", - "serde", - "serde_derive", -] - [[package]] name = "roxmltree" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "ruffle_core" version = "0.1.0" dependencies = [ "async-channel", - "bitflags 2.5.0", + "bitflags 2.6.0", "bitstream-io", "build_playerglobal", "bytemuck", "byteorder", + "chardetng", "chrono", "clap", "dasp", @@ -4264,7 +4314,7 @@ dependencies = [ "futures", "hashbrown", "id3", - "image 0.25.1", + "image", "indexmap", "jpegxr", "linkme", @@ -4293,12 +4343,13 @@ dependencies = [ "symphonia", "thiserror", "tracing", + "tracy-client", "ttf-parser", "unic-segment", "url", "wasm-bindgen-futures", "weak-table", - "web-time 1.1.0", + "web-time", ] [[package]] @@ -4320,17 +4371,20 @@ dependencies = [ "fontdb", "futures", "gilrs", - "image 0.25.1", + "image", "os_info", + "rand", "rfd", "ruffle_core", "ruffle_frontend_utils", "ruffle_render", "ruffle_render_wgpu", + "ruffle_video_external", "ruffle_video_software", "sys-locale", + "thiserror", "tokio", - "toml_edit 0.22.12", + "toml_edit", "tracing", "tracing-appender", "tracing-subscriber", @@ -4342,6 +4396,7 @@ dependencies = [ "wgpu", "winapi", "winit", + "zbus", ] [[package]] @@ -4350,21 +4405,19 @@ version = "0.1.0" dependencies = [ "async-channel", "async-io", - "async-net", - "futures", "futures-lite", "macro_rules_attribute", "reqwest", "ruffle_core", + "ruffle_render", "slotmap", "tempfile", "thiserror", "tokio", - "toml_edit 0.22.12", + "toml_edit", "tracing", "url", "urlencoding", - "webbrowser", "zip", ] @@ -4379,7 +4432,7 @@ dependencies = [ name = "ruffle_input_format" version = "0.1.0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_json", ] @@ -4389,7 +4442,7 @@ name = "ruffle_macros" version = "0.1.0" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -4459,13 +4512,12 @@ dependencies = [ "enum-map", "fnv", "futures", - "image 0.25.1", + "image", "indexmap", "lru", "naga", "naga-agal", "naga-pixelbender", - "naga_oil", "profiling", "ruffle_render", "swf", @@ -4508,7 +4560,7 @@ dependencies = [ "approx", "async-channel", "chrono", - "image 0.25.1", + "image", "percent-encoding", "pretty_assertions", "regex", @@ -4516,6 +4568,7 @@ dependencies = [ "ruffle_input_format", "ruffle_render", "ruffle_socket_format", + "ruffle_video_external", "ruffle_video_software", "serde", "toml", @@ -4533,6 +4586,24 @@ dependencies = [ "thiserror", ] +[[package]] +name = "ruffle_video_external" +version = "0.1.0" +dependencies = [ + "bzip2", + "hex", + "libloading", + "reqwest", + "ruffle_render", + "ruffle_video", + "ruffle_video_software", + "sha2", + "slotmap", + "swf", + "tempfile", + "tracing", +] + [[package]] name = "ruffle_video_software" version = "0.1.0" @@ -4556,7 +4627,7 @@ name = "ruffle_web" version = "0.1.0" dependencies = [ "async-channel", - "base64 0.22.0", + "base64", "chrono", "console_error_panic_hook", "futures", @@ -4585,16 +4656,15 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", + "zip", ] [[package]] name = "ruffle_web_common" version = "0.1.0" dependencies = [ - "js-sys", "tracing", "wasm-bindgen", - "web-sys", ] [[package]] @@ -4610,9 +4680,9 @@ version = "0.1.0" [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -4620,6 +4690,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -4659,7 +4735,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -4668,11 +4744,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ - "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -4682,25 +4758,25 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64 0.22.0", + "base64", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -4709,21 +4785,21 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safe_arch" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" +checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a" dependencies = [ "bytemuck", ] @@ -4751,9 +4827,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", @@ -4768,29 +4844,29 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" dependencies = [ - "self_cell 1.0.3", + "self_cell 1.0.4", ] [[package]] name = "self_cell" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.199" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -4808,23 +4884,24 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] @@ -4837,14 +4914,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -4915,9 +4992,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "similar" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "simple_asn1" @@ -4957,11 +5034,11 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "calloop", "calloop-wayland-source", "cursor-icon", @@ -4982,9 +5059,9 @@ dependencies = [ [[package]] name = "smithay-clipboard" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ "libc", "smithay-client-toolkit", @@ -4993,18 +5070,18 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -5025,7 +5102,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -5069,21 +5146,20 @@ dependencies = [ [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "swf" -version = "0.2.0" +version = "0.2.1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bitstream-io", "byteorder", "encoding_rs", "enum-map", "flate2", - "libflate", "log", "lzma-rs", "num-derive", @@ -5153,9 +5229,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -5164,9 +5240,12 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -5176,7 +5255,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5190,20 +5269,20 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -5211,14 +5290,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5237,7 +5317,7 @@ dependencies = [ "anyhow", "env_logger", "futures", - "image 0.25.1", + "image", "libtest-mimic", "regex", "ruffle_core", @@ -5250,22 +5330,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5358,18 +5438,18 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -5382,37 +5462,36 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", "rustls-pki-types", @@ -5421,61 +5500,49 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.12" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.6", + "winnow", ] [[package]] @@ -5491,20 +5558,19 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -5538,7 +5604,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5582,9 +5648,9 @@ dependencies = [ [[package]] name = "tracing-tracy" -version = "0.10.4" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6c7bf057d67aa107e076129a4f331aaac47ec379952d9f0775c6b1d838ee97" +checksum = "9be7f8874d6438e4263f9874c84eded5095bda795d9c7da6ea0192e1750d3ffe" dependencies = [ "tracing-core", "tracing-subscriber", @@ -5604,20 +5670,21 @@ dependencies = [ [[package]] name = "tracy-client" -version = "0.16.5" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307e6b7030112fe9640fdd87988a40795549ba75c355f59485d14e6b444d2987" +checksum = "63de1e1d4115534008d8fd5788b39324d6f58fc707849090533828619351d855" dependencies = [ "loom", "once_cell", + "rustc-demangle", "tracy-client-sys", ] [[package]] name = "tracy-client-sys" -version = "0.22.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d104d610dfa9dd154535102cc9c6164ae1fa37842bc2d9e83f9ac82b0ae0882" +checksum = "98b98232a2447ce0a58f9a0bfb5f5e39647b5c597c994b63945fcccd1306fafb" dependencies = [ "cc", ] @@ -5640,17 +5707,11 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttf-parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" - -[[package]] -name = "type-map" -version = "0.4.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" dependencies = [ - "rustc-hash", + "core_maths", ] [[package]] @@ -5659,7 +5720,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -5702,9 +5763,9 @@ checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" [[package]] name = "unic-langid" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" dependencies = [ "unic-langid-impl", "unic-langid-macros", @@ -5712,18 +5773,18 @@ dependencies = [ [[package]] name = "unic-langid-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" dependencies = [ "tinystr", ] [[package]] name = "unic-langid-macros" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c854cefb82ff2816410ce606acbad1b3af065140907b29be9229040752b83ec" +checksum = "0da1cd2c042d3c7569a1008806b02039e7a4a2bdf8f8e96bd3c792434a0e275e" dependencies = [ "proc-macro-hack", "tinystr", @@ -5733,13 +5794,13 @@ dependencies = [ [[package]] name = "unic-langid-macros-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea2a4c80deb4fb3ca51f66b5e2dd91e3642bbce52234bcf22e41668281208e4" +checksum = "1ed7f4237ba393424195053097c1516bd4590dc82b84f2f97c5c69e12704555b" dependencies = [ "proc-macro-hack", "quote", - "syn 2.0.60", + "syn 2.0.77", "unic-langid-impl", ] @@ -5772,15 +5833,6 @@ dependencies = [ "unic-common", ] -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.15" @@ -5810,15 +5862,15 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "untrusted" @@ -5828,9 +5880,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -5846,15 +5898,15 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "valuable" @@ -5870,9 +5922,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vergen" -version = "8.3.1" +version = "8.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" dependencies = [ "anyhow", "cargo_metadata", @@ -5884,9 +5936,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vfs" @@ -5944,34 +5996,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -5981,9 +6034,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5991,22 +6044,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" @@ -6023,9 +6076,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", @@ -6037,11 +6090,11 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "rustix", "wayland-backend", "wayland-scanner", @@ -6053,16 +6106,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.1" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" dependencies = [ "rustix", "wayland-client", @@ -6071,11 +6124,11 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.31.2" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -6083,11 +6136,11 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +checksum = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6096,11 +6149,11 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6109,9 +6162,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", "quick-xml", @@ -6120,9 +6173,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", @@ -6138,19 +6191,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" [[package]] name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "0.2.4" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -6168,26 +6211,27 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.15" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" +checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" dependencies = [ + "block2", "core-foundation", "home", "jni", "log", "ndk-context", - "objc", - "raw-window-handle 0.5.2", + "objc2", + "objc2-foundation", "url", "web-sys", ] [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -6200,20 +6244,19 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.4" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ "arrayvec", - "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "naga", "parking_lot", "profiling", - "raw-window-handle 0.6.1", - "serde", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -6226,45 +6269,42 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.4" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", - "cfg_aliases", - "codespan-reporting", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "document-features", "indexmap", "log", "naga", "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.1", - "ron", - "rustc-hash", - "serde", + "raw-window-handle", + "rustc-hash 1.1.0", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.19.4" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", - "cfg_aliases", + "cfg_aliases 0.1.1", "core-graphics-types", "d3d12", "glow", @@ -6276,19 +6316,19 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.3", + "libloading", "log", "metal", "naga", - "ndk-sys", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.6.1", + "raw-window-handle", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -6299,13 +6339,12 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.2" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", - "serde", "web-sys", ] @@ -6323,9 +6362,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.16" +version = "0.7.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a1851a719f11d1d2fea40e15c72f6c00de8c142d7ac47c1441cc7e4d0d5bc6" +checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690" dependencies = [ "bytemuck", "safe_arch", @@ -6355,9 +6394,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134306a13c5647ad6453e8deaec55d3a44d6021970129e6188735e74bf546697" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ "windows-sys 0.52.0", ] @@ -6375,7 +6414,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6385,7 +6424,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core 0.54.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6394,7 +6433,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6403,17 +6442,47 @@ version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-result", - "windows-targets 0.52.5", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] name = "windows-result" -version = "0.1.1" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-targets 0.52.5", + "windows-result 0.2.0", + "windows-targets 0.52.6", ] [[package]] @@ -6440,7 +6509,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -6475,18 +6553,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -6503,9 +6581,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6521,9 +6599,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6539,15 +6617,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6563,9 +6641,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6581,9 +6659,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6599,9 +6677,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6617,43 +6695,47 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.29.15" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", + "block2", "bytemuck", "calloop", - "cfg_aliases", + "cfg_aliases 0.2.1", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate", + "dpi", "js-sys", "libc", - "log", "memmap2", - "ndk", - "ndk-sys", + "ndk 0.9.0", "objc2", - "once_cell", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", - "raw-window-handle 0.6.1", - "redox_syscall 0.3.5", + "pin-project", + "raw-window-handle", + "redox_syscall 0.4.1", "rustix", "sctk-adwaita", "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", @@ -6662,8 +6744,8 @@ dependencies = [ "wayland-protocols", "wayland-protocols-plasma", "web-sys", - "web-time 0.2.4", - "windows-sys 0.48.0", + "web-time", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -6671,18 +6753,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.6" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -6719,14 +6792,14 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.3", + "libloading", "once_cell", "rustix", "x11rb-protocol", @@ -6734,24 +6807,24 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -6760,7 +6833,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -6769,15 +6842,15 @@ dependencies = [ [[package]] name = "xkeysym" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" [[package]] name = "yansi" @@ -6787,9 +6860,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zbus" -version = "4.1.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", @@ -6801,9 +6874,8 @@ dependencies = [ "async-task", "async-trait", "blocking", - "derivative", "enumflags2", - "event-listener 5.3.0", + "event-listener", "futures-core", "futures-sink", "futures-util", @@ -6826,15 +6898,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.1.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.77", "zvariant_utils", ] @@ -6851,48 +6922,67 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zip" -version = "1.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a23468b4a7a4e9e1e62812f8d1dd614f67f148e2b3faa72f4843bf00b573fd7" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ "arbitrary", - "byteorder", "crc32fast", "crossbeam-utils", + "displaydoc", "flate2", + "indexmap", + "memchr", + "thiserror", + "zopfli", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", ] [[package]] name = "zvariant" -version = "4.0.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", @@ -6904,24 +6994,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.0.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.1.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix index 0d9e05dc2e86d..55b2ce67fc9b6 100644 --- a/pkgs/applications/emulators/ruffle/default.nix +++ b/pkgs/applications/emulators/ruffle/default.nix @@ -23,7 +23,7 @@ }: let - version = "nightly-2024-05-01"; + version = "nightly-2024-09-12"; in rustPlatform.buildRustPackage { pname = "ruffle"; @@ -33,12 +33,12 @@ rustPlatform.buildRustPackage { owner = "ruffle-rs"; repo = "ruffle"; rev = version; - hash = "sha256-WfoYQku1NFhvWyqeSVKtsMMEyUA97YFD7cvdn4XYIPI="; + hash = "sha256-wvgx6581vvUPb9evvJl328oTP/F8+LhpeHX3vCsHXCc="; }; nativeBuildInputs = [ jre_minimal ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ glib gsettings-desktop-schemas makeWrapper @@ -46,10 +46,10 @@ rustPlatform.buildRustPackage { python3 wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib cairo gtk3 @@ -64,11 +64,11 @@ rustPlatform.buildRustPackage { vulkan-loader udev ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; dontWrapGApps = true; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/ruffle_desktop \ --add-needed libxkbcommon-x11.so \ --add-needed libwayland-client.so \ @@ -80,7 +80,7 @@ rustPlatform.buildRustPackage { # This name is too generic mv $out/bin/exporter $out/bin/ruffle_exporter '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' vulkanWrapperArgs+=( --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib ) @@ -98,11 +98,13 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "flash-lso-0.6.0" = "sha256-sVe53VRtBEEI6eERWRv6aG6BBT31sSLvJ6CSCcif2Lo="; - "h263-rs-0.1.0" = "sha256-EBYZ00axaILGc2CtJoPQpewlf6+jlmml+cXZFyoxhHQ="; - "jpegxr-0.3.1" = "sha256-YbQMi86DXqdi7o0s5ajAv7/vFaxNpShz19cNa9MpOsA="; + "ecolor-0.28.1" = "sha256-X1prQIc3jzmWyEmpfQMgowW2qM1r+2T12Nd7HCsPtpc="; + "flash-lso-0.6.0" = "sha256-X9XYj88GmkPRy+RxvGM6vFdBxif2XYesKtqwwW2DTw4="; + "h263-rs-0.1.0" = "sha256-dyQHnCe7LwwZYlF57sbRzir9vUavN3K8wLhwPIWlmik="; + "jpegxr-0.3.1" = "sha256-03gbXA5T02ofgfRaanaixqfrFpxw/UOOftgKZ7hPHY4="; "nellymoser-rs-0.1.2" = "sha256-66yt+CKaw/QFIPeNkZA2mb9ke64rKcAw/6k/pjNYY04="; "nihav_codec_support-0.1.0" = "sha256-HAJS4I6yyzQzCf+vmaFp1MWXpcUgFAHPxLhfMVXmN1c="; + "rfd-0.14.1" = "sha256-eq4OONgYrtWCogIpjws/1uRxmv3oyIdrimDVaLJ9IMo="; }; }; diff --git a/pkgs/applications/emulators/tamatool/default.nix b/pkgs/applications/emulators/tamatool/default.nix index 04e5452bf72d5..82cd8e9a25289 100644 --- a/pkgs/applications/emulators/tamatool/default.nix +++ b/pkgs/applications/emulators/tamatool/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libpng SDL2 SDL2_image - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index b5141c59f91ea..b1916a86867a6 100644 --- a/pkgs/applications/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { pname = "visualboyadvance-m"; - version = "2.1.9"; + version = "2.1.11"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "sha256-t5/CM5KXDG0OCByu7mUyuC5NkYmB3BFmEHHgnMY05nE="; + sha256 = "sha256-OtJ632H449kPRY1i4Ydlcc1tgG00Mv622KrCyJ80OF4="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index dccf67a7a9bbb..cff069a2e75c9 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -23,7 +23,7 @@ let }; } ./setup-hook-darwin.sh; - darwinFrameworks = lib.optionals stdenv.isDarwin ( + darwinFrameworks = lib.optionals stdenv.hostPlatform.isDarwin ( toBuildInputs pkgArches (pkgs: with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon @@ -40,7 +40,7 @@ let in stdenv.mkDerivation (finalAttrs: lib.optionalAttrs (buildScript != null) { builder = buildScript; } -// lib.optionalAttrs stdenv.isDarwin { +// lib.optionalAttrs stdenv.hostPlatform.isDarwin { postBuild = '' # The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link # to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and @@ -68,12 +68,12 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } pkg-config ] ++ lib.optionals supportFlags.mingwSupport (mingwGccs - ++ lib.optional stdenv.isDarwin setupHookDarwin); + ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin); buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: [ pkgs.freetype pkgs.perl pkgs.libunwind ] - ++ lib.optional stdenv.isLinux pkgs.libcap - ++ lib.optional stdenv.isDarwin pkgs.libinotify-kqueue + ++ lib.optional stdenv.hostPlatform.isLinux pkgs.libcap + ++ lib.optional stdenv.hostPlatform.isDarwin pkgs.libinotify-kqueue ++ lib.optional cupsSupport pkgs.cups ++ lib.optional gettextSupport pkgs.gettext ++ lib.optional dbusSupport pkgs.dbus @@ -92,7 +92,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional (xineramaSupport && x11Support) pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev - ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) + ++ lib.optional vulkanSupport (if stdenv.hostPlatform.isDarwin then moltenvk else pkgs.vulkan-loader) ++ lib.optional sdlSupport pkgs.SDL2 ++ lib.optional usbSupport pkgs.libusb1 ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; @@ -100,8 +100,8 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] - ++ lib.optionals stdenv.isDarwin darwinFrameworks + ++ lib.optionals (openglSupport && !stdenv.hostPlatform.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] + ++ lib.optionals stdenv.hostPlatform.isDarwin darwinFrameworks ++ lib.optionals (x11Support) (with pkgs.xorg; [ libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm ]) @@ -115,7 +115,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } configureFlags = prevConfigFlags ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ] - ++ lib.optionals ((stdenv.isDarwin && !supportFlags.xineramaSupport) || !supportFlags.x11Support) [ "--without-x" ]; + ++ lib.optionals ((stdenv.hostPlatform.isDarwin && !supportFlags.xineramaSupport) || !supportFlags.x11Support) [ "--without-x" ]; # 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 diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 69706dcfd7206..8c8ebdea5878c 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -35,7 +35,7 @@ vulkanSupport ? false, sdlSupport ? false, usbSupport ? false, - mingwSupport ? false, + mingwSupport ? stdenv.hostPlatform.isDarwin, waylandSupport ? false, x11Support ? false, embedInstallers ? false, # The Mono and Gecko MSI installers diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 329ff8cb31e30..cf517bfc0f1a6 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.16"; + version = "9.18"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-iQQq6MgLIzP4p9GId/xBecB9Y1erfyjMvabQbzwzDFA="; + hash = "sha256-ZSb1IRwIVFO8tkKUbrLOjR1CqKSmgWi/Kg1z8yYS3Rw="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-CUVUatw9SH/LwYwloGHsU8TFjAVQRhd3WBk4AP+2NH4="; + hash = "sha256-m3tuwb6OFcgZ/NATixIH1j3YgrzsREJNpnVbevN/9FY="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix index 4a9bfb6c3204e..634964fb75330 100644 --- a/pkgs/applications/emulators/wine/staging.nix +++ b/pkgs/applications/emulators/wine/staging.nix @@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging; in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version; (wineUnstable.override { wineRelease = "staging"; }).overrideAttrs (self: { - buildInputs = build-inputs ([ "perl" "autoconf" "gitMinimal" ] ++ lib.optional stdenv.isLinux "util-linux") self.buildInputs; + buildInputs = build-inputs ([ "perl" "autoconf" "gitMinimal" ] ++ lib.optional stdenv.hostPlatform.isLinux "util-linux") self.buildInputs; nativeBuildInputs = [ autoconf hexdump perl python3 gitMinimal ] ++ self.nativeBuildInputs; prePatch = self.prePatch or "" + '' diff --git a/pkgs/applications/file-managers/browsr/default.nix b/pkgs/applications/file-managers/browsr/default.nix index 3e93b9508a344..435577aa567b8 100644 --- a/pkgs/applications/file-managers/browsr/default.nix +++ b/pkgs/applications/file-managers/browsr/default.nix @@ -32,9 +32,9 @@ python3.pkgs.buildPythonApplication rec { rich-pixels textual textual-universal-directorytree - ] ++ lib.attrVals extras passthru.optional-dependencies; + ] ++ lib.attrVals extras optional-dependencies; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { all = [ pyarrow textual-universal-directorytree.optional-dependencies.remote @@ -85,7 +85,7 @@ python3.pkgs.buildPythonApplication rec { description = "File explorer in your terminal"; mainProgram = "browsr"; homepage = "https://juftin.com/browsr"; - changelog = "https://github.com/juftin/browsr/releases/tag/${src.rev}"; + changelog = "https://github.com/juftin/browsr/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index f24445f2a6d23..83fbaf6fd2135 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - hash = "sha256-TKQxNl+RTPQAE7mMALugm3rg8mPZq3eD/uW23DLws8I="; + hash = "sha256-x7Mdt8XcTtqxaHo28jrpyYPHZ/X1g9h4aulrW3YIXGQ="; }; buildInputs = [ diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix index 5e6c09b89c89e..9bbe32fd298e2 100644 --- a/pkgs/applications/file-managers/lf/default.nix +++ b/pkgs/applications/file-managers/lf/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { # Force the use of the pure-go implementation of the os/user library. # Relevant issue: https://github.com/gokcehan/lf/issues/191 - tags = lib.optionals (!stdenv.isDarwin) [ "osusergo" ]; + tags = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "osusergo" ]; postInstall = '' install -D --mode=444 lf.desktop $out/share/applications/lf.desktop diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index 08bfe6205fdef..1644da02ed2fd 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/applications/file-managers/mc/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.31"; + version = "4.8.32"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-JBkc+GZ2dbjjH8Sp0YoKZb3AWYwsXE6gkklM0Tq0qxo="; + hash = "sha256-TdyD0e3pryNjs+q5h/VLh89mGTJBEM4tOg5wlE0TWf4="; }; nativeBuildInputs = [ pkg-config unzip ] @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { slang zip ] ++ lib.optionals x11Support [ libX11 ] - ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ e2fsprogs gpm ]; enableParallelBuilding = true; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { --replace /bin/rm ${coreutils}/bin/rm ''; - postFixup = lib.optionalString ((!stdenv.isDarwin) && x11Support) '' + postFixup = lib.optionalString ((!stdenv.hostPlatform.isDarwin) && x11Support) '' # libX11.so is loaded dynamically so autopatch doesn't detect it patchelf \ --add-needed ${libX11}/lib/libX11.so \ diff --git a/pkgs/applications/file-managers/projectable/default.nix b/pkgs/applications/file-managers/projectable/default.nix index 207ea0d0ba0a7..b296e6a7ff1cf 100644 --- a/pkgs/applications/file-managers/projectable/default.nix +++ b/pkgs/applications/file-managers/projectable/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index 3cc04e3744400..9eb1bde4266d3 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -1,59 +1,98 @@ -{ lib, stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo -, fftwSinglePrec, netcdf, pcre, gdal, blas, lapack, glibc, ghostscript, dcw-gmt -, gshhg-gmt }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + Accelerate, + CoreGraphics, + CoreVideo, + fftwSinglePrec, + netcdf, + libxml2, + pcre, + gdal, + blas, + lapack, + glibc, + ghostscript, + dcw-gmt, + gshhg-gmt, +}: -/* The onus is on the user to also install: - - ffmpeg for webm or mp4 output - - graphicsmagick for gif output +/* + The onus is on the user to also install: + - ffmpeg for webm or mp4 output + - graphicsmagick for gif output */ -stdenv.mkDerivation rec { +let + # Certainly not an ideal situation, See: + # https://github.com/NixOS/nixpkgs/pull/340707#issuecomment-2361894717 + netcdf' = netcdf.override { + libxml2 = libxml2.override { + enableHttp = true; + }; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "gmt"; - version = "6.4.0"; - src = fetchurl { - url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz"; - sha256 = "sha256-0mfAx9b7MMnqfgKe8n2tsm/9e5LLS0cD+aO6Do85Ohs="; + version = "6.5.0"; + src = fetchFromGitHub { + owner = "GenericMappingTools"; + repo = "gmt"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ curl gdal netcdf pcre dcw-gmt gshhg-gmt ] - ++ (if stdenv.isDarwin then [ - Accelerate - CoreGraphics - CoreVideo - ] else [ - glibc - fftwSinglePrec - blas - lapack - ]); + buildInputs = + [ + curl + gdal + netcdf' + pcre + dcw-gmt + gshhg-gmt + ] + ++ ( + if stdenv.hostPlatform.isDarwin then + [ + Accelerate + CoreGraphics + CoreVideo + ] + else + [ + glibc + fftwSinglePrec + blas + lapack + ] + ); - propagatedBuildInputs = [ ghostscript ]; + propagatedBuildInputs = [ + ghostscript + ]; - cmakeFlags = [ - "-DGMT_DOCDIR=share/doc/gmt" - "-DGMT_MANDIR=share/man" - "-DGMT_LIBDIR=lib" - "-DCOPY_GSHHG:BOOL=FALSE" - "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" - "-DCOPY_DCW:BOOL=FALSE" - "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" - "-DGDAL_ROOT=${gdal.out}" - "-DNETCDF_ROOT=${netcdf.out}" - "-DPCRE_ROOT=${pcre.out}" - "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" - "-DGMT_ENABLE_OPENMP:BOOL=TRUE" - "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" - "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid - ] ++ (with stdenv; - lib.optionals (!isDarwin) [ - "-DFFTW3_ROOT=${fftwSinglePrec.dev}" - "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so" - "-DBLAS_LIBRARY=${blas}/lib/libblas.so" - ]); + cmakeFlags = + [ + "-DGMT_DOCDIR=share/doc/gmt" + "-DGMT_MANDIR=share/man" + "-DGMT_LIBDIR=lib" + "-DCOPY_GSHHG:BOOL=FALSE" + "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" + "-DCOPY_DCW:BOOL=FALSE" + "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" + "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" + "-DGMT_ENABLE_OPENMP:BOOL=TRUE" + "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" + "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid + ]; - meta = with lib; { + meta = { homepage = "https://www.generic-mapping-tools.org"; description = "Tools for manipulating geographic and cartesian data sets"; longDescription = '' @@ -65,9 +104,9 @@ stdenv.mkDerivation rec { transformations and includes supporting data such as coastlines, rivers, and political boundaries and optionally country polygons. ''; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ tviti ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ tviti ]; }; -} +}) diff --git a/pkgs/applications/gis/grass/clang-integer-conversion.patch b/pkgs/applications/gis/grass/clang-integer-conversion.patch deleted file mode 100644 index 85145f45c37d0..0000000000000 --- a/pkgs/applications/gis/grass/clang-integer-conversion.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur a/db/drivers/mysql/db.c b/db/drivers/mysql/db.c ---- a/db/drivers/mysql/db.c 1969-12-31 19:00:01.000000000 -0500 -+++ b/db/drivers/mysql/db.c 2023-11-09 23:26:25.329700495 -0500 -@@ -52,9 +52,16 @@ - - db_get_login2("mysql", name, &user, &password, &host, &port); - -+ const char* errstr; -+ unsigned int port_number = (unsigned int)strtonum(port, 0, 65536, &errstr); -+ if (errstr != NULL) { -+ db_d_append_error("%s", errstr); -+ return DB_FAILED; -+ } -+ - connection = mysql_init(NULL); - res = mysql_real_connect(connection, host, user, password, -- connpar.dbname, port, NULL, 0); -+ connpar.dbname, port_number, NULL, 0); - - if (res == NULL) { - db_d_append_error("%s\n%s", _("Connection failed."), diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index fd26e49fdbd88..68bbcb46b5260 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -5,7 +5,7 @@ , makeWrapper , wrapGAppsHook3 -, withOpenGL ? true +, withOpenGL ? !stdenv.hostPlatform.isDarwin , bison , blas @@ -23,6 +23,7 @@ , libsvm , libtiff , libxml2 +, llvmPackages , netcdf , pdal , pkg-config @@ -86,15 +87,11 @@ stdenv.mkDerivation (finalAttrs: { zlib zstd ] ++ lib.optionals withOpenGL [ libGLU ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] + ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; strictDeps = true; - patches = lib.optionals stdenv.isDarwin [ - # Fix conversion of const char* to unsigned int. - ./clang-integer-conversion.patch - ]; - configureFlags = [ "--with-blas" "--with-cairo-ldflags=-lfontconfig" @@ -120,14 +117,14 @@ stdenv.mkDerivation (finalAttrs: { "--without-odbc" ] ++ lib.optionals (! withOpenGL) [ "--without-opengl" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--without-cairo" "--without-freetype" "--without-x" ]; # Otherwise a very confusing "Can't load GDAL library" error - makeFlags = lib.optional stdenv.isDarwin "GDAL_DYNAMIC="; + makeFlags = lib.optional stdenv.hostPlatform.isDarwin "GDAL_DYNAMIC="; /* Ensures that the python script run at build time are actually executable; * otherwise, patchShebangs ignores them. */ diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index e5e744b374678..5e22cc9aa0161 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -24,13 +24,13 @@ in symlinkJoin rec { pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs); postBuild = '' - # unpackPhase - buildPythonPath "$pythonInputs" - wrapProgram $out/bin/qgis \ - --prefix PATH : $program_PATH \ - --set PYTHONPATH $program_PYTHONPATH + for program in $out/bin/*; do + wrapProgram $program \ + --prefix PATH : $program_PATH \ + --set PYTHONPATH $program_PYTHONPATH + done ''; passthru = { diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index bcf99a5f4e4f3..53e6069e87071 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -24,13 +24,13 @@ in symlinkJoin rec { pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs); postBuild = '' - # unpackPhase - buildPythonPath "$pythonInputs" - wrapProgram $out/bin/qgis \ - --prefix PATH : $program_PATH \ - --set PYTHONPATH $program_PYTHONPATH + for program in $out/bin/*; do + wrapProgram $program \ + --prefix PATH : $program_PATH \ + --set PYTHONPATH $program_PYTHONPATH + done ''; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 8b47329cd4a25..17af854eabda0 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -78,14 +78,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.10"; + version = "3.34.11"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-E2Ak14h1kWdGq+JNbCeh5YJkr/S9g/0HD834MtgACSA="; + hash = "sha256-VNgUMEA7VKZXsLG1ZYUIlYvjwRrH8LsliGiVRMnXOM0="; }; passthru = { @@ -151,7 +151,6 @@ in mkDerivation rec { env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" "-DWITH_PDAL=True" "-DENABLE_TESTS=False" @@ -173,9 +172,11 @@ in mkDerivation rec { # the path at build time using GRASS_PREFIX. # Using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS. - wrapProgram $out/bin/qgis \ - "''${gappsWrapperArgs[@]}" \ - --prefix PATH : ${lib.makeBinPath [ grass ]} + for program in $out/bin/*; do + wrapProgram $program \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : ${lib.makeBinPath [ grass ]} + done ''; meta = with lib; { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index d7c743e36a53b..97349b31845b1 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -79,14 +79,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.38.2"; + version = "3.38.3"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-lArwRtHR/KAsgjpjid6YnPA9BkcG1Mg/KeIIOWN75Kg="; + hash = "sha256-yJFYq4t0LzBr+O2bmtBSeehQ2vfUaZIQfOY68WZcHG4="; }; passthru = { @@ -152,7 +152,6 @@ in mkDerivation rec { env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" "-DWITH_PDAL=True" "-DENABLE_TESTS=False" @@ -175,9 +174,11 @@ in mkDerivation rec { # the path at build time using GRASS_PREFIX. # Using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS. - wrapProgram $out/bin/qgis \ - "''${gappsWrapperArgs[@]}" \ - --prefix PATH : ${lib.makeBinPath [ grass ]} + for program in $out/bin/*; do + wrapProgram $program \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : ${lib.makeBinPath [ grass ]} + done ''; meta = with lib; { diff --git a/pkgs/applications/gis/spatialite-gui/default.nix b/pkgs/applications/gis/spatialite-gui/default.nix index b33818e354867..a8bdedabaa374 100644 --- a/pkgs/applications/gis/spatialite-gui/default.nix +++ b/pkgs/applications/gis/spatialite-gui/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ curl @@ -59,11 +59,11 @@ stdenv.mkDerivation rec { wxGTK xz zstd - ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit ]; enableParallelBuilding = true; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' rm -fr $out/share ''; diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/applications/gis/udig/default.nix index 264445336cd3d..04740f55b0654 100644 --- a/pkgs/applications/gis/udig/default.nix +++ b/pkgs/applications/gis/udig/default.nix @@ -63,6 +63,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index df2343d8813e5..199595a658385 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { glib gtk3 openssl - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index dac185e3d3d07..e0834055e7163 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional openexrSupport openexr ++ lib.optional librsvgSupport librsvg ++ lib.optional openjpegSupport openjpeg - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ]; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 7175287db1a0e..27abada541193 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -49,13 +49,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-37"; + version = "7.1.1-38"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-dlcyCJw/tytb6z5VaogblUlzBRYBtijUJbkX3vZdeEU="; + hash = "sha256-dyk9kCH1w76Jhy/yBhVFLthTKYaMgXLBn7QGWAFS0XU="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { pango ] ++ lib.optional openjpegSupport openjpeg - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ]; @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { version = testers.testVersion { package = finalAttrs.finalPackage; }; inherit nixos-icons; inherit (perlPackages) ImageMagick; - inherit (python3.pkgs) img2pdf; + inherit (python3.pkgs) img2pdf willow; pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; version = lib.head (lib.splitString "-" finalAttrs.version); diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index d39961da9077c..b55e6a8a5bb00 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -28,7 +28,7 @@ in sed -i "s,python3,${python3.executable}," CMakeLists.txt ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 $src/deploy/icon.svg $out/share/icons/hicolor/scalable/apps/antimony.svg install -Dm644 ${./mimetype.xml} $out/share/mime/packages/antimony.xml ''; diff --git a/pkgs/applications/graphics/artem/default.nix b/pkgs/applications/graphics/artem/default.nix index 8b391f104d83c..8f6d27b176a3c 100644 --- a/pkgs/applications/graphics/artem/default.nix +++ b/pkgs/applications/graphics/artem/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 30cf116fed14d..82bba3c3fc53d 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { imagemagick libpng pstoedit - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 111e37711ef30..b1493b94ce67e 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { freetype fontconfig libjpeg libpng libtiff libwebp zlib - ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; preBuild = '' cd build diff --git a/pkgs/applications/graphics/brlcad/default.nix b/pkgs/applications/graphics/brlcad/default.nix index 91b063f8fc935..031b15baf0bae 100644 --- a/pkgs/applications/graphics/brlcad/default.nix +++ b/pkgs/applications/graphics/brlcad/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://brlcad.org"; description = "BRL-CAD is a powerful cross-platform open source combinatorial solid modeling system"; - changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${src.rev}"; + changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = with licenses; [ lgpl21 bsd2 ]; maintainers = with maintainers; [ GaetanLepage ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index cce0158023029..dac235b9995e3 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] ++ lib.optional stdenv.isDarwin Cocoa; + buildInputs = [ itk ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license = licenses.gpl3; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; # /build/source/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:312:10: fatal error: xmmintrin.h: No such file or directory }; } diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index d8e8693166194..f25259e5ebf40 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK32 zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/applications/graphics/curtail/default.nix index 6c6c6de1d8523..7c9d4298cb7bd 100644 --- a/pkgs/applications/graphics/curtail/default.nix +++ b/pkgs/applications/graphics/curtail/default.nix @@ -72,6 +72,6 @@ python3.pkgs.buildPythonApplication rec { mainProgram = "curtail"; homepage = "https://github.com/Huluti/Curtail"; license = licenses.gpl3Only; - maintainers = [ ]; + maintainers = with maintainers; [ aleksana ]; }; } diff --git a/pkgs/applications/graphics/curv/default.nix b/pkgs/applications/graphics/curv/default.nix index 7113437245a38..f1f66784aa510 100644 --- a/pkgs/applications/graphics/curv/default.nix +++ b/pkgs/applications/graphics/curv/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { xorg.libXi xorg.libXinerama xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ilmbase llvmPackages.openmp ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/curv3d/curv"; license = licenses.asl20; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ pbsds ]; mainProgram = "curv"; }; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix deleted file mode 100644 index 0d19158f4476d..0000000000000 --- a/pkgs/applications/graphics/darktable/default.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libsoup -, graphicsmagick -, json-glib -, wrapGAppsHook3 -, cairo -, cmake -, ninja -, curl -, perl -, desktop-file-utils -, exiv2 -, glib -, glib-networking -, ilmbase -, gtk3 -, intltool -, lcms2 -, lensfun -, libX11 -, libexif -, libgphoto2 -, libjpeg -, libpng -, librsvg -, libtiff -, libjxl -, openexr_3 -, osm-gps-map -, pkg-config -, sqlite -, libxslt -, openjpeg -, pugixml -, colord -, colord-gtk -, libwebp -, libsecret -, adwaita-icon-theme -, SDL2 -, ocl-icd -, pcre -, gtk-mac-integration -, isocodes -, llvmPackages -, gmic -, libavif -, icu -, jasper -, libheif -, libaom -, portmidi -, lua -}: - -stdenv.mkDerivation rec { - version = "4.8.1"; - pname = "darktable"; - - src = fetchurl { - url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "sha256-kBsOLK7Tb7hhn99MYO37jTETS5R9MFS1xm/VXDivWZE="; - }; - - nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook3 ]; - - buildInputs = [ - cairo - curl - exiv2 - glib - glib-networking - gtk3 - ilmbase - lcms2 - lensfun - libexif - libgphoto2 - libjpeg - libpng - librsvg - libtiff - libjxl - openexr_3 - sqlite - libxslt - libsoup - graphicsmagick - json-glib - openjpeg - pugixml - libwebp - libsecret - SDL2 - adwaita-icon-theme - osm-gps-map - pcre - isocodes - gmic - libavif - icu - jasper - libheif - libaom - portmidi - lua - ] ++ lib.optionals stdenv.isLinux [ - colord - colord-gtk - libX11 - ocl-icd - ] ++ lib.optional stdenv.isDarwin gtk-mac-integration - ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - - cmakeFlags = [ - "-DBUILD_USERMANUAL=False" - ] ++ lib.optionals stdenv.isDarwin [ - "-DUSE_COLORD=OFF" - "-DUSE_KWALLET=OFF" - ]; - - # darktable changed its rpath handling in commit - # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the - # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in - # the wrappers: - preFixup = - let - libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - libPathPrefix = "$out/lib/darktable" + lib.optionalString stdenv.isLinux ":${ocl-icd}/lib"; - in - '' - for f in $out/share/darktable/kernels/*.cl; do - sed -r "s|#include \"(.*)\"|#include \"$out/share/darktable/kernels/\1\"|g" -i "$f" - done - - gappsWrapperArgs+=( - --prefix ${libPathEnvVar} ":" "${libPathPrefix}" - ) - ''; - - meta = with lib; { - description = "Virtual lighttable and darkroom for photographers"; - homepage = "https://www.darktable.org"; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ flosse mrVanDalo paperdigits freyacodes ]; - }; -} diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 534d1f5884b92..9977224dd761c 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { lib.optionals withDocs [ libxslt ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ gtk-mac-integration-gtk3 ]; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 3678b9760c812..99af85a12b8d6 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { qtbase xorg.libXt libtiff - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AGL; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.AGL; preConfigure = '' NOCONFIGURE=1 ./autogen.sh @@ -49,10 +49,10 @@ mkDerivation rec { "--with-x" "--with-tiff" "--disable-nsdejavu" # 2023-11-14: modern browsers have dropped support for NPAPI - ] ++ lib.optional stdenv.isDarwin "--enable-mac"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-mac"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; mainProgram = "djview"; homepage = "https://djvu.sourceforge.net/djview4.html"; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index e943bf4f31816..56a128f2246c8 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,22 +1,43 @@ -{ lib, python3Packages, fetchPypi }: +{ + lib, + python3Packages, + fetchPypi, +}: python3Packages.buildPythonApplication rec { pname = "dosage"; - version = "2.17"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0"; + sha256 = "sha256-mHV/U9Vqv7fSsLYNrCXckkJ1YpsccLd8HsJ78IwLX0Y="; }; + pyproject = true; + nativeCheckInputs = with python3Packages; [ - pytestCheckHook pytest-xdist responses + pytestCheckHook + pytest-xdist + responses ]; - nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + build-system = [ python3Packages.setuptools-scm ]; + + dependencies = with python3Packages; [ + colorama + imagesize + lxml + requests + six + platformdirs + ]; - propagatedBuildInputs = with python3Packages; [ - colorama imagesize lxml requests setuptools six + disabledTests = [ + # need network connect to api.github.com + "test_update_available" + "test_no_update_available" + "test_update_broken" + "test_current" ]; meta = { diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 1442d794e3746..a0c1776a69717 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "24.6.4"; + version = "24.7.17"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-6+a+70uN4Tk4pMXg3DQ3D0GcLNGFQEcPG05xxyUv1DQ="; + hash = "sha256-DWNFh3ocU5WVi5WZheMOMUYH6FHJ+LJbaUC1XkQ5TFo="; }; # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-R8eCnp/ik3EfsmsVyJfLjyScUVQSm/EdXJesS/eVIX0="; + hash = "sha256-bAvS7AXmmS+yYsEkXxvszlErpZ3J5hVVXxxzYcsVP5Y="; }; nativeBuildInputs = [ @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { makeWrapper nodejs yarn - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ autoSignDarwinBinariesHook ]; @@ -62,15 +62,15 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - '' + lib.optionalString stdenv.isDarwin '' + '' + 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 sed -i "/afterSign/d" electron-builder-linux-mac.json '' + '' yarn --offline run electron-builder --dir \ - ${lib.optionalString stdenv.isDarwin "--config electron-builder-linux-mac.json"} \ - -c.electronDist=${if stdenv.isDarwin then "." else electron.dist} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "--config electron-builder-linux-mac.json"} \ + -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \ -c.electronVersion=${electron.version} runHook postBuild @@ -79,13 +79,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv dist/mac*/draw.io.app $out/Applications # Symlinking `draw.io` doesn't work; seems to look for files in the wrong place. makeWrapper $out/Applications/draw.io.app/Contents/MacOS/draw.io $out/bin/drawio - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/share/lib/drawio" cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/drawio" diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 3bdb37900de0b..ad76e0e92b7cc 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -107,7 +107,7 @@ in mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; } // lib.optionalAttrs buildServer { mainProgram = "drawpile-srv"; } // lib.optionalAttrs buildClient { diff --git a/pkgs/applications/graphics/emblem/default.nix b/pkgs/applications/graphics/emblem/default.nix index 2b249d7e294e7..c0f9046fa9c82 100644 --- a/pkgs/applications/graphics/emblem/default.nix +++ b/pkgs/applications/graphics/emblem/default.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { buildInputs = [ libadwaita libxml2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ]); diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index a57a33e11b51b..0db2a75721ec0 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -30,7 +30,7 @@ let libXrandr libXxf86vm libxcb - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ]; @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { python3 ]; - buildInputs = rpathLibs ++ lib.optionals stdenv.isDarwin [ + buildInputs = rpathLibs ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreGraphics CoreServices @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { OpenGL ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion ''; diff --git a/pkgs/applications/graphics/entwine/default.nix b/pkgs/applications/graphics/entwine/default.nix index 5a79bc38c553c..0ab59737cd61c 100644 --- a/pkgs/applications/graphics/entwine/default.nix +++ b/pkgs/applications/graphics/entwine/default.nix @@ -1,21 +1,22 @@ { lib , stdenv , fetchFromGitHub +, gitUpdater , cmake , pdal , curl , openssl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "entwine"; - version = "unstable-2023-04-27"; + version = "3.1.1"; src = fetchFromGitHub { owner = "connormanning"; repo = "entwine"; - rev = "8bd179c38e6da1688f42376b88ff30427672c4e3"; - sha256 = "sha256-RlNxTtqxQoniI1Ugj5ot0weu7ji3WqDJZpMu2n8vBkw="; + rev = version; + sha256 = "sha256-1dy5NafKX0E4MwFIggnr7bQIeB1KvqnNaQQUUAs6Bq8="; }; buildInputs = [ @@ -28,11 +29,13 @@ stdenv.mkDerivation { cmake ]; + passthru.updateScript = gitUpdater {}; + meta = with lib; { description = "Point cloud organization for massive datasets"; homepage = "https://entwine.io/"; license = licenses.lgpl2Only; - maintainers = with maintainers; [ matthewcroughan ]; + maintainers = with maintainers; teams.geospatial.members ++ [ matthewcroughan ]; platforms = platforms.linux; mainProgram = "entwine"; }; diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index ca93a5f579c9c..939232197eeb3 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ expat fontconfig freetype @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { xorg.libXcursor xorg.libXi xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { install -Dm444 assets/icon.png $out/share/icons/hicolor/48x48/apps/epick.png ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]} ''; diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index fb397239849b1..9c5c7e81c3a76 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; # Undefined symbols for architecture x86_64: # "_bundle_path", referenced from: App::SetupPaths() in src_app.cpp.o - broken = stdenv.isDarwin || + broken = stdenv.hostPlatform.isDarwin || # https://github.com/bcampbell/evilpixie/issues/28 - stdenv.isAarch64; + stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 5daaf0e10ef1e..3ce4095162495 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -15,7 +15,7 @@ , opencascade-occt , assimp , fontconfig -, withManual ? !stdenv.isDarwin +, withManual ? !stdenv.hostPlatform.isDarwin , withPythonBinding ? false }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { opencascade-occt assimp fontconfig - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenGL ] ++ lib.optionals withPythonBinding [ diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 56f4936ceff1d..e7d144579afdf 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" "exif=1" - ] ++ lib.optional stdenv.isDarwin "verscmp=0" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "verscmp=0" ++ lib.optional enableAutoreload "inotify=1"; installTargets = [ "install" ]; diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index c3d1f5eb655ee..f902776fb58b3 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall mkdir -p $out/Applications diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix deleted file mode 100644 index 4ee7b869eea07..0000000000000 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{lib, stdenv, fetchurl, fetchpatch, gtk2, perlPackages, pkg-config } : - -let version = "0.4"; in -stdenv.mkDerivation { - pname = "gcolor2"; - inherit version; - arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else "386"; - - src = fetchurl { - url = "mirror://sourceforge/project/gcolor2/gcolor2/${version}/gcolor2-${version}.tar.bz2"; - sha256 = "1siv54vwx9dbfcflklvf7pkp5lk6h3nn63flg6jzifz9wp0c84q6"; - }; - - preConfigure = '' - sed -i 's/\[:space:\]/[&]/g' configure - ''; - - # from https://github.com/PhantomX/slackbuilds/tree/master/gcolor2/patches - patches = (if stdenv.hostPlatform.system == "x86_64-linux" then - [ ./gcolor2-amd64.patch ] else - [ ]) - ++ [ - # Pull patch pending upstream inclusion for -fno-common toolchains: - # https://sourceforge.net/p/gcolor2/patches/8/ - (fetchpatch { - name = "fno-common.patch"; - url = "https://sourceforge.net/p/gcolor2/patches/8/attachment/0001-gcolor2-fix-build-on-gcc-10-fno-common.patch"; - sha256 = "0187zc8as9g3d6mpm3isg87jfpryj0hajb4inwvii8gxrzbi5l5f"; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 ] - ++ (with perlPackages; [ perl XMLParser ]); - - meta = { - description = "Simple GTK 2 color selector"; - homepage = "https://gcolor2.sourceforge.net/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ notthemessiah ]; - platforms = with lib.platforms; unix; - mainProgram = "gcolor2"; - }; -} diff --git a/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch b/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch deleted file mode 100644 index cd06a8315f984..0000000000000 --- a/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c ---- gcolor2-0.4.orig/src/callbacks.c 2005-07-12 14:06:12.000000000 -0400 -+++ gcolor2-0.4/src/callbacks.c 2007-02-17 19:19:38.000000000 -0500 -@@ -4,6 +4,9 @@ - - #include <gtk/gtk.h> - #include <stdio.h> -+#include <string.h> -+#include <glib.h> -+#include <glib/gprintf.h> - - #include "callbacks.h" - #include "interface.h" -@@ -172,6 +175,9 @@ void on_copy_color_to_clipboard_activate - gtk_clipboard_set_text (cb, hex, strlen (hex)); - } - -+void add_rgb_file (gchar *filename, gchar *type); -+gchar* get_system_file (void); -+ - void on_show_system_colors_activate (GtkMenuItem *menuitem, gpointer user_data) - { - if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem))) -@@ -266,6 +272,8 @@ void on_save_button_clicked (GtkButton * - gtk_widget_destroy (savedialog); - } - -+void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color); -+ - void add_color_to_treeview () - { - GtkTreeView *treeview; -diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c ---- gcolor2-0.4.orig/src/main.c 2005-07-11 10:55:49.000000000 -0400 -+++ gcolor2-0.4/src/main.c 2007-02-17 19:18:23.000000000 -0500 -@@ -4,6 +4,10 @@ - - #include <gtk/gtk.h> - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <glib.h> -+#include <glib/gprintf.h> - - #include "interface.h" - #include "support.h" diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 3c44ae0bddf1e..2d07fbb8633d7 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "geeqie"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - hash = "sha256-MVBKaiKcKknU0rChUYJ+N4oX4tVm145s+NqGQuDHY2g="; + hash = "sha256-k2FXj2ZKZzB5XpCcWzEv7Q1ozATfU3221XKcOFdWOGU="; }; patches = [ diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index fe89869809e99..5270b708486d1 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -42,6 +42,7 @@ , mypaint-brushes1 , libwebp , libheif +, libxslt , libgudev , openexr , desktopToDarwinBundle @@ -76,6 +77,14 @@ in stdenv.mkDerivation (finalAttrs: { # Use absolute paths instead of relying on PATH # to make sure plug-ins are loaded by the correct interpreter. ./hardcode-plugin-interpreters.patch + + # GIMP queries libheif.pc for builtin encoder/decoder support to determine if AVIF/HEIC files are supported + # (see https://gitlab.gnome.org/GNOME/gimp/-/blob/a8b1173ca441283971ee48f4778e2ffd1cca7284/configure.ac?page=2#L1846-1852) + # These variables have been removed since libheif 1.18.0 + # (see https://github.com/strukturag/libheif/commit/cf0d89c6e0809427427583290547a7757428cf5a) + # This has already been fixed for the upcoming GIMP 3, but the fix has not been backported to 2.x yet + # (see https://gitlab.gnome.org/GNOME/gimp/-/issues/9080) + ./force-enable-libheif.patch ]; nativeBuildInputs = [ @@ -85,7 +94,8 @@ in stdenv.mkDerivation (finalAttrs: { gettext makeWrapper gtk-doc - ] ++ lib.optionals stdenv.isDarwin [ + libxslt + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; @@ -125,11 +135,11 @@ in stdenv.mkDerivation (finalAttrs: { glib-networking libmypaint mypaint-brushes1 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa gtk-mac-integration-gtk2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libgudev ] ++ lib.optionals withPython [ python @@ -158,7 +168,7 @@ in stdenv.mkDerivation (finalAttrs: { doCheck = true; env = { - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DGDK_OSX_BIG_SUR=16"; # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; diff --git a/pkgs/applications/graphics/gimp/force-enable-libheif.patch b/pkgs/applications/graphics/gimp/force-enable-libheif.patch new file mode 100644 index 0000000000000..de3dfb09b95e8 --- /dev/null +++ b/pkgs/applications/graphics/gimp/force-enable-libheif.patch @@ -0,0 +1,22 @@ +diff --git a/configure.ac b/configure.ac +index 48c3c77892..3189781817 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1843,13 +1843,13 @@ can_export_heic=no + can_import_avif=no + can_export_avif=no + if test "x$have_libheif" = xyes; then +- can_import_heic=`$PKG_CONFIG --variable=builtin_h265_decoder libheif` +- can_export_heic=`$PKG_CONFIG --variable=builtin_h265_encoder libheif` ++ can_import_heic=yes ++ can_export_heic=yes + if test "x$can_import_heic" = xyes; then + MIME_TYPES="$MIME_TYPES;image/heif;image/heic" + fi +- can_import_avif=`$PKG_CONFIG --variable=builtin_avif_decoder libheif` +- can_export_avif=`$PKG_CONFIG --variable=builtin_avif_encoder libheif` ++ can_import_avif=yes ++ can_export_avif=yes + if test "x$can_import_avif" = xyes; then + MIME_TYPES="$MIME_TYPES;image/avif" + fi diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 667a1d505751a..f5c9266b571df 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -155,7 +155,7 @@ in }; }; - farbfeld = pluginDerivation rec { + farbfeld = pluginDerivation { pname = "farbfeld"; version = "unstable-2019-08-12"; @@ -309,7 +309,7 @@ in variant = "gimp"; }; - gimplensfun = pluginDerivation rec { + gimplensfun = pluginDerivation { version = "unstable-2018-10-21"; pname = "gimplensfun"; diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 6d0a8a8436f37..db173f58b54e6 100644 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9lrxK2psdIPGsOC6p8T+3AGPrX6PjrK9mFirdJqBSMM="; }; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one. # The vendored gettext does not build with clang 16. GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin"; @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { gtk4 gdk-pixbuf libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix deleted file mode 100644 index 9015677843545..0000000000000 --- a/pkgs/applications/graphics/gpicview/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "gpicview"; - version = "0.2.4"; - - src = fetchurl { - url = "mirror://sourceforge/lxde/gpicview-${version}.tar.gz"; - sha256 = "1svcy1c8bgk0pl12yhyv16h2fl52x5vzzcv57z6qdcv5czgvgglr"; - }; - - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/nonas/debian-clang/master/buildlogs/gpicview/gpicview-0.2.4/debian/patches/clang_FTBFS_Wreturn-type.patch"; - sha256 = "02dm966bplnv10knpdx7rlpjipk884156ggd9ij05zhza0jl8xcs"; - }) - ]; - - nativeBuildInputs = [ pkg-config intltool ]; - - buildInputs = [ gtk2 ]; - - meta = with lib; { - description = "Simple and fast image viewer for X"; - homepage = "https://lxde.sourceforge.net/gpicview/"; - license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - mainProgram = "gpicview"; - }; -} diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix deleted file mode 100644 index b3556cf27846c..0000000000000 --- a/pkgs/applications/graphics/gqview/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, libpng }: - -stdenv.mkDerivation rec { - pname = "gqview"; - version = "2.1.5"; - - src = fetchurl { - url = "mirror://sourceforge/gqview/gqview-${version}.tar.gz"; - sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ gtk2 libpng ]; - - hardeningDisable = [ "format" ]; - - env.NIX_CFLAGS_COMPILE = "-fcommon"; - NIX_LDFLAGS = "-lm"; - - meta = with lib; { - description = "Fast image viewer"; - homepage = "https://gqview.sourceforge.net"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = [ ]; - mainProgram = "gqview"; - }; -} diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 51a11528cb8fa..f4740c7d9d236 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "581"; + version = "591"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-Q/EdqwIMCjeDtFAPlYd04NMpEgC6xUDGK5LwxDCiI9Y="; + hash = "sha256-JhCnSNmCOEJdM5aEPpYWLpKy/EQ9BoN1A/aUAaILWtQ="; }; nativeBuildInputs = [ @@ -83,44 +83,10 @@ python3Packages.buildPythonPackage rec { ]; nativeCheckInputs = with python3Packages; [ - nose mock httmock ]; - # most tests are failing, presumably because we are not using test.py - checkPhase = '' - runHook preCheck - - nosetests $src/hydrus/test \ - -e TestClientAPI \ - -e TestClientConstants \ - -e TestClientDaemons \ - -e TestClientData \ - -e TestClientDB \ - -e TestClientDBDuplicates \ - -e TestClientDBTags \ - -e TestClientImageHandling \ - -e TestClientImportOptions \ - -e TestClientListBoxes \ - -e TestClientMigration \ - -e TestClientNetworking \ - -e TestClientTags \ - -e TestClientThreading \ - -e TestDialogs \ - -e TestFunctions \ - -e TestHydrusNetwork \ - -e TestHydrusNATPunch \ - -e TestHydrusSerialisable \ - -e TestHydrusServer \ - -e TestHydrusSessions \ - -e TestServer \ - -e TestClientMetadataMigration \ - -e TestClientFileStorage \ - - runHook postCheck - ''; - outputs = [ "out" "doc" ]; installPhase = '' @@ -140,6 +106,7 @@ python3Packages.buildPythonPackage rec { mkdir -p $out/bin install -m0755 hydrus_server.py $out/bin/hydrus-server install -m0755 hydrus_client.py $out/bin/hydrus-client + install -m0755 hydrus_test.py $out/bin/hydrus-test # desktop item mkdir -p "$out/share/icons/hicolor/scalable/apps" @@ -154,6 +121,16 @@ python3Packages.buildPythonPackage rec { runHook postInstall ''; + checkPhase = '' + runHook preCheck + + export QT_QPA_PLATFORM=offscreen + export HOME=$(mktemp -d) + $out/bin/hydrus-test + + runHook postCheck + ''; + dontWrapQtApps = true; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index 8b2347f438184..2b2c3e19825ab 100644 --- a/pkgs/applications/graphics/icon-library/default.nix +++ b/pkgs/applications/graphics/icon-library/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { hash = "sha256-nWGTYoSa0/fxnD0Mb2132LkeB1oa/gj/oIXBbI+FDw8="; }; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one. # The vendored gettext does not build with clang 16. GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { gtk4 gtksourceview5 libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 2398a61f2134b..37fed43765ea6 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib ]; dontWrapGApps = true; - desktopItems = lib.optionals stdenv.isLinux [ + desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ (makeDesktopItem { name = "ImageJ"; desktopName = "ImageJ"; @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${jre}/bin/java $out/bin/imagej \ ''${gappsWrapperArgs[@]} \ --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share" diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 9c60f309e12af..178bdfcae3fb4 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -32,7 +32,7 @@ let # default value of withWindowSystem withWindowSystem' = if withWindowSystem != null then withWindowSystem - else if stdenv.isLinux then "all" + else if stdenv.hostPlatform.isLinux then "all" else "x11"; windowSystems = { diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 81cd91ebb6b0b..62f485ff916ee 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { ] ++ (with perlPackages; [ perl XMLParser - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; @@ -168,15 +168,15 @@ stdenv.mkDerivation rec { python3Env zlib libepoxy - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gspell - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cairo gtk-mac-integration ]; # Make sure PyXML modules can be found at run-time. - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/lib/inkscape/*.dylib; do ln -s $f $out/lib/$(basename $f) done diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 8946d7e4afc98..53fa2a64350a5 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.52.0"; + version = "1.57.0"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-Ls8haijbd5rPQwnJCYjLbA1KAVZhPk0aRRe2TtzmTCs="; + hash = "sha256-b2XoywPnrYnuehR6xHH8BvhbMZFB1AeBN0khFfaLGn0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/komorebi/default.nix b/pkgs/applications/graphics/komorebi/default.nix index 4d60cde30cd38..f98549cb14ffb 100644 --- a/pkgs/applications/graphics/komorebi/default.nix +++ b/pkgs/applications/graphics/komorebi/default.nix @@ -13,17 +13,16 @@ , ninja , wrapGAppsHook3 , testers -, komorebi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "komorebi"; version = "2.2.1"; src = fetchFromGitHub { owner = "Komorebi-Fork"; repo = "komorebi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-vER69dSxu4JuWNAADpkxHE/zjOMhQp+Fc21J+JHQ8xk="; }; @@ -44,7 +43,7 @@ stdenv.mkDerivation rec { clutter-gst ]; - passthru.tests.version = testers.testVersion { package = komorebi; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { description = "Beautiful and customizable wallpaper manager for Linux"; @@ -53,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ kranzes ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index a0ad2ab676dbb..631ee1843d2c0 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... }: callPackage ./generic.nix { - version = "5.2.3"; + version = "5.2.6"; kde-channel = "stable"; - hash = "sha256-RmpG7bk8PjetZSB8+WAjSJCnJ0Tg9E8shV3kx9iCXMA="; + hash = "sha256-SNcShVT99LTpLFSuMbUq95IfR6jabOyqBnRKu/yC1fs="; } diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 308538f5d691d..18f4e8de7fed4 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { downloadPage = "https://github.com/bgrabitmap/lazpaint/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ aleksana ]; mainProgram = "lazpaint"; }; } diff --git a/pkgs/applications/graphics/lorien/default.nix b/pkgs/applications/graphics/lorien/default.nix index 8105e3682b591..1f86c6dd2ed07 100644 --- a/pkgs/applications/graphics/lorien/default.nix +++ b/pkgs/applications/graphics/lorien/default.nix @@ -27,8 +27,8 @@ let preset = - if stdenv.isLinux then "Linux/X11" - else if stdenv.isDarwin then "Mac OSX" + if stdenv.hostPlatform.isLinux then "Linux/X11" + else if stdenv.hostPlatform.isDarwin then "Mac OSX" else throw "unsupported platform"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index af6dffd249393..d66f4a5044641 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.31-1"; + version = "2.32"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "sha256-nyIFvFe86C2ciBDSNWn1yrBYTCm1dR7sZ5RFGoTPqvQ="; + sha256 = "sha256-amNNRuuk7qtcyXUVLEW71yEETExgKw48HeQQyxbi8BE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index 8d965fe7b1298..e8ae4e7f25558 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -25,11 +25,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0="; nativeBuildInputs = [ installShellFiles ] - ++ lib.optional stdenv.isLinux pkg-config; + ++ lib.optional stdenv.hostPlatform.isLinux pkg-config; buildInputs = lib.optional withSixel libsixel - ++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ]) - ++ lib.optional stdenv.isDarwin AppKit; + ++ lib.optionals stdenv.hostPlatform.isLinux (with xorg; [ libX11 libXrandr ]) + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; buildNoDefaultFeatures = !withSki; buildFeatures = lib.optional withSixel "sixel"; diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index c6f2b188770c4..f2c7aa843dbcd 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl fontconfig - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL libX11 libXcursor @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { libxkbcommon wayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Minimalistic crossplatform image viewer written in Rust"; homepage = "https://github.com/woelper/oculante"; changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md"; diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 363114fdaafbd..a02ae20d9f036 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -25,13 +25,13 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "openboard"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "OpenBoard-org"; repo = "OpenBoard"; rev = "v${finalAttrs.version}"; - hash = "sha256-OSAogtZoMisyRziv63ag9w8HQaaRdz0J28jQZR7cTMM="; + hash = "sha256-gXxxlAEuzMCvFu5oSQayNW191XAC/YKvldItYEFxvNM="; }; patches = [ @@ -52,9 +52,14 @@ in stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace OpenBoard.pro \ - --replace '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ - --replace '-lquazip5' '-lquazip1-qt5' \ - --replace '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' + --replace-fail '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ + --replace-fail '-lquazip5' '-lquazip1-qt5' \ + --replace-fail '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' + + substituteInPlace resources/etc/OpenBoard.config \ + --replace-fail 'EnableAutomaticSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ + --replace-fail 'EnableSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ + --replace-fail 'HideCheckForSoftwareUpdate=false' 'HideCheckForSoftwareUpdate=true' ''; nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 9b29f6ddc94d8..26e19eec33f8d 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -26,7 +26,7 @@ , mkDerivation , qtmacextras , qmake -, spacenavSupport ? stdenv.isLinux, libspnav +, spacenavSupport ? stdenv.hostPlatform.isLinux, libspnav , wayland , wayland-protocols , wrapGAppsHook3 @@ -66,8 +66,8 @@ mkDerivation rec { eigen boost glew opencsg cgal_4 mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig qtbase qtmultimedia qscintilla cairo - ] ++ lib.optionals stdenv.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ] - ++ lib.optional stdenv.isDarwin qtmacextras + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ] + ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras ++ lib.optional spacenavSupport libspnav ; @@ -88,7 +88,7 @@ mkDerivation rec { make objects/parser.cxx ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications rmdir $out/bin || true diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index 3af9566c375fa..710460054586c 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -48,7 +48,7 @@ mkDerivation rec { qtbase qtsvg qttools - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoDecodeAcceleration ]; @@ -58,6 +58,6 @@ mkDerivation rec { homepage = "https://ovito.org"; license = with licenses; [ gpl3Only mit ]; maintainers = with maintainers; [ twhitehead ]; - broken = stdenv.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=... + broken = stdenv.hostPlatform.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=... }; } diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index c7e7b7d07f5e7..494fd093ac4ad 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { libjpeg libpng libtiff - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Carbon ]; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index d8ca4fbcabf10..5d3e2d6abcc2e 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - hash = "sha256-E1D2DvwwrtlY06kvCZkoAO5VcdtkBJYLcxuqGsulFUA="; + hash = "sha256-NrR7qjVlac4on3pUde6Au8xlnU0wxWrRRh4QdviNPt4="; # Apparently upstream requires that the compiled executable will know the # commit hash and the date of the commit. This information is also presented # in the output of `pdfcpu version` which we use as a sanity check in the @@ -31,7 +31,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-4k4aZnQ9SjcGr/ziCacfcVfVk7w4Qhli2rOeYE76Qs0="; + vendorHash = "sha256-EGQd2hMf3eWswQ6a2GMqbkf7bE8HVMEqjY6fmWNHmBo="; ldflags = [ "-s" diff --git a/pkgs/applications/graphics/pureref/default.nix b/pkgs/applications/graphics/pureref/default.nix index 2e355ee376147..3d54b41290f77 100644 --- a/pkgs/applications/graphics/pureref/default.nix +++ b/pkgs/applications/graphics/pureref/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType1 rec { pname = "pureref"; - version = "2.0.2"; + version = "2.0.3"; src = runCommand "PureRef-${version}_x64.Appimage" { nativeBuildInputs = [ curl gnugrep cacert ]; - outputHash = "sha256-dCiQlYtjIkh/3x3Rt3Yzbn1KN7ip37Rxv1u8D9y+EMA="; + outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM="; } '' key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)" curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out diff --git a/pkgs/applications/graphics/pymeshlab/default.nix b/pkgs/applications/graphics/pymeshlab/default.nix index 255b14f09211e..4a4653b452272 100644 --- a/pkgs/applications/graphics/pymeshlab/default.nix +++ b/pkgs/applications/graphics/pymeshlab/default.nix @@ -88,12 +88,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/meshlab/src/external/ssynth.cmake \ --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \ --replace-warn "MD5 ''${SSYNTH_MD5}" "" - export cmakeFlags="cmakeFlags - -DCMAKE_INSTALL_PREFIX=$out/${python3Packages.python.sitePackages}/pymeshlab - " ''; cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python3Packages.python.sitePackages}/pymeshlab" "-DVCGDIR=${vcg.src}" ]; diff --git a/pkgs/applications/graphics/qosmic/default.nix b/pkgs/applications/graphics/qosmic/default.nix index ebee900cf9d6a..eab80b018ccc8 100644 --- a/pkgs/applications/graphics/qosmic/default.nix +++ b/pkgs/applications/graphics/qosmic/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace qosmic.pro \ --replace "/share" "/Applications/qosmic.app/Contents/Resources" \ --replace "/qosmic/scripts" "/scripts" \ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "CONFIG+=link_pkgconfig" ]; - preInstall = lib.optionalString stdenv.isDarwin '' + preInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv qosmic.app $out/Applications ''; diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix index e7c6def43b91f..ef4e17fcce812 100644 --- a/pkgs/applications/graphics/qvge/default.nix +++ b/pkgs/applications/graphics/qvge/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapQtAppsHook qmake ]; - buildInputs = if stdenv.isDarwin then [ qtsvg ] else [ qtx11extras ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ qtsvg ] else [ qtx11extras ]; meta = with lib; { description = "Qt Visual Graph Editor"; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 14c3a0dc7ef2d..deb45b06d19f1 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,9 +1,17 @@ { lib , stdenv , fetchFromGitHub -, fetchurl , cmake , pkg-config +, util-linux +, libselinux +, libsepol +, lerc +, libthai +, libdatrie +, libxkbcommon +, libepoxy +, libXtst , wrapGAppsHook3 , makeWrapper , pixman @@ -15,37 +23,31 @@ , libiptcdata , fftw , expat -, pcre +, pcre2 , libsigcxx , lensfun , librsvg , libcanberra-gtk3 , gtk-mac-integration , exiv2 +, libraw + , libjxl }: stdenv.mkDerivation rec { pname = "rawtherapee"; - version = "5.10"; + version = "5.11"; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - hash = "sha256-rIwwKNm7l7oPEt95sHyRj4aF3mtnvM4KAu8oVaIMwyE="; + hash = "sha256-jIAbguwF2aqRTk72ro5oHNTawA7biPSFC41YHgRR730="; # The developpers ask not to use the tarball from Github releases, see # https://www.rawtherapee.com/downloads/5.10/#news-relevant-to-package-maintainers forceFetchGit = true; }; - # https://github.com/Beep6581/RawTherapee/issues/7074 - patches = [ - (fetchurl { - url = "https://github.com/Beep6581/RawTherapee/commit/6b9f45c69c1ddfc3607d3d9c1206dcf1def30295.diff"; - hash = "sha256-3Rti9HV8N1ueUm5B9qxEZL7Lb9bBb+iy2AGKMpJ9YOM="; - }) - ]; - postPatch = '' echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \ @@ -56,11 +58,20 @@ stdenv.mkDerivation rec { cmake pkg-config wrapGAppsHook3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; buildInputs = [ + util-linux + libselinux + libsepol + lerc + libthai + libdatrie + libxkbcommon + libepoxy + libXtst pixman libpthreadstubs gtkmm3 @@ -70,21 +81,25 @@ stdenv.mkDerivation rec { libiptcdata fftw expat - pcre + pcre2 libsigcxx lensfun librsvg exiv2 - ] ++ lib.optionals stdenv.isLinux [ + libraw + libjxl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcanberra-gtk3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gtk-mac-integration ]; cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" "-DCACHE_NAME_SUFFIX=\"\"" - ] ++ lib.optionals stdenv.isDarwin [ + "-DWITH_SYSTEM_LIBRAW=\"ON\"" + "-DWITH_JXL=\"ON\"" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; @@ -95,7 +110,7 @@ stdenv.mkDerivation rec { ]; env.CXXFLAGS = "-include cstdint"; # needed at least with gcc13 on aarch64-linux - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications/RawTherapee.app $out/bin cp -R Release $out/Applications/RawTherapee.app/Contents for f in $out/Applications/RawTherapee.app/Contents/MacOS/*; do diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix index 5b7162299952f..943f46fab649c 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = lib.optionals stdenv.isLinux + buildInputs = lib.optionals stdenv.hostPlatform.isLinux (with xorg; [ # glfw-sys dependencies: libX11 libXrandr libXinerama libXcursor libXi libXext @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { # FIXME: GLFW (X11) requires DISPLAY env variable for all tests doCheck = false; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/applications cp $src/rx.desktop $out/share/applications wrapProgram $out/bin/rx --prefix LD_LIBRARY_PATH : ${libGL}/lib diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index ece80ef18a5be..f4c516ef56981 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -2,7 +2,7 @@ let myPatchElf = file: '' patchelf --set-interpreter \ - ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.hostPlatform.is64bit "-x86-64"}.so.2 \ ${file} ''; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { mkdir -p $out/$PATH_TO_BRSCAN4 cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4 mkdir -p $out/lib/sane - cp -rp usr/lib${lib.optionalString stdenv.is64bit "64"}/sane/* $out/lib/sane + cp -rp usr/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/sane/* $out/lib/sane # Symbolic links were absolute. Fix them so that they point to $out. pushd "$out/lib/sane" > /dev/null diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index b816eb71d27c1..91be20f3abbce 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -2,7 +2,7 @@ let myPatchElf = file: '' patchelf --set-interpreter \ - ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.hostPlatform.is64bit "-x86-64"}.so.2 \ ${file} ''; system = stdenv.hostPlatform.system; diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 1581b2f5b7b24..55fbc9a3616a7 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { libxml2 poppler gawk - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libieee1284 libv4l net-snmp diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index aaacfc3298587..eb6c6839bc5b1 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.8"; + version = "0.32.9"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-RwY8AXnl2A9TQ3PcVg4c6Ad6rdWE7u8GxSOkYOL5KcM="; + sha256 = "sha256-EjKjPcnBftI6oA2P8lUA5xC73JiZ1VtEFbaLdCnlYOs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/symbolic-preview/default.nix b/pkgs/applications/graphics/symbolic-preview/default.nix index 5d8ef439f0130..46f654b95600e 100644 --- a/pkgs/applications/graphics/symbolic-preview/default.nix +++ b/pkgs/applications/graphics/symbolic-preview/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 3c83be5119764..e19da3fa15fe0 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -99,7 +99,7 @@ let fribidi openexr fftw - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; }; diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index 16899aea978b9..a8563a09e4c09 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { icu pango opencl-headers - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index 6ab953020c607..a0c663ca9cffe 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "1.27"; + version = "1.28"; src = fetchFromGitHub { owner = "Tom94"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-+qCRHP0AbYOQBAE4zK2cmWPHZGWjjxC3DZPNm8sgBzs="; + hash = "sha256-bgum8UIv0hTcIacjQsL7nc/2AbhjW5Zhq+LFkIWmDu8="; }; nativeBuildInputs = [ cmake wrapGAppsHook3 ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Tom94/tev/releases/tag/v${version}"; license = licenses.bsd3; platforms = platforms.unix; - broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247 + broken = stdenv.hostPlatform.isDarwin; # needs apple frameworks + SDK fix? see #205247 maintainers = [ ]; }; } diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index ff6f30b6c5e9c..b64f136629edd 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { homepage = "https://unigine.com/products/benchmarks/valley/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf - maintainers = [ lib.maintainers.kierdavis ]; + maintainers = [ ]; platforms = [ "x86_64-linux" "i686-linux" ]; mainProgram = "valley"; }; diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 4470ccfec421e..be14ad6c63e9b 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -67,12 +67,12 @@ stdenv.mkDerivation (finalAttrs: { lzfse SDL2 SDL2_mixer - ] ++ lib.optional stdenv.isLinux wayland-protocols - ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices OpenCL ] - ++ lib.optional (!stdenv.isDarwin) opencl-headers; + ] ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreServices OpenCL ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers; cmakeFlags = - lib.optional stdenv.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; + lib.optional stdenv.hostPlatform.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; # error: "The plain signature for target_link_libraries has already been used" doCheck = false; @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { # one. # This is not needed on darwin, since on that platform data files are saved # in *.app/Contents/Resources/ too, and are picked up automatically. - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' for prog in $out/bin/*; do wrapProgram "$prog" \ --set CORE_PATH $out/share/$(basename "$prog")/ @@ -113,6 +113,6 @@ stdenv.mkDerivation (finalAttrs: { license = [ licenses.mit licenses.cc-by-sa-30 ]; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/graphics/vimiv-qt/default.nix b/pkgs/applications/graphics/vimiv-qt/default.nix index 83bbbecdc65ba..75a0b88fba4e4 100644 --- a/pkgs/applications/graphics/vimiv-qt/default.nix +++ b/pkgs/applications/graphics/vimiv-qt/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pyqt5 py3exiv2 ]; - buildInputs = [ qt5.qtsvg ] ++ lib.optionals stdenv.isLinux [ qt5.qtwayland ]; + buildInputs = [ qt5.qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ]; postInstall = '' install -Dm644 misc/vimiv.desktop $out/share/applications/vimiv.desktop diff --git a/pkgs/applications/graphics/vpv/default.nix b/pkgs/applications/graphics/vpv/default.nix index 1bbdbd4a35e7a..7f80ff24a3ce1 100644 --- a/pkgs/applications/graphics/vpv/default.nix +++ b/pkgs/applications/graphics/vpv/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Image viewer for image processing experts"; maintainers = [ lib.maintainers.kidanger ]; license = lib.licenses.gpl3; - broken = stdenv.isDarwin; # the CMake expects the SDL2::SDL2main target for darwin + broken = stdenv.hostPlatform.isDarwin; # the CMake expects the SDL2::SDL2main target for darwin mainProgram = "vpv"; }; }) diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 36647a62aef23..61b40006b3865 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ffmpeg x264 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Carbon Cocoa VideoToolbox - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus libva gst_all_1.gst-plugins-base @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage rec { git typescript makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config autoconf libtool @@ -88,7 +88,7 @@ rustPlatform.buildRustPackage rec { gst_all_1.gst-plugins-base pipewire ]; - in lib.optionalString stdenv.isLinux '' + in lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH} ''; @@ -97,7 +97,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Use your tablet as graphic tablet/touch screen on your computer"; mainProgram = "weylus"; homepage = "https://github.com/H-M-H/Weylus"; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 3527f96bf5b9e..921fef456289c 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook3 ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] ++ [ glib diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/applications/graphics/xpano/default.nix index 01501e9757efd..35df09c2032ca 100644 --- a/pkgs/applications/graphics/xpano/default.nix +++ b/pkgs/applications/graphics/xpano/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xpano"; - version = "0.19.0"; + version = "0.19.2"; src = fetchFromGitHub { owner = "krupkat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cb6BJg0wdfhqEFLbQ27NpjJU/cc4SZSk94UHzJfzn5U="; + sha256 = "sha256-CgUiZHjWQSoAam2Itan3Zadt8+w6j9W5KGMZ5f6bHiQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/xv/default.nix b/pkgs/applications/graphics/xv/default.nix index bb68b81024938..86103e75067cd 100644 --- a/pkgs/applications/graphics/xv/default.nix +++ b/pkgs/applications/graphics/xv/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "xv"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "jasper-software"; repo = "xv"; rev = "v${version}"; - sha256 = "sha256-KPX/HA9CUaRaIHkcFcM+oo3UasEQfZgmZwi6e/pbFuE="; + sha256 = "sha256-IFbR/1oksRkpJvvu+7TwLFtDujuAmV+sX8Njn6gpgBg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/kde/falkon.nix b/pkgs/applications/kde/falkon.nix index b24375e750055..85c4d113fb139 100644 --- a/pkgs/applications/kde/falkon.nix +++ b/pkgs/applications/kde/falkon.nix @@ -20,7 +20,7 @@ mkDerivation rec { libpthreadstubs libxcb libXdmcp qtsvg qttools qtwebengine qtx11extras kwallet kpurpose karchive kio - ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/kde/keysmith.nix b/pkgs/applications/kde/keysmith.nix index 6dd8e3505b537..08327151b580a 100644 --- a/pkgs/applications/kde/keysmith.nix +++ b/pkgs/applications/kde/keysmith.nix @@ -7,6 +7,7 @@ , kdbusaddons , ki18n , kirigami2 +, kirigami-addons , kwindowsystem , libsodium , qtquickcontrols2 @@ -24,6 +25,7 @@ mkDerivation rec { kdbusaddons ki18n kirigami2 + kirigami-addons kwindowsystem libsodium qtquickcontrols2 diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/applications/logging/sosreport/default.nix index 6a5e3f8781fa3..2e8e7e4d1f78e 100644 --- a/pkgs/applications/logging/sosreport/default.nix +++ b/pkgs/applications/logging/sosreport/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sosreport"; - version = "4.7.2"; + version = "4.8.0"; src = fetchFromGitHub { owner = "sosreport"; repo = "sos"; rev = "refs/tags/${version}"; - sha256 = "sha256-67YRmD3kaJbRR7g3w57EwFg7duhcI6zov7gQ4H1MkR8="; + sha256 = "sha256-8laOHFBvlSo70filTd84vMiivcZ9hE8rgFThVVrMwtE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 9d9a9fd4eb603..cecb229ce13f2 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -10,43 +10,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.36" else "8.10.38-13.BETA"; + version = if channel == "stable" then "8.10.40" else "8.10.44-21.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-yUSU0np6li5zLfFOnebpv0+s1UQ6BdgI+28OvcxS3H8="; + hash = "sha256-viY0SOUhrOvmue6Nolau356rIqwDo2nLzMilFFmNb9g="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-KG0PJ/gwBd9+qYyraRqS/D58Y58VwLd8yCnYzPVWQAY="; + hash = "sha256-7lUZiS3TSsIVqPoN5A6YqyVaaaRI9BliT51FHkwOPyw="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-vYhmA9N1izPRo3HPDouOpjJzMwK7LkCHuyYxBGkIPKM="; + hash = "sha256-xK/B8J3VP8y1xw3KorzZzPf/LjYmYdOIjDECMJnVv6I="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-v1eCh/cOpA5XcmamAqreKHRQ+waoBQtvvmNO4wvFq6A="; + hash = "sha256-iqdK6K7dcypZFGseYal2KjOaqJtUjXeCzbDdx7pDv8A="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-SeB1Em2WuYvslBv//TROYTAB1asYFhC22IwhcwGi+Qs="; + hash = "sha256-enorJfbn+xJVy1fG3wjhO3LkSsMncHA9/yA13kG+h4Y="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-Ik5gL5FCxNANOKx/MSH7dCz3XEdLr7jxykaWhMQKUVw="; + hash = "sha256-EUnIIi6DB5kBVid9ExBpNApKItHnRKQziBy/GFt0xag="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-8cNxhRAOrn/A++APOMUxwrD3+a++ksRMzlmmnQ8J8/c="; + hash = "sha256-U14CjoUJUpd4wWidZz6xGErhHI/VPChqG8cwBTBYoYc="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-YkZbuCFvWHksLQYKJ3LQD2YDXj9qwHF4Gg8JbxBZsuc="; + hash = "sha256-DD1M2EFSHqG9OHX5Q/CmZLZIKYrBMS4cnX/6tLVi7H0="; }; }; }; @@ -61,7 +61,7 @@ let meta = { # Requires to be installed in "/Application" which is not possible for now (https://github.com/NixOS/nixpkgs/issues/254944) - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Multi-platform password manager"; homepage = "https://1password.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; @@ -76,7 +76,7 @@ let }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 9ecc38a9abbbc..cbc05d27b8780 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation { else throw "Source for ${pname} is not available for ${system}"; - nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux autoPatchelfHook; + nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ xar cpio ]; - unpackPhase = lib.optionalString stdenv.isDarwin '' + unpackPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' xar -xf $src zcat op.pkg/Payload | cpio -i ''; @@ -55,7 +55,7 @@ stdenv.mkDerivation { --zsh <($out/bin/${mainProgram} completion zsh) ''; - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; doInstallCheck = true; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index bc2b92843c36f..efeb82110cf0d 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.0.4.4"; + version = "6.0.6.4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-5jV+EJDZ90qtYF8w7RW8jGiy36nPYsLfoOVM35ilVvw="; + hash = "sha256-U4RApOUtrZ9su4O1jamjDbVrjozujW+vYRI1R7rSzpc="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; @@ -27,22 +27,28 @@ buildDotnetModule rec { projectFile = "ArchiSteamFarm.sln"; executable = "ArchiSteamFarm"; + + enableParallelBuilding = false; + + useAppHost = false; dotnetFlags = [ + # useAppHost doesn't explicitly disable this "-p:UseAppHost=false" - ]; - dotnetInstallFlags = [ + "-p:RuntimeIdentifiers=" + ] + ; + dotnetBuildFlags = [ "--framework=net8.0" ]; + dotnetInstallFlags = dotnetBuildFlags; runtimeDeps = [ libkrb5 zlib openssl ]; doCheck = true; - preBuild = '' + preInstall = '' dotnetProjectFiles=(ArchiSteamFarm) - ''; - preInstall = '' # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors. makeWrapperArgs+=( --run 'mkdir -p ~/.config/archisteamfarm/{config,logs,plugins}' @@ -55,7 +61,7 @@ buildDotnetModule rec { echo "Publishing plugin $1" dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \ - -p:UseAppHost=false + $dotnetFlags $dotnetInstallFlags } buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 170e10fbeb01a..d33bed6722a47 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -4,7 +4,6 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; hash = "sha256-LvJDD+C/NiPLVjEnIWkR+39UkzoeWgPd7BBXakij0WU="; }) (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.4"; hash = "sha256-w3H3HtsEgG/qH5Zre5i2OAh5r+mDyNIjhfweJu9SDzM="; }) - (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; hash = "sha256-1DP9M4+Jzj1MEkz+qXLMLQC4YJCZqIuDlKMWlSF3lAY="; }) (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; hash = "sha256-58ukrKgmk9w5ZyuQU67KS3du4zvkfJ1MskKRL9L6M1o="; }) (fetchNuGet { pname = "Humanizer"; version = "3.0.0-beta.54"; hash = "sha256-QIQFZYsW58l1xi9iw5VyAzo9bCCAojHQKXi0+dMH86Y="; }) (fetchNuGet { pname = "Humanizer.Core"; version = "3.0.0-beta.54"; hash = "sha256-KQdtkJ1uqstncqPmvWNW/PwMenyw1bW54P9unDVtO0Y="; }) @@ -58,10 +57,11 @@ (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "3.0.0-beta.54"; hash = "sha256-fh4CRrhOAkuY89dtwHCkbclG8AxjizRQSJCLJvpRGyo="; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "3.0.0-beta.54"; hash = "sha256-0BXsdNBRWTqaloHdCCpVjAyU9IHz5FtweHjqvzpwW4Q="; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "3.0.0-beta.54"; hash = "sha256-lemSDWy2Jz6gg8+ObqC3uyw846yghzmVUeakNZj7prg="; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; hash = "sha256-/Eykez68qYMO5mlmUelzAke8aJehyp8fspO5Z+yt5G4="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2024.2.0"; hash = "sha256-OgtW4wIqo5d3q6NSiYrUm4KkUdUHEWFyvlbtoQJjDwU="; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; hash = "sha256-hYyyZz0iETAE2HydbyudPdoOUi6wHQRG0BjuS87Tnl0="; }) (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; hash = "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ResxSourceGenerator"; version = "3.11.0-beta1.24324.1"; hash = "sha256-+YEdFt4em1e8SMC3PnRAwOfyMZLwWPJo7/loTt7l9kQ="; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) @@ -78,54 +78,49 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.2"; hash = "sha256-Ipd8+JFpj44vqouRGO8YvxzVyjKOeFXczTeKguxdcgs="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.2"; hash = "sha256-lHzkMQIlbSwmetyGLbtuptHZP+HgG8n2aLtBDqDr1S4="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.2"; hash = "sha256-hNIbOZ6leANvh+i1I2ZXS35+yXUmhTlyomkA8PbF++w="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.2"; hash = "sha256-P0lN2+Die2ftnJh43A3X3CR207vvzfCCJjlow6yweVs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.0.2"; hash = "sha256-j37WWYrYgINKVn5eWhytGad7k2GwQPCemumJXU7cHsw="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.0.2"; hash = "sha256-siKloYOZKBRV//apM/O+A+KwhAWTZ0ZnnCI7Pq+pxMs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.0.2"; hash = "sha256-Ref5E5JXHXDAdog/Yix25fsYO7R4eCHP8L/GIJz70p8="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.0.2"; hash = "sha256-VM5Tw4lS1XxVajmA8PB4yn8J+Abi388U//5//0aNOHo="; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; hash = "sha256-/KshvKuql1A7zI1kTseWEYsOVMyOWZDXlFfKr0fz0Kg="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; hash = "sha256-YciAKvo1VBDoqGohABY2uD+Tt7wxpSqICV6ytEBNYKQ="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; hash = "sha256-vcf+MYu9Rp/Xpy1cA/azVz1KAkMgNrekD+LZX85Anq4="; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; hash = "sha256-ExXw+kScOwZsRDos3Myvh53yazGTGtjrtn2H1XbFi34="; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; hash = "sha256-B0AGaqwtuoT9DxXDvkR0bwEvVzSd67+vGZAgBm0nxxw="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.3.2"; hash = "sha256-q6ZGafMpM3HunHtjVATcIa+gPUM1ef4y3Do8Syf2pa4="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.3.2"; hash = "sha256-0+O40vygEoX0K2NDMSv1zFB4H10su0FAA1QTqzi1KcA="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.3.2"; hash = "sha256-H8dK/+S39mXZWnM9dB0CQhu23vQD9JRAaHivnutUDEY="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.3.2"; hash = "sha256-1H34nSpdSL+P91F5Ynjr8590eNFcm+1Rp27vYclx2Xc="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.3.2"; hash = "sha256-1SVTVvrFqStKoxuQSqaKBuKp+qDHZkCTpIECPuEEdQI="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; hash = "sha256-mj5UH+aqVk7f3Uu0+L47aqZUudJNCx3Lk7cbP4fzcmI="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) - (fetchNuGet { pname = "MSTest"; version = "3.4.3"; hash = "sha256-FkjZdIm9j/nfEy+sZRHs9M1g03+QJTWEva23L1TdChw="; }) - (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; hash = "sha256-sd+DFcORXa5ToA+n7p8isy4niOCd4mH4Sk5tRuDPRpE="; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; hash = "sha256-uOhEZp71KV0DFfkD4fMhy9zEggPBvzof1GZ5Z5ulWkM="; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; hash = "sha256-d3fTMQese3ld1WTw0v6MGczgdSnE28/UaM2E7T59cUM="; }) + (fetchNuGet { pname = "MSTest"; version = "3.5.2"; hash = "sha256-BZLyxq2WtJL338s9cIVlpodvVInsrjZ6L7vYalIFk5Y="; }) + (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.5.2"; hash = "sha256-Jwmtm/+yk8DoPnjOqauDXknVtmVzsrmqJwZuP6QfHvw="; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.5.2"; hash = "sha256-tbKREqe9w5Tkhib4AfWR9vB7DYLmvAjEov8UM2D2gA0="; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.5.2"; hash = "sha256-ZudwTMNhxbxehLz9hCOgrhTzegVs4P6avUpFiez+u10="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; hash = "sha256-NHMnIBkGzzuoZL0qHKAwFC35doB08IDvmCQptC2uu2s="; }) (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; hash = "sha256-W5jxZZ0pbPHte6TkWTq4FDtHOejvlrdyb1Inw+Yhl4c="; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; hash = "sha256-6Pmz6XQ+rY32O21Z3cUDVQsLH+i53LId18UCPTAxRZQ="; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; hash = "sha256-FKDLUWysqroSHLU2kLjK1m0g417AAPh6n2TIkwiapcM="; }) - (fetchNuGet { pname = "NLog"; version = "5.3.2"; hash = "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc="; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; hash = "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g="; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; hash = "sha256-6bMYbKyNWtb0tn8k3418mWBuogofIAfwT9NHSopUu58="; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; hash = "sha256-N7EgFENnCZdJVhV1TOjl6R7CImPb3SMcIvP63MfFJng="; }) + (fetchNuGet { pname = "NLog"; version = "5.3.3"; hash = "sha256-M6IbNKj4cUplxS7vi54m2SZe4bQdmMusDTMmsjqmZKg="; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.12"; hash = "sha256-KAqPPDIXrqM85yb1TfhqHUhBYrHug/bOlrEepV+0BEc="; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.12"; hash = "sha256-ZnPQeBLrGkP4EqfoJtDjJuuPqCZW5AMv/3XJaB0o0L0="; }) (fetchNuGet { pname = "OpenTelemetry"; version = "1.9.0"; hash = "sha256-QVV6ecnVk73bvi4Lw1RnTsaEUH/6CT0/zIJkYdg6CGg="; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; hash = "sha256-gl4I7GGJbe2HblOLIznTVxmEOm5SV6UyX+DVmKXcCcQ="; }) (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.9.0"; hash = "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4="; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; hash = "sha256-/JlVHQeer2Vxmv7kWXK1Wc7Ihjqdjb+hEoiYxxIW3qs="; }) (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.9.0"; hash = "sha256-Yy3EcKBW7XH7nhLcvwQB0NIfxiGChuy6UPc7MJpxEbE="; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; hash = "sha256-yIUPHCmDcuPsrE1fV5ij6G5ACdUL7M0rrvd6dOSy55w="; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.9.0-beta.2"; hash = "sha256-zV4sKZ3v2uSPPy0HLbAE6XwGt6r8R5UVdFJ/tVDiKWg="; }) (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.9.0"; hash = "sha256-vvIrTeDGzgz8dI7/SkLL0ZrV+9u3e9uhvW6VVdsd6Ps="; }) (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.9.0"; hash = "sha256-XYqa7kV4rhHPCgHsjQtMvyKCemW1OvQd/23QhjquYR4="; }) (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.9.0"; hash = "sha256-y/UbDt6n6heD+ayzv0xPurXLFNL+eSldwqoyGpvCg7o="; }) (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.9.0"; hash = "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk="; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; hash = "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; hash = "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="; }) - (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-alpha.1"; hash = "sha256-iCJc3MjuD7QoF5mUy0ROSgfosUvPaZjUgrNhd9dcmQY="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; hash = "sha256-kKz+NiXNfmrvrtbzsqnW1ItflNib3rymr3rf9yI5B1M="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; hash = "sha256-iL7TcRFy7g6EB8usWALwdOEaiqLsD0b+RXkepHk43+o="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; hash = "sha256-ED24tUcwiOkAIMQVQeQFths296yf3lL/Z1sVizQTEHA="; }) + (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.2"; hash = "sha256-aQ1zMyWPOvGFcDYYscn/qTpnWS4HfK/k1NLk37zeVAE="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.7.2"; hash = "sha256-clFYZAy7v6mbWr1a+yy0BVbqoQGlqDvzXGlVMXzqg9s="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.7.2"; hash = "sha256-tBsLIRSWAknFWvNu524sSFmOB4aIKuYX9I3Wp9AHxwE="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.7.2"; hash = "sha256-cH+/13iri7PMxlymzLUT+YEoJKxlXNNK56x8oQAkuAs="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.7.2"; hash = "sha256-EzHxMjlwAsyNOFdHZTiQ7Wk6ZEWpRJqwoQGSe/eFoJE="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.7.2"; hash = "sha256-4+aBYecxcA/Et8sAxoJ2+e86WO7s3rYT6xd9MOaQIxQ="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index b1da7708bfe96..8231e831b4fe7 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "3ae4df4206a3f5fbbe582403403df848fd29847f"; + version = "1641151b9f430908bc63bbe9927fa8414538e7f1"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -10,10 +10,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-81PESllqRmtfdYFda1fBRZMczlWQq2xSPWELIOIpi3s="; + hash = "sha256-0qfX0vHaDY4Mv9N6nXcn2/9DgRAAl07c8eNHBC3rX6I="; }; - npmDepsHash = "sha256-OIkT5XMWcVRbCemaC+hkHkZACCzNedJKHLvGmNXEye4="; + npmDepsHash = "sha256-/DRkzwU32RgXR+58MrD2KbxF55nJJxnMAnU3kafqtXg="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/applications/misc/OSCAR/default.nix deleted file mode 100644 index fab17cb0737dc..0000000000000 --- a/pkgs/applications/misc/OSCAR/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: -mkDerivation rec { - pname = "OSCAR"; - version = "1.5.1"; - - src = fetchFromGitLab { - owner = "pholy"; - repo = "OSCAR-code"; - rev = "v${version}"; - hash = "sha256-FBHbPtMZeIgcR1pQflfEWK2FS8bquctXaeY/yaZofHg="; - }; - - buildInputs = [ qtbase qttools qtserialport libGLU ]; - nativeBuildInputs = [ qmake ]; - postPatch = '' - substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}" - ''; - - qmakeFlags = [ "OSCAR_QT.pro" ]; - - installPhase = '' - runHook preInstall - install -d $out/bin - install -d $out/share/OSCAR/Help - install -d $out/share/OSCAR/Html - install -d $out/share/OSCAR/Translations - install -d $out/share/icons/OSCAR - install -d $out/share/applications - install -T oscar/OSCAR $out/bin/OSCAR - # help browser was removed 'temporarily' in https://gitlab.com/pholy/OSCAR-code/-/commit/57c3e4c33ccdd2d0eddedbc24c0e4f2969da3841 - # install oscar/Help/* $out/share/OSCAR/Help - install oscar/Html/* $out/share/OSCAR/Html - install oscar/Translations/* $out/share/OSCAR/Translations - install -T Building/Linux/OSCAR.png $out/share/icons/OSCAR/OSCAR.png - install -T Building/Linux/OSCAR.desktop $out/share/applications/OSCAR.desktop - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://www.sleepfiles.com/OSCAR/"; - description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea"; - mainProgram = "OSCAR"; - license = licenses.gpl3Only; - maintainers = [ maintainers.roconnor ]; - # Someone needs to create a suitable installPhase for Darwin and Windows. - # See https://gitlab.com/pholy/OSCAR-code/-/tree/master/Building. - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix deleted file mode 100644 index dd49357c604a2..0000000000000 --- a/pkgs/applications/misc/albert/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - libqalculate, - muparser, - libarchive, - python3Packages, - qtbase, - qtscxml, - qtsvg, - qtdeclarative, - qtwayland, - qt5compat, - qttools, - wrapQtAppsHook, - nix-update-script, - pkg-config, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "albert"; - version = "0.26.2"; - - src = fetchFromGitHub { - owner = "albertlauncher"; - repo = "albert"; - rev = "v${finalAttrs.version}"; - hash = "sha256-jgSa1IvpMlwtpNT/SEysG28qaszV7gH6ZSqGrHQ/EC0="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ]; - - buildInputs = - [ - libqalculate - libarchive - muparser - qtbase - qtscxml - qtsvg - qtdeclarative - qtwayland - qt5compat - qttools - ] - ++ (with python3Packages; [ - python - pybind11 - ]); - - postPatch = '' - find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \; - - substituteInPlace src/app/qtpluginprovider.cpp \ - --replace-fail "QStringList install_paths;" "QStringList install_paths;${"\n"}install_paths << QFileInfo(\"$out/lib\").canonicalFilePath();" - ''; - - postFixup = '' - for i in $out/{bin/.albert-wrapped,lib/albert/plugins/*.so}; do - patchelf $i --add-rpath $out/lib/albert - done - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - description = "Fast and flexible keyboard launcher"; - longDescription = '' - Albert is a desktop agnostic launcher. Its goals are usability and beauty, - performance and extensibility. It is written in C++ and based on the Qt - framework. - ''; - homepage = "https://albertlauncher.github.io"; - changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - # See: https://github.com/NixOS/nixpkgs/issues/279226 - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ - ericsagnes - synthetica - eljamm - ]; - mainProgram = "albert"; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/misc/anup/default.nix b/pkgs/applications/misc/anup/default.nix index 91cf5c9540a5b..a72ba17eb6b4a 100644 --- a/pkgs/applications/misc/anup/default.nix +++ b/pkgs/applications/misc/anup/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite xdg-utils - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index 30911d6380fe9..598ad82c1e35f 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, swiProlog, makeWrapper, +{ lib, stdenv, swi-prolog, makeWrapper, fetchFromGitHub, lexiconPath ? "prolog/lexicon/clex_lexicon.pl", pname ? "ape", @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "2019-08-10"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ swiProlog ]; + buildInputs = [ swi-prolog ]; src = fetchFromGitHub { owner = "Attempto"; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 44e1f0992ad73..621fca6feb2d7 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -31,7 +31,7 @@ , enableAMR ? false , amrnb , amrwb -, enableLibpulseaudio ? stdenv.isLinux && lib.meta.availableOn stdenv.hostPlatform libpulseaudio +, enableLibpulseaudio ? stdenv.hostPlatform.isLinux && lib.meta.availableOn stdenv.hostPlatform libpulseaudio , libpulseaudio }: @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; buildInputs = - lib.optional (enableAlsa && stdenv.isLinux) alsa-lib + lib.optional (enableAlsa && stdenv.hostPlatform.isLinux) alsa-lib ++ lib.optional enableLibao libao ++ lib.optional enableLame lame ++ lib.optional enableLibmad libmad @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableWavpack wavpack ++ lib.optionals enableAMR [ amrnb amrwb ] ++ lib.optional enableLibpulseaudio libpulseaudio - ++ lib.optional stdenv.isDarwin CoreAudio; + ++ lib.optional stdenv.hostPlatform.isDarwin CoreAudio; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix index b621635444266..ab5cda688562e 100644 --- a/pkgs/applications/misc/ausweisapp/default.nix +++ b/pkgs/applications/misc/ausweisapp/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ausweisapp"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-YOsKAWc6z39OPzc4eWc/9RhRoOD+J5xHve4Low1UX+Q="; + hash = "sha256-+hkbtxw1Bj/lMgyf3OkwmRXyZL6CS3bTHUlGH9xxe/E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index af12e6b2f4b84..01dbf16f00781 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "avrdudess"; - version = "2.17"; + version = "2.18"; src = fetchurl { - url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.17/AVRDUDESS-2.17-portable.zip"; - sha256 = "sha256-TcXXGDs75Q2ew+m2B/p00Y24O5aJQlp+3FcAn7GSVyI="; + url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.18/AVRDUDESS-2.18-portable.zip"; + sha256 = "sha256-N93FLiXp1WwhI5KwH6sho2wyFtkbODwCHOpEVbVnYdc="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 70812441d3484..b1ff6eb0a2f58 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -42,7 +42,7 @@ webkitgtk, wxGTK31, xorg, - withSystemd ? stdenv.isLinux, + withSystemd ? stdenv.hostPlatform.isLinux, }: let opencascade-occt = opencascade-occt_7_6; diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 89a0d75fc2b5b..16f4c0bd2d6f9 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { buildInputs = [ aalib ncurses libmikmod xorg.libXau xorg.libXdmcp xorg.libX11 - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudio; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.CoreAudio; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e '/^#include <malloc.h>$/d' *.c ''; # error: 'regparm' is not valid on this platform - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-D__STRICT_ANSI__"; meta = with lib; { diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix deleted file mode 100644 index 1b7fde5d7de84..0000000000000 --- a/pkgs/applications/misc/bibletime/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, docbook_xml_dtd_45 -, pkg-config -, wrapQtAppsHook -, boost -, clucene_core_2 -, docbook_xsl_ns -, perlPackages -, qtbase -, qtsvg -, qttools -, sword -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "bibletime"; - version = "3.0.3"; - - src = fetchFromGitHub { - owner = "bibletime"; - repo = "bibletime"; - rev = "v${finalAttrs.version}"; - hash = "sha256-4O8F5/EyoJFJBEWOAs9lzN3TKuu/CEdKfPaOF8gNqps="; - }; - - nativeBuildInputs = [ - cmake - docbook_xml_dtd_45 - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - boost - clucene_core_2 - perlPackages.Po4a - qtbase - qtsvg - qttools - sword - ]; - - preConfigure = '' - export CLUCENE_HOME=${clucene_core_2}; - export SWORD_HOME=${sword}; - ''; - - cmakeFlags = [ - "-DBUILD_HOWTO_PDF=OFF" - "-DBUILD_HANDBOOK_PDF=OFF" - "-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl" - "-DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl" - ]; - - meta = with lib; { - homepage = "http://www.bibletime.info/"; - description = "Powerful cross platform Bible study tool"; - mainProgram = "bibletime"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/applications/misc/binocle/default.nix b/pkgs/applications/misc/binocle/default.nix index 92ccc4112993a..da77d6c693df7 100644 --- a/pkgs/applications/misc/binocle/default.nix +++ b/pkgs/applications/misc/binocle/default.nix @@ -31,11 +31,11 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreFoundation CoreGraphics CoreVideo Foundation Metal QuartzCore ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapProgram $out/bin/binocle \ --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with xorg; [ libX11 libXcursor libXi libXrandr ] ++ [ vulkan-loader ])} ''; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 25e9388307b6a..a2ac2a81c8b60 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -71,18 +71,25 @@ python3Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340 rocmPackages, # comes with a significantly larger closure size runCommand, - spaceNavSupport ? stdenv.isLinux, + spaceNavSupport ? stdenv.hostPlatform.isLinux, sse2neon, stdenv, tbb, wayland, wayland-protocols, - waylandSupport ? stdenv.isLinux, + wayland-scanner, + waylandSupport ? stdenv.hostPlatform.isLinux, zlib, zstd, }: let + embreeSupport = + (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; + openImageDenoiseSupport = + (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; + openUsdSupport = !stdenv.hostPlatform.isDarwin; + python3 = python3Packages.python; pyPkgsOpenusd = python3Packages.openusd.override { withOsl = false; }; @@ -100,18 +107,18 @@ in stdenv.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.2.1"; + version = "4.2.2"; srcs = [ (fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-+Y4JbzeK+30fO8WdEmvjOeQjm094ofsUhRFXs9mkcxI="; + hash = "sha256-wv9EwB4DXSVS5K+lb+7gU3pTrMDO/ELeV2eErivfsWU="; }) (fetchgit { name = "assets"; url = "https://projects.blender.org/blender/blender-assets.git"; - rev = "6864f1832e71a31e1e04f72bb7a5a1f53f0cd01c"; + rev = "v${finalAttrs.version}"; fetchLFS = true; hash = "sha256-vepK0inPMuleAJBSipwoI99nMBBiFaK/eSMHDetEtjY="; }) @@ -125,10 +132,10 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "source"; - patches = [ ./draco.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ ./draco.patch ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; postPatch = - (lib.optionalString stdenv.isDarwin '' + (lib.optionalString stdenv.hostPlatform.isDarwin '' : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ --replace-fail '${"$"}{LIBDIR}/python' \ @@ -149,6 +156,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ + "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX" "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" "-DPYTHON_LIBPATH=${python3}/lib" "-DPYTHON_LIBRARY=${python3.libPrefix}" @@ -156,23 +164,33 @@ stdenv.mkDerivation (finalAttrs: { "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python3.sitePackages}" "-DPYTHON_VERSION=${python3.pythonVersion}" "-DWITH_ALEMBIC=ON" + "-DWITH_BUILDINFO=OFF" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" + "-DWITH_CPU_CHECK=OFF" + "-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}" + "-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}" + "-DWITH_CYCLES_OSL=OFF" "-DWITH_FFTW3=ON" + "-DWITH_HYDRA=${if openUsdSupport then "ON" else "OFF"}" "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_INSTALL_PORTABLE=OFF" - "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX" + "-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}" + "-DWITH_LIBS_PRECOMPILED=OFF" "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" "-DWITH_OPENCOLORIO=ON" + "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}" "-DWITH_OPENSUBDIV=ON" "-DWITH_OPENVDB=ON" + "-DWITH_PULSEAUDIO=OFF" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" "-DWITH_SDL=OFF" + "-DWITH_STRICT_BUILD_OPTIONS=ON" "-DWITH_TBB=ON" - "-DWITH_USD=ON" + "-DWITH_USD=${if openUsdSupport then "ON" else "OFF"}" # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" @@ -184,21 +202,14 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF" "-DWITH_GHOST_WAYLAND_LIBDECOR=ON" ] - ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ - "-DWITH_CYCLES_EMBREE=OFF" - ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBDIR=/does-not-exist" - "-DWITH_CYCLES_OSL=OFF" # causes segfault on aarch64-darwin "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib" - "-DWITH_USD=OFF" # currently fails on darwin ] ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic" - ++ lib.optional jackaudioSupport "-DWITH_JACK=ON" ++ lib.optionals cudaSupport [ "-DOPTIX_ROOT_DIR=${optix}" "-DWITH_CYCLES_CUDA_BINARIES=ON" - "-DWITH_CYCLES_DEVICE_OPTIX=ON" ]; preConfigure = '' @@ -223,7 +234,10 @@ stdenv.mkDerivation (finalAttrs: { addDriverRunpath cudaPackages.cuda_nvcc ] - ++ lib.optionals waylandSupport [ pkg-config ]; + ++ lib.optionals waylandSupport [ + pkg-config + wayland-scanner + ]; buildInputs = [ @@ -260,12 +274,10 @@ stdenv.mkDerivation (finalAttrs: { zlib zstd ] - ++ lib.optionals (!stdenv.isAarch64 && stdenv.isLinux) [ - embree - (openimagedenoise.override { inherit cudaSupport; }) - ] + ++ lib.optional embreeSupport embree + ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; }) ++ ( - if (!stdenv.isDarwin) then + if (!stdenv.hostPlatform.isDarwin) then [ libGL libGLU @@ -276,7 +288,6 @@ stdenv.mkDerivation (finalAttrs: { libXxf86vm openal openxr-loader - pyPkgsOpenusd ] else [ @@ -287,13 +298,12 @@ stdenv.mkDerivation (finalAttrs: { OpenGL SDL brotli - embree llvmPackages.openmp - (openimagedenoise.override { inherit cudaSupport; }) sse2neon ] ) ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] + ++ lib.optionals openUsdSupport [ pyPkgsOpenusd ] ++ lib.optionals waylandSupport [ dbus libdecor' @@ -316,18 +326,23 @@ stdenv.mkDerivation (finalAttrs: { ps.requests ps.zstandard ] - ++ lib.optionals (!stdenv.isDarwin) [ pyPkgsOpenusd ]; + ++ lib.optional openUsdSupport [ pyPkgsOpenusd ]; blenderExecutable = placeholder "out" - + (if stdenv.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); + + ( + if stdenv.hostPlatform.isDarwin then + "/Applications/Blender.app/Contents/MacOS/Blender" + else + "/bin/blender" + ); postInstall = - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/Blender.app $out/Applications '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mv $out/share/blender/${lib.versions.majorMinor finalAttrs.version}/python{,-ext} '' + '' @@ -347,7 +362,7 @@ stdenv.mkDerivation (finalAttrs: { addDriverRunpath "$program" done '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/Blender.app/Contents/MacOS/Blender $out/bin/blender ''; @@ -369,7 +384,7 @@ stdenv.mkDerivation (finalAttrs: { import bpy bpy.context.scene.eevee.taa_render_samples = 32 bpy.context.scene.cycles.samples = 32 - if ${if (stdenv.isAarch64 && stdenv.isLinux) then "True" else "False"}: + if ${if (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) then "True" else "False"}: bpy.context.scene.cycles.use_denoising = False bpy.context.scene.render.resolution_x = 100 bpy.context.scene.render.resolution_y = 100 @@ -425,8 +440,7 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-darwin" ]; - # the current apple sdk is too old (currently 11_0) and fails to build "metal" on x86_64-darwin - broken = stdenv.hostPlatform.system == "x86_64-darwin"; + broken = stdenv.hostPlatform.isDarwin; # fails due to too-old SDK, using newer SDK fails to compile maintainers = with lib.maintainers; [ amarshall veprbl diff --git a/pkgs/applications/misc/boatswain/default.nix b/pkgs/applications/misc/boatswain/default.nix index 5d2b1540aebe7..fc2842ebe52fc 100644 --- a/pkgs/applications/misc/boatswain/default.nix +++ b/pkgs/applications/misc/boatswain/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ _0xMRTT ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 495a945d32d3c..bc9d3cb2e444e 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -1,45 +1,44 @@ -{ lib -, fetchFromGitHub -, gitUpdater -, python3Packages -, blueprint-compiler -, meson -, ninja -, pkg-config -, wrapGAppsHook4 -, appstream-glib -, desktop-file-utils -, librsvg -, gtk4 -, gtksourceview5 -, libadwaita -, cabextract -, p7zip -, xdpyinfo -, imagemagick -, lsb-release -, pciutils -, procps -, gamescope -, mangohud -, vkbasalt-cli -, vmtouch +{ + lib, + fetchFromGitHub, + gitUpdater, + python3Packages, + blueprint-compiler, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + appstream-glib, + desktop-file-utils, + librsvg, + gtk4, + gtksourceview5, + libadwaita, + cabextract, + p7zip, + xdpyinfo, + imagemagick, + lsb-release, + pciutils, + procps, + gamescope, + mangohud, + vkbasalt-cli, + vmtouch, }: python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "51.11"; + version = "51.13"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; rev = version; - sha256 = "sha256-uS3xmTu+LrVFX93bYcJvYjl6179d3IjpxLKrOXn8Z8Y="; + hash = "sha256-ZcUevGY81H3ATTk390ojBp/4zBE2Lui7Qa+Qe8B0XL4="; }; - patches = [ - ./vulkan_icd.patch - ]; + patches = [ ./vulkan_icd.patch ]; # https://github.com/bottlesdevs/Bottles/wiki/Packaging nativeBuildInputs = [ @@ -60,38 +59,41 @@ python3Packages.buildPythonApplication rec { libadwaita ]; - propagatedBuildInputs = with python3Packages; [ - pathvalidate - pycurl - pyyaml - requests - pygobject3 - patool - markdown - fvs - pefile - urllib3 - chardet - certifi - idna - orjson - icoextract - ] ++ [ - cabextract - p7zip - xdpyinfo - imagemagick - vkbasalt-cli + propagatedBuildInputs = + with python3Packages; + [ + pathvalidate + pycurl + pyyaml + requests + pygobject3 + patool + markdown + fvs + pefile + urllib3 + chardet + certifi + idna + orjson + icoextract + ] + ++ [ + cabextract + p7zip + xdpyinfo + imagemagick + vkbasalt-cli - gamescope - mangohud - vmtouch + gamescope + mangohud + vmtouch - # Undocumented (subprocess.Popen()) - lsb-release - pciutils - procps - ]; + # Undocumented (subprocess.Popen()) + lsb-release + pciutils + procps + ]; format = "other"; dontWrapGApps = true; # prevent double wrapping @@ -107,7 +109,10 @@ python3Packages.buildPythonApplication rec { homepage = "https://usebottles.com/"; downloadPage = "https://github.com/bottlesdevs/Bottles/releases"; license = licenses.gpl3Only; - maintainers = with maintainers; [ psydvl shamilton ]; + maintainers = with maintainers; [ + psydvl + shamilton + ]; platforms = platforms.linux; mainProgram = "bottles"; }; diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/applications/misc/bottles/fhsenv.nix index fd0d38f69892e..1bd476a136c64 100644 --- a/pkgs/applications/misc/bottles/fhsenv.nix +++ b/pkgs/applications/misc/bottles/fhsenv.nix @@ -1,106 +1,129 @@ -{ buildFHSEnv -, symlinkJoin -, bottles-unwrapped -, extraPkgs ? pkgs: [ ] -, extraLibraries ? pkgs: [ ] +{ + buildFHSEnv, + symlinkJoin, + bottles-unwrapped, + extraPkgs ? pkgs: [ ], + extraLibraries ? pkgs: [ ], }: -let fhsEnv = { - # Many WINE games need 32bit - multiArch = true; +let + fhsEnv = { + # Many WINE games need 32bit + multiArch = true; - targetPkgs = pkgs: with pkgs; [ - bottles-unwrapped - # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env) - # See https://github.com/bottlesdevs/Bottles/issues/2401 - vkbasalt - ] ++ extraPkgs pkgs; + targetPkgs = + pkgs: + with pkgs; + [ + bottles-unwrapped + # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env) + # See https://github.com/bottlesdevs/Bottles/issues/2401 + vkbasalt + ] + ++ extraPkgs pkgs; - multiPkgs = - let - xorgDeps = pkgs: with pkgs.xorg; [ - libpthreadstubs - libSM - libX11 - libXaw - libxcb - libXcomposite - libXcursor - libXdmcp - libXext - libXi - libXinerama - libXmu - libXrandr - libXrender - libXv - libXxf86vm - ]; - gstreamerDeps = pkgs: with pkgs.gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-plugins-bad - gst-libav - ]; - in - pkgs: with pkgs; [ - # https://wiki.winehq.org/Building_Wine - alsa-lib - cups - dbus - fontconfig - freetype - glib - gnutls - libglvnd - gsm - libgphoto2 - libjpeg_turbo - libkrb5 - libpcap - libpng - libpulseaudio - libtiff - libunwind - libusb1 - libv4l - libxml2 - mpg123 - ocl-icd - openldap - samba4 - sane-backends - SDL2 - udev - vulkan-loader + multiPkgs = + let + xorgDeps = + pkgs: with pkgs.xorg; [ + libpthreadstubs + libSM + libX11 + libXaw + libxcb + libXcomposite + libXcursor + libXdmcp + libXext + libXi + libXinerama + libXmu + libXrandr + libXrender + libXv + libXxf86vm + ]; + gstreamerDeps = + pkgs: with pkgs.gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav + ]; + in + pkgs: + with pkgs; + [ + # https://wiki.winehq.org/Building_Wine + alsa-lib + cups + dbus + fontconfig + freetype + glib + gnutls + libglvnd + gsm + libgphoto2 + libjpeg_turbo + libkrb5 + libpcap + libpng + libpulseaudio + libtiff + libunwind + libusb1 + libv4l + libxml2 + mpg123 + ocl-icd + openldap + samba4 + sane-backends + SDL2 + udev + vulkan-loader - # https://www.gloriouseggroll.tv/how-to-get-out-of-wine-dependency-hell/ - alsa-plugins - dosbox - giflib - gtk3 - libva - libxslt - ncurses - openal + # https://www.gloriouseggroll.tv/how-to-get-out-of-wine-dependency-hell/ + alsa-plugins + dosbox + giflib + gtk3 + libva + libxslt + ncurses + openal - # Steam runtime - libgcrypt - libgpg-error - p11-kit - zlib # Freetype - ] ++ xorgDeps pkgs - ++ gstreamerDeps pkgs - ++ extraLibraries pkgs; -}; + # Steam runtime + libgcrypt + libgpg-error + p11-kit + zlib # Freetype + ] + ++ xorgDeps pkgs + ++ gstreamerDeps pkgs + ++ extraLibraries pkgs; + }; in symlinkJoin { name = "bottles"; paths = [ - (buildFHSEnv (fhsEnv // { name = "bottles"; runScript = "bottles"; })) - (buildFHSEnv (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; })) + (buildFHSEnv ( + fhsEnv + // { + name = "bottles"; + runScript = "bottles"; + } + )) + (buildFHSEnv ( + fhsEnv + // { + name = "bottles-cli"; + runScript = "bottles-cli"; + } + )) ]; postBuild = '' mkdir -p $out/share diff --git a/pkgs/applications/misc/bottles/vulkan_icd.patch b/pkgs/applications/misc/bottles/vulkan_icd.patch index ff376e136bb24..e1c402727d893 100644 --- a/pkgs/applications/misc/bottles/vulkan_icd.patch +++ b/pkgs/applications/misc/bottles/vulkan_icd.patch @@ -6,7 +6,7 @@ index 6673493..9191004 100644 "/usr/share/vulkan", "/etc/vulkan", "/usr/local/share/vulkan", -- "/usr/local/etc/vulkan" +- "/usr/local/etc/vulkan", + "/usr/local/etc/vulkan", + "/run/opengl-driver/share/vulkan", + "/run/opengl-driver-32/share/vulkan", diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 61a0b3b3e81a8..b5e8c469b408d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -186,6 +186,29 @@ stdenv.mkDerivation (finalAttrs: { done ''; + doInstallCheck = true; + installCheckInputs = with python3Packages; [ + fonttools + psutil + ]; + installCheckPhase = '' + runHook preInstallCheck + + ETN='--exclude-test-name' + EXCLUDED_FLAGS=( + $ETN 'test_7z' # we don't include 7z support + $ETN 'test_zstd' # we don't include zstd support + $ETN 'test_qt' # we don't include svg or webp support + $ETN 'test_import_of_all_python_modules' # explores actual file paths, gets confused + $ETN 'test_websocket_basic' # flakey + ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"} + ) + + python setup.py test ''${EXCLUDED_FLAGS[@]} + + runHook postInstallCheck + ''; + meta = { homepage = "https://calibre-ebook.com"; description = "Comprehensive e-book software"; @@ -201,6 +224,6 @@ stdenv.mkDerivation (finalAttrs: { else lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index 833ad9202b9fd..6122607bc4dc2 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # replace xcode check and hard-coded PCSC framework path substituteInPlace configure.ac \ --replace 'if test ! -e "/Applications/Xcode.app/"; then' 'if test yes != yes; then' \ @@ -34,8 +34,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib gtk3 lua5_2 curl readline ] - ++ lib.optional stdenv.isDarwin PCSC - ++ lib.optional stdenv.isLinux pcsclite; + ++ lib.optional stdenv.hostPlatform.isDarwin PCSC + ++ lib.optional stdenv.hostPlatform.isLinux pcsclite; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/applications/misc/chatblade/default.nix index 8ffb326572ef9..696cf52ba4146 100644 --- a/pkgs/applications/misc/chatblade/default.nix +++ b/pkgs/applications/misc/chatblade/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "chatblade"; - version = "0.6.3"; + version = "0.6.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-4zLyIrBkilZ2ciBRkU41iK6Q8xDTdFJYOYalNeEMApg="; + hash = "sha256-d8XavZBuWsuIUxraC2XaWM6tgo2JmsPZwzyl9Rj5wWM="; }; doCheck = false; # there are no tests diff --git a/pkgs/applications/misc/citations/default.nix b/pkgs/applications/misc/citations/default.nix index ae3964355a48c..178a0e25cbf6a 100644 --- a/pkgs/applications/misc/citations/default.nix +++ b/pkgs/applications/misc/citations/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { gtksourceview5 libadwaita poppler - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/applications/misc/clipqr/default.nix index 969ce4c75dc6a..90d4e0b66b525 100644 --- a/pkgs/applications/misc/clipqr/default.nix +++ b/pkgs/applications/misc/clipqr/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "clipqr"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitLab { owner = "imatt-foss"; repo = "clipqr"; rev = "v${version}"; - hash = "sha256-gfKCuTZY9VsiXMlw6XX6YylMO4xGoLQU/5QvnDV7GbE="; + hash = "sha256-iuA6RqclMm1CWaiM1kpOpgfYvKaYGOIwFQkLr/nCL5M="; }; vendorHash = null; @@ -69,7 +69,7 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ MatthieuBarthel ]; homepage = "https://gitlab.com/imatt-foss/clipqr"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "clipqr"; }; } diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/applications/misc/cloak/default.nix index bf3dd3c4a0818..61f307edd5554 100644 --- a/pkgs/applications/misc/cloak/default.nix +++ b/pkgs/applications/misc/cloak/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-m11A5fcJzWoDZglrr2Es1V5ZJNepEkGeIRVhexJ7jws="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { homepage = "https://github.com/evansmurithi/cloak"; diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index 82276b73c4d14..a5dd6a8d9ef40 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-g25Pw3BlRbuaGjsQav6mU9zVyS1mVUKkgKDOILm8R6U="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Static site generator written in Rust"; diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix index 96f19b47968aa..392bf98af62fd 100644 --- a/pkgs/applications/misc/collision/default.nix +++ b/pkgs/applications/misc/collision/default.nix @@ -48,7 +48,7 @@ crystal.buildCrystalPackage rec { # Shortly, adding pkg-config to buildInputs along with openssl fixes the issue. nativeBuildInputs = [ wrapGAppsHook4 pkg-config gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ libadwaita diff --git a/pkgs/applications/misc/conceal/default.nix b/pkgs/applications/misc/conceal/default.nix index 3641aebaeb4e4..5ce8d147fbbfc 100644 --- a/pkgs/applications/misc/conceal/default.nix +++ b/pkgs/applications/misc/conceal/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "conceal"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "TD-Sky"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LPuPpcs0PtZk516wM9cfhvV12550VBQugVvbQBWxnxA="; + sha256 = "sha256-N/KlxtxzEDwUvQMpgf2S6u7MaYiF0eXnMrGoowc08J0="; }; - cargoHash = "sha256-7FUUte6hAY+KyD9t3rgibkhARFcWIIrFyX4vWSAwcBU="; + cargoHash = "sha256-50EHc8ZHzbl5IFpi5k3/Katc3FaxBgnpf8COrpPHZWk="; nativeBuildInputs = [ installShellFiles ]; @@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/TD-Sky/conceal"; license = licenses.mit; maintainers = with maintainers; [ jedsek kashw2 ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/applications/misc/conduktor/default.nix index 574bd3bf922ea..e45edf248b41d 100644 --- a/pkgs/applications/misc/conduktor/default.nix +++ b/pkgs/applications/misc/conduktor/default.nix @@ -11,18 +11,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper copyDesktopItems ]; - desktopItems = makeDesktopItem { - type = "Application"; - name = pname; - desktopName = "Conduktor"; - genericName = meta.description; - exec = pname; - icon = fetchurl { - url = "https://github.com/conduktor/builds/raw/v${version}/.github/resources/Conduktor.png"; - sha256 = "0s7p74qclvac8xj2m22gfxx5m2c7cf0nqpk5sb049p2wvryhn2j4"; - }; - comment = "A beautiful and fully-featured desktop client for Apache Kafka"; - }; + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = pname; + desktopName = "Conduktor"; + genericName = meta.description; + exec = pname; + icon = fetchurl { + url = "https://github.com/conduktor/builds/raw/v${version}/.github/resources/Conduktor.png"; + sha256 = "0s7p74qclvac8xj2m22gfxx5m2c7cf0nqpk5sb049p2wvryhn2j4"; + }; + comment = "A beautiful and fully-featured desktop client for Apache Kafka"; + }) + ]; dontConfigure = true; dontBuild = true; diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix index d75cdd4843fab..22e9906db561d 100644 --- a/pkgs/applications/misc/coolreader/default.nix +++ b/pkgs/applications/misc/coolreader/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { buildInputs = [ qttools fribidi libunibreak ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/buggins/coolreader"; description = "Cross platform open source e-book reader"; mainProgram = "cr3"; diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index 3057210d5cef4..e2f5cffdfbad0 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -8,19 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-Of4stKrk3zQX2gxXaM9YrZf1SVjzIVUU+7JraKHk180="; + hash = "sha256-U5x8szvouoxJ+DZUlrn5wtXt+6vs62tzcWICQW3B21U="; }; - cargoHash = "sha256-DLq8w65UlfAdPsJ96mNZ+dJtm/VMPzlIYqsEJtkLKzI="; + cargoHash = "sha256-o9LRXbx77EXXO7rEmpBrx2nommJgG0ikw1YzdeB0Gug="; - buildInputs = lib.optionals stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; meta = with lib; { homepage = "https://github.com/replydev/cotp"; diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 8f6bc27438faf..84263380f11ae 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchzip +, fetchFromGitLab , cmake , extra-cmake-modules , qttools @@ -12,21 +12,24 @@ , wrapQtAppsHook , gst_all_1 , testers -, crow-translate }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crow-translate"; - version = "2.11.1"; + version = "3.0.0"; - src = fetchzip { - url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-1rq1pF4tOaZNEaHflxlBuHta80EzD9m3O99geR1EPxE="; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "office"; + repo = "crow-translate"; + rev = "v${finalAttrs.version}"; + hash = "sha256-hdrhxbv44DlxoF1JU1d2auP/vR8a3IJI+hN7PhdPMaY="; + fetchSubmodules = true; }; postPatch = '' - substituteInPlace data/io.crow_translate.CrowTranslate.desktop \ - --replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" + substituteInPlace data/org.kde.CrowTranslate.desktop.in \ + --subst-var-by QT_BIN_DIR ${lib.getBin qttools}/bin ''; nativeBuildInputs = [ @@ -54,15 +57,15 @@ stdenv.mkDerivation rec { ''; passthru.tests.version = testers.testVersion { - package = crow-translate; + package = finalAttrs.finalPackage; }; - meta = with lib; { + meta = { description = "Simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing"; - homepage = "https://crow-translate.github.io/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux; + homepage = "https://invent.kde.org/office/crow-translate"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.linux; mainProgram = "crow"; }; -} +}) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 0d29b7921a66d..f75ddf0c108de 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/Cubitect/cubiomes-viewer"; description = "Graphical Minecraft seed finder and map viewer"; mainProgram = "cubiomes-viewer"; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 26ea5f2cad0bf..f135a39a41e62 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles @@ -23,14 +24,14 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd dasel \ --bash <($out/bin/dasel completion bash) \ --fish <($out/bin/dasel completion fish) \ --zsh <($out/bin/dasel completion zsh) ''; - doInstallCheck = true; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; installCheckPhase = '' runHook preInstallCheck if [[ $($out/bin/dasel --version) == "dasel version ${version}" ]]; then diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index 294bc33a0ba7e..f3f3409434415 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -52,7 +52,7 @@ python.pkgs.buildPythonApplication rec { watchdog ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { aws = [ boto3 ]; azure = [ azure-storage-blob diff --git a/pkgs/applications/misc/diebahn/default.nix b/pkgs/applications/misc/diebahn/default.nix index 502c247ce2d21..0212547a75a61 100644 --- a/pkgs/applications/misc/diebahn/default.nix +++ b/pkgs/applications/misc/diebahn/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { gtk4 libadwaita pango - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Foundation Security @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { # Darwin needs to link against gettext from nixpkgs instead of the one vendored by gettext-sys # because the vendored copy does not build with newer versions of clang. - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 1d54b57c9b2f1..d64d8f6ab9be1 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ cairo poppler wxGTK ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; preConfigure = "./bootstrap"; diff --git a/pkgs/applications/misc/dmenu-rs/default.nix b/pkgs/applications/misc/dmenu-rs/default.nix index 87d484c2e9bf4..4b15eae9e6140 100644 --- a/pkgs/applications/misc/dmenu-rs/default.nix +++ b/pkgs/applications/misc/dmenu-rs/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ benjaminedwardwebb ]; platforms = platforms.linux; - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/applications/misc/doctave/default.nix b/pkgs/applications/misc/doctave/default.nix index 6b54636488e9b..8ddbe3a126e1b 100644 --- a/pkgs/applications/misc/doctave/default.nix +++ b/pkgs/applications/misc/doctave/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/done/default.nix b/pkgs/applications/misc/done/default.nix index 47238cd9cb9cf..095d77b1ee835 100644 --- a/pkgs/applications/misc/done/default.nix +++ b/pkgs/applications/misc/done/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { libsecret openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { GETTEXT_DIR = gettext; }; diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index c514c2177369b..8ec9dfc35033b 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GUI tool to find duplicate files in a system"; homepage = "https://github.com/arsenetar/dupeguru"; license = licenses.bsd3; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 910e21528eb51..e9854ac3ef94d 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; - buildInputs = [ ] ++ lib.optional stdenv.isLinux qtwayland; + buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { --replace "(share_dir" "(\"share\"" ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electron-cash.desktop \ --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash" ''; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 859d7bb42b00e..0faaf369125d7 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -32,13 +32,13 @@ let }; libsecp256k1_name = - if stdenv.isLinux then "libsecp256k1.so.{v}" - else if stdenv.isDarwin then "libsecp256k1.{v}.dylib" + if stdenv.hostPlatform.isLinux then "libsecp256k1.so.{v}" + else if stdenv.hostPlatform.isDarwin then "libsecp256k1.{v}.dylib" else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; libzbar_name = - if stdenv.isLinux then "libzbar.so.0" - else if stdenv.isDarwin then "libzbar.0.dylib" + if stdenv.hostPlatform.isLinux then "libzbar.so.0" + else if stdenv.hostPlatform.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; # Not provided in official source releases, which are what upstream signs. @@ -71,7 +71,7 @@ python.pkgs.buildPythonApplication { ''; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - buildInputs = lib.optional (stdenv.isLinux && enableQt) qtwayland; + buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland; propagatedBuildInputs = with python.pkgs; [ aiohttp @@ -124,7 +124,7 @@ python.pkgs.buildPythonApplication { sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electrum.desktop \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"' \ "Exec=$out/bin/electrum %u" \ diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index 9d71a5886be63..cd0b89f94f05e 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -13,13 +13,13 @@ let version = "4.5.4"; libsecp256k1_name = - if stdenv.isLinux then "libsecp256k1.so.{v}" - else if stdenv.isDarwin then "libsecp256k1.{v}.dylib" + if stdenv.hostPlatform.isLinux then "libsecp256k1.so.{v}" + else if stdenv.hostPlatform.isDarwin then "libsecp256k1.{v}.dylib" else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; libzbar_name = - if stdenv.isLinux then "libzbar.so.0" - else if stdenv.isDarwin then "libzbar.0.dylib" + if stdenv.hostPlatform.isLinux then "libzbar.so.0" + else if stdenv.hostPlatform.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; in @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication { }; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - buildInputs = lib.optional (stdenv.isLinux && enableQt) qtwayland; + buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland; propagatedBuildInputs = with python3.pkgs; [ aiohttp @@ -90,7 +90,7 @@ python3.pkgs.buildPythonApplication { sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electrum-grs.desktop \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-grs %u"' \ "Exec=$out/bin/electrum-grs %u" \ diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 110a17aeeac98..e0aaf139cd65e 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -14,13 +14,13 @@ let version = "4.2.2.1"; libsecp256k1_name = - if stdenv.isLinux then "libsecp256k1.so.0" - else if stdenv.isDarwin then "libsecp256k1.0.dylib" + if stdenv.hostPlatform.isLinux then "libsecp256k1.so.0" + else if stdenv.hostPlatform.isDarwin then "libsecp256k1.0.dylib" else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; libzbar_name = - if stdenv.isLinux then "libzbar.so.0" - else if stdenv.isDarwin then "libzbar.0.dylib" + if stdenv.hostPlatform.isLinux then "libzbar.so.0" + else if stdenv.hostPlatform.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; # Not provided in official source releases, which are what upstream signs. @@ -112,7 +112,7 @@ python3.pkgs.buildPythonApplication { sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' # Despite setting usr_share above, these files are installed under # $out/nix ... mv $out/${python3.sitePackages}/nix/store"/"*/share $out @@ -131,7 +131,7 @@ python3.pkgs.buildPythonApplication { ''; nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; - buildInputs = lib.optional stdenv.isLinux qtwayland; + buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland; pytestFlagsArray = [ "electrum_ltc/tests" ]; diff --git a/pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch b/pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch new file mode 100644 index 0000000000000..d7de78b4a6cdc --- /dev/null +++ b/pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch @@ -0,0 +1,35 @@ +From 3a0181ab0fb6c40f613894e65009e148c6e652c9 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross <hi@alyssa.is> +Date: Mon, 16 Sep 2024 10:24:08 +0200 +Subject: [PATCH] Remove outdated musl hack in rlimit_nofile_safe + +This was incorrect, because RLIM_FMT is not the format specifier for uintmax_t. + +Since 53e84063a ("Change RLIM_FMT to '%llu' for non-glibc builds (#269)"), +RLIM_FMT is correct for musl, so there's no longer any need for this casting +version. + +Link: https://github.com/elogind/elogind/pull/288 +--- + src/basic/rlimit-util.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c +index 091c111df..59bdc35a0 100644 +--- a/src/basic/rlimit-util.c ++++ b/src/basic/rlimit-util.c +@@ -428,11 +428,7 @@ int rlimit_nofile_safe(void) { + rl.rlim_max = MIN(rl.rlim_max, (rlim_t) read_nr_open()); + rl.rlim_cur = MIN((rlim_t) FD_SETSIZE, rl.rlim_max); + if (setrlimit(RLIMIT_NOFILE, &rl) < 0) +-#ifdef __GLIBC__ /// To be compatible with musl-libc, elogind uses an (uintmax_t) cast. + return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", rl.rlim_cur); +-#else // __GLIBC__ +- return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", (uintmax_t)rl.rlim_cur); +-#endif // __GLIBC__ + + return 1; + } +-- +2.45.2 + diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix index a8b71f34ede56..985d821837ec3 100644 --- a/pkgs/applications/misc/elogind/default.nix +++ b/pkgs/applications/misc/elogind/default.nix @@ -1,16 +1,24 @@ { stdenv , lib , fetchFromGitHub +, fetchurl +, fetchpatch , meson , ninja , m4 , gperf , getent +, acl +, audit +, dbus , libcap +, libselinux +, pam , gettext , pkg-config , udev , eudev +, util-linux , libxslt , python3Packages , docbook5 @@ -27,13 +35,13 @@ stdenv.mkDerivation rec { pname = "elogind"; - version = "246.10"; + version = "255.5"; src = fetchFromGitHub { owner = "elogind"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+Nv6FL9Yjmfxs24+2mUTP//wbjzGUq4ftgJLfuEqBJg="; + hash = "sha256-4KZr/NiiGVwzdDROhiX3GEQTUyIGva6ezb+xC2U3bkg="; }; nativeBuildInputs = [ @@ -48,12 +56,63 @@ stdenv.mkDerivation rec { libxslt.bin # xsltproc docbook5 docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 docbook_xml_dtd_45 # needed for docbook without Internet - # fixes: man/meson.build:111:0: ERROR: Could not execute command "/build/source/tools/xml_helper.py". python3Packages.python - python3Packages.lxml + python3Packages.jinja2 ]; - buildInputs = [ libcap ] ++ (if enableSystemd then [ udev ] else [ eudev ]); + buildInputs = [ acl audit dbus libcap libselinux pam util-linux ] + ++ (if enableSystemd then [ udev ] else [ eudev ]); + + postPatch = '' + substituteInPlace meson.build --replace-fail "install_emptydir(elogindstatedir)" "" + ''; + + patches = [ + (fetchurl { + url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/strerror_r.patch"; + hash = "sha256-amqXP12mLtrkWuAURb3/aoQeeTSRYlYqL2q2zrKbhxk="; + }) + (fetchurl { + url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/strerror_r_1.patch"; + hash = "sha256-tVUlmPValUPApqRX+Cqkzn7bkIILYSuCouvgRsdl9XE="; + }) + (fetchpatch { + url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/xxx-musl-fixes.patch"; + includes = [ + "src/basic/cgroup-util.c" + "src/basic/missing_prctl.h" + "src/libelogind/sd-journal/journal-file.h" + ]; + hash = "sha256-kY+B1t87E/TtWa83r0VoiojhRrrB667ZhUAHtHE7m28="; + }) + (fetchurl { + url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/gshadow.patch"; + hash = "sha256-YBy1OeWD1EluLTeUvqUvZKyrZyoUbGg1mxwqG5+VNO0="; + }) + (fetchurl { + name = "FTW.patch"; + url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; + hash = "sha256-SGvP0GT43vfyHxrmvl4AbsWQz8CPmNGyH001s3lTxng="; + }) + (fetchurl { + name = "malloc_info.patch"; + url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; + hash = "sha256-8aOw+BTtl5Qta8aqLmliKSHEirTjp1xLM195EmBdEDI="; + }) + (fetchpatch { + name = "malloc_trim.patch"; + url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; + stripLen = 3; + extraPrefix = [ "src/libelogind/" ]; + hash = "sha256-rtSnCEK+frhnlwl/UW3YHxB8MUCAq48jEzQRURpxdXk="; + }) + (fetchurl { + name = "malloc_info.patch"; + url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; + hash = "sha256-ZyOCmM5LcwJ7mHiZr0lQjV4G+XMxjhsUm7g7L3OzDDM="; + }) + ./0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch + ]; # Inspired by the systemd `preConfigure`. # Conceptually we should patch all files required during the build, but not scripts @@ -68,8 +127,11 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - "-Drootprefix=${placeholder "out"}" - "-Dsysconfdir=${placeholder "out"}/etc" + (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d") + (lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services") + (lib.mesonOption "sysconfdir" "${placeholder "out"}/etc") + (lib.mesonBool "utmp" (!stdenv.hostPlatform.isMusl)) + (lib.mesonEnable "xenctrl" false) ]; meta = with lib; { diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 85ff399ac83f9..1758dde546eac 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -1,29 +1,22 @@ { lib , stdenv -, fetchpatch , nixosTests , python3 -, fetchPypi +, fetchFromGitHub , radicale3 }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication { pname = "etesync-dav"; - version = "0.32.1"; + version = "0.32.1-unstable-2024-09-02"; - src = fetchPypi { - inherit pname version; - hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA="; + src = fetchFromGitHub { + owner = "etesync"; + repo = "etesync-dav"; + rev = "b9b23bf6fba60d42012008ba06023bccd9109c08"; + hash = "sha256-wWhwnOlwE1rFgROTSj90hlSw4k48fIEdk5CJOXoecuQ="; }; - patches = [ - (fetchpatch { - name = "add-missing-comma-in-setup.py.patch"; - url = "https://github.com/etesync/etesync-dav/commit/040cb7b57205e70515019fb356e508a6414da11e.patch"; - hash = "sha256-87IpIQ87rgpinvbRwUlWd0xeegn0zfVSiDFYNUqPerg="; - }) - ]; - propagatedBuildInputs = with python3.pkgs; [ appdirs etebase @@ -49,6 +42,6 @@ python3.pkgs.buildPythonApplication rec { mainProgram = "etesync-dav"; license = licenses.gpl3; maintainers = with maintainers; [ thyol valodim ]; - broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing + broken = stdenv.hostPlatform.isDarwin; # pyobjc-framework-Cocoa is missing }; } diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix index f8f24fa63569a..f9a911a1c1190 100644 --- a/pkgs/applications/misc/eureka-ideas/default.nix +++ b/pkgs/applications/misc/eureka-ideas/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index 9f8a507fdce4b..0f9155fe1b89e 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { glib libopus vips - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index f35df6a049f21..7508bc53e6578 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { ++ lib.optionals withColorer [ spdlog xercesc ] ++ lib.optionals withMultiArc [ libarchive pcre ] ++ lib.optionals withNetRocks [ openssl libssh libnfs neon ] - ++ lib.optional (withNetRocks && !stdenv.isDarwin) samba # broken on darwin + ++ lib.optional (withNetRocks && !stdenv.hostPlatform.isDarwin) samba # broken on darwin ++ lib.optionals withPython (with python3Packages; [ python cffi debugpy pcpp ]) - ++ lib.optionals stdenv.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL System ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL System ]; postPatch = '' patchShebangs python/src/prebuild.sh diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix index 8eb001e9c93bb..55e1700c5c858 100644 --- a/pkgs/applications/misc/firestarter/default.nix +++ b/pkgs/applications/misc/firestarter/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://tu-dresden.de/zih/forschung/projekte/firestarter"; description = "Processor Stress Test Utility"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index 98146e6bfdf38..c2cb20ef5b746 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SOsHvcfDdUpb0x5VZ1vZJnGaIiWWOPgnAwKYNXzfUfI="; }; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; cargoHash = "sha256-aimPeGIE5jP0pdrqwnzUzBqW0jz9+kcfpLdCN0r30xU="; diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 1741e5f2d3254..0a6e43f9e17a9 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.30.1"; + version = "1.30.4"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-R8lCAZkClmCFkiNPf9KGlzj2td3KxCx/7UkdTJgDtwY="; + sha256 = "sha256-r9RYNfbMa0axxS5kVBsFmvnuznsZz4s0ZfsIJVczHlI="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 0dc44c4eb6474..96c363f6cf925 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -24,14 +24,14 @@ assert svgSupport -> enableCairo; stdenv.mkDerivation (finalAttrs: { pname = "fuzzel"; - version = "1.10.2"; + version = "1.11.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fuzzel"; rev = finalAttrs.version; - hash = "sha256-I+h93/I1Kra2S5QSi2XgICAVrcUmO9cmb8UttVuzjwg="; + hash = "sha256-FM5HvPfLVmuKpS3/0m2QM/lSRcWsVpnwtJ++L3Uo5Dc="; }; depsBuildBuild = [ diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix deleted file mode 100644 index ef45224a83ce5..0000000000000 --- a/pkgs/applications/misc/galculator/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, autoreconfHook, intltool -, gtk, pkg-config, flex }: - -stdenv.mkDerivation rec { - pname = "galculator"; - version = "2.1.4"; - - src = fetchFromGitHub { - owner = "galculator"; - repo = "galculator"; - rev = "v${version}"; - sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w"; - }; - - patches = [ - # Pul patch pending upstream inclusion for -fno-common toolchain support: - # https://github.com/galculator/galculator/pull/45 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/galculator/galculator/commit/501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6.patch"; - sha256 = "08c9d2b49a1mizgk7v37dp8r96x389zc13mzv4dcy16x448lhp67"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; - buildInputs = [ gtk flex ]; - - meta = with lib; { - description = "GTK 2/3 algebraic and RPN calculator"; - longDescription = '' - galculator is a GTK 2 / GTK 3 based calculator. Its main features include: - - - Algebraic, RPN (Reverse Polish Notation), Formula Entry and Paper modes; - - Basic and Scientific Modes - - Decimal, hexadecimal, octal and binary number base - - Radiant, degree and grad support - - User defined constants and functions - - A bunch of common functions - - Binary arithmetic of configurable bit length and signedness - - Quad-precision floating point arithmetic, and 112-bit binary arithmetic - ''; - homepage = "http://galculator.sourceforge.net/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - mainProgram = "galculator"; - }; -} diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 5df13903ab28b..b235cabde9981 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.27.3"; + version = "1.27.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - hash = "sha256-ILnnbnQiJnBBOV87mWw1xHU8DtCXIVVwRwz/PfzVSSI="; + hash = "sha256-q/byWRvbzrV6KjPIDjJJWl0fkrluGEcvrISPKz8SJ+4="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 8f345f39b534a..f07a18c0edae4 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin gettext; + buildInputs = [ ncurses ] ++ lib.optional stdenv.hostPlatform.isDarwin gettext; meta = { description = "Program for calculating and printing calendars"; diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 6a55f0ff74209..c9c29cd8e007f 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -8,43 +8,52 @@ python3Packages.buildPythonApplication rec { pname = "gcalcli"; - version = "4.3.0"; + version = "4.4.0"; pyproject = true; src = fetchFromGitHub { owner = "insanum"; repo = "gcalcli"; rev = "refs/tags/v${version}"; - hash = "sha256-roHMWUwklLMNhLJANsAeBKcSX1Qk47kH5A3Y8SuDrmg="; + hash = "sha256-X9sgnujHMbmrt7cpcBOvTycIKFz3G2QzNDt3me5GUrQ="; }; - postPatch = lib.optionalString stdenv.isLinux '' - substituteInPlace gcalcli/argparsers.py \ - --replace-fail "'notify-send" "'${lib.getExe libnotify}" - ''; + postPatch = + '' + # dev dependencies + substituteInPlace pyproject.toml \ + --replace-fail "\"google-api-python-client-stubs\"," "" \ + --replace-fail "\"types-python-dateutil\"," "" \ + --replace-fail "\"types-requests\"," "" \ + --replace-fail "\"types-vobject\"," "" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace gcalcli/argparsers.py \ + --replace-fail "'notify-send" "'${lib.getExe libnotify}" + ''; build-system = with python3Packages; [ setuptools ]; dependencies = with python3Packages; [ + argcomplete python-dateutil gflags httplib2 parsedatetime - six vobject google-api-python-client - oauth2client + google-auth-oauthlib uritemplate libnotify ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "CLI for Google Calendar"; mainProgram = "gcalcli"; homepage = "https://github.com/insanum/gcalcli"; - license = licenses.mit; - maintainers = with maintainers; [ nocoolnametom ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nocoolnametom ]; }; } diff --git a/pkgs/applications/misc/gcfflasher/default.nix b/pkgs/applications/misc/gcfflasher/default.nix index b9a49e1723299..01a071dc68f4e 100644 --- a/pkgs/applications/misc/gcfflasher/default.nix +++ b/pkgs/applications/misc/gcfflasher/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libgpiod ]; diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 4f455d901c2d7..c807438aaa43d 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -20,7 +20,7 @@ perlPackages.buildPerlPackage rec { hash = "sha256-fqzrgmtqy7dlmGEaTXAqpdt9HqZCVooJ0Vf6/JUKihw="; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; buildInputs = [ perl ]; propagatedBuildInputs = with perlPackages; [ LWP LWPProtocolHttps XMLLibXML Mojolicious @@ -40,7 +40,7 @@ perlPackages.buildPerlPackage rec { runHook postInstall ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/.get_iplayer-wrapped ''; diff --git a/pkgs/applications/misc/gimoji/default.nix b/pkgs/applications/misc/gimoji/default.nix deleted file mode 100644 index 71582e3acc399..0000000000000 --- a/pkgs/applications/misc/gimoji/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "gimoji"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "zeenix"; - repo = "gimoji"; - rev = version; - hash = "sha256-0mLFrFxMbX9Gl72W3EC7kfXHqDBo5QU+ut+1psntphY="; - }; - - cargoHash = "sha256-pKHhYWEF9L0UX9hc2Ga3WOUWzISA8ONwn3rcI9u2/n0="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; - - meta = with lib; { - description = "Easily add emojis to your git commit messages"; - homepage = "https://github.com/zeenix/gimoji"; - license = licenses.mit; - mainProgram = "gimoji"; - maintainers = with maintainers; [ a-kenji ]; - }; -} diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index d33560c4f16a4..37f12a266c684 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { xvfb-run ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; mesonFlags = [ "-Ddocs=disabled" # docs do not seem to be installed - (lib.mesonEnable "tests" ((stdenv.buildPlatform.canExecute stdenv.hostPlatform) && (!stdenv.isDarwin))) + (lib.mesonEnable "tests" ((stdenv.buildPlatform.canExecute stdenv.hostPlatform) && (!stdenv.hostPlatform.isDarwin))) ]; checkPhase = '' diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 218110f6d17de..e6d8dfc31f5ab 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook3 ]; buildInputs = [ gettext glib gtk2 libX11 libSM libICE ] - ++ lib.optionals stdenv.isDarwin [ IOKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix deleted file mode 100644 index e3a33cace9cb0..0000000000000 --- a/pkgs/applications/misc/gmtp/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libmtp, libid3tag, flac, libvorbis, gtk3 -, gsettings-desktop-schemas, wrapGAppsHook3 -}: - -let version = "1.3.11"; in - -stdenv.mkDerivation { - pname = "gmtp"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz"; - sha256 = "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss"; - }; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; - - enableParallelBuilding = true; - - # Workaround build failure on -fno-common toolchains: - # ld: gmtp-preferences.o:src/main.h:72: multiple definition of - # `scrolledwindowMain'; gmtp-about.o:src/main.h:72: first defined here - # TODO: can be removed when 1.4.0 is released. - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preFixup = '' - gappsWrapperArgs+=(--add-flags "--datapath $out/share"); - ''; - - meta = { - description = "Simple MP3 and Media player client for UNIX and UNIX like systems"; - mainProgram = "gmtp"; - homepage = "https://gmtp.sourceforge.io"; - platforms = lib.platforms.linux; - maintainers = [ ]; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/applications/misc/gnome-frog/default.nix b/pkgs/applications/misc/gnome-frog/default.nix index 5743054d4f80a..0facc24ce44cc 100644 --- a/pkgs/applications/misc/gnome-frog/default.nix +++ b/pkgs/applications/misc/gnome-frog/default.nix @@ -23,13 +23,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-frog"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "TenderOwl"; repo = "Frog"; rev = "refs/tags/${version}"; - sha256 = "sha256-zL6zuqHF1pTXT3l1mAFx2EL+0ThzjXfst/nEyNVorZg="; + sha256 = "sha256-Zu1xUGpjqpFiPQAAgaVYtnXI4jMtyywrJqn+38K5VHo="; }; format = "other"; diff --git a/pkgs/applications/misc/golden-cheetah-bin/default.nix b/pkgs/applications/misc/golden-cheetah-bin/default.nix index 3fcd77f8f4b78..c37e7dc72fff1 100644 --- a/pkgs/applications/misc/golden-cheetah-bin/default.nix +++ b/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -29,7 +29,7 @@ appimageTools.wrapType2 { meta = { description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava"; platforms = lib.platforms.linux; - broken = !stdenv.isx86_64; + broken = !stdenv.hostPlatform.isx86_64; maintainers = with lib.maintainers; [ gador adamcstephens ]; license = lib.licenses.gpl2Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index 344f3439ef808..4d7c70e8bddb4 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goldendict-ng"; - version = "24.05.05"; + version = "24.09.0"; src = fetchFromGitHub { owner = "xiaoyifang"; repo = "goldendict-ng"; - rev = "v${finalAttrs.version}-LiXia.ecd1138c"; - hash = "sha256-C/0FUFLE3R+tZyCL88BiSFOHPTanILD/fIIQ/OQBSfk="; + rev = "v${finalAttrs.version}-Release.316ec900"; + hash = "sha256-LriKJLjqEuD0v8yjoE35O+V6oUX2jhWGFguqlXaDlQA="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook3 ]; @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { qtwebengine qt5compat qtmultimedia - qtspeech qtwayland libvorbis tomlplusplus diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 6b1865509b727..9c8edf3c774ec 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo - ] ++ lib.optionals stdenv.isLinux [ qtx11extras libXtst ] - ++ lib.optionals stdenv.isDarwin [ bzip2 libiconv ] + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtx11extras libXtst ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ bzip2 libiconv ] ++ lib.optional withCC opencc ++ lib.optional withEpwing libeb ++ lib.optional withExtraTiff libtiff @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { (lib.optional withZim "CONFIG+=zim_support") ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv GoldenDict.app $out/Applications ''; diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index fbacfb6984c6e..e1cfb556891af 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -2,7 +2,7 @@ , qmake, qttools, wrapQtAppsHook , libusb1, shapelib, zlib , withGUI ? false, qtserialport -, withMapPreview ? (!stdenv.isDarwin), qtwebengine +, withMapPreview ? (!stdenv.hostPlatform.isDarwin), qtwebengine , withDoc ? false, docbook_xml_dtd_45, docbook_xsl, expat, fop, libxml2, libxslt, perl }: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # Floating point behavior on i686 causes nmea.test failures. Preventing # extended precision fixes this problem. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-ffloat-store"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-ffloat-store"; doCheck = true; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 gpsbabel -t $out/bin - '' + lib.optionalString withGUI (if stdenv.isDarwin then '' + '' + lib.optionalString withGUI (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications mv gui/GPSBabelFE.app $out/Applications install -Dm644 gui/*.qm gui/coretool/*.qm -t $out/Applications/GPSBabelFE.app/Contents/Resources/translations @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { cp -r html $doc/share/doc/gpsbabel ''; - postFixup = lib.optionalString withGUI (if stdenv.isDarwin then '' + postFixup = lib.optionalString withGUI (if stdenv.hostPlatform.isDarwin then '' wrapQtApp "$out/Applications/GPSBabelFE.app/Contents/MacOS/GPSBabelFE" '' else '' wrapQtApp "$out/bin/gpsbabelfe" diff --git a/pkgs/applications/misc/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix deleted file mode 100644 index 97d6b674d5e57..0000000000000 --- a/pkgs/applications/misc/gpu-burn/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, addDriverRunpath, cudatoolkit }: - -stdenv.mkDerivation { - pname = "gpu-burn"; - version = "unstable-2023-11-10"; - - src = fetchFromGitHub { - owner = "wilicc"; - repo = "gpu-burn"; - rev = "b99aedce3e020d2ca419832ee27b7f29dfa6373e"; - sha256 = "sha256-cLO0GXvujZ+g64j+OY31n43MsVER3ljo8Qrt+EzSKjc="; - }; - - postPatch = '' - substituteInPlace gpu_burn-drv.cpp \ - --replace "#define COMPARE_KERNEL \"compare.ptx\"" \ - "#define COMPARE_KERNEL \"$out/share/compare.ptx\"" - ''; - - buildInputs = [ cudatoolkit ]; - - nativeBuildInputs = [ addDriverRunpath ]; - - makeFlags = [ "CUDAPATH=${cudatoolkit}" ]; - - LDFLAGS = "-L${cudatoolkit}/lib/stubs"; - - installPhase = '' - mkdir -p $out/{bin,share} - cp gpu_burn $out/bin/ - cp compare.ptx $out/share/ - ''; - - postFixup = '' - addDriverRunpath $out/bin/gpu_burn - ''; - - meta = with lib; { - homepage = "http://wili.cc/blog/gpu-burn.html"; - description = "Multi-GPU CUDA stress test"; - platforms = platforms.linux; - license = licenses.bsd2; - mainProgram = "gpu_burn"; - }; -} diff --git a/pkgs/applications/misc/gpu-viewer/default.nix b/pkgs/applications/misc/gpu-viewer/default.nix deleted file mode 100644 index 24255bccde190..0000000000000 --- a/pkgs/applications/misc/gpu-viewer/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, fetchFromGitHub -, pkg-config -, meson -, ninja -, gtk4 -, libadwaita -, python3Packages -, gobject-introspection -, vulkan-tools -, python3 -, wrapGAppsHook4 -, gdk-pixbuf -, lsb-release -, mesa-demos -, vdpauinfo -, clinfo -}: - -python3.pkgs.buildPythonApplication rec { - pname = "gpu-viewer"; - version = "3.04"; - - format = "other"; - - src = fetchFromGitHub { - owner = "arunsivaramanneo"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-+FDBHSVBTUHnhu2n7i9W1zIZe2wjY+OuFwQOJZojuzs="; - }; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gobject-introspection - wrapGAppsHook4 - ]; - - buildInputs = [ - gtk4 - libadwaita - vulkan-tools - gdk-pixbuf - ]; - - pythonPath = with python3Packages; [ - pygobject3 - click - ]; - - # Prevent double wrapping - dontWrapGApps = true; - - postFixup = '' - makeWrapper ${python3.interpreter} $out/bin/gpu-viewer \ - --prefix PATH : "${lib.makeBinPath [ clinfo lsb-release mesa-demos vdpauinfo vulkan-tools ]}" \ - --add-flags "$out/share/gpu-viewer/Files/GPUViewer.py" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --chdir "$out/share/gpu-viewer/Files" \ - ''${makeWrapperArgs[@]} \ - ''${gappsWrapperArgs[@]} - ''; - - - meta = with lib; { - homepage = "https://github.com/arunsivaramanneo/GPU-Viewer"; - description = "Front-end to glxinfo, vulkaninfo, clinfo and es2_info"; - changelog = "https://github.com/arunsivaramanneo/GPU-Viewer/releases/tag/v${version}"; - maintainers = with maintainers; [ GaetanLepage ]; - license = licenses.gpl3; - platforms = platforms.linux; - mainProgram = "gpu-viewer"; - }; -} diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index 18c31afef6b52..c3002104256c8 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { lrelease GPXLab/locale/*.ts ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv GPXLab/GPXLab.app $out/Applications ''; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 43e1b73cf87a3..60bc8b5792371 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -9,7 +9,6 @@ , qtpositioning ? null # qt6 only , qtserialport , qtsvg -, qt5compat ? null # qt6 only , wrapQtAppsHook }: @@ -18,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.23"; + version = "13.26"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-GC1Csxhr2uh9oLgC+mFxJZiwCO7TMI2ljv6GMdEiuZQ="; + hash = "sha256-EIeUcSHJXpd1/90fAPrP9F/DVyZhkcZk8MJd9VO1D70="; }; buildInputs = [ @@ -33,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtpositioning qtsvg - qt5compat ] else [ qtlocation ]); @@ -48,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { lrelease gpxsee.pro ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv GPXSee.app $out/Applications mkdir -p $out/bin @@ -60,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - broken = isQt6 && stdenv.isDarwin; + broken = isQt6 && stdenv.hostPlatform.isDarwin; changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; description = "GPS log file viewer and analyzer"; mainProgram = "gpxsee"; diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index b2b9c7b67b06c..bb30f7d1b6320 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { kubectl ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Giant Swarm command line interface"; diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index 9ccf6b6edd6f8..3870851655038 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, installShellFiles, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, installShellFiles, fetchFromGitHub }: buildGoModule rec { pname = "gum"; - version = "0.14.4"; + version = "0.14.5"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-kR/DNNWCFj/ott31bcppA2gkpNK5OY+SsjYcQak5CK8="; + hash = "sha256-moKirTXziVo6ESOsnTUmPkcdBYL/VHaG226+UfM0xAk="; }; - vendorHash = "sha256-pjWaAeBXIBG+g3TPxioIG9Cl4rvEf4QjyinAtCBYSug="; + vendorHash = "sha256-wjM2ld4go7OQu6XqsSGurjN09Fd5t9FNLvIzgrZEZ1k="; nativeBuildInputs = [ installShellFiles @@ -22,6 +22,7 @@ buildGoModule rec { postInstall = '' $out/bin/gum man > gum.1 installManPage gum.1 + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd gum \ --bash <($out/bin/gum completion bash) \ --fish <($out/bin/gum completion fish) \ diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index ca12e3bc77a9c..b812e56073804 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-SIGCHLD-fallback" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { Xaw3d ghostscriptX perl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/applications/misc/health/default.nix b/pkgs/applications/misc/health/default.nix index 8a2972e99a3a5..8ff79b36a5155 100644 --- a/pkgs/applications/misc/health/default.nix +++ b/pkgs/applications/misc/health/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libadwaita libsecret tracker - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix index 4f9c748730e59..c71dae3b27e1b 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index 661f537d8bef3..9f10136042293 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -28,11 +28,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ fontconfig xorg.libXcursor xorg.libXi @@ -41,11 +41,11 @@ rustPlatform.buildRustPackage rec { wayland libxkbcommon openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit ]; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # time out on darwin "--skip=interpreter::tests::centered_image_with_size_align_and_link" "--skip=watcher::tests::the_gauntlet" @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { --zsh completions/_inlyne ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/inlyne \ --add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]} ''; diff --git a/pkgs/applications/misc/inochi2d/default.nix b/pkgs/applications/misc/inochi2d/default.nix index 44a98ee40339b..a88c58d38555d 100644 --- a/pkgs/applications/misc/inochi2d/default.nix +++ b/pkgs/applications/misc/inochi2d/default.nix @@ -45,7 +45,7 @@ in meta = { # darwin has slightly different build steps - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/Inochi2D/inochi-creator/releases/tag/${src.rev}"; description = "An open source editor for the Inochi2D puppet format"; }; @@ -73,7 +73,7 @@ in meta = { # darwin has slightly different build steps, aarch fails to build because of some lua related error - broken = stdenv.isDarwin || stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; changelog = "https://github.com/Inochi2D/inochi-session/releases/tag/${src.rev}"; description = "An application that allows streaming with Inochi2D puppets"; }; diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix index 769b44204420c..3e55f97f8b2da 100644 --- a/pkgs/applications/misc/inochi2d/generic.nix +++ b/pkgs/applications/misc/inochi2d/generic.nix @@ -14,6 +14,7 @@ freetype, SDL2, zenity, + libGL, builderArgs, }: @@ -126,7 +127,8 @@ buildDubPackage ( postFixup = '' # Add support for `open file` dialog makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \ - --prefix PATH : ${lib.makeBinPath [ zenity ]} + --prefix PATH : ${lib.makeBinPath [ zenity ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} ''; meta = { diff --git a/pkgs/applications/misc/insulator2/default.nix b/pkgs/applications/misc/insulator2/default.nix index b69a3c7fe88df..2fb8b15e3e947 100644 --- a/pkgs/applications/misc/insulator2/default.nix +++ b/pkgs/applications/misc/insulator2/default.nix @@ -1,5 +1,4 @@ { lib -, cmake , dbus , fetchFromGitHub , fetchYarnDeps @@ -13,12 +12,14 @@ , cyrus_sasl , stdenv , fixup_yarn_lock -, yarn +, yarnConfigHook , nodejs-slim , cargo-tauri , cargo , rustPlatform , rustc +, jq +, moreutils }: stdenv.mkDerivation rec { @@ -32,6 +33,11 @@ stdenv.mkDerivation rec { hash = "sha256-Bi9GCQr7yox5Plc7o0svRKYi1XoK/HDGj1VbW1z4jac="; }; + # Yarn *really* wants us to use corepack if this is set + postPatch = '' + jq 'del(.packageManager)' package.json | sponge package.json + ''; + yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; hash = "sha256-ih5NSOvYje981SkVfPHm/u2sS1B36kgxpfe9LmQaxdo="; @@ -47,37 +53,22 @@ stdenv.mkDerivation rec { }; }; - configurePhase = '' - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} - fixup_yarn_lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ - yarn run postinstall --offline - ''; - - preBuild = '' - yarn tauri build -b deb - ''; - cargoRoot = "backend/"; - - preInstall = '' - mv backend/target/release/bundle/deb/*/data/usr/ "$out" - ''; + buildAndTestDir = cargoRoot; nativeBuildInputs = [ - cmake pkg-config perl rustPlatform.cargoSetupHook cargo rustc - cargo-tauri + cargo-tauri.hook fixup_yarn_lock - yarn + yarnConfigHook nodejs-slim cyrus_sasl + jq + moreutils # for sponge ]; buildInputs = [ diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index b6885374ef061..98c901da12658 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "iptsd"; - version = "2"; + version = "3"; src = fetchFromGitHub { owner = "linux-surface"; - repo = pname; - rev = "v${version}"; - hash = "sha256-zTXTyDgSa1akViDZlYLtJk1yCREGCSJKxzF+HZAWx0c="; + repo = "iptsd"; + rev = "refs/tags/v${version}"; + hash = "sha256-3z3A9qywmsSW1tlJ6LePC5wudM/FITTAFyuPkbHlid0="; }; nativeBuildInputs = [ @@ -47,13 +47,12 @@ stdenv.mkDerivation rec { # Original installs udev rules and service config into global paths postPatch = '' substituteInPlace etc/meson.build \ - --replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \ - --replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'" - substituteInPlace etc/systemd/iptsd-find-service \ - --replace "iptsd-find-hidraw" "$out/bin/iptsd-find-hidraw" \ - --replace "systemd-escape" "${lib.getExe' systemd "systemd-escape"}" + --replace-fail "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \ + --replace-fail "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'" + substituteInPlace etc/scripts/iptsd-find-service \ + --replace-fail "systemd-escape" "${lib.getExe' systemd "systemd-escape"}" substituteInPlace etc/udev/50-iptsd.rules.in \ - --replace "/bin/systemd-escape" "${lib.getExe' systemd "systemd-escape"}" + --replace-fail "/bin/systemd-escape" "${lib.getExe' systemd "systemd-escape"}" ''; mesonFlags = [ @@ -64,7 +63,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - changelog = "https://github.com/linux-surface/iptsd/releases/tag/${src.rev}"; + changelog = "https://github.com/linux-surface/iptsd/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; description = "Userspace daemon for Intel Precise Touch & Stylus"; homepage = "https://github.com/linux-surface/iptsd"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 2c7a76e29991f..4957ce2261733 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -11,28 +11,29 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - bigdecimal (3.1.7) + bigdecimal (3.1.8) colorator (1.1.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) drb (2.2.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.16.3) + ffi (1.17.0) forwardable-extended (2.6.0) gemoji (4.1.0) - google-protobuf (4.26.1) + google-protobuf (4.27.2) + bigdecimal rake (>= 13) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) jekyll (4.3.3) addressable (~> 2.4) @@ -76,26 +77,28 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - mini_portile2 (2.8.5) - minitest (5.22.3) + mini_portile2 (2.8.7) + minitest (5.24.0) mutex_m (0.2.0) - nokogiri (1.16.3) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.4) - racc (1.7.3) - rake (13.1.0) + public_suffix (6.0.0) + racc (1.8.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.6) - rouge (4.2.1) + rexml (3.3.1) + strscan + rouge (4.3.0) safe_yaml (1.0.5) - sass-embedded (1.72.0) + sass-embedded (1.77.5) google-protobuf (>= 3.25, < 5.0) - rake (>= 13.0.0) + rake (>= 13) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.6) @@ -115,4 +118,4 @@ DEPENDENCIES jemoji BUNDLED WITH - 2.5.6 + 2.5.11 diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index fc049e314e54a..f135bf6ccdef6 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d"; + sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; base64 = { groups = ["default"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.8"; }; colorator = { groups = ["default"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.3"; }; connection_pool = { groups = ["default"]; @@ -107,10 +107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; forwardable-extended = { groups = ["default"]; @@ -133,15 +133,15 @@ version = "4.1.0"; }; google-protobuf = { - dependencies = ["rake"]; + dependencies = ["bigdecimal" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14s40yxj35vixx9pvpnbrkz9z7ga3m7vcy72yll1flnn3cirl1aj"; + sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz"; type = "gem"; }; - version = "4.26.1"; + version = "4.27.2"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -170,10 +170,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.4"; + version = "1.14.5"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; @@ -321,20 +321,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.7"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; + sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg"; type = "gem"; }; - version = "5.22.3"; + version = "5.24.0"; }; mutex_m = { groups = ["default"]; @@ -352,10 +352,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9"; + sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; type = "gem"; }; - version = "1.16.3"; + version = "1.16.6"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -373,30 +373,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j"; type = "gem"; }; - version = "5.0.4"; + version = "6.0.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; rake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.1.0"; + version = "13.2.1"; }; rb-fsevent = { groups = ["default"]; @@ -414,30 +414,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; rexml = { + dependencies = ["strscan"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.1"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk"; + sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy"; type = "gem"; }; - version = "4.2.1"; + version = "4.3.0"; }; safe_yaml = { groups = ["default"]; @@ -455,10 +456,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bixk8c02dhflvhi4s5hxzjg8akzgicvjxjvxx74nah2j8qfblq5"; + sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2"; type = "gem"; }; - version = "1.72.0"; + version = "1.77.5"; + }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + type = "gem"; + }; + version = "3.1.0"; }; terminal-table = { dependencies = ["unicode-display_width"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile index 5e7e2d9032a37..5f095debe6d66 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile +++ b/pkgs/applications/misc/jekyll/full/Gemfile @@ -10,6 +10,7 @@ gem "jemoji" # Optional dependencies: gem "jekyll-coffeescript" +gem "jekyll-compose" #gem "jekyll-docs" gem "jekyll-favicon" gem "jekyll-feed", "~> 0.9" diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index c9cae601691ac..de800bfeb75d8 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -11,10 +11,10 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - bigdecimal (3.1.7) + bigdecimal (3.1.8) classifier-reborn (2.3.0) fast-stemmer (~> 1.0) matrix (~> 0.4) @@ -24,7 +24,7 @@ GEM execjs coffee-script-source (1.12.2) colorator (1.1.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) drb (2.2.1) em-websocket (0.5.3) @@ -32,21 +32,22 @@ GEM http_parser.rb (~> 0) eventmachine (1.2.7) execjs (2.9.1) - faraday (2.9.0) + faraday (2.9.2) faraday-net_http (>= 2.0, < 3.2) faraday-net_http (3.1.0) net-http fast-stemmer (1.0.2) - ffi (1.16.3) + ffi (1.17.0) forwardable-extended (2.6.0) gemoji (4.1.0) - google-protobuf (4.26.1) + google-protobuf (4.27.2) + bigdecimal rake (>= 13) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) jekyll (4.3.3) addressable (~> 2.4) @@ -69,6 +70,8 @@ GEM jekyll-coffeescript (2.0.0) coffee-script (~> 2.2) coffee-script-source (~> 1.12) + jekyll-compose (0.12.0) + jekyll (>= 3.7, < 5.0) jekyll-favicon (1.1.0) jekyll (>= 3.0, < 5.0) mini_magick (~> 4.11) @@ -114,14 +117,14 @@ GEM mercenary (0.4.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) - mini_magick (4.12.0) - mini_portile2 (2.8.5) - minitest (5.22.3) + mime-types-data (3.2024.0604) + mini_magick (4.13.1) + mini_portile2 (2.8.7) + minitest (5.24.0) mutex_m (0.2.0) net-http (0.4.1) uri - nokogiri (1.16.3) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) octokit (4.25.1) @@ -131,24 +134,26 @@ GEM forwardable-extended (~> 2.6) psych (5.1.2) stringio - public_suffix (5.0.4) - racc (1.7.3) - rake (13.1.0) + public_suffix (6.0.0) + racc (1.8.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rdoc (6.6.3.1) + rdoc (6.7.0) psych (>= 4.0.0) - rexml (3.2.6) - rouge (4.2.1) + rexml (3.3.1) + strscan + rouge (4.3.0) safe_yaml (1.0.5) - sass-embedded (1.72.0) + sass-embedded (1.77.5) google-protobuf (>= 3.25, < 5.0) - rake (>= 13.0.0) + rake (>= 13) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - stringio (3.1.0) + stringio (3.1.1) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tomlrb (1.3.0) @@ -167,6 +172,7 @@ DEPENDENCIES jekyll jekyll-avatar jekyll-coffeescript + jekyll-compose jekyll-favicon jekyll-feed (~> 0.9) jekyll-gist @@ -185,4 +191,4 @@ DEPENDENCIES yajl-ruby (~> 1.4) BUNDLED WITH - 2.5.6 + 2.5.11 diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index d81dee1136a0d..4260c081f19c4 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d"; + sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; base64 = { groups = ["default"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.8"; }; classifier-reborn = { dependencies = ["fast-stemmer" "matrix"]; @@ -110,10 +110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.3"; }; connection_pool = { groups = ["default"]; @@ -172,10 +172,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; + sha256 = "1913fk7szy3bj8mf1dxs4waym5ya5fzzc5d3a8z24qs67fzfv5b5"; type = "gem"; }; - version = "2.9.0"; + version = "2.9.2"; }; faraday-net_http = { dependencies = ["net-http"]; @@ -215,10 +215,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; forwardable-extended = { groups = ["default"]; @@ -241,15 +241,15 @@ version = "4.1.0"; }; google-protobuf = { - dependencies = ["rake"]; + dependencies = ["bigdecimal" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14s40yxj35vixx9pvpnbrkz9z7ga3m7vcy72yll1flnn3cirl1aj"; + sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz"; type = "gem"; }; - version = "4.26.1"; + version = "4.27.2"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -278,10 +278,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.4"; + version = "1.14.5"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; @@ -316,6 +316,17 @@ }; version = "2.0.0"; }; + jekyll-compose = { + dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ny8xps0mrmx2w0xxc9rwa15ch1wkxvdrzxiwnqramqwja566y04"; + type = "gem"; + }; + version = "0.12.0"; + }; jekyll-favicon = { dependencies = ["jekyll" "mini_magick" "rexml"]; groups = ["default"]; @@ -584,40 +595,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455"; + sha256 = "0rri45lldyk3bsg4yqpxcl1xrnxnqasnw94x03w5arq3yy7kff65"; type = "gem"; }; - version = "3.2024.0305"; + version = "3.2024.0604"; }; mini_magick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; + sha256 = "1zbfldqc3dp9fiyz9d4hkkabkvsmx5649bs78j5008i5gzr0x6zg"; type = "gem"; }; - version = "4.12.0"; + version = "4.13.1"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.7"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; + sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg"; type = "gem"; }; - version = "5.22.3"; + version = "5.24.0"; }; mutex_m = { groups = ["default"]; @@ -646,10 +657,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9"; + sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; type = "gem"; }; - version = "1.16.3"; + version = "1.16.6"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -689,30 +700,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j"; type = "gem"; }; - version = "5.0.4"; + version = "6.0.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; rake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.1.0"; + version = "13.2.1"; }; rb-fsevent = { groups = ["default"]; @@ -730,10 +741,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; rdoc = { dependencies = ["psych"]; @@ -741,30 +752,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ib3cnf4yllvw070gr4bz94sbmqx3haqc5f846fsvdcs494vgxrr"; + sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi"; type = "gem"; }; - version = "6.6.3.1"; + version = "6.7.0"; }; rexml = { + dependencies = ["strscan"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.1"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk"; + sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy"; type = "gem"; }; - version = "4.2.1"; + version = "4.3.0"; }; safe_yaml = { groups = ["default"]; @@ -782,10 +794,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bixk8c02dhflvhi4s5hxzjg8akzgicvjxjvxx74nah2j8qfblq5"; + sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2"; type = "gem"; }; - version = "1.72.0"; + version = "1.77.5"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -803,7 +815,17 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1"; + sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; + type = "gem"; + }; + version = "3.1.1"; + }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; type = "gem"; }; version = "3.1.0"; diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh index 650f3993f51e3..6d97872e2bf64 100755 --- a/pkgs/applications/misc/jekyll/update.sh +++ b/pkgs/applications/misc/jekyll/update.sh @@ -1,13 +1,12 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p bundix zlib libyaml -set -o errexit -set -o nounset +set -o errexit -o nounset -readonly BASEDIR="$(dirname $(readlink -f $0))" +script_dir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) for directory in "basic" "full"; do - pushd "$BASEDIR/$directory" + pushd "$script_dir/$directory" rm -f Gemfile.lock gemset.nix BUNDLE_FORCE_RUBY_PLATFORM=true bundix --magic rm -rf .bundle vendor diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 6a1a9423b5eb3..7f85685679e14 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -44,13 +44,13 @@ let linux = appimageTools.wrapType2 rec { inherit pname version src meta; + nativeBuildInputs = [ makeWrapper ]; profile = '' export LC_ALL=C.UTF-8 ''; extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications @@ -74,6 +74,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index 7702468768167..f55b435a4b613 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installFlags = [ "bashcompdir=\${out}/share/bash-completion/completions" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://csl.name/jp2a/"; description = "Small utility that converts JPG images to ASCII"; license = licenses.gpl2Only; diff --git a/pkgs/applications/misc/kbt/default.nix b/pkgs/applications/misc/kbt/default.nix index c59b5e62c4339..8a7e91ba3c7dd 100644 --- a/pkgs/applications/misc/kbt/default.nix +++ b/pkgs/applications/misc/kbt/default.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-6zD9WRPWEt0ubppaMRTOusy0zm3z6SGB/5/kMxcJ/Ag="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]; diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index 663768e28dae8..914884a9aa2b6 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ "-Wno-old-style-cast" "-Wno-error" - "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" + "-D__BIG_ENDIAN__=${if stdenv.hostPlatform.isBigEndian then "1" else "0"}" ]); - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-rpath ${libargon2}/lib"; patches = [ ./darwin.patch @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { "-DWITH_XC_UPDATECHECK=OFF" ] ++ (lib.optional (!withKeePassX11) "-DWITH_XC_X11=OFF") - ++ (lib.optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") - ++ (lib.optional (withKeePassYubiKey && stdenv.isLinux) "-DWITH_XC_YUBIKEY=ON") + ++ (lib.optional (withKeePassFDOSecrets && stdenv.hostPlatform.isLinux) "-DWITH_XC_FDOSECRETS=ON") + ++ (lib.optional (withKeePassYubiKey && stdenv.hostPlatform.isLinux) "-DWITH_XC_YUBIKEY=ON") ++ (lib.optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") ++ (lib.optional withKeePassBrowserPasskeys "-DWITH_XC_BROWSER_PASSKEYS=ON") ++ (lib.optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" # testcli, testgui and testkdbx4 are flaky - skip them all # testautotype on darwin throws "QWidget: Cannot create a QWidget without QApplication" - make test ARGS+="-E 'testcli|testgui${lib.optionalString stdenv.isDarwin "|testautotype|testkdbx4"}' --output-on-failure" + make test ARGS+="-E 'testcli|testgui${lib.optionalString stdenv.hostPlatform.isDarwin "|testautotype|testkdbx4"}' --output-on-failure" runHook postCheck ''; @@ -98,12 +98,12 @@ stdenv.mkDerivation rec { qttools pkg-config ] - ++ lib.optional (!stdenv.isDarwin) wrapGAppsHook3; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) wrapGAppsHook3; dontWrapGApps = true; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' wrapQtApp "$out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC" ''; @@ -128,9 +128,9 @@ stdenv.mkDerivation rec { readline zlib ] - ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) LocalAuthentication - ++ lib.optional stdenv.isDarwin qtmacextras - ++ lib.optional stdenv.isLinux libusb1 + ++ lib.optional (stdenv.hostPlatform.isDarwin && withKeePassTouchID) LocalAuthentication + ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras + ++ lib.optional stdenv.hostPlatform.isLinux libusb1 ++ lib.optional withKeePassX11 qtx11extras; passthru.tests = nixosTests.keepassxc; @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato blankparticle ]; + maintainers = with maintainers; [ blankparticle ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix deleted file mode 100644 index 33ebb9e329f25..0000000000000 --- a/pkgs/applications/misc/keeweb/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ lib -, stdenv -, fetchurl -, undmg -, dpkg -, autoPatchelfHook -, wrapGAppsHook3 -, makeWrapper -, alsa-lib -, at-spi2-atk -, gdk-pixbuf -, glibc -, nss -, udev -, xorg -, gnome-keyring -, mesa -, gtk3 -, libusb1 -, libsecret -, libappindicator -, xdotool -}: -let - pname = "keeweb"; - version = "1.18.7"; - - srcs = { - x86_64-linux = fetchurl { - 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="; - }; - }; - src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - libraries = [ - alsa-lib - at-spi2-atk - gdk-pixbuf - nss - udev - xorg.libX11 - xorg.libXcomposite - xorg.libXext - xorg.libXrandr - xorg.libXScrnSaver - xorg.libXtst - xorg.libxshmfence - gnome-keyring - mesa - gtk3 - libusb1 - libsecret - libappindicator - xdotool - ]; - - meta = with lib; { - description = "Free cross-platform password manager compatible with KeePass"; - mainProgram = "keeweb"; - homepage = "https://keeweb.info/"; - changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = builtins.attrNames srcs; - }; -in -if stdenv.isDarwin -then stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ undmg ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/Applications - cp -r *.app $out/Applications - ''; -} -else stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook3 - makeWrapper - ]; - - buildInputs = libraries; - - unpackPhase = '' - ${dpkg}/bin/dpkg-deb --fsys-tarfile $src | tar --extract - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp -r usr/share $out/share - - makeWrapper $out/share/keeweb-desktop/keeweb $out/bin/keeweb \ - --argv0 "keeweb" \ - --add-flags "$out/share/keeweb-desktop/resources/app.asar" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libraries}" - - runHook postInstall - ''; -} diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix index 70941045ce368..7ad3afc16ce57 100644 --- a/pkgs/applications/misc/kemai/default.nix +++ b/pkgs/applications/misc/kemai/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ poelzi ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "Kemai"; }; } diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 83de3e517d78b..32c307af60257 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -69,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { install -Dm755 misc/khal.desktop -t $out/share/applications ''; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 0b1bc647917a7..afff0cd683684 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -1,17 +1,17 @@ { lib, mkDerivation, fetchFromGitHub , python3, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl +, which, perl, libgit2 }: mkDerivation rec { pname = "klayout"; - version = "0.28.12"; + version = "0.29.6"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-QvEoXKJ9sH5WIarYPsYEWwoFwA/pZa2etegA+AD8rPo="; + hash = "sha256-gbbes8CPh+Z9wCeQaAaObZjQvBTMe06z8oR12i6e12M="; }; postPatch = '' @@ -31,6 +31,7 @@ mkDerivation rec { qtmultimedia qttools qtxmlpatterns + libgit2 ]; buildPhase = '' diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix index 136ad6115d786..e7a511769a8eb 100644 --- a/pkgs/applications/misc/klipper-estimator/default.nix +++ b/pkgs/applications/misc/klipper-estimator/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libgit2 Security SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libgit2 Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/applications/misc/klipperscreen/default.nix index 5364d090f75d2..0ef76edd42629 100644 --- a/pkgs/applications/misc/klipperscreen/default.nix +++ b/pkgs/applications/misc/klipperscreen/default.nix @@ -6,14 +6,14 @@ , gitUpdater }: python3.pkgs.buildPythonApplication rec { pname = "KlipperScreen"; - version = "0.3.2"; + version = "0.4.4"; format = "other"; src = fetchFromGitHub { - owner = "jordanruthe"; + owner = "KlipperScreen"; repo = "KlipperScreen"; rev = "v${version}"; - hash = "sha256-LweO5EVWr3OxziHrjtQDdWyUBCVUJ17afkw7RCZWgcg="; + hash = "sha256-MxuUmkuEnfFC0iPwNUc0Wh8bIEl1J1FMgGEYMjHePZ8="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ description = "Touchscreen GUI for the Klipper 3D printer firmware"; homepage = "https://github.com/jordanruthe/KlipperScreen"; license = licenses.agpl3Only; - maintainers = with maintainers; [ cab404 ]; + maintainers = with maintainers; [ cab404 saturn745 ]; mainProgram = "KlipperScreen"; }; } diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/applications/misc/kord/default.nix index 65337780469a6..4cbd5f38e19a4 100644 --- a/pkgs/applications/misc/kord/default.nix +++ b/pkgs/applications/misc/kord/default.nix @@ -40,11 +40,11 @@ rustPlatform.buildRustPackage rec { }) ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; meta = with lib; { description = "Music theory binary and library for Rust"; diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index d03b005d0b468..014bc216b40bc 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -17,13 +17,20 @@ stdenv.mkDerivation rec { version = "2024.04"; - src = if stdenv.isAarch64 then fetchurl { - url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; - hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; - } else fetchurl { - url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; - }; + src = { + aarch64-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; + hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; + }; + armv7l-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-armhf.deb"; + hash = "sha256-LgeWQcHm5Qq/7MUuidjily0WsOFZAWGWeO52jNHWKMw="; + }; + x86_64-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; + hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src_repo = fetchFromGitHub { repo = "koreader"; @@ -68,7 +75,7 @@ stdenv.mkDerivation rec { "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; mainProgram = "koreader"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; license = licenses.agpl3Only; maintainers = with maintainers; [ contrun neonfuz]; }; diff --git a/pkgs/applications/misc/krabby/default.nix b/pkgs/applications/misc/krabby/default.nix index e6edfd9c4ab13..f44a44523aa1e 100644 --- a/pkgs/applications/misc/krabby/default.nix +++ b/pkgs/applications/misc/krabby/default.nix @@ -4,14 +4,14 @@ }: rustPlatform.buildRustPackage rec { pname = "krabby"; - version = "0.1.8"; + version = "0.2.0"; src = fetchCrate { inherit pname version; - hash = "sha256-pqLk05hDPMvbrDG3xatAP0licaJszBSujo1fqsEtpRI="; + hash = "sha256-R4GW0e0tjLiCXQMf8iA+yYyMp43/28GeNsjs+QNQMSM="; }; - cargoHash = "sha256-/wXfdH9ObKGOw8EXHG/3Gvhm66v632lpDp/V3zFIzh4="; + cargoHash = "sha256-eQyU0sMfecOjX5k1qYeetrAhk41FIMcg9QmhhTYOxWc="; meta = with lib; { description = "Print pokemon sprites in your terminal"; diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix index 3cca48b24c610..24d7faf407220 100644 --- a/pkgs/applications/misc/leetcode-cli/default.nix +++ b/pkgs/applications/misc/leetcode-cli/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { openssl dbus sqlite - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd leetcode \ diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 7dc018e087146..c7a1ce9f5d2f1 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { wxsqlite3 fluidsynth fontconfig - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { "-DMAN_INSTALL_DIR=${placeholder "out"}/share/man" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/lenmus.app $out/Applications mv $out/Resources $out/Applications/lenmus.app/Contents diff --git a/pkgs/applications/misc/liberasurecode/default.nix b/pkgs/applications/misc/liberasurecode/default.nix deleted file mode 100644 index f94496d0b125e..0000000000000 --- a/pkgs/applications/misc/liberasurecode/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, doxygen -, installShellFiles -, zlib -}: - -stdenv.mkDerivation rec { - pname = "liberasurecode"; - version = "1.6.3"; - - outputs = [ "out" "dev" "doc" ]; - - src = fetchFromGitHub { - owner = "openstack"; - repo = pname; - rev = version; - sha256 = "sha256-HCp+FQ9nq4twk6FtfKhzT80wXXJbvG+clrDO2/9ATpU="; - }; - - postPatch = '' - substituteInPlace doc/doxygen.cfg.in \ - --replace "GENERATE_MAN = NO" "GENERATE_MAN = YES" - - substituteInPlace Makefile.am src/Makefile.am \ - --replace "-Werror" "" - ''; - - nativeBuildInputs = [ autoreconfHook doxygen installShellFiles ]; - - buildInputs = [ zlib ]; - - configureFlags = [ - "--disable-werror" - "--enable-doxygen" - ]; - - postInstall = '' - # remove useless man pages about directories - rm doc/man/man*/_* - installManPage doc/man/man*/* - - moveToOutput share/liberasurecode/ $doc - ''; - - checkTarget = "test"; - - meta = with lib; { - description = "Erasure Code API library written in C with pluggable Erasure Code backends"; - homepage = "https://github.com/openstack/liberasurecode"; - license = licenses.bsd2; - maintainers = teams.openstack.members; - }; -} diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index db089796222cb..ff5d34e8224a1 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ocaml pkg-config ]; buildInputs = [ mupdf libX11 freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ] - ++ lib.optionals stdenv.isLinux [ libGLU libGL ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.Cocoa ]; dontStrip = true; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { install build/llpp $out/bin install misc/llpp.inotify $out/bin/llpp.inotify install -Dm444 misc/llpp.desktop -t $out/share/applications - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/llpp \ --prefix PATH ":" "${xclip}/bin" diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index 263ac29eaed29..3d31ece646942 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.19.0"; + version = "0.20.0"; src = fetchCrate { inherit version pname; - hash = "sha256-9xYWjpeXg646JEW7faRLE1Au6LRVU6QQ7zfAwmYffT0="; + hash = "sha256-EUUPVSpHc9tN1Hi7917hJ2psTZq5nnGw6PBeApvlVtw="; }; - cargoHash = "sha256-gtcznStbuYWcBPKZ/hdH15cwRQL0+Q0fZHe+YW5Rek0="; + cargoHash = "sha256-1wAHd0WrJfjxDyGRAJjXGFY9ZBFlBOQFr2+cxoTufW0="; buildFeatures = [ "nu-ansi-term" ]; diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index dda7343d25e15..7471d7ce5e97d 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -1,12 +1,12 @@ { lib, appimageTools, fetchurl }: let - version = "2.0.4"; + version = "2.0.9"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-U+yelFSulAhgsn5xt45mxC7qGpQwmb3m3lt9nEW6MHU="; + sha256 = "sha256-tV3giMBF3DN8Aop1B1D7pGp3HYPMQlcZ52JrOhxFrEE="; }; appimageContents = appimageTools.extractType2 { @@ -24,6 +24,8 @@ appimageTools.wrapType2 rec { --replace 'Exec=AppRun' 'Exec=${pname}' ''; + passthru.updateScript = ./update.py; + meta = with lib; { description = "All-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app"; longDescription = '' @@ -31,6 +33,7 @@ appimageTools.wrapType2 rec { ''; homepage = "https://lunatask.app"; downloadPage = "https://lunatask.app/download"; + changelog = "https://lunatask.app/releases/${version}"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ henkery ]; diff --git a/pkgs/applications/misc/lunatask/update.py b/pkgs/applications/misc/lunatask/update.py new file mode 100755 index 0000000000000..128b7e78fbaf7 --- /dev/null +++ b/pkgs/applications/misc/lunatask/update.py @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python --packages python3 python3Packages.feedparser common-updater-scripts +""" +Parses the latest version from atom feed and runs update-source-version +""" + +import subprocess +import feedparser + +URL = "https://lunatask.app/releases/atom.xml" + +feed = feedparser.parse(URL) + +latest_entry = feed.entries[0] + +latest_version = latest_entry.title.split()[-1].lstrip("v") + +subprocess.run(["update-source-version", "lunatask", latest_version], check=True) diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index e4093295df682..92498cc92612d 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5zGUBvmf68tCk5jGrNn+ukgYbiKzrlmZvWrYgoJf2zk="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Plain text Zettelkasten based on mdBook"; diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index e0a3921824de2..18b4b0b9d2b28 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -36,9 +36,9 @@ python3Packages.buildPythonApplication rec { setuptools wxpython ] - ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ++ lib.flatten (lib.attrValues optional-dependencies); - passthru.optional-dependencies = with python3Packages; { + optional-dependencies = with python3Packages; { cam = [ opencv4 ]; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix deleted file mode 100644 index ce6cbc2a3b76d..0000000000000 --- a/pkgs/applications/misc/merkaartor/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, gdal -, proj -, qtsvg -, qtwebengine -, withGeoimage ? true, exiv2 -, withGpsdlib ? (!stdenv.isDarwin), gpsd -, withLibproxy ? false, libproxy -, withZbar ? false, zbar -}: - -stdenv.mkDerivation rec { - pname = "merkaartor"; - version = "0.19.0"; - - src = fetchFromGitHub { - owner = "openstreetmap"; - repo = "merkaartor"; - rev = version; - hash = "sha256-I3QNCXzwhEFa8aOdwl3UJV8MLZ9caN9wuaaVrGFRvbQ="; - }; - - patches = [ - (fetchpatch { - name = "exiv2-0.28.patch"; - url = "https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd.patch"; - hash = "sha256-aHjJLKYvqz7V0QwUIg0SbentBe+DaCJusVqy4xRBVWo="; - }) - # https://github.com/openstreetmap/merkaartor/pull/290 - (fetchpatch { - url = "https://github.com/openstreetmap/merkaartor/commit/7dede77370d89e8e7586f6ed5af225f9b5bde6cf.patch"; - hash = "sha256-3oDRPysVNvA50t/b9xOcVQgac3U1lDPrencanl4c6Zk="; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; - - buildInputs = [ gdal proj qtsvg qtwebengine ] - ++ lib.optional withGeoimage exiv2 - ++ lib.optional withGpsdlib gpsd - ++ lib.optional withLibproxy libproxy - ++ lib.optional withZbar zbar; - - cmakeFlags = [ - (lib.cmakeBool "GEOIMAGE" withGeoimage) - (lib.cmakeBool "GPSD" withGpsdlib) - (lib.cmakeBool "LIBPROXY" withLibproxy) - (lib.cmakeBool "WEBENGINE" true) - (lib.cmakeBool "ZBAR" withZbar) - ]; - - postInstall = '' - # Binary is looking for .qm files in share/merkaartor - mv $out/share/merkaartor/{translations/*.qm,} - rm -r $out/share/merkaartor/translations - '' + lib.optionalString stdenv.isDarwin '' - mkdir -p $out/{Applications,bin} - mv $out/merkaartor.app $out/Applications - # Prevent wrapping, otherwise plugins will not be loaded - chmod -x $out/Applications/merkaartor.app/Contents/plugins/background/*.dylib - makeWrapper $out/{Applications/merkaartor.app/Contents/MacOS,bin}/merkaartor - ''; - - meta = with lib; { - description = "OpenStreetMap editor"; - homepage = "http://merkaartor.be/"; - license = licenses.gpl2Plus; - mainProgram = "merkaartor"; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/mission-center/Cargo.lock b/pkgs/applications/misc/mission-center/Cargo.lock deleted file mode 100644 index 554a818901516..0000000000000 --- a/pkgs/applications/misc/mission-center/Cargo.lock +++ /dev/null @@ -1,1230 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[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 = "cairo-rs" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" -dependencies = [ - "bitflags", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "cc" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "libc", - "libdbus-sys", - "winapi", -] - -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f7083207e75d4435df450dc6413612d97fe5a441477aba02484f9f7f77057e" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-core", - "futures-macro", - "futures-task", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "getrandom" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gio" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "windows-sys", -] - -[[package]] -name = "glib" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be682de2914107f591efdbe2debf05d9ad70726310ee2b6a3802a697649fcc55" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed782fa3e949c31146671da6e7a227a5e7d354660df1db6d0aac4974dc82a3c" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "glib-sys" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "gobject-sys" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "graphene-rs" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" -dependencies = [ - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" -dependencies = [ - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "gtk4-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692eaaf7f7607518dd3cef090f1474b61edc5301d8012f09579920df68b725ee" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libadwaita" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" -dependencies = [ - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "libc" -version = "0.2.154" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" - -[[package]] -name = "libdbus-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libudev-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[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.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "missioncenter" -version = "0.5.2" -dependencies = [ - "dbus", - "errno-sys", - "gettext-rs", - "gtk4", - "lazy_static", - "libadwaita", - "libc", - "libudev-sys", - "regex", - "rusqlite", - "rust-ini", - "serde", - "serde_json", - "static_assertions", - "textdistance", -] - -[[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 = "ordered-multimap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" -dependencies = [ - "dlv-list", - "hashbrown", -] - -[[package]] -name = "pango" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" -dependencies = [ - "gio", - "glib", - "libc", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - -[[package]] -name = "proc-macro2" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" -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 = "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 = "rusqlite" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" -dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rust-ini" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" -dependencies = [ - "cfg-if", - "ordered-multimap", - "trim-in-place", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "semver" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" - -[[package]] -name = "serde" -version = "1.0.200" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.200" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.116" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "syn" -version = "2.0.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "temp-dir" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" - -[[package]] -name = "textdistance" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" - -[[package]] -name = "thiserror" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "toml" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.12", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.7", -] - -[[package]] -name = "trim-in-place" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" - -[[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.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.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" - -[[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.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" -dependencies = [ - "memchr", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix deleted file mode 100644 index 9188df9e5b3b4..0000000000000 --- a/pkgs/applications/misc/mission-center/default.nix +++ /dev/null @@ -1,144 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - fetchFromGitHub, - cargo, - libxml2, - meson, - ninja, - pkg-config, - python311, - rustPlatform, - symlinkJoin, - rustc, - wrapGAppsHook4, - appstream-glib, - blueprint-compiler, - cairo, - cmake, - dbus, - desktop-file-utils, - gdk-pixbuf, - gettext, - glib, - graphene, - gtk4, - libGL, - libadwaita, - libdrm, - mesa, - pango, - sqlite, - udev, - wayland, - dmidecode, - vulkan-loader, -}: - -let - nvtop = fetchFromGitHub { - owner = "Syllo"; - repo = "nvtop"; - rev = "45a1796375cd617d16167869bb88e5e69c809468"; - hash = "sha256-1P9pWXhgTHogO0DztxOsFKNwvTRRfDL3nzGmMANMC9w="; - }; -in -stdenv.mkDerivation rec { - pname = "mission-center"; - version = "0.5.2"; - - src = fetchFromGitLab { - owner = "mission-center-devs"; - repo = "mission-center"; - rev = "v${version}"; - hash = "sha256-84D+CttolY5hleCJbDiN3mlk0+nlwwJUJhGoKGVT/lw="; - }; - - cargoDeps = symlinkJoin { - name = "cargo-vendor-dir"; - paths = [ - (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }) - (rustPlatform.importCargoLock { lockFile = ./gatherer-Cargo.lock; }) - ]; - }; - - nativeBuildInputs = [ - blueprint-compiler - cargo - libxml2 - meson - ninja - pkg-config - python311 - rustPlatform.cargoSetupHook - rustc - wrapGAppsHook4 - ]; - - buildInputs = [ - appstream-glib - blueprint-compiler - cairo - cmake - dbus - desktop-file-utils - gdk-pixbuf - gettext - glib - graphene - gtk4 - libGL - libadwaita - libdrm - mesa - pango - sqlite - udev - wayland - ]; - - postPatch = '' - substituteInPlace src/sys_info_v2/gatherer.rs \ - --replace '"missioncenter-gatherer"' '"${placeholder "out"}/bin/missioncenter-gatherer"' - - substituteInPlace src/sys_info_v2/mem_info.rs \ - --replace '"dmidecode"' '"${dmidecode}/bin/dmidecode"' - - substituteInPlace $cargoDepsCopy/gl_loader-*/src/glad.c \ - --replace "libGL.so.1" "${libGL}/lib/libGL.so.1" - - substituteInPlace $cargoDepsCopy/ash-*/src/entry.rs \ - --replace '"libvulkan.so.1"' '"${vulkan-loader}/lib/libvulkan.so.1"' - - SRC_GATHERER=$NIX_BUILD_TOP/source/src/sys_info_v2/gatherer - SRC_GATHERER_NVTOP=$SRC_GATHERER/3rdparty/nvtop - - substituteInPlace $SRC_GATHERER_NVTOP/nvtop.json \ - --replace "nvtop-45a1796375cd617d16167869bb88e5e69c809468" "nvtop-src" - - GATHERER_BUILD_DEST=$NIX_BUILD_TOP/source/build/src/sys_info_v2/gatherer/src/debug/build/native - mkdir -p $GATHERER_BUILD_DEST - NVTOP_SRC=$GATHERER_BUILD_DEST/nvtop-src - - cp -r --no-preserve=mode,ownership "${nvtop}" $NVTOP_SRC - pushd $NVTOP_SRC - mkdir -p include/libdrm - for patchfile in $(ls $SRC_GATHERER_NVTOP/patches/nvtop*.patch); do - patch -p1 < $patchfile - done - popd - - patchShebangs data/hwdb/generate_hwdb.py - ''; - - meta = { - description = "Monitor your CPU, Memory, Disk, Network and GPU usage"; - homepage = "https://gitlab.com/mission-center-devs/mission-center"; - changelog = "https://gitlab.com/mission-center-devs/mission-center/-/releases/v${version}"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ GaetanLepage ]; - platforms = lib.platforms.linux; - mainProgram = "missioncenter"; - }; -} diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index a73767492f3fe..f475359a86cb3 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4921"; + version = "4922"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-s7EKHXh3UNMDzBmWUTZaLR1P21e27cWJNYRlFcpJu50="; + sha256 = "sha256-LgGdV6l9tjRR4BpGTDTm0MeAq2uiOe7Pv0qv87nbbWw="; }; patches = [ diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 9fa453cacdbfa..d09a02a172520 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -2,20 +2,20 @@ , buildGoModule , fetchFromGitHub , stdenv -, withSpeech ? !stdenv.isDarwin +, withSpeech ? !stdenv.hostPlatform.isDarwin , makeWrapper , espeak-ng }: buildGoModule rec { pname = "mob"; - version = "5.1.1"; + version = "5.3.1"; src = fetchFromGitHub { owner = "remotemobprogramming"; repo = "mob"; rev = "v${version}"; - hash = "sha256-+v48znHCfu2qBFB0JhYT1vnce0wSHMULTlwaLv0237Q="; + hash = "sha256-+zNlxIvIvPyz0vA9IPaMzP8wfEXwNyRcvp45ohzoxQQ="; }; vendorHash = null; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 7af43038e61a2..0a242d50e3e63 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -15,7 +15,7 @@ , libjpeg , darwin , gumbo -, enableX11 ? (!stdenv.isDarwin) +, enableX11 ? (!stdenv.hostPlatform.isDarwin) , libX11 , libXext , libXi @@ -98,16 +98,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ lib.optional (enableGL || enableX11) copyDesktopItems - ++ lib.optional (stdenv.isDarwin && (enableGL || enableX11)) desktopToDarwinBundle + ++ lib.optional (stdenv.hostPlatform.isDarwin && (enableGL || enableX11)) desktopToDarwinBundle ++ lib.optionals (enableCxx || enablePython) [ python3 python3.pkgs.setuptools python3.pkgs.libclang ] ++ lib.optionals (enablePython) [ which swig ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames xcbuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames xcbuild ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] else [ freeglut-mupdf libGLU ] @@ -167,7 +167,7 @@ stdenv.mkDerivation rec { moveToOutput "bin" "$bin" cp ./build/shared-release/libmupdf${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib - '' + (lib.optionalString (stdenv.isDarwin) '' + '' + (lib.optionalString (stdenv.hostPlatform.isDarwin) '' for exe in $bin/bin/*; do install_name_tool -change build/shared-release/libmupdf.dylib $out/lib/libmupdf.dylib "$exe" done @@ -185,7 +185,7 @@ stdenv.mkDerivation rec { mkdir -p $out/${python3.sitePackages}/mupdf cp build/*/_mupdf.so $out/${python3.sitePackages} cp build/*/mupdf.py $out/${python3.sitePackages}/mupdf/__init__.py - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool -add_rpath $out/lib $out/${python3.sitePackages}/_mupdf.so '')); @@ -212,5 +212,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; mainProgram = "mupdf"; + # ImportError: cannot import name '_mupdf' from partially initialized module 'mupdf' + # (most likely due to a circular import) + broken = enablePython; }; } diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 5591fa9b4533b..01df4df5d1c75 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString ([ # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated "-Wno-error=deprecated-declarations" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # error: narrowing conversion of '-1' from 'int' to 'char' "-Wno-error=narrowing" ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index 102991f002566..587bf4ac4d7c4 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "09mv52a5f0h3das8x96irqyznm69arfskx472b7w3b9q4a2ipxbq"; }; - buildInputs = [ ]; - installPhase = '' mkdir -p $out/bin cp -r * $out diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 23abf6a3546e3..2d634e99dd157 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; postInstall = '' wrapProgram $out/bin/navi \ diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index cccb55f5e5f72..9d1c4a246627c 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -22,6 +22,8 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; + nativeBuildInputs = [ makeWrapper ]; + extraPkgs = pkgs: [ pkgs.at-spi2-atk pkgs.at-spi2-core ]; extraInstallCommands = '' @@ -30,7 +32,6 @@ appimageTools.wrapType2 rec { $out/share/icons/hicolor/1024x1024/apps/notable.png substituteInPlace $out/share/applications/notable.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/${pname}" \ --add-flags "--disable-seccomp-filter-sandbox" ''; diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 82ade89882a1b..8f3cb528722d4 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -2,7 +2,7 @@ let pname = "notesnook"; - version = "3.0.11"; + version = "3.0.16"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; hash = { - x86_64-linux = "sha256-QnjfeN6CoLiyZvJY4mAZFJ58LxHhe/QUzpI4Fbz5Etg="; - x86_64-darwin = "sha256-uT4xo4LT70jq7bHmiYu4FL8Fldppc2ai8yEZzGMzM6Q="; - aarch64-darwin = "sha256-D5KIXHhzXXBOEcoOn2QKKUbVGMWhRW+L7fgxRxLpX/0="; + x86_64-linux = "sha256-HywWk3MAWdRVaQyimlQJCFsgydXdE0VSLWliZT7f8w0="; + x86_64-darwin = "sha256-GgZVVt1Gm95/kyI/q99fZ9BIN+5kpxumcSJ9BexfARc="; + aarch64-darwin = "sha256-ldg+bVROm/XzACCmiMapMQf3f6le9FHzt18QcaH8TxA="; }.${system} or throwSystem; }; @@ -74,6 +74,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index 9f59da0f9c12c..9f3b685cd06c9 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -14,13 +14,13 @@ python310Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.20"; + version = "0.3.21"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; rev = "refs/tags/v${version}"; - hash = "sha256-lpXcH45BFgfRjkEHqimnHonDenm5YA6oahe4sN2wpY4="; + hash = "sha256-aVQSWvQTRdz5R9uEXU4CvveRaPdehcL7hrXwFoPCEyI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 41ddd2cf8d943..e8ffe9f3b8778 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -23,10 +23,10 @@ let maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ]; }; - filename = if stdenv.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; + filename = if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-rFXmhlxXlVz5nCrXMmfYGaxe4/wnBRdFxsfiwiIDHgw=" else "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8="; + hash = if stdenv.hostPlatform.isDarwin then "sha256-rFXmhlxXlVz5nCrXMmfYGaxe4/wnBRdFxsfiwiIDHgw=" else "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8="; }; icon = fetchurl { @@ -89,4 +89,4 @@ let ''; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 18369b8827b5b..a241a109091ee 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -181,8 +181,8 @@ let class-doc pydantic_1 ] - ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ] - ++ lib.optionals (!stdenv.isDarwin) [ octoprint-pisupport ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ py.pkgs.appdirs ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ octoprint-pisupport ]; nativeCheckInputs = with self; [ ddt @@ -241,7 +241,7 @@ let disabledTests = [ "test_check_setup" # Why should it be able to call pip? - ] ++ lib.optionals stdenv.isDarwin [ "test_set_external_modification" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_set_external_modification" ]; disabledTestPaths = [ "tests/test_octoprint_setuptools.py" # fails due to distutils and python3.12 ]; diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 8d4d4df4ef755..b02a63301fee2 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Framework for controlling entertainment lighting equipment"; homepage = "https://www.openlighting.org/ola/"; maintainers = [ ]; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 2fcaa7f4c48aa..0ebe02881003b 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -121,10 +121,10 @@ python3.pkgs.buildPythonApplication rec { hunspellDicts.en-us hunspellDicts.es-es hunspellDicts.it-it - - python3.pkgs.nose ]; + # Tests have never been enabled, and upstream uses nose as a test + # runner (though not as a library). doCheck = false; preBuild = '' diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index da1f2dc629d2c..04a9fffcb083b 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -83,9 +83,9 @@ stdenv.mkDerivation rec { mainProgram = "openbangla-gui"; homepage = "https://openbangla.github.io/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ eclairevoyant hqurve ]; + maintainers = with lib.maintainers; [ hqurve ]; platforms = lib.platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index de3fc6cd0accc..7a9fd06cc295c 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./000-enable-svg.patch ]; # The strip options are not recognized by Darwin. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e '/strip -s/d' Makefile ''; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 380a88e6f2e0e..479fe1bcb0763 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-axRI3sssj2Q6IBfIeyvOa494b0EgKFP+lFL/QrGIybQ="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/fixup_bundle/d; /NO_DEFAULT_PATH/d' CMakeLists.txt ''; @@ -65,9 +65,9 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config gtest - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools makeWrapper ]; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus flac - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ AppKit ] ++ [ gtk3 @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { sqlite tinyxml wxGTK32 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-utils libselinux libsepol @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXtst ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lame ]; @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { "-DSQUISH_USE_SSE=0" ]); - postInstall = lib.optionals stdenv.isDarwin '' + postInstall = lib.optionals stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/OpenCPN.app $out/Applications makeWrapper $out/Applications/OpenCPN.app/Contents/MacOS/OpenCPN $out/bin/opencpn diff --git a/pkgs/applications/misc/oranda/default.nix b/pkgs/applications/misc/oranda/default.nix index b1326dd592b4d..0c5e55efe0eff 100644 --- a/pkgs/applications/misc/oranda/default.nix +++ b/pkgs/applications/misc/oranda/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { env = { RUSTONIG_SYSTEM_LIBONIG = true; ORANDA_USE_TAILWIND_BINARY = true; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { # without this, tailwindcss fails with OpenSSL configuration error OPENSSL_CONF = ""; }; diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 06014f6f479de..b81f09e1c3015 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -30,13 +30,13 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2024.08.16-5"; + version = "2024.09.08-7"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-qVLeZySVdncHEwA0aTiScGJ/RAIpvVVVse3O/sXLto0="; + hash = "sha256-X1dmk1IBjqM2AUVkvSDNZyVtV5Ens9ninZvMvsRc334="; fetchSubmodules = true; }; @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { meta = with lib; { # darwin: "invalid application of 'sizeof' to a function type" - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://organicmaps.app/"; description = "Detailed Offline Maps for Travellers, Tourists, Hikers and Cyclists"; license = licenses.asl20; diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 43bf5af6267cf..ca2b0c033ee91 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.7.0"; + version = "0.7.2"; src = fetchCrate { inherit pname version; - hash = "sha256-bn+5LBqZNwrhVX0KfXNBS00rE+BybN/NJmL4lu/oua0="; + hash = "sha256-Qh/mUEfCvrOrUHJ1kEWb3BLBmMyP/MzUyfFoB+eYj9w="; }; - cargoHash = "sha256-ssjLfNPP8g+2IOv0AQb+Soe/0e1H2LoqFSpmljj/z3o="; + cargoHash = "sha256-VYA5Y6CjhKx3MgQ0pyOO7vw44cKykRjlgUZopgR9pYo="; meta = with lib; { description = "Simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 1ab2edea76625..b8ca97d298ac3 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -19,23 +19,23 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - hash = "sha256-UAKEyJFdgwJ4Jz3lTG6vmxEkIVLSikWOEBjYV6o72nQ="; + hash = "sha256-eMg8DXFtVfYhl6vpg/KRUZUgMU/XsCS29Af1CSIbUsY="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; cmakeFlags = ["-DWITH_LTO=OFF"]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ "-faligned-allocation" ]); diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index 66ebad25ec361..8caf7c0fbe17d 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -1,15 +1,19 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, fetchNpmDeps -, npmHooks -, binaryen -, gzip -, nodejs -, rustc -, wasm-bindgen-cli -, wasm-pack -, fetchpatch +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + fetchNpmDeps, + fetchurl, + httplz, + binaryen, + gzip, + nodejs, + npmHooks, + python3, + rustc, + wasm-bindgen-cli, + wasm-pack, }: let @@ -20,28 +24,28 @@ let cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0="; }; + # the lindera-unidic v0.32.2 crate uses [1] an outdated unidic-mecab fork [2] and builds it in pure rust + # [1] https://github.com/lindera/lindera/blob/v0.32.2/lindera-unidic/build.rs#L5-L11 + # [2] https://github.com/lindera/unidic-mecab + lindera-unidic-src = fetchurl { + url = "https://dlwqk3ibdg1xh.cloudfront.net/unidic-mecab-2.1.2.tar.gz"; + hash = "sha256-JKx1/k5E2XO1XmWEfDX6Suwtt6QaB7ScoSUUbbn8EYk="; + }; + in rustPlatform.buildRustPackage rec { pname = "pagefind"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "cloudcannon"; repo = "pagefind"; rev = "refs/tags/v${version}"; - hash = "sha256-pcgcu9zylSTjj5rxNff+afFBWVpN5sGtlpadG1wb93M="; + hash = "sha256-4NfosDp5Wwz2lnqaFNcaIbWpjWiaQ4WCL6TcKEkfPck="; }; - cargoPatches = [ - (fetchpatch { # https://github.com/CloudCannon/pagefind/pull/680 - name = "cargo-update-time.patch"; - url = "https://github.com/CloudCannon/pagefind/commit/e6778572d225316803180db822f5cc12a936acd2.patch"; - hash = "sha256-XHpHA1hPIe+wjDQ6LE9hn2jn3eMBOK9Yoo920jfH9do="; - }) - ]; - - cargoHash = "sha256-KWWln7QCRo02cOgHy5JNERGS0CvvgsPISwkTZeeNEkg="; + cargoHash = "sha256-hnT9w3j8/YuN00x0LBPr75BKGWSnIYUNFTWIgtghJP4"; env.npmDeps_web_js = fetchNpmDeps { name = "npm-deps-web-js"; @@ -78,17 +82,50 @@ rustPlatform.buildRustPackage rec { cargoDeps=$cargoDeps_web cargoSetupPostUnpackHook cargoDeps=$cargoDeps_web cargoSetupPostPatchHook ) + + # patch a build-time dependency download + ( + cd $cargoDepsCopy/lindera-unidic + oldHash=$(sha256sum build.rs | cut -d " " -f 1) + + # serve lindera-unidic on localhost vacant port + httplz_port="${ + if stdenv.buildPlatform.isDarwin then + ''$(python -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()')'' + else + "34567" + }" + mkdir .lindera-http-plz + ln -s ${lindera-unidic-src} .lindera-http-plz/unidic-mecab-2.1.2.tar.gz + httplz --port "$httplz_port" -- .lindera-http-plz/ & + echo $! >$TMPDIR/.httplz_pid + + # file:// does not work + substituteInPlace build.rs --replace-fail \ + "https://dlwqk3ibdg1xh.cloudfront.net/unidic-mecab-2.1.2.tar.gz" \ + "http://localhost:$httplz_port/unidic-mecab-2.1.2.tar.gz" + + newHash=$(sha256sum build.rs | cut -d " " -f 1) + substituteInPlace .cargo-checksum.json --replace-fail $oldHash $newHash + ) ''; - nativeBuildInputs = [ - binaryen - gzip - nodejs - rustc - rustc.llvmPackages.lld - wasm-bindgen-92 - wasm-pack - ]; + __darwinAllowLocalNetworking = true; + + nativeBuildInputs = + [ + binaryen + gzip + nodejs + rustc + rustc.llvmPackages.lld + wasm-bindgen-92 + wasm-pack + httplz + ] + ++ lib.optionals stdenv.buildPlatform.isDarwin [ + python3 + ]; # build wasm and js assets # based on "test-and-build" in https://github.com/CloudCannon/pagefind/blob/main/.github/workflows/release.yml @@ -120,14 +157,19 @@ rustPlatform.buildRustPackage rec { ) ''; + # the file is also fetched during checkPhase + preInstall = '' + kill ${lib.optionalString stdenv.hostPlatform.isDarwin "-9"} $(cat $TMPDIR/.httplz_pid) + ''; + buildFeatures = [ "extended" ]; - meta = with lib; { + meta = { description = "Generate low-bandwidth search index for your static website"; homepage = "https://pagefind.app/"; - license = licenses.mit; - maintainers = with maintainers; [ pbsds ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds ]; + platforms = lib.platforms.unix; mainProgram = "pagefind"; }; } diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index f77bf332b57d9..5164e294a89bc 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "pastel"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uK4HWC+uGiey+K0p8+Wi+Pi+U7b4k09b8iKF9BmTPcc="; + sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0="; }; - cargoHash = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc="; + cargoHash = "sha256-+Cw/aAXkSbYLqc7TGWsMUJNo88v0s1Cq1m4V84j3gXE="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Command-line tool to generate, analyze, convert and manipulate colors"; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 2b6e7a0ed88cb..cae71f785978d 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = lib.optional stdenv.isDarwin (lib.cmakeBool "MOVIES" false); + cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin (lib.cmakeBool "MOVIES" false); meta = with lib; { description = "Presenter console with multi-monitor support for PDF files"; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index d5138d542c5a2..68dce0ee1484f 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "5.2.4"; + version = "5.2.6"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - hash = "sha256-xtkp5OCxzLx0ZNeYlwLQWudzsILErlrAHacuq4hOL8E="; + hash = "sha256-u9ldHJkY3/VfykBFgVY8Ah/uYNpTIkLyvPY7zfLWN38="; }; unpackPhase = '' diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix index 3e55a0de0a934..7ee5f3167434f 100644 --- a/pkgs/applications/misc/pe-bear/default.nix +++ b/pkgs/applications/misc/pe-bear/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pe-bear"; - version = "0.6.7.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hasherezade"; repo = "pe-bear"; rev = "v${version}"; - hash = "sha256-We3XxSsGL1mTK5DgI2wgRm7OaziI/cZRiLd+qrvZ7SE="; + hash = "sha256-jHFH1GAbAtOzUh+Gma89YCU5r/yuwekv/bqiyy8VmRk="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 7e3de4a18c125..35777a0b25635 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; - qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ] ++ lib.optionals stdenv.isDarwin [ - "PGSQL_INC=${postgresql}/include" - "PGSQL_LIB=${postgresql.lib}/lib/libpq.dylib" + qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "PGSQL_INC=${lib.getDev postgresql}/include" + "PGSQL_LIB=${lib.getLib postgresql}/lib/libpq.dylib" "XML_INC=${libxml2.dev}/include/libxml2" "XML_LIB=${libxml2.out}/lib/libxml2.dylib" "PREFIX=${placeholder "out"}/Applications/pgModeler.app/Contents" @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. buildInputs = [ postgresql qtsvg ] - ++ lib.optionals stdenv.isLinux [ qtwayland ] - ++ lib.optionals stdenv.isDarwin [ cups libxml2 ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups libxml2 ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin for item in pgmodeler pgmodeler-{cli,se,ch} do @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { done ''; - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Database modeling tool for PostgreSQL"; diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 2c31efe542919..494d287364c2b 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -10,7 +10,7 @@ , wrapGAppsHook3 , libinput , gobject-introspection -, gnome +, mutter , gnome-desktop , glib , gtk3 @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 gnome-desktop # For keybindings settings schemas - gnome.mutter + mutter json-glib wayland finalAttrs.wlroots diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 3f4e82d2e4d9d..65161d713f29a 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -8,7 +8,7 @@ version = "4.0.0.dev10"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "OpenSteno Plover stenography software"; maintainers = with maintainers; [ twey kovirobi ]; license = licenses.gpl2; diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index 24ff669e4f22a..ad0736c8bc4b6 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "polychromatic"; - version = "0.9.1"; + version = "0.9.2"; format = "other"; src = fetchFromGitHub { owner = "polychromatic"; repo = "polychromatic"; - rev = "v${version}"; - hash = "sha256-3Pt1Z8G0xDWlFD7LxJILPUifMBTN4OvPNHZv80umO1s="; + rev = "refs/tags/v${version}"; + hash = "sha256-eSfyoEu4qQv+R17wgTfATOE1uHkksNxo17btR6swuZo="; }; postPatch = '' diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix index 77774b5343a55..d9f76a75451b8 100644 --- a/pkgs/applications/misc/pomodoro/default.nix +++ b/pkgs/applications/misc/pomodoro/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4="; - buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; meta = with lib; { description = "Simple CLI pomodoro timer using desktop notifications written in Rust"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ annaaurora ]; # error: redefinition of module 'ObjectiveC' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "pomodoro"; }; } diff --git a/pkgs/applications/misc/porsmo/default.nix b/pkgs/applications/misc/porsmo/default.nix index f741ad2d6b482..6d9ed5ee2c98e 100644 --- a/pkgs/applications/misc/porsmo/default.nix +++ b/pkgs/applications/misc/porsmo/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreAudio darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index fe15d4b45e7be..2d37a68683100 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "1.24.2"; + version = "1.27.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-R+FkaCAI7Kkxd1UfdmeYo9BEUN0HUGZf2UDKxEvlTlQ="; + hash = "sha256-v8tcnndAP4+1cRWW2LmAsmSIvALdeESuuv2QmRQhq/s="; # 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 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-xGQf6E5QQyFdCUoFkPhWMlE6RQnQEJ/P6fBtUsaRz/Y="; + vendorHash = "sha256-G4ar+9ARBwR77t/6NswUDXpUw38rYnLy9lIep302mNI="; doCheck = false; diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix index ef2b9fec3adba..10f55aced9ead 100644 --- a/pkgs/applications/misc/process-viewer/default.nix +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk4 ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ gtk4 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 159b0e0aebc54..ecce3066ed5b2 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { catch2 ] ++ lib.optionals withSystemd [ systemd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreWLAN ]; @@ -210,7 +210,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.agpl3Plus; maintainers = with maintainers; [ moredread tweber tmarkus ]; platforms = platforms.unix; - } // lib.optionalAttrs (stdenv.isDarwin) { + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) { mainProgram = "PrusaSlicer"; }; }) diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 173323f589751..1eff0355412c5 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -23,11 +23,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Libsystem SystemConfiguration libiconv diff --git a/pkgs/applications/misc/pw-viz/Cargo.lock b/pkgs/applications/misc/pw-viz/Cargo.lock index aa97cc770b7b5..f4d1de269cc37 100644 --- a/pkgs/applications/misc/pw-viz/Cargo.lock +++ b/pkgs/applications/misc/pw-viz/Cargo.lock @@ -92,28 +92,20 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", "serde", "version_check", ] [[package]] -name = "aho-corasick" -version = "0.7.20" +name = "annotate-snippets" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", + "unicode-width", + "yansi-term", ] [[package]] @@ -189,25 +181,23 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bindgen" -version = "0.59.2" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags", + "annotate-snippets", + "bitflags 2.5.0", "cexpr", "clang-sys", - "clap", - "env_logger", + "itertools", "lazy_static", "lazycell", - "log", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "which", + "syn 2.0.66", ] [[package]] @@ -216,6 +206,12 @@ 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" @@ -264,7 +260,7 @@ checksum = "5fe233b960f12f8007e3db2d136e3cb1c291bfd7396e384ee76025fc1a3932b4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -316,12 +312,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -354,21 +344,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - [[package]] name = "clipboard-win" version = "4.4.2" @@ -395,7 +370,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation", @@ -411,7 +386,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", @@ -441,6 +416,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "cookie-factory" version = "0.3.2" @@ -469,7 +453,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types 0.3.2", @@ -482,7 +466,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "foreign-types 0.3.2", "libc", @@ -506,7 +490,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -568,8 +552,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn", + "strsim", + "syn 1.0.107", ] [[package]] @@ -582,7 +566,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -593,7 +577,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -604,7 +588,7 @@ checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ "darling_core 0.14.2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -615,7 +599,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -624,7 +608,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -820,20 +804,7 @@ dependencies = [ "darling 0.14.2", "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", + "syn 1.0.107", ] [[package]] @@ -853,27 +824,6 @@ dependencies = [ "serde", ] -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "error-code" version = "2.3.1" @@ -937,7 +887,7 @@ checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -967,7 +917,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "freetype-sys", "libc", ] @@ -999,7 +949,7 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] @@ -1039,7 +989,7 @@ version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524d807cd49a0c56a53ef9a6738cd15e7c8c4e9d37a3b7fdb3c250c1cd5bf7a3" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg_aliases", "cgl", "cocoa", @@ -1100,12 +1050,6 @@ dependencies = [ "libc", ] -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "ident_case" version = "1.0.1" @@ -1128,12 +1072,21 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.5" @@ -1199,9 +1152,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -1209,33 +1162,35 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "winapi", ] [[package]] name = "libspa" -version = "0.5.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8bb02bbc8d550e2f0a31989c61e1ac3c883bab2edee49ffcb5d5ca18266786d" +checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" dependencies = [ - "bitflags", + "bitflags 2.5.0", "cc", + "convert_case", "cookie-factory", - "errno", "libc", "libspa-sys", + "nix 0.27.1", "nom", "system-deps", ] [[package]] name = "libspa-sys" -version = "0.5.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8d2e38d6cdd10d7d78eb0cb409c127cf16da2c296d9623375551e309616d4d" +checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" dependencies = [ "bindgen", + "cc", "system-deps", ] @@ -1255,7 +1210,7 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1330,7 +1285,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum", @@ -1370,7 +1325,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1384,40 +1339,38 @@ dependencies = [ [[package]] name = "nix" -version = "0.14.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", + "bitflags 1.3.2", + "cfg-if", "libc", - "void", + "memoffset", ] [[package]] name = "nix" -version = "0.24.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ - "bitflags", - "cfg-if 1.0.0", + "autocfg", + "bitflags 1.3.2", + "cfg-if", "libc", "memoffset", ] [[package]] name = "nix" -version = "0.25.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "autocfg", - "bitflags", - "cfg-if 1.0.0", + "bitflags 2.5.0", + "cfg-if", "libc", - "memoffset", ] [[package]] @@ -1454,7 +1407,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1552,7 +1505,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -1565,12 +1518,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "percent-encoding" version = "2.2.0" @@ -1585,27 +1532,26 @@ checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pipewire" -version = "0.5.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d80fef8219c37f479f3d62d70167f3daaa90b71a083f7fd88d69e49f05f0ecdc" +checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" dependencies = [ "anyhow", - "bitflags", - "errno", + "bitflags 2.5.0", "libc", "libspa", "libspa-sys", + "nix 0.27.1", "once_cell", "pipewire-sys", - "signal", "thiserror", ] [[package]] name = "pipewire-sys" -version = "0.5.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6d4262ea1fd3b01786046d1892cc49e9578d872faf8723d95dc7affc810ee4" +checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" dependencies = [ "bindgen", "libspa-sys", @@ -1624,7 +1570,7 @@ version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "flate2", "miniz_oxide", @@ -1649,16 +1595,16 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] [[package]] name = "pw-viz" -version = "0.2.0" +version = "0.3.0" dependencies = [ "eframe", "egui", @@ -1673,9 +1619,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.23" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1734,7 +1680,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1754,8 +1700,6 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ - "aho-corasick", - "memchr", "regex-syntax", ] @@ -1772,7 +1716,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" dependencies = [ "base64", - "bitflags", + "bitflags 1.3.2", "serde", ] @@ -1841,7 +1785,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1871,16 +1815,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" -[[package]] -name = "signal" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f6ce83b159ab6984d2419f495134972b48754d13ff2e3f8c998339942b56ed9" -dependencies = [ - "libc", - "nix 0.14.1", -] - [[package]] name = "simple_logger" version = "4.0.0" @@ -1915,7 +1849,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" dependencies = [ - "bitflags", + "bitflags 1.3.2", "calloop", "dlib", "lazy_static", @@ -1944,12 +1878,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "strsim" version = "0.10.0" @@ -1967,6 +1895,17 @@ dependencies = [ "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 = "system-deps" version = "6.0.3" @@ -1980,24 +1919,6 @@ dependencies = [ "version-compare", ] -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "thiserror" version = "1.0.38" @@ -2015,7 +1936,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2056,7 +1977,7 @@ dependencies = [ "arrayref", "arrayvec 0.5.2", "bytemuck", - "cfg-if 1.0.0", + "cfg-if", "png", "safe_arch", "tiny-skia-path", @@ -2102,7 +2023,7 @@ version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "pin-project-lite", "tracing-core", ] @@ -2143,6 +2064,12 @@ 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.10" @@ -2178,12 +2105,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "walkdir" version = "2.3.2" @@ -2207,7 +2128,7 @@ version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -2222,7 +2143,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-shared", ] @@ -2232,7 +2153,7 @@ version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -2256,7 +2177,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2273,7 +2194,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" dependencies = [ - "bitflags", + "bitflags 1.3.2", "downcast-rs", "libc", "nix 0.24.3", @@ -2312,7 +2233,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-client", "wayland-commons", "wayland-scanner", @@ -2380,17 +2301,6 @@ dependencies = [ "windows 0.43.0", ] -[[package]] -name = "which" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" -dependencies = [ - "either", - "libc", - "once_cell", -] - [[package]] name = "winapi" version = "0.3.9" @@ -2470,7 +2380,7 @@ checksum = "9539b6bd3eadbd9de66c9666b22d802b833da7e996bc06896142e09854a61767" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2579,7 +2489,7 @@ version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cocoa", "core-foundation", "core-graphics", @@ -2662,3 +2572,12 @@ name = "xml-rs" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/applications/misc/pw-viz/default.nix index 04dcf343e5416..25a4978d9885c 100644 --- a/pkgs/applications/misc/pw-viz/default.nix +++ b/pkgs/applications/misc/pw-viz/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "pw-viz"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ax9d"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lw4whdh8tNoS5XUlamQCq8f8z8K59uD90PSSo3skeyo="; + sha256 = "sha256-fB7PnWWahCMKhGREg6neLmOZjh2OWLu61Vpmfsl03wA="; }; cargoLock = { diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index dc2de8b0cd730..b2856cb7978e1 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { openssl xercesc file - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libXext libXi libXt @@ -63,14 +63,14 @@ stdenv.mkDerivation rec { libuuid libyubikey yubikey-personalization - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; cmakeFlags = [ "-DNO_GTEST=ON" "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DNO_YUBI=ON" ]; @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { for f in $(grep -Rl /usr/bin/ .) ; do substituteInPlace $f --replace /usr/bin/ "" done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/ui/cli/CMakeLists.txt --replace "uuid" "" ''; diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index a28e8d588693d..806d1df05fc44 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # Upstream install is mostly defunct. It hardcodes target.path and doesn't # install anything but the binary. - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' mkdir -p "$out"/{Applications,bin} mv qMasterPassword.app "$out"/Applications/ ln -s ../Applications/qMasterPassword.app/Contents/MacOS/qMasterPassword "$out"/bin/qMasterPassword diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index b94b8326dca3b..6bffbda0a01b1 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -57,7 +57,7 @@ mkDerivation rec { qtscript qtsvg qtxmlpatterns - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; @@ -68,17 +68,17 @@ mkDerivation rec { "QMAKE_CXXFLAGS=-std=c++14" ]; - qtWrapperArgs = lib.optionals stdenv.isLinux [ + qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib" ]; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm555 release/qcad-bin $out/bin/qcad - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install -Dm555 release/QCAD.app/Contents/MacOS/QCAD $out/bin/qcad mkdir -p $out/lib '' + '' diff --git a/pkgs/applications/misc/qelectrotech/default.nix b/pkgs/applications/misc/qelectrotech/default.nix index b4d8bd3ab182b..705618bd2f01c 100644 --- a/pkgs/applications/misc/qelectrotech/default.nix +++ b/pkgs/applications/misc/qelectrotech/default.nix @@ -74,6 +74,6 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ yvesf ]; platforms = qtbase.meta.platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index 0439e212d1122..4b8213d46d607 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ azahi ]; platforms = platforms.unix; - broken = stdenv.isDarwin && stdenv.isx86_64; # Looks like a libcxx version mismatch problem. + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; # Looks like a libcxx version mismatch problem. mainProgram = "qolibri"; }; } diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 2fa22cf732211..68baf5e08ebb3 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -31,13 +31,13 @@ mkDerivation rec { }) ] ++ lib.optional (!preferQWebView && !preferNative) ./qsyncthingtray-0.5.8-qt-5.6.3.patch; postPatch = '' - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace includes/platforms/linux/posixUtils.hpp \ --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' \ --replace '"pgrep -x' '"${procps}/bin/pgrep -x' ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace includes/platforms/darwin/macUtils.hpp \ --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' ''} @@ -64,6 +64,6 @@ mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ zraexy peterhoeg ]; platforms = platforms.all; - broken = !preferNative || stdenv.isDarwin; + broken = !preferNative || stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index b737716ed5d38..c544dc44888f0 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; # package does not contain tests as of v0.3.3 docCheck = false; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 4546883b2bb33..6451fa2c7acf9 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,16 +1,17 @@ { lib, stdenv, fetchFromGitHub, fetchFromGitLab , autoconf, automake, gettext, intltool -, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection +, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection, wayland-scanner , gtk3, python, pygobject3, pyxdg -, withQuartz ? stdenv.isDarwin, ApplicationServices -, withRandr ? stdenv.isLinux, libxcb -, withDrm ? stdenv.isLinux, libdrm +, withQuartz ? stdenv.hostPlatform.isDarwin, ApplicationServices +, withRandr ? stdenv.hostPlatform.isLinux, libxcb +, withDrm ? stdenv.hostPlatform.isLinux, libdrm +, withVidmode ? stdenv.hostPlatform.isLinux, libXxf86vm , withGeolocation ? true -, withCoreLocation ? withGeolocation && stdenv.isDarwin, CoreLocation, Foundation, Cocoa -, withGeoclue ? withGeolocation && stdenv.isLinux, geoclue -, withAppIndicator ? stdenv.isLinux, libappindicator, libayatana-appindicator +, withCoreLocation ? withGeolocation && stdenv.hostPlatform.isDarwin, CoreLocation, Foundation, Cocoa +, withGeoclue ? withGeolocation && stdenv.hostPlatform.isLinux, geoclue +, withAppIndicator ? stdenv.hostPlatform.isLinux, libappindicator, libayatana-appindicator }: let @@ -26,6 +27,8 @@ let strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ autoconf automake @@ -37,12 +40,13 @@ let wrapPython gobject-introspection python - ]; + ] ++ lib.optionals (pname == "gammastep") [ wayland-scanner ]; configureFlags = [ "--enable-randr=${if withRandr then "yes" else "no"}" "--enable-geoclue2=${if withGeoclue then "yes" else "no"}" "--enable-drm=${if withDrm then "yes" else "no"}" + "--enable-vidmode=${if withVidmode then "yes" else "no"}" "--enable-quartz=${if withQuartz then "yes" else "no"}" "--enable-corelocation=${if withCoreLocation then "yes" else "no"}" ] ++ lib.optionals (pname == "gammastep") [ @@ -55,6 +59,7 @@ let ] ++ lib.optional withRandr libxcb ++ lib.optional withGeoclue geoclue ++ lib.optional withDrm libdrm + ++ lib.optional withVidmode libXxf86vm ++ lib.optional withQuartz ApplicationServices ++ lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ] ++ lib.optional withAppIndicator (if (pname != "gammastep") @@ -141,7 +146,7 @@ rec { + lib.removePrefix "Redshift" redshift.meta.longDescription; homepage = "https://gitlab.com/chinstrap/gammastep"; mainProgram = "gammastep"; - maintainers = (with lib.maintainers; [ eclairevoyant primeos ]) ++ redshift.meta.maintainers; + maintainers = (with lib.maintainers; [ primeos ]) ++ redshift.meta.maintainers; }; }; } diff --git a/pkgs/applications/misc/rootbar/default.nix b/pkgs/applications/misc/rootbar/default.nix deleted file mode 100644 index a528cd4a94ade..0000000000000 --- a/pkgs/applications/misc/rootbar/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv -, fetchhg -, pkg-config -, meson -, ninja -, gtk3 -, json_c -, libpulseaudio -, wayland -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "rootbar"; - version = "unstable-2020-11-13"; - - src = fetchhg { - url = "https://hg.sr.ht/~scoopta/rootbar"; - rev = "a018e10cfc5e"; - sha256 = "sha256-t6oDIYCVaCxaYy4bS1vxESaFDNxsx5JQLQK77eVuafE="; - }; - - nativeBuildInputs = [ - meson ninja pkg-config wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - json_c - libpulseaudio - wayland - ]; - - meta = with lib; { - homepage = "https://hg.sr.ht/~scoopta/rootbar"; - description = "Bar for Wayland WMs"; - mainProgram = "rootbar"; - longDescription = '' - Root Bar is a bar for wlroots based wayland compositors such as sway and - was designed to address the lack of good bars for wayland. - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/applications/misc/rtfm/default.nix b/pkgs/applications/misc/rtfm/default.nix index 53ad4f9aea9ed..655dd90fdb342 100644 --- a/pkgs/applications/misc/rtfm/default.nix +++ b/pkgs/applications/misc/rtfm/default.nix @@ -52,7 +52,7 @@ crystal.buildCrystalPackage rec { nativeBuildInputs = [ wrapGAppsHook4 gobject-introspection - ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ webkitgtk_6_0 diff --git a/pkgs/applications/misc/rust-traverse/default.nix b/pkgs/applications/misc/rust-traverse/default.nix index 7d0e072ee36b7..ffe1018471059 100644 --- a/pkgs/applications/misc/rust-traverse/default.nix +++ b/pkgs/applications/misc/rust-traverse/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; diff --git a/pkgs/applications/misc/safecloset/default.nix b/pkgs/applications/misc/safecloset/default.nix index ce774e5a668f1..d173777bc3bcf 100644 --- a/pkgs/applications/misc/safecloset/default.nix +++ b/pkgs/applications/misc/safecloset/default.nix @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rxNp9dOvy/UTx6Q9pzZGccEKmIiWxzWVYyMxb+h5bqw="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libxcb ]; diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index a111142bbde4b..7ee3d4573d9aa 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -25,8 +25,8 @@ buildGoModule rec { subPackages = [ "." ]; - buildInputs = lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.OpenAL ]; diff --git a/pkgs/applications/misc/senv/default.nix b/pkgs/applications/misc/senv/default.nix index b542966e828a6..999b140c5fe2a 100644 --- a/pkgs/applications/misc/senv/default.nix +++ b/pkgs/applications/misc/senv/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { homepage = "https://github.com/SpectralOps/senv"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; - broken = stdenv.isDarwin; # needs golang.org/x/sys bump + broken = stdenv.hostPlatform.isDarwin; # needs golang.org/x/sys bump mainProgram = "senv"; }; } diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 1e82fce078986..d9b4c4cfd53bc 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]); - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_nonmedia_files" ]; diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index ab853d4dc1f4d..64faccf6811c5 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { qt3d qtbase ] - ++ lib.optionals stdenv.isDarwin [ freetype ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ]; nativeBuildInputs = [ installShellFiles @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - qmakeFlags = lib.optionals stdenv.isDarwin [ "CONFIG+=non_portable" ]; + qmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CONFIG+=non_portable" ]; postPatch = '' substituteInPlace pdf_viewer_build_config.pro \ @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "/etc/sioyek" "$out/etc" ''; - postInstall = if stdenv.isDarwin then '' + postInstall = if stdenv.hostPlatform.isDarwin then '' cp -r pdf_viewer/shaders sioyek.app/Contents/MacOS/shaders cp pdf_viewer/prefs.config sioyek.app/Contents/MacOS/ cp pdf_viewer/prefs_user.config sioyek.app/Contents/MacOS/ diff --git a/pkgs/applications/misc/slippy/default.nix b/pkgs/applications/misc/slippy/default.nix index cf5cd1ff0b3db..a7e6a75a7a7ea 100644 --- a/pkgs/applications/misc/slippy/default.nix +++ b/pkgs/applications/misc/slippy/default.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/misc/slweb/default.nix b/pkgs/applications/misc/slweb/default.nix deleted file mode 100644 index f71a0d61c2a56..0000000000000 --- a/pkgs/applications/misc/slweb/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromSourcehut -, redo-apenwarr -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "slweb"; - version = "0.9.0"; - - src = fetchFromSourcehut { - owner = "~strahinja"; - repo = "slweb"; - rev = "v${finalAttrs.version}"; - hash = "sha256-QDHcp5pCmapgOlJpDDyyC12JOfh/biDyF6O+iKGbOGg="; - }; - - nativeBuildInputs = [ redo-apenwarr ]; - - installPhase = '' - runHook preInstall - export FALLBACKVER=${finalAttrs.version} - PREFIX=$out redo install - runHook postInstall - ''; - - enableParallelBuilding = true; - - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - - meta = with lib; { - description = "Static website generator which aims at being simplistic"; - homepage = "https://strahinja.srht.site/slweb/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ GaetanLepage ]; - mainProgram = "slweb"; - }; -}) diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/applications/misc/snagboot/default.nix index 11f49d8506b5e..3a663443513c8 100644 --- a/pkgs/applications/misc/snagboot/default.nix +++ b/pkgs/applications/misc/snagboot/default.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec { tftpy ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' rules="src/snagrecover/50-snagboot.rules" if [ ! -f "$rules" ]; then echo "$rules is missing, must update the Nix file." diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 0de395549bddd..4441508e0be88 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Impossibly fast web search, made for static sites"; diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index ab7ae6fff5997..da0c492850180 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "stretchly"; - version = "1.15.1"; + version = "1.16.0"; src = fetchurl { url = "https://github.com/hovancik/stretchly/releases/download/v${finalAttrs.version}/stretchly-${finalAttrs.version}.tar.xz"; - hash = "sha256-suTH6o7vtUr2DidPXAwqrya5/WukQOFmS/34LaiWDBs="; + hash = "sha256-gOMUXGldtZUfqLABJHfbToYe0pcAn8dRWEFxCi/gY9Y="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/stw/default.nix b/pkgs/applications/misc/stw/default.nix index 689fc9e81ce7f..5f36e1e1126c2 100644 --- a/pkgs/applications/misc/stw/default.nix +++ b/pkgs/applications/misc/stw/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ somasis ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "stw"; }; } diff --git a/pkgs/applications/misc/sunwait/default.nix b/pkgs/applications/misc/sunwait/default.nix index f824011f1b868..2f369c1eb9ce2 100644 --- a/pkgs/applications/misc/sunwait/default.nix +++ b/pkgs/applications/misc/sunwait/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Calculates sunrise or sunset times with civil, nautical, astronomical and custom twilights"; homepage = "https://github.com/risacher/sunwait"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "sunwait"; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index 2bb4184b4353b..bfb79fd10b930 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - doCheck = (!stdenv.isDarwin); # times out + doCheck = (!stdenv.hostPlatform.isDarwin); # times out enableParallelChecking = false; meta = with lib; { diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 4745a942304ad..c441ca300858b 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -12,7 +12,6 @@ , p7zip , autoPatchelfHook , libXxf86vm -, unzip , libGL }: diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 2c69b1343e9df..3d0cbe7198c23 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -22,9 +22,9 @@ , xdg-utils , webviewSupport ? true , jsSupport ? true -, kioPluginSupport ? stdenv.isLinux -, plasmoidSupport ? stdenv.isLinux -, systemdSupport ? stdenv.isLinux +, kioPluginSupport ? stdenv.hostPlatform.isLinux +, plasmoidSupport ? stdenv.hostPlatform.isLinux +, systemdSupport ? stdenv.hostPlatform.isLinux /* It is possible to set via this option an absolute exec path that will be written to the `~/.config/autostart/syncthingtray.desktop` file generated during runtime. Alternatively, one can edit the desktop file themselves after @@ -35,14 +35,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.6.0"; + version = "1.6.2"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-tbtSISWBNHxuF2T1XK5JnkiPMYzgP4fyw5t6z91P2p8="; + hash = "sha256-L56aX5UFFodSR2YHWt6Y+s83q3YoAuYvyqXP/XVMp20="; }; buildInputs = [ @@ -52,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: { qtutilities boost qtforkawesome - ] ++ lib.optionals stdenv.isDarwin [ iconv ] - ++ lib.optionals stdenv.isLinux [ qtwayland ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ iconv ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals webviewSupport [ qtwebengine ] ++ lib.optionals jsSupport [ qtdeclarative ] ++ lib.optionals kioPluginSupport [ kio ] @@ -74,12 +74,12 @@ stdenv.mkDerivation (finalAttrs: { ; # syncthing server seems to hang on darwin, causing tests to fail. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export QT_QPA_PLATFORM=offscreen export QT_PLUGIN_PATH="${lib.getBin qtbase}/${qtbase.qtPluginPrefix}" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # put the app bundle into the proper place /Applications instead of /bin mkdir -p $out/Applications mv $out/bin/syncthingtray.app $out/Applications diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index fe15ce3b98b0c..7db338b16897f 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/gui/src/SslCertificate.cpp \ --replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \ --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml" ''; @@ -69,14 +69,14 @@ stdenv.mkDerivation rec { qttools # Used for translations even when not building the GUI openssl pcre - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Carbon Cocoa CoreServices ScreenSaver UserNotifications - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux libsepol @@ -95,17 +95,17 @@ stdenv.mkDerivation rec { ]; # Silences many warnings - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-inconsistent-missing-override"; cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF" # NSFilenamesPboardType is deprecated in 10.14+ - ++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.hostPlatform.darwinSdkVersion}"; + ++ lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.hostPlatform.isAarch64 then "10.13" else stdenv.hostPlatform.darwinSdkVersion}"; doCheck = true; checkPhase = '' runHook preCheck - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # filter out tests failing with sandboxing on darwin export GTEST_FILTER=-ServerConfigTests.serverconfig_will_deem_equal_configs_with_same_cell_names:NetworkAddress.hostname_valid_parsing '' + '' @@ -120,12 +120,12 @@ stdenv.mkDerivation rec { cp bin/{synergyc,synergys,synergyd,syntool} $out/bin/ '' + lib.optionalString withGUI '' cp bin/synergy $out/bin/ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/ substitute ../res/synergy.desktop $out/share/applications/synergy.desktop \ --replace "/usr/bin" "$out/bin" - '' + lib.optionalString (stdenv.isDarwin && withGUI) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && withGUI) '' mkdir -p $out/Applications cp -r bundle/Synergy.app $out/Applications ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 05ecbe0b795de..e9831de3ed00d 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.3.10"; + version = "1.3.12"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-5U9LWFaCwszvT1reu6NflPKQUrsQkP/NdSO4LBHWm2g="; + sha256 = "sha256-rnKWzct2k/ObjBnf90uwMar7fjZAUvQ2RPPZVZQsWEA="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-S4+cS4m69nqDN2h0vwyO35fFFBEa0Rcxx0XDBfSNLp0="; + cargoHash = "sha256-3FUcJHuMOSbtE0sL6N2AvedyseJ7RiUbo8jtY/nWAW0="; postInstall = '' install -Dm444 linux/com.system76.keyboardconfigurator.desktop -t $out/share/applications diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index 903de3c05c1d4..30bb445089f5b 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index 802588e8ef64a..3d114302031ab 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terminal-parrot"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jmhobbs"; repo = "terminal-parrot"; rev = version; - hash = "sha256-Qhy5nCbuC9MmegXA48LFCDk4Lm1T5MBmcXfeHzTJm6w="; + hash = "sha256-LI67DDcK3M084r9JPx8NcBWthaiBOCEL4lQJhuUJSok="; }; - vendorHash = "sha256-DJEoJjItusN1LTOOX1Ep+frF03yF/QmB/L66gSG0VOE="; + vendorHash = "sha256-EhnmOpT+rx4RVpmqgEQ4qO+Uca1W9uhx4fcExXG9LOI="; doCheck = false; diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix index 80ece5bded7a5..ec2cda0c164c9 100644 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ libgit2 openssl sqlite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; OPENSSL_NO_VENDOR = 1; LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index f2cc437ab9b67..4e789f2f8ec7a 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/applications/misc/transifex-cli/default.nix b/pkgs/applications/misc/transifex-cli/default.nix index 72324c3d1c496..da06ce3929184 100644 --- a/pkgs/applications/misc/transifex-cli/default.nix +++ b/pkgs/applications/misc/transifex-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "transifex-cli"; - version = "1.6.16"; + version = "1.6.17"; src = fetchFromGitHub { owner = "transifex"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-4TYuWNpw1tc3igKe4ld6pN35W070fekCaxpHGb/ekuY="; + sha256 = "sha256-jzAt/SalItGG0KI3GZb4/pT4T7oHwCji2bjNR1BTJXI="; }; vendorHash = "sha256-3gi2ysIb5256CdmtX38oIfeDwNCQojK+YB9aEm8H01Q="; diff --git a/pkgs/applications/misc/translatelocally/default.nix b/pkgs/applications/misc/translatelocally/default.nix index 2749a7ec1566d..d99579a5f2a6d 100644 --- a/pkgs/applications/misc/translatelocally/default.nix +++ b/pkgs/applications/misc/translatelocally/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation (finalAttrs: { ''; # https://github.com/XapaJIaMnu/translateLocally/blob/81ed8b9/.github/workflows/build.yml#L330 - postConfigure = lib.optionalString stdenv.isAarch64 '' + postConfigure = lib.optionalString stdenv.hostPlatform.isAarch64 '' bash ../cmake/fix_ruy_build.sh .. . ''; diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix index 603ddeca4fd7a..e2b9d2e570414 100644 --- a/pkgs/applications/misc/tthsum/default.nix +++ b/pkgs/applications/misc/tthsum/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { cp obj-unix/tthsum $out/bin ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Md5sum-alike program that works with Tiger/THEX hashes"; longDescription = '' tthsum generates or checks TTH checksums (root of the THEX hash diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix index 1d2c6681c1b9a..9eeac726a83fc 100644 --- a/pkgs/applications/misc/tuba/default.nix +++ b/pkgs/applications/misc/tuba/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "tuba"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-K0TXWFCSVjwogSXiTRX2eE92w5OzOGVeU4hFkDTJl+M="; + hash = "sha256-PRzLTlq8XfI5dYZhJ8YBtYi4H3883S2olp9jrn1Q5CQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index d861601364e13..2947c31ce94d9 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.9.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-GmLhBlNHVyO0oUvjOBpTEqQiPYZ68MdgwAqt9v2oMdU="; + hash = "sha256-A3uSbd3tXrXe3jvlppndyg3L2gi5eiaxIrPTKqD5vog="; }; - cargoHash = "sha256-+5rWjq3/0xfJ5Nbq0kReombuaJkcFmHoqVzzQ4x68Hc="; + cargoHash = "sha256-b3loo6ZzZs3XwBI4JT9oth57vP3Aaulp24B7YDSnhhQ="; nativeBuildInputs = [ pkg-config @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix index a1c4f60c4e65a..3cc36bf8ae3c7 100644 --- a/pkgs/applications/misc/tuir/default.nix +++ b/pkgs/applications/misc/tuir/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { pname = "tuir"; - version = "1.29.0"; + version = "1.31.0"; src = fetchFromGitLab { - owner = "ajak"; + owner = "Chocimier"; repo = pname; rev = "v${version}"; - sha256 = "1fqp6bvq8kzdsf3nna4mn1phdcixpx76bya43xrivxjbzsfl59ib"; + hash = "sha256-VYBtD3Ex6+iIRNvX6jF0b0iPvno41/58xCRydiyssvk="; }; # Tests try to access network @@ -21,13 +21,13 @@ buildPythonApplication rec { nativeCheckInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ]; - propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests six ]; + propagatedBuildInputs = [ beautifulsoup4 decorator kitchen mailcap-fix requests six ]; meta = with lib; { description = "Browse Reddit from your Terminal (fork of rtv)"; mainProgram = "tuir"; - homepage = "https://gitlab.com/ajak/tuir/"; + homepage = "https://gitlab.com/Chocimier/tuir"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne matthiasbeyer ]; + maintainers = with maintainers; [ Br1ght0ne matthiasbeyer brokenpip3 ]; }; } diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/applications/misc/twitch-chat-downloader/default.nix index 922c925cbb0c3..ffe1ddc9c220a 100644 --- a/pkgs/applications/misc/twitch-chat-downloader/default.nix +++ b/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -20,6 +20,13 @@ buildPythonApplication rec { hash = "sha256-mV60ygrtQa9ZkJ2CImhAV59ckCJ7vJSA9cWkYE2xo1M="; }; + postPatch = '' + # Update client ID for Twitch changes + # See: <https://github.com/TheDrHax/Twitch-Chat-Downloader/pull/16> + substituteInPlace tcd/example.settings.json \ + --replace-fail jzkbprff40iqj646a697cyrvl0zt2m6 kd1unb4b3q4t58fwlpcbzcbnm76a8fp + ''; + propagatedBuildInputs = [ iso8601 progressbar2 diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index c991a71e9c0ae..adfb93fb0246d 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -11,18 +11,21 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "cdown"; repo = "tzupdate"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-eod4yFzX7pATNQmG7jU+r9mnC9nprJ55ufMXpKjw/YI="; }; cargoHash = "sha256-5+lp5xlwJxFDqzVxptJPX7z0iLoMkgdwHxvRVIXHF7Y="; - meta = with lib; { + meta = { description = "Set the system timezone based on IP geolocation"; homepage = "https://github.com/cdown/tzupdate"; - license = licenses.mit; - maintainers = with maintainers; [ camillemndn ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + camillemndn + doronbehar + ]; + platforms = lib.platforms.linux; mainProgram = "tzupdate"; }; } diff --git a/pkgs/applications/misc/ubpm/default.nix b/pkgs/applications/misc/ubpm/default.nix index f2c0a9aa02e88..883850f10b133 100644 --- a/pkgs/applications/misc/ubpm/default.nix +++ b/pkgs/applications/misc/ubpm/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ubpm"; license = licenses.gpl3Only; maintainers = with maintainers; [ kurnevsky ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/misc/udict/default.nix b/pkgs/applications/misc/udict/default.nix index 24424c1017db7..42f2585ec439b 100644 --- a/pkgs/applications/misc/udict/default.nix +++ b/pkgs/applications/misc/udict/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 438277bc98cd4..cf3a6a46f9dec 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -121,6 +121,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://ulauncher.io/"; license = licenses.gpl3; platforms = platforms.linux; + mainProgram = "ulauncher"; maintainers = with maintainers; [ aaronjanse sebtm ]; }; } diff --git a/pkgs/applications/misc/uni/default.nix b/pkgs/applications/misc/uni/default.nix index 5773c13ae68e8..04ffa390d4b39 100644 --- a/pkgs/applications/misc/uni/default.nix +++ b/pkgs/applications/misc/uni/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "uni"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "arp242"; repo = "uni"; rev = "refs/tags/v${version}"; - hash = "sha256-ociPkuRtpBS+x1zSVNYk8oqAsJZGv31/TUUUlBOYhJA="; + hash = "sha256-LSmQtndWBc7wCYBnyaeDb4Le4PQPcSO8lTp+CSC2jbc="; }; - vendorHash = "sha256-/PvBn2RRYuVpjnrIL1xAcVqAKZuIV2KTSyVtBW1kqj4="; + vendorHash = "sha256-4w5L5Zg0LJX2v4mqLLjAvEdh3Ad69MLa97SR6RY3fT4="; ldflags = [ "-s" diff --git a/pkgs/applications/misc/usb-reset/default.nix b/pkgs/applications/misc/usb-reset/default.nix index 0e924ba5ee671..a5bb2061ed502 100644 --- a/pkgs/applications/misc/usb-reset/default.nix +++ b/pkgs/applications/misc/usb-reset/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Perform a bus reset on a USB device using its vendor and product ID"; homepage = "https://github.com/ralight/usb-reset"; changelog = "https://github.com/ralight/usb-reset/blob/master/ChangeLog.txt"; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix deleted file mode 100644 index a7b0eed9037b0..0000000000000 --- a/pkgs/applications/misc/veracrypt/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, makeself -, yasm -, fuse -, wxGTK -, lvm2 -, substituteAll -, e2fsprogs -, exfat -, ntfs3g -, btrfs-progs -, pcsclite -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "veracrypt"; - version = "1.26.7"; - - src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${lib.toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "sha256-920nsYJBTg1P2ba1n76iiyXbb6afK7z/ouwmmxqGX2U="; - }; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - ext2 = "${e2fsprogs}/bin/mkfs.ext2"; - ext3 = "${e2fsprogs}/bin/mkfs.ext3"; - ext4 = "${e2fsprogs}/bin/mkfs.ext4"; - exfat = "${exfat}/bin/mkfs.exfat"; - ntfs = "${ntfs3g}/bin/mkfs.ntfs"; - btrfs = "${btrfs-progs}/bin/mkfs.btrfs"; - }) - ]; - - sourceRoot = "src"; - - nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook3 ]; - buildInputs = [ fuse lvm2 wxGTK pcsclite ]; - - enableParallelBuilding = true; - - installPhase = '' - install -Dm 755 Main/${pname} "$out/bin/${pname}" - install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/${pname}.xpm" - install -Dm 444 License.txt -t "$out/share/doc/${pname}/" - install -d $out/share/applications - substitute Setup/Linux/${pname}.desktop $out/share/applications/${pname}.desktop \ - --replace "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \ - --replace "Icon=veracrypt" "Icon=veracrypt.xpm" - ''; - - meta = with lib; { - description = "Free Open-Source filesystem on-the-fly encryption"; - homepage = "https://www.veracrypt.fr/"; - license = with licenses; [ asl20 /* and */ unfree /* TrueCrypt License version 3.0 */ ]; - maintainers = with maintainers; [ dsferruzza ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index 82633111c33c2..12e14f212f7d7 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "vhs"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-CWurSAxEXAquWXEOyBWBF6JN9Pesm5hBS3jVNv56dvE="; + hash = "sha256-kUsh+jy4dXYW1uAUfFv/HKBqIIyVogLKUYNjBhIKlls="; }; - vendorHash = "sha256-Kh5Sy7URmhsyBF35I0TaDdpSLD96MnkwIS+96+tSyO0="; + vendorHash = "sha256-1UBhiRemJ+dQNm20+8pbOJus5abvTwVcuzxNMzrniN8="; nativeBuildInputs = [ installShellFiles makeWrapper ]; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; postInstall = '' - wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isLinux [ chromium ] ++ [ ffmpeg ttyd ])} + wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ chromium ] ++ [ ffmpeg ttyd ])} $out/bin/vhs man > vhs.1 installManPage vhs.1 installShellCompletion --cmd vhs \ diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 1335d950405fb..cb3ab09e31bcb 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -10,7 +10,7 @@ , withMBTiles ? true, sqlite , withMd5Hash ? true, nettle , withOAuth ? true, liboauth -, withRealtimeGPSTracking ? (!stdenv.isDarwin), gpsd +, withRealtimeGPSTracking ? (!stdenv.hostPlatform.isDarwin), gpsd }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook3 yelp-tools ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ curl gdk-pixbuf gtk3 json-glib libxml2 ] ++ lib.optional withGeoClue geoclue2 diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index cb6033fa4b62e..d7a7c4d9f75f4 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -40,7 +40,7 @@ # other , git , withPcap ? true, dpkt, dnslib -, withXclip ? stdenv.isLinux, xclip +, withXclip ? stdenv.hostPlatform.isLinux, xclip , testers , visidata }: diff --git a/pkgs/applications/misc/watchmate/Cargo.lock b/pkgs/applications/misc/watchmate/Cargo.lock index df3bf599d496a..d5c1b017d1d1f 100644 --- a/pkgs/applications/misc/watchmate/Cargo.lock +++ b/pkgs/applications/misc/watchmate/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -10,25 +19,30 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] +[[package]] +name = "android-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" @@ -38,11 +52,80 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" + +[[package]] +name = "ashpd" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "4ac22eda5891cc086690cb6fa10121c0390de0e3b04eb269f2d766b00d3f2d81" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "gdk4-wayland", + "gdk4-x11", + "gtk4", + "once_cell", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus", +] [[package]] name = "async-broadcast" @@ -50,32 +133,34 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-channel" -version = "1.8.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", "futures-core", + "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock", + "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand", - "futures-lite", + "fastrand 2.0.1", + "futures-lite 2.2.0", "slab", ] @@ -85,74 +170,139 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] name = "async-io" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", + "cfg-if", "concurrent-queue", - "futures-lite", - "libc", + "futures-lite 1.13.0", "log", "parking", - "polling", + "polling 2.8.0", + "rustix 0.37.27", "slab", - "socket2", + "socket2 0.4.10", "waker-fn", - "windows-sys 0.42.0", +] + +[[package]] +name = "async-io" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.2.0", + "parking", + "polling 3.5.0", + "rustix 0.38.31", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.31", + "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b015a331cc64ebd1774ba119538573603427eaace0a1950c423ab971f903796" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.3.1", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.31", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.3.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.66" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "atomic-waker" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -160,11 +310,26 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" -version = "0.21.0" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -178,6 +343,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + [[package]] name = "block-buffer" version = "0.10.4" @@ -189,23 +360,25 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock", + "async-lock 3.3.0", "async-task", - "atomic-waker", - "fastrand", - "futures-lite", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.2.0", + "piper", + "tracing", ] [[package]] name = "bluer" -version = "0.15.7" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d76ba39a871348200bbbf7dbff9fbaec30f0b988420f7391bfd9fdc5f8b5144" +checksum = "108df43a349f623b6fc6b190b08a0e05720872bba4e2333d7fa7dd102dd80912" dependencies = [ "custom_debug", "dbus", @@ -218,7 +391,7 @@ dependencies = [ "libc", "log", "macaddr", - "nix", + "nix 0.27.1", "num-derive", "num-traits", "pin-project", @@ -232,21 +405,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bzip2" @@ -271,11 +444,11 @@ dependencies = [ [[package]] name = "cairo-rs" -version = "0.17.0" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags", + "bitflags 2.4.2", "cairo-sys-rs", "glib", "libc", @@ -285,9 +458,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ "glib-sys", "libc", @@ -296,20 +469,21 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" dependencies = [ - "jobserver", + "libc", ] [[package]] name = "cfg-expr" -version = "0.11.0" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -320,43 +494,39 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.52.4", ] [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concurrent-queue" -version = "2.1.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -369,9 +539,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -379,36 +549,33 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-common" @@ -422,66 +589,60 @@ dependencies = [ [[package]] name = "custom_debug" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89e0ae2c2a42be29595d05c50e3ce6096c0698a97e021c3289790f0750cc8e2" +checksum = "14e715bf0e503e909c7076c052e39dd215202e8edeb32f1c194fd630c314d256" dependencies = [ "custom_debug_derive", ] [[package]] name = "custom_debug_derive" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f3941234c9f62ceaa2782974827749de9b0a8a6487275a278da068e1baf7" +checksum = "f731440b39c73910e253cb465ec1fac97732b3c7af215639881ec0c2a38f4f69" dependencies = [ + "darling", + "itertools", "proc-macro2", - "syn", + "quote", + "syn 2.0.52", "synstructure", ] [[package]] -name = "cxx" -version = "1.0.92" +name = "darling" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", + "darling_core", + "darling_macro", ] [[package]] -name = "cxx-build" -version = "1.0.92" +name = "darling_core" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ - "cc", - "codespan-reporting", - "once_cell", + "fnv", + "ident_case", "proc-macro2", "quote", - "scratch", - "syn", + "strsim", + "syn 2.0.52", ] [[package]] -name = "cxxbridge-flags" -version = "1.0.92" +name = "darling_macro" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "proc-macro2", + "darling_core", "quote", - "syn", + "syn 2.0.52", ] [[package]] @@ -517,6 +678,15 @@ dependencies = [ "tokio", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + [[package]] name = "derivative" version = "2.2.0" @@ -525,65 +695,51 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", "subtle", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] [[package]] name = "enumflags2" -version = "0.7.5" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", "serde", @@ -591,47 +747,52 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.4" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] -name = "env_logger" -version = "0.10.0" +name = "env_filter" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", ] [[package]] -name = "errno" -version = "0.2.8" +name = "env_logger" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d" dependencies = [ - "errno-dragonfly", - "libc", - "winapi", + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -640,6 +801,59 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -649,21 +863,27 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + [[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.8.0", + "memoffset 0.9.0", "rustc_version", ] [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -671,14 +891,13 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", "nanorand", - "pin-project", "spin", ] @@ -705,9 +924,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -720,9 +939,9 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "futures" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -735,9 +954,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -745,15 +964,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -762,17 +981,17 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -781,34 +1000,47 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -824,11 +1056,10 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.0" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" dependencies = [ - "bitflags", "gdk-pixbuf-sys", "gio", "glib", @@ -838,9 +1069,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", @@ -851,11 +1082,10 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5042053ee765aeef08d9d7e3f0f1e36a4d37f1659b3f93ad3d6997515dbb64a" +checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" dependencies = [ - "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -867,9 +1097,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f0fb00507af1e9299681dd09965f720e2b5ea95536d49a5681e8994ef10c7a" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -882,11 +1112,60 @@ dependencies = [ "system-deps", ] +[[package]] +name = "gdk4-wayland" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0db9102ff11e55bd65e153c1192abc21ddfa45ede90622e423d4e4a0e5d5f313" +dependencies = [ + "gdk4", + "gdk4-wayland-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk4-wayland-sys" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48159be256ae0212d5a2b9884627197d08082c7168b28775b53a0f9885d5624" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4-x11" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c9bbf8ea1ea8469e74c3fdfafc142c9e14810a27f89ddb01b5e9076a60a450" +dependencies = [ + "gdk4", + "gdk4-x11-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk4-x11-sys" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3de1709370758192369f5329aa593847797f1c693c95e8a261e9b2e06a5f125" +dependencies = [ + "gdk4-sys", + "glib-sys", + "libc", + "system-deps", +] + [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -894,24 +1173,29 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + [[package]] name = "gio" -version = "0.17.4" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" dependencies = [ - "bitflags", "futures-channel", "futures-core", "futures-io", @@ -927,9 +1211,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -940,11 +1224,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.5" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags", + "bitflags 2.4.2", "futures-channel", "futures-core", "futures-executor", @@ -963,24 +1247,23 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.5" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454924cafe58d9174dc32972261fe271d6cd3c10f5e9ff505522a28dcf601a40" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" dependencies = [ - "anyhow", "heck", - "proc-macro-crate", + "proc-macro-crate 2.0.2", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "glib-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", "system-deps", @@ -988,9 +1271,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", @@ -999,9 +1282,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.17.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ "glib", "graphene-sys", @@ -1010,9 +1293,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ "glib-sys", "libc", @@ -1022,11 +1305,10 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa9cd285a72a95124b65c069a9cb1b8fb8e310be71783404c39fccf3bf7774c" +checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" dependencies = [ - "bitflags", "cairo-rs", "gdk4", "glib", @@ -1038,9 +1320,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a445ae1e50cbf181a1d5c61b920a7e7e8657b96e0ecdbbf8911a86fad462a32" +checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1054,11 +1336,10 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" +checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" dependencies = [ - "bitflags", "cairo-rs", "field-offset", "futures-channel", @@ -1071,29 +1352,28 @@ dependencies = [ "gtk4-macros", "gtk4-sys", "libc", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4676c4f90d8b010e88cb4558f61f47d76d6f6b8e6f6b89e62640f443907f61" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "gtk4-sys" -version = "0.6.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65463dc801460e498d5e7ffa6e9ae2cfbed7d05fabd1ca5a8d024adbc89eeda6" +checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1110,14 +1390,12 @@ dependencies = [ [[package]] name = "gvdb" -version = "0.4.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6fc5915836ff1779eb9455810dad729811334b1026d4316eaf89c3a415e32ea" +checksum = "0bb9136c388a1e7b3017d18fe7c2f263b0a2b13f215c48e8eb44935d413ce0f9" dependencies = [ "byteorder", "flate2", - "lazy_static", - "memmap2", "quick-xml", "safe-transmute", "serde", @@ -1128,9 +1406,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.16" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -1147,9 +1425,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1159,18 +1437,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1189,9 +1458,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1200,9 +1469,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1217,9 +1486,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -1229,9 +1498,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.25" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -1244,7 +1513,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.5.6", "tokio", "tower-service", "tracing", @@ -1266,33 +1535,38 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows-core", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1300,11 +1574,11 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] @@ -1328,6 +1602,15 @@ dependencies = [ "zip", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "instant" version = "0.1.12" @@ -1339,52 +1622,41 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] -name = "is-terminal" -version = "0.4.4" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.45.0", + "either", ] [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -1397,12 +1669,10 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libadwaita" -version = "0.3.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c4efd2020a4fcedbad2c4a97de97bf6045e5dc49d61d5a5d0cfd753db60700" +checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" dependencies = [ - "bitflags", - "futures-channel", "gdk-pixbuf", "gdk4", "gio", @@ -1410,15 +1680,14 @@ dependencies = [ "gtk4", "libadwaita-sys", "libc", - "once_cell", "pango", ] [[package]] name = "libadwaita-sys" -version = "0.3.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0727b85b4fe2b1bed5ac90df6343de15cbf8118bfb96d7c3cc1512681a4b34ac" +checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" dependencies = [ "gdk4-sys", "gio-sys", @@ -1432,39 +1701,36 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libdbus-sys" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8d7ae751e1cb825c840ae5e682f59b098cdfd213c350ac268b61449a5f58a0" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" dependencies = [ "pkg-config", ] [[package]] -name = "link-cplusplus" -version = "1.0.8" +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1472,12 +1738,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "macaddr" @@ -1487,18 +1750,9 @@ checksum = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8" [[package]] name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.10" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -1511,48 +1765,47 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "wasi", + "windows-sys 0.48.0", ] [[package]] name = "mpris2-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/mpris2-zbus#a41a9b994a901cb2bb7a83424c8c21a78ba658c6" +source = "git+https://github.com/pop-os/dbus-settings-bindings#8b9767f6cedede2def12941ce89e14bfcd913aeb" dependencies = [ "serde", "thiserror", - "time 0.3.20", + "time", "zbus", "zvariant", ] @@ -1586,77 +1839,85 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", - "pin-utils", - "static_assertions", ] [[package]] -name = "num-derive" -version = "0.3.3" +name = "nix" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "proc-macro2", - "quote", - "syn", + "bitflags 2.4.2", + "cfg-if", + "libc", ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ - "autocfg", - "num-traits", + "proc-macro2", + "quote", + "syn 2.0.52", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] -name = "once_cell" -version = "1.17.1" +name = "object" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] [[package]] -name = "opaque-debug" -version = "0.3.0" +name = "once_cell" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.46" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd2523381e46256e40930512c7fd25562b9eae4812cb52078f155e87217c9d1e" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags", + "bitflags 2.4.2", "cfg-if", "foreign-types", "libc", @@ -1667,13 +1928,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] @@ -1684,11 +1945,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.81" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176be2629957c157240f68f61f2d0053ad3a4ecfdd9ebf1e6521d18d9635cf67" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -1707,11 +1967,10 @@ dependencies = [ [[package]] name = "pango" -version = "0.17.4" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" dependencies = [ - "bitflags", "gio", "glib", "libc", @@ -1721,9 +1980,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", @@ -1733,9 +1992,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "password-hash" @@ -1762,35 +2021,35 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1798,28 +2057,59 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "polling" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", "log", "pin-project-lite", - "windows-sys 0.45.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.31", + "tracing", + "windows-sys 0.52.0", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1833,7 +2123,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +dependencies = [ + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -1845,7 +2145,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -1862,18 +2162,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quick-xml" -version = "0.27.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", "serde", @@ -1881,9 +2181,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1919,30 +2219,22 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" +name = "regex" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ - "getrandom", - "redox_syscall", - "thiserror", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.7.1" +name = "regex-automata" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -1951,15 +2243,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "relm4" -version = "0.6.0-beta.1" +version = "0.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f169f698ce2e487eed2306898fcf262224a287d0e81480db4190e74cfec412cf" +checksum = "b7497b6d4d07b10f8d5384a657d40fb814de5fc900785322129ec459527c7af1" dependencies = [ "async-trait", "flume", @@ -1975,9 +2267,9 @@ dependencies = [ [[package]] name = "relm4-components" -version = "0.6.0-beta.1" +version = "0.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "734838f188ee58954351c75175cb5ba6e9e67f90576b7fb90b928b2cb6043e1d" +checksum = "d8fbe20184f217314e9f034db0f01267407de3887892252015861d6a207384e8" dependencies = [ "once_cell", "relm4", @@ -1986,9 +2278,9 @@ dependencies = [ [[package]] name = "relm4-icons" -version = "0.6.0-beta.6" +version = "0.7.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7123701f31271a2e33a53270a6e73010356d99cff1b97c89276299609af3303" +checksum = "f0d2413577ec528e0a4de8d05e7b1f6840e60f2cf14a70b16dfd8d862654c06c" dependencies = [ "gtk4", "gvdb", @@ -1996,20 +2288,20 @@ dependencies = [ [[package]] name = "relm4-macros" -version = "0.6.0-beta.1" +version = "0.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fa06febb3685960e7c1c44e21e44a3829325940b31d1e91391a43c32020c201" +checksum = "830b999c06b80fc53dac4e1b20382fde949b15cfd3342e71f53fed5346237a4f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ "base64", "bytes", @@ -2029,9 +2321,12 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", "tower-service", @@ -2042,6 +2337,12 @@ dependencies = [ "winreg", ] +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + [[package]] name = "rustc_version" version = "0.4.0" @@ -2053,29 +2354,51 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.9" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", - "windows-sys 0.45.0", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "safe-transmute" @@ -2094,32 +2417,26 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.52.0", ] [[package]] name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2128,9 +2445,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -2138,35 +2455,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.156" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.156" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -2175,13 +2492,22 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.11" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395627de918015623b32e7669714206363a7fc00382bf477e72c1f7533e8eafc" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", ] [[package]] @@ -2198,9 +2524,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -2209,45 +2535,64 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", "digest", ] +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", ] +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "spin" -version = "0.9.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -2258,33 +2603,39 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + [[package]] name = "strum" -version = "0.24.1" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn", + "syn 2.0.52", ] [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -2297,23 +2648,60 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synstructure" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn", - "unicode-xid", + "syn 2.0.52", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", ] [[package]] name = "system-deps" -version = "6.0.3" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ "cfg-expr", "heck", @@ -2323,64 +2711,52 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.4.0" +name = "target-lexicon" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.42.0", -] +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] -name = "termcolor" -version = "1.2.0" +name = "tempfile" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ - "winapi-util", + "cfg-if", + "fastrand 2.0.1", + "rustix 0.38.31", + "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "syn 2.0.52", ] [[package]] name = "time" -version = "0.3.20" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -2388,16 +2764,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -2418,32 +2795,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.26.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", "pin-project-lite", - "socket2", + "signal-hook-registry", + "socket2 0.5.6", "tokio-macros", "tracing", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] @@ -2458,9 +2835,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -2469,9 +2846,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -2483,26 +2860,45 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] [[package]] name = "toml_edit" -version = "0.19.7" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] @@ -2515,11 +2911,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2527,115 +2922,111 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "tracker" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4948dd579c7facd8b583a8838956177740021c7bbcc1074ff49f7a5e76a150fd" +checksum = "ff9636d15e370187f6bf55b79ce62ebf4221998bc0ba1774d7fa208b007f6bf8" dependencies = [ "tracker-macros", ] [[package]] name = "tracker-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b086e6cb7f65c79bc0b132db4e468c4159133c917da44e1b97594101e9e7e0" +checksum = "ca029746fbe0efda3298205de77bf759d7fef23ac97902641e0b49a623b0455f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.0", "tempfile", "winapi", ] [[package]] name = "unicode-bidi" -version = "0.3.11" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "url" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" -version = "1.3.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ "getrandom", ] @@ -2660,15 +3051,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -2676,20 +3067,13 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2698,9 +3082,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2708,24 +3092,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if", "js-sys", @@ -2735,9 +3119,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2745,28 +3129,29 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "watchmate" -version = "0.4.4" +version = "0.5.2" dependencies = [ "anyhow", + "ashpd", "env_logger", "futures", "infinitime", @@ -2779,9 +3164,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", @@ -2805,9 +3190,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -2818,130 +3203,201 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.4", +] + [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows-targets 0.48.5", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows-targets", + "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.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.3.6" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "xdg-home" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ + "libc", "winapi", ] [[package]] name = "zbus" -version = "3.11.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20aae5dd5b051971cd2f49f9f3b860e57b2b495ba5ba254eaec42d34ede57e97" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", "async-recursion", "async-task", "async-trait", + "blocking", "byteorder", "derivative", - "dirs", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", "hex", - "lazy_static", - "nix", + "nix 0.26.4", "once_cell", "ordered-stream", "rand", @@ -2953,6 +3409,7 @@ dependencies = [ "tracing", "uds_windows", "winapi", + "xdg-home", "zbus_macros", "zbus_names", "zvariant", @@ -2960,23 +3417,23 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.11.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9264b3a1bcf5503d4e0348b6e7efe1da58d4f92a913c15ed9e63b52de85faaa1" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", - "syn", + "syn 1.0.109", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", @@ -2985,9 +3442,9 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "aes", "byteorder", @@ -2999,7 +3456,7 @@ dependencies = [ "hmac", "pbkdf2", "sha1", - "time 0.3.20", + "time", "zstd", ] @@ -3024,49 +3481,49 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] [[package]] name = "zvariant" -version = "3.12.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" dependencies = [ "byteorder", "enumflags2", "libc", "serde", "static_assertions", + "url", "zvariant_derive", ] [[package]] name = "zvariant_derive" -version = "3.12.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/applications/misc/watchmate/default.nix index c668aea455317..eebcc3cce0118 100644 --- a/pkgs/applications/misc/watchmate/default.nix +++ b/pkgs/applications/misc/watchmate/default.nix @@ -1,61 +1,66 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, gtk4 -, libadwaita -, bluez -, dbus -, openssl -, wrapGAppsHook4 -, glib -}: +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + gtk4, + libadwaita, + bluez, + dbus, + openssl, + wrapGAppsHook4, + glib, +}: let + releaseVersion = "0.5.2"; +in + rustPlatform.buildRustPackage rec { + pname = "watchmate"; + version = "${releaseVersion}-unstable-2024-08-13"; -rustPlatform.buildRustPackage rec { - pname = "watchmate"; - version = "0.4.5"; - - src = fetchFromGitHub { - owner = "azymohliad"; - repo = "watchmate"; - rev = "v${version}"; - hash = "sha256-4L9mfZWphwXON8VgRcGrz+k62wyPzd1phtRu9HQnVdE="; - }; + src = fetchFromGitHub { + owner = "azymohliad"; + repo = "watchmate"; + rev = "e05edfae94a1973110c6f40f25133d5979f485ab"; + hash = "sha256-fHWxn7hFx/9cnLlCHIC6hIJaLd1U3Ii9mJgTJ+Hw63M="; + }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "mpris2-zbus-0.1.0" = "sha256-f2hth7TnA14I4UPyp0u4IfMi9WY4G3M1sEc4xNtnbr0="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "mpris2-zbus-0.1.0" = "sha256-a/cvbB0M9cUd8RP5XxgHRbJ/i/UKAEK4DTwwUU69IuY="; + }; }; - }; - nativeBuildInputs = [ - pkg-config - wrapGAppsHook4 - glib - ]; - buildInputs = [ - gtk4 - libadwaita - bluez - dbus - openssl - ]; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + glib + ]; - postInstall = '' - install -Dm444 assets/io.gitlab.azymohliad.WatchMate.desktop -t $out/share/applications/ - install -Dm444 assets/io.gitlab.azymohliad.WatchMate.metainfo.xml -t $out/share/metainfo/ - install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate.svg -t $out/share/icons/hicolor/scalable/apps/ - install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate-symbolic.svg -t $out/share/icons/hicolor/scalable/apps/ - ''; + buildInputs = [ + gtk4 + libadwaita + bluez + dbus + openssl + ]; - meta = with lib; { - description = "PineTime smart watch companion app for Linux phone and desktop"; - mainProgram = "watchmate"; - homepage = "https://github.com/azymohliad/watchmate"; - changelog = "https://github.com/azymohliad/watchmate/raw/v${version}/CHANGELOG.md"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ chuangzhu ]; - platforms = platforms.linux; - }; -} + postInstall = '' + install -Dm444 assets/io.gitlab.azymohliad.WatchMate.desktop -t $out/share/applications/ + install -Dm444 assets/io.gitlab.azymohliad.WatchMate.metainfo.xml -t $out/share/metainfo/ + install -Dm444 assets/io.gitlab.azymohliad.WatchMate.gschema.xml -t $out/share/glib-2.0/schemas/ + glib-compile-schemas $out/share/glib-2.0/schemas/ + install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate.svg -t $out/share/icons/hicolor/scalable/apps/ + install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate-symbolic.svg -t $out/share/icons/hicolor/scalable/apps/ + ''; + + meta = with lib; { + description = "PineTime smart watch companion app for Linux phone and desktop"; + mainProgram = "watchmate"; + homepage = "https://github.com/azymohliad/watchmate"; + changelog = "https://github.com/azymohliad/watchmate/raw/v${releaseVersion}/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [chuangzhu]; + platforms = platforms.linux; + }; + } diff --git a/pkgs/applications/misc/waypaper/default.nix b/pkgs/applications/misc/waypaper/default.nix index a8dae9664264b..924a7e766a70d 100644 --- a/pkgs/applications/misc/waypaper/default.nix +++ b/pkgs/applications/misc/waypaper/default.nix @@ -8,13 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "waypaper"; - version = "2.1.2"; + version = "2.3"; + pyproject = true; src = fetchFromGitHub { owner = "anufrievroman"; repo = "waypaper"; rev = "refs/tags/${version}"; - hash = "sha256-GB+H2kZr1+UhhGFpfXc3V4DPXjvHBdg6EKNEFhjKEHk="; + hash = "sha256-ty3KiKkIyv6aqTua3YUB2smYJv7dXGPP5k3lXoxDzI0="; }; nativeBuildInputs = [ @@ -22,14 +23,17 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook3 ]; - propagatedBuildInputs = [ + build-system = [ python3.pkgs.setuptools ]; + + dependencies = [ python3.pkgs.pygobject3 python3.pkgs.platformdirs python3.pkgs.importlib-metadata python3.pkgs.pillow - killall ]; + propagatedBuildInputs = [ killall ]; + # has no tests doCheck = false; diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 4809462740cc6..2884f0072a08c 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "Launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; license = licenses.gpl3Only; - maintainers = [ ]; + maintainers = with maintainers; [ aleksana ]; platforms = with platforms; linux; mainProgram = "wofi"; }; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index fccd7585e41e3..5ed42ab1fc298 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ tcl tk ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index a0521d443937b..869f7c63712c7 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Program to help prevent Repetitive Strain Injury"; mainProgram = "workrave"; longDescription = '' diff --git a/pkgs/applications/misc/wthrr/default.nix b/pkgs/applications/misc/wthrr/default.nix index 142d331be9f75..28072763b8ca5 100644 --- a/pkgs/applications/misc/wthrr/default.nix +++ b/pkgs/applications/misc/wthrr/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "wthrr"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "ttytm"; repo = "wthrr-the-weathercrab"; rev = "v${version}"; - hash = "sha256-3bWO2Gl8/B2p4k/6QhlT46RvyMJJs7WkVcX35vWN2Fk="; + hash = "sha256-8o84FFdcEPRtbsxWCc97tTGGownxlhpIM71GiBRT6uM="; }; - cargoHash = "sha256-8Uy+8UpCQyLaLsulpgC1w2XI9aqj2P5ebBlXqpuDIc4="; + cargoHash = "sha256-gHvPz8DZ6wSfMCzh8vx7Wv8pfP3P7p5EeRCTo4b30cw="; nativeBuildInputs = [ pkg-config @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index ff9965c3403db..9b46c65b80033 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.21.3"; + version = "6.22.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-1lIrxJ1Y5YRoXbZn77Msah5lSVW71gDczYUlXQjf01s="; + hash = "sha256-kFjUAOs92xExCV/ph81TFvgRXC6ZRi1m0G51c4JmeMA="; }; patches = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libmicrohttpd openssl hwloc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreServices OpenCL diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 20d79d6c4ac0c..9efdbc700a646 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.21.1"; + version = "6.22.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - hash = "sha256-70SYdO3uyPINanAoARd2lDwyiuc2f/gg4QuoDgoXjjs="; + hash = "sha256-qRn/FiYvogGFUIUj3CojtfO6fXRZghH+bgRP+ysI6mc="; }; postPatch = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libuv libmicrohttpd openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices IOKit ]; diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 2315810e03ff2..13b4097f8cdf2 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # Fix "No known features for CXX compiler", see # https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at # https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt --replace \ 'cmake_minimum_required(VERSION 2.8.12)' 'cmake_minimum_required(VERSION 3.1.0)' ''; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { categories = [ "Office" ]; }; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -Dm644 ${desktopItem}/share/applications/xpdf.desktop -t $out/share/applications install -Dm644 $src/xpdf-qt/xpdf-icon.svg $out/share/pixmaps/xpdf.svg ''; diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index 4ce68f77e25be..32605747399a3 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ bzip2 qtbase libnova proj_7 openjpeg libpng ]; cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ] - ++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; postInstall = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources" cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns" mv $out/XyGrib/XyGrib.app $out/Applications diff --git a/pkgs/applications/misc/yewtube/default.nix b/pkgs/applications/misc/yewtube/default.nix index 26ce9f8f64a27..b9ec7f323b370 100644 --- a/pkgs/applications/misc/yewtube/default.nix +++ b/pkgs/applications/misc/yewtube/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yewtube"; - version = "2.10.5"; + version = "2.12.0"; src = fetchFromGitHub { owner = "mps-youtube"; repo = "yewtube"; rev = "refs/tags/v${version}"; - hash = "sha256-a7ySRHSRHmQePaVV7HnCk8QsiAQfN4nCVRdamPMUHGo="; + hash = "sha256-66cGnEEISC+lZAYhFXuVdDtwh1TgwvCP6nBD84z2z0I="; }; postPatch = '' diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index 2c4dc76abb477..8da351b480691 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -9,15 +9,17 @@ girara, gettext, libarchive, + desktop-file-utils, + appstream-glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-cb"; - version = "0.1.10"; + version = "0.1.11"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - hash = "sha256-ibDKF6gMuh6p/Rs7cvOnFz8KrToGqMNk2GXEmZwYu8g="; + url = "https://pwmt.org/projects/zathura-cb/download/zathura-cb-${finalAttrs.version}.tar.xz"; + hash = "sha256-TiAepUzcIKkyWMQ1VvY4lEGvmXQN59ymyh/1JBcvvUc="; }; nativeBuildInputs = [ @@ -25,23 +27,26 @@ stdenv.mkDerivation rec { ninja pkg-config gettext + desktop-file-utils + appstream-glib ]; + buildInputs = [ libarchive zathura_core girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-cb/"; description = "Zathura CB plugin"; longDescription = '' The zathura-cb plugin adds comic book support to zathura. ''; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ jlesquembre ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ jlesquembre ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index b7b7a517310b7..0ed21d76888e8 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, meson, ninja, wrapGAppsHook3, @@ -28,15 +29,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "zathura"; - version = "0.5.6"; + version = "0.5.8"; src = fetchFromGitHub { owner = "pwmt"; repo = "zathura"; rev = finalAttrs.version; - hash = "sha256-lTEBIZ3lkzjJ+L1qecrcL8iseo8AvSIo3Wh65/ikwac="; + hash = "sha256-k6DEJpUA3s0mGxE38aYnX7uea98LrzevJhWW1abHo/c="; }; + patches = [ + # https://github.com/pwmt/zathura/issues/664 + (fetchpatch { + name = "fix-build-on-macos.patch"; + url = "https://github.com/pwmt/zathura/commit/53f151f775091abec55ccc4b63893a8f9a668588.patch"; + hash = "sha256-d8lRdlBN1Kfw/aTjz8x0gvTKy+SqSYWHLQCjV7hF5MI="; + }) + ]; + outputs = [ "bin" "man" @@ -54,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { # Make sure tests are enabled for doCheck # (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) (lib.mesonEnable "seccomp" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "landlock" stdenv.hostPlatform.isLinux) ]; nativeBuildInputs = [ @@ -68,28 +79,31 @@ stdenv.mkDerivation (finalAttrs: { appstream-glib ]; - buildInputs = [ - gtk - girara - libintl - sqlite - glib - file - librsvg - check - json-glib - texlive.bin.core - ] ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional stdenv.isDarwin gtk-mac-integration; + buildInputs = + [ + gtk + girara + libintl + sqlite + glib + file + librsvg + check + json-glib + texlive.bin.core + ] + ++ lib.optional stdenv.hostPlatform.isLinux libseccomp + ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura"; description = "Core component for zathura PDF viewer"; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ globin ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ globin ]; }; }) diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index dd8c9b143a662..88241856632dc 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,14 +1,21 @@ { config, - pkgs, + lib, + stdenv, + newScope, + gtk3, useMupdf ? true, }: -let - callPackage = pkgs.newScope self; +lib.makeScope newScope ( + self: + let + callPackage = self.callPackage; + in + { + inherit useMupdf; - self = rec { - gtk = pkgs.gtk3; + gtk = gtk3; zathura_core = callPackage ./core { }; @@ -22,14 +29,6 @@ let zathura_cb = callPackage ./cb { }; - zathuraWrapper = callPackage ./wrapper.nix { - plugins = [ - zathura_djvu - zathura_ps - zathura_cb - (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler) - ]; - }; - }; -in -self + zathuraWrapper = callPackage ./wrapper.nix { }; + } +) diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 00d3563d5b769..87ac40d1b2045 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -10,22 +10,27 @@ girara, djvulibre, gettext, + desktop-file-utils, + appstream-glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-djvu"; - version = "0.2.9"; + version = "0.2.10"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - hash = "sha256-lub4pu5TIxBzsvcAMmSHL4RQHmPD2nvwWY0EYoawwgA="; + url = "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-${finalAttrs.version}.tar.xz"; + hash = "sha256-MunYmSmnbNfT/Lr3n0QYaL2r7fFzF9HRhD+qHxkzjZU="; }; nativeBuildInputs = [ meson ninja pkg-config + desktop-file-utils + appstream-glib ]; + buildInputs = [ djvulibre gettext @@ -34,17 +39,17 @@ stdenv.mkDerivation rec { girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-djvu/"; description = "Zathura DJVU plugin"; longDescription = '' The zathura-djvu plugin adds DjVu support to zathura by using the djvulibre library. ''; - license = licenses.zlib; - platforms = platforms.unix; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index b3b5d514a84c9..f0fd28d4a444b 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -17,22 +17,26 @@ tesseract, leptonica, mujs, + desktop-file-utils, + appstream-glib, gitUpdater, }: -stdenv.mkDerivation rec { - version = "0.4.2"; +stdenv.mkDerivation (finalAttrs: { + version = "0.4.4"; pname = "zathura-pdf-mupdf"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - hash = "sha256-fFC+z9mJX9ccExsV336Ut+zJJa8UdfUz/qVp9YgcnhM="; + url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-${finalAttrs.version}.tar.xz"; + hash = "sha256-ASViSQHKvjov5jMVpG59lmoyPAKP9TiQ3694Vq2x9Pw="; }; nativeBuildInputs = [ meson ninja pkg-config + desktop-file-utils + appstream-glib ]; buildInputs = [ @@ -47,9 +51,9 @@ stdenv.mkDerivation rec { tesseract leptonica mujs - ] ++ lib.optional stdenv.isDarwin gtk-mac-integration; + ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; postPatch = '' sed -i -e '/^mupdfthird =/d' -e 's/, mupdfthird//g' meson.build @@ -57,15 +61,15 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"; }; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-pdf-mupdf/"; description = "Zathura PDF plugin (mupdf)"; longDescription = '' The zathura-pdf-mupdf plugin adds PDF support to zathura by using the mupdf rendering library. ''; - license = licenses.zlib; - platforms = platforms.unix; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 7119acd037464..37941f2689831 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -8,39 +8,44 @@ zathura_core, girara, poppler, + desktop-file-utils, + appstream-glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-pdf-poppler"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - hash = "sha256-cavu1RzR0YjO89vUwWR1jjw3FgR1aWeyOtF2rlNFMBE="; + url = "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${finalAttrs.version}.tar.xz"; + hash = "sha256-yBLy9ERv1d4Wc04TwC6pqiW6Tjup9ytzLA/5D5ujSTU="; }; nativeBuildInputs = [ meson ninja pkg-config + desktop-file-utils + appstream-glib zathura_core ]; + buildInputs = [ poppler girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-pdf-poppler/"; description = "Zathura PDF plugin (poppler)"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by using the poppler rendering library. ''; - license = licenses.zlib; - platforms = platforms.unix; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 54202f919669d..3978668991c30 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -9,15 +9,17 @@ girara, libspectre, gettext, + desktop-file-utils, + appstream-glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-ps"; - version = "0.2.7"; + version = "0.2.8"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - hash = "sha256-WJf5IEz1+Xi5QTvnzn/r3oQxV69I41GTjt8H2/kwjkY="; + url = "https://pwmt.org/projects/zathura-ps/download/zathura-ps-${finalAttrs.version}.tar.xz"; + hash = "sha256-B8pZT3J3+YdtADgEhBg0PqKWQCjpPJD5Vp7/NqiTLko="; }; nativeBuildInputs = [ @@ -25,24 +27,27 @@ stdenv.mkDerivation rec { ninja pkg-config gettext + desktop-file-utils + appstream-glib ]; + buildInputs = [ libspectre zathura_core girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-ps/"; description = "Zathura PS plugin"; longDescription = '' The zathura-ps plugin adds PS support to zathura by using the libspectre library. ''; - license = licenses.zlib; - platforms = platforms.unix; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 5d60c48222123..4290fff26bcf6 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -3,8 +3,19 @@ lib, makeWrapper, zathura_core, + zathura_djvu, + zathura_ps, + zathura_cb, + zathura_pdf_mupdf, + zathura_pdf_poppler, file, - plugins ? [ ], + useMupdf, + plugins ? [ + zathura_djvu + zathura_ps + zathura_cb + (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler) + ], }: symlinkJoin { name = "zathura-with-plugins-${zathura_core.version}"; diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 593ca13f9fee2..7ac5133d11b9a 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -2,7 +2,7 @@ builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { zettlr = { - version = "3.0.2"; - hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA="; + version = "3.2.0"; + hash = "sha256-gttDGWFJ/VmOyqgOSKnCqqPtNTKJd1fmDpa0ZAX3xc8="; }; } diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix index 777c74a5dffe5..65e9f03de642b 100644 --- a/pkgs/applications/misc/zettlr/generic.nix +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -1,9 +1,11 @@ -{ pname -, version -, hash -, appimageTools -, lib -, fetchurl +{ + pname, + version, + hash, + appimageTools, + lib, + fetchurl, + makeWrapper, }: # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. @@ -19,21 +21,28 @@ in appimageTools.wrapType2 rec { inherit pname version src; - extraPkgs = pkgs: [ pkgs.texliveMedium pkgs.pandoc ]; + extraPkgs = pkgs: [ + pkgs.texliveMedium + pkgs.pandoc + ]; + + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' + wrapProgram $out/bin/zettlr \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png substituteInPlace $out/share/applications/Zettlr.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace-fail 'Exec=AppRun' 'Exec=${pname}' ''; - meta = with lib; { + meta = { description = "Markdown editor for writing academic texts and taking notes"; homepage = "https://www.zettlr.com"; platforms = [ "x86_64-linux" ]; - license = licenses.gpl3; - maintainers = with maintainers; [ tfmoraes ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ tfmoraes ]; mainProgram = "zettlr"; }; } diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index c7fb80e8318b1..40d8b61603655 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/applications/networking/adguardian/default.nix b/pkgs/applications/networking/adguardian/default.nix index 21123d47e5d1b..425974fee511e 100644 --- a/pkgs/applications/networking/adguardian/default.nix +++ b/pkgs/applications/networking/adguardian/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-IPkKiXuFN0KFlcrrSjLmML+O5zCrVRKEqdyV2xBsCsg="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 2eea332239ce8..97bf552604d45 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.11.10"; + version = "1.11.11"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-O+94hdRaPZYcU4ICiGGQ7CBKPMAT9qPCsMsHcurW+/4="; + hash = "sha256-9NhwxB5AeGvQgZbjNu5WWHiP194ws7s1WDtCntLr//g="; }; - vendorHash = "sha256-jXtnPBlSeA1Q+2VY+It7XnORz6uW0ZLYX+csBTYolNE="; + vendorHash = "sha256-A8Bf/KzTFvC/hFLU1k6M89649wjoqnIXRQ1uJaTj9YA="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; subPackages = [ "main" ]; diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index 1451e4bbaabd7..786f11d2d743c 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Gemini Project client written in Rust with NCurses"; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index e73772ce41558..65d064459e61c 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -3,20 +3,20 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( - if stdenv.isAarch64 then + if stdenv.hostPlatform.isAarch64 then rec { pname = "brave"; - version = "1.69.153"; + version = "1.70.123"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-4j5Byts8mawq3Z7pgVhtujE+RR/uOb5MIC4iip0GtEw="; + hash = "sha256-YqSZYQinNyQQQds5ACyDCeZA+D4sBxyMvMiOvD6CVeU="; platform = "aarch64-linux"; } - else if stdenv.isx86_64 then + else if stdenv.hostPlatform.isx86_64 then rec { pname = "brave"; - version = "1.69.153"; + version = "1.70.123"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-a5Hg7DoasbTQ7NOcx6XZ9zQosT5Y+TgQW5XCyYmIZDw="; + hash = "sha256-Hr7/Yry7fhSDe1gzpZqtjuIDrbB6HuC1PSeBQ3HlAdE="; platform = "x86_64-linux"; } else diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/applications/networking/browsers/brave/make-brave.nix index 0a4345593bba4..2ea95693a9aed 100644 --- a/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook3, makeWrapper +{ lib, stdenv, fetchurl, buildPackages , alsa-lib , at-spi2-atk , at-spi2-core @@ -49,14 +49,14 @@ , commandLineArgs ? "" # Necessary for USB audio devices. -, pulseSupport ? stdenv.isLinux +, pulseSupport ? stdenv.hostPlatform.isLinux , libpulseaudio # For GPU acceleration support on Wayland (without the lib it doesn't seem to work) , libGL # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder) -, libvaSupport ? stdenv.isLinux +, libvaSupport ? stdenv.hostPlatform.isLinux , libva , enableVideoAcceleration ? libvaSupport @@ -112,7 +112,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ dpkg - (wrapGAppsHook3.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/applications/networking/browsers/brave/update.sh index 04fbbc349419e..d08c1559d0a44 100755 --- a/pkgs/applications/networking/browsers/brave/update.sh +++ b/pkgs/applications/networking/browsers/brave/update.sh @@ -23,7 +23,7 @@ cat > $SCRIPT_DIR/default.nix << EOF callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( - if stdenv.isAarch64 then + if stdenv.hostPlatform.isAarch64 then rec { pname = "brave"; version = "${latestVersionAarch64}"; @@ -31,7 +31,7 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) hash = "${hashAarch64}"; platform = "aarch64-linux"; } - else if stdenv.isx86_64 then + else if stdenv.hostPlatform.isx86_64 then rec { pname = "brave"; version = "${latestVersionAmd64}"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1826cf61d147f..1ef2e9d153825 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchpatch , recompressTarball , buildPackages , buildPlatform @@ -65,10 +65,6 @@ let python3WithPackages = python3.pythonOnBuildForHost.withPackages(ps: with ps; [ ply jinja2 setuptools ]); - clangFormatPython3 = fetchurl { - url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT"; - hash = "sha256-1BRxXP+0QgejAWdFHJzGrLMhk/MsRDoVdK/GVoyFg0U="; - }; # The additional attributes for creating derivations based on the chromium # source tree. @@ -312,9 +308,12 @@ let # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61 # allowing us to use our rustc and our clang. ./patches/chromium-121-rust.patch - ] ++ lib.optionals (chromiumVersionAtLeast "126") [ + ] ++ lib.optionals (versionRange "126" "129") [ # Rebased variant of patch right above to build M126+ with our rust and our clang. ./patches/chromium-126-rust.patch + ] ++ lib.optionals (chromiumVersionAtLeast "129") [ + # Rebased variant of patch right above to build M129+ with our rust and our clang. + ./patches/chromium-129-rust.patch ]; postPatch = '' @@ -376,9 +375,6 @@ let # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc - # We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408: - base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format - # Add final newlines to scripts that do not end with one. # This is a temporary workaround until https://github.com/NixOS/nixpkgs/pull/255463 (or similar) has been merged, # as patchShebangs hard-crashes when it encounters files that contain only a shebang and do not end with a final diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index bebb279f1a669..484cc0e4f1940 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -16,7 +16,7 @@ , enableWideVine ? false , ungoogled ? false # Whether to build chromium or ungoogled-chromium , cupsSupport ? true -, pulseSupport ? config.pulseaudio or stdenv.isLinux +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , commandLineArgs ? "" , pkgsBuildBuild , pkgs diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 437b82d3a777e..0a8ed0a60a49b 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -20,7 +20,7 @@ for entry in feed.entries: url = requests.get(entry.link).url.split('?')[0] - if entry.title != 'Stable Channel Update for Desktop': + if entry.title.lower() != 'Stable Channel Update for Desktop'.lower(): if target_version and entry.title == '': # Workaround for a special case (Chrome Releases bug?): if not 'the-stable-channel-has-been-updated-to' in url: diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-129-rust.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-129-rust.patch new file mode 100644 index 0000000000000..1fe0c7f87324d --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-129-rust.patch @@ -0,0 +1,21 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 45086d6838cac..81132ad8ecb31 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -1727,16 +1727,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_nacl && !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/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 786991c11c797..4c2ee8a3c3576 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,37 +1,37 @@ { stable = { chromedriver = { - hash_darwin = "sha256-tC2BZmjKeYjBfwJINtgVQEJjiqJidVtnXdxigFkR2/M="; + hash_darwin = "sha256-cWY8P3D+PrIlbEdMYPp+4cFQZfOLbGeebC1Glg53Sx4="; hash_darwin_aarch64 = - "sha256-MRXiiQPY8EZ85zRCmJyxuI7SG5RbalBBg+vt0goeWus="; - hash_linux = "sha256-rQ/WYDghBXewFqMTGf7ZJGp2mMiPwjf8ImNyTvXulQU="; - version = "128.0.6613.86"; + "sha256-Tu11SCTlB+8/ao0uS7AbknB5WuvN+cw/gHiyL6xKH1o="; + hash_linux = "sha256-Da+xaXNNP8eRccq87LBxMb+2oXJ4WRGLdWoCAhG2yAQ="; + version = "129.0.6668.89"; }; deps = { gn = { - hash = "sha256-BiMGbML5aNUt4JzzVqSszBj+8BMlEc92csNugo5qjUk="; - rev = "b2afae122eeb6ce09c52d63f67dc53fc517dbdc8"; + hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA="; + rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad"; url = "https://gn.googlesource.com/gn"; - version = "2024-06-11"; + version = "2024-08-19"; }; }; - hash = "sha256-wqhaK1VuE1qPLt+f/x2KrtwZGxKFluTOWYMau+cSl2E="; - version = "128.0.6613.113"; + hash = "sha256-+n9LjRLFvVB/pYkSrRCxln/Xn2paFyoY+mJGD73NtII="; + version = "129.0.6668.89"; }; ungoogled-chromium = { deps = { gn = { - hash = "sha256-BiMGbML5aNUt4JzzVqSszBj+8BMlEc92csNugo5qjUk="; - rev = "b2afae122eeb6ce09c52d63f67dc53fc517dbdc8"; + hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA="; + rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad"; url = "https://gn.googlesource.com/gn"; - version = "2024-06-11"; + version = "2024-08-19"; }; ungoogled-patches = { - hash = "sha256-2P9c+zS741H4/jTp92mno4egju9r0tGTLkXHAFhM9mA="; - rev = "128.0.6613.113-1"; + hash = "sha256-fKMa/TxQRzteLIYMy+gn5fDvxLyrqtSwXHWxle0bhsE="; + rev = "129.0.6668.89-1"; }; }; - hash = "sha256-wqhaK1VuE1qPLt+f/x2KrtwZGxKFluTOWYMau+cSl2E="; - version = "128.0.6613.113"; + hash = "sha256-+n9LjRLFvVB/pYkSrRCxln/Xn2paFyoY+mJGD73NtII="; + version = "129.0.6668.89"; }; } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 8a129f2fdab8f..3dd71ab810e75 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -4,7 +4,7 @@ , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null , enablePython ? false, python ? null -, enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null +, enablePerl ? (!stdenv.hostPlatform.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null # re-add javascript support when upstream supports modern spidermonkey }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ncurses libX11 bzip2 zlib brotli zstd xz openssl libidn tre expat libev ] - ++ lib.optional stdenv.isLinux gpm + ++ lib.optional stdenv.hostPlatform.isLinux gpm ++ lib.optional enableGuile guile ++ lib.optional enablePython python ++ lib.optional enablePerl perl diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 69c3fdbfbca0c..1c82fa7d8612e 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,7 +1,7 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook3, gnome }: +, gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gst-plugins-ugly gstreamer - gnome.gnome-settings-daemon + gnome-settings-daemon gtk3 gtkspell3 hunspell diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 21d39c68fdcec..4be907711c295 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1035 +1,1035 @@ { - version = "130.0b2"; + version = "131.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ach/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ach/firefox-131.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "32f2f06fb0c00dc6e299453182da8a25fbf172ab398d6c984bcf35ff3a9ab4d3"; + sha256 = "4763bf000a15940affeccfe6e3cd468a9a8cd89db8d790292272f2819c980c07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/af/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/af/firefox-131.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a73e3bbbbb7c0ee46be12cd93a2c8c32f0664ed9b6480dd619a0d1a771fb6713"; + sha256 = "85046ad1fb678e95ca835435aa0722552a774e2c71f0b38cb9d15ba711d37c10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/an/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/an/firefox-131.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "12cc083d2b13aef55e13e5010c9ce37346bd30a7e1b29c59cff59c80a5914627"; + sha256 = "353952993afb71045c68f373b590ba3a496981a365d2f4f0c33300f82750a87f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ar/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ar/firefox-131.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "6d97cc24302ab864390d7d1dc7588fceb4acf563d9a28a0e877081053dfcf1ac"; + sha256 = "9965c0c302662f0863bce753d538950f0f5425575633f299188850505b9ca1cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ast/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ast/firefox-131.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "16cc8628f76b0591a4287996c5c648956f7cf45d4f7deccf09e50dd748a1a18e"; + sha256 = "b8bf592307c2719a448f9203471e3e71e90e1bacc41509d54a50307c3ac3920c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/az/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/az/firefox-131.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "bd5eff4c5dca6d313ceaaa46fb59d90fc6854e860ac9e708b1b31b3354eeeee7"; + sha256 = "4a58014662c43072ae6616ff98c28ca8f54fd883329789c41248bf5d63c7404d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/be/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/be/firefox-131.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "32757f8686419e7f267aaaacf0ea913389b1fb700ef6cfaff78a9fddcf70ce0d"; + sha256 = "f6845ab9a4715d92841973723c1126ffe10bf45a911c12cd74e3a09bdc1ad2b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/bg/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/bg/firefox-131.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "ceea76edd205debbe9f823dc0998b7ae8983b8fb081feaa904d7e17efdfd1343"; + sha256 = "9d180594754fe68366fb37ae22c9a1fc20ee429ae997ef482f7bd192f1ece760"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/bn/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/bn/firefox-131.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "9a80b2b4f22398f27fbac7c6d7f4897b3b7f67d3e7b252062dc8337260fcd33c"; + sha256 = "8281a1f5577892eeba43c761c66c26d0304faab55d5e4579a6f977e26f3fd6ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/br/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/br/firefox-131.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "1dd3aad00a8690f573b6209ed53de046a9b22db14f911a5a7c15fa24ad0611aa"; + sha256 = "188e8f62ef978a7113b648caccf581055f64925a170351169d193d8635492b97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/bs/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/bs/firefox-131.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "2b3ac30417aeb15245133be5fb70414b5661faef161747bc8922c6d667a883f3"; + sha256 = "b3ec4dd38cc6efdee0bea477f3cf804304d4b36b34b124cd969b7f5925009e30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ca-valencia/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ca-valencia/firefox-131.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "511d585cb868d7ed6fcac420ebbf282c9ed228273d5c7a0348b2ca5ea890bf07"; + sha256 = "f2519beaa589ee54f69e0a5d35c583fdabe80df247aa83f7915e2370c457d8f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ca/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ca/firefox-131.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4cb0cbf3817acd1629e746efc50f064d78e557945e3ef76159813c602099a5b2"; + sha256 = "22dd974392d30780b1a233406153082d292a7ad9ea3920f0afd315c6c9d7796f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/cak/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/cak/firefox-131.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b49901b5a1437d7e97a33d91a3c51f2cc2685811f4d5cadf6a1f58d188a3ee97"; + sha256 = "6afb592800ed07337b807a6bd925c4c0db40c9d18a28b7976a88f349e0dc46d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/cs/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/cs/firefox-131.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4dd0ada2241859e5789805ae571262c22240a843cc4ed80980c25804bb096bab"; + sha256 = "5975de9356392c335c37136be59c157a0364238eada296d356429f3c9a3c232f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/cy/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/cy/firefox-131.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3fe97434c7e718796cbc4a3d863be920c9310e0f1545e2e4692473f6ae3b6fa0"; + sha256 = "ff96ef11edde597f1c8c4dce2da4d6b9c72e3652c911d7e34368a9dbdf5fe1ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/da/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/da/firefox-131.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "0aed8fa23c42673d57bb672f386521585283d847d052c63957ed7ad8a06a6b82"; + sha256 = "620e6b7f7398e9942b67e41c6c850739a753ed46bcf82ce504c8e9912c46cd97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/de/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/de/firefox-131.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "bf3e1f8681fef2c1c78dc9fb32912856f0865d415cff2e6f250d66b737dbb192"; + sha256 = "1bf2006d6c8c2275eab203ba2d6a0d8aefea199e7276c4a33019400b2557fe2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/dsb/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/dsb/firefox-131.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "3339d19f6c2110daaa5a6d5efaa6535dc1ddc50b96970d763ccc6fbfde936253"; + sha256 = "600f9fd28335e4a86a79d3e0a8a83d8037e439426ea514c4257316230092d2bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/el/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/el/firefox-131.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1bf8b2f60a1d7a663a468e043f8989dd94e7316902550fd9293a3e1b11aaecb9"; + sha256 = "d14fce952540ab83fcea14b8318817138b93d4ade2fc95c38211e3888fcb152b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/en-CA/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/en-CA/firefox-131.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "390eb22078d3a6edfd617fe12ad9a8a0cdb084b685ac4a5a12e8ad9bde6d6519"; + sha256 = "f54ee4901ce8d26f812f97f5a1aa803d46c3b79e9db85fec7d5d49ae78b2d3b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/en-GB/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/en-GB/firefox-131.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "db83796e7ac98244a40997f5a601c80cee21bdae932117a40862e5000a78f087"; + sha256 = "cbc631160a71849b8f104a8e3486b750b1d1e614bd763c6f4aa67b2a8b804680"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/en-US/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/en-US/firefox-131.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "b4afbc5e987e84daecb3802e19d0daad15c4f522b66e15d443324e66fc0d04ba"; + sha256 = "6b8b2aead8f8ad4ad979277e2af621ae27d6a2dc11781abf85f11e1a867411f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/eo/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/eo/firefox-131.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "1b7a0489417d9b174eb72fa49acfb70d6cc7327f0d0535ed7e70da4cc150b17d"; + sha256 = "ab1c46580ab975f9a1318e23b8d8269b485c9ffd82696d2579efbce6d41a7c67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/es-AR/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-AR/firefox-131.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ce1178c4b8e733b9da83ac5e318dfb37997da631420544838318a3d75ada9a8e"; + sha256 = "00e238aa562c1700d8faa26b0233e17f6185a2cc2599e7842c34870d9e0227e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/es-CL/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-CL/firefox-131.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "02e6a34539e9c89c34bcd737996397fc69c2bd9666bf081861d78db34f507982"; + sha256 = "d6a1d8734908c47e5392670f68ee6bd413bb2d81635da5e244e9ccd7bdbbd0d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/es-ES/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-ES/firefox-131.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "3b7f99aed71fe41aa5981e601722539ef1d24d0f3f3fb6db433d3f0ff34c87d8"; + sha256 = "ef25296096196e03c4d73156b0915e15bf5de0a3beca46693902e0bbdc276152"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/es-MX/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-MX/firefox-131.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e73565132c5299806ee80c998d62ed191e8bfc34caff49a618a5c8da68908cc8"; + sha256 = "c41c0c851eee771d4c12a0296979837efc33730448d03a34565c326311efee4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/et/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/et/firefox-131.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d296dc6a32abe0d76b055ff242a67f2e78edce53a92fd09c3c2bd47daf7960f9"; + sha256 = "810668f7056a9e025bf48f0e1dd07ca588b1e159bac5c406460f18372c8a126d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/eu/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/eu/firefox-131.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b8cd6653c34114c36ca98ada18325ed0fde7624a04376203fc0b42ad252bea45"; + sha256 = "f9a7f2caba22a34d7363ef3e0fe2097ae577fffb8f410b5e4544ea4e158fd7c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/fa/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fa/firefox-131.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "481ee6fff91887455ce6186dd1562ba646e52a97c6aa024b10f654d556da1653"; + sha256 = "9ea0945da1a54c10bec5ae2c459963ae6b87ae2958b35a352ea2e7c7aca86e48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ff/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ff/firefox-131.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "f4a4c6724bb29262c808a9f560dad9275edaa9d06edea15c617a60bfd5052994"; + sha256 = "103b3246e2411b27caf160379581b33ed1b749444903a4194b0d33f1b2ea3c1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/fi/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fi/firefox-131.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "08415b02f52c683f5eb2f02d4e1b73f5002d30b5cba80126001921e201c30af4"; + sha256 = "2a25aa1fc5bc4126b93a47acb8554c4e337ab40faa5631b729b8f4b8b1278199"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/fr/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fr/firefox-131.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b3d360e4c1de1afb46cd6a85848eba13bddab9489df611a45d832ce6fd3e507b"; + sha256 = "57e5b8cb7ff457f22c40d75cd6f4b997afdd0b195f9d627bbdb08542c8bc0c84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/fur/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fur/firefox-131.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "06ec07bab22b0ff4b68064992e51981b6ae715a67a74cc8dec866206b1ea9dd2"; + sha256 = "3e6025dacc114d5798a74816d5b688f1b35fcd8e43664c53b2ae250790fdaa31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/fy-NL/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fy-NL/firefox-131.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "2721766c1a2b01eb010e6b8c78d6fa7baef96de3695467d40e52934101976b3a"; + sha256 = "94868a793e8f2f4d6489832d2f8f775f41a1e75cc1c2cadbfc9aec7bb490ea44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ga-IE/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ga-IE/firefox-131.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "1457f9ac6789267ccd55b6e12d1e5dcb00a7ce5841ec0c6aa29282c3c8c01218"; + sha256 = "1122f87064c7d34664a2c357ed572326b4722f2070d9ffb215a911dd4dee10e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/gd/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gd/firefox-131.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2151c145079aa319d26aa378d7727729e2736a0432e9ae9226614b5a3682a098"; + sha256 = "271b9616e87ae48d0a0f10cb354e4757762b8a6fd70d47c7eaf36f8175948f2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/gl/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gl/firefox-131.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "4c9dcaf293c5a2878e52b94e1d58ceb8d8ec70170c61b3aa4c916611c9619e45"; + sha256 = "383a27b1a3811dd920cca825eff6d73546df6cc43c91090a3b2802d18e6356c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/gn/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gn/firefox-131.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "62209e27ddea2ce84198a7a5c577cb7e5bd5814f608eaea5eefb7eff2ceded71"; + sha256 = "3d91aa02daec75a4f46365fd2e01e2d8384b980de87a7c332e38f96b16ad40ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/gu-IN/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gu-IN/firefox-131.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f1259eaad5278415c883170d084ef6016142310774c5b11ae8c40e94d8051dac"; + sha256 = "4bb2617124583eaa98d78747eb815c0fded49567b0322f12691b0d9d92b1ac3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/he/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/he/firefox-131.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "36dd3dc78c85eb7a3fd80d4a8f99496331ef8e17be7759ed12bc351bf39e735f"; + sha256 = "6cd73d1ed9d9b4a6e3b3f42eb2326e934bc63d8b65847bb86f2485203a984546"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/hi-IN/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hi-IN/firefox-131.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e457ac7e7a82cc5ba8d9d85ec65f9f966cc867086a387ffa9faaeb0af3dcde7d"; + sha256 = "b58ede5f65661ae777ae357f5da1e07915e52a649421772bb5dd8b9194afc386"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/hr/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hr/firefox-131.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "03f2fb0073846e9b7730d300c7c91ad3014c37213e3f051cf179ff52ca772dca"; + sha256 = "540b9e4bb100ba1498e39f4fdfa40d7d3f6607054c679527c2e2fdf679c73dc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/hsb/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hsb/firefox-131.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "ac3e66908fbddcb4f4f78e74dc65bb2959533355017c12f33798ff19d2887339"; + sha256 = "b77d277e46d2c4f855d3aa000da4e9664c93b734c679afe16b059e3b348df05b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/hu/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hu/firefox-131.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ed302e300926c2a9c23c9418f3fb5d1889508cde274a713cafe9e23188dac41e"; + sha256 = "ef5519a39296a517876092ea902ba93bea1915a0d32f664e9a5c86e8933cf49c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/hy-AM/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hy-AM/firefox-131.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f736210fe63258810e9ee71a13d6c0ae9ace40b6e3041faee4c3dd35ee16e354"; + sha256 = "4f50d666cdd26affa0da647af3df72b8d960bdb3697c5efc6b8537fb26813704"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ia/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ia/firefox-131.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "f37c963c51f16dd966cf4cbcd1eb24938cf94510f4b059e933c3771d267553c6"; + sha256 = "5437999fcac257a3d7d83b2ee8267fe142583a39e0ffd80b8abe69a78bbca57f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/id/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/id/firefox-131.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "3560b3f96a52ae7e07cfce077400f6e06099948afd45cb733661abda9dae09de"; + sha256 = "2527e3f497eaa25bbe0650c249c3f07f9b1c451c74d58a7b47fbc542bf4fc01a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/is/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/is/firefox-131.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d0e24244b69958877cb4f228008a400759a91f57edd14f326f5ca3080f8cbc5b"; + sha256 = "565db2c30fa3d51dc6061c134e4c428e7d65bf1d99ebe8c936e0f13b14e9ba31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/it/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/it/firefox-131.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "b8dfbbe048fe8a0de413e803f815c78da62032ebf9d1c24e4fa2aa7ed36fd012"; + sha256 = "cbfb895d5e01e2b4c80592dcf9a6a8a67fff3fdd926ca418066b52c5cf8af486"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ja/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ja/firefox-131.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "c1cd2d620100efb18c26ab4afe782a8f336abc5902d96dfd10a431a55128dcca"; + sha256 = "afe3aad601e339f649596754620a6cb41178e0580e2e04dfc3525921177ec2f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ka/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ka/firefox-131.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "a2eb1e7864e4fc3abd54966240cabe6c9571a75ce845938bf618e833a5c1c9a6"; + sha256 = "037ac18be525fd286e58d3cca21a83a92962df5b5317f561f014536e71eaf2a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/kab/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/kab/firefox-131.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f01a35a8a41844d2f5569c21b69c3891ba74173bfe08508c63d6aa527c854b0e"; + sha256 = "e26ad34373517016e32b6e1901f0b1a310870f2ce269e7273e4f3d5859c164aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/kk/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/kk/firefox-131.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "32dd08417033e785d4a1f85e77f1ed1f3d4670e65cd2c9237c1584cb57e6ecda"; + sha256 = "ff379878de875600ec9c229153a37500f6f1b4e2ff0a61916698e18da0235b3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/km/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/km/firefox-131.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "0eadca878bc176f05f1c4e944d7bd9ee8d9ca2bb585ecd3b5f70fbd3bdc27cfb"; + sha256 = "abac0d85952087d33c02880c689ab47a8b51ff421e6e7d1f2703250005662e21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/kn/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/kn/firefox-131.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "5f0fc77a6de113892a0e74ee0425d980427d8b090eb56c5cfcac81aa00c99ca2"; + sha256 = "a4fa0dbe1d51351c8ab54cc44bf4a3810a6919049e174d93c7dd64a86838c0c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ko/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ko/firefox-131.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "bbe82b836d9007454eb254ba174a2d1832bc778bbdcc113da23d8783e0bddb7d"; + sha256 = "02901a60da1e4ac3b8b70579ae003270dccefc72c112f4bbac1e3ba38a391a9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/lij/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/lij/firefox-131.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "7c86ca6ebcc78664ae7d4e6284b1e79abbf02c39cea51340eb54348a6523397b"; + sha256 = "2f4d71e54f56426651218df43cffae83d4a0da4f775f9e540d21f9e4e059d6c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/lt/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/lt/firefox-131.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "931d12f97435ffe7a214652abe8298e0ce960176d9b31b4945a380e707a01bce"; + sha256 = "d27567298bdd12f95089983413d3379987b2842fd94e29761aa83c89908ab3d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/lv/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/lv/firefox-131.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "7d144d7f177343f46d16fce19e33a2c6bda102e02a1940f8f5d70779a7f38ea8"; + sha256 = "781792bdd0f5169bda104c1bce61d80e3dfe854a98dc469d5fd89145e7480c16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/mk/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/mk/firefox-131.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "0a23d158821ab8f711fa87192ea3c1d0d1c6ca71518a41fb91be81b0e32b3915"; + sha256 = "441acc04a7796fdd9a693049ac2a2a99e19ca26d5433158a649dc9054cc78bfd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/mr/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/mr/firefox-131.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "4a2eee82794a46b60d7cb9c8231313b175c2d662378b89354967bc2209f44a5c"; + sha256 = "a45c4c84a08f969821f060d81e6537600d4c6f7be4bcb7967e0a1e4df8057985"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ms/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ms/firefox-131.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "17240afd4d475fa4a2ae7e7afeb886512e83cc597bc66319c4e7ed47bf3c1e26"; + sha256 = "9a1f96989aa5b0f5f40bd9b89f813b586334165d28ce68d0ea811bf4b4377a12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/my/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/my/firefox-131.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "d7de50c3a8486404c94b4234069f0b89596d05ce3aa08ee7ddebce98c1d88a5c"; + sha256 = "3622b5b8c9af179a8a536f3ce616132ebd8d3dc13f67a0368c7190c579cf9dbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/nb-NO/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/nb-NO/firefox-131.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "6bed8ab5cebbaa40f9f0e88e6f479137ce66a979d8999f16fe60264f6847ad16"; + sha256 = "062a00dec6f88988674e0b79f3c53215dc1dcfd270f04f9dc24fc0c69cbcc3bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ne-NP/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ne-NP/firefox-131.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d3d2051e9e9fc9367f1bfe743827a759cba17bd86f3a3dcddfed02fe9ae4aac3"; + sha256 = "9a83d84d258cd1ad43dda913423825aeaa3e77f7c51fff699cbed4932b2fccac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/nl/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/nl/firefox-131.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "5f7ecb9dcf22e58c843336b5514e13d0e5b831c26731aff37fa1dd9226668b1f"; + sha256 = "88f5a6ef96cb7aaff5903085988a43a0f5bd38c85e353076d150434986d571b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/nn-NO/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/nn-NO/firefox-131.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "74574486fbc38a9c827465613ac35f9d3c047412556ecbbfcd9195a57da0a674"; + sha256 = "0c226da7a894a8d13e6442b49ea60712afb95409fc0f8c786915594142fada35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/oc/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/oc/firefox-131.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "116b7dfecc231e1752cfda4e003567e12eb7025119bf9f6b29f05c387a85496c"; + sha256 = "54e231943cd9766431635429ba349590a9a80bfecf66eaad597d7c72cf4dcb0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/pa-IN/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pa-IN/firefox-131.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ed3f651bbb97b134de0aeab6604d3239433cac0781ff32270273ba77eefa6692"; + sha256 = "c9dc7e8f3c8dce9ca52f033928e7bbcc955e06afbb2d1322c6e4156d2b079d76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/pl/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pl/firefox-131.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "557390db4a29bcf9c21526c5f90c21072a3b43cf30cea08b58c63f2711990497"; + sha256 = "b310f3ea397ab1c84c0e4481a6a8d95f026766ab757faa412e5963a883c01fb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/pt-BR/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pt-BR/firefox-131.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "bf329696d5ec6aac9d8a59804d40467c8ac51e1c4f33c06019444f907b25f947"; + sha256 = "aa2881ab9553305e96544a534f42a476c26cbc206658ec2fe2b4927085e74481"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/pt-PT/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pt-PT/firefox-131.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4dfa6cfa0a77a38408d61135d773fa67a28a12bc4741995f226daa9bd564b20b"; + sha256 = "a8b171efe5ea76a3dacf02931f4bc4373aee947c9c326a514618fc827a0c2fcd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/rm/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/rm/firefox-131.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b2f0f466a204d027756a138c828aee60605e33a1bdaa74df9cd317f6f9065b85"; + sha256 = "8a05a553e9e0a35db3e871604c6921441d1eb859d9d05a2de8ac5e65ac3fb2d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ro/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ro/firefox-131.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "93a49561ab7c067e07287761ad4bb68426e3c0f17f63b9d1eafed8b44993cdd4"; + sha256 = "1873afb93447fc534b18370f8349e871dac5c8aa2f7380fec998a95259585d4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ru/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ru/firefox-131.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "be80ce130ac70dbd13c23cd0d3b32be691903af4ead0ff83337cf8ed3cb29070"; + sha256 = "dc4c06cc1440b014a85a889ba019e4ef1a5feb89e870f4dd7ac687114f6cd3ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/sat/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sat/firefox-131.0b9.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "53c8e996c3aac626e15ec4d88b9faa791b4ea4b7e5d37a658a951e506692fa1d"; + sha256 = "562d52bbcbb8883bf4a790960dcd91f090b3c2f8899c03d0440edbe4a30a0eff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/sc/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sc/firefox-131.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "2d37ad1cd1794101e1809900f4bbfaf2ad6a211c6fa0170a9ab8f038605971df"; + sha256 = "e75d71ba560a52a50c8032bf4d7df8da27c8cf8eb7cf4e9016e56a6377df1b5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/sco/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sco/firefox-131.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "d07af060a5d5f1e49fc73deed9ea124cf441c258353dc015087541cb8331cf58"; + sha256 = "e94f83e68516732fbbe00ad6caea44ae166c996ddd05fd2a7049c187143ea277"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/si/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/si/firefox-131.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "55339369f3bef6782f6490ca4992f0ab85a9da9d661cd8b60e4f35ebfdacb368"; + sha256 = "6883130e8537d9d4d8213103a75b9bc31b95535449ddbef258a602c11bfe144e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/sk/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sk/firefox-131.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "b42e500c2ed242cd98e46faac69c37e90241710520cb969778f2e91aaeaba7cf"; + sha256 = "6343a3fb3b7c8ab39c87c5abccc4eceb9105c9f59e6dc8944e2a2dc7b23ac073"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/skr/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/skr/firefox-131.0b9.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "910d4b98e8b1d664b2cba09f828cd2fb70af36b6e6e5901cb30c4b68eba9c264"; + sha256 = "f74f73fda01b36deed700f0b089bd3688f60b76b61aa1444a1d092d7d54599f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/sl/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sl/firefox-131.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ab5d8794d5a73d4aa77189c62475340b988ab9db03ce4861054d5db3f975c429"; + sha256 = "5c5a2ced7e9236d0cdbfb566105128307bd0012cbdd39af705e48b262e85aea2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/son/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/son/firefox-131.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "f9e980d9a52e95108357dc8df7e216e15dfd7daa4eed1aba6bc426ee6023e2e7"; + sha256 = "7e1bed00b5d0daa360a0a0b019cd9d4130006cd269c5e092ff48ef3288da21f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/sq/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sq/firefox-131.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "4641530000018143b5696321e7358777ffbead0fc18c65f27e01c6ed20db6955"; + sha256 = "d49e5c8bc7d2be60ae98b4a9f07579ddec4b153b300e35c6d1aea2d9f66ccc8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/sr/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sr/firefox-131.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "981b61c4ef02ba23da128d11b1cb3d5b2554f03b769cb8cd37bbca59309cd1af"; + sha256 = "363a6c7cffa7e5088d7253dce1e4981752a43a57c57d2183471644415776ce32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/sv-SE/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sv-SE/firefox-131.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "93c1642df4aef1419153f747dafb905124106d2a4244df150c1e17abc897cdd3"; + sha256 = "5a5e86dacac51bc734078575bbb394690ddb479830c95ace2520403249f4d386"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/szl/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/szl/firefox-131.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "f109a07ad914a1bdfc65d4ed79bef022ee25f3cab494141e00be2af65ee6cac7"; + sha256 = "cd8d6559dfef4999094775ccc7499170d5f41304215094e02a30b4c63017c7e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ta/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ta/firefox-131.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "68074b1e872e8f9e5a4b9c02d8e973f9ac51fb7e2bd431b3a56922e91e5a4c78"; + sha256 = "a83ff685e9a0b45c32ebec720382ab696f1135457369a44917ec34ebda26db8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/te/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/te/firefox-131.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "f3af7defc9598d56638c83c9b4d2bf8fee372b3d3b00d76c7a9679205a2746bf"; + sha256 = "5a2d5f05b95044bdd40f89ba7110b74902295b51a9ac59ef3e645b241bb90622"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/tg/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/tg/firefox-131.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "c07fba4163796a71b7cfe4b06c76bf83ca0fc493660210db224c1d72fc64241c"; + sha256 = "0ef5be4109ba6caafa91edc5ad32149fd76ed045258b045f30c1aa9b024428ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/th/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/th/firefox-131.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "40ad12187db69337171664595a38ef19929eb26cc923816e28671462a72a6746"; + sha256 = "5ac6d03de6aab2c5280fa880a13eec2cb228c02fe307e4bcd2e460cbe2f10ae7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/tl/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/tl/firefox-131.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "aa8e50fa88be92752bd00c2114bf0698535a2ef70764f2f6d1244ab779182ef6"; + sha256 = "6518de1b4deb40cacfca830333b6909f451e54d087fe6badfcd1c7dc6a32876e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/tr/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/tr/firefox-131.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "868c77177dce5e5e2cf54cc70ef3689f22e58435a972c2bfd32e6bd1a4b450ec"; + sha256 = "652367b86b180d5f9aa2fc2175069df9f00f270a9a526f6db3033df1e4ecf7ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/trs/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/trs/firefox-131.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "96e4606795f4212cd78865fe0592c030e864b87f3e6ca80c486e17106eedbf05"; + sha256 = "c949531be0a24259947c66581cb30c7e8ff0e046cdd5b80616ce32c24d4b394c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/uk/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/uk/firefox-131.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e4a968623cf2821c87a7663789489106b0bf811bfa49700f53fffaed90ecd028"; + sha256 = "9b705eb1ae999334bb3a652aed2a69b1112f7bde18b2463aa609f6ca82237304"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/ur/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ur/firefox-131.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "5111cb05702827c40ddd9604b852575b1949c910a5da861350bcbac2162cb520"; + sha256 = "f9543650db97d04106eac07897faea7115e1ee6180996c3c94dfae3a5d34363e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/uz/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/uz/firefox-131.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7493c9bedd4f39f79e9666661221fcb9853bcae524bc931dbb2daef51aa36ab7"; + sha256 = "aedadfeb84a3efe02eae59f806d827edb36271aa3c5ebf46e4e264ab937c6ab7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/vi/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/vi/firefox-131.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d2a47b94e9182c7636f7a6eb4814587a59cd2476698cee89cb36499c5b7388f6"; + sha256 = "87dfc6ea7811478111a426ec5bd71bf13f30f7d8161c49570124e23092fedc6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/xh/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/xh/firefox-131.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "22e8a22e72870fc928e69e1072b6a7c26adb3072dff5b4edfd6045516e0f7400"; + sha256 = "95ecc4eb6b769de9b2d30cbb04484f3845d79f6f097ed3d4a61ea5e231faa93e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/zh-CN/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/zh-CN/firefox-131.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "d761f7ec2aab3042de9e449eebc5784867e69729fa9e22262e1fd88525dbc83d"; + sha256 = "15475cf50d40b86141c1e870e24d280d79678885977ffcb417239d3948ac3d3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-x86_64/zh-TW/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/zh-TW/firefox-131.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7f59a5f17564a214b8963cfb0f28ccc35fd4e6de92965c8370dc7b0093eb91ef"; + sha256 = "d3e80bda223fbe9ee08bf1f6e094793ebb0ef1a16fe56ba58362e6c62a22e546"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ach/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ach/firefox-131.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "7b63bd298072bad2d6328f5c1a1baf8a31f30a2cba6296d9e31bf3b14949a0fd"; + sha256 = "69eb32eb9819bb9d01b77d10e5429a8770cc2970df5c460747dd7335ad0877d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/af/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/af/firefox-131.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "3673b0553707aa1b09aaad4181cc8c257ce09633faa681c9d0f7409fe036e47c"; + sha256 = "8e2d978913ab8b2e8b8bec9ae3b64906ba1cf0f71bfb79e5f942239659f6a5a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/an/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/an/firefox-131.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "d9015c7147dbf5091a418c84feacc91739f202ae1c6a48ea600a2e344fb1e95e"; + sha256 = "5d361f9a5720a958e58757e23ca8fd9852bf6187c3ae9a90b8c0457991e6847f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ar/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ar/firefox-131.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "85d049c28af55ed19a8d5e5a27b1e386edd9531222c4b77402ae362932340ca2"; + sha256 = "614b31438e1027d427fcbd2cc49fdc149c407c7c7b58f2ebb711fe152e0a6620"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ast/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ast/firefox-131.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "df0afbccc6077c70261929e8b581a5a445263f8445b7a77f7dbc79f7e5a9f1e3"; + sha256 = "f9a7ea4bcd928db80b1abf8bfaa375fc685e142ff70dfe892e414672af2312f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/az/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/az/firefox-131.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "aa8e05e2db98f8052a83debdefa76b279c69ae9208883dcef4b61a6d05ff5b63"; + sha256 = "5cc255cbe0df8bd7441f16cd6337e64f335aa06dfd0cb1a38d541a2e2e4d9499"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/be/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/be/firefox-131.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "a077810699e5ddce43f74ba7b6609aac9be911828270847472cce997d71736d7"; + sha256 = "a4724722a484dbf404897f0c9f387d1485f50032f28560826445a11d35c4059d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/bg/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/bg/firefox-131.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "7a7c35258d8f4a816fbc7be47836dda56dc02dcf799e966273c2b58695efc153"; + sha256 = "084c33231412d7e6770cc730b3f33db1588889bf64108cacb19f7dfacc6694e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/bn/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/bn/firefox-131.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "a903706bc127a34b5c649254598a027f5558bf695c634ae1ba9cbd571c7466f8"; + sha256 = "94cb150193c6f5ead5d7c06fff92ebe5c51291037f10b5e9e3d9d51cf910883c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/br/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/br/firefox-131.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8fc1d8cbaa3993060a6533a7fc0896b307f3d7194117bcfb3651aeeb92d6b7a8"; + sha256 = "78e05cf9b8a735a28ca2593a2e729883478245579f32d6e8b11b247c5dfae586"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/bs/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/bs/firefox-131.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "9ff6a558bf756b4a41aad41513c5e3af1bcfa13a39b7aa6e808ed44fb4a23dfd"; + sha256 = "06f1ef247527e3d421bac33e34fb4e46c97a866f14c7688517dee7189eb3267f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ca-valencia/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ca-valencia/firefox-131.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "84908a5501699ee273d9b28954f89f58a0090df7f9ca850aebe7a18b80cd0bf6"; + sha256 = "3ff3279d3adfa248b650f57a4f6fe094ab75d3ef0daf4b93a55f17685341e896"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ca/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ca/firefox-131.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "5c877cf935bbceb5090229c49511c8e14f979374d89eb1e37b22be98f97b4262"; + sha256 = "ce26536d2db9581f9b92c1e386cb172546df4e0f7cd40cb54116b7bc66cfcf36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/cak/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/cak/firefox-131.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "80a54ecc7157c0685741b8014382463f6f8a7996885793f2b52a0d24cd6b9970"; + sha256 = "61629cda585866b87d0047adc52b733df91f5ac46b161e955cf3c8b7962750f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/cs/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/cs/firefox-131.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "edab1c40b01536b9a8651c9454ffd3f4f4db1ec31059e03e43b1940b8030c53f"; + sha256 = "8d365f87da2d7c2b396e1bdb8fdafaa4daa2c7421cffad935e24e40636fc4036"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/cy/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/cy/firefox-131.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "21e53ee632086450645b339934c854639654e0f1bca0d00a0222c3abb06c7ea3"; + sha256 = "69d62b9ca499d51c99f796a91b58d9bc52bb73c4883ffe48982b74c1011a1d94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/da/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/da/firefox-131.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "95a7761928c2e595d1c172c6cab5a170eb3144e312ebd88938530b5bf60c3f30"; + sha256 = "6f8231de644fe6ece3e5d8765585aaa2f781a2d0502895be840503600d173c51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/de/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/de/firefox-131.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "fa9690d6bca26353edb5649bf2bb0b4c990d43402efa18e5162f9ce99d08c634"; + sha256 = "0af79c076391c3e809d88c53f017059ce673b16c91dae44fe314550f99f1621b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/dsb/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/dsb/firefox-131.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "e4aded68358ec362f7aa7c43f6d57e5ba2cb68e9699eba6a8d31f57ff6c09f8d"; + sha256 = "584be70610e13bc2236cbb6c8e3ac22ea487b8dbc0edac9c05e74bf3171558f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/el/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/el/firefox-131.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "2d18d613e78610d3523497d633f414a5a14537f6b5c534a0f0fbdb09d1eb4e0d"; + sha256 = "cbd65e86e40673e20fa15cc487cb34b17bb07a5346f25c4822b7037b3ac3fd5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/en-CA/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/en-CA/firefox-131.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d764d743a8827c919f5e262e7f3d92ec5bf6136c14674aa701a9bf4e7a3454cb"; + sha256 = "b0136e885b4562b74dfe89e92b9c2f4db85693b218031e7fc5540baef6c44e78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/en-GB/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/en-GB/firefox-131.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "2e2deccb70d5a1eb67b32005af4e824268b458f26a688c8d2d10a1b7d9f67f52"; + sha256 = "52e04c5559b439f51cfb128a9e2e3fc9167912162bc945da81f6be2355f50e64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/en-US/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/en-US/firefox-131.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "cac0620cdd0004f77edd1363550aae525c3a41cb9e7a21a6b0d9b8191eec2170"; + sha256 = "93f50d0f65931e966fce4efc049967ad413a9eaa6a3a0b73bdd160bb11cca7e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/eo/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/eo/firefox-131.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "5928360ad8779acbb9bb559f8186d50b289d82f44b85a4f2ffb4766a030b4923"; + sha256 = "63ecb54b5c8640b3cf4302fa61639d25dd8d273e758ccc0d43c832a67320e240"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/es-AR/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-AR/firefox-131.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "cf99775ef72de5424fed1bd78291ad7502f98718928819cb847f4419e5e9f098"; + sha256 = "76a371441d463f40f676b6333b5e041908ae1b53cd584268941232f57784d4fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/es-CL/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-CL/firefox-131.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "2e28388a1b4dca0aecc995a560b9a0869c7b33dfa1bbf40c8f7636e96506d9af"; + sha256 = "1272fea50d52e07512d86468f55c79222d8d10fab989326e7cb26596d60694f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/es-ES/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-ES/firefox-131.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "dd7a22a0208467ba077b7b85e42d39492509128152e295222b0fe06184e89c6e"; + sha256 = "7080509303a493851c8519533f95394c97f4e48cb9edf4c71ba8015fcfab2db2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/es-MX/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-MX/firefox-131.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "fcf7eaff8e24e8d01e260a84a930a44fc9f0ab481108ac8ac80ad8d0c2fca5e5"; + sha256 = "5a8d79d8e90caff7607852d2516fe46984f3301e863ea676f6df0426458a39d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/et/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/et/firefox-131.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "89066eb2df624d70f561ad4524e921a16389ed3f4d6b5491961c21a106ddb6c3"; + sha256 = "51bf97a75d98e0229712b5089514ef98ef9418cb2f81b0aa417b35b93a91b238"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/eu/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/eu/firefox-131.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "682373ca3c68c6bde0772e28d9d49748716644024880b375e65f4cc948c84c32"; + sha256 = "ae4cb5677424112ca885b9e685bbff7973ab5abd2346978f1df4d04a5ec9da67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/fa/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fa/firefox-131.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "8218935ed76216b6e199d3c9146c55ee27d92eeef18289a90fa924cb88de2ad5"; + sha256 = "6b2285a462be10594c197bf77443f3adf74282d9476c7b61d105f1e56faf274e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ff/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ff/firefox-131.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "adb5b4f8c258993c97f917cb46fd0a9b1baedb0ed0bd7e20370035afe271d4a0"; + sha256 = "63d7966b3f3888f94c2572a782f542a0c8d0459070a980cc10ce6596e19de55d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/fi/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fi/firefox-131.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4afc7f4be4f9c28985abc5e363ba621028b846355cccb1f71619f1cb6e4a6769"; + sha256 = "9fda1052b11868a54132c45791e608da9198a394ead4cdccc4c33641fbd99639"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/fr/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fr/firefox-131.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "583f6bbbe87c842b0684b0a856f81b658fa23a2e2d50b56932bc23e4ef080792"; + sha256 = "e05ac7d8b58060da27f51a54e9a42602b9c703a4ecea3f5516ba3bef5729f78a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/fur/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fur/firefox-131.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "e916f7f3b82c25410d016192ff6118e05ab8bf894d314c012b2c4f78887fe55e"; + sha256 = "84f48f7f053bc954c6e3a0f49d6037d87eaebad140442e24ec004cf570f4e04d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/fy-NL/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fy-NL/firefox-131.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "f259783b26f91a9e464fe4de6c95d885dd39a737d23d493c7b9ea8195092a39a"; + sha256 = "bee16b840dd96e1717d847dc9f0a21f39bbd1a0e3dd7d1e44c6abe570c2d3e11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ga-IE/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ga-IE/firefox-131.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "62150f6e9e142e52b77621f2331e529b0e13798ad2ce86f8fa8cde26bac99ed3"; + sha256 = "3cc432fc0616bc6a25efcd7b8fb7ca531a46bfa6daecfd1f9e6fd8c8e6de1567"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/gd/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gd/firefox-131.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5d78e89798d86c476116a7a04a8efbdf867da5228d01cf56fd189e0e00ceada8"; + sha256 = "b2e82175ac46f60330091ae4988431ca99589b5e29ce2164831374201231002e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/gl/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gl/firefox-131.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "53d72e637d6e2fb999bc2d5b0865a07c5e1f1ae64974fb24f90cf3bc13bec115"; + sha256 = "652ecc427d7db1959cbd13b8a6b3eac5bf460d75615318b3e33899c09e2c318c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/gn/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gn/firefox-131.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "560d60eb1ca98ed7c6dbd97d7c3a0b97cd0675391ede775f64d62a2e98bf6771"; + sha256 = "af1b79fd7cf0ed1f2694065c5ee1f8fb87d34a472524ddee78757d30c2bf6583"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/gu-IN/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gu-IN/firefox-131.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "0c0854450654e6a06df93361c80e7ef8671fb06704a7562aade57ed65e707862"; + sha256 = "a88d70e37ad783bfec45f5f3546df2c2ebbe42020bde496dba49aa2621079e44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/he/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/he/firefox-131.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3aa4c8ccd42ad0f5cc4ff0adf2d8682674e0f0febffdc61a9a8ca513d6656c4c"; + sha256 = "f3b4435ae00f6be336dc0c7278250f4b8c53a19ece0b32148314aa3ac3350efc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/hi-IN/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hi-IN/firefox-131.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "f28c6e5ae2f1c8082a10cbe1732bcef7df48ef734176f5682fde8df2a87c2778"; + sha256 = "41c595a8811d5f27775d99acd340a9aa8aa0678e8e4da525e0df68bb084d73fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/hr/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hr/firefox-131.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "c96d908c95bc025c6e30cf58d13ea7b8a9c54c925e6f985cb4ba3d77f9c36aa5"; + sha256 = "71dc76bb7b7f363b30821ef1ceee50df8063e50c55e922233843a3830bf00753"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/hsb/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hsb/firefox-131.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "219a1935b48f08370c423e8a40314e830de8eefc82465f06e6764d18cd29687b"; + sha256 = "eb19898c2578257846f822837848aa5a58cadb2e384e3bc1279f283872bba988"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/hu/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hu/firefox-131.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "29591118fc299fc128a401323c0a8207b44fc7e5702bcc2262af1a2c608a4366"; + sha256 = "c99dfa4470841565a60263940e697ea6068627ff6a382895a5b6644cc05d5485"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/hy-AM/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hy-AM/firefox-131.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "daba83c4d70501fc9925a67819403dcfb231250b401798615b0142e4ba0320aa"; + sha256 = "717a9d71f0c4e9f458c7743ebc2653ed804c21808bbe33e24df46734d76c2929"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ia/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ia/firefox-131.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "76f9e2ec34063b6d5899fb858f1c479379f84e6d15ef60521bc0ede7cdf97cc6"; + sha256 = "66bdcbd7b27e71d26274614863586364cab5362a1a4e408da922f72fb5859fd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/id/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/id/firefox-131.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "373537607de55bcd9decf9882400783773c203034ef85edbd13c760554a5d6c7"; + sha256 = "916eb11604936e14fe256adfea3904d385282d470cfe7b822d6d24826b4f5923"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/is/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/is/firefox-131.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f85cdc24c47dadf88a1801fa3d6e33e898f6ec67022980d46c406a5a79f06c97"; + sha256 = "c7922e665f9b382ccef7f3a9e50303ccc6cff61976f70a2dd8f176dc6efcc208"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/it/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/it/firefox-131.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "970e147f4d8fc6afc57067e5b9891ea14ce866e057c8b322e8738d4b76014af3"; + sha256 = "f4f7542197a31773045c365c3cebb432b272c1b0ebac49bbbf2ff2c39bfcd91c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ja/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ja/firefox-131.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "981efc6798a45163bd724238daaf27a27632505e320c99d1a045ca73f4bc9671"; + sha256 = "5ba99b8a6904ff53cc4488824ae3f32c708752cb35df030e6973fed9ac9bc6be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ka/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ka/firefox-131.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "94f814728f2c0617760dc6bc148c04817a3160ef0d5a29d3052c30bdf4701440"; + sha256 = "f02989fce1be1761be71aa960b3f70327d747bc8d71e8ceb10da06f2599f8a2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/kab/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/kab/firefox-131.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2e381178febaad9595e48ebadea1870c6e52a3b9e8b64be8c731371051967102"; + sha256 = "02b6b5c873c2f2a68071beb86df22e25b7b2aed1e2d1f4db955db534e6867c56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/kk/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/kk/firefox-131.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "9ead5889818c0fa8dc38aaddd7286fec3639939fb017d1546ee8f1256f6cbbf4"; + sha256 = "57305885fc575780f61b244747ad99d694204051ee0a6812c5d46d43afc1f4e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/km/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/km/firefox-131.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f5aee2fe01500a2ad9b7367ec4f77567528a38ec080efa243fc24756a7971f7b"; + sha256 = "ca423f1155bd45bb60d84bdb257b1c223e847735725a780d64c16d05b599dbc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/kn/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/kn/firefox-131.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "68a851da99f7c888eb7633631c94f70fc62ae5a28552646eb0f4424c86671052"; + sha256 = "d3834fbbb1f9441a377bd78bbb6a1433fca18ef67215bf4bba17642354aa465e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ko/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ko/firefox-131.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "4b77874a6184da622b0bdabb81a29b2e4b266cef3e0e14e8e03ea2bc17dbff44"; + sha256 = "f57b61412b00d9942691405691b0c4ab71eefabcd8a2440a4a1207aee913da78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/lij/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/lij/firefox-131.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6296b2014b08708d5713427a9bef5a508fd4823e02ab98ba87c113e2e6f96ca4"; + sha256 = "3786385aa819c46d4d2403c313e172ff5548f5ef41a8f8cab9cec0de2661e3a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/lt/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/lt/firefox-131.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f319ded0e1e65987e7dde7ad56f3c4ee0e02ea2b0b64ba23c6587e5ae0478210"; + sha256 = "8c9d2b0f829947046d5707437e53e98b56c36811bb4afd081a214de543c90e1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/lv/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/lv/firefox-131.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "0a758b50f893bd4cd3e02c5901325d17d5d22c859a2f8f5d9e90f29e4a2e5f16"; + sha256 = "25fa85bf802cba0358f01e9098306611baa047bbd796b9c1486179c4e181d4d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/mk/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/mk/firefox-131.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "f7d0efd7343d53d5de3d80332fcc42cc1a390d1944b5a408060ff4afe591c531"; + sha256 = "1b5bc7720849a702206d07439adede9f06a3dc36df1aaedec87b11bd464cc950"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/mr/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/mr/firefox-131.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "85d2314875c6383254adf665e32184448f51f432f06053b830f82432798b18c1"; + sha256 = "8d75634cfab7c5398c5dbb1d198d80f3a530ca6be9492fe161b103d67fa3120f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ms/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ms/firefox-131.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b84cbdd1e0147cd9c24961ef73859d5f4e2f9f06b06415bac4508a94bec9a4b1"; + sha256 = "b255028a855792af9c669b2a12e80dc6b6962a2fb64c29bc9b46e39b1a7ef83f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/my/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/my/firefox-131.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "34dd8c6669bc030aa6859567906fc7cdf759513501157d6adccc2ae3b9074724"; + sha256 = "ef1dc83a189e514c3cc446724bdb2325ccc806c7389acc85f751bb7356ccb9c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/nb-NO/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/nb-NO/firefox-131.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "21ff31649a8ef0ab8e2b541ee4e198bedfddf43d66266675c09b50879a83bb32"; + sha256 = "7ff5c535300d391d5db869189876b2ba6c7fd8692d8acb32b23dbed587e5d404"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ne-NP/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ne-NP/firefox-131.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "80d546f09fce76d7bb85fb82951b805b367518ef7b4fd4126c915aa37e515aa2"; + sha256 = "645e5f730f0678cce48e727b7d425b16197e45f259fa73ab2bdfb8d29ea0acf4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/nl/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/nl/firefox-131.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ce52c8f3f6691316cde7528b2ce66ea04244a3d5aaef770163508791a808d641"; + sha256 = "38fb818029706b30dfdb3a133190a13b7c30ee62472a17cc2591ddf3403ae945"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/nn-NO/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/nn-NO/firefox-131.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "636a0bc818b923ba9ccef6d1b8ac3cd34fef380c9ffb62b5bc1c5bfc8d4a1efa"; + sha256 = "bcb08b084bc0c785ccbdbe7106896b81f77e1ebfd1652752780abd9b83390a70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/oc/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/oc/firefox-131.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "2a4ff16c067d867148b2952874e48f107c4c340df4a793950821b3db9bdded32"; + sha256 = "79e27d2a621ce64315cce6c38599e6d12c3b18de06c594dd33090947daaa6c43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/pa-IN/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pa-IN/firefox-131.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "110f8a9d6702e301a3cc0eeec8b40788cd0799829f521fcb60b437dad29c60b6"; + sha256 = "bde16ef9afdcc989827e0e014d69abec3200ae07d138df5c69a6e7c9787722b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/pl/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pl/firefox-131.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "3bcd98641bdbf14ca2ab580457e19ad3c9400b5464ddb79507040f1a37245ed0"; + sha256 = "9e8665b37b0256e5ac0b62a88967ee337a5ff5d4625f7ae43cb13da7e51ad162"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/pt-BR/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pt-BR/firefox-131.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "2f60b71d956bc63232408d1db6c1b58462c3d1a6a64d86a93f39fc780b306222"; + sha256 = "66fa6a0361d64b6d2bec784671c77e42e0fb70db3a724fb57d5e4349ef1a4f06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/pt-PT/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pt-PT/firefox-131.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c87088e69f7376d2ebe5637c0896558c3a4dec95771760679b30327de873e08e"; + sha256 = "5c3b2f9f8589fee3214b3458c716214675b22608a76974ee154a0a3794ad4fb0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/rm/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/rm/firefox-131.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "9aee04564277f022bc3426bdfe45b085b6eb853c6c2e5ee5c5e2cb883bc344cc"; + sha256 = "0338c62aa70a83c6782065db6196850e7d1a8e7c13475aa2971c2ca0995fcaf5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ro/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ro/firefox-131.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "178029778402b7b19be7e9bd1897e5c275a787f435afb1f9e0a570d532d570da"; + sha256 = "545a96ae03334282d9e915ad3970cb655346600c3cc87f5a610ea56ba56fe859"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ru/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ru/firefox-131.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "8529555dcfd9af32e5de36f2326800efc7963621b194a282be475ffad76d7f2f"; + sha256 = "774a98da6ecfc67e350499bbdca10e694734e77049d6813f3a11102ef2786b88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/sat/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sat/firefox-131.0b9.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "52337358efe5cff5deff16edec412691cb3b62ddea6d6f35661c5542db5525a4"; + sha256 = "3fc563859c2bb701e955646b03d5f8a3ce2d0a492e247416c7ea826f608b2831"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/sc/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sc/firefox-131.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "5c68864c8ac5ff3b5301d94831c05e3036b6b92303f7b8401c79c253277335ed"; + sha256 = "256844a0a7e79bc42978c599caf07def4e7b56bdf0b6d62dad6304d27089fbb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/sco/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sco/firefox-131.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "9f6b54d307c50959d249659454c1ddc062454ae5d5aa856fb5b98dc8669c8b00"; + sha256 = "55d6b8153cb07c56bac006a0180ff5ae52e3da539c907fa6fe15dd6f950a284f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/si/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/si/firefox-131.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "ec288ce839924f6b83521d27dad7ac867302200e37f21227877b48e0b1a287d1"; + sha256 = "5aadfe21cdb8a6f8d590e98905b9a17ac5730825efcca007ccab8912cf25108a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/sk/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sk/firefox-131.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "055ca55ee7af8534611ff7c8799f227e20a9de49e542fbd6db39c788cae39baf"; + sha256 = "a73b49d89cb5118f4e20ea7b14d90b5edc20371cc15356197a10c1f3b41745a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/skr/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/skr/firefox-131.0b9.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "53be09ab8894f686cb4ed7b67757dd3dbcb0e77f5bd88261ddc066b812f01058"; + sha256 = "0d0c1ed8d9386207385a76466aca1d177d4a516149b844ce84a8b132dc862529"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/sl/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sl/firefox-131.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "3bcd6e97fd77b83af25fc62506a7b87af109fc05f89a11d1938fc2310b52bc4d"; + sha256 = "b4ba523ae509389b0889fe4e68ebd4d1ac5b2f08ebc625e16f9dd6a836ea72e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/son/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/son/firefox-131.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "4a64ddcbde27c29d077e14e381688070489779671db187a77b5bbb27234b9aca"; + sha256 = "795d063b0f00c2d5926642347faaa9ad422f75f1f4b241b617b8c52426b0b128"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/sq/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sq/firefox-131.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "07b74dd98812adbcd33e9478916de493d60653d6e956f97036cd84a8e501bfb8"; + sha256 = "126cea5bf67d1acdd1067c2b58e358a9390857cbf9ca16248efe936809bdf36f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/sr/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sr/firefox-131.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "07c41f3ba21714f829803ccc358031236299d13a3ca8f3676594eaf8a60a8ad8"; + sha256 = "36d6b5b278c15f4e127a70554a2705c7058915379bf1ff3fe9badd14132425b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/sv-SE/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sv-SE/firefox-131.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "e615cde1fd77e8e051a95a9005ea1b3138ed702126e55b17b1aaf2ca25d22114"; + sha256 = "3fd7c4a21d6ab6784bbe9b0c01ef736347bb72e7f9565a97bc5ee7ee1eed461f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/szl/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/szl/firefox-131.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "c8566fef15e8df33d5a6c3fd82b6f3d320651b9127c4438194c5d101c53c1bbf"; + sha256 = "9edc91448587a79b753df4a9e7feaed68311a49fad49c5789c3041a8f4d4b972"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ta/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ta/firefox-131.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "f53506de3808de393a2b045544e4e6c8c031051ec856046f7fdd1fad7cd99a39"; + sha256 = "4b39cd843483758060b930362a30de1b7adde0a302c77391d41486df87c69fdf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/te/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/te/firefox-131.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "13fd47917d24b8627498c86ba61da650a54c5fd39367403389a539d391920df1"; + sha256 = "80f4fa70c6346e9f652d8b3c3aa95cb3a20944ee221a06c82ea071368bcc3f52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/tg/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/tg/firefox-131.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "ff13e7b1ed62c3445a90c152970cdc394ec1d86f8cc8aaa50403ecb1f7821107"; + sha256 = "c7de592f571c993eef41bab4b119a268ef0dc65b869b5fb66cfe822aef2c8a06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/th/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/th/firefox-131.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "f28df2e27b0ea86352a8386f0a2d453f14bc59e67d964c9beb3ec66f0b0c4f02"; + sha256 = "6c1d86bc94fa30f43886b1738ec3461d89b7a86b9d092cc5196a2deb4e7376e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/tl/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/tl/firefox-131.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "4d3151c06b1e5db4ecc1a28927fd9e50bde6d21353aea9f63726e6fa58334999"; + sha256 = "d878d17dc8a81b374cafe3859bfcef1d2a9fe7db63a274119c4193020948de8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/tr/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/tr/firefox-131.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "fb3906732149fd6b6f71d45f8340efd74c3da4799acef2836d4b3cb650447d99"; + sha256 = "6648c0cca250c0cda65d2aab1a3f6499c8c6f3b1e4b02f718b241dcc301ddad7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/trs/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/trs/firefox-131.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "d2ab069435e335619927b0a29661a80f122be37393ff3c1728bb1f277f02e427"; + sha256 = "b6f00626c19e71f33f1f36cf08725925092e96fead027299d3490951e034e352"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/uk/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/uk/firefox-131.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "eb19793380a176998198429b824737eceec37a69dc468d7413a7912fb0100b7c"; + sha256 = "646fc4c5329f9105141227ef69012a1e6cae85013e036cfece228a54b6877b18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/ur/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ur/firefox-131.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "c59ae1e4267bafdb506c7dbb01ccb93523e9989f4676e6bf0925e175000086cf"; + sha256 = "bea7087f797cfcdb18329f0c86aafce64fdd73fba2229ec22685af49b595f4ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/uz/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/uz/firefox-131.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a946abf1f36ae15f9b319095f718cbbb6d56dbde200a90bf85dd3d4db9078001"; + sha256 = "7fecca7f57d7491e106f9e278f01b21d970a7ef69dcc8a24d32d18813b52751c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/vi/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/vi/firefox-131.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c58b94c8b45e85be52938ffe1a1b4c00db66b7160dd062b64ba2ff3e392bb797"; + sha256 = "9fa33db48f39195c7b7f285ae8586f8683d919e4f2e716e6a5f6b54850a93f7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/xh/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/xh/firefox-131.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "c99842bc5a03f77c5836c49bb081b5266a652225c5ee7a7444db30e50b52ac88"; + sha256 = "3fac756c551fb0dda8227f0ecaf9822c18782ba809abd3b0234c59e192756da4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/zh-CN/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/zh-CN/firefox-131.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "1585b4e404b2aedb7a03fde2dbe5dad54501951b85841e525658e4dd51a6ffec"; + sha256 = "df4cd8674914d5d79908a8d1cd2456b5bfe5b334118bc366e360c0216c93a79f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/130.0b2/linux-i686/zh-TW/firefox-130.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/zh-TW/firefox-131.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "adc817b6659c40083bd091a9ef7524b3ac193c0b66ddecfedfb9cd1043e47a55"; + sha256 = "d5cad971712572a8e1377c3cecfb8365f5ecc4f313e5101b89191b2e55f8c69f"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix index 6a965af33bf92..6e28001ac23a4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,1035 +1,1035 @@ { - version = "130.0b1"; + version = "131.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ach/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ach/firefox-131.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "4ccecb8552ba8f6492394bde1603a93c0025fda13e85aa6a5a8af84262a50903"; + sha256 = "5d23fc3bbc20283397d0cbda4a92e15e872e6b2775a40c7449fa2e181c53d622"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/af/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/af/firefox-131.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7168680b5a9bc94992a26d4de470b785e0f1e16fce266a211f300f052ded6642"; + sha256 = "dae4aa08599af741296083bb6684e0afb7b07dbcaa57b13461c2fa7fe293b1fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/an/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/an/firefox-131.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "54adb6e4a31db13f3428afc56f6c382152b5048f3620b88c30213c24c7e59e8b"; + sha256 = "8cc59a067ffdd783c959765d1b766e0fa7a3944a3df9a0512a7f75164800151e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ar/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ar/firefox-131.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "4e760b4fe58e0205ccede8e3ce110fa4e44f04e91bb913ddc0e05a254ce9fcf8"; + sha256 = "46a7ebface84fa533e02efba45ba3f79903c6dcf245c8bc83e94b4d764559cfc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ast/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ast/firefox-131.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "91af2f2bec5b2ffd4707a37c34e86183ae366218df0ff855850e8c12840cea89"; + sha256 = "01c8d108820f3dc05c6a20bbd4b4393ea790e902d7e862b313de5ee5f753a8e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/az/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/az/firefox-131.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "f65494bc2609a56886234bd8fa2d803de84ca09246021b9720f835fff0823f7f"; + sha256 = "62d852e798a9afadbd1071988121264e6f2edd535da26b6dced2f25046f62821"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/be/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/be/firefox-131.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "96e249151bee4b445b75e852f7a2d54bba5f5ec6d5f3737203654f7cc76baf5a"; + sha256 = "6731243528fdb724cfc4b7c0788c36382566a0433680e90ba2fa2c3c72bca0ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/bg/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/bg/firefox-131.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "19448bc0567677d0b4fc0035ad8fb7f50c82d5a746a89700f8bdca55d76705ff"; + sha256 = "21a5b548853da294e6611306f8d1cf37aa423a1942a8916ed27c718f73f65389"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/bn/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/bn/firefox-131.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "388551adb53061661b243617409de1c2efc3afa149ffc1c25f4cc71c371baf75"; + sha256 = "e0bbff5dee6e723709f1a6b00a6eb3a65087f86a55d2ad332dc04a97c9d1ef5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/br/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/br/firefox-131.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f4e8bbb90e4af55b92d962ec9a0bb7b38a1a78bc61588f30185edcef723648c0"; + sha256 = "46123ea811833fcbdfa8c829d35807bda86aa87135ee62786bdf56619de390f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/bs/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/bs/firefox-131.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "f35c9f7dfa2833447803fa7f1632190c96d0b5ac2beafdd5d96335880c6738e0"; + sha256 = "c9dcd5a31aec57425584613da9e1d681b42a9d2304582d215914694ec515edcd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ca-valencia/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ca-valencia/firefox-131.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "29bd0df654df97129f52ef6e3501ae300cf8379a9b99d32c21e836fae98cee59"; + sha256 = "bfbd17e8ee5bb1f0357c22b4f2b8ef6441199d1cdeabbf1d5609b66b5ce3e52c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ca/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ca/firefox-131.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1e423be7d2a861bd5b09d268b02aefc1b420e0b37258aec00b0dd9aabedb84ce"; + sha256 = "63fd254507c9020d439105afe577b2d1b98686f3a2bd30d1bf822cd48b81a991"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/cak/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/cak/firefox-131.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9596f36581a2da0fb705e769c4a42a4eae0c099dc3e2a6896767cebc285760e2"; + sha256 = "fd5605b3c0509ed82750c392bc4d63d58549a6a098519e464fd75e770e5a8043"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/cs/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/cs/firefox-131.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "dcaaa82f0a18ae5a4852b4779c4d42fcade7b154feed7d87714352e82bad2cb1"; + sha256 = "4d654ce1bddcfbf9753f718f8babec3764a9f004d1e3313c1d313777f16b2e6d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/cy/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/cy/firefox-131.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f0024d008dbd5d55ef655168d7ffe7d6740b2978ba8594ccf1c10db68252d216"; + sha256 = "35290ca239b98a9d3a8a7e3c8663713510d6f408a6f3f3fa0176b803be562cac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/da/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/da/firefox-131.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "24ab76f9126ca760c25eb24c5419ac8fc5402009edc1d6eee3f962226f913c63"; + sha256 = "df722d1f24f74a68197d11a05ed0fde3171fd58c62f8866748190ca8723bffba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/de/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/de/firefox-131.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "107ed50755bcd25ba3a0c3f314eeb3747cdefd621fdcd59a0d89f80b941dabdc"; + sha256 = "bdcb5f662d993041ac07e3f8df43f12182625b530e16a8ffb8a93afc1438b550"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/dsb/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/dsb/firefox-131.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2ed2b4668f1aa3dd0b5db7b38fd5cf8dfe40a742bb58e537c9237788be7f991e"; + sha256 = "13dfae0e4209179d65ca6a5f34362a3d24a0845f8360c99efd832e29d0903493"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/el/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/el/firefox-131.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "62cc57fafcf2e23c9ffaba181effb30933dfcf5db8154e337521ca96fd743948"; + sha256 = "91efa139db7bcb46958fe804d2c4b6e043310a0425c14b5d75b39f75b9a558a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/en-CA/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/en-CA/firefox-131.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "58a996a29bcba0b5801cbcf8d6c9dde011dc798e8d900cfca33b2a6b45158b57"; + sha256 = "5b43cf25b3f333267071048c09f5fcd23a8847193a21ed8e1cf6c18c03b8e8e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/en-GB/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/en-GB/firefox-131.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a1960329948f238fc01b9a7559349bf4544b416123885358bef4ecae52f68979"; + sha256 = "17f4a3ecf88b33c38e0e2e71244c4e3e31006b8d4bab5344608ff7b9be7bc11f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/en-US/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/en-US/firefox-131.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9a777b891e18e90cb845870fd9f73a979b616e3f1e75a61509fabaee900fcd8e"; + sha256 = "215b879b59ad0ea3dc40f13a97d3cf15abb98893f6b4c6e130c5f2a5cf91d2e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/eo/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/eo/firefox-131.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "26e2ec0ecfb75095e12b1b31aef725fd795466bcecbb8b215852c10593cbde4e"; + sha256 = "3684b84ffb7285d9d8cd50466b138533ba7ca24d64fade2f1ac6dd9b67fd6176"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/es-AR/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-AR/firefox-131.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "6ed99bfaa4655344ff910928c114aa172084adf09546b285be060c7cd767f067"; + sha256 = "c1af34c2593df1aab4fa0aef07f05e28592fa45077f0dd6bd07193e04f40e448"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/es-CL/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-CL/firefox-131.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "2e67cfcca1f498ae424efda32dffeb23c9dc95f4d1f15cdecbfe5f33f3342ad7"; + sha256 = "36d1b0301608898a9a44175f5c96476f75a56e238e1ba21efbaf17ba76d1dc93"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/es-ES/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-ES/firefox-131.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e881ad57fce8e5da0897ebadc418b6b398b09e6cd3d75f07a52b539a96baebcd"; + sha256 = "831cba83275db5a854bf466597a65959042b4508a8e7a3f2e15766b02a4076b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/es-MX/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-MX/firefox-131.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "f84a9f7f3fb98f8ad01517a9fb4213b7e8ceec01c936398cd92a011bd7be66fd"; + sha256 = "9a237406b8b3d5ba31a2ed0cf37eee73a94f6dbb8eac5388f1be125ba7991d36"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/et/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/et/firefox-131.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "eec820196c92a6bed0303c81c42d4ae48905ff65a463f322450a8d916b96ec2a"; + sha256 = "ede90675c7b60b1119393f0bb44f43a66bcede102179a66ebcc3b2ee3fb003f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/eu/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/eu/firefox-131.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4e3ff26ce4699f19ca691acc12ac28f8fef54cf30b327393cba1b774b3a5d104"; + sha256 = "c5137ee601179644776e011a8556997336fa0e30269999bcd4a669c775343009"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/fa/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fa/firefox-131.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "ae6accea8915c30c2f4c139aff6e4190aeeebd47018004954947cb21428a8ddf"; + sha256 = "10b9248d3cf3fa2047ef33c77d66af15be77db5b8d8a9ac3915d6873bd0a1096"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ff/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ff/firefox-131.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "1a6b85ab3cffbae14d3189f997a08548e414275f26474bbd41b6239b9b13260d"; + sha256 = "e3f8473b8a630d634b1bfc7394d2c19419154e9d9aae4d98aee415b5c4c677f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/fi/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fi/firefox-131.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "15f04e7e9a45cc84c6c7b4a168e93b6acc73be6257ef78aaf10c7a6f1a3057a4"; + sha256 = "e37afad7d7adac7b752e9a2cb5747b37151bc8b750166950b97e583c5788276c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/fr/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fr/firefox-131.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "7832e96f5582824a4e21ee9a7a0f06b1339e75f42861455637324fdd89c155a8"; + sha256 = "44cc3c181c8d43614e23c2c604869187ae5d4c42e2417d0279701159953b7e43"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/fur/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fur/firefox-131.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "2a08279d92f74020c8297c64d84006645b1620d69291f5ab483453c3d1702b32"; + sha256 = "a77eea411bbde78c913e154f9203411759ccdb9d4f5817b2f0b1c5363b6c110b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/fy-NL/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fy-NL/firefox-131.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "57812e76e8774f197c12369d6867d1015800421b2f18d2f14c661b88b9d10641"; + sha256 = "57c5020319ca48d7ce3d4d4d641ff4c331de7e945790ecf66b9ca8bc74083d33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ga-IE/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ga-IE/firefox-131.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "84af075709c9e75428def68f26b02db64e64c3c8735120d550c1bf969b30b671"; + sha256 = "7d52078700bba3faf5b61c9f8abcef8d0a43c3dfc634f2f586a6f18694118565"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/gd/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gd/firefox-131.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3ddc09cea21e6608a9da10cbdac090c711388f3c5979a845358d5b9855d74dcc"; + sha256 = "90df77b9b18eef8d8edd9297b14262d08e04aea580c28755a9197c08766fb79a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/gl/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gl/firefox-131.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5bd573cf00841e778c1e665199e9358e638c20dcea2b4e13893b1bc0a78cf710"; + sha256 = "02f4408e5b740f22fd46cff693cb10027fabf3dbeca45323bdea971394a98f73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/gn/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gn/firefox-131.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "badec2b01ff415d27dfbecb933fd3bf836a9c3e5bf1db86c033aadea013e7cbb"; + sha256 = "5f3ce545a399088846c4be2944137caf651839485c5010c75e1a2e15e6d59ad8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/gu-IN/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gu-IN/firefox-131.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "e680a1b197fac31fd1938584581bc35f37386e907d8fca7423ac20ca2e09b4bb"; + sha256 = "0c33796cf29d3d3e3dc98816d1423456ebd4ae2a278ca8fc93651345538557db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/he/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/he/firefox-131.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "9ab24a255f2726157296a5ecd7f24ce8f874ca4c6a257aeac5aaa247e39731bd"; + sha256 = "c341666c31e7398e878bdba16acced6430abd872797b39eddb6d26e536bdf845"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/hi-IN/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hi-IN/firefox-131.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "ea4b8d7d7fb48868a04aeb7dd10dc2029044a24ddaadb7c8e65d6c3ef7a61f16"; + sha256 = "be681b246e18d59046560c2852094794ea5261d6c05d0c8fcca6b0f2f807abcf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/hr/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hr/firefox-131.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "d18461dfb5dda517dad4878a38dca598b92937daf000930b2588ed69a2424614"; + sha256 = "8b6c52bbfe03b134d57f6c70c1015803e02be668a146d9d46772fc9af9692ca5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/hsb/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hsb/firefox-131.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2bb2edbc14fd8b14adb0ed0f6374a119b20a61604e23166ffc4c6ed1b2522a58"; + sha256 = "efe5afcbc5c08948e45b741f7fecb39ebf849038212cdb0b15138b1df633d973"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/hu/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hu/firefox-131.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ceafc5a52c41ffbb90cd6ad42f4dc21d282d3e39ec4f1f179c7fa11c600cf544"; + sha256 = "53511396b0b54237623e058755df8402ca2f9763dff3d0e72f2081f600c089a8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/hy-AM/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hy-AM/firefox-131.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a082f8a010d2425d775d19dceea1000beb40db3dc2d4bdc1de1b65d8e362fd21"; + sha256 = "ad74cb9d1aed355cce15604ffb0ddbf6b3a7beb08730a6b4b02d8d35308ba32f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ia/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ia/firefox-131.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "c42dc586d55eb59bda0d753b2ff11ad08d0465aed3dadc90acc59643c7953d61"; + sha256 = "6eff25d61aef2e236097ba73b2f061376d48247ac58a6afd1cc274a032a4b4f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/id/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/id/firefox-131.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0c2312d9e182e7e5e3efea4788b1872ef04b62a86a29e376e685f64bd9549c83"; + sha256 = "1f5f7b6daf3d56107e2c2a21a4ee550e21adda704bc6bcf97a42ed6b100795e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/is/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/is/firefox-131.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "2ea4c1473f7e61d47607e809842a841c096c87743bf42b4d3972ba7923e27bee"; + sha256 = "39a639d414920e56ea15d1a4ef4d07669c1564d4592fc4f18b7ec32a6244e757"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/it/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/it/firefox-131.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "19cd18eaeb9f25b756d1a6509888bf9a5c637850fb0376ff0e35b722022ef074"; + sha256 = "1b2b683ee7891e9f80435a2907ed7e56fc2181924ce3ceea2bd117a0623a29a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ja/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ja/firefox-131.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "dd8334dc1ffa8a00ba0e63616e290aeb088818bdc9a9ba1e1cff9eb57bb4571a"; + sha256 = "bf4613f48cbc4babe62da9db153fab829a56d45e487e5a84aa8b893e43a2a320"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ka/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ka/firefox-131.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "995c5886d46947c7a30bbaa150ad87f8cd3b21846596a6cc9291570a17cc907c"; + sha256 = "a0b4ae597421b37dd05ac425df62b66b1c332d6570c7164fcc491bf783487348"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/kab/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/kab/firefox-131.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f478e8dbcb048c85f11678cc0cf42a58a338ce38e4930d0bb6751034a9399f88"; + sha256 = "ec40e0ad8dce0ca44e586d9729121494c3d0335cf7d2a49e780b0863ac8e940c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/kk/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/kk/firefox-131.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "5ac870ffbaff47a49af378defcfac1eec1c2d655151fea9d665495d15c2db5d1"; + sha256 = "15be145c49e78a637a56b947ff40238b0a8dacf7c0fa740d0376399fd8a9e4d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/km/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/km/firefox-131.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "dd592b6121fae6615d5210ea3dbd5319bbcf71edbe38686d680d1e18e7a67c0f"; + sha256 = "f07dcc06f9924664f761fa7964a16faa5cb49f610a2300ce78e592ddd1ed241c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/kn/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/kn/firefox-131.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "472fee23be9f3e6654abc99a68332ef43e7997352952cc72a1aaa93a7adb9e50"; + sha256 = "3ba0c688d9994d1787b08781277b62b5a7f20c7211820532f8308b5914b32398"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ko/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ko/firefox-131.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "aa5103ae14e929275fadeae461711728ed6b27f99be1d26cb8eb0cc70b220466"; + sha256 = "f827cefa00ab62f98a7eb4ea0465a1512afde10c46a44a090adc8e81af15b893"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/lij/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/lij/firefox-131.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "dfcde91b0fff54bac2ba222fd7a1418ee9f5d0663503bb3189f8dd13dca5ee0b"; + sha256 = "f36747a714c88e5493739a7d466c2cfe09bd4d19b091433b944308271d97dd40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/lt/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/lt/firefox-131.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "53a03331e66f3a42183f6457d97e1ac9a34dbe557d1e6c75f5a6c40fb4313e43"; + sha256 = "f1e295669af7a2ba813312702c537d3c29f87fb0c08a0505fd0bc3cd16df5892"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/lv/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/lv/firefox-131.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "dbb0e108095ece117cce9d6dc6428a6060551c16aab625366b7a34425752ec97"; + sha256 = "b0b0842d8df5652feb8f05abe9da0f6ee2e0c97284bff212c1f0f21eb22a308c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/mk/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/mk/firefox-131.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3061ae0bdf84dfbc4ce4137bdb70179c7d96e394a46fddce698d3c5626241224"; + sha256 = "1cbc64f7677b16f1b97c4075656c16444ebbc5ee51127b53c9537a672ba3f9f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/mr/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/mr/firefox-131.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "d3497c833a5ad1624175a2d5101d76b981f7934e565301f13897ef1a57b27a45"; + sha256 = "75f76a10b49db491fd6602d6b8079e5781529d0b53a3cddbcd8a31c390825592"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ms/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ms/firefox-131.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c7d8a92aa4044b3011b8163e011d2360c688e3090ddcde682e081facf5415d7f"; + sha256 = "2eca2edc3867dc8360149a1437370127f394ea6065b44fae22ea4016effe84fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/my/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/my/firefox-131.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "2ea314216e599167876e3154ad296b36c96e71a7708ddf37b01f55e1ea0c5d0d"; + sha256 = "c6b56c8ad919462b543987e486a8f60c1636e8e2a1b3cdf1465db9cde5501d1a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/nb-NO/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/nb-NO/firefox-131.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "3e5e84a753c421ab9f8d44d424d7a15a18ff9c9270af6e82185ed886bb38f8c0"; + sha256 = "9312201d3b6e828161802a790cc04e0426c68d9fa943fc8dd95704bf91fd1a5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ne-NP/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ne-NP/firefox-131.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "e90e933de24961fc2e34fe0adf0f363a5182497a7cfec8b6f4ea6cf851f0bf45"; + sha256 = "151c1d81c4f9faea32900eb2ddca5ecd565e09be04f300c26c8210fe4a92bde6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/nl/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/nl/firefox-131.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "206b36f8e85931d34582e4f6f830673ca84a423eccbdae745ca5dd251b361492"; + sha256 = "4dd12d7ae84478954f2a9f35f7d7c4ea0cdc99614cba6230c9a278ca04981989"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/nn-NO/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/nn-NO/firefox-131.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "3b26ad7c5159a9170dc35f93f53ae6b6dc43eaef31d39b18b5975d827bb97090"; + sha256 = "9f3362d620af4311bf9b349903ad0b61320f4ecf4d4ca5d0326de5190d48f7d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/oc/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/oc/firefox-131.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a4ae3157bbd6e553a5b3d288c9b649477aa5687a30b899f6b6e575ec6a603556"; + sha256 = "2ee6e4ca52eed0ecca2464095e53f0688fa0522e44000d3ed47ade39115b129e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/pa-IN/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pa-IN/firefox-131.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "53ce7fe5517dd47a4af0609423dc4cf2450172d6673529eff40ce27628993459"; + sha256 = "5457d47b7af9d2f7d819e5702d23df6128e10d38c74101928b58353bce9afe8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/pl/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pl/firefox-131.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a6802d656a1e5cfdcad62fdf62546128bd5a49065af7669122494c2814d9feeb"; + sha256 = "3bcff5f278d492a88c5b0b975d6c0c3d70bebff3a61b04a7fbc1e6fd332bac77"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/pt-BR/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pt-BR/firefox-131.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "a524bb5160d93ee2ce2c5310ad6634692463055179f401213bd267c6cd52a7d8"; + sha256 = "183e23db5fb34ef93b05b7462a877f654462ebc56abd7e2c9314118978df80a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/pt-PT/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pt-PT/firefox-131.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "74b1118c4e0950a21cab972627b8d3228aad1bd0d18113b95104a7f233db0ee4"; + sha256 = "4014365d5231361d68e7e4959e12827345c0b80dd948e25eb3df2355e0943525"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/rm/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/rm/firefox-131.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "8042959c793d80810395f16036b7a100c7bacdb8c6cd0d6d8d63c5f9c220cdf1"; + sha256 = "4ae1c4d6fd687b7d0327e734476a922a4b6520d25ee87ae3284a32a12f870279"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ro/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ro/firefox-131.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "361e5dc269cf6f832ff7ddb662596c9636fad739155b092aab5e63c875a99c5d"; + sha256 = "1f42f2438b54dd695d3672fb097adf6855c400c980c4329bc53bca9d80c12c22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ru/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ru/firefox-131.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a90c203d8c6fe22fcec036387df020f2a4fb888c7fb8e2fc636a11d5c9990271"; + sha256 = "345ee0426d557861b8b4c1be02b3429f77615eea3e66fd6bca455819c21d1058"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/sat/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sat/firefox-131.0b9.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "83c94ae84536feb2a13a2bb7447eb3fd72dfebfd7c434787bfff84cc71294687"; + sha256 = "4d92c4a392be6012ddc9a5c815e066e4918e74f1ddc3d00ea1433b3f1bae52b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/sc/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sc/firefox-131.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "ee477331d67d4b464f57871faa3a503433c3113aa0bdf6b23ea3a22ee6247799"; + sha256 = "5c92a730192ff70822ea02bd0a1ecf3e9df0ecbc15c3b85da6150880fafd2e7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/sco/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sco/firefox-131.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "0aa3ee7d77dfec73ff8e1509c56b416f0dfbd64dccb66805699044b5646569fc"; + sha256 = "464335c80b3fc31fd418f2c58088af114d50d49f80b7bbebeeb24963387bc3a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/si/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/si/firefox-131.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "a8303d4b8e9700df53b6be50bc54f6404d21cf818ab8e895e6b128cec04ea1cb"; + sha256 = "ff7b9c7607d4991e8bf78a3e1010760c090867a8c0ebcdc4dfbfd726ec820a3f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/sk/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sk/firefox-131.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "134e3395eb331363dcfa378a87078119e2b8b178359fad2f3461772ef3518957"; + sha256 = "015d7fc92041f3cc64a63d0ac1090c00cc0ccaab77af4268f986cda4a790260d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/skr/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/skr/firefox-131.0b9.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "f1ae26302af1e8f990e39c3b6b7733e9d8d3c4014fc76b72b90968e15d859fbb"; + sha256 = "3b78cfa124aa7d22737c0d7c3e4b076ca10bcf6f50ade071f41d2ffb7bbd54bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/sl/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sl/firefox-131.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a6af520f8fa209cd1b60427e21f70aa392f3c5662daaf0b514f2768605e068fc"; + sha256 = "1e4d45ffa94185fda9f83228820ac2624455ac1b41b16975b81497c9b8b019b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/son/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/son/firefox-131.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "eba1248e75921771811b85a2fd88109f36409ecaafc10c9edd35756cbd440483"; + sha256 = "9a57563e84acf0815d1ba359e0b4d1c0d942456b2275a90c43fafd36aaf158b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/sq/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sq/firefox-131.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "cd15e8fd7dfce26af9c537773bf02cd7507db7f2fc67bba0d214da4eb4459cef"; + sha256 = "e17129b474e50f6cb8d378f79b7c130ecfdc9d367601a01e65eae1a5540c1dff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/sr/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sr/firefox-131.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "670885196eee681f517f6931c936faa9ba8b651718a228d22b650987cc4349e9"; + sha256 = "5f0c52f956d17e194dc9da90ca1c7c034c6227ca7caa382057547ca048b71328"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/sv-SE/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sv-SE/firefox-131.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "bb4172d0643b702d0c9ff92387aca850782e9acde940ef06f148bdc079a55f83"; + sha256 = "086b7dbf44bb89dc41a3c71d59f5bb4becb9cc07db98ea8dbd9966113ec1fae4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/szl/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/szl/firefox-131.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "85c0e53718dbdff4548a677c6244c3f5b4da0bbd79a94e31b107b95a6deb121a"; + sha256 = "6e7b7660e050b19ef15626f472a9b50af497ffbc306ffe6bca959c10e68f3b68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ta/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ta/firefox-131.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "844a0fce109450a899c24b04afd3af145d6a6645d9090ed76dfd99d78381aa8e"; + sha256 = "8c9075ec945fa0c4b7a096116f9e5b3f286b5d16afc8476f2592676f65308461"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/te/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/te/firefox-131.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "80a7f2908e5d057520bb11c559860b42cbe39ce12773530baa7daa4fc569ac33"; + sha256 = "962cea48a963d71d5f629f26f847713149d05f81ed2fd79b0e7615208e652f0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/tg/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/tg/firefox-131.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "4ce8be0090c428b7d3108c68c333196fd356433f7185092c5bd813cfe33b6767"; + sha256 = "09c8afe3bb1d0d3e8bf071d52795700ce4ce0e6f1c124f4e5a972929ed358d90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/th/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/th/firefox-131.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "87af15e98c7a795cef963e75a6d40062b234727b1a9f666cb37bcdc37e335ca7"; + sha256 = "c4caf317e1312b71ead7ebf0b21d2cfa1678164d9b248a79484912e783e2f271"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/tl/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/tl/firefox-131.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "2e597f14b93265c415b089cc749aa8d8b942970280ae6fb971de8fd337eff43b"; + sha256 = "51bb699925ead8433d377b53d0de721ee32eecff70552b6ab61fdd957cf862b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/tr/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/tr/firefox-131.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b3cbc4de01e112a2e040cdf0b8e943c9e7fb256ae824b547aef4236be70d8e63"; + sha256 = "f7826876af8917cf652df4009ca6dc22884ce4d40247d3506bee90a7bd4687d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/trs/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/trs/firefox-131.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "9bbfdea26263b3d50b8202be32c65eccc1e954dde54b9eb49df76f27b2ac7b77"; + sha256 = "5fb6ae81bc8c1941ffc0ef38b06b31b78b186c426f394d4a67f9be4d63d050fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/uk/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/uk/firefox-131.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "75298b6f22c1be8d4dcca9023e6e4cd385093fdc4767114fa7c1db2e69e62c03"; + sha256 = "eefd6322c99a3ba93a4fa786d31f0f776eca34c9e63d0174318f1ba1a3f0d9d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/ur/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ur/firefox-131.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "25854fedc5d46be7e73e5836a33d30d77fe8deb822cde1579cb40c76caf59ad4"; + sha256 = "8636ef350c3f91c8e69caa2b8470c16cdef28d578c2a6938db0ab8b456f174c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/uz/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/uz/firefox-131.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b5cd50ff7b221454cf1d9fcaf31daca328d3faed5391bea4b3ffce52b29fd365"; + sha256 = "2dfe1c15b9080bd8779eba2e0eea8c4e04231aa7e0608151b8bd17c40dd20c0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/vi/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/vi/firefox-131.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "1e098609ac94c1a7e6bd184759ec424d5ba71b5a3a3b232c83271620d7175bc3"; + sha256 = "2f1784e6c2ecee4b1633e3ea76df75514bd6b16e4f4fafcbdf3777598a2f2c77"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/xh/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/xh/firefox-131.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "348d30f1bb4172c041e74eb6d5ac83fb117109ce68e534f5953356a6c8d26a8d"; + sha256 = "ed6fbbebef7c75c3816413bef61a580a663b8d37e38b519facb26ed4b77cf53f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/zh-CN/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/zh-CN/firefox-131.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "ca28cc17a589d2a1ca0188c348de35d4659e073bfc2a3090413d8c7ec389ab32"; + sha256 = "3a637f025f932a7e5101901d16c8e216d3db8015924c5abcb50d019c5c21bc47"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-x86_64/zh-TW/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/zh-TW/firefox-131.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "3a89e82d1fac35c09abf5b003b046c2c69739a51fd5b4c2663ebc4e282876e3c"; + sha256 = "6eea1f043278ede18f67308566e2dd642504700be6c16a7259225de5a604505b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ach/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ach/firefox-131.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "561e04b52014577e36f3dd39f3d9d6db878de30d07878efcc74195243a5aca24"; + sha256 = "50fc2e2a82193e3268084a03d6498bf9b5e7c1d20479fc40efb251e879c06b22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/af/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/af/firefox-131.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "123adcced00a44d8db77905bf3002c2e64e81ebb72fc09824507846e0c3d31f8"; + sha256 = "5f9bc2c288b8bb864aa211b0d2f49814a99c3a098726e5ae6ce1b0b42fd5eb6b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/an/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/an/firefox-131.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "4439a0c911282708bb9707f8ca1449558687b839752067f63d81bdde920e4117"; + sha256 = "76a0c952bc1c8365645011a19fd1c75e825766f3c40c46c2fc743c10b9a0eb7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ar/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ar/firefox-131.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "55949846e3f1b8c54219fe89eac651b8974f10001b692096809288934cd92cf1"; + sha256 = "09ac88d33dd97c815fd39010e7dbcacb24a509879401fa2f91ca0e79f54fb238"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ast/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ast/firefox-131.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "46a8da2111fb6a200092294aaa23cd25ba2a8a61c839257d8a550883ad46b847"; + sha256 = "fadcc3d4873885a5c93c0f4c861b4ece2148696a5dc8997110a782008b922048"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/az/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/az/firefox-131.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7448b098967fae02e24b405ad6521717444105a0303a2490d710b37338c1220d"; + sha256 = "4cdf4e03d5d9b731769fca3ccb1eab680ca662407f4375bc2c9b152001ea242a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/be/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/be/firefox-131.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e729ba84291d6f354e2b989f23e90916b4fc68dedffe7a470e9ac27a3f7f8e3a"; + sha256 = "ced88b8e0c8850d0c4452a199a6716061380d22596e4e24e6511be176c7181f3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/bg/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/bg/firefox-131.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "eb46f4c2df9eb32b3af502848969874e27f88b007396cb4429862071e4578df0"; + sha256 = "034377422b59cf060c8bb7bddaa196f16917f4b70c11c1a566f0bf4fc5fcb40c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/bn/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/bn/firefox-131.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "6736dfe391bf9045ef956c07109d11b27116cfa8bce89e989004537bd55a8cce"; + sha256 = "af909704445b29982a81a34d5bb0cba22edb464905cad4c92e77489913fc32a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/br/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/br/firefox-131.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "4bc4f065a86fe1f582ea1aa7c115c18e077d2981c1d796a48f65ec437e53b958"; + sha256 = "54cc7cd3b036d57c9a5c0e5fc0ab225585a80bf787bfec394acdf63849715bbb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/bs/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/bs/firefox-131.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "5274bd0bb0b9f587efa04400e10b1ab4f5540811da75895472e2722045254b5e"; + sha256 = "5840cb0fd187509740d69939419cc44a3e25ec567cf92355c4cefc2ff209d135"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ca-valencia/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ca-valencia/firefox-131.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "355a8f0088909edefdbe8b66c5435df6b29dc54541f238b5783771a8f56c717e"; + sha256 = "cbd42bb1ecc25d4ffbcb8d8cba9953cc0d55358f76d13ce1db7691953e6c1f68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ca/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ca/firefox-131.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "da2a408a1a6d96d717dbe3afc5c4332bf8d80461b1f4b9dd3e9a44b659acaaf1"; + sha256 = "d8edea663dd8452b9fad221430d6ab71305d28734ece2ee79d8e8b29c875114a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/cak/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/cak/firefox-131.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "19ee9df4c37c6580c308730296058da604cbd0f4382b43aceb892bfc55097e2b"; + sha256 = "fb08af9b0ac43b2cc8aedfcef69996f80fcab1664fa4031ac52bf9236bcf9c59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/cs/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/cs/firefox-131.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b25d41a26ac23aad3d5fa9f0867c1ff97edb1624a452c8fb064a9419389f0e6c"; + sha256 = "6369dfe17841c9de4b3b5a93032c559d35e67c137cde1e4181aad414e06c5723"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/cy/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/cy/firefox-131.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "7737bd95f2a6a350bb774493b9330f123ffe3e599da980c14276e5137d0bcfa0"; + sha256 = "0bf424ed838344a98f81933de64b033726cf66ed9c8eb3142c21a10c8fb01f0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/da/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/da/firefox-131.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3af49a1e1a17db90a340202d9c79a052796dcaa5076bb4ab6580fe65fa550118"; + sha256 = "1bdb66957a5540f3768ffea9c0c23c2293fd0fd3a66aa72a2fd47768854015fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/de/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/de/firefox-131.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "e5e8f3eb6583742f1641b48ca55f690744c07fe2ed318e40f1f21102c6ec5b33"; + sha256 = "88a3d26cd16051096179b93d3e048e6fdb07a66453e037ede38ce7b4ddc63c47"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/dsb/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/dsb/firefox-131.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "7b93e8982b404f033a55d9d6ffb7e7ac6ba996ddbce48257962472ee52863392"; + sha256 = "bc33daf72d1f2f53baa59cc247ad7ec81fbed391f310bade3a944378b48d712d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/el/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/el/firefox-131.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "cc93ae82147e2fa8251eddcfc78c357b2a852754f80306f4188b69bbb0ba8481"; + sha256 = "6e67db3cc25ea6524d27d061802fd927cfa30161fb7a6fbe0e0503be6ba90073"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/en-CA/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/en-CA/firefox-131.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "73eb1fcfdb54877a4fe22fd352f59404cfe9ff3a945f53a8d3633a7b48e0b566"; + sha256 = "74080ce1da63f5597e2bcb2cec2aa293e514dcf80832188c2ea38e0c9b247dd3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/en-GB/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/en-GB/firefox-131.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "deeba102b79396ca8e7befd29334b238d3bcde499d2e174bb55d2569ec811bad"; + sha256 = "71f04becacd320bf673342a72de1f68136048c489ced4a31afee8ebeab2e0db9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/en-US/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/en-US/firefox-131.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "9c892bc7e7ec72b75a93baccf468fa8aa686cf65c47e37c0f0c1a3ee1dec131c"; + sha256 = "ff0ae00d7685165a47ca2e6c29980d3fd24a2889a36c066993a86930022f8d0c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/eo/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/eo/firefox-131.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "c6c77226d01d2aa79d3f6df8ec8362cdc0d8feb040062eff4bdc273722ce08b9"; + sha256 = "b3bf81f117985d8baddd5b14529c139eaca9a9a7473526aa89f63465fae63689"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/es-AR/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-AR/firefox-131.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "58313b20de1e59b69b6aa5b0e7553d559eda4e6da98f8d47c2dfe2816cf49513"; + sha256 = "a45a2fb851b0f5cc16abb0a8db6cbc24f63c5670e00bdc03197d42c3700aeb4d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/es-CL/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-CL/firefox-131.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "f1886d1c7fffa1af221d60f0d17519ac56c8e0eb07c997c2186d6bc954572d3d"; + sha256 = "f6b399aeaae4afd02ff9ef1470c4ac643f35ec291e63da1d0bca35ee80441838"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/es-ES/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-ES/firefox-131.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d99eaf17220619c5ba4da3d1d8f9a37ddfa14e1962de71afb6a1c545897825df"; + sha256 = "1cf8e064fbe3018a46083120d7a0ed54273a50608c2f3c4f193d5454128668db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/es-MX/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-MX/firefox-131.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "c9fa8a1481a55c8e5aff49be5357041e79838b8b3c81faca6412a98f7000689a"; + sha256 = "47771d5c6a450babe2df7392edaf3db890e74cc0ff2a840fa3073f147b00b692"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/et/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/et/firefox-131.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "6d289b4125763da87a1be7740530d6bdf6c2486f6726efecc46ffbca2d729546"; + sha256 = "c945c1707ecb99efe28f1c954e8b24a30d7ced8efef70e12aafc27573ffb8eba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/eu/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/eu/firefox-131.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f34db9d5d99c4122a0471fd1f424b3d77b22d5b08577b88245588b9f7db72288"; + sha256 = "a7dfd698b4ddb847190e5433be60c2f4e439eca168a4069f772f258f741f52b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/fa/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fa/firefox-131.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "9a6a91d149e53b01506d0d375e2865112dc0358b737f02330b5ccaf0e231fbb2"; + sha256 = "45240bf84f0f36ba76eacd45eaaa50764dc31b50024516a108bc7a0874ed7fd2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ff/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ff/firefox-131.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "87a0835d3470aca820a14af75366e654daff81cce32d1918b03bb0f057bc033f"; + sha256 = "4c7437671123c8166010004550c4f537b7781a7f0cb613b2d410c8f22b9e9e69"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/fi/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fi/firefox-131.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "d6e7c93e1e95937425048e48c9cecffb7bfc6da627b1f59686ea737c85c73dc2"; + sha256 = "0deeec3c2641dcf2fae91ab2ca9f7bfc2baa4da60e17d4f3222f771d9e164da9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/fr/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fr/firefox-131.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "41edeb0e1ca1e8ed7784c798daf1abc7f6790bda4069b8f002f931fc728518ca"; + sha256 = "21c640f55ab1eadebce4d95126362dbc133f4354dc8eca23cf77041bcfd8f621"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/fur/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fur/firefox-131.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "344c943b8194cfa027f22b06bf8a213c73f4a5e368a480a07a1e16b594373f81"; + sha256 = "60ceaeb0cba8de73fad46fc8804f1f53fc332824636de54fc25860385f332e8e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/fy-NL/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fy-NL/firefox-131.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "247d0b2bbe93923b01ff14ee9e5cb73f44c56d5bf5dea50712536aa929ffff6c"; + sha256 = "9c3d979d24bde8a5b942243144c2e99efbf49dbc0b53f467646f4ada4d95beb8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ga-IE/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ga-IE/firefox-131.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b8e373045e01731093e4d5717690763bcee9ed6a8714e6bc3d3033874e601b09"; + sha256 = "aaedb9933a1d01338d4d22f907948b00c9a88fa83e80530e709bcd3272c5aaec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/gd/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gd/firefox-131.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "ec58ed432aa0b194a7e7cb85d41efca9ad94c0850ceb1f7a6fe24d549940f064"; + sha256 = "85ffbc7193f6957c07173c8522e70fe313dd116bee3da52588f61bf3cddff1e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/gl/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gl/firefox-131.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "ae559cba902b33e49fc8c942694ef50cdb8807a36a12f20ef828ccfef7f2bf38"; + sha256 = "54a8bb50e9d497728bc455285ff40b53c7ac663e6b12531e17dbe18019bce19d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/gn/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gn/firefox-131.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "99ef7e9f97af819961b8e5c1900aa025b8a7c934097fbe1404c5f3575fd3349e"; + sha256 = "348a0de7fa8d1a8a44d0a4b3de48e7f377e5af3a6ee1a6c5c87d5f3e67e394f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/gu-IN/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gu-IN/firefox-131.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "2a8a9b2fc372b30e901da9813d4bcc040240de7a8a8aa46d630b3b7d7b4f2d5f"; + sha256 = "4c5bec0040ba7c7c86327da0936fb82873986535be12aa61085b5fe2fd292a83"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/he/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/he/firefox-131.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "44813dc94fc1a945bb728df6cdae20339e070b13e28b1e0fe9b58aa42cf1b7b2"; + sha256 = "2706293c91fd55de743916430cf4bc410a53efbe563f5c8794b6fa212b767870"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/hi-IN/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hi-IN/firefox-131.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "d4d7532dedb95fc63647da923a76d45e2a1292ffe24314ecd3b06976cc031c4d"; + sha256 = "620034e178aa1688c851bf618ed05c238e89a4611652d8907bb56858b0a88874"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/hr/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hr/firefox-131.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "c034c08715196022574c43d1820c8e4fb0b34f5ac1957d37ac8e726fcbd7b1c9"; + sha256 = "b168e24590ae4e74620ac279982d3277105f01e57b4c7b014965e941596960fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/hsb/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hsb/firefox-131.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "a14985957672e13335354cd8f5b28d113f5ac5a52c487da9929f5d0787b71e97"; + sha256 = "6a1b831ca8b7400962a051e2308c67b231dad5f331daf371440b73f02f15e305"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/hu/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hu/firefox-131.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "9bf3a8b5f9ad0ce143cca7a9ebf6a8e6a5ecadaa4e4b9bd09c7aff0f6a0178b7"; + sha256 = "c2db40b3fa0759bae7fcde219b91cb8c9d80548fd8f58ef006ed58696b0272f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/hy-AM/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hy-AM/firefox-131.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "dd806959c1f599cd629e7a9179f20b79f2cace536028c8ccc2507cf9d376e54d"; + sha256 = "e59f4ab6b761122b271f600ce3e3b2045b3264793ef4ba0a5f786f90de227a7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ia/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ia/firefox-131.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "cab60ce8fe36fe8f0ae259c74f4a212eb77395e856bcbc5647081685f70f8028"; + sha256 = "cf212e24c3be50a4a82f4e85a4363b1c9561441a98e2711eba4035f3d70e37a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/id/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/id/firefox-131.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "cba2e4f6d63c467637504e720ede4f43fbbd6497ffa1c535f67428dca0b73d26"; + sha256 = "1ac9397f213d1563840b1644c93cac4e9fbabce5d64d34d0d26cb2ad9cfb4e5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/is/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/is/firefox-131.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f45d9321d1db35d56a7431a049c5ee94ff105d08c11351afc38b826f972a9157"; + sha256 = "4b35afb37dd26bcfb2d1085ed52729624522c71d28429266896234be6d4f4c01"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/it/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/it/firefox-131.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "17b35a50d1d3268217493b39a24054ec6982590c1788ea3515f2c73041676cb3"; + sha256 = "49cfd104dfb6990e0d710e5f00b0a2261e219306ba79ec4c0c781a7c7434e7c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ja/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ja/firefox-131.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7bf9e5470c8b3f89712b2f5bd20178800c1dec6cbbe8d33287a237f7cf695436"; + sha256 = "f22221daeaedae3617119c7f20967fa4da9d31e3dafcaa7caaef2373a3aa6c9e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ka/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ka/firefox-131.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "07370c1fe13fa04363947b4a252850edc0a82687590409097a8ee53222e9d2d6"; + sha256 = "fc2f5b3f2d5ce8ca01e8a99dcee1711d1ee4023abb8731de5ea46692c4a61290"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/kab/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/kab/firefox-131.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "bc5dfa3b137edf5a1d10ed4dd29854979fe323c63c794908bb20691883d60102"; + sha256 = "055280c45f00288396d36c256526a5dd64adebcf3bfe440e9c9ab2202e55ab5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/kk/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/kk/firefox-131.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "67cec51b24d979d7ef20deb37dc56fa127adcfee1c80b711e8e20e5dd8470244"; + sha256 = "0a5317894efdd746f0e8d40707b0c0f33b8b84edc05df0c4f9002c884902e081"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/km/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/km/firefox-131.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "09d9f140c07666c8526eceb2dd5c39043f6f402b97801a36ae0fc74ec485217f"; + sha256 = "8c60941a34c898b3856ea187e975a7d6dbbb73a505d5ebaeece645d35106ca59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/kn/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/kn/firefox-131.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "6c6f557ef338b3b3ae4d771f93b331200ed2d959adf35631c0364d7daa900c1f"; + sha256 = "93513224080c9949528812a3da30f0a6e178240214fde3c97d1fd9cabbf08598"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ko/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ko/firefox-131.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5f7397f0864694427826021ea4055f1cfa5ea6080e346e3d8550b6738261cb8c"; + sha256 = "5dd5a0d16fc17f9e4cd252f2ab18a12c457a224b2acd163329cb1bd705f05bc4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/lij/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/lij/firefox-131.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "59c4b8baaf621d0433452a2cd372f6b829ac3fb4d2833fe3d73dfdf32a47cd2d"; + sha256 = "c54c0e099ec3dfb6355a79e1ae2ffa1298a21d786e6b5e04fa9a428872a4f717"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/lt/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/lt/firefox-131.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "07f25f2c44e2f93ee06766ba2f210bcc2179e12191a9bfe32af312166fb0f12e"; + sha256 = "c955b89c4d53075394cbb4d1a68e3864522e7e2fb24422917828079ae431f216"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/lv/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/lv/firefox-131.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "46423386a9445e97ccfed77297e9c6c6ad16857490cb3768651aa489d441e8ef"; + sha256 = "21b15d4bc68237c8ca60b7fcbbe166c2bc31330b5d77d333e25066e671f545ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/mk/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/mk/firefox-131.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "9d4f301a027f67db9ef053bf3d855bfe206f394f619e38b3274d75b88e94e26f"; + sha256 = "1ce9a53f0dba2c1f93a31c72228c6df2ef70e74cfa155058f764ec2ce05d3e91"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/mr/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/mr/firefox-131.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "2d7a494542aa3f327bd1001369b254066070e2dc6b03c376d5a6632706ad3603"; + sha256 = "b2a70628f72f662edaee06a767fba449a91af37387f0aac0d5c8b40a7c61571e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ms/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ms/firefox-131.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "638f1f047034e6d1de5fbfed8b817bd0e69a3f3f4d2316db11cbe18e45433167"; + sha256 = "c4b7453d3606d8a92acd7848e9e8e9f6aa2e54db11942a09b004b5017a50ef2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/my/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/my/firefox-131.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4d89706df692ba3e6a8c2054ae126eaca81776c88c5aba595a478debbbd31545"; + sha256 = "c7d0ad3715681816ed5466640315d50fbbd841516c56c6828e8e1a777207f967"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/nb-NO/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/nb-NO/firefox-131.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "1c266190c63734c56d15c551b60cb0cefc043fbd783d264843539ef16e28ea8f"; + sha256 = "2d2d14fc9a898ffbc755ac2b8d7cc67e006fce444c28785adf65f2663deb0815"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ne-NP/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ne-NP/firefox-131.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "cce96577d8067807659faff06dd092555055a6de34c9f30af673f544d1f1679b"; + sha256 = "4b3da73c884d15c4ab8be803ce8fdc6048e5c64def9f4dc9364b5df49774b67b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/nl/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/nl/firefox-131.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "329676aeb12761430305c91ffa1ebc2d6d8b43362614c0b19b5b3f88fe0b5565"; + sha256 = "a240f5ec34f358af7f0c5e1d15f6a9626d9a3e2a39cf75b2427f594be5045fa2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/nn-NO/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/nn-NO/firefox-131.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "3673f86f77f068569c59668fb122edd148259451c670534aac72c6b54ebbf93c"; + sha256 = "b4cecd431906789f1a1fbbd617ab332a6a007573c1c5ba5210af4a7de7262ba9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/oc/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/oc/firefox-131.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "9348d1e6aeb211e8b0ade1946f4db3a21d4c2e30fdac82d227e84ef5db9ad2c1"; + sha256 = "71230c3129a6ede7cd78fa9bbcd5868aaa1e43747a901645daedd0792aad3b39"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/pa-IN/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pa-IN/firefox-131.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "6b056e31a62395b234af43f7702c2d389183b8b1aed63da24545f60386dda6be"; + sha256 = "fdc719499aca5931cafb78b12b779d744239e9321e4b7cedeebec3a86ddcc4ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/pl/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pl/firefox-131.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "d7d63aa143364f2d928714b7e8eca30e8f9b87eb9ed9db134155df7916eaebba"; + sha256 = "c0d2437eb209648346e69b674482b7f3d5e95ac3ccb012ec1ecddc7ebb9bd203"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/pt-BR/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pt-BR/firefox-131.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "cc987d54edb004419c76516f662f417e03d99b349e801bfc4e2e08ef7cf2e431"; + sha256 = "07a5dae4cbdfcf6d2b8d5e34eb0cc95f55884e58a7f6cb3d8183f95225f53c66"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/pt-PT/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pt-PT/firefox-131.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "f312722b8452b23e2ca136a2842457780c852b8504d7cb415d90ae509519993f"; + sha256 = "4701a683a54da5ad32765979155a5115e9b4a8310029bdba587650255cc911d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/rm/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/rm/firefox-131.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "49b95d29028ae302266a5a7a2b84e30d0a061d54d14216c23efdf1829732075d"; + sha256 = "004a519addc3af848ad71f4d4b85afff5787104006f650748bdaaf3fed861f81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ro/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ro/firefox-131.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "faebd4b93a64bdfa756b62040b357c063d36eba741b1834c957dd961ee0fbba3"; + sha256 = "2c65bd5d604b3e3f4e431911a4f38ef903060c7cd5d79882287c027b4696e04d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ru/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ru/firefox-131.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "fade024a51148bff2792f841404abb9ce1fb0949645375d3027bed0258630c4f"; + sha256 = "b4ac9db58806c4a2f636a912663007268234a9d2c86dcf4be565b194e8ff7aa4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/sat/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sat/firefox-131.0b9.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "13d551fdce796151c0fb40365dc2105b8a10d14280b86e4d8f2e9754cfe6e461"; + sha256 = "4fd9453ad511871ed46ae1c5890071945724e7876fcd1ea818b3aa34360a4260"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/sc/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sc/firefox-131.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "099e7ab9d9427dcba819e0f212e56fa5a90dfe270ebc1cac8da589e01d206b89"; + sha256 = "1e2d3dfe585ce3c4472055ea644b75eb4ece0b60c8b5c05781a122d4c2958ae5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/sco/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sco/firefox-131.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "04b7487c43f863e075dfc3bd5ade2f9109e27eb5d19064cca8a9339b32a5899e"; + sha256 = "7e697b48056401689864604fb64f1344fb2e5be303a09f5e2a35fc1cc665d6a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/si/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/si/firefox-131.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "691b14f134a16f6401be76ea7c68dd30df6a5ae2602339bc99fd429aae945ae9"; + sha256 = "a4b8095c01c86f30049085a68631372a563de6941b4af7b31a5ba9502ae49b49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/sk/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sk/firefox-131.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "69f850cae0490029bb3a7fca59b14533abfd9ff66e66d48bcc831eab7c2056eb"; + sha256 = "1c915b7b06aea488410bb1d0b466ca77c204123f83988cd1466f7f33c77b6165"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/skr/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/skr/firefox-131.0b9.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "c84efe19a0f5190877f6f1653f8f3731f20f64c01bfacfcc800c0503e70a1510"; + sha256 = "4e0d908d97ddb16722b16226982fb1c3593ddb4d1ef2c89530da6a6822333522"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/sl/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sl/firefox-131.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "be183e734ae1fa6825af8f26ce30173f5d3605e8b42857d52f150be6f56a831e"; + sha256 = "64f294228a9df9540bf2669a13aeeedb1591ee5371513819096fe7c7a04efb6b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/son/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/son/firefox-131.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "f68a5e04ee1daf0507dcb1e714e70e19841d7f218900954e8cd032788ba6c7c7"; + sha256 = "fb28e25eaf88766f9b52a6bfdff1e918b443a62e128536c6b20ef4b2792f208b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/sq/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sq/firefox-131.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6c54bc95fb5af62a1710fbd15a8886f67faae9c8727859b932dec89875e9d0b1"; + sha256 = "778718548b29c64c6282a2a4ffd3686b0f059e7e32eb54bee2392c34fef5d7e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/sr/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sr/firefox-131.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "03d47ae24aa0fd6b41632954bb37fe09e5343b3110e260d368d8f4ce89fe7bda"; + sha256 = "63ee43ca2eb024f95da7d4305b725131a5370f35815e18fcb0892bae864c42e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/sv-SE/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sv-SE/firefox-131.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "c2401a90085d1ad9fe724a38d254ada92ee75304c9583bb51684e7bc877e8c35"; + sha256 = "987541c3b2aa680c095bd8c2d7d638bb2d64212da2bbebe3efa2125f966264ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/szl/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/szl/firefox-131.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "3b4cc1b8f60e83439eb9c89f9ba4f437a8b70e506ba8a936f1d823ce8f5802a9"; + sha256 = "2b0d0e51c4c060e0e9a3b9b3e1fda018ade61b37054b06953440bd3627af476c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ta/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ta/firefox-131.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "f1ff1861a706b8cbadcccdceb25a3c13f5659da250c4906aaffa6e9c4984608c"; + sha256 = "95ca89286b0845f752d2dd1da6ee87b3f7b4167099a369652b31ecb831d8d407"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/te/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/te/firefox-131.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "7b12691fda152b98a2a63d5dcf43dc96ee3ba34a71fc072fbd897dd4c5c39c9c"; + sha256 = "21087362b9b7f82cbbe094ee1dd1744a379759dcd7400f423dfc5482bb2922f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/tg/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/tg/firefox-131.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "bf4264dc07465718ea41624931f7c66d55df6ff63e03bba16339fd856e1364e9"; + sha256 = "af3d65fe8cc61128e0fec89eedac704733beb47ce9d4db71f9ffe07019f90f1b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/th/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/th/firefox-131.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "edc411d0f4aa56167a97e7479938ab51afc5972cbcd8a7e054d8ad5ffb84a809"; + sha256 = "3f198213cb7c8221d858c1c824d3fe10dd4d8835b237c0740d46510f0c95df14"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/tl/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/tl/firefox-131.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d4abff8bad155849edc7dfcd6c9c28460112d25ca275b76c1fd111415fa7e995"; + sha256 = "f8615bc06132b22c170a0ba552c9412ccd6c4c9f3b6a760a77e26208d03c5cc1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/tr/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/tr/firefox-131.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "4433a8dfd9d16dac3611f4ba30f1dfe0eb96ec9597f39290d195ee1bfc30709f"; + sha256 = "e1362f8b285d082ef2299be9af67bcb65fb58f9620ed19b8f2eb97d902733409"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/trs/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/trs/firefox-131.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b8bd992f47643889bd780c748b4ec010bffe0d9ea6701bb4fd0d1a0e72594cfe"; + sha256 = "6cb91ad15348984db6bf9bb11259640ea0beaf36bf06afcf82a7d90d66587776"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/uk/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/uk/firefox-131.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d0488062e63b54fa5ac9ebd7aeeaf56d1079fcb9a66b16a6c68aef07dba0ee15"; + sha256 = "0acc83a27be732fbf9e6d94650fcc0c467b7d653fd6dd65f34668831c43fa16b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/ur/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ur/firefox-131.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "0e1ff4663269e1db7018e9fa8addae438857876530e3daa53b7f910b04f7dc25"; + sha256 = "c99a6852c0840f36fd6cde0de174ccbb6516672ea5cf556e40c622a8381e49ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/uz/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/uz/firefox-131.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "6fb6e39c2acbb00688d604afc945c2a3e9e700ef5a3cadd677984756cce5668a"; + sha256 = "6172ea33ceb1fb782a47f014a64b1cd71050e05e4d8dddcf6270575acae422af"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/vi/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/vi/firefox-131.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a8447e2984650639e8eead6b05f572a4644455d10d6fd5e0e886b848c487b31b"; + sha256 = "08880e6ef6d4e967d24ead60208830b61c1ae193ffe8908d1b8e09381e369d81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/xh/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/xh/firefox-131.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "bf44273b0c636b961089d5ad9bbed1cf2dafc7c5811b6edcdbaf3289b02ad46a"; + sha256 = "e74fd0ec0f1779a26a57b410c95e1e25c52828cf0bac4467815583cd6c426ea4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/zh-CN/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/zh-CN/firefox-131.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "883b00705c041c3654d2912ce49f025f50d053a8eded82438092ba9f8506e081"; + sha256 = "cf169eaed6e207160ee5ae11d3e9c7f6d61eb4bcc827b0d56bd6216a5e45d5c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/130.0b1/linux-i686/zh-TW/firefox-130.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/zh-TW/firefox-131.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "62381634104d71a5705349fa21933da827fa0ebf185722ef59692c22044672e5"; + sha256 = "e8bd7755a146032ec5c5dcc816b355fe40da168008570316dd04161767043cce"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 53b396126066a..3585115bbc401 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1035 +1,1035 @@ { - version = "129.0.2"; + version = "131.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ach/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ach/firefox-131.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "7aaaef8961f1a15cedf6b5628f8d9b39e4df21949f3de29c9cff701b8a5396b2"; + sha256 = "be36e045c268ad7b8c6a18e118941bc166f7c0db4f981a571fa0b3bfcdea185d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/af/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/af/firefox-131.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "183a0bd2d72aa5d37a75c48ec88669d9596daf26bc201c2ae677b817b470de2a"; + sha256 = "8dfd7493a79ce8a9dba6a48c56c93eeee62251712098b300f54d9938cf6aa219"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/an/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/an/firefox-131.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "de0e5ff3726ffb24a3c395364a81872f2c92d8fe5792977671bdbc947437a68e"; + sha256 = "395c27aec8a019ef51ce47f4b6254a9778a67acbae2e196f107628e86b37df6f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ar/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ar/firefox-131.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f9ec116e68473c3b9758690c93d6a01b75f147ffa388123f8588f9f1c21af6e8"; + sha256 = "9c04d516a5d2c82508711910a4eb9bbc30395bf648349ddbef7150d950129a04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ast/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ast/firefox-131.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "494f0f5c2a87d72d39d0056bd6ed190d874a89980090b20ce0a35b262b9e2c15"; + sha256 = "ee75f84752e949454adbfbc634e3f4bbe746c253fcb845b5a098708dcf1d529b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/az/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/az/firefox-131.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "fcd4a02e5615fb249ecb03d494c5360f563ae87bd44fb2bda7f0767083f1fbf7"; + sha256 = "ed02a584a8c7d1a3d513f179650e9de68af0b68d827fc0ad1709f8632e40a626"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/be/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/be/firefox-131.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "8053d43134e823e974786f0ccd3182bab8a13b6eb07e40787890474e4990087d"; + sha256 = "4b6de517ee047134134da171dab4a508e81f885e0a31bd612f5333339e82f456"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/bg/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/bg/firefox-131.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "69c48d88c051f56c222ebf9828ca7b66f8713e2649b4fcf1224f551765cf584d"; + sha256 = "090d3d91b669ef4c9974db5bf8932387db6cbbf7d394fb19dc723a922fdb5bb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/bn/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/bn/firefox-131.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "e246019f72f0636bb42132b0c008151adf9d3e86578833a9259c640529f31dce"; + sha256 = "2e16f5f6db31ca4cad8afdf9d5013e60af2abb06018e85e28416e2a3684a0348"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/br/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/br/firefox-131.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "bda1bf4cab048cb35595213ecdc2a628d6bca359cb39b946718860a5a6ca224b"; + sha256 = "6b9c60151b003c076e4abd635069f6ea8ef1ef3a8c3d7ae10858064273bb1d12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/bs/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/bs/firefox-131.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "3b5a1a9555d8750a7885df9d6faebd4061cb0392a6c0b64993d808caeac0da6d"; + sha256 = "e456f09524e58843948dd0c0eb52fd5f740ee6442595697c0e548d7beac1b917"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ca-valencia/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ca-valencia/firefox-131.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "22b7088c272d84a1d092d439603d3845ea485432551bffe96beda477b116b8a1"; + sha256 = "568cde24b87cfcf1a87876aa8d78d7bd5200f49d1bf8a6529f66ba14a06a3dac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ca/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ca/firefox-131.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "71e732f53f0c95a29011fc80f12e3c65d20ba00843aa2a237c97352912bd0ff5"; + sha256 = "88188fb21436e3e4db9be013766ea3a8f5d7aca4130759e864ad91165d24e37f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/cak/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/cak/firefox-131.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e97b8371b38fb152e1ffa0915a011e1a134eb12b472be657ae2946237ec36f09"; + sha256 = "c836b79f48de1b023c41b1551de43a5482919af70542c2b9d0391f76487bb18c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/cs/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/cs/firefox-131.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "097bda337bc34a899857b948cb05a7394e60d45fcac08649a0b3e05e86cf5518"; + sha256 = "38e5938e3e23a52881f1ada0a927be7dca3db522aacfc6501267fe2f365e5666"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/cy/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/cy/firefox-131.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "ee6e799d8d1722ce7ae7965f9322e32482913905737ba0be43fe5fff89f73a12"; + sha256 = "d016960dafc9ded6a5ae0bf9ddc2df5bcc0cdaa965dba7800d1334c2b1cb5445"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/da/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/da/firefox-131.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "4edbe9fb78034bb68085cb4a28f5b21ba0b136ca6aa61e527c5aa938f14cad33"; + sha256 = "95352744ab62e2966fd182da671c88765d272e35f866ff1fec8f28049151e018"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/de/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/de/firefox-131.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "566a6a89998d039755b0a1fe52967df84851693ec4ac980dd96775abf6f48383"; + sha256 = "16934d819edacb15eb88a9430ccbcc2e7a322d3ebdb42de9a708f02f088d70bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/dsb/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/dsb/firefox-131.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "25fd4db8471f79631ac37cd6f1624344b3b1c6074b797ed2495bd07298666bd3"; + sha256 = "0a89ea6ae7e01a116d2ececa0980b6050f90514678b94431c420590d3e900912"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/el/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/el/firefox-131.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f89c3d396e4f9c4aa7262ed3148d0823bd627985cb1b1b5b9a621ad652197b15"; + sha256 = "01d4bd428e8e999d8979c1429728bbc1fd1cdc2659472e54dee68ab0a6b7c990"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/en-CA/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/en-CA/firefox-131.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "2f9891b64a32f4ace5cfaf8da2bf8020c06cda82f54815888ec8d322a43186fd"; + sha256 = "a14301b5d8f87724cff8c671a4a72d1e5951e00899c0c9a9b477b997ca1e495f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/en-GB/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/en-GB/firefox-131.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "4f79574372874afa16f3e15663bb241c2d4487228525813b02b52beafa7ab696"; + sha256 = "178b7a57e3bf382730ddd9b6c605683521aed7c9974b6d39ff51f5d5190e1fef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/en-US/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/en-US/firefox-131.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "abc39c9deb686084933371bbe0546001f7bfab46c9d7a0cf4b1a4a025886cd5e"; + sha256 = "4ca8504a62a31472ecb8c3a769d4301dd4ac692d4cc5d51b8fe2cf41e7b11106"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/eo/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/eo/firefox-131.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ea987042822c4525fbf9bc9aafb52d8bac31f660350d4b716805a56578b1a180"; + sha256 = "bcab9efc4930052472646180a418e6b93c661c5ed4c54374915b33abde1351b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/es-AR/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/es-AR/firefox-131.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "08300765d0b45acc05a5a1570c440d937f9f0b86e7901cef3961d3ea4b6bd65d"; + sha256 = "05bfe84b133e1d1a35c2934a0dd78589580f8edb9b050d11338a45533d6faef3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/es-CL/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/es-CL/firefox-131.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f00f2cf4e4d99441c6e412696ba99062253297384b7c1fff4302f26abcebf448"; + sha256 = "10d336cb4d2a316100c1db7714ae3da48d73e1ad6e7c36101bdb6a034d89196e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/es-ES/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/es-ES/firefox-131.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a0995bb508d84572aa1fbec2b03d822bad6ad0204cae640d55bda1f94bf31d2d"; + sha256 = "e4b1cb7f8363a62341d6a2bac3d534793dc317425cd05c5793f67d3c1d3ad6d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/es-MX/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/es-MX/firefox-131.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "0cebcbeae39cb6c22a8f7187ad743185c7a5608a052a8e89c9375540c1864cfc"; + sha256 = "ab45bf37e36d53d04450fd747b7cf2159e8b23ad940369c9bf967a8a5eeee054"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/et/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/et/firefox-131.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "311ad4f3f82ad0b6ddcbb04eba56cfa677b4e647a7edd6ab93b839e445ca37fe"; + sha256 = "85c73ca19aaecb687af7d7b4aaee2f2ebcfaacfdc3e5b5ce08d35f7a17afe8ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/eu/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/eu/firefox-131.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "f29874ec11d9b379253c3f1cb0af6dce9bc234f62095f6a5384e7fc71c8790b4"; + sha256 = "0ee96359d320da3f3fa8854a3264b856570d51f27394f872240318992bf8c8c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fa/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/fa/firefox-131.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "bf533e90cc97ffc202031ad6e031f927cac8ed68a36ed085362fe5b2c71b75b9"; + sha256 = "d38bc508f1fc3e2c265cff4b8fe9833e987944fe90a1a7d53bcae9c56e8d517c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ff/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ff/firefox-131.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "0b49ab0e7fe4b54b31b459d6589f9d305a30e51b288f5801caa308879c6e9314"; + sha256 = "06d7f72078a4dec3baa02ab156d484db96907e1adf9a232a5d35105eaae5d019"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fi/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/fi/firefox-131.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "6504da2de952fe15f7ab2384a24f13583a312ace4dcd5a3b047fd56bfd0c637b"; + sha256 = "54c9bd17b3315c44bf033e46f50d5cb56361501c8033a229d62552a7262cd8fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/fr/firefox-131.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6306db7115a74440e6334ac4f388201ab891944aab03751a211fe0d6a963476f"; + sha256 = "7505dc3135353166de0dffa8fc5dc847f6f0b832fbcb8f7a08075fd13c4fcff7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fur/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/fur/firefox-131.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "18faff8dcff0bdf8a5bd0e9bfabcc6a341fe422a3c95437e5253f672b6a60afb"; + sha256 = "3ee1af04cc890d7903553a16a2dcd670d13342de55d2628da78641b6ee2b13fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fy-NL/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/fy-NL/firefox-131.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "cb96cb4d0c6658a6e564e9ae379a8b6b90e964411aff0f30ccf213ae93d64351"; + sha256 = "d1e270655135f486eda9990bf0a9377c2c6be5555ec68446e75414ad3ea0e8c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ga-IE/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ga-IE/firefox-131.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7d45b7ba424003ecf8ff9f2e22c8881445ed328a7c3d28c7194e856278b59daa"; + sha256 = "1df9e69c392873b40e597225dd4f43e46d777cdc02861dd3c0a53fde401699a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/gd/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/gd/firefox-131.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "83a3cb11b7595b630091a8c65cc78ac0585c5a582513e2a376144a011316e2ba"; + sha256 = "50654e4fd3a2ab1634ce84af6bf70d61b7ecc47c01b1bcc54056f6f55ad94bab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/gl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/gl/firefox-131.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b57957ddf205a69e326d4f018d0c359ef5613f46fc29251fe011e8e7779283c6"; + sha256 = "c41fd6c1e753aecb5960f980d1e819a9086a10abb7877193be175bc98e9e4093"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/gn/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/gn/firefox-131.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "884eb5acafa07240a992efdd9653ccef3002a4112854e767cbe00856aa1d7da6"; + sha256 = "3aac4478640f9695bdf7deec5785d539bd28a116511a83f7e8b90b9599d83ced"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/gu-IN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/gu-IN/firefox-131.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "e6c7181087c49b702288c43c033451344b4029f6088ed5d6f8c7d870d3de29e7"; + sha256 = "98260679d210ffdb7a0abbb7a4f6335a7964e9e67ce67acb2282932f4171e7a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/he/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/he/firefox-131.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "943b6ce9d9831bd3321b71cc9796ee3b311168aa14536bfa27a857f4e9f285e7"; + sha256 = "9dd1ba7f70d9c2abe78f20c8f7c43f8fe2071283592f5403d395fe1e9afee832"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hi-IN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/hi-IN/firefox-131.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "04d511d86ff2d7ca868358e3713e8354c6953f52c12553faac13bc538782a634"; + sha256 = "7bf4cebc1d95a8879465b07f060ac0a300d2e198e86e68303ff87c68986bd4f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/hr/firefox-131.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "97182b477be51715d2d241e87954a5b722d1b5555047487774e069fcb73802c9"; + sha256 = "b2057d0916c17948c782741cc8ad33dee728fac50028fe69c1314ce5e2830d50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hsb/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/hsb/firefox-131.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "68495a5bcd85e28a125673cf2801b41f039d169dd5d10a375e298be65278474f"; + sha256 = "197bc7a7fd7fc0a7d5002a45307f37a201d19cc4916c7207b0aa87d2ca1bd777"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hu/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/hu/firefox-131.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b46db68cc2488c7632cf2ba9b685526c8ae8f4e528ecd37c885e034a1bb548d9"; + sha256 = "bf5d21d0890c5cc740b0ef60a9940d7bf70874ec8e98d6a2fa6a3906dbad5eee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hy-AM/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/hy-AM/firefox-131.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ee6de2465b22e138dbfae37bbac83f0d6ce4367bb6de3bd0baf7753d5e0fa76e"; + sha256 = "d6811fa82f435c027dce0b5feeea2320a7aacf94b1fe7923486c4a13cfd6284b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ia/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ia/firefox-131.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "f7ab6e0c7acd4480fa6f3e1aeb6ea27df9f105a4b62ddb4f9830df0fc70c2a35"; + sha256 = "666c537a9233bdacf0f16cc98a6708cb8dcba48a3d55cf8c6bcfb5418259a8b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/id/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/id/firefox-131.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "cee0868a891b37c669127a6a8c4235ba1aa6b32d3e6b35cc0c63377409d3cf14"; + sha256 = "9eddc0df63e3d3fa25ac4e61c68c04e497e4034cd8c8492d4556df3c0eaafd80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/is/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/is/firefox-131.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5acc79cab57f7fe96f4b9c620734c8085b845adb07e1173fc01e23ddd8296f01"; + sha256 = "af257fa9ff0b926845bd910c365da4858b5ae375c66776369023fdfc8ef1ff4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/it/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/it/firefox-131.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "626304726111b560469f8e091214f7b0eff5a0976966f3c95f10ba39f854991b"; + sha256 = "ebecd0d93cde4e9ac3fbb970d343dd826a7fdaa7c0c0c1411f739dbb59703a3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ja/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ja/firefox-131.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "86d8254bd6f1dbbcc83a482d4c3fd95e1141bde2f12270cb00f5c775dd7a0414"; + sha256 = "ec23826e3e748f4b3c3a79d8f0945d224b1fe0b26acc814ab046e1f296a791b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ka/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ka/firefox-131.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "25afab664c50acb86a7cda73089a9245543656ff6b5a2657e952bd91efcf0986"; + sha256 = "07cc5996d15647a3b0f487218bc02464e16fa8144ea2da0a15b533804b0f2fda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/kab/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/kab/firefox-131.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "4bbf14ea29b4a23812770013b99c8efc7f097332d6a4b154eb1727c7b5c5d077"; + sha256 = "fd63ef6a93b4f75d4106113053cff8b12466973a147b1c32d95575c5726340ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/kk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/kk/firefox-131.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f60d696894b0d400b5e7f144d133edbd52920d072abd02513f18ac247dd719dd"; + sha256 = "dddde0f27826990d7d20f1cf8fff06d6e127b52ed78afa1b7ef15bdec114118f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/km/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/km/firefox-131.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f65e2c6b23754b54175e3b403ef1aaa0d86e7fe91807614caf10b24a5a7f2f0d"; + sha256 = "bae7a63f5b94f827abfe274026ad5410dea884ad7cf9ca768c7c4742a7c8f38f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/kn/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/kn/firefox-131.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "1e726b29828081df75bdfe48e1f882460387e4ca34e5075e2e5de311ce4225f6"; + sha256 = "8a3fec8a361e4f53df91a36cb21224ada7fabc71258849ec984cfa1f72598645"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ko/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ko/firefox-131.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e380cbebd8032d489257509ae3ead668bb622ba79964fe2e115774ab723c61d0"; + sha256 = "2bb0ecf8437409bcc55543269276d147059533703e75ee163fff317847c133f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/lij/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/lij/firefox-131.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2ff47a150def39612f0c17199ef4ee71b6e75072fd24da896099a83b5342d161"; + sha256 = "0f2dedf32734f4b0c635a1431380a76239eb1e1c143f52088dab1bdb5c5dac73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/lt/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/lt/firefox-131.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f4f9ef24a048a8d7d503080e007e7cae60b50cd3eafe10414e4915f9b50590a5"; + sha256 = "f02bc3969e126a27603ec1e5b28c6faa9c937c41fd87ab5120a1592a2d619fa5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/lv/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/lv/firefox-131.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1086b7a4d4aa0d85a11e83fda3250c21b0418f6760d6aff9091a853e36b14d1e"; + sha256 = "4391ef6457ae6e98368a8d2e2df159920bb0dff8be0c1187d1c73d1eaf53b90c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/mk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/mk/firefox-131.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "9da40a63e3d0839a5475e5d4b9471fe368850c782b5916ffa662c4503a5ab8c4"; + sha256 = "6a1a7cdc3935e06a0328b5275f53988acd7d87ae326c75c20e525fb1100144c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/mr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/mr/firefox-131.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "af6050c29664da52fcc95202aaf440706a0fd6607d8a51241310f2b06453670b"; + sha256 = "cbbd5bebcf46c689962c5a72a17ec5368f7a157fa25f0aeb12b407774d180806"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ms/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ms/firefox-131.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "225ad7c0161f93fed2a5ca86c7cacdc77175676f314280a2ce80a270cdb10364"; + sha256 = "d02ef946ab3953041a392d820f6bdd298198c6d22de0287b400459844e2fdf6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/my/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/my/firefox-131.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "8a124bda79de71bb3128c1614defb950a744d40271f01e7efdce96a248f3f3ed"; + sha256 = "b45dbeec1516896b9e5907dbb1bed8a5511490c0897379c1a5af8a1449ec2328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/nb-NO/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/nb-NO/firefox-131.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b8498c9fee3549d74a0de4145491aa722a25ce83e3f5c99f6964d545e59650d4"; + sha256 = "5f92f97ade31f4037a7075524bd85cd89c50d3509772302a5c7ef340d02396ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ne-NP/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ne-NP/firefox-131.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "393ddf518ac361e21a9f74b3f18f2521e113b628e60adaad02cd7c9534f706a1"; + sha256 = "c41f60083d56c8fe2ca59806ee409c004ac4f6483322918ef1b89a5951a20681"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/nl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/nl/firefox-131.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "8ee2329b09f50f7359954ac3dbf9cb6a98a038b0f23ac12f7bd57a65cb0e1671"; + sha256 = "a3db7e65ff3a835c05d0c5eefd3687e1530c202a71983b95e8630cfa84830d7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/nn-NO/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/nn-NO/firefox-131.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "744fee46ca52133338e2a2c91c40dde6b0f40aec7cc1a262f3865875d0f05395"; + sha256 = "35ee4826270682c72110740f885a5f9aca2d7493e9a4c11e4c9e8a941153f988"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/oc/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/oc/firefox-131.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d3225783ccc2aeeb037435b7340706bb423ccd6b46fc64f5dc2fe9c2b6c5475e"; + sha256 = "a54883fb3df19b3b43c83c7766da428969f7c5854d38487f8ff3631417ca67ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/pa-IN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/pa-IN/firefox-131.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a99e70e0abfc8b059a9d395110d52a42150d82fe34c99c8aa0883aad8894d608"; + sha256 = "85f7114a305787f4ae0560541cdb9c43a8020b442d78260665f2fefcc165020d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/pl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/pl/firefox-131.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d7736cd892696aff5ddbf288d2ad6497e717d6239075b6e1ef97e08abff79c5b"; + sha256 = "7bdf350ffc508334c773c88027bceed8aed7f2ebe7095d7aed8fb15136f8250a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/pt-BR/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/pt-BR/firefox-131.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "000690be0f8f09ab3a7f0416abf0526089592e1f7b7f405f0aa850836c0a5a29"; + sha256 = "e3bc372080adf7f311ce23c6957226b9b8b997bf836ca3643961172f4db775f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/pt-PT/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/pt-PT/firefox-131.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "eca4a2abe96623be899cf0c053c6f4f9fdb2c7bd2bf88b664eab9a515c6f7a25"; + sha256 = "68767d1baadc4f1ef7f9512d32e3d0b5c7c957d601a3feb35dd60cb6b9e03aa5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/rm/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/rm/firefox-131.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "0dc4c7990dbcf497e0b08992d4d7cd835bfbed0c8a780b8800c2e37be6f1a822"; + sha256 = "19533cfa2c200c063615bd8f37bbee176386e29ad600e31de401c3d11a89686e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ro/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ro/firefox-131.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "817b740000d2e63e559743e1beb1cdabda304c171a2a9fd4e189d5ae8a0a1ae4"; + sha256 = "c51110fd220b8dd1579955dd25dc7c3fa37d5a607394a8e353752d7635e93a8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ru/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ru/firefox-131.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f72f1d5c3941136825e0a396ba649101403ca6663f0222cd3e4f8cf73311b4ca"; + sha256 = "904956c953a448ab488275c1c29b663b7a21ed1fe57e83b70ca20cad32d16564"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sat/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/sat/firefox-131.0.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "f0b5ec8b2661d431c31ae7e365bdb058b6a2b461110ee1762570050a30efde06"; + sha256 = "7f291835df563dd0531411353ba52cbc695bc60ebefaf1ceed81ada42cbe8bb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sc/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/sc/firefox-131.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "af1698573ea3376f307f65d7f1f2209635c5cfb664bfda02f551cd32133b4469"; + sha256 = "77ccc26e54cfec33d0913cd8a761df49d968291400c16c29e96c39c4dfac5e85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sco/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/sco/firefox-131.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "fe91ca8ee0c532f8d385e7242d7ccfe9289ceb76076aaf250ab4134b112a3390"; + sha256 = "c382e40193be0361cfe245a8f833b4376f775e0aaf6aaadecd8f8061186db5a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/si/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/si/firefox-131.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "e878f39ec1636dc875ef010dd78d1ec4fe42cdeb4c529a71e54122b5ecbb6f90"; + sha256 = "0ff3338cef8108b68da7a877d1557b30d317dfb6fe38bd0f6be98eaf5fc5907d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/sk/firefox-131.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "0ee3cc503f07879b443922a364f2a54ae4a5ea645e75d498dd86d50689ea3c76"; + sha256 = "334ac54b662381df95c6abd5ff79933a1de5668cb9fbb5e127dce3279bdf8835"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/skr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/skr/firefox-131.0.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "f54927b3bf8e70326fbfb6279dee5e49c71c30b864398f18cbda9656af2ad14c"; + sha256 = "8f82cc7434a7c4b03a1cab1c7350d52a97191df1acb143e851b332a913355445"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/sl/firefox-131.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d6b2fbe32b3828abd3d500f1cf2bba7cc6b5a43e84ea10e51fd80689a1a1b82a"; + sha256 = "f0515b2d890c89d7ad662ca4a31d566e2a105a70de4304040b6143c1efbfdb4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/son/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/son/firefox-131.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "f165f02a2e6b3ad5dc0cee6423b99f3e39b9be404b8ab372ad7afe8fd0772154"; + sha256 = "1c5bbe37dffd1cf947d49556ab1364292228076d550a59bea4bd3c0679349223"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sq/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/sq/firefox-131.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "40cfd87b696bb431bf76345a15be0b91378e566a16d908bcd557e0411d6c583d"; + sha256 = "b9fc2a2ef9cb6d8f4f127892dbffcb509f364bb8cd57fa77ccbc8a8e89fffef5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/sr/firefox-131.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "595a89f6981f9a6cf9f84bc1f22da72dd0aa1d475c9f2c4cd81b07c74abab2c8"; + sha256 = "426dc93eb8ee7b97f30b5499536335a210614e446ba3dabd41f32891c5820785"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sv-SE/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/sv-SE/firefox-131.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "eeee44cf5a18f2b9eb40a06da9d9aece626652d54a0e238549a8312b8abde4be"; + sha256 = "905eed6e5c04c5b2b6397870f78ee934531753c4757dcfca9b8a41f9ae126cdf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/szl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/szl/firefox-131.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "9cd0e7ddb3a660a1807189a43d9dc8ed6752c24b983ffdf15455ebcc60e8c21b"; + sha256 = "3c4b7ff974100fb84e81c90de0c1f8a55befd8a2b679139b1850b3815fb5c052"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ta/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ta/firefox-131.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "6863e65e9428c0ff35ea602939732f858097502144f873ebb68ecd39cf129f49"; + sha256 = "e990210216baafa2cf5c1a395ce9b160d7be00907df0dbf24c751f0e29982359"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/te/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/te/firefox-131.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "1d3dc43fd6e0e728398941a8a0cdf568c43def57cd8ac33fefab7ecaf7838798"; + sha256 = "c3c3d2fb66b429bb893451d585588781ef7c0affa54d15d65b5ae1aa9f389871"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/tg/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/tg/firefox-131.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "93b1f1910585754378e8bc6b2e83db551ac9c3d4d58ebe35071409c16cdc6c83"; + sha256 = "caf1776c1234c3e9f6cdebd736cdeaa3cba9845f2c7d4c853c3ddd1633f4846f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/th/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/th/firefox-131.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c03cb0a9222d4f3eb307598bddfb87c99b702b65657a2d4e3fd8fd858fe75ae2"; + sha256 = "0d78523d823d766cec251d2000c873a11a99dcf74fa92c19754b1107f3e0f3fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/tl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/tl/firefox-131.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "e303cf1df617025f2afee55e75e3416edffc6bf01434dd877ffb73f22571c57d"; + sha256 = "e57a609c57c652abef1adb88bf3a08216ff39c20d092181d3e121b1d9de7e14c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/tr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/tr/firefox-131.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5fe53f7ad3b4555364d9ecd5a794bc5e6de01ec748e8551d9fcfa7d4a9eb7cb2"; + sha256 = "fe856dbc9c613c082ced57848bf42e32f26ea7d1ed83c5fb5c5bffc39d75c0d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/trs/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/trs/firefox-131.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a1383fbcb469c613c4db07598977aed4d2e72ef52d8a1cb332ce868d741c4e36"; + sha256 = "e80d41003ed574f5eb9ad4b002cef4714e53f2f1d9668c42acc2380689121ad1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/uk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/uk/firefox-131.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5849331f7b9a4463e637c5724e065e66adb40f8da2e06d6c68301c3b841a02d3"; + sha256 = "29d6d49bdc4c6245a2671517a35eac92b779a5a0327930ae74c005f16ffdad86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ur/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/ur/firefox-131.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "072e47775da45609663e64c424ecbb6da7237ce5137c31b3eb4839d3764d6f98"; + sha256 = "f55549d3e88defa2fbd36e8db24af4c8b7b71b64f8d5592cfe81b8e8f353e9ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/uz/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/uz/firefox-131.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "0c9087fcb14f3bf64aaa3c5fc1a6f743362a689425b00fe017d50820b2e89be1"; + sha256 = "cc9e7d5a228dde6ea65391b14393142914223b56e22fe972d17e75f66a487f17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/vi/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/vi/firefox-131.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "cda8eb64f5ecd7176bb6e4fc9b275504da6c0e56b3f4ddb24111df39867abdd7"; + sha256 = "f5eca75e5dfda2c66eed895e9d4ab457664a24c45303f97419aa00b67738616f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/xh/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/xh/firefox-131.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "49ba4199a22d86e654fa5e5a47474198d874ca17eb59a36bec6b732609aca223"; + sha256 = "b14003bae074c80ca541bdb5e7e41a1e3bce0d852aa9428857f5107a4618367a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/zh-CN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/zh-CN/firefox-131.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c21b6e85a22370f5d6a9b15597c90706e2d3b2efeb181077d7e2ce8ee3d4180e"; + sha256 = "c97d2837b587c95ec94053148f7d8dcff191650a29722df5e64f6cd79fe8b182"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/zh-TW/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-x86_64/zh-TW/firefox-131.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "4eefbada519857eef6a692fd4497b45bdd901daa66a308caf35a37367734a259"; + sha256 = "e458b9095394da982fbe6dd4f31b1062cfad583901e778e0c1fe23787d5e5860"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ach/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ach/firefox-131.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "dc6a9df80df27e8aa7ea4eedf5136e302a4189b98bf135942a4b6aa92b2008fe"; + sha256 = "83ba8fee02e95660a0ad6e07456868e4e066f9cebbd9537153c1f7039d16e3fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/af/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/af/firefox-131.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "e7537da17e34b3cfc95ced5c0b12982d1049403fab440f767768882f844064c5"; + sha256 = "521398ece32a30b965c33305aaf9d135108ab6869e317630bd31df9e96bfe62d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/an/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/an/firefox-131.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "909adef9469aaeb8978a2b2232aabd4fbae789a97c00088f1629bb191d0d9e5d"; + sha256 = "3924f628eb44a021252a3b4ac2b523813504e5d440dcd9f18e4ae92f65d4fffa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ar/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ar/firefox-131.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "3c4b8d7c26074573efce4952d3494c40d5f7632759008ca0623951934024e031"; + sha256 = "fd80dcb273fb5cb2d8676059c604c9cc4f25c635b2adc506546f8ad7ce5c119a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ast/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ast/firefox-131.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "029ce1a8dec7b14ca671b9267bef8f7300dcffe80472cd8856baa8af23f748f2"; + sha256 = "1c6d1d015b8a74331085e109bea804ffb74aac12d943fa1906fc1b6e61b565f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/az/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/az/firefox-131.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "ebf23eb5e9d0fd2a22d0a2c863f387a810a1e55355bbe9b0cbfcbd4183d6c848"; + sha256 = "017ed0050d8e3d2b365417d77c8ac908450c6ab5ac726e31201b391c61c8f861"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/be/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/be/firefox-131.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "1b7d5803e425cacfb185f78fca810b511150c7c8251216be9da86bb8bddeb4bf"; + sha256 = "f392d4425528b775ae0d70e0c8ce5046147f28dc2df1e3c6458f7f5260ebe610"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/bg/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/bg/firefox-131.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "27257813875b0684096f893360c5ac4efca419e41179537548c45c64ee93b50d"; + sha256 = "6b9d732d27be5bef6ec372f8429e3ea45f417e35760a9bc902cd54ab834e01c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/bn/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/bn/firefox-131.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "432f4822ed86bc232200bf8feb44e76cf4ce0625424f06bbf4b5836890290c2c"; + sha256 = "7c10b98aa56a807a83b9f7b6c4981f4ed3346861d6771b43bb3862bf04d20945"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/br/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/br/firefox-131.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "72518fd9b89a9d362d6106d01e4cb9f65e94b29ad5d4935fe272c0d5fac7a697"; + sha256 = "c1d6762c815a5e2bfa467e3745957f47059903a0aa35cf01d55a79096024c023"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/bs/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/bs/firefox-131.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "9dabbbda2331c8b264bc8fa1a4f87086ea507905a51bb13a196f255faad17d99"; + sha256 = "a00960745ee1c41d3f19deb9661ca39667e4f4ca03d46cfe34d64452fbb59020"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ca-valencia/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ca-valencia/firefox-131.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ea89121b4e5192712e9a67186666b564ab8ddd3f9cac1d7797692c6cea33823f"; + sha256 = "54941df90c607ab8b26bd552898495d77929fb56f2d4cfd95ca3181f54368c0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ca/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ca/firefox-131.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1a62a13309cf8c9fb3acf9c30e6ffb21af0e7942a52b9e90bc13b135ff89196f"; + sha256 = "dc90165a2292dd67f6aa6cc220081a1d50ab3b833862083526784c5fff86e487"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/cak/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/cak/firefox-131.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "b452a278dad279ba9075e955718194e58b90eec80edf98e9f9f3ad12ecc15472"; + sha256 = "074ce8c8bacd04d6bc9d3fdbb168e0d7a55db9c262c8a203344dc0fc6a487e7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/cs/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/cs/firefox-131.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5796ed1a488413e00b7895ffbf13e9882a245c883c4adc1bf0cc97e3619aec66"; + sha256 = "4a4ba7a9383e9d6e5c315215bbf5993a5457a0d09957eee4939f4d9eeca4076e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/cy/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/cy/firefox-131.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "533cfc7830ef37ca6540f7ab2fdf7909d871a3155c348fc5e051330ffb0a6dc9"; + sha256 = "8080d000239021410eabda919bf652bf45f53604dfa4c99cc0e61569f58a6087"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/da/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/da/firefox-131.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "8bccc19dd59cc059ccb19d94b302fa8230443cb1930919a984919870b7f99398"; + sha256 = "9b87cfcbc140b0c12f1ecd99c42631bc27973789ccdc38fe964e17364a9e05d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/de/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/de/firefox-131.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "d964fe752283018bab7e8cfdb9c8d4adc2b38688ba5a194d75c6e353ae4d4d39"; + sha256 = "88b046d3a3816677840720f5dc2147fc4bb2b897bf83156a024ab1b26a56ff2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/dsb/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/dsb/firefox-131.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "725ae61a6743e82b835f2a0b103d2d345aa2d3f72b3fd7ee45424ef14e8e4190"; + sha256 = "b6739f5b999318b16cfac3f532ada04cac675df5e9e8899ac9160cb5d6767f72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/el/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/el/firefox-131.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "52762372928f56005624e9f2042469e83032632dd151f831478c773deaf48111"; + sha256 = "2a9671f3264e4329038636833a1bf7f1a51afa41c67077b68f7e565b7001e63f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/en-CA/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/en-CA/firefox-131.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "50621060f246bcd1e3f2e7de5e941bae17dfafdd4be01bb431245e40fcd4701a"; + sha256 = "dbc4f976e12495215eb18bdaa7539dabcadf4d2a8970ad67dc998c581d93da63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/en-GB/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/en-GB/firefox-131.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "207693709a20933c38aecbbb2721a52bda39213b656f12e614368d22cf8f1bd1"; + sha256 = "6543475d273b76a676c18b87cc4082b38230ea90730d6c46e3e5d185555571ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/en-US/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/en-US/firefox-131.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "10b24f1717a0ec5d8fd450740d948a157f6075bd07909b1d8a43aff7753c0bed"; + sha256 = "a7cc3e751bba91c17e72ff89b1df38c48b70ba7bf27059e96a776b2a7b10be90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/eo/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/eo/firefox-131.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "1a2c610a8d327840af2c8363832b691067b15568ffb9f0907331f22dd17b807b"; + sha256 = "48f3ad261441e32544c19bc950f653da07c05f5c10482e0782b6c4fa53364a0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/es-AR/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/es-AR/firefox-131.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "81de656e08edaf8527c00d925e7dcd9ad916938fc20e32e007763763b6e67b5a"; + sha256 = "459f3832fe806137f61ac38bb9aef32bf066ae6019c352bd4741a0a0639e4386"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/es-CL/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/es-CL/firefox-131.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "6f262b62d9cfbb5d451d3cb40589c3ed069953e710e098d5fe2566e3c594a393"; + sha256 = "2acbf635708fd4d9d32c5b31ff6945112c9a818b2b6c84757741756ed5bd7bf5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/es-ES/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/es-ES/firefox-131.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6fbe8832a1475407c37c44d097e530d03e0572c177366d79b9336f199445e679"; + sha256 = "aa3e5b3f4562f1dcf0fd5bd8c89baffd4b58772451aaf84251db5fa7f211f74d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/es-MX/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/es-MX/firefox-131.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e559bcb6185d89502ac9e71a91f2e770be61cb67fa9957a097891ca6fe44a2f8"; + sha256 = "6e57f48f027bbbe7981e973bed22f751f4b6490b7db390b4b2ac571fa66971fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/et/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/et/firefox-131.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "472fa478b66f587f80d7dd51d40fd1ee54ef537cdf23fc92427c1c79a6452883"; + sha256 = "68b1a58660a2805e682e9ddd2a89ac0d6f60147d08c780f867275c0cc7bf69f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/eu/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/eu/firefox-131.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "fd8579deb8e1da9ecf3f812b2d5f00e507090e60c802bf77257f2281802ebf6a"; + sha256 = "de410d170095aac2aa208ae58f649da4a6ef92455b72827ab048310377574fd3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fa/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/fa/firefox-131.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "bd65e4309b0db9bf919bea27487033573c5dda66fb62f2520688f449fb57e9d1"; + sha256 = "7cc566821f0405d46821d105a8fbc8cb243aab46cb303d0e9f01d8c623c2834f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ff/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ff/firefox-131.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "83c3edd356c40dc3cd52338a4ee32ea6e729758bff03ca2e4e2bd2d4aba3467f"; + sha256 = "8e8a1f7d3aebfb25d8a6119dd42aef27c488fb73bbc10ea6a071687eac8314af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fi/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/fi/firefox-131.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "a179eadac35870ca98fe9bf16fff611efb8c62c0eb7091e1d55e5b8b9fdf4337"; + sha256 = "18af8487bc33f9f9729596d1f5704aabb9fadc39e6251c69a4859a87f17c0757"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/fr/firefox-131.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bc01513651247d50e3ae065e9ac3693d0e25ea10b00dbaaef09424b46ca843b1"; + sha256 = "410459a59a30ce239f8a62dd1413009031368e06b2f1365689a4df47da01d022"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fur/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/fur/firefox-131.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "b7dc66967c52c1cf817859110c1d15958787ddd8e0aef1ea46ae70c87167b7fb"; + sha256 = "29c4220b2f822554be9139ab56aaada57de6885d408cbe9d51eb8450bc3e11e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fy-NL/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/fy-NL/firefox-131.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "cc942b523199e81b5574b1a972fdc9cce2ec73bbf1efd88366aa6ace3c9e409c"; + sha256 = "8c062382c3a6a2c6227c63ce0091c86e784e38d1e580e413b526bfa2775ebcc1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ga-IE/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ga-IE/firefox-131.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0efb2225b65df3640a690c6ca9e8d1c817b248b1ef0af8afe9175b4716b60215"; + sha256 = "c2409a66e16cca2311e4cf5d5413c9ebc9de739ec2e31fe7209caa5a1bc553a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/gd/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/gd/firefox-131.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "15c9fea41632fd61e083d75538a76afe98ba09202ccbef44a9c1951fb99b1bb3"; + sha256 = "722998440e0fd75924c3e9acc287de9c9b7cd47f771f0026afbeecac53a8ef21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/gl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/gl/firefox-131.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "3e4f7dc67a9981c80859286c7f94da6b56e882d1706e1e6e56b97fc855b60891"; + sha256 = "998cf6c3087b4e1f3db8a32c033cf5cfc0fc5c035e997e22ef2a2d25dda5a150"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/gn/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/gn/firefox-131.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "99ba85209d17c203fd51107249603e4a79a547da06fda6eb19a387e0ef41e93e"; + sha256 = "eb2fa6461477e3bb68cc778c78517523ffc032a63ad7d90eb604e6aa92203fa8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/gu-IN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/gu-IN/firefox-131.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "912873aa4a734f25ca1f0aca946713a53c1c01b093b12d722fde673cc53c66b5"; + sha256 = "3203cea87f755aa28a1e443b62aed7d4be36307cdbb33b848a9d2dbd5367a56e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/he/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/he/firefox-131.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "21ce37a70f0ace5d15334e64633282f664161d58deb315ac48749cebab58a064"; + sha256 = "f58019e1f1f35fe219ff60fa77bd92103ea10caa0ce00f9f1ea7068c17f7d9e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hi-IN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/hi-IN/firefox-131.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "dc700ef62e264d0c493fe1ed6ff8d77672baca2bac5314e85dfb4ead137f09d6"; + sha256 = "0add549f900a133463ae2e5dc9238998ae4f3ad79ceee00819a1544d4edb5db9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/hr/firefox-131.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "2f23713521bf0e9ae4eea5e38ef653d6c16400d70979b648b23c7e913847380a"; + sha256 = "24d09424247be0b9a033e1b7cf53d3a207088a147c9245e1c6fbade572e8abc5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hsb/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/hsb/firefox-131.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "51436bdc094c6fa921e0f778cb5f4bfc866e7b6d25e76e096bd08d469e6d79cb"; + sha256 = "59aeffafaa7360f49a4b5a1ac85469ce95134539c5739c3cf910c25283bd5be3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hu/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/hu/firefox-131.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "3ad2f8847414dc2ed8b6c1016ffbbf50ade5d45a19a7a6e2b4d9e39a63f65610"; + sha256 = "2da80cff3c8f2b2c77e12e63fc0859a7c60a0444531ac484aafa4d4f33d7de29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hy-AM/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/hy-AM/firefox-131.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "ee64c6125a882e8f302162a2e08694b2ca95de1290b5b55e534887e6f50715d2"; + sha256 = "f5a18ec68bfe50836ec99be8c06f31b19fe320a2c3212b436a5f88a6482b8b25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ia/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ia/firefox-131.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "f9f2581bb3ec84ca3b0d8b1881fff420fece9fb9030afe4903e5984901223197"; + sha256 = "5dd21bc4afeefda95933a23d5dbd211374b94eef30bb30e06d1a4536c9474811"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/id/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/id/firefox-131.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b01e61576471d473b052ae2f20c29b4966169735b0096d9703fc905768ea2531"; + sha256 = "07e1171d55b74c9ed72578d3cf7c9647c15603467214b476b78c4cb8ac230e4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/is/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/is/firefox-131.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "7623c5cfececf30dc458b9255dcd5da7542c88a0e8a326958d9d61c107af41c9"; + sha256 = "60ab3d8c14812a70fd37324446df565fc667c72e6cf1dedc9feff208c244f321"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/it/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/it/firefox-131.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0003e065feab434db52441bb82c6f0e6d626e1040db41a289668866b58702a46"; + sha256 = "208ed3506b64c2330354ad0454cc6293180d4e3673a0b9600411f797184a357f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ja/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ja/firefox-131.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "8fa4cad993cb27a46c79359cc1670217ad8400731cc27ce7f537ec90b4ffe463"; + sha256 = "fe2d750e42d22ff39479cb56d0165bcb1b3f7d1d3ef61ee05f821ac639c1e7af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ka/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ka/firefox-131.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "7a939879bad4101419e50ae9611ed0efe5797917815324fc1593f94a5b714f1d"; + sha256 = "55bf8f71a339ca05f631db4c407e566ce3406e1f365b3cee17b8b0445818f62e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/kab/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/kab/firefox-131.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a4a5f2844042d923840b8b1b8602aef4473aa3a1e428ae59724d8fd66a68506d"; + sha256 = "36dba89b95b919a62ca6deda0a94a67d9d6ccf693628a900739e05061eee7b92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/kk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/kk/firefox-131.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a543bb171815a378a494f0fb073506c11eeaed9d146be4a4893c908d75a233f4"; + sha256 = "7ee06218eb0dab593425c3832747025f84cf114feaa5afe0a869b2f304bfdfe0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/km/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/km/firefox-131.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "9ff3c92904daa9ffac0b482ff1d3e06fa338fa50bdb0300cdae5ca3df00f0fd1"; + sha256 = "f5f781b13b5e1bc7ad92fb27d972d7b1787dc2f9d5bbf791a26699dce227450e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/kn/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/kn/firefox-131.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "a584cf1df366a71f91ff04d8d4fd32f66b185387484b351b700017df8e07d5f5"; + sha256 = "725f60ccabc19ef7f79517ff29604dbe1a13c649b4b6a684da4a8f2b38c6ec95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ko/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ko/firefox-131.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "0bfd51544f5a9270d2538aff828d597f5a7ed94ce68daa11a0a008aea48f000e"; + sha256 = "bcc1c2e460b7bf4c3d93bbf7cde52e9d04d0caad8881343e6d1ecdec46b0d698"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/lij/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/lij/firefox-131.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "97e9897b42d43d583066c3874547337c812af1d1174fe138e3690b9fc9fe9dfe"; + sha256 = "0b27c55d3e156a906f5ad60a3888deeb3bc9398736055b35d40cb07474d456b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/lt/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/lt/firefox-131.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a32276d1a6a65974ec7119e9a0e27904f2d6faec540444d85b7cd1961635ac0d"; + sha256 = "626e768087e0022719b8c93b2ca10cf82c18589460e9d872354cd5c66c7fbc30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/lv/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/lv/firefox-131.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "26b6e1a90c153e72485555ba26732c01a4a5370f189dc76408f4bd782630b611"; + sha256 = "2e9a55e044378957f3dbfd9221fa0a50fed95e94c2527659d5143a84eea54015"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/mk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/mk/firefox-131.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "9cd76a0b51d553f5363d368c4a8bd569c3f31e9fe53ea581fe5d477a3e2bb5a1"; + sha256 = "64d2eebd96481291a1c9d65f3a55d488abff13a39a23616e25bc6cac942b4061"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/mr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/mr/firefox-131.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "dbf225cea7dd46225862dafea1528ebf9af4a0c1c4376fd0286c388f93a9bb30"; + sha256 = "262d9e221a4d29365998dd50450fae04b5b18dd90b71509f5a1c50c59eb53de1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ms/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ms/firefox-131.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "beb734692ef042eaae17eb7c64a44c661a903874056d2a755caa048f3e46582f"; + sha256 = "11d89bf414498cdddb182a518451af7abf8ca2152163b0e0eefb9ae65154aec5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/my/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/my/firefox-131.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "55381b086e360f443db378432c93a48da06c969d78fbffe3a22b561b65a5697b"; + sha256 = "289a37c7ca53552b1cfe7b90505455b38e5b3e7d1eb46e5d1d85ee4a8fe61045"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/nb-NO/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/nb-NO/firefox-131.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "652a27817bcf35537e30e642517c6b9f279fbb182bbfe0e1f3f2e7abce51dc80"; + sha256 = "0d79fba27168c2ad413365baa7e73dfa55946f3b5866f52df6ebbf34b7237d97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ne-NP/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ne-NP/firefox-131.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "cfde01a7c01ec8db923145faa1e84b521bdfd9edf9434602152aa6bc92e6b775"; + sha256 = "a8ef15d05d244fe0c17095001f73ecb5caf0da8e2e04df12a14b4d7aa82020e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/nl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/nl/firefox-131.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "c58291b410032f9dcece60a26740cec4189c807c6239d91eb01eccd0a769be65"; + sha256 = "7e9c9eef46135db2dc4db3cdaccf37284de0e056674b8c16372ba1282cb4e902"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/nn-NO/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/nn-NO/firefox-131.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "0e49abf506436444071eb4d9af919f36e93a2313e94409e505f2e2c102162e50"; + sha256 = "7857a5af826dc219b952c0d810ada22737ec5e6fa40c059497a3eba3464621bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/oc/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/oc/firefox-131.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "2e2eb99dff764537ebe36e47a0f161d343011f95075fef31e09d179ab821dfba"; + sha256 = "429d710a49d9177bd797f07668fb421133d09c47496790efbd37cd3e247c2a66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/pa-IN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/pa-IN/firefox-131.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d4480f5c7db7bf91ee783f5e5d35cf39168171549178e84b132c7d620027350c"; + sha256 = "bb8da6c0f3745556044a19592203a920e794a58ef19e482be11ff80dc9039060"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/pl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/pl/firefox-131.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5ad811e583c96a994813635cd24ff3dd9255509a313c4d12655038f913ff1542"; + sha256 = "bcf5c54d77b222c24abbe6772303a7efb32669a8d02bd3946b941443f287ccae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/pt-BR/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/pt-BR/firefox-131.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9ffa73a862da1ea7c9ff6f92311db599f3fa3cddbbb80f6170e9921e203f0019"; + sha256 = "270e2d32a46eaf38d1cb54735dd2638e0daecc91f340888c05bb2cea1546e372"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/pt-PT/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/pt-PT/firefox-131.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a0a91a30752179b0a47589e15542559b3e7aadd4d80c7ac235772b7a2b475c11"; + sha256 = "05ccb4ade03ad2423e37d43d893095fdea237976f0f0b05cbc2618f71d45a001"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/rm/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/rm/firefox-131.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "dce6ad38b33d3d09627b940695fe09990dafed4014609d72ccccbb5ebf933f46"; + sha256 = "6ed0abb3c7ef0a70d38eeb2fac2c5a696d8ced9ff012e9e7d0a7e0f302ab070c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ro/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ro/firefox-131.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "17a41544e81ca30f8343767de18289ffa2d8a5ba0f5baf56c1604db51d890420"; + sha256 = "7a32973c56d5da861646ef3027f23f5b100f58c44aff0973353fb636c4daca2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ru/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ru/firefox-131.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "62cc7f609a793f44de5ef69c4128f85fc8529a202dff06d2e13de7dba78792eb"; + sha256 = "6a65a50ac05ad6d2a3db84870bedf317703b7997da9cb49007b117d3bc8550e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sat/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/sat/firefox-131.0.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "40d4987233506205ba542f34f548db58277811538d11cb5a9abe1ce190fcc56e"; + sha256 = "af517a95ed0aa06bab8801faed62fe6c8b51f9092f9e9090ef13f498bd9a8c75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sc/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/sc/firefox-131.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "d866b09ab322517304ebd2dc3d3d3a74d0747577ed358dfdb63629c783248192"; + sha256 = "a18a4ec67b378b13da669bd85dc952a6fa6924dcb8c095f5341f873719688700"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sco/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/sco/firefox-131.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "6e4492fd8138e436d6f7fefd9718a0a3cfd9eb6e6d82420b00567d133273c1ae"; + sha256 = "5fa7e2de0dae283a5e9b1d1f8d70c51c31620f5ba603aa8d2e901cd3511b3886"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/si/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/si/firefox-131.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "7ee7f72dcabe2ca171fa940b236fe3000d989a506eb04c780137c403bed53f21"; + sha256 = "a33336c5002776b0ab28e4e6e7345578e3bea7ab56688f03f55647fe8e7bd723"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/sk/firefox-131.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4d4c2c45efa3aa54b5ec6e137f0fb8b92059f5c7eae3ee5b56a857e093ed816d"; + sha256 = "fd3e8a086d0706adf6db3b4b1e5026e3e6a83afc691d3ba251f8ea6720e6a3f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/skr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/skr/firefox-131.0.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "cfe7864e3d2b2a621f42784ca5d8be3414e757c56e401a687fb32a6be6180c09"; + sha256 = "06e96322334a8df2a3739772ebc81a4bc1789a2d603d2413582917e91c6f3495"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/sl/firefox-131.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "73af554b3cd3e2782c56df579b5254c0658895cf5c3e6e5c18f9911047cc45d7"; + sha256 = "7e9fd7510407060b6def90213e910c2c20e00481529ac830bf4d721c29277188"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/son/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/son/firefox-131.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "1e67654241341f4fa4092737183ed0c16affdcf9612a068a89f55497d05c17fd"; + sha256 = "80b150886b7c4a9d3446e95ca72da53de964a582a398438cf216b7a8e1b0b220"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sq/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/sq/firefox-131.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b9325457af48f36bb3cc1521e64add9524c95010e6fc44a7976170b5efd5fa71"; + sha256 = "c31aec576632d56988af5b8131ac5ed03f87d625f5d8c4ab6a5577c731cd34ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/sr/firefox-131.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2e107a9e262256947ec2864bcd02b9a479de4b5fbb29ca4e978feb54fb515470"; + sha256 = "8353aca1dcc8ff255f522e4e2d75dbb49b88515f2cf5232e0f4bec0f3f41e11b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sv-SE/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/sv-SE/firefox-131.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "91d8e8092ee35a790778a8ff8f89c12fda000ada0b27476de2ec5b9f7dc6ebe1"; + sha256 = "3a4d6c3ed47b0462656be24dfa63cae290b8e431eeadab4f8b79c39c73b6057e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/szl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/szl/firefox-131.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a929fa6e7742ed2e37dc86162f6982c32e99487fd7763e56a17736ea3e390256"; + sha256 = "3e01f04a7aa1b499dc1501ab94e72fb28e0b43ca8dbec281fdae5d51ad51afe5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ta/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ta/firefox-131.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "b7af5e9cf3240b6a30da249c2d0209907cce342c0f48d433ec8ff9cf72c3d468"; + sha256 = "3497d024c31681b9cc8c63991bd2c56b7725511f62d19c254045c0fae4727363"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/te/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/te/firefox-131.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "d9ced92020305d6a641ca6190bfc808bd83e8cd43decfa49f22c1fb03f4a7861"; + sha256 = "b0de9d80858ef7fadbea770071521690d62566651afd4d31443511904ad4bc09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/tg/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/tg/firefox-131.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "7ea19763f02ce91015f3701d3ea7fcc4e1a1f22743c035a8bc6beae2f9b5bbaf"; + sha256 = "9c5647246fbb4b8b33bc8254ac4f4241f718e33c0b1ea2d342eb565bdc978ab6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/th/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/th/firefox-131.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b8e82d0d1e810e3c6dce35cdde6b38e2b8187bbe2d8edb4281088bfa74b197f8"; + sha256 = "f3fe34265c98836738f1efe2fe722956518cd2688656839c77ecdd03df24bb00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/tl/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/tl/firefox-131.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "a7d0fd082f86b21267f82ef068d2965f090d6c050243f94c28c812cf3052f3fd"; + sha256 = "517933b38b7c68a39294dd3cd0c3694ea8064c890065d47de1f5e4014d7a43e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/tr/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/tr/firefox-131.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "cde9e1a2ab04e9bdc2d72ca6f69abeb3b5838d85e81aa58d1fc766c0b4de9f16"; + sha256 = "4f4b473e0f2f7ecc75da6d45c4d56d1ae289e833adc4a4a430c87f9e53795f40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/trs/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/trs/firefox-131.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "344c0f7dfe6fbc08cb7c9008b148c78f1fd04c35411b7a6530526a2b2285c683"; + sha256 = "fd55e24f139f5835dcab9ccf155b4fe41117eec466f3d29ec589ee8b54905f06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/uk/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/uk/firefox-131.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "3bd0777c7028bb9bfd891afd60238777c073c27c60229183b8dc003bed50ed3f"; + sha256 = "a1f86b3c2156995d95fa067011fbdfd29f600691cc1ba441316b5359c601ce9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ur/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/ur/firefox-131.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "afeba739025b7dd656ca6f68fce268efac3c6e0bd7cc47ab6f62d95dfbd7a3a4"; + sha256 = "2806785190413b23624b277828d9f059a7522fccfef6000be8377db85d649aec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/uz/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/uz/firefox-131.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4a068543bb839af64e3fccd5e299d5ae01033ac0b6617fad7749088b59fbd166"; + sha256 = "903740e232e85385bc5843a09d0a3cd1d5cf5375a3049de7194d9106406a3e1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/vi/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/vi/firefox-131.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "5f1b0a92d3504db44f5a9727b6e899bc0866cb96959e9d4a051016cf0b38249a"; + sha256 = "783eb539fbd0d4be1cd6fc194ceaa979e0f99555b07139ff24fabf4f6920c839"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/xh/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/xh/firefox-131.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "98bb156006acb8953ef64da46b20ae7c599338900124ce8becc352f42a763cc5"; + sha256 = "1b65fa5e41797446f47de7f5f7c7e205c5bbf7528f365b193861de051df97947"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/zh-CN/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/zh-CN/firefox-131.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "120ae812950335df8bbab9864d9938d83834fc81b38f9d49d12f66e173255969"; + sha256 = "0a22d85fd7f932d3959ee475cccaf8e3dc9625c5f1677fc7c5c40d262605890a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/zh-TW/firefox-129.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0/linux-i686/zh-TW/firefox-131.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e8b4fafa98e812b0f483a861ac175be2324773cb91c2abe9f724d78596ebb17e"; + sha256 = "0425c6cb289e0a77ee4ebb03068c8991430d356747a927f8adfcd074ea8702af"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 593a642c8652a..0e1c6241aae41 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -12,6 +12,7 @@ , baseName ? "firefox" , basePath ? "pkgs/applications/networking/browsers/firefox-bin" , baseUrl +, versionSuffix ? "" }: let @@ -47,7 +48,7 @@ in writeScript "update-${pname}" '' grep "^[0-9]" | \ sort --version-sort | \ grep -v "funnelcake" | \ - grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${lib.optionalString (!isBeta) "grep -v \"b\" |"} \ + grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | ${lib.optionalString (!isBeta) "grep -v \"b\" |"} \ tail -1` curl --silent -o $HOME/shasums "$url$version/SHA256SUMS" diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 15d958a3607f1..77e020ff0cea6 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -94,20 +94,20 @@ in , debugBuild ? false # On 32bit platforms, we disable adding "-g" for easier linking. -, enableDebugSymbols ? !stdenv.is32bit +, enableDebugSymbols ? !stdenv.hostPlatform.is32bit ## optional libraries -, alsaSupport ? stdenv.isLinux, alsa-lib +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib , ffmpegSupport ? true , gssSupport ? true, libkrb5 -, jackSupport ? stdenv.isLinux, libjack2 +, jackSupport ? stdenv.hostPlatform.isLinux, libjack2 , jemallocSupport ? !stdenv.hostPlatform.isMusl, jemalloc -, ltoSupport ? (stdenv.isLinux && stdenv.is64bit && !stdenv.hostPlatform.isRiscV), overrideCC, buildPackages -, pgoSupport ? (stdenv.isLinux && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run +, ltoSupport ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isRiscV), overrideCC, buildPackages +, pgoSupport ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run , pipewireSupport ? waylandSupport && webrtcSupport -, pulseaudioSupport ? stdenv.isLinux, libpulseaudio -, sndioSupport ? stdenv.isLinux, sndio +, pulseaudioSupport ? stdenv.hostPlatform.isLinux, libpulseaudio +, sndioSupport ? stdenv.hostPlatform.isLinux, sndio , waylandSupport ? true, libxkbcommon, libdrm ## privacy-related options @@ -237,7 +237,7 @@ buildStdenv.mkDerivation { patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ] ++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ] ++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ] - ++ lib.optionals (lib.versionOlder version "131") [ + ++ lib.optionals (lib.versionOlder version "128.2" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [ (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1912663 name = "cbindgen-0.27.0-compat.patch"; @@ -245,24 +245,6 @@ buildStdenv.mkDerivation { hash = "sha256-MqgWHgbDedVzDOqY2/fvCCp+bGwFBHqmaJLi/mllZug="; }) ] - ++ lib.optionals (lib.versionOlder version "130" && lib.versionAtLeast version "128") [ - # https://bugzilla.mozilla.org/show_bug.cgi?id=1898476 - (fetchpatch { - name = "mozbz-1898476-1.patch"; - url = "https://hg.mozilla.org/mozilla-central/raw-rev/f9323daf7abe"; - hash = "sha256-fvIowXJLWnm16LeiSz6EasGypTi1ilG+s/T6+lNLbMQ="; - }) - (fetchpatch { - name = "mozbz-1898476-2.patch"; - url = "https://hg.mozilla.org/mozilla-central/raw-rev/a264ff9e9f6f"; - hash = "sha256-9vkI/Ho4BXvLnoRGdfTzUODcIlA6K3RjbdhZjb/LEz0="; - }) - (fetchpatch { - name = "mozbz-1898476-3.patch"; - url = "https://hg.mozilla.org/mozilla-central/raw-rev/eb230ecdf8eb"; - hash = "sha256-IaLltxf5W1WEzxvbi10wphqXVQPtBiLc2zlk38CIiz4="; - }) - ] ++ lib.optionals (lib.versionOlder version "122") [ ./bindgen-0.64-clang-18.patch ] ++ lib.optionals (lib.versionOlder version "123") [ (fetchpatch { @@ -381,7 +363,7 @@ buildStdenv.mkDerivation { # please get your own set of keys at https://location.services.mozilla.com/api. echo "dfd7836c-d458-4917-98bb-421c82d3c8a0" > $TMPDIR/mls-api-key configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key") - '' + lib.optionalString (enableOfficialBranding && !stdenv.is32bit) '' + '' + lib.optionalString (enableOfficialBranding && !stdenv.hostPlatform.is32bit) '' export MOZILLA_OFFICIAL=1 '' + lib.optionalString (!requireSigning) '' export MOZ_REQUIRE_SIGNING= @@ -424,7 +406,7 @@ buildStdenv.mkDerivation { ] # elf-hack is broken when using clang+lld: # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" + ++ lib.optional (ltoSupport && (buildStdenv.hostPlatform.isAarch32 || buildStdenv.hostPlatform.isi686 || buildStdenv.hostPlatform.isx86_64)) "--disable-elf-hack" ++ lib.optional (!drmSupport) "--disable-eme" ++ lib.optional (allowAddonSideload) "--allow-addon-sideload" ++ [ @@ -442,7 +424,7 @@ buildStdenv.mkDerivation { (if debugBuild then "--enable-profiling" else "--enable-optimize") # --enable-release adds -ffunction-sections & LTO that require a big amount # of RAM, and the 32-bit memory space cannot handle that linking - (enableFeature (!debugBuild && !stdenv.is32bit) "release") + (enableFeature (!debugBuild && !stdenv.hostPlatform.is32bit) "release") (enableFeature enableDebugSymbols "debug-symbols") ] ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ] @@ -558,7 +540,7 @@ buildStdenv.mkDerivation { install -Dvm644 ${distributionIni} $out/lib/${binaryName}/distribution/distribution.ini install -Dvm644 ${defaultPrefsFile} $out/lib/${binaryName}/browser/defaults/preferences/nixos-default-prefs.js - '' + lib.optionalString buildStdenv.isLinux '' + '' + lib.optionalString buildStdenv.hostPlatform.isLinux '' # Remove SDK cruft. FIXME: move to a separate output? rm -rf $out/share/idl $out/include $out/lib/${binaryName}-devel-* diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 3e620b946b7bd..d6ec46a37fba5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -5,10 +5,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "129.0.2"; + version = "131.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "f6805a87e5cb4e437583916e3ec1b312dc73eec5fc06ce7a038b13bd7c6827b18cf383c30645d96623ce41675351f3023ec6b9f89d676f1c889994eae79f2c13"; + sha512 = "324cbaadff4d19a18d56ca01ae7212ac8362e3f5933f3017a19b64c35d58606ace8bba3672790ecb48d4a849619cdc95701440701725e8eb2859d55f1e8d8e3c"; }; extraPatches = [ @@ -35,11 +35,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "130.0b2"; + version = "131.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "bfba17643923ec10686df7d0047e0fcba7716f96a645722869cc472f68bb42415e63ce37905a7d41f1bb3aa139ee7d336ac838bbbff105b3785eb522ebcb7eb0"; + sha512 = "043f983a295fa27d3641f6db231da2e3a88d43609f9c1f4fbd0d98356ab902e802b20a81ae8bbf3812d8ae6776fd6ea557f19cc083f09aae42b8cd98424430dc"; }; meta = { @@ -64,13 +64,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "130.0b2"; + version = "131.0b9"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "ef26fa3dad6fdafe8e8e2d9d88101b75244b3f21a499d0b61c4a2c9a0addbcd3184274096a34da958b0ab2489ecf6c3d7684a1f507ed687648b96f9e9e2b123c"; + sha512 = "f1f56bd121ecdf1f659ce85ea77a9b1abe983583081f6cadaaf4c57695148b481eed1ecfa7ac2d3449fbc1a0c8560a8a5665e309722a5fc5455df740cf639989"; }; meta = { @@ -96,10 +96,10 @@ firefox-esr-128 = buildMozillaMach rec { pname = "firefox"; - version = "128.1.0esr"; + version = "128.3.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "8055a7f83acf0cab6124ba5809aff1c082e81a0d30ff318ec719f8fd3f4af9aa60e2094c1abd6c981193d751075a9569370176e20e50f3c1959fe27a15511388"; + sha512 = "3c6ef272c0fb653d030fe3f7f72aa0e1097b1c6759556166815cde15465330f988b3bc23df4b4eb753daee930edbb1ef72145273cb29d0952bd9d7c547050f9b"; }; meta = { @@ -125,11 +125,11 @@ firefox-esr-115 = (buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.14.0esr"; + version = "115.16.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "dd40c1fd3cf454dbf33a85d38e47bb0e736ed89b829643653e239f43232441f4e9f3c7876f058ff2e6f19daf2b50a8f2d13274e9a107d8a258a6067d1fc43f54"; + sha512 = "b6f93ec3d6acac5df177253c65b833c017e65ed6e78e96ff029098443928d291f6f67164aedb83d80aa28ee9dee305086597798238d3330e35183030e53e3550"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index bbc88581e1e56..5cd1246531008 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -50,7 +50,7 @@ let # https://mozilla.github.io/policy-templates/ , extraPolicies ? {} , extraPoliciesFiles ? [] - , libName ? browser.libName or "firefox" # Important for tor package or the like + , libName ? browser.libName or applicationName # Important for tor package or the like , nixExtensions ? null }: @@ -86,7 +86,7 @@ let else []) ); - libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] + libs = lib.optionals stdenv.hostPlatform.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport libkrb5 diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 4bf93acdac26e..eef6c3a2abfc8 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -2,16 +2,14 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, buildMozillaMach, nixosTests, - python311, }: ( (buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.17.7"; + packageVersion = "11.18.1"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -19,14 +17,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "128.2.0"; + version = "128.3.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-IAzPt696AWBEyfxR5U5/Isd6urPoi3fHshT+Fl+o/Bg="; + hash = "sha256-w7b3s8/ekDzGbjbdqK/9W9S5e79fbE9ftJkSsz2sQtA="; }; extraConfigureFlags = [ diff --git a/pkgs/applications/networking/browsers/kristall/default.nix b/pkgs/applications/networking/browsers/kristall/default.nix index 3515f0e30e01d..f228c97306840 100644 --- a/pkgs/applications/networking/browsers/kristall/default.nix +++ b/pkgs/applications/networking/browsers/kristall/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { qmakeFlags = [ "src/kristall.pro" ]; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications mv kristall.app $out/Applications '' else '' diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 2c610945e3964..60157ca262826 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,9 +10,9 @@ , cmake , ninja , pkg-config +, curl , libavif , libjxl -, libtiff , libwebp , libxcrypt , python3 @@ -58,13 +58,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-08-12"; + version = "0-unstable-2024-09-21"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "7e57cc7b090455e93261c847064f12a61d686ff3"; - hash = "sha256-8rkgxEfRH8ERuC7iplQKOzKb1EJ4+SNGDX5gTGpOmQo="; + rev = "44f672bacf6779f6bbe5972d84e210f953f14598"; + hash = "sha256-Qku6W1kETOXQh8Kxn0wabe0Xc4gkpxrGbDFwIik34eY="; }; postPatch = '' @@ -134,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = with qt6Packages; [ + curl ffmpeg libavif libjxl @@ -144,9 +145,9 @@ stdenv.mkDerivation (finalAttrs: { simdutf skia woff2 - ] ++ lib.optional stdenv.isLinux [ + ] ++ lib.optional stdenv.hostPlatform.isLinux [ qtwayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -157,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { # Disable network operations "-DSERENITY_CACHE_DIR=Caches" "-DENABLE_NETWORK_DOWNLOADS=OFF" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DCMAKE_INSTALL_LIBEXECDIR=libexec" ]; @@ -166,14 +167,14 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications $out/bin mv $out/bundle/Ladybird.app $out/Applications ''; # Only Ladybird and WebContent need wrapped, if Qt is enabled. # On linux we end up wraping some non-Qt apps, like headless-browser. - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; passthru.tests = { nixosTest = nixosTests.ladybird; @@ -187,6 +188,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "Ladybird"; # use of undeclared identifier 'NSBezelStyleAccessoryBarAction' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 7a486ec65fe93..d6770a85138eb 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ the-foundation ] ++ lib.optionals (!enableTUI) [ fribidi harfbuzz libwebp mpg123 SDL2 ] ++ lib.optionals enableTUI [ ncurses sealcurses ] - ++ lib.optional stdenv.isDarwin AppKit; + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; cmakeFlags = lib.optionals enableTUI [ "-DENABLE_TUI=YES" @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" ]; - installPhase = lib.optionalString (stdenv.isDarwin && !enableTUI) '' + installPhase = lib.optionalString (stdenv.hostPlatform.isDarwin && !enableTUI) '' mkdir -p $out/Applications mv Lagrange.app $out/Applications ''; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index c92c6fda87e53..575b936513127 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "129.0.2-1", + "packageVersion": "130.0-3", "source": { - "rev": "129.0.2-1", - "sha256": "1zghj91bqy2746x4x6cwn503dkw1fmfv0wgq02wv2cwlp8mmd7j7" + "rev": "130.0-3", + "sha256": "0ah6k4637fg3v3l13rk6bw6wxsx0mc41hvi9sld5psbl8l2kyk29" }, "firefox": { - "version": "129.0.2", - "sha512": "f6805a87e5cb4e437583916e3ec1b312dc73eec5fc06ce7a038b13bd7c6827b18cf383c30645d96623ce41675351f3023ec6b9f89d676f1c889994eae79f2c13" + "version": "130.0", + "sha512": "d0d11b38d9e02fa15298ec13336bb086668b4f36b3ce9ced218a265327fd4822b9fea4303402631947ea3c20490c414de87f8df3e7c23d2e02b70f0456b9af40" } } diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 9fe4fe7e37f2f..12968f2f56cf6 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -2,9 +2,9 @@ , gpm, openssl, pkg-config, libev # Misc. , libpng, libjpeg, libtiff, librsvg, libavif # graphic formats , bzip2, zlib, xz # Transfer encodings -, enableFB ? (!stdenv.isDarwin) +, enableFB ? (!stdenv.hostPlatform.isDarwin) , enableDirectFB ? false, directfb -, enableX11 ? (!stdenv.isDarwin), libX11, libXt, libXau # GUI support +, enableX11 ? (!stdenv.hostPlatform.isDarwin), libX11, libXt, libXau # GUI support }: stdenv.mkDerivation (finalAttrs: { @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libev librsvg libpng libjpeg libtiff libavif openssl xz bzip2 zlib ] - ++ lib.optionals stdenv.isLinux [ gpm ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ] ++ lib.optionals enableX11 [ libX11 libXau libXt ] ++ lib.optionals enableDirectFB [ directfb ]; diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 6f899c924ff25..5721c6e616b9c 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "128.0.2739.42"; + version = "130.0.2849.5"; revision = "1"; - hash = "sha256-VcBn2WL4rdAeEa62XT/dhC2OFLsV0Q/Sp6hqgmc/e0Y="; + hash = "sha256-chvB84+zu6/xgRHyUk33aicc44QJLxxdOOu0ngqmsFM="; }; dev = import ./browser.nix { channel = "dev"; - version = "129.0.2779.0"; + version = "130.0.2849.1"; revision = "1"; - hash = "sha256-hlamsHTpBMGwOICga0k874q8+xuaZFMofFLG/EvB0NU="; + hash = "sha256-JObqtaaUR6J4rZ90WWw7Ku5Ntl/QBWHo23T7Ohu5p1s="; }; stable = import ./browser.nix { channel = "stable"; - version = "128.0.2739.42"; + version = "129.0.2792.65"; revision = "1"; - hash = "sha256-AwdZX2Ens2+rhHLYV0efYsXYBTs2a57HyGz2k+IDMeQ="; + hash = "sha256-xuCtHptE2CG4aiY7gu2sWW3Km4qfB0E/L/PBACIaKOc="; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix index cd1b78fc2980f..2397145a21c43 100644 --- a/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-fcommon"; - env.CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + env.CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; patchPhase = lib.optionalString stdenv.cc.isClang '' runHook prePatch diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 36327e5219946..429923f6268ae 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "111.0.5168.61"; + version = "113.0.5230.47"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-O2QqosmhhFk6KfiAdlpDYOsZUqGhvtwzYFi2I90Hemo="; + hash = "sha256-0RQTcROUv85yE6ceLkyF09/++WrvK828h5hoN1QYpCE="; }; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index aeeb03d8d028e..e6bb9e887c4f4 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.3.0"; + version = "33.3.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-9JZzwWe40M6nJkzeUqNDPXMfDGBnLRDSLL5kE2sNzCs="; + hash = "sha256-auo45tzMY6bKahSEmUrkcYnz7v+GFbsrG+ePAKRC00U="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-K3PC1EDZeDyJUPhfvqTlqyMM07GmiWlUdYiNnSZuesw="; + hash = "sha256-7qrT5fSfwcEAkbq8g/HRoUiDv5+qrzpiysjHTdZVgLc="; }; }; diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index 79b32bd575c86..693b1e8f0f50e 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "20.1.2"; + version = "21.1.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-rdbx0ffI8MDGXArniFnqTpuLLMlihtXXQiZnxw5vq+c="; + sha256 = "sha256-MVBxKJeqIFAkSOajo1q/062BGBF6Fm2sUA6GYZIBoKQ="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 3f676ecd6cc09..64fee95385cc6 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -3,7 +3,7 @@ , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt , withPdfReader ? true -, pipewireSupport ? stdenv.isLinux +, pipewireSupport ? stdenv.hostPlatform.isLinux , pipewire , qtwayland , qtbase @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication { buildInputs = [ qtbase glib-networking - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index d4ffaedcb09e4..d0a27d8252116 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -15,7 +15,7 @@ , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , enableWidevine ? false, widevine-cdm ? null , commandLineArgs ? "" -, pulseSupport ? stdenv.isLinux, libpulseaudio +, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio , kerberosSupport ? true, libkrb5 }: @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.8.3381.57"; + version = "6.9.3447.48"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-Tehc9T9+7NHaMYu7l7qB/09ips41rTx1VDCalUyO6Nw="; - x86_64-linux = "sha256-PC5fzMRIC2bW8xmPCG2nNIwwz0wha6+VDLAV1ihbQkM="; + aarch64-linux = "sha256-pl6vZwIPqfYi/nO/PDEwUyi4CdVP9ciTAbVg0d+DX1w="; + x86_64-linux = "sha256-mhJCCYXP9eyA8YquSZsnm5o04VmY5NRwVM5vKqbdkZs="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { ++ lib.optional kerberosSupport libkrb5; libPath = lib.makeLibraryPath buildInputs - + lib.optionalString (stdenv.is64bit) + + lib.optionalString (stdenv.hostPlatform.is64bit) (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs) + ":$out/opt/${vivaldiName}/lib"; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 827202ae38181..8ea48ffbad994 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , ncurses, boehmgc, gettext, zlib , sslSupport ? true, openssl -, graphicsSupport ? !stdenv.isDarwin, imlib2 +, graphicsSupport ? !stdenv.hostPlatform.isDarwin, imlib2 , x11Support ? graphicsSupport, libX11 -, mouseSupport ? !stdenv.isDarwin, gpm-ncurses +, mouseSupport ? !stdenv.hostPlatform.isDarwin, gpm-ncurses , perl, man, pkg-config, buildPackages, w3m , testers, updateAutotoolsGnuConfigScriptsHook }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { hash = "sha256-upb5lWqhC1jRegzTncIz5e21v4Pw912FyVn217HucFs="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isSunOS "-lsocket -lnsl"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lsocket -lnsl"; # we must set these so that the generated files (e.g. w3mhelp.cgi) contain # the correct paths. diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index d4fa55f266763..06d4251b9faab 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -54,15 +54,15 @@ let version = { - corporate = "24.4.3.1073-1"; - beta = "24.4.1.952-1"; - stable = "24.4.1.951-1"; + corporate = "24.7.1.1195-1"; + beta = "24.7.1.1124-1"; + stable = "24.7.1.1120-1"; }.${edition}; hash = { - corporate = "sha256-f2Q6q3rL+RcVYX46RHRAageF2JKPxmBaV6KHYl5XtN8="; - beta = "sha256-WCyjgb5uj9guqyge6giP0wavndorlMG6yacG134xWjw="; - stable = "sha256-4AsMpANtMXUS2NCPKI+Ut0tWGurRIpWCmS3PhEi1CGo="; + corporate = "sha256-HPEUeIZl9nRhMzrMv4MzIOnbF8mJ789vCtTWf9TcCH4="; + beta = "sha256-vcX/9MWqeUd/YlczHivcL6+TignE8Nk6rO5DaCjf2SQ="; + stable = "sha256-wrYPQ8WrttF/tlafA0+e3eDZMq9SFmLk5NOIeHQr14U="; }.${edition}; app = { diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index f2d841a419bc0..4cd54559fb055 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.8.3"; + version = "2024.9.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-w0VocNM3KVu4TG5s9vdGV4Au+Hz7PfPoaksqidMRJ+E="; + hash = "sha256-PFe58tdLc6RtLFrGuL9y+FWNGIASXCDawxSG2He2IQ0="; }; vendorHash = null; @@ -69,7 +69,7 @@ buildGoModule rec { --replace "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions" ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru = { tests.simple = callPackage ./tests.nix { inherit version; }; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 0d004cbb94ad8..815ac16a8573e 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -34,16 +34,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.5.10"; + version = "3.5.11"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-35Hp5lISQuFNsbSOKsLRcD695ZRCgQue+H8rKEPma5M="; + hash = "sha256-Yw61BCcMLl/zkmPm79SI0AdT6Nj2bxQkt6IKRBu0FmQ="; }; - vendorHash = "sha256-dGDXDpjf1kWcqBhCMKLXGXax6ApOL9eIiiem86CxdGs="; + vendorHash = "sha256-QwQasJMSEnHvBxyxCjLuinPt47XAhERch3j60KXGxa4="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index ed7a502b7d38d..985c0e3bebdc4 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.12.3"; + version = "2.12.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-XD/+alC0OZUDExXpAnxmN6zcGPrsYGxaWGU9KgdoCgM="; + hash = "sha256-CxxaNm6O0wGvh1V0RmU4eA654u2ooL41EmlNX49KEE0="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 8e576a422d689..2d9e23b7cc998 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.21"; + version = "0.11.27"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-vNJQLrpPJJG5FjQ73203V/Ky93HawRWgMiPYHU+eXPM="; + hash = "sha256-5/QAtaAAiIzpvOl43A4OqnIcKlfdxehGjmCREFRKXTs="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index bc9627286a658..d4788c80bafc4 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.7.0"; + version = "7.7.2"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z3nC9h8kSQYukIVrcdtUiGyHIUl5W6r43RC7l40Vlwo="; + sha256 = "sha256-orn1pxHefYCp0vPsZ4TI5Y76tpR8dOcEmxA3cHwfYQU="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index d5afb172885b0..509a0385c8500 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.28.1"; + version = "3.28.2"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-IQGDuxk3ZDtrY/RLp2DfdCWtBNMTYPOitcVCcxH7HoY="; + hash = "sha256-ZENlUmSLI+aY33a69LNsfer/TLz8gmzxEv8Gddz6faU="; }; - vendorHash = "sha256-F44n+n9jfGYBQC1I33ylp8ZJtMi+uzjOLeG+5MbVePs="; + vendorHash = "sha256-6ZHb4SUa22/KfN4B2hg710FOSpg69rlT9FbZ/wCjpDc="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index de8e4b38754cb..a471c5827c762 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-fcJTxZX9mdF4oFl/Cn1egczRy+yhWt2zLKsdLKz6Q+s="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = ''The "Command Line Interactive Controller for Kubernetes"''; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 936ed7ec73ca2..b927703748049 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.7.11"; + version = "8.8.1"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-7FYIJf9vNHK9u8r7HVpPtGGWwRA5cdrB9f1Vz1iTFjI="; + sha256 = "sha256-0SVz97XjFeXaj56ssqFK2jTUQfL0rSc72HAdK9mikUc="; }; - vendorHash = "sha256-9SpmMXmocwaZH4fqqETzmRP6wvI2NV/LL6M0Ld4lvso="; + vendorHash = "sha256-WI4yg+r8zGLZI10/kNFkdbzXk0hZ6CCXvXLOd8l7AWo="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index c100416a55c46..1e9183adbaaa6 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-Z7cFwR8IUThEd4Te3KHPC8K8v56ymAG7nIM/7pxWq4U="; + hash = "sha256-zvMjfaEq6EOWVqjVOoS2nb1fuGyEljcNVfTpAWUsiL8="; }; vendorHash = "sha256-0VVaD1vGIGezgkVCvIhNHmZqVFxFu4UcUUh0wuX2viw="; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 98fb309942ea9..b103450942c75 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { ]; # Trusted by this computer: no: x509: “cert-manager” certificate is not trusted - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = '' mv $out/bin/ctl $out/bin/cmctl diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/applications/networking/cluster/gatekeeper/default.nix index 559be08a5e890..2b8ef8c1f1766 100644 --- a/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.17.0"; + version = "3.17.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - hash = "sha256-33imFUFIonE5DTNwAKgJQd4jQ/lLap3LmVTqn9nxj98="; + hash = "sha256-Tu4p0kY0UdU0++zLpj+6A5ky5OXEEN5iivHbiyvghw4="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index a695f261ef62f..65009e7d4de68 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -1,21 +1,22 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, }: buildGoModule rec { pname = "glooctl"; - version = "1.16.17"; + version = "1.17.10"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-18ZvxXAE83/NT/Syv/wshTiulTMroAaamxYtfuYIuR4="; + hash = "sha256-p917jiPvWjLRoH2y81TvILc9WYZ6n1y1UQy8hIO93jM="; }; - vendorHash = "sha256-wLB+sUaSOBb1VLx/iwlU4U6LKakUP+GbhdWfjlvCu84="; + vendorHash = "sha256-rAObw4J0ATle1gq5Z1MsrGy/iqQDHjnMPAEIPBgtY3g="; subPackages = [ "projects/gloo/cli/cmd" ]; @@ -25,10 +26,13 @@ buildGoModule rec { ldflags = [ "-s" - "-w" "-X github.com/solo-io/gloo/pkg/version.Version=${version}" ]; + preCheck = '' + export HOME=$TMPDIR + ''; + postInstall = '' mv $out/bin/cmd $out/bin/glooctl installShellCompletion --cmd glooctl \ @@ -37,9 +41,10 @@ buildGoModule rec { ''; meta = { - description = "glooctl is the unified CLI for Gloo"; + description = "Unified CLI for Gloo, the feature-rich, Kubernetes-native, next-generation API gateway built on Envoy"; mainProgram = "glooctl"; homepage = "https://docs.solo.io/gloo-edge/latest/reference/cli/glooctl/"; + changelog = "https://github.com/solo-io/gloo/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index d9f20411a5a0e..02acad93a3156 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -15,7 +15,6 @@ , zlib , zstd , openssl -, glibc , nixosTests , sparkSupport ? true , spark @@ -32,26 +31,26 @@ let version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}"); src = fetchurl { url = "mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}" - + lib.optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; + + lib.optionalString stdenv.hostPlatform.isAarch64 "-aarch64" + ".tar.gz"; inherit (platformAttrs.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) hash; }; doCheck = true; # Build the container executor binary from source # InstallPhase is not lazily evaluating containerExecutor for some reason - containerExecutor = if stdenv.isLinux then (callPackage ./containerExecutor.nix { + containerExecutor = if stdenv.hostPlatform.isLinux then (callPackage ./containerExecutor.nix { inherit (finalAttrs) version; inherit platformAttrs; }) else ""; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; installPhase = '' mkdir $out mv * $out/ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' for n in $(find ${finalAttrs.containerExecutor}/bin -type f); do ln -sf "$n" $out/bin done diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 2ebc588527277..c5f161db09149 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.15.4"; + version = "3.16.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-hFQX9v37cXJ4wv1aQnBOBlmVWUiZuKrjCJ/R4dzUa/4="; + sha256 = "sha256-OTG4xPgK1WT/HUWjQZ1a7X126+PUo02yFnEAnd6MTU8="; }; - vendorHash = "sha256-lR/6n+EH4Nhs1Q/BqEkMlugM74NtEtT+SKQQHc6+Zjk="; + vendorHash = "sha256-rNp2aah6lAMZd07HXF2w0h7wfPc+TuRHl/jQpgqY5Sk="; 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 ec4073cf251a6..94828973bd1fe 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.9.9"; + version = "3.9.11"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - hash = "sha256-2vippOY56eP+dMTvH3E+pesq03SHnIsNaRwHK8rdIus="; + hash = "sha256-DwZZi7A6/UsKiFJSgMdo/zqlsRFz9RkFy8+s8RTumXg="; }; - vendorHash = "sha256-Xfev2TsAtP9XddAUNCCKOeIFpKLnD00SdkH2io2REQk="; + vendorHash = "sha256-3TtUpwg8HLHp/fILH5/qBnMKFmBlALOGSSYoEg3s1h0="; ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ]; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix index c2367b57ede34..4dc5619079444 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm-mapkubeapis"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm-mapkubeapis"; rev = "v${version}"; - hash = "sha256-SYNCzVGGeuRj0PoOKU+1zydvAXVg4gUpIsqBTGChOgE="; + hash = "sha256-0DIBdSi/WIHVF8O7OtJOaFnIfpObsUXzgpj25kJuS6E="; }; vendorHash = "sha256-G3Q8XCwKLgHeWLF46C5lWfvuynr/cJbkq7xdydfTHZ4="; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix index a3b622fc889d3..d56d850d3bb7c 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-s3"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "hypnoglow"; repo = pname; rev = "v${version}"; - hash = "sha256-0wx8q93y8goXNh2x/XI3FQEXImVTpONURiDW2dCAi6o="; + hash = "sha256-hQuZd0VI+JspIjR7Dax/LXUZ9Rqflc6RQG9X80BkfeY="; }; - vendorHash = "sha256-i+rWg0/EUes5soFVRu9M5/iktbtudII7Ly5pcnOU2hU="; + vendorHash = "sha256-CXlZazpsHasjHPNHzXIsrbtWgQs/lVRqGsoqRvl2MHw="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 5f19c5697f5ac..1aceae0b31823 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.167.1"; + version = "0.168.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - hash = "sha256-v5H5CQtLUmWCAh1Fhnf63gObxz3Wchpczi4gsPOh2ps="; + hash = "sha256-qpYTYOzQWhjuVANOPpLDsYZyhvRl6FnNQz5ssDZHohw="; }; - vendorHash = "sha256-QVFCPTGhYcCya9MGtj0vVZ3BJCcJeaxENrrJVef0H4Y="; + vendorHash = "sha256-pCP5PxxOLlqQBmqufpo6G69v4M+NxMpTlIUY6TnclVA="; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 9609e87e32d9d..c624489084180 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.22.3"; + version = "1.23.1"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-rtvuGIcjarIc4PmBXM3s/XbMQp/wlU1FhHb1lmXE2go="; + hash = "sha256-ksTtjPzEY//JMLKzTMqkeqZqD92euvqV0iXziYQvFGg="; }; - vendorHash = "sha256-0F4GIOT/YUzLLhD9HzNJpGSgfMALiEPAb4vtmLmI+Qs="; + vendorHash = "sha256-4zNPI5tefOgLwbzxRM9NS/szlUjGo2BiruqP92qmwBU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 9d71c20707082..9bb95b36dad0c 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jx"; - version = "3.10.154"; + version = "3.10.155"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-BrCErGsHJq9h2AijwhG8MwCxXGJ9sCDpCOqazsmi8hs="; + sha256 = "sha256-9dRYPeVWwJCbxkjPVI0B4FLaFNHRyGIdKd/ubJbP9tI="; }; vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14="; @@ -33,7 +33,7 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Command line tool for installing and using Jenkins X"; mainProgram = "jx"; homepage = "https://jenkins-x.io"; diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 9215ea9845ebf..94667e40d3a48 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - hash = "sha256-lZCD8hBe6SKKjTvEKNg/lr7NXrAPqFQoh9iQg0O6jhc="; + hash = "sha256-86MLQdXc10bvDFeq3ImD19ytjVPVD19eJzicIo6oJZc="; }; - vendorHash = "sha256-FobBn7rbRVfnW8Zd982vkSuKpPj4gGK4b41o9OK/CCY="; + vendorHash = "sha256-eKim5F8bKC1UOY+lOo0NSHOzXuMOcnBjkjm3/vDkGEM="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/k3d/default.nix b/pkgs/applications/networking/cluster/k3d/default.nix index 9162251ce43ae..37c256b714b07 100644 --- a/pkgs/applications/networking/cluster/k3d/default.nix +++ b/pkgs/applications/networking/cluster/k3d/default.nix @@ -15,13 +15,13 @@ let in buildGoModule rec { pname = "k3d"; - version = "5.7.3"; + version = "5.7.4"; src = fetchFromGitHub { owner = "k3d-io"; repo = "k3d"; rev = "refs/tags/v${version}"; - hash = "sha256-G9z4yJ7Oa2zmxYTRIMCiXlBPLlc3vGPUqUOoIohDKU8="; + hash = "sha256-z+7yeX0ea/6+4aWbA5NYW/HzvVcJiSkewOvo+oXp9bE="; }; vendorHash = "sha256-lFmIRtkUiohva2Vtg4AqHaB5McVOWW5+SFShkNqYVZ8="; diff --git a/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json index f5e27995f0564..04c0f6616107f 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "0dhzkn5y3ng7blyxj4bwrhbq5qvl3hq1hzg0h9633h8swv0xbsss" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1v3vyrb86xijyvljs0s0skhxpjbarjqg2sx9m40332dfq9din7xq" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "1225nqsfg7p6iq7a7qibzf3d0r7iwn53hnd9w6l189dxqna97015" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "0yifpx6vix5bjzkz81i5rsn89hkpp0rhk77ndl1lgy66pq4csbmm" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "1lic564naj9323dkkq0z0y10n3j3yfmhixargqqs60syanfvj2p7" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "1p8zf47pghhjqhrcvmzdbcfxxy78pjpqwvmhm3wdidsa8xyy375a" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-images.txt", - "sha256": "1my3lfs5rfazcnnpsc9dj84dfnxx88xydrl86z6yw5n5p84x4nif" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-images.txt", + "sha256": "1f1d33jn4g5b6zmzdzzm4ffwfrmjwh60v9gnph0ysxjwsq1k0pxp" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix index a6149c0d6e51b..9128fbda8dfbd 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.28.12+k3s1"; - k3sCommit = "4717e2a58e04f0ba3d9f43d574a7eff01dea9146"; - k3sRepoSha256 = "02wywlqqna0dj9cam6q3ykb3p5mi96f6lclrg5yhjky7jdvkffds"; - k3sVendorHash = "sha256-RyUlaGQnfrCm4cB5FRs9IAeF+zn4LzAXmIViU3o30Z4="; + k3sVersion = "1.28.13+k3s1"; + k3sCommit = "47737e1c4c941325574e8aa14e4a3af2e596f696"; + k3sRepoSha256 = "1x66n36lxcvi5d9bdz0f1w2p24493rh3vbk1pskqd1f3v3fbv7kn"; + k3sVendorHash = "sha256-/knBr0l7dZ6lX9QpohyPNrFEi4WQpNM01zOE5bCIB2E="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.0"; k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.17-k3s1.28"; - containerdSha256 = "0nhhx932j551ran3kkvyp4nmsg5c71mq0g6jrcbs2j4nn7yqdkhm"; + containerdVersion = "1.7.20-k3s2.28"; + containerdSha256 = "0jqqa9202d94qd7g8d5zy161snlsc42cdjpmp50w4j3pnp2i1cki"; criCtlVersion = "1.26.0-rc.0-k3s1"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json index 39b6faf17a46c..ac4b6556128dd 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "1dyh107ygnlv9gyq2f9jdgrwjiyg25a61id69z48vc60gq480888" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1v3vyrb86xijyvljs0s0skhxpjbarjqg2sx9m40332dfq9din7xq" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "16l6d1ix3ri1l2wr2k5brg11a1snbkqhqasrk69wrix6diddklrn" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "0yifpx6vix5bjzkz81i5rsn89hkpp0rhk77ndl1lgy66pq4csbmm" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "0pg4nzh1rf28003yxhl3jklxs41vjjgldviybvnqqp146ib6hy0r" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "1p8zf47pghhjqhrcvmzdbcfxxy78pjpqwvmhm3wdidsa8xyy375a" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-images.txt", - "sha256": "1my3lfs5rfazcnnpsc9dj84dfnxx88xydrl86z6yw5n5p84x4nif" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-images.txt", + "sha256": "1f1d33jn4g5b6zmzdzzm4ffwfrmjwh60v9gnph0ysxjwsq1k0pxp" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index f27ea9030173d..fd5654980afd8 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.29.7+k3s1"; - k3sCommit = "f246bbc390a05f45431e49617b58013fe06a460d"; - k3sRepoSha256 = "0fv628rxxavqmb2gv0ncsx4m8ghn3v6ddn2n06x8q4ar27d9gijg"; - k3sVendorHash = "sha256-pAOyGgEaO6ewNv+6yhDt83NZl95rmLseFUs4vlXNH6Q="; + k3sVersion = "1.29.8+k3s1"; + k3sCommit = "33fdc35dd67cf6c07989327e992fd26ed89b2449"; + k3sRepoSha256 = "0ky5f039nkhdj6y5v9yr6lk875l29c67j6kqc2dzdb3iqbwskcbr"; + k3sVendorHash = "sha256-VxVGBvpeKf/nuw09Llf85d4P8oCD2GvD1f0Mxt6fMj8="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.0"; k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.17-k3s1"; - containerdSha256 = "1j61mbgx346ydvnjd8b07wf7nmvvplx28wi5jjdzi1k688r2hxpf"; + containerdVersion = "1.7.20-k3s1"; + containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i"; criCtlVersion = "1.29.0-k3s1"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json index e653293903257..cc2e2498d6443 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "1ym7cdm3a2f05wgh4vba2g7q1zihrfvvm2zngcs0gm8djj7hy4d9" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "145sj4gpwdjvfv3bphpdg6db1d83bbwl0shbnsqpjizsm3ifvmm9" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "15mj949msrd30xhqryhpsvx1bi3pywm1z5bmi0h40qyzc1mcfvjk" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "0sdkfsjxxi5sq0nxjw7g7r1p7711l74r39y5ss12q85q4sla0m7l" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "1k2q6rzczajnrkj57p97fdr7lgmrfv7x54by2syngfwb5in8fhd5" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "1kw85g79rywk6n3wda7ffvjhf030wwj8g3x8n73rgiprvksw4p7j" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-images.txt", - "sha256": "1my3lfs5rfazcnnpsc9dj84dfnxx88xydrl86z6yw5n5p84x4nif" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-images.txt", + "sha256": "1f1d33jn4g5b6zmzdzzm4ffwfrmjwh60v9gnph0ysxjwsq1k0pxp" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index 31b14892bab65..40e7386b38b2c 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.30.3+k3s1"; - k3sCommit = "f646604010affc6a1d3233a8a0870bca46bf80cf"; - k3sRepoSha256 = "1sqa4cx5rihrqcnriq7if7sm4hx73ma975yyr5k9nvhg71dvlig3"; - k3sVendorHash = "sha256-HMlYdWDUoELpwsfCtyCxVIcFULdvu5gna83lc79AUWc="; + k3sVersion = "1.30.4+k3s1"; + k3sCommit = "98262b5dee29fe5ac849a0cef90b5d50292b020b"; + k3sRepoSha256 = "1iwg7j0divbh41dx40kz69qkvscvppqb37dqvxayw3ha1yja4sq6"; + k3sVendorHash = "sha256-EovTZ3DvDqWFR9vxhtjgcZcPXVk1C0PYNCxEV5XA6wg="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.0"; k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.17-k3s1"; - containerdSha256 = "1j61mbgx346ydvnjd8b07wf7nmvvplx28wi5jjdzi1k688r2hxpf"; + containerdVersion = "1.7.20-k3s1"; + containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i"; criCtlVersion = "1.29.0-k3s1"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix new file mode 100644 index 0000000000000..aaaa3d4c29700 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; + sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; + sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json new file mode 100644 index 0000000000000..099ff7e3609b2 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json @@ -0,0 +1,18 @@ +{ + "airgap-images-amd64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "13pakr8nxlbqhqcz40gyjncw4bghk7x7ryb2ynmr5airspqcdrl6" + }, + "airgap-images-arm": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "0vc2v89qy9gbzfbmfrdb0l5yzyprk7yma5ps0yfj60jd9av07qvh" + }, + "airgap-images-arm64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "10ffa45pm1scavcd5cimdaw29rlc55c9i40qzh3n3451g1yqlmmk" + }, + "images-list": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-images.txt", + "sha256": "0y4x02fj1iysghq6s88wsiqfpsajrrwrg89m59qk431cii23nrza" + } +} diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix new file mode 100644 index 0000000000000..74f2f1de05699 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix @@ -0,0 +1,15 @@ +{ + k3sVersion = "1.31.0+k3s1"; + k3sCommit = "34be6d96d17d8d65fda86272b62b752cb0e9c45e"; + k3sRepoSha256 = "16yzsx56jmca07jdnzjvy4pcfrvvibv987l1mzdaws1vkm3xqfnw"; + k3sVendorHash = "sha256-1uYlvGkW6n4aiUVX/2OjppczdobY/fk1ZaK6j3AEwvM="; + chartVersions = import ./chart-versions.nix; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); + k3sRootVersion = "0.14.0"; + k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; + k3sCNIVersion = "1.4.0-k3s2"; + k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; + containerdVersion = "1.7.20-k3s1"; + containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i"; + criCtlVersion = "1.31.0-k3s2"; +} diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index e0288c21fc997..8d66882a8a97a 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -150,9 +150,9 @@ let # a shortcut that provides the images archive for the host platform. Currently only supports # aarch64 (arm64) and x86_64 (amd64), aborts on other architectures. airgapImages = fetchurl ( - if stdenv.isAarch64 then + if stdenv.hostPlatform.isAarch64 then imagesVersions.${findImagesArchive "arm64"} - else if stdenv.isx86_64 then + else if stdenv.hostPlatform.isx86_64 then imagesVersions.${findImagesArchive "amd64"} else abort "k3s: airgap images cannot be found automatically for architecture ${stdenv.hostPlatform.linuxArch}, consider using an image archive with an explicit architecture." @@ -211,7 +211,7 @@ let sed --quiet '/# --- run the install process --/q;p' ${k3sRepo}/install.sh > install.sh # Let killall expect "containerd-shim" in the Nix store - to_replace="k3s/data/\[\^/\]\*/bin/containerd-shim" + to_replace="/data/\[\^/\]\*/bin/containerd-shim" replacement="/nix/store/.*k3s-containerd.*/bin/containerd-shim" changes=$(sed -i "s|$to_replace|$replacement| w /dev/stdout" install.sh) if [ -z "$changes" ]; then diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index c8e3fbc926961..59fd6b1be344e 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -43,4 +43,14 @@ in ]; } ) extraArgs; + + k3s_1_31 = common ( + (import ./1_31/versions.nix) + // { + updateScript = [ + ./update-script.sh + "31" + ]; + } + ) extraArgs; } diff --git a/pkgs/applications/networking/cluster/k3s/docs/USAGE.md b/pkgs/applications/networking/cluster/k3s/docs/USAGE.md index 27c5963bd0b8f..326118e1712ae 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/USAGE.md +++ b/pkgs/applications/networking/cluster/k3s/docs/USAGE.md @@ -15,7 +15,7 @@ services.k3s.enable = true; services.k3s.role = "server"; services.k3s.extraFlags = toString [ - # "--kubelet-arg=v=4" # Optionally add additional args to k3s + # "--debug" # Optionally add additional args to k3s ]; } ``` diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh index 9eab8ce08f81f..ac451806ff663 100755 --- a/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -107,7 +107,13 @@ CONTAINERD_VERSION=$(grep github.com/containerd/containerd ${FILE_GO_MOD} \ CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/k3s-io/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz") -CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \ +# The repository of "cri-tools" changes for 1.31.x, this can likely be removed in future releases +if [ "$MINOR_VERSION" -gt 30 ]; then + CRI_CTL_REPO=sigs.k8s.io +else + CRI_CTL_REPO=github.com/kubernetes-sigs +fi +CRI_CTL_VERSION=$(grep "$CRI_CTL_REPO/cri-tools" ${FILE_GO_MOD} \ | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') setKV () { diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 8e91f641a7a37..5bd085f2bb59d 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { vendorHash = "sha256-U/tIsYpoog3S8V2yQGGqaQ+Av7TfvCYt3zn74qWuQKs="; # TODO investigate why some config tests are failing - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # Required to workaround test check error: preCheck = "export HOME=$(mktemp -d)"; # For arch != x86 diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 79dcfd2a9fc13..8832c697944e0 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -49,12 +49,6 @@ in rec { mkKops = generic; - kops_1_26 = mkKops rec { - version = "1.26.6"; - sha256 = "sha256-qaehvPgB3phZl/K577hig4G4RxAUi6Im94vXP5ctnWM="; - rev = "v${version}"; - }; - kops_1_27 = mkKops rec { version = "1.27.1"; sha256 = "sha256-WV+0380yj8GHckY4PDM3WspbZ/YuYZOAQEMd2ygEOjo="; @@ -62,14 +56,20 @@ rec { }; kops_1_28 = mkKops rec { - version = "1.28.5"; - sha256 = "sha256-spw3lTrp6RlxkTNoZ/3Yz/U2tdvBnwiYORS2QtOSX9k="; + version = "1.28.7"; + sha256 = "sha256-rTf7+w/o8MGSBKV9wCzZOEI0v31exZhOJpRABeF/KyI="; rev = "v${version}"; }; kops_1_29 = mkKops rec { - version = "1.29.2"; - sha256 = "sha256-SRj0x9N+yfTG/UL/hu1ds46Zt6d5SUYU0PA9lPHO6jQ="; + version = "1.30.1"; + sha256 = "sha256-aj2OnjkXlBEH830RoJiAlhiFfS1zjVoX38PrsgAaB7A="; + rev = "v${version}"; + }; + + kops_1_30 = mkKops rec { + version = "1.30.1"; + sha256 = "sha256-aj2OnjkXlBEH830RoJiAlhiFfS1zjVoX38PrsgAaB7A="; rev = "v${version}"; }; } diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index d7aa86fd7d39e..ccccec1c8562a 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { homepage = "https://googlecontainertools.github.io/kpt/"; license = licenses.asl20; maintainers = with maintainers; [ mikefaille ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 7d780f0e93168..a1912256547da 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,36 +1,37 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.4) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) bigdecimal (3.1.8) colorize (0.8.1) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) domain_name (0.6.20240107) drb (2.2.1) ejson (1.4.1) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + faraday (2.11.0) + faraday-net_http (>= 2.0, < 3.4) logger - faraday-net_http (3.1.1) + faraday-net_http (3.3.0) net-http ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake - google-cloud-env (2.1.1) + google-cloud-env (2.2.0) faraday (>= 1.0, < 3.a) googleauth (1.11.0) faraday (>= 1.0, < 3.a) @@ -46,7 +47,7 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) i18n (1.14.5) @@ -55,7 +56,7 @@ GEM multi_json jwt (2.8.2) base64 - krane (3.6.1) + krane (3.6.2) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -64,7 +65,7 @@ GEM jsonpath (~> 1.0) kubeclient (~> 4.9) multi_json - statsd-instrument (>= 2.8, < 4) + statsd-instrument (>= 2.8, < 3.9) thor (>= 1.0, < 2.0) kubeclient (4.12.0) http (>= 3.0, < 6.0) @@ -74,13 +75,12 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.0) + logger (1.6.1) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) - minitest (5.24.1) + mime-types-data (3.2024.0903) + minitest (5.25.1) multi_json (1.15.0) - mutex_m (0.2.0) net-http (0.4.1) uri netrc (0.11.0) @@ -93,16 +93,17 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) + securerandom (0.3.1) signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) statsd-instrument (3.8.0) - thor (1.3.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uri (0.13.0) + uri (0.13.1) PLATFORMS ruby diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index e8bf7ffd74196..39b8783c3a539 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5"; + sha256 = "094cv9kxa8hwlsw3c0njkvvayd0wszcz9b6xywv4yajrg83zlmvm"; type = "gem"; }; - version = "7.1.3.4"; + version = "7.2.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -107,10 +107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "104s7n9505488p923cs0pl3jlgn4naam28clkm2885hrysizpjbb"; + sha256 = "00pd34pnfmij5iw1xv73f6d68zng63wyjhmk7dyi010kmb4x5sp6"; type = "gem"; }; - version = "2.10.1"; + version = "2.11.0"; }; faraday-net_http = { dependencies = ["net-http"]; @@ -118,10 +118,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f49frpfdr8czwm2mjkfny4pini6fy49b6hamw4jrppl4vsg14ys"; + sha256 = "0rg54k4skaz8z7j358p6pdzc9pr84fjq7sdlpicf7s5ig7vb1rlk"; type = "gem"; }; - version = "3.1.1"; + version = "3.3.0"; }; ffi = { groups = ["default"]; @@ -150,10 +150,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg"; + sha256 = "0vlwifnhih8nq5441pfbnzc7w4z8rmy7j54pfixpm9yvlq11428j"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; googleauth = { dependencies = ["faraday" "google-cloud-env" "jwt" "multi_json" "os" "signet"]; @@ -193,10 +193,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i20j9wgxk4k47g54jiphb02xdhrwvadf4a0jjq5mzr1dwcx64vp"; + sha256 = "0lr2yk5g5vvf9nzlmkn3p7mhh9mn55gpdc7kl2w21xs46fgkjynb"; type = "gem"; }; - version = "1.0.6"; + version = "1.0.7"; }; http-form_data = { groups = ["default"]; @@ -247,10 +247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "002nf72l4b9h0lmpxzd5zm7dwakjs9f9cxrmkrx77qdyj4vy4g48"; + sha256 = "07f87rzlr0yamji5ns2isf5f554jal5b9v62lijhsafmq9545f42"; type = "gem"; }; - version = "3.6.1"; + version = "3.6.2"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -279,10 +279,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa"; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -300,20 +300,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vzvh906sk9zqfd4bvpjjgw856i769d2abjp3cibh5w73r9g70zj"; + sha256 = "0d5bmxcq87nj6h5rx6b1fkdzq8256yba97s2vlkszpwhc47m9rfs"; type = "gem"; }; - version = "3.2024.0806"; + version = "3.2024.0903"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.24.1"; + version = "5.25.1"; }; multi_json = { groups = ["default"]; @@ -325,16 +325,6 @@ }; version = "1.15.0"; }; - mutex_m = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; - type = "gem"; - }; - version = "0.2.0"; - }; net-http = { dependencies = ["uri"]; groups = ["default"]; @@ -407,6 +397,16 @@ }; version = "2.1.0"; }; + securerandom = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; + type = "gem"; + }; + version = "0.3.1"; + }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; groups = ["default"]; @@ -433,10 +433,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -454,9 +454,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz"; type = "gem"; }; - version = "0.13.0"; + version = "0.13.1"; }; } diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/applications/networking/cluster/krelay/default.nix deleted file mode 100644 index 61ba6863e6182..0000000000000 --- a/pkgs/applications/networking/cluster/krelay/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "krelay"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "knight42"; - repo = pname; - rev = "v${version}"; - hash = "sha256-tZnHkjsAT8AOIpVDIiHnD6k/2S/S/+jM9uw18TaYJaA="; - }; - - vendorHash = "sha256-5lA7I/vrc6+XsiSCL61a/p7jbseLcJyXnOC5R/z85vQ="; - - subPackages = [ "cmd/client" ]; - - ldflags = [ "-s" "-w" "-X github.com/knight42/krelay/pkg/constants.ClientVersion=${version}" ]; - - postInstall = '' - mv $out/bin/client $out/bin/kubectl-relay - ''; - - meta = with lib; { - description = "Drop-in replacement for `kubectl port-forward` with some enhanced features"; - homepage = "https://github.com/knight42/krelay"; - changelog = "https://github.com/knight42/krelay/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ ivankovnatsky ]; - mainProgram = "kubectl-relay"; - }; -} diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 00e4efc9f7e6e..3ec9e7f791137 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-1/X8HuhzizrkiOyCZ7F6rq6G33oqVaf4uW9Sr94ogL8="; + hash = "sha256-iWu3HnfjT9hiDyl9Ni0xJa/e+E9fbh3bnfrdE1ChaWc="; }; - vendorHash = "sha256-2b/c6t9RkHbBe894DPOETLMf4MpsTjXMtEoVG4FMo24="; + vendorHash = "sha256-dMzDKYjPBAiNFwzaBML76tMylHtBs9Tb2Ulj/WovVJ4="; subPackages = ["cmd"]; diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix index a369bf0d7cbeb..494d5e5e1b2e2 100644 --- a/pkgs/applications/networking/cluster/kubecm/default.nix +++ b/pkgs/applications/networking/cluster/kubecm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecm"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-zyXxMp+59buSwm4fZY62b2xqAmq7XAzhET0qez8oWPs="; + hash = "sha256-Go2lroa8lq1XjIzvdA5ZL/lOjTAyDKopBepqgWzsUII="; }; - vendorHash = "sha256-6RrnsRbQ1+Cx7vnqauisBICgwmvTpJQT32DnIDVc6ts="; + vendorHash = "sha256-BrSYfxftrnNOcPgG/rsTF3OukDd+VlOvE7OJcos7vW4="; ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/applications/networking/cluster/kubecolor/default.nix deleted file mode 100644 index ecd24e4afbe83..0000000000000 --- a/pkgs/applications/networking/cluster/kubecolor/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "kubecolor"; - version = "0.3.3"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-VGpyYc6YmRr58OSRQvWTo4f8ku8L1/gn0ilbQSotO2k="; - }; - - vendorHash = "sha256-Gzz+mCEMQCcLwTiGMB8/nXk7HDAEGkEapC/VOyXrn/Q="; - - ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; - - meta = with lib; { - description = "Colorizes kubectl output"; - mainProgram = "kubecolor"; - homepage = "https://github.com/kubecolor/kubecolor"; - changelog = "https://github.com/kubecolor/kubecolor/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ ivankovnatsky SuperSandro2000 applejag ]; - }; -} diff --git a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix index 5fd38f78ae606..157ff1358ce0b 100644 --- a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.23.3"; + version = "1.24.0"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-78XvVPWhsvu7shbU2fJ+/7NnGxUXLLOeR28OPkUUw2A="; + hash = "sha256-/BUrUksNT6KuVLxJxnBfkU9OEeQU3u7WA6pKqcGnuSU="; }; - vendorHash = "sha256-Y5HmoxMLs2rvpLycH5bMd9awHrNeIOkwn7m53hCAWug="; + vendorHash = "sha256-s1fKwWfOSgRw6eOPc1aZzf1VzaTVHXBjQWd1132vAS0="; subPackages = [ "cmd/kubectl-cnpg" ]; diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix deleted file mode 100644 index 30e835ba2c0ba..0000000000000 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "kubectl-gadget"; - version = "0.31.0"; - - src = fetchFromGitHub { - owner = "inspektor-gadget"; - repo = "inspektor-gadget"; - rev = "v${version}"; - hash = "sha256-f93PdSA3OGiUUXSQn0aUP3o5xfvjiq/3L3Bz9k4OigI="; - }; - - vendorHash = "sha256-lBfz0tzCWKEAAmpvjB2kUJ3aLjlzAjniIu/1aNE80Xg="; - - CGO_ENABLED = 0; - - ldflags = [ - "-s" "-w" - "-X github.com/inspektor-gadget/inspektor-gadget/internal/version.version=v${version}" - "-X main.gadgetimage=ghcr.io/inspektor-gadget/inspektor-gadget:v${version}" - "-extldflags=-static" - ]; - - tags = [ - "withoutebpf" - ]; - - subPackages = [ "cmd/kubectl-gadget" ]; - - meta = with lib; { - description = "Collection of gadgets for troubleshooting Kubernetes applications using eBPF"; - mainProgram = "kubectl-gadget"; - homepage = "https://inspektor-gadget.io"; - license = licenses.asl20; - maintainers = with maintainers; [ kranurag7 devusb ]; - }; -} diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix index 934d1c9151dc1..06c64497747af 100644 --- a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix @@ -28,6 +28,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/kvaps/kubectl-node-shell"; license = licenses.asl20; maintainers = with maintainers; [ jocelynthode ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix index 4d67c3786bdd5..8f912c2670194 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, perl , Security ? null }: @@ -25,8 +24,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; }; - nativeBuildInputs = [ perl ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "kubectl plugin to list allocations (cpu, memory, gpu,... X utilization, requested, limit, allocatable,...)"; diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 65be1f739ae35..f70dcee4682d9 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.47.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-C106krMg4vtRe78hh6emAGBxEApfc5ZorRgTtH+QZ9g="; + sha256 = "sha256-xqupDfcjCSP7uomBCuFlhCAOetZrvSiKehOgCqZKLLg="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index d9ccd5d5148f4..54d7adb9bfb77 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.5.0"; + version = "2.5.11"; src = fetchFromGitHub { - owner = "kubefirst"; + owner = "konstructio"; repo = "kubefirst"; rev = "refs/tags/v${version}"; - hash = "sha256-1VadsiZZii6gI8vdTNfwmbBPuHcgPh4kWZ2jf/EkFKU="; + hash = "sha256-paGb/Ifslj2XsXhY99ETXs72s3vSXAUqTeGPg+Nviho="; }; vendorHash = "sha256-tOCVDp9oClfeBsyZ6gv6HoGPjZByoxxAceV/wxQeBSA="; @@ -19,7 +19,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/kubefirst/runtime/configs.K1Version=v${version}" + "-X=github.com/konstructio/kubefirst-api/configs.K1Version=v${version}" ]; doCheck = false; @@ -27,8 +27,8 @@ buildGoModule rec { meta = with lib; { description = "Tool to create instant GitOps platforms that integrate some of the best tools in cloud native from scratch"; mainProgram = "kubefirst"; - homepage = "https://github.com/kubefirst/kubefirst/"; - changelog = "https://github.com/kubefirst/kubefirst/releases/tag/v${version}"; + homepage = "https://github.com/konstructio/kubefirst/"; + changelog = "https://github.com/konstructio/kubefirst/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ qjoly ]; }; diff --git a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix deleted file mode 100644 index baa070a17608b..0000000000000 --- a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "kubelogin"; - version = "1.29.0"; - - src = fetchFromGitHub { - owner = "int128"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-fGCllV07YustUIX1XiSvsC42obDOgl2yV5ruQMT2R0c="; - }; - - subPackages = ["."]; - - vendorHash = "sha256-wtxSoRSpmRwuIOdKGmCRR+QLwOvONiiltg6KL6t2cf8="; - - # Rename the binary instead of symlinking to avoid conflict with the - # Azure version of kubelogin - postInstall = '' - mv $out/bin/kubelogin $out/bin/kubectl-oidc_login - ''; - - meta = with lib; { - description = "Kubernetes credential plugin implementing OpenID Connect (OIDC) authentication"; - mainProgram = "kubectl-oidc_login"; - inherit (src.meta) homepage; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - }; -} diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 62bcad9f2510e..d888cdfe5d6ce 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-H+EzSsXCjURMBJW9+1EWXsfO4faUXcTcYckK/QJYEFk="; + hash = "sha256-+9Dw6W/Tbg7zRC/ARuuXqZGTcMeSrtdoTvHtsQevigg="; }; vendorHash = "sha256-z1BBE+PH2s7VxWNxneu5y2ZerfzCZNPJowZJVq821Kk="; diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix index 3c5cf3ee52d27..b6262cf857003 100644 --- a/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-yN5tpe3ayQPhTlBvxlt7CD6mSURCB4lxGatEK9OThzs="; + sha256 = "sha256-FOXnerB6qmUUotWLlTTsR5x0+A0Q9D8PVDTMG8j8b9o="; }; - vendorHash = "sha256-VJkqg2cnpYHuEYOv5+spoyRWFAdFWE7YIVYaN9OmIZM="; + vendorHash = "sha256-rgU6Yv+gmKShWfpPaWtK2VIBPgFSsPVOnUzIp2+V7oI="; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index 1176f0f28f684..b7036251b77ab 100644 --- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -27,6 +27,7 @@ kubernetes.overrideAttrs (_: rec { meta = kubernetes.meta // { description = "Kubernetes CLI"; homepage = "https://github.com/kubernetes/kubectl"; + mainProgram = "kubectl"; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index d5e4a9d4ca7ec..27eb93f118249 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.3.78"; + version = "52.3.82"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-tv0yBm10bUCepa03GUQlok6cP0bIuG7sgunX8iAUjO4="; + hash = "sha256-PjQX+OAE2UujGc+XHn2izrHgjvGbSK84IU9z5aBM+VM="; }; - vendorHash = "sha256-b3Aq3970E19jOJPjw/e0ly1W9x9HiDN+bfuB4uP09BY="; + vendorHash = "sha256-fjkuDX6SC23An0zZW0ocoFJ/K6JKsyVUQdxzfHCUFJs="; ldflags = let t = "github.com/kubeshark/kubeshark"; in [ "-s" "-w" diff --git a/pkgs/applications/networking/cluster/kubevela/default.nix b/pkgs/applications/networking/cluster/kubevela/default.nix index caa2519af57aa..1c8b618518702 100644 --- a/pkgs/applications/networking/cluster/kubevela/default.nix +++ b/pkgs/applications/networking/cluster/kubevela/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "kubevela"; - version = "1.9.11"; + version = "1.9.12"; src = fetchFromGitHub { owner = "kubevela"; repo = "kubevela"; rev = "v${version}"; - hash = "sha256-u9UGV1UwZoj4eSqqMLf8BvsfTFIYagoslN5pflDKm8c="; + hash = "sha256-AltyaV4tFW/3nOzEgWwlIqFXVaEtcpN5IxdFScZ7Nes="; }; - vendorHash = "sha256-NnUZnlvVb2VmNx4HM8lkbTNcQA3/pctkg1UVpOY8Acs="; + vendorHash = "sha256-Ethbor1nZRYuemBL03QdnExNJtdOJ4w76sjLrBDW9Aw="; ldflags = [ "-s" "-w" diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 1351b9fe7051d..54c014fb4e684 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { inherit pname; - version = "2.8.2"; + version = "2.8.3"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-znjOMegh0lgFDonUXtRfs+1ZMN5Olzz01E2tX+tRcns="; + hash = "sha256-wGEO7DJLWy/d6SYsTb8EZhF9c1ptYBXDL/Owter4nfo="; }; - vendorHash = "sha256-FEdDOpz6C89OlzU3Pl4Uu6P0WgM4QsuccQ9vAHnb4xI="; + vendorHash = "sha256-PAW2Byzz6Ky4I51QrJoNoyn1QH/i0SeU2dDHvj2BqXM="; # no test files doCheck = false; diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index c6402dbb103ba..88b8cfc73a338 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.18.0"; + version = "0.19.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-wTnBMNgwHqK8PdpEa3RAsVJemnGw/ymn6GJciPFsYrU="; + sha256 = "sha256-7fcVmLvRbKYuWuqwqZWlQf08YEyowcTxrp5RteV8qyU="; }; - vendorHash = "sha256-RKQM1JxyZA1HwqRjCULY4X3jZK9SgclW55/qXp395cQ="; + vendorHash = "sha256-E6gzr9gCLbRaoJU/pYA2cAy0rv5SUVmwf0m34lchF+M="; subPackages = [ "cmd/kubectl-kuttl" ]; diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index 3e59a1fc23df7..98c9ca2d1758d 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -35,7 +35,7 @@ let platforms = builtins.attrNames sources; }; -in if stdenv.isDarwin then +in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname version src meta; } else callPackage ./linux.nix { inherit pname version src meta; } diff --git a/pkgs/applications/networking/cluster/lens/linux.nix b/pkgs/applications/networking/cluster/lens/linux.nix index 4a68ce6468924..5b43a6c962107 100644 --- a/pkgs/applications/networking/cluster/lens/linux.nix +++ b/pkgs/applications/networking/cluster/lens/linux.nix @@ -9,9 +9,10 @@ in appimageTools.wrapType2 { inherit pname version src meta; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 341e9767a9023..32aaffc07374c 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.8.2"; - sha256 = "0jvyw002xy5zdb27q02r3bj88138zpc73an61sbgmls3jwp9w9iq"; - vendorHash = "sha256-16tdpREYDJDvwIZLpwCxGsZGERxMdSyPH7c6wbD2GCI="; + version = "24.9.3"; + sha256 = "1vm6f8abain3zjs3jymr62p7lk475av38pljczgb13fgnn2w6qii"; + vendorHash = "sha256-w7TchPXGQQSWcCVf4BMvh5U8qnkctgJAl0sHL6ml/8Y="; } diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index 6a01cb5134cd4..8c145ef6393f0 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -2,14 +2,19 @@ python3.pkgs.buildPythonApplication rec { pname = "luigi"; - version = "3.5.1"; + version = "3.5.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/HkLJ0dRXdGcZz77uOTJrOX0xc3DH45/k9xmfesuxsg="; + hash = "sha256-0AD+am6nfJN2Z0/oegRawAw/z36+hBRlWgZjCqnbURE="; }; - propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 tenacity ]; + build-system = [ python3.pkgs.setuptools ]; + + dependencies = with python3.pkgs; [ python-dateutil tornado python-daemon tenacity ]; + + pythonImportsCheck = [ "luigi" ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 90f94c459742d..a367c8bc3aab3 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.33.1"; + version = "1.34.0"; - vendorHash = "sha256-VHl6CKPWqahX70GHbZE6SVa8XPfiC912DvsOteH2B0w="; + vendorHash = "sha256-gw5Ol7Gp26KyIaiMvwik8FJpABpMT86vpFnZnAJ6hhs="; doCheck = false; @@ -25,18 +25,18 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-z0wNngEzddxpeeLyQVA2yRC5SfYvU5G66V95sVmW6bA="; + sha256 = "sha256-Z7x3MOQUF3a19X4SSiIUfSJ3xl3482eKH700m/9pqcU="; }; postPatch = ( - lib.optionalString (withQemu && stdenv.isDarwin) '' + lib.optionalString (withQemu && stdenv.hostPlatform.isDarwin) '' substituteInPlace \ pkg/minikube/registry/drvs/qemu2/qemu2.go \ --replace "/usr/local/opt/qemu/share/qemu" "${qemu}/share/qemu" \ --replace "/opt/homebrew/opt/qemu/share/qemu" "${qemu}/share/qemu" '' ) + ( - lib.optionalString (withQemu && stdenv.isLinux) '' + lib.optionalString (withQemu && stdenv.hostPlatform.isLinux) '' substituteInPlace \ pkg/minikube/registry/drvs/qemu2/qemu2.go \ --replace "/usr/share/OVMF/OVMF_CODE.fd" "${OVMF.firmware}" \ @@ -46,7 +46,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; - buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; + buildInputs = if stdenv.hostPlatform.isDarwin then [ vmnet ] else if stdenv.hostPlatform.isLinux then [ libvirt ] else null; buildPhase = '' make COMMIT=${src.rev} diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index af9c96c6c5eb1..7d27205855c4a 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-z83c8Ji0zSM1QDwjB4FwhHW6XCqG0Hb5crM3jjK46jk="; + hash = "sha256-GHFs8QvLcXu+DZ851TCLI7EVc9wMS5fRC4TYBXzyv3Q="; }; - vendorHash = "sha256-KqWmwwQRrWoyRehuSJBnlyPQgwk5hUGk2/d0Ue/reVc="; + vendorHash = "sha256-5LRsT04T/CKv+YHaiM2g6giimWWXyzPju3iZuj2DfAY="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index d9d31d94ac96b..88c426565fc4e 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -19,13 +19,13 @@ let }; plugins = ps: _super: with ps; rec { - nixops-aws = callPackage ./plugins/nixops-aws.nix { }; nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; + nixops-aws = throw "nixops-aws was broken and was removed from nixpkgs"; nixops-gce = throw "nixops-gce was broken and was removed from nixpkgs"; nixops-libvirtd = throw "nixops-libvirtd was broken and was removed from nixpkgs"; nixops-hetzner = throw "nixops-hetzner was broken and was removed from nixpkgs"; @@ -42,7 +42,7 @@ let selectedPlugins = []; # selector is a function mapping pythonPackages to a list of plugins - # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) + # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-digitalocean ]) withPlugins = selector: this.extend (this: _old: { selectedPlugins = selector this.availablePlugins; @@ -109,8 +109,6 @@ in # Not recommended; too fragile. nixops_unstable_full = minimal.withPlugins (ps: [ - # currently broken - # ps.nixops-aws ps.nixops-digitalocean ps.nixops-encrypted-links ps.nixops-hercules-ci diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix deleted file mode 100644 index 895794d3e0f66..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, unstableGitUpdater -, poetry-core -, boto -, boto3 -, nixops -, nixos-modules-contrib -, typing-extensions -}: - -buildPythonPackage { - pname = "nixops-aws"; - version = "1.0.0-unstable-2024-02-29"; - pyproject = true; - - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nixops-aws"; - rev = "d173b2f14ec767d782ceab45fb22b32fe3b5a1f7"; - hash = "sha256-ocTtc7POt1bugb9Bki2ew2Eh5uc933GftNw1twoOJsc="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api \ - --replace "poetry>=" "poetry-core>=" - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - buildInputs = [ - nixops - ]; - - propagatedBuildInputs = [ - boto - boto3 - nixos-modules-contrib - typing-extensions - ]; - - pythonImportsCheck = [ "nixops_aws" ]; - - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - - meta = with lib; { - description = "AWS plugin for NixOps"; - homepage = "https://github.com/NixOS/nixops-aws"; - license = licenses.lgpl3Only; - broken = true; # fails with `nose-1.3.7 not supported for interpreter python3.12` - maintainers = nixops.meta.maintainers; - }; -} diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 4daed56dd9d37..e30d89a9a34c4 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -20,15 +20,15 @@ buildGoModule rec { # Linux-only feature. See 'ENABLE_JOURNALD' upstream: # https://github.com/kubernetes/node-problem-detector/blob/master/Makefile subPackages = [ "cmd/nodeproblemdetector" ] ++ - lib.optionals stdenv.isLinux [ "cmd/logcounter" ]; + lib.optionals stdenv.hostPlatform.isLinux [ "cmd/logcounter" ]; preBuild = '' - export CGO_ENABLED=${if stdenv.isLinux then "1" else "0"} + export CGO_ENABLED=${if stdenv.hostPlatform.isLinux then "1" else "0"} ''; - buildInputs = lib.optionals stdenv.isLinux [ systemd ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd ]; - tags = lib.optionals stdenv.isLinux [ "journald" ]; + tags = lib.optionals stdenv.hostPlatform.isLinux [ "journald" ]; ldflags = [ "-X k8s.io/${pname}/pkg/version.version=v${version}" diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index c79fe32939dcb..fae25a6ec623e 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,6 +1,5 @@ { lib , buildGoModule -, buildGo121Module , buildGo122Module , fetchFromGitHub , nixosTests @@ -61,17 +60,7 @@ rec { nomad_1_5 = throwUnsupportaed "nomad_1_5"; - nomad_1_6 = generic { - buildGoModule = buildGo121Module; - version = "1.6.10"; - sha256 = "sha256-kiMdpJzjF0S7lrTX3sBFkWm0Gac9a+qlwCPcMKeVXXQ="; - vendorHash = "sha256-qnsPPV/NWTrqUa1v1CL16WfCH7B0zW9ZSnEmtqvotqI="; - license = lib.licenses.mpl20; - passthru.tests.nomad = nixosTests.nomad; - preCheck = '' - export PATH="$PATH:$NIX_BUILD_TOP/go/bin" - ''; - }; + nomad_1_6 = throwUnsupportaed "nomad_1_6"; nomad_1_7 = generic { buildGoModule = buildGo122Module; @@ -87,9 +76,9 @@ rec { nomad_1_8 = generic { buildGoModule = buildGo122Module; - version = "1.8.3"; - sha256 = "sha256-u1R5lG9fpIbAePLlDy+kk2hQpFdT1VIY0sMskHJZ19w="; - vendorHash = "sha256-5Gn37hFVDkUlyv4MVZMH9PlpyWAyWE5RTFQyuMIA/Bc="; + version = "1.8.4"; + sha256 = "sha256-BzLvALD65VqWNB9gx4BgI/mYWLNeHzp6WSXD/1Xf0Wk="; + vendorHash = "sha256-0mnhZeiCLAWvwAoNBJtwss85vhYCrf/5I1AhyXTFnWk="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix index f83347d0538e6..1b2b5568cdd1f 100644 --- a/pkgs/applications/networking/cluster/ocm/default.nix +++ b/pkgs/applications/networking/cluster/ocm/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ''; # Tests fail in Darwin sandbox. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = '' installShellCompletion --cmd ocm \ diff --git a/pkgs/applications/networking/cluster/openlens/default.nix b/pkgs/applications/networking/cluster/openlens/default.nix deleted file mode 100644 index 4581aef00e2d3..0000000000000 --- a/pkgs/applications/networking/cluster/openlens/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, fetchurl, appimageTools }: - -let - pname = "openlens"; - version = "6.5.2-366"; - - src = fetchurl { - url = "https://github.com/MuhammedKalkan/OpenLens/releases/download/v${version}/OpenLens-${version}.x86_64.AppImage"; - sha256 = "sha256-ZAltAS/U/xh4kCT7vQ+NHAzWV7z0uE5GMQICHKSdj8k="; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; - -in -appimageTools.wrapType2 { - inherit pname version src; - unshareIpc = false; - - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/open-lens.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/open-lens.png \ - $out/share/icons/hicolor/512x512/apps/${pname}.png - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Icon=open-lens' 'Icon=${pname}' \ - --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - - meta = with lib; { - description = "Kubernetes IDE"; - homepage = "https://github.com/MuhammedKalkan/OpenLens"; - license = licenses.mit; - maintainers = with maintainers; [ benwbooth sebtm ]; - mainProgram = "openlens"; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 2ac931ba414bf..ea67231bfcc81 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -60,7 +60,7 @@ buildGoModule rec { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; homepage = "http://www.openshift.org"; license = licenses.asl20; - maintainers = with maintainers; [ offline bachp moretea stehessel ]; + maintainers = with maintainers; [ offline moretea stehessel ]; mainProgram = "oc"; }; } diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index 74d5fd9b30f20..3619742d8a901 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,13 +14,13 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-mMp3X2jXBQi/lRbqdiBa1UMYPKXl4jEvTHXxbPji5D8="; + hash = "sha256-+1ctvUz1Prhon+w5fGO+IQCYl7uEMZwAYMfQut7fmO4="; }; vendorHash = "sha256-cM2DSP2ss3vleUhPBIdyxKeWJxtHpdjL5b5HVS/iC6o="; diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 24888e39f4856..56bad49da759d 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.11.1"; + version = "2.11.3"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-dg93x73Lg0JGE/q67ae+ugLrVXDRftsZRLslaPryui8="; + hash = "sha256-tn+wOd01zClMcANYTolXHTEMGohXGNnKbsZ5NA4kELc="; }; vendorHash = "sha256-d2MSMucGMGGPLE0wh8Y27AUVPkeyOCkCa0JSPawYQmc="; diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index f6e75ebd0648d..66bd0f480bdb5 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pluto"; - version = "5.20.1"; + version = "5.20.3"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-M0top2czb9iPbA0JxDZwRrNT5sEUi8E3uTB+eCN4RDY="; + hash = "sha256-WbXIg453VewOejX/hyGi1DEi0cSwcQ+hKUFG8Ne4cPE="; }; vendorHash = "sha256-VkaFANSzKOpmHWUwFp7YjwvsJegcJOrvJOBNNAIxOak="; diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix deleted file mode 100644 index 1ef34b011ef80..0000000000000 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "prow-unstable"; - version = "2020-04-01"; - rev = "32e3b5ce7695fb622381421653db436cb57b47c5"; - - src = fetchFromGitHub { - inherit rev; - - owner = "kubernetes"; - repo = "test-infra"; - hash = "sha256-ZNa7iAcN1qlBFT/UfziivW4q+9hjIt9WbHEOt6r1g1U="; - }; - - vendorHash = "sha256-FJO8KVCZLehaN1Eku6uQpj/vgwOyO+Irqs0qJHJhzZk="; - - doCheck = false; - - subPackages = [ - "prow/cmd/admission" - "prow/cmd/branchprotector" - "prow/cmd/checkconfig" - "prow/cmd/clonerefs" - "prow/cmd/cm2kc" - "prow/cmd/config-bootstrapper" - "prow/cmd/crier" - "prow/cmd/deck" - "prow/cmd/entrypoint" - "prow/cmd/exporter" - "prow/cmd/gcsupload" - "prow/cmd/gerrit" - "prow/cmd/hook" - "prow/cmd/horologium" - "prow/cmd/initupload" - "prow/cmd/jenkins-operator" - "prow/cmd/mkbuild-cluster" - "prow/cmd/mkpj" - "prow/cmd/mkpod" - "prow/cmd/peribolos" - "prow/cmd/phaino" - "prow/cmd/phony" - "prow/cmd/pipeline" - "prow/cmd/plank" - "prow/cmd/sidecar" - "prow/cmd/sinker" - "prow/cmd/status-reconciler" - "prow/cmd/sub" - "prow/cmd/tackle" - "prow/cmd/tide" - "prow/cmd/tot" - ]; - - meta = with lib; { - description = "Kubernetes based CI/CD system"; - longDescription = '' - Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various - types of events and report their status to many different services. In - addition to job execution, Prow provides GitHub automation in the form of - policy enforcement, chat-ops via /foo style commands, and automatic PR - merging. - ''; - homepage = "https://github.com/kubernetes/test-infra/tree/master/prow"; - license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/applications/networking/cluster/rancher/default.nix index ab781a71ec7e5..820cc94d93133 100644 --- a/pkgs/applications/networking/cluster/rancher/default.nix +++ b/pkgs/applications/networking/cluster/rancher/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rancher"; - version = "2.7.7"; + version = "2.9.0"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; rev = "v${version}"; - hash = "sha256-HgLV4iuZXkL6BOKtUul1pFuIWv09VnUSPbdrtFd6Khk="; + hash = "sha256-YyNzqihoQNMmROLeD7/KOU6mTe/UMKgRwGPxCjIglDM="; }; ldflags = [ @@ -19,7 +19,7 @@ buildGoModule rec { "-static" ]; - vendorHash = "sha256-mXLZMnGJ1m5gFroJcSoE4SbVvsyuS73hfXFeWBRtUdI="; + vendorHash = "sha256-BvT5Awn4o8AbCSaUPLuAIsayC2oj2to4VSZpxQlKKSM="; postInstall = '' mv $out/bin/cli $out/bin/rancher diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix index 3f44a9cff7105..6dc8052967643 100644 --- a/pkgs/applications/networking/cluster/rke/default.nix +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rke"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-ZxNU76W7IGSn1cdzmiLI/eMO3dAd8bUQX+1cvANci2k="; + hash = "sha256-KBN7QFjH9wr5G40/224BcTz59aHu+HZISU+LMr54b9c="; }; vendorHash = "sha256-Rr2BXCpliv9KF9wkXQLy6LxKxyPo1pO5SHUTcy2wETM="; diff --git a/pkgs/applications/networking/cluster/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix index 58a9d6c629ea8..21941ad8ee0a2 100644 --- a/pkgs/applications/networking/cluster/rke2/builder.nix +++ b/pkgs/applications/networking/cluster/rke2/builder.nix @@ -91,7 +91,7 @@ buildGoModule rec { package = rke2; version = "v${version}"; }; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) rke2; }; diff --git a/pkgs/applications/networking/cluster/rke2/latest/versions.nix b/pkgs/applications/networking/cluster/rke2/latest/versions.nix index 9cf3dfe955d73..f04ea8df2eb01 100644 --- a/pkgs/applications/networking/cluster/rke2/latest/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/latest/versions.nix @@ -1,14 +1,14 @@ { - rke2Version = "1.30.3+rke2r1"; - rke2RepoSha256 = "1ix7mm11j9ir9xz0yypznja5mcbizibclh314sgcsfxhg39w4a70"; - rke2Commit = "e742dc53b463d205773cfb25633309671ce6777c"; - rke2VendorHash = "sha256-6ma0t0ElZ13VTS/aK5AknJ00F45kZXn36b5sePK2wh0="; - k8sVersion = "v1.30.3"; - k8sImageTag = "v1.30.3-rke2r1-build20240717"; + rke2Version = "1.31.0+rke2r1"; + rke2RepoSha256 = "1xf7yhpfwiydhl31dd8wc2bhq0j470ad8vazjzzsl76skcy07rbc"; + rke2Commit = "4bf1156f41631dc0e81d66a6834a53d14b48aaef"; + rke2VendorHash = "sha256-/ALzC2fYYI+DbF+2TSNBiMy57T8wfXGPpdyKtbqdrtE="; + k8sVersion = "v1.31.0"; + k8sImageTag = "v1.31.0-rke2r1-build20240815"; etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; ccmVersion = "v1.29.3-build20240515"; - dockerizedVersion = "v1.30.3-dev."; + dockerizedVersion = "v1.31.0-dev."; golangVersion = "go1.22.5"; - eol = "2025-06-28"; + eol = "2025-10-28"; } diff --git a/pkgs/applications/networking/cluster/rke2/stable/versions.nix b/pkgs/applications/networking/cluster/rke2/stable/versions.nix index 58b0eb57b80c5..ee2c9ceebc1f0 100644 --- a/pkgs/applications/networking/cluster/rke2/stable/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/stable/versions.nix @@ -1,14 +1,14 @@ { - rke2Version = "1.28.11+rke2r1"; - rke2RepoSha256 = "1mkl7mnlsq2j9n610jnr9545hq6ilr5sdg8jxjxjbk9lnmmbvrm1"; - rke2Commit = "6b12d7a783238b72da8450fa1b6ec587cebb79ed"; - rke2VendorHash = "sha256-VenNSaa86nbhrFYzXPbj0fxbDlrIu6pxqMo+HPDuUxs="; - k8sVersion = "v1.28.11"; - k8sImageTag = "v1.28.11-rke2r1-build20240619"; + rke2Version = "1.30.4+rke2r1"; + rke2RepoSha256 = "1daxs8gxy775qn1yrf7zh77cyaj3nn3qlwj0vjqfpbv1gpkimfyi"; + rke2Commit = "9517eea519b780e154dd791c555c698e84a0e5cd"; + rke2VendorHash = "sha256-Q+Wt4Hyp6VyxfCXNsRQMyAo0QCGWhnY9tcV/NQrrSEY="; + k8sVersion = "v1.30.4"; + k8sImageTag = "v1.30.4-rke2r1-build20240815"; etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; ccmVersion = "v1.29.3-build20240515"; - dockerizedVersion = "v1.28.11-rke2r1"; - golangVersion = "go1.21.11"; - eol = "2024-10-28"; + dockerizedVersion = "v1.30.4-dev.877838a0-dirty"; + golangVersion = "go1.22.5"; + eol = "2025-06-28"; } diff --git a/pkgs/applications/networking/cluster/rke2/testing/versions.nix b/pkgs/applications/networking/cluster/rke2/testing/versions.nix index 1ba579e917ed8..5cf0039d5abd8 100644 --- a/pkgs/applications/networking/cluster/rke2/testing/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/testing/versions.nix @@ -1,14 +1,14 @@ { - rke2Version = "1.30.3-rc5+rke2r1"; - rke2RepoSha256 = "1ix7mm11j9ir9xz0yypznja5mcbizibclh314sgcsfxhg39w4a70"; - rke2Commit = "e742dc53b463d205773cfb25633309671ce6777c"; - rke2VendorHash = "sha256-6ma0t0ElZ13VTS/aK5AknJ00F45kZXn36b5sePK2wh0="; - k8sVersion = "v1.30.3"; - k8sImageTag = "v1.30.3-rke2r1-build20240717"; + rke2Version = "1.31.1-rc3+rke2r1"; + rke2RepoSha256 = "1j09f95d99xk1jbsy08cl1rw5y1ljnrmq3nv1rixlc4hgqwz56pm"; + rke2Commit = "909d20d6a28cd7656b7177190f06f69f57927613"; + rke2VendorHash = "sha256-7nWbWi4oJTOWZ5iZr9ptECDJJakPg4qZ7hW+tU7LBsI="; + k8sVersion = "v1.31.1"; + k8sImageTag = "v1.31.1-rke2r1-build20240912"; etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; - ccmVersion = "v1.29.3-build20240515"; - dockerizedVersion = "v1.30.3-dev."; - golangVersion = "go1.22.5"; - eol = "2025-06-28"; + ccmVersion = "v1.31.0-build20240910"; + dockerizedVersion = "v1.31.1-dev."; + golangVersion = "go1.22.6"; + eol = "2025-10-28"; } diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 53e18967700b8..ddabe261bfba7 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.5.1"; + version = "4.5.3"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-EYhp07G4a3dhnNrWzz6BtFpcgoYHosGdY2sDUYcS9QA="; + sha256 = "sha256-TWmbpU27ZGG8L66TW3yWoxUO8M4N6mMOmLv2VVXM+Q4="; }; - vendorHash = "sha256-Z7EkKVrwTzoD1BwaPhLr6XVtq/dctPJwH+KgyN3ZbUU="; + vendorHash = "sha256-qDSi1Jk6erSCwPiLubdVlqOT6PQygMQghS8leieJ78s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index f717ec92267f0..86e98c3a419d0 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -2,9 +2,7 @@ , stdenv , fetchzip , makeWrapper -, jdk8 , python3 -, coreutils , hadoop , RSupport ? true , R diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index d7b73979dfb80..583aa3bf063ab 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.7.6"; + version = "1.8.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-uyPnln1Cj4j1oPVERBIHMJXJWR+jPUq6AE7rZXr2yQo="; + hash = "sha256-Ezie6RQsigmJgdvnSVk6awuUu2kODSio9DNg4bow76M="; }; - vendorHash = "sha256-ZJGhPT2KYYIMKmRWqdOppvXSD2W8kYtxK/900TdVdUg="; + vendorHash = "sha256-9qkealjjdBO659fdWdgFii3ThPRwKpYasB03L3Bktqs="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index fd805916ab03b..1a734bc0eb91d 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,18 +2,20 @@ buildGoModule rec { pname = "tanka"; - version = "0.27.1"; + version = "0.28.2"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4ChTYwRp9R8U97hH1Bgrxr5a/5IoWRAmFgJbD7oJpO4="; + sha256 = "sha256-KXOH2CSGG0esgpgU85mszoYnYHc9XhdYoAtr3DFR30g="; }; - vendorHash = "sha256-u2l3cX8PKHUCPkHuCOyED2LLWygYCDJEhfTjycEBzHI="; + vendorHash = "sha256-MJwizWd2X4YE0QhwCxw3FX7+Z5HxakYjBttu8KGLsWo="; doCheck = false; + # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK + env.GOWORK = "off"; subPackages = [ "cmd/tk" ]; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index ff3202d2dd784..84cc60af542d2 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-gg3FhPDXqnn3y/tcvlHTd0t8KxtPGTrN/2buBSVffBg="; + sha256 = "sha256-FZbuYKYT/LJ9php66N2RYGGYDJxDI9fWfIZAI8X+iRk="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index e25092409c6f1..101d3baa6c5df 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -17,16 +17,16 @@ let tctl-next = buildGoModule rec { pname = "tctl-next"; - version = "0.13.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-bh0UsXA5yHtvP9femOwEzVzmu1VLz2uZwoIHL/kI7kM="; + hash = "sha256-y0C2z2iMMQSG5+xGngZ98+ixIgbvaQxPdAWuPbEbBAY="; }; - vendorHash = "sha256-ziCJG722c32QAh9QmoC2E7TcLiC2InKwfdC9mkanTsU="; + vendorHash = "sha256-zhGqDHdVGg7eGnw5L3eSyXKBTjp85ir5zrtf7HbXmC0="; inherit overrideModAttrs; @@ -37,11 +37,11 @@ let ldflags = [ "-s" "-w" - "-X github.com/temporalio/cli/headers.Version=${version}" + "-X github.com/temporalio/cli/temporalcli.Version=${version}" ]; # Tests fail with x86 on macOS Rosetta 2 - doCheck = !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); preCheck = '' export HOME="$(mktemp -d)" diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 1b81c59e713b4..93f71492b2bec 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.24.2"; + version = "1.25.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-hQkus8BZvtR2ObCJbtP2SZST9tRxuPjFwR+jKDYH8Bs="; + hash = "sha256-H/kHPS43h+MQgOpKIHoM6hJQxCYq8Yo1GzOQeLFRoNw="; }; - vendorHash = "sha256-u9xQFTwVKEGRPhBwcBgexCQhlNO91yP4m4vchCdBt9E="; + vendorHash = "sha256-RhWeIT1i86wxAALNhhpWZjWo1v+82vTrGBWCaryE3Ws="; excludedPackages = [ "./build" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 9e4d3d824f7b2..2b34e7c6d544d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildGoModule +, buildGo123Module , fetchFromGitHub , fetchFromGitLab , callPackage @@ -24,7 +25,7 @@ let , deleteVendor ? false , proxyVendor ? false , mkProviderFetcher ? fetchFromGitHub - , mkProviderGoModule ? buildGoModule + , mkProviderGoModule ? buildGo123Module # "https://registry.terraform.io/providers/vancluever/acme" , homepage ? "" # "registry.terraform.io/vancluever/acme" diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f883b0ff82af8..35ba84a27c26a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -9,13 +9,13 @@ "vendorHash": null }, "acme": { - "hash": "sha256-LlpPc3um4D2nNJFZRoXnw5ss0E0rrJN0wKKmuV0S6NU=", + "hash": "sha256-RboEWeTUgEZShZ9NrR9yuUzbGPq9wauTyoFiHXZS2oI=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.24.2", + "rev": "v2.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ptZ14WWarYeKT8gIcUDi4LmCFkpoTwAhSwMXmLPlWxs=" + "vendorHash": "sha256-pJlt35kPV3CYOE4RiIjHLT9YEwSreQHgzRuY3ba9oBk=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -27,29 +27,29 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-X3KtT4Thsf7bYeZJEUphRiXAlNamabFE0rjS636dJSY=", + "hash": "sha256-cNcF8pyqRR1YEc2RuKhOtcpFDkdFU8OFCYHRhefdHHk=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.20.0", + "rev": "v4.24.0", "spdx": "MIT", - "vendorHash": "sha256-QzbtTp78tROVj8kPYzjP5kBRHASlvqK6xpmRnJF6jsw=" + "vendorHash": "sha256-ENH/TfC/Yv+jjn4giiThfj9SatFxkfwR/Xj3W+FT/Lg=" }, "akamai": { - "hash": "sha256-jDCrNDJ6O9dXE6bG4GAMFytlVbEe/Z8mb6vx4DG355U=", + "hash": "sha256-d4unurf1WYmVx5z698kAeqKslkVH+tM8G4hrCofDtUs=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v6.2.0", + "rev": "v6.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-QQaLUJJs/7hfLTIOIkG9WF7XmkLXsJP9MOQAvQoDQOw=" + "vendorHash": "sha256-qnKpQpK/AoFOxPiGHkUMqcF5loc0hVbqOuPaDLzj1Es=" }, "alicloud": { - "hash": "sha256-WaMvv/NqyblA2rrauZ7p4pHCND6S6/kfBKS/2xIrcjI=", + "hash": "sha256-lVQAkdwrnZrSZlBqNj2BBpQwzI0d5c+NGaKJxVpgQPg=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.226.0", + "rev": "v1.230.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -63,13 +63,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { - "hash": "sha256-jkqbj7NGrTQeMQcg52JVurV3ce8iosxAJjBGdoQ3PLY=", + "hash": "sha256-Xm9BT8O18aTIa1h166dElYaTq4PlC4u7TgFgCfcC6jI=", "homepage": "https://registry.terraform.io/providers/hashicorp/archive", "owner": "hashicorp", "repo": "terraform-provider-archive", - "rev": "v2.4.2", + "rev": "v2.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-buKYDNVCIcSDLCrCL4ZAKNQ7HqkH3+/7RHjyyR4dLmU=" + "vendorHash": "sha256-b8yGtOUZezGRgURXigv8ySaxxHN/vCCDPgoDC5EBlok=" }, "argocd": { "hash": "sha256-dHIvMFz5XIxxBvBFsEw8lqi6yVoYM9E4tLIoTY+mdiQ=", @@ -81,22 +81,22 @@ "vendorHash": "sha256-yyTU+D4zMDcJPZ9j7a2ZuPjGBCHvED5R0rvevCEaoAI=" }, "artifactory": { - "hash": "sha256-j9TtO8dJltf7SZdlMZaiCWdJbcEPloPbDhYfWcCzgss=", + "hash": "sha256-m6eRhNPxMa08OYYkFDt+Ew2iCkJdI/5aQth9qiE0v4o=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v11.1.0", + "rev": "v11.9.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-nPEN1ee0RmNpgKIlz0jHcHkG6oYZn7LV/Gmmdd9krq8=" + "vendorHash": "sha256-+3EemRl+rKoCg2HpHvjMPvN6ajrDOnO5C98NVGkYdo4=" }, "auth0": { - "hash": "sha256-Ay/EPlAxpEehbDsOeOyOViwT3jDsd3FmpHB5sxnAxAs=", + "hash": "sha256-Yltf+s1gEgP/dbX8EuK45VPBAEzelP+CAcllUaqvnAQ=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.3.0", + "rev": "v1.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oc6ZI5j7pqiiFgfbaTARb6sn+Ma/rqrupv/RPN05mrc=" + "vendorHash": "sha256-76Uf6vQpQ6GlumPHd1uBi0gO5aGmm/HAhNY3I7WCr8k=" }, "avi": { "hash": "sha256-OKUxIJO5WR8ZVkhst1xIgxKsAy+9PNHOmG2NsaRUxFY=", @@ -108,22 +108,22 @@ "vendorHash": "sha256-Sq304WOdKx4J1sD1+YA7uDi+uQtUiXa+BISs/j87dWw=" }, "aviatrix": { - "hash": "sha256-84MtHPrDVaLMQQYnAfuP/pZuzruWxUTLpziwn3ny1oU=", + "hash": "sha256-erBjyDX6xG8lpqcPq8iqgsanJKLuSgmiW/9PC8Xbyag=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.1.4", + "rev": "v3.1.5", "spdx": "MPL-2.0", "vendorHash": null }, "aws": { - "hash": "sha256-DJ0mfqcWIs1iLSEfhlYEgHr1PKz8HchlgvHfEwIAnlA=", + "hash": "sha256-Fmhb3mKRviYsl3qQfXuQMI6KBpmDN0rtwJxDjSkj4EM=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.57.0", + "rev": "v5.66.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NlFP7cRE+6PiGMSz2y/SDQas/TNWAJk/EBEqIeG2INY=" + "vendorHash": "sha256-9DWxMDsyWl/bczvbPOmdRTwjIYAKTuNXyBzrCHExNUA=" }, "azuread": { "hash": "sha256-UOaEfmhGPrqQBkodNYybYb5rnB3X8wpXKHlpKqZnnXU=", @@ -135,11 +135,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-3EHm4fpeYJYzwrwaQLMdgFq1dgmV755WwAhKBG3f10M=", + "hash": "sha256-tCZKDqMrmwAGqs4eoMWj4lty4aVOkzF16RpEl24GNPc=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.111.0", + "rev": "v4.1.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -153,20 +153,20 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-uKIBimMMTManwztb4vdMCpsRWMr6GB8O7vK850sVI2g=", + "hash": "sha256-kLEEbBQ1YdxJkvCCHzpGHBX2wC9JtLVY6chZEmAziSU=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.21.8", + "rev": "v1.21.9", "spdx": "MPL-2.0", "vendorHash": null }, "bigip": { - "hash": "sha256-F7AD3Wb6R6exPRcEByOTuEQFdYSJB+V2cVotO2cabt0=", + "hash": "sha256-jCQgjxGBSy2d9DIJeshLVdj6N/SXWEPcd5EpJ5GAXe4=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.2", + "rev": "v1.22.3", "spdx": "MPL-2.0", "vendorHash": null }, @@ -180,13 +180,13 @@ "vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso=" }, "bitwarden": { - "hash": "sha256-+zuKZBwoOSp3HIdxmK1FInE33/1D5nX2N7zYBCtRvHA=", + "hash": "sha256-YB+9CWd3U6Yl33ZFbTxzjomrLCilpBPKLdn6Yv7LAUA=", "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden", "owner": "maxlaverse", "repo": "terraform-provider-bitwarden", - "rev": "v0.8.0", + "rev": "v0.8.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-u9ICJtPZveRrK5BOthvFDGkNcUiA0/Hb39KM0eIhUVI=" + "vendorHash": "sha256-BZ1+D0JQrGb6qE25+eTLSHIQdCmzucMPKUY/6x2LwT8=" }, "brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", @@ -198,22 +198,22 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-QS+JCFLYPvxwLIVzCS/gKZkBZQhOOxRfn7Vudgiox+E=", + "hash": "sha256-kwrhIii1jGpIZBzT58UdgnDtX5279shW77HphLobaEI=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.10.1", + "rev": "v1.10.2", "spdx": "MIT", - "vendorHash": "sha256-gTJakGr9f9bzR5pbmgAMTJL54e2mS/h92TM4ft3ABdw=" + "vendorHash": "sha256-PFeWgDw1hkW/ekQfubRSYlaD4d4wJ4GOohOJ00QcEqQ=" }, "checkly": { - "hash": "sha256-qPlXaw8J2J7DPKJvfiTLalgMIWpttqbdMg2UB3rvt14=", + "hash": "sha256-4J7pwtlAa920RXF6ZoSoi03qA15NBzUlXQCZRErI2Co=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.8.0", + "rev": "v1.8.2", "spdx": null, - "vendorHash": "sha256-+GirqFNV0eIC9CzpW53UOi9cDUzXs8ozSLX7dKQnOQ8=" + "vendorHash": "sha256-DcRe3nBzKn8fC0Q8Dx/p0PXuUccX+4kmOMdZa3HuXNI=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -225,22 +225,22 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-aEbGvGPYvW3NOO+Q89/ebcJWNrXIoNQkqAIbv9ikiI8=", + "hash": "sha256-0lqVHIq37CebSVDR5Ni4kFyXeZZ+tOqpj8gN4h7OaA0=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.29.4", + "rev": "v1.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-cI3brJwN+7FTceOMwR0HMbZCNHhwvm31OXqjAEvrzrs=" + "vendorHash": "sha256-j3qdi19dxJL+R8Xa6MDag6KHMuBnzEZ9lUhuSAEZOAQ=" }, "cloudflare": { - "hash": "sha256-7MdXh5SIQwFPL5APmdrkrh++shZRbRUAYrVIHDGjM68=", + "hash": "sha256-9M7PQEBg0qDmyz2B35krNUF9dDo0g28JomFor7b/Nsc=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.36.0", + "rev": "v4.41.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-og31UnUsXGgOm2dH0jlvEpvjOnxUlRy04s2TffiVX00=" + "vendorHash": "sha256-uLkoG0m3v1vohXO03nCrfxEhvJYfJOvYSIHsgYCjKtc=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -262,32 +262,32 @@ "vendorHash": "sha256-Hny481ihxllpoVPL5/0rTV9oCAmyoGKxCYiN986aKTk=" }, "cloudscale": { - "hash": "sha256-O4Y8p5S5C4SldryndecoaX5d8nrX10nqurAkJ0Un2NY=", + "hash": "sha256-4RU1CD0WwLMd3NsnJWl2Smc8XBYlP9K8Iev16uqsetE=", "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale", "owner": "cloudscale-ch", "repo": "terraform-provider-cloudscale", - "rev": "v4.3.0", + "rev": "v4.4.0", "spdx": "MIT", "vendorHash": null }, "constellix": { "deleteVendor": true, - "hash": "sha256-ecwXWYrs7XJM1web+kia2ccpvTjxAVFPzav6lLal4e4=", + "hash": "sha256-yDXZ+lizDK+Ds8/Z3jfNLjO7fvlfRhx5y88bMLZCaj0=", "homepage": "https://registry.terraform.io/providers/Constellix/constellix", "owner": "Constellix", "repo": "terraform-provider-constellix", - "rev": "v0.4.5", + "rev": "v0.4.6", "spdx": "MPL-2.0", "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { - "hash": "sha256-Glgig56QdXZ9VNZx25/60YPChg9MtLq/S95nuAco3m0=", + "hash": "sha256-QiVE1ezwViOjCNhTAfeR5G8hXAHCi19PqwWnBlwhPCc=", "homepage": "https://registry.terraform.io/providers/hashicorp/consul", "owner": "hashicorp", "repo": "terraform-provider-consul", - "rev": "v2.20.0", + "rev": "v2.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OKKcyx5JAQGMoUMRxIbe3lg825vhwCcWcPNZqo+/gl4=" + "vendorHash": "sha256-hR20+dRvS3tZ6aoTKCHs4zkyE5jWHEh62uLBkVJPA4M=" }, "ct": { "hash": "sha256-c1cqTfMlZ5fXDNMYLsk4447X0p/qIQYvRTqVY8cSs+E=", @@ -299,22 +299,22 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-sWcVMQiSRFyjwYIHUdKQm9sKX279pnA3FVLwUJ3kBKw=", + "hash": "sha256-s1JCno9cpXk0RdovXjTue77Gv9cLX3lB46jYy2xgOOk=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.40.0", + "rev": "v3.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-GEZmpCyqZCxsS5aFxEznNscs5CcgQiiPvJweA3mKkRY=" + "vendorHash": "sha256-ZmOuk2uNnFQzXSfRp6Lz/1bplEm0AuB/M94+dRnqhHU=" }, "dexidp": { - "hash": "sha256-XR8OI+Nf3PKNzZzM+jvylF8Itnapb9Xdztxq4OyXPVQ=", + "hash": "sha256-ommpazPlY4dMAOB1pgI7942aGH6YYPn6WtaowucQpZY=", "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp", "owner": "marcofranssen", "repo": "terraform-provider-dexidp", - "rev": "v0.5.0", + "rev": "v0.6.1", "spdx": "MIT", - "vendorHash": "sha256-xW0sPt2TGmoQXc5a2lp6471amBbDDPZbyc9YIIHP+M0=" + "vendorHash": "sha256-3swcRmm+JZ4ZQX0hvXZosYDGwk0KSyZcqEdNGDYcyYE=" }, "dhall": { "hash": "sha256-QjY5ZazQn4HiLQtdmw9X7o5tFw+27B2IISzmzMMHjHE=", @@ -327,11 +327,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-66bG22xNzJEjCZJ7pHY4OW1vj8qTJIXd0CF/0zLiyug=", + "hash": "sha256-EpT0pL6JrQ9BKL7IyUmEYllRyIFbjJepVvVZdxQhFKs=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.39.2", + "rev": "v2.40.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -354,13 +354,13 @@ "vendorHash": "sha256-yOuZcvaregVLf0O6Teuvv6FtapuQGgHjTkqiH2euV8U=" }, "dnsimple": { - "hash": "sha256-xF0zvUKJgB67rKNkeHKyKU0k7INiCKzN+G6v0PIq204=", + "hash": "sha256-19h4x+kxhFwlNUdTmTLjoLRQB7fNBh0CxxoQDGRPPiQ=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v1.6.0", + "rev": "v1.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Zl98s0+sgs+n/OkrJMsia0MxqO/AGWId8zzY+/n6LXM=" + "vendorHash": "sha256-5445cUKxjNlZcQ6opJKgXgT7I9XUmqbPMB/iKuEBPwg=" }, "docker": { "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=", @@ -372,11 +372,11 @@ "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, "doppler": { - "hash": "sha256-jDCmIHdfHi+gp3+HGo8Wh+xYiHVU2Zy0lxETKW2rvGA=", + "hash": "sha256-yHWOMDhsqF+DXIKREyx8FftItZiWlWFoRhpub752UtU=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.8.0", + "rev": "v1.10.0", "spdx": "Apache-2.0", "vendorHash": "sha256-UvpSfCelEsV9gjRWHxdYvVe3HAnYWWY5KYLVYiqc/So=" }, @@ -390,20 +390,20 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-Ipl+POTZRKe9xKR08x/TPm2S7kv6w54im16pp56rWDE=", + "hash": "sha256-Wj/qrc18/wJekWZdNgzheT1hsIlAPTAf/tAIrpw6N9Y=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v2.0.1", + "rev": "v2.4.1", "spdx": "MIT", - "vendorHash": "sha256-oxtFq1tejyqsY2uEkMjiub1CwdkFpuSVRb1Z2u3CebQ=" + "vendorHash": "sha256-5M/ceHvcwAlIhjpYO1JTQVUmuBLa9pT5opwiC/tp6+8=" }, "exoscale": { - "hash": "sha256-d6vdYtEBD34SPHDAlkpTb/T8D7TaLbVwMYjSefuNdr0=", + "hash": "sha256-i7Lp3NhaxVR317vHfdE/2aXAxmKk7u7kETM7JTJr5BI=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.59.1", + "rev": "v0.59.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -417,11 +417,11 @@ "vendorHash": "sha256-qeKXdjrDPJWO4xW8by6djJReeYbCjh8VzQmE5/65zII=" }, "fastly": { - "hash": "sha256-FfdXMrGfz+JFEyWfZytIt1R0M/v7JUmkvu4VohF1vSA=", + "hash": "sha256-NzuWXQtaobbkk4oKcs+aT6ONeIsmLZsyRhW3BP7+5Wg=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.11.0", + "rev": "v5.13.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -453,40 +453,40 @@ "vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw=" }, "github": { - "hash": "sha256-6RAGc1UXebNm24d4+7S0LugvpSVgjIvqa7B6y+pozkA=", + "hash": "sha256-8TP3iw/NeVjq49HhurCULXbAOvP2ye6mZsVe62FxSAE=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.2.2", + "rev": "v6.2.3", "spdx": "MIT", "vendorHash": null }, "gitlab": { - "hash": "sha256-F73eY0m+KdzfAFCFPOZ0a29OOfgOm87WZvi8+mHwPek=", + "hash": "sha256-F+ps7hpRm6+DHJwVOMe2qwVvKSL2o1JUl0Blgd8qFsA=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v17.1.0", + "rev": "v17.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-FrmQsuLinm5Z4+GHC1PV19lt1rfxv3TwQiEUxTvlTtk=" + "vendorHash": "sha256-vIGqb5+e9vZkJFsH7f1UU13V80XtQVcsQ1hYu5laV70=" }, "google": { - "hash": "sha256-RJ01+OA3BXMNThRk9aGkYa2jrj3SYgOh9eA5al5wR/Q=", + "hash": "sha256-RIBSJc5wmBXvd+NWaz3oCOClAOqXEOpSXIR8+wYKfk0=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v5.36.0", + "rev": "v6.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0SxftrOjmpYK4ud3RweYaW6qgdKwi43D1ZhN470rvVs=" + "vendorHash": "sha256-iRN3qqJHmpLuuAbmaFCj9wFXAHTXK+farkFlkWt1hyU=" }, "google-beta": { - "hash": "sha256-r9ndcNxiocRHH++zvEtuIwJ8U2fE5cgndPcYjdhLpEA=", + "hash": "sha256-CxoWwoR4CVW5sVSOpOmfnn5xECKmbSuSpBWVAhW24D0=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v5.36.0", + "rev": "v6.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-XkpLgFB/974WEbZe34uKrLSEWjinrkmpOFOG7uYDHhg=" + "vendorHash": "sha256-RgquPp7hJQcgXZndl9kojAxunGA3KxSneYACru23WUk=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -498,49 +498,49 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-VEg95n7S4PDWjGPbuADOQWymGDlS4jupQAHo2OCkfAA=", + "hash": "sha256-tUx6L+ESPsa9VWFztNoYAtspnPoNO8QX3AQk3i0VyNc=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v3.2.1", + "rev": "v3.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ykPnplAA7s6lVQ7M0We7irIxOM2Ie4zSdQQynIjLFWA=" + "vendorHash": "sha256-d7ugVKmKQovewfeZF5k5KHbELwCSY9Krknow7q/7HWo=" }, "gridscale": { - "hash": "sha256-pFBH3J61Bk3QSfYVtLx3NrAFqrAnvKjKzL8qpeH5cOw=", + "hash": "sha256-GVOjkena3zRaOxO3YRYf+gfM2/CRm8VajpuWGTU0F1Y=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.25.0", + "rev": "v1.26.0", "spdx": "MPL-2.0", "vendorHash": null }, "harbor": { - "hash": "sha256-dlAjbiSSgTuuZhTML66l4mSa3Rf14G86++RyXUJYbkw=", + "hash": "sha256-JdCBeUYB6rkSNhfTTIoRV8Bz4FnlHJFJxEZZbqyzAyc=", "homepage": "https://registry.terraform.io/providers/goharbor/harbor", "owner": "goharbor", "repo": "terraform-provider-harbor", - "rev": "v3.10.12", + "rev": "v3.10.15", "spdx": "MIT", "vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI=" }, "hcloud": { - "hash": "sha256-2eCHgHh6SVSHqjf+h4tRaD1orzh1LRUNVJdNsfLtZMc=", + "hash": "sha256-td1R2Xeo1QfsNJOwE7cCuzF5OjW4XUQJOVd0LPAXfuE=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.47.0", + "rev": "v1.48.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-wCr9tYaA6Y1LgbhvWbRtqtDrviMu45WnXAB/WMWpkl0=" + "vendorHash": "sha256-t9nXq30jRSlx9gMR+s8irDVdSE5tg9ZvMp47HZwEm7w=" }, "helm": { - "hash": "sha256-SD5lUEkbn09S/fnQNyCE9ZZ2fkXbcFZfdE95GGEqHzE=", + "hash": "sha256-82jM8XZF8X7tYbebMXPYNyhNGqQ51zl3WxYWX2ObD1g=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.14.0", + "rev": "v2.15.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-p6VUNSJKJtPrawdsi8Lgmu0uYjRmsdP4nsOl2L6h3JA=" + "vendorHash": "sha256-QERpwymuz45RiH9SMuAJPyl/z8r0a5Wd8NBMFKV6NjI=" }, "heroku": { "hash": "sha256-B/NaFe8KOKGJJlF3vZnpdMnbD1VxBktqodPBk+4NZEc=", @@ -570,20 +570,20 @@ "vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs=" }, "http": { - "hash": "sha256-fGJBrgobtDAOPXnAIcmuepgCRVIdSCABQlP+dycAm+E=", + "hash": "sha256-fYbOfsKTah+5pgJdSftZvVlYmBp75o/6ByJO+ayXDhQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", "repo": "terraform-provider-http", - "rev": "v3.4.3", + "rev": "v3.4.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-3yrcTs0QV2I4CX1TZgY9FimXC2G/p1s+xNsurH0n8e8=" + "vendorHash": "sha256-+U6k+mAVdGWOKzopp0yfaMmKuhqG0Laut+jHap4hBWs=" }, "huaweicloud": { - "hash": "sha256-p5vS7rnoBqE81Dhj35xeAs5ja/ekpeVEaNALtxw0/Tc=", + "hash": "sha256-Qs5/bDIb2SkQn9oXYU0kgpHY2q2obf8h2bN4prsaNrs=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.66.0", + "rev": "v1.68.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -606,13 +606,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-91EXK/8Kovq2yqyF5lFgWV/AJMvU6eHCnIBnLpzsQws=", + "hash": "sha256-PgrC6k6xGfGR9DoTBLSbWDjfF5comrpLGxgUIeof1lI=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.67.1", + "rev": "v1.69.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ioyfsNgXoQOtzU1eBJkjMw4hgIo5ryFPIFKqOdn4fuk=" + "vendorHash": "sha256-Ve0qfeuDU59W3jCXpNvcZbnLt7OLAreBbGam2Wp/3Ig=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -624,13 +624,13 @@ "vendorHash": null }, "incus": { - "hash": "sha256-nyL8sWFgTlJjuAYhBuzThCm89UHwYmb+x+A39z2FCj0=", + "hash": "sha256-VHoEUcFwsERC3EKfobTEoWOxuiOEBzEaWXL+mzlTe44=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v0.1.2", + "rev": "v0.1.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-81ykw34Qj5qAAa06p7br94bvlIM4uNiKNUI8d+Gw07g=" + "vendorHash": "sha256-7MQi9gJU0RAm9jTiY/YjkEU5QsxSX2lbUC7qvT20mes=" }, "infoblox": { "hash": "sha256-x5WGCYvsXby2O8J15fvoRNsYnBCaYdjx6LuDkYAfIlU=", @@ -651,13 +651,13 @@ "vendorHash": "sha256-NEGjgtrn6ZowqSF6NAK1NnSjYVUvfWuH/4R5ZPdTZSs=" }, "kafka": { - "hash": "sha256-bkZfgA/PgLWC3YXrIgoF2YRgOFQhoT+Seeifg1GvVFY=", + "hash": "sha256-CIA+0BMVPOpsB83QD6QEVOhohzeEFjFYTQ5UE+9MMIY=", "homepage": "https://registry.terraform.io/providers/Mongey/kafka", "owner": "Mongey", "repo": "terraform-provider-kafka", - "rev": "v0.7.1", + "rev": "v0.8.1", "spdx": "MIT", - "vendorHash": "sha256-Adfz3r3xWY7a4u9/m6a1rvQYGq+E8Q5pAuS/uMgZRQM=" + "vendorHash": "sha256-wfN5tgW/Pqm6PqHLnuON4SQwd7U6DFj7e8HiTSrTGbo=" }, "kafka-connect": { "hash": "sha256-3EUTte3txaDRz3jh0h23+Bf1tdLeCvPN9x8mYWY5VjI=", @@ -687,22 +687,22 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-MlM7OEpzDOmM8BaaGYn6ZSDaIO8IswreOIkLOkbqQHo=", + "hash": "sha256-SXHi6iW946P7EjNOtci2b0ioftxMHtqTIZmTBnHvmU4=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.31.0", + "rev": "v2.32.0", "spdx": "MPL-2.0", "vendorHash": "sha256-MfXuVZC7aroO83CJTNCh5YfbmMlUG1CiPeGgxhUFjN0=" }, "launchdarkly": { - "hash": "sha256-ZJxtrDGUH/Ea07CwBX+om0Ccsg6oSUjoS9pKIOnl0GM=", + "hash": "sha256-ke7o4I6d1JSsk+/6hk0EXUatnyCnXzb8xdgPX/cr4eM=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.19.0", + "rev": "v2.20.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-pO9QTtqA+YG0i+o1+p3PYg8E/mUpzIV3II++CxQcuHE=" + "vendorHash": "sha256-v9N7lj7bEgR5HZm1SO0+DSCmQFVnsRvHPMycYMfpYwo=" }, "libvirt": { "hash": "sha256-yGlNBbixrQxjh7zgZoK3YXpUmr1vrLiLZhKpXvQULYg=", @@ -714,13 +714,13 @@ "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" }, "linode": { - "hash": "sha256-X7Uslu8HjJg/Ikz48hg1aIaDNNcr3Xz4gBTPB+y949k=", + "hash": "sha256-4uRKers66pbuft7lWKzBbsE3fFWTfyozWvGjmDke210=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.23.1", + "rev": "v2.27.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lQ1+MVErv0g2Q7PSrO95Qzs0o/0hpL6JKK9E5J1EGic=" + "vendorHash": "sha256-bWyHzN+W3G83V8sjqn1bfLBuB71/O5DuUWsro58A2xs=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -741,13 +741,13 @@ "vendorHash": "sha256-PpLqFek6FnD+xWF8QMS2PFUP7sXXVWWWosq6fpLRzxg=" }, "lxd": { - "hash": "sha256-z7AjOKMSf2XnyCQiBcjFY0V9mDLF6Fj54Ck7971Ehio=", + "hash": "sha256-LGho9iCjKn0OR8sbnkduZtLIxcnVwpedvVinA78791c=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v2.1.0", + "rev": "v2.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fu6EgUIw1rFswXM3xUi0DLSChhl2c3a70uJO7aZhX+I=" + "vendorHash": "sha256-J1KWnU0IspjoosI5wIAc8ygOImXlc3tFkhV3yDXoDl4=" }, "mailgun": { "hash": "sha256-Sj6iejtaSdAPg2tI5f0b88Lni431cervHxlQWwGl8Bo=", @@ -777,31 +777,31 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-EGVIk828DwYGMkRBGs3Lnt9goYb+biWoZcXmfuy/OPg=", + "hash": "sha256-/VR2pko5ctH/Gz3zUMhmwlZOpxQPu1AgZ3wRddndf6c=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2024.6.6", + "rev": "2024.9.5", "spdx": "0BSD", - "vendorHash": "sha256-xUb3tRMG9Exth2d2/1hGVa3llFss99up1cnNaldwse0=" + "vendorHash": "sha256-3pPRgmoC0eYFyu/kNpJty45MfIjBMN5uV8l7iQErAns=" }, "minio": { - "hash": "sha256-P+rhDVmZl8DouSOTkBRE2MNG0ZcpLDveO3Npt1AIEGU=", + "hash": "sha256-1f6T5sfrBPgwxKKZMknd3JJd7mv90zuGtXInDPKAg0M=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v2.3.2", + "rev": "v2.5.0", "spdx": "AGPL-3.0", "vendorHash": "sha256-Gn4P4NIksv8S4DmnuYArxdSQDQsyCeayJJAIkmm/I6A=" }, "mongodbatlas": { - "hash": "sha256-8A2csdDMS5W0SzVRy7QATWUEDEZqR7gLRDpVAeROsZk=", + "hash": "sha256-ZAgoC6HNBIQP3tCo3+kZh7TyMDi+caPstqB5HpjTa5g=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.17.3", + "rev": "v1.18.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-idXan9/OGEKY+VT2dwWwj+P1fFQIrIs2ghkthz53j/g=" + "vendorHash": "sha256-llbYJi3ghgh9y97ri03a7ZBXSUPMs7f3FLd4iLRRmmk=" }, "namecheap": { "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", @@ -822,31 +822,31 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-hJKYz95+i1j1KhDuh5Jcm8cZzBAD3cK5+a5B1vCYBXM=", + "hash": "sha256-Q1wY613U8cdAlHd+mVTKVNO4KBqVm2/HcKp66DTzbII=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.39.1", + "rev": "v3.45.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-EHO78DEZ92WRDP8ZA0M9zdZ8KsPWMA2ljgFY6dX29YM=" + "vendorHash": "sha256-C3dDWWmV7YrorPps0m0V9DQDraID57+vXWg8pBIYXIE=" }, "nomad": { - "hash": "sha256-42QZfbbugxV6USCz0Urnhfcsf+DZKpOepC44Z37dGkw=", + "hash": "sha256-OdttxZEY4fiLiK6ReoIFjN3VAvEgARQ9yBAqemVyheU=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v2.3.0", + "rev": "v2.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-+4JU2z56W/uT+DW4+LRf1hwK0nLK9WARTY31bqMpHNM=" + "vendorHash": "sha256-WTfhKSaSzXOsYH8Aso735y5fYCKEjwMtWto5oZ6lU4s=" }, "ns1": { - "hash": "sha256-96q68P+d7K4UycCZ0Z5w3HWIcKwsC4/UD6WPU6yyC7M=", + "hash": "sha256-3NDHEpvBlVb3IgkEjJ1g2Jpvy2MbgXSeabuCPlpKZmM=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.3.1", + "rev": "v2.4.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-0RRZF7/NHo9y7SUKZbq8nNU+gFdCb0u4XJgsobNeWsk=" + "vendorHash": "sha256-jTsjVhVEgtI3B+tLl9xLqQsGI2piQc6QA2EHqfVhDxg=" }, "null": { "hash": "sha256-KOwJXGvMc9Xgq4Kbr72aW6RDwzldUrU1C3aDxpKO3qE=", @@ -868,22 +868,22 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-yiHBWcOE2QxyhzKqjSPvgqAFu0hL13idWXbwkhAhNeE=", + "hash": "sha256-LlRy0i4JGjaeHMQMWUYtKgJOUqm0RFwtyDO+KtQcCRI=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v6.1.0", + "rev": "v6.9.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-GHC2HhpyPBQ5gPg/HPmP+Bms6O5mLhdAysKW58FWhwA=", + "hash": "sha256-lSZWAAZWkM2+fgLpbfsHLvu1m6R8LMrtc7hUPdwiioc=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.9.1", + "rev": "v4.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-71z33jsQmNQoCVSQCiyjHnfUMtwY+KB5Mn2MHItwGa0=" + "vendorHash": "sha256-8Wez4UkS0LsJTtgepdPpyZHhNZADxvGwOEVu6RLBI0o=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -895,11 +895,11 @@ "vendorHash": null }, "onepassword": { - "hash": "sha256-rdS9Udzfc/U7E4CIyySnntOCVBBZL0/GuAiVCI5uMrc=", + "hash": "sha256-u2nSzEKD0o/e0AzeHdKQj3+h7mAt6r5cxaKsPn6nRGo=", "homepage": "https://registry.terraform.io/providers/1Password/onepassword", "owner": "1Password", "repo": "terraform-provider-onepassword", - "rev": "v2.1.0", + "rev": "v2.1.2", "spdx": "MIT", "vendorHash": null }, @@ -913,47 +913,47 @@ "vendorHash": "sha256-Hd6vh4ihuR1rRk5yIu1mPuDMb4Not4soKld10MfOuGU=" }, "openstack": { - "hash": "sha256-NSfKyXTuPiEYFE8guWsRcJsKiccMrHJRK4I5REzzIZQ=", + "hash": "sha256-Vt6cFZBfM5sP62zWeyoCuEPU6vRucGG8z7zeQywDA40=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v2.0.0", + "rev": "v2.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-TS1Zp9IMD+Mq91QhyRuDgzbwd61bASWLPft5JdNCcy4=" + "vendorHash": "sha256-UH4LgC4UATpglZ2lYb92LvEeAgqXyDFzujNnaYCYN3g=" }, "opentelekomcloud": { - "hash": "sha256-UhECzYRA9AaATeYdC68ALd3aoB8G0okWQm1U9VkgL5c=", + "hash": "sha256-CXWaIISfDtT6jTdFKE67LiRPlGaq+9fRO77GqIMrZhs=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.12", + "rev": "v1.36.18", "spdx": "MPL-2.0", - "vendorHash": "sha256-PwYc9p8nRe0QkgLKLOeb7KYTLgFiT2JQGsmTfFLzBH4=" + "vendorHash": "sha256-vsK74qZ20VOID5sg7kHjxBXiu1dkyJ961zFf0+QkqH0=" }, "opsgenie": { - "hash": "sha256-ZssKhfwFrzCjvlebEmKAHWBInN5daVqxbmVFoA92dv8=", + "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.35", + "rev": "v0.6.37", "spdx": "MPL-2.0", "vendorHash": null }, "ovh": { - "hash": "sha256-346lBl1AnEdZmLEfsPiTW7I6rhOv61t004DBx7gRkF8=", + "hash": "sha256-XVNinT1kjvjrVLB4NXELw1Rf6UZEkX4el+dKzOO0QjY=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.45.0", + "rev": "v0.48.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-sXFRN05mn5hMIqxhwIvYWlMgkrUGZqi+J29Sq9GRS90=", + "hash": "sha256-+8Ar/PDGSSe9Xs2BoNndrBCXZpgqKHNXz7HNVvok1Eo=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.14.5", + "rev": "v3.15.6", "spdx": "MPL-2.0", "vendorHash": null }, @@ -976,13 +976,13 @@ "vendorHash": "sha256-pbJk35O8EowCa2dgLCrPDgakR0EJVaAnEvePGnrl/YQ=" }, "postgresql": { - "hash": "sha256-UNnAe5alro4dEZ9x2ZDsjybOgHq2IVs8w9rMcMJBm8w=", + "hash": "sha256-v/88uUvILQT0uHRgfwMuLQWw0ma2ELT691kQ9GVjr/A=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", - "rev": "v1.22.0", + "rev": "v1.23.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-omJjWeCLIdHIySQW8tcDPQ1XPmfWbPDOGwPUedrb8Bw=" + "vendorHash": "sha256-fHNXJGyOWGF7Dwfk14GWmLXSIENsshIHbxkF7iQJNuI=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", @@ -994,13 +994,13 @@ "vendorHash": null }, "project": { - "hash": "sha256-CuUHTuq2ufSuolpvfkT4Q30tiIGkpuIoYCYqY9EOd9s=", + "hash": "sha256-rxv1owtlc9P9uZDReH0lKFUUTSL+X+HlkWL5FWz3bHw=", "homepage": "https://registry.terraform.io/providers/jfrog/project", "owner": "jfrog", "repo": "terraform-provider-project", - "rev": "v1.6.2", + "rev": "v1.7.2", "spdx": "Apache-2.0", - "vendorHash": "sha256-UcoTldBVqCPh1SVaZm2aKeRVCVfgE/zGOR7+feDEUM0=" + "vendorHash": "sha256-ld52rPoG4bCfU+qizliuwmz6ncxrhcoAYOEZo5mnCYI=" }, "proxmox": { "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", @@ -1021,13 +1021,13 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-w9oAeE8KuD7kdBFOkNgifaELrxr3X1yKYXFiQLyaGY8=", + "hash": "sha256-n4sEIew7C7tG19paaJjgtCwGt5KhUyoR/OGoLu4Kal8=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v4.1.0", + "rev": "v5.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kzOEHkVCHOwISXVPmKbJJ2BbBdIJ3G1JtA1nFGZYnG8=" + "vendorHash": "sha256-uIyLOqabx8wQurxcG70LHm+jBga+bCNyf5XxGrt5OKA=" }, "random": { "hash": "sha256-10SRHJx7h04qRH4XnBsqiwJ43nxTodj89kkik2UTI6E=", @@ -1057,13 +1057,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-VTtS5iqeMzcaVveMlnJZDrXUSf0Ts/FG7STVix08mQs=", + "hash": "sha256-h30SfKtx2l9zp9ZGy1KRoQRmb83B4e48R/URJ2I2J+U=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.41.3", + "rev": "v2.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eLQLozDXk83vjfTrsJHQqU3GMZToMwvjadqf+X7OeOU=" + "vendorHash": "sha256-crp1XJRsWBEhRFC1CzLTgBTrTLaM2Y39Mwx+l1mg0Ks=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1075,13 +1075,13 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-yIQdxwkcpFKm2+woHW7yClWAwQr82XaCDFHh6KAOaQI=", + "hash": "sha256-cLN0wNT8Yn+uiaGZFzdDg1ZN4pzm5VHriMgRGZv3ZpU=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v5.1.1", + "rev": "v5.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-PyATpaCqu8csmpf83EODKgecZaquraFlh1bTYhhhBO4=" + "vendorHash": "sha256-MP44e56j7rLyT4+TbFDfDb5GNc/LzZNLplm1/qqeGiw=" }, "sentry": { "hash": "sha256-iTwl5FowrrhznO+Zr7QXy7/6HlYWCryZTMxNsBGSfWI=", @@ -1102,13 +1102,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-JPL2VjYIg8qW9kk6QaT3+alWtMvKHXRlqLD6AZ2+cQ0=", + "hash": "sha256-OmM3NvTnT/yZBgBYf15vITJSVOXQ7Vvqn6T6+LXOpbk=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.1.5", + "rev": "v9.1.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-uPAWL2BigYiazZQSScM/J39dLDtYheq2P6l4A9M3rOA=" + "vendorHash": "sha256-h+tusSFbu4jmfu0v1BwRrSoDEPYjXZwQ+YykRUoXlv4=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1129,40 +1129,40 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "snowflake": { - "hash": "sha256-3vC246+XoCfmnEdNFHW8iy0fy5aN+kmaZzgJot4hKs0=", + "hash": "sha256-jIzLT2tQViOdNOQ462fM1SFt0E22QZbUdh33OjmUf+k=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.92.0", + "rev": "v0.95.0", "spdx": "MIT", - "vendorHash": "sha256-pxti3wXBke16zoEPaTbXrTc/LI1QbvKfBvbUSxnAIOk=" + "vendorHash": "sha256-FPIqTXbGLui6QW1bFhwV4rGgo8IUw3XkmryqmjpM5Sw=" }, "sops": { - "hash": "sha256-ZastswL5AVurQY3xn6yx3M1BMvQ9RjfcZdXX0S/oZqw=", + "hash": "sha256-MdsWKV98kWpZpTK5qC7x6vN6cODxeeiVVc+gtlh1s88=", "homepage": "https://registry.terraform.io/providers/carlpett/sops", "owner": "carlpett", "repo": "terraform-provider-sops", - "rev": "v1.0.0", + "rev": "v1.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" + "vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo=" }, "spacelift": { - "hash": "sha256-xDkOngj8wPsqZhyYh0oVA9YVwMY+bRnpXL2yjpkN38M=", + "hash": "sha256-kEfZ1ErNMdUGw1eRiX4SphreCCGMQj1Wj0DLFikTfxI=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.14.0", + "rev": "v1.15.0", "spdx": "MIT", "vendorHash": "sha256-m/J390su2nUpYMXrrYcOfKSjZb5Y23+g24rroLRss4U=" }, "spotinst": { - "hash": "sha256-SOzaTZIBEC9se942ofYHURH8btw38upJtnlDDWmLcTM=", + "hash": "sha256-ChtaZkztmyFPJvtoE+TUPzZyEEoZ6y3o1CgnKsnK6I4=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.180.2", + "rev": "v1.190.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mgDWGimTq7AODC+ojipWUgCDKpC/EP/W8x8kbey05mQ=" + "vendorHash": "sha256-JGwBQMsMGxH5ceHOd5CbSQFQdL6u99lHpWFgJUyMYRQ=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", @@ -1192,20 +1192,20 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-LPJwJ6j/eZzOliHH7Ci49c5CqDckaqSm7ikLKTVhuew=", + "hash": "sha256-e/Vmu+odmn/IasHl6dSy5aYLRi/lTcVjpzJl+YYn1mg=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.31.1", + "rev": "v2.31.3", "spdx": "MPL-2.0", "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, "tailscale": { - "hash": "sha256-hMcnHTdxxEfAU5cd0nlK2Bc+fxfrERk4wYaRidPM4mA=", + "hash": "sha256-GflanQbIPpS0mxmw7LXeTfPly+CmgpsoLHBIMe6f7xM=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.16.1", + "rev": "v0.16.2", "spdx": "MIT", "vendorHash": "sha256-RAmAN57hIHvQvZ2pjbLbanixUk8Cart6a3PQPXhnx9U=" }, @@ -1219,49 +1219,49 @@ "vendorHash": "sha256-939lQsdp0Ixj9FU7IqxbOAM93GwL+X6gC3kY5/0x+AE=" }, "temporalcloud": { - "hash": "sha256-PIqsCdIaFob/C2b1Rem/JYl7bQVvdRecDQDkcAZutz0=", + "hash": "sha256-OD3cCNRZG9wQSu/aFmnVzcUbJyASusM1rt2PdpWKXkI=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v0.0.9", + "rev": "v0.0.11", "spdx": "MPL-2.0", "vendorHash": "sha256-/yXPJgwpUCKRs3Sf2BbuHp3pfQiheTAh7Auxk3qkTFg=" }, "tencentcloud": { - "hash": "sha256-PZWBVLUfWn13B7saz2XecMv6pWWqPMOfBzqr2pErnvs=", + "hash": "sha256-HgBC+C7z15cdVUBOAaPE3ddhEKMfp7Ow+lWqS/EkD98=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.107", + "rev": "v1.81.120", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-mfJtQs+fl7zfysWJO/EBM/DMYYOvR5nuOwDA6sei1PI=", + "hash": "sha256-lXwdNtdbCwiotVCGBIiAPHUjNdj+srpBaW30GUWW0ao=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.56.0", + "rev": "v0.58.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-heMfI1NLjOHSKondXY8mRCNWFedSYJqfn9nU2Ywj57c=" + "vendorHash": "sha256-eeVkzZ+ATTyZCEq4loEbIb0XO/Ir1jejUaWi4Jd6nMo=" }, "thunder": { - "hash": "sha256-ezolcZ652YUV/CDoNKNRZkiRpRoa5AMqHxeYLxluA5A=", + "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=", "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", "repo": "terraform-provider-thunder", - "rev": "v1.4.1", + "rev": "v1.4.2", "spdx": "BSD-2-Clause", "vendorHash": null }, "time": { - "hash": "sha256-Uwe0VpY7CKXNy6RNS+yoIkyLmMQ2daJ5x7IhJV+KuxU=", + "hash": "sha256-mAGBcBMd00r2URY/jqZQBLjo0mN+IMG5ONVKj0AwXNs=", "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", "repo": "terraform-provider-time", - "rev": "v0.11.2", + "rev": "v0.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-dmBCjbVmK4Qa07bcgUxKch5Vj7nylgNA7rzx+7ag3CY=" + "vendorHash": "sha256-C40wkY1M9d5oPO6TOm/iu99Gcrnnin1ggn9mbOJ0YjY=" }, "tls": { "hash": "sha256-2K18jY2+oPvelMtZ2o4WJcAPhc93nCvJdHq+VNfmWZI=", @@ -1283,11 +1283,11 @@ "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { - "hash": "sha256-OmhNZZcCw6tGsL3Ha4cdg76GHqMjKeRB6aOXfqkIOjQ=", + "hash": "sha256-lVKJKMCAm8paXxfPo6YvJBnHdmV4iwaTYmwdN31s/e4=", "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", "repo": "terraform-provider-turbot", - "rev": "v1.10.1", + "rev": "v1.11.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1301,22 +1301,22 @@ "vendorHash": null }, "utils": { - "hash": "sha256-9a8K2Yl3hfmUG+/QgQJdXnW6lxkOJps1BskFto3tIwg=", + "hash": "sha256-bxjEdmPgKPFpRM9Jz9nichDhXY+7x74WS6VjZGf9VUE=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.23.0", + "rev": "v1.26.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-oaVBYSH2ix9SUqvrFo+oBIS80/Sb3E7Z/Jpvznt+OtU=" + "vendorHash": "sha256-zJtVKDaqOMQqyAzq4VtVv5MgXS999BwxeWhXQI6McC4=" }, "vault": { - "hash": "sha256-tPRwdSwygypfgXAS3QmZNAb4GXe/8IFsRs8YGa4HDJg=", + "hash": "sha256-EiCLz5Z0ztwWrn8yHG9JnuIizicpi3WtvDSGyBtzgSY=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v4.3.0", + "rev": "v4.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-rS6tigtjTGG2c4FwSjn6dvblwqYtPQS/tl7qQ+P7uVM=" + "vendorHash": "sha256-z9qg6NVKYIU2OQTW8g72t6B69aTL/BeLCUFeoII75cE=" }, "vcd": { "hash": "sha256-4+7CblKeop9Uwpl7XxjmR33XE/mcmZfOuFJrJuqzZmw=", @@ -1364,13 +1364,13 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-rF7gtZUPse6ewcawmxlIfCmVRKKNJMUwqVVEBaLvLbE=", + "hash": "sha256-V13LeUNJ4LbP18CMRphU/w/7eytg49j5//gl/sZSV04=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.8.2", + "rev": "v2.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-TxaYIJtEIgy0Q56Gk1JXqIUuVyVJNVH0gKmdzzDWW/E=" + "vendorHash": "sha256-ozdbYuqz6ua1ubh48IkLxJZ6xAV2ho9mkhtnCTwzRIM=" }, "vultr": { "hash": "sha256-gQwLGnYmB9bwpGrLNdbw+zY0MlPPrY/37rJPtindT1Q=", @@ -1391,12 +1391,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-FwwjHWwUUtOwZZh0YeUbSnSLFH1Q80ALFHhd0tCAZNQ=", + "hash": "sha256-47aAZuGLhiHLzk0mvHD48NfoSUs1Ec3R4DGEpbvPyj8=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.123.0", + "rev": "v0.128.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-K6Khgg9sAG2S/onFUlVG5mZfMtvpvVJeU6YQOyA4Liw=" + "vendorHash": "sha256-4uHYcg+dJg1bJQRsJWDT9VEsPs5JOvGIdrw8cj0IkrE=" } } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 40355107b0551..630df5b8ae6ee 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -165,9 +165,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.9.5"; - hash = "sha256-fWyqBDvuBrwqgwi1WU4RsdWssKmaClNyP5zyUf+JmTU="; - vendorHash = "sha256-CAZUs1hxjHXcAteuVJZmkqwnMYUoIau++IFdD1b7yYY="; + version = "1.9.7"; + hash = "sha256-L0F0u96et18IlqAUsc0HK+cLeav2OqN4kxs58hPNMIM="; + vendorHash = "sha256-tH9KQF4oHcQh34ikB9Bx6fij/iLZN+waxv5ZilqGGlU="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/cluster/tf-summarize/default.nix b/pkgs/applications/networking/cluster/tf-summarize/default.nix index 09c6ee5ae0d74..9912edb0acdf6 100644 --- a/pkgs/applications/networking/cluster/tf-summarize/default.nix +++ b/pkgs/applications/networking/cluster/tf-summarize/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tf-summarize"; - version = "0.3.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "dineshba"; repo = "tf-summarize"; rev = "v${version}"; - hash = "sha256-OmGJgy36Jv7/kyGg2y1cNS1r6n1C/plfC0s6q08Wox4="; + hash = "sha256-HXmFxbYfzEp6hxdmvNcSI+8zM3wh7pVpFjquwP/t4PU="; }; vendorHash = "sha256-nfontEgMj2qPbrM35iR7b65qrkWHCMY1v944iYdNLG8="; diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index a9994ef144ecb..372722d3deb02 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = "v${version}"; - sha256 = "sha256-Ym0ypMfoceOvje1z1oCxjnFrl1oosMFSplM7bhI0KXU="; + sha256 = "sha256-Eb1pniSppowyQsLkCbbNlWtMCrDu4URqKXHnVFbA5lE="; }; - vendorHash = "sha256-44A9fF+HIOJrlxpps6GV3yjPBqfpwOhEZ8Ejnp2o/wk="; + vendorHash = "sha256-KQfsWbWwxznGkJB/KA/OkG8r8FnfsoSL90+mFUN9454="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix deleted file mode 100644 index 509b5aa5576e5..0000000000000 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "velero"; - version = "1.14.0"; - - - src = fetchFromGitHub { - owner = "vmware-tanzu"; - repo = "velero"; - rev = "v${version}"; - sha256 = "sha256-1jhhZosrU2zTlgMhM7vJ2kLpO+BITPdUo0t3rcbDYjg="; - }; - - ldflags = [ - "-s" "-w" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${version}" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" - ]; - - vendorHash = "sha256-J0fYfSbxL4R1ac6ezM03e1+J8n7+CRSujVU6XDCyPU4="; - - excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; - - doCheck = false; # Tests expect a running cluster see https://github.com/vmware-tanzu/velero/tree/main/test/e2e - doInstallCheck = true; - installCheckPhase = '' - $out/bin/velero version --client-only | grep ${version} > /dev/null - ''; - - nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - $out/bin/velero completion bash > velero.bash - $out/bin/velero completion zsh > velero.zsh - installShellCompletion velero.{bash,zsh} - ''; - - meta = with lib; { - description = - "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; - homepage = "https://velero.io/"; - changelog = - "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ maintainers.mbode maintainers.bryanasdev000 ]; - }; -} diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix deleted file mode 100644 index 39e8958d1242d..0000000000000 --- a/pkgs/applications/networking/cluster/waagent/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ coreutils -, fetchFromGitHub -, lib -, python39 -}: - -let - inherit (lib) makeBinPath; - # the latest python version that waagent test against according to https://github.com/Azure/WALinuxAgent/blob/28345a55f9b21dae89472111635fd6e41809d958/.github/workflows/ci_pr.yml#L75 - python = python39; - -in -python.pkgs.buildPythonApplication rec { - pname = "waagent"; - version = "2.11.1.4"; - src = fetchFromGitHub { - owner = "Azure"; - repo = "WALinuxAgent"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-5V9js9gGkIsdGYrQQK/V6tPfL9lh2Cht4llOKBVTyOM="; - }; - patches = [ - # Suppress the following error when waagent tries to configure sshd: - # Read-only file system: '/etc/ssh/sshd_config' - ./dont-configure-sshd.patch - ]; - doCheck = false; - - # azure-product-uuid chmod rule invokes chmod to change the mode of - # product_uuid (which is not a device itself). - # Replace this with an absolute path. - postPatch = '' - substituteInPlace config/99-azure-product-uuid.rules \ - --replace "/bin/chmod" "${coreutils}/bin/chmod" - ''; - - propagatedBuildInputs = [ python.pkgs.distro ]; - - # The udev rules are placed to the wrong place. - # Move them to their default location. - # Keep $out/${python.sitePackages}/usr/sbin/waagent where it is. - # waagent re-executes itself in UpdateHandler.run_latest, even if autoupdate - # is disabled, manually spawning a python interprever with argv0. - # We can't use the default python program wrapping mechanism, as it uses - # wrapProgram which doesn't support --argv0. - # So instead we make our own wrapper in $out/bin/waagent, setting PATH and - # PYTHONPATH. - # PATH contains our PYTHON, and PYTHONPATH stays set, so this should somewhat - # still work. - preFixup = '' - mv $out/${python.sitePackages}/etc $out/ - - buildPythonPath - - mkdir -p $out/bin - makeWrapper $out/${python.sitePackages}/usr/sbin/waagent $out/bin/waagent \ - --set PYTHONPATH $PYTHONPATH \ - --prefix PATH : $program_PATH \ - --argv0 $out/${python.sitePackages}/usr/sbin/waagent - ''; - - dontWrapPythonPrograms = false; - - meta = { - description = "Microsoft Azure Linux Agent (waagent)"; - mainProgram = "waagent"; - longDescription = '' - The Microsoft Azure Linux Agent (waagent) - manages Linux provisioning and VM interaction with the Azure - Fabric Controller''; - homepage = "https://github.com/Azure/WALinuxAgent"; - license = with lib.licenses; [ asl20 ]; - }; -} diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index 7a802dd351bf4..ffc69b514713f 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.37.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-GgvpBYFPH1corqNCA6NQCg6Rkbdez9mFwv5HlmOCKvE="; + hash = "sha256-tSMaDb8lflkedDa5ICXthqMpWBkHg+UQ20aTrF4+hUQ="; }; - vendorHash = "sha256-gLnUvNxuxrMu6i+b0jgindgcbGOA+tk4N5N4owGV7B8="; + vendorHash = "sha256-7G+gROPw8Ab6iGMr7vnmC7jAm7jLPd5pbLOkKqDKIDc="; proxyVendor = true; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 12e6f432c5bdc..88f0b34fd27cf 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; # check-dnstap.sh failing on Darwin + doCheck = !stdenv.hostPlatform.isDarwin; # check-dnstap.sh failing on Darwin nativeCheckInputs = [ cbor-diag cddl diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index b98e308f6b726..242c6da0424c2 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -5,19 +5,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.13.7"; + version = "0.13.8"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-ZWM45RoGfGd9mRQkQ/Hz7MGlYq4X26J/QV7FWDjMVrk="; + hash = "sha256-TR4c+7VUHoxZfLCOip7WqjOQFFxGyg+36FUaNw0Sc9k="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-KSBoqp56n/b9zk5elEWsv7EAv3oyVhmc7hjyudicTWs="; + vendorHash = "sha256-41r6tsrHw533ygvS3G2OQA9wsVXVxJi96DVu6stBq3c="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/deck/default.nix b/pkgs/applications/networking/deck/default.nix deleted file mode 100644 index 63cc06b0dc8e9..0000000000000 --- a/pkgs/applications/networking/deck/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ buildGoModule, lib, installShellFiles, fetchFromGitHub }: - -buildGoModule rec { - pname = "deck"; - version = "1.39.5"; - - src = fetchFromGitHub { - owner = "Kong"; - repo = "deck"; - rev = "v${version}"; - hash = "sha256-kG7eT9g4akiQV2dpZuIi3uabW2lnCm2SF2uT/wFIUiA="; - }; - - nativeBuildInputs = [ installShellFiles ]; - - CGO_ENABLED = 0; - - ldflags = [ - "-s -w -X github.com/kong/deck/cmd.VERSION=${version}" - "-X github.com/kong/deck/cmd.COMMIT=${src.rev}" - ]; - - proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-3iUnNSelViAgmwsA9XZg50+JGbizamiM1Y64rZ7KeFo="; - - postInstall = '' - installShellCompletion --cmd deck \ - --bash <($out/bin/deck completion bash) \ - --fish <($out/bin/deck completion fish) \ - --zsh <($out/bin/deck completion zsh) - ''; - - meta = with lib; { - description = "Configuration management and drift detection tool for Kong"; - homepage = "https://github.com/Kong/deck"; - license = licenses.asl20; - maintainers = with maintainers; [ liyangau ]; - }; -} diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix index 6afe93fee4712..356f8f622c350 100644 --- a/pkgs/applications/networking/diswall/default.nix +++ b/pkgs/applications/networking/diswall/default.nix @@ -5,20 +5,20 @@ let in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-HoIkozwRV0xz14mOTM4BXDzPShRAp8a3quhvtWwnQ2I="; + sha256 = "sha256-iZln/cgYGSFYwXDvD1CkQdfwBDXj897X1il1m5HfFJs="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-KA2hwaEhY2G+H4+xVgin6xhmRfnGcJBBWj9xWtD0h9I="; + cargoHash = "sha256-5PPI7fnG71xkQCY+OLLk83XZb+4DoPX81bAtKRp/H8U="; doCheck = false; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index d1427b48271dc..e8a09f4e73012 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.12.5"; + version = "4.13.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-xNbCKRAHs9xiZMLbsV6vcu8ga7WaGqZ+Dg4itTmRRr4="; + hash = "sha256-qDCt1Ld3xHPexpCv/0SbvQwGhWE46cVX3BJ0PoBsKcA="; }; - vendorHash = "sha256-Zq/98A3FiOPySXqY83rboC39cLcwrk6AvBk8+XIPrT8="; + vendorHash = "sha256-qEIvxQ4PRtDWyIw3MWmyXV4HLraCLSglHivlV7UJ9jM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index f66f0262242b6..10e133ac4cab5 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { description = "Command line client for the dropbox daemon"; license = lib.licenses.gpl3Plus; mainProgram = "dropbox"; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; # NOTE: Dropbox itself only works on linux, so this is ok. platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index e785bdccd2bc9..303678bbe3fb8 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "185.4.6054"; + version = "206.3.6386"; arch = { x86_64-linux = "x86_64"; @@ -31,6 +31,12 @@ in buildFHSEnv { name = "dropbox"; + # The dropbox-cli command `dropbox start` starts the dropbox daemon in a + # separate session, and wants the daemon to outlive the launcher. Enabling + # `--die-with-parent` defeats this and causes the daemon to exit when + # dropbox-cli exits. + dieWithParent = false; + # dropbox-cli (i.e. nautilus-dropbox) needs the PID to confirm dropbox is running. # Dropbox's internal limit-to-one-instance check also relies on the PID. unsharePid = false; @@ -82,7 +88,7 @@ buildFHSEnv { description = "Online stored folders (daemon version)"; homepage = "http://www.dropbox.com/"; license = licenses.unfree; - maintainers = with maintainers; [ eclairevoyant ttuegel ]; + maintainers = with maintainers; [ ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; mainProgram = "dropbox"; }; diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index d9da9e48c7fbc..a4c84ee7e76a6 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { # AssertionError "test_null_dummy" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # The tests that spawn a server using Bottle cannot be run on # macOS or Windows as the default multiprocessing start method # on those platforms is 'spawn', which requires the code to be diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix deleted file mode 100644 index 43f3c565d2449..0000000000000 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses -, asciidoctor, libiconv, Security, Foundation, makeWrapper, nix-update-script }: - -rustPlatform.buildRustPackage rec { - pname = "newsboat"; - version = "2.36"; - - src = fetchFromGitHub { - owner = "newsboat"; - repo = "newsboat"; - rev = "r${version}"; - hash = "sha256-RnDnyRAZ71aE5st5wUcUKjFFGY288oFpiyDXAno15MQ="; - }; - - cargoHash = "sha256-0z3G8j0Qk0HEDUKA7fmjFfNW956rRtzKO+0ltNQR4es="; - - # TODO: Check if that's still needed - postPatch = lib.optionalString stdenv.isDarwin '' - # Allow other ncurses versions on Darwin - substituteInPlace config.sh \ - --replace "ncurses5.4" "ncurses" - ''; - - nativeBuildInputs = [ - pkg-config - asciidoctor - gettext - ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; - - buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ]; - - postBuild = '' - make -j $NIX_BUILD_CORES prefix="$out" - ''; - - # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set - # these for all platforms, since upstream's gettext crate behavior might - # change in the future. - GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; - GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; - GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; - - doCheck = true; - - preCheck = '' - make -j $NIX_BUILD_CORES test - ''; - - postInstall = '' - make -j $NIX_BUILD_CORES prefix="$out" install - '' + lib.optionalString stdenv.isDarwin '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" - done - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - homepage = "https://newsboat.org/"; - changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md"; - description = "Fork of Newsbeuter, an RSS/Atom feed reader for the text console"; - maintainers = with lib.maintainers; [ dotlambda nicknovitski ]; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - mainProgram = "newsboat"; - }; -} diff --git a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock index 2e8ac457cceeb..cb8dd85b7a6a4 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock +++ b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aes" version = "0.7.5" @@ -89,9 +95,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" @@ -113,14 +119,14 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "article_scraper" @@ -147,9 +153,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "async-fs", "async-net", @@ -189,9 +195,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "brotli", "flate2", @@ -203,9 +209,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", @@ -227,9 +233,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock", "cfg-if", @@ -241,7 +247,7 @@ dependencies = [ "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -268,9 +274,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", "async-io", @@ -283,7 +289,6 @@ dependencies = [ "futures-lite", "rustix", "tracing", - "windows-sys 0.52.0", ] [[package]] @@ -294,14 +299,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ "async-io", "async-lock", @@ -312,7 +317,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -323,13 +328,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -369,17 +374,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -427,9 +432,9 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitstream-io" -version = "2.5.0" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "block" @@ -520,9 +525,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -538,9 +543,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytesize" @@ -550,37 +555,36 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cairo-rs" -version = "0.19.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" +checksum = "e8a0ea147c94108c9613235388f540e4d14c327f7081c9e471fc8ee8a2533e69" dependencies = [ "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", - "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "cc" -version = "1.1.1" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907d8581360765417f8f2e0e7d602733bbed60156b4465b7617243689ef9b83d" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -593,6 +597,16 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cfg-expr" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c" +dependencies = [ + "smallvec", + "target-lexicon", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -631,7 +645,7 @@ dependencies = [ [[package]] name = "clapper" version = "0.1.0" -source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" dependencies = [ "bitflags 2.6.0", "clapper-sys", @@ -644,7 +658,7 @@ dependencies = [ [[package]] name = "clapper-gtk" version = "0.1.0" -source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" dependencies = [ "bitflags 2.6.0", "clapper", @@ -659,27 +673,27 @@ dependencies = [ [[package]] name = "clapper-gtk-sys" version = "0.0.1" -source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" dependencies = [ "clapper-sys", "gio-sys", "glib-sys", "gtk4-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "clapper-sys" version = "0.0.1" -source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "gstreamer-sys", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -763,15 +777,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -865,7 +879,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -876,7 +890,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -930,9 +944,9 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" [[package]] name = "diesel" -version = "2.2.1" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62d6dcd069e7b5fe49a302411f759d4cf1cf2c27fe798ef46fb8baefc053dd2b" +checksum = "158fe8e2e68695bd615d7e4f3227c0727b151330d3e253b525086c348d055d5e" dependencies = [ "bigdecimal", "chrono", @@ -951,15 +965,15 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.2.1" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59de76a222c2b8059f789cbe07afbfd8deb8c31dd0bc2a21f85e256c1def8259" +checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4" dependencies = [ "diesel_table_macro_syntax", "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -979,7 +993,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -1045,16 +1059,16 @@ dependencies = [ [[package]] name = "dsl_auto_type" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0892a17df262a24294c382f0d5997571006e7a4348b4327557c4ff1cd4a8bccc" +checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607" dependencies = [ "darling", "either", - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -1086,14 +1100,14 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -1114,7 +1128,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -1173,7 +1187,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -1191,9 +1205,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1206,9 +1220,9 @@ dependencies = [ [[package]] name = "feed-rs" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5366c3d4ae865540354ecafa0e5b41dd56c2f31d0b2ef876669edf964daaec" +checksum = "2c546f6f85e02eaca09e6a6dd22fe4db839745f55ae16c8f36626980a57f5bc4" dependencies = [ "chrono", "mediatype", @@ -1281,12 +1295,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1408,7 +1422,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -1443,9 +1457,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699" +checksum = "8730751991b97419fc3f0c2dca2c9e45b48edf46e48e0f965964ecf33889812f" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1455,22 +1469,22 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" +checksum = "1ffbf649fd5b1c8c0f0feeb015b7533c3ef92da2887fb95ddd338bc2b1644a7c" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "gdk4" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1483,9 +1497,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1495,7 +1509,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps", + "system-deps 7.0.3", ] [[package]] @@ -1521,9 +1535,9 @@ dependencies = [ [[package]] name = "gettext-rs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c" dependencies = [ "gettext-sys", "locale_config", @@ -1531,9 +1545,9 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" dependencies = [ "cc", "temp-dir", @@ -1551,15 +1565,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "gio" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe" +checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52" dependencies = [ "futures-channel", "futures-core", @@ -1570,27 +1584,26 @@ dependencies = [ "libc", "pin-project-lite", "smallvec", - "thiserror", ] [[package]] name = "gio-sys" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" +checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.3", "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.19.9" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" +checksum = "95648aac01b75503000bb3bcaa5ec7a7a2dd61e43636b8b1814854de94dd80e4" dependencies = [ "bitflags 2.6.0", "futures-channel", @@ -1605,57 +1618,47 @@ dependencies = [ "libc", "memchr", "smallvec", - "thiserror", -] - -[[package]] -name = "glib-build-tools" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "108f374fff60efd14b0d70d8916e7213aed18d7dd071ba3e9334ed2dac1dc86a" -dependencies = [ - "gio", ] [[package]] name = "glib-macros" -version = "0.19.9" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" +checksum = "302f1d633c9cdef4350330e7b68fd8016e2834bb106c93fdf9789fcde753c1ab" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "glib-sys" -version = "0.19.8" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" +checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163" dependencies = [ "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "gobject-sys" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" +checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "graphene-rs" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf" +checksum = "80aac87f74e81c0e13433e892a047237abdc37945c86887f5eed905038356e69" dependencies = [ "glib", "graphene-sys", @@ -1664,14 +1667,14 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" +checksum = "cc2f91ecd32989efad60326cc20a8fb252bd2852239a08e4e70cde8c100de9ca" dependencies = [ "glib-sys", "libc", "pkg-config", - "system-deps", + "system-deps 7.0.3", ] [[package]] @@ -1692,9 +1695,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" dependencies = [ "cairo-rs", "gdk4", @@ -1707,9 +1710,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1718,14 +1721,14 @@ dependencies = [ "graphene-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "gstreamer" -version = "0.22.6" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080daaf35d22367a398aefd032af80cc36238c76fac7b8822894f5e5be073795" +checksum = "683e15f8cc3a1a2646d9fe2181a58b7abb4c166256d8d15cce368e420c741140" dependencies = [ "cfg-if", "futures-channel", @@ -1748,21 +1751,21 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.22.6" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f147e7c6bc9313d5569eb15da61f6f64026ec69791922749de230583a07286" +checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "gtk4" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" +checksum = "f4fe572bf318e5dbc6f5a2f8a25d853f1ae3f42768c0b08af6ca20a18f4057e1" dependencies = [ "cairo-rs", "field-offset", @@ -1781,21 +1784,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" +checksum = "e9e7b362c8fccd2712297903717d65d30defdab2b509bc9d209cbe5ffb9fabaf" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "gtk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1807,14 +1810,14 @@ dependencies = [ "gsk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -1870,12 +1873,6 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -1999,9 +1996,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -2054,9 +2051,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http", @@ -2087,9 +2084,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -2107,9 +2104,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2166,12 +2163,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "exr", "gif", @@ -2189,12 +2186,12 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ "byteorder-lite", - "thiserror", + "quick-error 2.0.1", ] [[package]] @@ -2211,9 +2208,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", @@ -2227,7 +2224,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -2239,14 +2236,14 @@ dependencies = [ "socket2", "widestring", "windows-sys 0.48.0", - "winreg 0.50.0", + "winreg", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "ipnetwork" @@ -2292,9 +2289,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "javascriptcore6" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a69260c40bbf52066f2c6fa520c00c1ec8ab8208636cf3070c0157c5221f8" +checksum = "03b28ed9c7c08f906b2a51bc2365eae2ba5e7db1249b89892f7ae4cbd602d1f4" dependencies = [ "glib", "javascriptcore6-sys", @@ -2303,14 +2300,14 @@ dependencies = [ [[package]] name = "javascriptcore6-sys" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc104f99c5adcd7ed53dd491121c111e05e3e8d40020d3519e98c346ca64186b" +checksum = "4741e2a31c2145050dd4971f8dd51e92c840d5839a7124cc68a33c7325523a12" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] @@ -2321,9 +2318,9 @@ checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -2336,9 +2333,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2357,11 +2354,10 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" dependencies = [ - "gdk-pixbuf", "gdk4", "gio", "glib", @@ -2373,9 +2369,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" dependencies = [ "gdk4-sys", "gio-sys", @@ -2384,14 +2380,14 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libfuzzer-sys" @@ -2422,9 +2418,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.28.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "pkg-config", "vcpkg", @@ -2623,7 +2619,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ "cfg-if", - "rayon", ] [[package]] @@ -2703,9 +2698,9 @@ dependencies = [ [[package]] name = "miniflux_api" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6e3b827f7d7e0b921d129e27e2621d317bb38005e0f2512092aa33435e5dc0" +checksum = "1063beb3a61f877a219fe278c01242851d5c1a107f23cbc50fd841ad92f67fe9" dependencies = [ "base64 0.22.1", "log", @@ -2733,15 +2728,25 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2806,7 +2811,7 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "news-flash" version = "2.3.0-alpha.0" -source = "git+https://gitlab.com/news_flash/news_flash.git#10282a582b4d2fcd71c667d53355e68176e0bf62" +source = "git+https://gitlab.com/news_flash/news_flash.git#6b65c403da8dbe36e5df6fbb597cfeb2afaa6b58" dependencies = [ "article_scraper", "async-trait", @@ -2873,7 +2878,6 @@ dependencies = [ "gettext-rs", "gio", "glib", - "glib-build-tools", "gsk4", "gtk4", "html2pango", @@ -2982,7 +2986,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3061,9 +3065,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -3082,9 +3086,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -3103,7 +3107,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3114,9 +3118,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -3171,9 +3175,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" +checksum = "5764e5a174a5a0ec054fe5962ce6d4fc7052e2d0dcc23bbc77202b40a4a403d3" dependencies = [ "gio", "glib", @@ -3183,21 +3187,21 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" +checksum = "fd317e1de76b14b3d3efe05518c08b360327f1ab7fec150473a89ffcad4b072d" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -3289,7 +3293,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3306,9 +3310,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand", @@ -3317,9 +3321,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" @@ -3331,14 +3335,14 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", @@ -3346,7 +3350,7 @@ dependencies = [ "pin-project-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3357,9 +3361,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "precomputed-hash" @@ -3369,11 +3376,11 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -3401,7 +3408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3458,9 +3465,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "encoding_rs", "memchr", @@ -3468,9 +3475,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3554,7 +3561,7 @@ dependencies = [ "rand", "rand_chacha", "simd_helpers", - "system-deps", + "system-deps 6.2.2", "thiserror", "v_frame", "wasm-bindgen", @@ -3562,24 +3569,23 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.8" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12" +checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" dependencies = [ "avif-serialize", "imgref", "loop9", "quick-error 2.0.1", "rav1e", - "rayon", "rgb", ] [[package]] name = "raw-cpuid" -version = "11.0.2" +version = "11.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" +checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" dependencies = [ "bitflags 2.6.0", ] @@ -3612,18 +3618,18 @@ checksum = "ca8049c74229f22d8cba889ee1d541b05da9c9668d8fe2011bb922250d0be148" [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -3632,9 +3638,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -3661,9 +3667,9 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "async-compression", "base64 0.22.1", @@ -3707,7 +3713,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg 0.52.0", + "windows-registry", ] [[package]] @@ -3722,9 +3728,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.44" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -3765,7 +3771,7 @@ dependencies = [ "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.70", + "syn 2.0.77", "walkdir", ] @@ -3787,18 +3793,18 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -3809,9 +3815,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.11" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "once_cell", "rustls-pki-types", @@ -3822,9 +3828,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -3832,15 +3838,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.5" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -3874,11 +3880,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3898,9 +3904,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", "core-foundation", @@ -3911,9 +3917,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -3927,9 +3933,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -3946,22 +3952,23 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -3974,14 +3981,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -4055,6 +4062,12 @@ dependencies = [ "dirs", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -4118,9 +4131,9 @@ dependencies = [ [[package]] name = "soup3" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb6bbb0e56d089517432ca8aac0879e5f343b309783384a7fdbdd6d5232e681" +checksum = "b84ccd1f4aee0854a16b0b489ba843798e2eb4cdcddd4a61248f7db9ce8b6df1" dependencies = [ "futures-channel", "gio", @@ -4131,15 +4144,15 @@ dependencies = [ [[package]] name = "soup3-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c6d7beef555a91c6129f5e71ecf4b6e9eac8b48914098d713b1537ebbf6917" +checksum = "8869997193d52a61a1db48627bdaa57343f76e2c5132ee6d351245a6ab30631e" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] @@ -4208,9 +4221,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.70" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -4222,23 +4235,26 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -4250,8 +4266,21 @@ version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "cfg-expr", - "heck 0.5.0", + "cfg-expr 0.15.8", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "system-deps" +version = "7.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005" +dependencies = [ + "cfg-expr 0.17.0", + "heck", "pkg-config", "toml", "version-compare", @@ -4265,9 +4294,9 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[package]] name = "target-lexicon" -version = "0.12.15" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "temp-dir" @@ -4277,14 +4306,15 @@ checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4309,29 +4339,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.62" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.62" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "thread-id" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" +checksum = "cfe8f25bbdd100db7e1d34acf7fd2dc59c4bf8f7483f505eaa7d4f12f76cc0ea" dependencies = [ "libc", "winapi", @@ -4407,30 +4437,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -4456,9 +4485,9 @@ dependencies = [ [[package]] name = "tokio-socks" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" dependencies = [ "either", "futures-util", @@ -4468,9 +4497,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -4481,47 +4510,36 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.15", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.15" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow", ] [[package]] @@ -4541,15 +4559,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4570,7 +4588,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -4678,15 +4696,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -4764,9 +4782,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -4795,34 +4813,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4832,9 +4851,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4842,22 +4861,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" @@ -4874,9 +4893,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4884,9 +4903,9 @@ dependencies = [ [[package]] name = "webkit6" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d82bda18116290a9effc1e0f8dbd00236807bf4a9b990b9484bad5ba852fc06" +checksum = "8c359ef247305dcade3363c281c505b943e0e6162a42eac76ff76ed8e7cebfbd" dependencies = [ "gdk4", "gio", @@ -4900,9 +4919,9 @@ dependencies = [ [[package]] name = "webkit6-sys" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c459941f1b22750cbda435ede3f94ed8e8dd8c8608d324ecb0b9a8556b49abd" +checksum = "96284c5280af5984dbdae8dae3cfeea11b44b214f9bd42b35c0ca75903bccce2" dependencies = [ "gdk4-sys", "gio-sys", @@ -4912,7 +4931,7 @@ dependencies = [ "javascriptcore6-sys", "libc", "soup3-sys", - "system-deps", + "system-deps 7.0.3", ] [[package]] @@ -4945,11 +4964,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4967,6 +4986,36 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -4985,6 +5034,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -5108,18 +5166,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -5134,31 +5183,21 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" [[package]] name = "xml5ever" @@ -5179,18 +5218,18 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xmltree" -version = "0.10.3" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb" +checksum = "b619f8c85654798007fb10afa5125590b43b088c225a25fc2fec100a9fad0fc6" dependencies = [ "xml-rs", ] [[package]] name = "zbus" -version = "4.3.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", @@ -5226,14 +5265,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.3.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", "zvariant_utils", ] @@ -5248,6 +5287,27 @@ dependencies = [ "zvariant", ] +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "zeroize" version = "1.8.1" @@ -5271,18 +5331,18 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] [[package]] name = "zvariant" -version = "4.1.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", @@ -5294,24 +5354,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 4633f8686b014..f751c13329176 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -27,21 +27,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "3.3.2"; + version = "3.3.5"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - hash = "sha256-caINK4tmDsP7AkLUBqbM96Po7sQxFOn/CAq62K+3aoE="; + hash = "sha256-H2/qKnsByidziUldX5MZBrMyMHfuQ4SN9wXizJUGQ8I="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "article_scraper-2.1.0" = "sha256-0jDXH5kkX34tAWK+3hpmW1LWBsFksVgTnSuQX+XXVEM="; - "clapper-0.1.0" = "sha256-xQ7l6luO5E4PMjtN9elg0bkJa7IhWzA7KuYDJ+m/VY0="; - "news-flash-2.3.0-alpha.0" = "sha256-+CYU2CpF2WfSVjhLtLpHjdAGoycdhdbN9UucKO9XKiA="; + "clapper-0.1.0" = "sha256-IFFqfSq2OpzfopQXSYfnJ68HGLY+rvcLqk7NTdDd+28="; + "news-flash-2.3.0-alpha.0" = "sha256-L7siGYdb8v57nBGYs86smlw971fvurYQJKK/AdTpi6s="; "newsblur_api-0.3.0" = "sha256-m2178zdJzeskl3BQpZr6tlxTAADehxz8uYcZzi15nhQ="; }; }; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index 524e8d76b6973..cecad11a4f632 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; }; - buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ libmrss ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; postPatch = '' substituteInPlace Makefile --replace -liconv_hook "" diff --git a/pkgs/applications/networking/feedreaders/russ/default.nix b/pkgs/applications/networking/feedreaders/russ/default.nix index 832f888dcfaa8..3fbaa2108d605 100644 --- a/pkgs/applications/networking/feedreaders/russ/default.nix +++ b/pkgs/applications/networking/feedreaders/russ/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { # tests are network based :( doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices AppKit ]); diff --git a/pkgs/applications/networking/feedreaders/tuifeed/default.nix b/pkgs/applications/networking/feedreaders/tuifeed/default.nix index 0465fc31cf64d..16bb0324d07a6 100644 --- a/pkgs/applications/networking/feedreaders/tuifeed/default.nix +++ b/pkgs/applications/networking/feedreaders/tuifeed/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-QKSNbpVRtSKp2q1jVPYTS8XCMtQAyg3AWvD/6+OjI7Y="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; doCheck = false; diff --git a/pkgs/applications/networking/filebrowser/default.nix b/pkgs/applications/networking/filebrowser/default.nix index 334302cae0089..7adede3e32997 100644 --- a/pkgs/applications/networking/filebrowser/default.nix +++ b/pkgs/applications/networking/filebrowser/default.nix @@ -1,20 +1,27 @@ -{ buildGoModule, buildNpmPackage, fetchFromGitHub, lib }: +{ + buildGo123Module, + buildNpmPackage, + fetchFromGitHub, + lib, +}: let + version = "2.31.0"; + + src = fetchFromGitHub { + owner = "filebrowser"; + repo = "filebrowser"; + rev = "v${version}"; + hash = "sha256-zLM1fLrucIhzGdTTDu81ZnTIipK+iRnPhgfMiT1P+yg="; + }; + frontend = buildNpmPackage rec { pname = "filebrowser-frontend"; - version = "2.23.0"; - - src = fetchFromGitHub { - owner = "filebrowser"; - repo = "filebrowser"; - rev = "v${version}"; - hash = "sha256-xhBIJcEtxDdMXSgQtLAV0UWzPtrvKEil0WV76K5ycBc="; - }; + inherit version src; sourceRoot = "${src.name}/frontend"; - npmDepsHash = "sha256-acNIMKHc4q7eiFLPBtKZBNweEsrt+//0VR6dqwXHTvA="; + npmDepsHash = "sha256-5/yEMWkNPAS8/PkaHlPBGFLiJu7xK2GHYo5dYqHAfCE="; NODE_OPTIONS = "--openssl-legacy-provider"; @@ -28,18 +35,11 @@ let ''; }; in -buildGoModule rec { +buildGo123Module { pname = "filebrowser"; - version = "2.23.0"; + inherit version src; - src = fetchFromGitHub { - owner = "filebrowser"; - repo = "filebrowser"; - rev = "v${version}"; - hash = "sha256-xhBIJcEtxDdMXSgQtLAV0UWzPtrvKEil0WV76K5ycBc="; - }; - - vendorHash = "sha256-MR0ju2Nomb3j78Z+1YcJY+jPd40MZpuOTuQJM94AM8A="; + vendorHash = "sha256-N5aUs8rgTYXeb0qJhPQBCa6lUDkT6lH1bh+1u4bixos="; excludedPackages = [ "tools" ]; @@ -55,7 +55,8 @@ buildGoModule rec { description = "Filebrowser is a web application for managing files and directories"; homepage = "https://filebrowser.org"; license = licenses.asl20; - maintainers = with maintainers; [ nielsegberts ]; + maintainers = with maintainers; [ oakenshield ]; mainProgram = "filebrowser"; }; } + diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 10cf454dc659e..e8a1f90fbfa8b 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { wxGTK32 gtk3 xdg-utils - ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; - preBuild = lib.optionalString (stdenv.isDarwin) '' + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin) '' export MACOSX_DEPLOYMENT_TARGET=11.0 ''; diff --git a/pkgs/applications/networking/gdrive3/default.nix b/pkgs/applications/networking/gdrive3/default.nix index 4e7fea1296542..3fc7af9b14177 100644 --- a/pkgs/applications/networking/gdrive3/default.nix +++ b/pkgs/applications/networking/gdrive3/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix index 32b0fe1462946..43761b659b82f 100644 --- a/pkgs/applications/networking/geph/default.nix +++ b/pkgs/applications/networking/geph/default.nix @@ -1,26 +1,24 @@ -{ lib -, stdenvNoCC -, rustPlatform -, fetchFromGitHub -, buildGoModule -, makeWrapper -, nodejs -, pnpm -, cacert -, esbuild -, jq -, moreutils -, perl -, pkg-config -, glib -, webkitgtk -, libayatana-appindicator -, cairo -, openssl +{ + lib, + stdenvNoCC, + rustPlatform, + fetchFromGitHub, + buildGoModule, + makeWrapper, + nodejs, + pnpm, + esbuild, + perl, + pkg-config, + glib, + webkitgtk, + libayatana-appindicator, + cairo, + openssl, }: let - version = "4.11.0"; + version = "4.99.2"; geph-meta = with lib; { description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering"; homepage = "https://geph.io"; @@ -37,10 +35,10 @@ in owner = "geph-official"; repo = pname; rev = "v${version}"; - hash = "sha256-6zii8WxJp++yqTkxejNDta7IW+SG0uPgmnWqX5Oa9PU="; + hash = "sha256-aZFm4+oUQungCPbxs7j1J8hLcCYoIodIEQEiQfjoLUw="; }; - cargoHash = "sha256-WI525ufJxuepRZHyx8tO4K+7WZuM/NlTVNqVMJH6avg="; + cargoHash = "sha256-ypnjVoscGqVifkjzFh2KE+3EVFWIiyahTNTil3nu/+s="; nativeBuildInputs = [ perl ]; @@ -56,8 +54,8 @@ in src = fetchFromGitHub { owner = "geph-official"; repo = "gephgui-pkg"; - rev = "3a6d2fa85603e9ac3d5d6286685d8a8ca792a508"; - hash = "sha256-SE1TwYvR3+zwdPxlanq4hovmJsOdCJQzWfSJ6sSyJ5k="; + rev = "3b045e21b8c587c26f9d5f0f2b4bdf0a34bfee80"; + hash = "sha256-p+AxAOznUsG45Ibm1kczapfmbK+aeex2js463eqZ8gY="; fetchSubmodules = true; }; @@ -96,18 +94,25 @@ in openssl ]; - ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override { - buildGoModule = args: buildGoModule (args // rec { - version = "0.15.10"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - }); - })}"; + ESBUILD_BINARY_PATH = "${lib.getExe ( + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // rec { + version = "0.15.10"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); + } + )}"; pnpmRoot = "gephgui"; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 8048b87409c1d..c34309258fc91 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,38 +1,38 @@ { callPackage , libsForQt5 -, python311 +, python311Packages }: let mkGui = args: callPackage (import ./gui.nix (args)) { inherit (libsForQt5) wrapQtAppsHook; - python3 = python311; + python3Packages = python311Packages; }; mkServer = args: callPackage (import ./server.nix (args)) { }; -in { - +in +{ guiStable = mkGui { channel = "stable"; - version = "2.2.47"; - hash = "sha256-6UXQTPkRHbtNX6RzWMakCsO9YpkFlWliNnm+mZ4wuZA="; + version = "2.2.49"; + hash = "sha256-hvLJ4VilcgtpxHeboeSUuGAco9LEnUB8J6vy/ZPajbU="; }; guiPreview = mkGui { channel = "stable"; - version = "2.2.47"; - hash = "sha256-6UXQTPkRHbtNX6RzWMakCsO9YpkFlWliNnm+mZ4wuZA="; + version = "2.2.49"; + hash = "sha256-hvLJ4VilcgtpxHeboeSUuGAco9LEnUB8J6vy/ZPajbU="; }; serverStable = mkServer { channel = "stable"; - version = "2.2.47"; - hash = "sha256-iZ/1qACPLe7r1cZMhJbFRjVt/FlVgadBgp9tJwvYSi0="; + version = "2.2.49"; + hash = "sha256-fI49MxA6b2kPkUihLl32a6jo8oHcEwDEjmvSVDj8/So="; }; serverPreview = mkServer { channel = "stable"; - version = "2.2.47"; - hash = "sha256-iZ/1qACPLe7r1cZMhJbFRjVt/FlVgadBgp9tJwvYSi0="; + version = "2.2.49"; + hash = "sha256-fI49MxA6b2kPkUihLl32a6jo8oHcEwDEjmvSVDj8/So="; }; } diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index dfa92a444e0fc..e01380bc286ab 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -1,33 +1,37 @@ -{ channel -, version -, hash +{ + channel, + version, + hash, }: -{ lib -, python3 -, fetchFromGitHub -, qt5 -, wrapQtAppsHook -, testers -, gns3-gui +{ + fetchFromGitHub, + gns3-gui, + lib, + python3Packages, + qt5, + testers, + wrapQtAppsHook, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "gns3-gui"; inherit version; src = fetchFromGitHub { inherit hash; owner = "GNS3"; - repo = pname; + repo = "gns3-gui"; rev = "refs/tags/v${version}"; }; - nativeBuildInputs = with python3.pkgs; [ - wrapQtAppsHook - ]; + nativeBuildInputs = with python3Packages; [ wrapQtAppsHook ]; + + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ qt5.qtwayland ]; + + dependencies = with python3Packages; [ distro jsonschema psutil @@ -36,7 +40,6 @@ python3.pkgs.buildPythonApplication rec { sip (pyqt5.override { withWebSockets = true; }) truststore - qt5.qtwayland ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; @@ -49,9 +52,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = true; - checkInputs = with python3.pkgs; [ - pytestCheckHook - ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; preCheck = '' export HOME=$(mktemp -d) @@ -65,7 +66,7 @@ python3.pkgs.buildPythonApplication rec { command = "${lib.getExe gns3-gui} --version"; }; - meta = with lib; { + meta = { description = "Graphical Network Simulator 3 GUI (${channel} release)"; longDescription = '' Graphical user interface for controlling the GNS3 network simulator. This @@ -74,9 +75,9 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://www.gns3.com/"; changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ anthonyroussel ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ anthonyroussel ]; mainProgram = "gns3"; }; } diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index c6ba5fe2b93e6..dec90b620f704 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,17 +1,19 @@ -{ channel -, version -, hash +{ + channel, + version, + hash, }: -{ lib -, python3Packages -, fetchFromGitHub -, pkgsStatic -, stdenv -, nixosTests -, testers -, util-linux -, gns3-server +{ + fetchFromGitHub, + gns3-server, + lib, + nixosTests, + pkgsStatic, + python3Packages, + stdenv, + testers, + util-linux, }: python3Packages.buildPythonApplication { @@ -30,7 +32,9 @@ python3Packages.buildPythonApplication { cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox ''; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ aiofiles aiohttp aiohttp-cors @@ -44,7 +48,6 @@ python3Packages.buildPythonApplication { psutil py-cpuinfo sentry-sdk - setuptools truststore yarl ] ++ lib.optionals (pythonOlder "3.9") [ @@ -69,7 +72,7 @@ python3Packages.buildPythonApplication { checkInputs = with python3Packages; [ pytest-aiohttp pytest-rerunfailures - (pytestCheckHook.override { pytest = pytest_7; }) + pytestCheckHook ]; pytestFlagsArray = [ @@ -87,7 +90,7 @@ python3Packages.buildPythonApplication { }; }; - meta = with lib; { + meta = { description = "Graphical Network Simulator 3 server (${channel} release)"; longDescription = '' The GNS3 server manages emulators such as Dynamips, VirtualBox or @@ -96,9 +99,9 @@ python3Packages.buildPythonApplication { ''; homepage = "https://www.gns3.com/"; changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ anthonyroussel ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ anthonyroussel ]; mainProgram = "gns3server"; }; } diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix index b57f57081b8c3..b2d34d9e90aaa 100644 --- a/pkgs/applications/networking/go-graft/default.nix +++ b/pkgs/applications/networking/go-graft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-graft"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-07fP3dVFs4MZrFOH/8/4e3LHjFGZd7pNu6J3LBOWAd8="; + sha256 = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/gopher/phetch/default.nix b/pkgs/applications/networking/gopher/phetch/default.nix index 9f835c8535e21..a74f94eceb60e 100644 --- a/pkgs/applications/networking/gopher/phetch/default.nix +++ b/pkgs/applications/networking/gopher/phetch/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk="; nativeBuildInputs = [ installShellFiles pkg-config scdoc which ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' make manual diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix index dc4ed20d7204e..92907d8a110de 100644 --- a/pkgs/applications/networking/gopher/sacc/default.nix +++ b/pkgs/applications/networking/gopher/sacc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libressl ]; - CFLAGS = lib.optionals stdenv.isDarwin [ + CFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-D_DARWIN_C_SOURCE" ]; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 63a13a26923c9..f654a96cb75d1 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = lib.optional stdenv.is64bit ./bpf_stubs_workaround.patch; + patches = lib.optional stdenv.hostPlatform.is64bit ./bpf_stubs_workaround.patch; postPatch = '' substituteInPlace ./configure \ @@ -128,6 +128,8 @@ stdenv.mkDerivation rec { # zerocallusedregs interferes during BPF compilation; TODO: perhaps improve hardeningDisable = [ "stackprotector" "zerocallusedregs" ]; + doCheck = true; + installFlags = [ "e_datadir=\${TMPDIR}" "e_localstatedir=\${TMPDIR}" diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix index 49a13cdb2623f..0fcdd5048c0e6 100644 --- a/pkgs/applications/networking/ids/zeek/broker/default.nix +++ b/pkgs/applications/networking/ids/zeek/broker/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ./0001-Fix-include-path-in-exported-CMake-targets.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace bindings/python/CMakeLists.txt --replace " -u -r" "" ''; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "-DPY_MOD_INSTALL_DIR=${placeholder "py"}/${python3.sitePackages}/" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; meta = with lib; { description = "Zeek's Messaging Library"; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index e1ac462330c2c..8286c46bcb484 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -58,9 +58,9 @@ stdenv.mkDerivation rec { openssl zlib python - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libkqueue - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; @@ -78,11 +78,11 @@ stdenv.mkDerivation rec { "-DZEEK_STATE_DIR=/var/lib/zeek" "-DZEEK_SPOOL_DIR=/var/spool/zeek" "-DDISABLE_JAVASCRIPT=ON" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DLIBKQUEUE_ROOT_DIR=${libkqueue}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; postInstall = '' for file in $out/share/zeek/base/frameworks/notice/actions/pp-alarms.zeek $out/share/zeek/base/frameworks/notice/main.zeek; do diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index be04282fcb8f7..4e1230e614e91 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "9.13.0"; + version = "9.14.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-ENd3ozRi47vszgHZIX63nQu7wZz6Zf4HdmCsNvkcLOo="; + hash = "sha256-YBC6zjcxSnOOY3RSo0X1ixTY1to2vEEkj1/9rItLzNA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index 4d07c850986ef..1c0ad5aa361a9 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -3,27 +3,27 @@ , fetchFromGitHub , pnpm , nodejs -, electron_30 +, electron_31 , makeWrapper , copyDesktopItems , makeDesktopItem }: stdenv.mkDerivation rec { pname = "armcord"; - version = "3.2.8"; + version = "3.3.1"; src = fetchFromGitHub { owner = "ArmCord"; repo = "ArmCord"; rev = "v${version}"; - hash = "sha256-H/Y3xA7gE24UsUkrxmrRFSvs16qZCVxli9vdnt7ihi8="; + hash = "sha256-rCcjanmr4s9Nc5QB3Rb5ptKF/Ge8PSZt0WvgIul3RGs="; }; nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ]; pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-hYp1XbWQL5NbIzzUSnZ7y7V+vYQmymRNo+EiSjn5d9E="; + hash = "sha256-ZfErOj03NdkviNXV4bvZC8uPOk29RhgmSez/Qvw1sGo="; }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { npm exec electron-builder -- \ --dir \ - -c.electronDist="${electron_30.dist}" \ - -c.electronVersion="${electron_30.version}" + -c.electronDist="${electron_31.dist}" \ + -c.electronVersion="${electron_31.version}" runHook postBuild ''; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/armcord.png" - makeShellWrapper "${lib.getExe electron_30}" "$out/bin/armcord" \ + makeShellWrapper "${lib.getExe electron_31}" "$out/bin/armcord" \ --add-flags "$out/share/lib/armcord/resources/app.asar" \ "''${gappsWrapperArgs[@]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index b9ce525a9cbbb..918d07863734f 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -10,10 +10,10 @@ }: let pname = "beeper"; - version = "3.108.3"; + version = "3.109.1"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.108.3-build-2407188w36frwla-x86_64.AppImage"; - hash = "sha256-mlbw5K7+xZqz05FWKgKnro5SiVG+uSTI7muErAt8PM0="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.109.1-build-240923466rji1i4-x86_64.AppImage"; + hash = "sha256-RXpoOgnoPmNID5Jx/lNxqsHsifFSS9dZzhjSu8kGtXc="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index cadfe432b297e..f82ae2ac42201 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -18,7 +18,7 @@ let sha256 = "sha256-WMT4yrLjDSMsI/lFbYODu3/0whcF+++4ShoChfMyLfQ="; }; in -(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { +(if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { passthru = (oldAttrs.passthru or { }) // { inherit x86_64-appimage x86_64-dmg; }; meta = oldAttrs.meta // { platforms = x86_64-appimage.meta.platforms ++ x86_64-dmg.meta.platforms; diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index ca8a163fd5660..be7862611f192 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { boost openssl libsecret - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; cmakeFlags = [ "-DBUILD_WITH_QT6=ON" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" '' + '' diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index b818baa899300..dd5f8f54c7455 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # Undefined symbols for architecture arm64: "_gpg_strerror" - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lgpg-error"; doCheck = true; checkPhase = '' @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { # will load # # See https://github.com/dino/dino/wiki/macOS - postFixup = lib.optionalString (stdenv.isDarwin) '' + postFixup = lib.optionalString (stdenv.hostPlatform.isDarwin) '' cd "$out/lib/dino/plugins/" for f in *.dylib; do mv "$f" "$(basename "$f" .dylib).so" diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index c4f352ac67a1d..939716d9b52d3 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,53 +1,53 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = - if stdenv.isLinux then { - stable = "0.0.65"; - ptb = "0.0.101"; - canary = "0.0.475"; - development = "0.0.24"; + if stdenv.hostPlatform.isLinux then { + stable = "0.0.67"; + ptb = "0.0.105"; + canary = "0.0.492"; + development = "0.0.28"; } else { - stable = "0.0.316"; - ptb = "0.0.130"; - canary = "0.0.583"; - development = "0.0.46"; + stable = "0.0.318"; + ptb = "0.0.133"; + canary = "0.0.591"; + development = "0.0.49"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-kzYLZcjuG7k8RSjc5ooDlMKaAlMHvm0yCl5Krnhqq8A="; + hash = "sha256-L8COdPP4SFRO+1mipjn4tjLR+xShcJbT/72yhNHdSWg="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-JesxPoYybVLVwTrDwG2kO6Pikq7qvn7CO8j+24dwjBc="; + hash = "sha256-u/4wWssZxKlHrRW/Vd9pqUfqN2VQGYv1SDktpRsOayM="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-suVIDCZhI6DwUVizBmTm104Clr6pH/olAIbOMNzFNss="; + hash = "sha256-NjcNgKYm1Twm8nN3sFlZCG/3x5fcSmX7X2On7CeZm0M="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-rSlGL2BwtUxLJltSD2Ms94qmZ4kuX5i9jFqyYC30jyQ="; + hash = "sha256-326KAuqt3VQSgyJAdsdc7YgrdF3vCVoJoKUCVC2UdaU="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-ZJ2ybvKGGCm8CZhwGxmLXZWNUD1eAyg17zD/sBwViB4="; + hash = "sha256-Ot6IM6EAg4MQPp0JqvUOZNAor6Nr6luc6pGY+722GMo="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-mLfeMx5dQNpoLUyoOSCj8XtNxWjsBpVWdFv1obtHJak="; + hash = "sha256-FFp6CRgD/kpCVxJ4+es0DaOGaW5v2Aa+lzJdG2Zu8eY="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-eIjkXOW07sR26iBttT0mGDxNnpLFKlVJtzSAtFcicBg="; + hash = "sha256-TIXe8cy6feME0900R5aWyItZfUrUA8zXo0pqwQ79yAM="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-nMihtf/xLIxwqAVrF1BSRewdS2WThx0LZ5HZUI+OzM0="; + hash = "sha256-kfHnS1NHuPD7UR7XvMdtY2LPsDRJVQHk7/Nm+cR/KGc="; }; }; aarch64-darwin = x86_64-darwin; @@ -65,7 +65,7 @@ let mainProgram = "discord"; }; package = - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then ./linux.nix else ./darwin.nix; @@ -85,17 +85,17 @@ let }; ptb = rec { pname = "discord-ptb"; - binaryName = if stdenv.isLinux then "DiscordPTB" else desktopName; + binaryName = if stdenv.hostPlatform.isLinux then "DiscordPTB" else desktopName; desktopName = "Discord PTB"; }; canary = rec { pname = "discord-canary"; - binaryName = if stdenv.isLinux then "DiscordCanary" else desktopName; + binaryName = if stdenv.hostPlatform.isLinux then "DiscordCanary" else desktopName; desktopName = "Discord Canary"; }; development = rec { pname = "discord-development"; - binaryName = if stdenv.isLinux then "DiscordDevelopment" else desktopName; + binaryName = if stdenv.hostPlatform.isLinux then "DiscordDevelopment" else desktopName; desktopName = "Discord Development"; }; } diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index db8a8be7a8718..fc40e11dca16b 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { pname = "element-desktop"; name = "${finalAttrs.pname}-${finalAttrs.version}"; src = fetchFromGitHub { - owner = "vector-im"; + owner = "element-hq"; repo = "element-desktop"; rev = "v${finalAttrs.version}"; hash = desktopSrcHash; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { }; nativeBuildInputs = [ yarn fixup-yarn-lock nodejs makeWrapper jq ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; inherit seshat; @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { ''; # The desktop item properties should be kept in sync with data from upstream: - # https://github.com/vector-im/element-desktop/blob/develop/package.json + # https://github.com/element-hq/element-desktop/blob/develop/package.json desktopItem = makeDesktopItem { name = "element-desktop"; exec = "${executableName} %u"; @@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { mimeTypes = [ "x-scheme-handler/element" ]; }; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' cp build/icon.icns $out/Applications/Element.app/Contents/Resources/element.icns ''; @@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { meta = with lib; { description = "A feature-rich client for Matrix.org"; homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.matrix.members; inherit (electron.meta) platforms; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 83289e5a6f617..1bfea7162dde8 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { pname = "element-web"; src = fetchFromGitHub { - owner = "vector-im"; + owner = "element-hq"; repo = "element-web"; rev = "v${finalAttrs.version}"; hash = webSrcHash; @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { # with the update of openssl3, some key ciphers are not supported anymore # this flag will allow those codecs again as a workaround # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 - # and https://github.com/vector-im/element-web/issues/21043 + # and https://github.com/element-hq/element-web/issues/21043 export NODE_OPTIONS=--openssl-legacy-provider mkdir -p $HOME @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { meta = { description = "Glossy Matrix collaboration client for the web"; homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 7d17d582762a3..958a80fb47430 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -19,10 +19,10 @@ in stdenv.mkDerivation rec { nodejs python3 pkg-config npmHooks.npmConfigHook ] - ++ lib.optional stdenv.isDarwin xcbuild; + ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; - buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] - ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security AppKit ]; npmDeps = fetchNpmDeps { inherit src; diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index ea86d807aafad..01a4d3c89ecf7 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.76"; + "version" = "1.11.79"; "hashes" = { - "desktopSrcHash" = "sha256-oG1nzOSXl2vjxvxdVg2o5ssKbAqrYHS4pnLCPJsIBCQ="; - "desktopYarnHash" = "0bl78yd7apd5qbsqyhxnwj7lwrjx5820zh22rzgn9jqkcv25jwgw"; - "webSrcHash" = "sha256-1hmSdefNChRcUnwbxS00NYrEexMyg8FIL0BXdEbwm+s="; - "webYarnHash" = "0bnxd7kig2a5scgdsd0yhhmanf7zqi2gd2si6kgnr0v2kc0akc0b"; + "desktopSrcHash" = "sha256-w9JWrStxmiiffu8kKVxM5h8Frxig7v4Vul3YwTnJias="; + "desktopYarnHash" = "0fwkdrfhfl6knvx552q2lpp5pd54qbzkm4kx6jvcrdwjk3x4cgqd"; + "webSrcHash" = "sha256-rla55a0SgeWddXpgaDfsvPcL00NP4DbMDgtc25TM4dw="; + "webYarnHash" = "084nm85y2fmzi27i0050hnxa4m2bqcbl7fn33zd1yini8dwr2n7s"; }; } diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index c1c9a57d43569..e8e88491c2cc0 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -17,7 +17,7 @@ in rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/seshat-node/native"; nativeBuildInputs = [ nodejs python3 yarn fixup-yarn-lock ]; - buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; + buildInputs = [ sqlcipher ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; npm_config_nodedir = nodejs; @@ -36,7 +36,7 @@ in rustPlatform.buildRustPackage rec { fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ - node_modules/.bin/neon build --release -- --target ${rust.toRustTargetSpec stdenv.hostPlatform} -Z unstable-options --out-dir target/release + node_modules/.bin/neon build --release -- --target ${stdenv.hostPlatform.rust.rustcTarget} -Z unstable-options --out-dir target/release runHook postBuild ''; diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/applications/networking/instant-messengers/element/update.sh index 0a1cc0595f879..2a4ec5fcdec24 100755 --- a/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/update.sh @@ -12,15 +12,15 @@ version="$1" set -euo pipefail if [ -z "$version" ]; then - version="$(wget -q -O- "https://api.github.com/repos/vector-im/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" + version="$(wget -q -O- "https://api.github.com/repos/element-hq/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" fi # strip leading "v" version="${version#v}" # Element Web -web_src="https://raw.githubusercontent.com/vector-im/element-web/v$version" -web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .hash) +web_src="https://raw.githubusercontent.com/element-hq/element-web/v$version" +web_src_hash=$(nix-prefetch-github element-hq element-web --rev v${version} | jq -r .hash) web_tmpdir=$(mktemp -d) trap 'rm -rf "$web_tmpdir"' EXIT @@ -31,8 +31,8 @@ web_yarn_hash=$(prefetch-yarn-deps yarn.lock) popd # Element Desktop -desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version" -desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .hash) +desktop_src="https://raw.githubusercontent.com/element-hq/element-desktop/v$version" +desktop_src_hash=$(nix-prefetch-github element-hq element-desktop --rev v${version} | jq -r .hash) desktop_tmpdir=$(mktemp -d) trap 'rm -rf "$desktop_tmpdir"' EXIT diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 0a27f5b81b9c6..8a0dc4256a031 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -65,12 +65,12 @@ let sources = { x86_64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/88a232d5/Feishu-linux_x64-7.18.11.deb"; - sha256 = "sha256-EneDVW8eQ6J+M49hn9xLtvlqiDOx4Rs8VMLt1cqSbak="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/bfdb886c/Feishu-linux_x64-7.22.9.deb"; + sha256 = "sha256-4lLCQeW6ZRzmzrHPQ91RxKEqJCxqqa4iGuJ8snZqvkQ="; }; aarch64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f29ac73d/Feishu-linux_arm64-7.18.11.deb"; - sha256 = "sha256-ghAWPQgVEBSom7zBHUKb56O3EZR4rOnQlz9BRSJBNp4="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/c3f495d6/Feishu-linux_arm64-7.22.9.deb"; + sha256 = "sha256-cT9n1p220ya1T21fWy4b7b7dIx3hqw7lConGaSZ2+UA="; }; }; @@ -131,7 +131,7 @@ let ]; in stdenv.mkDerivation { - version = "7.18.11"; + version = "7.22.9"; pname = "feishu"; src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock index 4f715a576acdf..bf459c08de5a0 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aead" version = "0.5.2" @@ -100,9 +106,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -115,33 +121,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -149,9 +155,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" [[package]] name = "arbitrary" @@ -167,7 +173,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -178,15 +184,15 @@ checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "ashpd" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "enumflags2", "futures-channel", @@ -229,9 +235,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock", "cfg-if", @@ -243,7 +249,7 @@ dependencies = [ "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -259,9 +265,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.3" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ "async-channel", "async-io", @@ -274,7 +280,7 @@ dependencies = [ "futures-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -285,14 +291,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "async-signal" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ "async-io", "async-lock", @@ -303,7 +309,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -314,20 +320,20 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "async-tungstenite" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3609af4bbf701ddaf1f6bb4e6257dff4ff8932327d0e685d3f653724c258b1ac" +checksum = "c5359381fd414fbdb272c48f2111c16cb0bb3447bfacd59311ff3736da9f6664" dependencies = [ "futures-io", "futures-util", @@ -377,17 +383,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets", ] [[package]] @@ -431,15 +437,15 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitstream-io" -version = "2.3.0" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "blake3" -version = "1.5.3" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", "arrayvec", @@ -487,9 +493,8 @@ dependencies = [ [[package]] name = "blurhash" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2415c16381be1178c8a3b9d9d67d364406c8c097894d8ae27202a00a7accedb3" +version = "0.2.3" +source = "git+https://github.com/Schmiddiii/blurhash-rs?rev=e1f9bdc1976bcc0f7dc725ac3b4fdaa6c6bdffd7#e1f9bdc1976bcc0f7dc725ac3b4fdaa6c6bdffd7" dependencies = [ "gdk-pixbuf", "image 0.25.2", @@ -509,9 +514,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -527,32 +532,31 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.6.1" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cairo-rs" -version = "0.19.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" +checksum = "e8a0ea147c94108c9613235388f540e4d14c327f7081c9e471fc8ee8a2533e69" dependencies = [ "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", - "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.2", ] [[package]] @@ -566,12 +570,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.6" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -584,6 +589,16 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cfg-expr" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345c78335be0624ed29012dc10c49102196c6882c12dde65d9f35b02da2aada8" +dependencies = [ + "smallvec", + "target-lexicon", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -632,7 +647,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -654,9 +669,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "concurrent-queue" @@ -669,9 +684,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -685,15 +700,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -781,7 +796,7 @@ source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve2551 dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -809,7 +824,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -831,14 +846,14 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "either" @@ -870,14 +885,14 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -885,9 +900,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -902,20 +917,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "err-derive" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", - "synstructure", -] - [[package]] name = "errno" version = "0.3.9" @@ -957,7 +958,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -965,9 +966,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1002,13 +1003,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flare" -version = "0.15.0" +version = "0.15.2" dependencies = [ "ashpd", "blurhash", "chrono", "env_logger", - "err-derive", "futures", "gettext-rs", "gtk4", @@ -1035,12 +1035,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1152,7 +1152,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1196,9 +1196,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699" +checksum = "8730751991b97419fc3f0c2dca2c9e45b48edf46e48e0f965964ecf33889812f" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1208,22 +1208,22 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" +checksum = "1ffbf649fd5b1c8c0f0feeb015b7533c3ef92da2887fb95ddd338bc2b1644a7c" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.2", ] [[package]] name = "gdk4" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1236,9 +1236,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1248,14 +1248,14 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps", + "system-deps 7.0.2", ] [[package]] name = "gdk4-wayland" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f620a0ecbe4c574e3fec6bef6bebcefe19cb1b9a81569245ca4503c95f9b1371" +checksum = "d48ff9cbd61a1a87b36faed4793d0d8603a2cd8db38f5df7800448ddc1a3d462" dependencies = [ "gdk4", "gdk4-wayland-sys", @@ -1266,20 +1266,20 @@ dependencies = [ [[package]] name = "gdk4-wayland-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5fd3927c917184b0e8712624eebabdc7f0909b645d468c825f8ec627e61803" +checksum = "23295b2ecafae572224a382b876b0bdc0fed947da63b51edebc8798288002048" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.2", ] [[package]] name = "gdk4-x11" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec6da3e3527007c14b27ddafe19496c49696a2a74dccb6ab75ba58dfa478b7ab" +checksum = "c4b89c2149f74668d630279559fb5e2b4f11a77124b73d04518cc344854cd626" dependencies = [ "gdk4", "gdk4-x11-sys", @@ -1290,14 +1290,14 @@ dependencies = [ [[package]] name = "gdk4-x11-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb4e987ec77b7b2fb72c0943ccbec5c3834d9d7165fe762af8ff2414f0ae23d" +checksum = "a186f565940124ebd6c1c97e9eb0909e2d19a33ccd3eebed4ff32ebda766207d" dependencies = [ "gdk4-sys", "glib-sys", "libc", - "system-deps", + "system-deps 7.0.2", ] [[package]] @@ -1323,9 +1323,9 @@ dependencies = [ [[package]] name = "gettext-rs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c" dependencies = [ "gettext-sys", "locale_config", @@ -1333,9 +1333,9 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" dependencies = [ "cc", "temp-dir", @@ -1364,15 +1364,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "gio" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe" +checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52" dependencies = [ "futures-channel", "futures-core", @@ -1383,27 +1383,26 @@ dependencies = [ "libc", "pin-project-lite", "smallvec", - "thiserror", ] [[package]] name = "gio-sys" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" +checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.2", "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.19.9" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" +checksum = "9c1ea829497810f8e87f5ee6d05c4879af641704add879e6b6080607cceeefe4" dependencies = [ "bitflags 2.6.0", "futures-channel", @@ -1418,30 +1417,29 @@ dependencies = [ "libc", "memchr", "smallvec", - "thiserror", ] [[package]] name = "glib-macros" -version = "0.19.9" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" +checksum = "951aa19c5e89555c0ca5e94ee874b24b2594ece8412b387bd84ee3266b8a3ea0" dependencies = [ "heck", - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "glib-sys" -version = "0.19.8" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" +checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163" dependencies = [ "libc", - "system-deps", + "system-deps 7.0.2", ] [[package]] @@ -1452,20 +1450,20 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" +checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.2", ] [[package]] name = "graphene-rs" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf" +checksum = "80aac87f74e81c0e13433e892a047237abdc37945c86887f5eed905038356e69" dependencies = [ "glib", "graphene-sys", @@ -1474,21 +1472,21 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" +checksum = "cc2f91ecd32989efad60326cc20a8fb252bd2852239a08e4e70cde8c100de9ca" dependencies = [ "glib-sys", "libc", "pkg-config", - "system-deps", + "system-deps 7.0.2", ] [[package]] name = "gsk4" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" dependencies = [ "cairo-rs", "gdk4", @@ -1501,9 +1499,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1512,14 +1510,14 @@ dependencies = [ "graphene-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.2", ] [[package]] name = "gtk4" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" +checksum = "f4fe572bf318e5dbc6f5a2f8a25d853f1ae3f42768c0b08af6ca20a18f4057e1" dependencies = [ "cairo-rs", "field-offset", @@ -1538,21 +1536,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" +checksum = "e9e7b362c8fccd2712297903717d65d30defdab2b509bc9d209cbe5ffb9fabaf" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "gtk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1564,25 +1562,25 @@ dependencies = [ "gsk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.2", ] [[package]] name = "h2" -version = "0.3.26" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", - "http 0.2.12", + "http", "indexmap", "slab", "tokio", - "tokio-util 0.7.11", + "tokio-util", "tracing", ] @@ -1604,14 +1602,14 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "headers" -version = "0.3.9" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http 0.2.12", + "http", "httpdate", "mime", "sha1", @@ -1619,11 +1617,11 @@ dependencies = [ [[package]] name = "headers-core" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" dependencies = [ - "http 0.2.12", + "http", ] [[package]] @@ -1685,9 +1683,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1695,24 +1693,25 @@ dependencies = [ ] [[package]] -name = "http" -version = "1.1.0" +name = "http-body" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "fnv", - "itoa", + "http", ] [[package]] -name = "http-body" -version = "0.4.6" +name = "http-body-util" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "http 0.2.12", + "futures-util", + "http", + "http-body", "pin-project-lite", ] @@ -1736,55 +1735,73 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.30" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", - "http 0.2.12", + "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.25.0" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c78f9338483cb7e630c8474b07268983c6bd5acee012e4211f9f7bb21b070" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 0.2.12", + "http", "hyper", + "hyper-util", "log", "rustls", - "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" dependencies = [ "hyper", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1879,9 +1896,9 @@ checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", @@ -1914,14 +1931,14 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -1932,6 +1949,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -1940,9 +1966,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -1958,9 +1984,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1982,11 +2008,10 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" dependencies = [ - "gdk-pixbuf", "gdk4", "gio", "glib", @@ -1998,9 +2023,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" dependencies = [ "gdk4-sys", "gio-sys", @@ -2009,14 +2034,14 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.2", ] [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libfuzzer-sys" @@ -2038,7 +2063,7 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libsignal-core" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" +source = "git+https://github.com/signalapp/libsignal?tag=v0.56.1#e46841ea2c1ad03bc5113eba267ac1543689d031" dependencies = [ "num_enum", "uuid", @@ -2047,7 +2072,7 @@ dependencies = [ [[package]] name = "libsignal-protocol" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" +source = "git+https://github.com/signalapp/libsignal?tag=v0.56.1#e46841ea2c1ad03bc5113eba267ac1543689d031" dependencies = [ "aes", "aes-gcm-siv", @@ -2061,7 +2086,7 @@ dependencies = [ "hkdf", "hmac", "indexmap", - "itertools", + "itertools 0.13.0", "libsignal-core", "log", "num_enum", @@ -2083,12 +2108,12 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=1b591540b908112816be131d6baa6eafba2129cb#1b591540b908112816be131d6baa6eafba2129cb" +source = "git+https://github.com/Schmiddiii/libsignal-service-rs?rev=340caf1e931a862f9052eecf089667465b3819af#340caf1e931a862f9052eecf089667465b3819af" dependencies = [ "aes", "aes-gcm", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bincode", "bytes", "cbc", @@ -2118,16 +2143,18 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=1b591540b908112816be131d6baa6eafba2129cb#1b591540b908112816be131d6baa6eafba2129cb" +source = "git+https://github.com/Schmiddiii/libsignal-service-rs?rev=340caf1e931a862f9052eecf089667465b3819af#340caf1e931a862f9052eecf089667465b3819af" dependencies = [ "async-trait", "async-tungstenite", "bytes", "futures", "headers", + "http-body-util", "hyper", "hyper-rustls", "hyper-timeout", + "hyper-util", "libsignal-service", "mpart-async", "rustls-pemfile", @@ -2143,9 +2170,9 @@ dependencies = [ [[package]] name = "libspelling" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d899332fb50d87851a5599a38e244062f92878d51a3f0dd038fd414760b52d" +checksum = "1cbd36b794de5725e0b2be4cc90c57c5e3c7a5a3e5c317436e9e667305274c34" dependencies = [ "gio", "glib", @@ -2157,9 +2184,9 @@ dependencies = [ [[package]] name = "libspelling-sys" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d4ed284e63577d6d61ef30a4f26255d9a460d5a493b3425656a84a00521ba4" +checksum = "2d2ec120461981daf9d0c5a8b0bc55ebf350292280e93fd6d063895593754484" dependencies = [ "gio-sys", "glib-sys", @@ -2167,7 +2194,7 @@ dependencies = [ "gtk4-sys", "libc", "sourceview5-sys", - "system-deps", + "system-deps 7.0.2", ] [[package]] @@ -2245,7 +2272,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ "cfg-if", - "rayon", ] [[package]] @@ -2305,27 +2331,37 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "mpart-async" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea6ab2359d45d2401bd7ba5ce5a67582f2abb872ea9ec17f78efb6ac3591864" +checksum = "f9bdeb8c63325c5d4ec66dff19cc42c5416b5bb27b2f555b3b9debdbe2d40d9b" dependencies = [ "bytes", "futures-core", "futures-util", - "http 0.2.12", + "http", "httparse", "log", "memchr", @@ -2335,7 +2371,7 @@ dependencies = [ "rand", "thiserror", "tokio", - "tokio-util 0.6.10", + "tokio-util", ] [[package]] @@ -2438,7 +2474,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -2481,35 +2517,25 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - [[package]] name = "num_enum" -version = "0.6.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.6.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -2543,9 +2569,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -2614,9 +2640,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" +checksum = "5764e5a174a5a0ec054fe5962ce6d4fc7052e2d0dcc23bbc77202b40a4a403d3" dependencies = [ "gio", "glib", @@ -2626,21 +2652,21 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.8" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" +checksum = "fd317e1de76b14b3d3efe05518c08b360327f1ab7fec150473a89ffcad4b072d" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.2", ] [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -2684,7 +2710,7 @@ checksum = "7459127d7a18cb202d418e4b7df1103ffd6d82a106e9b2091c250624c2ace70d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -2728,7 +2754,7 @@ dependencies = [ "bincode", "either", "fnv", - "itertools", + "itertools 0.12.1", "lazy_static", "nom", "quick-xml", @@ -2757,7 +2783,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -2774,9 +2800,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand", @@ -2799,13 +2825,13 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "poksho" version = "0.7.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" +source = "git+https://github.com/signalapp/libsignal?tag=v0.56.1#e46841ea2c1ad03bc5113eba267ac1543689d031" dependencies = [ "curve25519-dalek", "hmac", @@ -2814,9 +2840,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", @@ -2824,7 +2850,7 @@ dependencies = [ "pin-project-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2852,9 +2878,12 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "pqcrypto-internals" @@ -2890,9 +2919,9 @@ checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb" [[package]] name = "presage" version = "0.6.2" -source = "git+https://github.com/whisperfish/presage?rev=e2392c42a0392397b9db782607fdd7ab2ea91b5f#e2392c42a0392397b9db782607fdd7ab2ea91b5f" +source = "git+https://github.com/whisperfish/presage?rev=b0e862baa03e452ccb9717d7d2f005ab93d46303#b0e862baa03e452ccb9717d7d2f005ab93d46303" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "futures", "hex", "libsignal-service", @@ -2910,7 +2939,7 @@ dependencies = [ [[package]] name = "presage-store-cipher" version = "0.1.0" -source = "git+https://github.com/whisperfish/presage?rev=e2392c42a0392397b9db782607fdd7ab2ea91b5f#e2392c42a0392397b9db782607fdd7ab2ea91b5f" +source = "git+https://github.com/whisperfish/presage?rev=b0e862baa03e452ccb9717d7d2f005ab93d46303#b0e862baa03e452ccb9717d7d2f005ab93d46303" dependencies = [ "blake3", "chacha20poly1305", @@ -2927,10 +2956,10 @@ dependencies = [ [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage?rev=e2392c42a0392397b9db782607fdd7ab2ea91b5f#e2392c42a0392397b9db782607fdd7ab2ea91b5f" +source = "git+https://github.com/whisperfish/presage?rev=b0e862baa03e452ccb9717d7d2f005ab93d46303#b0e862baa03e452ccb9717d7d2f005ab93d46303" dependencies = [ "async-trait", - "base64 0.21.7", + "base64 0.22.1", "chrono", "fs_extra", "log", @@ -2948,55 +2977,21 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "toml_edit", ] [[package]] @@ -3024,14 +3019,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "prost" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" dependencies = [ "bytes", "prost-derive", @@ -3039,13 +3034,13 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.13.0", "log", "multimap", "once_cell", @@ -3054,28 +3049,28 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.72", + "syn 2.0.77", "tempfile", ] [[package]] name = "prost-derive" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", - "itertools", + "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" dependencies = [ "prost", ] @@ -3134,9 +3129,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3185,7 +3180,7 @@ dependencies = [ "built", "cfg-if", "interpolate_name", - "itertools", + "itertools 0.12.1", "libc", "libfuzzer-sys", "log", @@ -3200,7 +3195,7 @@ dependencies = [ "rand", "rand_chacha", "simd_helpers", - "system-deps", + "system-deps 6.2.2", "thiserror", "v_frame", "wasm-bindgen", @@ -3208,17 +3203,15 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.6" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85be49d628515bb99a01c44200009f0a4167c252f036445b975b35daf952258c" +checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" dependencies = [ "avif-serialize", - "bitstream-io", "imgref", "loop9", "quick-error", "rav1e", - "rayon", "rgb", ] @@ -3253,9 +3246,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -3300,9 +3293,9 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rgb" -version = "0.8.45" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -3330,18 +3323,18 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" dependencies = [ "bitflags 2.6.0", "errno", @@ -3352,11 +3345,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -3366,9 +3360,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3379,9 +3373,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -3389,15 +3383,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -3418,11 +3412,11 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3462,31 +3456,32 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -3499,14 +3494,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -3533,10 +3528,16 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-crypto" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" +source = "git+https://github.com/signalapp/libsignal?tag=v0.56.1#e46841ea2c1ad03bc5113eba267ac1543689d031" dependencies = [ "aes", "cbc", @@ -3617,9 +3618,9 @@ dependencies = [ [[package]] name = "sourceview5" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0bf70f2f1ac4624af22056f9c4cf58dccff73dafc7207b46fbd3df7b57410f" +checksum = "905c83b38d4aff1800a12adba65b083deba61b4d948f62fc2ff7ad7d77656d05" dependencies = [ "futures-channel", "futures-core", @@ -3635,9 +3636,9 @@ dependencies = [ [[package]] name = "sourceview5-sys" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac236ad7ce6dad2b819ced8b68b5a1cf4d968aa301cb9a7692470eb21f657be" +checksum = "4a3759467713554a8063faa380237ee2c753e89026bbe1b8e9611d991cb106ff" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -3647,7 +3648,7 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.2", ] [[package]] @@ -3684,7 +3685,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3706,9 +3707,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -3716,24 +3717,25 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "system-deps" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", + "cfg-expr 0.15.8", + "heck", + "pkg-config", + "toml", + "version-compare", ] [[package]] name = "system-deps" -version = "6.2.2" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +checksum = "070a0a5e7da2d24be457809c4b3baa57a835fd2829ad8b86f9a049052fe71031" dependencies = [ - "cfg-expr", + "cfg-expr 0.16.0", "heck", "pkg-config", "toml", @@ -3742,9 +3744,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.15" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "temp-dir" @@ -3754,14 +3756,15 @@ checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3781,7 +3784,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3812,49 +3815,38 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.1" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", "rustls-pki-types", @@ -3863,23 +3855,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -3890,65 +3868,64 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.15" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.16", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", + "serde", + "serde_spanned", "toml_datetime", - "winnow 0.5.40", + "winnow", ] [[package]] -name = "toml_edit" -version = "0.21.1" +name = "tower" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", ] [[package]] -name = "toml_edit" -version = "0.22.16" +name = "tower-layer" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.14", -] +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -3970,7 +3947,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4000,14 +3977,14 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.1.0", + "http", "httparse", "log", "rand", @@ -4066,12 +4043,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "universal-hash" version = "0.5.1" @@ -4146,9 +4117,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "want" @@ -4167,34 +4138,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4202,22 +4174,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "weezl" @@ -4253,16 +4225,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", + "windows-targets", ] [[package]] @@ -4271,22 +4234,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-targets" -version = "0.48.5" +name = "windows-sys" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" 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", + "windows-targets", ] [[package]] @@ -4295,46 +4252,28 @@ 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_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -4347,48 +4286,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -4397,18 +4312,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374ec40a2d767a3c1b4972d9475ecd557356637be906f2cb3f7fe17a6eb5e22f" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -4427,12 +4333,12 @@ dependencies = [ [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4474,10 +4380,10 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "zvariant_utils", ] @@ -4492,6 +4398,27 @@ dependencies = [ "zvariant", ] +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "zeroize" version = "1.8.1" @@ -4509,13 +4436,13 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "zkcredential" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" +source = "git+https://github.com/signalapp/libsignal?tag=v0.56.1#e46841ea2c1ad03bc5113eba267ac1543689d031" dependencies = [ "cfg-if", "curve25519-dalek", @@ -4534,7 +4461,7 @@ dependencies = [ [[package]] name = "zkgroup" version = "0.9.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" +source = "git+https://github.com/signalapp/libsignal?tag=v0.56.1#e46841ea2c1ad03bc5113eba267ac1543689d031" dependencies = [ "aes-gcm-siv", "bincode", @@ -4604,10 +4531,10 @@ version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "zvariant_utils", ] @@ -4619,5 +4546,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix index 6614d54ff696c..85882107887f5 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix +++ b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -21,23 +21,24 @@ stdenv.mkDerivation rec { pname = "flare"; - version = "0.15.0"; + version = "0.15.2"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = "flare"; rev = version; - hash = "sha256-sIT4oEmIV8TJ5MMxg3vxkvK+7PaIy/01kN9I2FTsfo0="; + hash = "sha256-w8H6EYnVYJ6gDhdeZwyxRquem4ayZ4cgLaJMKqcetuI="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { + "blurhash-0.2.3" = "sha256-s1777+2O0D/VyKwlPUA53gho5sOP8pN610KqxEjugz0="; "curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A="; - "libsignal-core-0.1.0" = "sha256-4aHINlpVAqVTtm7npwXQRutZUmIxYgkhXhApg7jSM4M="; - "libsignal-service-0.1.0" = "sha256-UMQqp6hfyVtUwkAqsw/xsn7UrGul/F4WVC/Oy5s+hqA="; - "presage-0.6.2" = "sha256-4E23mzXwb5gcj0XpXB17a5BD96+ZAl7dh5I6vMvE9Kg="; + "libsignal-core-0.1.0" = "sha256-AdN8UHu0khgsog1btE++0J4BmdUC6wMpZzL7HPzhALQ="; + "libsignal-service-0.1.0" = "sha256-bnbbbnoBaHUdobBywOAUQojoMYkOlgI2O1RG2DoyvUc="; + "presage-0.6.2" = "sha256-AB4ttolC6MPp3foT66DG5RArqX+c1wf2w3lIZ0u0LCM="; }; }; diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index e259c6b60f8d6..b71395ad93bb0 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { buildInputs = [ guile glib loudmouth gmp libidn readline libtool libunwind ncurses curl jansson - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone ]; - env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-largp"; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-largp"; meta = with lib; { description = "Console XMPP client"; diff --git a/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/pkgs/applications/networking/instant-messengers/go-neb/default.nix index 82cfb3126c861..6b4528dfe289c 100644 --- a/pkgs/applications/networking/instant-messengers/go-neb/default.nix +++ b/pkgs/applications/networking/instant-messengers/go-neb/default.nix @@ -21,7 +21,7 @@ buildGoModule { passthru.tests.go-neb = nixosTests.go-neb; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Extensible matrix bot written in Go"; mainProgram = "go-neb"; homepage = "https://github.com/matrix-org/go-neb"; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 64b971b2353bf..510f577a50e93 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -42,7 +42,7 @@ buildGoModule rec { }/* $out/ substituteAllInPlace $out/share/applications/* wrapProgram $out/bin/gomuks \ - --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}" \ + --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ libnotify pulseaudio ])}" \ --set-default GOMUKS_SOUND_NORMAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/message-new-instant.oga" \ --set-default GOMUKS_SOUND_CRITICAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/complete.oga" ''; diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/Cargo.lock b/pkgs/applications/networking/instant-messengers/gurk-rs/Cargo.lock index 3c5de8c878377..2ca881477050b 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aead" version = "0.5.2" @@ -70,9 +76,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -83,27 +89,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -128,47 +125,48 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -176,25 +174,24 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" -version = "3.3.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1faa3c733d9a3dd6fbaf85da5d162a2e03b2e0033a90dceb0e2a90fdd1e5380a" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ "clipboard-win", "core-graphics", "image", "log", - "objc", - "objc-foundation", - "objc_id", - "parking_lot 0.12.1", - "thiserror", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot 0.12.3", "windows-sys 0.48.0", "wl-clipboard-rs", "x11rb", @@ -202,185 +199,158 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 2.5.3", + "event-listener 5.3.1", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.2.0", + "fastrand", + "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock", "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", + "futures-lite", ] [[package]] name = "async-io" -version = "2.3.1" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ - "async-lock 3.3.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite", "parking", - "polling 3.5.0", - "rustix 0.38.31", + "polling", + "rustix", "slab", "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", + "windows-sys 0.59.0", ] [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.31", - "windows-sys 0.48.0", + "event-listener 5.3.1", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.1", - "async-lock 2.8.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.31", + "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -424,48 +394,38 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "atomic-write-file" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" -dependencies = [ - "nix 0.27.1", - "rand", -] - [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.13.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -490,18 +450,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", "arrayvec", @@ -534,50 +494,50 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.2.0", + "futures-lite", "piper", - "tracing", ] [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", - "regex-automata 0.4.5", + "regex-automata", "serde", ] [[package]] name = "bumpalo" -version = "3.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" - -[[package]] -name = "bytecount" -version = "0.6.7" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" [[package]] name = "byteorder" @@ -585,11 +545,17 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" -version = "1.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cassowary" @@ -603,6 +569,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +[[package]] +name = "castaway" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +dependencies = [ + "rustversion", +] + [[package]] name = "cbc" version = "0.1.2" @@ -614,11 +589,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.88" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ + "jobserver", "libc", + "shlex", ] [[package]] @@ -627,6 +604,18 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chacha20" version = "0.9.1" @@ -659,15 +648,17 @@ checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", "serde", - "windows-targets 0.52.4", + "wasm-bindgen", + "windows-targets 0.52.6", ] [[package]] @@ -710,9 +701,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.1" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -720,9 +711,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.1" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -732,27 +723,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clipboard-win" -version = "5.2.0" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -764,22 +755,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] -name = "color_quant" -version = "1.1.0" +name = "colorchoice" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] -name = "colorchoice" -version = "1.0.0" +name = "compact_str" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "ryu", + "static_assertions", +] [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -804,9 +802,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -820,15 +818,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -850,18 +848,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] @@ -874,9 +872,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -921,15 +919,15 @@ dependencies = [ [[package]] name = "critical-section" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" +checksum = "f64009896348fc5af4222e9cf7d7d82a95a256c634ebcf61c53e4ea461422242" [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -964,9 +962,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" @@ -974,12 +972,12 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "crossterm_winapi", "futures-core", "libc", - "mio", - "parking_lot 0.12.1", + "mio 0.8.11", + "parking_lot 0.12.3", "signal-hook", "signal-hook-mio", "winapi", @@ -1022,15 +1020,14 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" -source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.1#a12ab4e58455bb3dc7cd73a0f9f3443507b2854b" +version = "4.1.3" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.3#7c6d34756355a3566a704da84dce7b1c039a6572" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest", "fiat-crypto", - "platforms", "rustc_version", "serde", "subtle", @@ -1039,25 +1036,36 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" -source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.1#a12ab4e58455bb3dc7cd73a0f9f3443507b2854b" +version = "0.1.1" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.3#7c6d34756355a3566a704da84dce7b1c039a6572" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "dbus" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -1086,13 +1094,13 @@ dependencies = [ [[package]] name = "derive-new" -version = "0.5.9" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" +checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.76", ] [[package]] @@ -1103,7 +1111,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1120,9 +1128,9 @@ dependencies = [ [[package]] name = "dirs" -version = "4.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ "dirs-sys", ] @@ -1139,13 +1147,14 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1161,13 +1170,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1187,21 +1196,21 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" dependencies = [ "serde", ] @@ -1213,10 +1222,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" [[package]] -name = "emojis" +name = "embedded-io" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee61eb945bff65ee7d19d157d39c67c33290ff0742907413fd5eefd29edc979" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + +[[package]] +name = "emojis" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e72f23d65b46527e461b161ab9a126c378aa2249d8a8d15718d23ab1fb4d8786" dependencies = [ "phf", ] @@ -1227,11 +1242,17 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -1239,13 +1260,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1266,9 +1287,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1299,31 +1320,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.2.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1332,38 +1331,19 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.2.0", + "event-listener 5.3.1", "pin-project-lite", ] [[package]] name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1376,28 +1356,22 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - [[package]] name = "fixedbitset" version = "0.4.2" @@ -1406,12 +1380,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1422,7 +1396,7 @@ checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "spin 0.9.8", + "spin", ] [[package]] @@ -1449,7 +1423,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1533,7 +1507,7 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -1544,26 +1518,11 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -1578,7 +1537,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1651,9 +1610,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1662,9 +1621,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ "opaque-debug", "polyval", @@ -1673,9 +1632,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1685,18 +1644,17 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gurk" -version = "0.4.3" +version = "0.5.1" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "anyhow", "arboard", "async-trait", - "base64 0.13.1", + "base64 0.22.1", "chrono", "clap", "criterion", "crossterm", - "derivative", "dirs", "emojis", "futures-channel", @@ -1705,7 +1663,8 @@ dependencies = [ "hostname", "image", "insta", - "itertools 0.10.5", + "itertools 0.12.1", + "libsqlite3-sys", "log-panics", "mime_guess", "notify-rust", @@ -1715,18 +1674,16 @@ dependencies = [ "postcard", "presage", "presage-store-sled", - "prost 0.10.4", + "prost", "qr2term", "quickcheck", "quickcheck_macros", "ratatui", "rayon", "regex", - "regex-automata 0.1.10", "scopeguard", "serde", "serde_json", - "sha2", "sqlx", "tempfile", "textwrap", @@ -1739,34 +1696,35 @@ dependencies = [ "tracing-appender", "tracing-subscriber", "unicode-width", + "url", "uuid", "whoami", ] [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.11", + "http 0.2.12", "indexmap", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tracing", ] [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1783,9 +1741,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -1809,7 +1767,7 @@ dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http 0.2.11", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -1821,7 +1779,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http 0.2.11", + "http 0.2.12", ] [[package]] @@ -1834,7 +1792,7 @@ dependencies = [ "hash32", "rustc_version", "serde", - "spin 0.9.8", + "spin", "stable_deref_trait", ] @@ -1847,12 +1805,24 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -1894,20 +1864,20 @@ dependencies = [ [[package]] name = "hostname" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ + "cfg-if", "libc", - "match_cfg", - "winapi", + "windows 0.52.0", ] [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1916,9 +1886,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1932,15 +1902,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1950,22 +1920,22 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http 0.2.11", + "http 0.2.12", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.6", + "socket2", "tokio", "tower-service", "tracing", @@ -1979,10 +1949,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "399c78f9338483cb7e630c8474b07268983c6bd5acee012e4211f9f7bb21b070" dependencies = [ "futures-util", - "http 0.2.11", + "http 0.2.12", "hyper", "log", - "rustls 0.22.2", + "rustls 0.22.4", "rustls-native-certs", "rustls-pki-types", "tokio", @@ -2036,13 +2006,12 @@ dependencies = [ [[package]] name = "image" -version = "0.24.9" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", - "color_quant", + "byteorder-lite", "num-traits", "png", "tiff", @@ -2050,20 +2019,14 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown", ] -[[package]] -name = "indoc" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" - [[package]] name = "inout" version = "0.1.3" @@ -2076,48 +2039,42 @@ dependencies = [ [[package]] name = "insta" -version = "1.35.1" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c985c1bef99cf13c58fade470483d81a2bfe846ebde60ed28cc2dddec2df9e2" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", "linked-hash-map", "serde", "similar", - "yaml-rust", ] [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "is-terminal" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] -name = "is-terminal" -version = "0.4.12" +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.52.0", -] +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -2130,27 +2087,36 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] [[package]] name = "jpeg-decoder" @@ -2160,36 +2126,46 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] name = "libc" -version = "0.2.153" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "cc", + "pkg-config", +] [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.6", ] [[package]] @@ -2200,19 +2176,19 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", ] [[package]] name = "libsignal-core" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "num_enum", "uuid", @@ -2221,7 +2197,7 @@ dependencies = [ [[package]] name = "libsignal-protocol" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "aes", "aes-gcm-siv", @@ -2241,13 +2217,13 @@ dependencies = [ "num_enum", "pqcrypto-kyber", "pqcrypto-traits", - "prost 0.12.3", + "prost", "prost-build", "rand", "rayon", + "serde", "sha2", "signal-crypto", - "static_assertions", "subtle", "thiserror", "uuid", @@ -2257,7 +2233,7 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=689a4c2#689a4c23292026f0d7067535988eb4a9e4bdb37a" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=86dd9da99b254c2127fb60c366df426d60318097#86dd9da99b254c2127fb60c366df426d60318097" dependencies = [ "aes", "aes-gcm", @@ -2275,7 +2251,7 @@ dependencies = [ "hmac", "libsignal-protocol", "phonenumber", - "prost 0.12.3", + "prost", "prost-build", "rand", "serde", @@ -2292,7 +2268,7 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=689a4c2#689a4c23292026f0d7067535988eb4a9e4bdb37a" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=86dd9da99b254c2127fb60c366df426d60318097#86dd9da99b254c2127fb60c366df426d60318097" dependencies = [ "async-trait", "async-tungstenite", @@ -2304,7 +2280,7 @@ dependencies = [ "hyper-timeout", "libsignal-service", "mpart-async", - "rustls-pemfile 2.1.1", + "rustls-pemfile 2.1.3", "serde", "serde_json", "thiserror", @@ -2322,6 +2298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", + "openssl-sys", "pkg-config", "vcpkg", ] @@ -2334,21 +2311,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2356,9 +2327,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "log-panics" @@ -2369,6 +2340,15 @@ dependencies = [ "log", ] +[[package]] +name = "lru" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +dependencies = [ + "hashbrown", +] + [[package]] name = "lru-cache" version = "0.1.2" @@ -2400,12 +2380,6 @@ dependencies = [ "libc", ] -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - [[package]] name = "md-5" version = "0.10.6" @@ -2418,24 +2392,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -2448,9 +2413,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -2464,19 +2429,28 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -2484,6 +2458,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "mpart-async" version = "0.6.1" @@ -2493,7 +2479,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http 0.2.11", + "http 0.2.12", "httparse", "log", "memchr", @@ -2508,32 +2494,33 @@ dependencies = [ [[package]] name = "multimap" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "nix" -version = "0.26.4" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases 0.1.1", "libc", - "memoffset 0.7.1", - "pin-utils", ] [[package]] name = "nix" -version = "0.27.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases 0.2.1", "libc", + "memoffset", ] [[package]] @@ -2546,11 +2533,20 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "normpath" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "notify-rust" -version = "4.10.0" +version = "4.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226" +checksum = "26a1d03b6305ecefdd9c6c60150179bb8d9f0cd4e64bbcad1e41419e7bf5e414" dependencies = [ "log", "mac-notification-sys", @@ -2603,9 +2599,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2614,24 +2610,14 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_enum" version = "0.6.1" @@ -2647,10 +2633,10 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -2673,6 +2659,105 @@ dependencies = [ "objc_id", ] +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + [[package]] name = "objc_id" version = "0.1.1" @@ -2684,9 +2769,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -2705,9 +2790,9 @@ checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "opaque-debug" @@ -2717,12 +2802,14 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "opener" -version = "0.5.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005" +checksum = "d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681" dependencies = [ "bstr", - "winapi", + "dbus", + "normpath", + "windows-sys 0.59.0", ] [[package]] @@ -2731,6 +2818,34 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.3.1+3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "ordered-stream" version = "0.2.0" @@ -2743,12 +2858,12 @@ dependencies = [ [[package]] name = "os_pipe" -version = "1.1.5" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2776,12 +2891,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -2800,15 +2915,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -2828,14 +2943,14 @@ checksum = "7459127d7a18cb202d418e4b7df1103ffd6d82a106e9b2091c250624c2ace70d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -2864,9 +2979,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap", @@ -2892,50 +3007,50 @@ dependencies = [ [[package]] name = "phonenumber" -version = "0.3.3+8.13.9" +version = "0.3.6+8.13.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "635f3e6288e4f01c049d89332a031bd74f25d64b6fb94703ca966e819488cd06" +checksum = "11756237b57b8cc5e97dc8b1e70ea436324d30e7075de63b14fd15073a8f692a" dependencies = [ "bincode", "either", "fnv", - "itertools 0.11.0", + "itertools 0.12.1", "lazy_static", "nom", - "quick-xml 0.28.2", + "quick-xml 0.31.0", "regex", "regex-cache", "serde", "serde_derive", - "strum 0.24.1", + "strum", "thiserror", ] [[package]] name = "pin-project" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2945,12 +3060,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] @@ -2981,17 +3096,11 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "platforms" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" - [[package]] name = "plotters" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" dependencies = [ "num-traits", "plotters-backend", @@ -3002,15 +3111,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" [[package]] name = "plotters-svg" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" dependencies = [ "plotters-backend", ] @@ -3025,48 +3134,32 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "poksho" version = "0.7.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "curve25519-dalek", "hmac", "sha2", - "subtle", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", ] [[package]] name = "polling" -version = "3.5.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.31", + "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3082,9 +3175,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -3094,12 +3187,13 @@ dependencies = [ [[package]] name = "postcard" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" dependencies = [ "cobs", - "embedded-io", + "embedded-io 0.4.0", + "embedded-io 0.6.1", "heapless", "serde", ] @@ -3112,9 +3206,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "pqcrypto-internals" @@ -3149,8 +3246,8 @@ checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb" [[package]] name = "presage" -version = "0.6.1" -source = "git+https://github.com/whisperfish/presage?rev=97e2357#97e235721efbc47da0872ab432e401f434b0ee99" +version = "0.6.2" +source = "git+https://github.com/whisperfish/presage?rev=67d98a3cb021dd365a671be067abc69deb71c736#67d98a3cb021dd365a671be067abc69deb71c736" dependencies = [ "base64 0.21.7", "futures", @@ -3170,7 +3267,7 @@ dependencies = [ [[package]] name = "presage-store-cipher" version = "0.1.0" -source = "git+https://github.com/whisperfish/presage?rev=97e2357#97e235721efbc47da0872ab432e401f434b0ee99" +source = "git+https://github.com/whisperfish/presage?rev=67d98a3cb021dd365a671be067abc69deb71c736#67d98a3cb021dd365a671be067abc69deb71c736" dependencies = [ "blake3", "chacha20poly1305", @@ -3187,15 +3284,16 @@ dependencies = [ [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage?rev=97e2357#97e235721efbc47da0872ab432e401f434b0ee99" +source = "git+https://github.com/whisperfish/presage?rev=67d98a3cb021dd365a671be067abc69deb71c736#67d98a3cb021dd365a671be067abc69deb71c736" dependencies = [ "async-trait", "base64 0.21.7", + "chrono", "fs_extra", "log", "presage", "presage-store-cipher", - "prost 0.12.3", + "prost", "prost-build", "quickcheck_macros", "serde", @@ -3207,12 +3305,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.16" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -3222,107 +3320,99 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] -name = "proc-macro2" -version = "1.0.78" +name = "proc-macro-crate" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "unicode-ident", + "toml_edit 0.22.20", ] [[package]] -name = "prost" -version = "0.10.4" +name = "proc-macro2" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ - "bytes", - "prost-derive 0.10.1", + "unicode-ident", ] [[package]] name = "prost" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.3", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", - "heck", - "itertools 0.11.0", + "heck 0.5.0", + "itertools 0.12.1", "log", "multimap", "once_cell", "petgraph", "prettyplease", - "prost 0.12.3", + "prost", "prost-types", "regex", - "syn 2.0.52", + "syn 2.0.76", "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", ] [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "prost-types" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.3", + "prost", ] [[package]] name = "pulldown-cmark" -version = "0.9.6" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +checksum = "cb4e75767fbc9d92b90e4d0c011f61358cde9513b31ef07ea3631b15ffc3b4fd" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "getopts", "memchr", + "pulldown-cmark-escape", "unicase", ] +[[package]] +name = "pulldown-cmark-escape" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" + [[package]] name = "qr2term" version = "0.3.1" @@ -3343,27 +3433,18 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" dependencies = [ "memchr", ] @@ -3392,9 +3473,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3431,26 +3512,29 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.23.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e2e4cd95294a85c3b4446e63ef054eea43e0205b1fd60120c16b74ff7ff96ad" +checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cassowary", + "compact_str", "crossterm", - "indoc", - "itertools 0.11.0", + "itertools 0.12.1", + "lru", "paste", - "strum 0.25.0", + "stability", + "strum", "unicode-segmentation", + "unicode-truncate", "unicode-width", ] [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3484,11 +3568,20 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -3497,34 +3590,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ - "aho-corasick 1.1.2", + "aho-corasick", "memchr", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax 0.8.4", ] [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ - "aho-corasick 1.1.2", + "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] @@ -3547,9 +3631,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "ring" @@ -3561,7 +3645,7 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin 0.9.8", + "spin", "untrusted", "windows-sys 0.52.0", ] @@ -3588,9 +3672,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -3603,36 +3687,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.31" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "ring", "rustls-webpki 0.101.7", @@ -3641,26 +3711,26 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.7", "subtle", "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.1", + "rustls-pemfile 2.1.3", "rustls-pki-types", "schannel", "security-framework", @@ -3677,19 +3747,19 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.3.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" @@ -3703,9 +3773,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring", "rustls-pki-types", @@ -3714,15 +3784,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3766,11 +3836,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3779,9 +3849,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3789,50 +3859,60 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", ] [[package]] @@ -3866,10 +3946,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-crypto" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "aes", "cbc", @@ -3895,20 +3981,20 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio", + "mio 0.8.11", "signal-hook", ] [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3931,9 +4017,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "similar" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "siphasher" @@ -3968,9 +4054,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smawk" @@ -3980,30 +4066,14 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -4025,20 +4095,19 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" +checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" dependencies = [ - "itertools 0.12.1", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4049,9 +4118,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" dependencies = [ "ahash", "atoi", @@ -4060,7 +4129,6 @@ dependencies = [ "chrono", "crc", "crossbeam-queue", - "dotenvy", "either", "event-listener 2.5.3", "futures-channel", @@ -4076,7 +4144,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls 0.21.10", + "rustls 0.21.12", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -4094,9 +4162,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" dependencies = [ "proc-macro2", "quote", @@ -4107,14 +4175,13 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" dependencies = [ - "atomic-write-file", "dotenvy", "either", - "heck", + "heck 0.4.1", "hex", "once_cell", "proc-macro2", @@ -4134,13 +4201,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" dependencies = [ "atoi", "base64 0.21.7", - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "bytes", "chrono", @@ -4178,13 +4245,13 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" dependencies = [ "atoi", "base64 0.21.7", - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "chrono", "crc", @@ -4206,7 +4273,6 @@ dependencies = [ "rand", "serde", "serde_json", - "sha1", "sha2", "smallvec", "sqlx-core", @@ -4219,9 +4285,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" dependencies = [ "atoi", "chrono", @@ -4242,6 +4308,16 @@ dependencies = [ "uuid", ] +[[package]] +name = "stability" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" +dependencies = [ + "quote", + "syn 2.0.76", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -4256,70 +4332,48 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stringprep" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" dependencies = [ - "finl_unicode", "unicode-bidi", "unicode-normalization", + "unicode-properties", ] [[package]] name = "strsim" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - -[[package]] -name = "strum" -version = "0.24.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros 0.24.3", -] +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros 0.25.3", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", + "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -4334,9 +4388,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -4345,9 +4399,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -4356,24 +4410,26 @@ dependencies = [ [[package]] name = "tauri-winrt-notification" -version = "0.1.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" dependencies = [ - "quick-xml 0.30.0", - "windows", + "quick-xml 0.31.0", + "windows 0.56.0", + "windows-version", ] [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "rustix 0.38.31", - "windows-sys 0.52.0", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", ] [[package]] @@ -4389,22 +4445,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -4430,9 +4486,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -4451,9 +4507,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -4471,9 +4527,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4486,19 +4542,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "pin-project-lite", - "socket2 0.5.6", + "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4513,13 +4568,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -4528,16 +4583,16 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -4560,32 +4615,37 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.5.11" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -4595,14 +4655,27 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.18", ] [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4636,7 +4709,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -4686,13 +4759,13 @@ dependencies = [ [[package]] name = "tree_magic_mini" -version = "3.0.3" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91adfd0607cacf6e4babdb870e9bec4037c1c4b151cfd279ccefc5e0c7feaa6d" +checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2" dependencies = [ - "bytecount", "fnv", - "lazy_static", + "home", + "memchr", "nom", "once_cell", "petgraph", @@ -4713,11 +4786,11 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.0.0", + "http 1.1.0", "httparse", "log", "rand", - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "sha1", "thiserror", @@ -4737,7 +4810,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset", "tempfile", "winapi", ] @@ -4778,17 +4851,34 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-properties" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" + [[package]] name = "unicode-segmentation" version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +[[package]] +name = "unicode-truncate" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" +dependencies = [ + "itertools 0.13.0", + "unicode-segmentation", + "unicode-width", +] + [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode_categories" @@ -4814,9 +4904,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4838,15 +4928,15 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "serde", @@ -4866,21 +4956,15 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.1.1" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4901,36 +4985,43 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4938,32 +5029,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.31", + "rustix", "scoped-tls", "smallvec", "wayland-sys", @@ -4971,12 +5062,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" dependencies = [ - "bitflags 2.4.2", - "rustix 0.38.31", + "bitflags 2.6.0", + "rustix", "wayland-backend", "wayland-scanner", ] @@ -4987,7 +5078,7 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -4999,7 +5090,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -5008,20 +5099,20 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ "proc-macro2", - "quick-xml 0.31.0", + "quick-xml 0.34.0", "quote", ] [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" dependencies = [ "dlib", "log", @@ -5030,9 +5121,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -5050,25 +5141,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.31", -] - [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.4.1", + "wasite", "web-sys", ] @@ -5090,11 +5170,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -5105,21 +5185,22 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", + "windows-core 0.52.0", + "windows-targets 0.52.6", ] [[package]] -name = "windows-core" -version = "0.51.1" +name = "windows" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-targets 0.48.5", + "windows-core 0.56.0", + "windows-targets 0.52.6", ] [[package]] @@ -5128,7 +5209,50 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -5146,7 +5270,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -5166,17 +5299,27 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-version" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -5187,9 +5330,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5199,9 +5342,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -5211,9 +5354,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -5223,9 +5372,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5235,9 +5384,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5247,9 +5396,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5259,9 +5408,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -5272,16 +5421,25 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + [[package]] name = "wl-clipboard-rs" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57af79e973eadf08627115c73847392e6b766856ab8e3844a59245354b23d2fa" +checksum = "12b41773911497b18ca8553c3daaf8ec9fe9819caf93d451d3055f69de028adb" dependencies = [ "derive-new", "libc", "log", - "nix 0.26.4", + "nix 0.28.0", "os_pipe", "tempfile", "thiserror", @@ -5294,20 +5452,20 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "gethostname", - "rustix 0.38.31", + "rustix", "x11rb-protocol", ] [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "x25519-dalek" @@ -5328,18 +5486,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.13", - "rustix 0.38.31", + "linux-raw-sys", + "rustix", ] [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -5359,18 +5517,18 @@ checksum = "672423d4fea7ffa2f6c25ba60031ea13dc6258070556f125cc4d790007d4a155" [[package]] name = "xshell" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2107fe03e558353b4c71ad7626d58ed82efaf56c54134228608893c77023ad" +checksum = "6db0ab86eae739efd1b054a8d3d16041914030ac4e01cd1dca0cf252fd8b6437" dependencies = [ "xshell-macros", ] [[package]] name = "xshell-macros" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e" +checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852" [[package]] name = "xtask" @@ -5385,41 +5543,29 @@ dependencies = [ "xshell", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "zbus" -version = "3.15.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener 5.3.1", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.4", - "once_cell", + "nix 0.29.0", "ordered-stream", "rand", "serde", @@ -5428,7 +5574,7 @@ dependencies = [ "static_assertions", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -5437,23 +5583,22 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.15.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.76", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -5462,29 +5607,30 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -5497,28 +5643,32 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "zkcredential" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ + "cfg-if", "curve25519-dalek", "derive-where", "displaydoc", "lazy_static", "partial-default", "poksho", + "rayon", "serde", + "sha2", "subtle", + "thiserror", ] [[package]] name = "zkgroup" version = "0.9.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "aes-gcm-siv", "bincode", @@ -5530,25 +5680,28 @@ dependencies = [ "hkdf", "lazy_static", "libsignal-core", + "num_enum", "partial-default", "poksho", + "rand", + "rayon", "serde", "sha2", "signal-crypto", "subtle", + "thiserror", "uuid", "zkcredential", ] [[package]] name = "zvariant" -version = "3.15.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "zvariant_derive", @@ -5556,24 +5709,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.76", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.76", ] diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index 7bcc99d98063d..ae7001fe7bf97 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -5,17 +5,19 @@ , fetchFromGitHub , Cocoa , pkgsBuildHost +, openssl +, pkg-config }: rustPlatform.buildRustPackage rec { pname = "gurk-rs"; - version = "0.4.3"; + version = "0.5.1"; src = fetchFromGitHub { owner = "boxdot"; repo = pname; rev = "v${version}"; - hash = "sha256-MPYqWgwh5PKH3GsCDx6aa4ryorWZ96YK8KOYZ5PILkk="; + hash = "sha256-g0V6FPkCpIEWx+/kDG9+0NtlCVj6jc1gbkkzOSl/lAo="; }; postPatch = '' @@ -25,22 +27,27 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "libsignal-protocol-0.1.0" = "sha256-p4YzrtJaQhuMBTtquvS1m9llszfyTeDfl7+IXzRUFSE="; - "libsignal-service-0.1.0" = "sha256-p0umCPtBg9s4G6RHcwK/tU+RtQE2fFLRHOYt2GmBCtQ="; - "curve25519-dalek-4.1.1" = "sha256-p9Vx0lAaYILypsI4/RVsHZLOqZKaa4Wvf7DanLA38pc="; - "presage-0.6.1" = "sha256-MsVSUI4ht+ftO2UC1IIeCtomkzg4ug95kKsc41PDVNg="; + "libsignal-protocol-0.1.0" = "sha256-4aHINlpVAqVTtm7npwXQRutZUmIxYgkhXhApg7jSM4M="; + "libsignal-service-0.1.0" = "sha256-AOGw76A9R2qH3hc7B+MBE3okzW8b5LTZdepzUDOv9lM="; + "curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A="; + "presage-0.6.2" = "sha256-t9t8ecPtefI/jYlk+Ul8WdgH26VJIkfMptbKxprekS0="; "qr2term-0.3.1" = "sha256-U8YLouVZTtDwsvzZiO6YB4Pe75RXGkZXOxHCQcCOyT8="; }; }; - nativeBuildInputs = [ protobuf ]; + nativeBuildInputs = [ protobuf pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; - NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ]; + NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-framework" "AppKit" ]; PROTOC = "${pkgsBuildHost.protobuf}/bin/protoc"; + OPENSSL_NO_VENDOR = true; + + useNextest = true; + meta = with lib; { description = "Signal Messenger client for terminal"; mainProgram = "gurk"; diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix index 05841080b1dd8..f0e9a267e950b 100644 --- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -1,29 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchYarnDeps -, yarn -, fixup-yarn-lock -, nodejs +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarn, + fixup-yarn-lock, + nodejs, + olm, }: stdenv.mkDerivation (finalAttrs: { pname = "hydrogen-web"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "vector-im"; + owner = "element-hq"; repo = "hydrogen-web"; rev = "v${finalAttrs.version}"; - hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0="; + hash = "sha256-pXrmWPp4/MYIS1FHEGzAxGbh4OnTaiPudg+NauvA6Vc="; }; offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-N9lUAhfYLlEAIaWSNS3Ecq+aBTz+f7Z22Sclwj9rp6w="; + hash = "sha256-j+BwlmL0ncaccy9qQbzb9GpDRC4KB9MwOR2ISx+vbLE="; }; - nativeBuildInputs = [ yarn fixup-yarn-lock nodejs ]; + nativeBuildInputs = [ + yarn + fixup-yarn-lock + nodejs + ]; configurePhase = '' runHook preConfigure @@ -57,9 +63,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lightweight matrix client with legacy and mobile browser support"; - homepage = "https://github.com/vector-im/hydrogen-web"; + homepage = "https://github.com/element-hq/hydrogen-web"; maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; + inherit (olm.meta) knownVulnerabilities; }; }) diff --git a/pkgs/applications/networking/instant-messengers/iamb/default.nix b/pkgs/applications/networking/instant-messengers/iamb/default.nix index 655a20c12ac68..02a632a9f4b1f 100644 --- a/pkgs/applications/networking/instant-messengers/iamb/default.nix +++ b/pkgs/applications/networking/instant-messengers/iamb/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-a5y8nNFixOxJPNDOzvFFRqVrY2jsirCud2ZJJ8OvRhQ="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index e457d7bdbc357..d4876e20370d1 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,15 +4,15 @@ with ocamlPackages; buildDunePackage rec { pname = "jackline"; - version = "unstable-2023-03-09"; + version = "unstable-2024-02-28"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "a7acd19bd8141b842ac69b05146d9a63e729230d"; - hash = "sha256-AhiFfZkDit9tnGenETc3A1hHqWN+csiS2bVjsGNaHf8="; + rev = "31b90275a5f848cfc8c4f5b75e7d1933bec37852"; + hash = "sha256-G2jjsc/i9Qgo0TP+ZE4gB/1cjuZ9l8R7e59K2DGD5GY="; }; nativeBuildInpts = [ diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 313d45a98239f..a3df5958beb63 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { "--disable-resample" "--disable-libwebrtc" "--with-gnutls=yes" - ] ++ lib.optionals stdenv.isLinux [ "--enable-epoll" ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-epoll" ]; buildInputs = old.buildInputs ++ [ gnutls ]; }); diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 7d0044c7124c5..619759df2f008 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -19,36 +19,36 @@ let in buildNpmPackage rec { pname = "jitsi-meet-electron"; - version = "2024.3.0"; + version = "2024.6.0"; src = fetchFromGitHub { owner = "jitsi"; repo = "jitsi-meet-electron"; rev = "v${version}"; - hash = "sha256-BGN+t9Caw5n/NN1E5Oi/ruMLjoVh0jUlpzYR6vodHbw="; + hash = "sha256-jnt+aHkCnIj4GGFbAk6AlVhg0rvzFhGCELAaYMCZx88="; }; nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; # robotjs node-gyp dependencies - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpng libX11 libXi libXtst zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreFoundation ApplicationServices OpenGL ]; - npmDepsHash = "sha256-KanG8y+tYzswCCXjSkOlk+p9XKaouP2Z7IhsD5bDtRk="; + npmDepsHash = "sha256-zmnxNJdalspZib1PGZN0YBIauJ+gaxs6Iir94cPRNtU="; makeCacheWritable = true; @@ -84,7 +84,7 @@ buildNpmPackage rec { installPhase = '' runHook preInstall - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/jitsi-meet-electron cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/jitsi-meet-electron @@ -97,7 +97,7 @@ buildNpmPackage rec { install -Dm644 resources/icons/512x512.png $out/share/icons/hicolor/512x512/apps/jitsi-meet-electron.png ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r dist/mac*/"Jitsi Meet.app" $out/Applications makeWrapper "$out/Applications/Jitsi Meet.app/Contents/MacOS/Jitsi Meet" $out/bin/jitsi-meet-electron diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 6d39ab785cfa8..856aa55f132da 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ cacert setuptools - matrix-nio + (matrix-nio.override { withOlm = true; }) python-magic markdown pillow @@ -51,7 +51,7 @@ buildPythonApplication rec { pyxdg python-olm emoji - ] ++ matrix-nio.optional-dependencies.e2e; + ]; meta = with lib; { description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 8390d77934585..41c27ed7c19ca 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -8,17 +8,17 @@ let pname = "mattermost-desktop"; - version = "5.8.1"; + version = "5.9.0"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-VuYHF5ALdbsKxBI7w5UhcqKYLV8BHZncWSDeuCy/SW0="; + hash = "sha256-zLKdfu5p7TyJOw8vJX7i/uu4j0PrUf2/BDmb1kdqqMc="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-b+sVzMX/NDavshR+WsQyVgYyLkIPSuUlZGqK6/ZjLFs="; + hash = "sha256-JljK7d4KLAn1+NwF+VcedL/7hEsp/9LzLdzROa1fgJA="; }; }; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix deleted file mode 100644 index 3938d03447f83..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ /dev/null @@ -1,159 +0,0 @@ -{ lib -, stdenv -, fetchurl -, bundlerEnv -, alsa-utils -, atk -, copyDesktopItems -, gobject-introspection -, gtk2 -, ruby -, libicns -, libnotify -, makeDesktopItem -, which -, wrapGAppsHook3 -, writeText -}: - -let - # NOTE: $out may have different values depending on context - mikutterPaths = rec { - optPrefixDir = "$out/opt/mikutter"; - appPrefixDir = "$out/Applications/mikutter.app/Contents"; - appBinDir = "${appPrefixDir}/MacOS"; - appResourceDir = "${appPrefixDir}/Resources"; - iconPath = "${optPrefixDir}/core/skin/data/icon.png"; - }; - - gems = bundlerEnv { - name = "mikutter-gems"; # leave the version out to enable package reuse - gemdir = ./deps; - groups = [ "default" "plugin" ]; - inherit ruby; - - # Avoid the following error: - # > `<module:Moneta>': uninitialized constant Moneta::Builder (NameError) - # - # Related: - # https://github.com/NixOS/nixpkgs/pull/76510 - # https://github.com/NixOS/nixpkgs/pull/76765 - # https://github.com/NixOS/nixpkgs/issues/83442 - # https://github.com/NixOS/nixpkgs/issues/106545 - copyGemFiles = true; - }; - - mkDesktopItem = { description }: - makeDesktopItem { - name = "mikutter"; - desktopName = "mikutter"; - exec = "mikutter"; - icon = "mikutter"; - categories = [ "Network" ]; - comment = description; - keywords = [ "Mastodon" ]; - }; - - mkInfoPlist = { version }: - writeText "Info.plist" (lib.generators.toPlist { } { - CFBundleName = "mikutter"; - CFBundleDisplayName = "mikutter"; - CFBundleExecutable = "mikutter"; - CFBundleIconFile = "mikutter"; - CFBundleIdentifier = "net.hachune.mikutter"; - CFBundleInfoDictionaryVersion = "6.0"; - CFBundlePackageType = "APPL"; - CFBundleVersion = version; - CFBundleShortVersionString = version; - }); - - inherit (gems) wrappedRuby; -in -with mikutterPaths; stdenv.mkDerivation rec { - pname = "mikutter"; - version = "4.1.4"; - - src = fetchurl { - url = "https://mikutter.hachune.net/bin/mikutter-${version}.tar.gz"; - sha256 = "05253nz4i1lmnq6czj48qdab2ny4vx2mznj6nsn2l1m2z6zqkwk3"; - }; - - nativeBuildInputs = [ copyDesktopItems wrapGAppsHook3 gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ libicns ]; - buildInputs = [ - atk - gtk2 - libnotify - which # some plugins use it at runtime - wrappedRuby - ] ++ lib.optionals stdenv.isLinux [ alsa-utils ]; - - scriptPath = lib.makeBinPath ( - [ wrappedRuby libnotify which ] - ++ lib.optionals stdenv.isLinux [ alsa-utils ] - ); - - postUnpack = '' - rm -rf vendor - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin ${optPrefixDir} - - install -Dm644 README $out/share/doc/mikutter/README - install -Dm644 LICENSE $out/share/doc/mikutter/LICENSE - rm -r README LICENSE deployment - - cp -r . ${optPrefixDir} - - gappsWrapperArgsHook # FIXME: currently runs at preFixup - wrapGApp ${optPrefixDir}/mikutter.rb \ - --prefix PATH : "${scriptPath}" \ - --set DISABLE_BUNDLER_SETUP 1 - mv ${optPrefixDir}/mikutter.rb $out/bin/mikutter - - install -Dm644 ${iconPath} $out/share/icons/hicolor/256x256/apps/mikutter.png - - runHook postInstall - ''; - - postInstall = - let - infoPlist = mkInfoPlist { inherit version; }; - in - lib.optionalString stdenv.isDarwin '' - mkdir -p ${appBinDir} ${appResourceDir} - install -Dm644 ${infoPlist} ${appPrefixDir}/Info.plist - ln -s $out/bin/mikutter ${appBinDir}/mikutter - png2icns ${appResourceDir}/mikutter.icns ${iconPath} - ''; - - installCheckPhase = '' - runHook preInstallCheck - - testDir="$(mktemp -d)" - install -Dm644 ${./test_plugin.rb} "$testDir/plugin/test_plugin/test_plugin.rb" - - $out/bin/mikutter --confroot="$testDir" --plugin=test_plugin --debug - - runHook postInstallCheck - ''; - - desktopItems = [ - (mkDesktopItem { inherit (meta) description; }) - ]; - - doInstallCheck = true; - dontWrapGApps = true; # the target is placed outside of bin/ - - passthru.updateScript = [ ./update.sh version (toString ./.) ]; - - meta = with lib; { - description = "An extensible Mastodon client"; - homepage = "https://mikutter.hachune.net"; - platforms = ruby.meta.platforms; - license = licenses.mit; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile deleted file mode 100644 index fbe6a2f29c5da..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile +++ /dev/null @@ -1,39 +0,0 @@ -alias __source_distinct__ source -def source(url) - @loaded ||= {} - unless @loaded[url] - @loaded[url] = true - __source_distinct__(url) end end - -source 'https://rubygems.org' - -ruby '>= 2.5.0' - -group :default do - gem 'addressable','>= 2.7.0', '< 2.8' - gem 'delayer','>= 1.1.2', '< 2.0' - gem 'delayer-deferred','>= 2.2.0', '< 3.0' - gem 'diva','>= 1.0.2', '< 2.0' - gem 'memoist','>= 0.16.2', '< 0.17' - gem 'oauth','>= 0.5.4' - gem 'pluggaloid','>= 1.5.0', '< 2.0' - gem 'typed-array','>= 0.1.2', '< 0.2' -end - -group :test do - gem 'test-unit','>= 3.3.4', '< 4.0' - gem 'rake','>= 13.0.1' - gem 'mocha','>= 1.11.1' - gem 'webmock','>= 3.7.6' - gem 'ruby-prof','>= 1.1.0' -end - - -group :plugin do - Dir.glob(File.expand_path(File.join(__dir__, 'plugin/*/Gemfile'))){ |path| - eval File.open(path).read - } - Dir.glob(File.join(File.expand_path(ENV['MIKUTTER_CONFROOT'] || '~/.mikutter'), 'plugin/*/Gemfile')){ |path| - eval File.open(path).read - } -end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock deleted file mode 100644 index 92568056d52a4..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock +++ /dev/null @@ -1,101 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - atk (3.4.1) - glib2 (= 3.4.1) - cairo (1.17.5) - native-package-installer (>= 1.0.3) - pkg-config (>= 1.2.2) - red-colors - cairo-gobject (3.4.1) - cairo (>= 1.16.2) - glib2 (= 3.4.1) - crack (0.4.5) - rexml - delayer (1.2.0) - delayer-deferred (2.2.0) - delayer (>= 1.1.2, < 2.0) - diva (1.0.2) - addressable (>= 2.5.2, < 2.8) - gdk_pixbuf2 (3.4.1) - gio2 (= 3.4.1) - gettext (3.3.7) - locale (>= 2.0.5) - text (>= 1.3.0) - gio2 (3.4.1) - gobject-introspection (= 3.4.1) - glib2 (3.4.1) - native-package-installer (>= 1.0.3) - pkg-config (>= 1.3.5) - gobject-introspection (3.4.1) - glib2 (= 3.4.1) - gtk2 (3.4.1) - atk (= 3.4.1) - gdk_pixbuf2 (= 3.4.1) - pango (= 3.4.1) - hashdiff (1.0.1) - httpclient (2.8.3) - instance_storage (1.0.0) - locale (2.1.3) - memoist (0.16.2) - mini_portile2 (2.5.0) - mocha (1.12.0) - moneta (1.4.1) - native-package-installer (1.1.1) - nokogiri (1.11.3) - mini_portile2 (~> 2.5.0) - racc (~> 1.4) - oauth (0.5.6) - pango (3.4.1) - cairo-gobject (= 3.4.1) - gobject-introspection (= 3.4.1) - pkg-config (1.4.6) - pluggaloid (1.5.0) - delayer (>= 1.1.0, < 2.0) - instance_storage (>= 1.0.0, < 2.0.0) - power_assert (2.0.0) - public_suffix (4.0.6) - racc (1.5.2) - rake (13.0.3) - red-colors (0.1.1) - rexml (3.2.5) - ruby-prof (1.4.3) - test-unit (3.4.0) - power_assert - text (1.3.1) - typed-array (0.1.2) - webmock (3.12.2) - addressable (>= 2.3.6) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - -PLATFORMS - ruby - -DEPENDENCIES - addressable (>= 2.7.0, < 2.8) - delayer (>= 1.1.2, < 2.0) - delayer-deferred (>= 2.2.0, < 3.0) - diva (>= 1.0.2, < 2.0) - gettext (>= 3.3.5, < 3.4) - gtk2 (= 3.4.1) - httpclient - memoist (>= 0.16.2, < 0.17) - mocha (>= 1.11.1) - moneta - nokogiri - oauth (>= 0.5.4) - pluggaloid (>= 1.5.0, < 2.0) - rake (>= 13.0.1) - ruby-prof (>= 1.1.0) - test-unit (>= 3.3.4, < 4.0) - typed-array (>= 0.1.2, < 0.2) - webmock (>= 3.7.6) - -RUBY VERSION - ruby 2.6.6p146 - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix deleted file mode 100644 index b45a36c6fec09..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix +++ /dev/null @@ -1,410 +0,0 @@ -{ - addressable = { - dependencies = ["public_suffix"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; - type = "gem"; - }; - version = "2.7.0"; - }; - atk = { - dependencies = ["glib2"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a8q9a1f6x4gy55p8cf52a22bnpjgn18ad9n959x0f4gybbhs948"; - type = "gem"; - }; - version = "3.4.1"; - }; - cairo = { - dependencies = ["native-package-installer" "pkg-config" "red-colors"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vbj9szp2xbnxqan8hppip8vm9fxpcmpx745y5fvg2scdh9f0p7s"; - type = "gem"; - }; - version = "1.17.5"; - }; - cairo-gobject = { - dependencies = ["cairo" "glib2"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gkxdfslcvrwrs48giilji3bgxd5bwijwq33p9h00r10jzfg2028"; - type = "gem"; - }; - version = "3.4.1"; - }; - crack = { - dependencies = ["rexml"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cr1kfpw3vkhysvkk3wg7c54m75kd68mbm9rs5azdjdq57xid13r"; - type = "gem"; - }; - version = "0.4.5"; - }; - delayer = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0iqf4i18i8rk3x7qgvkhbiqskf0xzdf733fjimrq6xkag2mq60bl"; - type = "gem"; - }; - version = "1.2.0"; - }; - delayer-deferred = { - dependencies = ["delayer"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i2das3ncssacpqdgaf4as77vrxm7jfiizaja884fqv4rzv6s2sv"; - type = "gem"; - }; - version = "2.2.0"; - }; - diva = { - dependencies = ["addressable"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05wl4wg57vvng4nrp4lzjq148v908xzq092kq93phwvyxs7jnw2g"; - type = "gem"; - }; - version = "1.0.2"; - }; - gdk_pixbuf2 = { - dependencies = ["gio2"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0194gzn0kialfh0j7crllvp808r64sg6dh297x69b0av21ar5pam"; - type = "gem"; - }; - version = "3.4.1"; - }; - gettext = { - dependencies = ["locale" "text"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fqlwq7i8ck1fjyhn19q3skvgrbz44q7gq51mlr0qym5rkj5f6rn"; - type = "gem"; - }; - version = "3.3.7"; - }; - gio2 = { - dependencies = ["gobject-introspection"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1l3jpgbdvb55xhcmpkcqgwx5068dfyi8kijfvzhbqh96ng0p1m7g"; - type = "gem"; - }; - version = "3.4.1"; - }; - glib2 = { - dependencies = ["native-package-installer" "pkg-config"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18clyn0fp0h5alnkf9i2bqd6wvl78h468pdbzs1csqnba8vw4q1c"; - type = "gem"; - }; - version = "3.4.1"; - }; - gobject-introspection = { - dependencies = ["glib2"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1a3x8qiisbax3x0izj8l5w66r53ba5ma53ax2jhdbhbvaxx3d02n"; - type = "gem"; - }; - version = "3.4.1"; - }; - gtk2 = { - dependencies = ["atk" "gdk_pixbuf2" "pango"]; - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17az8g0n1yzz90kdbjg2hpabi04qccda7v6lin76bs637ivfg2md"; - type = "gem"; - }; - version = "3.4.1"; - }; - hashdiff = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c"; - type = "gem"; - }; - version = "1.0.1"; - }; - httpclient = { - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; - type = "gem"; - }; - version = "2.8.3"; - }; - instance_storage = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08nf5fhq9dckq9lmaklxydq0hrlfi7phk66gr3bggxg45zd687pl"; - type = "gem"; - }; - version = "1.0.0"; - }; - locale = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn"; - type = "gem"; - }; - version = "2.1.3"; - }; - memoist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; - type = "gem"; - }; - version = "0.16.2"; - }; - mini_portile2 = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; - type = "gem"; - }; - version = "2.5.0"; - }; - mocha = { - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a"; - type = "gem"; - }; - version = "1.12.0"; - }; - moneta = { - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0z25b4yysvnf2hi9jxnsiv3fvnicnzr2m70ci231av5093jfknc6"; - type = "gem"; - }; - version = "1.4.1"; - }; - native-package-installer = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ww1mq41q7rda975byjmq5dk8k13v8dawvm33370pbkrymd8syp8"; - type = "gem"; - }; - version = "1.1.1"; - }; - nokogiri = { - dependencies = ["mini_portile2" "racc"]; - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0"; - type = "gem"; - }; - version = "1.11.3"; - }; - oauth = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0"; - type = "gem"; - }; - version = "0.5.6"; - }; - pango = { - dependencies = ["cairo-gobject" "gobject-introspection"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d0cn50qgpifrcv8qx72wi6l9xalw3ryngbfmm9xpg9vx5rl1qbp"; - type = "gem"; - }; - version = "3.4.1"; - }; - pkg-config = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mjjy1grxr64znkffxsvprcckbrrnm40b6gbllnbm7jxslbr3gjl"; - type = "gem"; - }; - version = "1.4.6"; - }; - pluggaloid = { - dependencies = ["delayer" "instance_storage"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m3f940lf1bg01jin22by7hg9hs43y995isgcyqb6vbvlv51zj11"; - type = "gem"; - }; - version = "1.5.0"; - }; - power_assert = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "172qfmzwxdf82bmwgcb13hnz9i3p6i2s2nijxnx6r63kn3drjppr"; - type = "gem"; - }; - version = "2.0.0"; - }; - public_suffix = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; - type = "gem"; - }; - version = "4.0.6"; - }; - racc = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; - type = "gem"; - }; - version = "1.5.2"; - }; - rake = { - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; - type = "gem"; - }; - version = "13.0.3"; - }; - red-colors = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ar2k7zvhr1215jx5di29hkg5h1798f1gypmq6v0sy9v35w6ijca"; - type = "gem"; - }; - version = "0.1.1"; - }; - rexml = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; - type = "gem"; - }; - version = "3.2.5"; - }; - ruby-prof = { - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r3xalp91l07m0cwllcxjzg6nkviiqnxkcbgg5qnzsdji6rgy65m"; - type = "gem"; - }; - version = "1.4.3"; - }; - test-unit = { - dependencies = ["power_assert"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h0c323zfn4hdida4g58h8wnlh4kax438gyxlw20dd78kcp01i8m"; - type = "gem"; - }; - version = "3.4.0"; - }; - text = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; - type = "gem"; - }; - version = "1.3.1"; - }; - typed-array = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qlv2rnkin9rwkgjx3k5qvc17m0m7jf5cdirw3wxbjnw5kga27w9"; - type = "gem"; - }; - version = "0.1.2"; - }; - webmock = { - dependencies = ["addressable" "crack" "hashdiff"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "038igpmkpmn0nw0k7s4db8x88af1nwcy7wzh9m9c9q4p74h7rii0"; - type = "gem"; - }; - version = "3.12.2"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile deleted file mode 100644 index 3306c29e3cbff..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'gtk2', '3.4.1' - diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile deleted file mode 100644 index f86005fef078e..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile +++ /dev/null @@ -1 +0,0 @@ -gem 'moneta' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile deleted file mode 100644 index 66016eee9c466..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'nokogiri' -gem 'httpclient' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile deleted file mode 100644 index 08b4831dfc66c..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source 'https://rubygems.org' - -group :default do - gem 'gettext', '>= 3.3.5', '< 3.4' -end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb b/pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb deleted file mode 100644 index b19c15cd304fb..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Tests mikutter's event system. - -Plugin.create(:test_plugin) do - require 'logger' - Delayer.new do - log = Logger.new(STDOUT) - log.info("loaded test_plugin") - exit - end -end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/update.sh b/pkgs/applications/networking/instant-messengers/mikutter/update.sh deleted file mode 100755 index 142fd8ca9424d..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/update.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p bundler bundix curl jq common-updater-scripts -# shellcheck shell=bash - -set -euo pipefail - -main() { - local currentVer="$1" - local scriptDir="$2" - local latestVer - local srcDir - - if [[ -z "$UPDATE_NIX_ATTR_PATH" ]]; then - echo "[ERROR] Please run the following instead:" >&2 - echo >&2 - echo " % nix-shell maintainers/scripts/update.nix --argstr path mikutter" >&2 - exit 1 - fi - - latestVer="$(queryLatestVersion)" - if [[ "$currentVer" == "$latestVer" ]]; then - echo "[INFO] mikutter is already up to date" >&2 - exit - fi - - update-source-version "$UPDATE_NIX_ATTR_PATH" "$latestVer" - - cd "$scriptDir" - - rm -rf deps - mkdir deps - cd deps - - srcDir="$(nix-build ../../../../../.. --no-out-link -A mikutter.src)" - tar xvf "$srcDir" --strip-components=1 - find . -not -name Gemfile -exec rm {} \; - find . -type d -exec rmdir -p --ignore-fail-on-non-empty {} \; || true - - bundle lock - bundix -} - -queryLatestVersion() { - curl -sS 'https://mikutter.hachune.net/download.json?count=1' \ - | jq -r '.[].version_string' \ - | head -n1 -} - -main "$@" - -# vim:set ft=bash: diff --git a/pkgs/applications/networking/instant-messengers/nchat/default.nix b/pkgs/applications/networking/instant-messengers/nchat/default.nix deleted file mode 100644 index 0e3c7f6803fb7..0000000000000 --- a/pkgs/applications/networking/instant-messengers/nchat/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gperf -, file, ncurses, openssl, readline, sqlite, zlib -, AppKit, Cocoa, Foundation -}: - -stdenv.mkDerivation rec { - pname = "nchat"; - version = "3.67"; - - src = fetchFromGitHub { - owner = "d99kris"; - repo = "nchat"; - rev = "v${version}"; - hash = "sha256-PhvZejtSoDptzoMP5uIe6T0Ws/bQQXVuYH9uoZo3JsI="; - }; - - postPatch = '' - substituteInPlace lib/tgchat/ext/td/CMakeLists.txt \ - --replace "get_git_head_revision" "#get_git_head_revision" - ''; - - nativeBuildInputs = [ cmake gperf ]; - - buildInputs = [ - file # for libmagic - ncurses - openssl - readline - sqlite - zlib - ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Foundation ]; - - cmakeFlags = [ - "-DHAS_WHATSAPP=OFF" # go module build required - ]; - - meta = with lib; { - description = "Terminal-based chat client with support for Telegram and WhatsApp"; - mainProgram = "nchat"; - homepage = "https://github.com/d99kris/nchat"; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix deleted file mode 100644 index 5dc09ae1f3eec..0000000000000 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, perl, perlPackages, coreutils, -fetchFromGitHub, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "oysttyer"; - version = "2.10.0"; - - src = fetchFromGitHub { - owner = "oysttyer"; - repo = "oysttyer"; - rev = version; - sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - perl - ]; - - propagatedBuildInputs = with perlPackages; [ - DateTimeFormatDateParse - TermReadLineTTYtter - TermReadKey - ]; - - installPhase = '' - ${coreutils}/bin/install -Dm755 \ - oysttyer.pl \ - $out/bin/oysttyer - - wrapProgram $out/bin/oysttyer \ - --prefix PERL5LIB : $PERL5LIB - ''; - - meta = with lib; { - description = "Perl Console Twitter Client"; - homepage = "http://oysttyer.github.io/"; - maintainers = with maintainers; [ woffs ]; - license = with licenses; [ ffsl ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index f5118bb968634..8a6391892ae40 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -5,6 +5,7 @@ , installShellFiles , nixosTests , enableDbusUi ? true +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -39,11 +40,10 @@ python3Packages.buildPythonApplication rec { janus keyring logbook - matrix-nio + (matrix-nio.override { withOlm = true; }) peewee prompt-toolkit ] - ++ matrix-nio.optional-dependencies.e2e ++ lib.optionals enableDbusUi optional-dependencies.ui; optional-dependencies.ui = with python3Packages; [ @@ -61,8 +61,17 @@ python3Packages.buildPythonApplication rec { ] ++ lib.flatten (lib.attrValues optional-dependencies); + nativeBuildInputs = lib.optionals enableDbusUi [ + wrapGAppsHook3 + ]; + + dontWrapGApps = enableDbusUi; + makeWrapperArgs = lib.optionals enableDbusUi [ + "\${gappsWrapperArgs[@]}" + ]; + # darwin has difficulty communicating with server, fails some integration tests - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = '' installManPage docs/man/*.[1-9] diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 9300a73b175db..c2c8f98251b66 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -79,14 +79,14 @@ let ] ++ lib.optional withOpenssl openssl ++ lib.optionals withGnutls [ gnutls libgcrypt ] - ++ lib.optionals stdenv.isLinux [ gtk2 gtkspell2 farstream ] - ++ lib.optional stdenv.isDarwin gtk2-x11; + ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 gtkspell2 farstream ] + ++ lib.optional stdenv.hostPlatform.isDarwin gtk2-x11; propagatedBuildInputs = [ pkg-config gettext ] ++ (with perlPackages; [ perl XMLParser ]) - ++ lib.optional stdenv.isLinux gtk2 - ++ lib.optional stdenv.isDarwin gtk2-x11; + ++ lib.optional stdenv.hostPlatform.isLinux gtk2 + ++ lib.optional stdenv.hostPlatform.isDarwin gtk2-x11; patches = [ ./add-search-path.patch @@ -107,7 +107,7 @@ let ] ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ] ++ lib.optionals withGnutls [ "--enable-gnutls=yes" "--enable-nss=no" ] - ++ lib.optionals stdenv.isDarwin [ "--disable-gtkspell" "--disable-vv" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-gtkspell" "--disable-vv" ] ++ lib.optionals stdenv.cc.isClang [ "CFLAGS=-Wno-error=int-conversion" ]; enableParallelBuilding = true; @@ -121,7 +121,7 @@ let # In particular, this detects missing python imports in some of the tools. postFixup = let # TODO: python is a script, so it doesn't work as interpreter on darwin - binsToTest = lib.optionalString stdenv.isLinux "purple-remote," + "pidgin,finch"; + binsToTest = lib.optionalString stdenv.hostPlatform.isLinux "purple-remote," + "pidgin,finch"; in lib.optionalString doInstallCheck '' for f in "''${!outputBin}"/bin/{${binsToTest}}; do echo "Testing: $f --help" diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix index 1a1fd3b409a66..26c67b070e5e8 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DNoVoip=True" ]; # libtgvoip required - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "-U__ARM_NEON__" ]); + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "-U__ARM_NEON__" ]); meta = with lib; { homepage = "https://github.com/ars3niy/tdlib-purple"; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 09240ae4713b5..84b24dab2de79 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -53,10 +53,10 @@ mkDerivation rec { pcre qrencode sqlcipher - ] ++ lib.optionals stdenv.isDarwin [ AVFoundation ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation ]; nativeBuildInputs = [ cmake pkg-config qttools ] - ++ lib.optionals stdenv.isDarwin [ perl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ perl ]; cmakeFlags = [ "-DGIT_DESCRIBE=v${version}" @@ -67,7 +67,7 @@ mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Qt Tox client"; mainProgram = "qtox"; homepage = "https://tox.chat"; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 2a0bfce75631c..ef6bc08616c54 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications mv $out/bin/quaternion.app $out/Applications rmdir $out/bin || : diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 9310154d04448..995284672bb85 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.3.4"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - hash = "sha256-YaLvqd0yr0wlsvjtoN/9GXoZIpjH26DInhWC0Vg62Rs="; + hash = "sha256-pm4Ji1gv5vNMgB9ZWNKMLZSUE9wBklQ/MnFOKHP+Rcc="; }; desktopItem = (makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 72d60f5700c9a..95ab2c39b21dd 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "4.0.1"; + version = "4.1.1"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-GWU2qGeQB8bou0+Ja6Cs4bQM1stAL+dlKC3QNTA0EIY="; + hash = "sha256-6NvQtc+IUWqixFwWUHvl+SkSl0pk3SK4VmQXoZYyqqg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 11336d70eff7a..7eafae046a5e0 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -9,12 +9,12 @@ }: let - version = "1.12.5"; + version = "1.13.2"; pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - hash = "sha256-5lE2jab9AK40j2rKYE8zFJr3a+drwCKnVmIZoihhJv8="; + hash = "sha256-71v6CvlKa4m1LPG07eGhPqkpK60X4VrafCQyfjQR3rs="; }; appimage = appimageTools.wrapType2 { inherit version pname src; }; appimage-contents = appimageTools.extractType2 { inherit version pname src; }; @@ -58,7 +58,10 @@ stdenvNoCC.mkDerivation { mainProgram = "session-desktop"; homepage = "https://getsession.org/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ alexnortung ]; + maintainers = with maintainers; [ + alexnortung + cyewashish + ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 0706ce657383e..b1c2c9cc100d8 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.13.5"; + version = "0.13.7"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - hash = "sha256-MWQz/+eusZpXUlpPemLf8Y2nOsh2lv0+Ilf/w+7na+k="; + hash = "sha256-KeSKupExFIaLKdkXJw+UTclNaiMfrIomCec6GUV0E7M="; }; - buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libmatthew_java dbus dbus_java ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin cp -r lib $out/lib cp bin/signal-cli $out/bin/signal-cli - '' + (if stdenv.isLinux then '' + '' + (if stdenv.hostPlatform.isLinux then '' makeWrapper ${openjdk21_headless}/bin/java $out/bin/signal-cli \ --set JAVA_HOME "${openjdk21_headless}" \ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat() # /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat() # /nix/store/in41dz8byyyz4c0w132l7mqi43liv4yr-stdenv-darwin/setup: line 1310: 2231 Abort trap: 6 signal-cli --version - doInstallCheck = stdenv.isLinux; + doInstallCheck = stdenv.hostPlatform.isLinux; installCheckPhase = '' export PATH=$PATH:$out/bin diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 2b60e2ae6b844..97abf0e749f66 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -8,8 +8,7 @@ , asar , rsync , python3 -, wrapGAppsHook3 -, makeWrapper +, buildPackages , nixosTests , gtk3 , atk @@ -127,7 +126,9 @@ stdenv.mkDerivation rec { asar python3 autoPatchelfHook - (wrapGAppsHook3.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ @@ -264,7 +265,6 @@ stdenv.mkDerivation rec { lib.licenses.free ]; maintainers = with lib.maintainers; [ - eclairevoyant mic92 equirosa urandom diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix index 72cde3388e828..8f3eabb7bc279 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.19.0"; + version = "7.23.0"; url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; - hash = "sha256-wyXVZUuY1TDGAVq7Gx9r/cuBuoMmSk9KQttTJlIN+k8="; + hash = "sha256-fQb2nYE1+q6DNcMF0z5NadGlffYaCFNgcu8IIGVUtf8="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index da88b7e02e722..f557734764cdc 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.23.0-beta.1"; + version = "7.25.0-beta.2"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-qVPvzz5dEzff9+qmy92X2VWOhcfYdeoOsV4hX/PcJ+k="; + hash = "sha256-7L+ldJYJXB9VkC12s8AyUdECVXnyN8PNo7AFIyEHcS8="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 74c5d82b052b6..91b35e95441d6 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.22.0"; + version = "7.26.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-om3hhGYgrBrcNt3tV9QHZOKuhN/ljaR6SG/6S51xqOo="; + hash = "sha256-A9gTphQ7FQm1iCutrDxAD2wazihn+4ZafJrqdZ8Nahk="; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 0b226e78d40b2..8cd6bed359fa8 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -1,27 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, openssl, sqlite }: +{ + lib, + stdenv, + fetchFromGitHub, + + cmake, + pkg-config, + + darwin, + dbus, + openssl, + sqlite, +}: stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240816"; + version = "20240929"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-8r3XpKqCR2ElfQnRuuBaDDIUwAASTTfGSihOounIVZQ="; + hash = "sha256-OXn/RMc2v099S8/atQTYz1YwSH0sD7o7ZImlrBmUlSE="; }; - postPatch = '' - patchShebangs BUILDSCRIPT_MULTIPROC.bash44 - ''; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + ]; - buildInputs = [ openssl sqlite ]; - - buildPhase = '' - runHook preBuild - ./BUILDSCRIPT_MULTIPROC.bash44${lib.optionalString stdenv.isDarwin " --config nixpkgs-darwin"} - runHook postBuild - ''; + buildInputs = [ + openssl + sqlite + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Security + ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 125691639586b..9359480b0efbe 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -207,6 +207,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 53f4338ac4d8c..6aa7e45ac117f 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,30 @@ -{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl -, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config -, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, perl, llvmPackages +{ + lib, + stdenv, + fetchurl, + fetchzip, + makeWrapper, + makeDesktopItem, + zlib, + glib, + libpng, + freetype, + openssl, + xorg, + fontconfig, + qtbase, + qtwebengine, + qtwebchannel, + qtsvg, + qtwebsockets, + xkeyboard_config, + alsa-lib, + libpulseaudio ? null, + libredirect, + quazip, + which, + perl, + llvmPackages, }: let @@ -9,12 +33,33 @@ let libDir = "lib64"; - deps = - [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl - xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama - xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg - qtwebsockets libpulseaudio quazip llvmPackages.libcxx - ]; + deps = [ + zlib + glib + libpng + freetype + xorg.libSM + xorg.libICE + xorg.libXrender + openssl + xorg.libXrandr + xorg.libXfixes + xorg.libXcursor + xorg.libXinerama + xorg.libxcb + fontconfig + xorg.libXext + xorg.libX11 + alsa-lib + qtbase + qtwebengine + qtwebchannel + qtsvg + qtwebsockets + libpulseaudio + quazip + llvmPackages.libcxx + ]; desktopItem = makeDesktopItem { name = "teamspeak"; @@ -38,15 +83,14 @@ stdenv.mkDerivation rec { }; # grab the plugin sdk for the desktop icon - pluginsdk = fetchurl { - url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.1.1.1.zip"; - sha256 = "1bywmdj54glzd0kffvr27r84n4dsd0pskkbmh59mllbxvj0qwy7f"; + pluginsdk = fetchzip { + url = "https://files.teamspeak-services.com/releases/sdk/3.3.1/ts_sdk_3.3.1.zip"; + hash = "sha256-wx4pBZHpFPoNvEe4xYE80KnXGVda9XcX35ho4R8QxrQ="; }; nativeBuildInputs = [ makeWrapper which - unzip perl # Installer script needs `shasum` ]; @@ -54,23 +98,21 @@ stdenv.mkDerivation rec { # ++ exec # + PAGER_PATH= # it's looking for a dependency and didn't find it. Check the script and make sure the dep is in nativeBuildInputs. - unpackPhase = - '' - echo -e '\ny' | PAGER=cat sh -xe $src - cd TeamSpeak* - ''; - - buildPhase = - '' - mv ts3client_linux_${arch} ts3client - echo "patching ts3client..." - patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip1-qt5.so ts3client - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ - --force-rpath \ - ts3client - ''; + unpackPhase = '' + echo -e '\ny' | PAGER=cat sh -xe $src + cd TeamSpeak* + ''; + + buildPhase = '' + mv ts3client_linux_${arch} ts3client + echo "patching ts3client..." + patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip1-qt5.so ts3client + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ + --force-rpath \ + ts3client + ''; installPhase = '' @@ -86,8 +128,7 @@ stdenv.mkDerivation rec { # Make a desktop item mkdir -p $out/share/applications/ $out/share/icons/hicolor/64x64/apps/ - unzip ${pluginsdk} - cp pluginsdk/docs/client_html/images/logo.png $out/share/icons/hicolor/64x64/apps/teamspeak.png + cp ${pluginsdk}/doc/_static/logo.png $out/share/icons/hicolor/64x64/apps/teamspeak.png cp ${desktopItem}/share/applications/* $out/share/applications/ # Make a symlink to the binary from bin. @@ -97,9 +138,10 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ts3client \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \ - '' /* wayland is currently broken, remove when TS3 fixes that */ + '' - --set QT_QPA_PLATFORM xcb \ - --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb + '' # wayland is currently broken, remove when TS3 fixes that + + '' + --set QT_QPA_PLATFORM xcb \ + --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb ''; dontStrip = true; @@ -110,47 +152,17 @@ stdenv.mkDerivation rec { homepage = "https://teamspeak.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = { + # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak. fullName = "Teamspeak client license"; url = "https://www.teamspeak.com/en/privacy-and-terms/"; free = false; }; - maintainers = with maintainers; [ lhvwb lukegb atemu ]; + maintainers = with maintainers; [ + lhvwb + lukegb + atemu + ]; mainProgram = "ts3client"; platforms = [ "x86_64-linux" ]; }; } - -/* -License issues: -Date: Mon, 10 Dec 2007 19:55:16 -0500 -From: TeamSpeak Sales <sales@tritoncia.com> -To: 'Marc Weber' <marco-oweber@gmx.de> -Subject: RE: teamspeak on nix? - -Yes, that would be fine. As long as you are not renting servers or selling -TeamSpeak then you are more than welcome to distribute it. - -Thank you, - -TeamSpeak Sales Team -________________________________ -e-Mail: sales@tritoncia.com -TeamSpeak: http://www.TeamSpeak.com -Account Login: https://sales.TritonCIA.com/users - - - ------Original Message----- -From: Marc Weber [mailto:marco-oweber@gmx.de] -Sent: Monday, December 10, 2007 5:03 PM -To: sales@tritoncia.com -Subject: teamspeak on nix? - -Hello, - -nix is very young software distribution system (http://nix.cs.uu.nl/) -I'd like to ask wether you permit us to add teamspeak (server/ client?) - -Sincerly -Marc Weber (small nix contributor) -*/ diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/distribution-permit.txt b/pkgs/applications/networking/instant-messengers/teamspeak/distribution-permit.txt new file mode 100644 index 0000000000000..e053d470b3163 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/teamspeak/distribution-permit.txt @@ -0,0 +1,32 @@ +License issues: +Date: Mon, 10 Dec 2007 19:55:16 -0500 +From: TeamSpeak Sales <sales@tritoncia.com> +To: 'Marc Weber' <marco-oweber@gmx.de> +Subject: RE: teamspeak on nix? + +Yes, that would be fine. As long as you are not renting servers or selling +TeamSpeak then you are more than welcome to distribute it. + +Thank you, + +TeamSpeak Sales Team +________________________________ +e-Mail: sales@tritoncia.com +TeamSpeak: http://www.TeamSpeak.com +Account Login: https://sales.TritonCIA.com/users + + + +-----Original Message----- +From: Marc Weber [mailto:marco-oweber@gmx.de] +Sent: Monday, December 10, 2007 5:03 PM +To: sales@tritoncia.com +Subject: teamspeak on nix? + +Hello, + +nix is very young software distribution system (http://nix.cs.uu.nl/) +I'd like to ask wether you permit us to add teamspeak (server/ client?) + +Sincerly +Marc Weber (small nix contributor) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 577589f6a40b0..d1be4c251fc70 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, postgresql, autoPatchelfHook, writeScript }: let - arch = if stdenv.is64bit then "amd64" else "x86"; + arch = if stdenv.hostPlatform.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; version = "3.13.7"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; - sha256 = if stdenv.is64bit + sha256 = if stdenv.hostPlatform.is64bit then "sha256-d1pXMamAmAHkyPkGbNm8ViobNoVTE5wSSfKgdA1QBB4=" else "sha256-aMEDOnvBeKfzG8lDFhU8I5DYgG53IsCDBMV2MUyJi2g="; }; @@ -59,43 +59,9 @@ in stdenv.mkDerivation rec { description = "TeamSpeak voice communication server"; homepage = "https://teamspeak.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak. license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ arobyn gerschtli ]; }; } - -/* -License issues: -Date: Mon, 10 Dec 2007 19:55:16 -0500 -From: TeamSpeak Sales <sales@tritoncia.com> -To: 'Marc Weber' <marco-oweber@gmx.de> -Subject: RE: teamspeak on nix? - -Yes, that would be fine. As long as you are not renting servers or selling -TeamSpeak then you are more than welcome to distribute it. - -Thank you, - -TeamSpeak Sales Team -________________________________ -e-Mail: sales@tritoncia.com -TeamSpeak: http://www.TeamSpeak.com -Account Login: https://sales.TritonCIA.com/users - - - ------Original Message----- -From: Marc Weber [mailto:marco-oweber@gmx.de] -Sent: Monday, December 10, 2007 5:03 PM -To: sales@tritoncia.com -Subject: teamspeak on nix? - -Hello, - -nix is very young software distribution system (http://nix.cs.uu.nl/) -I'd like to ask wether you permit us to add teamspeak (server/ client?) - -Sincerly -Marc Weber (small nix contributor) -*/ 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 4f382dc28e75a..434f08acdd2c3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -27,13 +27,10 @@ , tl-expected , hunspell , gobject-introspection -, glibmm_2_68 , jemalloc , rnnoise , microsoft-gsl , boost -, fmt -, wayland , libicns , darwin }: @@ -44,17 +41,17 @@ let inherit stdenv; }; - mainProgram = if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"; + mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; in stdenv.mkDerivation rec { pname = "kotatogram-desktop"; - version = "0-unstable-2024-07-01"; + version = "0-unstable-2024-09-27"; src = fetchFromGitHub { owner = "kotatogram"; repo = "kotatogram-desktop"; - rev = "fbb22ebd3e39dfa4a036fa79a7a3f78b86b1cea2"; - hash = "sha256-ccfmaqapk9ct+5kvBI02xHJ7YCGmm1CcqwM+3hC1bk0="; + rev = "0581eb6219343b3cfcbb81124b372df1039b7568"; + hash = "sha256-rvn8GZmHdMkVutLUe/LmUNIawlb9VgU3sYhPwZ2MWsI="; fetchSubmodules = true; }; @@ -63,20 +60,20 @@ stdenv.mkDerivation rec { ./macos-opengl.patch ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster ''; # Wrapping the inside of the app bundles, avoiding double-wrapping - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ pkg-config @@ -85,11 +82,11 @@ stdenv.mkDerivation rec { python3 wrapQtAppsHook removeReferencesTo - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # to build bundled libdispatch clang gobject-introspection - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ]; @@ -109,17 +106,14 @@ stdenv.mkDerivation rec { tg_owt microsoft-gsl boost - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland kcoreaddons alsa-lib libpulseaudio hunspell - glibmm_2_68 jemalloc - fmt - wayland - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa CoreFoundation CoreServices @@ -156,7 +150,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; @@ -164,7 +158,7 @@ stdenv.mkDerivation rec { "-DTDESKTOP_API_TEST=ON" ]; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r ${mainProgram}.app $out/Applications ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} @@ -176,7 +170,7 @@ stdenv.mkDerivation rec { remove-references-to -t ${tg_owt.dev} $out/bin/${mainProgram} ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch index 8082f09646052..941e5f80526b8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch @@ -1,3 +1,19 @@ +diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm +index ef544803e9..69c61b3139 100644 +--- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm ++++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm +@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) { + [window setTitleVisibility:NSWindowTitleHidden]; + [window setTitlebarAppearsTransparent:YES]; + [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView]; ++#if 0 + if (@available(macOS 12.0, *)) { + _data->topNotchSkip = [[window screen] safeAreaInsets].top; + } ++#endif + } + + void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) { Submodule Telegram/lib_base contains modified content diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm index 7ce90d3..dac3c2c 100644 @@ -33,14 +49,88 @@ index 7ce90d3..dac3c2c 100644 const auto state = DetectBatteryState(); if (!state.has || !state.draining) { return false; +Submodule Telegram/lib_webrtc contains modified content +diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm +index 7521c08..5e22da2 100644 +--- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm ++++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm +@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate) + DefaultCaptureDeviceChangedMonitor.registerEnvironment(this); + AudioDeviceListChangedMonitor.registerEnvironment(this); + ++#if 0 + if (@available(macOS 14.0, *)) { + const auto weak = base::make_weak(this); + id block = [^(BOOL shouldBeMuted){ +@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate) + setInputMuteStateChangeHandler:block + error:nil]; + } ++#endif + } + + EnvironmentMac::~EnvironmentMac() { +@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) { + } + + void EnvironmentMac::setCaptureMuted(bool muted) { ++#if 0 + if (@available(macOS 14.0, *)) { + if (!_captureMuteNotification) { + const auto value = muted ? YES : NO; + [[AVAudioApplication sharedInstance] setInputMuted:value error:nil]; + } + } ++#endif + } + + void EnvironmentMac::captureMuteSubscribe() { ++#if 0 + if (@available(macOS 14.0, *)) { + id observer = [[InputMuteObserver alloc] init]; + [[[NSWorkspace sharedWorkspace] notificationCenter] +@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() { + [observer release]; + }); + } ++#endif + } + + void EnvironmentMac::captureMuteUnsubscribe() { +@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() { + void EnvironmentMac::setCaptureMuteTracker( + not_null<CaptureMuteTracker*> tracker, + bool track) { ++#if 0 + if (@available(macOS 14.0, *)) { + if (track) { + if (!_captureMuteTracker) { +@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker( + } + } + } ++#endif + } + + std::unique_ptr<Environment> CreateEnvironment( Submodule Telegram/lib_webview contains modified content diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -index 657c5a4..4bfc097 100644 +index e7808fc..34020f0 100644 --- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm +++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -@@ -317,9 +317,11 @@ Instance::Instance(Config config) { +@@ -334,6 +334,7 @@ Instance::Instance(Config config) { + _handler = [[Handler alloc] initWithMessageHandler:config.messageHandler navigationStartHandler:config.navigationStartHandler navigationDoneHandler:config.navigationDoneHandler dialogHandler:config.dialogHandler dataRequested:handleDataRequest]; _dataRequestHandler = std::move(config.dataRequestHandler); [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; ++#if 0 + if (@available(macOS 14, *)) { + if (config.userDataToken != LegacyStorageIdToken().toStdString()) { + NSUUID *uuid = UuidFromToken(config.userDataToken); +@@ -341,10 +342,13 @@ Instance::Instance(Config config) { + [uuid release]; + } + } ++#endif _webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]; +#if 0 if (@available(macOS 13.3, *)) { @@ -50,3 +140,32 @@ index 657c5a4..4bfc097 100644 [_manager addScriptMessageHandler:_handler name:@"external"]; [_webview setNavigationDelegate:_handler]; [_webview setUIDelegate:_handler]; +@@ -700,10 +704,12 @@ void *Instance::winId() { + } + + void Instance::setOpaqueBg(QColor opaqueBg) { ++#if 0 + if (@available(macOS 12.0, *)) { + [_webview setValue: @NO forKey: @"drawsBackground"]; + [_webview setUnderPageBackgroundColor:[NSColor clearColor]]; + } ++#endif + } + + void Instance::resizeToWindow() { +@@ -739,6 +745,7 @@ std::string GenerateStorageToken() { + } + + void ClearStorageDataByToken(const std::string &token) { ++#if 0 + if (@available(macOS 14, *)) { + if (!token.empty() && token != LegacyStorageIdToken().toStdString()) { + if (NSUUID *uuid = UuidFromToken(token)) { +@@ -754,6 +761,7 @@ void ClearStorageDataByToken(const std::string &token) { + } + } + } ++#endif + } + + } // namespace Webview diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index e2f3c4ba884ed..c136d121aa867 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \ @@ -64,7 +64,7 @@ stdenv.mkDerivation { crc32c libvpx abseil-cpp - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXtst libXcomposite @@ -78,7 +78,7 @@ stdenv.mkDerivation { mesa libdrm libGL - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa AppKit IOKit diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 4dfe20e94892a..e3e8a3b3f6eb9 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.4.1"; + version = "5.5.5"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-AWu0LH6DH/omcIsgIBHQIg1uCKN9Ly6EVj4U9QxoSlg="; + hash = "sha256-LWIOgyHp43bLN4RQtBKH2HitfVI6AKstPK5es2s+wVw="; }; patches = [ @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { ./scheme.patch ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \ --replace-fail '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster ''; @@ -105,11 +105,11 @@ stdenv.mkDerivation (finalAttrs: { ninja python3 wrapQtAppsHook - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gobject-introspection wrapGAppsHook3 extra-cmake-modules - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ]; @@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { microsoft-gsl rlottie ada - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland gtk3 glib-networking @@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: { hunspell webkitgtk_6_0 jemalloc - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa CoreFoundation CoreServices @@ -180,7 +180,7 @@ stdenv.mkDerivation (finalAttrs: { libicns ]); - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; @@ -198,20 +198,20 @@ stdenv.mkDerivation (finalAttrs: { export GI_GIR_PATH="$XDG_DATA_DIRS" ''; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin} ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram} ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix index 7cdbda355d382..d23ee405efc2f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { ]; # Fix notifications on platforms other than darwin by providing notify-send - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i 's|^NOTIFY_CMD = .*|NOTIFY_CMD = "${libnotify}/bin/notify-send {title} {message} -i {icon_path}"|' tg/config.py ''; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 4054219850b42..70612f529434f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib dbus - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 92daa59ae415f..5d4bfc5eab4b9 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pkg-config libxslt makeWrapper - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoreconfHook gtk-doc ]; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index e90b8b6971300..2a42692e412c2 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { mimeTypes = [ "application/x-chat" ]; }; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' runHook preInstall mkdir -p $out/Applications diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 31ef96cf80c6f..8d3b360718745 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 50be0777ae4eb..60ed9d60b1e12 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -71,4 +71,4 @@ let cp -r *.app $out/Applications ''; }; -in if stdenv.isDarwin then darwin else linux +in if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index eb4a9de8425dd..89688c3ecadff 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -156,11 +156,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wavebox"; - version = "10.127.10-2"; + version = "10.129.29-2"; src = fetchurl { url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb"; - hash = "sha256-x095V2UhRJfPmmG+4/i7I9AnCU4WVrw0b71nEu73uew="; + hash = "sha256-HGzBvCv6ASW2wXMd0BrA6NNGAEsuN2yHwS+0WbABfWM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index e699c761b6953..0925bae8a6956 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "whatsapp-for-linux"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ bartuka ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; }) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 9d41b0455a722..22bf7fb11e6c5 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -187,6 +187,6 @@ let }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix deleted file mode 100644 index a5cf1a8b39c2d..0000000000000 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ /dev/null @@ -1,202 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pipewire -, makeWrapper -, xar -, cpio - # Dynamic libraries -, alsa-lib -, atk -, at-spi2-atk -, at-spi2-core -, cairo -, cups -, dbus -, expat -, libdrm -, libGL -, fontconfig -, freetype -, gtk3 -, gdk-pixbuf -, glib -, mesa -, nspr -, nss -, pango -, wayland -, xorg -, libxkbcommon -, udev -, zlib -, libkrb5 - # Runtime -, coreutils -, pciutils -, procps -, util-linux -, pulseaudioSupport ? true -, libpulseaudio -}: - -let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - - # Zoom versions are released at different times for each platform - # and often with different versions. We write them on three lines - # like this (rather than using {}) so that the updater script can - # find where to edit them. - versions.aarch64-darwin = "6.1.10.38818"; - versions.x86_64-darwin = "6.1.10.38818"; - versions.x86_64-linux = "6.1.10.1400"; - - srcs = { - aarch64-darwin = fetchurl { - url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; - name = "zoomusInstallerFull.pkg"; - hash = "sha256-E8r0bctM5whwEMppzO9hR3W+k+BmrV0gVx+J02KYmuk="; - }; - x86_64-darwin = fetchurl { - url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-HMSBV/B/nTkcU8src6Wdz8uZnz455guSAMGm5ha7mIA="; - }; - x86_64-linux = fetchurl { - url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-c3WywWmblz9Wg3RMtovCBcR/mYyaWkmuoCqqGvHBxwo="; - }; - }; - - libs = lib.makeLibraryPath ([ - # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' - alsa-lib - atk - at-spi2-atk - at-spi2-core - cairo - cups - dbus - expat - libdrm - libGL - pipewire - fontconfig - freetype - gtk3 - gdk-pixbuf - glib - mesa - nspr - nss - pango - stdenv.cc.cc - wayland - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - libxkbcommon - xorg.libXrandr - xorg.libXrender - xorg.libxshmfence - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.libXfixes - xorg.libXtst - udev - zlib - libkrb5 - ] ++ lib.optional (pulseaudioSupport) libpulseaudio); - -in -stdenv.mkDerivation rec { - pname = "zoom"; - version = versions.${system} or throwSystem; - - src = srcs.${system} or throwSystem; - - dontUnpack = stdenv.isLinux; - unpackPhase = lib.optionalString stdenv.isDarwin '' - xar -xf $src - zcat < zoomus.pkg/Payload | cpio -i - ''; - - nativeBuildInputs = [ - makeWrapper - ] - ++ lib.optionals stdenv.isDarwin [ - xar - cpio - ]; - - installPhase = '' - runHook preInstall - ${rec { - aarch64-darwin = '' - mkdir -p $out/Applications - cp -R zoom.us.app $out/Applications/ - ''; - # darwin steps same on both architectures - x86_64-darwin = aarch64-darwin; - x86_64-linux = '' - mkdir $out - tar -C $out -xf $src - mv $out/usr/* $out/ - ''; - }.${system} or throwSystem} - runHook postInstall - ''; - - postFixup = lib.optionalString stdenv.isDarwin '' - makeWrapper $out/Applications/zoom.us.app/Contents/MacOS/zoom.us $out/bin/zoom - '' + lib.optionalString stdenv.isLinux '' - # Desktop File - substituteInPlace $out/share/applications/Zoom.desktop \ - --replace-fail "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" - - for i in aomhost zopen zoom ZoomLauncher; do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i - done - - # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom - # IPC breaks if the executable name does not end in 'zoom' - mv $out/opt/zoom/zoom $out/opt/zoom/.zoom - makeWrapper $out/opt/zoom/.zoom $out/opt/zoom/zoom \ - --prefix LD_LIBRARY_PATH ":" ${libs} - - rm $out/bin/zoom - # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect - # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm: - # Clear Qt paths to prevent tripping over "foreign" Qt resources. - # Clear Qt screen scaling settings to prevent over-scaling. - makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \ - --chdir "$out/opt/zoom" \ - --unset QML2_IMPORT_PATH \ - --unset QT_PLUGIN_PATH \ - --unset QT_SCREEN_SCALE_FACTORS \ - --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \ - --prefix LD_LIBRARY_PATH ":" ${libs} - - # Backwards compatibility: we used to call it zoom-us - ln -s $out/bin/{zoom,zoom-us} - ''; - - # already done - dontPatchELF = true; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - homepage = "https://zoom.us/"; - description = "zoom.us video conferencing application"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ danbst tadfisher ]; - mainProgram = "zoom"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh deleted file mode 100755 index 3684f057a08c3..0000000000000 --- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p common-updater-scripts curl jq - -set -eu -o pipefail - -scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) -nixpkgs=$(realpath "$scriptDir"/../../../../..) - -echo >&2 "=== Obtaining version data from https://zoom.us/rest/download ..." -linux_data=$(curl -Ls 'https://zoom.us/rest/download?os=linux' | jq .result.downloadVO) -mac_data=$(curl -Ls 'https://zoom.us/rest/download?os=mac' | jq .result.downloadVO) - -version_aarch64_darwin=$(jq -r .zoomArm64.version <<<"$mac_data") -version_x86_64_darwin=$(jq -r .zoom.version <<<"$mac_data") -version_x86_64_linux=$(jq -r .zoom.version <<<"$linux_data") - -echo >&2 "=== Downloading packages and computing hashes..." -# We precalculate the hashes before calling update-source-version -# because it attempts to calculate each architecture's package's hash -# by running `nix-build --system <architecture> -A zoom-us.src` which -# causes cross compiling headaches; using nix-prefetch-url with -# hard-coded URLs is simpler. Keep these URLs in sync with the ones -# in default.nix where `srcs` is defined. -hash_aarch64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_aarch64_darwin}/zoomusInstallerFull.pkg?archType=arm64")) -hash_x86_64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_darwin}/zoomusInstallerFull.pkg")) -hash_x86_64_linux=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_linux}/zoom_x86_64.pkg.tar.xz")) - -echo >&2 "=== Updating default.nix ..." -# update-source-version expects to be at the root of nixpkgs -(cd "$nixpkgs" && update-source-version zoom-us "$version_aarch64_darwin" $hash_aarch64_darwin --system=aarch64-darwin --version-key=versions.aarch64-darwin) -(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_darwin" $hash_x86_64_darwin --system=x86_64-darwin --version-key=versions.x86_64-darwin) -(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_linux" $hash_x86_64_linux --system=x86_64-linux --version-key=versions.x86_64-linux) - -echo >&2 "=== Done!" diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index f7bb1ea099cab..877eb833de8ce 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,11 +5,11 @@ let pname = "zulip"; - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-snxeMgcLFMYDEsog7Xqeybw8GkU4kPqHMds1174bPd0="; + hash = "sha256-t5qBm5+kTdeRMvcHpNbS5mp184UG/IqgJrtj7Ntcbb0="; name="${pname}-${version}.AppImage"; }; @@ -27,14 +27,14 @@ in appimageTools.wrapType2 { install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \ $out/share/icons/hicolor/512x512/apps/zulip.png substituteInPlace $out/share/applications/zulip.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace-fail 'Exec=AppRun' 'Exec=${pname}' ''; meta = with lib; { description = "Desktop client for Zulip Chat"; homepage = "https://zulip.com"; license = licenses.asl20; - maintainers = with maintainers; [ andersk jonafato ]; + maintainers = with maintainers; [ andersk ]; platforms = [ "x86_64-linux" ]; mainProgram = "zulip"; }; diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index 0ad7de8ec468c..4beb88feca1ff 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipget"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "ipfs"; repo = "ipget"; rev = "v${version}"; - hash = "sha256-nT0bMy4L1T2rwE6g3Q4tNkmeP3XyPVxCV9yoGqMZjNs="; + hash = "sha256-SCYbfsQ8yF2ggwNyW0+kydpSBQN9NPpz1Hmw4ni3cg0="; }; - vendorHash = "sha256-q8uwijh3y4l4ebFc3u5Z6TLUUiQqUK6Qpqq/m0kLF14="; + vendorHash = "sha256-90iimOtFys12nrT0hHyzHrpB03YGNfHY/a7V8Blijfw="; postPatch = '' # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 84940c288bed2..9c25ece8556b3 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # libCommuni.dylib is installed in $out/Applications/Communi.app/Contents/Frameworks/ on Darwin # Wrapper hook thinks it's a binary because it's in $out/Applications, wraps it with a shell script # So we manually call the wrapper script on just the binary - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; preConfigure = '' export QMAKEFEATURES=${libcommuni}/features @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { "COMMUNI_INSTALL_ICONS=${placeholder "out"}/share/icons/hicolor" "COMMUNI_INSTALL_DESKTOP=${placeholder "out"}/share/applications" "COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes" - "COMMUNI_INSTALL_BINS=${placeholder "out"}/${if stdenv.isDarwin then "Applications" else "bin"}" + "COMMUNI_INSTALL_BINS=${placeholder "out"}/${if stdenv.hostPlatform.isDarwin then "Applications" else "bin"}" ]; postInstall = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' # Nix qmake does not add the bundle rpath by default. install_name_tool \ -add_rpath @executable_path/../Frameworks \ diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 2fc2e0585910c..c456875d016ba 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec { }; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; buildInputs = with perlPackages; [ CryptPassphrase CryptPassphraseArgon2 CryptPassphraseBcrypt @@ -79,7 +79,7 @@ perlPackages.buildPerlPackage rec { ln -s $AUTO_SHARE_PATH/public/assets $out/assets cp -vR templates $out/templates cp Makefile.PL $out/Makefile.PL - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/convos '' + '' wrapProgram $out/bin/convos --set MOJO_HOME $out diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index 2331eaa4596d3..c3a10cc39e9dd 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Darwin needs libiconv, tcl; while Linux build don't buildInputs = [ openssl ncurses libxcrypt ] - ++ lib.optionals stdenv.isDarwin [ libiconv tcl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv tcl ]; patches = [ (fetchpatch { diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix index 1ff1f0413d2bd..c2b1d5b2ee535 100644 --- a/pkgs/applications/networking/irc/ircdog/default.nix +++ b/pkgs/applications/networking/irc/ircdog/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ircdog"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "goshuirc"; repo = "ircdog"; rev = "refs/tags/v${version}"; - hash = "sha256-X8DTwudgQyQQIpXCG7d+tdXMV33HG6ETzHsvIp3KFDo="; + hash = "sha256-maF53Z0FHAhGmnOnMsX0dDnmckPNBY4Bcm4OBM/x4hQ="; }; vendorHash = null; diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix index 729afb831d579..b297ba4e253a0 100644 --- a/pkgs/applications/networking/irc/thelounge/default.nix +++ b/pkgs/applications/networking/irc/thelounge/default.nix @@ -5,7 +5,7 @@ , nodejs , yarn , fixup-yarn-lock -, python3 +, python311 , npmHooks , cctools , sqlite @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "thelounge"; - version = "4.4.1"; + version = "4.4.3"; src = fetchFromGitHub { owner = "thelounge"; repo = "thelounge"; rev = "v${finalAttrs.version}"; - hash = "sha256-4FdNYP9VLgv/rfvT7KHCF+ABFsZvPbJjfz6IvvDkRNA="; + hash = "sha256-lDbyqVFjhF2etRx31ax7KiQ1QKgVhD8xkTog/E3pUlA="; }; # Allow setting package path for the NixOS module. @@ -35,10 +35,12 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0="; + hash = "sha256-csVrgsEy9HjSBXxtgNG0hcBrR9COlcadhMQrw6BWPc4="; }; - nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin cctools; + # Distutils was deprecated in 3.10, and removed in 3.12. This build needs it. An alternative could be adding + # setuptools, but testing with that and 3.12 still fails. + nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python311 npmHooks.npmInstallHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ sqlite ]; configurePhase = '' diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 583723c0d147c..fa8f3edf5ad6e 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -4,10 +4,10 @@ , fetchFromGitHub , pkg-config , Foundation -, dbusSupport ? stdenv.isLinux, dbus +, dbusSupport ? stdenv.hostPlatform.isLinux, dbus # rustls will be used for TLS if useOpenSSL=false -, useOpenSSL ? stdenv.isLinux, openssl -, notificationSupport ? stdenv.isLinux +, useOpenSSL ? stdenv.hostPlatform.isLinux, openssl +, notificationSupport ? stdenv.hostPlatform.isLinux }: rustPlatform.buildRustPackage rec { @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AhQCfLCoJU7o8s+XL3hDOPmZi9QjOxXSA9uglA1KSuY="; - nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config; buildInputs = lib.optionals dbusSupport [ dbus ] ++ lib.optionals useOpenSSL [ openssl ] - ++ lib.optional stdenv.isDarwin Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; buildFeatures = lib.optional notificationSupport "desktop-notifications"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 0633199787ee8..8ac356b9183bc 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -3,14 +3,14 @@ , zlib, curl, pkg-config, libgcrypt , cmake, libobjc, libresolv, libiconv , asciidoctor # manpages -, enableTests ? !stdenv.isDarwin, cpputest +, enableTests ? !stdenv.hostPlatform.isDarwin, cpputest , guileSupport ? true, guile , luaSupport ? true, lua5 , perlSupport ? true, perl , pythonSupport ? true, python3Packages , rubySupport ? true, ruby , tclSupport ? true, tcl -, phpSupport ? !stdenv.isDarwin, php, systemd, libxml2, pcre2, libargon2 +, phpSupport ? !stdenv.hostPlatform.isDarwin, php, systemd, libxml2, pcre2, libargon2 , extraBuildInputs ? [] }: @@ -29,21 +29,21 @@ let { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON3"; buildInputs = [ python ]; } { name = "php"; enabled = phpSupport; cmakeFlag = "ENABLE_PHP"; buildInputs = [ php-embed.unwrapped.dev libxml2 pcre2 libargon2 - ] ++ lib.optional stdenv.isLinux systemd; } + ] ++ lib.optional stdenv.hostPlatform.isLinux systemd; } ]; enabledPlugins = builtins.filter (p: p.enabled) plugins; in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.4.1"; + version = "4.4.2"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-5d4L0UwqV6UFgTqDw9NyZI0tlXPccoNoV78ocXMmk2w="; + hash = "sha256-1N8ompxbygOm1PrgBuUgNwZO8Dutb76VnFOPMZdDTew="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 @@ -57,19 +57,19 @@ let "-DENABLE_DOC_INCOMPLETE=ON" "-DENABLE_TESTS=${if enableTests then "ON" else "OFF"}" ] - ++ lib.optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] + ++ lib.optionals stdenv.hostPlatform.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ; nativeBuildInputs = [ cmake pkg-config asciidoctor ] ++ lib.optional enableTests cpputest; buildInputs = [ ncurses openssl aspell cjson gnutls gettext zlib curl libgcrypt ] - ++ lib.optionals stdenv.isDarwin [ libobjc libresolv ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc libresolv ] ++ lib.concatMap (p: p.buildInputs) enabledPlugins ++ extraBuildInputs; env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" # Fix '_res_9_init: undefined symbol' error - + (lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); + + (lib.optionalString stdenv.hostPlatform.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); postInstall = '' for p in ${lib.concatMapStringsSep " " (p: p.name) enabledPlugins}; do diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index e51e6f061b07a..22eb0849cc4a0 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { # As of 2019-06-30, all of the dependencies are available on macOS but the # package itself does not build. - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index a67903c6fe98a..265065a445e3c 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -56,10 +56,10 @@ in buildPythonPackage { attrs logbook pygments - matrix-nio + (matrix-nio.override { withOlm = true; }) aiohttp requests - ] ++ matrix-nio.optional-dependencies.e2e; + ]; passthru.scripts = [ "matrix.py" ]; diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix index c059babffe7b6..c046a0c2d7f99 100644 --- a/pkgs/applications/networking/irc/wraith/default.nix +++ b/pkgs/applications/networking/irc/wraith/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "IRC channel management bot written purely in C/C++"; longDescription = '' Wraith is an IRC channel management bot written purely in C/C++. It has diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index 1ba9611bf94ac..9cc23fa2563d1 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.23.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-kXKA0gDmxruoHLTB9zJ36ydqqwaeyQm/Icqgv6API0k="; + hash = "sha256-MQJQsM1nH6p91JWPR75iAvNox8eem4ZnM6n5DUxFzlE="; }; - cargoHash = "sha256-XUokfLMXIYfiN4A2/aYYhq0N7H2vsZL1uvKg498M3yA="; + cargoHash = "sha256-24sBTXE+2CeiietuSL3UNbsjkE25gnYkQtc62RgD6eM="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security SystemConfiguration diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix index d66e8586a6e35..5c691e239d218 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -1,11 +1,11 @@ { lib , stdenv , fetchFromGitHub -, buildGoModule +, buildGo123Module , cmake , extra-cmake-modules , git -, go +, go_1_23 , wrapQtAppsHook , qtbase , qtdeclarative @@ -23,20 +23,20 @@ }: let - version = "0.17.2"; + version = "0.18.1"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-jACcTRIdzYiSLy7zw5QuDu9tZfee9ufhlEecbTbSr+4="; + hash = "sha256-hlpxim4Vm/C37ts+Q/t9swCejKEE97R1QlP+Y2jNWoM="; }; - goDeps = (buildGoModule { + goDeps = (buildGo123Module { pname = "ktailctl-go-wrapper"; inherit src version; modRoot = "src/wrapper"; - vendorHash = "sha256-V4Bn5/VaoFOZlNGBedA4Ly8Kocw0BWyfIHv8IU6Eay4="; + vendorHash = "sha256-KdkvAPLnoC7DccRVIz7t/Ns71dnG59DpO5qwOhJk7qc="; }).goModules; in stdenv.mkDerivation { @@ -61,7 +61,7 @@ stdenv.mkDerivation { cmake extra-cmake-modules git - go + go_1_23 wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix index 54ae2551caa32..d44fafb3be9e9 100644 --- a/pkgs/applications/networking/kubo-migrator/all-migrations.nix +++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -63,7 +63,7 @@ let fs-repo-9-to-10 fs-repo-8-to-9 fs-repo-7-to-8 - ] ++ lib.optional (!stdenv.isDarwin) # I didn't manage to fix this on macOS: + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) # I didn't manage to fix this on macOS: fs-repo-6-to-7 # gx/ipfs/QmSGRM5Udmy1jsFBr1Cawez7Lt7LZ3ZKA23GGVEsiEW6F3/eventfd/eventfd.go:27:32: undefined: syscall.SYS_EVENTFD2 ++ [ fs-repo-5-to-6 diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/applications/networking/localproxy/default.nix index 3de21a4c71127..f693bcb12c04a 100644 --- a/pkgs/applications/networking/localproxy/default.nix +++ b/pkgs/applications/networking/localproxy/default.nix @@ -15,25 +15,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "localproxy"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "aws-samples"; repo = "aws-iot-securetunneling-localproxy"; rev = "v${finalAttrs.version}"; - hash = "sha256-voUKfXa43mOltePQEXgmJ2EBaN06E6R/2Zz6O09ogyY="; + hash = "sha256-bIJLGJhSzBVqJaTWJj4Pmw/shA4Y0CzX4HhHtQZjfj0="; }; patches = [ - # gcc-13 compatibility fix: - # https://github.com/aws-samples/aws-iot-securetunneling-localproxy/pull/136 (fetchpatch { - name = "gcc-13-part-1.patch"; - url = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy/commit/f6ba73eaede61841534623cdb01b69d793124f4b.patch"; - hash = "sha256-sB9GuEuHLyj6DXNPuYAMibUJXdkThKbS/fxvnJU3rS4="; - }) - (fetchpatch { - name = "gcc-13-part-2.patch"; + name = "gcc-13.patch"; url = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy/commit/de8779630d14e4f4969c9b171d826acfa847822b.patch"; hash = "sha256-11k6mRvCx72+5G/5LZZx2qnx10yfKpcAZofn8t8BD3E="; }) @@ -43,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl protobuf catch2 boost icu ]; + postPatch = '' + sed -i '/set(OPENSSL_USE_STATIC_LIBS TRUE)/d' CMakeLists.txt + ''; + # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index 9fb1732c788b7..cf0de377e370b 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -5,12 +5,14 @@ , gnupg , gawk , procps +, notmuch , withManpage ? false }: with python311.pkgs; buildPythonApplication rec { pname = "alot"; - version = "0.10"; + version = "0.11"; + pyproject = true; outputs = [ "out" @@ -23,16 +25,18 @@ with python311.pkgs; buildPythonApplication rec { src = fetchFromGitHub { owner = "pazz"; repo = "alot"; - rev = version; - sha256 = "sha256-1reAq8X9VwaaZDY5UfvcFzHDKd71J88CqJgH3+ANjis="; + rev = "refs/tags/${version}"; + sha256 = "sha256-mXaRzl7260uxio/BQ36BCBxgKhl1r0Rc6PwFZA8qNqc="; }; postPatch = '' substituteInPlace alot/settings/manager.py \ - --replace /usr/share "$out/share" + --replace-fail /usr/share "$out/share" ''; - nativeBuildInputs = lib.optional withManpage sphinx; + nativeBuildInputs = [ + setuptools-scm + ] ++ lib.optional withManpage sphinx; propagatedBuildInputs = [ configobj @@ -53,6 +57,7 @@ with python311.pkgs; buildPythonApplication rec { mock procps pytestCheckHook + notmuch ]; postBuild = lib.optionalString withManpage [ @@ -80,7 +85,7 @@ with python311.pkgs; buildPythonApplication rec { cp -r extra/themes $out/share/alot substituteInPlace extra/completion/alot-completion.zsh \ - --replace "python3" "${completionPython.interpreter}" + --replace-fail "python3" "${completionPython.interpreter}" install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index b62b30ae60b36..38ff368ad5fde 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -12,13 +12,13 @@ let thunderbird-unwrapped = thunderbirdPackages.thunderbird-115; - version = "115.9.0"; + version = "115.14.0"; majVer = lib.versions.major version; betterbird-patches = fetchFromGitHub { owner = "Betterbird"; repo = "thunderbird-patches"; - rev = "${version}-bb26-build2"; + rev = "${version}-bb31"; postFetch = '' echo "Retrieving external patches" @@ -36,7 +36,7 @@ let . ./external.sh rm external.sh ''; - hash = "sha256-0RlI30zxiueeXdLEXPZevc8QyKr667juHk0bTcqBB1w="; + hash = "sha256-dXfpu+ufBfAWl1OlpQ1i8CC7N8f0NbxfaMH6BdKr28c="; }; in ((buildMozillaMach { pname = "betterbird"; @@ -50,7 +50,7 @@ in ((buildMozillaMach { src = fetchurl { # https://download.cdn.mozilla.net/pub/thunderbird/releases/ url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha256-Kut3ynA43289MG+cPSpOphWvDtzw9ykCFcpfMMEpDlc="; + hash = "sha256-A3/D8D9e5PI9SUetKFUE0oDpJsThprIk1zUfZoxu1/A="; }; extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' @@ -79,7 +79,8 @@ in ((buildMozillaMach { fi # requires vendored icu, fails to link with our icu - if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch ]]; then + # feature-506064 depends on those icu patches + if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch || $patch == feature-506064-match-diacritics.patch || $patch == feature-506064-match-diacritics-m-c.patch ]]; then continue fi @@ -111,6 +112,8 @@ in ((buildMozillaMach { webrtcSupport = false; pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" + + inherit (thunderbird-unwrapped.passthru) icu73; }).overrideAttrs (oldAttrs: { postInstall = oldAttrs.postInstall or "" + '' mv $out/lib/thunderbird/* $out/lib/betterbird diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index ddc47d1800c37..d0345f946600b 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -18,7 +18,7 @@ , enableLdap ? true, openldap , enableNetworkManager ? true, networkmanager , enableLibetpan ? true, libetpan -, enableValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind, valgrind +, enableValgrind ? !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind, valgrind , enableSvg ? true, librsvg # Configure claws-mail's plugins diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index d7c971c66a5d3..22e7200277f97 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -7,11 +7,11 @@ let pname = "electron-mail"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-bGqTPP+djpr+RFS6X7jUlSbxl7UDUaZLWQ3D/R76zEI="; + sha256 = "sha256-ajekPPRgprYNWE2osAXe46qVjnxXzkXa+MkWiNYJ5Fc="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/applications/networking/mailreaders/mmh/default.nix index 95c101002e2b9..edcc48386a110 100644 --- a/pkgs/applications/networking/mailreaders/mmh/default.nix +++ b/pkgs/applications/networking/mailreaders/mmh/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { homepage = "http://marmaro.de/prog/mmh"; license = licenses.bsd3; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ kaction ]; }; } diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index d3c2fda9588ff..5a94137ea2f3a 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,8 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which -, ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn2, libxml2, notmuch, openssl -, lua, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib, lndir -, pkg-config, zstd, enableZstd ? true, enableMixmaster ? false, enableLua ? false -, withContrib ? true +{ + lib, + stdenv, + fetchFromGitHub, + gettext, + makeWrapper, + tcl, + which, + ncurses, + perl, + cyrus_sasl, + gss, + gpgme, + libkrb5, + libidn2, + libxml2, + notmuch, + openssl, + lua, + lmdb, + libxslt, + docbook_xsl, + docbook_xml_dtd_42, + w3m, + mailcap, + sqlite, + zlib, + lndir, + pkg-config, + zstd, + enableZstd ? true, + enableMixmaster ? false, + enableLua ? false, + enableSmimeKeys ? true, + withContrib ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -10,22 +40,38 @@ stdenv.mkDerivation (finalAttrs: { version = "20240425"; src = fetchFromGitHub { - owner = "neomutt"; - repo = "neomutt"; - rev = finalAttrs.version; - hash = "sha256-QBqPFteoAm3AdQN0XTWpho8DEW2BFCCzBcHUZIiSxyQ="; + owner = "neomutt"; + repo = "neomutt"; + rev = finalAttrs.version; + hash = "sha256-QBqPFteoAm3AdQN0XTWpho8DEW2BFCCzBcHUZIiSxyQ="; }; buildInputs = [ - cyrus_sasl gss gpgme libkrb5 libidn2 ncurses - notmuch openssl perl lmdb - mailcap sqlite - ] - ++ lib.optional enableZstd zstd - ++ lib.optional enableLua lua; + cyrus_sasl + gss + gpgme + libkrb5 + libidn2 + ncurses + notmuch + openssl + perl + lmdb + mailcap + sqlite + ] ++ lib.optional enableZstd zstd ++ lib.optional enableLua lua; nativeBuildInputs = [ - docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m + docbook_xsl + docbook_xml_dtd_42 + gettext + libxml2 + libxslt.bin + makeWrapper + tcl + which + zlib + w3m pkg-config ]; @@ -49,31 +95,38 @@ stdenv.mkDerivation (finalAttrs: { --replace /etc/mime.types ${mailcap}/etc/mime.types ''; - configureFlags = [ - "--enable-autocrypt" - "--gpgme" - "--gss" - "--lmdb" - "--notmuch" - "--ssl" - "--sasl" - "--with-homespool=mailbox" - "--with-mailpath=" - # To make it not reference .dev outputs. See: - # https://github.com/neomutt/neomutt/pull/2367 - "--disable-include-path-in-cflags" - "--zlib" - ] - ++ lib.optional enableZstd "--zstd" - ++ lib.optional enableLua "--lua" - ++ lib.optional enableMixmaster "--mixmaster"; - - postInstall = '' - wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt" - '' - # https://github.com/neomutt/neomutt-contrib - # Contains vim-keys, keybindings presets and more. - + lib.optionalString withContrib "${lib.getExe lndir} ${finalAttrs.passthru.contrib} $out/share/doc/neomutt"; + configureFlags = + [ + "--enable-autocrypt" + "--gpgme" + "--gss" + "--lmdb" + "--notmuch" + "--ssl" + "--sasl" + "--with-homespool=mailbox" + "--with-mailpath=" + # To make it not reference .dev outputs. See: + # https://github.com/neomutt/neomutt/pull/2367 + "--disable-include-path-in-cflags" + "--zlib" + ] + ++ lib.optional enableZstd "--zstd" + ++ lib.optional enableLua "--lua" + ++ lib.optional enableMixmaster "--mixmaster"; + + postInstall = + '' + wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt" + '' + + lib.optionalString enableSmimeKeys '' + install -m 755 $src/contrib/smime_keys $out/bin; + substituteInPlace $out/bin/smime_keys \ + --replace-fail '/usr/bin/openssl' '${openssl}/bin/openssl'; + '' + # https://github.com/neomutt/neomutt-contrib + # Contains vim-keys, keybindings presets and more. + + lib.optionalString withContrib "${lib.getExe lndir} ${finalAttrs.passthru.contrib} $out/share/doc/neomutt"; doCheck = true; @@ -111,9 +164,12 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Small but very powerful text-based mail client"; mainProgram = "neomutt"; - homepage = "https://www.neomutt.org"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ erikryb raitobezarius ]; - platforms = lib.platforms.unix; + homepage = "https://www.neomutt.org"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + erikryb + raitobezarius + ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 29aa21bca0f22..7073c7b911138 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "notmuch-bower"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "sha256-BNuJEVuzreI2AK/fqVMRHq8ZhPQjO33Y2FzkrWlfmm0="; + sha256 = "sha256-CqA9JU/ujqIn/NvtbPtSWxKDYCv4oDdLCgbf2jj9Av4="; }; nativeBuildInputs = [ mercury pandoc ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 588cd4326a61e..b70512a9d1514 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -2,7 +2,6 @@ , pkg-config, gnupg , xapian, gmime3, sfsexp, talloc, zlib , doxygen, perl, texinfo -, notmuch , pythonPackages , emacs , ruby @@ -157,7 +156,7 @@ stdenv.mkDerivation (finalAttrs: { paths = with ruby.gems; [ mail ]; pathsToLink = [ "/lib" "/nix-support" ]; }; - tests.version = testers.testVersion { package = notmuch; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; updateScript = gitUpdater { url = "https://git.notmuchmail.org/git/notmuch"; diff --git a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix index 0eec9fb0c1cb9..3b6d2ee9285fe 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix @@ -6,23 +6,23 @@ }: rustPlatform.buildRustPackage rec { pname = "notmuch-mailmover"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "michaeladler"; repo = pname; rev = "v${version}"; - hash = "sha256-12eDCqer13GJS0YjJDleJbkP4o7kZfof6HlLG06qZW0="; + hash = "sha256-b+6vQ7m49+9RQ+GA75VgOAJej/2zeu5JAje/OazsEsk="; }; - cargoHash = "sha256-B5VSkhY4nNXSG2SeCl22pSkl6SXEEoYj99wEsNhs/bQ="; + cargoHash = "sha256-qHSmfR5iUBXq8OQJkGCVA4JnExXisN2OIAVKiVMUaZo="; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ notmuch ]; postInstall = '' - installManPage share/notmuch-mailmover.1 + installManPage share/notmuch-mailmover.1.gz installShellCompletion --cmd notmuch-mailmover \ --bash share/notmuch-mailmover.bash \ --fish share/notmuch-mailmover.fish \ diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 48d14d78d8e18..9e765743dd636 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 ] ++ lib.optionals gpgSupport [ gpgme ] ++ lib.optionals sslSupport [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl"; # Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool" - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework Foundation"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework Foundation"; meta = with lib; { homepage = "https://sylpheed.sraoss.jp/en/"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 5026afeaea0bf..cd3954ba590a3 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -3,48 +3,10 @@ # To update `thunderbird-bin`'s `release_sources.nix`, run from the nixpkgs root: # # nix-shell maintainers/scripts/update.nix --argstr package pkgs.thunderbird-bin-unwrapped -{ lib, stdenv, fetchurl, config, wrapGAppsHook3 +{ lib, stdenv, fetchurl, config, wrapGAppsHook3, autoPatchelfHook , alsa-lib -, atk -, cairo , curl -, cups -, dbus-glib -, dbus -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc -, gtk2 , gtk3 -, libkrb5 -, libX11 -, libXScrnSaver -, libxcb -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXinerama -, libXrender -, libXrandr -, libXt -, libXtst -, libcanberra -, libnotify -, adwaita-icon-theme -, libGLU, libGL -, nspr -, nss_latest -, pango -, pipewire -, pciutils -, heimdal -, libpulseaudio -, systemd , writeScript , writeText , xidel @@ -52,10 +14,9 @@ , gnused , gnugrep , gnupg -, ffmpeg , runtimeShell -, mesa # thunderbird wants gbm for drm+dmabuf , systemLocale ? config.i18n.defaultLocale or "en_US" +, patchelfUnstable # have to use patchelfUnstable to support --no-clobber-old-sections , generated }: @@ -86,83 +47,30 @@ let else lib.replaceStrings ["_"] ["-"] systemLocale; source = lib.findFirst (sourceMatches mozLocale) defaultSource sources; + + pname = "thunderbird-bin"; in stdenv.mkDerivation { - pname = "thunderbird-bin"; - inherit version; + inherit pname version; src = fetchurl { url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; inherit (source) sha256; }; - libPath = lib.makeLibraryPath - [ stdenv.cc.cc - alsa-lib - atk - cairo - curl - cups - dbus-glib - dbus - fontconfig - freetype - gdk-pixbuf - glib - glibc - gtk2 - gtk3 - libkrb5 - mesa - libX11 - libXScrnSaver - libXcomposite - libXcursor - libxcb - libXdamage - libXext - libXfixes - libXi - libXinerama - libXrender - libXrandr - libXt - libXtst - libcanberra - libnotify - libGLU libGL - nspr - nss_latest - pango - pipewire - pciutils - heimdal - libpulseaudio - systemd - ffmpeg - ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ - stdenv.cc.cc - ]; - - inherit gtk3; - - nativeBuildInputs = [ wrapGAppsHook3 ]; - - buildInputs = [ gtk3 adwaita-icon-theme ]; - - # "strip" after "patchelf" may break binaries. - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = true; - dontPatchELF = true; + nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook patchelfUnstable ]; + buildInputs = [ + alsa-lib + ]; + # Thunderbird uses "relrhack" to manually process relocations from a fixed offset + patchelfFlags = [ "--no-clobber-old-sections" ]; patchPhase = '' # Don't download updates from Mozilla directly echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js ''; - # See "Note on GPG support" in `../thunderbird/default.nix` for explanations - # on adding `gnupg` and `gpgme` into PATH/LD_LIBRARY_PATH. installPhase = '' mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}" @@ -171,21 +79,6 @@ stdenv.mkDerivation { mkdir -p "$out/bin" ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/" - for executable in \ - thunderbird thunderbird-bin plugin-container \ - updater crashreporter webapprt-stub \ - glxtest vaapitest - do - if [ -e "$out/usr/lib/thunderbird-bin-${version}/$executable" ]; then - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/usr/lib/thunderbird-bin-${version}/$executable" - fi - done - - find . -executable -type f -exec \ - patchelf --set-rpath "$libPath" \ - "$out/usr/lib/thunderbird-bin-${version}/{}" \; - # wrapThunderbird expects "$out/lib" instead of "$out/usr/lib" ln -s "$out/usr/lib" "$out/lib" @@ -197,16 +90,18 @@ stdenv.mkDerivation { ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { - inherit lib writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; - pname = "thunderbird-bin"; + inherit pname lib writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; baseName = "thunderbird"; channel = "release"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; + versionSuffix = "esr"; }; passthru = { binaryName = "thunderbird"; + gssSupport = true; + gtk3 = gtk3; }; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 608e6bf1d7e9e..6db733da41267 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "115.13.0"; + version = "128.2.3esr"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/af/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/af/thunderbird-128.2.3esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "73600c9de1e75f0a2baf7e13d9ecded491e93f7fb4d5aa63e8e4ec2f5c95ab2d"; + sha256 = "11450c70fbb9952707384ef5900ffce76c0ddc079cd02993a37393da3b6f35e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ar/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ar/thunderbird-128.2.3esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8eee06c6f5d347d23fa2401862bc733065162415e15a8decba31d7f71afaf8f5"; + sha256 = "99b09985161dda620e53c5afe9387357b7e8ef0f46c3af332c15167c9bfa32fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ast/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ast/thunderbird-128.2.3esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "6ebcc36fc7306e49513ce6ba9090817acbfcc65eefacac552d4c1fbb3d2ee452"; + sha256 = "5cca2e4b9ce3e52625fb9442c15aa5166a836a3625c0bcc9fad0a6a888d564b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/be/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/be/thunderbird-128.2.3esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "386cd002e1986c4ae5e3d05e3279713994b610453745b25199906427db3874ee"; + sha256 = "c2cbc174ef0bf8616a09cfe863dcd850722c8f0fb8bb3d071fa7af6da7088fd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/bg/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/bg/thunderbird-128.2.3esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c909a752e7f09c37ce67cd7995562eaa30cdb5f604bda70a222e376eacdab8b2"; + sha256 = "92ac1d843307d3a13da2bd7eaacda090aa3ca9b26e3da33a2d8e4780ccb7affe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/br/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/br/thunderbird-128.2.3esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "511f1af492da3cd5a6aea641a8cc67f5f779196cbd81a940f3b0390dc0c1809f"; + sha256 = "c15561c692845ab1d750dfe2fbfa0031d4b713afe5b1359644ececef0def1e3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ca/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ca/thunderbird-128.2.3esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "c7f087af3ed5b3fa60b94cd5380aabf019397479591be08b60d23ca782ac144d"; + sha256 = "efdfcf6d564b5e82f0b0e8d2bd93ba32258cbc403cefda46036e07bc813630cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/cak/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/cak/thunderbird-128.2.3esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "fe7c6fe3e99f0d4d8d6e2561e1fb2e5e8ce6def6caa119d4bb73c55605c3222d"; + sha256 = "fdbea8ea3eca0ba502c3340f02462ce4f03064498de8c37b86559a5c491a2829"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/cs/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/cs/thunderbird-128.2.3esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "222a9a0898375e5edfe09ff67a6db89a340eab4c7b195f895dbe891b5157846c"; + sha256 = "34233723a02da1021520ea9630d8397d29ff135ad0f80e499d6bca3a0b8c34c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/cy/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/cy/thunderbird-128.2.3esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "19e3060fb67039a6fd70bbbce712aeab7def908528a3d54cc77387cac8c58d83"; + sha256 = "0fa356291b99737024a5aae863c18456ddcbb7300369367ad083aab9a48b2dfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/da/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/da/thunderbird-128.2.3esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a2462934c90fb2433692b8ccf342c1669770a20be0c3703ecc54f65e5aaa2487"; + sha256 = "c7f51211239bcc5265e2ab81d257b8a6ff0811aa5294b7bce68c08f2fa8e3524"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/de/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/de/thunderbird-128.2.3esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "d45733c83c65abc1a3df8f6fc0cb2880c55405a4b2a798a5062304dc93f4ac43"; + sha256 = "a128e567f8701ae72fd82e329d660603c2c30963b80a88e646e00254312d5141"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/dsb/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/dsb/thunderbird-128.2.3esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e91883128422d834b7713f1ffc0d8095882e4f4e594940c5adf825f38ca8c1e7"; + sha256 = "869b352a024d9ceec41ba4d4c6d70085e8e9986dc9733da691abdd41e5d57389"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/el/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/el/thunderbird-128.2.3esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f54b76e5ae958ad3eb5bf651f892fbfef460732dee8364df70ed5f8b24a77a5c"; + sha256 = "623d36518dbc976b50e8a6fc7e14240eff158dde50fafe1ecaead4d6ad5554af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/en-CA/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/en-CA/thunderbird-128.2.3esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "fff09666b871aff621cc513aa8fab7843cb1d019e1914c9b654e8af797edfc04"; + sha256 = "321b39bc363f058e04742a4bf64e66a3d36abdbf5876ccec21657b69f1abc6a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/en-GB/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/en-GB/thunderbird-128.2.3esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "2762b9c0c2da7b1d35b51231f395b34d6e7ed8a8c34c56a3c36fd1af40152d57"; + sha256 = "c40566dd51219c4373af3b476b8ec4189c8ca6de34befd84d76dcd9af1badc52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/en-US/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/en-US/thunderbird-128.2.3esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "b70d487213fca89aaed8c2a1da07e179597cf70c6bc56e5fcc93855afdf66365"; + sha256 = "e1886acd969d75f1030f9dc68d3f360548b15e7ff6260182ebeaffcde53d11d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/es-AR/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/es-AR/thunderbird-128.2.3esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "37341713a27b90cd8324585cbe2b4413ed0ce3415366b27f1cbfb97f91595e22"; + sha256 = "04f3275d8aa8cf68618e84bbf12df8974e63acd50e799d06032c96931a1f3c8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/es-ES/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/es-ES/thunderbird-128.2.3esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c2412ebe923dfcdc464bd6d7576c0fdfde748d26b5684b75618b21fa3396d69a"; + sha256 = "a879e7d4a0791ca53bb1904b7a162119ce2271d9d7d33a1fcacf4b92338ec58e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/es-MX/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/es-MX/thunderbird-128.2.3esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "6a1e03cdf4605b768feb802502dc00b9cf7567804c8c2cc7eebf7855c10e555c"; + sha256 = "2367511c520bc2a10e9ca986e56f0fa79d77af710a97367c30a8a963a932d060"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/et/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/et/thunderbird-128.2.3esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e8d92ff29455577680ea1c24f5025387ec502ae5ce65a528c3d526dc2b0e23d5"; + sha256 = "256167062672846e90962e3a7a3c60c04c34c18c35c8b3b47b98663922b2421e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/eu/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/eu/thunderbird-128.2.3esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0added0bc1846f7231a8806bbf5d4478743fb9dab3ba12270a540cb298ce2e12"; + sha256 = "4b5928bd99c088366b08c09de01b7d5dc5f1f11deb5ad48db29f0e266f3790e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/fi/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/fi/thunderbird-128.2.3esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "08ecb359ec9f1bb79271fae375f4094f32232ca17ba516b4dc68d33a49fe26a4"; + sha256 = "878cc0b6831e75f80408ab25629b6dc97d993be97f0144b87dee331019119124"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/fr/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/fr/thunderbird-128.2.3esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "5cbb360a2f824a63a06996d8d7bd11184f04a154acca6d11f9d9ad149add7211"; + sha256 = "ebf090c97372ace2ab04ce43545b05328ae50b7e7ccfe4f1bae0abc6bf7bf18f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/fy-NL/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/fy-NL/thunderbird-128.2.3esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "8c489d2e33c2c0d0d1ecb7c8d8766fce2498ee1256cd37e12f4c975b5533a98d"; + sha256 = "945f072fc92cd3db1e2ce9de0fc5c8fc08e13a8764db54f9494a896fd4add7c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ga-IE/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ga-IE/thunderbird-128.2.3esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5841ef91f177e47ff8a272e76cb57968863c341531b45a42c14bac80979b3187"; + sha256 = "556a3a879c173038f829c5a94f659b3fe86848465498b6cd287aace380409a7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/gd/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/gd/thunderbird-128.2.3esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a07eacd6df3834980886517a9eb1f5d4a6c05d087bb6aac024456b1867079ab6"; + sha256 = "614ef8d8f5229e7c153fb239e056002bfde8a1920cffc3e317dbafd0b486b8f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/gl/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/gl/thunderbird-128.2.3esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d5359822c6817dc8937a3d24e3e50efa27d450c1f9d48d5b79c63b7ffce54439"; + sha256 = "b81c0470717d21cc95412e938c651aceef010bd771a90b6b1b2166c56a064bee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/he/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/he/thunderbird-128.2.3esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5320ef08555bf368c4e09a80524429482f2b23fb27b8b2850ef4a1f60eaf34b0"; + sha256 = "22885a85a65c0be0d292ac9c7275ef07c6c04c79a9d8b383d17e2d23d5f78e8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/hr/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/hr/thunderbird-128.2.3esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "dd6a69a320ed40b662814da28af7165ac499cbcdca1371bba86ef4c84f0d0949"; + sha256 = "a8f2235ac630a23d1e00d670caaa9ccb0f939d97171449554fe59be6c9051510"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/hsb/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/hsb/thunderbird-128.2.3esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "fdc547651aa09c3874366180d4e3fcca407fc8efba5745344cfca1f5c4597003"; + sha256 = "341f8c2753ff38c0e9d61a634ef448a1f2c91cdba9a7d7c494748ec6918da6d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/hu/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/hu/thunderbird-128.2.3esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "85b1b6f9b3f52258ddae7fd03dcd12dc87564d5d797cf7dd8c9fa6f1278da233"; + sha256 = "b3ae6f2fc7cce5cb2bb2634e261c0b73f218bb50ca0b81d8afe588b83a0e601d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/hy-AM/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/hy-AM/thunderbird-128.2.3esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "13c0f0e3b112ac7d4ec0c794458b81057f9965ca718b10bf2b7880be4f4a85fd"; + sha256 = "23c25370fa8c9822fd4f34bced4df5f889375d487709698e7a81154152b54583"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/id/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/id/thunderbird-128.2.3esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "700393b3b121a6398e3f809d035e5b90fd8f3879f0a751a4ed362fb973b3ccfd"; + sha256 = "989719255963ca2d3550022c43c724368a7c48e484b4557c300311237902eea2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/is/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/is/thunderbird-128.2.3esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8eb368b9ffc00aa06238af03c16c3b183858aff829d5741100e515498bee065a"; + sha256 = "afae9e8d124da04903874a35879b20bb45e9f03c0aeba78108e3765bb0803b63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/it/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/it/thunderbird-128.2.3esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "c3d8d2136e3a0096c07413c0c591cc60e322ee1b929b5f6cd99708413014913c"; + sha256 = "f55d86350731c4b89eafde39d7badd228c22ae7d250d51f1f922632b27d9c66c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ja/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ja/thunderbird-128.2.3esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "af6109dade0343a3354e5b8c82df8505ecca189bb9eae0037a578db4fcf99f1b"; + sha256 = "54315aaeb33ff3b1b795545e5c7cdabb32a3fb6b36a0b0175cf7e770fece96a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ka/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ka/thunderbird-128.2.3esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "ad7c22e31b575f28268794b390d75021bcf67cb2a4d7ecbdfc3a5bce8f547160"; + sha256 = "881373f2c3903b72b3f626a7ae245921f235e00b23943b9379e589e6c01b178c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/kab/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/kab/thunderbird-128.2.3esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0356017444c3a046c85599f7188d012f1a8260a5a76d42e8bddb3e937ff1d0db"; + sha256 = "2f01762ab42c86c65d0a88034c6f931fa599411a3cc705772a9bedef139191f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/kk/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/kk/thunderbird-128.2.3esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "d278f53f92f4514b1a1b0cc87a6329e1cfe53d82c815557d2d1038b192fb0a03"; + sha256 = "60202a6ae70d4c83b65c46803d0cd7cb2fe1b4524be63544c18a83f980cf470a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ko/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ko/thunderbird-128.2.3esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "0cda6697ab6041f0983447e5594158e185905d34a7b3ec70022f258403dba6d5"; + sha256 = "69e259e3737e4f759be6cc069acaa58c5a36e20eefb6712c4c75936e7b6aa509"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/lt/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/lt/thunderbird-128.2.3esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f783e465629993c2e5d7c5f71fa421b289ca1051ab461ea4e128a9facf370e21"; + sha256 = "74e750b692f59232f96094af91bf9053df8a680774e20dad34c6436dee10f9e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/lv/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/lv/thunderbird-128.2.3esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b64684c99509c9b2751d4afaced2a2f6067251345f672eb84d2337f9082fee67"; + sha256 = "3e2fbc8693718ce8c4cab0bb1b8ec973d84a95342a6a7783cf5518a5fb3cf459"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ms/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ms/thunderbird-128.2.3esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "a001272f61877db602f26aa80c485f0ad7be82acc26343fbf18a95040aeed429"; + sha256 = "b98245ec7b41493883fd06af08f94d350b22e61e36ad3f289af2239cba5e84d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/nb-NO/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/nb-NO/thunderbird-128.2.3esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "6d9b817608399d59a20d34da172529eacb950e19ddb3cb3966f8acb2704099e1"; + sha256 = "e40f4b73190e85cd2c60c9a87336669e3a36d599642ab4415097fd4485287ede"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/nl/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/nl/thunderbird-128.2.3esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "259e8b433b7c757c507f8deb5ae9453f593f353a7544ec6d8e4b798b3c9958e1"; + sha256 = "c76ae2e8e46d062964c913d57742a1195768af6eb273e01b5488f692dc40a7a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/nn-NO/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/nn-NO/thunderbird-128.2.3esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "0af2bea6b0b4b56dfbbf0b3a4845d5540d17a2998ee000c16a9dee0e63814ee7"; + sha256 = "b1c25025a407d698a45e6e0077a74aba3fb80389ec9fc7cefb2f847adcec7c40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/pa-IN/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/pa-IN/thunderbird-128.2.3esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "7a686986ed8d899ffd00dd770c04c16a0ba5ef66e6889dbf34e86d9794d27448"; + sha256 = "4c8ddacd077e71f005e02c2c4c1553c6d83a96b4df1b15705dd75a302d7f6cee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/pl/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/pl/thunderbird-128.2.3esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d736d10c5c57a2b8b5c7ddd8620eea673e83a4efb66288dcac4f39fb9cafdeef"; + sha256 = "4f8acd938e09f5fbe1a61d22ea93935e44a94ce00b416da48e8e74cbfcd8b2e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/pt-BR/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/pt-BR/thunderbird-128.2.3esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2666dfb8ed5cdcc747d91b5a8f396a268243c9e46aada60b26a62ac1904f11d0"; + sha256 = "1cb2d1eb626c9784555f3dce178b4b4e119213af1c9181b829442b9fb935f0ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/pt-PT/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/pt-PT/thunderbird-128.2.3esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ba1a76293cac33601f8317e538b54c4a05b277f862d3e76e11944a0d51d0b4c2"; + sha256 = "d44ed828ddf0b6ea644470dd90e332be92893d6a37abd5cdba0bec4bdafcfef9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/rm/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/rm/thunderbird-128.2.3esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "d55625a4a75b671cc614f04fa55337df80d0949906256c8852274b0c73f9d8c1"; + sha256 = "77d56c77323ed0cf994f79bd9a81aa516b183542794a3ca5e4fb15f11595fa37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ro/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ro/thunderbird-128.2.3esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ff56d88c4c003bf8e5aa245b65ae17d0d2a3f40ab5cf341fedf7b2bbcfec7088"; + sha256 = "8080b95078f732104df47d426cd353468fa743dc98682dfd83d72091a6701d12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ru/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/ru/thunderbird-128.2.3esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a9eb569ff312c13fc651c44f192c64cd46eb27624f71a4ad9399b0531cdf1a57"; + sha256 = "2ddd6a04de6b15e439c43435772c09823e7814561d9228db63b17fcd6c00a6c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sk/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/sk/thunderbird-128.2.3esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "82bb11f5491a90404d40692218848a36c62ee1f73294f94abaf89102c185dfae"; + sha256 = "ed9f68ac0accc5ae9a4e86fc723a2d4128255ffd48264e0290a63792b5171c8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sl/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/sl/thunderbird-128.2.3esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "b5400b07f12e0712157bbaedafd9f88e7d2326e1407b9a989ae9da8fc245c558"; + sha256 = "d85ef11dc6f123696a0d9b021ebc1b78b606e9cc372b92ecdbf227d3fd275c3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sq/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/sq/thunderbird-128.2.3esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "cff26cd2e27db6c374d1b34da18bd513010bd4572a5abd3179cb6b0bb062a750"; + sha256 = "59bb9dcb795ce15413c836ec671ba0760eba831741ecd94d181199171d26d3b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sr/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/sr/thunderbird-128.2.3esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bce534608ef8da85ea0083dfc86c40759b4b073c90369f94ed98df3d41c3e1c9"; + sha256 = "257e912ea0396a95681fc72a4f8db2248250defbb0a146c8618a067e582f14c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sv-SE/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/sv-SE/thunderbird-128.2.3esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3a2e9f610436b140e3a7098ac27516c3ce5fe2dd672e23a85050bbd896bb2738"; + sha256 = "4d1fb17a41af616be0e357e4accb2757adfc6d81ca586136f93dc44144b30c4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/th/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/th/thunderbird-128.2.3esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3753527489a666c2e89cc1c4be85d85a52890069700ef9bd809e14a50d253d37"; + sha256 = "e52c7d23fa7c8ab9e1868eda178ae82ab0d9c86f3a8bb1b112817692e05fcc24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/tr/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/tr/thunderbird-128.2.3esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "90d37e9512c46db20d8ce44863dabb1c72b196fb26e462e310f83bf7472763b1"; + sha256 = "ffa0651c001df67568e7e87b5755943894a9f55f4a8f67d7e10d08dd49a635a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/uk/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/uk/thunderbird-128.2.3esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "07f8d8809d3dc079e9f5d25f0b553b96efa975c69f4b94ddc5772bbb07c6f2a9"; + sha256 = "b208ef12f677ad325d460b9a67d68e9b78a0ba4b7cd9c4eff6b2a25ba0e1f051"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/uz/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/uz/thunderbird-128.2.3esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7d3d207fe4f427b5492771a6db5f6716d0f49ea2452f3521c53d06da15090135"; + sha256 = "7a11f1ae369d4dc1805d9221184718011533b8a657ebbc7205a60526ce1d7b97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/vi/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/vi/thunderbird-128.2.3esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "48de00ce91f678f9e2b2fdddd57b164feee7c06079c10796707cd1be67452cf1"; + sha256 = "057b2458a6b6759833c86f5e7019b3495a70e2656ad7089f1491c0dfda28e689"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/zh-CN/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/zh-CN/thunderbird-128.2.3esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "686dd1d40c6e5d473b7f768919567d71d7a32bf277aa4f20ee160850d4a19812"; + sha256 = "74d44042e2ac9e95336f1d13930424dc420f5bcef9f0308e2f19a6fc34c97dda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/zh-TW/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-x86_64/zh-TW/thunderbird-128.2.3esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "3be64c8cb88ab2e93ce85249110e91da26f958f5f667f9b2c3524d9337aa3ae6"; + sha256 = "5ccf633ad828fffc3c9e352c78d245df61f2c56eea49e8bda021645d1425e85a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/af/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/af/thunderbird-128.2.3esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "fc6f36e813419ef33d9491c0317c8f73a7d08a10d2767446a6e708499d0664db"; + sha256 = "997ac3091e641305cf282723590d48204fd542376d0227ce98cd9a7bf24230c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ar/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ar/thunderbird-128.2.3esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d7134af862d2f588623a9414d0e09702b04c20577f674ade2c67269db25e7bbf"; + sha256 = "f5f0564d607ff19d51508dd17f908e38d8d4f53bb4241b4e828a5bba2c1b8eee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ast/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ast/thunderbird-128.2.3esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5632d2264f4ad78115c66542bb9a30bd92044e2e480612f0755d1f2bbac1fa39"; + sha256 = "2e585288ae394f9f32038ae75ae47398857c21c88af68cac8d3c7801f2b6b55b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/be/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/be/thunderbird-128.2.3esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "522b1219b3586e028023a0b40b5a0b807fd5bbf26981ae0b28fed41111dfd97f"; + sha256 = "0379fbb7416bb4c92ba77403f5769cc810387c3b5f9518b1061ed2f2e3f179a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/bg/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/bg/thunderbird-128.2.3esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "cee2dbcb5d3e6cff325cc5a9132d574c48cc356a524b619ab0efea481fed87a5"; + sha256 = "1a07ca44cd3071c4adc640a53ff2f0e9b66b8b4a2855b8ba1a491e98d14ec3e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/br/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/br/thunderbird-128.2.3esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "5583cf26d49f32dfaf5a7000c8c670d3b7fd1e839595960bc73e81e5bed8b2b1"; + sha256 = "cd47f44426a82afd286064963782403eaaccabf40fc43335761770c7595c6776"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ca/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ca/thunderbird-128.2.3esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "7ecbeb64308d4a8962c86a75742dcf86ac4f3a0009fa60071f1ba90e3fd89cc3"; + sha256 = "51009f72230f084d005fe9424d5e4f161a1428e650e7b9cd396132a64352ecfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/cak/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/cak/thunderbird-128.2.3esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "4c55e8fa96c9763d1b8e9d8c47b55683827dfceac982514206c422edd34afe37"; + sha256 = "27d392a801b4727cc002685248f2b9abdd6a7987fedb88e1f6dd5a237f3a2f0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/cs/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/cs/thunderbird-128.2.3esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "6f0e483d77b6322fcd50decd868994c9a22e8f7f8ede4a8cc6def64cebf3fd36"; + sha256 = "1de78102a09e564cae08bcf4228aa06ee191abe89975e0e5936cdd98b82d6919"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/cy/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/cy/thunderbird-128.2.3esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "0c727b6364d07666417f7ab03dbf9e8e1cc040d855cbe361e1385cb2d4aa4242"; + sha256 = "fdc84d26c11acbd6d92d3ac2104e15317eb82fdec3c3d0fa8a5c31ce023ad039"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/da/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/da/thunderbird-128.2.3esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "819b01b0fb03eab22d58de73f464e98133778154e122463d20693b4aa1090ecb"; + sha256 = "eb0a2cd1d6113d8e0bfa2233adf3b00dfa950ebf2fc3319fe1b6afa75a616c98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/de/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/de/thunderbird-128.2.3esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "84db18d8ebc383fac729a9e5be2554169368aaaac34523450151ec9c4f8015b1"; + sha256 = "4953cae2c051b63f360964c8efbe7ab4f682e06e4058382b959b6ce843418c96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/dsb/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/dsb/thunderbird-128.2.3esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "4d23aead7db91ca8f657f6eefc3cb37d08be537586d492122b2583c5e4bac516"; + sha256 = "88381b5b23427bce3b53893aef9d334b54101cd30b2af501cc87fcb319f43c3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/el/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/el/thunderbird-128.2.3esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "44833b968bf29d784163776cc7343d23a9c4a781aa36728dcea9fad23b776aa8"; + sha256 = "8b5d6484cc05473b039dd74edbc30184e9ab83e40f2ed3193638dde0da7f2eca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/en-CA/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/en-CA/thunderbird-128.2.3esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c29f159ff4a8aa234f8117c936fc1621aac4ad12841ac261a85c7326d9ad8704"; + sha256 = "b5c9adc111b62a9ba3d4b06c9d79953edd00a25df424ebc6ee8f9263923e6333"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/en-GB/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/en-GB/thunderbird-128.2.3esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "51a2633ed89f3eb08df77153a1a894983b9609fab6aed998cbad7e78129845aa"; + sha256 = "4cc02fc3f7417620256357927e9fb199ffd081996b2d08a149ebe57f4156d932"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/en-US/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/en-US/thunderbird-128.2.3esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "badce662962c90cc0fe4a0e89c7b69185fcf11ac1fdebcb12078226d06eec7cd"; + sha256 = "ade6909367c4311c478d50a16fffdf2aadab51dbe59a5a7df0203adbc93d4846"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/es-AR/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/es-AR/thunderbird-128.2.3esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "6e26898de69237d3915c7b7b18ee565e1b882a0a62ff89d0c64de74f4cf32b06"; + sha256 = "461c5f11d7ae6145bb7e9779cd44c8c7107d779d30d3a20621d046b2ba092fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/es-ES/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/es-ES/thunderbird-128.2.3esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8de6a6bc3c688375239fd56a72c8f9b5db45dbc01793cdb4e508b89b600957cf"; + sha256 = "09bc297bcb61f8fb4216147fc360ee3071349f213f642edd5ccbab3d86ff2cb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/es-MX/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/es-MX/thunderbird-128.2.3esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "d7fa892b266cde71881c6bc1a2926c273ac9990a5f555a1da7ad92e8da7d2079"; + sha256 = "bb4332ab92aefd60e3ccad37049e1a908449c7d9809cc67343149634fa451a66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/et/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/et/thunderbird-128.2.3esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "7e3f6026fd7eb69fcc716b1fd512e43bb24e666fd9792b9c0fcdecc6c2080c64"; + sha256 = "b567ac1b9703db4c4b56b4c05d587a5c7d298f8b76858f26b2ca528a375d805b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/eu/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/eu/thunderbird-128.2.3esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "6992361227e6455834651d2d4c322d68b2772e81f5d41495bc891c6968a31fb3"; + sha256 = "2d8f103540ca51ea231de0f6885b8b717eb4055016cd54d7b10849f52db3723c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/fi/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/fi/thunderbird-128.2.3esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "eb2f64b6079a7fc82ac9cb300a3263682c30f5d5ca88b7e8ffc239b0eeff2e4b"; + sha256 = "7b170156acbf6a4fb315e78ad08c173d7ddcf00714ce7b40e64f9198297ed715"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/fr/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/fr/thunderbird-128.2.3esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "2cd90fda0de39c0c5f880967d5b3c887b82a4b2b2cff68e563cacf918d1067c2"; + sha256 = "43972b7689800f1c2e69edca8a907d179c99ac8778931be912daefeb331a36bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/fy-NL/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/fy-NL/thunderbird-128.2.3esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "79e3d745529f8ba10c47bf47c530d251a60fba60ae6434c28b21d6d920715343"; + sha256 = "5f2296663581feee2c24906bd479681fe4380c725bbdff9f299c4217b2f744ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ga-IE/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ga-IE/thunderbird-128.2.3esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "eecef1ff59423519f2dcda87e5bbe2d627324c1e2812d2ee8554fe4624ae5f13"; + sha256 = "c478695ffca7d13bbdd415259304f3e2c4adc52cdc16d27fb3130c6332f9360b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/gd/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/gd/thunderbird-128.2.3esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "98061b5bbba7663a76ba1fd81c45da1b819dc60d7eb328865bb4e6054893e68c"; + sha256 = "eac3e5806ef6c62a45a0fe6e7fd3ef2d6bafc7665d70501536fa4cd0c1b745b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/gl/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/gl/thunderbird-128.2.3esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "20b27324d5d1007898432a5149be39e023d0574cd9412e1981644fa437559462"; + sha256 = "204f8cf41b39d991634bb79bcb0260b2f403ea93522a1fa907ad3311a5bb96c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/he/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/he/thunderbird-128.2.3esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d0b623cb12b09e8da788a248d9d0c73075a47ab400cd5e9636d63f802d81239f"; + sha256 = "f2df6508f6e9caa6647cd4b6eaadde869ee4001afa438d596932c2bd49d927d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/hr/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/hr/thunderbird-128.2.3esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "a4c6f3c8c4e39677e4fa7a7260bff44764fa66e571919d70349f615429ded199"; + sha256 = "1c632e191f37f8e63692d4f4b8dbdf831148f8ef29ba44fde7b2cfd52e6d9cf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/hsb/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/hsb/thunderbird-128.2.3esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e059202e8add45d767878d96af50d08e540e21af6239e101825153ad3bcde087"; + sha256 = "c3f3acb8c5e45a2ccf97d25eee4c3c0e9af00785e55d8d8a5ada3edb2761cefa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/hu/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/hu/thunderbird-128.2.3esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "a02b0c0460e6bdc54f4d9be92e78ff5c6f8730e1f7199f5f0eceefc220d585ab"; + sha256 = "10bcb2f4d27a065d72d6d6a4b88dfc826f974faf5b2b1bcffb8e723c0d0d29ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/hy-AM/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/hy-AM/thunderbird-128.2.3esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "53b02544de8294c1292311510f5e72b0b0c6c0209e3d01d92d603e5e52f988b6"; + sha256 = "267a887612e3fa82ed92ca98b97976fe3baf0ede1fc47ad30d8c4939c4d54a33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/id/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/id/thunderbird-128.2.3esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "014a9d5214ccd346df23168d1f523374bc5058d247a3817fa8a3df1af7255230"; + sha256 = "a7ecdfcd9bfcfc17c2a32c697ec0afb0370e8f5ca066e2224ebc540d8bc61f0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/is/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/is/thunderbird-128.2.3esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f81280dd398b1e5f6e003ec040052f739d20e3f5bc6ebf79ba5ddef068ab9cd7"; + sha256 = "64d6dbbec1d876b614ca601a58faa4baca7680a4045a9c54b4331b5bd104b86a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/it/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/it/thunderbird-128.2.3esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "54a9b84390fe010708a901aeedd95a1a6b51aeeb44c47760ee68c261898fa52a"; + sha256 = "106a92c15da3e96903b511ee7759e764b3378713b54f13437713b9c02982798a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ja/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ja/thunderbird-128.2.3esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a3a1e497d31244a7acc5ea99a1cd4129c28fc00d82d750b5ce360165e7c6b915"; + sha256 = "a65e9f47fd722de2281d151c95ede105cb912c8b62d3348fab904a4fdcb6579a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ka/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ka/thunderbird-128.2.3esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "df4ea755689a82315627d851fa7b59d5cb9730064785099273431e1993ccb529"; + sha256 = "af553455b4ab549cba61e23baab72524716bd166baf8de9a0e6bb01697acceba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/kab/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/kab/thunderbird-128.2.3esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "e40f72751b40fe6896ab0cdd78ab540ece04d1650c35d1d9af944f5e9983da69"; + sha256 = "4efed1d221fcedb3151f686d4b19cb5cb18e5d90e0ff23506bcb98144724c185"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/kk/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/kk/thunderbird-128.2.3esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "aee0ac4b2bf06468b0fd4d302507693c3e5a76426d4aa2b4deb9081f054156b3"; + sha256 = "b02d3630206093a381dc252b8839c6d5e0e11ba36e0beb34f0e764f41d51faca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ko/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ko/thunderbird-128.2.3esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "32cbdac8073fdc47feda1e17754a1966d668d10b881d137d593f10ef61f1c8a8"; + sha256 = "c87297bec4f3865ef06aa313bfc8fe2f7d12d7a44bc4d83f47769f65b629b2f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/lt/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/lt/thunderbird-128.2.3esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "be4a3241453d43ec04586d27c7a2d09c96ab0558eba5c52a6242b5cc39f7be89"; + sha256 = "a7c131b03b732030a2c887bcd9931b92aacc8e620d46bae6d4e30a54f76523ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/lv/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/lv/thunderbird-128.2.3esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6b92c31b2e2cbb9f2dcf73d29004233f4a4128dfa315fcc0e642aab59ea65c82"; + sha256 = "7641f0b0168b66a18ebda4598d6b039cff57cbea38fe25e467b35cdc28040476"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ms/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ms/thunderbird-128.2.3esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "87cc4f4a7cf59361c899990e023a57ffd6cd7f8b575fa4f06b5045d71b7d0ba8"; + sha256 = "ffd61330b4945c626093ae1a20b3a7ace51e4d93e32346da53cd27b0df9d1da5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/nb-NO/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/nb-NO/thunderbird-128.2.3esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "5a21efede9c8f142e77c37dd569a42467408c9863c03b791b26153c4e09a962a"; + sha256 = "4927bd51e18922d4f6b3ec2d6134d33943f5daa61ae0a80529a3aea3345bade6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/nl/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/nl/thunderbird-128.2.3esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "d6158645ee629b89a6d518d1e62f6777f3f453e6546ad177979473f432dfb376"; + sha256 = "b3010b541469aae57a0909d6f72c0f76482782d85cceef4e1dc970d36e53ae3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/nn-NO/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/nn-NO/thunderbird-128.2.3esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "1528148ba47eabfce476ca351ba0c7341a5454d38c798c3b6dfb1c2f02efd3f8"; + sha256 = "60c0c4cdd0f0b7a2f892206c1e7adcaa4e32e8cf2b29d55a2dfce0881e66096f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/pa-IN/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/pa-IN/thunderbird-128.2.3esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8d6c1f3ce92af5e19e24661aa7bbbe815e3c9ac7ff3e9b6db7c2662e8f56f97c"; + sha256 = "a59494d8eb43583d5e70a2c0c92aa9373edab5903435e337383c93aae848ff60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/pl/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/pl/thunderbird-128.2.3esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "b26ab380e57e442047092f8f12ce701fc062d3dffb3fb905ffde8ec1c2bd9975"; + sha256 = "73fc938c2eb420aef5fbc023dd8d1834cf08325a18d23515155cb311198239ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/pt-BR/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/pt-BR/thunderbird-128.2.3esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "23ff7b60b2a754c34bf243851ce7896cba6918126615ebffb030180fc4df754b"; + sha256 = "fa203684e790a9529f34398763fe2410a6bf8d56b887fb9c1dca91fdca624c7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/pt-PT/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/pt-PT/thunderbird-128.2.3esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "f6667f60d0a54f4e5c25b7c15d843f7215fb0ff8f65962b9ed219f9fa1cac9c1"; + sha256 = "63b53d16d3a1ddd88455a2eae7fe185d7abde743f284ac634d3e63bdb38d88b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/rm/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/rm/thunderbird-128.2.3esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c6c6d412f9a01824bedb46094239caec8c8f32b249f5c9bcce455166472e0c8a"; + sha256 = "5cd0a65ea1e41e6d1a9c833edf75c5a67ce77ec9bb85107d1ba282f2abe91fde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ro/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ro/thunderbird-128.2.3esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d87bb9e6262ca8639db9c72dc512ccd6e2c5c644b2540b76f1d8db2c6cc11681"; + sha256 = "a000256b2ae3a67ccf6f805fbb6c122fd624448021312a7311773a59f412c5ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ru/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/ru/thunderbird-128.2.3esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "933509f254d0a83807eb8423a812b44fa293a34302179bde31f8e7c63f29f17a"; + sha256 = "531a05a5e7b5e4c1de4968a5b3e29aa28e7cb36358d8ffb2dd39f0e1a47738ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sk/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/sk/thunderbird-128.2.3esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7075f022ecbc76d4c00a9816f85f22a08998bd44080b3edf7bb2b15f78a5ca98"; + sha256 = "178ff0a5f05544cf8b2275bc96328055dab6250fb6b4292a51a8295981340d05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sl/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/sl/thunderbird-128.2.3esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "66bd3ea1238198fdf240fa471c846b83ae6ddcb7bb164d3e0bad8480c2b0c9cc"; + sha256 = "5750677fa4c9fa04d9c91a93962eb5ee701deab20889adb3bf7c913832358d87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sq/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/sq/thunderbird-128.2.3esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "0fa98fbe0ebd473ffb247546fba6e7ebcb994bbd4bbbbffb868c2d27984ed8e2"; + sha256 = "1d64734c7b31fd002978dfb08cb058310638bddbe55bab225bd9e2015e7b7f86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sr/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/sr/thunderbird-128.2.3esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "8388932ebc71148cfd3be78d5fd31754c78c4e249930ec5290876655e115207a"; + sha256 = "ce5dae0a9ba5be012eb5e44ce06a7b4c18f4b137caca1b19dbc4bdad32d777a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sv-SE/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/sv-SE/thunderbird-128.2.3esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "793f43ad4062323b408527cbf98988291452fb5007938fc6c75f794a95f6fbbd"; + sha256 = "418e5fbbd04816de06031f56fe73033dbc72df70de688f80604fc5a16275c304"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/th/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/th/thunderbird-128.2.3esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ccd43eb6dd39d0be2af3ab4581a1d49563b78aa1389ff227b5b9c7ae83a782b1"; + sha256 = "4ca1e251bb36653242a8061491304f345f016c2582a68726869453ce2047df8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/tr/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/tr/thunderbird-128.2.3esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "61cef2f34fba3606af62ed2cdeff626f73d1bf628af17c9a30b151da4f7357e2"; + sha256 = "2934a095eddd73b84a3fe2fba2d8273e36c1b853cf8f00951fb58ab96ef142f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/uk/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/uk/thunderbird-128.2.3esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "51daf721ea9864fb199eab9908792b67031005238067543f4a69ebc5ad4fb10c"; + sha256 = "ff82f18e9ba352df0d395534f306fc78b696341f193619c5e3de03dba8dde09a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/uz/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/uz/thunderbird-128.2.3esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "83acb46cce8a7e94e16bb0dd323af816284728d507c2787ae3a8e77fd78662d9"; + sha256 = "679ecaa3f670e49cc741ce113280db9d55d9bbf3798337f9959e1e2e0f6ccf06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/vi/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/vi/thunderbird-128.2.3esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "2ddc9a1b085f1a936e1ac10fb84440cb6159d77baab95ee7a2073202b3341987"; + sha256 = "753006173e67f07c87066915be9312826547fb7ee500a1aafffc1d56ba56c34c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/zh-CN/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/zh-CN/thunderbird-128.2.3esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "6468070bca4ab013646945206c04a03a9b5ac5bac5b07cd48543aa0b7e980353"; + sha256 = "0eb18aba4976e0b17de9584773e4bb66883c1624423fec104e8b893132f24bac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/zh-TW/thunderbird-115.13.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.3esr/linux-i686/zh-TW/thunderbird-128.2.3esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "27a73e84abdea7e4f9d4fe595129f08dd92dc9fdb4d2a3c275481096be90cb8a"; + sha256 = "e28e778c121abc8259445bbee5e5bd0b787f21faac556b7c77452096d60fb219"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 020d5974c8468..41c7c27a1b480 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -1,6 +1,17 @@ -{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu73, fetchpatch2, config }: +{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, icu73, fetchpatch2, config }: let + icu73' = icu73.overrideAttrs (attrs: { + # standardize vtzone output + # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 + patches = attrs.patches ++ [(fetchpatch2 { + url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; + stripLen = 3; + hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; + })]; + }); + common = { version, sha512, updateScript }: (buildMozillaMach rec { pname = "thunderbird"; inherit version updateScript; @@ -16,6 +27,10 @@ let ./no-buildconfig.patch ]; + extraPassthru = { + icu73 = icu73'; + }; + meta = with lib; { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "Full-featured e-mail client"; @@ -34,24 +49,15 @@ let pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" - icu73 = icu73.overrideAttrs (attrs: { - # standardize vtzone output - # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 - patches = attrs.patches ++ [(fetchpatch2 { - url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; - stripLen = 3; - hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; - })]; - }); + icu73 = icu73'; }; in rec { thunderbird = thunderbird-128; thunderbird-115 = common { - version = "115.14.0"; - sha512 = "b12e1302d6be94dd88bee6dd069d3fec944bfce95e1afc1d72c14cc188d952fd5a85f0e70575317250701ac89498d876f3384b022957689fabcef61ad7d78c29"; + version = "115.15.0"; + sha512 = "b161b99e09b6d1ba833f77264e35034ad199438b4fc88d244a6b68c84693fa2e90fbab60dafb827a2e23b37c484f9843a58751d93826ba7cdd0391114d253de2"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-115"; @@ -60,8 +66,8 @@ in rec { }; thunderbird-128 = common { - version = "128.1.1esr"; - sha512 = "91e17d63383b05a7565838c61eda3b642f1bb3b4c43ae78a8810dd6d9ba2e5f10939be17598dd5e87bdf28d6f70ff9e154e54218aaf161bd89a5a6d30b504427"; + version = "128.2.3esr"; + sha512 = "f852d1fe6b8d41aa2f0fbc0fceae93cccf1e5f88d9c0447f504de775283289b82b246b79a01e8eb26e9c87197fb33138fb18c75ecc3f5f1bcfefa3920a7c7512"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index f052e69305916..55b19785e448a 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -5,11 +5,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "235.240712.0"; + version = "235.240718.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-IhGfpHzK853b21oqhlfvXVrS1gl/4xgrZeWvBCIL1qg="; + hash = "sha256-Pycz05cwse2SUvJlaCXMA1/Trdt6ZGOJK3NRSPb6/VM="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix index 435f58d068502..777ea44dc7bdb 100644 --- a/pkgs/applications/networking/mhost/default.nix +++ b/pkgs/applications/networking/mhost/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-d2JYT/eJaGm8pfmjsuSZiQxlzcsypFH53F/9joW0J6I="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index 065749554ea10..4a37b4737c610 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -74,7 +74,7 @@ let ]; gemConfig = defaultGemConfig // { pg = attrs: { - buildFlags = [ "--with-pg-config=${postgresql}/bin/pg_config" ]; + buildFlags = [ "--with-pg-config=${lib.getDev postgresql}/bin/pg_config" ]; }; rszr = attrs: { buildInputs = [ imlib2 imlib2.dev ]; diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix index f6364f5ba5726..b0df1210b318b 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/applications/networking/mkchromecast/default.nix @@ -25,7 +25,7 @@ let packages = [ nodejs ffmpeg youtube-dl -] ++ lib.optionals stdenv.isLinux [ pulseaudio ]; +] ++ lib.optionals stdenv.hostPlatform.isLinux [ pulseaudio ]; in python3Packages.buildPythonApplication { @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication { sha256 = "sha256-dxsIcBPrZaXlsfzOEXhYj2qoK5LRducJG2ggMrMMl9Y="; }; - buildInputs = lib.optional stdenv.isLinux qtwayland; + buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland; propagatedBuildInputs = with python3Packages; ([ pychromecast psutil @@ -72,7 +72,7 @@ python3Packages.buildPythonApplication { postInstall = '' substituteInPlace $out/${python3Packages.python.sitePackages}/mkchromecast/video.py \ --replace '/usr/share/mkchromecast/nodejs/' '${placeholder "out"}/share/mkchromecast/nodejs/' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install -Dm 755 -t $out/bin bin/audiodevice substituteInPlace $out/${python3Packages.python.sitePackages}/mkchromecast/audio_devices.py \ --replace './bin/audiodevice' '${placeholder "out"}/bin/audiodevice' diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 7370ddd6e2013..5e41ef5d2a91a 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - lib.optional stdenv.isDarwin Security + lib.optional stdenv.hostPlatform.isDarwin Security ++ lib.optional gsaslSupport gsasl ++ lib.optional idnSupport libidn ++ lib.optional (sslLibrary == "gnutls") gnutls @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { (lib.withFeature idnSupport "idn") (lib.withFeature gsaslSupport "gsasl") "--with-tls=${sslLibrary}" - ] ++ lib.optional stdenv.isDarwin "--with-macosx-keyring"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-macosx-keyring"; meta = with lib;{ description = "POP3 mail retrieval agent"; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 6bd0f38ba6f45..15cd369ae335d 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -48,10 +48,10 @@ let inherit version src meta; configureFlags = [ "--sysconfdir=/etc" "--with-libgsasl" ] - ++ optionals stdenv.isDarwin [ "--with-macosx-keyring" ]; + ++ optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-keyring" ]; buildInputs = [ gnutls gsasl libidn2 ] - ++ optionals stdenv.isDarwin [ Security ] + ++ optionals stdenv.hostPlatform.isDarwin [ Security ] ++ optionals withKeyring [ libsecret ]; nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix index d89c173550468..8ee04ef19607a 100644 --- a/pkgs/applications/networking/mujmap/default.nix +++ b/pkgs/applications/networking/mujmap/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ notmuch - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "JMAP integration for notmuch mail"; diff --git a/pkgs/applications/networking/mullvad/openvpn.nix b/pkgs/applications/networking/mullvad/openvpn.nix index 0dcfeaabf677e..af2a2d2e494e9 100644 --- a/pkgs/applications/networking/mullvad/openvpn.nix +++ b/pkgs/applications/networking/mullvad/openvpn.nix @@ -31,7 +31,7 @@ openvpn.overrideAttrs (oldAttrs: ]; buildInputs = oldAttrs.buildInputs or [ ] - ++ optional stdenv.isLinux [ libnl.dev ]; + ++ optional stdenv.hostPlatform.isLinux [ libnl.dev ]; configureFlags = [ # Assignement instead of appending to make sure to use exactly the flags required by mullvad @@ -52,7 +52,7 @@ openvpn.overrideAttrs (oldAttrs: "--disable-lz4" "--enable-comp-stub" ] - ++ optional stdenv.isLinux [ + ++ optional stdenv.hostPlatform.isLinux [ # Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L35 "--enable-dco" # requires libnl "--disable-iproute2" diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index f33ef641abf23..ba77425b5ef8e 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -107,6 +107,14 @@ let hash = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4="; fetchSubmodules = true; }; + + patches = [ + (fetchpatch { + name = "GCC14.patch"; + url = "https://github.com/mumble-voip/mumble/commit/56945a9dfb62d29dccfe561572ebf64500deaed1.patch"; + hash = "sha256-Frct9XJ/ZuHPglx+GB9h3vVycR8YY039dStIbfkPPDk="; + }) + ]; }; in { mumble = client source; diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 37fc5bdb25aa0..20d4f831d78bc 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.24.3"; + version = "0.25.0"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-gZeIZTEO/5jKUEGRl91Px44tVTerIm1o4kIGj5Y9pb8="; + hash = "sha256-1mrodzW51nbqfWQjjmHYnInJd61FsWtQcYbKhJAiQ8Q="; }; - vendorHash = "sha256-ZaHgB9nxOYOVE/kjb62f3Kyow9mpXFUc1Gtvsnu28k8="; + vendorHash = "sha256-/iuXnnO8OhGhQWg5nU/hza4yZMSIHKOTPFqojgY8w74="; inherit subPackages; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 7e35c4b22fb5e..9713389954a7e 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.15.7"; + version = "1.15.8"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-vv6hrvfD1T+eH/Bi1ID0yoxB4747Q+nMvklT49uaX38="; + hash = "sha256-eBnysEppgYar2QEHq4P+5blmBgrW4H0jHPmYMXri8f8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 0d1a2dea7d6a0..4e23246a6d428 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "GTK-based Usenet newsreader good at both text and binaries"; mainProgram = "pan"; homepage = "http://pan.rebelbase.com/"; - maintainers = [ ]; + maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; license = with licenses; [ gpl2Only fdl11Only ]; }; diff --git a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch index d3bac6af08d2a..312a0d089f603 100644 --- a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch +++ b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch @@ -16,7 +16,7 @@ index 887213f09..c66468306 100644 << QLatin1String("Name=") << guiName << QLatin1Char('\n') << QLatin1String("GenericName=") << QLatin1String("File Synchronizer\n") - << QLatin1String("Exec=\"") << executablePath << "\" --background\n" -+ << QLatin1String("Exec=") << "nextcloud --background" << endl ++ << QLatin1String("Exec=") << "nextcloud --background\n" << QLatin1String("Terminal=") << "false\n" << QLatin1String("Icon=") << APPLICATION_ICON_NAME << QLatin1Char('\n') << QLatin1String("Categories=") << QLatin1String("Network\n") diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 9bc16811381aa..29f044536981c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -4,20 +4,20 @@ , cmake , extra-cmake-modules , inotify-tools +, kdePackages , libcloudproviders , librsvg , libsecret , openssl , pcre , pkg-config +, qt5compat , qtbase , qtkeychain +, qtsvg , qttools , qtwebengine , qtwebsockets -, qtquickcontrols2 -, qtgraphicaleffects -, plasma5Packages , sphinx , sqlite , xdg-utils @@ -26,15 +26,15 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.13.3"; + version = "3.14.1"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "nextcloud-releases"; repo = "desktop"; - rev = "v${version}"; - hash = "sha256-Z2/WllEiz/Yj/GyIczfA4L2+3Hr8Jmo7X2W/hP1PmwI="; + rev = "refs/tags/v${version}"; + hash = "sha256-bUqHegW38NQJn4TnEQt9wRJFqR6fbLpvQvmWF3akekc="; }; patches = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { postPatch = '' for file in src/libsync/vfs/*/CMakeLists.txt; do substituteInPlace $file \ - --replace "PLUGINDIR" "KDE_INSTALL_PLUGINDIR" + --replace-fail "PLUGINDIR" "KDE_INSTALL_PLUGINDIR" done ''; @@ -61,17 +61,17 @@ stdenv.mkDerivation rec { buildInputs = [ inotify-tools + kdePackages.kio libcloudproviders libsecret openssl pcre - plasma5Packages.kio + qt5compat qtbase qtkeychain + qtsvg qttools qtwebengine - qtquickcontrols2 - qtgraphicaleffects qtwebsockets sqlite ]; @@ -93,7 +93,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Nextcloud themed desktop client"; + changelog = "https://github.com/nextcloud/desktop/releases/tag/v${version}"; + description = "Desktop sync client for Nextcloud"; homepage = "https://nextcloud.com"; license = licenses.gpl2Plus; maintainers = with maintainers; [ kranzes SuperSandro2000 ]; diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix index a2b2731b3b033..3f97981528f5f 100644 --- a/pkgs/applications/networking/nload/default.nix +++ b/pkgs/applications/networking/nload/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; buildInputs = [ ncurses ]; meta = { diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index fc2095caaf21e..41fe108b99f29 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security CoreServices ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ]; checkType = "debug"; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 081f7d96c1aa2..89853c8a088d6 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl libmrss ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo - ++ lib.optional (!stdenv.isLinux) libiconv; + ++ lib.optional (!stdenv.hostPlatform.isLinux) libiconv; # Workaround build failure on -fno-common toolchains: # ld: serve_pdf.o:offrss.h:75: multiple definition of `cgi_url_path'; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile \ --replace '$(CC) $(CFLAGS) $(LDFLAGS)' '$(CXX) $(CFLAGS) $(LDFLAGS)' - '' + lib.optionalString (!stdenv.isLinux) '' + '' + lib.optionalString (!stdenv.hostPlatform.isLinux) '' sed 's/#EXTRA/EXTRA/' -i Makefile '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed 's/^PDF/#PDF/' -i Makefile diff --git a/pkgs/applications/networking/omping/default.nix b/pkgs/applications/networking/omping/default.nix index 808df455a4f2e..1efcd98b46f86 100644 --- a/pkgs/applications/networking/omping/default.nix +++ b/pkgs/applications/networking/omping/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Open Multicast Ping (omping) is a tool for testing IPv4/IPv6 multicast connectivity on a LAN"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 18d791f534025..9e7152393a4d1 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -102,9 +102,9 @@ rec { export HOME="$(mktemp -d)" ''; - disabledTests = lib.optionals stdenv.isLinux [ + disabledTests = lib.optionals stdenv.hostPlatform.isLinux [ "test_get_tor_paths_linux" # expects /usr instead of /nix/store - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # requires meek-client which is not packaged "test_get_tor_paths_darwin" # on darwin (and only on darwin) onionshare attempts to discover diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/applications/networking/opsdroid/default.nix index 7169850327be5..3ef92e059e057 100644 --- a/pkgs/applications/networking/opsdroid/default.nix +++ b/pkgs/applications/networking/opsdroid/default.nix @@ -18,48 +18,45 @@ python3Packages.buildPythonPackage rec { build-system = with python3Packages; [ setuptools ]; - dependencies = - with python3Packages; - [ - aiohttp - aiohttp-middlewares - aioredis - aiosqlite - appdirs - arrow - babel - bitstring - bleach - # botbuilder-core, connector for teams - certifi - click - # dialogflow, connector for Dialogflow - dnspython - emoji - get-video-properties - ibm-watson - matrix-nio - mattermostdriver - motor - multidict - nbconvert - nbformat - opsdroid-get-image-size - parse - puremagic - pycron - python-olm - pyyaml - regex - rich - slack-sdk - tailer - voluptuous - watchgod - webexteamssdk - wrapt - ] - ++ matrix-nio.optional-dependencies.e2e; + dependencies = with python3Packages; [ + aiohttp + aiohttp-middlewares + aioredis + aiosqlite + appdirs + arrow + babel + bitstring + bleach + # botbuilder-core, connector for teams + certifi + click + # dialogflow, connector for Dialogflow + dnspython + emoji + get-video-properties + ibm-watson + (matrix-nio.override { withOlm = true; }) + mattermostdriver + motor + multidict + nbconvert + nbformat + opsdroid-get-image-size + parse + puremagic + pycron + python-olm + pyyaml + regex + rich + slack-sdk + tailer + voluptuous + watchgod + webexteamssdk + wrapt + ]; passthru.python = python3Packages.python; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 67dab32e113f1..61501dbeb20e9 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { GetoptLong TermShellUI ])) ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; cmakeFlags = [ "-DDBUS_NOTIFY=ON" diff --git a/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix b/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix index e8432b4c5c244..5074690228045 100644 --- a/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix +++ b/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "BitTorrent client written in C++"; mainProgram = "ctorrent"; longDescription = '' diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix deleted file mode 100644 index abcc69ec12402..0000000000000 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, jre, gradle, bash, coreutils -, substituteAll, nixosTests, fetchpatch, writeText }: - -let - version = "01497"; - - freenet_ext = fetchurl { - url = "https://github.com/freenet/fred/releases/download/build01495/freenet-ext.jar"; - sha256 = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158="; - }; - - seednodes = fetchurl { - url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref"; - sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv"; - }; - - patches = [ - # gradle 7 support - # https://github.com/freenet/fred/pull/827 - (fetchpatch { - url = "https://github.com/freenet/fred/commit/8991303493f2c0d9933f645337f0a7a5a979e70a.patch"; - sha256 = "sha256-T1zymxRTADVhhwp2TyB+BC/J4gZsT/CUuMrT4COlpTY="; - }) - ]; - -in stdenv.mkDerivation rec { - pname = "freenet"; - inherit version patches; - - src = fetchFromGitHub { - owner = "freenet"; - repo = "fred"; - rev = "refs/tags/build${version}"; - hash = "sha256-pywNPekofF/QotNVF28McojqK7c1Zzucds5rWV0R7BQ="; - }; - - postPatch = '' - rm gradle/verification-{keyring.keys,metadata.xml} - ''; - - nativeBuildInputs = [ gradle jdk ]; - - wrapper = substituteAll { - src = ./freenetWrapper; - inherit bash coreutils jre seednodes; - }; - - mitmCache = gradle.fetchDeps { - inherit pname; - data = ./deps.json; - }; - - # using reproducible archives breaks the build - gradleInitScript = writeText "empty-init-script.gradle" ""; - - gradleFlags = [ "-Dorg.gradle.java.home=${jdk}" ]; - - gradleBuildTask = "jar"; - - installPhase = '' - runHook preInstall - install -Dm444 build/libs/freenet.jar $out/share/freenet/freenet.jar - ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar - mkdir -p $out/bin - install -Dm555 ${wrapper} $out/bin/freenet - substituteInPlace $out/bin/freenet \ - --subst-var-by outFreenet $out - runHook postInstall - ''; - - passthru.tests = { inherit (nixosTests) freenet; }; - - meta = { - description = "Decentralised and censorship-resistant network"; - homepage = "https://freenetproject.org/"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ nagy ]; - platforms = with lib.platforms; linux; - changelog = "https://github.com/freenet/fred/blob/build${version}/NEWS.md"; - }; -} diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper deleted file mode 100755 index 74ff2c62961f6..0000000000000 --- a/pkgs/applications/networking/p2p/freenet/freenetWrapper +++ /dev/null @@ -1,18 +0,0 @@ -#! @bash@/bin/bash -set -eo pipefail -PATH=@coreutils@/bin:$PATH -export CLASSPATH=$(find @outFreenet@/deps/ -name "*.jar"|grep -v bcprov-jdk15on-1.48.jar|tr $'\n' :) -CLASSPATH=$CLASSPATH:@outFreenet@/share/freenet/freenet-ext.jar:@outFreenet@/share/freenet/freenet.jar - -export FREENET_HOME="$HOME/.local/share/freenet" -if [ -n "$XDG_DATA_HOME" ] ; then - FREENET_HOME="$XDG_DATA_HOME/freenet" -fi - -mkdir -p -- $FREENET_HOME - -cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref -chmod u+rw -- $FREENET_HOME/seednodes.fref - -cd -- $FREENET_HOME -exec @jre@/bin/java -Xmx1024M freenet.node.NodeStarter "$@" diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 81a625e5210fd..d83a33833b0bc 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Client for many p2p networks, with multiple frontends"; homepage = "https://github.com/ygrek/mldonkey"; license = lib.licenses.gpl2Only; diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index 795f6969ff48c..240dc41998017 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -5,7 +5,7 @@ , pyrosimple , python3 , testers -, withInotify ? stdenv.isLinux +, withInotify ? stdenv.hostPlatform.isLinux }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 1ec2cbac9ce45..e542dabc6dae9 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -28,15 +28,14 @@ let in stdenv.mkDerivation rec { pname = "qbittorrent" - + lib.optionalString (guiSupport && qtVersion == "5") "-qt5" + lib.optionalString (!guiSupport) "-nox"; - version = "4.6.5"; + version = "5.0.0"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-umJObvPv4VjdAZdQEuhqFCRvi1eZQViu1IO88oeTTq8="; + hash = "sha256-iwqJaRfwJTL6SimWTNqqqFPXxSKrgo6whYY70llZyGs"; }; nativeBuildInputs = [ @@ -52,19 +51,17 @@ stdenv.mkDerivation rec { qtbase qtsvg qttools - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optionals guiSupport [ dbus - ] ++ lib.optionals (guiSupport && stdenv.isLinux) [ + ] ++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qtwayland ] ++ lib.optionals trackerSearch [ python3 ]; - cmakeFlags = lib.optionals (qtVersion == "6") [ - "-DQT6=ON" - ] ++ lib.optionals (!guiSupport) [ + cmakeFlags = lib.optionals (!guiSupport) [ "-DGUI=OFF" "-DSYSTEMD=ON" "-DSYSTEMD_SERVICES_INSTALL_DIR=${placeholder "out"}/lib/systemd/system" @@ -78,7 +75,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' APP_NAME=qbittorrent${lib.optionalString (!guiSupport) "-nox"} mkdir -p $out/{Applications,bin} cp -R $APP_NAME.app $out/Applications diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 9587bd0a93047..014dd89d74995 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -33,7 +33,8 @@ mkDerivation rec { # fixup and install desktop file desktop-file-install --dir $out/share/applications \ - --set-key Exec --set-value $binary \ + --set-key Exec --set-value SoulseekQt \ + --set-key Terminal --set-value false \ --set-key Comment --set-value "${meta.description}" \ --set-key Categories --set-value Network ${appextracted}/default.desktop mv $out/share/applications/default.desktop $out/share/applications/SoulseekQt.desktop diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 9ab60d5a18f40..120afed45de6a 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--all" ]; diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index dd27a22168b47..25296efe6926b 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -55,7 +55,7 @@ let zlib ] ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.isLinux [ inotify-tools ]); + ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ]); in stdenv.mkDerivation (finalAttrs: { @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { (cmakeBool "ENABLE_MAC" false) # requires xcodebuild (cmakeBool "ENABLE_QT" (enableQt5 || enableQt6)) (cmakeBool "INSTALL_LIB" installLib) - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ # Transmission sets this to 10.13 if not explicitly specified, see https://github.com/transmission/transmission/blob/0be7091eb12f4eb55f6690f313ef70a66795ee72/CMakeLists.txt#L7-L16. "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; @@ -145,8 +145,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals enableQt6 (with qt6Packages; [ qttools qtbase qtsvg ]) ++ optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.isLinux [ inotify-tools ] - ++ optionals stdenv.isDarwin [ libiconv Foundation ]; + ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ] + ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Foundation ]; postInstall = '' mkdir $apparmor diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 8f3b2c6e35ef4..98ab36dac08a0 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages -, x11Support ? !stdenv.isDarwin +, x11Support ? !stdenv.hostPlatform.isDarwin , xclip ? null , pbcopy ? null , useGeoIP ? false # Require /var/lib/geoip-databases/GeoIP.dat @@ -7,7 +7,7 @@ let wrapperPath = lib.makeBinPath ( lib.optional x11Support xclip ++ - lib.optional stdenv.isDarwin pbcopy + lib.optional stdenv.hostPlatform.isDarwin pbcopy ); in python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index ccc0d924cac37..3a2a479e78eb6 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,13 +38,13 @@ let pname = "pcloud"; - version = "1.14.6"; - code = "XZQDbs0Z4ET1VL0SIUuzr5ewR9LYuf6ssLRk"; + version = "1.14.7"; + code = "XZhPkU0Zh5gulxHfMn4j1dYBS4dh45iDQHby"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-3HUVIDxeq7svzeWyZrxlE4TjZ8lOwT8bYgyRFRzGnmU="; + hash = "sha256-fzQVuCI3mK93Y3Fwzc0WM5rti0fTZhRm+Qj1CHC8CJ4="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index f27a570123665..047e86036d082 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: { openssl libsamplerate ] - ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreFoundation Security @@ -59,7 +59,9 @@ stdenv.mkDerivation (finalAttrs: { env = lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } - // lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-headerpad_max_install_names"; }; + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_LINK = "-headerpad_max_install_names"; + }; preConfigure = '' export LD=$CC @@ -86,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { python -m installer --prefix $py dist/*.whl ) '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # On MacOS relative paths are used to refer to libraries. All libraries use # a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to # rewrite these to use absolute ones. diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index edb42aa79e9ba..16c2bcf66cef6 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-3nEf9maHDd2LmRpgRqvFOub2DQNvjP3iEBRUlpvo8yg="; + hash = "sha256-rwESt2s/TCAFNkf+JwMa7sfYpRvMT8FoIii4EzR/Z6U="; }; - vendorHash = "sha256-c8KNdENF0wRQ0Ssv6mgnZkY4BOcEoY7r80/hd7XJ5yo="; + vendorHash = "sha256-jmXh53KwzPvmu7RP1F1Ein9/EfJ5m/GGVAqjJVcEVsE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index abeabcd1610f9..9484a1c42dcf0 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -1,47 +1,46 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, gobject-introspection -, setuptools -, wrapGAppsHook3 -, dbus-python -, packaging -, proton-core -, proton-keyring-linux -, proton-keyring-linux-secretservice -, proton-vpn-api-core -, proton-vpn-connection -, proton-vpn-killswitch -, proton-vpn-killswitch-network-manager -, proton-vpn-logger -, proton-vpn-network-manager -, proton-vpn-network-manager-openvpn -, proton-vpn-session -, pycairo -, pygobject3 -, pytest-cov-stub -, pytestCheckHook -, withIndicator ? true -, libappindicator-gtk3 -, libayatana-appindicator +{ + lib, + buildPythonApplication, + fetchFromGitHub, + gobject-introspection, + setuptools, + wrapGAppsHook3, + dbus-python, + packaging, + proton-core, + proton-keyring-linux, + proton-keyring-linux-secretservice, + proton-vpn-api-core, + proton-vpn-connection, + proton-vpn-killswitch, + proton-vpn-killswitch-network-manager, + proton-vpn-logger, + proton-vpn-network-manager, + proton-vpn-network-manager-openvpn, + proton-vpn-network-manager-wireguard, + proton-vpn-session, + pycairo, + pygobject3, + withIndicator ? true, + libappindicator-gtk3, + libayatana-appindicator, }: buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.3.0"; + version = "4.4.4"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; rev = "refs/tags/v${version}"; - hash = "sha256-H4m4u9zksab47W5aIsQZPQTPEYiXbmrVCnT67b+A5Tc="; + hash = "sha256-e581FgXrk1cfjsl/UaG9M+3VBYXcV0mggeLeEW9s9KM="; }; nativeBuildInputs = [ # Needed for the NM namespace gobject-introspection - setuptools wrapGAppsHook3 ]; @@ -52,7 +51,11 @@ buildPythonApplication rec { libayatana-appindicator ]; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ dbus-python packaging proton-core @@ -65,6 +68,7 @@ buildPythonApplication rec { proton-vpn-logger proton-vpn-network-manager proton-vpn-network-manager-openvpn + proton-vpn-network-manager-wireguard proton-vpn-session pycairo pygobject3 @@ -76,11 +80,6 @@ buildPythonApplication rec { install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps ''; - nativeCheckInputs = [ - pytest-cov-stub - pytestCheckHook - ]; - preCheck = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) @@ -89,12 +88,12 @@ buildPythonApplication rec { # Gets a segmentation fault after the widgets test doCheck = false; - meta = with lib; { + meta = { description = "Proton VPN GTK app for Linux"; homepage = "https://github.com/ProtonVPN/proton-vpn-gtk-app"; - license = licenses.gpl3Plus; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; mainProgram = "protonvpn-app"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/applications/networking/protonvpn-gui/legacy.nix b/pkgs/applications/networking/protonvpn-gui/legacy.nix index a749b2875affb..19a2fe7288e92 100644 --- a/pkgs/applications/networking/protonvpn-gui/legacy.nix +++ b/pkgs/applications/networking/protonvpn-gui/legacy.nix @@ -1,22 +1,24 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, setuptools -, wrapGAppsHook3 -, gdk-pixbuf -, glib-networking -, gobject-introspection -, imagemagick -, librsvg -, pango -, python3 -, webkitgtk -# Python libs -, protonvpn-nm-lib -, psutil -# Optionals -, withIndicator ? true -, libappindicator-gtk3 }: +{ + lib, + buildPythonApplication, + fetchFromGitHub, + setuptools, + wrapGAppsHook3, + gdk-pixbuf, + glib-networking, + gobject-introspection, + imagemagick, + librsvg, + pango, + python3, + webkitgtk, + # Python libs + protonvpn-nm-lib, + psutil, + # Optionals + withIndicator ? true, + libappindicator-gtk3, +}: buildPythonApplication rec { pname = "protonvpn-gui"; diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index 01e471c97de96..1105933a9afa6 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { fetchSubmodules = true; }; - postPatch = lib.optionals stdenv.isDarwin '' + postPatch = lib.optionals stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/platforms/macos.cmake \ --replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt ''; @@ -76,7 +76,7 @@ mkDerivation rec { maintainers = with maintainers; [ poscat rewine ]; platforms = platforms.all; # never built on aarch64-darwin, x86_64-darwin since update to unstable-2022-09-25 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "qv2ray"; }; } diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index ef1c08ef2dcc7..35da8969ae2ee 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -7,14 +7,14 @@ let description = "Desktop sharing application, providing remote support and online meetings"; in stdenv.mkDerivation (finalAttrs: { pname = "anydesk"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz" ]; - hash = "sha256-nSY4qHRsEvQk4M3JDHalAk3C6Y21WlfDQ2Gpp6/jjMs="; + hash = "sha256-uSotkFOpuC2a2sRTagY9KFx3F2VJmgrsn+dBa5ycdck="; }; buildInputs = [ diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 231defdc34c5f..b59a82f720dce 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { message = '' In order to use Citrix Workspace, you need to comply with the Citrix EULA and download - the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: + the ${if stdenv.hostPlatform.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: ${homepage} @@ -238,7 +238,7 @@ stdenv.mkDerivation rec { description = "Citrix Workspace"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ] ++ optional (versionOlder version "24") "i686-linux"; - maintainers = with maintainers; [ michaeladler ]; + maintainers = [ ]; inherit homepage; }; } diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 1b0826c4d2bdf..2b5d0e9d7b142 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -3,9 +3,9 @@ let mkVersionInfo = _: { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }: { inherit homepage; - version = "${major}.${minor}.${patch}.${if stdenv.is64bit then x64suffix else x86suffix}"; - prefix = "linuxx${if stdenv.is64bit then "64" else "86"}"; - hash = if stdenv.is64bit then x64hash else x86hash; + version = "${major}.${minor}.${patch}.${if stdenv.hostPlatform.is64bit then x64suffix else x86suffix}"; + prefix = "linuxx${if stdenv.hostPlatform.is64bit then "64" else "86"}"; + hash = if stdenv.hostPlatform.is64bit then x64hash else x86hash; }; # Attribute-set with all actively supported versions of the Citrix workspace app diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/applications/networking/remote/freerdp/3.nix index 202893ced50c7..49b412bf76631 100644 --- a/pkgs/applications/networking/remote/freerdp/3.nix +++ b/pkgs/applications/networking/remote/freerdp/3.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , docbook-xsl-nons , libxslt @@ -70,15 +71,24 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = finalAttrs.version; - hash = "sha256-o/Sp9mMEIxtXa0oIpxYG9Fm8YejStUYcW/jkdPwyE5I="; + hash = "sha256-zqqPfAXHjY4IV18mgbNxWDw7ZP/7SvoYn1u0FahpcNk="; }; + patches = [ + (fetchpatch { + name = "clang-fix-unwind-getlanguagespecificdata.patch"; + url = "https://github.com/FreeRDP/FreeRDP/commit/6fb7bfd043d159d3819486fb601b598102cca823.patch"; + hash = "sha256-U2Oz+IVvlIdg7kJ4rgAWhJVdzthY50YaCYKMMc2he7Y="; + }) + ]; + + postPatch = '' export HOME=$TMP @@ -142,13 +152,13 @@ stdenv.mkDerivation (finalAttrs: { SDL2_image uriparser zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib fuse3 systemd wayland wayland-scanner - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AVFoundation Carbon @@ -169,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: { WITH_CUPS = cups != null; WITH_FAAC = withUnfree && faac != null; WITH_FAAD2 = faad2 != null; - WITH_FUSE = stdenv.isLinux && fuse3 != null; + WITH_FUSE = stdenv.hostPlatform.isLinux && fuse3 != null; WITH_JPEG = libjpeg_turbo != null; WITH_KRB5 = libkrb5 != null; WITH_OPENH264 = openh264 != null; @@ -184,7 +194,7 @@ stdenv.mkDerivation (finalAttrs: { WITH_X11 = true; }; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" "-include AudioToolbox/AudioToolbox.h" @@ -192,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: { "-Wno-error=incompatible-function-pointer-types" ]); - env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-framework AudioToolbox" ]); diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 988986812e30a..7490066c73271 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -64,7 +64,7 @@ let dir = "libfreerdp/crypto/test"; file = "Test_x509_cert_info.c"; } - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ { dir = "winpr/libwinpr/sysinfo/test"; file = "TestGetComputerName.c"; @@ -140,11 +140,11 @@ stdenv.mkDerivation rec { pcre2 pcsclite zlib - ] ++ optionals stdenv.isLinux [ + ] ++ optionals stdenv.hostPlatform.isLinux [ alsa-lib systemd wayland - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AVFoundation Carbon @@ -185,7 +185,7 @@ stdenv.mkDerivation rec { WITH_X11 = true; }; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" "-include AudioToolbox/AudioToolbox.h" @@ -193,7 +193,7 @@ stdenv.mkDerivation rec { "-Wno-error=incompatible-function-pointer-types" ]); - NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ + NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-framework AudioToolbox" ]; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 82f096699b20b..585f48d3a5f8d 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl pkg-config copyDesktopItems ]; buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ gtk3 ncurses - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp; enableParallelBuilding = true; desktopItems = [ diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index a544984ee76b8..b92822b17d3f6 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1 , nettle, gnutls, pkg-config, autoreconfHook, libiconv -, enableCredssp ? (!stdenv.isDarwin) +, enableCredssp ? (!stdenv.hostPlatform.isDarwin) } : stdenv.mkDerivation (rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [pkg-config autoreconfHook]; buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] ++ lib.optional enableCredssp krb5 - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; configureFlags = [ "--with-ipv6" diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 7096c6265b654..eb926ff1c0661 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -2,17 +2,18 @@ , curl, fuse3, fetchpatch2 , desktopToDarwinBundle , glib, gtk3, gettext, libxkbfile, libX11, python3 -, freerdp3, libssh, libgcrypt, gnutls, vte +, freerdp3, libssh, libgcrypt, gnutls , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core -, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz +, openssl, gsettings-desktop-schemas, json-glib, libsodium, harfbuzz , wayland # The themes here are soft dependencies; only icons are missing without them. , adwaita-icon-theme -, withKf5Wallet ? stdenv.isLinux, libsForQt5 -, withLibsecret ? stdenv.isLinux -, withVte ? true +, withKf5Wallet ? stdenv.hostPlatform.isLinux, libsForQt5 +, withLibsecret ? stdenv.hostPlatform.isLinux +, withWebkitGtk ? false, webkitgtk_4_1 +, withVte ? true, vte }: stdenv.mkDerivation (finalAttrs: { @@ -35,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ curl @@ -50,9 +51,10 @@ stdenv.mkDerivation (finalAttrs: { openssl adwaita-icon-theme json-glib libsodium harfbuzz python3 wayland - ] ++ lib.optionals stdenv.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ] + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 ] ++ lib.optionals withLibsecret [ libsecret ] ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] + ++ lib.optionals withWebkitGtk [ webkitgtk_4_1 ] ++ lib.optionals withVte [ vte ]; cmakeFlags = [ @@ -62,14 +64,14 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_AVAHI=OFF" "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" - ] ++ lib.optionals stdenv.isDarwin [ + "-DWITH_WEBKIT2GTK=${if withWebkitGtk then "ON" else "OFF"}" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DHAVE_LIBAPPINDICATOR=OFF" "-DWITH_CUPS=OFF" "-DWITH_ICON_CACHE=OFF" - "-DWITH_WEBKIT2GTK=OFF" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" ]); @@ -80,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { gappsWrapperArgs+=( --set-default SSL_CERT_DIR "/etc/ssl/certs/" --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''} ) diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index 08c5243414dac..70b446db8a5a2 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { libXinerama libXrandr libXxf86vm - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix deleted file mode 100644 index 604ba4772710a..0000000000000 --- a/pkgs/applications/networking/seahub/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib -, fetchFromGitHub -, fetchpatch -, python3 -, makeWrapper -, nixosTests -}: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - django = super.django_3; - }; - }; -in -python.pkgs.buildPythonApplication rec { - pname = "seahub"; - version = "10.0.1"; - pyproject = false; - - src = fetchFromGitHub { - owner = "haiwen"; - repo = "seahub"; - rev = "e8c02236c0eaca6dde009872745f089da4b77e6e"; # using a fixed revision because upstream may re-tag releases :/ - sha256 = "sha256-7JXWKEFqCsC+ZByhvyP8AmDpajT3hpgyYDNUqc3wXyg="; - }; - - patches = [ - (fetchpatch { - # PIL update fix - url = "https://patch-diff.githubusercontent.com/raw/haiwen/seahub/pull/5570.patch"; - sha256 = "sha256-7V2aRlacJ7Qhdi9k4Bs+t/Emx+EAM/NNCI+K40bMwLA="; - }) - ]; - - dontBuild = true; - - doCheck = false; # disabled because it requires a ccnet environment - - nativeBuildInputs = [ - makeWrapper - ]; - - propagatedBuildInputs = with python.pkgs; [ - django - future - django-compressor - django-statici18n - django-webpack-loader - django-simple-captcha - django-picklefield - django-formtools - mysqlclient - pillow - python-dateutil - djangorestframework - openpyxl - requests - requests-oauthlib - chardet - pyjwt - pycryptodome - qrcode - pysearpc - seaserv - gunicorn - markdown - bleach - ]; - - installPhase = '' - cp -dr --no-preserve='ownership' . $out/ - wrapProgram $out/manage.py \ - --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:" - ''; - - passthru = { - inherit python; - pythonPath = python.pkgs.makePythonPath propagatedBuildInputs; - tests = { - inherit (nixosTests) seafile; - }; - }; - - meta = with lib; { - description = "Web end of seafile server"; - homepage = "https://github.com/haiwen/seahub"; - license = licenses.asl20; - maintainers = with maintainers; [ greizgh schmittlauch ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 5586fbbdba417..a43e954e70f4d 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.72"; + version = "3.73"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-5ANhRknN8EOUw+Ifsd2zCKDpDeoWJzUuwGMDMkZOwls="; + hash = "sha256-5CgkpL0nBLKojKPSfkYxh8F5Ub+yWhfmOsKC5qQ4QaE="; }; - vendorHash = "sha256-3CrWrv8kXnbZUcaI2CG/x7MUWlR14OLbjen5FbljTEI="; + vendorHash = "sha256-rj5BbbT3/IBtPZ1MqbwC9TNp+N9ec90Anear2AWBZZU="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 192f8f02c71ce..b5d6c4474e53c 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.16.0"; + version = "0.16.4"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-CJ9ZkoQmZlDI9mgZkEOWuJn66Dvt2f1DjPGf140qJDg="; + hash = "sha256-pxV9WLx0trgG0htWuYG/j634iaQRo5/TXOOU8rOmxDw="; }; modRoot = "./agent"; - vendorHash = "sha256-QWscqQlkvpfvJnI4C74qqD2P9V7ZAY29kCLF1WTTJ7Q="; + vendorHash = "sha256-qqh9KdhOt6KDgwUhf6lzb6I7YAhocBSZ7UeyBT0e0eM="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/pkgs/applications/networking/sniffers/qtwirediff/default.nix index 7cadaee0e2038..ad71c217dbb92 100644 --- a/pkgs/applications/networking/sniffers/qtwirediff/default.nix +++ b/pkgs/applications/networking/sniffers/qtwirediff/default.nix @@ -27,17 +27,17 @@ stdenv.mkDerivation { buildInputs = [ qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r qtwirediff.app $out/Applications makeWrapper $out/{Applications/qtwirediff.app/Contents/MacOS,bin}/qtwirediff - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm755 -T qtwirediff $out/bin/qtwirediff wrapProgram $out/bin/qtwirediff \ --prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}" diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 191924ac70029..0ee03ab5bbeb1 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -51,13 +51,13 @@ , qt6 ? null }: let - isAppBundle = withQt && stdenv.isDarwin; + isAppBundle = withQt && stdenv.hostPlatform.isDarwin; in assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.2.6"; + version = "4.2.7"; outputs = [ "out" "dev" ]; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-zlFTUgsEKraE9crS5SZ13r93JJzUb6eyBhusJbbGwsE="; + hash = "sha256-0tBAmZz8tQfcTtKZf0TZ+I3aaarUCxlpaBXM4zNzkxM="; }; patches = [ @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withQt [ qt6.wrapQtAppsHook wrapGAppsHook3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; @@ -126,13 +126,13 @@ stdenv.mkDerivation rec { qtmultimedia qtsvg qttools - ]) ++ lib.optionals (withQt && stdenv.isLinux) [ + ]) ++ lib.optionals (withQt && stdenv.hostPlatform.isLinux) [ qt6.qtwayland - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libnl sbc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices gmp SystemConfiguration @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString isAppBundle '' mkdir -p $out/Applications mv $out/bin/Wireshark.app $out/Applications/Wireshark.app - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' local flags=() for file in $out/lib/*.dylib; do flags+=(-change @rpath/"$(basename "$file")" "$file") diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/applications/networking/sniffnet/default.nix index 79df10e20751f..146c0941e8507 100644 --- a/pkgs/applications/networking/sniffnet/default.nix +++ b/pkgs/applications/networking/sniffnet/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libpcap openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib expat fontconfig @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { xorg.libXcursor xorg.libXi xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit rustPlatform.bindgenHook ]; @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec { --replace 'Exec=/usr/bin/sniffnet' 'Exec=sniffnet' ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/sniffnet \ --add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 libxkbcommon wayland ]} ''; diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index c1531a25b5480..c4ef9831a8ce7 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { src = fetchurl { name = "SpiderOakONE-${version}-slack_tar_x64.tgz"; - url = "https://spideroak.com/release/spideroak/slack_tar_x64"; + url = "https://spideroak-releases.s3.us-east-2.amazonaws.com/SpiderOakONE-${version}-slack_tar_x64.tgz"; inherit sha256; }; diff --git a/pkgs/applications/networking/stc-cli/default.nix b/pkgs/applications/networking/stc-cli/default.nix deleted file mode 100644 index bfc2d1e84d290..0000000000000 --- a/pkgs/applications/networking/stc-cli/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "stc"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "tenox7"; - repo = pname; - rev = version; - sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U="; - }; - - vendorHash = "sha256-0OsxCGCJT5k5bHXNSIL6QiJXj72bzYCZiI03gvHQuR8="; - - meta = with lib; { - description = "Syncthing CLI Tool"; - homepage = "https://github.com/tenox7/stc"; - changelog = "https://github.com/tenox7/stc/releases/tag/${version}"; - license = licenses.asl20; - maintainers = [ maintainers.ivankovnatsky ]; - mainProgram = "stc"; - }; -} diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 0a1a1d05dde4a..087b415c241fe 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -7,13 +7,13 @@ let apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.4.3"; + version = "1.5.2"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "sha256-2q2Q4rnxXwVnfH1YEBwY35B2ctG9+qpOIAHqPOjjArg="; + sha256 = "sha256-yfCSTzCmhXDBC1vYqwgVjsYUtc5VO1VW74BmIB0hHfE="; }; nativeBuildInputs = [ makeWrapper gettext ]; @@ -24,12 +24,13 @@ in stdenv.mkDerivation rec { configureFlags = [ "--python=${lib.getExe python'}" ]; preConfigure = '' + patchShebangs --build updateversion.sh cd common substituteInPlace configure \ - --replace "/.." "" \ - --replace "share/backintime" "${python'.sitePackages}/backintime" - substituteInPlace "backintime" \ - --replace "share" "${python'.sitePackages}" + --replace-fail "/.." "" \ + --replace-fail "share/backintime" "${python'.sitePackages}/backintime" + substituteInPlace "backintime" "backintime-askpass" \ + --replace-fail "share" "${python'.sitePackages}" ''; dontAddPrefix = true; @@ -44,10 +45,11 @@ in stdenv.mkDerivation rec { description = "Simple backup tool for Linux"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ stephen-huan ]; - platforms = lib.platforms.all; + platforms = lib.platforms.linux; + mainProgram = "backintime"; longDescription = '' Back In Time is a simple backup tool (on top of rsync) for Linux - inspired from “flyback project” and “TimeVault”. The backup is + inspired from "flyback project" and "TimeVault". The backup is done by taking snapshots of a specified set of directories. ''; }; diff --git a/pkgs/applications/networking/sync/backintime/qt.nix b/pkgs/applications/networking/sync/backintime/qt.nix index 1580a51151a2b..136b91a0623cf 100644 --- a/pkgs/applications/networking/sync/backintime/qt.nix +++ b/pkgs/applications/networking/sync/backintime/qt.nix @@ -1,19 +1,25 @@ -{ lib, mkDerivation, backintime-common, python3, polkit, which, su, coreutils, util-linux }: +{ lib, stdenv, backintime-common, python3, polkit, which, su, coreutils, util-linux, +wrapQtAppsHook, qtbase, qtwayland }: let - python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common packaging ]); + python' = python3.withPackages (ps: with ps; [ pyqt6 backintime-common packaging ]); in -mkDerivation { +stdenv.mkDerivation { inherit (backintime-common) - version src installFlags meta dontAddPrefix nativeBuildInputs; + version src installFlags meta dontAddPrefix; pname = "backintime-qt"; - buildInputs = [ python' backintime-common ]; + buildInputs = [ python' backintime-common qtbase qtwayland ]; + + nativeBuildInputs = backintime-common.nativeBuildInputs or [ ] ++ [ + wrapQtAppsHook + ]; configureFlags = [ "--python=${lib.getExe python'}" ]; preConfigure = '' + patchShebangs --build updateversion.sh cd qt substituteInPlace qttools_path.py \ --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' @@ -24,23 +30,23 @@ mkDerivation { --prefix PATH : "${lib.getBin backintime-common}/bin:$PATH" substituteInPlace "$out/share/polkit-1/actions/net.launchpad.backintime.policy" \ - --replace "/usr/bin/backintime-qt" "$out/bin/backintime-qt" + --replace-fail "/usr/bin/backintime-qt" "$out/bin/backintime-qt" substituteInPlace "$out/share/applications/backintime-qt-root.desktop" \ - --replace "/usr/bin/backintime-qt" "backintime-qt" + --replace-fail "/usr/bin/backintime-qt" "backintime-qt" substituteInPlace "$out/share/backintime/qt/serviceHelper.py" \ - --replace "'which'" "'${lib.getBin which}/bin/which'" \ - --replace "/bin/su" "${lib.getBin su}/bin/su" \ - --replace "/usr/bin/backintime" "${lib.getBin backintime-common}/bin/backintime" \ - --replace "/usr/bin/nice" "${lib.getBin coreutils}/bin/nice" \ - --replace "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" + --replace-fail "'which'" "'${lib.getExe which}'" \ + --replace-fail "/bin/su" "${lib.getBin su}/bin/su" \ + --replace-fail "/usr/bin/backintime" "${lib.getExe backintime-common}" \ + --replace-fail "/usr/bin/nice" "${lib.getBin coreutils}/bin/nice" \ + --replace-fail "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" substituteInPlace "$out/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service" \ - --replace "/usr/share/backintime" "$out/share/backintime" + --replace-fail "/usr/share/backintime" "$out/share/backintime" substituteInPlace "$out/bin/backintime-qt_polkit" \ - --replace "/usr/bin/backintime-qt" "$out/bin/backintime-qt" + --replace-fail "/usr/bin/backintime-qt" "$out/bin/backintime-qt" wrapProgram "$out/bin/backintime-qt_polkit" \ --prefix PATH : "${lib.getBin polkit}/bin:$PATH" diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix index fe2d7b07acc82..b1a946f244f93 100644 --- a/pkgs/applications/networking/sync/celeste/default.nix +++ b/pkgs/applications/networking/sync/celeste/default.nix @@ -66,12 +66,12 @@ rustPlatform.buildRustPackage rec { libadwaita librclone pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.Security ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ]); diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index bdb1b69289fed..66fa5665ccaf8 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # Special flags needed on Darwin: # https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51 - cmakeFlags = lib.optionals stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" "-DXNU_DIR=${xnu}/include" ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" "-DXNU_DIR=${xnu}/include" ]; dontUseCmakeBuildDir = true; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 88c4066095b91..87f7080f2fd44 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "rclone"; - version = "1.67.0"; + version = "1.68.1"; outputs = [ "out" "man" ]; @@ -14,22 +14,22 @@ buildGoModule rec { owner = "rclone"; repo = "rclone"; rev = "v${version}"; - hash = "sha256-rTibyh5z89QuPgZMvv3Y6FCugxMIytAg1gdCxE3+QLE="; + hash = "sha256-qVk1l6PLB2S9KlUiccBN60wbaApZnPXTjq1LYsf7pyE="; }; - vendorHash = "sha256-Sw9zZf0rup+VyncIpJHp9PKUp60lv+TV4wbWtVTTK3w="; + vendorHash = "sha256-vZxdayoKTo/fs5PgEdT4gepNq0kNNmLQhlybWY5kpx0="; subPackages = [ "." ]; nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildInputs = lib.optional enableCmount (if stdenv.isDarwin then macfuse-stubs else fuse); + buildInputs = lib.optional enableCmount (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse); tags = lib.optionals enableCmount [ "cmount" ]; ldflags = [ "-s" "-w" "-X github.com/rclone/rclone/fs.Version=${version}" ]; - postConfigure = lib.optionalString (!stdenv.isDarwin) '' + postConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace vendor/github.com/winfsp/cgofuse/fuse/host_cgo.go \ --replace-fail '"libfuse.so.2"' '"${lib.getLib fuse}/lib/libfuse.so.2"' ''; @@ -51,7 +51,7 @@ buildGoModule rec { # filesystem helpers ln -s $out/bin/rclone $out/bin/rclonefs ln -s $out/bin/rclone $out/bin/mount.rclone - '' + lib.optionalString (enableCmount && !stdenv.isDarwin) + '' + lib.optionalString (enableCmount && !stdenv.hostPlatform.isDarwin) # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount3, # as the setuid wrapper is required as non-root on NixOS. '' diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index 171b547ece4ad..07548fbe66317 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.110.3"; + version = "1.113.4"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-hVgFr5fnoSZumNkImMIEbKCu7nIAT72bMi3wnsn95tc="; + hash = "sha256-nf2fNnkY6Z0T5dfSRUmqYpstV5yP+dJiZqB/AF3NR94="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-iXOL7YtSXTmLMS3nDvuUy2puWK83gbtVmrzD17C9JxU="; + vendorHash = "sha256-NnFCs64xUoFFHFQs/3YtdJkUurd3TxNieZJ96VqnJaU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 956dd598d4c3b..f7d0fdeb5c36f 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -28,11 +28,11 @@ buildPythonApplication rec { ./trusted_certificates.patch ]; - buildInputs = lib.optionals enableGUI [ (if stdenv.isLinux then qt6.qtwayland else qt6.qtbase) ]; + buildInputs = lib.optionals enableGUI [ (if stdenv.hostPlatform.isLinux then qt6.qtwayland else qt6.qtbase) ]; propagatedBuildInputs = [ certifi pem twisted ] ++ twisted.optional-dependencies.tls ++ lib.optional enableGUI pyside6 - ++ lib.optional (stdenv.isDarwin && enableGUI) appnope; + ++ lib.optional (stdenv.hostPlatform.isDarwin && enableGUI) appnope; nativeBuildInputs = lib.optionals enableGUI [ qt6.wrapQtAppsHook ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index c30bb61a410f1..b87752f0412b6 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,18 +13,18 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.27.9"; + version = "1.27.12"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-9PKx5jxntG1QjDA+6XySxGahE1IrKKBl/Xk5ZaCAf5I="; + hash = "sha256-/HPq71KkWUE0vG7qUBD3JON4N5KBkuRWc4SvX/JA2nQ="; }; - vendorHash = "sha256-Xv5x+/1lx8nyXw72eEHz7+qnkyZfPAnBtDRrOrD2l+g="; + vendorHash = "sha256-R5GlsCkfoMc5km+NaV+TNUlM3Ot1ARcXfEFimcZOLI4="; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when # run from Launch Agents/Daemons, even on x86 devices where it has a # more lax code signing policy compared to Apple Silicon. So just sign @@ -61,14 +61,14 @@ let inherit (nixosTests) syncthing syncthing-init syncthing-relay; }; - meta = with lib; { + meta = { homepage = "https://syncthing.net/"; description = "Open Source Continuous File Synchronization"; changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ joko peterhoeg ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ joko peterhoeg ]; mainProgram = target; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; }; @@ -87,20 +87,16 @@ in install -Dm644 "$mf" "$mandir/$(basename "$mf")" done - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' mkdir -p $out/lib/systemd/{system,user} - substitute etc/linux-systemd/system/syncthing-resume.service \ - $out/lib/systemd/system/syncthing-resume.service \ - --replace /usr/bin/pkill ${procps}/bin/pkill - substitute etc/linux-systemd/system/syncthing@.service \ $out/lib/systemd/system/syncthing@.service \ - --replace /usr/bin/syncthing $out/bin/syncthing + --replace-fail /usr/bin/syncthing $out/bin/syncthing substitute etc/linux-systemd/user/syncthing.service \ $out/lib/systemd/user/syncthing.service \ - --replace /usr/bin/syncthing $out/bin/syncthing + --replace-fail /usr/bin/syncthing $out/bin/syncthing ''; }; @@ -113,12 +109,12 @@ in stname = "syncthing-relay"; target = "strelaysrv"; - postInstall = lib.optionalString (stdenv.isLinux) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isLinux) '' mkdir -p $out/lib/systemd/system substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ $out/lib/systemd/system/strelaysrv.service \ - --replace /usr/bin/strelaysrv $out/bin/strelaysrv + --replace-fail /usr/bin/strelaysrv $out/bin/strelaysrv ''; }; } diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index 2fafbad3499e2..fb930edd14479 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -2,7 +2,7 @@ let pname = "synology-drive-client"; baseUrl = "https://global.synologydownload.com/download/Utility/SynologyDriveClient"; - version = "3.5.0-16084"; + version = "3.5.1-16101"; buildNumber = lib.last (lib.splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server"; @@ -30,7 +30,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Ubuntu/Installer/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-Spl6DC+wf+JaXjwH2ecraySo1VtA+EiI3/TWw9UOSA8="; + sha256 = "sha256-VeS5bPcMM4JDCSH5GXkl4OgQjrPKaNDh5PfX28/zqaU="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -60,7 +60,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "sha256-NDYxUhWtAVUtpCf1WemqShZCFHGgLGwrkX6HldxOlH0="; + sha256 = "sha256-VyhROpQCeVHNxxYgPUZdAlng15aJ1/IYadz30FThlsw="; }; nativeBuildInputs = [ cpio xar undmg ]; @@ -78,4 +78,4 @@ let cp -R 'Synology Drive Client.app' $out/Applications/ ''; }; -in if stdenv.isDarwin then darwin else linux +in if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 38e5a50b339a3..487b13e557058 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -10,11 +10,13 @@ , mesa , udev , wrapGAppsHook3 +, writeScript }: stdenv.mkDerivation rec { pname = "termius"; - version = "8.12.9"; + version = "9.6.1"; + revision = "204"; src = fetchurl { # find the latest version with @@ -23,8 +25,8 @@ stdenv.mkDerivation rec { # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_194.snap"; - hash = "sha512-48SHa0KQzbDRD9Z6qb63jH+8/jcjGefSjqsCK52Ob2vnzDDBdsmrRLmFDs/K/FBIjzFV4GAjQx61v9jQtvAsmA=="; + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; + hash = "sha512-ok3B/h+d0Q7k5i+IjgGB+4S5g2kzrQT/b4dYz4k07OnyfjJRgJ4X4f7BFFrwKLd+IbIC5OIibrvivWnkSWU3Ew=="; }; desktopItem = makeDesktopItem { @@ -63,7 +65,7 @@ stdenv.mkDerivation rec { mkdir -p $out/opt/termius cp -r ./ $out/opt/termius - mkdir -p "$out/share/applications" "$out/share/pixmaps/termius-app.png" + mkdir -p "$out/share/applications" "$out/share/pixmaps" cp "${desktopItem}/share/applications/"* "$out/share/applications" cp meta/gui/icon.png $out/share/pixmaps/termius-app.png @@ -77,6 +79,28 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" ''; + passthru.updateScript = writeScript "update-termius" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl jq + + set -eu -o pipefail + + data=$(curl -H 'X-Ubuntu-Series: 16' \ + 'https://api.snapcraft.io/api/v1/snaps/details/termius-app?fields=download_sha512,revision,version') + + version=$(jq -r .version <<<"$data") + + if [[ "x$UPDATE_NIX_OLD_VERSION" != "x$version" ]]; then + + revision=$(jq -r .revision <<<"$data") + hash=$(nix hash to-sri "sha512:$(jq -r .download_sha512 <<<"$data")") + + update-source-version "$UPDATE_NIX_ATTR_PATH" "$version" "$hash" + update-source-version --ignore-same-hash --version-key=revision "$UPDATE_NIX_ATTR_PATH" "$revision" "$hash" + + fi + ''; + meta = with lib; { description = "Cross-platform SSH client with cloud data sync and more"; homepage = "https://termius.com/"; diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/applications/networking/twingate/default.nix index 9537ab4c17846..dfab962499f95 100644 --- a/pkgs/applications/networking/twingate/default.nix +++ b/pkgs/applications/networking/twingate/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "twingate"; - version = "2024.98.119300"; + version = "2024.263.131851"; src = fetchurl { url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; - hash = "sha256-N0cabYHaF5H1EeriQRQL7bN5UM85oOGrm9pxGr1AlEk="; + hash = "sha256-8rmTGCHROdq+g+IsuZUMbhXfQEKfiy0riSXjLZ2yDhA="; }; buildInputs = [ diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 5af5c568e4636..5f87a73954629 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/umurmur/umurmur"; platforms = platforms.all; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "umurmurd"; }; } diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index d7f64031c9693..c41cc99df4b43 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/pkgs/applications/networking/warp/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-bad - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security Foundation ]; @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ]; platforms = lib.platforms.all; mainProgram = "warp"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix index ab7fe6bdb2cf0..4011c7c29eafd 100644 --- a/pkgs/applications/networking/xpipe/default.nix +++ b/pkgs/applications/networking/xpipe/default.nix @@ -33,14 +33,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-l67oq9Jj2mmxcLsEMI4t+85cKD65xxMNkTNJrrRrwJQ="; + x86_64-linux = "sha256-0Cdu1ntG8ZPHbLOIFvVFO6Dj8ZBHl4Rb+MM46luRKj4="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "11.0"; + version = "12.0"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/applications/networking/yaup/default.nix b/pkgs/applications/networking/yaup/default.nix index 238bedd52be03..d2fa2778fc875 100644 --- a/pkgs/applications/networking/yaup/default.nix +++ b/pkgs/applications/networking/yaup/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # ld: unknown option: --export-dynamic - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "yaup"; }; } diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/applications/office/PageEdit/default.nix index 5f47ca9bbe68b..fa7acd9310ba5 100644 --- a/pkgs/applications/office/PageEdit/default.nix +++ b/pkgs/applications/office/PageEdit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ]; installPhase = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' runHook preInstall mkdir -p $out/Applications diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 1df4815b6a28f..0790cb44d1f33 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -17,19 +17,20 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-2v7LF53UmVxFzoNHwv+B2zN7I6pSP66x32OplcIR7Fk="; + hash = "sha256-sQ3dxwPWHLUoWgnR9+oHaFoDzXxtwKRiBvz2wkFB01g="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-73Do2Jhso6GJsyDiSz3ACN8pEmZbuPNW3vjW3BFLhY4="; + hash = "sha256-4bU/qecZBrTr34SZAjDDgwpXAAHDITz6lV6mJGjElko="; }; aarch64-darwin = x86_64-darwin; } - ."${stdenvNoCC.hostPlatform.system}"; + ."${stdenvNoCC.hostPlatform.system}" + or (throw "appflowy: No source for system: ${stdenvNoCC.hostPlatform.system}"); in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.6.6"; + version = "0.6.8"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; @@ -40,7 +41,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper copyDesktopItems - ] ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + ] ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ gtk3 @@ -52,7 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontConfigure = true; installPhase = - lib.optionalString stdenvNoCC.isLinux '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' runHook preInstall cd AppFlowy/ @@ -67,7 +68,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall '' - + lib.optionalString stdenvNoCC.isDarwin '' + + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' runHook preInstall mkdir -p $out/{Applications,bin} @@ -77,17 +78,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; preFixup = - lib.optionalString stdenvNoCC.isLinux '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' # Add missing libraries to appflowy using the ones it comes with makeWrapper $out/opt/AppFlowy $out/bin/appflowy \ --set LD_LIBRARY_PATH "$out/opt/lib/" \ --prefix PATH : "${lib.makeBinPath [ xdg-user-dirs ]}" '' - + lib.optionalString stdenvNoCC.isDarwin '' + + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' makeWrapper $out/Applications/AppFlowy.app/Contents/MacOS/AppFlowy $out/bin/appflowy ''; - desktopItems = lib.optionals stdenvNoCC.isLinux [ + desktopItems = lib.optionals stdenvNoCC.hostPlatform.isLinux [ (makeDesktopItem { name = "appflowy"; desktopName = "AppFlowy"; diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 65fe907c27668..0d122cfbf3cd9 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "beamerpresenter"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "stiglers-eponym"; repo = "BeamerPresenter"; rev = "v${version}"; - hash = "sha256-UQbyzkFjrIDPcrE6yGuOWsXNjz8jWyJEWiQwHmf91/8="; + hash = "sha256-ofS0KMsn0KG8squIvMPxSCgE/qNK+Kd47psNziLBBoo="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { qtsvg qtmultimedia qttools - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals useMupdf [ freetype diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix deleted file mode 100644 index 611336b8a908e..0000000000000 --- a/pkgs/applications/office/calligra/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ mkDerivation, lib, fetchpatch, fetchurl, extra-cmake-modules, kdoctools -, boost, qtwebkit, qtx11extras, shared-mime-info -, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets -, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n -, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross -, knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons -, kwindowsystem, kxmlgui, sonnet, threadweaver -, kcontacts, akonadi, akonadi-calendar, akonadi-contacts -, eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen -, librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon -, poppler, pstoedit, qca-qt5, vc, fontconfig -# TODO: package Spnav, m2mml LibEtonyek, Libqgit2 -}: - -mkDerivation rec { - pname = "calligra"; - version = "3.2.1"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0iqi6z6gkck2afgy200dacgcspq7i7887alcj0pklm08hbmsdy5i"; - }; - - patches = [ - # Fix fontconfig underlinking: https://github.com/NixOS/nixpkgs/issues/137794 - # Can be dropped on next release. - (fetchpatch { - name = "fix-fontconfig-linking.patch"; - url = "https://github.com/KDE/calligra/commit/62f510702ef9c34ac50f8d8601a4290ab558464c.patch"; - sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma"; - excludes = [ "CMakeLists.txt" ]; - }) - # Fixes for building calligra with gcc11/c++17 - (fetchpatch { - name = "build_c++17_poppler.patch"; - url = "https://github.com/archlinux/svntogit-packages/raw/bbbe35f97eb1033798f1cf95d427890168598199/trunk/068cd9ae.patch"; - sha256 = "sha256-d9/ILwSeW+ov11DF191hzIaUafO/rjQrAeONwqDSKbA="; - }) - # Fixes for building calligra with modern poppler[-qt5] - (fetchpatch { - name = "calligra-poppler-22.03.patch"; - url = "https://invent.kde.org/office/calligra/-/commit/236bacbe13739414e919de868283b0caf2df5d8a.patch"; - sha256 = "sha256-9DmKPCvEFy2Cs3g7350iOCF5Vrx1HL+/8jr+Tb44CyE="; - }) - (fetchpatch { - name = "calligra-poppler-22.04.patch"; - url = "https://invent.kde.org/office/calligra/-/commit/6b75bec784c9835c78993349845d8c2ef22ec3de.patch"; - sha256 = "sha256-z9/4he4x0WN2K/ZGrDAAtHF/W5X1PAtpeO6s7fgL/fA="; - }) - ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' - ''; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - - buildInputs = [ - boost qtwebkit qtx11extras shared-mime-info - kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons - kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews - kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts - ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver - kcontacts akonadi akonadi-calendar akonadi-contacts - eigen git gsl ilmbase kproperty kreport lcms2 marble pcre libgit2 libodfgen librevenge - libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc - fontconfig - ]; - - propagatedUserEnvPkgs = [ kproperty ]; - - env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - - qtWrapperArgs = [ - "--prefix PATH : ${lib.getBin pstoedit}/bin" - "--prefix XDG_DATA_DIRS : ${breeze-icons}/share" - ]; - - meta = with lib; { - description = "Suite of productivity applications"; - longDescription = '' - Calligra Suite is a set of applications written to help - you to accomplish your work. Calligra includes efficient - and capable office components: Words for text processing, - Sheets for computations, Plan for planning, and Karbon for - vector graphics. - ''; - homepage = "https://www.calligra.org/"; - maintainers = with maintainers; [ ebzzry zraexy ]; - platforms = platforms.linux; - license = with licenses; [ gpl2 lgpl2 ]; - }; -} diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index c8883f36339e4..5679c44ca2dc7 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -30,14 +30,14 @@ , WebKit , System , waylandSupport ? false -, x11Support ? stdenv.isLinux +, x11Support ? stdenv.hostPlatform.isLinux , testers , espanso }: # espanso does not support building with both X11 and Wayland support at the same time -assert stdenv.isLinux -> x11Support != waylandSupport; -assert stdenv.isDarwin -> !x11Support; -assert stdenv.isDarwin -> !waylandSupport; +assert stdenv.hostPlatform.isLinux -> x11Support != waylandSupport; +assert stdenv.hostPlatform.isDarwin -> !x11Support; +assert stdenv.hostPlatform.isDarwin -> !waylandSupport; rustPlatform.buildRustPackage rec { pname = "espanso"; version = "2.2-unstable-2024-05-14"; @@ -69,20 +69,20 @@ rustPlatform.buildRustPackage rec { "modulo" ] ++ lib.optionals waylandSupport [ "wayland" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "vendored-tls" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "native-tls" ]; buildInputs = [ wxGTK32 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl dbus libnotify libxkbcommon - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { xdotool ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace scripts/create_bundle.sh \ --replace-fail target/mac/ $out/Applications/ \ --replace-fail /bin/echo ${coreutils}/bin/echo @@ -119,12 +119,12 @@ rustPlatform.buildRustPackage rec { doCheck = false; postInstall = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' EXEC_PATH=$out/bin/espanso BUILD_ARCH=current ${stdenv.shell} ./scripts/create_bundle.sh '' else '' wrapProgram $out/bin/espanso \ --prefix PATH : ${lib.makeBinPath ( - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ libnotify setxkbmap ] ++ lib.optionals waylandSupport [ diff --git a/pkgs/applications/office/gnote/default.nix b/pkgs/applications/office/gnote/default.nix index beb68aaa46667..935645a05f2dc 100644 --- a/pkgs/applications/office/gnote/default.nix +++ b/pkgs/applications/office/gnote/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnote"; - version = "46.1"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-47v3A6WPgI3Fd9WiVsF3wYkHC5KPS9WSltDA3SXz2pk="; + hash = "sha256-vrNcreIMYOQxVRbyCsfr7p37wrgPAHy+2LxaUlIuRC4="; }; buildInputs = [ diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix deleted file mode 100644 index ef61bb15c3019..0000000000000 --- a/pkgs/applications/office/homebank/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3 -, libsoup_3, adwaita-icon-theme }: - -stdenv.mkDerivation rec { - pname = "homebank"; - version = "5.8.2"; - src = fetchurl { - url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-1CpForKKHXp6le8vVlObm22VTh2LqQlI9Qk4bwlzfLA="; - }; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; - buildInputs = [ gtk libofx libsoup_3 adwaita-icon-theme]; - - meta = with lib; { - description = "Free, easy, personal accounting for everyone"; - mainProgram = "homebank"; - homepage = "https://www.gethomebank.org"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ pSub frlan ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index f87eaf6d9e4d4..32cbcf088c51a 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ant jdk wrapGAppsHook3 makeWrapper stripJavaArchivesHook ]; - buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib libXtst ] - ++ lib.optional stdenv.isDarwin Cocoa; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ gtk2 glib libXtst ] + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; dontWrapGApps = true; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${jre}/bin/java $out/bin/jameica \ --add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${ - lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' + lib.optionalString stdenv.hostPlatform.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' } de.willuhn.jameica.Main" \ --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg (lib.makeLibraryPath buildInputs)} \ --chdir "$out/share/java/" \ diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix index f8f32ecec6ed5..9821cdd2f2f86 100644 --- a/pkgs/applications/office/kitsas/default.nix +++ b/pkgs/applications/office/kitsas/default.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { qmakeFlags = [ "../kitsas/kitsas.pro" ]; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv kitsas.app $out/Applications - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -Dm755 kitsas -t $out/bin install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index d2e62f8e5c74c..aeab3da08dd7a 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -16,7 +16,7 @@ , gnugrep # Configuration options for the wrapper , extraMakeWrapperArgs ? [] -, dbusVerify ? stdenv.isLinux +, dbusVerify ? stdenv.hostPlatform.isLinux , dbus }: diff --git a/pkgs/applications/office/micropad/default.nix b/pkgs/applications/office/micropad/default.nix index 46c318ffbd11f..8fd6b2dd5228c 100644 --- a/pkgs/applications/office/micropad/default.nix +++ b/pkgs/applications/office/micropad/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ yarnBuildHook copyDesktopItems makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 14f3c4098102a..b88f70225873b 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-TQgJ2Q4Z7+OtwuwkfPBgm2BmMKML9nmyFLSkmKJ1RE4="; }; - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace src/platfdep_mac.mm \ --replace "appearance.name == NSAppearanceNameDarkAqua" "NO" - '' + lib.optionalString (stdenv.isLinux && !stdenv.isx86_64) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64) '' substituteInPlace 3rd/CMakeLists.txt \ --replace "-msse4.2 -maes" "" ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { makeWrapper pkg-config wrapGAppsHook3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { sqlite wxGTK32 gtk3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { "-Wno-unused-parameter" ]); - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/mmex.app $out/Applications makeWrapper $out/{Applications/mmex.app/Contents/MacOS,bin}/mmex diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 5454eea2fd074..dae08cd485c61 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.5.5"; + version = "3.5.9"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-xT/mV54L2tXiQnUR7K/h61FsHtF16siEExM/I0mSy+8="; + hash = "sha256-ZKlj/QuQnrqQepsJY6KCROC2fXK/4Py5tmI/FVnRi9w="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/notes/default.nix b/pkgs/applications/office/notes/default.nix deleted file mode 100644 index 7f41ca33e3dcf..0000000000000 --- a/pkgs/applications/office/notes/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, wrapQtAppsHook -, qtbase -, qtdeclarative -, Cocoa -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "notes"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "nuttyartist"; - repo = "notes"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ShChF87ysRoisKshY86kJTa3ZAiQhBOImuL8OsEqgBo="; - fetchSubmodules = true; - }; - - cmakeFlags = [ "-DUPDATE_CHECKER=OFF" ]; - - nativeBuildInputs = [ - cmake - wrapQtAppsHook - ]; - - buildInputs = [ - qtbase - qtdeclarative - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa - ]; - - postInstall = lib.optionalString stdenv.isDarwin '' - mkdir $out/Applications - mv $out/bin/Notes.app $out/Applications - ''; - - meta = { - description = "Fast and beautiful note-taking app"; - mainProgram = "notes"; - downloadPage = "https://github.com/nuttyartist/notes"; - homepage = "https://www.get-notes.com"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ zendo ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -}) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 9e8f2e6f6a342..b0e51f5a8e542 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -25,13 +25,13 @@ }: let - version = "2.11.6"; + version = "2.12.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-RNX+KS2h9zrOK8QzeQWH55pkNPTDW4gic2HLG+XXLRg="; + hash = "sha256-txqwVGLUel74ObCqwMWSqa4Nd2eDRf0SqAIes5tlMDg="; }; # subpath installation is broken with uvicorn >= 0.26 @@ -76,18 +76,18 @@ let cd src-ui ''; - npmDepsHash = "sha256-ML1Yp3JIMbRF6kVu190ReoY7oDUtUfNkHE7dHF6YUAE="; + npmDepsHash = "sha256-hb2z2cPMTN5bHtUldTR5Mvgo4nZL8/S+Uhfis37gF44="; nativeBuildInputs = [ pkg-config python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = [ pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib darwin.apple_sdk.frameworks.CoreText ]; @@ -116,16 +116,22 @@ let in python.pkgs.buildPythonApplication rec { pname = "paperless-ngx"; - format = "other"; + pyproject = false; inherit version src; + postPatch = '' + # pytest-xdist makes the tests flaky + substituteInPlace src/setup.cfg \ + --replace-fail "--numprocesses auto --maxprocesses=16" "" + ''; + nativeBuildInputs = [ gettext xorg.lndir ]; - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python.pkgs; [ bleach channels channels-redis @@ -192,7 +198,7 @@ python.pkgs.buildPythonApplication rec { ''; installPhase = let - pythonPath = python.pkgs.makePythonPath propagatedBuildInputs; + pythonPath = python.pkgs.makePythonPath dependencies; in '' runHook preInstall @@ -203,7 +209,7 @@ python.pkgs.buildPythonApplication rec { makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ --prefix PYTHONPATH : "${pythonPath}" \ --prefix PATH : "${path}" - makeWrapper ${python.pkgs.celery}/bin/celery $out/bin/celery \ + makeWrapper ${lib.getExe python.pkgs.celery} $out/bin/celery \ --prefix PYTHONPATH : "${pythonPath}:$out/lib/paperless-ngx/src" \ --prefix PATH : "${path}" @@ -225,7 +231,6 @@ python.pkgs.buildPythonApplication rec { pytest-httpx pytest-mock pytest-rerunfailures - pytest-xdist pytestCheckHook ]; @@ -254,7 +259,7 @@ python.pkgs.buildPythonApplication rec { "test_rtl_language_detection" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru = { inherit python path frontend tesseract5; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 2f54b435928f6..8b8735d9ac354 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.2.3"; + version = "2.2.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "sha256-xQN1IUbTQEHtyW5F8Zbg2EUN5K87oYqnSdzo0gEeOfI="; + sha256 = "sha256-PRh0ohmPLwpM76qYfbExFqq4OK6Hm0fbdzrjXungSoY="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index 60a9769e6ca16..7c10b9953cdc4 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.11.0"; + version = "4.11.4"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-jAQXe7g+u4tHca4QL8Ae8Yvl+esvGQpCHbDlycAwFZ4="; + hash = "sha256-ADNMSXvfeAT53coAtCu3CVCU5XUFhLbvAH3WPFoKJVE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index 8ada870912eb9..f370ecec9ddfd 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -7,9 +7,9 @@ , gobject-introspection , libcanberra-gtk3 , poppler_gi -, withGstreamer ? stdenv.isLinux +, withGstreamer ? stdenv.hostPlatform.isLinux , gst_all_1 -, withVLC ? stdenv.isLinux +, withVLC ? stdenv.hostPlatform.isLinux }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index c091f61dffc6a..4fd2e741adb00 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -47,7 +47,7 @@ python3Packages.buildPythonPackage rec { homepage = "https://www.cogsci.nl/software/qnotero"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; # Build fails even after adding cx-freeze to `buildInputs` + broken = stdenv.hostPlatform.isDarwin; # Build fails even after adding cx-freeze to `buildInputs` maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index a08f9dd02ad0a..7757357ec869e 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -20,14 +20,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.9.0"; + version = "24.9.8"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-xlGBpRiak/th/z9zKbQXpuk3py/W1ns90NjKw4w3FtI="; + hash = "sha256-G5PLz1GzjfPM5tj3rtwJt4hR3v+oSq2bVr/llTSFbNk="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation { pkg-config installShellFiles xvfb-run - ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; buildInputs = [ qtbase @@ -45,7 +45,7 @@ stdenv.mkDerivation { qtsvg qtwebsockets botan2 - ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; cmakeFlags = [ "-DQON_QT6_BUILD=ON" @@ -61,11 +61,11 @@ stdenv.mkDerivation { --fish <(xvfb-run $out/bin/${appname} --completion fish) '' # Create a lowercase symlink for Linux - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' ln -s $out/bin/${appname} $out/bin/${pname} '' # Wrap application for macOS as lowercase binary - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/${appname}.app $out/Applications makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} diff --git a/pkgs/applications/office/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix index 56bd5f126afae..7d44c684fd99e 100644 --- a/pkgs/applications/office/qpdfview/default.nix +++ b/pkgs/applications/office/qpdfview/default.nix @@ -40,6 +40,9 @@ mkDerivation rec { ghostscript ]; + # needed for qmakeFlags+=( below + __structuredAttrs = true; + preConfigure = '' lrelease qpdfview.pro qmakeFlags+=(*.pro) diff --git a/pkgs/applications/office/roam-research/default.nix b/pkgs/applications/office/roam-research/default.nix index 408f026bc57a1..3edbbe1a50813 100644 --- a/pkgs/applications/office/roam-research/default.nix +++ b/pkgs/applications/office/roam-research/default.nix @@ -2,7 +2,7 @@ let extraArgs = removeAttrs args [ "callPackage" ]; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix (extraArgs // { }) else callPackage ./linux.nix (extraArgs // { }) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 85c0afe9db66a..f95ac14c67ab5 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation (finalAttrs: { mit publicDomain ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 54773afe7604f..4883af59286a3 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "8.0.10"; + version = "9.0.5"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-YJx5ygHx0ZYPmw3xFGjPRx8nR20D+XR9SMxE2ymuWes="; + sha256 = "sha256-eNAoLcQWnsTDA7sG8i0Ur9BZ+pNt4AK1GOppFCD1ZGg="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 3667414e9296d..a696ab5412808 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2024-06-29"; + version = "0-unstable-2024-09-08"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "0d3eff693f23929e8b53317b08df9da2d610994f"; - hash = "sha256-c5HMxFxDD439kKguW8Mwkjmnavh2MSSiODTgrnZcbjo="; + rev = "8db448f67710194d64211ac467ffd2d456854432"; + hash = "sha256-SM62ymN5HXRiyXayoWQaGXLCGEDbHcKMJdPLXDv5dv8="; }; nativeBuildInputs = [ @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; env.NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shopt -s extglob mkdir -p $out/{share/treesheets,bin} mv $out/!(share) $out/share/treesheets diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 9681c5fc9b8a4..13a291f458042 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -96,4 +96,4 @@ let }; in - if stdenv.isDarwin then darwin else linux + if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 55d43623bc7ad..bc66a8b458a63 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -19,22 +19,23 @@ python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "7.2.4"; - - disabled = !python3Packages.isPy3k; + version = "7.2.5"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LYebXgAvIG3pUF7GpRjeQvP6S83yPjPO/lZg9r0X+Kc="; + hash = "sha256-U6hA6TuIMDTFAZUic60A5IKr/LKxKZEgiTIhkLlTJSw="; }; + build-system = [ python3Packages.setuptools ]; + nativeBuildInputs = [ pkg-config gobject-introspection wrapGAppsHook3 ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ python-dateutil pygobject3 goocalendar @@ -55,8 +56,16 @@ python3Packages.buildPythonApplication rec { pango ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + strictDeps = false; + pythonImportsCheck = [ "tryton" ]; + doCheck = false; meta = with lib; { diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 3647d8ea8e22f..c3b2aaf42a071 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "OBJDIR=$TMP/wg-build" ]; - preBuild = lib.optionalString stdenv.isLinux '' + preBuild = lib.optionalString stdenv.hostPlatform.isLinux '' makeFlagsArray+=('XFT_PACKAGE=--cflags={} --libs={-lX11 -lXft}') ''; @@ -38,17 +38,17 @@ stdenv.mkDerivation rec { ncurses readline zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libXft ]; # To be able to find <Xft.h> - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-I${libXft.dev}/include/X11"; # Binaries look for LuaFileSystem library (lfs.so) at runtime postInstall = '' wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; ''; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 0f4017dbbc07c..77eaaa16b9929 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -55,6 +55,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; mainProgram = "zim"; - broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 + broken = stdenv.hostPlatform.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 }; } diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 1a71c08c1f87b..7b9a22ff07215 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "7.0"; + version = "7.0.3"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-0CAiK8HY/udup51zB6I2o4jvOHvSJGm+5JehHk8F/Io="; + hash = "sha256-W5/j5ohrx/X0qlOiWWtB/FEF9aZCnbbAA3pcL8R6yy0="; }; dontPatchELF = true; diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index 02c4e74eb855b..abeb83c9271c3 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libpng libusb1 zlib - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # upstream mentions these are not needed for Mac # see: https://github.com/michaelrsweet/pappl#requirements avahi diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/applications/radio/abracadabra/default.nix index f1177fe5419ef..faede7f8d7f6d 100644 --- a/pkgs/applications/radio/abracadabra/default.nix +++ b/pkgs/applications/radio/abracadabra/default.nix @@ -1,18 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook -, qtbase, qtmultimedia, qttools -, faad2, mpg123, portaudio -, libusb1, rtl-sdr, airspy, soapysdr-with-plugins -} : +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + wrapQtAppsHook, + qtbase, + qtmultimedia, + qttools, + qtpositioning, + qtlocation, + faad2, + mpg123, + portaudio, + libusb1, + rtl-sdr, + airspy, + soapysdr-with-plugins, +}: stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-EaHVHfyhQTxxLtb3wsJV7Fea2jyENnfn6Lv/3GwAKdk="; + hash = "sha256-oO8ef2VTw/gVNNU2JRXtEHEkJm7X7dypjZr0vZXCfH8="; }; nativeBuildInputs = [ @@ -24,6 +38,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtmultimedia + qtlocation + qtpositioning faad2 mpg123 portaudio @@ -47,4 +63,3 @@ stdenv.mkDerivation rec { mainProgram = "AbracaDABra"; }; } - diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix index 6cb0f40f129a8..3c1fa511aef77 100644 --- a/pkgs/applications/radio/airspy/default.nix +++ b/pkgs/applications/radio/airspy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; cmakeFlags = - lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; + lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; meta = with lib; { homepage = "https://github.com/airspy/airspyone_host"; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix deleted file mode 100644 index 4734ad5efdf37..0000000000000 --- a/pkgs/applications/radio/chirp/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, fetchFromGitHub -, writeShellScript -, glib -, gsettings-desktop-schemas -, python3 -, unstableGitUpdater -, wrapGAppsHook3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "chirp"; - version = "0.4.0-unstable-2024-08-06"; - - src = fetchFromGitHub { - owner = "kk7ds"; - repo = "chirp"; - rev = "a8242df7d2bfc888604e26b9dc3e8ad111e02ee2"; - hash = "sha256-TpTlYRXB1hnpyQ8fL8DQ1mtLW64zDCvtDZXykahfq5U="; - }; - buildInputs = [ - glib - gsettings-desktop-schemas - ]; - nativeBuildInputs = [ - wrapGAppsHook3 - ]; - propagatedBuildInputs = with python3.pkgs; [ - future - pyserial - requests - six - suds - wxpython - yattag - ]; - - # "running build_ext" fails with no output - doCheck = false; - - passthru.updateScript = unstableGitUpdater { - tagConverter = writeShellScript "chirp-tag-converter.sh" '' - sed -e 's/^release_//g' -e 's/_/./g' - ''; - }; - - meta = with lib; { - description = "Free, open-source tool for programming your amateur radio"; - homepage = "https://chirp.danplanet.com/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ emantor wrmilling ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/applications/radio/csdr/default.nix index af05cb61e8362..65bbdbb05dac5 100644 --- a/pkgs/applications/radio/csdr/default.nix +++ b/pkgs/applications/radio/csdr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libsamplerate ]; - hardeningDisable = lib.optional stdenv.isAarch64 "format"; + hardeningDisable = lib.optional stdenv.hostPlatform.isAarch64 "format"; postFixup = '' substituteInPlace "$out"/lib/pkgconfig/csdr.pc \ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Simple DSP library and command-line tool for Software Defined Radio"; license = licenses.gpl3Only; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = teams.c3d2.members; }; } diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 839fc9ceaaa14..2677795dc0edf 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fftw hamlib liquid-dsp soapysdr-with-plugins wxGTK32 ] - ++ lib.optionals stdenv.isLinux [ libpulseaudio libGL libX11 ] - ++ lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio libGL libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa WebKit ]; cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix deleted file mode 100644 index 5ccce0a2dc369..0000000000000 --- a/pkgs/applications/radio/dablin/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, mpg123, SDL2, gtkmm3, faad2, pcre -} : - -stdenv.mkDerivation rec { - pname = "dablin"; - version = "1.16.0"; - - src = fetchFromGitHub { - owner = "Opendigitalradio"; - repo = "dablin"; - rev = version; - sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ faad2 mpg123 SDL2 gtkmm3 pcre ]; - - meta = with lib; { - description = "Play DAB/DAB+ from ETI-NI aligned stream"; - homepage = "https://github.com/Opendigitalradio/dablin"; - license = with licenses; [ gpl3 lgpl21 ]; - platforms = platforms.linux; - maintainers = [ maintainers.markuskowa ]; - }; -} - diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index e55f895d24af1..6cd591fcbda64 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = lib.optionals stdenv.isLinux [ alsa-lib udev ] - ++ lib.optionals stdenv.isDarwin [ portaudio ] + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ portaudio ] ++ lib.optionals gpsdSupport [ gpsd ] ++ lib.optionals hamlibSupport [ hamlib ] ++ lib.optionals extraScripts [ python3 perl espeak ]; diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 39c7f832e09f4..c34e18be8696f 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ncurses rtl-sdr soapysdr-with-plugins - ] ++ lib.optional stdenv.isLinux limesuite; + ] ++ lib.optional stdenv.hostPlatform.isLinux limesuite; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration -Wno-int-conversion -Wno-unknown-warning-option"; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 2390a4f8c0813..0a7edb7aed6ad 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { portaudio libsndfile libsamplerate - ] ++ lib.optionals (stdenv.isLinux) [ libpulseaudio alsa-lib udev ]; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libpulseaudio alsa-lib udev ]; env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14"; diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index ff2aedf6005ee..e45604856a59e 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorHash = "sha256-05LWJm4MoJqjJaFrBZvutKlqSTGl4dSp433AfHHO6LU="; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/kc2g-flex-tools/nDAX"; description = "FlexRadio digital audio transport (DAX) connector for PulseAudio"; license = licenses.mit; diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 27da63dd40221..d53f67031600f 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -16,7 +16,7 @@ , hamlib_4 , wxGTK32 , sioclient -, pulseSupport ? config.pulseaudio or stdenv.isLinux +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , AppKit , AVFoundation , Cocoa @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { hash = "sha256-oFuAH81mduiSQGIDgDDy1IPskqqCBmfWbpqQstUIw9g="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace-fail "-Wl,-ld_classic" "" substituteInPlace src/CMakeLists.txt \ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ macdylibbundler makeWrapper darwin.autoSignDarwinBinariesHook @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { wxGTK32 sioclient ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]) - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit AVFoundation Cocoa @@ -74,13 +74,13 @@ stdenv.mkDerivation rec { "-DUSE_PULSEAUDIO:BOOL=${if pulseSupport then "TRUE" else "FALSE"}" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DAPPLE_OLD_XCODE" ]); doCheck = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/FreeDV.app $out/Applications makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 67cc2d6c8ebf8..b611ef66b8250 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -150,8 +150,8 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] - ++ lib.optionals stdenv.isDarwin [ CoreAudio ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index e7efa57428b8b..f9113b0a23c39 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -170,8 +170,8 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] - ++ lib.optionals stdenv.isDarwin [ CoreAudio ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index fe75f6037f375..75a2a97e0d22f 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -88,7 +88,7 @@ in { remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) '' # Clang references in InstalledDir - + lib.optionalString (hasFeature "gnuradio-runtime" && stdenv.isDarwin) '' + + lib.optionalString (hasFeature "gnuradio-runtime" && stdenv.hostPlatform.isDarwin) '' remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) '' ; @@ -116,7 +116,7 @@ in { dontWrapQtApps = true; # On darwin, it requires playing with DYLD_FALLBACK_LIBRARY_PATH to make if # find libgnuradio-runtim.3.*.dylib . - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME=$(mktemp -d) export QT_QPA_PLATFORM=offscreen diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index f468aadb27b5d..4ffe42593ec5d 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -127,7 +127,7 @@ let unwrapped.qt.qtbase.qtPluginPrefix (builtins.map lib.getBin ([ unwrapped.qt.qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ unwrapped.qt.qtwayland ])) }" @@ -137,7 +137,7 @@ let unwrapped.qt.qtbase.qtQmlPrefix (builtins.map lib.getBin ([ unwrapped.qt.qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ unwrapped.qt.qtwayland ])) }" diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index d8d7bcd22d0a8..9190896d8e11a 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { gnuplot libusb1 soapysdr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ GLUT ] ++ lib.optionals withGui [ fltk diff --git a/pkgs/applications/radio/m17-cxx-demod/default.nix b/pkgs/applications/radio/m17-cxx-demod/default.nix index d6663fbc42876..47a7d103e76cc 100644 --- a/pkgs/applications/radio/m17-cxx-demod/default.nix +++ b/pkgs/applications/radio/m17-cxx-demod/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.c3d2.members; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index 70f3da3118c10..f71af7e648625 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-irKpVerxzjJIiLofoTdySk/PzojuVLgMq2DYF0qPaAM="; }; - buildInputs = lib.optionals stdenv.isLinux [ libpulseaudio libX11 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio libX11 ]; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/radio/pat/default.nix b/pkgs/applications/radio/pat/default.nix index 267be192f44f6..1f1140e5fd4b0 100644 --- a/pkgs/applications/radio/pat/default.nix +++ b/pkgs/applications/radio/pat/default.nix @@ -25,11 +25,11 @@ buildGoModule rec { installShellFiles ]; - buildInputs = lib.optional stdenv.isLinux [ libax25 ]; + buildInputs = lib.optional stdenv.hostPlatform.isLinux [ libax25 ]; # Needed by wl2k-go go module for libax25 to include support for Linux' AX.25 stack by linking against libax25. # ref: https://github.com/la5nta/wl2k-go/blob/abe3ae5bf6a2eec670a21672d461d1c3e1d4c2f3/transport/ax25/ax25.go#L11-L17 - tags = lib.optionals stdenv.isLinux [ "libax25" ]; + tags = lib.optionals stdenv.hostPlatform.isLinux [ "libax25" ]; postInstall = '' installManPage man/pat-configure.1 man/pat.1 diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index 2ebc0d30ff6c2..442828a763028 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -16,7 +16,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index b8df780214956..dacdfcbb2704c 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.37.2"; + version = "0.38.0"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-cphbM9dl+Ls2i3H5QjOugW0nXqa9bp5LpcnE9ACjqWM="; + hash = "sha256-C9kXntcCUaEl/S1ypZrU0ZPfaJbzg6/aXJSC+TREmhc="; fetchSubmodules = true; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { qtwebchannel hamlib qtkeychain - ] ++ (lib.optionals stdenv.isDarwin [ + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ cups ]); diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index ab413ca82e386..035f97fd19152 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -19,17 +19,18 @@ , speex , speexdsp , cppzmq +, uhd }: gnuradio3_8.pkgs.mkDerivation rec { pname = "qradiolink"; - version = "0.8.11-1"; + version = "0.9.0-1"; src = fetchFromGitHub { owner = "qradiolink"; repo = "qradiolink"; rev = version; - sha256 = "sha256-62+eKaLt9DlTebbnLPVJFx68bfWb7BrdQHocyJTfK28="; + sha256 = "sha256-Js6DzmUG8O9c9VvjE6hc7JGuFmgc1Wq41zVJb8Us/yI="; }; preBuild = '' @@ -67,6 +68,7 @@ gnuradio3_8.pkgs.mkDerivation rec { libsndfile cppzmq gnuradio3_8.qwt + uhd ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [ thrift gnuradio3_8.unwrapped.python.pkgs.thrift diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index e31c5ea369b0b..0eef85c992a13 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -8,11 +8,11 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.35"; + version = "4.2.38"; src = fetchPypi { inherit pname version; - hash = "sha256-2QCFUV7FpNiqGPHLXAMHJcnCn9FOk1mx12P9ZDtvVvg="; + hash = "sha256-IF7I+NgnqwU6c5R4caZslt7DJneI3fYk4KXl10dIsEw="; }; buildInputs = [ diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index f0bbba9b0a3ba..6cb25feb980b8 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -13,7 +13,7 @@ let nativeBuildInputs = [ pkg-config cmake ]; propagatedBuildInputs = [ libusb1 ]; - cmakeFlags = lib.optionals stdenv.isLinux [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=ON" "-DWITH_RPC=ON" ]; diff --git a/pkgs/applications/radio/sdr-j-fm/default.nix b/pkgs/applications/radio/sdr-j-fm/default.nix index 6c1dd5f4a0a1d..e77ce2d88eaac 100644 --- a/pkgs/applications/radio/sdr-j-fm/default.nix +++ b/pkgs/applications/radio/sdr-j-fm/default.nix @@ -6,7 +6,7 @@ wrapQtAppsHook, pkg-config, qtbase, - qwt, + qwt6_1, fftwFloat, libsamplerate, portaudio, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtbase - qwt + qwt6_1 fftwFloat libsamplerate portaudio diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix index 9d9ee298e09c0..d19ed4b027942 100644 --- a/pkgs/applications/radio/sdrplay/default.nix +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchurl, autoPatchelfHook, udev, libusb1 }: let arch = - if stdenv.isx86_64 then "x86_64" - else if stdenv.isi686 then "i686" - else if stdenv.isAarch64 then "aarch64" + if stdenv.hostPlatform.isx86_64 then "x86_64" + else if stdenv.hostPlatform.isi686 then "i686" + else if stdenv.hostPlatform.isAarch64 then "aarch64" else throw "unsupported architecture"; version = "3.07.1"; diff --git a/pkgs/applications/radio/sdrpp/default.nix b/pkgs/applications/radio/sdrpp/default.nix index 1ae5c028d28e8..151a967d943ff 100644 --- a/pkgs/applications/radio/sdrpp/default.nix +++ b/pkgs/applications/radio/sdrpp/default.nix @@ -8,12 +8,12 @@ , hackrf_source ? true, hackrf , limesdr_source ? true, limesuite , perseus_source ? false # needs libperseus-sdr, not yet available in nixpks -, plutosdr_source ? stdenv.isLinux, libiio, libad9361 +, plutosdr_source ? stdenv.hostPlatform.isLinux, libiio, libad9361 , rfspace_source ? true , rtl_sdr_source ? true, rtl-sdr-osmocom, libusb1 # osmocom better w/ rtlsdr v4 , rtl_tcp_source ? true , sdrplay_source ? false, sdrplay -, soapy_source ? true, soapysdr +, soapy_source ? true, soapysdr-with-plugins , spyserver_source ? true , usrp_source ? false, uhd, boost @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glfw glew fftwFloat volk zstd ] - ++ lib.optional stdenv.isDarwin AppKit - ++ lib.optional stdenv.isLinux libX11 + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit + ++ lib.optional stdenv.hostPlatform.isLinux libX11 ++ lib.optional airspy_source airspy ++ lib.optional airspyhf_source airspyhf ++ lib.optional bladerf_source libbladeRF @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ++ lib.optional limesdr_source limesuite ++ lib.optionals rtl_sdr_source [ rtl-sdr-osmocom libusb1 ] ++ lib.optional sdrplay_source sdrplay - ++ lib.optional soapy_source soapysdr + ++ lib.optional soapy_source soapysdr-with-plugins ++ lib.optionals plutosdr_source [ libiio libad9361 ] ++ lib.optionals usrp_source [ uhd boost ] ++ lib.optional audio_sink rtaudio diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index 289a20d281ccb..9d198ad15eb35 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ airspy soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix index 7434791b69f0b..86921754d6b64 100644 --- a/pkgs/applications/radio/soapyaudio/default.nix +++ b/pkgs/applications/radio/soapyaudio/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hamlib rtaudio libjack2 libusb1 soapysdr ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] - ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreAudio ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index 0f2b445b960e5..15c46507350c2 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbladeRF soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index be621c0d3135e..3f385a4b7255e 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hackrf soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index c6e7cddd0903c..4191b8ae95ceb 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-include sys/select.h" ]); + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-include sys/select.h" ]); meta = with lib; { homepage = "https://github.com/pothosware/SoapyRemote"; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 80ea41e4f950f..f0a5194a4a9e8 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rtl-sdr soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index 9220df3f5f946..de7b7be855ec6 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ uhd boost soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/splat/default.nix b/pkgs/applications/radio/splat/default.nix index 59d0fc1fdeb0e..1bf4e738c7138 100644 --- a/pkgs/applications/radio/splat/default.nix +++ b/pkgs/applications/radio/splat/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "SPLAT! is an RF Signal Propagation, Loss, And Terrain analysis tool for the electromagnetic spectrum between 20 MHz and 20 GHz"; license = licenses.gpl2Only; diff --git a/pkgs/applications/radio/ubertooth/default.nix b/pkgs/applications/radio/ubertooth/default.nix index 62e645fb6df81..2d8b9f857938d 100644 --- a/pkgs/applications/radio/ubertooth/default.nix +++ b/pkgs/applications/radio/ubertooth/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbtbb libpcap libusb1 bluez ]; - cmakeFlags = lib.optionals stdenv.isLinux [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=TRUE" "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DUDEV_RULES_GROUP=${udevGroup}" diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 947d7d48108d2..ce668c45300f6 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { # TODO: Check if this still needed # ABI differences GCC 7.1 # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1 - ] ++ optionals stdenv.isAarch32 [ + ] ++ optionals stdenv.hostPlatform.isAarch32 [ "-DCMAKE_CXX_FLAGS=-Wno-psabi" ]; @@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # many tests fails on darwin, according to ofborg - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # Build only the host software preConfigure = "cd host"; diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/applications/science/astronomy/calcmysky/default.nix index 9b7f50415ecde..2fe51ba98d925 100644 --- a/pkgs/applications/science/astronomy/calcmysky/default.nix +++ b/pkgs/applications/science/astronomy/calcmysky/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "calcmysky"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "10110111"; repo = "CalcMySky"; rev = "refs/tags/v${version}"; - hash = "sha256-AP6YkORbvH8PzF869s2OWbTwTfwMC+RLJx3V3BqVy88="; + hash = "sha256-18ZNnLK2zMT7P0MDXS6Z38LffE8EqXKBH89TPPxVWlo="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 5767efab733cb..eafc631ef92c1 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "apr24a"; - version = "20240401_a"; + srcVersion = "sep24a"; + version = "20240901_a"; pname = "gildas"; src = fetchurl { @@ -16,23 +16,23 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "sha256-Eq6S5S8xrhkCo6O2wUaHnoMDVG9WeiSurGvOc+2JKbM="; + sha256 = "sha256-dZ03J3I1dgoSgSc9yGfO13ZvNawCSYKN3+SGvp1eyGA="; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); patches = [ ./wrapper.patch ] - ++ lib.optionals stdenv.isDarwin ([ ./clang.patch ./cpp-darwin.patch ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin ([ ./clang.patch ./cpp-darwin.patch ]); env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; # Workaround for https://github.com/NixOS/nixpkgs/issues/304528 - env.GAG_CPP = lib.optionalString stdenv.isDarwin "${gfortran.outPath}/bin/cpp"; + env.GAG_CPP = lib.optionalString stdenv.hostPlatform.isDarwin "${gfortran.outPath}/bin/cpp"; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 467f478da96b3..7f0e0836d9ca2 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,17 +1,29 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool -, gtk3, glib, curl, goocanvas2, gpsd -, hamlib, wrapGAppsHook3 +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + pkg-config, + intltool, + autoreconfHook, + gtk3, + glib, + curl, + goocanvas2, + gpsd, + hamlib, + wrapGAppsHook3, }: -let - version = "2.2.1"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gpredict"; - inherit version; + version = "2.2.1"; - src = fetchurl { - url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2"; - sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; + src = fetchFromGitHub { + owner = "csete"; + repo = "gpredict"; + rev = "v${version}"; + hash = "sha256-+hgjImfT3nWMBYwde7+KC/hzd84pwQbpoJvaJSNG4E8="; }; patches = [ @@ -22,12 +34,32 @@ in stdenv.mkDerivation { url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch"; sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a"; }) + # Updates URLs for TLE files + # https://github.com/csete/gpredict/pull/305 + (fetchpatch { + name = "TLE-urls.patch"; + url = "https://github.com/csete/gpredict/commit/8f60f856921e8ee143cd6e2d34a9183778cb0fbf.patch"; + hash = "sha256-X/nKrqh5sjxDMLhA9LQek8AsJFqhvK/k8Ep3ug/0rMI="; + }) + ]; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; - buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; + nativeBuildInputs = [ + pkg-config + intltool + wrapGAppsHook3 + autoreconfHook + ]; + buildInputs = [ + curl + glib + gtk3 + goocanvas2 + gpsd + hamlib + ]; - meta = with lib; { + meta = { description = "Real time satellite tracking and orbit prediction"; mainProgram = "gpredict"; longDescription = '' @@ -37,9 +69,12 @@ in stdenv.mkDerivation { well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the NORAD Keplerian elements. ''; - license = licenses.gpl2Only; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; homepage = "http://gpredict.oz9aec.net/"; - maintainers = [ maintainers.markuskowa maintainers.cmcdragonkai ]; + maintainers = with lib.maintainers; [ + markuskowa + cmcdragonkai + ]; }; } diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 070ce96fd5771..b734ea9750dcc 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/gak/gravit"; description = "Beautiful OpenGL-based gravity simulator"; mainProgram = "gravit"; diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index 863c5b70e0211..5f9fe55b9b5f3 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kstars"; - version = "3.7.0"; + version = "3.7.2"; src = fetchurl { - url = "mirror://kde/stable/kstars/kstars-${finalAttrs.version}.tar.xz"; - hash = "sha256-yvN1k0LqUi5Odb34Nk8UP5qoIbFUcvUiyESpoMKmuqg="; + url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz"; + hash = "sha256-fEu3BGBW5cgrY38zBB3iL0/SRrobEtJVsGNWRNtT40s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 87118beec99f0..b97ac6cf97c25 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stellarium"; - version = "24.2"; + version = "24.3"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${finalAttrs.version}"; - hash = "sha256-tqyLwlf8hugixZSsFCZPTtchO3VXk3m/nX1kuDoLOAY="; + hash = "sha256-shDp2tCOynMiEuTSx4TEK8V9h3EsMDq+kkZFhldrinM="; }; patches = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' @@ -72,22 +72,22 @@ stdenv.mkDerivation (finalAttrs: { libnova exiv2 nlopt - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; preConfigure = '' export SOURCE_DATE_EPOCH=$(date -d 20${lib.versions.major finalAttrs.version}0101 +%s) - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export LC_ALL=en_US.UTF-8 ''; # fatal error: 'QtSerialPort/QSerialPortInfo' file not found - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-F${qtserialport}/lib"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${qtserialport}/lib"; dontWrapGApps = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/Stellarium.app/Contents/MacOS/Stellarium $out/bin/stellarium ''; diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index a4bb8c62f1c42..e2e33b5c5d589 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -1,30 +1,60 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libminc, bicpl, itk, fftwFloat, gsl }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + perl, + libminc, + bicpl, + itk_5_2, + fftwFloat, + gsl, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "EZminc"; - version = "unstable-2019-03-12"; + version = "2.2.00-unstable-2023-10-06"; src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "5e3333ee356f914d34d66d33ea8df809c7f7fa51"; - sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4"; + owner = "BIC-MNI"; + repo = "EZminc"; + rev = "5fdf112e837000d155891e423041d7065ea13c3f"; + hash = "sha256-0KdFIWRHnIHrau0ysGMVpg3oz01UdIvna1y2I4YEWJw="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ itk libminc bicpl fftwFloat gsl ]; + postPatch = '' + patchShebangs scripts/* + ''; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" - "-DEZMINC_BUILD_TOOLS=TRUE" - "-DEZMINC_BUILD_MRFSEG=TRUE" - "-DEZMINC_BUILD_DD=TRUE" ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - meta = with lib; { - homepage = "https://github.com/BIC-MNI/${pname}"; + buildInputs = [ + itk_5_2 + libminc + bicpl + fftwFloat + gsl + perl + ]; + + cmakeFlags = [ + "-DLIBMINC_DIR=${libminc}/lib/cmake" + "-DEZMINC_BUILD_TOOLS=TRUE" + "-DEZMINC_BUILD_MRFSEG=TRUE" + # "-DEZMINC_BUILD_DD=TRUE" # numerous compilation issues + ]; + + doCheck = false; # test programs/data exist but no actual test harness + + meta = { + homepage = "https://github.com/BIC-MNI/EZminc"; description = "Collection of Perl and shell scripts for processing MINC files"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.free; - broken = true; # ITK5 compatibility issue (https://github.com/BIC-MNI/EZminc/issues/15) + maintainers = with lib.maintainers; [ bcdarwin ]; + platforms = lib.platforms.linux; # can't detect opengl on Darwin + license = lib.licenses.free; }; -} +}) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 21dbf69407f21..b42eb791d27f5 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ itk vtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/applications/science/biology/bamtools/default.nix b/pkgs/applications/science/biology/bamtools/default.nix index 602254e2966ad..820459e00003b 100644 --- a/pkgs/applications/science/biology/bamtools/default.nix +++ b/pkgs/applications/science/biology/bamtools/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ API & command-line toolkit for working with BAM data"; mainProgram = "bamtools"; homepage = "https://github.com/pezmaster31/bamtools"; - changelog = "https://github.com/pezmaster31/bamtools/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/pezmaster31/bamtools/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index cafc952dec4c7..1e44835302385 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.20"; + version = "1.21"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-MSuDKd5RMN06N2eMcSlR5h5XcVV8cSmnCjJ6MA/ahiA="; + sha256 = "sha256-UopMwdNVU2jbdacAsio8ldqJP9GCf20wRxbf1F6k4oI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/blast/bin.nix b/pkgs/applications/science/biology/blast/bin.nix index 48537a568e4ba..1e3975f9f5ffa 100644 --- a/pkgs/applications/science/biology/blast/bin.nix +++ b/pkgs/applications/science/biology/blast/bin.nix @@ -35,9 +35,9 @@ in stdenv.mkDerivation { inherit pname version src; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = [ python3 perl ] ++ lib.optionals stdenv.isLinux [ zlib bzip2 glib libxml2 ]; + buildInputs = [ python3 perl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ zlib bzip2 glib libxml2 ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index 407d38970b0f8..791d6049ad6da 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { # perl is necessary in buildInputs so that installed perl scripts get patched # correctly buildInputs = [ coreutils perl gawk zlib bzip2 cpio ] - ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; hardeningDisable = [ "format" ]; postInstall = '' diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 576b46288c885..2a1358f2e5b77 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; license = licenses.gpl3Plus; homepage = "http://bowtie-bio.sf.net/bowtie2"; - changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; maintainers = with maintainers; [ rybern ]; platforms = platforms.all; mainProgram = "bowtie2"; diff --git a/pkgs/applications/science/biology/bwa-mem2/default.nix b/pkgs/applications/science/biology/bwa-mem2/default.nix index c339baf446d2d..0a2d2c8d20529 100644 --- a/pkgs/applications/science/biology/bwa-mem2/default.nix +++ b/pkgs/applications/science/biology/bwa-mem2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib ]; # see https://github.com/bwa-mem2/bwa-mem2/issues/93 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/memset_s/memset8_s/g' ext/safestringlib/include/safe_mem_lib.h sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset16_s.c sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset32_s.c diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index d7d23dd2d46ea..1263f8194c9f2 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString [ (lib.optionalString stdenv.cc.isGNU "-std=c++11") (lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing") - (lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite") + (lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dfinite=isfinite") ]; meta = with lib; { diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index 34ea942b4f5c7..f122b24d465f1 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -13,22 +13,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "delly"; - version = "1.2.6"; + version = "1.2.9"; src = fetchFromGitHub { owner = "dellytools"; repo = "delly"; rev = "v${finalAttrs.version}"; - hash = "sha256-OO5nnaIcfNAV8pc03Z8YS5kE96bFOrJXA9QTiLi7vPc="; + hash = "sha256-HeLqf/bUkZQJrW1LHl3XmecW3wS3QmjifoH34VNr3A4="; }; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace Makefile \ + --replace-fail "-std=c++17" "-std=c++14" + ''; + buildInputs = [ boost bzip2 htslib xz zlib - ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; makeFlags = [ "EBROOTHTSLIB=${htslib}" diff --git a/pkgs/applications/science/biology/dssp/default.nix b/pkgs/applications/science/biology/dssp/default.nix index 56eb023805a3e..680fc67ffcd14 100644 --- a/pkgs/applications/science/biology/dssp/default.nix +++ b/pkgs/applications/science/biology/dssp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Calculate the most likely secondary structure assignment given the 3D structure of a protein"; mainProgram = "mkdssp"; homepage = "https://github.com/PDB-REDO/dssp"; - changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/PDB-REDO/dssp/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = licenses.bsd2; maintainers = with maintainers; [ natsukium ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 0c74b65c98a26..e2502248a50ae 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { cp -Rv * $out/share/ sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igv.sh - sed -i 's#java#${jdk17}/bin/java#g' $out/share/igv.sh + sed -i 's#\bjava\b#${jdk17}/bin/java#g' $out/share/igv.sh sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igvtools - sed -i 's#java#${jdk17}/bin/java#g' $out/share/igvtools + sed -i 's#\bjava\b#${jdk17}/bin/java#g' $out/share/igvtools ln -s $out/share/igv.sh $out/bin/igv ln -s $out/share/igvtools $out/bin/igvtools diff --git a/pkgs/applications/science/biology/iqtree/default.nix b/pkgs/applications/science/biology/iqtree/default.nix index 60827b8e3a685..ce6218449a7e8 100644 --- a/pkgs/applications/science/biology/iqtree/default.nix +++ b/pkgs/applications/science/biology/iqtree/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "iqtree"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "iqtree"; repo = "iqtree2"; rev = "v${version}"; - hash = "sha256-ld+9vPJRVHMEe5/igqRr6RkISY2ipfGkJFHDOSZuAmg="; + hash = "sha256-8d5zqZIevv3bnq7z7Iyo/x8i445y1RAFtRMeK8s/ieQ="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { boost eigen zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index ba1b91298bb32..a4b408b14a012 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { break fi done - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so ''; diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index ce39ca8f425ac..88db9190465f2 100644 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ b/pkgs/applications/science/biology/jbrowse/default.nix @@ -2,11 +2,11 @@ let pname = "jbrowse"; - version = "2.13.1"; + version = "2.15.1"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-JxV7ZxA3/YMG6ziYOA8QiBVth9UunVGJLTy1E110y6w="; + sha256 = "sha256-/dpHUrigO0wnWay0jIkg6eG75ynrVXd7zcIAss6DhSs="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/science/biology/kalign/default.nix b/pkgs/applications/science/biology/kalign/default.nix index 55df8d875bbd5..4dc720290adce 100644 --- a/pkgs/applications/science/biology/kalign/default.nix +++ b/pkgs/applications/science/biology/kalign/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Fast multiple sequence alignment program"; mainProgram = "kalign"; homepage = "https://github.com/TimoLassmann/kalign"; - changelog = "https://github.com/TimoLassmann/kalign/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/TimoLassmann/kalign/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ natsukium ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix index 5eb6d40d030c8..a375df35dd3ee 100644 --- a/pkgs/applications/science/biology/kallisto/default.nix +++ b/pkgs/applications/science/biology/kallisto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kallisto"; - version = "0.51.0"; + version = "0.51.1"; src = fetchFromGitHub { repo = "kallisto"; owner = "pachterlab"; rev = "v${version}"; - sha256 = "sha256-+tnuka6uzoNr5pLuE2yV97KmqdThIG0IwiO+SCYiCk8="; + sha256 = "sha256-hfdeztEyHvuOnLS71oSv8sPqFe2UCX5KlANqrT/Gfx8="; }; nativeBuildInputs = [ autoconf cmake ]; diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 3812e9980cdfe..24b9a96019da6 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "4.2.2"; + version = "4.3"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - sha256 = "sha256-TlB7Hj4pVN4p4VanACWjQBeTxP9/DvRvdCdgelrXx60="; + hash = "sha256-Hgh1ianEdITRUIDKLiLW32kQlPlXKIfN4PSv3cOXTGI="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix index 53fc807776126..aceb010875d74 100644 --- a/pkgs/applications/science/biology/migrate/default.nix +++ b/pkgs/applications/science/biology/migrate/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Estimates population size, migration, population splitting parameters using genetic/genomic data"; homepage = "https://peterbeerli.com/migrate-html5/index.html"; license = licenses.mit; diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 3dece25915b47..d4b98fce87197 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -1,24 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat, - libminc, libjpeg, nifticlib, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + makeWrapper, + flex, + bison, + perl, + TextFormat, + libminc, + libjpeg, + nifticlib, + zlib, +}: stdenv.mkDerivation rec { - pname = "minc-tools"; - version = "unstable-2020-07-25"; + pname = "minc-tools"; + version = "2.3.06-unstable-2023-08-12"; src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "fb0a68a07d281e4e099c5d54df29925240de14c1"; - sha256 = "0zcv2sdj3k6k0xjqdq8j5bxq8smm48dzai90vwsmz8znmbbm6kvw"; + owner = "BIC-MNI"; + repo = pname; + rev = "c86a767dbb63aaa05ee981306fa09f6133bde427"; + hash = "sha256-PLNcuDU0ht1PcjloDhrPzpOpE42gbhPP3rfHtP7WnM4="; }; - nativeBuildInputs = [ cmake flex bison makeWrapper ]; - buildInputs = [ libminc libjpeg nifticlib zlib ]; - propagatedBuildInputs = [ perl TextFormat ]; + nativeBuildInputs = [ + cmake + flex + bison + makeWrapper + ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" - "-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti" - "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti" ]; + buildInputs = [ + libminc + libjpeg + nifticlib + zlib + ]; + + propagatedBuildInputs = [ + perl + TextFormat + ]; + + cmakeFlags = [ + "-DLIBMINC_DIR=${libminc}/lib/cmake" + "-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti" + "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti" + ]; postFixup = '' for prog in minccomplete minchistory mincpik; do @@ -31,6 +61,6 @@ stdenv.mkDerivation rec { description = "Command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = licenses.free; }; } diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index 5597b5504678d..1c523a909241a 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - makeFlags = lib.optionals stdenv.isAarch64 [ "arm_neon=1" "aarch64=1" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "arm_neon=1" "aarch64=1" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index 64eafa0f69686..e17aa3ca038c7 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/MRtrix3/mrtrix3"; description = "Suite of tools for diffusion imaging"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index cdcf6c7b50aa8..33a56d6e26d6d 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -1,10 +1,9 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, gccStdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { - pname = "muscle"; +gccStdenv.mkDerivation rec { + pname = "muscle"; version = "5.1.0"; - src = fetchFromGitHub { owner = "rcedgar"; repo = pname; @@ -14,15 +13,26 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; - installPhase = '' - install -m755 -D Linux/muscle $out/bin/muscle - ''; + patches = [ + ./muscle-darwin-g++.patch + ]; + + installPhase = + let + target = + if gccStdenv.hostPlatform.isDarwin + then "Darwin" + else "Linux"; + in + '' + install -m755 -D ${target}/muscle $out/bin/muscle + ''; meta = with lib; { description = "Multiple sequence alignment with top benchmark scores scalable to thousands of sequences"; mainProgram = "muscle"; - license = licenses.gpl3Plus; - homepage = "https://www.drive5.com/muscle/"; + license = licenses.gpl3Plus; + homepage = "https://www.drive5.com/muscle/"; maintainers = with maintainers; [ unode thyol ]; }; } diff --git a/pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch b/pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch new file mode 100644 index 0000000000000..41e5fc7ae476c --- /dev/null +++ b/pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch @@ -0,0 +1,15 @@ + +diff --git a/Makefile b/Makefile +index df16673..be3bd0d 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,9 +20,6 @@ OS := $(shell uname) + CPPFLAGS := $(CPPFLAGS) -DNDEBUG -pthread + + CXX := g++ +-ifeq ($(OS),Darwin) +- CXX := g++-11 +-endif + + CXXFLAGS := $(CXXFLAGS) -O3 -fopenmp -ffast-math + diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix index 96418346eeb9e..9714f015f71a4 100644 --- a/pkgs/applications/science/biology/nest/default.nix +++ b/pkgs/applications/science/biology/nest/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { python3 python3.pkgs.cython ] ++ lib.optional withMpi mpi - ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = with python3.pkgs; [ numpy diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index e54d3c9ba7a12..fe5de3c68fab5 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { flex git ] ++ optionals useCore [ perl gsl ] - ++ optionals stdenv.isDarwin [ xcbuild ]; + ++ optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = optionals useIv [ xorg.libX11.dev diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix index f415c9c39141d..53aa177307dfa 100644 --- a/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/pkgs/applications/science/biology/obitools/obitools3.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.cython cmake ]; - postPatch = lib.optionalString stdenv.isAarch64 '' + postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace setup.py \ --replace "'-msse2'," "" ''; diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index c593b5ed3d34c..1e21d18242bd2 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-P/oHaLxoQzjFuvmHyRdShHv1ayruy6O/I9w8aTyya2s="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D_POSIX_C_SOURCE"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_POSIX_C_SOURCE"; preBuild = '' cd ./src/ @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { longDescription = "PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc."; license = lib.licenses.gpl3Only; homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html"; - changelog = "https://github.com/abacus-gene/paml/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/abacus-gene/paml/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index b91655ac8fdac..b66bed97a94a5 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq"; }; - buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ blas lapack ]) ; + buildInputs = [ zlib ] ++ (if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ blas lapack ]) ; preBuild = '' sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Comprehensive update to the PLINK association analysis toolset"; mainProgram = "plink"; homepage = "https://www.cog-genomics.org/plink2"; diff --git a/pkgs/applications/science/biology/repseek/default.nix b/pkgs/applications/science/biology/repseek/default.nix index e5e0193f7911a..9b38171b34ef2 100644 --- a/pkgs/applications/science/biology/repseek/default.nix +++ b/pkgs/applications/science/biology/repseek/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile \ --replace "INSTALLDIR = \$\$HOME/bin" "INSTALLDIR = $out/bin/" \ --replace "CC= gcc" "CC = $CC" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Makefile --replace "MACHINE = MACOSX" "MACHINE = LINUX" ''; diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index c19556318843b..b6291ea852975 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { platforms = platforms.x86_64; homepage = "https://bioinfo.lifl.fr/RNA/sortmerna/"; maintainers = with maintainers; [ luispedro ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix index 62ea61af91926..d2ee518883b54 100644 --- a/pkgs/applications/science/biology/subread/default.nix +++ b/pkgs/applications/science/biology/subread/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configurePhase = '' cd src - cp Makefile.${if stdenv.isLinux then "Linux" else "MacOS"} Makefile + cp Makefile.${if stdenv.hostPlatform.isLinux then "Linux" else "MacOS"} Makefile ''; makeFlags = [ "CC_EXEC=cc" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "High-performance read alignment, quantification and mutation discovery"; license = licenses.gpl3; maintainers = with maintainers; [ jbedo ]; diff --git a/pkgs/applications/science/biology/svaba/default.nix b/pkgs/applications/science/biology/svaba/default.nix index fec5a5a3b92dc..cdb6c4f9c8aa4 100644 --- a/pkgs/applications/science/biology/svaba/default.nix +++ b/pkgs/applications/science/biology/svaba/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Structural variant and INDEL caller for DNA sequencing data, using genome-wide local assembly"; mainProgram = "svaba"; license = licenses.gpl3; diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/applications/science/biology/veryfasttree/default.nix index 6c054fecd7428..27c34f67d952a 100644 --- a/pkgs/applications/science/biology/veryfasttree/default.nix +++ b/pkgs/applications/science/biology/veryfasttree/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "veryfasttree"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "citiususc"; repo = "veryfasttree"; rev = "v${finalAttrs.version}"; - hash = "sha256-Sp331VJRaYv/BTwFj3HwUcUsWjYf6YEXWjYdOzDhBBA="; + hash = "sha256-S4FW91VEdTPOIwRamz62arLSN9inxoKXpKsen2ISXMo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/biology/whisper/default.nix b/pkgs/applications/science/biology/whisper/default.nix index a69b39f4e0898..6c8bb21df6a52 100644 --- a/pkgs/applications/science/biology/whisper/default.nix +++ b/pkgs/applications/science/biology/whisper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Short read sequence mapper"; license = licenses.gpl3; homepage = "https://github.com/refresh-bio/whisper"; diff --git a/pkgs/applications/science/chemistry/apbs/default.nix b/pkgs/applications/science/chemistry/apbs/default.nix index ec8f8e7ffbf61..766e4dcbd5575 100644 --- a/pkgs/applications/science/chemistry/apbs/default.nix +++ b/pkgs/applications/science/chemistry/apbs/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { suitesparse blas python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl libiconv ]; diff --git a/pkgs/applications/science/chemistry/autodock-vina/default.nix b/pkgs/applications/science/chemistry/autodock-vina/default.nix index d56b8a02a20d0..844fe5fea7ed5 100644 --- a/pkgs/applications/science/chemistry/autodock-vina/default.nix +++ b/pkgs/applications/science/chemistry/autodock-vina/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost' - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glibc.static ]; diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix deleted file mode 100644 index f12dfda5d2c12..0000000000000 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ /dev/null @@ -1,242 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, mpiCheckPhaseHook -, python3 -, gfortran -, blas -, lapack -, fftw -, libint -, libvori -, libxc -, dftd4 -, mctc-lib -, mstore -, multicharge -, mpi -, gsl -, scalapack -, openssh -, makeWrapper -, libxsmm -, spglib -, which -, pkg-config -, plumed -, zlib -, hdf5-fortran -, sirius -, libvdwxc -, spla -, spfft -, enableElpa ? false -, elpa -, cudaPackages -, rocmPackages -, config -, gpuBackend ? ( - if config.cudaSupport - then "cuda" - else if config.rocmSupport - then "rocm" - else "none" -) -# Change to a value suitable for your target GPU. -# For AMD values see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2v-rocmhip-support-for-amd-gpu -# and for Nvidia see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2i-cuda-optional-improved-performance-on-gpu-systems -, gpuVersion ? ( if gpuBackend == "cuda" then "A100" else "Mi100" ) -, gpuArch ? ( if gpuBackend == "cuda" then "sm_80" else "gfx908" ) -}: - -assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; - -let - cp2kVersion = "psmp"; - arch = "Linux-x86-64-gfortran"; - -in -stdenv.mkDerivation rec { - pname = "cp2k"; - version = "2024.2"; - - src = fetchFromGitHub { - owner = "cp2k"; - repo = "cp2k"; - rev = "v${version}"; - hash = "sha256-KXxqzapdPZggFlxX1rkNcxEYb2+aQIPFclFspxII7aE="; - fetchSubmodules = true; - }; - - patches = [ - # Remove the build command line from the source. - # This avoids dependencies to .dev inputs - ./remove-compiler-options.patch - ]; - - nativeBuildInputs = [ python3 which openssh makeWrapper pkg-config ] - ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc; - - buildInputs = [ - gfortran - fftw - gsl - libint - libvori - libxc - dftd4 - mctc-lib - mstore - multicharge - libxsmm - mpi - spglib - scalapack - blas - lapack - plumed - zlib - hdf5-fortran - sirius - spla - spfft - libvdwxc - ] - ++ lib.optional enableElpa elpa - ++ lib.optionals (gpuBackend == "cuda") [ - cudaPackages.cuda_cudart - cudaPackages.libcublas - cudaPackages.cuda_nvrtc - ] ++ lib.optionals (gpuBackend == "rocm") [ - rocmPackages.clr - rocmPackages.rocm-core - rocmPackages.hipblas - rocmPackages.hipfft - rocmPackages.rocblas - ] - ; - - propagatedBuildInputs = [ (lib.getBin mpi) ]; - propagatedUserEnvPkgs = [ mpi ]; - - makeFlags = [ - "ARCH=${arch}" - "VERSION=${cp2kVersion}" - ]; - - doCheck = gpuBackend == "none"; - - enableParallelBuilding = true; - - 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' - ''; - - configurePhase = '' - cat > arch/${arch}.${cp2kVersion} << EOF - CC = mpicc - CPP = - FC = mpif90 - LD = mpif90 - AR = ar -r - ${lib.strings.optionalString (gpuBackend == "cuda") '' - OFFLOAD_CC = nvcc - OFFLOAD_FLAGS = -O3 -g -w --std=c++11 -arch ${gpuArch} - OFFLOAD_TARGET = cuda - GPUVER = ${gpuVersion} - CXX = mpicxx - CXXFLAGS = -std=c++11 -fopenmp - ''} - ${lib.strings.optionalString (gpuBackend == "rocm") '' - GPUVER = ${gpuVersion} - OFFLOAD_CC = hipcc - OFFLOAD_FLAGS = -fopenmp -m64 -pthread -fPIC -D__GRID_HIP -O2 --offload-arch=${gpuArch} --rocm-path=${rocmPackages.rocm-core} - OFFLOAD_TARGET = hip - CXX = mpicxx - CXXFLAGS = -std=c++11 -fopenmp -D__HIP_PLATFORM_AMD__ - ''} - DFLAGS = -D__FFTW3 -D__LIBXC -D__LIBINT -D__parallel -D__SCALAPACK \ - -D__MPI_VERSION=3 -D__F2008 -D__LIBXSMM -D__SPGLIB \ - -D__MAX_CONTR=4 -D__LIBVORI ${lib.optionalString enableElpa "-D__ELPA"} \ - -D__PLUMED2 -D__HDF5 -D__GSL -D__SIRIUS -D__LIBVDWXC -D__SPFFT -D__SPLA \ - -D__DFTD4 \ - ${lib.strings.optionalString (gpuBackend == "cuda") "-D__OFFLOAD_CUDA -D__ACC -D__DBCSR_ACC -D__NO_OFFLOAD_PW"} \ - ${lib.strings.optionalString (gpuBackend == "rocm") "-D__OFFLOAD_HIP -D__DBCSR_ACC -D__NO_OFFLOAD_PW"} - CFLAGS = -fopenmp - FCFLAGS = \$(DFLAGS) -O2 -ffree-form -ffree-line-length-none \ - -ftree-vectorize -funroll-loops -msse2 \ - -std=f2008 \ - -fopenmp -ftree-vectorize -funroll-loops \ - ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} \ - -I${lib.getDev libint}/include \ - -I${lib.getDev sirius}/include/sirius \ - -I${lib.getDev libxc}/include \ - -I${lib.getDev dftd4}/include/dftd4 \ - -I${lib.getDev libxsmm}/include \ - -I${lib.getDev hdf5-fortran}/include \ - -fallow-argument-mismatch - LIBS = -lfftw3 -lfftw3_threads \ - -lscalapack -lblas -llapack \ - -lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \ - -lint2 -lstdc++ -lvori \ - -lgomp -lpthread -lm \ - -fopenmp ${lib.optionalString enableElpa "$(pkg-config --libs elpa)"} \ - -lz -ldl ${lib.optionalString (mpi.pname == "openmpi") "$(mpicxx --showme:link)"} \ - -lplumed -lhdf5_fortran -lhdf5_hl -lhdf5 -lgsl -lsirius -lspla -lspfft -lvdwxc \ - -ldftd4 -lmstore -lmulticharge -lmctc-lib \ - ${lib.strings.optionalString (gpuBackend == "cuda") '' - -L${cudaPackages.cuda_cudart}/lib/stubs/ \ - -lcudart -lnvrtc -lcuda -lcublas - '' - } \ - ${lib.strings.optionalString (gpuBackend == "rocm") "-lamdhip64 -lhipfft -lhipblas -lrocblas"} - LDFLAGS = \$(FCFLAGS) \$(LIBS) - include ${plumed}/lib/plumed/src/lib/Plumed.inc - EOF - ''; - - nativeCheckInputs = [ - mpiCheckPhaseHook - openssh - ]; - - checkPhase = '' - runHook preCheck - - export CP2K_DATA_DIR=data - mpirun -np 2 exe/${arch}/libcp2k_unittest.${cp2kVersion} - - runHook postCheck - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/cp2k - - cp exe/${arch}/* $out/bin - rm $out/bin/*_unittest.* - - for i in cp2k cp2k_shell graph; do - wrapProgram $out/bin/$i.${cp2kVersion} \ - --set-default CP2K_DATA_DIR $out/share/cp2k - done - - wrapProgram $out/bin/cp2k.popt \ - --set-default CP2K_DATA_DIR $out/share/cp2k \ - --set OMP_NUM_THREADS 1 - - cp -r data/* $out/share/cp2k - ''; - - passthru = { inherit mpi; }; - - meta = with lib; { - description = "Quantum chemistry and solid state physics program"; - homepage = "https://www.cp2k.org"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.sheepforce ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/science/chemistry/element/default.nix b/pkgs/applications/science/chemistry/element/default.nix index cc80cb058d92c..dc03eac51028d 100644 --- a/pkgs/applications/science/chemistry/element/default.nix +++ b/pkgs/applications/science/chemistry/element/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { homepage = "https://github.com/gennaro-tedesco/element"; license = licenses.asl20; maintainers = [ maintainers.j0hax ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/science/chemistry/ergoscf/default.nix b/pkgs/applications/science/chemistry/ergoscf/default.nix index 3ee33cf19b746..ceaeb3336427d 100644 --- a/pkgs/applications/science/chemistry/ergoscf/default.nix +++ b/pkgs/applications/science/chemistry/ergoscf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-linalgebra-templates" "--enable-performance" - ] ++ lib.optional stdenv.isx86_64 "--enable-sse-intrinsics"; + ] ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-intrinsics"; LDFLAGS = "-lblas -llapack"; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 9e64ee7afe4db..c7440e3fad81e 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -11,7 +11,7 @@ zlibSupport ? true, zlib, libuniqueSupport ? true, libunique, libpngSupport ? true, libpng, - openglSupport ? !stdenv.isDarwin, libGL + openglSupport ? !stdenv.hostPlatform.isDarwin, libGL }: stdenv.mkDerivation rec { @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; maintainers = [ ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix index 44ce15229017e..fb24f903f5224 100644 --- a/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -164,6 +164,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/nwchem cp $NWCHEM_TOP/bin/LINUX64/nwchem $out/bin/nwchem @@ -186,6 +188,8 @@ stdenv.mkDerivation rec { charmm_s $out/share/nwchem/data/charmm_s/ charmm_x $out/share/nwchem/data/charmm_x/ EOF + + runHook postInstall ''; doCheck = false; diff --git a/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix index ae6c0df879056..0ec45053bf67c 100644 --- a/pkgs/applications/science/chemistry/wxmacmolplt/default.nix +++ b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix @@ -7,6 +7,7 @@ , pkg-config , xorg , autoreconfHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { hash = "sha256-gFGstyq9bMmBaIS4QE6N3EIC9GxRvyJYUr8DUvwRQBc="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook4 ]; buildInputs = [ wxGTK32 libGL diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix index c60ee224aa2a4..41597cb02945f 100644 --- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "QtRVSim"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "cvut"; repo = "qtrvsim"; rev = "refs/tags/v${version}"; - sha256 = "sha256-SelmqHauj5Yxg043NZqR4bhqW5clwg1h7UD8mW7j7vE="; + sha256 = "sha256-+EpPDA2+mBTdQjq6i9TN11yeXqvJA28JtmdNihM1a/U="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/applications/science/computer-architecture/timeloop/default.nix index 7fc5da8dfa89a..3a70478262d55 100644 --- a/pkgs/applications/science/computer-architecture/timeloop/default.nix +++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { yaml-cpp ncurses accelergy - ] ++ lib.optionals stdenv.isLinux [ gpm ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ]; preConfigure = '' cp -r ./pat-public/src/pat ./src/pat @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { substituteInPlace ./SConstruct \ --replace-fail "env.Replace(AR = \"gcc-ar\")" "pass" \ --replace-fail "env.Replace(RANLIB = \"gcc-ranlib\")" "pass" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # prevent clang from dying on errors that gcc is fine with substituteInPlace ./src/SConscript --replace "-Werror" "-Wno-inconsistent-missing-override" @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { sconsFlags = # will fail on clang/darwin on link without --static due to undefined extern # however, will fail with static on linux as nixpkgs deps aren't static - lib.optional stdenv.isDarwin "--static" + lib.optional stdenv.hostPlatform.isDarwin "--static" ++ lib.optional enableAccelergy "--accelergy" ++ lib.optional enableISL "--with-isl"; diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix index 7619e43e80332..a929b962481b0 100644 --- a/pkgs/applications/science/electronics/digital/default.nix +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -5,8 +5,8 @@ let pname = "digital"; pkgDescription = "A digital logic designer and circuit simulator."; - version = "0.30"; - buildDate = "2023-02-03T08:00:56+01:00"; # v0.30 commit date + version = "0.31"; + buildDate = "2024-09-03T14:02:31+02:00"; # v0.31 commit date desktopItem = makeDesktopItem { type = "Application"; @@ -35,7 +35,7 @@ maven.buildMavenPackage rec { owner = "hneemann"; repo = "Digital"; rev = "v${version}"; - hash = "sha256-cDykYlcFvDLFBy9UnX07iCR2LCq28SNU+h9vRT/AoJM="; + hash = "sha256-6XaM3U1x/yvoCrkJ2nMtBmj972gCFlWn3F4DM7TLWgw="; }; inherit mvnParameters; @@ -71,7 +71,7 @@ maven.buildMavenPackage rec { description = pkgDescription; mainProgram = "digital"; license = licenses.gpl3Only; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.all; maintainers = with maintainers; [ Dettorer ]; }; } diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 5d6c83f5dfaa1..48a94468ef0b2 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ boost fftw qtbase qtsvg libusb1 libzip python3 - ] ++ lib.optional stdenv.isLinux qtwayland; + ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; meta = with lib; { description = "GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; diff --git a/pkgs/applications/science/electronics/flopoco/default.nix b/pkgs/applications/science/electronics/flopoco/default.nix index e15ef3277a664..ef6f297c63ccc 100644 --- a/pkgs/applications/science/electronics/flopoco/default.nix +++ b/pkgs/applications/science/electronics/flopoco/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' sed -i "s/-pg//g" {,src/Apps/TaMaDi/}CMakeLists.txt ''; diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 9eb7b50445020..04ca24861c0d8 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { quazip libngspice clipper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; @@ -93,7 +93,7 @@ stdenv.mkDerivation { "phoenix.pro" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/Fritzing.app $out/Applications/Fritzing.app cp FritzingInfo.plist $out/Applications/Fritzing.app/Contents/Info.plist diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index d28a5cf809065..5649b6bb5a77f 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ] - ++ lib.optional stdenv.isDarwin gtk-mac-integration; + ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; # fix compilation under Darwin # remove these patches upon next release diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index c193352eb4559..acf52931c7ed7 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -38,7 +38,7 @@ let hash = "sha256-adU5SctH+H54UaAmr5BZInytD3wjUzLtQbCwngAWs4o="; }) ]; - postPatch = prev.postPatch + lib.optionalString stdenv.isAarch64 '' + postPatch = prev.postPatch + lib.optionalString stdenv.hostPlatform.isAarch64 '' # https://github.com/igraph/igraph/issues/1694 substituteInPlace tests/CMakeLists.txt \ --replace "igraph_scg_grouping3" "" \ @@ -136,7 +136,7 @@ in stdenv.mkDerivation rec { cmakeBuildType = "MinSizeRel"; # some plugins depend on other plugins and need to be able to load them - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' find $out/lib/hal_plugins -name '*.so*' | while read -r f ; do patchelf --set-rpath "$(patchelf --print-rpath "$f"):$out/lib/hal_plugins" "$f" done diff --git a/pkgs/applications/science/electronics/horizon-eda/base.nix b/pkgs/applications/science/electronics/horizon-eda/base.nix index 0292ee493a829..d39fc83823a23 100644 --- a/pkgs/applications/science/electronics/horizon-eda/base.nix +++ b/pkgs/applications/science/electronics/horizon-eda/base.nix @@ -1,4 +1,5 @@ { lib +, cmake , cppzmq , curl , fetchFromGitHub @@ -9,6 +10,8 @@ , libgit2 , librsvg , libuuid +, meson +, ninja , opencascade-occt_7_6 , pkg-config , podofo @@ -20,16 +23,19 @@ in # This base is used in horizon-eda and python3Packages.horizon-eda rec { pname = "horizon-eda"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - hash = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8="; + hash = "sha256-0ikCR10r/WPb+H+Ut2GO6y4A/9bctJLanL/RR4r9GWs="; }; nativeBuildInputs = [ + meson + ninja + cmake pkg-config ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index b5f721c3d772d..3d39261bc7a52 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -39,7 +39,7 @@ , pcre2 , libdeflate -, swig4 +, swig , python , wxPython , opencascade-occt_7_6 @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { ] # wanted by configuration on linux, doesn't seem to affect performance # no effect on closure size - ++ optionals (stdenv.isLinux) [ + ++ optionals (stdenv.hostPlatform.isLinux) [ util-linux libselinux libsepol @@ -168,7 +168,7 @@ stdenv.mkDerivation rec { curl openssl boost - swig4 + swig python unixODBC libdeflate diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 4dd8fa743121b..a5cceb492522e 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -22,7 +22,7 @@ , pname ? "kicad" , stable ? true , testing ? false -, withNgspice ? !stdenv.isDarwin +, withNgspice ? !stdenv.hostPlatform.isDarwin , libngspice , withScripting ? true , python3 @@ -234,7 +234,7 @@ stdenv.mkDerivation rec { # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? installPhase = let - bin = if stdenv.isDarwin then "*.app/Contents/MacOS" else "bin"; + bin = if stdenv.hostPlatform.isDarwin then "*.app/Contents/MacOS" else "bin"; tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad-cli" ]; in @@ -286,7 +286,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ evils ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "kicad"; }; } diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index 327f77d1c42fa..4a3e40a3166d2 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -1,6 +1,5 @@ { lib, stdenv , cmake -, gettext , libSrc , stepreduce , parallel diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 3d66c909036e5..b76db0040088d 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "8.0.4"; + version = "8.0.5"; src = { - rev = "5609722002776982320b6a8fbe6d096bbccf469b"; - sha256 = "03971przr1kzmkr302qzx30mmp92mkwg29dwjvzayc522iskxcbx"; + rev = "1413b8bfab256aa09ae3f23027b9ffe278161ca6"; + sha256 = "1g0w3g1gq6p72gg0jikdrh5mczcv5y16jmqi79bkp6nfl8gbx4l5"; }; }; libVersion = { - version = "8.0.4"; + version = "8.0.5"; libSources = { - symbols.rev = "967a2828636d21f90ccc28dcfdc0e48508101c9d"; - symbols.sha256 = "1s8mkxb3ncb0w8z5q8jzhryb0yri7g51vx29qykqwv4ksra1f07i"; - templates.rev = "9c51a73b2e2fc4ea75d8b8be0a78bc9fb1785433"; + symbols.rev = "3bd95a02b135941ba00e5e4671e7c3ebc7672db4"; + symbols.sha256 = "12v8g48fgbalp0xrlgn3vm3ld79ymmwccv5aib6jz2qycdjxmznf"; + templates.rev = "4644b7570ba73dfe03a06a674c98d3fe2a7fe1e4"; templates.sha256 = "03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza"; - footprints.rev = "a2aa9b5aea64c0efad9a31bc9ca88d48c0203752"; - footprints.sha256 = "1aqdb7mamz8xzz1qrw3qnvnaj97asb8z37w1cjz6y06sjcznlihn"; - packages3d.rev = "5430edd57b3a66fe69288aa8fda714f9732a7f52"; - packages3d.sha256 = "0vixdcldvnl8lr8bq3rc748q3vhx1lr2a0i071w914xyn983z9vz"; + footprints.rev = "4d2be8bf917b9c31f0510fa953532b88ef8b8be8"; + footprints.sha256 = "0ixfiraahi09gvszzxsdz21mdr9wsxyby5qp3n57pzid42gs35a1"; + packages3d.rev = "2f3ea516116cc553c9d488424fbb196f4e65ef29"; + packages3d.sha256 = "03yicqv36zx0wrb0njpkk45l4ysvv3dlsjlpi4j8j75gla060mai"; }; }; }; diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index d4c3c68991a22..1f483034d2b19 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { qt6.qtbase ]; - buildInputs = lib.optional stdenv.isLinux qt6.qtwayland; + buildInputs = lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland; propagatedBuildInputs = with python3.pkgs; [ cython diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index f0d49ac11f028..0c557fbeca3e1 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.13.3"; + version = "1.14.0"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-u+EmZ+h+TVBHEmrELgU4s1C+Z8Cfp3gN9BnQruwCsYU="; + hash = "sha256-xaJt3zMAv+Op7cQAaKJOyI28oEssMw/7zvEnfReS4aw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix index 60ee6cef77530..a3a906c25c2b4 100644 --- a/pkgs/applications/science/electronics/openboardview/default.nix +++ b/pkgs/applications/science/electronics/openboardview/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config python3 wrapGAppsHook3 ]; - buildInputs = [ SDL2 fontconfig gtk3 ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ SDL2 fontconfig gtk3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; @@ -53,10 +53,10 @@ stdenv.mkDerivation rec { ]; dontWrapGApps = true; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" mv "$out/openboardview.app" "$out/Applications/OpenBoardView.app" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapGApp "$out/bin/${pname}" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]} ''; diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index 0c929fe47c18e..65bf094c2a2c1 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -8,7 +8,7 @@ , flex , git , python3 -, swig4 +, swig , boost179 , cbc # for clp , cimg @@ -51,7 +51,7 @@ mkDerivation rec { flex git pkg-config - swig4 + swig ]; buildInputs = [ diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index b6d40a19a14bd..3a40b107817db 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pkg-config qttools wrapQtAppsHook - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ glib @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { pcre python3 qtsvg - ] ++ lib.optionals stdenv.isLinux [ bluez ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; meta = with lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; diff --git a/pkgs/applications/science/electronics/sv-lang/default.nix b/pkgs/applications/science/electronics/sv-lang/default.nix index 58ecf986cf7a2..928cf3059385e 100644 --- a/pkgs/applications/science/electronics/sv-lang/default.nix +++ b/pkgs/applications/science/electronics/sv-lang/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { # TODO: a mysterious linker error occurs when building the unittests on darwin. # The error occurs when using catch2_3 in nixpkgs, not when fetching catch2_3 using CMake - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "SystemVerilog compiler and language services"; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index f20ce5e0acd09..03883652e6378 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, tcl, tk, libX11, glibc, which, bison, flex, imake, xorgproto, gccmakedep }: let - libiconvInc = lib.optionalString stdenv.isLinux "${glibc.dev}/include"; - libiconvLib = lib.optionalString stdenv.isLinux "${glibc.out}/lib"; + libiconvInc = lib.optionalString stdenv.hostPlatform.isLinux "${glibc.dev}/include"; + libiconvLib = lib.optionalString stdenv.hostPlatform.isLinux "${glibc.out}/lib"; in stdenv.mkDerivation rec { pname = "tkgate"; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 1bed876157569..b7f2abd37ba75 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { # cmake ]; - doCheck = stdenv.isLinux; # darwin tests are broken for now... + doCheck = stdenv.hostPlatform.isLinux; # darwin tests are broken for now... checkTarget = "test"; preConfigure = "autoconf"; diff --git a/pkgs/applications/science/electronics/xschem/default.nix b/pkgs/applications/science/electronics/xschem/default.nix index 826181139c194..72f4687f5c85e 100644 --- a/pkgs/applications/science/electronics/xschem/default.nix +++ b/pkgs/applications/science/electronics/xschem/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Schematic capture and netlisting EDA tool"; longDescription = '' Xschem is a schematic capture program, it allows creation of diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix index 85cdafb660575..56fc59c080994 100644 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ b/pkgs/applications/science/electronics/xyce/default.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "High-performance analog circuit simulator"; longDescription = '' Xyce is a SPICE-compatible, high-performance analog circuit simulator, diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 03787a3a084b1..2f58141c3281b 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,11 +2,11 @@ let pname = "alt-ergo"; - version = "2.5.4"; + version = "2.6.0"; src = fetchurl { url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; - hash = "sha256-AsHok5i62vqJ5hK8XRiD8hM6JQaFv3dMxZAcVYEim6w="; + hash = "sha256-EmkxGvJSeKRmiSuoeMyIi6WfF39T3QPxKixiOwP8834="; }; in @@ -14,7 +14,17 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; inherit version src; buildInputs = with ocamlPackages; [ ppx_blob ]; - propagatedBuildInputs = with ocamlPackages; [ camlzip dolmen_loop dune-build-info fmt ocplib-simplex seq stdlib-shims zarith ]; + propagatedBuildInputs = with ocamlPackages; [ + camlzip + dolmen_loop + dune-build-info + fmt + ocplib-simplex + ppx_deriving + seq + stdlib-shims + zarith + ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { @@ -28,8 +38,18 @@ ocamlPackages.buildDunePackage { inherit pname version src; - nativeBuildInputs = [ ocamlPackages.menhir ] ++ lib.optionals stdenv.isDarwin [ darwin.sigtool ]; - buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ]); + nativeBuildInputs = [ ocamlPackages.menhir ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; + propagatedBuildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ppxlib ]); + + outputs = [ "bin" "out" ]; + + installPhase = '' + runHook preInstall + dune install --prefix $bin ${pname} + mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib + mv $bin/lib/alt-ergo $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/ + runHook postInstall + ''; meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 1fd6bf7dc5431..30e3cf5002114 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ python3 ]; doCheck = true; preCheck = - let var = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + let var = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in # tests modelgen and modelgensmt2 spawn boolector in another processes and # macOS strips DYLD_LIBRARY_PATH, hardcode it for testing - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' cp -r bin bin.back install_name_tool -change libboolector.dylib $(pwd)/lib/libboolector.dylib bin/boolector '' + '' @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { patchShebangs .. ''; - postCheck = lib.optionalString stdenv.isDarwin '' + postCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' rm -rf bin mv bin.back bin ''; diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix index 5aca699f9d3db..19bb53fb766b0 100644 --- a/pkgs/applications/science/logic/btor2tools/default.nix +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0ncl4xwms8d656x95ga8v8zjybx4cmdl5hlcml7dpcgm3p8qj4ks"; }; - nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; installPhase = '' mkdir -p $out $dev/include/btor2parser/ $lib/lib @@ -21,11 +21,24 @@ stdenv.mkDerivation rec { cp -v lib/libbtor2parser.* $lib/lib ''; + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + # make sure shared libraries are present and program can be executed + $out/bin/btorsim -h > /dev/null + + runHook postInstallCheck + ''; + outputs = [ "out" "dev" "lib" ]; cmakeFlags = [ # RPATH of binary /nix/store/.../bin/btorsim contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ]; meta = with lib; { diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index c980e84f9d9f6..0bfb512737582 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jiegec ]; platforms = platforms.unix; # error: no member named 'aligned_alloc' in the global namespace - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 25531c6a33af0..c45ee7190e77f 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -5,7 +5,7 @@ # - The exact version can be specified through the `version` argument to # the derivation; it defaults to the latest stable version. -{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 +{ lib, stdenv, fetchzip, fetchurl, writeText, pkg-config, gnumake42 , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12 , ocamlPackages_4_14 @@ -58,11 +58,11 @@ let "8.19.0".sha256 = "sha256-ixsYCvCXpBHqJ71hLQklphlwoOO3i/6w2PJjllKqf9k="; "8.19.1".sha256 = "sha256-kmZ8Uk8jpzjOd67aAPp3C+vU2oNaBw9pr7+Uixcgg94="; "8.19.2".sha256 = "sha256-q+i07JsMZp83Gqav6v1jxsgPLN7sPvp5/oszVnavmz0="; - "8.20+rc1".sha256 = "sha256-OLGPMvvA3hc42zdgWSOnOkN0/WwzBpneUcUVRNcNVms="; + "8.20.0".sha256 = "sha256-WFpZlA6CzFVAruPhWcHQI7VOBVhrGLdFzWrHW0DTSl0="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix - { inherit lib stdenv fetchzip; } + { inherit lib stdenv fetchzip fetchurl; } { inherit release releaseRev; location = { owner = "coq"; repo = "coq";}; } args.version; version = fetched.version; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 2dc12b7ab7234..c44b495f2caef 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ gmp git python3.pkgs.toml readline swig libantlr3c antlr3_4 boost jdk python3 ] - ++ lib.optionals (!stdenv.isDarwin) [ cln ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ cln ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" "--with-readline" "--with-boost=${boost.dev}" - ] ++ lib.optionals (!stdenv.isDarwin) [ "--with-cln" ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "--with-cln" ]; prePatch = '' patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat diff --git a/pkgs/applications/science/logic/dafny/default.nix b/pkgs/applications/science/logic/dafny/default.nix index 93ae5c92b32fe..3f97765e6c180 100644 --- a/pkgs/applications/science/logic/dafny/default.nix +++ b/pkgs/applications/science/logic/dafny/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "Dafny"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; rev = "v${version}"; - hash = "sha256-XoSk08TVv17YyuTsRJ25e6bwSwKIF2+HjF5nFaul8+M="; + hash = "sha256-x/fX4o+R72Pl02u1Zsr80Rh/4Wb/aKw90fhAGmsfFUI="; }; postPatch = diff --git a/pkgs/applications/science/logic/dafny/deps.nix b/pkgs/applications/science/logic/dafny/deps.nix index 0c96fca4ec539..95924b788dc9a 100644 --- a/pkgs/applications/science/logic/dafny/deps.nix +++ b/pkgs/applications/science/logic/dafny/deps.nix @@ -2,181 +2,174 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Boogie"; version = "3.1.3"; sha256 = "0xzc7s0rjb8dhdkdf71g6pdsnyhbl534xpwd8gbx6g16a87iqx6i"; }) - (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.1.6"; sha256 = "1c6z13dz0sbkmk4ay64aihy7s7xlfdvhpcknxhw1m1b0yly5qj6b"; }) - (fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.1.6"; sha256 = "1hxcpc45f32g3jpaw7mg6k9qsppcb3p20wxv4d4dc3nz0r52lrmr"; }) - (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.1.6"; sha256 = "1qk7w7c40fpkvvarbgi1bkdcxpn12r0lqngpwwjw8i7nk84ni5gl"; }) - (fetchNuGet { pname = "Boogie.Concurrency"; version = "3.1.6"; sha256 = "11981gfa0n4s214yilnxqhh1clr4l78iqlws6gv01z1n6rxgbyla"; }) - (fetchNuGet { pname = "Boogie.Core"; version = "3.1.6"; sha256 = "0sgj6i1hvp90g2zfqs1aly500xnv3fq9d4cfgii5kpza8vgm7w4g"; }) - (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.1.6"; sha256 = "08vxxwcnkykcngihkp0bvfwkgwxb3nnqjp5f1vz4bnw708xs0ydg"; }) - (fetchNuGet { pname = "Boogie.Graph"; version = "3.1.6"; sha256 = "0fzj65pnky8i83jj2h9nszij25a46z68fy2sm3pxwlg678nmx2jz"; }) - (fetchNuGet { pname = "Boogie.Houdini"; version = "3.1.6"; sha256 = "0lfljb9brnr79hp1f0ff6fcy51ml66pjj102jk4pqpmsjwvcjx43"; }) - (fetchNuGet { pname = "Boogie.Model"; version = "3.1.6"; sha256 = "0546b27mxv97v7qilb1carbwip0q7sz9zz7sxizpww6yc3j8w8if"; }) - (fetchNuGet { pname = "Boogie.Provers.LeanAuto"; version = "3.1.6"; sha256 = "1x1f35g0kxzhxvw4icmbvkik16py47j6h04gj0ckwbny9qmglaby"; }) - (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.1.6"; sha256 = "0mqlpwfxgv9dd773254rrbgbjb5mpa3xkvlq32ml752h36j8m2r9"; }) - (fetchNuGet { pname = "Boogie.VCExpr"; version = "3.1.6"; sha256 = "0p7axpjn4qg191bs7b33zf9l336bdznvxp3305z2ssnkakjx247h"; }) - (fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.1.6"; sha256 = "05z2lr92hbllikv65gh7m3i879fnn6pjn2acf133sijx9b1jixdb"; }) - (fetchNuGet { pname = "CocoR"; version = "2014.12.24"; sha256 = "0ps8h7aawkcc1910qnh13llzb01pvgsjmg862pxp0p4wca2dn7a2"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.1.0"; sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; }) - (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.7.0"; sha256 = "0882492nx6x68b0pkh3q5xaawz0b2l5x35r40722ignyjnvjydph"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.7.0"; sha256 = "0adw6rcag8wxydzyiyhls2mxaqkay5qlz25z1fxrlv5qnchqn0n5"; }) - (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.4"; sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "5.0.0"; sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "5.0.0"; sha256 = "084hnz5l0vr15ay23rksqipslqnz3pp30w9hsirpx1iqdm5688mc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "5.0.0"; sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "5.0.0"; sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.4"; sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "5.0.0"; sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "5.0.0"; sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "5.0.0"; sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.Extensions.TrxLogger"; version = "17.9.0"; sha256 = "0wn38vj9i4gjw5zsl4wcivpqrmp1h5n6m1zxcfwj7yjn9hf45rz9"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.81"; sha256 = "06wihcaga8537ibh0mkj28m720m6vzkqk562zkynhca85nd236yi"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.5"; sha256 = "0ilcv3cxcvjkd8ngiydi69pzll07rhqdv5nq9yjnhyj142ynw2cb"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.5"; sha256 = "1mac4yx29ld8fyirg7n0vqn81hzdvcrl8w0l9w5xhnnm6bcd42v8"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.5"; sha256 = "1clgrbw6dlh46iiiqhavwh15xqar41az352mb5r4ln8ql3wnmk1i"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.5"; sha256 = "0cvxmc0r4ajnaah7lsppik61qickq7i0df4jwqaj6c6axiizhqlm"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.5"; sha256 = "0cczmmsmn3pj74wpasgfhjay1a817sd0zgzgqvvnckxxzq3n463h"; }) - (fetchNuGet { pname = "RangeTree"; version = "3.0.1"; sha256 = "19si88v2r0rc7kai1avwhigcvh3x3c916vrvqlyb59sn4f27pbm2"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; }) - (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; }) - (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "3.1.0"; sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; }) - (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.0"; sha256 = "1gik4sn9jsi1wcy1pyyp0r4sn2g17cwrsh24b2d52vif8p2h24zx"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) - (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.3"; sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "4.4.1"; sha256 = "0gx8jh3hny2y5kijz5k9pxiqw481d013787c04zlhps21ygklw4a"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.Caching"; version = "6.0.0"; sha256 = "0wh98a77cby4i3h2mar241k01105x661kh03vlyd399shxkfk60a"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.6.0"; sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.6.0"; sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "4.7.1"; sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) - (fetchNuGet { pname = "Tomlyn"; version = "0.16.2"; sha256 = "1i928q6a7l65mk7wj2vvfclyvxamdjxg4dbj3g6g95inrfgvidah"; }) + (fetchNuGet { pname = "Boogie"; version = "3.1.3"; hash = "sha256-0XQcD1ImPNPXQ43fTkahC3qr2zUvHNdmgw0tmYE+7Hc="; }) + (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.2.3"; hash = "sha256-SwJ5D3tOU+qcyQdNITIM15ujMEC++aXHOsUSovWbsC4="; }) + (fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.2.3"; hash = "sha256-cIUdpGGjMKn70Z0nD8rvva8UbFSoLDUrBprC+TMG/EA="; }) + (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.2.3"; hash = "sha256-L+phJ66oHNINliPkabU3vO4Vl9Lkv+nug+DWC8VmFlc="; }) + (fetchNuGet { pname = "Boogie.Concurrency"; version = "3.2.3"; hash = "sha256-w+5B+uyfKCf8j8hP0G/SSPUd2lT2T8A4Lkg0tsxniBg="; }) + (fetchNuGet { pname = "Boogie.Core"; version = "3.2.3"; hash = "sha256-qqoeLAdpRRaTISdgxyE3iFqhrmezxISaE5bm02rXVyE="; }) + (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.2.3"; hash = "sha256-8EKwiBnoMFGxeK2+IuG5p6BtnPlR0CCekXi4PBFLEbU="; }) + (fetchNuGet { pname = "Boogie.Graph"; version = "3.2.3"; hash = "sha256-7XjrCHSnvEL7eMmma2vKA7r8YGJe8Oo4E8U9Wja/al0="; }) + (fetchNuGet { pname = "Boogie.Houdini"; version = "3.2.3"; hash = "sha256-g7i0yF/89IWXElTi0onOgvPaesqlPGl3qINMCePHGA8="; }) + (fetchNuGet { pname = "Boogie.Model"; version = "3.2.3"; hash = "sha256-gRMZQQFMjQEQasg3A3iZ9/0KUWCxAoUPiHPZHbWXUs4="; }) + (fetchNuGet { pname = "Boogie.Provers.LeanAuto"; version = "3.2.3"; hash = "sha256-kMLvTTnvKWjggSby7D4jkaRmdvvOum0ZlfM6yU2760Q="; }) + (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.2.3"; hash = "sha256-SCfEJCRueTE66ZZbHX8FHpD50SrBDQne8725uiKjbvM="; }) + (fetchNuGet { pname = "Boogie.VCExpr"; version = "3.2.3"; hash = "sha256-U6Rc5P0dUtNZ1IGDBU4hggwreVxSZqu6cZSKcWLpq/o="; }) + (fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.2.3"; hash = "sha256-snbFiueD508B1GLqIC8cQdT9jW2jkRyhmYxPTlfnyrQ="; }) + (fetchNuGet { pname = "CocoR"; version = "2014.12.25"; hash = "sha256-qxTcnqh7jziriMHwos5/YArRYUG2+3nNoYYmFyPo8E0="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.1.0"; hash = "sha256-64Vc/jHHG5tzaQrmlaU3y7+9qj3jT1V5vRr1R3uH9h4="; }) + (fetchNuGet { pname = "MediatR"; version = "8.1.0"; hash = "sha256-dyqhDG1NJjY1b+dj37sMmklGkxAm3zKdhh2lBJ0/HTM="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.4"; hash = "sha256-Eu3aY2f4gZWQLJHdVV98tu5Rn1uQ8f9UKQumGomlv7k="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; hash = "sha256-SSemrjaokMnzOF8ynrgEV6xEh4TlesUE7waW2BLuWns="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "5.0.0"; hash = "sha256-N3yQnqcwAKISG6HS8ZC3PFpBMK+xCTkZpOBtgOnfqQY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; hash = "sha256-jveXZPNvx30uWT3q80OA1YaSb4K/KGOhlyun97IXn8Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; hash = "sha256-0+ywPdqMkx32+HcMHqAp00cWBE7aCNc09Xh2eRObHTs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; hash = "sha256-7GVLiJupIL3BS5XgB44M95TxzF4KwvVUsShko+pqO98="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "5.0.0"; hash = "sha256-rCJkSm04hn5z1DBxMO4d32Kqb8R65iG8KiFvQMu3kCA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "5.0.0"; hash = "sha256-41soBkRr6fPO7KYnXb+462KyXd23YZ0gT7WyPnISAvM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "5.0.0"; hash = "sha256-6Xp3Snr9/aNHPszduVdvPnSBoh40KRpuvnvJNRCJBUM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; hash = "sha256-+KqiuV8ncy9b1xhtDExh4s4U57tKxqx4pAyr6d//EQU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; hash = "sha256-RN478YJQE0YM0g+JztXp00w57CIF4bb48hSD/z3jTZc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; hash = "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; hash = "sha256-0sfuxZ07HsMZJpKatDrW6I671uJBYWsUgAyoDZA2n50="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.4"; hash = "sha256-qcu4Lwd+aqFwBjOYJ37duL5bXkCz/d6pev+uyOgOMRA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "5.0.0"; hash = "sha256-QWpl951Ns5Zu4w2GAhcB1qVCmcCaUZEz8198sUB7UAU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "5.0.0"; hash = "sha256-7Wt0iaQnbFt12MczXHCh8apzJcyAykRFmNcoRAKKcQM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "5.0.0"; hash = "sha256-q145xaBUpweu7GvPKn0b2rJgOU5eMIZPoABKv3ayplI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; hash = "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; hash = "sha256-IyJiQk0xhESWjr231L7MsbFvFbphP6T8VwlKgVGgQeE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; hash = "sha256-jJtcchUS8Spt/GddcDtWa4lN1RAVQ2sxDnu1cgwa6vs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; hash = "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; hash = "sha256-Xq2JIa2Rg9vnLnZ75k4ydyT4j2A+G6UUx6iDc959teU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; hash = "sha256-lD4xwvlLRLdJ2WdaHWGpEIRWOtWcvbr4ccD8v2QeTMc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; hash = "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; hash = "sha256-pj1BdHlmYm5HZifp/yB3lwDkdw0/jcIF0vYg6O1kmGs="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; hash = "sha256-ocB+U+mMvi/xVwII7bGsIfAqSXiKVSnEMLHCODLJaK4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.Extensions.TrxLogger"; version = "17.9.0"; hash = "sha256-6edCHExW+iO5Y/2HamyB4daM746ME6p/4fKRmORGw3I="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; hash = "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; hash = "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; hash = "sha256-V2HB/0j+I/3iUT7mEVyeF11P/61cSpYcZQa1LnXuoI8="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; hash = "sha256-4lsL6hg1mposZ62buQWBud1B4raV8Pl+BkyvM4FraRM="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; hash = "sha256-/NWbGyad7wejY8QyxK8YWTgiRiUGjimaBgoLkWxOCao="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; hash = "sha256-Wrj0Sc9srH5+ma0lCbgRYYP6gKgnlXcL6h7j7AU6nkQ="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.81"; hash = "sha256-0Zshmi1IMWj9/MKUieffpgJxKhJyVgBXPKMg9RSDkRs="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; hash = "sha256-YhlAbGfwoxQzxb3Hef4iyV9eGdPQJJNd2GgSR0jsBJ0="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.5"; hash = "sha256-iwluvSBBemilT9iW3TDMB1D6bzKx+fgsalNu1tnYjEY="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.5"; hash = "sha256-aAvS2DLVWtgLTxRwRDPb7cOALN7Anpejd6jRJLonTNU="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.5"; hash = "sha256-Mcxq+aAYWUpyWVWU8VUgWeFeAuRbQRxjNATSZvjKj7I="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.5"; hash = "sha256-lWL4Y+zKMCMV5pK4BuLBk0UczIz3anqgUlYqkgGrfTM="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.5"; hash = "sha256-cBhiB/69T2b3xu+/D5o+AanglYTuaXU5OfIOW3WtnzE="; }) + (fetchNuGet { pname = "RangeTree"; version = "3.0.1"; hash = "sha256-oq57hCNWp7I8xTtvExIbfcDNXoR8qxDVPCyDLDZCUac="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "Serilog"; version = "2.12.0"; hash = "sha256-JD+ud+CFoLGdYGasTWKTxx5PYj2W5pBv2lMybBK7HVM="; }) + (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; hash = "sha256-KtHMMnepmEpOlHrIGlUkK6Vq1L0iBBnFGavbUtvxOBk="; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "3.1.0"; hash = "sha256-ZU0eb88tVMRKrfz9ewcmtCmWFqZeVLdeGGMcYElVRbI="; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.0"; hash = "sha256-/RMBxUUublGaWERAnTk74QmrSQbX+xs84yFqmawmM74="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.3"; hash = "sha256-nis1vH2bdwxvbKm00PYvGzIbmCwX9U5AbJFOU3oqVzY="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; hash = "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; hash = "sha256-l3h3cF1cCC9zMhWLKSDnZBZvFADUd0Afe2+iAwBA0r0="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reactive"; version = "4.4.1"; hash = "sha256-inA6nw9CX0g/AeygMwJoARGOY79pli/jLF54CweUqD8="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.Caching"; version = "6.0.0"; hash = "sha256-CpjpZoc6pdE83QPAGYzpBYQAZiAiqyrgiMQvdo5CCXI="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; hash = "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; hash = "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.6.0"; hash = "sha256-rspJ63MbjNVDve0owXby0Pu2vHjQvR2uuhCDCJ9vgfI="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.6.0"; hash = "sha256-lZeXm45RboVgqnPQVJ65y8b5b+9FSVr0MBciG777rso="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "4.7.1"; hash = "sha256-IkMmQnF9QfV+9EScPEwHypcK0+HTPu6K1J9fH3P2Dg0="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; hash = "sha256-8TglbC6KBHlDeSfgr6d5dGn7wu8td4XERl2JUyo0+Tw="; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; }) + (fetchNuGet { pname = "Tomlyn"; version = "0.16.2"; hash = "sha256-ULW4n8s2lvTMG3I18rpsVfXtKXN7C8nPrMXQowxGIsU="; }) ] diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index 782d15d615599..faf3dc75167f1 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3, python3 }: +{ lib, stdenv, darwin, fetchFromGitHub, ocamlPackages, why3, python3 }: stdenv.mkDerivation rec { pname = "easycrypt"; - version = "2024.01"; + version = "2024.09"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "r${version}"; - hash = "sha256-UYDoVMi5TtYxgPq5nkp/oRtcMcHl2p7KAG8ptvuOL5U="; + hash = "sha256-ZGYklG1eXfytRKzFvRSB6jFrOCm1gjyG8W78eMve5Ng="; }; nativeBuildInputs = with ocamlPackages; [ @@ -17,10 +17,12 @@ stdenv.mkDerivation rec { menhir ocaml python3.pkgs.wrapPython - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.sigtool; + buildInputs = with ocamlPackages; [ batteries dune-build-info + dune-site inifiles why3 yojson @@ -32,7 +34,7 @@ stdenv.mkDerivation rec { strictDeps = true; postPatch = '' - substituteInPlace dune-project --replace '(name easycrypt)' '(name easycrypt)(version ${version})' + substituteInPlace dune-project --replace-fail '(name easycrypt)' '(name easycrypt)(version ${version})' ''; pythonPath = with python3.pkgs; [ pyyaml ]; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index d43ae16a647e5..04c5f746f647a 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -19,11 +19,11 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; buildInputs = [ curl zlib openssl ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; buildFeatures = [ "no-self-update" ]; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals stdenv.hostPlatform.isLinux [ # Run patchelf on the downloaded binaries. # This is necessary because Lean 4 is now dynamically linked. (runCommand "0001-dynamically-patchelf-binaries.patch" { diff --git a/pkgs/applications/science/logic/formula/default.nix b/pkgs/applications/science/logic/formula/default.nix index 20267e6071c56..bfaf2489bdf77 100644 --- a/pkgs/applications/science/logic/formula/default.nix +++ b/pkgs/applications/science/logic/formula/default.nix @@ -14,9 +14,9 @@ buildDotnetModule rec { nugetDeps = ./nuget.nix; projectFile = "Src/CommandLine/CommandLine.csproj"; - postFixup = if stdenv.isLinux then '' + postFixup = if stdenv.hostPlatform.isLinux then '' mv $out/bin/CommandLine $out/bin/formula - '' else lib.optionalString stdenv.isDarwin '' + '' else lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \ --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index f23dce326dd57..883eb4331c9fa 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Interactive theorem prover based on Higher-Order Logic"; longDescription = '' HOL4 is the latest version of the HOL interactive proof diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index 0cd5e90cbb504..d97eb42b4027f 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { __darwinAllowLocalNetworking = true; # tests are broken on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index f0bd2ba777db9..4df1d6eb8aab5 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs ."; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace $out/bin/leanpkg \ --replace "greadlink" "${coreutils}/bin/readlink" ''; diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index e30b8af047350..83cada9e309ab 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice gebner ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "lean"; }; } diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 3e5398e2b7849..cc05d0dbd33b6 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.9.0"; + version = "4.10.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${finalAttrs.version}"; - hash = "sha256-wi7outnKpz60to6Z7MSGAKK6COxmpJo6iu6Re86jqlo="; + hash = "sha256-lNWr84aeVpI/p/oxkNAUlUMUROGGzHAkb2D9q8BzHeA="; }; postPatch = '' @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; + version = "v${finalAttrs.version}"; }; }; diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 3d86c8cafdbc2..465360a202385 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { makeBinaryWrapper copyDesktopItems unzip - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index d278f1e784687..951d5b22deef0 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { makeBinaryWrapper copyDesktopItems unzip - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index c26e5f2e761f6..a0cbdabc5a452 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Toolset for model-checking concurrent systems and protocols"; longDescription = '' A formal specification language with an associated toolset, diff --git a/pkgs/applications/science/logic/nuXmv/default.nix b/pkgs/applications/science/logic/nuXmv/default.nix index ad40902e92808..5726796bfa189 100644 --- a/pkgs/applications/science/logic/nuXmv/default.nix +++ b/pkgs/applications/science/logic/nuXmv/default.nix @@ -5,21 +5,21 @@ stdenv.mkDerivation rec { version = "2.0.0"; src = fetchurl { - url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-${if stdenv.isDarwin then "macosx64" else "linux64"}.tar.gz"; - sha256 = if stdenv.isDarwin + url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-${if stdenv.hostPlatform.isDarwin then "macosx64" else "linux64"}.tar.gz"; + sha256 = if stdenv.hostPlatform.isDarwin then "sha256-48I+FhJUUam1nMCMMM47CwGO82BYsNz0eHDHXBfqO2E=" else "sha256-Gf+QgAjTrysZj7qTtt1wcQPganDtO0YtRY4ykhLPzVo="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ gmp ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ gmp ]; installPhase= '' runHook preInstall install -Dm755 -t $out/bin ./bin/nuXmv runHook postInstall ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' wrapProgram $out/bin/nuXmv --prefix DYLD_LIBRARY_PATH : ${gmp}/lib ''; diff --git a/pkgs/applications/science/logic/nusmv/default.nix b/pkgs/applications/science/logic/nusmv/default.nix index d7ecbc7cd8874..058949083caf0 100644 --- a/pkgs/applications/science/logic/nusmv/default.nix +++ b/pkgs/applications/science/logic/nusmv/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "New symbolic model checker for the analysis of synchronous finite-state and infinite-state systems"; - homepage = "https://nuxmv.fbk.eu/pmwiki.php"; + homepage = "https://nusmv.fbk.eu/"; maintainers = with maintainers; [ mgttlinger ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix index 2290ff29224b4..798643acc1bba 100644 --- a/pkgs/applications/science/logic/open-wbo/default.nix +++ b/pkgs/applications/science/logic/open-wbo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "State-of-the-art MaxSAT and Pseudo-Boolean solver"; mainProgram = "open-wbo"; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 1a031e8d1e1dd..0ebbbc663caab 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Satisfiability modulo theory (SMT) solver"; mainProgram = "opensmt"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 1fef05069a696..23fc2776ba813 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configurePhase = "./configure.sh --shared --trace"; - makeFlags = lib.optional stdenv.isDarwin + makeFlags = lib.optional stdenv.hostPlatform.isDarwin "SONAME=-Wl,-install_name,$(out)/lib/libpicosat.so"; installPhase = '' diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index bd3e9d3e8351e..0f7d05a8823ee 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; # error: invalid suffix on literal; C++11 requires a space between literal and identifier - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-reserved-user-defined-literal"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-reserved-user-defined-literal"; installPhase = '' mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax" @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { cp -r coq* "$out/lib/satallax/" ''; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' runHook preCheck diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 2aa92118b03a7..e621b36a773bb 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -108,7 +108,7 @@ mkDerivation (common "tamarin-prover" src // { executableToolDepends = [ makeWrapper which maude graphviz ]; postInstall = '' wrapProgram $out/bin/tamarin-prover \ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \ '' + '' --prefix PATH : ${lib.makeBinPath [ which maude graphviz ]} diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index a1f5ec65a3be3..9515bda467cfd 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "verifast"; - version = "21.04"; + version = "24.08.30"; src = fetchurl { url = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz"; - sha256 = "sha256-PlRsf4wFXoM+E+60SbeKzs/RZK0HNVirX47AnI6NeYM="; + sha256 = "sha256-hIS5e+zVlxSOqr1/ZDy0PangyWjB9uLCvN8Qr688msg="; }; dontConfigure = true; diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index ba95bc2239ab2..f1159f3c06875 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "sha256-ZOmc83OZVHIt/Sq6KQWuG4/xyeaETL8qJmmSjGcqL60="; + sha256 = "sha256-326iDxQ1t9iih2JVRO07C41V5DtkUzwkcNHCz5kLHT8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 9dbbe8455d1b2..ca495dcc280ac 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index b6fa984e7d5b0..2b3bd2776089d 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { gfortran.cc.lib lapack openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index b6fac3cca9e5a..f2825e13568a8 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre2 perl readline (texliveSmall.withPackages (ps: with ps; [ inconsolata helvetic ps.texinfo fancyvrb cm-super rsfs ])) xz zlib less texinfo graphviz icu bison imake which blas lapack curl tcl tk jdk tzdata - ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { # Test of the examples for package 'tcltk' fails in Darwin sandbox. See: # https://github.com/NixOS/nixpkgs/issues/146131 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ --replace "-install_name libRblas.dylib" "-install_name $out/lib/R/lib/libRblas.dylib" \ --replace "-install_name libRlapack.dylib" "-install_name $out/lib/R/lib/libRlapack.dylib" \ @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { RANLIB=$(type -p ranlib) r_cv_have_curl728=yes R_SHELL="${stdenv.shell}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' --disable-R-framework --without-x OBJC="clang" diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 0f36c4783df78..f82cef9d881cb 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -73,14 +73,14 @@ stdenv.mkDerivation rec { ++ lib.optional ncclSupport nccl ++ lib.optionals leveldbSupport [ leveldb snappy ] ++ lib.optionals pythonSupport [ python numpy ] - ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo ] ; propagatedBuildInputs = lib.optionals pythonSupport ( # requirements.txt let pp = python.pkgs; in ([ pp.numpy pp.scipy pp.scikit-image pp.h5py - pp.matplotlib pp.ipython pp.networkx pp.nose + pp.matplotlib pp.ipython pp.networkx pp.pandas pp.python-dateutil pp.protobuf pp.gflags pp.pyyaml pp.pillow pp.six ] ++ lib.optional leveldbSupport pp.leveldb) diff --git a/pkgs/applications/science/math/cemu-ti/default.nix b/pkgs/applications/science/math/cemu-ti/default.nix index c8d5bea6f602e..547b57b312dbf 100644 --- a/pkgs/applications/science/math/cemu-ti/default.nix +++ b/pkgs/applications/science/math/cemu-ti/default.nix @@ -1,39 +1,39 @@ { stdenv , lib , fetchFromGitHub -, qmake +, cmake , pkg-config -, wrapQtAppsHook +, qt6 , libarchive , libpng }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "CEmu"; - version = "unstable-2022-06-29"; + version = "2.0"; src = fetchFromGitHub { owner = "CE-Programming"; repo = "CEmu"; - rev = "880d391ba9f8b7b2ec36ab9b45a34e9ecbf744e9"; - hash = "sha256-aFwGZJceh1jEP8cEajY5wYlSaFuNhYvSoZ/E1QDfJEI="; + rev = "v${finalAttrs.version}"; + hash = "sha256-fohsIJrvPDMmYHoPbmYQlKLMnj/B3XEBaerZYuqxvd8="; fetchSubmodules = true; }; + sourceRoot = "${finalAttrs.src.name}/gui/qt/"; + + nativeBuildInputs = [ - qmake - wrapQtAppsHook + cmake + qt6.wrapQtAppsHook pkg-config ]; buildInputs = [ + qt6.qtbase libarchive libpng ]; - qmakeFlags = [ - "gui/qt" - ]; - meta = with lib; { description = "Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features"; mainProgram = "CEmu"; @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ luc65r ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix index 768366cc5d7a5..591ac3281e5e8 100644 --- a/pkgs/applications/science/math/colpack/default.nix +++ b/pkgs/applications/science/math/colpack/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ - "--enable-openmp=${if stdenv.isLinux then "yes" else "no"}" + "--enable-openmp=${if stdenv.hostPlatform.isLinux then "yes" else "no"}" "--enable-examples=no" ]; diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix index 222db0e98e6a5..ed1c07d87ec1a 100644 --- a/pkgs/applications/science/math/ecm/default.nix +++ b/pkgs/applications/science/math/ecm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; # See https://trac.sagemath.org/ticket/19233 - configureFlags = lib.optional stdenv.isDarwin "--disable-asm-redc"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--disable-asm-redc"; buildInputs = [ m4 gmp ]; diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index 00b69e03f1b82..8a3ff56e1f6b9 100644 --- a/pkgs/applications/science/math/eigenmath/default.nix +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "3.27-unstable-2024-08-24"; + version = "3.27-unstable-2024-09-15"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "92ae1a3f9c9f6808f3faefa10ae66c0ff480dab2"; - hash = "sha256-AHZ9p7yyYENHywNppsSTfaM3KFqpX5ehxfjPwocHv5Q="; + rev = "ba00d77289f1c9ce64108b1bbcee02c71ce48633"; + hash = "sha256-yFzsMNVjQK64uQSfjQKC8LbdQu7/97hDolRMBc4Womc="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 7a466f8c000c5..697a19d6afa19 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch , fetchurl , makeWrapper , readline @@ -73,6 +74,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZyMIdF63iiIklO6N1nhu3VvDMUVvzGRWrAZL2yjVh6g="; }; + patches = [ + (fetchpatch { + url = "https://github.com/gap-system/gap/commit/c786e229413a44b7462196716b99ae9bb0071f4c.patch"; + hash = "sha256-g3jrEMSavHAUKlHoPqWmOw49hWHU+29SA788Klnr0Uw="; + }) + ]; + # remove all non-essential packages (which take up a lot of space) preConfigure = lib.optionalString (!keepAll) (removeNonWhitelistedPkgs packagesToKeep) + '' patchShebangs . diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 5fa4862bb9b40..1d5fa4a9ef450 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -95,6 +95,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwinPkg else linuxPkg diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 40169a72e4a6f..d57175daff93e 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -97,4 +97,4 @@ let }; }; in -if stdenv.isDarwin then darwinPkg else linuxPkg +if stdenv.hostPlatform.isDarwin then darwinPkg else linuxPkg diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index ee1fce783d265..531a30e3f857f 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, gmp, mpir, cddlib}: +{lib, stdenv, fetchpatch, fetchurl, gmp, mpir, cddlib}: stdenv.mkDerivation rec { pname = "gfan"; version = "0.6.2"; @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { patches = [ ./gfan-0.6.2-cddlib-prefix.patch + ] ++ lib.optionals (stdenv.cc.isClang) [ + (fetchpatch { + name = "clang-fix-miscompilation.patch"; + url = "https://raw.githubusercontent.com/sagemath/sage/eea1f59394a5066e9acd8ae39a90302820914ee3/build/pkgs/gfan/patches/nodel.patch"; + sha256 = "sha256-RrncSgFyrBIk/Bwe3accxiJ2rpOSJKQ84cV/uBvQsDc="; + }) ]; postPatch = lib.optionalString stdenv.cc.isClang '' diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 834ae7b3d61f3..ce009975c1ba1 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -9,18 +9,30 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; - version = "1.9.0-43"; # TODO try to remove preCheck phase on upgrade + version = "1.9.0-993"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; - sha256 = "sha256-466jB8ZRqHkU5XCY+j0Fh7Dq/mMaOu10rHECKbtNGrs="; + sha256 = "sha256-pqytFWrSWfEwQqRdRbaigGCq68s8mdgj2j8M+kclslE="; }; patches = [ + ./remove-old-functional-patterns.patch + ./fix-fltk-guard.patch + + (fetchpatch { + name = "pari_2_15.patch"; + url = "https://raw.githubusercontent.com/sagemath/sage/07a2afd65fb4b0a1c9cbc43ede7d4a18c921a000/build/pkgs/giac/patches/pari_2_15.patch"; + sha256 = "sha256-Q3xBFED7XEAyNz6AHjzt63XtospmdGAIdS6iPq1C2UE="; + }) + (fetchpatch { - name = "pari_2_11.patch"; - url = "https://raw.githubusercontent.com/sagemath/sage/21ba7540d385a9864b44850d6987893dfa16bfc0/build/pkgs/giac/patches/pari_2_11.patch"; - sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k="; + name = "infinity.patch"; + url = "https://github.com/geogebra/giac/commit/851c2cd91e879c79d6652f8a5d5bed03b65c6d39.patch"; + sha256 = "sha256-WJRT2b8I9kgAkRuIugMiXoF4hT7yR7qyad8A6IspNTM="; + stripLen = 5; + extraPrefix = "/src/"; + excludes = [ "src/kdisplay.cc" ]; }) # giac calls scanf/printf with non-constant first arguments, which @@ -31,8 +43,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-r+M+9MRPRqhHcdhYWI6inxyNvWbXUbBcPCeDY7aulvk="; }) - # increase pari stack size for test chk_fhan{4,6} - ./increase-pari-stack-size.patch + # issue with include path precedence + (fetchpatch { + name = "fix_implicit_declaration.patch"; + url = "https://salsa.debian.org/science-team/giac/-/raw/c05ae9b9e74d3c6ee6411d391071989426a76201/debian/patches/fix_implicit_declaration.patch"; + sha256 = "sha256-ompUceYJLiL0ftfjBkIMcYvX1YqG2/XA7e1yDyFY0IY="; + }) ] ++ lib.optionals (!enableGUI) [ # when enableGui is false, giac is compiled without fltk. That # means some outputs differ in the make check. Patch around this: @@ -86,6 +102,12 @@ stdenv.mkDerivation rec { # when fltk is disabled. disable these tests for now. echo > check/chk_fhan2 echo > check/chk_fhan9 + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' + # these cover a known regression in giac, likely due to how pari state + # is shared between multiple giac instances (see pari.cc.old). + # see https://github.com/NixOS/nixpkgs/pull/264126 for more information + echo > check/chk_fhan4 + echo > check/chk_fhan6 ''; enableParallelBuilding = true; @@ -96,6 +118,8 @@ stdenv.mkDerivation rec { "--enable-ao" "--enable-ecm" "--enable-glpk" ] ++ lib.optionals enableGUI [ "--enable-gui" "--with-x" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--disable-nls" ] ++ lib.optionals (!enableGUI) [ "--disable-fltk" ] ++ lib.optionals (!enableMicroPy) [ @@ -129,7 +153,6 @@ stdenv.mkDerivation rec { homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; license = licenses.gpl3Plus; platforms = platforms.linux ++ (optionals (!enableGUI) platforms.darwin); - broken = stdenv.isDarwin && stdenv.isAarch64; maintainers = [ maintainers.symphorien ]; }; } diff --git a/pkgs/applications/science/math/giac/fix-fltk-guard.patch b/pkgs/applications/science/math/giac/fix-fltk-guard.patch new file mode 100644 index 0000000000000..a9c8e5bbaab8d --- /dev/null +++ b/pkgs/applications/science/math/giac/fix-fltk-guard.patch @@ -0,0 +1,28 @@ +From c7eafa2d7bde0d735b125912542acec2d5896c17 Mon Sep 17 00:00:00 2001 +From: George Huebner <george@feyor.sh> +Date: Sat, 20 Jul 2024 02:31:20 -0500 +Subject: [PATCH 3/4] remove erroneous HAVE_LIBFLTK guard + +--- + src/icas.cc | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/icas.cc b/src/icas.cc +index f91885b..17a0373 100644 +--- a/src/icas.cc ++++ b/src/icas.cc +@@ -2407,11 +2407,7 @@ int main(int ARGC, char *ARGV[]){ + #ifdef __APPLE__ + startc=clock(); + #endif +-#ifdef HAVE_LIBFLTK + xcas::icas_eval(gq,e,reading_file,filename,contextptr); +-#else +- e=eval(gq,1,contextptr); +-#endif + #ifdef __APPLE__ + startc=clock()-startc; + #endif +-- +2.44.1 + diff --git a/pkgs/applications/science/math/giac/increase-pari-stack-size.patch b/pkgs/applications/science/math/giac/increase-pari-stack-size.patch deleted file mode 100644 index b12b4b7fad660..0000000000000 --- a/pkgs/applications/science/math/giac/increase-pari-stack-size.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur a/check/chk_fhan4 b/check/chk_fhan4 ---- a/check/chk_fhan4 2018-03-13 19:27:11.000000000 +0100 -+++ b/check/chk_fhan4 2023-05-20 16:31:30.349063063 +0200 -@@ -1,4 +1,5 @@ - #! /bin/sh - unset LANG -+export PARI_SIZE=2048000 - ../src/icas TP04-sol.cas > TP04.tst - diff TP04.tst TP04-sol.cas.out1 -diff -ur a/check/chk_fhan6 b/check/chk_fhan6 ---- a/check/chk_fhan6 2018-03-13 19:27:21.000000000 +0100 -+++ b/check/chk_fhan6 2023-05-20 16:32:04.199407065 +0200 -@@ -1,4 +1,5 @@ - #! /bin/sh - unset LANG -+export PARI_SIZE=2048000 - ../src/icas TP06-sol.cas > TP06.tst - diff TP06.tst TP06-sol.cas.out1 diff --git a/pkgs/applications/science/math/giac/remove-old-functional-patterns.patch b/pkgs/applications/science/math/giac/remove-old-functional-patterns.patch new file mode 100644 index 0000000000000..95f6efe119fcb --- /dev/null +++ b/pkgs/applications/science/math/giac/remove-old-functional-patterns.patch @@ -0,0 +1,294 @@ +From f1c5309d5b815acc2616cd9fbb5182b1e64d225f Mon Sep 17 00:00:00 2001 +From: George Huebner <george@feyor.sh> +Date: Wed, 17 Jul 2024 18:12:36 -0500 +Subject: [PATCH 1/4] remove old <functional> patterns + +pointer_to_binary_function and ptr_fun are holdovers from pre c++11, +and can be replaced or entirely removed. This allows Giac to compile +with Clang 16>=. +--- + src/all_global_var | 2 +- + src/gausspol.cc | 2 +- + src/gausspol.h | 2 +- + src/gen.cc | 2 +- + src/gen.h | 4 ++-- + src/maple.cc | 2 +- + src/monomial.h | 16 ++++++++-------- + src/plot.cc | 2 +- + src/poly.h | 17 +++++++++-------- + src/solve.cc | 18 +++++++++--------- + src/usual.cc | 2 +- + 11 files changed, 35 insertions(+), 34 deletions(-) + +diff --git a/src/all_global_var b/src/all_global_var +index 7d75d73..55f4782 100644 +--- a/src/all_global_var ++++ b/src/all_global_var +@@ -16,7 +16,7 @@ Relatif a l'evaluation du tableur + // File Eqw.cc + vector<string> completion_tab; + // File alg_ext.cc +- rootmap symbolic_rootof_list(ptr_fun(islesscomplex)); ++ rootmap symbolic_rootof_list(islesscomplex); + // File derive.cc + // File desolve.cc + identificateur laplace_var(" s"); +diff --git a/src/gausspol.cc b/src/gausspol.cc +index 8fbd581..2f2121f 100644 +--- a/src/gausspol.cc ++++ b/src/gausspol.cc +@@ -855,7 +855,7 @@ namespace giac { + std::vector< monomial<gen> >::const_iterator & itb_end, + std::vector< monomial<gen> > & new_coord, + bool (* is_strictly_greater)( const index_m &, const index_m &), +- const std::pointer_to_binary_function < const monomial<gen> &, const monomial<gen> &, bool> m_is_strictly_greater ++ const std::function<bool(const monomial<gen> &, const monomial<gen> &)> m_is_strictly_greater + ) { + if (ita==ita_end || itb==itb_end){ + new_coord.clear(); +diff --git a/src/gausspol.h b/src/gausspol.h +index b5d214b..e6c7e0c 100644 +--- a/src/gausspol.h ++++ b/src/gausspol.h +@@ -93,7 +93,7 @@ namespace giac { + std::vector< monomial<gen> >::const_iterator & itb_end, + std::vector< monomial<gen> > & new_coord, + bool (* is_strictly_greater)( const index_t &, const index_t &), +- const std::pointer_to_binary_function < const monomial<gen> &, const monomial<gen> &, bool> m_is_greater ++ const std::function<bool(const monomial<gen> &, const monomial<gen> &)> m_is_greater + ) ; + void mulpoly(const polynome & th,const gen & fact,polynome & res); + polynome operator * (const polynome & th, const gen & fact) ; +diff --git a/src/gen.cc b/src/gen.cc +index 7d4874c..0b64afe 100644 +--- a/src/gen.cc ++++ b/src/gen.cc +@@ -1126,7 +1126,7 @@ namespace giac { + #if 1 // def NSPIRE + g.__MAPptr = new ref_gen_map; + #else +- g.__MAPptr = new ref_gen_map(ptr_fun(islesscomplexthanf)); ++ g.__MAPptr = new ref_gen_map(islesscomplexthanf); + #endif + #endif + g.type=_MAP; +diff --git a/src/gen.h b/src/gen.h +index 04d70af..496b25d 100644 +--- a/src/gen.h ++++ b/src/gen.h +@@ -443,7 +443,7 @@ namespace giac { + }; + typedef std::map<gen,gen,comparegen> gen_map; + #else +- typedef std::map<gen,gen,const std::pointer_to_binary_function < const gen &, const gen &, bool> > gen_map; ++ typedef std::map<gen,gen,const std::function<bool(const gen &, const gen &)> > gen_map; + #endif + struct ref_gen_map; + +@@ -902,7 +902,7 @@ namespace giac { + #if 1 // def NSPIRE + ref_gen_map(): ref_count(1),m() {} + #else +- ref_gen_map(const std::pointer_to_binary_function < const gen &, const gen &, bool> & p): ref_count(1),m(p) {} ++ ref_gen_map(const std::function<bool(const gen &, const gen &)> & p): ref_count(1),m(p) {} + #endif + ref_gen_map(const gen_map & M):ref_count(1),m(M) {} + }; +diff --git a/src/maple.cc b/src/maple.cc +index 3b33da8..d57a170 100644 +--- a/src/maple.cc ++++ b/src/maple.cc +@@ -3626,7 +3626,7 @@ namespace giac { + #if 1 // def NSPIRE + gen_map m; + #else +- gen_map m(ptr_fun(islessthanf)); ++ gen_map m(islessthanf); + #endif + int s=int(args.size()); + vector<int> indexbegin,indexsize; +diff --git a/src/monomial.h b/src/monomial.h +index 6e606d0..637a76c 100644 +--- a/src/monomial.h ++++ b/src/monomial.h +@@ -338,9 +338,9 @@ namespace giac { + + template<class T> class sort_helper { + public: +- std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> strictly_greater ; +- sort_helper(const std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> is_strictly_greater):strictly_greater(is_strictly_greater) {}; +- sort_helper():strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) {}; ++ std::function<bool(const monomial<T> &, const monomial<T> &)> strictly_greater ; ++ sort_helper(const std::function<bool(const monomial<T> &, const monomial<T> &)> is_strictly_greater):strictly_greater(is_strictly_greater) {}; ++ sort_helper():strictly_greater(m_lex_is_strictly_greater<T>) {}; + bool operator () (const monomial<T> & a, const monomial<T> & b){ return strictly_greater(a,b);} + }; + +@@ -677,7 +677,7 @@ namespace giac { + typename std::vector< monomial<T> >::const_iterator & itb_end, + std::vector< monomial<T> > & new_coord, + bool (* is_strictly_greater)( const index_m &, const index_m &), +- const std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> m_is_strictly_greater ++ const std::function<bool(const monomial<T> &, const monomial<T> &)> m_is_strictly_greater + ) { + if (ita==ita_end || itb==itb_end){ + new_coord.clear(); +@@ -726,8 +726,8 @@ namespace giac { + #endif + #ifndef NSPIRE + /* other algorithm using a map to avoid reserving too much space */ +- typedef std::map< index_t,T,const std::pointer_to_binary_function < const index_m &, const index_m &, bool> > application; +- application produit(std::ptr_fun(is_strictly_greater)); ++ typedef std::map< index_t,T,const std::function<bool(const index_m &, const index_m &)> > application; ++ application produit(is_strictly_greater); + // typedef std::map<index_t,T> application; + // application produit; + index_t somme(ita->index.size()); +@@ -848,7 +848,7 @@ namespace giac { + typename std::vector< monomial<T> >::const_iterator a=v.begin(), a_end=v.end(); + typename std::vector< monomial<T> >::const_iterator b=w.begin(), b_end=w.end(); + std::vector< monomial<T> > res; +- Mul(a,a_end,b,b_end,res,i_lex_is_strictly_greater,std::ptr_fun< const monomial<T> &, const monomial<T> &, bool >((m_lex_is_strictly_greater<T>))); ++ Mul(a,a_end,b,b_end,res,i_lex_is_strictly_greater,m_lex_is_strictly_greater<T>); + return res ; + } + +@@ -856,7 +856,7 @@ namespace giac { + std::vector< monomial<T> > & operator *= (std::vector< monomial<T> > & v,const std::vector< monomial<T> > & w){ + typename std::vector< monomial<T> >::const_iterator a=v.begin(), a_end=v.end(); + typename std::vector< monomial<T> >::const_iterator b=w.begin(), b_end=w.end(); +- Mul(a,a_end,b,b_end,v,i_lex_is_strictly_greater,std::ptr_fun< const monomial<T> &, const monomial<T> &, bool >((m_lex_is_strictly_greater<T>))); ++ Mul(a,a_end,b,b_end,v,i_lex_is_strictly_greater,m_lex_is_strictly_greater<T>); + return v; + } + +diff --git a/src/plot.cc b/src/plot.cc +index 288a1b5..ac85c9a 100755 +--- a/src/plot.cc ++++ b/src/plot.cc +@@ -11886,7 +11886,7 @@ static vecteur densityscale(double xmin,double xmax,double ymin,double ymax,doub + #if 1 // def NSPIRE + gen_map m; + #else +- gen_map m(ptr_fun(islesscomplexthanf)); ++ gen_map m(islesscomplexthanf); + #endif + int taille; + is >> taille; +diff --git a/src/poly.h b/src/poly.h +index 7d64e2c..d9ff991 100644 +--- a/src/poly.h ++++ b/src/poly.h +@@ -40,23 +40,24 @@ namespace giac { + // T zero; + // functional object sorting function for monomial ordering + bool (* is_strictly_greater)( const index_m &, const index_m &); +- std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> m_is_strictly_greater ; ++ std::function<bool(const monomial<T> &, const monomial<T> &)> m_is_strictly_greater ; + // constructors + tensor(const tensor<T> & t) : dim(t.dim), coord(t.coord), is_strictly_greater(t.is_strictly_greater), m_is_strictly_greater(t.m_is_strictly_greater) { } + tensor(const tensor<T> & t, const std::vector< monomial<T> > & v) : dim(t.dim), coord(v), is_strictly_greater(t.is_strictly_greater), m_is_strictly_greater(t.m_is_strictly_greater) { } + // warning: this constructor prohibits construction of tensor from a value + // of type T if this value is an int, except by using tensor<T>(T(int)) +- tensor() : dim(0), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { } +- explicit tensor(int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { } ++ // DANGER ++ tensor() : dim(0), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { } ++ explicit tensor(int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { } + explicit tensor(int d,const tensor<T> & t) : dim(d),is_strictly_greater(t.is_strictly_greater), m_is_strictly_greater(t.m_is_strictly_greater) { } +- tensor(const monomial<T> & v) : dim(int(v.index.size())), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { ++ tensor(const monomial<T> & v) : dim(int(v.index.size())), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { + coord.push_back(v); + } +- tensor(const T & v, int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { ++ tensor(const T & v, int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { + if (!is_zero(v)) + coord.push_back(monomial<T>(v,0,d)); + } +- tensor(int d,const std::vector< monomial<T> > & c) : dim(d), coord(c), is_strictly_greater(i_lex_is_strictly_greater),m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { } ++ tensor(int d,const std::vector< monomial<T> > & c) : dim(d), coord(c), is_strictly_greater(i_lex_is_strictly_greater),m_is_strictly_greater(m_lex_is_strictly_greater<T>) { } + ~tensor() { coord.clear(); } + // member functions + // ordering monomials in the tensor +@@ -519,10 +520,10 @@ namespace giac { + template <class T> + void lexsort(std::vector < monomial<T> > & v){ + #if 1 // def NSPIRE +- sort_helper<T> M(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)); ++ sort_helper<T> M(m_lex_is_strictly_greater<T>); + sort(v.begin(),v.end(),M); + #else +- sort(v.begin(),v.end(),std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)); ++ sort(v.begin(),v.end(),m_lex_is_strictly_greater<T>); + #endif + } + +diff --git a/src/solve.cc b/src/solve.cc +index 889f824..2a51ab8 100755 +--- a/src/solve.cc ++++ b/src/solve.cc +@@ -8684,39 +8684,39 @@ namespace giac { + switch (order.val){ + case _PLEX_ORDER: + p.is_strictly_greater=i_lex_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_lex_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_lex_is_strictly_greater<gen>; + break; + case _REVLEX_ORDER: + p.is_strictly_greater=i_total_revlex_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_total_revlex_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_total_revlex_is_strictly_greater<gen>; + break; + case _TDEG_ORDER: + p.is_strictly_greater=i_total_lex_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_total_lex_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_total_lex_is_strictly_greater<gen>; + break; + case _3VAR_ORDER: + p.is_strictly_greater=i_3var_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_3var_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_3var_is_strictly_greater<gen>; + break; + case _7VAR_ORDER: + p.is_strictly_greater=i_7var_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_7var_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_7var_is_strictly_greater<gen>; + break; + case _11VAR_ORDER: + p.is_strictly_greater=i_11var_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_11var_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_11var_is_strictly_greater<gen>; + break; + case _16VAR_ORDER: + p.is_strictly_greater=i_16var_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_16var_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_16var_is_strictly_greater<gen>; + break; + case _32VAR_ORDER: + p.is_strictly_greater=i_32var_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_32var_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_32var_is_strictly_greater<gen>; + break; + case _64VAR_ORDER: + p.is_strictly_greater=i_64var_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_64var_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_64var_is_strictly_greater<gen>; + break; + } + p.tsort(); +diff --git a/src/usual.cc b/src/usual.cc +index fddede6..eb7ae5e 100755 +--- a/src/usual.cc ++++ b/src/usual.cc +@@ -5950,7 +5950,7 @@ namespace giac { + #if 1 // def NSPIRE + gen_map m; + #else +- gen_map m(ptr_fun(islesscomplexthanf)); ++ gen_map m(islesscomplexthanf); + #endif + for (;it!=itend;++it){ + if (is_equal(*it) || it->is_symb_of_sommet(at_deuxpoints)){ +-- +2.44.1 + diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index d9d12cbf388de..d2713befed382 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cln ]; buildInputs = [ readline ] - ++ lib.optional stdenv.isDarwin gmp; + ++ lib.optional stdenv.hostPlatform.isDarwin gmp; nativeBuildInputs = [ pkg-config python3 ]; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 3e88e7f94bbe6..2219815824e7c 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ blas lapack gmm fltk libjpeg zlib opencascade-occt - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index 773f1f3c089e4..67d7bfdba90c2 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -15,16 +15,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8="; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; env = { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; - } // lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { NIX_LDFLAGS = "-headerpad_max_install_names"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildPhase = let - ccc = if stdenv.isDarwin then "ccc.osx" else "ccc"; + ccc = if stdenv.hostPlatform.isDarwin then "ccc.osx" else "ccc"; in '' runHook preBuild diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 9e2552478765d..9d0a308f44357 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -53,8 +53,8 @@ let versions = callPackage ./versions.nix { }; matchesDoc = v: builtins.match (if webdoc - then ".*[0-9]_LINUX.sh" - else ".*[0-9]_BNDL_LINUX.sh") v.src.name != null; + then ".*[0-9]_LIN(UX)?.sh" + else ".*_B[Nn][Dd][Ll].sh") v.src.name != null; in @@ -71,7 +71,7 @@ callPackage ./generic.nix { homepage = "http://www.wolfram.com/mathematica/"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ herberteuler rafaelrc ]; + maintainers = with maintainers; [ herberteuler rafaelrc chewblacka ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index c1c10f8937ce0..6bf8992308125 100644 --- a/pkgs/applications/science/math/mathematica/generic.nix +++ b/pkgs/applications/science/math/mathematica/generic.nix @@ -157,9 +157,15 @@ in stdenv.mkDerivation { mkdir -p "$out/lib/udev/rules.d" - # Patch MathInstaller's shebangs and udev rules dir - patchShebangs MathInstaller - substituteInPlace MathInstaller \ + # Set name of installer file + if [ -f "MathInstaller" ]; then + INSTALLER="MathInstaller" + else + INSTALLER="WolframInstaller" + fi + # Patch Installer's shebangs and udev rules dir + patchShebangs $INSTALLER + substituteInPlace $INSTALLER \ --replace /etc/udev/rules.d $out/lib/udev/rules.d # Remove PATH restriction, root and avahi daemon checks, and hostname call @@ -169,13 +175,13 @@ in stdenv.mkDerivation { s/^\s*checkAvahiDaemon$/:/ s/^\s*installBundledInstall$/:/ s/`hostname`/""/ - ' MathInstaller + ' $INSTALLER # NOTE: some files placed under HOME may be useful XDG_DATA_HOME="$out/share" HOME="$TMPDIR/home" vernierLink=y \ - ./MathInstaller -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y + ./$INSTALLER -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y - # Check if MathInstaller produced any errors + # Check if Installer produced any errors errLog="$out/libexec/Mathematica/InstallErrors" if [ -f "$errLog" ]; then echo "Installation errors:" diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix index 98e65d376b393..a88aca6f12a8f 100644 --- a/pkgs/applications/science/math/mathematica/versions.nix +++ b/pkgs/applications/science/math/mathematica/versions.nix @@ -7,6 +7,20 @@ */ let versions = [ + { + version = "14.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-PCpjwqA6NC+iwvYxddYBlmF5+vl76r+MoIYAL91WFns="; + installer = "Wolfram_14.1.0_LIN.sh"; + } + { + version = "14.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-pnu60Pv3xo3+MAkDLiU3yTPVbbQ00diV45vSVL8B310="; + installer = "Wolfram_14.1.0_LIN_Bndl.sh"; + } { version = "14.0.0"; lang = "en"; diff --git a/pkgs/applications/science/math/mathmod/default.nix b/pkgs/applications/science/math/mathmod/default.nix deleted file mode 100644 index dd85d06784922..0000000000000 --- a/pkgs/applications/science/math/mathmod/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, mkDerivation -, fetchFromGitHub -, qmake -}: - -mkDerivation { - pname = "mathmod"; - version = "11.1-unstable-2024-01-26"; - - src = fetchFromGitHub { - owner = "parisolab"; - repo = "mathmod"; - rev = "24d03a04c17363520ae7cf077e72a7b8684eb6fd"; - hash = "sha256-HiqHssPGqYEVZWchZRj4rFPc+xNVZk1ryl5qvFC2BmQ="; - }; - - patches = [ ./fix-paths.patch ]; - - postPatch = '' - substituteInPlace MathMod.pro --subst-var out - ''; - - nativeBuildInputs = [ qmake ]; - - meta = { - description = "Mathematical modelling software"; - homepage = "https://github.com/parisolab/mathmod"; - license = lib.licenses.gpl2Plus; - mainProgram = "MathMod"; - maintainers = with lib.maintainers; [ tomasajt ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index a3b54b78f99bc..0db35ba89ae61 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "format" ]; - patchPhase = lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace GNUmakefile --replace gcc cc ''; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index a27d7c1ffdb6f..306d6141ac17a 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ libqalculate gtk3 curl ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index b1db5ce31a791..2cde634498889 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; buildInputs = [ libqalculate qtbase qtsvg ] - ++ lib.optionals stdenv.isLinux [ qtwayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; postPatch = '' substituteInPlace qalculate-qt.pro\ --replace "LRELEASE" "${qttools.dev}/bin/lrelease" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/qalculate-qt.app $out/Applications makeWrapper $out/{Applications/qalculate-qt.app/Contents/MacOS,bin}/qalculate-qt diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index f2aa1aac26079..4aaed4a1b0edc 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - buildFlags = lib.optionals stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; + buildFlags = lib.optionals stdenv.hostPlatform.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; installFlags = [ "INSTALL_DIR=$(out)" ]; preInstall = ''mkdir -p "$out"/{bin,share,lib,include}''; diff --git a/pkgs/applications/science/math/sage/README.md b/pkgs/applications/science/math/sage/README.md index 35e8d0deeffba..94a9b0b6bc29b 100644 --- a/pkgs/applications/science/math/sage/README.md +++ b/pkgs/applications/science/math/sage/README.md @@ -12,7 +12,7 @@ If the build broke as a result of a package update, try those solutions in order - search the [sage GitHub repo](https://github.com/sagemath/sage) for keywords like "Upgrade <package>". Maybe somebody has already proposed a patch that fixes the issue. You can then add a `fetchpatch` to `sage-src.nix`. -- check if [gentoo](https://github.com/cschwan/sage-on-gentoo/tree/master/sci-mathematics/sage), [debian](https://salsa.debian.org/science-team/sagemath/tree/master/debian) or [arch linux](https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath) already solved the problem. You can then again add a `fetchpatch` to `sage-src.nix`. If applicable you should also [propose the patch upstream](#proposing-a-sage-patch). +- check if [gentoo](https://github.com/cschwan/sage-on-gentoo/tree/master/sci-mathematics/sage), [debian](https://salsa.debian.org/science-team/sagemath/tree/master/debian) or [arch linux](https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath) already solved the problem. You can then again add a `fetchpatch` to `sage-src.nix`. If applicable you should also propose the patch upstream. - fix the problem yourself. First clone the sagemath source and then check out the sage version you want to patch: diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 6624dcc36528b..95ad7ab120134 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -18,7 +18,7 @@ let inherit flint3; inherit sage-src env-locations singular; inherit (maxima) lisp-compiler; - linbox = pkgs.linbox.override { withSage = true; }; + linbox = pkgs.linbox; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -97,6 +97,7 @@ let # Running the tests should take something in the order of 1h. sage-tests = callPackage ./sage-tests.nix { inherit sage-with-env; + pytest = python3.pkgs.pytest; }; sage-src = callPackage ./sage-src.nix {}; diff --git a/pkgs/applications/science/math/sage/dist-tests.nix b/pkgs/applications/science/math/sage/dist-tests.nix index 24a86a8f37a4b..45376b832b9f5 100644 --- a/pkgs/applications/science/math/sage/dist-tests.nix +++ b/pkgs/applications/science/math/sage/dist-tests.nix @@ -7,10 +7,10 @@ # subset of files responsible for the vast majority of packaging tests, we can # think about moving this upstream. [ - "src/sage/env.py" # [1] - "src/sage/misc/persist.pyx" # [1] - "src/sage/misc/inline_fortran.py" # [1] - "src/sage/repl/ipython_extension.py" # [1] + "src/sage/env.py" # [1] + "src/sage/misc/persist.pyx" # [1] + "src/sage/misc/inline_fortran.py" # [1] + "src/sage/repl/ipython_extension.py" # [1] ] # Numbered list of past failures to annotate files with diff --git a/pkgs/applications/science/math/sage/patches/disable-singular-doctest.patch b/pkgs/applications/science/math/sage/patches/disable-singular-doctest.patch new file mode 100644 index 0000000000000..8501d55e54882 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/disable-singular-doctest.patch @@ -0,0 +1,36 @@ +From d6362714c9acf4cab69f3e2e772ec0bb1dfd39fe Mon Sep 17 00:00:00 2001 +From: George Huebner <george@feyor.sh> +Date: Mon, 22 Jul 2024 00:37:53 -0500 +Subject: [PATCH] disable singular version doctest to avoid exceeding the stack + limit + +It works fine interactively, only an issue for Nix builds +--- + src/sage/interfaces/singular.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py +index c0ab80e0a6..c778acdb0c 100644 +--- a/src/sage/interfaces/singular.py ++++ b/src/sage/interfaces/singular.py +@@ -1262,7 +1262,7 @@ class Singular(ExtraTabCompletion, Expect): + + EXAMPLES:: + +- sage: singular.version() ++ sage: singular.version() # not tested + "Singular ... version 4... + """ + return singular_version() +@@ -2475,7 +2475,7 @@ def singular_version(): + + EXAMPLES:: + +- sage: singular.version() ++ sage: singular.version() # not tested + "Singular ... version 4... + """ + return singular.eval('system("--version");') +-- +2.44.1 + diff --git a/pkgs/applications/science/math/sage/patches/silence-linker.patch b/pkgs/applications/science/math/sage/patches/silence-linker.patch new file mode 100644 index 0000000000000..f11f6cc6d0e33 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/silence-linker.patch @@ -0,0 +1,27 @@ +From 06d3bb5d8ef007bbcd71ee157fd97cd69557383b Mon Sep 17 00:00:00 2001 +From: George Huebner <george@feyor.sh> +Date: Sat, 20 Jul 2024 18:46:04 -0500 +Subject: [PATCH] sage.cython: silence linker + +(Nix+LLVM specific issue) "ld: warning: directory not found" causes +any cython doctest to fail and is annoying, so I told ld to shut up. +--- + src/sage/misc/cython.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sage/misc/cython.py b/src/sage/misc/cython.py +index 545e1227b0..c5f4b69221 100644 +--- a/src/sage/misc/cython.py ++++ b/src/sage/misc/cython.py +@@ -339,7 +339,7 @@ def cython(filename, verbose=0, compile_message=False, + Cython.Compiler.Options.pre_import = "sage.all" if sage_namespace else None + + extra_compile_args = ['-w'] # no warnings +- extra_link_args = [] ++ extra_link_args = ['-w'] + + ext = Extension(name, + sources=[pyxfile], +-- +2.44.1 + diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch index 2bfac780dfca3..fecf2088e5045 100644 --- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -1,15 +1,15 @@ diff --git a/src/sage_docbuild/builders.py b/src/sage_docbuild/builders.py -index c5be38600a..e1d15f62d3 100644 +index 871cc4705a2..4b718136b91 100644 --- a/src/sage_docbuild/builders.py +++ b/src/sage_docbuild/builders.py -@@ -105,31 +105,6 @@ def builder_helper(type): +@@ -106,31 +106,6 @@ def builder_helper(type): """ Return a function which builds the documentation for output type ``type``. - - TESTS: - -- Check that :trac:`25161` has been resolved:: +- Check that :issue:`25161` has been resolved:: - - sage: from sage_docbuild.builders import DocBuilder - sage: from sage_docbuild.__main__ import setup_parser @@ -48,10 +48,10 @@ index c5be38600a..e1d15f62d3 100644 if build_options.ABORT_ON_ERROR: raise diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py -index 07c584de55..b83283a9ee 100644 +index 5621fe9e456..b1b91ce7b2c 100644 --- a/src/sage_docbuild/sphinxbuild.py +++ b/src/sage_docbuild/sphinxbuild.py -@@ -331,3 +331,8 @@ def runsphinx(): +@@ -323,3 +323,8 @@ def runsphinx(): sys.stderr = saved_stderr sys.stdout.flush() sys.stderr.flush() diff --git a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix index b45998bbcb86d..43f67b97a278e 100644 --- a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix +++ b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , sage-src +, furo , jupyter-sphinx , sphinx , sphinx-copybutton @@ -13,6 +14,7 @@ buildPythonPackage rec { src = sage-src; propagatedBuildInputs = [ + furo jupyter-sphinx sphinx sphinx-copybutton diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index e886f6645468b..1503d3a89957a 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -10,6 +10,7 @@ , coreutils , gnused , gnugrep +, gawk , binutils , pythonEnv , python3 @@ -70,6 +71,7 @@ let coreutils gnused gnugrep + gawk binutils.bintools pkg-config pari @@ -186,7 +188,7 @@ writeTextFile rec { export SAGE_EXTCODE='${sagelib.src}/src/sage/ext_data' # for find_library - export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [stdenv.cc.libc singular giac]}''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" + export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [stdenv.cc.libc singular giac gap]}''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" ''; } // { # equivalent of `passthru`, which `writeTextFile` doesn't support lib = sagelib; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index b21bb07e6a646..b8d9e3e903a6d 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchFromGitHub , fetchpatch , fetchurl @@ -10,14 +11,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "10.3"; + version = "10.4"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - hash = "sha256-OHtMv8t0RrP6R8XIREU+C1vpazeQLWa75wx9Mv6BN1U="; + hash = "sha256-BDO00ZSm5lnjEuA56VsY/FZyAhoG1hkFxdIlTtBZVBA="; }; # contains essential files (e.g., setup.cfg) generated by the bootstrap script. @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { configure-src = fetchurl { # the hash below is the tagged commit's _parent_. it can also be found by looking for # the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version} - url = "mirror://sageupstream/configure/configure-ab1a517b64b02bf15bbcb8d7c2d4d643bd5eff9b.tar.gz"; - hash = "sha256-pe9AxTM+gFSR4/eVfUzay+4bwjoubbYeDPc+avKjlaw="; + url = "mirror://sageupstream/configure/configure-3c279ec5712e0fa35c5733e03e010970727d7189.tar.gz"; + hash = "sha256-3bRlgIUSIq9tDzvI+ZfEd5LMy1qHXdItEwu1say4cx4="; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -40,6 +41,13 @@ stdenv.mkDerivation rec { # we can now set the cache dir to be within the .sage directory. This is # not strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch + ] ++ lib.optionals (stdenv.cc.isClang) [ + # https://github.com/NixOS/nixpkgs/pull/264126 + # Dead links in python sysconfig cause LLVM linker warnings, leading to cython doctest failures. + ./patches/silence-linker.patch + + # Stack overflows during doctests; this does not change functionality. + ./patches/disable-singular-doctest.patch ]; # Since sage unfortunately does not release bugfix releases, packagers must @@ -54,13 +62,6 @@ stdenv.mkDerivation rec { # https://github.com/sagemath/sage/issues/34575 ./patches/disable-slow-glpk-test.patch - # https://github.com/sagemath/sage/pull/37489, landed in 10.4.beta1 - (fetchpatch { - name = "quaternionalgebra-random-failure.patch"; - url = "https://github.com/sagemath/sage/commit/1c3f991b9d3c5778e409e5414c6cfcd456113f19.diff"; - hash = "sha256-uCXchYx26DdxTjR1k2748KCEHPnekKS2fAM7SpyhNvM="; - }) - # compile libs/gap/element.pyx with -O1 # a more conservative version of https://github.com/sagemath/sage/pull/37951 ./patches/gap-element-crash.patch @@ -73,39 +74,11 @@ stdenv.mkDerivation rec { # should come from or be proposed to upstream. This list will probably never # be empty since dependencies update all the time. packageUpgradePatches = [ - # https://github.com/sagemath/sage/pull/37763, landed in 10.4.beta2 - (fetchpatch { - name = "scipy-fault-tolerance.patch"; - url = "https://github.com/sagemath/sage/commit/551139c09f26a5da96b1187c3f0dd17b8d80ef84.diff"; - hash = "sha256-PR4przrZ3ieHaW2nSY7l7VhNfrUupu9yCIrXpeyoAgg="; - }) - - # https://github.com/sagemath/sage/pull/37492, landed in 10.4.beta5 - (fetchpatch { - name = "singular-4.3.2p14-upgrade.patch"; - url = "https://github.com/sagemath/sage/commit/a0c56816b051e97da44ac0a4e4d4f6915cf7fa0f.diff"; - sha256 = "sha256-WGMmPeBoj2LUC+2qxWuaJL89QUuGt6axGvxWkpM9LYg="; - }) - - # https://github.com/sagemath/sage/pull/37949, landed in 10.4.beta6 - (fetchpatch { - name = "conway-polynomials-new-len.patch"; - url = "https://github.com/sagemath/sage/commit/c9f5b45179e92ea0de1e0dbe0f47464010902851.diff"; - hash = "sha256-DwN2UIX8dxfxjIiqVvMdGbIxJ7CR/Ag2XUmS5vUKFTs="; - }) - - # https://github.com/sagemath/sage/pull/37967, landed in 10.4.beta6 - (fetchpatch { - name = "conway-polynomials-ell-point.patch"; - url = "https://github.com/sagemath/sage/commit/4e0bbaf90262a42f8ea14d5bcfed65f9d1787f54.diff"; - hash = "sha256-9gXydi1A+n7+K8YpH0PB8l/OMexhgO2F5NccU0cK+ls="; - }) - - # https://github.com/sagemath/sage/pull/38100, landed in 10.4.beta8 + # https://github.com/sagemath/sage/pull/38500, positively reviewed, to land in 10.5.beta3 (fetchpatch { - name = "sphinx-7.3-update.patch"; - url = "https://github.com/sagemath/sage/commit/e1b22690db42885423be5049246eb71ff52bdfef.diff"; - hash = "sha256-04KAyz8+0pJbRV8Ld0bNX1OoEx/35gIh3Nff+6n8QUU="; + name = "cython-3.0.11-upgrade.patch"; + url = "https://patch-diff.githubusercontent.com/raw/sagemath/sage/pull/38500.diff"; + hash = "sha256-ePfH3Gy1T0UfpoVd3EZowCfy88CbE+yE2MV2itWthsA="; }) ]; @@ -130,7 +103,7 @@ stdenv.mkDerivation rec { installPhase = '' cp -r . "$out" - tar xkzf ${configure-src} -C "$out" + tar xzf ${configure-src} -C "$out" rm "$out/configure" ''; } diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 1a415ae65e96a..e50754986709c 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -1,5 +1,6 @@ { stdenv , lib +, pytest , sage-with-env , makeWrapper , files ? null # "null" means run all tests @@ -30,6 +31,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ + pytest sage-with-env ]; diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 81b55e841d244..cc39624b7f110 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://www.sagemath.org"; license = licenses.gpl2Plus; maintainers = teams.sage.members; - platforms = platforms.linux; + platforms = platforms.linux ++ [ "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/science/math/scalp/default.nix b/pkgs/applications/science/math/scalp/default.nix index f6ec20faff594..a4d3dc52e0a96 100644 --- a/pkgs/applications/science/math/scalp/default.nix +++ b/pkgs/applications/science/math/scalp/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { lp_solve ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" ''; diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index f6da20531385b..e3ca7bef52a4b 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -100,4 +100,4 @@ let ''; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index ee84ae440b304..fff9c7dfaf903 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -7,6 +7,7 @@ , getconf , flint3 , ntl +, mpfr , cddlib , gfan , lrcalc @@ -15,8 +16,7 @@ , latex2html , texinfo , texliveSmall -, enableDocs ? !stdenv.isDarwin -, enableGfanlib ? true +, enableDocs ? true }: stdenv.mkDerivation rec { @@ -40,12 +40,11 @@ stdenv.mkDerivation rec { }; configureFlags = [ + "--enable-gfanlib" "--with-ntl=${ntl}" - "--disable-pyobject-module" + "--with-flint=${flint3}" ] ++ lib.optionals enableDocs [ "--enable-doc-build" - ] ++ lib.optionals enableGfanlib [ - "--enable-gfanlib" ]; prePatch = '' @@ -61,14 +60,15 @@ stdenv.mkDerivation rec { buildInputs = [ # necessary gmp + flint3 # by upstream recommended but optional ncurses readline ntl - flint3 + mpfr lrcalc + # for gfanlib gfan - ] ++ lib.optionals enableGfanlib [ cddlib ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { latex2html texinfo texliveSmall - ] ++ lib.optionals stdenv.isDarwin [ getconf ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; preAutoreconf = '' @@ -95,11 +95,13 @@ stdenv.mkDerivation rec { -i '{}' ';' ''; - hardeningDisable = lib.optional stdenv.isi686 "stackprotector"; + hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "stackprotector"; doCheck = true; # very basic checks, does not test any libraries installPhase = '' + # clean up any artefacts a previous non-sandboxed docbuild may have left behind + rm /tmp/conic.log /tmp/conic.tex /tmp/tropicalcurve*.tex || true make install '' + lib.optionalString enableDocs '' # Sage uses singular.info, which is not installed by default @@ -118,8 +120,8 @@ stdenv.mkDerivation rec { "Buch/buch.lst" "Plural/short.lst" "Old/factor.tst" - ] ++ lib.optionals enableGfanlib [ # tests that require gfanlib + # requires "DivRemIdU", a syzextra (undocumented) command "Short/ok_s.lst" ]; diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 021c1bedc348a..ed7339ab56775 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -32,6 +32,6 @@ mkDerivation rec { ''; maintainers = with maintainers; [ gebner j0hax ]; inherit (qtbase.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index d6ec352d32a2f..f215ec0037d49 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { autoreconfHook ]; + # clang warning: passing arguments to '...' without a prototype is deprecated + # in all versions of C and is not supported in C23. + CFLAGS = "-std=c99 -Wno-deprecated-non-prototype"; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix index 6ff159cc54cbe..15dbdf169e539 100644 --- a/pkgs/applications/science/misc/foldingathome/client.nix +++ b/pkgs/applications/science/misc/foldingathome/client.nix @@ -13,13 +13,13 @@ , extraPkgs ? [ ] }: let - version = "8.3.7"; + version = "8.3.18"; cbangSrc = fetchFromGitHub { owner = "cauldrondevelopmentllc"; repo = "cbang"; rev = "bastet-v${version}"; - sha256 = "sha256-acAImItdkgo6PBFL6Vu/caIdcnvp/3VEW2lgVDgKy9g="; + sha256 = "sha256-BQNomjz6Bhod3FOC5iICwt1rPrZgIxGQ08yspSvAnJc="; }; fah-client = stdenv.mkDerivation { @@ -30,7 +30,7 @@ let owner = "FoldingAtHome"; repo = "fah-client-bastet"; rev = "v${version}"; - sha256 = "sha256-d+LY/R4TAko+2e2W76KEBQ8fXj0hzzmBOm+c4tksXMA="; + sha256 = "sha256-lqpC1fAMFb8iX02daVre/pE0c7DkwswlFigJS3ZGEjM="; }; nativeBuildInputs = [ scons re2 libevent git ]; diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix deleted file mode 100644 index a64c973914c66..0000000000000 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv -, dpkg -, fahviewer -, fetchurl -, makeWrapper -, python2 -}: -let - majMin = lib.versions.majorMinor version; - version = "7.6.21"; - - python = python2.withPackages - ( - ps: [ - ps.pycairo - ps.pygobject2 - ps.pygtk - ] - ); -in -stdenv.mkDerivation rec { - inherit version; - pname = "fahcontrol"; - - src = fetchurl { - url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - sha256 = "1vfrdqkrvdlyxaw3f6z92w5dllrv6810lmf8yhcmjcwmphipvf71"; - }; - - nativeBuildInputs = [ - dpkg - makeWrapper - ]; - - buildInputs = [ fahviewer python ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase = "cp -ar usr $out"; - - postFixup = '' - sed -e "s|/usr/bin|$out/bin|g" -i $out/share/applications/FAHControl.desktop - wrapProgram "$out/bin/FAHControl" \ - --suffix PATH : "${fahviewer.outPath}/bin" \ - --set PYTHONPATH "$out/lib/python2.7/dist-packages" - ''; - - meta = { - description = "Folding@home control"; - homepage = "https://foldingathome.org/"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.zimbatm ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix deleted file mode 100644 index bb2c3c0abe30e..0000000000000 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv -, autoPatchelfHook -, dpkg -, fetchurl -, libglut -, gcc-unwrapped -, libGL -, libGLU -, makeWrapper -, zlib -}: -let - majMin = lib.versions.majorMinor version; - version = "7.6.21"; -in -stdenv.mkDerivation rec { - inherit version; - pname = "fahviewer"; - - src = fetchurl { - url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - sha256 = "00fd00pf6fcpplcaahvy9ir60mk69d9rcmwsyq3jrv9mxqm9aq7p"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - ]; - - buildInputs = [ - libglut - gcc-unwrapped.lib - libGL - libGLU - zlib - ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - sed -e "s|/usr/bin|$out/bin|g" -i usr/share/applications/FAHViewer.desktop - ''; - - installPhase = '' - cp -ar usr $out - ''; - - meta = { - description = "Folding@home viewer"; - homepage = "https://foldingathome.org/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.zimbatm ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 5c2c4cabc9f12..72504246b6c0a 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , doxygen , graphviz @@ -42,6 +43,14 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-3fEwm5EKK9RcRbnyUejgwfjdsXaujjZjoMbq/BbVMeM="; }; + patches = [ + (fetchpatch { + name = "qwt-6.3-compile-error-fix.patch"; + url = "https://github.com/GPlates/GPlates/commit/c4680ebe54f4535909085feacecd66410a91ff98.patch"; + hash = "sha256-mw5+GLayMrmcSDd1ai+0JTuY3iedHT9u2kx5Dd2wMjg="; + }) + ]; + nativeBuildInputs = [ cmake doxygen @@ -71,6 +80,6 @@ in stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gplates.org"; license = licenses.gpl2Only; platforms = platforms.all; - broken = stdenv.isDarwin; # FIX: this check: https://github.com/GPlates/GPlates/blob/gplates/cmake/modules/Config_h.cmake#L72 + broken = stdenv.hostPlatform.isDarwin; # FIX: this check: https://github.com/GPlates/GPlates/blob/gplates/cmake/modules/Config_h.cmake#L72 }; }) diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix index a5055220e95fb..88fc3a8c0e570 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/graphia.x86_64-darwin - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Visualisation tool for the creation and analysis of graphs"; homepage = "https://graphia.app"; license = licenses.gpl3Only; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index f622f87d2e412..a535f436ddb19 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; meta = { - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; description = "Library for computer-vision scientists and targeted for the Multiple View Geometry community"; homepage = "https://openmvg.readthedocs.io/en/latest/"; license = lib.licenses.mpl20; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 57c4367d2a822..689ce1ad554ca 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; # SSE is enabled by default - cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF"; + cmakeFlags = lib.optional (!stdenv.hostPlatform.isx86_64) "-DOpenMVS_USE_SSE=OFF"; buildInputs = [ boostWithZstd diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index 6d169db23b925..60615b6f09260 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -120,7 +120,7 @@ in maven.buildMavenPackage { fromSource binaryBytecode # maven dependencies ]; - broken = stdenv.isDarwin; # builds, doesn't run + broken = stdenv.hostPlatform.isDarwin; # builds, doesn't run mainProgram = "refine"; }; } diff --git a/pkgs/applications/science/misc/reason-shell/default.nix b/pkgs/applications/science/misc/reason-shell/default.nix index 5491593cc7f70..015b5c97ebf31 100644 --- a/pkgs/applications/science/misc/reason-shell/default.nix +++ b/pkgs/applications/science/misc/reason-shell/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index ae51d55168a9f..c0b33b3cbedb2 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; buildInputs = [ ncurses ] - ++ (if stdenv.isDarwin then [ curl libiconv Security ] else [ openssl ]); + ++ (if stdenv.hostPlatform.isDarwin then [ curl libiconv Security ] else [ openssl ]); # Some tests fail and/or attempt to use internet servers. doCheck = false; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 80f2df0688da3..62f80ee48096a 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ pcre python3 zlib libxml2 lz4 xz gsl xxHash libxcrypt ] - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] - ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ Cocoa OpenGL ] ; patches = [ @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { "-Dxml=ON" "-Dxrootd=OFF" ] - ++ lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; + ++ lib.optional stdenv.hostPlatform.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; setupHook = ./setup-hook.sh; @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { homepage = "https://root.cern.ch/"; description = "Data analysis framework"; platforms = platforms.unix; - broken = !stdenv.isx86_64 || stdenv.cc.isClang or false; + broken = !stdenv.hostPlatform.isx86_64 || stdenv.cc.isClang or false; maintainers = with maintainers; [ veprbl ]; license = licenses.lgpl21; }; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index fd998f7328182..32de529c55449 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.32.04"; + version = "6.32.06"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -64,15 +64,15 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-Ey8Saq59MO+8zX3NmRt62hiQrleYDvMAwWQh+dTQfqg="; + hash = "sha256-P8Ay2T/oSN6lrbG0fY8KhieVIyk/7gqis81Sof+rckc="; }; clad_src = fetchgit { url = "https://github.com/vgvassilev/clad"; # Make sure that this is the same tag as in the ROOT build files! # https://github.com/root-project/root/blob/master/interpreter/cling/tools/plugins/clad/CMakeLists.txt#L76 - rev = "refs/tags/v1.6"; - hash = "sha256-Fv3i84lgoifxtyWKhQjj1c4bR9wSl5SPzUh0ZhZBxFI="; + rev = "refs/tags/v1.7"; + hash = "sha256-iKrZsuUerrlrjXBrxcTsFu/t0Pb0sa4UlfSwd1yhg3g="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -109,8 +109,8 @@ stdenv.mkDerivation rec { tbb xrootd ] - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] - ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ Cocoa CoreSymbolication OpenGL ] ; patches = [ @@ -124,22 +124,22 @@ stdenv.mkDerivation rec { fi done substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ - --replace 'set(lcgpackages ' '#set(lcgpackages ' + --replace-fail 'set(lcgpackages ' '#set(lcgpackages ' # We have to bypass the connection check, because it would disable clad. # This should probably be fixed upstream with a flag to disable the # connectivity check! substituteInPlace CMakeLists.txt \ - --replace 'if(clad AND NO_CONNECTION)' 'if(FALSE)' + --replace-fail 'if(clad AND NO_CONNECTION)' 'if(FALSE)' # Make sure that clad is not downloaded when building substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ - --replace 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' + --replace-fail 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' # Make sure that clad is finding the right llvm version substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ - --replace '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_16.dev}/lib/cmake/llvm' + --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_16.dev}/lib/cmake/llvm' substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \ - --replace 'add_clang_symlink(''${link} clang)' "" + --replace-fail 'add_clang_symlink(''${link} clang)' "" # Don't require textutil on macOS : > cmake/modules/RootCPack.cmake @@ -149,11 +149,11 @@ stdenv.mkDerivation rec { -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' patchShebangs build/unix/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Eliminate impure reference to /System/Library/PrivateFrameworks substituteInPlace core/macosx/CMakeLists.txt \ - --replace "-F/System/Library/PrivateFrameworks " "" - '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + --replace-fail "-F/System/Library/PrivateFrameworks " "" + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { "-Dvdt=OFF" ] ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" # fatal error: module map file '/nix/store/<hash>-Libsystem-osx-10.12.6/include/module.modulemap' not found diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 37c7fb3a2a054..40202b8dbaccf 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -115,6 +115,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ mickours mpoquet ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 7f0e70c642134..07cc2ceaedcc2 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -1,30 +1,26 @@ { lib -, fetchFromGitHub +, fetchPypi , python3 -, runtimeShell +, stress }: python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.14.0"; + version = "8.20.1"; format = "setuptools"; - src = fetchFromGitHub { - owner = "snakemake"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-6oguN4u4OUDXpDsbueSBNwtWgLCaKmgq3w/d/MsMh7Y="; - # https://github.com/python-versioneer/python-versioneer/issues/217 - postFetch = '' - sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' - ''; + src = fetchPypi { + inherit pname version; + hash = "sha256-adNwIA1z/TwWsa0gQb4hAsUvHInjd30sm1dYKXvvXy8="; }; postPatch = '' patchShebangs --build tests/ - patchShebangs --host snakemake/executors/jobscript.sh - substituteInPlace snakemake/shell.py \ - --replace "/bin/sh" "${runtimeShell}" + substituteInPlace tests/common.py \ + --replace-fail 'os.environ["PYTHONPATH"] = os.getcwd()' "pass" \ + --replace-fail 'del os.environ["PYTHONPATH"]' "pass" + substituteInPlace snakemake/unit_tests/__init__.py \ + --replace-fail '"unit_tests/templates"' '"'"$PWD"'/snakemake/unit_tests/templates"' ''; propagatedBuildInputs = with python3.pkgs; [ @@ -41,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { nbformat psutil pulp + pygments pyyaml requests reretry @@ -66,16 +63,54 @@ python3.pkgs.buildPythonApplication rec { numpy pandas pytestCheckHook + pytest-mock requests-mock snakemake-executor-plugin-cluster-generic + snakemake-storage-plugin-fs + stress ]; - disabledTestPaths = [ - "tests/test_conda_python_3_7_script/test_script.py" + pytestFlagsArray = [ + "tests/tests.py" + "tests/test_expand.py" + "tests/test_io.py" + "tests/test_schema.py" + "tests/test_executor_test_suite.py" + "tests/test_api.py" ]; + # Some will be disabled via https://github.com/snakemake/snakemake/pull/3074 disabledTests = [ + # requires graphviz + "test_filegraph" + # requires s3 + "test_storage" + "test_default_storage" + "test_output_file_cache_storage" + # requires peppy and eido + "test_pep" + "test_modules_peppy" + # requires perl + "test_shadow" + # requires snakemake-storage-plugin-http + "test_ancient" + "test_modules_prefix" + # requires snakemake-storage-plugin-s3 "test_deploy_sources" + # requires modules + "test_env_modules" + # issue with locating template file + "test_generate_unit_tests" + # weird + "test_strict_mode" + "test_issue1256" + "test_issue2574" + "test_github_issue1384" + # future-proofing + "conda" + "singularity" + "apptainer" + "container" ]; pythonImportsCheck = [ diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/applications/science/misc/toil/default.nix deleted file mode 100644 index 9142676fff48d..0000000000000 --- a/pkgs/applications/science/misc/toil/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -, rsync -}: - -python3.pkgs.buildPythonApplication rec { - pname = "toil"; - version = "5.12.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "DataBiosphere"; - repo = pname; - rev = "refs/tags/releases/${version}"; - hash = "sha256-cTpbQo9tPZifUO59vbnIa3XUinFJ2/5Slfe4yszglFM="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - addict - dill - docker - enlighten - psutil - py-tes - pypubsub - python-dateutil - pytz - pyyaml - requests - typing-extensions - ]; - - nativeCheckInputs = [ - rsync - ] ++ (with python3.pkgs; [ - boto - botocore - flask - pytestCheckHook - stubserver - ]); - - pytestFlagsArray = [ - "src/toil/test" - ]; - - pythonImportsCheck = [ - "toil" - ]; - - disabledTestPaths = [ - # Tests are reaching their timeout - "src/toil/test/docs/scriptsTest.py" - "src/toil/test/jobStores/jobStoreTest.py" - "src/toil/test/provisioners/aws/awsProvisionerTest.py" - "src/toil/test/src" - "src/toil/test/wdl" - "src/toil/test/utils/utilsTest.py" - "src/toil/test/cwl/cwlTest.py" - "src/toil/test/lib/test_ec2.py" - "src/toil/test/lib/aws/test_iam.py" - "src/toil/test/lib/aws/test_s3.py" - ]; - - disabledTests = [ - # Tests fail starting with 5.7.1 - "testServices" - "testConcurrencyWithDisk" - "testJobConcurrency" - "testNestedResourcesDoNotBlock" - "test_omp_threads" - "testFileSingle" - "testFileSingle10000" - "testFileSingleCheckpoints" - "testFileSingleNonCaching" - "testFetchJobStoreFiles" - "testFetchJobStoreFilesWSymlinks" - "testJobStoreContents" - "test_cwl_on_arm" - "test_cwl_toil_kill" - ]; - - meta = with lib; { - description = "Workflow engine written in pure Python"; - homepage = "https://toil.ucsc-cgl.org/"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 9808a572836d8..590b429e73f0e 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake wrapQtAppsHook ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ libxml2 freetype glew libjpeg qtbase python3 ] - ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] - ++ lib.optionals stdenv.isLinux [ libGLU libGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL ]; qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ # fatal error: 'Python.h' file not found "-I${python3}/include/${python3.libPrefix}" # error: format string is not a string literal (potentially insecure) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 6531002ceb31b..1eed4ff7c3d60 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -40,13 +40,13 @@ let source = if enablePlumed then { - version = "2023"; - hash = "sha256-rJLG2nL7vMpBT9io2Xnlbs8XxMHNq+0tpc+05yd7e6g="; + version = "2024.2"; + hash = "sha256-gCp+M18uiVdw9XsVnk7DaOuw/yzm2sz3BsboAlw2hSs="; } else { - version = "2024.2"; - hash = "sha256-gCp+M18uiVdw9XsVnk7DaOuw/yzm2sz3BsboAlw2hSs="; + version = "2024.3"; + hash = "sha256-u9oFbuWTkL59WNhME6nsDU42NWF63y63RwNJIsuh8Ck="; }; in stdenv.mkDerivation rec { @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { patches = [ ./pkgconfig.patch ]; postPatch = lib.optionalString enablePlumed '' - plumed patch -p -e gromacs-2023 + plumed patch -p -e gromacs-${source.version} ''; outputs = [ "out" "dev" "man" ]; @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { cudaPackages.cuda_cudart cudaPackages.libcufft cudaPackages.cuda_profiler_api - ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = lib.optional enableMpi mpi; propagatedUserEnvPkgs = lib.optional enableMpi mpi; diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix deleted file mode 100644 index 30253dfe493a5..0000000000000 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, libpng -, gzip -, fftw -, blas -, lapack -, cmake -, autoAddDriverRunpath -, pkg-config -# Available list of packages can be found near here: -# -# - https://github.com/lammps/lammps/blob/develop/cmake/CMakeLists.txt#L222 -# - https://docs.lammps.org/Build_extras.html -, packages ? { - ASPHERE = true; - BODY = true; - CLASS2 = true; - COLLOID = true; - COMPRESS = true; - CORESHELL = true; - DIPOLE = true; - GRANULAR = true; - KSPACE = true; - MANYBODY = true; - MC = true; - MISC = true; - MOLECULE = true; - OPT = true; - PERI = true; - QEQ = true; - REPLICA = true; - RIGID = true; - SHOCK = true; - ML-SNAP = true; - SRD = true; - REAXFF = true; -} -# Extra cmakeFlags to add as "-D${attr}=${value}" -, extraCmakeFlags ? {} -# Extra `buildInputs` - meant for packages that require more inputs -, extraBuildInputs ? [] -}: - -stdenv.mkDerivation (finalAttrs: { - # LAMMPS has weird versioning convention. Updates should go smoothly with: - # nix-update --commit lammps --version-regex 'stable_(.*)' - version = "2Aug2023_update4"; - pname = "lammps"; - - src = fetchFromGitHub { - owner = "lammps"; - repo = "lammps"; - rev = "stable_${finalAttrs.version}"; - hash = "sha256-4y41kRO1iKFoCDVe6Dap4njcFa3z+9acKomoxOL7ipI="; - }; - preConfigure = '' - cd cmake - ''; - 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 - ]; - - passthru = { - # Remove these at some point - perhaps after release 23.11. See discussion at: - # https://github.com/NixOS/nixpkgs/pull/238771#discussion_r1235459961 - mpi = throw "`lammps-mpi.passthru.mpi` was removed in favor of `extraBuildInputs`"; - inherit packages; - inherit extraCmakeFlags; - inherit extraBuildInputs; - }; - cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" true) - ] - ++ (lib.mapAttrsToList (n: v: lib.cmakeBool "PKG_${n}" v) packages) - ++ (lib.mapAttrsToList (n: v: "-D${n}=${v}") extraCmakeFlags) - ; - - buildInputs = [ - fftw - libpng - blas - lapack - gzip - ] ++ extraBuildInputs - ; - - postInstall = '' - # For backwards compatibility - ln -s $out/bin/lmp $out/bin/lmp_serial - # Install vim and neovim plugin - install -Dm644 ../../tools/vim/lammps.vim $out/share/vim-plugins/lammps/syntax/lammps.vim - install -Dm644 ../../tools/vim/filetype.vim $out/share/vim-plugins/lammps/ftdetect/lammps.vim - mkdir -p $out/share/nvim - ln -s $out/share/vim-plugins/lammps $out/share/nvim/site - ''; - - meta = { - description = "Classical Molecular Dynamics simulation code"; - longDescription = '' - LAMMPS is a classical molecular dynamics simulation code designed to - run efficiently on parallel computers. It was developed at Sandia - National Laboratories, a US Department of Energy facility, with - funding from the DOE. It is an open-source code, distributed freely - under the terms of the GNU Public License (GPL). - ''; - homepage = "https://www.lammps.org"; - license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; - # compiling lammps with 64 bit support blas and lapack might cause runtime - # segfaults. In anycase both blas and lapack should have the same #bits - # support. - broken = (blas.isILP64 && lapack.isILP64); - maintainers = with lib.maintainers; [ - costrouc - doronbehar - ]; - mainProgram = "lmp"; - }; -}) diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index e7eb69fb4e1c1..b6f8a0d6f13c9 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -75,7 +75,7 @@ let let version = "7.4.0"; src = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-osx-64-noX11.zip"; @@ -86,7 +86,7 @@ let url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-linux-64-noX11.zip"; hash = "sha256:1f2qins5kaz5v6mkaclncqpirx3mlz177ywm13py9p6s9mk99g32"; }; - mosflmBinary = if stdenv.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11"; + mosflmBinary = if stdenv.hostPlatform.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11"; in stdenv.mkDerivation { pname = "mosflm"; @@ -209,9 +209,9 @@ stdenv.mkDerivation rec { xgandalf pandoc ] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone - ] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [ memorymappingHook ] ++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ]; diff --git a/pkgs/applications/science/physics/crystfel/disable-fmemopen-on-aarch64-darwin.patch b/pkgs/applications/science/physics/crystfel/disable-fmemopen-on-aarch64-darwin.patch deleted file mode 100644 index c35350d0008f8..0000000000000 --- a/pkgs/applications/science/physics/crystfel/disable-fmemopen-on-aarch64-darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libcrystfel/src/image-cbf.c b/libcrystfel/src/image-cbf.c -index b8f09a1f..f8a15c1b 100644 ---- a/libcrystfel/src/image-cbf.c -+++ b/libcrystfel/src/image-cbf.c -@@ -287,7 +287,7 @@ static float *read_cbf_data(const char *filename, int gz, int *w, int *h) - - } else { - -- #ifdef HAVE_ZLIB -+ #if defined(HAVE_ZLIB) && !(defined(__aarch64__) && defined(__APPLE__)) - gzFile gzfh; - int len_read; - size_t len; diff --git a/pkgs/applications/science/physics/fasthenry/default.nix b/pkgs/applications/science/physics/fasthenry/default.nix index 6b9a73f6dd175..963828e18edc4 100644 --- a/pkgs/applications/science/physics/fasthenry/default.nix +++ b/pkgs/applications/science/physics/fasthenry/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { SHELL="sh" "all" ) - '' + (if stdenv.isx86_64 then '' + '' + (if stdenv.hostPlatform.isx86_64 then '' makeFlagsArray+=( CFLAGS="-fcommon -O -DFOUR -m64" ); diff --git a/pkgs/applications/science/physics/professor/default.nix b/pkgs/applications/science/physics/professor/default.nix index 1c6c21c52fef8..60a030f528211 100644 --- a/pkgs/applications/science/physics/professor/default.nix +++ b/pkgs/applications/science/physics/professor/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ --replace-fail 'pip install ' 'pip install --prefix $(out) ' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace-fail '-shared -o' '-shared -install_name "$(out)/$@" -o' ''; diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index dbe2365371393..b6b53446473fc 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace configure --replace HAVE_LCG=yes HAVE_LCG=no '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace LIB_SUFFIX=\"so\" LIB_SUFFIX=\"dylib\" ''; @@ -29,7 +29,7 @@ stdenv.mkDerivation { "--with-pythia=${pythia}" ]; - postInstall = if stdenv.isDarwin then '' + postInstall = if stdenv.hostPlatform.isDarwin then '' install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia '' else '' wrapProgram $out/bin/run-pythia \ @@ -46,6 +46,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 21a5ee7ec234a..2dfe3f7d7bb2c 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 8a92c85a13830..e509f3a005f7e 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # workaround wrong library IDs - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -sv "$out/lib/xfitter/"* "$out/lib/" ''; diff --git a/pkgs/applications/science/physics/xnec2c/default.nix b/pkgs/applications/science/physics/xnec2c/default.nix index ffdd4b6d0b07f..aaff1ff40d313 100644 --- a/pkgs/applications/science/physics/xnec2c/default.nix +++ b/pkgs/applications/science/physics/xnec2c/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # Darwin support likely to be fixed upstream in the next release - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/science/robotics/inav-configurator/default.nix b/pkgs/applications/science/robotics/inav-configurator/default.nix index 364f5185d00a8..6862b909b044a 100644 --- a/pkgs/applications/science/robotics/inav-configurator/default.nix +++ b/pkgs/applications/science/robotics/inav-configurator/default.nix @@ -33,14 +33,16 @@ stdenv.mkDerivation rec { runHook postInstall ''; - desktopItems = makeDesktopItem { - name = pname; - exec = pname; - icon = pname; - comment = "iNavFlight configuration tool"; - desktopName = "iNav Configurator"; - genericName = "Flight controller configuration tool"; - }; + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = "iNavFlight configuration tool"; + desktopName = "iNav Configurator"; + genericName = "Flight controller configuration tool"; + }) + ]; meta = with lib; { description = "INav flight control system configuration tool"; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index f86ca5f635e48..e36b3d62b696f 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { pyserial setuptools wxpython - ] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ billiard gnureadline ]; # No tests doCheck = false; diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/applications/science/robotics/mission-planner/default.nix index 0e60cb1fc2604..bd8ac9ed4b973 100644 --- a/pkgs/applications/science/robotics/mission-planner/default.nix +++ b/pkgs/applications/science/robotics/mission-planner/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono }: +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono, gitUpdater +}: let pname = "mission-planner"; @@ -12,11 +13,12 @@ let }; in stdenv.mkDerivation rec { inherit pname; - version = "1.3.80"; + version = "1.3.82"; src = fetchurl { - url = "https://firmware.ardupilot.org/Tools/MissionPlanner/MissionPlanner-${version}.zip"; - sha256 = "sha256-iivlaQWtOMJHchmR92FoqTaosGJ9F1AgFtuFgDE/9qQ="; + url = + "https://firmware.ardupilot.org/Tools/MissionPlanner/MissionPlanner-${version}.zip"; + sha256 = "sha256-554fFDxHMo4jV3yrPdGgDYQ6XeW+TWdVIIkGQIBdrCQ="; }; nativeBuildInputs = [ makeWrapper mono unzip ]; @@ -44,6 +46,8 @@ in stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "ArduPilot ground station"; mainProgram = "mission-planner"; diff --git a/pkgs/applications/science/robotics/mujoco/default.nix b/pkgs/applications/science/robotics/mujoco/default.nix deleted file mode 100644 index f36d316164aac..0000000000000 --- a/pkgs/applications/science/robotics/mujoco/default.nix +++ /dev/null @@ -1,192 +0,0 @@ -{ cereal_1_3_2 -, cmake -, fetchFromGitHub -, fetchFromGitLab -, glfw -, glm -, lib -, spdlog -, stdenv -}: - -let - pin = { - # TODO: Check the following file and ensure the dependencies are up-to-date - # See https://github.com/google-deepmind/mujoco/blob/<VERSION>/cmake/MujocoDependencies.cmake#L17-L64 - abseil-cpp = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - rev = "4447c7562e3bc702ade25105912dce503f0c4010"; - hash = "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4="; - }; - benchmark = fetchFromGitHub { - owner = "google"; - repo = "benchmark"; - rev = "7c8ed6b082aa3c7a3402f18e50da4480421d08fd"; - hash = "sha256-xX3o4wX7RUvw1x2gOlT6sGhutDYLBZ/JzFnv68qN6E8="; - }; - ccd = fetchFromGitHub { - owner = "danfis"; - repo = "libccd"; - rev = "7931e764a19ef6b21b443376c699bbc9c6d4fba8"; - hash = "sha256-TIZkmqQXa0+bSWpqffIgaBela0/INNsX9LPM026x1Wk="; - }; - eigen3 = fetchFromGitLab { - owner = "libeigen"; - repo = "eigen"; - rev = "33d0937c6bdf5ec999939fb17f2a553183d14a74"; - hash = "sha256-qmFsmFEQCDH+TRFc8+5BsYAG1ybL08fWhn8NpM6H6xY="; - }; - googletest = fetchFromGitHub { - owner = "google"; - repo = "googletest"; - rev = "b514bdc898e2951020cbdca1304b75f5950d1f59"; - hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM="; - }; - lodepng = fetchFromGitHub { - owner = "lvandeve"; - repo = "lodepng"; - rev = "b4ed2cd7ecf61d29076169b49199371456d4f90b"; - hash = "sha256-5cCkdj/izP4e99BKfs/Mnwu9aatYXjlyxzzYiMD/y1M="; - }; - qhull = fetchFromGitHub { - owner = "qhull"; - repo = "qhull"; - rev = "0c8fc90d2037588024d9964515c1e684f6007ecc"; - hash = "sha256-Ptzxad3ewmKJbbcmrBT+os4b4SR976zlCG9F0nq0x94="; - }; - tinyobjloader = fetchFromGitHub { - owner = "tinyobjloader"; - repo = "tinyobjloader"; - rev = "1421a10d6ed9742f5b2c1766d22faa6cfbc56248"; - hash = "sha256-9z2Ne/WPCiXkQpT8Cun/pSGUwgClYH+kQ6Dx1JvW6w0="; - }; - tinyxml2 = fetchFromGitHub { - owner = "leethomason"; - repo = "tinyxml2"; - rev = "9a89766acc42ddfa9e7133c7d81a5bda108a0ade"; - hash = "sha256-YGAe4+Ttv/xeou+9FoJjmQCKgzupTYdDhd+gzvtz/88="; - }; - marchingcubecpp = fetchFromGitHub { - owner = "aparis69"; - repo = "MarchingCubeCpp"; - rev = "f03a1b3ec29b1d7d865691ca8aea4f1eb2c2873d"; - hash = "sha256-90ei0lpJA8XuVGI0rGb3md0Qtq8/bdkU7dUCHpp88Bw="; - }; - - tmd = stdenv.mkDerivation rec { - name = "TriangleMeshDistance"; - - src = fetchFromGitHub { - owner = "InteractiveComputerGraphics"; - repo = name; - rev = "e55a15c20551f36242fd6368df099a99de71d43a"; - hash = "sha256-vj6TMMT8mp7ciLa5nzVAhMWPcAHXq+ZwHlWsRA3uCmg="; - }; - - installPhase = '' - mkdir -p $out/include/tmd - cp ${name}/include/tmd/${name}.h $out/include/tmd/ - ''; - }; - - sdflib = stdenv.mkDerivation rec { - name = "SdfLib"; - - src = fetchFromGitHub { - owner = "UPC-ViRVIG"; - repo = name; - rev = "1927bee6bb8225258a39c8cbf14e18a4d50409ae"; - hash = "sha256-+SFUOdZ6pGZvnQa0mT+yfbTMHWe2CTOlroXcuVBHdOE="; - }; - - patches = [ ./sdflib-system-deps.patch ]; - - cmakeFlags = [ - "-DSDFLIB_USE_ASSIMP=OFF" - "-DSDFLIB_USE_OPENMP=OFF" - "-DSDFLIB_USE_ENOKI=OFF" - "-DSDFLIB_USE_SYSTEM_GLM=ON" - "-DSDFLIB_USE_SYSTEM_SPDLOG=ON" - "-DSDFLIB_USE_SYSTEM_CEREAL=ON" - "-DSDFLIB_USE_SYSTEM_TRIANGLEMESHDISTANCE=ON" - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - pin.tmd - - # Mainline. The otherwise pinned glm realease from 2018 does - # not build due to test failures and missing files. - glm - - spdlog - cereal_1_3_2 - ]; - }; - - }; - -in stdenv.mkDerivation rec { - pname = "mujoco"; - version = "3.2.2"; - - # Bumping version? Make sure to look though the MuJoCo's commit - # history for bumped dependency pins! - src = fetchFromGitHub { - owner = "google-deepmind"; - repo = "mujoco"; - rev = "refs/tags/${version}"; - hash = "sha256-UUPB7AY6OYWaK5uBu92kmoIE116AfFa34sYmF943AOU="; - }; - - patches = [ ./mujoco-system-deps-dont-fetch.patch ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - pin.sdflib - glm - - # non-numerical - spdlog - cereal_1_3_2 - glfw - ]; - - cmakeFlags = [ - "-DMUJOCO_USE_SYSTEM_sdflib=ON" - "-DMUJOCO_SIMULATE_USE_SYSTEM_GLFW=ON" - "-DMUJOCO_SAMPLES_USE_SYSTEM_GLFW=ON" - ]; - - # 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 - ln -s ${pin.ccd} build/_deps/ccd-src - ln -s ${pin.eigen3} build/_deps/eigen3-src - ln -s ${pin.googletest} build/_deps/googletest-src - ln -s ${pin.lodepng} build/_deps/lodepng-src - ln -s ${pin.qhull} build/_deps/qhull-src - ln -s ${pin.tinyobjloader} build/_deps/tinyobjloader-src - ln -s ${pin.tinyxml2} build/_deps/tinyxml2-src - ln -s ${pin.marchingcubecpp} build/_deps/marchingcubecpp-src - ''; - - passthru.pin = { inherit (pin) lodepng eigen3 abseil-cpp; }; - - meta = { - description = "Multi-Joint dynamics with Contact. A general purpose physics simulator"; - homepage = "https://mujoco.org/"; - changelog = "https://github.com/google-deepmind/mujoco/releases/tag/${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - GaetanLepage - samuela - tmplt - ]; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix deleted file mode 100644 index c2ee629d77ba9..0000000000000 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, SDL2, qtbase, qtcharts, qtlocation, qtserialport -, qtsvg, qtquickcontrols2, qtgraphicaleffects, qtspeech, qtx11extras, qmake -, qttools, gst_all_1, wayland, pkg-config, wrapQtAppsHook }: - -stdenv.mkDerivation rec { - pname = "qgroundcontrol"; - version = "4.4.1"; - - propagatedBuildInputs = [ - qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 - qtgraphicaleffects qtspeech qtx11extras - ]; - - gstInputs = with gst_all_1; [ - gstreamer - gst-plugins-base - (gst-plugins-good.override { qt5Support = true; }) - gst-plugins-bad - gst-libav - wayland - ]; - - buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs; - nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ]; - - preConfigure = '' - mkdir build - cd build - ''; - - qmakeFlags = [ - "CONFIG+=StableBuild" - # Default install tries to copy Qt files into package - "CONFIG+=QGC_DISABLE_BUILD_SETUP" - # Tries to download x86_64-only prebuilt binaries - "DEFINES+=DISABLE_AIRMAP" - "../qgroundcontrol.pro" - ]; - - installPhase = '' - runHook preInstall - - cd .. - - mkdir -p $out/share/applications - sed 's/Exec=.*$/Exec=QGroundControl/g' --in-place deploy/qgroundcontrol.desktop - cp -v deploy/qgroundcontrol.desktop $out/share/applications - - mkdir -p $out/bin - cp -v build/staging/QGroundControl "$out/bin/" - - mkdir -p $out/share/qgroundcontrol - cp -rv resources/ $out/share/qgroundcontrol - - mkdir -p $out/share/pixmaps - cp -v resources/icons/qgroundcontrol.png $out/share/pixmaps - - runHook postInstall - ''; - - postInstall = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - # TODO: package mavlink so we can build from a normal source tarball - src = fetchFromGitHub { - owner = "mavlink"; - repo = pname; - rev = "v${version}"; - hash = "sha256-FdF9QQYCF7HbmjvUQgV6HytJo2Aje2OEDPO2GSl1dqE="; - fetchSubmodules = true; - }; - - meta = with lib; { - description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; - homepage = "http://qgroundcontrol.com/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ lopsided98 pandapip1 ]; - mainProgram = "QGroundControl"; - }; -} diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index 3b33096dc683f..4f2e45384b76c 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -18,11 +18,9 @@ stdenv.mkDerivation rec { "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON" "-DCREATE_YARPC:BOOL=ON" "-DCREATE_YARPCXX:BOOL=ON" + "-DCMAKE_INSTALL_LIBDIR=${placeholder "out"}/lib" ]; - # since we cant expand $out in cmakeFlags - preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_LIBDIR=$out/lib"''; - postInstall = "mv ./$out/lib/*.so $out/lib/"; meta = { diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 5de1166e116dd..21618f8ed3ecc 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -68,7 +68,7 @@ let filters = { perl = perl.passthru.withPackages (p: [ p.ImageExifTool ]); }; filterPath = lib.makeBinPath (map lib.getBin (builtins.attrValues filters)); - useInotify = if stdenv.isLinux then "true" else "false"; + useInotify = if stdenv.hostPlatform.isLinux then "true" else "false"; in mkDerivation rec { @@ -138,7 +138,7 @@ mkDerivation rec { file ] ++ lib.optionals withGui [ qtbase - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; @@ -167,15 +167,15 @@ mkDerivation rec { --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} wrapProgram $out/share/recoll/filters/rclimg \ --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' - '' + lib.optionalString (stdenv.isDarwin && withGui) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && withGui) '' mkdir $out/Applications mv $out/bin/recoll.app $out/Applications ''; # create symlink after fixup to prevent double wrapping of recoll - postFixup = lib.optionalString (stdenv.isDarwin && withGui) '' + postFixup = lib.optionalString (stdenv.hostPlatform.isDarwin && withGui) '' ln -s ../Applications/recoll.app/Contents/MacOS/recoll $out/bin/recoll ''; diff --git a/pkgs/applications/system/asusctl/Cargo.lock b/pkgs/applications/system/asusctl/Cargo.lock index 2b300d0606f42..13906906d0da1 100644 --- a/pkgs/applications/system/asusctl/Cargo.lock +++ b/pkgs/applications/system/asusctl/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.26" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -33,6 +33,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.8.11" @@ -63,12 +69,12 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", @@ -105,21 +111,21 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27a4bd113ab6da4cd0f521068a6e2ee1065eab54107266a11835d02c8ec86a37" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-raw-xcb-connection" @@ -129,7 +135,7 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "asusctl" -version = "6.0.9" +version = "6.0.12" dependencies = [ "asusd", "cargo-husky", @@ -147,7 +153,7 @@ dependencies = [ [[package]] name = "asusd" -version = "6.0.9" +version = "6.0.12" dependencies = [ "cargo-husky", "concat-idents", @@ -158,14 +164,13 @@ dependencies = [ "inotify", "log", "logind-zbus", - "mio", + "mio 0.8.11", "rog_anime", "rog_aura", "rog_platform", "rog_profiles", "rog_slash", "serde", - "serde_derive", "tokio", "udev 0.8.0", "zbus", @@ -173,7 +178,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "6.0.9" +version = "6.0.12" dependencies = [ "cargo-husky", "config-traits", @@ -185,19 +190,18 @@ dependencies = [ "rog_platform", "ron", "serde", - "serde_derive", "smol", "zbus", ] [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener 5.3.1", + "event-listener-strategy", "futures-core", "pin-project-lite", ] @@ -215,26 +219,25 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -257,7 +260,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 3.3.0", + "async-lock 3.4.0", "blocking", "futures-lite 2.3.0", ] @@ -284,21 +287,21 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ - "async-lock 3.3.0", + "async-lock 3.4.0", "cfg-if", "concurrent-queue", "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.35", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -312,12 +315,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] @@ -345,28 +348,28 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.48.0", ] [[package]] name = "async-process" -version = "2.2.2" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ - "async-channel 2.3.0", - "async-io 2.3.2", - "async-lock 3.3.0", + "async-channel 2.3.1", + "async-io 2.3.4", + "async-lock 3.4.0", "async-signal", "async-task", "blocking", "cfg-if", - "event-listener 5.3.0", + "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.34", + "rustix 0.38.35", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -377,25 +380,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.4", + "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix 0.38.35", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -417,7 +420,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -428,13 +431,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -445,14 +448,14 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auto_enums" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1899bfcfd9340ceea3533ea157360ba8fa864354eccbceab58e1006ecab35393" +checksum = "459b77b7e855f875fd15f101064825cd79eb83185a961d66e6298560126facfb" dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -463,18 +466,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", "http", "http-body", - "hyper", + "http-body-util", "itoa", "matchit", "memchr", @@ -483,7 +485,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", + "sync_wrapper 1.0.1", "tower", "tower-layer", "tower-service", @@ -491,32 +493,35 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", "http", "http-body", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", ] [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.7.2", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -539,16 +544,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88df312fbb13c845a05ede7e91ab7b9fea442d9176d092bbdb954ae6db55ad5d" dependencies = [ - "async-io 2.3.2", + "async-io 2.3.4", "block2 0.4.0", "flume", - "icrate 0.1.2", + "icrate", "log", - "objc2 0.5.1", + "objc2", "once_cell", "parking_lot", "png", - "windows 0.56.0", + "windows", "zbus", ] @@ -558,10 +563,10 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools", + "itertools 0.12.1", "lazy_static", "lazycell", "log", @@ -571,7 +576,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.63", + "syn 2.0.76", "which", ] @@ -589,9 +594,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -622,32 +627,30 @@ dependencies = [ [[package]] name = "block2" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" dependencies = [ "block-sys", - "objc2 0.4.1", + "objc2", ] [[package]] name = "block2" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "block-sys", - "objc2 0.5.1", + "objc2", ] [[package]] name = "blocking" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel 2.3.0", - "async-lock 3.3.0", + "async-channel 2.3.1", "async-task", "futures-io", "futures-lite 2.3.0", @@ -668,22 +671,22 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -692,11 +695,17 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "calloop" @@ -704,22 +713,36 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", + "log", + "polling 3.7.3", + "rustix 0.38.35", + "slab", + "thiserror", +] + +[[package]] +name = "calloop" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +dependencies = [ + "bitflags 2.6.0", "log", - "polling 3.7.0", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.35", "slab", "thiserror", ] [[package]] name = "calloop-wayland-source" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop", - "rustix 0.38.34", + "calloop 0.13.0", + "rustix 0.38.35", "wayland-backend", "wayland-client", ] @@ -732,13 +755,13 @@ checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad" [[package]] name = "cc" -version = "1.0.97" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -762,12 +785,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "cfg_aliases" version = "0.2.1" @@ -794,18 +811,18 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.3", + "libloading", ] [[package]] @@ -893,7 +910,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -907,7 +924,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "6.0.9" +version = "6.0.12" dependencies = [ "cargo-husky", "log", @@ -917,9 +934,9 @@ dependencies = [ [[package]] name = "console-api" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" +checksum = "86ed14aa9c9f927213c6e4f3ef75faaad3406134efe84ba2cb7983431d5f0931" dependencies = [ "futures-core", "prost", @@ -930,9 +947,9 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" +checksum = "e2e3a111a37f3333946ebf9da370ba5c5577b18eb342ec683eb488dd21980302" dependencies = [ "console-api", "crossbeam-channel", @@ -940,6 +957,8 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", + "hyper-util", + "prost", "prost-types", "serde", "serde_json", @@ -955,7 +974,7 @@ dependencies = [ [[package]] name = "const-field-offset" version = "0.1.5" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "const-field-offset-macro", "field-offset", @@ -964,11 +983,11 @@ dependencies = [ [[package]] name = "const-field-offset-macro" version = "0.1.5" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -1003,9 +1022,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -1051,37 +1070,37 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cpuctl" -version = "6.0.9" +version = "6.0.12" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "critical-section" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" +checksum = "f64009896348fc5af4222e9cf7d7d82a95a256c634ebcf61c53e4ea461422242" [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1107,9 +1126,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1128,23 +1147,10 @@ dependencies = [ ] [[package]] -name = "css-color-parser2" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf8ed1639f4b56ec6f31d007ff66ce4a13099dce5a9995d48368a30d62bf04bd" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "ctor" -version = "0.2.8" +name = "ctor-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" -dependencies = [ - "quote", - "syn 2.0.63", -] +checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b" [[package]] name = "cursor-icon" @@ -1169,26 +1175,26 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.76", ] [[package]] name = "derive_utils" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" +checksum = "65f152f4b8559c4da5d574bafc7af85454d706b4c5fe8b530d508cacbb6807ea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -1254,12 +1260,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading", ] [[package]] name = "dmi_id" -version = "6.0.9" +version = "6.0.12" dependencies = [ "log", "udev 0.8.0", @@ -1271,6 +1277,12 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + [[package]] name = "drm" version = "0.9.0" @@ -1325,9 +1337,9 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "endi" @@ -1337,9 +1349,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -1347,13 +1359,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -1387,9 +1399,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.9" +version = "0.22.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" dependencies = [ "num-traits", ] @@ -1413,43 +1425,22 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "pin-project-lite", ] @@ -1463,7 +1454,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide 0.7.2", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -1480,9 +1471,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1495,14 +1486,14 @@ dependencies = [ [[package]] name = "femtovg" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a056992c3a862ef9d4452bad8b6b455780382502b38b93540fb17773a54ca092" +checksum = "47921d14afc4daad9bedc926099bc6edcaa23e37a957448f86cdefcbafe2f632" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "fnv", "glow", - "image", + "image 0.25.2", "imgref", "log", "lru", @@ -1521,30 +1512,30 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.1", + "memoffset", "rustc_version", ] [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox 0.1.3", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide 0.7.2", + "miniz_oxide 0.8.0", ] [[package]] @@ -1573,35 +1564,36 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ "roxmltree", ] [[package]] name = "fontdb" -version = "0.16.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" dependencies = [ "fontconfig-parser", "log", "memmap2 0.9.4", "slotmap", "tinyvec", - "ttf-parser 0.20.0", + "ttf-parser 0.21.1", ] [[package]] name = "fontdue" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9099a2f86b8e674b75d03ff154b3fe4c5208ed249ced8d69cc313a9fa40bb488" +checksum = "efe23d02309319171d00d794c9ff48d4f903c0e481375b1b04b017470838af04" dependencies = [ "hashbrown 0.14.5", - "ttf-parser 0.20.0", + "rayon", + "ttf-parser 0.21.1", ] [[package]] @@ -1622,7 +1614,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -1682,7 +1674,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -1749,16 +1741,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "gethostname" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "gethostname" version = "0.4.3" @@ -1824,9 +1806,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gl_generator" @@ -1868,55 +1850,56 @@ dependencies = [ [[package]] name = "glutin" -version = "0.31.3" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746" +checksum = "2491aa3090f682ddd920b184491844440fdd14379c7eef8f5bc10ef7fb3242fd" dependencies = [ - "bitflags 2.5.0", - "cfg_aliases 0.1.1", + "bitflags 2.6.0", + "cfg_aliases", "cgl", "core-foundation", "dispatch", "glutin_egl_sys", "glutin_glx_sys", "glutin_wgl_sys", - "icrate 0.0.4", - "libloading 0.8.3", - "objc2 0.4.1", + "libloading", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", - "raw-window-handle 0.5.2", + "raw-window-handle", "wayland-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", ] [[package]] name = "glutin-winit" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebcdfba24f73b8412c5181e56f092b5eff16671c514ce896b258a0a64bd7735" +checksum = "85edca7075f8fc728f28cb8fbb111a96c3b89e930574369e3e9c27eb75d3788f" dependencies = [ - "cfg_aliases 0.1.1", + "cfg_aliases", "glutin", - "raw-window-handle 0.5.2", + "raw-window-handle", "winit", ] [[package]] name = "glutin_egl_sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77cc5623f5309ef433c3dd4ca1223195347fe62c413da8e2fdd0eb76db2d9bcd" +checksum = "cae99fff4d2850dbe6fb8c1fa8e4fead5525bab715beaacfccf3fb994e01c827" dependencies = [ "gl_generator", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "glutin_glx_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a165fd686c10dcc2d45380b35796e577eacfd43d4660ee741ec8ebe2201b3b4f" +checksum = "9c2b2d3918e76e18e08796b55eb64e8fe6ec67d5a6b2e2a7e2edce224ad24c63" dependencies = [ "gl_generator", "x11-dl", @@ -1924,9 +1907,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] @@ -1953,17 +1936,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.26" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http", - "indexmap 2.2.6", + "indexmap 2.4.0", "slab", "tokio", "tokio-util", @@ -1994,6 +1977,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", + "rayon", ] [[package]] @@ -2011,9 +1995,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -2021,6 +2005,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -2038,9 +2028,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2049,20 +2039,32 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -2078,13 +2080,12 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", "http", @@ -2093,31 +2094,50 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", "hyper", "pin-project-lite", + "socket2 0.5.7", "tokio", - "tokio-io-timeout", + "tower", + "tower-service", + "tracing", ] [[package]] name = "i-slint-backend-linuxkms" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +version = "1.8.0" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ - "calloop", + "calloop 0.12.4", "drm", "gbm", "gbm-sys", @@ -2128,14 +2148,14 @@ dependencies = [ "input", "libseat", "nix 0.27.1", - "raw-window-handle 0.5.2", + "raw-window-handle", "xkbcommon", ] [[package]] name = "i-slint-backend-selector" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +version = "1.8.0" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "cfg-if", "i-slint-backend-linuxkms", @@ -2146,11 +2166,11 @@ dependencies = [ [[package]] name = "i-slint-backend-winit" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +version = "1.8.0" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "cocoa", "const-field-offset", "copypasta", @@ -2165,7 +2185,7 @@ dependencies = [ "lyon_path", "once_cell", "pin-weak", - "raw-window-handle 0.5.2", + "raw-window-handle", "scoped-tls-hkt", "scopeguard", "softbuffer", @@ -2176,29 +2196,28 @@ dependencies = [ [[package]] name = "i-slint-common" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +version = "1.8.0" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "cfg-if", "derive_more", "fontdb", - "libloading 0.8.3", + "libloading", ] [[package]] name = "i-slint-compiler" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +version = "1.8.0" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "by_address", "codemap", "codemap-diagnostic", - "css-color-parser2", "derive_more", "fontdue", "i-slint-common", - "image", - "itertools", + "image 0.24.9", + "itertools 0.13.0", "linked_hash_set", "lyon_extra", "lyon_path", @@ -2216,12 +2235,13 @@ dependencies = [ [[package]] name = "i-slint-core" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +version = "1.8.0" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "auto_enums", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", + "chrono", "clru", "const-field-offset", "derive_more", @@ -2229,7 +2249,7 @@ dependencies = [ "gettext-rs", "i-slint-common", "i-slint-core-macros", - "image", + "image 0.24.9", "integer-sqrt", "lyon_algorithms", "lyon_extra", @@ -2240,7 +2260,7 @@ dependencies = [ "pin-project", "pin-weak", "portable-atomic", - "raw-window-handle 0.6.1", + "raw-window-handle", "resvg", "rgb", "scoped-tls-hkt", @@ -2254,22 +2274,22 @@ dependencies = [ "vtable", "wasm-bindgen", "web-sys", - "web-time 1.1.0", + "web-time", ] [[package]] name = "i-slint-core-macros" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +version = "1.8.0" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] name = "i-slint-renderer-femtovg" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +version = "1.8.0" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "cfg-if", "const-field-offset", @@ -2286,10 +2306,9 @@ dependencies = [ "lyon_path", "once_cell", "pin-weak", - "raw-window-handle 0.5.2", "rgb", "scoped-tls-hkt", - "ttf-parser 0.20.0", + "ttf-parser 0.21.1", "unicode-script", "unicode-segmentation", "wasm-bindgen", @@ -2299,12 +2318,12 @@ dependencies = [ [[package]] name = "i-slint-renderer-skia" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +version = "1.8.0" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "bytemuck", "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "cocoa", "const-field-offset", "core-foundation", @@ -2321,13 +2340,13 @@ dependencies = [ "objc", "once_cell", "pin-weak", - "raw-window-handle 0.5.2", + "raw-window-handle", "scoped-tls-hkt", "skia-safe", "softbuffer", "unicode-segmentation", "vtable", - "windows 0.54.0", + "windows", ] [[package]] @@ -2353,17 +2372,6 @@ dependencies = [ "cc", ] -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2 0.3.0", - "dispatch", - "objc2 0.4.1", -] - [[package]] name = "icrate" version = "0.1.2" @@ -2371,7 +2379,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" dependencies = [ "block2 0.4.0", - "objc2 0.5.1", + "objc2", ] [[package]] @@ -2402,6 +2410,17 @@ dependencies = [ "tiff", ] +[[package]] +name = "image" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "num-traits", +] + [[package]] name = "imagesize" version = "0.12.0" @@ -2426,9 +2445,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -2478,9 +2497,9 @@ checksum = "bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0" [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -2500,18 +2519,18 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -2525,6 +2544,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2555,9 +2583,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -2573,9 +2601,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2604,9 +2632,9 @@ checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -2622,28 +2650,18 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2658,7 +2676,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -2669,8 +2687,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall 0.5.3", ] [[package]] @@ -2738,9 +2757,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "locale_config" @@ -2767,15 +2786,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logind-zbus" -version = "4.0.3" +version = "4.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e77231dda256523272d8168cf57a9f214ccef06d385c126ce64df662ca5721e" +checksum = "a85a07c35bc3d71bd5ce956b6e89420fbce7e221da18ce2c685c0c784e64fa01" dependencies = [ "serde", "zbus", @@ -2783,9 +2802,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" [[package]] name = "lyon_algorithms" @@ -2820,9 +2839,9 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7" dependencies = [ "lyon_geom", "num-traits", @@ -2830,9 +2849,9 @@ dependencies = [ [[package]] name = "mac-notification-sys" -version = "0.5.9" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9402858e87f85f88bf518bd2e68450640df1c99b1ddb3ea28c4d5d823bb54cdd" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" dependencies = [ "cc", "dirs-next", @@ -2867,9 +2886,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2889,15 +2908,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -2913,7 +2923,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types", @@ -2946,14 +2956,23 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.8.11" @@ -2966,6 +2985,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "nanorand" version = "0.7.0" @@ -2977,16 +3008,16 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", "ndk-sys", "num_enum", - "raw-window-handle 0.5.2", + "raw-window-handle", "thiserror", ] @@ -2998,9 +3029,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.5.0+25.2.9519653" +version = "0.6.0+11769913" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" dependencies = [ "jni-sys", ] @@ -3014,7 +3045,6 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.7.1", ] [[package]] @@ -3023,22 +3053,22 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "libc", ] [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.1.1", + "cfg_aliases", "libc", - "memoffset 0.9.1", + "memoffset", ] [[package]] @@ -3053,9 +3083,11 @@ dependencies = [ [[package]] name = "notify-rust" -version = "4.7.0" -source = "git+https://github.com/flukejones/notify-rust.git?rev=54176413b81189a3e4edbdc20a0b4f7e2e35c063#54176413b81189a3e4edbdc20a0b4f7e2e35c063" +version = "4.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26a1d03b6305ecefdd9c6c60150179bb8d9f0cd4e64bbcad1e41419e7bf5e414" dependencies = [ + "log", "mac-notification-sys", "serde", "tauri-winrt-notification", @@ -3078,35 +3110,25 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -3132,41 +3154,206 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", - "objc2-encode 3.0.0", + "objc2-encode", ] [[package]] -name = "objc2" -version = "0.5.1" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b25e1034d0e636cd84707ccdaa9f81243d399196b8a773946dcffec0401659" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "objc-sys", - "objc2-encode 4.0.1", + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-contacts", + "objc2-foundation", +] [[package]] name = "objc2-encode" -version = "4.0.1" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88658da63e4cc2c8adb1262902cd6af51094df0488b760d6fd27194269c0950a" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "dispatch", + "libc", + "objc2", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2", + "objc2-core-location", + "objc2-foundation", +] [[package]] name = "objc_exception" @@ -3188,9 +3375,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -3226,11 +3413,11 @@ dependencies = [ [[package]] name = "owned_ttf_parser" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ - "ttf-parser 0.21.1", + "ttf-parser 0.24.1", ] [[package]] @@ -3241,9 +3428,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3257,9 +3444,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3297,7 +3484,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -3320,12 +3507,12 @@ checksum = "b330c9d1b92dfe68442ca20b009c717d5f0b1e3cf4965e62f704c3c6e95a1305" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] @@ -3351,7 +3538,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.2", + "miniz_oxide 0.7.4", ] [[package]] @@ -3382,24 +3569,24 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix 0.38.35", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" dependencies = [ "critical-section", ] @@ -3412,43 +3599,46 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "prost" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", "prost-derive", @@ -3456,22 +3646,22 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools", + "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" dependencies = [ "prost", ] @@ -3487,27 +3677,27 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3544,15 +3734,9 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "raw-window-handle" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rayon" @@ -3574,15 +3758,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -3594,18 +3769,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox 0.1.3", @@ -3614,14 +3789,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -3635,13 +3810,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -3652,15 +3827,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "resvg" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2327ced609dadeed3e9702fec3e6b2ddd208758a9268d13e06566c6101ba533" +checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051" dependencies = [ "log", "pico-args", @@ -3672,16 +3847,16 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "0f86ae463694029097b846d8f99fd5536740602ae00022c0c50c5600720b2f71" dependencies = [ "bytemuck", ] [[package]] name = "rog-control-center" -version = "6.0.9" +version = "6.0.12" dependencies = [ "asusd", "betrayer", @@ -3694,7 +3869,7 @@ dependencies = [ "env_logger", "gumdrop", "log", - "nix 0.28.0", + "nix 0.29.0", "notify-rust", "rog_anime", "rog_aura", @@ -3702,7 +3877,6 @@ dependencies = [ "rog_platform", "rog_profiles", "serde", - "serde_derive", "slint", "slint-build", "supergfxctl", @@ -3714,7 +3888,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "6.0.9" +version = "6.0.12" dependencies = [ "cargo-husky", "dmi_id", @@ -3724,28 +3898,26 @@ dependencies = [ "pix", "png_pong", "serde", - "serde_derive", "typeshare", "zbus", ] [[package]] name = "rog_aura" -version = "6.0.9" +version = "6.0.12" dependencies = [ "cargo-husky", "dmi_id", "log", "ron", "serde", - "serde_derive", "typeshare", "zbus", ] [[package]] name = "rog_dbus" -version = "6.0.9" +version = "6.0.12" dependencies = [ "asusd", "cargo-husky", @@ -3759,7 +3931,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "6.0.9" +version = "6.0.12" dependencies = [ "cargo-husky", "concat-idents", @@ -3774,13 +3946,12 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "6.0.9" +version = "6.0.12" dependencies = [ "cargo-husky", "log", "rog_platform", "serde", - "serde_derive", "typeshare", "udev 0.8.0", "zbus", @@ -3788,7 +3959,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "6.0.9" +version = "6.0.12" dependencies = [ "log", "rog_anime", @@ -3798,12 +3969,11 @@ dependencies = [ [[package]] name = "rog_slash" -version = "6.0.9" +version = "6.0.12" dependencies = [ "cargo-husky", "dmi_id", "serde", - "serde_derive", "typeshare", "zbus", ] @@ -3815,29 +3985,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] [[package]] name = "rowan" -version = "0.15.15" +version = "0.15.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49" +checksum = "0a542b0253fa46e632d27a1dc5cf7b930de4df8659dc6e720b647fc72147ae3d" dependencies = [ "countme", "hashbrown 0.14.5", - "memoffset 0.9.1", "rustc-hash", "text-size", ] [[package]] name = "roxmltree" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rusb" @@ -3863,9 +4032,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] @@ -3886,33 +4055,33 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustversion" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustybuzz" -version = "0.13.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88117946aa1bfb53c2ae0643ceac6506337f44887f8c9fbfb43587b1cc52ba49" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "smallvec", - "ttf-parser 0.20.0", + "ttf-parser 0.21.1", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -3954,9 +4123,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", @@ -3967,9 +4136,9 @@ dependencies = [ [[package]] name = "sdl2" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8356b2697d1ead5a34f40bcc3c5d3620205fe0c7be0a14656223bfeec0258891" +checksum = "3b498da7d14d1ad6c839729bd4ad6fc11d90a57583605f3b4df2cd709a9cd380" dependencies = [ "bitflags 1.3.2", "lazy_static", @@ -3979,9 +4148,9 @@ dependencies = [ [[package]] name = "sdl2-sys" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26bcacfdd45d539fb5785049feb0038a63931aa896c7763a2a12e125ec58bd29" +checksum = "951deab27af08ed9c6068b7b0d05a93c91f0a8eb16b6b816a5e73452a43521d3" dependencies = [ "cfg-if", "libc", @@ -3996,31 +4165,32 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.201" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -4033,14 +4203,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -4103,9 +4273,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "skia-bindings" -version = "0.72.0" +version = "0.75.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace7c5359ccb009880e65958eaf1e2fa68ee19ada6931300c2f1942f84abf2c3" +checksum = "c06e19e97660b09a381c6eb566849b63556b1a90b8e2c6ba2d146b3f5066847b" dependencies = [ "bindgen", "cc", @@ -4120,14 +4290,14 @@ dependencies = [ [[package]] name = "skia-safe" -version = "0.72.0" +version = "0.75.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a4a3df502b317456a34df181ac67a7a6443b0f2e4b883ac220dba1dcb3ce38" +checksum = "ad6e6f369522471b585c99427720b53aad04016fa4314e0a8cf23f17083a4e4c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "lazy_static", "skia-bindings", - "windows 0.54.0", + "windows", ] [[package]] @@ -4141,8 +4311,8 @@ dependencies = [ [[package]] name = "slint" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +version = "1.8.0" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "const-field-offset", "i-slint-backend-selector", @@ -4157,19 +4327,19 @@ dependencies = [ [[package]] name = "slint-build" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +version = "1.8.0" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "i-slint-compiler", "spin_on", "thiserror", - "toml_edit 0.22.12", + "toml_edit", ] [[package]] name = "slint-macros" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +version = "1.8.0" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "i-slint-compiler", "proc-macro2", @@ -4194,18 +4364,18 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ - "bitflags 2.5.0", - "calloop", + "bitflags 2.6.0", + "calloop 0.13.0", "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2 0.9.4", - "rustix 0.38.34", + "rustix 0.38.35", "thiserror", "wayland-backend", "wayland-client", @@ -4219,9 +4389,9 @@ dependencies = [ [[package]] name = "smithay-clipboard" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ "libc", "smithay-client-toolkit", @@ -4247,9 +4417,9 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] @@ -4276,32 +4446,34 @@ dependencies = [ [[package]] name = "softbuffer" -version = "0.3.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f266ce2aa23eaaaa4e758ed44495d505d00fb79f359d46f6c1900cb053123b62" +checksum = "d623bff5d06f60d738990980d782c8c866997d9194cfe79ecad00aa2f76826dd" dependencies = [ "as-raw-xcb-connection", "bytemuck", - "cfg_aliases 0.1.1", - "cocoa", + "cfg_aliases", "core-graphics", - "fastrand 2.1.0", + "fastrand 2.1.1", "foreign-types", "js-sys", "log", "memmap2 0.9.4", - "objc", - "raw-window-handle 0.5.2", - "redox_syscall 0.4.1", - "rustix 0.38.34", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-quartz-core", + "raw-window-handle", + "redox_syscall 0.5.3", + "rustix 0.38.35", "tiny-xlib", "wasm-bindgen", "wayland-backend", "wayland-client", "wayland-sys", "web-sys", - "windows-sys 0.48.0", - "x11rb 0.12.0", + "windows-sys 0.52.0", + "x11rb", ] [[package]] @@ -4345,30 +4517,30 @@ dependencies = [ [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] name = "supergfxctl" -version = "5.2.3" -source = "git+https://gitlab.com/asus-linux/supergfxctl.git#bf7099c0a771a98f83da055e3c561b91e82b5c75" +version = "5.2.4" +source = "git+https://gitlab.com/asus-linux/supergfxctl.git#4c99316e0a6ac288faeb76b2f46111fddd5d7d83" dependencies = [ "log", "logind-zbus", @@ -4376,15 +4548,15 @@ dependencies = [ "serde_derive", "serde_json", "tokio", - "udev 0.8.0", + "udev 0.9.0", "zbus", ] [[package]] name = "svgtypes" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fae3064df9b89391c9a76a0425a69d124aee9c5c28455204709e72c39868a43c" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" dependencies = [ "kurbo", "siphasher", @@ -4403,9 +4575,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.63" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -4418,11 +4590,17 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -4431,12 +4609,13 @@ dependencies = [ [[package]] name = "tauri-winrt-notification" -version = "0.1.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" dependencies = [ - "quick-xml 0.30.0", - "windows 0.51.1", + "quick-xml 0.31.0", + "windows", + "windows-version", ] [[package]] @@ -4447,14 +4626,15 @@ checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", + "fastrand 2.1.1", + "once_cell", + "rustix 0.38.35", + "windows-sys 0.59.0", ] [[package]] @@ -4474,22 +4654,22 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -4560,21 +4740,22 @@ dependencies = [ [[package]] name = "tiny-xlib" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" +checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", - "ctor", - "libloading 0.8.3", + "ctor-lite", + "libloading", + "pkg-config", "tracing", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4587,41 +4768,30 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "pin-project-lite", "socket2 0.5.7", "tokio-macros", "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -4650,68 +4820,60 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.12" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.4.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow", ] [[package]] name = "tonic" -version = "0.10.2" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64 0.22.1", "bytes", "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", "prost", + "socket2 0.5.7", "tokio", "tokio-stream", "tower", @@ -4742,15 +4904,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4771,7 +4933,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -4807,15 +4969,15 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttf-parser" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" [[package]] name = "ttf-parser" -version = "0.21.1" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" [[package]] name = "typenum" @@ -4842,7 +5004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a615d6c2764852a2e88a4f16e9ce1ea49bb776b5872956309e170d63a042a34f" dependencies = [ "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -4865,7 +5027,19 @@ dependencies = [ "io-lifetimes", "libc", "libudev-sys", - "mio", + "mio 0.8.11", + "pkg-config", +] + +[[package]] +name = "udev" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ba005bcd5b1158ae3cd815905990e8b6ee4ba9ee7adbab6d7b58d389ad09c93" +dependencies = [ + "io-lifetimes", + "libc", + "libudev-sys", "pkg-config", ] @@ -4875,7 +5049,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.1", + "memoffset", "tempfile", "winapi", ] @@ -4941,9 +5115,9 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" [[package]] name = "unicode-script" @@ -4965,9 +5139,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4976,9 +5150,9 @@ dependencies = [ [[package]] name = "usvg" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c704361d822337cfc00387672c7b59eaa72a1f0744f62b2a68aa228a0c6927d" +checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032" dependencies = [ "base64 0.22.1", "data-url", @@ -5021,24 +5195,24 @@ checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "versions" -version = "6.2.0" +version = "6.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a8931f8d167b6448076020e70b9de46dcf5ea1731212481a092d0071c4ac5b" +checksum = "f25d498b63d1fdb376b4250f39ab3a5ee8d103957346abacd911e2d8b612c139" dependencies = [ - "itertools", + "itertools 0.13.0", "nom", ] [[package]] name = "vtable" version = "0.2.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "const-field-offset", "portable-atomic", @@ -5049,11 +5223,11 @@ dependencies = [ [[package]] name = "vtable-macro" version = "0.2.0" -source = "git+https://github.com/slint-ui/slint.git#7b3e2fcf32d2937a8ed58bcc742e45dd4852bced" +source = "git+https://github.com/slint-ui/slint.git#6472ab841612c05f0996bfd277e157085b7fcbff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -5089,34 +5263,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -5126,9 +5301,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5136,32 +5311,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.34", + "rustix 0.38.35", "scoped-tls", "smallvec", "wayland-sys", @@ -5169,12 +5344,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" dependencies = [ - "bitflags 2.5.0", - "rustix 0.38.34", + "bitflags 2.6.0", + "rustix 0.38.35", "wayland-backend", "wayland-scanner", ] @@ -5185,29 +5360,29 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.1" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.35", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.31.2" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -5215,11 +5390,11 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -5228,11 +5403,11 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -5241,20 +5416,20 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ "proc-macro2", - "quick-xml 0.31.0", + "quick-xml 0.34.0", "quote", ] [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" dependencies = [ "dlib", "log", @@ -5264,19 +5439,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "0.2.4" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -5307,7 +5472,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.34", + "rustix 0.38.35", ] [[package]] @@ -5328,20 +5493,11 @@ 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" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -5350,26 +5506,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" -dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.5", -] - [[package]] name = "windows" version = "0.56.0" @@ -5377,16 +5513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ "windows-core 0.56.0", - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -5395,17 +5522,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-core" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" -dependencies = [ - "windows-result", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5417,7 +5534,7 @@ dependencies = [ "windows-implement", "windows-interface", "windows-result", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5428,7 +5545,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -5439,16 +5556,16 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] name = "windows-result" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5475,7 +5592,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -5510,18 +5636,27 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -5538,9 +5673,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5556,9 +5691,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -5574,15 +5709,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -5598,9 +5733,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5616,9 +5751,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5634,9 +5769,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5652,43 +5787,47 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.29.15" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", + "block2 0.5.1", "bytemuck", - "calloop", - "cfg_aliases 0.1.1", + "calloop 0.13.0", + "cfg_aliases", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate 0.0.4", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.4", "ndk", - "ndk-sys", - "objc2 0.4.1", - "once_cell", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", - "raw-window-handle 0.5.2", - "redox_syscall 0.3.5", - "rustix 0.38.34", + "pin-project", + "raw-window-handle", + "redox_syscall 0.4.1", + "rustix 0.38.35", "sctk-adwaita", "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", @@ -5697,27 +5836,18 @@ dependencies = [ "wayland-protocols", "wayland-protocols-plasma", "web-sys", - "web-time 0.2.4", - "windows-sys 0.48.0", + "web-time", + "windows-sys 0.52.0", "x11-dl", - "x11rb 0.13.1", + "x11rb", "xkbcommon-dl", ] [[package]] name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.8" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -5738,7 +5868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98785a09322d7446e28a13203d2cae1059a0dd3dfb32cb06d0a225f023d8286" dependencies = [ "libc", - "x11rb 0.13.1", + "x11rb", ] [[package]] @@ -5752,23 +5882,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11rb" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" -dependencies = [ - "as-raw-xcb-connection", - "gethostname 0.3.0", - "libc", - "libloading 0.7.4", - "nix 0.26.4", - "once_cell", - "winapi", - "winapi-wsapoll", - "x11rb-protocol 0.12.0", -] - [[package]] name = "x11rb" version = "0.13.1" @@ -5776,21 +5889,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "as-raw-xcb-connection", - "gethostname 0.4.3", + "gethostname", "libc", - "libloading 0.8.3", + "libloading", "once_cell", - "rustix 0.38.34", - "x11rb-protocol 0.13.1", -] - -[[package]] -name = "x11rb-protocol" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix 0.26.4", + "rustix 0.38.35", + "x11rb-protocol", ] [[package]] @@ -5806,24 +5910,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.13", - "rustix 0.38.34", + "linux-raw-sys 0.4.14", + "rustix 0.38.35", ] [[package]] name = "xcursor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -5843,7 +5947,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -5852,15 +5956,15 @@ dependencies = [ [[package]] name = "xkeysym" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" [[package]] name = "xmlwriter" @@ -5870,27 +5974,27 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "zbus" -version = "4.2.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5915716dff34abef1351d2b10305b019c8ef33dcf6c72d31a6e227d5d9d7a21" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", "async-fs 2.1.2", - "async-io 2.3.2", - "async-lock 3.3.0", - "async-process 2.2.2", + "async-io 2.3.4", + "async-lock 3.4.0", + "async-process 2.2.4", "async-recursion", "async-task", "async-trait", "blocking", "enumflags2", - "event-listener 5.3.0", + "event-listener 5.3.1", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.28.0", + "nix 0.29.0", "ordered-stream", "rand", "serde", @@ -5908,14 +6012,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.2.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fceb36d0c1c4a6b98f3ce40f410e64e5a134707ed71892e1b178abc4c695d4" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.76", "zvariant_utils", ] @@ -5932,22 +6036,23 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.76", ] [[package]] @@ -5961,9 +6066,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877ef94e5e82b231d2a309c531f191a8152baba8241a7939ee04bd76b0171308" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", @@ -5974,24 +6079,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ca98581cc6a8120789d8f1f0997e9053837d6aa5346cbb43454d7121be6e39" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.76", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.1.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75fa7291bdd68cd13c4f97cc9d78cbf16d96305856dfc7ac942aeff4c2de7d5a" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.76", ] diff --git a/pkgs/applications/system/asusctl/default.nix b/pkgs/applications/system/asusctl/default.nix index 8ae81050634b5..ab160092f1564 100644 --- a/pkgs/applications/system/asusctl/default.nix +++ b/pkgs/applications/system/asusctl/default.nix @@ -16,21 +16,20 @@ rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "6.0.9"; + version = "6.0.12"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-mml+nj+Z6267QtejTkWiR3SdNAdZCNz4M8r6LzvhALw="; + hash = "sha256-fod3ZkJktmJGHF8nSSp9lVMg/qYKQd4EiauFGTSvbsg="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "const-field-offset-0.1.5" = "sha256-0MaNu6cUXislY+wDFuxZptXeJRkOuXGRJwZWm6AvcZ8="; - "notify-rust-4.7.0" = "sha256-A7edUorty5GpGXCUQPszZuXtLdEmbmrDSU9JcoDaiaI="; - "supergfxctl-5.2.3" = "sha256-wKcHoMukdUXZrdbE1xsylq7ySJpxny3+0dGUQ40BVH8="; + "const-field-offset-0.1.5" = "sha256-QtlvLwe27tLLdWhqiKzXoUvBsBcZbfwY84jXUduzCKw="; + "supergfxctl-5.2.4" = "sha256-MQJJaTajPQ45BU6zyMx0Wwf7tAPcT4EURWWbZxrbGzE="; }; }; diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix index 25f62fad9bbf4..cb3e0c22835ee 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -1,5 +1,4 @@ { lib -, buildNpmPackage , rustPlatform , dbus , freetype diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index 40db1cebacec9..16e55a8c21f2e 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -1,5 +1,4 @@ { rustPlatform -, buildNpmPackage , testers , libdrm , coolercontrol diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 6d8899440d4a3..ff8b4c3106629 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -40,14 +40,14 @@ buildPythonApplication rec { # CoreFoundation. This issues was solved for binaries but for interpreted # scripts a workaround below is still required. # Relevant: https://github.com/NixOS/nixpkgs/issues/24693 - makeWrapperArgs = lib.optionals stdenv.isDarwin [ + makeWrapperArgs = lib.optionals stdenv.hostPlatform.isDarwin [ "--set" "DYLD_FRAMEWORK_PATH" "/System/Library/Frameworks" ]; doCheck = true; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks ''; @@ -68,7 +68,7 @@ buildPythonApplication rec { jinja2 orjson prometheus-client - ] ++ lib.optional stdenv.isLinux hddtemp; + ] ++ lib.optional stdenv.hostPlatform.isLinux hddtemp; meta = { homepage = "https://nicolargo.github.io/glances/"; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 55544e5f461f0..fada61d6b6a41 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - hash = "sha256-Eo0nwATKrx6SmTsaXe3oFIkp0BUTmjcjIc3Vjt+Cr20="; + hash = "sha256-Kk3L4hfHon0B6Y6vU7en1UFpg221+EiVCxMX9mvu7pU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix index 5c8714677ad98..fc80c3f69df81 100644 --- a/pkgs/applications/system/qjournalctl/default.nix +++ b/pkgs/applications/system/qjournalctl/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pentix/qjournalctl"; license = licenses.gpl3Only; platforms = platforms.all; - maintainers = with maintainers; [ srgom romildo ]; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/applications/system/thumbdrives/default.nix b/pkgs/applications/system/thumbdrives/default.nix deleted file mode 100644 index 89711e996831f..0000000000000 --- a/pkgs/applications/system/thumbdrives/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, python3 -, fetchFromSourcehut -, gtk3 -, libhandy_0 -, gobject-introspection -, meson -, pkg-config -, ninja -, gettext -, glib -, desktop-file-utils -, wrapGAppsHook3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "thumbdrives"; - version = "0.3.1"; - - format = "other"; - - src = fetchFromSourcehut { - owner = "~martijnbraam"; - repo = pname; - rev = version; - sha256 = "sha256-CPZKswbvsG61A6J512FOCKAntoJ0sUb2s+MKb0rO+Xw="; - }; - - postPatch = '' - patchShebangs build-aux/meson - ''; - - nativeBuildInputs = [ - meson - pkg-config - ninja - gettext - glib - gtk3 - desktop-file-utils - wrapGAppsHook3 - gobject-introspection - ]; - - buildInputs = [ - gtk3 - libhandy_0 - ]; - - propagatedBuildInputs = with python3.pkgs; [ - pygobject3 - pyxdg - ]; - - meta = with lib; { - description = "USB mass storage emulator for Linux handhelds"; - homepage = "https://sr.ht/~martijnbraam/thumbdrives/"; - license = licenses.mit; - maintainers = with maintainers; [ chuangzhu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 58e527cc50a98..33691aaef4911 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -35,7 +35,7 @@ let expat fontconfig freetype - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL xorg.libX11 xorg.libXcursor @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = rpathLibs - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreGraphics CoreServices @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "terminfo" ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace alacritty/src/config/ui_config.rs \ --replace xdg-open ${xdg-utils}/bin/xdg-open ''; @@ -91,7 +91,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=term::test::mock_term" ]; # broken on aarch64 postInstall = ( - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' mkdir $out/Applications cp -r extra/osx/Alacritty.app $out/Applications ln -s $out/bin $out/Applications/Alacritty.app/Contents/MacOS diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index a255b2fb99db8..78a1b7243cdc9 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (final: { file wrapQtAppsHook installShellFiles - ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; buildInputs = [ boxed-cpp @@ -67,21 +67,21 @@ stdenv.mkDerivation (final: { range-v3 yaml-cpp ] - ++ lib.optionals stdenv.isLinux [ libutempter ] - ++ lib.optionals stdenv.isDarwin [ utmp ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ utmp ]; cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ]; postInstall = '' mkdir -p $out/nix-support $terminfo/share - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications installShellCompletion --zsh $out/contour.app/Contents/Resources/shell-integration/shell-integration.zsh installShellCompletion --fish $out/contour.app/Contents/Resources/shell-integration/shell-integration.fish cp -r $out/contour.app/Contents/Resources/terminfo $terminfo/share mv $out/contour.app $out/Applications ln -s $out/bin $out/Applications/contour.app/Contents/MacOS - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mv $out/share/terminfo $terminfo/share/ installShellCompletion --zsh $out/share/contour/shell-integration/shell-integration.zsh installShellCompletion --fish $out/share/contour/shell-integration/shell-integration.fish @@ -99,5 +99,8 @@ stdenv.mkDerivation (final: { maintainers = with maintainers; [ moni ]; platforms = platforms.unix; mainProgram = "contour"; + # This was caused by boxed-cpp 1.4.2 -> 1.4.3 + # More details in issue #345752 + broken = true; }; }) diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 8a33d222855eb..c2a8710858318 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { mv $out/usr/share $out/share mv $out/usr/bin $out/bin rmdir $out/usr - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term ''; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 1b7484cf4b736..0459fd9c01696 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -25,28 +25,28 @@ , zsh , fish , nixosTests -, go -, buildGoModule +, go_1_23 +, buildGo123Module , nix-update-script }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.36.1"; + version = "0.36.4"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-7+MxxgQQlAje7klfJvvEWe8CfxyN0oTGQJ/QOORFUsY="; + hash = "sha256-nN0y2VKK5UNaozpHQNPN7AYkto9z6rJNpYRJhvLPtVQ="; }; - goModules = (buildGoModule { + goModules = (buildGo123Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-YN4sSdDNDIVgtcykg60H0bZEryRHJJfZ5rXWUMYXGr4="; + vendorHash = "sha256-8hsQH7OdsxeVG6pomuxdmTXNmQYBROoUUxoC10LeLFo="; }).goModules; buildInputs = [ @@ -57,7 +57,7 @@ buildPythonApplication rec { librsync openssl.dev xxHash - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa Kernel UniformTypeIdentifiers @@ -65,9 +65,9 @@ buildPythonApplication rec { libpng python3 zlib - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ Libsystem - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext wayland-protocols wayland dbus libGL @@ -82,13 +82,12 @@ buildPythonApplication rec { sphinx-copybutton sphinxext-opengraph sphinx-inline-tabs - go + go_1_23 fontconfig - (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ imagemagick libicns # For the png2icns tool. - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]; @@ -137,8 +136,13 @@ buildPythonApplication rec { ''; in '' runHook preBuild - ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } - ${if stdenv.isDarwin then '' + + # Add the font by hand because fontconfig does not finds it in darwin + mkdir ./fonts/ + cp "${(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})}/share/fonts/truetype/NerdFonts/SymbolsNerdFontMono-Regular.ttf" ./fonts/ + + ${ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } + ${if stdenv.hostPlatform.isDarwin then '' ${python.pythonOnBuildForHost.interpreter} setup.py build ${darwinOptions} make docs ${python.pythonOnBuildForHost.interpreter} setup.py kitty.app ${darwinOptions} @@ -161,13 +165,13 @@ buildPythonApplication rec { bashInteractive zsh fish - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # integration tests need sudo sudo ]; # skip failing tests due to darwin sandbox - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace kitty_tests/file_transmission.py \ --replace test_file_get dont_test_file_get \ --replace test_path_mapping_receive dont_test_path_mapping_receive \ @@ -205,7 +209,7 @@ buildPythonApplication rec { runHook preInstall mkdir -p "$out" mkdir -p "$kitten/bin" - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' mkdir "$out/bin" ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" ln -s ../Applications/kitty.app/Contents/MacOS/kitten "$out/bin/kitten" @@ -228,7 +232,7 @@ buildPythonApplication rec { --fish <("$out/bin/kitty" +complete setup fish2) \ --zsh <("$out/bin/kitty" +complete setup zsh) - terminfo_src=${if stdenv.isDarwin then + terminfo_src=${if stdenv.hostPlatform.isDarwin then ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' else "$out/share/terminfo"} @@ -245,7 +249,7 @@ buildPythonApplication rec { ''; passthru = { - tests = lib.optionalAttrs stdenv.isLinux { + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { default = nixosTests.terminal-emulators.kitty; }; updateScript = nix-update-script {}; diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 28f027401bd74..dcf581f27a80c 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -27,8 +27,8 @@ # documentd in `./configure --help`, and it is reported here: # https://github.com/arakiken/mlterm/issues/73 fb = false; - quartz = stdenv.isDarwin; - wayland = stdenv.isLinux; + quartz = stdenv.hostPlatform.isDarwin; + wayland = stdenv.hostPlatform.isLinux; sdl2 = true; } , libxkbcommon @@ -59,16 +59,16 @@ mlfc = true; } # Whether to enable the X window system -, enableX11 ? stdenv.isLinux +, enableX11 ? stdenv.hostPlatform.isLinux # Most of the input methods and other build features are enabled by default, # the following attribute set can be used to disable some of them. It's parsed # when we set `configureFlags`. If you find other configure Flags that require # dependencies, it'd be nice to make that contribution here. , enableFeatures ? { - uim = !stdenv.isDarwin; - ibus = !stdenv.isDarwin; - fcitx = !stdenv.isDarwin; - m17n = !stdenv.isDarwin; + uim = !stdenv.hostPlatform.isDarwin; + ibus = !stdenv.hostPlatform.isDarwin; + fcitx = !stdenv.hostPlatform.isDarwin; + m17n = !stdenv.hostPlatform.isDarwin; ssh2 = true; bidi = true; # Open Type layout support, (substituting glyphs with opentype fonts) @@ -185,7 +185,7 @@ in stdenv.mkDerivation (finalAttrs: { install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png" install -D -t $out/share/applications $desktopItem/share/applications/* - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications/ cp -a cocoa/mlterm.app $out/Applications/ install $out/bin/mlterm -Dt $out/Applications/mlterm.app/Contents/MacOS/ diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index b232bec2c5b26..daea4128935c4 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -17,21 +17,21 @@ , vulkan-loader , libxkbcommon -, withX11 ? !stdenv.isDarwin +, withX11 ? !stdenv.hostPlatform.isDarwin , libX11 , libXcursor , libXi , libXrandr , libxcb -, withWayland ? !stdenv.isDarwin +, withWayland ? !stdenv.hostPlatform.isDarwin , wayland , testers , rio }: let - rlinkLibs = if stdenv.isDarwin then [ + rlinkLibs = if stdenv.hostPlatform.isDarwin then [ darwin.libobjc darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.AVFoundation @@ -55,20 +55,20 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.1.10"; + version = "0.1.16"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; - rev = "refs/tags/v${version}"; - hash = "sha256-S42is3wqjBvYgysQ6yDUAn7ZEy9xJBmQD/emYAQfCkw="; + rev = "v${version}"; + hash = "sha256-3OtPlaYkTPIF98CyaXWGZ/1msWHFdscqZXVviu0/O/o="; }; - cargoHash = "sha256-ILX3xrcz3tMnl7mUrwUAXv9ffaZKjSoSf8cZVQB10zk="; + cargoHash = "sha256-VpS3prTmAbWTd+gwAOA0BXso4gkcAFuhMZh8Go3Dlao="; nativeBuildInputs = [ ncurses - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ cmake pkg-config autoPatchelfHook @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # Fail to run in sandbox environment. - "--skip=screen::context::test" + "--skip=sys::unix::eventedfd::EventedFd" ]; postInstall = '' @@ -99,7 +99,7 @@ rustPlatform.buildRustPackage rec { tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications/ mv misc/osx/Rio.app/ $out/Applications/ mkdir $out/Applications/Rio.app/Contents/MacOS/ @@ -112,8 +112,13 @@ rustPlatform.buildRustPackage rec { }; tests = { - test = nixosTests.terminal-emulators.rio; version = testers.testVersion { package = rio; }; + } // lib.optionalAttrs stdenv.buildPlatform.isLinux { + # FIXME: Restrict test execution inside nixosTests for Linux devices as ofborg + # 'passthru.tests' nixosTests are failing on Darwin architectures. + # + # Ref: https://github.com/NixOS/nixpkgs/issues/345825 + test = nixosTests.terminal-emulators.rio; }; }; @@ -123,13 +128,7 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ tornax otavio oluceps ]; platforms = lib.platforms.unix; - changelog = "https://github.com/raphamorim/rio/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/raphamorim/rio/blob/v${version}/docs/docs/releases.md"; mainProgram = "rio"; - # ---- corcovado/src/sys/unix/eventedfd.rs - sys::unix::eventedfd::EventedFd (line 31) stdout ---- - # Test executable failed (exit status: 101). - # stderr: - # thread 'main' panicked at corcovado/src/sys/unix/eventedfd.rs:24:16: - # called `Result::unwrap()` on an `Err` value: Os { code: 1, kind: PermissionDenied, message: "Operation not permitted" } - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index f28694db29493..a39099cc4bd46 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation { url = "https://github.com/exg/rxvt-unicode/commit/16634bc8dd5fc4af62faf899687dfa8f27768d15.patch"; excludes = [ "Changes" ]; sha256 = "sha256-JVqzYi3tcWIN2j5JByZSztImKqbbbB3lnfAwUXrumHM="; - }) ++ lib.optional stdenv.isDarwin ./patches/makefile-phony.patch; + }) ++ lib.optional stdenv.hostPlatform.isDarwin ./patches/makefile-phony.patch; configureFlags = [ "--with-terminfo=${placeholder "terminfo"}/share/terminfo" diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 72a6835ff4aaa..676ef292def16 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { (writeText "config.def.h" conf); postPatch = lib.optionalString (conf != null) "cp ${finalAttrs.configFile} config.def.h" - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.mk --replace "-lrt" "" ''; diff --git a/pkgs/applications/terminal-emulators/syncterm/default.nix b/pkgs/applications/terminal-emulators/syncterm/default.nix index 36a02e08bbd50..60b172184fc99 100644 --- a/pkgs/applications/terminal-emulators/syncterm/default.nix +++ b/pkgs/applications/terminal-emulators/syncterm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-Wno-unused-result" "-Wformat-overflow=0" - ] ++ (lib.optionals stdenv.isLinux [ + ] ++ (lib.optionals stdenv.hostPlatform.isLinux [ "-DUSE_ALSA_SOUND" # Don't use OSS for beeps. ]); makeFlags = [ @@ -38,12 +38,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook pkg-config SDL2 perl unzip ]; # SDL2 for `sdl2-config`. buildInputs = [ ncurses SDL2 ] - ++ (lib.optional stdenv.isLinux alsa-lib); + ++ (lib.optional stdenv.hostPlatform.isLinux alsa-lib); runtimeDependencies = [ ncurses SDL2 ]; # Both of these are dlopen()'ed at runtime. meta = with lib; { # error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin' - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; homepage = "https://syncterm.bbsdev.net/"; description = "BBS terminal emulator"; mainProgram = "syncterm"; diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index aedbb761a8cad..01047f26bc634 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -30,7 +30,6 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection makeBinaryWrapper wrapGAppsHook3 - python3.pkgs.pytest-runner ]; buildInputs = [ diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix index 4acc8263ce869..3dc6d484d2d3c 100644 --- a/pkgs/applications/terminal-emulators/termite/default.nix +++ b/pkgs/applications/terminal-emulators/termite/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch"; sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j"; }) - ] ++ lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; + ] ++ lib.optional stdenv.hostPlatform.isDarwin ./remove_ldflags_macos.patch; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 4f710d61c20ab..68391fc4dc7ff 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -63,12 +63,12 @@ rustPlatform.buildRustPackage rec { ncurses # tic for terminfo pkg-config python3 - ] ++ lib.optional stdenv.isDarwin perl; + ] ++ lib.optional stdenv.hostPlatform.isDarwin perl; buildInputs = [ fontconfig zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libxcb libxkbcommon @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage rec { xcbutilimage xcbutilkeysyms xcbutilwm # contains xcb-ewmh among others - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreGraphics Foundation @@ -89,7 +89,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "distro-defaults" ]; - env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework System"; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework System"; postInstall = '' mkdir -p $out/nix-support @@ -108,12 +108,12 @@ rustPlatform.buildRustPackage rec { install -Dm644 assets/wezterm-nautilus.py -t $out/share/nautilus-python/extensions ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --add-needed "${libGL}/lib/libEGL.so.1" \ --add-needed "${vulkan-loader}/lib/libvulkan.so.1" \ $out/bin/wezterm-gui - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" OUT_APP="$out/Applications/WezTerm.app" cp -r assets/macos/WezTerm.app "$OUT_APP" diff --git a/pkgs/applications/terminal-emulators/x3270/default.nix b/pkgs/applications/terminal-emulators/x3270/default.nix index 2e901e5af8763..45b08bd10f664 100644 --- a/pkgs/applications/terminal-emulators/x3270/default.nix +++ b/pkgs/applications/terminal-emulators/x3270/default.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-gcC6REfZentIPEDhGznUSYu8mvVfpPeMz/Bks+N43Fk="; }; - buildFlags = lib.optional stdenv.isLinux "unix"; + buildFlags = lib.optional stdenv.hostPlatform.isLinux "unix"; - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-c3270" "--enable-pr3270" "--enable-s3270" @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { expat openssl readline - ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "IBM 3270 terminal emulator for the X Window System"; diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 33b4cb0f90b54..5a60f9a1d5467 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -93,6 +93,6 @@ let mainProgram = "bcompare"; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index c98ff367c6688..e5be040f6a25e 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnupg ]; # https://github.com/NixOS/nixpkgs/issues/134445 - doCheck = !stdenv.isDarwin && stdenv.isx86_64; + doCheck = !stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; nativeCheckInputs = [ expect diff --git a/pkgs/applications/version-management/bump2version/default.nix b/pkgs/applications/version-management/bump2version/default.nix deleted file mode 100644 index 86d1618cc48d4..0000000000000 --- a/pkgs/applications/version-management/bump2version/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, testfixtures -}: - -buildPythonApplication rec { - pname = "bump2version"; - version = "1.0.1"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "c4urself"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; - }; - - nativeCheckInputs = [ - pytestCheckHook - testfixtures - ]; - - disabledTests = [ - # X's in pytest are git tests which won't run in sandbox - "usage_string_fork" - "test_usage_string" - "test_defaults_in_usage_with_config" - ]; - - pythonImportsCheck = [ "bumpversion" ]; - - meta = with lib; { - description = "Version-bump your software with a single command"; - longDescription = '' - A small command line tool to simplify releasing software by updating - all version strings in your source code by the correct increment. - ''; - homepage = "https://github.com/c4urself/bump2version"; - license = licenses.mit; - maintainers = with maintainers; [ jefflabonte ]; - }; -} diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 20a38f9f8e8cf..7ec801503f767 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" ]; - env = lib.optionalAttrs (stdenv.isDarwin && stdenv.cc.isClang) { + env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.cc.isClang) { NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; }; diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix index 64bc41ce6a183..76ace5026e681 100644 --- a/pkgs/applications/version-management/delta/default.nix +++ b/pkgs/applications/version-management/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "dandavison"; repo = "delta"; rev = "refs/tags/${version}"; - hash = "sha256-9hi3efHzJV9jKJPSkyBaRO7hCYT17QPhw9pP/GwkMdo="; + hash = "sha256-fJSKGa935kwLG8WYmT9Ncg2ozpSNMzUJx0WLo1gtVAA="; }; - cargoHash = "sha256-aQaqQApoPlm/VhGs11RI9+Fk8s2czuJbOreSr3fEX+g="; + cargoHash = "sha256-DIWzRVTADfAZdFckhh2lIfOD13h7GP3KIOQHf/oBHgc="; nativeBuildInputs = [ installShellFiles @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { # https://github.com/dandavison/delta/issues/1660 dontUseCargoParallelTests = true; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # This test tries to read /etc/passwd, which fails with the sandbox # enabled on Darwin "--skip=test_diff_real_files" diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index b523141808167..b0bae95ba9d13 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fnc"; - version = "0.16"; + version = "0.18"; src = fetchurl { url = "https://fnc.bsdbox.org/tarball/${finalAttrs.version}/fnc-${finalAttrs.version}.tar.gz"; - hash = "sha256-6I6wtSMHaKdnlUK4pYiaybJeODGu2P+smYW8lQDIWGM="; + hash = "sha256-npS+sOxF0S/9TuFjtEFlev0HpIOsaP6zmcfopPNUehk="; }; buildInputs = [ libiconv ncurses zlib ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ # Needed with GCC 12 "-Wno-error=maybe-uninitialized" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # error: 'strtonum' is only available on macOS 11.0 or newer "-Wno-error=unguarded-availability-new" ]); diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index b1b828d479598..9443c1e9cdea2 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles tcl tcllib ]; buildInputs = [ zlib openssl readline which ed ] - ++ lib.optional stdenv.isDarwin libiconv + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv ++ lib.optional (!withInternalSqlite) sqlite; enableParallelBuilding = true; diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix deleted file mode 100644 index 51a8839261af9..0000000000000 --- a/pkgs/applications/version-management/gex/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "gex"; - version = "0.6.4"; - - src = fetchFromGitHub { - owner = "Piturnah"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Xer7a3UtFIv3idchI7DfZ5u6qgDW/XFWi5ihtcREXqo="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - libgit2 - ] ++ lib.optionals stdenv.isDarwin [ - Security - ]; - - # force the libgit2-sys crate to use the system libgit2 library - LIBGIT2_NO_VENDOR = 1; - - cargoHash = "sha256-HNz1wwn0eUhNR6ZLLPMse8LmAS4CzADx0ZR9gJgJQCg="; - - meta = with lib; { - description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; - homepage = "https://github.com/Piturnah/gex"; - changelog = "https://github.com/Piturnah/gex/releases/tag/${src.rev}"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ azd325 evanrichter piturnah ]; - mainProgram = "gex"; - }; -} diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index fb8cccdda1bde..299ea9fb6ba40 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-idzw5dfCCvujvYr7DG0oOzQUIcbACtiIZLoA4MEClzY="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 7debed6749e93..d04b844e84f77 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.55.0"; + version = "2.58.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-Ty74t+FwyRHed4V/OoJkq/4It5KpLLa4Xxti+93rjCs="; + hash = "sha256-KHJKE550XlGdB++jq/1kHP4o1QISbPtbt4GU9uIP3RE="; }; - vendorHash = "sha256-K4KKgfjbopYEMJZCDt2x9l6EO7MwVBZ2HrdzvF/oetw="; + vendorHash = "sha256-6T9LQNzGpADLwI0pFvjBe5rqbXOEDZmjYCy4RhNqcFI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/ghorg/default.nix b/pkgs/applications/version-management/ghorg/default.nix index 528bba032b9fa..001743d4fc96d 100644 --- a/pkgs/applications/version-management/ghorg/default.nix +++ b/pkgs/applications/version-management/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.9.13"; + version = "1.11.0"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-RXXDWz8sXvn0+6JFf6cHNRwg9xAGrCHGRM/M8MQpMko="; + sha256 = "sha256-tsR7cBpDa311rLI1CTXD2LLl3j2PxkBeQsjkUP99iIo="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index 49d4a0a67ad25..8679f2842f9d0 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoHash = "sha256-Y/0In33y4mVTaE9yoBZ/3tRWcsSKgGjTCSHdjScNEj0="; diff --git a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix b/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix index 72c0e48275ca4..03bd655adcdc8 100644 --- a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix +++ b/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix @@ -6,24 +6,29 @@ , gitpython , humanfriendly , tenacity +, setuptools +, distutils }: buildPythonApplication rec { pname = "git-annex-remote-googledrive"; version = "1.3.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "0rwjcdvfgzdlfgrn1rrqwwwiqqzyh114qddrbfwd46ld5spry6r1"; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ annexremote drivelib gitpython tenacity humanfriendly + distutils ]; # while git-annex does come with a testremote command that *could* be used, @@ -36,7 +41,7 @@ buildPythonApplication rec { meta = with lib; { description = "Git-annex special remote for Google Drive"; - homepage = "https://pypi.org/project/git-annex-remote-googledrive/"; + homepage = "https://github.com/Lykos153/git-annex-remote-googledrive"; license = licenses.gpl3Only; maintainers = with maintainers; [ gravndal ]; mainProgram = "git-annex-remote-googledrive"; diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index 3a08072935c72..0e83d17d33a7a 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -1,15 +1,16 @@ -{ lib -, fetchFromGitHub -, git -, libiconv -, ncurses -, openssl -, pkg-config -, rustPlatform -, sqlite -, stdenv -, Security -, SystemConfiguration +{ + lib, + fetchFromGitHub, + git, + libiconv, + ncurses, + openssl, + pkg-config, + rustPlatform, + sqlite, + stdenv, + Security, + SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -27,15 +28,17 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - ncurses - openssl - sqlite - ] ++ lib.optionals stdenv.isDarwin [ - Security - SystemConfiguration - libiconv - ]; + buildInputs = + [ + ncurses + openssl + sqlite + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Security + SystemConfiguration + libiconv + ]; postInstall = '' $out/bin/git-branchless install-man-pages $out/share/man @@ -57,6 +60,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/arxanas/git-branchless"; license = licenses.gpl2Only; mainProgram = "git-branchless"; - maintainers = with maintainers; [ nh2 hmenke ]; + maintainers = with maintainers; [ + nh2 + hmenke + ]; }; } diff --git a/pkgs/applications/version-management/git-cinnabar/default.nix b/pkgs/applications/version-management/git-cinnabar/default.nix index 2d97b41cdd043..84a34601d40f9 100644 --- a/pkgs/applications/version-management/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-cinnabar/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { curl zlib zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices ]; diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 7307988693b63..3e5dcec035b30 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -8,21 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.4.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-JRFd84DR0pLimAslr+LTC2N09sjOuFCXU71hRsEriOs="; + hash = "sha256-le/E+26N/SEam9Rvo2xzB2cFly65FO0RA+Xvh9NOSfE="; }; - cargoHash = "sha256-pLbz2z+l8E/R+GffseOacKrjr6ERZf1ETh8tVQjI4TU="; + cargoHash = "sha256-QC/7MctcfGWQpSSz/mS6czHh37llJl7aWJgyaa/WvB0="; # attempts to run the program on .git in src which is not deterministic doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index 3f36fa142c1e7..fac196e9ad0cd 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -10,17 +10,17 @@ python3Packages.buildPythonApplication rec { pname = "git-cola"; - version = "4.8.1"; + version = "4.8.2"; pyproject = true; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - hash = "sha256-3SCfsLYB4qhvsVo0Ji4WPwIDGcMwQ4M4zKnCOsXGTS0="; + hash = "sha256-8OErZ6uKTWE245BoBu9lQyTLA43DfWaYDv3wbPWaufg="; }; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ]; @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { disabledTestPaths = [ "qtpy/" "contrib/win32" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "cola/inotify.py" ]; diff --git a/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-credential-keepassxc/default.nix index 5f4f7c6daf71b..3a85cff455b81 100644 --- a/pkgs/applications/version-management/git-credential-keepassxc/default.nix +++ b/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jBUp0jes4wtr8cmqceEBb6noqGkJUHbIfYgWOw5KMF4="; - buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration Foundation ]; buildFeatures = [] ++ lib.optional withNotification "notification" diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index 592074224f01c..c9df6aff549ab 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -2,22 +2,16 @@ , fetchFromGitHub , buildDotnetModule , dotnetCorePackages -, libX11 -, libICE -, libSM -, fontconfig , libsecret , git , git-credential-manager , gnupg , pass , testers -, withGuiSupport ? true , withLibsecretSupport ? true , withGpgSupport ? true }: -assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; version = "2.5.1"; @@ -36,9 +30,8 @@ buildDotnetModule rec { dotnetInstallFlags = [ "--framework" "net8.0" ]; executables = [ "git-credential-manager" ]; - runtimeDeps = [ fontconfig ] - ++ lib.optionals withGuiSupport [ libX11 libICE libSM ] - ++ lib.optional withLibsecretSupport libsecret; + runtimeDeps = + lib.optional withLibsecretSupport libsecret; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath ([ git ] ++ lib.optionals withGpgSupport [ gnupg pass ])}" ]; diff --git a/pkgs/applications/version-management/git-dive/default.nix b/pkgs/applications/version-management/git-dive/default.nix index c0209c38cfa9e..b80397e142bf4 100644 --- a/pkgs/applications/version-management/git-dive/default.nix +++ b/pkgs/applications/version-management/git-dive/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { libgit2 oniguruma zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix index 884eeb893ac41..1cc039a09fc63 100644 --- a/pkgs/applications/version-management/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "swsnr"; repo = "git-gone"; rev = "v${version}"; - hash = "sha256-Mc9/P4VBmLOC05xqdx/yopbhvdpQS3uejc4YA7BIgug="; + hash = "sha256-j88ZnJ0V8h/fthOWwV6B0ZbzUz7THykqrI2QpOkDT4I="; }; - cargoHash = "sha256-NyyficEDJReMLAw2VAK2fOXNIwHilnUqQRACGck+0Vo="; + cargoHash = "sha256-H41wpG5LhjJ7BtFrol0JbjTpssOPUgumgapOiZJi2lc="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' installManPage git-gone.1 diff --git a/pkgs/applications/version-management/git-graph/default.nix b/pkgs/applications/version-management/git-graph/default.nix index 016892892247d..e801cb0e23bf0 100644 --- a/pkgs/applications/version-management/git-graph/default.nix +++ b/pkgs/applications/version-management/git-graph/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "Command line tool to show clear git graphs arranged for your branching model"; homepage = "https://github.com/mlange-42/git-graph"; license = licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ cafkafk ]; mainProgram = "git-graph"; }; diff --git a/pkgs/applications/version-management/git-ignore/default.nix b/pkgs/applications/version-management/git-ignore/default.nix index 1210e31894e17..12f4f02fd0a20 100644 --- a/pkgs/applications/version-management/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-ignore/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix index 6019e2eb7a4b2..835b6ddf8514e 100644 --- a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; # Compilation during tests fails if this env var is not set. preCheck = "export GIRT_BUILD_GIT_HASH=${version}"; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 1e0ab925c8328..a8dc37f177efb 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.29.0"; + version = "3.29.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-QEZF6bCNAXvGTC1KUMRyhIfgUBh4wjgfuoiBEG7jKFE="; + hash = "sha256-3GXTdIXITZeDqe6gxwOCaFXwITYYfXTy57H2AHA5Zyc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 9d1ba6f460fad..2dc3ab74a05d4 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.13.28"; + version = "5.13.29"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-zw1yY/vCrxklmIXGHO5cMOQ9L3xfHD24f2JN7ibF/I8="; + hash = "sha256-8XUpUpsd2q/1N28ZAPt7rW0pJu0WzE6oVSOwdJxhSBk="; }; - cargoHash = "sha256-pnSp6XCVSxCY7b1LHeQM9/KsjG6sGQoMCPcL8Bby4A4="; + cargoHash = "sha256-KtdbYzXHpdg0Rf4ENrWpP0+vG3+HlLVi7MLeXp9HoVw="; nativeBuildInputs = [ pkg-config ]; @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/applications/version-management/git-nomad/default.nix b/pkgs/applications/version-management/git-nomad/default.nix index 941b84b68fcc3..566a032f9b208 100644 --- a/pkgs/applications/version-management/git-nomad/default.nix +++ b/pkgs/applications/version-management/git-nomad/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-7CZC29y9dLpyanolO+epKd0KwmRc1iGY+sPM9f/j5hk="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/applications/version-management/git-quick-stats/default.nix b/pkgs/applications/version-management/git-quick-stats/default.nix index 99be76387bd88..113388c48cd30 100644 --- a/pkgs/applications/version-management/git-quick-stats/default.nix +++ b/pkgs/applications/version-management/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.5.6"; + version = "2.5.7"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-xd/ItpngreR77QTsSHLCgZfyvUZXBfOVPJaVtBZ2iTc="; + sha256 = "sha256-TGwoW4jpXbFdxk9HAZJTDhXIHhR1QEcDRCjspBv2KdQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix index 9bc7e678d3ed6..a9382ee0cb391 100644 --- a/pkgs/applications/version-management/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-quickfix/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration libiconv diff --git a/pkgs/applications/version-management/git-radar/default.nix b/pkgs/applications/version-management/git-radar/default.nix index 1c19381c1bb17..59ec4b61d85c2 100644 --- a/pkgs/applications/version-management/git-radar/default.nix +++ b/pkgs/applications/version-management/git-radar/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-radar fetch.sh prompt.bash prompt.zsh radar-base.sh $out ln -s $out/git-radar $out/bin - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' wrapProgram $out/git-radar --prefix PATH : ${lib.makeBinPath [ coreutils-prefixed ]} ''} ''; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 86978c7cf7cfe..f9c59ad18ebff 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.46"; + version = "2.47"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-eWRDarMx0QzTdTx3nFl1y12k25NqxGzuhLZd52Yr4qU="; + hash = "sha256-LFzUvDMNGxp5HzdjlaN0VS7HpIzN8GA5MQL61teKRvo="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/git-series/default.nix b/pkgs/applications/version-management/git-series/default.nix index 9f20e7cab7b87..86277614bc4c3 100644 --- a/pkgs/applications/version-management/git-series/default.nix +++ b/pkgs/applications/version-management/git-series/default.nix @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config installShellFiles - ] ++ lib.optionals stdenv.isDarwin [ curl ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ]; buildInputs = [ libgit2 libssh2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ curl ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ]; env = { LIBGIT2_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix index d9792654a94b0..67893b122d069 100644 --- a/pkgs/applications/version-management/git-stack/default.nix +++ b/pkgs/applications/version-management/git-stack/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-MEhUmy4ijR/zHm/qMt4PqNGYnCfIgjNaL9SlMmXCMmc="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/applications/version-management/git-sync/default.nix b/pkgs/applications/version-management/git-sync/default.nix index 07fa41a726379..01ac29cf8c56f 100644 --- a/pkgs/applications/version-management/git-sync/default.nix +++ b/pkgs/applications/version-management/git-sync/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { git gnugrep gnused - ] ++ lib.optionals stdenv.isLinux [ inotify-tools ]); + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]); postFixup = '' wrap_path="${wrapperPath}":$out/bin diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index 3654aadaf156e..00d2722bcdbe4 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "15.1.0"; + version = "16.3.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-e4lOyYQHsVOmOYKQ+3B2EdneWL8NEzboTlRKtO8Wdjg="; + hash = "sha256-q4bRUz6ZI6y0AYEDMUBMN1YJxmHkIDDkUiMd4rQbDHk="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix index a387ec706718d..60db7f8ee71e1 100644 --- a/pkgs/applications/version-management/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libgit2 ] - ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit CoreFoundation Security ]; postInstall = '' install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 diff --git a/pkgs/applications/version-management/git-workspace/default.nix b/pkgs/applications/version-management/git-workspace/default.nix index 9418c7d20e580..c7af04adcb9ff 100644 --- a/pkgs/applications/version-management/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-workspace/default.nix @@ -13,21 +13,21 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qAJv4iCw9gkO9yPVQUqla7UWpNkPjPBa4IGQfOyd8k0="; + sha256 = "sha256-Xf3uR+MG8vRBcad5n5k9NKyfC6v0y3BCz0CfDORsy/Q="; }; - cargoHash = "sha256-p+mZN0TXxntT22vp6uBRc6kBTzVN3/Oy7D4v3ihwV8Y="; + cargoHash = "sha256-oywwbDwg6O4pdqRJAM+IAt65DV6IkpMec8v4PY1RoZU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index dd1b96c29a8cc..3d7f96bb5fe0c 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -7,7 +7,7 @@ , svnSupport ? false, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform , nlsSupport ? true -, osxkeychainSupport ? stdenv.isDarwin +, osxkeychainSupport ? stdenv.hostPlatform.isDarwin , guiSupport ? false , withManual ? true , pythonSupport ? true @@ -20,11 +20,11 @@ , gzip # needed at runtime by gitweb.cgi , withSsh ? false , sysctl -, doInstallCheck ? !stdenv.isDarwin # extremely slow on darwin +, doInstallCheck ? !stdenv.hostPlatform.isDarwin # extremely slow on darwin , tests }: -assert osxkeychainSupport -> stdenv.isDarwin; +assert osxkeychainSupport -> stdenv.hostPlatform.isDarwin; assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { ./installCheck-path.patch ] ++ lib.optionals withSsh [ ./ssh-path.patch - ] ++ lib.optionals (guiSupport && stdenv.isDarwin) [ + ] ++ lib.optionals (guiSupport && stdenv.hostPlatform.isDarwin) [ # Needed to workaround an issue in macOS where gitk shows a empty window # https://github.com/Homebrew/homebrew-core/issues/68798 # https://github.com/git/git/pull/944 @@ -87,16 +87,16 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gettext perlPackages.perl makeWrapper pkg-config ] ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ]; - buildInputs = [ curl openssl zlib expat cpio (if stdenv.isFreeBSD then libiconvReal else libiconv) bash ] + buildInputs = [ curl openssl zlib expat cpio (if stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv) bash ] ++ lib.optionals perlSupport [ perlPackages.perl ] ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] - ++ lib.optionals stdenv.isDarwin [ Security CoreServices ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ] ++ lib.optionals withLibsecret [ glib libsecret ]; # required to support pthread_cancel() NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" - + lib.optionalString (stdenv.isFreeBSD) "-lthr"; + + lib.optionalString (stdenv.hostPlatform.isFreeBSD) "-lthr"; configureFlags = [ "ac_cv_prog_CURL_CONFIG=${lib.getDev curl}/bin/curl-config" @@ -118,8 +118,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "SHELL_PATH=${stdenv.shell}" ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"]) ++ (if pythonSupport then ["PYTHON_PATH=${python3}/bin/python"] else ["NO_PYTHON=1"]) - ++ lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] - ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) + ++ lib.optionals stdenv.hostPlatform.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] + ++ (if stdenv.hostPlatform.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) ++ lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] ++ lib.optional withpcre2 "USE_LIBPCRE2=1" ++ lib.optional (!nlsSupport) "NO_GETTEXT=1" @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { # acceptable version. # # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 - ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent" + ++ lib.optional stdenv.hostPlatform.isDarwin "TKFRAMEWORK=/nonexistent" ++ lib.optional (stdenv.hostPlatform.isFreeBSD && stdenv.hostPlatform != stdenv.buildPlatform) "uname_S=FreeBSD"; disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -302,7 +302,7 @@ stdenv.mkDerivation (finalAttrs: { "PERL_PATH=${buildPackages.perl}/bin/perl" ]; - nativeInstallCheckInputs = lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) sysctl; + nativeInstallCheckInputs = lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) sysctl; preInstallCheck = '' installCheckFlagsArray+=( @@ -346,7 +346,7 @@ stdenv.mkDerivation (finalAttrs: { # Fails reproducibly on ZFS on Linux with formD normalization disable_test t0021-conversion disable_test t3910-mac-os-precompose - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # XXX: Some tests added in 2.24.0 fail. # Please try to re-enable on the next release. disable_test t7816-grep-binary-pattern @@ -355,7 +355,7 @@ stdenv.mkDerivation (finalAttrs: { disable_test t6300-for-each-ref # not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin) disable_test t5003-archive-zip - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' disable_test t7527-builtin-fsmonitor '' + lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 66bab500c664f..e6dec35a4a5d4 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -37,7 +37,7 @@ makeDesktopItem, openssl, wrapGAppsHook3, - makeShellWrapper, + buildPackages, at-spi2-atk, at-spi2-core, libuuid, @@ -57,24 +57,24 @@ let pname = "gitkraken"; - version = "10.2.0"; + version = "10.4.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - hash = "sha256-NY7IgUt6Q27Pz1K46xL4LYFBwTJdT+fvsFDM2OhoPWg="; + hash = "sha256-JGWDOAkJEnhvUyQOFsmoeW9Izj0IuHNpYGlYAMiWPj0="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - hash = "sha256-e7zIMJNMdFy7/8zsV3nH1OT76xNznoSPRUVhoLfR6QI="; + hash = "sha256-yCDE6QJMgU2Mgr/kUDnbKwQ3MpgVcdjAK7fnTAjSL54="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - hash = "sha256-YjGH9tKbJaYc5qENBCCpJGWWFJIQTD8O2H3onhMwGrw="; + hash = "sha256-nh+tO++QvPx9jyZuxNrH7rHFXZqVnu5jyiki3oWdw7E="; }; }; @@ -166,7 +166,9 @@ let nativeBuildInputs = [ copyDesktopItems - (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ gtk3 @@ -249,4 +251,4 @@ let dontFixup = true; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 9a431ad885305..8b73993462c78 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.2.4", - "repo_hash": "0hj1v7w68axzdy2lwwc320zpg2r2qv2f9rl23yisni6975p03ayi", + "version": "17.2.5", + "repo_hash": "0l3s3k3v306ihn47lkj49b8vlly7v11clciwpf7ly4c5mwvwjlx6", "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.2.4-ee", + "rev": "v17.2.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.2.4", - "GITLAB_PAGES_VERSION": "17.2.4", + "GITALY_SERVER_VERSION": "17.2.5", + "GITLAB_PAGES_VERSION": "17.2.5", "GITLAB_SHELL_VERSION": "14.37.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", - "GITLAB_WORKHORSE_VERSION": "17.2.4" + "GITLAB_WORKHORSE_VERSION": "17.2.5" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c469613ec6471..68acfdcf53430 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "17.2.4"; + version = "17.2.5"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -20,7 +20,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-Y+Yi5kH/0s+yMuD/90Tdxeshp9m0Mrx080jmWnq/zZ0="; + hash = "sha256-R6GmIBU7rzLBsegcXPjc9Dxp9qe3tP6unqOsnyiozgw="; }; vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 6d1a3ba1a192e..bbf6c9292206c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.7.0"; + version = "4.9.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-+71mqnXRMq0vE+T6V/JqIhP//zldQOEK7694IB5RSnc="; + hash = "sha256-kBM5ICESRUwHlM9FeJEFQFTM2E2zIF6axOGOHNmloKo="; }; - vendorHash = "sha256-h4nLnmsQ52PU3tUbTCUwWN8LbYuSgzaDkqplEZcDAGM="; + vendorHash = "sha256-nePIExsIWJgBDUrkkVBzc0qsYdfxR7GL1VhdWcVJnLg="; postPatch = '' # Disable flaky inmemory storage driver test @@ -28,7 +28,7 @@ buildGoModule rec { meta = with lib; { description = "GitLab Docker toolset to pack, ship, store, and deliver content"; license = licenses.asl20; - maintainers = with maintainers; [ yayayayaka xanderio ]; + maintainers = with maintainers; [ yayayayaka ] ++ teams.cyberus.members; platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index 463231b67fd0c..e04809a59a830 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Indexes Git repositories into Elasticsearch for GitLab"; mainProgram = "gitlab-elasticsearch-indexer"; license = licenses.mit; - maintainers = with maintainers; [ xanderio yayayayaka ]; + maintainers = with maintainers; [ yayayayaka ] ++ teams.cyberus.members; }; } diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 0fecac6298838..30dd1ff03d375 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.2.4"; + version = "17.2.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-7sB2MjU1iwqrOK8dNb7a14NFtrJ/7yoT07tzYVyCSJ8="; + hash = "sha256-5qksHuY7EzCoCMBxF4souvUz8xFstfzOZT3CF5YsV7M="; }; vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index a7d2c7d2c0fd0..5948a05158b57 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.2.4"; + version = "17.2.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index f8d33908e6cae..c62ad405603ac 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -813,11 +813,11 @@ GEM gapic-common (>= 0.20.0, < 2.a) google-cloud-common (~> 1.0) google-cloud-errors (~> 1.0) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-cloud-core (1.7.0) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) + google-cloud-env (2.1.1) + faraday (>= 1.0, < 3.a) google-cloud-errors (1.3.0) google-cloud-location (0.6.0) gapic-common (>= 0.20.0, < 2.a) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 325a467cd6244..f24b731790603 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -2729,10 +2729,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0amp8vd16pzbdrfbp7k0k38rqxpwd88bkyp35l3x719hbb6l85za"; + sha256 = "0dagdfx3rnk9xplnj19gqpqn41fd09xfn8lp2p75psihhnj2i03l"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -2740,10 +2740,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1"; + sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg"; type = "gem"; }; - version = "1.6.0"; + version = "2.1.1"; }; google-cloud-errors = { groups = ["default"]; diff --git a/pkgs/applications/version-management/gitnr/default.nix b/pkgs/applications/version-management/gitnr/default.nix index a6d5a5bd61e36..3e4e1c07f8523 100644 --- a/pkgs/applications/version-management/gitnr/default.nix +++ b/pkgs/applications/version-management/gitnr/default.nix @@ -28,9 +28,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ]; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 9909d9829cbdd..f89e80c2daa6d 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -32,7 +32,7 @@ in rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config installShellFiles ]; - buildInputs = [ curl ] ++ (if stdenv.isDarwin + buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin then [ libiconv Security SystemConfiguration ] else [ openssl ]); diff --git a/pkgs/applications/version-management/gitstatus/default.nix b/pkgs/applications/version-management/gitstatus/default.nix index 2e2fc5af2c4c3..2170526c4ec58 100644 --- a/pkgs/applications/version-management/gitstatus/default.nix +++ b/pkgs/applications/version-management/gitstatus/default.nix @@ -1,5 +1,12 @@ -{ callPackage, lib, stdenv, fetchFromGitHub, git, zsh }: - +{ + callPackage, + lib, + stdenv, + fetchFromGitHub, + git, + zsh, + runtimeShell, +}: stdenv.mkDerivation rec { pname = "gitstatus"; version = "1.5.5"; @@ -23,6 +30,8 @@ stdenv.mkDerivation rec { install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd install -Dm444 gitstatus.plugin.sh -t $out/share/gitstatus/ install -Dm444 gitstatus.plugin.zsh -t $out/share/gitstatus/ + install -Dm444 gitstatus.prompt.sh -t $out/share/gitstatus/ + install -Dm444 gitstatus.prompt.zsh -t $out/share/gitstatus/ install -Dm555 install -t $out/share/gitstatus/ install -Dm444 build.info -t $out/share/gitstatus/ @@ -30,6 +39,14 @@ stdenv.mkDerivation rec { # because the FHS directories don't start at / substituteInPlace install \ --replace "_gitstatus_install_main ." "_gitstatus_install_main $out" + + cat <<EOF > $out/bin/gitstatus-share + #!${runtimeShell} + # Run this script to find the gitstatus shared folder where all the shell + # integration scripts are living. + echo $out/share/gitstatus + EOF + chmod +x $out/bin/gitstatus-share ''; # Don't install the "install" and "build.info" files, which the end user @@ -38,6 +55,8 @@ stdenv.mkDerivation rec { "/bin/gitstatusd" "/share/gitstatus/gitstatus.plugin.sh" "/share/gitstatus/gitstatus.plugin.zsh" + "/share/gitstatus/gitstatus.prompt.sh" + "/share/gitstatus/gitstatus.prompt.zsh" ]; # The install check sets up an empty Git repository and a minimal zshrc that @@ -45,7 +64,10 @@ stdenv.mkDerivation rec { # that the script was sourced successfully and that the "gitstatus_query" # command ran successfully. This tests the binary itself and the zsh # integration. - nativeInstallCheckInputs = [ git zsh ]; + nativeInstallCheckInputs = [ + git + zsh + ]; doInstallCheck = true; installCheckPhase = '' TEMP=$(mktemp -d) @@ -83,9 +105,20 @@ stdenv.mkDerivation rec { meta = with lib; { description = "10x faster implementation of `git status` command"; + longDescription = '' + To enable the included gitstatus prompt, add the appropriate line to your NixOS configuration: + `programs.bash.promptInit = "source $(gitstatus-share)/gitstatus.prompt.sh";` + `programs.zsh.promptInit = "source $(gitstatus-share)/gitstatus.prompt.zsh";` + + See the project homepage for details on customization. + ''; homepage = "https://github.com/romkatv/gitstatus"; license = licenses.gpl3Only; - maintainers = with maintainers; [ mmlb hexa SuperSandro2000 ]; + maintainers = with maintainers; [ + mmlb + hexa + SuperSandro2000 + ]; platforms = platforms.all; mainProgram = "gitstatusd"; }; diff --git a/pkgs/applications/version-management/gittyup/default.nix b/pkgs/applications/version-management/gittyup/default.nix index 2a7cb13d2aa47..146f2c7e95251 100644 --- a/pkgs/applications/version-management/gittyup/default.nix +++ b/pkgs/applications/version-management/gittyup/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { openssl qtbase qttools - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { license = with licenses; [ mit ]; maintainers = [ ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix index c8001682adc39..4e8cfbfd43fc6 100644 --- a/pkgs/applications/version-management/gql/default.nix +++ b/pkgs/applications/version-management/gql/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.26.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-qVO+kqsmVFDsO9fJGLyqxBzlBc8DZmX1ZQ7UjI3T0Fw="; + hash = "sha256-BA94Q8nRf4NptVBHSMYLMEklB9vHaXRU1+o7shXhkZQ="; }; - cargoHash = "sha256-sq8hxI1MOOE97OwrUEkwrEkpQWeCTzA8r6x5abTxCl0="; + cargoHash = "sha256-L+o0ZhTI7x01DpGuhWrvzvSZDYHc++31svWTJ41qx90="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/version-management/guilt/default.nix b/pkgs/applications/version-management/guilt/default.nix index aeb0eaf43f11a..bca572b28bcac 100644 --- a/pkgs/applications/version-management/guilt/default.nix +++ b/pkgs/applications/version-management/guilt/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gawk git gnused - ] ++ lib.optionals stdenv.isDarwin [ openssl ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix deleted file mode 100644 index 0e5451256045a..0000000000000 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch2 -, rustPlatform -, Security -, SystemConfiguration -, pkg-config -, libiconv -, openssl -, gzip -, libssh2 -, libgit2 -, zstd -, installShellFiles -, nix-update-script -, testers -, jujutsu -}: - -rustPlatform.buildRustPackage rec { - pname = "jujutsu"; - version = "0.20.0"; - - src = fetchFromGitHub { - owner = "martinvonz"; - repo = "jj"; - rev = "v${version}"; - hash = "sha256-1lONtpataRi0yE6LpN6oNnC3OAW918v8GFCUwinYJWI="; - }; - - cargoPatches = [ - # cargo: bump `git2` to 0.19.0 - (fetchpatch2 { - url = "https://github.com/martinvonz/jj/commit/38f6ee89183d886e432472c5888908c9900c9c18.patch?full_index=1"; - hash = "sha256-BVcak7uIEhwoO0f9hf0GVKKSVmp/ueKD5C9F8J0iL3w="; - }) - ]; - - cargoHash = "sha256-FxcvLT0YnXcjDCKxuyijYsVSMLjx1glDzmFH5ctSx6s="; - - cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors - useNextest = false; # nextest is the upstream integration framework, but is problematic for test skipping - ZSTD_SYS_USE_PKG_CONFIG = "1"; # disable vendored zlib - LIBGIT2_NO_VENDOR = "1"; # disable vendored libgit2 - LIBSSH2_SYS_USE_PKG_CONFIG = "1"; # disable vendored libssh2 - - nativeBuildInputs = [ - gzip - installShellFiles - pkg-config - ]; - - buildInputs = [ - openssl - zstd - libgit2 - libssh2 - ] ++ lib.optionals stdenv.isDarwin [ - Security - SystemConfiguration - libiconv - ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - $out/bin/jj util mangen > ./jj.1 - installManPage ./jj.1 - - installShellCompletion --cmd jj \ - --bash <($out/bin/jj util completion bash) \ - --fish <($out/bin/jj util completion fish) \ - --zsh <($out/bin/jj util completion zsh) - ''; - - checkFlags = [ - # signing tests spin up an ssh-agent and do git checkouts - "--skip=test_ssh_signing" - ]; - - passthru = { - updateScript = nix-update-script { }; - tests = { - version = testers.testVersion { - package = jujutsu; - command = "jj --version"; - }; - }; - }; - - meta = with lib; { - description = "Git-compatible DVCS that is both simple and powerful"; - homepage = "https://github.com/martinvonz/jj"; - changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ _0x4A6F thoughtpolice ]; - mainProgram = "jj"; - }; -} diff --git a/pkgs/applications/version-management/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix index dcaca33f09522..6e3cb2c09d5f9 100644 --- a/pkgs/applications/version-management/lucky-commit/default.nix +++ b/pkgs/applications/version-management/lucky-commit/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-8JkodGtMdYP/IIBqRcJFD5syiZi+VakDyX7VcvR0HLo="; - buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); + buildInputs = lib.optional withOpenCL (if stdenv.hostPlatform.isDarwin then OpenCL else ocl-icd); buildNoDefaultFeatures = !withOpenCL; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 466cc643c39f3..5a790ff3f4d3f 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -50,7 +50,7 @@ let rustc ]; buildInputs = [ docutils ] - ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional rustSupport "PURE=--rust"; diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 06e4624c8ee09..ec01f86a3af07 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ jam ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Foundation Security ]; outputs = [ "out" "bin" "dev" ]; - hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ]; jamFlags = [ @@ -59,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: rec { ] ++ lib.optionals stdenv.cc.isClang [ "-sOSCOMP=clang" "-sCLANGVER=${stdenv.cc.cc.version}" ] ++ lib.optionals stdenv.cc.isGNU [ "-sOSCOMP=gcc" "-sGCCVER=${stdenv.cc.cc.version}" ] - ++ lib.optionals stdenv.isLinux [ "-sOSVER=26" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "-sOSVER=26" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-sOSVER=1013" "-sMACOSX_SDK=${emptyDirectory}" "-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib" @@ -69,11 +69,11 @@ stdenv.mkDerivation (finalAttrs: rec { CCFLAGS = # The file contrib/optimizations/slide_hash_neon.h is missing from the # upstream distribution. It comes from the Android/Chromium sources. - lib.optionals stdenv.isAarch64 [ "-I${androidZlibContrib}" ]; + lib.optionals stdenv.hostPlatform.isAarch64 [ "-I${androidZlibContrib}" ]; "C++FLAGS" = # Avoid a compilation error that only occurs for 4-byte longs. - lib.optionals stdenv.isi686 [ "-Wno-narrowing" ] + lib.optionals stdenv.hostPlatform.isi686 [ "-Wno-narrowing" ] # See the "Header dependency changes" section of # https://www.gnu.org/software/gcc/gcc-11/porting_to.html for more # information on why we need to include these. diff --git a/pkgs/applications/version-management/p4d/default.nix b/pkgs/applications/version-management/p4d/default.nix index d7dcd1405575b..b441fe846302b 100644 --- a/pkgs/applications/version-management/p4d/default.nix +++ b/pkgs/applications/version-management/p4d/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dontBuild = true; diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 2824ed82cfa22..82aa6b57a8c51 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -21,7 +21,7 @@ let }; mkDerivation = - if stdenv.isDarwin then callPackage ./darwin.nix { } + if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { } else qt6Packages.callPackage ./linux.nix { }; in mkDerivation { pname = "p4v"; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 7503814c389d9..95d974bfa145b 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl libsodium xxHash ] ++ (lib.optionals gitImportSupport [ libgit2 ]) - ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ (lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices Security SystemConfiguration ])); diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 8887d5126fde0..4ed034c500f99 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { apr aprutil python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index f1536e8c54b2e..e19fbeb4977f8 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, python3Packages +, python311Packages , fetchFromGitHub , fetchurl , cargo @@ -40,7 +40,7 @@ let # # See https://github.com/NixOS/nixpkgs/pull/198311#issuecomment-1326894295 myCargoSetupHook = rustPlatform.cargoSetupHook.overrideAttrs (old: { - cargoConfig = lib.optionalString (!stdenv.isDarwin) old.cargoConfig; + cargoConfig = lib.optionalString (!stdenv.hostPlatform.isDarwin) old.cargoConfig; }); src = fetchFromGitHub { @@ -83,7 +83,7 @@ let substituteInPlace build-tar.py \ --replace-fail 'run(yarn + ["--cwd", src_join(), "install", "--prefer-offline"])' 'pass' - ${python3Packages.python}/bin/python3 build-tar.py \ + ${python311Packages.python}/bin/python3 build-tar.py \ --output isl-dist.tar.xz \ --yarn 'yarn --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress' @@ -101,7 +101,7 @@ let }; in # Builds the main `sl` binary and its Python extensions -python3Packages.buildPythonApplication { +python311Packages.buildPythonApplication { pname = "sapling"; inherit src version; @@ -141,7 +141,7 @@ python3Packages.buildPythonApplication { install ${isl}/isl-dist.tar.xz $out/lib/isl-dist.tar.xz ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/sl \ --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" ''; @@ -156,7 +156,7 @@ python3Packages.buildPythonApplication { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl libiconv Cocoa diff --git a/pkgs/applications/version-management/silver-platter/default.nix b/pkgs/applications/version-management/silver-platter/default.nix index f1653cf103890..368cf8dcf218b 100644 --- a/pkgs/applications/version-management/silver-platter/default.nix +++ b/pkgs/applications/version-management/silver-platter/default.nix @@ -37,9 +37,9 @@ buildPythonApplication rec { propagatedBuildInputs = [ setuptools breezy dulwich jinja2 pyyaml ruamel-yaml ]; nativeBuildInputs = [ setuptools-rust rustPlatform.cargoSetupHook cargo rustc ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; pythonImportsCheck = [ "silver_platter" ]; diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix deleted file mode 100644 index c2dc0d8bd2be5..0000000000000 --- a/pkgs/applications/version-management/srvc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }: - -rustPlatform.buildRustPackage rec { - pname = "srvc"; - version = "0.20.0"; - - src = fetchFromGitHub { - owner = "insilica"; - repo = "rs-srvc"; - rev = "v${version}"; - hash = "sha256-pnlbMU/uoP9ZK8kzTRYTMY9+X9VIKJHwW2qMXXD8Udg="; - }; - - cargoHash = "sha256-+m8WJMn1aq3FBDO5c/ZwbcK2G+UE5pSwHTgOl2s6pDw="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - ]; - - nativeCheckInputs = [ git ]; - - # remove timeouts in tests to make them less flaky - TEST_SRVC_DISABLE_TIMEOUT = 1; - - meta = with lib; { - description = "Sysrev version control"; - homepage = "https://github.com/insilica/rs-srvc"; - changelog = "https://github.com/insilica/rs-srvc/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ john-shaffer ]; - mainProgram = "sr"; - }; -} diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix index 07f75af31d2ec..4d44724eddec8 100644 --- a/pkgs/applications/version-management/stgit/default.nix +++ b/pkgs/applications/version-management/stgit/default.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.4.11"; + version = "2.4.12"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-wmBbcK6oImIlgbJ1gMkCVPBLaHUUeN2y9szx8age7mo="; + hash = "sha256-fNQLdW5KFpYUBBmaUYYOmDym7OweXsDfD+uFl688zcY="; }; - cargoHash = "sha256-hw5pXmwcoi76XwPFdfQoai8S6ApDit48nVuII4ksCRM="; + cargoHash = "sha256-s3PFNc1rn01X6tauRXp5B4cg3AIVSishqDFy0lP/8g8="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ git perl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.system_cmds libiconv ]; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index a978ff16357d7..84f41e6e26c60 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -85,7 +85,7 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 490a0c4644043..d272645ee5062 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -11,9 +11,9 @@ in } { }; sublime-merge-dev = common { - buildVersion = "2095"; + buildVersion = "2100"; dev = true; - aarch64sha256 = "FmXz8VAWS7e0bB9NeXbihnhdhWMyNJJs6PNt+K2G0Bk="; - x64sha256 = "83Hw27RgGPgugpf4eMuWT6/MSQ2Q2VBCbaXoSGFtTPI="; + aarch64sha256 = "BL0hk/8hf660I1HUQMQwvZxB6TpXpygQxOYtuDGfrYw="; + x64sha256 = "NePJt2WttsbqJsduGX6UsOzAce2xW4Mc8Nq9We+ZCSM="; } { }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 72f21fd8e2a39..11d9c7fefdffe 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -49,6 +49,14 @@ let # "-P" CPPFLAG is needed to build Python bindings and subversionClient CPPFLAGS = [ "-P" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + "-Wno-int-conversion" + ]; + }; + preConfigure = lib.optionalString needsAutogen '' ./autogen.sh ''; @@ -119,7 +127,7 @@ let platforms = platforms.linux ++ platforms.darwin; }; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { CXX = "clang++"; CC = "clang"; CPP = "clang -E"; diff --git a/pkgs/applications/version-management/tig/default.nix b/pkgs/applications/version-management/tig/default.nix index b4a8533d468ee..6c90d24e55bf6 100644 --- a/pkgs/applications/version-management/tig/default.nix +++ b/pkgs/applications/version-management/tig/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoreconfFlags = [ "-I" "tools" "-v" ]; buildInputs = [ ncurses readline git ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # those files are inherently impure, we'll handle the corresponding dependencies. postPatch = '' diff --git a/pkgs/applications/version-management/transcrypt/default.nix b/pkgs/applications/version-management/transcrypt/default.nix index 5000037b0c8af..26e88f6242996 100644 --- a/pkgs/applications/version-management/transcrypt/default.nix +++ b/pkgs/applications/version-management/transcrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "transcrypt"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "elasticdog"; repo = "transcrypt"; rev = "v${version}"; - sha256 = "+B8CYHDneDd0GwiTwQK6YVScDMKao2JXFpGk9PY6/EE="; + sha256 = "sha256-hevKqs0JKsRI2qTRzWAAuMotiBX6dGF0ZmypBco2l6g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/ungit/default.nix b/pkgs/applications/version-management/ungit/default.nix index 98846c445dbf5..215c9c2b75812 100644 --- a/pkgs/applications/version-management/ungit/default.nix +++ b/pkgs/applications/version-management/ungit/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "ungit"; - version = "1.5.26"; + version = "1.5.28"; src = fetchFromGitHub { owner = "FredrikNoren"; repo = "ungit"; rev = "v${version}"; - hash = "sha256-HTo0z/y7thUrDm6ofHiUtv1UDuqGN+kpMFLuIvxyxZQ="; + hash = "sha256-zLc+qzbbaQs6Y3NJFHupxyZ0QfuM/VW97dFESR+5dVQ="; }; - npmDepsHash = "sha256-f/CtNYoy5ZOgdVTG2ZdBpXOSNUKSG5wCy0eIl4ov80U="; + npmDepsHash = "sha256-pYOBdCb6G24JBGWOhd4fyVEEUn19D9t/GxjjIi/2ya0="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = true; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 0dab32e57accf..2d6c0c9089afe 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -75,7 +75,7 @@ resholve.mkDerivation rec { gnutar ]; fake = { - external = if stdenv.isCygwin then [ ] else [ "cygpath" ]; + external = if stdenv.hostPlatform.isCygwin then [ ] else [ "cygpath" ]; }; fix = { "$GPG_PROGRAM" = [ "gpg" ]; diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index d906b0d2b865f..b5d9fb11f5e07 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -21,13 +21,13 @@ assert withMpv || withVlc || withIina; stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "4.8"; + version = "4.9"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - hash = "sha256-vntCiWaONndjU622c1BoCoASQxQf/i7yO0x+70OxzPU="; + hash = "sha256-7zuepWTtrFp9RW3zTSjPzyJ9e+09PdKgwcnV+DqPEUY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index 3369316621713..8bb21ac9d43b2 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "2.2.18"; + version = "2.2.19"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - hash = "sha256-gFIz2tkuBaC4DoN/oVNra5pQi23MAuhFJRGxEcZgvAo="; + hash = "sha256-f4AlTfLTn0GvBj3ztpkNPc6BDlLsEtz/yE5F2WfjU8U="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 7bde503bd7aeb..686821482e6dd 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -34,7 +34,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "19.0"; + version = "19.0.2"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } ) @@ -55,8 +55,8 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant - then "sha256-KxoUXHMlgWoa00GSq/DLVgyOjuv7k8aUwl20XvDRZvc=" - else "sha256-XQP5RL/p/voQePLiBr1Hc+dBUZHW39XxDjyxKJyKXxw="; + then "sha256-q11stWFWRDUebAUzGH23R3Spd3EdDG85+6yB/srYCJY=" + else "sha256-dYTrO0wpIN68WhBovmYLK5uWOQ1nubpSyKqPCDMPMiM="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix index db34d1da27497..5127dba204fc4 100644 --- a/pkgs/applications/video/dmlive/default.nix +++ b/pkgs/applications/video/dmlive/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ configd Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ configd Security ]; postInstall = '' wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}" diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix deleted file mode 100644 index 3fb98c8d71894..0000000000000 --- a/pkgs/applications/video/filebot/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv, fetchurl, coreutils, openjdk17, makeWrapper, autoPatchelfHook -, zlib, libzen, libmediainfo, curlWithGnuTls, libmms, glib -, genericUpdater, writeShellScript -}: - -let - lanterna = fetchurl { - url = "https://search.maven.org/remotecontent?filepath=com/googlecode/lanterna/lanterna/3.1.1/lanterna-3.1.1.jar"; - hash = "sha256-7zxCeXYW5v9ritnvkwRpPKdgSptCmkT3HJOaNgQHUmQ="; - }; -in stdenv.mkDerivation (finalAttrs: { - pname = "filebot"; - version = "5.1.4"; - - src = fetchurl { - url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz"; - hash = "sha256-UEgG3bQT5GPMfh/nxC1aXGsb8HKE5Ov5ax0ULjLr73U="; - }; - - unpackPhase = "tar xvf $src"; - - nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; - - buildInputs = [ zlib libzen libmediainfo curlWithGnuTls libmms glib ]; - - postPatch = '' - # replace lanterna.jar to be able to specify `com.googlecode.lanterna.terminal.UnixTerminal.sttyCommand` - cp ${lanterna} jar/lanterna.jar - ''; - - dontBuild = true; - installPhase = '' - mkdir -p $out/opt $out/bin - # Since FileBot has dependencies on relative paths between files, all required files are copied to the same location as is. - cp -r filebot.sh lib/ jar/ $out/opt/ - # Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead. - substituteInPlace $out/opt/filebot.sh \ - --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ - --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' \ - --replace '-jar "$FILEBOT_HOME/jar/filebot.jar"' '-Dcom.googlecode.lanterna.terminal.UnixTerminal.sttyCommand=${coreutils}/bin/stty -jar "$FILEBOT_HOME/jar/filebot.jar"' - wrapProgram $out/opt/filebot.sh \ - --prefix PATH : ${lib.makeBinPath [ openjdk17 ]} - # Expose the binary in bin to make runnable. - ln -s $out/opt/filebot.sh $out/bin/filebot - ''; - - passthru.updateScript = genericUpdater { - versionLister = writeShellScript "filebot-versionLister" '' - curl -s https://www.filebot.net \ - | sed -rne 's,^.*FileBot_([0-9]*\.[0-9]+\.[0-9]+)-portable.tar.xz.*,\1,p' - ''; - }; - - meta = with lib; { - description = "Ultimate TV and Movie Renamer"; - longDescription = '' - FileBot is the ultimate tool for organizing and renaming your Movies, TV - Shows and Anime as well as fetching subtitles and artwork. It's smart and - just works. - ''; - homepage = "https://filebot.net"; - changelog = "https://www.filebot.net/forums/viewforum.php?f=7"; - sourceProvenance = with sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ gleber felschr ]; - platforms = platforms.linux; - mainProgram = "filebot"; - }; -}) diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index 9e4eda8a0790a..7c6d8500d8776 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; - passthru.tests.version = lib.optionalAttrs stdenv.isLinux (testers.testVersion { + passthru.tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux (testers.testVersion { package = glaxnimate; command = "${xvfb-run}/bin/xvfb-run glaxnimate --version"; }); diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix deleted file mode 100644 index 3d6b281ef07b3..0000000000000 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{lib, stdenv, substituteAll, fetchFromGitHub, pkg-config, gettext, glib, gtk3, gmtk, dbus, dbus-glib -, libnotify, libpulseaudio, mplayer, wrapGAppsHook3 }: - -stdenv.mkDerivation rec { - pname = "gnome-mplayer"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "kdekorte"; - repo = "gnome-mplayer"; - rev = "v${version}"; - sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; - }; - - nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; - buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - mencoder = "${mplayer}/bin/mencoder"; - mplayer = "${mplayer}/bin/mplayer"; - }) - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: mpris-interface.o:src/playlist.h:32: multiple definition of - # `plclose'; gui.o:src/playlist.h:32: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - meta = with lib; { - description = "Gnome MPlayer, a simple GUI for MPlayer"; - mainProgram = "gnome-mplayer"; - homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/video/gnome-mplayer/fix-paths.patch b/pkgs/applications/video/gnome-mplayer/fix-paths.patch deleted file mode 100644 index ede4991c4662c..0000000000000 --- a/pkgs/applications/video/gnome-mplayer/fix-paths.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/src/gui.c -+++ b/src/gui.c -@@ -7470,7 +7470,7 @@ - filename = g_strdup_printf("%s/00000001.jpg", dirname); - g_free(basepath); - // run mplayer and try to get the first frame and convert it to a jpeg -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - av[ac++] = g_strdup_printf("-vo"); - av[ac++] = g_strdup_printf("jpeg:outdir=%s", dirname); - av[ac++] = g_strdup_printf("-ao"); ---- a/src/property_page_common.c -+++ b/src/property_page_common.c -@@ -80,7 +80,7 @@ - MetaData *ret; - ret = g_new0(MetaData, 1); - -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - av[ac++] = g_strdup_printf("-vo"); - av[ac++] = g_strdup_printf("null"); - av[ac++] = g_strdup_printf("-ao"); ---- a/src/support.c -+++ b/src/support.c -@@ -566,7 +566,7 @@ - } else { - playlist = FALSE; - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -728,7 +728,7 @@ - playlist = FALSE; - // run mplayer and try to get the first frame and convert it to a jpeg - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -825,7 +825,7 @@ - playlist = FALSE; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1251,7 +1251,7 @@ - gm_log(verbose, G_LOG_LEVEL_INFO, "getting file metadata for %s", name); - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1532,7 +1532,7 @@ - return 0; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1597,7 +1597,7 @@ - - if (control_id == 0) { - ac = 0; -- av[ac++] = g_strdup_printf("mencoder"); -+ av[ac++] = g_strdup_printf("@mencoder@"); - av[ac++] = g_strdup_printf("-ovc"); - av[ac++] = g_strdup_printf("copy"); - av[ac++] = g_strdup_printf("-oac"); -@@ -2830,7 +2830,7 @@ - gboolean ret = TRUE; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index 37bf7baec8706..bea389ccc5342 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -40,7 +40,7 @@ buildPythonApplication rec { description = "Native Linux GUI for Chromecasting local files"; homepage = "https://github.com/keredson/gnomecast"; license = with licenses; [ gpl3 ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "gnomecast"; }; } diff --git a/pkgs/applications/video/go2tv/default.nix b/pkgs/applications/video/go2tv/default.nix index 6837572cd9f03..e7ecf29369354 100644 --- a/pkgs/applications/video/go2tv/default.nix +++ b/pkgs/applications/video/go2tv/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "go2tv" + lib.optionalString (!withGui) "-lite"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "alexballas"; repo = "go2tv"; rev = "refs/tags/v${version}"; - hash = "sha256-7m5GikrdcrJyl+KYuSk1JWLW2SsHOcBJNJuq2BahxHc="; + hash = "sha256-h0q2VhnU7CPCD0Co9rLPmGh4BK4eP5QUMep7AaJ3weY="; }; - vendorHash = "sha256-na79rF/9o+s6E4i08Ocs6u98IABc19sTGFvjI6yeJFo="; + vendorHash = "sha256-+sASY+HosTMMVHHPwVw8nO+/72s2A1EpuTMHJXhHtnc="; nativeBuildInputs = [ pkg-config ]; @@ -36,7 +36,7 @@ buildGoModule rec { xorg.libXext xorg.libXxf86vm libglvnd - ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel UserNotifications ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa Kernel UserNotifications ]; ldflags = [ "-s" diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 57da5147407eb..b036e69ce8a39 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { # For most other functionality, this should probably be extended nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon ]; diff --git a/pkgs/applications/video/gyroflow/Cargo.lock b/pkgs/applications/video/gyroflow/Cargo.lock index 2a3709e1b15e4..c675874a49af1 100644 --- a/pkgs/applications/video/gyroflow/Cargo.lock +++ b/pkgs/applications/video/gyroflow/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -17,23 +17,29 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy 0.7.32", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -43,8 +49,8 @@ name = "ahrs" version = "0.6.0" source = "git+https://github.com/jmagnuson/ahrs-rs.git?rev=bf7b41d#bf7b41d09115b47ce8f6060624ed6a8a9bc445d4" dependencies = [ - "nalgebra 0.32.3", - "num-traits 0.2.17", + "nalgebra 0.32.6", + "num-traits 0.2.19", "simba 0.8.1", ] @@ -70,20 +76,20 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alsa" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" dependencies = [ "alsa-sys", - "bitflags 1.3.2", + "bitflags 2.6.0", + "cfg-if", "libc", - "nix 0.24.3", ] [[package]] @@ -113,9 +119,20 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.76" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "app_dirs2" +version = "2.5.5" +source = "git+https://github.com/app-dirs-rs/app_dirs2.git#1137ee05d745c2d5fa3fd01aecb6e1300d6fc280" +dependencies = [ + "jni", + "ndk-context", + "windows 0.58.0", + "xdg", +] [[package]] name = "approx" @@ -123,7 +140,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -145,7 +162,7 @@ dependencies = [ "argh_shared", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -159,14 +176,14 @@ dependencies = [ [[package]] name = "argmin" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897c18cfe995220bdd94a27455e5afedc7c688cbf62ad2be88ce7552452aa1b2" +checksum = "760a49d596b18b881d2fe6e9e6da4608fa64d4a7653ef5cd43bfaa4da018d596" dependencies = [ "anyhow", "argmin-math", "instant", - "num-traits 0.2.17", + "num-traits 0.2.19", "paste", "rand", "rand_xoshiro", @@ -175,25 +192,25 @@ dependencies = [ [[package]] name = "argmin-math" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8798ca7447753fcb3dd98d9095335b1564812a68c6e7c3d1926e1d5cf094e37" +checksum = "d93a0d0269b60bd1cd674de70314e3f0da97406cf8c1936ce760d2a46e0f13fe" dependencies = [ "anyhow", "cfg-if", - "nalgebra 0.32.3", + "nalgebra 0.32.6", "num-complex", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", "rand", "thiserror", ] [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arrsac" @@ -207,11 +224,11 @@ dependencies = [ [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] @@ -222,22 +239,23 @@ checksum = "4cea652ffbedecf29e9cd41bb4c066881057a42c0c119040f022802b26853e77" [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 2.5.3", + "event-listener", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.1.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 4.0.1", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -245,150 +263,122 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.8.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ - "async-lock 3.2.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.1.0", + "fastrand", + "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock", "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2", - "waker-fn", + "futures-lite", ] [[package]] name = "async-io" -version = "2.2.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ - "async-lock 3.2.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling", + "rustix", "slab", "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", + "windows-sys 0.59.0", ] [[package]] name = "async-lock" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.1", + "event-listener", "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.28", - "windows-sys 0.48.0", + "event-listener", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.2.2", - "async-lock 2.8.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] name = "async-task" -version = "4.6.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.75" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -399,30 +389,30 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.21.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base91" @@ -441,42 +431,22 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", -] - -[[package]] -name = "bindgen" -version = "0.69.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -490,18 +460,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bit_field" @@ -527,9 +497,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitreader" @@ -555,20 +525,26 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.2.0", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "piper", - "tracing", ] [[package]] @@ -582,15 +558,29 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] [[package]] name = "byteorder" @@ -600,17 +590,19 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cc" -version = "1.0.79" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" dependencies = [ "jobserver", + "libc", + "shlex", ] [[package]] @@ -634,6 +626,18 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "cgl" version = "0.3.2" @@ -645,23 +649,23 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.17", + "num-traits 0.2.19", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -670,18 +674,18 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", - "half 1.8.2", + "half", ] [[package]] @@ -705,13 +709,13 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading", ] [[package]] @@ -730,42 +734,11 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" -[[package]] -name = "com" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" -dependencies = [ - "com_macros", -] - -[[package]] -name = "com_macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" -dependencies = [ - "com_macros_support", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "com_macros_support" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -773,24 +746,24 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -811,9 +784,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics-types" @@ -839,36 +812,34 @@ dependencies = [ [[package]] name = "coreaudio-sys" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3120ebb80a9de008e638ad833d4127d50ea3d3a960ea23ea69bc66d9358a028" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" dependencies = [ - "bindgen 0.69.1", + "bindgen", ] [[package]] name = "cpal" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ "alsa", "core-foundation-sys", "coreaudio-rs", "dasp_sample", - "jni 0.19.0", + "jni", "js-sys", "libc", "mach2", - "ndk 0.7.0", + "ndk 0.8.0", "ndk-context", "oboe", - "once_cell", - "parking_lot", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.46.0", + "windows 0.54.0", ] [[package]] @@ -891,7 +862,7 @@ dependencies = [ "lazy_static", "proc-macro2", "regex", - "syn 2.0.43", + "syn 2.0.77", "unicode-xid", ] @@ -903,7 +874,7 @@ checksum = "3e1a2532e4ed4ea13031c13bc7bc0dbca4aae32df48e9d77f0d1e743179f2ea1" dependencies = [ "lazy_static", "proc-macro2", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -918,34 +889,33 @@ dependencies = [ "lazy_static", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -955,54 +925,46 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.10" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.17" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-queue" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1022,9 +984,9 @@ dependencies = [ [[package]] name = "cstr" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aa998c33a6d3271e3678950a22134cd7dd27cef86dee1b611b5b14207d1d90b" +checksum = "68523903c8ae5aacfa32a0d9ae60cadeb764e1da14ee0d26b1f3089f13a54636" dependencies = [ "proc-macro2", "quote", @@ -1058,7 +1020,7 @@ source = "git+https://github.com/rust-cv/cv.git?rev=82a25ee#82a25ee3a88c12002741 dependencies = [ "derive_more", "nalgebra 0.30.1", - "num-traits 0.2.17", + "num-traits 0.2.19", "sample-consensus", ] @@ -1071,17 +1033,7 @@ dependencies = [ "derive_more", "float-ord", "nalgebra 0.30.1", - "num-traits 0.2.17", -] - -[[package]] -name = "d3d12" -version = "0.7.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" -dependencies = [ - "bitflags 2.4.1", - "libloading 0.8.1", - "winapi", + "num-traits 0.2.19", ] [[package]] @@ -1091,7 +1043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1105,35 +1057,24 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -1146,61 +1087,38 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "directories" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - [[package]] name = "dispatch" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] - [[package]] name = "doc-comment" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "eight-point" @@ -1212,14 +1130,14 @@ dependencies = [ "cv-pinhole", "derive_more", "float-ord", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -1227,6 +1145,12 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + [[package]] name = "enterpolation" version = "0.2.1" @@ -1234,7 +1158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fadf5c8cbf7c6765ff05ccbd8811cd7bc3a763e4671755204552bf8740d042a" dependencies = [ "assert_float_eq", - "num-traits 0.2.17", + "num-traits 0.2.19", "serde", "topology-traits", ] @@ -1274,9 +1198,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -1284,24 +1208,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] - -[[package]] -name = "enumn" -version = "0.1.12" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -1312,9 +1225,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1322,26 +1235,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "4.0.1" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1350,25 +1246,25 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.1", + "event-listener", "pin-project-lite", ] [[package]] name = "exr" -version = "1.6.4" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", - "half 2.3.1", + "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -1385,60 +1281,40 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fc-blackbox" version = "0.2.0" -source = "git+https://github.com/AdrianEddy/fc-blackbox.git?rev=4e9e4e6#4e9e4e6c95e7bb98efc5e0186bd37937755e450f" +source = "git+https://github.com/ilya-epifanov/fc-blackbox.git?rev=de08350#de08350b2bd95f7af93b1b4adf0f27dc3dfd227a" dependencies = [ "chrono", "integer-encoding", "itertools 0.10.5", "nom", "num-rational", - "num-traits 0.2.17", + "num-traits 0.2.19", "thiserror", ] -[[package]] -name = "fdeflate" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" -dependencies = [ - "simd-adler32", -] - [[package]] name = "ffmpeg-next" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f45d337871329d85f5aad1e3d7b09d033cd611d50f734fd6464c731fe7c769bf" +version = "7.0.4" +source = "git+https://github.com/AdrianEddy/rust-ffmpeg#79564c6b9e6286b690635b499f1c5b3c7908230c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "ffmpeg-sys-next", "libc", ] [[package]] name = "ffmpeg-sys-next" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2529ad916d08c3562c754c21bc9b17a26c7882c0f5706cc2cd69472175f1620" +version = "7.0.2" +source = "git+https://github.com/AdrianEddy/rust-ffmpeg-sys.git#09e510214af403c9dea599f341fe3e6d648475c8" dependencies = [ - "bindgen 0.64.0", + "bindgen", "cc", "libc", "num_cpus", @@ -1448,25 +1324,25 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "filetime_creation" -version = "0.1.6" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aea213d5ab4e6cd49f50c0688a4e20e5b75ff3bc07ff63f814778bd9b1dd42d" +checksum = "c25b5d475550e559de5b0c0084761c65325444e3b6c9e298af9cefe7a9ef3a5f" dependencies = [ "cfg-if", "filetime", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1477,12 +1353,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1493,14 +1369,10 @@ checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", "spin", ] @@ -1522,7 +1394,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -1571,26 +1443,11 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -1637,32 +1494,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", ] [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gl_generator" @@ -1677,9 +1522,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.24.2" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" dependencies = [ "libm 0.2.8", ] @@ -1692,8 +1537,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glow" -version = "0.13.0" -source = "git+https://github.com/grovesNL/glow.git?rev=29ff917a2b2ff7ce0a81b2cc5681de6d4735b36e#29ff917a2b2ff7ce0a81b2cc5681de6d4735b36e" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f865cbd94bd355b89611211e49508da98a1fce0ad755c1e8448fb96711b24528" dependencies = [ "js-sys", "slotmap", @@ -1703,9 +1549,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] @@ -1716,7 +1562,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -1726,41 +1572,39 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", ] [[package]] name = "gpu-allocator" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d79e648296d0cf46c494e594763b6b362c4567e447177bc82750c733398b2a" +checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" dependencies = [ - "backtrace", "log", "presser", "thiserror", - "winapi", - "windows 0.51.1", + "windows 0.58.0", ] [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "gpu-descriptor-types", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", ] [[package]] @@ -1771,13 +1615,13 @@ dependencies = [ "breakpad-sys", "bytemuck", "cc", + "chrono", "core-foundation-sys", "cpp", "cpp_build", "crc32fast", "cstr", - "directories", - "fastrand 2.0.1", + "fastrand", "ffmpeg-next", "filetime_creation", "flate2", @@ -1785,8 +1629,8 @@ dependencies = [ "gyroflow-core", "human-sort", "indicatif", - "itertools 0.12.0", - "jni 0.21.1", + "itertools 0.13.0", + "jni", "keep-awake", "lazy_static", "log", @@ -1794,10 +1638,10 @@ dependencies = [ "lru", "metal", "mp4-merge", - "nalgebra 0.32.3", - "ndk 0.8.0", + "nalgebra 0.32.6", + "ndk 0.9.0", "ndk-context", - "ndk-sys 0.5.0+25.2.9519653", + "ndk-sys 0.6.0+11769913", "oslog", "parking_lot", "pollster", @@ -1814,11 +1658,13 @@ dependencies = [ "simplelog", "system_shutdown", "tar", + "test-case", + "trash", "ureq", "url", "walkdir", "whoami", - "windows 0.52.0", + "windows 0.58.0", "winres", ] @@ -1828,13 +1674,16 @@ version = "1.5.4" dependencies = [ "ahrs", "akaze", + "app_dirs2", + "argmin", + "argmin-math", "arrsac", "ash", "base91", "bincode", "biquad", "bitarray", - "bitflags 2.4.1", + "bitflags 2.6.0", "bytemuck", "byteorder", "ciborium", @@ -1842,33 +1691,30 @@ dependencies = [ "crc32fast", "cv-core", "cv-pinhole", - "d3d12", "dyn-clone", "eight-point", "enterpolation", "enum_delegate", - "fastrand 2.0.1", + "exr", + "fastrand", "flate2", "futures-intrusive", - "half 2.3.1", + "half", "image", - "include_dir", - "itertools 0.12.0", - "jni 0.21.1", + "itertools 0.13.0", + "jni", "lazy_static", "libc", - "libloading 0.8.1", + "libloading", "line_drawing", "log", "lru", "metal", "mimalloc", - "naga", - "nalgebra 0.32.3", - "ndk 0.8.0", + "nalgebra 0.32.6", + "ndk 0.9.0", "ndk-context", - "ndk-sys 0.5.0+25.2.9519653", - "nt-hive", + "ndk-sys 0.6.0+11769913", "num", "objc-foundation", "ocl", @@ -1888,7 +1734,6 @@ dependencies = [ "simple-easing", "space", "stabilize_spirv", - "tar", "telemetry-parser", "thiserror", "time", @@ -1897,24 +1742,14 @@ dependencies = [ "urlencoding", "walkdir", "wgpu", - "wgpu-core", - "wgpu-hal", - "wgpu-types", - "winapi", - "windows 0.52.0", + "windows 0.58.0", ] [[package]] name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "half" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1937,34 +1772,25 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", ] [[package]] -name = "hassle-rs" -version = "0.11.0" +name = "hermit-abi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" -dependencies = [ - "bitflags 2.4.1", - "com", - "libc", - "libloading 0.8.1", - "thiserror", - "widestring", - "winapi", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -1986,16 +1812,16 @@ checksum = "140a09c9305e6d5e557e2ed7cbc68e05765a7d4213975b87cb04920689cc6219" [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.51.1", + "windows-core 0.52.0", ] [[package]] @@ -2019,58 +1845,31 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-rational", - "num-traits 0.2.17", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "include_dir" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" -dependencies = [ - "glob", - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" -dependencies = [ - "proc-macro2", - "quote", + "num-traits 0.2.19", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -2081,9 +1880,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -2094,17 +1893,6 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "itertools" version = "0.10.5" @@ -2116,55 +1904,27 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni" -version = "0.20.0" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -2190,27 +1950,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] - [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2218,17 +1969,17 @@ dependencies = [ [[package]] name = "keep-awake" version = "0.1.0" -source = "git+https://github.com/AdrianEddy/keep-awake-rs.git?rev=1b5eaad#1b5eaadbc1b3e1d6c48397b9d17bb7db75950e05" +source = "git+https://github.com/AdrianEddy/keep-awake-rs.git?rev=04ce779#04ce779150814c1505b75659d883f1fdb28b2abd" dependencies = [ "core-foundation", "dispatch", - "jni 0.21.1", + "jni", "libc", "log", "mach", "ndk-context", "objc", - "windows 0.52.0", + "windows 0.58.0", "zbus", ] @@ -2239,7 +1990,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.1", + "libloading", "pkg-config", ] @@ -2251,9 +2002,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -2280,28 +2031,18 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" - -[[package]] -name = "libloading" -version = "0.7.4" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.6", ] [[package]] @@ -2318,9 +2059,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" -version = "0.1.35" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -2328,11 +2069,11 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "libc", "redox_syscall", ] @@ -2343,26 +2084,26 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d1478a313008a3e6c8149995e90a99ee9094034b5c5c3da1eeb81183cb61d1d" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] -name = "linux-raw-sys" -version = "0.4.12" +name = "litrs" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2370,9 +2111,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "log-panics" @@ -2386,11 +2127,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.1" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -2422,9 +2163,9 @@ dependencies = [ [[package]] name = "matrixmultiply" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ "autocfg", "rawpointer", @@ -2432,44 +2173,26 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types", @@ -2480,9 +2203,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.39" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -2495,50 +2218,59 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", - "simd-adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", ] [[package]] name = "mp4-merge" -version = "0.1.6" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c86d5d99a15116fce87baea15314b7d455a3c9689382f6bb36092c11c0a4db7" +checksum = "d7864f64a27881e7c07c39b17477af1f1bbed717fb99166bc626b03d22c2e8f4" dependencies = [ "byteorder", + "filetime_creation", "log", ] [[package]] name = "mp4parse" version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63a35203d3c6ce92d5251c77520acb2e57108c88728695aa883f70023624c570" +source = "git+https://github.com/AdrianEddy/mp4parse-rust.git#2f1b4a5a0c86155a7c4d1c12ca347cd33a5b2b24" dependencies = [ "bitreader", "byteorder", "fallible_collections", "log", - "num-traits 0.2.17", + "num-traits 0.2.19", "static_assertions", ] [[package]] name = "naga" -version = "0.14.2" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=ee35b0e#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ + "arrayvec", "bit-set", - "bitflags 2.4.1", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits 0.2.17", "petgraph", "rustc-hash", "spirv", @@ -2557,23 +2289,23 @@ dependencies = [ "matrixmultiply", "num-complex", "num-rational", - "num-traits 0.2.17", + "num-traits 0.2.19", "simba 0.7.3", "typenum", ] [[package]] name = "nalgebra" -version = "0.32.3" +version = "0.32.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" +checksum = "7b5c17de023a86f59ed79891b2e5d5a94c705dbe904a5b5c9c952ea6221b03e4" dependencies = [ "approx", "matrixmultiply", "nalgebra-macros", "num-complex", "num-rational", - "num-traits 0.2.17", + "num-traits 0.2.19", "serde", "simba 0.8.1", "typenum", @@ -2581,22 +2313,13 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" +checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", + "syn 2.0.77", ] [[package]] @@ -2608,36 +2331,36 @@ dependencies = [ "matrixmultiply", "num-complex", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", "rawpointer", ] [[package]] name = "ndk" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "jni-sys", - "ndk-sys 0.4.1+23.1.7779620", - "num_enum 0.5.11", - "raw-window-handle 0.5.2", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum", "thiserror", ] [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "jni-sys", "log", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.1", - "raw-window-handle 0.6.0", + "ndk-sys 0.6.0+11769913", + "num_enum", + "raw-window-handle", "thiserror", ] @@ -2647,15 +2370,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-sys" -version = "0.4.1+23.1.7779620" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" -dependencies = [ - "jni-sys", -] - [[package]] name = "ndk-sys" version = "0.5.0+25.2.9519653" @@ -2666,26 +2380,25 @@ dependencies = [ ] [[package]] -name = "nix" -version = "0.24.3" +name = "ndk-sys" +version = "0.6.0+11769913" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", + "jni-sys", ] [[package]] name = "nix" -version = "0.26.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases 0.2.1", "libc", - "memoffset 0.7.1", + "memoffset", ] [[package]] @@ -2713,97 +2426,86 @@ dependencies = [ "ndarray", ] -[[package]] -name = "nt-hive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d397d4a4328ae4ae705968cb21215adef115062e8f9513e7116355159f6dd9ca" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "displaydoc", - "enumn", - "memoffset 0.6.5", - "zerocopy 0.6.6", -] - [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", "num-integer", "num-iter", "num-rational", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", "serde", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -2812,14 +2514,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm 0.2.8", @@ -2831,57 +2533,36 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" -dependencies = [ - "num_enum_derive 0.7.1", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 2.0.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] @@ -2899,7 +2580,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] @@ -2914,12 +2594,37 @@ dependencies = [ ] [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ - "cc", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", ] [[package]] @@ -2933,45 +2638,45 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] [[package]] name = "oboe" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ - "jni 0.20.0", - "ndk 0.7.0", + "jni", + "ndk 0.8.0", "ndk-context", "num-derive", - "num-traits 0.2.17", + "num-traits 0.2.19", "oboe-sys", ] [[package]] name = "oboe-sys" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" dependencies = [ "cc", ] [[package]] name = "ocl" -version = "0.19.6" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c3ce118fd2f00eeb3c01f8073db1ee127cac0b2f79848192c7889b2bd7fe40" +checksum = "4297afb442d411793e4e24ee5a2977d15b6c95c743418f1c0ce0a2397d7ec8a3" dependencies = [ "futures", "nodrop", - "num-traits 0.2.17", + "num-traits 0.2.19", "ocl-core", "qutex", "thiserror", @@ -2987,7 +2692,7 @@ dependencies = [ "cl-sys", "enum_primitive", "num-complex", - "num-traits 0.2.17", + "num-traits 0.2.19", "ocl-core-vector", "rustc_version", "thiserror", @@ -2999,7 +2704,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f562279e046ca160aeed5eaf6f7c4eb9fa56cb8fd9d038dbdbf56225caeb8074" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -3030,28 +2735,29 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opencv" -version = "0.88.5" +version = "0.92.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "980aa24534b9bcfb03c259779ffcbe422e0395cf45700d6d85657734ea1d5c57" +checksum = "c01f7646f18911737aa3d721dec4a0060d044ef1224eb54a439ae6fa716ccb86" dependencies = [ "cc", "dunce", "jobserver", "libc", - "num-traits 0.2.17", + "num-traits 0.2.19", "once_cell", "opencv-binding-generator", "pkg-config", "semver", "shlex", "vcpkg", + "windows 0.58.0", ] [[package]] name = "opencv-binding-generator" -version = "0.82.0" +version = "0.90.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ac010a66cd1e1dc457c20d467a16286cc83381307cace05357b414c06740f6" +checksum = "c238fe1b9e78bf939dfab14184464a25acaf42d634fd502dc9ccc445f5bad1b9" dependencies = [ "clang", "clang-sys", @@ -3061,12 +2767,6 @@ dependencies = [ "regex", ] -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - [[package]] name = "ordered-stream" version = "0.2.0" @@ -3096,9 +2796,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3106,28 +2806,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -3137,39 +2831,19 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap", ] -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] - [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -3179,62 +2853,34 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" - -[[package]] -name = "png" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "polling" -version = "3.3.1" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.28", + "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3245,9 +2891,9 @@ checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "powerfmt" @@ -3257,9 +2903,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "presser" @@ -3275,9 +2924,9 @@ checksum = "bbc83ee4a840062f368f9096d80077a9841ec117e17e7f700df81958f1451254" [[package]] name = "primal" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b53cc99c892c461727618e8a63806c94b09ae13c494dc5fc70a7557b3a2f071" +checksum = "b1e5f354948532e6017fc91f9a5ff5ba1be0dabd3a0c9e9c417969cd4c1ad6e8" dependencies = [ "primal-check", "primal-estimate", @@ -3286,33 +2935,33 @@ dependencies = [ [[package]] name = "primal-bit" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce4fe11b2a87850ca3bd5dc9c7cb9f66e32a09edab221be406ac5ff677f2241" +checksum = "252429dbb8aeacc3233df500dc3a6a367bf28eb3a711272884d7540a7b636055" dependencies = [ "hamming", ] [[package]] name = "primal-check" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0" +checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08" dependencies = [ "num-integer", ] [[package]] name = "primal-estimate" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7374f14c76f23e1271e6be806981ac5dd9e52b59132b0a2f10bcc412495f9159" +checksum = "a432100a0b3a61085e75b5f89e9f42de73c0acb7dea5038b893697918105d822" [[package]] name = "primal-sieve" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2a14766f8c543620824b5b2cec356abf2681b76966a7ac4b4ed2c0011e696a" +checksum = "8e982796d82203351983d3602a8d6372d1d7894e86960047ba0d4b7426a5edd3" dependencies = [ "primal-bit", "primal-estimate", @@ -3321,44 +2970,33 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.71" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "profiling" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135ede8821cf6376eb7a64148901e1690b788c11ae94dc297ae917dbc91dc0e" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" [[package]] name = "prost" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995" dependencies = [ "bytes", "prost-derive", @@ -3366,21 +3004,21 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] name = "qmetaobject" version = "0.2.10" -source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=59029b9#59029b9ac71a56db5cbb99c1d0f666e648fd9656" +source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=ee6f5dc#ee6f5dccbba5454a9c48f1cf68cae9553ddc1d2a" dependencies = [ "cpp", "cpp_build", @@ -3394,7 +3032,7 @@ dependencies = [ [[package]] name = "qmetaobject_impl" version = "0.2.10" -source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=59029b9#59029b9ac71a56db5cbb99c1d0f666e648fd9656" +source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=ee6f5dc#ee6f5dccbba5454a9c48f1cf68cae9553ddc1d2a" dependencies = [ "proc-macro2", "quote", @@ -3404,7 +3042,7 @@ dependencies = [ [[package]] name = "qml-video-rs" version = "0.1.0" -source = "git+https://github.com/AdrianEddy/qml-video-rs.git?rev=63f35bf#63f35bfe96ba846e45c2bbf985e396bf634b29da" +source = "git+https://github.com/AdrianEddy/qml-video-rs.git?rev=2a3bd8b#2a3bd8ba9bb10dd5605492f9d9cf6cb75d059ae4" dependencies = [ "cpp", "cpp_build", @@ -3414,19 +3052,10 @@ dependencies = [ "ureq", ] -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - [[package]] name = "qttypes" version = "0.2.11" -source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=59029b9#59029b9ac71a56db5cbb99c1d0f666e648fd9656" +source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=ee6f5dc#ee6f5dccbba5454a9c48f1cf68cae9553ddc1d2a" dependencies = [ "cpp", "cpp_build", @@ -3435,18 +3064,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "qutex" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda4a51ba3d773c196f9450a6b239077ad8dda608b15263b4c9f29e58909883f" +checksum = "11778238e7d8b0e3ca62033fdc69e01ef5cdb08809cdc2398b2ce5ec873a1757" dependencies = [ "crossbeam", "futures", @@ -3499,15 +3128,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "raw-window-handle" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rawpointer" @@ -3517,9 +3140,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3527,9 +3150,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -3537,29 +3160,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "getrandom", - "libredox", - "thiserror", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -3569,9 +3181,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -3580,50 +3192,52 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "renderdoc-sys" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "ring" -version = "0.17.3" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rodio" -version = "0.17.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" +checksum = "6006a627c1a38d37f3d3a85c6575418cfe34a5392d60a686d0071e1c8d427acb" dependencies = [ "cpal", "lewton", + "thiserror", ] [[package]] name = "rs-sync" version = "0.1.0" -source = "git+https://github.com/gyroflow/rs-sync.git?rev=c73bf47#c73bf478e2f6442e5935bd6314d0cfc56239f7b5" +source = "git+https://github.com/gyroflow/rs-sync.git?rev=0d22978#0d22978140ad8783dc723a128745ae42729d2a23" dependencies = [ "argmin", "argmin-math", "libm 0.2.8", "log", - "nalgebra 0.32.3", + "nalgebra 0.32.6", "rand", "rayon", "superslice", @@ -3631,9 +3245,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3643,22 +3257,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustfft" -version = "6.1.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" +checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" dependencies = [ "num-complex", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", "primal-check", "strength_reduce", "transpose", @@ -3667,64 +3281,60 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "errno", - "io-lifetimes", "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "log", + "once_cell", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safe_arch" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" +checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a" dependencies = [ "bytemuck", ] @@ -3750,70 +3360,61 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] name = "serde_yaml" -version = "0.9.29" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ "indexmap", "itoa", @@ -3835,15 +3436,15 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3856,7 +3457,7 @@ checksum = "2f3fd720c48c53cace224ae62bef1bbff363a70c68c4802a78b5cc6159618176" dependencies = [ "approx", "num-complex", - "num-traits 0.2.17", + "num-traits 0.2.19", "paste", "wide", ] @@ -3870,7 +3471,7 @@ dependencies = [ "approx", "libm 0.2.8", "num-complex", - "num-traits 0.2.17", + "num-traits 0.2.19", "paste", "wide", ] @@ -3889,8 +3490,9 @@ checksum = "832ddd7df0d98d6fd93b973c330b7c8e0742d5cb8f1afc7dea89dba4d2531aa1" [[package]] name = "simplelog" -version = "0.12.0" -source = "git+https://github.com/Drakulix/simplelog.rs.git?rev=4ef071d#4ef071dfd008d7729658cd5313e6d877bde272ca" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" dependencies = [ "log", "termcolor", @@ -3917,19 +3519,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "socket2" -version = "0.4.10" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "space" @@ -3938,7 +3530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5ab9701ae895386d13db622abf411989deff7109b13b46b6173bb4ce5c1d123" dependencies = [ "doc-comment", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -3952,32 +3544,29 @@ dependencies = [ [[package]] name = "spirv" -version = "0.2.0+1.5.4" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 1.3.2", - "num-traits 0.2.17", + "bitflags 2.6.0", ] [[package]] name = "spirv-std" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ad6bf0206aea3e6ac6283cb88ef397239cd2d9276b8f71854d60ac2cf94e0b" +version = "0.9.0" +source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=54f6978#54f6978c25b7e168ded04e720b996625b3654ebd" dependencies = [ "bitflags 1.3.2", "glam", - "num-traits 0.2.17", + "num-traits 0.2.19", "spirv-std-macros", "spirv-std-types", ] [[package]] name = "spirv-std-macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2058ef7585e7ef31ee7b00bdfee2e6726649d827c71070a50087598405e8b2cf" +version = "0.9.0" +source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=54f6978#54f6978c25b7e168ded04e720b996625b3654ebd" dependencies = [ "proc-macro2", "quote", @@ -3987,9 +3576,8 @@ dependencies = [ [[package]] name = "spirv-std-types" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cce2183deb9e7ada727867823fb8bbbc8b56e503801a332d155dde613130e1b" +version = "0.9.0" +source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=54f6978#54f6978c25b7e168ded04e720b996625b3654ebd" [[package]] name = "stabilize_spirv" @@ -4010,6 +3598,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "superslice" version = "1.0.0" @@ -4029,9 +3623,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.43" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -4041,17 +3635,17 @@ dependencies = [ [[package]] name = "system_shutdown" version = "4.0.1" -source = "git+https://github.com/risoflora/system_shutdown.git?rev=4d93e5e#4d93e5e8c86ab94a1b7073b09b2b5b83096a35a8" +source = "git+https://github.com/risoflora/system_shutdown.git?rev=48ac516#48ac5169d8a5ddac14d08d020c7cf0e7994e348f" dependencies = [ - "windows 0.52.0", + "windows 0.58.0", "zbus", ] [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -4060,8 +3654,8 @@ dependencies = [ [[package]] name = "telemetry-parser" -version = "0.2.8" -source = "git+https://github.com/AdrianEddy/telemetry-parser.git?rev=8920009#89200095066ce8555a24ca90d1de3663216cc1df" +version = "0.3.0" +source = "git+https://github.com/AdrianEddy/telemetry-parser.git?rev=8ec4bc9#8ec4bc9a28c0518ad393ea3a31e98c5eaede222f" dependencies = [ "argh", "byteorder", @@ -4069,7 +3663,7 @@ dependencies = [ "csv", "fc-blackbox", "human-sort", - "jni 0.21.1", + "jni", "log", "memchr", "mp4parse", @@ -4084,66 +3678,89 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.28", - "windows-sys 0.48.0", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", ] [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] -name = "thiserror" -version = "1.0.51" +name = "test-case" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" dependencies = [ - "thiserror-impl", + "test-case-macros", ] [[package]] -name = "thiserror-impl" -version = "1.0.51" +name = "test-case-core" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" dependencies = [ + "cfg-if", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] -name = "tiff" -version = "0.9.0" +name = "test-case-macros" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", + "proc-macro2", + "quote", + "syn 2.0.77", + "test-case-core", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", ] [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -4159,18 +3776,19 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4192,26 +3810,15 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" - -[[package]] -name = "toml_edit" -version = "0.19.15" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "toml_datetime", @@ -4224,7 +3831,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0c8dab428531e30115d3bfd6e3092b55256a4a7b4f87cb3abe37a000b1f4032" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -4246,7 +3853,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -4260,14 +3867,31 @@ dependencies = [ [[package]] name = "transpose" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" +checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" dependencies = [ "num-integer", "strength_reduce", ] +[[package]] +name = "trash" +version = "5.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33caf2a9be1812a263a4bfce74d2de225fcde12ee7b77001361abd2b34ffdcc4" +dependencies = [ + "chrono", + "libc", + "log", + "objc2", + "objc2-foundation", + "once_cell", + "scopeguard", + "urlencoding", + "windows 0.56.0", +] + [[package]] name = "typenum" version = "1.17.0" @@ -4280,16 +3904,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset", "tempfile", "winapi", ] [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -4299,30 +3923,30 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -4332,25 +3956,25 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.1" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64", "flate2", "log", "once_cell", "rustls", - "rustls-webpki", + "rustls-pki-types", "url", "webpki-roots", ] [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4371,21 +3995,15 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.1.1" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4397,36 +4015,43 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4436,9 +4061,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4446,28 +4071,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4475,29 +4100,27 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "wgpu" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=ee35b0e#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ "arrayvec", - "cfg-if", + "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "naga", "parking_lot", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -4510,58 +4133,61 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=ee35b0e#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.4.1", - "codespan-reporting", + "bitflags 2.6.0", + "bytemuck", + "cfg_aliases 0.1.1", + "document-features", + "indexmap", "log", "naga", + "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=ee35b0e#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.4.1", + "bitflags 2.6.0", "block", + "cfg_aliases 0.1.1", "core-graphics-types", - "d3d12", "glow", "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", "gpu-descriptor", - "hassle-rs", "js-sys", "khronos-egl", "libc", - "libloading 0.8.1", + "libloading", "log", "metal", "naga", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.6.0", + "raw-window-handle", "renderdoc-sys", "rustc-hash", "smallvec", @@ -4569,45 +4195,41 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu-types", - "winapi", + "windows 0.58.0", + "windows-core 0.58.0", ] [[package]] name = "wgpu-types" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=ee35b0e#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "js-sys", "web-sys", ] [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ - "wasm-bindgen", + "redox_syscall", + "wasite", "web-sys", ] [[package]] name = "wide" -version = "0.7.13" +version = "0.7.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" +checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690" dependencies = [ "bytemuck", "safe_arch", ] -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - [[package]] name = "winapi" version = "0.3.9" @@ -4626,11 +4248,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -4641,49 +4263,148 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.46.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ - "windows-targets 0.42.2", + "windows-core 0.54.0", + "windows-targets 0.52.6", ] [[package]] name = "windows" -version = "0.51.1" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", + "windows-core 0.56.0", + "windows-targets 0.52.6", ] [[package]] name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.51.1" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-targets 0.48.5", + "windows-result 0.1.2", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.52.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement 0.56.0", + "windows-interface 0.56.0", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ - "windows-targets 0.52.0", + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", ] [[package]] @@ -4697,20 +4418,20 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -4730,32 +4451,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4766,15 +4473,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4784,15 +4485,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4802,15 +4497,15 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "windows_i686_gnu" -version = "0.52.0" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4820,15 +4515,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4838,15 +4527,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4856,15 +4539,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4874,21 +4551,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.30" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -4904,57 +4575,60 @@ dependencies = [ [[package]] name = "xattr" -version = "1.1.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dae5072fe1f8db8f8d29059189ac175196e410e40ba42d5d4684ae2f750995" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.12", - "rustix 0.38.28", + "linux-raw-sys", + "rustix", ] +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ - "nix 0.26.4", - "winapi", + "libc", + "windows-sys 0.59.0", ] [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" [[package]] name = "zbus" -version = "3.14.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.4", - "once_cell", + "nix", "ordered-stream", "rand", "serde", @@ -4963,7 +4637,7 @@ dependencies = [ "static_assertions", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -4972,23 +4646,22 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.77", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -4997,44 +4670,30 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.6.6" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive 0.6.6", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive 0.7.32", + "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.6.6" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] -name = "zerocopy-derive" -version = "0.7.32" +name = "zeroize" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zune-inflate" @@ -5047,13 +4706,12 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "zvariant_derive", @@ -5061,24 +4719,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] diff --git a/pkgs/applications/video/gyroflow/default.nix b/pkgs/applications/video/gyroflow/default.nix index bb7df1dfa01de..5d3673c2b23d8 100644 --- a/pkgs/applications/video/gyroflow/default.nix +++ b/pkgs/applications/video/gyroflow/default.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage rec { pname = "gyroflow"; - version = "1.5.4-2023-12-25"; + version = "1.5.4-2024-09-05"; src = fetchFromGitHub { owner = "gyroflow"; repo = "gyroflow"; - rev = "e0869ffe648cb3fd88d81c807b1f7fa2e18d7430"; - hash = "sha256-KB/uoQR43im/m5uJhheAPCqUH9oIx85JaIUwW9rhAAw="; + rev = "52038dedad0bd14d6af68db36a09da0243ad5455"; + hash = "sha256-EuhUF2b8YWv2eN2pcoHA0SlnyeQ8gJ5eHbXi6G4GIzk="; }; cargoLock = { @@ -19,17 +19,20 @@ rustPlatform.buildRustPackage rec { outputHashes = { "ahrs-0.6.0" = "sha256-CxWyX8t+BjqIyNj1p1LdkCmNrtJkudmKgZPv0MVcghY="; "akaze-0.7.0" = "sha256-KkGXKoVRZZ7HUTtWYBerrN36a7RqsHjYQb+bwG1JagY="; - "d3d12-0.7.0" = "sha256-FqAVwW2jtDE1BV31OfrCJljGhj5iD0OfN2fANQ1wasc="; - "fc-blackbox-0.2.0" = "sha256-gL8m9DpHJPVD8vvrmuYv+biJT4PA5LmtohJwFVO+khU="; - "glow-0.13.0" = "sha256-vhPWzsm7NZx9JiRZcVoUslTGySQbASRh/wNlo1nK5jg="; - "keep-awake-0.1.0" = "sha256-EoXhK4/Aij70f73+5NBUoCXqZISG1+n2eVavNqe8mq4="; + "app_dirs2-2.5.5" = "sha256-nQ5Cs9r1k/3zjqXJ18Oilk8ErLKim7bGwCXDlQW4GRQ="; + "fc-blackbox-0.2.0" = "sha256-82DuI0KuHhDVhCMUsnDqk6Fk774VpvoJ1qYFLO+n1X4="; + "ffmpeg-next-7.0.4" = "sha256-F1N70tSxdC36uS9Bh7X2S9Wspd7bcCbGPmoMRs1cm8Y="; + "ffmpeg-sys-next-7.0.2" = "sha256-7C46WJseKIhqXW0cQGaF8Q/xQi7sX+e8fKVrhBMVwZE="; + "keep-awake-0.1.0" = "sha256-iZuntDkAhDZBojRgNEupAExtqOhiw4mf6XK0N6ff2Oc="; + "mp4parse-0.17.0" = "sha256-DktX6zmQsHBlo7uLgLXcXWxKq9uisnX0R16lftWRLZY="; + "naga-22.0.0" = "sha256-+ngomv0VyWKNDkSGVI/f5wtDyLs79qiXxtj3qNOsbFc="; "nshare-0.9.0" = "sha256-PAV41mMLDmhkAz4+qyf+MZnYTAdMwjk83+f+RdaJji8="; - "qmetaobject-0.2.10" = "sha256-ldmpbOYoCOaAoipfcCSwuV+fzF9gg1PTbRz2Jm4zJvA="; - "qml-video-rs-0.1.0" = "sha256-rwdci0QhGYOnCf04u61xuon06p8Zm2wKCNrW/qti9+U="; - "rs-sync-0.1.0" = "sha256-sfym7zv5SUitopqNJ6uFP6AMzAGf4Y7U0dzXAKlvuGA="; - "simplelog-0.12.0" = "sha256-NvmtLbzahSw1WMS3LY+jWiX4SxfSRwidTMvICGcmDO4="; - "system_shutdown-4.0.1" = "sha256-arJWmEjDdaig/oAfwSolVmk9s1UovrQ5LNUgTpUvoOQ="; - "telemetry-parser-0.2.8" = "sha256-Nr4SWEERKEAiZppqzjn1LIuMiZ2BTQEOKOlSnLVAXAg="; + "qmetaobject-0.2.10" = "sha256-kEwFjDe1tYTLQ8XdjrPyYEYnjVFyYeaWUPCj5D8mg7A="; + "qml-video-rs-0.1.0" = "sha256-8RYB+numVy7u29EYtSSdf/+cTsUMVjrcw4u5mqB7KbE="; + "rs-sync-0.1.0" = "sha256-6xQb0CUlBDx7S7zsqNL9zfZZtkmw0cbUUXd6pOYIrXI="; + "spirv-std-0.9.0" = "sha256-uZn1p2pM5UYQKlY9u16aafPH7dfQcSG7PaFDd1sT4Qc="; + "system_shutdown-4.0.1" = "sha256-YypNnZzTxkmUgIxaP4jOpFBje/fEzI5L1g+3pJgMd0w="; + "telemetry-parser-0.3.0" = "sha256-U26cWC7pSw4NFiu43BZf+KlLy9NU61iRpFx3Btse1aY="; }; }; diff --git a/pkgs/applications/video/gyroflow/lens-profiles.nix b/pkgs/applications/video/gyroflow/lens-profiles.nix index 850b6ca72f87a..b7d1de7fc9dc8 100644 --- a/pkgs/applications/video/gyroflow/lens-profiles.nix +++ b/pkgs/applications/video/gyroflow/lens-profiles.nix @@ -2,12 +2,12 @@ fetchFromGitHub { pname = "gyroflow-lens-profiles"; - version = "2023-12-01"; + version = "2024-09-08"; owner = "gyroflow"; repo = "lens_profiles"; - rev = "3e72169ae6b8601260497d7216d5fcbbc8b67194"; - hash = "sha256-18KtunSxTsJhBge+uOGBcNZRG3W26M/Osyxllu+N0UI="; + rev = "a100b233a1df242d5bf1be06df2888a5852febf3"; + hash = "sha256-z994k2lozakaKNKcdrJKzTiMGeL9oJ70jFnEYgbutq4="; meta = with lib; { description = "Lens profile database for Gyroflow"; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix deleted file mode 100644 index 610f5af8046e4..0000000000000 --- a/pkgs/applications/video/handbrake/default.nix +++ /dev/null @@ -1,334 +0,0 @@ -# Upstream distributes HandBrake with bundle of according versions of libraries -# and patches to them. This derivation patches HandBrake to use Nix closure -# dependencies. -# -# NOTE: 2019-07-19: This derivation does not currently support the native macOS -# GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would -# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that -# requires invoking the Xcode build system, which is non-trivial for now. - -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch - # For tests -, testers -, runCommand -, fetchurl - # Main build tools -, pkg-config -, autoconf -, automake -, libtool -, m4 -, xz -, python3 -, numactl -, writeText - # Processing, video codecs, containers -, ffmpeg_7-full -, nv-codec-headers -, libogg -, x264 -, x265 -, libvpx -, libtheora -, dav1d -, zimg -, svt-av1 - # Codecs, audio -, libopus -, lame -, libvorbis -, a52dec -, speex -, libsamplerate - # Text processing -, libiconv -, fribidi -, fontconfig -, freetype -, libass -, jansson -, libxml2 -, harfbuzz -, libjpeg_turbo - # Optical media -, libdvdread -, libdvdnav -, libdvdcss -, libbluray - # Darwin-specific -, AudioToolbox -, Foundation -, libobjc -, VideoToolbox - # GTK - # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus, - # which in turn depends on systemd. systemd is not supported on Darwin, so - # for now we disable GTK GUI support on Darwin. (It may be possible to remove - # this restriction later.) -, useGtk ? !stdenv.isDarwin -, appstream -, desktop-file-utils -, meson -, ninja -, wrapGAppsHook4 -, intltool -, glib -, gtk4 -, libappindicator-gtk3 -, libnotify -, gst_all_1 -, dbus-glib -, udev -, libgudev -, hicolor-icon-theme - # FDK -, useFdk ? false -, fdk_aac -}: - -let - version = "1.8.1"; - - src = fetchFromGitHub { - owner = "HandBrake"; - repo = "HandBrake"; - # uses version commit for logic in version.txt - rev = "e9ff2bdf1ac670eb9c6d6170e27c999c05535127"; - hash = "sha256-grbT+oRIyLnyJowhdqw7qGRg11HzWGIU9yTwUQhCWtg="; - }; - - # Handbrake maintains a set of ffmpeg patches. In particular, these - # patches are required for subtitle timing to work correctly. See: - # 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.0.1"; - ffmpeg-hb = (ffmpeg_7-full.override { - version = ffmpeg-version; - hash = "sha256-HiCT6bvLx4zmJ6ffutoimdz5ENQ55CRF64WBT3HeXMA="; - }).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-dvdsubdec-fix-processing-of-partial-packets.patch" - "${src}/contrib/ffmpeg/A06-dvdsubdec-return-number-of-bytes-used.patch" - "${src}/contrib/ffmpeg/A07-dvdsubdec-use-pts-of-initial-packet.patch" - "${src}/contrib/ffmpeg/A08-dvdsubdec-do-not-discard-zero-sized-rects.patch" - "${src}/contrib/ffmpeg/A09-ccaption_dec-fix-pts-in-real_time-mode.patch" - "${src}/contrib/ffmpeg/A10-matroskaenc-aac-extradata-updated.patch" - "${src}/contrib/ffmpeg/A11-videotoolbox-disable-H.264-10-bit-on-Intel-macOS.patch" - - # patch to fix <https://github.com/HandBrake/HandBrake/issues/5011> - # commented out because it causes ffmpeg's filter-pixdesc-p010le test to fail. - # "${src}/contrib/ffmpeg/A12-libswscale-fix-yuv420p-to-p01xle-color-conversion-bu.patch" - - "${src}/contrib/ffmpeg/A13-qsv-fix-decode-10bit-hdr.patch" - "${src}/contrib/ffmpeg/A14-amfenc-Add-support-for-pict_type-field.patch" - "${src}/contrib/ffmpeg/A15-amfenc-Fixes-the-color-information-in-the-ou.patch" - "${src}/contrib/ffmpeg/A16-amfenc-HDR-metadata.patch" - "${src}/contrib/ffmpeg/A17-av1dec-dovi-rpu.patch" - "${src}/contrib/ffmpeg/A18-avformat-mov-add-support-audio-fallback-track-ref.patch" - "${src}/contrib/ffmpeg/A19-fix-qsv-on-gcc-14.patch" - ]; - }); - - x265-hb = x265.overrideAttrs (old: { - # 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-threads-priority.patch - patch -p1 < ${src}/contrib/x265/A02-threads-pool-adjustments.patch - patch -p1 < ${src}/contrib/x265/A03-sei-length-crash-fix.patch - patch -p1 < ${src}/contrib/x265/A04-ambient-viewing-enviroment-sei.patch - # patch -p1 < ${src}/contrib/x265/A05-memory-leaks.patch - # patch -p1 < ${src}/contrib/x265/A06-crosscompile-fix.patch - popd - ''; - }); - - versionFile = writeText "version.txt" '' - URL=${src.meta.homepage}.git - HASH=${src.rev} - SHORTHASH=${lib.substring 0 9 src.rev} - TAG=${version} - TAG_HASH=${src.rev} - REV=0 - BRANCH= - REMOTE=${src.meta.homepage}.git - DATE=1970-01-01 00:00:01 +0000 - ''; - - inherit (lib) optional optionals optionalString versions; - - - self = stdenv.mkDerivation rec { - pname = "handbrake"; - inherit version src; - - postPatch = '' - install -Dm444 ${versionFile} ${versionFile.name} - - patchShebangs scripts - patchShebangs gtk/data/ - - substituteInPlace libhb/hb.c \ - --replace-fail 'return hb_version;' 'return "${version}";' - - # Force using nixpkgs dependencies - sed -i '/MODULES += contrib/d' make/include/main.defs - sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ - -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ - -i make/configure.py - '' + optionalString stdenv.isDarwin '' - # Prevent the configure script from failing if xcodebuild isn't available, - # which it isn't in the Nix context. (The actual build goes fine without - # xcodebuild.) - sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py - '' + optionalString useGtk '' - substituteInPlace gtk/module.rules \ - --replace-fail '$(MESON.exe)' 'meson' \ - --replace-fail '$(NINJA.exe)' 'ninja' \ - # Force using nixpkgs dependencies - substituteInPlace gtk/meson.build \ - --replace-fail \ - "hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')" \ - "hb_incdirs = include_directories(hb_dir / 'libhb')" - substituteInPlace gtk/ghb.spec \ - --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache" - substituteInPlace gtk/data/post_install.py \ - --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache" - ''; - - nativeBuildInputs = [ - autoconf - automake - libtool - m4 - pkg-config - python3 - ] - ++ optionals useGtk [ appstream desktop-file-utils intltool meson ninja wrapGAppsHook4 ]; - - buildInputs = [ - a52dec - dav1d - ffmpeg-hb - fontconfig - freetype - fribidi - harfbuzz - jansson - lame - libass - libbluray - libdvdcss - libdvdnav - libdvdread - libiconv - libjpeg_turbo - libogg - libopus - libsamplerate - libtheora - libvorbis - libvpx - libxml2 - speex - svt-av1 - x264 - x265-hb - xz - zimg - ] - ++ optional (!stdenv.isDarwin) numactl - ++ optionals useGtk [ - dbus-glib - glib - gst_all_1.gst-libav - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gstreamer - gtk4 - hicolor-icon-theme - libappindicator-gtk3 - libgudev - libnotify - udev - ] - ++ optional useFdk fdk_aac - ++ optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] - # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, - # look at ./make/configure.py search "enable_nvenc" - ++ optional stdenv.isLinux nv-codec-headers; - - configureFlags = [ - "--disable-df-fetch" - "--disable-df-verify" - ] - ++ optional (!useGtk) "--disable-gtk" - ++ optional useFdk "--enable-fdk-aac" - ++ optional stdenv.isDarwin "--disable-xcode" - ++ optional stdenv.hostPlatform.isx86 "--harden"; - - # NOTE: 2018-12-27: Check NixOS HandBrake test if changing - NIX_LDFLAGS = [ "-lx265" ]; - - # meson/ninja are used only for the subprojects, not the toplevel - dontUseMesonConfigure = true; - dontUseMesonInstall = true; - dontUseNinjaBuild = true; - dontUseNinjaInstall = true; - - makeFlags = [ "--directory=build" ]; - - passthru = { - # for convenience - inherit ffmpeg-hb x265-hb; - - tests.basic-conversion = - let - # Big Buck Bunny example, licensed under CC Attribution 3.0. - testMkv = fetchurl { - url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true"; - sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9"; - }; - in - runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } '' - mkdir -p $out - cd $out - HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160 - test -e test.mp4 - HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160 - test -e test.mkv - ''; - - tests.version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; - }; - - meta = with lib; { - homepage = "https://handbrake.fr/"; - description = "Tool for converting video files and ripping DVDs"; - longDescription = '' - Tool for converting and remuxing video files - into selection of modern and widely supported codecs - and containers. Very versatile and customizable. - Package provides: - CLI - `HandbrakeCLI` - GTK GUI - `ghb` - ''; - license = licenses.gpl2Only; - maintainers = with maintainers; [ Anton-Latukha wmertens ]; - platforms = with platforms; unix; - broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/297984#issuecomment-2016503434 - }; - }; -in -self diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix index 00c2467624b80..837e5071f440e 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub , cmake, wrapQtAppsHook, perl , flatbuffers, protobuf, mbedtls -, hidapi, libcec, libusb1 +, alsa-lib, hidapi, libcec, libusb1 , libX11, libxcb, libXrandr, python3 , qtbase, qtserialport, qtsvg, qtx11extras , withRPiDispmanx ? false, libraspberrypi @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hyperion.ng"; - version = "2.0.14"; + version = "2.0.16"; src = fetchFromGitHub { owner = "hyperion-project"; repo = pname; rev = version; - hash = "sha256-Y1PZ+YyPMZEX4fBpMG6IVT1gtXR9ZHlavJMCQ4KAenc="; + hash = "sha256-nQPtJw9DOKMPGI5trxZxpP+z2PYsbRKqOQEyaGzvmmA="; # needed for `dependencies/external/`: # * rpi_ws281x` - not possible to use as a "system" lib # * qmdnsengine - not in nixpkgs yet @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ + alsa-lib hidapi libusb1 libX11 @@ -36,12 +37,12 @@ stdenv.mkDerivation rec { qtserialport qtsvg qtx11extras - ] ++ lib.optional stdenv.isLinux libcec + ] ++ lib.optional stdenv.hostPlatform.isLinux libcec ++ lib.optional withRPiDispmanx libraspberrypi; nativeBuildInputs = [ cmake wrapQtAppsHook - ] ++ lib.optional stdenv.isDarwin perl; # for macos bundle + ] ++ lib.optional stdenv.hostPlatform.isDarwin perl; # for macos bundle patchPhase = '' patchShebangs test/testrunner.sh diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index fef1a9ae80f08..013b6bdf36316 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -21,7 +21,7 @@ , qtwebchannel , qtwebengine , qtx11extras -, withDbus ? stdenv.isLinux +, withDbus ? stdenv.hostPlatform.isLinux }: mkDerivation rec { @@ -51,9 +51,9 @@ mkDerivation rec { qtwebchannel qtwebengine qtx11extras - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreAudio CoreFoundation @@ -74,7 +74,7 @@ mkDerivation rec { "-DLINUX_X11POWER=ON" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin $out/Applications mv "$out/Jellyfin Media Player.app" $out/Applications diff --git a/pkgs/applications/video/kodi/addons/iagl/default.nix b/pkgs/applications/video/kodi/addons/iagl/default.nix index 1665a613bc084..90698a10cf9f6 100644 --- a/pkgs/applications/video/kodi/addons/iagl/default.nix +++ b/pkgs/applications/video/kodi/addons/iagl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchFromGitHub, dateutil, requests, routing, vfs-libarchive, archive_tool, youtube }: +{ lib, buildKodiAddon, fetchFromGitHub, dateutil, requests, routing, vfs-libarchive, archive_tool, youtube, infotagger }: buildKodiAddon rec { pname = "iagl"; @@ -19,6 +19,7 @@ buildKodiAddon rec { vfs-libarchive archive_tool youtube + infotagger ]; meta = with lib; { diff --git a/pkgs/applications/video/kodi/addons/radioparadise/default.nix b/pkgs/applications/video/kodi/addons/radioparadise/default.nix index 45e0e845acb74..9d18cfb6a60a8 100644 --- a/pkgs/applications/video/kodi/addons/radioparadise/default.nix +++ b/pkgs/applications/video/kodi/addons/radioparadise/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "radioparadise"; namespace = "script.radioparadise"; - version = "2.0.0"; + version = "2.0.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/script.radioparadise/script.radioparadise-${version}.zip"; - sha256 = "sha256-eRCP0XMQHmyDrZ8Y6RGFfxQ1r26/bWbE/PJz4PET7D8="; + sha256 = "sha256-osQoOFr1vyTgZdlq1gNmhhDY37e+4SFqN3uX3yT8NQE="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 8c007ec4b83ef..faa623f37e298 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.9.2"; + version = "7.1.0"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-42BBvXIrPAAhNgrGyPTK5dgg2DACPTT6/jRUoYcihFA="; + hash = "sha256-I3dSGcPQVVhn4RO8CHtn3FG2dheSv4XiDO7w+MtTjRU="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index b6aa8009dcd0a..c72568d3805d4 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -22,6 +22,8 @@ in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + profile = '' export LC_ALL=C.UTF-8 ''; @@ -38,7 +40,6 @@ appimageTools.wrapType2 { cp ${extracted}/losslesscut.desktop $out/share/applications substituteInPlace $out/share/applications/losslesscut.desktop \ --replace AppRun losslesscut - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/losslesscut" \ --add-flags "--disable-seccomp-filter-sandbox" ''; diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 6b9c8ef2fd14f..32b533346dfdb 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdvdread ]; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Command line tool to make a copy from a video DVD for private use"; homepage = "https://sourceforge.net/projects/lxdvdrip"; license = lib.licenses.gpl2; diff --git a/pkgs/applications/video/mirakurun/default.nix b/pkgs/applications/video/mirakurun/default.nix index 3d8034521c89a..a1d9d58403d07 100644 --- a/pkgs/applications/video/mirakurun/default.nix +++ b/pkgs/applications/video/mirakurun/default.nix @@ -41,7 +41,7 @@ buildNpmPackage rec { bash nodejs which - ] ++ lib.optionals stdenv.isLinux [ v4l-utils ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ v4l-utils ]; crc32Patch = substituteAll { src = ./fix-musl-detection.patch; isMusl = if stdenv.hostPlatform.isMusl then "true" else "false"; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 79b16f06c6f1a..7d4ced909df61 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "86.0"; + version = "87.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - hash = "sha256-h9rVs4A7JihnCj15XUus9xMvShKWyYhJN/90v/fl0PE="; + hash = "sha256-UU57ZgH1sxCXspwfKXScw08aJYiv+k526U8q8N1tA+4="; }; nativeBuildInputs = [ @@ -91,8 +91,8 @@ stdenv.mkDerivation rec { zlib ] ++ optionals withGUI [ cmark ] - ++ optionals stdenv.isLinux [ qtwayland ] - ++ optionals stdenv.isDarwin [ libiconv ]; + ++ optionals stdenv.hostPlatform.isLinux [ qtwayland ] + ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # autoupdate is not needed but it silences a ton of pointless warnings postPatch = '' diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix index e3f61cdd82018..da9f4d5807e10 100644 --- a/pkgs/applications/video/mlv-app/default.nix +++ b/pkgs/applications/video/mlv-app/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU="; }; - patches = if stdenv.isAarch64 then ./aarch64-flags.patch else null; + patches = if stdenv.hostPlatform.isAarch64 then ./aarch64-flags.patch else null; installPhase = '' runHook preInstall diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index c3082639cae7e..5e02d58977ceb 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ puffnfresh veprbl ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "motion"; }; } diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index c9219fdf63596..c3f6981503c8f 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://mpc-qt.github.io"; license = licenses.gpl2; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ romildo ]; mainProgram = "mpc-qt"; }; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 1608585de795a..352c7b7edae7a 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -5,11 +5,11 @@ , x11Support ? true, libX11, libXext, libGLU, libGL , xineramaSupport ? true, libXinerama , xvSupport ? true, libXv -, alsaSupport ? stdenv.isLinux, alsa-lib +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib , screenSaverSupport ? true, libXScrnSaver , vdpauSupport ? false, libvdpau -, cddaSupport ? !stdenv.isDarwin, cdparanoia -, dvdnavSupport ? !stdenv.isDarwin, libdvdnav +, cddaSupport ? !stdenv.hostPlatform.isDarwin, cdparanoia +, dvdnavSupport ? !stdenv.hostPlatform.isDarwin, libdvdnav , dvdreadSupport ? true, libdvdread , bluraySupport ? true, libbluray , amrSupport ? false, amrnb, amrwb @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ++ lib.optional libjpegSupport libjpeg ++ lib.optional bs2bSupport libbs2b ++ lib.optional v4lSupport libv4l - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.OpenGL ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.OpenGL ] ; configurePlatforms = [ ]; @@ -147,8 +147,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional (useUnfreeCodecs && codecs != null && !crossBuild) "--codecsdir=${codecs}" ++ lib.optional (stdenv.hostPlatform.isx86 && !crossBuild) "--enable-runtime-cpudetection" ++ lib.optional fribidiSupport "--enable-fribidi" - ++ lib.optional (stdenv.isLinux && !stdenv.isAarch64) "--enable-vidix" - ++ lib.optional stdenv.isLinux "--enable-fbdev" + ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) "--enable-vidix" + ++ lib.optional stdenv.hostPlatform.isLinux "--enable-fbdev" ++ lib.optionals (crossBuild) [ "--enable-cross-compile" "--disable-vidix-pcidb" diff --git a/pkgs/applications/video/mpv/0001-fix-darwin-build.patch b/pkgs/applications/video/mpv/0001-fix-darwin-build.patch index c7e486a3c5d14..2b6085ed3c9f0 100644 --- a/pkgs/applications/video/mpv/0001-fix-darwin-build.patch +++ b/pkgs/applications/video/mpv/0001-fix-darwin-build.patch @@ -1,3 +1,5 @@ +diff --git a/osdep/mac/input_helper.swift b/osdep/mac/input_helper.swift +index 0acec6bd40..0ec5837864 100644 --- a/osdep/mac/input_helper.swift +++ b/osdep/mac/input_helper.swift @@ -18,6 +18,14 @@ @@ -15,15 +17,3 @@ class InputHelper: NSObject { var option: OptionHelper? var lock = NSCondition() ---- a/audio/out/ao_avfoundation.m -+++ b/audio/out/ao_avfoundation.m -@@ -312,7 +312,8 @@ - -+ #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120000 - p->observer = [[AVObserver alloc] initWithAO:ao]; - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; - [center addObserver:p->observer selector:@selector(handleRestartNotification:) name:AVSampleBufferAudioRendererOutputConfigurationDidChangeNotification object:p->renderer]; - [center addObserver:p->observer selector:@selector(handleRestartNotification:) name:AVSampleBufferAudioRendererWasFlushedAutomaticallyNotification object:p->renderer]; -- -+ #endif - return CONTROL_OK; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 5b255be9a1a58..d1f44b09b16d3 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -72,37 +72,37 @@ zimg, # Boolean - alsaSupport ? stdenv.isLinux, + alsaSupport ? stdenv.hostPlatform.isLinux, archiveSupport ? true, bluraySupport ? true, bs2bSupport ? true, cacaSupport ? true, cddaSupport ? false, cmsSupport ? true, - drmSupport ? stdenv.isLinux, - dvbinSupport ? stdenv.isLinux, - dvdnavSupport ? stdenv.isLinux, + drmSupport ? stdenv.hostPlatform.isLinux, + dvbinSupport ? stdenv.hostPlatform.isLinux, + dvdnavSupport ? stdenv.hostPlatform.isLinux, jackaudioSupport ? false, javascriptSupport ? true, libpngSupport ? true, openalSupport ? true, - pipewireSupport ? stdenv.isLinux, - pulseSupport ? config.pulseaudio or stdenv.isLinux, + pipewireSupport ? stdenv.hostPlatform.isLinux, + pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, rubberbandSupport ? true, screenSaverSupport ? true, - sdl2Support ? !stdenv.isDarwin, + sdl2Support ? !stdenv.hostPlatform.isDarwin, sixelSupport ? false, speexSupport ? true, - swiftSupport ? stdenv.isDarwin, + swiftSupport ? stdenv.hostPlatform.isDarwin, theoraSupport ? true, vaapiSupport ? x11Support || waylandSupport, vapoursynthSupport ? false, vdpauSupport ? true, - vulkanSupport ? stdenv.isLinux, - waylandSupport ? stdenv.isLinux, - x11Support ? stdenv.isLinux, - xineramaSupport ? stdenv.isLinux, - xvSupport ? stdenv.isLinux, + vulkanSupport ? stdenv.hostPlatform.isLinux, + waylandSupport ? stdenv.hostPlatform.isLinux, + x11Support ? stdenv.hostPlatform.isLinux, + xineramaSupport ? stdenv.hostPlatform.isLinux, + xvSupport ? stdenv.hostPlatform.isLinux, zimgSupport ? true, }: @@ -124,7 +124,7 @@ let platform // lib.optionalAttrs (platform ? darwinMinVersion) { darwinMinVersion = version; }; stdenv' = - if swiftSupport && stdenv.isDarwin && stdenv.isx86_64 then + if swiftSupport && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then stdenv.override (old: { buildPlatform = overrideSDK old.buildPlatform "11.0"; hostPlatform = overrideSDK old.hostPlatform "11.0"; @@ -135,7 +135,7 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "mpv"; - version = "0.38.0"; + version = "0.39.0"; outputs = [ "out" @@ -148,7 +148,7 @@ stdenv'.mkDerivation (finalAttrs: { owner = "mpv-player"; repo = "mpv"; rev = "v${finalAttrs.version}"; - hash = "sha256-dFajnCpGlNqUv33A8eFEn8kjtzIPkcBY5j0gNVlaiIY="; + hash = "sha256-BOGh+QBTO7hrHohh+RqjSF8eHQH8jVBPjG/k4eyFaaM="; }; patches = [ @@ -194,7 +194,7 @@ stdenv'.mkDerivation (finalAttrs: { (lib.mesonEnable "swift-build" swiftSupport) (lib.mesonEnable "macos-cocoa-cb" swiftSupport) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Toggle explicitly because it fails on darwin (lib.mesonEnable "videotoolbox-pl" vulkanSupport) ]; @@ -209,7 +209,7 @@ stdenv'.mkDerivation (finalAttrs: { ninja pkg-config ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ buildPackages.darwin.sigtool xcbuild.xcrun ] @@ -283,9 +283,9 @@ stdenv'.mkDerivation (finalAttrs: { ++ lib.optionals xineramaSupport [ libXinerama ] ++ lib.optionals xvSupport [ libXv ] ++ lib.optionals zimgSupport [ zimg ] - ++ lib.optionals stdenv.isLinux [ nv-codec-headers-11 ] - ++ lib.optionals stdenv.isDarwin [ libiconv ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ nv-codec-headers-11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreFoundation Cocoa @@ -293,12 +293,12 @@ stdenv'.mkDerivation (finalAttrs: { MediaPlayer VideoToolbox ] - ++ lib.optionals (stdenv.isDarwin && swiftSupport) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && swiftSupport) [ AVFoundation CoreMedia ]; - postBuild = lib.optionalString stdenv.isDarwin '' + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' pushd .. # Must be run from the source dir because it uses relative paths python3 TOOLS/osxbundle.py -s build/mpv popd @@ -313,24 +313,23 @@ stdenv'.mkDerivation (finalAttrs: { pushd ../TOOLS cp mpv_identify.sh umpv $out/bin/ popd + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' pushd $out/share/applications - # patch out smb protocol reference, since our ffmpeg can't handle it - substituteInPlace mpv.desktop --replace-fail "smb," "" - sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \ mpv.desktop > umpv.desktop printf "NoDisplay=true\n" >> umpv.desktop popd '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r mpv.app $out/Applications ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addDriverRunpath. - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' addDriverRunpath $out/bin/mpv patchShebangs --update --host $out/bin/umpv $out/bin/mpv_identify.sh ''; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 12e614d487a70..cfe4d9d150f6a 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -114,6 +114,7 @@ let mpv-discord = callPackage ./mpv-discord.nix { }; mpv-notify-send = callPackage ./mpv-notify-send.nix { }; mpv-osc-modern = callPackage ./mpv-osc-modern.nix { }; + mpv-osc-tethys = callPackage ./mpv-osc-tethys.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; mpv-slicing = callPackage ./mpv-slicing.nix { }; mpv-webm = callPackage ./mpv-webm.nix { }; diff --git a/pkgs/applications/video/mpv/scripts/dynamic-crop.nix b/pkgs/applications/video/mpv/scripts/dynamic-crop.nix index ea39f33ba418b..8f33f5db90663 100644 --- a/pkgs/applications/video/mpv/scripts/dynamic-crop.nix +++ b/pkgs/applications/video/mpv/scripts/dynamic-crop.nix @@ -7,12 +7,12 @@ buildLua { pname = "dynamic-crop"; - version = "0-unstable-2024-06-22"; + version = "0-unstable-2024-09-14"; src = fetchFromGitHub { owner = "Ashyni"; repo = "mpv-scripts"; - rev = "1fadd5ea3e31818db33c9372c40161db6fc1bdd3"; - hash = "sha256-nC0Iw+9PSGxc3OdYhEmFVa49Sw+rIbuFhgZvAphP4cM="; + rev = "d3f5685f5209ae548f8398b21d4dcbbea766d076"; + hash = "sha256-9v8ZsBj9F5Odhfo/iWGA3Ak/+gFrbe0FldrTyCKF6tk="; }; passthru.scriptName = "dynamic-crop.lua"; diff --git a/pkgs/applications/video/mpv/scripts/memo.nix b/pkgs/applications/video/mpv/scripts/memo.nix index 7795d1e7b9927..0b6022e3de3cf 100644 --- a/pkgs/applications/video/mpv/scripts/memo.nix +++ b/pkgs/applications/video/mpv/scripts/memo.nix @@ -7,13 +7,13 @@ buildLua { pname = "memo"; - version = "0-unstable-2024-07-02"; + version = "0-unstable-2024-09-03"; src = fetchFromGitHub { owner = "po5"; repo = "memo"; - rev = "43ad5bc37d4ac63a00dd2a8f15b9028789467da7"; - hash = "sha256-nHJ1x5R4Rw2YjB3Li3ZFbI3ZdLSqddJFzJlni4NjpH0="; + rev = "e0624611438b2e19ef4b7e24f53461c9d0304b07"; + hash = "sha256-6+fI3TdBDfKcozxLcsykavgi17ywqRRhyiMK7PgAzGs="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix index 426d9a3521f2a..4d36bdc4a8923 100644 --- a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix +++ b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernx-zydezu"; - version = "0.3.6.6"; + version = "0.3.7"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "zydezu"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-Jt3Y/4no3dUOopjvbS/dBGU0vw9Lq4o5inb4efuyYBM="; + hash = "sha256-slJYbhjNrzwq5rl83HV0Uy7BUK/bbltWSyH0198kSqw="; }; postInstall = '' diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix index 0a00b04c7192e..fa148c3cde2a0 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -2,7 +2,6 @@ lib, buildLua, fetchFromGitHub, - fetchpatch, unstableGitUpdater, libnotify, }: diff --git a/pkgs/applications/video/mpv/scripts/mpv-osc-tethys.nix b/pkgs/applications/video/mpv/scripts/mpv-osc-tethys.nix new file mode 100644 index 0000000000000..6f0d6bddb4a43 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv-osc-tethys.nix @@ -0,0 +1,26 @@ +{ + lib, + buildLua, + fetchFromGitHub, +}: +buildLua (finalAttrs: { + pname = "mpv-osc-tethys"; + version = "0-unstable-2024-08-19"; + + scriptPath = "osc_tethys.lua"; + extraScripts = [ "mpv_thumbnail_script_server.lua" ]; + + src = fetchFromGitHub { + owner = "Zren"; + repo = "mpv-osc-tethys"; + rev = "c4167f88a0e9944738419e90a71f1f80fba39ccb"; + hash = "sha256-eAY+ZUuOxPJiNCuL7lqMBU4iURCMz12LQdfaYj4WFQc="; + }; + + meta = { + description = "OSC UI replacement for MPV with icons from the bomi video player"; + homepage = "https://github.com/Zren/mpv-osc-tethys"; + license = lib.licenses.unfree; # no license specified + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + }; +}) diff --git a/pkgs/applications/video/mpv/scripts/quality-menu.nix b/pkgs/applications/video/mpv/scripts/quality-menu.nix index 36e5024b6aa8e..ec384c9ad4ed3 100644 --- a/pkgs/applications/video/mpv/scripts/quality-menu.nix +++ b/pkgs/applications/video/mpv/scripts/quality-menu.nix @@ -8,13 +8,13 @@ buildLua rec { pname = "mpv-quality-menu"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "christoph-heinrich"; repo = "mpv-quality-menu"; rev = "v${version}"; - hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns="; + hash = "sha256-W7N8H+kq/bhF917TutyilfT8FBbWmbSFUrHd8a8k5Jg="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index 158e1f38b32b3..249b7b8962010 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -8,13 +8,13 @@ buildLua { pname = "mpv-thumbfast"; - version = "0-unstable-2023-12-08"; + version = "0-unstable-2024-08-02"; src = fetchFromGitHub { owner = "po5"; repo = "thumbfast"; - rev = "03e93feee5a85bf7c65db953ada41b4826e9f905"; - hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c="; + rev = "f1fdf10b17f394f2d42520d0e9bf22feaa20a9f4"; + hash = "sha256-cygLf+0PMH7cVXBcY12PdcxBHmy38DNoXQubKAlerHM="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix index 45b359a42a83d..30bfdcc8cb8e6 100644 --- a/pkgs/applications/video/mpv/scripts/uosc.nix +++ b/pkgs/applications/video/mpv/scripts/uosc.nix @@ -9,14 +9,14 @@ buildLua (finalAttrs: { pname = "uosc"; - version = "5.2.0"; + version = "5.5.0"; scriptPath = "src/uosc"; src = fetchFromGitHub { owner = "tomasklaen"; repo = "uosc"; rev = finalAttrs.version; - hash = "sha256-0GPDna9uOuhFDhA9A1fbkoKkgSB76qiDzJVQ9gjGcWo="; + hash = "sha256-WFsqA5kGefQmvihLUuQBfMmKoUHiO7ofxpwISRygRm4="; }; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/applications/video/mpv/scripts/videoclip.nix b/pkgs/applications/video/mpv/scripts/videoclip.nix index bff265892eb1a..3a2ac5e4e992d 100644 --- a/pkgs/applications/video/mpv/scripts/videoclip.nix +++ b/pkgs/applications/video/mpv/scripts/videoclip.nix @@ -24,7 +24,7 @@ buildLua { substituteInPlace platform.lua \ --replace \'curl\' \'${lib.getExe curl}\' \ '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' --replace xclip ${lib.getExe xclip} \ --replace wl-copy ${lib.getExe' wl-clipboard "wl-copy"} ''; diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index b68f2d50c5c49..8104921aadbdb 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -95,7 +95,7 @@ let makeWrapper "${mpv}/bin/mpv" "$out/bin/mpv" ${mostMakeWrapperArgs} rm "$out/bin/umpv" makeWrapper "${mpv}/bin/umpv" "$out/bin/umpv" ${umpvWrapperArgs} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # wrapProgram can't operate on symlinks rm "$out/Applications/mpv.app/Contents/MacOS/mpv" makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 5ca88c666ee85..e02aa4af610df 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 204f0e1311fab..c7bcdfc4f75d1 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -29,15 +29,15 @@ , wrapGAppsHook3 , scriptingSupport ? true , luajit -, swig4 +, swig , python3 -, alsaSupport ? stdenv.isLinux +, alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio , libcef , pciutils -, pipewireSupport ? stdenv.isLinux +, pipewireSupport ? stdenv.hostPlatform.isLinux , withFdk ? true , pipewire , libdrm @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 wrapQtAppsHook ] - ++ optional scriptingSupport swig4; + ++ optional scriptingSupport swig; buildInputs = [ curl @@ -183,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' addDriverRunpath $out/lib/lib*.so addDriverRunpath $out/lib/obs-plugins/*.so @@ -201,7 +201,7 @@ stdenv.mkDerivation (finalAttrs: { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ eclairevoyant jb55 materus fpletz ]; + maintainers = with maintainers; [ jb55 materus fpletz ]; license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index 9a2069a27133a..aff145b1fc740 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index c4e2dc43d2466..9dc1c4f04835e 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-Vwm0Eyb8MevZtS3PTqnFQAbCj7JuTw9Ju0lS9CZ6rf8="; + sha256 = "sha256-ZmxopTv6YuAZ/GykvMRcP2PQwQk08ObmqZ9kBcR0UH4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix index e7c0d144b41d4..5a29921b932b6 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix @@ -2,25 +2,34 @@ stdenv.mkDerivation rec { pname = "obs-multi-rtmp"; - version = "0.2.8.1-OBS28"; + version = "0.6.0.1"; src = fetchFromGitHub { owner = "sorayuki"; repo = "obs-multi-rtmp"; rev = version; - sha256 = "sha256-1W+c8Y0AmtKQmCIg8IDAaYYStQzDpZRuqw3vZEY5ncU="; + sha256 = "sha256-MRBQY9m6rj8HVdn58mK/Vh07FSm0EglRUaP20P3FFO4="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio qtbase ]; - patches = [ - # Patch cmake file to link against the obs build output, instead of its sources - ./fix-build.patch + cmakeFlags = [ + (lib.cmakeBool "ENABLE_QT" true) + (lib.cmakeBool "ENABLE_FRONTEND_API" true) + (lib.cmakeBool "CMAKE_COMPILE_WARNING_AS_ERROR" false) ]; dontWrapQtApps = true; + # install dirs changed after 0.5.0.3-OBS30 + postInstall = '' + mkdir -p $out/{lib,share/obs/obs-plugins/} + mv $out/dist/obs-multi-rtmp/data $out/share/obs/obs-plugins/obs-multi-rtmp + mv $out/dist/obs-multi-rtmp/bin/64bit $out/lib/obs-plugins + rm -rf $out/dist + ''; + meta = with lib; { homepage = "https://github.com/sorayuki/obs-multi-rtmp/"; changelog = "https://github.com/sorayuki/obs-multi-rtmp/releases/tag/${version}"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch deleted file mode 100644 index dd40fc7e95951..0000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 72aeddb52c2b656bfec918097ad07a0ff092008b Mon Sep 17 00:00:00 2001 -From: Raphael Robatsch <raphael-git@tapesoftware.net> -Date: Thu, 13 Oct 2022 21:34:21 +0200 -Subject: [PATCH] Link against OBS public interface instead of sources - ---- - CMakeLists.txt | 22 ++++------------------ - 1 file changed, 4 insertions(+), 18 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 27e20f8..8725c5b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,15 +65,9 @@ if (WIN32) - "/def:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.def" - "/out:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.lib" - ) --elseif (APPLE) -- # macOS -- find_library(_LIB_OBS "${LIB_OBS}.0.dylib" PATHS ${OBS_BIN_DIR} REQUIRED) -- set(LIB_OBS "${_LIB_OBS}") --elseif (UNIX) -- # Linux -- find_package(LibObs REQUIRED) - else () -- message(FATAL_ERROR "Unsupported OS!") -+ find_package(libobs REQUIRED) -+ find_package(obs-frontend-api REQUIRED) - endif () - - -@@ -96,18 +90,10 @@ if (WIN32) - "${CMAKE_CURRENT_BINARY_DIR}/version.rc" - ) - endif () --target_include_directories(obs-multi-rtmp PRIVATE -- "${OBS_SRC_DIR}/libobs" -- "${OBS_SRC_DIR}/UI/obs-frontend-api" --) --target_link_directories(obs-multi-rtmp PRIVATE -- "${CMAKE_CURRENT_BINARY_DIR}" -- ${OBS_BIN_DIR} --) - target_link_libraries(obs-multi-rtmp PRIVATE - Qt6::Widgets -- ${LIB_OBS} -- obs-frontend-api -+ OBS::libobs -+ OBS::obs-frontend-api - ) - - if (WIN32) --- -2.37.3 diff --git a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix index 8819f4f53779d..8ce601f08ea50 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-text-pthread"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "norihiro"; repo = "obs-text-pthread"; rev = version; - sha256 = "sha256-3Y++zpy5TEp8AtyRw+1fZDEFY9AuN7JpUNqUhM7h04U="; + sha256 = "sha256-zrgxKs3jmrwQJiEgKfZz1BOVToTLauQXtFYcuFlV71o="; }; nativeBuildInputs = [ cmake pkg-config ]; 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 9b7ec4090dd55..59be77c454de8 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "obs-vaapi"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "fzwoch"; repo = pname; rev = version; - hash = "sha256-PpGNLIOz+fCpcP/nvjcJ+1fkduxjcbZjb7yx8TUO25s="; + hash = "sha256-ykiLsHL3hoe0ibxMxp4zrqeSeQfgnJfNg7Yb5i9HDJQ="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index b66d3d01b234a..f7e21b796c54c 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RIDsT6eL6bUfqPiyPlecnZHu5OorcJb3Xal8pjdOpAA="; }; - cmakeFlags = lib.optionals stdenv.isi686 [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isi686 [ # We don't want to build the plugin for 32bit. The library integrates with # the 64bit plugin but it's necessary to be loaded into 32bit games. "-DBUILD_PLUGIN=OFF" @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { vulkan-loader wayland ] - ++ lib.optionals (!stdenv.isi686) [ + ++ lib.optionals (!stdenv.hostPlatform.isi686) [ obs-studio ]; diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 18ee73b534540..c033c19143683 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { qtwayland qtmultimedia qttools - ] ++ lib.optional stdenv.isDarwin CoreFoundation; + ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreFoundation; meta = with lib; { description = "Professional open-source NLE video editor"; @@ -90,7 +90,7 @@ stdenv.mkDerivation { maintainers = [ maintainers.balsoft ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "olive-editor"; }; } diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 88f13ef3eb9b3..ec6e309e9b82c 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -10,7 +10,7 @@ , qtsvg , qtwayland , wayland -, waylandSupport ? stdenv.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , wrapGAppsHook3 }: @@ -66,7 +66,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication { wrapProgram $out/bin/openshot-qt \ '' # Fix toolbar icons on Darwin - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/${qtbase.qtPluginPrefix}" \ '' + '' "''${gappsWrapperArgs[@]}" \ diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index e95e1a1346a2a..a1c7de85ebc44 100644 --- a/pkgs/applications/video/pipe-viewer/default.nix +++ b/pkgs/applications/video/pipe-viewer/default.nix @@ -37,13 +37,13 @@ let in buildPerlModule rec { pname = "pipe-viewer"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "trizen"; repo = "pipe-viewer"; rev = version; - hash = "sha256-TCcAQjz0B3eWILMAoqHCnMLvu8zD0W5wOFg+UaMPmXg="; + hash = "sha256-crYdbHIDcecfq1FKoRWX3u9x9wqdlaYrBgr7mGdEHeU="; }; nativeBuildInputs = [ makeWrapper ] diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index e278d4a158c81..616cce1a38987 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -102,7 +102,7 @@ python3.pkgs.buildPythonApplication rec { that can appeal to newbies and professionals alike. ''; license = licenses.lgpl21Plus; - maintainers = [ ]; + maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; mainProgram = "pitivi"; }; diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index 52463c4689313..eab7c5a7d2331 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -73,7 +73,7 @@ python3.pkgs.buildPythonApplication rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Fully functional Opencast capture agent written in Python"; mainProgram = "pyca"; homepage = "https://github.com/opencast/pyCA"; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 0e8f3bfb584bc..d08387669eb3a 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ dotlambda ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "QMediathekView"; }; } diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 3172c4bb43435..2f0c66ecd1d12 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -79,7 +79,7 @@ mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; platforms = lib.platforms.gnu ++ lib.platforms.linux; mainProgram = "qstopmotion"; }; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 209023bb14cef..4b1763d6a3379 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.8.3"; + version = "6.11.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4/UaVnwIcDCS+R0El6P8Ku/jJ+/Ncl0D5m89zRHtm2g="; + hash = "sha256-Vi5ddTyhCeGVYgfeSsJ8M3zmuZ++ftcgO5RRBe1bL4Y="; }; patches = [ @@ -31,7 +31,6 @@ python3Packages.buildPythonApplication rec { mock requests-mock freezegun - pytest-asyncio pytest-trio ]; diff --git a/pkgs/applications/video/stremio/default.nix b/pkgs/applications/video/stremio/default.nix index 1cef55fa9ecd6..0b6495c8b1e68 100644 --- a/pkgs/applications/video/stremio/default.nix +++ b/pkgs/applications/video/stremio/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "stremio-shell"; - version = "4.4.165"; + version = "4.4.168"; src = fetchFromGitHub { owner = "Stremio"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-Gky0/HaGm11PeV4twoQV71T99NG2o0mYzQxu/c9x5oE="; + hash = "sha256-pz1mie0kJov06GcyitvZu5Gg0Vz3YnigjDqFujGKqZM="; }; server = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/stremio-artifacts/four/v${version}/server.js"; - sha256 = "sha256-52Pg0PrV15arGqhD3rXYCl1J6kcoL+/BHRvgiQBO/OA="; + hash = "sha256-aD3niQpgq1EiZLacnEFgmqUV+bc4rvGN9IA+9T4XF10="; }; buildInputs = [ qtwebengine mpv ]; diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index 713a0ad2753ea..48b38da01fae5 100644 --- a/pkgs/applications/video/sub-batch/default.nix +++ b/pkgs/applications/video/sub-batch/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kl/sub-batch"; license = licenses.mit; maintainers = with maintainers; [ erictapen ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "sub-batch"; }; } diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 057484d379e84..480c36edcfbdb 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.5.0"; + version = "2.5.040"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "refs/tags/v${version}"; - sha256 = "sha256-IcJDh8Q9K6SROZWVi98R1N2kSdgwJczScLdJFKy2FIU="; + sha256 = "sha256-yFsQbEXjWPxLYqFxsI6MjK1hE8Lk2Z0sPj3peLBs7r8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix index 105823fec3ab6..91a966bd1f4ea 100644 --- a/pkgs/applications/video/vcs/default.nix +++ b/pkgs/applications/video/vcs/default.nix @@ -5,7 +5,7 @@ }: let version = "1.13.4"; - gopt = if stdenv.isLinux then util-linux else getopt; + gopt = if stdenv.hostPlatform.isLinux then util-linux else getopt; runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer gopt ]; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index afce9a79d0abb..612731acdcc10 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-gn1Z3pw8f0Tpo8Ot0hP9+p/KbK/EGOInE34BCH3aVp0="; + sha256 = "sha256-/eNPhkrLpxXeX/5EitMJUgZCPy1Ked3oKuMdD6OuEYc="; rev = "v${version}"; }; diff --git a/pkgs/applications/video/xine/lib.nix b/pkgs/applications/video/xine/lib.nix deleted file mode 100644 index 641243ee77c6d..0000000000000 --- a/pkgs/applications/video/xine/lib.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib -, stdenv -, fetchurl -, aalib -, alsa-lib -, autoreconfHook -, ffmpeg -, flac -, libGL -, libGLU -, libX11 -, libXext -, libXinerama -, libXv -, libcaca -, libcdio -, libmng -, libmpcdec -, libpulseaudio -, libtheora -, libv4l -, libvorbis -, libxcb -, ncurses -, perl -, pkg-config -, speex -, vcdimager -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xine-lib"; - version = "1.2.13"; - - src = fetchurl { - url = "mirror://sourceforge/xine/xine-lib-${finalAttrs.version}.tar.xz"; - hash = "sha256-XxDW1xikpRwX7RsysDHU+bgLBh6CdlNbK+MeWsS3Xm8="; - }; - - outputs = [ "out" "dev" "man" ]; - - nativeBuildInputs = [ - autoreconfHook - perl - pkg-config - ]; - - buildInputs = [ - aalib - alsa-lib - ffmpeg - flac - libGL - libGLU - libX11 - libXext - libXinerama - libXv - libcaca - libcdio - libmng - libmpcdec - libpulseaudio - libtheora - libv4l - libvorbis - libxcb - ncurses - perl - speex - vcdimager - zlib - libX11 - libXext - libXinerama - libXv - libxcb - ]; - - enableParallelBuilding = true; - - env.NIX_LDFLAGS = "-lxcb-shm"; - - meta = { - homepage = "https://xine.sourceforge.net/"; - description = "High-performance, portable and reusable multimedia playback engine"; - license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/video/xine/ui.nix b/pkgs/applications/video/xine/ui.nix deleted file mode 100644 index 84631a8c45793..0000000000000 --- a/pkgs/applications/video/xine/ui.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoreconfHook -, curl -, libXext -, libXft -, libXi -, libXinerama -, libXtst -, libXv -, libXxf86vm -, libjpeg -, libpng -, lirc -, ncurses -, pkg-config -, readline -, shared-mime-info -, xine-lib -, xorgproto -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xine-ui"; - version = "0.99.14"; - - src = fetchurl { - url = "mirror://sourceforge/xine/xine-ui-${finalAttrs.version}.tar.xz"; - hash = "sha256-1NSQ1c7OcOK7mEnJ5ILyz4evAwLUUbYUR2/cw2Qs2cM="; - }; - - outputs = [ "out" "dev" "lib" "man" ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - shared-mime-info - ]; - - buildInputs = [ - curl - libXext - libXft - libXi - libXinerama - libXtst - libXv - libXxf86vm - libjpeg - libpng - lirc - ncurses - readline - xine-lib - xorgproto - ]; - - configureFlags = [ "--with-readline=${readline.dev}" ]; - - env = { - LIRC_CFLAGS="-I${lirc}/include"; - LIRC_LIBS="-L ${lirc}/lib -llirc_client"; - }; - - postInstall = '' - substituteInPlace $out/share/applications/xine.desktop \ - --replace "MimeType=;" "MimeType=" - ''; - - meta = { - homepage = "https://xine.sourceforge.net/"; - description = "Xlib-based frontend for Xine video player"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/video/youtube-tui/default.nix b/pkgs/applications/video/youtube-tui/default.nix index 89d32f6f9a70f..70458c7f6235c 100644 --- a/pkgs/applications/video/youtube-tui/default.nix +++ b/pkgs/applications/video/youtube-tui/default.nix @@ -43,14 +43,14 @@ rustPlatform.buildRustPackage rec { xorg.libxcb libsixel mpv - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security AppKit ]; # sixel-sys is dynamically linked to libsixel - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' wrapProgram $out/bin/youtube-tui \ --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}" ''; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 76d4db7d807ca..35336ad8ad3f3 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -29,6 +29,7 @@ x86_64 = "OvmfPkg/OvmfPkgX64.dsc"; aarch64 = "ArmVirtPkg/ArmVirtQemu.dsc"; riscv64 = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc"; + loongarch64 = "OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc"; }.${stdenv.hostPlatform.parsed.cpu.name} or (throw "Unsupported OVMF `projectDscPath` on ${stdenv.hostPlatform.parsed.cpu.name}") , fwPrefix ? { @@ -36,6 +37,7 @@ x86_64 = "OVMF"; aarch64 = "AAVMF"; riscv64 = "RISCV_VIRT"; + loongarch64 = "LOONGARCH_VIRT"; }.${stdenv.hostPlatform.parsed.cpu.name} or (throw "Unsupported OVMF `fwPrefix` on ${stdenv.hostPlatform.parsed.cpu.name}") , metaPlatforms ? edk2.meta.platforms @@ -84,8 +86,8 @@ let in -assert platformSpecific ? ${cpuName}; assert msVarsTemplate -> fdSize4MB; +assert msVarsTemplate -> platformSpecific ? ${cpuName}; assert msVarsTemplate -> platformSpecific.${cpuName} ? msVarsArgs; edk2.mkDerivation projectDscPath (finalAttrs: { @@ -130,17 +132,17 @@ edk2.mkDerivation projectDscPath (finalAttrs: { export PYTHONPATH=$NIX_BUILD_TOP/debian/python:$PYTHONPATH ''; - postBuild = lib.optionalString stdenv.hostPlatform.isAarch '' + postBuild = lib.optionalString (stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isLoongArch64) '' ( cd ${buildPrefix}/FV cp QEMU_EFI.fd ${fwPrefix}_CODE.fd cp QEMU_VARS.fd ${fwPrefix}_VARS.fd - + ) + '' + lib.optionalString stdenv.hostPlatform.isAarch '' # QEMU expects 64MiB CODE and VARS files on ARM/AARCH64 architectures # Truncate the firmware files to the expected size - truncate -s 64M ${fwPrefix}_CODE.fd - truncate -s 64M ${fwPrefix}_VARS.fd - ) + truncate -s 64M ${buildPrefix}/FV/${fwPrefix}_CODE.fd + truncate -s 64M ${buildPrefix}/FV/${fwPrefix}_VARS.fd '' + lib.optionalString stdenv.hostPlatform.isRiscV '' truncate -s 32M ${buildPrefix}/FV/${fwPrefix}_CODE.fd truncate -s 32M ${buildPrefix}/FV/${fwPrefix}_VARS.fd @@ -165,7 +167,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { postInstall = '' mkdir -vp $fd/FV '' + lib.optionalString (builtins.elem fwPrefix [ - "OVMF" "AAVMF" "RISCV_VIRT" + "OVMF" "AAVMF" "RISCV_VIRT" "LOONGARCH_VIRT" ]) '' mv -v $out/FV/${fwPrefix}_{CODE,VARS}.fd $fd/FV '' + lib.optionalString stdenv.hostPlatform.isx86 '' @@ -204,6 +206,6 @@ edk2.mkDerivation projectDscPath (finalAttrs: { license = lib.licenses.bsd2; platforms = metaPlatforms; maintainers = with lib.maintainers; [ adamcstephens raitobezarius mjoerg ]; - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index f1dcda8df7216..9af9b964825f1 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { separateDebugInfo = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional stdenv.isAarch64 dtc; + buildInputs = lib.optional stdenv.hostPlatform.isAarch64 dtc; checkInputs = [ openssl ]; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 4338fccb6c6d6..290186a59e3eb 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -12,18 +12,18 @@ , colima # use lima-bin on darwin to support native macOS virtualization # https://github.com/NixOS/nixpkgs/pull/209171 -, lima-drv ? if stdenv.isDarwin then lima-bin else lima +, lima-drv ? if stdenv.hostPlatform.isDarwin then lima-bin else lima }: buildGoModule rec { pname = "colima"; - version = "0.7.0"; + version = "0.7.5"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - hash = "sha256-fl1QtGbcaUwHDz4Jg+UgK27GPTHyJUyK76LXyaYj4Fo="; + hash = "sha256-WInmoTUaEm2kQ7esZgPj3YIHmHbBrlBTWcLPC9/2MdY="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -33,9 +33,9 @@ buildGoModule rec { }; nativeBuildInputs = [ installShellFiles makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; - vendorHash = "sha256-OXK6ZHKghKxgETjY3mg1R2yp8pPpy5yV8M4K+Hh9Fjw="; + vendorHash = "sha256-niuBo2YUUYKH0eSApOByNLrcHqr9m5VKGoiGp1fKklg="; # disable flaky Test_extractZones # https://hydra.nixos.org/build/212378003/log diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/applications/virtualization/conmon-rs/default.nix index e22257f7367b1..a68f48ebaa404 100644 --- a/pkgs/applications/virtualization/conmon-rs/default.nix +++ b/pkgs/applications/virtualization/conmon-rs/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "conmon-rs"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-qb7n6AcRkv/nF0BQbPgdFqaklfJeC+PRzMh6EIykobY="; + hash = "sha256-1kGAUAmiPI9zE8LE7G2r0Gy0YM+BUy2MxY7IQOu2ZDQ="; }; nativeBuildInputs = [ capnproto protobuf ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 2bfbf5e4a2555..3b9dcf0bfad4e 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.20"; + version = "1.7.22"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY="; + hash = "sha256-8IHBKai4PvvTuHPDTgx9wFEBzz4MM7Mwo8Q/bzFRzfk="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 5f7103886ccca..0524e0d699900 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.30.4"; + version = "1.31.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-PfG5RlUmMGMduTApdlHoI+4kdRprvWXeXZDkd6brVkM="; + hash = "sha256-pY8FRxexf/WG+aGkKZc4EtqO9uxAV7D6EFWirgSEye8="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 8b375e1e4c426..5dca484e5e9ea 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.16.1"; + version = "1.17"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-OhDzScs8xGs7kRn/xZRPwyqIszD0OuuY4ymrJ9QVDvM="; + hash = "sha256-d2YBpW8KivWYPRPpvXlT5tWPX8hvTCaSkMxdSuswYRA="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix index 66ed0aa6b2839..95aacbeb63865 100644 --- a/pkgs/applications/virtualization/ddev/default.nix +++ b/pkgs/applications/virtualization/ddev/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.23.3"; + version = "1.23.4"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-+DQEXJcW0nKBvw+pWZnFJfO/7R9IjbhAl9WZvorO9Io="; + hash = "sha256-+Ou9YbFwUVu6AqR041ngnVb9TpiO1UMph2w1zsbEMEM="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 2230e31231e74..57ce036eb4956 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.16.2"; + version = "0.17.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-s4VLuOLPNZGThnvr20EBddxKkreWf3B4D0RRx9OwJiw="; + hash = "sha256-+d0yaosNoOOuo/A7aC6pfy2xGJU718nBBNMMok2Ofv0="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 264a8ae288ecf..45099329c2e62 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.29.2"; + version = "2.29.7"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-UR2O8xBfoFew9G7RjyfXpdA0BcilKBp9Maj3Z+T7Kbw="; + hash = "sha256-6ksZAGVAFnLwPnCXlCtp4cWfxzJRp/bfVkpvp3Z6fiQ="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-5pBpTXayAo/YbZsYwBuEU8CSTQGzKoyQ5QLzh2McCt8="; + vendorHash = "sha256-B2ywdZjp7h7eFYNJ4wXmAdbOxc8ftGqHnLmDvzQASJE="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index a8a4863d6bf3b..fdc3515d5e0fe 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -14,13 +14,13 @@ rec { , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, tini, libtool , sqlite, iproute2, docker-buildx, docker-compose, docker-sbom - , iptables, e2fsprogs, xz, util-linux, xfsprogs, git + , iptables, e2fsprogs, xz, util-linux, xfsprogs, gitMinimal , procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests - , clientOnly ? !stdenv.isLinux, symlinkJoin + , clientOnly ? !stdenv.hostPlatform.isLinux, symlinkJoin , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd - , withBtrfs ? stdenv.isLinux, btrfs-progs - , withLvm ? stdenv.isLinux, lvm2 - , withSeccomp ? stdenv.isLinux, libseccomp + , withBtrfs ? stdenv.hostPlatform.isLinux, btrfs-progs + , withLvm ? stdenv.hostPlatform.isLinux, lvm2 + , withSeccomp ? stdenv.hostPlatform.isLinux, libseccomp , knownVulnerabilities ? [] }: let @@ -80,7 +80,7 @@ rec { hash = mobyHash; }; - moby = buildGoModule (lib.optionalAttrs stdenv.isLinux rec { + moby = buildGoModule (lib.optionalAttrs stdenv.hostPlatform.isLinux rec { pname = "moby"; inherit version; @@ -95,9 +95,9 @@ rec { ++ lib.optional withSystemd systemd ++ lib.optional withSeccomp libseccomp; - extraPath = lib.optionals stdenv.isLinux (lib.makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); + extraPath = lib.optionals stdenv.hostPlatform.isLinux (lib.makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux gitMinimal ]); - extraUserPath = lib.optionals (stdenv.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); + extraUserPath = lib.optionals (stdenv.hostPlatform.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); patches = lib.optionals (lib.versionOlder version "23") [ # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver. @@ -188,7 +188,7 @@ rec { makeWrapper pkg-config go-md2man go libtool installShellFiles ]; - buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23" && stdenv.isLinux) [ + buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23" && stdenv.hostPlatform.isLinux) [ glibc glibc.static ]; @@ -323,15 +323,15 @@ rec { }; docker_27 = callPackage dockerGen rec { - version = "27.1.1"; + version = "27.3.0"; cliRev = "v${version}"; - cliHash = "sha256-r9figEMYHHSbMYVFiw7GUMzjZBhlF+jyZqKixyCpoQ0="; + cliHash = "sha256-1z2MmWq+HD2fhpZqXu0G7oBL3Mc0NN/fR69aMWRelns="; mobyRev = "v${version}"; - mobyHash = "sha256-LuCEdQQ3eWt8VyzmWkQTxlxTok9h/UlACTVls5LcI7g="; - runcRev = "v1.1.13"; - runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; - containerdRev = "v1.7.20"; - containerdHash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY="; + mobyHash = "sha256-AKl06k2ePWOFhL3oH086HcLLYs2Da+wLOcGjGnQ0SXE="; + runcRev = "v1.1.14"; + runcHash = "sha256-7PYbSZqCQLTaeFppuNz5mxDlwEyLkA5zpdMhWy1tWmc="; + containerdRev = "v1.7.22"; + containerdHash = "sha256-8IHBKai4PvvTuHPDTgx9wFEBzz4MM7Mwo8Q/bzFRzfk="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix deleted file mode 100644 index c44f101ba9464..0000000000000 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib, stdenvNoCC, fetchurl }: - -let - # Upstream versioned download links are broken - # NOTE: the archive.org timestamp must be updated if the version changes. - # See https://xenproject.org/downloads/ - files = [ - { - url = "https://web.archive.org/web/20230817070451if_/https://xenbits.xenproject.org/pvdrivers/win/xenbus.tar"; - hash = "sha256-sInkbVL/xkoUeZxgknLM3e2AXBVSqItF2Vpkon53Xec="; - } - { - url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xencons.tar"; - hash = "sha256-r8bxH5B4y0V9qgALi42KtpZW05UOevv29AqqXaIXMBo="; - } - { - url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenhid.tar"; - hash = "sha256-e7ztzaXi/6irMus9IH0cfbW5HiKSaybXV1C/rd5mEfA="; - } - { - url = "https://web.archive.org/web/20230817071133if_/https://xenbits.xenproject.org/pvdrivers/win/xeniface.tar"; - hash = "sha256-qPM0TjcGR2luPtOSAfXJ22k6yhwJOmOP3ot6kopEFsI="; - } - { - url = "https://web.archive.org/web/20230817071134if_/https://xenbits.xenproject.org/pvdrivers/win/xennet.tar"; - hash = "sha256-Vg1wSfXjIVRd2iXCa19W4Jdaf2LTVin0yac/D70UjPM="; - } - { - url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenvbd.tar"; - hash = "sha256-nLNM0TWqsEWiQBCYxARMldvRecRUcY5DBF5DNAG4490="; - } - { - url = "https://web.archive.org/web/20230817071225if_/https://xenbits.xenproject.org/pvdrivers/win/xenvif.tar"; - hash = "sha256-R8G5vG6Q4g0/UkA2oxcc9/jaHZQYb+u64NShCNt7s7U="; - } - { - url = "https://web.archive.org/web/20230817071153if_/https://xenbits.xenproject.org/pvdrivers/win/xenvkbd.tar"; - hash = "sha256-CaSxCKnT/KaZw8Ma60g2z+4lOOWIRisGRtzMveQqQmM="; - } - ]; - -in -stdenvNoCC.mkDerivation { - pname = "win-pvdrivers"; - version = "unstable-2023-08-17"; - - srcs = map ({hash, url}: fetchurl { - inherit hash url; - # Wait & retry up to 3 times as archive.org can closes connection - # when an HTTP client makes too many requests - curlOpts = "--retry 3 --retry-delay 5"; - }) files; - - - unpackPhase = '' - runHook preUnpack - - for _src in $srcs; do - mkdir -p $out - tar xfv $_src -C $out - done - - runHook postUnpack - ''; - - meta = with lib; { - description = "Xen Subproject: Windows PV Drivers"; - homepage = "https://xenproject.org/developers/teams/windows-pv-drivers/"; - license = licenses.bsd2; - maintainers = with maintainers; [ anthonyroussel ]; - platforms = platforms.linux; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index ee2e1aa0a35f1..39c1ba4b7e2eb 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.85.1"; + version = "1.86.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-TrfFJ6N1DreO3NcznXBcNZziESAMxWa4FR+KzDjRDmM="; + hash = "sha256-YygvAYoqbWVmtBgHNrP0Xp1zSgCv2PsnWARWyo3K8rM="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index d6da5a2742f51..392ba594189ab 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { rustc asciidoctor makeWrapper - ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; - buildInputs = [ libkrun ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libkrun ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # It attaches entitlements with codesign and strip removes those, # voiding the entitlements and making it non-operational. - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; postFixup = '' wrapProgram $out/bin/krunvm \ diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix index 7549f0c1528b2..ca45c58ff2190 100644 --- a/pkgs/applications/virtualization/lima/bin.nix +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation { sourceRoot = "."; nativeBuildInputs = [ makeBinaryWrapper installShellFiles ] - ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall @@ -79,7 +79,7 @@ stdenvNoCC.mkDerivation { # Stripping removes entitlements of the binary on Darwin making it non-operational. # Therefore, disable stripping on Darwin. - dontStrip = stdenvNoCC.isDarwin; + dontStrip = stdenvNoCC.hostPlatform.isDarwin; passthru.updateScript = let diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index c57b58a008b32..318d54c77c413 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { vendorHash = "sha256-P0Qnfu/cqLveAwz9jf/wTXxkoh0jvazlE5C/PcUrWsA="; nativeBuildInputs = [ makeWrapper installShellFiles ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun sigtool ]; # clean fails with read only vendor dir postPatch = '' @@ -34,7 +34,7 @@ buildGoModule rec { # It attaches entitlements with codesign and strip removes those, # voiding the entitlements and making it non-operational. - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index c889dc5ff50af..751cbd021fc21 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484 sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c - '' + lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.hostPlatform.isi686 '' echo CONFIG_KALLSYMS=n >> arch/lkl/configs/defconfig echo CONFIG_KALLSYMS_BASE_RELATIVE=n >> arch/lkl/configs/defconfig '' + lib.optionalString firewallSupport '' diff --git a/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch b/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch deleted file mode 100644 index b044fb47c2e1f..0000000000000 --- a/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Geoffrey McRae <geoff@hostfission.com> -Date: Wed, 13 Mar 2024 11:17:25 +1100 -Subject: [PATCH] [client] cmake: move X11 config directives to - `displayservers` - ---- - client/CMakeLists.txt | 7 ------- - client/displayservers/CMakeLists.txt | 7 +++++++ - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git client/CMakeLists.txt client/CMakeLists.txt -index 3755adcf..eeeb3eb0 100644 ---- client/CMakeLists.txt -+++ client/CMakeLists.txt -@@ -42,19 +42,12 @@ add_feature_info(ENABLE_ASAN ENABLE_ASAN "AddressSanitizer support.") - option(ENABLE_UBSAN "Build with UndefinedBehaviorSanitizer" OFF) - add_feature_info(ENABLE_UBSAN ENABLE_UBSAN "UndefinedBehaviorSanitizer support.") - --option(ENABLE_X11 "Build with X11 support" ON) --add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.") -- - option(ENABLE_PIPEWIRE "Build with PipeWire audio output support" ON) - add_feature_info(ENABLE_PIPEWIRE ENABLE_PIPEWIRE "PipeWire audio support.") - - option(ENABLE_PULSEAUDIO "Build with PulseAudio audio output support" ON) - add_feature_info(ENABLE_PULSEAUDIO ENABLE_PULSEAUDIO "PulseAudio audio support.") - --if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND) -- message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on") --endif() -- - add_compile_options( - "-Wall" - "-Wextra" -diff --git client/displayservers/CMakeLists.txt client/displayservers/CMakeLists.txt -index 5b5f827a..e7c4b25a 100644 ---- client/displayservers/CMakeLists.txt -+++ client/displayservers/CMakeLists.txt -@@ -18,9 +18,16 @@ function(add_displayserver name) - add_subdirectory(${name}) - endfunction() - -+option(ENABLE_X11 "Build with X11 support" ON) -+add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.") -+ - option(ENABLE_WAYLAND "Build with Wayland support" ON) - add_feature_info(ENABLE_WAYLAND ENABLE_WAYLAND "Wayland support.") - -+if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND) -+ message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on") -+endif() -+ - # Add/remove displayservers here! - if (ENABLE_WAYLAND) - add_displayserver(Wayland) --- -2.43.1 diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 6adb2ebcc163e..8e0f81680b631 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch , fetchFromGitHub , makeDesktopItem , pkg-config @@ -62,7 +63,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Fix failing cmake assertion when disabling X11 whithout explicitly enabling Wayland. - ./0001-client-cmake-move-X11-config-directives-to-displayse.patch + (fetchpatch { + url = "https://github.com/gnif/LookingGlass/commit/20972cfd9b940fddf9e7f3d2887a271d16398979.patch"; + hash = "sha256-CqB8AmOZ4YxnEsQkyu/ZEaun6ywpSh4B7PM+MFJF0qU="; + stripLen = 1; + }) ]; nativeBuildInputs = [ cmake pkg-config wayland-scanner ]; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index ae7fdf3edc26e..772cc2189d99a 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.26.1"; + version = "1.28.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xwuW6bncNK9zhI6gWDpI5imdAd0+mALxyUQW433AeMA="; + sha256 = "sha256-0gy9fm18Tc1ALZEV+XZN8kwK725PpIK2OTKKMatvtVQ="; }; - cargoHash = "sha256-uxvFeoooz7aSM7ZAgUsxGO3LE/zinW5D/GwXcWoKLA0="; + cargoHash = "sha256-r7jVcDja3BZyZoN2JxDymyv+rOv3wWaGo+yC4GwnZ50="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 015768b4ed7c7..ce7d993d39dea 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper copyDesktopItems ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index d1103ca12f99b..57ede5b8b1613 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -22,8 +22,7 @@ , crun , runc , conmon -, extraRuntimes ? lib.optionals stdenv.isLinux [ runc ] # e.g.: runc, gvisor, youki -, slirp4netns +, extraRuntimes ? lib.optionals stdenv.hostPlatform.isLinux [ runc ] # e.g.: runc, gvisor, youki , fuse-overlayfs , util-linux , iptables @@ -33,17 +32,20 @@ , aardvark-dns , netavark , passt +, vfkit , testers , podman }: let # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed - binPath = lib.makeBinPath (lib.optionals stdenv.isLinux [ + binPath = lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ fuse-overlayfs util-linux iptables iproute2 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + vfkit ] ++ extraPackages); helpersBin = symlinkJoin { @@ -52,11 +54,10 @@ let # this only works for some binaries, others may need to be added to `binPath` or in the modules paths = [ gvproxy - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ aardvark-dns catatonit # added here for the pause image and also set in `containersConf` for `init_path` netavark - slirp4netns passt conmon crun @@ -65,13 +66,13 @@ let in buildGoModule rec { pname = "podman"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-48ltjGrzh74CYV6T6YDFSFC+Msui8YCG1N+c9k5Y09I="; + hash = "sha256-2FnUijeQhre7B4utsGGEGbMuuMVZlPDoM2di3z1d4vs="; }; patches = [ @@ -92,7 +93,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper python3 ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs gpgme libapparmor @@ -109,7 +110,7 @@ buildGoModule rec { runHook preBuild patchShebangs . substituteInPlace Makefile --replace "/bin/bash" "${runtimeShell}" - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' make podman-remote # podman-mac-helper uses FHS paths '' else '' make bin/podman bin/rootlessport bin/quadlet @@ -120,7 +121,7 @@ buildGoModule rec { installPhase = '' runHook preInstall - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' install bin/darwin/podman -Dt $out/bin '' else '' make install.bin install.systemd @@ -133,7 +134,7 @@ buildGoModule rec { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped) patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped ''; @@ -143,7 +144,7 @@ buildGoModule rec { package = podman; command = "HOME=$TMPDIR podman --version"; }; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) podman; # related modules inherit (nixosTests) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b722405908f89..3b797c957e83f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages +{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, overrideSDK, buildPackages , pixman, vde2, alsa-lib, flex, pcre2 , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson , sigtool , makeWrapper, removeReferencesTo , attr, libcap, libcap_ng, socat, libslirp -, CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet +, CoreServices, Cocoa, Hypervisor, Kernel, rez, setfile, vmnet , guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal -, numaSupport ? stdenv.isLinux && !stdenv.isAarch32 && !minimal, numactl -, seccompSupport ? stdenv.isLinux && !minimal, libseccomp +, numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, numactl +, seccompSupport ? stdenv.hostPlatform.isLinux && !minimal, libseccomp , alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner && !minimal -, pulseSupport ? !stdenv.isDarwin && !nixosTestRunner && !minimal, libpulseaudio -, pipewireSupport ? !stdenv.isDarwin && !nixosTestRunner && !minimal, pipewire -, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner && !minimal, SDL2, SDL2_image -, jackSupport ? !stdenv.isDarwin && !nixosTestRunner && !minimal, libjack2 -, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner && !minimal, gtk3, gettext, vte, wrapGAppsHook3 +, pulseSupport ? !stdenv.hostPlatform.isDarwin && !nixosTestRunner && !minimal, libpulseaudio +, pipewireSupport ? !stdenv.hostPlatform.isDarwin && !nixosTestRunner && !minimal, pipewire +, sdlSupport ? !stdenv.hostPlatform.isDarwin && !nixosTestRunner && !minimal, SDL2, SDL2_image +, jackSupport ? !stdenv.hostPlatform.isDarwin && !nixosTestRunner && !minimal, libjack2 +, gtkSupport ? !stdenv.hostPlatform.isDarwin && !xenSupport && !nixosTestRunner && !minimal, gtk3, gettext, vte, wrapGAppsHook3 , vncSupport ? !nixosTestRunner && !minimal, libjpeg, libpng , smartcardSupport ? !nixosTestRunner && !minimal, libcacard , spiceSupport ? true && !nixosTestRunner && !minimal, spice, spice-protocol @@ -28,7 +28,7 @@ , libiscsiSupport ? !minimal, libiscsi , smbdSupport ? false, samba , tpmSupport ? !minimal -, uringSupport ? stdenv.isLinux && !userOnly, liburing +, uringSupport ? stdenv.hostPlatform.isLinux && !userOnly, liburing , canokeySupport ? !minimal, canokey-qemu , capstoneSupport ? !minimal, capstone , pluginsSupport ? !stdenv.hostPlatform.isStatic @@ -39,7 +39,7 @@ , hostCpuTargets ? (if toolsOnly then [ ] else if hostCpuOnly - then (lib.optional stdenv.isx86_64 "i386-softmmu" + then (lib.optional stdenv.hostPlatform.isx86_64 "i386-softmmu" ++ ["${stdenv.hostPlatform.qemuArch}-softmmu"]) else null) , nixosTestRunner ? false @@ -52,6 +52,16 @@ let hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets; + + buildPlatformStdenv = + if stdenv.buildPlatform.isDarwin then + overrideSDK buildPackages.stdenv { + # Keep these values in sync with `all-packages.nix`. + darwinSdkVersion = "12.3"; + darwinMinVersion = "12.0"; + } + else + buildPackages.stdenv; in stdenv.mkDerivation (finalAttrs: { @@ -61,14 +71,14 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "9.0.2"; + version = "9.1.0"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-qMP1lq7Olto7AMr7dLqvoNFFFer7jtHuP39cLQ6/ArY="; + hash = "sha256-gWtwIqi6fCrDDi4M+XPoJva8yFBTOWAyEsXt6OlNeDQ="; }; - depsBuildBuild = [ buildPackages.stdenv.cc ] + depsBuildBuild = [ buildPlatformStdenv.cc ] ++ lib.optionals hexagonSupport [ pkg-config ]; nativeBuildInputs = [ @@ -81,17 +91,14 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals gtkSupport [ wrapGAppsHook3 ] ++ lib.optionals enableDocs [ python3Packages.sphinx python3Packages.sphinx-rtd-theme ] ++ lib.optionals hexagonSupport [ glib ] - ++ lib.optionals stdenv.isDarwin [ sigtool ] - ++ lib.optionals (!userOnly) [ dtc ] - # workaround, remove once this patch lands: https://lore.kernel.org/qemu-devel/20240805104921.4035256-1-hi@alyssa.is/ - ++ lib.optionals (hexagonSupport && stdenv.hostPlatform.isStatic) [ pcre2 ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ] + ++ lib.optionals (!userOnly) [ dtc ]; - buildInputs = [ zlib glib pixman - vde2 lzo snappy libtasn1 - gnutls nettle curl libslirp - ] + buildInputs = [ glib zlib ] + ++ lib.optionals (!minimal) [ dtc pixman vde2 lzo snappy libtasn1 gnutls nettle libslirp ] + ++ lib.optionals (!userOnly) [ curl ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile vmnet ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Cocoa Hypervisor Kernel rez setfile vmnet ] ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] ++ lib.optionals alsaSupport [ alsa-lib ] @@ -104,8 +111,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals smartcardSupport [ libcacard ] ++ lib.optionals spiceSupport [ spice-protocol spice ] ++ lib.optionals usbredirSupport [ usbredir ] - ++ lib.optionals stdenv.isLinux [ libcap_ng libcap attr ] - ++ lib.optionals (stdenv.isLinux && !userOnly) [ libaio ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && !userOnly) [ libcap_ng libcap attr libaio ] ++ lib.optionals xenSupport [ xen ] ++ lib.optionals cephSupport [ ceph ] ++ lib.optionals glusterfsSupport [ glusterfs libuuid ] @@ -116,30 +122,18 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals smbdSupport [ samba ] ++ lib.optionals uringSupport [ liburing ] ++ lib.optionals canokeySupport [ canokey-qemu ] - ++ lib.optionals capstoneSupport [ capstone ] - ++ lib.optionals (!userOnly) [ dtc ]; + ++ lib.optionals capstoneSupport [ capstone ]; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build dontAddStaticConfigureFlags = true; outputs = [ "out" ] ++ lib.optional guestAgentSupport "ga"; # On aarch64-linux we would shoot over the Hydra's 2G output limit. - separateDebugInfo = !(stdenv.isAarch64 && stdenv.isLinux); + separateDebugInfo = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); patches = [ ./fix-qemu-ga.patch - # QEMU upstream does not demand compatibility to pre-10.13, so 9p-darwin - # support on nix requires utimensat fallback. The patch adding this fallback - # set was removed during the process of upstreaming this functionality, and - # will still be needed in nix until the macOS SDK reaches 10.13+. - ./provide-fallback-for-utimensat.patch - # Cocoa clipboard support only works on macOS 10.14+ - ./revert-ui-cocoa-add-clipboard-support.patch - # Standard about panel requires AppKit and macOS 10.13+ - ./revert-ui-cocoa-use-the-standard-about-panel.patch - # Safe area insets require macOS 11+ - ./remove-ui-cocoa-use-safe-area-insets.patch # Workaround for upstream issue with nested virtualisation: https://gitlab.com/qemu-project/qemu/-/issues/1008 (fetchpatch { url = "https://gitlab.com/qemu-project/qemu/-/commit/3e4546d5bd38a1e98d4bd2de48631abf0398a3a2.diff"; @@ -182,8 +176,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional spiceSupport "--enable-spice" ++ lib.optional usbredirSupport "--enable-usb-redir" ++ lib.optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}" - ++ lib.optionals stdenv.isDarwin [ "--enable-cocoa" "--enable-hvf" ] - ++ lib.optional (stdenv.isLinux && !userOnly) "--enable-linux-aio" + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-cocoa" "--enable-hvf" ] + ++ lib.optional (stdenv.hostPlatform.isLinux && !userOnly) "--enable-linux-aio" ++ lib.optional gtkSupport "--enable-gtk" ++ lib.optional xenSupport "--enable-xen" ++ lib.optional cephSupport "--enable-rbd" @@ -207,7 +201,7 @@ stdenv.mkDerivation (finalAttrs: { # voiding the entitlements and making it non-operational. # The alternative is to re-sign with entitlements after stripping: # * https://github.com/qemu/qemu/blob/v6.1.0/scripts/entitlement.sh#L25 - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; postFixup = '' # the .desktop is both invalid and pointless @@ -263,7 +257,7 @@ stdenv.mkDerivation (finalAttrs: { # xattrs are not allowed in the sandbox substituteInPlace ../tests/qtest/virtio-9p-test.c \ --replace-fail mapped-xattr mapped-file - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # skip test that stalls on darwin, perhaps due to subtle differences # in fifo behaviour substituteInPlace ../tests/unit/meson.build \ @@ -296,7 +290,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.qemu.org/"; description = "Generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ qyliss ]; + maintainers = with maintainers; [ qyliss ] ++ lib.optionals xenSupport xen.meta.maintainers; platforms = platforms.unix; } # toolsOnly: Does not have qemu-kvm and there's no main support tool diff --git a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch index 94dec69168002..9a4a7f0d432ee 100644 --- a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch +++ b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch @@ -1,36 +1,45 @@ -diff --git i/qga/commands-posix.c w/qga/commands-posix.c -index 954efed01b..39c4b916ce 100644 ---- i/qga/commands-posix.c -+++ w/qga/commands-posix.c -@@ -123,6 +123,8 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) - execl("/sbin/shutdown", "shutdown", shutdown_flag, "-g0", "-y", - "hypervisor initiated shutdown", (char *)NULL); - #else -+ execl("/run/current-system/sw/bin/shutdown", "shutdown", "-h", shutdown_flag, "+0", -+ "hypervisor initiated shutdown", (char *)NULL); - execl("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", - "hypervisor initiated shutdown", (char *)NULL); - #endif -@@ -158,11 +160,13 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) - pid_t pid; - Error *local_err = NULL; - struct timeval tv; -+ static const char hwclock_path_nix[] = "/run/current-system/sw/bin/hwclock"; - static const char hwclock_path[] = "/sbin/hwclock"; - static int hwclock_available = -1; - - if (hwclock_available < 0) { -- hwclock_available = (access(hwclock_path, X_OK) == 0); -+ hwclock_available = (access(hwclock_path_nix, X_OK) == 0) || -+ (access(hwclock_path, X_OK) == 0); +diff --git a/qga/commands-posix.c b/qga/commands-posix.c +index c2bd0b4316..47cee1c351 100644 +--- a/qga/commands-posix.c ++++ b/qga/commands-posix.c +@@ -246,7 +246,7 @@ void qmp_guest_shutdown(const char *mode, Error **errp) + return; } - if (!hwclock_available) { -@@ -208,6 +212,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) +- const char *argv[] = {"/sbin/shutdown", ++ const char *argv[] = {"/run/current-system/sw/bin/shutdown", + #ifdef CONFIG_SOLARIS + shutdown_flag, "-g0", "-y", + #elif defined(CONFIG_BSD) +@@ -257,6 +257,10 @@ void qmp_guest_shutdown(const char *mode, Error **errp) + "hypervisor initiated shutdown", (char *) NULL}; + + ga_run_command(argv, NULL, "shutdown", &local_err); ++ if (local_err) { ++ argv[0] = "/sbin/shutdown"; ++ ga_run_command(argv, NULL, "shutdown", &local_err); ++ } + if (local_err) { + error_propagate(errp, local_err); + return; +@@ -270,7 +274,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) + int ret; + Error *local_err = NULL; + struct timeval tv; +- const char *argv[] = {"/sbin/hwclock", has_time ? "-w" : "-s", NULL}; ++ const char *argv[] = {"/run/current-system/sw/bin/hwclock", has_time ? "-w" : "-s", NULL}; - /* Use '/sbin/hwclock -w' to set RTC from the system time, - * or '/sbin/hwclock -s' to set the system time from RTC. */ -+ execl(hwclock_path_nix, "hwclock", has_time ? "-w" : "-s", NULL); - execl(hwclock_path, "hwclock", has_time ? "-w" : "-s", NULL); - _exit(EXIT_FAILURE); - } else if (pid < 0) { + /* If user has passed a time, validate and set it. */ + if (has_time) { +@@ -303,6 +307,11 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) + * hardware clock (RTC). */ + ga_run_command(argv, NULL, "set hardware clock to system time", + &local_err); ++ if (local_err) { ++ argv[0] = "/sbin/hwclock"; ++ ga_run_command(argv, NULL, "set hardware clock to system time", ++ &local_err); ++ } + if (local_err) { + error_propagate(errp, local_err); + return; diff --git a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch deleted file mode 100644 index dc4f4abb27383..0000000000000 --- a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 2ec149ea3f0046fa83e3be74aca192649a60be47 Mon Sep 17 00:00:00 2001 -From: Keno Fischer <keno@juliacomputing.com> -Date: Sat, 16 Jun 2018 20:56:54 -0400 -Subject: [PATCH] 9p: darwin: Provide fallback impl for utimensat - -This function is new in Mac OS 10.13. Provide a fallback implementation -when building against older SDKs. The complication in the definition comes -having to separately handle the used SDK version and the target OS version. - -- If the SDK version is too low (__MAC_10_13 not defined), utimensat is not - defined in the header, so we must not try to use it (doing so would error). -- Otherwise, if the targetted OS version is at least 10.13, we know this - function is available, so we can unconditionally call it. -- Lastly, we check for the availability of the __builtin_available macro to - potentially insert a dynamic check for this OS version. However, __builtin_available - is only available with sufficiently recent versions of clang and while all - Apple clang versions that ship with Xcode versions that support the 10.13 - SDK support with builtin, we want to allow building with compilers other - than Apple clang that may not support this builtin. - -Signed-off-by: Keno Fischer <keno@juliacomputing.com> -Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com> -Signed-off-by: Will Cohen <wwcohen@gmail.com> ---- - hw/9pfs/9p-local.c | 2 +- - hw/9pfs/9p-util-darwin.c | 96 ++++++++++++++++++++++++++++++++++++++++ - hw/9pfs/9p-util-linux.c | 6 +++ - hw/9pfs/9p-util.h | 8 ++++ - 4 files changed, 111 insertions(+), 1 deletion(-) - -diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c -index 9d07620235..9c77a431d5 100644 ---- a/hw/9pfs/9p-local.c -+++ b/hw/9pfs/9p-local.c -@@ -1081,7 +1081,7 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path, - goto out; - } - -- ret = qemu_utimensat(dirfd, name, buf, AT_SYMLINK_NOFOLLOW); -+ ret = utimensat_nofollow(dirfd, name, buf); - close_preserve_errno(dirfd); - out: - g_free(dirpath); -diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c -index 95146e7354..74ab2a7f99 100644 ---- a/hw/9pfs/9p-util-darwin.c -+++ b/hw/9pfs/9p-util-darwin.c -@@ -145,3 +145,99 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) - } - - #endif -+ -+#ifndef __has_builtin -+#define __has_builtin(x) 0 -+#endif -+ -+static int update_times_from_stat(int fd, struct timespec times[2], -+ int update0, int update1) -+{ -+ struct stat buf; -+ int ret = fstat(fd, &buf); -+ if (ret == -1) { -+ return ret; -+ } -+ if (update0) { -+ times[0] = buf.st_atimespec; -+ } -+ if (update1) { -+ times[1] = buf.st_mtimespec; -+ } -+ return 0; -+} -+ -+int utimensat_nofollow(int dirfd, const char *filename, -+ const struct timespec times_in[2]) -+{ -+ int ret, fd; -+ int special0, special1; -+ struct timeval futimes_buf[2]; -+ struct timespec times[2]; -+ memcpy(times, times_in, 2 * sizeof(struct timespec)); -+ -+/* Check whether we have an SDK version that defines utimensat */ -+#if defined(__MAC_10_13) -+# if __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_13 -+# define UTIMENSAT_AVAILABLE 1 -+# elif __has_builtin(__builtin_available) -+# define UTIMENSAT_AVAILABLE __builtin_available(macos 10.13, *) -+# else -+# define UTIMENSAT_AVAILABLE 0 -+# endif -+ if (UTIMENSAT_AVAILABLE) { -+ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); -+ } -+#endif -+ -+ /* utimensat not available. Use futimes. */ -+ fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); -+ if (fd == -1) { -+ return -1; -+ } -+ -+ special0 = times[0].tv_nsec == UTIME_OMIT; -+ special1 = times[1].tv_nsec == UTIME_OMIT; -+ if (special0 || special1) { -+ /* If both are set, nothing to do */ -+ if (special0 && special1) { -+ ret = 0; -+ goto done; -+ } -+ -+ ret = update_times_from_stat(fd, times, special0, special1); -+ if (ret < 0) { -+ goto done; -+ } -+ } -+ -+ special0 = times[0].tv_nsec == UTIME_NOW; -+ special1 = times[1].tv_nsec == UTIME_NOW; -+ if (special0 || special1) { -+ ret = futimes(fd, NULL); -+ if (ret < 0) { -+ goto done; -+ } -+ -+ /* If both are set, we are done */ -+ if (special0 && special1) { -+ ret = 0; -+ goto done; -+ } -+ -+ ret = update_times_from_stat(fd, times, special0, special1); -+ if (ret < 0) { -+ goto done; -+ } -+ } -+ -+ futimes_buf[0].tv_sec = times[0].tv_sec; -+ futimes_buf[0].tv_usec = times[0].tv_nsec / 1000; -+ futimes_buf[1].tv_sec = times[1].tv_sec; -+ futimes_buf[1].tv_usec = times[1].tv_nsec / 1000; -+ ret = futimes(fd, futimes_buf); -+ -+done: -+ close_preserve_errno(fd); -+ return ret; -+} -diff --git a/hw/9pfs/9p-util-linux.c b/hw/9pfs/9p-util-linux.c -index db451b0784..320697f347 100644 ---- a/hw/9pfs/9p-util-linux.c -+++ b/hw/9pfs/9p-util-linux.c -@@ -68,3 +68,9 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) - { - return mknodat(dirfd, filename, mode, dev); - } -+ -+int utimensat_nofollow(int dirfd, const char *filename, -+ const struct timespec times[2]) -+{ -+ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); -+} -diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h -index c314cf381d..12d57f3398 100644 ---- a/hw/9pfs/9p-util.h -+++ b/hw/9pfs/9p-util.h -@@ -101,6 +101,12 @@ static inline int errno_to_dotl(int err) { - #define qemu_utimensat utimensat - #define qemu_unlinkat unlinkat - -+/* Compatibility with old SDK Versions for Darwin */ -+#if defined(CONFIG_DARWIN) && !defined(UTIME_NOW) -+#define UTIME_NOW -1 -+#define UTIME_OMIT -2 -+#endif -+ - static inline void close_preserve_errno(int fd) - { - int serrno = errno; -@@ -163,6 +169,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename, - char *list, size_t size); - ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, - const char *name); -+int utimensat_nofollow(int dirfd, const char *filename, -+ const struct timespec times[2]); - - /* - * Darwin has d_seekoff, which appears to function similarly to d_off. --- -2.39.2 diff --git a/pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch b/pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch deleted file mode 100644 index 2a8430afaa705..0000000000000 --- a/pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/ui/cocoa.m b/ui/cocoa.m -index 25e0db9dd0..7ce889d798 100644 ---- a/ui/cocoa.m -+++ b/ui/cocoa.m -@@ -539,9 +539,6 @@ - (NSSize)fixAspectRatio:(NSSize)max - - (NSSize) screenSafeAreaSize - { - NSSize size = [[[self window] screen] frame].size; -- NSEdgeInsets insets = [[[self window] screen] safeAreaInsets]; -- size.width -= insets.left + insets.right; -- size.height -= insets.top + insets.bottom; - return size; - } - diff --git a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch deleted file mode 100644 index c429bce03dcf6..0000000000000 --- a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch +++ /dev/null @@ -1,200 +0,0 @@ -Based on a reversion of upstream 7e3e20d89129614f4a7b2451fe321cc6ccca3b76, -adapted for 7.2.0 - -diff --git a/include/ui/clipboard.h b/include/ui/clipboard.h -index ce76aa451f..c4e1dc4ff4 100644 ---- a/include/ui/clipboard.h -+++ b/include/ui/clipboard.h -@@ -269,7 +269,7 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, - QemuClipboardInfo *info, - QemuClipboardType type, - uint32_t size, -- const void *data, -+ void *data, - bool update); - - G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuClipboardInfo, qemu_clipboard_info_unref) -diff --git a/ui/clipboard.c b/ui/clipboard.c -index 3d14bffaf8..2c3f4c3ba0 100644 ---- a/ui/clipboard.c -+++ b/ui/clipboard.c -@@ -154,7 +154,7 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, - QemuClipboardInfo *info, - QemuClipboardType type, - uint32_t size, -- const void *data, -+ void *data, - bool update) - { - if (!info || -diff --git a/ui/cocoa.m b/ui/cocoa.m -index 660d3e0935..0e6760c360 100644 ---- a/ui/cocoa.m -+++ b/ui/cocoa.m -@@ -29,7 +29,6 @@ - - #include "qemu/help-texts.h" - #include "qemu-main.h" --#include "ui/clipboard.h" - #include "ui/console.h" - #include "ui/input.h" - #include "ui/kbd-state.h" -@@ -105,10 +104,6 @@ static void cocoa_switch(DisplayChangeListener *dcl, - - static bool allow_events; - --static NSInteger cbchangecount = -1; --static QemuClipboardInfo *cbinfo; --static QemuEvent cbevent; -- - // Utility functions to run specified code block with the BQL held - typedef void (^CodeBlock)(void); - typedef bool (^BoolCodeBlock)(void); -@@ -1799,107 +1794,6 @@ static void addRemovableDevicesMenuItems(void) - qapi_free_BlockInfoList(pointerToFree); - } - --@interface QemuCocoaPasteboardTypeOwner : NSObject<NSPasteboardTypeOwner> --@end -- --@implementation QemuCocoaPasteboardTypeOwner -- --- (void)pasteboard:(NSPasteboard *)sender provideDataForType:(NSPasteboardType)type --{ -- if (type != NSPasteboardTypeString) { -- return; -- } -- -- with_bql(^{ -- QemuClipboardInfo *info = qemu_clipboard_info_ref(cbinfo); -- qemu_event_reset(&cbevent); -- qemu_clipboard_request(info, QEMU_CLIPBOARD_TYPE_TEXT); -- -- while (info == cbinfo && -- info->types[QEMU_CLIPBOARD_TYPE_TEXT].available && -- info->types[QEMU_CLIPBOARD_TYPE_TEXT].data == NULL) { -- bql_unlock(); -- qemu_event_wait(&cbevent); -- bql_lock(); -- } -- -- if (info == cbinfo) { -- NSData *data = [[NSData alloc] initWithBytes:info->types[QEMU_CLIPBOARD_TYPE_TEXT].data -- length:info->types[QEMU_CLIPBOARD_TYPE_TEXT].size]; -- [sender setData:data forType:NSPasteboardTypeString]; -- [data release]; -- } -- -- qemu_clipboard_info_unref(info); -- }); --} -- --@end -- --static QemuCocoaPasteboardTypeOwner *cbowner; -- --static void cocoa_clipboard_notify(Notifier *notifier, void *data); --static void cocoa_clipboard_request(QemuClipboardInfo *info, -- QemuClipboardType type); -- --static QemuClipboardPeer cbpeer = { -- .name = "cocoa", -- .notifier = { .notify = cocoa_clipboard_notify }, -- .request = cocoa_clipboard_request --}; -- --static void cocoa_clipboard_update_info(QemuClipboardInfo *info) --{ -- if (info->owner == &cbpeer || info->selection != QEMU_CLIPBOARD_SELECTION_CLIPBOARD) { -- return; -- } -- -- if (info != cbinfo) { -- NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; -- qemu_clipboard_info_unref(cbinfo); -- cbinfo = qemu_clipboard_info_ref(info); -- cbchangecount = [[NSPasteboard generalPasteboard] declareTypes:@[NSPasteboardTypeString] owner:cbowner]; -- [pool release]; -- } -- -- qemu_event_set(&cbevent); --} -- --static void cocoa_clipboard_notify(Notifier *notifier, void *data) --{ -- QemuClipboardNotify *notify = data; -- -- switch (notify->type) { -- case QEMU_CLIPBOARD_UPDATE_INFO: -- cocoa_clipboard_update_info(notify->info); -- return; -- case QEMU_CLIPBOARD_RESET_SERIAL: -- /* ignore */ -- return; -- } --} -- --static void cocoa_clipboard_request(QemuClipboardInfo *info, -- QemuClipboardType type) --{ -- NSAutoreleasePool *pool; -- NSData *text; -- -- switch (type) { -- case QEMU_CLIPBOARD_TYPE_TEXT: -- pool = [[NSAutoreleasePool alloc] init]; -- text = [[NSPasteboard generalPasteboard] dataForType:NSPasteboardTypeString]; -- if (text) { -- qemu_clipboard_set_data(&cbpeer, info, type, -- [text length], [text bytes], true); -- } -- [pool release]; -- break; -- default: -- break; -- } --} -- - /* - * The startup process for the OSX/Cocoa UI is complicated, because - * OSX insists that the UI runs on the initial main thread, and so we -@@ -1922,7 +1816,6 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info, - status = qemu_default_main(); - qemu_mutex_unlock_iothread(); - COCOA_DEBUG("Second thread: qemu_default_main() returned, exiting\n"); -- [cbowner release]; - exit(status); - } - -@@ -2003,18 +1896,6 @@ static void cocoa_refresh(DisplayChangeListener *dcl) - [cocoaView setAbsoluteEnabled:YES]; - }); - } -- -- if (cbchangecount != [[NSPasteboard generalPasteboard] changeCount]) { -- qemu_clipboard_info_unref(cbinfo); -- cbinfo = qemu_clipboard_info_new(&cbpeer, QEMU_CLIPBOARD_SELECTION_CLIPBOARD); -- if ([[NSPasteboard generalPasteboard] availableTypeFromArray:@[NSPasteboardTypeString]]) { -- cbinfo->types[QEMU_CLIPBOARD_TYPE_TEXT].available = true; -- } -- qemu_clipboard_update(cbinfo); -- cbchangecount = [[NSPasteboard generalPasteboard] changeCount]; -- qemu_event_set(&cbevent); -- } -- - [pool release]; - } - -@@ -2071,12 +1952,6 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) - // register vga output callbacks - register_displaychangelistener(&dcl); - [cocoaView updateUIInfo]; -- -- qemu_event_init(&cbevent, false); -- cbowner = [[QemuCocoaPasteboardTypeOwner alloc] init]; -- qemu_clipboard_peer_register(&cbpeer); -- -- [pool release]; - } - - static QemuDisplay qemu_display_cocoa = { diff --git a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch deleted file mode 100644 index 08620da3b9632..0000000000000 --- a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff --git a/ui/cocoa.m b/ui/cocoa.m -index 25e0db9dd0..4af0712036 100644 ---- a/ui/cocoa.m -+++ b/ui/cocoa.m -@@ -93,6 +93,7 @@ static void cocoa_switch(DisplayChangeListener *dcl, - - static void cocoa_refresh(DisplayChangeListener *dcl); - -+static NSWindow *about_window; - static const DisplayChangeListenerOps dcl_ops = { - .dpy_name = "cocoa", - .dpy_gfx_update = cocoa_update, -@@ -1180,6 +1181,7 @@ - (void)changeDeviceMedia:(id)sender; - - (BOOL)verifyQuit; - - (void)openDocumentation:(NSString *)filename; - - (IBAction) do_about_menu_item: (id) sender; -+- (void)make_about_window; - - (void)adjustSpeed:(id)sender; - @end - -@@ -1227,6 +1229,8 @@ - (id) init - [pauseLabel setFont: [NSFont fontWithName: @"Helvetica" size: 90]]; - [pauseLabel setTextColor: [NSColor blackColor]]; - [pauseLabel sizeToFit]; -+ -+ [self make_about_window]; - } - return self; - } -@@ -1549,29 +1553,92 @@ - (BOOL)verifyQuit - /* The action method for the About menu item */ - - (IBAction) do_about_menu_item: (id) sender - { -- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -- char *icon_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png"); -- NSString *icon_path = [NSString stringWithUTF8String:icon_path_c]; -- g_free(icon_path_c); -- NSImage *icon = [[NSImage alloc] initWithContentsOfFile:icon_path]; -- NSString *version = @"QEMU emulator version " QEMU_FULL_VERSION; -- NSString *copyright = @QEMU_COPYRIGHT; -- NSDictionary *options; -- if (icon) { -- options = @{ -- NSAboutPanelOptionApplicationIcon : icon, -- NSAboutPanelOptionApplicationVersion : version, -- @"Copyright" : copyright, -- }; -- [icon release]; -- } else { -- options = @{ -- NSAboutPanelOptionApplicationVersion : version, -- @"Copyright" : copyright, -- }; -- } -- [NSApp orderFrontStandardAboutPanelWithOptions:options]; -- [pool release]; -+ [about_window makeKeyAndOrderFront: nil]; -+} -+ -+/* Create and display the about dialog */ -+- (void)make_about_window -+{ -+ /* Make the window */ -+ int x = 0, y = 0, about_width = 400, about_height = 200; -+ NSRect window_rect = NSMakeRect(x, y, about_width, about_height); -+ about_window = [[NSWindow alloc] initWithContentRect:window_rect -+ styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | -+ NSWindowStyleMaskMiniaturizable -+ backing:NSBackingStoreBuffered -+ defer:NO]; -+ [about_window setTitle: @"About"]; -+ [about_window setReleasedWhenClosed: NO]; -+ [about_window center]; -+ NSView *superView = [about_window contentView]; -+ -+ /* Create the dimensions of the picture */ -+ int picture_width = 80, picture_height = 80; -+ x = (about_width - picture_width)/2; -+ y = about_height - picture_height - 10; -+ NSRect picture_rect = NSMakeRect(x, y, picture_width, picture_height); -+ -+ /* Make the picture of QEMU */ -+ NSImageView *picture_view = [[NSImageView alloc] initWithFrame: -+ picture_rect]; -+ char *qemu_image_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png"); -+ NSString *qemu_image_path = [NSString stringWithUTF8String:qemu_image_path_c]; -+ g_free(qemu_image_path_c); -+ NSImage *qemu_image = [[NSImage alloc] initWithContentsOfFile:qemu_image_path]; -+ [picture_view setImage: qemu_image]; -+ [picture_view setImageScaling: NSImageScaleProportionallyUpOrDown]; -+ [superView addSubview: picture_view]; -+ -+ /* Make the name label */ -+ NSBundle *bundle = [NSBundle mainBundle]; -+ if (bundle) { -+ x = 0; -+ y = y - 25; -+ int name_width = about_width, name_height = 20; -+ NSRect name_rect = NSMakeRect(x, y, name_width, name_height); -+ NSTextField *name_label = [[NSTextField alloc] initWithFrame: name_rect]; -+ [name_label setEditable: NO]; -+ [name_label setBezeled: NO]; -+ [name_label setDrawsBackground: NO]; -+ [name_label setAlignment: NSTextAlignmentCenter]; -+ NSString *qemu_name = [[bundle executablePath] lastPathComponent]; -+ [name_label setStringValue: qemu_name]; -+ [superView addSubview: name_label]; -+ } -+ -+ /* Set the version label's attributes */ -+ x = 0; -+ y = 50; -+ int version_width = about_width, version_height = 20; -+ NSRect version_rect = NSMakeRect(x, y, version_width, version_height); -+ NSTextField *version_label = [[NSTextField alloc] initWithFrame: -+ version_rect]; -+ [version_label setEditable: NO]; -+ [version_label setBezeled: NO]; -+ [version_label setAlignment: NSTextAlignmentCenter]; -+ [version_label setDrawsBackground: NO]; -+ -+ /* Create the version string*/ -+ NSString *version_string; -+ version_string = [[NSString alloc] initWithFormat: -+ @"QEMU emulator version %s", QEMU_FULL_VERSION]; -+ [version_label setStringValue: version_string]; -+ [superView addSubview: version_label]; -+ -+ /* Make copyright label */ -+ x = 0; -+ y = 35; -+ int copyright_width = about_width, copyright_height = 20; -+ NSRect copyright_rect = NSMakeRect(x, y, copyright_width, copyright_height); -+ NSTextField *copyright_label = [[NSTextField alloc] initWithFrame: -+ copyright_rect]; -+ [copyright_label setEditable: NO]; -+ [copyright_label setBezeled: NO]; -+ [copyright_label setDrawsBackground: NO]; -+ [copyright_label setAlignment: NSTextAlignmentCenter]; -+ [copyright_label setStringValue: [NSString stringWithFormat: @"%s", -+ QEMU_COPYRIGHT]]; -+ [superView addSubview: copyright_label]; - } - - /* Used by the Speed menu items */ diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 0a9a802f70f37..ff7fa9f8a3b9b 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.13"; + version = "1.1.14"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - hash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; + hash = "sha256-7PYbSZqCQLTaeFppuNz5mxDlwEyLkA5zpdMhWy1tWmc="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/rvvm/default.nix b/pkgs/applications/virtualization/rvvm/default.nix index 2d6b7d3da0c50..4693999e8f111 100644 --- a/pkgs/applications/virtualization/rvvm/default.nix +++ b/pkgs/applications/virtualization/rvvm/default.nix @@ -15,7 +15,7 @@ assert lib.assertMsg (builtins.elem guiBackend ["sdl" "x11" "none"]) "Unsupported GUI backend"; assert lib.assertMsg (!(enableSDL && enableX11)) "RVVM can have only one GUI backend at a time"; -assert lib.assertMsg (stdenv.isDarwin -> !enableX11) "macOS supports only SDL GUI backend"; +assert lib.assertMsg (stdenv.hostPlatform.isDarwin -> !enableX11) "macOS supports only SDL GUI backend"; stdenv.mkDerivation rec { pname = "rvvm"; diff --git a/pkgs/applications/virtualization/sail-riscv/default.nix b/pkgs/applications/virtualization/sail-riscv/default.nix index cda1f5d6cb20f..ba98f6b2cd5a7 100644 --- a/pkgs/applications/virtualization/sail-riscv/default.nix +++ b/pkgs/applications/virtualization/sail-riscv/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/riscv/sail-riscv"; description = "Formal specification of the RISC-V architecture, written in Sail"; maintainers = with maintainers; [ genericnerdyusername ]; - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; license = licenses.bsd2; }; } diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 6237db9cd6991..c6cbdc8e2c76e 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -9,14 +9,14 @@ let callPackage (import ./generic.nix rec { pname = "apptainer"; - version = "1.3.3"; + version = "1.3.4"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; rev = "refs/tags/v${version}"; - hash = "sha256-xQZCQa9z1aJ2tVtxMlwcNhlm0EV/nn8OnbfaVZRm4JI="; + hash = "sha256-eByF0OpL1OKGq0wY7kw8Sv9sZuVE0K3TGIm4Chk9PC4="; }; # Update by running @@ -47,20 +47,20 @@ let callPackage (import ./generic.nix rec { pname = "singularity-ce"; - version = "4.1.4"; + version = "4.2.1"; projectName = "singularity"; src = fetchFromGitHub { owner = "sylabs"; repo = "singularity"; rev = "refs/tags/v${version}"; - hash = "sha256-+qwPzgwfF6A1c/rmSM/5T2N9/wVeWhMoAthj3eSQmh8="; + hash = "sha256-Go4um/bIgq2lCZvjJ2GR81XpA/JvjPholi1PzNG9Hz8="; }; # Update by running # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules" # at the root directory of the Nixpkgs repository - vendorHash = "sha256-dTqOSk8APLOsqwEiZ/IL8Zu1SR48MyEYPgRe6PC2nd8="; + vendorHash = "sha256-CRZ42NdmJhAkV6bkl5n7rEV4Tu/h65qF5qaQ4W5wQ3w="; # Do not build conmon and squashfuse from the Git submodule sources, # Use Nixpkgs provided version diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix index 1712685048115..d0e79c4f9812d 100644 --- a/pkgs/applications/virtualization/spike/default.nix +++ b/pkgs/applications/virtualization/spike/default.nix @@ -1,30 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, dtc, pkgsCross }: +{ lib, stdenv, fetchFromGitHub, dtc, pkgsCross }: stdenv.mkDerivation rec { pname = "spike"; - version = "1.1.0"; + version = "1.1.0-unstable-2024-09-21"; src = fetchFromGitHub { owner = "riscv"; repo = "riscv-isa-sim"; - rev = "v${version}"; - sha256 = "sha256-4D2Fezej0ioOOupw3kgMT5VLs+/jXQjwvek6v0AVMzI="; + rev = "de5094a1a901d77ff44f89b38e00fefa15d4018e"; + sha256 = "sha256-mAgR2VzDgeuIdmPEgrb+MaA89BnWfmNanOVidqn0cgc="; }; - patches = [ - (fetchpatch { - name = "fesvr-fix-compilation-with-gcc-13.patch"; - url = "https://github.com/riscv-software-src/riscv-isa-sim/commit/0a7bb5403d0290cea8b2356179d92e4c61ffd51d.patch"; - hash = "sha256-JUMTbGawvLkoOWKkruzLzUFQytVR3wqTlGu/eegRFEE="; - }) - ]; - nativeBuildInputs = [ dtc ]; enableParallelBuilding = true; postPatch = '' patchShebangs scripts/*.sh - patchShebangs tests/ebreak.py ''; doCheck = true; diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index cddad036d68e7..f233dc4f82ca6 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.18.0"; + version = "2.18.5"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-no05QZpvaF7Kn9lU26lXjimHJn7xHydmh7Rv50aXPm4="; + hash = "sha256-3mbO6HlJxEl9NZzJ8IaZWESqPzS7OTw+I+t0XH25D/Q="; }; sourceRoot = "."; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 228c2ed6cb9f8..8546f64a55b04 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection # for setup hook populating GI_TYPELIB_PATH docutils wrapGAppsHook3 - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ gst_all_1.gst-plugins-base @@ -54,7 +54,7 @@ python3.pkgs.buildPythonApplication rec { gsettings-desktop-schemas libosinfo gtksourceview4 ] ++ lib.optional spiceSupport spice-gtk; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ pygobject3 libvirt libxml2 requests cdrtools ]; @@ -74,7 +74,7 @@ python3.pkgs.buildPythonApplication rec { preFixup = '' glib-compile-schemas $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas - gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") + gappsWrapperArgs+=(--set PYTHONPATH "${python3.pkgs.makePythonPath dependencies}") # these are called from virt-install in initrdinject.py gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ cpio e2fsprogs file findutils gzip ]}") diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index a4e32f618a04f..2c368db8da945 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { gdbm spice-gtk spice-protocol - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap ]); diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3f27170311cde..437ceba29ce07 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -13,7 +13,7 @@ , javaBindings ? true, jdk # Almost doesn't affect closure size , pythonBindings ? false, python3 , extensionPack ? null, fakeroot -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio , enableHardening ? false , headless ? false , enable32bitGuests ? true diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index f3eea8a5c1713..965cca829d849 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -31,7 +31,6 @@ in stdenv.mkDerivation { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; nativeBuildInputs = [ patchelf makeWrapper virtualBoxNixGuestAdditionsBuilder ] ++ kernel.moduleBuildDependencies; - buildInputs = [ ]; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index e4d5673305f0d..b60875c381295 100644 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { ''} ''; - patchPhase = lib.optionalString enableMacOSGuests '' + postPatch = lib.optionalString enableMacOSGuests '' cp -R "${unlockerSrc}" unlocker/ substituteInPlace unlocker/unlocker.py --replace \ @@ -153,6 +153,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p \ $out/bin \ $out/etc/vmware \ @@ -324,7 +326,7 @@ stdenv.mkDerivation rec { sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe," $out/bin/vmplayer sed -i -e "s,@@BINARY@@,$out/bin/vmplayer," $out/share/applications/vmware-player.desktop - ## VMware OVF Tool compoment + ## VMware OVF Tool component echo "Installing VMware OVF Tool for Linux" unpacked="unpacked/vmware-ovftool" mkdir -p $out/lib/vmware-ovftool/ @@ -390,7 +392,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/* $out/lib/vmware/bin/* $out/lib/vmware/setup/* - # Harcoded pkexec hack + # Hardcoded pkexec hack for lib in "lib/vmware/lib/libvmware-mount.so/libvmware-mount.so" "lib/vmware/lib/libvmwareui.so/libvmwareui.so" "lib/vmware/lib/libvmware-fuseUI.so/libvmware-fuseUI.so" do sed -i -e "s,/usr/local/sbin,/run/vmware/bin," "$out/$lib" @@ -405,6 +407,8 @@ stdenv.mkDerivation rec { wrapProgram $out/lib/vmware/bin/vmware-vmx rm $out/lib/vmware/bin/vmware-vmx ln -s /run/wrappers/bin/vmware-vmx $out/lib/vmware/bin/vmware-vmx + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix deleted file mode 100644 index 15f769ef96981..0000000000000 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, testers -, vpcs -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "vpcs"; - version = "0.8.3"; - - src = fetchFromGitHub { - owner = "GNS3"; - repo = "vpcs"; - rev = "v${finalAttrs.version}"; - hash = "sha256-OKi4sC4fmKtkJkkpHZ6OfeIDaBafVrJXGXh1R6gLPFY="; - }; - - sourceRoot = "${finalAttrs.src.name}/src"; - - buildPhase = '' - runHook preBuild - - MKOPT="CC=${stdenv.cc.targetPrefix}cc" ./mk.sh ${stdenv.buildPlatform.linuxArch} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -D -m555 vpcs $out/bin/vpcs - install -D -m444 ../man/vpcs.1 $out/share/man/man1/vpcs.1 - - runHook postInstall - ''; - - enableParallelBuilding = true; - - passthru = { - tests.version = testers.testVersion { - package = vpcs; - command = "vpcs -v"; - }; - }; - - meta = with lib; { - description = "Simple virtual PC simulator"; - longDescription = '' - The VPCS (Virtual PC Simulator) can simulate up to 9 PCs. You can - ping/traceroute them, or ping/traceroute the other hosts/routers from the - VPCS when you study the Cisco routers in the dynamips. - ''; - inherit (finalAttrs.src.meta) homepage; - license = licenses.bsd2; - platforms = platforms.linux ++ platforms.darwin; - mainProgram = "vpcs"; - maintainers = with maintainers; [ anthonyroussel ]; - }; -}) diff --git a/pkgs/applications/virtualization/xen/4.16/default.nix b/pkgs/applications/virtualization/xen/4.16/default.nix deleted file mode 100644 index 27139ca06e8ee..0000000000000 --- a/pkgs/applications/virtualization/xen/4.16/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - fetchpatch, - callPackage, - ocaml-ng, - ... -}@genericDefinition: - -let - upstreamPatches = import ../generic/patches.nix { - inherit lib; - inherit fetchpatch; - }; - - upstreamPatchList = lib.lists.flatten ( - with upstreamPatches; - [ - XSA_458 - XSA_460 - XSA_461 - ] - ); -in - -callPackage (import ../generic/default.nix { - pname = "xen"; - branch = "4.16"; - version = "4.16.6"; - latest = false; - pkg = { - xen = { - rev = "4b33780de790bd438dd7cbb6143b410d94f0f049"; - hash = "sha256-2kcmfKwBo3w1U5CSxLSYSteqvzcJaB+cA7keVb3amyA="; - patches = [ ] ++ upstreamPatchList; - }; - qemu = { - rev = "c02cb236b5e4a76cf74e641cc35a0e3ebd3e52f3"; - hash = "sha256-LwlPry04az9QQowaDG2la8PYlGOUMbZaQAsCHxj+pwM="; - patches = [ ]; - }; - seaBIOS = { - rev = "d239552ce7220e448ae81f41515138f7b9e3c4db"; - hash = "sha256-UKMceJhIprN4/4Xe4EG2EvKlanxVcEi5Qcrrk3Ogiik="; - patches = [ ]; - }; - ovmf = { - rev = "7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"; - hash = "sha256-Qq2RgktCkJZBsq6Ch+6tyRHhme4lfcN7d2oQfxwhQt8="; - patches = [ ]; - }; - ipxe = { - rev = "3c040ad387099483102708bb1839110bc788cefb"; - hash = "sha256-y2QdZEoGsGUQjrrvD8YRa8VoqcZSr4tjLM//I/MrsLI="; - patches = [ ]; - }; - }; -}) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_14; } // genericDefinition) diff --git a/pkgs/applications/virtualization/xen/4.17/default.nix b/pkgs/applications/virtualization/xen/4.17/default.nix index 6887696fcfe94..d270c37f2ce83 100644 --- a/pkgs/applications/virtualization/xen/4.17/default.nix +++ b/pkgs/applications/virtualization/xen/4.17/default.nix @@ -16,9 +16,7 @@ let with upstreamPatches; [ QUBES_REPRODUCIBLE_BUILDS - XSA_458 - XSA_460 - XSA_461 + XSA_462 ] ); in @@ -26,12 +24,12 @@ in callPackage (import ../generic/default.nix { pname = "xen"; branch = "4.17"; - version = "4.17.4"; + version = "4.17.5"; latest = false; pkg = { xen = { - rev = "d530627aaa9b6e03c7f911434bb342fca3d13300"; - hash = "sha256-4ltQUzo4XPzGT/7fGt1hnNMqBQBVF7VP+WXD9ZaJcGo="; + rev = "430ce6cd936546ad883ecd1c85ddea32d790604b"; + hash = "sha256-UoMdXRW0yWSaQPPV0rgoTZVO2ghdnqWruBHn7+ZjKzI="; patches = [ ] ++ upstreamPatchList; }; qemu = { diff --git a/pkgs/applications/virtualization/xen/4.18/default.nix b/pkgs/applications/virtualization/xen/4.18/default.nix index ed2df662e26e6..21d6de13f1b03 100644 --- a/pkgs/applications/virtualization/xen/4.18/default.nix +++ b/pkgs/applications/virtualization/xen/4.18/default.nix @@ -16,9 +16,7 @@ let with upstreamPatches; [ QUBES_REPRODUCIBLE_BUILDS - XSA_458 - XSA_460 - XSA_461 + XSA_462 ] ); in @@ -26,12 +24,12 @@ in callPackage (import ../generic/default.nix { pname = "xen"; branch = "4.18"; - version = "4.18.2"; + version = "4.18.3"; latest = false; pkg = { xen = { - rev = "d152a0424677d8b78e00ed1270a583c5dafff16f"; - hash = "sha256-pHCjj+Bcy4xQfB9xHU9fccFwVdP2DXrUhdszwGvrdmY="; + rev = "bd51e573a730efc569646379cd59ccba967cde97"; + hash = "sha256-OFiFdpPCXR+sWjzFHCORtY4DkWyggvxkcsGdgEyO1ts="; patches = [ ] ++ upstreamPatchList; }; qemu = { diff --git a/pkgs/applications/virtualization/xen/4.19/default.nix b/pkgs/applications/virtualization/xen/4.19/default.nix index 5b8cf5d21788a..a1b1337042855 100644 --- a/pkgs/applications/virtualization/xen/4.19/default.nix +++ b/pkgs/applications/virtualization/xen/4.19/default.nix @@ -18,6 +18,7 @@ let QUBES_REPRODUCIBLE_BUILDS XSA_460 XSA_461 + XSA_462 ] ); in diff --git a/pkgs/applications/virtualization/xen/README.md b/pkgs/applications/virtualization/xen/README.md index 0df84ad8e4c25..07087e2fee230 100644 --- a/pkgs/applications/virtualization/xen/README.md +++ b/pkgs/applications/virtualization/xen/README.md @@ -15,17 +15,18 @@ </a> </p> -# Xen Hypervisor <a href="https://xenproject.org/"><img src="https://downloads.xenproject.org/Branding/Mascots/Xen-Fu-Panda-2000px.png" width="48px" align="top" alt="Xen Fu Panda"></a> +# Xen Project Hypervisor <a href="https://xenproject.org/"><img src="https://downloads.xenproject.org/Branding/Mascots/Xen-Fu-Panda-2000px.png" width="48px" align="top" alt="Xen Fu Panda"></a> -This directory includes the build recipes for the [Xen Hypervisor](https://xenproject.org/). +This directory includes the build recipes for the [Xen Project Hypervisor](https://xenproject.org/). -Some other notable packages that compose the Xen Ecosystem include: +Some other notable packages that compose the Xen Project Ecosystem include: - `ocamlPackages.xenstore`: Mirage's `oxenstore` implementation. - `ocamlPackages.vchan`: Mirage's `xen-vchan` implementation. - `ocamlPackages.xenstore-tool`: XAPI's `oxenstore` utilities. - `xen-guest-agent`: Guest drivers for UNIX domUs. - `win-pvdrivers`: Guest drivers for Windows domUs. +- `xtf`: The Xen Test Framework. ## Updating @@ -100,6 +101,8 @@ open a PR fixing the script, and update Xen manually: ``` Change the value of `xenToEvaluate` to evaluate all relevant Xen packages. +1. Run `xtf --all --host` as root when booted into the Xen update, and make + sure no tests fail. 1. Clean up your changes and commit them, making sure to follow the [Nixpkgs Contribution Guidelines](../../../../CONTRIBUTING.md). 1. Open a PR and await a review from the current maintainers. diff --git a/pkgs/applications/virtualization/xen/generic/default.nix b/pkgs/applications/virtualization/xen/generic/default.nix index d273f9b1f381d..d4d0d235eef21 100644 --- a/pkgs/applications/virtualization/xen/generic/default.nix +++ b/pkgs/applications/virtualization/xen/generic/default.nix @@ -25,7 +25,7 @@ versionDefinition: ncurses, ocamlPackages, perl, - python311Packages, + python3Packages, systemdMinimal, xz, yajl, @@ -98,14 +98,16 @@ let ]; # Inherit attributes from a versionDefinition. - inherit (versionDefinition) pname; - inherit (versionDefinition) branch; - inherit (versionDefinition) version; - inherit (versionDefinition) latest; - inherit (versionDefinition) pkg; + inherit (versionDefinition) + pname + branch + version + latest + pkg + ; # Mark versions older than minSupportedVersion as EOL. - minSupportedVersion = "4.16"; + minSupportedVersion = "4.17"; ## Pre-fetched Source Handling ## @@ -118,10 +120,9 @@ let lib.attrsets.optionalAttrs withInternalQEMU { qemu = { src = fetchgit { - url = "https://xenbits.xen.org/git-http/qemu-xen.git"; + url = "https://xenbits.xenproject.org/git-http/qemu-xen.git"; fetchSubmodules = true; - inherit (pkg.qemu) rev; - inherit (pkg.qemu) hash; + inherit (pkg.qemu) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.qemu) pkg.qemu.patches; path = "tools/qemu-xen"; @@ -130,9 +131,8 @@ let // lib.attrsets.optionalAttrs withInternalSeaBIOS { seaBIOS = { src = fetchgit { - url = "https://xenbits.xen.org/git-http/seabios.git"; - inherit (pkg.seaBIOS) rev; - inherit (pkg.seaBIOS) hash; + url = "https://xenbits.xenproject.org/git-http/seabios.git"; + inherit (pkg.seaBIOS) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" @@ -143,10 +143,9 @@ let // lib.attrsets.optionalAttrs withInternalOVMF { ovmf = { src = fetchgit { - url = "https://xenbits.xen.org/git-http/ovmf.git"; + url = "https://xenbits.xenproject.org/git-http/ovmf.git"; fetchSubmodules = true; - inherit (pkg.ovmf) rev; - inherit (pkg.ovmf) hash; + inherit (pkg.ovmf) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.ovmf) pkg.ovmf.patches; path = "tools/firmware/ovmf-dir-remote"; @@ -157,8 +156,7 @@ let src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - inherit (pkg.ipxe) rev; - inherit (pkg.ipxe) hash; + inherit (pkg.ipxe) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.ipxe) pkg.ipxe.patches; path = "tools/firmware/etherboot/ipxe.git"; @@ -317,8 +315,7 @@ let in stdenv.mkDerivation (finalAttrs: { - inherit pname; - inherit version; + inherit pname version; outputs = [ "out" # TODO: Split $out in $bin for binaries and $lib for libraries. @@ -326,13 +323,13 @@ stdenv.mkDerivation (finalAttrs: { "doc" # The full Xen documentation in HTML format. "dev" # Development headers. "boot" # xen.gz kernel, policy file if Flask is enabled, xen.efi if EFI is enabled. + # TODO: Python package to be in separate output/package. ]; # Main Xen source. src = fetchgit { - url = "https://xenbits.xen.org/git-http/xen.git"; - inherit (pkg.xen) rev; - inherit (pkg.xen) hash; + url = "https://xenbits.xenproject.org/git-http/xen.git"; + inherit (pkg.xen) rev hash; }; patches = @@ -349,10 +346,11 @@ stdenv.mkDerivation (finalAttrs: { flex pandoc pkg-config + python3Packages.setuptools ] ++ lib.lists.optionals withInternalQEMU [ ninja - python311Packages.sphinx + python3Packages.sphinx ]; buildInputs = [ @@ -366,7 +364,7 @@ stdenv.mkDerivation (finalAttrs: { lzo ncurses perl - python311Packages.python + python3Packages.python xz yajl zlib @@ -377,7 +375,7 @@ stdenv.mkDerivation (finalAttrs: { ocamlPackages.ocaml # Python Fixes - python311Packages.wrapPython + python3Packages.wrapPython ] ++ lib.lists.optionals withInternalQEMU [ glib @@ -430,8 +428,6 @@ stdenv.mkDerivation (finalAttrs: { "xen" # Build the Xen Hypervisor. "tools" # Build the userspace tools, such as `xl`. "docs" # Build the Xen Documentation - # TODO: Enable the Stubdomains target. This requires another pre-fetched source: mini-os. Currently, Xen appears to build a limited version of stubdomains which does not include mini-os. - # "stubdom" ]; enableParallelBuilding = true; @@ -536,8 +532,10 @@ stdenv.mkDerivation (finalAttrs: { ${deployPrefetchedSourcesPatches} '' # Patch shebangs for QEMU and OVMF build scripts. - + '' + + lib.strings.optionalString withInternalQEMU '' patchShebangs --build tools/qemu-xen/scripts/tracetool.py + '' + + lib.strings.optionalString withInternalOVMF '' patchShebangs --build tools/firmware/ovmf-dir-remote/OvmfPkg/build.sh tools/firmware/ovmf-dir-remote/BaseTools/BinWrappers/PosixLike/{AmlToC,BrotliCompress,build,GenFfs,GenFv,GenFw,GenSec,LzmaCompress,TianoCompress,Trim,VfrCompile} ''; @@ -640,79 +638,91 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = { - inherit branch; - # Short description for Xen. - description = - "Xen Hypervisor" - # The "and related components" addition is automatically hidden if said components aren't being built. - + lib.strings.optionalString (prefetchedSources != { }) " and related components" - # To alter the description inside the paranthesis, edit ./packages.nix. - + lib.strings.optionalString (lib.attrsets.hasAttrByPath [ + meta = + if + !(lib.attrsets.hasAttrByPath [ "meta" - "description" - ] packageDefinition) " (${packageDefinition.meta.description})"; - # Long description for Xen. - longDescription = - # Starts with the longDescription from ./packages.nix. - (packageDefinition.meta.longDescription or "") - + lib.strings.optionalString (!withInternalQEMU) ( - "\nUse with `qemu_xen_${lib.strings.stringAsChars (x: if x == "." then "_" else x) branch}`" - + lib.strings.optionalString latest " or `qemu_xen`" - + ".\n" - ) - # Then, if any of the optional with* components are being built, add the "Includes:" string. - + - lib.strings.optionalString - ( - withInternalQEMU - || withInternalSeaBIOS - || withInternalOVMF - || withInternalIPXE - || withEFI - || withFlask - ) - ( - "\nIncludes:" - # Originally, this was a call for the complicated withPrefetchedSources. Since there aren't - # that many optional components, we just use lib.strings.optionalString, because it's simpler. - # Optional components that aren't being built are automatically hidden. - + lib.strings.optionalString withEFI "\n* `xen.efi`: Xen's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package." - + lib.strings.optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package." - + lib.strings.optionalString withInternalQEMU "\n* `qemu-xen`: Xen's mirror of [QEMU](https://www.qemu.org/)." - + lib.strings.optionalString withInternalSeaBIOS "\n* `seabios-xen`: Xen's mirror of [SeaBIOS](https://www.seabios.org/SeaBIOS)." - + lib.strings.optionalString withInternalOVMF "\n* `ovmf-xen`: Xen's mirror of [OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF)." - + lib.strings.optionalString withInternalIPXE "\n* `ipxe-xen`: Xen's pinned version of [iPXE](https://ipxe.org/)." + ] versionDefinition) + then + { + inherit branch; + + # Short description for Xen. + description = + "Xen Project Hypervisor" + # The "and related components" addition is automatically hidden if said components aren't being built. + + lib.strings.optionalString (prefetchedSources != { }) " and related components" + # To alter the description inside the paranthesis, edit ./packages.nix. + + lib.strings.optionalString (lib.attrsets.hasAttrByPath [ + "meta" + "description" + ] packageDefinition) " (${packageDefinition.meta.description})"; + + # Long description for Xen. + longDescription = + # Starts with the longDescription from ./packages.nix. + (packageDefinition.meta.longDescription or "") + + lib.strings.optionalString (!withInternalQEMU) ( + "\nUse with `qemu_xen_${lib.strings.stringAsChars (x: if x == "." then "_" else x) branch}`" + + lib.strings.optionalString latest " or `qemu_xen`" + + ".\n" ) - # Finally, we write a notice explaining which vulnerabilities this Xen is NOT vulnerable to. - # This will hopefully give users the peace of mind that their Xen is secure, without needing - # to search the source code for the XSA patches. - + lib.strings.optionalString (writeAdvisoryDescription != [ ]) ( - "\n\nThis Xen (${version}) has been patched against the following known security vulnerabilities:\n" - + lib.strings.removeSuffix "\n" (lib.strings.concatLines writeAdvisoryDescription) - ); - homepage = "https://xenproject.org/"; - downloadPage = "https://downloads.xenproject.org/release/xen/${version}/"; - changelog = "https://wiki.xenproject.org/wiki/Xen_Project_${branch}_Release_Notes"; - license = with lib.licenses; [ - # Documentation. - cc-by-40 - # Most of Xen is licensed under the GPL v2.0. - gpl2Only - # Xen Libraries and the `xl` command-line utility. - lgpl21Only - # Development headers in $dev/include. - mit - ]; - # This automatically removes maintainers from EOL versions of Xen, so we aren't bothered about versions we don't explictly support. - maintainers = lib.lists.optionals (lib.strings.versionAtLeast version minSupportedVersion) ( - with lib.maintainers; [ sigmasquadron ] - ); - mainProgram = "xl"; - # Evaluates to x86_64-linux. - platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.x86_64; - knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version minSupportedVersion) [ - "Xen ${version} is no longer supported by the Xen Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html" - ]; - }; + # Then, if any of the optional with* components are being built, add the "Includes:" string. + + + lib.strings.optionalString + ( + withInternalQEMU + || withInternalSeaBIOS + || withInternalOVMF + || withInternalIPXE + || withEFI + || withFlask + ) + ( + "\nIncludes:" + # Originally, this was a call for the complicated withPrefetchedSources. Since there aren't + # that many optional components, we just use lib.strings.optionalString, because it's simpler. + # Optional components that aren't being built are automatically hidden. + + lib.strings.optionalString withEFI "\n* `xen.efi`: The Xen Project's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package." + + lib.strings.optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package." + + lib.strings.optionalString withInternalQEMU "\n* `qemu-xen`: The Xen Project's mirror of [QEMU](https://www.qemu.org/)." + + lib.strings.optionalString withInternalSeaBIOS "\n* `seabios-xen`: The Xen Project's mirror of [SeaBIOS](https://www.seabios.org/SeaBIOS)." + + lib.strings.optionalString withInternalOVMF "\n* `ovmf-xen`: The Xen Project's mirror of [OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF)." + + lib.strings.optionalString withInternalIPXE "\n* `ipxe-xen`: The Xen Project's pinned version of [iPXE](https://ipxe.org/)." + ) + # Finally, we write a notice explaining which vulnerabilities this Xen is NOT vulnerable to. + # This will hopefully give users the peace of mind that their Xen is secure, without needing + # to search the source code for the XSA patches. + + lib.strings.optionalString (writeAdvisoryDescription != [ ]) ( + "\n\nThis Xen Project Hypervisor (${version}) has been patched against the following known security vulnerabilities:\n" + + lib.strings.removeSuffix "\n" (lib.strings.concatLines writeAdvisoryDescription) + ); + + homepage = "https://xenproject.org/"; + downloadPage = "https://downloads.xenproject.org/release/xen/${version}/"; + changelog = "https://wiki.xenproject.org/wiki/Xen_Project_${branch}_Release_Notes"; + + license = with lib.licenses; [ + # Documentation. + cc-by-40 + # Most of Xen is licensed under the GPL v2.0. + gpl2Only + # Xen Libraries and the `xl` command-line utility. + lgpl21Only + # Development headers in $dev/include. + mit + ]; + + # This automatically removes maintainers from EOL versions of Xen, so we aren't bothered about versions we don't explictly support. + maintainers = lib.lists.optionals (lib.strings.versionAtLeast version minSupportedVersion) lib.teams.xen.members; + knownVulnerabilities = lib.lists.optional (lib.strings.versionOlder version minSupportedVersion) "The Xen Project Hypervisor version ${version} is no longer supported by the Xen Project Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html"; + + mainProgram = "xl"; + + # Evaluates to x86_64-linux. + platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.x86_64; + + } + else + versionDefinition.meta; }) diff --git a/pkgs/applications/virtualization/xen/generic/patches.nix b/pkgs/applications/virtualization/xen/generic/patches.nix index 33b4cdf8035e8..4bb58d5a42160 100644 --- a/pkgs/applications/virtualization/xen/generic/patches.nix +++ b/pkgs/applications/virtualization/xen/generic/patches.nix @@ -99,21 +99,6 @@ in }) ]; - # Xen Security Advisory #458: (4.16.6 - 4.19-rc3) - "XSA_458" = xsaPatch { - id = "458"; - title = "Double unlock in x86 guest IRQ handling"; - description = '' - An optional feature of PCI MSI called "Multiple Message" allows a device - to use multiple consecutive interrupt vectors. Unlike for MSI-X, the - setting up of these consecutive vectors needs to happen all in one go. - In this handling an error path could be taken in different situations, - with or without a particular lock held. This error path wrongly releases - the lock even when it is not currently held. - ''; - cve = [ "CVE-2024-31143" ]; - hash = "sha256-yHI9Sp/7Ed40iIYQ/HOOIULlfzAzL0c0MGqdF+GR+AQ="; - }; # Xen Security Advisory #460: (4.16.6 - 4.19.0) "XSA_460" = xsaPatch { id = "460"; @@ -149,4 +134,26 @@ in cve = [ "CVE-2024-31146" ]; hash = "sha256-JQWoqf47hy9WXNkVC/LgmjUhkxN0SBF6w8PF4aFZxhM="; }; + # Xen Security Advisory #462: (4.16.6 - 4.19.0) + "XSA_462" = xsaPatch { + id = "462"; + title = "x86: Deadlock in vlapic_error()"; + description = '' + In x86's APIC (Advanced Programmable Interrupt Controller) architecture, + error conditions are reported in a status register. Furthermore, the OS + can opt to receive an interrupt when a new error occurs. + + It is possible to configure the error interrupt with an illegal vector, + which generates an error when an error interrupt is raised. + + This case causes Xen to recurse through vlapic_error(). The recursion + itself is bounded; errors accumulate in the the status register and only + generate an interrupt when a new status bit becomes set. + + However, the lock protecting this state in Xen will try to be taken + recursively, and deadlock. + ''; + cve = [ "CVE-2024-45817" ]; + hash = "sha256-01lzjaT2f69UfEdTUCkm92DDOmd+Mo8sNPZsHJfgJEM="; + }; } diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 5f0f50ecd736c..fe759709770ff 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -1,65 +1,71 @@ -{ callPackage }: +{ + python3Packages, + python311Packages, + callPackage, +}: let standard = { + # Broken with python 3.12+ when using internal QEMU due to https://github.com/NixOS/nixpkgs/issues/253751 + python3Packages = python311Packages; meta = { - description = "Standard Xen"; + description = "Standard"; longDescription = '' - Standard version of Xen. Uses forks of QEMU, SeaBIOS, OVMF and iPXE provided - by the Xen Project. This provides the vanilla Xen experince, but wastes space - and build time. A typical NixOS setup that runs lots of VMs will usually need - to build two different versions of QEMU when using this Xen derivation (one - fork and upstream). + Standard version of the Xen Project Hypervisor. Uses forks of QEMU, SeaBIOS, + OVMF and iPXE provided by the Xen Project. This provides the vanilla Xen + experience, but wastes space and build time. A typical NixOS setup that runs + lots of VMs will usually need to build two different versions of QEMU when using + this Xen derivation (one fork and upstream). ''; }; }; slim = { + inherit python3Packages; meta = { description = "Without Internal Components"; longDescription = '' - Slimmed-down version of Xen that reuses nixpkgs packages as much as possible. - Instead of using the Xen forks for various internal components, this version uses - `seabios`, `ovmf` and `ipxe` from nixpkgs. These components may ocasionally get - out of sync with the hypervisor itself, but this builds faster and uses less space - than the default derivation. + Slimmed-down version of the Xen Project Hypervisor that reuses nixpkgs packages + as much as possible. Instead of using the Xen Project forks for various internal + components, this version uses `seabios`, `ovmf` and `ipxe` from Nixpkgs. These + components may ocasionally get out of sync with the hypervisor itself, but this + builds faster and uses less space than the default derivation. ''; }; }; in # TODO: generalise this to automatically generate both Xen variants for each ./<version>/default.nix. rec { - xen_4_19 = callPackage ./4.19/default.nix { inherit (standard) meta; }; + xen_4_19 = callPackage ./4.19/default.nix { + inherit (standard) meta python3Packages; + }; xen_4_19-slim = xen_4_19.override { withInternalQEMU = false; withInternalSeaBIOS = false; withInternalOVMF = false; withInternalIPXE = false; - inherit (slim) meta; + inherit (slim) meta python3Packages; }; - xen_4_18 = callPackage ./4.18/default.nix { inherit (standard) meta; }; + xen_4_18 = callPackage ./4.18/default.nix { + inherit (standard) meta python3Packages; + }; xen_4_18-slim = xen_4_18.override { withInternalQEMU = false; withInternalSeaBIOS = false; withInternalOVMF = false; withInternalIPXE = false; - inherit (slim) meta; + inherit (slim) meta python3Packages; }; - xen_4_17 = callPackage ./4.17/default.nix { inherit (standard) meta; }; - xen_4_17-slim = xen_4_17.override { - withInternalQEMU = false; - withInternalSeaBIOS = false; - withInternalOVMF = false; - withInternalIPXE = false; - inherit (slim) meta; + xen_4_17 = callPackage ./4.17/default.nix { + inherit (standard) meta python3Packages; }; - - xen_4_16 = callPackage ./4.16/default.nix { inherit (standard) meta; }; - xen_4_16-slim = xen_4_16.override { + xen_4_17-slim = xen_4_17.override { withInternalQEMU = false; withInternalSeaBIOS = false; withInternalOVMF = false; withInternalIPXE = false; inherit (slim) meta; + # Broken with python 3.12+ due to distutils missing. + python3Packages = python311Packages; }; } diff --git a/pkgs/applications/virtualization/xen/update.sh b/pkgs/applications/virtualization/xen/update.sh index 6ac8ba5a825ce..e5012768b4e85 100755 --- a/pkgs/applications/virtualization/xen/update.sh +++ b/pkgs/applications/virtualization/xen/update.sh @@ -5,6 +5,9 @@ set -o errexit set -o pipefail set -o nounset +#TODO: Use `jq` instead of `sed`. +#TODO: Accept the small security drawback and make this script runnable by r-ryantm. + # This script expects to be called in an interactive terminal somewhere inside Nixpkgs. echo "Preparing..." nixpkgs=$(git rev-parse --show-toplevel) @@ -22,7 +25,7 @@ userInputFingerprint=${userInputFingerprint:-"23E3222C145F4475FA8060A783FE14C957 # Clone xen.git. echo -e "Cloning \e[1;34mxen.git\e[0m..." -git clone --quiet https://xenbits.xen.org/git-http/xen.git /tmp/xenUpdateScript/xen +git clone --quiet https://xenbits.xenproject.org/git-http/xen.git /tmp/xenUpdateScript/xen cd /tmp/xenUpdateScript/xen # Get list of versions and branches. @@ -35,6 +38,8 @@ minSupportedBranch="$(grep " minSupportedVersion = " "$xenPath"/generic/default supportedBranches=($(for version in "${branchList[@]}"; do if [ "$(printf '%s\n' "$minSupportedBranch" "$version" | sort -V | head -n1)" = "$minSupportedBranch" ]; then echo "$version"; fi; done)) supportedVersions=($(for version in "${supportedBranches[@]}"; do echo "$versionList" | tr ' ' '\n' | grep "$version" | tail --lines=1; done)) +echo -e "\e[1mNOTE\e[0m: As we're also pre-fetching the submodules, QEMU and OVMF may take a very long time to fetch." + # Main loop that installs every supportedVersion. for version in "${supportedVersions[@]}"; do echo -e "\n------------------------------------------------" @@ -59,31 +64,33 @@ for version in "${supportedVersions[@]}"; do git switch --quiet --detach RELEASE-"$version" # Originally we told people to go check the Makefile themselves. - echo -e "\nDetermining source versions from Xen Makefiles..." - qemuVersion="$(grep -ie "QEMU_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"QEMU_UPSTREAM_REVISION ?= "//g)" - seaBIOSVersion="$(grep -ie "SEABIOS_UPSTREAM_REVISION ?= rel-" /tmp/xenUpdateScript/xen/Config.mk | sed s/"SEABIOS_UPSTREAM_REVISION ?= "//g)" - ovmfVersion="$(grep -ie "OVMF_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"OVMF_UPSTREAM_REVISION ?= "//g)" - ipxeVersion="$(grep -ie "IPXE_GIT_TAG :=" /tmp/xenUpdateScript/xen/tools/firmware/etherboot/Makefile | sed s/"IPXE_GIT_TAG := "//g)" + echo -e -n "\nDetermining source versions from Xen Makefiles..." + qemuVersion="$(grep "QEMU_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"QEMU_UPSTREAM_REVISION ?= "//g)" + seaBIOSVersion="$(grep "SEABIOS_UPSTREAM_REVISION ?= rel-" /tmp/xenUpdateScript/xen/Config.mk | sed s/"SEABIOS_UPSTREAM_REVISION ?= "//g)" + ovmfVersion="$(grep "OVMF_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"OVMF_UPSTREAM_REVISION ?= "//g)" + miniOSVersion="$(grep "MINIOS_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"MINIOS_UPSTREAM_REVISION ?= "//g)" + ipxeVersion="$(grep "IPXE_GIT_TAG :=" /tmp/xenUpdateScript/xen/tools/firmware/etherboot/Makefile | sed s/"IPXE_GIT_TAG := "//g)" + echo "done!" # Use `nix-prefetch-git` to fetch `rev`s and `hash`es. echo "Pre-fetching sources and determining hashes..." echo -e -n " \e[1;32mXen\e[0m..." - fetchXen=$(nix-prefetch-git --url https://xenbits.xen.org/git-http/xen.git --rev RELEASE-"$version" --quiet) + fetchXen=$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/xen.git --rev RELEASE-"$version" --quiet) finalVersion="$(echo "$fetchXen" | tr ', ' '\n ' | grep -ie rev | sed s/' "rev": "'//g | sed s/'"'//g)" hash="$(echo "$fetchXen" | tr ', ' '\n ' | grep -ie hash | sed s/' "hash": "'//g | sed s/'"'//g)" echo "done!" echo -e -n " \e[1;36mQEMU\e[0m..." - fetchQEMU=$(nix-prefetch-git --url https://xenbits.xen.org/git-http/qemu-xen.git --rev "$qemuVersion" --quiet --fetch-submodules) + fetchQEMU=$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/qemu-xen.git --rev "$qemuVersion" --quiet --fetch-submodules) finalQEMUVersion="$(echo "$fetchQEMU" | tr ', ' '\n ' | grep -ie rev | sed s/' "rev": "'//g | sed s/'"'//g)" qemuHash="$(echo "$fetchQEMU" | tr ', ' '\n ' | grep -ie hash | sed s/' "hash": "'//g | sed s/'"'//g)" echo "done!" echo -e -n " \e[1;36mSeaBIOS\e[0m..." - fetchSeaBIOS=$(nix-prefetch-git --url https://xenbits.xen.org/git-http/seabios.git --rev "$seaBIOSVersion" --quiet) + fetchSeaBIOS=$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/seabios.git --rev "$seaBIOSVersion" --quiet) finalSeaBIOSVersion="$(echo "$fetchSeaBIOS" | tr ', ' '\n ' | grep -ie rev | sed s/' "rev": "'//g | sed s/'"'//g)" seaBIOSHash="$(echo "$fetchSeaBIOS" | tr ', ' '\n ' | grep -ie hash | sed s/' "hash": "'//g | sed s/'"'//g)" echo "done!" echo -e -n " \e[1;36mOVMF\e[0m..." - ovmfHash="$(nix-prefetch-git --url https://xenbits.xen.org/git-http/ovmf.git --rev "$ovmfVersion" --quiet --fetch-submodules | grep -ie hash | sed s/' "hash": "'//g | sed s/'",'//g)" + ovmfHash="$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/ovmf.git --rev "$ovmfVersion" --quiet --fetch-submodules | grep -ie hash | sed s/' "hash": "'//g | sed s/'",'//g)" echo "done!" echo -e -n " \e[1;36miPXE\e[0m..." ipxeHash="$(nix-prefetch-git --url https://github.com/ipxe/ipxe.git --rev "$ipxeVersion" --quiet | grep -ie hash | sed s/' "hash": "'//g | sed s/'",'//g)" @@ -120,13 +127,13 @@ for version in "${supportedVersions[@]}"; do echo -e "Found the following patches:\n \e[1;32mXen\e[0m: \e[1;33m$discoveredXenPatchesEcho\e[0m\n \e[1;36mQEMU\e[0m: \e[1;33m$discoveredQEMUPatchesEcho\e[0m\n \e[1;36mSeaBIOS\e[0m: \e[1;33m$discoveredSeaBIOSPatchesEcho\e[0m\n \e[1;36mOVMF\e[0m: \e[1;33m$discoveredOVMFPatchesEcho\e[0m\n \e[1;36miPXE\e[0m: \e[1;33m$discoveredIPXEPatchesEcho\e[0m" # Prepare patches that are called in ./patches.nix. - defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_458" "XSA_460" "XSA_461" ) + defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_460" "XSA_461" ) read -r -a defaultPatchList -p $'\nWould you like to override the \e[1;34mupstreamPatches\e[0m list for \e[1;32mXen '"$version"$'\e[0m? If no, press \e[1;34menter\e[0m to use the default patch list: [ \e[1;34m'"${defaultPatchListInit[*]}"$' \e[0m]: ' defaultPatchList=(${defaultPatchList[@]:-${defaultPatchListInit[@]}}) upstreamPatches=${defaultPatchList[*]} # Write and format default.nix file. - echo -e "\nWriting updated \e[1;34mversionDefinition\e[0m..." + echo -e -n "\nWriting updated \e[1;34mversionDefinition\e[0m..." cat >"$branch"/default.nix <<EOF { lib, @@ -181,9 +188,11 @@ callPackage (import ../generic/default.nix { }; }) ({ ocamlPackages = ocaml-ng.ocamlPackages_$ocamlVersion; } // genericDefinition) EOF +echo done! - echo "Formatting..." + echo -n "Formatting..." nixfmt "$branch"/default.nix + echo done! echo -e "\n\e[1;32mSuccessfully produced $branch/default.nix.\e[0m" done diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index 2d66f8351411f..a9119975a7ae3 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.darwin; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/window-managers/dk/default.nix b/pkgs/applications/window-managers/dk/default.nix index a0efe1ad768f6..27d0e15492a70 100644 --- a/pkgs/applications/window-managers/dk/default.nix +++ b/pkgs/applications/window-managers/dk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dk"; - version = "2.2"; + version = "2.3"; src = fetchFromBitbucket { owner = "natemaia"; repo = "dk"; rev = "v${finalAttrs.version}"; - hash = "sha256-u1fZTcfGLwKFeRADU55MFYDvtSOaOg5qtWB90xYpVuY="; + hash = "sha256-VkNF3F/NRQadBkbnbVmMZliIXRxFU0qqxOeQDX4UrJg="; }; buildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix index 3952256b8d410..b24c905478e46 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # src/ewmh/ewmh.cpp:67:28: error: non-constant-expression cannot be narrowed from type 'int' to 'uint32_t' (aka 'unsigned int') in initializer list - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-c++11-narrowing"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-c++11-narrowing"; installPhase = '' runHook preInstall diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index 2970e724b3fda..91f57ad526d92 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -32,6 +32,7 @@ let { hyprgrass = import ./hyprgrass.nix; } { hyprscroller = import ./hyprscroller.nix; } { hyprspace = import ./hyprspace.nix; } + { hyprsplit = import ./hyprsplit.nix; } (import ./hyprland-plugins.nix) ]; in diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix index 8ae17d72877fc..574d2806b330a 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix @@ -7,13 +7,13 @@ }: mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; rev = "refs/tags/hl${version}"; - hash = "sha256-gyhpW3Mv9RgWsB8jAMoA7yoMSb01ol0jyPFNsghaZ0w="; + hash = "sha256-hBvwaMlgBuR2cB1Kx6cA1z7x38HXUujNcHtBsKhaEZs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix index be074e0c5e83e..38bcd12a7ffa4 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix @@ -28,5 +28,6 @@ mkHyprlandPlugin hyprland rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ donovanglover ]; platforms = lib.platforms.linux; + broken = true; # Doesn't work after Hyprland v0.41.2 https://gitee.com/DreamMaoMao/hycov/issues/IANYC8#note_31512295_link }; } 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 e81537db800d5..bb5a4dc9f6f60 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -14,13 +14,13 @@ let mkHyprlandPlugin, }: let - version = "0.42.0"; + version = "0.43.0"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; rev = "refs/tags/v${version}"; - hash = "sha256-aPzAbDgAyxJlUjyaFPDhjcL7WnyDP5uDZKOqlQRD8eM="; + hash = "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k="; }; in mkHyprlandPlugin hyprland { diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix index f94da804d370a..3d39c7d216dd9 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix @@ -9,13 +9,13 @@ mkHyprlandPlugin hyprland { pluginName = "hyprscroller"; - version = "0-unstable-2024-07-04"; + version = "0-unstable-2024-09-06"; src = fetchFromGitHub { owner = "dawsers"; repo = "hyprscroller"; - rev = "bef840b3f0fd3d37b5c1c9f2704b2efb60173184"; - hash = "sha256-vkpGSseA7n0/Y+83snbEe7Z++2akdDbvv7eZzM9V3wI="; + rev = "07671d7d42b92a85fc7e62cd8f02b0d9c52a8dea"; + hash = "sha256-RLI202fBXz+mDXX5Em70FU+16ChbA/YtpORYiOSX8uc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix new file mode 100644 index 0000000000000..13e51037fc9ca --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -0,0 +1,34 @@ +{ + lib, + meson, + fetchFromGitHub, + hyprland, + ninja, + mkHyprlandPlugin, +}: +mkHyprlandPlugin hyprland rec { + pluginName = "hyprsplit"; + version = "0.43.0"; + + src = fetchFromGitHub { + owner = "shezdy"; + repo = "hyprsplit"; + rev = "refs/tags/v${version}"; + hash = "sha256-r533kNIyfgPi/q8ddIYyDK1Pmupt/F3ncHuFo3zjDkU="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + meta = { + homepage = "https://github.com/shezdy/hyprsplit"; + description = "Hyprland plugin for awesome / dwm like workspaces"; + license = lib.licenses.bsd3; + inherit (hyprland.meta) platforms; + maintainers = with lib.maintainers; [ + aacebedo + ]; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix index 8553f292dcec1..771b3b1841a58 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , cairo , expat @@ -22,6 +23,7 @@ , util-linux , wayland , wayland-protocols +, wayland-scanner , hyprwayland-scanner , hyprutils }: @@ -37,10 +39,19 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-HIK7XJWQCM0BAnwW5uC7P0e7DAkVTy5jlxQ0NwoSy4M="; }; + patches = [ + # CMakeLists: look for wayland.xml protocol in wayland-scanner pkgdata + (fetchpatch { + url = "https://github.com/hyprwm/hyprpaper/commit/6c6e54faa84d2de94d2321eda43a8a669ebf3312.patch"; + hash = "sha256-Ns7HlUPVgBDIocZRGR6kIW58Mt92kJPQRMSKTvp6Vik="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config hyprwayland-scanner + wayland-scanner ]; buildInputs = [ @@ -77,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ wozeparrot fufexan ]; inherit (wayland.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "hyprpaper"; }; }) 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 322962123547c..ef479589d59b6 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 @@ -2,15 +2,16 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, - pkg-config, - wayland-scanner, makeWrapper, + pkg-config, wrapQtAppsHook, nix-update-script, + hyprland, hyprland-protocols, hyprlang, + hyprutils, + hyprwayland-scanner, libdrm, mesa, pipewire, @@ -18,35 +19,39 @@ qttools, qtwayland, sdbus-cpp, + slurp, systemd, wayland, wayland-protocols, - hyprland, - hyprpicker, - slurp, + wayland-scanner, }: stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-hyprland"; - version = "1.3.3"; + version = "1.3.6"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; - rev = "v${finalAttrs.version}"; - hash = "sha256-cyyxu/oj4QEFp3CVx2WeXa9T4OAUyynuBJHGkBZSxJI="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ cmake - pkg-config - wayland-scanner makeWrapper + pkg-config wrapQtAppsHook + hyprwayland-scanner ]; buildInputs = [ hyprland-protocols hyprlang + hyprutils libdrm mesa pipewire @@ -57,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { systemd wayland wayland-protocols + wayland-scanner ]; dontWrapQtApps = true; @@ -72,12 +78,7 @@ stdenv.mkDerivation (finalAttrs: { } wrapProgramShell $out/libexec/xdg-desktop-portal-hyprland \ - --prefix PATH ":" ${ - lib.makeBinPath [ - (placeholder "out") - hyprpicker - ] - } + --prefix PATH ":" ${lib.makeBinPath [ (placeholder "out") ]} ''; passthru = { diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 9b66a3279f8d3..acb05f4ac7713 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; # xvfb-run is available only on Linux - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' test_failed= diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/applications/window-managers/i3/lock-blur.nix index e3eabc547b5f9..dc8e8250135b6 100644 --- a/pkgs/applications/window-managers/i3/lock-blur.nix +++ b/pkgs/applications/window-managers/i3/lock-blur.nix @@ -29,6 +29,6 @@ i3lock-color.overrideAttrs (oldAttrs : rec { license = licenses.bsd3; maintainers = with maintainers; [ dan4ik605743 ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/i3lock-blur.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/i3lock-blur.x86_64-darwin }; }) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 584e13f553697..5a4c12a4474a7 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/applications/window-managers/jay/default.nix index 88ea73105a568..9eff972a0c609 100644 --- a/pkgs/applications/window-managers/jay/default.nix +++ b/pkgs/applications/window-managers/jay/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "jay"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "mahkoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iZTdhWHlorTAJTd3p2ZJbD5LRYkUmDAFjSEIR5E0JDI="; + sha256 = "sha256-cuXFkG2YwS0w4xzr7jpjr0QmVA5UJfk5SpjIQKxN/LY="; }; - cargoHash = "sha256-SEL7hpHcW+p49vFRedC1hDRZ/Vq9zMzMAACyyBXHwZM="; + cargoHash = "sha256-w3ARwQlehJq9uNSQmbUjiWik4a2W3Ax/6/BIsdDUfKM="; SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index ac9a17a489b75..2518d1fe42958 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -20,7 +20,16 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wn5DurPWFwSUtc5naEL4lBSQpKWTJkugpN9mKx+Ed2Y="; }; - cargoHash = "sha256-TylRxdpAVuGtZ3Lm8je6FZ0JUwetBi6mOGRoT2M3Jyk="; + cargoPatches = [ + # This pacth can be removed with the next version bump, it just updates the `time` crate + ./update-time-crate.patch + ]; + + # To show the "correct" git-hash in `leftwm-check` we manually set the GIT_HASH env variable + # can be remove together with the above patch + GIT_HASH = "36609e0 patched"; + + cargoHash = "sha256-SNq76pTAPSUGVRp/+fwCjSMP/lKVzh6wU+WZW5n/yjg="; buildInputs = rpathLibs; @@ -39,7 +48,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/leftwm/leftwm"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ yanganto ]; + maintainers = with lib.maintainers; [ vuimuich yanganto ]; changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG.md"; mainProgram = "leftwm"; }; diff --git a/pkgs/applications/window-managers/leftwm/update-time-crate.patch b/pkgs/applications/window-managers/leftwm/update-time-crate.patch new file mode 100644 index 0000000000000..f0c09b20d2868 --- /dev/null +++ b/pkgs/applications/window-managers/leftwm/update-time-crate.patch @@ -0,0 +1,57 @@ +From 9358bebb11df19f46d0813723959518498d812b2 Mon Sep 17 00:00:00 2001 +From: VuiMuich <vuimuich@quantentunnel.de> +Date: Mon, 2 Sep 2024 11:15:27 +0200 +Subject: [PATCH] fix rust 1.80.x for nixpkgs + +--- + Cargo.lock | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index f8a82eecf..5728b55bf 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -777,6 +777,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-traits" + version = "0.2.17" +@@ -1218,13 +1224,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.30" ++version = "0.3.35" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" ++checksum = "ef89ece63debf11bc32d1ed8d078ac870cbeb44da02afb02a9ff135ae7ca0582" + dependencies = [ + "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", + "powerfmt", + "serde", +@@ -1240,10 +1247,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.15" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index 97aa12e8ecd03..c23f1e799c35b 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "0-unstable-2024-08-14"; + version = "0-unstable-2024-08-31"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "2d00e8a61cb029cec96596897a1dada8033c601a"; - hash = "sha256-DB07IGFXLQj2LsU8iVZrSda0FS/efKUAolet8fK9Clo="; + rev = "2d754931f038865bd91938578b862262f0ce7c00"; + hash = "sha256-wmtAbajZ859tvLjKuwqFUq05VGLxHNJX1XyIXM6vvgU="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/owl/default.nix b/pkgs/applications/window-managers/owl/default.nix index 812e65830b333..15ba9de7d7537 100644 --- a/pkgs/applications/window-managers/owl/default.nix +++ b/pkgs/applications/window-managers/owl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { }; # use pregenerated nib files because generating them requires Xcode - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i "/ibtool/d" configure mkdir -p build/Owl.app/Contents/Resources/English.lproj cp ${./mac/MainMenu.nib} build/Owl.app/Contents/Resources/English.lproj/MainMenu.nib @@ -37,10 +37,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper wayland-scanner - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools darwin.bootstrap_cmds - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gnustep.make gnustep.wrapGNUstepAppsHook ]; @@ -48,9 +48,9 @@ stdenv.mkDerivation { buildInputs = [ libxkbcommon wayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gnustep.back gnustep.base gnustep.gui @@ -64,14 +64,14 @@ stdenv.mkDerivation { configureScript = "../configure"; # error: "Your gnustep-base was configured for the objc-nonfragile-abi but you are not using it now." - env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-fobjc-runtime=gnustep-2.0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-fobjc-runtime=gnustep-2.0"; installPhase = '' runHook preInstall mkdir -p $out/{Applications,bin} mv Owl.app $out/Applications - makeWrapper $out/{Applications/Owl.app${lib.optionalString stdenv.isDarwin "/Contents/MacOS"},bin}/Owl + makeWrapper $out/{Applications/Owl.app${lib.optionalString stdenv.hostPlatform.isDarwin "/Contents/MacOS"},bin}/Owl runHook postInstall ''; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 047e2dfda596b..bba1f204da6ae 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -17,8 +17,11 @@ , evince , glib , gtk4 -, gnome +, gnome-bluetooth +, gnome-control-center , gnome-desktop +, gnome-session +, gnome-shell , gcr , pam , systemd @@ -38,12 +41,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "phosh"; - version = "0.41.0"; + version = "0.41.1"; src = fetchurl { # Release tarball which includes subprojects gvc and libcall-ui url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-HXuD9YC7gqGqAq2YmhXI3WRGsvyBc6PgSW3YSYTOdI4="; + hash = "sha256-Oc6Dltjj+2D3LWZz1eYArqEKEJYYqJPSrScEkxyNhX0="; }; nativeBuildInputs = [ @@ -71,10 +74,10 @@ stdenv.mkDerivation (finalAttrs: { networkmanager polkit gmobile - gnome.gnome-bluetooth - gnome.gnome-control-center + gnome-bluetooth + gnome-control-center gnome-desktop - gnome.gnome-session + gnome-session gtk4 pam systemd @@ -109,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: { # Depends on GSettings schemas in gnome-shell preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}" - --set GNOME_SESSION "${gnome.gnome-session}/bin/gnome-session" + --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath gnome-shell}" + --set GNOME_SESSION "${gnome-session}/bin/gnome-session" ) ''; diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index ef1a90fd2b92e..52b413452e827 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, xorg }: +{ lib, stdenv, fetchFromGitHub, libbsd, pkg-config, xorg }: stdenv.mkDerivation (finalAttrs: { pname = "spectrwm"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "conformal"; repo = "spectrwm"; rev = "SPECTRWM_${lib.replaceStrings ["."] ["_"] finalAttrs.version}"; - hash = "sha256-Nlzo35OsNqFbR6nl3nnGXDWmwc8JlP4tyDuIGtKTnIY="; + hash = "sha256-Dnn/iIrceiAVuMR8iMGcc7LqNhWC496eT5gNrYOInRU="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = with xorg; [ + buildInputs = (with xorg; [ libXrandr libXcursor libXft @@ -20,10 +20,10 @@ stdenv.mkDerivation (finalAttrs: { xcbutil xcbutilkeysyms xcbutilwm - ]; + ] ++ [ libbsd ]); prePatch = let - subdir = if stdenv.isDarwin then "osx" else "linux"; + subdir = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; in "cd ${subdir}"; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index e9f8f245dfa7c..e0a76e2195352 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,10 +1,9 @@ { lib, stdenv, fetchurl , meson, ninja, pkg-config, python3, wayland-scanner -, cairo, libGL, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland -, wayland-protocols, xcbutilcursor +, cairo, libGL, libdisplay-info, libdrm, libevdev, libinput, libxkbcommon, mesa +, seatd, wayland, wayland-protocols, xcbutilcursor , demoSupport ? true -, hdrSupport ? true, libdisplay-info , jpegSupport ? true, libjpeg , lcmsSupport ? true, lcms2 , pangoSupport ? true, pango @@ -19,27 +18,19 @@ stdenv.mkDerivation rec { pname = "weston"; - version = "13.0.3"; + version = "14.0.0"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-J/aNluO5fZjare8TogI1ZSSST6OBQY+mcWuRNu8JkJM="; + hash = "sha256-R/0DJbC5SOmwA6OP306zqFgfP9x0C4kys1roeTv05KU="; }; - postPatch = '' - # raise neatvnc version bound to < 0.9.0 - # https://gitlab.freedesktop.org/wayland/weston/-/issues/890 - substituteInPlace libweston/backend-vnc/meson.build \ - --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '< 0.9.0']" - ''; - depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ - cairo libGL libdrm libevdev libinput libxkbcommon mesa seatd wayland - wayland-protocols - ] ++ lib.optional hdrSupport libdisplay-info - ++ lib.optional jpegSupport libjpeg + cairo libGL libdisplay-info libdrm libevdev libinput libxkbcommon mesa seatd + wayland wayland-protocols + ] ++ lib.optional jpegSupport libjpeg ++ lib.optional lcmsSupport lcms2 ++ lib.optional pangoSupport pango ++ lib.optional pipewireSupport pipewire diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index c31b3c80b8d4c..2e6d72b91071b 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib , desktopSupport ? "gnomeflashback", xorg , gtk2 -, gtk3, gnome, mate +, gtk3, gnome-panel, mate , libxfce4util, xfce4-panel }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib dbus-glib xorg.xcbutilwm ] - ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ] + ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome-panel ] ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; diff --git a/pkgs/build-support/add-driver-runpath/default.nix b/pkgs/build-support/add-driver-runpath/default.nix index 08547a4453c5f..56026b1fc908e 100644 --- a/pkgs/build-support/add-driver-runpath/default.nix +++ b/pkgs/build-support/add-driver-runpath/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { # Named "opengl-driver" for legacy reasons, but it is the path to # hardware drivers installed by NixOS - driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; + driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32"; buildCommand = '' mkdir -p $out/nix-support diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index ec0dfe7cc1443..12dfdc4b5122c 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -109,7 +109,7 @@ let # darwin, it seems that there is no standard such locale; luckily, # the referenced issue doesn't seem to surface on darwin. Hence let's # set this only on non-darwin. - LC_ALL = optionalString (!stdenv.isDarwin) "C.UTF-8"; + LC_ALL = optionalString (!stdenv.hostPlatform.isDarwin) "C.UTF-8"; meta = if meta.broken or false then meta // { hydraPlatforms = platforms.none; } else meta; diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 2d62855b258a4..983d59ac6f609 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { }; # TODO: drop this forced rebuild, as it was needed just once. - rebuild_salt = if stdenv.isDarwin && stdenv.isx86_64 then "J4AQ" else null; + rebuild_salt = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "J4AQ" else null; dontBuild = true; dontConfigure = true; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 6451feeabe3c9..a6b08042db993 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -205,6 +205,8 @@ rec { at-spi2-core pciutils # for FreeCAD pipewire # immersed-vr wayland support + + libsecret # For bitwarden ]; }; } diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 6e97d0cf00fab..b64e97345ab5c 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -10,15 +10,15 @@ , stdenvNoCC , runtimeShell , bintools ? null, libc ? null, coreutils ? null, gnugrep ? null -, netbsd ? null, netbsdCross ? null +, netbsd ? null , sharedLibraryLoader ? if libc == null then null else if stdenvNoCC.targetPlatform.isNetBSD then - if !(targetPackages ? netbsdCross) then + if !(targetPackages ? netbsd) then netbsd.ld_elf_so - else if libc != targetPackages.netbsdCross.headers then - targetPackages.netbsdCross.ld_elf_so + else if libc != targetPackages.netbsd.headers then + targetPackages.netbsd.ld_elf_so else null else diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 3ffff74f70e23..1131f73a1836a 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -64,7 +64,7 @@ let ; }; fBuildAttrs = fArgs // buildAttrs; - fFetchAttrs = fArgs // removeAttrs fetchAttrs [ "sha256" ]; + fFetchAttrs = fArgs // removeAttrs fetchAttrs [ "hash" "sha256" ]; bazelCmd = { cmd, additionalFlags, targets, targetRunFlags ? [ ] }: lib.optionalString (targets != [ ]) '' # See footnote called [USER and BAZEL_USE_CPP_ONLY_TOOLCHAIN variables] @@ -181,7 +181,7 @@ stdenv.mkDerivation (fBuildAttrs // { new_target="$(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,")" rm "$symlink" ln -sf "$new_target" "$symlink" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # on linux symlink permissions cannot be modified, so we modify those on darwin to match the linux ones ${chmodder}/bin/chmodder "$symlink" '' + '' @@ -197,8 +197,10 @@ stdenv.mkDerivation (fBuildAttrs // { dontFixup = true; allowedRequisites = []; - outputHashAlgo = "sha256"; - outputHash = fetchAttrs.sha256; + inherit (lib.fetchers.normalizeHash { hashTypes = [ "sha256" ]; } fetchAttrs) + outputHash + outputHashAlgo + ; }); nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (bazel.override { enableNixHacks = true; }) ]; diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index 67931a07dd401..4eeb3b0f169c8 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -12,6 +12,7 @@ , targetPkgs ? pkgs: [] , multiPkgs ? pkgs: [] , multiArch ? false # Whether to include 32bit packages +, nativeBuildInputs ? [] , extraBuildCommands ? "" , extraBuildCommandsMulti ? "" , extraOutputsToInstall ? [] @@ -34,7 +35,7 @@ # /lib will link to /lib32 let - inherit (stdenv) is64bit; + inherit (stdenv.hostPlatform) is64bit; name = if (args ? pname && args ? version) then "${args.pname}-${args.version}" @@ -257,6 +258,7 @@ let ''; in runCommandLocal "${name}-fhs" { + inherit nativeBuildInputs; passthru = { inherit args baseTargetPaths targetPaths baseMultiPaths ldconfig isMultiBuild; }; diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 398a99e80e8cd..5be1172352b5a 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -10,6 +10,7 @@ }: { runScript ? "bash" +, nativeBuildInputs ? [] , extraInstallCommands ? "" , meta ? {} , passthru ? {} @@ -125,12 +126,13 @@ let indentLines = str: concatLines (map (s: " " + s) (filter (s: s != "") (splitString "\n" str))); bwrapCmd = { initArgs ? "" }: '' - ${extraPreBwrapCmds} ignored=(/nix /dev /proc /etc ${optionalString privateTmp "/tmp"}) ro_mounts=() symlinks=() etc_ignored=() + ${extraPreBwrapCmds} + # loop through all entries of root in the fhs environment, except its /etc. for i in ${fhsenv}/*; do path="/''${i##*/}" @@ -270,7 +272,7 @@ let bin = writeShellScript "${name}-bwrap" (bwrapCmd { initArgs = ''"$@"''; }); in runCommandLocal name (nameAttrs // { - inherit meta; + inherit nativeBuildInputs meta; passthru = passthru // { env = runCommandLocal "${name}-shell-env" { diff --git a/pkgs/build-support/build-fhsenv-chroot/default.nix b/pkgs/build-support/build-fhsenv-chroot/default.nix index 6f0adfb4e08cb..b1d9630ae8f91 100644 --- a/pkgs/build-support/build-fhsenv-chroot/default.nix +++ b/pkgs/build-support/build-fhsenv-chroot/default.nix @@ -2,7 +2,7 @@ let buildFHSEnv = callPackage ./env.nix { }; in -args@{ name, version ? null, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: +args@{ name, version ? null, runScript ? "bash", nativeBuildInputs ? [], extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: let env = buildFHSEnv (removeAttrs args [ "version" "runScript" "extraInstallCommands" "meta" "passthru" ]); @@ -28,7 +28,7 @@ let nameAndVersion = name + versionStr; in runCommandLocal nameAndVersion { - inherit meta; + inherit nativeBuildInputs meta; passthru = passthru // { env = runCommandLocal "${name}-shell-env" { diff --git a/pkgs/build-support/build-fhsenv-chroot/env.nix b/pkgs/build-support/build-fhsenv-chroot/env.nix index 6a82435d7067c..105e2975f433e 100644 --- a/pkgs/build-support/build-fhsenv-chroot/env.nix +++ b/pkgs/build-support/build-fhsenv-chroot/env.nix @@ -4,6 +4,7 @@ , profile ? "" , targetPkgs ? pkgs: [] , multiPkgs ? pkgs: [] +, nativeBuildInputs ? [] , extraBuildCommands ? "" , extraBuildCommandsMulti ? "" , extraOutputsToInstall ? [] @@ -245,6 +246,7 @@ let in stdenv.mkDerivation { name = "${name}-fhs"; + inherit nativeBuildInputs; buildCommand = '' mkdir -p $out cd $out diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index f0e73901c8db0..0ac84b0005751 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -11,8 +11,8 @@ # Default native-image arguments. You probably don't want to set this, # except in special cases. In most cases, use extraNativeBuildArgs instead , nativeImageBuildArgs ? [ - (lib.optionalString stdenv.isDarwin "-H:-CheckToolchain") - (lib.optionalString (stdenv.isLinux && stdenv.isAarch64) "-H:PageSize=64K") + (lib.optionalString stdenv.hostPlatform.isDarwin "-H:-CheckToolchain") + (lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) "-H:PageSize=64K") "-H:Name=${executable}" "-march=compatibility" "--verbose" diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 542accd8fa11d..7717c5015cb7f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -152,8 +152,8 @@ let x86-64-v4 = versionAtLeast ccVersion "11.0"; # Intel - skylake = versionAtLeast ccVersion "6.0"; - skylake-avx512 = versionAtLeast ccVersion "6.0"; + skylake = true; + skylake-avx512 = true; cannonlake = versionAtLeast ccVersion "8.0"; icelake-client = versionAtLeast ccVersion "8.0"; icelake-server = versionAtLeast ccVersion "8.0"; @@ -164,7 +164,7 @@ let alderlake = versionAtLeast ccVersion "12.0"; # AMD - znver1 = versionAtLeast ccVersion "6.0"; + znver1 = true; znver2 = versionAtLeast ccVersion "9.0"; znver3 = versionAtLeast ccVersion "11.0"; znver4 = versionAtLeast ccVersion "13.0"; @@ -202,9 +202,9 @@ let else if targetPlatform.isAarch64 then (if isGNU then { - cortex-a53 = versionAtLeast ccVersion "4.8"; # gcc 8c075f - cortex-a72 = versionAtLeast ccVersion "5.1"; # gcc d8f70d - "cortex-a72.cortex-a53" = versionAtLeast ccVersion "5.1"; # gcc d8f70d + cortex-a53 = true; + cortex-a72 = true; + "cortex-a72.cortex-a53" = true; }.${tune} or false else if isClang then { @@ -688,7 +688,7 @@ stdenvNoCC.mkDerivation { '' + optionalString targetPlatform.isAndroid '' - echo "-D__ANDROID_API__=${targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags + echo "-D__ANDROID_API__=${targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags '' # There are a few tools (to name one libstdcxx5) which do not work @@ -752,6 +752,6 @@ stdenvNoCC.mkDerivation { (optionalAttrs (cc_ ? meta) (removeAttrs cc.meta ["priority"])) // { description = attrByPath ["meta" "description"] "System C compiler" cc_ + " (wrapper script)"; priority = 10; - mainProgram = if name != "" then name else ccName; + mainProgram = if name != "" then name else "${targetPrefix}${ccName}"; }; } diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index e55e22215daaf..866b0d3256c73 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, coqPackages, coq, which, fetchzip }@args: +{ lib, stdenv, coqPackages, coq, which, fetchzip, fetchurl }@args: let lib = import ./extra-lib.nix { @@ -71,7 +71,7 @@ let "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; fetch = import ../coq/meta-fetch/default.nix - { inherit lib stdenv fetchzip; } ({ + { inherit lib stdenv fetchzip fetchurl; } ({ inherit release releaseRev; location = { inherit domain owner repo; }; } // optionalAttrs (args?fetcher) {inherit fetcher;}); diff --git a/pkgs/build-support/coq/extra-lib.nix b/pkgs/build-support/coq/extra-lib.nix index 94de7c0113d84..76537484e266f 100644 --- a/pkgs/build-support/coq/extra-lib.nix +++ b/pkgs/build-support/coq/extra-lib.nix @@ -176,7 +176,7 @@ recursiveUpdate lib (rec { coqPackages.lib.overrideCoqDerivation { defaultVersion = "9999"; - release."9999".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dbbbhyfkw"; + release."9999".hash = "sha256-fDoP11rtrIM7+OLdMisv2EF7n/IbGuwFxHiPtg3qCNM="; } coqPackages.QuickChick; ``` diff --git a/pkgs/build-support/coq/meta-fetch/default.nix b/pkgs/build-support/coq/meta-fetch/default.nix index daed9faa3efed..ad0a69e29f2ce 100644 --- a/pkgs/build-support/coq/meta-fetch/default.nix +++ b/pkgs/build-support/coq/meta-fetch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }@args: +{ lib, stdenv, fetchurl, fetchzip }@args: let lib = import ../extra-lib.nix { @@ -28,11 +28,16 @@ let inherit (lib.strings) match split; - default-fetcher = {domain ? "github.com", owner ? "", repo, rev, name ? "source", sha256 ? null, ...}@args: - let ext = if args?sha256 then "zip" else "tar.gz"; - fmt = if args?sha256 then "zip" else "tarball"; + default-fetcher = {domain ? "github.com", owner ? "", repo, rev, name ? "source", sha256 ? null, artifact ? null, ...}@args: + let kind = switch-if [ + { cond = artifact != null; out = {ext = "tbz"; fmt = "tbz"; fetchfun = fetchurl; }; } + { cond = args?sha256 ; out = {ext = "zip"; fmt = "zip"; fetchfun = fetchzip; }; } + ] {ext = "tar.gz"; fmt = "tarball"; fetchfun = builtins.fetchTarball; }; in + with kind; let pr = match "^#(.*)$" rev; url = switch-if [ + { cond = pr == null && (match "^github.*" domain) != null && artifact != null; + out = "https://github.com/${owner}/${repo}/releases/download/${rev}/${artifact}"; } { cond = pr == null && (match "^github.*" domain) != null; out = "https://${domain}/${owner}/${repo}/archive/${rev}.${ext}"; } { cond = pr != null && (match "^github.*" domain) != null; @@ -42,7 +47,7 @@ let { cond = (match "(www.)?mpi-sws.org" domain) != null; out = "https://www.mpi-sws.org/~${owner}/${repo}/download/${repo}-${rev}.${ext}";} ] (throw "meta-fetch: no fetcher found for domain ${domain} on ${rev}"); - fetch = x: if args?sha256 then fetchzip (x // { inherit sha256; }) else builtins.fetchTarball x; + fetch = x: fetchfun (if args?sha256 then (x // { inherit sha256; }) else x); in fetch { inherit url ; }; in { @@ -50,8 +55,10 @@ in location, release ? {}, releaseRev ? (v: v), + releaseArtifact ? (v: null) }: -let isVersion = x: isString x && match "^/.*" x == null && release?${x}; +let + isVersion = x: isString x && match "^/.*" x == null && release?${x}; shortVersion = x: if (isString x && match "^/.*" x == null) then findFirst (v: versions.majorMinor v == x) null (sort versionAtLeast (attrNames release)) @@ -71,7 +78,7 @@ switch arg [ in { version = rv.version or v; - src = rv.src or fetcher (location // { rev = releaseRev v; } // rv); + src = rv.src or fetcher (location // { rev = releaseRev v; artifact = releaseArtifact v; } // rv); }; } { case = isString; diff --git a/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix index c99b8bbf325e9..bd1d2ac1b49c7 100644 --- a/pkgs/build-support/dart/build-dart-application/default.nix +++ b/pkgs/build-support/dart/build-dart-application/default.nix @@ -104,7 +104,7 @@ let dartFixupHook makeWrapper jq - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ] ++ # Ensure that we inherit the propagated build inputs from the dependencies. diff --git a/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py b/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py index fbb51960ad7b6..b3cd3e511f090 100644 --- a/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py +++ b/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py @@ -13,7 +13,7 @@ def eprint(text: str): if not os.path.exists("dub.selections.json"): eprint("The file `dub.selections.json` does not exist in the current working directory") - eprint("run `dub upgrade --annotate` to generate it") + eprint("run `dub upgrade` to generate it") sys.exit(1) with open("dub.selections.json") as f: diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 8e7371728029a..c19df29375399 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -907,6 +907,7 @@ rec { , config ? { } , architecture ? defaultArchitecture , created ? "1970-01-01T00:00:01Z" + , mtime ? "1970-01-01T00:00:01Z" , uid ? 0 , gid ? 0 , uname ? "root" @@ -924,7 +925,7 @@ rec { (lib.assertMsg (maxLayers > 1) "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"); assert - (lib.assertMsg (enableFakechroot -> !stdenv.isDarwin) '' + (lib.assertMsg (enableFakechroot -> !stdenv.hostPlatform.isDarwin) '' cannot use `enableFakechroot` because `proot` is not portable to Darwin. Workarounds: - use `fakeRootCommands` with the restricted `fakeroot` environment - cross-compile your packages @@ -1009,7 +1010,7 @@ rec { conf = runCommand "${baseName}-conf.json" { - inherit fromImage maxLayers created uid gid uname gname; + inherit fromImage maxLayers created mtime uid gid uname gname; imageName = lib.toLower name; preferLocalBuild = true; passthru.imageTag = @@ -1029,10 +1030,13 @@ rec { imageTag="${tag}" ''} - # convert "created" to iso format + # convert "created" and "mtime" to iso format if [[ "$created" != "now" ]]; then created="$(date -Iseconds -d "$created")" fi + if [[ "$mtime" != "now" ]]; then + mtime="$(date -Iseconds -d "$mtime")" + fi paths() { cat $paths ${lib.concatMapStringsSep " " @@ -1089,6 +1093,7 @@ rec { "customisation_layer", $customisation_layer, "repo_tag": $repo_tag, "created": $created, + "mtime": $mtime, "uid": $uid, "gid": $gid, "uname": $uname, @@ -1100,6 +1105,7 @@ rec { --arg customisation_layer ${customisationLayer} \ --arg repo_tag "$imageName:$imageTag" \ --arg created "$created" \ + --arg mtime "$mtime" \ --arg uid "$uid" \ --arg gid "$gid" \ --arg uname "$uname" \ diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index d3778625ccdf4..0078c1cb764ea 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -307,6 +307,15 @@ def add_bytes(tar, path, content, mtime): tar.addfile(ti, io.BytesIO(content)) +now = datetime.now(tz=timezone.utc) + + +def parse_time(s): + if s == "now": + return now + return datetime.fromisoformat(s) + + def main(): arg_parser = argparse.ArgumentParser( description=""" @@ -342,12 +351,8 @@ def main(): with open(args.conf, "r") as f: conf = json.load(f) - created = ( - datetime.now(tz=timezone.utc) - if conf["created"] == "now" - else datetime.fromisoformat(conf["created"]) - ) - mtime = int(created.timestamp()) + created = parse_time(conf["created"]) + mtime = int(parse_time(conf["mtime"]).timestamp()) uid = int(conf["uid"]) gid = int(conf["gid"]) uname = conf["uname"] diff --git a/pkgs/build-support/dotnet/add-nuget-deps/default.nix b/pkgs/build-support/dotnet/add-nuget-deps/default.nix new file mode 100644 index 0000000000000..bf3df815af8a5 --- /dev/null +++ b/pkgs/build-support/dotnet/add-nuget-deps/default.nix @@ -0,0 +1,108 @@ +{ + writeShellScript, + runtimeShell, + nix, + lib, + substituteAll, + nuget-to-nix, + cacert, + fetchNupkg, + callPackage, +}: + +{ + nugetDeps, + overrideFetchAttrs ? x: { }, +}: +fnOrAttrs: finalAttrs: +let + attrs = if builtins.isFunction fnOrAttrs then fnOrAttrs finalAttrs else fnOrAttrs; + + deps = + if (nugetDeps != null) then + if lib.isDerivation nugetDeps then + [ nugetDeps ] + else if lib.isList nugetDeps then + nugetDeps + else + assert (lib.isPath nugetDeps); + callPackage nugetDeps { fetchNuGet = fetchNupkg; } + else + [ ]; + + finalPackage = finalAttrs.finalPackage; + +in +attrs +// { + buildInputs = attrs.buildInputs or [ ] ++ deps; + + passthru = + attrs.passthru or { } + // { + nugetDeps = deps; + } + // lib.optionalAttrs (nugetDeps == null || lib.isPath nugetDeps) rec { + fetch-drv = + let + pkg' = finalPackage.overrideAttrs (old: { + buildInputs = attrs.buildInputs or [ ]; + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ cacert ]; + keepNugetConfig = true; + dontBuild = true; + doCheck = false; + dontInstall = true; + doInstallCheck = false; + dontFixup = true; + doDist = false; + }); + in + pkg'.overrideAttrs overrideFetchAttrs; + fetch-deps = + let + drv = builtins.unsafeDiscardOutputDependency fetch-drv.drvPath; + + innerScript = substituteAll { + src = ./fetch-deps.sh; + isExecutable = true; + inherit cacert; + nugetToNix = nuget-to-nix; + }; + + defaultDepsFile = + # Wire in the depsFile such that running the script with no args + # runs it agains the correct deps file by default. + # Note that toString is necessary here as it results in the path at + # eval time (i.e. to the file in your local Nixpkgs checkout) rather + # than the Nix store path of the path after it's been imported. + if lib.isPath nugetDeps && !lib.isStorePath nugetDeps then + toString nugetDeps + else + ''$(mktemp -t "${finalAttrs.pname or finalPackage.name}-deps-XXXXXX.nix")''; + + in + writeShellScript "${finalPackage.name}-fetch-deps" '' + set -eu + + echo 'fetching dependencies for' ${lib.escapeShellArg finalPackage.name} >&2 + + # this needs to be before TMPDIR is changed, so the output isn't deleted + # if it uses mktemp + depsFile=$(realpath "''${1:-${lib.escapeShellArg defaultDepsFile}}") + + export TMPDIR + TMPDIR=$(mktemp -d -t fetch-deps-${lib.escapeShellArg finalPackage.name}.XXXXXX) + trap 'chmod -R +w "$TMPDIR" && rm -fr "$TMPDIR"' EXIT + + export NUGET_HTTP_CACHE_PATH=''${NUGET_HTTP_CACHE_PATH-~/.local/share/NuGet/v3-cache} + + HOME=$TMPDIR/home + mkdir "$HOME" + + cd "$TMPDIR" + + NIX_BUILD_SHELL=${lib.escapeShellArg runtimeShell} ${nix}/bin/nix-shell \ + --pure --keep NUGET_HTTP_CACHE_PATH --run 'source '${lib.escapeShellArg innerScript}' '"''${depsFile@Q}" "${drv}" + ''; + }; +} diff --git a/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh b/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh new file mode 100644 index 0000000000000..af560b96fcd53 --- /dev/null +++ b/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh @@ -0,0 +1,11 @@ +set -e + +genericBuild + +( + echo -e "# This file was automatically generated by passthru.fetch-deps.\n# Please dont edit it manually, your changes might get overwritten!\n" + @nugetToNix@/bin/nuget-to-nix "${NUGET_PACKAGES%/}" +) > deps.nix + +mv deps.nix "$1" +echo "Succesfully wrote lockfile to $1" diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix index 466c1972899c0..2177000c3627e 100644 --- a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix @@ -1,4 +1,4 @@ -{ buildDotnetModule, emptyDirectory, mkNugetDeps, dotnet-sdk }: +{ buildDotnetModule, emptyDirectory, fetchNupkg, dotnet-sdk }: { pname , version @@ -23,13 +23,15 @@ buildDotnetModule (args // { src = emptyDirectory; - nugetDeps = mkNugetDeps { - name = pname; - nugetDeps = { fetchNuGet }: [ - (fetchNuGet { pname = nugetName; inherit version; sha256 = nugetSha256; hash = nugetHash; }) - ] ++ (nugetDeps fetchNuGet); - installable = true; - }; + buildInputs = [ + (fetchNupkg { + pname = nugetName; + inherit version; + sha256 = nugetSha256; + hash = nugetHash; + installable = true; + }) + ]; dotnetGlobalTool = true; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index c8ad6a174ce53..950a17b8b256d 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -7,21 +7,14 @@ writeShellScript, makeWrapper, dotnetCorePackages, - mkNugetDeps, - nuget-to-nix, cacert, - unzip, - yq, - nix, + addNuGetDeps, }: let transformArgs = finalAttrs: { - name ? "${args.pname}-${args.version}", - pname ? name, enableParallelBuilding ? true, - doCheck ? false, # Flags to pass to `makeWrapper`. This is done to avoid double wrapping. makeWrapperArgs ? [ ], @@ -67,7 +60,12 @@ let # platforms in meta.platforms which are supported by the sdk. runtimeId ? null, + # Test filters. This gets passed to `dotnet test --filter`, concatenated using `&`. + # You may also use `disabledTests` to filter tests based on their name. + # See https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details for more details. + testFilters ? [ ], # Tests to disable. This gets passed to `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all frameworks. + # You may also use `testFilters` to pass more generic filters to `dotnet test --filter`. # See https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details for more details. disabledTests ? [ ], # The project file to run unit tests against. This is usually referenced in the regular project file, but sometimes it needs to be manually set. @@ -107,31 +105,16 @@ let dotnetFixupHook ; - _nugetDeps = - if (nugetDeps != null) then - if lib.isDerivation nugetDeps then - nugetDeps - else - mkNugetDeps { - inherit name; - sourceFile = nugetDeps; - } - else - throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated by running the `passthru.fetch-deps` script."; - - nugetDepsFile = _nugetDeps.sourceFile; - inherit (dotnetCorePackages) systemToDotnetRid; in - # Not all args need to be passed through to mkDerivation - # TODO: We should probably filter out even more attrs - removeAttrs args [ "nugetDeps" ] + args // { dotnetInstallPath = installPath; dotnetExecutables = executables; dotnetBuildType = buildType; dotnetProjectFiles = projectFiles; dotnetTestProjectFiles = testProjectFiles; + dotnetTestFilters = testFilters; dotnetDisabledTests = disabledTests; dotnetRuntimeIds = lib.singleton ( if runtimeId != null then runtimeId else systemToDotnetRid stdenvNoCC.hostPlatform.system @@ -139,7 +122,21 @@ let dotnetRuntimeDeps = map lib.getLib runtimeDeps; dotnetSelfContainedBuild = selfContainedBuild; dotnetUseAppHost = useAppHost; - inherit useDotnetFromEnv; + + inherit + enableParallelBuilding + dotnetRestoreFlags + dotnetBuildFlags + dotnetTestFlags + dotnetInstallFlags + dotnetPackFlags + dotnetFlags + packNupkg + useDotnetFromEnv + nugetDeps + runtimeId + dotnet-sdk + ; nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ dotnetConfigureHook @@ -151,17 +148,9 @@ let cacert makeWrapper dotnet-sdk - unzip - yq ]; - buildInputs = - args.buildInputs or [ ] - ++ [ - dotnet-sdk.packages - _nugetDeps - ] - ++ projectReferences; + buildInputs = args.buildInputs or [ ] ++ dotnet-sdk.packages ++ projectReferences; # Parse the version attr into a format acceptable for the Version msbuild property # The actual version attr is saved in InformationalVersion, which accepts an arbitrary string @@ -201,60 +190,53 @@ let # executables propagatedSandboxProfile = toString dotnet-runtime.__propagatedSandboxProfile; - passthru = - { - nugetDeps = _nugetDeps; - } - // lib.optionalAttrs (!lib.isDerivation nugetDeps) { - fetch-deps = - let - pkg = finalAttrs.finalPackage.overrideAttrs ( - old: - { - buildInputs = lib.remove _nugetDeps old.buildInputs; - keepNugetConfig = true; - } - // lib.optionalAttrs (runtimeId == null) { - dotnetRuntimeIds = map (system: systemToDotnetRid system) platforms; - } - ); - - drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; - - innerScript = substituteAll { - src = ./fetch-deps.sh; - isExecutable = true; - defaultDepsFile = - # Wire in the nugetDeps file such that running the script with no args - # runs it agains the correct deps file by default. - # Note that toString is necessary here as it results in the path at - # eval time (i.e. to the file in your local Nixpkgs checkout) rather - # than the Nix store path of the path after it's been imported. - if lib.isPath nugetDepsFile && !lib.hasPrefix "${builtins.storeDir}/" (toString nugetDepsFile) then - toString nugetDepsFile - else - ''$(mktemp -t "${pname}-deps-XXXXXX.nix")''; - nugetToNix = (nuget-to-nix.override { inherit dotnet-sdk; }); - }; - - in - writeShellScript "${name}-fetch-deps" '' - NIX_BUILD_SHELL="${runtimeShell}" exec ${nix}/bin/nix-shell \ - --pure --run 'source "${innerScript}"' "${drv}" - ''; - } - // args.passthru or { }; - meta = (args.meta or { }) // { inherit platforms; }; }; + in fnOrAttrs: stdenvNoCC.mkDerivation ( finalAttrs: let - args = if lib.isFunction fnOrAttrs then fnOrAttrs (args // finalAttrs) else fnOrAttrs; + args = if lib.isFunction fnOrAttrs then fnOrAttrs (args' // finalAttrs) else fnOrAttrs; + args' = transformArgs finalAttrs args; + inherit (args') + nugetDeps + runtimeId + meta + dotnet-sdk + ; + args'' = removeAttrs args' [ + "nugetDeps" + "runtimeId" + "installPath" + "executables" + "projectFile" + "projectReferences" + "runtimeDeps" + "disabledTests" + "testProjectFile" + "buildType" + "selfContainedBuild" + "useDotnet" + "useAppHost" + "dotnet-sdk" + ]; in - transformArgs finalAttrs args + if nugetDeps != null then + addNuGetDeps { + inherit nugetDeps; + overrideFetchAttrs = + old: + lib.optionalAttrs ((args'.runtimeId or null) == null) rec { + dotnetRuntimeIds = map (system: dotnetCorePackages.systemToDotnetRid system) meta.platforms; + buildInputs = + old.buildInputs + ++ lib.concatLists (lib.attrValues (lib.getAttrs dotnetRuntimeIds dotnet-sdk.targetPackages)); + }; + } args'' finalAttrs + else + args'' ) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/fetch-deps.sh b/pkgs/build-support/dotnet/build-dotnet-module/fetch-deps.sh deleted file mode 100644 index c8d4282406212..0000000000000 --- a/pkgs/build-support/dotnet/build-dotnet-module/fetch-deps.sh +++ /dev/null @@ -1,22 +0,0 @@ -set -e - -tmp=$(mktemp -d) -trap 'chmod -R +w "$tmp" && rm -fr "$tmp"' EXIT - -HOME=$tmp/.home -cd "$tmp" - -phases=" - ${prePhases[*]:-} - unpackPhase - patchPhase - ${preConfigurePhases[*]:-} - configurePhase -" genericBuild - -depsFile=$(realpath "${1:-@defaultDepsFile@}") -tmpFile="$tmp"/deps.nix -echo -e "# This file was automatically generated by passthru.fetch-deps.\n# Please dont edit it manually, your changes might get overwritten!\n" > "$tmpFile" -@nugetToNix@/bin/nuget-to-nix "$NUGET_PACKAGES" >> "$tmpFile" -mv "$tmpFile" "$depsFile" -echo "Succesfully wrote lockfile to $depsFile" diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh index 4dc8b5a97a1f9..38ded5874ad21 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh @@ -9,6 +9,7 @@ dotnetCheckHook() { local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" ) local dotnetTestFlagsArray=( "${dotnetTestFlags[@]}" ) + local dotnetTestFiltersArray=( "${dotnetTestFilters[@]}" ) local dotnetDisabledTestsArray=( "${dotnetDisabledTests[@]}" ) local dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" ) local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" ) @@ -16,6 +17,7 @@ dotnetCheckHook() { local dotnetProjectFilesArray=($dotnetProjectFiles) local dotnetTestProjectFilesArray=($dotnetTestProjectFiles) local dotnetTestFlagsArray=($dotnetTestFlags) + local dotnetTestFiltersArray=($dotnetTestFilters) local dotnetDisabledTestsArray=($dotnetDisabledTests) local dotnetRuntimeDepsArray=($dotnetRuntimeDeps) local dotnetRuntimeIdsArray=($dotnetRuntimeIds) @@ -23,8 +25,12 @@ dotnetCheckHook() { if (( ${#dotnetDisabledTestsArray[@]} > 0 )); then local disabledTestsFilters=("${dotnetDisabledTestsArray[@]/#/FullyQualifiedName!=}") + dotnetTestFiltersArray=( "${dotnetTestFiltersArray[@]}" "${disabledTestsFilters[@]//,/%2C}" ) + fi + + if (( ${#dotnetTestFiltersArray[@]} > 0 )); then local OLDIFS="$IFS" IFS='&' - dotnetTestFlagsArray+=("--filter:${disabledTestsFilters[*]//,/%2C}") + dotnetTestFlagsArray+=("--filter:${dotnetTestFiltersArray[*]}") IFS="$OLDIFS" fi @@ -56,6 +62,7 @@ dotnetCheckHook() { -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ --configuration "$dotnetBuildType" \ + --no-restore \ --no-build \ --logger "console;verbosity=normal" \ "${runtimeIdFlagsArray[@]}" \ diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh index 1e421cb18ce10..4e08534f992e4 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh @@ -38,19 +38,7 @@ dotnetConfigureHook() { done } - find -iname nuget.config -print0 | while IFS= read -rd "" config; do - if [[ -n "${keepNugetConfig-}" ]]; then - # If we're keeping the existing configs, we'll add _nix everywhere, - # in case sources are cleared. - dotnet nuget add source "$nugetSource" -n _nix --configfile "$config" - else - # This will allow everything to fall through to our config in the - # build root. Deleting them causes some build failures. - xq -xi '.configuration={}' "$config" - fi - done - - if [[ -f .config/dotnet-tools.json || -f .dotnet-tools.json ]]; then + if [[ -f .config/dotnet-tools.json || -f dotnet-tools.json ]]; then dotnet tool restore fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh index a9701f2898b27..7b01a9f2c4c39 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh @@ -62,8 +62,6 @@ dotnetFromEnv' } dotnetFixupHook() { - echo "Executing dotnetFixupPhase" - local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}" local executable executableBasename @@ -94,10 +92,8 @@ dotnetFixupHook() { wrapDotnetProgram "$executable" "$out/bin/$executableBasename" \; done < <(find "$dotnetInstallPath" ! -name "*.dll" -executable -type f -print0) fi - - echo "Finished dotnetFixupPhase" } -if [[ -z "${dontDotnetFixup-}" ]]; then +if [[ -z "${dontFixup-}" && -z "${dontDotnetFixup-}" ]]; then preFixupPhases+=" dotnetFixupHook" fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh index 73d2863419a23..7b008a26d1c63 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh @@ -55,6 +55,7 @@ dotnetInstallHook() { -p:OverwriteReadOnlyFiles=true \ --output "$dotnetInstallPath" \ --configuration "$dotnetBuildType" \ + --no-restore \ --no-build \ "${runtimeIdFlagsArray[@]}" \ "${dotnetInstallFlagsArray[@]}" \ @@ -62,8 +63,6 @@ dotnetInstallHook() { done } - local -r pkgs=$PWD/.nuget-pack - dotnetPack() { local -r projectFile="${1-}" @@ -73,8 +72,9 @@ dotnetInstallHook() { -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ -p:OverwriteReadOnlyFiles=true \ - --output "$pkgs" \ + --output "$out/share/nuget/source" \ --configuration "$dotnetBuildType" \ + --no-restore \ --no-build \ --runtime "$runtimeId" \ "${dotnetPackFlagsArray[@]}" \ @@ -102,20 +102,6 @@ dotnetInstallHook() { fi fi - local -r unpacked="$pkgs/.unpacked" - for nupkg in "$pkgs"/*.nupkg; do - rm -rf "$unpacked" - unzip -qd "$unpacked" "$nupkg" - chmod -R +rw "$unpacked" - echo {} > "$unpacked"/.nupkg.metadata - local id version - id=$(xq -r '.package.metadata.id|ascii_downcase' "$unpacked"/*.nuspec) - version=$(xq -r '.package.metadata.version|ascii_downcase' "$unpacked"/*.nuspec) - mkdir -p "$out/share/nuget/packages/$id" - mv "$unpacked" "$out/share/nuget/packages/$id/$version" - # TODO: should we fix executable flags here? - done - runHook postInstall echo "Finished dotnetInstallHook" diff --git a/pkgs/build-support/dotnet/dotnetenv/build-solution.nix b/pkgs/build-support/dotnet/dotnetenv/build-solution.nix index b3372b9421777..9984db1cb2d3f 100644 --- a/pkgs/build-support/dotnet/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnet/dotnetenv/build-solution.nix @@ -31,41 +31,37 @@ stdenv.mkDerivation { ''; installPhase = '' - addDeps() - { - if [ -f $1/nix-support/dotnet-assemblies ] - then - for i in $(cat $1/nix-support/dotnet-assemblies) - do - windowsPath=$(cygpath --windows $i) - assemblySearchPaths="$assemblySearchPaths;$windowsPath" - - addDeps $i - done - fi + runHook preInstall + + addDeps() { + if [ -f $1/nix-support/dotnet-assemblies ]; then + for i in $(cat $1/nix-support/dotnet-assemblies); do + windowsPath=$(cygpath --windows $i) + assemblySearchPaths="$assemblySearchPaths;$windowsPath" + + addDeps $i + done + fi } - for i in ${toString assemblyInputs} - do - windowsPath=$(cygpath --windows $i) - echo "Using assembly path: $windowsPath" + for i in ${toString assemblyInputs}; do + windowsPath=$(cygpath --windows $i) + echo "Using assembly path: $windowsPath" - if [ "$assemblySearchPaths" = "" ] - then - assemblySearchPaths="$windowsPath" - else - assemblySearchPaths="$assemblySearchPaths;$windowsPath" - fi + if [ "$assemblySearchPaths" = "" ]; then + assemblySearchPaths="$windowsPath" + else + assemblySearchPaths="$assemblySearchPaths;$windowsPath" + fi - addDeps $i + addDeps $i done echo "Assembly search paths are: $assemblySearchPaths" - if [ "$assemblySearchPaths" != "" ] - then - echo "Using assembly search paths args: $assemblySearchPathsArg" - export AssemblySearchPaths=$assemblySearchPaths + if [ "$assemblySearchPaths" != "" ]; then + echo "Using assembly search paths args: $assemblySearchPathsArg" + export AssemblySearchPaths=$assemblySearchPaths fi mkdir -p $out @@ -77,9 +73,10 @@ stdenv.mkDerivation { mkdir -p $out/nix-support - for i in ${toString assemblyInputs} - do - echo $i >> $out/nix-support/dotnet-assemblies + for i in ${toString assemblyInputs}; do + echo $i >> $out/nix-support/dotnet-assemblies done + + runHook postInstall ''; } diff --git a/pkgs/build-support/dotnet/dotnetenv/wrapper.nix b/pkgs/build-support/dotnet/dotnetenv/wrapper.nix index 423303c3084a1..549abd07e2b99 100644 --- a/pkgs/build-support/dotnet/dotnetenv/wrapper.nix +++ b/pkgs/build-support/dotnet/dotnetenv/wrapper.nix @@ -28,27 +28,23 @@ dotnetenv.buildSolution { slnFile = "Wrapper.sln"; assemblyInputs = [ application ]; preBuild = '' - addRuntimeDeps() - { - if [ -f $1/nix-support/dotnet-assemblies ] - then - for i in $(cat $1/nix-support/dotnet-assemblies) - do - windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g') - assemblySearchArray="$assemblySearchArray @\"$windowsPath\"" + addRuntimeDeps() { + if [ -f $1/nix-support/dotnet-assemblies ]; then + for i in $(cat $1/nix-support/dotnet-assemblies); do + windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g') + assemblySearchArray="$assemblySearchArray @\"$windowsPath\"" - addRuntimeDeps $i - done - fi + addRuntimeDeps $i + done + fi } export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g') # Generate assemblySearchPaths string array contents - for path in ${toString assemblyInputs} - do - assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", " - addRuntimeDeps $path + for path in ${toString assemblyInputs}; do + assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", " + addRuntimeDeps $path done sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \ @@ -57,8 +53,8 @@ dotnetenv.buildSolution { sed -e "s|@NAMESPACE@|${namespace}|g" \ -e "s|@MAINCLASSNAME@|${mainClassName}|g" \ - -e "s|@EXEPATH@|$exePath|g" \ - -e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \ + -e "s|@EXEPATH@|$exePath|g" \ + -e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \ Wrapper/Wrapper.cs.in > Wrapper/Wrapper.cs ''; } diff --git a/pkgs/build-support/dotnet/fetch-nupkg/default.nix b/pkgs/build-support/dotnet/fetch-nupkg/default.nix new file mode 100644 index 0000000000000..e653bbb0376c0 --- /dev/null +++ b/pkgs/build-support/dotnet/fetch-nupkg/default.nix @@ -0,0 +1,88 @@ +{ + symlinkJoin, + fetchurl, + stdenvNoCC, + lib, + unzip, + patchNupkgs, + nugetPackageHook, + callPackage, + overrides ? callPackage ./overrides.nix { }, +}: +lib.makeOverridable ( + { + pname, + version, + sha256 ? "", + hash ? "", + url ? "https://www.nuget.org/api/v2/package/${pname}/${version}", + installable ? false, + }: + let + package = stdenvNoCC.mkDerivation rec { + inherit pname version; + + src = fetchurl { + name = "${pname}.${version}.nupkg"; + # There is no need to verify whether both sha256 and hash are + # valid here, because nuget-to-nix does not generate a deps.nix + # containing both. + inherit + url + sha256 + hash + version + ; + }; + + nativeBuildInputs = [ + unzip + patchNupkgs + nugetPackageHook + ]; + + unpackPhase = '' + runHook preUnpack + + unpackNupkg "$src" source + cd source + + runHook postUnpack + ''; + + prePatch = '' + shopt -s nullglob + local dir + for dir in tools runtimes/*/native; do + [[ ! -d "$dir" ]] || chmod -R +x "$dir" + done + rm -rf .signature.p7s + ''; + + installPhase = '' + runHook preInstall + + dir=$out/share/nuget/packages/${lib.toLower pname}/${lib.toLower version} + mkdir -p $dir + cp -r . $dir + echo {} > "$dir"/.nupkg.metadata + + runHook postInstall + ''; + + preFixup = '' + patch-nupkgs $out/share/nuget/packages + ''; + + createInstallableNugetSource = installable; + + meta = { + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + }; + }; + in + overrides.${pname} or lib.id package +) diff --git a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix new file mode 100644 index 0000000000000..923f8b4e917dd --- /dev/null +++ b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix @@ -0,0 +1,87 @@ +{ + autoPatchelfHook, + dotnetCorePackages, + fontconfig, + lib, + libICE, + libSM, + libX11, + stdenv, + writeText, +}: +{ + # e.g. + # "Package.Id" = + # package: + # package.overrideAttrs (old: { + # buildInputs = old.buildInputs or [ ] ++ [ hello ]; + # }); + + "Avalonia" = + package: + package.overrideAttrs ( + old: + let + # These versions have a runtime error when built with `dotnet publish --no-build` + # When attempting to draw a window, Avalonia will throw "No precompiled XAML found" + # + # Introduced in https://github.com/AvaloniaUI/Avalonia/pull/13840 + # Fixed by https://github.com/AvaloniaUI/Avalonia/pull/16835 + affectedVersions = [ + "11.1.0-beta1" + "11.1.0-beta2" + "11.1.0-rc1" + "11.1.0-rc2" + "11.1.0" + "11.1.1" + "11.1.2-rc1" + "11.1.2" + "11.1.3" + "11.2.0-beta1" + ]; + in + lib.optionalAttrs (builtins.elem old.version affectedVersions) { + postPatch = '' + substituteInPlace {build,buildTransitive}/AvaloniaBuildTasks.targets \ + --replace-fail 'BeforeTargets="CopyFilesToOutputDirectory;BuiltProjectOutputGroup"' \ + 'BeforeTargets="CopyFilesToOutputDirectory;BuiltProjectOutputGroup;ComputeResolvedFilesToPublishList"' + ''; + } + ); + + "Avalonia.X11" = + package: + package.overrideAttrs ( + old: + lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { + setupHook = writeText "setupHook.sh" '' + prependToVar dotnetRuntimeDeps \ + "${lib.getLib libICE}" \ + "${lib.getLib libSM}" \ + "${lib.getLib libX11}" + ''; + } + ); + + "SkiaSharp.NativeAssets.Linux" = + package: + package.overrideAttrs ( + old: + lib.optionalAttrs stdenv.hostPlatform.isLinux { + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ autoPatchelfHook ]; + + buildInputs = old.buildInputs or [ ] ++ [ fontconfig ]; + + preInstall = + old.preInstall or "" + + '' + cd runtimes + for platform in *; do + [[ $platform == "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ]] || + rm -r "$platform" + done + cd - >/dev/null + ''; + } + ); +} diff --git a/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/pkgs/build-support/dotnet/make-nuget-deps/default.nix index 341ab82ccddb5..efc3d07e97774 100644 --- a/pkgs/build-support/dotnet/make-nuget-deps/default.nix +++ b/pkgs/build-support/dotnet/make-nuget-deps/default.nix @@ -5,6 +5,7 @@ , unzip , patchNupkgs , nugetPackageHook +, fetchNupkg }: lib.makeOverridable( { name @@ -15,56 +16,7 @@ lib.makeOverridable( (symlinkJoin { name = "${name}-nuget-deps"; paths = nugetDeps { - fetchNuGet = - { pname - , version - , sha256 ? "" - , hash ? "" - , url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" }: - stdenvNoCC.mkDerivation rec { - inherit pname version; - - src = fetchurl { - name = "${pname}.${version}.nupkg"; - # There is no need to verify whether both sha256 and hash are - # valid here, because nuget-to-nix does not generate a deps.nix - # containing both. - inherit url sha256 hash version; - }; - - nativeBuildInputs = [ - unzip - patchNupkgs - nugetPackageHook - ]; - - unpackPhase = '' - unzip -nq $src - chmod -R +rw . - ''; - - prePatch = '' - shopt -s nullglob - local dir - for dir in tools runtimes/*/native; do - [[ ! -d "$dir" ]] || chmod -R +x "$dir" - done - rm -rf .signature.p7s - ''; - - installPhase = '' - dir=$out/share/nuget/packages/${lib.toLower pname}/${lib.toLower version} - mkdir -p $dir - cp -r . $dir - echo {} > "$dir"/.nupkg.metadata - ''; - - preFixup = '' - patch-nupkgs $out/share/nuget/packages - ''; - - createInstallableNugetSource = installable; - }; + fetchNuGet = args: fetchNupkg (args // { inherit installable; }); }; }) // { inherit sourceFile; diff --git a/pkgs/build-support/dotnet/nuget-to-nix/default.nix b/pkgs/build-support/dotnet/nuget-to-nix/default.nix index 3fdda4ac68d33..52f5f9906ba14 100644 --- a/pkgs/build-support/dotnet/nuget-to-nix/default.nix +++ b/pkgs/build-support/dotnet/nuget-to-nix/default.nix @@ -5,27 +5,26 @@ , nix , coreutils , jq -, yq +, xmlstarlet , curl , gnugrep , gawk -, dotnet-sdk +, cacert }: runCommandLocal "nuget-to-nix" { script = substituteAll { src = ./nuget-to-nix.sh; - inherit runtimeShell; + inherit runtimeShell cacert; binPath = lib.makeBinPath [ nix coreutils jq - yq + xmlstarlet curl gnugrep gawk - dotnet-sdk ]; }; diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index 902f010a74e6e..0e241ba536ebb 100755 --- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh +++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -3,7 +3,8 @@ set -euo pipefail shopt -s nullglob -export PATH="@binPath@" +export SSL_CERT_FILE=@cacert@/etc/ssl/certs/ca-bundle.crt +export PATH="@binPath@:$PATH" # used for glob ordering of package names export LC_ALL=C @@ -50,7 +51,7 @@ for package in *; do [[ -d "$package" ]] || continue cd "$package" for version in *; do - id=$(xq -r .package.metadata.id "$version"/*.nuspec) + id=$(xmlstarlet sel -t -v /_:package/_:metadata/_:id "$version"/*.nuspec) if grep -qxF "$id.$version.nupkg" "$excluded_list"; then continue diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/build-support/expand-response-params/default.nix index 6868ab97d8964..83972f6ed97a6 100644 --- a/pkgs/build-support/expand-response-params/default.nix +++ b/pkgs/build-support/expand-response-params/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; installPhase = '' mkdir -p $prefix/bin - mv expand-response-params $prefix/bin/ + mv expand-response-params${stdenv.hostPlatform.extensions.executable} $prefix/bin/ ''; meta = { @@ -38,5 +38,6 @@ stdenv.mkDerivation { ''; license = lib.licenses.mit; platforms = lib.platforms.all; + mainProgram = "expand-response-params${stdenv.hostPlatform.extensions.executable}"; }; } diff --git a/pkgs/build-support/fetchbzr/default.nix b/pkgs/build-support/fetchbzr/default.nix index b7db9e9274da3..1f6f0f2a788e2 100644 --- a/pkgs/build-support/fetchbzr/default.nix +++ b/pkgs/build-support/fetchbzr/default.nix @@ -1,15 +1,16 @@ -{ stdenvNoCC, breezy }: -{ url, rev, sha256 }: +{ lib, stdenvNoCC, breezy }: +lib.fetchers.withNormalizedHash { } ( + { url, rev, outputHash, outputHashAlgo }: -stdenvNoCC.mkDerivation { - name = "bzr-export"; + stdenvNoCC.mkDerivation { + name = "bzr-export"; - builder = ./builder.sh; - nativeBuildInputs = [ breezy ]; + builder = ./builder.sh; + nativeBuildInputs = [ breezy ]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - inherit url rev; -} + inherit url rev; + } +) diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr index dbe8a7ef80138..184f2485ce57b 100755 --- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr +++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr @@ -9,7 +9,7 @@ if test -z "$hashType"; then hashType=sha256 fi if test -z "$hashFormat"; then - hashFormat=--base32 + hashFormat=--sri fi if test -z "$url"; then diff --git a/pkgs/build-support/fetchcvs/default.nix b/pkgs/build-support/fetchcvs/default.nix index 43a10c3aa5529..94bbc69bba65a 100644 --- a/pkgs/build-support/fetchcvs/default.nix +++ b/pkgs/build-support/fetchcvs/default.nix @@ -6,17 +6,18 @@ {stdenvNoCC, cvs, openssh, lib}: lib.makeOverridable ( -{cvsRoot, module, tag ? null, date ? null, sha256}: + lib.fetchers.withNormalizedHash { } ( + {cvsRoot, module, tag ? null, date ? null, outputHash, outputHashAlgo}: -stdenvNoCC.mkDerivation { - name = "cvs-export"; - builder = ./builder.sh; - nativeBuildInputs = [cvs openssh]; + stdenvNoCC.mkDerivation { + name = "cvs-export"; + builder = ./builder.sh; + nativeBuildInputs = [cvs openssh]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - inherit cvsRoot module sha256 tag date; -} + inherit cvsRoot module tag date; + } + ) ) diff --git a/pkgs/build-support/fetchcvs/nix-prefetch-cvs b/pkgs/build-support/fetchcvs/nix-prefetch-cvs index b6a169f8b5316..4438f44026f2a 100755 --- a/pkgs/build-support/fetchcvs/nix-prefetch-cvs +++ b/pkgs/build-support/fetchcvs/nix-prefetch-cvs @@ -59,7 +59,7 @@ if test -z "$finalPath"; then (cd "$tmpPath" && cvs -f -z0 -d $cvsRoot export "${args[*]}" -d cvs-export $module >&2) # Compute the hash. - hash=$(nix-hash --type $hashType $hashFormat $tmpFile) + hash=$(nix-hash --type $hashType ${hashFormat:-"--sri"} $tmpFile) if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi # Add the downloaded file to the Nix store. diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 6073efec28159..320b201f2853c 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -1,21 +1,23 @@ {stdenvNoCC, darcs, cacert, lib}: lib.makeOverridable ( -{ url -, rev ? null -, context ? null -, sha256 ? "" -, name ? "fetchdarcs" -}: + lib.fetchers.withNormalizedHash { } ( + { url + , rev ? null + , context ? null + , outputHash ? lib.fakeHash + , outputHashAlgo ? null + , name ? "fetchdarcs" + }: -stdenvNoCC.mkDerivation { - builder = ./builder.sh; - nativeBuildInputs = [cacert darcs]; + stdenvNoCC.mkDerivation { + builder = ./builder.sh; + nativeBuildInputs = [cacert darcs]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - inherit url rev context name; -} + inherit url rev context name; + } + ) ) diff --git a/pkgs/build-support/fetchfossil/default.nix b/pkgs/build-support/fetchfossil/default.nix index 3f3bf69db0477..d0fc4cdea703d 100644 --- a/pkgs/build-support/fetchfossil/default.nix +++ b/pkgs/build-support/fetchfossil/default.nix @@ -1,33 +1,26 @@ {stdenv, lib, fossil, cacert}: -{ name ? null -, url -, rev -, sha256 ? "" -, hash ? "" -}: +lib.fetchers.withNormalizedHash { } ( + { name ? null + , url + , rev + , outputHash ? lib.fakeHash + , outputHashAlgo ? null + }: -if hash != "" && sha256 != "" then - throw "Only one of sha256 or hash can be set" -else -stdenv.mkDerivation { - name = "fossil-archive" + (lib.optionalString (name != null) "-${name}"); - builder = ./builder.sh; - nativeBuildInputs = [fossil cacert]; + stdenv.mkDerivation { + name = "fossil-archive" + (lib.optionalString (name != null) "-${name}"); + builder = ./builder.sh; + nativeBuildInputs = [fossil cacert]; - # Envvar docs are hard to find. A link for the future: - # https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md - impureEnvVars = [ "http_proxy" ]; + # Envvar docs are hard to find. A link for the future: + # https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md + impureEnvVars = [ "http_proxy" ]; - outputHashAlgo = if hash != "" then null else "sha256"; - outputHashMode = "recursive"; - outputHash = if hash != "" then - hash - else if sha256 != "" then - sha256 - else - lib.fakeSha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - inherit url rev; - preferLocalBuild = true; -} + inherit url rev; + preferLocalBuild = true; + } +) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 66bb3b7c09ffc..1b000fb49a99e 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -10,8 +10,9 @@ appendShort = lib.optionalString ((builtins.match "[a-f0-9]*" rev) != null) "-${short}"; in "${if matched == null then base else builtins.head matched}${appendShort}"; in -lib.makeOverridable ( -{ url, rev ? "HEAD", sha256 ? "", hash ? "", leaveDotGit ? deepClone +lib.makeOverridable (lib.fetchers.withNormalizedHash { } ( +{ url, rev ? "HEAD", leaveDotGit ? deepClone +, outputHash ? lib.fakeHash, outputHashAlgo ? null , fetchSubmodules ? true, deepClone ? false , branchName ? null , sparseCheckout ? [] @@ -56,9 +57,7 @@ lib.makeOverridable ( assert deepClone -> leaveDotGit; assert nonConeMode -> (sparseCheckout != []); -if hash != "" && sha256 != "" then - throw "Only one of sha256 or hash can be set" -else if builtins.isString sparseCheckout then +if builtins.isString sparseCheckout then # Changed to throw on 2023-06-04 throw "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more." else @@ -67,17 +66,11 @@ stdenvNoCC.mkDerivation { builder = ./builder.sh; fetcher = ./nix-prefetch-git; - nativeBuildInputs = [ git ] + nativeBuildInputs = [ git cacert ] ++ lib.optionals fetchLFS [ git-lfs ]; - outputHashAlgo = if hash != "" then null else "sha256"; + inherit outputHash outputHashAlgo; outputHashMode = "recursive"; - outputHash = if hash != "" then - hash - else if sha256 != "" then - sha256 - else - lib.fakeSha256; # git-sparse-checkout(1) says: # > When the --stdin option is provided, the directories or patterns are read @@ -94,8 +87,6 @@ stdenvNoCC.mkDerivation { export HOME=$PWD ''; - GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ netrcImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "NIX_GIT_SSL_CAINFO" "SOCKS_SERVER" ]; @@ -107,4 +98,4 @@ stdenvNoCC.mkDerivation { gitRepoUrl = url; }; } -) +)) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 0f41cbd6a265d..b921f161f012b 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -17,9 +17,9 @@ branchName=$NIX_PREFETCH_GIT_BRANCH_NAME out=${out:-} http_proxy=${http_proxy:-} -# allow overwriting cacert's ca-bundle.crt with a custom one -# this can be done by setting NIX_GIT_SSL_CAINFO and NIX_SSL_CERT_FILE environment variables for the nix-daemon -GIT_SSL_CAINFO=${NIX_GIT_SSL_CAINFO:-$GIT_SSL_CAINFO} +# NOTE: use of NIX_GIT_SSL_CAINFO is for backwards compatibility; NIX_SSL_CERT_FILE is preferred +# as of PR#303307 +GIT_SSL_CAINFO=${NIX_GIT_SSL_CAINFO:-$NIX_SSL_CERT_FILE} # populated by clone_user_rev() fullRev= diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix index 93f60c0a9cac8..5726e7d4e9f14 100644 --- a/pkgs/build-support/fetchgx/default.nix +++ b/pkgs/build-support/fetchgx/default.nix @@ -1,30 +1,31 @@ -{ stdenvNoCC, gx, gx-go, go, cacert }: +{ lib, stdenvNoCC, gx, gx-go, go, cacert }: -{ name, src, sha256 }: +lib.fetchers.withNormalizedHash { } ( + { name, src, outputHash, outputHashAlgo }: -stdenvNoCC.mkDerivation { - name = "${name}-gxdeps"; - inherit src; + stdenvNoCC.mkDerivation { + name = "${name}-gxdeps"; + inherit src; - nativeBuildInputs = [ cacert go gx gx-go ]; + nativeBuildInputs = [ cacert go gx gx-go ]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - dontConfigure = true; - doCheck = false; - doInstallCheck = false; + dontConfigure = true; + doCheck = false; + doInstallCheck = false; - buildPhase = '' - export GOPATH=$(pwd)/vendor - mkdir -p vendor - gx install - ''; + buildPhase = '' + export GOPATH=$(pwd)/vendor + mkdir -p vendor + gx install + ''; - installPhase = '' - mv vendor $out - ''; + installPhase = '' + mv vendor $out + ''; - preferLocalBuild = true; -} + preferLocalBuild = true; + } +) diff --git a/pkgs/build-support/fetchipfs/default.nix b/pkgs/build-support/fetchipfs/default.nix index 0cbb094d6003a..da94200206ba3 100644 --- a/pkgs/build-support/fetchipfs/default.nix +++ b/pkgs/build-support/fetchipfs/default.nix @@ -1,50 +1,36 @@ -{ stdenv +{ lib +, stdenv , curl }: - -{ ipfs -, url ? "" -, curlOpts ? "" -, outputHash ? "" -, outputHashAlgo ? "" -, md5 ? "" -, sha1 ? "" -, sha256 ? "" -, sha512 ? "" -, meta ? {} -, port ? "8080" -, postFetch ? "" -, preferLocalBuild ? true -}: - -let - - hasHash = (outputHash != "" && outputHashAlgo != "") - || md5 != "" || sha1 != "" || sha256 != "" || sha512 != ""; - -in - -if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" else stdenv.mkDerivation { - name = ipfs; - builder = ./builder.sh; - nativeBuildInputs = [ curl ]; - - # New-style output content requirements. - outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else - if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; - outputHash = if outputHash != "" then outputHash else - if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; - - outputHashMode = "recursive"; - - inherit curlOpts - postFetch - ipfs - url - port - meta; - - # Doing the download on a remote machine just duplicates network - # traffic, so don't do that. - inherit preferLocalBuild; -} +lib.fetchers.withNormalizedHash { hashTypes = [ "sha1" "sha256" "sha512" ]; } ( + { ipfs + , url ? "" + , curlOpts ? "" + , outputHash + , outputHashAlgo + , meta ? {} + , port ? "8080" + , postFetch ? "" + , preferLocalBuild ? true + }: + stdenv.mkDerivation { + name = ipfs; + builder = ./builder.sh; + nativeBuildInputs = [ curl ]; + + # New-style output content requirements. + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; + + inherit curlOpts + postFetch + ipfs + url + port + meta; + + # Doing the download on a remote machine just duplicates network + # traffic, so don't do that. + inherit preferLocalBuild; + } +) diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix index 4aa134242aa7e..de208b92193fe 100644 --- a/pkgs/build-support/fetchmtn/default.nix +++ b/pkgs/build-support/fetchmtn/default.nix @@ -1,25 +1,24 @@ # You can specify some extra mirrors and a cache DB via options {lib, stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: -# dbs is a list of strings -# each is an url for sync -# selector is mtn selector, like h:org.example.branch -# -{name ? "mtn-checkout", dbs ? [], sha256 -, selector ? "h:" + branch, branch}: +lib.fetchers.withNormalizedHash { } ( + # dbs is a list of strings, each is an url for sync + # selector is mtn selector, like h:org.example.branch + {name ? "mtn-checkout", dbs ? [] + , outputHash, outputHashAlgo + , selector ? "h:" + branch, branch}: -stdenvNoCC.mkDerivation { - builder = ./builder.sh; - nativeBuildInputs = [monotone]; + stdenvNoCC.mkDerivation { + builder = ./builder.sh; + nativeBuildInputs = [monotone]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - dbs = defaultDBMirrors ++ dbs; - inherit branch cacheDB name selector; + dbs = defaultDBMirrors ++ dbs; + inherit branch cacheDB name selector; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - -} + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + } +) diff --git a/pkgs/build-support/fetchpijul/default.nix b/pkgs/build-support/fetchpijul/default.nix index fd41cfa55355c..3aef7c035e729 100644 --- a/pkgs/build-support/fetchpijul/default.nix +++ b/pkgs/build-support/fetchpijul/default.nix @@ -45,12 +45,12 @@ else runHook postFixup ''; - outputHashAlgo = if hash != "" then null else "sha256"; + outputHashAlgo = null; outputHashMode = "recursive"; outputHash = if hash != "" then hash else - lib.fakeSha256; + lib.fakeHash; inherit url change state channel; diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix index a5e79c8d4ef97..354913574b0f2 100644 --- a/pkgs/build-support/fetchrepoproject/default.nix +++ b/pkgs/build-support/fetchrepoproject/default.nix @@ -1,83 +1,83 @@ { lib, stdenvNoCC, gitRepo, cacert, copyPathsToStore }: - -{ name, manifest, rev ? "HEAD", sha256 -# Optional parameters: -, repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "", manifestName ? "" -, localManifests ? [], createMirror ? false, useArchive ? false -}: - -assert repoRepoRev != "" -> repoRepoURL != ""; -assert createMirror -> !useArchive; - -let - inherit (lib) - concatMapStringsSep - concatStringsSep - fetchers - optionalString - ; - - extraRepoInitFlags = [ - (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}") - (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}") - (optionalString (referenceDir != "") "--reference=${referenceDir}") - (optionalString (manifestName != "") "--manifest-name=${manifestName}") - ]; - - repoInitFlags = [ - "--manifest-url=${manifest}" - "--manifest-branch=${rev}" - "--depth=1" - (optionalString createMirror "--mirror") - (optionalString useArchive "--archive") - ] ++ extraRepoInitFlags; - - local_manifests = copyPathsToStore localManifests; - -in stdenvNoCC.mkDerivation { - inherit name; - - inherit cacert manifest rev repoRepoURL repoRepoRev referenceDir; # TODO - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; - - preferLocalBuild = true; - enableParallelBuilding = true; - - impureEnvVars = fetchers.proxyImpureEnvVars ++ [ - "GIT_PROXY_COMMAND" "SOCKS_SERVER" - ]; - - nativeBuildInputs = [ gitRepo cacert ]; - - GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - buildCommand = '' - # Path must be absolute (e.g. for GnuPG: ~/.repoconfig/gnupg/pubring.kbx) - export HOME="$(pwd)" - - mkdir $out - cd $out - - mkdir .repo - ${optionalString (local_manifests != []) '' - mkdir .repo/local_manifests - for local_manifest in ${concatMapStringsSep " " toString local_manifests}; do - cp $local_manifest .repo/local_manifests/$(stripHash $local_manifest) - done - ''} - - repo init ${concatStringsSep " " repoInitFlags} - repo sync --jobs=$NIX_BUILD_CORES --current-branch - - # TODO: The git-index files (and probably the files in .repo as well) have - # different contents each time and will therefore change the final hash - # (i.e. creating a mirror probably won't work). - ${optionalString (!createMirror) '' - rm -rf .repo - find -type d -name '.git' -prune -exec rm -rf {} + - ''} - ''; -} +lib.fetchers.withNormalizedHash { } ( + { name, manifest, rev ? "HEAD", outputHash, outputHashAlgo + # Optional parameters: + , repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "", manifestName ? "" + , localManifests ? [], createMirror ? false, useArchive ? false + }: + + assert repoRepoRev != "" -> repoRepoURL != ""; + assert createMirror -> !useArchive; + + let + inherit (lib) + concatMapStringsSep + concatStringsSep + fetchers + optionalString + ; + + extraRepoInitFlags = [ + (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}") + (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}") + (optionalString (referenceDir != "") "--reference=${referenceDir}") + (optionalString (manifestName != "") "--manifest-name=${manifestName}") + ]; + + repoInitFlags = [ + "--manifest-url=${manifest}" + "--manifest-branch=${rev}" + "--depth=1" + (optionalString createMirror "--mirror") + (optionalString useArchive "--archive") + ] ++ extraRepoInitFlags; + + local_manifests = copyPathsToStore localManifests; + + in stdenvNoCC.mkDerivation { + inherit name; + + inherit cacert manifest rev repoRepoURL repoRepoRev referenceDir; # TODO + + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; + + preferLocalBuild = true; + enableParallelBuilding = true; + + impureEnvVars = fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" "SOCKS_SERVER" + ]; + + nativeBuildInputs = [ gitRepo cacert ]; + + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + buildCommand = '' + # Path must be absolute (e.g. for GnuPG: ~/.repoconfig/gnupg/pubring.kbx) + export HOME="$(pwd)" + + mkdir $out + cd $out + + mkdir .repo + ${optionalString (local_manifests != []) '' + mkdir .repo/local_manifests + for local_manifest in ${concatMapStringsSep " " toString local_manifests}; do + cp $local_manifest .repo/local_manifests/$(stripHash $local_manifest) + done + ''} + + repo init ${concatStringsSep " " repoInitFlags} + repo sync --jobs=$NIX_BUILD_CORES --current-branch + + # TODO: The git-index files (and probably the files in .repo as well) have + # different contents each time and will therefore change the final hash + # (i.e. creating a mirror probably won't work). + ${optionalString (!createMirror) '' + rm -rf .repo + find -type d -name '.git' -prune -exec rm -rf {} + + ''} + ''; + } +) diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index acad0749b6634..1dd6945a5cb55 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -1,36 +1,37 @@ { lib, runCommand, awscli }: +lib.fetchers.withNormalizedHash { } ( + { s3url + , name ? builtins.baseNameOf s3url + , outputHash + , outputHashAlgo + , region ? "us-east-1" + , credentials ? null # Default to looking at local EC2 metadata service + , recursiveHash ? false + , postFetch ? null + }: -{ s3url -, name ? builtins.baseNameOf s3url -, sha256 -, region ? "us-east-1" -, credentials ? null # Default to looking at local EC2 metadata service -, recursiveHash ? false -, postFetch ? null -}: + let + mkCredentials = { access_key_id, secret_access_key, session_token ? null }: { + AWS_ACCESS_KEY_ID = access_key_id; + AWS_SECRET_ACCESS_KEY = secret_access_key; + AWS_SESSION_TOKEN = session_token; + }; -let - mkCredentials = { access_key_id, secret_access_key, session_token ? null }: { - AWS_ACCESS_KEY_ID = access_key_id; - AWS_SECRET_ACCESS_KEY = secret_access_key; - AWS_SESSION_TOKEN = session_token; - }; + credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials); + in runCommand name ({ + nativeBuildInputs = [ awscli ]; - credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials); -in runCommand name ({ - nativeBuildInputs = [ awscli ]; + inherit outputHash outputHashAlgo; + outputHashMode = if recursiveHash then "recursive" else "flat"; - outputHashAlgo = "sha256"; - outputHash = sha256; - outputHashMode = if recursiveHash then "recursive" else "flat"; + preferLocalBuild = true; - preferLocalBuild = true; - - AWS_DEFAULT_REGION = region; -} // credentialAttrs) (if postFetch != null then '' - downloadedFile="$(mktemp)" - aws s3 cp ${s3url} $downloadedFile - ${postFetch} -'' else '' - aws s3 cp ${s3url} $out -'') + AWS_DEFAULT_REGION = region; + } // credentialAttrs) (if postFetch != null then '' + downloadedFile="$(mktemp)" + aws s3 cp ${s3url} $downloadedFile + ${postFetch} + '' else '' + aws s3 cp ${s3url} $out + '') +) diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix index ef72de61fe218..e798044e2ea16 100644 --- a/pkgs/build-support/fetchsvnssh/default.nix +++ b/pkgs/build-support/fetchsvnssh/default.nix @@ -1,17 +1,19 @@ -{stdenvNoCC, subversion, sshSupport ? true, openssh ? null, expect}: -{username, password, url, rev ? "HEAD", sha256 ? ""}: +{lib, stdenvNoCC, subversion, sshSupport ? true, openssh ? null, expect}: +{username, password +, url, rev ? "HEAD" +, outputHash ? lib.fakeHash, outputHashAlgo ? null}: +lib.fetchers.withNormalizedHash { } ( + stdenvNoCC.mkDerivation { + name = "svn-export-ssh"; + builder = ./builder.sh; + nativeBuildInputs = [subversion expect]; -stdenvNoCC.mkDerivation { - name = "svn-export-ssh"; - builder = ./builder.sh; - nativeBuildInputs = [subversion expect]; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + sshSubversion = ./sshsubversion.exp; - sshSubversion = ./sshsubversion.exp; - - inherit username password url rev sshSupport openssh; -} + inherit username password url rev sshSupport openssh; + } +) diff --git a/pkgs/build-support/fetchurl/boot.nix b/pkgs/build-support/fetchurl/boot.nix index 8f8c78b7a454a..4aa76094a843e 100644 --- a/pkgs/build-support/fetchurl/boot.nix +++ b/pkgs/build-support/fetchurl/boot.nix @@ -1,12 +1,15 @@ -let mirrors = import ./mirrors.nix; in +let + mirrors = import ./mirrors.nix; +in { system }: -{ url ? builtins.head urls -, urls ? [] -, sha256 ? "" -, hash ? "" -, name ? baseNameOf (toString url) +{ + url ? builtins.head urls, + urls ? [ ], + sha256 ? "", + hash ? "", + name ? baseNameOf (toString url), }: # assert exactly one hash is set @@ -14,12 +17,18 @@ assert hash != "" || sha256 != ""; assert hash != "" -> sha256 == ""; import <nix/fetchurl.nix> { - inherit system hash sha256 name; + inherit + system + hash + sha256 + name + ; url = # Handle mirror:// URIs. Since <nix/fetchurl.nix> currently # supports only one URI, use the first listed mirror. - let m = builtins.match "mirror://([a-z]+)/(.*)" url; in - if m == null then url - else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1); + let + m = builtins.match "mirror://([a-z]+)/(.*)" url; + in + if m == null then url else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1); } diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index a9c2c7c46d14d..e4a70743334b5 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -1,6 +1,12 @@ -{ lib, buildPackages ? { inherit stdenvNoCC; }, stdenvNoCC -, curl # Note that `curl' may be `null', in case of the native stdenvNoCC. -, cacert ? null }: +{ + lib, + buildPackages ? { + inherit stdenvNoCC; + }, + stdenvNoCC, + curl, # Note that `curl' may be `null', in case of the native stdenvNoCC. + cacert ? null, +}: let @@ -11,180 +17,255 @@ let # fetchurl instantiations via environment variables. This makes the # resulting store derivations (.drv files) much smaller, which in # turn makes nix-env/nix-instantiate faster. - mirrorsFile = - buildPackages.stdenvNoCC.mkDerivation ({ + mirrorsFile = buildPackages.stdenvNoCC.mkDerivation ( + { name = "mirrors-list"; strictDeps = true; builder = ./write-mirror-list.sh; preferLocalBuild = true; - } // mirrors); + } + // mirrors + ); # Names of the master sites that are mirrored (i.e., "sourceforge", # "gnu", etc.). sites = builtins.attrNames mirrors; - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - # This variable allows the user to pass additional options to curl - "NIX_CURL_FLAGS" + impureEnvVars = + lib.fetchers.proxyImpureEnvVars + ++ [ + # This variable allows the user to pass additional options to curl + "NIX_CURL_FLAGS" - # This variable allows the user to override hashedMirrors from the - # command-line. - "NIX_HASHED_MIRRORS" + # This variable allows the user to override hashedMirrors from the + # command-line. + "NIX_HASHED_MIRRORS" - # This variable allows overriding the timeout for connecting to - # the hashed mirrors. - "NIX_CONNECT_TIMEOUT" - ] ++ (map (site: "NIX_MIRRORS_${site}") sites); + # This variable allows overriding the timeout for connecting to + # the hashed mirrors. + "NIX_CONNECT_TIMEOUT" + ] + ++ (map (site: "NIX_MIRRORS_${site}") sites); in -{ # URL to fetch. - url ? "" +{ + # URL to fetch. + url ? "", -, # Alternatively, a list of URLs specifying alternative download + # Alternatively, a list of URLs specifying alternative download # locations. They are tried in order. - urls ? [] + urls ? [ ], -, # Additional curl options needed for the download to succeed. + # Additional curl options needed for the download to succeed. # Warning: Each space (no matter the escaping) will start a new argument. # If you wish to pass arguments with spaces, use `curlOptsList` - curlOpts ? "" + curlOpts ? "", -, # Additional curl options needed for the download to succeed. - curlOptsList ? [] + # Additional curl options needed for the download to succeed. + curlOptsList ? [ ], -, # Name of the file. If empty, use the basename of `url' (or of the + # Name of the file. If empty, use the basename of `url' (or of the # first element of `urls'). - name ? "" + name ? "", # for versioned downloads optionally take pname + version. -, pname ? "" -, version ? "" + pname ? "", + version ? "", -, # SRI hash. - hash ? "" + # SRI hash. + hash ? "", -, # Legacy ways of specifying the hash. - outputHash ? "" -, outputHashAlgo ? "" -, sha1 ? "" -, sha256 ? "" -, sha512 ? "" + # Legacy ways of specifying the hash. + outputHash ? "", + outputHashAlgo ? "", + sha1 ? "", + sha256 ? "", + sha512 ? "", -, recursiveHash ? false + recursiveHash ? false, -, # Shell code to build a netrc file for BASIC auth - netrcPhase ? null + # Shell code to build a netrc file for BASIC auth + netrcPhase ? null, -, # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes) + # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes) # needed for netrcPhase - netrcImpureEnvVars ? [] + netrcImpureEnvVars ? [ ], -, # Shell code executed after the file has been fetched + # Shell code executed after the file has been fetched # successfully. This can do things like check or transform the file. - postFetch ? "" + postFetch ? "", -, # Whether to download to a temporary path rather than $out. Useful + # Whether to download to a temporary path rather than $out. Useful # in conjunction with postFetch. The location of the temporary file # is communicated to postFetch via $downloadedFile. - downloadToTemp ? false + downloadToTemp ? false, -, # If true, set executable bit on downloaded file - executable ? false + # If true, set executable bit on downloaded file + executable ? false, -, # If set, don't download the file, but write a list of all possible + # If set, don't download the file, but write a list of all possible # URLs (resulting from resolving mirror:// URLs) to $out. - showURLs ? false + showURLs ? false, -, # Meta information, if any. - meta ? {} + # Meta information, if any. + meta ? { }, # Passthru information, if any. -, passthru ? {} + passthru ? { }, # Doing the download on a remote machine just duplicates network # traffic, so don't do that by default -, preferLocalBuild ? true + preferLocalBuild ? true, # Additional packages needed as part of a fetch -, nativeBuildInputs ? [ ] + nativeBuildInputs ? [ ], }: let urls_ = - if urls != [] && url == "" then - (if lib.isList urls then urls - else throw "`urls` is not a list") - else if urls == [] && url != "" then - (if lib.isString url then [url] - else throw "`url` is not a string") - else throw "fetchurl requires either `url` or `urls` to be set"; + if urls != [ ] && url == "" then + (if lib.isList urls then urls else throw "`urls` is not a list") + else if urls == [ ] && url != "" then + (if lib.isString url then [ url ] else throw "`url` is not a string") + else + throw "fetchurl requires either `url` or `urls` to be set"; hash_ = - if with lib.lists; length (filter (s: s != "") [ hash outputHash sha1 sha256 sha512 ]) > 1 - then throw "multiple hashes passed to fetchurl" else - - if hash != "" then { outputHashAlgo = null; outputHash = hash; } + if + with lib.lists; + length ( + filter (s: s != "") [ + hash + outputHash + sha1 + sha256 + sha512 + ] + ) > 1 + then + throw "multiple hashes passed to fetchurl" + else + + if hash != "" then + { + outputHashAlgo = null; + outputHash = hash; + } else if outputHash != "" then - if outputHashAlgo != "" then { inherit outputHashAlgo outputHash; } - else throw "fetchurl was passed outputHash without outputHashAlgo" - else if sha512 != "" then { outputHashAlgo = "sha512"; outputHash = sha512; } - else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; } - else if sha1 != "" then { outputHashAlgo = "sha1"; outputHash = sha1; } - else if cacert != null then { outputHashAlgo = "sha256"; outputHash = ""; } - else throw "fetchurl requires a hash for fixed-output derivation: ${lib.concatStringsSep ", " urls_}"; + if outputHashAlgo != "" then + { inherit outputHashAlgo outputHash; } + else + throw "fetchurl was passed outputHash without outputHashAlgo" + else if sha512 != "" then + { + outputHashAlgo = "sha512"; + outputHash = sha512; + } + else if sha256 != "" then + { + outputHashAlgo = "sha256"; + outputHash = sha256; + } + else if sha1 != "" then + { + outputHashAlgo = "sha1"; + outputHash = sha1; + } + else if cacert != null then + { + outputHashAlgo = "sha256"; + outputHash = ""; + } + else + throw "fetchurl requires a hash for fixed-output derivation: ${lib.concatStringsSep ", " urls_}"; in -assert (lib.isList curlOpts) -> lib.warn '' - fetchurl for ${toString (builtins.head urls_)}: curlOpts is a list (${lib.generators.toPretty { multiline = false; } curlOpts}), which is not supported anymore. +assert + (lib.isList curlOpts) + -> lib.warn '' + fetchurl for ${toString (builtins.head urls_)}: curlOpts is a list (${ + lib.generators.toPretty { multiline = false; } curlOpts + }), which is not supported anymore. - If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead: curlOpts = ${lib.strings.escapeNixString (toString curlOpts)}; - If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead: curlOptsList = [ ${lib.concatMapStringsSep " " lib.strings.escapeNixString curlOpts} ];'' true; -stdenvNoCC.mkDerivation (( - if (pname != "" && version != "") then - { inherit pname version; } - else - { name = - if showURLs then "urls" - else if name != "" then name - else baseNameOf (toString (builtins.head urls_)); - } -) // { - builder = ./builder.sh; - - nativeBuildInputs = [ curl ] ++ nativeBuildInputs; - - urls = urls_; - - # If set, prefer the content-addressable mirrors - # (http://tarballs.nixos.org) over the original URLs. - preferHashedMirrors = true; - - # New-style output content requirements. - inherit (hash_) outputHashAlgo outputHash; - - SSL_CERT_FILE = if (hash_.outputHash == "" || hash_.outputHash == lib.fakeSha256 || hash_.outputHash == lib.fakeSha512 || hash_.outputHash == lib.fakeHash) - then "${cacert}/etc/ssl/certs/ca-bundle.crt" - else "/no-cert-file.crt"; - - outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; - - inherit curlOpts; - curlOptsList = lib.escapeShellArgs curlOptsList; - inherit showURLs mirrorsFile postFetch downloadToTemp executable; - - impureEnvVars = impureEnvVars ++ netrcImpureEnvVars; - - nixpkgsVersion = lib.trivial.release; - - inherit preferLocalBuild; - - postHook = if netrcPhase == null then null else '' - ${netrcPhase} - curlOpts="$curlOpts --netrc-file $PWD/netrc" - ''; - - inherit meta; - passthru = { inherit url; } // passthru; -}) +stdenvNoCC.mkDerivation ( + ( + if (pname != "" && version != "") then + { inherit pname version; } + else + { + name = + if showURLs then + "urls" + else if name != "" then + name + else + baseNameOf (toString (builtins.head urls_)); + } + ) + // { + builder = ./builder.sh; + + nativeBuildInputs = [ curl ] ++ nativeBuildInputs; + + urls = urls_; + + # If set, prefer the content-addressable mirrors + # (http://tarballs.nixos.org) over the original URLs. + preferHashedMirrors = true; + + # New-style output content requirements. + inherit (hash_) outputHashAlgo outputHash; + + # Disable TLS verification only when we know the hash and no credentials are + # needed to access the resource + SSL_CERT_FILE = + if + ( + hash_.outputHash == "" + || hash_.outputHash == lib.fakeSha256 + || hash_.outputHash == lib.fakeSha512 + || hash_.outputHash == lib.fakeHash + || netrcPhase != null + ) + then + "${cacert}/etc/ssl/certs/ca-bundle.crt" + else + "/no-cert-file.crt"; + + outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; + + inherit curlOpts; + curlOptsList = lib.escapeShellArgs curlOptsList; + inherit + showURLs + mirrorsFile + postFetch + downloadToTemp + executable + ; + + impureEnvVars = impureEnvVars ++ netrcImpureEnvVars; + + nixpkgsVersion = lib.trivial.release; + + inherit preferLocalBuild; + + postHook = + if netrcPhase == null then + null + else + '' + ${netrcPhase} + curlOpts="$curlOpts --netrc-file $PWD/netrc" + ''; + + inherit meta; + passthru = { + inherit url; + } // passthru; + } +) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index e192c650a4ddb..abc4813da11d7 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -309,7 +309,7 @@ "https://cpan.metacpan.org/" "https://cpan.perl.org/" "https://mirrors.kernel.org/CPAN/" - "https://backpan.perl.org/" # for old releases + "https://backpan.perl.org/" # for old releases ]; # D DUB diff --git a/pkgs/build-support/fetchurl/tests.nix b/pkgs/build-support/fetchurl/tests.nix index e348d77db0bdc..8d9064141f235 100644 --- a/pkgs/build-support/fetchurl/tests.nix +++ b/pkgs/build-support/fetchurl/tests.nix @@ -1,11 +1,23 @@ -{ testers, fetchurl, jq, moreutils, ... }: { +{ + testers, + fetchurl, + jq, + moreutils, + ... +}: +{ # Tests that we can send custom headers with spaces in them header = - let headerValue = "Test '\" <- These are some quotes"; - in testers.invalidateFetcherByDrvHash fetchurl { + let + headerValue = "Test '\" <- These are some quotes"; + in + testers.invalidateFetcherByDrvHash fetchurl { url = "https://httpbin.org/headers"; sha256 = builtins.hashString "sha256" (headerValue + "\n"); - curlOptsList = [ "-H" "Hello: ${headerValue}" ]; + curlOptsList = [ + "-H" + "Hello: ${headerValue}" + ]; postFetch = '' ${jq}/bin/jq -r '.headers.Hello' $out | ${moreutils}/bin/sponge $out ''; diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 214b2603ff7f3..e1e39918436b8 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -63,20 +63,6 @@ let GO111MODULE = "on"; GOTOOLCHAIN = "local"; - toExtension = - overlay0: - if lib.isFunction overlay0 then - final: prev: - if lib.isFunction (overlay0 prev) then - # `overlay0` is `final: prev: { ... }` - overlay0 final prev - else - # `overlay0` is `prev: { ... }` - overlay0 prev - else - # `overlay0` is `{ ... }` - final: prev: overlay0; - in (stdenv.mkDerivation (finalAttrs: args @@ -136,6 +122,7 @@ in exit 10 fi + export GIT_SSL_CAINFO=$NIX_SSL_CERT_FILE ${if finalAttrs.proxyVendor then '' mkdir -p "''${GOPATH}/pkg/mod/cache/download" go mod download @@ -176,7 +163,8 @@ in # Handle empty vendorHash; avoid # error: empty hash requires explicit hash algorithm outputHashAlgo = if finalAttrs.vendorHash == "" then "sha256" else null; - }).overrideAttrs finalAttrs.passthru.overrideModAttrs; + # in case an overlay clears passthru by accident, don't fail evaluation + }).overrideAttrs (finalAttrs.passthru.overrideModAttrs or overrideModAttrs); nativeBuildInputs = [ go ] ++ nativeBuildInputs; @@ -331,7 +319,7 @@ in # Canonicallize `overrideModAttrs` as an attribute overlay. # `passthru.overrideModAttrs` will be overridden # when users want to override `goModules`. - overrideModAttrs = toExtension overrideModAttrs; + overrideModAttrs = lib.toExtension overrideModAttrs; } // passthru; meta = { diff --git a/pkgs/build-support/install-shell-files/default.nix b/pkgs/build-support/install-shell-files/default.nix deleted file mode 100644 index d50661ddc65d1..0000000000000 --- a/pkgs/build-support/install-shell-files/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ makeSetupHook, tests }: - -# See the header comment in ../setup-hooks/install-shell-files.sh for example usage. -let - setupHook = makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh; -in - -setupHook.overrideAttrs (oldAttrs: { - passthru = (oldAttrs.passthru or {}) // { - tests = tests.install-shell-files; - }; -}) diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix index c70e9cc6dc2ea..b0b0143c5ca91 100644 --- a/pkgs/build-support/kernel/make-initrd-ng.nix +++ b/pkgs/build-support/kernel/make-initrd-ng.nix @@ -37,9 +37,9 @@ in , extension ? _compressorMeta.extension or (throw "Unrecognised compressor ${_compressorName}, please specify filename extension") -# List of { object = path_or_derivation; symlink = "/path"; } +# List of { source = path_or_derivation; target = "/path"; } # The paths are copied into the initramfs in their nix store path -# form, then linked at the root according to `symlink`. +# form, then linked at the root according to `target`. , contents # List of uncompressed cpio files to prepend to the initramfs. This diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index 9998241673886..1b8ebcaeacddb 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -32,7 +32,7 @@ else stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ${if stdenv.isDarwin && stdenv.isAarch64 then '' + ${if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then '' # We need the unwrapped binutils and clang: # We also want to build a fat library with x86_64, arm64, arm64e in there. # Because we use the unwrapped tools, we need to provide -isystem for headers @@ -47,7 +47,7 @@ else stdenv.mkDerivation rec { -Wl,-install_name,$libName \ -Wall -std=c99 -O3 -fPIC libredirect.c \ -shared -o "$libName" - '' else if stdenv.isDarwin then '' + '' else if stdenv.hostPlatform.isDarwin then '' $CC -Wall -std=c99 -O3 -fPIC libredirect.c \ -Wl,-install_name,$out/lib/$libName \ -shared -o "$libName" @@ -58,7 +58,7 @@ else stdenv.mkDerivation rec { if [ -n "$doInstallCheck" ]; then $CC -Wall -std=c99 \ - ${lib.optionalString (!stdenv.isDarwin) "-D_GNU_SOURCE"} \ + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "-D_GNU_SOURCE"} \ -O3 test.c -o test fi @@ -75,7 +75,7 @@ else stdenv.mkDerivation rec { install -vD "$libName" "$out/lib/$libName" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # dylib will be rejected unless dylib rpath gets explictly set install_name_tool \ -change $libName $out/lib/$libName \ @@ -84,7 +84,7 @@ else stdenv.mkDerivation rec { # Provide a setup hook that injects our library into every process. mkdir -p "$hook/nix-support" cat <<SETUP_HOOK > "$hook/nix-support/setup-hook" - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' export DYLD_INSERT_LIBRARIES="$out/lib/$libName" '' else '' export LD_PRELOAD="$out/lib/$libName" diff --git a/pkgs/build-support/mitm-cache/default.nix b/pkgs/build-support/mitm-cache/default.nix index dd44a7ddca9af..e3bce225b46b3 100644 --- a/pkgs/build-support/mitm-cache/default.nix +++ b/pkgs/build-support/mitm-cache/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-l9dnyA4Zo4jlbiCMRzUqW3NkiploVpmvxz9i896JkXU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 4bcbf3f14f2fe..52b4f5a30e2ab 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (args // { (if npmInstallHook != null then npmInstallHook else npmHooks.npmInstallHook) nodejs.python ] - ++ lib.optionals stdenv.isDarwin [ cctools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = buildInputs ++ [ nodejs ]; strictDeps = true; diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix index d0caa42dade16..29a76d3d9f3e8 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix @@ -2,9 +2,14 @@ stdenv, lib, makeWrapper, + installShellFiles, + nodejsInstallManuals, + nodejsInstallExecutables, coreutils, nix-prefetch-git, fetchurl, + jq, + nodejs, nodejs-slim, prefetch-yarn-deps, fixup-yarn-lock, @@ -175,4 +180,16 @@ in description = "Run yarn build in buildPhase"; }; } ./yarn-build-hook.sh; + + yarnInstallHook = makeSetupHook { + name = "yarn-install-hook"; + propagatedBuildInputs = [ + yarn + nodejsInstallManuals + nodejsInstallExecutables + ]; + substitutions = { + jq = lib.getExe jq; + }; + } ./yarn-install-hook.sh; } diff --git a/pkgs/build-support/node/fetch-yarn-deps/index.js b/pkgs/build-support/node/fetch-yarn-deps/index.js index 400b64d2e920a..c961365becf1c 100755 --- a/pkgs/build-support/node/fetch-yarn-deps/index.js +++ b/pkgs/build-support/node/fetch-yarn-deps/index.js @@ -42,7 +42,7 @@ const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => { } else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${url}`)) resolve() }) - res.on('error', e => reject(e)) + res.on('error', e => reject(e)) }) get(url) }) @@ -88,13 +88,14 @@ const isGitUrl = pattern => { } const downloadPkg = (pkg, verbose) => { - const fileMarker = '@file:' - const split = pkg.key.split(fileMarker) - if (split.length == 2) { - console.info(`ignoring lockfile entry "${split[0]}" which points at path "${split[1]}"`) - return - } else if (split.length > 2) { - throw new Error(`The lockfile entry key "${pkg.key}" contains "${fileMarker}" more than once. Processing is not implemented.`) + for (let marker of ['@file:', '@link:']) { + const split = pkg.key.split(marker) + if (split.length == 2) { + console.info(`ignoring lockfile entry "${split[0]}" which points at path "${split[1]}"`) + return + } else if (split.length > 2) { + throw new Error(`The lockfile entry key "${pkg.key}" contains "${marker}" more than once. Processing is not implemented.`) + } } if (pkg.resolved === undefined) { @@ -141,10 +142,20 @@ const performParallel = tasks => { return Promise.all(workers) } +// This could be implemented using [`Map.groupBy`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map/groupBy), +// but that method is only supported starting with Node 21 +const uniqueBy = (arr, callback) => { + const map = new Map() + for (const elem of arr) { + map.set(callback(elem), elem) + } + return [...map.values()] +} + const prefetchYarnDeps = async (lockContents, verbose) => { const lockData = lockfile.parse(lockContents) await performParallel( - Object.entries(lockData.object) + uniqueBy(Object.entries(lockData.object), ([_, value]) => value.resolved) .map(([key, value]) => () => downloadPkg({ key, ...value }, verbose)) ) await fs.promises.writeFile('yarn.lock', lockContents) diff --git a/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh b/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh new file mode 100644 index 0000000000000..240879ad7182f --- /dev/null +++ b/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh @@ -0,0 +1,79 @@ +# shellcheck shell=bash + +yarnInstallHook() { + echo "Executing yarnInstallHook" + + runHook preInstall + + local -r packageOut="$out/lib/node_modules/$(@jq@ --raw-output '.name' ./package.json)" + mkdir -p "$packageOut" + + local -ar yarnArgs=( + --ignore-engines + --ignore-platform + --ignore-scripts + --no-progress + --non-interactive + --offline + ) + + local -r tmpDir="$(mktemp -d)" + + # yarn pack does not work at all with bundleDependencies. + # Since we are imediately unpacking, we can just remove them from package.json + # This will NOT be fixed in yarn v1: https://github.com/yarnpkg/yarn/issues/6794 + mv ./package.json "$tmpDir/package.json.orig" + # Note: two spellings are accepted, 'bundleDependencies' and 'bundledDependencies' + @jq@ 'del(.bundleDependencies)|del(.bundledDependencies)' "$tmpDir/package.json.orig" > ./package.json + + # TODO: figure out a way to avoid redundant compress/decompress steps + yarn pack \ + --filename "$tmpDir/yarn-pack.tgz" \ + "${yarnArgs[@]}" + + tar xzf "$tmpDir/yarn-pack.tgz" \ + -C "$packageOut" \ + --strip-components 1 \ + package/ + + mv "$tmpDir/package.json.orig" ./package.json + + nodejsInstallExecutables ./package.json + + nodejsInstallManuals ./package.json + + local -r nodeModulesPath="$packageOut/node_modules" + + if [ ! -d "$nodeModulesPath" ]; then + if [ -z "${yarnKeepDevDeps-}" ]; then + # Yarn has a 'prune' command, but it's only a stub that directs you to use install + if ! yarn install \ + --frozen-lockfile \ + --force \ + --production=true \ + "${yarnArgs[@]}" + then + echo + echo + echo "ERROR: yarn prune step failed" + echo + echo 'If yarn tried to download additional dependencies above, try setting `yarnKeepDevDeps = true`.' + echo + + exit 1 + fi + fi + + find node_modules -maxdepth 1 -type d -empty -delete + + cp -r node_modules "$nodeModulesPath" + fi + + runHook postInstall + + echo "Finished yarnInstallHook" +} + +if [ -z "${dontYarnInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=yarnInstallHook +fi diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index e293605cb31d0..fbf732958a45f 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -4,14 +4,15 @@ let Dune = let dune-version = args.duneVersion or "3"; in - { "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}" -; in + { "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}"; + stdenv' = args.stdenv or stdenv; +in if args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation ({ +stdenv'.mkDerivation ({ inherit enableParallelBuilding; dontAddStaticConfigureFlags = true; diff --git a/pkgs/build-support/php/builders/v1/build-composer-project.nix b/pkgs/build-support/php/builders/v1/build-composer-project.nix index 698391ad1603c..912fe7d72f3cb 100644 --- a/pkgs/build-support/php/builders/v1/build-composer-project.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-project.nix @@ -94,12 +94,6 @@ let or (if finalAttrs.composerRepository.composerLock == null then nix-update-script { } else null); }; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_DISABLE_NETWORK = "1"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - }; - meta = previousAttrs.meta or { } // { platforms = lib.platforms.all; }; diff --git a/pkgs/build-support/php/builders/v1/build-composer-repository.nix b/pkgs/build-support/php/builders/v1/build-composer-repository.nix index 037d8bdeb3eb1..c16056ce8fdfe 100644 --- a/pkgs/build-support/php/builders/v1/build-composer-repository.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-repository.nix @@ -102,13 +102,6 @@ let runHook postInstallCheck ''; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - COMPOSER_HTACCESS_PROTECT = "0"; - COMPOSER_DISABLE_NETWORK = "0"; - }; - outputHashMode = "recursive"; outputHashAlgo = if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; diff --git a/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix b/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix index 060b51241e6c8..e199000f4f7bc 100644 --- a/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix @@ -149,12 +149,6 @@ let or (if finalAttrs.vendor.composerLock == null then nix-update-script { } else null); }; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_DISABLE_NETWORK = "1"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - }; - meta = previousAttrs.meta or composer.meta; }; in diff --git a/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh index 44e87d06d3a53..d69050ecc6a4d 100644 --- a/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh @@ -24,7 +24,7 @@ composerInstallConfigureHook() { fi if [[ ! -f "composer.lock" ]]; then - setComposeRootVersion + setComposerRootVersion composer \ --no-install \ @@ -79,7 +79,7 @@ composerInstallConfigureHook() { composerInstallBuildHook() { echo "Executing composerInstallBuildHook" - setComposeRootVersion + setComposerRootVersion # Since this file cannot be generated in the composer-repository-hook.sh # because the file contains hardcoded nix store paths, we generate it here. @@ -99,7 +99,8 @@ composerInstallCheckHook() { composerInstallInstallHook() { echo "Executing composerInstallInstallHook" - setComposeRootVersion + setComposerRootVersion + setComposerEnvVariables # Finally, run `composer install` to install the dependencies and generate # the autoloader. diff --git a/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh index ec9777541fc0f..9d7b048870ee6 100644 --- a/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh +++ b/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh @@ -20,7 +20,7 @@ composerRepositoryConfigureHook() { fi if [[ ! -f "composer.lock" ]]; then - setComposeRootVersion + setComposerRootVersion composer \ --no-install \ @@ -58,7 +58,7 @@ composerRepositoryBuildHook() { mkdir -p repository - setComposeRootVersion + setComposerRootVersion # Build the local composer repository # The command 'build-local-repo' is provided by the Composer plugin diff --git a/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh index 0d88d14094ad4..186b72111cca3 100644 --- a/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh +++ b/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh @@ -28,7 +28,7 @@ composerWithPluginConfigureHook() { cp -ar $src $out/src if [[ ! -f "$out/composer.lock" ]]; then - setComposeRootVersion + setComposerRootVersion composer \ global \ diff --git a/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash index 65c0a3b410f69..d1b8a25c949db 100644 --- a/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash +++ b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash @@ -2,7 +2,7 @@ declare version declare composerStrictValidation declare composerGlobal -setComposeRootVersion() { +setComposerRootVersion() { set +e # Disable exit on error if [[ -v version ]]; then @@ -13,8 +13,15 @@ setComposeRootVersion() { set -e } +setComposerEnvVariables() { + echo -e "\e[32mSetting some required environment variables for Composer...\e[0m" + export COMPOSER_MIRROR_PATH_REPOS=1 + export COMPOSER_CACHE_DIR=/dev/null + export COMPOSER_HTACCESS_PROTECT=0 +} + checkComposerValidate() { - setComposeRootVersion + setComposerRootVersion if [ "1" == "${composerGlobal-}" ]; then global="global"; diff --git a/pkgs/build-support/php/builders/v2/build-composer-project.nix b/pkgs/build-support/php/builders/v2/build-composer-project.nix index 6013225e7c594..bfbd2327812bc 100644 --- a/pkgs/build-support/php/builders/v2/build-composer-project.nix +++ b/pkgs/build-support/php/builders/v2/build-composer-project.nix @@ -94,12 +94,6 @@ let or (if finalAttrs.composerVendor.composerLock == null then nix-update-script { } else null); }; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_DISABLE_NETWORK = "1"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - }; - meta = previousAttrs.meta or { } // { platforms = lib.platforms.all; }; diff --git a/pkgs/build-support/php/builders/v2/build-composer-vendor.nix b/pkgs/build-support/php/builders/v2/build-composer-vendor.nix index b68e16e6cc1a0..cbbe643d20f1e 100644 --- a/pkgs/build-support/php/builders/v2/build-composer-vendor.nix +++ b/pkgs/build-support/php/builders/v2/build-composer-vendor.nix @@ -87,13 +87,6 @@ let runHook postInstallCheck ''; - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - COMPOSER_HTACCESS_PROTECT = "0"; - COMPOSER_DISABLE_NETWORK = "0"; - }; - outputHashMode = "recursive"; outputHashAlgo = if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh index 7cc176058b504..0b04af6222334 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh @@ -14,7 +14,7 @@ source @phpScriptUtils@ composerInstallConfigureHook() { echo "Executing composerInstallConfigureHook" - setComposeRootVersion + setComposerRootVersion if [[ ! -e "${composerVendor}" ]]; then echo "No local composer vendor found." diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh index 7a14e544ae0de..24f3eaa2744e2 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -15,7 +15,7 @@ source @phpScriptUtils@ composerVendorConfigureHook() { echo "Executing composerVendorConfigureHook" - setComposeRootVersion + setComposerRootVersion if [[ -e "$composerLock" ]]; then echo -e "\e[32mUsing user provided \`composer.lock\` file from \`$composerLock\`\e[0m" @@ -59,9 +59,13 @@ composerVendorConfigureHook() { composerVendorBuildHook() { echo "Executing composerVendorBuildHook" + setComposerEnvVariables + composer \ - --apcu-autoloader \ - --apcu-autoloader-prefix="$(jq -r -c 'try ."content-hash"' < composer.lock)" \ + `# The acpu-autoloader is not reproducible and has to be disabled.` \ + `# Upstream PR: https://github.com/composer/composer/pull/12090` \ + `# --apcu-autoloader` \ + `# --apcu-autoloader-prefix="$(jq -r -c 'try ."content-hash"' < composer.lock)"` \ --no-interaction \ --no-progress \ --optimize-autoloader \ diff --git a/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash index 3e8299bf15d37..573b82c2baff4 100644 --- a/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash +++ b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash @@ -2,7 +2,7 @@ declare version declare composerStrictValidation declare composerGlobal -setComposeRootVersion() { +setComposerRootVersion() { set +e # Disable exit on error if [[ -v version ]]; then @@ -13,6 +13,13 @@ setComposeRootVersion() { set -e } +setComposerEnvVariables() { + echo -e "\e[32mSetting some required environment variables for Composer...\e[0m" + export COMPOSER_MIRROR_PATH_REPOS=1 + export COMPOSER_CACHE_DIR=/dev/null + export COMPOSER_HTACCESS_PROTECT=0 +} + checkComposerValidate() { if [ "1" == "${composerGlobal-}" ]; then global="global"; diff --git a/pkgs/build-support/replace-dependencies.nix b/pkgs/build-support/replace-dependencies.nix new file mode 100644 index 0000000000000..fe325b175fe7b --- /dev/null +++ b/pkgs/build-support/replace-dependencies.nix @@ -0,0 +1,193 @@ +{ + lib, + runCommandLocal, + replaceDirectDependencies, +}: + +# Replace some dependencies in the requisites tree of drv, propagating the change all the way up the tree, even within other replacements, without a full rebuild. +# This can be useful, for example, to patch a security hole in libc and still use your system safely without rebuilding the world. +# This should be a short term solution, as soon as a rebuild can be done the properly rebuilt derivation should be used. +# Each old dependency and the corresponding new dependency MUST have the same-length name, and ideally should have close-to-identical directory layout. +# +# Example: safeFirefox = replaceDependencies { +# drv = firefox; +# replacements = [ +# { +# oldDependency = glibc; +# newDependency = glibc.overrideAttrs (oldAttrs: { +# patches = oldAttrs.patches ++ [ ./fix-glibc-hole.patch ]; +# }); +# } +# { +# oldDependency = libwebp; +# newDependency = libwebp.overrideAttrs (oldAttrs: { +# patches = oldAttrs.patches ++ [ ./fix-libwebp-hole.patch ]; +# }); +# } +# ]; +# }; +# This will first rebuild glibc and libwebp with your security patches. +# Then it copies over firefox (and all of its dependencies) without rebuilding further. +# In particular, the glibc dependency of libwebp will be replaced by the patched version as well. +# +# In rare cases, it is possible for the replacement process to cause breakage (for example due to checksum mismatch). +# The cutoffPackages argument can be used to exempt the problematic packages from the replacement process. +{ + drv, + replacements, + cutoffPackages ? [ ], + verbose ? true, +}: + +let + inherit (builtins) unsafeDiscardStringContext appendContext; + inherit (lib) + listToAttrs + isStorePath + readFile + attrValues + mapAttrs + filter + hasAttr + mapAttrsToList + ; + inherit (lib.attrsets) mergeAttrsList; + + toContextlessString = x: unsafeDiscardStringContext (toString x); + warn = if verbose then lib.warn else (x: y: y); + + referencesOf = + drv: + import + (runCommandLocal "references.nix" + { + exportReferencesGraph = [ + "graph" + drv + ]; + } + '' + (echo { + while read path + do + echo " \"$path\" = [" + read count + read count + while [ "0" != "$count" ] + do + read ref_path + if [ "$ref_path" != "$path" ] + then + echo " \"$ref_path\"" + fi + count=$(($count - 1)) + done + echo " ];" + done < graph + echo }) > $out + '' + ).outPath; + + realisation = + drv: + if isStorePath drv then + # Input-addressed and fixed-output derivations have their realisation as outPath. + toContextlessString drv + else + # Floating and deferred derivations have a placeholder outPath. + # The realisation can only be obtained by performing an actual build. + unsafeDiscardStringContext ( + readFile ( + runCommandLocal "realisation" + { + env = { + inherit drv; + }; + } + '' + echo -n "$drv" > $out + '' + ) + ); + rootReferences = referencesOf drv; + relevantReplacements = filter ( + { oldDependency, newDependency }: + if toString oldDependency == toString newDependency then + warn "replaceDependencies: attempting to replace dependency ${oldDependency} of ${drv} with itself" + # Attempting to replace a dependency by itself is completely useless, and would only lead to infinite recursion. + # Hence it must not be attempted to apply this replacement in any case. + false + else if !hasAttr (realisation oldDependency) rootReferences then + warn "replaceDependencies: ${drv} does not depend on ${oldDependency}, so it will not be replaced" + # Strictly speaking, another replacement could introduce the dependency. + # However, handling this corner case would add significant complexity. + # So we just leave it to the user to apply the replacement at the correct place, but show a warning to let them know. + false + else + true + ) replacements; + targetDerivations = [ drv ] ++ map ({ newDependency, ... }: newDependency) relevantReplacements; + referencesMemo = listToAttrs ( + map (drv: { + name = realisation drv; + value = referencesOf drv; + }) targetDerivations + ); + relevantReferences = mergeAttrsList (attrValues referencesMemo); + # Make sure a derivation is returned even when no replacements are actually applied. + # Yes, even in the stupid edge case where the root derivation itself is replaced. + storePathOrKnownTargetDerivationMemo = + mapAttrs ( + drv: _references: + # builtins.storePath does not work in pure evaluation mode, even though it is not impure. + # This reimplementation in Nix works as long as the path is already allowed in the evaluation state. + # This is always the case here, because all paths come from the closure of the original derivation. + appendContext drv { ${drv}.path = true; } + ) relevantReferences + // listToAttrs ( + map (drv: { + name = realisation drv; + value = drv; + }) targetDerivations + ); + + rewriteMemo = + # Mind the order of how the three attrsets are merged here. + # The order of precedence needs to be "explicitly specified replacements" > "rewrite exclusion (cutoffPackages)" > "rewrite". + # So the attrset merge order is the opposite. + mapAttrs ( + drv: references: + let + rewrittenReferences = filter (dep: dep != drv && toString rewriteMemo.${dep} != dep) references; + rewrites = listToAttrs ( + map (reference: { + name = reference; + value = rewriteMemo.${reference}; + }) rewrittenReferences + ); + in + replaceDirectDependencies { + drv = storePathOrKnownTargetDerivationMemo.${drv}; + replacements = mapAttrsToList (name: value: { + oldDependency = name; + newDependency = value; + }) rewrites; + } + ) relevantReferences + // listToAttrs ( + map (drv: { + name = realisation drv; + value = storePathOrKnownTargetDerivationMemo.${realisation drv}; + }) cutoffPackages + ) + // listToAttrs ( + map ( + { oldDependency, newDependency }: + { + name = realisation oldDependency; + value = rewriteMemo.${realisation newDependency}; + } + ) relevantReplacements + ); +in +rewriteMemo.${realisation drv} diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix deleted file mode 100644 index 7912d21bfd692..0000000000000 --- a/pkgs/build-support/replace-dependency.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ runCommandLocal, nix, lib }: - -# Replace a single dependency in the requisites tree of drv, propagating -# the change all the way up the tree, without a full rebuild. This can be -# useful, for example, to patch a security hole in libc and still use your -# system safely without rebuilding the world. This should be a short term -# solution, as soon as a rebuild can be done the properly rebuild derivation -# should be used. The old dependency and new dependency MUST have the same-length -# name, and ideally should have close-to-identical directory layout. -# -# Example: safeFirefox = replaceDependency { -# drv = firefox; -# oldDependency = glibc; -# newDependency = overrideDerivation glibc (attrs: { -# patches = attrs.patches ++ [ ./fix-glibc-hole.patch ]; -# }); -# }; -# This will rebuild glibc with your security patch, then copy over firefox -# (and all of its dependencies) without rebuilding further. -{ drv, oldDependency, newDependency, verbose ? true }: - -let - inherit (lib) - any - attrNames - concatStringsSep - elem - filter - filterAttrs - listToAttrs - mapAttrsToList - stringLength - substring - ; - - warn = if verbose then builtins.trace else (x: y: y); - references = import (runCommandLocal "references.nix" { exportReferencesGraph = [ "graph" drv ]; } '' - (echo { - while read path - do - echo " \"$path\" = [" - read count - read count - while [ "0" != "$count" ] - do - read ref_path - if [ "$ref_path" != "$path" ] - then - echo " (builtins.storePath (/. + \"$ref_path\"))" - fi - count=$(($count - 1)) - done - echo " ];" - done < graph - echo }) > $out - '').outPath; - - discard = builtins.unsafeDiscardStringContext; - - oldStorepath = builtins.storePath (discard (toString oldDependency)); - - referencesOf = drv: references.${discard (toString drv)}; - - dependsOnOldMemo = listToAttrs (map - (drv: { name = discard (toString drv); - value = elem oldStorepath (referencesOf drv) || - any dependsOnOld (referencesOf drv); - }) (attrNames references)); - - dependsOnOld = drv: dependsOnOldMemo.${discard (toString drv)}; - - drvName = drv: - discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv)); - - rewriteHashes = drv: hashes: runCommandLocal (drvName drv) { nixStore = "${nix.out}/bin/nix-store"; } '' - $nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${ - concatStringsSep " -e " (mapAttrsToList (name: value: - "'s|${baseNameOf name}|${baseNameOf value}|g'" - ) hashes) - } | $nixStore --restore $out - ''; - - rewrittenDeps = listToAttrs [ {name = discard (toString oldDependency); value = newDependency;} ]; - - rewriteMemo = listToAttrs (map - (drv: { name = discard (toString drv); - value = rewriteHashes (builtins.storePath drv) - (filterAttrs (n: v: elem (builtins.storePath (discard (toString n))) (referencesOf drv)) rewriteMemo); - }) - (filter dependsOnOld (attrNames references))) // rewrittenDeps; - - drvHash = discard (toString drv); -in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency))); -rewriteMemo.${drvHash} or (warn "replace-dependency.nix: Derivation ${drvHash} does not depend on ${discard (toString oldDependency)}" drv) diff --git a/pkgs/build-support/replace-direct-dependencies.nix b/pkgs/build-support/replace-direct-dependencies.nix new file mode 100644 index 0000000000000..57036ebd74d14 --- /dev/null +++ b/pkgs/build-support/replace-direct-dependencies.nix @@ -0,0 +1,72 @@ +{ + lib, + runCommandLocal, + nix, +}: + +# Replace some direct dependencies of drv, not recursing into the dependency tree. +# You likely want to use replaceDependencies instead, unless you plan to implement your own recursion mechanism. +{ + drv, + replacements ? [ ], +}: +let + inherit (lib) + isStorePath + substring + stringLength + optionalString + escapeShellArgs + concatMap + ; +in +if replacements == [ ] then + drv +else + let + drvName = + if isStorePath drv then + # Reconstruct the name from the actual store path if available. + substring 33 (stringLength (baseNameOf drv)) (baseNameOf drv) + else if drv ? drvAttrs.name then + # Try to get the name from the derivation arguments otherwise (for floating or deferred derivations). + drv.drvAttrs.name + + ( + let + outputName = drv.outputName or "out"; + in + optionalString (outputName != "out") "-${outputName}" + ) + else + throw "cannot reconstruct the derivation name from ${drv}"; + in + runCommandLocal drvName { nativeBuildInputs = [ nix.out ]; } '' + createRewriteScript() { + while [ $# -ne 0 ]; do + oldBasename="$(basename "$1")" + newBasename="$(basename "$2")" + shift 2 + if [ ''${#oldBasename} -ne ''${#newBasename} ]; then + echo "cannot rewrite $oldBasename to $newBasename: length does not match" >&2 + exit 1 + fi + echo "s|$oldBasename|$newBasename|g" >> rewrite.sed + done + } + createRewriteScript ${ + escapeShellArgs ( + [ + drv + (placeholder "out") + ] + ++ concatMap ( + { oldDependency, newDependency }: + [ + oldDependency + newDependency + ] + ) replacements + ) + } + nix-store --dump ${drv} | sed -f rewrite.sed | nix-store --restore $out + '' diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 3af13fe70a7de..4bf1b188cd1c5 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -27,7 +27,7 @@ # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022 ++ lib.optional (lib.elem "proc-macro" crateType) "--extern proc_macro" - ++ lib.optional (stdenv.hostPlatform.linker == "lld") # Needed when building for targets that use lld. e.g. 'wasm32-unknown-unknown' + ++ lib.optional (stdenv.hostPlatform.linker == "lld" && rustc ? llvmPackages.lld) # Needed when building for targets that use lld. e.g. 'wasm32-unknown-unknown' "-C linker=${rustc.llvmPackages.lld}/bin/lld" ++ lib.optional (stdenv.hasCC && stdenv.hostPlatform.linker != "lld") "-C linker=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 841e8e86cbfb1..db9c2d784f6b9 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -16,16 +16,6 @@ }: let - # Returns a true if the builder's rustc was built with support for the target. - targetAlreadyIncluded = lib.elem stdenv.hostPlatform.rust.rustcTarget - (lib.splitString "," (lib.removePrefix "--target=" ( - lib.elemAt (lib.filter (f: lib.hasPrefix "--target=" f) pkgsBuildBuild.rustc.unwrapped.configureFlags) 0) - )); - - # If the build's rustc was built with support for the target then reuse it. (Avoids uneeded compilation for targets like `wasm32-unknown-unknown`) - rustc' = if targetAlreadyIncluded then pkgsBuildBuild.rustc else rustc; - cargo' = if targetAlreadyIncluded then pkgsBuildBuild.cargo else cargo; - # Create rustc arguments to link against the given list of dependencies # and renames. # @@ -85,11 +75,6 @@ let inherit lib stdenv echo_colored noisily mkRustcDepArgs mkRustcFeatureArgs; }; - buildCrate = import ./build-crate.nix { - inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI; - rustc = rustc'; - }; - installCrate = import ./install-crate.nix { inherit stdenv; }; in @@ -103,7 +88,11 @@ crate_: lib.makeOverridable # The rust compiler to use. # # Default: pkgs.rustc - { rust + { rust ? rustc + # The cargo package to use for getting some metadata. + # + # Default: pkgs.cargo + , cargo ? cargo # 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. @@ -262,6 +251,11 @@ crate_: lib.makeOverridable # https://github.com/kolloch/crate2nix/blame/5b19c1b14e1b0e5522c3e44e300d0b332dc939e7/crate2nix/templates/build.nix.tera#L89 crateBin = lib.filter (bin: !(bin ? name && bin.name == ",")) (crate.crateBin or [ ]); hasCrateBin = crate ? crateBin; + + buildCrate = import ./build-crate.nix { + inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI; + rustc = rust; + }; in stdenv.mkDerivation (rec { @@ -285,11 +279,11 @@ crate_: lib.makeOverridable name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; version = crate.version; depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; - nativeBuildInputs = [ rustc' cargo' jq ] + nativeBuildInputs = [ rust cargo jq ] ++ lib.optionals stdenv.hasCC [ stdenv.cc ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ] ++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] ++ (crate.buildInputs or [ ]) ++ buildInputs_; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ (crate.buildInputs or [ ]) ++ buildInputs_; dependencies = map lib.getLib dependencies_; buildDependencies = map lib.getLib buildDependencies_; @@ -392,7 +386,8 @@ crate_: lib.makeOverridable ) ) { - rust = rustc'; + rust = crate_.rust or rustc; + cargo = crate_.cargo or cargo; release = crate_.release or true; verbose = crate_.verbose or true; extraRustcOpts = [ ]; diff --git a/pkgs/build-support/rust/build-rust-crate/log.nix b/pkgs/build-support/rust/build-rust-crate/log.nix index 9054815f4a1bb..cb0846190eac9 100644 --- a/pkgs/build-support/rust/build-rust-crate/log.nix +++ b/pkgs/build-support/rust/build-rust-crate/log.nix @@ -49,11 +49,11 @@ in { noisily = colors: verbose: '' noisily() { - ${lib.optionalString verbose '' + ${lib.optionalString verbose '' echo_colored -n "Running " echo $@ - ''} - $@ + ''} + $@ } ''; } 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 dd135af919654..6069ef802dde2 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -529,7 +529,7 @@ let # Note: On darwin (which defaults to clang) we have to add # `-undefined dynamic_lookup` as otherwise the compilation fails. $CC -shared \ - ${lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "-undefined dynamic_lookup"} \ -o $out/lib/${name}${stdenv.hostPlatform.extensions.library} ${src} ''; b = compile "libb" '' @@ -626,7 +626,7 @@ let }; expectedFiles = [ "./bin/test_binary1" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # On Darwin, the debug symbols are in a separate directory. "./bin/test_binary1.dSYM/Contents/Info.plist" "./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1" diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index a1727c91ba366..40b7a61812328 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -150,21 +150,24 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg strictDeps = true; - meta = { - # default to Rust's platforms - platforms = rustc.meta.platforms ++ [ - # Platforms without host tools from - # https://doc.rust-lang.org/nightly/rustc/platform-support.html - "armv7a-darwin" - "armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux" - "mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux" - "armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd" - "x86_64-redox" - "wasm32-wasi" - ]; - badPlatforms = [ + meta = meta // { + badPlatforms = meta.badPlatforms or [] ++ [ # Rust is currently unable to target the n32 ABI lib.systems.inspect.patterns.isMips64n32 ]; - } // meta; + } // lib.optionalAttrs (rustc.meta ? platforms) { + # default to Rust's platforms + platforms = lib.intersectLists + meta.platforms or lib.platforms.all + (rustc.meta.platforms ++ [ + # Platforms without host tools from + # https://doc.rust-lang.org/nightly/rustc/platform-support.html + "armv7a-darwin" + "armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux" + "mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux" + "armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd" + "x86_64-redox" + "wasm32-wasi" + ]); + }; }) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 126be2ad99eb2..21ca75357fbbf 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -72,7 +72,7 @@ in cargo = attrs: { buildInputs = [ openssl zlib curl ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; }; libz-sys = attrs: { @@ -281,7 +281,7 @@ in }; security-framework-sys = attr: { - propagatedBuildInputs = lib.optional stdenv.isDarwin Security; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; }; sequoia-openpgp = attrs: { @@ -320,7 +320,7 @@ in }; serde_derive = attrs: { - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; }; servo-fontconfig-sys = attrs: { diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index adbfe98d81039..c16f3540e6ae2 100644 --- a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -1,116 +1,156 @@ -{ lib, stdenv, cacert, git, cargo, python3 }: -let cargo-vendor-normalise = stdenv.mkDerivation { - name = "cargo-vendor-normalise"; - src = ./cargo-vendor-normalise.py; - nativeBuildInputs = [ python3.pkgs.wrapPython ]; - dontUnpack = true; - installPhase = "install -D $src $out/bin/cargo-vendor-normalise"; - pythonPath = [ python3.pkgs.toml ]; - postFixup = "wrapPythonPrograms"; - doInstallCheck = true; - installCheckPhase = '' - # check that ../fetchcargo-default-config.toml is a fix point - reference=${../fetchcargo-default-config.toml} - < $reference $out/bin/cargo-vendor-normalise > test; - cmp test $reference - ''; - preferLocalBuild = true; -}; +{ + lib, + stdenv, + cacert, + git, + cargo, + python3, +}: +let + cargo-vendor-normalise = stdenv.mkDerivation { + name = "cargo-vendor-normalise"; + src = ./cargo-vendor-normalise.py; + nativeBuildInputs = [ python3.pkgs.wrapPython ]; + dontUnpack = true; + installPhase = "install -D $src $out/bin/cargo-vendor-normalise"; + pythonPath = [ python3.pkgs.toml ]; + postFixup = "wrapPythonPrograms"; + doInstallCheck = true; + installCheckPhase = '' + # check that ../fetchcargo-default-config.toml is a fix point + reference=${../fetchcargo-default-config.toml} + < $reference $out/bin/cargo-vendor-normalise > test; + cmp test $reference + ''; + preferLocalBuild = true; + }; in -{ name ? "cargo-deps" -, src ? null -, srcs ? [] -, patches ? [] -, sourceRoot ? "" -, cargoUpdateHook ? "" -, nativeBuildInputs ? [] -, ... -} @ args: - -let hash_ = - if args ? hash then - { - outputHashAlgo = if args.hash == "" then "sha256" else null; - outputHash = args.hash; - } - else if args ? sha256 then { outputHashAlgo = "sha256"; outputHash = args.sha256; } - else throw "fetchCargoTarball requires a hash for ${name}"; -in stdenv.mkDerivation ({ - name = "${name}-vendor.tar.gz"; - nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ] ++ nativeBuildInputs; - - buildPhase = '' - runHook preBuild - - # Ensure deterministic Cargo vendor builds - export SOURCE_DATE_EPOCH=1 - - if [[ ! -f Cargo.lock ]]; then - echo - echo "ERROR: The Cargo.lock file doesn't exist" - echo - echo "Cargo.lock is needed to make sure that cargoHash/cargoSha256 doesn't change" - echo "when the registry is updated." - echo - - exit 1 - fi - - # Keep the original around for copyLockfile - cp Cargo.lock Cargo.lock.orig - - export CARGO_HOME=$(mktemp -d cargo-home.XXX) - CARGO_CONFIG=$(mktemp cargo-config.XXXX) - - if [[ -n "$NIX_CRATES_INDEX" ]]; then - cat >$CARGO_HOME/config.toml <<EOF - [source.crates-io] - replace-with = 'mirror' - [source.mirror] - registry = "$NIX_CRATES_INDEX" - EOF - fi - - ${cargoUpdateHook} - - # Override the `http.cainfo` option usually specified in `.cargo/config`. - export CARGO_HTTP_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt - - if grep '^source = "git' Cargo.lock; then - echo - echo "ERROR: The Cargo.lock contains git dependencies" - echo - echo "This is currently not supported in the fixed-output derivation fetcher." - echo "Use cargoLock.lockFile / importCargoLock instead." - echo - - exit 1 - fi - - cargo vendor $name --respect-source-config | cargo-vendor-normalise > $CARGO_CONFIG - - # Create an empty vendor directory when there is no dependency to vendor - mkdir -p $name - # Add the Cargo.lock to allow hash invalidation - cp Cargo.lock.orig $name/Cargo.lock - - # Packages with git dependencies generate non-default cargo configs, so - # always install it rather than trying to write a standard default template. - install -D $CARGO_CONFIG $name/.cargo/config; - - runHook postBuild - ''; - - # Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/ - installPhase = '' - tar --owner=0 --group=0 --numeric-owner --format=gnu \ - --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ - -czf $out $name - ''; - - inherit (hash_) outputHashAlgo outputHash; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_CRATES_INDEX" ]; -} // (builtins.removeAttrs args [ - "name" "sha256" "cargoUpdateHook" "nativeBuildInputs" -])) +{ + pname ? null, + version ? null, + name ? if args ? pname && args ? version then "${pname}-${version}" else "cargo-deps", + src ? null, + srcs ? [ ], + patches ? [ ], + sourceRoot ? "", + cargoUpdateHook ? "", + nativeBuildInputs ? [ ], + ... +}@args: + +assert lib.assertMsg ( + (args ? pname || args ? version) -> !(args ? name) +) "Either specify `pname` with `version`, or specify `name` only, not a mix of both."; +assert lib.assertMsg ( + args ? pname == args ? version +) "If `pname` is specified, `version` must be also, and vice versa."; +let + # args to remove from the final call to stdenv.mkDerivation, as we've already handled them + removedArgs = [ + "name" + "pname" + "version" + "sha256" + "cargoUpdateHook" + "nativeBuildInputs" + ]; + + hash_ = + if args ? hash then + { + outputHashAlgo = if args.hash == "" then "sha256" else null; + outputHash = args.hash; + } + else if args ? sha256 then + { + outputHashAlgo = "sha256"; + outputHash = args.sha256; + } + else + throw "fetchCargoTarball requires a hash for ${name}"; +in +stdenv.mkDerivation ( + { + name = "${name}-vendor.tar.gz"; + nativeBuildInputs = [ + cacert + git + cargo-vendor-normalise + cargo + ] ++ nativeBuildInputs; + + buildPhase = '' + runHook preBuild + + # Ensure deterministic Cargo vendor builds + export SOURCE_DATE_EPOCH=1 + + if [[ ! -f Cargo.lock ]]; then + echo + echo "ERROR: The Cargo.lock file doesn't exist" + echo + echo "Cargo.lock is needed to make sure that cargoHash/cargoSha256 doesn't change" + echo "when the registry is updated." + echo + + exit 1 + fi + + # Keep the original around for copyLockfile + cp Cargo.lock Cargo.lock.orig + + export CARGO_HOME=$(mktemp -d cargo-home.XXX) + CARGO_CONFIG=$(mktemp cargo-config.XXXX) + + if [[ -n "$NIX_CRATES_INDEX" ]]; then + cat >$CARGO_HOME/config.toml <<EOF + [source.crates-io] + replace-with = 'mirror' + [source.mirror] + registry = "$NIX_CRATES_INDEX" + EOF + fi + + ${cargoUpdateHook} + + # Override the `http.cainfo` option usually specified in `.cargo/config`. + export CARGO_HTTP_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt + + if grep '^source = "git' Cargo.lock; then + echo + echo "ERROR: The Cargo.lock contains git dependencies" + echo + echo "This is currently not supported in the fixed-output derivation fetcher." + echo "Use cargoLock.lockFile / importCargoLock instead." + echo + + exit 1 + fi + + cargo vendor $name --respect-source-config | cargo-vendor-normalise > $CARGO_CONFIG + + # Create an empty vendor directory when there is no dependency to vendor + mkdir -p $name + # Add the Cargo.lock to allow hash invalidation + cp Cargo.lock.orig $name/Cargo.lock + + # Packages with git dependencies generate non-default cargo configs, so + # always install it rather than trying to write a standard default template. + install -D $CARGO_CONFIG $name/.cargo/config; + + runHook postBuild + ''; + + # Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/ + installPhase = '' + tar --owner=0 --group=0 --numeric-owner --format=gnu \ + --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ + -czf $out $name + ''; + + inherit (hash_) outputHashAlgo outputHash; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_CRATES_INDEX" ]; + } + // (removeAttrs args removedArgs) +) diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index e09f913bfbd39..3229748548785 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -15,7 +15,7 @@ rec { envVars = let # As a workaround for https://github.com/rust-lang/rust/issues/89626 use lld on pkgsStatic aarch64 - shouldUseLLD = platform: platform.isAarch64 && platform.isStatic && !stdenv.isDarwin; + shouldUseLLD = platform: platform.isAarch64 && platform.isStatic && !stdenv.hostPlatform.isDarwin; ccForBuild = "${pkgsBuildHost.stdenv.cc}/bin/${pkgsBuildHost.stdenv.cc.targetPrefix}cc"; cxxForBuild = "${pkgsBuildHost.stdenv.cc}/bin/${pkgsBuildHost.stdenv.cc.targetPrefix}c++"; @@ -80,8 +80,7 @@ rec { ''; }; } // lib.mapAttrs (old: new: platform: - # TODO: enable warning after 23.05 is EOL. - # lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${new}` instead." + lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${lib.showAttrPath new}` instead." lib.getAttrFromPath new platform.rust) { toTargetArch = [ "platform" "arch" ]; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix index 63e3bea3ca1fe..b616b293fa397 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh index 763ea649c1c43..bb168aad4c51d 100644 --- a/pkgs/build-support/setup-hooks/autoreconf.sh +++ b/pkgs/build-support/setup-hooks/autoreconf.sh @@ -4,8 +4,11 @@ autoreconfPhase() { runHook preAutoreconf local flagsArray=() - : "${autoreconfFlags:=--install --force --verbose}" - concatTo flagsArray autoreconfFlags + if [[ -v autoreconfFlags ]]; then + concatTo flagsArray autoreconfFlags + else + flagsArray+=(--install --force --verbose) + fi autoreconf "${flagsArray[@]}" runHook postAutoreconf diff --git a/pkgs/build-support/setup-hooks/install-shell-files.sh b/pkgs/build-support/setup-hooks/install-shell-files.sh deleted file mode 100644 index 4f4e215da4df2..0000000000000 --- a/pkgs/build-support/setup-hooks/install-shell-files.sh +++ /dev/null @@ -1,235 +0,0 @@ -# shellcheck shell=bash -# Setup hook for the `installShellFiles` package. -# -# Example usage in a derivation: -# -# { …, installShellFiles, … }: -# stdenv.mkDerivation { -# … -# nativeBuildInputs = [ installShellFiles ]; -# postInstall = '' -# installManPage share/doc/foobar.1 -# installShellCompletion share/completions/foobar.{bash,fish,zsh} -# ''; -# … -# } -# -# See comments on each function for more details. - -# installManPage <path> [...<path>] -# -# Each argument is checked for its man section suffix and installed into the appropriate -# share/man/man<n>/ directory. The function returns an error if any paths don't have the man -# section suffix (with optional .gz compression). -installManPage() { - local path - for path in "$@"; do - if (( "${NIX_DEBUG:-0}" >= 1 )); then - echo "installManPage: installing $path" - fi - if test -z "$path"; then - echo "installManPage: error: path cannot be empty" >&2 - return 1 - fi - local basename - basename=$(stripHash "$path") # use stripHash in case it's a nix store path - local trimmed=${basename%.gz} # don't get fooled by compressed manpages - local suffix=${trimmed##*.} - if test -z "$suffix" -o "$suffix" = "$trimmed"; then - echo "installManPage: error: path missing manpage section suffix: $path" >&2 - return 1 - fi - local outRoot - if test "$suffix" = 3; then - outRoot=${!outputDevman:?} - else - outRoot=${!outputMan:?} - fi - install -Dm644 -T "$path" "${outRoot}/share/man/man$suffix/$basename" || return - done -} - -# installShellCompletion [--cmd <name>] ([--bash|--fish|--zsh] [--name <name>] <path>)... -# -# Each path is installed into the appropriate directory for shell completions for the given shell. -# If one of `--bash`, `--fish`, or `--zsh` is given the path is assumed to belong to that shell. -# Otherwise the file extension will be examined to pick a shell. If the shell is unknown a warning -# will be logged and the command will return a non-zero status code after processing any remaining -# paths. Any of the shell flags will affect all subsequent paths (unless another shell flag is -# given). -# -# If the shell completion needs to be renamed before installing the optional `--name <name>` flag -# may be given. Any name provided with this flag only applies to the next path. -# -# If all shell completions need to be renamed before installing the optional `--cmd <name>` flag -# may be given. This will synthesize a name for each file, unless overridden with an explicit -# `--name` flag. For example, `--cmd foobar` will synthesize the name `_foobar` for zsh and -# `foobar.bash` for bash. -# -# For zsh completions, if the `--name` flag is not given, the path will be automatically renamed -# such that `foobar.zsh` becomes `_foobar`. -# -# A path may be a named fd, such as produced by the bash construct `<(cmd)`. When using a named fd, -# the shell type flag must be provided, and either the `--name` or `--cmd` flag must be provided. -# This might look something like: -# -# installShellCompletion --zsh --name _foobar <($out/bin/foobar --zsh-completion) -# -# This command accepts multiple shell flags in conjunction with multiple paths if you wish to -# install them all in one command: -# -# installShellCompletion share/completions/foobar.{bash,fish} --zsh share/completions/_foobar -# -# However it may be easier to read if each shell is split into its own invocation, especially when -# renaming is involved: -# -# installShellCompletion --bash --name foobar.bash share/completions.bash -# installShellCompletion --fish --name foobar.fish share/completions.fish -# installShellCompletion --zsh --name _foobar share/completions.zsh -# -# Or to use shell newline escaping to split a single invocation across multiple lines: -# -# installShellCompletion --cmd foobar \ -# --bash <($out/bin/foobar --bash-completion) \ -# --fish <($out/bin/foobar --fish-completion) \ -# --zsh <($out/bin/foobar --zsh-completion) -# -# If any argument is `--` the remaining arguments will be treated as paths. -installShellCompletion() { - local shell='' name='' cmdname='' retval=0 parseArgs=1 arg - while { arg=$1; shift; }; do - # Parse arguments - if (( parseArgs )); then - case "$arg" in - --bash|--fish|--zsh) - shell=${arg#--} - continue;; - --name) - name=$1 - shift || { - echo 'installShellCompletion: error: --name flag expected an argument' >&2 - return 1 - } - continue;; - --name=*) - # treat `--name=foo` the same as `--name foo` - name=${arg#--name=} - continue;; - --cmd) - cmdname=$1 - shift || { - echo 'installShellCompletion: error: --cmd flag expected an argument' >&2 - return 1 - } - continue;; - --cmd=*) - # treat `--cmd=foo` the same as `--cmd foo` - cmdname=${arg#--cmd=} - continue;; - --?*) - echo "installShellCompletion: warning: unknown flag ${arg%%=*}" >&2 - retval=2 - continue;; - --) - # treat remaining args as paths - parseArgs=0 - continue;; - esac - fi - if (( "${NIX_DEBUG:-0}" >= 1 )); then - echo "installShellCompletion: installing $arg${name:+ as $name}" - fi - # if we get here, this is a path or named pipe - # Identify shell and output name - local curShell=$shell - local outName='' - if [[ -z "$arg" ]]; then - echo "installShellCompletion: error: empty path is not allowed" >&2 - return 1 - elif [[ -p "$arg" ]]; then - # this is a named fd or fifo - if [[ -z "$curShell" ]]; then - echo "installShellCompletion: error: named pipe requires one of --bash, --fish, or --zsh" >&2 - return 1 - elif [[ -z "$name" && -z "$cmdname" ]]; then - echo "installShellCompletion: error: named pipe requires one of --cmd or --name" >&2 - return 1 - fi - else - # this is a path - local argbase - argbase=$(stripHash "$arg") - if [[ -z "$curShell" ]]; then - # auto-detect the shell - case "$argbase" in - ?*.bash) curShell=bash;; - ?*.fish) curShell=fish;; - ?*.zsh) curShell=zsh;; - *) - if [[ "$argbase" = _* && "$argbase" != *.* ]]; then - # probably zsh - echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2 - curShell=zsh - else - echo "installShellCompletion: warning: unknown shell for path: $arg" >&2 - retval=2 - continue - fi;; - esac - fi - outName=$argbase - fi - # Identify output path - if [[ -n "$name" ]]; then - outName=$name - elif [[ -n "$cmdname" ]]; then - case "$curShell" in - bash|fish) outName=$cmdname.$curShell;; - zsh) outName=_$cmdname;; - *) - # Our list of shells is out of sync with the flags we accept or extensions we detect. - echo 'installShellCompletion: internal error' >&2 - return 1;; - esac - fi - local sharePath - case "$curShell" in - bash) sharePath=bash-completion/completions;; - fish) sharePath=fish/vendor_completions.d;; - zsh) - sharePath=zsh/site-functions - # only apply automatic renaming if we didn't have a manual rename - if [[ -z "$name" && -z "$cmdname" ]]; then - # convert a name like `foo.zsh` into `_foo` - outName=${outName%.zsh} - outName=_${outName#_} - fi;; - *) - # Our list of shells is out of sync with the flags we accept or extensions we detect. - echo 'installShellCompletion: internal error' >&2 - return 1;; - esac - # Install file - local outDir="${!outputBin:?}/share/$sharePath" - local outPath="$outDir/$outName" - if [[ -p "$arg" ]]; then - # install handles named pipes on NixOS but not on macOS - mkdir -p "$outDir" \ - && cat "$arg" > "$outPath" - else - install -Dm644 -T "$arg" "$outPath" - fi || return - - if [ ! -s "$outPath" ]; then - echo "installShellCompletion: error: installed shell completion file \`$outPath' does not exist or has zero size" >&2 - return 1 - fi - # Clear the per-path flags - name= - done - if [[ -n "$name" ]]; then - echo 'installShellCompletion: error: --name flag given with no path' >&2 - return 1 - fi - return $retval -} diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 80a29d727c858..0553eb04b1114 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -90,8 +90,8 @@ patchShebangs() { if [[ $arg0 == "-S" ]]; then arg0=${args%% *} args=${args#* } - newPath="$(PATH="${!pathName}" command -v "env" || true)" - args="-S $(PATH="${!pathName}" command -v "$arg0" || true) $args" + newPath="$(PATH="${!pathName}" type -P "env" || true)" + args="-S $(PATH="${!pathName}" type -P "$arg0" || true) $args" # Check for unsupported 'env' functionality: # - options: something starting with a '-' besides '-S' @@ -100,7 +100,7 @@ patchShebangs() { echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >&2 exit 1 else - newPath="$(PATH="${!pathName}" command -v "$arg0" || true)" + newPath="$(PATH="${!pathName}" type -P "$arg0" || true)" fi else if [[ -z $oldPath ]]; then @@ -109,7 +109,7 @@ patchShebangs() { oldPath="/bin/sh" fi - newPath="$(PATH="${!pathName}" command -v "$(basename "$oldPath")" || true)" + newPath="$(PATH="${!pathName}" type -P "$(basename "$oldPath")" || true)" args="$arg0 $args" fi 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 69f9f3b145d7c..b2ce7b4b2654b 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix @@ -35,7 +35,7 @@ makeSetupHook { # TODO: remove this, packages should depend on GTK explicitly. gtk3 - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # It is highly probable that a program will use GSettings, # at minimum through GTK file chooser dialogue. # Let’s add a GIO module for “dconf” GSettings backend @@ -68,7 +68,7 @@ makeSetupHook { basic-contains-dconf = let tested = basic; in testLib.runTest "basic-contains-dconf" ( - testLib.skip stdenv.isDarwin '' + testLib.skip stdenv.hostPlatform.isDarwin '' ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GIO_EXTRA_MODULES" "${dconf.lib}/lib/gio/modules"} ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GIO_EXTRA_MODULES" "${dconf.lib}/lib/gio/modules"} '' @@ -77,7 +77,7 @@ makeSetupHook { basic-contains-gdk-pixbuf = let tested = basic; in testLib.runTest "basic-contains-gdk-pixbuf" ( - testLib.skip stdenv.isDarwin '' + testLib.skip stdenv.hostPlatform.isDarwin '' ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GDK_PIXBUF_MODULE_FILE" "${lib.getLib librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"} ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GDK_PIXBUF_MODULE_FILE" "${lib.getLib librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"} '' diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 3bccc871a7dca..a02fe1fd6d0a1 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -86,6 +86,13 @@ rec { , preferLocalBuild ? true , derivationArgs ? { } }: + assert lib.assertMsg (destination != "" -> (lib.hasPrefix "/" destination && destination != "/")) '' + destination must be an absolute path, relative to the derivation's out path, + got '${destination}' instead. + + Ensure that the path starts with a / and specifies at least the filename. + ''; + let matches = builtins.match "/bin/([^/]+)" destination; in diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index e882c917688be..f0b9d34aa950d 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -131,7 +131,7 @@ rec { # On darwin a script cannot be used as an interpreter in a shebang but # there doesn't seem to be a limit to the size of shebang and multiple # arguments to the interpreter are allowed. - if [[ -n "${toString pkgs.stdenvNoCC.isDarwin}" ]] && isScript $interpreter + if [[ -n "${toString pkgs.stdenvNoCC.hostPlatform.isDarwin}" ]] && isScript $interpreter then wrapperInterpreterLine=$(head -1 "$interpreter" | tail -c+3) # Get first word from the line (note: xargs echo remove leading spaces) @@ -297,25 +297,36 @@ rec { ln -s ${inner}/bin/${name} $out ''; - # Like writeScript but the first line is a shebang to bash - # - # Can be called with or without extra arguments. - # - # Example without arguments: - # writeBash "example" '' - # echo hello world - # '' - # - # Example with arguments: - # writeBash "example" - # { - # makeWrapperArgs = [ - # "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" - # ]; - # } - # '' - # hello - # '' + /** + Like writeScript but the first line is a shebang to bash + Can be called with or without extra arguments. + + # Examples + :::{.example} + + ## Without arguments + + ```nix + writeBash "example" '' + echo hello world + '' + ``` + + ## With arguments + + ```nix + writeBash "example" + { + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" + ]; + } + '' + hello + '' + ``` + ::: + */ writeBash = name: argsOrScript: if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then @@ -323,46 +334,72 @@ rec { else makeScriptWriter { interpreter = "${lib.getExe pkgs.bash}"; } name argsOrScript; - # Like writeScriptBin but the first line is a shebang to bash - # - # Can be called with or without extra arguments. - # - # Example without arguments: - # writeBashBin "example" '' - # echo hello world - # '' - # - # Example with arguments: - # writeBashBin "example" - # { - # makeWrapperArgs = [ - # "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" - # ]; - # } - # '' - # hello - # '' + /** + Like writeScriptBin but the first line is a shebang to bash + + Can be called with or without extra arguments. + + ## Examples + :::{.example} + ## `pkgs.writers.writeBashBin` example without arguments + + ```nix + writeBashBin "example" '' + echo hello world + '' + ``` + ::: + + :::{.example} + ## `pkgs.writers.writeBashBin` example with arguments + + ```nix + writeBashBin "example" + { + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" + ]; + } + '' + hello + '' + ``` + ::: + */ writeBashBin = name: writeBash "/bin/${name}"; - # Like writeScript but the first line is a shebang to dash - # - # Can be called with or without extra arguments. - # - # Example without arguments: - # writeDash "example" '' - # echo hello world - # '' - # - # Example with arguments: - # writeDash "example" - # { - # makeWrapperArgs = [ - # "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" - # ]; - # } - # '' - # hello - # '' + /** + Like writeScript but the first line is a shebang to dash + + Can be called with or without extra arguments. + + # Example + :::{.example} + ## `pkgs.writers.writeDash` example without arguments + + ```nix + writeDash "example" '' + echo hello world + '' + ``` + ::: + + :::{.example} + ## `pkgs.writers.writeDash` example with arguments + + ```nix + writeDash "example" + { + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" + ]; + } + '' + hello + '' + ``` + ::: + */ writeDash = name: argsOrScript: if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then @@ -370,46 +407,71 @@ rec { else makeScriptWriter { interpreter = "${lib.getExe pkgs.dash}"; } name argsOrScript; - # Like writeScriptBin but the first line is a shebang to dash - # - # Can be called with or without extra arguments. - # - # Example without arguments: - # writeDashBin "example" '' - # echo hello world - # '' - # - # Example with arguments: - # writeDashBin "example" - # { - # makeWrapperArgs = [ - # "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" - # ]; - # } - # '' - # hello - # '' + /** + Like writeScriptBin but the first line is a shebang to dash + + Can be called with or without extra arguments. + + # Examples + :::{.example} + ## `pkgs.writers.writeDashBin` without arguments + + ```nix + writeDashBin "example" '' + echo hello world + '' + ``` + ::: + + :::{.example} + ## `pkgs.writers.writeDashBin` with arguments + + ```nix + writeDashBin "example" + { + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" + ]; + } + '' + hello + '' + ``` + ::: + */ writeDashBin = name: writeDash "/bin/${name}"; - # Like writeScript but the first line is a shebang to fish - # - # Can be called with or without extra arguments. - # - # Example without arguments: - # writeFish "example" '' - # echo hello world - # '' - # - # Example with arguments: - # writeFish "example" - # { - # makeWrapperArgs = [ - # "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" - # ]; - # } - # '' - # hello - # '' + /** + Like writeScript but the first line is a shebang to fish + + Can be called with or without extra arguments. + + :::{.example} + ## `pkgs.writers.writeFish` without arguments + + ```nix + writeFish "example" '' + echo hello world + '' + ``` + ::: + + :::{.example} + ## `pkgs.writers.writeFish` with arguments + + ```nix + writeFish "example" + { + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" + ]; + } + '' + hello + '' + ``` + ::: + */ writeFish = name: argsOrScript: if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then @@ -426,36 +488,140 @@ rec { check = "${lib.getExe pkgs.fish} --no-config --no-execute"; # syntax check only } name argsOrScript; - # Like writeScriptBin but the first line is a shebang to fish - # - # Can be called with or without extra arguments. - # - # Example without arguments: - # writeFishBin "example" '' - # echo hello world - # '' - # - # Example with arguments: - # writeFishBin "example" - # { - # makeWrapperArgs = [ - # "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" - # ]; - # } - # '' - # hello - # '' + /** + Like writeScriptBin but the first line is a shebang to fish + + Can be called with or without extra arguments. + + # Examples + :::{.example} + ## `pkgs.writers.writeFishBin` without arguments + + ```nix + writeFishBin "example" '' + echo hello world + '' + ``` + ::: + + :::{.example} + ## `pkgs.writers.writeFishBin` with arguments + + ```nix + writeFishBin "example" + { + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" + ]; + } + '' + hello + '' + ``` + ::: + */ writeFishBin = name: writeFish "/bin/${name}"; - # writeHaskell takes a name, an attrset with libraries and haskell version (both optional) - # and some haskell source code and returns an executable. - # - # Example: - # writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } '' - # import Acme.Missiles - # - # main = launchMissiles - # ''; + /** + Like writeScript but the first line is a shebang to babashka + + Can be called with or without extra arguments. + + :::{.example} + ## `pkgs.writers.writeBabashka` without arguments + + ```nix + writeBabashka "example" '' + (println "hello world") + '' + ``` + ::: + + :::{.example} + ## `pkgs.writers.writeBabashka` with arguments + + ```nix + writeBabashka "example" + { + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" + ]; + } + '' + (require '[babashka.tasks :as tasks]) + (tasks/shell "hello" "-g" "Hello babashka!") + '' + ``` + ::: + */ + writeBabashka = + name: argsOrScript: + if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then + makeScriptWriter ( + argsOrScript + // { + interpreter = "${lib.getExe pkgs.babashka}"; + check = "${lib.getExe pkgs.clj-kondo} --lint"; + } + ) name + else + makeScriptWriter { + interpreter = "${lib.getExe pkgs.babashka}"; + check = "${lib.getExe pkgs.clj-kondo} --lint"; + } name argsOrScript; + + /** + Like writeScriptBin but the first line is a shebang to babashka + + Can be called with or without extra arguments. + + # Examples + :::{.example} + ## `pkgs.writers.writeBabashkaBin` without arguments + + ```nix + writeBabashkaBin "example" '' + (println "hello world") + '' + ``` + ::: + + :::{.example} + ## `pkgs.writers.writeBabashkaBin` with arguments + + ```nix + writeBabashkaBin "example" + { + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" + ]; + } + '' + (require '[babashka.tasks :as tasks]) + (tasks/shell "hello" "-g" "Hello babashka!") + '' + ``` + ::: + */ + writeBabashkaBin = name: writeBabashka "/bin/${name}"; + + /** + writeHaskell takes a name, an attrset with libraries and haskell version (both optional) + and some haskell source code and returns an executable. + + # Examples + :::{.example} + ## `pkgs.writers.writeHaskell` usage example + + ```nix + writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } '' + import Acme.Missiles + + main = launchMissiles + ''; + ``` + ::: + */ writeHaskell = name: { @@ -480,28 +646,43 @@ rec { inherit makeWrapperArgs strip; } name; - # writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin) + /** + writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin) + */ writeHaskellBin = name: writeHaskell "/bin/${name}"; - # Like writeScript but the first line is a shebang to nu - # - # Can be called with or without extra arguments. - # - # Example without arguments: - # writeNu "example" '' - # echo hello world - # '' - # - # Example with arguments: - # writeNu "example" - # { - # makeWrapperArgs = [ - # "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" - # ]; - # } - # '' - # hello - # '' + /** + Like writeScript but the first line is a shebang to nu + + Can be called with or without extra arguments. + + # Examples + :::{.example} + ## `pkgs.writers.writeNu` without arguments + + ```nix + writeNu "example" '' + echo hello world + '' + ``` + ::: + + :::{.example} + ## `pkgs.writers.writeNu` with arguments + + ```nix + writeNu "example" + { + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" + ]; + } + '' + hello + '' + ``` + ::: + */ writeNu = name: argsOrScript: if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then @@ -511,29 +692,44 @@ rec { else makeScriptWriter { interpreter = "${lib.getExe pkgs.nushell} --no-config-file"; } name argsOrScript; - # Like writeScriptBin but the first line is a shebang to nu - # - # Can be called with or without extra arguments. - # - # Example without arguments: - # writeNuBin "example" '' - # echo hello world - # '' - # - # Example with arguments: - # writeNuBin "example" - # { - # makeWrapperArgs = [ - # "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" - # ]; - # } - # '' - # hello - # '' + /** + Like writeScriptBin but the first line is a shebang to nu + + Can be called with or without extra arguments. + + # Examples + :::{.example} + ## `pkgs.writers.writeNuBin` without arguments + + ```nix + writeNuBin "example" '' + echo hello world + '' + ``` + ::: + + :::{.example} + ## `pkgs.writers.writeNuBin` with arguments + + ```nix + writeNuBin "example" + { + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" + ]; + } + '' + hello + '' + ``` + ::: + */ writeNuBin = name: writeNu "/bin/${name}"; - # makeRubyWriter takes ruby and compatible rubyPackages and produces ruby script writer, - # If any libraries are specified, ruby.withPackages is used as interpreter, otherwise the "bare" ruby is used. + /** + makeRubyWriter takes ruby and compatible rubyPackages and produces ruby script writer, + If any libraries are specified, ruby.withPackages is used as interpreter, otherwise the "bare" ruby is used. + */ makeRubyWriter = ruby: rubyPackages: buildRubyPackages: name: { @@ -552,19 +748,30 @@ rec { } ) name; - # Like writeScript but the first line is a shebang to ruby - # - # Example: - # writeRuby "example" { libraries = [ pkgs.rubyPackages.git ]; } '' - # puts "hello world" - # '' + /** + Like writeScript but the first line is a shebang to ruby + + # Examples + :::{.example} + ## `pkgs.writers.writeRuby` usage example + + ```nix + writeRuby "example" { libraries = [ pkgs.rubyPackages.git ]; } '' + puts "hello world" + '' + ``` + + ::: + */ writeRuby = makeRubyWriter pkgs.ruby pkgs.rubyPackages buildPackages.rubyPackages; writeRubyBin = name: writeRuby "/bin/${name}"; - # makeLuaWriter takes lua and compatible luaPackages and produces lua script writer, - # which validates the script with luacheck at build time. If any libraries are specified, - # lua.withPackages is used as interpreter, otherwise the "bare" lua is used. + /** + makeLuaWriter takes lua and compatible luaPackages and produces lua script writer, + which validates the script with luacheck at build time. If any libraries are specified, + lua.withPackages is used as interpreter, otherwise the "bare" lua is used. + */ makeLuaWriter = lua: luaPackages: buildLuaPackages: name: { @@ -587,26 +794,35 @@ rec { } ) name; - # writeLua takes a name an attributeset with libraries and some lua source code and - # returns an executable (should also work with luajit) - # - # Example: - # writeLua "test_lua" { libraries = [ pkgs.luaPackages.say ]; } '' - # s = require("say") - # s:set_namespace("en") - # - # s:set('money', 'I have %s dollars') - # s:set('wow', 'So much money!') - # - # print(s('money', {1000})) -- I have 1000 dollars - # - # s:set_namespace("fr") -- switch to french! - # s:set('wow', "Tant d'argent!") - # - # print(s('wow')) -- Tant d'argent! - # s:set_namespace("en") -- switch back to english! - # print(s('wow')) -- So much money! - # '' + /** + writeLua takes a name an attributeset with libraries and some lua source code and + returns an executable (should also work with luajit) + + # Examples + :::{.example} + ## `pkgs.writers.writeLua` usage example + + ```nix + writeLua "test_lua" { libraries = [ pkgs.luaPackages.say ]; } '' + s = require("say") + s:set_namespace("en") + + s:set('money', 'I have %s dollars') + s:set('wow', 'So much money!') + + print(s('money', {1000})) -- I have 1000 dollars + + s:set_namespace("fr") -- switch to french! + s:set('wow', "Tant d'argent!") + + print(s('wow')) -- Tant d'argent! + s:set_namespace("en") -- switch back to english! + print(s('wow')) -- So much money! + '' + ``` + + ::: + */ writeLua = makeLuaWriter pkgs.lua pkgs.luaPackages buildPackages.luaPackages; writeLuaBin = name: writeLua "/bin/${name}"; @@ -620,7 +836,7 @@ rec { strip ? true, }: let - darwinArgs = lib.optionals stdenv.isDarwin [ "-L${lib.getLib libiconv}/lib" ]; + darwinArgs = lib.optionals stdenv.hostPlatform.isDarwin [ "-L${lib.getLib libiconv}/lib" ]; in makeBinWriter { compileScript = '' @@ -632,16 +848,39 @@ rec { writeRustBin = name: writeRust "/bin/${name}"; - # writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and - # returns an executable - # - # Example: - # writeJS "example" { libraries = [ pkgs.uglify-js ]; } '' - # var UglifyJS = require("uglify-js"); - # var code = "function add(first, second) { return first + second; }"; - # var result = UglifyJS.minify(code); - # console.log(result.code); - # '' + /** + writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and + returns an executable + + # Inputs + + `name` + + : 1\. Function argument + + `attrs` + + : 2\. Function argument + + `content` + + : 3\. Function argument + + # Examples + :::{.example} + ## `pkgs.writers.writeJS` usage example + + ```nix + writeJS "example" { libraries = [ pkgs.uglify-js ]; } '' + var UglifyJS = require("uglify-js"); + var code = "function add(first, second) { return first + second; }"; + var result = UglifyJS.minify(code); + console.log(result.code); + '' + ``` + + ::: + */ writeJS = name: { @@ -660,7 +899,9 @@ rec { exec ${lib.getExe pkgs.nodejs} ${pkgs.writeText "js" content} "$@" ''; - # writeJSBin takes the same arguments as writeJS but outputs a directory (like writeScriptBin) + /** + writeJSBin takes the same arguments as writeJS but outputs a directory (like writeScriptBin) + */ writeJSBin = name: writeJS "/bin/${name}"; awkFormatNginx = builtins.toFile "awkFormat-nginx.awk" '' @@ -685,14 +926,23 @@ rec { gixy $out ''; - # writePerl takes a name an attributeset with libraries and some perl sourcecode and - # returns an executable - # - # Example: - # writePerl "example" { libraries = [ pkgs.perlPackages.boolean ]; } '' - # use boolean; - # print "Howdy!\n" if true; - # '' + /** + writePerl takes a name an attributeset with libraries and some perl sourcecode and + returns an executable + + # Examples + :::{.example} + ## `pkgs.writers.writePerl` usage example + + ```nix + writePerl "example" { libraries = [ pkgs.perlPackages.boolean ]; } '' + use boolean; + print "Howdy!\n" if true; + '' + ``` + + ::: + */ writePerl = name: { @@ -706,12 +956,38 @@ rec { } ) name; - # writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin) + /** + writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin) + */ writePerlBin = name: writePerl "/bin/${name}"; - # makePythonWriter takes python and compatible pythonPackages and produces python script writer, - # which validates the script with flake8 at build time. If any libraries are specified, - # python.withPackages is used as interpreter, otherwise the "bare" python is used. + /** + makePythonWriter takes python and compatible pythonPackages and produces python script writer, + which validates the script with flake8 at build time. If any libraries are specified, + python.withPackages is used as interpreter, otherwise the "bare" python is used. + + # Inputs + + `python` + + : 1\. Function argument + + `pythonPackages` + + : 2\. Function argument + + `buildPythonPackages` + + : 3\. Function argument + + `name` + + : 4\. Function argument + + `attrs` + + : 5\. Function argument + */ makePythonWriter = python: pythonPackages: buildPythonPackages: name: { @@ -745,55 +1021,86 @@ rec { } ) name; - # writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and - # returns an executable - # - # Example: - # writePyPy2 "test_pypy2" { libraries = [ pkgs.pypy2Packages.enum ]; } '' - # from enum import Enum - # - # class Test(Enum): - # a = "success" - # - # print Test.a - # '' + /** + writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and + returns an executable + + # Examples + :::{.example} + ## `pkgs.writers.writePyPy2` usage example + + ```nix + writePyPy2 "test_pypy2" { libraries = [ pkgs.pypy2Packages.enum ]; } '' + from enum import Enum + + class Test(Enum): + a = "success" + + print Test.a + '' + ``` + + ::: + */ writePyPy2 = makePythonWriter pkgs.pypy2 pkgs.pypy2Packages buildPackages.pypy2Packages; - # writePyPy2Bin takes the same arguments as writePyPy2 but outputs a directory (like writeScriptBin) + /** + writePyPy2Bin takes the same arguments as writePyPy2 but outputs a directory (like writeScriptBin) + */ writePyPy2Bin = name: writePyPy2 "/bin/${name}"; - # writePython3 takes a name an attributeset with libraries and some python3 sourcecode and - # returns an executable - # - # Example: - # writePython3 "test_python3" { libraries = [ pkgs.python3Packages.pyyaml ]; } '' - # import yaml - # - # y = yaml.safe_load(""" - # - test: success - # """) - # print(y[0]['test']) - # '' + /** + writePython3 takes a name an attributeset with libraries and some python3 sourcecode and + returns an executable + + # Examples + :::{.example} + ## `pkgs.writers.writePython3` usage example + + ```nix + writePython3 "test_python3" { libraries = [ pkgs.python3Packages.pyyaml ]; } '' + import yaml + + y = yaml.safe_load(""" + - test: success + """) + print(y[0]['test']) + '' + ``` + + ::: + */ writePython3 = makePythonWriter pkgs.python3 pkgs.python3Packages buildPackages.python3Packages; # writePython3Bin takes the same arguments as writePython3 but outputs a directory (like writeScriptBin) writePython3Bin = name: writePython3 "/bin/${name}"; - # writePyPy3 takes a name an attributeset with libraries and some pypy3 sourcecode and - # returns an executable - # - # Example: - # writePyPy3 "test_pypy3" { libraries = [ pkgs.pypy3Packages.pyyaml ]; } '' - # import yaml - # - # y = yaml.safe_load(""" - # - test: success - # """) - # print(y[0]['test']) - # '' + /** + writePyPy3 takes a name an attributeset with libraries and some pypy3 sourcecode and + returns an executable + + # Examples + :::{.example} + ## `pkgs.writers.writePyPy3` usage example + + ```nix + writePyPy3 "test_pypy3" { libraries = [ pkgs.pypy3Packages.pyyaml ]; } '' + import yaml + + y = yaml.safe_load(""" + - test: success + """) + print(y[0]['test']) + '' + ``` + + ::: + */ writePyPy3 = makePythonWriter pkgs.pypy3 pkgs.pypy3Packages buildPackages.pypy3Packages; - # writePyPy3Bin takes the same arguments as writePyPy3 but outputs a directory (like writeScriptBin) + /** + writePyPy3Bin takes the same arguments as writePyPy3 but outputs a directory (like writeScriptBin) + */ writePyPy3Bin = name: writePyPy3 "/bin/${name}"; makeFSharpWriter = diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 656d127930fad..b7e8452947f06 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -18,6 +18,8 @@ let makeFSharpWriter writeBash writeBashBin + writeBabashka + writeBabashkaBin writeDash writeDashBin writeFish @@ -85,6 +87,10 @@ recurseIntoAttrs { end ''); + babashka = expectSuccessBin (writeBabashkaBin "test-writers-babashka-bin" '' + (println "success") + ''); + rust = expectSuccessBin (writeRustBin "test-writers-rust-bin" {} '' fn main(){ println!("success") @@ -189,6 +195,10 @@ recurseIntoAttrs { echo "success" ''); + babashka = expectSuccess (writeBabashka "test-writers-babashka" '' + (println "success") + ''); + haskell = expectSuccess (writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default @@ -245,30 +255,32 @@ recurseIntoAttrs { # print(y[0]['test']) #''); - fsharp = expectSuccess (makeFSharpWriter { - libraries = { fetchNuGet }: [ - (fetchNuGet { pname = "FSharp.SystemTextJson"; version = "0.17.4"; sha256 = "1bplzc9ybdqspii4q28l8gmfvzpkmgq5l1hlsiyg2h46w881lwg2"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.6.0"; sha256 = "0ism236hwi0k6axssfq58s1d8lihplwiz058pdvl8al71hagri39"; }) - ]; - } "test-writers-fsharp" '' - - #r "nuget: FSharp.SystemTextJson, 0.17.4" - - module Json = - open System.Text.Json - open System.Text.Json.Serialization - let options = JsonSerializerOptions() - options.Converters.Add(JsonFSharpConverter()) - let serialize<'a> (o: 'a) = JsonSerializer.Serialize<'a>(o, options) - let deserialize<'a> (str: string) = JsonSerializer.Deserialize<'a>(str, options) - - type Letter = A | B - let a = {| Hello = Some "World"; Letter = A |} - if a |> Json.serialize |> Json.deserialize |> (=) a - then "success" - else "failed" - |> printfn "%s" - ''); + # Commented out because fails with 'error FS0039: The value or constructor 'JsonFSharpConverter' is not defined.' + + # fsharp = expectSuccess (makeFSharpWriter { + # libraries = { fetchNuGet }: [ + # (fetchNuGet { pname = "FSharp.SystemTextJson"; version = "0.17.4"; sha256 = "1bplzc9ybdqspii4q28l8gmfvzpkmgq5l1hlsiyg2h46w881lwg2"; }) + # (fetchNuGet { pname = "System.Text.Json"; version = "4.6.0"; sha256 = "0ism236hwi0k6axssfq58s1d8lihplwiz058pdvl8al71hagri39"; }) + # ]; + # } "test-writers-fsharp" '' + # + # #r "nuget: FSharp.SystemTextJson, 0.17.4" + # + # module Json = + # open System.Text.Json + # open System.Text.Json.Serialization + # let options = JsonSerializerOptions() + # options.Converters.Add(JsonFSharpConverter()) + # let serialize<'a> (o: 'a) = JsonSerializer.Serialize<'a>(o, options) + # let deserialize<'a> (str: string) = JsonSerializer.Deserialize<'a>(str, options) + # + # type Letter = A | B + # let a = {| Hello = Some "World"; Letter = A |} + # if a |> Json.serialize |> Json.deserialize |> (=) a + # then "success" + # else "failed" + # |> printfn "%s" + # ''); #pypy2NoLibs = expectSuccess (writePyPy2 "test-writers-pypy2-no-libs" {} '' # print("success") @@ -369,6 +381,36 @@ recurseIntoAttrs { '' ); + babashka-bin = expectSuccessBin ( + writeBabashkaBin "test-writers-wrapping-babashka-bin" + { + makeWrapperArgs = [ + "--set" + "ThaigerSprint" + "Thailand" + ]; + } + '' + (when (= (System/getenv "ThaigerSprint") "Thailand") + (println "success")) + '' + ); + + babashka = expectSuccess ( + writeBabashka "test-writers-wrapping-babashka" + { + makeWrapperArgs = [ + "--set" + "ThaigerSprint" + "Thailand" + ]; + } + '' + (when (= (System/getenv "ThaigerSprint") "Thailand") + (println "success")) + '' + ); + python = expectSuccess ( writePython3 "test-writers-wrapping-python" { diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md index 17214ded02c48..5eb121b4f3f05 100644 --- a/pkgs/by-name/README.md +++ b/pkgs/by-name/README.md @@ -18,7 +18,7 @@ pkgs ``` -Where `some-package` is the package name and `so` is the lowercased 2-letter prefix of the package name. +Where `some-package` is the attribute name corresponding to the package, and `so` is the lowercase 2-letter prefix of the attribute name. The `package.nix` may look like this: @@ -79,18 +79,39 @@ and override its value in [`pkgs/top-level/all-packages.nix`](../top-level/all-p ## Manual migration guidelines Most packages are still defined in `all-packages.nix` and the [category hierarchy](../README.md#category-hierarchy). -Please hold off migrating your maintained packages to this directory. +Since it would take a lot of contributor and reviewer time to migrate all packages manually, +an [automated migration is planned](https://github.com/NixOS/nixpkgs/pull/211832), +though it is expected to still take some time to get done. +If you're interested in helping out with this effort, +please see [this ticket](https://github.com/NixOS/nixpkgs-vet/issues/56). -1. An automated migration for the majority of packages [is being worked on](https://github.com/NixOS/nixpkgs/pull/211832). - In order to save on contributor and reviewer time, packages should only be migrated manually afterwards if they couldn't be migrated automatically. +Since [only PRs to packages in `pkgs/by-name` can be automatically merged](../../CONTRIBUTING.md#how-to-merge-pull-requests), +if package maintainers would like to use this feature, they are welcome to migrate their packages to `pkgs/by-name`. +To lessen PR traffic, they're encouraged to also perform some more general maintenance on the package in the same PR, +though this is not required and must not be expected. -1. Manual migrations should only be lightly encouraged if the relevant code is being worked on anyways. - For example with a package update or refactoring. +Note that `callPackage` definitions in `all-packages.nix` with custom arguments should not be removed. +That is a backwards-incompatible change because it changes the `.override` interface. +Such packages may still be moved to `pkgs/by-name` however, in order to avoid the slightly superficial choice of directory / category in which the `default.nix` file was placed, but please keep the definition in `all-packages.nix` using `callPackage`. +See also [changing implicit attribute defaults](#changing-implicit-attribute-defaults). -1. Manual migrations should not remove definitions from `all-packages.nix` with custom arguments. - That is a backwards-incompatible change because it changes the `.override` interface. - Such packages may still be moved to `pkgs/by-name` however, while keeping the definition in `all-packages.nix`. - See also [changing implicit attribute defaults](#changing-implicit-attribute-defaults). +Definitions like the following however, _can_ be transitioned: + +```nix +# all-packages.nix +fooWithBaz = foo.override { + bar = baz; +}; +# turned into pkgs/by-name/fo/fooWithBaz/package.nix with: +{ + foo, + baz, +}: + +foo.override { + bar = baz; +} +``` ## Limitations @@ -110,16 +131,16 @@ There's some limitations as to which packages can be defined using this structur ## Validation -CI performs [certain checks](https://github.com/NixOS/nixpkgs-check-by-name?tab=readme-ov-file#validity-checks) on the `pkgs/by-name` structure. -This is done using the [`nixpkgs-check-by-name` tool](https://github.com/NixOS/nixpkgs-check-by-name). +CI performs [certain checks](https://github.com/NixOS/nixpkgs-vet?tab=readme-ov-file#validity-checks) on the `pkgs/by-name` structure. +This is done using the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet). You can locally emulate the CI check using ``` -$ ./maintainers/scripts/check-by-name.sh master +$ ./ci/nixpkgs-vet.sh master ``` -See [here](../../.github/workflows/check-by-name.yml) for more info. +See [here](../../.github/workflows/nixpkgs-vet.yml) for more info. ## Recommendation for new packages with multiple versions diff --git a/pkgs/games/0verkill/default.nix b/pkgs/by-name/_0/_0verkill/package.nix similarity index 100% rename from pkgs/games/0verkill/default.nix rename to pkgs/by-name/_0/_0verkill/package.nix diff --git a/pkgs/tools/misc/0x/Cargo.lock b/pkgs/by-name/_0/_0x/Cargo.lock similarity index 100% rename from pkgs/tools/misc/0x/Cargo.lock rename to pkgs/by-name/_0/_0x/Cargo.lock diff --git a/pkgs/tools/misc/0x/default.nix b/pkgs/by-name/_0/_0x/package.nix similarity index 100% rename from pkgs/tools/misc/0x/default.nix rename to pkgs/by-name/_0/_0x/package.nix diff --git a/pkgs/by-name/_1/_1fps/package.nix b/pkgs/by-name/_1/_1fps/package.nix new file mode 100644 index 0000000000000..a8ec077491ceb --- /dev/null +++ b/pkgs/by-name/_1/_1fps/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + xorg, +}: +buildGoModule rec { + pname = "1fps"; + version = "0.1.10"; + + src = fetchFromGitHub { + owner = "1fpsvideo"; + repo = "1fps"; + rev = "v${version}"; + hash = "sha256-3uPGFxEWmKQxQWPmotZI29GykUGQDjtDjFPps4QMs0M="; + }; + + proxyVendor = true; + + vendorHash = "sha256-J3RGQhjpGURmXOwq19BbbNg5ERrUXHnSG5Id6gX7Nug="; + + buildInputs = [ + xorg.libX11 + xorg.libXtst + xorg.libXi + ]; + + meta = { + description = "Encrypted Screen Sharing"; + homepage = "https://1fps.video"; + license = lib.licenses.fsl11Asl20; + maintainers = with lib.maintainers; [ renesat ]; + mainProgram = "1fps"; + }; +} diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix new file mode 100644 index 0000000000000..97b1ccc6595ec --- /dev/null +++ b/pkgs/by-name/_1/_1oom/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gitUpdater, + autoreconfHook, + allegro, + libsamplerate, + libX11, + libXext, + SDL, + SDL_mixer, + SDL2, + SDL2_mixer, + readline, +}: + +stdenv.mkDerivation rec { + pname = "1oom"; + version = "1.11"; + + src = fetchFromGitHub { + owner = "1oom-fork"; + repo = "1oom"; + rev = "refs/tags/v${version}"; + hash = "sha256-xEHFuCOyuWmee6kgOc0WUk1iWWFqfFb42F7shGZmutQ="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ + allegro + libsamplerate + libX11 + libXext + SDL + SDL_mixer + SDL2 + SDL2_mixer + readline + ]; + + outputs = [ + "out" + "doc" + ]; + + postInstall = '' + install -d $doc/share/doc/${pname} + install -t $doc/share/doc/${pname} \ + HACKING NEWS PHILOSOPHY README.md doc/*.txt + ''; + + passthru.updateScript = gitUpdater { rev-prefix = "f"; }; + + meta = with lib; { + homepage = "https://github.com/1oom-fork/1oom"; + changelog = "https://github.com/1oom-fork/1oom/releases/tag/v${version}"; + description = "Master of Orion (1993) game engine recreation; a more updated fork"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = [ maintainers.AndersonTorres ]; + }; +} diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix index 2af660495cddf..90899330ea3d3 100644 --- a/pkgs/by-name/_2/_2ship2harkinian/package.nix +++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix @@ -138,7 +138,6 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "NON_PORTABLE" true) - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/2s2h") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'.src}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}") diff --git a/pkgs/by-name/_4/_4d-minesweeper/package.nix b/pkgs/by-name/_4/_4d-minesweeper/package.nix index 857b11229cd87..4cb7b20bcb45e 100644 --- a/pkgs/by-name/_4/_4d-minesweeper/package.nix +++ b/pkgs/by-name/_4/_4d-minesweeper/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { owner = "gapophustu"; repo = "4D-Minesweeper"; rev = "db176d8aa5981a597bbae6a1a74aeebf0f376df4"; - sha256 = "sha256-A5QKqCo9TTdzmK13WRSAfkrkeUqHc4yQCzy4ZZ9uX2M="; + hash = "sha256-A5QKqCo9TTdzmK13WRSAfkrkeUqHc4yQCzy4ZZ9uX2M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/4ti2/default.nix b/pkgs/by-name/_4/_4ti2/package.nix similarity index 100% rename from pkgs/applications/science/math/4ti2/default.nix rename to pkgs/by-name/_4/_4ti2/package.nix diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index e10414204a2d8..65ba3347eb48e 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -8,7 +8,7 @@ telegram-desktop.overrideAttrs (old: rec { pname = "64gram"; - version = "1.1.34"; + version = "1.1.39"; src = fetchFromGitHub { owner = "TDesktop-x64"; @@ -16,7 +16,7 @@ telegram-desktop.overrideAttrs (old: rec { rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-DbHbhkInZi8B/0fvbCWutN4noEv7MZ+C5Eg7g+89Moo="; + hash = "sha256-+slLW177PhNvMb4ARY3X95eKVZiZTxJIPuSurTiGTls="; }; patches = (old.patches or []) ++ [ @@ -41,6 +41,6 @@ telegram-desktop.overrideAttrs (old: rec { changelog = "https://github.com/TDesktop-x64/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ clot27 ]; mainProgram = "telegram-desktop"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/_9/_9base/package.nix b/pkgs/by-name/_9/_9base/package.nix index 580c0ad698dcf..3d523c513eecd 100644 --- a/pkgs/by-name/_9/_9base/package.nix +++ b/pkgs/by-name/_9/_9base/package.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation { platforms = platforms.unix; # needs additional work to support aarch64-darwin # due to usage of _DARWIN_NO_64_BIT_INODE - broken = stdenv.isAarch64 && stdenv.isDarwin; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/misc/9menu/default.nix b/pkgs/by-name/_9/_9menu/package.nix similarity index 100% rename from pkgs/applications/misc/9menu/default.nix rename to pkgs/by-name/_9/_9menu/package.nix diff --git a/pkgs/by-name/a5/a52dec/package.nix b/pkgs/by-name/a5/a52dec/package.nix index 048b96787a79d..c9223b7061fac 100644 --- a/pkgs/by-name/a5/a52dec/package.nix +++ b/pkgs/by-name/a5/a52dec/package.nix @@ -29,13 +29,14 @@ stdenv.mkDerivation rec { # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686 # which can also be fixed with - # hardeningDisable = lib.optional stdenv.isi686 "pic"; + # hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "pic"; # but it's better to disable tests than loose ASLR on i686 - doCheck = !stdenv.isi686; + doCheck = !stdenv.hostPlatform.isi686; meta = with lib; { description = "ATSC A/52 stream decoder"; homepage = "https://liba52.sourceforge.io/"; + changelog = "https://git.adelielinux.org/community/a52dec/-/blob/v${version}/ChangeLog?ref_type=tags"; license = licenses.gpl2Plus; maintainers = with maintainers; [ wegank ]; mainProgram = "a52dec"; diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix index a3561d811cc80..4f832429ff6f4 100644 --- a/pkgs/by-name/aa/aaaaxy/package.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -20,17 +20,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.5.190"; + version = "1.5.202"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-yMap8Po3NeFwaqTn0gCHp8f30iiNg1AmG/ALQcW8eYA="; + hash = "sha256-UR6rcdNXrDotakDhUW7EFYKpGEqGVmAPUUwrEG9Fiqs="; fetchSubmodules = true; }; - vendorHash = "sha256-Z52g/ZSIYjHt8bjeAnQidkFyprJOO/IkNcrSFcKcv30="; + vendorHash = "sha256-rNCzCSVENwoVTWOEcXBCWgVAwiBZtGsbyz3QBT+WUGw="; buildInputs = [ alsa-lib diff --git a/pkgs/tools/graphics/aaphoto/default.nix b/pkgs/by-name/aa/aaphoto/package.nix similarity index 100% rename from pkgs/tools/graphics/aaphoto/default.nix rename to pkgs/by-name/aa/aaphoto/package.nix diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index a7a7457647102..5c2a5f8f43e60 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ab-av1"; - version = "0.7.17"; + version = "0.7.18"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; rev = "v${version}"; - hash = "sha256-QPelXqJT3zbVP+lNiczrCR+JD4icimSyCravlIwTAyw="; + hash = "sha256-n8yclhjeEkkge9xHuM4ZW+7aubIiLWwxCmmGTI1bE9I="; }; - cargoHash = "sha256-7h1Hbtsk0pnoPXX5sFfzcZoH/sqcb0YTpmJp6yCzTG0="; + cargoHash = "sha256-Rn+y1W2Cimt5JrD2dLmvLmZshxyLO7N+oIALwGjxhvM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix index 680c59f714889..ed0d22eb4abee 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 = "2024.08.11"; + version = "2024.08.13"; src = fetchFromGitHub { owner = "sshlien"; repo = "abcmidi"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-ljRwRSF6Odv99ej8mmMjtf9NE0du7TtAypkw7W9TEYU="; + hash = "sha256-+X7ZPjZtqxEq2GSzdhLA48aqHfWFimST1GCfZ/NLjeU="; }; meta = { diff --git a/pkgs/by-name/ab/abctl/package.nix b/pkgs/by-name/ab/abctl/package.nix new file mode 100644 index 0000000000000..bd1464c550e80 --- /dev/null +++ b/pkgs/by-name/ab/abctl/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + stdenv, +}: +let + pname = "abctl"; + version = "0.13.1"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "airbytehq"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ZZP5wXsPtqkZd/sdj/LU8M/DYv0gjIWRspAFrp3ETH8="; + }; + + vendorHash = "sha256-uvOKH/MLIoIwYClpTIj010os9dGkkZPAVV0RYBjjzVk="; + + meta = { + description = "Airbyte's CLI for managing local Airbyte installations"; + homepage = "https://airbyte.com/"; + changelog = "https://github.com/airbytehq/abctl/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xelden ]; + mainProgram = "abctl"; + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/by-name/ab/abpoa/package.nix b/pkgs/by-name/ab/abpoa/package.nix index 7641674e61b1a..cecdcbc923a00 100644 --- a/pkgs/by-name/ab/abpoa/package.nix +++ b/pkgs/by-name/ab/abpoa/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "${lib.optionalString enablePython "py"}abpoa"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "yangao07"; repo = "abPOA"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-gS0PO7K4hN+3k2NF8enri1FzM80H2I+a3MNaKsm74xM="; + hash = "sha256-90mkXp4cC0Omnx0C7ab7NNs/M2oedIcICTUJl3qhcyo="; }; patches = [ ./simd-arch.patch ]; @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "SIMD-based C library for fast partial order alignment using adaptive band"; homepage = "https://github.com/yangao07/abPOA"; - changelog = "https://github.com/yangao07/abPOA/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/yangao07/abPOA/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; mainProgram = "abpoa"; diff --git a/pkgs/by-name/ac/ac-library/package.nix b/pkgs/by-name/ac/ac-library/package.nix new file mode 100644 index 0000000000000..6e3cebd0becd1 --- /dev/null +++ b/pkgs/by-name/ac/ac-library/package.nix @@ -0,0 +1,49 @@ +{ + fetchFromGitHub, + stdenv, + lib, + python3, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ac-library"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "atcoder"; + repo = "ac-library"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-AIqG98c1tcxxhYcX+NSf6Rw3onw61T5NTZtqQzT9jls="; + }; + + outputs = [ + "dev" + "out" + ]; + + buildInputs = [ + python3 + ]; + + installPhase = '' + runHook preInstall + + install -d $dev/include/atcoder + install -m644 atcoder/* $dev/include/atcoder/ + install -Dm755 expander.py $out/bin/expander + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Official library of AtCoder"; + homepage = "https://github.com/atcoder/ac-library"; + license = lib.licenses.cc0; + changelog = "https://github.com/atcoder/ac-library/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ac/accerciser/package.nix b/pkgs/by-name/ac/accerciser/package.nix index 7493c6a0bfa4d..3d5cf0f5885bc 100644 --- a/pkgs/by-name/ac/accerciser/package.nix +++ b/pkgs/by-name/ac/accerciser/package.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "d2m9T09j3ImhQ+hs3ET+rr1/jJab6lwfWoaskxGQL0g="; + hash = "sha256-d2m9T09j3ImhQ+hs3ET+rr1/jJab6lwfWoaskxGQL0g="; }; nativeBuildInputs = [ @@ -68,6 +68,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/accerciser"; + changelog = "https://gitlab.gnome.org/GNOME/accerciser/-/blob/${version}/NEWS?ref_type=tags"; description = "Interactive Python accessibility explorer"; mainProgram = "accerciser"; maintainers = teams.gnome.members; diff --git a/pkgs/games/ace-of-penguins/fixup-miscompilations.patch b/pkgs/by-name/ac/ace-of-penguins/fixup-miscompilations.patch similarity index 100% rename from pkgs/games/ace-of-penguins/fixup-miscompilations.patch rename to pkgs/by-name/ac/ace-of-penguins/fixup-miscompilations.patch diff --git a/pkgs/games/ace-of-penguins/default.nix b/pkgs/by-name/ac/ace-of-penguins/package.nix similarity index 100% rename from pkgs/games/ace-of-penguins/default.nix rename to pkgs/by-name/ac/ace-of-penguins/package.nix diff --git a/pkgs/by-name/ac/aces-container/package.nix b/pkgs/by-name/ac/aces-container/package.nix new file mode 100644 index 0000000000000..0d55b2e74a30c --- /dev/null +++ b/pkgs/by-name/ac/aces-container/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "aces-container"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "ampas"; + repo = "aces_container"; + rev = "v${finalAttrs.version}"; + hash = "sha256-luMqXqlJ6UzoawEDmbK38lm3GHosaZm/mFJntBF54Y4="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Reference Implementation of SMPTE ST2065-4"; + homepage = "https://github.com/ampas/aces_container"; + license = lib.licenses.ampas; + maintainers = with lib.maintainers; [ paperdigits ]; + mainProgram = "aces-container"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix new file mode 100644 index 0000000000000..11e6f1f454c7a --- /dev/null +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, bison +, flex +}: + +stdenv.mkDerivation rec { + pname = "acpica-tools"; + version = "20240827"; + + src = fetchFromGitHub { + owner = "acpica"; + repo = "acpica"; + rev = "refs/tags/version-${version}"; + hash = "sha256-RlhKBvydesUdBaFUHk3sSM6SRIZ7q5IqnibX+hps+Tc="; + }; + + nativeBuildInputs = [ bison flex ]; + + buildFlags = [ + "acpibin" + "acpidump" + "acpiexamples" + "acpiexec" + "acpihelp" + "acpisrc" + "acpixtract" + "iasl" + ]; + + env.NIX_CFLAGS_COMPILE = toString ([ + "-O3" + ]); + + enableParallelBuilding = true; + + # i686 builds fail with hardening enabled (due to -Wformat-overflow). Disable + # -Werror altogether to make this derivation less fragile to toolchain + # updates. + NOWERROR = "TRUE"; + + # We can handle stripping ourselves. + # Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected. + INSTALLFLAGS = lib.optionals (!stdenv.hostPlatform.isDarwin) "-m 555"; + + installFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + homepage = "https://www.acpica.org/"; + description = "ACPICA Tools"; + license = with licenses; [ iasl gpl2Only bsd3 ]; + maintainers = with maintainers; [ tadfisher felixsinger ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/tools/misc/acr/default.nix b/pkgs/by-name/ac/acr/package.nix similarity index 100% rename from pkgs/development/tools/misc/acr/default.nix rename to pkgs/by-name/ac/acr/package.nix diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix new file mode 100644 index 0000000000000..621a392fe2d78 --- /dev/null +++ b/pkgs/by-name/ac/act/package.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: + +let + version = "0.2.67"; +in +buildGoModule { + pname = "act"; + inherit version; + + src = fetchFromGitHub { + owner = "nektos"; + repo = "act"; + rev = "refs/tags/v${version}"; + hash = "sha256-yNa6o35YUP8D8K3kQLHQOG3V9mWGoxNvYgw5UQOqAtc="; + }; + + vendorHash = "sha256-bkOLortxztmzAO/KCbQC4YsZ5iAero1yxblCkDZg8Ds="; + + doCheck = false; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + meta = { + description = "Run your GitHub Actions locally"; + mainProgram = "act"; + homepage = "https://github.com/nektos/act"; + changelog = "https://github.com/nektos/act/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + Br1ght0ne + kashw2 + ]; + }; +} diff --git a/pkgs/by-name/ac/actionlint/package.nix b/pkgs/by-name/ac/actionlint/package.nix new file mode 100644 index 0000000000000..4619367ddf7ef --- /dev/null +++ b/pkgs/by-name/ac/actionlint/package.nix @@ -0,0 +1,62 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + makeWrapper, + python3Packages, + ronn, + shellcheck, +}: + +let + version = "1.7.3"; +in +buildGoModule { + pname = "actionlint"; + inherit version; + + subPackages = [ "cmd/actionlint" ]; + + src = fetchFromGitHub { + owner = "rhysd"; + repo = "actionlint"; + rev = "v${version}"; + hash = "sha256-IwkTiuQ3eTZMn1y0NG1jo9UrX7AmEUBRSGQ/vq/0YL8="; + }; + + vendorHash = "sha256-SIY79SjYYXW2slUQr2Bm9dLH8K2wE3l/TL3QP0m8GLs="; + + nativeBuildInputs = [ + makeWrapper + ronn + installShellFiles + ]; + + postInstall = '' + ronn --roff man/actionlint.1.ronn + installManPage man/actionlint.1 + wrapProgram "$out/bin/actionlint" \ + --prefix PATH : ${ + lib.makeBinPath [ + python3Packages.pyflakes + shellcheck + ] + } + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/rhysd/actionlint.version=${version}" + ]; + + meta = { + homepage = "https://rhysd.github.io/actionlint/"; + description = "Static checker for GitHub Actions workflow files"; + changelog = "https://github.com/rhysd/actionlint/raw/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ momeemt ]; + mainProgram = "actionlint"; + }; +} diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix new file mode 100644 index 0000000000000..81a6b540f232b --- /dev/null +++ b/pkgs/by-name/ac/activemq/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: + +let + version = "6.1.3"; +in +stdenvNoCC.mkDerivation { + pname = "activemq"; + inherit version; + + src = fetchurl { + url = "https://archive.apache.org/dist/activemq/${version}/apache-activemq-${version}-bin.tar.gz"; + hash = "sha256-ytFOgW6ZDxMScJ6/wij0KJXYxUxlLTzVbwtRRWNdx5Q="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv * $out/ + for j in $(find $out/lib -name "*.jar"); do + cp="''${cp:+"$cp:"}$j"; + done + echo "CLASSPATH=$cp" > $out/lib/classpath.env + + runHook postInstall + ''; + + meta = { + homepage = "https://activemq.apache.org/"; + description = "Messaging and Integration Patterns server written in Java"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.asl20; + mainProgram = "activemq"; + maintainers = [ lib.maintainers.anthonyroussel ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix index d65f91fd5e802..3a7b3b685359a 100644 --- a/pkgs/by-name/ad/ad-miner/package.nix +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ad-miner"; - version = "1.5.2"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "Mazars-Tech"; repo = "AD_Miner"; rev = "refs/tags/v${version}"; - hash = "sha256-Xb0RFllg3oqW6PhUjRxDkgXd7lv7XD37FfBsnpxrN+s="; + hash = "sha256-kWIareupm0r48HGnESk5S/0IEKjDfHtXWi64ehjdAQ4="; }; # All requirements are pinned diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index aaf2d31986ffd..33ab8e65463dd 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ada"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; rev = "v${version}"; - hash = "sha256-bDkhSAd+MlOm8pd5MPvzVHkWMY9aNcvNfLuH7qoyUuk="; + hash = "sha256-VWFxupmgc+fq9aj/02uMEsiwhP+9PWMSleoIoyKVe3c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ad/adafruit-nrfutil/package.nix b/pkgs/by-name/ad/adafruit-nrfutil/package.nix index fda8682a8ca67..09d8aa66377d2 100644 --- a/pkgs/by-name/ad/adafruit-nrfutil/package.nix +++ b/pkgs/by-name/ad/adafruit-nrfutil/package.nix @@ -23,12 +23,12 @@ python3Packages.buildPythonApplication rec { (fetchpatch { name = "fix-tests.patch"; url = "https://github.com/adafruit/Adafruit_nRF52_nrfutil/commit/e5fbcc8ee5958041db38c04139ba686bf7d1b845.patch"; - sha256 = "sha256-0tbJldGtYcDdUzA3wZRv0lenXVn6dqV016U9nMpQ6/w="; + hash = "sha256-0tbJldGtYcDdUzA3wZRv0lenXVn6dqV016U9nMpQ6/w="; }) (fetchpatch { name = "fix-test-test_get_vk_pem.patch"; url = "https://github.com/adafruit/Adafruit_nRF52_nrfutil/commit/f42cee3c2d7c8d0911f27ba24d6a140083cb85cf.patch"; - sha256 = "sha256-7WoRqPKc8O5EYK7Fj1WrMJREwhueiVpkEizIfVnEPBU="; + hash = "sha256-7WoRqPKc8O5EYK7Fj1WrMJREwhueiVpkEizIfVnEPBU="; }) ]; diff --git a/pkgs/by-name/ad/adcli/package.nix b/pkgs/by-name/ad/adcli/package.nix new file mode 100644 index 0000000000000..6ca3445c88a40 --- /dev/null +++ b/pkgs/by-name/ad/adcli/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + autoreconfHook, + cyrus_sasl, + docbook_xml_dtd_43, + docbook_xsl, + fetchFromGitLab, + libkrb5, + libxslt, + openldap, + pkg-config, + util-linux, + xmlto, +}: + +stdenv.mkDerivation rec { + pname = "adcli"; + version = "0.9.2"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "realmd"; + repo = "adcli"; + rev = version; + hash = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE="; + }; + + nativeBuildInputs = [ + autoreconfHook + docbook_xsl + pkg-config + util-linux + xmlto + ]; + + buildInputs = [ + cyrus_sasl + libkrb5 + libxslt + openldap + ]; + + configureFlags = [ "--disable-debug" ]; + + postPatch = '' + substituteInPlace tools/Makefile.am \ + --replace-fail 'sbin_PROGRAMS' 'bin_PROGRAMS' + + substituteInPlace doc/Makefile.am \ + --replace-fail 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \ + '${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl' + + function patch_docbook() { + substituteInPlace $1 \ + --replace-fail "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ + "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd" + } + patch_docbook doc/adcli.xml + patch_docbook doc/adcli-devel.xml + patch_docbook doc/adcli-docs.xml + ''; + + meta = with lib; { + homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html"; + description = "Helper library and tools for Active Directory client operations"; + mainProgram = "adcli"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ + SohamG + anthonyroussel + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ad/adrs/package.nix b/pkgs/by-name/ad/adrs/package.nix index ed12b527ae380..6cd0994989473 100644 --- a/pkgs/by-name/ad/adrs/package.nix +++ b/pkgs/by-name/ad/adrs/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "adrs"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "joshrotenberg"; repo = "adrs"; rev = "v${version}"; - hash = "sha256-5rvdW2UntseSsKFndrDj9ogH/qYN+KymuOsuqS0/C3M="; + hash = "sha256-a1vxo2Zw2fvCJeGaatNqf2h74t7pvWppYS2l2gbCF5k="; }; - cargoHash = "sha256-WqsZ+ICfKrackQ5dMs/WvF3inJX+k9LhxAJkXmaVAtY="; + cargoHash = "sha256-eVADcCXf6hl9o9pApp3inU7kZAKA3k5mM3+vy7cq5u8="; meta = { description = "Command-line tool for managing Architectural Decision Records"; diff --git a/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix b/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix index 3ffe3c70f17cc..62686f251f164 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Fullcolor icon theme providing fallback for legacy apps"; homepage = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy"; + changelog = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.cc-by-sa-30; maintainers = teams.gnome.members; platforms = platforms.all; diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix index 1ea493890bf9a..14d6b869e75df 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme"; + changelog = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/blob/${version}/NEWS?ref_type=tags"; platforms = with platforms; linux ++ darwin; maintainers = teams.gnome.members; license = licenses.cc-by-sa-30; diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index 7107d548410d1..da6bd31073126 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -38,10 +38,10 @@ wxGTK, zlib, # Boolean guard flags - alsaSupport ? stdenv.isLinux, + alsaSupport ? stdenv.hostPlatform.isLinux, openalSupport ? true, portaudioSupport ? true, - pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, + pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, spellcheckSupport ? true, useBundledLuaJIT ? false, }: @@ -102,12 +102,12 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals openalSupport [ - (if stdenv.isDarwin then OpenAL else openal) + (if stdenv.hostPlatform.isDarwin then OpenAL else openal) ] ++ lib.optionals portaudioSupport [ portaudio ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] ++ lib.optionals spellcheckSupport [ hunspell ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon Cocoa diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index d6697cf1558d1..6291681a4fbf3 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromSourcehut +, fetchpatch , ncurses , notmuch , scdoc @@ -31,6 +32,12 @@ buildGoModule rec { patches = [ ./runtime-libexec.patch + + # patch to fix a encoding problem with gpg signed messages + (fetchpatch { + url ="https://git.sr.ht/~rjarry/aerc/commit/7346d20.patch"; + hash = "sha256-OCm8BcovYN2IDSgslZklQxkGVkSYQ8HLCrf2+DRB2mM="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/ae/aerogramme/0001-update-time-rs.patch b/pkgs/by-name/ae/aerogramme/0001-update-time-rs.patch new file mode 100644 index 0000000000000..cbfffbe090186 --- /dev/null +++ b/pkgs/by-name/ae/aerogramme/0001-update-time-rs.patch @@ -0,0 +1,59 @@ +From ad754664a05808bdbb976906a86ad0b08f16eb32 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Tue, 24 Sep 2024 20:38:19 +0800 +Subject: [PATCH] update time-rs + +--- + Cargo.lock | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 0a159ae..cf6b1c4 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2468,6 +2468,12 @@ dependencies = [ + "num-traits", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.45" +@@ -3579,12 +3585,13 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.31" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", + "powerfmt", + "serde", + "time-core", +@@ -3599,10 +3606,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.16" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +-- +2.46.0 + diff --git a/pkgs/by-name/ae/aerogramme/Cargo.lock b/pkgs/by-name/ae/aerogramme/Cargo.lock index 0a159ae3487db..cf6b1c43b0eb4 100644 --- a/pkgs/by-name/ae/aerogramme/Cargo.lock +++ b/pkgs/by-name/ae/aerogramme/Cargo.lock @@ -2468,6 +2468,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -3579,12 +3585,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -3599,10 +3606,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/pkgs/by-name/ae/aerogramme/package.nix b/pkgs/by-name/ae/aerogramme/package.nix index 86e3ef5b7dd9b..49379db4a2c62 100644 --- a/pkgs/by-name/ae/aerogramme/package.nix +++ b/pkgs/by-name/ae/aerogramme/package.nix @@ -6,17 +6,20 @@ openssl, }: -rustPlatform.buildRustPackage { - RUSTC_BOOTSTRAP = true; - +rustPlatform.buildRustPackage rec { pname = "aerogramme"; version = "0.3.0"; src = fetchgit { url = "https://git.deuxfleurs.fr/Deuxfleurs/aerogramme/"; + rev = "refs/tags/${version}"; hash = "sha256-ER+P/XGqNzTLwDLK5EBZq/Dl29ZZKl2FdxDb+oLEJ8Y="; }; + cargoPatches = [ + ./0001-update-time-rs.patch + ]; + # must use our own Cargo.lock due to git dependencies cargoLock = { lockFile = ./Cargo.lock; @@ -31,8 +34,11 @@ rustPlatform.buildRustPackage { # disable network tests as Nix sandbox breaks them doCheck = false; - # get openssl-sys to use pkg-config - OPENSSL_NO_VENDOR = 1; + env = { + # get openssl-sys to use pkg-config + OPENSSL_NO_VENDOR = true; + RUSTC_BOOTSTRAP = true; + }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index af1e981e0ca5c..9573e53f3e6b7 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -16,10 +16,10 @@ stdenvNoCC.mkDerivation (finalAttrs: let }; in { pname = "affine"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; - hash = "sha256-6F6BzEnseqdzkEUVgUa9eu7MkyNsvucK9lGL+dsKhwc="; + hash = "sha256-7Gaiv3XBxpHcI4curNlkN8kXcJZrD4WQS8ciqcabRMs="; }; nativeBuildInputs = [ copyDesktopItems @@ -29,7 +29,8 @@ in { postInstall = '' mkdir -p $out/lib cp -r ./resources/* -t $out/lib/ - cp LICENSE* $out/ + mkdir -p $out/share/doc/affine/ + cp LICENSE* $out/share/doc/affine/ install -Dm644 ${icon} $out/share/pixmaps/affine.png makeWrapper "${electron}/bin/electron" $out/bin/affine \ --inherit-argv0 \ diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix index 90e2cf394a509..1d2763dd324a2 100644 --- a/pkgs/by-name/ag/agate/package.nix +++ b/pkgs/by-name/ag/agate/package.nix @@ -13,22 +13,22 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.3.8"; + version = "3.3.9"; src = fetchFromGitHub { owner = "mbrubeck"; repo = "agate"; rev = "v${version}"; - hash = "sha256-HK4ZTpRe6dEvBnjZLisSGXJmD5gTPEnf6f/gN0AHUsI="; + hash = "sha256-u+v9RydB6OIsq2zOSmTDuejneb2uNFhRXsVNlGcPABs="; }; - cargoHash = "sha256-yRCH4TRZ3m7ZG/NAEi1YDisSoad6FxCyojtXVvwbU9w="; + cargoHash = "sha256-oNI+UsxDdHSQGtl6vhxNWSiYVc8TV/vG8UoQX2w4ZoM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix index 209bc1a24728f..6c9571a64d05f 100644 --- a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix +++ b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix @@ -1,10 +1,27 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, libfido2 -, stdenv +{ + lib, + buildGoModule, + fetchFromGitHub, + stdenv, + libfido2, + openssl, + libcbor }: +let + darwin_arch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "amd64"; + darwin_configure = '' + chmod -R +w vendor/github.com/keys-pub/go-libfido2 + cat << EOF > vendor/github.com/keys-pub/go-libfido2/fido2_static_${darwin_arch}.go + package libfido2 + /* + #cgo darwin LDFLAGS: -framework CoreFoundation -framework IOKit -L${lib.getLib openssl}/lib -L${lib.getLib libcbor}/lib -lfido2 + #cgo darwin CFLAGS: -I${libfido2.dev}/include -I${openssl.dev}/include + */ + import "C" + EOF + ''; +in buildGoModule rec { pname = "age-plugin-fido2-hmac"; version = "0.2.3"; @@ -18,11 +35,11 @@ buildGoModule rec { vendorHash = "sha256-h4/tyq9oZt41IfRJmmsLHUpJiPJ7YuFu59ccM7jHsFo="; - ldflags = [ "-s" "-w" ]; + ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; - buildInputs = [ - libfido2 - ]; + buildInputs = [ libfido2 ]; + + postConfigure = lib.optional stdenv.hostPlatform.isDarwin darwin_configure; meta = with lib; { description = "Age plugin to encrypt files with fido2 tokens using the hmac-secret extension and non-discoverable credentials"; @@ -30,6 +47,5 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; mainProgram = "age-plugin-fido2-hmac"; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix index 5fd52f72485e3..f47dca9aaad48 100644 --- a/pkgs/by-name/ag/ags/package.nix +++ b/pkgs/by-name/ag/ags/package.nix @@ -8,7 +8,7 @@ gobject-introspection, gjs, glib-networking, - gnome, + gnome-bluetooth, gtk-layer-shell, libpulseaudio, libsoup_3, @@ -50,7 +50,7 @@ buildNpmPackage rec { buildInputs = [ gjs glib-networking - gnome.gnome-bluetooth + gnome-bluetooth gtk-layer-shell libpulseaudio libsoup_3 diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix index 4cf03feea296b..d1ed4c6f936b4 100644 --- a/pkgs/by-name/ai/aider-chat/package.nix +++ b/pkgs/by-name/ai/aider-chat/package.nix @@ -12,7 +12,7 @@ let self = python3; packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; }; - version = "0.53.0"; + version = "0.57.0"; in python3.pkgs.buildPythonApplication { pname = "aider-chat"; @@ -23,10 +23,12 @@ python3.pkgs.buildPythonApplication { owner = "paul-gauthier"; repo = "aider"; rev = "refs/tags/v${version}"; - hash = "sha256-KQp4qqQKm++oB9RVQZhAWQJs7Nbyssc9eKKRH1VZbRU="; + hash = "sha256-ErDepSju8B4GochHKxL03aUfOLAiNfTaXBAllAZ144M="; }; - build-system = with python3.pkgs; [ setuptools ]; + pythonRelaxDeps = true; + + build-system = with python3.pkgs; [ setuptools-scm ]; dependencies = with python3.pkgs; @@ -41,6 +43,7 @@ python3.pkgs.buildPythonApplication { gitpython grep-ast importlib-resources + json5 jsonschema jiter litellm @@ -48,13 +51,16 @@ python3.pkgs.buildPythonApplication { numpy packaging pathspec + pexpect pillow playwright prompt-toolkit + ptyprocess pypager pypandoc pyperclip pyyaml + psutil rich scipy sounddevice @@ -70,45 +76,46 @@ python3.pkgs.buildPythonApplication { buildInputs = [ portaudio ]; - pythonRelaxDeps = true; - nativeCheckInputs = (with python3.pkgs; [ pytestCheckHook ]) ++ [ gitMinimal ]; disabledTestPaths = [ - # requires network + # Tests require network access "tests/scrape/test_scrape.py" - # Expected 'mock' to have been called once "tests/help/test_help.py" ]; disabledTests = [ - # requires network + # Tests require network "test_urls" "test_get_commit_message_with_custom_prompt" - # FileNotFoundError "test_get_commit_message" - # Expected 'launch_gui' to have been called once "test_browser_flag_imports_streamlit" + # AttributeError + "test_simple_send_with_retries" + # Expected 'check_version' to have been called once + "test_main_exit_calls_version_check" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # fails on darwin + # Tests fails on darwin "test_dark_mode_sets_code_theme" "test_default_env_file_sets_automatic_variable" ]; preCheck = '' export HOME=$(mktemp -d) + export AIDER_CHECK_UPDATE=false ''; meta = { description = "AI pair programming in your terminal"; homepage = "https://github.com/paul-gauthier/aider"; + changelog = "https://github.com/paul-gauthier/aider/blob/v${version}/HISTORY.md"; license = lib.licenses.asl20; - mainProgram = "aider"; maintainers = with lib.maintainers; [ taha-yassine ]; + mainProgram = "aider"; }; } diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index 3ebdb3706b55e..272adcfb401ee 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "aiken"; - version = "1.0.29-alpha"; # all releases are 'alpha' + version = "1.1.4"; src = fetchFromGitHub { owner = "aiken-lang"; repo = "aiken"; rev = "v${version}"; - hash = "sha256-fikXypc9HKil4Ut4jdgQtTTy/CHEogEpDprwdTgd9b4="; + hash = "sha256-PTC7qn8Z1PGcBTNK5MtMvThIEhmAqTj23B/cHHhiDFE="; }; - cargoHash = "sha256-UWDPXnq2k/PoogrfuW93ieRW8AfuNIEfri9Jo6gHkdg="; + cargoHash = "sha256-p//1TZJ6sJUUDPPpxRBKL7w7MBTUQppbQedj2x4T17w="; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/by-name/ai/airgorah/package.nix b/pkgs/by-name/ai/airgorah/package.nix new file mode 100644 index 0000000000000..f063495c72a9c --- /dev/null +++ b/pkgs/by-name/ai/airgorah/package.nix @@ -0,0 +1,74 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + pkg-config, + glib, + pango, + gdk-pixbuf, + graphene, + gtk4, + copyDesktopItems, + makeDesktopItem, + wrapGAppsHook4, +}: + +rustPlatform.buildRustPackage rec { + pname = "airgorah"; + version = "0.7.3"; + + src = fetchFromGitHub { + owner = "martin-olivier"; + repo = "airgorah"; + rev = "refs/tags/v${version}"; + hash = "sha256-cIb40TKkk3gfy4dTP8WyZqQkRGj5nItaQ3NSfexCUOA="; + }; + + cargoHash = "sha256-sJFOpxBW6Z8ewfyhJuxZByJNgaEmezw15OQt9KjFaec="; + + nativeBuildInputs = [ + pkg-config + copyDesktopItems + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + pango + gdk-pixbuf + graphene + gtk4 + ]; + + postInstall = '' + install -Dm644 icons/app_icon.png $out/share/icons/hicolor/1024x1024/apps/airgorah.png + ''; + + dessktopItems = [ + (makeDesktopItem { + name = "airgorah"; + comment = "A WiFi auditing software that can perform deauth attacks and passwords cracking"; + desktopName = "airgorah"; + exec = "pkexec airgorah"; + icon = "airgorah"; + categories = [ + "Network" + "Monitor" + "Utility" + "GTK" + ]; + type = "Application"; + terminal = false; + }) + ]; + + meta = { + description = "WiFi security auditing software mainly based on aircrack-ng tools suite"; + homepage = "https://github.com/martin-olivier/airgorah"; + changelog = "https://github.com/martin-olivier/airgorah/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "airgorah"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ai/aisleriot/package.nix b/pkgs/by-name/ai/aisleriot/package.nix index 8f9d2bee5c921..7b94a2f7f0602 100644 --- a/pkgs/by-name/ai/aisleriot/package.nix +++ b/pkgs/by-name/ai/aisleriot/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "aisleriot"; rev = finalAttrs.version; - sha256 = "sha256-HylhDBgkAJrrs/r42v3aDNR8mBJaqnJHyY7T3QW1eWg="; + hash = "sha256-HylhDBgkAJrrs/r42v3aDNR8mBJaqnJHyY7T3QW1eWg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/al/alacarte/package.nix b/pkgs/by-name/al/alacarte/package.nix index e380929f6f624..c9b1c9d7c6189 100644 --- a/pkgs/by-name/al/alacarte/package.nix +++ b/pkgs/by-name/al/alacarte/package.nix @@ -61,6 +61,7 @@ python3.pkgs.buildPythonApplication rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/alacarte"; + changelog = "https://gitlab.gnome.org/GNOME/alacarte/-/blob/${version}/NEWS?ref_type=tags"; description = "Menu editor for GNOME using the freedesktop.org menu specification"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix new file mode 100644 index 0000000000000..3e9196aa8df0b --- /dev/null +++ b/pkgs/by-name/al/albert/package.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + fetchFromGitHub, + qt6, + cmake, + libqalculate, + muparser, + libarchive, + python3Packages, + nix-update-script, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "albert"; + version = "0.26.4"; + + src = fetchFromGitHub { + owner = "albertlauncher"; + repo = "albert"; + rev = "v${finalAttrs.version}"; + hash = "sha256-MEpBZV1Fxoq24eT1hgyrp33qcaLqmQ+aAP974Yn8d2g="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = + [ + libqalculate + libarchive + muparser + qt6.qtbase + qt6.qtscxml + qt6.qtsvg + qt6.qtdeclarative + qt6.qtwayland + qt6.qt5compat + qt6.qttools + ] + ++ (with python3Packages; [ + python + pybind11 + ]); + + postPatch = '' + find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \; + + substituteInPlace src/app/qtpluginprovider.cpp \ + --replace-fail "QStringList install_paths;" "QStringList install_paths;${"\n"}install_paths << QFileInfo(\"$out/lib\").canonicalFilePath();" + ''; + + postFixup = '' + for i in $out/{bin/.albert-wrapped,lib/albert/plugins/*.so}; do + patchelf $i --add-rpath $out/lib/albert + done + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Fast and flexible keyboard launcher"; + longDescription = '' + Albert is a desktop agnostic launcher. Its goals are usability and beauty, + performance and extensibility. It is written in C++ and based on the Qt + framework. + ''; + homepage = "https://albertlauncher.github.io"; + changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + # See: https://github.com/NixOS/nixpkgs/issues/279226 + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + ericsagnes + synthetica + eljamm + ]; + mainProgram = "albert"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix index 9759dba06ebd4..4d79821f67188 100644 --- a/pkgs/by-name/al/aldente/package.nix +++ b/pkgs/by-name/al/aldente/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aldente"; - version = "1.27.3"; + version = "1.28.4"; src = fetchurl { url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg"; - hash = "sha256-G6Kpfy1LE1VG/nTks4KU6doTKZeJT6gk6JtKmUEy6FI="; + hash = "sha256-ihfTVVc6kM+rOyPG7k2rkLVmCsOlBA7Uik8KrWhrdp0="; }; dontBuild = true; @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://apphousekitchen.com"; changelog = "https://github.com/davidwernhart/aldente-charge-limiter/releases/tag/${finalAttrs.version}"; license = lib.licenses.unfree; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" diff --git a/pkgs/by-name/al/alephone-apotheosis-x/package.nix b/pkgs/by-name/al/alephone-apotheosis-x/package.nix index 566b98f9e8566..7cb7646919f59 100644 --- a/pkgs/by-name/al/alephone-apotheosis-x/package.nix +++ b/pkgs/by-name/al/alephone-apotheosis-x/package.nix @@ -8,7 +8,7 @@ alephone.makeWrapper rec { zip = requireFile { name = "Apotheosis_X_1.1.zip"; url = "https://www.moddb.com/mods/apotheosis-x/downloads"; - sha256 = "sha256-4Y/RQQeN4VTpig8ZyxUpVHwzN8W8ciTBCkSzND8SMbs="; + hash = "sha256-4Y/RQQeN4VTpig8ZyxUpVHwzN8W8ciTBCkSzND8SMbs="; }; sourceRoot = "Apotheosis X 1.1"; diff --git a/pkgs/by-name/al/alephone-durandal/package.nix b/pkgs/by-name/al/alephone-durandal/package.nix index 6f49e76ad43fa..25ac05901e5b5 100644 --- a/pkgs/by-name/al/alephone-durandal/package.nix +++ b/pkgs/by-name/al/alephone-durandal/package.nix @@ -10,7 +10,7 @@ alephone.makeWrapper rec { zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon2-${version}-Data.zip"; - sha256 = "sha256-uoBl1/7XlXmMLqpk3tvme9w18q4Yh0WCrmqSzjGxNz0="; + hash = "sha256-uoBl1/7XlXmMLqpk3tvme9w18q4Yh0WCrmqSzjGxNz0="; }; meta = { diff --git a/pkgs/by-name/al/alephone-eternal/package.nix b/pkgs/by-name/al/alephone-eternal/package.nix index 186352db7ec11..83a5cb7a5e487 100644 --- a/pkgs/by-name/al/alephone-eternal/package.nix +++ b/pkgs/by-name/al/alephone-eternal/package.nix @@ -7,7 +7,7 @@ alephone.makeWrapper rec { zip = fetchurl { url = "http://eternal.bungie.org/files/_releases/EternalXv120.zip"; - sha256 = "1qrvx0sp9xc8zbpp5yz8jdz458ajzmyv2si7hrppiyawc8dpcwck"; + hash = "sha256-k3F2G2Jc+XhvhidqsX39UqFCfpPo+3Lv+oj1dDXoO+M="; }; sourceRoot = "Eternal 1.2.0"; diff --git a/pkgs/by-name/al/alephone-evil/package.nix b/pkgs/by-name/al/alephone-evil/package.nix index d6b59557133b8..8cc817505adef 100644 --- a/pkgs/by-name/al/alephone-evil/package.nix +++ b/pkgs/by-name/al/alephone-evil/package.nix @@ -7,7 +7,7 @@ alephone.makeWrapper rec { zip = fetchurl { url = "http://files3.bungie.org/trilogy/MarathonEvil.zip"; - sha256 = "08nizbjp2rx10bpqrbhb76as0j2zynmy2c0qa5b482lz1szf9b95"; + hash = "sha256-Ja3kvg6fCkRWURgw4av1X0iglTkLrozvAqFnceX60SI="; }; meta = { diff --git a/pkgs/by-name/al/alephone-infinity/package.nix b/pkgs/by-name/al/alephone-infinity/package.nix index 2b8d0b92ab450..592399a9dda61 100644 --- a/pkgs/by-name/al/alephone-infinity/package.nix +++ b/pkgs/by-name/al/alephone-infinity/package.nix @@ -10,7 +10,7 @@ alephone.makeWrapper rec { zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; - sha256 = "sha256-+FPym4Avqzyo4cZtfYPHXCS+q21+g9AIdKOImkd/UjU="; + hash = "sha256-+FPym4Avqzyo4cZtfYPHXCS+q21+g9AIdKOImkd/UjU="; }; meta = { diff --git a/pkgs/by-name/al/alephone-marathon/package.nix b/pkgs/by-name/al/alephone-marathon/package.nix index 928fe4f6ce84b..df34ae8f20c3a 100644 --- a/pkgs/by-name/al/alephone-marathon/package.nix +++ b/pkgs/by-name/al/alephone-marathon/package.nix @@ -10,7 +10,7 @@ alephone.makeWrapper rec { zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; - sha256 = "sha256-shZ82e7veaaT/petxDQ8Fd7YtJPmTgxSCStf0kGfrFs="; + hash = "sha256-shZ82e7veaaT/petxDQ8Fd7YtJPmTgxSCStf0kGfrFs="; }; meta = { diff --git a/pkgs/by-name/al/alephone-pathways-into-darkness/package.nix b/pkgs/by-name/al/alephone-pathways-into-darkness/package.nix index 6c6de4b88e8f0..10c0fcfc04fb2 100644 --- a/pkgs/by-name/al/alephone-pathways-into-darkness/package.nix +++ b/pkgs/by-name/al/alephone-pathways-into-darkness/package.nix @@ -7,7 +7,7 @@ alephone.makeWrapper rec { zip = fetchurl { url = "http://simplici7y.com/version/file/1185/AOPID_v1.1.1.zip"; - sha256 = "0x83xjcw5n5s7sw8z6rb6zzhihjkjgk7x7ynnqq917dcklr7bz4g"; + hash = "sha256-j/x1Mp2snZAwttaffuaTU8II/zcrm4+4PrrYwpnsA3U="; }; meta = { diff --git a/pkgs/by-name/al/alephone-pheonix/package.nix b/pkgs/by-name/al/alephone-pheonix/package.nix index da914e16ee316..052a2d7752df7 100644 --- a/pkgs/by-name/al/alephone-pheonix/package.nix +++ b/pkgs/by-name/al/alephone-pheonix/package.nix @@ -7,7 +7,7 @@ alephone.makeWrapper rec { zip = fetchurl { url = "http://simplici7y.com/version/file/998/Marathon_Phoenix_1.3.zip"; - sha256 = "1r06k0z8km7l9d3njinsrci4jhk8hrnjdcmjd8n5z2qxkqvhn9qj"; + hash = "sha256-EicLN54di18sarKyJm2GaEJJIsvaRmlHS/TUiT6YBuQ="; }; meta = { diff --git a/pkgs/by-name/al/alephone-red/package.nix b/pkgs/by-name/al/alephone-red/package.nix index a2f6a0279017d..691c474c444c3 100644 --- a/pkgs/by-name/al/alephone-red/package.nix +++ b/pkgs/by-name/al/alephone-red/package.nix @@ -7,7 +7,7 @@ alephone.makeWrapper rec { zip = fetchurl { url = "http://files3.bungie.org/trilogy/MarathonRED.zip"; - sha256 = "1p13snlrvn39znvfkxql67crhysn71db2bwsfrkhjkq58wzs6qgw"; + hash = "sha256-/GGjP0cFTwlndpovsVo4VnuY2TEU9+m2/WnYnanVI9w="; }; meta = { diff --git a/pkgs/by-name/al/alephone-rubicon-x/package.nix b/pkgs/by-name/al/alephone-rubicon-x/package.nix index b59fa4cfeb626..384a1473b4373 100644 --- a/pkgs/by-name/al/alephone-rubicon-x/package.nix +++ b/pkgs/by-name/al/alephone-rubicon-x/package.nix @@ -7,7 +7,7 @@ alephone.makeWrapper rec { zip = fetchurl { url = "http://files5.bungie.org/marathon/marathonRubiconX.zip"; - sha256 = "095si89wap76pvkvk90zqw7djhrhwb1anjm2s8i503jbcn5n4ipm"; + hash = "sha256-9UZii2VLDlAi0qJKq8LiMEPZDscfpLnnvuZcxROKuiQ="; }; sourceRoot = "Rubicon X ƒ"; diff --git a/pkgs/by-name/al/alephone-yuge/package.nix b/pkgs/by-name/al/alephone-yuge/package.nix index 6ae73f984a4fc..c9e2d05a08fac 100644 --- a/pkgs/by-name/al/alephone-yuge/package.nix +++ b/pkgs/by-name/al/alephone-yuge/package.nix @@ -7,7 +7,7 @@ alephone.makeWrapper rec { zip = fetchurl { url = "https://lochnits.com/marathon/yuge/files/Mararthon_Yuge.zip"; - sha256 = "sha256-dZHInYThB/4igpAXbUadXwPvh2Fl3XGZ4ficg7IEnNc="; + hash = "sha256-dZHInYThB/4igpAXbUadXwPvh2Fl3XGZ4ficg7IEnNc="; }; meta = { diff --git a/pkgs/by-name/al/alephone/package.nix b/pkgs/by-name/al/alephone/package.nix index 0ae580c75edd5..92cf6667f6c3f 100644 --- a/pkgs/by-name/al/alephone/package.nix +++ b/pkgs/by-name/al/alephone/package.nix @@ -28,7 +28,6 @@ unzip, zlib, zziplib, - alephone, testers, }: @@ -94,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.version = # test that the version is correct - testers.testVersion { package = alephone; }; + testers.testVersion { package = finalAttrs.finalPackage; }; meta = { description = "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine"; @@ -112,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { version, zip, meta, - icon ? alephone.icons + "/alephone.png", + icon ? finalAttrs.finalPackage.icons + "/alephone.png", ... }@extraArgs: stdenv.mkDerivation ( @@ -142,14 +141,14 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/bin $out/data/$pname $out/share/applications cp -a * $out/data/$pname cp $desktopItem/share/applications/* $out/share/applications - makeWrapper ${alephone}/bin/alephone $out/bin/$pname \ + makeWrapper ${finalAttrs.finalPackage}/bin/alephone $out/bin/$pname \ --add-flags $out/data/$pname ''; } // extraArgs // { meta = - alephone.meta + finalAttrs.finalPackage.meta // { license = lib.licenses.free; mainProgram = pname; diff --git a/pkgs/by-name/al/algolia-cli/package.nix b/pkgs/by-name/al/algolia-cli/package.nix new file mode 100644 index 0000000000000..1f1debffbd5d0 --- /dev/null +++ b/pkgs/by-name/al/algolia-cli/package.nix @@ -0,0 +1,47 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: +let + version = "1.6.11"; +in +buildGoModule { + pname = "algolia-cli"; + inherit version; + + src = fetchFromGitHub { + owner = "algolia"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-VqY0h0Z3ocmgw0uFI4f6B5C/bTt3zoUXBlYPgOPxBo0="; + }; + + vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "cmd/algolia" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/algolia/cli/pkg/version.Version=${version}" + ]; + + postInstall = '' + installShellCompletion --cmd algolia \ + --bash <($out/bin/algolia completion bash) \ + --fish <($out/bin/algolia completion fish) \ + --zsh <($out/bin/algolia completion zsh) + ''; + + meta = { + description = "Algolia’s official CLI devtool"; + mainProgram = "algolia"; + homepage = "https://algolia.com/doc/tools/cli/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ momeemt ]; + }; +} diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix new file mode 100644 index 0000000000000..c3c9a6452d9c4 --- /dev/null +++ b/pkgs/by-name/al/aliae/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: + +buildGoModule rec { + pname = "aliae"; + version = "0.22.2"; + + src = fetchFromGitHub { + owner = "jandedobbeleer"; + repo = "aliae"; + rev = "refs/tags/v${version}"; + hash = "sha256-IpOfTCMbnNUW8flyb7p98QEwveNb8wClyBuv7fAKm8Y="; + }; + + vendorHash = "sha256-aUKF/r0OFN0gZXCKHFYKyQa806NFP5lQAONFZlMP4vE="; + + sourceRoot = "${src.name}/src"; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + tags = [ + "netgo" + "osusergo" + ]; + + postInstall = + '' + mv $out/bin/{src,aliae} + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd aliae \ + --bash <($out/bin/aliae completion bash) \ + --fish <($out/bin/aliae completion fish) \ + --zsh <($out/bin/aliae completion zsh) + ''; + + meta = { + description = "Cross shell and platform alias management"; + mainProgram = "aliae"; + homepage = "https://aliae.dev"; + changelog = "https://github.com/JanDeDobbeleer/aliae/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vedantmgoyal9 ]; + }; +} diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix new file mode 100644 index 0000000000000..e7cb03a8771ef --- /dev/null +++ b/pkgs/by-name/al/aligator/package.nix @@ -0,0 +1,97 @@ +{ + cmake, + crocoddyl, + doxygen, + fetchFromGitHub, + fmt, + fontconfig, + gbenchmark, + graphviz, + lib, + llvmPackages, # llvm/Support/Host.h required by casadi 3.6.5 and not available in llvm 18 + pinocchio, + pkg-config, + proxsuite-nlp, + python3Packages, + pythonSupport ? false, + stdenv, + suitesparse, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "aligator"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "Simple-Robotics"; + repo = "aligator"; + rev = "v${finalAttrs.version}"; + hash = "sha256-o4QjxTaZUa17hZsCv4hCI2cedaHoojBtLe8SVUkl0bo="; + }; + + outputs = [ + "doc" + "out" + ]; + + strictDeps = true; + + nativeBuildInputs = [ + doxygen + cmake + graphviz + pkg-config + ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; + buildInputs = [ fmt ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; + propagatedBuildInputs = + [ suitesparse ] + ++ lib.optionals pythonSupport [ + python3Packages.crocoddyl + python3Packages.matplotlib + python3Packages.pinocchio + python3Packages.proxsuite-nlp + ] + ++ lib.optionals (!pythonSupport) [ + crocoddyl + pinocchio + proxsuite-nlp + ]; + checkInputs = + [ gbenchmark ] + ++ lib.optionals pythonSupport [ + python3Packages.matplotlib + python3Packages.pytest + ]; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "BUILD_WITH_PINOCCHIO_SUPPORT" true) + (lib.cmakeBool "BUILD_CROCODDYL_COMPAT" true) + (lib.cmakeBool "BUILD_WITH_OPENMP_SUPPORT" true) + (lib.cmakeBool "BUILD_WITH_CHOLMOD_SUPPORT" true) + (lib.cmakeBool "GENERATE_PYTHON_STUBS" false) # this need git at configure time + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [ + # ignore one failing test for now + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;aligator-test-py-integrators") + ]; + + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + # Fontconfig error: No writable cache directories + preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + + doCheck = true; + pythonImportsCheck = [ "aligator" ]; + + meta = { + description = "Versatile and efficient framework for constrained trajectory optimization"; + homepage = "https://github.com/Simple-Robotics/aligator"; + changelog = "https://github.com/Simple-Robotics/aligator/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/al/alive2/package.nix b/pkgs/by-name/al/alive2/package.nix new file mode 100644 index 0000000000000..f627751189c88 --- /dev/null +++ b/pkgs/by-name/al/alive2/package.nix @@ -0,0 +1,67 @@ +{ + lib, + clangStdenv, + fetchFromGitHub, + re2c, + z3, + hiredis, + llvm_18, + cmake, + ninja, +}: + +clangStdenv.mkDerivation (finalAttrs: { + pname = "alive2"; + version = "0-unstable-2024-09-23"; + + src = fetchFromGitHub { + owner = "AliveToolkit"; + repo = "alive2"; + rev = "05a964284056b38a6dc1f807e7acad64a0308328"; + sha256 = "sha256-okKKUU7WLXLD9Hvsfoz+1HQWoyQ/bqRpBk5ogr7kSJA="; + }; + + nativeBuildInputs = [ + cmake + ]; + buildInputs = [ + re2c + z3 + hiredis + llvm_18 + ninja + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'find_package(Git REQUIRED)' "" + ''; + + env = { + ALIVE2_HOME = "$PWD"; + LLVM2_HOME = "${llvm_18}"; + LLVM2_BUILD = "$LLVM2_HOME/build"; + }; + + preBuild = '' + mkdir -p build + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp alive $out/bin/ + cp alive-jobserver $out/bin/ + rm -rf $out/bin/CMakeFiles $out/bin/*.o + runHook postInstall + ''; + + meta = { + description = "Automatic verification of LLVM optimizations"; + homepage = "https://github.com/AliveToolkit/alive2"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ shogo ]; + mainProgram = "alive"; + }; +}) diff --git a/pkgs/by-name/al/almo/package.nix b/pkgs/by-name/al/almo/package.nix new file mode 100644 index 0000000000000..00764f5301a76 --- /dev/null +++ b/pkgs/by-name/al/almo/package.nix @@ -0,0 +1,51 @@ +{ + lib, + fetchFromGitHub, + stdenv, + gcc, + python312Packages, +}: +let + version = "0.9.5-alpha"; +in +stdenv.mkDerivation { + pname = "almo"; + inherit version; + + src = fetchFromGitHub { + owner = "abap34"; + repo = "almo"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Cz+XDJmdp+utzwm1c7ThTNS6kfNF6r4B16tnGQSCVMc="; + }; + + buildInputs = [ + gcc + python312Packages.pybind11 + ]; + + makeFlags = [ "all" ]; + + # remove darwin-only linker flag on linux + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace scripts/pybind.sh \ + --replace-fail " -undefined dynamic_lookup" "" + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/lib + cp build/almo $out/bin + cp almo.so $out/lib + runHook postInstall + ''; + + meta = { + description = "ALMO is markdown parser and static site generator"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + homepage = "https://github.com/abap34/almo"; + maintainers = with lib.maintainers; [ momeemt ]; + mainProgram = "almo"; + }; +} diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index 9c424aa2e74bb..13de92ee294e5 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -17,14 +17,14 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "1.1.1"; + version = "2.0.5"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; - rev = version; - hash = "sha256-FFMclm+IUEU4cQZ0+uJHDCHytgW8+fygooWw3Nc1jxM="; + rev = "refs/tags/${version}"; + hash = "sha256-BLLcU2GESyHGFJJicE42V3nMFf/YfnYsXcAOPIHuCAg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/al/alsa-firmware/package.nix b/pkgs/by-name/al/alsa-firmware/package.nix index 1666cce5646fb..8f63166679280 100644 --- a/pkgs/by-name/al/alsa-firmware/package.nix +++ b/pkgs/by-name/al/alsa-firmware/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://alsa/firmware/alsa-firmware-${version}.tar.bz2"; - sha256 = "sha256-tnttfQi8/CR+9v8KuIqZwYgwWjz1euLf0LzZpbNs1bs="; + hash = "sha256-tnttfQi8/CR+9v8KuIqZwYgwWjz1euLf0LzZpbNs1bs="; }; patches = [ # fixes some includes / missing types on musl libc; should not make a difference for other platforms (fetchpatch { url = "https://raw.githubusercontent.com/void-linux/void-packages/ae690000017d5fd355ab397c49202426e3a01c11/srcpkgs/alsa-firmware/patches/musl.patch"; - sha256 = "sha256-4A+TBBvpz14NwMNewLc2LQL51hnz4EZlZ44rhnx5dnc="; + hash = "sha256-4A+TBBvpz14NwMNewLc2LQL51hnz4EZlZ44rhnx5dnc="; }) ]; diff --git a/pkgs/by-name/al/alsa-oss/package.nix b/pkgs/by-name/al/alsa-oss/package.nix index 5010c1a3dac62..425c2c4996582 100644 --- a/pkgs/by-name/al/alsa-oss/package.nix +++ b/pkgs/by-name/al/alsa-oss/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://alsa/oss-lib/alsa-oss-${version}.tar.bz2"; - sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4"; + hash = "sha256-ZK3O9ZJ+hI0uAk5kxL+FtvOVlk2ZdOxhkFrky4011o4="; }; buildInputs = [ alsa-lib ncurses libsamplerate ]; diff --git a/pkgs/by-name/al/alsa-topology-conf/package.nix b/pkgs/by-name/al/alsa-topology-conf/package.nix index e0dfc879fbc94..06d3a63dc468a 100644 --- a/pkgs/by-name/al/alsa-topology-conf/package.nix +++ b/pkgs/by-name/al/alsa-topology-conf/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "sha256-98W64VRavNc4JLyX9OcsNA4Rq+oYi6DxwG9eCtd2sXk="; + hash = "sha256-98W64VRavNc4JLyX9OcsNA4Rq+oYi6DxwG9eCtd2sXk="; }; dontBuild = true; diff --git a/pkgs/by-name/al/alsa-utils/package.nix b/pkgs/by-name/al/alsa-utils/package.nix index cadf42149fbc3..cc70a8578d76c 100644 --- a/pkgs/by-name/al/alsa-utils/package.nix +++ b/pkgs/by-name/al/alsa-utils/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://alsa/utils/alsa-utils-${version}.tar.bz2"; - sha256 = "sha256-EEti7H8Cp84WynefSBVhbfHMIZM1A3g6kQe1lE+DBjo="; + hash = "sha256-EEti7H8Cp84WynefSBVhbfHMIZM1A3g6kQe1lE+DBjo="; }; patches = [ # Backport fixes for musl libc. Remove on next release diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index 2b47d0fbaafda..33dde993cd8f8 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -51,7 +51,7 @@ buildDotnetModule { owner = "AM2R-Community-Developers"; repo = "AM2RLauncher"; rev = "5d8b7d9b3de68e6215c10b9fd223b7f1d5e40dea"; - sha256 = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg="; + hash = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg="; }; projectFile = "AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj"; diff --git a/pkgs/by-name/am/amazon-ec2-utils/package.nix b/pkgs/by-name/am/amazon-ec2-utils/package.nix new file mode 100644 index 0000000000000..27fdef05c1a88 --- /dev/null +++ b/pkgs/by-name/am/amazon-ec2-utils/package.nix @@ -0,0 +1,86 @@ +{ + stdenv, + lib, + bash, + curl, + fetchFromGitHub, + gawk, + installShellFiles, + python3, +}: + +stdenv.mkDerivation rec { + pname = "amazon-ec2-utils"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "amazonlinux"; + repo = "amazon-ec2-utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-plTBh2LAXkYVSxN0IZJQuPr7QxD7+OAqHl/Zl8JPCmg="; + }; + + outputs = [ + "out" + "man" + ]; + + strictDeps = true; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = [ + bash + python3 + ]; + + postInstall = '' + install -Dm755 -t $out/bin/ ebsnvme-id + install -Dm755 -t $out/bin/ ec2-metadata + install -Dm755 -t $out/bin/ ec2nvme-nsid + install -Dm755 -t $out/bin/ ec2udev-vbd + + install -Dm644 -t $out/lib/udev/rules.d/ 51-ec2-hvm-devices.rules + install -Dm644 -t $out/lib/udev/rules.d/ 51-ec2-xen-vbd-devices.rules + install -Dm644 -t $out/lib/udev/rules.d/ 53-ec2-read-ahead-kb.rules + install -Dm644 -t $out/lib/udev/rules.d/ 70-ec2-nvme-devices.rules + install -Dm644 -t $out/lib/udev/rules.d/ 60-cdrom_id.rules + + installManPage doc/*.8 + ''; + + postFixup = '' + substituteInPlace $out/lib/udev/rules.d/{51-ec2-hvm-devices,70-ec2-nvme-devices}.rules \ + --replace-fail '/usr/sbin' "$out/bin" + + substituteInPlace $out/lib/udev/rules.d/53-ec2-read-ahead-kb.rules \ + --replace-fail '/bin/awk' '${gawk}/bin/awk' + + substituteInPlace "$out/bin/ec2-metadata" \ + --replace-fail 'curl' '${curl}/bin/curl' + ''; + + doInstallCheck = true; + + # We cannot run + # ec2-metadata --help + # because it actually checks EC2 metadata even if --help is given + # so it won't work in the test sandbox. + installCheckPhase = '' + $out/bin/ebsnvme-id --help + ''; + + meta = with lib; { + changelog = "https://github.com/amazonlinux/amazon-ec2-utils/releases/tag/v${version}"; + description = "Contains a set of utilities and settings for Linux deployments in EC2"; + homepage = "https://github.com/amazonlinux/amazon-ec2-utils"; + license = licenses.mit; + maintainers = with maintainers; [ + ketzacoatl + thefloweringash + anthonyroussel + ]; + }; +} diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 37eb2388cecc4..19fc0673355b3 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -41,13 +41,13 @@ let in buildGoModule rec { pname = "amazon-ssm-agent"; - version = "3.3.808.0"; + version = "3.3.859.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ssm-agent"; rev = "refs/tags/${version}"; - hash = "sha256-ig8mr4xfYnj1z1H3Ro6HFmlzW9HsBWMDtbHtpM6BIfg="; + hash = "sha256-Qxzq91GXOrssBO9VaQTkLZjVqdpUYoYq3N/rakwewJs="; }; vendorHash = null; @@ -63,7 +63,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; @@ -84,20 +84,20 @@ buildGoModule rec { printf "#!/bin/sh\ntrue" > ./Tools/src/checkstyle.sh substituteInPlace agent/platform/platform_unix.go \ - --replace "/usr/bin/uname" "${coreutils}/bin/uname" \ - --replace '"/bin", "hostname"' '"${nettools}/bin/hostname"' \ - --replace '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"' + --replace-fail "/usr/bin/uname" "${coreutils}/bin/uname" \ + --replace-fail '"/bin", "hostname"' '"${nettools}/bin/hostname"' \ + --replace-fail '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"' substituteInPlace agent/session/shell/shell_unix.go \ - --replace '"script"' '"${util-linux}/bin/script"' + --replace-fail '"script"' '"${util-linux}/bin/script"' substituteInPlace agent/rebooter/rebooter_unix.go \ - --replace "/sbin/shutdown" "shutdown" + --replace-fail "/sbin/shutdown" "shutdown" echo "${version}" > VERSION - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \ - --replace /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode + --replace-fail /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode ''; preBuild = '' diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix index 1ab8c493eebbf..69f41081cc918 100644 --- a/pkgs/by-name/am/amber-lang/package.nix +++ b/pkgs/by-name/am/amber-lang/package.nix @@ -7,20 +7,21 @@ makeWrapper, runCommand, amber-lang, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "amber-lang"; - version = "0.3.3-alpha"; + version = "0.3.5-alpha"; src = fetchFromGitHub { - owner = "Ph0enixKM"; - repo = "Amber"; + owner = "amber-lang"; + repo = "amber"; rev = version; - hash = "sha256-Al1zTwQufuVGSlttf02s5uI3cyCNDShhzMT3l9Ctv3Y="; + hash = "sha256-wf0JNWNliDGNvlbWoatPqDKmVaBzHeCKOvJWuE9PnpQ="; }; - cargoHash = "sha256-HbkIkCVy2YI+nP5t01frXBhlp/rCsB6DwLL53AHJ4vE="; + cargoHash = "sha256-6T4WcQkCMR8W67w0uhhN8W0FlLsrTUMa3/xRXDtW4Es="; preConfigure = '' substituteInPlace src/compiler.rs \ @@ -36,14 +37,22 @@ rustPlatform.buildRustPackage rec { util-linux ]; + checkFlags = [ + "--skip=tests::extra::download" + "--skip=tests::formatter::all_exist" + ]; + postInstall = '' wrapProgram "$out/bin/amber" --prefix PATH : "${lib.makeBinPath [ bc ]}" ''; - passthru.tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } '' - diff -U3 --color=auto <(amber -e 'echo "Hello, World"') <(echo 'Hello, World') - touch $out - ''; + passthru = { + updateScript = nix-update-script { }; + tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } '' + diff -U3 --color=auto <(amber -e 'echo "Hello, World"') <(echo 'Hello, World') + touch $out + ''; + }; meta = with lib; { description = "Programming language compiled to bash"; diff --git a/pkgs/by-name/am/amberol/package.nix b/pkgs/by-name/am/amberol/package.nix new file mode 100644 index 0000000000000..ba530618be912 --- /dev/null +++ b/pkgs/by-name/am/amberol/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + fetchFromGitLab, + rustPlatform, + cargo, + desktop-file-utils, + appstream-glib, + meson, + ninja, + pkg-config, + reuse, + rustc, + m4, + wrapGAppsHook4, + glib, + gtk4, + gst_all_1, + libadwaita, + dbus, +}: + +stdenv.mkDerivation rec { + pname = "amberol"; + version = "2024.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "amberol"; + rev = version; + hash = "sha256-WuyvTgh9Qc5WcgEssxkytwQpSACd82l5WKeMD0NFOp8="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "amberol-${version}"; + hash = "sha256-C1ENyNUpgwGlZus/zIWD1mUrmWT9L0fH/1T4QaIxGJw="; + }; + + postPatch = '' + patchShebangs build-aux + ''; + + nativeBuildInputs = [ + appstream-glib + cargo + desktop-file-utils + m4 + meson + ninja + pkg-config + reuse + rustc + rustPlatform.cargoSetupHook + wrapGAppsHook4 + ]; + + buildInputs = + [ + dbus + glib + gtk4 + libadwaita + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav + ]); + + meta = { + homepage = "https://gitlab.gnome.org/World/amberol"; + description = "Small and simple sound and music player"; + maintainers = with lib.maintainers; [ linsui ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + mainProgram = "amberol"; + }; +} diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix index 8adf2b030d521..a50e51685f91f 100644 --- a/pkgs/by-name/am/amdvlk/package.nix +++ b/pkgs/by-name/am/amdvlk/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { name = "amdvlk-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${finalAttrs.version}"; - sha256 = "1Svdr93ShjhaWJUTLn5y1kBM4hHey1dUVDiHqFIKgrU="; + hash = "sha256-1Svdr93ShjhaWJUTLn5y1kBM4hHey1dUVDiHqFIKgrU="; }; buildInputs = diff --git a/pkgs/by-name/am/amfora/package.nix b/pkgs/by-name/am/amfora/package.nix index 7c80504fd95e4..9b658386725e0 100644 --- a/pkgs/by-name/am/amfora/package.nix +++ b/pkgs/by-name/am/amfora/package.nix @@ -8,12 +8,12 @@ buildGoModule rec { owner = "makeworld-the-better-one"; repo = "amfora"; rev = "v${version}"; - sha256 = "sha256-KOuKgxH3n4rdF+oj/TwEcRqX1sn4A9e23FNwQMhMVO4="; + hash = "sha256-KOuKgxH3n4rdF+oj/TwEcRqX1sn4A9e23FNwQMhMVO4="; }; vendorHash = "sha256-T/hnlQMDOZV+QGl7xp29sBGfb4VXcXqN6PDoBFdpp4M="; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i "s:amfora:$out/bin/amfora:" amfora.desktop install -Dm644 amfora.desktop -t $out/share/applications ''; diff --git a/pkgs/by-name/am/amiberry/package.nix b/pkgs/by-name/am/amiberry/package.nix new file mode 100644 index 0000000000000..82c9c2a8aac6a --- /dev/null +++ b/pkgs/by-name/am/amiberry/package.nix @@ -0,0 +1,109 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + copyDesktopItems, + makeWrapper, + flac, + libmpeg2, + libmpg123, + libpng, + libserialport, + portmidi, + SDL2, + SDL2_image, + SDL2_ttf, + makeDesktopItem, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "amiberry"; + version = "5.7.4"; + + src = fetchFromGitHub { + owner = "BlitterStudio"; + repo = "amiberry"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-EOoVJYefX2pQ2Zz9bLD1RS47u/+7ZWTMwZYha0juF64="; + }; + + nativeBuildInputs = [ + cmake + copyDesktopItems + makeWrapper + ]; + + buildInputs = [ + flac + libmpeg2 + libmpg123 + libpng + libserialport + portmidi + SDL2 + SDL2_image + SDL2_ttf + ]; + + enableParallelBuilding = true; + + # Amiberry has traditionally behaved as a "Portable" app, meaning that it was designed to expect everything + # under the same directory. This is not compatible with Nix package conventions. + # The Amiberry behavior has changed since versions 5.7.4 and 6.3.4 (see + # https://github.com/BlitterStudio/amiberry/wiki/FAQ#q-where-does-amiberry-look-for-its-files-can-i-change-that + # for more information), however this is still not compatible with Nix packaging. The AMIBERRY_DATA_DIR can go + # in the nix store but the Amiberry configuration files must be stored in a user writable location. + # Fortunately Amiberry provides environment variables for specifying these locations which we can supply with the + # wrapper script below. + # One more caveat: Amiberry expects the configuration files path (AMIBERRY_HOME_DIR) to exist, otherwise it will + # fall back to behaving like a "Portable" app. The wrapper below ensures that the AMIBERRY_HOME_DIR path exists, + # preventing that fallback. + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp amiberry $out/bin/ + cp -r abr data $out/ + install -Dm444 data/amiberry.png $out/share/icons/hicolor/256x256/apps/amiberry.png + wrapProgram $out/bin/amiberry \ + --set-default AMIBERRY_DATA_DIR $out \ + --run 'AMIBERRY_HOME_DIR="$HOME/.amiberry"' \ + --run 'mkdir -p \ + $AMIBERRY_HOME_DIR/kickstarts \ + $AMIBERRY_HOME_DIR/conf \ + $AMIBERRY_HOME_DIR/nvram \ + $AMIBERRY_HOME_DIR/plugins \ + $AMIBERRY_HOME_DIR/screenshots \ + $AMIBERRY_HOME_DIR/savestates \ + $AMIBERRY_HOME_DIR/controllers \ + $AMIBERRY_HOME_DIR/whdboot \ + $AMIBERRY_HOME_DIR/lha \ + $AMIBERRY_HOME_DIR/floppies \ + $AMIBERRY_HOME_DIR/cdroms \ + $AMIBERRY_HOME_DIR/harddrives' + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "amiberry"; + desktopName = "Amiberry"; + exec = "amiberry"; + comment = "Amiga emulator"; + icon = "amiberry"; + categories = [ + "System" + "Emulator" + ]; + }) + ]; + + meta = with lib; { + homepage = "https://github.com/BlitterStudio/amiberry"; + description = "Optimized Amiga emulator for Linux/macOS"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ michaelshmitty ]; + mainProgram = "amiberry"; + }; +}) diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix new file mode 100644 index 0000000000000..2d0890b63d67d --- /dev/null +++ b/pkgs/by-name/am/amp/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + openssl, + pkg-config, + python3, + xorg, + cmake, + libgit2, + darwin, + curl, +}: + +rustPlatform.buildRustPackage rec { + pname = "amp"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "jmacdonald"; + repo = "amp"; + rev = version; + hash = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M="; + }; + + cargoPatches = [ ./update_time_crate.patch ]; + + cargoHash = "sha256-EYD1gQgkHemT/3VewdsU5kOGQKY3OjIHRiTSqSRNwtU="; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + buildInputs = + [ + openssl + xorg.libxcb + libgit2 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + curl + Security + AppKit + ] + ); + + # Tests need to write to the theme directory in HOME. + preCheck = "export HOME=`mktemp -d`"; + + meta = { + description = "Modern text editor inspired by Vim"; + homepage = "https://amp.rs"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + sb0 + aleksana + ]; + mainProgram = "amp"; + }; +} diff --git a/pkgs/by-name/am/amp/update_time_crate.patch b/pkgs/by-name/am/amp/update_time_crate.patch new file mode 100644 index 0000000000000..92f6ad73c9ea7 --- /dev/null +++ b/pkgs/by-name/am/amp/update_time_crate.patch @@ -0,0 +1,56 @@ +From 4ce866de7a2e1613951002ff61563a80e19a5c0c Mon Sep 17 00:00:00 2001 +From: Drewry Pope <drewrypope@gmail.com> +Date: Wed, 28 Aug 2024 18:45:41 -0500 +Subject: [PATCH] update time + +--- + Cargo.lock | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 0e1b8ff6..bd8b5814 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -864,6 +864,12 @@ dependencies = [ + "minimal-lexical", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-traits" + version = "0.2.16" +@@ -1372,12 +1378,13 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.31" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", + "powerfmt", + "serde", + "time-core", +@@ -1392,10 +1399,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.16" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 60ab7d12dafde..c282aff0c4d76 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-2024-08-26"; + version = "0-unstable-2024-09-18"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "a78b76536246898045fd1844aced381d01b7f1c6"; - hash = "sha256-bDfvWg5r4LmWI8tPrx9qzgEnJuMSYBm6MDf6yOaPqkY="; + rev = "1da705ebab9ab44bb933c1275961f963cc4440eb"; + hash = "sha256-6dVY0sZ09H5vdhfk5nGNjt+KG+Qw62b2YbJQCprXBPQ="; }; dontConfigure = true; @@ -38,7 +38,6 @@ stdenvNoCC.mkDerivation { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ artturin - diniamo johnrtitor ]; }; diff --git a/pkgs/by-name/an/anchor/0001-update-time-rs.patch b/pkgs/by-name/an/anchor/0001-update-time-rs.patch new file mode 100644 index 0000000000000..7b6a5852889f3 --- /dev/null +++ b/pkgs/by-name/an/anchor/0001-update-time-rs.patch @@ -0,0 +1,88 @@ +From ff4dfb52767695c066b4ad027983c0d4958094b3 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Tue, 24 Sep 2024 17:20:19 +0800 +Subject: [PATCH] update time-rs + +--- + Cargo.lock | 30 ++++++++++++++++++++++++------ + 1 file changed, 24 insertions(+), 6 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index d588e86c..f09caad8 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1432,9 +1432,12 @@ dependencies = [ + + [[package]] + name = "deranged" +-version = "0.3.8" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] + + [[package]] + name = "derivation-path" +@@ -2629,6 +2632,12 @@ dependencies = [ + "num-traits", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-derive" + version = "0.3.3" +@@ -3014,6 +3023,12 @@ dependencies = [ + "rand 0.8.5", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -5276,12 +5291,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.29" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -5295,10 +5312,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.15" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +-- +2.46.0 + diff --git a/pkgs/by-name/an/anchor/Cargo.lock b/pkgs/by-name/an/anchor/Cargo.lock index d588e86c40e24..f09caad8dbf9b 100644 --- a/pkgs/by-name/an/anchor/Cargo.lock +++ b/pkgs/by-name/an/anchor/Cargo.lock @@ -1432,9 +1432,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "derivation-path" @@ -2629,6 +2632,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -3014,6 +3023,12 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -5276,12 +5291,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -5295,10 +5312,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix index 2f4d95b732bbc..78165b6b1224e 100644 --- a/pkgs/by-name/an/anchor/package.nix +++ b/pkgs/by-name/an/anchor/package.nix @@ -1,8 +1,9 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, }: rustPlatform.buildRustPackage rec { @@ -17,6 +18,10 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + cargoPatches = [ + ./0001-update-time-rs.patch + ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -24,7 +29,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -36,7 +41,6 @@ rustPlatform.buildRustPackage rec { "--skip=tests::test_get_anchor_version_from_commit" ]; - meta = with lib; { description = "Solana Sealevel Framework"; homepage = "https://github.com/coral-xyz/anchor"; diff --git a/pkgs/by-name/an/android-studio-tools/package.nix b/pkgs/by-name/an/android-studio-tools/package.nix index 06af624a8e26b..2b1bca4798418 100644 --- a/pkgs/by-name/an/android-studio-tools/package.nix +++ b/pkgs/by-name/an/android-studio-tools/package.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation { postPatch = '' find . -type f -not -path "./bin/*" -exec chmod -x {} \; - '' + lib.optionalString stdenvNoCC.isDarwin '' + '' + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' for f in cmdline-tools/bin/*; do sed -i 's|start up script for Linux|start up script for Mac|' $f done diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 73c15042d5ef2..a7e19dec98a1c 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -77,13 +77,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2024-07-09"; + version = "0-unstable-2024-08-13"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "55761cfc7a6aacdc483dadacbf3fadcd89108e27"; - hash = "sha256-5L/d5R2qQ/GFrJcDPKdqhhMQwEg050CmmDh3BLmETRQ="; + rev = "85f2b8b15fe2081634c6f2c3f96b5d430e045bf0"; + hash = "sha256-w2DziVBoCy1NpH4AoIFmKdjqufopqUeYjAwqkOhxHBc="; fetchSubmodules = true; }; @@ -170,11 +170,16 @@ stdenv.mkDerivation { hardcodeZeroVersion = true; }; + # cmake can't find the binary itself + cmakeFlags = [ + (lib.cmakeFeature "Xsltproc_BIN" (lib.getExe' libxslt "xsltproc")) + ]; + meta = { description = "Darktable fork minus the bloat plus some design vision"; homepage = "https://ansel.photos/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "ansel"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/an/ansible-navigator/package.nix b/pkgs/by-name/an/ansible-navigator/package.nix index fd5615178524b..96b19ebef6c00 100644 --- a/pkgs/by-name/an/ansible-navigator/package.nix +++ b/pkgs/by-name/an/ansible-navigator/package.nix @@ -7,7 +7,7 @@ }: python3Packages.buildPythonApplication rec { pname = "ansible-navigator"; - version = "24.7.0"; + version = "24.9.0"; pyproject = true; disabled = python3Packages.pythonOlder "3.10"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "ansible_navigator"; - hash = "sha256-XMwJzDxo/VZ+0qy5MLg/Kw/7j3V594qfV+T6jeVEWzg="; + hash = "sha256-eW38/n3vh2l2hKrh1xpW2fiB5yOkTnK77AnevDStD7s="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/an/antares/package.nix b/pkgs/by-name/an/antares/package.nix index fae2010e20a6b..c433cab7ebcc6 100644 --- a/pkgs/by-name/an/antares/package.nix +++ b/pkgs/by-name/an/antares/package.nix @@ -4,7 +4,6 @@ buildNpmPackage, electron, nodejs, - fetchpatch, }: buildNpmPackage rec { diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/by-name/an/antiprism/package.nix similarity index 100% rename from pkgs/applications/science/geometry/antiprism/default.nix rename to pkgs/by-name/an/antiprism/package.nix diff --git a/pkgs/by-name/an/anyk/package.nix b/pkgs/by-name/an/anyk/package.nix index 4e9a92081d5d2..d0c6321bb6697 100644 --- a/pkgs/by-name/an/anyk/package.nix +++ b/pkgs/by-name/an/anyk/package.nix @@ -30,17 +30,17 @@ let extraClasspath = [ (fetchurl { url = "mirror://maven/org/glassfish/metro/webservices-rt/2.4.10/webservices-rt-2.4.10.jar"; - sha256 = "sha256-lHclIZn3HR2B2lMttmmQGIV67qJi5KhL5jT2WNUQpPI="; + hash = "sha256-lHclIZn3HR2B2lMttmmQGIV67qJi5KhL5jT2WNUQpPI="; }) (fetchurl { url = "mirror://maven/org/glassfish/metro/webservices-api/2.4.10/webservices-api-2.4.10.jar"; - sha256 = "sha256-1jiabjPkRnh+l/fmTt8aKE5hpeLreYOiLH9sVIcLUQE="; + hash = "sha256-1jiabjPkRnh+l/fmTt8aKE5hpeLreYOiLH9sVIcLUQE="; }) (fetchurl { url = "mirror://maven/com/sun/activation/jakarta.activation/2.0.1/jakarta.activation-2.0.1.jar"; - sha256 = "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE="; + hash = "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE="; }) # Patch one of the classes so it works with the packages above by removing .internal. from the package names. diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index 66ad50e47dfe4..d7712ea43e129 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -46,9 +46,9 @@ rustPlatform.buildRustPackage rec { gtk3 gtk-layer-shell pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]; @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec { description = "Wayland-native, highly customizable runner"; homepage = "https://github.com/kirottu/anyrun"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ eclairevoyant NotAShelf ]; + maintainers = with lib.maintainers; [ NotAShelf ]; mainProgram = "anyrun"; }; } diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 619ca4adefd5d..af5ee3c7277ca 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -1,23 +1,25 @@ -{ lib, fetchurl, appimageTools, makeWrapper }: +{ lib, fetchurl, appimageTools, makeWrapper, commandLineArgs ? "" }: let pname = "anytype"; - version = "0.42.5"; + version = "0.42.8"; name = "Anytype-${version}"; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; - hash = "sha256-43g/CdmmQTSxk7OTZMPIiWIYJjCG2zJNM9kaAq1jOqE="; + hash = "sha256-MIPKfwIZQah6K+WOQZsTpVcOrws+f4oVa7BoW29K5BA="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} install -m 444 -D ${appimageContents}/anytype.desktop -t $out/share/applications substituteInPlace $out/share/applications/anytype.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/by-name/ap/apfsprogs/package.nix b/pkgs/by-name/ap/apfsprogs/package.nix index 526cff28dbca1..6483b967e7ba0 100644 --- a/pkgs/by-name/ap/apfsprogs/package.nix +++ b/pkgs/by-name/ap/apfsprogs/package.nix @@ -6,21 +6,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "apfsprogs"; - version = "unstable-2023-11-30"; + version = "0-unstable-2024-09-27"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "apfsprogs"; - rev = "990163894d871f51ba102a75aed384a275c5991b"; - hash = "sha256-yCShZ+ALzSe/svErt9/i1JyyEvbIeABGPbpS4lVil0A="; + rev = "f31d7c2d69d212ce381399d2bb1e91410f592484"; + hash = "sha256-+c+wU52XKNOTxSpSrkrNWoGEYw6Zo4CGEOyKMvkXEa0="; }; postPatch = let shortRev = builtins.substring 0 9 finalAttrs.src.rev; in '' substituteInPlace \ - apfs-snap/Makefile apfsck/Makefile mkapfs/Makefile \ - --replace \ + apfs-snap/Makefile apfsck/Makefile mkapfs/Makefile apfs-label/Makefile \ + --replace-fail \ '$(shell git describe --always HEAD | tail -c 9)' \ '${shortRev}' ''; @@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { make -C apfs-snap $makeFlags make -C apfsck $makeFlags make -C mkapfs $makeFlags + make -C apfs-label $makeFlags runHook postBuild ''; @@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { make -C apfs-snap install DESTDIR="$out" $installFlags make -C apfsck install DESTDIR="$out" $installFlags make -C mkapfs install DESTDIR="$out" $installFlags + make -C apfs-label install DESTDIR="$out" $installFlags runHook postInstall ''; diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix index 9a01c0548e60a..0e82446e666aa 100644 --- a/pkgs/by-name/ap/api-linter/package.nix +++ b/pkgs/by-name/ap/api-linter/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "api-linter"; - version = "1.67.2"; + version = "1.67.3"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-xwRpJKAkZFSpmAQti2EswM6RXlJVwD+nNY9t5oRzU1s="; + hash = "sha256-uyupDoLLF1lqYaufBsSNDjKVGF0JsRnephkq4Hk3aMU="; }; vendorHash = "sha256-+dyoWK5iXH480c+akg26BCF/J8lKQoATVqZUfqMa080="; diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix index 2537f8cfed818..3f39ac1244535 100644 --- a/pkgs/by-name/ap/apostrophe/package.nix +++ b/pkgs/by-name/ap/apostrophe/package.nix @@ -5,6 +5,7 @@ libspelling, fetchFromGitHub, python3Packages, + nodePackages, meson, ninja, pkg-config, @@ -25,7 +26,7 @@ let repo = "apostrophe"; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "sha256-rXaz0EtLuKOBJLF81K/4qoTZtG6B8Wn+KwSiqYvxAVc="; + hash = "sha256-rXaz0EtLuKOBJLF81K/4qoTZtG6B8Wn+KwSiqYvxAVc="; }; # Patches are required by upstream. Without the patches @@ -50,7 +51,7 @@ let hash = "sha256-a+J+GasFmRvu5cJ1GLXscoJ+owzFXsLhCbeDbYChkyQ="; }; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { inherit version src; pname = "apostrophe"; pyproject = false; @@ -62,6 +63,11 @@ python3Packages.buildPythonApplication rec { patchShebangs --build build-aux/meson_post_install.py '' + # Use mathjax from nixpkgs to avoid loading from CDN + + '' + substituteInPlace apostrophe/preview_converter.py \ + --replace-fail "--mathjax" "--mathjax=file://${nodePackages.mathjax}/lib/node_modules/mathjax/es5/tex-chtml-full.js" + '' # Should be done in postInstall, but meson checks this eagerly before build + '' install -d $out/share/apostrophe/libs diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix index 65fda7aa82b52..a98fda3e6b00f 100644 --- a/pkgs/by-name/ap/application-title-bar/package.nix +++ b/pkgs/by-name/ap/application-title-bar/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "application-title-bar"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "antroids"; repo = "application-title-bar"; rev = "v${finalAttrs.version}"; - hash = "sha256-0tSwjyKPVyOR0VJi1qqMFf/yVmWFmyue0xaNp9pYxDo="; + hash = "sha256-kvFUz0m222jTGrkqLyYmnW0o4MXU9lLAsyk6QBAJHr8="; }; propagatedUserEnvPkgs = with kdePackages; [ kconfig ]; diff --git a/pkgs/by-name/ap/aprx/package.nix b/pkgs/by-name/ap/aprx/package.nix index fe946ff48366c..e6dc23cbef5ce 100644 --- a/pkgs/by-name/ap/aprx/package.nix +++ b/pkgs/by-name/ap/aprx/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "PhirePhly"; repo = "aprx"; rev = "2c84448fe6d897980234961a87ee4c1d4fad69ec"; - sha256 = "sha256-01PB7FaG8GmPm1U15/3g1CfQwdYmf3ThZFdVh2zUAl4="; + hash = "sha256-01PB7FaG8GmPm1U15/3g1CfQwdYmf3ThZFdVh2zUAl4="; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/ap/apt-offline/package.nix b/pkgs/by-name/ap/apt-offline/package.nix index 124aadf1acb2e..ba34dec6c0f87 100644 --- a/pkgs/by-name/ap/apt-offline/package.nix +++ b/pkgs/by-name/ap/apt-offline/package.nix @@ -23,10 +23,10 @@ python3Packages.buildPythonApplication { postPatch = '' substituteInPlace org.debian.apt.aptoffline.policy \ - --replace /usr/bin/ "$out/bin" + --replace-fail /usr/bin/ "$out/bin" substituteInPlace apt_offline_core/AptOfflineCoreLib.py \ - --replace /usr/bin/gpgv "${lib.getBin gnupg}/bin/gpgv" + --replace-fail /usr/bin/gpgv "${lib.getBin gnupg}/bin/gpgv" ''; postInstall = '' diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index 0bc91bde511b3..49cd0b53c49aa 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; - version = "0.3.3"; + version = "0.4.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "aquamarine"; rev = "v${finalAttrs.version}"; - hash = "sha256-zushuLkBblDZGVo2qbiMTJ51LSkqYJpje/R2dvfec1U="; + hash = "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index b177837cb83f1..2956a9ed021ef 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.55.0-52417"; + version = "1.61.2-54148"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-8r5SAnk1iPqqad1RKVDXkqd6tHUQCRRYnkWrQdyub+o="; + hash = "sha256-y5oQFPdk6Y7AjzeTrA2U8MhGkPi6RJUcGqsvpjJ++UE="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix index d472b9f132287..b31d642c703e5 100644 --- a/pkgs/by-name/ar/arcan/package.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -48,7 +48,7 @@ # Boolean flags buildManPages ? true, useBuiltinLua ? true, - useEspeak ? !stdenv.isDarwin, + useEspeak ? !stdenv.hostPlatform.isDarwin, useStaticLibuvc ? true, useStaticOpenAL ? true, useStaticSqlite ? true, diff --git a/pkgs/by-name/ar/arduino-cli/package.nix b/pkgs/by-name/ar/arduino-cli/package.nix index 8d01ae38e3ec8..4eb9cabebac8a 100644 --- a/pkgs/by-name/ar/arduino-cli/package.nix +++ b/pkgs/by-name/ar/arduino-cli/package.nix @@ -47,7 +47,7 @@ let --replace-fail "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'" ''; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' runHook preCheck @@ -60,7 +60,7 @@ let "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown" - ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' export HOME="$(mktemp -d)" @@ -89,7 +89,7 @@ let }; in -if stdenv.isLinux then +if stdenv.hostPlatform.isLinux then # buildFHSEnv is needed because the arduino-cli downloads compiler # toolchains from the internet that have their interpreters pointed at # /lib64/ld-linux-x86-64.so.2 diff --git a/pkgs/development/tools/misc/argbash/default.nix b/pkgs/by-name/ar/argbash/package.nix similarity index 100% rename from pkgs/development/tools/misc/argbash/default.nix rename to pkgs/by-name/ar/argbash/package.nix diff --git a/pkgs/by-name/ar/arma3-unix-launcher/package.nix b/pkgs/by-name/ar/arma3-unix-launcher/package.nix index 49c4e98ceb05d..104293c9be561 100644 --- a/pkgs/by-name/ar/arma3-unix-launcher/package.nix +++ b/pkgs/by-name/ar/arma3-unix-launcher/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "p-ranav"; repo = "argparse"; rev = "45664c4e9f05ff287731a9ff8b724d0c89fb6e77"; - sha256 = "sha256-qLD9zD6hbItDn6ZHHWBXrAWhySvqcs40xA5+C/5Fkhw="; + hash = "sha256-qLD9zD6hbItDn6ZHHWBXrAWhySvqcs40xA5+C/5Fkhw="; }; curlpp_src = curlpp.src; doctest_src = doctest; @@ -44,12 +44,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "muttleyxd"; repo = "pugixml"; rev = "simple-build-for-a3ul"; - sha256 = "sha256-FpREdz6DbhnLDGOuQY9rU17SSd6ngA4WfO0kGHqGJPM="; + hash = "sha256-FpREdz6DbhnLDGOuQY9rU17SSd6ngA4WfO0kGHqGJPM="; }; spdlog_src = spdlog; steamworkssdk_src = fetchurl { url = "https://github.com/julianxhokaxhiu/SteamworksSDKCI/releases/download/1.53/SteamworksSDK-v1.53.0_x64.zip"; - sha256 = "sha256-6PQGaPsaxBg/MHVWw2ynYW6LaNSrE9Rd9Q9ZLKFGPFA="; + hash = "sha256-6PQGaPsaxBg/MHVWw2ynYW6LaNSrE9Rd9Q9ZLKFGPFA="; }; trompeloeil_src = trompeloeil; }) diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix index ef2b5c3101c7d..7d704633a3603 100644 --- a/pkgs/by-name/ar/armitage/package.nix +++ b/pkgs/by-name/ar/armitage/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { gradle makeWrapper copyDesktopItems - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ writeDarwinBundle ]; @@ -87,18 +87,18 @@ stdenv.mkDerivation (finalAttrs: { install -Dm755 dist/unix/armitage $out/bin/armitage substituteInPlace $out/bin/armitage \ - --replace "armitage.jar" "$JAR" + --replace-fail "armitage.jar" "$JAR" wrapProgram $out/bin/armitage \ --prefix PATH : "${lib.makeBinPath [ jdk11 metasploit ]}" install -Dm755 dist/unix/teamserver $out/bin/teamserver substituteInPlace $out/bin/teamserver \ - --replace "armitage.jar" "$JAR" + --replace-fail "armitage.jar" "$JAR" wrapProgram $out/bin/teamserver \ --prefix PATH : "${lib.makeBinPath [ jdk11 metasploit ]}" install -Dm444 dist/unix/armitage-logo.png $out/share/pixmaps/armitage.png - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications/Armitage.app/Contents/MacOS" mkdir -p "$out/Applications/Armitage.app/Contents/Resources" cp dist/mac/Armitage.app/Contents/Resources/macIcon.icns $out/Applications/Armitage.app/Contents/Resources diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 1abfe6f3b701f..04a5678f38f19 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -50,13 +50,13 @@ testers, enableShared ? !stdenv.hostPlatform.isStatic, enableFlight ? true, - enableJemalloc ? !stdenv.isDarwin, + enableJemalloc ? !stdenv.hostPlatform.isDarwin, enableS3 ? true, - enableGcs ? !stdenv.isDarwin, + enableGcs ? !stdenv.hostPlatform.isDarwin, }: assert lib.asserts.assertMsg ( - (enableS3 && stdenv.isDarwin) + (enableS3 && stdenv.hostPlatform.isDarwin) -> (lib.versionOlder boost.version "1.69" || lib.versionAtLeast boost.version "1.70") ) "S3 on Darwin requires Boost != 1.69"; @@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { ninja autoconf # for vendored jemalloc flatbuffers - ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ boost @@ -218,10 +218,10 @@ stdenv.mkDerivation (finalAttrs: { "-DPARQUET_REQUIRE_ENCRYPTION=ON" ] ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] - ++ lib.optionals (!stdenv.isx86_64) [ "-DARROW_USE_SIMD=OFF" ] + ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DARROW_USE_SIMD=OFF" ] ++ lib.optionals enableS3 [ "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" ]; @@ -247,7 +247,7 @@ stdenv.mkDerivation (finalAttrs: { "TestS3FS.*" "TestS3FSGeneric.*" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # TODO: revisit at 12.0.0 or when # https://github.com/apache/arrow/commit/295c6644ca6b67c95a662410b2c7faea0920c989 # is available, see diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index 67f9032faebb4..6181d49d4b06b 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -3,18 +3,27 @@ , fetchFromBitbucket , cmake , pkg-config +, util-linux +, libselinux +, libsepol +, libthai +, libdatrie +, lerc +, libxkbcommon +, libepoxy +, libXtst , wrapGAppsHook3 -, makeWrapper , pixman , libpthreadstubs , gtkmm3 , libXau , libXdmcp , lcms2 +, libraw , libiptcdata , fftw , expat -, pcre +, pcre2 , libsigcxx , lensfun , librsvg @@ -22,6 +31,10 @@ , exiv2 , exiftool , mimalloc +, openexr_3 +, ilmbase +, opencolorio +, color-transformation-language }: stdenv.mkDerivation rec { @@ -42,16 +55,26 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + util-linux + libselinux + libsepol + libthai + libdatrie + lerc + libxkbcommon + libepoxy + libXtst pixman libpthreadstubs gtkmm3 libXau libXdmcp lcms2 + libraw libiptcdata fftw expat - pcre + pcre2 libsigcxx lensfun librsvg @@ -59,11 +82,18 @@ stdenv.mkDerivation rec { exiftool libcanberra-gtk3 mimalloc + openexr_3 + ilmbase + opencolorio + color-transformation-language ]; cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" "-DCACHE_NAME_SUFFIX=\"\"" + "-DENABLE_OCIO=True" + "-DENABLE_CTL=1" + "-DCTL_INCLUDE_DIR=${color-transformation-language}/include/CTL" ]; CMAKE_CXX_FLAGS = toString [ diff --git a/pkgs/by-name/ar/artalk/package.nix b/pkgs/by-name/ar/artalk/package.nix index a9918059d6ad1..c56c066e2acf7 100644 --- a/pkgs/by-name/ar/artalk/package.nix +++ b/pkgs/by-name/ar/artalk/package.nix @@ -11,22 +11,22 @@ }: buildGoModule rec { pname = "artalk"; - version = "2.8.7"; + version = "2.9.0"; src = fetchFromGitHub { owner = "ArtalkJS"; repo = "artalk"; rev = "refs/tags/v${version}"; - hash = "sha256-fOuZiFomXGvRUXkpEM3BpJyMOtSm6/RHd0a7dPOsoT4="; + hash = "sha256-5tUUlkGeT4kY/81EQ29M6z+JnBT4YCa8gecbV9WMuDo="; }; web = fetchurl { url = "https://github.com/${src.owner}/${src.repo}/releases/download/v${version}/artalk_ui.tar.gz"; - hash = "sha256-3Rg5mCFigLkZ+X8Fxe6A16THd9j6hcTYMEAKU1SrLMw="; + hash = "sha256-Cx3fDpnl52kwILzH9BBLfsWe5qEbIl/ecJd1wJEB/Hc="; }; CGO_ENABLED = 1; - vendorHash = "sha256-Hm388ub/ja3PuSRqPkr6A+pgKUQ+czMj1WKU8W8H5wI="; + vendorHash = "sha256-edqmv/Q99pgnScJqCmLwjHd7uKMNPGfCSujNTUQtpLc="; ldflags = [ "-s" diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix new file mode 100644 index 0000000000000..6185ec1c683ff --- /dev/null +++ b/pkgs/by-name/ar/arti/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitLab, + pkg-config, + sqlite, + openssl, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "arti"; + version = "1.2.7"; + + src = fetchFromGitLab { + domain = "gitlab.torproject.org"; + group = "tpo"; + owner = "core"; + repo = "arti"; + rev = "arti-v${version}"; + hash = "sha256-lyko4xwTn03/Es8icOx8GIrjC4XDXvZPDYHYILw8Opo="; + }; + + cargoHash = "sha256-I45SaawWAK7iTZDFhJT4YVO439D/3NmWLp3FtFmhLC0="; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + + buildInputs = + [ sqlite ] + ++ lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreServices + ] + ); + + cargoBuildFlags = [ + "--package" + "arti" + ]; + + cargoTestFlags = [ + "--package" + "arti" + ]; + + checkFlags = [ + # problematic tests that were fixed after the release + "--skip=reload_cfg::test::watch_single_file" + "--skip=reload_cfg::test::watch_multiple" + ]; + + meta = { + description = "Implementation of Tor in Rust"; + mainProgram = "arti"; + homepage = "https://arti.torproject.org/"; + changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/${src.rev}/CHANGELOG.md"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ rapiteanu ]; + }; +} diff --git a/pkgs/development/compilers/as31/0000-getline-break.patch b/pkgs/by-name/as/as31/0000-getline-break.patch similarity index 100% rename from pkgs/development/compilers/as31/0000-getline-break.patch rename to pkgs/by-name/as/as31/0000-getline-break.patch diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/by-name/as/as31/package.nix similarity index 100% rename from pkgs/development/compilers/as31/default.nix rename to pkgs/by-name/as/as31/package.nix diff --git a/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix b/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix index e3f879d293afa..f3fe53a3ecfae 100644 --- a/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix +++ b/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { owner = "yishilin14"; repo = "asc-key-to-qr-code-gif"; rev = "5d36a1bada8646ae0f61b04356e62ba5ef10a1aa"; - sha256 = "sha256-DwxYgBsioL86WM6KBFJ+DuSJo3/1pwD1Fl156XD98RY="; + hash = "sha256-DwxYgBsioL86WM6KBFJ+DuSJo3/1pwD1Fl156XD98RY="; }; dontBuild = true; diff --git a/pkgs/by-name/as/asciinema-automation/package.nix b/pkgs/by-name/as/asciinema-automation/package.nix index 339ec370a96f6..975659da7cdc8 100644 --- a/pkgs/by-name/as/asciinema-automation/package.nix +++ b/pkgs/by-name/as/asciinema-automation/package.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { pexpect ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { dev = [ mypy pytest diff --git a/pkgs/by-name/as/asfa/package.nix b/pkgs/by-name/as/asfa/package.nix index 846ce5ef176ab..e9be2526dd729 100644 --- a/pkgs/by-name/as/asfa/package.nix +++ b/pkgs/by-name/as/asfa/package.nix @@ -10,19 +10,19 @@ installShellFiles, }: let - version = "0.10.0"; + version = "0.10.0-1"; src = fetchFromGitHub { owner = "obreitwi"; repo = "asfa"; rev = "v${version}"; - hash = "sha256-MnhnwtZmPFhOuiqNiaxJnPu88JOdlpvyVy0YGphblBc="; + hash = "sha256-ARdUlACxmbjmOTuNW2oiVUcfd5agR4rcp9aMQYUAYsw="; }; in rustPlatform.buildRustPackage { pname = "asfa"; inherit version src; - cargoHash = "sha256-/bRBP/NzcNOXl/nANeOYouUAo3NNbtbV9fxIJrNajYQ="; + cargoHash = "sha256-pzCTqVUo3LEpR3hmTPKDwvgtUJZ+tsArbi0HDlY2Cy8="; outputs = [ "out" @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeBuildInputs = [ help2man diff --git a/pkgs/development/compilers/asl/Makefile-nixos.def b/pkgs/by-name/as/asl/Makefile-nixos.def similarity index 100% rename from pkgs/development/compilers/asl/Makefile-nixos.def rename to pkgs/by-name/as/asl/Makefile-nixos.def diff --git a/pkgs/by-name/as/asl/package.nix b/pkgs/by-name/as/asl/package.nix new file mode 100644 index 0000000000000..f6cbe3f46b66c --- /dev/null +++ b/pkgs/by-name/as/asl/package.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchzip +, texliveMedium +, buildDocs ? false +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "asl"; + version = "142-bld232"; + + src = let inherit (finalAttrs) pname version; in fetchzip { + name = "${pname}-${version}"; + url = "http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-${version}.tar.bz2"; + hash = "sha256-Q50GzXBxFMhbt5s9OgHPNH4bdqz2hhEmTnMmKowVn2E="; + }; + + outputs = [ "out" "doc" "man" ]; + + nativeBuildInputs = lib.optionals buildDocs [ texliveMedium ]; + + postPatch = lib.optionalString (!buildDocs) '' + substituteInPlace Makefile --replace "all: binaries docs" "all: binaries" + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' + substituteInPlace sysdefs.h --replace "x86_64" "aarch64" + ''; + + dontConfigure = true; + + preBuild = '' + bindir="${placeholder "out"}/bin" \ + docdir="${placeholder "doc"}/share/doc/asl" \ + incdir="${placeholder "out"}/include/asl" \ + libdir="${placeholder "out"}/lib/asl" \ + mandir="${placeholder "man"}/share/man" \ + substituteAll ${./Makefile-nixos.def} Makefile.def + mkdir -p .objdir + ''; + + meta = with lib; { + homepage = "http://john.ccac.rwth-aachen.de:8000/as/index.html"; + description = "Portable macro cross assembler"; + longDescription = '' + AS is a portable macro cross assembler for a variety of microprocessors + and -controllers. Though it is mainly targeted at embedded processors and + single-board computers, you also find CPU families in the target list that + are used in workstations and PCs. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +}) +# TODO: cross-compilation support +# TODO: customize TeX input +# TODO: report upstream about `mkdir -p .objdir/` +# TODO: suggest upstream about building docs as an option diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 0f5be37795a58..08da3009f6bb4 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -1,12 +1,16 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + darwin, + libiconv, }: let pname = "asm-lsp"; - version = "0.7.4"; + version = "0.9.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,18 +19,19 @@ rustPlatform.buildRustPackage { owner = "bergercookie"; repo = "asm-lsp"; rev = "v${version}"; - hash = "sha256-tgwiCAlHuFdeMr1GA4vPg8i94zfRj+uyPMAXYh+Smo4="; + hash = "sha256-0GB3tXZuCu3syh+RG+eXoliZVHMPOhYC3RchSSx4u5w="; }; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.buildPlatform.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + libiconv + ]; - cargoHash = "sha256-UBYD0rs7bEtVZatu/kRgyCwKHvcgYJWRgyfBi3ooPGQ="; + cargoHash = "sha256-AtCnYOOtViMpg+rz8miuBZg1pENBPaf9kamSPaVUyiw="; # tests expect ~/.cache/asm-lsp to be writable preCheck = '' @@ -37,8 +42,11 @@ rustPlatform.buildRustPackage { description = "Language server for NASM/GAS/GO Assembly"; homepage = "https://github.com/bergercookie/asm-lsp"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ NotAShelf ]; + maintainers = with lib.maintainers; [ + NotAShelf + CaiqueFigueiredo + ]; mainProgram = "asm-lsp"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/as/asouldocs/package.nix b/pkgs/by-name/as/asouldocs/package.nix new file mode 100644 index 0000000000000..f5392796fdde5 --- /dev/null +++ b/pkgs/by-name/as/asouldocs/package.nix @@ -0,0 +1,34 @@ +{ + lib, + asouldocs, + buildGoModule, + fetchFromGitHub, + testers, +}: + +buildGoModule rec { + pname = "asouldocs"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "asoul-sig"; + repo = "asouldocs"; + rev = "v${version}"; + hash = "sha256-ctRE7aF3Qj+fI/m0CuLA6x7E+mY6s1+UfBJI5YFea4g="; + }; + + vendorHash = "sha256-T/KLiSK6bxXGkmVJ5aGrfHTUfLs/ElGyWSoCL5kb/KU="; + + passthru.tests.version = testers.testVersion { + package = asouldocs; + command = "asouldocs --version"; + }; + + meta = with lib; { + description = "Web server for multi-language, real-time synchronization and searchable documentation"; + homepage = "https://asouldocs.dev/"; + license = licenses.mit; + maintainers = with maintainers; [ anthonyroussel ]; + mainProgram = "asouldocs"; + }; +} diff --git a/pkgs/by-name/as/assemblyscript/package.nix b/pkgs/by-name/as/assemblyscript/package.nix index b2fcb5ff6317e..cb0f0cd25948e 100644 --- a/pkgs/by-name/as/assemblyscript/package.nix +++ b/pkgs/by-name/as/assemblyscript/package.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "assemblyscript"; - version = "0.27.29"; + version = "0.27.30"; src = fetchFromGitHub { owner = "AssemblyScript"; repo = "assemblyscript"; rev = "v${version}"; - sha256 = "sha256-Jhjq+kLRzDesTPHHonImCnuzt1Ay04n7+O9aK4knb5g="; + hash = "sha256-dmtKXU1bu25AzqxBhC9sWulMek5gRVnD0FN0G0XGQxU="; }; - npmDepsHash = "sha256-mWRQPQVprM+9SCYd8M7NMDtiwDjSH5cr4Xlr5VP9eHo="; + npmDepsHash = "sha256-rj6tvevoDQQihTH+tYkrvhJRzynglG5roHHL7aZ6j+Y="; meta = with lib; { homepage = "https://github.com/AssemblyScript/assemblyscript"; diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 1a35131b61317..44c90f1e2cfc0 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.26.3"; + version = "0.27.3"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-i2M3QSwLj2px6tiYyW8jz/WZ2z+IETrSoxis+BgHGXg="; + hash = "sha256-nE4cHQvFseSgB6LluTp9dCDEqR9vAymZCN3V7HgieYA="; }; - cargoHash = "sha256-6CXttQ+r2Ye5tz1V7XgLLnKQg7LHUVUtqpThETrwtzQ="; + cargoHash = "sha256-A0qvug8wbqN22B0j6BFZyeHMfmlBsuZJRJ1SmctTz1s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/as/astartectl/package.nix b/pkgs/by-name/as/astartectl/package.nix index 4dcd046570e97..ac88b96cfab7f 100644 --- a/pkgs/by-name/as/astartectl/package.nix +++ b/pkgs/by-name/as/astartectl/package.nix @@ -5,20 +5,16 @@ }: buildGoModule rec { pname = "astartectl"; - version = "23.5.1"; - - # Workaround for go vendor failing - # https://github.com/astarte-platform/astartectl/pull/244 - postPatch = "go mod edit -go=1.22"; + version = "24.5.2"; src = fetchFromGitHub { owner = "astarte-platform"; repo = "astartectl"; rev = "v${version}"; - hash = "sha256-ntlLk7soiZq6Ql6k/RG9PdHawguRV6Wha8C+5FM+2og="; + hash = "sha256-T4/lkeipE7GWq1zTxkoV3MfADlduFKtGuB/dsI4YZZw="; }; - vendorHash = "sha256-3k/G7fLll19XG2RU8YsepWv8BtkCmiLg4/c7lSvx+9k="; + vendorHash = "sha256-kVI1DigDlTvrYLVRUYoW+AAkd31d9EehjRJxrqo8OB4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 9859765bf8974..e2bdedc60f0d6 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "astro-language-server"; - version = "2.10.0"; + version = "2.14.2"; src = fetchFromGitHub { owner = "withastro"; repo = "language-tools"; rev = "@astrojs/language-server@${finalAttrs.version}"; - hash = "sha256-WdeQQaC9AVHT+/pXLzaC6MZ6ddHsFSpxoDPHqWvqmiQ="; + hash = "sha256-4GaLyaRUN9qS2U7eSzASB6fSQY2+fWtgfb54uuHjuh4="; }; pnpmDeps = pnpm_8.fetchDeps { @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspace prePnpmInstall ; - hash = "sha256-n7HTd/rKxJdQKnty5TeOcyvBU9j/EClQ9IHqbBaEwQE="; + hash = "sha256-q9a4nFPRhR6W/PT1l/Q1799iDmI+WTsudUP8rb8e97g="; }; nativeBuildInputs = [ @@ -35,15 +35,21 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ nodejs_22 ]; - pnpmWorkspace = "@astrojs/language-server"; + # Must specify to download "@astrojs/yaml2ts" depencendies + # https://pnpm.io/filtering#--filter-package_name-1 + pnpmWorkspace = "@astrojs/language-server..."; prePnpmInstall = '' + # Warning section for "pnpm@v8" + # https://pnpm.io/cli/install#--filter-package_selector pnpm config set dedupe-peer-dependents false ''; buildPhase = '' runHook preBuild - pnpm --filter=@astrojs/language-server build + # Must build the "@astrojs/yaml2ts" package. Dependency is linked via workspace by "pnpm" + # (https://github.com/withastro/language-tools/blob/%40astrojs/language-server%402.14.2/pnpm-lock.yaml#L78-L80) + pnpm --filter "@astrojs/language-server..." build runHook postBuild ''; @@ -61,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "The Astro language server"; homepage = "https://github.com/withastro/language-tools"; + changelog = "https://github.com/withastro/language-tools/blob/@astrojs/language-server@${finalAttrs.version}/packages/language-server/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pyrox0 ]; mainProgram = "astro-ls"; diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index 66d001d215221..000b41b1b904e 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.16.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-PTslXzgZCzmy45zI2omv4Ef5h4gJdfWcK5ko7ulHnXo="; + hash = "sha256-FSZGpV+dREwjst84TT1aBm/H+VqkjI8XDPo3usJ7UeI="; }; - cargoHash = "sha256-ZQyj2+gsZnayWD29dYZDh1zYTstaQluzzF7pXf0yoY4="; + cargoHash = "sha256-sNgtqvFiwHSYMDf0379i8Yl9NrkCRVLo/ogjbHFgKBY="; nativeBuildInputs = [ pkg-config @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { [ oniguruma ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/compilers/atasm/0000-file-not-found.diff b/pkgs/by-name/at/atasm/0000-file-not-found.diff similarity index 100% rename from pkgs/development/compilers/atasm/0000-file-not-found.diff rename to pkgs/by-name/at/atasm/0000-file-not-found.diff diff --git a/pkgs/development/compilers/atasm/0001-select-flags.diff b/pkgs/by-name/at/atasm/0001-select-flags.diff similarity index 100% rename from pkgs/development/compilers/atasm/0001-select-flags.diff rename to pkgs/by-name/at/atasm/0001-select-flags.diff diff --git a/pkgs/development/compilers/atasm/default.nix b/pkgs/by-name/at/atasm/package.nix similarity index 100% rename from pkgs/development/compilers/atasm/default.nix rename to pkgs/by-name/at/atasm/package.nix diff --git a/pkgs/by-name/at/atf/package.nix b/pkgs/by-name/at/atf/package.nix index e77eb5244d6c9..5edb2d6366b8f 100644 --- a/pkgs/by-name/at/atf/package.nix +++ b/pkgs/by-name/at/atf/package.nix @@ -42,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'atf_test_program{name="srcdir_test"}' "" '' # These tests fail on Darwin. - + lib.optionalString (finalAttrs.doInstallCheck && stdenv.isDarwin) '' + + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isDarwin) '' substituteInPlace atf-c/detail/process_test.c \ --replace-fail 'ATF_TP_ADD_TC(tp, status_coredump);' "" '' # This test fails on Linux. - + lib.optionalString (finalAttrs.doInstallCheck && stdenv.isLinux) '' + + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isLinux) '' substituteInPlace atf-c/detail/fs_test.c \ --replace-fail 'ATF_TP_ADD_TC(tp, eaccess);' "" ''; diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index 53cba1793a3ea..2cdd671c7504e 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -1,24 +1,29 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, testers -, athens +{ + lib, + fetchFromGitHub, + buildGoModule, + testers, + athens, }: + buildGoModule rec { pname = "athens"; - version = "0.14.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "gomods"; repo = "athens"; rev = "v${version}"; - hash = "sha256-vpg5EcQSxVFjDFKa4oHwF5fNHhLWtj3ZMi2wbMZNn/8="; + hash = "sha256-Ikm9nznJhd5ZrkJyh3ny1SZeuWVs5xgT4fpWKhVbuDA="; }; - vendorHash = "sha256-LajNPzGbWqW+9aqiquk2LvSUjKwi1gbDY4cKXmn3PWk="; + vendorHash = "sha256-cK23BIGh/BK1OHHrI++PD1h7lCN7NZfV1Yfirs8vC5A="; CGO_ENABLED = "0"; - ldflags = [ "-s" "-w" "-X github.com/gomods/athens/pkg/build.version=${version}" ]; + ldflags = [ + "-s" + "-X github.com/gomods/athens/pkg/build.version=${version}" + ]; subPackages = [ "cmd/proxy" ]; @@ -27,9 +32,7 @@ buildGoModule rec { ''; passthru = { - tests.version = testers.testVersion { - package = athens; - }; + tests.version = testers.testVersion { package = athens; }; }; meta = with lib; { @@ -38,7 +41,10 @@ buildGoModule rec { changelog = "https://github.com/gomods/athens/releases/tag/v${version}"; license = licenses.mit; mainProgram = "athens"; - maintainers = with maintainers; [ katexochen malt3 ]; + maintainers = with maintainers; [ + katexochen + malt3 + ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix new file mode 100644 index 0000000000000..d19454e84ce51 --- /dev/null +++ b/pkgs/by-name/at/atlas/package.nix @@ -0,0 +1,46 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, atlas }: + +buildGoModule rec { + pname = "atlas"; + version = "0.28.0"; + + src = fetchFromGitHub { + owner = "ariga"; + repo = "atlas"; + rev = "v${version}"; + hash = "sha256-D6dHHTxD2eObmXwYntIOtcPsU1vP+K289n+XVoaGUVc="; + }; + + modRoot = "cmd/atlas"; + + proxyVendor = true; + vendorHash = "sha256-SFG//hc5vLQXC3SeEn4YRcc82PItYZy+TNqzq19sRnI="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-s" "-w" "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" ]; + + subPackages = [ "." ]; + + postInstall = '' + installShellCompletion --cmd atlas \ + --bash <($out/bin/atlas completion bash) \ + --fish <($out/bin/atlas completion fish) \ + --zsh <($out/bin/atlas completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = atlas; + command = "atlas version"; + version = "v${version}"; + }; + + meta = with lib; { + description = "Modern tool for managing database schemas"; + homepage = "https://atlasgo.io/"; + changelog = "https://github.com/ariga/atlas/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "atlas"; + }; +} diff --git a/pkgs/by-name/at/atlassian-plugin-sdk/package.nix b/pkgs/by-name/at/atlassian-plugin-sdk/package.nix new file mode 100644 index 0000000000000..8f4becdd99147 --- /dev/null +++ b/pkgs/by-name/at/atlassian-plugin-sdk/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchurl, + makeWrapper, + jdk11, + atlassian-plugin-sdk, + testers, + writeShellScript, + common-updater-scripts, + curl, + jq, + yq, +}: + +let + mavenGroupIdUrl = "https://packages.atlassian.com/maven/public/com/atlassian/amps"; + +in +stdenv.mkDerivation rec { + pname = "atlassian-plugin-sdk"; + version = "9.1.1"; + + src = fetchurl { + url = "${mavenGroupIdUrl}/atlassian-plugin-sdk/${version}/atlassian-plugin-sdk-${version}.tar.gz"; + hash = "sha256-sEAe1eif9qXvIOu8RfZ4MWngEO5yCjU74g4Crd85J3Y="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk11 ]; + + unpackPhase = "tar -xzf $src"; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r atlassian-plugin-sdk-${version}/* $out + rm $out/bin/*.bat + + for file in "$out"/bin/*; do + wrapProgram $file --set JAVA_HOME "${jdk11}" + done + + runHook postInstall + ''; + + passthru = { + tests.version = testers.testVersion { + package = atlassian-plugin-sdk; + command = "atlas-version"; + version = "atlassian-plugin-sdk-${version}"; + }; + + updateScript = writeShellScript "update-atlassian-plugin-sdk" '' + set -o errexit + export PATH="${ + lib.makeBinPath [ + curl + jq + yq + common-updater-scripts + ] + }:$PATH" + + NEW_VERSION=$(curl -s ${mavenGroupIdUrl}/atlassian-plugin-sdk/maven-metadata.xml | xq -r '.metadata.versioning.latest') + + if [[ "${version}" = "$NEW_VERSION" ]]; then + echo "The new version same as the old version." + exit 0 + fi + + DOWNLOAD_URL="${mavenGroupIdUrl}/atlassian-plugin-sdk/${version}/atlassian-plugin-sdk-$NEW_VERSION.tar.gz" + NIX_HASH=$(nix hash to-sri sha256:$(nix-prefetch-url $DOWNLOAD_URL)) + + update-source-version "atlassian-plugin-sdk" "$NEW_VERSION" "$NIX_HASH" "$DOWNLOAD_URL" + ''; + }; + + meta = with lib; { + description = "Atlassian Plugin SDK"; + homepage = "https://developer.atlassian.com/server/framework/atlassian-sdk/"; + license = licenses.asl20; + maintainers = with maintainers; [ pathob ]; + platforms = platforms.linux; + mainProgram = "atlas-mvn"; + }; +} diff --git a/pkgs/by-name/at/atlauncher/deps.json b/pkgs/by-name/at/atlauncher/deps.json new file mode 100644 index 0000000000000..bd7ab048a99b7 --- /dev/null +++ b/pkgs/by-name/at/atlauncher/deps.json @@ -0,0 +1,1285 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jitpack.io/com": { + "github/ATLauncher/gradle-macappbundle#build/d22f8cdb94": { + "jar": "sha256-rBqYi12MUWdwuNbFSlYO0tREzcDpfXI3VRPVV/DRZ+c=", + "module": "sha256-JlSHpEtQuOO3/qIdidXBZ21IjieA7PE2b0ui7aimdxc=", + "pom": "sha256-ySbX7ZLlXt7l+JcGEqV/peu6T+h7oJp6s/d95XQdIVo=" + }, + "github/ATLauncher/gradle-macappbundle#edu.sc.seis.macAppBundle.gradle.plugin/d22f8cdb94": { + "pom": "sha256-9LZJTFfyVUyMXTgn2ifGyXEPLfPJ6tmlY8qSWEO0YmU=" + }, + "github/MCRcortex#nekodetector/Version-1.1-pre": { + "jar": "sha256-5K2d2tmaNRavJFLe9oIv1RxNUoSUsWbZla7B0Z+4f9U=", + "module": "sha256-NCI+ztVps3ogtEyQTwowxHLTZCzaGuKHF4xQItu/Ejg=", + "pom": "sha256-pdiFUkilkUhJCwxup4WHMPCu9aPmzg0LmuVZ18Z5ODo=" + }, + "github/RyanTheAllmighty/gettext#gettext-gradle-plugin/aab5c30bf8": { + "jar": "sha256-S6XyAGm5/VXtmttMQBoNSkZ1cKNw0WKPVnLl0GxyTjw=", + "pom": "sha256-ozcVak/AVSDRcUwozKhEC5crmdQwI1NUJso7nGu5qOg=" + }, + "github/RyanTheAllmighty/gettext#gettext-lib/88ae68d897": { + "jar": "sha256-W/Er53HJryRvdlo/Vh4XQFu6TSD5OTwTxSYt7Sv9QMs=", + "pom": "sha256-nbYGMqdReKL4Po10G3MWrloZWQLK8zUd3YqLKs/8TZI=" + }, + "github/RyanTheAllmighty/gettext#gettext-lib/aab5c30bf8": { + "jar": "sha256-5ZE5ZDU4P3vhzmlAOVxAZynMBrkJfxPsTKVH+b/MxRE=", + "pom": "sha256-AdGzI8W4ciDR49kasH/2Bh0XVpY8Ve/MFj+LI3pJHR4=" + }, + "github/Vatuu#discord-rpc/1.6.2": { + "jar": "sha256-nTR5RBRKtdd34W1ui+EI3gxb9fbIz08uBOXS3Wn7tU4=", + "pom": "sha256-TWqqjVQWL2EeeD9I7+HngsFOv5WuZifEfKc9s1PVVdo=" + }, + "gitlab/doomsdayrs#rxswing/a5749ad421": { + "jar": "sha256-XZIGfC5TCNjiXwHdEdpxBSGWJu8aHt5RLkHYJey0nbc=", + "module": "sha256-TAPDjgy5Byv7Vh43y9xE1VmAcq62/FGCh6NX+8Ir7lk=", + "pom": "sha256-7Grt6dk72Csvb8zMKtflZte6wdf4SjDUynirA/OF1fM=" + } + }, + "https://libraries.minecraft.net": { + "com/mojang#authlib/1.5.21": { + "jar": "sha256-znqchuvr8wuJkpAm9KCjxYzg9NR5N9bcCGrk/Qx3VEo=", + "pom": "sha256-1ZKDxzA7QuQWUY2PXCZYlSlcEWkP2NNgefGgTGpWsXw=" + } + }, + "https://plugins.gradle.org/m2": { + "com/adarshr#gradle-test-logger-plugin/3.2.0": { + "jar": "sha256-LW0Bksjs90nVxLHkUz/P2WXrsuteW9G+6qpLEJYdldg=", + "pom": "sha256-bQ61NlUv5CUhW5L7YX/UP3RSCt05QDQUE3oVEkBPEFA=" + }, + "com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/3.2.0": { + "pom": "sha256-ql6amsMp1l5VI+RgyVfUmalqo/FUJzQoxENCxB57BBk=" + }, + "com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": { + "pom": "sha256-+Ww0HGI0gfly9FQurzIE3rd3NerlFYjOQrY0LUzfmcE=" + }, + "com/github/ben-manes#gradle-versions-plugin/0.47.0": { + "jar": "sha256-H3CAteTQM5/dUJhSa+YDtPCVFaR/EirBUVCZzRWNg88=", + "module": "sha256-VYVMhFmwZESD+Gh53gvsIcwx9GsgfNizpF5TdKxngl4=", + "pom": "sha256-lO3mIRlM2G49tapNmGwedJroqjkSrN9xP5pTyKh9E5Q=" + }, + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.47.0": { + "pom": "sha256-+Mn7dWyfcAjGRFsFTbe7g9aJAp09tHjdYZqa7cwnCgw=" + }, + "com/github/johnrengelman#shadow/8.1.1": { + "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=", + "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=", + "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { + "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA=" + }, + "de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": { + "pom": "sha256-6wbtSRqHmov6z2CGiCpS/hh9J17a+DUN0eoMmMQS6Jw=" + }, + "edu/sc/seis#macAppBundle/2.3.0": { + "jar": "sha256-RaQcBHwRecgPk0+WBIlWK8yD9CjWMcLUC2qzf93XlEQ=", + "pom": "sha256-Bz+N8ig5R6YJRDDWt0iJ8xSjOW+6zOTAfqlTI+uecbY=" + }, + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.3": { + "pom": "sha256-Os140q2vOhpbu95A1j3H9vFCTge+OmzytMhvP5E2RKU=" + }, + "edu/sc/seis/launch4j#launch4j/3.0.3": { + "jar": "sha256-nKdCRA20uwEgYWQXxHE500jaDntn3KVB+wKfR3Yjdjo=", + "module": "sha256-Cjj1r5mHEEhY1lPn0qwfv7kdHDfqDqU7qTf3lC1E4vs=", + "pom": "sha256-hXI2OQ+LV4qlENBxsf2+k8/UKKcbyie2JDliKah7PGQ=" + }, + "edu/sc/seis/macAppBundle#edu.sc.seis.macAppBundle.gradle.plugin/2.3.0": { + "pom": "sha256-aIm5UVUoqdAZ6vQ1FQTUkj0fIZz34HuRZKnYERmdBsw=" + }, + "gradle/plugin/org/cadixdev/gradle#licenser/0.6.1": { + "jar": "sha256-w2sPCJOeiD8o0b9WgNvxxNYCSiIuN5dXiaJTcC05JmI=", + "pom": "sha256-BPOApmghda+dW1ux+P7ULbtdoscHNpd0D/RfJn5MDtw=" + }, + "org/cadixdev/licenser#org.cadixdev.licenser.gradle.plugin/0.6.1": { + "pom": "sha256-R5s2fGaOTTg5LrH+WVD4tOq6CFe0hym9oxIiIhX74MM=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/apollographql/apollo#apollo-api-jvm/2.5.14": { + "jar": "sha256-ik9oiadu00lo72+aZMPpSyarUmFJR65dQjexoMFj2kY=", + "module": "sha256-UjgMwRILvKZlPCrJHqBq6+z8S8JsqPUV/GH174tgX0E=", + "pom": "sha256-B1cZPGRU3KS8qiGATDsYfLF6ZhxFy20HRbv3J8tFkkA=" + }, + "com/apollographql/apollo#apollo-api/2.5.14": { + "module": "sha256-aCVcba2dnxtyH11LvYGOogtdkEMpTU76vW+ZkdI/3IE=", + "pom": "sha256-ua2D9n7+u+1w/Xo4Q6xu40aXPMJyIdqG4i/JwcjcD1w=" + }, + "com/apollographql/apollo#apollo-gradle-plugin/2.5.14": { + "jar": "sha256-xolghlRAe5uPk217j8CgLcTvhqEubaVgAkQTbJ+vq0M=", + "module": "sha256-UCBR7CzahYmZRozuBYi1AJZDkCAjp4a/MBERzEENVGA=", + "pom": "sha256-BADiKaboAKDcR+Smb0HtYvPR91qAz8kCcXhR0+VqR6o=" + }, + "com/apollographql/apollo#apollo-http-cache-api/2.5.14": { + "jar": "sha256-Qca5bmMQxRJ9LmG3cP84u/3I0Yz95G/F640Z/QZpRlw=", + "module": "sha256-9DW1mK+1e/Zj59xx6DXNPFSWtx4IaqpE/jEItadtmto=", + "pom": "sha256-6l/favLiCLRel35kgoX421G/wuITRwWyPYpjYoi6tvA=" + }, + "com/apollographql/apollo#apollo-http-cache/2.5.14": { + "jar": "sha256-PEbhbdRZfbTLqShL0jEBFEs3P7izUEY9JW8OykPkjg8=", + "module": "sha256-HGZ+KrdHJCg6Yuf5ILvuQoEgPT27l/wOp4Lmnb7vA90=", + "pom": "sha256-pUq2o/vxpNP4IcrW5dEwUg9/ggOEuFYf3M6f4UHf0nA=" + }, + "com/apollographql/apollo#apollo-normalized-cache-api-jvm/2.5.14": { + "jar": "sha256-vO01dy6yqLrzGYufZJ7ENTawccRxfoKAj2BOsf0PDPg=", + "module": "sha256-QVaMITERZQZZu+VphkN8S8P8mY5IZ3rMGkAuuDOO0BU=", + "pom": "sha256-MBBuZ/Ul07Qp2+Xho9c68Xvc25czmfiwWud4nQ89TM8=" + }, + "com/apollographql/apollo#apollo-normalized-cache-api/2.5.14": { + "module": "sha256-gTBeMIcINbqp4CpF/E5TO8Mg9jSnKs49bC7KtTRMBjU=", + "pom": "sha256-HIccETIq3dAHgDUoTti34Yxa5jjdXD4wiYt5PkCqleo=" + }, + "com/apollographql/apollo#apollo-normalized-cache-jvm/2.5.14": { + "jar": "sha256-6kNfiztqub0KZUzBG7di5sTandhb0O3+i+o2ELzOWaI=", + "module": "sha256-HJW8E/g0ptk3Xq8smD1S0ent1GeJNkd0i94gGV5mO+M=", + "pom": "sha256-TTOHbwMJCYQXF7edrXrtS5MU9KWvqKL1GtBnmg/fZic=" + }, + "com/apollographql/apollo#apollo-normalized-cache/2.5.14": { + "module": "sha256-Fpsg4WzmNwCZDGnlmlx0DFx8+8z7lv60Lkx7thQ410I=", + "pom": "sha256-ao3ZFBX1vESFDzaky32DEcTmJNEdVbQp7ROa+4yCit0=" + }, + "com/apollographql/apollo#apollo-runtime/2.5.14": { + "jar": "sha256-svVruDVJmTutF/nujXrosNin7NGCo/BO0wwyHqW0vHQ=", + "module": "sha256-pOMsFT5jX7lgFaBK2JbAqzMkyxjv9CFicPmW07FjwLI=", + "pom": "sha256-k/cVpVv+AiUlqEnAhbuvvX8S04By7fYLh+Lhn7+TbT8=" + }, + "com/apollographql/apollo#apollo-rx3-support/2.5.14": { + "jar": "sha256-sHZg8rYqymFjBiL90cy73W1zCcGpjhdBEi5DxvCRV9s=", + "module": "sha256-VnUaIcuCllQzInsCKAEzUSqiKplxEuIyWdkASuK5OZ0=", + "pom": "sha256-Ww5yoXMIwc+dld6zMz5VBi+/5razxalgmH2hfhzrAFA=" + }, + "com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": { + "pom": "sha256-jrv1c+8UAZu4n9/HQnfCBRHVyeEHR10dP8X/O4LVKuY=" + }, + "com/benasher44#uuid-jvm/0.2.0": { + "jar": "sha256-/YBhY1na/dyoW/WGkelJgQ6UGJ2bs8EZ0AL4XGzVk4Q=", + "module": "sha256-UoG7jLvCZCKgfEBeSP1JULZU2Qwe08bNWbFrU+fJ4Hs=", + "pom": "sha256-9ujJ/xbl9o7PsOke2r7s/9lEYh5ZGKlsbAczGmiyg9A=" + }, + "com/benasher44#uuid/0.2.0": { + "module": "sha256-QNZuutBWPPBK7ScOhmAjCHLER8wMoJ5D4ZpOfOIUw1A=", + "pom": "sha256-jrkHIhN74rupW7ioLd0Q6Nxp9ENCuK5tUYBHc4F6M/U=" + }, + "com/ethlo/time#itu/1.7.0": { + "jar": "sha256-Vc60GMnoE4xPz2LiE8TIFNieioTIJ9OVQHy+y6XXkec=", + "pom": "sha256-gIZwS+Wqp8UulyZmz0nHr+6bOZu6O6nNJraAXE/N6Bg=" + }, + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml#oss-parent/49": { + "pom": "sha256-bfHMCoZSQhAIiUNBLJcbQqumidGwaNuf05Htmhk4cjU=" + }, + "com/fasterxml/jackson#jackson-base/2.14.1": { + "pom": "sha256-GAFdG6y6mhRiWovxlBH1v62C0AYN83snvQLngTLEZ24=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.14.1": { + "jar": "sha256-0lW0uGP/jscUqPlvpVw0Yh1D27grgtP1dHZJakwJ4ec=", + "module": "sha256-JnpoC7csvXUsdreeuQiuDAq+sRT8scIKlnjwN4iYues=", + "pom": "sha256-id8WI4ax7eg6iATpCDlw0aYr310caenpkUdhtGf4CIM=" + }, + "com/fasterxml/jackson/core#jackson-core/2.14.1": { + "jar": "sha256-ARQYfilrNMkxwb+eWoQVK2K/q30YL1Yj85gtwto15SY=", + "module": "sha256-fIuANfkA8/HL2wa4x53CsYsR9q+hOwt0cZzuNJ/0wyk=", + "pom": "sha256-dHse68uLbe8o+u7cCSN0jxwVP8aksNjjsLyo3l/aY38=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.14.1": { + "jar": "sha256-QjoMgG3ks/petKKGmDBeOjd3xzHhvPobLzo3YMe253M=", + "module": "sha256-2BeXfIprCq7aUZ+yp7jcugKzjDwnICT62jLFzOfj08s=", + "pom": "sha256-etsj1tdG7c+UbRwGKxmP+aAmwOIrMHuNXXnB4IU4xjU=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.14.1": { + "jar": "sha256-nhV+JiXthVq3OveRXiVvaCOZOjCYL0kjycqCu3UqAwM=", + "module": "sha256-VanyBdnMgeilSjgYNbspbniFWR0Dx0BGd6EuEvJJeoo=", + "pom": "sha256-MLlX5y4J2kuXIn4AFluOTmupgXTK3JcJHDRlLihi4cI=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.1": { + "pom": "sha256-+jI/nD8sJtfMzU4hNgkQRRVNRdwcFmHU+HakcfVix1k=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.14.1": { + "jar": "sha256-C2U2E/UdbhU5bStlzP7JU5sqtHHFhC9bEaxId8vVH3I=", + "module": "sha256-/Tb5c/sUISE7KMjOFXtoj0oKO+9gll/wzohQDtbJIh4=", + "pom": "sha256-yRM4B2Gdzeb1Jc1UNJZSk/0BcUccj4R+D6GVu6GttNc=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.14.1": { + "pom": "sha256-CyfB7lgSDFHyo4cXwseUr/qa91wSNNcpe5zkLof8Il4=" + }, + "com/fasterxml/uuid#java-uuid-generator/4.1.0": { + "jar": "sha256-u0s3BtLxXF5eYCPu0lG87hOPoVK+NUdJ9W/sAccmhnk=", + "pom": "sha256-5TZK+P0X73rgJVElx+Qy1w0YW/Uy6cLzOSWZSeendSQ=" + }, + "com/formdev#flatlaf-extras/3.1.1": { + "jar": "sha256-3l09TZ+oX+pOPEOv1+iCfr5cAF8+H/rVTT4/QJofZtM=", + "module": "sha256-5N/Q1zK+EUS7BJWdNkSwvvzvLAa6MNQj5Cp34hcLmMQ=", + "pom": "sha256-jFE9cIGiz2SOOUG/LTDo/NJ4y7I3FZqbWn2fCNaeXBo=" + }, + "com/formdev#flatlaf/3.1.1": { + "jar": "sha256-Jk75UoYnUQyiDzxoDE46wBKbysI1uNTZ8BQmHzzW1W8=", + "module": "sha256-pyoFwWAhh9DRfKh+1W9IjgzCtVpPiK0LAfgejZlnX4I=", + "pom": "sha256-X6tw379yYFHCJtgn2zQfND00aPKlm3Qw1hQKSJMsi+8=" + }, + "com/formdev#svgSalamander/1.1.3": { + "jar": "sha256-y7Z73jhascHpgy9UkSmCxp/GDIHCRINdB/Q8pORhDrA=", + "pom": "sha256-Cz+GlIGr8x9f9fQ4apYLTeYY4AQgLPHXsowlRf9Qoy8=" + }, + "com/github/cliftonlabs#json-simple/3.0.2": { + "jar": "sha256-/aZamtDhrAyImHEG6Jqk2LKiSV5+BCNx76g4E/ZbcpU=", + "pom": "sha256-sNrLFHnNTb4IENGqM1vw+5vDxP9VNpyHWXumj1h5/k8=" + }, + "com/github/hypfvieh#dbus-java-parent/3.3.2": { + "pom": "sha256-f3IGVDpJy9AvxUbGukYJGeQFwDxaRyNCvF0WQs7WGOI=" + }, + "com/github/hypfvieh#dbus-java/3.3.2": { + "jar": "sha256-avCJp4anMpzhH1cjO0EwLa9+DcQGiffy4LCfpr7gCEU=", + "pom": "sha256-BWRd/O/aPsk7ZdigneVvQfT33DjnqG7nqL5MDZOXhT8=" + }, + "com/github/java-json-tools#btf/1.3": { + "jar": "sha256-Z8PkYutQgH9OCl9N7jBLvxfNmGpC7l6wsvTJv2TRMNk=", + "pom": "sha256-qb8bOVbm1Gy99zeRKOsXMs3hrGVAl5RNxlobbcQlcPA=" + }, + "com/github/java-json-tools#jackson-coreutils-equivalence/1.0": { + "jar": "sha256-60qa19gD+whL/895PIqB9R10W21DjChHDvnVql+4oYI=", + "pom": "sha256-0Vd8uaSY6Et0+ADXdRiQb/ErXT4vKJ2SqTauCU6sxeE=" + }, + "com/github/java-json-tools#jackson-coreutils/2.0": { + "jar": "sha256-FrOqvTqeslZV3aQz41+b2cfBqnmRQncC9fEfAAgT27A=", + "pom": "sha256-jZ7pOk/dXSvYDrqUonoTDWBo8/heSI61vxSUOHEc6eo=" + }, + "com/github/java-json-tools#json-patch/1.13": { + "jar": "sha256-H3lNJWlltT7zfnC1VQXi7QDdwBhNROLo4f3OWjysx94=", + "pom": "sha256-59lec35Uwo1EuFv2Qw8VNvZEZU1pQr2ogzM4r5aWSw8=" + }, + "com/github/java-json-tools#json-schema-core/1.2.14": { + "jar": "sha256-yFmUL92inCbMsr6DqEU6Ew3jX95viK4Yl4VRa10U+Bw=", + "pom": "sha256-pR/BAI6VN7vFJbpywl4Lz4LzXxscwwfC53jS7fO9V18=" + }, + "com/github/java-json-tools#json-schema-validator/2.2.14": { + "jar": "sha256-zZ48WZuzIpZRf9OsOL7qxwnwpquBstQolJXQNhulmJk=", + "pom": "sha256-W8HTDGddkv+DV3ldOvN172JqvffrMjS2TahmKqEeqZs=" + }, + "com/github/java-json-tools#msg-simple/1.2": { + "jar": "sha256-vvQRG5k6Wz5hSNj1hWIczqwqGInNvDREixFjLg2Kmo8=", + "pom": "sha256-bvPzUgcukUz6FzkzRoXyotAAJRL8Ul+kEtSQ1FCUMKM=" + }, + "com/github/java-json-tools#uri-template/0.10": { + "jar": "sha256-OTb2fY59+j7t7+RQ/1iHF0kwiYLGuLcGU1qIQ5HfT7A=", + "pom": "sha256-MXithX0gGmwpZy4rFGrAuj7MUlNquZaUpGuxJfoBxrk=" + }, + "com/github/jnr#jffi/1.3.9": { + "jar": "sha256-1zwPAKXOnb88teW7JpGjJso4giBeyaBs65AGU3En5mE=", + "pom": "sha256-zEqmwymkRXqBhdvE2iH17AYuIiWux5wgCDsg11ESehw=" + }, + "com/github/jnr#jffi/1.3.9/native": { + "jar": "sha256-vd/kYNUoxopx0NTJ0wEi8o9vGC+eu0vo9l5wkMTKiBw=" + }, + "com/github/jnr#jnr-a64asm/1.0.0": { + "jar": "sha256-U65ep/pcKE6Ceao0jnud5FSLDK4Qv9BY+iF8eRh15M8=", + "pom": "sha256-ndnCmco+ySh9suwmVxpcxhHcIaGk9dLvElWpJPrOR6g=" + }, + "com/github/jnr#jnr-constants/0.10.3": { + "jar": "sha256-phew2EY9PqNkNb0WERE97bN0kVev0iaZCKswbJkq7+0=", + "pom": "sha256-5s/r5K5E3pah7I7j/z6xE07Uk7ChWymoZj45tv2rp6I=" + }, + "com/github/jnr#jnr-enxio/0.32.13": { + "jar": "sha256-08ATbrAXYJIhDVyHDb4w8dkrQ9c+6bHkqGHijGRgUnw=", + "pom": "sha256-pcrvbflKJYBULdQsZzN004RQ2W+82Od8mOaoX4ln/Tk=" + }, + "com/github/jnr#jnr-ffi/2.2.11": { + "jar": "sha256-qcC955JRTZLonxneBBLF4m7nLbWYkUAkKykCpDt6x/U=", + "pom": "sha256-i+JCWRyszLbK6dpwD0Nz3a0Adg6NpnlpepgSi7QqX3s=" + }, + "com/github/jnr#jnr-posix/3.1.15": { + "jar": "sha256-w47PzNJOXyHxemLkXVvUVIQsXbF+1CsBuGj5IG0Omec=", + "pom": "sha256-qjwjbl+8bsNl5MgR7OpNvKdZGFHOx8eh32syTE6wgqM=" + }, + "com/github/jnr#jnr-unixsocket/0.38.17": { + "jar": "sha256-mPYscZs0gUV/Jf0l4lAqznqQ1F91olVOvPy2vgsWGhc=", + "pom": "sha256-3oSBWeFSRkTp8cV0r39Gt1Hm5TDzWifutMhT6R6hwuE=" + }, + "com/github/jnr#jnr-x86asm/1.0.2": { + "jar": "sha256-OfNnW5EObpuTgl+ChL7J9K0wRM0gpvfI/54vhpXr8h4=", + "pom": "sha256-6oYs472WzLjKNrjp57rvLaP7v73CVrrqqMioc5EQdOc=" + }, + "com/github/oshi#oshi-core/6.4.4": { + "jar": "sha256-Qj70zXIge3OpGXvVw1FMOzNqcG5E8t+9Hp2hT3UTXc4=", + "pom": "sha256-LQP0hyNVDZCjSpqrK8EAY2jRaaxvpQnLAbHbKbueOFo=" + }, + "com/github/oshi#oshi-parent/6.4.4": { + "pom": "sha256-jNu7z13zPmIDXCUQWKKb7LK6e9R+LjqsDtyKrvfl+dA=" + }, + "com/github/stephenc/jcip#jcip-annotations/1.0-1": { + "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=", + "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs=" + }, + "com/google/code/findbugs#jsr305/2.0.1": { + "pom": "sha256-AsEsPCrhLdR1IZ/2kcgqTZ6iH0S8WUoYEpW/bUPc+7A=" + }, + "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/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/errorprone#error_prone_annotations/2.18.0": { + "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=", + "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw=" + }, + "com/google/errorprone#error_prone_parent/2.18.0": { + "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/32.1.1-jre": { + "pom": "sha256-BqpdGsBo8vgJUw8/9T+1yMlAFSolNiPQtTxPU/WhOj0=" + }, + "com/google/guava#guava/32.1.1-jre": { + "jar": "sha256-kfu6N/HIslHPnqnn06Np63nrHmpd8dS79IPdA4B0AoE=", + "module": "sha256-pY+TjSOeaYtZs8OcrVgO/Ro/1MoTq5KzBCbUJFLE7z4=", + "pom": "sha256-LJBx19FSKwx2IFfDToub+uOZJ6DrdVw2qnZRlyGHDXs=" + }, + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "com/googlecode/libphonenumber#libphonenumber-parent/8.11.1": { + "pom": "sha256-X12sUXT4TGCi6Z56g8eCb3NJgfvCDqHUN/em/Piq2hY=" + }, + "com/googlecode/libphonenumber#libphonenumber/8.11.1": { + "jar": "sha256-9DDJI5TCBT8WhxWFPaltmZlulONOWikbl8XIalrWKpg=", + "pom": "sha256-irUVuq10qC2rsC6+nm8XLUj0r+0KyAxn7aKIRqbN7dA=" + }, + "com/jayway/jsonpath#json-path/2.7.0": { + "jar": "sha256-3oLw5GAu6gGH3zZ3mujPwWU7bZIBJWdK9NNl0LyllQg=", + "pom": "sha256-F5akBRkEB7LqzgQlhmlKmy/w2XuCAJ016VyeIVDN0Mc=" + }, + "com/jcraft#jzlib/1.1.3": { + "jar": "sha256-ibE2D0Bzgb9h/eQRAZ2MvQCeuxDP9xXzZpAXoDECdWA=", + "pom": "sha256-7bZyUWCFVq2VhNAORrXvOOzxJG1XHA+A8k9QsoWp9oI=" + }, + "com/lmax#disruptor/3.4.4": { + "jar": "sha256-FSTtMfE7yr7hthRuZ74wxjF8uU/NDHwvfHofPoIIfFE=", + "pom": "sha256-34QNrLNYveyOnBZAlyHksOsFJGF9QkJt9yg3b8WHQi8=" + }, + "com/networknt#json-schema-validator/1.0.76": { + "jar": "sha256-CbdNrjzp+L4eeUm979MWQt3aWD4us1ZDnSn5QRMB6uA=", + "pom": "sha256-+gTgetjg62RK7LCU6USfD7GSxne3ywqurvL1ndq6UHc=" + }, + "com/nimbusds#nimbus-jose-jwt/9.28": { + "jar": "sha256-7bukLZl+N6zws2zk1anErIjv2ILOVwfzXnUZaul2LkU=", + "pom": "sha256-5rSewLgGmFClCxkWO1b8eoiyU6D2R7Su5uH7mAGnsnU=" + }, + "com/nytimes/android#cache/2.0.2": { + "jar": "sha256-AyLQrW+wm6xEH8wBJyuVbUvrUbHkLdaPm4prCoH1uLU=", + "pom": "sha256-+YA4MgoWLGV7SllvKp9pmkHY2Wg/F/6XQgMdoNT3rjM=" + }, + "com/samskivert#jmustache/1.15": { + "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=", + "pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k=" + }, + "com/sangupta#murmur/1.0.0": { + "jar": "sha256-Mmj1Ag+5oi0slAwazBDllj2IxFLbMdn0YQo0LOftGio=", + "pom": "sha256-iR3ql2IvUijfrV1DCHUq9kJ9GgbfxrRIwuC2vrNwO1Q=" + }, + "com/squareup/moshi#moshi-kotlin/1.12.0": { + "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", + "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=", + "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24=" + }, + "com/squareup/moshi#moshi/1.12.0": { + "jar": "sha256-7pCR4dGlkm+ptN8mQsH7e7lq7Ahjm2IZwZ4LhyTUJHU=", + "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=", + "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k=" + }, + "com/squareup/okhttp3#okhttp-tls/4.11.0": { + "jar": "sha256-SuTHCSwBeBhSRQabkSdGX9V8dkSF81ev7USlxIoFNf0=", + "module": "sha256-2m5O5qfdybnUZusr5ScBAmsXms2wClyso08uXTdeSMI=", + "pom": "sha256-0SYiMcXxtb/bVe/7+SXas1/dWlNFEvhsSd3HIGY/IEg=" + }, + "com/squareup/okhttp3#okhttp/4.11.0": { + "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=", + "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", + "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94=" + }, + "com/squareup/okio#okio-jvm/3.2.0": { + "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=", + "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", + "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" + }, + "com/squareup/okio#okio-multiplatform/2.9.0": { + "module": "sha256-JA9DK32vz1cfuOx8s48eiQiPFsjN92gq9Wt3I5FKw2A=", + "pom": "sha256-NywwDgfKvA3u89B/QoPQfESwoS89XoV9WYT5UYCPdsY=" + }, + "com/squareup/okio#okio/3.2.0": { + "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", + "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" + }, + "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/sun/mail#all/1.6.2": { + "pom": "sha256-S36Dqpt31l4AfpfLUPm4nNt1T6rxZBHl/ZTR49q3brM=" + }, + "com/sun/mail#mailapi/1.6.2": { + "jar": "sha256-03wPiO+llzzLQQD0zEmu41EM0BqyUBLR8IWxt5iuLrs=", + "pom": "sha256-PPiVwnXN1NlmmFtwGYwVAaTl/UqfbYGDiGJKm24oCMA=" + }, + "com/sun/xml/bind#jaxb-bom-ext/4.0.1": { + "pom": "sha256-q7S3Gd3TFWhM1/W/iebXU2XC4I8wCVmsbF9SyjioLxk=" + }, + "com/sun/xml/bind#jaxb-core/4.0.1": { + "jar": "sha256-EIaQnLEwQzA52OKGW/Mxr2KNmSvO8QqV9y3BIasCB3U=", + "pom": "sha256-GmaseJTWVDkAz/EMuxD0hZ68DoQHbYPpP1ybc8wx3lY=" + }, + "com/sun/xml/bind#jaxb-impl/4.0.1": { + "jar": "sha256-2XplOnj4z5pt6azznU7ZHaOQe/7XSOhzCmLDD58+ycE=", + "pom": "sha256-rywz0zS9LjOZLR+fQqSItix5SdweJqpEJ5kMUn4vbZ0=" + }, + "com/sun/xml/bind/mvn#jaxb-bundles/4.0.1": { + "pom": "sha256-sBFLQhIwN6zURDEpu2pdhvCVtdzSLt7wGrGpNvxRcIk=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/4.0.1": { + "pom": "sha256-URxR71bIkbZ15LYenyNqUDCVLBBy/5RgQBgXoQRT+K4=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.20": { + "pom": "sha256-ERiJ4wIWWg9EpU3k23BSUNHeDckbp4oZih0ieDRL7uc=" + }, + "com/thoughtworks/xstream#xstream/1.4.20": { + "jar": "sha256-h98PC+V8kgN9ARD7siWjC2UXAtwnVlPSha/P7zG8LoE=", + "pom": "sha256-c9gezjnpSh0tf80BhGYqo9QQa/6XCbeTlkiS4+f0/cQ=" + }, + "com/tunnelvisionlabs#antlr4-master/4.7.3": { + "pom": "sha256-5KRpWtziLRuHurCavYZ3vnAzbd+63YbTnIAsAMRctro=" + }, + "com/tunnelvisionlabs#antlr4-runtime/4.7.3": { + "jar": "sha256-X08MQDHkuDyzae8A9JCc229isR49JT+DphhNgMXrMVc=", + "pom": "sha256-jcFqM2Rg2Fc4wPw+JKyUwGNwmwHZFYOOBV/PaAFgXV0=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-codec#commons-codec/1.15": { + "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "commons-codec#commons-codec/1.9": { + "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=", + "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA=" + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-io#commons-io/2.4": { + "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=", + "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "de/undercouch#gradle-download-task/5.4.0": { + "jar": "sha256-JsVNuzwLnvITSpqanOcC6qyjbsFUnB3NJVv5SiRqjlQ=", + "module": "sha256-ttq8wyBMhKj4+Eh00qFkQ6thI2PP5SfBAngVuxJ7+sE=", + "pom": "sha256-jlGpL1k66bZZxEYWIcTymIP4l+EC1SIWZFmBsbQJiYU=" + }, + "de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": { + "pom": "sha256-4NrTSpBgtpqatLk0VkOHq5IW2hwphf4BVrQNgfTYMAE=" + }, + "io/fabric8#kubernetes-client-bom/5.12.2": { + "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" + }, + "io/github/classgraph#classgraph/4.8.154": { + "jar": "sha256-8LBLXXexjtow8h+NHDXNbiuMsv8PmsRuc71yekdW39E=", + "pom": "sha256-Irh7X4jt0O1kE2d4w9XluyqenqONrkg8+pOoAn3Qgd0=" + }, + "io/github/x-stream#mxparser/1.2.2": { + "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", + "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" + }, + "io/netty#netty-bom/4.1.86.Final": { + "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" + }, + "io/netty#netty-buffer/4.1.86.Final": { + "jar": "sha256-5C4V9HyGUmax+qbgOOv9fdrc+fSunmYX7dSIHb1Kvog=", + "pom": "sha256-AuVYTl+waYU7QYqRQ15Xdxp2efcf8Ex6K+UXzdOGZF0=" + }, + "io/netty#netty-codec-http/4.1.86.Final": { + "jar": "sha256-P2zrMRLPz3twVF61ERIgzlfbVNWT8j9kw4MzuyLEC4Q=", + "pom": "sha256-Gk2fY66Da5YHWhrQ/QBLUOAerjgqx6BnqPGhtnn/v14=" + }, + "io/netty#netty-codec-http2/4.1.86.Final": { + "jar": "sha256-6Ojijmq2u5ia7ZBHeJIgRfOIz7QgvB6zer9N+IAdsWc=", + "pom": "sha256-E79xRBBCtPvWvrk+VMLnVy11UUJy6JCerJxYxFM4RNE=" + }, + "io/netty#netty-codec-socks/4.1.86.Final": { + "jar": "sha256-g4ovRmeOhKu37XZiR9A4y4Xfr8SA/4wsXkLZHZnF/00=", + "pom": "sha256-qmEWU5aTLf+2bzyVEX8jx+jGUjx9G6uBH9k0SVhJij8=" + }, + "io/netty#netty-codec/4.1.86.Final": { + "jar": "sha256-BFaEC1yFHa1sq4gc0amtXZFttl2BBIFF3x2abQMyW+o=", + "pom": "sha256-6PLkDv2+igJXYhulUNlS53RK1wlXf+ITQXsvya8zJUI=" + }, + "io/netty#netty-common/4.1.86.Final": { + "jar": "sha256-o1o/FufNRcXYUpqj53AtTvOzYhPqMy21l0TqNI/Crpk=", + "pom": "sha256-PhYyrWMX3D24rTt3V9I/l3lXHXKNvGrUAyoZqItQ64k=" + }, + "io/netty#netty-handler-proxy/4.1.86.Final": { + "jar": "sha256-uBL+fXLIT7yE5TtPJnZNgvdrBqZfMx8PvZVDqnPhj5E=", + "pom": "sha256-6KOsTrx3EaCm5UZS2DK1uUiCdlFtPpGyaGKGxxEwafc=" + }, + "io/netty#netty-handler/4.1.86.Final": { + "jar": "sha256-5ptCKSkpsnjcUi4lF33ffFQCVIS1WHn4InNJrfvhwE0=", + "pom": "sha256-MtNruk2l9kv9vau0PHGVXnzQ6dZ5BTHU0/6XiCp+YKs=" + }, + "io/netty#netty-parent/4.1.86.Final": { + "pom": "sha256-HZIrfai+sQMcrCpfr89xnOZyyyy2nuzJw4PzCswWUBM=" + }, + "io/netty#netty-resolver/4.1.86.Final": { + "jar": "sha256-diihMJ1/JEPcQdiSOn8mnimBuWFvgKmZ63JkrmvL/bo=", + "pom": "sha256-q/IkL64IwCALGC91P6pvP0g+wdpt2waO5xfwTOBCB/k=" + }, + "io/netty#netty-tcnative-boringssl-static/2.0.56.Final": { + "jar": "sha256-eS2vMLQmGm6uvmUsFxqq4Qr/GBoomT7GWUJtiefzafg=", + "pom": "sha256-jiXf4zBSV9HHQ1tgk6oqvu8yXN3rAjgxYaRqHF+QcOc=" + }, + "io/netty#netty-tcnative-classes/2.0.56.Final": { + "jar": "sha256-7t6Afw3V6xrXTqGuEJRDBjHaY/zeANTcIOsM0Ei7CsM=", + "pom": "sha256-XvARmSCV3II/sBw7MUKMSmypKnvem7jyetY4DqolYjY=" + }, + "io/netty#netty-tcnative-parent/2.0.56.Final": { + "pom": "sha256-PuDTYrA0q7bTmnEE8G7g0fruIz9MrTVQwwuFKFeaPWE=" + }, + "io/netty#netty-transport-native-unix-common/4.1.86.Final": { + "jar": "sha256-7CbQOgZWV5HVfpl/eTZ37k0/xHspC3lRiYwuzQIy8RU=", + "pom": "sha256-HLTiJ560F+3OKE9xvflhQYMmTyLwUNxTcm9W3w9SC5U=" + }, + "io/netty#netty-transport/4.1.86.Final": { + "jar": "sha256-9nJtzVTkkitGs7T0RntEOnCjDrCKYmIMj+UC2MuALJ8=", + "pom": "sha256-hc9ax3wb90xRqFFVexdXE560zS0KW2HK4oSfRvy1ldo=" + }, + "io/prometheus#parent/0.16.0": { + "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY=" + }, + "io/prometheus#simpleclient/0.16.0": { + "jar": "sha256-IsN08jf3vE/bHw7C2jecC6AOaa0v/otq3lQ9cwYtN38=", + "pom": "sha256-/sCA0HqxWHXZccSugflR2mG1z/mZHPUOUwuo/KR3CXM=" + }, + "io/prometheus#simpleclient_common/0.16.0": { + "jar": "sha256-66bsJs5+QMu4cl4F+4Mkep9PRJRbnnUi4zdd3me58Fk=", + "pom": "sha256-d/ARCc4VB710Q+InJzdnSydST6rLDcuW47jt4LarnrY=" + }, + "io/prometheus#simpleclient_httpserver/0.16.0": { + "jar": "sha256-yrh94QtqR0FRzO68O2NDKalz/7YCzm7+8sD9l6kDZcg=", + "pom": "sha256-PGR/1vVhohsZ7ZcdBBn9Ri2fg/k0e8ChBaHCie6qqsQ=" + }, + "io/prometheus#simpleclient_tracer/0.16.0": { + "pom": "sha256-OBK7IrlfgbTDRg6eTnXDunL6ReRDqfzlMghCqr0OmcI=" + }, + "io/prometheus#simpleclient_tracer_common/0.16.0": { + "jar": "sha256-6Ep4SsjiTxgu5i2oC2tcgUB3S3W/pL+cw9O4OQ22JfY=", + "pom": "sha256-X5AHXOz80RKB3pzLSJaNEhKyRnDWhP/IQEQaUq6HXv8=" + }, + "io/prometheus#simpleclient_tracer_otel/0.16.0": { + "jar": "sha256-oqhMWb7zeWu3+cbyrot96LkFMT7ygYCsPef/Yd1o3z8=", + "pom": "sha256-frl58dwz6L5OWtFDDlQJcYpBeDwmd5qzEFJg9rQ20EY=" + }, + "io/prometheus#simpleclient_tracer_otel_agent/0.16.0": { + "jar": "sha256-etK7QN90p3LZ9URaPQNXm0nWs3pH1ekPbPP1ns9BrQY=", + "pom": "sha256-VSj4WIQ1SulNm8BnR+f1iS0JLAtVBVrnBWZo6gyhznw=" + }, + "io/reactivex/rxjava3#rxjava/3.1.6": { + "jar": "sha256-NGgr0+xvBDxd77WJotGBE7o+LSNy3UAXRPjkgVwdtjg=", + "module": "sha256-xLSmhqW/xXqx3ud42SR1l8LtzDU3d2nbtMWuPQV000Q=", + "pom": "sha256-sfaISn2fJzghY7nkaKlfKNtls7j2tIhVieZ6C7zjw1E=" + }, + "io/sentry#sentry/6.25.0": { + "jar": "sha256-QkQ2zF0SuRoCxvrazTDaf74NPcfoprvSygQEWMLw68w=", + "pom": "sha256-xMKzUiPvr/ZFvCRUcAqtmn+WcZjYDr3hLzDsbB0uq60=" + }, + "io/swagger#swagger-annotations/1.6.9": { + "jar": "sha256-fvhZdOXYL8q9DavSxFXNgDeLNtd03gF86shCo6T6ZPg=", + "pom": "sha256-6BtJB3W1C6snD7sLb7wKoda0wHS6GFuwUrjsMTFIPmk=" + }, + "io/swagger#swagger-compat-spec-parser/1.0.64": { + "jar": "sha256-zkFPC8rqxSFq7q/Wivre+J/TPc4m+Zba3uDGO5UWPAM=", + "pom": "sha256-DK2rKrdbuIf3HmIl5RiL9KxTiWKHQ+JQrCsUwwOaCfo=" + }, + "io/swagger#swagger-core/1.6.9": { + "jar": "sha256-QPtMcZBJR65H+f/P6+3v3mMNiUfhwbtmdDu8QPB7ngE=", + "pom": "sha256-3y2nBUrbCjZR1NQ87aKblNXd0Fhz0tgU1OSXe6cPSek=" + }, + "io/swagger#swagger-models/1.6.9": { + "jar": "sha256-zwtTERHMwCqAE3nXQ8jjPwL7x5BpiqIOYsYvR22oyVo=", + "pom": "sha256-YNg3lgDJP0qyFYkWJ6cednc+KiSitd1n/DkkWSjxv2s=" + }, + "io/swagger#swagger-parser-project/1.0.64": { + "pom": "sha256-tMVYXqpLuz2i3XNVaP4YdG+8DwhTzXRjF9tQoRRN6eQ=" + }, + "io/swagger#swagger-parser/1.0.64": { + "jar": "sha256-IgYs5/fEO7UodTpc8I/3tZ6A0e4hHxP92+rn3aaQsyg=", + "pom": "sha256-Y7RH9HoMcUh8xP5tcIuXilfa32WaxvjnwjUPbmD5ryM=" + }, + "io/swagger#swagger-project/1.6.9": { + "pom": "sha256-bSqxGVAq0G+Apf8NdBzwshPFYXC1F2H8WRGuzY9RJEE=" + }, + "io/swagger/core/v3#swagger-annotations/2.2.8": { + "jar": "sha256-Cvzf5Kd3X8zlHRBbj3yMpRRnbBa+pXFCNQPYOHd/Ed0=", + "pom": "sha256-VhgFAUOpHf/pVfAn7PDg75Z310EbGyXBRsoZUXgQ2Zo=" + }, + "io/swagger/core/v3#swagger-core/2.2.8": { + "jar": "sha256-c4Japfb0d8Y340xwIQspV7jpBL8PXA0yuqoqN9LDOiM=", + "pom": "sha256-cwB0DaF4EVy0TpD+lk91x5UNgEm0n7br4tsXxwFDzE0=" + }, + "io/swagger/core/v3#swagger-models/2.2.8": { + "jar": "sha256-s3I3ROAu1TADsWLViUqeF8QQxTOrKmlwtDCSHln032Y=", + "pom": "sha256-p20h2UwizuLWBXr7py8sdDxwA7x1e3IXhY+E84CTXdE=" + }, + "io/swagger/core/v3#swagger-project/2.2.8": { + "pom": "sha256-a17siOJKC8vQFj9ZEErvDwBtJ+S7CGG9ypgCW2f9lFc=" + }, + "io/swagger/parser/v3#swagger-parser-core/2.1.10": { + "jar": "sha256-dWGrUJ6XLPu1LNmROSwuOQvBPQ/1+/ykJWDTBaG2UJM=", + "pom": "sha256-lZbs9gLG/YGLNEOz68v0pN4cijVATcgL73aWsog0CW8=" + }, + "io/swagger/parser/v3#swagger-parser-project/2.1.10": { + "pom": "sha256-R8bWO70ZDgOdpigmdcSWWTfnr7Tg8EHU9gPS0PIH5hM=" + }, + "io/swagger/parser/v3#swagger-parser-v2-converter/2.1.10": { + "jar": "sha256-mAr5/FK/ftv8QMlUZViP3Nz1Bt2nqQYn/qnhBvBcI+s=", + "pom": "sha256-9Oqs2CxPfKPy3+D+CT6EQs4vsC3TRSKIW2wr40KFm4o=" + }, + "io/swagger/parser/v3#swagger-parser-v3/2.1.10": { + "jar": "sha256-sa24NH67Y8+SsHt5v8sHWAzsCDQID13MNTz+8UHFr/c=", + "pom": "sha256-ultheoFp1/obMPnRwt3q3Cd25b9vSp3Ycshwj9n67rk=" + }, + "io/swagger/parser/v3#swagger-parser/2.1.10": { + "jar": "sha256-AyreTvUvSxReAlKLhog9Ftf6siz0iHkXKPxk0/mvxKM=", + "pom": "sha256-4KEdmSQXRe3uUvmuOfVVLICg29b5+wah1q5nF+KDxyY=" + }, + "jakarta/activation#jakarta.activation-api/2.1.0": { + "jar": "sha256-VujZlAlf5JwoE4xgKRSC9m8Y0SrCtyDpOGl9zmoxNcc=", + "pom": "sha256-hw0qdcyS4K7Dfo0WNxBVLTVDGJ6B6cqQCaMl33YMKwY=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { + "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" + }, + "jakarta/platform#jakartaee-api-parent/9.0.0": { + "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" + }, + "jakarta/validation#jakarta.validation-api/2.0.2": { + "jar": "sha256-tC1CQo89kiyJKpCfoEMofVd8DFsWWtm31WjOv4f8nqQ=", + "pom": "sha256-Oy5Oh3+3C6+h2tdcDemZxFYTEoLUcbpR3z25bDt02pI=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": { + "pom": "sha256-nx+11KAun4/dYu876rlLj+p7gWQ3SMhvaKMfQPd0rVY=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.0": { + "pom": "sha256-4lW43VYeity88NHHus2uynK5Cr9BPy5//TSBd4rhCZA=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": { + "jar": "sha256-uPtL7j/1tcHvdxRNhBExYBjXu9Qfzx7eBkb3l4VGuGc=", + "pom": "sha256-onPayXQUEv2dzM6ZESmHBteJ5YLcs1GXB19v0qWw6+o=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/4.0.0": { + "jar": "sha256-V+N5atV1NkAIj1+dPFPBg/LCULfa2QUp6j4ZpVFaoSI=", + "pom": "sha256-a9atlG7ZyKRKJrYKX8zM/M9fyMy/v/SQS1kXs8aUACs=" + }, + "javax/servlet#javax.servlet-api/4.0.1": { + "jar": "sha256-g6A92HfTZ0V28Np7kHVchSSvCZzPBgf8YaqXFTWtfGA=", + "pom": "sha256-FAVeYVW4oqYype7GoeW+DAoLo4D36T+ctMuPfk+Vm/E=" + }, + "joda-time#joda-time/2.12.5": { + "jar": "sha256-EGKEEey0DEY0GWxUTzRoGr3u+CbzdwljV0M9H5oTW8Y=", + "pom": "sha256-QHV6ykQ5qWmPR1jyBsPFNxO1nNxVAd6W0WGKhPb/bH4=" + }, + "junit#junit/4.12": { + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/bytebuddy#byte-buddy-agent/1.12.19": { + "jar": "sha256-OnAkDefNzeBOfFBMIyfXA1ucJa4CBogeO/TmeYonPtg=", + "pom": "sha256-taLP9kNoHeFof8QKzSUf7v38oj5nPgSfs8NpK1NSbUs=" + }, + "net/bytebuddy#byte-buddy-parent/1.12.19": { + "pom": "sha256-cqtv70CegSkh9HKLPEtu9PpTvCX6uwSI/CyuNnNotU0=" + }, + "net/bytebuddy#byte-buddy/1.12.19": { + "jar": "sha256-AwcEE55G8yw40nBg7e6eBnawoP/4qL5TRhUVFUuop74=", + "pom": "sha256-Q1+4Zkqpt+EgyN1scH1Or6ZC+iYt/21eP3HcJcaeies=" + }, + "net/freeutils#jlhttp/2.6": { + "jar": "sha256-HMFbUBezgFWM4q0uCvwrqW3iYXK6rXjCpwulXFRoV4A=", + "pom": "sha256-BaYFDFndeVRC+3zdZFjXUrJg6FOWbYovsNXiCXEo6Ug=" + }, + "net/freeutils#parent/1.3": { + "pom": "sha256-xouwWtmH1kcR6aU+/0ODO87EiMepPuRyfTOJEpsBc2Q=" + }, + "net/iharder#base64/2.3.9": { + "jar": "sha256-8aDjWe7imlk5w15f3txXTdfoygZbBW/BSysp4+081U0=", + "pom": "sha256-3CpFvNCQU+bgD4tgOpFwz/20GMBV3TWrbrsJ1WgtYns=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "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/javacrumbs/json-unit#json-unit-core/2.36.0": { + "jar": "sha256-a1j8/G2tlI6YMwzlmDUrOjnEndyPbZ9aCYPpL8h1hwU=", + "pom": "sha256-k2b/YXpssLQW3sOJQ13+q5AIsgj2lIvSVj8uAgQ5dTM=" + }, + "net/javacrumbs/json-unit#json-unit-parent/2.36.0": { + "pom": "sha256-xZA74bIcEdkTIEXwxbQKQqEdX0iub0+ORtLExeVscnw=" + }, + "net/minidev#accessors-smart/2.4.7": { + "jar": "sha256-71EDQp8QH34/9i86GCNCcgQ56upD0u7TEZu6dwuyAqk=", + "pom": "sha256-WNvy07GUT0rbSSvQXSWM0OVW6r/5oU3qnUEBo04FguA=" + }, + "net/minidev#json-smart/2.4.7": { + "jar": "sha256-KMF+0WrCLmhFdD/R6EMh7fXXc1/CFuRO4mnRBr89gUY=", + "pom": "sha256-6QFccydoKXJRxB74wMnD1HGslQl2iAmKlUx18eIwPrI=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "net/sf/launch4j#launch4j/3.50": { + "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0=" + }, + "net/sf/launch4j#launch4j/3.50/core": { + "jar": "sha256-2U8eT20fHhl9Es7vpwot75OMzxbig+mjx0Cmb/WGvW8=" + }, + "net/sf/launch4j#launch4j/3.50/workdir-linux64": { + "jar": "sha256-/uvoOrT+Q5F+qn3/Jy3uDvP6hUvWgzRDRDDgjjoS8zA=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "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/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/ant#ant-launcher/1.10.13": { + "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=", + "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o=" + }, + "org/apache/ant#ant-parent/1.10.13": { + "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk=" + }, + "org/apache/ant#ant/1.10.13": { + "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=", + "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o=" + }, + "org/apache/commons#commons-compress/1.23.0": { + "jar": "sha256-wmfxcWDp72YrTXi38p3KfIKxXFz/LLaphl70qz3Vt4c=", + "pom": "sha256-WdwSFAa6notbUSvO9FcTUf7R+QK5Oc9SfYk7f3KUVMk=" + }, + "org/apache/commons#commons-digester3/3.2": { + "jar": "sha256-HBUOPS30tCN7R+KP6iB5+w2jJFeNXMpqX+0uN6Ygguw=", + "pom": "sha256-W7ihmK21l8MCBLTxwzb9s9KBZTZAPprTNJqyAAMuVEU=" + }, + "org/apache/commons#commons-lang3/3.12.0": { + "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "org/apache/commons#commons-parent/22": { + "pom": "sha256-+4xeVeMKet20/yEIWKDo0klO1nV7vhkBLamdUVhsPLs=" + }, + "org/apache/commons#commons-parent/25": { + "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" + }, + "org/apache/commons#commons-parent/32": { + "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/54": { + "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M=" + }, + "org/apache/commons#commons-parent/56": { + "pom": "sha256-VgxwUd3HaOE3LkCHlwdk5MATkDxdxutSwph3Nw2uJpQ=" + }, + "org/apache/commons#commons-text/1.10.0": { + "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=", + "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc=" + }, + "org/apache/httpcomponents#httpclient/4.5.13": { + "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", + "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.13": { + "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.13": { + "pom": "sha256-xVTnAI5FF8fvVOAFzIt09Mh6VKDqLG9Xvl0Fad9Rk2s=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.13": { + "jar": "sha256-4G6J1AlDJF/Po57FN82/zjdirs3o+cWXeA0rAMK0NCQ=", + "pom": "sha256-j4Etn6e3Kj1Kp/glJ4kypd80S0Km2DmJBYeUMaG/mpc=" + }, + "org/apache/logging#logging-parent/7": { + "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + }, + "org/apache/logging/log4j#log4j-api/2.20.0": { + "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", + "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" + }, + "org/apache/logging/log4j#log4j-bom/2.20.0": { + "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + }, + "org/apache/logging/log4j#log4j-core/2.20.0": { + "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", + "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" + }, + "org/apache/logging/log4j#log4j/2.20.0": { + "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" + }, + "org/apache/velocity#velocity-engine-core/2.3": { + "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=", + "pom": "sha256-1CQqYXQkPx5oBDRXG6TmoduuGZwLw1Cph9X7nDzh4NM=" + }, + "org/apache/velocity#velocity-engine-parent/2.3": { + "pom": "sha256-TA5KkvaHDzmblG1bt4nRd+SkeUEUfD/dwubwY+nLlts=" + }, + "org/apache/velocity#velocity-engine-scripting/2.3": { + "jar": "sha256-PspyQVbBrSBlVfBSx4POm2Cc567wLYW5AvdHxcdNUKU=", + "pom": "sha256-pURg2E/7W60V6jOgR47ZzOWGvxqpN0P3YHM96MBkaTE=" + }, + "org/apache/velocity#velocity-master/4": { + "pom": "sha256-eirHPJDdEEtaB+bizQPpXsKNKfO4ME891//87LBJcS4=" + }, + "org/apache/velocity/tools#velocity-tools-generic/3.1": { + "jar": "sha256-gljP3KoWEn81/+YQo/pPdrfr5RuIkixzxO45zo83jOU=", + "pom": "sha256-pvUMs/QTh1wDllImnSqJ+IeNDZ/IzGYvwTWRyiDYR1g=" + }, + "org/apache/velocity/tools#velocity-tools-parent/3.1": { + "pom": "sha256-Wll7iNunlQkOdwFbzfU0YbQdRdotfRdk5Ozoswoib80=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/assertj#assertj-core/3.17.2": { + "jar": "sha256-2al41VnQtSqH9Bmz2PW7E3uXxmH3viE04EmLRU5LmA4=", + "pom": "sha256-n3yDy/nAPZNYQT7rNDExhDZ6/o5dKRX1X5Eb49vhRgY=" + }, + "org/assertj#assertj-parent-pom/2.2.1": { + "pom": "sha256-DtCwM3FLoeYkfT4T7/8FILdvi1TTM+jNsO5fNscphWA=" + }, + "org/assertj#assertj-parent-pom/2.2.7": { + "pom": "sha256-DpRvSGuXLAgPwin2U3PRUQSvZnTGMP2fElxP1yEgdzs=" + }, + "org/assertj#assertj-swing-junit/3.17.1": { + "jar": "sha256-5W/qUbeWkkBGDQJ6F/HHBLQ+TuykmoxXIG1XPaPjCHE=", + "pom": "sha256-v1t2qFRwpj6fuShvtCC80iSXySGVM6vou3D5sCoeLpY=" + }, + "org/assertj#assertj-swing-parent-pom/3.17.1": { + "pom": "sha256-r1N8kNjGDMiis2NTz/777Dgk/9LsmVvCsqqIxOZ3J8s=" + }, + "org/assertj#assertj-swing/3.17.1": { + "jar": "sha256-42RFQ41y2DzEgBXcs/FNmpfqpCxGY6mCbbK7UOTHcTs=", + "pom": "sha256-rkNavHruVk/+pSh32IPKViRLFBGtcYQqEPcbvv9+1es=" + }, + "org/bouncycastle#bcpkix-jdk18on/1.72": { + "jar": "sha256-VqBUyxcNQfsfi6CylWiAYli3/+/cXpi3fvltR0Dz1rw=", + "pom": "sha256-KFuL5ZWHD2HXXniBsPtO3C0ao30KecT8j/Lczx2caf0=" + }, + "org/bouncycastle#bcprov-jdk18on/1.72": { + "jar": "sha256-OSh/IginU9tBn1ylKdbIDwlGFKp015AzESazyca4X9o=", + "pom": "sha256-47ttnhNGz8Iw4JAPF35goSttviEqkuHNLPseSNTASDk=" + }, + "org/bouncycastle#bcutil-jdk18on/1.72": { + "jar": "sha256-RTd/22VgqXHupyX1B9kf1rj70Hl9Yb/Ibyy2U8WBhqQ=", + "pom": "sha256-VwEEzKwN+inkb7ZAL35qchcCwlXe9DvjAcassYwl520=" + }, + "org/checkerframework#checker-qual/3.33.0": { + "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=", + "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=", + "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM=" + }, + "org/codehaus/groovy#groovy-bom/3.0.14": { + "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" + }, + "org/codehaus/plexus#plexus-utils/3.5.1": { + "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", + "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI=" + }, + "org/codehaus/plexus#plexus/10": { + "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" + }, + "org/commonmark#commonmark-parent/0.21.0": { + "pom": "sha256-qeGddPQOEj3jbHAaUlIg2r5eMjVDZUfbek/TwJi31Qs=" + }, + "org/commonmark#commonmark/0.21.0": { + "jar": "sha256-gQhKcDUEb+MG8NvxbvV6aNCO5clwBOqGfmK120bpivs=", + "pom": "sha256-RhGg7TfAGTzGANRRrUxFfT0NVBxaxlbI2ANL0s0NB1g=" + }, + "org/easytesting#fest-reflect/1.4.1": { + "jar": "sha256-wcoZ/PDNNVW698KvFHwErSK0OTq3Xl2wKE5RcPtVTBY=", + "pom": "sha256-HGUmEF/LVuFjU1Hi0DuO8coI4qOSrj+NRUK1L9DTpYM=" + }, + "org/easytesting#fest-util/1.2.5": { + "jar": "sha256-e1L0061Bt+1x9baxGDMRO34IMmyO9w0t7fC0MMe6U0E=", + "pom": "sha256-odiCzcAADcrcZQzw8DXh6edCW/ipx57f1h0lzn8ODHo=" + }, + "org/easytesting#fest/1.0.15": { + "pom": "sha256-EBz6z6cEL1sWQWoG7EIZjLeUIqv40R1I/xIXfznbIxc=" + }, + "org/eclipse/angus#angus-activation-project/1.0.0": { + "pom": "sha256-xbpJl8zRYQNHMGsM23caRKv9qhhzIkogdZVQ4Q8inNU=" + }, + "org/eclipse/angus#angus-activation/1.0.0": { + "jar": "sha256-43r/FH4Y7UjFCqn7eMyF50eMv9ASV7AtU9OhhtGDIkU=", + "pom": "sha256-L8eRQlvvS53yjp80ZAXMCeDqN369YQJjiNqEDGGhsPw=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { + "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" + }, + "org/fusesource#fusesource-pom/1.12": { + "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" + }, + "org/fusesource/jansi#jansi/2.4.0": { + "jar": "sha256-bNkZkTI917L7KMqT16wSr1qGovUyeeKzWCezAxP9C58=", + "pom": "sha256-rECp8tDB7mMfw7CO+OLwvRS6IgEcp2/xvPZftWnq3zU=" + }, + "org/glassfish/jaxb#jaxb-bom/4.0.1": { + "pom": "sha256-lSK+rNDHwC3Mi7VDMA6Eolu8wPfREPEwr3Z9yX1eP5Q=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-core/2.2": { + "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=", + "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/hamcrest#hamcrest/2.2": { + "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", + "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + }, + "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-reflect/1.8.20": { + "jar": "sha256-Ux48P5sMRfmiHxZCF0RTBmoQZr7AGQJUpjMbMxgUq4s=", + "pom": "sha256-5D19CbkCpeM8I0r1O3YYTUkz9gkI0A4QSy7EA+4tQDU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.20": { + "jar": "sha256-jaQKJSDTDcsQEhdv6T0k6C0Io+NGw34DQ7D7b2T2vgE=", + "pom": "sha256-PgTMk1HVzsQqRcBg+HM/bpTrx+NZExClGOBuiFB4mcg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": { + "jar": "sha256-akTJ7MnXdU2elD+x41iMdNSj8Xhb5RB09J1sVyNoKnM=", + "pom": "sha256-4ZpVd8vOqJcolw21MzyCZMjGmuci7recv0HV8LDJrmU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.20": { + "jar": "sha256-qi+i6BNVxNmN2X2iFpv0AfhCJhN49bHL6hqhGFXWdiA=", + "pom": "sha256-iBveiiNwhuKOA0KLTvMmj0SspfoajHb4lUdIRVyuvSE=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=", + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.20": { + "jar": "sha256-/asb8SDiteerbXiI6evAJOxrjKcpNhKWOV2rY0shNpU=", + "pom": "sha256-GEap+GBLC+HHGiEovb2diQJyAnlCf2ItK5pECsmjwwk=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=", + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.6.20": { + "jar": "sha256-7rUcK2eyYjP9gdC8T4BE7ISXGIkJBXY87/2Eox4st5k=", + "pom": "sha256-oI6D3LDymFCYd94i1SZEZHbdsx6hx3Uw8sgfJNsWb5k=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "jar": "sha256-BCoc0ayXbNz+XrY/HY4LC4kskkjhWmnIz7pJXVRupSo=", + "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.5.2": { + "pom": "sha256-WklWKkcEVB5p1O4xbNfq9xHN23ytXQ+Ia/ih/pjWqcU=" + }, + "org/junit#junit-bom/5.6.2": { + "module": "sha256-f0j4L1XvwfDMWVg8LUdKNBDiQXndLR0iFkUVzOM9dkM=", + "pom": "sha256-6K1gGzGBsjeHoY5x0mrIaknFbcX4VgZ2S8PFG15F/hM=" + }, + "org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.2": { + "jar": "sha256-r/93wYbNMXJ1gDhy+lEzqoAf1qxAvZHHimz4AJtLF8w=", + "module": "sha256-QRtKlsKm2wmY1uWOiZNn8NElQWPzBBydmOeu38o3RBk=", + "pom": "sha256-u12jBgImsbPOtUCEldxptZRlv1DX6+Y+75TyWQnPGQA=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.2": { + "jar": "sha256-tt812nUKVGrpMjdvEbPA34QfDJDHyylEzTmttDKIbks=", + "module": "sha256-FD7yda5mlRGdeCEqkyRazrv5I1tTdbn0wdSvcy87Uwo=", + "pom": "sha256-q+csj7+anI+e55usKbpkedMrDf+quICApQKRHSTTlGM=" + }, + "org/junit/platform#junit-platform-commons/1.10.2": { + "jar": "sha256-tWpewACked9Jc7GLuiTJj+Dbj6oUyJB9PvRR2Mcf2K4=", + "module": "sha256-HoFCGmL4cryk0gIgs56hniexNfNre3gXBPkvrVQxlhg=", + "pom": "sha256-8/glx8o72JcU1IlEfHfHbifqOPAoX195ahAAoX/KS+c=" + }, + "org/junit/platform#junit-platform-engine/1.10.2": { + "jar": "sha256-kFy6m0mYzMKdEjkIWn+x/g4oAk11JhUjVtgQ7ewKSaM=", + "module": "sha256-4dG63P7cJyRFQeC+XV6EtyoicNevYWhrJvEc/Edw2kI=", + "pom": "sha256-EqqGyhwNZIoiXU58aWBUwfx26IeCxcOft983muI7728=" + }, + "org/junit/vintage#junit-vintage-engine/5.10.2": { + "jar": "sha256-8fjR0zVyx1DL6bxquBAZryjo3lVdWMQtHQtySLMxV2k=", + "module": "sha256-kMb9QnMc0QoP6c6qolXz/B9IPnFO6b2DtPk8lsgfWVY=", + "pom": "sha256-kw2chGQmBTZYP28ozjHkZL6JJIWu/tWnYIqzZqUYEK4=" + }, + "org/mock-server#mockserver-client-java/5.15.0": { + "jar": "sha256-LMqrNKNYdlkALhh/PISJAtd8g55OrmxZRp4YUUnvGyY=", + "pom": "sha256-nVRRAJ9Q2bMQCStLyAFPz3+di/HYUbOfOzNPm4rmkfQ=" + }, + "org/mock-server#mockserver-core/5.15.0": { + "jar": "sha256-dpZGoStLzGwK8eZiFsRYH4b5UkY4zvxn3vVJjNKeL7o=", + "pom": "sha256-DSwI3ATUdSuev1sSROKtV6+kSBJ/YZnqeeUYRAbpUYM=" + }, + "org/mock-server#mockserver-netty/5.15.0": { + "jar": "sha256-EKBXpHdbami8aXQtEgBmt/cBOH7X5l9RioGYTqRaw6s=", + "pom": "sha256-1aN22L2gDxkgNt4fm6g89tTXvlFar4+GaN6u1pagCVU=" + }, + "org/mock-server#mockserver/5.15.0": { + "pom": "sha256-tlNuOpSx7xwjGfX1Zwc1JL1YtvIh4vK1rLh57Bu5DJA=" + }, + "org/mockito#mockito-core/4.11.0": { + "jar": "sha256-S5CWkMqyiMdh65TAvw6BRJbPOSHYr/rITNh3dFMDUeU=", + "pom": "sha256-K8LjyMizE/2sIx8jgiIlsHgx3ImdBnBy9J1fiuN+c5o=" + }, + "org/mockito#mockito-inline/4.11.0": { + "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=", + "pom": "sha256-g+Y+nBxoitBSIUa0qneUjJlzrAGCnhAzZGI2lWGoA0Q=" + }, + "org/mozilla#rhino/1.7.7.2": { + "jar": "sha256-XG2uBQzrcXdKX8gs5uPwOS2vD/qew1lvcNTQfuULiXA=", + "pom": "sha256-B2kGiYfBiVPlHUGeBi9AlW8egvOioUD+qITXxeb6lH8=" + }, + "org/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-analysis/9.2": { + "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=", + "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs=" + }, + "org/ow2/asm#asm-commons/9.2": { + "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=", + "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA=" + }, + "org/ow2/asm#asm-commons/9.4": { + "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=", + "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk=" + }, + "org/ow2/asm#asm-tree/9.2": { + "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=", + "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g=" + }, + "org/ow2/asm#asm-tree/9.4": { + "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", + "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" + }, + "org/ow2/asm#asm-tree/9.5": { + "jar": "sha256-PDOmSBkQea6urrfBmkmxU5UvnkD+hvusUgVVTd2azZQ=", + "pom": "sha256-pyqq+N0FGJn6CJ54PsfUgnrE19GHYgHG3uy6qUoNyVY=" + }, + "org/ow2/asm#asm-util/9.2": { + "jar": "sha256-/1s80zGuipqAR2goDamPUPQk/vI908eIuzIOCMlO5Zg=", + "pom": "sha256-3dBpE/FH1wrmjnpuQ1alWzPxTd5hYtv/K9DiiVgfGtI=" + }, + "org/ow2/asm#asm/9.2": { + "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=", + "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ=" + }, + "org/ow2/asm#asm/9.4": { + "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", + "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" + }, + "org/ow2/asm#asm/9.5": { + "jar": "sha256-ti6EtZgHKXUbBFjFNM8TZvcnVCu40VhiEzVoKkYPA1M=", + "pom": "sha256-LJzOuVHMZYbejZoWxnKtPkwwucMjAo16PDNmVg1WJ7E=" + }, + "org/reactivestreams#reactive-streams/1.0.4": { + "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", + "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" + }, + "org/slf4j#slf4j-api/1.6.6": { + "pom": "sha256-cxmZMiteIokinNntRiTJQexXG3xh0qJ9alB+9zuXyho=" + }, + "org/slf4j#slf4j-api/2.0.7": { + "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=", + "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE=" + }, + "org/slf4j#slf4j-parent/1.6.6": { + "pom": "sha256-QrjCR2CP2OENW2Zs98gKW1nSseEoRQ97bZ0sIM+2sxs=" + }, + "org/slf4j#slf4j-parent/2.0.7": { + "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/6": { + "pom": "sha256-tDBtE+j1OSRYobMIZvHP8WGz0uaZmojQWe6jkyyKhJk=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.24": { + "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", + "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "org/vafer#jdependency/2.8.0": { + "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=", + "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0=" + }, + "org/xmlunit#xmlunit-core/2.9.1": { + "jar": "sha256-fnDyPU914F8O558Pa54Tts9R0082xfw6a4OUKd3h7+8=", + "pom": "sha256-0n5OKjEqIVR+82BcgS5+YMiuyWTn+WDlDU3Dy2azkBI=" + }, + "org/xmlunit#xmlunit-parent/2.9.1": { + "pom": "sha256-1+RY+9XGRFBIeOX7zglLHTB402mn/uF93ezj0Zn9qsA=" + }, + "org/xmlunit#xmlunit-placeholders/2.9.1": { + "jar": "sha256-H+OrnCfYNVl+031hZ8m7zLksLT0Buhr+7Cqta0Ny0+g=", + "pom": "sha256-8lixEzrsF0x2T84Rf12TjVBxfEFzVSIYKJUXmKF8qH8=" + }, + "org/yaml#snakeyaml/1.33": { + "jar": "sha256-Ef9Fl4jwoteB9WpKhtfmkgLOus0Cc9UmnErp8C8/2PA=", + "pom": "sha256-6n1I/UUyGmAz2XzSiBhtSOXpLMDHBm5ziNfEzrSvWVc=" + }, + "org/zeroturnaround#zt-zip/1.15": { + "jar": "sha256-egIaxh7b4ktfzIM5aWf3BxIE51cLktf0s/mH6Wylu5M=", + "pom": "sha256-ll/F/uIc+Ys81paoijiZqsjRiBsZlfZp+Jmvdtu2C2E=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + } + } +} diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 254c2374e604a..a276dff1c7878 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -1,14 +1,13 @@ { - copyDesktopItems, - fetchurl, + fetchFromGitHub, + gradle, jre, lib, - makeDesktopItem, makeWrapper, stdenvNoCC, - gamemodeSupport ? stdenvNoCC.isLinux, - textToSpeechSupport ? stdenvNoCC.isLinux, + gamemodeSupport ? stdenvNoCC.hostPlatform.isLinux, + textToSpeechSupport ? stdenvNoCC.hostPlatform.isLinux, additionalLibs ? [ ], # dependencies @@ -22,25 +21,39 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.36.10"; + version = "3.4.37.3"; - src = fetchurl { - url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-JZTiYcea5ik8a4RmNLxZcuea7spGWftUGRiRW2Ive7c="; + src = fetchFromGitHub { + owner = "ATLauncher"; + repo = "ATLauncher"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XdTbrM7FPR0o0d+p4ko48UonMsY+nLfiXj5fP2a3/zI="; }; - env.ICON = fetchurl { - url = "https://atlauncher.com/assets/images/logo.svg"; - hash = "sha256-XoqpsgLmkpa2SdjZvPkgg6BUJulIBIeu6mBsJJCixfo="; - }; - - dontUnpack = true; + postPatch = '' + # exclude UI tests + sed -i "/test {/a\ exclude '**/BasicLauncherUiTest.class'" build.gradle + ''; nativeBuildInputs = [ - copyDesktopItems + gradle makeWrapper ]; + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + doCheck = true; + + gradleBuildTask = "shadowJar"; + + gradleFlags = [ + "--exclude-task" + "createExe" + ]; + installPhase = let runtimeLibraries = @@ -59,30 +72,28 @@ stdenvNoCC.mkDerivation (finalAttrs: { '' runHook preInstall - mkdir -p $out/bin $out/share/java - cp $src $out/share/java/ATLauncher.jar + mkdir -p $out/{bin,share/java} + cp build/libs/ATLauncher-${finalAttrs.version}.jar $out/share/java/ATLauncher.jar - makeWrapper ${jre}/bin/java $out/bin/atlauncher \ + makeWrapper ${lib.getExe jre} $out/bin/atlauncher \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibraries}" \ --add-flags "-jar $out/share/java/ATLauncher.jar" \ --add-flags "--working-dir \"\''${XDG_DATA_HOME:-\$HOME/.local/share}/ATLauncher\"" \ --add-flags "--no-launcher-update" - mkdir -p $out/share/icons/hicolor/scalable/apps - cp $ICON $out/share/icons/hicolor/scalable/apps/atlauncher.svg - runHook postInstall ''; - desktopItems = [ - (makeDesktopItem { - categories = [ "Game" ]; - desktopName = "ATLauncher"; - exec = "atlauncher"; - icon = "atlauncher"; - name = "atlauncher"; - }) - ]; + postInstall = + let + packagingDir = "${finalAttrs.src}/packaging/linux/_common"; + in + '' + install -D -m444 ${packagingDir}/atlauncher.desktop -t $out/share/applications + install -D -m444 ${packagingDir}/atlauncher.metainfo.xml -t $out/share/metainfo + install -D -m444 ${packagingDir}/atlauncher.png -t $out/share/pixmaps + install -D -m444 ${packagingDir}/atlauncher.svg -t $out/share/icons/hicolor/scalable/apps + ''; meta = { changelog = "https://github.com/ATLauncher/ATLauncher/blob/v${finalAttrs.version}/CHANGELOG.md"; @@ -93,6 +104,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { mainProgram = "atlauncher"; maintainers = with lib.maintainers; [ getpsyched ]; platforms = lib.platforms.all; - sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; }; }) diff --git a/pkgs/by-name/at/atomix/package.nix b/pkgs/by-name/at/atomix/package.nix index 341e97d0c9abc..a7f3f8f01f6fc 100644 --- a/pkgs/by-name/at/atomix/package.nix +++ b/pkgs/by-name/at/atomix/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/atomix/${lib.versions.major finalAttrs.version}/atomix-${finalAttrs.version}.tar.xz"; - sha256 = "yISTF2iNh9pzTJBjA1YxBSAH8qh5m2xsyRUmWIC1X7Q="; + hash = "sha256-yISTF2iNh9pzTJBjA1YxBSAH8qh5m2xsyRUmWIC1X7Q="; }; nativeBuildInputs = [ @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Puzzle game where you move atoms to build a molecule"; mainProgram = "atomix"; homepage = "https://gitlab.gnome.org/GNOME/atomix"; + changelog = "https://gitlab.gnome.org/GNOME/atomix/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/pkgs/by-name/at/attic-client/Cargo.lock b/pkgs/by-name/at/attic-client/Cargo.lock index a8bd1f01fcfe0..53a47e002f007 100644 --- a/pkgs/by-name/at/attic-client/Cargo.lock +++ b/pkgs/by-name/at/attic-client/Cargo.lock @@ -92,6 +92,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + [[package]] name = "anstream" version = "0.6.14" @@ -231,11 +237,13 @@ dependencies = [ "base64 0.22.1", "bytes", "cc", + "criterion", "cxx", "cxx-build", "digest", "displaydoc", "ed25519-compact", + "fastcdc", "futures", "hex", "lazy_static", @@ -250,7 +258,6 @@ dependencies = [ "sha2", "tempfile", "tokio", - "tokio-test", "version-compare", "wildmatch", "xdg", @@ -309,7 +316,6 @@ dependencies = [ "digest", "displaydoc", "enum-as-inner", - "fastcdc", "futures", "hex", "http-body-util", @@ -327,7 +333,6 @@ dependencies = [ "serde_with", "sha2", "tokio", - "tokio-test", "tokio-util", "toml", "tower-http", @@ -1050,6 +1055,12 @@ dependencies = [ "either", ] +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + [[package]] name = "cc" version = "1.1.13" @@ -1088,6 +1099,33 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "clap" version = "4.5.4" @@ -1307,6 +1345,44 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "futures", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "tokio", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + [[package]] name = "crossbeam-channel" version = "0.5.13" @@ -1316,6 +1392,25 @@ 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" @@ -1331,6 +1426,12 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-bigint" version = "0.4.9" @@ -1698,6 +1799,11 @@ name = "fastcdc" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a71061d097bfa9a5a4d2efdec57990d9a88745020b365191d37e48541a1628f2" +dependencies = [ + "async-stream", + "tokio", + "tokio-stream", +] [[package]] name = "fastrand" @@ -1956,6 +2062,16 @@ dependencies = [ "tracing", ] +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -2388,12 +2504,32 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "is_terminal_polyfill" version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.12.1" @@ -2642,8 +2778,9 @@ dependencies = [ [[package]] name = "nix-base32" -version = "0.1.2-alpha.0" -source = "git+https://github.com/zhaofengli/nix-base32.git?rev=b850c6e9273d1c39bd93abb704a53345f5be92eb#b850c6e9273d1c39bd93abb704a53345f5be92eb" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2628953ed836273ee4262e3708a8ef63ca38bd8a922070626eef7f9e5d8d536" [[package]] name = "nom" @@ -2776,6 +2913,12 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "oorandom" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" + [[package]] name = "openssl-probe" version = "0.1.5" @@ -3002,6 +3145,34 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +[[package]] +name = "plotters" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" + +[[package]] +name = "plotters-svg" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" +dependencies = [ + "plotters-backend", +] + [[package]] name = "portable-atomic" version = "1.6.0" @@ -3088,7 +3259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.66", @@ -3168,6 +3339,26 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "redox_syscall" version = "0.4.1" @@ -4069,7 +4260,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" dependencies = [ - "itertools", + "itertools 0.12.1", "nom", "unicode_categories", ] @@ -4459,6 +4650,16 @@ dependencies = [ "time-core", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -4546,19 +4747,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-test" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" -dependencies = [ - "async-stream", - "bytes", - "futures-core", - "tokio", - "tokio-stream", -] - [[package]] name = "tokio-util" version = "0.7.11" diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index e9b89cf6d54b3..44b6f1b1d886c 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage { pname = "attic"; - version = "0-unstable-2024-08-19"; + version = "0-unstable-2024-10-04"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "attic"; - rev = "acf3c351f8de47c6857f31948ab253f9c7ce2a6f"; - hash = "sha256-jcY81r8PdMQ9dCGhT0YLZzxPj3kQJXyWCmvQLXbR1EI="; + rev = "61ebdef2e263c091f24807b07701be5cb8068dea"; + hash = "sha256-whgxjoDF7aey3xWy2b9Dp+NHsszK6By+raEbygcSU6w="; }; nativeBuildInputs = [ @@ -28,15 +28,12 @@ rustPlatform.buildRustPackage { buildInputs = [ nix boost - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]); cargoLock = { lockFile = ./Cargo.lock; - outputHashes = { - "nix-base32-0.1.2-alpha.0" = "sha256-wtPWGOamy3+ViEzCxMSwBcoR4HMMD0t8eyLwXfCDFdo="; - }; }; cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates; @@ -56,6 +53,8 @@ rustPlatform.buildRustPackage { fi ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Multi-tenant Nix Binary Cache"; homepage = "https://github.com/zhaofengli/attic"; diff --git a/pkgs/by-name/at/attic-client/update.sh b/pkgs/by-name/at/attic-client/update.sh new file mode 100755 index 0000000000000..e6ec0ab1296b3 --- /dev/null +++ b/pkgs/by-name/at/attic-client/update.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p wget nix-prefetch-github jq coreutils + +# shellcheck shell=bash + +if [ -n "$GITHUB_TOKEN" ]; then + TOKEN_ARGS=(--header "Authorization: token $GITHUB_TOKEN") +fi + +if [[ $# -gt 1 || $1 == -* ]]; then + echo "Regenerates packaging data for attic." + echo "Usage: $0 [git commit]" + exit 1 +fi + +set -x + +cd "$(dirname "$0")" +rev="$1" + +set -euo pipefail + +if [ -z "$rev" ]; then + rev="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/zhaofengli/attic/commits?per_page=1" | jq -r '.[0].sha')" +fi + +date="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/zhaofengli/attic/commits/$rev" | jq -r '.commit.author.date' | cut -dT -f1)" + +version="0-unstable-$date" + +# Sources +src_hash=$(nix-prefetch-github zhaofengli attic --rev "$rev" | jq -r .hash) + +# Cargo.lock +src="https://raw.githubusercontent.com/zhaofengli/attic/$rev" +wget "${TOKEN_ARGS[@]}" "$src/Cargo.lock" -O Cargo.lock + +sed -i -E -e "s#version = \".*\"#version = \"$version\"#" package.nix +sed -i -E -e "s#rev = \".*\"#rev = \"$rev\"#" package.nix +sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" package.nix diff --git a/pkgs/by-name/at/attract-mode/package.nix b/pkgs/by-name/at/attract-mode/package.nix index 87328a78ce6fe..21be9ce314417 100644 --- a/pkgs/by-name/at/attract-mode/package.nix +++ b/pkgs/by-name/at/attract-mode/package.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation { sfml zlib ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openal fontconfig ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.IOKit @@ -61,7 +61,7 @@ stdenv.mkDerivation { "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" "AR=${stdenv.cc.targetPrefix}ar" "BUILD_EXPAT=0" - ] ++ lib.optionals stdenv.isDarwin [ "USE_FONTCONFIG=0" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "USE_FONTCONFIG=0" ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index 9234e8866752e..e50cdde161efe 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { # TODO: unify this to one hash because updater do not support this cargoHash = - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then "sha256-K4Vw/d0ZOROWujWr76I3QvfKefLhXLeFufUrgStAyjQ=" else "sha256-8NAfE7cGFT64ntNXK9RT0D/MbDJweN7vvsG/KlrY4K4="; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.Security diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix index 91008472059b0..efa34166f0937 100644 --- a/pkgs/by-name/au/audiobookshelf/package.nix +++ b/pkgs/by-name/au/audiobookshelf/package.nix @@ -56,14 +56,6 @@ buildNpmPackage { inherit pname src; inherit (source) version; - postPatch = '' - # Always skip version checks of the binary manager. - # We provide our own binaries, and don't want to trigger downloads. - substituteInPlace server/managers/BinaryManager.js --replace-fail \ - 'if (!this.validVersions.length) return true' \ - 'return true' - ''; - buildInputs = [ util-linux ]; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index 384ef51404f72..350ca60dfd956 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "52a3bc224ae7c79fbb543716a25b731c65a8f76a", - "hash": "sha256-SbpoCtd5PJ6fU9muy58J4VxlbKiJM0OfMALHC5DUqFc=", - "version": "2.12.3", - "depsHash": "sha256-8YUGM+MPYFLpLwWe3W+eObxH4ZklDVGj8bDYkSWTzQg=", - "clientDepsHash": "sha256-8xE1M7InH+Rxjpb2rsdvC3LcLV+k8a83BKWCis5P+tY=" + "rev": "ce213c3d89458baeb77324ce59a5f2137740564e", + "hash": "sha256-7vPhvsjGJQvus5Mmx8543OuBeuPWC/4cLfHHYmN2lnk=", + "version": "2.13.4", + "depsHash": "sha256-1CmtuzE8R6zkb0DT7gt9MrxErAw0mqY2AkJZh3PjuBQ=", + "clientDepsHash": "sha256-BfrVN70i1e4JWELxLS0jliHLfG4/kN8tj8aQOjsnZ/M=" } diff --git a/pkgs/by-name/au/audiobookshelf/wrapper.nix b/pkgs/by-name/au/audiobookshelf/wrapper.nix index d8f16829ffb57..87d3358a425cf 100644 --- a/pkgs/by-name/au/audiobookshelf/wrapper.nix +++ b/pkgs/by-name/au/audiobookshelf/wrapper.nix @@ -52,6 +52,7 @@ NODE_ENV=production \ SOURCE=nixpkgs \ + SKIP_BINARIES_CHECK=1 \ FFMPEG_PATH=${ffmpeg-full}/bin/ffmpeg \ FFPROBE_PATH=${ffmpeg-full}/bin/ffprobe \ CONFIG_PATH="$config" \ diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/by-name/au/audit/package.nix similarity index 100% rename from pkgs/os-specific/linux/audit/default.nix rename to pkgs/by-name/au/audit/package.nix diff --git a/pkgs/by-name/au/authentik/ldap.nix b/pkgs/by-name/au/authentik/ldap.nix index 1e1a5abf8754f..278ea195e04c8 100644 --- a/pkgs/by-name/au/authentik/ldap.nix +++ b/pkgs/by-name/au/authentik/ldap.nix @@ -4,7 +4,7 @@ buildGoModule { pname = "authentik-ldap-outpost"; inherit (authentik) version src; - vendorHash = "sha256-hxtyXyCfVemsjYQeo//gd68x4QO/4Vcww8i2ocsUVW8="; + vendorHash = "sha256-BcL9QAc2jJqoPaQImJIFtCiu176nxmVcCLPjXjNBwqI="; CGO_ENABLED = 0; diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 2059f4a414d25..74511b866a381 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -14,13 +14,13 @@ , makeWrapper }: let - version = "2024.6.1"; + version = "2024.6.4"; src = fetchFromGitHub { owner = "goauthentik"; repo = "authentik"; rev = "version/${version}"; - hash = "sha256-SMupiJGJbkBn33JP4WLF3IsBdt3SN3JvZg/EYlz443g="; + hash = "sha256-QwK/auMLCJEHHtyexFnO+adCq/u0fezHQ90fXW9J4c4="; }; meta = with lib; { @@ -87,7 +87,7 @@ let ln -s ${src}/website $out/ ln -s ${clientapi} $out/web/node_modules/@goauthentik/api ''; - npmDepsHash = "sha256-v9oD8qV5UDJeZn4GZDEPlVM/jGVSeTqdIUDJl6tYXZw="; + npmDepsHash = "sha256-8TzB3ylZzVLePD86of8E/lGgIQCciWMQF9m1Iqv9ZTY="; postPatch = '' cd web @@ -383,7 +383,7 @@ let CGO_ENABLED = 0; - vendorHash = "sha256-hxtyXyCfVemsjYQeo//gd68x4QO/4Vcww8i2ocsUVW8="; + vendorHash = "sha256-BcL9QAc2jJqoPaQImJIFtCiu176nxmVcCLPjXjNBwqI="; postInstall = '' mv $out/bin/server $out/bin/authentik diff --git a/pkgs/by-name/au/authentik/radius.nix b/pkgs/by-name/au/authentik/radius.nix index 04efa139efea4..1a26c661ef07e 100644 --- a/pkgs/by-name/au/authentik/radius.nix +++ b/pkgs/by-name/au/authentik/radius.nix @@ -4,7 +4,7 @@ buildGoModule { pname = "authentik-radius-outpost"; inherit (authentik) version src; - vendorHash = "sha256-hxtyXyCfVemsjYQeo//gd68x4QO/4Vcww8i2ocsUVW8="; + vendorHash = "sha256-BcL9QAc2jJqoPaQImJIFtCiu176nxmVcCLPjXjNBwqI="; CGO_ENABLED = 0; diff --git a/pkgs/by-name/au/auto-changelog/package.nix b/pkgs/by-name/au/auto-changelog/package.nix index ba35a26d6e373..0add7c39c6c93 100644 --- a/pkgs/by-name/au/auto-changelog/package.nix +++ b/pkgs/by-name/au/auto-changelog/package.nix @@ -10,18 +10,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "auto-changelog"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "cookpete"; repo = "auto-changelog"; rev = "v${finalAttrs.version}"; - hash = "sha256-qgJ/TVyViMhISt/EfCWV7XWQLXKTeZalGHFG905Ma5I="; + hash = "sha256-ticQpDOQieLaWXfavDKIH0jSenRimp5QYeJy42BjpKw="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-rP/Xt0txwfEUmGZ0CyHXSEG9zSMtv8wr5M2Na+6PbyQ="; + hash = "sha256-NGQbzogQi0XbeGd7fYNyw0i9Yo9j91CfeTdO7nhq4Yw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/auto-cpufreq/fix-version-output.patch b/pkgs/by-name/au/auto-cpufreq/fix-version-output.patch index be21ca889081d..dbb459b7fee95 100644 --- a/pkgs/by-name/au/auto-cpufreq/fix-version-output.patch +++ b/pkgs/by-name/au/auto-cpufreq/fix-version-output.patch @@ -1,33 +1,20 @@ -diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index 58cedb7..89e77a4 100755 ---- a/auto_cpufreq/core.py -+++ b/auto_cpufreq/core.py -@@ -136,26 +136,8 @@ except PermissionError: - +diff --git c/auto_cpufreq/core.py i/auto_cpufreq/core.py +index b51d55d..b0bff1e 100755 +--- c/auto_cpufreq/core.py ++++ i/auto_cpufreq/core.py +@@ -96,13 +96,8 @@ except PermissionError: + # display running version of auto-cpufreq def app_version(): -- - print("auto-cpufreq version: ", end="") - -- # snap package -- if os.getenv("PKG_MARKER") == "SNAP": -- print(getoutput(r"echo \(Snap\) $SNAP_VERSION")) -- # aur package -- elif dist_name in ["arch", "manjaro", "garuda"]: -- aur_pkg_check = call("pacman -Qs auto-cpufreq > /dev/null", shell=True) -- if aur_pkg_check == 1: -- print(get_formatted_version()) -- else: -- print(getoutput("pacman -Qi auto-cpufreq | grep Version")) +- if IS_INSTALLED_WITH_SNAP: print(getoutput(r"echo \(Snap\) $SNAP_VERSION")) +- elif IS_INSTALLED_WITH_AUR: print(getoutput("pacman -Qi auto-cpufreq | grep Version")) - else: -- # source code (auto-cpufreq-installer) -- try: -- print(get_formatted_version()) -- except Exception as e: -- print(repr(e)) -- pass -+ print("auto-cpufreq version: @version@") -+ print("Git commit: v@version@") - +- try: print(get_formatted_version()) +- except Exception as e: print(repr(e)) ++ print("auto-cpufreq version: @version@") ++ print("Git commit: v@version@") + def check_for_update(): # returns True if a new release is available from the GitHub repo diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix index bfc4d29632366..244735554010a 100644 --- a/pkgs/by-name/au/auto-cpufreq/package.nix +++ b/pkgs/by-name/au/auto-cpufreq/package.nix @@ -9,14 +9,14 @@ }: python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "AdnanHodzic"; repo = "auto-cpufreq"; - rev = "v${version}"; - hash = "sha256-Bet/WOVveLIA+0Mvly4AsielR+r/AJXIgHdWrtc7i/U="; + rev = "refs/tags/v${version}"; + hash = "sha256-Xsh3d7rQY7RKzZ7J0swrgxZEyITb7B3oX5F/tcBGjfk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/auto-cpufreq/prevent-install-and-copy.patch b/pkgs/by-name/au/auto-cpufreq/prevent-install-and-copy.patch index 2b3c9de1b6b07..bf4987f8117b0 100644 --- a/pkgs/by-name/au/auto-cpufreq/prevent-install-and-copy.patch +++ b/pkgs/by-name/au/auto-cpufreq/prevent-install-and-copy.patch @@ -1,13 +1,13 @@ -diff --git a/auto_cpufreq/bin/auto_cpufreq.py b/auto_cpufreq/bin/auto_cpufreq.py -index 4343b8d..dc286f6 100755 ---- a/auto_cpufreq/bin/auto_cpufreq.py -+++ b/auto_cpufreq/bin/auto_cpufreq.py -@@ -199,41 +199,9 @@ def main(config, daemon, debug, update, install, remove, live, log, monitor, sta - print("https://github.com/AdnanHodzic/auto-cpufreq/#donate") - footer() +diff --git c/auto_cpufreq/bin/auto_cpufreq.py i/auto_cpufreq/bin/auto_cpufreq.py +index 7192366..96289e1 100755 +--- c/auto_cpufreq/bin/auto_cpufreq.py ++++ i/auto_cpufreq/bin/auto_cpufreq.py +@@ -134,20 +134,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g + except KeyboardInterrupt: break + conf.notifier.stop() elif install: -- if os.getenv("PKG_MARKER") == "SNAP": -- root_check() +- root_check() +- if IS_INSTALLED_WITH_SNAP: - running_daemon_check() - gnome_power_detect_snap() - tlp_service_detect_snap() @@ -15,17 +15,21 @@ index 4343b8d..dc286f6 100755 - gov_check() - run("snapctl set daemon=enabled", shell=True) - run("snapctl start --enable auto-cpufreq", shell=True) -- deploy_complete_msg() - else: -- root_check() - running_daemon_check() - gov_check() - deploy_daemon() -- deploy_complete_msg() +- deploy_complete_msg() + print("install is disabled in the nix package") + elif update: + root_check() + custom_dir = "/opt/auto-cpufreq/source" +@@ -185,21 +172,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g + run(["auto-cpufreq", "--version"]) + else: print("Aborted") elif remove: -- if os.getenv("PKG_MARKER") == "SNAP": -- root_check() +- root_check() +- if IS_INSTALLED_WITH_SNAP: - run("snapctl set daemon=disabled", shell=True) - run("snapctl stop --disable auto-cpufreq", shell=True) - if auto_cpufreq_stats_path.exists(): @@ -37,92 +41,73 @@ index 4343b8d..dc286f6 100755 - # {the following snippet also used in --update, update it there too(if required)} - # * undo bluetooth boot disable - gnome_power_rm_reminder_snap() -- remove_complete_msg() -- else: -- root_check() -- remove_daemon() -- remove_complete_msg() +- else: remove_daemon() +- remove_complete_msg() + print("remove is disabled in the nix package") - elif update: - root_check() - custom_dir = "/opt/auto-cpufreq/source" -diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index 58cedb7..c50b0e1 100755 ---- a/auto_cpufreq/core.py -+++ b/auto_cpufreq/core.py -@@ -391,30 +391,13 @@ def get_current_gov(): - + elif stats: + not_running_daemon_check() + config_info_dialog() +diff --git c/auto_cpufreq/core.py i/auto_cpufreq/core.py +index b51d55d..4e4b5d3 100755 +--- c/auto_cpufreq/core.py ++++ i/auto_cpufreq/core.py +@@ -277,18 +277,12 @@ def get_current_gov(): + ) def cpufreqctl(): - """ -- deploy cpufreqctl script +- deploy cpufreqctl.auto-cpufreq script - """ -- -- # detect if running on a SNAP -- if os.getenv("PKG_MARKER") == "SNAP": -- pass -- else: -- # deploy cpufreqctl.auto-cpufreq script -- if not os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"): -- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/local/bin/cpufreqctl.auto-cpufreq") +- if not (IS_INSTALLED_WITH_SNAP or os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq")): +- copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/local/bin/cpufreqctl.auto-cpufreq") + # scripts are already in the correct place + pass - def cpufreqctl_restore(): - """ - remove cpufreqctl.auto-cpufreq script - """ -- # detect if running on a SNAP -- if os.getenv("PKG_MARKER") == "SNAP": -- pass -- else: -- if os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"): -- os.remove("/usr/local/bin/cpufreqctl.auto-cpufreq") -- +- if not IS_INSTALLED_WITH_SNAP and os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"): +- os.remove("/usr/local/bin/cpufreqctl.auto-cpufreq") + # no need to restore + pass - def footer(l=79): - print("\n" + "-" * l + "\n") -@@ -441,30 +424,8 @@ def remove_complete_msg(): + def footer(l=79): print("\n" + "-" * l + "\n") +@@ -306,27 +300,8 @@ def remove_complete_msg(): + footer() def deploy_daemon(): - print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n") - -- # deploy cpufreqctl script func call -- cpufreqctl() +- cpufreqctl() # deploy cpufreqctl script func call - -- # turn off bluetooth on boot -- bluetooth_disable() +- bluetooth_disable() # turn off bluetooth on boot - - auto_cpufreq_stats_path.touch(exist_ok=True) - - print("\n* Deploy auto-cpufreq install script") -- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/local/bin/auto-cpufreq-install") +- copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/local/bin/auto-cpufreq-install") - - print("\n* Deploy auto-cpufreq remove script") -- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/local/bin/auto-cpufreq-remove") +- copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/local/bin/auto-cpufreq-remove") - - # output warning if gnome power profile is running - gnome_power_detect_install() - gnome_power_svc_disable() - -- # output warning if TLP service is detected -- tlp_service_detect() +- tlp_service_detect() # output warning if TLP service is detected - - call("/usr/local/bin/auto-cpufreq-install", shell=True) + # prevent needless copying and system changes + pass - def deploy_daemon_performance(): -@@ -504,40 +465,7 @@ def deploy_daemon_performance(): + print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon (performance) " + "-" * 22 + "\n") +@@ -359,34 +334,7 @@ def deploy_daemon_performance(): + call("/usr/local/bin/auto-cpufreq-install", shell=True) - # remove auto-cpufreq daemon def remove_daemon(): -- - # check if auto-cpufreq is installed - if not os.path.exists("/usr/local/bin/auto-cpufreq-remove"): - print("\nauto-cpufreq daemon is not installed.\n") @@ -130,8 +115,7 @@ index 58cedb7..c50b0e1 100755 - - print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n") - -- # turn on bluetooth on boot -- bluetooth_enable() +- bluetooth_enable() # turn on bluetooth on boot - - # output warning if gnome power profile is stopped - gnome_power_rm_reminder() @@ -144,19 +128,15 @@ index 58cedb7..c50b0e1 100755 - os.remove("/usr/local/bin/auto-cpufreq-remove") - - # delete override pickle if it exists -- if os.path.exists(governor_override_state): -- os.remove(governor_override_state) +- if os.path.exists(governor_override_state): os.remove(governor_override_state) - - # delete stats file - if auto_cpufreq_stats_path.exists(): -- if auto_cpufreq_stats_file is not None: -- auto_cpufreq_stats_file.close() -- +- if auto_cpufreq_stats_file is not None: auto_cpufreq_stats_file.close() - auto_cpufreq_stats_path.unlink() - -- # restore original cpufrectl script -- cpufreqctl_restore() +- cpufreqctl_restore() # restore original cpufrectl script + pass - def gov_check(): + for gov in AVAILABLE_GOVERNORS: diff --git a/pkgs/by-name/au/auto-cpufreq/prevent-update.patch b/pkgs/by-name/au/auto-cpufreq/prevent-update.patch index 840c7230313d7..b9119540b80fc 100644 --- a/pkgs/by-name/au/auto-cpufreq/prevent-update.patch +++ b/pkgs/by-name/au/auto-cpufreq/prevent-update.patch @@ -1,10 +1,10 @@ -diff --git a/auto_cpufreq/bin/auto_cpufreq.py b/auto_cpufreq/bin/auto_cpufreq.py -index 4343b8d..183c2e9 100755 ---- a/auto_cpufreq/bin/auto_cpufreq.py -+++ b/auto_cpufreq/bin/auto_cpufreq.py -@@ -235,47 +235,7 @@ def main(config, daemon, debug, update, install, remove, live, log, monitor, sta - remove_daemon() - remove_complete_msg() +diff --git c/auto_cpufreq/bin/auto_cpufreq.py i/auto_cpufreq/bin/auto_cpufreq.py +index 7192366..0bf087e 100755 +--- c/auto_cpufreq/bin/auto_cpufreq.py ++++ i/auto_cpufreq/bin/auto_cpufreq.py +@@ -149,41 +149,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g + deploy_daemon() + deploy_complete_msg() elif update: - root_check() - custom_dir = "/opt/auto-cpufreq/source" @@ -16,27 +16,22 @@ index 4343b8d..183c2e9 100755 - if "--update" in sys.argv: - update = True - sys.argv.remove("--update") -- if len(sys.argv) == 2: -- custom_dir = sys.argv[1] +- if len(sys.argv) == 2: custom_dir = sys.argv[1] - -- if os.getenv("PKG_MARKER") == "SNAP": +- if IS_INSTALLED_WITH_SNAP: - print("Detected auto-cpufreq was installed using snap") - # refresh snap directly using this command - # path wont work in this case - - print("Please update using snap package manager, i.e: `sudo snap refresh auto-cpufreq`.") - #check for AUR -- elif subprocess.run(["bash", "-c", "command -v pacman >/dev/null 2>&1"]).returncode == 0 and subprocess.run(["bash", "-c", "pacman -Q auto-cpufreq >/dev/null 2>&1"]).returncode == 0: -- print("Arch-based distribution with AUR support detected. Please refresh auto-cpufreq using your AUR helper.") +- elif IS_INSTALLED_WITH_AUR: print("Arch-based distribution with AUR support detected. Please refresh auto-cpufreq using your AUR helper.") - else: - is_new_update = check_for_update() -- if not is_new_update: -- return +- if not is_new_update: return - ans = input("Do you want to update auto-cpufreq to the latest release? [Y/n]: ").strip().lower() -- if not os.path.exists(custom_dir): -- os.makedirs(custom_dir) -- if os.path.exists(os.path.join(custom_dir, "auto-cpufreq")): -- shutil.rmtree(os.path.join(custom_dir, "auto-cpufreq")) +- if not os.path.exists(custom_dir): os.makedirs(custom_dir) +- if os.path.exists(os.path.join(custom_dir, "auto-cpufreq")): rmtree(os.path.join(custom_dir, "auto-cpufreq")) - if ans in ['', 'y', 'yes']: - remove_daemon() - remove_complete_msg() @@ -45,28 +40,28 @@ index 4343b8d..183c2e9 100755 - run(["auto-cpufreq", "--install"]) - print("auto-cpufreq is installed with the latest version") - run(["auto-cpufreq", "--version"]) -- else: -- print("Aborted") +- else: print("Aborted") + print("update is disabled in the nix package") - - elif completions: - if completions == "bash": -diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index 58cedb7..8b44712 100755 ---- a/auto_cpufreq/core.py -+++ b/auto_cpufreq/core.py -@@ -17,8 +17,7 @@ import importlib.metadata - from math import isclose + elif remove: + root_check() + if IS_INSTALLED_WITH_SNAP: +diff --git c/auto_cpufreq/core.py i/auto_cpufreq/core.py +index b51d55d..99eeed8 100755 +--- c/auto_cpufreq/core.py ++++ i/auto_cpufreq/core.py +@@ -7,9 +7,8 @@ from math import isclose from pathlib import Path - from shutil import which --from subprocess import getoutput, call, run, check_output, DEVNULL --import requests -+from subprocess import getoutput, call, run, DEVNULL - import re + from pickle import dump, load + from re import search +-from requests import get, exceptions + from shutil import copy +-from subprocess import call, check_output, DEVNULL, getoutput, run ++from subprocess import call, DEVNULL, getoutput, run + from time import sleep + from warnings import filterwarnings - # execution timestamp used in countdown func -@@ -158,55 +157,7 @@ def app_version(): - pass +@@ -105,49 +104,7 @@ def app_version(): + except Exception as e: print(repr(e)) def check_for_update(): - # returns True if a new release is available from the GitHub repo @@ -74,21 +69,19 @@ index 58cedb7..8b44712 100755 - # Specify the repository and package name - # IT IS IMPORTANT TO THAT IF THE REPOSITORY STRUCTURE IS CHANGED, THE FOLLOWING FUNCTION NEEDS TO BE UPDATED ACCORDINGLY - # Fetch the latest release information from GitHub API -- latest_release_url = f"https://api.github.com/repos/AdnanHodzic/auto-cpufreq/releases/latest" +- latest_release_url = GITHUB.replace("github.com", "api.github.com/repos") + "/releases/latest" - try: -- response = requests.get(latest_release_url) -- if response.status_code == 200: -- latest_release = response.json() +- response = get(latest_release_url) +- if response.status_code == 200: latest_release = response.json() - else: - message = response.json().get("message") - print("Error fetching recent release!") - if message is not None and message.startswith("API rate limit exceeded"): - print("GitHub Rate limit exceeded. Please try again later within 1 hour or use different network/VPN.") -- else: -- print("Unexpected status code:", response.status_code) +- else: print("Unexpected status code:", response.status_code) - return False -- except (requests.exceptions.ConnectionError, requests.exceptions.Timeout, -- requests.exceptions.RequestException, requests.exceptions.HTTPError) as err: +- except (exceptions.ConnectionError, exceptions.Timeout, +- exceptions.RequestException, exceptions.HTTPError): - print("Error Connecting to server!") - return False - @@ -98,8 +91,7 @@ index 58cedb7..8b44712 100755 - # Get the current version of auto-cpufreq - # Extract version number from the output string - output = check_output(['auto-cpufreq', '--version']).decode('utf-8') -- try: -- version_line = next((re.search(r'\d+\.\d+\.\d+', line).group() for line in output.split('\n') if line.startswith('auto-cpufreq version')), None) +- try: version_line = next((search(r'\d+\.\d+\.\d+', line).group() for line in output.split('\n') if line.startswith('auto-cpufreq version')), None) - except AttributeError: - print("Error Retrieving Current Version!") - exit(1) @@ -113,40 +105,31 @@ index 58cedb7..8b44712 100755 - print(f"Updates are available,\nCurrent version: {installed_version}\nLatest version: {latest_version}") - print("Note that your previous custom settings might be erased with the following update") - return True -- else: -- # Handle the case where "tag_name" key doesn't exist -- print("Malformed Released data!\nReinstall manually or Open an issue on GitHub for help!") -- -- +- # Handle the case where "tag_name" key doesn't exist +- else: print("Malformed Released data!\nReinstall manually or Open an issue on GitHub for help!") + pass def new_update(custom_dir): os.chdir(custom_dir) -diff --git a/poetry.lock b/poetry.lock -index 2a99ca6..9bc26e2 100644 ---- a/poetry.lock -+++ b/poetry.lock -@@ -1,4 +1,4 @@ --# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. -+# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. - - [[package]] - name = "attrs" -@@ -1300,4 +1300,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p +diff --git c/poetry.lock i/poetry.lock +index 0e6da84..b4936fe 100644 +--- c/poetry.lock ++++ i/poetry.lock +@@ -1306,4 +1306,4 @@ test = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-it [metadata] lock-version = "2.0" python-versions = "^3.8" --content-hash = "ee73b2db6a43cac87120f38c93d0a8a297bec52f1346b55bc0ca2992aa464482" -+content-hash = "1ba0c404ffea01a611e7c74f9c104de44a914b0a6fad2350470f15880931ae42" -diff --git a/pyproject.toml b/pyproject.toml -index 876d80c..7190356 100644 ---- a/pyproject.toml -+++ b/pyproject.toml +-content-hash = "cad3783d04e35b66b241352e76631d0a83c8df3d286b113979ba34a65847f06c" ++content-hash = "b21af52156d2d624602fe6941cf001abd7f8cf5b70b22ebfd7b7ad0dece1e39f" +diff --git c/pyproject.toml i/pyproject.toml +index 562a94b..cc44d8d 100644 +--- c/pyproject.toml ++++ i/pyproject.toml @@ -25,7 +25,6 @@ python = "^3.8" - psutil = {git = "https://github.com/giampaolo/psutil.git", rev = "4cf56e08c1bc883ec89758834b50954380759858"} + psutil = "^6.0.0" click = "^8.1.0" distro = "^1.8.0" --requests = "^2.31.0" +-requests = "^2.32.3" PyGObject = "^3.46.0" pyinotify = {git = "https://github.com/shadeyg56/pyinotify-3.12"} diff --git a/pkgs/by-name/au/autologin/package.nix b/pkgs/by-name/au/autologin/package.nix new file mode 100644 index 0000000000000..091a2cb8ad5be --- /dev/null +++ b/pkgs/by-name/au/autologin/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromSourcehut, + meson, + ninja, + pam, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "autologin"; + version = "1.0.0"; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = "autologin"; + rev = version; + hash = "sha256-Cy4v/1NuaiSr5Bl6SQMWk5rga8h1QMBUkHpN6M3bWOc="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + ]; + buildInputs = [ pam ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Run a command inside of a new PAM user session"; + homepage = "https://sr.ht/~kennylevinsen/autologin"; + changelog = "https://git.sr.ht/~kennylevinsen/autologin/refs/${version}"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ beviu ]; + mainProgram = "autologin"; + }; +} diff --git a/pkgs/by-name/au/autopsy/package.nix b/pkgs/by-name/au/autopsy/package.nix index 359a7affa3a00..a2693eb5b8bc3 100644 --- a/pkgs/by-name/au/autopsy/package.nix +++ b/pkgs/by-name/au/autopsy/package.nix @@ -1,6 +1,6 @@ { stdenv, lib, makeWrapper, fetchzip, testdisk, imagemagick, jdk, findutils, sleuthkit, ... }: let - jdkWithJfx = jdk.override (lib.optionalAttrs stdenv.isLinux { + jdkWithJfx = jdk.override (lib.optionalAttrs stdenv.hostPlatform.isLinux { enableJavaFX = true; }); in @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/sleuthkit/autopsy/releases/download/autopsy-${version}/autopsy-${version}.zip"; - sha256 = "32iOQA3+ykltCYW/MpqCVxyhh3mm6eYzY+t0smAsWRw="; + hash = "sha256-32iOQA3+ykltCYW/MpqCVxyhh3mm6eYzY+t0smAsWRw="; }; nativeBuildInputs = [ makeWrapper findutils ]; diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index 798dc89b8375f..479f6d69d736d 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "7.0.0"; + version = "7.0.1"; disabled = python3.pythonOlder "3.10"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "languitar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AJ0ZWRxqhBJEics6XnIVWyf7pJI8MphQU4LRqSYYNSQ="; + hash = "sha256-Zjo8H5PU6JezrBF0XBHvmePUTNeX74BX4NsHtPozcKs="; }; dependencies = with python3.pkgs; [ diff --git a/pkgs/by-name/au/autotools-language-server/package.nix b/pkgs/by-name/au/autotools-language-server/package.nix index 9cd9c57ba463a..68439d57dcf07 100644 --- a/pkgs/by-name/au/autotools-language-server/package.nix +++ b/pkgs/by-name/au/autotools-language-server/package.nix @@ -7,7 +7,12 @@ let python3 = python311.override { self = python3; - packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; + packageOverrides = _: super: { + tree-sitter = super.tree-sitter_0_21; + lsp-tree-sitter = super.lsp-tree-sitter.overridePythonAttrs(__: { + pythonRelaxDeps = [ "tree-sitter" ]; + }); + }; }; in python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/by-name/au/autotrash/package.nix b/pkgs/by-name/au/autotrash/package.nix new file mode 100644 index 0000000000000..c963703a9514c --- /dev/null +++ b/pkgs/by-name/au/autotrash/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + pandoc, + installShellFiles, +}: +python3Packages.buildPythonPackage rec { + pname = "autotrash"; + version = "0.4.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bneijt"; + repo = "autotrash"; + rev = "refs/tags/${version}"; + hash = "sha256-qMU3jjBL5+fd9vKX5BIqES5AM8D/54aBOmdHFiBtfEo="; + }; + + build-system = [ python3Packages.poetry-core ]; + + nativeBuildInputs = [ + installShellFiles + pandoc + ]; + postBuild = "make -C doc autotrash.1"; + postInstall = "installManPage doc/autotrash.1"; + + pythonImportsCheck = [ "autotrash" ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; + + meta = { + description = "Tool to automatically purge old trashed files"; + license = lib.licenses.gpl3Plus; + homepage = "https://bneijt.nl/pr/autotrash"; + maintainers = with lib.maintainers; [ + sigmanificient + mithicspirit + ]; + mainProgram = "autotrash"; + }; +} diff --git a/pkgs/by-name/av/av1an/package.nix b/pkgs/by-name/av/av1an/package.nix index 5595a72fb9bf5..7f7418f793d31 100644 --- a/pkgs/by-name/av/av1an/package.nix +++ b/pkgs/by-name/av/av1an/package.nix @@ -4,7 +4,7 @@ makeBinaryWrapper, av1an-unwrapped, ffmpeg, - python3Packages, + python3, libaom, svt-av1, rav1e, @@ -12,6 +12,8 @@ x264, x265, libvmaf, + vapoursynth, + mkvtoolnix-cli, withAom ? true, # AV1 reference encoder withSvtav1 ? false, # AV1 encoder/decoder (focused on speed and correctness) withRav1e ? false, # AV1 encoder (focused on speed and safety) @@ -19,6 +21,7 @@ withX264 ? true, # H.264/AVC encoder withX265 ? true, # H.265/HEVC encoder withVmaf ? false, # Perceptual video quality assessment algorithm + withMkvtoolnix ? true, # mkv editor, recommended concatenation method }: # av1an requires at least one encoder @@ -41,19 +44,24 @@ symlinkJoin { postBuild = let runtimePrograms = - [ (ffmpeg.override { inherit withVmaf; }) ] + [ + vapoursynth + (ffmpeg.override { inherit withVmaf; }) + ] ++ lib.optional withAom libaom ++ lib.optional withSvtav1 svt-av1 ++ lib.optional withRav1e rav1e ++ lib.optional withVpx libvpx ++ lib.optional withX264 x264 ++ lib.optional withX265 x265 - ++ lib.optional withVmaf libvmaf; + ++ lib.optional withVmaf libvmaf + ++ lib.optional withMkvtoolnix mkvtoolnix-cli; in '' wrapProgram $out/bin/av1an \ + --prefix LD_LIBRARY_PATH : ${vapoursynth}/lib \ --prefix PATH : ${lib.makeBinPath runtimePrograms} \ - --prefix PYTHONPATH : ${python3Packages.makePythonPath [ python3Packages.vapoursynth ]} + --prefix PYTHONPATH : ${vapoursynth}/${python3.sitePackages} ''; passthru = { diff --git a/pkgs/by-name/av/avalonia/0001-use-files-for-unicode-character-database.patch b/pkgs/by-name/av/avalonia/0001-use-files-for-unicode-character-database.patch new file mode 100644 index 0000000000000..5d0ecef4a44b0 --- /dev/null +++ b/pkgs/by-name/av/avalonia/0001-use-files-for-unicode-character-database.patch @@ -0,0 +1,137 @@ +From f4c599a48d153d15ccb1879ff511617c8e310515 Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Sat, 10 Aug 2024 23:14:12 -0300 +Subject: [PATCH 1/2] use files for unicode character database + +--- + .../BiDiClassTestDataGenerator.cs | 1 - + .../TextFormatting/BiDiTestDataGenerator.cs | 1 - + .../GraphemeBreakClassTrieGenerator.cs | 1 - + .../GraphemeBreakTestDataGenerator.cs | 1 - + .../LineBreakEnumuratorTests.cs | 1 - + .../TextFormatting/UnicodeDataGenerator.cs | 28 +++++++++++++++++-- + .../TextFormatting/UnicodeEnumsGenerator.cs | 1 - + 7 files changed, 26 insertions(+), 8 deletions(-) + +diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs +index f6b01d737..bc7278ef8 100644 +--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs ++++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs +@@ -3,7 +3,6 @@ + using System.Collections.Generic; + using System.IO; + using System.Linq; +-using System.Net.Http; + using Avalonia.Base.UnitTests.Media.TextFormatting; + + namespace Avalonia.Visuals.UnitTests.Media.TextFormatting +diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs +index 28d37130a..5e26edf49 100644 +--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs ++++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs +@@ -3,7 +3,6 @@ + using System.Collections.Generic; + using System.IO; + using System.Linq; +-using System.Net.Http; + using Avalonia.Base.UnitTests.Media.TextFormatting; + using Avalonia.Media.TextFormatting.Unicode; + +diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs +index 1a8d41caa..185b6ea62 100644 +--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs ++++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs +@@ -1,7 +1,6 @@ + using System; + using System.Collections.Generic; + using System.IO; +-using System.Net.Http; + using System.Text.RegularExpressions; + using Avalonia.Media.TextFormatting.Unicode; + +diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs +index 029f8e236..44c2aaf6a 100644 +--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs ++++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs +@@ -3,7 +3,6 @@ + using System.Collections.Generic; + using System.IO; + using System.Linq; +-using System.Net.Http; + using Avalonia.Base.UnitTests.Media.TextFormatting; + + namespace Avalonia.Visuals.UnitTests.Media.TextFormatting +diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs +index 3db9a32b6..b8df1f446 100644 +--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs ++++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs +@@ -3,7 +3,6 @@ + using System.Collections.Generic; + using System.IO; + using System.Linq; +-using System.Net.Http; + using Avalonia.Media.TextFormatting; + using Avalonia.Media.TextFormatting.Unicode; + using Xunit; +diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs +index f05a1e574..7e698ae0a 100644 +--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs ++++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs +@@ -1,16 +1,40 @@ + using System; + using System.Collections.Generic; + using System.IO; +-using System.Net.Http; + using System.Text.RegularExpressions; ++using System.Threading.Tasks; + using Avalonia.Media.TextFormatting.Unicode; + using Xunit; + + namespace Avalonia.Base.UnitTests.Media.TextFormatting + { ++ class HttpContent : IDisposable { ++ readonly string url; ++ public HttpContent(string url) => this.url = url; ++ ++ public void Dispose() {} ++ public Task<Stream> ReadAsStreamAsync() => ++ Task.FromResult<Stream>(File.OpenRead(url)); ++ } ++ ++ class HttpResponseMessage : IDisposable { ++ HttpContent content; ++ public HttpResponseMessage(string url) => Content = new(url); ++ ++ public void Dispose() {} ++ public bool IsSuccessStatusCode => true; ++ public HttpContent Content { get; init; } ++ } ++ ++ class HttpClient : IDisposable { ++ public void Dispose() {} ++ public Task<HttpResponseMessage> GetAsync(string url) => ++ Task.FromResult<HttpResponseMessage>(new (url)); ++ } ++ + internal static class UnicodeDataGenerator + { +- public const string Ucd = "https://www.unicode.org/Public/15.0.0/ucd/"; ++ public static readonly string Ucd = Environment.GetEnvironmentVariable("UNICODE_CHARACTER_DATABASE"); + + public static UnicodeTrie GenerateBiDiTrie(out BiDiDataEntries biDiDataEntries, out Dictionary<int, BiDiDataItem> biDiData) + { +diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs +index 110e57cbd..7073ea508 100644 +--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs ++++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs +@@ -2,7 +2,6 @@ + using System.Collections.Generic; + using System.IO; + using System.Linq; +-using System.Net.Http; + + namespace Avalonia.Base.UnitTests.Media.TextFormatting + { +-- +2.42.2 + diff --git a/pkgs/by-name/av/avalonia/0002-disable-parallel-compile.patch b/pkgs/by-name/av/avalonia/0002-disable-parallel-compile.patch new file mode 100644 index 0000000000000..b1e3b8724ca55 --- /dev/null +++ b/pkgs/by-name/av/avalonia/0002-disable-parallel-compile.patch @@ -0,0 +1,38 @@ +From 9ba51df4258d0dc2fe72d4f621d29073eeadc011 Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Sun, 11 Aug 2024 00:03:36 -0300 +Subject: [PATCH 2/2] disable parallel compile + +--- + nukebuild/Build.cs | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs +index e3d5139bf..ce50db574 100644 +--- a/nukebuild/Build.cs ++++ b/nukebuild/Build.cs +@@ -136,12 +136,20 @@ DotNetConfigHelper ApplySettingCore(DotNetConfigHelper c) + ProcessTasks.StartProcess("xcodebuild", args).AssertZeroExitCode(); + }); + ++ [Serializable] ++ public class SerialBuildSettings : DotNetBuildSettings ++ { ++ protected override Arguments ConfigureProcessArguments(Arguments arguments) => ++ base.ConfigureProcessArguments(arguments) ++ .Add("-m:1"); ++ } ++ + Target Compile => _ => _ + .DependsOn(Clean, CompileNative) + .DependsOn(CompileHtmlPreviewer) + .Executes(() => + { +- DotNetBuild(c => ApplySetting(c) ++ DotNetBuild(ApplySetting(new SerialBuildSettings()) + .SetProjectFile(Parameters.MSBuildSolution) + ); + }); +-- +2.42.2 + diff --git a/pkgs/by-name/av/avalonia/deps.nix b/pkgs/by-name/av/avalonia/deps.nix new file mode 100644 index 0000000000000..377014ed055d5 --- /dev/null +++ b/pkgs/by-name/av/avalonia/deps.nix @@ -0,0 +1,2957 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: +[ + (fetchNuGet { + pname = "Appium.WebDriver"; + version = "4.4.0"; + hash = "sha256-VEeAYpA48ULM0eQU9Iu47sxQYGTmhcKjGUepTb5OZvA="; + }) + (fetchNuGet { + pname = "Avalonia.Angle.Windows.Natives"; + version = "2.1.0.2023020321"; + hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; + }) + (fetchNuGet { + pname = "BenchmarkDotNet"; + version = "0.13.4"; + hash = "sha256-CPmAo/yRIJ4GHHAnEmsfdT/Fn2hJfCMHUpCMxOHIY5U="; + }) + (fetchNuGet { + pname = "BenchmarkDotNet.Annotations"; + version = "0.13.4"; + hash = "sha256-SB+g4+oTkFdmISiW2u/Q+rU3s7VFxyCZZC0gsRrT75A="; + }) + (fetchNuGet { + pname = "Castle.Core"; + version = "4.3.1"; + hash = "sha256-wIBI698ernSsEXM+jp0gIL8OaasE8e9mSarZLM8XZFA="; + }) + (fetchNuGet { + pname = "Castle.Core"; + version = "5.1.1"; + hash = "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="; + }) + (fetchNuGet { + pname = "CommandLineParser"; + version = "2.4.3"; + hash = "sha256-pTyYP26uXXLe6ejCb/yVYpb23ad/Dkl2Ka8NWwQeiqk="; + }) + (fetchNuGet { + pname = "DotNet.Bundle"; + version = "0.9.13"; + hash = "sha256-VA7wFPC2V4JudQ+edk6lFkklDPIHZYVWql8/KMzcnys="; + }) + (fetchNuGet { + pname = "DotNetSeleniumExtras.PageObjects"; + version = "3.11.0"; + hash = "sha256-OLKoHGsBOlGDrwjbSHHITl2mWKbUXoRBbTjNMCkzDQg="; + }) + (fetchNuGet { + pname = "DynamicData"; + version = "7.12.8"; + hash = "sha256-MIR66d5vWwpOo06b8f3UDJXMlwyiGl/9JsedtVAh6LA="; + }) + (fetchNuGet { + pname = "DynamicData"; + version = "7.9.5"; + hash = "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="; + }) + (fetchNuGet { + pname = "Gee.External.Capstone"; + version = "2.3.0"; + hash = "sha256-wdYT/F8SLL72OIVv/Q/hfLMfhlWMnhDNCTWx+wWlPoU="; + }) + (fetchNuGet { + pname = "Glob"; + version = "1.1.8"; + hash = "sha256-GHnuCFIIkm2pEDYbDXSDF6gScCKPqmz9Fil1U7VNVIw="; + }) + (fetchNuGet { + pname = "HarfBuzzSharp"; + version = "7.3.0"; + hash = "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="; + }) + (fetchNuGet { + pname = "HarfBuzzSharp.NativeAssets.Linux"; + version = "7.3.0"; + hash = "sha256-AEHjgqX0o+Fob0SeZ6EikGKoEe6rRxess5fVJ31UL0U="; + }) + (fetchNuGet { + pname = "HarfBuzzSharp.NativeAssets.macOS"; + version = "7.3.0"; + hash = "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="; + }) + (fetchNuGet { + pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; + version = "7.3.0"; + hash = "sha256-9VI0xCavuuIIStuQ7ipBfWu5HrAt+Kk/F2j57C1llTU="; + }) + (fetchNuGet { + pname = "HarfBuzzSharp.NativeAssets.Win32"; + version = "7.3.0"; + hash = "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="; + }) + (fetchNuGet { + pname = "Humanizer.Core"; + version = "2.2.0"; + hash = "sha256-5Q6oRaV8wHPONHreKvB74VjV2FW36mwC3n+05It5vyI="; + }) + (fetchNuGet { + pname = "Iced"; + version = "1.17.0"; + hash = "sha256-6/5E5v5mqSG7yiE2zHUChZZeC47NRgLzQFD4+7bqKaU="; + }) + (fetchNuGet { + pname = "JetBrains.Annotations"; + version = "2022.1.0"; + hash = "sha256-AgCfhDvBb/xOLxNvFoZPYuiSBWEhXihHTBvYqLS+WFM="; + }) + (fetchNuGet { + pname = "JetBrains.dotMemoryUnit"; + version = "3.2.20220510"; + hash = "sha256-+BiTUpWaFoAaUrDDyFnoVMn+bCWIBdTnaRVug4DN1Qo="; + }) + (fetchNuGet { + pname = "Libuv"; + version = "1.9.1"; + hash = "sha256-bQdVn50eId1GzSQa9CFth0meKAQMYCFQ98zLN9pqL0k="; + }) + (fetchNuGet { + pname = "MicroCom.CodeGenerator"; + version = "0.11.0"; + hash = "sha256-WUiyVoYnaJnstPEjdw6jyhvIKKH0Z29awByblO/CpgQ="; + }) + (fetchNuGet { + pname = "MicroCom.CodeGenerator.MSBuild"; + version = "0.11.0"; + hash = "sha256-TsxziX9V8T3qRrEA3o9wY84ocDcUUUBzvARi5QZW23o="; + }) + (fetchNuGet { + pname = "MicroCom.Runtime"; + version = "0.11.0"; + hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; + }) + (fetchNuGet { + pname = "Microsoft.ApplicationInsights"; + version = "2.20.0"; + hash = "sha256-EsqOUirzfOOplbO8W2eeYBO+QWqbtH+394R9GvhbnJk="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Ref"; + version = "6.0.31"; + hash = "sha256-rVxnpwa8B1weEzkJIxm+todHXrSdIT3KY38D09MncUI="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; + version = "6.0.31"; + hash = "sha256-z6HNgiyLyXN5+QlktIZmOQh9D4KRHWd6yonmKChEji4="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; + version = "6.0.8"; + hash = "sha256-HYRPXOGEiwiNPjZj66Tkdhsua24RrL06ZlgNfYIROhE="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "6.0.31"; + hash = "sha256-Rq97wUeAD2bZhe0XRLB9Ffq1MBU/u4Yq45KwRLz7DRQ="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "6.0.8"; + hash = "sha256-MI2coSanqLYP6OXZ3bRwsvldP7LNPxViBDX7UI3xrNI="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; + version = "6.0.31"; + hash = "sha256-QlAteE0egI+YzouNm4d8+yXRs9E0jfBTVl7KbMxSmnA="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; + version = "6.0.8"; + hash = "sha256-xSuoeeDmj7GX1HcJGL16LMR3CbYLHPNpaLsHzZbUBpM="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; + version = "6.0.31"; + hash = "sha256-c1hTOPeoH7STKevPryBv4+IL/7YMfTFm5EakMvrhfI4="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; + version = "6.0.8"; + hash = "sha256-t2F1+XniGrg0mI5ULmY1yswgeQB9x+69RQIANuBEJpE="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.Authorization"; + version = "7.0.2"; + hash = "sha256-G7vaCZss/xIn/AURedRueohWJRxS8W47N1AsK8Y5rTo="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.Components"; + version = "7.0.2"; + hash = "sha256-4KEo+SHSkHCIXgkUhTlx15GB3p+v/y53rCBGcE0mP5Q="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.Components.Analyzers"; + version = "7.0.2"; + hash = "sha256-e/fjQ1RFa3aJvB6evlXE24+wEqIQASDpEGKeVtD3N2g="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.Components.Forms"; + version = "7.0.2"; + hash = "sha256-d8x7Xg0Yu4tkPwPPgEnsjFL0VwKRqTxGobDbTLYReWE="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.Components.Web"; + version = "7.0.2"; + hash = "sha256-d5kCtJ/8KuJjabyZ9Rx84lO2tPGCpIiRzFqFEftIAIE="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.Metadata"; + version = "7.0.2"; + hash = "sha256-FOKhbvww6xRXxNLgailETvD8/Bw4overmoPlODO44ik="; + }) + (fetchNuGet { + pname = "Microsoft.Azure.KeyVault"; + version = "3.0.4"; + hash = "sha256-Oko2by52WnA3o35nEoSShPlKywiH8zPnl7eTz3v6GZI="; + }) + (fetchNuGet { + pname = "Microsoft.Azure.KeyVault.WebKey"; + version = "3.0.4"; + hash = "sha256-y9k4CMKKrdRB8q+95gDxryQedplMTOB9FSRUsVo/7tA="; + }) + (fetchNuGet { + pname = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.1.0"; + hash = "sha256-QYVojfqSZKbF8P6D/aacfxfumMaRUD9SEEQbzw73Bbc="; + }) + (fetchNuGet { + pname = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.1.1"; + hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; + }) + (fetchNuGet { + pname = "Microsoft.Bcl.AsyncInterfaces"; + version = "6.0.0"; + hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; + }) + (fetchNuGet { + pname = "Microsoft.Build"; + version = "16.9.0"; + hash = "sha256-t3AATMGHi3xho92r9y3O0hlEIg/svVTUcKiwiuPo7k0="; + }) + (fetchNuGet { + pname = "Microsoft.Build.Framework"; + version = "15.1.548"; + hash = "sha256-0U6XANGftKOS9Owx1x8hOe5GOdqx2uwQwuAsVHw297g="; + }) + (fetchNuGet { + pname = "Microsoft.Build.Framework"; + version = "17.3.2"; + hash = "sha256-x/Cv21DrCXB5pA0mBNass/hGzMqLEI4MDEswHBKbEd0="; + }) + (fetchNuGet { + pname = "Microsoft.Build.Locator"; + version = "1.4.1"; + hash = "sha256-PdPdg3O6D8EwXZmLFWj7+eZhs2+dHaNYDoCoE3NOIUg="; + }) + (fetchNuGet { + pname = "Microsoft.Build.Tasks.Core"; + version = "16.9.0"; + hash = "sha256-/LclaFA/8uKIWg0Diw2kD/k0o5y2tKFA/HzzrAFQ+b4="; + }) + (fetchNuGet { + pname = "Microsoft.Build.Tasks.Git"; + version = "1.1.1"; + hash = "sha256-PHxHmsCty8Si5dCUQSizeHkJrHa9+j2nRsg6Sz+5Za0="; + }) + (fetchNuGet { + pname = "Microsoft.Build.Traversal"; + version = "3.2.0"; + hash = "sha256-ShJ7pIuI8GYb8X4XQjqtFUgmj1ABLj27MEieYtKO5RA="; + }) + (fetchNuGet { + pname = "Microsoft.Build.Utilities.Core"; + version = "16.9.0"; + hash = "sha256-THRb4oxK8FGyJmMzrQEOWuNbeFW6/PainWsM+W+FBTw="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Analyzers"; + version = "1.1.0"; + hash = "sha256-7KrZfK3kUbmeT82eVadvHurZcaFq3FDj4qkIIeExJiM="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Analyzers"; + version = "2.6.2-beta2"; + hash = "sha256-hWlcoxSXAxBxhctuBnl0uD6KlCQyciZ9YepWEcAWS5Q="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Analyzers"; + version = "3.0.0"; + hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Analyzers"; + version = "3.3.4"; + hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Common"; + version = "1.3.0"; + hash = "sha256-Jcw54WWyfPKdkeqRAG4xjihiGP/djjAkvpR6KM2I+CQ="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Common"; + version = "3.0.0"; + hash = "sha256-ucZQCNXYzt+I+8H7L8afvs1oNKq3NyD6Qn0M/8EP22A="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Common"; + version = "3.8.0"; + hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Common"; + version = "3.9.0"; + hash = "sha256-M2LpVHr+UDFCVD7PtDSRD635+RO620JKmK/siOw01PQ="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Common"; + version = "4.4.0"; + hash = "sha256-URZOc/hOgDmCdrl/T8yQjowvsQUoWuSYVnrk2k0NT1E="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp"; + version = "1.3.0"; + hash = "sha256-OqqvMHNj9Xql4YTEPMlzoGXXELoLC7JkRGjS0pil+m4="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp"; + version = "3.0.0"; + hash = "sha256-IT1T1G4dyMCC85ypa5Ue1JkZC4Vex35yZR4PzO+Aa7U="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp"; + version = "3.8.0"; + hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp"; + version = "3.9.0"; + hash = "sha256-f3591/1mz/P3Asi9NTYU38bNukrKR7COR0pGmEtPKzM="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp"; + version = "4.4.0"; + hash = "sha256-p+fUPxpaEhHrZ4oBnYv2ffibZqW2hEQ75MajH4qpWnI="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; + version = "3.8.0"; + hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; + version = "3.8.0"; + hash = "sha256-i6PTXkHepgTXseFFg57iRh5thKtKYc9CH11y/qzDy8k="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Scripting.Common"; + version = "3.8.0"; + hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.VisualBasic"; + version = "1.3.0"; + hash = "sha256-lIKN1dG59aY8zeYgkY8Kdnv4UBgSwVbghz5ngPyEzKA="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Workspaces.Common"; + version = "3.8.0"; + hash = "sha256-3D7xV3V1WsUU9OMMEOj+z9GouCDKXSBC4Z/Szs/OcWE="; + }) + (fetchNuGet { + pname = "Microsoft.CodeCoverage"; + version = "1.0.3"; + hash = "sha256-vO0DJv2QNYfus4VzqVkNcnWQqmuUrM5le7supZRl/Uk="; + }) + (fetchNuGet { + pname = "Microsoft.CodeCoverage"; + version = "17.5.0"; + hash = "sha256-RBFO0YLp1//Li2a9s1oAhR+C4TMXgD7TTH+V9QDgMS8="; + }) + (fetchNuGet { + pname = "Microsoft.CSharp"; + version = "4.0.1"; + hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; + }) + (fetchNuGet { + pname = "Microsoft.CSharp"; + version = "4.3.0"; + hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; + }) + (fetchNuGet { + pname = "Microsoft.CSharp"; + version = "4.7.0"; + hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; + }) + (fetchNuGet { + pname = "Microsoft.Diagnostics.NETCore.Client"; + version = "0.2.251802"; + hash = "sha256-9ZH4rrfACzJP5oiarDW4cD2nczv1SNgZr4GW1J9hlUA="; + }) + (fetchNuGet { + pname = "Microsoft.Diagnostics.Runtime"; + version = "2.2.332302"; + hash = "sha256-5R9xK0owZEhXsucqPKnPaTiwhXBnLo92L2AY7IjyxNg="; + }) + (fetchNuGet { + pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; + version = "3.0.2"; + hash = "sha256-BHuiTEkA76/9QIR9MG8SBhdExgKFFGd//2RjX8V3XJM="; + }) + (fetchNuGet { + pname = "Microsoft.DotNet.ApiCompat.Tool"; + version = "7.0.305"; + hash = "sha256-/NVk9c4xO4p53Um+7Y96Nvg3cJAGqu5zPStn8jEMboI="; + }) + (fetchNuGet { + pname = "Microsoft.DotNet.GenAPI.Tool"; + version = "8.0.101-servicing.23580.12"; + hash = "sha256-h6u2nIE2pTlYjqk2/lBHXQafxqUVSbFStIiOFbs1sOM="; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/microsoft.dotnet.genapi.tool/8.0.101-servicing.23580.12/microsoft.dotnet.genapi.tool.8.0.101-servicing.23580.12.nupkg"; + }) + (fetchNuGet { + pname = "Microsoft.DotNet.PlatformAbstractions"; + version = "1.0.3"; + hash = "sha256-tE+2/zJAOpwaINSnmsq070K5xHQAzzqcrVkCxBFiXtk="; + }) + (fetchNuGet { + pname = "Microsoft.DotNet.PlatformAbstractions"; + version = "3.1.6"; + hash = "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration"; + version = "2.1.1"; + hash = "sha256-pnO6GdmnPJ8D4pmMpkxwgM4GggwGd2Uk+5s6OfJnhAg="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.1.1"; + hash = "sha256-3DdHcNmy+JKWB4Q8ixzE4N/hUAvx2o4YlYal4Riwiyw="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.Binder"; + version = "2.1.1"; + hash = "sha256-FVdAa88PLAbWXTnEoa7AVSaC9AEjQ66LoxdtJ5nRIVk="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection"; + version = "7.0.0"; + hash = "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "2.1.1"; + hash = "sha256-BMU00QmmhtH3jP5cepJnoTrxrPESWeDU0i5UrIpIwGY="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "7.0.0"; + hash = "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyModel"; + version = "1.0.3"; + hash = "sha256-NEcjABwtUqoDs6mrYKHJZ8Rn0EN5krHitnxghez6lO0="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyModel"; + version = "6.0.0"; + hash = "sha256-1BLzyZJ1Hn03JToJeIlW4JGhdh0HHrgD1FFvZAN0hCE="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging"; + version = "2.1.1"; + hash = "sha256-HnEBmAhweBalCAeX+KZ4kEL3GXEVDBg6Uq4H4LJ56oo="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.1.0"; + hash = "sha256-0i4YUnMQ4DE0KDp47pssJLUIw8YAsHf2NZN0xoOLb78="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.1.1"; + hash = "sha256-TzbYgz4EemrYKHMvB9HWDkFmq0BkTetKPUwBpYHk9+k="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Abstractions"; + version = "7.0.0"; + hash = "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Options"; + version = "2.1.1"; + hash = "sha256-dCPA56Wv9cLuz720PmVbk2oXda1t9ZSAlP8/clDU93E="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Options"; + version = "7.0.0"; + hash = "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Primitives"; + version = "2.1.1"; + hash = "sha256-nbu2OeQGWeG8QKpoAOxIQ8aPzDbWHgbzLXh55xqeeQw="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Primitives"; + version = "7.0.0"; + hash = "sha256-AGnfNNDvZDGZ0Er9JQxeyLoUbVH+jfXF3anFr12qk6w="; + }) + (fetchNuGet { + pname = "Microsoft.IdentityModel.Clients.ActiveDirectory"; + version = "5.2.4"; + hash = "sha256-wR8Jz+b/TXR+BhK3cwo9IFPpHay2vxAb6Q9UR6LODhk="; + }) + (fetchNuGet { + pname = "Microsoft.JSInterop"; + version = "7.0.2"; + hash = "sha256-yZTt2Fas0t1X4ISIW+nRkxKfkblEzGhAzhkwZ5cmj9o="; + }) + (fetchNuGet { + pname = "Microsoft.NET.Test.Sdk"; + version = "15.7.0"; + hash = "sha256-nLJtEpXWWiRHlqFWWEQWyn/gajknHb8ByWN+ahf4GCo="; + }) + (fetchNuGet { + pname = "Microsoft.NET.Test.Sdk"; + version = "17.5.0"; + hash = "sha256-XgahgoL+VfAN4NB6qxeAHxvGj9s1Dsl9wLSSPlEU/wE="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App"; + version = "1.0.5"; + hash = "sha256-DVNWNgfuZCOmHQVilZG8se3JxvFXTcL09+dJQo98P3w="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App"; + version = "2.0.0"; + hash = "sha256-op2W8RQ55eC+5TKYD1ZvuT0h6zSRqdxq7h5qlbWeHUk="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.linux-arm64"; + version = "6.0.31"; + hash = "sha256-mjS1IKBwxDFT2UmcyC5ZMIQ3mWSADw887CIV0pZhQRc="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.linux-arm64"; + version = "6.0.8"; + hash = "sha256-myvahTEkTjNRKnuo9ZzTzwjP7KA7hLQWMwr0MHS/rq0="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.linux-x64"; + version = "6.0.31"; + hash = "sha256-VifKEirDStL5vpjnEe0hGsODssK20XBX/Mm6j8G4QIM="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.linux-x64"; + version = "6.0.8"; + hash = "sha256-zWxsJKKcjbhFIn6Jw9b+uNjBO7iJqskB9XJVRs3MHyg="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.osx-arm64"; + version = "6.0.31"; + hash = "sha256-unElfKN3Ro852wsIzgTIXJJPoYpvVjrsSIwxKtwLUGk="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.osx-arm64"; + version = "6.0.8"; + hash = "sha256-mrRRDarC+yNfriKeuRjp8gSuACpF4X9LBi/DkFXVgRI="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.osx-x64"; + version = "6.0.31"; + hash = "sha256-JiIXW9FPqjEb5cZHZ0otmmbY4gpgRdTZCxxuy12AJkw="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Host.osx-x64"; + version = "6.0.8"; + hash = "sha256-7AWIE6YEJ5p+IJ3VpE9lz/A8hV7OuO7Y40vIzntsOEg="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Ref"; + version = "6.0.31"; + hash = "sha256-p/KpNGwJfvoWNRn057o4t8u8La2LvsmOjF0i2W1URKU="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; + version = "6.0.31"; + hash = "sha256-N3xRbF5nQo9Okixqg1mN86L7VB72bpDR0C6wlfzntPI="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; + version = "6.0.8"; + hash = "sha256-m8XnqqAtXeJ+euVyaoeohhJYEO8RJDmqh161WEAxDBA="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "6.0.31"; + hash = "sha256-TE1DmzoBKO9qKoATBWZPRKXBRoRzs6AafKuubeSwgl8="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "6.0.8"; + hash = "sha256-lcmKA/sFan/GVZ2jZxGwiIh1ia+tSXD7MxHiEIiIzAU="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; + version = "6.0.31"; + hash = "sha256-Gh+/HbETPJ2LNX9vRo+e8CmbL3YacBUXGHNVcIEQrIQ="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; + version = "6.0.8"; + hash = "sha256-GTF6ir2SEPnaRbpJVIPN+am6xZzXIcFtG30PkjWVUBk="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.osx-x64"; + version = "6.0.31"; + hash = "sha256-ZZYzARixjQ42taRJLiTq0ykG1Hm8F/4RkZXM9lowhbI="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App.Runtime.osx-x64"; + version = "6.0.8"; + hash = "sha256-WQYWx+gwEi1rtaADPn1M1sZ20iU2ronjUSEuWpTE5i8="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.DotNetAppHost"; + version = "2.0.0"; + hash = "sha256-jT+oiSZkd9S88BeH5ZY0uXdQHvTXNFBotn9RncNsPXo="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.DotNetHost"; + version = "1.0.1"; + hash = "sha256-yiyZ4KGVRDZRgAuoSl4ZNWnRR3ityniyRPvzS799JOM="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.DotNetHostPolicy"; + version = "1.0.5"; + hash = "sha256-2HEoAgMBxUwPdBYDwyJOkCt0DwzfkWImYYjwF/h4QeQ="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.DotNetHostPolicy"; + version = "2.0.0"; + hash = "sha256-TnmtKfWidje2CVnwMb9Y0WcYroR3aHRoJFGxzb7z6f8="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.DotNetHostResolver"; + version = "1.0.1"; + hash = "sha256-hGJLA8Q6R+up9zHzk+Up2KF1a+fXZeEWrAZ+iNfQP4E="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.DotNetHostResolver"; + version = "2.0.0"; + hash = "sha256-qw/aGePgrpt97N8iKreCL5hzc2Cnoge2yefjVnEvxHc="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Jit"; + version = "1.0.7"; + hash = "sha256-cVI+XBe6DGYecTKX+7zEXLqsl1amtDZiYZ12HnI3PKk="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.0.2"; + hash = "sha256-YLJ2+BONtCWb0lY4Rttdqzbcm4z+5N5uNr3byRWQOZ8="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.1.1"; + hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "2.1.2"; + hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + hash = "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "5.0.0"; + hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Runtime.CoreCLR"; + version = "1.0.7"; + hash = "sha256-2x/Wjubyulx14Pm8jH0ru/TahHO6U64IahWVushTod4="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.0.3"; + hash = "sha256-5dU8P0YJm0HOUuP2wuLxmvQInXAVqJKriSu+BkfgspY="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.1.3"; + hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Windows.ApiSets"; + version = "1.0.1"; + hash = "sha256-6PR4o/wQxBaJ5eRdt/awSO80EP3QqpWIk0XkCR9kaJo="; + }) + (fetchNuGet { + pname = "Microsoft.NETFramework.ReferenceAssemblies"; + version = "1.0.2"; + hash = "sha256-CkB8iyn+WeG9rwCB5HFC/E4Dqr9W1ZQOAhbu2pHNgkQ="; + }) + (fetchNuGet { + pname = "Microsoft.NETFramework.ReferenceAssemblies.net45"; + version = "1.0.2"; + hash = "sha256-tADSnydJn3S88vurGVkhEuIwTex++RGbNTSg0Pq1B3c="; + }) + (fetchNuGet { + pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; + version = "1.0.2"; + hash = "sha256-4iJ/QJ2LhqTMrGsredRuQ/xSdYVnwwuwQP1ra8RtQ0s="; + }) + (fetchNuGet { + pname = "Microsoft.NETFramework.ReferenceAssemblies.net462"; + version = "1.0.2"; + hash = "sha256-3WtnbZTCk7hsajKYVqk86laxUPyytL6QfR9U6YVIGqw="; + }) + (fetchNuGet { + pname = "Microsoft.NETFramework.ReferenceAssemblies.net47"; + version = "1.0.2"; + hash = "sha256-ey9xZKPJysuA3p2IG+k+DN/0vLAl50SUbuRi3oG1AOI="; + }) + (fetchNuGet { + pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; + version = "1.0.2"; + hash = "sha256-TLQ23nLAPXskvLZTuRs3vIj1AJKotpl/qs14PeUg3rY="; + }) + (fetchNuGet { + pname = "Microsoft.Reactive.Testing"; + version = "4.1.6"; + hash = "sha256-aDJj4t5QPwVl7I3BHawBvIiq28nqLpvIB2WWgcf+jAs="; + }) + (fetchNuGet { + pname = "Microsoft.Rest.ClientRuntime"; + version = "2.3.20"; + hash = "sha256-1uRXk2jHXoGuGvQ1DVo0lZYybfsN2rXDdEzJwagmMFc="; + }) + (fetchNuGet { + pname = "Microsoft.Rest.ClientRuntime.Azure"; + version = "3.3.18"; + hash = "sha256-zisaNDp0uHprZmhTokn/Gsr0bBzkiC3gcEls0jGJ0ho="; + }) + (fetchNuGet { + pname = "Microsoft.SourceLink.Common"; + version = "1.1.1"; + hash = "sha256-b4FaNFneDVDbvJVX1iNyhhLTrnxUfnmyypeJr47GbXY="; + }) + (fetchNuGet { + pname = "Microsoft.SourceLink.GitHub"; + version = "1.1.1"; + hash = "sha256-3hc9ym5ReONp00ruCKio/Ka1gYXo/jDlUHtfK1wZPiU="; + }) + (fetchNuGet { + pname = "Microsoft.TestPlatform.ObjectModel"; + version = "15.7.0"; + hash = "sha256-jOWsNS5O/0lENIPugExKoCkmUcelzRrtg1aZ6uU7FiA="; + }) + (fetchNuGet { + pname = "Microsoft.TestPlatform.ObjectModel"; + version = "17.5.0"; + hash = "sha256-mj5UH+aqVk7f3Uu0+L47aqZUudJNCx3Lk7cbP4fzcmI="; + }) + (fetchNuGet { + pname = "Microsoft.TestPlatform.TestHost"; + version = "15.7.0"; + hash = "sha256-sNB7DvyDT8/JGTCxRV+QXLcIrNcEkRM+4wV7gkHDv8s="; + }) + (fetchNuGet { + pname = "Microsoft.TestPlatform.TestHost"; + version = "17.5.0"; + hash = "sha256-A/LU0UTQ7ee9n1Yww8FGPGELvYTPkjeRWvkhW/KY4J0="; + }) + (fetchNuGet { + pname = "Microsoft.VisualBasic"; + version = "10.0.1"; + hash = "sha256-7HHzZcWLVTTQ1K1rCIyoB+UxLHMvOIz+O5av6XDa22A="; + }) + (fetchNuGet { + pname = "Microsoft.VisualStudio.SlnGen"; + version = "8.5.17"; + hash = "sha256-PfIy+t1VNBuKnAeH7bCPvoFQDr0dUUAB06R4H38Ggy8="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + hash = "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Registry"; + version = "4.0.0"; + hash = "sha256-M/06F/Z2wTHCh4pZOgtCjUGLD1FJXEJKCmzOeFMl7uo="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Registry"; + version = "4.3.0"; + hash = "sha256-50XwFbyRfZkTD/bBn76WV/NIpOy/mzXD3MMEVFX/vr8="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.SystemEvents"; + version = "4.5.0"; + hash = "sha256-WFqy842DMQG4W1H2ewXWflfBJ+lQf/LwP0KI4OfY0zo="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.SystemEvents"; + version = "4.7.0"; + hash = "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.SystemEvents"; + version = "6.0.0"; + hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; + }) + (fetchNuGet { + pname = "Mono.Cecil"; + version = "0.11.5"; + hash = "sha256-nPFwbzW08gnCjadBdgi+16MHYhsPAXnFIliveLxGaNA="; + }) + (fetchNuGet { + pname = "MonoMac.NetStandard"; + version = "0.0.4"; + hash = "sha256-UcllMfNIjmAFLQOWBypDGsrSCKXbbnAFG5Sy4kvXQBA="; + }) + (fetchNuGet { + pname = "Moq"; + version = "4.18.4"; + hash = "sha256-JOmYlcTJdQOthRxnT0jAD6WG+NVLMmIV2BM9rNhNg3Q="; + }) + (fetchNuGet { + pname = "NETStandard.Library"; + version = "1.6.0"; + hash = "sha256-ExWI1EKDCRishcfAeHVS/RoJphqSqohmJIC/wz3ZtVo="; + }) + (fetchNuGet { + pname = "NETStandard.Library"; + version = "1.6.1"; + hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; + }) + (fetchNuGet { + pname = "NETStandard.Library"; + version = "2.0.0"; + hash = "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0="; + }) + (fetchNuGet { + pname = "NETStandard.Library"; + version = "2.0.3"; + hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "12.0.3"; + hash = "sha256-PSHK+Qn52ytdEySdZyjCUGxV5y4hI/vir2WgVsCgv50="; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "13.0.1"; + hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "9.0.1"; + hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; + }) + (fetchNuGet { + pname = "Nito.AsyncEx.Context"; + version = "5.1.2"; + hash = "sha256-7BCVYJgZyU2/Z4r8CKajorlzajr6GBUBAbY3AcswPC0="; + }) + (fetchNuGet { + pname = "Nito.AsyncEx.Tasks"; + version = "5.1.2"; + hash = "sha256-W5jxZZ0pbPHte6TkWTq4FDtHOejvlrdyb1Inw+Yhl4c="; + }) + (fetchNuGet { + pname = "Nito.Disposables"; + version = "2.2.1"; + hash = "sha256-FKDLUWysqroSHLU2kLjK1m0g417AAPh6n2TIkwiapcM="; + }) + (fetchNuGet { + pname = "NuGet.Common"; + version = "5.11.0"; + hash = "sha256-IzeAfwDJpgTceOZyXHDzlUtMonmKOhfabpLVkpk2rqo="; + }) + (fetchNuGet { + pname = "NuGet.Configuration"; + version = "5.11.0"; + hash = "sha256-dJS5EgM26Aq2ncNxF7p7iLMgdYNKg3/t+TL5fmBeN+k="; + }) + (fetchNuGet { + pname = "NuGet.Frameworks"; + version = "5.11.0"; + hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; + }) + (fetchNuGet { + pname = "NuGet.Packaging"; + version = "5.11.0"; + hash = "sha256-u4cQk7izZ+ULh9iO5pndqg+8cL7g2MbMXmd4i6C2r2c="; + }) + (fetchNuGet { + pname = "NuGet.Versioning"; + version = "5.11.0"; + hash = "sha256-eBfn91Kr7Vv+js8kvKrnai2W3ZN7dY+7u9ivHGwoIxA="; + }) + (fetchNuGet { + pname = "Nuke.Common"; + version = "6.2.1"; + hash = "sha256-aubP9+aoDZbGR/Zd9PlZhbIwmxpjneGUl4816eRomfY="; + }) + (fetchNuGet { + pname = "NUnit"; + version = "3.13.0"; + hash = "sha256-vi9NMfED3L/odwQhjWo+4+UbI6gjbFrMILOJH3/Gwu0="; + }) + (fetchNuGet { + pname = "NUnit"; + version = "3.13.3"; + hash = "sha256-Zn+sJIF7ieNqu/t2RwJx6WPFb1jl9UuNHidb/Px0v3E="; + }) + (fetchNuGet { + pname = "NUnit3TestAdapter"; + version = "4.4.2"; + hash = "sha256-MQscImurah0M+4OXL/UfB+ty7sLEr7BYQK3JbQKjUtg="; + }) + (fetchNuGet { + pname = "Octokit"; + version = "0.51.0"; + hash = "sha256-CehsV2k6kiV8i618o0bxGYVqNr/I8A7Op0YAtffgteI="; + }) + (fetchNuGet { + pname = "Perfolizer"; + version = "0.2.1"; + hash = "sha256-nllshKuHU+1jSBfcTz8BTJTGr1TeCFvxjM4OPyLGSgQ="; + }) + (fetchNuGet { + pname = "Quamotion.RemoteViewing"; + version = "1.1.21"; + hash = "sha256-vYqMRupugw7Q9fyDMxkeDqhfXh6KjOGzWA8aMc1z9gU="; + }) + (fetchNuGet { + pname = "ReactiveUI"; + version = "18.3.1"; + hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; + }) + (fetchNuGet { + pname = "ReactiveUI"; + version = "18.4.1"; + hash = "sha256-IqaIu3xmShw3m/ko34SytnL9sIm/LQnTUZcda7CF7tA="; + }) + (fetchNuGet { + pname = "ReactiveUI.Validation"; + version = "3.0.22"; + hash = "sha256-f/1yGwrQb/Nauj+0lqBV6xxbfp8qCQvJxbxUy2VhS8I="; + }) + (fetchNuGet { + pname = "runtime.any.System.Collections"; + version = "4.0.11"; + hash = "sha256-4L3fXzSgw8UaCTvdb3cEyihka3K8JHBz/Ujsx0JdhPQ="; + }) + (fetchNuGet { + pname = "runtime.any.System.Collections"; + version = "4.3.0"; + hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Diagnostics.Tools"; + version = "4.0.1"; + hash = "sha256-xx62V6zbptoPPXm8VvLlC1RZDK1u015v6i/VDEGql2E="; + }) + (fetchNuGet { + pname = "runtime.any.System.Diagnostics.Tools"; + version = "4.3.0"; + hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; + }) + (fetchNuGet { + pname = "runtime.any.System.Diagnostics.Tracing"; + version = "4.1.0"; + hash = "sha256-+PJZWFl6hkqryCerWVtbG+ppIGvZf2l6fu2HWyGqMRA="; + }) + (fetchNuGet { + pname = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization"; + version = "4.0.11"; + hash = "sha256-BgmoUM3WsMUCjtO9KmtjPKsjYRAEVjp74KvEa8zNgAg="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization"; + version = "4.3.0"; + hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization.Calendars"; + version = "4.0.1"; + hash = "sha256-qNDLcNy/UvLhN5/vFPVqsiWSapcdL63s54YAannh8QA="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; + }) + (fetchNuGet { + pname = "runtime.any.System.IO"; + version = "4.1.0"; + hash = "sha256-ZbG7B6GOO90k/prj/Z60UGloQUrBepsvmlPQGuV0Wk0="; + }) + (fetchNuGet { + pname = "runtime.any.System.IO"; + version = "4.3.0"; + hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection"; + version = "4.1.0"; + hash = "sha256-BtdDCQLHDdAgO9qhwE0JBuUqFKc7l9On8p+VlgrQbBo="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection"; + version = "4.3.0"; + hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Extensions"; + version = "4.0.1"; + hash = "sha256-ef4sBhwHzEPZqsw6xn8cJtCe6Xhjr7UB1Cy99GUkYxY="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Primitives"; + version = "4.0.1"; + hash = "sha256-H2ZzRIWLN6FbSh8+q4OXqhssn3nGRnv7/NiV3OO+uf8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; + }) + (fetchNuGet { + pname = "runtime.any.System.Resources.ResourceManager"; + version = "4.0.1"; + hash = "sha256-eZasny65yEQESxMJHOBaqJQzlrd8CIOIc1ks6+HRr8o="; + }) + (fetchNuGet { + pname = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime"; + version = "4.1.0"; + hash = "sha256-FZC+BNSzSkN3rObLJJAqwW/vNnJ+PiwdvNNufuISWVY="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime"; + version = "4.3.0"; + hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.Handles"; + version = "4.0.1"; + hash = "sha256-WlmU4OzK6IpszOCuEb5pdh4dwpkuoBQTYRuT4SF+XM8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.InteropServices"; + version = "4.1.0"; + hash = "sha256-H9FNiCk+Qrm+15K+Rje+wnQxwUmkVx60x+FWBoGLqD4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding"; + version = "4.0.11"; + hash = "sha256-pyaH3Lcuv/pEM9NSFWlLcljav/Ksnwwk7cjPEH99m1Q="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.0.11"; + hash = "sha256-5yD9kqovaIcqclgIpFVT90UOSQb/Ob0i5Went2/vOTQ="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Tasks"; + version = "4.0.11"; + hash = "sha256-c/8eunlNexFpzZ+GvNF0p1hi5Xo0VPo7LnkhjRO47eM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Timer"; + version = "4.0.1"; + hash = "sha256-OQISKsgxIjJOb43wf/LANJbDiu+0DzP+m8Yr5BPD6ZI="; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Timer"; + version = "4.3.0"; + hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; + }) + (fetchNuGet { + pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; + }) + (fetchNuGet { + pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="; + }) + (fetchNuGet { + pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; + }) + (fetchNuGet { + pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="; + }) + (fetchNuGet { + pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; + }) + (fetchNuGet { + pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="; + }) + (fetchNuGet { + pname = "runtime.linux-x64.Microsoft.NETCore.App"; + version = "2.0.0"; + hash = "sha256-twzpaOxUuJkREqhwC0PocLkpXyDcoPPTDaC90ckE4Yk="; + }) + (fetchNuGet { + pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; + version = "2.0.0"; + hash = "sha256-hXs5zBlHfNy9pW7WyKhHo9UN7HRFMtd+d3cMg/GAzYc="; + }) + (fetchNuGet { + pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; + version = "2.0.0"; + hash = "sha256-GWQcmZBgWcHMziYLdgxL7CS6SRPdeeSirPW51+w8rN8="; + }) + (fetchNuGet { + pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; + version = "2.0.0"; + hash = "sha256-yOukfbFamSrrzwaRo4Yti1M0q8DcVisDUK3Guue6B+E="; + }) + (fetchNuGet { + pname = "runtime.native.System"; + version = "4.0.0"; + hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; + }) + (fetchNuGet { + pname = "runtime.native.System"; + version = "4.3.0"; + hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; + }) + (fetchNuGet { + pname = "runtime.native.System.IO.Compression"; + version = "4.1.0"; + hash = "sha256-085JrZxNEwIHdBWKKKFsh1JzpF0AblvrUsz5T8kH4jQ="; + }) + (fetchNuGet { + pname = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; + }) + (fetchNuGet { + pname = "runtime.native.System.Net.Http"; + version = "4.0.1"; + hash = "sha256-5nWnTQrA1T6t9r8MqIiV4yTNu+IH0of2OX1qteoS+8E="; + }) + (fetchNuGet { + pname = "runtime.native.System.Net.Http"; + version = "4.3.0"; + hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; + }) + (fetchNuGet { + pname = "runtime.native.System.Net.Security"; + version = "4.0.1"; + hash = "sha256-E64W+qCHZGYbhzQOEeToCob/4K8cTg3uOO7ltZG7ZNo="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + hash = "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography"; + version = "4.0.1"; + hash = "sha256-L9UVeEUrdftpUHUhKFjDnAtqNmayCUW1y6o81UwbSVE="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="; + }) + (fetchNuGet { + pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; + }) + (fetchNuGet { + pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="; + }) + (fetchNuGet { + pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; + }) + (fetchNuGet { + pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="; + }) + (fetchNuGet { + pname = "runtime.osx-x64.Microsoft.NETCore.App"; + version = "2.0.0"; + hash = "sha256-ID6EkjtBZiVxcFXL6Q49uk1RtU1EuHr7bONRBy5APv8="; + }) + (fetchNuGet { + pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; + version = "2.0.0"; + hash = "sha256-m1v9uLW9zTjQk1rkurj4b8pxbkspL444vqWaYzbj2tw="; + }) + (fetchNuGet { + pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; + version = "2.0.0"; + hash = "sha256-juHe1IlyvVxBRgnOSpf7Kjzj8vgj1cW/TzXKaGx+EWg="; + }) + (fetchNuGet { + pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; + version = "2.0.0"; + hash = "sha256-Vs3E0CtQQnqZ+aV2opth17TydkfTb4+MsXB1H0Fr4s8="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="; + }) + (fetchNuGet { + pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; + }) + (fetchNuGet { + pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="; + }) + (fetchNuGet { + pname = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.0.1"; + hash = "sha256-w2ilaMbEqeTavUrdEOdRw1a9niwkNwE9/CvSDwhhh8Q="; + }) + (fetchNuGet { + pname = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Console"; + version = "4.0.0"; + hash = "sha256-5v6iE2bDhUx8IyOHpc+nR/2IhzRfCAkEWEB6QSS1JmE="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Console"; + version = "4.3.0"; + hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Console"; + version = "4.3.1"; + hash = "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Diagnostics.Debug"; + version = "4.0.11"; + hash = "sha256-TTzJP6sR0/mDbbU3+ySnt9LVEcPPLfiAzxnfTaJazRY="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; + }) + (fetchNuGet { + pname = "runtime.unix.System.IO.FileSystem"; + version = "4.0.1"; + hash = "sha256-CnI6JdiFHRJZiH6i88UKFOjIwINxDnb8B1HBZZunlgs="; + }) + (fetchNuGet { + pname = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Net.Primitives"; + version = "4.0.11"; + hash = "sha256-6b4QiYG/RX1D0SHRt0Im5jP/mN4iMpGl2XfoBYaHybs="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Net.Sockets"; + version = "4.1.0"; + hash = "sha256-jrD36z3QAlbeGcq2wBQt18pW/qLh5u0VnGKKWguxRW4="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Net.Sockets"; + version = "4.3.0"; + hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Private.Uri"; + version = "4.0.1"; + hash = "sha256-1Q50COfWkU4/y9eBWj0jPDp3qvy19vRCZnDKQthrhUU="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Runtime.Extensions"; + version = "4.1.0"; + hash = "sha256-xB8TkAadhz7gi8Ag3+uYtLdfjtxO8dCLrd/FzU7jLHQ="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; + }) + (fetchNuGet { + pname = "Selenium.Support"; + version = "3.141.0"; + hash = "sha256-K37OzjDaMAGUtMGCQDXS3WGgo15RggUG+jLFg936HL8="; + }) + (fetchNuGet { + pname = "Selenium.WebDriver"; + version = "3.141.0"; + hash = "sha256-uCakUX6ANwIGroysFz6pI2/lpm/y30x77dAfaz784CU="; + }) + (fetchNuGet { + pname = "Serilog"; + version = "2.10.0"; + hash = "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE="; + }) + (fetchNuGet { + pname = "Serilog"; + version = "2.3.0"; + hash = "sha256-vg6NI4K48DeW2oSBqtq3oYg+JITK2QASjdZpBnwIIXg="; + }) + (fetchNuGet { + pname = "Serilog"; + version = "2.8.0"; + hash = "sha256-MBL9AWGV8UthhiHXnqH3EsfIyXnxdLWqAdFa6QvQ2To="; + }) + (fetchNuGet { + pname = "Serilog.Formatting.Compact"; + version = "1.1.0"; + hash = "sha256-nnnKC8AZv/0hp66LqJrx3rfKHslE0ZQfEAvGLIOEePA="; + }) + (fetchNuGet { + pname = "Serilog.Formatting.Compact.Reader"; + version = "1.0.5"; + hash = "sha256-Gb6We7QBNVIZd7bLoKDmaURLF8bvSDar599CmG8/CCc="; + }) + (fetchNuGet { + pname = "Serilog.Sinks.Console"; + version = "4.0.1"; + hash = "sha256-n0LQOEsUg9M/T1aWryiG2690pyGBjHsk6TRZz2aCGyA="; + }) + (fetchNuGet { + pname = "Serilog.Sinks.File"; + version = "5.0.0"; + hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; + }) + (fetchNuGet { + pname = "SharpDX"; + version = "4.0.1"; + hash = "sha256-48y2l4jcZTO5ORurkgoRGWD6TcqM/mKGld5uwGKYG0w="; + }) + (fetchNuGet { + pname = "SharpDX.D3DCompiler"; + version = "4.0.1"; + hash = "sha256-hgN3RCNul8I3JFKhlhpTW8IvWroM/cvA6qneyjg+cAk="; + }) + (fetchNuGet { + pname = "SharpDX.Direct2D1"; + version = "4.0.1"; + hash = "sha256-h43lj7MmDmeiAQ7xnp+G9o7kJZdtmLIMxpVRcz/6OyU="; + }) + (fetchNuGet { + pname = "SharpDX.Direct3D11"; + version = "4.0.1"; + hash = "sha256-4P0jTzi8n+4kkvbcpVJ7qjdVC8PgiGvn3MKJOjuobrA="; + }) + (fetchNuGet { + pname = "SharpDX.DXGI"; + version = "4.0.1"; + hash = "sha256-Fwkw+Ff+J4Ex/vEp6G6QmCE64lCNrJouJ/A/juCoKNU="; + }) + (fetchNuGet { + pname = "SharpDX.Mathematics"; + version = "4.0.1"; + hash = "sha256-w3+0unA5QEP3fjh2RGKH0GnO+GT5PScRy/5Yj7GCsaI="; + }) + (fetchNuGet { + pname = "SharpZipLib"; + version = "1.3.3"; + hash = "sha256-HWEQTKh9Ktwg/zIl079dAiH+ob2ShWFAqLgG6XgIMr4="; + }) + (fetchNuGet { + pname = "Silk.NET.Core"; + version = "2.16.0"; + hash = "sha256-E/QTCNV+2s6X22HWZlRXVw3YpTxb+Oz8rXZuFpVgeNY="; + }) + (fetchNuGet { + pname = "Silk.NET.Vulkan"; + version = "2.16.0"; + hash = "sha256-nouPkjBmdt0ZyWBYBVZ1LHd3gBTlU8C4wbeod3av5Wk="; + }) + (fetchNuGet { + pname = "Silk.NET.Vulkan.Extensions.EXT"; + version = "2.16.0"; + hash = "sha256-brvWqisI0WwE7qRhLeRdWXDedztX4lOFon4h6oxDIRU="; + }) + (fetchNuGet { + pname = "Silk.NET.Vulkan.Extensions.KHR"; + version = "2.16.0"; + hash = "sha256-QU7xVauLOBAF6TDo8mcuRsA2sZWyVLqFq1M+Oc/WnMg="; + }) + (fetchNuGet { + pname = "SixLabors.ImageSharp"; + version = "2.1.3"; + hash = "sha256-6f6WuuRdT7Lzbt80o9WC/B1R/DH5eYQR3yFtsU8GC4s="; + }) + (fetchNuGet { + pname = "SkiaSharp"; + version = "2.88.7"; + hash = "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="; + }) + (fetchNuGet { + pname = "SkiaSharp.NativeAssets.Linux"; + version = "2.88.7"; + hash = "sha256-QdQRN1IBjqohmI8U+6WJRPgOsh8a9soN2UvVObs1H1w="; + }) + (fetchNuGet { + pname = "SkiaSharp.NativeAssets.macOS"; + version = "2.88.7"; + hash = "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="; + }) + (fetchNuGet { + pname = "SkiaSharp.NativeAssets.WebAssembly"; + version = "2.88.7"; + hash = "sha256-oIjFF+Rv+g8AKyNaaVAgnHX3eeP/l8K2sgHs9bRyUMw="; + }) + (fetchNuGet { + pname = "SkiaSharp.NativeAssets.Win32"; + version = "2.88.7"; + hash = "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="; + }) + (fetchNuGet { + pname = "SourceLink"; + version = "1.1.0"; + hash = "sha256-/nt/6j6K//5S07aWxvt05Owa20oTBKuEZoHDgjxeRF4="; + }) + (fetchNuGet { + pname = "Splat"; + version = "14.4.1"; + hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; + }) + (fetchNuGet { + pname = "Splat"; + version = "14.5.1"; + hash = "sha256-qv/N4VN3MtCW3t/OJ77NGUMfPON2kHIq5BtrMTQLRUQ="; + }) + (fetchNuGet { + pname = "System.AppContext"; + version = "4.1.0"; + hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; + }) + (fetchNuGet { + pname = "System.AppContext"; + version = "4.3.0"; + hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.0.0"; + hash = "sha256-+YUymoyS0O+xVyF2+LiAdZlMww8nofPN4ja9ylYqRo8="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.3.0"; + hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.4.0"; + hash = "sha256-KTxAhYawFG2V5VX1jw3pzx3IrQXRgn1TsvgjPgxAbqA="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.5.0"; + hash = "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.5.1"; + hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; + }) + (fetchNuGet { + pname = "System.CodeDom"; + version = "4.4.0"; + hash = "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0="; + }) + (fetchNuGet { + pname = "System.CodeDom"; + version = "6.0.0"; + hash = "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="; + }) + (fetchNuGet { + pname = "System.Collections"; + version = "4.0.11"; + hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; + }) + (fetchNuGet { + pname = "System.Collections"; + version = "4.3.0"; + hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; + }) + (fetchNuGet { + pname = "System.Collections.Concurrent"; + version = "4.0.12"; + hash = "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8="; + }) + (fetchNuGet { + pname = "System.Collections.Concurrent"; + version = "4.3.0"; + hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "1.2.0"; + hash = "sha256-FQ3l+ulbLSPhQ0JcQCC4D4SzjTnHsRqcOj56Ywy7pMo="; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "1.5.0"; + hash = "sha256-BliqYlL9ntbMXo5d7NUrKXwYN+PqdyqDIS5bp4qVr7Q="; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "1.7.1"; + hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "5.0.0"; + hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "6.0.0"; + hash = "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="; + }) + (fetchNuGet { + pname = "System.Collections.NonGeneric"; + version = "4.0.1"; + hash = "sha256-jdCVXmGOsJ+2F0xAagCkiMZ91SGAm9iOhO2u4ksmKaU="; + }) + (fetchNuGet { + pname = "System.Collections.NonGeneric"; + version = "4.3.0"; + hash = "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="; + }) + (fetchNuGet { + pname = "System.Collections.Specialized"; + version = "4.0.1"; + hash = "sha256-qao6hk9XKdRtpsqdks2uOx5jqT41KpuTCb1cg4w/e/E="; + }) + (fetchNuGet { + pname = "System.Collections.Specialized"; + version = "4.3.0"; + hash = "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="; + }) + (fetchNuGet { + pname = "System.ComponentModel"; + version = "4.0.1"; + hash = "sha256-X5T36S49q1odsn6wAET6EGNlsxOyd66naMr5T3G9mGw="; + }) + (fetchNuGet { + pname = "System.ComponentModel"; + version = "4.3.0"; + hash = "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="; + }) + (fetchNuGet { + pname = "System.ComponentModel.Annotations"; + version = "4.1.0"; + hash = "sha256-jhvr6zS+iC4OXBkdXr+S8rPy/5nfhZtDVVJiAc0f1VA="; + }) + (fetchNuGet { + pname = "System.ComponentModel.Annotations"; + version = "4.5.0"; + hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; + }) + (fetchNuGet { + pname = "System.ComponentModel.EventBasedAsync"; + version = "4.0.11"; + hash = "sha256-kAOQ9dEg+yDh5h56qSf36OTLJYRIcKftIcOqxfuJJR8="; + }) + (fetchNuGet { + pname = "System.ComponentModel.Primitives"; + version = "4.1.0"; + hash = "sha256-AIcFeZDeYbaI4V9lY8TtUG+xkUyhA8K8dYSDp5StZXE="; + }) + (fetchNuGet { + pname = "System.ComponentModel.Primitives"; + version = "4.3.0"; + hash = "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="; + }) + (fetchNuGet { + pname = "System.ComponentModel.TypeConverter"; + version = "4.1.0"; + hash = "sha256-HmzGTU2NVj8qUn1xCGxifOQ/e/HZCVvgIECzcJPaDJ0="; + }) + (fetchNuGet { + pname = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + hash = "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="; + }) + (fetchNuGet { + pname = "System.Composition"; + version = "1.0.31"; + hash = "sha256-wcQEG6MCRa1S03s3Yb3E3tfsIBZid99M7WDhcb48Qik="; + }) + (fetchNuGet { + pname = "System.Composition.AttributedModel"; + version = "1.0.31"; + hash = "sha256-u+XnXfj6LQ3OXwrb9KqHRW4a/a9yHzLrJOXwDQ1a/sY="; + }) + (fetchNuGet { + pname = "System.Composition.Convention"; + version = "1.0.31"; + hash = "sha256-GQWo1YDyQ3r2OMcKW+GbR3BbZNIAdwK79XAfinNj+AE="; + }) + (fetchNuGet { + pname = "System.Composition.Hosting"; + version = "1.0.31"; + hash = "sha256-fg9BIY+zWtiEBIJefYP2lKHDYa4r/vtPTr3ZI8e0K7g="; + }) + (fetchNuGet { + pname = "System.Composition.Runtime"; + version = "1.0.31"; + hash = "sha256-mqfxjAnVyE1YCgXMOcV34IWhYFnvXVKjMo9Y/d3yDuo="; + }) + (fetchNuGet { + pname = "System.Composition.TypedParts"; + version = "1.0.31"; + hash = "sha256-w9ApcUJr7jYP4Vf5+efIIqoWmr5v9R56W4uC0n8KktQ="; + }) + (fetchNuGet { + pname = "System.Console"; + version = "4.0.0"; + hash = "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo="; + }) + (fetchNuGet { + pname = "System.Console"; + version = "4.3.0"; + hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Contracts"; + version = "4.3.0"; + hash = "sha256-K74oyUn0Vriv3mwrbZwQFQ6EA0M7Hm9YlcWLRjLjqr8="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Debug"; + version = "4.0.11"; + hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "4.0.0"; + hash = "sha256-dYh9UoFesuGcHY+ewsI+z2WnNy+bwHPsHQ3t85cbzNg="; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "5.0.0"; + hash = "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4="; + }) + (fetchNuGet { + pname = "System.Diagnostics.EventLog"; + version = "4.7.0"; + hash = "sha256-J9lDMYQxpX9gEAEYKML+PyLh7rgMDZIgxA2yi/Ti+IY="; + }) + (fetchNuGet { + pname = "System.Diagnostics.EventLog"; + version = "6.0.0"; + hash = "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="; + }) + (fetchNuGet { + pname = "System.Diagnostics.FileVersionInfo"; + version = "4.0.0"; + hash = "sha256-Yy94jPhDXF2QHOF7qTmqKkn1048K9xkKryuBeDzsu+g="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Process"; + version = "4.1.0"; + hash = "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg="; + }) + (fetchNuGet { + pname = "System.Diagnostics.StackTrace"; + version = "4.0.1"; + hash = "sha256-gqqCAwpDsca242nli+fejgqwPAuwROv3NoNeOnFXSWA="; + }) + (fetchNuGet { + pname = "System.Diagnostics.TextWriterTraceListener"; + version = "4.0.0"; + hash = "sha256-GmInHGlq5ZTnT7qsxpKnXid11hcRXVBhA1N1zyePL/Y="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tools"; + version = "4.0.1"; + hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tools"; + version = "4.3.0"; + hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; + }) + (fetchNuGet { + pname = "System.Diagnostics.TraceSource"; + version = "4.0.0"; + hash = "sha256-cCjdPU7ow91HGf1hBIOLJMQGO6pNmF+N+5/Z38XJh9U="; + }) + (fetchNuGet { + pname = "System.Diagnostics.TraceSource"; + version = "4.3.0"; + hash = "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tracing"; + version = "4.1.0"; + hash = "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tracing"; + version = "4.3.0"; + hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; + }) + (fetchNuGet { + pname = "System.Drawing.Common"; + version = "4.5.1"; + hash = "sha256-HeA6mO7jTWhLetbe5dwXj7qqcWiXws/aQf8BfJWqovU="; + }) + (fetchNuGet { + pname = "System.Drawing.Common"; + version = "4.7.0"; + hash = "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk="; + }) + (fetchNuGet { + pname = "System.Drawing.Common"; + version = "6.0.0"; + hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; + }) + (fetchNuGet { + pname = "System.Dynamic.Runtime"; + version = "4.0.11"; + hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; + }) + (fetchNuGet { + pname = "System.Dynamic.Runtime"; + version = "4.3.0"; + hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; + }) + (fetchNuGet { + pname = "System.Formats.Asn1"; + version = "5.0.0"; + hash = "sha256-9nL3dN4w/dZ49W1pCkTjRqZm6Dh0mMVExNungcBHrKs="; + }) + (fetchNuGet { + pname = "System.Globalization"; + version = "4.0.11"; + hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; + }) + (fetchNuGet { + pname = "System.Globalization"; + version = "4.3.0"; + hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; + }) + (fetchNuGet { + pname = "System.Globalization.Calendars"; + version = "4.0.1"; + hash = "sha256-EJN3LbN+b0O9Dr2eg7kfThCYpne0iJ/H/GIyUTNVYC8="; + }) + (fetchNuGet { + pname = "System.Globalization.Calendars"; + version = "4.3.0"; + hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; + }) + (fetchNuGet { + pname = "System.Globalization.Extensions"; + version = "4.0.1"; + hash = "sha256-zLtkPryJwqTGcJqMC6zoMMvMrT+aAL5GoumjmMtqUEI="; + }) + (fetchNuGet { + pname = "System.Globalization.Extensions"; + version = "4.3.0"; + hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; + }) + (fetchNuGet { + pname = "System.IO"; + version = "4.1.0"; + hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; + }) + (fetchNuGet { + pname = "System.IO"; + version = "4.3.0"; + hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; + }) + (fetchNuGet { + pname = "System.IO.Compression"; + version = "4.1.0"; + hash = "sha256-UT4KEfJNZOk7b4X0AqLFUsqfHu6myVH/BhbRKYc+1Uc="; + }) + (fetchNuGet { + pname = "System.IO.Compression"; + version = "4.3.0"; + hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; + }) + (fetchNuGet { + pname = "System.IO.Compression.ZipFile"; + version = "4.0.1"; + hash = "sha256-An0Twb9JODl/nuVm6MR0kJ3aj4WxGpI/1/vVp5b94kA="; + }) + (fetchNuGet { + pname = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem"; + version = "4.0.1"; + hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem"; + version = "4.3.0"; + hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.Watcher"; + version = "4.0.0"; + hash = "sha256-OcLhbiHvn453sJsZBHe6RmtDlCaaarcqRB439HGU7mU="; + }) + (fetchNuGet { + pname = "System.IO.MemoryMappedFiles"; + version = "4.0.0"; + hash = "sha256-1VQa8FoMUNAsja31OvOn7ungif+IPusAe9YcR+kRF6o="; + }) + (fetchNuGet { + pname = "System.IO.Pipelines"; + version = "6.0.0"; + hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; + }) + (fetchNuGet { + pname = "System.IO.Pipelines"; + version = "7.0.0"; + hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; + }) + (fetchNuGet { + pname = "System.IO.UnmanagedMemoryStream"; + version = "4.0.1"; + hash = "sha256-Sx60QjHjvXQMAL7O4aN81321gu13LE0XzCRtt7hFTwQ="; + }) + (fetchNuGet { + pname = "System.IO.UnmanagedMemoryStream"; + version = "4.3.0"; + hash = "sha256-PmUcbYTfYKTeqf2PZU+ePmdS8ekXlc4Z3eUoRV3wdos="; + }) + (fetchNuGet { + pname = "System.Linq"; + version = "4.1.0"; + hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; + }) + (fetchNuGet { + pname = "System.Linq"; + version = "4.3.0"; + hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; + }) + (fetchNuGet { + pname = "System.Linq.Expressions"; + version = "4.1.0"; + hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; + }) + (fetchNuGet { + pname = "System.Linq.Expressions"; + version = "4.1.1"; + hash = "sha256-nwRmq03bvyYhohaDJtCYj4Z6hHsp0AlhjFJzuw7fsdk="; + }) + (fetchNuGet { + pname = "System.Linq.Expressions"; + version = "4.3.0"; + hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; + }) + (fetchNuGet { + pname = "System.Linq.Parallel"; + version = "4.0.1"; + hash = "sha256-TV1F3KYFipPmPnWFjX6hOZQNFsG2m729EdgPSFzqY0Q="; + }) + (fetchNuGet { + pname = "System.Linq.Queryable"; + version = "4.0.1"; + hash = "sha256-XOFRO+lyoxsWtIUJfg5JCqv9Gx35ASOc94WIR8ZMVoY="; + }) + (fetchNuGet { + pname = "System.Management"; + version = "6.0.0"; + hash = "sha256-uZEf0a+9a2dqmzJS1Qxm3TR5ZxBHfeBLNO+q6ct5QWU="; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.0"; + hash = "sha256-YOz1pCR4RpP1ywYoJsgXnVlzsWtC2uYKQJTg0NnFXtE="; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.1"; + hash = "sha256-7JhQNSvE6JigM1qmmhzOX3NiZ6ek82R4whQNb+FpBzg="; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.3"; + hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.4"; + hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.5"; + hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; + }) + (fetchNuGet { + pname = "System.Net.Http"; + version = "4.1.0"; + hash = "sha256-y6PnGuObJvOkhl9CXNFJQcV3SXuEz5yRLOCxGGTEucQ="; + }) + (fetchNuGet { + pname = "System.Net.Http"; + version = "4.1.2"; + hash = "sha256-XNkhjL7kmPTX52tjcpZq2ubccBAG43RdBnBJfopJ4XI="; + }) + (fetchNuGet { + pname = "System.Net.Http"; + version = "4.3.0"; + hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; + }) + (fetchNuGet { + pname = "System.Net.Http"; + version = "4.3.4"; + hash = "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="; + }) + (fetchNuGet { + pname = "System.Net.NameResolution"; + version = "4.0.0"; + hash = "sha256-EAO67qEDqrtxEa+J3xccA5/lgCJ0PiRU9DYZsO++QzY="; + }) + (fetchNuGet { + pname = "System.Net.NameResolution"; + version = "4.3.0"; + hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; + }) + (fetchNuGet { + pname = "System.Net.Primitives"; + version = "4.0.11"; + hash = "sha256-2YSijNhCdw/ZU2yfH7vE+ReA8pgxRCXPnWr+ab36v4M="; + }) + (fetchNuGet { + pname = "System.Net.Primitives"; + version = "4.3.0"; + hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; + }) + (fetchNuGet { + pname = "System.Net.Requests"; + version = "4.0.11"; + hash = "sha256-MLXxaUhHQC3pId/6r4q0EF37CIExt0+4Na8ZpUtRs44="; + }) + (fetchNuGet { + pname = "System.Net.Security"; + version = "4.0.1"; + hash = "sha256-mCSeMKW/KJC+dJdkBOc+TW2RfpsMTsGHGnMsWXRVH+k="; + }) + (fetchNuGet { + pname = "System.Net.Sockets"; + version = "4.1.0"; + hash = "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0="; + }) + (fetchNuGet { + pname = "System.Net.Sockets"; + version = "4.3.0"; + hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; + }) + (fetchNuGet { + pname = "System.Net.WebHeaderCollection"; + version = "4.0.1"; + hash = "sha256-uJSV6kmL+V/9/ot1LhHXGCd8Ndcu6zk+AJ8wgGS/fYE="; + }) + (fetchNuGet { + pname = "System.Numerics.Vectors"; + version = "4.1.1"; + hash = "sha256-Kv4FrStml5+X7hGDCLhJJaIwJDvdJdYMBfcCcOjNf/Y="; + }) + (fetchNuGet { + pname = "System.Numerics.Vectors"; + version = "4.4.0"; + hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; + }) + (fetchNuGet { + pname = "System.Numerics.Vectors"; + version = "4.5.0"; + hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; + }) + (fetchNuGet { + pname = "System.ObjectModel"; + version = "4.0.12"; + hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; + }) + (fetchNuGet { + pname = "System.ObjectModel"; + version = "4.3.0"; + hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; + }) + (fetchNuGet { + pname = "System.Private.DataContractSerialization"; + version = "4.1.1"; + hash = "sha256-OaE+ZcEfkpIkbdMOMAMiJa9vgiVP25FGuFrf+N/mafY="; + }) + (fetchNuGet { + pname = "System.Private.DataContractSerialization"; + version = "4.3.0"; + hash = "sha256-vNlHUKkaFvhiVnTY0JNsNT5E6TW9CFRzTqVcufGN0hk="; + }) + (fetchNuGet { + pname = "System.Private.Uri"; + version = "4.0.1"; + hash = "sha256-MjVaZHx8DUFnVUxOEEaU9GxF6EyEXbcuI1V7yRXEp0w="; + }) + (fetchNuGet { + pname = "System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; + }) + (fetchNuGet { + pname = "System.Private.Uri"; + version = "4.3.2"; + hash = "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU="; + }) + (fetchNuGet { + pname = "System.Reactive"; + version = "5.0.0"; + hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.1.0"; + hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.3.0"; + hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; + }) + (fetchNuGet { + pname = "System.Reflection.DispatchProxy"; + version = "4.0.1"; + hash = "sha256-GdjA81UywW1yeAyNi+MR5agmOXl859GrWwiOui2jT9U="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit"; + version = "4.0.1"; + hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit"; + version = "4.3.0"; + hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit"; + version = "4.7.0"; + hash = "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.ILGeneration"; + version = "4.7.0"; + hash = "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; + }) + (fetchNuGet { + pname = "System.Reflection.Extensions"; + version = "4.0.1"; + hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; + }) + (fetchNuGet { + pname = "System.Reflection.Extensions"; + version = "4.3.0"; + hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; + }) + (fetchNuGet { + pname = "System.Reflection.Metadata"; + version = "1.3.0"; + hash = "sha256-a/RQr++mSsziWaOTknicfIQX/zJrwPFExfhK6PM0tfg="; + }) + (fetchNuGet { + pname = "System.Reflection.Metadata"; + version = "1.6.0"; + hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; + }) + (fetchNuGet { + pname = "System.Reflection.Metadata"; + version = "5.0.0"; + hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.0.1"; + hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; + }) + (fetchNuGet { + pname = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; + }) + (fetchNuGet { + pname = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; + }) + (fetchNuGet { + pname = "System.Resources.Extensions"; + version = "4.6.0"; + hash = "sha256-ErAPQRTkjRsica+h1mAFxMZbE4RrR9nH0/VB9mSCzEY="; + }) + (fetchNuGet { + pname = "System.Resources.Reader"; + version = "4.0.0"; + hash = "sha256-NOax26EYc/L4bfedL2a33fg4sFXVkBwzVTQ41saJTsk="; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.0.1"; + hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.1.0"; + hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.3.0"; + hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.0"; + hash = "sha256-g9jIdQtXSAhY+ezQtYNgHEUoQR3HzznHs3JMzD9bip4="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.2"; + hash = "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.3"; + hash = "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "4.6.0"; + hash = "sha256-FTjQeMuvqnKxpoVsVh/OlQ21NMaZiFtOdv7VdZ+Iv3Y="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "4.7.1"; + hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "5.0.0"; + hash = "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "6.0.0"; + hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.1.0"; + hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.0.1"; + hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices"; + version = "4.1.0"; + hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + hash = "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices.WindowsRuntime"; + version = "4.3.0"; + hash = "sha256-6b51jL+5CO5iMqXun95mPXsCvbko0uTL9VlU7EPy+i4="; + }) + (fetchNuGet { + pname = "System.Runtime.Loader"; + version = "4.0.0"; + hash = "sha256-gE5/ehU3Qq5phhSxGuPmSv1DFVQeiyl1/+YyrO+I7lI="; + }) + (fetchNuGet { + pname = "System.Runtime.Numerics"; + version = "4.0.1"; + hash = "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg="; + }) + (fetchNuGet { + pname = "System.Runtime.Numerics"; + version = "4.3.0"; + hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; + }) + (fetchNuGet { + pname = "System.Runtime.Serialization.Formatters"; + version = "4.3.0"; + hash = "sha256-Feic7MGKVG4imh7kpLkPHmApQzYjq7SxHnazh2wZkoQ="; + }) + (fetchNuGet { + pname = "System.Runtime.Serialization.Json"; + version = "4.0.2"; + hash = "sha256-thmzgYbyxoPYtkDdDwoG7wnVuVhFNwLUE2AsDfRf1yM="; + }) + (fetchNuGet { + pname = "System.Runtime.Serialization.Json"; + version = "4.3.0"; + hash = "sha256-ivxJeBn0LjrKDZ2fFXwU1Z3Fd6GL0dqkvbpqcDJ86OI="; + }) + (fetchNuGet { + pname = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; + }) + (fetchNuGet { + pname = "System.Runtime.Serialization.Primitives"; + version = "4.3.0"; + hash = "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc="; + }) + (fetchNuGet { + pname = "System.Security.AccessControl"; + version = "4.7.0"; + hash = "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="; + }) + (fetchNuGet { + pname = "System.Security.AccessControl"; + version = "6.0.0"; + hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; + }) + (fetchNuGet { + pname = "System.Security.Claims"; + version = "4.0.1"; + hash = "sha256-xqI0HHahNAd9g3jqgnLKH4P/pIueef6cy3qvRDQFvA0="; + }) + (fetchNuGet { + pname = "System.Security.Claims"; + version = "4.3.0"; + hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + hash = "sha256-BelNIpEyToEp/VYKnje/q1P7KNEpQNtOzGPU18pLGpE="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + hash = "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "4.7.0"; + hash = "sha256-MvVSJhAojDIvrpuyFmcSVRSZPl3dRYOI9hSptbA+6QA="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "5.0.0"; + hash = "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + hash = "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + hash = "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + hash = "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Pkcs"; + version = "4.7.0"; + hash = "sha256-lZMmOxtg5d7Oyoof8p6awVALUsYQstc2mBNNrQr9m9c="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Pkcs"; + version = "5.0.0"; + hash = "sha256-kq/tvYQSa24mKSvikFK2fKUAnexSL4PO4LkPppqtYkE="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + hash = "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.ProtectedData"; + version = "4.4.0"; + hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + hash = "sha256-sBUUhJP+yYDXvcjNMKqNpn8yzGUpVABwK9vVUvYKjzI="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Xml"; + version = "4.7.0"; + hash = "sha256-67k24CjNisMJUtnyWb08V/t7mBns+pxLyNhBG5YXiCE="; + }) + (fetchNuGet { + pname = "System.Security.Permissions"; + version = "4.7.0"; + hash = "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40="; + }) + (fetchNuGet { + pname = "System.Security.Permissions"; + version = "6.0.0"; + hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; + }) + (fetchNuGet { + pname = "System.Security.Principal"; + version = "4.0.1"; + hash = "sha256-9wBgPnJfFOtrhKZ7wDXZ4q12GklQ49Ka02/9v7Frf9k="; + }) + (fetchNuGet { + pname = "System.Security.Principal"; + version = "4.3.0"; + hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; + }) + (fetchNuGet { + pname = "System.Security.Principal.Windows"; + version = "4.0.0"; + hash = "sha256-38wEUCB889Mpm4WgRFEQBB+4HtE0X0wu+knrDyJie7Q="; + }) + (fetchNuGet { + pname = "System.Security.Principal.Windows"; + version = "4.3.0"; + hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; + }) + (fetchNuGet { + pname = "System.Security.Principal.Windows"; + version = "4.7.0"; + hash = "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="; + }) + (fetchNuGet { + pname = "System.Security.SecureString"; + version = "4.3.0"; + hash = "sha256-zOEezcgkfTHrEGivQa7dofISz81y6M7uYqj1evhy17c="; + }) + (fetchNuGet { + pname = "System.Text.Encoding"; + version = "4.0.11"; + hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; + }) + (fetchNuGet { + pname = "System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "4.0.1"; + hash = "sha256-wxtwWQSTv5tuFP79KhUAhaL6bL4d8lSzSWkCn9aolwM="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "4.5.0"; + hash = "sha256-Q+7R7EVSOtsXIzKjjfCnvfNul6AE1NxzJZirG0JCo6c="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "4.5.1"; + hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "5.0.0"; + hash = "sha256-YJ5jJqkVPp+6fEzSXOmw1sNSdygB5Rx7TJ0TrNS/wq4="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "6.0.0"; + hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; + }) + (fetchNuGet { + pname = "System.Text.Encodings.Web"; + version = "6.0.0"; + hash = "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="; + }) + (fetchNuGet { + pname = "System.Text.Json"; + version = "4.7.0"; + hash = "sha256-ubmcBH9pNdILnROdpGfnfo90WijLE6bUbKUypn3u4zo="; + }) + (fetchNuGet { + pname = "System.Text.Json"; + version = "6.0.0"; + hash = "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="; + }) + (fetchNuGet { + pname = "System.Text.RegularExpressions"; + version = "4.1.0"; + hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; + }) + (fetchNuGet { + pname = "System.Text.RegularExpressions"; + version = "4.3.0"; + hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.0.11"; + hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.3.0"; + hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; + }) + (fetchNuGet { + pname = "System.Threading.Channels"; + version = "6.0.0"; + hash = "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="; + }) + (fetchNuGet { + pname = "System.Threading.Overlapped"; + version = "4.0.1"; + hash = "sha256-CAWZlavcuBQHs+kaSX9CmkpHF7wC8rFrug3XPb5KJzo="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.0.11"; + hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Dataflow"; + version = "4.6.0"; + hash = "sha256-YYrT3GRzVBdendxt8FUDCnOBJi0nw/CJ9VrzcPJWLSg="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Dataflow"; + version = "4.9.0"; + hash = "sha256-ZTZBJTrP5kzO38ec9lPxuNUYgEoeGNdQ8hF98uRN2rw="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.5.0"; + hash = "sha256-SIdUoXOGGSmBGXLWW76fz0OEoFYDJ8ZoU/xFdVibtxY="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.5.2"; + hash = "sha256-EqJF9TppMHTKvpR6emrdA61zalMW3HwrZ7j6Bn4bBuo="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.5.4"; + hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Parallel"; + version = "4.0.1"; + hash = "sha256-5VyRZ97Fug4reK/cQ6wsCrJ5jH53aGu1a4ZkKMZrnIQ="; + }) + (fetchNuGet { + pname = "System.Threading.Thread"; + version = "4.0.0"; + hash = "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8="; + }) + (fetchNuGet { + pname = "System.Threading.Thread"; + version = "4.3.0"; + hash = "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg="; + }) + (fetchNuGet { + pname = "System.Threading.ThreadPool"; + version = "4.0.10"; + hash = "sha256-/fowWjM/0ZZFC1Rwu0i5N71iRxV2JOd3jQV2Jn0wuTk="; + }) + (fetchNuGet { + pname = "System.Threading.ThreadPool"; + version = "4.3.0"; + hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; + }) + (fetchNuGet { + pname = "System.Threading.Timer"; + version = "4.0.1"; + hash = "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY="; + }) + (fetchNuGet { + pname = "System.Threading.Timer"; + version = "4.3.0"; + hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; + }) + (fetchNuGet { + pname = "System.ValueTuple"; + version = "4.5.0"; + hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; + }) + (fetchNuGet { + pname = "System.Windows.Extensions"; + version = "4.7.0"; + hash = "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="; + }) + (fetchNuGet { + pname = "System.Windows.Extensions"; + version = "6.0.0"; + hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; + }) + (fetchNuGet { + pname = "System.Xml.ReaderWriter"; + version = "4.0.11"; + hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; + }) + (fetchNuGet { + pname = "System.Xml.ReaderWriter"; + version = "4.3.0"; + hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; + }) + (fetchNuGet { + pname = "System.Xml.XDocument"; + version = "4.0.11"; + hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; + }) + (fetchNuGet { + pname = "System.Xml.XDocument"; + version = "4.3.0"; + hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; + }) + (fetchNuGet { + pname = "System.Xml.XmlDocument"; + version = "4.0.1"; + hash = "sha256-gdoFrPo54v1LjkBF79f8EvtltVVjHz9ZI9kc5ve0GkY="; + }) + (fetchNuGet { + pname = "System.Xml.XmlDocument"; + version = "4.3.0"; + hash = "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="; + }) + (fetchNuGet { + pname = "System.Xml.XmlSerializer"; + version = "4.0.11"; + hash = "sha256-v6x4d6W18dijG5cDqQmVHdtWRf6Y4OkdBolT3d5g3wY="; + }) + (fetchNuGet { + pname = "System.Xml.XmlSerializer"; + version = "4.3.0"; + hash = "sha256-IqTGPENWYoI06x2NHFPVtHlLEq9tazbom32bFLom6h4="; + }) + (fetchNuGet { + pname = "System.Xml.XPath"; + version = "4.0.1"; + hash = "sha256-lQCoK2M51SGRuGjfiuIW26Y2goABY2RLE6cZ4816WDo="; + }) + (fetchNuGet { + pname = "System.Xml.XPath.XDocument"; + version = "4.0.1"; + hash = "sha256-H/zyMMB1YB8vd+StYJr99KLqWmSHhaP7RHDLRcFhzbo="; + }) + (fetchNuGet { + pname = "System.Xml.XPath.XmlDocument"; + version = "4.0.1"; + hash = "sha256-bK9AfAYrdSipdRbmo8Rk7394ku92UFNe2TEQF5+k/lA="; + }) + (fetchNuGet { + pname = "Tmds.DBus.Protocol"; + version = "0.15.0"; + hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; + }) + (fetchNuGet { + pname = "Tmds.DBus.SourceGenerator"; + version = "0.0.13"; + hash = "sha256-ZZ2xGS7FK9FChLH4cnaradlOe7psN31rBy7t6nhzFHA="; + }) + (fetchNuGet { + pname = "Validation"; + version = "2.4.18"; + hash = "sha256-ByITVSjsqVglWPIRaZ3i1P3bHh8+OB6BWgDA8f8qTFI="; + }) + (fetchNuGet { + pname = "xunit"; + version = "2.4.2"; + hash = "sha256-tePXTtlRgTAhfnUzc13Y9MwowU/cKttl1qlzHLqhWS0="; + }) + (fetchNuGet { + pname = "xunit.abstractions"; + version = "2.0.2"; + hash = "sha256-w5APCW7suBdoDOmQqm/8Gq6+Sk88JcTR09zjmj9s17E="; + }) + (fetchNuGet { + pname = "xunit.abstractions"; + version = "2.0.3"; + hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; + }) + (fetchNuGet { + pname = "xunit.analyzers"; + version = "1.0.0"; + hash = "sha256-hZEaTaJN0bWw9q8tha5RziGlZ/lkDrj2S+QLQxgRjlw="; + }) + (fetchNuGet { + pname = "xunit.assert"; + version = "2.4.2"; + hash = "sha256-wMyRXZzDn9Se4c0Pzzn0U4YuKRiUtu6o4MoPjJPPzUU="; + }) + (fetchNuGet { + pname = "xunit.core"; + version = "2.4.0"; + hash = "sha256-dt59aoFjpqlbcPFGwPrzOSEBSPIn33tLcLraK8xEntE="; + }) + (fetchNuGet { + pname = "xunit.core"; + version = "2.4.2"; + hash = "sha256-jRFoW8LSuqDINuJlno3xT3VfdkHFVEbDKctU/mISIMc="; + }) + (fetchNuGet { + pname = "xunit.extensibility.core"; + version = "2.4.0"; + hash = "sha256-LbuXEcEJjGn3L6FCbC119+MY/QLvfLlGkCeAsCsZqGE="; + }) + (fetchNuGet { + pname = "xunit.extensibility.core"; + version = "2.4.2"; + hash = "sha256-wlTMUOQg5NaAPEsWkNSr8QSPbbCNSicpFajp1rowCsA="; + }) + (fetchNuGet { + pname = "xunit.extensibility.execution"; + version = "2.4.0"; + hash = "sha256-chRJEazwq93yhVONlbtTI1znqYy0gdAoQajPRnhM/i4="; + }) + (fetchNuGet { + pname = "xunit.extensibility.execution"; + version = "2.4.2"; + hash = "sha256-l5Q60IBYWE5tYJCdFEEQnO5rIlXcNEM5S4Ut8vFnL2U="; + }) + (fetchNuGet { + pname = "Xunit.Extensions.Ordering"; + version = "1.4.5"; + hash = "sha256-Yd3j5PWDOWnMqyCTZLQaGd/9i5fDi31+ZVe/kDTXq6I="; + }) + (fetchNuGet { + pname = "xunit.runner.console"; + version = "2.4.2"; + hash = "sha256-oIMjDcBeyaYeRVkO4m/t/dYjgXzfZLU3QOxGbD1LOEY="; + }) + (fetchNuGet { + pname = "xunit.runner.visualstudio"; + version = "2.4.5"; + hash = "sha256-Gv7U1VPKfNb7IOWrwUGUKAeurKtE3AtQmegDFNkYHHk="; + }) + (fetchNuGet { + pname = "Xunit.SkippableFact"; + version = "1.4.13"; + hash = "sha256-pLtx0/2oTKYO1Y1Vg3k/Eli2OWHT5uorGdBp2uXvFfw="; + }) + (fetchNuGet { + pname = "YamlDotNet"; + version = "11.2.1"; + hash = "sha256-JDZpwLU4eMChIFupL4LJc1OwADU1HIqx1/Fje9I8jSk="; + }) +] diff --git a/pkgs/by-name/av/avalonia/npm-deps.nix b/pkgs/by-name/av/avalonia/npm-deps.nix new file mode 100644 index 0000000000000..0fe6baaaf6647 --- /dev/null +++ b/pkgs/by-name/av/avalonia/npm-deps.nix @@ -0,0 +1,14 @@ +[ + { + path = "src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp"; + hash = "sha256-gncHW5SMtAUMtvHGZ2nUc0KEjxX24DZkAnmeHgo1Roc="; + } + { + path = "tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp"; + hash = "sha256-MiznlOJ+hIO1cUswy9oGNHP6MWfx+FDLKVT8qcmg8vo="; + } + { + path = "src/Browser/Avalonia.Browser/webapp"; + hash = "sha256-LTQzT4ycLyGQs9T0sa2k/0wfG1GWCdeH9Wx2KeecOyU="; + } +] diff --git a/pkgs/by-name/av/avalonia/nuget-packages.json b/pkgs/by-name/av/avalonia/nuget-packages.json new file mode 100644 index 0000000000000..865b99bd6ad07 --- /dev/null +++ b/pkgs/by-name/av/avalonia/nuget-packages.json @@ -0,0 +1,996 @@ +[ + { + "id": "Avalonia", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": ".NETFramework,Version=v4.6.1", + "packages": [ + { + "id": "Avalonia.Remote.Protocol", + "version": "11.0.11" + }, + { + "id": "Microsoft.Bcl.AsyncInterfaces", + "version": "6.0.0" + }, + { + "id": "System.ComponentModel.Annotations", + "version": "4.5.0" + }, + { + "id": "System.Memory", + "version": "4.5.3" + }, + { + "id": "System.Runtime.CompilerServices.Unsafe", + "version": "4.6.0" + }, + { + "id": "System.Threading.Tasks.Extensions", + "version": "4.5.4" + }, + { + "id": "System.ValueTuple", + "version": "4.5.0" + }, + { + "id": "MicroCom.Runtime", + "version": "0.11.0" + } + ] + }, + { + "framework": ".NETCoreApp,Version=v2.0", + "packages": [ + { + "id": "Avalonia.Remote.Protocol", + "version": "11.0.11" + }, + { + "id": "Microsoft.Bcl.AsyncInterfaces", + "version": "6.0.0" + }, + { + "id": "System.ComponentModel.Annotations", + "version": "4.5.0" + }, + { + "id": "System.Memory", + "version": "4.5.3" + }, + { + "id": "System.Runtime.CompilerServices.Unsafe", + "version": "4.6.0" + }, + { + "id": "System.Threading.Tasks.Extensions", + "version": "4.5.4" + }, + { + "id": "System.ValueTuple", + "version": "4.5.0" + }, + { + "id": "MicroCom.Runtime", + "version": "0.11.0" + } + ] + }, + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia.Remote.Protocol", + "version": "11.0.11" + }, + { + "id": "System.ComponentModel.Annotations", + "version": "4.5.0" + }, + { + "id": "MicroCom.Runtime", + "version": "0.11.0" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia.Remote.Protocol", + "version": "11.0.11" + }, + { + "id": "Microsoft.Bcl.AsyncInterfaces", + "version": "6.0.0" + }, + { + "id": "System.ComponentModel.Annotations", + "version": "4.5.0" + }, + { + "id": "System.Memory", + "version": "4.5.3" + }, + { + "id": "System.Runtime.CompilerServices.Unsafe", + "version": "4.6.0" + }, + { + "id": "System.Threading.Tasks.Extensions", + "version": "4.5.4" + }, + { + "id": "System.ValueTuple", + "version": "4.5.0" + }, + { + "id": "MicroCom.Runtime", + "version": "0.11.0" + } + ] + } + ] + }, + { + "id": "Avalonia.Browser", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net7.0", + "packages": [ + { + "id": "HarfBuzzSharp", + "version": "7.3.0" + }, + { + "id": "SkiaSharp", + "version": "2.88.7" + }, + { + "id": "Avalonia", + "version": "11.0.11" + }, + { + "id": "Avalonia.Skia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Browser.Blazor", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net7.0", + "packages": [ + { + "id": "Microsoft.AspNetCore.Components.Web", + "version": "7.0.2" + }, + { + "id": "Avalonia.Browser", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Controls.ColorPicker", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia.Remote.Protocol", + "version": "11.0.11" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia.Remote.Protocol", + "version": "11.0.11" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Controls.DataGrid", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia.Remote.Protocol", + "version": "11.0.11" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia.Remote.Protocol", + "version": "11.0.11" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Controls.ItemsRepeater", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Desktop", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + }, + { + "id": "Avalonia.Native", + "version": "11.0.11" + }, + { + "id": "Avalonia.X11", + "version": "11.0.11" + }, + { + "id": "Avalonia.Skia", + "version": "11.0.11" + }, + { + "id": "Avalonia.Win32", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + }, + { + "id": "Avalonia.Native", + "version": "11.0.11" + }, + { + "id": "Avalonia.X11", + "version": "11.0.11" + }, + { + "id": "Avalonia.Skia", + "version": "11.0.11" + }, + { + "id": "Avalonia.Win32", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Diagnostics", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Microsoft.CodeAnalysis.CSharp.Scripting", + "version": "3.8.0" + }, + { + "id": "Microsoft.CodeAnalysis.Common", + "version": "3.8.0" + }, + { + "id": "Avalonia.Controls.ColorPicker", + "version": "11.0.11" + }, + { + "id": "Avalonia.Controls.DataGrid", + "version": "11.0.11" + }, + { + "id": "Avalonia.Themes.Simple", + "version": "11.0.11" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Microsoft.CodeAnalysis.CSharp.Scripting", + "version": "3.8.0" + }, + { + "id": "Microsoft.CodeAnalysis.Common", + "version": "3.8.0" + }, + { + "id": "Avalonia.Controls.ColorPicker", + "version": "11.0.11" + }, + { + "id": "Avalonia.Controls.DataGrid", + "version": "11.0.11" + }, + { + "id": "Avalonia.Themes.Simple", + "version": "11.0.11" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Direct2D1", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "HarfBuzzSharp", + "version": "7.3.0" + }, + { + "id": "SharpDX", + "version": "4.0.1" + }, + { + "id": "SharpDX.DXGI", + "version": "4.0.1" + }, + { + "id": "SharpDX.Direct2D1", + "version": "4.0.1" + }, + { + "id": "SharpDX.Direct3D11", + "version": "4.0.1" + }, + { + "id": "Avalonia", + "version": "11.0.11" + }, + { + "id": "Avalonia.Win32", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "HarfBuzzSharp", + "version": "7.3.0" + }, + { + "id": "SharpDX", + "version": "4.0.1" + }, + { + "id": "SharpDX.DXGI", + "version": "4.0.1" + }, + { + "id": "SharpDX.Direct2D1", + "version": "4.0.1" + }, + { + "id": "SharpDX.Direct3D11", + "version": "4.0.1" + }, + { + "id": "Avalonia", + "version": "11.0.11" + }, + { + "id": "Avalonia.Win32", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Fonts.Inter", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.FreeDesktop", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Tmds.DBus.Protocol", + "version": "0.15.0" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Tmds.DBus.Protocol", + "version": "0.15.0" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Headless", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Headless.NUnit", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "NUnit", + "version": "3.13.0" + }, + { + "id": "Avalonia.Headless", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "NUnit", + "version": "3.13.0" + }, + { + "id": "Avalonia.Headless", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Headless.Vnc", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Quamotion.RemoteViewing", + "version": "1.1.21" + }, + { + "id": "Avalonia.Headless", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Quamotion.RemoteViewing", + "version": "1.1.21" + }, + { + "id": "Avalonia.Headless", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Headless.XUnit", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "xunit.core", + "version": "2.4.0" + }, + { + "id": "Avalonia.Headless", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "xunit.core", + "version": "2.4.0" + }, + { + "id": "Avalonia.Headless", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.LinuxFramebuffer", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + }, + { + "id": "Avalonia.Skia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + }, + { + "id": "Avalonia.Skia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Markup.Xaml.Loader", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "System.Reflection.Emit", + "version": "4.3.0" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "System.Reflection.Emit", + "version": "4.3.0" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Native", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.ReactiveUI", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "ReactiveUI", + "version": "18.3.1" + }, + { + "id": "System.Reactive", + "version": "5.0.0" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "ReactiveUI", + "version": "18.3.1" + }, + { + "id": "System.Reactive", + "version": "5.0.0" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Remote.Protocol", + "version": "11.0.11", + "hash": null, + "dependencies": [] + }, + { + "id": "Avalonia.Skia", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "HarfBuzzSharp", + "version": "7.3.0" + }, + { + "id": "HarfBuzzSharp.NativeAssets.Linux", + "version": "7.3.0" + }, + { + "id": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "7.3.0" + }, + { + "id": "SkiaSharp", + "version": "2.88.7" + }, + { + "id": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.7" + }, + { + "id": "SkiaSharp.NativeAssets.WebAssembly", + "version": "2.88.7" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "HarfBuzzSharp", + "version": "7.3.0" + }, + { + "id": "HarfBuzzSharp.NativeAssets.Linux", + "version": "7.3.0" + }, + { + "id": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "7.3.0" + }, + { + "id": "SkiaSharp", + "version": "2.88.7" + }, + { + "id": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.7" + }, + { + "id": "SkiaSharp.NativeAssets.WebAssembly", + "version": "2.88.7" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Themes.Fluent", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Themes.Simple", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.Win32", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia.Angle.Windows.Natives", + "version": "2.1.0.2023020321" + }, + { + "id": "System.Numerics.Vectors", + "version": "4.5.0" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia.Angle.Windows.Natives", + "version": "2.1.0.2023020321" + }, + { + "id": "System.Numerics.Vectors", + "version": "4.5.0" + }, + { + "id": "Avalonia", + "version": "11.0.11" + } + ] + } + ] + }, + { + "id": "Avalonia.X11", + "version": "11.0.11", + "hash": null, + "dependencies": [ + { + "framework": "net6.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + }, + { + "id": "Avalonia.FreeDesktop", + "version": "11.0.11" + }, + { + "id": "Avalonia.Skia", + "version": "11.0.11" + } + ] + }, + { + "framework": ".NETStandard,Version=v2.0", + "packages": [ + { + "id": "Avalonia", + "version": "11.0.11" + }, + { + "id": "Avalonia.FreeDesktop", + "version": "11.0.11" + }, + { + "id": "Avalonia.Skia", + "version": "11.0.11" + } + ] + } + ] + } +] diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix new file mode 100644 index 0000000000000..ebcbc3a9e62f6 --- /dev/null +++ b/pkgs/by-name/av/avalonia/package.nix @@ -0,0 +1,202 @@ +{ + dotnetCorePackages, + fetchFromGitHub, + fetchNpmDeps, + fetchzip, + fontconfig, + lib, + libICE, + libSM, + libX11, + libXcursor, + libXext, + libXi, + libXrandr, + liberation_ttf, + makeFontsConf, + nodejs, + npmHooks, + runCommand, + stdenvNoCC, +}: + +let + inherit (dotnetCorePackages) systemToDotnetRid; + + dotnet-sdk = + with dotnetCorePackages; + combinePackages [ + sdk_6_0 + sdk_7_0_1xx + ]; + + npmDepsFile = ./npm-deps.nix; + +in +stdenvNoCC.mkDerivation ( + finalAttrs: + dotnetCorePackages.addNuGetDeps + { + nugetDeps = ./deps.nix; + overrideFetchAttrs = old: rec { + runtimeIds = map (system: dotnetCorePackages.systemToDotnetRid system) old.meta.platforms; + buildInputs = + old.buildInputs + ++ lib.concatLists (lib.attrValues (lib.getAttrs runtimeIds dotnet-sdk.targetPackages)); + }; + } + rec { + pname = "Avalonia"; + version = "11.0.11"; + + src = fetchFromGitHub { + owner = "AvaloniaUI"; + repo = "Avalonia"; + rev = version; + fetchSubmodules = true; + hash = "sha256-Du8DEsZKl7rnVH9YZKAWTCpEQ/5HrNlgacgK/46kx/o="; + }; + + patches = [ + # Fix failing tests that use unicode.org + ./0001-use-files-for-unicode-character-database.patch + # [ERR] Compile: [...]/Microsoft.NET.Sdk.targets(148,5): error MSB4018: The "GenerateDepsFile" task failed unexpectedly. [/build/source/src/tools/DevAnalyzers/DevAnalyzers.csproj] + # [ERR] Compile: [...]/Microsoft.NET.Sdk.targets(148,5): error MSB4018: System.IO.IOException: The process cannot access the file '/build/source/src/tools/DevAnalyzers/bin/Release/netstandard2.0/DevAnalyzers.deps.json' because it is being used by another process. [/build/source/src/tools/DevAnalyzers/DevAnalyzers.csproj] + ./0002-disable-parallel-compile.patch + ]; + + # this needs to be match the version being patched above + UNICODE_CHARACTER_DATABASE = fetchzip { + url = "https://www.unicode.org/Public/15.0.0/ucd/UCD.zip"; + hash = "sha256-jj6bX46VcnH7vpc9GwM9gArG+hSPbOGL6E4SaVd0s60="; + stripRoot = false; + }; + + postPatch = + '' + patchShebangs build.sh + + substituteInPlace src/Avalonia.X11/ICELib.cs \ + --replace-fail '"libICE.so.6"' '"${lib.getLib libICE}/lib/libICE.so.6"' + substituteInPlace src/Avalonia.X11/SMLib.cs \ + --replace-fail '"libSM.so.6"' '"${lib.getLib libSM}/lib/libSM.so.6"' + substituteInPlace src/Avalonia.X11/XLib.cs \ + --replace-fail '"libX11.so.6"' '"${lib.getLib libX11}/lib/libX11.so.6"' \ + --replace-fail '"libXrandr.so.2"' '"${lib.getLib libXrandr}/lib/libXrandr.so.2"' \ + --replace-fail '"libXext.so.6"' '"${lib.getLib libXext}/lib/libXext.so.6"' \ + --replace-fail '"libXi.so.6"' '"${lib.getLib libXi}/lib/libXi.so.6"' \ + --replace-fail '"libXcursor.so.1"' '"${lib.getLib libXcursor}/lib/libXcursor.so.1"' + + # from RestoreAdditionalProjectSources, which isn't supported by nuget-to-nix + dotnet nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json + + # Tricky way to run npmConfigHook multiple times (borrowed from pagefind) + ( + local postPatchHooks=() # written to by npmConfigHook + source ${npmHooks.npmConfigHook}/nix-support/setup-hook + '' + + + # TODO: implement updateScript + lib.concatMapStrings ( + { path, hash }: + let + deps = fetchNpmDeps { + src = "${src}/${path}"; + inherit hash; + }; + in + '' + npmRoot=${path} npmDeps="${deps}" npmConfigHook + rm -rf "$TMPDIR/cache" + '' + ) (import npmDepsFile) + + '' + ) + # Avalonia.Native is normally only packed on darwin. + substituteInPlace src/Avalonia.Native/Avalonia.Native.csproj \ + --replace-fail \ + '<IsPackable>$(PackAvaloniaNative)</IsPackable>' \ + '<IsPackable>true</IsPackable>' + ''; + + makeCacheWritable = true; + + # CSC : error CS1566: Error reading resource 'pdbstr.exe' -- 'Could not find a part of the path '/build/.nuget-temp/packages/sourcelink/1.1.0/tools/pdbstr.exe'.' [/build/source/nukebuild/_build.csproj] + linkNugetPackages = true; + + # [WRN] Could not inject value for Build.ApiCompatTool + # System.Exception: Missing package reference/download. + # Run one of the following commands: + # ---> System.ArgumentException: Could not find package 'Microsoft.DotNet.ApiCompat.Tool' using: + # - Project assets file '/build/source/nukebuild/obj/project.assets.json' + # - NuGet packages config '/build/source/nukebuild/_build.csproj' + makeEmptyNupkgInPackages = true; + + FONTCONFIG_FILE = + let + fc = makeFontsConf { fontDirectories = [ liberation_ttf ]; }; + in + runCommand "fonts.conf" { } '' + substitute ${fc} $out \ + --replace-fail "/etc/" "${fontconfig.out}/etc/" + ''; + + preConfigure = '' + # closed source (telemetry?) https://github.com/AvaloniaUI/Avalonia/discussions/16878 + dotnet remove packages/Avalonia/Avalonia.csproj package Avalonia.BuildServices + ''; + + runtimeIds = [ (systemToDotnetRid stdenvNoCC.hostPlatform.system) ]; + + configurePhase = '' + runHook preConfigure + for project in nukebuild/_build.csproj dirs.proj; do + for rid in $runtimeIds; do + dotnet restore --runtime "$rid" "$project" + done + done + runHook postConfigure + ''; + + nativeBuildInputs = [ + nodejs + dotnet-sdk + ]; + buildInputs = dotnet-sdk.packages; + + buildTarget = "Package"; + + buildPhase = '' + runHook preBuild + # ValidateApiDiff requires a network connection + ./build.sh --target $buildTarget --verbosity Verbose --skip ValidateApiDiff + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p "$out/share/nuget/source" + cp artifacts/nuget/* "$out/share/nuget/source" + runHook postInstall + ''; + + passthru = { + updateScript = ./update.bash; + inherit npmDepsFile; + }; + + meta = { + homepage = "https://avaloniaui.net/"; + license = [ lib.licenses.mit ]; + maintainers = with lib.maintainers; [ corngood ]; + description = "A cross-platform UI framework for dotnet"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryNativeCode # npm dependencies contain binaries + ]; + platforms = dotnet-sdk.meta.platforms; + broken = stdenvNoCC.hostPlatform.isDarwin; + }; + } + finalAttrs +) diff --git a/pkgs/by-name/av/avalonia/update.bash b/pkgs/by-name/av/avalonia/update.bash new file mode 100755 index 0000000000000..b0ceaaa03eec9 --- /dev/null +++ b/pkgs/by-name/av/avalonia/update.bash @@ -0,0 +1,27 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p nix-update -p prefetch-npm-deps +#shellcheck shell=bash + +set -euo pipefail + +package="$UPDATE_NIX_ATTR_PATH" +nix-update "$package" +src=$(nix-build -A "$package".src --no-out-link) +npmDepsFile=$(nix-instantiate --eval -A "$package".npmDepsFile) +( + echo '[' + for path in \ + src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp \ + tests/Avalonia.DesignerSupport.Tests/Remote/HtmlTransport/webapp \ + src/Browser/Avalonia.Browser/webapp + do + echo ' {' + echo " path = \"$path\";" + echo prefetch-npm-deps "$src/$path/package-lock.json" >&2 + hash=$(prefetch-npm-deps "$src/$path/package-lock.json") + echo " hash = \"$hash\";" + echo ' }' + done + echo ']' +) > "$npmDepsFile" +"$(nix-build -A "$package".fetch-deps --no-out-link)" diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix index 8e992e5c3a36e..249ed14233eef 100644 --- a/pkgs/by-name/av/avbroot/package.nix +++ b/pkgs/by-name/av/avbroot/package.nix @@ -33,7 +33,9 @@ rustPlatform.buildRustPackage rec { protobuf ]; - buildInputs = [ bzip2 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ + bzip2 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = { description = "Sign (and root) Android A/B OTAs with custom keys while preserving Android Verified Boot"; diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix index 6ae9f4378ec6f..f556430666dc6 100644 --- a/pkgs/by-name/av/avml/package.nix +++ b/pkgs/by-name/av/avml/package.nix @@ -2,7 +2,8 @@ lib, fetchFromGitHub, rustPlatform, - perl, + pkg-config, + openssl, testers, avml, nix-update-script, @@ -21,7 +22,12 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-gcpjrxnQDyO92OW6LZVc4x73TmTtQoaEYhmGmqhz8ng="; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; passthru.tests.version = testers.testVersion { package = avml; }; diff --git a/pkgs/by-name/av/avr-sim/package.nix b/pkgs/by-name/av/avr-sim/package.nix index 8afb4d902bb83..38f8b246f62a6 100644 --- a/pkgs/by-name/av/avr-sim/package.nix +++ b/pkgs/by-name/av/avr-sim/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "http://www.avr-asm-tutorial.net/avr_sim/28/avr_sim_28_lin_src.zip" "https://web.archive.org/web/20231129125754/http://www.avr-asm-tutorial.net/avr_sim/28/avr_sim_28_lin_src.zip" ]; - sha256 = "sha256-7MgUzMs+l+3RVUbORAWyU1OUpgrKIeWhS+ObgRJtOHc="; + hash = "sha256-7MgUzMs+l+3RVUbORAWyU1OUpgrKIeWhS+ObgRJtOHc="; }; nativeBuildInputs = [lazarus fpc]; diff --git a/pkgs/by-name/av/avro-tools/package.nix b/pkgs/by-name/av/avro-tools/package.nix new file mode 100644 index 0000000000000..730a05a259e8e --- /dev/null +++ b/pkgs/by-name/av/avro-tools/package.nix @@ -0,0 +1,43 @@ +{ + stdenv, + fetchurl, + makeWrapper, + jre, + lib, +}: +let + pname = "avro-tools"; + version = "1.11.3"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; + sha256 = "sha256-dPaV1rZxxE+G/gB7hEDyiMI7ZbzkTpNEtexp/Y6hrPI="; + }; + + dontUnpack = true; + + buildInputs = [ jre ]; + nativeBuildInputs = [ makeWrapper ]; + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/libexec/avro-tools + cp $src $out/libexec/avro-tools/${pname}.jar + + makeWrapper ${jre}/bin/java $out/bin/avro-tools \ + --add-flags "-jar $out/libexec/avro-tools/${pname}.jar" + ''; + + meta = { + homepage = "https://avro.apache.org/"; + description = "Avro command-line tools and utilities"; + mainProgram = "avro-tools"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ momeemt ]; + }; +} diff --git a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix new file mode 100644 index 0000000000000..62cda863f0c7c --- /dev/null +++ b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix @@ -0,0 +1,84 @@ +{ + lib, + aws-encryption-sdk-cli, + fetchPypi, + nix-update-script, + python3, + testers, +}: + +let + localPython = python3.override { + self = localPython; + packageOverrides = final: prev: { + urllib3 = prev.urllib3.overridePythonAttrs (prev: rec { + pyproject = true; + version = "1.26.18"; + nativeBuildInputs = with final; [ setuptools ]; + src = prev.src.override { + inherit version; + hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; + }; + }); + }; + }; +in + +localPython.pkgs.buildPythonApplication rec { + pname = "aws-encryption-sdk-cli"; + version = "4.2.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gORrscY+Bgmz2FrKdSBd56jP0yuEklytMeA3wr8tTZU="; + }; + + build-system = with localPython.pkgs; [ + setuptools + ]; + + dependencies = with localPython.pkgs; [ + attrs + aws-encryption-sdk + base64io + setuptools # for pkg_resources + urllib3 + ]; + + doCheck = true; + + nativeCheckInputs = with localPython.pkgs; [ + mock + pytest-mock + pytest7CheckHook + ]; + + disabledTestPaths = [ + # requires networking + "test/integration" + ]; + + # Upstream did not adapt to pytest 8 yet. + pytestFlagsArray = [ + "-W" + "ignore::pytest.PytestRemovedIn8Warning" + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = aws-encryption-sdk-cli; + command = "aws-encryption-cli --version"; + }; + }; + + meta = with lib; { + homepage = "https://aws-encryption-sdk-cli.readthedocs.io/"; + changelog = "https://github.com/aws/aws-encryption-sdk-cli/blob/v${version}/CHANGELOG.rst"; + description = "CLI wrapper around aws-encryption-sdk-python"; + license = licenses.asl20; + mainProgram = "aws-encryption-cli"; + maintainers = with maintainers; [ anthonyroussel ]; + }; +} diff --git a/pkgs/by-name/aw/aws-sso-cli/package.nix b/pkgs/by-name/aw/aws-sso-cli/package.nix index 6e5b72b1f2d37..b77680f058f29 100644 --- a/pkgs/by-name/aw/aws-sso-cli/package.nix +++ b/pkgs/by-name/aw/aws-sso-cli/package.nix @@ -37,7 +37,7 @@ buildGoModule rec { "TestAWSConsoleUrl" "TestAWSFederatedUrl" "TestServerWithSSL" # https://github.com/synfinatic/aws-sso-cli/issues/1030 -- remove when version >= 2.x - ] ++ lib.optionals stdenv.isDarwin [ "TestDetectShellBash" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestDetectShellBash" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index 20d0667b70e2e..a99ed43ea7c0f 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -14,7 +14,7 @@ buildGoModule rec { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Qs4vxFgehWQYYECBGBSU8YI/BHLwOQUO5wBlNEUzD7c="; + hash = "sha256-Qs4vxFgehWQYYECBGBSU8YI/BHLwOQUO5wBlNEUzD7c="; }; vendorHash = "sha256-4bJKDEZlO0DzEzTQ7m+SQuzhe+wKmL6wLueqgSz/46s="; @@ -24,7 +24,7 @@ buildGoModule rec { postInstall = '' # make xdg-open overrideable at runtime # aws-vault uses https://github.com/skratchdot/open-golang/blob/master/open/open.go to open links - ${lib.optionalString (!stdenv.isDarwin) "wrapProgram $out/bin/aws-vault --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}"} + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "wrapProgram $out/bin/aws-vault --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}"} installShellCompletion --cmd aws-vault \ --bash $src/contrib/completions/bash/aws-vault.bash \ --fish $src/contrib/completions/fish/aws-vault.fish \ diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 3214675a9c607..e3053c6f711b1 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -1,86 +1,83 @@ -{ lib -, stdenv -, python3 -, groff -, less -, fetchFromGitHub -, fetchpatch -, installShellFiles -, nix-update-script -, testers -, awscli2 +{ + lib, + stdenv, + python3, + groff, + less, + fetchFromGitHub, + fetchpatch, + installShellFiles, + nix-update-script, + testers, + awscli2, }: let py = python3 // { - pkgs = python3.pkgs.overrideScope (final: prev: { - sphinx = prev.sphinx.overridePythonAttrs (prev: { - disabledTests = prev.disabledTests ++ [ - "test_check_link_response_only" # fails on hydra https://hydra.nixos.org/build/242624087/nixlog/1 - ]; - }); - python-dateutil = prev.python-dateutil.overridePythonAttrs (prev: { - version = "2.8.2"; - pyproject = null; - src = prev.src.override { + pkgs = python3.pkgs.overrideScope ( + final: prev: { + sphinx = prev.sphinx.overridePythonAttrs (prev: { + disabledTests = prev.disabledTests ++ [ + "test_check_link_response_only" # fails on hydra https://hydra.nixos.org/build/242624087/nixlog/1 + ]; + }); + python-dateutil = prev.python-dateutil.overridePythonAttrs (prev: { version = "2.8.2"; - hash = "sha256-ASPKzBYnrhnd88J6XeW9Z+5FhvvdZEDZdI+Ku0g9PoY="; - }; - patches = [ - # https://github.com/dateutil/dateutil/pull/1285 - (fetchpatch { - url = "https://github.com/dateutil/dateutil/commit/f2293200747fb03d56c6c5997bfebeabe703576f.patch"; - relative = "src"; - hash = "sha256-BVEFGV/WGUz9H/8q+l62jnyN9VDnoSR71DdL+LIkb0o="; - }) - ]; - postPatch = null; - }); - ruamel-yaml = prev.ruamel-yaml.overridePythonAttrs (prev: { - src = prev.src.override { - version = "0.17.21"; - hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; - }; - }); - urllib3 = prev.urllib3.overridePythonAttrs (prev: rec { - pyproject = true; - version = "1.26.18"; - nativeBuildInputs = with final; [ - setuptools - ]; - src = prev.src.override { - inherit version; - hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; - }; - }); - }); + pyproject = null; + src = prev.src.override { + version = "2.8.2"; + hash = "sha256-ASPKzBYnrhnd88J6XeW9Z+5FhvvdZEDZdI+Ku0g9PoY="; + }; + patches = [ + # https://github.com/dateutil/dateutil/pull/1285 + (fetchpatch { + url = "https://github.com/dateutil/dateutil/commit/f2293200747fb03d56c6c5997bfebeabe703576f.patch"; + relative = "src"; + hash = "sha256-BVEFGV/WGUz9H/8q+l62jnyN9VDnoSR71DdL+LIkb0o="; + }) + ]; + postPatch = null; + }); + ruamel-yaml = prev.ruamel-yaml.overridePythonAttrs (prev: { + src = prev.src.override { + version = "0.17.21"; + hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; + }; + }); + urllib3 = prev.urllib3.overridePythonAttrs (prev: rec { + pyproject = true; + version = "1.26.18"; + nativeBuildInputs = with final; [ + setuptools + ]; + src = prev.src.override { + inherit version; + hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; + }; + }); + } + ); }; in py.pkgs.buildPythonApplication rec { pname = "awscli2"; - version = "2.17.18"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.17.56"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-HxFtMFeGR6XAMsP5LM0tvJ/ECWVpveIhWRTKvf8uYA0="; + hash = "sha256-h82g99+3TsMa5yyzt7A1q3m2vO34rJlhmOlXx6jqmUk="; }; - patches = [ - # Temporary test fix until https://github.com/aws/aws-cli/pull/8838 is merged upstream - (fetchpatch { - url = "https://github.com/aws/aws-cli/commit/b5f19fe136ab0752cd5fcab21ff0ab59bddbea99.patch"; - hash = "sha256-NM+nVlpxGAHVimrlV0m30d4rkFVb11tiH8Y6//2QhMI="; - }) - ]; + patches = [ ]; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'awscrt>=0.19.18,<=0.20.11' 'awscrt>=0.19.18' \ - --replace-fail 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \ + --replace-fail 'awscrt>=0.19.18,<=0.21.2' 'awscrt>=0.19.18' \ + --replace-fail 'cryptography>=40.0.0,<40.0.2' 'cryptography>=43.0.0' \ --replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \ --replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \ --replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24' @@ -129,13 +126,15 @@ py.pkgs.buildPythonApplication rec { pytestCheckHook ]; - postInstall = '' - installShellCompletion --cmd aws \ - --bash <(echo "complete -C $out/bin/aws_completer aws") \ - --zsh $out/bin/aws_zsh_completer.sh - '' + lib.optionalString (!stdenv.hostPlatform.isWindows) '' - rm $out/bin/aws.cmd - ''; + postInstall = + '' + installShellCompletion --cmd aws \ + --bash <(echo "complete -C $out/bin/aws_completer aws") \ + --zsh $out/bin/aws_zsh_completer.sh + '' + + lib.optionalString (!stdenv.hostPlatform.isWindows) '' + rm $out/bin/aws.cmd + ''; preCheck = '' export PATH=$PATH:$out/bin @@ -166,7 +165,10 @@ py.pkgs.buildPythonApplication rec { python = py; # for aws_shell updateScript = nix-update-script { # Excludes 1.x versions from the Github tags list - extraArgs = [ "--version-regex" "^(2\.(.*))" ]; + extraArgs = [ + "--version-regex" + "^(2\.(.*))" + ]; }; tests.version = testers.testVersion { package = awscli2; @@ -180,7 +182,13 @@ py.pkgs.buildPythonApplication rec { homepage = "https://aws.amazon.com/cli/"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ]; + maintainers = with maintainers; [ + bhipple + davegallant + bryanasdev000 + devusb + anthonyroussel + ]; mainProgram = "aws"; }; } diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix new file mode 100644 index 0000000000000..21a20ad7dd168 --- /dev/null +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -0,0 +1,102 @@ +{ + lib, + python3, + fetchFromGitHub, + git, +}: + +let + changeVersion = + overrideFunc: version: hash: + overrideFunc (oldAttrs: rec { + inherit version; + src = oldAttrs.src.override { + inherit version hash; + }; + }); + + localPython = python3.override { + self = localPython; + packageOverrides = self: super: { + cement = + changeVersion super.cement.overridePythonAttrs "2.10.14" + "sha256-NC4n21SmYW3RiS7QuzWXoifO4z3C2FVgQm3xf8qQcFg="; + }; + }; + +in + +localPython.pkgs.buildPythonApplication rec { + pname = "awsebcli"; + version = "3.21"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-elastic-beanstalk-cli"; + rev = "refs/tags/${version}"; + hash = "sha256-VU8bXvS4m4eIamjlgGmHE2qwDXWAXvWTa0QHomXR5ZE="; + }; + + postPatch = '' + # https://github.com/aws/aws-elastic-beanstalk-cli/pull/469 + substituteInPlace setup.py --replace-fail "scripts=['bin/eb']," "" + ''; + + propagatedBuildInputs = with localPython.pkgs; [ + blessed + botocore + cement + colorama + pathspec + pyyaml + future + requests + semantic-version + setuptools + tabulate + termcolor + websocket-client + ]; + + pythonRelaxDeps = [ + "botocore" + "colorama" + "pathspec" + "PyYAML" + "six" + "termcolor" + ]; + + nativeCheckInputs = with localPython.pkgs; [ + pytestCheckHook + pytest-socket + mock + git + ]; + + pytestFlagsArray = [ + "tests/unit" + ]; + + disabledTests = [ + # Needs docker installed to run. + "test_local_run" + "test_local_run__with_arguments" + + # Needs access to the user's ~/.ssh directory. + "test_generate_and_upload_keypair__exit_code_0" + "test_generate_and_upload_keypair__exit_code_1" + "test_generate_and_upload_keypair__exit_code_is_other_than_1_and_0" + "test_generate_and_upload_keypair__ssh_keygen_not_present" + ]; + + meta = with lib; { + homepage = "https://aws.amazon.com/elasticbeanstalk/"; + description = "Command line interface for Elastic Beanstalk"; + changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${version}/CHANGES.rst"; + maintainers = with maintainers; [ kirillrdy ]; + license = licenses.asl20; + mainProgram = "eb"; + }; +} diff --git a/pkgs/by-name/ax/axis2/package.nix b/pkgs/by-name/ax/axis2/package.nix new file mode 100644 index 0000000000000..adb305f3100e8 --- /dev/null +++ b/pkgs/by-name/ax/axis2/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenvNoCC, + ant, + fetchurl, + jdk, + nixosTests, + stripJavaArchivesHook, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "axis2"; + version = "1.8.2"; + + src = fetchurl { + url = "mirror://apache/axis/axis2/java/core/${finalAttrs.version}/axis2-${finalAttrs.version}-bin.zip"; + hash = "sha256-oilPVFFpl3F61nVDxcYx/bc81FopS5fzoIdXzeP8brk="; + }; + + nativeBuildInputs = [ + ant + jdk + stripJavaArchivesHook + unzip + ]; + + buildPhase = '' + runHook preBuild + ant -f webapp + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 dist/axis2.war -t $out/webapps + unzip $out/webapps/axis2.war -d $out/webapps/axis2 + + runHook postInstall + ''; + + passthru.tests = { + inherit (nixosTests) tomcat; + }; + + meta = { + description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack"; + homepage = "https://axis.apache.org/axis2/java/core/"; + changelog = "https://axis.apache.org/axis2/java/core/release-notes/${finalAttrs.version}.html"; + maintainers = [ lib.maintainers.anthonyroussel ]; + platforms = lib.platforms.unix; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.asl20; + }; +}) diff --git a/pkgs/by-name/ay/ayatana-ido/package.nix b/pkgs/by-name/ay/ayatana-ido/package.nix new file mode 100644 index 0000000000000..ae8f9419fb89e --- /dev/null +++ b/pkgs/by-name/ay/ayatana-ido/package.nix @@ -0,0 +1,43 @@ +{ + cmake, + fetchFromGitHub, + glib, + gtk3, + lib, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "ayatana-ido"; + version = "0.10.3"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = pname; + rev = version; + sha256 = "sha256-WEPW9BstDv2k/5dTEDQza3eOQ9bd6CEVvmd817sEPAs="; + }; + + nativeBuildInputs = [ + cmake + glib # for glib-mkenums + pkg-config + ]; + + buildInputs = [ gtk3 ]; + + strictDeps = true; + + meta = with lib; { + description = "Ayatana Display Indicator Objects"; + homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; + changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; + license = [ + licenses.lgpl3Plus + licenses.lgpl21Plus + ]; + maintainers = [ maintainers.nickhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix b/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix new file mode 100644 index 0000000000000..7f4eb6cef35a1 --- /dev/null +++ b/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix @@ -0,0 +1,84 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gitUpdater, + nixosTests, + cmake, + gettext, + glib, + gobject-introspection, + intltool, + libayatana-common, + lomiri, + pkg-config, + systemd, + vala, + wrapGAppsHook3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ayatana-indicator-bluetooth"; + version = "24.5.0"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = "ayatana-indicator-bluetooth"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-EreOhrlWbSZtwazsvwWsPji2iLfQxr2LbjCI13Hrb28="; + }; + + postPatch = '' + substituteInPlace data/CMakeLists.txt \ + --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \ + --replace-fail '/etc' "\''${CMAKE_INSTALL_SYSCONFDIR}" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + gobject-introspection + intltool + pkg-config + vala + wrapGAppsHook3 + ]; + + buildInputs = [ + lomiri.cmake-extras + glib + libayatana-common + systemd + ]; + + cmakeFlags = [ + (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "GSETTINGS_COMPILE" true) + ]; + + passthru = { + ayatana-indicators = { + ayatana-indicator-bluetooth = [ + "ayatana" + "lomiri" + ]; + }; + updateScript = gitUpdater { }; + tests.vm = nixosTests.ayatana-indicators; + }; + + meta = { + description = "Ayatana System Indicator for Bluetooth Management"; + longDescription = '' + This Ayatana Indicator exposes bluetooth functionality via the system + indicator API and provides fast user controls for Bluetooth devices. + ''; + homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth"; + changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/blob/${finalAttrs.version}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix index 0914bec39610a..0ee7f52286249 100644 --- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -7,7 +7,7 @@ cmake, dbus, glib, - gnome, + gnome-settings-daemon, gsettings-desktop-schemas, gtest, intltool, @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { # TODO these bloat the closure size alot, just so the indicator doesn't have the potential to crash. # is there a better way to give it access to DE-specific schemas as needed? # https://github.com/AyatanaIndicators/ayatana-indicator-session/blob/88846bad7ee0aa8e0bb122816d06f9bc887eb464/src/service.c#L1387-L1413 - gnome.gnome-settings-daemon + gnome-settings-daemon mate.mate-settings-daemon ]; diff --git a/pkgs/by-name/az/azuki/package.nix b/pkgs/by-name/az/azuki/package.nix new file mode 100644 index 0000000000000..8ab216a750e3c --- /dev/null +++ b/pkgs/by-name/az/azuki/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: + +let + fonts = [ + { + name = "azuki"; + downloadVersion = "121"; + hash = "sha256-AMpEJDD8lN0qWJ5C0y4V+/2JE/pKQrUHGfKHcnV+dhA="; + } + { + name = "azuki-b"; + downloadVersion = "B120"; + hash = "sha256-GoXnDX9H6D1X0QEgrD2jmQp7ek081PpO+xR3OdIY8Ck="; + } + { + name = "azuki-l"; + downloadVersion = "L120"; + hash = "sha256-rvWvSuvLnK3m2+iyKPQyIB1UGjg8dAW5oygjsLCQZ48="; + } + { + name = "azuki-lb"; + downloadVersion = "LB100"; + hash = "sha256-zpGomVshCe2W2Z2C5UGtVrJ2k7F//MftndSHPHmG290="; + } + { + name = "azuki-lp"; + downloadVersion = "LP100"; + hash = "sha256-Q/ND3dv8q7WTQx4oYVY5pTiGl4Ht89oA+tuCyfPOLUk="; + } + { + name = "azuki-p"; + downloadVersion = "P100"; + hash = "sha256-s4uodxyXP5R7jwkzjmg6qJZCllJ/MtgkkVOeELI8hLI="; + } + ]; + +in +stdenvNoCC.mkDerivation { + pname = "azuki"; + version = "0-unstable-2021-07-02"; + + sourceRoot = "azuki"; + + srcs = map ( + { + name, + downloadVersion, + hash, + }: + fetchzip { + url = "https://azukifont.com/font/azukifont${downloadVersion}.zip"; + stripRoot = false; + inherit name hash; + } + ) fonts; + + installPhase = '' + runHook preInstall + + for font in $srcs; do + install -Dm644 $font/azukifont*/*.ttf -t $out/share/fonts/truetype + done + + runHook postInstall + ''; + + meta = { + homepage = "http://azukifont.com/font/azuki.html"; + description = "Azuki Font"; + license = lib.licenses.unfree; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ nyadiia ]; + }; +} diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index a4a37cb65ebc5..9f80146842ded 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -59,9 +59,9 @@ }; aks-preview = mkAzExtension rec { pname = "aks-preview"; - version = "7.0.0b6"; + version = "8.0.0b1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl"; - sha256 = "268457ea6463d03775caa822b4b7a70749c503b47cb2aa9c898e1186cfb423f6"; + sha256 = "500a670e0f4cd8ef9399a0928fbcef6440a68cdc2978c62db911d1585f351b75"; description = "Provides a preview for upcoming AKS features"; }; akshybrid = mkAzExtension rec { @@ -87,9 +87,9 @@ }; amg = mkAzExtension rec { pname = "amg"; - version = "2.1.0"; + version = "2.2.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/amg-${version}-py3-none-any.whl"; - sha256 = "b28952d967b9a1e0d81dac280bdff23b44fdbb06dedd66cdf99477bdd7541d6c"; + sha256 = "8d832463a35329e61840bce5fe2c3ba214f8e800cc38140fe58dc2bf13ffeb90"; description = "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"; }; amlfs = mkAzExtension rec { @@ -150,9 +150,9 @@ }; azurelargeinstance = mkAzExtension rec { pname = "azurelargeinstance"; - version = "1.0.0b2"; + version = "1.0.0b3"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/azurelargeinstance-${version}-py3-none-any.whl"; - sha256 = "6948ac3306269ea6c8ff6d32d5673989dfd4dfa0a4e4c5d6d3991b364d5dc628"; + sha256 = "093a2fa900e3df53f8bf15b335156058333efe0eff9584a11db4bac0bccc7b1d"; description = "Microsoft Azure Command-Line Tools Azurelargeinstance Extension"; }; azurestackhci = mkAzExtension rec { @@ -164,10 +164,10 @@ }; baremetal-infrastructure = mkAzExtension rec { pname = "baremetal-infrastructure"; - version = "2.0.1"; - url = "https://github.com/Azure/azure-baremetalinfrastructure-cli-extension/releases/download/${version}/baremetal_infrastructure-2.0.1-py2.py3-none-any.whl"; - sha256 = "ea127d64603c8a45774cdf9aa80c4c8b5839a42719971b296beb96105fe5ef2d"; - description = "Additional commands for working with BareMetal instances"; + version = "3.0.0b1"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/baremetal_infrastructure-${version}-py3-none-any.whl"; + sha256 = "83ff3e4540f522a5f3578a923155715160e90a15a8d919a2e5569c08f1295a2f"; + description = "Microsoft Azure Command-Line Tools BaremetalInfrastructure Extension"; }; bastion = mkAzExtension rec { pname = "bastion"; @@ -596,6 +596,13 @@ sha256 = "41861d65b9d86e0b622986a4984ce7a611f87b92da578db8c0527ec74334f32c"; description = "Microsoft Azure Command-Line Tools K8s-extension Extension"; }; + k8s-runtime = mkAzExtension rec { + pname = "k8s-runtime"; + version = "1.0.3"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-${version}-py3-none-any.whl"; + sha256 = "133dd153979c74d37aa25956ed8a9aa741c334929848cd67c26f268332759d40"; + description = "Microsoft Azure Command-Line Tools K8sRuntime Extension"; + }; kusto = mkAzExtension rec { pname = "kusto"; version = "0.5.0"; diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 1b6bd5effd666..e1b5b2bf8b8a8 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -3,6 +3,7 @@ # Checkout ./README.md for more information. { + config, lib, mkAzExtension, mycli, @@ -32,9 +33,9 @@ containerapp = mkAzExtension rec { pname = "containerapp"; - version = "0.3.53"; + version = "1.0.0b1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl"; - sha256 = "f9b4f3928469efcc1bfbc98cd906d9d92e72617e5c21cf3ade8b37651607c3e1"; + sha256 = "d80b83b0e22770925c24bca150c84182376b7b0aff9b6f28498d769dc8618b45"; description = "Microsoft Azure Command-Line Tools Containerapp Extension"; propagatedBuildInputs = with python3Packages; [ docker @@ -83,6 +84,8 @@ meta.maintainers = with lib.maintainers; [ katexochen ]; }; +} +// lib.optionalAttrs config.allowAliases { # Removed extensions blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06 diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 6af667f57673c..d9bfd888dd7b1 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -21,14 +21,14 @@ }: let - version = "2.63.0"; + version = "2.64.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-HpWdEZAMnAkB07fnE7IrA0FqpBYKChqojxwAo8RfuQs="; + hash = "sha256-1FnrUvRpAkZ0nAxen3seam2S49tBkK5N37ZD99OkvB0="; }; # put packages that needs to be overridden in the py package scope @@ -191,7 +191,7 @@ py.pkgs.toPythonApplication ( chardet colorama ] - ++ lib.optional stdenv.isLinux distro + ++ lib.optional stdenv.hostPlatform.isLinux distro ++ [ fabric javaproperties diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index 12281851ee535..5bde74450419b 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -69,7 +69,7 @@ let nativeCheckInputs = with self; [ pytest ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; # ignore tests that does network call, or assume powershell checkPhase = '' @@ -139,6 +139,11 @@ let overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip" "sha256-QcHY1wCwQyVOEdUi06/wEa4dqJH5Ccd33gJ1Sju0qZA="; + # ValueError: The operation 'azure.mgmt.hdinsight.operations#ExtensionsOperations.get_azure_monitor_agent_status' is invalid. + azure-mgmt-hdinsight = + overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0b3" "tar.gz" + "sha256-clSeCP8+7T1uI4Nec+zhzDK980C9+JGeeJFsNSwgD2Q="; + # ValueError: The operation 'azure.mgmt.kusto.operations#ClustersOperations.delete' is invalid. azure-mgmt-kusto = (overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix index 8f70c247fc1ec..de63807785f2a 100644 --- a/pkgs/by-name/az/azurite/package.nix +++ b/pkgs/by-name/az/azurite/package.nix @@ -22,9 +22,9 @@ buildNpmPackage rec { npmDepsHash = "sha256-+ptjsz2MDIB/aqu4UxkBLCcehtamFdmswNUsHs23LuE="; nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret - ] ++ lib.optionals stdenv.isDarwin (with darwin; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin; [ Security apple_sdk.frameworks.AppKit ]); diff --git a/pkgs/by-name/ba/babeltrace/package.nix b/pkgs/by-name/ba/babeltrace/package.nix index 4d651d5e700ec..eb36ac7a07536 100644 --- a/pkgs/by-name/ba/babeltrace/package.nix +++ b/pkgs/by-name/ba/babeltrace/package.nix @@ -11,7 +11,7 @@ elfutils, enablePython ? false, pythonPackages ? null, - swig4, + swig, }: stdenv.mkDerivation (finalAttrs: { @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.efficios.com/files/babeltrace/babeltrace-${finalAttrs.version}.tar.bz2"; - sha256 = "Z7Q6qu9clR+nrxpVfPcgGhH+iYdrfCK6CgPLwxbbWpw="; + hash = "sha256-Z7Q6qu9clR+nrxpVfPcgGhH+iYdrfCK6CgPLwxbbWpw="; }; nativeBuildInputs = @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ] ++ lib.optionals enablePython [ - swig4 + swig pythonPackages.setuptools ]; buildInputs = [ diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix index 3ee27b6923939..1d16ec2071a70 100644 --- a/pkgs/by-name/ba/backgroundremover/package.nix +++ b/pkgs/by-name/ba/backgroundremover/package.nix @@ -29,7 +29,7 @@ let postPatch = '' substituteInPlace backgroundremover/bg.py backgroundremover/u2net/detect.py \ - --replace 'os.path.expanduser(os.path.join("~", ".u2net", model_name + ".pth"))' "os.path.join(\"$models\", model_name + \".pth\")" + --replace-fail 'os.path.expanduser(os.path.join("~", ".u2net", model_name + ".pth"))' "os.path.join(\"$models\", model_name + \".pth\")" ''; nativeBuildInputs = [ p.setuptools p.wheel ]; diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix new file mode 100644 index 0000000000000..a989c6cb1fc44 --- /dev/null +++ b/pkgs/by-name/ba/backrest/package.nix @@ -0,0 +1,75 @@ +{ + buildGoModule, + buildNpmPackage, + fetchFromGitHub, + lib, + restic, + util-linux, + stdenv, +}: +let + pname = "backrest"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "garethgeorge"; + repo = "backrest"; + rev = "refs/tags/v${version}"; + hash = "sha256-qxEZkRKkwKZ+EZ3y3aGcX2ioKOz19SRdi3+9mjF1LpE="; + }; + + frontend = buildNpmPackage { + inherit version; + pname = "${pname}-webui"; + src = "${src}/webui"; + + npmDepsHash = "sha256-mS8G3+JuASaOkAYi+vgWztrSIIu7vfaasu+YeRJjWZw="; + + installPhase = '' + runHook preInstall + mkdir $out + cp -r dist/* $out + runHook postInstall + ''; + }; +in +buildGoModule { + inherit pname src version; + + vendorHash = "sha256-YukcHnXa/QimfX3nDtQI6yfPkEK9j5SPXOPIT++eWsU="; + + preBuild = '' + mkdir -p ./webui/dist + cp -r ${frontend}/* ./webui/dist + ''; + + nativeCheckInputs = [ util-linux ]; + + checkFlags = + let + skippedTests = + [ + "TestServeIndex" # Fails with handler returned wrong content encoding + ] + ++ lib.optionals stdenv.isDarwin [ + "TestBackup" # relies on ionice + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + preCheck = '' + # Use restic from nixpkgs, otherwise download fails in sandbox + export BACKREST_RESTIC_COMMAND="${restic}/bin/restic" + export HOME=$(pwd) + ''; + + 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}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ interdependence ]; + mainProgram = "backrest"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix index 3b7dd09dc9fc3..8dd4c5a0453c8 100644 --- a/pkgs/by-name/ba/badkeys/package.nix +++ b/pkgs/by-name/ba/badkeys/package.nix @@ -3,16 +3,17 @@ fetchFromGitHub, python3Packages, }: + python3Packages.buildPythonApplication rec { pname = "badkeys"; - version = "0.0.11"; + version = "0.0.12"; pyproject = true; src = fetchFromGitHub { owner = "badkeys"; repo = "badkeys"; rev = "refs/tags/v${version}"; - hash = "sha256-VfkJeHEdvRc0Khf/C7ZUNpjd6t+hUULCTXXY80rs4Ko="; + hash = "sha256-LFoB/ZHIMRpN/eHg3x8HCxNbMKclf2SJSDPk33OIil8="; }; build-system = with python3Packages; [ @@ -37,9 +38,9 @@ python3Packages.buildPythonApplication rec { meta = { description = "Tool to find common vulnerabilities in cryptographic public keys"; homepage = "https://badkeys.info/"; - changelog = "https://github.com/badkeys/badkeys/releases/tag/${src.rev}"; - mainProgram = "badkeys"; + changelog = "https://github.com/badkeys/badkeys/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "badkeys"; }; } diff --git a/pkgs/by-name/ba/banana-cursor/package.nix b/pkgs/by-name/ba/banana-cursor/package.nix index 73d26048b7eac..2bb9d1ea4f578 100644 --- a/pkgs/by-name/ba/banana-cursor/package.nix +++ b/pkgs/by-name/ba/banana-cursor/package.nix @@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "ful1e5"; repo = "banana-cursor"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-PI7381xf/GctQTnfcE0W3M3z2kqbX4VexMf17C61hT8="; + hash = "sha256-PI7381xf/GctQTnfcE0W3M3z2kqbX4VexMf17C61hT8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix index d7bd9feb5b64c..3fc5138912a23 100644 --- a/pkgs/by-name/ba/bant/package.nix +++ b/pkgs/by-name/ba/bant/package.nix @@ -12,18 +12,18 @@ let registry = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-central-registry"; - rev = "1c729c2775715fd98f0f948a512eb173213250da"; - hash = "sha256-1iaDDM8/v8KCOUjPgLUtZVta7rMzwlIK//cCoLUrb/s="; + rev = "40bc9ad53e5a59d596935839e7c072679e706266"; + hash = "sha256-CL0YMQd1ck6/dlvJCLxt9jYyqDuk+iAWfdBOMj864u8="; }; in buildBazelPackage rec { pname = "bant"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "hzeller"; repo = "bant"; rev = "v${version}"; - hash = "sha256-4h76ok2aN7WfD8OHIS0O2Dk924+hFXJXewKRM7XYjKw="; + hash = "sha256-QbxPosjlrpxbz6gQKUKccF2Gu/i5xvqh2gwfABYE8kE="; }; bazelFlags = ["--registry" "file://${registry}"]; @@ -34,8 +34,8 @@ in buildBazelPackage rec { fetchAttrs = { sha256 = { - aarch64-linux = "sha256-38O9HPKMjqpNCO+kC8hUlsJAclONVCj3oj/iVRwOEDo="; - x86_64-linux = "sha256-OUVjgVIBNh0j10dgk/l42bqmsGuBC56uf4Ei/IRXxBI="; + aarch64-linux = "sha256-09RL0tj6xsGEmuv11V81eAtqLc9nAaE8Il3d6ueS0UQ="; + x86_64-linux = "sha256-6mlaJ/kT14vKvlJjxqBK/lESjjxbcYxApi7+eiiI37M="; }.${system} or (throw "No hash for system: ${system}"); }; diff --git a/pkgs/by-name/ba/barrage/package.nix b/pkgs/by-name/ba/barrage/package.nix index 497468cb489a8..ff879e56924a3 100644 --- a/pkgs/by-name/ba/barrage/package.nix +++ b/pkgs/by-name/ba/barrage/package.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "barrage"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (SDL.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/ba/basedpyright/package-lock.json b/pkgs/by-name/ba/basedpyright/package-lock.json index dee0ab51a5212..8c8593a7ab2bb 100644 --- a/pkgs/by-name/ba/basedpyright/package-lock.json +++ b/pkgs/by-name/ba/basedpyright/package-lock.json @@ -1,193 +1,12120 @@ { - "name": "pyright-root", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "pyright-root", - "hasInstallScript": true, - "dependencies": { - "glob": "^7.2.3", - "jsonc-parser": "^3.2.1" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==" - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + "name": "pyright-root", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "pyright-root", + "hasInstallScript": true, + "devDependencies": { + "@detachhead/ts-helpers": "^16.2.0", + "@types/glob": "^7.2.0", + "@types/node": "^20", + "@types/yargs": "^16.0.9", + "@typescript-eslint/eslint-plugin": "^6.21.0", + "@typescript-eslint/parser": "^6.21.0", + "cross-env": "^7.0.3", + "eslint": "^8.56.0", + "eslint-config-prettier": "^8.10.0", + "eslint-plugin-simple-import-sort": "^10.0.0", + "glob": "^7.2.3", + "jsonc-parser": "^3.2.1", + "lerna": "^7.4.2", + "npm-check-updates": "^16.14.14", + "p-queue": "^6.6.2", + "prettier": "2.8.8", + "syncpack": "~10.9.3", + "throw-expression": "^2.0.1", + "typescript": "~5.5.4", + "word-wrap": "1.2.5", + "yargs": "^16.2.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.24.7", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@colors/colors": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", + "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/@detachhead/ts-helpers": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@detachhead/ts-helpers/-/ts-helpers-16.2.0.tgz", + "integrity": "sha512-1kwJ1AgXWK9goECjtyRh6SMVf7YYkMt0yvUccxqo7qpDRYs3uDC0ot5MhIbDTbhyoQQio3wTTmA2m5ijdUehdA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@types/lodash": "4.14.195", + "date-fns": "2.21.1", + "is-ci": "2.0.0", + "lodash": "^4.17.21", + "ordinal": "1.0.3", + "throw-expression": "1.0.2", + "ts-is-present": "1.2.1", + "ts-toolbelt": "9.6.0", + "tsdef": "0.0.14", + "utility-types": "3.10.0" + }, + "engines": { + "node": ">=16.6.0" + } + }, + "node_modules/@detachhead/ts-helpers/node_modules/throw-expression": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/throw-expression/-/throw-expression-1.0.2.tgz", + "integrity": "sha512-y8cHYZgp0Vj8bRMQSWAA7pfHj1JPift81tZM9i/rHQuJoYEv9kewjEpRu2wRRuXRaClFWWzWQFTG3Q9rDysyNQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@effect/data": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@effect/data/-/data-0.17.1.tgz", + "integrity": "sha512-QCYkLE5Y5Dm5Yax5R3GmW4ZIgTx7W+kSZ7yq5eqQ/mFWa8i4yxbLuu8cudqzdeZtRtTGZKlhDxfFfgVtMywXJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@effect/io": { + "version": "0.37.1", + "resolved": "https://registry.npmjs.org/@effect/io/-/io-0.37.1.tgz", + "integrity": "sha512-Ez3GfcG+gDDfAiBXtSjJpSrPU5Guiyw69LsYkMtIukFwyNwpHWLhYaVgfVbVjoQasil8KiFSQJSd5DbJL6nqPg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@effect/data": "^0.17.0" + } + }, + "node_modules/@effect/match": { + "version": "0.31.0", + "resolved": "https://registry.npmjs.org/@effect/match/-/match-0.31.0.tgz", + "integrity": "sha512-QT0HSh19Y6iHAghc51Yt/rYDU9/jhs7O+2kSEQiJqj4xqCLjfJONWsK19xBCNbuV5bt3ZO1NGFqvsWeNR7ZhDg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@effect/data": "^0.17.1", + "@effect/schema": "^0.32.0" + } + }, + "node_modules/@effect/schema": { + "version": "0.32.0", + "resolved": "https://registry.npmjs.org/@effect/schema/-/schema-0.32.0.tgz", + "integrity": "sha512-4HJK/cFkVPdIjYICy0eRsL7JuuLJ6mE3aJC5rX9OuUIei/qfctFEEX2NaARjtGX7hACBrRcuJCNwiq+54TTjFw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@effect/data": "^0.17.1", + "@effect/io": "^0.37.0", + "fast-check": "^3.12.0" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.11.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz", + "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@gar/promisify": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", + "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@hutson/parse-repository-url": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz", + "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@lerna/child-process": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/@lerna/child-process/-/child-process-7.4.2.tgz", + "integrity": "sha512-je+kkrfcvPcwL5Tg8JRENRqlbzjdlZXyaR88UcnCdNW0AJ1jX9IfHRys1X7AwSroU2ug8ESNC+suoBw1vX833Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "execa": "^5.0.0", + "strong-log-transformer": "^2.1.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@lerna/create": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/@lerna/create/-/create-7.4.2.tgz", + "integrity": "sha512-1wplFbQ52K8E/unnqB0Tq39Z4e+NEoNrpovEnl6GpsTUrC6WDp8+w0Le2uCBV0hXyemxChduCkLz4/y1H1wTeg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@lerna/child-process": "7.4.2", + "@npmcli/run-script": "6.0.2", + "@nx/devkit": ">=16.5.1 < 17", + "@octokit/plugin-enterprise-rest": "6.0.1", + "@octokit/rest": "19.0.11", + "byte-size": "8.1.1", + "chalk": "4.1.0", + "clone-deep": "4.0.1", + "cmd-shim": "6.0.1", + "columnify": "1.6.0", + "conventional-changelog-core": "5.0.1", + "conventional-recommended-bump": "7.0.1", + "cosmiconfig": "^8.2.0", + "dedent": "0.7.0", + "execa": "5.0.0", + "fs-extra": "^11.1.1", + "get-stream": "6.0.0", + "git-url-parse": "13.1.0", + "glob-parent": "5.1.2", + "globby": "11.1.0", + "graceful-fs": "4.2.11", + "has-unicode": "2.0.1", + "ini": "^1.3.8", + "init-package-json": "5.0.0", + "inquirer": "^8.2.4", + "is-ci": "3.0.1", + "is-stream": "2.0.0", + "js-yaml": "4.1.0", + "libnpmpublish": "7.3.0", + "load-json-file": "6.2.0", + "lodash": "^4.17.21", + "make-dir": "4.0.0", + "minimatch": "3.0.5", + "multimatch": "5.0.0", + "node-fetch": "2.6.7", + "npm-package-arg": "8.1.1", + "npm-packlist": "5.1.1", + "npm-registry-fetch": "^14.0.5", + "npmlog": "^6.0.2", + "nx": ">=16.5.1 < 17", + "p-map": "4.0.0", + "p-map-series": "2.1.0", + "p-queue": "6.6.2", + "p-reduce": "^2.1.0", + "pacote": "^15.2.0", + "pify": "5.0.0", + "read-cmd-shim": "4.0.0", + "read-package-json": "6.0.4", + "resolve-from": "5.0.0", + "rimraf": "^4.4.1", + "semver": "^7.3.4", + "signal-exit": "3.0.7", + "slash": "^3.0.0", + "ssri": "^9.0.1", + "strong-log-transformer": "2.1.0", + "tar": "6.1.11", + "temp-dir": "1.0.0", + "upath": "2.0.1", + "uuid": "^9.0.0", + "validate-npm-package-license": "^3.0.4", + "validate-npm-package-name": "5.0.0", + "write-file-atomic": "5.0.1", + "write-pkg": "4.0.0", + "yargs": "16.2.0", + "yargs-parser": "20.2.4" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@lerna/create/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@lerna/create/node_modules/chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@lerna/create/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@lerna/create/node_modules/glob": { + "version": "9.3.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", + "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "minimatch": "^8.0.2", + "minipass": "^4.2.4", + "path-scurry": "^1.6.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@lerna/create/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@lerna/create/node_modules/glob/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@lerna/create/node_modules/glob/node_modules/minimatch": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", + "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@lerna/create/node_modules/is-ci": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", + "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ci-info": "^3.2.0" + }, + "bin": { + "is-ci": "bin.js" + } + }, + "node_modules/@lerna/create/node_modules/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@lerna/create/node_modules/minipass": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", + "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/@lerna/create/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@lerna/create/node_modules/rimraf": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz", + "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^9.2.0" + }, + "bin": { + "rimraf": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@npmcli/fs": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", + "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "@gar/promisify": "^1.1.3", + "semver": "^7.3.5" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@npmcli/git": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", + "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/promise-spawn": "^6.0.0", + "lru-cache": "^7.4.4", + "npm-pick-manifest": "^8.0.0", + "proc-log": "^3.0.0", + "promise-inflight": "^1.0.1", + "promise-retry": "^2.0.1", + "semver": "^7.3.5", + "which": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/git/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/@npmcli/git/node_modules/which": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/installed-package-contents": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz", + "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==", + "dev": true, + "license": "ISC", + "dependencies": { + "npm-bundled": "^3.0.0", + "npm-normalize-package-bin": "^3.0.0" + }, + "bin": { + "installed-package-contents": "bin/index.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/installed-package-contents/node_modules/npm-bundled": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", + "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "npm-normalize-package-bin": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/installed-package-contents/node_modules/npm-normalize-package-bin": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/move-file": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", + "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", + "deprecated": "This functionality has been moved to @npmcli/fs", + "dev": true, + "license": "MIT", + "dependencies": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@npmcli/node-gyp": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", + "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/promise-spawn": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", + "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==", + "dev": true, + "license": "ISC", + "dependencies": { + "which": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/promise-spawn/node_modules/which": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/run-script": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", + "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/node-gyp": "^3.0.0", + "@npmcli/promise-spawn": "^6.0.0", + "node-gyp": "^9.0.0", + "read-package-json-fast": "^3.0.0", + "which": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/run-script/node_modules/which": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@nrwl/devkit": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.10.0.tgz", + "integrity": "sha512-fRloARtsDQoQgQ7HKEy0RJiusg/HSygnmg4gX/0n/Z+SUS+4KoZzvHjXc6T5ZdEiSjvLypJ+HBM8dQzIcVACPQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nx/devkit": "16.10.0" + } + }, + "node_modules/@nrwl/tao": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-16.10.0.tgz", + "integrity": "sha512-QNAanpINbr+Pod6e1xNgFbzK1x5wmZl+jMocgiEFXZ67KHvmbD6MAQQr0MMz+GPhIu7EE4QCTLTyCEMlAG+K5Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "nx": "16.10.0", + "tslib": "^2.3.0" + }, + "bin": { + "tao": "index.js" + } + }, + "node_modules/@nx/devkit": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-16.10.0.tgz", + "integrity": "sha512-IvKQqRJFDDiaj33SPfGd3ckNHhHi6ceEoqCbAP4UuMXOPPVOX6H0KVk+9tknkPb48B7jWIw6/AgOeWkBxPRO5w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nrwl/devkit": "16.10.0", + "ejs": "^3.1.7", + "enquirer": "~2.3.6", + "ignore": "^5.0.4", + "semver": "7.5.3", + "tmp": "~0.2.1", + "tslib": "^2.3.0" + }, + "peerDependencies": { + "nx": ">= 15 <= 17" + } + }, + "node_modules/@nx/devkit/node_modules/semver": { + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nx/nx-darwin-arm64": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.10.0.tgz", + "integrity": "sha512-YF+MIpeuwFkyvM5OwgY/rTNRpgVAI/YiR0yTYCZR+X3AAvP775IVlusNgQ3oedTBRUzyRnI4Tknj1WniENFsvQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-darwin-x64": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.10.0.tgz", + "integrity": "sha512-ypi6YxwXgb0kg2ixKXE3pwf5myVNUgWf1CsV5OzVccCM8NzheMO51KDXTDmEpXdzUsfT0AkO1sk5GZeCjhVONg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-freebsd-x64": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.10.0.tgz", + "integrity": "sha512-UeEYFDmdbbDkTQamqvtU8ibgu5jQLgFF1ruNb/U4Ywvwutw2d4ruOMl2e0u9hiNja9NFFAnDbvzrDcMo7jYqYw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm-gnueabihf": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.10.0.tgz", + "integrity": "sha512-WV3XUC2DB6/+bz1sx+d1Ai9q2Cdr+kTZRN50SOkfmZUQyEBaF6DRYpx/a4ahhxH3ktpNfyY8Maa9OEYxGCBkQA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm64-gnu": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.10.0.tgz", + "integrity": "sha512-aWIkOUw995V3ItfpAi5FuxQ+1e9EWLS1cjWM1jmeuo+5WtaKToJn5itgQOkvSlPz+HSLgM3VfXMvOFALNk125g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm64-musl": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.10.0.tgz", + "integrity": "sha512-uO6Gg+irqpVcCKMcEPIQcTFZ+tDI02AZkqkP7koQAjniLEappd8DnUBSQdcn53T086pHpdc264X/ZEpXFfrKWQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-x64-gnu": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.10.0.tgz", + "integrity": "sha512-134PW/u/arNFAQKpqMJniC7irbChMPz+W+qtyKPAUXE0XFKPa7c1GtlI/wK2dvP9qJDZ6bKf0KtA0U/m2HMUOA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-x64-musl": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.10.0.tgz", + "integrity": "sha512-q8sINYLdIJxK/iUx9vRk5jWAWb/2O0PAbOJFwv4qkxBv4rLoN7y+otgCZ5v0xfx/zztFgk/oNY4lg5xYjIso2Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-win32-arm64-msvc": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.10.0.tgz", + "integrity": "sha512-moJkL9kcqxUdJSRpG7dET3UeLIciwrfP08mzBQ12ewo8K8FzxU8ZUsTIVVdNrwt01CXOdXoweGfdQLjJ4qTURA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-win32-x64-msvc": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.10.0.tgz", + "integrity": "sha512-5iV2NKZnzxJwZZ4DM5JVbRG/nkhAbzEskKaLBB82PmYGKzaDHuMHP1lcPoD/rtYMlowZgNA/RQndfKvPBPwmXA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@octokit/auth-token": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.4.tgz", + "integrity": "sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/core": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz", + "integrity": "sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/auth-token": "^3.0.0", + "@octokit/graphql": "^5.0.0", + "@octokit/request": "^6.0.0", + "@octokit/request-error": "^3.0.0", + "@octokit/types": "^9.0.0", + "before-after-hook": "^2.2.0", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/endpoint": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.6.tgz", + "integrity": "sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/types": "^9.0.0", + "is-plain-object": "^5.0.0", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/graphql": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.6.tgz", + "integrity": "sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/request": "^6.0.0", + "@octokit/types": "^9.0.0", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/openapi-types": { + "version": "18.1.1", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.1.1.tgz", + "integrity": "sha512-VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@octokit/plugin-enterprise-rest": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz", + "integrity": "sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@octokit/plugin-paginate-rest": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.1.2.tgz", + "integrity": "sha512-qhrmtQeHU/IivxucOV1bbI/xZyC/iOBhclokv7Sut5vnejAIAEXVcGQeRpQlU39E0WwK9lNvJHphHri/DB6lbQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/tsconfig": "^1.0.2", + "@octokit/types": "^9.2.3" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "@octokit/core": ">=4" + } + }, + "node_modules/@octokit/plugin-request-log": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", + "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "@octokit/core": ">=3" + } + }, + "node_modules/@octokit/plugin-rest-endpoint-methods": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.2.3.tgz", + "integrity": "sha512-I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/types": "^10.0.0" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "@octokit/core": ">=3" + } + }, + "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-10.0.0.tgz", + "integrity": "sha512-Vm8IddVmhCgU1fxC1eyinpwqzXPEYu0NrYzD3YZjlGjyftdLBTeqNblRC0jmJmgxbJIsQlyogVeGnrNaaMVzIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/openapi-types": "^18.0.0" + } + }, + "node_modules/@octokit/request": { + "version": "6.2.8", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.8.tgz", + "integrity": "sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/endpoint": "^7.0.0", + "@octokit/request-error": "^3.0.0", + "@octokit/types": "^9.0.0", + "is-plain-object": "^5.0.0", + "node-fetch": "^2.6.7", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/request-error": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz", + "integrity": "sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/types": "^9.0.0", + "deprecation": "^2.0.0", + "once": "^1.4.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/rest": { + "version": "19.0.11", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.11.tgz", + "integrity": "sha512-m2a9VhaP5/tUw8FwfnW2ICXlXpLPIqxtg3XcAiGMLj/Xhw3RSBfZ8le/466ktO1Gcjr8oXudGnHhxV1TXJgFxw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/core": "^4.2.1", + "@octokit/plugin-paginate-rest": "^6.1.2", + "@octokit/plugin-request-log": "^1.0.4", + "@octokit/plugin-rest-endpoint-methods": "^7.1.2" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/tsconfig": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@octokit/tsconfig/-/tsconfig-1.0.2.tgz", + "integrity": "sha512-I0vDR0rdtP8p2lGMzvsJzbhdOWy405HcGovrspJ8RRibHnyRgggUSNO5AIox5LmqiwmatHKYsvj6VGFHkqS7lA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@octokit/types": { + "version": "9.3.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz", + "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@octokit/openapi-types": "^18.0.0" + } + }, + "node_modules/@parcel/watcher": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.4.tgz", + "integrity": "sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^3.2.1", + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@pnpm/config.env-replace": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", + "integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.22.0" + } + }, + "node_modules/@pnpm/network.ca-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz", + "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "4.2.10" + }, + "engines": { + "node": ">=12.22.0" + } + }, + "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "dev": true, + "license": "ISC" + }, + "node_modules/@pnpm/npm-conf": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz", + "integrity": "sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@pnpm/config.env-replace": "^1.1.0", + "@pnpm/network.ca-file": "^1.0.1", + "config-chain": "^1.1.11" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@sigstore/bundle": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz", + "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/protobuf-specs": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz", + "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz", + "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@sigstore/bundle": "^1.1.0", + "@sigstore/protobuf-specs": "^0.2.0", + "make-fetch-happen": "^11.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "dev": true, + "license": "ISC", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/cacache": { + "version": "17.1.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", + "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^7.7.1", + "minipass": "^7.0.3", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/cacache/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/@sigstore/sign/node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/fs-minipass/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/@sigstore/sign/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@sigstore/sign/node_modules/glob/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/@sigstore/sign/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/@sigstore/sign/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "dev": true, + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@sigstore/sign/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/@sigstore/sign/node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/@sigstore/sign/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/@sigstore/sign/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/ssri/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/@sigstore/sign/node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dev": true, + "license": "ISC", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/tuf": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", + "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.0", + "tuf-js": "^1.1.7" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@sindresorhus/is": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz", + "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sindresorhus/is?sponsor=1" + } + }, + "node_modules/@szmarczak/http-timer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz", + "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==", + "dev": true, + "license": "MIT", + "dependencies": { + "defer-to-connect": "^2.0.1" + }, + "engines": { + "node": ">=14.16" + } + }, + "node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tufjs/canonical-json": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", + "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@tufjs/models": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz", + "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@tufjs/canonical-json": "1.0.0", + "minimatch": "^9.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@types/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "node_modules/@types/http-cache-semantics": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", + "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/lodash": { + "version": "4.14.195", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.195.tgz", + "integrity": "sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/minimatch": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", + "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "20.16.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.8.tgz", + "integrity": "sha512-sbo5JmfbZNkyDv+2HCccr9Y9ZkKJBMTru7UdAsCojMGjKNjdaOV73bqEW242QrHEZL8R4LbHMrW+FHB5lZ5/bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.2" + } + }, + "node_modules/@types/normalize-package-data": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", + "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/semver": { + "version": "7.5.8", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/semver-utils": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@types/semver-utils/-/semver-utils-1.1.3.tgz", + "integrity": "sha512-T+YwkslhsM+CeuhYUxyAjWm7mJ5am/K10UX40RuA6k6Lc7eGtq8iY2xOzy7Vq0GOqhl/xZl5l2FwURZMTPTUww==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/yargs": { + "version": "16.0.9", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", + "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", + "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", + "dev": true, + "license": "MIT" + }, + "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", + "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/type-utils": "6.21.0", + "@typescript-eslint/utils": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", + "debug": "^4.3.4", + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz", + "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/typescript-estree": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz", + "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz", + "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/typescript-estree": "6.21.0", + "@typescript-eslint/utils": "6.21.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz", + "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz", + "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "minimatch": "9.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz", + "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/typescript-estree": "6.21.0", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz", + "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "6.21.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/@yarnpkg/lockfile": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/@yarnpkg/parsers": { + "version": "3.0.0-rc.46", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz", + "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "js-yaml": "^3.10.0", + "tslib": "^2.4.0" + }, + "engines": { + "node": ">=14.15.0" + } + }, + "node_modules/@yarnpkg/parsers/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/@yarnpkg/parsers/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@yarnpkg/parsers/node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@zkochan/js-yaml": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz", + "integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true, + "license": "ISC" + }, + "node_modules/acorn": { + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/add-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", + "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agentkeepalive": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz", + "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==", + "dev": true, + "license": "MIT", + "dependencies": { + "humanize-ms": "^1.2.1" + }, + "engines": { + "node": ">= 8.0.0" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-align": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", + "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.1.0" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-escapes/node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/are-we-there-yet": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", + "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", + "deprecated": "This package is no longer supported.", + "dev": true, + "license": "ISC", + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/array-differ": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", + "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/array-ify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz", + "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==", + "dev": true, + "license": "MIT" + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/async": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "dev": true, + "license": "MIT" + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/axios": { + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/before-after-hook": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz", + "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/boxen": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.1.1.tgz", + "integrity": "sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-align": "^3.0.1", + "camelcase": "^7.0.1", + "chalk": "^5.2.0", + "cli-boxes": "^3.0.0", + "string-width": "^5.1.2", + "type-fest": "^2.13.0", + "widest-line": "^4.0.1", + "wrap-ansi": "^8.1.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/boxen/node_modules/ansi-regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/boxen/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/boxen/node_modules/camelcase": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-7.0.1.tgz", + "integrity": "sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/boxen/node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/boxen/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/boxen/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/boxen/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/boxen/node_modules/type-fest": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", + "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/boxen/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/builtins": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/byte-size": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-8.1.1.tgz", + "integrity": "sha512-tUkzZWK0M/qdoLEqikxBWe4kumyuwjl3HO6zHTr4yEI23EojPtLYXdG1+AQY7MN0cGyNDvEaJ8wiYQm6P2bPxg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.17" + } + }, + "node_modules/cacache": { + "version": "16.1.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", + "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^2.1.0", + "@npmcli/move-file": "^2.0.0", + "chownr": "^2.0.0", + "fs-minipass": "^2.1.0", + "glob": "^8.0.1", + "infer-owner": "^1.0.4", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "mkdirp": "^1.0.4", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^9.0.0", + "tar": "^6.1.11", + "unique-filename": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/cacache/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/cacache/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/cacache/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/cacheable-lookup": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz", + "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.16" + } + }, + "node_modules/cacheable-request": { + "version": "10.2.14", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz", + "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/http-cache-semantics": "^4.0.2", + "get-stream": "^6.0.1", + "http-cache-semantics": "^4.1.1", + "keyv": "^4.5.3", + "mimic-response": "^4.0.0", + "normalize-url": "^8.0.0", + "responselike": "^3.0.0" + }, + "engines": { + "node": ">=14.16" + } + }, + "node_modules/cacheable-request/node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "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": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase-keys": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", + "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true, + "license": "MIT" + }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/cli-boxes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz", + "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-spinners": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-table3": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz", + "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "string-width": "^4.2.0" + }, + "engines": { + "node": "10.* || >= 12.*" + }, + "optionalDependencies": { + "@colors/colors": "1.5.0" + } + }, + "node_modules/cli-width": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 10" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/clone-deep/node_modules/is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, + "license": "MIT", + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/cmd-shim": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz", + "integrity": "sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.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==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "dev": true, + "license": "ISC", + "bin": { + "color-support": "bin.js" + } + }, + "node_modules/columnify": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz", + "integrity": "sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "strip-ansi": "^6.0.1", + "wcwidth": "^1.0.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/compare-func": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz", + "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-ify": "^1.0.0", + "dot-prop": "^5.1.0" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/concat-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", + "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", + "dev": true, + "engines": [ + "node >= 6.0" + ], + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.0.2", + "typedarray": "^0.0.6" + } + }, + "node_modules/config-chain": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", + "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, + "node_modules/configstore": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz", + "integrity": "sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "dot-prop": "^6.0.1", + "graceful-fs": "^4.2.6", + "unique-string": "^3.0.0", + "write-file-atomic": "^3.0.3", + "xdg-basedir": "^5.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/yeoman/configstore?sponsor=1" + } + }, + "node_modules/configstore/node_modules/dot-prop": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", + "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-obj": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/configstore/node_modules/write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/conventional-changelog-angular": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz", + "integrity": "sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "compare-func": "^2.0.0" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/conventional-changelog-core": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-5.0.1.tgz", + "integrity": "sha512-Rvi5pH+LvgsqGwZPZ3Cq/tz4ty7mjijhr3qR4m9IBXNbxGGYgTVVO+duXzz9aArmHxFtwZ+LRkrNIMDQzgoY4A==", + "dev": true, + "license": "MIT", + "dependencies": { + "add-stream": "^1.0.0", + "conventional-changelog-writer": "^6.0.0", + "conventional-commits-parser": "^4.0.0", + "dateformat": "^3.0.3", + "get-pkg-repo": "^4.2.1", + "git-raw-commits": "^3.0.0", + "git-remote-origin-url": "^2.0.0", + "git-semver-tags": "^5.0.0", + "normalize-package-data": "^3.0.3", + "read-pkg": "^3.0.0", + "read-pkg-up": "^3.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/conventional-changelog-preset-loader": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-3.0.0.tgz", + "integrity": "sha512-qy9XbdSLmVnwnvzEisjxdDiLA4OmV3o8db+Zdg4WiFw14fP3B6XNz98X0swPPpkTd/pc1K7+adKgEDM1JCUMiA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/conventional-changelog-writer": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-6.0.1.tgz", + "integrity": "sha512-359t9aHorPw+U+nHzUXHS5ZnPBOizRxfQsWT5ZDHBfvfxQOAik+yfuhKXG66CN5LEWPpMNnIMHUTCKeYNprvHQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "conventional-commits-filter": "^3.0.0", + "dateformat": "^3.0.3", + "handlebars": "^4.7.7", + "json-stringify-safe": "^5.0.1", + "meow": "^8.1.2", + "semver": "^7.0.0", + "split": "^1.0.1" + }, + "bin": { + "conventional-changelog-writer": "cli.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/conventional-commits-filter": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-3.0.0.tgz", + "integrity": "sha512-1ymej8b5LouPx9Ox0Dw/qAO2dVdfpRFq28e5Y0jJEU8ZrLdy0vOSkkIInwmxErFGhg6SALro60ZrwYFVTUDo4Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash.ismatch": "^4.4.0", + "modify-values": "^1.0.1" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/conventional-commits-parser": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz", + "integrity": "sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-text-path": "^1.0.1", + "JSONStream": "^1.3.5", + "meow": "^8.1.2", + "split2": "^3.2.2" + }, + "bin": { + "conventional-commits-parser": "cli.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/conventional-recommended-bump": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-7.0.1.tgz", + "integrity": "sha512-Ft79FF4SlOFvX4PkwFDRnaNiIVX7YbmqGU0RwccUaiGvgp3S0a8ipR2/Qxk31vclDNM+GSdJOVs2KrsUCjblVA==", + "dev": true, + "license": "MIT", + "dependencies": { + "concat-stream": "^2.0.0", + "conventional-changelog-preset-loader": "^3.0.0", + "conventional-commits-filter": "^3.0.0", + "conventional-commits-parser": "^4.0.0", + "git-raw-commits": "^3.0.0", + "git-semver-tags": "^5.0.0", + "meow": "^8.1.2" + }, + "bin": { + "conventional-recommended-bump": "cli.js" + }, + "engines": { + "node": ">=14" + } + }, + "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==", + "dev": true, + "license": "MIT" + }, + "node_modules/cosmiconfig": { + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", + "dev": true, + "license": "MIT", + "dependencies": { + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0", + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "cross-spawn": "^7.0.1" + }, + "bin": { + "cross-env": "src/bin/cross-env.js", + "cross-env-shell": "src/bin/cross-env-shell.js" + }, + "engines": { + "node": ">=10.14", + "npm": ">=6", + "yarn": ">=1" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/crypto-random-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz", + "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^1.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/crypto-random-string/node_modules/type-fest": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", + "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/dargs": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", + "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/date-fns": { + "version": "2.21.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.21.1.tgz", + "integrity": "sha512-m1WR0xGiC6j6jNFAyW4Nvh4WxAi4JF4w9jRJwSI8nBmNcyZXPcP9VUQG+6gHQXAmqaGEKDKhOqAtENDC941UkA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.11" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/date-fns" + } + }, + "node_modules/dateformat": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", + "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decamelize-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", + "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", + "dev": true, + "license": "MIT", + "dependencies": { + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decamelize-keys/node_modules/map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decompress-response/node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/dedent": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", + "dev": true, + "license": "MIT" + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/defaults": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "clone": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/defer-to-connect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", + "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/deprecation": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", + "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/detect-indent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", + "integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dot-prop": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-obj": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/dotenv": { + "version": "16.3.2", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz", + "integrity": "sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/motdotla/dotenv?sponsor=1" + } + }, + "node_modules/dotenv-expand": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz", + "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + } + }, + "node_modules/duplexer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", + "dev": true, + "license": "MIT" + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true, + "license": "MIT" + }, + "node_modules/ejs": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/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==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/envinfo": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", + "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", + "dev": true, + "license": "MIT", + "bin": { + "envinfo": "dist/cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", + "dev": true, + "license": "MIT" + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-goat": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz", + "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-prettier": { + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", + "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", + "dev": true, + "license": "MIT", + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-simple-import-sort": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz", + "integrity": "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "eslint": ">=5.0.0" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/eslint/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "dev": true, + "license": "MIT" + }, + "node_modules/execa": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", + "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "license": "MIT", + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/external-editor/node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/fast-check": { + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-3.22.0.tgz", + "integrity": "sha512-8HKz3qXqnHYp/VCNn2qfjHdAdcI8zcSqOyX64GOMukp7SL2bfzfeDKjSd+UyECtejccaZv3LcvZTm9YDD22iCQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ], + "license": "MIT", + "dependencies": { + "pure-rand": "^6.1.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dev": true, + "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.4" + }, + "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==", + "dev": true, + "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", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-memoize": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz", + "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/figures/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "license": "BSD-3-Clause", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "dev": true, + "license": "ISC" + }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/foreground-child": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/form-data-encoder": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", + "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14.17" + } + }, + "node_modules/fp-and-or": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.4.tgz", + "integrity": "sha512-+yRYRhpnFPWXSly/6V4Lw9IfOV26uu30kynGJ03PW+MnjOEQe45RZ141QcS0aJehYBYA50GfCDnsRbFJdhssRw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true, + "license": "MIT" + }, + "node_modules/fs-extra": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gauge": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", + "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", + "deprecated": "This package is no longer supported.", + "dev": true, + "license": "ISC", + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.3", + "console-control-strings": "^1.1.0", + "has-unicode": "^2.0.1", + "signal-exit": "^3.0.7", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.5" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-pkg-repo": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz", + "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@hutson/parse-repository-url": "^3.0.0", + "hosted-git-info": "^4.0.0", + "through2": "^2.0.0", + "yargs": "^16.2.0" + }, + "bin": { + "get-pkg-repo": "src/cli.js" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-port": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz", + "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-stream": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz", + "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/git-raw-commits": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-3.0.0.tgz", + "integrity": "sha512-b5OHmZ3vAgGrDn/X0kS+9qCfNKWe4K/jFnhwzVWWg0/k5eLa3060tZShrRg8Dja5kPc+YjS0Gc6y7cRr44Lpjw==", + "dev": true, + "license": "MIT", + "dependencies": { + "dargs": "^7.0.0", + "meow": "^8.1.2", + "split2": "^3.2.2" + }, + "bin": { + "git-raw-commits": "cli.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/git-remote-origin-url": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz", + "integrity": "sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "gitconfiglocal": "^1.0.0", + "pify": "^2.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/git-remote-origin-url/node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/git-semver-tags": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-5.0.1.tgz", + "integrity": "sha512-hIvOeZwRbQ+7YEUmCkHqo8FOLQZCEn18yevLHADlFPZY02KJGsu5FZt9YW/lybfK2uhWFI7Qg/07LekJiTv7iA==", + "dev": true, + "license": "MIT", + "dependencies": { + "meow": "^8.1.2", + "semver": "^7.0.0" + }, + "bin": { + "git-semver-tags": "cli.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/git-up": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz", + "integrity": "sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-ssh": "^1.4.0", + "parse-url": "^8.1.0" + } + }, + "node_modules/git-url-parse": { + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz", + "integrity": "sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==", + "dev": true, + "license": "MIT", + "dependencies": { + "git-up": "^7.0.0" + } + }, + "node_modules/gitconfiglocal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz", + "integrity": "sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==", + "dev": true, + "license": "BSD", + "dependencies": { + "ini": "^1.3.2" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/glob/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/global-dirs": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", + "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ini": "2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/global-dirs/node_modules/ini": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", + "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/got": { + "version": "12.6.1", + "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz", + "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sindresorhus/is": "^5.2.0", + "@szmarczak/http-timer": "^5.0.1", + "cacheable-lookup": "^7.0.0", + "cacheable-request": "^10.2.8", + "decompress-response": "^6.0.0", + "form-data-encoder": "^2.1.2", + "get-stream": "^6.0.1", + "http2-wrapper": "^2.1.10", + "lowercase-keys": "^3.0.0", + "p-cancelable": "^3.0.0", + "responselike": "^3.0.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sindresorhus/got?sponsor=1" + } + }, + "node_modules/got/node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "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/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/handlebars": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, + "node_modules/hard-rejection": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", + "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/has-yarn": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz", + "integrity": "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/hosted-git-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/http2-wrapper": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz", + "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "quick-lru": "^5.1.1", + "resolve-alpn": "^1.2.0" + }, + "engines": { + "node": ">=10.19.0" + } + }, + "node_modules/http2-wrapper/node_modules/quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/humanize-ms": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", + "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.0.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "BSD-3-Clause" + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/ignore-walk": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz", + "integrity": "sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minimatch": "^5.0.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/ignore-walk/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "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/import-lazy": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", + "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/import-local": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/infer-owner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", + "dev": true, + "license": "ISC" + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true, + "license": "ISC" + }, + "node_modules/init-package-json": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-5.0.0.tgz", + "integrity": "sha512-kBhlSheBfYmq3e0L1ii+VKe3zBTLL5lDCDWR+f9dLmEGSB3MqLlMlsolubSsyI88Bg6EA+BIMlomAnQ1SwgQBw==", + "dev": true, + "license": "ISC", + "dependencies": { + "npm-package-arg": "^10.0.0", + "promzard": "^1.0.0", + "read": "^2.0.0", + "read-package-json": "^6.0.0", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/init-package-json/node_modules/hosted-git-info": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", + "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/init-package-json/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/init-package-json/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "dev": true, + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/inquirer": { + "version": "8.2.6", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", + "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.1", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.21", + "mute-stream": "0.0.8", + "ora": "^5.4.1", + "run-async": "^2.4.0", + "rxjs": "^7.5.5", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6", + "wrap-ansi": "^6.0.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, + "engines": { + "node": ">= 12" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-ci": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", + "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "ci-info": "^2.0.0" + }, + "bin": { + "is-ci": "bin.js" + } + }, + "node_modules/is-core-module": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "dev": true, + "license": "MIT", + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-installed-globally": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", + "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "global-dirs": "^3.0.0", + "is-path-inside": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-interactive": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-npm": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-6.0.0.tgz", + "integrity": "sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-ssh": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz", + "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "protocols": "^2.0.1" + } + }, + "node_modules/is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-text-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", + "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "text-extensions": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-docker": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-yarn-global": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.1.tgz", + "integrity": "sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + } + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/jake": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jake/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/jake/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jju": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", + "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-helpfulerror": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz", + "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==", + "dev": true, + "license": "MIT", + "dependencies": { + "jju": "^1.1.0" + } + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", + "dev": true, + "license": "ISC" + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsonc-parser": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/jsonlines": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsonlines/-/jsonlines-0.1.1.tgz", + "integrity": "sha512-ekDrAGso79Cvf+dtm+mL8OBI2bmAOt3gssYs833De/C9NmIpWDWyUO4zPgB5x2/OhY366dkhgfPMYfwZF7yOZA==", + "dev": true, + "license": "MIT" + }, + "node_modules/jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", + "dev": true, + "engines": [ + "node >= 0.2.0" + ], + "license": "MIT" + }, + "node_modules/JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "dev": true, + "license": "(MIT OR Apache-2.0)", + "dependencies": { + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" + }, + "bin": { + "JSONStream": "bin.js" + }, + "engines": { + "node": "*" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/kleur": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", + "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/latest-version": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz", + "integrity": "sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==", + "dev": true, + "license": "MIT", + "dependencies": { + "package-json": "^8.1.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lerna": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/lerna/-/lerna-7.4.2.tgz", + "integrity": "sha512-gxavfzHfJ4JL30OvMunmlm4Anw7d7Tq6tdVHzUukLdS9nWnxCN/QB21qR+VJYp5tcyXogHKbdUEGh6qmeyzxSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@lerna/child-process": "7.4.2", + "@lerna/create": "7.4.2", + "@npmcli/run-script": "6.0.2", + "@nx/devkit": ">=16.5.1 < 17", + "@octokit/plugin-enterprise-rest": "6.0.1", + "@octokit/rest": "19.0.11", + "byte-size": "8.1.1", + "chalk": "4.1.0", + "clone-deep": "4.0.1", + "cmd-shim": "6.0.1", + "columnify": "1.6.0", + "conventional-changelog-angular": "7.0.0", + "conventional-changelog-core": "5.0.1", + "conventional-recommended-bump": "7.0.1", + "cosmiconfig": "^8.2.0", + "dedent": "0.7.0", + "envinfo": "7.8.1", + "execa": "5.0.0", + "fs-extra": "^11.1.1", + "get-port": "5.1.1", + "get-stream": "6.0.0", + "git-url-parse": "13.1.0", + "glob-parent": "5.1.2", + "globby": "11.1.0", + "graceful-fs": "4.2.11", + "has-unicode": "2.0.1", + "import-local": "3.1.0", + "ini": "^1.3.8", + "init-package-json": "5.0.0", + "inquirer": "^8.2.4", + "is-ci": "3.0.1", + "is-stream": "2.0.0", + "jest-diff": ">=29.4.3 < 30", + "js-yaml": "4.1.0", + "libnpmaccess": "7.0.2", + "libnpmpublish": "7.3.0", + "load-json-file": "6.2.0", + "lodash": "^4.17.21", + "make-dir": "4.0.0", + "minimatch": "3.0.5", + "multimatch": "5.0.0", + "node-fetch": "2.6.7", + "npm-package-arg": "8.1.1", + "npm-packlist": "5.1.1", + "npm-registry-fetch": "^14.0.5", + "npmlog": "^6.0.2", + "nx": ">=16.5.1 < 17", + "p-map": "4.0.0", + "p-map-series": "2.1.0", + "p-pipe": "3.1.0", + "p-queue": "6.6.2", + "p-reduce": "2.1.0", + "p-waterfall": "2.1.1", + "pacote": "^15.2.0", + "pify": "5.0.0", + "read-cmd-shim": "4.0.0", + "read-package-json": "6.0.4", + "resolve-from": "5.0.0", + "rimraf": "^4.4.1", + "semver": "^7.3.8", + "signal-exit": "3.0.7", + "slash": "3.0.0", + "ssri": "^9.0.1", + "strong-log-transformer": "2.1.0", + "tar": "6.1.11", + "temp-dir": "1.0.0", + "typescript": ">=3 < 6", + "upath": "2.0.1", + "uuid": "^9.0.0", + "validate-npm-package-license": "3.0.4", + "validate-npm-package-name": "5.0.0", + "write-file-atomic": "5.0.1", + "write-pkg": "4.0.0", + "yargs": "16.2.0", + "yargs-parser": "20.2.4" + }, + "bin": { + "lerna": "dist/cli.js" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/lerna/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/lerna/node_modules/chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/lerna/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/lerna/node_modules/glob": { + "version": "9.3.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", + "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "minimatch": "^8.0.2", + "minipass": "^4.2.4", + "path-scurry": "^1.6.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/lerna/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/lerna/node_modules/glob/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/lerna/node_modules/glob/node_modules/minimatch": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", + "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/lerna/node_modules/is-ci": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", + "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ci-info": "^3.2.0" + }, + "bin": { + "is-ci": "bin.js" + } + }, + "node_modules/lerna/node_modules/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/lerna/node_modules/minipass": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", + "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/lerna/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/lerna/node_modules/rimraf": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz", + "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^9.2.0" + }, + "bin": { + "rimraf": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/libnpmaccess": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-7.0.2.tgz", + "integrity": "sha512-vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw==", + "dev": true, + "license": "ISC", + "dependencies": { + "npm-package-arg": "^10.1.0", + "npm-registry-fetch": "^14.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/libnpmaccess/node_modules/hosted-git-info": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", + "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/libnpmaccess/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/libnpmaccess/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "dev": true, + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/libnpmpublish": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-7.3.0.tgz", + "integrity": "sha512-fHUxw5VJhZCNSls0KLNEG0mCD2PN1i14gH5elGOgiVnU3VgTcRahagYP2LKI1m0tFCJ+XrAm0zVYyF5RCbXzcg==", + "dev": true, + "license": "ISC", + "dependencies": { + "ci-info": "^3.6.1", + "normalize-package-data": "^5.0.0", + "npm-package-arg": "^10.1.0", + "npm-registry-fetch": "^14.0.3", + "proc-log": "^3.0.0", + "semver": "^7.3.7", + "sigstore": "^1.4.0", + "ssri": "^10.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/libnpmpublish/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/libnpmpublish/node_modules/hosted-git-info": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", + "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/libnpmpublish/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/libnpmpublish/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/libnpmpublish/node_modules/normalize-package-data": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", + "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^6.0.0", + "is-core-module": "^2.8.1", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/libnpmpublish/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "dev": true, + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/libnpmpublish/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/lines-and-columns": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz", + "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/load-json-file": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz", + "integrity": "sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.15", + "parse-json": "^5.0.0", + "strip-bom": "^4.0.0", + "type-fest": "^0.6.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/load-json-file/node_modules/type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.ismatch": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz", + "integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lowercase-keys": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz", + "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-fetch-happen": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", + "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "dev": true, + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^16.1.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^2.0.3", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^9.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/make-fetch-happen/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/map-obj": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz", + "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/minimist": "^1.2.0", + "camelcase-keys": "^6.2.2", + "decamelize-keys": "^1.1.0", + "hard-rejection": "^2.1.0", + "minimist-options": "4.1.0", + "normalize-package-data": "^3.0.0", + "read-pkg-up": "^7.0.1", + "redent": "^3.0.0", + "trim-newlines": "^3.0.0", + "type-fest": "^0.18.0", + "yargs-parser": "^20.2.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true, + "license": "ISC" + }, + "node_modules/meow/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/meow/node_modules/type-fest": { + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true, + "license": "MIT" + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "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==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/mimic-response": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", + "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/min-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minimist-options": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", + "dev": true, + "license": "MIT", + "dependencies": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0", + "kind-of": "^6.0.3" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-fetch": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", + "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^3.1.6", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-json-stream": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz", + "integrity": "sha512-myxeeTm57lYs8pH2nxPzmEEg8DGIgW+9mv6D4JZD2pa81I/OBjeU7PtICXV6c9eRGTA5JMDsuIPUZRCyBMYNhg==", + "dev": true, + "license": "MIT", + "dependencies": { + "jsonparse": "^1.3.1", + "minipass": "^3.0.0" + } + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/modify-values": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz", + "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/multimatch": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz", + "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/minimatch": "^3.0.3", + "array-differ": "^3.0.0", + "array-union": "^2.1.0", + "arrify": "^2.0.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/multimatch/node_modules/@types/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/multimatch/node_modules/arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/multimatch/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/multimatch/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true, + "license": "ISC" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.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==", + "dev": true, + "license": "MIT" + }, + "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==", + "dev": true, + "license": "MIT" + }, + "node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-gyp": { + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", + "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^10.0.3", + "nopt": "^6.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": "^12.13 || ^14.13 || >=16" + } + }, + "node_modules/node-gyp-build": { + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz", + "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==", + "dev": true, + "license": "MIT", + "bin": { + "node-gyp-build": "bin.js", + "node-gyp-build-optional": "optional.js", + "node-gyp-build-test": "build-test.js" + } + }, + "node_modules/node-machine-id": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz", + "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/nopt": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", + "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "^1.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/normalize-package-data": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^4.0.1", + "is-core-module": "^2.5.0", + "semver": "^7.3.4", + "validate-npm-package-license": "^3.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/normalize-url": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz", + "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/npm-bundled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz", + "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "node_modules/npm-check-updates": { + "version": "16.14.20", + "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.14.20.tgz", + "integrity": "sha512-sYbIhun4DrjO7NFOTdvs11nCar0etEhZTsEjL47eM0TuiGMhmYughRCxG2SpGRmGAQ7AkwN7bw2lWzoE7q6yOQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@types/semver-utils": "^1.1.1", + "chalk": "^5.3.0", + "cli-table3": "^0.6.3", + "commander": "^10.0.1", + "fast-memoize": "^2.5.2", + "find-up": "5.0.0", + "fp-and-or": "^0.1.4", + "get-stdin": "^8.0.0", + "globby": "^11.0.4", + "hosted-git-info": "^5.1.0", + "ini": "^4.1.1", + "js-yaml": "^4.1.0", + "json-parse-helpfulerror": "^1.0.3", + "jsonlines": "^0.1.1", + "lodash": "^4.17.21", + "make-fetch-happen": "^11.1.1", + "minimatch": "^9.0.3", + "p-map": "^4.0.0", + "pacote": "15.2.0", + "parse-github-url": "^1.0.2", + "progress": "^2.0.3", + "prompts-ncu": "^3.0.0", + "rc-config-loader": "^4.1.3", + "remote-git-tags": "^3.0.0", + "rimraf": "^5.0.5", + "semver": "^7.5.4", + "semver-utils": "^1.1.4", + "source-map-support": "^0.5.21", + "spawn-please": "^2.0.2", + "strip-ansi": "^7.1.0", + "strip-json-comments": "^5.0.1", + "untildify": "^4.0.0", + "update-notifier": "^6.0.2" + }, + "bin": { + "ncu": "build/src/bin/cli.js", + "npm-check-updates": "build/src/bin/cli.js" + }, + "engines": { + "node": ">=14.14" + } + }, + "node_modules/npm-check-updates/node_modules/@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "dev": true, + "license": "ISC", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-check-updates/node_modules/ansi-regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/npm-check-updates/node_modules/cacache": { + "version": "17.1.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", + "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^7.7.1", + "minipass": "^7.0.3", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-check-updates/node_modules/cacache/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-check-updates/node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/npm-check-updates/node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-check-updates/node_modules/fs-minipass/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-check-updates/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/npm-check-updates/node_modules/glob/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-check-updates/node_modules/hosted-git-info": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", + "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/npm-check-updates/node_modules/ini": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz", + "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-check-updates/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/npm-check-updates/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "dev": true, + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-check-updates/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/npm-check-updates/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/npm-check-updates/node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/npm-check-updates/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-check-updates/node_modules/rimraf": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", + "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^10.3.7" + }, + "bin": { + "rimraf": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/npm-check-updates/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-check-updates/node_modules/ssri/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-check-updates/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/npm-check-updates/node_modules/strip-json-comments": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz", + "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/npm-check-updates/node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dev": true, + "license": "ISC", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-check-updates/node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-install-checks": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", + "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "semver": "^7.1.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", + "dev": true, + "license": "ISC" + }, + "node_modules/npm-package-arg": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz", + "integrity": "sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg==", + "dev": true, + "license": "ISC", + "dependencies": { + "hosted-git-info": "^3.0.6", + "semver": "^7.0.0", + "validate-npm-package-name": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/npm-package-arg/node_modules/builtins": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", + "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/npm-package-arg/node_modules/hosted-git-info": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz", + "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/npm-package-arg/node_modules/validate-npm-package-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", + "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==", + "dev": true, + "license": "ISC", + "dependencies": { + "builtins": "^1.0.3" + } + }, + "node_modules/npm-packlist": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.1.tgz", + "integrity": "sha512-UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^8.0.1", + "ignore-walk": "^5.0.1", + "npm-bundled": "^1.1.2", + "npm-normalize-package-bin": "^1.0.1" + }, + "bin": { + "npm-packlist": "bin/index.js" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/npm-packlist/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/npm-packlist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/npm-pick-manifest": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz", + "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==", + "dev": true, + "license": "ISC", + "dependencies": { + "npm-install-checks": "^6.0.0", + "npm-normalize-package-bin": "^3.0.0", + "npm-package-arg": "^10.0.0", + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-pick-manifest/node_modules/hosted-git-info": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", + "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-pick-manifest/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/npm-pick-manifest/node_modules/npm-normalize-package-bin": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-pick-manifest/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "dev": true, + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch": { + "version": "14.0.5", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz", + "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==", + "dev": true, + "license": "ISC", + "dependencies": { + "make-fetch-happen": "^11.0.0", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-json-stream": "^1.0.1", + "minizlib": "^2.1.2", + "npm-package-arg": "^10.0.0", + "proc-log": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "dev": true, + "license": "ISC", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/cacache": { + "version": "17.1.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", + "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^7.7.1", + "minipass": "^7.0.3", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/cacache/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-registry-fetch/node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/fs-minipass/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-registry-fetch/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/npm-registry-fetch/node_modules/glob/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-registry-fetch/node_modules/hosted-git-info": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", + "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "dev": true, + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/npm-registry-fetch/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/npm-registry-fetch/node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/npm-registry-fetch/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-registry-fetch/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "dev": true, + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/ssri/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-registry-fetch/node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dev": true, + "license": "ISC", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/npmlog": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", + "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", + "deprecated": "This package is no longer supported.", + "dev": true, + "license": "ISC", + "dependencies": { + "are-we-there-yet": "^3.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^4.0.3", + "set-blocking": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/nx": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/nx/-/nx-16.10.0.tgz", + "integrity": "sha512-gZl4iCC0Hx0Qe1VWmO4Bkeul2nttuXdPpfnlcDKSACGu3ZIo+uySqwOF8yBAxSTIf8xe2JRhgzJN1aFkuezEBg==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@nrwl/tao": "16.10.0", + "@parcel/watcher": "2.0.4", + "@yarnpkg/lockfile": "^1.1.0", + "@yarnpkg/parsers": "3.0.0-rc.46", + "@zkochan/js-yaml": "0.0.6", + "axios": "^1.0.0", + "chalk": "^4.1.0", + "cli-cursor": "3.1.0", + "cli-spinners": "2.6.1", + "cliui": "^8.0.1", + "dotenv": "~16.3.1", + "dotenv-expand": "~10.0.0", + "enquirer": "~2.3.6", + "figures": "3.2.0", + "flat": "^5.0.2", + "fs-extra": "^11.1.0", + "glob": "7.1.4", + "ignore": "^5.0.4", + "jest-diff": "^29.4.1", + "js-yaml": "4.1.0", + "jsonc-parser": "3.2.0", + "lines-and-columns": "~2.0.3", + "minimatch": "3.0.5", + "node-machine-id": "1.1.12", + "npm-run-path": "^4.0.1", + "open": "^8.4.0", + "semver": "7.5.3", + "string-width": "^4.2.3", + "strong-log-transformer": "^2.1.0", + "tar-stream": "~2.2.0", + "tmp": "~0.2.1", + "tsconfig-paths": "^4.1.2", + "tslib": "^2.3.0", + "v8-compile-cache": "2.3.0", + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" + }, + "bin": { + "nx": "bin/nx.js" + }, + "optionalDependencies": { + "@nx/nx-darwin-arm64": "16.10.0", + "@nx/nx-darwin-x64": "16.10.0", + "@nx/nx-freebsd-x64": "16.10.0", + "@nx/nx-linux-arm-gnueabihf": "16.10.0", + "@nx/nx-linux-arm64-gnu": "16.10.0", + "@nx/nx-linux-arm64-musl": "16.10.0", + "@nx/nx-linux-x64-gnu": "16.10.0", + "@nx/nx-linux-x64-musl": "16.10.0", + "@nx/nx-win32-arm64-msvc": "16.10.0", + "@nx/nx-win32-x64-msvc": "16.10.0" + }, + "peerDependencies": { + "@swc-node/register": "^1.6.7", + "@swc/core": "^1.3.85" + }, + "peerDependenciesMeta": { + "@swc-node/register": { + "optional": true + }, + "@swc/core": { + "optional": true + } + } + }, + "node_modules/nx/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/nx/node_modules/glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/nx/node_modules/jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "dev": true, + "license": "MIT" + }, + "node_modules/nx/node_modules/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/nx/node_modules/semver": { + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/nx/node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/nx/node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/open": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/ora": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ordinal": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ordinal/-/ordinal-1.0.3.tgz", + "integrity": "sha512-cMddMgb2QElm8G7vdaa02jhUNbTSrhsgAGUz1OokD83uJTwSUn+nKoNoKVVaRa08yF6sgfO7Maou1+bgLd9rdQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/p-cancelable": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", + "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.20" + } + }, + "node_modules/p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map-series": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz", + "integrity": "sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/p-pipe": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz", + "integrity": "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-queue": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz", + "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eventemitter3": "^4.0.4", + "p-timeout": "^3.2.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-reduce": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz", + "integrity": "sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/p-timeout": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", + "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-finally": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/p-waterfall": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/p-waterfall/-/p-waterfall-2.1.1.tgz", + "integrity": "sha512-RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-reduce": "^2.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/package-json": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.1.tgz", + "integrity": "sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==", + "dev": true, + "license": "MIT", + "dependencies": { + "got": "^12.1.0", + "registry-auth-token": "^5.0.1", + "registry-url": "^6.0.0", + "semver": "^7.3.7" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "dev": true, + "license": "BlueOak-1.0.0" + }, + "node_modules/pacote": { + "version": "15.2.0", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz", + "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/git": "^4.0.0", + "@npmcli/installed-package-contents": "^2.0.1", + "@npmcli/promise-spawn": "^6.0.1", + "@npmcli/run-script": "^6.0.0", + "cacache": "^17.0.0", + "fs-minipass": "^3.0.0", + "minipass": "^5.0.0", + "npm-package-arg": "^10.0.0", + "npm-packlist": "^7.0.0", + "npm-pick-manifest": "^8.0.0", + "npm-registry-fetch": "^14.0.0", + "proc-log": "^3.0.0", + "promise-retry": "^2.0.1", + "read-package-json": "^6.0.0", + "read-package-json-fast": "^3.0.0", + "sigstore": "^1.3.0", + "ssri": "^10.0.0", + "tar": "^6.1.11" + }, + "bin": { + "pacote": "lib/bin.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "dev": true, + "license": "ISC", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/cacache": { + "version": "17.1.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", + "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^7.7.1", + "minipass": "^7.0.3", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/cacache/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/pacote/node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/fs-minipass/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/pacote/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/pacote/node_modules/glob/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/pacote/node_modules/hosted-git-info": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", + "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/ignore-walk": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz", + "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==", + "dev": true, + "license": "ISC", + "dependencies": { + "minimatch": "^9.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/pacote/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/pacote/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/pacote/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "dev": true, + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/npm-packlist": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz", + "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "ignore-walk": "^6.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/ssri/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/pacote/node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dev": true, + "license": "ISC", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-github-url": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.3.tgz", + "integrity": "sha512-tfalY5/4SqGaV/GIGzWyHnFjlpTPTNpENR9Ea2lLldSJ8EWXMsvacWucqY3m3I4YPtas15IxTLQVQ5NSYXPrww==", + "dev": true, + "license": "MIT", + "bin": { + "parse-github-url": "cli.js" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse-json/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==", + "dev": true, + "license": "MIT" + }, + "node_modules/parse-path": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz", + "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==", + "dev": true, + "license": "MIT", + "dependencies": { + "protocols": "^2.0.0" + } + }, + "node_modules/parse-url": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz", + "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==", + "dev": true, + "license": "MIT", + "dependencies": { + "parse-path": "^7.0.0" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/path-scurry/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/picocolors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz", + "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "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", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/proc-log": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", + "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true, + "license": "MIT" + }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/promise-inflight": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", + "dev": true, + "license": "ISC" + }, + "node_modules/promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/prompts-ncu": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/prompts-ncu/-/prompts-ncu-3.0.0.tgz", + "integrity": "sha512-qyz9UxZ5MlPKWVhWrCmSZ1ahm2GVYdjLb8og2sg0IPth1KRuhcggHGuijz0e41dkx35p1t1q3GRISGH7QGALFA==", + "dev": true, + "license": "MIT", + "dependencies": { + "kleur": "^4.0.1", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/prompts/node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/promzard": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/promzard/-/promzard-1.0.2.tgz", + "integrity": "sha512-2FPputGL+mP3jJ3UZg/Dl9YOkovB7DX0oOr+ck5QbZ5MtORtds8k/BZdn+02peDLI8/YWbmzx34k5fA+fHvCVQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "read": "^3.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/promzard/node_modules/mute-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", + "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/promzard/node_modules/read": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/read/-/read-3.0.1.tgz", + "integrity": "sha512-SLBrDU/Srs/9EoWhU5GdbAoxG1GzpQHo/6qiGItaoLJ1thmYpcNIM1qISEUvyHBzfGlWIyd6p2DNi1oV1VmAuw==", + "dev": true, + "license": "ISC", + "dependencies": { + "mute-stream": "^1.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", + "dev": true, + "license": "ISC" + }, + "node_modules/protocols": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz", + "integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true, + "license": "MIT" + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/pupa": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz", + "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-goat": "^4.0.0" + }, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pure-rand": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", + "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ], + "license": "MIT" + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/quick-lru": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "dev": true, + "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "node_modules/rc-config-loader": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.3.tgz", + "integrity": "sha512-kD7FqML7l800i6pS6pvLyIE2ncbk9Du8Q0gp/4hMPhJU6ZxApkoLcGD8ZeqgiAlfwZ6BlETq6qqe+12DUL207w==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.3.4", + "js-yaml": "^4.1.0", + "json5": "^2.2.2", + "require-from-string": "^2.0.2" + } + }, + "node_modules/rc/node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "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==", + "dev": true, + "license": "MIT" + }, + "node_modules/read": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/read/-/read-2.1.0.tgz", + "integrity": "sha512-bvxi1QLJHcaywCAEsAk4DG3nVoqiY2Csps3qzWalhj5hFqRn1d/OixkFXtLO1PrgHUcAP0FNaSY/5GYNfENFFQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "mute-stream": "~1.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-cmd-shim": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz", + "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-package-json": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz", + "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==", + "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^10.2.2", + "json-parse-even-better-errors": "^3.0.0", + "normalize-package-data": "^5.0.0", + "npm-normalize-package-bin": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-package-json-fast": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", + "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", + "dev": true, + "license": "ISC", + "dependencies": { + "json-parse-even-better-errors": "^3.0.0", + "npm-normalize-package-bin": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-package-json-fast/node_modules/json-parse-even-better-errors": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", + "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-package-json-fast/node_modules/npm-normalize-package-bin": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-package-json/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/read-package-json/node_modules/hosted-git-info": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", + "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-package-json/node_modules/json-parse-even-better-errors": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", + "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-package-json/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/read-package-json/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/read-package-json/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/read-package-json/node_modules/normalize-package-data": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", + "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^6.0.0", + "is-core-module": "^2.8.1", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-package-json/node_modules/npm-normalize-package-bin": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", + "integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true, + "license": "ISC" + }, + "node_modules/read-pkg/node_modules/load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/read-pkg/node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "license": "MIT", + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "dev": true, + "license": "MIT", + "dependencies": { + "pify": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/read-pkg/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/read-yaml-file": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/read-yaml-file/-/read-yaml-file-2.1.0.tgz", + "integrity": "sha512-UkRNRIwnhG+y7hpqnycCL/xbTk7+ia9VuVTC0S+zVbwd65DI9eUpRMfsWIGrCWxTU/mi+JW8cHQCrv+zfCbEPQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "js-yaml": "^4.0.0", + "strip-bom": "^4.0.0" + }, + "engines": { + "node": ">=10.13" + } + }, + "node_modules/read/node_modules/mute-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", + "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/redent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", + "dev": true, + "license": "MIT", + "dependencies": { + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/registry-auth-token": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz", + "integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@pnpm/npm-conf": "^2.1.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/registry-url": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz", + "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "rc": "1.2.8" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/remote-git-tags": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz", + "integrity": "sha512-C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-alpn": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", + "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-cwd/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/responselike": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz", + "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==", + "dev": true, + "license": "MIT", + "dependencies": { + "lowercase-keys": "^3.0.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true, + "license": "MIT" + }, + "node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz", + "integrity": "sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/semver-utils": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.4.tgz", + "integrity": "sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==", + "dev": true, + "license": "APACHEv2" + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "dev": true, + "license": "ISC" + }, + "node_modules/shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "dev": true, + "license": "MIT", + "dependencies": { + "kind-of": "^6.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/sigstore": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz", + "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@sigstore/bundle": "^1.1.0", + "@sigstore/protobuf-specs": "^0.2.0", + "@sigstore/sign": "^1.0.0", + "@sigstore/tuf": "^1.0.3", + "make-fetch-happen": "^11.0.1" + }, + "bin": { + "sigstore": "bin/sigstore.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sigstore/node_modules/@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "dev": true, + "license": "ISC", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sigstore/node_modules/cacache": { + "version": "17.1.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", + "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^7.7.1", + "minipass": "^7.0.3", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sigstore/node_modules/cacache/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/sigstore/node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sigstore/node_modules/fs-minipass/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/sigstore/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/sigstore/node_modules/glob/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/sigstore/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/sigstore/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "dev": true, + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sigstore/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/sigstore/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/sigstore/node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/sigstore/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/sigstore/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sigstore/node_modules/ssri/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/sigstore/node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dev": true, + "license": "ISC", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sigstore/node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true, + "license": "MIT" + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", + "dev": true, + "license": "MIT", + "dependencies": { + "ip-address": "^9.0.5", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", + "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/sort-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", + "integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-plain-obj": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/spawn-please": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.2.tgz", + "integrity": "sha512-KM8coezO6ISQ89c1BzyWNtcn2V2kAVtwIXd3cN/V5a0xPYc1F/vydrRc01wsKFEQ/p+V1a4sw4z2yMITIXrgGw==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.3" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "dev": true, + "license": "CC-BY-3.0" + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", + "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", + "dev": true, + "license": "CC0-1.0" + }, + "node_modules/split": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", + "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", + "dev": true, + "license": "MIT", + "dependencies": { + "through": "2" + }, + "engines": { + "node": "*" + } + }, + "node_modules/split2": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", + "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", + "dev": true, + "license": "ISC", + "dependencies": { + "readable-stream": "^3.0.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/ssri": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", + "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.1.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-indent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "min-indent": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/strong-log-transformer": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", + "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "duplexer": "^0.1.1", + "minimist": "^1.2.0", + "through": "^2.3.4" + }, + "bin": { + "sl-log-transformer": "bin/sl-log-transformer.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/syncpack": { + "version": "10.9.3", + "resolved": "https://registry.npmjs.org/syncpack/-/syncpack-10.9.3.tgz", + "integrity": "sha512-urdxuqkvO2/4tB1GaZGbCTzOgdi1XJzHjpiG4DTunOMH4oChSg54hczzzybfFQhqUl0ZY8A6LJNziKsf3J6E7g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@effect/data": "0.17.1", + "@effect/io": "0.37.1", + "@effect/match": "0.31.0", + "@effect/schema": "0.32.0", + "chalk": "4.1.2", + "commander": "11.0.0", + "cosmiconfig": "8.2.0", + "enquirer": "2.4.1", + "fs-extra": "11.1.1", + "globby": "11.1.0", + "minimatch": "9.0.3", + "npm-package-arg": "10.1.0", + "ora": "5.4.1", + "prompts": "2.4.2", + "read-yaml-file": "2.1.0", + "semver": "7.5.4", + "tightrope": "0.1.0", + "ts-toolbelt": "9.6.0" + }, + "bin": { + "syncpack": "dist/bin.js", + "syncpack-fix-mismatches": "dist/bin-fix-mismatches/index.js", + "syncpack-format": "dist/bin-format/index.js", + "syncpack-lint": "dist/bin-lint/index.js", + "syncpack-lint-semver-ranges": "dist/bin-lint-semver-ranges/index.js", + "syncpack-list": "dist/bin-list/index.js", + "syncpack-list-mismatches": "dist/bin-list-mismatches/index.js", + "syncpack-prompt": "dist/bin-prompt/index.js", + "syncpack-set-semver-ranges": "dist/bin-set-semver-ranges/index.js", + "syncpack-update": "dist/bin-update/index.js" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/syncpack/node_modules/commander": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz", + "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + } + }, + "node_modules/syncpack/node_modules/cosmiconfig": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz", + "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + } + }, + "node_modules/syncpack/node_modules/enquirer": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", + "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.1", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/syncpack/node_modules/fs-extra": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, + "node_modules/syncpack/node_modules/hosted-git-info": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", + "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/syncpack/node_modules/hosted-git-info/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/syncpack/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "dev": true, + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/syncpack/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "dev": true, + "license": "ISC", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/temp-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", + "integrity": "sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/text-extensions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", + "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true, + "license": "MIT" + }, + "node_modules/through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + }, + "node_modules/through2/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/through2/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/through2/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/throw-expression": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/throw-expression/-/throw-expression-2.1.0.tgz", + "integrity": "sha512-ZVP9rT4wC596AkWEyYprufvUV+ppfz0xK7H9Ka3WeTKufn5pnfESxicIDnaJyf88pGHaIx2GkwNC4Qjh0OdEwA==", + "dev": true, + "license": "MIT" + }, + "node_modules/tightrope": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/tightrope/-/tightrope-0.1.0.tgz", + "integrity": "sha512-HHHNYdCAIYwl1jOslQBT455zQpdeSo8/A346xpIb/uuqhSg+tCvYNsP5f11QW+z9VZ3vSX8YIfzTApjjuGH63w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/tmp": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.14" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/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/trim-newlines": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ts-api-utils": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", + "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, + "node_modules/ts-is-present": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ts-is-present/-/ts-is-present-1.2.1.tgz", + "integrity": "sha512-EYHn58qVRd/VHGkHSNGQJAxPXhF9wRiphYXl04VznngqqKjcT2jfHvAMPuzh8sRKdvifXw+dq6/Q3hG+nr3DRA==", + "dev": true, + "license": "MIT" + }, + "node_modules/ts-toolbelt": { + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/ts-toolbelt/-/ts-toolbelt-9.6.0.tgz", + "integrity": "sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tsconfig-paths/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/tsdef": { + "version": "0.0.14", + "resolved": "https://registry.npmjs.org/tsdef/-/tsdef-0.0.14.tgz", + "integrity": "sha512-UjMD4XKRWWFlFBfwKVQmGFT5YzW/ZaF8x6KpCDf92u9wgKeha/go3FU0e5WqDjXsCOdfiavCkfwfVHNDxRDGMA==", + "dev": true, + "license": "MIT" + }, + "node_modules/tslib": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "dev": true, + "license": "0BSD" + }, + "node_modules/tuf-js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", + "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@tufjs/models": "1.0.4", + "debug": "^4.3.4", + "make-fetch-happen": "^11.1.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "dev": true, + "license": "ISC", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/cacache": { + "version": "17.1.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", + "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^7.7.1", + "minipass": "^7.0.3", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/cacache/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/tuf-js/node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/fs-minipass/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/tuf-js/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/tuf-js/node_modules/glob/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/tuf-js/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/tuf-js/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "dev": true, + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/tuf-js/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/tuf-js/node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/tuf-js/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/tuf-js/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/ssri/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/tuf-js/node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dev": true, + "license": "ISC", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "node_modules/typescript": { + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "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==", + "dev": true, + "license": "BSD-2-Clause", + "optional": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "dev": true, + "license": "MIT" + }, + "node_modules/unique-filename": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", + "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", + "dev": true, + "license": "ISC", + "dependencies": { + "unique-slug": "^3.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/unique-slug": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", + "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/unique-string": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz", + "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "crypto-random-string": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/universal-user-agent": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz", + "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/untildify": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", + "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/upath": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz", + "integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4", + "yarn": "*" + } + }, + "node_modules/update-notifier": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz", + "integrity": "sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "boxen": "^7.0.0", + "chalk": "^5.0.1", + "configstore": "^6.0.0", + "has-yarn": "^3.0.0", + "import-lazy": "^4.0.0", + "is-ci": "^3.0.1", + "is-installed-globally": "^0.4.0", + "is-npm": "^6.0.0", + "is-yarn-global": "^0.4.0", + "latest-version": "^7.0.0", + "pupa": "^3.1.0", + "semver": "^7.3.7", + "semver-diff": "^4.0.0", + "xdg-basedir": "^5.1.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/yeoman/update-notifier?sponsor=1" + } + }, + "node_modules/update-notifier/node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/update-notifier/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/update-notifier/node_modules/is-ci": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", + "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ci-info": "^3.2.0" + }, + "bin": { + "is-ci": "bin.js" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/utility-types": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz", + "integrity": "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "dev": true, + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "dev": true, + "license": "MIT" + }, + "node_modules/validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/validate-npm-package-name": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", + "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "builtins": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "dev": true, + "license": "MIT", + "dependencies": { + "defaults": "^1.0.3" + } + }, + "node_modules/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": { + "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/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, + "node_modules/widest-line": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz", + "integrity": "sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==", + "dev": true, + "license": "MIT", + "dependencies": { + "string-width": "^5.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/widest-line/node_modules/ansi-regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/widest-line/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/widest-line/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/widest-line/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/write-file-atomic": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", + "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/write-file-atomic/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/write-json-file": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz", + "integrity": "sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "detect-indent": "^5.0.0", + "graceful-fs": "^4.1.15", + "make-dir": "^2.1.0", + "pify": "^4.0.1", + "sort-keys": "^2.0.0", + "write-file-atomic": "^2.4.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/write-json-file/node_modules/make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "pify": "^4.0.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/write-json-file/node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/write-json-file/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/write-json-file/node_modules/write-file-atomic": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" + } + }, + "node_modules/write-pkg": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz", + "integrity": "sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==", + "dev": true, + "license": "MIT", + "dependencies": { + "sort-keys": "^2.0.0", + "type-fest": "^0.4.1", + "write-json-file": "^3.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/write-pkg/node_modules/type-fest": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz", + "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=6" + } + }, + "node_modules/xdg-basedir": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz", + "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/yargs/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } } - }, - "dependencies": { - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "requires": { - "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" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==" - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "requires": { - "wrappy": "1" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - } - } } diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 5933a1921b289..e899d7dbf1873 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -2,27 +2,31 @@ lib, fetchFromGitHub, runCommand, - jq, buildNpmPackage, - python3, stdenvNoCC, + docify, testers, + writeText, + jq, + python3, basedpyright, }: let - version = "1.17.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "refs/tags/v${version}"; - hash = "sha256-mFY0GvVGiozxd04ktSoqcezBwXkOAeIWTgNnv1zB74A="; + hash = "sha256-nYbxgrNFhQ576rN8W+Hf/Keohy1N8tihOeTQHItKPRc="; }; + # To regenerate the patched package-lock.json, copy the patched package.json + # and run `nix-shell -p nodejs --command 'npm update --package-lock'` patchedPackageJSON = runCommand "package.json" { } '' ${jq}/bin/jq ' - .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser")) + .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser" or .key == "@detachhead/ts-helpers")) | .scripts = { } ' ${src}/package.json > $out ''; @@ -30,7 +34,7 @@ let pyright-root = buildNpmPackage { pname = "pyright-root"; inherit version src; - npmDepsHash = "sha256-63kUhKrxtJhwGCRBnxBfOFXs2ARCNn+OOGu6+fSJey4="; + npmDepsHash = "sha256-vxfoaShk3ihmhr/5/2GSOuMqeo6rxebO6aiD3DybjW4="; dontNpmBuild = true; postPatch = '' cp ${patchedPackageJSON} ./package.json @@ -47,7 +51,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-IJMK/YhTldOr3Gh4ewlVLUSt3PlhIjilxB7QBJpdu80="; + npmDepsHash = "sha256-Md17EF3a1GBfnHD2fnLGS76r0xiWYJmBBTzZWRc0j5c="; dontNpmBuild = true; # Uncomment this flag when using unreleased peer dependencies # npmFlags = [ "--legacy-peer-deps" ]; @@ -58,32 +62,15 @@ let ''; }; - docify = python3.pkgs.buildPythonApplication { - pname = "docify"; - version = "unstable"; - format = "pyproject"; - src = fetchFromGitHub { - owner = "AThePeanut4"; - repo = "docify"; - rev = "7380a6faa6d1e8a3dc790a00254e6d77f84cbd91"; - hash = "sha256-BPR1rc/JzdBweiWmdHxgardDDrJZVWkUIF3ZEmEYf/A="; - }; - buildInputs = [ python3.pkgs.setuptools ]; - propagatedBuildInputs = [ - python3.pkgs.libcst - python3.pkgs.tqdm - ]; - }; - docstubs = stdenvNoCC.mkDerivation { name = "docstubs"; inherit src; - buildInputs = [ docify ]; + nativeBuildInputs = [ docify ]; installPhase = '' runHook preInstall cp -r packages/pyright-internal/typeshed-fallback docstubs - ${docify}/bin/docify docstubs/stdlib --builtins-only --in-place + docify docstubs/stdlib --builtins-only --in-place cp -rv docstubs "$out" runHook postInstall ''; @@ -94,7 +81,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-TmJrh/Pya7jXhMQyCz6wwCCP0gzTTKFNUKF+vBq22U0="; + npmDepsHash = "sha256-6/OhBbIuFjXTN8N/PitaQ57aYZmpwcUOJ/vlLbhiXAU="; postPatch = '' chmod +w ../../ @@ -113,7 +100,39 @@ buildNpmPackage rec { passthru = { updateScript = ./update.sh; - tests.version = testers.testVersion { package = basedpyright; }; + tests = { + version = testers.testVersion { package = basedpyright; }; + + # We are expecting 3 errors. Any other amount would indicate, not working + # stub files, for instance. + simple = testers.testEqualContents { + assertion = "simple type checking"; + expected = writeText "expected" '' + 3 + ''; + actual = + runCommand "actual" + { + nativeBuildInputs = [ + jq + basedpyright + ]; + base = writeText "base" '' + import sys + + if sys.platform == "win32": + a = "a" + 1 + + print(3) + nonexistentfunction(3) + ''; + + } + '' + (basedpyright --outputjson $base || true) | jq -r .summary.errorCount > $out + ''; + }; + }; }; meta = { diff --git a/pkgs/development/libraries/basu/default.nix b/pkgs/by-name/ba/basu/package.nix similarity index 100% rename from pkgs/development/libraries/basu/default.nix rename to pkgs/by-name/ba/basu/package.nix diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix index 9e4132bc0b460..716ad80de7251 100644 --- a/pkgs/by-name/ba/bat/package.nix +++ b/pkgs/by-name/ba/bat/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 diff --git a/pkgs/by-name/ba/batmon/package.nix b/pkgs/by-name/ba/batmon/package.nix index 5e5cf3f6501f7..0d51bc0ec83b8 100644 --- a/pkgs/by-name/ba/batmon/package.nix +++ b/pkgs/by-name/ba/batmon/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { license = licenses.asl20; mainProgram = "batmon"; platforms = with platforms; unix ++ windows; - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; maintainers = with maintainers; [ _6543 ]; }; } diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index 0d587882099f4..7561af663e208 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.4.4"; + version = "1.5.1"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-ep+3lqWdktyvbTKxfLcPiVq9/5f0xBHwKG1+BxDDBQA="; + hash = "sha256-Vnbyq6NVJ/QtDqXT6IY/sjqsWqxs34C+ibebbx8Vp4E="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 @@ -31,6 +31,8 @@ appimageTools.wrapAppImage { # taken from # https://github.com/Dygmalab/Bazecor/blob/v1.4.4/src/main/utils/udev.ts#L6 + nativeBuildInputs = [ makeWrapper ]; + extraPkgs = pkgs: [ pkgs.glib ]; # Also expose the udev rules here, so it can be used as: @@ -38,7 +40,6 @@ appimageTools.wrapAppImage { # to allow non-root modifications to the keyboards. extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/bazecor \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 0ea0c06ea167f..a230087ae8943 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -130,7 +130,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ davidak - johnrtitor Madouura ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index 50d812cd1d712..6cc3c1ce33608 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -13,16 +13,16 @@ , makeWrapper , netperf , nixosTests -, python3 +, python3Packages , stdenv , zip }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "bcc"; version = "0.31.0"; - disabled = !stdenv.isLinux; + disabled = !stdenv.hostPlatform.isLinux; src = fetchFromGitHub { owner = "iovisor"; @@ -44,14 +44,14 @@ python3.pkgs.buildPythonApplication rec { ./fix-deadlock-detector-import.patch ]; - propagatedBuildInputs = [ python3.pkgs.netaddr ]; + propagatedBuildInputs = [ python3Packages.netaddr ]; nativeBuildInputs = [ bison cmake flex llvmPackages.llvm.dev makeWrapper - python3.pkgs.setuptools + python3Packages.setuptools zip ]; @@ -82,7 +82,7 @@ python3.pkgs.buildPythonApplication rec { preInstall = '' # required for setuptool during install - export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH + export PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH ''; postInstall = '' mkdir -p $out/bin $out/share diff --git a/pkgs/by-name/bd/bdf2ttf/package.nix b/pkgs/by-name/bd/bdf2ttf/package.nix index c12100bb3662f..399c07ee0b654 100644 --- a/pkgs/by-name/bd/bdf2ttf/package.nix +++ b/pkgs/by-name/bd/bdf2ttf/package.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; maintainers = with lib.maintainers; [ ners ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix index 96705c35d345a..42e1f738e470f 100644 --- a/pkgs/by-name/be/beatsabermodmanager/package.nix +++ b/pkgs/by-name/be/beatsabermodmanager/package.nix @@ -5,11 +5,6 @@ dotnetCorePackages, - libX11, - libICE, - libSM, - fontconfig, - xdg-utils, }: @@ -38,12 +33,11 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; - runtimeDeps = [ - libX11 - libICE - libSM - fontconfig - ]; + preConfigureNuGet = '' + # This should really be in the upstream nuget.config + dotnet nuget add source https://api.nuget.org/v3/index.json \ + -n nuget.org --configfile nuget.config + ''; # Required for OneClick makeWrapperArgs = [ diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix index ce4c9b1d02225..5828a47f5c809 100644 --- a/pkgs/by-name/be/bee/package.nix +++ b/pkgs/by-name/be/bee/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bee"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ethersphere"; repo = "bee"; rev = "v${version}"; - sha256 = "sha256-FflPGsHF2kZ5eh0bNFtK5aMLon5m5B/se/5PdIIafzo="; + hash = "sha256-crfALJU0Hira5CE3XGeN3b9M3pfWdsBxFb6LKGS/u3A="; }; - vendorHash = "sha256-XbOp0821HeCU5c+es3/UJNF0StDSDKKT+sasBJ+uTLM="; + vendorHash = "sha256-KvkgSMuZyR/hkmqOhBOj1JeXav+jeBl/Xg0okGxiJBE="; subPackages = [ "cmd/bee" ]; diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index c36564b9af2d2..274bf24136dba 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -29,8 +29,9 @@ in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/ diff --git a/pkgs/by-name/be/beeper-bridge-manager/package.nix b/pkgs/by-name/be/beeper-bridge-manager/package.nix index d138e5de0e2e6..3beaa9cfc512d 100644 --- a/pkgs/by-name/be/beeper-bridge-manager/package.nix +++ b/pkgs/by-name/be/beeper-bridge-manager/package.nix @@ -17,11 +17,11 @@ buildGoModule rec { vendorHash = "sha256-uz4pao8Y/Sb3fffi9d0lbWQEUMohbthA6t6k6PfQz2M="; meta = { - description = "Tool for running self-hosted bridges with the Beeper Matrix server. "; + description = "Tool for running self-hosted bridges with the Beeper Matrix server."; homepage = "https://github.com/beeper/bridge-manager"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.heywoodlh ]; mainProgram = "bbctl"; - changelog = "https://github.com/beeper/bridge-manager/releases/tag/v{version}"; + changelog = "https://github.com/beeper/bridge-manager/releases/tag/v${version}"; }; } diff --git a/pkgs/by-name/be/beon/package.nix b/pkgs/by-name/be/beon/package.nix new file mode 100644 index 0000000000000..068ae8da78a9f --- /dev/null +++ b/pkgs/by-name/be/beon/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + mkfontdir, + mkfontscale, +}: + +stdenvNoCC.mkDerivation { + pname = "beon"; + version = "2024-02-26"; + + src = fetchFromGitHub { + owner = "noirblancrouge"; + repo = "Beon"; + rev = "c0379c80a3b7d01532413f43f49904b2567341ac"; + hash = "sha256-jBLVVykHFJamOVF6GSRnQqYixqOrw5K1oV1B3sl4Zoc="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall + + install -D -v fonts/ttf/Beon-Regular.ttf $out/share/fonts/truetype/Beon-Regular.ttf + cd $out/share/fonts + mkfontdir + mkfontscale + + runHook postInstall + ''; + + meta = { + description = "Neon stencil typeface"; + homepage = "https://noirblancrouge.com/fonts/beon-display"; + changelog = "https://github.com/noirblancrouge/Beon#changelog"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ raboof ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/be/betterdiscordctl/package.nix b/pkgs/by-name/be/betterdiscordctl/package.nix index 3ff3bf7db0043..9c9f9d7a545f8 100644 --- a/pkgs/by-name/be/betterdiscordctl/package.nix +++ b/pkgs/by-name/be/betterdiscordctl/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "bb010g"; repo = "betterdiscordctl"; rev = "v${finalAttrs.version}"; - sha256 = "0p321rfcihz2779sdd6qfgpxgk5yd53d33vq5pvb50dbdgxww0bc"; + hash = "sha256-bAHO+2urgbL2LXiP0UZpvszX73PYtKbTOeLDyFwOYlw="; }; postPatch = '' diff --git a/pkgs/by-name/be/bevelbar/package.nix b/pkgs/by-name/be/bevelbar/package.nix index e91299ae97208..077f60b60a189 100644 --- a/pkgs/by-name/be/bevelbar/package.nix +++ b/pkgs/by-name/be/bevelbar/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bevelbar"; - version = "24.06"; + version = "24.07"; src = fetchurl { url = "https://www.uninformativ.de/git/bevelbar/archives/bevelbar-v${finalAttrs.version}.tar.gz"; - hash = "sha256-A7nrpMty4uxbiLzW83cmxlhQh8et1qo/n0mwBXNLJOc="; + hash = "sha256-PUYgbJCII0JecetoY3dMBUgrtaVhlLKeaJY27JJ78RQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/by-name/bi/biblesync/package.nix similarity index 100% rename from pkgs/development/libraries/biblesync/default.nix rename to pkgs/by-name/bi/biblesync/package.nix diff --git a/pkgs/by-name/bi/bibletime/package.nix b/pkgs/by-name/bi/bibletime/package.nix new file mode 100644 index 0000000000000..2c95eb11b25ba --- /dev/null +++ b/pkgs/by-name/bi/bibletime/package.nix @@ -0,0 +1,74 @@ +{ + lib, + boost, + clucene_core_2, + cmake, + docbook_xml_dtd_45, + docbook_xsl_ns, + fetchFromGitHub, + perlPackages, + pkg-config, + qt5, + stdenv, + sword, +}: + +let + inherit (qt5) + qtbase + qtsvg + qttools + wrapQtAppsHook + ; +in +stdenv.mkDerivation (finalAttrs: { + pname = "bibletime"; + version = "3.0.3"; + + src = fetchFromGitHub { + owner = "bibletime"; + repo = "bibletime"; + rev = "v${finalAttrs.version}"; + hash = "sha256-4O8F5/EyoJFJBEWOAs9lzN3TKuu/CEdKfPaOF8gNqps="; + }; + + nativeBuildInputs = [ + cmake + docbook_xml_dtd_45 + pkg-config + wrapQtAppsHook + perlPackages.Po4a + ]; + + buildInputs = [ + boost + clucene_core_2 + qtbase + qtsvg + qttools + sword + ]; + + preConfigure = '' + export CLUCENE_HOME=${clucene_core_2}; + export SWORD_HOME=${sword}; + ''; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_HOWTO_PDF" false) + (lib.cmakeBool "BUILD_HANDBOOK_PDF" false) + (lib.cmakeFeature "BT_DOCBOOK_XSL_HTML_CHUNK_XSL" "${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl") + (lib.cmakeFeature "BT_DOCBOOK_XSL_PDF_DOCBOOK_XSL" "${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl") + ]; + + strictDeps = true; + + meta = { + homepage = "http://www.bibletime.info/"; + description = "Powerful cross platform Bible study tool"; + license = lib.licenses.gpl2Plus; + mainProgram = "bibletime"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/bi/bicep/deps.nix b/pkgs/by-name/bi/bicep/deps.nix index 40abcef89aac5..f93edc67d969b 100644 --- a/pkgs/by-name/bi/bicep/deps.nix +++ b/pkgs/by-name/bi/bicep/deps.nix @@ -5,43 +5,46 @@ (fetchNuGet { pname = "Azure.Bicep.Internal.RoslynAnalyzers"; version = "0.1.38"; hash = "sha256-++iIefl+xbX3Tw4EsPvJrsMoG2DdQ5dPtqEgD+jaI6w="; }) (fetchNuGet { pname = "Azure.Bicep.Types"; version = "0.5.81"; hash = "sha256-eggoXh3X4h8UeyUN7EJEECW77yuM4sms7yogfasIB2I="; }) (fetchNuGet { pname = "Azure.Bicep.Types"; version = "0.5.9"; hash = "sha256-ArayCbMPz2itkOE88usMZfW5fx18cWlymdSVq/KXZQs="; }) - (fetchNuGet { pname = "Azure.Bicep.Types.Az"; version = "0.2.698"; hash = "sha256-3O+CO+y8sqB3rJttuH9ymyoqygJVCtM4ybvPllCv+IU="; }) + (fetchNuGet { pname = "Azure.Bicep.Types.Az"; version = "0.2.706"; hash = "sha256-KafgQYWKy5sXgDpNlf77yRVVBj4A0XxkkhIbN2EYTXA="; }) (fetchNuGet { pname = "Azure.Bicep.Types.K8s"; version = "0.1.626"; hash = "sha256-UYpfVbjvtr8eLWsjAEBrzVjxrHWiEEtjerNjafCLB7A="; }) (fetchNuGet { pname = "Azure.Containers.ContainerRegistry"; version = "1.1.1"; hash = "sha256-BC7QlrtYz74yDtTf/Kvf+Y3Vm3NEZsJLO5g5twKuxkI="; }) (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; hash = "sha256-lokfjW2wvgFu6bALLzNmDhXIz3HXoPuGX0WfGb9hmpI="; }) - (fetchNuGet { pname = "Azure.Core"; version = "1.39.0"; hash = "sha256-l5c+iPoCPkR3bKJ48WY+YHGEP2Kft9CU0RT/K0LcZiw="; }) (fetchNuGet { pname = "Azure.Core"; version = "1.40.0"; hash = "sha256-c1DBQ+OmNAKoQkj3kC3U7yWy77yG+fo+H3vR1e+Qrpo="; }) - (fetchNuGet { pname = "Azure.Deployments.Core"; version = "1.71.0"; hash = "sha256-voVequHvoUfk1SLLCibzsZrmYx6vQa4LCG1Na/m4weM="; }) - (fetchNuGet { pname = "Azure.Deployments.DiffEngine"; version = "1.71.0"; hash = "sha256-tGy2ienvvMHd4jjGye5DdoGJlzBao8YKddqL3CQCAEA="; }) - (fetchNuGet { pname = "Azure.Deployments.Engine"; version = "1.71.0"; hash = "sha256-J5mIPdbZcXuMT/sxb5aFQ0hFWn19yLyzoKqa0V+QEME="; }) - (fetchNuGet { pname = "Azure.Deployments.Expression"; version = "1.71.0"; hash = "sha256-zycWbem1lFP49WosaYep7QwDdKm6cxx0ZHWWPXKnyqo="; }) - (fetchNuGet { pname = "Azure.Deployments.Extensibility"; version = "1.71.0"; hash = "sha256-u16l7T2o4y+BA0wQ/u10ZGGjUI+bgzJBEE29ncsNEjI="; }) + (fetchNuGet { pname = "Azure.Deployments.Core"; version = "1.95.0"; hash = "sha256-YJ4nmC1LbqNvsD5gERJkyImw8itQR2xF1MUQocKCMtU="; }) + (fetchNuGet { pname = "Azure.Deployments.DiffEngine"; version = "1.95.0"; hash = "sha256-ZCfv+Mr62BoDSM4K3LmwwqlaKW8rIqfqTAgjQvozQIA="; }) + (fetchNuGet { pname = "Azure.Deployments.Engine"; version = "1.95.0"; hash = "sha256-s0BEWMZyIacwZWR1d744jHg2rc4vIVNTT/OhpPYKmNs="; }) + (fetchNuGet { pname = "Azure.Deployments.Expression"; version = "1.95.0"; hash = "sha256-85eQaO0HCih/C2wt5bkXJL9+urWRVzV9X3Vr5tFlRnQ="; }) + (fetchNuGet { pname = "Azure.Deployments.Extensibility"; version = "1.95.0"; hash = "sha256-oMeOPINDHh+0DsWgvn/iJohalERtNkWY6+lB3SXKePY="; }) (fetchNuGet { pname = "Azure.Deployments.Extensibility.Core"; version = "0.1.55"; hash = "sha256-u5Xo/TkFJSOeI+/T1fWuEeFVQVT4gM6pE09jhY6b2vU="; }) (fetchNuGet { pname = "Azure.Deployments.Internal.GenerateNotice"; version = "0.1.38"; hash = "sha256-LW8q/5ler1c0tK8FGd5PIqnWpdC/YggKrERAFhioXwI="; }) (fetchNuGet { pname = "Azure.Deployments.JsonPath"; version = "1.0.1265"; hash = "sha256-67xm85aTEJHv/6iYXxnjmkHDEtRnTnFhzs9gv1H/J4c="; }) (fetchNuGet { pname = "Azure.Deployments.ResourceMetadata"; version = "1.0.1265"; hash = "sha256-kvFL2oHG7javm4K8Wkyjc72jUbJBWKunlt0yrL360Wg="; }) - (fetchNuGet { pname = "Azure.Deployments.Templates"; version = "1.71.0"; hash = "sha256-ORtuQEvMr5j0yCKZMzBO5GuDfG9XFEho2gkpGtk944k="; }) + (fetchNuGet { pname = "Azure.Deployments.Templates"; version = "1.95.0"; hash = "sha256-SltmETp+P/TIbFr9XjkvcuPircNpO9TfsvCx/8vjoFY="; }) (fetchNuGet { pname = "Azure.Identity"; version = "1.12.0"; hash = "sha256-F3dFL8/HHqYgINxe9OAkHW067KPcsKgLjcPTHmpfBAo="; }) - (fetchNuGet { pname = "Azure.ResourceManager"; version = "1.11.1"; hash = "sha256-Pi+LT//A33XzGSE0yb1FK+fxu8FIfcD3/KOnTHQW120="; }) - (fetchNuGet { pname = "Azure.ResourceManager.Resources"; version = "1.7.3"; hash = "sha256-SfQ1bavuKdwPW81ML2x3gVpDRwIvTvAO9h2E12pVito="; }) + (fetchNuGet { pname = "Azure.ResourceManager"; version = "1.12.0"; hash = "sha256-zcML/ZTttuz5U7xd9I/uHN/aGXWm+mPHBWGNMYErnio="; }) + (fetchNuGet { pname = "Azure.ResourceManager.Resources"; version = "1.8.0"; hash = "sha256-qGRPsWIHW40UXIWEAYSWQsqc9Pl4p9TTAwkg7PNrNzU="; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; hash = "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="; }) (fetchNuGet { pname = "coverlet.collector"; version = "6.0.2"; hash = "sha256-LdSQUrOmjFug47LjtqgtN2MM6BcfG0HR5iL+prVHlDo="; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.12.0"; hash = "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE="; }) - (fetchNuGet { pname = "Google.Protobuf"; version = "3.27.1"; hash = "sha256-6BdAwStdmfFEwCqkYO4yffdq6QBDZskfmopI5fl0Dy8="; }) - (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.63.0"; hash = "sha256-tPvrMdQoVn6quCOkfiDyuTPzJN55vghMeIWmn1Gy2Ig="; }) - (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.63.0"; hash = "sha256-iq5O1Aa1SlBeuW5MoZnRotmQbPJmqSkhbyO53WVwSSk="; }) - (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.63.0"; hash = "sha256-JHpSo+cymATjLloCXRATzkXJr6zYRM2X2B/nQfXAdQ0="; }) - (fetchNuGet { pname = "Grpc.Tools"; version = "2.64.0"; hash = "sha256-vL8NnlHu6X4g6VLMQ7K6ZpBg3SgahaELonRK2B8/47E="; }) + (fetchNuGet { pname = "Google.Protobuf"; version = "3.28.0"; hash = "sha256-Q/p1lM/7SD7WNVC6/V/MNKkH2rJiPOttHgRSJi3BzYk="; }) + (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.65.0"; hash = "sha256-cLE/TiOYjMFUBF2ENWwGWrn1AaKpo8TO+8C2lj+5hqw="; }) + (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.65.0"; hash = "sha256-ZTaIuhC7W/Oyr4BGH3TDctdDSwRlNmM8dAd1Us0D7os="; }) + (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.65.0"; hash = "sha256-WsUmrHumKqamxYu/Ayj2NVg+Q0jervFHy9lJAGb7jTU="; }) + (fetchNuGet { pname = "Grpc.Tools"; version = "2.66.0"; hash = "sha256-UM3QNCMKcoDBhTD9OTkxqOT7EOsAViIM5yF2SzGc0TM="; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) (fetchNuGet { pname = "IPNetwork2"; version = "2.6.548"; hash = "sha256-6N61UG/WrJWNv+bO/l9BNWA17iPIMn5G4J7maw54UPg="; }) (fetchNuGet { pname = "IPNetwork2"; version = "2.6.598"; hash = "sha256-FPjItZbaf5gJYP6lORQITPqWnwHN0WDLvq+v4Hmc3Q4="; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2019.1.3"; hash = "sha256-gn2Z7yANT+2tnK+qbOA2PviRf1M1VtvamABGajgGC6E="; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; hash = "sha256-/Eykez68qYMO5mlmUelzAke8aJehyp8fspO5Z+yt5G4="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2024.2.0"; hash = "sha256-OgtW4wIqo5d3q6NSiYrUm4KkUdUHEWFyvlbtoQJjDwU="; }) (fetchNuGet { pname = "Json.More.Net"; version = "2.0.1.2"; hash = "sha256-fnp/By8n8xKa8bhvUbO2p8rlze5AvgA+z9ZvWEpL/Ls="; }) + (fetchNuGet { pname = "Json.More.Net"; version = "2.0.2"; hash = "sha256-a05C4llKu1sOBjjV+GXQqSD1FWaj7twjkx4L95qixDQ="; }) (fetchNuGet { pname = "JsonDiffPatch.Net"; version = "2.1.0"; hash = "sha256-lyUOusPMv1ZF3EcrEFG4Fze603CVPxLwOPmTVOy/HmU="; }) (fetchNuGet { pname = "JsonPatch.Net"; version = "3.1.0"; hash = "sha256-bvCOOiH2SruZXF+jPYlAaEkinZ040YDp9QjP3QXlCbc="; }) + (fetchNuGet { pname = "JsonPatch.Net"; version = "3.1.1"; hash = "sha256-j8MZwl96BUPBSFnsb42d/JZIccDQQ1TvgBjqwafv9SQ="; }) (fetchNuGet { pname = "JsonPath.Net"; version = "1.1.0"; hash = "sha256-FQGPodaxHwyfRN3HhEl7N39SKsn922FiZAiDzKOYxUo="; }) + (fetchNuGet { pname = "JsonPath.Net"; version = "1.1.4"; hash = "sha256-eft2nHG05XCIh3dH2C+ceW771vPSHxXccbRK0qFga7I="; }) (fetchNuGet { pname = "JsonPointer.Net"; version = "5.0.0"; hash = "sha256-OCeXHpJyHJSyh2vpnrY8nSuM4u3eNXtN6YXnJZyHnWc="; }) + (fetchNuGet { pname = "JsonPointer.Net"; version = "5.0.2"; hash = "sha256-S04fnxMCJm86yc1FYHSqHznhA+90NW6QI+7rxYIyhs0="; }) (fetchNuGet { pname = "JsonSchema.Net"; version = "7.0.4"; hash = "sha256-sCaGr8m20DzNEkF3TS7Cb+wmvo3hYZPZwQ2bTqwlB5g="; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; hash = "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI="; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; hash = "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk="; }) @@ -53,13 +56,13 @@ (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; hash = "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; hash = "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.11.1"; hash = "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA="; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.EventRegister"; version = "1.1.28"; hash = "sha256-A/gOXo0PWS8+L7OyJz1s8zDxGU39SFuvxrHZnqSLANI="; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.1.3"; hash = "sha256-MVKR1ZRpUMNdRAPuXh9cp5T/hG7wu8R9wUr9bey8V60="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.1"; hash = "sha256-KYPQYYspiBGiez7JshmEjy4kFt7ASzVxQeVsygIEvHA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.2"; hash = "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; hash = "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; hash = "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; }) @@ -77,49 +80,46 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) - (fetchNuGet { pname = "Microsoft.Graph.Bicep.Types"; version = "0.1.6-preview"; hash = "sha256-01IC1xejcwK5da5UEhxgzfBcuT1plAajbFp2jNgS4II="; }) + (fetchNuGet { pname = "Microsoft.Graph.Bicep.Types"; version = "0.1.7-preview"; hash = "sha256-Lz45XaKIjKA7w4xX2ElZO5jxVi0LqhGbGBTAHc+aqL0="; }) (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.61.3"; hash = "sha256-1cccC8EWlIQlJ3SSOB7CNImOYSaxsJpRHvlCgv2yOtA="; }) (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.61.3"; hash = "sha256-nFQ2C7S4BQ4nvQmGAc5Ar7/ynKyztvK7fPKrpJXaQFE="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; hash = "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q="; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; hash = "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo="; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.11.1"; hash = "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; hash = "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="; }) (fetchNuGet { pname = "Microsoft.PowerPlatform.ResourceStack"; version = "7.0.0.2007"; hash = "sha256-XjmVeRhHkBlDbM/anEwN/pFbNHC1w7YMZ49LRV7cL8I="; }) (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="; }) (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; hash = "sha256-/KshvKuql1A7zI1kTseWEYsOVMyOWZDXlFfKr0fz0Kg="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; hash = "sha256-YciAKvo1VBDoqGohABY2uD+Tt7wxpSqICV6ytEBNYKQ="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; hash = "sha256-vcf+MYu9Rp/Xpy1cA/azVz1KAkMgNrekD+LZX85Anq4="; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; hash = "sha256-ExXw+kScOwZsRDos3Myvh53yazGTGtjrtn2H1XbFi34="; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; hash = "sha256-B0AGaqwtuoT9DxXDvkR0bwEvVzSd67+vGZAgBm0nxxw="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.3.2"; hash = "sha256-q6ZGafMpM3HunHtjVATcIa+gPUM1ef4y3Do8Syf2pa4="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.3.2"; hash = "sha256-0+O40vygEoX0K2NDMSv1zFB4H10su0FAA1QTqzi1KcA="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.3.2"; hash = "sha256-H8dK/+S39mXZWnM9dB0CQhu23vQD9JRAaHivnutUDEY="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.3.2"; hash = "sha256-1H34nSpdSL+P91F5Ynjr8590eNFcm+1Rp27vYclx2Xc="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.3.2"; hash = "sha256-1SVTVvrFqStKoxuQSqaKBuKp+qDHZkCTpIECPuEEdQI="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; hash = "sha256-mj5UH+aqVk7f3Uu0+L47aqZUudJNCx3Lk7cbP4fzcmI="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.9.28"; hash = "sha256-4Z/uKv/jJPHXCJD9W/2vHNDfas3o4EfLh6+Tmkv44YE="; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.48"; hash = "sha256-EvZGbyxtrJDvHZwsQbZDXtVfWiy0f58oCdTdSzD34wI="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.11.1"; hash = "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.11.1"; hash = "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.10.48"; hash = "sha256-WL8c7TjDBHGjsVLMMPf9cin8rirzOdxusEBQlkUfiVU="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.11.20"; hash = "sha256-mHYVKapahjHlrzeJ6JpQAtugg+Ub3IzesYSJ+UTybAU="; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; hash = "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms="; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; hash = "sha256-+jWCwRqU/J/jLdQKDFm93WfIDrDMXMJ984UevaQMoi8="; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) (fetchNuGet { pname = "Microsoft.Win32.Registry.AccessControl"; version = "6.0.0"; hash = "sha256-Vm9H1A7+YDXtAjYimnN28TQLm94c8UkQNTSIa9ghPbA="; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.1"; hash = "sha256-wk8oV7jHZfSxKX5PDcV3S/pSnsaFq4mr8fakvJI4V9U="; }) (fetchNuGet { pname = "Microsoft.Windows.Compatibility"; version = "6.0.7"; hash = "sha256-LSQbmbX833b0Q6s6h6Un+yfU8JZS6eLbgFHwes5rAaw="; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; hash = "sha256-uOhEZp71KV0DFfkD4fMhy9zEggPBvzof1GZ5Z5ulWkM="; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; hash = "sha256-d3fTMQese3ld1WTw0v6MGczgdSnE28/UaM2E7T59cUM="; }) - (fetchNuGet { pname = "Nerdbank.GitVersioning"; version = "3.6.139"; hash = "sha256-DMEdNlYh9tqkqQ/98zwk7NcRYBpTApLiFwzkgaHP7Fo="; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; hash = "sha256-a0hXKhR7dv6Vm4rlUOD2ffBKG49CC3wzXLCHeTz1ms4="; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.5.2"; hash = "sha256-tbKREqe9w5Tkhib4AfWR9vB7DYLmvAjEov8UM2D2gA0="; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.6.0"; hash = "sha256-3j4Gp+BOhhKZav23gED/dtAnsoOrG+wtI9+p6IHNVMA="; }) + (fetchNuGet { pname = "Nerdbank.GitVersioning"; version = "3.6.143"; hash = "sha256-OhOtMzP+2obDIR+npR7SsoXo0KrmcsL+VCE8Z3t5gzQ="; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.11.74"; hash = "sha256-asIdaqCIjZspTA+hhtjKNajpCo+ZQi3erZLCpBQ5No4="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; hash = "sha256-ESyjt/R7y9dDvvz5Sftozk+e/3Otn38bOcLGGh69Ot0="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; hash = "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA="; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) @@ -165,7 +165,7 @@ (fetchNuGet { pname = "Semver"; version = "2.3.0"; hash = "sha256-77/J/w41PLEMIxA5Uj475TeReBGw8QwptQsbQDtdsMI="; }) (fetchNuGet { pname = "SharpYaml"; version = "2.1.1"; hash = "sha256-KSs7993j0VJxSDx/VpruMQFnnjP4CzvzPLlIfDEwOpw="; }) (fetchNuGet { pname = "Sprache.StrongNamed"; version = "2.3.2"; hash = "sha256-q6G1Y1/oellt0ABex7UQZdc0ACEBKFT6Ah+mNIHWyVw="; }) - (fetchNuGet { pname = "StreamJsonRpc"; version = "2.18.48"; hash = "sha256-/vjpwKMFoJfSf+uKEjmWzW/HdIfDGMLb7el91ni6gFQ="; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.19.27"; hash = "sha256-0eQVv72i5vZ3SsgjyG42w6YIZXpTpCQpIwDPEFkr6Z0="; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) (fetchNuGet { pname = "System.ClientModel"; version = "1.0.0"; hash = "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y="; }) (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; hash = "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="; }) @@ -173,7 +173,6 @@ (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.6.0"; hash = "sha256-gnu+8nN48GAd4GRgeB5cAQmW7VnCubL/8h7zO377fd0="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "6.0.0"; hash = "sha256-7JyYbqWl1NHTNMJW12g6TtYfkemI52nOnX7OHWvp7ps="; }) (fetchNuGet { pname = "System.ComponentModel.Composition.Registration"; version = "6.0.0"; hash = "sha256-NOw9ZLTBGBwQoHk8P6yIH1f+WoU3fSfm+jNrTQVZZdM="; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; hash = "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I="; }) @@ -200,11 +199,11 @@ (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.22"; hash = "sha256-UTdB/kD39zeXjUxdgQbXSxS/yyzDtc2rLre2+pLoQWk="; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.29"; hash = "sha256-91e2/Bd4ZgANw19mKkTdxAy2tv7NutyG0lQTKhMiEpo="; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) (fetchNuGet { pname = "System.IO.Packaging"; version = "6.0.0"; hash = "sha256-TKnqKh34uSkPSeideZXrVqnZ5a0Yu5jDgZswKSbAVoQ="; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; hash = "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="; }) (fetchNuGet { pname = "System.IO.Ports"; version = "6.0.0"; hash = "sha256-AqCYJwPsLkZqEBX7y3sfnrNSvwQnKM7BEl53sY7dDyw="; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) @@ -248,7 +247,6 @@ (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; hash = "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; hash = "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI="; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; }) @@ -272,10 +270,8 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; hash = "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; hash = "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; hash = "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4="; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.2"; hash = "sha256-uQQPCGRYKMUykb7dhg60YKPTXbjM8X01xmTYev1sId4="; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; }) @@ -286,13 +282,12 @@ (fetchNuGet { pname = "System.Threading.AccessControl"; version = "6.0.0"; hash = "sha256-ZkoQVA9cLa/du8FCVonnHy/R/t6ms6BG+NiTlFA3A7g="; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; hash = "sha256-KTeMhCWcyYEwG7EkA0VkVvHwo0B2FBs5FpjW3BFNVUE="; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) (fetchNuGet { pname = "System.Web.Services.Description"; version = "4.9.0"; hash = "sha256-cGLlUp+ue7PVrs6Gg6T3KfUQ0OuHr8DdJd8agaSeySE="; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.22"; hash = "sha256-900+hyDm/wCd7iD5hnPJue/In/ZcA3NlGNk9kHWLoX0="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.22"; hash = "sha256-xDe16iGy2i0SyYnlauFxZMTUx44PM+kas+jRtagDV50="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.29"; hash = "sha256-OFpu9RcDRPLYntQyesBevoG1XxyH96ukHOH0uXqO5ls="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.29"; hash = "sha256-2q1HzbyRPIm6VKYzZzZnkXBJzV8S+HBtT6Lej1pv84Y="; }) ] diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index d8246c5458902..d2212cc8c010e 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "bicep"; - version = "0.29.47"; + version = "0.30.23"; src = fetchFromGitHub { owner = "Azure"; repo = "bicep"; rev = "v${version}"; - hash = "sha256-KdaoOejoM/3P1WwDCjDhChOpKA7c4UulPLK7IOVw3o4="; + hash = "sha256-EQMSqEvBdOEnntv2glVp19LsjC4Zvh5U0zx0h3n8Okc="; }; postPatch = '' @@ -30,7 +30,7 @@ buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.runtime_8_0; - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); # mono is not available on aarch64-darwin + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # mono is not available on aarch64-darwin nativeCheckInputs = [ mono ]; diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix index b3f7a7b7adaa7..14b3e03483702 100644 --- a/pkgs/by-name/bi/bilibili/package.nix +++ b/pkgs/by-name/bi/bilibili/package.nix @@ -1,29 +1,40 @@ -{ lib -, stdenv -, fetchurl -, electron -, zstd -, makeWrapper +{ + lib, + stdenv, + fetchurl, + electron_30, + dpkg, + makeWrapper, + commandLineArgs ? "", }: - -stdenv.mkDerivation rec { - pname = "bilibili"; - version = "1.14.0-1"; - src = fetchurl { - url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-4+DGL/DNR3wLFUff17OquAM6dOkcsXFNeCqA7ITtCaI="; +let + version = "1.14.0-2"; + srcs = { + x86_64-linux = fetchurl { + url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; + hash = "sha256-QQMdEpKE7r/fPMaX/yEoaa7KjilhiPMYLRvGPkv1jds="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_arm64.deb"; + hash = "sha256-UaGI4BLhfoYluZpARsj+I0iEmFXYYNfl4JWhBWOOip0="; + }; }; - + src = + srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in +stdenv.mkDerivation { + pname = "bilibili"; + inherit src version; unpackPhase = '' runHook preUnpack - - ar x $src - tar -I ${zstd}/bin/zstd -xvf data.tar.zst - + dpkg -x $src ./ runHook postUnpack ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + dpkg + ]; installPhase = '' runHook preInstall @@ -32,20 +43,31 @@ stdenv.mkDerivation rec { cp -r usr/share $out/share sed -i "s|Exec=.*|Exec=$out/bin/bilibili|" $out/share/applications/*.desktop cp -r opt/apps/io.github.msojocs.bilibili/files/bin/app $out/opt - makeWrapper ${electron}/bin/electron $out/bin/bilibili \ + makeWrapper ${lib.getExe electron_30} $out/bin/bilibili \ --argv0 "bilibili" \ - --add-flags "$out/opt/app.asar" + --add-flags "$out/opt/app.asar" \ + --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall ''; - meta = with lib; { + meta = { description = "Electron-based bilibili desktop client"; homepage = "https://github.com/msojocs/bilibili-linux"; - license = with licenses; [ unfree mit ]; - maintainers = with maintainers; [ jedsek kashw2 ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = with lib.licenses; [ + unfree + mit + ]; + maintainers = with lib.maintainers; [ + jedsek + kashw2 + bot-wxt1221 + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; mainProgram = "bilibili"; }; } diff --git a/pkgs/by-name/bi/binary/package.nix b/pkgs/by-name/bi/binary/package.nix index 584458719c684..0f77b26c5c86b 100644 --- a/pkgs/by-name/bi/binary/package.nix +++ b/pkgs/by-name/bi/binary/package.nix @@ -16,14 +16,14 @@ python3Packages.buildPythonApplication rec { pname = "binary"; - version = "4.0"; + version = "5.0"; format = "other"; src = fetchFromGitHub { owner = "fizzyizzy05"; repo = "binary"; rev = "refs/tags/${version}"; - hash = "sha256-sIW20yHNPBeGSV9Rx7GMpuWpSkVgk5YMJoeYEq7Ag6s="; + hash = "sha256-T/gFXYcUJBN1NWMQaFco1bqqZTz3JHQpM8C2Y5yz7SI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix new file mode 100644 index 0000000000000..b5a1b55036664 --- /dev/null +++ b/pkgs/by-name/bi/binsider/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, +}: +rustPlatform.buildRustPackage rec { + pname = "binsider"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "binsider"; + rev = "v${version}"; + hash = "sha256-+QgbSpiDKPTVdSm0teEab1O6OJZKEDpC2ZIZ728e69Y="; + }; + + cargoHash = "sha256-lXYTZ3nvLrfEgo7AY/qSQYpXsyrdJuQQw43xREezNn0="; + + # Tests need the executable in target/debug/ + preCheck = '' + cargo build + ''; + + meta = with lib; { + description = "Analyzer of executables using a terminal user interface"; + homepage = "https://github.com/orhun/binsider"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ samueltardieu ]; + mainProgram = "binsider"; + broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; + }; +} diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix new file mode 100644 index 0000000000000..3213241e94484 --- /dev/null +++ b/pkgs/by-name/bi/biome/package.nix @@ -0,0 +1,76 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libgit2, + rust-jemalloc-sys, + zlib, + stdenv, + darwin, + git, +}: +rustPlatform.buildRustPackage rec { + pname = "biome"; + version = "1.9.2"; + + src = fetchFromGitHub { + owner = "biomejs"; + repo = "biome"; + rev = "cli/v${version}"; + hash = "sha256-erwGLcE5w/UnjZ1aVF3ZYD2OQGI8xt7lVBvpWkJ56tc="; + }; + + cargoHash = "sha256-m9r0fcnkDPT2J1DjjbLCzdAxqh8DCFAWA3jikuaVVGQ="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + [ + libgit2 + rust-jemalloc-sys + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ + git + ]; + + cargoBuildFlags = [ "-p=biome_cli" ]; + cargoTestFlags = + cargoBuildFlags + ++ + # skip a broken test from v1.7.3 release + # this will be removed on the next version + [ "-- --skip=diagnostics::test::termination_diagnostic_size" ]; + + env = { + BIOME_VERSION = version; + LIBGIT2_NO_VENDOR = 1; + }; + + preCheck = '' + # tests assume git repository + git init + + # tests assume $BIOME_VERSION is unset + unset BIOME_VERSION + ''; + + meta = { + description = "Toolchain of the web"; + homepage = "https://biomejs.dev/"; + changelog = "https://github.com/biomejs/biome/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + figsoda + isabelroses + ]; + mainProgram = "biome"; + }; +} diff --git a/pkgs/by-name/bi/bitbucket-cli/package.nix b/pkgs/by-name/bi/bitbucket-cli/package.nix new file mode 100644 index 0000000000000..f5927ec44de54 --- /dev/null +++ b/pkgs/by-name/bi/bitbucket-cli/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "bitbucket-cli"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "swisscom"; + repo = "bitbucket-cli"; + rev = "v${version}"; + hash = "sha256-8Qvlv/S5IkRk+2D/Pnb0+FP7ryHh1kSRJCiUjSO0OtI="; + }; + + vendorHash = "sha256-xjCY3Ycz5Ty6jTDHNNUWYp2SP8EPhDiwO7+WJBL3lAQ="; + + # Tests seem to be using Swisscom's live servers. + doCheck = false; + + meta = { + description = "Bitbucket Enterprise CLI"; + homepage = "https://github.com/swisscom/bitbucket-cli"; + mainProgram = "bitbucket-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ attila ]; + platforms = with lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/by-name/bi/bite/package.nix b/pkgs/by-name/bi/bite/package.nix index de072e33d4702..4dd9e43841422 100644 --- a/pkgs/by-name/bi/bite/package.nix +++ b/pkgs/by-name/bi/bite/package.nix @@ -60,14 +60,14 @@ rustPlatform.buildRustPackage rec { pango vulkan-loader ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.Metal darwin.apple_sdk.frameworks.QuartzCore ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]; @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec { libxkbcommon vulkan-loader ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]; @@ -105,6 +105,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [vinnymeller]; mainProgram = "bite"; - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index 4e42efd685b7a..c18545747b9f2 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "bitrise"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = version; - hash = "sha256-kwM3TqXxkVq45oN9T+G7wmsBMdIJ/FN6ZoUysoM5PNY="; + hash = "sha256-BVOvBNn4m9aes+g02moYt91KLTQEcsPPJTeAzA4I854="; }; # many tests rely on writable $HOME/.bitrise and require network access diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 6f3187cddb27e..2fe5a8e36878e 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -5,19 +5,20 @@ , fetchFromGitHub , python3 , cctools +, nix-update-script , nixosTests , xcbuild }: buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.8.1"; + version = "2024.9.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-l9fLh1YFivVcMs688vM0pHoN0Um2r/EDpo7dvwvZFwY="; + hash = "sha256-o5nRG2j73qheDOyeFfSga64D8HbTn1EUrCiN0W+Xn0w="; }; postPatch = '' @@ -27,11 +28,11 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-/6yWdTy6/GvYy8u5eZB+x5KRG6vhPVE0DIn+RUAO5MI="; + npmDepsHash = "sha256-L7/frKCNlq0xr6T+aSqyEQ44yrIXwcpdU/djrhCJNNk="; nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ setuptools ])) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools xcbuild.xcrun ]; @@ -58,8 +59,13 @@ buildNpmPackage rec { npmFlags = [ "--legacy-peer-deps" ]; - passthru.tests = { - vaultwarden = nixosTests.vaultwarden.sqlite; + passthru = { + tests = { + vaultwarden = nixosTests.vaultwarden.sqlite; + }; + updateScript = nix-update-script { + extraArgs = [ "--commit" "--version=stable" "--version-regex=^cli-v(.*)$" ]; + }; }; meta = with lib; { diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index e34bd5ea696f8..a45712bfe8019 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -3,7 +3,7 @@ , cargo , copyDesktopItems , dbus -, electron_31 +, electron_32 , fetchFromGitHub , glib , gnome-keyring @@ -13,6 +13,7 @@ , makeDesktopItem , makeWrapper , napi-rs-cli +, nix-update-script , nodejs_20 , patchutils_0_4_2 , pkg-config @@ -25,16 +26,16 @@ let description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; - electron = electron_31; + electron = electron_32; in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.8.1"; + version = "2024.9.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-FBNqgPjWSY8SCIGyKpoOl7I3pWQxDbWiFtcPZScDE4A="; + hash = "sha256-o5nRG2j73qheDOyeFfSga64D8HbTn1EUrCiN0W+Xn0w="; }; patches = [ @@ -51,7 +52,7 @@ in buildNpmPackage rec { makeCacheWritable = true; npmFlags = [ "--engine-strict" "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-8cxhor90GqgO34AD8Jhd3N7PCnBnbhg8h7agVq0i3jk="; + npmDepsHash = "sha256-L7/frKCNlq0xr6T+aSqyEQ44yrIXwcpdU/djrhCJNNk="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; @@ -67,7 +68,7 @@ in buildNpmPackage rec { patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-zc5AarCbrJixcin8t+Ws8fH0ULM9rp3sUFsDb0htPuM="; + hash = "sha256-y+6vaESiOeVrFJpZoOJ75onOpldqSsT2kqkMMzTDUmM="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -195,6 +196,12 @@ in buildNpmPackage rec { }) ]; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--commit" "--version=stable" "--version-regex=^desktop-v(.*)$" ]; + }; + }; + meta = { changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; inherit description; diff --git a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix index a9a0e6b3d893b..8888ba83a8c3d 100644 --- a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix +++ b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix @@ -6,17 +6,17 @@ , autoPatchelfHook , libcxx , libGL -, gcc7 +, gcc }: stdenv.mkDerivation (finalAttrs: { pname = "blackmagic-desktop-video"; - version = "14.1a1"; + version = "14.2a1"; buildInputs = [ autoPatchelfHook libcxx libGL - gcc7.cc.lib + gcc.cc.lib ]; # yes, the below download function is an absolute mess. @@ -24,15 +24,15 @@ stdenv.mkDerivation (finalAttrs: { src = let # from the URL the download page where you click the "only download" button is at - REFERID = "93b33ad64a244cd5b95ec9d373e8d2e1"; + REFERID = "b97e55f37a0042fbacd234971d8c93ed"; # from the URL that the POST happens to, see browser console - DOWNLOADID = "0f544a89ce204df6818079a2f18c76a7"; + DOWNLOADID = "552546307a7c4de29ea6d09a6ca08c90"; in runCommandLocal "${finalAttrs.pname}-${lib.versions.majorMinor finalAttrs.version}-src.tar.gz" { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-1Cv7VQHhHcM53DKa15lJJVJmdiGUHNTYPTbX+VghQOc="; + outputHash = "sha256-rfZDL1YvAuMD5u68MMyiT8cERsIHMc9K25lXt7cqrrk="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; diff --git a/pkgs/by-name/bl/blade-formatter/package-lock.json b/pkgs/by-name/bl/blade-formatter/package-lock.json deleted file mode 100644 index b40f7c09b12c4..0000000000000 --- a/pkgs/by-name/bl/blade-formatter/package-lock.json +++ /dev/null @@ -1,13221 +0,0 @@ -{ - "name": "blade-formatter", - "version": "1.41.1", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "blade-formatter", - "version": "1.41.1", - "license": "MIT", - "dependencies": { - "@prettier/plugin-php": "^0.22.2", - "@shufo/tailwindcss-class-sorter": "3.0.1", - "aigle": "^1.14.1", - "ajv": "^8.9.0", - "chalk": "^4.1.0", - "concat-stream": "^2.0.0", - "detect-indent": "^6.0.0", - "find-config": "^1.0.0", - "glob": "^8.0.1", - "html-attribute-sorter": "^0.4.3", - "ignore": "^5.1.8", - "js-beautify": "^1.14.8", - "lodash": "^4.17.19", - "php-parser": "3.1.5", - "prettier": "^3.2.5", - "string-replace-async": "^2.0.0", - "tailwindcss": "^3.1.8", - "vscode-oniguruma": "1.7.0", - "vscode-textmate": "^7.0.1", - "xregexp": "^5.0.1", - "yargs": "^17.3.1" - }, - "bin": { - "blade-formatter": "bin/blade-formatter.cjs" - }, - "devDependencies": { - "@babel/core": "^7.6.4", - "@babel/plugin-transform-modules-commonjs": "^7.16.5", - "@babel/preset-env": "^7.13.12", - "@babel/preset-typescript": "^7.16.5", - "@types/concat-stream": "^2.0.0", - "@types/find-config": "^1.0.1", - "@types/fs-extra": "^11.0.0", - "@types/glob": "^8.0.0", - "@types/js-beautify": "^1.13.3", - "@types/lodash": "^4.14.178", - "@types/mocha": "^10.0.0", - "@types/node": "^20.0.0", - "@types/xregexp": "^4.4.0", - "@typescript-eslint/eslint-plugin": "^5.8.1", - "@typescript-eslint/parser": "^5.8.1", - "app-root-path": "^3.0.0", - "codecov": "^3.8.3", - "cross-env": "^7.0.3", - "esbuild": "^0.19.0", - "esbuild-node-externals": "^1.4.1", - "eslint": "^8.5.0", - "eslint-config-airbnb-base": "^15.0.0", - "eslint-config-airbnb-typescript": "^17.0.0", - "eslint-config-prettier": "^9.0.0", - "eslint-import-resolver-typescript": "^3.0.0", - "eslint-plugin-import": "^2.25.3", - "eslint-plugin-prettier": "^5.0.0", - "fs-extra": "^11.0.0", - "husky": "^8.0.0", - "lint-staged": ">=10", - "source-map-loader": "^4.0.0", - "ts-loader": "^9.2.6", - "ts-migrate": "^0.1.27", - "ts-node": "^10.4.0", - "typescript": "^5.0.0", - "vitest": "^1.2.2" - }, - "engines": { - "node": ">= 14.0.0" - } - }, - "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==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "dev": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.6.tgz", - "integrity": "sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.24.6", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/compat-data": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.6.tgz", - "integrity": "sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.6.tgz", - "integrity": "sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ==", - "dev": true, - "dependencies": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.6", - "@babel/generator": "^7.24.6", - "@babel/helper-compilation-targets": "^7.24.6", - "@babel/helper-module-transforms": "^7.24.6", - "@babel/helpers": "^7.24.6", - "@babel/parser": "^7.24.6", - "@babel/template": "^7.24.6", - "@babel/traverse": "^7.24.6", - "@babel/types": "^7.24.6", - "convert-source-map": "^2.0.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@babel/generator": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.6.tgz", - "integrity": "sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.6", - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.6.tgz", - "integrity": "sha512-DitEzDfOMnd13kZnDqns1ccmftwJTS9DMkyn9pYTxulS7bZxUxpMly3Nf23QQ6NwA4UB8lAqjbqWtyvElEMAkg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.6.tgz", - "integrity": "sha512-+wnfqc5uHiMYtvRX7qu80Toef8BXeh4HHR1SPeonGb1SKPniNEd4a/nlaJJMv/OIEYvIVavvo0yR7u10Gqz0Iw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.6.tgz", - "integrity": "sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.24.6", - "@babel/helper-validator-option": "^7.24.6", - "browserslist": "^4.22.2", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.6.tgz", - "integrity": "sha512-djsosdPJVZE6Vsw3kk7IPRWethP94WHGOhQTc67SNXE0ZzMhHgALw8iGmYS0TD1bbMM0VDROy43od7/hN6WYcA==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.6", - "@babel/helper-environment-visitor": "^7.24.6", - "@babel/helper-function-name": "^7.24.6", - "@babel/helper-member-expression-to-functions": "^7.24.6", - "@babel/helper-optimise-call-expression": "^7.24.6", - "@babel/helper-replace-supers": "^7.24.6", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.6", - "@babel/helper-split-export-declaration": "^7.24.6", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.6.tgz", - "integrity": "sha512-C875lFBIWWwyv6MHZUG9HmRrlTDgOsLWZfYR0nW69gaKJNe0/Mpxx5r0EID2ZdHQkdUmQo2t0uNckTL08/1BgA==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.6", - "regexpu-core": "^5.3.1", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz", - "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==", - "dev": true, - "dependencies": { - "@babel/helper-compilation-targets": "^7.22.6", - "@babel/helper-plugin-utils": "^7.22.5", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2" - }, - "peerDependencies": { - "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" - } - }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.6.tgz", - "integrity": "sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.6.tgz", - "integrity": "sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==", - "dev": true, - "dependencies": { - "@babel/template": "^7.24.6", - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.6.tgz", - "integrity": "sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.6.tgz", - "integrity": "sha512-OTsCufZTxDUsv2/eDXanw/mUZHWOxSbEmC3pP8cgjcy5rgeVPWWMStnv274DV60JtHxTk0adT0QrCzC4M9NWGg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.6.tgz", - "integrity": "sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.6.tgz", - "integrity": "sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA==", - "dev": true, - "dependencies": { - "@babel/helper-environment-visitor": "^7.24.6", - "@babel/helper-module-imports": "^7.24.6", - "@babel/helper-simple-access": "^7.24.6", - "@babel/helper-split-export-declaration": "^7.24.6", - "@babel/helper-validator-identifier": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.6.tgz", - "integrity": "sha512-3SFDJRbx7KuPRl8XDUr8O7GAEB8iGyWPjLKJh/ywP/Iy9WOmEfMrsWbaZpvBu2HSYn4KQygIsz0O7m8y10ncMA==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.6.tgz", - "integrity": "sha512-MZG/JcWfxybKwsA9N9PmtF2lOSFSEMVCpIRrbxccZFLJPrJciJdG/UhSh5W96GEteJI2ARqm5UAHxISwRDLSNg==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.6.tgz", - "integrity": "sha512-1Qursq9ArRZPAMOZf/nuzVW8HgJLkTB9y9LfP4lW2MVp4e9WkLJDovfKBxoDcCk6VuzIxyqWHyBoaCtSRP10yg==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.6", - "@babel/helper-environment-visitor": "^7.24.6", - "@babel/helper-wrap-function": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-replace-supers": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.6.tgz", - "integrity": "sha512-mRhfPwDqDpba8o1F8ESxsEkJMQkUF8ZIWrAc0FtWhxnjfextxMWxr22RtFizxxSYLjVHDeMgVsRq8BBZR2ikJQ==", - "dev": true, - "dependencies": { - "@babel/helper-environment-visitor": "^7.24.6", - "@babel/helper-member-expression-to-functions": "^7.24.6", - "@babel/helper-optimise-call-expression": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-simple-access": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.6.tgz", - "integrity": "sha512-nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.6.tgz", - "integrity": "sha512-jhbbkK3IUKc4T43WadP96a27oYti9gEf1LdyGSP2rHGH77kwLwfhO7TgwnWvxxQVmke0ImmCSS47vcuxEMGD3Q==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.6.tgz", - "integrity": "sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz", - "integrity": "sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz", - "integrity": "sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-option": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.6.tgz", - "integrity": "sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-wrap-function": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.6.tgz", - "integrity": "sha512-f1JLrlw/jbiNfxvdrfBgio/gRBk3yTAEJWirpAkiJG2Hb22E7cEYKHWo0dFPTv/niPovzIdPdEDetrv6tC6gPQ==", - "dev": true, - "dependencies": { - "@babel/helper-function-name": "^7.24.6", - "@babel/template": "^7.24.6", - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.6.tgz", - "integrity": "sha512-V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA==", - "dev": true, - "dependencies": { - "@babel/template": "^7.24.6", - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.6.tgz", - "integrity": "sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.24.6", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/parser": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.6.tgz", - "integrity": "sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.6.tgz", - "integrity": "sha512-bYndrJ6Ph6Ar+GaB5VAc0JPoP80bQCm4qon6JEzXfRl5QZyQ8Ur1K6k7htxWmPA5z+k7JQvaMUrtXlqclWYzKw==", - "dev": true, - "dependencies": { - "@babel/helper-environment-visitor": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.6.tgz", - "integrity": "sha512-iVuhb6poq5ikqRq2XWU6OQ+R5o9wF+r/or9CeUyovgptz0UlnK4/seOQ1Istu/XybYjAhQv1FRSSfHHufIku5Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.6.tgz", - "integrity": "sha512-c8TER5xMDYzzFcGqOEp9l4hvB7dcbhcGjcLVwxWfe4P5DOafdwjsBJZKsmv+o3aXh7NhopvayQIovHrh2zSRUQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.6", - "@babel/plugin-transform-optional-chaining": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.13.0" - } - }, - "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.6.tgz", - "integrity": "sha512-z8zEjYmwBUHN/pCF3NuWBhHQjJCrd33qAi8MgANfMrAvn72k2cImT8VjK9LJFu4ysOLJqhfkYYb3MvwANRUNZQ==", - "dev": true, - "dependencies": { - "@babel/helper-environment-visitor": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/plugin-proposal-class-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", - "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", - "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", - "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", - "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-object-rest-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", - "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", - "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.20.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-optional-chaining": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz", - "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==", - "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.21.0-placeholder-for-preset-env.2", - "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==", - "dev": true, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-export-namespace-from": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.3" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-flow": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.6.tgz", - "integrity": "sha512-gNkksSdV8RbsCoHF9sjVYrHfYACMl/8U32UfUhJ9+84/ASXw8dlx+eHyyF0m6ncQJ9IBSxfuCkB36GJqYdXTOA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.6.tgz", - "integrity": "sha512-BE6o2BogJKJImTmGpkmOic4V0hlRRxVtzqxiSPa8TIFxyhi4EFjHm08nq1M4STK4RytuLMgnSz0/wfflvGFNOg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.6.tgz", - "integrity": "sha512-D+CfsVZousPXIdudSII7RGy52+dYRtbyKAZcvtQKq/NpsivyMVduepzcLqG5pMBugtMdedxdC8Ramdpcne9ZWQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "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==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.6.tgz", - "integrity": "sha512-lWfvAIFNWMlCsU0DRUun2GpFwZdGTukLaHJqRh1JRb80NdAP5Sb1HDHB5X9P9OtgZHQl089UzQkpYlBq2VTPRw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "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==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "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==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "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==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "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==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "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==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "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==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.6.tgz", - "integrity": "sha512-TzCtxGgVTEJWWwcYwQhCIQ6WaKlo80/B+Onsk4RRCcYqpYGFcG9etPW94VToGte5AAcxRrhjPUFvUS3Y2qKi4A==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-unicode-sets-regex": { - "version": "7.18.6", - "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==", - "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.6.tgz", - "integrity": "sha512-jSSSDt4ZidNMggcLx8SaKsbGNEfIl0PHx/4mFEulorE7bpYLbN0d3pDW3eJ7Y5Z3yPhy3L3NaPCYyTUY7TuugQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.6.tgz", - "integrity": "sha512-VEP2o4iR2DqQU6KPgizTW2mnMx6BG5b5O9iQdrW9HesLkv8GIA8x2daXBQxw1MrsIkFQGA/iJ204CKoQ8UcnAA==", - "dev": true, - "dependencies": { - "@babel/helper-environment-visitor": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-remap-async-to-generator": "^7.24.6", - "@babel/plugin-syntax-async-generators": "^7.8.4" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.6.tgz", - "integrity": "sha512-NTBA2SioI3OsHeIn6sQmhvXleSl9T70YY/hostQLveWs0ic+qvbA3fa0kwAwQ0OA/XGaAerNZRQGJyRfhbJK4g==", - "dev": true, - "dependencies": { - "@babel/helper-module-imports": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-remap-async-to-generator": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.6.tgz", - "integrity": "sha512-XNW7jolYHW9CwORrZgA/97tL/k05qe/HL0z/qqJq1mdWhwwCM6D4BJBV7wAz9HgFziN5dTOG31znkVIzwxv+vw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.6.tgz", - "integrity": "sha512-S/t1Xh4ehW7sGA7c1j/hiOBLnEYCp/c2sEG4ZkL8kI1xX9tW2pqJTCHKtdhe/jHKt8nG0pFCrDHUXd4DvjHS9w==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-class-properties": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.6.tgz", - "integrity": "sha512-j6dZ0Z2Z2slWLR3kt9aOmSIrBvnntWjMDN/TVcMPxhXMLmJVqX605CBRlcGI4b32GMbfifTEsdEjGjiE+j/c3A==", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.6.tgz", - "integrity": "sha512-1QSRfoPI9RoLRa8Mnakc6v3e0gJxiZQTYrMfLn+mD0sz5+ndSzwymp2hDcYJTyT0MOn0yuWzj8phlIvO72gTHA==", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/plugin-syntax-class-static-block": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.12.0" - } - }, - "node_modules/@babel/plugin-transform-classes": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.6.tgz", - "integrity": "sha512-+fN+NO2gh8JtRmDSOB6gaCVo36ha8kfCW1nMq2Gc0DABln0VcHN4PrALDvF5/diLzIRKptC7z/d7Lp64zk92Fg==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.6", - "@babel/helper-compilation-targets": "^7.24.6", - "@babel/helper-environment-visitor": "^7.24.6", - "@babel/helper-function-name": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-replace-supers": "^7.24.6", - "@babel/helper-split-export-declaration": "^7.24.6", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.6.tgz", - "integrity": "sha512-cRzPobcfRP0ZtuIEkA8QzghoUpSB3X3qSH5W2+FzG+VjWbJXExtx0nbRqwumdBN1x/ot2SlTNQLfBCnPdzp6kg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/template": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.6.tgz", - "integrity": "sha512-YLW6AE5LQpk5npNXL7i/O+U9CE4XsBCuRPgyjl1EICZYKmcitV+ayuuUGMJm2lC1WWjXYszeTnIxF/dq/GhIZQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.6.tgz", - "integrity": "sha512-rCXPnSEKvkm/EjzOtLoGvKseK+dS4kZwx1HexO3BtRtgL0fQ34awHn34aeSHuXtZY2F8a1X8xqBBPRtOxDVmcA==", - "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.6.tgz", - "integrity": "sha512-/8Odwp/aVkZwPFJMllSbawhDAO3UJi65foB00HYnK/uXvvCPm0TAXSByjz1mpRmp0q6oX2SIxpkUOpPFHk7FLA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-dynamic-import": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.6.tgz", - "integrity": "sha512-vpq8SSLRTBLOHUZHSnBqVo0AKX3PBaoPs2vVzYVWslXDTDIpwAcCDtfhUcHSQQoYoUvcFPTdC8TZYXu9ZnLT/w==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.6.tgz", - "integrity": "sha512-EemYpHtmz0lHE7hxxxYEuTYOOBZ43WkDgZ4arQ4r+VX9QHuNZC+WH3wUWmRNvR8ECpTRne29aZV6XO22qpOtdA==", - "dev": true, - "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-export-namespace-from": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.6.tgz", - "integrity": "sha512-inXaTM1SVrIxCkIJ5gqWiozHfFMStuGbGJAxZFBoHcRRdDP0ySLb3jH6JOwmfiinPwyMZqMBX+7NBDCO4z0NSA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-flow-strip-types": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.6.tgz", - "integrity": "sha512-1l8b24NoCpaQ13Vi6FtLG1nv6kNoi8PWvQb1AYO7GHZDpFfBYc3lbXArx1lP2KRt8b4pej1eWc/zrRmsQTfOdQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/plugin-syntax-flow": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-for-of": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.6.tgz", - "integrity": "sha512-n3Sf72TnqK4nw/jziSqEl1qaWPbCRw2CziHH+jdRYvw4J6yeCzsj4jdw8hIntOEeDGTmHVe2w4MVL44PN0GMzg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-function-name": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.6.tgz", - "integrity": "sha512-sOajCu6V0P1KPljWHKiDq6ymgqB+vfo3isUS4McqW1DZtvSVU2v/wuMhmRmkg3sFoq6GMaUUf8W4WtoSLkOV/Q==", - "dev": true, - "dependencies": { - "@babel/helper-compilation-targets": "^7.24.6", - "@babel/helper-function-name": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-json-strings": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.6.tgz", - "integrity": "sha512-Uvgd9p2gUnzYJxVdBLcU0KurF8aVhkmVyMKW4MIY1/BByvs3EBpv45q01o7pRTVmTvtQq5zDlytP3dcUgm7v9w==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/plugin-syntax-json-strings": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-literals": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.6.tgz", - "integrity": "sha512-f2wHfR2HF6yMj+y+/y07+SLqnOSwRp8KYLpQKOzS58XLVlULhXbiYcygfXQxJlMbhII9+yXDwOUFLf60/TL5tw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.6.tgz", - "integrity": "sha512-EKaWvnezBCMkRIHxMJSIIylzhqK09YpiJtDbr2wsXTwnO0TxyjMUkaw4RlFIZMIS0iDj0KyIg7H7XCguHu/YDA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.6.tgz", - "integrity": "sha512-9g8iV146szUo5GWgXpRbq/GALTnY+WnNuRTuRHWWFfWGbP9ukRL0aO/jpu9dmOPikclkxnNsjY8/gsWl6bmZJQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.6.tgz", - "integrity": "sha512-eAGogjZgcwqAxhyFgqghvoHRr+EYRQPFjUXrTYKBRb5qPnAVxOOglaxc4/byHqjvq/bqO2F3/CGwTHsgKJYHhQ==", - "dev": true, - "dependencies": { - "@babel/helper-module-transforms": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.6.tgz", - "integrity": "sha512-JEV8l3MHdmmdb7S7Cmx6rbNEjRCgTQMZxllveHO0mx6uiclB0NflCawlQQ6+o5ZrwjUBYPzHm2XoK4wqGVUFuw==", - "dev": true, - "dependencies": { - "@babel/helper-module-transforms": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-simple-access": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.6.tgz", - "integrity": "sha512-xg1Z0J5JVYxtpX954XqaaAT6NpAY6LtZXvYFCJmGFJWwtlz2EmJoR8LycFRGNE8dBKizGWkGQZGegtkV8y8s+w==", - "dev": true, - "dependencies": { - "@babel/helper-hoist-variables": "^7.24.6", - "@babel/helper-module-transforms": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-validator-identifier": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.6.tgz", - "integrity": "sha512-esRCC/KsSEUvrSjv5rFYnjZI6qv4R1e/iHQrqwbZIoRJqk7xCvEUiN7L1XrmW5QSmQe3n1XD88wbgDTWLbVSyg==", - "dev": true, - "dependencies": { - "@babel/helper-module-transforms": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.6.tgz", - "integrity": "sha512-6DneiCiu91wm3YiNIGDWZsl6GfTTbspuj/toTEqLh9d4cx50UIzSdg+T96p8DuT7aJOBRhFyaE9ZvTHkXrXr6Q==", - "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/plugin-transform-new-target": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.6.tgz", - "integrity": "sha512-f8liz9JG2Va8A4J5ZBuaSdwfPqN6axfWRK+y66fjKYbwf9VBLuq4WxtinhJhvp1w6lamKUwLG0slK2RxqFgvHA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.6.tgz", - "integrity": "sha512-+QlAiZBMsBK5NqrBWFXCYeXyiU1y7BQ/OYaiPAcQJMomn5Tyg+r5WuVtyEuvTbpV7L25ZSLfE+2E9ywj4FD48A==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-numeric-separator": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.6.tgz", - "integrity": "sha512-6voawq8T25Jvvnc4/rXcWZQKKxUNZcKMS8ZNrjxQqoRFernJJKjE3s18Qo6VFaatG5aiX5JV1oPD7DbJhn0a4Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.6.tgz", - "integrity": "sha512-OKmi5wiMoRW5Smttne7BwHM8s/fb5JFs+bVGNSeHWzwZkWXWValR1M30jyXo1s/RaqgwwhEC62u4rFH/FBcBPg==", - "dev": true, - "dependencies": { - "@babel/helper-compilation-targets": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-object-super": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.6.tgz", - "integrity": "sha512-N/C76ihFKlZgKfdkEYKtaRUtXZAgK7sOY4h2qrbVbVTXPrKGIi8aww5WGe/+Wmg8onn8sr2ut6FXlsbu/j6JHg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-replace-supers": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-optional-catch-binding": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.6.tgz", - "integrity": "sha512-L5pZ+b3O1mSzJ71HmxSCmTVd03VOT2GXOigug6vDYJzE5awLI7P1g0wFcdmGuwSDSrQ0L2rDOe/hHws8J1rv3w==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.6.tgz", - "integrity": "sha512-cHbqF6l1QP11OkYTYQ+hhVx1E017O5ZcSPXk9oODpqhcAD1htsWG2NpHrrhthEO2qZomLK0FXS+u7NfrkF5aOQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.6", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-parameters": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.6.tgz", - "integrity": "sha512-ST7guE8vLV+vI70wmAxuZpIKzVjvFX9Qs8bl5w6tN/6gOypPWUmMQL2p7LJz5E63vEGrDhAiYetniJFyBH1RkA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-private-methods": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.6.tgz", - "integrity": "sha512-T9LtDI0BgwXOzyXrvgLTT8DFjCC/XgWLjflczTLXyvxbnSR/gpv0hbmzlHE/kmh9nOvlygbamLKRo6Op4yB6aw==", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-private-property-in-object": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.6.tgz", - "integrity": "sha512-Qu/ypFxCY5NkAnEhCF86Mvg3NSabKsh/TPpBVswEdkGl7+FbsYHy1ziRqJpwGH4thBdQHh8zx+z7vMYmcJ7iaQ==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.6", - "@babel/helper-create-class-features-plugin": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.6.tgz", - "integrity": "sha512-oARaglxhRsN18OYsnPTpb8TcKQWDYNsPNmTnx5++WOAsUJ0cSC/FZVlIJCKvPbU4yn/UXsS0551CFKJhN0CaMw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.6.tgz", - "integrity": "sha512-SMDxO95I8WXRtXhTAc8t/NFQUT7VYbIWwJCJgEli9ml4MhqUMh4S6hxgH6SmAC3eAQNWCDJFxcFeEt9w2sDdXg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "regenerator-transform": "^0.15.2" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.6.tgz", - "integrity": "sha512-DcrgFXRRlK64dGE0ZFBPD5egM2uM8mgfrvTMOSB2yKzOtjpGegVYkzh3s1zZg1bBck3nkXiaOamJUqK3Syk+4A==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.6.tgz", - "integrity": "sha512-xnEUvHSMr9eOWS5Al2YPfc32ten7CXdH7Zwyyk7IqITg4nX61oHj+GxpNvl+y5JHjfN3KXE2IV55wAWowBYMVw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-spread": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.6.tgz", - "integrity": "sha512-h/2j7oIUDjS+ULsIrNZ6/TKG97FgmEk1PXryk/HQq6op4XUUUwif2f69fJrzK0wza2zjCS1xhXmouACaWV5uPA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-skip-transparent-expression-wrappers": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.6.tgz", - "integrity": "sha512-fN8OcTLfGmYv7FnDrsjodYBo1DhPL3Pze/9mIIE2MGCT1KgADYIOD7rEglpLHZj8PZlC/JFX5WcD+85FLAQusw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.6.tgz", - "integrity": "sha512-BJbEqJIcKwrqUP+KfUIkxz3q8VzXe2R8Wv8TaNgO1cx+nNavxn/2+H8kp9tgFSOL6wYPPEgFvU6IKS4qoGqhmg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.6.tgz", - "integrity": "sha512-IshCXQ+G9JIFJI7bUpxTE/oA2lgVLAIK8q1KdJNoPXOpvRaNjMySGuvLfBw/Xi2/1lLo953uE8hyYSDW3TSYig==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-typescript": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.6.tgz", - "integrity": "sha512-H0i+hDLmaYYSt6KU9cZE0gb3Cbssa/oxWis7PX4ofQzbvsfix9Lbh8SRk7LCPDlLWJHUiFeHU0qRRpF/4Zv7mQ==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.24.6", - "@babel/helper-create-class-features-plugin": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/plugin-syntax-typescript": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.6.tgz", - "integrity": "sha512-bKl3xxcPbkQQo5eX9LjjDpU2xYHeEeNQbOhj0iPvetSzA+Tu9q/o5lujF4Sek60CM6MgYvOS/DJuwGbiEYAnLw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-unicode-property-regex": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.6.tgz", - "integrity": "sha512-8EIgImzVUxy15cZiPii9GvLZwsy7Vxc+8meSlR3cXFmBIl5W5Tn9LGBf7CDKkHj4uVfNXCJB8RsVfnmY61iedA==", - "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.6.tgz", - "integrity": "sha512-pssN6ExsvxaKU638qcWb81RrvvgZom3jDgU/r5xFZ7TONkZGFf4MhI2ltMb8OcQWhHyxgIavEU+hgqtbKOmsPA==", - "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-unicode-sets-regex": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.6.tgz", - "integrity": "sha512-quiMsb28oXWIDK0gXLALOJRXLgICLiulqdZGOaPPd0vRT7fQp74NtdADAVu+D8s00C+0Xs0MxVP0VKF/sZEUgw==", - "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/preset-env": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.6.tgz", - "integrity": "sha512-CrxEAvN7VxfjOG8JNF2Y/eMqMJbZPZ185amwGUBp8D9USK90xQmv7dLdFSa+VbD7fdIqcy/Mfv7WtzG8+/qxKg==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.24.6", - "@babel/helper-compilation-targets": "^7.24.6", - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-validator-option": "^7.24.6", - "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.6", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.6", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.6", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.6", - "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.24.6", - "@babel/plugin-syntax-import-attributes": "^7.24.6", - "@babel/plugin-syntax-import-meta": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.24.6", - "@babel/plugin-transform-async-generator-functions": "^7.24.6", - "@babel/plugin-transform-async-to-generator": "^7.24.6", - "@babel/plugin-transform-block-scoped-functions": "^7.24.6", - "@babel/plugin-transform-block-scoping": "^7.24.6", - "@babel/plugin-transform-class-properties": "^7.24.6", - "@babel/plugin-transform-class-static-block": "^7.24.6", - "@babel/plugin-transform-classes": "^7.24.6", - "@babel/plugin-transform-computed-properties": "^7.24.6", - "@babel/plugin-transform-destructuring": "^7.24.6", - "@babel/plugin-transform-dotall-regex": "^7.24.6", - "@babel/plugin-transform-duplicate-keys": "^7.24.6", - "@babel/plugin-transform-dynamic-import": "^7.24.6", - "@babel/plugin-transform-exponentiation-operator": "^7.24.6", - "@babel/plugin-transform-export-namespace-from": "^7.24.6", - "@babel/plugin-transform-for-of": "^7.24.6", - "@babel/plugin-transform-function-name": "^7.24.6", - "@babel/plugin-transform-json-strings": "^7.24.6", - "@babel/plugin-transform-literals": "^7.24.6", - "@babel/plugin-transform-logical-assignment-operators": "^7.24.6", - "@babel/plugin-transform-member-expression-literals": "^7.24.6", - "@babel/plugin-transform-modules-amd": "^7.24.6", - "@babel/plugin-transform-modules-commonjs": "^7.24.6", - "@babel/plugin-transform-modules-systemjs": "^7.24.6", - "@babel/plugin-transform-modules-umd": "^7.24.6", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.6", - "@babel/plugin-transform-new-target": "^7.24.6", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.6", - "@babel/plugin-transform-numeric-separator": "^7.24.6", - "@babel/plugin-transform-object-rest-spread": "^7.24.6", - "@babel/plugin-transform-object-super": "^7.24.6", - "@babel/plugin-transform-optional-catch-binding": "^7.24.6", - "@babel/plugin-transform-optional-chaining": "^7.24.6", - "@babel/plugin-transform-parameters": "^7.24.6", - "@babel/plugin-transform-private-methods": "^7.24.6", - "@babel/plugin-transform-private-property-in-object": "^7.24.6", - "@babel/plugin-transform-property-literals": "^7.24.6", - "@babel/plugin-transform-regenerator": "^7.24.6", - "@babel/plugin-transform-reserved-words": "^7.24.6", - "@babel/plugin-transform-shorthand-properties": "^7.24.6", - "@babel/plugin-transform-spread": "^7.24.6", - "@babel/plugin-transform-sticky-regex": "^7.24.6", - "@babel/plugin-transform-template-literals": "^7.24.6", - "@babel/plugin-transform-typeof-symbol": "^7.24.6", - "@babel/plugin-transform-unicode-escapes": "^7.24.6", - "@babel/plugin-transform-unicode-property-regex": "^7.24.6", - "@babel/plugin-transform-unicode-regex": "^7.24.6", - "@babel/plugin-transform-unicode-sets-regex": "^7.24.6", - "@babel/preset-modules": "0.1.6-no-external-plugins", - "babel-plugin-polyfill-corejs2": "^0.4.10", - "babel-plugin-polyfill-corejs3": "^0.10.4", - "babel-plugin-polyfill-regenerator": "^0.6.1", - "core-js-compat": "^3.31.0", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/preset-flow": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.24.6.tgz", - "integrity": "sha512-huoe0T1Qs9fQhMWbmqE/NHUeZbqmHDsN6n/jYvPcUUHfuKiPV32C9i8tDhMbQ1DEKTjbBP7Rjm3nSLwlB2X05g==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-validator-option": "^7.24.6", - "@babel/plugin-transform-flow-strip-types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/preset-modules": { - "version": "0.1.6-no-external-plugins", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", - "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/types": "^7.4.4", - "esutils": "^2.0.2" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" - } - }, - "node_modules/@babel/preset-typescript": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.6.tgz", - "integrity": "sha512-U10aHPDnokCFRXgyT/MaIRTivUu2K/mu0vJlwRS9LxJmJet+PFQNKpggPyFCUtC6zWSBPjvxjnpNkAn3Uw2m5w==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.6", - "@babel/helper-validator-option": "^7.24.6", - "@babel/plugin-syntax-jsx": "^7.24.6", - "@babel/plugin-transform-modules-commonjs": "^7.24.6", - "@babel/plugin-transform-typescript": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/register": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.24.6.tgz", - "integrity": "sha512-WSuFCc2wCqMeXkz/i3yfAAsxwWflEgbVkZzivgAmXl/MxrXeoYFZOOPllbC8R8WTF7u61wSRQtDVZ1879cdu6w==", - "dev": 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": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/regjsgen": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", - "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", - "dev": true - }, - "node_modules/@babel/runtime": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.6.tgz", - "integrity": "sha512-Ja18XcETdEl5mzzACGd+DKgaGJzPTCow7EglgwTmHdwokzDFYh/MHua6lU6DV/hjF2IaOJ4oX2nqnjG7RElKOw==", - "dev": true, - "dependencies": { - "regenerator-runtime": "^0.14.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/runtime-corejs3": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.24.6.tgz", - "integrity": "sha512-tbC3o8uHK9xMgMsvUm9qGqxVpbv6yborMBLbDteHIc7JDNHsTV0vDMQ5j1O1NXvO+BDELtL9KgoWYaUVIVGt8w==", - "dependencies": { - "core-js-pure": "^3.30.2", - "regenerator-runtime": "^0.14.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/template": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.6.tgz", - "integrity": "sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.24.6", - "@babel/parser": "^7.24.6", - "@babel/types": "^7.24.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.6.tgz", - "integrity": "sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.24.6", - "@babel/generator": "^7.24.6", - "@babel/helper-environment-visitor": "^7.24.6", - "@babel/helper-function-name": "^7.24.6", - "@babel/helper-hoist-variables": "^7.24.6", - "@babel/helper-split-export-declaration": "^7.24.6", - "@babel/parser": "^7.24.6", - "@babel/types": "^7.24.6", - "debug": "^4.3.1", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/types": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.6.tgz", - "integrity": "sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.24.6", - "@babel/helper-validator-identifier": "^7.24.6", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "devOptional": true, - "dependencies": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "devOptional": true, - "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz", - "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz", - "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz", - "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz", - "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz", - "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz", - "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz", - "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz", - "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz", - "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz", - "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz", - "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz", - "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz", - "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz", - "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz", - "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz", - "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz", - "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz", - "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz", - "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz", - "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz", - "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz", - "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz", - "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" - } - }, - "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", - "dev": true, - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", - "dev": true, - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint/eslintrc/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/@eslint/eslintrc/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@eslint/eslintrc/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", - "dev": true, - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "dev": true - }, - "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==", - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", - "dependencies": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/source-map": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", - "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@one-ini/wasm": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz", - "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==" - }, - "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==", - "optional": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/@pkgr/core": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz", - "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/unts" - } - }, - "node_modules/@prettier/plugin-php": { - "version": "0.22.2", - "resolved": "https://registry.npmjs.org/@prettier/plugin-php/-/plugin-php-0.22.2.tgz", - "integrity": "sha512-md0+7tNbsP0oy+wIP3KZZc6fzx1k1jtWaMjOy/gM8yU9f2BDYEi+iHOc/UNPihYvPI28zFTbjvlhH4QXQjQwNg==", - "dependencies": { - "linguist-languages": "^7.27.0", - "php-parser": "^3.1.5" - }, - "peerDependencies": { - "prettier": "^3.0.0" - } - }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz", - "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz", - "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz", - "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz", - "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz", - "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz", - "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz", - "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz", - "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz", - "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz", - "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz", - "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz", - "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz", - "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz", - "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz", - "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz", - "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@shufo/tailwindcss-class-sorter": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@shufo/tailwindcss-class-sorter/-/tailwindcss-class-sorter-3.0.1.tgz", - "integrity": "sha512-y9SMobvwElX2G6vdg4odJ6UL6hu/o5RlMsdwEeDLGaqHU3BLSw9CeitGgBus6kadjjDdT2wseG0Tl5yXWdc4UQ==", - "dependencies": { - "escalade": "^3.1.1", - "object-hash": "^3.0.0", - "tailwindcss": "^3.3.2" - }, - "engines": { - "node": ">= 14.0.0" - } - }, - "node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true - }, - "node_modules/@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@ts-morph/bootstrap": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@ts-morph/bootstrap/-/bootstrap-0.16.0.tgz", - "integrity": "sha512-FYW3bK5EBeAgpHu0qZ57gHbLjzgzC81y5EJmrebzIhXSYg6OgZu5lFHpF5NJ7CwM7ZMhxX1PG+DRA8e+skopKw==", - "dev": true, - "dependencies": { - "@ts-morph/common": "~0.16.0" - } - }, - "node_modules/@ts-morph/common": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.16.0.tgz", - "integrity": "sha512-SgJpzkTgZKLKqQniCjLaE3c2L2sdL7UShvmTmPBejAKd2OKV/yfMpQ2IWpAuA+VY5wy7PkSUaEObIqEK6afFuw==", - "dev": true, - "dependencies": { - "fast-glob": "^3.2.11", - "minimatch": "^5.1.0", - "mkdirp": "^1.0.4", - "path-browserify": "^1.0.1" - } - }, - "node_modules/@ts-morph/common/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@ts-morph/common/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@tsconfig/node10": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", - "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", - "devOptional": true - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "devOptional": true - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "devOptional": true - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", - "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "devOptional": true - }, - "node_modules/@types/concat-stream": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-2.0.3.tgz", - "integrity": "sha512-3qe4oQAPNwVNwK4C9c8u+VJqv9kez+2MR4qJpoPFfXtgxxif1QbFusvXzK0/Wra2VX07smostI2VMmJNSpZjuQ==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/eslint": { - "version": "8.56.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz", - "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==", - "dev": true, - "peer": true, - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "peer": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, - "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true - }, - "node_modules/@types/find-config": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@types/find-config/-/find-config-1.0.4.tgz", - "integrity": "sha512-BCXaKgzHK7KnfCQBRQBWGTA+QajOE9uFolXPt+9EktiiMS56D8oXF2ZCh9eCxuEyfqDmX/mYIcmWg9j9f659eg==", - "dev": true - }, - "node_modules/@types/fs-extra": { - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz", - "integrity": "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==", - "dev": true, - "dependencies": { - "@types/jsonfile": "*", - "@types/node": "*" - } - }, - "node_modules/@types/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==", - "dev": true, - "dependencies": { - "@types/minimatch": "^5.1.2", - "@types/node": "*" - } - }, - "node_modules/@types/js-beautify": { - "version": "1.14.3", - "resolved": "https://registry.npmjs.org/@types/js-beautify/-/js-beautify-1.14.3.tgz", - "integrity": "sha512-FMbQHz+qd9DoGvgLHxeqqVPaNRffpIu5ZjozwV8hf9JAGpIOzuAf4wGbRSo8LNITHqGjmmVjaMggTT5P4v4IHg==", - "dev": true - }, - "node_modules/@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true - }, - "node_modules/@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", - "dev": true - }, - "node_modules/@types/jsonfile": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.4.tgz", - "integrity": "sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==", - "dev": true - }, - "node_modules/@types/minimatch": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", - "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", - "dev": true - }, - "node_modules/@types/mocha": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz", - "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==", - "dev": true - }, - "node_modules/@types/node": { - "version": "20.12.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.13.tgz", - "integrity": "sha512-gBGeanV41c1L171rR7wjbMiEpEI/l5XFQdLLfhr/REwpgDy/4U8y89+i8kRiLzDyZdOkXh+cRaTetUnCYutoXA==", - "devOptional": true, - "dependencies": { - "undici-types": "~5.26.4" - } - }, - "node_modules/@types/semver": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", - "dev": true - }, - "node_modules/@types/xregexp": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@types/xregexp/-/xregexp-4.4.0.tgz", - "integrity": "sha512-RJJHNci1sRRq8nZjWxzCbQdLhJVq+JcDHpsdzoTtFAR9qdsMhAWqKQ1NHsNcenKDtLsOwCBe/kfSKM82yXtocg==", - "deprecated": "This is a stub types definition. xregexp provides its own type definitions, so you do not need this installed.", - "dev": true, - "dependencies": { - "xregexp": "*" - } - }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", - "dev": true, - "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", - "dev": true, - "dependencies": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "debug": "^4.3.4" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", - "dev": true, - "dependencies": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "*" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true - }, - "node_modules/@vitest/expect": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.6.0.tgz", - "integrity": "sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==", - "dev": true, - "dependencies": { - "@vitest/spy": "1.6.0", - "@vitest/utils": "1.6.0", - "chai": "^4.3.10" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/runner": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.6.0.tgz", - "integrity": "sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==", - "dev": true, - "dependencies": { - "@vitest/utils": "1.6.0", - "p-limit": "^5.0.0", - "pathe": "^1.1.1" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/runner/node_modules/p-limit": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz", - "integrity": "sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^1.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@vitest/runner/node_modules/yocto-queue": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", - "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", - "dev": true, - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@vitest/snapshot": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.6.0.tgz", - "integrity": "sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==", - "dev": true, - "dependencies": { - "magic-string": "^0.30.5", - "pathe": "^1.1.1", - "pretty-format": "^29.7.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/spy": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.6.0.tgz", - "integrity": "sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==", - "dev": true, - "dependencies": { - "tinyspy": "^2.2.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/utils": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.6.0.tgz", - "integrity": "sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==", - "dev": true, - "dependencies": { - "diff-sequences": "^29.6.3", - "estree-walker": "^3.0.3", - "loupe": "^2.3.7", - "pretty-format": "^29.7.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@webassemblyjs/ast": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", - "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, - "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", - "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", - "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.12.1" - } - }, - "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", - "dev": true, - "peer": true, - "dependencies": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "node_modules/@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", - "dev": true, - "peer": true, - "dependencies": { - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", - "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-opt": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1", - "@webassemblyjs/wast-printer": "1.12.1" - } - }, - "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", - "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", - "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1" - } - }, - "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", - "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wast-printer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", - "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true, - "peer": true - }, - "node_modules/@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true, - "peer": true - }, - "node_modules/abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", - "devOptional": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", - "dev": true, - "peer": true, - "peerDependencies": { - "acorn": "^8" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/acorn-walk": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", - "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", - "devOptional": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/aigle": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/aigle/-/aigle-1.14.1.tgz", - "integrity": "sha512-bCmQ65CEebspmpbWFs6ab3S27TNyVH1b5MledX8KoiGxUhsJmPUUGpaoSijhwawNnq5Lt8jbcq7Z7gUAD0nuTw==", - "dependencies": { - "aigle-core": "^1.0.0" - } - }, - "node_modules/aigle-core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/aigle-core/-/aigle-core-1.0.0.tgz", - "integrity": "sha512-uGFWPumk5DLvYnUphNnff+kWC8VeAnjPbbU8ovsSHflKXGX77SD7cAN/aSBCLX3xnoJAM9KdtRgxUygRnSSu7A==" - }, - "node_modules/ajv": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz", - "integrity": "sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.4.1" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-escapes": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz", - "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "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==" - }, - "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==", - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/app-root-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz", - "integrity": "sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==", - "dev": true, - "engines": { - "node": ">= 6.0.0" - } - }, - "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==" - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/argv": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/argv/-/argv-0.0.2.tgz", - "integrity": "sha512-dEamhpPEwRUBpLNHeuCm/v+g0anFByHahxodVO/BbAarHVBBg2MccCwf9K+o1Pof+2btdnkJelYVUWjW/VrATw==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dev": true, - "engines": { - "node": ">=0.6.10" - } - }, - "node_modules/arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-buffer-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", - "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.5", - "is-array-buffer": "^3.0.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array-includes": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", - "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-object-atoms": "^1.0.0", - "get-intrinsic": "^1.2.4", - "is-string": "^1.0.7" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array.prototype.findlastindex": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz", - "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", - "es-shim-unscopables": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.flat": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", - "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.flatmap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", - "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", - "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", - "dev": true, - "dependencies": { - "array-buffer-byte-length": "^1.0.1", - "call-bind": "^1.0.5", - "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", - "es-errors": "^1.2.1", - "get-intrinsic": "^1.2.3", - "is-array-buffer": "^3.0.4", - "is-shared-array-buffer": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ast-types": { - "version": "0.11.7", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.7.tgz", - "integrity": "sha512-2mP3TwtkY/aTv5X3ZsMpNAbOnyoC/aMJwJSoaELPkHId0nSQgFcnU4dRW3isxiz7+zBexk0ym3WNVjMiQBnJSw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/atob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true, - "bin": { - "atob": "bin/atob.js" - }, - "engines": { - "node": ">= 4.5.0" - } - }, - "node_modules/available-typed-arrays": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", - "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", - "dev": true, - "dependencies": { - "possible-typed-array-names": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/babel-core": { - "version": "7.0.0-bridge.0", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz", - "integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==", - "dev": true, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz", - "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.6.2", - "semver": "^6.3.1" - }, - "peerDependencies": { - "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" - } - }, - "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz", - "integrity": "sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==", - "dev": true, - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.6.1", - "core-js-compat": "^3.36.1" - }, - "peerDependencies": { - "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" - } - }, - "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz", - "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==", - "dev": true, - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.6.2" - }, - "peerDependencies": { - "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, - "dependencies": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/base/node_modules/define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.0" - }, - "engines": { - "node": ">=0.10.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==", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/browserslist": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", - "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "caniuse-lite": "^1.0.30001587", - "electron-to-chromium": "^1.4.668", - "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.13" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "node_modules/cac": { - "version": "6.7.14", - "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", - "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true, - "dependencies": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", - "dev": true, - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "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==", - "engines": { - "node": ">= 6" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001625", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001625.tgz", - "integrity": "sha512-4KE9N2gcRH+HQhpeiRZXd+1niLB/XNLAhSy4z7fI8EzcbcPoAqjNInxVHTiTwWfTIV4w096XG8OtCOCQQKPv3w==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ] - }, - "node_modules/chai": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz", - "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==", - "dev": true, - "dependencies": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.3", - "deep-eql": "^4.1.3", - "get-func-name": "^2.0.2", - "loupe": "^2.3.6", - "pathval": "^1.1.1", - "type-detect": "^4.0.8" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/check-error": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", - "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", - "dev": true, - "dependencies": { - "get-func-name": "^2.0.2" - }, - "engines": { - "node": "*" - } - }, - "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "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/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==", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/chrome-trace-event": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz", - "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6.0" - } - }, - "node_modules/class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "dev": true, - "dependencies": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-descriptor": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", - "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.1", - "is-data-descriptor": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/cli-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", - "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", - "dev": true, - "dependencies": { - "restore-cursor": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-truncate": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", - "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", - "dev": true, - "dependencies": { - "slice-ansi": "^5.0.0", - "string-width": "^7.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/cliui/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==" - }, - "node_modules/cliui/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==", - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/clone-deep": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", - "dev": true, - "dependencies": { - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.2", - "shallow-clone": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/codecov": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.8.3.tgz", - "integrity": "sha512-Y8Hw+V3HgR7V71xWH2vQ9lyS358CbGCldWlJFR0JirqoGtOoas3R3/OclRTvgUYFK29mmJICDPauVKmpqbwhOA==", - "deprecated": "https://about.codecov.io/blog/codecov-uploader-deprecation-plan/", - "dev": true, - "dependencies": { - "argv": "0.0.2", - "ignore-walk": "3.0.4", - "js-yaml": "3.14.1", - "teeny-request": "7.1.1", - "urlgrey": "1.0.0" - }, - "bin": { - "codecov": "bin/codecov" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==", - "dev": true, - "dependencies": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - }, - "engines": { - "node": ">=0.10.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==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/colorette": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", - "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", - "dev": true - }, - "node_modules/colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true, - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", - "engines": { - "node": ">=14" - } - }, - "node_modules/commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", - "dev": true - }, - "node_modules/component-emitter": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz", - "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "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 - }, - "node_modules/concat-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", - "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", - "engines": [ - "node >= 6.0" - ], - "dependencies": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.0.2", - "typedarray": "^0.0.6" - } - }, - "node_modules/confbox": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz", - "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==", - "dev": true - }, - "node_modules/config-chain": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", - "dependencies": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, - "node_modules/confusing-browser-globals": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz", - "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", - "dev": true - }, - "node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true - }, - "node_modules/copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/core-js-compat": { - "version": "3.37.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz", - "integrity": "sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==", - "dev": true, - "dependencies": { - "browserslist": "^4.23.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" - } - }, - "node_modules/core-js-pure": { - "version": "3.37.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.37.1.tgz", - "integrity": "sha512-J/r5JTHSmzTxbiYYrzXg9w1VpqrYt+gexenBE9pugeyhwPZTAEJddyiReJWsLO6uNQ8xJZFbod6XC7KKwatCiA==", - "hasInstallScript": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" - } - }, - "node_modules/create-jest-runner": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/create-jest-runner/-/create-jest-runner-0.5.3.tgz", - "integrity": "sha512-a9VY2doMBmzRollJB3Ft3/Y5fBceSWJ4gdyVsg4/d7nP1S4715VG939s2VnITDj79YBmRgKhjGjNRv1c+Kre1g==", - "dev": true, - "dependencies": { - "chalk": "^2.4.2", - "jest-worker": "^24.0.0", - "throat": "^4.1.0" - }, - "bin": { - "create-jest-runner": "generator/index.js" - } - }, - "node_modules/create-jest-runner/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/create-jest-runner/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/create-jest-runner/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/create-jest-runner/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/create-jest-runner/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/create-jest-runner/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/create-jest-runner/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "devOptional": true - }, - "node_modules/cross-env": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", - "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.1" - }, - "bin": { - "cross-env": "src/bin/cross-env.js", - "cross-env-shell": "src/bin/cross-env-shell.js" - }, - "engines": { - "node": ">=10.14", - "npm": ">=6", - "yarn": ">=1" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "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==", - "bin": { - "cssesc": "bin/cssesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/data-view-buffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", - "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.6", - "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/data-view-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", - "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/data-view-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", - "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.6", - "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decode-uri-component": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", - "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/deep-eql": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", - "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", - "dev": true, - "dependencies": { - "type-detect": "^4.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "node_modules/define-data-property": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dev": true, - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/define-properties": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", - "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", - "dev": true, - "dependencies": { - "define-data-property": "^1.0.1", - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/detect-indent": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", - "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", - "engines": { - "node": ">=8" - } - }, - "node_modules/didyoumean": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", - "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==" - }, - "node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "devOptional": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/diff-sequences": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", - "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", - "dev": true, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dlv": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", - "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==" - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" - }, - "node_modules/editorconfig": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz", - "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==", - "dependencies": { - "@one-ini/wasm": "0.1.1", - "commander": "^10.0.0", - "minimatch": "9.0.1", - "semver": "^7.5.3" - }, - "bin": { - "editorconfig": "bin/editorconfig" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/editorconfig/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/editorconfig/node_modules/minimatch": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz", - "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/editorconfig/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/electron-to-chromium": { - "version": "1.4.784", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.784.tgz", - "integrity": "sha512-9CZwh+sDrhDAeOEFh8s3PqwduzTyYIeYwZolc1b9ENAUt3ePu7R1sJSCWr/820ISssRxCJUyHI9Wb7j+0Uo1AA==", - "dev": true - }, - "node_modules/emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", - "dev": true - }, - "node_modules/enhanced-resolve": { - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz", - "integrity": "sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/enquirer": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", - "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", - "dev": true, - "dependencies": { - "ansi-colors": "^4.1.1", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/es-abstract": { - "version": "1.23.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", - "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", - "dev": true, - "dependencies": { - "array-buffer-byte-length": "^1.0.1", - "arraybuffer.prototype.slice": "^1.0.3", - "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "data-view-buffer": "^1.0.1", - "data-view-byte-length": "^1.0.1", - "data-view-byte-offset": "^1.0.0", - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", - "es-set-tostringtag": "^2.0.3", - "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.4", - "get-symbol-description": "^1.0.2", - "globalthis": "^1.0.3", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.3", - "has-symbols": "^1.0.3", - "hasown": "^2.0.2", - "internal-slot": "^1.0.7", - "is-array-buffer": "^3.0.4", - "is-callable": "^1.2.7", - "is-data-view": "^1.0.1", - "is-negative-zero": "^2.0.3", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.3", - "is-string": "^1.0.7", - "is-typed-array": "^1.1.13", - "is-weakref": "^1.0.2", - "object-inspect": "^1.13.1", - "object-keys": "^1.1.1", - "object.assign": "^4.1.5", - "regexp.prototype.flags": "^1.5.2", - "safe-array-concat": "^1.1.2", - "safe-regex-test": "^1.0.3", - "string.prototype.trim": "^1.2.9", - "string.prototype.trimend": "^1.0.8", - "string.prototype.trimstart": "^1.0.8", - "typed-array-buffer": "^1.0.2", - "typed-array-byte-length": "^1.0.1", - "typed-array-byte-offset": "^1.0.2", - "typed-array-length": "^1.0.6", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.15" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.2.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-module-lexer": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz", - "integrity": "sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==", - "dev": true, - "peer": true - }, - "node_modules/es-object-atoms": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", - "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", - "dev": true, - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-set-tostringtag": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", - "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.2.4", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-shim-unscopables": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", - "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", - "dev": true, - "dependencies": { - "hasown": "^2.0.0" - } - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/esbuild": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", - "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==", - "dev": true, - "hasInstallScript": true, - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.19.12", - "@esbuild/android-arm": "0.19.12", - "@esbuild/android-arm64": "0.19.12", - "@esbuild/android-x64": "0.19.12", - "@esbuild/darwin-arm64": "0.19.12", - "@esbuild/darwin-x64": "0.19.12", - "@esbuild/freebsd-arm64": "0.19.12", - "@esbuild/freebsd-x64": "0.19.12", - "@esbuild/linux-arm": "0.19.12", - "@esbuild/linux-arm64": "0.19.12", - "@esbuild/linux-ia32": "0.19.12", - "@esbuild/linux-loong64": "0.19.12", - "@esbuild/linux-mips64el": "0.19.12", - "@esbuild/linux-ppc64": "0.19.12", - "@esbuild/linux-riscv64": "0.19.12", - "@esbuild/linux-s390x": "0.19.12", - "@esbuild/linux-x64": "0.19.12", - "@esbuild/netbsd-x64": "0.19.12", - "@esbuild/openbsd-x64": "0.19.12", - "@esbuild/sunos-x64": "0.19.12", - "@esbuild/win32-arm64": "0.19.12", - "@esbuild/win32-ia32": "0.19.12", - "@esbuild/win32-x64": "0.19.12" - } - }, - "node_modules/esbuild-node-externals": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/esbuild-node-externals/-/esbuild-node-externals-1.13.1.tgz", - "integrity": "sha512-ho4Lokc6iMB1lWbb2tWJ6otien+3Kfoaxe0fy7NUNgVuLnfmlW+GRINftTVUGtTVY/dapuwUu/CvFylYNwzkMA==", - "dev": true, - "dependencies": { - "find-up": "^5.0.0", - "tslib": "^2.4.1" - }, - "engines": { - "node": ">=12" - }, - "peerDependencies": { - "esbuild": "0.12 - 0.21" - } - }, - "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-config-airbnb-base": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz", - "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==", - "dev": true, - "dependencies": { - "confusing-browser-globals": "^1.0.10", - "object.assign": "^4.1.2", - "object.entries": "^1.1.5", - "semver": "^6.3.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "peerDependencies": { - "eslint": "^7.32.0 || ^8.2.0", - "eslint-plugin-import": "^2.25.2" - } - }, - "node_modules/eslint-config-airbnb-typescript": { - "version": "17.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.1.0.tgz", - "integrity": "sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==", - "dev": true, - "dependencies": { - "eslint-config-airbnb-base": "^15.0.0" - }, - "peerDependencies": { - "@typescript-eslint/eslint-plugin": "^5.13.0 || ^6.0.0", - "@typescript-eslint/parser": "^5.0.0 || ^6.0.0", - "eslint": "^7.32.0 || ^8.2.0", - "eslint-plugin-import": "^2.25.3" - } - }, - "node_modules/eslint-config-prettier": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", - "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", - "dev": true, - "bin": { - "eslint-config-prettier": "bin/cli.js" - }, - "peerDependencies": { - "eslint": ">=7.0.0" - } - }, - "node_modules/eslint-import-resolver-node": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", - "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", - "dev": true, - "dependencies": { - "debug": "^3.2.7", - "is-core-module": "^2.13.0", - "resolve": "^1.22.4" - } - }, - "node_modules/eslint-import-resolver-node/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-import-resolver-typescript": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz", - "integrity": "sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==", - "dev": true, - "dependencies": { - "debug": "^4.3.4", - "enhanced-resolve": "^5.12.0", - "eslint-module-utils": "^2.7.4", - "fast-glob": "^3.3.1", - "get-tsconfig": "^4.5.0", - "is-core-module": "^2.11.0", - "is-glob": "^4.0.3" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts" - }, - "peerDependencies": { - "eslint": "*", - "eslint-plugin-import": "*" - } - }, - "node_modules/eslint-module-utils": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz", - "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==", - "dev": true, - "dependencies": { - "debug": "^3.2.7" - }, - "engines": { - "node": ">=4" - }, - "peerDependenciesMeta": { - "eslint": { - "optional": true - } - } - }, - "node_modules/eslint-module-utils/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-import": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", - "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", - "dev": true, - "dependencies": { - "array-includes": "^3.1.7", - "array.prototype.findlastindex": "^1.2.3", - "array.prototype.flat": "^1.3.2", - "array.prototype.flatmap": "^1.3.2", - "debug": "^3.2.7", - "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.9", - "eslint-module-utils": "^2.8.0", - "hasown": "^2.0.0", - "is-core-module": "^2.13.1", - "is-glob": "^4.0.3", - "minimatch": "^3.1.2", - "object.fromentries": "^2.0.7", - "object.groupby": "^1.0.1", - "object.values": "^1.1.7", - "semver": "^6.3.1", - "tsconfig-paths": "^3.15.0" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" - } - }, - "node_modules/eslint-plugin-import/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-import/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eslint-plugin-prettier": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.3.tgz", - "integrity": "sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==", - "dev": true, - "dependencies": { - "prettier-linter-helpers": "^1.0.0", - "synckit": "^0.8.6" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint-plugin-prettier" - }, - "peerDependencies": { - "@types/eslint": ">=8.0.0", - "eslint": ">=8.0.0", - "eslint-config-prettier": "*", - "prettier": ">=3.0.0" - }, - "peerDependenciesMeta": { - "@types/eslint": { - "optional": true - }, - "eslint-config-prettier": { - "optional": true - } - } - }, - "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/eslint/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/eslint/node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/eslint/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "dependencies": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esquery/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "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, - "dependencies": { - "@types/estree": "^1.0.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eventemitter3": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", - "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", - "dev": true - }, - "node_modules/events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, - "peer": true, - "engines": { - "node": ">=0.8.x" - } - }, - "node_modules/execa": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", - "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^8.0.1", - "human-signals": "^5.0.0", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^4.1.0", - "strip-final-newline": "^3.0.0" - }, - "engines": { - "node": ">=16.17" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==", - "dev": true, - "dependencies": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/expand-brackets/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/is-descriptor": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", - "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.1", - "is-data-descriptor": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/expand-brackets/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", - "dev": true, - "dependencies": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "dependencies": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob/node_modules/define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "node_modules/fast-diff": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz", - "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==", - "dev": true - }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "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.4" - }, - "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==", - "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", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "node_modules/fast-url-parser": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz", - "integrity": "sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==", - "dev": true, - "dependencies": { - "punycode": "^1.3.2" - } - }, - "node_modules/fast-url-parser/node_modules/punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", - "dev": true - }, - "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^1.0.5" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/figures/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.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==", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-cache-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "dev": true, - "dependencies": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/find-config": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-config/-/find-config-1.0.0.tgz", - "integrity": "sha512-Z+suHH+7LSE40WfUeZPIxSxypCWvrzdVc60xAjUShZeT5eMWM0/FQUduq3HjluyfAHWvC/aOBkT1pTZktyF/jg==", - "dependencies": { - "user-home": "^2.0.0" - }, - "engines": { - "node": ">= 0.12" - } - }, - "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", - "dev": true - }, - "node_modules/flow-parser": { - "version": "0.237.1", - "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.237.1.tgz", - "integrity": "sha512-PUeG8GQLmrv49vEcFcag7mriJvVs7Yyegnv1DGskvcokhP8UyqWsLV0KoTQ1iAW3ePVUIGUc3MFfBaXwz9MmIg==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.3" - } - }, - "node_modules/for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==", - "dev": true, - "dependencies": { - "map-cache": "^0.2.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fs-extra": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", - "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "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==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/function.prototype.name": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", - "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "functions-have-names": "^1.2.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", - "dev": true - }, - "node_modules/functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-east-asian-width": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz", - "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==", - "dev": true, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-func-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", - "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", - "dev": true, - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-stream": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", - "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", - "dev": true, - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-symbol-description": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", - "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.5", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-tsconfig": { - "version": "4.7.5", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.5.tgz", - "integrity": "sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==", - "dev": true, - "dependencies": { - "resolve-pkg-maps": "^1.0.0" - }, - "funding": { - "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" - } - }, - "node_modules/get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/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==", - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "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, - "peer": true - }, - "node_modules/glob/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/glob/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/globalthis": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", - "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", - "dev": true, - "dependencies": { - "define-properties": "^1.2.1", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true - }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true - }, - "node_modules/has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "dev": true, - "dependencies": { - "es-define-property": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==", - "dev": true, - "dependencies": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==", - "dev": true, - "dependencies": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-values/node_modules/is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-values/node_modules/is-number/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-values/node_modules/kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/html-attribute-sorter": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/html-attribute-sorter/-/html-attribute-sorter-0.4.3.tgz", - "integrity": "sha512-HWSvaXJki44tg0uR1t+j5pRdUVpNiZcJaoB/PFhss/YoAw9cxUDLCpIBbLWQmKjBQfWk91P6LaRnredEyabrDw==", - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", - "dev": true, - "dependencies": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/human-signals": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", - "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", - "dev": true, - "engines": { - "node": ">=16.17.0" - } - }, - "node_modules/husky": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", - "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", - "dev": true, - "bin": { - "husky": "lib/bin.js" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/typicode" - } - }, - "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", - "engines": { - "node": ">= 4" - } - }, - "node_modules/ignore-walk": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz", - "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==", - "dev": true, - "dependencies": { - "minimatch": "^3.0.4" - } - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" - }, - "node_modules/internal-slot": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", - "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", - "dev": true, - "dependencies": { - "es-errors": "^1.3.0", - "hasown": "^2.0.0", - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-accessor-descriptor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz", - "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==", - "dev": true, - "dependencies": { - "hasown": "^2.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/is-array-buffer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", - "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, - "dependencies": { - "has-bigints": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/is-callable": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", - "dependencies": { - "hasown": "^2.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-data-descriptor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz", - "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==", - "dev": true, - "dependencies": { - "hasown": "^2.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-data-view": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", - "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", - "dev": true, - "dependencies": { - "is-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-descriptor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz", - "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.1", - "is-data-descriptor": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "dependencies": { - "is-plain-object": "^2.0.4" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-negative-zero": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", - "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-shared-array-buffer": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", - "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", - "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", - "dev": true, - "dependencies": { - "which-typed-array": "^1.1.14" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "node_modules/isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jackspeak": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz", - "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/jest-worker": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", - "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==", - "dev": true, - "dependencies": { - "merge-stream": "^2.0.0", - "supports-color": "^6.1.0" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/jest-worker/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jiti": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", - "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", - "bin": { - "jiti": "bin/jiti.js" - } - }, - "node_modules/js-beautify": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.1.tgz", - "integrity": "sha512-ESjNzSlt/sWE8sciZH8kBF8BPlwXPwhR6pWKAw8bw4Bwj+iZcnKW6ONWUutJ7eObuBZQpiIb8S7OYspWrKt7rA==", - "dependencies": { - "config-chain": "^1.1.13", - "editorconfig": "^1.0.4", - "glob": "^10.3.3", - "js-cookie": "^3.0.5", - "nopt": "^7.2.0" - }, - "bin": { - "css-beautify": "js/bin/css-beautify.js", - "html-beautify": "js/bin/html-beautify.js", - "js-beautify": "js/bin/js-beautify.js" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/js-beautify/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/js-beautify/node_modules/glob": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz", - "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/js-beautify/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/js-cookie": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", - "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", - "engines": { - "node": ">=14" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jscodeshift": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.6.4.tgz", - "integrity": "sha512-+NF/tlNbc2WEhXUuc4WEJLsJumF84tnaMUZW2hyJw3jThKKRvsPX4sPJVgO1lPE28z0gNL+gwniLG9d8mYvQCQ==", - "dev": true, - "dependencies": { - "@babel/core": "^7.1.6", - "@babel/parser": "^7.1.6", - "@babel/plugin-proposal-class-properties": "^7.1.0", - "@babel/plugin-proposal-object-rest-spread": "^7.0.0", - "@babel/preset-env": "^7.1.6", - "@babel/preset-flow": "^7.0.0", - "@babel/preset-typescript": "^7.1.0", - "@babel/register": "^7.0.0", - "babel-core": "^7.0.0-bridge.0", - "colors": "^1.1.2", - "flow-parser": "0.*", - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "neo-async": "^2.5.0", - "node-dir": "^0.1.17", - "recast": "^0.16.1", - "temp": "^0.8.1", - "write-file-atomic": "^2.3.0" - }, - "bin": { - "jscodeshift": "bin/jscodeshift.js" - } - }, - "node_modules/jscodeshift/node_modules/braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "dependencies": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jscodeshift/node_modules/braces/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jscodeshift/node_modules/fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==", - "dev": true, - "dependencies": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jscodeshift/node_modules/fill-range/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jscodeshift/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jscodeshift/node_modules/is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jscodeshift/node_modules/is-number/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jscodeshift/node_modules/micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "dependencies": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jscodeshift/node_modules/to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", - "dev": true, - "dependencies": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "peer": true - }, - "node_modules/json-schema": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", - "dev": true - }, - "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==" - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/json5-writer": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/json5-writer/-/json5-writer-0.1.8.tgz", - "integrity": "sha512-h5sqkk/vSKvESOUTBniGWs8p8nTzHsoDrxPS9enJfQVINqXv3lm+FAyizLwbrCwCn0q7NXqDBb+r8AdUdK3XZw==", - "dev": true, - "dependencies": { - "jscodeshift": "^0.6.3" - } - }, - "node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/lilconfig": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz", - "integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==", - "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==" - }, - "node_modules/linguist-languages": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/linguist-languages/-/linguist-languages-7.27.0.tgz", - "integrity": "sha512-Wzx/22c5Jsv2ag+uKy+ITanGA5hzvBZngrNGDXLTC7ZjGM6FLCYGgomauTkxNJeP9of353OM0pWqngYA180xgw==" - }, - "node_modules/lint-staged": { - "version": "15.2.5", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.5.tgz", - "integrity": "sha512-j+DfX7W9YUvdzEZl3Rk47FhDF6xwDBV5wwsCPw6BwWZVPYJemusQmvb9bRsW23Sqsaa+vRloAWogbK4BUuU2zA==", - "dev": true, - "dependencies": { - "chalk": "~5.3.0", - "commander": "~12.1.0", - "debug": "~4.3.4", - "execa": "~8.0.1", - "lilconfig": "~3.1.1", - "listr2": "~8.2.1", - "micromatch": "~4.0.7", - "pidtree": "~0.6.0", - "string-argv": "~0.3.2", - "yaml": "~2.4.2" - }, - "bin": { - "lint-staged": "bin/lint-staged.js" - }, - "engines": { - "node": ">=18.12.0" - }, - "funding": { - "url": "https://opencollective.com/lint-staged" - } - }, - "node_modules/lint-staged/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/lint-staged/node_modules/commander": { - "version": "12.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", - "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", - "dev": true, - "engines": { - "node": ">=18" - } - }, - "node_modules/listr2": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.1.tgz", - "integrity": "sha512-irTfvpib/rNiD637xeevjO2l3Z5loZmuaRi0L0YE5LfijwVY96oyVn0DFD3o/teAok7nfobMG1THvvcHh/BP6g==", - "dev": true, - "dependencies": { - "cli-truncate": "^4.0.0", - "colorette": "^2.0.20", - "eventemitter3": "^5.0.1", - "log-update": "^6.0.0", - "rfdc": "^1.3.1", - "wrap-ansi": "^9.0.0" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/loader-runner": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6.11.5" - } - }, - "node_modules/local-pkg": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", - "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==", - "dev": true, - "dependencies": { - "mlly": "^1.4.2", - "pkg-types": "^1.0.3" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - } - }, - "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "node_modules/lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "node_modules/lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", - "dev": true - }, - "node_modules/log-update": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.0.0.tgz", - "integrity": "sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==", - "dev": true, - "dependencies": { - "ansi-escapes": "^6.2.0", - "cli-cursor": "^4.0.0", - "slice-ansi": "^7.0.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/log-update/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/log-update/node_modules/is-fullwidth-code-point": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz", - "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==", - "dev": true, - "dependencies": { - "get-east-asian-width": "^1.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/slice-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz", - "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.2.1", - "is-fullwidth-code-point": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/log-update/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/loupe": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", - "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", - "dev": true, - "dependencies": { - "get-func-name": "^2.0.1" - } - }, - "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "dependencies": { - "yallist": "^3.0.2" - } - }, - "node_modules/magic-string": { - "version": "0.30.10", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz", - "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==", - "dev": true, - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15" - } - }, - "node_modules/make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "dev": true, - "dependencies": { - "pify": "^4.0.1", - "semver": "^5.6.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/make-dir/node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/make-dir/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "devOptional": true - }, - "node_modules/map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/map-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==", - "dev": true, - "dependencies": { - "object-visit": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "peer": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "peer": true, - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "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, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/mixin-deep": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", - "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", - "dev": true, - "dependencies": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/mlly": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.0.tgz", - "integrity": "sha512-U9SDaXGEREBYQgfejV97coK0UL1r+qnF2SyO9A3qcI8MzKnsIFKHNVEkrDyNncQTKQQumsasmeq84eNMdBfsNQ==", - "dev": true, - "dependencies": { - "acorn": "^8.11.3", - "pathe": "^1.1.2", - "pkg-types": "^1.1.0", - "ufo": "^1.5.3" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/mz": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", - "dependencies": { - "any-promise": "^1.0.0", - "object-assign": "^4.0.1", - "thenify-all": "^1.0.0" - } - }, - "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/nanomatch": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", - "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, - "dependencies": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, - "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==", - "dev": true - }, - "node_modules/node-dir": { - "version": "0.1.17", - "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", - "integrity": "sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==", - "dev": true, - "dependencies": { - "minimatch": "^3.0.2" - }, - "engines": { - "node": ">= 0.10.5" - } - }, - "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==", - "dev": true, - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", - "dev": true - }, - "node_modules/nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", - "dependencies": { - "abbrev": "^2.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.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==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/npm-run-path": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", - "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", - "dev": true, - "dependencies": { - "path-key": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-run-path/node_modules/path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "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==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==", - "dev": true, - "dependencies": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/is-descriptor": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", - "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.1", - "is-data-descriptor": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object-copy/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "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==", - "engines": { - "node": ">= 6" - } - }, - "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object-visit": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==", - "dev": true, - "dependencies": { - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object.assign": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", - "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.5", - "define-properties": "^1.2.1", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.entries": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", - "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.fromentries": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", - "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.groupby": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", - "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", - "dev": true, - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object.values": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", - "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "dev": true, - "dependencies": { - "mimic-fn": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/optionator": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", - "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", - "dev": true, - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.5" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-ms": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz", - "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-browserify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", - "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", - "dev": true - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" - }, - "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==", - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", - "engines": { - "node": "14 || >=16.14" - } - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/pathe": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", - "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", - "dev": true - }, - "node_modules/pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/php-parser": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/php-parser/-/php-parser-3.1.5.tgz", - "integrity": "sha512-jEY2DcbgCm5aclzBdfW86GM6VEIWcSlhTBSHN1qhJguVePlYe28GhwS0yoeLYXpM2K8y6wzLwrbq814n2PHSoQ==" - }, - "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==" - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pidtree": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz", - "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==", - "dev": true, - "bin": { - "pidtree": "bin/pidtree.js" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pirates": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", - "engines": { - "node": ">= 6" - } - }, - "node_modules/pkg-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", - "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", - "dev": true, - "dependencies": { - "find-up": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-dir/node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-dir/node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-dir/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-dir/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/pkg-types": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.1.1.tgz", - "integrity": "sha512-ko14TjmDuQJ14zsotODv7dBlwxKhUKQEhuhmbqo1uCi9BB0Z2alo/wAXg6q1dTR5TyuqYyWhjtfe/Tsh+X28jQ==", - "dev": true, - "dependencies": { - "confbox": "^0.1.7", - "mlly": "^1.7.0", - "pathe": "^1.1.2" - } - }, - "node_modules/posix-character-classes": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/possible-typed-array-names": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", - "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", - "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" - } - ], - "dependencies": { - "nanoid": "^3.3.7", - "picocolors": "^1.0.0", - "source-map-js": "^1.2.0" - }, - "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==", - "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.0.1", - "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz", - "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==", - "dependencies": { - "camelcase-css": "^2.0.1" - }, - "engines": { - "node": "^12 || ^14 || >= 16" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - "peerDependencies": { - "postcss": "^8.4.21" - } - }, - "node_modules/postcss-load-config": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz", - "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "lilconfig": "^3.0.0", - "yaml": "^2.3.4" - }, - "engines": { - "node": ">= 14" - }, - "peerDependencies": { - "postcss": ">=8.0.9", - "ts-node": ">=9.0.0" - }, - "peerDependenciesMeta": { - "postcss": { - "optional": true - }, - "ts-node": { - "optional": true - } - } - }, - "node_modules/postcss-nested": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz", - "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==", - "dependencies": { - "postcss-selector-parser": "^6.0.11" - }, - "engines": { - "node": ">=12.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - "peerDependencies": { - "postcss": "^8.2.14" - } - }, - "node_modules/postcss-selector-parser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz", - "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==", - "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==" - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, - "node_modules/prettier-linter-helpers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", - "dev": true, - "dependencies": { - "fast-diff": "^1.1.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/pretty-format": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", - "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", - "dev": true, - "dependencies": { - "@jest/schemas": "^29.6.3", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/pretty-format/node_modules/ansi-styles": { - "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, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/pretty-ms": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz", - "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==", - "dev": true, - "dependencies": { - "parse-ms": "^2.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==" - }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "engines": { - "node": ">=6" - } - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "peer": true, - "dependencies": { - "safe-buffer": "^5.1.0" - } - }, - "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==", - "dev": true - }, - "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==", - "dependencies": { - "pify": "^2.3.0" - } - }, - "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==", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/recast": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/recast/-/recast-0.16.2.tgz", - "integrity": "sha512-O/7qXi51DPjRVdbrpNzoBQH5dnAPQNbfoOFyRiUwreTMJfIHYOEBzwuH+c0+/BTSJ3CQyKs6ILSWXhESH6Op3A==", - "dev": true, - "dependencies": { - "ast-types": "0.11.7", - "esprima": "~4.0.0", - "private": "~0.1.5", - "source-map": "~0.6.1" - }, - "engines": { - "node": ">= 4" - } - }, - "node_modules/recast/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/regenerate": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", - "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", - "dev": true - }, - "node_modules/regenerate-unicode-properties": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", - "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", - "dev": true, - "dependencies": { - "regenerate": "^1.4.2" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/regenerator-runtime": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", - "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" - }, - "node_modules/regenerator-transform": { - "version": "0.15.2", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", - "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", - "dev": true, - "dependencies": { - "@babel/runtime": "^7.8.4" - } - }, - "node_modules/regex-not": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, - "dependencies": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/regexp.prototype.flags": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", - "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.6", - "define-properties": "^1.2.1", - "es-errors": "^1.3.0", - "set-function-name": "^2.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/regexpu-core": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", - "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", - "dev": true, - "dependencies": { - "@babel/regjsgen": "^0.8.0", - "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.1.0", - "regjsparser": "^0.9.1", - "unicode-match-property-ecmascript": "^2.0.0", - "unicode-match-property-value-ecmascript": "^2.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/regjsparser": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", - "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", - "dev": true, - "dependencies": { - "jsesc": "~0.5.0" - }, - "bin": { - "regjsparser": "bin/parser" - } - }, - "node_modules/regjsparser/node_modules/jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - } - }, - "node_modules/repeat-element": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz", - "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", - "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/resolve-pkg-maps": { - "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, - "funding": { - "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" - } - }, - "node_modules/resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==", - "deprecated": "https://github.com/lydell/resolve-url#deprecated", - "dev": true - }, - "node_modules/restore-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", - "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", - "dev": true, - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/restore-cursor/node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/restore-cursor/node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/restore-cursor/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "node_modules/ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true, - "engines": { - "node": ">=0.12" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rfdc": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", - "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==", - "dev": true - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rollup": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz", - "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==", - "dev": true, - "dependencies": { - "@types/estree": "1.0.5" - }, - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=18.0.0", - "npm": ">=8.0.0" - }, - "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.18.0", - "@rollup/rollup-android-arm64": "4.18.0", - "@rollup/rollup-darwin-arm64": "4.18.0", - "@rollup/rollup-darwin-x64": "4.18.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.18.0", - "@rollup/rollup-linux-arm-musleabihf": "4.18.0", - "@rollup/rollup-linux-arm64-gnu": "4.18.0", - "@rollup/rollup-linux-arm64-musl": "4.18.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0", - "@rollup/rollup-linux-riscv64-gnu": "4.18.0", - "@rollup/rollup-linux-s390x-gnu": "4.18.0", - "@rollup/rollup-linux-x64-gnu": "4.18.0", - "@rollup/rollup-linux-x64-musl": "4.18.0", - "@rollup/rollup-win32-arm64-msvc": "4.18.0", - "@rollup/rollup-win32-ia32-msvc": "4.18.0", - "@rollup/rollup-win32-x64-msvc": "4.18.0", - "fsevents": "~2.3.2" - } - }, - "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" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/safe-array-concat": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", - "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4", - "has-symbols": "^1.0.3", - "isarray": "^2.0.5" - }, - "engines": { - "node": ">=0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==", - "dev": true, - "dependencies": { - "ret": "~0.1.10" - } - }, - "node_modules/safe-regex-test": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", - "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.6", - "es-errors": "^1.3.0", - "is-regex": "^1.1.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "node_modules/schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", - "dev": true, - "peer": true, - "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/schema-utils/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "peer": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/schema-utils/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "peer": true, - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/schema-utils/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "peer": true - }, - "node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", - "dev": true, - "peer": true, - "dependencies": { - "randombytes": "^2.1.0" - } - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true - }, - "node_modules/set-function-length": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", - "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", - "dev": true, - "dependencies": { - "define-data-property": "^1.1.4", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/set-function-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", - "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", - "dev": true, - "dependencies": { - "define-data-property": "^1.1.4", - "es-errors": "^1.3.0", - "functions-have-names": "^1.2.3", - "has-property-descriptors": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/set-value": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", - "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", - "dev": true, - "dependencies": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/set-value/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/set-value/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/shallow-clone": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", - "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.2" - }, - "engines": { - "node": ">=8" - } - }, - "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==", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "engines": { - "node": ">=8" - } - }, - "node_modules/side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "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 - }, - "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==", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/slice-ansi": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", - "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.0.0", - "is-fullwidth-code-point": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/slice-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "dev": true, - "dependencies": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "dev": true, - "dependencies": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-node/node_modules/define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "dev": true, - "dependencies": { - "kind-of": "^3.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-util/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/snapdragon/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-descriptor": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", - "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.1", - "is-data-descriptor": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/snapdragon/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/snapdragon/node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", - "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-loader": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.2.tgz", - "integrity": "sha512-oYwAqCuL0OZhBoSgmdrLa7mv9MjommVMiQIWgcztf+eS4+8BfcUee6nenFnDhKOhzAVnk5gpZdfnz1iiBv+5sg==", - "dev": true, - "dependencies": { - "iconv-lite": "^0.6.3", - "source-map-js": "^1.0.2" - }, - "engines": { - "node": ">= 14.15.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.72.1" - } - }, - "node_modules/source-map-resolve": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", - "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", - "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", - "dev": true, - "dependencies": { - "atob": "^2.1.2", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/source-map-support/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-url": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", - "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", - "deprecated": "See https://github.com/lydell/source-map-url#deprecated", - "dev": true - }, - "node_modules/split-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, - "dependencies": { - "extend-shallow": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, - "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 - }, - "node_modules/static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==", - "dev": true, - "dependencies": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-descriptor": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", - "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.1", - "is-data-descriptor": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/std-env": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz", - "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==", - "dev": true - }, - "node_modules/stream-events": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", - "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==", - "dev": true, - "dependencies": { - "stubs": "^3.0.0" - } - }, - "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==", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string-argv": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", - "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==", - "dev": true, - "engines": { - "node": ">=0.6.19" - } - }, - "node_modules/string-replace-async": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/string-replace-async/-/string-replace-async-2.0.0.tgz", - "integrity": "sha512-AHMupZscUiDh07F1QziX7PLoB1DQ/pzu19vc8Xa8LwZcgnOXaw7yCgBuSYrxVEfaM2d8scc3Gtp+i+QJZV+spw==", - "engines": { - "node": ">=0.12" - } - }, - "node_modules/string-width": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", - "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", - "dev": true, - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/string-width-cjs/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==", - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/string.prototype.trim": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", - "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.0", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimend": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", - "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimstart": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", - "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "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, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/strip-literal": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.1.0.tgz", - "integrity": "sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==", - "dev": true, - "dependencies": { - "js-tokens": "^9.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - } - }, - "node_modules/strip-literal/node_modules/js-tokens": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.0.tgz", - "integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==", - "dev": true - }, - "node_modules/stubs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", - "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==", - "dev": true - }, - "node_modules/sucrase": { - "version": "3.35.0", - "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz", - "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.2", - "commander": "^4.0.0", - "glob": "^10.3.10", - "lines-and-columns": "^1.1.6", - "mz": "^2.7.0", - "pirates": "^4.0.1", - "ts-interface-checker": "^0.1.9" - }, - "bin": { - "sucrase": "bin/sucrase", - "sucrase-node": "bin/sucrase-node" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/sucrase/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/sucrase/node_modules/commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", - "engines": { - "node": ">= 6" - } - }, - "node_modules/sucrase/node_modules/glob": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz", - "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/sucrase/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "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==", - "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==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/synckit": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz", - "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==", - "dev": true, - "dependencies": { - "@pkgr/core": "^0.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/unts" - } - }, - "node_modules/table": { - "version": "6.8.2", - "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz", - "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==", - "dev": true, - "dependencies": { - "ajv": "^8.0.1", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/table/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/table/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/table/node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/table/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/tailwindcss": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz", - "integrity": "sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==", - "dependencies": { - "@alloc/quick-lru": "^5.2.0", - "arg": "^5.0.2", - "chokidar": "^3.5.3", - "didyoumean": "^1.2.2", - "dlv": "^1.1.3", - "fast-glob": "^3.3.0", - "glob-parent": "^6.0.2", - "is-glob": "^4.0.3", - "jiti": "^1.21.0", - "lilconfig": "^2.1.0", - "micromatch": "^4.0.5", - "normalize-path": "^3.0.0", - "object-hash": "^3.0.0", - "picocolors": "^1.0.0", - "postcss": "^8.4.23", - "postcss-import": "^15.1.0", - "postcss-js": "^4.0.1", - "postcss-load-config": "^4.0.1", - "postcss-nested": "^6.0.1", - "postcss-selector-parser": "^6.0.11", - "resolve": "^1.22.2", - "sucrase": "^3.32.0" - }, - "bin": { - "tailwind": "lib/cli.js", - "tailwindcss": "lib/cli.js" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/tailwindcss/node_modules/lilconfig": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", - "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", - "engines": { - "node": ">=10" - } - }, - "node_modules/tapable": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/teeny-request": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.1.1.tgz", - "integrity": "sha512-iwY6rkW5DDGq8hE2YgNQlKbptYpY5Nn2xecjQiNjOXWbKzPGUfmeUBCSQbbr306d7Z7U2N0TPl+/SwYRfua1Dg==", - "dev": true, - "dependencies": { - "http-proxy-agent": "^4.0.0", - "https-proxy-agent": "^5.0.0", - "node-fetch": "^2.6.1", - "stream-events": "^1.0.5", - "uuid": "^8.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/temp": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz", - "integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==", - "dev": true, - "dependencies": { - "rimraf": "~2.6.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/temp/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/temp/node_modules/rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/terser": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz", - "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/terser-webpack-plugin": { - "version": "5.3.10", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", - "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.20", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.26.0" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "uglify-js": { - "optional": true - } - } - }, - "node_modules/terser-webpack-plugin/node_modules/jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, - "peer": true, - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/terser-webpack-plugin/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "peer": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "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==", - "dev": true, - "peer": true - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, - "node_modules/thenify": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", - "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", - "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==", - "dependencies": { - "thenify": ">= 3.1.0 < 4" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/throat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz", - "integrity": "sha512-wCVxLDcFxw7ujDxaeJC6nfl2XfHJNYs8yUYJnvMgtPEFlttP9tHSfRUv2vBe6C4hkVFPWoP1P6ZccbYjmSEkKA==", - "dev": true - }, - "node_modules/tinybench": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.8.0.tgz", - "integrity": "sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==", - "dev": true - }, - "node_modules/tinypool": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.4.tgz", - "integrity": "sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==", - "dev": true, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/tinyspy": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz", - "integrity": "sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==", - "dev": true, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/to-object-path": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/to-object-path/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, - "dependencies": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true - }, - "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==" - }, - "node_modules/ts-loader": { - "version": "9.5.1", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz", - "integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==", - "dev": true, - "dependencies": { - "chalk": "^4.1.0", - "enhanced-resolve": "^5.0.0", - "micromatch": "^4.0.0", - "semver": "^7.3.4", - "source-map": "^0.7.4" - }, - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "typescript": "*", - "webpack": "^5.0.0" - } - }, - "node_modules/ts-loader/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ts-migrate": { - "version": "0.1.35", - "resolved": "https://registry.npmjs.org/ts-migrate/-/ts-migrate-0.1.35.tgz", - "integrity": "sha512-EmXahqwIP0a6fE1BLKKVMgJEeYn9V+CxJ19qFJ/DzkPL4PjDI/FcgPo8D519amBPy2nnlc/x1V6R6aIeHdD87w==", - "dev": true, - "dependencies": { - "create-jest-runner": "^0.5.3", - "json5": "^2.1.1", - "json5-writer": "^0.1.8", - "ts-migrate-plugins": "^0.1.35", - "ts-migrate-server": "^0.1.33", - "updatable-log": "^0.2.0", - "yargs": "^15.0.2" - }, - "bin": { - "ts-migrate": "build/cli.js", - "ts-migrate-full": "bin/ts-migrate-full.sh" - }, - "peerDependencies": { - "typescript": ">4.0" - } - }, - "node_modules/ts-migrate-plugins": { - "version": "0.1.35", - "resolved": "https://registry.npmjs.org/ts-migrate-plugins/-/ts-migrate-plugins-0.1.35.tgz", - "integrity": "sha512-DUkx7ClKhxKYPWDha9DJTZ6LhwEUszL90uH5I/O11K/6TbA96ytln1O3HL6Pt83i4mAKOlg0mQ6AMsPtL5FFkQ==", - "dev": true, - "dependencies": { - "eslint": "^7.14.0", - "jscodeshift": "^0.13.0", - "json-schema": "^0.4.0", - "ts-migrate-server": "^0.1.33" - }, - "peerDependencies": { - "typescript": ">4.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.10.4" - } - }, - "node_modules/ts-migrate-plugins/node_modules/@eslint/eslintrc": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", - "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", - "dev": true, - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", - "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/@humanwhocodes/config-array": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", - "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", - "dev": true, - "dependencies": { - "@humanwhocodes/object-schema": "^1.2.0", - "debug": "^4.1.1", - "minimatch": "^3.0.4" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true - }, - "node_modules/ts-migrate-plugins/node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ts-migrate-plugins/node_modules/ast-types": { - "version": "0.14.2", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz", - "integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==", - "dev": true, - "dependencies": { - "tslib": "^2.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/ts-migrate-plugins/node_modules/braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "dependencies": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/braces/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/eslint": { - "version": "7.32.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", - "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", - "dev": true, - "dependencies": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.3", - "@humanwhocodes/config-array": "^0.5.0", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "enquirer": "^2.3.5", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", - "globals": "^13.6.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", - "strip-json-comments": "^3.1.0", - "table": "^6.0.9", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/ts-migrate-plugins/node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/ts-migrate-plugins/node_modules/espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", - "dev": true, - "dependencies": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/ts-migrate-plugins/node_modules/fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==", - "dev": true, - "dependencies": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/fill-range/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/ts-migrate-plugins/node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ts-migrate-plugins/node_modules/ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/ts-migrate-plugins/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/is-number/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/jscodeshift": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.13.1.tgz", - "integrity": "sha512-lGyiEbGOvmMRKgWk4vf+lUrCWO/8YR8sUR3FKF1Cq5fovjZDlIcw3Hu5ppLHAnEXshVffvaM0eyuY/AbOeYpnQ==", - "dev": true, - "dependencies": { - "@babel/core": "^7.13.16", - "@babel/parser": "^7.13.16", - "@babel/plugin-proposal-class-properties": "^7.13.0", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8", - "@babel/plugin-proposal-optional-chaining": "^7.13.12", - "@babel/plugin-transform-modules-commonjs": "^7.13.8", - "@babel/preset-flow": "^7.13.13", - "@babel/preset-typescript": "^7.13.0", - "@babel/register": "^7.13.16", - "babel-core": "^7.0.0-bridge.0", - "chalk": "^4.1.2", - "flow-parser": "0.*", - "graceful-fs": "^4.2.4", - "micromatch": "^3.1.10", - "neo-async": "^2.5.0", - "node-dir": "^0.1.17", - "recast": "^0.20.4", - "temp": "^0.8.4", - "write-file-atomic": "^2.3.0" - }, - "bin": { - "jscodeshift": "bin/jscodeshift.js" - }, - "peerDependencies": { - "@babel/preset-env": "^7.1.6" - } - }, - "node_modules/ts-migrate-plugins/node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/ts-migrate-plugins/node_modules/micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "dependencies": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/recast": { - "version": "0.20.5", - "resolved": "https://registry.npmjs.org/recast/-/recast-0.20.5.tgz", - "integrity": "sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==", - "dev": true, - "dependencies": { - "ast-types": "0.14.2", - "esprima": "~4.0.0", - "source-map": "~0.6.1", - "tslib": "^2.0.1" - }, - "engines": { - "node": ">= 4" - } - }, - "node_modules/ts-migrate-plugins/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ts-migrate-plugins/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ts-migrate-plugins/node_modules/to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", - "dev": true, - "dependencies": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ts-migrate-server": { - "version": "0.1.33", - "resolved": "https://registry.npmjs.org/ts-migrate-server/-/ts-migrate-server-0.1.33.tgz", - "integrity": "sha512-MYHy10yzL2fkb2FHFQ9f54gqc5KkaVthTjtpwS4bTroYCONDelp1hbz5nxKWaP3q2oc3kBVeGuAR91RNI+yK+g==", - "dev": true, - "dependencies": { - "@ts-morph/bootstrap": "^0.16.0", - "pretty-ms": "^7.0.1", - "updatable-log": "^0.2.0" - }, - "peerDependencies": { - "typescript": ">4.0" - } - }, - "node_modules/ts-migrate/node_modules/cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - } - }, - "node_modules/ts-migrate/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/ts-migrate/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ts-migrate/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/ts-migrate/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ts-migrate/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ts-migrate/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ts-migrate/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ts-migrate/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ts-migrate/node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true - }, - "node_modules/ts-migrate/node_modules/yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", - "dev": true, - "dependencies": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ts-migrate/node_modules/yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/ts-node": { - "version": "10.9.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", - "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", - "devOptional": true, - "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, - "node_modules/ts-node/node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "devOptional": true - }, - "node_modules/tsconfig-paths": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", - "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", - "dev": true, - "dependencies": { - "@types/json5": "^0.0.29", - "json5": "^1.0.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - } - }, - "node_modules/tsconfig-paths/node_modules/json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, - "node_modules/tsutils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/typed-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", - "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "is-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/typed-array-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", - "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/typed-array-byte-offset": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", - "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", - "dev": true, - "dependencies": { - "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/typed-array-length": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", - "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13", - "possible-typed-array-names": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" - }, - "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", - "devOptional": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/ufo": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz", - "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==", - "dev": true - }, - "node_modules/unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "devOptional": true - }, - "node_modules/unicode-canonical-property-names-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", - "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/unicode-match-property-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", - "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", - "dev": true, - "dependencies": { - "unicode-canonical-property-names-ecmascript": "^2.0.0", - "unicode-property-aliases-ecmascript": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/unicode-match-property-value-ecmascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", - "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/unicode-property-aliases-ecmascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", - "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/union-value": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", - "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, - "dependencies": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/union-value/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==", - "dev": true, - "dependencies": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/has-value": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==", - "dev": true, - "dependencies": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/has-value/node_modules/isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==", - "dev": true, - "dependencies": { - "isarray": "1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true - }, - "node_modules/updatable-log": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/updatable-log/-/updatable-log-0.2.0.tgz", - "integrity": "sha512-gR48/mTR6YFB+B1sNoap3nx8HFbEvDl0ej9KhlQTFZdmP8yL5fzFiCUfeHCUf1QvNnXowY1pM9iiGkPKrd0XyQ==", - "dev": true, - "dependencies": { - "chalk": "^2.4.2", - "figures": "^3.0.0", - "log-update": "^3.3.0" - } - }, - "node_modules/updatable-log/node_modules/ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/updatable-log/node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/updatable-log/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/updatable-log/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/updatable-log/node_modules/cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==", - "dev": true, - "dependencies": { - "restore-cursor": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/updatable-log/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/updatable-log/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/updatable-log/node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "node_modules/updatable-log/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/updatable-log/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/updatable-log/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/updatable-log/node_modules/log-update": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-3.4.0.tgz", - "integrity": "sha512-ILKe88NeMt4gmDvk/eb615U/IVn7K9KWGkoYbdatQ69Z65nj1ZzjM6fHXfcs0Uge+e+EGnMW7DY4T9yko8vWFg==", - "dev": true, - "dependencies": { - "ansi-escapes": "^3.2.0", - "cli-cursor": "^2.1.0", - "wrap-ansi": "^5.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/updatable-log/node_modules/mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/updatable-log/node_modules/onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==", - "dev": true, - "dependencies": { - "mimic-fn": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/updatable-log/node_modules/restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==", - "dev": true, - "dependencies": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/updatable-log/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "node_modules/updatable-log/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/updatable-log/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/updatable-log/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/updatable-log/node_modules/wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/update-browserslist-db": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz", - "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "escalade": "^3.1.2", - "picocolors": "^1.0.1" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==", - "deprecated": "Please see https://github.com/lydell/urix#deprecated", - "dev": true - }, - "node_modules/urlgrey": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/urlgrey/-/urlgrey-1.0.0.tgz", - "integrity": "sha512-hJfIzMPJmI9IlLkby8QrsCykQ+SXDeO2W5Q9QTW3QpqZVTx4a/K7p8/5q+/isD8vsbVaFgql/gvAoQCRQ2Cb5w==", - "dev": true, - "dependencies": { - "fast-url-parser": "^1.1.3" - } - }, - "node_modules/use": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/user-home": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz", - "integrity": "sha512-KMWqdlOcjCYdtIJpicDSFBQ8nFwS2i9sslAd6f4+CBGcU4gist2REnr2fxj2YocvJFxSF3ZOHLYLVZnUxv4BZQ==", - "dependencies": { - "os-homedir": "^1.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==" - }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true, - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/v8-compile-cache": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz", - "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==", - "dev": true - }, - "node_modules/v8-compile-cache-lib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "devOptional": true - }, - "node_modules/vite": { - "version": "5.2.12", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz", - "integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==", - "dev": true, - "dependencies": { - "esbuild": "^0.20.1", - "postcss": "^8.4.38", - "rollup": "^4.13.0" - }, - "bin": { - "vite": "bin/vite.js" - }, - "engines": { - "node": "^18.0.0 || >=20.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", - "less": "*", - "lightningcss": "^1.21.0", - "sass": "*", - "stylus": "*", - "sugarss": "*", - "terser": "^5.4.0" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "less": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "sass": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "terser": { - "optional": true - } - } - }, - "node_modules/vite-node": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.6.0.tgz", - "integrity": "sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==", - "dev": true, - "dependencies": { - "cac": "^6.7.14", - "debug": "^4.3.4", - "pathe": "^1.1.1", - "picocolors": "^1.0.0", - "vite": "^5.0.0" - }, - "bin": { - "vite-node": "vite-node.mjs" - }, - "engines": { - "node": "^18.0.0 || >=20.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/vite/node_modules/@esbuild/aix-ppc64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", - "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/android-arm": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", - "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/android-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", - "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/android-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", - "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/darwin-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", - "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/darwin-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", - "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/freebsd-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", - "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/freebsd-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", - "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-arm": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", - "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", - "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-ia32": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", - "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-loong64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", - "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-mips64el": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", - "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-ppc64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", - "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-riscv64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", - "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-s390x": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", - "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", - "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/netbsd-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", - "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/openbsd-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", - "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/sunos-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", - "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/win32-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", - "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/win32-ia32": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", - "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/win32-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", - "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/esbuild": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", - "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", - "dev": true, - "hasInstallScript": true, - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.20.2", - "@esbuild/android-arm": "0.20.2", - "@esbuild/android-arm64": "0.20.2", - "@esbuild/android-x64": "0.20.2", - "@esbuild/darwin-arm64": "0.20.2", - "@esbuild/darwin-x64": "0.20.2", - "@esbuild/freebsd-arm64": "0.20.2", - "@esbuild/freebsd-x64": "0.20.2", - "@esbuild/linux-arm": "0.20.2", - "@esbuild/linux-arm64": "0.20.2", - "@esbuild/linux-ia32": "0.20.2", - "@esbuild/linux-loong64": "0.20.2", - "@esbuild/linux-mips64el": "0.20.2", - "@esbuild/linux-ppc64": "0.20.2", - "@esbuild/linux-riscv64": "0.20.2", - "@esbuild/linux-s390x": "0.20.2", - "@esbuild/linux-x64": "0.20.2", - "@esbuild/netbsd-x64": "0.20.2", - "@esbuild/openbsd-x64": "0.20.2", - "@esbuild/sunos-x64": "0.20.2", - "@esbuild/win32-arm64": "0.20.2", - "@esbuild/win32-ia32": "0.20.2", - "@esbuild/win32-x64": "0.20.2" - } - }, - "node_modules/vitest": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.6.0.tgz", - "integrity": "sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==", - "dev": true, - "dependencies": { - "@vitest/expect": "1.6.0", - "@vitest/runner": "1.6.0", - "@vitest/snapshot": "1.6.0", - "@vitest/spy": "1.6.0", - "@vitest/utils": "1.6.0", - "acorn-walk": "^8.3.2", - "chai": "^4.3.10", - "debug": "^4.3.4", - "execa": "^8.0.1", - "local-pkg": "^0.5.0", - "magic-string": "^0.30.5", - "pathe": "^1.1.1", - "picocolors": "^1.0.0", - "std-env": "^3.5.0", - "strip-literal": "^2.0.0", - "tinybench": "^2.5.1", - "tinypool": "^0.8.3", - "vite": "^5.0.0", - "vite-node": "1.6.0", - "why-is-node-running": "^2.2.2" - }, - "bin": { - "vitest": "vitest.mjs" - }, - "engines": { - "node": "^18.0.0 || >=20.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - }, - "peerDependencies": { - "@edge-runtime/vm": "*", - "@types/node": "^18.0.0 || >=20.0.0", - "@vitest/browser": "1.6.0", - "@vitest/ui": "1.6.0", - "happy-dom": "*", - "jsdom": "*" - }, - "peerDependenciesMeta": { - "@edge-runtime/vm": { - "optional": true - }, - "@types/node": { - "optional": true - }, - "@vitest/browser": { - "optional": true - }, - "@vitest/ui": { - "optional": true - }, - "happy-dom": { - "optional": true - }, - "jsdom": { - "optional": true - } - } - }, - "node_modules/vscode-oniguruma": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz", - "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==" - }, - "node_modules/vscode-textmate": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-7.0.4.tgz", - "integrity": "sha512-9hJp0xL7HW1Q5OgGe03NACo7yiCTMEk3WU/rtKXUbncLtdg6rVVNJnHwD88UhbIYU2KoxY0Dih0x+kIsmUKn2A==" - }, - "node_modules/watchpack": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz", - "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==", - "dev": true, - "peer": true, - "dependencies": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" - }, - "engines": { - "node": ">=10.13.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 - }, - "node_modules/webpack": { - "version": "5.91.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz", - "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==", - "dev": true, - "peer": true, - "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.5", - "@webassemblyjs/ast": "^1.12.1", - "@webassemblyjs/wasm-edit": "^1.12.1", - "@webassemblyjs/wasm-parser": "^1.12.1", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.21.10", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.16.0", - "es-module-lexer": "^1.2.1", - "eslint-scope": "5.1.1", - "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.11", - "json-parse-even-better-errors": "^2.3.1", - "loader-runner": "^4.2.0", - "mime-types": "^2.1.27", - "neo-async": "^2.6.2", - "schema-utils": "^3.2.0", - "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.10", - "watchpack": "^2.4.1", - "webpack-sources": "^3.2.3" - }, - "bin": { - "webpack": "bin/webpack.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - } - } - }, - "node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, - "peer": true, - "engines": { - "node": ">=10.13.0" - } - }, - "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, - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/which-module": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", - "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", - "dev": true - }, - "node_modules/which-typed-array": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", - "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", - "dev": true, - "dependencies": { - "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/why-is-node-running": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz", - "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==", - "dev": true, - "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", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wrap-ansi": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", - "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/wrap-ansi-cjs/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==", - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "node_modules/write-file-atomic": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", - "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" - } - }, - "node_modules/write-file-atomic/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "node_modules/xregexp": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-5.1.1.tgz", - "integrity": "sha512-fKXeVorD+CzWvFs7VBuKTYIW63YD1e1osxwQ8caZ6o1jg6pDAbABDG54LCIq0j5cy7PjRvGIq6sef9DYPXpncg==", - "dependencies": { - "@babel/runtime-corejs3": "^7.16.5" - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, - "node_modules/yaml": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz", - "integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==", - "bin": { - "yaml": "bin.mjs" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs/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==" - }, - "node_modules/yargs/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==", - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "devOptional": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - } - } -} diff --git a/pkgs/by-name/bl/blade-formatter/package.nix b/pkgs/by-name/bl/blade-formatter/package.nix index e0f58cd80139a..7aa9b1345fe6a 100644 --- a/pkgs/by-name/bl/blade-formatter/package.nix +++ b/pkgs/by-name/bl/blade-formatter/package.nix @@ -1,33 +1,44 @@ { + stdenvNoCC, lib, - buildNpmPackage, fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, testers, writeText, runCommand, blade-formatter, - nodejs, }: -buildNpmPackage rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "blade-formatter"; version = "1.41.1"; src = fetchFromGitHub { owner = "shufo"; repo = "blade-formatter"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-iaWpIa+H+ocAXGc042PfmCu9UcJZeso9ripWB2/1oTs="; }; - postPatch = '' - cp ${./package-lock.json} ./package-lock.json - ''; + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-zn0PgLIWk23EhYeOKF2RkpvLOusVrqoBazKcJpIAzm8="; + }; - npmDepsHash = "sha256-wEz0DTbg+Fdmsf0Qyeu9QS+I8gkPJeaJC/3HuP913og="; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; passthru = { - updateScript = ./update.sh; + updateScript = nix-update-script { }; tests = { version = testers.testVersion { package = blade-formatter; @@ -64,4 +75,4 @@ buildNpmPackage rec { mainProgram = "blade-formatter"; inherit (nodejs.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/bl/blade-formatter/update.sh b/pkgs/by-name/bl/blade-formatter/update.sh deleted file mode 100755 index c7a0cdde38aa3..0000000000000 --- a/pkgs/by-name/bl/blade-formatter/update.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p ripgrep common-updater-scripts prefetch-npm-deps jq sd - -set -xeu -o pipefail - -PACKAGE_DIR="$(realpath "$(dirname "$0")")" -cd "$PACKAGE_DIR/.." -while ! test -f default.nix; do cd .. ; done -NIXPKGS_DIR="$PWD" - -new_version="$( - list-git-tags --url=https://github.com/shufo/blade-formatter \ - | rg '^v([\d.]*)' -r '$1' \ - | sort --version-sort \ - | tail -n1 -)" - -cd "$NIXPKGS_DIR" -update-source-version blade-formatter "$new_version" - -TMPDIR="$(mktemp -d)" -cd "$TMPDIR" - -src="$(nix-build --no-link "$NIXPKGS_DIR" -A blade-formatter.src)" -cp $src/package.json . -npm update -cp ./package-lock.json "$PACKAGE_DIR" - -prev_npm_hash="$(nix-instantiate "$NIXPKGS_DIR" \ - --eval --json \ - -A blade-formatter.npmDepsHash \ - | jq -r . -)" -new_npm_hash="$(prefetch-npm-deps ./package-lock.json)" - -sd --fixed-strings "$prev_npm_hash" "$new_npm_hash" "$PACKAGE_DIR/package.nix" - -rm -rf "$TMPDIR" diff --git a/pkgs/by-name/bl/blastem/package.nix b/pkgs/by-name/bl/blastem/package.nix index d1ba8d3cb8268..2bdd9ed5f4772 100644 --- a/pkgs/by-name/bl/blastem/package.nix +++ b/pkgs/by-name/bl/blastem/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; # will probably be fixed in https://github.com/NixOS/nixpkgs/pull/302481 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace-fail "-flto" "" ''; diff --git a/pkgs/by-name/bl/bleep/package.nix b/pkgs/by-name/bl/bleep/package.nix new file mode 100644 index 0000000000000..19a007dd70aaf --- /dev/null +++ b/pkgs/by-name/bl/bleep/package.nix @@ -0,0 +1,75 @@ +{ + stdenvNoCC, + fetchzip, + autoPatchelfHook, + installShellFiles, + makeWrapper, + lib, + zlib, +}: +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-dB8reN5rTlY5czFH7BaRya7qBa6czAIH2NkFWZh81ek="; + x86_64-darwin = "sha256-tpUcduCPCbVVaYZZOhWdPlN6SW3LGZPWSO9bDStVDms="; + aarch64-darwin = "sha256-V8QGF3Dpuy9I6CqKsJRHBHRdaLhc4XKZkv/rI7zs+qQ="; + } + ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}"); +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "bleep"; + version = "0.0.7"; + + src = fetchzip { + url = "https://github.com/oyvindberg/bleep/releases/download/v${finalAttrs.version}/bleep-${platform}.tar.gz"; + hash = hash; + }; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + ] ++ lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook; + + buildInputs = [ zlib ]; + + installPhase = '' + runHook preInstall + install -Dm755 bleep -t $out/bin/ + runHook postInstall + ''; + + dontAutoPatchelf = true; + + postFixup = + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + autoPatchelf $out + '' + + '' + export PATH=$PATH:$out/bin + installShellCompletion --cmd bleep \ + --bash <(bleep install-tab-completions-bash --stdout) \ + --zsh <(bleep install-tab-completions-zsh --stdout) \ + ''; + + meta = { + homepage = "https://bleep.build/"; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + license = lib.licenses.mit; + description = "Bleeping fast scala build tool"; + mainProgram = "bleep"; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + maintainers = with lib.maintainers; [ kristianan ]; + }; +}) diff --git a/pkgs/by-name/bl/blendfarm/deps.nix b/pkgs/by-name/bl/blendfarm/deps.nix index 12bb03d85bdb2..f68333b5d09cc 100644 --- a/pkgs/by-name/bl/blendfarm/deps.nix +++ b/pkgs/by-name/bl/blendfarm/deps.nix @@ -1,185 +1,185 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "0.10.15"; sha256 = "02rf96gxpafbk0ilg3nxf0fas9gkpb25kzqc2lnbxp8h366qg431"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.15"; sha256 = "0wgc46vg227bv7nsybc9mxkqv9xlz2bj08bdipkigjlf23g0x4p6"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.15"; sha256 = "1bq2ha1mmgsb9gxmsibr3i6alcg6y3kizxi07qh4wgw38c3fkwzs"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.15"; sha256 = "0p0ih6ql5kyvpfhc6ll2mgy23kx0vwn88qji74713id493w2ab02"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.15"; sha256 = "1va9zwznfr161w2xjjg4swm5505685mdkxxs747l2s35mahl5072"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.15"; sha256 = "0xlnanssz24rcnybz1x0d3lclzmbzdjb9k0i37rd76dif3rgng0h"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.15"; sha256 = "1lxaj8la8bwc7j4d3cc3q5jklycc647lzpm8610ya241y64gryww"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.15"; sha256 = "120d19i8ad3b2m1516v5r1bj4h7fddmad6szrbkbpd711x3sh6ka"; }) - (fetchNuGet { pname = "coverlet.collector"; version = "1.2.0"; sha256 = "0gbhdk9i3xqhay4jbfi0mxdpgk2w5x5m89rfzviv7zp1i7cksbka"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.29"; sha256 = "0z359wbz3014rwz7cdcr60qr6mrcwsbwwh36g59a5hncxb1g73rj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.29"; sha256 = "031kalc7mp8w35rwvnb13jbwwi8cgmny7nywsk3717iy6blxldih"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.29"; sha256 = "0byixcrwj7ixz60lvg7c6r3f132br4pfrjv0w0fh99b3iwzrf114"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.5.0"; sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.5.0"; sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.29"; sha256 = "03rzclkvl2gc7wakh0xqhnj6zl32b91igrnyhd69pzr3mql5kdll"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.29"; sha256 = "0kh3lrzpz7y42iqa4vdhw4mg51vf4y2x8l4lg767mzbx0sd4xllv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.29"; sha256 = "0gv5dnd44xj1yidzd70b01s5a19khbq757llkfykgwf7wl4a89cf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.29"; sha256 = "1bk2n7csgnvqma5yv550037xg4ph4j11gp4m5hn7s4sy23cfc5xp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.29"; sha256 = "0hhypwr4202n8nvpz10ac1q48ryjr7d4xj34r4c79mw49fvh1n61"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.1"; sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.5.0"; sha256 = "02h7j1fr0fwcggn0wgddh59k8b2wmly3snckwhswzqvks5rvfnnw"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.5.0"; sha256 = "08cvss66lqa92h55dxkbrzn796jckhlyj53zz22x3qyr6xi21v5v"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.1.0"; sha256 = "1g1v8yjnk4nr1c36k3cz116889bnpiw1i1jkmqnpb19wms7sq7cz"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.1.0"; sha256 = "0mac4h7ylw953chclhz0lrn19yks3bab9dn9x9fpjqi7309gid0p"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.linux-x64.CoreCompat.System.Drawing"; version = "1.0.0-beta009"; sha256 = "1fb0fjxxa8g4f0p9mqnd221iw7qkc7jmm05nwmymjfl5g8b1nin7"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.CoreCompat.System.Drawing"; version = "5.8.64"; sha256 = "1m5b58ifqkdci5281hjfx2ci1fzrnff1isddxinyg566w40arfhp"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.26.0"; sha256 = "03cygf8p44j1bfn6z9cn2xrw6zhvhq17xac1sph5rgq7vq2m5iq5"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0"; sha256 = "0wqfgzyp2m4myqrni9rgchiqi95axbf279hlqjflrj4c9z2412ni"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.1"; sha256 = "1i1px67hcr9kygmbfq4b9nqzlwm7v2gapsp4isg9i19ax5g8dlhm"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.1"; sha256 = "1r9qr3civk0ws1z7hg322qyr8yjm10853zfgs03szr2lvdqiy7d1"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux.NoDependencies"; version = "2.88.0"; sha256 = "1hxn1gqq8qmds65zb5jhq7r1l94lyg52qks61zmh5fqfvcmkfc17"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.0"; sha256 = "0d0pdcm61jfy3fvgkxmm3hj9cijrwbmp6ky2af776m1l63ryii3q"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.1"; sha256 = "1w55nrwpl42psn6klia5a9aw2j1n25hpw2fdhchypm9f0v2iz24h"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0"; sha256 = "135ni4rba4wy4wyzy9ip11f3dwb1ipn38z9ps1p9xhw8jc06y5vp"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.0"; sha256 = "0fag8hr2v9bswrsjka311lhbr1a43yzcc36j4fadz0f0kl2hby7h"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; }) - (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.7.1"; sha256 = "1y1hdap9qbl7vp74j8s9zcbh3v1rnrrvcc55wj1hl6has2v3qh1r"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "5.0.0"; sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "5.0.0"; sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) + (fetchNuGet { pname = "Avalonia"; version = "0.10.15"; hash = "sha256-YZCHjRkQ3b4sFQz/WcS68yWtHHDdjkcjmMup259JLgs="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; hash = "sha256-ahDcJNCqlNniItcat7owREQ0hfIwMWFNhnDu89lAVRI="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.15"; hash = "sha256-5pIO3hCOyhfnjW0hIJf4tKeNZ6+JLa/t2esI8bYh7HE="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.15"; hash = "sha256-+vPpBkODP04gPiD2H+fw5jGqTBx5RV37S0u/WoOCAq8="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.15"; hash = "sha256-Aiwl+EikxREOOVFihCzfoM8h/KuCUsOgu9vPQrGBEVw="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.15"; hash = "sha256-4oBCoaplaEEPObr32WpBpoBSKtfkSdkFDyZkZz//Se0="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.15"; hash = "sha256-EDz78nCxmdPyGRHMtGT7q37K6Gigh7+8ZZmIr7VVlnY="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.15"; hash = "sha256-nPv8iPGBCOVBMKjeTw8xjHk6ZcGDsdGIPIwvpCiSqtM="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.15"; hash = "sha256-ahqoRw/htLvmyl+bpmpr7kAiV8hlm1BCFWs0hWIKDYg="; }) + (fetchNuGet { pname = "coverlet.collector"; version = "1.2.0"; hash = "sha256-ai492Ynh/rPj/i4nVEsvXMx3W68guiWJVxD3EdNscD0="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; hash = "sha256-dtvXNjVSU1WZ4kFsT6VV56R8iGMPHtdM09dfeejnttw="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; hash = "sha256-Vyy8zgtqw1uLJTbWNTS+wt/7yNuO4qzYU5a91Sf1ApA="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; hash = "sha256-YqGYQttBmNRCmkSS+JRfqTsPnuMdKxkYU9ctS5mKFV0="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; hash = "sha256-QAwWpNc03Vh2RSqIW0xE/rmQCvl/IWs87QREqZNXMtk="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; hash = "sha256-J9exQ3FxRHMF8tHTc4zhjYGQ6eBYb4ZKwWhzk2L0uuQ="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; hash = "sha256-6I/8HtwvEK0JLgRcSrCzCtUfMylj88s5JNcl9ZDoLb8="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.29"; hash = "sha256-Mo/zwurMwqJSeWZAzpfmLFeTMTCZNXY+zySA8RdPZXw="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.29"; hash = "sha256-MDba6TI+nnDG1Nzb4219DEXOlxxh2c1zGRzdehhVMww="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.29"; hash = "sha256-JASXP49jpQQd4GDL7C7JS4zgRjbsvE2B+T0eyTPr0S8="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; hash = "sha256-bpJjcJSUSZH0GeOXoZI12xUQOf2SRtxG7sZV0dWS5TI="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.5.0"; hash = "sha256-rpZmS5Yn9f2lrUu+88AjrOcLMd9oFLJoctx7TOznIBg="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.5.0"; hash = "sha256-2C0hHFcV2TrQGEbYYybhxzVMumqEcRnQd7WWyP5exaU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.29"; hash = "sha256-lLZZKK4j/5tMg97mF0NaYtBvpIW4AzgVP+wJuidlPw8="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.29"; hash = "sha256-m9JOmgZ9/XrMeZRQ1IUnbofyKuGwbaJwFMSff3+mA04="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.29"; hash = "sha256-jiWkCOXH8Te9m5SecvCCMwVVdAALnPZb9EF2QpptZT8="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.29"; hash = "sha256-txfm2BBeE30sLJXcF4Ik8JLXzwCglO2Lqnjbp9mxYq4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.29"; hash = "sha256-wdgAt0uE13QYyWTITtrJ0mdEcGAKhH+3RVYAQTK/HkI="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.1"; hash = "sha256-ByV7aEFjGR4L4Tudg4KaJ96lnzr7RhOxzWGE0p5XFRY="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.5.0"; hash = "sha256-3Fq3c9Fz48815JNZPTytXCw0U4GtPQ7se4w7kF2QBwo="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.5.0"; hash = "sha256-u+wgYjfZ49GF+H8U6SmcTJp07M9r9lYKFElhaozWmyE="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; hash = "sha256-WFqy842DMQG4W1H2ewXWflfBJ+lQf/LwP0KI4OfY0zo="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; hash = "sha256-mGUKg+bmB5sE/DCwsTwCsbe00MCwpgxsVW3nCtQiSmo="; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.1.0"; hash = "sha256-nx2sj648hXUtrlOGGHi8diWETAifjWkGC9mSaaVHO7w="; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.1.0"; hash = "sha256-F7T4EhgnYnld6sm2tNQaevoUbKbgQ8ogGyVx6g8kTFU="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; hash = "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; hash = "sha256-FZC+BNSzSkN3rObLJJAqwW/vNnJ+PiwdvNNufuISWVY="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.linux-x64.CoreCompat.System.Drawing"; version = "1.0.0-beta009"; hash = "sha256-x0YbFnqFOll95baAWuVhEx8egxDN4poucOQh1bt0YLk="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.CoreCompat.System.Drawing"; version = "5.8.64"; hash = "sha256-F7qsAOHGlOdt7K3pGJyz+bsQmehOwoBEiaxN7CIqq9Q="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; hash = "sha256-1Q50COfWkU4/y9eBWj0jPDp3qvy19vRCZnDKQthrhUU="; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.26.0"; hash = "sha256-BcdSBd4Hv1zg1YGpfgKGG37DcxeWpW+sW0EScpF7ng0="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0"; hash = "sha256-0YpAxE+MyEydxBSmI9zqqqSII2Qvp2gz9pVUcf1/DnM="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.1"; hash = "sha256-FdKGXukqhZiejuTqq57Yp3L6sU2LYLfq8zNlBo/pN8Q="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.1"; hash = "sha256-oR0fcdtU5K8H0M/9URAIVXqUPRZiPHh+0BzMHdnIOOU="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux.NoDependencies"; version = "2.88.0"; hash = "sha256-JzA3K9sOuwLrD0ZPLMrzlCQa8sFQlvWL0a1ihPELtsM="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.0"; hash = "sha256-eMTo8zA0VHOOU8JPc+viWUaWJBy19vm2G97JYCprFzQ="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.1"; hash = "sha256-kIgfxQYu1eshg80JfmERNkjBVVJFRTqN1VcQenm2pfA="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; hash = "sha256-OH8aBCNQPR0QQWg3cUytuYW49JET+wF8poDYR6gXklc="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0"; hash = "sha256-dxdvAJOIw55u0Dd9NOyNYfE2XAg3Jv89J54TtTKJtow="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; hash = "sha256-m24HrDOUXn6s+HJqMs3eQb2Q5lqTTZp+cvEeEtpSoMw="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; hash = "sha256-gx3IHPvPNRmwpLwtswu12U/ow4f/7OPAeHxyMxw5qyU="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; hash = "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; hash = "sha256-DLYGJraIfSj0Zmpi2H5Am2AsZ+kP5UVGdjakqj9Q2E4="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.0"; hash = "sha256-8PgFBZ3Agd+UI9IMxr4fRIW8IA1hqCl15nqlLTJETzk="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; hash = "sha256-MjVaZHx8DUFnVUxOEEaU9GxF6EyEXbcuI1V7yRXEp0w="; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; hash = "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; hash = "sha256-FTjQeMuvqnKxpoVsVh/OlQ21NMaZiFtOdv7VdZ+Iv3Y="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; hash = "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; hash = "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.7.1"; hash = "sha256-OUA8ttAKGgqD5KUwtnO2OewBF/tJI0nO3YcunK5qMPg="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "5.0.0"; hash = "sha256-IYctBEelnDQbDTPJh0yfFRucAQvPkXaymmswWYx/l5A="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "5.0.0"; hash = "sha256-epL8glCZZnsgW+dcmVtsYX0uZ08Jvhkzri9j81Gg774="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; hash = "sha256-w332WVsJrdAOnlSUtgvatSTtnoC81C3LG6J2ip42fW8="; }) ] diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix index badbda23c38a6..4eeabc18efaf2 100644 --- a/pkgs/by-name/bl/blendfarm/package.nix +++ b/pkgs/by-name/bl/blendfarm/package.nix @@ -6,9 +6,6 @@ dotnetCorePackages, xz, pcre, - libX11, - libICE, - libSM, autoPatchelfHook, bintools, fixDarwinDylibNames, @@ -77,13 +74,9 @@ buildDotnetModule rec { runtimeDeps = [ xz pcre - libX11 - libICE - libSM libgdiplus glib libXrandr - fontconfig ] ++ lib.optionals stdenv.hostPlatform.isLinux [ blender ]; # there is no "*.so.3" or "*.so.5" in nixpkgs. So ignore the warning diff --git a/pkgs/by-name/bl/bloaty/package.nix b/pkgs/by-name/bl/bloaty/package.nix new file mode 100644 index 0000000000000..fab4550cbdb00 --- /dev/null +++ b/pkgs/by-name/bl/bloaty/package.nix @@ -0,0 +1,91 @@ +{ + lib, + stdenv, + cmake, + zlib, + fetchFromGitHub, + re2, + abseil-cpp, + protobuf, + capstone, + gtest, + pkg-config, + lit, + llvmPackages_16, +}: +let + # Old vendored package which has no other use than here, so not packaged in nixpkgs. + demumble = fetchFromGitHub { + owner = "nico"; + repo = "demumble"; + rev = "01098eab821b33bd31b9778aea38565cd796aa85"; + hash = "sha256-605SsXd7TSdm3BH854ChHIZbOXcHI/n8RN+pFMz4Ex4="; + }; +in +stdenv.mkDerivation { + pname = "bloaty"; + version = "1.1-unstable-2024-09-23"; + + src = fetchFromGitHub { + owner = "google"; + repo = "bloaty"; + rev = "0c89acd7e8b9d91fd1e9c8c129be627b4e47f1ea"; + hash = "sha256-txZDPytWnkjkiVkPL2SWLwCPEtVvqoI/MVRvbJ2kBGw="; + }; + + cmakeFlags = [ + "-DLIT_EXECUTABLE=${lit}/bin/lit" + "-DFILECHECK_EXECUTABLE=${llvmPackages_16.libllvm}/bin/FileCheck" + "-DYAML2OBJ_EXECUTABLE=${llvmPackages_16.libllvm}/bin/yaml2obj" + ]; + + postPatch = '' + # 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)" "" \ + --replace "if(Python_FOUND AND LIT_EXECUTABLE" "if(LIT_EXECUTABLE" \ + --replace "COMMAND \''\${Python_EXECUTABLE} \''\${LIT_EXECUTABLE}" "COMMAND \''\${LIT_EXECUTABLE}" + # wasm test fail. Possibly due to LLVM version < 17. See https://github.com/google/bloaty/pull/354 + rm -rf tests/wasm + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + zlib + re2 + abseil-cpp + protobuf + capstone + gtest + lit + llvmPackages_16.libllvm + ]; + + doCheck = true; + + postCheck = '' + # These lit tests need to be build seperatly. + # See https://github.com/google/bloaty/blob/main/tests/README.md + cmake --build . --target check-bloaty + ''; + installPhase = '' + install -Dm755 {.,$out/bin}/bloaty + ''; + + meta = { + description = "Size profiler for binaries"; + mainProgram = "bloaty"; + homepage = "https://github.com/google/bloaty"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ momeemt ]; + }; +} diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index 35b765920a0a9..0e8a3cbc4d519 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://blockattack.net/"; description = "Open source clone of Panel de Pon (aka Tetris Attack)"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/blockattack/blockattack-game/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "blockattack"; diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index a8458255c714d..0b247296bfbef 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -12,28 +12,28 @@ buildNpmPackage rec { pname = "blockbench"; - version = "4.10.4"; + version = "4.11.1"; src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; rev = "v${version}"; - hash = "sha256-TjT93nx52PxuHuW4NONTfI3G7+Dl0NFX2aKpZDEF8+8="; + hash = "sha256-a+55seE5tFxTmdTn4qDFWWW6C6FzO8Vgjvfow/tBqf0="; }; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ imagemagick # for icon resizing copyDesktopItems ]; - npmDepsHash = "sha256-WkOn1bLJ9xmJdQcY6ak+hs/YW+crIXhTWA6tjMSVq9I="; + npmDepsHash = "sha256-0hS+AjfYvkdxyM6CtXYgvjt49GmcCvyAdEFWfK8uaHc="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; # disable code signing on Darwin - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export CSC_IDENTITY_AUTO_DISCOVERY=false sed -i "/afterSign/d" package.json ''; @@ -54,13 +54,13 @@ buildNpmPackage rec { installPhase = '' runHook preInstall - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r dist/mac*/Blockbench.app $out/Applications makeWrapper $out/Applications/Blockbench.app/Contents/MacOS/Blockbench $out/bin/blockbench ''} - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p $out/share/blockbench cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/blockbench diff --git a/pkgs/by-name/bl/bluemap/package.nix b/pkgs/by-name/bl/bluemap/package.nix index 97e8831d13eec..6275295aaefdc 100644 --- a/pkgs/by-name/bl/bluemap/package.nix +++ b/pkgs/by-name/bl/bluemap/package.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bluemap"; - version = "3.21"; + version = "5.4"; src = fetchurl { url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar"; - hash = "sha256-YWf69+nsMfqk2x9xGTt+tdnGvaU+6rPsiBLWsP89ngM="; + hash = "sha256-ycgCYot3lTdkufJdOSX/PMWI2fnAWz8f5I9IWZpKppw="; }; dontUnpack = true; diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix index b40e613b33e58..ae8106160d643 100644 --- a/pkgs/by-name/bl/bluetuith/package.nix +++ b/pkgs/by-name/bl/bluetuith/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "darkhz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yXH/koNT4ec/SOZhSU01iPNAfD1MdMjM2+wNmjXWsrk="; + hash = "sha256-yXH/koNT4ec/SOZhSU01iPNAfD1MdMjM2+wNmjXWsrk="; }; vendorHash = "sha256-tEVzuhE0Di7edGa5eJHLLqOecCuoj02h91TsZiZU1PM="; diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 3d21eb39455f1..f18b65c62552b 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20240722"; + version = "20240808"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-FlS9DK0oQ2CElmmh6amTGB/tE3iWqsJpS4LqmjX3CeQ="; + hash = "sha256-tZGJJRtIPezUSS8fdDh7KlhMA9WqRjfNSLOOxiucCEg="; }; patches = [ @@ -29,7 +29,9 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "man" ]; - nativeBuildInputs = [ getopt ]; + nativeBuildInputs = [ + getopt + ]; nativeCheckInputs = [ bc diff --git a/pkgs/by-name/bm/bmake/setup-hook.sh b/pkgs/by-name/bm/bmake/setup-hook.sh index a36d024b111e7..acca59004730b 100644 --- a/pkgs/by-name/bm/bmake/setup-hook.sh +++ b/pkgs/by-name/bm/bmake/setup-hook.sh @@ -14,11 +14,10 @@ bmakeBuildPhase() { local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES}} SHELL="$SHELL" - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} ) + concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray - echoCmd 'build flags' "${flagsArray[@]}" + nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" runHook postBuild @@ -37,18 +36,15 @@ bmakeCheckPhase() { fi if [ -z "${checkTarget:-}" ]; then - echo "no test target found in bmake, doing nothing" + nixInfoLog "${FUNCNAME[0]}: no test target found in bmake, doing nothing" else local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL" - # Old bash empty array hack - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} - ${checkTarget} ) + concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget - echoCmd 'check flags' "${flagsArray[@]}" + nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" fi @@ -65,13 +61,10 @@ bmakeInstallPhase() { local flagsArray=( ${enableParallelInstalling:+-j${NIX_BUILD_CORES}} SHELL="$SHELL" - # Old bash empty array hack - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} - ${installTargets:-install} ) + concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install - echoCmd 'install flags' "${flagsArray[@]}" + nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" runHook postInstall @@ -84,12 +77,10 @@ bmakeDistPhase() { mkdir -p "$prefix" fi - # Old bash empty array hack - local flagsArray=( - $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist} - ) + local flagsArray=() + concatTo flagsArray distFlags distFlagsArray distTarget=dist - echo 'dist flags: %q' "${flagsArray[@]}" + nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" if [ "${dontCopyDist:-0}" != 1 ]; then @@ -107,16 +98,20 @@ preConfigureHooks+=(addMakeFlags) if [ -z "${dontUseBmakeBuild-}" ] && [ -z "${buildPhase-}" ]; then buildPhase=bmakeBuildPhase + nixInfoLog "${FUNCNAME[0]}: set buildPhase to bmakeBuildPhase" fi if [ -z "${dontUseBmakeCheck-}" ] && [ -z "${checkPhase-}" ]; then checkPhase=bmakeCheckPhase + nixInfoLog "${FUNCNAME[0]}: set checkPhase to bmakeCheckPhase" fi if [ -z "${dontUseBmakeInstall-}" ] && [ -z "${installPhase-}" ]; then installPhase=bmakeInstallPhase + nixInfoLog "${FUNCNAME[0]}: set installPhase to bmakeInstallPhase" fi if [ -z "${dontUseBmakeDist-}" ] && [ -z "${distPhase-}" ]; then distPhase=bmakeDistPhase + nixInfoLog "${FUNCNAME[0]}: set distPhase to bmakeDistPhase" fi diff --git a/pkgs/by-name/bm/bmaptool/package.nix b/pkgs/by-name/bm/bmaptool/package.nix new file mode 100644 index 0000000000000..dedc16bd23fac --- /dev/null +++ b/pkgs/by-name/bm/bmaptool/package.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "bmaptool"; + version = "3.8.0"; + + src = fetchFromGitHub { + owner = "yoctoproject"; + repo = "bmaptool"; + rev = "v${version}"; + hash = "sha256-YPY3sNuZ/TASNBPH94iqG6AuBRq5KjioKiuxAcu94+I="; + }; + + propagatedBuildInputs = with python3Packages; [ six ]; + + # tests fail only on hydra. + doCheck = false; + + meta = with lib; { + description = "BMAP Tools"; + homepage = "https://github.com/yoctoproject/bmaptool"; + license = licenses.gpl2Only; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + mainProgram = "bmaptool"; + }; +} diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index 9d95e8443317f..5fb86282c392d 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.9.5"; + version = "0.9.7"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-fJDoKGYal/wDpe2FALWDm0cVngP2ybWlrDIJLSEBIGY="; + hash = "sha256-h4m/tPiLFRi3Dwh6QPmnCCZR4XNOZaz9xoDhOXAcIEQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix index 963f242d1ed7b..2bb8d36f3edb9 100644 --- a/pkgs/by-name/bo/bochs/package.nix +++ b/pkgs/by-name/bo/bochs/package.nix @@ -1,26 +1,28 @@ -{ lib -, stdenv -, fetchurl -, SDL2 -, curl -, darwin -, docbook_xml_dtd_45 -, docbook_xsl -, gtk3 -, libGL -, libGLU -, libX11 -, libXpm -, libtool -, ncurses -, pkg-config -, readline -, wget -, wxGTK32 -, enableSDL2 ? true -, enableTerm ? true -, enableWx ? !stdenv.isDarwin -, enableX11 ? !stdenv.isDarwin +{ + lib, + SDL2, + curl, + darwin, + docbook_xml_dtd_45, + docbook_xsl, + fetchurl, + gtk3, + libGL, + libGLU, + libX11, + libXpm, + libtool, + ncurses, + pkg-config, + readline, + stdenv, + wget, + wxGTK32, + # Boolean flags + enableSDL2 ? true, + enableTerm ? true, + enableWx ? !stdenv.hostPlatform.isDarwin, + enableX11 ? !stdenv.hostPlatform.isDarwin, }: stdenv.mkDerivation (finalAttrs: { @@ -39,98 +41,110 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = [ - curl - readline - wget - ] ++ lib.optionals enableSDL2 [ - SDL2 - ] ++ lib.optionals enableTerm [ - ncurses - ] ++ lib.optionals enableWx [ - gtk3 - wxGTK32 - ] ++ lib.optionals enableX11 [ - libGL - libGLU - libX11 - libXpm - ] ++ lib.optionals stdenv.isDarwin [ - darwin.libobjc - ]; + buildInputs = + [ + curl + readline + wget + ] + ++ lib.optionals enableSDL2 [ + SDL2 + ] + ++ lib.optionals enableTerm [ + ncurses + ] + ++ lib.optionals enableWx [ + gtk3 + wxGTK32 + ] + ++ lib.optionals enableX11 [ + libGL + libGLU + libX11 + libXpm + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.libobjc + ]; - configureFlags = [ - "--with-rfb=no" - "--with-vncsrv=no" - "--with-nogui" + configureFlags = + [ + (lib.withFeature false "rfb") + (lib.withFeature false "vncsrv") + (lib.withFeature true "nogui") - # These will always be "yes" on NixOS - "--enable-ltdl-install=yes" - "--enable-readline=yes" - "--enable-all-optimizations=yes" - "--enable-logging=yes" - "--enable-xpm=yes" + # These will always be "yes" on NixOS + (lib.enableFeature true "ltdl-install") + (lib.enableFeature true "readline") + (lib.enableFeature true "all-optimizations") + (lib.enableFeature true "logging") + (lib.enableFeature true "xpm") - # ... whereas these, always "no"! - "--enable-cpp=no" - "--enable-instrumentation=no" + # ... whereas these, always "no"! + (lib.enableFeature false "cpp") + (lib.enableFeature false "instrumentation") - "--enable-docbook=no" # Broken - it requires docbook2html + (lib.enableFeature false "docbook") # Broken - it requires docbook2html - # Dangerous options - they are marked as "incomplete/experimental" on Bochs documentation - "--enable-3dnow=no" - "--enable-monitor-mwait=no" - "--enable-raw-serial=no" + # Dangerous options - they are marked as "incomplete/experimental" on Bochs documentation + (lib.enableFeature false "3dnow") + (lib.enableFeature false "monitor-mwait") + (lib.enableFeature false "raw-serial") - # These are completely configurable, and they don't depend of external tools - "--enable-a20-pin" - "--enable-avx" - "--enable-busmouse" - "--enable-cdrom" - "--enable-clgd54xx" - "--enable-configurable-msrs" - "--enable-cpu-level=6" # from 3 to 6 - "--enable-debugger" #conflicts with gdb-stub option - "--enable-debugger-gui" - "--enable-evex" - "--enable-fpu" - "--enable-gdb-stub=no" # conflicts with debugger option - "--enable-handlers-chaining" - "--enable-idle-hack" - "--enable-iodebug" - "--enable-large-ramfile" - "--enable-largefile" - "--enable-pci" - "--enable-repeat-speedups" - "--enable-show-ips" - "--enable-smp" - "--enable-vmx=2" - "--enable-svm" - "--enable-trace-linking" - "--enable-usb" - "--enable-usb-ehci" - "--enable-usb-ohci" - "--enable-usb-xhci" - "--enable-voodoo" - "--enable-x86-64" - "--enable-x86-debugger" - ] ++ lib.optionals enableSDL2 [ - "--with-sdl2" - ] ++ lib.optionals enableTerm [ - "--with-term" - ] ++ lib.optionals enableWx [ - "--with-wx" - ] ++ lib.optionals enableX11 [ - "--with-x" - "--with-x11" - ] ++ lib.optionals (!stdenv.isDarwin) [ - "--enable-e1000" - "--enable-es1370" - "--enable-ne2000" - "--enable-plugins" - "--enable-pnic" - "--enable-sb16" - ]; + # These are completely configurable, and they don't depend of external tools + (lib.enableFeature true "a20-pin") + (lib.enableFeature true "avx") + (lib.enableFeature true "busmouse") + (lib.enableFeature true "cdrom") + (lib.enableFeature true "clgd54xx") + (lib.enableFeature true "configurable-msrs") + (lib.enableFeatureAs true "cpu-level" "6") # from 3 to 6 + (lib.enableFeature true "debugger") # conflicts with gdb-stub option + (lib.enableFeature true "debugger-gui") + (lib.enableFeature true "evex") + (lib.enableFeature true "fpu") + (lib.enableFeature false "gdb-stub") # conflicts with debugger option + (lib.enableFeature true "handlers-chaining") + (lib.enableFeature true "idle-hack") + (lib.enableFeature true "iodebug") + (lib.enableFeature true "large-ramfile") + (lib.enableFeature true "largefile") + (lib.enableFeature true "pci") + (lib.enableFeature true "repeat-speedups") + (lib.enableFeature true "show-ips") + (lib.enableFeature true "smp") + (lib.enableFeatureAs true "vmx" "2") + (lib.enableFeature true "svm") + (lib.enableFeature true "trace-linking") + (lib.enableFeature true "usb") + (lib.enableFeature true "usb-ehci") + (lib.enableFeature true "usb-ohci") + (lib.enableFeature true "usb-xhci") + (lib.enableFeature true "voodoo") + (lib.enableFeature true "x86-64") + (lib.enableFeature true "x86-debugger") + ] + ++ lib.optionals enableSDL2 [ + (lib.withFeature true "sdl2") + ] + ++ lib.optionals enableTerm [ + (lib.withFeature true "term") + ] + ++ lib.optionals enableWx [ + (lib.withFeature true "wx") + ] + ++ lib.optionals enableX11 [ + (lib.withFeature true "x") + (lib.withFeature true "x11") + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + (lib.enableFeature true "e1000") + (lib.enableFeature true "es1370") + (lib.enableFeature true "ne2000") + (lib.enableFeature true "plugins") + (lib.enableFeature true "pnic") + (lib.enableFeature true "sb16") + ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix index 4a5418a3206b6..1c46aea7f9ca6 100644 --- a/pkgs/by-name/bo/boehmgc/package.nix +++ b/pkgs/by-name/bo/boehmgc/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; outputs = [ "out" "dev" "doc" ]; - separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; + separateDebugInfo = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "musl"; nativeBuildInputs = [ autoreconfHook @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { # `gctest` fails under x86_64 emulation on aarch64-darwin # and also on aarch64-linux (qemu-user) - doCheck = !((stdenv.isDarwin && stdenv.isx86_64) || (stdenv.isLinux && stdenv.isAarch64)); + doCheck = !((stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64)); enableParallelBuilding = true; diff --git a/pkgs/by-name/bo/boilr/0001-update-time.patch b/pkgs/by-name/bo/boilr/0001-update-time.patch new file mode 100644 index 0000000000000..334d0fe1e9b3c --- /dev/null +++ b/pkgs/by-name/bo/boilr/0001-update-time.patch @@ -0,0 +1,287 @@ +From 047681f1425c7cd68b77fdd729ea4664f73126b8 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Mon, 23 Sep 2024 15:11:09 +0800 +Subject: [PATCH] update time + +--- + Cargo.lock | 87 +++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 56 insertions(+), 31 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index be4fbeb..42f29b8 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -265,7 +265,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -282,7 +282,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -467,7 +467,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -809,6 +809,15 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] ++ + [[package]] + name = "derivative" + version = "2.2.0" +@@ -1007,7 +1016,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1259,7 +1268,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2002,6 +2011,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.45" +@@ -2156,7 +2171,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2308,7 +2323,7 @@ dependencies = [ + "pest_meta", + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2339,7 +2354,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2389,6 +2404,12 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -2407,9 +2428,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.57" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] +@@ -2425,9 +2446,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.27" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -2711,22 +2732,22 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.163" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.163" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2748,7 +2769,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2981,9 +3002,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.16" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -3035,7 +3056,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3061,11 +3082,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.21" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -3073,16 +3097,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.9" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -3153,7 +3178,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3260,7 +3285,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3443,7 +3468,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + "wasm-bindgen-shared", + ] + +@@ -3477,7 +3502,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +-- +2.46.0 + diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index d7e95b5a8bf90..83a83011c1c99 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, clangStdenv -, gtk3 -, xorg -, perl -, openssl -, speechd-minimal -, libxkbcommon -, libGL -, wayland +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + clangStdenv, + gtk3, + xorg, + perl, + openssl, + speechd-minimal, + libxkbcommon, + libGL, + wayland, }: let rpathLibs = [ @@ -38,11 +39,15 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { src = fetchFromGitHub { owner = "PhilipK"; repo = "BoilR"; - rev = "v.${version}"; + rev = "refs/tags/v.${version}"; hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80="; }; - cargoHash = "sha256-nAZU1xVpeRXubotla4I6InGMH4lisPMOnoqaK5mBPCM="; + cargoPatches = [ + ./0001-update-time.patch + ]; + + cargoHash = "sha256-09vPP+kNrmk0nN3Bdn9T7QjvuZvJeqQ56lCQIFb+Zrs="; nativeBuildInputs = [ perl ]; @@ -57,10 +62,12 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { dontPatchELF = true; meta = { - description = - "Automatically adds (almost) all your games to your Steam library (including image art)"; + description = "Automatically adds (almost) all your games to your Steam library (including image art)"; homepage = "https://github.com/PhilipK/BoilR"; - license = with lib.licenses; [ asl20 mit ]; + license = with lib.licenses; [ + asl20 + mit + ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ foolnotion ]; mainProgram = "boilr"; diff --git a/pkgs/by-name/bo/boinctui/package.nix b/pkgs/by-name/bo/boinctui/package.nix index faf8ca709dd48..eca32ef377317 100644 --- a/pkgs/by-name/bo/boinctui/package.nix +++ b/pkgs/by-name/bo/boinctui/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; outputs = [ "out" "man" ]; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; enableParallelBuilding = true; diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index 93005522cf4dd..75d089c0aab2c 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -2,18 +2,21 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - sha256 = "sha256-dMJ6A2ggBb20vuHL1g/Zx3pl9tXE8oayMGOqpChcg2U="; + hash = "sha256-wpMENrhfD8+bt66gd29xkfLANcMbPpkzDacj0KPuXT4="; }; projectFile = [ "Source/Boogie.sln" ]; nugetDeps = ./deps.nix; + # [...]Microsoft.NET.Publish.targets(248,5): error MSB3021: Unable to copy file "[...]/NUnit3.TestAdapter.pdb" to "[...]/NUnit3.TestAdapter.pdb". Access to the path '[...]/NUnit3.TestAdapter.pdb' is denied. [[...]/ExecutionEngineTests.csproj] + enableParallelBuilding = false; + executables = [ "BoogieDriver" ]; makeWrapperArgs = [ @@ -54,4 +57,3 @@ buildDotnetModule rec { platforms = with platforms; (linux ++ darwin); }; } - diff --git a/pkgs/by-name/bo/bower2nix/package.nix b/pkgs/by-name/bo/bower2nix/package.nix new file mode 100644 index 0000000000000..c0db35461b578 --- /dev/null +++ b/pkgs/by-name/bo/bower2nix/package.nix @@ -0,0 +1,44 @@ +{ + buildNpmPackage, + fetchFromGitHub, + git, + lib, + nix, + unstableGitUpdater, +}: + +buildNpmPackage rec { + pname = "bower2nix"; + version = "3.2.0-unstable-2024-06-25"; + + src = fetchFromGitHub { + owner = "rvl"; + repo = "bower2nix"; + rev = "b5da44f055c7561ed7a46226b3be0070e07d80e6"; + hash = "sha256-da+m2UWQ83tW1o0P1qvw35KpsXL/BDTeShg4KxL+7Ck="; + }; + + npmDepsHash = "sha256-TK1sqF2J/hQuP3bgGA4MolLA7LWWuYNnqf4gDyU154k="; + + npmBuildScript = "prepare"; + + makeWrapperArgs = [ + "--prefix PATH : ${ + lib.makeBinPath [ + git + nix + ] + }" + ]; + + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + + meta = { + changelog = "https://github.com/rvl/bower2nix/releases/tag/v${version}"; + description = "Generate nix expressions to fetch bower dependencies"; + homepage = "https://github.com/rvl/bower2nix"; + license = lib.licenses.gpl3Only; + mainProgram = "bower2nix"; + maintainers = [ ]; + }; +} diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index 17694f6abe619..db8e357899f67 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.2.10"; + version = "2.2.12"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-q09yrFO/qBXr/O3tK7seqWyBEraQ7VJB39RukS6v+ys="; + hash = "sha256-PoPIIwe2SlK/iQTyqIhMG0dRobU98L5hnOciMmi9coo="; }; - cargoHash = "sha256-Ow16RxhauuisQ+GiJ5TdFa0D9FcgmAjwnk7WenXoQYo="; + cargoHash = "sha256-En5TVCW/URJEry4sTd+vdi8K1YO2L0X5pYu/TGsrx6U="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here diff --git a/pkgs/by-name/bo/boxed-cpp/package.nix b/pkgs/by-name/bo/boxed-cpp/package.nix index a9f225e3c4116..3ce5a5c9c6084 100644 --- a/pkgs/by-name/bo/boxed-cpp/package.nix +++ b/pkgs/by-name/bo/boxed-cpp/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (final: { pname = "boxed-cpp"; - version = "1.3.0"; + version = "1.4.3"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "boxed-cpp"; rev = "v${final.version}"; - hash = "sha256-o+qAEpP2inGQVXJ1i3HBee0fXQYR2HCyBY4Urk8ohMI="; + hash = "sha256-uZ/wT159UuEcTUtoQyt0D59z2wnLT5KpeeCpjyij198="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/bo/bozohttpd/package.nix b/pkgs/by-name/bo/bozohttpd/package.nix new file mode 100644 index 0000000000000..4ff11c5a66ca9 --- /dev/null +++ b/pkgs/by-name/bo/bozohttpd/package.nix @@ -0,0 +1,107 @@ +{ + lib, + bmake, + fetchurl, + groff, + inetutils, + libxcrypt, + lua, + openssl, + stdenv, + wget, + # Boolean flags + minimal ? false, + userSupport ? !minimal, + cgiSupport ? !minimal, + dirIndexSupport ? !minimal, + dynamicContentSupport ? !minimal, + sslSupport ? !minimal, + luaSupport ? !minimal, + htpasswdSupport ? !minimal, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bozohttpd"; + version = "20240126"; + + # bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at: + # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo + src = fetchurl { + url = "http://eterna23.net/bozohttpd/bozohttpd-${finalAttrs.version}.tar.bz2"; + hash = "sha512-fr1PnyYAS3wkpmj/npRC3A87UL9LIXw4thlM4GfrtlJbuX5EkWGVJnHJW/EmYp7z+N91dcdRJgdO79l6WJsKpg=="; + }; + + buildInputs = [ + libxcrypt + openssl + ] ++ lib.optionals (luaSupport) [ lua ]; + + nativeBuildInputs = [ + bmake + groff + ]; + + nativeCheckInputs = [ + inetutils + wget + ]; + + env = { + COPTS = lib.concatStringsSep " " ( + [ + "-D_DEFAULT_SOURCE" + "-D_GNU_SOURCE" + + # ensure that we can serve >2GB files even on 32-bit systems. + "-D_LARGEFILE_SOURCE" + "-D_FILE_OFFSET_BITS=64" + + # unpackaged dependency: https://man.netbsd.org/blocklist.3 + "-DNO_BLOCKLIST_SUPPORT" + ] + ++ lib.optionals (htpasswdSupport) [ "-DDO_HTPASSWD" ] + ++ lib.optionals (!cgiSupport) [ "-DNO_CGIBIN_SUPPORT" ] + ++ lib.optionals (!dirIndexSupport) [ "-DNO_DIRINDEX_SUPPORT" ] + ++ lib.optionals (!dynamicContentSupport) [ "-DNO_DYNAMIC_CONTENT" ] + ++ lib.optionals (!luaSupport) [ "-DNO_LUA_SUPPORT" ] + ++ lib.optionals (!sslSupport) [ "-DNO_SSL_SUPPORT" ] + ++ lib.optionals (!userSupport) [ "-DNO_USER_SUPPORT" ] + ); + + _LDADD = lib.concatStringsSep " " ( + [ "-lm" ] + ++ lib.optionals (stdenv.hostPlatform.libc != "libSystem") [ "-lcrypt" ] + ++ lib.optionals (luaSupport) [ "-llua" ] + ++ lib.optionals (sslSupport) [ + "-lcrypto" + "-lssl" + ] + ); + }; + + makeFlags = [ "LDADD=$(_LDADD)" ]; + + checkFlags = lib.optionals (!cgiSupport) [ "CGITESTS=" ]; + + doCheck = true; + + meta = { + homepage = "http://www.eterna23.net/bozohttpd/"; + description = "Bozotic HTTP server; small and secure"; + longDescription = '' + bozohttpd is a small and secure HTTP version 1.1 server. Its main + feature is the lack of features, reducing the code size and improving + verifiability. + + It supports CGI/1.1, HTTP/1.1, HTTP/1.0, HTTP/0.9, ~user translations, + virtual hosting support, as well as multiple IP-based servers on a + single machine. It is capable of servicing pages via the IPv6 protocol. + It has SSL support. It has no configuration file by design. + ''; + changelog = "http://www.eterna23.net/bozohttpd/CHANGES"; + license = lib.licenses.bsd2; + mainProgram = "bozohttpd"; + maintainers = [ lib.maintainers.embr ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index 0c7f03ec4aad4..0a3522b960875 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, bluez, cmake, dbus, @@ -18,34 +17,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "brainflow"; - version = "5.12.1"; + version = "5.14.0"; src = fetchFromGitHub { owner = "brainflow-dev"; repo = "brainflow"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-haQO03nkvLoXtFVe+C+yi+MwM0CFh6rLcLvU8fQ4k/w="; + hash = "sha256-cnItKuOu4ez54mAyRuk8PDC3oKKUIqdkAUuuaxNs5Z8="; }; - patches = [ - # All of these are PRs that were merged into the upstream repository and will be included in the next release - # These should be removed once the next version is released - (fetchpatch { - # Fixes a major issue that prevented the build from working at all (why was this not backported???) - url = "https://github.com/brainflow-dev/brainflow/commit/883b0cd08acb99d7b6e241e92fba2e9a363d17b1.patch"; - hash = "sha256-QQd+BI3I65gfaNS/SKLjCoqbCwPCiTh+nh0tJAZM6hQ="; - }) - (fetchpatch { - # Bumps the version of a python dependency that had a backwards-incompatible change - url = "https://github.com/brainflow-dev/brainflow/commit/ea23a6f0483ce4d6fdd7a82bace865356ee78d7f.patch"; - hash = "sha256-dvMpxxRrnJQ9ADGagB1JhuoB9SNwn755wbHzW/3ECeo="; - }) - (fetchpatch { - # Fixes an incorrect use of an environment variable during the build - url = "https://github.com/brainflow-dev/brainflow/commit/053b8c1253b686cbec49ab4adb47c9ee02d3f99a.patch"; - hash = "sha256-Pfhe1ZvMagfVAGZqeWn1uHXgwlTtkOm+gyWuvC5/Sro="; - }) - ]; + patches = [ ]; cmakeFlags = [ (lib.cmakeBool "USE_LIBFTDI" useLibFTDI) diff --git a/pkgs/by-name/br/brogue-ce/package.nix b/pkgs/by-name/br/brogue-ce/package.nix new file mode 100644 index 0000000000000..32f1dda3e4854 --- /dev/null +++ b/pkgs/by-name/br/brogue-ce/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, SDL2 +, SDL2_image +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "brogue-ce"; + version = "1.14.1"; + + src = fetchFromGitHub { + owner = "tmewett"; + repo = "BrogueCE"; + rev = "v${finalAttrs.version}"; + hash = "sha256-habmfq1jZa70eggLOgsPT6j1OGmmQ6qmWcCwRN2G4Fo="; + }; + + postPatch = '' + substituteInPlace linux/brogue-multiuser.sh \ + --replace broguedir= "broguedir=$out/opt/brogue-ce #" + ''; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + buildInputs = [ + SDL2 + SDL2_image + ]; + + makeFlags = [ "DATADIR=$(out)/opt/brogue-ce" ]; + + desktopItems = [(makeDesktopItem { + name = "brogue-ce"; + desktopName = "Brogue CE"; + genericName = "Roguelike"; + comment = "Brave the Dungeons of Doom!"; + icon = "brogue-ce"; + exec = "brogue-ce"; + categories = [ "Game" "AdventureGame" ]; + })]; + + installPhase = '' + runHook preInstall + mkdir -p $out/opt + cp -r bin $out/opt/brogue-ce + install -Dm755 linux/brogue-multiuser.sh $out/bin/brogue-ce + install -Dm 644 bin/assets/icon.png $out/share/icons/hicolor/256x256/apps/brogue-ce.png + runHook postInstall + ''; + + meta = with lib; { + description = "Community-lead fork of the minimalist roguelike game Brogue"; + mainProgram = "brogue-ce"; + homepage = "https://github.com/tmewett/BrogueCE"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ AndersonTorres fgaz ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/games/brogue/default.nix b/pkgs/by-name/br/brogue/package.nix similarity index 100% rename from pkgs/games/brogue/default.nix rename to pkgs/by-name/br/brogue/package.nix diff --git a/pkgs/by-name/br/browsers/Cargo.lock b/pkgs/by-name/br/browsers/Cargo.lock new file mode 100644 index 0000000000000..be32d3d604d19 --- /dev/null +++ b/pkgs/by-name/br/browsers/Cargo.lock @@ -0,0 +1,3416 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +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 = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "associative-cache" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46016233fc1bb55c23b856fe556b7db6ccd05119a0a392e04f0b3b7c79058f16" + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "2.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" +dependencies = [ + "async-channel", + "async-io", + "async-lock", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "async-signal" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "atk" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39991bc421ddf72f70159011b323ff49b0f783cc676a7287c59453da2e2531cf" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "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 = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + +[[package]] +name = "browsers" +version = "0.5.8" +dependencies = [ + "clap", + "cocoa-foundation 0.2.0", + "configparser", + "core-foundation 0.10.0", + "dark-light", + "dirs 5.0.1", + "druid", + "dunce", + "freedesktop-desktop-entry", + "freedesktop-icons", + "globset", + "interprocess", + "lazy_static", + "libc", + "naive-cityhash", + "objc", + "rolling-file", + "serde", + "serde_json", + "shell-words", + "single-instance", + "static_vcruntime", + "toml 0.8.19", + "tracing", + "tracing-appender", + "tracing-subscriber", + "url", + "winapi", + "winreg 0.52.0", + "winres", + "winsplit", + "xdg-mime", +] + +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cairo-rs" +version = "0.16.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "cc" +version = "1.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "clap" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "configparser" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b" + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", + "libc", +] + +[[package]] +name = "core-text" +version = "19.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" +dependencies = [ + "core-foundation 0.9.4", + "core-graphics", + "foreign-types", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "dark-light" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a76fa97167fa740dcdbfe18e8895601e1bc36525f09b044e00916e717c03a3c" +dependencies = [ + "dconf_rs", + "detect-desktop-environment", + "dirs 4.0.0", + "objc", + "rust-ini 0.18.0", + "web-sys", + "winreg 0.10.1", + "zbus", +] + +[[package]] +name = "dconf_rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7046468a81e6a002061c01e6a7c83139daf91b11c30e66795b13217c2d885c8b" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "detect-desktop-environment" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21d8ad60dd5b13a4ee6bd8fa2d5d88965c597c67bce32b5fc49c94f55cb50810" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "dlv-list" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] + +[[package]] +name = "doctest-file" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" + +[[package]] +name = "druid" +version = "0.8.3" +source = "git+https://github.com/browsers-software/druid.git?branch=browsers#d03ea912723e77394d30807983cdfb1d07cebd91" +dependencies = [ + "console_error_panic_hook", + "druid-derive", + "druid-shell", + "fluent-bundle", + "fluent-langneg", + "fluent-syntax", + "fnv", + "instant", + "tracing", + "tracing-subscriber", + "tracing-wasm", + "unic-langid", + "unicode-segmentation", + "xi-unicode", +] + +[[package]] +name = "druid-derive" +version = "0.5.1" +source = "git+https://github.com/browsers-software/druid.git?branch=browsers#d03ea912723e77394d30807983cdfb1d07cebd91" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "druid-shell" +version = "0.8.3" +source = "git+https://github.com/browsers-software/druid.git?branch=browsers#d03ea912723e77394d30807983cdfb1d07cebd91" +dependencies = [ + "anyhow", + "bitflags 1.3.2", + "block", + "cairo-rs", + "cfg-if", + "cocoa", + "core-graphics", + "foreign-types", + "gdk-sys", + "glib-sys", + "gtk", + "gtk-sys", + "instant", + "js-sys", + "keyboard-types", + "objc", + "once_cell", + "piet-common", + "scopeguard", + "time", + "tracing", + "wasm-bindgen", + "web-sys", + "winapi", + "wio", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "dwrote" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +dependencies = [ + "lazy_static", + "libc", + "winapi", + "wio", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[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 = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset 0.9.1", + "rustc_version", +] + +[[package]] +name = "flate2" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell 0.10.3", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" +dependencies = [ + "thiserror", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "freedesktop-desktop-entry" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "714dc75515835140c365a1f199143577afe4650ef1277f2fba50032c8c20bbc2" +dependencies = [ + "dirs 5.0.1", + "gettext-rs", + "log", + "memchr", + "strsim", + "textdistance", + "thiserror", + "xdg", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8ef34245e0540c9a3ce7a28340b98d2c12b75da0d446da4e8224923fcaa0c16" +dependencies = [ + "dirs 5.0.1", + "once_cell", + "rust-ini 0.20.0", + "thiserror", + "xdg", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdk" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9cb33da481c6c040404a11f8212d193889e9b435db2c14fd86987f630d3ce1" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.16.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" +dependencies = [ + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk-sys" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gettext-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gio" +version = "0.16.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glib" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16aa2475c9debed5a32832cb5ff2af5a3f9e1ab9e69df58eaadc1ab2004d6eba" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.16.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "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 = "gobject-sys" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gtk" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4d3507d43908c866c805f74c9dd593c0ce7ba5c38e576e41846639cdcd4bee6" +dependencies = [ + "atk", + "bitflags 1.3.2", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk3-macros" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "096eb63c6fedf03bafe65e5924595785eaf1bcb7200dac0f2cbe9c9738f05ad8" +dependencies = [ + "anyhow", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "jpeg-decoder", + "num-traits", + "png", +] + +[[package]] +name = "indexmap" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "interprocess" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f4e4a06d42fab3e85ab1b419ad32b09eab58b901d40c57935ff92db3287a13" +dependencies = [ + "doctest-file", + "libc", + "recvmsg", + "widestring 1.1.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "keyboard-types" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.156" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "naive-cityhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fce7b49e1e6d8aa67232ef1c4c936c0af58756eb2db6f65c40bacb39035e7f42" + +[[package]] +name = "nix" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset 0.9.1", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[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 = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list 0.3.0", + "hashbrown 0.12.3", +] + +[[package]] +name = "ordered-multimap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" +dependencies = [ + "dlv-list 0.5.2", + "hashbrown 0.14.5", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.16.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" +dependencies = [ + "bitflags 1.3.2", + "gio", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "pangocairo" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16ad2ec87789371b551fd2367c10aa37060412ffd3e60abd99491b21b93a3f9b" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "glib", + "libc", + "pango", + "pangocairo-sys", +] + +[[package]] +name = "pangocairo-sys" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "848d2df9b7f1a8c7a19d994de443bcbe5d4382610ccb8e64247f932be74fcf76" +dependencies = [ + "cairo-sys-rs", + "glib-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "piet" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e381186490a3e2017a506d62b759ea8eaf4be14666b13ed53973e8ae193451b1" +dependencies = [ + "image", + "kurbo", + "unic-bidi", +] + +[[package]] +name = "piet-cairo" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc0b38ac300c79deb9bfc8c7f91a08f2b080338648f7202981094b22321bb9" +dependencies = [ + "cairo-rs", + "pango", + "pangocairo", + "piet", + "unicode-segmentation", + "xi-unicode", +] + +[[package]] +name = "piet-common" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd8497cc0bcfecb1e14e027428c5e3eaf9af6e14761176e1212006d8bdba387" +dependencies = [ + "cairo-rs", + "cairo-sys-rs", + "cfg-if", + "core-graphics", + "piet", + "piet-cairo", + "piet-coregraphics", + "piet-direct2d", + "piet-web", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "piet-coregraphics" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a819b41d2ddb1d8abf3e45e49422f866cba281b4abb5e2fb948bba06e2c3d3f7" +dependencies = [ + "associative-cache", + "core-foundation 0.9.4", + "core-foundation-sys", + "core-graphics", + "core-text", + "foreign-types", + "piet", +] + +[[package]] +name = "piet-direct2d" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd00e91df4f987be40eb13042afe6ee9e54468466bdb7486390b40d4fef0993e" +dependencies = [ + "associative-cache", + "dwrote", + "piet", + "utf16_lit", + "winapi", + "wio", +] + +[[package]] +name = "piet-web" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a560232a94e535979923d49062d1c6d5407b3804bcd0d0b4cb9e25a9b41db1e" +dependencies = [ + "js-sys", + "piet", + "unicode-segmentation", + "wasm-bindgen", + "web-sys", + "xi-unicode", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "3.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +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 = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "recvmsg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "rolling-file" +version = "0.2.0" +source = "git+https://github.com/browsers-software/rolling-file-rs.git?branch=browsers#1e187f7aa3af6286ef1029bc1beed0c0993a6630" + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap 0.4.3", +] + +[[package]] +name = "rust-ini" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +dependencies = [ + "cfg-if", + "ordered-multimap 0.7.3", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "self_cell" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.0.4", +] + +[[package]] +name = "self_cell" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.208" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.208" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "serde_json" +version = "1.0.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "single-instance" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4637485391f8545c9d3dbf60f9d9aab27a90c789a700999677583bcb17c8795d" +dependencies = [ + "libc", + "nix 0.23.2", + "thiserror", + "widestring 0.4.3", + "winapi", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "static_vcruntime" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "954e3e877803def9dc46075bf4060147c55cd70db97873077232eae0269dc89b" + +[[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.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml 0.8.19", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "temp-dir" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "textdistance" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.20", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.18", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror", + "time", + "tracing-subscriber", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "time", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-wasm" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07" +dependencies = [ + "tracing", + "tracing-subscriber", + "wasm-bindgen", +] + +[[package]] +name = "type-map" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[package]] +name = "unic-bidi" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1356b759fb6a82050666f11dce4b6fe3571781f1449f3ef78074e408d468ec09" +dependencies = [ + "matches", + "unic-ucd-bidi", +] + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-langid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" +dependencies = [ + "tinystr", +] + +[[package]] +name = "unic-ucd-bidi" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1d568b51222484e1f8209ce48caa6b430bf352962b877d592c29ab31fb53d8c" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-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 = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf16_lit" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14706d2a800ee8ff38c1d3edb873cd616971ea59eb7c0d046bb44ef59b06a1ae" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.74", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "widestring" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winres" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "winsplit" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab703352da6a72f35c39a533526393725640575bb211f61987a2748323ad956" + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xdg-home" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "xdg-mime" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58d325d0ca93fb1984a56eb926f019acfc67bd2ec559b0dbf09cafcc92e81ec9" +dependencies = [ + "dirs-next", + "glob", + "mime", + "nom", + "unicase", +] + +[[package]] +name = "xi-unicode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + +[[package]] +name = "zbus" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.29.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.74", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "zvariant" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.74", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix new file mode 100644 index 0000000000000..f09aa4b56082a --- /dev/null +++ b/pkgs/by-name/br/browsers/package.nix @@ -0,0 +1,73 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + wrapGAppsHook3, + atk, + cairo, + gdk-pixbuf, + glib, + gtk3, + pango, +}: + +rustPlatform.buildRustPackage rec { + pname = "browsers"; + version = "0.5.8"; + + src = fetchFromGitHub { + owner = "Browsers-software"; + repo = "browsers"; + rev = "refs/tags/${version}"; + hash = "sha256-o9vyrHQsZQ3qywA4bviM+W4xx64IZL24VHErMFAEMFE="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "druid-0.8.3" = "sha256-s9csjZ0ZimOrPnjJpPjrrMdNKAXFfroWHBPeR369Phk="; + "rolling-file-0.2.0" = "sha256-3xeOSXFVVgeKRE39gtzTURt0OkKScQ4uwtvLl4CE3R4="; + }; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk3 + pango + ]; + + postInstall = '' + install -m 444 \ + -D extra/linux/dist/software.Browsers.template.desktop \ + -t $out/share/applications + mv $out/share/applications/software.Browsers.template.desktop $out/share/applications/software.Browsers.desktop + substituteInPlace \ + $out/share/applications/software.Browsers.desktop \ + --replace-fail 'Exec=€ExecCommand€' 'Exec=${pname} %u' + cp -r resources $out + for size in 16 32 128 256 512; do + install -m 444 \ + -D resources/icons/"$size"x"$size"/software.Browsers.png \ + -t $out/share/icons/hicolor/"$size"x"$size"/apps + done + ''; + + meta = { + description = "Open the right browser at the right time"; + homepage = "https://browsers.software"; + changelog = "https://github.com/Browsers-software/browsers/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ravenz46 ]; + platforms = lib.platforms.linux; + mainProgram = "browsers"; + }; +} diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index e49ed0b4d2c72..f845487609797 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -21,25 +21,25 @@ let # fix for: https://github.com/NixOS/nixpkgs/issues/272156 buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; in buildNpmPackage' rec { pname = "bruno"; - version = "1.25.0"; + version = "1.30.1"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-TXEe0ICrkljxfnvW1wv/e1BB7J6p/KW3JklCvYyjqSs="; + hash = "sha256-9dH79ytqkZcdgUMbTa32VHKr2dHiNsJu6GawDtRsJx0="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-/1/QPKjSgJJDtmUipgbiVR+Buea9cXO+HvICfKVX/2g="; + npmDepsHash = "sha256-p3kdYuDiPZ9SmtrFajXd76Ohd+VUqn/Y8SpAPFrTBZA="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = @@ -47,7 +47,7 @@ buildNpmPackage' rec { (writeShellScriptBin "phantomjs" "echo 2.1.1") pkg-config ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ makeWrapper copyDesktopItems ]; @@ -58,7 +58,7 @@ buildNpmPackage' rec { cairo pango ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreText ]; @@ -79,16 +79,13 @@ buildNpmPackage' rec { --replace-fail 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then' ''; - ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - - # remove giflib dependency - npmRebuildFlags = [ "--ignore-scripts" ]; - preBuild = '' - substituteInPlace node_modules/canvas/binding.gyp \ - --replace-fail "'with_gif%': '<!(node ./util/has_lib.js gif)'" "'with_gif%': 'false'" - npm rebuild + postConfigure = '' + # sh: line 1: /build/source/packages/bruno-common/node_modules/.bin/rollup: cannot execute: required file not found + patchShebangs packages/*/node_modules ''; + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + dontNpmBuild = true; postBuild = '' npm run build --workspace=packages/bruno-common @@ -96,12 +93,14 @@ buildNpmPackage' rec { npm run build --workspace=packages/bruno-app npm run build --workspace=packages/bruno-query + npm run sandbox:bundle-libraries --workspace=packages/bruno-js + bash scripts/build-electron.sh pushd packages/bruno-electron ${ - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then '' cp -r ${electron.dist}/Electron.app ./ find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw @@ -137,7 +136,7 @@ buildNpmPackage' rec { ${ - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications diff --git a/pkgs/by-name/bs/bs2b-lv2/package.nix b/pkgs/by-name/bs/bs2b-lv2/package.nix new file mode 100644 index 0000000000000..161522ef32f11 --- /dev/null +++ b/pkgs/by-name/bs/bs2b-lv2/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + python3, + wafHook, + libbs2b, + lv2, +}: + +stdenv.mkDerivation rec { + pname = "bs2b-lv2"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "nilninull"; + repo = "bs2b-lv2"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-dOcDPtiKN9Kfs2cdaeDO/GkWrh5tfJSHfiHPBtxJXvc="; + }; + + nativeBuildInputs = [ + pkg-config + python3 + wafHook + ]; + + buildInputs = [ + libbs2b + lv2 + ]; + + meta = with lib; { + description = "LV2 plugin for using Bauer stereophonic-to-binaural DSP library"; + homepage = "https://github.com/nilninull/bs2b-lv2"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/bs/bsc/package.nix b/pkgs/by-name/bs/bsc/package.nix index 48a1c8f994dea..03bbb66e5550d 100644 --- a/pkgs/by-name/bs/bsc/package.nix +++ b/pkgs/by-name/bs/bsc/package.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "IlyaGrebnov"; repo = "libbsc"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-reGg5xvoZBbNFFYPPyT2P1LA7oSCUIm9NIDjXyvkP9Q="; + hash = "sha256-reGg5xvoZBbNFFYPPyT2P1LA7oSCUIm9NIDjXyvkP9Q="; }; enableParallelBuilding = true; - buildInputs = lib.optional stdenv.isDarwin llvmPackages.openmp; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; makeFlags = [ "CC=$(CXX)" diff --git a/pkgs/by-name/bu/buckle/package.nix b/pkgs/by-name/bu/buckle/package.nix index 390c78534b115..51c5e1486d544 100644 --- a/pkgs/by-name/bu/buckle/package.nix +++ b/pkgs/by-name/bu/buckle/package.nix @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec { owner = "benbrittain"; repo = "buckle"; rev = "v${version}"; - sha256 = "sha256-eWhcDzw+6I5N0dse5avwhcQ/y6YZ6b3QKyBwWBrA/xo="; + hash = "sha256-eWhcDzw+6I5N0dse5avwhcQ/y6YZ6b3QKyBwWBrA/xo="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 3efe7787db6f5..ca114fb1f6ff6 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -21,9 +21,11 @@ glib-networking, glibc, gnome, + gnome-bluetooth_1_0, gnome-color-manager, gnome-desktop, gnome-remote-desktop, + gnome-settings-daemon, gnome-user-share, gsettings-desktop-schemas, gsound, @@ -46,6 +48,7 @@ libxslt, meson, modemmanager, + mutter, networkmanager, networkmanagerapplet, ninja, @@ -116,11 +119,11 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop adwaita-icon-theme cheese - gnome.gnome-bluetooth_1_0 + gnome-bluetooth_1_0 gnome-remote-desktop - gnome.gnome-settings-daemon + gnome-settings-daemon gnome-user-share - gnome.mutter + mutter gsettings-desktop-schemas gsound gtk3 @@ -174,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" # WM keyboard shortcuts - --prefix XDG_DATA_DIRS : "${gnome.mutter}/share" + --prefix XDG_DATA_DIRS : "${mutter}/share" ) ''; diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index e75704944f7ab..74d9d2c35a94f 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -7,8 +7,8 @@ budgie-screensaver, docbook-xsl-nons, glib, - gnome, gnome-desktop, + gnome-settings-daemon, graphene, gst_all_1, gtk-doc, @@ -26,6 +26,7 @@ magpie, mesa, meson, + mutter, ninja, nix-update-script, nixosTests, @@ -79,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: { budgie-screensaver glib gnome-desktop - gnome.gnome-settings-daemon - gnome.mutter + gnome-settings-daemon + mutter zenity graphene gst_all_1.gstreamer diff --git a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix index f45a033a87323..02bd605ee3cfb 100644 --- a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix +++ b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix @@ -5,7 +5,7 @@ budgie-desktop-view, glib, gsettings-desktop-schemas, - gnome, + mutter, nixos-artwork, nixos-background-light ? nixos-artwork.wallpapers.nineish, nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray, @@ -59,7 +59,7 @@ let budgie-desktop budgie-desktop-view gsettings-desktop-schemas - gnome.mutter + mutter ] ++ extraGSettingsOverridePackages; in diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix index 0dfd4dc608245..407902d824e70 100644 --- a/pkgs/by-name/bu/budgie-session/package.nix +++ b/pkgs/by-name/bu/budgie-session/package.nix @@ -6,12 +6,12 @@ meson, ninja, pkg-config, - gnome, adwaita-icon-theme, glib, gtk3, gsettings-desktop-schemas, gnome-desktop, + gnome-settings-daemon, dbus, json-glib, libICE, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { json-glib xorg.xtrans adwaita-icon-theme - gnome.gnome-settings-daemon + gnome-settings-daemon gsettings-desktop-schemas systemd libepoxy @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram "$out/libexec/budgie-session-binary" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" + --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg" ''; separateDebugInfo = true; diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix index 54b017d1baad0..51d3f63e14be5 100644 --- a/pkgs/by-name/bu/buffer/package.nix +++ b/pkgs/by-name/bu/buffer/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "buffer"; - version = "0.9.2"; + version = "0.9.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "cheywood"; repo = "buffer"; rev = finalAttrs.version; - hash = "sha256-EIyaFL2AEez8FIErL8+x7QNHnCYxj4mOuz7E+Svvh5I="; + hash = "sha256-WhUSiZ2Nty5CdaJC8zZVkUptP5cRnMByZKy3e9TAyjs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix index 8da59b372413c..ccbfc90a3a20b 100644 --- a/pkgs/by-name/bu/buildkite-agent/package.nix +++ b/pkgs/by-name/bu/buildkite-agent/package.nix @@ -13,16 +13,16 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.77.0"; + version = "3.82.1"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-QsSCIAy0ekkZiqO/cFcPNNkXa3FLL3Z1LJoKsjzB6jw="; + hash = "sha256-xTF8zmpwEFHkLwDYBICXJZ4gjJYpcH5i76kPQM6qt5o="; }; - vendorHash = "sha256-xp836ZT2x20ZbkTEubhiZlLmK9n2F8mCSWZTHmAuu6A="; + vendorHash = "sha256-xKAQ2yvFYl9ld3H6IGafYgCdA8jn9xig/AAej56ACns="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/by-name/bu/bulk_extractor/package.nix b/pkgs/by-name/bu/bulk_extractor/package.nix index 58bbb1edd6d17..25d38c6c35cae 100644 --- a/pkgs/by-name/bu/bulk_extractor/package.nix +++ b/pkgs/by-name/bu/bulk_extractor/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { aclocal -I m4 ''; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/be20_api/feature_recorder_set.cpp --replace-fail '#warn ' '#warning ' ''; diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix index dc8584fb67076..6b395068e9148 100644 --- a/pkgs/by-name/bu/bulloak/package.nix +++ b/pkgs/by-name/bu/bulloak/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-lj/wmLu4cBjDjzMD8DlIz+6Rnag0h+zWiE7lfcTC7lY="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; # tests run in CI on the source repo doCheck = false; diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix index ab90682778711..2d042f08d8f96 100644 --- a/pkgs/by-name/bu/bunbun/package.nix +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-CcGfaSyCMv0Wm4QsYASBwEnpX8fKbLHRqyEcUmj2w2o="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ CoreFoundation diff --git a/pkgs/by-name/bu/bundix/package.nix b/pkgs/by-name/bu/bundix/package.nix index f324ebecda615..a595649cac9be 100644 --- a/pkgs/by-name/bu/bundix/package.nix +++ b/pkgs/by-name/bu/bundix/package.nix @@ -18,7 +18,7 @@ buildRubyGem rec { owner = "nix-community"; repo = "bundix"; rev = version; - sha256 = "sha256-QnNdseCSwQYhO/ybzWsflMEk68TMgPU3HqXJ7av3SHE="; + hash = "sha256-QnNdseCSwQYhO/ybzWsflMEk68TMgPU3HqXJ7av3SHE="; }; buildInputs = [ ruby bundler ]; diff --git a/pkgs/by-name/bu/bundletool/package.nix b/pkgs/by-name/bu/bundletool/package.nix new file mode 100644 index 0000000000000..da40101e55230 --- /dev/null +++ b/pkgs/by-name/bu/bundletool/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenvNoCC, + fetchurl, + makeBinaryWrapper, + jre_headless, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "bundletool"; + version = "1.17.1"; + + src = fetchurl { + url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar"; + sha256 = "sha256-RYgerRM4iHLYLEJVsZVIi3/DPyysWpqXewr8XpI2dZI="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + installPhase = '' + runHook preInstall + makeWrapper ${jre_headless}/bin/java $out/bin/bundletool --add-flags "-jar $src" + runHook postInstall + ''; + + meta = { + description = "Command-line tool to manipulate Android App Bundles"; + mainProgram = "bundletool"; + 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 ]; + platforms = jre_headless.meta.platforms; + license = lib.licenses.asl20; + }; +}) diff --git a/pkgs/by-name/bu/bup/package.nix b/pkgs/by-name/bu/bup/package.nix index 91fb2b3c3f710..c9fe3986611c7 100644 --- a/pkgs/by-name/bu/bup/package.nix +++ b/pkgs/by-name/bu/bup/package.nix @@ -23,7 +23,7 @@ let setuptools tornado ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pyxattr pylibacl fuse diff --git a/pkgs/by-name/bu/bupc/package.nix b/pkgs/by-name/bu/bupc/package.nix index ddec40e49cb9c..228de48e603ad 100644 --- a/pkgs/by-name/bu/bupc/package.nix +++ b/pkgs/by-name/bu/bupc/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://upc.lbl.gov/download/release/berkeley_upc-${version}.tar.gz"; - sha256 = "sha256-JdpFORlXHpCQE+TivoQQnjQlxQN7C8BNfHvTOSwXbYQ="; + hash = "sha256-JdpFORlXHpCQE+TivoQQnjQlxQN7C8BNfHvTOSwXbYQ="; }; postPatch = '' diff --git a/pkgs/by-name/bu/bustle/package.nix b/pkgs/by-name/bu/bustle/package.nix index a6e3e6474729c..876d63ff014fb 100644 --- a/pkgs/by-name/bu/bustle/package.nix +++ b/pkgs/by-name/bu/bustle/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-r29Z+6P+yuCpOBUE3vkESd15lcGXs5+ZTBiQ9nW6DJ4="; }; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one. # The vendored gettext does not build with clang 16. GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin"; @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { glib gtk4 libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation libiconv ]; diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/by-name/by/byacc/package.nix similarity index 100% rename from pkgs/development/tools/parsing/byacc/default.nix rename to pkgs/by-name/by/byacc/package.nix diff --git a/pkgs/by-name/by/byedpi/package.nix b/pkgs/by-name/by/byedpi/package.nix new file mode 100644 index 0000000000000..bf8a27e8e2d37 --- /dev/null +++ b/pkgs/by-name/by/byedpi/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "byedpi"; + version = "0.14.1"; + + src = fetchFromGitHub { + owner = "hufrea"; + repo = "byedpi"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-JdL+3ETNxaEtOLUhgLSABL9C8w/EM4Ay37OXU5jLCFA="; + }; + + installPhase = '' + runHook preInstall + install -Dm755 ciadpi $out/bin/ciadpi + runHook postInstall + ''; + + strictDeps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "SOCKS proxy server implementing some DPI bypass methods"; + 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; + mainProgram = "ciadpi"; + }; +}) diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 43f120fd09a80..29cb68b1f4e03 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "c2patool"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "contentauth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f1Ec2dJGVjk9Jp5nmcVYwTyIlmnZmERj1pV9weVO3lI="; + hash = "sha256-OU1X8EB0IBABlXJklUUCOBhwbcnJNczzjnTl4e8/BYY="; }; - cargoHash = "sha256-wUGOabFTKLCEmg4zNPUklK3YddIIM4N3pev2TtlVthM="; + cargoHash = "sha256-0/fdQ9l4vm5Zy8QEvftKqt5GqPn+BkntyJoRiSaSbmU="; # use the non-vendored openssl OPENSSL_NO_VENDOR = 1; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Carbon diff --git a/pkgs/by-name/c3/c3-lsp/package.nix b/pkgs/by-name/c3/c3-lsp/package.nix new file mode 100644 index 0000000000000..6f2e0b361c58e --- /dev/null +++ b/pkgs/by-name/c3/c3-lsp/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "c3-lsp"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "pherrymason"; + repo = "c3-lsp"; + rev = "v${version}"; + hash = "sha256-HD3NE2L1ge0pf8vtrKkYh4GIZg6lSPTZGFQ+LPbDup4="; + }; + + sourceRoot = "${src.name}/server"; + + vendorHash = "sha256-y+Qs3zuvTq/KRc1ziH0R7E10et+MaQW9xOsFmSdI7PM="; + + postInstall = '' + mv $out/bin/lsp $out/bin/c3-lsp + ''; + + meta = { + description = "Language Server for C3 Language"; + homepage = "https://github.com/pherrymason/c3-lsp"; + changelog = "https://github.com/pherrymason/c3-lsp/blob/${src.rev}/changelog.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ arthsmn ]; + mainProgram = "c3-lsp"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ca/cables/package.nix b/pkgs/by-name/ca/cables/package.nix new file mode 100644 index 0000000000000..4ce71233cb19d --- /dev/null +++ b/pkgs/by-name/ca/cables/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchurl, + appimageTools, + stdenv, +}: + +let + pname = "cables"; + version = "0.3.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage"; + sha256 = "sha256-D5Bgg5D03FPQF2HKow4yehcqToo4dpPudBg0W4UnqFs="; + }; + + appimageContents = appimageTools.extract { + inherit pname version src; + postExtract = '' + substituteInPlace $out/${name}.desktop --replace 'Exec=AppRun' 'Exec=cables' + ''; + }; + +in +appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/cables + + install -m 444 -D ${appimageContents}/${name}.desktop $out/share/applications/cables.desktop + install -m 444 -D ${appimageContents}/${name}.png $out/share/icons/hicolor/512x512/apps/cables.png + ''; + + meta = with lib; { + description = "Standalone version of cables, a tool for creating beautiful interactive content."; + homepage = "https://cables.gl"; + changelog = "https://cables.gl/changelog"; + license = licenses.mit; + maintainers = with maintainers; [ rubikcubed ]; + platforms = with platforms; linux ++ darwin ++ windows; + broken = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64); + mainProgram = "cables"; + }; +} diff --git a/pkgs/by-name/ca/cadzinho/package.nix b/pkgs/by-name/ca/cadzinho/package.nix index 6b24ef5a18f75..5a12cd1e54bc5 100644 --- a/pkgs/by-name/ca/cadzinho/package.nix +++ b/pkgs/by-name/ca/cadzinho/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace-fail "-lGLEW" "-lGLEW -lSDL2_net" ''; - nativeBuildInputs = lib.optional stdenv.isDarwin desktopToDarwinBundle; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ SDL2 SDL2_net glew lua5_4 ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString ([ "-I${SDL2.dev}/include/SDL2" "-I${SDL2_net.dev}/include/SDL2" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/llvm/llvm-project/issues/62254 "-fno-builtin-strrchr" ]); diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index 59cffb1328f37..35061f3f7ff03 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -15,14 +15,14 @@ let "cli" "desktop" ]; - version = "0.40.0"; + version = "0.41.0"; cli = fetchurl { - url = "https://storage.googleapis.com/caido-releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; - hash = "sha256-G8sg+3Cp9QkSiiZ810z4jCfGvEJUFLorKT0JmHrO6Ao="; + url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; + hash = "sha256-aQhax0efp5L3JNqGsOWsoO6z5pVVc/rxlz+5mvZoPNU="; }; desktop = fetchurl { - url = "https://storage.googleapis.com/caido-releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-iNhitCNc221pYwcG+07GvP+bnTdtQGFjsloQ5Pth2l0="; + url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; + hash = "sha256-DgXxOOWaLJG1h1nB+mkw77APh06WiJo9V9ZFCiWeha8="; }; appimageContents = appimageTools.extractType2 { inherit pname version; @@ -33,13 +33,14 @@ let src = desktop; inherit pname version; + nativeBuildInputs = [ makeWrapper ]; + extraPkgs = pkgs: [ pkgs.libthai ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications install -m 444 -D ${appimageContents}/caido.png \ $out/share/icons/hicolor/512x512/apps/caido.png - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/caido \ --set WEBKIT_DISABLE_COMPOSITING_MODE 1 ''; diff --git a/pkgs/by-name/ca/cairosvg/package.nix b/pkgs/by-name/ca/cairosvg/package.nix new file mode 100644 index 0000000000000..c000927312c49 --- /dev/null +++ b/pkgs/by-name/ca/cairosvg/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.cairosvg diff --git a/pkgs/applications/misc/calcoo/default.nix b/pkgs/by-name/ca/calcoo/package.nix similarity index 100% rename from pkgs/applications/misc/calcoo/default.nix rename to pkgs/by-name/ca/calcoo/package.nix diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index 6cb36421eaae5..d957b2c79a92d 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { }; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Cocoa IOKit diff --git a/pkgs/by-name/ca/calligraphy/package.nix b/pkgs/by-name/ca/calligraphy/package.nix new file mode 100644 index 0000000000000..88856bd21adc8 --- /dev/null +++ b/pkgs/by-name/ca/calligraphy/package.nix @@ -0,0 +1,61 @@ +{ + lib, + python3Packages, + fetchFromGitLab, + meson, + ninja, + pkg-config, + gobject-introspection, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, +}: + +python3Packages.buildPythonApplication rec { + pname = "calligraphy"; + version = "1.0.1"; + pyproject = false; # Built with meson + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GeopJr"; + repo = "Calligraphy"; + rev = "refs/tags/v${version}"; + hash = "sha256-Vqbrt8zS2PL4Fhc421DY+IkjD4nuGqSNTLlE8IYSmcI="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + ]; + + dependencies = with python3Packages; [ + pygobject3 + pyfiglet + ]; + + dontWrapGApps = true; + + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + + meta = { + description = "GTK tool turning text into ASCII banners"; + homepage = "https://calligraphy.geopjr.dev"; + license = with lib.licenses; [ + gpl3Plus + # and + cc0 + ]; + mainProgram = "calligraphy"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ca/cameractrls/package.nix b/pkgs/by-name/ca/cameractrls/package.nix index 2b715397150c5..d56b75124ddc7 100644 --- a/pkgs/by-name/ca/cameractrls/package.nix +++ b/pkgs/by-name/ca/cameractrls/package.nix @@ -39,14 +39,14 @@ let in python3Packages.buildPythonApplication rec { pname = "cameractrls"; - version = "0.6.6"; + version = "0.6.7"; pyproject = false; src = fetchFromGitHub { owner = "soyersoyer"; repo = "cameractrls"; rev = "v${version}"; - hash = "sha256-QjjLd5L+8Slxc3ywurhsWp1pZ2E1Y7NOdnCV2ZYBlqU="; + hash = "sha256-MM+Py8tHtqJWIGmGg3RaIhJa0E1zM3hXOnTOqXPuejw="; }; postPatch = '' @@ -125,7 +125,7 @@ python3Packages.buildPythonApplication rec { presets at device connection). ''; homepage = "https://github.com/soyersoyer/cameractrls"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.lgpl3Plus; mainProgram = mainExecutable; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ca/canokey-usbip/package.nix b/pkgs/by-name/ca/canokey-usbip/package.nix new file mode 100644 index 0000000000000..99e7b0bd40970 --- /dev/null +++ b/pkgs/by-name/ca/canokey-usbip/package.nix @@ -0,0 +1,47 @@ +{ + cmake, + fetchFromGitHub, + lib, + python3, + stdenv, + unstableGitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "canokey-usbip"; + version = "0-unstable-2024-03-11"; + + src = fetchFromGitHub { + owner = "canokeys"; + repo = "canokey-usbip"; + rev = "cc7087277096f185401b05143f9a028711d43557"; + hash = "sha256-+7sGW2eGelRQ2TDvgUITbPdcsXo7Pp6Pp+r3RmyQAZM="; + fetchSubmodules = true; + }; + + postPatch = '' + sed -i 's/COMMAND git describe.*\(>>.*\)/COMMAND echo ${finalAttrs.src.rev} \1/' canokey-core/CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + python3 + ]; + + postInstall = '' + install -D --target-directory=$out/bin canokey-usbip + ''; + + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; + }; + + meta = { + description = "CanoKey USB/IP Virt Card"; + homepage = "https://github.com/canokeys/canokey-usbip"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.jmbaur ]; + mainProgram = "canokey-usbip"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix index e6e2106b38096..f164af42b5a80 100644 --- a/pkgs/by-name/ca/caprine/package.nix +++ b/pkgs/by-name/ca/caprine/package.nix @@ -40,7 +40,7 @@ buildNpmPackage rec { installPhase = '' runHook preInstall - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/caprine cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/caprine @@ -53,7 +53,7 @@ buildNpmPackage rec { install -Dm644 build/icon.png $out/share/icons/hicolor/512x512/apps/caprine.png ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r dist/mac*/"Caprine.app" $out/Applications makeWrapper "$out/Applications/Caprine.app/Contents/MacOS/Caprine" $out/bin/caprine diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix index 87da681fe9582..06746e1b654e1 100644 --- a/pkgs/by-name/ca/capslock/package.nix +++ b/pkgs/by-name/ca/capslock/package.nix @@ -1,37 +1,36 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, }: buildGoModule rec { pname = "capslock"; - version = "0.1.1"; + version = "0.2.5"; src = fetchFromGitHub { owner = "google"; repo = "capslock"; rev = "v${version}"; - hash = "sha256-mGrq43YCjF137c5ynQxL7IXDCUbnbBLv5E0tw/boObE="; + hash = "sha256-w2dB8DUCjbuzdEfX4nmaGbf9TZH58t+NZtyMoBHVG8I="; }; - vendorHash = "sha256-WTbHcVARbz7cvAY7IZnACTrN5h9NXWXfxxEWq4hssOM="; + vendorHash = "sha256-ZRDoKB3/oxJhVFNWT71sKu8WbvIUyvXNKY1hD8ljo5U="; - subPackages = [ - "cmd/capslock" - ]; + subPackages = [ "cmd/capslock" ]; CGO_ENABLED = "0"; - ldflags = [ - "-s" - "-w" - ]; + ldflags = [ "-s" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Capability analysis CLI for Go packages that informs users of which privileged operations a given package can access"; homepage = "https://github.com/google/capslock"; - license = licenses.bsd3; + license = lib.licenses.bsd3; mainProgram = "capslock"; - maintainers = with maintainers; [ katexochen ]; + maintainers = with lib.maintainers; [ katexochen ]; }; } diff --git a/pkgs/by-name/ca/cardboard/package.nix b/pkgs/by-name/ca/cardboard/package.nix index 6c859002114a2..e8bc82fd1cf01 100644 --- a/pkgs/by-name/ca/cardboard/package.nix +++ b/pkgs/by-name/ca/cardboard/package.nix @@ -46,7 +46,7 @@ let name = "expected"; url = "https://gitlab.com/cardboardwm/expected"; rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e"; - sha256 = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo="; + hash = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo="; }; # wlroots.wrap @@ -54,7 +54,7 @@ let name = "wlroots"; url = "https://github.com/swaywm/wlroots"; rev = "0.12.0"; - sha256 = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY="; + hash = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY="; }; # the source itself diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix index 0de63ed2036b8..e40d79a14089f 100644 --- a/pkgs/by-name/ca/cargo-bump/package.nix +++ b/pkgs/by-name/ca/cargo-bump/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index acfc59829eead..c29825cb86b5d 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security libiconv curl ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security libiconv curl ]); nativeBuildInputs = [ pkg-config ] # curl-sys wants to run curl-config on darwin - ++ lib.optionals stdenv.isDarwin [ curl.dev ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl.dev ]; # skip tests with networking or other failures checkFlags = [ diff --git a/pkgs/by-name/ca/cargo-i18n/package.nix b/pkgs/by-name/ca/cargo-i18n/package.nix index 43b353ed4d495..0665e8860b84e 100644 --- a/pkgs/by-name/ca/cargo-i18n/package.nix +++ b/pkgs/by-name/ca/cargo-i18n/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-vN62QmCuhu7AjL6xSpBU6/ul4WgNLZbjWDCFyHj6rIM="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/ca/cargo-information/package.nix b/pkgs/by-name/ca/cargo-information/package.nix index dcb87ba967484..fe7f950fce852 100644 --- a/pkgs/by-name/ca/cargo-information/package.nix +++ b/pkgs/by-name/ca/cargo-information/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl curl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix index 4a90d4af78b53..0bd36afc166b4 100644 --- a/pkgs/by-name/ca/cargo-make/package.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -10,23 +10,23 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.16"; + version = "0.37.20"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-OC1HzoEb9OyusYGC5jmEC4qW4U3oGApYvpy5XkZttSg="; + hash = "sha256-PmCpm+ZOqnJdGrQtOciU6hEKV2lfoUT8bGtWzRpBXxQ="; }; - cargoHash = "sha256-voa456NCuOVEcLlJeUD1G3phzLufqfE0R88aYxcd3ew="; + cargoHash = "sha256-RjsYrFbS/OiMQKTiPshGcBI9KF75Z5stn2HaB6mniZE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/ca/cargo-profiler/package.nix b/pkgs/by-name/ca/cargo-profiler/package.nix index 63b6aa567d89c..d8e4def6b7566 100644 --- a/pkgs/by-name/ca/cargo-profiler/package.nix +++ b/pkgs/by-name/ca/cargo-profiler/package.nix @@ -10,7 +10,7 @@ let # Version-specific variables version = "0.2.0"; rev = "0a8ab772fd5c0f1579e4847c5d05aa443ffa2bc8"; - sha256 = "sha256-ZRAbvSMrPtgaWy9RwlykQ3iiPxHCMh/tS5p67/4XqqA="; + hash = "sha256-ZRAbvSMrPtgaWy9RwlykQ3iiPxHCMh/tS5p67/4XqqA="; cargoHash = "sha256-qt3S6ZcLEP9ZQoP5+kSQdmBlxdMgGUqLszdU7JkFNVI="; inherit (rustPlatform) buildRustPackage; @@ -18,7 +18,7 @@ in buildRustPackage rec { inherit pname version; src = fetchFromGitHub { - inherit owner rev sha256; + inherit owner rev hash; repo = pname; }; diff --git a/pkgs/by-name/ca/cargo-raze/package.nix b/pkgs/by-name/ca/cargo-raze/package.nix index a0b4fd0ace7b0..ca381ef562ddf 100644 --- a/pkgs/by-name/ca/cargo-raze/package.nix +++ b/pkgs/by-name/ca/cargo-raze/package.nix @@ -36,9 +36,9 @@ rustPlatform.buildRustPackage { libgit2 openssl curl - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin issue: Os { code: 24, kind: Uncategorized, message: "Too many open files" } # https://github.com/google/cargo-raze/issues/544 ulimit -n 1024 diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix index 131a6eb70f45f..105104e9b46d1 100644 --- a/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/pkgs/by-name/ca/cargo-rdme/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AARkXr6qOq9u/nmcmCnA4P+Q+MPPChCXoRaYiLwCNPs="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 9ff861190d04e..8eaa8247089e0 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.1.2"; + version = "1.1.3"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-JnQrQBx9VuXI0wj1mMLfl15lxC85f1kUBucgC3Q8F0c="; + hash = "sha256-xKO/57yvHSGzjWyDPu1DmI9eeDESyFgMschqK+OLUMs="; }; - cargoHash = "sha256-iFcW9REkEolrDDbEwoepUSO79OgUdsLUhSkk12y4yxk="; + cargoHash = "sha256-lwPD46irkBg+Xg9/d07Q6BPk2rzKYkj3114EiMbbd+U="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/by-name/ca/cargo-tauri/hook.nix b/pkgs/by-name/ca/cargo-tauri/hook.nix new file mode 100644 index 0000000000000..a1fbdd3024f70 --- /dev/null +++ b/pkgs/by-name/ca/cargo-tauri/hook.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + makeSetupHook, + cargo, + cargo-tauri, + rust, + # The subdirectory of `target/` from which to copy the build artifacts + targetSubdirectory ? stdenv.hostPlatform.rust.cargoShortTarget, +}: + +let + kernelName = stdenv.hostPlatform.parsed.kernel.name; +in +makeSetupHook { + name = "tauri-hook"; + + propagatedBuildInputs = [ + cargo + cargo-tauri + ]; + + substitutions = { + inherit targetSubdirectory; + inherit (rust.envVars) rustHostPlatformSpec setEnv; + + # A map of the bundles used for Tauri's different supported platforms + # https://github.com/tauri-apps/tauri/blob/23a912bb84d7c6088301e1ffc59adfa8a799beab/README.md#platforms + defaultTauriBundleType = + { + darwin = "app"; + linux = "deb"; + } + .${kernelName} or (throw "${kernelName} is not supported by cargo-tauri.hook"); + + # $targetDir is the path to the build artifacts (i.e., `./target/release`) + installScript = + { + darwin = '' + mkdir $out + mv "$targetDir"/bundle/macos $out/Applications + ''; + + linux = '' + mv "$targetDir"/bundle/deb/*/data/usr $out + ''; + } + .${kernelName} or (throw "${kernelName} is not supported by cargo-tauri.hook"); + }; + + meta = { + inherit (cargo-tauri.meta) maintainers broken; + # Platforms that Tauri supports bundles for + platforms = lib.platforms.darwin ++ lib.platforms.linux; + }; +} ./hook.sh diff --git a/pkgs/by-name/ca/cargo-tauri/hook.sh b/pkgs/by-name/ca/cargo-tauri/hook.sh new file mode 100644 index 0000000000000..adfa24b515b85 --- /dev/null +++ b/pkgs/by-name/ca/cargo-tauri/hook.sh @@ -0,0 +1,101 @@ +# shellcheck shell=bash disable=SC2034,SC2154,SC2164 + +# We replace these +export dontCargoBuild=true +export dontCargoInstall=true + +tauriBuildHook() { + echo "Executing tauriBuildHook" + + runHook preBuild + + ## The following is lifted from rustPlatform.cargoBuildHook + ## As we're replacing it, we should also be respecting its options. + + # Account for running outside of mkRustPackage where this may not be set + cargoBuildType="${cargoBuildType:-release}" + + # Let stdenv handle stripping, for consistency and to not break + # separateDebugInfo. + export "CARGO_PROFILE_${cargoBuildType@U}_STRIP"=false + + if [ -n "${buildAndTestSubdir-}" ]; then + # ensure the output doesn't end up in the subdirectory + CARGO_TARGET_DIR="$(pwd)/target" + export CARGO_TARGET_DIR + + # Tauri doesn't respect $CARGO_TARGET_DIR, but does respect the cargo + # argument...but that doesn't respect `--target`, so we have to use the + # config file + # https://github.com/tauri-apps/tauri/issues/10190 + printf '\nbuild.target-dir = "%s"' "$CARGO_TARGET_DIR" >>config.toml + + pushd "${buildAndTestSubdir}" + fi + + local cargoFlagsArray=( + "-j" "$NIX_BUILD_CORES" + "--target" "@rustHostPlatformSpec@" + "--offline" + ) + local tauriFlagsArray=( + "--bundles" "${tauriBundleType:-@defaultTauriBundleType@}" + "--target" "@rustHostPlatformSpec@" + ) + + if [ "${cargoBuildType}" != "debug" ]; then + cargoFlagsArray+=("--profile" "${cargoBuildType}") + fi + + if [ -n "${cargoBuildNoDefaultFeatures-}" ]; then + cargoFlagsArray+=("--no-default-features") + fi + + if [ -n "${cargoBuildFeatures-}" ]; then + cargoFlagsArray+=("--features=$(concatStringsSep "," cargoBuildFeatures)") + fi + + concatTo cargoFlagsArray cargoBuildFlags + + if [ "${cargoBuildType:-}" == "debug" ]; then + tauriFlagsArray+=("--debug") + fi + + concatTo tauriFlagsArray tauriBuildFlags + + echoCmd 'cargo-tauri.hook cargoFlags' "${cargoFlagsArray[@]}" + echoCmd 'cargo-tauri.hook tauriFlags' "${tauriFlagsArray[@]}" + + @setEnv@ cargo tauri build "${tauriFlagsArray[@]}" -- "${cargoFlagsArray[@]}" + + if [ -n "${buildAndTestSubdir-}" ]; then + popd + fi + + runHook postBuild + + echo "Finished tauriBuildHook" +} + +tauriInstallHook() { + echo "Executing tauriInstallHook" + + runHook preInstall + + # Use a nice variable for our target directory in the following script + targetDir=target/@targetSubdirectory@/$cargoBuildType + + @installScript@ + + runHook postInstall + + echo "Finished tauriInstallHook" +} + +if [ -z "${dontTauriBuild:-}" ] && [ -z "${buildPhase:-}" ]; then + buildPhase=tauriBuildHook +fi + +if [ -z "${dontTauriInstall:-}" ] && [ -z "${installPhase:-}" ]; then + installPhase=tauriInstallHook +fi diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix new file mode 100644 index 0000000000000..867dff3b7c4f4 --- /dev/null +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + callPackage, + rustPlatform, + fetchFromGitHub, + darwin, + gtk3, + libsoup, + openssl, + pkg-config, + webkitgtk, +}: + +rustPlatform.buildRustPackage rec { + pname = "tauri"; + version = "1.7.1-unstable-2024-08-16"; + + src = fetchFromGitHub { + owner = "tauri-apps"; + repo = "tauri"; + rev = "2b61447dfc167ec11724f99671bf9e2de0bf6768"; + hash = "sha256-gKG7olZuTCkW+SKI3FVZqgS6Pp5hFemRJshdma8rpyg="; + }; + + # 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 = "${src.name}/tooling/cli"; + + cargoHash = "sha256-VXg/dAhwPTSrLwJm8HNzAi/sVF9RqgpHIF3PZe1LjSA="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + gtk3 + libsoup + webkitgtk + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreServices + Security + SystemConfiguration + ] + ); + + passthru = { + # See ./doc/hooks/tauri.section.md + hook = callPackage ./hook.nix { }; + + tests = { + setupHooks = callPackage ./test-app.nix { }; + }; + }; + + meta = { + description = "Build smaller, faster, and more secure desktop applications with a web frontend"; + homepage = "https://tauri.app/"; + changelog = "https://github.com/tauri-apps/tauri/releases/tag/tauri-v${version}"; + license = with lib.licenses; [ + asl20 # or + mit + ]; + maintainers = with lib.maintainers; [ + dit7ya + getchoo + happysalada + ]; + mainProgram = "cargo-tauri"; + }; +} diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix new file mode 100644 index 0000000000000..d9304e38910d0 --- /dev/null +++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + rustPlatform, + cargo-tauri, + darwin, + glib-networking, + libsoup, + openssl, + pkg-config, + webkitgtk, + wrapGAppsHook3, +}: + +rustPlatform.buildRustPackage rec { + pname = "test-app"; + inherit (cargo-tauri) version src; + + # Basic example provided by upstream + sourceRoot = "${src.name}/examples/workspace"; + + cargoPatches = [ + # https://github.com/NixOS/nixpkgs/issues/332957 + ./update-time-crate.patch + ]; + + cargoHash = "sha256-ull9BWzeKsnMi4wcH67FnKFzTjqEdiRlM3f+EKIPvvU="; + + nativeBuildInputs = [ + cargo-tauri.hook + + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isLinux [ + glib-networking + libsoup + webkitgtk + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + CoreServices + Security + WebKit + ] + ); + + # No one should be actually running this, so lets save some time + buildType = "debug"; + doCheck = false; + + meta = { + inherit (cargo-tauri.hook.meta) platforms; + }; +} diff --git a/pkgs/by-name/ca/cargo-tauri/update-time-crate.patch b/pkgs/by-name/ca/cargo-tauri/update-time-crate.patch new file mode 100644 index 0000000000000..6f27242a60cd5 --- /dev/null +++ b/pkgs/by-name/ca/cargo-tauri/update-time-crate.patch @@ -0,0 +1,1378 @@ +diff --git a/Cargo.lock b/Cargo.lock +index b0b153f67..dd801d616 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -32,6 +32,21 @@ dependencies = [ + "alloc-no-stdlib", + ] + ++[[package]] ++name = "android-tzdata" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" ++ ++[[package]] ++name = "android_system_properties" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" ++dependencies = [ ++ "libc", ++] ++ + [[package]] + name = "anyhow" + version = "1.0.68" +@@ -87,9 +102,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + + [[package]] + name = "base64" +-version = "0.20.0" ++version = "0.21.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" ++ ++[[package]] ++name = "base64" ++version = "0.22.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" ++checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + + [[package]] + name = "bitflags" +@@ -114,9 +135,9 @@ dependencies = [ + + [[package]] + name = "brotli" +-version = "3.3.4" ++version = "6.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" ++checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" + dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +@@ -125,9 +146,9 @@ dependencies = [ + + [[package]] + name = "brotli-decompressor" +-version = "2.3.4" ++version = "4.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" ++checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" + dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +@@ -143,6 +164,12 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "bumpalo" ++version = "3.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" ++ + [[package]] + name = "bytemuck" + version = "1.12.3" +@@ -187,19 +214,22 @@ dependencies = [ + + [[package]] + name = "cargo_toml" +-version = "0.14.0" ++version = "0.15.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0f1204fe51a1e56042b8ec31d6407547ecd18f596b66f470dadb9abd9be9c843" ++checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" + dependencies = [ + "serde", +- "toml", ++ "toml 0.7.8", + ] + + [[package]] + name = "cc" +-version = "1.0.78" ++version = "1.1.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" ++checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" ++dependencies = [ ++ "shlex", ++] + + [[package]] + name = "cesu8" +@@ -242,6 +272,19 @@ version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + ++[[package]] ++name = "chrono" ++version = "0.4.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" ++dependencies = [ ++ "android-tzdata", ++ "iana-time-zone", ++ "num-traits", ++ "serde", ++ "windows-targets", ++] ++ + [[package]] + name = "cocoa" + version = "0.24.1" +@@ -401,7 +444,7 @@ dependencies = [ + "proc-macro2", + "quote", + "smallvec", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -411,17 +454,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" + dependencies = [ + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] + name = "ctor" +-version = "0.1.26" ++version = "0.2.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" ++checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" + dependencies = [ + "quote", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] +@@ -432,9 +475,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + + [[package]] + name = "darling" +-version = "0.13.4" ++version = "0.20.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" ++checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" + dependencies = [ + "darling_core", + "darling_macro", +@@ -442,27 +485,37 @@ dependencies = [ + + [[package]] + name = "darling_core" +-version = "0.13.4" ++version = "0.20.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" ++checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" + dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] + name = "darling_macro" +-version = "0.13.4" ++version = "0.20.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" ++checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" + dependencies = [ + "darling_core", + "quote", +- "syn", ++ "syn 2.0.77", ++] ++ ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++ "serde", + ] + + [[package]] +@@ -475,7 +528,7 @@ dependencies = [ + "proc-macro2", + "quote", + "rustc_version 0.4.0", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -551,6 +604,12 @@ dependencies = [ + "cfg-if", + ] + ++[[package]] ++name = "equivalent" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" ++ + [[package]] + name = "fastrand" + version = "1.8.0" +@@ -592,6 +651,15 @@ dependencies = [ + "miniz_oxide", + ] + ++[[package]] ++name = "fluent-uri" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" ++dependencies = [ ++ "bitflags", ++] ++ + [[package]] + name = "fnv" + version = "1.0.7" +@@ -672,7 +740,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -883,7 +951,7 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -978,7 +1046,7 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -987,6 +1055,12 @@ 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 = "heck" + version = "0.3.3" +@@ -1002,6 +1076,12 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + ++[[package]] ++name = "heck" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" ++ + [[package]] + name = "hermit-abi" + version = "0.2.6" +@@ -1011,18 +1091,24 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "hex" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" ++ + [[package]] + name = "html5ever" +-version = "0.25.2" ++version = "0.26.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" ++checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" + dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -1042,6 +1128,29 @@ version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + ++[[package]] ++name = "iana-time-zone" ++version = "0.1.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" ++dependencies = [ ++ "android_system_properties", ++ "core-foundation-sys", ++ "iana-time-zone-haiku", ++ "js-sys", ++ "wasm-bindgen", ++ "windows-core", ++] ++ ++[[package]] ++name = "iana-time-zone-haiku" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" ++dependencies = [ ++ "cc", ++] ++ + [[package]] + name = "ico" + version = "0.3.0" +@@ -1106,14 +1215,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" + dependencies = [ + "autocfg", +- "hashbrown", ++ "hashbrown 0.12.3", ++ "serde", ++] ++ ++[[package]] ++name = "indexmap" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" ++dependencies = [ ++ "equivalent", ++ "hashbrown 0.14.5", ++ "serde", + ] + + [[package]] + name = "infer" +-version = "0.12.0" ++version = "0.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" ++checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" + dependencies = [ + "cfb", + ] +@@ -1182,26 +1303,47 @@ version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + ++[[package]] ++name = "js-sys" ++version = "0.3.70" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" ++dependencies = [ ++ "wasm-bindgen", ++] ++ + [[package]] + name = "json-patch" +-version = "0.3.0" ++version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e712e62827c382a77b87f590532febb1f8b2fdbc3eefa1ee37fe7281687075ef" ++checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" + dependencies = [ ++ "jsonptr", + "serde", + "serde_json", + "thiserror", +- "treediff", + ] + + [[package]] +-name = "kuchiki" +-version = "0.8.1" ++name = "jsonptr" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" ++dependencies = [ ++ "fluent-uri", ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "kuchikiki" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" ++checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" + dependencies = [ + "cssparser", + "html5ever", ++ "indexmap 1.9.2", + "matches", + "selectors", + ] +@@ -1278,13 +1420,13 @@ dependencies = [ + + [[package]] + name = "markup5ever" +-version = "0.10.1" ++version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" ++checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" + dependencies = [ + "log", +- "phf 0.8.0", +- "phf_codegen", ++ "phf 0.10.1", ++ "phf_codegen 0.10.0", + "string_cache", + "string_cache_codegen", + "tendril", +@@ -1379,6 +1521,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.45" +@@ -1437,7 +1585,7 @@ dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -1561,9 +1709,17 @@ version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" + dependencies = [ +- "phf_macros 0.10.0", + "phf_shared 0.10.0", +- "proc-macro-hack", ++] ++ ++[[package]] ++name = "phf" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" ++dependencies = [ ++ "phf_macros 0.11.2", ++ "phf_shared 0.11.2", + ] + + [[package]] +@@ -1576,6 +1732,16 @@ dependencies = [ + "phf_shared 0.8.0", + ] + ++[[package]] ++name = "phf_codegen" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" ++dependencies = [ ++ "phf_generator 0.10.0", ++ "phf_shared 0.10.0", ++] ++ + [[package]] + name = "phf_generator" + version = "0.8.0" +@@ -1596,6 +1762,16 @@ dependencies = [ + "rand 0.8.5", + ] + ++[[package]] ++name = "phf_generator" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" ++dependencies = [ ++ "phf_shared 0.11.2", ++ "rand 0.8.5", ++] ++ + [[package]] + name = "phf_macros" + version = "0.8.0" +@@ -1607,21 +1783,20 @@ dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] + name = "phf_macros" +-version = "0.10.0" ++version = "0.11.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" ++checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" + dependencies = [ +- "phf_generator 0.10.0", +- "phf_shared 0.10.0", +- "proc-macro-hack", ++ "phf_generator 0.11.2", ++ "phf_shared 0.11.2", + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1642,6 +1817,15 @@ dependencies = [ + "siphasher", + ] + ++[[package]] ++name = "phf_shared" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" ++dependencies = [ ++ "siphasher", ++] ++ + [[package]] + name = "pin-project-lite" + version = "0.2.9" +@@ -1667,7 +1851,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5329b8f106a176ab0dce4aae5da86bfcb139bb74fb00882859e03745011f3635" + dependencies = [ + "base64 0.13.1", +- "indexmap", ++ "indexmap 1.9.2", + "line-wrap", + "quick-xml", + "serde", +@@ -1686,6 +1870,12 @@ dependencies = [ + "miniz_oxide", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -1706,7 +1896,7 @@ checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" + dependencies = [ + "once_cell", + "thiserror", +- "toml", ++ "toml 0.5.10", + ] + + [[package]] +@@ -1718,7 +1908,7 @@ dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + "version_check", + ] + +@@ -1741,9 +1931,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + + [[package]] + name = "proc-macro2" +-version = "1.0.50" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] +@@ -1759,9 +1949,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.23" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -1981,7 +2171,7 @@ dependencies = [ + "log", + "matches", + "phf 0.8.0", +- "phf_codegen", ++ "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", +@@ -2017,31 +2207,33 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.152" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.152" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] + name = "serde_json" +-version = "1.0.91" ++version = "1.0.128" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" ++checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" + dependencies = [ ++ "indexmap 2.5.0", + "itoa 1.0.5", ++ "memchr", + "ryu", + "serde", + ] +@@ -2054,36 +2246,53 @@ checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", ++] ++ ++[[package]] ++name = "serde_spanned" ++version = "0.6.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" ++dependencies = [ ++ "serde", + ] + + [[package]] + name = "serde_with" +-version = "1.14.0" ++version = "3.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" ++checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" + dependencies = [ ++ "base64 0.22.1", ++ "chrono", ++ "hex", ++ "indexmap 1.9.2", ++ "indexmap 2.5.0", + "serde", ++ "serde_derive", ++ "serde_json", + "serde_with_macros", ++ "time", + ] + + [[package]] + name = "serde_with_macros" +-version = "1.5.2" ++version = "3.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" ++checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" + dependencies = [ + "darling", + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] + name = "serialize-to-javascript" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" ++checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5" + dependencies = [ + "serde", + "serde_json", +@@ -2092,13 +2301,13 @@ dependencies = [ + + [[package]] + name = "serialize-to-javascript-impl" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" ++checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2131,6 +2340,12 @@ dependencies = [ + "lazy_static", + ] + ++[[package]] ++name = "shlex" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ + [[package]] + name = "siphasher" + version = "0.3.10" +@@ -2223,9 +2438,9 @@ dependencies = [ + + [[package]] + name = "strsim" +-version = "0.10.0" ++version = "0.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" ++checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + + [[package]] + name = "syn" +@@ -2238,6 +2453,17 @@ dependencies = [ + "unicode-ident", + ] + ++[[package]] ++name = "syn" ++version = "2.0.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ + [[package]] + name = "system-deps" + version = "5.0.0" +@@ -2247,7 +2473,7 @@ dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", +- "toml", ++ "toml 0.5.10", + "version-compare 0.0.11", + ] + +@@ -2260,7 +2486,7 @@ dependencies = [ + "cfg-expr 0.11.0", + "heck 0.4.0", + "pkg-config", +- "toml", ++ "toml 0.5.10", + "version-compare 0.1.1", + ] + +@@ -2318,7 +2544,7 @@ checksum = "3b6fcd8245d45a39ffc8715183d92ae242750eb57b285eb3bcd63dfd512afd09" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -2334,19 +2560,21 @@ dependencies = [ + + [[package]] + name = "tauri" +-version = "1.2.4" ++version = "1.7.1" + dependencies = [ + "anyhow", + "cocoa", + "dirs-next", ++ "dunce", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", ++ "getrandom 0.2.8", + "glib", + "glob", + "gtk", +- "heck 0.4.0", ++ "heck 0.5.0", + "http", + "ignore", + "objc", +@@ -2377,24 +2605,26 @@ dependencies = [ + + [[package]] + name = "tauri-build" +-version = "1.2.1" ++version = "1.5.3" + dependencies = [ + "anyhow", + "cargo_toml", +- "heck 0.4.0", ++ "dirs-next", ++ "heck 0.5.0", + "json-patch", + "semver 1.0.16", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", ++ "walkdir", + ] + + [[package]] + name = "tauri-codegen" +-version = "1.2.1" ++version = "1.4.4" + dependencies = [ +- "base64 0.20.0", ++ "base64 0.21.7", + "brotli", + "ico", + "json-patch", +@@ -2415,19 +2645,19 @@ dependencies = [ + + [[package]] + name = "tauri-macros" +-version = "1.2.1" ++version = "1.4.5" + dependencies = [ +- "heck 0.4.0", ++ "heck 0.5.0", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + "tauri-codegen", + "tauri-utils", + ] + + [[package]] + name = "tauri-runtime" +-version = "0.12.1" ++version = "0.14.4" + dependencies = [ + "gtk", + "http", +@@ -2446,7 +2676,7 @@ dependencies = [ + + [[package]] + name = "tauri-runtime-wry" +-version = "0.12.2" ++version = "0.14.9" + dependencies = [ + "cocoa", + "gtk", +@@ -2464,18 +2694,20 @@ dependencies = [ + + [[package]] + name = "tauri-utils" +-version = "1.2.1" ++version = "1.6.0" + dependencies = [ + "brotli", + "ctor", ++ "dunce", + "glob", +- "heck 0.4.0", ++ "heck 0.5.0", + "html5ever", + "infer", + "json-patch", +- "kuchiki", ++ "kuchikiki", ++ "log", + "memchr", +- "phf 0.10.1", ++ "phf 0.11.2", + "proc-macro2", + "quote", + "semver 1.0.16", +@@ -2485,7 +2717,7 @@ dependencies = [ + "thiserror", + "url", + "walkdir", +- "windows", ++ "windows-version", + ] + + [[package]] +@@ -2494,7 +2726,7 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1b7a78dc04f75fb5ab815e66ac561c81e92a968a40f29e7c21afd152d694fad8" + dependencies = [ +- "toml", ++ "toml 0.5.10", + "version_check", + ] + +@@ -2531,22 +2763,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + + [[package]] + name = "thiserror" +-version = "1.0.38" ++version = "1.0.63" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" ++checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.38" ++version = "1.0.63" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" ++checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2560,11 +2792,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.17" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa 1.0.5", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -2572,16 +2807,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.0" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.6" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -2623,6 +2859,40 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "toml" ++version = "0.7.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" ++dependencies = [ ++ "serde", ++ "serde_spanned", ++ "toml_datetime", ++ "toml_edit", ++] ++ ++[[package]] ++name = "toml_datetime" ++version = "0.6.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "toml_edit" ++version = "0.19.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" ++dependencies = [ ++ "indexmap 2.5.0", ++ "serde", ++ "serde_spanned", ++ "toml_datetime", ++ "winnow", ++] ++ + [[package]] + name = "tracing" + version = "0.1.37" +@@ -2643,7 +2913,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -2685,15 +2955,6 @@ dependencies = [ + "tracing-log", + ] + +-[[package]] +-name = "treediff" +-version = "4.0.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" +-dependencies = [ +- "serde_json", +-] +- + [[package]] + name = "typenum" + version = "1.16.0" +@@ -2807,6 +3068,61 @@ version = "0.11.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" ++dependencies = [ ++ "cfg-if", ++ "once_cell", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" ++dependencies = [ ++ "bumpalo", ++ "log", ++ "once_cell", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.77", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.77", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" ++ + [[package]] + name = "webkit2gtk" + version = "0.18.2" +@@ -2874,7 +3190,7 @@ checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -2947,13 +3263,22 @@ dependencies = [ + "windows-tokens", + ] + ++[[package]] ++name = "windows-core" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" ++dependencies = [ ++ "windows-targets", ++] ++ + [[package]] + name = "windows-implement" + version = "0.39.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" + dependencies = [ +- "syn", ++ "syn 1.0.107", + "windows-tokens", + ] + +@@ -2969,27 +3294,58 @@ version = "0.42.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" + dependencies = [ +- "windows_aarch64_gnullvm", ++ "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", +- "windows_x86_64_gnullvm", ++ "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", + ] + ++[[package]] ++name = "windows-targets" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.52.6", ++ "windows_aarch64_msvc 0.52.6", ++ "windows_i686_gnu 0.52.6", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc 0.52.6", ++ "windows_x86_64_gnu 0.52.6", ++ "windows_x86_64_gnullvm 0.52.6", ++ "windows_x86_64_msvc 0.52.6", ++] ++ + [[package]] + name = "windows-tokens" + version = "0.39.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + ++[[package]] ++name = "windows-version" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" ++dependencies = [ ++ "windows-targets", ++] ++ + [[package]] + name = "windows_aarch64_gnullvm" + version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" ++ + [[package]] + name = "windows_aarch64_msvc" + version = "0.39.0" +@@ -3002,6 +3358,12 @@ version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" ++ + [[package]] + name = "windows_i686_gnu" + version = "0.39.0" +@@ -3014,6 +3376,18 @@ version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + ++[[package]] ++name = "windows_i686_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" ++ + [[package]] + name = "windows_i686_msvc" + version = "0.39.0" +@@ -3026,6 +3400,12 @@ version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + ++[[package]] ++name = "windows_i686_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" ++ + [[package]] + name = "windows_x86_64_gnu" + version = "0.39.0" +@@ -3038,12 +3418,24 @@ version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" ++ + [[package]] + name = "windows_x86_64_gnullvm" + version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" ++ + [[package]] + name = "windows_x86_64_msvc" + version = "0.39.0" +@@ -3056,11 +3448,26 @@ version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" ++ ++[[package]] ++name = "winnow" ++version = "0.5.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" ++dependencies = [ ++ "memchr", ++] ++ + [[package]] + name = "wry" +-version = "0.24.1" ++version = "0.24.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1c846dc4dda988e959869dd0802cd27417c9696e584593e49178aeee28890d25" ++checksum = "c55c80b12287eb1ff7c365fc2f7a5037cb6181bd44c9fce81c8d1cf7605ffad6" + dependencies = [ + "base64 0.13.1", + "block", +@@ -3074,7 +3481,7 @@ dependencies = [ + "gtk", + "html5ever", + "http", +- "kuchiki", ++ "kuchikiki", + "libc", + "log", + "objc", diff --git a/pkgs/by-name/ca/cargo-unfmt/package.nix b/pkgs/by-name/ca/cargo-unfmt/package.nix index 3a2a16dfaaf6f..e53cc07c330ce 100644 --- a/pkgs/by-name/ca/cargo-unfmt/package.nix +++ b/pkgs/by-name/ca/cargo-unfmt/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-mMeHTYCUIZR3jVvTxfyH4I9wGfUdCWcyn9djnksAY8k="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; # Doc tests are broken on 0.3.3 doCheck = false; diff --git a/pkgs/by-name/ca/cargo-vibe/package.nix b/pkgs/by-name/ca/cargo-vibe/package.nix index 4caaa823264b9..ba7a5882b5bb1 100644 --- a/pkgs/by-name/ca/cargo-vibe/package.nix +++ b/pkgs/by-name/ca/cargo-vibe/package.nix @@ -28,8 +28,8 @@ rustPlatform.buildRustPackage rec { dbus openssl ] - ++ lib.optional stdenv.isLinux udev - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit IOKit CoreBluetooth ]); + ++ lib.optional stdenv.hostPlatform.isLinux udev + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit IOKit CoreBluetooth ]); meta = with lib; { description = "Cargo x Buttplug.io"; diff --git a/pkgs/by-name/ca/cargo-wasi/package.nix b/pkgs/by-name/ca/cargo-wasi/package.nix index b0fe56c9fb69a..a42b98da20541 100644 --- a/pkgs/by-name/ca/cargo-wasi/package.nix +++ b/pkgs/by-name/ca/cargo-wasi/package.nix @@ -21,8 +21,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); # Checks need to be disabled here because the current test suite makes assumptions # about the surrounding environment that aren't Nix friendly. See these lines for specifics: diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 78c6c9933e831..4f3b16c4ddee0 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-xVG1nET020rfMIjhIcCtNr9ZCj8SgQAvXePjyKSPjUs="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/ca/cargo2junit/0001-update-time-rs.patch b/pkgs/by-name/ca/cargo2junit/0001-update-time-rs.patch new file mode 100644 index 0000000000000..a76deea7a0e8c --- /dev/null +++ b/pkgs/by-name/ca/cargo2junit/0001-update-time-rs.patch @@ -0,0 +1,154 @@ +From 84e19417eb0c7768922cd5e05bc246b278c64ce2 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Tue, 24 Sep 2024 21:12:03 +0800 +Subject: [PATCH] update time-rs + +--- + Cargo.lock | 61 ++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 43 insertions(+), 18 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index c56ff81..b20dca4 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -28,6 +28,15 @@ dependencies = [ + "strip-ansi-escapes", + ] + ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] ++ + [[package]] + name = "derive-getters" + version = "0.2.0" +@@ -64,20 +73,32 @@ version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "proc-macro2" +-version = "1.0.55" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] + + [[package]] + name = "quote" +-version = "1.0.26" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -107,22 +128,22 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + + [[package]] + name = "serde" +-version = "1.0.159" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.159" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.13", ++ "syn 2.0.77", + ] + + [[package]] +@@ -158,9 +179,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.13" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -184,16 +205,19 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.13", ++ "syn 2.0.77", + ] + + [[package]] + name = "time" +-version = "0.3.20" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -201,16 +225,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.0" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.8" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +-- +2.46.0 + diff --git a/pkgs/by-name/ca/cargo2junit/package.nix b/pkgs/by-name/ca/cargo2junit/package.nix new file mode 100644 index 0000000000000..f2aac9a191809 --- /dev/null +++ b/pkgs/by-name/ca/cargo2junit/package.nix @@ -0,0 +1,29 @@ +{ + fetchCrate, + lib, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo2junit"; + version = "0.1.13"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-R3a87nXCnGhdeyR7409hFR5Cj3TFUWqaLNOtlXPsvto="; + }; + + cargoPatches = [ + ./0001-update-time-rs.patch + ]; + + cargoHash = "sha256-ncRELlbT8Dy8huLgZrroRWohCLeN5cRjMWrIW4JNcCM="; + + meta = with lib; { + description = "Converts cargo's json output (from stdin) to JUnit XML (to stdout)"; + mainProgram = "cargo2junit"; + homepage = "https://github.com/johnterickson/cargo2junit"; + license = licenses.mit; + maintainers = with maintainers; [ alekseysidorov ]; + }; +} diff --git a/pkgs/by-name/ca/caribou/package.nix b/pkgs/by-name/ca/caribou/package.nix index 34621a8d6a0af..463fe2f7e2815 100644 --- a/pkgs/by-name/ca/caribou/package.nix +++ b/pkgs/by-name/ca/caribou/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/caribou/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; + hash = "sha256-nEPZ9L0w9P6n94DU6LFPdYkQfFLpy2vSAr0NHCBk3lU="; }; patches = [ @@ -40,22 +40,22 @@ stdenv.mkDerivation rec { # https://bugzilla.gnome.org/show_bug.cgi?id=791001 (fetchurl { url = "https://bugzilla.gnome.org/attachment.cgi?id=364774"; - sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; + hash = "sha256-bU+/PTfkMh0KAUNCDhYYJ2iq9JlWLtwztdO4/EohYZY="; }) # Stop patching the generated GIR, fixes build with latest vala (fetchurl { url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/c52ce71c49dc8d6109a58d16cc8d491d7bd1d781.patch"; - sha256 = "sha256-jbF1Ygp8Q0ENN/5aEpROuK5zkufIfn6cGW8dncl7ET4="; + hash = "sha256-jbF1Ygp8Q0ENN/5aEpROuK5zkufIfn6cGW8dncl7ET4="; }) (fetchurl { name = "fix-build-modern-vala.patch"; url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/76fbd11575f918fc898cb0f5defe07f67c11ec38.patch"; - sha256 = "0qy27zk7889hg51nx40afgppcx9iaihxbg3aqz9w35d6fmhr2k2y"; + hash = "sha256-XkyRYXWmlcHTx2q81WFUMXV273MKkG5DeTAhdOY/wmM="; }) (fetchurl { name = "CVE-2021-3567.patch"; url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/d41c8e44b12222a290eaca16703406b113a630c6.patch"; - sha256 = "1vd2j3823k2p3msv7fq2437p3jvxzbd7hyh07i80g9754ylh92y8"; + hash = "sha256-yIsEqSflpAdQPAB6eNr6fctxzyACu7N1HVfMIdCQou0="; }) ]; diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix index 42575689ea191..53f13d323262c 100644 --- a/pkgs/by-name/ca/cartridges/package.nix +++ b/pkgs/by-name/ca/cartridges/package.nix @@ -64,7 +64,7 @@ python3Packages.buildPythonApplication rec { You can sort and hide games or download cover art from SteamGridDB. ''; homepage = "https://apps.gnome.org/Cartridges/"; - changelog = "https://github.com/kra-mo/cartridges/releases/tag/${src.rev}"; + changelog = "https://github.com/kra-mo/cartridges/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "cartridges"; diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 9c39449704dfa..0f1f3e3d7a00c 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -30,7 +30,7 @@ #sundials, superscs, spral, - swig4, + swig, tinyxml-2, withUnfree ? false, }: @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { "if (SWIG_IMPORT)" \ "if (NOT SWIG_IMPORT)" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # this is only printing stuff, and is not defined on all CPU substituteInPlace casadi/interfaces/hpipm/hpipm_runtime.hpp --replace-fail \ "d_print_exp_tran_mat" \ @@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { #sundials superscs spral - swig4 + swig tinyxml-2 ] ++ lib.optionals withUnfree [ @@ -150,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.numpy python3Packages.python ] - ++ lib.optionals stdenv.isDarwin [ llvmPackages_17.openmp ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages_17.openmp ]; cmakeFlags = [ (lib.cmakeBool "WITH_PYTHON" pythonSupport) diff --git a/pkgs/by-name/ca/castxml/package.nix b/pkgs/by-name/ca/castxml/package.nix index 88cbbec87c6d1..c0fe17a1d0978 100644 --- a/pkgs/by-name/ca/castxml/package.nix +++ b/pkgs/by-name/ca/castxml/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 llvm zlib - ] ++ lib.optionals (!stdenv.isDarwin) [ libclang ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libclang ]; cmakeFlags = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SPHINX_HTML" withHTML) (lib.cmakeBool "SPHINX_MAN" withManual) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeOptionType "path" "Clang_DIR" "${lib.getDev libclang}/lib/cmake/clang") ]; diff --git a/pkgs/by-name/ca/catppuccin-cursors/package.nix b/pkgs/by-name/ca/catppuccin-cursors/package.nix index 1a46f4370bfb7..604b04e50e0c7 100644 --- a/pkgs/by-name/ca/catppuccin-cursors/package.nix +++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix @@ -5,6 +5,7 @@ , just , xcursorgen , hyprcursor +, xcur2png }: let @@ -14,7 +15,7 @@ let }; variantName = { palette, color }: palette + color; variants = lib.mapCartesianProduct variantName dimensions; - version = "0.3.0"; + version = "0.3.1"; in stdenvNoCC.mkDerivation { pname = "catppuccin-cursors"; @@ -24,10 +25,10 @@ stdenvNoCC.mkDerivation { owner = "catppuccin"; repo = "cursors"; rev = "v${version}"; - hash = "sha256-LJyBnXDUGBLOD4qPI7l0YC0CcqYTtgoMJc1H2yLqk9g="; + hash = "sha256-CuzD6O/RImFKLWzJoiUv7nlIdoXNvwwl+k5mTeVIY10="; }; - nativeBuildInputs = [ just inkscape xcursorgen hyprcursor ]; + nativeBuildInputs = [ just inkscape xcursorgen hyprcursor xcur2png ]; outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage diff --git a/pkgs/by-name/ca/catppuccin-fcitx5/package.nix b/pkgs/by-name/ca/catppuccin-fcitx5/package.nix index 475171ad2cf97..804dd90b6ab15 100644 --- a/pkgs/by-name/ca/catppuccin-fcitx5/package.nix +++ b/pkgs/by-name/ca/catppuccin-fcitx5/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation { pname = "catppuccin-fcitx5"; - version = "0-unstable-2022-10-05"; + version = "0-unstable-2024-09-01"; src = fetchFromGitHub { owner = "catppuccin"; repo = "fcitx5"; - rev = "ce244cfdf43a648d984719fdfd1d60aab09f5c97"; - hash = "sha256-uFaCbyrEjv4oiKUzLVFzw+UY54/h7wh2cntqeyYwGps="; + rev = "3471b918d4b5aab2d3c3dd9f2c3b9c18fb470e8e"; + hash = "sha256-1IqFVTEY6z8yNjpi5C+wahMN1kpt0OJATy5echjPXmc="; }; dontConfigure = true; diff --git a/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/pkgs/by-name/ca/catppuccin-whiskers/package.nix index 6ab0b4aaff79c..4d578abdd941c 100644 --- a/pkgs/by-name/ca/catppuccin-whiskers/package.nix +++ b/pkgs/by-name/ca/catppuccin-whiskers/package.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform }: -let version = "2.4.0"; +let version = "2.5.0"; in rustPlatform.buildRustPackage { pname = "catppuccin-whiskers"; inherit version; @@ -8,10 +8,10 @@ in rustPlatform.buildRustPackage { owner = "catppuccin"; repo = "whiskers"; rev = "refs/tags/v${version}"; - hash = "sha256-rbPr5eSs99nS70J785SWO7tVBdiX/S7XUNHuo3aOQU4="; + hash = "sha256-HsHBMJPSoDhSNwjAR7LbFG4Za4H2H+7itqgiKRdb4M8="; }; - cargoHash = "sha256-T7dreELSHfJizfbJEvvgkOmkMwlOETZVUdLwRFJOJEo="; + cargoHash = "sha256-FpBgXP4kXSzrYP+ad+KubUG4NSDpyoaJwyReS86ETy8="; meta = { homepage = "https://github.com/catppuccin/whiskers"; diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index 2463b1fde6db3..c547de3b3c47e 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -69,7 +69,7 @@ let owner = "catppuccin"; repo = "Kvantum"; rev = "d1e174c85311de9715aefc1eba4b8efd6b2730fc"; - sha256 = "sha256-IrHo8pnR3u90bq12m7FEXucUF79+iub3I9vgH5h86Lk="; + hash = "sha256-IrHo8pnR3u90bq12m7FEXucUF79+iub3I9vgH5h86Lk="; }; lazygit = fetchFromGitHub { diff --git a/pkgs/by-name/cb/cbeams/package.nix b/pkgs/by-name/cb/cbeams/package.nix new file mode 100644 index 0000000000000..c5278cdbf897f --- /dev/null +++ b/pkgs/by-name/cb/cbeams/package.nix @@ -0,0 +1,44 @@ +{ + lib, + python3Packages, + fetchPypi, +}: + +python3Packages.buildPythonApplication rec { + pname = "cbeams"; + version = "1.0.3"; + pyproject = true; + + disabled = !python3Packages.isPy3k; + + src = fetchPypi { + inherit pname version; + hash = "sha256-8Q2sWsAc39Mu34K1wWOKOJERKzBStE4GmtuzOs2T7Kk="; + }; + + build-system = [ python3Packages.setuptools ]; + + postPatch = '' + substituteInPlace cbeams/terminal.py \ + --replace-fail "blessings" "blessed" + ''; + + pythonRemoveDeps = [ "blessings" ]; + + dependencies = with python3Packages; [ + blessed + docopt + ]; + + doCheck = false; # no tests + + meta = { + homepage = "https://github.com/tartley/cbeams"; + description = "Command-line program to draw animated colored circles in the terminal"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + oxzi + sigmanificient + ]; + }; +} diff --git a/pkgs/by-name/cb/cbftp/package.nix b/pkgs/by-name/cb/cbftp/package.nix new file mode 100644 index 0000000000000..73e11f27b2776 --- /dev/null +++ b/pkgs/by-name/cb/cbftp/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchurl +, ncurses +, openssl +}: + +stdenv.mkDerivation rec { + pname = "cbftp"; + version = "1173"; + + src = fetchurl { + url = "https://cbftp.eu/${pname}-r${version}.tar.gz"; + hash = "sha256-DE6fnLzWsx6Skz2LRJAaijjIqrYFB8/HPp45P5CcEc8="; + }; + + buildInputs = [ + ncurses + openssl + ]; + + dontConfigure = true; + + makeFlags = lib.optional stdenv.hostPlatform.isDarwin "OPTFLAGS=-O0"; + + installPhase = '' + runHook preInstall + + install -D bin/* -t $out/bin/ + install -D API README -t $out/share/doc/${pname}/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://cbftp.eu/"; + description = " An advanced multi-purpose FTP/FXP client"; + longDescription = '' + Cbftp is an advanced multi-purpose FTP/FXP client that focuses on + efficient large-scale data spreading, while also supporting most regular + FTP/FXP use cases in a modern way. It runs in a terminal and provides a + semi-graphical user interface through ncurses. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/by-name/cc/cc65/package.nix similarity index 100% rename from pkgs/development/compilers/cc65/default.nix rename to pkgs/by-name/cc/cc65/package.nix diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index 9984771b7ce9e..c30543cdbdd18 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { # test/run requires the compgen function which is available in # bashInteractive, but not bash. bashInteractive - ] ++ lib.optional stdenv.isDarwin xcodebuild; + ] ++ lib.optional stdenv.hostPlatform.isDarwin xcodebuild; checkInputs = [ doctest @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { [ "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test.basedir" "test.fileclone" # flaky on hydra (possibly filesystem-specific?) "test.multi_arch" diff --git a/pkgs/by-name/cc/ccid/package.nix b/pkgs/by-name/cc/ccid/package.nix new file mode 100644 index 0000000000000..af3afd1b24ac0 --- /dev/null +++ b/pkgs/by-name/cc/ccid/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchurl, + flex, + gitUpdater, + libusb1, + pcsclite, + perl, + pkg-config, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "ccid"; + version = "1.5.5"; + + src = fetchurl { + url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; + hash = "sha256-GUcI91/jadRd18Feiz6Kfbi0nPxVV1dMoqLnbvEsoMo="; + }; + + postPatch = '' + patchShebangs . + substituteInPlace src/Makefile.in --replace-fail /bin/echo echo + ''; + + configureFlags = [ + "--enable-twinserial" + "--enable-serialconfdir=${placeholder "out"}/etc/reader.conf.d" + "--enable-ccidtwindir=${placeholder "out"}/pcsc/drivers/serial" + "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers" + ]; + + # error: call to undeclared function 'InterruptRead'; + # ISO C99 and later do not support implicit function declarations + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + + nativeBuildInputs = [ + flex + perl + pkg-config + ]; + + buildInputs = [ + libusb1 + pcsclite + zlib + ]; + + postInstall = '' + install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules + substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \ + --replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd" + ''; + + # The resulting shared object ends up outside of the default paths which are + # usually getting stripped. + stripDebugList = [ "pcsc" ]; + + passthru.updateScript = gitUpdater { + url = "https://salsa.debian.org/rousseau/CCID.git"; + }; + + meta = with lib; { + description = "PC/SC driver for USB CCID smart card readers"; + homepage = "https://ccid.apdu.fr/"; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.anthonyroussel ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/cc/cctools/package.nix b/pkgs/by-name/cc/cctools/package.nix index 2ab074def6740..c56f79b69e474 100644 --- a/pkgs/by-name/cc/cctools/package.nix +++ b/pkgs/by-name/cc/cctools/package.nix @@ -132,8 +132,8 @@ stdenv.mkDerivation (finalAttrs: { ld64 llvm ] - ++ lib.optionals stdenv.isDarwin [ darwin.objc4 ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ memstreamHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.objc4 ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ]; mesonBuildType = "release"; diff --git a/pkgs/by-name/cd/cdecl/package.nix b/pkgs/by-name/cd/cdecl/package.nix index c500e095d1f2c..07a2656299424 100644 --- a/pkgs/by-name/cd/cdecl/package.nix +++ b/pkgs/by-name/cd/cdecl/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdecl"; - version = "18.3"; + version = "18.4.1"; src = fetchFromGitHub { owner = "paul-j-lucas"; repo = "cdecl"; rev = "refs/tags/cdecl-${finalAttrs.version}"; - hash = "sha256-w6n/7oAl6D7cBG/YIauhjFjHs+ygF3ugKWv0lgY1G9Q="; + hash = "sha256-GtNB55zFIpt6yYE3olC3yQr2RLsS9AMewzJKDcb67GM="; }; strictDeps = true; diff --git a/pkgs/by-name/ce/celeste64/package.nix b/pkgs/by-name/ce/celeste64/package.nix index 7d497ec35166b..8588a2d6f5818 100644 --- a/pkgs/by-name/ce/celeste64/package.nix +++ b/pkgs/by-name/ce/celeste64/package.nix @@ -78,7 +78,7 @@ buildDotnetModule rec { meta = { license = with lib.licenses; [ unfree mit ]; platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; - maintainers = with lib.maintainers; [ lychee ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "Celeste64"; homepage = "https://github.com/ExOK/Celeste64"; description = "Celeste 64: Fragments of the Mountain"; diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 66f857945e4b3..bc99ee2eeb64a 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -44,7 +44,7 @@ let owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg="; + hash = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg="; }; }; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/ce/centerpiece/package.nix b/pkgs/by-name/ce/centerpiece/package.nix index 784945da7c775..7d7c7512d8760 100644 --- a/pkgs/by-name/ce/centerpiece/package.nix +++ b/pkgs/by-name/ce/centerpiece/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { libXrandr ]); - postFixup = lib.optional stdenv.isLinux '' + postFixup = lib.optional stdenv.hostPlatform.isLinux '' rpath=$(patchelf --print-rpath $out/bin/centerpiece) patchelf --set-rpath "$rpath:${ lib.makeLibraryPath [ diff --git a/pkgs/by-name/ce/ceph-csi/package.nix b/pkgs/by-name/ce/ceph-csi/package.nix index 6c45b0aa24358..55ff6cda52fb9 100644 --- a/pkgs/by-name/ce/ceph-csi/package.nix +++ b/pkgs/by-name/ce/ceph-csi/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ceph-csi"; - version = "3.11.0"; + version = "3.12.2"; src = fetchFromGitHub { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - hash = "sha256-EgHl74kJ6lTS3pqz/Hxh/2tpc1xiDNcJxzERwKops+A="; + hash = "sha256-AyGdXPszvYO/ocfcWKeRaUXgwB0IHFVG9uc+c2iaEvA="; }; preConfigure = '' diff --git a/pkgs/development/libraries/cereal/1.3.0.nix b/pkgs/by-name/ce/cereal_1_3_0/package.nix similarity index 100% rename from pkgs/development/libraries/cereal/1.3.0.nix rename to pkgs/by-name/ce/cereal_1_3_0/package.nix diff --git a/pkgs/development/libraries/cereal/1.3.2.nix b/pkgs/by-name/ce/cereal_1_3_2/package.nix similarity index 100% rename from pkgs/development/libraries/cereal/1.3.2.nix rename to pkgs/by-name/ce/cereal_1_3_2/package.nix diff --git a/pkgs/by-name/ce/cewler/package.nix b/pkgs/by-name/ce/cewler/package.nix index f4f96039b9f69..92399307e6a77 100644 --- a/pkgs/by-name/ce/cewler/package.nix +++ b/pkgs/by-name/ce/cewler/package.nix @@ -19,7 +19,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools wheel - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/cf/cf-tool/package.nix b/pkgs/by-name/cf/cf-tool/package.nix new file mode 100644 index 0000000000000..044a7f7e602b5 --- /dev/null +++ b/pkgs/by-name/cf/cf-tool/package.nix @@ -0,0 +1,31 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + nix-update-script, +}: +buildGoModule rec { + pname = "cf-tool"; + version = "202405140250"; + + src = fetchFromGitHub { + owner = "sempr"; + repo = "cf-tool"; + rev = version; + hash = "sha256-D+mJJw1+ImCrFpsv8HmaAwWqjYvUWouh8mgQ7hJxMrc="; + }; + + vendorHash = "sha256-R+mzfH9f422+WTiwIbDoBeEc+YYbW3tisUPlqrnFWbg="; + + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Codeforces CLI (Submit, Parse, Test, etc.). Support Contests, Gym, Groups, acmsguru, Windows, macOS, Linux, 7 MB"; + homepage = "https://github.com/sempr/cf-tool"; + license = licenses.mit; + maintainers = with maintainers; [ bot-wxt1221 ]; + mainProgram = "cf"; + }; +} diff --git a/pkgs/by-name/cf/cfn-nag/Gemfile b/pkgs/by-name/cf/cfn-nag/Gemfile new file mode 100644 index 0000000000000..7f4f5e950d157 --- /dev/null +++ b/pkgs/by-name/cf/cfn-nag/Gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +source 'https://rubygems.org' + +gemspec diff --git a/pkgs/by-name/cf/cfn-nag/Gemfile.lock b/pkgs/by-name/cf/cfn-nag/Gemfile.lock new file mode 100644 index 0000000000000..7892e62b052ca --- /dev/null +++ b/pkgs/by-name/cf/cfn-nag/Gemfile.lock @@ -0,0 +1,106 @@ +PATH + remote: . + specs: + cfn-nag (0.8.10) + aws-sdk-s3 (~> 1.76) + cfn-model (= 0.6.6) + lightly (~> 0.3.2) + logging (~> 2.2.2) + netaddr (~> 2.0.4) + optimist (~> 3.0.0) + rexml + +GEM + remote: https://rubygems.org/ + specs: + ast (2.4.2) + aws-eventstream (1.3.0) + aws-partitions (1.982.0) + aws-sdk-core (3.209.1) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.9) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.94.0) + aws-sdk-core (~> 3, >= 3.207.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.166.0) + aws-sdk-core (~> 3, >= 3.207.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.0) + aws-eventstream (~> 1, >= 1.0.2) + cfn-model (0.6.6) + kwalify (= 0.7.2) + psych (~> 3) + diff-lcs (1.5.1) + docile (1.4.1) + jmespath (1.6.2) + json (2.7.2) + kwalify (0.7.2) + language_server-protocol (3.17.0.3) + lightly (0.3.3) + little-plugger (1.1.4) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) + multi_json (1.15.0) + netaddr (2.0.6) + optimist (3.0.1) + parallel (1.26.3) + parser (3.3.5.0) + ast (~> 2.4.1) + racc + psych (3.3.4) + racc (1.8.1) + rainbow (3.1.1) + rake (13.2.1) + regexp_parser (2.9.2) + rexml (3.3.8) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rubocop (1.66.1) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.3.0.2) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + ruby-progressbar (1.13.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.13.1) + simplecov_json_formatter (0.1.4) + unicode-display_width (2.6.0) + +PLATFORMS + arm64-darwin-23 + ruby + +DEPENDENCIES + cfn-nag! + rake + rspec (~> 3.4) + rubocop + simplecov (~> 0.21) + +BUNDLED WITH + 2.5.11 diff --git a/pkgs/by-name/cf/cfn-nag/gemset.nix b/pkgs/by-name/cf/cfn-nag/gemset.nix new file mode 100644 index 0000000000000..c8d2cd75d6cff --- /dev/null +++ b/pkgs/by-name/cf/cfn-nag/gemset.nix @@ -0,0 +1,536 @@ +{ + ast = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + type = "gem"; + }; + version = "2.4.2"; + }; + aws-eventstream = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-partitions = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "075y2zwfqwg7qb7w34bfvp8dkjcmiz6hx5a3rbhpqglnlkav7ir4"; + type = "gem"; + }; + version = "1.982.0"; + }; + aws-sdk-core = { + dependencies = [ + "aws-eventstream" + "aws-partitions" + "aws-sigv4" + "jmespath" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06mrp7g24ndg55w85ndyrvxfx2v6hnkh5fj32w9s6w3xsc8v5kqq"; + type = "gem"; + }; + version = "3.209.1"; + }; + aws-sdk-kms = { + dependencies = [ + "aws-sdk-core" + "aws-sigv4" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1acx3bhqkhni3kbl7xnjdgy8raq5y7p0zyniq61bsihzkwcj7imh"; + type = "gem"; + }; + version = "1.94.0"; + }; + aws-sdk-s3 = { + dependencies = [ + "aws-sdk-core" + "aws-sdk-kms" + "aws-sigv4" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zpww3lxpjg8smmznz2nbx5hrpnkzflbasllxjwprkqr56rrrjap"; + type = "gem"; + }; + version = "1.166.0"; + }; + aws-sigv4 = { + dependencies = [ "aws-eventstream" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "176zh13m1vhwgys0drlqiw79ljmmx84vva036shsb7rzr4yi36qm"; + type = "gem"; + }; + version = "1.10.0"; + }; + cfn-model = { + dependencies = [ + "kwalify" + "psych" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1b3ix36yfnfwyxb4w9ss8a7nc6w15m1wbj3q8rarsqjrs3xj6wjs"; + type = "gem"; + }; + version = "0.6.6"; + }; + cfn-nag = { + dependencies = [ + "aws-sdk-s3" + "cfn-model" + "lightly" + "logging" + "netaddr" + "optimist" + "rexml" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = ./.; + type = "path"; + }; + version = "0.8.10"; + }; + diff-lcs = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; + type = "gem"; + }; + version = "1.5.1"; + }; + docile = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07pj4z3h8wk4fgdn6s62vw1lwvhj0ac0x10vfbdkr9xzk7krn5cn"; + type = "gem"; + }; + version = "1.4.1"; + }; + jmespath = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; + type = "gem"; + }; + version = "1.6.2"; + }; + json = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; + type = "gem"; + }; + version = "2.7.2"; + }; + kwalify = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ngxg3ysq5vip9dn3d32ajc7ly61kdin86hfycm1hkrcvkkn1vjf"; + type = "gem"; + }; + version = "0.7.2"; + }; + language_server-protocol = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; + type = "gem"; + }; + version = "3.17.0.3"; + }; + lightly = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0sgj2r6j7qxb9vqzkx5isjbphi38rplk4h8838am0cjcpq5h3jb3"; + type = "gem"; + }; + version = "0.3.3"; + }; + little-plugger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + logging = { + dependencies = [ + "little-plugger" + "multi_json" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + type = "gem"; + }; + version = "2.2.2"; + }; + multi_json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + netaddr = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1d7iccg9cjcsfl0fd0iiqfc5s7yh2602dgscbji5lrn2q879ghz7"; + type = "gem"; + }; + version = "2.0.6"; + }; + optimist = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; + type = "gem"; + }; + version = "3.0.1"; + }; + parallel = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; + type = "gem"; + }; + version = "1.26.3"; + }; + parser = { + dependencies = [ + "ast" + "racc" + ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cqs31cyg2zp8yx2zzm3zkih0j93q870wasbviy2w343nxqvn3pk"; + type = "gem"; + }; + version = "3.3.5.0"; + }; + psych = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "186i2hc6sfvg4skhqf82kxaf4mb60g65fsif8w8vg1hc9mbyiaph"; + type = "gem"; + }; + version = "3.3.4"; + }; + racc = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; + type = "gem"; + }; + version = "1.8.1"; + }; + rainbow = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; + type = "gem"; + }; + version = "3.1.1"; + }; + rake = { + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; + type = "gem"; + }; + version = "13.2.1"; + }; + regexp_parser = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ik40vcv7mqigsfpqpca36hpmnx0536xa825ai5qlkv3mmkyf9ss"; + type = "gem"; + }; + version = "2.9.2"; + }; + rexml = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rr145mvjgc4n28lfy0gw87aw3ab680h83bdi5i102ik8mixk3zn"; + type = "gem"; + }; + version = "3.3.8"; + }; + rspec = { + dependencies = [ + "rspec-core" + "rspec-expectations" + "rspec-mocks" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; + type = "gem"; + }; + version = "3.13.0"; + }; + rspec-core = { + dependencies = [ "rspec-support" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0s688wfw77fjldzayvczg8bgwcgh6bh552dw7qcj1rhjk3r4zalx"; + type = "gem"; + }; + version = "3.13.1"; + }; + rspec-expectations = { + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; + type = "gem"; + }; + version = "3.13.3"; + }; + rspec-mocks = { + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88"; + type = "gem"; + }; + version = "3.13.1"; + }; + rspec-support = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; + type = "gem"; + }; + version = "3.13.1"; + }; + rubocop = { + dependencies = [ + "json" + "language_server-protocol" + "parallel" + "parser" + "rainbow" + "regexp_parser" + "rubocop-ast" + "ruby-progressbar" + "unicode-display_width" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rsyxrl647bz49gpa4flh8igg6wy7qxyh2jrp01x0kqnn5iw4y86"; + type = "gem"; + }; + version = "1.66.1"; + }; + rubocop-ast = { + dependencies = [ "parser" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03zywfpm4540q6hw8srhi8pzp0gg51w65ir8jkaw58vk3j31w820"; + type = "gem"; + }; + version = "1.32.3"; + }; + ruby-progressbar = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; + type = "gem"; + }; + version = "1.13.0"; + }; + simplecov = { + dependencies = [ + "docile" + "simplecov-html" + "simplecov_json_formatter" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; + type = "gem"; + }; + version = "0.22.0"; + }; + simplecov-html = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx"; + type = "gem"; + }; + version = "0.13.1"; + }; + simplecov_json_formatter = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; + type = "gem"; + }; + version = "0.1.4"; + }; + unicode-display_width = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; + type = "gem"; + }; + version = "2.6.0"; + }; +} diff --git a/pkgs/by-name/cf/cfn-nag/package.nix b/pkgs/by-name/cf/cfn-nag/package.nix new file mode 100644 index 0000000000000..4ec8f7848cbca --- /dev/null +++ b/pkgs/by-name/cf/cfn-nag/package.nix @@ -0,0 +1,24 @@ +{ + lib, + bundlerEnv, + bundlerUpdateScript, + ruby, +}: + +bundlerEnv { + pname = "cfn-nag"; + version = "0.8.10"; + + inherit ruby; + gemdir = ./.; + + passthru.updateScript = bundlerUpdateScript "cfn-nag"; + + meta = { + description = "Linting tool for CloudFormation templates"; + homepage = "https://github.com/stelligent/cfn_nag"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ momeemt ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/cgreen/default.nix b/pkgs/by-name/cg/cgreen/package.nix similarity index 100% rename from pkgs/development/libraries/cgreen/default.nix rename to pkgs/by-name/cg/cgreen/package.nix diff --git a/pkgs/by-name/ch/challenger/package.nix b/pkgs/by-name/ch/challenger/package.nix deleted file mode 100644 index eff7aa1700209..0000000000000 --- a/pkgs/by-name/ch/challenger/package.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - autoreconfHook, - libgcrypt, - pkg-config, - texinfo, - curl, - gnunet, - jansson, - libgnurl, - libmicrohttpd, - libsodium, - libtool, - postgresql, - taler-exchange, - taler-merchant, - runtimeShell, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "challenger"; - version = "0.12.0"; - - src = fetchgit { - url = "https://git.taler.net/challenger.git"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Qntwtcjjtu3Mbr8Wi5pgFq8KENaycGR4Y3hJ5+LBgTI="; - }; - - # https://git.taler.net/challenger.git/tree/bootstrap - preAutoreconf = '' - # Generate Makefile.am in contrib/ - pushd contrib - rm -f Makefile.am - find wallet-core/challenger/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext - # Remove extra '\' at the end of the file - truncate -s -2 Makefile.am.ext - cat Makefile.am.in Makefile.am.ext >> Makefile.am - # Prevent accidental editing of the generated Makefile.am - chmod -w Makefile.am - popd - ''; - - strictDeps = true; - - nativeBuildInputs = [ - autoreconfHook - libgcrypt - pkg-config - texinfo - ]; - - buildInputs = [ - curl - gnunet - jansson - libgcrypt - libgnurl - libmicrohttpd - libsodium - libtool - postgresql - taler-exchange - taler-merchant - ]; - - preFixup = '' - substituteInPlace $out/bin/challenger-{dbconfig,send-post.sh} \ - --replace-fail "/bin/bash" "${runtimeShell}" - ''; - - meta = { - description = "OAuth 2.0-based authentication service that validates user can receive messages at a certain address"; - homepage = "https://git.taler.net/challenger.git"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ wegank ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/ch/chance/package.nix b/pkgs/by-name/ch/chance/package.nix index 80d50b7eb7501..b200b39693f0c 100644 --- a/pkgs/by-name/ch/chance/package.nix +++ b/pkgs/by-name/ch/chance/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) pname version src; + inherit (finalAttrs) src; hash = "sha256-Q4CfDQxlhspjg7Et+0zHwZ/iSnp0CnwwpW/gT7htlL8="; }; diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 3baec2ac9e6a3..80c245f746375 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -1,37 +1,14 @@ { lib, git, - python3, + python3Packages, fetchFromGitHub, nix-update-script, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec { - version = "0.11.2"; - src = fetchFromGitHub { - owner = "NowanIlfideme"; - repo = "pydantic-yaml"; - rev = "refs/tags/v${version}"; - hash = "sha256-AeUyVav0/k4Fz69Qizn4hcJKoi/CDR9eUan/nJhWsDY="; - }; - dependencies = with self; [ - deprecated - importlib-metadata - pydantic_1 - ruamel-yaml - types-deprecated - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "charmcraft"; - version = "3.1.2"; + version = "3.2.1"; pyproject = true; @@ -39,14 +16,14 @@ python.pkgs.buildPythonApplication rec { owner = "canonical"; repo = "charmcraft"; rev = "refs/tags/${version}"; - hash = "sha256-Qi2ZtAYgQlKj77QPovcT3RrPwAlEwaFyoJ0MAq4EETE="; + hash = "sha256-VqJZP82OIfxPBkayq0ijXDsotgKPbo34RTMuNkLfjls="; }; postPatch = '' substituteInPlace charmcraft/__init__.py --replace-fail "dev" "${version}" ''; - dependencies = with python.pkgs; [ + dependencies = with python3Packages; [ craft-application craft-cli craft-parts @@ -58,7 +35,7 @@ python.pkgs.buildPythonApplication rec { humanize jinja2 jsonschema - pydantic_1 + pydantic python-dateutil pyyaml requests @@ -69,15 +46,15 @@ python.pkgs.buildPythonApplication rec { urllib3 ]; - build-system = with python.pkgs; [ - setuptools - setuptools-scm - ]; + build-system = with python3Packages; [ setuptools-scm ]; - pythonRelaxDeps = [ "urllib3" ]; + pythonRelaxDeps = [ + "urllib3" + "craft-application" + ]; nativeCheckInputs = - with python.pkgs; + with python3Packages; [ hypothesis pyfakefs diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix index 692e7d752971f..59e36a2f298c7 100644 --- a/pkgs/by-name/ch/chatd/package.nix +++ b/pkgs/by-name/ch/chatd/package.nix @@ -33,9 +33,8 @@ buildNpmPackage rec { nativeBuildInputs = [ makeWrapper electron - autoPatchelfHook # for onnx libs pkg-config - ]; + ] ++ lib.optional stdenv.isLinux autoPatchelfHook; # for onnx libs buildInputs = [ stdenv.cc.cc.lib # for libstdc++.so, required by onnxruntime @@ -67,15 +66,17 @@ buildNpmPackage rec { find $out/share/chatd/node_modules -name '*.exe' -or -name '*.dll' -or -name '*.pdb' -delete rm -rf ${ lib.concatStringsSep " " ( - (lib.optional (!stdenv.isx86_64) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/x64") + (lib.optional ( + !stdenv.hostPlatform.isx86_64 + ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/x64") ++ (lib.optional ( - !stdenv.isAarch64 + !stdenv.hostPlatform.isAarch64 ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/arm64") ++ (lib.optional ( - !stdenv.isDarwin + !stdenv.hostPlatform.isDarwin ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/darwin") ++ (lib.optional ( - !stdenv.isLinux + !stdenv.hostPlatform.isLinux ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/linux") ) } diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index d4eb26d58750b..d6ffc1d3dcd2c 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation { pname = "chawan"; - version = "0-unstable-2024-08-03"; + version = "0-unstable-2024-09-03"; src = fetchFromSourcehut { owner = "~bptato"; repo = "chawan"; - rev = "4c64687290c908cd791a058dede9bd4f2a1c7757"; - hash = "sha256-o0GMRNl5GiW0cJdaQYsL2JVp0CPs5VxQF8s0XEh/f7o="; + rev = "298684d174be90be57967f15c2f1bf0d24ba2446"; + hash = "sha256-R/+qLoyewqoOfi264GvZUvpZbN5FX8LtGikQ3FxJEvw="; fetchSubmodules = true; }; @@ -79,6 +79,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ jtbx ]; mainProgram = "cha"; - broken = stdenv.isDarwin; # pending PR #292043 + broken = stdenv.hostPlatform.isDarwin; # pending PR #292043 }; } diff --git a/pkgs/by-name/ch/cheese/package.nix b/pkgs/by-name/ch/cheese/package.nix index 4a39d865d3632..db260a067a399 100644 --- a/pkgs/by-name/ch/cheese/package.nix +++ b/pkgs/by-name/ch/cheese/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/cheese/${lib.versions.major version}/cheese-${version}.tar.xz"; - sha256 = "XyGFxMmeVN3yuLr2DIKBmVDlSVLhMuhjmHXz7cv49o4="; + hash = "sha256-XyGFxMmeVN3yuLr2DIKBmVDlSVLhMuhjmHXz7cv49o4="; }; nativeBuildInputs = [ @@ -98,9 +98,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/cheese"; + changelog = "https://gitlab.gnome.org/GNOME/cheese/-/blob/${version}/NEWS?ref_type=tags"; description = "Take photos and videos with your webcam, with fun graphical effects"; mainProgram = "cheese"; - maintainers = [ ]; + maintainers = with maintainers; [ aleksana ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/science/chemistry/chemtool/default.nix b/pkgs/by-name/ch/chemtool/package.nix similarity index 100% rename from pkgs/applications/science/chemistry/chemtool/default.nix rename to pkgs/by-name/ch/chemtool/package.nix diff --git a/pkgs/by-name/ch/chess-clock/package.nix b/pkgs/by-name/ch/chess-clock/package.nix index 9e36fc97d00a8..2074e5404c414 100644 --- a/pkgs/by-name/ch/chess-clock/package.nix +++ b/pkgs/by-name/ch/chess-clock/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "chess-clock"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = "v${version}"; - hash = "sha256-wwNOop2V84vZO3JV0+VZ+52cKPx8xJg2rLkjfgc/+n4="; + hash = "sha256-XDOCHFZC3s3b/4kD1ZkhWar3kozW3vXc0pk7O6oQfiE="; }; nativeBuildInputs = [ @@ -45,10 +45,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Time games of over-the-board chess"; - mainProgram = "chess-clock"; homepage = "https://gitlab.gnome.org/World/chess-clock"; - changelog = "https://gitlab.gnome.org/World/chess-clock/-/releases/v${version}"; license = licenses.gpl3Plus; + mainProgram = "chess-clock"; maintainers = with maintainers; [ michaelgrahamevans ]; }; } diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 8becb62771bff..ffae0dd265ecb 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.52.1"; + version = "2.52.3"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-USDZ3tEXXOTNyA6tCJndZiHTDBFg70EFnvxYsrFbgi0="; + hash = "sha256-OoVf0Gxyd+hTlM4VOei1atNEZYL2ZF3eKAHyUqRkRzs="; }; - vendorHash = "sha256-xof2uSVUzWPlMhWU7p9/dlbHnr2/Keu7JpUUvuTB2dM="; + vendorHash = "sha256-QJkTscj3MvmscanEqA9Md2OZPYoNtxIJsAd2J6E9zHk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix new file mode 100644 index 0000000000000..1a72701d02d74 --- /dev/null +++ b/pkgs/by-name/ch/chirp/package.nix @@ -0,0 +1,54 @@ +{ lib +, fetchFromGitHub +, writeShellScript +, glib +, gsettings-desktop-schemas +, python3 +, unstableGitUpdater +, wrapGAppsHook3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "chirp"; + version = "0.4.0-unstable-2024-09-28"; + + src = fetchFromGitHub { + owner = "kk7ds"; + repo = "chirp"; + rev = "c09d51c5b92995de266ef4d7f285b8d110c0bdc7"; + hash = "sha256-ErIAqXexgKjpbnubekX9Gy0qAkUDhNil8PtEOcxYVdk="; + }; + buildInputs = [ + glib + gsettings-desktop-schemas + ]; + nativeBuildInputs = [ + wrapGAppsHook3 + ]; + propagatedBuildInputs = with python3.pkgs; [ + future + pyserial + requests + six + suds + wxpython + yattag + ]; + + # "running build_ext" fails with no output + doCheck = false; + + passthru.updateScript = unstableGitUpdater { + tagConverter = writeShellScript "chirp-tag-converter.sh" '' + sed -e 's/^release_//g' -e 's/_/./g' + ''; + }; + + meta = with lib; { + description = "Free, open-source tool for programming your amateur radio"; + homepage = "https://chirp.danplanet.com/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ emantor wrmilling ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ch/chow-centaur/package.nix b/pkgs/by-name/ch/chow-centaur/package.nix index 87c8bc35b1b9b..3b281aa960784 100644 --- a/pkgs/by-name/ch/chow-centaur/package.nix +++ b/pkgs/by-name/ch/chow-centaur/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "jatinchowdhury18"; repo = "KlonCentaur"; rev = "v${finalAttrs.version}"; - sha256 = "0mrzlf4a6f25xd7z9xanpyq7ybb4al01dzpjsgi0jkmlmadyhc4h"; + hash = "sha256-kDDom6q0Tgni0/L+FgBVZC1/sL9W9fRP60U4o4ijP1c="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index a233e2352d7f1..e080ee6c05b83 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.linux; # error: 'vvtanh' was not declared in this scope; did you mean 'tanh'? # error: no matching function for call to 'juce::dsp::SIMDRegister<double>::SIMDRegister(xsimd::simd_batch_traits<xsimd::batch<double, 2> >::batch_bool_type)' - broken = stdenv.isAarch64; # since 2021-12-27 on hydra (update to 2.10): https://hydra.nixos.org/build/162558991 + broken = stdenv.hostPlatform.isAarch64; # since 2021-12-27 on hydra (update to 2.10): https://hydra.nixos.org/build/162558991 mainProgram = "CHOWTapeModel"; }; }) diff --git a/pkgs/games/chromium-bsu/default.nix b/pkgs/by-name/ch/chromium-bsu/package.nix similarity index 100% rename from pkgs/games/chromium-bsu/default.nix rename to pkgs/by-name/ch/chromium-bsu/package.nix diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix index 96383fdd66672..7d2e25026722d 100644 --- a/pkgs/by-name/ch/chrysalis/package.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -45,7 +45,6 @@ appimageTools.wrapType2 { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ aw - eclairevoyant nshalman ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/ci/cidr-merger/package.nix b/pkgs/by-name/ci/cidr-merger/package.nix index 97d73e93d7cd7..d9e7591573fe1 100644 --- a/pkgs/by-name/ci/cidr-merger/package.nix +++ b/pkgs/by-name/ci/cidr-merger/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { owner = "zhanhb"; repo = "cidr-merger"; rev = "v${version}"; - sha256 = "sha256-Kb+89VP7JhBrTE4MM3H/dqoIBgDLnVhKqkgHdymYCgk="; + hash = "sha256-Kb+89VP7JhBrTE4MM3H/dqoIBgDLnVhKqkgHdymYCgk="; }; vendorHash = "sha256-cPri384AX/FdfNtzt3xj4bF+/izSa4sZuAohK0R/7H4="; diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index 1d45df4f632e3..5d2a68e4be264 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.4.0"; + version = "3.4.2"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; rev = "refs/tags/v.${finalAttrs.version}"; - hash = "sha256-BnDS1n1aIQh9HJZeZv0hR7vo2l6Kf9B/11fYFbb/cpQ="; + hash = "sha256-lYs8V/phdyM1kpcxBDS3vAjxFgGCaaOCdNHU3//dgDs="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix index ae9f77416a1d6..cb37c0a8dc360 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon-common/package.nix @@ -18,7 +18,6 @@ , gtk3 , intltool , json-glib -, callPackage , libstartup_notification , libXtst , libXdamage diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix index b5a98a9090b95..2c9308f15a923 100644 --- a/pkgs/by-name/ci/cinnamon-control-center/package.nix +++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix @@ -18,7 +18,6 @@ , networkmanager , libgudev , libwacom -, gnome , wrapGAppsHook3 , tzdata , glibc diff --git a/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix index 7234d00d9c06e..0969fb1123390 100644 --- a/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix +++ b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix @@ -1,6 +1,5 @@ { lib , runCommand -, nixos-artwork , glib , gnome-terminal , gtk3 diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix index cbcc481ca2329..7ea3f4a0a13f6 100644 --- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix +++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-hXgDTQnOlskzyOogvk7BQ9iJ3oXRtgUUX5bXtgD+gFo="; + hash = "sha256-f1Z3fmtCokWNLJwsTOAIAZB3lwFfqakJJco3umyEaYk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix index 79dd3e555d83b..790e0cfe6efcb 100644 --- a/pkgs/by-name/ci/cinnamon-session/package.nix +++ b/pkgs/by-name/ci/cinnamon-session/package.nix @@ -8,7 +8,6 @@ , gtk3 , libcanberra , libxslt -, makeWrapper , meson , ninja , pkg-config diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index eaba2e8e40b4d..77fdf99d197b5 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -3,11 +3,10 @@ stdenv, darwin, fetchFromGitHub, - rust, rustPlatform, cargo-tauri, cinny, - copyDesktopItems, + desktop-file-utils, wrapGAppsHook3, pkg-config, openssl, @@ -16,24 +15,23 @@ glib-networking, libayatana-appindicator, webkitgtk, - makeDesktopItem, }: rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; rev = "refs/tags/v${version}"; - hash = "sha256-3HwKDD0O1Yx2OIjyO5FhV4d1INAIFXMO7FjSL7cOVmI="; + hash = "sha256-W73ma8ScF3LGv45yhZCV80zhh7URLuWhbi+JumyTp+4="; }; sourceRoot = "${src.name}/src-tauri"; - cargoHash = "sha256-CwB4S/5UuDH1LlJ4CY77XUCriplT3ZFfdg1j41AUoTI="; + cargoHash = "sha256-ved2W4+Dt7pN9j9vIaDlAkaY517nBEgPKgu8ArcHXsM="; postPatch = let @@ -58,27 +56,22 @@ rustPlatform.buildRustPackage rec { --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" ''; - postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - cargo tauri build --bundles app --target "${rust.envVars.rustHostPlatform}" - ''; - postInstall = - lib.optionalString stdenv.hostPlatform.isLinux '' - install -DT icons/128x128@2x.png $out/share/icons/hicolor/256x256@2/apps/cinny.png - install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/cinny.png - install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/cinny.png - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p "$out/Applications/" - cp -r "target/${rust.envVars.rustHostPlatform}/release/bundle/macos/Cinny.app" "$out/Applications/" + lib.optionalString stdenv.hostPlatform.isDarwin '' ln -sf "$out/Applications/Cinny.app/Contents/MacOS/Cinny" "$out/bin/cinny" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + desktop-file-edit \ + --set-comment "Yet another matrix client for desktop" \ + --set-key="Categories" --set-value="Network;InstantMessaging;" \ + $out/share/applications/cinny.desktop ''; nativeBuildInputs = [ - copyDesktopItems wrapGAppsHook3 pkg-config - cargo-tauri + cargo-tauri.hook + desktop-file-utils ]; buildInputs = @@ -97,20 +90,6 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.WebKit ]; - desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ - (makeDesktopItem { - name = "cinny"; - exec = "cinny"; - icon = "cinny"; - desktopName = "Cinny"; - comment = meta.description; - categories = [ - "Network" - "InstantMessaging" - ]; - }) - ]; - meta = { description = "Yet another matrix client for desktop"; homepage = "https://github.com/cinnyapp/cinny-desktop"; diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index 63f4d84649c6c..643b7017deb6a 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -14,20 +14,20 @@ buildNpmPackage rec { pname = "cinny-unwrapped"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-GC+TvTPfirov4GxkTp0N3tkDQEAEdmPB71NzOBZQiqs="; + hash = "sha256-+sJQosQMji2iLGgOMRykSJm0zIhghsOsROJZvTQk2zQ="; }; - npmDepsHash = "sha256-dP+m/ocGn8szZuakrz8slSReNeepOF4Jf7L0/gnXWGU="; + npmDepsHash = "sha256-VSTpe1CA6lv5MoqXyk1iZSwzRc6Axy5cM8PmqPOyheA="; # Fix error: no member named 'aligned_alloc' in the global namespace env.NIX_CFLAGS_COMPILE = lib.optionalString ( - stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0" + stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0" ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; nativeBuildInputs = [ @@ -39,7 +39,7 @@ buildNpmPackage rec { pixman cairo pango - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreText ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreText ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix new file mode 100644 index 0000000000000..a77ea92b6521c --- /dev/null +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, installShellFiles +}: + +buildGoModule rec { + pname = "cirrus-cli"; + version = "0.126.1"; + + src = fetchFromGitHub { + owner = "cirruslabs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-A894AUmsJjCCvN6cI2qoTPyOeQx6h2uukzxtlvWZVn8="; + }; + + vendorHash = "sha256-PecNBlSoo8WN2FKXN/UpkqpqbsJkOPHKILy76YWgNlw="; + + ldflags = [ + "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" + "-X github.com/cirruslabs/cirrus-cli/internal/version.Commit=v${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd cirrus \ + --bash <($out/bin/cirrus completion bash) \ + --zsh <($out/bin/cirrus completion zsh) \ + --fish <($out/bin/cirrus completion fish) + ''; + + # tests fail on read-only filesystem + doCheck = false; + + meta = with lib; { + description = "CLI for executing Cirrus tasks locally and in any CI"; + homepage = "https://github.com/cirruslabs/cirrus-cli"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ techknowlogick ]; + mainProgram = "cirrus"; + }; +} diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix index 620e7420439b2..a378940e55990 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix @@ -19,7 +19,7 @@ let dontUnpack = true; src = requireFile { name = "PacketTracer_${builtins.replaceStrings ["."] [""] version}_amd64.deb"; - sha256 = "c39802d15dd61d00ba27fb8c116da45fd8562ab4b49996555ad66b88deace27f"; + hash = "sha256-w5gC0V3WHQC6J/uMEW2kX9hWKrS0mZZVWtZriN6s4n8="; url = "https://www.netacad.com"; }; diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index f96db4760b683..d68c7628defe9 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.89"; + version = "1.1.91"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-hX/tmeQYcTDs3JZSFhvzCrcbqvfa78MXtTo8VcuAqxY="; + hash = "sha256-1RemtyaIyL5OqAfl+njL/DeFXPMUT5vghXwHOjmsgl0="; }; - vendorHash = "sha256-bwmJnKxdvVskrrTCa0cdpiYeFVZWTYyaFNEbeymT7P0="; + vendorHash = "sha256-dzhSfC864ievkbM0Mt6itlAzlk3211tQmpFrCYFR0s8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix index 4dce159eedd54..01a2c1bcfd5e0 100644 --- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix +++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix @@ -7,14 +7,14 @@ }: rustPlatform.buildRustPackage rec { pname = "clang-tidy-sarif"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit pname version; - hash = "sha256-pQbhLbDRcZJhXXY6bWGO/8mmQRwgM3tDEWKoqmsNr68="; + hash = "sha256-rZnGueaqK7h8tWwwWacvFBvJwE1li2wN9iB4DJRHJ8U="; }; - cargoHash = "sha256-K+Cle2eCH4jCLbYfOrlEXeBvFUr7dGmpKFQM1IJi7p4="; + cargoHash = "sha256-mELx6UGHV+qtL1G3+xvYUaUzZbfMy0dKgai6IqdbT+A="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix index ec1f034996193..bb8a4d98bdb7a 100644 --- a/pkgs/by-name/cl/clang-uml/package.nix +++ b/pkgs/by-name/cl/clang-uml/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "clang-uml"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "bkryza"; repo = "clang-uml"; rev = finalAttrs.version; - hash = "sha256-PEzTvwW/wUg8wgKjeNGbpgpP3SH2sVWRYc6o3gFjxx0="; + hash = "sha256-YzHlauVuFLT2PmfqJBNwqQ/P7d7tyl3brk7Vo/kTOF4="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { yaml-cpp ]; - cmakeFlags = if debug then [ "-DCMAKE_BUILD_TYPE=Debug" ] else [ ]; + cmakeBuildType = if debug then "Debug" else "Release"; clang = if enableLibcxx then llvmPackages.libcxxClang else llvmPackages.clang; diff --git a/pkgs/by-name/cl/clangbuildanalyzer/package.nix b/pkgs/by-name/cl/clangbuildanalyzer/package.nix index c5dc4f1b40641..5fa21806f2d4f 100644 --- a/pkgs/by-name/cl/clangbuildanalyzer/package.nix +++ b/pkgs/by-name/cl/clangbuildanalyzer/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "aras-p"; repo = "ClangBuildAnalyzer"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-kmgdk634zM0W0OoRoP/RzepArSipa5bNqdVgdZO9gxo="; + hash = "sha256-kmgdk634zM0W0OoRoP/RzepArSipa5bNqdVgdZO9gxo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/clash-nyanpasu/package.nix b/pkgs/by-name/cl/clash-nyanpasu/package.nix index 1c63f165bedd9..ec1d9bd16df97 100644 --- a/pkgs/by-name/cl/clash-nyanpasu/package.nix +++ b/pkgs/by-name/cl/clash-nyanpasu/package.nix @@ -6,11 +6,11 @@ }: appimageTools.wrapType2 rec { pname = "clash-nyanpasu"; - version = "1.5.1"; + version = "1.6.1"; src = fetchurl { url = "https://github.com/LibNyanpasu/clash-nyanpasu/releases/download/v${version}/clash-nyanpasu_${version}_amd64.AppImage"; - hash = "sha256-uUWs7yfSrqe/6kTb4iMA9ty6j/Wi9qGYX65VzTG5nkc="; + hash = "sha256-buxhsO/X4orChaMYA2JgceeybWRlryPqY1PlF+9KoNI="; }; extraInstallCommands = diff --git a/pkgs/by-name/cl/clash-verge-rev/Cargo-tauri.lock b/pkgs/by-name/cl/clash-verge-rev/Cargo-tauri.lock new file mode 100644 index 0000000000000..062fb642793d2 --- /dev/null +++ b/pkgs/by-name/cl/clash-verge-rev/Cargo-tauri.lock @@ -0,0 +1,7579 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom 0.2.15", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" +dependencies = [ + "memchr", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arboard" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +dependencies = [ + "clipboard-win", + "core-graphics 0.23.2", + "image 0.25.1", + "log 0.4.22", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot", + "windows-sys 0.48.0", + "wl-clipboard-rs", + "x11rb", +] + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener 5.3.0", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log 0.4.22", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.0", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-net" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" +dependencies = [ + "async-io 1.13.0", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-process" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +dependencies = [ + "async-channel 2.3.1", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.0", + "futures-lite 2.3.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "async-signal" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "atk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "auto-launch" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471" +dependencies = [ + "dirs 4.0.0", + "thiserror", + "winreg 0.10.1", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel 2.3.1", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "boa_ast" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b6fb81ca0f301f33aff7401e2ffab37dc9e0e4a1cf0ccf6b34f4d9e60aa0682" +dependencies = [ + "bitflags 2.6.0", + "boa_interner", + "boa_macros", + "indexmap 2.2.6", + "num-bigint", + "rustc-hash", +] + +[[package]] +name = "boa_engine" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "600e4e4a65b26efcef08a7b1cf2899d3845a32e82e067ee3b75eaf7e413ff31c" +dependencies = [ + "arrayvec", + "bitflags 2.6.0", + "boa_ast", + "boa_gc", + "boa_interner", + "boa_macros", + "boa_parser", + "boa_profiler", + "bytemuck", + "cfg-if", + "dashmap", + "fast-float", + "hashbrown 0.14.5", + "icu_normalizer", + "indexmap 2.2.6", + "intrusive-collections", + "itertools", + "num-bigint", + "num-integer", + "num-traits", + "num_enum 0.7.2", + "once_cell", + "paste", + "pollster", + "portable-atomic", + "rand 0.8.5", + "regress", + "rustc-hash", + "ryu-js", + "serde", + "serde_json", + "sptr", + "static_assertions", + "tap", + "thin-vec", + "thiserror", + "time", +] + +[[package]] +name = "boa_gc" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c055ef3cd87ea7db014779195bc90c6adfc35de4902e3b2fe587adecbd384578" +dependencies = [ + "boa_macros", + "boa_profiler", + "hashbrown 0.14.5", + "thin-vec", +] + +[[package]] +name = "boa_interner" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cacc9caf022d92195c827a3e5bf83f96089d4bfaff834b359ac7b6be46e9187" +dependencies = [ + "boa_gc", + "boa_macros", + "hashbrown 0.14.5", + "indexmap 2.2.6", + "once_cell", + "phf 0.11.2", + "rustc-hash", + "static_assertions", +] + +[[package]] +name = "boa_macros" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6be9c93793b60dac381af475b98634d4b451e28336e72218cad9a20176218dbc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure", +] + +[[package]] +name = "boa_parser" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8592556849f0619ed142ce2b3a19086769314a8d657f93a5765d06dbce4818" +dependencies = [ + "bitflags 2.6.0", + "boa_ast", + "boa_interner", + "boa_macros", + "boa_profiler", + "fast-float", + "icu_properties", + "num-bigint", + "num-traits", + "regress", + "rustc-hash", +] + +[[package]] +name = "boa_profiler" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0d8372f2d5cbac600a260de87877141b42da1e18d2c7a08ccb493a49cbd55c0" + +[[package]] +name = "brotli" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +dependencies = [ + "serde", +] + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "cargo_toml" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +dependencies = [ + "serde", + "toml 0.7.8", +] + +[[package]] +name = "cc" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] +name = "cfg-expr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "clash-verge" +version = "1.7.7" +dependencies = [ + "anyhow", + "auto-launch", + "boa_engine", + "chrono", + "deelevate", + "delay_timer", + "dirs 5.0.1", + "dunce", + "log 0.4.22", + "log4rs", + "nanoid", + "network-interface", + "once_cell", + "open 5.2.0", + "parking_lot", + "percent-encoding", + "port_scanner", + "reqwest 0.12.5", + "runas", + "serde", + "serde_json", + "serde_yaml", + "sysinfo", + "sysproxy", + "tauri", + "tauri-build", + "tokio", + "users", + "warp", + "window-shadows", + "winreg 0.52.0", +] + +[[package]] +name = "clipboard-win" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +dependencies = [ + "error-code", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concat-idents" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" +dependencies = [ + "quote", + "syn 2.0.68", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cron_clock" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8699d8ed16e3db689f8ae04d8dc3c6666a4ba7e724e5a157884b7cc385d16b" +dependencies = [ + "chrono", + "nom 7.1.3", + "once_cell", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.68", +] + +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn 2.0.68", +] + +[[package]] +name = "darling" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.68", +] + +[[package]] +name = "darling_macro" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "deelevate" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c7397f8c48906dd9b5afc75001368c979418e5dff5575998a831eb2319b424e" +dependencies = [ + "lazy_static 1.5.0", + "pathsearch", + "rand 0.8.5", + "shared_library", + "termwiz", + "winapi", +] + +[[package]] +name = "delay_timer" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20eba879b7ee5f1d255d5666e16646fe384f899f71a4c0b4b0644e2e074964fe" +dependencies = [ + "anyhow", + "async-trait", + "autocfg", + "concat-idents", + "cron_clock", + "dashmap", + "event-listener 5.3.0", + "futures", + "log 0.4.22", + "lru", + "once_cell", + "rs-snowflake", + "rustc_version 0.2.3", + "smol", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive-new" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version 0.4.0", + "syn 2.0.68", +] + +[[package]] +name = "destructure_traitobject" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.4", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "embed-resource" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +dependencies = [ + "cc", + "memchr", + "rustc_version 0.4.0", + "toml 0.8.14", + "vswhom", + "winreg 0.52.0", +] + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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 = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.0", + "pin-project-lite", +] + +[[package]] +name = "fast-float" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset 0.9.1", + "rustc_version 0.4.0", +] + +[[package]] +name = "filedescriptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e" +dependencies = [ + "libc", + "thiserror", + "winapi", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.2.2", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps 6.2.2", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps 6.2.2", + "x11", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log 0.4.22", + "rustversion", + "windows 0.48.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick 1.1.3", + "bstr", + "log 0.4.22", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +dependencies = [ + "atk", + "bitflags 1.3.2", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps 6.2.2", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +dependencies = [ + "anyhow", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "handlebars" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb04af2006ea09d985fef82b81e0eb25337e51b691c76403332378a53d521edc" +dependencies = [ + "lazy_static 0.2.11", + "log 0.3.9", + "pest 0.3.3", + "quick-error", + "regex 0.2.11", + "serde", + "serde_json", +] + +[[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" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "headers" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core", + "http 0.2.12", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http 0.2.12", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "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 = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log 0.4.22", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.11", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.11", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "pin-project-lite", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa 1.0.11", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "itoa 1.0.11", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.0", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper 0.14.29", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.4.0", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.4.0", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ico" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "ico" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "icu_collections" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "137d96353afc8544d437e8a99eceb10ab291352699573b0de5b08bda38c78c60" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" + +[[package]] +name = "icu_normalizer" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accb85c5b2e76f8dade22978b3795ae1e550198c6cfc7e915144e17cd6e2ab56" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3744fecc0df9ce19999cdaf1f9f3a48c253431ce1d67ef499128fe9d0b607ab" + +[[package]] +name = "icu_properties" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db9e559598096627aeca8cdfb98138a70eb4078025f8d1d5f2416a361241f756" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e70a8b51ee5dd4ff8f20ee9b1dd1bc07afc110886a3747b1fec04cc6e5a15815" + +[[package]] +name = "icu_provider" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.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 0.4.22", + "memchr", + "regex-automata 0.4.7", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", +] + +[[package]] +name = "image" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +dependencies = [ + "bytemuck", + "byteorder", + "num-traits", + "png", + "tiff", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "infer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a" +dependencies = [ + "cfb", +] + +[[package]] +name = "infer" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" +dependencies = [ + "cfb", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "interfaces" +version = "0.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec8f50a973916cac3da5057c986db05cd3346f38c78e9bc24f64cc9f6a3978f" +dependencies = [ + "bitflags 1.3.2", + "cc", + "handlebars", + "lazy_static 1.5.0", + "libc", + "nix 0.23.2", + "serde", + "serde_derive", +] + +[[package]] +name = "intrusive-collections" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b694dc9f70c3bda874626d2aed13b780f137aab435f4e9814121955cf706122e" +dependencies = [ + "memoffset 0.9.1", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "iptools" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c416c05ba2a10240e022887617af3128fccdbf69713214da0fc81a5690d00df7" +dependencies = [ + "ahash", + "once_cell", + "regex 1.10.5", +] + +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log 0.4.22", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "kuchikiki" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +dependencies = [ + "cssparser", + "html5ever", + "indexmap 1.9.3", + "matches", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libappindicator" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log 0.4.22", +] + +[[package]] +name = "libappindicator-sys" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" +dependencies = [ + "gtk-sys", + "libloading 0.7.4", + "once_cell", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + +[[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.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +dependencies = [ + "log 0.4.22", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "serde", +] + +[[package]] +name = "log-mdc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" + +[[package]] +name = "log4rs" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0816135ae15bd0391cf284eab37e6e3ee0a6ee63d2ceeb659862bd8d0a984ca6" +dependencies = [ + "anyhow", + "arc-swap", + "chrono", + "derivative", + "fnv", + "humantime", + "libc", + "log 0.4.22", + "log-mdc", + "once_cell", + "parking_lot", + "rand 0.8.5", + "serde", + "serde-value", + "serde_json", + "serde_yaml", + "thiserror", + "thread-id", + "typemap-ors", + "winapi", +] + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mac-notification-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log 0.4.22", + "phf 0.10.1", + "phf_codegen 0.10.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmem" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "minisign-verify" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "multer" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http 0.2.12", + "httparse", + "log 0.4.22", + "memchr", + "mime", + "spin", + "version_check", +] + +[[package]] +name = "nanoid" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" +dependencies = [ + "rand 0.8.5", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log 0.4.22", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum 0.5.11", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "network-interface" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433419f898328beca4f2c6c73a1b52540658d92b0a99f0269330457e0fd998d5" +dependencies = [ + "cc", + "libc", + "serde", + "thiserror", + "winapi", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.1.1", + "libc", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", + "memoffset 0.9.1", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "nom" +version = "5.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify-rust" +version = "4.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" +dependencies = [ + "log 0.4.22", + "mac-notification-sys", + "serde", + "tauri-winrt-notification", + "zbus", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", + "serde", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive 0.7.2", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "open" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +dependencies = [ + "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "open" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d2c909a3fce3bd80efef4cd1c6c056bd9376a8fe06fcfdbebaf32cb485a7e37" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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 = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "os_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 = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags 1.3.2", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.2", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "pathsearch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da983bc5e582ab17179c190b4b66c7d76c5943a69c6d34df2a2b6bf8a2977b05" +dependencies = [ + "anyhow", + "libc", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8" + +[[package]] +name = "pest" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap 2.2.6", +] + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plist" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" +dependencies = [ + "base64 0.22.1", + "indexmap 2.2.6", + "quick-xml 0.32.0", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log 0.4.22", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[package]] +name = "port_scanner" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "325a6d2ac5dee293c3b2612d4993b98aec1dff096b0a2dae70ed7d95784a05da" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +dependencies = [ + "memchr", +] + +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.15", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[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.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom 0.2.15", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" +dependencies = [ + "aho-corasick 0.6.10", + "memchr", + "regex-syntax 0.5.6", + "thread_local 0.3.6", + "utf8-ranges", +] + +[[package]] +name = "regex" +version = "1.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +dependencies = [ + "aho-corasick 1.1.3", + "memchr", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick 1.1.3", + "memchr", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-syntax" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" +dependencies = [ + "ucd-util", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "regress" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eae2a1ebfecc58aff952ef8ccd364329abe627762f5bf09ff42eb9d98522479" +dependencies = [ + "hashbrown 0.14.5", + "memchr", +] + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.29", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "log 0.4.22", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.4.0", + "hyper-rustls", + "hyper-tls 0.6.0", + "hyper-util", + "ipnet", + "js-sys", + "log 0.4.22", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg 0.52.0", +] + +[[package]] +name = "rfd" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +dependencies = [ + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "lazy_static 1.5.0", + "log 0.4.22", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.37.0", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.15", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rs-snowflake" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e60ef3b82994702bbe4e134d98aadca4b49ed04440148985678d415c68127666" + +[[package]] +name = "runas" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b96d6b6c505282b007a9b009f2aa38b2fd0359b81a0430ceacc60f69ade4c6a0" +dependencies = [ + "libc", + "security-framework-sys", + "which", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.23", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-webpki" +version = "0.102.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "ryu-js" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log 0.4.22", + "matches", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser 0.7.0", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser 0.10.2", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest 2.7.11", +] + +[[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-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + +[[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.68", +] + +[[package]] +name = "serde_json" +version = "1.0.120" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +dependencies = [ + "indexmap 2.2.6", + "itoa 1.0.11", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa 1.0.11", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.6", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.2.6", + "itoa 1.0.11", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static 1.5.0", +] + +[[package]] +name = "shared_child" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "shared_library" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11" +dependencies = [ + "lazy_static 1.5.0", + "libc", +] + +[[package]] +name = "signal-hook" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smol" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" +dependencies = [ + "async-channel 1.9.0", + "async-executor", + "async-fs 1.6.0", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-net", + "async-process 1.8.1", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "soup2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +dependencies = [ + "bitflags 1.3.2", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", +] + +[[package]] +name = "soup2-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags 1.3.2", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "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.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "sysinfo" +version = "0.30.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "windows 0.52.0", +] + +[[package]] +name = "sysproxy" +version = "0.3.0" +source = "git+https://github.com/zzzgydi/sysproxy-rs?branch=main#bd912f90ae7f20b75c9278795551c13a7ea4c271" +dependencies = [ + "interfaces", + "iptools", + "log 0.4.22", + "thiserror", + "windows 0.52.0", + "winreg 0.52.0", + "xdg", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" +dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml 0.5.11", + "version-compare 0.0.11", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr 0.15.8", + "heck 0.5.0", + "pkg-config", + "toml 0.8.14", + "version-compare 0.2.0", +] + +[[package]] +name = "tao" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "cc", + "cocoa 0.24.1", + "core-foundation", + "core-graphics 0.22.3", + "crossbeam-channel", + "dirs-next", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkwayland-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image 0.24.9", + "instant", + "jni", + "lazy_static 1.5.0", + "libappindicator", + "libc", + "log 0.4.22", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "tao-macros", + "unicode-segmentation", + "uuid", + "windows 0.39.0", + "windows-implement 0.39.0", + "x11-dl", +] + +[[package]] +name = "tao-macros" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "tauri" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "336bc661a3f3250853fa83c6e5245449ed1c26dce5dcb28bdee7efedf6278806" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytes", + "cocoa 0.24.1", + "dirs-next", + "dunce", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "getrandom 0.2.15", + "glib", + "glob", + "gtk", + "heck 0.5.0", + "http 0.2.12", + "ico 0.2.0", + "ignore", + "indexmap 1.9.3", + "infer 0.9.0", + "minisign-verify", + "nix 0.26.4", + "notify-rust", + "objc", + "once_cell", + "open 3.2.0", + "os_pipe", + "percent-encoding", + "png", + "rand 0.8.5", + "raw-window-handle", + "regex 1.10.5", + "reqwest 0.11.27", + "rfd", + "semver 1.0.23", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "shared_child", + "state", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "time", + "tokio", + "url", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "zip", +] + +[[package]] +name = "tauri-build" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c6ec7a5c3296330c7818478948b422967ce4649094696c985f61d50076d29c" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs-next", + "heck 0.5.0", + "json-patch", + "semver 1.0.23", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", + "walkdir", +] + +[[package]] +name = "tauri-codegen" +version = "1.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1aed706708ff1200ec12de9cfbf2582b5d8ec05f6a7293911091effbd22036b" +dependencies = [ + "base64 0.21.7", + "brotli", + "ico 0.3.0", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "regex 1.10.5", + "semver 1.0.23", + "serde", + "serde_json", + "sha2 0.10.8", + "tauri-utils", + "thiserror", + "time", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b88f831d2973ae4f81a706a0004e67dac87f2e4439973bbe98efbd73825d8ede" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 1.0.109", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-runtime" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3068ed62b63dedc705558f4248c7ecbd5561f0f8050949859ea0db2326f26012" +dependencies = [ + "gtk", + "http 0.2.12", + "http-range", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "url", + "uuid", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-runtime-wry" +version = "0.14.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c3db170233096aa30330feadcd895bf9317be97e624458560a20e814db7955" +dependencies = [ + "arboard", + "cocoa 0.24.1", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2826db448309d382dac14d520f0c0a40839b87b57b977e59cf5f296b3ace6a93" +dependencies = [ + "brotli", + "ctor", + "dunce", + "glob", + "heck 0.5.0", + "html5ever", + "infer 0.13.0", + "json-patch", + "kuchikiki", + "log 0.4.22", + "memchr", + "phf 0.11.2", + "proc-macro2", + "quote", + "semver 1.0.23", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows-version", +] + +[[package]] +name = "tauri-winres" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" +dependencies = [ + "embed-resource", + "toml 0.7.8", +] + +[[package]] +name = "tauri-winrt-notification" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" +dependencies = [ + "quick-xml 0.31.0", + "windows 0.56.0", + "windows-version", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "terminfo" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" +dependencies = [ + "dirs 4.0.0", + "fnv", + "nom 5.1.3", + "phf 0.11.2", + "phf_codegen 0.11.2", +] + +[[package]] +name = "termios" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" +dependencies = [ + "libc", +] + +[[package]] +name = "termwiz" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31ef6892cc0348a9b3b8c377addba91e0f6365863d92354bf27559dca81ee8c5" +dependencies = [ + "anyhow", + "base64 0.13.1", + "bitflags 1.3.2", + "cfg-if", + "filedescriptor", + "hex", + "lazy_static 1.5.0", + "libc", + "log 0.4.22", + "memmem", + "num-derive", + "num-traits", + "ordered-float", + "regex 1.10.5", + "semver 0.11.0", + "sha2 0.9.9", + "signal-hook", + "terminfo", + "termios", + "thiserror", + "ucd-trie", + "unicode-segmentation", + "vtparse", + "winapi", +] + +[[package]] +name = "thin-slice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" + +[[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.68", +] + +[[package]] +name = "thread-id" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "thread_local" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +dependencies = [ + "lazy_static 1.5.0", +] + +[[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 = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa 1.0.11", + "js-sys", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log 0.4.22", + "tokio", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.14", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log 0.4.22", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log 0.4.22", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex 1.10.5", + "sharded-slab", + "smallvec", + "thread_local 1.1.8", + "tracing", + "tracing-core", + "tracing-log", +] + +[[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 7.1.3", + "once_cell", + "petgraph", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log 0.4.22", + "rand 0.8.5", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typemap-ors" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867" +dependencies = [ + "unsafe-any-ors", +] + +[[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 = "ucd-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abd2fc5d32b590614af8b0a20d837f32eca055edd0bbead59a9cfe80858be003" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-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 = "unsafe-any-ors" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad" +dependencies = [ + "destructure_traitobject", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "users" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" +dependencies = [ + "libc", + "log 0.4.22", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8-ranges" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +dependencies = [ + "getrandom 0.2.15", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "vtparse" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9b2acfb050df409c972a37d3b8e08cdea3bddb0c09db9d53137e504cfabed0" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "warp" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "headers", + "http 0.2.12", + "hyper 0.14.29", + "log 0.4.22", + "mime", + "mime_guess", + "multer", + "percent-encoding", + "pin-project", + "scoped-tls", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-tungstenite", + "tokio-util", + "tower-service", + "tracing", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log 0.4.22", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.34", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982" +dependencies = [ + "bitflags 2.6.0", + "rustix 0.38.34", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6" +dependencies = [ + "proc-macro2", + "quick-xml 0.34.0", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7" +dependencies = [ + "dlib", + "log 0.4.22", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.2.2", +] + +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "webview2-com" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement 0.39.0", +] + +[[package]] +name = "webview2-com-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "webview2-com-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +dependencies = [ + "regex 1.10.5", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.34", +] + +[[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-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "window-shadows" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ff424735b1ac21293b0492b069394b0a189c8a463fb015a16dea7c2e221c08" +dependencies = [ + "cocoa 0.25.0", + "objc", + "raw-window-handle", + "windows-sys 0.48.0", +] + +[[package]] +name = "windows" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +dependencies = [ + "windows_aarch64_msvc 0.37.0", + "windows_i686_gnu 0.37.0", + "windows_i686_msvc 0.37.0", + "windows_x86_64_gnu 0.37.0", + "windows_x86_64_msvc 0.37.0", +] + +[[package]] +name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows-implement 0.39.0", + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core 0.56.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-bindgen" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" +dependencies = [ + "windows-metadata", + "windows-tokens", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement 0.56.0", + "windows-interface", + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" +dependencies = [ + "syn 1.0.109", + "windows-tokens", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-metadata" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-tokens" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + +[[package]] +name = "windows-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" + +[[package]] +name = "windows_i686_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" + +[[package]] +name = "windows_i686_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wl-clipboard-rs" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12b41773911497b18ca8553c3daaf8ec9fe9819caf93d451d3055f69de028adb" +dependencies = [ + "derive-new", + "libc", + "log 0.4.22", + "nix 0.28.0", + "os_pipe", + "tempfile", + "thiserror", + "tree_magic_mini", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", +] + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "wry" +version = "0.24.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45" +dependencies = [ + "base64 0.13.1", + "block", + "cocoa 0.24.1", + "core-graphics 0.22.3", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http 0.2.12", + "kuchikiki", + "libc", + "log 0.4.22", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2 0.10.8", + "soup2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement 0.39.0", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "gethostname", + "rustix 0.38.34", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys 0.4.14", + "rustix 0.38.34", +] + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xdg-home" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure", +] + +[[package]] +name = "zbus" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs 2.1.2", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-process 2.2.3", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.0", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.29.0", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] + +[[package]] +name = "zvariant" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 5474d36028665..86cb3cfe303ce 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -1,66 +1,137 @@ { lib, - autoPatchelfHook, - clash-meta, - dpkg, - fetchurl, - libayatana-appindicator, - nix-update-script, - openssl, + mihomo, + callPackage, + fetchFromGitHub, + dbip-country-lite, stdenv, - udev, - webkitgtk, wrapGAppsHook3, + v2ray-geoip, + v2ray-domain-list-community, + copyDesktopItems, + makeDesktopItem, }: - -stdenv.mkDerivation (finalAttrs: { +let pname = "clash-verge-rev"; - version = "1.7.5"; + version = "1.7.7"; - src = fetchurl { - url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${finalAttrs.version}/clash-verge_${finalAttrs.version}_amd64.deb"; - hash = "sha256-pVEP+A4W6xLShFXuXPA6P+HZT8Hqkj/HRW2LaOOBI6U="; + src = fetchFromGitHub { + owner = "clash-verge-rev"; + repo = "clash-verge-rev"; + rev = "v${version}"; + hash = "sha256-5sd0CkUCV52wrBPo0IRIa1uqf2QNkjXuZhE33cZW3SY="; }; - nativeBuildInputs = [ - dpkg - wrapGAppsHook3 - autoPatchelfHook - ]; + src-service = fetchFromGitHub { + owner = "clash-verge-rev"; + repo = "clash-verge-service"; + rev = "e74e419f004275cbf35a427337d3f8c771408f07"; # no meaningful tags in this repo. The only way is updating manully every time. + hash = "sha256-HyRTOqPj4SnV9gktqRegxOYz9c8mQHOX+IrdZlHhYpo="; + }; - buildInputs = [ - openssl - webkitgtk - ]; + meta-unwrapped = { + description = "Clash GUI based on tauri"; + homepage = "https://github.com/clash-verge-rev/clash-verge-rev"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + Guanran928 + bot-wxt1221 + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; - runtimeDependencies = [ - (lib.getLib udev) - libayatana-appindicator - ]; + service-cargo-hash = "sha256-NBeHR6JvdCp06Ug/UEtLY2tu3iCmlsCU0x8umRbJXLU="; - installPhase = '' - runHook preInstall + service = callPackage ./service.nix { + inherit + version + src-service + service-cargo-hash + pname + ; + meta = meta-unwrapped; + }; - mkdir -p $out/bin - mv usr/* $out + webui = callPackage ./webui.nix { + inherit + version + src + pname + ; + meta = meta-unwrapped; - runHook postInstall - ''; + }; - postFixup = '' - rm -f $out/bin/verge-mihomo - ln -sf ${lib.getExe clash-meta} $out/bin/verge-mihomo - ''; + sysproxy-hash = "sha256-TEC51s/viqXUoEH9rJev8LdC2uHqefInNcarxeogePk="; - passthru.updateScript = nix-update-script { }; + unwrapped = callPackage ./unwrapped.nix { + inherit + pname + version + src + sysproxy-hash + webui + ; + meta = meta-unwrapped; + }; meta = { description = "Clash GUI based on tauri"; homepage = "https://github.com/clash-verge-rev/clash-verge-rev"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Only; mainProgram = "clash-verge"; - maintainers = with lib.maintainers; [ Guanran928 ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ + Guanran928 + bot-wxt1221 + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; -}) +in +stdenv.mkDerivation { + inherit + pname + src + version + meta + ; + + nativeBuildInputs = [ + wrapGAppsHook3 + copyDesktopItems + ]; + + desktopItems = [ + (makeDesktopItem { + name = "clash-verge"; + exec = "clash-verge"; + comment = "Clash Verge Rev"; + type = "Application"; + icon = "clash-verge"; + desktopName = "Clash Verge Rev"; + terminal = false; + categories = [ "Network" ]; + }) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share,lib/clash-verge/resources} + cp -r ${unwrapped}/share/* $out/share + cp -r ${unwrapped}/bin/clash-verge $out/bin/clash-verge + # This can't be symbol linked. It will find mihomo in its runtime path + ln -s ${service}/bin/clash-verge-service $out/bin/clash-verge-service + ln -s ${mihomo}/bin/mihomo $out/bin/verge-mihomo + # people who want to use alpha build show override mihomo themselves. The alpha core entry was removed in clash-verge. + ln -s ${v2ray-geoip}/share/v2ray/geoip.dat $out/lib/clash-verge/resources/geoip.dat + ln -s ${v2ray-domain-list-community}/share/v2ray/geosite.dat $out/lib/clash-verge/resources/geosite.dat + ln -s ${dbip-country-lite.mmdb} $out/lib/clash-verge/resources/Country.mmdb + runHook postInstall + ''; +} diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix new file mode 100644 index 0000000000000..21baad40d3f73 --- /dev/null +++ b/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -0,0 +1,34 @@ +{ + version, + rustPlatform, + src-service, + pkg-config, + openssl, + pname, + webkitgtk, + service-cargo-hash, + meta, +}: +rustPlatform.buildRustPackage { + pname = "${pname}-service"; + inherit version meta; + + src = src-service; + sourceRoot = "${src-service.name}"; + + nativeBuildInputs = [ + pkg-config + rustPlatform.cargoSetupHook + ]; + + buildInputs = [ + openssl + webkitgtk + ]; + + env = { + OPENSSL_NO_VENDOR = 1; + }; + + cargoHash = service-cargo-hash; +} diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix new file mode 100644 index 0000000000000..64386c552dceb --- /dev/null +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -0,0 +1,68 @@ +{ + pname, + version, + src, + libayatana-appindicator, + sysproxy-hash, + webui, + pkg-config, + rustPlatform, + makeDesktopItem, + meta, + webkitgtk, + openssl, +}: +rustPlatform.buildRustPackage { + inherit version src meta; + pname = "${pname}-unwrapped"; + sourceRoot = "${src.name}/src-tauri"; + + cargoLock = { + lockFile = ./Cargo-tauri.lock; + outputHashes = { + "sysproxy-0.3.0" = sysproxy-hash; + }; + }; + + env = { + OPENSSL_NO_VENDOR = 1; + }; + + postPatch = '' + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + substituteInPlace ./tauri.conf.json \ + --replace-fail '"distDir": "../dist",' '"distDir": "${webui}",' \ + --replace-fail '"beforeBuildCommand": "pnpm run web:build"' '"beforeBuildCommand": ""' + sed -i -e '/externalBin/d' -e '/resources/d' tauri.conf.json + ''; + + nativeBuildInputs = [ + pkg-config + rustPlatform.cargoSetupHook + ]; + + buildInputs = [ + openssl + webkitgtk + ]; + + postInstall = '' + install -DT icons/128x128@2x.png $out/share/icons/hicolor/128x128@2/apps/clash-verge.png + install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/clash-verge.png + install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/clash-verge.png + ''; + + desktopItems = [ + (makeDesktopItem { + name = "clash-verge-rev"; + exec = "clash-verge %u"; + icon = "clash-verge-rev"; + desktopName = "Clash Verge Rev"; + genericName = meta.description; + mimeTypes = [ "x-scheme-handler/clash" ]; + type = "Application"; + terminal = false; + }) + ]; +} diff --git a/pkgs/by-name/cl/clash-verge-rev/webui.nix b/pkgs/by-name/cl/clash-verge-rev/webui.nix new file mode 100644 index 0000000000000..c35dca01a34c6 --- /dev/null +++ b/pkgs/by-name/cl/clash-verge-rev/webui.nix @@ -0,0 +1,44 @@ +{ + version, + src, + pname, + pnpm, + nodejs, + stdenv, + meta, +}: +stdenv.mkDerivation { + inherit version src meta; + pname = "${pname}-webui"; + pnpmDeps = pnpm.fetchDeps { + inherit pname version src; + hash = "sha256-DYsx1X1yXYEPFuMlvZtbJdefcCR8/wSUidFwsMy8oLk="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + postPatch = '' + chmod -R +644 -- ./src/components/setting/mods/clash-core-viewer.tsx + chmod -R +644 -- ./src/components/setting/mods + sed -i -e '/Mihomo Alpha/d' ./src/components/setting/mods/clash-core-viewer.tsx + ''; + + buildPhase = '' + runHook preBuild + + node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist $out + + runHook postInstall + ''; +} diff --git a/pkgs/by-name/cl/clash-verge/package.nix b/pkgs/by-name/cl/clash-verge/package.nix deleted file mode 100644 index 9d9aca7cb1fc8..0000000000000 --- a/pkgs/by-name/cl/clash-verge/package.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchurl -, dpkg -, wrapGAppsHook3 -, autoPatchelfHook -, clash-meta -, openssl -, webkitgtk -, udev -, libayatana-appindicator -, nix-update-script -}: - -stdenv.mkDerivation rec { - pname = "clash-verge"; - version = "1.3.8"; - - src = fetchurl { - url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-kOju4yaa+EKzFWDrk0iSJVoWkQMBjQG3hKLfAsqlsy8="; - }; - - nativeBuildInputs = [ - dpkg - wrapGAppsHook3 - autoPatchelfHook - ]; - - buildInputs = [ - openssl - webkitgtk - stdenv.cc.cc - ]; - - runtimeDependencies = [ - (lib.getLib udev) - libayatana-appindicator - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - mv usr/* $out - - runHook postInstall - ''; - - postFixup = '' - rm -f $out/bin/clash - ln -sf ${lib.getExe clash-meta} $out/bin/${clash-meta.meta.mainProgram} - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Clash GUI based on tauri"; - homepage = "https://github.com/zzzgydi/clash-verge"; - platforms = [ "x86_64-linux" ]; - license = licenses.gpl3Plus; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ zendo ]; - mainProgram = "clash-verge"; - }; -} diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 228b3e608a6e2..ddea9886a8887 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -1,15 +1,16 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, nodejs_18 -, installShellFiles -, stdenv +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs_18, + installShellFiles, + stdenv, }: buildNpmPackage rec { pname = "clever-tools"; - version = "3.8.2"; + version = "3.8.3"; nodejs = nodejs_18; @@ -17,23 +18,27 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-cBFdxJrH/1l6YpvdJTeLQf1zl6pm3IbPryimtewh9fc="; + hash = "sha256-70wyu8+Jb9kR5lIucBZG9UWIufMhsgMBMkT2ohGvE50="; }; - npmDepsHash = "sha256-cY7wB0IQPLHOOuOLunjeJASp1Ba7ri8cj05/2HveJ7A="; + npmDepsHash = "sha256-LljwS6Rd/8WnGpxSHwCr87KWLaRR2i7sMdUuuprYiOE="; dontNpmBuild = true; nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd clever \ - --bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \ - --zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever) - '' + '' - rm $out/bin/install-clever-completion - rm $out/bin/uninstall-clever-completion - ''; + makeWrapperArgs = [ "--set NO_UPDATE_NOTIFIER true" ]; + + postInstall = + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd clever \ + --bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \ + --zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever) + '' + + '' + rm $out/bin/install-clever-completion + rm $out/bin/uninstall-clever-completion + ''; meta = with lib; { homepage = "https://github.com/CleverCloud/clever-tools"; diff --git a/pkgs/by-name/cl/cli11/package.nix b/pkgs/by-name/cl/cli11/package.nix index 0e7146d8d7ce9..596178f81dc24 100644 --- a/pkgs/by-name/cl/cli11/package.nix +++ b/pkgs/by-name/cl/cli11/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "CLIUtils"; repo = "CLI11"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-x3/kBlf5LdzkTO4NYOKanZBfcU4oK+fJw9L7cf88LsY="; + hash = "sha256-x3/kBlf5LdzkTO4NYOKanZBfcU4oK+fJw9L7cf88LsY="; }; buildInputs = [ catch2 ]; diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix index 53ef6c2dd4b0a..0437aae99580d 100644 --- a/pkgs/by-name/cl/clickable/package.nix +++ b/pkgs/by-name/cl/clickable/package.nix @@ -67,7 +67,7 @@ python3Packages.buildPythonApplication rec { ++ # There are no docker images available for the aarch64 architecutre # which are required for tests. - lib.optionals stdenv.isAarch64 [ + lib.optionals stdenv.hostPlatform.isAarch64 [ "test_arch" "test_restricted_arch" ]; diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index 6c5bd77c89db5..b5d22c8b5081e 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-z2t7kq2ogMHJGF7xQnzc11B42gUZFTVokVkbw35CeY0="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/cl/clipper2/package.nix b/pkgs/by-name/cl/clipper2/package.nix index cbcee8a3aa9a5..37ec396779396 100644 --- a/pkgs/by-name/cl/clipper2/package.nix +++ b/pkgs/by-name/cl/clipper2/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "AngusJohnson"; repo = "Clipper2"; rev = "Clipper2_${version}"; - sha256 = "sha256-ASL9uKkXsWyIbD1qaKEL7gf/JuCqzZQZSKHwLT5dKJU="; + hash = "sha256-ASL9uKkXsWyIbD1qaKEL7gf/JuCqzZQZSKHwLT5dKJU="; }; sourceRoot = "${src.name}/CPP"; diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix index 063493ea35f3e..199e6603866a7 100644 --- a/pkgs/by-name/cl/clippy-sarif/package.nix +++ b/pkgs/by-name/cl/clippy-sarif/package.nix @@ -8,14 +8,14 @@ }: rustPlatform.buildRustPackage rec { pname = "clippy-sarif"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit pname version; - hash = "sha256-vwHb622JIJr+iRx/MhWdXoRULnKqtxx6HB4rv9zpYA8="; + hash = "sha256-GoVUOtxgLKEG+G1vgmFqtm0b2NRl4bhIe7DVo1tOqaw="; }; - cargoHash = "sha256-bRB6DedlvFsHcjTJQiGn///M9YOp1rl9FxXQlzuI0vo="; + cargoHash = "sha256-DZdU1QyIvzHm9UekqA2nZUKSRcgn7pKQFhPkPcAVFPY="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix index 074587dd72212..cc200b0c6b514 100644 --- a/pkgs/by-name/cl/clipse/package.nix +++ b/pkgs/by-name/cl/clipse/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "clipse"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "savedra1"; repo = "clipse"; rev = "v${version}"; - hash = "sha256-Kpe/LiAreZXRqh6BHvUIn0GcHloKo3A0WOdlRF2ygdc="; + hash = "sha256-yUkHT7SZT7Eudvk1n43V+WGWqUKtXaV+p4ySMK/XzQw="; }; - vendorHash = "sha256-Hdr9NRqHJxpfrV2G1KuHGg3T+cPLKhZXEW02f1ptgsw="; + vendorHash = "sha256-+9uoB/1g4qucdM8RJRs+fSc5hpcgaCK0GrUOFgHWeKo="; meta = { description = "Useful clipboard manager TUI for Unix"; diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix index 9fe3570714399..2005215f8fc42 100644 --- a/pkgs/by-name/cl/cljfmt/package.nix +++ b/pkgs/by-name/cl/cljfmt/package.nix @@ -8,11 +8,11 @@ buildGraalvmNativeImage rec { pname = "cljfmt"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { url = "https://github.com/weavejester/cljfmt/releases/download/${version}/cljfmt-${version}-standalone.jar"; - sha256 = "sha256-JdrMsRmTT8U8RZDI2SnQxM5WGMpo1pL2CQ5BqLxcf5M="; + hash = "sha256-gPIDaFb8mmJyoAIOUWV7ZNNi/rSnuRkYN16Grqly0/c="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix new file mode 100644 index 0000000000000..7d9397caf65f7 --- /dev/null +++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildGoModule, + cloudflare-dynamic-dns, + fetchFromGitHub, + testers, +}: +buildGoModule rec { + pname = "cloudflare-dynamic-dns"; + version = "4.3.5"; + + src = fetchFromGitHub { + owner = "zebradil"; + repo = "cloudflare-dynamic-dns"; + rev = "refs/tags/${version}"; + hash = "sha256-9WJeWWgI96+LjMFl7TkDc7udsLvi54eAN3Y9iv2e+F4="; + }; + + vendorHash = "sha256-KtTZcFYzJOH2qwoeHYfksXN7sDVV9ERCFVrrqzdh3M0="; + + subPackages = "."; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + "-X=main.commit=nixpkg-${version}" + "-X=main.date=1970-01-01" + ]; + + CGO_ENABLED = 0; + + passthru.tests.version = testers.testVersion { package = cloudflare-dynamic-dns; }; + + meta = with lib; { + changelog = "https://github.com/Zebradil/cloudflare-dynamic-dns/blob/${version}/CHANGELOG.md"; + description = "Dynamic DNS client for Cloudflare"; + homepage = "https://github.com/Zebradil/cloudflare-dynamic-dns"; + license = licenses.mit; + mainProgram = "cloudflare-dynamic-dns"; + maintainers = [ maintainers.zebradil ]; + }; +} diff --git a/pkgs/by-name/cl/cloudflare-utils/package.nix b/pkgs/by-name/cl/cloudflare-utils/package.nix index 44e3688e69fa3..d57b772b7cb11 100644 --- a/pkgs/by-name/cl/cloudflare-utils/package.nix +++ b/pkgs/by-name/cl/cloudflare-utils/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { owner = "Cyb3r-Jak3"; repo = "cloudflare-utils"; rev = "v${version}"; - sha256 = "sha256-hmMWMV8hJblXn0aW+S/VpFu9xYdh8k1H1Oa2x5DYMY4="; + hash = "sha256-hmMWMV8hJblXn0aW+S/VpFu9xYdh8k1H1Oa2x5DYMY4="; }; vendorHash = "sha256-c1fUMX7pSiElSWSMBIzoNIEGcnCck9eUGPYXzb2Rv3w="; diff --git a/pkgs/by-name/cl/cloudlens/package.nix b/pkgs/by-name/cl/cloudlens/package.nix index 9fbda04667498..677b9acf00519 100644 --- a/pkgs/by-name/cl/cloudlens/package.nix +++ b/pkgs/by-name/cl/cloudlens/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoPatchelfHook , xclip -, +, stdenv }: buildGoModule rec { @@ -27,7 +27,7 @@ buildGoModule rec { "-X=github.com/one2nc/cloudlens/cmd.date=1970-01-01T00:00:00Z" ]; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = [ xclip ]; diff --git a/pkgs/by-name/cl/cloudlogoffline/package.nix b/pkgs/by-name/cl/cloudlogoffline/package.nix index 04e6f0ed2c32a..027e91d5eb3a2 100644 --- a/pkgs/by-name/cl/cloudlogoffline/package.nix +++ b/pkgs/by-name/cl/cloudlogoffline/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (self: { qt6.qmake qt6.wrapQtAppsHook ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ]; @@ -33,16 +33,16 @@ stdenv.mkDerivation (self: { ]; postPatch = let - targetDir = if stdenv.isDarwin then "Applications" else "bin"; + targetDir = if stdenv.hostPlatform.isDarwin then "Applications" else "bin"; in '' substituteInPlace CloudLogOffline.pro \ --replace 'target.path = /opt/$''${TARGET}/bin' "target.path = $out/${targetDir}" ''; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -d $out/share/pixmaps install -m644 images/logo_circle.svg $out/share/pixmaps/cloudlogoffline.svg - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # FIXME: For some reason, the Info.plist isn't copied correctly to # the application bundle when building normally, instead creating an # empty file. This doesn't happen when building in a dev shell with @@ -53,7 +53,7 @@ stdenv.mkDerivation (self: { install -m644 macos/Info.plist $out/Applications/CloudLogOffline.app/Contents/Info.plist ''; - desktopItems = lib.optionals (!stdenv.isDarwin) [ + desktopItems = lib.optionals (!stdenv.hostPlatform.isDarwin) [ (makeDesktopItem { name = "cloudlogoffline"; desktopName = "CloudLogOffline"; diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index ca0f1789a1107..82563e56c2b02 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -25,7 +25,7 @@ isBootstrap else false) , useOpenSSL ? !isMinimalBuild -, useSharedLibraries ? (!isMinimalBuild && !stdenv.isCygwin) +, useSharedLibraries ? (!isMinimalBuild && !stdenv.hostPlatform.isCygwin) , uiToolkits ? [] # can contain "ncurses" and/or "qt5" , buildDocs ? !(isMinimalBuild || (uiToolkits == [])) , darwin @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./003-libuv-application-services.diff ] - ++ lib.optional stdenv.isCygwin ./004-cygwin.diff + ++ lib.optional stdenv.hostPlatform.isCygwin ./004-cygwin.diff # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 - ++ lib.optional (stdenv.isDarwin && isMinimalBuild) ./005-remove-systemconfiguration-dep.diff + ++ lib.optional (stdenv.hostPlatform.isDarwin && isMinimalBuild) ./005-remove-systemconfiguration-dep.diff # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. - ++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff + ++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff # On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path. - ++ lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) ( + ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) ( substituteAll { src = ./007-darwin-bsd-ps-abspath.diff; ps = lib.getExe ps; @@ -108,8 +108,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional useOpenSSL openssl ++ lib.optional cursesUI ncurses ++ lib.optional qt5UI qtbase - ++ lib.optional stdenv.isDarwin CoreServices - ++ lib.optional (stdenv.isDarwin && !isMinimalBuild) SystemConfiguration; + ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices + ++ lib.optional (stdenv.hostPlatform.isDarwin && !isMinimalBuild) SystemConfiguration; preConfigure = '' fixCmakeFiles . @@ -207,6 +207,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ ttuegel lnl7 AndersonTorres ]; platforms = lib.platforms.all; mainProgram = "cmake"; - broken = (qt5UI && stdenv.isDarwin); + broken = (qt5UI && stdenv.hostPlatform.isDarwin); }; }) diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/by-name/cm/cmatrix/package.nix similarity index 100% rename from pkgs/applications/misc/cmatrix/default.nix rename to pkgs/by-name/cm/cmatrix/package.nix diff --git a/pkgs/by-name/cm/cmd-wrapped/package.nix b/pkgs/by-name/cm/cmd-wrapped/package.nix index ac65ea65afa96..f98ba3bee930b 100644 --- a/pkgs/by-name/cm/cmd-wrapped/package.nix +++ b/pkgs/by-name/cm/cmd-wrapped/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cmd-wrapped"; - version = "0.2.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "YiNNx"; repo = "cmd-wrapped"; - rev = version; - hash = "sha256-YWX4T3EiBIbEG/NGShuHRyxfdVGrqQH6J42EDkRblNQ="; + rev = "v${version}"; + hash = "sha256-tIvwJo33Jz9cPq6o4Ytc3VqkxEaxt0W9Fd8CNp+7vAE="; }; - cargoHash = "sha256-CM2IpWs1vGiXHvQNgHyD6cUgMYSkp5+23j+YyF9G9IE="; + cargoHash = "sha256-pAlAWG9Dfqhhvl7uVvzr4nx481seIwwzBg+5SSsje84="; meta = with lib; { description = "Find out what the past year looks like in commandline"; diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix index 24b3193089196..75efd4e0727c0 100644 --- a/pkgs/by-name/cn/cntb/package.nix +++ b/pkgs/by-name/cn/cntb/package.nix @@ -3,18 +3,30 @@ , fetchFromGitHub }: buildGoModule rec { pname = "cntb"; - version = "1.4.8"; + version = "1.4.12"; src = fetchFromGitHub { owner = "contabo"; repo = "cntb"; - rev = version; - hash = "sha256-Cj1PO82JeztThFAHR4/8UyqKrodgxBqVDMDsun3iGDo="; + rev = "v${version}"; + hash = "sha256-5JOO9tWMjy81wSB9Vq/gBYZ0xfrhES0dm/cTqXP8HiI"; + # 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 + postFetch = '' + rm -rf $out/openapi/docs + ''; }; subPackages = [ "." ]; - vendorHash = "sha256-4PhLUUtlnRh2dKkeVD7rZDDVP0eTDVAohvLLftQxQyE="; + vendorHash = "sha256-IBDVHQe6OOGQ27G7uXKRtavy4tnCvIbL07j969/E9Vg="; + + ldflags = [ + "-X contabo.com/cli/cntb/cmd.version=${src.rev}" + "-X contabo.com/cli/cntb/cmd.commit=${src.rev}" + "-X contabo.com/cli/cntb/cmd.date=1970-01-01T00:00:00Z" + ]; meta = with lib; { description = "CLI tool for managing your products from Contabo like VPS and VDS"; diff --git a/pkgs/development/tools/cobra-cli/default.nix b/pkgs/by-name/co/cobra-cli/package.nix similarity index 100% rename from pkgs/development/tools/cobra-cli/default.nix rename to pkgs/by-name/co/cobra-cli/package.nix diff --git a/pkgs/by-name/co/coc-clangd/package.nix b/pkgs/by-name/co/coc-clangd/package.nix new file mode 100644 index 0000000000000..032df2f18d7ef --- /dev/null +++ b/pkgs/by-name/co/coc-clangd/package.nix @@ -0,0 +1,27 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage { + pname = "coc-clangd"; + version = "0.31.0"; + + src = fetchFromGitHub { + owner = "clangd"; + repo = "coc-clangd"; + # Upstream has no tagged versions + rev = "3a85a36f1ac08454deab1ed8d2553e0cae00cc1c"; + hash = "sha256-uxK0nciLq4ZKFCoMJrO4dR0tuOBHYpgdZUc/KJ+JA/I="; + }; + + npmDepsHash = "sha256-93MEug2eEL/Hum+RFmXx0JYO6jUygF8QRmL5nTTFyrs="; + + meta = { + description = "clangd extension for coc.nvim"; + homepage = "https://github.com/clangd/coc-clangd"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/by-name/co/coc-pyright/package.nix b/pkgs/by-name/co/coc-pyright/package.nix new file mode 100644 index 0000000000000..34bcf59b756dd --- /dev/null +++ b/pkgs/by-name/co/coc-pyright/package.nix @@ -0,0 +1,27 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage { + pname = "coc-pyright"; + version = "1.1.371"; + + src = fetchFromGitHub { + owner = "fannheyward"; + repo = "coc-pyright"; + # No tagged releases, this commit corresponds to the latest release of the package. + rev = "d4cfda2f530622962a2a6e3ac1ddb2ad83ea2387"; + hash = "sha256-oNixIW63DhPn2LYJ5t/R4xcReZR3W6nqqFBnCUmo/Wo="; + }; + + npmDepsHash = "sha256-cTAt02RdQbKurP6H/JWwVp+VpoIysbFt9le9R69+DL4="; + + meta = { + description = "Pyright extension for coc.nvim"; + homepage = "https://github.com/fannheyward/coc-pyright"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix new file mode 100644 index 0000000000000..41cb3aaec1b15 --- /dev/null +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenvNoCC, + fetchurl, + appimageTools, + makeWrapper, + writeScript, +}: +let + pname = "cursor"; + version = "0.41.3"; + appKey = "230313mzl4w4u92"; + src = fetchurl { + url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.41.3-build-240925fkhcqg263-x86_64.AppImage"; + hash = "sha256-WtfyiNGnUn8g1HR0TQPyn3SMJmjqe+otAYeyokMIO+w="; + }; + appimageContents = appimageTools.extractType2 { inherit version pname src; }; +in +stdenvNoCC.mkDerivation { + inherit pname version; + + src = appimageTools.wrapType2 { inherit version pname src; }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/ + cp -r bin $out/bin + + mkdir -p $out/share/cursor + cp -a ${appimageContents}/locales $out/share/cursor + cp -a ${appimageContents}/resources $out/share/cursor + cp -a ${appimageContents}/usr/share/icons $out/share/ + install -Dm 644 ${appimageContents}/cursor.desktop -t $out/share/applications/ + + substituteInPlace $out/share/applications/cursor.desktop --replace-fail "AppRun" "cursor" + + wrapProgram $out/bin/cursor \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} --no-update" + + runHook postInstall + ''; + + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl yq coreutils gnused common-updater-scripts + set -eu -o pipefail + latestLinux="$(curl -s https://download.todesktop.com/${appKey}/latest-linux.yml)" + version="$(echo "$latestLinux" | yq -r .version)" + filename="$(echo "$latestLinux" | yq -r '.files[] | .url | select(. | endswith(".AppImage"))')" + url="https://download.todesktop.com/${appKey}/$filename" + currentVersion=$(nix-instantiate --eval -E "with import ./. {}; code-cursor.version or (lib.getVersion code-cursor)" | tr -d '"') + + if [[ "$version" != "$currentVersion" ]]; then + hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$url")") + update-source-version code-cursor "$version" "$hash" "$url" --source-key=src.src + fi + ''; + + meta = { + description = "AI-powered code editor built on vscode"; + homepage = "https://cursor.com"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ sarahec ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "cursor"; + }; +} diff --git a/pkgs/by-name/co/code2prompt/package.nix b/pkgs/by-name/co/code2prompt/package.nix index f951b2b1e294b..03c5e6e7b0a81 100644 --- a/pkgs/by-name/co/code2prompt/package.nix +++ b/pkgs/by-name/co/code2prompt/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index 825731d4d1b48..2d89eaed91898 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( let d = darwin.apple_sdk.frameworks; in diff --git a/pkgs/by-name/co/codefresh/package.nix b/pkgs/by-name/co/codefresh/package.nix index 36792f48dfaa3..fc6829cba2c39 100644 --- a/pkgs/by-name/co/codefresh/package.nix +++ b/pkgs/by-name/co/codefresh/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchYarnDeps, yarnConfigHook, npmHooks, nodejs, testers }: +{ lib, stdenv, fetchFromGitHub, fetchYarnDeps, yarnConfigHook, yarnInstallHook, nodejs, testers }: stdenv.mkDerivation (finalAttrs: { pname = "codefresh"; @@ -17,11 +17,9 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ yarnConfigHook - npmHooks.npmInstallHook + yarnInstallHook nodejs ]; - # Tries to fetch stuff from the internet - dontNpmPrune = true; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 15b5c98bd0853..bd3e146088954 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-MQYUSUbQ0YjJjURpX/fguUbXJdcs16z/eYHXUzzMQ14="; - aarch64-linux = "sha256-SQoxk70ZTBsK+KKaCF2M/5de7+L2Ycgryr4yZEfK6N8="; - x86_64-darwin = "sha256-Tl70grYgR/yF1giGOdzvsii2GQ2/pGdUT+TAMslixzw="; - aarch64-darwin = "sha256-VJwfskMUMpGk3n52KMvBa01EKUcZsvsd0yt7nGon6yw="; + x86_64-linux = "sha256-/m+t4abPgVWeGpfDkPm5DGCIXm1LoM5znHfES9lotAo="; + aarch64-linux = "sha256-0kR799yuxSFmyedJ14f5/EqOiFHs9cWjeJKvDIpIRl0="; + x86_64-darwin = "sha256-7Go5qZVAe2UHn547HZG4fmh84iF2r15+0IIlJK72Fqg="; + aarch64-darwin = "sha256-fe4GrgLRr66Qmme3p0X5BEwvKZhqG1aiE8xs5A1Dt6E="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,14 +24,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.14.11"; + version = "1.16.18"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; inherit hash; }; - nativeBuildInputs = [ gzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = [ gzip ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dontUnpack = true; dontConfigure = true; diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix index fb56f3e865735..36054e7dc86f6 100644 --- a/pkgs/by-name/co/codux/package.nix +++ b/pkgs/by-name/co/codux/package.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.33.0"; + version = "15.34.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-Fdy/Ovx8VCBe+pO/87VHVEnafJ9Ms8Pop0DOLYOHuQY="; + hash = "sha256-/e5tz3/XD/aaxLc/SUrTmWWfqI2Gw/xBTTTSmv5uZEQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/co/coinmp/package.nix b/pkgs/by-name/co/coinmp/package.nix index 8c15c5ca62c34..5aff27ceb93d4 100644 --- a/pkgs/by-name/co/coinmp/package.nix +++ b/pkgs/by-name/co/coinmp/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.coin-or.org/download/source/CoinMP/CoinMP-${finalAttrs.version}.tgz"; - sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l"; + hash = "sha256-NFn7DMvdOTQnRGhDOJhKxMwVP7BDT0yujPdL1nSQo40="; }; patches = [ diff --git a/pkgs/by-name/co/collabora-online/fix-file-server-regex.patch b/pkgs/by-name/co/collabora-online/fix-file-server-regex.patch new file mode 100644 index 0000000000000..31cda69bbf0bc --- /dev/null +++ b/pkgs/by-name/co/collabora-online/fix-file-server-regex.patch @@ -0,0 +1,15 @@ +In the nix build, COOLWSD_VERSION_HASH becomes the same as COOLWSD_VERSION, e.g. +`24.04.3.5`. The web server that serves files from +`/browser/$COOLWSD_VERSION_HASH`, doesn't expect the hash to contain dots. + +--- a/wsd/FileServer.cpp ++++ b/wsd/FileServer.cpp +@@ -933,7 +933,7 @@ std::string FileServerRequestHandler::getRequestPathname(const HTTPRequest& requ + + std::string path(requestUri.getPath()); + +- Poco::RegularExpression gitHashRe("/([0-9a-f]+)/"); ++ Poco::RegularExpression gitHashRe("/([0-9a-f.]+)/"); + std::string gitHash; + if (gitHashRe.extract(path, gitHash)) + { diff --git a/pkgs/by-name/co/collabora-online/package-lock.json b/pkgs/by-name/co/collabora-online/package-lock.json new file mode 100644 index 0000000000000..bdf1910fbfd4c --- /dev/null +++ b/pkgs/by-name/co/collabora-online/package-lock.json @@ -0,0 +1,9897 @@ +{ + "name": "cool", + "version": "0.8.0-dev", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "cool", + "version": "0.8.0-dev", + "license": "BSD-2-Clause", + "dependencies": { + "jsdom": "^16.4.0" + }, + "devDependencies": { + "@braintree/sanitize-url": "6.0.2", + "@types/jquery": "^3.5.29", + "@types/jquery.contextmenu": "^1.7.38", + "@types/jqueryui": "^1.12.21", + "@types/mocha": "8.2.0", + "@types/node": "14.14.25", + "@types/offscreencanvas": "^2019.7.3", + "@types/w2ui": "^1.4.37", + "@typescript-eslint/eslint-plugin": "^4.21.0", + "@typescript-eslint/parser": "^4.21.0", + "autolinker": "3.14.1", + "browserify": "16.5.1", + "browserify-css": "0.15.0", + "canvas": "^2.6.1", + "d3": "6.7.0", + "eslint": "7.0.0", + "eslint-config-prettier": "^9.1.0", + "fzstd": "0.1.0", + "hammerjs": "2.0.8", + "jquery": "3.5.1", + "jquery-contextmenu": "2.9.2", + "jquery-mousewheel": "3.1.13", + "jquery-ui": "1.13.2", + "jscpd": "3.5.10", + "l10n-for-node": "0.0.1", + "mocha": "8.2.1", + "prettier": "^3.1.1", + "select2": "4.0.13", + "shrinkpack": "1.0.0-alpha", + "smartmenus": "1.0.0", + "stylelint": "13.7.0", + "typescript": "4.4.2", + "uglify-js": "3.17.4", + "uglifycss": "0.0.29", + "uglifyify": "5.0.2" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.25.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz", + "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", + "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.25.0", + "@babel/helper-compilation-targets": "^7.25.2", + "@babel/helper-module-transforms": "^7.25.2", + "@babel/helpers": "^7.25.0", + "@babel/parser": "^7.25.0", + "@babel/template": "^7.25.0", + "@babel/traverse": "^7.25.2", + "@babel/types": "^7.25.2", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/core/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/generator": { + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", + "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.25.6", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", + "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.25.2", + "@babel/helper-validator-option": "^7.24.8", + "browserslist": "^4.23.1", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", + "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", + "dev": true, + "dependencies": { + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", + "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", + "dev": true, + "dependencies": { + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-simple-access": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7", + "@babel/traverse": "^7.25.2" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", + "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", + "dev": true, + "dependencies": { + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", + "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", + "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", + "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", + "dev": true, + "dependencies": { + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.24.7", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/parser": { + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", + "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", + "dev": true, + "dependencies": { + "@babel/types": "^7.25.6" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/template": { + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", + "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.25.0", + "@babel/types": "^7.25.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", + "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.25.6", + "@babel/parser": "^7.25.6", + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.6", + "debug": "^4.3.1", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/types": { + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", + "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.24.8", + "@babel/helper-validator-identifier": "^7.24.7", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@braintree/sanitize-url": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.2.tgz", + "integrity": "sha512-Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg==", + "dev": true + }, + "node_modules/@colors/colors": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", + "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/@iarna/cli": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@iarna/cli/-/cli-2.1.0.tgz", + "integrity": "sha512-rvVVqDa2g860niRbqs3D5RhL4la3dc1vwk+NlpKPZxKaMSHtE2se6C2x8NeveN+rcjp3/686X+u+09CZ+7lmAQ==", + "dev": true, + "dependencies": { + "glob": "^7.1.2", + "signal-exit": "^3.0.2" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@jscpd/core": { + "version": "3.5.10", + "resolved": "https://registry.npmjs.org/@jscpd/core/-/core-3.5.10.tgz", + "integrity": "sha512-k8owgREEI6bUHtVq+PM3+Gp5GgLgwMklWabJzZdtNXpHeC22EzviAW1Of7cifPLmdMJ3xfkoHl5No9/gg6y5FA==", + "dev": true, + "dependencies": { + "eventemitter3": "^5.0.1" + } + }, + "node_modules/@jscpd/finder": { + "version": "3.5.10", + "resolved": "https://registry.npmjs.org/@jscpd/finder/-/finder-3.5.10.tgz", + "integrity": "sha512-zyafUsTB2xDySho3wKMSoZuiMw2XvkdYW72kI7bLdz9M+ERyTMRfUnX1RgoGldXyylyZPF1FSflmfsppkV4Wuw==", + "dev": true, + "dependencies": { + "@jscpd/core": "^3.5.4", + "@jscpd/tokenizer": "^3.5.4", + "blamer": "^1.0.4", + "bytes": "^3.1.0", + "cli-table3": "^0.6.0", + "colors": "1.4.0", + "fast-glob": "^3.2.2", + "fs-extra": "^9.0.0", + "markdown-table": "^2.0.0", + "pug": "^3.0.1" + } + }, + "node_modules/@jscpd/html-reporter": { + "version": "3.5.10", + "resolved": "https://registry.npmjs.org/@jscpd/html-reporter/-/html-reporter-3.5.10.tgz", + "integrity": "sha512-EPee/YSy/12UboUOoOD+vFvU8/Bi/CAKnjTDnAdPnJlSh68jog/BNhHKrXiiJKZS2CLn1WzjUaefJrn8VcWo+A==", + "dev": true, + "dependencies": { + "@jscpd/finder": "^3.5.10", + "colors": "1.4.0", + "fs-extra": "^9.0.1", + "pug": "^3.0.2" + } + }, + "node_modules/@jscpd/tokenizer": { + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/@jscpd/tokenizer/-/tokenizer-3.5.4.tgz", + "integrity": "sha512-qvGbHNFaGXqMqgw0cujRqSM2cuPBAR9EOtZNUx4eGQ6IeuJhsS+aI0ijEUOE1OdVBStdu5xYdyytuLkkmtJzHA==", + "dev": true, + "dependencies": { + "@jscpd/core": "^3.5.4", + "reprism": "^0.0.11", + "spark-md5": "^3.0.1" + } + }, + "node_modules/@mapbox/node-pre-gyp": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz", + "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==", + "devOptional": true, + "dependencies": { + "detect-libc": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.7", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + }, + "bin": { + "node-pre-gyp": "bin/node-pre-gyp" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@stylelint/postcss-css-in-js": { + "version": "0.37.3", + "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.3.tgz", + "integrity": "sha512-scLk3cSH1H9KggSniseb2KNAU5D9FWc3H7BxCSAIdtU9OWIyw0zkEZ9qEKHryRM+SExYXRKNb7tOOVNAsQ3iwg==", + "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", + "dev": true, + "dependencies": { + "@babel/core": "^7.17.9" + }, + "peerDependencies": { + "postcss": ">=7.0.0", + "postcss-syntax": ">=0.36.2" + } + }, + "node_modules/@stylelint/postcss-markdown": { + "version": "0.36.2", + "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz", + "integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==", + "deprecated": "Use the original unforked package instead: postcss-markdown", + "dev": true, + "dependencies": { + "remark": "^13.0.0", + "unist-util-find-all-after": "^3.0.2" + }, + "peerDependencies": { + "postcss": ">=7.0.0", + "postcss-syntax": ">=0.36.2" + } + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/@types/jquery": { + "version": "3.5.30", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.30.tgz", + "integrity": "sha512-nbWKkkyb919DOUxjmRVk8vwtDb0/k8FKncmUKFi+NY+QXqWltooxTrswvz4LspQwxvLdvzBN1TImr6cw3aQx2A==", + "dev": true, + "dependencies": { + "@types/sizzle": "*" + } + }, + "node_modules/@types/jquery.contextmenu": { + "version": "1.7.38", + "resolved": "https://registry.npmjs.org/@types/jquery.contextmenu/-/jquery.contextmenu-1.7.38.tgz", + "integrity": "sha512-UJnILf0CmTDABuUglPQ6hVwOKxXNqWK9toErwAwtWa14ipPSsRI3hIVHftKB+kNZ2G3MadQJoroc+p5TU8CN5g==", + "dev": true, + "dependencies": { + "@types/jquery": "*" + } + }, + "node_modules/@types/jqueryui": { + "version": "1.12.23", + "resolved": "https://registry.npmjs.org/@types/jqueryui/-/jqueryui-1.12.23.tgz", + "integrity": "sha512-pm1yVNVI29B9IGw41anCEzA5eR2r1pYc7flqD471ZT7B0yUXIY7YNe/zq7LGpihIGXNzWyG+Q4YQSzv2AF3fNA==", + "dev": true, + "dependencies": { + "@types/jquery": "*" + } + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true + }, + "node_modules/@types/mdast": { + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz", + "integrity": "sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==", + "dev": true, + "dependencies": { + "@types/unist": "^2" + } + }, + "node_modules/@types/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", + "dev": true + }, + "node_modules/@types/mocha": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.0.tgz", + "integrity": "sha512-/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ==", + "dev": true + }, + "node_modules/@types/node": { + "version": "14.14.25", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.25.tgz", + "integrity": "sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ==", + "dev": true + }, + "node_modules/@types/normalize-package-data": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", + "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", + "dev": true + }, + "node_modules/@types/offscreencanvas": { + "version": "2019.7.3", + "resolved": "https://registry.npmjs.org/@types/offscreencanvas/-/offscreencanvas-2019.7.3.tgz", + "integrity": "sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A==", + "dev": true + }, + "node_modules/@types/parse-json": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", + "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", + "dev": true + }, + "node_modules/@types/sizzle": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz", + "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==", + "dev": true + }, + "node_modules/@types/unist": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz", + "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==", + "dev": true + }, + "node_modules/@types/w2ui": { + "version": "1.4.37", + "resolved": "https://registry.npmjs.org/@types/w2ui/-/w2ui-1.4.37.tgz", + "integrity": "sha512-/55RzOljbfQgQSSxkyVva8AkEP9Ugx8dUcxTGqdw9T2fKFPzGKT16tXP/3AQsuQT0bvljhxgi/6rt0zm5cuwOQ==", + "dev": true, + "dependencies": { + "@types/jquery": "*" + } + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz", + "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==", + "dev": true, + "dependencies": { + "@typescript-eslint/experimental-utils": "4.33.0", + "@typescript-eslint/scope-manager": "4.33.0", + "debug": "^4.3.1", + "functional-red-black-tree": "^1.0.1", + "ignore": "^5.1.8", + "regexpp": "^3.1.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^4.0.0", + "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/experimental-utils": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz", + "integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==", + "dev": true, + "dependencies": { + "@types/json-schema": "^7.0.7", + "@typescript-eslint/scope-manager": "4.33.0", + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/typescript-estree": "4.33.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "*" + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz", + "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "4.33.0", + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/typescript-estree": "4.33.0", + "debug": "^4.3.1" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz", + "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/visitor-keys": "4.33.0" + }, + "engines": { + "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/types": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz", + "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==", + "dev": true, + "engines": { + "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz", + "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "4.33.0", + "@typescript-eslint/visitor-keys": "4.33.0", + "debug": "^4.3.1", + "globby": "^11.0.3", + "is-glob": "^4.0.1", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "4.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz", + "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "4.33.0", + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@ungap/promise-all-settled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", + "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "dev": true + }, + "node_modules/abab": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", + "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", + "deprecated": "Use your platform's native atob() and btoa() methods instead" + }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "devOptional": true + }, + "node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-node": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", + "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", + "dev": true, + "dependencies": { + "acorn": "^7.0.0", + "acorn-walk": "^7.0.0", + "xtend": "^4.0.2" + } + }, + "node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agentkeepalive": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.3.tgz", + "integrity": "sha512-yqXL+k5rr8+ZRpOAntkaaRgWgE5o8ESAj5DyRmVTCSoZxXmqemb9Dd7T4i5UzwuERdLAJUy6XzR9zFVuf0kzkw==", + "dev": true, + "dependencies": { + "humanize-ms": "^1.2.1" + }, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-escapes/node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "devOptional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", + "devOptional": true + }, + "node_modules/are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "deprecated": "This package is no longer supported.", + "devOptional": true, + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/are-we-there-yet/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==", + "devOptional": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", + "dev": true + }, + "node_modules/asn1.js": { + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", + "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", + "dev": true, + "dependencies": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } + }, + "node_modules/asn1.js/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/assert": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz", + "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==", + "dev": true, + "dependencies": { + "object.assign": "^4.1.4", + "util": "^0.10.4" + } + }, + "node_modules/assert-never": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.3.0.tgz", + "integrity": "sha512-9Z3vxQ+berkL/JJo0dK+EY3Lp0s3NtSnP3VCLsh5HDcZPrh0M+KQRK5sWhUeyPPH+/RCxZqOxLMR+YC6vlviEQ==", + "dev": true + }, + "node_modules/astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/atob": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", + "dev": true, + "bin": { + "atob": "bin/atob.js" + }, + "engines": { + "node": ">= 4.5.0" + } + }, + "node_modules/autolinker": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-3.14.1.tgz", + "integrity": "sha512-yvsRHIaY51EYDml6MGlbqyJGfl4n7zezGYf+R7gvM8c5LNpRGc4SISkvgAswSS8SWxk/OrGCylKV9mJyVstz7w==", + "dev": true, + "dependencies": { + "tslib": "^1.9.3" + } + }, + "node_modules/autoprefixer": { + "version": "9.8.8", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz", + "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==", + "dev": true, + "dependencies": { + "browserslist": "^4.12.0", + "caniuse-lite": "^1.0.30001109", + "normalize-range": "^0.1.2", + "num2fraction": "^1.2.2", + "picocolors": "^0.2.1", + "postcss": "^7.0.32", + "postcss-value-parser": "^4.1.0" + }, + "bin": { + "autoprefixer": "bin/autoprefixer" + }, + "funding": { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/autoprefixer" + } + }, + "node_modules/autoprefixer/node_modules/picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, + "node_modules/babel-walk": { + "version": "3.0.0-canary-5", + "resolved": "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz", + "integrity": "sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.9.6" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/bail": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", + "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "devOptional": true + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/blamer": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/blamer/-/blamer-1.0.6.tgz", + "integrity": "sha512-fv7QToPS87oD1m1bDDTf29zC/bVKJxj2Nqh1r/v4NhMtbnzDIbWOHBYIfxCjlmkVGu3FGOjKgdNG3SFm7TkvBQ==", + "dev": true, + "dependencies": { + "execa": "^4.0.0", + "which": "^2.0.2" + }, + "engines": { + "node": ">=8.9" + } + }, + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "dev": true + }, + "node_modules/bn.js": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", + "dev": true + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "devOptional": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==", + "dev": true + }, + "node_modules/browser-pack": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz", + "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==", + "dev": true, + "dependencies": { + "combine-source-map": "~0.8.0", + "defined": "^1.0.0", + "JSONStream": "^1.0.3", + "safe-buffer": "^5.1.1", + "through2": "^2.0.0", + "umd": "^3.0.0" + }, + "bin": { + "browser-pack": "bin/cmd.js" + } + }, + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==" + }, + "node_modules/browser-resolve": { + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz", + "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==", + "dev": true, + "dependencies": { + "resolve": "1.1.7" + } + }, + "node_modules/browser-resolve/node_modules/resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==", + "dev": true + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "node_modules/browserify": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.5.1.tgz", + "integrity": "sha512-EQX0h59Pp+0GtSRb5rL6OTfrttlzv+uyaUVlK6GX3w11SQ0jKPKyjC/54RhPR2ib2KmfcELM06e8FxcI5XNU2A==", + "dev": true, + "dependencies": { + "assert": "^1.4.0", + "browser-pack": "^6.0.1", + "browser-resolve": "^1.11.0", + "browserify-zlib": "~0.2.0", + "buffer": "~5.2.1", + "cached-path-relative": "^1.0.0", + "concat-stream": "^1.6.0", + "console-browserify": "^1.1.0", + "constants-browserify": "~1.0.0", + "crypto-browserify": "^3.0.0", + "defined": "^1.0.0", + "deps-sort": "^2.0.0", + "domain-browser": "^1.2.0", + "duplexer2": "~0.1.2", + "events": "^2.0.0", + "glob": "^7.1.0", + "has": "^1.0.0", + "htmlescape": "^1.1.0", + "https-browserify": "^1.0.0", + "inherits": "~2.0.1", + "insert-module-globals": "^7.0.0", + "JSONStream": "^1.0.3", + "labeled-stream-splicer": "^2.0.0", + "mkdirp-classic": "^0.5.2", + "module-deps": "^6.0.0", + "os-browserify": "~0.3.0", + "parents": "^1.0.1", + "path-browserify": "~0.0.0", + "process": "~0.11.0", + "punycode": "^1.3.2", + "querystring-es3": "~0.2.0", + "read-only-stream": "^2.0.0", + "readable-stream": "^2.0.2", + "resolve": "^1.1.4", + "shasum": "^1.0.0", + "shell-quote": "^1.6.1", + "stream-browserify": "^2.0.0", + "stream-http": "^3.0.0", + "string_decoder": "^1.1.1", + "subarg": "^1.0.0", + "syntax-error": "^1.1.1", + "through2": "^2.0.0", + "timers-browserify": "^1.0.1", + "tty-browserify": "0.0.1", + "url": "~0.11.0", + "util": "~0.10.1", + "vm-browserify": "^1.0.0", + "xtend": "^4.0.0" + }, + "bin": { + "browserify": "bin/cmd.js" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/browserify-aes": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", + "dev": true, + "dependencies": { + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/browserify-cipher": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", + "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", + "dev": true, + "dependencies": { + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" + } + }, + "node_modules/browserify-css": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/browserify-css/-/browserify-css-0.15.0.tgz", + "integrity": "sha512-ZgLHyZ16PH6P25JlBE+5xNtdobpkc5Egh+ctc8ha3GDtuZqSSQu0ovOxOQvXt0xAmaXixth/DY9iT56HlDOxyg==", + "dev": true, + "dependencies": { + "clean-css": "^4.1.5", + "concat-stream": "^1.6.0", + "css": "^2.2.1", + "find-node-modules": "^2.0.0", + "lodash": "^4.17.11", + "mime": "^1.3.6", + "strip-css-comments": "^3.0.0", + "through2": "2.0.x" + } + }, + "node_modules/browserify-des": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", + "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", + "dev": true, + "dependencies": { + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "node_modules/browserify-rsa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", + "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", + "dev": true, + "dependencies": { + "bn.js": "^5.0.0", + "randombytes": "^2.0.1" + } + }, + "node_modules/browserify-sign": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz", + "integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==", + "dev": true, + "dependencies": { + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "elliptic": "^6.5.5", + "hash-base": "~3.0", + "inherits": "^2.0.4", + "parse-asn1": "^5.1.7", + "readable-stream": "^2.3.8", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/browserify-zlib": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", + "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", + "dev": true, + "dependencies": { + "pako": "~1.0.5" + } + }, + "node_modules/browserslist": { + "version": "4.23.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", + "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "caniuse-lite": "^1.0.30001646", + "electron-to-chromium": "^1.5.4", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz", + "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==", + "dev": true, + "dependencies": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "node_modules/buffer-xor": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==", + "dev": true + }, + "node_modules/builtin-status-codes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==", + "dev": true + }, + "node_modules/builtins": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", + "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==", + "dev": true + }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/cacache": { + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", + "dev": true, + "dependencies": { + "bluebird": "^3.5.1", + "chownr": "^1.0.1", + "glob": "^7.1.2", + "graceful-fs": "^4.1.11", + "lru-cache": "^4.1.1", + "mississippi": "^2.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.2", + "ssri": "^5.2.4", + "unique-filename": "^1.1.0", + "y18n": "^4.0.0" + } + }, + "node_modules/cacache/node_modules/mississippi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", + "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", + "dev": true, + "dependencies": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^2.0.1", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/cacache/node_modules/pump": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "dev": true, + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/cacache/node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/cached-path-relative": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz", + "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==", + "dev": true + }, + "node_modules/call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase-keys": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", + "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", + "dev": true, + "dependencies": { + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001658", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz", + "integrity": "sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ] + }, + "node_modules/canvas": { + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz", + "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==", + "devOptional": true, + "hasInstallScript": true, + "dependencies": { + "@mapbox/node-pre-gyp": "^1.0.0", + "nan": "^2.17.0", + "simple-get": "^3.0.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/character-entities": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", + "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/character-entities-legacy": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", + "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/character-parser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz", + "integrity": "sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==", + "dev": true, + "dependencies": { + "is-regex": "^1.0.3" + } + }, + "node_modules/character-reference-invalid": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", + "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true + }, + "node_modules/chokidar": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", + "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "dev": true, + "dependencies": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.5.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.1.2" + } + }, + "node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, + "node_modules/cipher-base": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", + "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/clean-css": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", + "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", + "dev": true, + "dependencies": { + "source-map": "~0.6.0" + }, + "engines": { + "node": ">= 4.0" + } + }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-table3": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz", + "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0" + }, + "engines": { + "node": "10.* || >= 12.*" + }, + "optionalDependencies": { + "@colors/colors": "1.5.0" + } + }, + "node_modules/cli-width": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "dependencies": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "node_modules/cliui/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/cliui/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/clone-regexp": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz", + "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==", + "dev": true, + "dependencies": { + "is-regexp": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/clone-regexp/node_modules/is-regexp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz", + "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==", + "dev": true, + "engines": { + "node": ">=0.10.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==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "devOptional": true, + "bin": { + "color-support": "bin.js" + } + }, + "node_modules/colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true, + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/combine-source-map": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz", + "integrity": "sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg==", + "dev": true, + "dependencies": { + "convert-source-map": "~1.1.0", + "inline-source-map": "~0.6.0", + "lodash.memoize": "~3.0.3", + "source-map": "~0.5.3" + } + }, + "node_modules/combine-source-map/node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "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==", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "devOptional": true + }, + "node_modules/concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "dev": true, + "engines": [ + "node >= 0.8" + ], + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, + "node_modules/console-browserify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true + }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "devOptional": true + }, + "node_modules/constantinople": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz", + "integrity": "sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.6.0", + "@babel/types": "^7.6.1" + } + }, + "node_modules/constants-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==", + "dev": true + }, + "node_modules/convert-source-map": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", + "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==", + "dev": true + }, + "node_modules/copy-concurrently": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", + "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", + "deprecated": "This package is no longer supported.", + "dev": true, + "dependencies": { + "aproba": "^1.1.1", + "fs-write-stream-atomic": "^1.0.8", + "iferr": "^0.1.5", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.0" + } + }, + "node_modules/copy-concurrently/node_modules/aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "dev": true + }, + "node_modules/copy-concurrently/node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "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==", + "dev": true + }, + "node_modules/cosmiconfig": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", + "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "dev": true, + "dependencies": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/create-ecdh": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", + "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", + "dev": true, + "dependencies": { + "bn.js": "^4.1.0", + "elliptic": "^6.5.3" + } + }, + "node_modules/create-ecdh/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/create-hash": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", + "dev": true, + "dependencies": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" + } + }, + "node_modules/create-hmac": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", + "dev": true, + "dependencies": { + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/crypto-browserify": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", + "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", + "dev": true, + "dependencies": { + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" + }, + "engines": { + "node": "*" + } + }, + "node_modules/css": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz", + "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "source-map": "^0.6.1", + "source-map-resolve": "^0.5.2", + "urix": "^0.1.0" + } + }, + "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==", + "dev": true, + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==" + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + }, + "node_modules/cyclist": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz", + "integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==", + "dev": true + }, + "node_modules/d3": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/d3/-/d3-6.7.0.tgz", + "integrity": "sha512-hNHRhe+yCDLUG6Q2LwvR/WdNFPOJQ5VWqsJcwIYVeI401+d2/rrCjxSXkiAdIlpx7/73eApFB4Olsmh3YN7a6g==", + "dev": true, + "dependencies": { + "d3-array": "2", + "d3-axis": "2", + "d3-brush": "2", + "d3-chord": "2", + "d3-color": "2", + "d3-contour": "2", + "d3-delaunay": "5", + "d3-dispatch": "2", + "d3-drag": "2", + "d3-dsv": "2", + "d3-ease": "2", + "d3-fetch": "2", + "d3-force": "2", + "d3-format": "2", + "d3-geo": "2", + "d3-hierarchy": "2", + "d3-interpolate": "2", + "d3-path": "2", + "d3-polygon": "2", + "d3-quadtree": "2", + "d3-random": "2", + "d3-scale": "3", + "d3-scale-chromatic": "2", + "d3-selection": "2", + "d3-shape": "2", + "d3-time": "2", + "d3-time-format": "3", + "d3-timer": "2", + "d3-transition": "2", + "d3-zoom": "2" + } + }, + "node_modules/d3-array": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", + "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", + "dev": true, + "dependencies": { + "internmap": "^1.0.0" + } + }, + "node_modules/d3-axis": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-2.1.0.tgz", + "integrity": "sha512-z/G2TQMyuf0X3qP+Mh+2PimoJD41VOCjViJzT0BHeL/+JQAofkiWZbWxlwFGb1N8EN+Cl/CW+MUKbVzr1689Cw==", + "dev": true + }, + "node_modules/d3-brush": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-2.1.0.tgz", + "integrity": "sha512-cHLLAFatBATyIKqZOkk/mDHUbzne2B3ZwxkzMHvFTCZCmLaXDpZRihQSn8UNXTkGD/3lb/W2sQz0etAftmHMJQ==", + "dev": true, + "dependencies": { + "d3-dispatch": "1 - 2", + "d3-drag": "2", + "d3-interpolate": "1 - 2", + "d3-selection": "2", + "d3-transition": "2" + } + }, + "node_modules/d3-chord": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-2.0.0.tgz", + "integrity": "sha512-D5PZb7EDsRNdGU4SsjQyKhja8Zgu+SHZfUSO5Ls8Wsn+jsAKUUGkcshLxMg9HDFxG3KqavGWaWkJ8EpU8ojuig==", + "dev": true, + "dependencies": { + "d3-path": "1 - 2" + } + }, + "node_modules/d3-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", + "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==", + "dev": true + }, + "node_modules/d3-contour": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-2.0.0.tgz", + "integrity": "sha512-9unAtvIaNk06UwqBmvsdHX7CZ+NPDZnn8TtNH1myW93pWJkhsV25JcgnYAu0Ck5Veb1DHiCv++Ic5uvJ+h50JA==", + "dev": true, + "dependencies": { + "d3-array": "2" + } + }, + "node_modules/d3-delaunay": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-5.3.0.tgz", + "integrity": "sha512-amALSrOllWVLaHTnDLHwMIiz0d1bBu9gZXd1FiLfXf8sHcX9jrcj81TVZOqD4UX7MgBZZ07c8GxzEgBpJqc74w==", + "dev": true, + "dependencies": { + "delaunator": "4" + } + }, + "node_modules/d3-dispatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz", + "integrity": "sha512-S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA==", + "dev": true + }, + "node_modules/d3-drag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-2.0.0.tgz", + "integrity": "sha512-g9y9WbMnF5uqB9qKqwIIa/921RYWzlUDv9Jl1/yONQwxbOfszAWTCm8u7HOTgJgRDXiRZN56cHT9pd24dmXs8w==", + "dev": true, + "dependencies": { + "d3-dispatch": "1 - 2", + "d3-selection": "2" + } + }, + "node_modules/d3-dsv": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-2.0.0.tgz", + "integrity": "sha512-E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w==", + "dev": true, + "dependencies": { + "commander": "2", + "iconv-lite": "0.4", + "rw": "1" + }, + "bin": { + "csv2json": "bin/dsv2json", + "csv2tsv": "bin/dsv2dsv", + "dsv2dsv": "bin/dsv2dsv", + "dsv2json": "bin/dsv2json", + "json2csv": "bin/json2dsv", + "json2dsv": "bin/json2dsv", + "json2tsv": "bin/json2dsv", + "tsv2csv": "bin/dsv2dsv", + "tsv2json": "bin/dsv2json" + } + }, + "node_modules/d3-ease": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-2.0.0.tgz", + "integrity": "sha512-68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ==", + "dev": true + }, + "node_modules/d3-fetch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-2.0.0.tgz", + "integrity": "sha512-TkYv/hjXgCryBeNKiclrwqZH7Nb+GaOwo3Neg24ZVWA3MKB+Rd+BY84Nh6tmNEMcjUik1CSUWjXYndmeO6F7sw==", + "dev": true, + "dependencies": { + "d3-dsv": "1 - 2" + } + }, + "node_modules/d3-force": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-2.1.1.tgz", + "integrity": "sha512-nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew==", + "dev": true, + "dependencies": { + "d3-dispatch": "1 - 2", + "d3-quadtree": "1 - 2", + "d3-timer": "1 - 2" + } + }, + "node_modules/d3-format": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz", + "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==", + "dev": true + }, + "node_modules/d3-geo": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.2.tgz", + "integrity": "sha512-8pM1WGMLGFuhq9S+FpPURxic+gKzjluCD/CHTuUF3mXMeiCo0i6R0tO1s4+GArRFde96SLcW/kOFRjoAosPsFA==", + "dev": true, + "dependencies": { + "d3-array": "^2.5.0" + } + }, + "node_modules/d3-hierarchy": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-2.0.0.tgz", + "integrity": "sha512-SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw==", + "dev": true + }, + "node_modules/d3-interpolate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", + "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "dev": true, + "dependencies": { + "d3-color": "1 - 2" + } + }, + "node_modules/d3-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-2.0.0.tgz", + "integrity": "sha512-ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA==", + "dev": true + }, + "node_modules/d3-polygon": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-2.0.0.tgz", + "integrity": "sha512-MsexrCK38cTGermELs0cO1d79DcTsQRN7IWMJKczD/2kBjzNXxLUWP33qRF6VDpiLV/4EI4r6Gs0DAWQkE8pSQ==", + "dev": true + }, + "node_modules/d3-quadtree": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-2.0.0.tgz", + "integrity": "sha512-b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw==", + "dev": true + }, + "node_modules/d3-random": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-2.2.2.tgz", + "integrity": "sha512-0D9P8TRj6qDAtHhRQn6EfdOtHMfsUWanl3yb/84C4DqpZ+VsgfI5iTVRNRbELCfNvRfpMr8OrqqUTQ6ANGCijw==", + "dev": true + }, + "node_modules/d3-scale": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz", + "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==", + "dev": true, + "dependencies": { + "d3-array": "^2.3.0", + "d3-format": "1 - 2", + "d3-interpolate": "1.2.0 - 2", + "d3-time": "^2.1.1", + "d3-time-format": "2 - 3" + } + }, + "node_modules/d3-scale-chromatic": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-2.0.0.tgz", + "integrity": "sha512-LLqy7dJSL8yDy7NRmf6xSlsFZ6zYvJ4BcWFE4zBrOPnQERv9zj24ohnXKRbyi9YHnYV+HN1oEO3iFK971/gkzA==", + "dev": true, + "dependencies": { + "d3-color": "1 - 2", + "d3-interpolate": "1 - 2" + } + }, + "node_modules/d3-selection": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz", + "integrity": "sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==", + "dev": true + }, + "node_modules/d3-shape": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-2.1.0.tgz", + "integrity": "sha512-PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA==", + "dev": true, + "dependencies": { + "d3-path": "1 - 2" + } + }, + "node_modules/d3-time": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz", + "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==", + "dev": true, + "dependencies": { + "d3-array": "2" + } + }, + "node_modules/d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "dev": true, + "dependencies": { + "d3-time": "1 - 2" + } + }, + "node_modules/d3-timer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz", + "integrity": "sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==", + "dev": true + }, + "node_modules/d3-transition": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-2.0.0.tgz", + "integrity": "sha512-42ltAGgJesfQE3u9LuuBHNbGrI/AJjNL2OAUdclE70UE6Vy239GCBEYD38uBPoLeNsOhFStGpPI0BAOV+HMxog==", + "dev": true, + "dependencies": { + "d3-color": "1 - 2", + "d3-dispatch": "1 - 2", + "d3-ease": "1 - 2", + "d3-interpolate": "1 - 2", + "d3-timer": "1 - 2" + }, + "peerDependencies": { + "d3-selection": "2" + } + }, + "node_modules/d3-zoom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-2.0.0.tgz", + "integrity": "sha512-fFg7aoaEm9/jf+qfstak0IYpnesZLiMX6GZvXtUSdv8RH2o4E2qeelgdU09eKS6wGuiGMfcnMI0nTIqWzRHGpw==", + "dev": true, + "dependencies": { + "d3-dispatch": "1 - 2", + "d3-drag": "2", + "d3-interpolate": "1 - 2", + "d3-selection": "2", + "d3-transition": "2" + } + }, + "node_modules/dash-ast": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz", + "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==", + "dev": true + }, + "node_modules/data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decamelize-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", + "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", + "dev": true, + "dependencies": { + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decamelize-keys/node_modules/map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decimal.js": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", + "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==" + }, + "node_modules/decode-uri-component": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", + "dev": true, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/decompress-response": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", + "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", + "devOptional": true, + "dependencies": { + "mimic-response": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/defined": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz", + "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/delaunator": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-4.0.1.tgz", + "integrity": "sha512-WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag==", + "dev": true + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "devOptional": true + }, + "node_modules/deps-sort": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz", + "integrity": "sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==", + "dev": true, + "dependencies": { + "JSONStream": "^1.0.3", + "shasum-object": "^1.0.0", + "subarg": "^1.0.0", + "through2": "^2.0.0" + }, + "bin": { + "deps-sort": "bin/cmd.js" + } + }, + "node_modules/des.js": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz", + "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } + }, + "node_modules/detect-file": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", + "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/detect-indent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", + "integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/detect-libc": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", + "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", + "devOptional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/detect-newline": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", + "integrity": "sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/detective": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", + "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==", + "dev": true, + "dependencies": { + "acorn-node": "^1.8.2", + "defined": "^1.0.0", + "minimist": "^1.2.6" + }, + "bin": { + "detective": "bin/detective.js" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/diffie-hellman": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", + "dev": true, + "dependencies": { + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" + } + }, + "node_modules/diffie-hellman/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/doctypes": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz", + "integrity": "sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==", + "dev": true + }, + "node_modules/dom-serializer": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", + "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", + "dev": true, + "dependencies": { + "domelementtype": "^2.0.1", + "entities": "^2.0.0" + } + }, + "node_modules/dom-serializer/node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ] + }, + "node_modules/dom-serializer/node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "dev": true, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/domain-browser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", + "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", + "dev": true, + "engines": { + "node": ">=0.4", + "npm": ">=1.2" + } + }, + "node_modules/domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", + "dev": true + }, + "node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "deprecated": "Use your platform's native DOMException instead", + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/domhandler": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", + "dev": true, + "dependencies": { + "domelementtype": "1" + } + }, + "node_modules/domutils": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", + "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", + "dev": true, + "dependencies": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, + "node_modules/duplexer2": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", + "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==", + "dev": true, + "dependencies": { + "readable-stream": "^2.0.2" + } + }, + "node_modules/duplexify": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", + "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", + "dev": true, + "dependencies": { + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.5.18", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz", + "integrity": "sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==", + "dev": true + }, + "node_modules/elliptic": { + "version": "6.5.7", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", + "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", + "dev": true, + "dependencies": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/elliptic/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "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==", + "devOptional": true + }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "dev": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/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==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/entities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", + "dev": true + }, + "node_modules/err-code": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz", + "integrity": "sha512-CJAN+O0/yA1CKfRn9SXOGctSpEM7DCon/r/5r2eXFMY2zCCJBasFhcM5I+1kh3Ap11FsQCX+vGHceNPvpWKhoA==", + "dev": true + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", + "dev": true + }, + "node_modules/es6-promisify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==", + "dev": true, + "dependencies": { + "es6-promise": "^4.0.3" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/escodegen/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/eslint": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.0.0.tgz", + "integrity": "sha512-qY1cwdOxMONHJfGqw52UOpZDeqXy8xmD0u8CT6jIstil72jkhURC704W8CFyTPDPllz4z4lu0Ql1+07PG/XdIg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0", + "eslint-visitor-keys": "^1.1.0", + "espree": "^7.0.0", + "esquery": "^1.2.0", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.0.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^7.0.0", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash": "^4.17.14", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "progress": "^2.0.0", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", + "table": "^5.2.3", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-prettier": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", + "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", + "dev": true, + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint/node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/espree": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", + "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "dev": true, + "dependencies": { + "acorn": "^7.4.0", + "acorn-jsx": "^5.3.1", + "eslint-visitor-keys": "^1.3.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esquery/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esrecurse/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eventemitter3": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "dev": true + }, + "node_modules/events": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz", + "integrity": "sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==", + "dev": true, + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/evp_bytestokey": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", + "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "dev": true, + "dependencies": { + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" + } + }, + "node_modules/execa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/execall": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz", + "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==", + "dev": true, + "dependencies": { + "clone-regexp": "^2.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", + "dev": true, + "dependencies": { + "homedir-polyfill": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true + }, + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dev": true, + "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.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fast-safe-stringify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", + "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", + "dev": true + }, + "node_modules/fast-uri": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", + "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", + "dev": true + }, + "node_modules/fastest-levenshtein": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "dev": true, + "engines": { + "node": ">= 4.9.1" + } + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/figgy-pudding": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", + "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==", + "deprecated": "This module is no longer supported.", + "dev": true + }, + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/file-entry-cache": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "dev": true, + "dependencies": { + "flat-cache": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-node-modules": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/find-node-modules/-/find-node-modules-2.1.3.tgz", + "integrity": "sha512-UC2I2+nx1ZuOBclWVNdcnbDR5dlrOdVb7xNjmT/lHE+LsgztWks3dG7boJ37yTS/venXw84B/mAW9uHVoC5QRg==", + "dev": true, + "dependencies": { + "findup-sync": "^4.0.0", + "merge": "^2.1.1" + } + }, + "node_modules/find-npm-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz", + "integrity": "sha512-KEftzJ+H90x6pcKtdXZEPsQse8/y/UnvzRKrOSQFprnrGaFuJ62fVkP34Iu2IYuMvyauCyoLTNkJZgrrGA2wkA==", + "deprecated": "This package is no longer supported.", + "dev": true + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/findup-sync": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz", + "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==", + "dev": true, + "dependencies": { + "detect-file": "^1.0.0", + "is-glob": "^4.0.0", + "micromatch": "^4.0.2", + "resolve-dir": "^1.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "bin": { + "flat": "cli.js" + } + }, + "node_modules/flat-cache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "dev": true, + "dependencies": { + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/flat-cache/node_modules/rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/flatted": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", + "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", + "dev": true + }, + "node_modules/flush-write-stream": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", + "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" + } + }, + "node_modules/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/from2": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", + "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" + } + }, + "node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "devOptional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "devOptional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fs-minipass/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "devOptional": true + }, + "node_modules/fs-write-stream-atomic": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", + "integrity": "sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==", + "deprecated": "This package is no longer supported.", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.2", + "iferr": "^0.1.5", + "imurmurhash": "^0.1.4", + "readable-stream": "1 || 2" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "devOptional": true + }, + "node_modules/fsevents": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "deprecated": "\"Please update to latest v2.3 or v2.2\"", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "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==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", + "dev": true + }, + "node_modules/fzstd": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/fzstd/-/fzstd-0.1.0.tgz", + "integrity": "sha512-TTvznnpde1rTv/3FOmZMbPCh75gqkJ9dKJdsKmcNiXh4olLJl3eRahHJcGzyPZjuVaytffP02Or4z5avDvqKQA==", + "dev": true + }, + "node_modules/gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "deprecated": "This package is no longer supported.", + "devOptional": true, + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/genfun": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz", + "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==", + "dev": true + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-assigned-identifiers": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz", + "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==", + "dev": true + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/gitignore-to-glob": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/gitignore-to-glob/-/gitignore-to-glob-0.3.0.tgz", + "integrity": "sha512-mk74BdnK7lIwDHnotHddx1wsjMOFIThpLY3cPNniJ/2fA/tlLzHnFxIdR+4sLOu5KGgQJdij4kjJ2RoUNnCNMA==", + "dev": true, + "engines": { + "node": ">=4.4 <5 || >=6.9" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "devOptional": 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": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "dev": true, + "dependencies": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", + "dev": true, + "dependencies": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/global-prefix/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "dependencies": { + "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globjoin": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", + "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==", + "dev": true + }, + "node_modules/gonzales-pe": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz", + "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==", + "dev": true, + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "gonzales": "bin/gonzales.js" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true + }, + "node_modules/growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true, + "engines": { + "node": ">=4.x" + } + }, + "node_modules/hammerjs": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", + "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/hard-rejection": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", + "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/has": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz", + "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==", + "dev": true, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", + "devOptional": true + }, + "node_modules/hash-base": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", + "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", + "dev": true, + "dependencies": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/homedir-polyfill": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", + "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", + "dev": true, + "dependencies": { + "parse-passwd": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true + }, + "node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/html-tags": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz", + "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/htmlescape": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz", + "integrity": "sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==", + "dev": true, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/htmlparser2": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", + "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", + "dev": true, + "dependencies": { + "domelementtype": "^1.3.1", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^3.1.1" + } + }, + "node_modules/htmlparser2/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/http-cache-semantics": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", + "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==", + "dev": true + }, + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", + "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==", + "dev": true + }, + "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==", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", + "dev": true, + "engines": { + "node": ">=8.12.0" + } + }, + "node_modules/humanize-ms": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", + "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", + "dev": true, + "dependencies": { + "ms": "^2.0.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==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/iferr": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", + "integrity": "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==", + "dev": true + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/ignore-walk": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz", + "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==", + "dev": true, + "dependencies": { + "minimatch": "^3.0.4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-lazy": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", + "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "devOptional": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "devOptional": true + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true + }, + "node_modules/inline-source-map": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.3.tgz", + "integrity": "sha512-1aVsPEsJWMJq/pdMU61CDlm1URcW702MTB4w9/zUjMus6H/Py8o7g68Pr9D4I6QluWGt/KdmswuRhaA05xVR1w==", + "dev": true, + "dependencies": { + "source-map": "~0.5.3" + } + }, + "node_modules/inline-source-map/node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/inquirer": { + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", + "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", + "dev": true, + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.19", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.6.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/insert-module-globals": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz", + "integrity": "sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==", + "dev": true, + "dependencies": { + "acorn-node": "^1.5.2", + "combine-source-map": "^0.8.0", + "concat-stream": "^1.6.1", + "is-buffer": "^1.1.0", + "JSONStream": "^1.0.3", + "path-is-absolute": "^1.0.1", + "process": "~0.11.0", + "through2": "^2.0.0", + "undeclared-identifiers": "^1.1.2", + "xtend": "^4.0.0" + }, + "bin": { + "insert-module-globals": "bin/cmd.js" + } + }, + "node_modules/internmap": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz", + "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==", + "dev": true + }, + "node_modules/ip": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz", + "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==", + "dev": true + }, + "node_modules/is-alphabetical": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", + "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/is-alphanumerical": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", + "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", + "dev": true, + "dependencies": { + "is-alphabetical": "^1.0.0", + "is-decimal": "^1.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "node_modules/is-core-module": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", + "dev": true, + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-decimal": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", + "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/is-expression": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz", + "integrity": "sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==", + "dev": true, + "dependencies": { + "acorn": "^7.1.1", + "object-assign": "^4.1.1" + } + }, + "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, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "devOptional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-hexadecimal": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", + "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==" + }, + "node_modules/is-promise": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", + "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==", + "dev": true + }, + "node_modules/is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", + "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==", + "dev": true, + "engines": { + "node": ">=0.10.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==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", + "dev": true + }, + "node_modules/is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true, + "engines": { + "node": ">=0.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==", + "dev": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/jquery": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", + "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==", + "dev": true + }, + "node_modules/jquery-contextmenu": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/jquery-contextmenu/-/jquery-contextmenu-2.9.2.tgz", + "integrity": "sha512-6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw==", + "dev": true, + "dependencies": { + "jquery": "^3.5.0" + }, + "peerDependencies": { + "jquery": ">=1.8.2" + } + }, + "node_modules/jquery-mousewheel": { + "version": "3.1.13", + "resolved": "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz", + "integrity": "sha512-GXhSjfOPyDemM005YCEHvzrEALhKDIswtxSHSR2e4K/suHVJKJxxRCGz3skPjNxjJjQa9AVSGGlYjv1M3VLIPg==", + "dev": true + }, + "node_modules/jquery-ui": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.2.tgz", + "integrity": "sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==", + "dev": true, + "dependencies": { + "jquery": ">=1.8.0 <4.0.0" + } + }, + "node_modules/js-stringify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz", + "integrity": "sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==", + "dev": true + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jscpd": { + "version": "3.5.10", + "resolved": "https://registry.npmjs.org/jscpd/-/jscpd-3.5.10.tgz", + "integrity": "sha512-lsFBSqtmGocMtF8NuCh867VRhjeSvPlGit7FYA9a9bX3GFoV65djHnWMbIWfHLb/6wCCwllmXaHuMgeMuhqo3Q==", + "dev": true, + "dependencies": { + "@jscpd/core": "^3.5.4", + "@jscpd/finder": "^3.5.10", + "@jscpd/html-reporter": "^3.5.10", + "@jscpd/tokenizer": "^3.5.4", + "colors": "1.4.0", + "commander": "^5.0.0", + "fs-extra": "^9.1.0", + "gitignore-to-glob": "^0.3.0" + }, + "bin": { + "jscpd": "bin/jscpd" + } + }, + "node_modules/jscpd/node_modules/commander": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", + "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jsdom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/acorn": { + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true, + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz", + "integrity": "sha512-nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==", + "dev": true, + "dependencies": { + "jsonify": "~0.0.0" + } + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/jsonify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", + "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", + "dev": true, + "engines": [ + "node >= 0.2.0" + ] + }, + "node_modules/JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "dev": true, + "dependencies": { + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" + }, + "bin": { + "JSONStream": "bin.js" + }, + "engines": { + "node": "*" + } + }, + "node_modules/jstransformer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz", + "integrity": "sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==", + "dev": true, + "dependencies": { + "is-promise": "^2.0.0", + "promise": "^7.0.1" + } + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/known-css-properties": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.19.0.tgz", + "integrity": "sha512-eYboRV94Vco725nKMlpkn3nV2+96p9c3gKXRsYqAJSswSENvBhN7n5L+uDhY58xQa0UukWsDMTGELzmD8Q+wTA==", + "dev": true + }, + "node_modules/l10n-for-node": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/l10n-for-node/-/l10n-for-node-0.0.1.tgz", + "integrity": "sha512-oAoyHnpCgZ8UQQ6Apa8CVBGHlFwhWXRui2Vd/f9rPPtGxItd1ULyBvsxQ8D9LpLgWR8ZDJ/6ZZ4TZ7FkJzbpjQ==", + "dev": true + }, + "node_modules/labeled-stream-splicer": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz", + "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "stream-splicer": "^2.0.0" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/libprecious": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/libprecious/-/libprecious-1.9.0.tgz", + "integrity": "sha512-0CInMTo64PHf1YWyMgQbBu/rOxa3vtH9vqJEka7+mPJpRkWbBVHLzh46cy3osdPeqedxr80fgdXglNgMfFuOWg==", + "dev": true, + "dependencies": { + "bluebird": "^3.5.1", + "detect-indent": "^5.0.0", + "detect-newline": "^2.1.0", + "find-npm-prefix": "^1.0.2", + "graceful-fs": "^4.1.11", + "lock-verify": "^2.0.0", + "mkdirp": "^0.5.1", + "npm-logical-tree": "^1.2.1", + "npm-package-arg": "^6.0.0", + "pacote": "^7.4.2", + "protoduck": "^5.0.0", + "rimraf": "^2.6.2", + "ssri": "^5.2.4" + } + }, + "node_modules/libprecious/node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "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==", + "dev": true + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lock-verify": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/lock-verify/-/lock-verify-2.2.2.tgz", + "integrity": "sha512-2CUNtr1ZSVKJHcYP8uEzafmmuyauCB5zZimj8TvQd/Lflt9kXVZs+8S+EbAzZLaVUDn8CYGmeC3DFGdYfnCzeQ==", + "deprecated": "This package is no longer supported.", + "dev": true, + "dependencies": { + "@iarna/cli": "^2.1.0", + "npm-package-arg": "^6.1.0", + "semver": "^5.4.1" + }, + "bin": { + "lock-verify": "cli.js" + } + }, + "node_modules/lock-verify/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.memoize": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", + "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==", + "dev": true + }, + "node_modules/lodash.truncate": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", + "dev": true + }, + "node_modules/log-symbols": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", + "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/longest-streak": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", + "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dev": true, + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "devOptional": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "devOptional": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/make-fetch-happen": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.6.0.tgz", + "integrity": "sha512-FFq0lNI0ax+n9IWzWpH8A4JdgYiAp2DDYIZ3rsaav8JDe8I+72CzK6PQW/oom15YDZpV5bYW/9INd6nIJ2ZfZw==", + "dev": true, + "dependencies": { + "agentkeepalive": "^3.3.0", + "cacache": "^10.0.0", + "http-cache-semantics": "^3.8.0", + "http-proxy-agent": "^2.0.0", + "https-proxy-agent": "^2.1.0", + "lru-cache": "^4.1.1", + "mississippi": "^1.2.0", + "node-fetch-npm": "^2.0.2", + "promise-retry": "^1.1.1", + "socks-proxy-agent": "^3.0.1", + "ssri": "^5.0.0" + } + }, + "node_modules/make-fetch-happen/node_modules/agent-base": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", + "dev": true, + "dependencies": { + "es6-promisify": "^5.0.0" + }, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/make-fetch-happen/node_modules/debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/make-fetch-happen/node_modules/http-proxy-agent": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", + "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", + "dev": true, + "dependencies": { + "agent-base": "4", + "debug": "3.1.0" + }, + "engines": { + "node": ">= 4.5.0" + } + }, + "node_modules/make-fetch-happen/node_modules/https-proxy-agent": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz", + "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==", + "dev": true, + "dependencies": { + "agent-base": "^4.3.0", + "debug": "^3.1.0" + }, + "engines": { + "node": ">= 4.5.0" + } + }, + "node_modules/make-fetch-happen/node_modules/mississippi": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.1.tgz", + "integrity": "sha512-/6rB8YXFbAtsUVRphIRQqB0+9c7VaPHCjVtvto+JqwVxgz8Zz+I+f68/JgQ+Pb4VlZb2svA9OtdXnHHsZz7ltg==", + "dev": true, + "dependencies": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^1.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + } + }, + "node_modules/make-fetch-happen/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/make-fetch-happen/node_modules/pump": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", + "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==", + "dev": true, + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/map-obj": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/markdown-table": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", + "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==", + "dev": true, + "dependencies": { + "repeat-string": "^1.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/mathml-tag-names": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", + "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/md5.js": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", + "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", + "dev": true, + "dependencies": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "node_modules/mdast-util-from-markdown": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz", + "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==", + "dev": true, + "dependencies": { + "@types/mdast": "^3.0.0", + "mdast-util-to-string": "^2.0.0", + "micromark": "~2.11.0", + "parse-entities": "^2.0.0", + "unist-util-stringify-position": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-to-markdown": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz", + "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==", + "dev": true, + "dependencies": { + "@types/unist": "^2.0.0", + "longest-streak": "^2.0.0", + "mdast-util-to-string": "^2.0.0", + "parse-entities": "^2.0.0", + "repeat-string": "^1.0.0", + "zwitch": "^1.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/mdast-util-to-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", + "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/meow": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz", + "integrity": "sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==", + "dev": true, + "dependencies": { + "@types/minimist": "^1.2.0", + "camelcase-keys": "^6.2.2", + "decamelize-keys": "^1.1.0", + "hard-rejection": "^2.1.0", + "minimist-options": "4.1.0", + "normalize-package-data": "^2.5.0", + "read-pkg-up": "^7.0.1", + "redent": "^3.0.0", + "trim-newlines": "^3.0.0", + "type-fest": "^0.13.1", + "yargs-parser": "^18.1.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow/node_modules/type-fest": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", + "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/merge": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz", + "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==", + "dev": true + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromark": { + "version": "2.11.4", + "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz", + "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "dependencies": { + "debug": "^4.0.0", + "parse-entities": "^2.0.0" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/miller-rabin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", + "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", + "dev": true, + "dependencies": { + "bn.js": "^4.0.0", + "brorand": "^1.0.1" + }, + "bin": { + "miller-rabin": "bin/miller-rabin" + } + }, + "node_modules/miller-rabin/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/mimic-response": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", + "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==", + "devOptional": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/min-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true + }, + "node_modules/minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==", + "dev": true + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "devOptional": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minimist-options": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", + "dev": true, + "dependencies": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0", + "kind-of": "^6.0.3" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "devOptional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "devOptional": true, + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "devOptional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "devOptional": true + }, + "node_modules/mississippi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", + "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", + "dev": true, + "dependencies": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "dev": true + }, + "node_modules/mocha": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz", + "integrity": "sha512-cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==", + "dev": true, + "dependencies": { + "@ungap/promise-all-settled": "1.1.2", + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.4.3", + "debug": "4.2.0", + "diff": "4.0.2", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.1.6", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "3.14.0", + "log-symbols": "4.0.0", + "minimatch": "3.0.4", + "ms": "2.1.2", + "nanoid": "3.1.12", + "serialize-javascript": "5.0.1", + "strip-json-comments": "3.1.1", + "supports-color": "7.2.0", + "which": "2.0.2", + "wide-align": "1.1.3", + "workerpool": "6.0.2", + "yargs": "13.3.2", + "yargs-parser": "13.1.2", + "yargs-unparser": "2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha" + }, + "engines": { + "node": ">= 10.12.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mochajs" + } + }, + "node_modules/mocha/node_modules/debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/mocha/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mocha/node_modules/glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/mocha/node_modules/js-yaml": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", + "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/mocha/node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mocha/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/module-deps": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz", + "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==", + "dev": true, + "dependencies": { + "browser-resolve": "^2.0.0", + "cached-path-relative": "^1.0.2", + "concat-stream": "~1.6.0", + "defined": "^1.0.0", + "detective": "^5.2.0", + "duplexer2": "^0.1.2", + "inherits": "^2.0.1", + "JSONStream": "^1.0.3", + "parents": "^1.0.0", + "readable-stream": "^2.0.2", + "resolve": "^1.4.0", + "stream-combiner2": "^1.1.1", + "subarg": "^1.0.0", + "through2": "^2.0.0", + "xtend": "^4.0.0" + }, + "bin": { + "module-deps": "bin/cmd.js" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/module-deps/node_modules/browser-resolve": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz", + "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==", + "dev": true, + "dependencies": { + "resolve": "^1.17.0" + } + }, + "node_modules/move-concurrently": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", + "integrity": "sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==", + "deprecated": "This package is no longer supported.", + "dev": true, + "dependencies": { + "aproba": "^1.1.1", + "copy-concurrently": "^1.0.0", + "fs-write-stream-atomic": "^1.0.8", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.3" + } + }, + "node_modules/move-concurrently/node_modules/aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "dev": true + }, + "node_modules/move-concurrently/node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "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==" + }, + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true + }, + "node_modules/nan": { + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", + "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", + "devOptional": true + }, + "node_modules/nanoid": { + "version": "3.1.12", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", + "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==", + "dev": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || >=13.7" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "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==", + "devOptional": true, + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-fetch-npm": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz", + "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==", + "deprecated": "This module is not used anymore, npm uses minipass-fetch for its fetch implementation now", + "dev": true, + "dependencies": { + "encoding": "^0.1.11", + "json-parse-better-errors": "^1.0.0", + "safe-buffer": "^5.1.1" + }, + "engines": { + "node": ">=4" + } + }, + "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==", + "devOptional": true + }, + "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==", + "devOptional": true + }, + "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==", + "devOptional": true, + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/node-releases": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "dev": true + }, + "node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "devOptional": true, + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/normalize-package-data/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/normalize-selector": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz", + "integrity": "sha512-dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw==", + "dev": true + }, + "node_modules/npm-bundled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz", + "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==", + "dev": true, + "dependencies": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "node_modules/npm-logical-tree": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz", + "integrity": "sha512-AJI/qxDB2PWI4LG1CYN579AY1vCiNyWfkiquCsJWqntRu/WwimVrC8yXeILBFHDwxfOejxewlmnvW9XXjMlYIg==", + "dev": true + }, + "node_modules/npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", + "dev": true + }, + "node_modules/npm-package-arg": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz", + "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==", + "dev": true, + "dependencies": { + "hosted-git-info": "^2.7.1", + "osenv": "^0.1.5", + "semver": "^5.6.0", + "validate-npm-package-name": "^3.0.0" + } + }, + "node_modules/npm-package-arg/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/npm-packlist": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", + "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", + "dev": true, + "dependencies": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1", + "npm-normalize-package-bin": "^1.0.1" + } + }, + "node_modules/npm-pick-manifest": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz", + "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==", + "dev": true, + "dependencies": { + "figgy-pudding": "^3.5.1", + "npm-package-arg": "^6.0.0", + "semver": "^5.4.1" + } + }, + "node_modules/npm-pick-manifest/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "deprecated": "This package is no longer supported.", + "devOptional": true, + "dependencies": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + } + }, + "node_modules/num2fraction": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", + "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==", + "dev": true + }, + "node_modules/number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/nwsapi": { + "version": "2.2.12", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz", + "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==" + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "devOptional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "has-symbols": "^1.0.3", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "devOptional": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/os-browserify": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==", + "dev": true + }, + "node_modules/os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "deprecated": "This package is no longer supported.", + "dev": true, + "dependencies": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pacote": { + "version": "7.6.1", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-7.6.1.tgz", + "integrity": "sha512-2kRIsHxjuYC1KRUIK80AFIXKWy0IgtFj76nKcaunozKAOSlfT+DFh3EfeaaKvNHCWixgi0G0rLg11lJeyEnp/Q==", + "dev": true, + "dependencies": { + "bluebird": "^3.5.1", + "cacache": "^10.0.4", + "get-stream": "^3.0.0", + "glob": "^7.1.2", + "lru-cache": "^4.1.1", + "make-fetch-happen": "^2.6.0", + "minimatch": "^3.0.4", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "normalize-package-data": "^2.4.0", + "npm-package-arg": "^6.0.0", + "npm-packlist": "^1.1.10", + "npm-pick-manifest": "^2.1.0", + "osenv": "^0.1.5", + "promise-inflight": "^1.0.1", + "promise-retry": "^1.1.1", + "protoduck": "^5.0.0", + "rimraf": "^2.6.2", + "safe-buffer": "^5.1.1", + "semver": "^5.5.0", + "ssri": "^5.2.4", + "tar": "^4.4.0", + "unique-filename": "^1.1.0", + "which": "^1.3.0" + } + }, + "node_modules/pacote/node_modules/fs-minipass": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "dev": true, + "dependencies": { + "minipass": "^2.6.0" + } + }, + "node_modules/pacote/node_modules/get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/pacote/node_modules/minipass": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", + "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "node_modules/pacote/node_modules/minizlib": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", + "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", + "dev": true, + "dependencies": { + "minipass": "^2.9.0" + } + }, + "node_modules/pacote/node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/pacote/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/pacote/node_modules/tar": { + "version": "4.4.19", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz", + "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==", + "dev": true, + "dependencies": { + "chownr": "^1.1.4", + "fs-minipass": "^1.2.7", + "minipass": "^2.9.0", + "minizlib": "^1.3.3", + "mkdirp": "^0.5.5", + "safe-buffer": "^5.2.1", + "yallist": "^3.1.1" + }, + "engines": { + "node": ">=4.5" + } + }, + "node_modules/pacote/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/pacote/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true + }, + "node_modules/parallel-transform": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz", + "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", + "dev": true, + "dependencies": { + "cyclist": "^1.0.1", + "inherits": "^2.0.3", + "readable-stream": "^2.1.5" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parents": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz", + "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==", + "dev": true, + "dependencies": { + "path-platform": "~0.11.15" + } + }, + "node_modules/parse-asn1": { + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz", + "integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==", + "dev": true, + "dependencies": { + "asn1.js": "^4.10.1", + "browserify-aes": "^1.2.0", + "evp_bytestokey": "^1.0.3", + "hash-base": "~3.0", + "pbkdf2": "^3.1.2", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/parse-entities": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", + "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", + "dev": true, + "dependencies": { + "character-entities": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "character-reference-invalid": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-hexadecimal": "^1.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + }, + "node_modules/path-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", + "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==", + "dev": true + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "devOptional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/path-platform": { + "version": "0.11.15", + "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz", + "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/pbkdf2": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", + "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", + "dev": true, + "dependencies": { + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/picocolors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "dev": true + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/postcss": { + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", + "dev": true, + "dependencies": { + "picocolors": "^0.2.1", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + } + }, + "node_modules/postcss-html": { + "version": "0.36.0", + "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz", + "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==", + "dev": true, + "dependencies": { + "htmlparser2": "^3.10.0" + }, + "peerDependencies": { + "postcss": ">=5.0.0", + "postcss-syntax": ">=0.36.0" + } + }, + "node_modules/postcss-less": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz", + "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==", + "dev": true, + "dependencies": { + "postcss": "^7.0.14" + }, + "engines": { + "node": ">=6.14.4" + } + }, + "node_modules/postcss-media-query-parser": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", + "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", + "dev": true + }, + "node_modules/postcss-resolve-nested-selector": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz", + "integrity": "sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==", + "dev": true + }, + "node_modules/postcss-safe-parser": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz", + "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==", + "dev": true, + "dependencies": { + "postcss": "^7.0.26" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/postcss-sass": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz", + "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==", + "dev": true, + "dependencies": { + "gonzales-pe": "^4.3.0", + "postcss": "^7.0.21" + } + }, + "node_modules/postcss-scss": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz", + "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==", + "dev": true, + "dependencies": { + "postcss": "^7.0.6" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "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==", + "dev": true, + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/postcss-syntax": { + "version": "0.36.2", + "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz", + "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==", + "dev": true, + "peerDependencies": { + "postcss": ">=5.0.0" + } + }, + "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 + }, + "node_modules/postcss/node_modules/picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "dev": true, + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "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==", + "dev": true, + "engines": { + "node": ">= 0.6.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true + }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "dev": true, + "dependencies": { + "asap": "~2.0.3" + } + }, + "node_modules/promise-inflight": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", + "dev": true + }, + "node_modules/promise-retry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz", + "integrity": "sha512-StEy2osPr28o17bIW776GtwO6+Q+M9zPiZkYfosciUUMYqjhU/ffwRAH0zN2+uvGyUsn8/YICIHRzLbPacpZGw==", + "dev": true, + "dependencies": { + "err-code": "^1.0.0", + "retry": "^0.10.0" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/protoduck": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz", + "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==", + "dev": true, + "dependencies": { + "genfun": "^5.0.0" + } + }, + "node_modules/pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", + "dev": true + }, + "node_modules/psl": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==" + }, + "node_modules/public-encrypt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", + "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", + "dev": true, + "dependencies": { + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "node_modules/public-encrypt/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/pug": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.3.tgz", + "integrity": "sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==", + "dev": true, + "dependencies": { + "pug-code-gen": "^3.0.3", + "pug-filters": "^4.0.0", + "pug-lexer": "^5.0.1", + "pug-linker": "^4.0.0", + "pug-load": "^3.0.0", + "pug-parser": "^6.0.0", + "pug-runtime": "^3.0.1", + "pug-strip-comments": "^2.0.0" + } + }, + "node_modules/pug-attrs": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz", + "integrity": "sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==", + "dev": true, + "dependencies": { + "constantinople": "^4.0.1", + "js-stringify": "^1.0.2", + "pug-runtime": "^3.0.0" + } + }, + "node_modules/pug-code-gen": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.3.tgz", + "integrity": "sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw==", + "dev": true, + "dependencies": { + "constantinople": "^4.0.1", + "doctypes": "^1.1.0", + "js-stringify": "^1.0.2", + "pug-attrs": "^3.0.0", + "pug-error": "^2.1.0", + "pug-runtime": "^3.0.1", + "void-elements": "^3.1.0", + "with": "^7.0.0" + } + }, + "node_modules/pug-error": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.1.0.tgz", + "integrity": "sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg==", + "dev": true + }, + "node_modules/pug-filters": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz", + "integrity": "sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==", + "dev": true, + "dependencies": { + "constantinople": "^4.0.1", + "jstransformer": "1.0.0", + "pug-error": "^2.0.0", + "pug-walk": "^2.0.0", + "resolve": "^1.15.1" + } + }, + "node_modules/pug-lexer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz", + "integrity": "sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==", + "dev": true, + "dependencies": { + "character-parser": "^2.2.0", + "is-expression": "^4.0.0", + "pug-error": "^2.0.0" + } + }, + "node_modules/pug-linker": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz", + "integrity": "sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==", + "dev": true, + "dependencies": { + "pug-error": "^2.0.0", + "pug-walk": "^2.0.0" + } + }, + "node_modules/pug-load": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz", + "integrity": "sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==", + "dev": true, + "dependencies": { + "object-assign": "^4.1.1", + "pug-walk": "^2.0.0" + } + }, + "node_modules/pug-parser": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz", + "integrity": "sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==", + "dev": true, + "dependencies": { + "pug-error": "^2.0.0", + "token-stream": "1.0.0" + } + }, + "node_modules/pug-runtime": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz", + "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==", + "dev": true + }, + "node_modules/pug-strip-comments": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz", + "integrity": "sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==", + "dev": true, + "dependencies": { + "pug-error": "^2.0.0" + } + }, + "node_modules/pug-walk": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz", + "integrity": "sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==", + "dev": true + }, + "node_modules/pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/pumpify": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", + "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", + "dev": true, + "dependencies": { + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" + } + }, + "node_modules/pumpify/node_modules/pump": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "dev": true, + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", + "dev": true + }, + "node_modules/qs": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "dev": true, + "dependencies": { + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/querystring-es3": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==", + "dev": true, + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/quick-lru": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/randomfill": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", + "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", + "dev": true, + "dependencies": { + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" + } + }, + "node_modules/read-only-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz", + "integrity": "sha512-3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w==", + "dev": true, + "dependencies": { + "readable-stream": "^2.0.2" + } + }, + "node_modules/read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "dev": true, + "dependencies": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "dev": true, + "dependencies": { + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg/node_modules/type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/readable-stream/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "node_modules/readable-stream/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/readdirp": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/redent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", + "dev": true, + "dependencies": { + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/remark": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz", + "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==", + "dev": true, + "dependencies": { + "remark-parse": "^9.0.0", + "remark-stringify": "^9.0.0", + "unified": "^9.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/remark-parse": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", + "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", + "dev": true, + "dependencies": { + "mdast-util-from-markdown": "^0.8.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/remark-stringify": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz", + "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==", + "dev": true, + "dependencies": { + "mdast-util-to-markdown": "^0.6.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", + "dev": true, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/reprism": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/reprism/-/reprism-0.0.11.tgz", + "integrity": "sha512-VsxDR5QxZo08M/3nRypNlScw5r3rKeSOPdU/QhDmu3Ai3BJxHn/qgfXGWQp/tAxUtzwYNo9W6997JZR0tPLZsA==", + "dev": true + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==" + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-dir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", + "dev": true, + "dependencies": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==", + "deprecated": "https://github.com/lydell/resolve-url#deprecated", + "dev": true + }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/retry": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz", + "integrity": "sha512-ZXUSQYTHdl3uS7IuCehYfMzKyIDBNoAuUblvy5oGO5UJSUTmStUUVPXbA9Qxd173Bgre53yCQczQuHgRWAdvJQ==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "devOptional": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/ripemd160": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", + "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", + "dev": true, + "dependencies": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1" + } + }, + "node_modules/run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/run-queue": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", + "integrity": "sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==", + "dev": true, + "dependencies": { + "aproba": "^1.1.1" + } + }, + "node_modules/run-queue/node_modules/aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "dev": true + }, + "node_modules/rw": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", + "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==", + "dev": true + }, + "node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.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==", + "devOptional": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/select2": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.13.tgz", + "integrity": "sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw==", + "dev": true + }, + "node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "devOptional": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/serialize-javascript": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", + "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "devOptional": true + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/sha.js": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + }, + "bin": { + "sha.js": "bin.js" + } + }, + "node_modules/shasum": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz", + "integrity": "sha512-UTzHm/+AzKfO9RgPgRpDIuMSNie1ubXRaljjlhFMNGYoG7z+rm9AHLPMf70R7887xboDH9Q+5YQbWKObFHEAtw==", + "dev": true, + "dependencies": { + "json-stable-stringify": "~0.0.0", + "sha.js": "~2.4.4" + } + }, + "node_modules/shasum-object": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz", + "integrity": "sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==", + "dev": true, + "dependencies": { + "fast-safe-stringify": "^2.0.7" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/shrinkpack": { + "version": "1.0.0-alpha", + "resolved": "https://registry.npmjs.org/shrinkpack/-/shrinkpack-1.0.0-alpha.tgz", + "integrity": "sha512-TrVN8iWydKT69kM9/8MQDv10qWYlPk+y+svpsenAwkg4J7GHE+YQLerR+g/LJ0DV3w7fNiE+lZletaMQWpMfDA==", + "dev": true, + "dependencies": { + "chalk": "2.4.1", + "commander": "2.15.1", + "libprecious": "1.9.0", + "npmlog": "4.1.2" + }, + "bin": { + "shrinkpack": "cli.js" + }, + "engines": { + "node": ">=4.0", + "npm": "<=5.8.0" + } + }, + "node_modules/shrinkpack/node_modules/ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/shrinkpack/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/shrinkpack/node_modules/aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "dev": true + }, + "node_modules/shrinkpack/node_modules/are-we-there-yet": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", + "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", + "deprecated": "This package is no longer supported.", + "dev": true, + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "node_modules/shrinkpack/node_modules/chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/shrinkpack/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/shrinkpack/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/shrinkpack/node_modules/commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", + "dev": true + }, + "node_modules/shrinkpack/node_modules/gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==", + "deprecated": "This package is no longer supported.", + "dev": true, + "dependencies": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "node_modules/shrinkpack/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/shrinkpack/node_modules/is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", + "dev": true, + "dependencies": { + "number-is-nan": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/shrinkpack/node_modules/npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "deprecated": "This package is no longer supported.", + "dev": true, + "dependencies": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "node_modules/shrinkpack/node_modules/string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", + "dev": true, + "dependencies": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/shrinkpack/node_modules/strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", + "dev": true, + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/shrinkpack/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/side-channel": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "devOptional": true + }, + "node_modules/simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "devOptional": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/simple-get": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz", + "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==", + "devOptional": true, + "dependencies": { + "decompress-response": "^4.2.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", + "is-fullwidth-code-point": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/slice-ansi/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/slice-ansi/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/slice-ansi/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/smart-buffer": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz", + "integrity": "sha512-1+8bxygjTsNfvQe0/0pNBesTOlSHtOeG6b6LYbvsZCCHDKYZ40zcQo6YTnZBWrBSLWOCbrHljLdEmGMYebu7aQ==", + "dev": true, + "engines": { + "node": ">= 0.10.15", + "npm": ">= 1.3.5" + } + }, + "node_modules/smartmenus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/smartmenus/-/smartmenus-1.0.0.tgz", + "integrity": "sha512-xKvo0DvAgN6yfRyUyAGra4+34aztwiNpSPrKW2Rt153eboxOhD/URQon9d39IlvetKq/3pYS3OgTeDRV76y46g==", + "dev": true, + "dependencies": { + "jquery": ">=1.4.4" + } + }, + "node_modules/socks": { + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz", + "integrity": "sha512-ArX4vGPULWjKDKgUnW8YzfI2uXW7kzgkJuB0GnFBA/PfT3exrrOk+7Wk2oeb894Qf20u1PWv9LEgrO0Z82qAzA==", + "deprecated": "If using 2.x branch, please upgrade to at least 2.1.6 to avoid a serious bug with socket data flow and an import issue introduced in 2.1.0", + "dev": true, + "dependencies": { + "ip": "^1.1.4", + "smart-buffer": "^1.0.13" + }, + "engines": { + "node": ">= 0.10.0", + "npm": ">= 1.3.5" + } + }, + "node_modules/socks-proxy-agent": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz", + "integrity": "sha512-ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA==", + "dev": true, + "dependencies": { + "agent-base": "^4.1.0", + "socks": "^1.1.10" + } + }, + "node_modules/socks-proxy-agent/node_modules/agent-base": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", + "dev": true, + "dependencies": { + "es6-promisify": "^5.0.0" + }, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "devOptional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-resolve": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", + "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", + "dev": true, + "dependencies": { + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/source-map-url": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", + "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", + "deprecated": "See https://github.com/lydell/source-map-url#deprecated", + "dev": true + }, + "node_modules/spark-md5": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.2.tgz", + "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==", + "dev": true + }, + "node_modules/spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "dev": true, + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "dev": true + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", + "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", + "dev": true + }, + "node_modules/specificity": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz", + "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==", + "dev": true, + "bin": { + "specificity": "bin/specificity" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "node_modules/ssri": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", + "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.1" + } + }, + "node_modules/stream-browserify": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", + "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", + "dev": true, + "dependencies": { + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" + } + }, + "node_modules/stream-combiner2": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz", + "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==", + "dev": true, + "dependencies": { + "duplexer2": "~0.1.0", + "readable-stream": "^2.0.2" + } + }, + "node_modules/stream-each": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", + "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", + "dev": true, + "dependencies": { + "end-of-stream": "^1.1.0", + "stream-shift": "^1.0.0" + } + }, + "node_modules/stream-http": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", + "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", + "dev": true, + "dependencies": { + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "xtend": "^4.0.2" + } + }, + "node_modules/stream-http/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/stream-shift": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz", + "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==", + "dev": true + }, + "node_modules/stream-splicer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz", + "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" + } + }, + "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==", + "devOptional": true, + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "devOptional": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "devOptional": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-css-comments": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-css-comments/-/strip-css-comments-3.0.0.tgz", + "integrity": "sha512-xJwk2yMZ6j+0Clj7ETUfqQ6frsaCIqNGg3zjTVswIt3SbiOsCQgRI1E93hdt/JgGfh5De/sTwxrnrBhhWzMwcg==", + "dev": true, + "dependencies": { + "is-regexp": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-indent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", + "dev": true, + "dependencies": { + "min-indent": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/style-search": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", + "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==", + "dev": true + }, + "node_modules/stylelint": { + "version": "13.7.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.7.0.tgz", + "integrity": "sha512-1wStd4zVetnlHO98VjcHQbjSDmvcA39smkZQMct2cf+hom40H0xlQNdzzbswoG/jGBh61/Ue9m7Lu99PY51O6A==", + "dev": true, + "dependencies": { + "@stylelint/postcss-css-in-js": "^0.37.2", + "@stylelint/postcss-markdown": "^0.36.1", + "autoprefixer": "^9.8.6", + "balanced-match": "^1.0.0", + "chalk": "^4.1.0", + "cosmiconfig": "^7.0.0", + "debug": "^4.1.1", + "execall": "^2.0.0", + "fast-glob": "^3.2.4", + "fastest-levenshtein": "^1.0.12", + "file-entry-cache": "^5.0.1", + "get-stdin": "^8.0.0", + "global-modules": "^2.0.0", + "globby": "^11.0.1", + "globjoin": "^0.1.4", + "html-tags": "^3.1.0", + "ignore": "^5.1.8", + "import-lazy": "^4.0.0", + "imurmurhash": "^0.1.4", + "known-css-properties": "^0.19.0", + "lodash": "^4.17.20", + "log-symbols": "^4.0.0", + "mathml-tag-names": "^2.1.3", + "meow": "^7.1.1", + "micromatch": "^4.0.2", + "normalize-selector": "^0.2.0", + "postcss": "^7.0.32", + "postcss-html": "^0.36.0", + "postcss-less": "^3.1.4", + "postcss-media-query-parser": "^0.2.3", + "postcss-resolve-nested-selector": "^0.1.1", + "postcss-safe-parser": "^4.0.2", + "postcss-sass": "^0.4.4", + "postcss-scss": "^2.1.1", + "postcss-selector-parser": "^6.0.2", + "postcss-syntax": "^0.36.2", + "postcss-value-parser": "^4.1.0", + "resolve-from": "^5.0.0", + "slash": "^3.0.0", + "specificity": "^0.4.1", + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "style-search": "^0.1.0", + "sugarss": "^2.0.0", + "svg-tags": "^1.0.0", + "table": "^6.0.1", + "v8-compile-cache": "^2.1.1", + "write-file-atomic": "^3.0.3" + }, + "bin": { + "stylelint": "bin/stylelint.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/stylelint" + } + }, + "node_modules/stylelint/node_modules/ajv": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, + "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/stylelint/node_modules/astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/stylelint/node_modules/global-modules": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", + "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", + "dev": true, + "dependencies": { + "global-prefix": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/stylelint/node_modules/global-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", + "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", + "dev": true, + "dependencies": { + "ini": "^1.3.5", + "kind-of": "^6.0.2", + "which": "^1.3.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/stylelint/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 + }, + "node_modules/stylelint/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/stylelint/node_modules/slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/stylelint/node_modules/table": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz", + "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==", + "dev": true, + "dependencies": { + "ajv": "^8.0.1", + "lodash.truncate": "^4.4.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/stylelint/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/subarg": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", + "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==", + "dev": true, + "dependencies": { + "minimist": "^1.1.0" + } + }, + "node_modules/sugarss": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz", + "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==", + "dev": true, + "dependencies": { + "postcss": "^7.0.2" + } + }, + "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, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/svg-tags": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", + "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==", + "dev": true + }, + "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==" + }, + "node_modules/syntax-error": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz", + "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==", + "dev": true, + "dependencies": { + "acorn-node": "^1.2.0" + } + }, + "node_modules/table": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "dev": true, + "dependencies": { + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/table/node_modules/ansi-regex": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/table/node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "node_modules/table/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/table/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/table/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "devOptional": true, + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar/node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "devOptional": true, + "engines": { + "node": ">=10" + } + }, + "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==", + "devOptional": true, + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "devOptional": true + }, + "node_modules/terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "dependencies": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "bin": { + "terser": "bin/uglifyjs" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true + }, + "node_modules/through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "dev": true, + "dependencies": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + }, + "node_modules/timers-browserify": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz", + "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==", + "dev": true, + "dependencies": { + "process": "~0.11.0" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/token-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz", + "integrity": "sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==", + "dev": true + }, + "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==", + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tough-cookie/node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/tough-cookie/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==", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tr46/node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/trim-newlines": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/trough": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", + "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/tty-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", + "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==", + "dev": true + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", + "dev": true + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "node_modules/typescript": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz", + "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/uglify-js": { + "version": "3.17.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", + "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", + "dev": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/uglifycss": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/uglifycss/-/uglifycss-0.0.29.tgz", + "integrity": "sha512-J2SQ2QLjiknNGbNdScaNZsXgmMGI0kYNrXaDlr4obnPW9ni1jljb1NeEVWAiTgZ8z+EBWP2ozfT9vpy03rjlMQ==", + "dev": true, + "bin": { + "uglifycss": "uglifycss" + }, + "engines": { + "node": ">=6.4.0" + } + }, + "node_modules/uglifyify": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/uglifyify/-/uglifyify-5.0.2.tgz", + "integrity": "sha512-NcSk6pgoC+IgwZZ2tVLVHq+VNKSvLPlLkF5oUiHPVOJI0s/OlSVYEGXG9PCAH0hcyFZLyvt4KBdPAQBRlVDn1Q==", + "dev": true, + "dependencies": { + "convert-source-map": "~1.1.0", + "minimatch": "^3.0.2", + "terser": "^3.7.5", + "through": "~2.3.4", + "xtend": "^4.0.1" + } + }, + "node_modules/umd": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz", + "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==", + "dev": true, + "bin": { + "umd": "bin/cli.js" + } + }, + "node_modules/undeclared-identifiers": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz", + "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==", + "dev": true, + "dependencies": { + "acorn-node": "^1.3.0", + "dash-ast": "^1.0.0", + "get-assigned-identifiers": "^1.2.0", + "simple-concat": "^1.0.0", + "xtend": "^4.0.1" + }, + "bin": { + "undeclared-identifiers": "bin.js" + } + }, + "node_modules/unified": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", + "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", + "dev": true, + "dependencies": { + "bail": "^1.0.0", + "extend": "^3.0.0", + "is-buffer": "^2.0.0", + "is-plain-obj": "^2.0.0", + "trough": "^1.0.0", + "vfile": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unified/node_modules/is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "engines": { + "node": ">=4" + } + }, + "node_modules/unified/node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/unique-filename": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", + "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", + "dev": true, + "dependencies": { + "unique-slug": "^2.0.0" + } + }, + "node_modules/unique-slug": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", + "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4" + } + }, + "node_modules/unist-util-find-all-after": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz", + "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==", + "dev": true, + "dependencies": { + "unist-util-is": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-is": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", + "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-stringify-position": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", + "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", + "dev": true, + "dependencies": { + "@types/unist": "^2.0.2" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", + "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "escalade": "^3.1.2", + "picocolors": "^1.0.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/uri-js/node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==", + "deprecated": "Please see https://github.com/lydell/urix#deprecated", + "dev": true + }, + "node_modules/url": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz", + "integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==", + "dev": true, + "dependencies": { + "punycode": "^1.4.1", + "qs": "^6.12.3" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, + "node_modules/util": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", + "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "dev": true, + "dependencies": { + "inherits": "2.0.3" + } + }, + "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==", + "devOptional": true + }, + "node_modules/util/node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", + "dev": true + }, + "node_modules/v8-compile-cache": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz", + "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==", + "dev": true + }, + "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==", + "dev": true, + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/validate-npm-package-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", + "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==", + "dev": true, + "dependencies": { + "builtins": "^1.0.3" + } + }, + "node_modules/vfile": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", + "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", + "dev": true, + "dependencies": { + "@types/unist": "^2.0.0", + "is-buffer": "^2.0.0", + "unist-util-stringify-position": "^2.0.0", + "vfile-message": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vfile-message": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", + "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", + "dev": true, + "dependencies": { + "@types/unist": "^2.0.0", + "unist-util-stringify-position": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vfile/node_modules/is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "engines": { + "node": ">=4" + } + }, + "node_modules/vm-browserify": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", + "dev": 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==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.", + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "engines": { + "node": ">=10.4" + } + }, + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==" + }, + "node_modules/whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-module": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", + "dev": true + }, + "node_modules/wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "devOptional": true, + "dependencies": { + "string-width": "^1.0.2 || 2" + } + }, + "node_modules/wide-align/node_modules/ansi-regex": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", + "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", + "devOptional": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/wide-align/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "devOptional": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/wide-align/node_modules/string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "devOptional": true, + "dependencies": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/wide-align/node_modules/strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", + "devOptional": true, + "dependencies": { + "ansi-regex": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/with": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/with/-/with-7.0.2.tgz", + "integrity": "sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "assert-never": "^1.2.1", + "babel-walk": "3.0.0-canary-5" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/workerpool": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz", + "integrity": "sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==", + "dev": true + }, + "node_modules/wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/wrap-ansi/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/wrap-ansi/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/wrap-ansi/node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "devOptional": true + }, + "node_modules/write": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", + "dev": true, + "dependencies": { + "mkdirp": "^0.5.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/ws": { + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==" + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" + }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "dev": true, + "engines": { + "node": ">=0.4" + } + }, + "node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, + "node_modules/yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", + "dev": true + }, + "node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "dependencies": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "node_modules/yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs-unparser/node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs-unparser/node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "node_modules/yargs/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/yargs/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/yargs/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/zwitch": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", + "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + } + } +} diff --git a/pkgs/by-name/co/collabora-online/package.nix b/pkgs/by-name/co/collabora-online/package.nix new file mode 100644 index 0000000000000..489894bd1d841 --- /dev/null +++ b/pkgs/by-name/co/collabora-online/package.nix @@ -0,0 +1,105 @@ +{ + autoreconfHook, + cairo, + cppunit, + fetchFromGitHub, + fetchNpmDeps, + lib, + libcap, + libpng, + libreoffice-collabora, + nodejs, + npmHooks, + pam, + pango, + pixman, + pkg-config, + poco, + python3, + rsync, + stdenv, + zstd, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "collabora-online"; + version = "24.04.6-1"; + + src = fetchFromGitHub { + owner = "CollaboraOnline"; + repo = "online"; + rev = "refs/tags/cp-${finalAttrs.version}"; + hash = "sha256-0IvymvXAozsjm+GXJK9AGWo79QMaIACrAfkYfX67fBc="; + }; + + nativeBuildInputs = [ + autoreconfHook + nodejs + npmHooks.npmConfigHook + pkg-config + python3 + python3.pkgs.lxml + python3.pkgs.polib + rsync + ]; + + buildInputs = [ + cairo + cppunit + libcap + libpng + pam + pango + pixman + poco + zstd + ]; + + configureFlags = [ + "--disable-setcap" + "--disable-werror" + "--enable-silent-rules" + "--with-lo-path=${libreoffice-collabora}/lib/collaboraoffice" + "--with-lokit-path=${libreoffice-collabora.src}/include" + ]; + + patches = [ ./fix-file-server-regex.patch ]; + + postPatch = '' + cp ${./package-lock.json} ${finalAttrs.npmRoot}/package-lock.json + + patchShebangs browser/util/*.py coolwsd-systemplate-setup scripts/* + substituteInPlace configure.ac --replace-fail '/usr/bin/env python3' python3 + substituteInPlace coolwsd-systemplate-setup --replace-fail /bin/pwd pwd + ''; + + # Copy dummy self-signed certificates provided for testing. + postInstall = '' + cp etc/ca-chain.cert.pem etc/cert.pem etc/key.pem $out/etc/coolwsd + ''; + + npmDeps = fetchNpmDeps { + unpackPhase = "true"; + # TODO: Use upstream `npm-shrinkwrap.json` once it's fixed + # https://github.com/CollaboraOnline/online/issues/9644 + postPatch = '' + cp ${./package-lock.json} package-lock.json + ''; + hash = "sha256-CUh+jwJnKtmzk8w6QwH1Nh92500dFj63ThkI4tN5FyQ="; + }; + + npmRoot = "browser"; + + passthru = { + libreoffice = libreoffice-collabora; # Used by NixOS module. + updateScript = ./update.sh; + }; + + meta = { + description = "Collaborative online office suite based on LibreOffice technology"; + license = lib.licenses.mpl20; + maintainers = [ lib.maintainers.xzfc ]; + homepage = "https://www.collaboraonline.com"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/co/collabora-online/update.sh b/pkgs/by-name/co/collabora-online/update.sh new file mode 100755 index 0000000000000..5ff4d1dfc0ac3 --- /dev/null +++ b/pkgs/by-name/co/collabora-online/update.sh @@ -0,0 +1,38 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p common-updater-scripts prefetch-npm-deps jq sd +#shellcheck shell=bash + +set -xeu -o pipefail + +PACKAGE_DIR="$(realpath "$(dirname "$0")")" +cd "$PACKAGE_DIR/.." +while ! test -f default.nix; do cd .. ; done +NIXPKGS_DIR="$PWD" + +new_version="$( + list-git-tags --url=https://github.com/CollaboraOnline/online \ + | grep --perl-regex --only-matching '^cp-\K[0-9.-]+$' \ + | sort --version-sort \ + | tail -n1 +)" + +cd "$NIXPKGS_DIR" +update-source-version collabora-online "$new_version" + +TMPDIR="$(mktemp -d)" +trap 'rm -rf "$TMPDIR"' EXIT +cd "$TMPDIR" + +src="$(nix-build --no-link "$NIXPKGS_DIR" -A collabora-online.src)" +cp "$src"/browser/package.json . +npm install --package-lock-only +cp ./package-lock.json "$PACKAGE_DIR" + +prev_npm_hash="$(nix-instantiate "$NIXPKGS_DIR" \ + --eval --json \ + -A collabora-online.npmDeps.hash \ + | jq -r . +)" +new_npm_hash="$(prefetch-npm-deps ./package-lock.json)" + +sd --fixed-strings "$prev_npm_hash" "$new_npm_hash" "$PACKAGE_DIR/package.nix" diff --git a/pkgs/by-name/co/color-transformation-language/package.nix b/pkgs/by-name/co/color-transformation-language/package.nix new file mode 100644 index 0000000000000..7fe0b5c661bea --- /dev/null +++ b/pkgs/by-name/co/color-transformation-language/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ilmbase, + openexr_3, + libtiff, + aces-container, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ctl"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "ampas"; + repo = "CTL"; + rev = "ctl-${finalAttrs.version}"; + hash = "sha256-jG+38jsPw+4CEAbOG+hudfPBPbZLG+Om7PszkFa6DuI="; + }; + + nativeBuildInputs = [ + cmake + ilmbase + openexr_3 + libtiff + aces-container + ]; + + meta = { + description = "Programming language for digital color management"; + homepage = "https://github.com/ampas/CTL"; + changelog = "https://github.com/ampas/CTL/blob/${finalAttrs.src.rev}/CHANGELOG"; + license = lib.licenses.ampas; + maintainers = with lib.maintainers; [ paperdigits ]; + mainProgram = "ctl"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/co/comet-gog/package.nix b/pkgs/by-name/co/comet-gog/package.nix index 35677d4bf08d1..f601930057058 100644 --- a/pkgs/by-name/co/comet-gog/package.nix +++ b/pkgs/by-name/co/comet-gog/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { env.PROTOC = lib.getExe' protobuf "protoc"; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation SystemConfiguration ]; diff --git a/pkgs/by-name/co/comic-mandown/package.nix b/pkgs/by-name/co/comic-mandown/package.nix index 15b81cc5e83e7..90f2ef2155003 100644 --- a/pkgs/by-name/co/comic-mandown/package.nix +++ b/pkgs/by-name/co/comic-mandown/package.nix @@ -4,8 +4,8 @@ , withGUI ? true }: let - mandown' = python3Packages.mandown.overrideAttrs (prev: { - propagatedBuildInputs = prev.propagatedBuildInputs ++ lib.optionals withGUI prev.passthru.optional-dependencies.gui; + mandown' = python3Packages.mandown.overridePythonAttrs (prev: { + propagatedBuildInputs = prev.propagatedBuildInputs ++ lib.optionals withGUI prev.optional-dependencies.gui; }); mandownApp = python3Packages.toPythonApplication mandown'; in diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/by-name/co/comic-neue/package.nix similarity index 100% rename from pkgs/data/fonts/comic-neue/default.nix rename to pkgs/by-name/co/comic-neue/package.nix diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix index 61cad3e9682e1..297d36ddb1793 100644 --- a/pkgs/by-name/co/commafeed/package.nix +++ b/pkgs/by-name/co/commafeed/package.nix @@ -1,5 +1,6 @@ { lib, + biome, buildNpmPackage, fetchFromGitHub, jre, @@ -9,13 +10,13 @@ writeText, }: let - version = "4.3.3"; + version = "4.6.0"; src = fetchFromGitHub { owner = "Athou"; repo = "commafeed"; rev = version; - hash = "sha256-y0gTmtlDg7sdunG1ne/3WkFx2KQkTGRlfYpXBHFFh2o="; + hash = "sha256-Qc2l/CSVK+8k7b3RZA8hQsGTq29OvkDMbMzHcnPm/yE="; }; frontend = buildNpmPackage { @@ -25,7 +26,9 @@ let sourceRoot = "${src.name}/commafeed-client"; - npmDepsHash = "sha256-fye7MPWXUeFCMgcnesspd1giGG/ZldiOv00fjtXZSb4="; + npmDepsHash = "sha256-bQShz6dmE9IZ9to5Z2DScncc/WVJnX1tRCm8XQJNmiU="; + + nativeBuildInputs = [ biome ]; installPhase = '' runHook preInstall @@ -49,7 +52,7 @@ maven.buildMavenPackage { pname = "commafeed"; - mvnHash = "sha256-LDZv3CBc/FpVMKmZ+kqfBdkTbqZcJMRqeXN35t4rwJI="; + mvnHash = "sha256-7nm8Cz05Qa44TMC0ioklvKAXQnE9J2wUDZFXLQt2A1w="; mvnParameters = lib.escapeShellArgs [ "-Dskip.installnodenpm" diff --git a/pkgs/by-name/co/committed/package.nix b/pkgs/by-name/co/committed/package.nix index cd42172fde9f7..229414b14f682 100644 --- a/pkgs/by-name/co/committed/package.nix +++ b/pkgs/by-name/co/committed/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { }; cargoHash = "sha256-AmAEGVWq6KxLtiHDGIFVcoP1Wck8z+P9mnDy0SSSJNM="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; passthru = { tests.version = testers.testVersion { package = committed; }; diff --git a/pkgs/by-name/co/compose2nix/package.nix b/pkgs/by-name/co/compose2nix/package.nix index 87b875ab33f3d..af02f0d7c6dac 100644 --- a/pkgs/by-name/co/compose2nix/package.nix +++ b/pkgs/by-name/co/compose2nix/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "compose2nix"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "aksiksi"; repo = "compose2nix"; rev = "v${version}"; - hash = "sha256-2t4pXTzd5TDpAOzNS8MfnE9p8Rm55OPLaEpSPF4/UbE="; + hash = "sha256-qN7MFw6JKBbzwiqURkZ3or/8hT29mRpfITovSHdzDEY="; }; - vendorHash = "sha256-SwJzyOXE23BLoJ+efFuSIhDTMjirEUmBhGGmgrnKhXw="; + vendorHash = "sha256-yGBdsej6DjRMWzS13WyqCLaY5M/N9BrMARAM3oHsc+s="; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix index 80b832a56174e..3a08789beffb3 100644 --- a/pkgs/by-name/co/composefs/package.nix +++ b/pkgs/by-name/co/composefs/package.nix @@ -1,8 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch - , meson , ninja , go-md2man @@ -25,20 +23,21 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "composefs"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "containers"; repo = "composefs"; rev = "v${finalAttrs.version}"; - hash = "sha256-2h0wwtuhvFz5IExR/Fu0l+/nTAlDpMREVRjgrhbEghw="; + hash = "sha256-9YEY7oTjWwVT2KbzTOOc6sJIGEAkdLSKDf1noF1cYuA="; }; strictDeps = true; outputs = [ "out" "lib" "dev" ]; postPatch = lib.optionalString installExperimentalTools '' - sed -i "s/install : false/install : true/g" tools/meson.build + substituteInPlace tools/meson.build \ + --replace-fail "install : false" "install : true" ''; nativeBuildInputs = [ meson ninja go-md2man pkg-config ]; diff --git a/pkgs/by-name/co/concord/package.nix b/pkgs/by-name/co/concord/package.nix index b79368bf0ff95..97c31704ba365 100644 --- a/pkgs/by-name/co/concord/package.nix +++ b/pkgs/by-name/co/concord/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "concord"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Cogmasters"; repo = "concord"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-8k/W6007U1/s3vx03i1929a5RKZtpW/jOr4JDwmzwp8="; + hash = "sha256-yTFGRnhDzxU+dPeZbCWlm52gsmEgD2el+46c8XQBQng="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/by-name/co/conduwuit/Cargo.lock b/pkgs/by-name/co/conduwuit/Cargo.lock new file mode 100644 index 0000000000000..ca348f4117116 --- /dev/null +++ b/pkgs/by-name/co/conduwuit/Cargo.lock @@ -0,0 +1,5043 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "argon2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" +dependencies = [ + "base64ct", + "blake2", + "cpufeatures", + "password-hash", +] + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "as_variant" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" + +[[package]] +name = "assign" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" + +[[package]] +name = "async-compression" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "zstd", + "zstd-safe", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "async-trait" +version = "0.1.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "aws-lc-rs" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0e249228c6ad2d240c2dc94b714d711629d52bad946075d8e9b2f5391f0703" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-client-ip" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72188bed20deb981f3a4a9fe674e5980fd9e9c2bd880baa94715ad5d60d64c67" +dependencies = [ + "axum", + "forwarded-header-value", + "serde", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-extra" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" +dependencies = [ + "axum", + "axum-core", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "serde", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-server" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56bac90848f6a9393ac03c63c640925c4b7c8ca21654de40d53f55964667c7d8" +dependencies = [ + "arc-swap", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "pin-project-lite", + "rustls 0.23.12", + "rustls-pemfile", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower 0.4.13", + "tower-service", +] + +[[package]] +name = "axum-server-dual-protocol" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2164551db024e87f20316d164eab9f5ad342d8188b08051ceb15ca92a60ea7b7" +dependencies = [ + "axum-server", + "bytes", + "http", + "http-body-util", + "pin-project", + "rustls 0.23.12", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.7.4", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.76", + "which", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cargo_toml" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad639525b1c67b6a298f378417b060fbc04618bea559482a8484381cce27d965" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "cc" +version = "1.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "checked_ops" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b491d76efc1d99d74de3c8529bee64c62312c275c7eb124f9185291de45801d5" +dependencies = [ + "num-traits", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "num-traits", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +dependencies = [ + "anstyle", + "clap_lex", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "cmake" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +dependencies = [ + "cc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "conduit" +version = "0.4.6" +dependencies = [ + "clap", + "conduit_admin", + "conduit_api", + "conduit_core", + "conduit_database", + "conduit_router", + "conduit_service", + "console-subscriber", + "const-str", + "hardened_malloc-rs", + "log", + "opentelemetry", + "opentelemetry-jaeger", + "opentelemetry_sdk", + "sentry", + "sentry-tower", + "sentry-tracing", + "tokio", + "tokio-metrics", + "tracing", + "tracing-flame", + "tracing-opentelemetry", + "tracing-subscriber", +] + +[[package]] +name = "conduit_admin" +version = "0.4.6" +dependencies = [ + "clap", + "conduit_api", + "conduit_core", + "conduit_macros", + "conduit_service", + "const-str", + "futures-util", + "log", + "ruma", + "serde_json", + "serde_yaml", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "conduit_api" +version = "0.4.6" +dependencies = [ + "axum", + "axum-client-ip", + "axum-extra", + "base64 0.22.1", + "bytes", + "conduit_core", + "conduit_database", + "conduit_service", + "const-str", + "futures-util", + "hmac", + "http", + "http-body-util", + "hyper", + "ipaddress", + "jsonwebtoken", + "log", + "rand", + "reqwest", + "ruma", + "serde", + "serde_html_form", + "serde_json", + "sha-1", + "tokio", + "tracing", +] + +[[package]] +name = "conduit_core" +version = "0.4.6" +dependencies = [ + "argon2", + "arrayvec", + "axum", + "bytes", + "cargo_toml", + "checked_ops", + "chrono", + "clap", + "conduit_macros", + "const-str", + "ctor", + "cyborgtime", + "either", + "figment", + "hardened_malloc-rs", + "http", + "http-body-util", + "image", + "ipaddress", + "itertools 0.13.0", + "libloading", + "log", + "nix", + "rand", + "regex", + "reqwest", + "ring", + "ruma", + "rustls 0.23.12", + "sanitize-filename", + "serde", + "serde_json", + "serde_regex", + "thiserror", + "tikv-jemalloc-ctl", + "tikv-jemalloc-sys", + "tikv-jemallocator", + "tokio", + "tokio-metrics", + "toml", + "tracing", + "tracing-core", + "tracing-subscriber", + "url", +] + +[[package]] +name = "conduit_database" +version = "0.4.6" +dependencies = [ + "conduit_core", + "const-str", + "log", + "rust-rocksdb-uwu", + "tokio", + "tracing", +] + +[[package]] +name = "conduit_macros" +version = "0.4.6" +dependencies = [ + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "conduit_router" +version = "0.4.6" +dependencies = [ + "axum", + "axum-client-ip", + "axum-server", + "axum-server-dual-protocol", + "bytes", + "conduit_admin", + "conduit_api", + "conduit_core", + "conduit_service", + "const-str", + "http", + "http-body-util", + "hyper", + "hyper-util", + "log", + "ruma", + "rustls 0.23.12", + "sd-notify", + "sentry", + "sentry-tower", + "sentry-tracing", + "serde_json", + "tokio", + "tower 0.5.0", + "tower-http", + "tracing", +] + +[[package]] +name = "conduit_service" +version = "0.4.6" +dependencies = [ + "async-trait", + "base64 0.22.1", + "bytes", + "conduit_core", + "conduit_database", + "const-str", + "futures-util", + "hickory-resolver", + "http", + "image", + "ipaddress", + "itertools 0.13.0", + "jsonwebtoken", + "log", + "loole", + "lru-cache", + "rand", + "regex", + "reqwest", + "ruma", + "rustyline-async", + "serde", + "serde_json", + "serde_yaml", + "sha2", + "termimad", + "tokio", + "tracing", + "url", + "webpage", +] + +[[package]] +name = "console-api" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ed14aa9c9f927213c6e4f3ef75faaad3406134efe84ba2cb7983431d5f0931" +dependencies = [ + "futures-core", + "prost", + "prost-types", + "tonic", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e3a111a37f3333946ebf9da370ba5c5577b18eb342ec683eb488dd21980302" +dependencies = [ + "console-api", + "crossbeam-channel", + "crossbeam-utils", + "futures-task", + "hdrhistogram", + "humantime", + "hyper-util", + "prost", + "prost-types", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "const-str" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3618cccc083bb987a415d85c02ca6c9994ea5b44731ec28b9ecf09658655fba9" + +[[package]] +name = "const_panic" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" + +[[package]] +name = "coolor" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "691defa50318376447a73ced869862baecfab35f6aabaa91a4cd726b315bfe1a" +dependencies = [ + "crossterm", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crokey" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520e83558f4c008ac06fa6a86e5c1d4357be6f994cce7434463ebcdaadf47bb1" +dependencies = [ + "crokey-proc_macros", + "crossterm", + "once_cell", + "serde", + "strict", +] + +[[package]] +name = "crokey-proc_macros" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "370956e708a1ce65fe4ac5bb7185791e0ece7485087f17736d54a23a0895049f" +dependencies = [ + "crossterm", + "proc-macro2", + "quote", + "strict", + "syn 1.0.109", +] + +[[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.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "futures-core", + "mio", + "parking_lot", + "rustix", + "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 = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn 2.0.76", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "cyborgtime" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "817fa642fb0ee7fe42e95783e00e0969927b96091bdd4b9b1af082acd943913b" + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "date_header" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "serde", + "uuid", +] + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek", + "ed25519", + "rand_core", + "serde", + "sha2", + "subtle", + "zeroize", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] + +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[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 = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "figment" +version = "0.10.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" +dependencies = [ + "atomic", + "pear", + "serde", + "toml", + "uncased", + "version_check", +] + +[[package]] +name = "findshlibs" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" +dependencies = [ + "cc", + "lazy_static", + "libc", + "winapi", +] + +[[package]] +name = "flate2" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" +dependencies = [ + "crc32fast", + "miniz_oxide 0.8.0", +] + +[[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 = "forwarded-header-value" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9" +dependencies = [ + "nonempty", + "thiserror", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap 2.4.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hardened_malloc-rs" +version = "0.1.2+12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "647deb1583b14d160f85f3ff626f20b6edd366e3852c9843b06077388f794cb6" + +[[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 = "hdrhistogram" +version = "7.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" +dependencies = [ + "base64 0.21.7", + "byteorder", + "flate2", + "nom", + "num-traits", +] + +[[package]] +name = "headers" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hickory-proto" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if", + "libc", + "windows", +] + +[[package]] +name = "html5ever" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-auth" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643c9bbf6a4ea8a656d6b4cd53d34f79e3f841ad5203c1a55fb7d761923bc255" +dependencies = [ + "memchr", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls 0.23.12", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower 0.4.13", + "tower-service", + "tracing", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "color_quant", + "gif", + "image-webp", + "num-traits", + "png", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +dependencies = [ + "byteorder-lite", + "quick-error 2.0.1", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "integer-encoding" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" + +[[package]] +name = "ipaddress" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957bb9f3645d6bb7f36df99d5105b4866aa79749819d7c176a170a27dc477cbf" +dependencies = [ + "lazy_static", + "libc", + "num", + "num-integer", + "num-traits", + "regex", +] + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2", + "widestring", + "windows-sys 0.48.0", + "winreg", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "js_int" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a" +dependencies = [ + "serde", +] + +[[package]] +name = "js_option" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" +dependencies = [ + "serde", +] + +[[package]] +name = "jsonwebtoken" +version = "9.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +dependencies = [ + "base64 0.21.7", + "js-sys", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "konst" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50a0ba6de5f7af397afff922f22c149ff605c766cd3269cf6c1cd5e466dbe3b9" +dependencies = [ + "const_panic", + "konst_kernel", + "typewit", +] + +[[package]] +name = "konst_kernel" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0a455a1719220fd6adf756088e1c69a85bf14b6a9e24537a5cc04f503edb2b" +dependencies = [ + "typewit", +] + +[[package]] +name = "lazy-regex" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d8e41c97e6bc7ecb552016274b99fbb5d035e8de288c582d9b933af6677bfda" +dependencies = [ + "lazy-regex-proc_macros", + "once_cell", + "regex", +] + +[[package]] +name = "lazy-regex-proc_macros" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76e1d8b05d672c53cb9c7b920bbba8783845ae4f0b076e02a3db1d02c81b4163" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 2.0.76", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libz-sys" +version = "1.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "loole" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad95468e4700cb37d8d1f198050db18cebe55e4b4c8aa9180a715deedb2f8965" + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "lz4-sys" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "markup5ever" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" +dependencies = [ + "log", + "phf", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever_rcdom" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18" +dependencies = [ + "html5ever", + "markup5ever", + "tendril", + "xml5ever", +] + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimad" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c5d708226d186590a7b6d4a9780e2bdda5f689e0d58cd17012a298efd745d2" +dependencies = [ + "once_cell", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "log", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nonempty" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.36.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "opentelemetry" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" +dependencies = [ + "futures-core", + "futures-sink", + "indexmap 2.4.0", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", +] + +[[package]] +name = "opentelemetry-jaeger" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e617c66fd588e40e0dbbd66932fdc87393095b125d4459b1a3a10feb1712f8a1" +dependencies = [ + "async-trait", + "futures-core", + "futures-util", + "opentelemetry", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", + "thrift", + "tokio", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry", + "ordered-float 4.2.2", + "percent-encoding", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-float" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde", + "windows-sys 0.52.0", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pear" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "pem" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +dependencies = [ + "base64 0.22.1", + "serde", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.4", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.76", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", + "version_check", + "yansi", +] + +[[package]] +name = "prost" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "prost-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" +dependencies = [ + "prost", +] + +[[package]] +name = "pulldown-cmark" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4e75767fbc9d92b90e4d0c011f61358cde9513b31ef07ea3631b15ffc3b4fd" +dependencies = [ + "bitflags 2.6.0", + "memchr", + "pulldown-cmark-escape", + "unicase", +] + +[[package]] +name = "pulldown-cmark-escape" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quinn" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls 0.23.12", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash 2.0.0", + "rustls 0.23.12", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +dependencies = [ + "async-compression", + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "hickory-resolver", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls 0.23.12", + "rustls-native-certs", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tokio-rustls", + "tokio-socks", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "windows-registry", +] + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname 0.3.1", + "quick-error 1.2.3", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "ruma" +version = "0.10.1" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "assign", + "js_int", + "js_option", + "ruma-appservice-api", + "ruma-client-api", + "ruma-common", + "ruma-events", + "ruma-federation-api", + "ruma-identifiers-validation", + "ruma-identity-service-api", + "ruma-push-gateway-api", + "ruma-server-util", + "ruma-signatures", + "ruma-state-res", + "web-time 1.1.0", +] + +[[package]] +name = "ruma-appservice-api" +version = "0.10.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "js_int", + "ruma-common", + "ruma-events", + "serde", + "serde_json", +] + +[[package]] +name = "ruma-client-api" +version = "0.18.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "as_variant", + "assign", + "bytes", + "date_header", + "http", + "js_int", + "js_option", + "maplit", + "ruma-common", + "ruma-events", + "serde", + "serde_html_form", + "serde_json", + "thiserror", + "url", + "web-time 1.1.0", +] + +[[package]] +name = "ruma-common" +version = "0.13.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "as_variant", + "base64 0.22.1", + "bytes", + "form_urlencoded", + "http", + "indexmap 2.4.0", + "js_int", + "konst", + "percent-encoding", + "rand", + "regex", + "ruma-identifiers-validation", + "ruma-macros", + "serde", + "serde_html_form", + "serde_json", + "thiserror", + "time", + "tracing", + "url", + "uuid", + "web-time 1.1.0", + "wildmatch", +] + +[[package]] +name = "ruma-events" +version = "0.28.1" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "as_variant", + "indexmap 2.4.0", + "js_int", + "js_option", + "percent-encoding", + "pulldown-cmark", + "regex", + "ruma-common", + "ruma-identifiers-validation", + "ruma-macros", + "serde", + "serde_json", + "thiserror", + "tracing", + "url", + "web-time 1.1.0", + "wildmatch", +] + +[[package]] +name = "ruma-federation-api" +version = "0.9.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "bytes", + "http", + "httparse", + "js_int", + "memchr", + "mime", + "rand", + "ruma-common", + "ruma-events", + "serde", + "serde_json", +] + +[[package]] +name = "ruma-identifiers-validation" +version = "0.9.5" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "js_int", + "thiserror", +] + +[[package]] +name = "ruma-identity-service-api" +version = "0.9.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "js_int", + "ruma-common", + "serde", +] + +[[package]] +name = "ruma-macros" +version = "0.13.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "ruma-identifiers-validation", + "serde", + "syn 2.0.76", + "toml", +] + +[[package]] +name = "ruma-push-gateway-api" +version = "0.9.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "js_int", + "ruma-common", + "ruma-events", + "serde", + "serde_json", +] + +[[package]] +name = "ruma-server-util" +version = "0.3.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "headers", + "http", + "http-auth", + "ruma-common", + "thiserror", + "tracing", +] + +[[package]] +name = "ruma-signatures" +version = "0.15.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "base64 0.22.1", + "ed25519-dalek", + "pkcs8", + "rand", + "ruma-common", + "serde_json", + "sha2", + "subslice", + "thiserror", +] + +[[package]] +name = "ruma-state-res" +version = "0.11.0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=d7ddcd036f81edb257ab9371f9cadd46444e8a90#d7ddcd036f81edb257ab9371f9cadd46444e8a90" +dependencies = [ + "itertools 0.12.1", + "js_int", + "ruma-common", + "ruma-events", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "rust-librocksdb-sys" +version = "0.25.0+9.5.2" +source = "git+https://github.com/girlbossceo/rust-rocksdb-zaidoon1?rev=5383ca8173299066b516406e3a2cf945ead891cb#5383ca8173299066b516406e3a2cf945ead891cb" +dependencies = [ + "bindgen", + "bzip2-sys", + "cc", + "glob", + "libc", + "libz-sys", + "lz4-sys", + "pkg-config", + "tikv-jemalloc-sys", + "zstd-sys", +] + +[[package]] +name = "rust-rocksdb" +version = "0.29.0" +source = "git+https://github.com/girlbossceo/rust-rocksdb-zaidoon1?rev=5383ca8173299066b516406e3a2cf945ead891cb#5383ca8173299066b516406e3a2cf945ead891cb" +dependencies = [ + "libc", + "rust-librocksdb-sys", + "serde", +] + +[[package]] +name = "rust-rocksdb-uwu" +version = "0.0.1" +dependencies = [ + "rust-rocksdb", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "aws-lc-rs", + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "aws-lc-rs", + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "rustyline-async" +version = "0.4.3" +source = "git+https://github.com/girlbossceo/rustyline-async?rev=9654cc84e19241f6e19021eb8e677892656f5071#9654cc84e19241f6e19021eb8e677892656f5071" +dependencies = [ + "crossterm", + "futures-channel", + "futures-util", + "pin-project", + "thingbuf", + "thiserror", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "sanitize-filename" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sd-notify" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4646d6f919800cd25c50edb49438a1381e2cd4833c027e75e8897981c50b8b5e" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "sentry" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066" +dependencies = [ + "httpdate", + "reqwest", + "rustls 0.22.4", + "sentry-backtrace", + "sentry-contexts", + "sentry-core", + "sentry-debug-images", + "sentry-log", + "sentry-panic", + "sentry-tower", + "sentry-tracing", + "tokio", + "ureq", + "webpki-roots", +] + +[[package]] +name = "sentry-backtrace" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a" +dependencies = [ + "backtrace", + "once_cell", + "regex", + "sentry-core", +] + +[[package]] +name = "sentry-contexts" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910" +dependencies = [ + "hostname 0.4.0", + "libc", + "os_info", + "rustc_version", + "sentry-core", + "uname", +] + +[[package]] +name = "sentry-core" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30" +dependencies = [ + "once_cell", + "rand", + "sentry-types", + "serde", + "serde_json", +] + +[[package]] +name = "sentry-debug-images" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc6b25e945fcaa5e97c43faee0267eebda9f18d4b09a251775d8fef1086238a" +dependencies = [ + "findshlibs", + "once_cell", + "sentry-core", +] + +[[package]] +name = "sentry-log" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75bbcc61886955045a1dd4bdb173412a80bb2571be3c5bfcf7eb8f55a442bbf5" +dependencies = [ + "log", + "sentry-core", +] + +[[package]] +name = "sentry-panic" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc74f229c7186dd971a9491ffcbe7883544aa064d1589bd30b83fb856cd22d63" +dependencies = [ + "sentry-backtrace", + "sentry-core", +] + +[[package]] +name = "sentry-tower" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c90802b38c899a2c9e557dff25ad186362eddf755d5f5244001b172dd03bead" +dependencies = [ + "http", + "pin-project", + "sentry-core", + "tower-layer", + "tower-service", + "url", +] + +[[package]] +name = "sentry-tracing" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c5faf2103cd01eeda779ea439b68c4ee15adcdb16600836e97feafab362ec" +dependencies = [ + "sentry-backtrace", + "sentry-core", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sentry-types" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f" +dependencies = [ + "debugid", + "hex", + "rand", + "serde", + "serde_json", + "thiserror", + "time", + "url", + "uuid", +] + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "serde_html_form" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5" +dependencies = [ + "form_urlencoded", + "indexmap 2.4.0", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_json" +version = "1.0.127" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_regex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" +dependencies = [ + "regex", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.4.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha-1" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio", + "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 = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "strict" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f42444fea5b87a39db4218d9422087e66a85d0e7a0963a439b07bcdf91804006" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "subslice" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a8e4809a3bb02de01f1f7faf1ba01a83af9e8eabcd4d31dd6e413d14d56aae" +dependencies = [ + "memchr", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[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.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "termimad" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "920e7c4671e79f3d9df269da9c8edf0dbc580044fd727d3594f7bfba5eb6107a" +dependencies = [ + "coolor", + "crokey", + "crossbeam", + "lazy-regex", + "minimad", + "serde", + "thiserror", + "unicode-width", +] + +[[package]] +name = "thingbuf" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "662b54ef6f7b4e71f683dadc787bbb2d8e8ef2f91b682ebed3164a5a7abca905" +dependencies = [ + "parking_lot", + "pin-project", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[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 = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "thrift" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" +dependencies = [ + "byteorder", + "integer-encoding", + "log", + "ordered-float 2.10.1", + "threadpool", +] + +[[package]] +name = "tikv-jemalloc-ctl" +version = "0.6.0" +source = "git+https://github.com/girlbossceo/jemallocator?rev=c32af15f3b440ae5e46c3404f78b19093bbd5294#c32af15f3b440ae5e46c3404f78b19093bbd5294" +dependencies = [ + "libc", + "paste", + "tikv-jemalloc-sys", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +source = "git+https://github.com/girlbossceo/jemallocator?rev=c32af15f3b440ae5e46c3404f78b19093bbd5294#c32af15f3b440ae5e46c3404f78b19093bbd5294" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.6.0" +source = "git+https://github.com/girlbossceo/jemallocator?rev=c32af15f3b440ae5e46c3404f78b19093bbd5294#c32af15f3b440ae5e46c3404f78b19093bbd5294" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "tokio-metrics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eace09241d62c98b7eeb1107d4c5c64ca3bd7da92e8c218c153ab3a78f9be112" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.12", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.20", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.4.0", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap 2.4.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.18", +] + +[[package]] +name = "tonic" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost", + "socket2", + "tokio", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36b837f86b25d7c0d7988f00a54e74739be6477f2aac6201b8f429a7569991b7" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "async-compression", + "bitflags 2.6.0", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "pin-project-lite", + "tokio", + "tokio-util", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "git+https://github.com/girlbossceo/tracing?rev=4d78a14a5e03f539b8c6b475aefa08bb14e4de91#4d78a14a5e03f539b8c6b475aefa08bb14e4de91" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "git+https://github.com/girlbossceo/tracing?rev=4d78a14a5e03f539b8c6b475aefa08bb14e4de91#4d78a14a5e03f539b8c6b475aefa08bb14e4de91" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "git+https://github.com/girlbossceo/tracing?rev=4d78a14a5e03f539b8c6b475aefa08bb14e4de91#4d78a14a5e03f539b8c6b475aefa08bb14e4de91" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-flame" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" +dependencies = [ + "lazy_static", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "git+https://github.com/girlbossceo/tracing?rev=4d78a14a5e03f539b8c6b475aefa08bb14e4de91#4d78a14a5e03f539b8c6b475aefa08bb14e4de91" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "smallvec", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", + "web-time 0.2.4", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "git+https://github.com/girlbossceo/tracing?rev=4d78a14a5e03f539b8c6b475aefa08bb14e4de91#4d78a14a5e03f539b8c6b475aefa08bb14e4de91" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "typewit" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24" +dependencies = [ + "typewit_proc_macros", +] + +[[package]] +name = "typewit_proc_macros" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" + +[[package]] +name = "uname" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" +dependencies = [ + "libc", +] + +[[package]] +name = "uncased" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-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 = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +dependencies = [ + "base64 0.22.1", + "log", + "once_cell", + "rustls 0.23.12", + "rustls-pki-types", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.76", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpage" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70862efc041d46e6bbaa82bb9c34ae0596d090e86cbd14bd9e93b36ee6802eac" +dependencies = [ + "html5ever", + "markup5ever_rcdom", + "serde_json", + "url", +] + +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[package]] +name = "wildmatch" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3928939971918220fed093266b809d1ee4ec6c1a2d72692ff6876898f3b16c19" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "xml5ever" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bbb26405d8e919bc1547a5aa9abc95cbfa438f04844f5fdd9dc7596b748bf69" +dependencies = [ + "log", + "mac", + "markup5ever", +] + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", +] diff --git a/pkgs/by-name/co/conduwuit/package.nix b/pkgs/by-name/co/conduwuit/package.nix new file mode 100644 index 0000000000000..733b502246a02 --- /dev/null +++ b/pkgs/by-name/co/conduwuit/package.nix @@ -0,0 +1,107 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + bzip2, + zstd, + stdenv, + darwin, + rocksdb, + nix-update-script, + testers, + conduwuit, + # upstream conduwuit enables jemalloc by default, so we follow suit + enableJemalloc ? true, + rust-jemalloc-sys, + enableLiburing ? stdenv.hostPlatform.isLinux, + liburing, +}: +let + rust-jemalloc-sys' = rust-jemalloc-sys.override { + unprefixed = !stdenv.hostPlatform.isDarwin; + }; + rocksdb' = rocksdb.override { + inherit enableLiburing; + # rocksdb does not support prefixed jemalloc, which is required on darwin + enableJemalloc = enableJemalloc && !stdenv.hostPlatform.isDarwin; + jemalloc = rust-jemalloc-sys'; + }; +in +rustPlatform.buildRustPackage rec { + pname = "conduwuit"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "girlbossceo"; + repo = "conduwuit"; + rev = "v${version}"; + hash = "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "ruma-0.10.1" = "sha256-u4C2VwRBmw8iVaPrkSmF/EKi5U3nWJWVktUDFmQcI1E="; + "rust-librocksdb-sys-0.25.0+9.5.2" = "sha256-wz6QDLoXtY8+EU2DlPf4MbWC67KJK0hZnRswCeomkLQ="; + "rustyline-async-0.4.3" = "sha256-7yYOGZ14SODD4+e9fTGgggUKqTi31479S0lEVKTKLPI="; + "tikv-jemalloc-ctl-0.6.0" = "sha256-guiH6Gw/Oeb6A8Ri1SFcB6CW6mt+9XeA6vfwdS72yDQ="; + "tracing-0.1.40" = "sha256-J6+8hBC/755SU8n1fTiJwBh17Unluv1SXfd5+dDAEhk="; + }; + }; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = + [ + bzip2 + zstd + ] + ++ lib.optional enableJemalloc rust-jemalloc-sys' + ++ lib.optional enableLiburing liburing + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include"; + ROCKSDB_LIB_DIR = "${rocksdb'}/lib"; + }; + + buildNoDefaultFeatures = true; + # See https://github.com/girlbossceo/conduwuit/blob/main/src/main/Cargo.toml + # for available features. + # We enable all default features except jemalloc and io_uring, which + # we guard behind our own (default-enabled) flags. + buildFeatures = [ + "brotli_compression" + "element_hacks" + "gzip_compression" + "release_max_log_level" + "sentry_telemetry" + "systemd" + "zstd_compression" + ] ++ lib.optional enableJemalloc "jemalloc" ++ lib.optional enableLiburing "io_uring"; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = conduwuit; + version = "${version}"; + }; + }; + + meta = { + description = "Matrix homeserver written in Rust, forked from conduit"; + homepage = "https://conduwuit.puppyirl.gay/"; + changelog = "https://github.com/girlbossceo/conduwuit/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ niklaskorz ]; + # Not a typo, conduwuit is a drop-in replacement for conduit. + mainProgram = "conduit"; + }; +} diff --git a/pkgs/by-name/co/connman-gtk/package.nix b/pkgs/by-name/co/connman-gtk/package.nix index 181c43bcde208..d721b3551b044 100644 --- a/pkgs/by-name/co/connman-gtk/package.nix +++ b/pkgs/by-name/co/connman-gtk/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "jgke"; repo = "connman-gtk"; rev = "v${version}"; - sha256 = "09k0hx5hxpbykvslv12l2fq9pxdwpd311mxj038hbqzjghcyidyr"; + hash = "sha256-2bfoGXzy4wXRALLXEEa7vPWbsBNUhE31nn7dDkuHYCY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/connman-ncurses/package.nix b/pkgs/by-name/co/connman-ncurses/package.nix index 53b488159823d..9b63dcd7b3aa7 100644 --- a/pkgs/by-name/co/connman-ncurses/package.nix +++ b/pkgs/by-name/co/connman-ncurses/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "eurogiciel-oss"; repo = "connman-json-client"; rev = "3c34b2ee62d2e188090d20e7ed2fd94bab9c47f2"; - sha256 = "1831r0776fv481g8kgy1dkl750pzv47835dw11sslq2k6mm6i9p1"; + hash = "sha256-4aZoajVTYKp1CLyVgQ7Z/4Jy6GzBv4leQGQ7cw7IYaA="; }; patches = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation { (fetchpatch { url = "https://github.com/void-linux/void-packages/raw/5830ce60e922b7dced8157ededda8c995adb3bb9/srcpkgs/connman-ncurses/patches/lowercase-boolean.patch"; extraPrefix = ""; - sha256 = "uK83DeRyXS2Y0ZZpTYvYNh/1ZM2QQ7QpajiBztaEuSM="; + hash = "sha256-uK83DeRyXS2Y0ZZpTYvYNh/1ZM2QQ7QpajiBztaEuSM="; }) ]; diff --git a/pkgs/by-name/co/connman-notify/package.nix b/pkgs/by-name/co/connman-notify/package.nix index 4b9002441a926..fad8e477ada72 100644 --- a/pkgs/by-name/co/connman-notify/package.nix +++ b/pkgs/by-name/co/connman-notify/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication { owner = "wavexx"; repo = "connman-notify"; rev = "24b10a51721b54d932f4cd61ef2756423768c015"; - sha256 = "1k5b5y6114yna2cm0cq82xilicran63hrhlklgv7k3p89057xh8j"; + hash = "sha256-EsF+Ckjojnn2o5PCDIexKrNIYxcIM1CZUNaTEIwvq8w="; }; format = "other"; diff --git a/pkgs/by-name/co/connman/package.nix b/pkgs/by-name/co/connman/package.nix index 238e84c091698..b7906fd72c6c9 100644 --- a/pkgs/by-name/co/connman/package.nix +++ b/pkgs/by-name/co/connman/package.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/about/"; license = lib.licenses.gpl2Only; mainProgram = "connmanctl"; - maintainers = with lib.maintainers; [ eclairevoyant AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/connman_dmenu/package.nix b/pkgs/by-name/co/connman_dmenu/package.nix index 6c4d3dd26ec0e..9e9bf070a14d9 100644 --- a/pkgs/by-name/co/connman_dmenu/package.nix +++ b/pkgs/by-name/co/connman_dmenu/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "march-linux"; repo = "connman_dmenu"; rev = "cc89fec40b574b0d234afeb70ea3c94626ca3f5c"; - sha256 = "061fi83pai4n19l9d7wq6wwj2d7cixwkhkh742c5ibmw1wb274yk"; + hash = "sha256-05MjFg+8rliYIAdOOHmP7DQhOTeYn5ZoCpZEdQeKLhg="; }; buildInputs = [ connman dmenu ]; diff --git a/pkgs/by-name/co/construct/package.nix b/pkgs/by-name/co/construct/package.nix index eb2c922b31b44..89833c8176088 100644 --- a/pkgs/by-name/co/construct/package.nix +++ b/pkgs/by-name/co/construct/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ENso0y7yEaXzGXzZOnlZ1L7+j/qayJL+f55/NYLz2ew="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace g++ c++ ''; diff --git a/pkgs/by-name/co/container-structure-test/package.nix b/pkgs/by-name/co/container-structure-test/package.nix index f8ef4728b2d96..ad6b2a8478900 100644 --- a/pkgs/by-name/co/container-structure-test/package.nix +++ b/pkgs/by-name/co/container-structure-test/package.nix @@ -4,24 +4,24 @@ fetchurl, }: let - version = "v1.18.1"; + version = "v1.19.1"; sources = { x86_64-linux = { url = "https://github.com/GoogleContainerTools/container-structure-test/releases/download/${version}/container-structure-test-linux-amd64"; - hash = "sha256-vnZsdjRix3P7DpDz00WUTbNBLQIFPKzfUbVbxn+1ygM="; + hash = "sha256-7KScpej6Km4fuv6XJez4frLwXUm91lII2RLLT71YRrs="; }; aarch64-linux = { url = "https://github.com/GoogleContainerTools/container-structure-test/releases/download/${version}/container-structure-test-linux-arm64"; - hash = "sha256-/YPAeh/Ad2YVdZ/irpgikQST0uWITWYQOB4qI54aPlY="; + hash = "sha256-5MyjOzbDPrV5R3ldJCINipJPOILCzx8+xBVO4bxq9ic="; }; x86_64-darwin = { url = "https://github.com/GoogleContainerTools/container-structure-test/releases/download/${version}/container-structure-test-darwin-amd64"; - hash = "sha256-tJ1gMnQ7d6du65fnw5GV425kWl/3jLwcqj3gIHHuOyU="; + hash = "sha256-2QwyKvgzOdGOEuZVwntCpBGBk0JnOLpYOoEYp48qB/I="; }; aarch64-darwin = { url = "https://github.com/GoogleContainerTools/container-structure-test/releases/download/${version}/container-structure-test-darwin-arm64"; - hash = "sha256-cNSb3nhSGU9q/PJDNdEeV/hlCXAdXkaV6SROdXnXjp0="; + hash = "sha256-x3RmVdDFmHoGOqX49OWeAab/6m1U0jq/g/30rNjj5aI="; }; }; in diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix new file mode 100644 index 0000000000000..a73f33f0bc745 --- /dev/null +++ b/pkgs/by-name/co/containerlab/package.nix @@ -0,0 +1,52 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "containerlab"; + version = "0.57.3"; + + src = fetchFromGitHub { + owner = "srl-labs"; + repo = "containerlab"; + rev = "v${version}"; + hash = "sha256-OSisVSfbOKBA1INrhj8DaWnHOEsLPwazp6NSXwAG3PU="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + vendorHash = "sha256-mI5w7hUfQZPWv5JPbBodHxonLxtZfnHRw2K7Nl6sDOE="; + + ldflags = [ + "-s" + "-w" + "-X github.com/srl-labs/containerlab/cmd.version=${version}" + "-X github.com/srl-labs/containerlab/cmd.commit=${src.rev}" + "-X github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z" + ]; + + preCheck = '' + # Fix failed TestLabelsInit test + export USER="runner" + ''; + + postInstall = '' + local INSTALL="$out/bin/containerlab" + installShellCompletion --cmd containerlab \ + --bash <($out/bin/containerlab completion bash) \ + --fish <($out/bin/containerlab completion fish) \ + --zsh <($out/bin/containerlab completion zsh) + ''; + + meta = with lib; { + description = "Container-based networking lab"; + homepage = "https://containerlab.dev/"; + changelog = "https://github.com/srl-labs/containerlab/releases/tag/${src.rev}"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "containerlab"; + }; +} diff --git a/pkgs/by-name/co/contrast/package.nix b/pkgs/by-name/co/contrast/package.nix index 12dbc1c637a81..adb0384628933 100644 --- a/pkgs/by-name/co/contrast/package.nix +++ b/pkgs/by-name/co/contrast/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "contrast"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { owner = "design"; repo = "contrast"; rev = version; - hash = "sha256-Y0CynBvnCOBesONpxUicR7PgMJgmM0ZQX/uOwIppj7w="; + hash = "sha256-8A1qX1H0cET5AUvMoHC1/VyIQiaTysEY5RJRrVYvGng="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-BdwY2YDJyDApGgE0Whz3xRU/0gRbkwbKUvPbWEObXE8="; + hash = "sha256-Z5Gn1J/ziDlSowUk3HYLdx1PDg0WlQJQDjto2xYYK44="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index 2564f3b06c1be..0f08aba98ae8a 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -11,20 +11,20 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - hash = "sha256-S5k0d29tuR0VkJrqCiWg1v+W2n9TrQCfMOInII4jxg0="; + hash = "sha256-TRuzHcGnvxDMd/XtbSXj4P+72ZL86Z2FgsqmYrKg/Ys="; }; - cargoHash = "sha256-cYb3syf+k4V0pCpekQ2tY73Gl6rDc9YMCXs3TKRtgpo="; + cargoHash = "sha256-mT1bwCp/MdYbyc9IrC9WDmKfD6lfiqVL7TlenddTXt8="; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "Conventional commit cli"; diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix index 8250d0edb5919..61d5e5133731a 100644 --- a/pkgs/by-name/co/converseen/package.nix +++ b/pkgs/by-name/co/converseen/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://converseen.fasterland.net/"; changelog = "https://github.com/Faster3ck/Converseen/blob/${finalAttrs.src.rev}/CHANGELOG"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "converseen"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/co/convmv/package.nix b/pkgs/by-name/co/convmv/package.nix index 65fbd85e37d68..e89b4250ead3c 100644 --- a/pkgs/by-name/co/convmv/package.nix +++ b/pkgs/by-name/co/convmv/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { # testsuite.tar contains filenames that aren't valid UTF-8. Extraction of # testsuite.tar will fail as APFS enforces that filenames are valid UTF-8. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; prePatch = lib.optionalString finalAttrs.doCheck '' diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index fbebd0d7fb46f..846d3fb527777 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; postPatch = '' rm -rf "ui/public" diff --git a/pkgs/by-name/co/cook-framework/package.nix b/pkgs/by-name/co/cook-framework/package.nix new file mode 100644 index 0000000000000..8d8591750945f --- /dev/null +++ b/pkgs/by-name/co/cook-framework/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "cook-framework"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "glitchedgitz"; + repo = "cook"; + rev = "refs/tags/v${version}"; + hash = "sha256-DK0kbvM11t64nGkrzThZgSruHTCHAPP374YPWmoM50g="; + }; + + sourceRoot = "${src.name}/v2"; + + vendorHash = "sha256-VpNr06IiVKpMsJXzcKCuNfJ+T+zeA9dMBMp6jeCRgn8="; + + doCheck = false; # uses network to fetch data sources + + meta = { + description = "Wordlist generator, splitter, merger, finder, saver for security researchers, bug bounty and hackers"; + homepage = "https://github.com/glitchedgitz/cook"; + changelog = "https://github.com/glitchedgitz/cook/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "cook"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/by-name/co/cope/package.nix b/pkgs/by-name/co/cope/package.nix new file mode 100644 index 0000000000000..d1aed0b02c5b7 --- /dev/null +++ b/pkgs/by-name/co/cope/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + perl, + perlPackages, +}: + +perlPackages.buildPerlPackage { + pname = "cope"; + version = "0-unstable-2024-03-27"; + + src = fetchFromGitHub { + owner = "deftdawg"; + repo = "cope"; + rev = "ad0c1ebec5684f5ec3e8becf348414292c489175"; + hash = "sha256-LMAir7tUkjHtKz+KME/Raa9QHGN1g0bzr56fNxfURQY="; + }; + + buildInputs = with perlPackages; [ + EnvPath + FileShareDir + IOPty + IOStty + ListMoreUtils + RegexpCommon + RegexpIPv6 + ]; + + postInstall = '' + mkdir -p $out/bin + mv $out/${perlPackages.perl.libPrefix}/${perlPackages.perl.version}/auto/share/dist/Cope/* $out/bin/ + rm -r $out/${perlPackages.perl.libPrefix}/${perlPackages.perl.version}/auto + ''; + + meta = { + description = "A colourful wrapper for terminal programs"; + homepage = "https://github.com/deftdawg/cope"; + license = with lib.licenses; [ + artistic1 + gpl1Plus + ]; + maintainers = with lib.maintainers; [ deftdawg ]; + }; +} diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix new file mode 100644 index 0000000000000..59b36bda19746 --- /dev/null +++ b/pkgs/by-name/co/copycat/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "ccat"; + version = "001"; + + src = fetchFromGitHub { + owner = "DeeKahy"; + repo = "CopyCat"; + rev = "refs/tags/${version}"; + hash = "sha256-zllxQifRMNEMa3RO5WKrwGAUf1xQg6YrQBzIHzy43F0="; + }; + + cargoHash = "sha256-LYVhvq5l+PCZXW+elWi3zZFxLekgPn+plo4dybbLK9g="; + + meta = { + description = "Utility to copy project tree contents to clipboard"; + homepage = "https://github.com/DeeKahy/CopyCat"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.deekahy ]; + mainProgram = "ccat"; + }; +} diff --git a/pkgs/by-name/co/corefonts/package.nix b/pkgs/by-name/co/corefonts/package.nix index 1ad30af493830..f2c9533b01fc3 100644 --- a/pkgs/by-name/co/corefonts/package.nix +++ b/pkgs/by-name/co/corefonts/package.nix @@ -2,32 +2,32 @@ let fonts = [ - { name = "andale"; sha256 = "0w7927hlwayqf3vvanf8f3qp2g1i404jzqvhp1z3mp0sjm1gw905"; } - { name = "arial"; sha256 = "1xkqyivbyb3z9dcalzidf8m4npzfpls2g0kldyn8g73f2i6plac5"; } - { name = "arialb"; sha256 = "1a60zqrg63kjnykh5hz7dbpzvx7lyivn3vbrp7jyv9d1nvzz09d4"; } - { name = "comic"; sha256 = "0ki0rljjc1pxkbsxg515fwx15yc95bdyaksa3pjd89nyxzzg6vcw"; } - { name = "courie"; sha256 = "111k3waxki9yyxpjwl2qrdkswvsd2dmvhbjmmrwyipam2s31sldv"; } - { name = "georgi"; sha256 = "0083jcpd837j2c06kp1q8glfjn9k7z6vg3wi137savk0lv6psb1c"; } - { name = "impact"; sha256 = "1yyc5z7zmm3s418hmrkmc8znc55afsrz5dgxblpn9n81fhxyyqb0"; } - { name = "times"; sha256 = "1aq7z3l46vwgqljvq9zfgkii6aivy00z1529qbjkspggqrg5jmnv"; } - { name = "trebuc"; sha256 = "1jfsgz80pvyqvpfpaiz5pd8zwlcn67rg2jgynjwf22sip2dhssas"; } - { name = "webdin"; sha256 = "0nnp2znmnmx87ijq9zma0vl0hd46npx38p0cc6lgp00hpid5nnb4"; } - { name = "verdan"; sha256 = "15mdbbfqbyp25a6ynik3rck3m3mg44plwrj79rwncc9nbqjn3jy1"; } - { name = "wd97vwr"; sha256 = "1lmkh3zb6xv47k0z2mcwk3vk8jff9m845c9igxm14bbvs6k2c4gn"; } + { name = "andale"; hash = "sha256-BST+QpUa3Dp+uHDjLwkgMTxx8XDIWbX3cNgrTuER6XA="; } + { name = "arial"; hash = "sha256-hSl6TRRunIesb3SCJzS97l9LKnItfqpYS38sv3b0ePY="; } + { name = "arialb"; hash = "sha256-pCXw/7ahpe3luXntYXf09PT972rnwwKnt3IO8zL+wKg="; } + { name = "comic"; hash = "sha256-nG3z/u/eJtTkHUpP5dsqifkSOncllNf1mv0GJiXNIE4="; } + { name = "courie"; hash = "sha256-u1EdhhZV3eh5rlUuuGsTTW+uZ8tYUC5v9z7F2RUfM4Q="; } + { name = "georgi"; hash = "sha256-LCx9zaZgbqXPCJGPt80/M1np6EM43GkAE/IM1C6TAwE="; } + { name = "impact"; hash = "sha256-YGHvO3QB2WQvXf218rN2qhRmP2J15gpRIHrU+s8vzPs="; } + { name = "times"; hash = "sha256-21ZZXsbvXT3lwkmU8AHwOyoT43zuJ7wlxY9vQ+j4B6s="; } + { name = "trebuc"; hash = "sha256-WmkNm7hRC+G4tP5J8fIxllH+UbvlR3Xd3djvC9B/2sk="; } + { name = "webdin"; hash = "sha256-ZFlbWrwQgPuoYQxcNPq1hjQI6Aaq/oRlPKhXW+0X11o="; } + { name = "verdan"; hash = "sha256-wcthJV42MWZ5TkdmTi8hr446JstjRuuNKuL6hd1arZY="; } + { name = "wd97vwr"; hash = "sha256-9hEmptF7LRJqfzGxQlBNzkk095icVfHBPGR3s/6As9I="; } ]; eula = fetchurl { url = "https://corefonts.sourceforge.net/eula.htm"; - sha256 = "1aqbcnl032g2hd7iy56cs022g47scb0jxxp3mm206x1yqc90vs1c"; + hash = "sha256-LOgNEsM+dANEreP2LsFi+pAnBNDMFB9Pg+KJAahlC6s="; }; in stdenv.mkDerivation { pname = "corefonts"; version = "1"; - exes = map ({name, sha256}: fetchurl { + exes = map ({name, hash}: fetchurl { url = "mirror://sourceforge/corefonts/the%20fonts/final/${name}32.exe"; - inherit sha256; + inherit hash; }) fonts; nativeBuildInputs = [ cabextract ]; diff --git a/pkgs/by-name/co/corrscope/package.nix b/pkgs/by-name/co/corrscope/package.nix index 220c0a8746340..97751960af61e 100644 --- a/pkgs/by-name/co/corrscope/package.nix +++ b/pkgs/by-name/co/corrscope/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "corrscope"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; src = fetchFromGitHub { owner = "corrscope"; repo = "corrscope"; rev = "refs/tags/${version}"; - hash = "sha256-hyLCygaSWMQd+UJ/Ijgk9C+3O/r5x0aaW/x9PoojDIg="; + hash = "sha256-WSv65jEu/w6iNrL/f5PN147FBjmR0j30H1D39dd+KN8="; }; pythonRelaxDeps = [ "attrs" "ruamel.yaml" ]; diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index 809010c31e8c7..c3bc5db415e7b 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-applets"; description = "Applets for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ qyliss nyanbinary ]; + maintainers = with maintainers; [ qyliss nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index 6402cd1d30bc6..c7f26c5fde3e1 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-applibrary"; description = "Application Template for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-app-library"; }; diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index e6b7d37c26963..12ce7083c3c40 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { }; postPatch = '' - substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" + substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" ''; nativeBuildInputs = [ just pkg-config makeBinaryWrapper ]; @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-bg"; description = "Applies Background for the COSMIC Desktop Environment"; license = licenses.mpl20; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-bg"; }; diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 5bd04bf2db4ae..544c214894a36 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -94,7 +94,7 @@ rustPlatform.buildRustPackage rec { description = "Compositor for the COSMIC Desktop Environment"; mainProgram = "cosmic-comp"; license = licenses.gpl3Only; - maintainers = with maintainers; [ qyliss nyanbinary ]; + maintainers = with maintainers; [ qyliss nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-design-demo/package.nix b/pkgs/by-name/co/cosmic-design-demo/package.nix index 3de84af599794..24dee441572cc 100644 --- a/pkgs/by-name/co/cosmic-design-demo/package.nix +++ b/pkgs/by-name/co/cosmic-design-demo/package.nix @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-design-demo"; description = "Design Demo for the COSMIC Desktop Environment"; license = licenses.mpl20; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-design-demo"; }; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 2c8cd21562de0..40d6eb082dd4b 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -105,7 +105,7 @@ rustPlatform.buildRustPackage rec { description = "Text Editor for the COSMIC Desktop Environment"; mainProgram = "cosmic-edit"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ahoneybun nyanbinary ]; + maintainers = with maintainers; [ ahoneybun nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index 32994724519ad..31f238b10d643 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-files"; description = "File Manager for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ahoneybun nyanbinary ]; + maintainers = with maintainers; [ ahoneybun nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index d1a21fdc9c912..2a9473800b3c6 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { owner = "pop-os"; repo = "cosmic-greeter"; rev = "epoch-${version}"; - sha256 = "sha256-dc+VV7eIEUKoio/bQieXcDVZCepf4HtQrIKRslym31Y="; + hash = "sha256-dc+VV7eIEUKoio/bQieXcDVZCepf4HtQrIKRslym31Y="; }; cargoLock = { @@ -60,10 +60,10 @@ rustPlatform.buildRustPackage rec { (placeholder "out") "--set" "bin-src" - "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-greeter" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-greeter" "--set" "daemon-src" - "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-greeter-daemon" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-greeter-daemon" ]; postPatch = '' @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { description = "Greeter for the COSMIC Desktop Environment"; mainProgram = "cosmic-greeter"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 8b5c0aef72f92..23031d56b9c53 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -8,13 +8,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "cosmic-icons"; - version = "0-unstable-2024-08-04"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = "f93dcdfa1060c2cf3f8cf0b56b0338292edcafa5"; - sha256 = "sha256-KvEKFmsh7ljt9JbaqyZfTUiFZHZM2Ha1TwUDljXXLDw="; + rev = "341c84467fd863f0319cadf49b3d4bac1bf3029a"; + hash = "sha256-VA2QKuzTQBgubfjPXdpejFtZxqOZUXds/fZrfN6/8Nk="; }; nativeBuildInputs = [ just ]; diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index f23e00125bde3..5ff34d7528e1a 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { owner = "pop-os"; repo = pname; rev = "epoch-${version}"; - sha256 = "sha256-LzTVtXyNgaVKyARmrmb6YUi4dWa20EwM1SYMlnawtzk="; + hash = "sha256-LzTVtXyNgaVKyARmrmb6YUi4dWa20EwM1SYMlnawtzk="; }; cargoLock = { @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { description = "Launcher for the COSMIC Desktop Environment"; mainProgram = "cosmic-launcher"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index bae1f66e20ac6..baf2dda64bedc 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-notifications"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { }; postPatch = '' - substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" + substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" ''; nativeBuildInputs = [ just which pkg-config makeBinaryWrapper ]; @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { description = "Notifications for the COSMIC Desktop Environment"; mainProgram = "cosmic-notifications"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 80c64e40635d5..621ce9d7673cb 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-osd"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-osd"; rev = "epoch-${version}"; hash = "sha256-JDdVFNTJI9O88lLKB1esJE4sk7ZZnTMilQRZSAgnTqs="; }; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { description = "OSD for the COSMIC Desktop Environment"; mainProgram = "cosmic-osd"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 8847307fa41fe..960d8d7314e8c 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { owner = "pop-os"; repo = "cosmic-panel"; rev = "f07cccbd2dc15ede5aeb7646c61c6f62cb32db0c"; - sha256 = "sha256-uUq+xElZMcG5SWzha9/8COaenycII5aiXmm7sXGgjXE="; + hash = "sha256-uUq+xElZMcG5SWzha9/8COaenycII5aiXmm7sXGgjXE="; }; cargoLock = { @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage { description = "Panel for the COSMIC Desktop Environment"; mainProgram = "cosmic-panel"; license = licenses.gpl3Only; - maintainers = with maintainers; [ qyliss nyanbinary ]; + maintainers = with maintainers; [ qyliss nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index 1805d4b48fed0..f4ba351d5c456 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pop-os/cosmic-protocols"; description = "Additional wayland-protocols used by the COSMIC desktop environment"; license = [ licenses.mit licenses.gpl3Only ]; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index 0c3b5b752d164..2c56734834443 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-randr"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-randr"; description = "Library and utility for displaying and configuring Wayland outputs"; license = licenses.mpl20; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-randr"; }; diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index 1881ef8fb9db3..0319585a0449e 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-screenshot"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+yHpRbK+AWnpcGrC5U0wKbt0u8tm3CFGjKTCDQpb3G0="; }; - cargoHash = "sha256-d56y35npMPrQM0yF0ytNcOdMKBz9IQvEz37DNvKBBSk="; + cargoHash = "sha256-fzIVyxzNknEjGJoR9sgXkY+gyuTC0T4Sy513X8umbWA="; nativeBuildInputs = [ just pkg-config ]; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-screenshot"; description = "Screenshot tool for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-screenshot"; }; diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index 572a5d8307774..19bdc5ab0f92a 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { owner = "pop-os"; repo = "cosmic-session"; rev = "epoch-${version}"; - sha256 = "sha256-5zfEBNsMxtKPJZcGYZth/SoXrsg0gpug15VR5fPbvt0="; + hash = "sha256-5zfEBNsMxtKPJZcGYZth/SoXrsg0gpug15VR5fPbvt0="; }; cargoLock = { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace Justfile \ - --replace-fail '{{cargo-target-dir}}/release/cosmic-session' 'target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-session' + --replace-fail '{{cargo-target-dir}}/release/cosmic-session' 'target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-session' 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" @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "cosmic-session"; maintainers = with maintainers; [ a-kenji - nyanbinary + nyabinary ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 8b0c9819ab4e0..6db310e48919c 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { description = "Settings Daemon for the COSMIC Desktop Environment"; mainProgram = "cosmic-settings-daemon"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 669b5403a0e1c..5ab555f262e49 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-settings"; description = "Settings for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-settings"; }; diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index c2859ba558de8..5954f3a7e6351 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -95,7 +95,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-store"; description = "App Store for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ahoneybun nyanbinary ]; + maintainers = with maintainers; [ ahoneybun nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 699c8a8564e35..02911fca4a891 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-term"; description = "Terminal for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ahoneybun nyanbinary ]; + maintainers = with maintainers; [ ahoneybun nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-term"; }; diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index b0fd28563c409..beadf73856849 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { description = "Workspaces Epoch for the COSMIC Desktop Environment"; mainProgram = "cosmic-workspaces"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/costa/package.nix b/pkgs/by-name/co/costa/package.nix index 3dacce6550559..fcc644edadf43 100644 --- a/pkgs/by-name/co/costa/package.nix +++ b/pkgs/by-name/co/costa/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ scalapack ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + buildInputs = [ scalapack ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = [ mpi ]; diff --git a/pkgs/by-name/co/coyim/package.nix b/pkgs/by-name/co/coyim/package.nix index 9e8991b5fbe0e..b45522006890a 100644 --- a/pkgs/by-name/co/coyim/package.nix +++ b/pkgs/by-name/co/coyim/package.nix @@ -19,7 +19,7 @@ buildGoModule { owner = "coyim"; repo = "coyim"; rev = "3f84daa8c27277543b1b4ad4536dde5100d9df12"; - sha256 = "sha256-lzhcUSBuAgYwcmdwnqNxKG0P6ZSjWeLS/g/gaF171D4="; + hash = "sha256-lzhcUSBuAgYwcmdwnqNxKG0P6ZSjWeLS/g/gaF171D4="; }; vendorHash = "sha256-zG7r/Db6XiwKoHRduGj3tEh/KT1hsuBoSGLYaZ+qO0Y="; @@ -34,6 +34,6 @@ buildGoModule { homepage = "https://coy.im/"; license = lib.licenses.gpl3; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/co/coz/package.nix b/pkgs/by-name/co/coz/package.nix index 2938a60b46de5..3bf4826b4dadc 100644 --- a/pkgs/by-name/co/coz/package.nix +++ b/pkgs/by-name/co/coz/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "plasma-umass"; repo = "coz"; rev = version; - sha256 = "0val36yw987b1558iiyk3nqg0yy5k9y5wh49v91zj3cs58mmfyhc"; + hash = "sha256-DHpXKyqaDflD2olAXnyaxXvwsB3Tx4hKCeugxL0ZVG0="; }; postPatch = '' diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix new file mode 100644 index 0000000000000..95c7f04610327 --- /dev/null +++ b/pkgs/by-name/cp/cp2k/package.nix @@ -0,0 +1,273 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mpiCheckPhaseHook, + python3, + gfortran, + blas, + lapack, + fftw, + libint, + libvori, + libxc, + dftd4, + mctc-lib, + mstore, + multicharge, + mpi, + gsl, + scalapack, + openssh, + makeWrapper, + libxsmm, + spglib, + which, + pkg-config, + plumed, + zlib, + hdf5-fortran, + sirius, + libvdwxc, + spla, + spfft, + enableElpa ? false, + elpa, + cudaPackages, + rocmPackages, + config, + gpuBackend ? ( + if config.cudaSupport then + "cuda" + else if config.rocmSupport then + "rocm" + else + "none" + ), + # Change to a value suitable for your target GPU. + # For AMD values see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2v-rocmhip-support-for-amd-gpu + # and for Nvidia see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2i-cuda-optional-improved-performance-on-gpu-systems + gpuVersion ? (if gpuBackend == "cuda" then "A100" else "Mi100"), + gpuArch ? (if gpuBackend == "cuda" then "sm_80" else "gfx908"), +}: + +assert builtins.elem gpuBackend [ + "none" + "cuda" + "rocm" +]; + +let + cp2kVersion = "psmp"; + arch = "Linux-x86-64-gfortran"; + +in +stdenv.mkDerivation rec { + pname = "cp2k"; + version = "2024.3"; + + src = fetchFromGitHub { + owner = "cp2k"; + repo = "cp2k"; + rev = "v${version}"; + hash = "sha256-TeVQ0wVUx6d4knwMi9z3LjQZ4ELE6s1TnvwfFz8jbYk="; + fetchSubmodules = true; + }; + + patches = [ + # Remove the build command line from the source. + # This avoids dependencies to .dev inputs + ./remove-compiler-options.patch + ]; + + nativeBuildInputs = [ + python3 + which + openssh + makeWrapper + pkg-config + ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc; + + buildInputs = + [ + gfortran + fftw + gsl + libint + libvori + libxc + dftd4 + mctc-lib + mstore + multicharge + libxsmm + mpi + spglib + scalapack + blas + lapack + plumed + zlib + hdf5-fortran + sirius + spla + spfft + libvdwxc + ] + ++ lib.optional enableElpa elpa + ++ lib.optionals (gpuBackend == "cuda") [ + cudaPackages.cuda_cudart + cudaPackages.libcublas + cudaPackages.cuda_nvrtc + ] + ++ lib.optionals (gpuBackend == "rocm") [ + rocmPackages.clr + rocmPackages.rocm-core + rocmPackages.hipblas + rocmPackages.hipfft + rocmPackages.rocblas + ]; + + propagatedBuildInputs = [ (lib.getBin mpi) ]; + propagatedUserEnvPkgs = [ mpi ]; + + makeFlags = [ + "ARCH=${arch}" + "VERSION=${cp2kVersion}" + ]; + + doCheck = gpuBackend == "none"; + + enableParallelBuilding = true; + + 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' + ''; + + configurePhase = '' + runHook preConfigure + + cat > arch/${arch}.${cp2kVersion} << EOF + CC = mpicc + CPP = + FC = mpif90 + LD = mpif90 + AR = ar -r + ${lib.strings.optionalString (gpuBackend == "cuda") '' + OFFLOAD_CC = nvcc + OFFLOAD_FLAGS = -O3 -g -w --std=c++11 -arch ${gpuArch} + OFFLOAD_TARGET = cuda + GPUVER = ${gpuVersion} + CXX = mpicxx + CXXFLAGS = -std=c++11 -fopenmp + ''} + ${lib.strings.optionalString (gpuBackend == "rocm") '' + GPUVER = ${gpuVersion} + OFFLOAD_CC = hipcc + OFFLOAD_FLAGS = -fopenmp -m64 -pthread -fPIC -D__GRID_HIP -O2 --offload-arch=${gpuArch} --rocm-path=${rocmPackages.rocm-core} + OFFLOAD_TARGET = hip + CXX = mpicxx + CXXFLAGS = -std=c++11 -fopenmp -D__HIP_PLATFORM_AMD__ + ''} + DFLAGS = -D__FFTW3 -D__LIBXC -D__LIBINT -D__parallel -D__SCALAPACK \ + -D__MPI_VERSION=3 -D__F2008 -D__LIBXSMM -D__SPGLIB \ + -D__MAX_CONTR=4 -D__LIBVORI ${lib.optionalString enableElpa "-D__ELPA"} \ + -D__PLUMED2 -D__HDF5 -D__GSL -D__SIRIUS -D__LIBVDWXC -D__SPFFT -D__SPLA \ + -D__DFTD4 \ + ${ + lib.strings.optionalString ( + gpuBackend == "cuda" + ) "-D__OFFLOAD_CUDA -D__ACC -D__DBCSR_ACC -D__NO_OFFLOAD_PW" + } \ + ${ + lib.strings.optionalString (gpuBackend == "rocm") "-D__OFFLOAD_HIP -D__DBCSR_ACC -D__NO_OFFLOAD_PW" + } + CFLAGS = -fopenmp + FCFLAGS = \$(DFLAGS) -O2 -ffree-form -ffree-line-length-none \ + -ftree-vectorize -funroll-loops -msse2 \ + -std=f2008 \ + -fopenmp -ftree-vectorize -funroll-loops \ + ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} \ + -I${lib.getDev libint}/include \ + -I${lib.getDev sirius}/include/sirius \ + -I${lib.getDev libxc}/include \ + -I${lib.getDev dftd4}/include/dftd4 \ + -I${lib.getDev libxsmm}/include \ + -I${lib.getDev hdf5-fortran}/include \ + -fallow-argument-mismatch + LIBS = -lfftw3 -lfftw3_threads \ + -lscalapack -lblas -llapack \ + -lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \ + -lint2 -lstdc++ -lvori \ + -lgomp -lpthread -lm \ + -fopenmp ${lib.optionalString enableElpa "$(pkg-config --libs elpa)"} \ + -lz -ldl ${lib.optionalString (mpi.pname == "openmpi") "$(mpicxx --showme:link)"} \ + -lplumed -lhdf5_fortran -lhdf5_hl -lhdf5 -lgsl -lsirius -lspla -lspfft -lvdwxc \ + -ldftd4 -lmstore -lmulticharge -lmctc-lib \ + ${ + lib.strings.optionalString (gpuBackend == "cuda") '' + -L${cudaPackages.cuda_cudart}/lib/stubs/ \ + -lcudart -lnvrtc -lcuda -lcublas + '' + } \ + ${ + lib.strings.optionalString (gpuBackend == "rocm") "-lamdhip64 -lhipfft -lhipblas -lrocblas" + } + LDFLAGS = \$(FCFLAGS) \$(LIBS) + include ${plumed}/lib/plumed/src/lib/Plumed.inc + EOF + + runHook postConfigure + ''; + + nativeCheckInputs = [ + mpiCheckPhaseHook + openssh + ]; + + checkPhase = '' + runHook preCheck + + export CP2K_DATA_DIR=data + mpirun -np 2 exe/${arch}/libcp2k_unittest.${cp2kVersion} + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/cp2k + + cp exe/${arch}/* $out/bin + rm $out/bin/*_unittest.* + + for i in cp2k cp2k_shell graph; do + wrapProgram $out/bin/$i.${cp2kVersion} \ + --set-default CP2K_DATA_DIR $out/share/cp2k + done + + wrapProgram $out/bin/cp2k.popt \ + --set-default CP2K_DATA_DIR $out/share/cp2k \ + --set OMP_NUM_THREADS 1 + + cp -r data/* $out/share/cp2k + + runHook postInstall + ''; + + passthru = { + inherit mpi; + }; + + meta = { + description = "Quantum chemistry and solid state physics program"; + homepage = "https://www.cp2k.org"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.sheepforce ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/chemistry/cp2k/remove-compiler-options.patch b/pkgs/by-name/cp/cp2k/remove-compiler-options.patch similarity index 100% rename from pkgs/applications/science/chemistry/cp2k/remove-compiler-options.patch rename to pkgs/by-name/cp/cp2k/remove-compiler-options.patch diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix index ed12a43f2b3da..d7ed4fb99c476 100644 --- a/pkgs/by-name/cp/cppcheck/package.nix +++ b/pkgs/by-name/cp/cppcheck/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.14.2"; + version = "2.15.0"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "danmar"; repo = "cppcheck"; rev = finalAttrs.version; - hash = "sha256-aVjQqwsTw6TCLxs2oQif3hX5kfXHua7ekBpO/PyneAQ="; + hash = "sha256-6AI3sy4D+YhUOpy02UHJWyhelbqcoEW+Tw/ADCPEbuM="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; # test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed. - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); doInstallCheck = true; postPatch = '' diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index bb1b7cf10f030..372ebbce2a504 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -1,12 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses -, libcpuid, pciutils, procps, wrapGAppsHook3, nasm, makeWrapper -, opencl-headers, ocl-icd -, vulkan-headers, vulkan-loader, glfw -, libXdmcp, pcre, util-linux -, libselinux, libsepol -, libthai, libdatrie, libxkbcommon, libepoxy -, dbus, at-spi2-core -, libXtst +{ + lib, + testers, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + gtk3, + ncurses, + libcpuid, + pciutils, + procps, + wrapGAppsHook3, + nasm, + opencl-headers, + ocl-icd, + vulkan-headers, + vulkan-loader, + glfw, + libXdmcp, + pcre, + util-linux, + libselinux, + libsepol, + libthai, + libdatrie, + libxkbcommon, + libepoxy, + dbus, + at-spi2-core, + libXtst, + gtkmm3, }: # Known issues: @@ -14,41 +37,69 @@ # registered in /etc/shells. The nix's bash is not in there when running # cpu-x from nixpkgs. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpu-x"; version = "5.0.4"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; - rev = "v${version}"; - sha256 = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 nasm makeWrapper ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook3 + nasm + ]; + buildInputs = [ - gtk3 ncurses libcpuid pciutils procps - vulkan-headers vulkan-loader glfw - opencl-headers ocl-icd - libXdmcp pcre util-linux - libselinux libsepol - libthai libdatrie libxkbcommon libepoxy - dbus at-spi2-core + gtk3 + gtkmm3 + ncurses + libcpuid + pciutils + procps + vulkan-headers + vulkan-loader + glfw + opencl-headers + ocl-icd + libXdmcp + pcre + util-linux + libselinux + libsepol + libthai + libdatrie + libxkbcommon + libepoxy + dbus + at-spi2-core libXtst ]; - postInstall = '' - wrapProgram $out/bin/cpu-x \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \ + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ) ''; - meta = with lib; { + passthru = { + tests = { + version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; + }; + + meta = { description = "Free software that gathers information on CPU, motherboard and more"; mainProgram = "cpu-x"; homepage = "https://thetumultuousunicornofdarkness.github.io/CPU-X"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ viraptor ]; + maintainers = with lib.maintainers; [ viraptor ]; }; -} +}) diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 7e3c88015fa8c..8989bf8e16898 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2024-08-07"; + version = "0-unstable-2024-09-26"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "16bfc1622c6902d6f91d316ec54894910c620325"; - hash = "sha256-LDqBH2O64PaVaqNvvjy/17kNpvfa60oP8VZ0GLeAAag="; + rev = "1e83a2fdd3102f65c6f1fb602c1b320486218a99"; + hash = "sha256-28cFACca+NYE8oKlP5aWXNCLeEjhWqJ6gRnFI+VxDvg="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SYSTEM_LIBS" true) ]; - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); meta = { description = "Tools and library to detect essential for performance optimization information about host CPU"; diff --git a/pkgs/by-name/cr/crabfit-api/package.nix b/pkgs/by-name/cr/crabfit-api/package.nix index c3d396a035813..eb1eda130e5b3 100644 --- a/pkgs/by-name/cr/crabfit-api/package.nix +++ b/pkgs/by-name/cr/crabfit-api/package.nix @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/cr/cro-mag-rally/package.nix b/pkgs/by-name/cr/cro-mag-rally/package.nix index 781ddad7fd05b..93ca67f0a86a9 100644 --- a/pkgs/by-name/cr/cro-mag-rally/package.nix +++ b/pkgs/by-name/cr/cro-mag-rally/package.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation { SDL2 ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - installPhase = '' runHook preInstall mkdir -p "$out/share/CroMagRally" diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix new file mode 100644 index 0000000000000..a1a283727743f --- /dev/null +++ b/pkgs/by-name/cr/crocoddyl/package.nix @@ -0,0 +1,89 @@ +{ + blas, + cmake, + doxygen, + example-robot-data, + fetchFromGitHub, + ipopt, + lapack, + lib, + pinocchio, + pkg-config, + pythonSupport ? false, + python3Packages, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "crocoddyl"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "loco-3d"; + repo = "crocoddyl"; + rev = "v${finalAttrs.version}"; + hash = "sha256-SVV9sleDXLm2QJmNgL25XLHC3y5bfKab4GSlE8jbT8w="; + }; + + outputs = [ + "out" + "doc" + ]; + + strictDeps = true; + + nativeBuildInputs = + [ + cmake + doxygen + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; + + propagatedBuildInputs = + [ + blas + ipopt + lapack + ] + ++ lib.optionals (!pythonSupport) [ + example-robot-data + pinocchio + ] + ++ lib.optionals pythonSupport [ + python3Packages.example-robot-data + python3Packages.pinocchio + python3Packages.scipy + ]; + + cmakeFlags = [ + (lib.cmakeBool "INSTALL_DOCUMENTATION" true) + (lib.cmakeBool "BUILD_EXAMPLES" pythonSupport) + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + ]; + + prePatch = '' + substituteInPlace \ + examples/CMakeLists.txt \ + examples/log/check_logfiles.sh \ + --replace-fail /bin/bash ${stdenv.shell} + ''; + + doCheck = true; + pythonImportsCheck = [ "crocoddyl" ]; + checkInputs = lib.optionals pythonSupport [ python3Packages.scipy ]; + + meta = with lib; { + description = "Crocoddyl optimal control library"; + homepage = "https://github.com/loco-3d/crocoddyl"; + license = licenses.bsd3; + maintainers = with maintainers; [ + nim65s + wegank + ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/cr/cronutils/package.nix b/pkgs/by-name/cr/cronutils/package.nix index 40c03a0e55bb0..8c2c3d5213a80 100644 --- a/pkgs/by-name/cr/cronutils/package.nix +++ b/pkgs/by-name/cr/cronutils/package.nix @@ -1,14 +1,19 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "cronutils"; version = "1.10"; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "google"; @@ -37,18 +42,20 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "prefix=$(out)" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ "-D_DARWIN_C_SOURCE" # runstat.c:81:81: error: format string is not a string literal "-Wno-format-nonliteral" ]); - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { changelog = "https://github.com/google/cronutils/releases/tag/version%2F${finalAttrs.version}"; description = "Utilities to assist running periodic batch processing jobs"; homepage = "https://github.com/google/cronutils"; - license = licenses.asl20; - maintainers = with maintainers; [ katexochen ]; - platforms = platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ katexochen ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix index 9fc066de866c6..f9391a02f6205 100644 --- a/pkgs/by-name/cr/crossplane-cli/package.nix +++ b/pkgs/by-name/cr/crossplane-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "crossplane-cli"; - version = "1.16.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "crossplane"; repo = "crossplane"; rev = "v${version}"; - hash = "sha256-1067l3DM6/kW6d35+9nfMdFtu8jIzw/QJaHFKzOTbSc="; + hash = "sha256-zcORVw+6QUucxJkHx/QWOHn50fd4+Jp+ZtiGuwfEQ6I="; }; - vendorHash = "sha256-Ccc7hEsHkHw2P5cgMB06VVlHur5DCPclaEMoFCwoSrA="; + vendorHash = "sha256-de9xt3aFmGDddwMO2GgKKKmSfvsfnpit3wUrBme//fI="; ldflags = [ "-s" diff --git a/pkgs/by-name/cr/crosswords/package.nix b/pkgs/by-name/cr/crosswords/package.nix index bff7d838ec7b8..91bbd5c6e88f8 100644 --- a/pkgs/by-name/cr/crosswords/package.nix +++ b/pkgs/by-name/cr/crosswords/package.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Crossword player and editor for GNOME"; homepage = "https://gitlab.gnome.org/jrb/crosswords"; + changelog = "https://gitlab.gnome.org/jrb/crosswords/-/blob/${version}/NEWS.md?ref_type=tags"; license = licenses.gpl3Plus; mainProgram = "crosswords"; maintainers = with maintainers; [ aleksana ]; diff --git a/pkgs/by-name/cr/crunchy-cli/package.nix b/pkgs/by-name/cr/crunchy-cli/package.nix index 4a5e9236ef9b0..21a8a5b8cb344 100644 --- a/pkgs/by-name/cr/crunchy-cli/package.nix +++ b/pkgs/by-name/cr/crunchy-cli/package.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/cr/cryptpad/package.nix b/pkgs/by-name/cr/cryptpad/package.nix index 5362a96cda039..146e9cf7bc1a7 100644 --- a/pkgs/by-name/cr/cryptpad/package.nix +++ b/pkgs/by-name/cr/cryptpad/package.nix @@ -9,7 +9,7 @@ }: let - version = "2024.6.1"; + version = "2024.9.0"; # nix version of install-onlyoffice.sh # a later version could rebuild from sdkjs/web-apps as per # https://github.com/cryptpad/onlyoffice-builds/blob/main/build.sh @@ -68,10 +68,10 @@ buildNpmPackage { owner = "cryptpad"; repo = "cryptpad"; rev = version; - hash = "sha256-qwyXpTY8Ds7R5687PVGZa/rlEyrAZjNzJ4+VQZpF8v0="; + hash = "sha256-OUtWaDVLRUbKS0apwY0aNq4MalGFv+fH9VA7LvWWYRs="; }; - npmDepsHash = "sha256-GSTPsXqe/rxiDh5OW2t+ZY1YRNgRSDxkJ0pvcLIFtFw="; + npmDepsHash = "sha256-pK0b7q1kJja9l8ANwudbfo3jpldwuO56kuulS8X9A5s="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/cr/crystal-dock/package.nix b/pkgs/by-name/cr/crystal-dock/package.nix new file mode 100644 index 0000000000000..fe1f4eaf11c9f --- /dev/null +++ b/pkgs/by-name/cr/crystal-dock/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kdePackages, + qt6, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "crystal-dock"; + version = "2.5"; + + src = fetchFromGitHub { + owner = "dangvd"; + repo = "crystal-dock"; + rev = "v${finalAttrs.version}"; + hash = "sha256-y7Wt0o57z8NaAcYoaigWtI7twx8UAUgSIEWz86LcNKM="; + }; + + nativeBuildInputs = [ + cmake + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + kdePackages.layer-shell-qt + qt6.qtbase + qt6.qtwayland + ]; + + cmakeDir = "../src"; + + meta = with lib; { + description = "Dock (desktop panel) for Linux desktop"; + mainProgram = "crystal-dock"; + license = licenses.gpl3Only; + homepage = "https://github.com/dangvd/crystal-dock"; + maintainers = with maintainers; [ rafameou ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix index 69ac2ade35b1d..ab9c003e27653 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 = "0.28.2"; + version = "0.29.1"; executables = "dotnet-csharpier"; - nugetHash = "sha256-fXyE25niM80pPXCLC80Hm9XEHGUMx0XZOMxdVoA0h18="; + nugetHash = "sha256-VW9QzbQfbY3Tz+Gz3hQ7VC4wOtwfIYV1Yq2WJz6bL04="; meta = with lib; { description = "Opinionated code formatter for C#"; diff --git a/pkgs/by-name/cs/csv-tui/package.nix b/pkgs/by-name/cs/csv-tui/package.nix index cab49e4ddaa76..a56c08e4ec8f0 100644 --- a/pkgs/by-name/cs/csv-tui/package.nix +++ b/pkgs/by-name/cs/csv-tui/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "csv-tui"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "nathangavin"; repo = "csv-tui"; rev = "v${version}"; - hash = "sha256-IRXLwZ2FHcCDmDVJ0xnV/4q+X2AFXPX/+Ph4Xxo3DyM="; + hash = "sha256-T8T9fW4E/wigktSomoc+xPkVqX5T3OnTmL4XIT5YXe8="; }; - cargoHash = "sha256-wgeVcX0zSXffAuvKw2eKXC846WlC8F9UGMoxP3IXoLE="; + cargoHash = "sha256-WDUw539G15rf2X1NWLRCHIxMqyuxthEy8Cbn5XgIFCk="; meta = { description = "Terminal based csv editor which is designed to be memory efficient but still useful"; diff --git a/pkgs/by-name/cs/csvq/package.nix b/pkgs/by-name/cs/csvq/package.nix index 050b25f8da58b..aa1816082b396 100644 --- a/pkgs/by-name/cs/csvq/package.nix +++ b/pkgs/by-name/cs/csvq/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "mithrandie"; repo = "csvq"; rev = "v${version}"; - sha256 = "sha256-1UK+LSMKryoUf2UWbGt8MU3zs5hH2WdpA2v/jBaIHYE="; + hash = "sha256-1UK+LSMKryoUf2UWbGt8MU3zs5hH2WdpA2v/jBaIHYE="; }; vendorHash = "sha256-byBYp+iNnnsAXR+T3XmdwaeeBG8oB1EgNkDabzgUC98="; diff --git a/pkgs/by-name/cs/csvtk/package.nix b/pkgs/by-name/cs/csvtk/package.nix new file mode 100644 index 0000000000000..4079b55f98358 --- /dev/null +++ b/pkgs/by-name/cs/csvtk/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +let + version = "0.30.0"; +in +buildGoModule { + pname = "csvtk"; + inherit version; + + src = fetchFromGitHub { + owner = "shenwei356"; + repo = "csvtk"; + rev = "refs/tags/v${version}"; + hash = "sha256-xq56dErO0vjG9bZ5aISIFWX4IOHaQksE9W1is2HiFuQ="; + }; + + vendorHash = "sha256-wJedDF7QIg8oWc/QX+rZDyq/nkAW+PMb8EYb0RGJxQM="; + + meta = { + description = "Cross-platform, efficient and practical CSV/TSV toolkit in Golang"; + changelog = "https://github.com/shenwei356/csvtk/releases/tag/v${version}"; + homepage = "https://github.com/shenwei356/csvtk"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + mainProgram = "csvtk"; + }; +} diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/by-name/cu/cue2pops/package.nix similarity index 100% rename from pkgs/tools/cd-dvd/cue2pops/default.nix rename to pkgs/by-name/cu/cue2pops/package.nix diff --git a/pkgs/by-name/cu/cuetsy/package.nix b/pkgs/by-name/cu/cuetsy/package.nix new file mode 100644 index 0000000000000..e7afa8b140ada --- /dev/null +++ b/pkgs/by-name/cu/cuetsy/package.nix @@ -0,0 +1,27 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, +}: + +buildGoModule rec { + pname = "cuetsy"; + version = "0.1.11"; + + src = fetchFromGitHub { + owner = "grafana"; + repo = "cuetsy"; + rev = "v${version}"; + hash = "sha256-dirzVR4j5K1+EHbeRi4rHwRxkyveySoM7qJzvOlGp+0="; + }; + + vendorHash = "sha256-CDa7ZfbVQOIt24VZTy4j0Dn24nolmYa0h9zgrJ3QTeY="; + + meta = { + description = "Experimental CUE->TypeScript exporter"; + homepage = "https://github.com/grafana/cuetsy"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bryanhonof ]; + mainProgram = "cuetsy"; + }; +} diff --git a/pkgs/by-name/cu/cups-brother-dcpt725dw/package.nix b/pkgs/by-name/cu/cups-brother-dcpt725dw/package.nix new file mode 100644 index 0000000000000..b93e8e1fc32ff --- /dev/null +++ b/pkgs/by-name/cu/cups-brother-dcpt725dw/package.nix @@ -0,0 +1,113 @@ +{ + stdenv, + lib, + fetchurl, + perl, + ghostscript, + coreutils, + gnugrep, + which, + file, + gnused, + dpkg, + makeWrapper, + libredirect, + debugLvl ? "0", +}: + +stdenv.mkDerivation rec { + pname = "cups-brother-dcpt725dw"; + version = "3.5.0-1"; + src = fetchurl { + url = "https://download.brother.com/welcome/dlf105181/dcpt725dwpdrv-${version}.i386.deb"; + hash = "sha256-fK6RHaW/ej1nFgSaTbzWxVgjIW32YTbJbd1xD37ZE7c="; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + buildInputs = [ perl ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + dpkg-deb -x $src $out + + LPDDIR=$out/opt/brother/Printers/dcpt725dw/lpd + WRAPPER=$out/opt/brother/Printers/dcpt725dw/cupswrapper/brother_lpdwrapper_dcpt725dw + + ln -s $LPDDIR/${stdenv.hostPlatform.linuxArch}/* $LPDDIR/ + + substituteInPlace $WRAPPER \ + --replace-fail "PRINTER =~" "PRINTER = \"dcpt725dw\"; #" \ + --replace-fail "basedir =~" "basedir = \"$out/opt/brother/Printers/dcpt725dw/\"; #" \ + --replace-fail "lpdconf = " "lpdconf = \$lpddir.'/'.\$LPDCONFIGEXE.\$PRINTER; #" \ + --replace-fail "\$DEBUG=0;" "\$DEBUG=${debugLvl};" + + substituteInPlace $LPDDIR/filter_dcpt725dw \ + --replace-fail "BR_PRT_PATH =~" "BR_PRT_PATH = \"$out/opt/brother/Printers/dcpt725dw/\"; #" \ + --replace-fail "PRINTER =~" "PRINTER = \"dcpt725dw\"; #" + + wrapProgram $WRAPPER \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + gnused + ] + } + + wrapProgram $LPDDIR/filter_dcpt725dw \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + ghostscript + gnugrep + gnused + which + file + ] + } + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $LPDDIR/brdcpt725dwfilter + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $LPDDIR/brprintconf_dcpt725dw + + wrapProgram $LPDDIR/brprintconf_dcpt725dw \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS /opt=$out/opt + + wrapProgram $LPDDIR/brdcpt725dwfilter \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS /opt=$out/opt + + mkdir -p "$out/lib/cups/filter" "$out/share/cups/model" + + ln -s $out/opt/brother/Printers/dcpt725dw/cupswrapper/brother_lpdwrapper_dcpt725dw \ + $out/lib/cups/filter/brother_lpdwrapper_dcpt725dw + + ln -s "$out/opt/brother/Printers/dcpt725dw/cupswrapper/brother_dcpt725dw_printer_en.ppd" \ + "$out/share/cups/model/" + + runHook postInstall + ''; + + meta = with lib; { + description = "Brother DCP-T725DW printer driver"; + license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ u2x1 ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + downloadPage = "https://support.brother.com/g/b/downloadtop.aspx?c=cn_ot&lang=en&prod=dcpt725dw_cn"; + homepage = "http://www.brother.com/"; + }; +} diff --git a/pkgs/by-name/cu/cups-idprt-barcode/package.nix b/pkgs/by-name/cu/cups-idprt-barcode/package.nix index 1f9bb0b168f91..a5e3a85b5a943 100644 --- a/pkgs/by-name/cu/cups-idprt-barcode/package.nix +++ b/pkgs/by-name/cu/cups-idprt-barcode/package.nix @@ -25,10 +25,13 @@ stdenvNoCC.mkDerivation { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-barcode: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cu/cups-idprt-mt888/package.nix b/pkgs/by-name/cu/cups-idprt-mt888/package.nix index 27441a467b303..0fa4fd146d060 100644 --- a/pkgs/by-name/cu/cups-idprt-mt888/package.nix +++ b/pkgs/by-name/cu/cups-idprt-mt888/package.nix @@ -25,10 +25,13 @@ stdenvNoCC.mkDerivation { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-mt888: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cu/cups-idprt-mt890/package.nix b/pkgs/by-name/cu/cups-idprt-mt890/package.nix index ca3baacbcfe46..96ca74b35ee60 100644 --- a/pkgs/by-name/cu/cups-idprt-mt890/package.nix +++ b/pkgs/by-name/cu/cups-idprt-mt890/package.nix @@ -25,10 +25,13 @@ stdenvNoCC.mkDerivation { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-mt890: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cu/cups-idprt-sp900/package.nix b/pkgs/by-name/cu/cups-idprt-sp900/package.nix index ed07c4fc36be4..34243a325ee72 100644 --- a/pkgs/by-name/cu/cups-idprt-sp900/package.nix +++ b/pkgs/by-name/cu/cups-idprt-sp900/package.nix @@ -34,10 +34,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-sp900: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cu/cups-idprt-tspl/package.nix b/pkgs/by-name/cu/cups-idprt-tspl/package.nix index 60aa4c8c80d81..f165015c14f4f 100644 --- a/pkgs/by-name/cu/cups-idprt-tspl/package.nix +++ b/pkgs/by-name/cu/cups-idprt-tspl/package.nix @@ -33,10 +33,13 @@ stdenvNoCC.mkDerivation { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-tspl: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cw/cwe-client-cli/package.nix b/pkgs/by-name/cw/cwe-client-cli/package.nix new file mode 100644 index 0000000000000..c7ec89733fa8f --- /dev/null +++ b/pkgs/by-name/cw/cwe-client-cli/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + glib, + dbus, + openssl_3, +}: +rustPlatform.buildRustPackage rec { + pname = "cwe-client-cli"; + version = "0.3.2"; + src = fetchFromGitHub { + owner = "NotBalds"; + repo = "cwe-client-cli"; + rev = "v${version}"; + hash = "sha256-7zzmYwuQ+Sg8hf1zuKtKUMgk0Is1YJB4WdOKdxtWRA0="; + }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + glib + dbus + openssl_3 + ]; + cargoHash = "sha256-VgbNwqDVcORWJB5QjH39gZZtW1n2Me9FxVUhb4vIg1A="; + + meta = { + description = "Simple command line client for CWE"; + homepage = "https://github.com/NotBalds/cwe-client-cli"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ tbwanderer ]; + mainProgram = "cwe-client-cli"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/cy/cyberpunk-neon/package.nix b/pkgs/by-name/cy/cyberpunk-neon/package.nix index f0a2f6f41d20f..cbaf538c18f89 100644 --- a/pkgs/by-name/cy/cyberpunk-neon/package.nix +++ b/pkgs/by-name/cy/cyberpunk-neon/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "cyberpunk-neon"; - version = "0-unstable-2024-02-23"; + version = "0-unstable-2024-09-15"; src = fetchFromGitHub { owner = "Roboron3042"; repo = "Cyberpunk-Neon"; - rev = "258b3956a677d56df3027f3d08eabf07da936ec3"; - hash = "sha256-00scMHUgesgEmE9naC/AJ9mCRz325jT5WN0uo+u2s6k="; + rev = "18febaab8aa808889fb08c368e37be4ca79e0cdd"; + hash = "sha256-YR8au1ukggYsPGecZMkLIf901dbRJSrXVMs2CzaIMBo="; }; outputs = [ diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index d0ed49b7b2673..341fa8b0dfa29 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "1.8.2"; + version = "1.8.4"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-bmVgl6E+MdjzM4wfhKHdii+58srAStRTYU+IP/OTqdU="; + hash = "sha256-5433lq3u+s4LiC9089Ul7wGJiouQdVDoM3RT0QSiAnU="; }; - cargoHash = "sha256-dpdtjeejt+jfSlSN1NZeAWSMcDq8mOGAHTJlmBkp/4s="; + cargoHash = "sha256-EW4M072qWCghg4UlhjMBR6DVzKsu/foE+j4MOSiHqNk="; nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # doctest that requires access outside sandbox "--skip=udev::hwdb::get" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # system_profiler is not available in the sandbox "--skip=test_run" ]; diff --git a/pkgs/by-name/cz/czkawka/time.patch b/pkgs/by-name/cz/czkawka/0000-time.diff similarity index 100% rename from pkgs/by-name/cz/czkawka/time.patch rename to pkgs/by-name/cz/czkawka/0000-time.diff diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index cc3396125f40c..934b6d1dcafac 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -1,95 +1,112 @@ -{ lib -, stdenv -, atk -, cairo -, czkawka -, darwin -, fetchFromGitHub -, gdk-pixbuf -, glib -, gobject-introspection -, gtk4 -, pango -, overrideSDK -, pkg-config -, rustPlatform -, testers -, wrapGAppsHook4 -, xvfb-run +{ + lib, + atk, + cairo, + callPackage, + darwin, + fetchFromGitHub, + gdk-pixbuf, + glib, + gobject-introspection, + gtk4, + overrideSDK, + pango, + pkg-config, + rustPlatform, + stdenv, + testers, + wrapGAppsHook4, + xvfb-run, }: let - pname = "czkawka"; - version = "7.0.0"; - - src = fetchFromGitHub { - owner = "qarmin"; - repo = "czkawka"; - rev = version; - hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94="; - }; - cargoPatches = [ ./time.patch ]; - cargoHash = "sha256-cQv8C0P3xizsvnJODkTMJQA98P4nYSCHFT75isJE6es="; - buildRustPackage' = rustPlatform.buildRustPackage.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; -in -buildRustPackage' { - inherit pname version src cargoPatches cargoHash; - nativeBuildInputs = [ - gobject-introspection - pkg-config - wrapGAppsHook4 - ]; + self = buildRustPackage' { + pname = "czkawka"; + version = "7.0.0"; - buildInputs = [ - atk - cairo - gdk-pixbuf - glib - gtk4 - pango - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - AppKit - ]); + src = fetchFromGitHub { + owner = "qarmin"; + repo = "czkawka"; + rev = self.version; + hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94="; + }; - nativeCheckInputs = [ - xvfb-run - ]; + cargoPatches = [ + # Updates time and time-macros from Cargo.lock + ./0000-time.diff + ]; - strictDeps = true; + cargoHash = "sha256-cQv8C0P3xizsvnJODkTMJQA98P4nYSCHFT75isJE6es="; - checkPhase = '' - runHook preCheck - xvfb-run cargo test - runHook postCheck - ''; + nativeBuildInputs = [ + gobject-introspection + pkg-config + wrapGAppsHook4 + ]; - doCheck = stdenv.hostPlatform.isLinux - && (stdenv.hostPlatform == stdenv.buildPlatform); + buildInputs = + [ + atk + cairo + gdk-pixbuf + glib + gtk4 + pango + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + Foundation + ] + ); - passthru.tests.version = testers.testVersion { - package = czkawka; - command = "czkawka_cli --version"; - }; + nativeCheckInputs = [ xvfb-run ]; - # Desktop items, icons and metainfo are not installed automatically - postInstall = '' - install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop - install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg - install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka-symbolic.svg - install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml - ''; + strictDeps = true; - meta = { - changelog = "https://github.com/qarmin/czkawka/raw/${version}/Changelog.md"; - description = "Simple, fast and easy to use app to remove unnecessary files from your computer"; - homepage = "https://github.com/qarmin/czkawka"; - license = with lib.licenses; [ mit ]; - mainProgram = "czkawka_gui"; - maintainers = with lib.maintainers; [ AndersonTorres yanganto _0x4A6F ]; + doCheck = stdenv.hostPlatform.isLinux && (stdenv.hostPlatform == stdenv.buildPlatform); + + checkPhase = '' + runHook preCheck + xvfb-run cargo test + runHook postCheck + ''; + + # Desktop items, icons and metainfo are not installed automatically + postInstall = '' + install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop + install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg + install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka-symbolic.svg + install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml + ''; + + passthru = { + tests.version = testers.testVersion { + package = self; + command = "czkawka_cli --version"; + }; + wrapper = callPackage ./wrapper.nix { + czkawka = self; + }; + }; + + meta = { + 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 ]; + mainProgram = "czkawka_gui"; + maintainers = with lib.maintainers; [ + AndersonTorres + yanganto + _0x4A6F + ]; + }; }; -} +in +self diff --git a/pkgs/by-name/cz/czkawka/wrapper.nix b/pkgs/by-name/cz/czkawka/wrapper.nix new file mode 100644 index 0000000000000..0b2e7bf0ed0e1 --- /dev/null +++ b/pkgs/by-name/cz/czkawka/wrapper.nix @@ -0,0 +1,33 @@ +{ + lib, + czkawka, + makeWrapper, + symlinkJoin, + # configurable options + extraPackages ? [ ], +}: + +symlinkJoin { + name = "czkawka-wrapped-${czkawka.version}"; + inherit (czkawka) pname version outputs; + + nativeBuildInputs = [ makeWrapper ]; + + paths = [ czkawka ]; + + postBuild = '' + ${lib.concatMapStringsSep "\n" ( + output: "ln --symbolic --no-target-directory ${czkawka.${output}} \$${output}" + ) (lib.remove "out" czkawka.outputs)} + + pushd $out/bin + for f in *; do + rm -v $f + makeWrapper ${lib.getBin czkawka}/bin/$f $out/bin/$f \ + --prefix PATH ":" "${lib.makeBinPath extraPackages}" + done + popd + ''; + + meta = czkawka.meta; +} diff --git a/pkgs/by-name/da/dablin/package.nix b/pkgs/by-name/da/dablin/package.nix new file mode 100644 index 0000000000000..a86a6d505721e --- /dev/null +++ b/pkgs/by-name/da/dablin/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + mpg123, + SDL2, + gtkmm3, + faad2, + pcre, +}: + +stdenv.mkDerivation rec { + pname = "dablin"; + version = "1.16.0"; + + src = fetchFromGitHub { + owner = "Opendigitalradio"; + repo = "dablin"; + rev = version; + sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + faad2 + mpg123 + SDL2 + gtkmm3 + pcre + ]; + + meta = { + description = "Play DAB/DAB+ from ETI-NI aligned stream"; + homepage = "https://github.com/Opendigitalradio/dablin"; + license = with lib.licenses; [ + gpl3Plus + lgpl21Only + ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.markuskowa ]; + }; +} diff --git a/pkgs/applications/science/math/dap/default.nix b/pkgs/by-name/da/dap/package.nix similarity index 100% rename from pkgs/applications/science/math/dap/default.nix rename to pkgs/by-name/da/dap/package.nix diff --git a/pkgs/by-name/da/dapr-cli/package.nix b/pkgs/by-name/da/dapr-cli/package.nix index 798e87d2877ee..ffdf5b50769ef 100644 --- a/pkgs/by-name/da/dapr-cli/package.nix +++ b/pkgs/by-name/da/dapr-cli/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "dapr"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-NjGTH9aKupv/32ibqMSmPPaNA0TSq6AXjN8cjVD6r/M="; + hash = "sha256-NjGTH9aKupv/32ibqMSmPPaNA0TSq6AXjN8cjVD6r/M="; }; vendorHash = "sha256-Ec1z8Wvq8gk8dYcm10ujy7zYWR7Mus1nl21Od3SUFrU="; diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix index aa79d6048dd96..fd31987ff364e 100644 --- a/pkgs/by-name/da/darklua/package.nix +++ b/pkgs/by-name/da/darklua/package.nix @@ -19,7 +19,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-fYx+SQdQMnNSygr0/Y4zEPtqfQPZYmQUq3ndi1HlXuE="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix new file mode 100644 index 0000000000000..e3a32dba46582 --- /dev/null +++ b/pkgs/by-name/da/darktable/package.nix @@ -0,0 +1,150 @@ +{ lib +, stdenv +, fetchurl +, libsoup +, graphicsmagick +, json-glib +, wrapGAppsHook3 +, cairo +, cmake +, ninja +, curl +, perl +, desktop-file-utils +, exiv2 +, glib +, glib-networking +, ilmbase +, gtk3 +, intltool +, lcms2 +, lensfun +, libX11 +, libexif +, libgphoto2 +, libjpeg +, libpng +, librsvg +, libtiff +, libjxl +, openexr_3 +, osm-gps-map +, pkg-config +, sqlite +, libxslt +, openjpeg +, pugixml +, colord +, colord-gtk +, libwebp +, libsecret +, adwaita-icon-theme +, SDL2 +, ocl-icd +, pcre +, gtk-mac-integration +, isocodes +, llvmPackages +, gmic +, libavif +, icu +, jasper +, libheif +, libaom +, portmidi +, lua +}: + +stdenv.mkDerivation rec { + version = "4.8.1"; + pname = "darktable"; + + src = fetchurl { + url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; + hash = "sha256-kBsOLK7Tb7hhn99MYO37jTETS5R9MFS1xm/VXDivWZE="; + }; + + nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook3 ]; + + buildInputs = [ + cairo + curl + exiv2 + glib + glib-networking + gtk3 + ilmbase + lcms2 + lensfun + libexif + libgphoto2 + libjpeg + libpng + librsvg + libtiff + libjxl + openexr_3 + sqlite + libxslt + libsoup + graphicsmagick + json-glib + openjpeg + pugixml + libwebp + libsecret + SDL2 + adwaita-icon-theme + osm-gps-map + pcre + isocodes + gmic + libavif + icu + jasper + libheif + libaom + portmidi + lua + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + colord + colord-gtk + libX11 + ocl-icd + ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; + + cmakeFlags = [ + "-DBUILD_USERMANUAL=False" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DUSE_COLORD=OFF" + "-DUSE_KWALLET=OFF" + ]; + + # darktable changed its rpath handling in commit + # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the + # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in + # the wrappers: + preFixup = + 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"; + in + '' + for f in $out/share/darktable/kernels/*.cl; do + sed -r "s|#include \"(.*)\"|#include \"$out/share/darktable/kernels/\1\"|g" -i "$f" + done + + gappsWrapperArgs+=( + --prefix ${libPathEnvVar} ":" "${libPathPrefix}" + ) + ''; + + meta = with lib; { + description = "Virtual lighttable and darkroom for photographers"; + homepage = "https://www.darktable.org"; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ flosse mrVanDalo paperdigits freyacodes ]; + }; +} diff --git a/pkgs/by-name/da/darling-dmg/package.nix b/pkgs/by-name/da/darling-dmg/package.nix index 4fca75a45bc85..3053982a64765 100644 --- a/pkgs/by-name/da/darling-dmg/package.nix +++ b/pkgs/by-name/da/darling-dmg/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ fuse openssl zlib bzip2 libxml2 icu lzfse ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; CXXFLAGS = [ "-DCOMPILE_WITH_LZFSE=1" diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix new file mode 100644 index 0000000000000..f0409ac390413 --- /dev/null +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -0,0 +1,62 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + python3, +}: + +buildGoModule rec { + pname = "databricks-cli"; + version = "0.228.1"; + + src = fetchFromGitHub { + owner = "databricks"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-zQ39PwVjyxOTo6P+RA4F20/28loMbu3Bprd4C3jgu5A="; + }; + + vendorHash = "sha256-SOeVIwMbx1eRzBvyfT3aaJOL7BCb745yezn1QYrf5vU="; + + excludedPackages = [ "bundle/internal" ]; + + postBuild = '' + mv "$GOPATH/bin/cli" "$GOPATH/bin/databricks" + ''; + + checkFlags = + "-skip=" + + (lib.concatStringsSep "|" [ + # Need network + "TestTerraformArchiveChecksums" + "TestExpandPipelineGlobPaths" + "TestRelativePathTranslationDefault" + "TestRelativePathTranslationOverride" + ]); + + nativeCheckInputs = [ + git + (python3.withPackages ( + ps: with ps; [ + setuptools + wheel + ] + )) + ]; + + preCheck = '' + # Some tested depends on git and remote url + git init + git remote add origin https://github.com/databricks/cli.git + ''; + + meta = with lib; { + description = "Databricks CLI"; + mainProgram = "databricks"; + homepage = "https://github.com/databricks/cli"; + changelog = "https://github.com/databricks/cli/releases/tag/v${version}"; + license = licenses.databricks; + maintainers = with maintainers; [ kfollesdal ]; + }; +} diff --git a/pkgs/by-name/db/dbd/package.nix b/pkgs/by-name/db/dbd/package.nix index 20658b4d716db..1df459cb32670 100644 --- a/pkgs/by-name/db/dbd/package.nix +++ b/pkgs/by-name/db/dbd/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" - ] ++ lib.optionals stdenv.isDarwin [ "darwin" ] ++ lib.optionals (stdenv.hostPlatform.isUnix && !stdenv.isDarwin) [ "unix" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "darwin" ] ++ lib.optionals (stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin) [ "unix" ]; meta = with lib; { description = "Netcat-clone, designed to be portable and offer strong encryption"; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index d741337c78b3a..9b5bf26200fb7 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -11,11 +11,13 @@ gtk3, swt, glib, + webkitgtk, + glib-networking, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "24.1.5"; + version = "24.2.1"; src = let @@ -28,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-FdrQDQ+2nsZp44+sARXT89/ZXlkl/OGej1JuezXGgU4="; - aarch64-linux = "sha256-oNP0ntsQ79ckNXuQ3TeVf9ooGzwCq7WXI0TbjTLC5DI="; - x86_64-darwin = "sha256-YcmMZPigykA9vNEF32NzCQWMWPt1GM7VaWGSAZp/1YM="; - aarch64-darwin = "sha256-tz+Ap/YZJbc+obCLqq2b2HgRUORWkaOHVGEEJtwEJXo="; + x86_64-linux = "sha256-U1KJxE1PzRRMvYw3jSYV2n6JuhzyL30le1HeY0kft1k="; + aarch64-linux = "sha256-AT/Xx+Hwu64sUfR1fS9nI+RTsIfdi9udF9TR9hbjnxg="; + x86_64-darwin = "sha256-hCIfBv6FaNoZiTvpx1UCdwBg15vq+ZsTG5upmbWXN0M="; + aarch64-darwin = "sha256-g0G6fqR75AoOEzlYr6MbTBL8aQ/hWQuFyw1G2w9/JlU="; }; in fetchurl { @@ -39,22 +41,22 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit hash; }; - sourceRoot = lib.optional stdenvNoCC.isDarwin "dbeaver.app"; + sourceRoot = lib.optional stdenvNoCC.hostPlatform.isDarwin "dbeaver.app"; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals (!stdenvNoCC.isDarwin) [ + ++ lib.optionals (!stdenvNoCC.hostPlatform.isDarwin) [ gnused wrapGAppsHook3 autoPatchelfHook ] - ++ lib.optionals stdenvNoCC.isDarwin [ undmg ]; + ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ undmg ]; dontConfigure = true; dontBuild = true; installPhase = - if !stdenvNoCC.isDarwin then + if !stdenvNoCC.hostPlatform.isDarwin then '' runHook preInstall @@ -64,11 +66,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { --prefix PATH : "${openjdk17}/bin" \ --set JAVA_HOME "${openjdk17.home}" \ --prefix CLASSPATH : "$out/dbeaver/plugins/*:${swt}/jars/swt.jar" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix LD_LIBRARY_PATH : "$out/lib:${ lib.makeLibraryPath [ swt gtk3 glib + webkitgtk + glib-networking ] }" diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix index ab62dee5f391c..58c88b65c0fee 100644 --- a/pkgs/by-name/db/dbgate/package.nix +++ b/pkgs/by-name/db/dbgate/package.nix @@ -40,7 +40,7 @@ let sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname diff --git a/pkgs/by-name/db/dbqn/package.nix b/pkgs/by-name/db/dbqn/package.nix index 0e9d311c4dc7a..7ec4dea053429 100644 --- a/pkgs/by-name/db/dbqn/package.nix +++ b/pkgs/by-name/db/dbqn/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "dzaima"; repo = "BQN"; rev = "v${version}"; - sha256 = "sha256-AUfT7l7zr/pyG63wX8FMej8RUg7tXC1aroCrunjyw/8="; + hash = "sha256-AUfT7l7zr/pyG63wX8FMej8RUg7tXC1aroCrunjyw/8="; }; nativeBuildInputs = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ AndersonTorres sternenseemann ]; inherit (jdk.meta) platforms; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dbqn-native.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dbqn-native.x86_64-darwin }; } # TODO: Processing app diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix index b40371f51487b..aaf39f2ca14da 100644 --- a/pkgs/by-name/dc/dconf-editor/package.nix +++ b/pkgs/by-name/dc/dconf-editor/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/dconf-editor/${lib.versions.major version}/dconf-editor-${version}.tar.xz"; - sha256 = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0="; + hash = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0="; }; patches = [ @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { description = "GSettings editor for GNOME"; mainProgram = "dconf-editor"; homepage = "https://apps.gnome.org/DconfEditor/"; + changelog = "https://gitlab.gnome.org/GNOME/dconf-editor/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/pkgs/by-name/de/debase/ignore-vendored-libgit2.patch b/pkgs/by-name/de/debase/ignore-vendored-libgit2.patch new file mode 100644 index 0000000000000..027a016d76034 --- /dev/null +++ b/pkgs/by-name/de/debase/ignore-vendored-libgit2.patch @@ -0,0 +1,31 @@ +diff --git a/Makefile b/Makefile +index b0b682cb..513822d9 100644 +--- a/Makefile ++++ b/Makefile +@@ -58,17 +58,14 @@ endif + + INCDIRS = \ + -isystem ./lib/ncurses/include \ +- -iquote ./lib/libgit2/include \ + -iquote ./src \ + -iquote . + + LIBDIRS = \ +- -L./lib/libgit2/build-$(PLATFORM) \ + -L./lib/ncurses/build-$(PLATFORM) + + LIBS = \ + -lgit2 \ +- -lz \ + -lpthread \ + -lformw \ + -lmenuw \ +@@ -102,7 +99,7 @@ $(OBJS): | lib $(GITHASHHEADER) + # Libs: execute make from `lib` directory + .PHONY: lib + lib: +- $(MAKE) -C $@ ++ $(MAKE) -C $@ ncurses/$(BUILDROOT) + + # C rule + $(BUILDDIR)/%.o: %.c diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix new file mode 100644 index 0000000000000..91061e5ad2e92 --- /dev/null +++ b/pkgs/by-name/de/debase/package.nix @@ -0,0 +1,98 @@ +{ + darwin, + fetchFromGitHub, + fetchpatch, # Delete at next version bump. + lib, + libgit2, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "debase"; + # NOTE: When updating version, also update commit hash in prePatch. + version = "2"; + + src = + (fetchFromGitHub { + owner = "toasterllc"; + repo = "debase"; + rev = "refs/tags/v${version}"; + hash = "sha256-6AavH8Ag+879ntcxJDbVgsg8V6U4cxwPQYPKvq2PpoQ="; + fetchSubmodules = true; + }).overrideAttrs + { + # Workaround to fetch git@github.com submodules. + # See https://github.com/NixOS/nixpkgs/issues/195117 + # + # Already fixed in latest upstream, so delete at next version bump. + GIT_CONFIG_COUNT = 1; + GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; + GIT_CONFIG_VALUE_0 = "git@github.com:"; + }; + + prePatch = '' + # xcrun is not available in the Darwin stdenv, but we don't need it anyway. + substituteInPlace Makefile \ + --replace-fail 'xcrun dsymutil' dsymutil + + # NOTE: Update this when updating version. + substituteInPlace Makefile \ + --replace-fail 'git rev-parse HEAD' 'echo bbe9f1737ab229dd370640a4b5d5e742a051c13b' \ + --replace-fail '$(GITHASHHEADER): .git/HEAD .git/index' '$(GITHASHHEADER):' + ''; + + patches = [ + # Ignore debase's vendored copy of libgit2 in favor of the nixpkgs version. + ./ignore-vendored-libgit2.patch + # Already fixed in latest upstream, so delete at next version bump. + (fetchpatch { + url = "https://github.com/toasterllc/debase/commit/d483c5ac016ac2ef3600e93ae4022cd9d7781c83.patch"; + hash = "sha256-vVQMOEiLTd46+UknZm8Y197sjyK/kTK/M+9sRX9AssY="; + }) + ]; + + buildInputs = [ + libgit2 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; + + installPhase = '' + runHook preInstall + install -Dm755 build-${ + if stdenv.hostPlatform.isDarwin then "mac" else "linux" + }/release/debase $out/bin/debase + runHook postInstall + ''; + + enableParallelBuilding = true; + + makeFlags = [ + "ARCHS=${ + if stdenv.hostPlatform.isx86_64 then + "x86_64" + else if stdenv.hostPlatform.isAarch64 then + "arm64" + else + abort "unsupported system: ${stdenv.system}" + }" + ]; + + meta = { + description = "TUI for drag-and-drop manipulation of git commits"; + homepage = "https://toaster.llc/debase"; + # The author has not yet specified a license. + # See https://github.com/toasterllc/debase/pull/4 + license = lib.licenses.publicDomain; + mainProgram = "debase"; + maintainers = with lib.maintainers; [ + jeremyschlatter + aleksana + ]; + 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/decibels/package.nix b/pkgs/by-name/de/decibels/package.nix index 2921c1897356a..82e0131edcad2 100644 --- a/pkgs/by-name/de/decibels/package.nix +++ b/pkgs/by-name/de/decibels/package.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base # for GstVideo gst_all_1.gst-plugins-bad # for GstPlay gst_all_1.gst-plugins-good # for scaletempo + gst_all_1.gst-libav libadwaita ]; @@ -65,6 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Play audio files"; homepage = "https://gitlab.gnome.org/GNOME/Incubator/decibels"; + changelog = "https://gitlab.gnome.org/GNOME/Incubator/decibels/-/blob/main/NEWS?ref_type=tags"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "org.gnome.Decibels"; diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix new file mode 100644 index 0000000000000..29f6bdaeeaf7f --- /dev/null +++ b/pkgs/by-name/de/deck/package.nix @@ -0,0 +1,48 @@ +{ + buildGoModule, + lib, + installShellFiles, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "deck"; + version = "1.40.3"; + + src = fetchFromGitHub { + owner = "Kong"; + repo = "deck"; + rev = "refs/tags/v${version}"; + hash = "sha256-n6WASCtDwBX4FASSWI17JpU7rDXIeSidPWhj/MB2tUs="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + CGO_ENABLED = 0; + + ldflags = [ + "-s -w -X github.com/kong/deck/cmd.VERSION=${version}" + "-X github.com/kong/deck/cmd.COMMIT=${src.rev}" + ]; + + proxyVendor = true; # darwin/linux hash mismatch + vendorHash = "sha256-csoSvu7uce1diB4EsQCRRt08mX+rJoxfZqAtaoo0x4M="; + + postInstall = '' + installShellCompletion --cmd deck \ + --bash <($out/bin/deck completion bash) \ + --fish <($out/bin/deck completion fish) \ + --zsh <($out/bin/deck completion zsh) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Configuration management and drift detection tool for Kong"; + homepage = "https://github.com/Kong/deck"; + license = lib.licenses.asl20; + mainProgram = "deck"; + maintainers = with lib.maintainers; [ liyangau ]; + }; +} diff --git a/pkgs/by-name/de/delfin/package.nix b/pkgs/by-name/de/delfin/package.nix index d5eaa8beb93e6..359098559bcae 100644 --- a/pkgs/by-name/de/delfin/package.nix +++ b/pkgs/by-name/de/delfin/package.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "delfin"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitea { domain = "codeberg.org"; owner = "avery42"; repo = "delfin"; rev = "v${version}"; - hash = "sha256-iqibdVMf4RBl/EuFvE6tEPDliYmRtIYCW/mO+nNKcWU="; + hash = "sha256-kCPLfGeMsWAjNrtrxUeXaLv1ZkDCfhDl0HLwYDaoMTY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2V2jx78S0Gj4/w3oduH/s7Pd6XG/GCs4lwhFCdGVdd8="; + hash = "sha256-LOW4Gm69e0Cyif3UuzYITy0GMGEgZOHURNxrsZRLdWo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index bf70d4672a054..78f7c75d4e03b 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -37,29 +37,29 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.46.5"; + version = "1.46.8"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-u/2/lCQpUf5bxKPseHz6SFmiW0m9SywuA5Ng3BBnX88="; + hash = "sha256-17JhaanYEySoDuLYFMc4vB3wVlCucMh3Jk2Uu9PqUdQ="; }; - npmDepsHash = "sha256-jnuSL0yr6E8P0Tev9rMsfCLs59WStaH19DhZe0zthmw="; + npmDepsHash = "sha256-+74koym1lL2rk5n06i7JgcXmX+yW4zgqRfdH6ryXe0s="; nativeBuildInputs = [ jq makeWrapper pkg-config python3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; buildInputs = [ deltachat-rpc-server - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/by-name/de/deltachat-repl/package.nix b/pkgs/by-name/de/deltachat-repl/package.nix index fe97f891caa79..eedda8a397aff 100644 --- a/pkgs/by-name/de/deltachat-repl/package.nix +++ b/pkgs/by-name/de/deltachat-repl/package.nix @@ -1,6 +1,5 @@ { rustPlatform , libdeltachat -, perl , pkg-config }: @@ -10,10 +9,13 @@ rustPlatform.buildRustPackage { inherit (libdeltachat) version src cargoLock buildInputs; nativeBuildInputs = [ - perl pkg-config ]; + env = { + OPENSSL_NO_VENDOR = true; + }; + cargoBuildFlags = [ "--package" "deltachat-repl" ]; doCheck = false; diff --git a/pkgs/by-name/de/deltachat-rpc-server/package.nix b/pkgs/by-name/de/deltachat-rpc-server/package.nix index b7d0dbef23748..1e1e95796771c 100644 --- a/pkgs/by-name/de/deltachat-rpc-server/package.nix +++ b/pkgs/by-name/de/deltachat-rpc-server/package.nix @@ -1,6 +1,5 @@ { rustPlatform , libdeltachat -, perl , pkg-config }: @@ -10,10 +9,13 @@ rustPlatform.buildRustPackage { inherit (libdeltachat) version src cargoLock buildInputs; nativeBuildInputs = [ - perl pkg-config ]; + env = { + OPENSSL_NO_VENDOR = true; + }; + cargoBuildFlags = [ "--package" "deltachat-rpc-server" ]; doCheck = false; diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix index 3b65c23a9a0a3..3c78eeb75b315 100644 --- a/pkgs/by-name/de/deltatouch/package.nix +++ b/pkgs/by-name/de/deltatouch/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "deltatouch"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "lk108"; repo = "deltatouch"; rev = "v${finalAttrs.version}"; - hash = "sha256-OQrTxxmiBiAc9il1O5aEl9iN3fCfoxSAwJDfrASCPxs="; + hash = "sha256-mOs5WlWOkH9A+BZK6hvKq/JKS4k8tzvvov4CYFHyMfA="; fetchSubmodules = true; }; @@ -48,12 +48,13 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'assets/logo.svg DESTINATION assets' 'assets/logo.svg DESTINATION ''${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME deltatouch.svg' \ --replace-fail "\''${DESKTOP_FILE_NAME} DESTINATION \''${DATA_DIR}" "\''${DESKTOP_FILE_NAME} DESTINATION \''${CMAKE_INSTALL_DATAROOTDIR}/applications" - substituteInPlace plugins/DeltaHandler/CMakeLists.txt plugins/DTWebEngineProfile/CMakeLists.txt \ + substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile}/CMakeLists.txt \ --replace-fail 'set(QT_IMPORTS_DIR "/lib/''${ARCH_TRIPLET}")' 'set(QT_IMPORTS_DIR "${placeholder "out"}/${qt5.qtbase.qtQmlPrefix}")' # Fix import of library dependencies + substituteInPlace plugins/{DeltaHandler,WebxdcEngineProfile}/CMakeLists.txt \ + --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libdeltachat.so"' 'IMPORTED_LOCATION "${lib.getLib libdeltachat}/lib/libdeltachat.so"' substituteInPlace plugins/DeltaHandler/CMakeLists.txt \ - --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libdeltachat.so"' 'IMPORTED_LOCATION "${lib.getLib libdeltachat}/lib/libdeltachat.so"' \ --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libquirc.so.1.2"' 'IMPORTED_LOCATION "${lib.getLib quirc}/lib/libquirc.so"' # Fix icon reference in desktop file diff --git a/pkgs/by-name/de/deno/librusty_v8.nix b/pkgs/by-name/de/deno/librusty_v8.nix new file mode 100644 index 0000000000000..bb9e09d2e2f89 --- /dev/null +++ b/pkgs/by-name/de/deno/librusty_v8.nix @@ -0,0 +1,23 @@ +# auto-generated file -- DO NOT EDIT! +{ lib, stdenv, fetchurl }: + +let + fetch_librusty_v8 = args: fetchurl { + name = "librusty_v8-${args.version}"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; + sha256 = args.shas.${stdenv.hostPlatform.system}; + meta = { + inherit (args) version; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; + }; +in +fetch_librusty_v8 { + version = "0.105.0"; + shas = { + x86_64-linux = "sha256-9yON4DNPxm4IUZSLZp9VZtzSRPPWX1tEuQLVJmN8cLs="; + aarch64-linux = "sha256-5vAjw2vimjCHKPxjIp5vcwMCWUUDYVlk4QyOeEI0DLY="; + x86_64-darwin = "sha256-o4WRkg4ptiJTNMkorn5K+P8xOJwpChM5PqkZCjP076g="; + aarch64-darwin = "sha256-ZuWBnvxu1PgDtjtguxtj3BhFO01AChlbjAS0kZUws3A="; + }; +} diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix new file mode 100644 index 0000000000000..687d837952a26 --- /dev/null +++ b/pkgs/by-name/de/deno/package.nix @@ -0,0 +1,118 @@ +{ + stdenv, + lib, + callPackage, + fetchFromGitHub, + rustPlatform, + cmake, + protobuf, + installShellFiles, + libiconv, + darwin, + librusty_v8 ? callPackage ./librusty_v8.nix { }, +}: +rustPlatform.buildRustPackage rec { + pname = "deno"; + version = "1.46.3"; + + src = fetchFromGitHub { + owner = "denoland"; + repo = "deno"; + rev = "refs/tags/v${version}"; + hash = "sha256-AM6SjcIHo6Koxcnznhkv3cXoKaMy2TEVpiWe/bczDuA="; + }; + + cargoHash = "sha256-D+CZpb6OTzM5Il0k8GQB7qSONy4myE5yKlaSkLLqHT8="; + + postPatch = '' + # upstream uses lld on aarch64-darwin for faster builds + # within nix lld looks for CoreFoundation rather than CoreFoundation.tbd and fails + substituteInPlace .cargo/config.toml --replace "-fuse-ld=lld " "" + ''; + + # uses zlib-ng but can't dynamically link yet + # https://github.com/rust-lang/libz-sys/issues/158 + nativeBuildInputs = [ + # required by libz-ng-sys crate + cmake + # required by deno_kv crate + protobuf + installShellFiles + ]; + buildInputs = lib.optionals stdenv.isDarwin ( + [ + libiconv + darwin.libobjc + ] + ++ (with darwin.apple_sdk_11_0.frameworks; [ + Security + CoreServices + Metal + MetalPerformanceShaders + Foundation + QuartzCore + ]) + ); + + # work around "error: unknown warning group '-Wunused-but-set-parameter'" + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option"; + + buildAndTestSubdir = "cli"; + + # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem + # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE + RUSTY_V8_ARCHIVE = librusty_v8; + + # Tests have some inconsistencies between runs with output integration tests + # Skipping until resolved + doCheck = false; + + preInstall = '' + find ./target -name libswc_common${stdenv.hostPlatform.extensions.sharedLibrary} -delete + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd deno \ + --bash <($out/bin/deno completions bash) \ + --fish <($out/bin/deno completions fish) \ + --zsh <($out/bin/deno completions zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/deno --help + $out/bin/deno --version | grep "deno ${version}" + runHook postInstallCheck + ''; + + passthru.updateScript = ./update/update.ts; + passthru.tests = callPackage ./tests { }; + + meta = with lib; { + homepage = "https://deno.land/"; + changelog = "https://github.com/denoland/deno/releases/tag/v${version}"; + description = "Secure runtime for JavaScript and TypeScript"; + longDescription = '' + Deno aims to be a productive and secure scripting environment for the modern programmer. + Deno will always be distributed as a single executable. + Given a URL to a Deno program, it is runnable with nothing more than the ~15 megabyte zipped executable. + Deno explicitly takes on the role of both runtime and package manager. + It uses a standard browser-compatible protocol for loading modules: URLs. + Among other things, Deno is a great replacement for utility scripts that may have been historically written with + bash or python. + ''; + license = licenses.mit; + mainProgram = "deno"; + maintainers = with maintainers; [ jk ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + # NOTE: `aligned_alloc` error on darwin SDK < 10.15. Can't do usual overrideSDK with rust toolchain in current implementation. + # Should be fixed with darwin SDK refactor and can be revisited. + badPlatforms = [ "x86_64-darwin" ]; + }; +} diff --git a/pkgs/development/web/deno/tests/basic.ts b/pkgs/by-name/de/deno/tests/basic.ts similarity index 100% rename from pkgs/development/web/deno/tests/basic.ts rename to pkgs/by-name/de/deno/tests/basic.ts diff --git a/pkgs/development/web/deno/tests/default.nix b/pkgs/by-name/de/deno/tests/default.nix similarity index 100% rename from pkgs/development/web/deno/tests/default.nix rename to pkgs/by-name/de/deno/tests/default.nix diff --git a/pkgs/development/web/deno/tests/import-json/data.json b/pkgs/by-name/de/deno/tests/import-json/data.json similarity index 100% rename from pkgs/development/web/deno/tests/import-json/data.json rename to pkgs/by-name/de/deno/tests/import-json/data.json diff --git a/pkgs/development/web/deno/tests/import-json/index.ts b/pkgs/by-name/de/deno/tests/import-json/index.ts similarity index 100% rename from pkgs/development/web/deno/tests/import-json/index.ts rename to pkgs/by-name/de/deno/tests/import-json/index.ts diff --git a/pkgs/development/web/deno/tests/import-ts/index.ts b/pkgs/by-name/de/deno/tests/import-ts/index.ts similarity index 100% rename from pkgs/development/web/deno/tests/import-ts/index.ts rename to pkgs/by-name/de/deno/tests/import-ts/index.ts diff --git a/pkgs/development/web/deno/tests/import-ts/lib.ts b/pkgs/by-name/de/deno/tests/import-ts/lib.ts similarity index 100% rename from pkgs/development/web/deno/tests/import-ts/lib.ts rename to pkgs/by-name/de/deno/tests/import-ts/lib.ts diff --git a/pkgs/development/web/deno/tests/read-file/data.txt b/pkgs/by-name/de/deno/tests/read-file/data.txt similarity index 100% rename from pkgs/development/web/deno/tests/read-file/data.txt rename to pkgs/by-name/de/deno/tests/read-file/data.txt diff --git a/pkgs/development/web/deno/tests/read-file/index.ts b/pkgs/by-name/de/deno/tests/read-file/index.ts similarity index 100% rename from pkgs/development/web/deno/tests/read-file/index.ts rename to pkgs/by-name/de/deno/tests/read-file/index.ts diff --git a/pkgs/development/web/deno/update/common.ts b/pkgs/by-name/de/deno/update/common.ts similarity index 100% rename from pkgs/development/web/deno/update/common.ts rename to pkgs/by-name/de/deno/update/common.ts diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/by-name/de/deno/update/librusty_v8.ts similarity index 100% rename from pkgs/development/web/deno/update/librusty_v8.ts rename to pkgs/by-name/de/deno/update/librusty_v8.ts diff --git a/pkgs/development/web/deno/update/src.ts b/pkgs/by-name/de/deno/update/src.ts similarity index 100% rename from pkgs/development/web/deno/update/src.ts rename to pkgs/by-name/de/deno/update/src.ts diff --git a/pkgs/development/web/deno/update/update.ts b/pkgs/by-name/de/deno/update/update.ts similarity index 93% rename from pkgs/development/web/deno/update/update.ts rename to pkgs/by-name/de/deno/update/update.ts index 27e1d86ee861a..5a219307c45f9 100755 --- a/pkgs/development/web/deno/update/update.ts +++ b/pkgs/by-name/de/deno/update/update.ts @@ -12,8 +12,8 @@ const nixpkgs = Deno.cwd(); // TODO: Read values from default.nix const owner = "denoland"; const repo = "deno"; -const denoDir = `${nixpkgs}/pkgs/development/web/${repo}`; -const src = `${denoDir}/default.nix`; +const denoDir = `${nixpkgs}/pkgs/by-name/de/${repo}`; +const src = `${denoDir}/package.nix`; const librusty_v8 = `${denoDir}/librusty_v8.nix`; const architectures: Architecture[] = [ { nix: "x86_64-linux", rust: "x86_64-unknown-linux-gnu" }, diff --git a/pkgs/by-name/de/densify/package.nix b/pkgs/by-name/de/densify/package.nix old mode 100755 new mode 100644 index 0b2e1c3143713..b4f2797ba94bc --- a/pkgs/by-name/de/densify/package.nix +++ b/pkgs/by-name/de/densify/package.nix @@ -2,7 +2,6 @@ fetchFromGitHub, lib, python3Packages, - python3, gtk3, gobject-introspection, wrapGAppsHook3, diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index 930c37fc9dccb..1aac043fcf83e 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -4,16 +4,28 @@ python3, }: +let + appthreat-vulnerability-db = ( + python3.pkgs.appthreat-vulnerability-db.overrideAttrs (oldAttrs: rec { + version = "5.7.3"; + src = oldAttrs.src.override { + rev = "refs/tags/v${version}"; + hash = "sha256-MrlgBUx3T2G46Pnah3obe5b4yKDzsAFVC/B7AHM0kZY="; + }; + }) + ); + +in python3.pkgs.buildPythonApplication rec { pname = "dep-scan"; - version = "5.3.4"; + version = "5.4.3"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-5iMhl3Wcxwgq4Wr0TUcAuRnb2+y8DHBugnnkpcZfSAM="; + hash = "sha256-m0vDsCetOSfScu1eprrGaDJ1VuXxuNFBitK8N5GtfSQ="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/de/dep-tree/package.nix b/pkgs/by-name/de/dep-tree/package.nix index 224eddd3d156d..5c276b5686ffa 100644 --- a/pkgs/by-name/de/dep-tree/package.nix +++ b/pkgs/by-name/de/dep-tree/package.nix @@ -10,25 +10,25 @@ let owner = "gabotechs"; repo = "react-stl-viewer"; rev = "2.2.4"; - sha256 = "sha256-0u9q0UgOn43PE1Y6BUhl1l6RnVjpPraFqZWB+HhQ0s8="; + hash = "sha256-0u9q0UgOn43PE1Y6BUhl1l6RnVjpPraFqZWB+HhQ0s8="; }; react-gcode-viewer = fetchFromGitHub { owner = "gabotechs"; repo = "react-gcode-viewer"; rev = "2.2.4"; - sha256 = "sha256-FHBICLdy0k4j3pPKStg+nkIktMpKS1ADa4m1vYHJ+AQ="; + hash = "sha256-FHBICLdy0k4j3pPKStg+nkIktMpKS1ADa4m1vYHJ+AQ="; }; graphql-js = fetchFromGitHub { owner = "graphql"; repo = "graphql-js"; rev = "v17.0.0-alpha.2"; - sha256 = "sha256-y55SNiMivL7bRsjLEIpsKKyaluI4sXhREpiB6A5jfDU="; + hash = "sha256-y55SNiMivL7bRsjLEIpsKKyaluI4sXhREpiB6A5jfDU="; }; warp = fetchFromGitHub { owner = "seanmonstar"; repo = "warp"; rev = "v0.3.3"; - sha256 = "sha256-76ib8KMjTS2iUOwkQYCsoeL3GwBaA/MRQU2eGjJEpOo="; + hash = "sha256-76ib8KMjTS2iUOwkQYCsoeL3GwBaA/MRQU2eGjJEpOo="; }; }; pname = "dep-tree"; diff --git a/pkgs/by-name/de/departure-mono/package.nix b/pkgs/by-name/de/departure-mono/package.nix index a272a79d1ba30..09b1af57d28ab 100644 --- a/pkgs/by-name/de/departure-mono/package.nix +++ b/pkgs/by-name/de/departure-mono/package.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "departure-mono"; - version = "1.346"; + version = "1.350"; src = fetchzip { - url = "https://departuremono.com/assets/DepartureMono-${finalAttrs.version}.zip"; + url = "https://github.com/rektdeckard/departure-mono/releases/download/v${finalAttrs.version}/DepartureMono-${finalAttrs.version}.zip"; stripRoot = false; - hash = "sha256-xJVVtLnukcWQKVC3QiHvrfIA3W9EYt/iiphbLYT1iMg="; + hash = "sha256-MMmS1yjhy50fgMK5h0526YKRfQJuOcEAHqxn9rhUwCc="; }; installPhase = '' @@ -25,6 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; meta = { + changelog = "https://github.com/rektdeckard/departure-mono/releases/tag/v${finalAttrs.version}"; description = "Departure Mono is a monospaced pixel font with a lo-fi technical vibe"; homepage = "https://departuremono.com/"; license = lib.licenses.ofl; diff --git a/pkgs/by-name/de/dependency-track/0000-remove-frontend-download.patch b/pkgs/by-name/de/dependency-track/0000-remove-frontend-download.patch new file mode 100644 index 0000000000000..6e68f1813c253 --- /dev/null +++ b/pkgs/by-name/de/dependency-track/0000-remove-frontend-download.patch @@ -0,0 +1,44 @@ +diff --git a/pom.xml b/pom.xml +index 9988e765..906917c0 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -660,38 +660,13 @@ + <artifactId>maven-antrun-plugin</artifactId> + <version>3.1.0</version> + <executions> +- <execution> +- <id>frontend-download</id> +- <phase>prepare-package</phase> +- <configuration> +- <target> +- <get src="https://github.com/DependencyTrack/frontend/releases/download/${frontend.version}/frontend-dist.zip" dest="${project.build.directory}" verbose="true"/> +- </target> +- </configuration> +- <goals> +- <goal>run</goal> +- </goals> +- </execution> +- <execution> +- <id>frontend-extract</id> +- <phase>prepare-package</phase> +- <configuration> +- <target> +- <unzip src="${project.build.directory}/frontend-dist.zip" dest="${project.build.directory}/frontend"> +- </unzip> +- </target> +- </configuration> +- <goals> +- <goal>run</goal> +- </goals> +- </execution> + <execution> + <id>frontend-resource-deploy</id> + <phase>prepare-package</phase> + <configuration> + <target> + <copy todir="${project.build.directory}/${project.artifactId}"> +- <fileset dir="${project.build.directory}/frontend/dist"> ++ <fileset dir="${project.basedir}/frontend/dist"> + <include name="**/*"/> + </fileset> + </copy> diff --git a/pkgs/by-name/de/dependency-track/0001-add-junixsocket.patch b/pkgs/by-name/de/dependency-track/0001-add-junixsocket.patch new file mode 100644 index 0000000000000..c6b0f9e76c651 --- /dev/null +++ b/pkgs/by-name/de/dependency-track/0001-add-junixsocket.patch @@ -0,0 +1,17 @@ +diff --git a/pom.xml b/pom.xml +index 9988e765..f69576b4 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -457,6 +457,12 @@ + <version>${lib.testcontainers.version}</version> + <scope>test</scope> + </dependency> ++ <dependency> ++ <groupId>com.kohlschutter.junixsocket</groupId> ++ <artifactId>junixsocket-core</artifactId> ++ <version>2.10.0</version> ++ <type>pom</type> ++ </dependency> + </dependencies> + + <build> diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix new file mode 100644 index 0000000000000..64f45f5c06192 --- /dev/null +++ b/pkgs/by-name/de/dependency-track/package.nix @@ -0,0 +1,113 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + jre_headless, + cyclonedx-cli, + makeWrapper, + maven, + nix-update-script, + nixosTests, +}: +let + version = "4.11.7"; + + frontend = buildNpmPackage { + pname = "dependency-track-frontend"; + inherit version; + + src = fetchFromGitHub { + owner = "DependencyTrack"; + repo = "frontend"; + rev = version; + hash = "sha256-hgBDzzG90gunnlZeektzdBIdatNjbkDVmNLbxjyxAXE="; + }; + + npmDepsHash = "sha256-veyt7fn4g/eh/+2CapQxlEssZP8cQXONpI6sSW299tk="; + forceGitDeps = true; + makeCacheWritable = true; + + # The prepack script runs the build script, which we'd rather do in the build phase. + npmPackFlags = [ "--ignore-scripts" ]; + }; +in + +maven.buildMavenPackage rec { + inherit version; + pname = "dependency-track"; + + src = fetchFromGitHub { + owner = "DependencyTrack"; + repo = "dependency-track"; + rev = version; + hash = "sha256-BMkn9WnUGs4RxH5I1QQ2UDrlo32JcbfjfFcOG5YogLI="; + }; + + patches = [ + ./0000-remove-frontend-download.patch + ./0001-add-junixsocket.patch + ]; + + mvnJdk = jre_headless; + mvnHash = "sha256-c/JwBiKsXuWbCm1dTCrVc+V/1G7Eii1mUW8xDyewyLs="; + manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ]; + buildOffline = true; + + mvnDepsParameters = lib.escapeShellArgs [ + "-Dmaven.test.skip=true" + "-P enhance" + "-P embedded-jetty" + ]; + + mvnParameters = lib.escapeShellArgs [ + "-Dmaven.test.skip=true" + "-P enhance" + "-P embedded-jetty" + "-P bundle-ui" + "-Dservices.bom.merge.skip=false" + "-Dlogback.configuration.file=${src}/src/main/docker/logback.xml" + "-Dcyclonedx-cli.path=${lib.getExe cyclonedx-cli}" + ]; + + preBuild = '' + mkdir -p frontend + cp -r ${frontend}/lib/node_modules/@dependencytrack/frontend/dist frontend/ + ''; + + afterDepsSetup = '' + mvn cyclonedx:makeBom -Dmaven.repo.local=$mvnDeps/.m2 \ + org.codehaus.mojo:exec-maven-plugin:exec@merge-services-bom + ''; + + doCheck = false; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm644 target/dependency-track-*.jar $out/share/dependency-track/dependency-track.jar + makeWrapper ${jre_headless}/bin/java $out/bin/dependency-track \ + --add-flags "-jar $out/share/dependency-track/dependency-track.jar" + + runHook postInstall + ''; + + passthru = { + # passthru for nix-update + inherit (frontend) npmDeps; + tests = { + inherit (nixosTests) dependency-track; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain"; + homepage = "https://github.com/DependencyTrack/dependency-track"; + license = lib.licenses.asl20; + maintainers = lib.teams.cyberus.members; + mainProgram = "dependency-track"; + inherit (jre_headless.meta) platforms; + }; +} diff --git a/pkgs/by-name/de/deploy-rs/package.nix b/pkgs/by-name/de/deploy-rs/package.nix index 9830785e6a307..a4b85ff3dce95 100644 --- a/pkgs/by-name/de/deploy-rs/package.nix +++ b/pkgs/by-name/de/deploy-rs/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-lsW810bktMzHZIbuN3pz9N+IUcjNtE5J2AuB/G6pGWI="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/de/desed/package.nix b/pkgs/by-name/de/desed/package.nix new file mode 100644 index 0000000000000..a6909bbde8448 --- /dev/null +++ b/pkgs/by-name/de/desed/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage { + pname = "desed"; + version = "1.2.1-unstable-2024-09-06"; + + src = fetchFromGitHub { + owner = "SoptikHa2"; + repo = "desed"; + rev = "master"; + hash = "sha256-iCpEfefXXognk4YI1LLb3mwgaqMw4m3haq/gdS1JbQU="; + }; + + cargoHash = "sha256-z2qv394C0GhQC21HuLyvlNjrM65KFEZh1XLj+Y/B9ZM="; + + meta = { + changelog = "https://github.com/SoptikHa2/desed/releases/tag/v1.2.1"; + description = "Debugger for Sed: demystify and debug your sed scripts, from comfort of your terminal. "; + homepage = "https://github.com/SoptikHa2/desed"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ vinylen ]; + mainProgram = "desed"; + }; +} diff --git a/pkgs/applications/emulators/desmume/default.nix b/pkgs/by-name/de/desmume/package.nix similarity index 100% rename from pkgs/applications/emulators/desmume/default.nix rename to pkgs/by-name/de/desmume/package.nix diff --git a/pkgs/by-name/de/dethrace/package.nix b/pkgs/by-name/de/dethrace/package.nix new file mode 100644 index 0000000000000..7aca04136563c --- /dev/null +++ b/pkgs/by-name/de/dethrace/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + SDL2, + perl, +}: + +stdenv.mkDerivation rec { + pname = "dethrace"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "dethrace-labs"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Bt2wwF5cquXZwFpFyJ0TDmbFdTHbboQ93W/DvP9bsMo="; + fetchSubmodules = true; + }; + + buildInputs = [ SDL2 ]; + nativeBuildInputs = [ + cmake + perl + ]; + + installPhase = '' + install -Dm755 dethrace $out/bin/dethrace + ''; + + meta = with lib; { + homepage = "https://twitter.com/dethrace_labs"; + description = "Reverse engineering the 1997 game Carmageddon"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ astro ]; + mainProgram = "dethrace"; + }; +} diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/by-name/de/dev86/package.nix similarity index 100% rename from pkgs/development/compilers/dev86/default.nix rename to pkgs/by-name/de/dev86/package.nix diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index 58dff97c8bee1..c21b758b9af92 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -14,18 +14,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.65.0"; + version = "0.71.0"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Q1qQjIRyOeFr8qrZJZ1IkO12RM2hp4IxI1NI7WqpmZA="; + hash = "sha256-plIDK5nOvLKFlRVlPHgpjHPhIh0NAWHmbaKsnYCU/7k="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-tN7qAvfYmDz5ZtgZL5+ZZtkuxZxvlS9FM3+dGl+daUQ="; + hash = "sha256-KSVr6RlBEeDAo8D+7laTN+pSH8Ukl6WTpeAULuG2fq8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 68ebc9ff536ea..0e5de7b6cc07a 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -4,32 +4,29 @@ , makeWrapper , rustPlatform , testers - , cachix , darwin -, libgit2 -, nix +, sqlx-cli +, nixVersions , openssl , pkg-config - , devenv # required to run version test }: let - devenv_nix = nix.overrideAttrs (old: { - version = "2.21-devenv"; + devenv_nix = nixVersions.nix_2_24.overrideAttrs (old: { + version = "2.24-devenv"; src = fetchFromGitHub { owner = "domenkozar"; repo = "nix"; - rev = "b24a9318ea3f3600c1e24b4a00691ee912d4de12"; - hash = "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794="; + rev = "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546"; + hash = "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg="; }; - buildInputs = old.buildInputs ++ [ libgit2 ]; doCheck = false; doInstallCheck = false; }); - version = "1.0.8"; + version = "1.3"; in rustPlatform.buildRustPackage { pname = "devenv"; inherit version; @@ -38,16 +35,26 @@ in rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-q/ERT4Ui315opFz4h4+BsJ/zrTYdXkwq13vvrpL+KzM="; + hash = "sha256-14hqEeVy72nYDOFn7HK6Mff7L49kUI5K6wMLVHG3A90="; }; - cargoHash = "sha256-fCXAFVmKns8uglbzyCznoVFGCU+Veq0t1h8T7i1P5XQ="; + cargoHash = "sha256-E4pU/tZHxMrKSheqWF5qeOfS/NZ/Uw5jY+AbSUHmoaI="; buildAndTestSubdir = "devenv"; - nativeBuildInputs = [ makeWrapper pkg-config ]; + # Force sqlx to use the prepared queries + SQLX_OFFLINE = true; + # A local database to use for preparing queries + DATABASE_URL = "sqlite:nix-eval-cache.db"; + + preBuild = '' + cargo sqlx database setup --source devenv-eval-cache/migrations + cargo sqlx prepare --workspace + ''; + + nativeBuildInputs = [ makeWrapper pkg-config sqlx-cli ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/de/devhelp/package.nix b/pkgs/by-name/de/devhelp/package.nix index 54991136da643..085374e32b547 100644 --- a/pkgs/by-name/de/devhelp/package.nix +++ b/pkgs/by-name/de/devhelp/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/devhelp-${version}.tar.xz"; - sha256 = "Y87u/QU5LgIESIHvHs1yQpNVPaVzW378CCstE/6F3QQ="; + hash = "sha256-Y87u/QU5LgIESIHvHs1yQpNVPaVzW378CCstE/6F3QQ="; }; nativeBuildInputs = [ @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { description = "API documentation browser for GNOME"; mainProgram = "devhelp"; homepage = "https://apps.gnome.org/Devhelp/"; + changelog = "https://gitlab.gnome.org/GNOME/devhelp/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix index d2660fff82ab8..b8f637088d139 100644 --- a/pkgs/by-name/de/dezoomify-rs/package.nix +++ b/pkgs/by-name/de/dezoomify-rs/package.nix @@ -1,21 +1,30 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, + darwin, }: rustPlatform.buildRustPackage rec { pname = "dezoomify-rs"; - version = "2.12.4"; + version = "2.13.0"; src = fetchFromGitHub { owner = "lovasoa"; repo = "dezoomify-rs"; rev = "refs/tags/v${version}"; - hash = "sha256-7CRwlnIItJ89qqemkJbx5QjcLrwYrvpcjVYX5ZWP0W4="; + hash = "sha256-uo0QTaAAbNYMidlWBauW+3hdd0snEWH+I5KQL6Vxgug="; }; - cargoHash = "sha256-v48eM43+/dt2M1J9yfjfTpBetv6AA2Hhzu8rrL3gojg="; + cargoHash = "sha256-0T5zvd78l3ghop/KoIgXYoGssVV9F+ppJV2pWyLnwxo="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + SystemConfiguration + ] + ); checkFlags = [ # Tests failing due to networking errors in Nix build environment diff --git a/pkgs/applications/emulators/dgen-sdl/default.nix b/pkgs/by-name/dg/dgen-sdl/package.nix similarity index 100% rename from pkgs/applications/emulators/dgen-sdl/default.nix rename to pkgs/by-name/dg/dgen-sdl/package.nix diff --git a/pkgs/by-name/di/diagrams-as-code/package.nix b/pkgs/by-name/di/diagrams-as-code/package.nix index cbce445d630a9..fd748332c230e 100644 --- a/pkgs/by-name/di/diagrams-as-code/package.nix +++ b/pkgs/by-name/di/diagrams-as-code/package.nix @@ -29,6 +29,7 @@ python3Packages.buildPythonPackage rec { pythonRelaxDeps = [ "diagrams" "pydantic" + "pyyaml" ]; pythonImportsCheck = [ "diagrams_as_code" ]; diff --git a/pkgs/by-name/di/dialog/package.nix b/pkgs/by-name/di/dialog/package.nix index 23f75bb1c994f..9ef3647299330 100644 --- a/pkgs/by-name/di/dialog/package.nix +++ b/pkgs/by-name/di/dialog/package.nix @@ -3,7 +3,7 @@ , fetchurl , libtool , ncurses -, enableShared ? !stdenv.isDarwin && !stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isStatic , unicodeSupport ? true , withLibrary ? true }: diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 1efcfdec0e961..04f6100615999 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.2.3"; + version = "2.2.4"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-pv75bvswi+JfeL7B8GPaQgXyNdNvzNgXs9VYgzKRn2U="; + hash = "sha256-kTwAG1B4gy+1jj5ar5RkmIUMAO9wYsG7QnMcZii/OZk="; }; - cargoHash = "sha256-BMMh4BEoB1UhavoiQWfFhsSZsvfFSfEJhEewjA1ukLQ="; + cargoHash = "sha256-qcyNFuKJldHVJDAye4K1rHPf/SvpZ+BmqBast1vh/3Q="; nativeBuildInputs = [ installShellFiles @@ -44,8 +44,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security - ++ lib.optional (stdenv.isDarwin && mysqlSupport) libiconv + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security + ++ lib.optional (stdenv.hostPlatform.isDarwin && mysqlSupport) libiconv ++ lib.optional sqliteSupport sqlite ++ lib.optional postgresqlSupport postgresql ++ lib.optionals mysqlSupport [ diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix index 6e1edaf882fa4..6c342dba52f1e 100644 --- a/pkgs/by-name/di/diffedit3/package.nix +++ b/pkgs/by-name/di/diffedit3/package.nix @@ -4,14 +4,14 @@ rustPlatform.buildRustPackage rec { pname = "diffedit3"; - version = "0.4.0"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-qw5Wos2u/H6ccJ3qkrVOCisMFDTNwxp/YeOTE1x5lcU="; + hash = "sha256-zBdLz8O2WCR8SN0UXUAaEdIpmmL+LIaGt44STBw6nyU="; }; - cargoHash = "sha256-e5bm8GLubA9BzH9oKKSC/Ysh+O+GJA8x6W576vKIIUA="; + cargoHash = "sha256-jZTXM+2Gd4N9D4Pj2KsuQ2MFPuWJdHg30u/5BlM3HEE="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/di/dim/package.nix b/pkgs/by-name/di/dim/package.nix index f7fe86ab9a987..53ab3a0ed685c 100644 --- a/pkgs/by-name/di/dim/package.nix +++ b/pkgs/by-name/di/dim/package.nix @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite ] - ++ lib.optional stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/di/direnv/package.nix b/pkgs/by-name/di/direnv/package.nix index 033f73249f0b9..c89d0f19650a5 100644 --- a/pkgs/by-name/di/direnv/package.nix +++ b/pkgs/by-name/di/direnv/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "sha256-EvzqLS/FiWrbIXDkp0L/T8QNKnRGuQkbMWajI3X3BDw="; + hash = "sha256-EvzqLS/FiWrbIXDkp0L/T8QNKnRGuQkbMWajI3X3BDw="; }; vendorHash = "sha256-FfKvLPv+jUT5s2qQ7QlzBMArI+acj7nhpE8FGMPpp5E="; diff --git a/pkgs/by-name/di/disarchive/package.nix b/pkgs/by-name/di/disarchive/package.nix index 9bc24e531552d..8b908d40a6598 100644 --- a/pkgs/by-name/di/disarchive/package.nix +++ b/pkgs/by-name/di/disarchive/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { guile-lzma ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ guile-quickcheck diff --git a/pkgs/by-name/di/discord-gamesdk/package.nix b/pkgs/by-name/di/discord-gamesdk/package.nix index 40756d68e1e54..5d7a8185be45a 100644 --- a/pkgs/by-name/di/discord-gamesdk/package.nix +++ b/pkgs/by-name/di/discord-gamesdk/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://dl-game-sdk.discordapp.net/${version}/discord_game_sdk.zip"; - sha256 = "sha256-83DgL9y3lHLLJ8vgL3EOVk2Tjcue64N+iuDj/UpSdLc="; + hash = "sha256-83DgL9y3lHLLJ8vgL3EOVk2Tjcue64N+iuDj/UpSdLc="; stripRoot = false; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ (stdenv.cc.cc.libgcc or null) ]; - nativeBuildInputs = lib.optional stdenv.isLinux autoPatchelfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; installPhase = let diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix index 157571269688e..68722d2c61428 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/package.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix @@ -39,7 +39,7 @@ buildDotnetModule rec { homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; license = licenses.gpl3Plus; changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md"; - maintainers = with maintainers; [ eclairevoyant ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; mainProgram = "discordchatexporter-cli"; }; diff --git a/pkgs/by-name/di/discover-overlay/package.nix b/pkgs/by-name/di/discover-overlay/package.nix index 7f3c2c5a741f5..4488c4953336f 100644 --- a/pkgs/by-name/di/discover-overlay/package.nix +++ b/pkgs/by-name/di/discover-overlay/package.nix @@ -1,14 +1,14 @@ { lib, python3, fetchFromGitHub, gtk3, gobject-introspection, gtk-layer-shell, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { pname = "discover-overlay"; - version = "0.7.4"; + version = "0.7.8"; pyproject = true; src = fetchFromGitHub { owner = "trigg"; repo = "Discover"; rev = "refs/tags/v${version}"; - hash = "sha256-qA+gvgKQlTjcm0JPUmJp47Ttvm+69CW4lOngnueLVpo="; + hash = "sha256-0b0uZDa9Q3pQ6X65C+E31dMpdTPt4vvHDEqFEtRoedg="; }; buildInputs = [ gtk3 gtk-layer-shell ]; diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index d0e76fc29c4fc..f7553a70fc27c 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -4,18 +4,18 @@ , fetchFromGitHub , bash , nix -, nixos-install-tools +, nixos-install , coreutils }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "disko"; - version = "1.6.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-5CNvkH0Nf7yMwgKhjUNg/lUK40C7DXB4zKOuA2jVO90="; + hash = "sha256-5zShvCy9S4tuISFjNSjb+TWpPtORqPbRZ0XwbLbPLho="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { for i in disko disko-install; do sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i" chmod 755 "$out/bin/$i" - wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install-tools ]} + wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install ]} done runHook postInstall ''; diff --git a/pkgs/by-name/di/dispad/package.nix b/pkgs/by-name/di/dispad/package.nix index bf7007e1eda25..7abea6a785f15 100644 --- a/pkgs/by-name/di/dispad/package.nix +++ b/pkgs/by-name/di/dispad/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "BlueDragonX"; repo = "dispad"; rev = "v${version}"; - sha256 = "0y0n9mf1hs3s706gkpmg1lh74m6vvkqc9rdbzgc6s2k7vdl2zp1y"; + hash = "sha256-PtwvaNtnCm3Y+6vlxPDc21RyIA2v3vkMOHpoGFxNFng="; }; buildInputs = [ libX11 libXi libconfuse ]; diff --git a/pkgs/by-name/di/dissent/package.nix b/pkgs/by-name/di/dissent/package.nix index ecc1b68c50d44..36708fb39215b 100644 --- a/pkgs/by-name/di/dissent/package.nix +++ b/pkgs/by-name/di/dissent/package.nix @@ -7,18 +7,20 @@ , libcanberra-gtk3 , pkg-config , sound-theme-freedesktop +, libspelling +, gtksourceview5 , wrapGAppsHook4 }: buildGoModule rec { pname = "dissent"; - version = "0.0.27"; + version = "0.0.30"; src = fetchFromGitHub { owner = "diamondburned"; repo = "dissent"; rev = "v${version}"; - hash = "sha256-aksQgkeisNvfp++Gobg4ITA1au2GzTgKmFtVCrLkfac="; + hash = "sha256-wBDN9eUPOr9skTTgA0ea50Byta3qVr1loRrfMWhnxP8="; }; nativeBuildInputs = [ @@ -37,9 +39,13 @@ buildGoModule rec { libadwaita libcanberra-gtk3 sound-theme-freedesktop + libspelling + gtksourceview5 ]; postInstall = '' + substituteInPlace nix/so.libdb.dissent.service \ + --replace-warn "/usr/bin/dissent" "$out/bin/dissent" install -D -m 444 -t $out/share/applications nix/so.libdb.dissent.desktop install -D -m 444 -t $out/share/icons/hicolor/scalable/apps internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg install -D -m 444 -t $out/share/icons/hicolor/symbolic/apps internal/icons/symbolic/apps/so.libdb.dissent-symbolic.svg @@ -47,7 +53,7 @@ buildGoModule rec { install -D -m 444 -t $out/share/dbus-1/services nix/so.libdb.dissent.service ''; - vendorHash = "sha256-8LY7XEMe91rGOGLr6TJhoEnl2cWArcQ5VXMV9NpZaL8="; + vendorHash = "sha256-TXqdO+DjnDD/+zwm3gK3+sxMTEVSHuceKz4ZJVH5Y34="; meta = with lib; { description = "A third-party Discord client designed for a smooth, native experience (formerly gtkcord4)"; diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index 51c8148320725..cf8cae7b4f5aa 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -37,7 +37,7 @@ let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; osname = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; @@ -106,9 +106,9 @@ stdenv.mkDerivation (finalAttrs: { rm dmd/compiler/test/dshell/test6952.d '' + lib.optionalString (lib.versionAtLeast version "2.092.2") '' substituteInPlace dmd/compiler/test/dshell/test6952.d --replace-fail "/usr/bin/env bash" "${bash}/bin/bash" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace phobos/std/socket.d --replace-fail "assert(ih.addrList[0] == 0x7F_00_00_01);" "" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)" ''; @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl tzdata - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; @@ -224,6 +224,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) - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/pkgs/by-name/dm/dms/package.nix b/pkgs/by-name/dm/dms/package.nix new file mode 100644 index 0000000000000..52150cf741724 --- /dev/null +++ b/pkgs/by-name/dm/dms/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "dms"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "anacrolix"; + repo = "dms"; + rev = "refs/tags/v${version}"; + hash = "sha256-QwRLNCXDu/dKh2o17AyASlVQPIEOX6e4kTINa2ZzZkU="; + }; + + vendorHash = "sha256-Z0DoVmL0zJ4l9hrO+zGp6FcExvhbiPu5+N3Mfyxi5DE="; + + meta = { + homepage = "https://github.com/anacrolix/dms"; + description = "UPnP DLNA Digital Media Server with basic video transcoding"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.claes ]; + platforms = lib.platforms.linux; + mainProgram = "dms"; + }; +} diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix index 18b80cf7142b8..e4828191c0c67 100644 --- a/pkgs/by-name/do/docfd/package.nix +++ b/pkgs/by-name/do/docfd/package.nix @@ -16,12 +16,12 @@ let # Needed for x86_64-darwin buildDunePackage' = ocamlPackages.buildDunePackage.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; in buildDunePackage' rec { pname = "docfd"; - version = "7.0.0"; + version = "8.0.3"; minimalOCamlVersion = "5.1"; @@ -29,7 +29,7 @@ buildDunePackage' rec { owner = "darrenldl"; repo = "docfd"; rev = version; - hash = "sha256-R/UOA1rf9NnEQQWn/ToCZuUSC48DPqglrb+5ZjCdpb0="; + hash = "sha256-890/3iBruaQtWwlcvwuz4ujp7+P+5y1/2Axx4Iuik8Q="; }; nativeBuildInputs = [ @@ -41,6 +41,7 @@ buildDunePackage' rec { buildInputs = with ocamlPackages; [ cmdliner containers-data + decompress digestif eio_main lwd diff --git a/pkgs/by-name/do/docify/package.nix b/pkgs/by-name/do/docify/package.nix new file mode 100644 index 0000000000000..5d9991752c4c8 --- /dev/null +++ b/pkgs/by-name/do/docify/package.nix @@ -0,0 +1,41 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "docify"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AThePeanut4"; + repo = "docify"; + rev = "refs/tags/v${version}"; + hash = "sha256-pt35Kw0kaZsIGTutXPhjdp8czGtWrSUFWMV3NyFQ/NM="; + }; + + build-system = with python3Packages; [ + pdm-backend + ]; + + dependencies = with python3Packages; [ + libcst + tqdm + ]; + + pythonImportsCheck = [ "docify" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/AThePeanut4/docify/releases/tag/v${version}"; + description = "Script to add docstrings to Python type stubs using reflection"; + homepage = "https://github.com/AThePeanut4/docify"; + license = lib.licenses.mit; + mainProgram = "docify"; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/by-name/do/docker-credential-gcr/package.nix b/pkgs/by-name/do/docker-credential-gcr/package.nix index 5f656f14eaad6..11362c8717453 100644 --- a/pkgs/by-name/do/docker-credential-gcr/package.nix +++ b/pkgs/by-name/do/docker-credential-gcr/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.23"; + version = "2.1.25"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ViZxxqRZQPevuK/yueHKmg4CwnNpgfyXszGalzWucko="; + hash = "sha256-BnYh+MFTj76AWf0GfjzjQ/g/ACgCOLOLVfCSPssvfUY="; }; postPatch = '' diff --git a/pkgs/by-name/do/docopts/package.nix b/pkgs/by-name/do/docopts/package.nix index f2d0033e035d5..cb63a666973eb 100644 --- a/pkgs/by-name/do/docopts/package.nix +++ b/pkgs/by-name/do/docopts/package.nix @@ -11,14 +11,14 @@ buildGoModule rec { owner = "docopt"; repo = "docopts"; rev = "refs/tags/v${version}"; - sha256 = "sha256-GIBrJ5qexeJ6ul5ek9LJZC4J3cNExsTrnxdzRCfoqn8="; + hash = "sha256-GIBrJ5qexeJ6ul5ek9LJZC4J3cNExsTrnxdzRCfoqn8="; }; patches = [ # Migrate project to Go modules. (fetchpatch { url = "https://github.com/docopt/docopts/pull/74/commits/2c516165e72b35516a64c4529dbc938c0aaa9442.patch"; - sha256 = "sha256-Tp05B3tmctnSYIQzCxCc/fhcAWWuEz2ifu/CQZt0XPU="; + hash = "sha256-Tp05B3tmctnSYIQzCxCc/fhcAWWuEz2ifu/CQZt0XPU="; }) ]; diff --git a/pkgs/by-name/do/docuum/package.nix b/pkgs/by-name/do/docuum/package.nix index 3eae913da1e1f..68409ca05651b 100644 --- a/pkgs/by-name/do/docuum/package.nix +++ b/pkgs/by-name/do/docuum/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { "--skip=format::tests::code_str_display" ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; diff --git a/pkgs/by-name/do/dogedns/package.nix b/pkgs/by-name/do/dogedns/package.nix index 0c94a9506d2c0..c6afe1ab78223 100644 --- a/pkgs/by-name/do/dogedns/package.nix +++ b/pkgs/by-name/do/dogedns/package.nix @@ -29,9 +29,9 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ installShellFiles pandoc ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postInstall = '' installShellCompletion completions/doge.{bash,fish,zsh} diff --git a/pkgs/by-name/do/doggo/package.nix b/pkgs/by-name/do/doggo/package.nix index cf8c3ae362281..08f65a5a40c8d 100644 --- a/pkgs/by-name/do/doggo/package.nix +++ b/pkgs/by-name/do/doggo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "doggo"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "mr-karan"; repo = "doggo"; rev = "v${version}"; - hash = "sha256-SD/BcJxoc5Oi8+nAs+CWBEcbgtaohykNlZ14jJvEWew="; + hash = "sha256-SbTwVvE699MCgfUXifnJ1oMNN8TdLg8P03Xx5hrQxF8="; }; - vendorHash = "sha256-JIc6/G1hMf8+oIe4OMc+b0th5MCgi5Mwp3AxW4OD1lg="; + vendorHash = "sha256-44gBPMr6gKaRaq7W69K7OBTVXvsz9pSEL1eOKYd4fT8="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/doggo" ]; @@ -43,6 +43,6 @@ buildGoModule rec { It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well ''; license = licenses.gpl3Only; - maintainers = with maintainers; [ georgesalkhouri ]; + maintainers = with maintainers; [ georgesalkhouri ma27 ]; }; } diff --git a/pkgs/by-name/do/dokieli/package.json b/pkgs/by-name/do/dokieli/package.json new file mode 100644 index 0000000000000..39198309b8127 --- /dev/null +++ b/pkgs/by-name/do/dokieli/package.json @@ -0,0 +1,104 @@ +{ + "name": "dokieli", + "version": "0.3.1417", + "description": "dokieli is a clientside editor for decentralised article publishing, annotations, and social interactions.", + "main": "./src/dokieli.js", + "type": "module", + "scripts": { + "build-dist": "webpack --progress --color", + "build": "yarn build-dist", + "test": "TZ=UTC node --experimental-vm-modules node_modules/jest/bin/jest.js --silent", + "test:e2e": "playwright test", + "watch": "webpack --progress --color --watch", + "minify": "webpack --progress --color --env minimize", + "postinstall": "patch-package", + "lint": "eslint ." + }, + "repository": "https://github.com/linkeddata/dokieli", + "keywords": [ + "activitystreams", + "activitypub", + "annotations", + "authoring", + "decentralized", + "editor", + "knowledge graph", + "linked data", + "notifications", + "publishing", + "social web", + "web standards" + ], + "author": "dokieli team", + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/linkeddata/dokieli/issues" + }, + "homepage": "https://dokie.li/", + "engines": { + "node": ">=18.0.0" + }, + "dependencies": { + "buffer": "^6.0.3", + "d3-force": "^3.0.0", + "d3-selection": "^3.0.0", + "diff": "^5.2.0", + "dompurify": "^3.1.5", + "fs": "^0.0.1-security", + "http-link-header": "^1.1.3", + "leaflet": "^1.9.4", + "leaflet-gpx": "^1.7.0", + "medium-editor": "^5.23.3", + "medium-editor-tables": "^0.6.1", + "micromark": "^4.0.0", + "micromark-extension-gfm": "^3.0.0", + "micromark-extension-gfm-tagfilter": "^2.0.0", + "rdf-parser-rdfa": "https://github.com/rdf-ext/rdf-parser-rdfa.git#master", + "rdf-store-ldp": "^0.3.1", + "shower": "https://github.com/shower/core.git#main", + "simplerdf": "^0.2.14", + "simplerdf-parse": "^0.1.3", + "solid-auth-client": "^2.5.6" + }, + "devDependencies": { + "@axe-core/playwright": "^4.9.1", + "@playwright/test": "^1.44.1", + "babel-eslint": "^10.1.0", + "dotenv": "^16.4.5", + "eslint": "^9.10.0", + "eslint-plugin-jest": "^27.9.0", + "husky": "^9.0.11", + "jest": "^29.0.3", + "jest-environment-jsdom": "^29.0.3", + "patch-package": "^8.0.0", + "process": "^0.11.10", + "terser-webpack-plugin": "^5.3.3", + "webpack": "5.94.0", + "webpack-cli": "^5.0.1" + }, + "resolutions": { + "ansi-regex": "^5.0.0", + "xmldom": "https://github.com/xmldom/xmldom.git#master", + "green-turtle": "https://github.com/csarven/green-turtle#master", + "json5": "^1.0.2", + "http-cache-semantics": "^4.1.1", + "jsonld": "^5.0.0", + "xml2js": "^0.6.2", + "semver": "^7.6.2", + "lru-cache": "^8.0.0", + "micromatch": "^4.0.8" + }, + "standard": { + "globals": [ + "DO", + "SimpleRDF", + "ld", + "describe", + "it", + "before", + "beforeEach", + "after", + "afterEach" + ] + } +} diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix new file mode 100644 index 0000000000000..882f863ef97ae --- /dev/null +++ b/pkgs/by-name/do/dokieli/package.nix @@ -0,0 +1,58 @@ +{ + lib, + mkYarnPackage, + fetchFromGitHub, + fetchYarnDeps, + makeWrapper, + nodejs, + xsel, +}: + +mkYarnPackage rec { + pname = "dokieli"; + version = "0-unstable-2024-09-23"; + + src = fetchFromGitHub { + owner = "linkeddata"; + repo = "dokieli"; + rev = "40ebbc60ba48d8b08f763b07befba96382c5f027"; + hash = "sha256-lc96jOR8uXLcZFhN3wpSd9O5cUdKxllB8WWCh2oWuEw="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-TEXCCLFhpwHZJ8zRGsC7J6EwNaFpIi+CZ3L5uilebK4="; + }; + + packageJSON = ./package.json; + + installPhase = '' + mkdir -p $out/bin + cp -r * $out + ''; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + makeWrapper ${nodejs}/bin/npx $out/bin/dokieli \ + --prefix PATH : ${ + lib.makeBinPath ([ + nodejs + xsel + ]) + } \ + --add-flags serve \ + --chdir $out/deps/dokieli + ''; + + doDist = false; + + meta = { + description = "dokieli is a clientside editor for decentralised article publishing, annotations and social interactions"; + homepage = "https://github.com/linkeddata/dokieli"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ shogo ]; + mainProgram = "dokieli"; + }; +} diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix index b55e7481e5598..1befad040decf 100644 --- a/pkgs/by-name/do/dooit/package.nix +++ b/pkgs/by-name/do/dooit/package.nix @@ -24,7 +24,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; pythonRelaxDeps = [ - "textual" "tzlocal" ]; @@ -33,7 +32,21 @@ python3.pkgs.buildPythonApplication rec { pyperclip python-dateutil pyyaml - textual + (textual.overridePythonAttrs (oldAttrs: { + version = "0.47.1"; + src = fetchFromGitHub { + owner = "Textualize"; + repo = "textual"; + rev = "refs/tags/v0.47.1"; + hash = "sha256-RFaZKQ+0o6ZvfZxx95a1FjSHVJ0VOIAfzkdxYQXYBKU="; + }; + disabledTests = [ + "test_tracked_slugs" + "test_textual_env_var" + "test_register_language" + "test_register_language_existing_language" + ]; + })) tzlocal ]; @@ -57,6 +70,7 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ khaneliman wesleyjrz + kraanzu ]; mainProgram = "dooit"; }; diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix index edc953a2dcccf..10a45cbb2b421 100644 --- a/pkgs/by-name/do/dopamine/package.nix +++ b/pkgs/by-name/do/dopamine/package.nix @@ -6,11 +6,11 @@ }: appimageTools.wrapType2 rec { pname = "dopamine"; - version = "3.0.0-preview.31"; + version = "3.0.0-preview.34"; src = fetchurl { url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage"; - hash = "sha256-NWDk4OOaven1FgSkvKCNY078xkwR+Tp4kUASh/rIbzo="; + hash = "sha256-K4dDYYzo2oMAZvlb25cQuh1G187efSyJfAA6jdCKaT0="; }; extraInstallCommands = diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index f3fbfe1caf209..175909ad20f81 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.69.0"; + version = "3.69.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-lijVKNmqTcmjgIzlcMdm/DUrBA+0xV6Wge9dt5xdWFY="; + hash = "sha256-KiSRMF4S+gz8cnRxkO2SVwO3Rl6ImflK/4MEgkQh2UE="; }; vendorHash = "sha256-NUHWKPszQH/pvnA+j65+bJ6t+C0FDRRbTviqkYztpE4="; diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index 1ed9382bef8f2..a60a03c393677 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tiny alternative Discord client"; license = lib.licenses.gpl3Only; mainProgram = "dorion"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.intersectLists (lib.platforms.linux) (lib.platforms.x86_64); sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index f4cab21b1b305..d23466447eccb 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -80,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: { speexdsp zlib-ng ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AudioUnit diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index a285b546d75bf..2871a5f52bd2c 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.8.0"; + version = "1.14.2"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; rev = "refs/tags/v${version}"; - hash = "sha256-j30ZEYO8OBMhEPn+LDipZ/aciWrI9QWStz6tHq0uX7E="; + hash = "sha256-SlZ18ToGbC+c5ffuYFGeOy30w90ukBO0qKxD+HNVt3E="; }; - npmDepsHash = "sha256-ZSnrV1C9NX/Wq7cjKlM1w/m6T7snfnPru5g0pqFTGis="; + npmDepsHash = "sha256-KaqSCtraMmQHe7Tcs/2CVaQcmazgHkV5K4T64lHEVP4="; dontNpmBuild = true; diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix index 402b94f044a3e..68d55ffba40d7 100644 --- a/pkgs/by-name/do/dotter/package.nix +++ b/pkgs/by-name/do/dotter/package.nix @@ -9,20 +9,22 @@ installShellFiles, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.13.2-unstable-2024-08-02"; + version = "0.13.3"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; - rev = "d5199df24e6db039c460fa37fe3279f89c3bfc63"; - hash = "sha256-8/drsrJq8mfrWvTCcNX0eoPHzywxQNuyRdxQE/zb8lA="; + rev = "v${version}"; + hash = "sha256-7YExvmuliTL9oagXNUtZ7ZOPyELcS+igK1tXdhG0kQk="; }; - cargoHash = "sha256-+LBmswq2mvM0hb6wwCQMxL+C/TdpRGZQGufgsqC1KSQ="; + cargoHash = "sha256-LEOORHD0j+HVl/fB9Q2xVZ2AxZKsPE5SeOS1ZsKwTSo="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; nativeCheckInputs = [ which diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index fa15709d3c0ae..766ce66b1dbc5 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.17"; + version = "1.1.18"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-TKlhPvfnq62XWTo2twKO8hEjBZW0mWkKruXWhwirtR4="; + hash = "sha256-1lmDmtvkLMLxvF6ZTOShr5fsYN++Jm6+ngzgFyNjFn4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/dovecot_exporter/package.nix b/pkgs/by-name/do/dovecot_exporter/package.nix index 88a5eb11c0249..2ef6fd97d8dbb 100644 --- a/pkgs/by-name/do/dovecot_exporter/package.nix +++ b/pkgs/by-name/do/dovecot_exporter/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "kumina"; repo = "dovecot_exporter"; rev = "7ef79118ba619ff078594837377189477a4d059f"; - sha256 = "sha256-qJbIBSfHYgFztuivuNjleDa+Bx0KC4OklCh3IvK2XFI="; + hash = "sha256-qJbIBSfHYgFztuivuNjleDa+Bx0KC4OklCh3IvK2XFI="; }; vendorHash = "sha256-+B8sROL1h6ElBfAUBT286yJF9m9zoRvMOrf0z2SVCj0="; @@ -22,7 +22,7 @@ buildGoModule rec { # https://github.com/kumina/dovecot_exporter/pull/23 (fetchpatch { url = "https://github.com/kumina/dovecot_exporter/commit/b5184dd99cf8c79facf20cea281828d302327665.patch"; - sha256 = "sha256-OcdI1fJ/wumDI/wk5PQVot9+Gw/PnsiwgJY7dcRyEsc="; + hash = "sha256-OcdI1fJ/wumDI/wk5PQVot9+Gw/PnsiwgJY7dcRyEsc="; }) ]; diff --git a/pkgs/by-name/dp/dpp/package.nix b/pkgs/by-name/dp/dpp/package.nix index 7e639cc021d0a..bd93b48262d4b 100644 --- a/pkgs/by-name/dp/dpp/package.nix +++ b/pkgs/by-name/dp/dpp/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dpp"; - version = "10.0.30"; + version = "10.0.31"; src = fetchFromGitHub { owner = "brainboxdotcc"; repo = "DPP"; rev = "v${finalAttrs.version}"; - hash = "sha256-FW1DKbVwPPlvLtv8XzpqaAZjS1y5hasq3Rhh2u08Sz0="; + hash = "sha256-IsgYGfPcqiJBQ1MM97jI7ksvc49ZcCn3i6/yMe8zLjY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ds/dssat/package.nix b/pkgs/by-name/ds/dssat/package.nix index 95653e2ebb7ce..4b40302c415da 100644 --- a/pkgs/by-name/ds/dssat/package.nix +++ b/pkgs/by-name/ds/dssat/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (final: { owner = "DSSAT"; repo = "dssat-csm-os"; rev = "refs/tags/v${final.version}"; - sha256 = "sha256-8OaTM7IXFZjlelx5O4O+bVNQj4dIhGzIk2iCfpqI8uA="; + hash = "sha256-8OaTM7IXFZjlelx5O4O+bVNQj4dIhGzIk2iCfpqI8uA="; }; # maintainers are on windows and have CRLF endings in their files @@ -51,7 +51,7 @@ stdenv.mkDerivation (final: { makeWrapper ]; - buildInputs = lib.optionals stdenv.isLinux [ glibc.static ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ glibc.static ]; cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/share/dssat/" ]; @@ -69,6 +69,6 @@ stdenv.mkDerivation (final: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ pcboy ]; platforms = lib.platforms.unix; - broken = stdenv.isAarch64 && stdenv.isLinux; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; }; }) diff --git a/pkgs/by-name/du/dub/package.nix b/pkgs/by-name/du/dub/package.nix index 1416b06fc13f7..c6782b49070eb 100644 --- a/pkgs/by-name/du/dub/package.nix +++ b/pkgs/by-name/du/dub/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postBuild ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/pkgs/by-name/du/dublin-traceroute/package.nix b/pkgs/by-name/du/dublin-traceroute/package.nix index 5e797cf97b57f..0ec5ac87ef61c 100644 --- a/pkgs/by-name/du/dublin-traceroute/package.nix +++ b/pkgs/by-name/du/dublin-traceroute/package.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ baloo ]; platforms = platforms.unix; mainProgram = "dublin-traceroute"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix index 453d272458e2a..4b96fc1707b20 100644 --- a/pkgs/by-name/du/duckstation/package.nix +++ b/pkgs/by-name/du/duckstation/package.nix @@ -76,6 +76,9 @@ stdenv.mkDerivation (finalAttrs: { substituteAllInPlace src/scmversion/gen_scmversion.sh ''; + # error: cannot convert 'int16x8_t' to '__Int32x4_t' + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-flax-vector-conversions"; + installCheckPhase = '' runHook preCheck diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index dd1c3fcf76f44..357559de846c9 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "dumbpipe"; - version = "0.13.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-n/gmkOtCO07paWLKHSNtoTRCgdynMi5cG6johjsuDbU="; + hash = "sha256-FVS0+2BuM2/X+SEBk9DngzlFlpSL16vzn4oEsjelM6c="; }; - cargoHash = "sha256-YfieNhhqvW8nU6GZFgWa0oBuCfUSr2AhxpFOFusIYCY="; + cargoHash = "sha256-o+nUTqIPycUxz2VXwse7QN7q3j1Stjck1VUf6rHgS64="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ SystemConfiguration ] diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix index 0676e970a81fe..59ca3d3344a01 100644 --- a/pkgs/by-name/du/dummyhttp/package.nix +++ b/pkgs/by-name/du/dummyhttp/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-bw0VlPHjNZkpLVJZrB3aaQGkwvQpkJGIn+hi0yn2M4s="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/du/dune3d/package.nix b/pkgs/by-name/du/dune3d/package.nix index 122a9691c53bc..b1e1863581b8b 100644 --- a/pkgs/by-name/du/dune3d/package.nix +++ b/pkgs/by-name/du/dune3d/package.nix @@ -24,7 +24,7 @@ }: let - stdenv' = if stdenv.isDarwin then llvmPackages_17.stdenv else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv; opencascade-occt = opencascade-occt_7_6; in stdenv'.mkDerivation (finalAttrs: { @@ -45,7 +45,7 @@ stdenv'.mkDerivation (finalAttrs: { pkg-config wrapGAppsHook3 libxml2 # for xmllints - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ cmake @@ -55,7 +55,7 @@ stdenv'.mkDerivation (finalAttrs: { libepoxy librsvg libspnav - (if stdenv.isLinux then libuuid else libossp_uuid) + (if stdenv.hostPlatform.isLinux then libuuid else libossp_uuid) opencascade-occt (python3.withPackages (pp: [ pp.pygobject3 diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix index f01f65c862831..c5dc4b04eac7c 100644 --- a/pkgs/by-name/du/dunst/package.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -23,7 +23,6 @@ , xorgproto , librsvg , testers -, dunst , withX11 ? true , withWayland ? true }: @@ -89,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "jq" "${lib.getExe jq}" ''; - passthru.tests.version = testers.testVersion { package = dunst; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { description = "Lightweight and customizable notification daemon"; diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix new file mode 100644 index 0000000000000..d818b7c5b537f --- /dev/null +++ b/pkgs/by-name/du/duplicati/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchzip, + mono, + sqlite, + makeWrapper, +}: + +stdenv.mkDerivation rec { + pname = "duplicati"; + version = "2.0.8.1"; + channel = "beta"; + build_date = "2024-05-07"; + + src = fetchzip { + url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; + hash = "sha256-LmW6yGutxP33ghFqyOLKrGDNCQdr8DDFn/IHigsLpzA="; + stripRoot = false; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version} + makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \ + --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + sqlite + ] + } + makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \ + --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + sqlite + ] + } + ''; + + meta = with lib; { + description = "Free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers"; + homepage = "https://www.duplicati.com/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ nyanloutre bot-wxt1221 ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index cf13173519ac1..53b0955748982 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; doCheck = false; diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/by-name/dv/dvdstyler/package.nix similarity index 100% rename from pkgs/applications/video/dvdstyler/default.nix rename to pkgs/by-name/dv/dvdstyler/package.nix diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix index 24bf5a7ca242f..a819f904e7fb9 100644 --- a/pkgs/by-name/dw/dwl/package.nix +++ b/pkgs/by-name/dw/dwl/package.nix @@ -112,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://codeberg.org/dwl/dwl"; + changelog = "https://codeberg.org/dwl/dwl/src/branch/${finalAttrs.version}/CHANGELOG.md"; description = "Dynamic window manager for Wayland"; longDescription = '' dwl is a compact, hackable compositor for Wayland based on wlroots. It is diff --git a/pkgs/by-name/dw/dwlb/package.nix b/pkgs/by-name/dw/dwlb/package.nix new file mode 100644 index 0000000000000..c01e1f5dad410 --- /dev/null +++ b/pkgs/by-name/dw/dwlb/package.nix @@ -0,0 +1,51 @@ +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + wayland-scanner, + wayland-protocols, + unstableGitUpdater, + pixman, + fcft, + wayland, +}: + +stdenv.mkDerivation { + pname = "dwlb"; + version = "0-unstable-2024-05-16"; + + src = fetchFromGitHub { + owner = "kolunmi"; + repo = "dwlb"; + rev = "0daa1c1fdd82c4d790e477bf171e23ca2fdfa0cb"; + hash = "sha256-Bu20IqRwBP1WRBgbcEQU4Q2BZ2FBnVaySOTsCn0iSSE="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + env = { + PREFIX = placeholder "out"; + }; + + buildInputs = [ + wayland-scanner + wayland-protocols + pixman + fcft + wayland + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Fast, feature-complete bar for dwl"; + homepage = "https://github.com/kolunmi/dwlb"; + license = lib.licenses.gpl3Plus; + mainProgram = "dwlb"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = wayland.meta.platforms; + }; +} diff --git a/pkgs/development/compilers/xa/dxa.nix b/pkgs/by-name/dx/dxa/package.nix similarity index 100% rename from pkgs/development/compilers/xa/dxa.nix rename to pkgs/by-name/dx/dxa/package.nix diff --git a/pkgs/by-name/dx/dxvk/package.nix b/pkgs/by-name/dx/dxvk/package.nix index 9a82a2a20b578..144bfe33609b5 100644 --- a/pkgs/by-name/dx/dxvk/package.nix +++ b/pkgs/by-name/dx/dxvk/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation ( mingwW64Stdenv = useWin32ThreadModel pkgsCross.mingwW64.stdenv; dxvk32 = - if stdenvNoCC.isDarwin then + if stdenvNoCC.hostPlatform.isDarwin then pkgsCross.mingw32.dxvk_1.override { stdenv = mingw32Stdenv; enableMoltenVKCompat = true; @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation ( pkgsCross.mingw32.dxvk_2.override { stdenv = mingw32Stdenv; }; dxvk64 = - if stdenvNoCC.isDarwin then + if stdenvNoCC.hostPlatform.isDarwin then pkgsCross.mingwW64.dxvk_1.override { stdenv = mingwW64Stdenv; enableMoltenVKCompat = true; diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 2655e5b95c7c2..1833320dd13ef 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -51,14 +51,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dyalog"; - version = "19.0.49960"; + version = "19.0.50027"; shortVersion = lib.versions.majorMinor finalAttrs.version; src = assert !acceptLicense -> throw licenseDisclaimer; fetchurl { url = "https://download.dyalog.com/download.php?file=${finalAttrs.shortVersion}/linux_64_${finalAttrs.version}_unicode.x86_64.deb"; - hash = "sha256-WeIrwF6msiQGS6ltYWn6TN+v+aXK1cbJ1e11B6f0+2A="; + hash = "sha256-3uB102Hr0dmqAZj2ezLhsAdBotY24PWJfE7g5wSmKMA="; }; outputs = [ "out" ] ++ lib.optional enableDocs "doc"; diff --git a/pkgs/by-name/dy/dynamips/package.nix b/pkgs/by-name/dy/dynamips/package.nix new file mode 100644 index 0000000000000..77f662acb6e11 --- /dev/null +++ b/pkgs/by-name/dy/dynamips/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + libelf, + libpcap, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "dynamips"; + version = "0.2.23"; + + src = fetchFromGitHub { + owner = "GNS3"; + repo = "dynamips"; + rev = "refs/tags/v${version}"; + hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libelf + libpcap + ]; + + cmakeFlags = [ + (lib.cmakeFeature "DYNAMIPS_CODE" "stable") + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Cisco router emulator"; + longDescription = '' + Dynamips is an emulator computer program that was written to emulate Cisco + routers. + ''; + homepage = "https://github.com/GNS3/dynamips"; + changelog = "https://github.com/GNS3/dynamips/releases/tag/v${version}"; + license = licenses.gpl2Plus; + mainProgram = "dynamips"; + maintainers = with maintainers; [ + primeos + anthonyroussel + ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/by-name/dy/dynisland/package.nix b/pkgs/by-name/dy/dynisland/package.nix new file mode 100644 index 0000000000000..9c78c061352a3 --- /dev/null +++ b/pkgs/by-name/dy/dynisland/package.nix @@ -0,0 +1,63 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + dbus, + openssl, + gtk4, + gtk4-layer-shell, + glib, + pkg-config, + wrapGAppsHook4, + installShellFiles, +}: + +rustPlatform.buildRustPackage rec { + pname = "dynisland"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "cr3eperall"; + repo = "dynisland"; + rev = "refs/tags/${version}"; + hash = "sha256-HqwykR6BXxtYSxNUYdegmjCwSVTW29pqP7qLWbcqLeg="; + fetchSubmodules = true; + }; + + cargoHash = "sha256-p67h67fRNcfiQyhCUY5Y11xTTqQbl0Ngx1EhYfaSJmw="; + + buildFeatures = [ "completions" ]; + + buildInputs = [ + dbus + openssl + gtk4 + gtk4-layer-shell + ]; + + nativeBuildInputs = [ + glib + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + pkg-config + wrapGAppsHook4 + installShellFiles + ]; + + postInstall = '' + installShellCompletion --cmd dynisland \ + --bash ./target/dynisland.bash \ + --fish ./target/dynisland.fish \ + --zsh ./target/_dynisland + ''; + + meta = { + description = "Dynamic and extensible GTK4 layer-shell, written in Rust"; + homepage = "https://github.com/cr3eperall/dynisland"; + changelog = "https://github.com/cr3eperall/dynisland/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ryand56 ]; + mainProgram = "dynisland"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix index d6759b57deeaf..edab9766f4a0c 100644 --- a/pkgs/by-name/e1/e1s/package.nix +++ b/pkgs/by-name/e1/e1s/package.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let pname = "e1s"; - version = "1.0.38"; + version = "1.0.39"; in buildGoModule { inherit pname version; @@ -10,10 +10,10 @@ buildGoModule { owner = "keidarcy"; repo = "e1s"; rev = "refs/tags/v${version}"; - hash = "sha256-OFnriW+rerVTyonuXe9qilR78Qok6QUYQvTDbsTi5L0="; + hash = "sha256-kfG9Nkt5L2YokTLPzPuIAmjCHlZvr3FqZiYLr8bU+K4="; }; - vendorHash = "sha256-oQVZ1SNXaXOngZazUVeWLvtZu17XvtIcrx+XC6PvGH0="; + vendorHash = "sha256-u6h/sqI0Rqs3ZmVXtMNVuL3h9Cj15+mM+QnIaylzlHI="; meta = with lib; { description = "Easily Manage AWS ECS Resources in Terminal 🐱"; diff --git a/pkgs/by-name/ea/eask-cli/package.nix b/pkgs/by-name/ea/eask-cli/package.nix new file mode 100644 index 0000000000000..745830c0d5a92 --- /dev/null +++ b/pkgs/by-name/ea/eask-cli/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage rec { + pname = "eask-cli"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "emacs-eask"; + repo = "cli"; + rev = version; + hash = "sha256-bTig1g9G/2NYlvlo6TBMIQjmCqaC8AOwvTiPDbLv//Q="; + }; + + npmDepsHash = "sha256-JEk+dbLndXn8Bfz9HZWzY9Blk2ZyEf5AH6M4+X1uwaM="; + + dontBuild = true; + + meta = { + changelog = "https://github.com/emacs-eask/cli/blob/${src.rev}/CHANGELOG.md"; + description = "CLI for building, runing, testing, and managing your Emacs Lisp dependencies"; + homepage = "https://emacs-eask.github.io/"; + license = lib.licenses.gpl3Plus; + mainProgram = "eask"; + maintainers = with lib.maintainers; [ + jcs090218 + piotrkwiecinski + ]; + }; +} diff --git a/pkgs/by-name/ea/eask/package.nix b/pkgs/by-name/ea/eask/package.nix deleted file mode 100644 index 3f7fb419795b5..0000000000000 --- a/pkgs/by-name/ea/eask/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildNpmPackage, - fetchFromGitHub, -}: - -buildNpmPackage rec { - pname = "eask"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "emacs-eask"; - repo = "cli"; - rev = version; - hash = "sha256-bTig1g9G/2NYlvlo6TBMIQjmCqaC8AOwvTiPDbLv//Q="; - }; - - npmDepsHash = "sha256-JEk+dbLndXn8Bfz9HZWzY9Blk2ZyEf5AH6M4+X1uwaM="; - - dontBuild = true; - - meta = { - changelog = "https://github.com/emacs-eask/cli/blob/${src.rev}/CHANGELOG.md"; - description = "CLI for building, runing, testing, and managing your Emacs Lisp dependencies"; - homepage = "https://emacs-eask.github.io/"; - license = lib.licenses.gpl3Plus; - mainProgram = "eask"; - maintainers = with lib.maintainers; [ - jcs090218 - piotrkwiecinski - ]; - }; -} diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 21d897bc2fdea..5c371efca5d3d 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.1.8"; + version = "7.1.9"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "refs/tags/v${version}"; - hash = "sha256-eDjtmr100WOCd0k0p3rUEtu6O9LlSGs43oaIXT07ikI="; + hash = "sha256-It+kldlhThWF9y/rTgKt9QlIouH1cQcCtSHQTsaGjfo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix new file mode 100644 index 0000000000000..68f63261c8a61 --- /dev/null +++ b/pkgs/by-name/ea/easytier/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + protobuf, + nix-update-script, + darwin, + withQuic ? false, # with QUIC protocol support +}: + +rustPlatform.buildRustPackage rec { + pname = "easytier"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "EasyTier"; + repo = "EasyTier"; + rev = "refs/tags/v${version}"; + hash = "sha256-Qej6g9oxY6Wvv7jbyK9TN7QE7sfrdref7XPj10mSKUg="; + }; + + cargoHash = "sha256-UegTL9ZdqLQYtcg8sJSGkie3ezt9OFMX0iVm/B1D91I="; + + nativeBuildInputs = [ protobuf ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + buildNoDefaultFeatures = stdenv.hostPlatform.isMips; + buildFeatures = lib.optional stdenv.hostPlatform.isMips "mips" ++ lib.optional withQuic "quic"; + + doCheck = false; # tests failed due to heavy rely on network + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/EasyTier/EasyTier"; + changelog = "https://github.com/EasyTier/EasyTier/releases/tag/v${version}"; + description = "Simple, decentralized mesh VPN with WireGuard support"; + longDescription = '' + EasyTier is a simple, safe and decentralized VPN networking solution implemented + with the Rust language and Tokio framework. + ''; + mainProgram = "easytier-core"; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix ++ windows; + maintainers = with lib.maintainers; [ ltrump ]; + }; +} diff --git a/pkgs/by-name/eb/ebtks/package.nix b/pkgs/by-name/eb/ebtks/package.nix index b2ffa4bdc20f8..664882305a0ab 100644 --- a/pkgs/by-name/eb/ebtks/package.nix +++ b/pkgs/by-name/eb/ebtks/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "BIC-MNI"; repo = "EBTKS"; rev = "67e4e197d8a32d6462c9bdc7af44d64ebde4fb5c"; - sha256 = "1a1qw6i47fs1izx60l1ysabpmyx9j5sjnbdv8b47wi2xcc9i3hpq"; + hash = "sha256-+MIRE2NdRH7IQrstK3WRqft6l9I+UGD6j0G7Q6LhOKg="; }; # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix new file mode 100644 index 0000000000000..6d97c3fa60ee6 --- /dev/null +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -0,0 +1,118 @@ +{ + buildGoModule, + fetchFromGitHub, + stdenv, + bpftools, + lib, + nspr, + libpcap, + clang, + fd, + go-bindata, + glibc, + gnutls, + bashInteractive, + postgresql, + mariadb, + openssl, + bash, +}: + +buildGoModule rec { + pname = "ecapture"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "gojue"; + repo = "ecapture"; + rev = "refs/tags/v${version}"; + hash = "sha256-xnUgsnz3zUkuLwqgdogEWQh0GMEmS/qmDqqmEQlHhfQ="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + clang + fd + bpftools + go-bindata + ]; + + newlibpcap = libpcap.overrideAttrs (previousAttrs: { + configureFlags = previousAttrs.configureFlags ++ [ "--without-libnl" ]; + }); + + buildInputs = [ + newlibpcap + glibc.static + glibc + ]; + + CGO_LDFLAGS = "-lpcap -lpthread -static"; + + ldflags = [ + "-extldflags '-static'" + "-linkmode=external" + ]; + + hardeningDisable = [ + "zerocallusedregs" + ]; + + patchPhase = '' + runHook prePatch + + substituteInPlace user/config/config_gnutls_linux.go \ + --replace-fail 'return errors.New("cant found Gnutls so load path")' 'gc.Gnutls = "${lib.getLib gnutls}/lib/libgnutls.so.30"' \ + --replace-fail '"errors"' ' ' + + substituteInPlace user/module/probe_bash.go \ + --replace-fail '/bin/bash' '${lib.getExe bashInteractive}' + + substituteInPlace user/config/config_bash.go \ + --replace-fail '/bin/bash' '${lib.getExe bashInteractive}' + + substituteInPlace user/config/config_nspr_linux.go \ + --replace-fail '/usr/lib/firefox/libnspr4.so' '${lib.getLib nspr}/lib/libnspr4.so' + + substituteInPlace cli/cmd/postgres.go \ + --replace-fail '/usr/bin/postgres' '${postgresql}/bin/postgres' + + substituteInPlace cli/cmd/mysqld.go \ + --replace-fail '/usr/sbin/mariadbd' '${mariadb}/bin/mariadbd' + + substituteInPlace user/module/probe_mysqld.go \ + --replace-fail '/usr/sbin/mariadbd' '${mariadb}/bin/mariadbd' + + substituteInPlace user/config/config_openssl_linux.go \ + --replace-fail 'return errors.New("cant found openssl so load path")' 'oc.Openssl = "${lib.getLib openssl}/lib/libssl.so.3"' \ + --replace-fail '"errors"' ' ' + + runHook postPatch + ''; + + postConfigure = '' + sed -i '/git/d' Makefile + sed -i '/git/d' variables.mk + + substituteInPlace Makefile \ + --replace-fail '/bin/bash' '${lib.getExe bash}' + + make ebpf + go-bindata -pkg assets -o "assets/ebpf_probe.go" $(find user/bytecode -name "*.o" -printf "./%p ") + ''; + + vendorHash = "sha256-j5AXZqup0nPUlGWvb4PCLKJFoQx/c4I3PxZB99TTTWA="; + + meta = { + description = "Capture SSL/TLS text content without CA certificate Using eBPF"; + changelog = "https://github.com/gojue/ecapture/releases/tag/v${version}"; + homepage = "https://ecapture.cc"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + mainProgram = "ecapture"; + }; +} diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/by-name/ed/edit/package.nix similarity index 100% rename from pkgs/applications/editors/edit/default.nix rename to pkgs/by-name/ed/edit/package.nix diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index b6946ea119495..b4919f27efb09 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -13,20 +13,22 @@ let pythonEnv = buildPackages.python3.withPackages (ps: [ps.tkinter]); -targetArch = if stdenv.isi686 then +targetArch = if stdenv.hostPlatform.isi686 then "IA32" -else if stdenv.isx86_64 then +else if stdenv.hostPlatform.isx86_64 then "X64" -else if stdenv.isAarch32 then +else if stdenv.hostPlatform.isAarch32 then "ARM" -else if stdenv.isAarch64 then +else if stdenv.hostPlatform.isAarch64 then "AARCH64" else if stdenv.hostPlatform.isRiscV64 then "RISCV64" +else if stdenv.hostPlatform.isLoongArch64 then + "LOONGARCH64" else throw "Unsupported architecture"; -buildType = if stdenv.isDarwin then +buildType = if stdenv.hostPlatform.isDarwin then "CLANGPDB" else "GCC5"; @@ -106,7 +108,7 @@ edk2 = stdenv.mkDerivation { env.NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" - + lib.optionalString (stdenv.isDarwin) " -Wno-error=macro-redefined"; + + lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined"; hardeningDisable = [ "format" "fortify" ]; @@ -128,7 +130,7 @@ edk2 = stdenv.mkDerivation { homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/"; changelog = "https://github.com/tianocore/edk2/releases/tag/edk2-stable${edk2.version}"; license = lib.licenses.bsd2; - platforms = with lib.platforms; aarch64 ++ arm ++ i686 ++ x86_64 ++ riscv64; + platforms = with lib.platforms; aarch64 ++ arm ++ i686 ++ x86_64 ++ loongarch64 ++ riscv64; maintainers = [ lib.maintainers.mjoerg ]; }; diff --git a/pkgs/applications/editors/edlin/default.nix b/pkgs/by-name/ed/edlin/package.nix similarity index 100% rename from pkgs/applications/editors/edlin/default.nix rename to pkgs/by-name/ed/edlin/package.nix diff --git a/pkgs/by-name/ef/efibootmgr/package.nix b/pkgs/by-name/ef/efibootmgr/package.nix index c81f5123c67a8..f53ea4a6abf5b 100644 --- a/pkgs/by-name/ef/efibootmgr/package.nix +++ b/pkgs/by-name/ef/efibootmgr/package.nix @@ -2,19 +2,26 @@ lib, stdenv, fetchFromGitHub, - pkg-config, efivar, + nix-update-script, + pkg-config, popt, + testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "efibootmgr"; version = "18"; + outputs = [ + "out" + "man" + ]; + src = fetchFromGitHub { owner = "rhboot"; repo = "efibootmgr"; - rev = version; + rev = finalAttrs.version; hash = "sha256-DYYQGALEn2+mRHgqCJsA7OQCF7xirIgQlWexZ9uoKcg="; }; @@ -32,12 +39,18 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=${placeholder "out"}" ]; + passthru = { + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + updateScript = nix-update-script { }; + }; + meta = { description = "Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager"; homepage = "https://github.com/rhboot/efibootmgr"; - changelog = "https://github.com/rhboot/efibootmgr/releases/tag/${src.rev}"; + changelog = "https://github.com/rhboot/efibootmgr/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "efibootmgr"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/eflite/format.patch b/pkgs/by-name/ef/eflite/format.patch similarity index 100% rename from pkgs/applications/audio/eflite/format.patch rename to pkgs/by-name/ef/eflite/format.patch diff --git a/pkgs/by-name/ef/eflite/package.nix b/pkgs/by-name/ef/eflite/package.nix new file mode 100644 index 0000000000000..a6aa478947e84 --- /dev/null +++ b/pkgs/by-name/ef/eflite/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchurl, + fetchpatch, + flite, + alsa-lib, + debug ? false, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "eflite"; + version = "0.4.1"; + + src = fetchurl { + url = "mirror://sourceforge/eflite/eflite/${finalAttrs.version}/eflite-${finalAttrs.version}.tar.gz"; + hash = "sha256-ka2FhV5Vo/w7l6GlJdtf0dIR1UNCu/yI0QJoExBPFyE="; + }; + + buildInputs = [ + flite + alsa-lib + ]; + + configureFlags = [ + "flite_dir=${flite.dev}" + "--with-audio=alsa" + "--with-vox=cmu_us_kal16" + ]; + + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/cvs-update"; + sha256 = "0r631vzmky7b7qyhm152557y4fr0xqrpi3y4w66fcn6p4rj03j05"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/buf-overflow"; + sha256 = "071qk133kb7n7bq6kxgh3p9bba6hcl1ixsn4lx8vp8klijgrvkmx"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/link"; + sha256 = "0p833dp4pdsya72bwh3syvkq85927pm6snxvx13lvcppisbhj0fc"; + }) + ./format.patch + ]; + + CFLAGS = lib.optionalString debug " -DDEBUG=2"; + + meta = { + homepage = "https://eflite.sourceforge.net"; + description = "Speech server for screen readers"; + longDescription = '' + EFlite is a speech server for Emacspeak and other screen + readers that allows them to interface with Festival Lite, + a free text-to-speech engine developed at the CMU Speech + Center as an off-shoot of Festival. + ''; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + mainProgram = "eflite"; + }; +}) diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix index e7553cf4ad724..7f7a2e1bada31 100644 --- a/pkgs/by-name/ei/eigenlayer/package.nix +++ b/pkgs/by-name/ei/eigenlayer/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "eigenlayer"; - version = "0.10.3"; + version = "0.10.6"; src = fetchFromGitHub { owner = "Layr-Labs"; repo = "eigenlayer-cli"; rev = "v${version}"; - hash = "sha256-5xskx/Bd8h344EH/up0jofcUNS9lZxgboySIO2i2vr8="; + hash = "sha256-FvmS9rWmf6bzY5QjVS3otylHYPyQ7KqXVJ0m28/zEi8="; }; - vendorHash = "sha256-mvV/AsSSRsCf7TrKLZgo+AHEWXCnPUEsnLOvt73eFf4="; + vendorHash = "sha256-7KC99PqAPfGnm7yA4nfAlC7V4NhCEYDyPxY7CdOdwno="; ldflags = ["-s" "-w"]; subPackages = ["cmd/eigenlayer"]; diff --git a/pkgs/by-name/ei/eigenrand/package.nix b/pkgs/by-name/ei/eigenrand/package.nix new file mode 100644 index 0000000000000..d3014ff9d75f4 --- /dev/null +++ b/pkgs/by-name/ei/eigenrand/package.nix @@ -0,0 +1,48 @@ +{ + cmake, + eigen, + fetchFromGitHub, + gtest, + lib, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "eigenrand"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "bab2min"; + repo = "EigenRand"; + rev = "v${finalAttrs.version}"; + hash = "sha256-mrpkWIb6kfLvppmIfzhjF1/3m1zSd8XG1D07V6Zjlu0="; + }; + + # Avoid downloading googletest: we already have it. + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "FetchContent_MakeAvailable(googletest)" \ + "add_subdirectory(${gtest.src} googletest SYSTEM)" + ''; + + postInstall = '' + # Remove installed tests and googletest stuff + rm -rf $out/bin $out/include/gmock $out/include/gtest $out/lib + ''; + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ eigen ]; + checkInputs = [ gtest ]; + + doCheck = true; + + cmakeFlags = [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;EigenRand-test" ]; + + meta = { + description = "Fastest Random Distribution Generator for Eigen"; + homepage = "https://github.com/bab2min/EigenRand"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ei/eintopf/frontend.nix b/pkgs/by-name/ei/eintopf/frontend.nix index 80cb19001f5b1..c87c850eeb066 100644 --- a/pkgs/by-name/ei/eintopf/frontend.nix +++ b/pkgs/by-name/ei/eintopf/frontend.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/backstage/yarn.lock"; - hash = "sha256-Z/Pkk/qCWwr99g11DjEgnisPfxOhfD8+OCn6otxJtfI="; + hash = "sha256-7Br2FBhLZf7Cuul5n55EHfqyW8GbujB+yZ/RK6f7I4M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ei/eintopf/package.nix b/pkgs/by-name/ei/eintopf/package.nix index 7a2a08c453f00..fddd943b7af6a 100644 --- a/pkgs/by-name/ei/eintopf/package.nix +++ b/pkgs/by-name/ei/eintopf/package.nix @@ -6,13 +6,13 @@ }: let - version = "0.13.16"; + version = "0.14.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Klasse-Methode"; repo = "eintopf"; rev = "v${version}"; - hash = "sha256-ex5bpO60ousJcgZGdviqWrCyihycW+JT+EYFvdooUDw="; + hash = "sha256-+QEAUyAqFLcc3bhGI3v4FxhDt+3P6vBnxWsFPp56lfg="; }; frontend = callPackage ./frontend.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { pname = "eintopf"; inherit version src; - vendorHash = "sha256-dBxI6cUGc16lg89x8b+hSLcv5y/MLf6vDIvqdMBUz3I="; + vendorHash = "sha256-ODVCZWxkPWW8ZlONiVXwVQalsLIUl9x512JimLAUm6U="; ldflags = [ "-s" @@ -47,9 +47,7 @@ buildGoModule rec { meta = with lib; { description = "A calendar for Stuttgart, showing events, groups and places"; homepage = "https://codeberg.org/Klasse-Methode/eintopf"; - # License is going to change back to AGPL in the next release - # https://codeberg.org/Klasse-Methode/eintopf/issues/351#issuecomment-2076870 - license = licenses.gpl3Plus; + license = licenses.agpl3Only; maintainers = with maintainers; [ onny ]; platforms = platforms.unix; }; diff --git a/pkgs/by-name/ei/eiquadprog/package.nix b/pkgs/by-name/ei/eiquadprog/package.nix new file mode 100644 index 0000000000000..70242a2aa9a04 --- /dev/null +++ b/pkgs/by-name/ei/eiquadprog/package.nix @@ -0,0 +1,48 @@ +{ + boost, + cmake, + doxygen, + eigen, + fetchFromGitHub, + jrl-cmakemodules, + lib, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "eiquadprog"; + version = "1.2.9"; + + src = fetchFromGitHub { + owner = "stack-of-tasks"; + repo = "eiquadprog"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VqRx06sCCZrnB+NWm6Z9OMKzjKQIydGgKQU6fMY7phk="; + }; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + cmake + doxygen + pkg-config + jrl-cmakemodules + ]; + propagatedBuildInputs = [ eigen ]; + checkInputs = [ boost ]; + + doCheck = true; + + meta = { + description = "C++ reimplementation of eiquadprog"; + homepage = "https://github.com/stack-of-tasks/eiquadprog"; + changelog = "https://github.com/stack-of-tasks/eiquadprog/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ej/ejs/package.nix b/pkgs/by-name/ej/ejs/package.nix new file mode 100644 index 0000000000000..90934f9002ecc --- /dev/null +++ b/pkgs/by-name/ej/ejs/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: +let + version = "3.1.10"; +in +buildNpmPackage { + pname = "ejs"; + inherit version; + + src = fetchFromGitHub { + owner = "mde"; + repo = "ejs"; + rev = "v${version}"; + hash = "sha256-3Rq+7oiYJlIY7sGPasx728sz2zj0ndAvKpHGsQX4tlc="; + }; + + npmDepsHash = "sha256-829eWfJiMw9KRlhdmzD0ha//bgUQ5nPEzO+ayUPLxXY="; + + buildPhase = '' + runHook preBuild + + ./node_modules/.bin/jake build + + runHook postBuild + ''; + + meta = { + description = "Embedded JavaScript templates"; + homepage = "http://ejs.co"; + license = lib.licenses.asl20; + mainProgram = "ejs"; + maintainers = with lib.maintainers; [ momeemt ]; + }; +} diff --git a/pkgs/by-name/ek/ekho/package.nix b/pkgs/by-name/ek/ekho/package.nix new file mode 100644 index 0000000000000..818c113ba0c27 --- /dev/null +++ b/pkgs/by-name/ek/ekho/package.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoconf +, automake +, libtool +, libsndfile +, libpulseaudio +, espeak-ng +, sonic +, utf8cpp +, darwin +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ekho"; + version = "9.0"; + + src = fetchFromGitHub { + owner = "hgneng"; + repo = "ekho"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VYN9tR3BJXd3UA0V5vqQJNItJe1e1knZ+S7tLeaeYYk="; + }; + + preConfigure = '' + ./autogen.sh + ''; + + CXXFLAGS = [ + "-O0" + "-I${lib.getDev utf8cpp}/include/utf8cpp" + ]; + + nativeBuildInputs = [ pkg-config autoconf automake libtool ]; + + buildInputs = [ libsndfile libpulseaudio espeak-ng sonic utf8cpp ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; + + meta = with lib; { + description = "Chinese text-to-speech software"; + homepage = "http://www.eguidedog.net/ekho.php"; + longDescription = '' + Ekho (余音) is a free, open source and multilingual text-to-speech (TTS) + software. It supports Cantonese (Chinese dialect spoken in Hong Kong and + part of Guangdong province), Mandarin (standard Chinese), Zhaoan Hakka + (a dialect in Taiwan), Tibetan, Ngangien (an ancient Chinese before + Yuan Dynasty) and Korean (in trial). + ''; + license = licenses.gpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "ekho"; + }; +}) diff --git a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/pkgs/by-name/ek/eks-node-viewer/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/eks-node-viewer/default.nix rename to pkgs/by-name/ek/eks-node-viewer/package.nix diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 58ce467b20304..4122de8675c41 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.189.0"; + version = "0.191.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-YG1p7T2K1b3LO2MiTkCC88ZpgCpVTSCBUoCEcJK+V7I="; + hash = "sha256-ypHBvaCvQ1FZiQmKTkQ5h024pLBOpISZooSkIDa1OeQ="; }; - vendorHash = "sha256-W7tAdImEsPWSQkK8FnXgx5ADZ2JOdVc2xNBkNM11FOw="; + vendorHash = "sha256-mdGkdiYjcmsmYnM6fbyUeTC4Zb/Q1+geZrqJELv5i+4="; doCheck = false; diff --git a/pkgs/by-name/el/elektroid/package.nix b/pkgs/by-name/el/elektroid/package.nix index 0500cacd2b14c..75b6c83295f58 100644 --- a/pkgs/by-name/el/elektroid/package.nix +++ b/pkgs/by-name/el/elektroid/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { owner = "dagargo"; repo = "elektroid"; rev = version; - sha256 = "sha256-Qv4jvk6N0IMgYGCPWNYGDZJKGA+UPzhHeYfSrkq5hy4="; + hash = "sha256-Qv4jvk6N0IMgYGCPWNYGDZJKGA+UPzhHeYfSrkq5hy4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/element-call/name.patch b/pkgs/by-name/el/element-call/name.patch deleted file mode 100644 index fa6ab068d18ca..0000000000000 --- a/pkgs/by-name/el/element-call/name.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/package.json b/package.json -index e25221f2..5268d11a 100644 ---- a/package.json -+++ b/package.json -@@ -1,4 +1,5 @@ - { -+ "name": "element-call", - "version": "0.0.0", - "type": "module", - "scripts": { \ No newline at end of file diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index 8f9e27b3a9b3d..784df21863385 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -4,34 +4,31 @@ , fetchYarnDeps , yarnConfigHook , yarnBuildHook +, yarnInstallHook , nodejs -, npmHooks -, olm }: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; offlineCacheHash = { - x86_64-linux = "sha256-mZCnvX6hzkdi/zjPiefcmbyC2kGemjS4w7WTVkyq8W0="; - aarch64-linux = "sha256-mZCnvX6hzkdi/zjPiefcmbyC2kGemjS4w7WTVkyq8W0="; - x86_64-darwin = "sha256-G4doEnZORJqcl3bWaKZPuQmBeXNXud06nLO12Afr9kM="; - aarch64-darwin = "sha256-G4doEnZORJqcl3bWaKZPuQmBeXNXud06nLO12Afr9kM="; + x86_64-linux = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU="; + aarch64-linux = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU="; + x86_64-darwin = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU="; + aarch64-darwin = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU="; }.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "element-call"; - version = "0.5.16"; + version = "0.6.3"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-call"; rev = "v${finalAttrs.version}"; - hash = "sha256-GTHM27i716RZk+kDELMg/lYy355/SZoQLXGPQ90M4xg="; + hash = "sha256-PyxqUhnlWfcACsoFYrppO7g5e74jI4/xxXBi6oWyWsg="; }; - patches = [ ./name.patch ]; - offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; hash = offlineCacheHash; @@ -40,12 +37,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarnConfigHook yarnBuildHook + yarnInstallHook nodejs - npmHooks.npmInstallHook ]; - # From some reason causes the build to fail due to dependencies not available - # offline - dontNpmPrune = true; meta = with lib; { homepage = "https://github.com/element-hq/element-call"; @@ -53,6 +47,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; maintainers = with maintainers; [ kilimnik ]; mainProgram = "element-call"; - inherit (olm.meta) knownVulnerabilities; }; }) diff --git a/pkgs/by-name/el/elf2nucleus/package.nix b/pkgs/by-name/el/elf2nucleus/package.nix index 1e755c6293389..de0b88e988060 100644 --- a/pkgs/by-name/el/elf2nucleus/package.nix +++ b/pkgs/by-name/el/elf2nucleus/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FAIOtGfGow+0DrPPEBEfvaiinNZLQlGWKJ4DkMj63OA="; + hash = "sha256-FAIOtGfGow+0DrPPEBEfvaiinNZLQlGWKJ4DkMj63OA="; }; cargoHash = "sha256-IeQnI6WTzxSI/VzoHtVukZtB1jX98wzLOT01NMLD5wQ="; diff --git a/pkgs/by-name/el/elvis/package.nix b/pkgs/by-name/el/elvis/package.nix new file mode 100644 index 0000000000000..337794ac642f2 --- /dev/null +++ b/pkgs/by-name/el/elvis/package.nix @@ -0,0 +1,75 @@ +{ + lib, + fetchurl, + fetchpatch, + installShellFiles, + ncurses, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "elvis"; + version = "2.2_0"; + + src = fetchurl { + urls = [ + "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${finalAttrs.version}.tar.gz" + "http://www.the-little-red-haired-girl.org/pub/elvis/old/elvis-${finalAttrs.version}.tar.gz" + ]; + hash = "sha256-moRmsik3mEQQVrwnlzavOmFrqrovEZQDlsxg/3GSTqA="; + }; + + patches = [ + (fetchpatch { + name = "0000-resolve-stdio-getline-naming-conflict.patch"; + url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; + hash = "sha256-DCo2caiyE8zV5ss3O1AXy7oNlJ5AzFxdTeBx2Wtg83s="; + }) + ]; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ ncurses ]; + + configureFlags = [ "--ioctl=termios" ]; + + strictDeps = false; + + postPatch = '' + substituteInPlace configure \ + --replace-fail '-lcurses' '-lncurses' + ''; + + installPhase = '' + runHook preInstall + + installBin elvis ref elvtags elvfmt + + pushd doc + for page in *.man; do + installManPage $page + rm $page + done + popd + + mkdir -p $out/share/doc/elvis-${finalAttrs.version}/ $out/share/elvis/ + cp -R data/* $out/share/elvis/ + cp doc/* $out/share/doc/elvis-${finalAttrs.version}/ + + runHook postInstall + ''; + + meta = { + homepage = "http://elvis.the-little-red-haired-girl.org/"; + description = "Vi clone for Unix and other operating systems"; + license = lib.licenses.free; + mainProgram = "elvis"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/applications/editors/em/default.nix b/pkgs/by-name/em/em/package.nix similarity index 100% rename from pkgs/applications/editors/em/default.nix rename to pkgs/by-name/em/em/package.nix diff --git a/pkgs/applications/emulators/emu2/default.nix b/pkgs/by-name/em/emu2/package.nix similarity index 100% rename from pkgs/applications/emulators/emu2/default.nix rename to pkgs/by-name/em/emu2/package.nix diff --git a/pkgs/by-name/en/en-croissant/Cargo.lock b/pkgs/by-name/en/en-croissant/Cargo.lock new file mode 100644 index 0000000000000..73ddcb608e3e7 --- /dev/null +++ b/pkgs/by-name/en/en-croissant/Cargo.lock @@ -0,0 +1,7020 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom 0.2.12", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arboard" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" +dependencies = [ + "clipboard-win", + "core-graphics 0.23.1", + "image", + "log", + "objc", + "objc-foundation", + "objc_id", + "parking_lot", + "thiserror", + "windows-sys 0.48.0", + "wl-clipboard-rs", + "x11rb", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +dependencies = [ + "concurrent-queue", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +dependencies = [ + "async-lock 3.3.0", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite 2.2.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.2.0", + "parking", + "polling 3.5.0", + "rustix 0.38.31", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.31", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.3.2", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.31", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "atk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", + "itoa 1.0.10", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "tokio", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bincode" +version = "2.0.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95" +dependencies = [ + "bincode_derive", + "serde", +] + +[[package]] +name = "bincode_derive" +version = "2.0.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e30759b3b99a1b802a7a3aa21c85c3ded5c28e1c83170d82d70f08bbf7f3e4c" +dependencies = [ + "virtue", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock 3.3.0", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.2.0", + "piper", + "tracing", +] + +[[package]] +name = "borsh" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" +dependencies = [ + "once_cell", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.52", + "syn_derive", +] + +[[package]] +name = "brotli" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "btoi" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" +dependencies = [ + "num-traits", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byte-unit" +version = "5.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e" +dependencies = [ + "rust_decimal", + "serde", + "utf8-width", +] + +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "bytecount" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" + +[[package]] +name = "bytemuck" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +dependencies = [ + "serde", +] + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "cargo_toml" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +dependencies = [ + "serde", + "toml 0.7.8", +] + +[[package]] +name = "cc" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] +name = "cfg-expr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-expr" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "circular" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fc239e0f6cb375d2402d48afb92f76f5404fd1df208a41930ec81eda078bea" + +[[package]] +name = "clap" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags 1.3.2", + "clap_lex", + "indexmap 1.9.3", + "strsim 0.10.0", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "clipboard-win" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297" +dependencies = [ + "error-code", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.23.1", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.52", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa 1.0.10", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctor" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" +dependencies = [ + "quote", + "syn 2.0.52", +] + +[[package]] +name = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.52", +] + +[[package]] +name = "darling_macro" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "dashmap" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "deflate64" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive-new" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "diesel" +version = "2.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62c6fcf842f17f8c78ecf7c81d75c5ce84436b41ee07e03f490fbb5f5a8731d8" +dependencies = [ + "diesel_derives", + "libsqlite3-sys", + "r2d2", + "time", +] + +[[package]] +name = "diesel_derives" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8337737574f55a468005a83499da720f20c65586241ffea339db9ecdfd2b44" +dependencies = [ + "diesel_table_macro_syntax", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "diesel_table_macro_syntax" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +dependencies = [ + "syn 2.0.52", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "embed-resource" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml 0.8.11", + "vswhom", + "winreg 0.52.0", +] + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "en-croissant" +version = "0.11.1" +dependencies = [ + "axum", + "bincode", + "btoi", + "bzip2", + "chrono", + "csv", + "dashmap 6.0.1", + "derivative", + "diesel", + "futures-util", + "governor", + "lazy_static", + "log", + "nonzero_ext", + "oauth2", + "once_cell", + "pgn-reader", + "quick-xml 0.31.0", + "rand 0.8.5", + "rayon", + "reqwest 0.12.5", + "rusqlite", + "serde", + "serde_json", + "shakmaty", + "specta", + "strsim 0.11.0", + "sysinfo", + "tar", + "tauri", + "tauri-build", + "tauri-plugin-log", + "tauri-specta", + "tempfile", + "thiserror", + "tokio", + "vampirc-uci", + "window-shadows", + "zip 2.1.6", + "zstd", +] + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "fern" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +dependencies = [ + "log", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset 0.9.0", + "rustc_version", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.2.0", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps 6.2.0", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps 6.2.0", + "x11", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.0", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.6", + "regex-syntax 0.8.2", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "governor" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" +dependencies = [ + "cfg-if", + "dashmap 5.5.3", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot", + "portable-atomic", + "quanta", + "rand 0.8.5", + "smallvec", + "spinning_top", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +dependencies = [ + "atk", + "bitflags 1.3.2", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps 6.2.0", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +dependencies = [ + "anyhow", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "h2" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.2.5", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.5", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.8", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash 0.8.11", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.3", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.10", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.10", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.24", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa 1.0.10", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "itoa 1.0.10", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.12", + "hyper 0.14.28", + "rustls 0.21.10", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.1", + "hyper-util", + "rustls 0.23.12", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper 0.14.28", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ico" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.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 0.4.6", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", + "png", + "tiff", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", + "serde", +] + +[[package]] +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] +name = "infer" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" +dependencies = [ + "cfb", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "treediff", +] + +[[package]] +name = "kuchikiki" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +dependencies = [ + "cssparser", + "html5ever", + "indexmap 1.9.3", + "matches", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +dependencies = [ + "value-bag", +] + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mac-notification-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "minisign-verify" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + +[[package]] +name = "notify-rust" +version = "4.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226" +dependencies = [ + "log", + "mac-notification-sys", + "serde", + "tauri-winrt-notification", + "zbus", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "oauth2" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" +dependencies = [ + "base64 0.13.1", + "chrono", + "getrandom 0.2.12", + "http 0.2.12", + "rand 0.8.5", + "reqwest 0.11.26", + "serde", + "serde_json", + "serde_path_to_error", + "sha2", + "thiserror", + "url", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "open" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +dependencies = [ + "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[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.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "os_info" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a07930afc1bd77ac9e1101dc18d3fc4986c6568e939c31d1c26657eb0ccbf5" +dependencies = [ + "log", + "serde", + "windows-sys 0.52.0", +] + +[[package]] +name = "os_pipe" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags 1.3.2", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "pest_meta" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.2.5", +] + +[[package]] +name = "pgn-reader" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1994b0ce2a74829bff0462e229b3f0a138cfb293e22c6a65f7966ff26d304e74" +dependencies = [ + "btoi", + "circular", + "memchr", + "shakmaty", +] + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plist" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +dependencies = [ + "base64 0.21.7", + "indexmap 2.2.5", + "line-wrap", + "quick-xml 0.31.0", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.31", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quanta" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi 0.11.0+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r2d2" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" +dependencies = [ + "log", + "parking_lot", + "scheduled-thread-pool", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.12", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-cpuid" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" +dependencies = [ + "bitflags 2.4.2", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rayon" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom 0.2.12", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.6", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.11.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.24", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", + "hyper-rustls 0.24.2", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.10", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-rustls 0.24.1", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls 0.27.2", + "hyper-tls 0.6.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 2.1.3", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg 0.52.0", +] + +[[package]] +name = "rfd" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +dependencies = [ + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "lazy_static", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.37.0", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.12", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rkyv" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rusqlite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" +dependencies = [ + "bitflags 1.3.2", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rust_decimal" +version = "1.34.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39449a79f45e8da28c57c341891b69a183044b29518bb8f86dbac9df60bb7df" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand 0.8.5", + "rkyv", + "serde", + "serde_json", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki 0.102.6", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scheduled-thread-pool" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" +dependencies = [ + "parking_lot", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "serde_json" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +dependencies = [ + "indexmap 2.2.5", + "itoa 1.0.10", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa 1.0.10", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa 1.0.10", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" +dependencies = [ + "base64 0.21.7", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.5", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shakmaty" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8969aea589c3356aa6c0251dbd9c27d0586224f2cb1f068f33d756966f58fb7a" +dependencies = [ + "arrayvec", + "bitflags 2.4.2", + "btoi", + "nohash-hasher", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shared_child" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "soup2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +dependencies = [ + "bitflags 1.3.2", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", +] + +[[package]] +name = "soup2-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags 1.3.2", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "specta" +version = "2.0.0-rc.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18938fc0c7c0e8b7c8f4702e8cb53c218d4442f5b7420dd8b3d9640ca9a46712" +dependencies = [ + "once_cell", + "paste", + "serde", + "specta-macros", + "tauri", + "thiserror", +] + +[[package]] +name = "specta-macros" +version = "2.0.0-rc.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05080358d47cc706229b854d51c6477208de2b022ec0e16f1572c8cdc5263c8e" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +dependencies = [ + "lock_api", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[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.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + +[[package]] +name = "sys-locale" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" +dependencies = [ + "js-sys", + "libc", + "wasm-bindgen", + "web-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "sysinfo" +version = "0.29.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" +dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml 0.5.11", + "version-compare 0.0.11", +] + +[[package]] +name = "system-deps" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr 0.15.7", + "heck 0.4.1", + "pkg-config", + "toml 0.8.11", + "version-compare 0.1.1", +] + +[[package]] +name = "tao" +version = "0.16.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d22205b267a679ca1c590b9f178488d50981fc3e48a1b91641ae31593db875ce" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "cc", + "cocoa 0.24.1", + "core-foundation", + "core-graphics 0.22.3", + "crossbeam-channel", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkwayland-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "tao-macros", + "unicode-segmentation", + "uuid", + "windows 0.39.0", + "windows-implement", + "x11-dl", +] + +[[package]] +name = "tao-macros" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tar" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "tauri" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f078117725e36d55d29fafcbb4b1e909073807ca328ae8deb8c0b3843aac0fed" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytes", + "clap", + "cocoa 0.24.1", + "dirs-next", + "dunce", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "glib", + "glob", + "gtk", + "heck 0.4.1", + "http 0.2.12", + "ignore", + "indexmap 1.9.3", + "minisign-verify", + "nix 0.26.4", + "notify-rust", + "objc", + "once_cell", + "open", + "os_info", + "os_pipe", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "regex", + "reqwest 0.11.26", + "rfd", + "semver", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "shared_child", + "state", + "sys-locale", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "time", + "tokio", + "url", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "zip 0.6.6", +] + +[[package]] +name = "tauri-build" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9914a4715e0b75d9f387a285c7e26b5bbfeb1249ad9f842675a82481565c532" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs-next", + "heck 0.4.1", + "json-patch", + "semver", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", + "walkdir", +] + +[[package]] +name = "tauri-codegen" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1554c5857f65dbc377cefb6b97c8ac77b1cb2a90d30d3448114d5d6b48a77fc" +dependencies = [ + "base64 0.21.7", + "brotli", + "ico", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "regex", + "semver", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "277abf361a3a6993ec16bcbb179de0d6518009b851090a01adfea12ac89fa875" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-plugin-log" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#d95a1b382f512a0be748e7a89e0f8fc4278010e2" +dependencies = [ + "byte-unit", + "fern", + "log", + "serde", + "serde_json", + "serde_repr", + "tauri", + "time", +] + +[[package]] +name = "tauri-runtime" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf2d0652aa2891ff3e9caa2401405257ea29ab8372cce01f186a5825f1bd0e76" +dependencies = [ + "gtk", + "http 0.2.12", + "http-range", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "url", + "uuid", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-runtime-wry" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "067c56fc153b3caf406d7cd6de4486c80d1d66c0f414f39e94cb2f5543f6445f" +dependencies = [ + "arboard", + "cocoa 0.24.1", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-specta" +version = "2.0.0-rc.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9c8e4e35bb01f7b53df4bd7f747626e45c67f41bf40b51a648c953ec779b5c" +dependencies = [ + "heck 0.4.1", + "indoc", + "serde", + "serde_json", + "specta", + "tauri", + "tauri-specta-macros", + "thiserror", +] + +[[package]] +name = "tauri-specta-macros" +version = "2.0.0-rc.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2098cb9333e5ae46629ef74ce89b2fce3978bdcaf9dea6dd0fcb1aca85934ddd" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "tauri-utils" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75ad0bbb31fccd1f4c56275d0a5c3abdf1f59999f72cb4ef8b79b4ed42082a21" +dependencies = [ + "brotli", + "ctor", + "dunce", + "glob", + "heck 0.4.1", + "html5ever", + "infer", + "json-patch", + "kuchikiki", + "log", + "memchr", + "phf 0.11.2", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows-version", +] + +[[package]] +name = "tauri-winres" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" +dependencies = [ + "embed-resource", + "toml 0.7.8", +] + +[[package]] +name = "tauri-winrt-notification" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" +dependencies = [ + "quick-xml 0.30.0", + "windows 0.51.1", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "rustix 0.38.31", + "windows-sys 0.52.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" + +[[package]] +name = "thin-slice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[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 = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa 1.0.10", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.6", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.10", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.12", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.7", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.5", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.5", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992" +dependencies = [ + "indexmap 2.2.5", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.5", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tree_magic_mini" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91adfd0607cacf6e4babdb870e9bec4037c1c4b151cfd279ccefc5e0c7feaa6d" +dependencies = [ + "bytecount", + "fnv", + "lazy_static", + "nom", + "once_cell", + "petgraph", +] + +[[package]] +name = "treediff" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d127780145176e2b5d16611cc25a900150e86e9fd79d3bde6ff3a37359c9cb5" +dependencies = [ + "serde_json", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[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 = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.0", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + +[[package]] +name = "uuid" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +dependencies = [ + "getrandom 0.2.12", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec26a25bd6fca441cdd0f769fd7f891bae119f996de31f86a5eddccef54c1d" + +[[package]] +name = "vampirc-uci" +version = "0.11.1" +source = "git+https://github.com/franciscoBSalgueiro/vampirc-uci?rev=c60e65c7d801920ccfc533df3ab87e292d6d0448#c60e65c7d801920ccfc533df3ab87e292d6d0448" +dependencies = [ + "chrono", + "pest", + "pest_derive", + "serde", + "specta", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "virtue" +version = "0.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.52", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.31", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +dependencies = [ + "bitflags 2.4.2", + "rustix 0.38.31", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +dependencies = [ + "proc-macro2", + "quick-xml 0.31.0", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.2.0", +] + +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webview2-com" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "webview2-com-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "webview2-com-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "window-shadows" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ff424735b1ac21293b0492b069394b0a189c8a463fb015a16dea7c2e221c08" +dependencies = [ + "cocoa 0.25.0", + "objc", + "raw-window-handle", + "windows-sys 0.48.0", +] + +[[package]] +name = "windows" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +dependencies = [ + "windows_aarch64_msvc 0.37.0", + "windows_i686_gnu 0.37.0", + "windows_i686_msvc 0.37.0", + "windows_x86_64_gnu 0.37.0", + "windows_x86_64_msvc 0.37.0", +] + +[[package]] +name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows-implement", + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core 0.51.1", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-bindgen" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" +dependencies = [ + "windows-metadata", + "windows-tokens", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" +dependencies = [ + "syn 1.0.109", + "windows-tokens", +] + +[[package]] +name = "windows-metadata" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-tokens" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + +[[package]] +name = "windows-version" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" + +[[package]] +name = "windows_i686_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" + +[[package]] +name = "windows_i686_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wl-clipboard-rs" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12b41773911497b18ca8553c3daaf8ec9fe9819caf93d451d3055f69de028adb" +dependencies = [ + "derive-new", + "libc", + "log", + "nix 0.28.0", + "os_pipe", + "tempfile", + "thiserror", + "tree_magic_mini", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", +] + +[[package]] +name = "wry" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ad85d0e067359e409fcb88903c3eac817c392e5d638258abfb3da5ad8ba6fc4" +dependencies = [ + "base64 0.13.1", + "block", + "cocoa 0.24.1", + "core-graphics 0.22.3", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http 0.2.12", + "kuchikiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2", + "soup2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +dependencies = [ + "gethostname", + "rustix 0.38.31", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys 0.4.13", + "rustix 0.38.31", +] + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] + +[[package]] +name = "zip" +version = "2.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" +dependencies = [ + "aes", + "arbitrary", + "bzip2", + "constant_time_eq", + "crc32fast", + "crossbeam-utils", + "deflate64", + "displaydoc", + "flate2", + "hmac", + "indexmap 2.2.5", + "lzma-rs", + "memchr", + "pbkdf2", + "rand 0.8.5", + "sha1", + "thiserror", + "time", + "zeroize", + "zopfli", + "zstd", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix new file mode 100644 index 0000000000000..81489925d19f8 --- /dev/null +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + overrideSDK, + rustPlatform, + fetchFromGitHub, + + pnpm_9, + nodejs, + cargo-tauri, + pkg-config, + wrapGAppsHook3, + makeBinaryWrapper, + + openssl, + libsoup, + webkitgtk, + gst_all_1, + darwin, +}: + +let + buildRustPackage = rustPlatform.buildRustPackage.override { + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; +in +buildRustPackage rec { + pname = "en-croissant"; + version = "0.11.1"; + + src = fetchFromGitHub { + owner = "franciscoBSalgueiro"; + repo = "en-croissant"; + rev = "refs/tags/v${version}"; + hash = "sha256-EiGML3oFCJR4TZkd+FekUrJwCYe/nGdWD9mAtKKtITQ="; + }; + + pnpmDeps = pnpm_9.fetchDeps { + inherit pname version src; + hash = "sha256-hjSioKpvrGyo5UKvBrwln0S3aIpnJZ2PUdzBfbT7IC4="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tauri-plugin-log-0.0.0" = "sha256-t+zmMMSnD9ASZZvqlhu1ah2OjCUtRXdk/xaI37uI49c="; + "vampirc-uci-0.11.1" = "sha256-g2JjHZoAmmZ7xsw4YnkUPRXJxsYmBqflWxCFkFEvMXQ="; + }; + }; + + cargoRoot = "src-tauri"; + + buildAndTestSubdir = cargoRoot; + + nativeBuildInputs = + [ + pnpm_9.configHook + nodejs + cargo-tauri.hook + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ]; + + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + openssl + libsoup + webkitgtk + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Cocoa + darwin.apple_sdk_11_0.frameworks.WebKit + ]; + + doCheck = false; # many scoring tests fail + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + makeWrapper "$out"/Applications/en-croissant.app/Contents/MacOS/en-croissant $out/bin/en-croissant + ''; + + meta = { + description = "Ultimate Chess Toolkit"; + homepage = "https://github.com/franciscoBSalgueiro/en-croissant/"; + license = lib.licenses.gpl3Only; + mainProgram = "en-croissant"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/en/encled/package.nix b/pkgs/by-name/en/encled/package.nix index 8b48f11bc8b00..474b790775cc9 100644 --- a/pkgs/by-name/en/encled/package.nix +++ b/pkgs/by-name/en/encled/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { owner = "amarao"; repo = "sdled"; rev = "60fd6c728112f2f1feb317355bdb1faf9d2f76da"; - sha256 = "1qygzjzsv305662317435nsc6r15k7r6qidp48lgspvy9x5xli73"; + hash = "sha256-40TaS09+X/0oIrdFbPKZJWTDtC2DnDCEMQWMrb/8z+M="; }; buildInputs = [ python3 ]; diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix new file mode 100644 index 0000000000000..e39d908668133 --- /dev/null +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -0,0 +1,119 @@ +{ + lib, + flutter324, + fetchFromGitHub, + webkitgtk, + sqlite, + libayatana-appindicator, + makeDesktopItem, + copyDesktopItems, + imagemagick, + makeWrapper, + xdg-user-dirs, +}: +let + # fetch simple-icons directly to avoid cloning with submodules, + # which would also clone a whole copy of flutter + simple-icons = fetchFromGitHub (lib.importJSON ./simple-icons.json); +in +flutter324.buildFlutterApplication rec { + pname = "ente-auth"; + version = "4.0.2"; + + src = fetchFromGitHub { + owner = "ente-io"; + repo = "ente"; + sparseCheckout = [ "auth" ]; + rev = "auth-v${version}"; + hash = "sha256-me+fT79vwqBBNsRWWo58GdzBf58LNB4Mk+pmCLvn/ik="; + }; + + sourceRoot = "${src.name}/auth"; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + patchPhase = '' + rmdir assets/simple-icons + ln -s ${simple-icons} assets/simple-icons + ''; + + gitHashes = { + desktop_webview_window = "sha256-jdNMpzFBgw53asWlGzWUS+hoPdzcL6kcJt2KzjxXf2E="; + ente_crypto_dart = "sha256-XBzQ268E0cYljJH6gDS5O0Pmie/GwuhMDlQPfopSqJM="; + flutter_local_authentication = "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0="; + flutter_secure_storage_linux = "sha256-x45jrJ7pvVyhZlpqRSy3CbwT4Lna6yi/b2IyAilWckg="; + sqflite = "sha256-TdvCtEO7KL1R2oOSwGWllmS5kGCIU5CkvvUqUJf3tUc="; + }; + + nativeBuildInputs = [ + copyDesktopItems + imagemagick + makeWrapper + ]; + + buildInputs = [ + webkitgtk + sqlite + libayatana-appindicator + ]; + + # Based on https://github.com/ente-io/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml + # and https://github.com/ente-io/ente/blob/main/auth/linux/packaging/ente_auth.appdata.xml + desktopItems = [ + (makeDesktopItem { + name = "ente_auth"; + exec = "ente_auth"; + icon = "ente-auth"; + desktopName = "Ente Auth"; + genericName = "Ente Authentication"; + comment = "Open source 2FA authenticator, with end-to-end encrypted backups"; + categories = [ "Utility" ]; + keywords = [ + "Authentication" + "2FA" + ]; + mimeTypes = [ "x-scheme-handler/enteauth" ]; + startupNotify = false; + }) + ]; + + postInstall = '' + FAV=$out/app/data/flutter_assets/assets/icons/auth-icon.png + ICO=$out/share/icons + + install -D $FAV $ICO/ente-auth.png + for size in 24 32 42 64 128 256 512; do + D=$ICO/hicolor/''${size}x''${size}/apps + mkdir -p $D + magick $FAV -resize ''${size}x''${size} $D/ente-auth.png + done + + install -Dm444 linux/packaging/ente_auth.appdata.xml -t $out/share/metainfo + + wrapProgram $out/bin/ente_auth \ + --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]} + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "End-to-end encrypted, cross platform and free app for storing your 2FA codes with cloud backups"; + longDescription = '' + Ente's 2FA app. An end-to-end encrypted, cross platform and free app for storing your 2FA codes with cloud backups. Works offline. You can even use it without signing up for an account if you don't want the cloud backups or multi-device sync. + ''; + homepage = "https://ente.io/auth/"; + changelog = "https://github.com/ente-io/ente/releases/tag/auth-v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + niklaskorz + schnow265 + zi3m5f + gepbird + ]; + mainProgram = "ente_auth"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +} diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json new file mode 100644 index 0000000000000..2666c6b1be223 --- /dev/null +++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json @@ -0,0 +1,2273 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "67.0.0" + }, + "adaptive_theme": { + "dependency": "direct main", + "description": { + "name": "adaptive_theme", + "sha256": "f4ee609b464e5efc68131d9d15ba9aa1de4e3b5ede64be17781c6e19a52d637d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.1" + }, + "ansicolor": { + "dependency": "transitive", + "description": { + "name": "ansicolor", + "sha256": "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "app_links": { + "dependency": "direct main", + "description": { + "name": "app_links", + "sha256": "f04c3ca96426baba784c736a201926bd4145524c36a1b38942a351b033305e21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.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": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "auto_size_text": { + "dependency": "direct main", + "description": { + "name": "auto_size_text", + "sha256": "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "base32": { + "dependency": "direct main", + "description": { + "name": "base32", + "sha256": "ddad4ebfedf93d4500818ed8e61443b734ffe7cf8a45c668c9b34ef6adde02e2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "bip39": { + "dependency": "direct main", + "description": { + "name": "bip39", + "sha256": "de1ee27ebe7d96b84bb3a04a4132a0a3007dcdd5ad27dd14aa87a29d97c45edc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "bloc": { + "dependency": "direct main", + "description": { + "name": "bloc", + "sha256": "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.4" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.11" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.1" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clipboard": { + "dependency": "direct main", + "description": { + "name": "clipboard", + "sha256": "2ec38f0e59878008ceca0ab122e4bfde98847f88ef0f83331362ba4521f565a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "confetti": { + "dependency": "direct main", + "description": { + "name": "confetti", + "sha256": "979aafde2428c53947892c95eb244466c109c129b7eee9011f0a66caaca52267", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "connectivity_plus": { + "dependency": "direct main", + "description": { + "name": "connectivity_plus", + "sha256": "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.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" + }, + "convert": { + "dependency": "direct main", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "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": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.6" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "desktop_webview_window": { + "dependency": "direct main", + "description": { + "path": "packages/desktop_webview_window", + "ref": "main", + "resolved-ref": "726d8281a244d56ab36e843f0427c48de6d9cc56", + "url": "https://github.com/MixinNetwork/flutter-plugins" + }, + "source": "git", + "version": "0.2.4" + }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.2" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.4.3+1" + }, + "dotted_border": { + "dependency": "direct main", + "description": { + "name": "dotted_border", + "sha256": "108837e11848ca776c53b30bc870086f84b62ed6e01c503ed976e8f8c7df9c04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "dropdown_button2": { + "dependency": "direct main", + "description": { + "name": "dropdown_button2", + "sha256": "b0fe8d49a030315e9eef6c7ac84ca964250155a6224d491c1365061bc974a9e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.9" + }, + "email_validator": { + "dependency": "direct main", + "description": { + "name": "email_validator", + "sha256": "b19aa5d92fdd76fbc65112060c94d45ba855105a28bb6e462de7ff03b12fa1fb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "ente_crypto_dart": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "e2e66ffd03f23bef5e0bb138b5f01b32d8e9b7bb", + "url": "https://github.com/ente-io/ente_crypto_dart.git" + }, + "source": "git", + "version": "1.0.0" + }, + "event_bus": { + "dependency": "direct main", + "description": { + "name": "event_bus", + "sha256": "44baa799834f4c803921873e7446a2add0f3efa45e101a054b1f0ab9b95f8edc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "expandable": { + "dependency": "direct main", + "description": { + "name": "expandable", + "sha256": "9604d612d4d1146dafa96c6d8eec9c2ff0994658d6d09fed720ab788c7f5afc2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.1" + }, + "expansion_tile_card": { + "dependency": "direct main", + "description": { + "name": "expansion_tile_card", + "sha256": "27ce4cb518f00e21d0f2309aaa6462b26b148e93cee2029a73088cecf42b1eb0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "direct main", + "description": { + "name": "ffi", + "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.2" + }, + "file_saver": { + "dependency": "direct main", + "description": { + "name": "file_saver", + "sha256": "bdebc720e17b3e01aba59da69b6d47020a7e5ba7d5c75bd9194f9618d5f16ef4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.12" + }, + "fixnum": { + "dependency": "direct main", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "fk_user_agent": { + "dependency": "direct main", + "description": { + "name": "fk_user_agent", + "sha256": "fd6c94e120786985a292d12f61422a581f4e851148d5940af38b819357b8ad0d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_animate": { + "dependency": "direct main", + "description": { + "name": "flutter_animate", + "sha256": "7c8a6594a9252dad30cc2ef16e33270b6248c4dedc3b3d06c86c4f3f4dc05ae5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.0" + }, + "flutter_bloc": { + "dependency": "direct main", + "description": { + "name": "flutter_bloc", + "sha256": "b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.6" + }, + "flutter_context_menu": { + "dependency": "direct main", + "description": { + "name": "flutter_context_menu", + "sha256": "4bc1dc30ae5aa705ed99ebbeb875898c6341a6d092397a566fecd5184b392380", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "flutter_displaymode": { + "dependency": "direct main", + "description": { + "name": "flutter_displaymode", + "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "flutter_email_sender": { + "dependency": "direct main", + "description": { + "name": "flutter_email_sender", + "sha256": "fb515d4e073d238d0daf1d765e5318487b6396d46b96e0ae9745dbc9a133f97a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.3" + }, + "flutter_inappwebview": { + "dependency": "direct main", + "description": { + "name": "flutter_inappwebview", + "sha256": "3e9a443a18ecef966fb930c3a76ca5ab6a7aafc0c7b5e14a4a850cf107b09959", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "flutter_inappwebview_android": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_android", + "sha256": "d247f6ed417f1f8c364612fa05a2ecba7f775c8d0c044c1d3b9ee33a6515c421", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.13" + }, + "flutter_inappwebview_internal_annotations": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_internal_annotations", + "sha256": "5f80fd30e208ddded7dbbcd0d569e7995f9f63d45ea3f548d8dd4c0b473fb4c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter_inappwebview_ios": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_ios", + "sha256": "f363577208b97b10b319cd0c428555cd8493e88b468019a8c5635a0e4312bd0f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.13" + }, + "flutter_inappwebview_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_macos", + "sha256": "b55b9e506c549ce88e26580351d2c71d54f4825901666bd6cfa4be9415bb2636", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.11" + }, + "flutter_inappwebview_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_platform_interface", + "sha256": "545fd4c25a07d2775f7d5af05a979b2cac4fbf79393b0a7f5d33ba39ba4f6187", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.10" + }, + "flutter_inappwebview_web": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_web", + "sha256": "d8c680abfb6fec71609a700199635d38a744df0febd5544c5a020bd73de8ee07", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "flutter_launcher_icons": { + "dependency": "direct main", + "description": { + "name": "flutter_launcher_icons", + "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_local_authentication": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "1ac346a04592a05fd75acccf2e01fa3c7e955d96", + "resolved-ref": "1ac346a04592a05fd75acccf2e01fa3c7e955d96", + "url": "https://github.com/eaceto/flutter_local_authentication" + }, + "source": "git", + "version": "1.2.0" + }, + "flutter_local_notifications": { + "dependency": "direct main", + "description": { + "name": "flutter_local_notifications", + "sha256": "c500d5d9e7e553f06b61877ca6b9c8b92c570a4c8db371038702e8ce57f8a50f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "17.2.2" + }, + "flutter_local_notifications_linux": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_linux", + "sha256": "c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.1" + }, + "flutter_local_notifications_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_platform_interface", + "sha256": "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.2.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_native_splash": { + "dependency": "direct main", + "description": { + "name": "flutter_native_splash", + "sha256": "edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.20" + }, + "flutter_secure_storage": { + "dependency": "direct main", + "description": { + "name": "flutter_secure_storage", + "sha256": "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.2.2" + }, + "flutter_secure_storage_linux": { + "dependency": "direct overridden", + "description": { + "path": "flutter_secure_storage_linux", + "ref": "develop", + "resolved-ref": "cb30953edc029dc4059b72700270b4cd3a3afade", + "url": "https://github.com/mogol/flutter_secure_storage.git" + }, + "source": "git", + "version": "1.2.1" + }, + "flutter_secure_storage_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_macos", + "sha256": "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "flutter_secure_storage_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_platform_interface", + "sha256": "cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "flutter_secure_storage_web": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_web", + "sha256": "f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "flutter_secure_storage_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_windows", + "sha256": "b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "flutter_shaders": { + "dependency": "transitive", + "description": { + "name": "flutter_shaders", + "sha256": "02750b545c01ff4d8e9bbe8f27a7731aa3778402506c67daa1de7f5fc3f4befe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "flutter_speed_dial": { + "dependency": "direct main", + "description": { + "name": "flutter_speed_dial", + "sha256": "698a037274a66dbae8697c265440e6acb6ab6cae9ac5f95c749e7944d8f28d41", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "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": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.10+1" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "fluttertoast": { + "dependency": "direct main", + "description": { + "name": "fluttertoast", + "sha256": "95f349437aeebe524ef7d6c9bde3e6b4772717cf46a0eb6a3ceaddc740b297cc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.2.8" + }, + "freezed_annotation": { + "dependency": "transitive", + "description": { + "name": "freezed_annotation", + "sha256": "c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "google_nav_bar": { + "dependency": "direct main", + "description": { + "name": "google_nav_bar", + "sha256": "1c8e3882fa66ee7b74c24320668276ca23affbd58f0b14a24c1e5590f4d07ab0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.6" + }, + "gradient_borders": { + "dependency": "direct main", + "description": { + "name": "gradient_borders", + "sha256": "b1cd969552c83f458ff755aa68e13a0327d09f06c3f42f471b423b01427f21f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "gtk": { + "dependency": "transitive", + "description": { + "name": "gtk", + "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "hashlib": { + "dependency": "transitive", + "description": { + "name": "hashlib", + "sha256": "67e640e19cc33070113acab3125cd48ebe480a0300e15554dec089b8878a729f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.16.0" + }, + "hashlib_codecs": { + "dependency": "transitive", + "description": { + "name": "hashlib_codecs", + "sha256": "a1c7b5d89ff29e81fd8e8c0b35966db4c935e149fc4ebe1ebf71e358c15863ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "hex": { + "dependency": "transitive", + "description": { + "name": "hex", + "sha256": "4e7cd54e4b59ba026432a6be2dd9d96e4c5205725194997193bf871703b82c4a", + "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" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "json_annotation": { + "dependency": "direct main", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_serializable": { + "dependency": "direct dev", + "description": { + "name": "json_serializable", + "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.8.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.5" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "direct dev", + "description": { + "name": "lints", + "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "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": "direct main", + "description": { + "name": "local_auth_android", + "sha256": "48dfb2d954da8ef6a77adfc93a29998f7729e9308eaa817e91dea4500317b2c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.39" + }, + "local_auth_darwin": { + "dependency": "direct main", + "description": { + "name": "local_auth_darwin", + "sha256": "7ba5738c874ca2b910d72385d00d2bebad9d4e807612936cf5e32bc01a048c71", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.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": "505ba3367ca781efb1c50d3132e44a2446bccc4163427bc203b9b4d8994d97ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.10" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "menu_base": { + "dependency": "transitive", + "description": { + "name": "menu_base", + "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "mocktail": { + "dependency": "direct dev", + "description": { + "name": "mocktail", + "sha256": "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "modal_bottom_sheet": { + "dependency": "direct main", + "description": { + "name": "modal_bottom_sheet", + "sha256": "eac66ef8cb0461bf069a38c5eb0fa728cee525a531a8304bd3f7b2185407c67e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "move_to_background": { + "dependency": "direct main", + "description": { + "name": "move_to_background", + "sha256": "00caad17a6ce149910777131503f43f8ed80025681f94684e3a6a87d979b914c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "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" + }, + "otp": { + "dependency": "direct main", + "description": { + "name": "otp", + "sha256": "fcb7f21e30c4cd80a0a982c27a9b75151cc1fe3d8f7ee680673c090171b1ad55", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.2" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "password_strength": { + "dependency": "direct main", + "description": { + "name": "password_strength", + "sha256": "0e51e3d864e37873a1347e658147f88b66e141ee36c58e19828dc5637961e1ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_drawing": { + "dependency": "transitive", + "description": { + "name": "path_drawing", + "sha256": "bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.5" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.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": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "pinput": { + "dependency": "direct main", + "description": { + "name": "pinput", + "sha256": "7bf9aa7d0eeb3da9f7d49d2087c7bc7d36cd277d2e94cc31c6da52e1ebb048d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pointycastle": { + "dependency": "direct main", + "description": { + "name": "pointycastle", + "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.9.1" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "privacy_screen": { + "dependency": "direct main", + "description": { + "name": "privacy_screen", + "sha256": "b80297d2726d96e8a8341149e81a415302755f02d3af7c05c820d9e191bbfbee", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.6" + }, + "protobuf": { + "dependency": "direct main", + "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": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "qr": { + "dependency": "transitive", + "description": { + "name": "qr", + "sha256": "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "qr_code_scanner": { + "dependency": "direct main", + "description": { + "name": "qr_code_scanner", + "sha256": "f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "qr_flutter": { + "dependency": "direct main", + "description": { + "name": "qr_flutter", + "sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.9" + }, + "sentry": { + "dependency": "direct main", + "description": { + "name": "sentry", + "sha256": "0f787e27ff617e4f88f7074977240406a9c5509444bac64a4dfa5b3200fb5632", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.7.0" + }, + "sentry_flutter": { + "dependency": "direct main", + "description": { + "name": "sentry_flutter", + "sha256": "fbbb47d72ccca48be25bf3c2ced6ab6e872991af3a0ba78e54be8d138f2e053f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.7.0" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "468c43f285207c84bcabf5737f33b914ceb8eb38398b91e5e3ad1698d1b72a52", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.2" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "6ababf341050edff57da8b6990f11f4e99eaba837865e2e6defe16d039619db5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "shortid": { + "dependency": "transitive", + "description": { + "name": "shortid", + "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "sodium": { + "dependency": "transitive", + "description": { + "name": "sodium", + "sha256": "d9830a388e37c82891888e64cfd4c6764fa3ac716bed80ac6eab89ee42c3cd76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1+1" + }, + "sodium_libs": { + "dependency": "transitive", + "description": { + "name": "sodium_libs", + "sha256": "441444f6f433032bae3444c2ef5ed2cf5bc0def77f104abdff20aedcf79a7c7a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1+5" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.4" + }, + "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" + }, + "sqflite": { + "dependency": "direct main", + "description": { + "path": "sqflite", + "ref": "HEAD", + "resolved-ref": "3309d399dd7d695bbfa7c05f643bb16765cef4ee", + "url": "https://github.com/tekartik/sqflite" + }, + "source": "git", + "version": "2.3.3+1" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "sqflite_common_ffi": { + "dependency": "direct main", + "description": { + "name": "sqflite_common_ffi", + "sha256": "4d6137c29e930d6e4a8ff373989dd9de7bac12e3bc87bce950f6e844e8ad3bb5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "sqlite3": { + "dependency": "direct main", + "description": { + "name": "sqlite3", + "sha256": "45f168ae2213201b54e09429ed0c593dc2c88c924a1488d6f9c523a255d567cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.6" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "steam_totp": { + "dependency": "direct main", + "description": { + "name": "steam_totp", + "sha256": "3c09143c983f6bb05bb53e9232f9d40bbcc01c596ba0273c3e6bb246729abfa1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.1" + }, + "step_progress_indicator": { + "dependency": "direct main", + "description": { + "name": "step_progress_indicator", + "sha256": "b51bb1fcfc78454359f0658c5a2c21548c3825ebf76e826308e9ca10f383bbb8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "styled_text": { + "dependency": "direct main", + "description": { + "name": "styled_text", + "sha256": "fd624172cf629751b4f171dd0ecf9acf02a06df3f8a81bb56c0caa4f1df706c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.0" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+1" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "timezone": { + "dependency": "transitive", + "description": { + "name": "timezone", + "sha256": "a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "tray_manager": { + "dependency": "direct main", + "description": { + "name": "tray_manager", + "sha256": "c9a63fd88bd3546287a7eb8ccc978d707eef82c775397af17dda3a4f4c039e64", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.3" + }, + "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": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "universal_io": { + "dependency": "transitive", + "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" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.3" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.4.0" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "win32": { + "dependency": "direct main", + "description": { + "name": "win32", + "sha256": "a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.1" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "xmlstream": { + "dependency": "transitive", + "description": { + "name": "xmlstream", + "sha256": "cfc14e3f256997897df9481ae630d94c2d85ada5187ebeb868bb1aabc2c977b4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + } + }, + "sdks": { + "dart": ">=3.4.0 <4.0.0", + "flutter": ">=3.22.0" + } +} diff --git a/pkgs/by-name/en/ente-auth/simple-icons.json b/pkgs/by-name/en/ente-auth/simple-icons.json new file mode 100644 index 0000000000000..0275e35bb3627 --- /dev/null +++ b/pkgs/by-name/en/ente-auth/simple-icons.json @@ -0,0 +1,6 @@ +{ + "owner": "simple-icons", + "repo": "simple-icons", + "rev": "bffc992b7d1365ee44b1683f8397e9f7a44d0c2c", + "hash": "sha256-aqX6X/UsXXprWYU0xYK+wM9vWULYI8enCbVFebEM0yw=" +} diff --git a/pkgs/by-name/en/ente-auth/update.sh b/pkgs/by-name/en/ente-auth/update.sh new file mode 100755 index 0000000000000..7f79ffae58f4b --- /dev/null +++ b/pkgs/by-name/en/ente-auth/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gojq nix-prefetch-github common-updater-scripts + +set -eou pipefail +pkg_dir="$(dirname "$0")" + +gh-curl () { + curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "$1" +} + +version="$(gh-curl "https://api.github.com/repos/ente-io/ente/releases" | gojq 'map(select(.draft == false and .prerelease == false and (.tag_name | startswith("auth-v")))) | first | .tag_name' --raw-output)" +short_version="${version:6}" +if [[ "$short_version" == "$UPDATE_NIX_OLD_VERSION" ]]; then + echo "ente-auth is already up-to-date: $short_version" + exit 0 +fi +echo "Updating to $short_version" + +# Subtree needed for lockfile and icons +auth_tree="$(gh-curl "https://api.github.com/repos/ente-io/ente/git/trees/$version" | gojq '.tree[] | select(.path == "auth") | .url' --raw-output)" + +# Get lockfile, filter out incompatible sqlite dependency and convert to JSON +echo "Updating lockfile" +pubspec_lock="$(gh-curl "$auth_tree" | gojq '.tree[] | select(.path == "pubspec.lock") | .url' --raw-output)" +gh-curl "$pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input 'del(.packages.sqlite3_flutter_libs)' > "$pkg_dir/pubspec.lock.json" + +# Get rev and hash of simple-icons submodule +echo "Updating icons" +assets_tree="$(gh-curl "$auth_tree" | gojq '.tree[] | select(.path == "assets") | .url' --raw-output)" +simple_icons_rev="$(gh-curl "$assets_tree" | gojq '.tree[] | select(.path == "simple-icons") | .sha' --raw-output)" +nix-prefetch-github --rev "$simple_icons_rev" simple-icons simple-icons > "$pkg_dir/simple-icons.json" + +# Update package version and hash +echo "Updating package source" +update-source-version ente-auth "$short_version" --file="$pkg_dir/package.nix" diff --git a/pkgs/by-name/en/enter-tex/package.nix b/pkgs/by-name/en/enter-tex/package.nix new file mode 100644 index 0000000000000..f0ee8ce9f3874 --- /dev/null +++ b/pkgs/by-name/en/enter-tex/package.nix @@ -0,0 +1,84 @@ +{ + stdenv, + lib, + fetchurl, + desktop-file-utils, + docbook-xsl-nons, + gettext, + gobject-introspection, + gtk-doc, + itstool, + meson, + ninja, + pkg-config, + vala, + wrapGAppsHook3, + dconf, + glib, + gsettings-desktop-schemas, + gspell, + libgedit-amtk, + libgedit-gtksourceview, + libgedit-tepl, + libgee, + gnome, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "enter-tex"; + version = "3.47.0"; + + src = fetchurl { + url = "mirror://gnome/sources/enter-tex/${lib.versions.majorMinor finalAttrs.version}/enter-tex-${finalAttrs.version}.tar.xz"; + hash = "sha256-oIyuySdcCruVNWdN9bnBa5KxSWjNIZFtb/wvoMud12o="; + }; + + nativeBuildInputs = [ + desktop-file-utils + docbook-xsl-nons + gettext + gobject-introspection + gtk-doc + itstool + meson + ninja + pkg-config + vala + wrapGAppsHook3 + ]; + + buildInputs = [ + dconf + glib + gsettings-desktop-schemas + gspell + libgedit-amtk + libgedit-gtksourceview + libgedit-tepl + libgee + ]; + + preBuild = '' + # Workaround the use case of C code mixed with Vala code. + # https://gitlab.gnome.org/swilmet/enter-tex/-/blob/3.47.0/docs/more-information.md#install-procedure + ninja src/gtex/Gtex-1.gir + ''; + + doCheck = true; + + passthru.updateScript = gnome.updateScript { + packageName = "enter-tex"; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/swilmet/enter-tex"; + description = "LaTeX editor for the GNOME desktop"; + maintainers = with maintainers; [ + manveru + bobby285271 + ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + mainProgram = "enter-tex"; + }; +}) diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix index 0424bcf4e9bd3..c723ba7dc996a 100644 --- a/pkgs/by-name/en/envio/package.nix +++ b/pkgs/by-name/en/envio/package.nix @@ -1,11 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, darwin -, gpgme -, libgpg-error -, pkg-config -, rustPlatform +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + installShellFiles, + darwin, + gpgme, + libgpg-error, + pkg-config, + rustPlatform, }: let @@ -13,32 +16,34 @@ let in rustPlatform.buildRustPackage rec { pname = "envio"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "envio-cli"; repo = "envio"; rev = "v${version}"; - hash = "sha256-KhjHd+1IeKdASeYP2rPtyTmtkPcBbaruylmOwTPtFgo="; + hash = "sha256-je0DBoBIayFK//Aija5bnO/2z+hxNWgVkwOgxMyq5s4="; }; - cargoHash = "sha256-qmJUARwsGln07RAX1Ab0cNDgJq7NkezuT0tZsyd48Mw="; + cargoHash = "sha256-L7GgPocj32zAfR27dgKK7/OM106cATdCqufSvG3MFYQ="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; - buildInputs = [ libgpg-error gpgme ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ + libgpg-error + gpgme + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - # Remove postPatch when updating to the next envio release - # For details see https://github.com/envio-cli/envio/pull/31 - postPatch = '' - substituteInPlace build.rs\ - --replace 'fn get_version() -> String {' 'fn get_version() -> String { return "${version}".to_string();' + postInstall = '' + installManPage man/*.1 ''; meta = with lib; { - homepage = "https://envio-cli.github.io/home"; - changelog = "https://github.com/envio-cli/envio/blob/${version}/CHANGELOG.md"; + homepage = "https://envio-cli.github.io/home"; + changelog = "https://github.com/envio-cli/envio/blob/${version}/CHANGELOG.md"; description = "Modern and secure CLI tool for managing environment variables"; mainProgram = "envio"; longDescription = '' @@ -47,8 +52,11 @@ rustPlatform.buildRustPackage rec { switch between different configurations and apply them to their current environment. ''; - license = with licenses; [ mit asl20 ]; - platforms = platforms.unix; + license = with licenses; [ + mit + asl20 + ]; + platforms = platforms.unix; maintainers = with maintainers; [ afh ]; }; } diff --git a/pkgs/by-name/en/envision-unwrapped/Cargo.lock b/pkgs/by-name/en/envision-unwrapped/Cargo.lock index 38d9964de6ff6..06e4c6ebff42f 100644 --- a/pkgs/by-name/en/envision-unwrapped/Cargo.lock +++ b/pkgs/by-name/en/envision-unwrapped/Cargo.lock @@ -28,9 +28,18 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "ash" +version = "0.38.0+1.3.281" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" +dependencies = [ + "libloading 0.8.5", +] [[package]] name = "atomic-waker" @@ -71,7 +80,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools", @@ -96,9 +105,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -106,6 +115,15 @@ 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 = "bumpalo" version = "3.14.0" @@ -120,11 +138,11 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cairo-rs" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" +checksum = "797fd5a634dcb0ad0d7d583df794deb0a236d88e759cd34b7da20198c6c9d145" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", @@ -133,9 +151,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" dependencies = [ "glib-sys", "libc", @@ -191,7 +209,7 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.7.4", ] [[package]] @@ -228,6 +246,35 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + +[[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 = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + [[package]] name = "dlopen2" version = "0.7.0" @@ -271,6 +318,7 @@ name = "envision" version = "0.1.0" dependencies = [ "anyhow", + "ash", "gettext-rs", "git2", "gtk4", @@ -278,17 +326,19 @@ dependencies = [ "libadwaita", "libmonado-rs", "nix", - "phf", - "phf_macros", + "openxr", "relm4", "relm4-components", "reqwest", "rusb", "serde", "serde_json", + "sha2", + "tokio", "tracker", "uuid", "vte4", + "xdg", ] [[package]] @@ -479,9 +529,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" +checksum = "28bb53ecb56857c683c9ec859908e076dd3969c7d67598bd8b1ce095d211304a" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -491,9 +541,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" +checksum = "9f6681a0c1330d1d3968bec1529f7172d62819ef0bdbb0d18022320654158b03" dependencies = [ "gio-sys", "glib-sys", @@ -504,9 +554,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -519,9 +569,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -534,6 +584,16 @@ dependencies = [ "system-deps", ] +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "getrandom" version = "0.2.10" @@ -575,9 +635,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" +checksum = "398e3da68749fdc32783cbf7521ec3f65c9cf946db8c7774f8460af49e52c6e2" dependencies = [ "futures-channel", "futures-core", @@ -593,9 +653,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" +checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63" dependencies = [ "glib-sys", "gobject-sys", @@ -606,11 +666,11 @@ dependencies = [ [[package]] name = "git2" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", @@ -621,11 +681,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.7" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490" +checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -643,11 +703,11 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.7" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e" +checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro-crate", "proc-macro2", "quote", @@ -656,9 +716,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" +checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60" dependencies = [ "libc", "system-deps", @@ -672,9 +732,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" +checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8" dependencies = [ "glib-sys", "libc", @@ -683,9 +743,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +checksum = "630e940ad5824f90221d6579043a9cd1f8bec86b4a17faaf7827d58eb16e8c1f" dependencies = [ "glib", "graphene-sys", @@ -694,9 +754,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" +checksum = "6fb8fade7b754982f47ebbed241fd2680816fdd4598321784da10b9e1168836a" dependencies = [ "glib-sys", "libc", @@ -706,9 +766,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" dependencies = [ "cairo-rs", "gdk4", @@ -721,9 +781,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -737,9 +797,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" +checksum = "eaffc6c743c9160514cc9b67eace364e5dc5798369fa809cdb04e035c21c5c5d" dependencies = [ "cairo-rs", "field-offset", @@ -758,9 +818,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" +checksum = "188211f546ce5801f6d0245c37b6249143a2cb4fa040e54829ca1e76796e9f09" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -770,9 +830,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -812,12 +872,6 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -826,9 +880,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "home" @@ -899,6 +953,23 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.6.0" @@ -1002,9 +1073,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -1014,11 +1085,10 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libadwaita" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" dependencies = [ - "gdk-pixbuf", "gdk4", "gio", "glib", @@ -1030,9 +1100,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" dependencies = [ "gdk4-sys", "gio-sys", @@ -1052,9 +1122,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" -version = "0.16.2+1.7.2" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -1074,17 +1144,31 @@ dependencies = [ "winapi", ] +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.5", +] + [[package]] name = "libmonado-rs" version = "0.1.0" -source = "git+https://github.com/technobaboo/libmonado-rs?rev=e32e78c79ce9ec4a5a5de9eff30661c6c4307347#e32e78c79ce9ec4a5a5de9eff30661c6c4307347" +source = "git+https://github.com/technobaboo/libmonado-rs?rev=6edb1163627d87db9904c57d7ed9dd4dcc7228b7#6edb1163627d87db9904c57d7ed9dd4dcc7228b7" dependencies = [ "bindgen", "cmake", "convert_case", "dlopen2", "flagset", + "mint", "semver", + "serde", + "serde_json", + "xdg", ] [[package]] @@ -1171,9 +1255,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1205,15 +1289,22 @@ dependencies = [ "adler", ] +[[package]] +name = "mint" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1243,13 +1334,19 @@ dependencies = [ "tempfile", ] +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + [[package]] name = "nix" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -1265,16 +1362,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "objc" version = "0.2.7" @@ -1325,7 +1412,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1363,11 +1450,30 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "openxr" +version = "0.18.0" +source = "git+https://github.com/galister/openxrs?rev=af4a55d#af4a55df60125491c80c61464c824219c6019b76" +dependencies = [ + "libc", + "libloading 0.8.5", + "ndk-context", + "openxr-sys", +] + +[[package]] +name = "openxr-sys" +version = "0.10.0" +source = "git+https://github.com/galister/openxrs?rev=af4a55d#af4a55df60125491c80c61464c824219c6019b76" +dependencies = [ + "libc", +] + [[package]] name = "pango" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" +checksum = "54768854025df6903061d0084fd9702a253ddfd60db7d9b751d43b76689a7f0a" dependencies = [ "gio", "glib", @@ -1377,9 +1483,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.5" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" +checksum = "b07cc57d10cee4ec661f718a6902cee18c2f4cfae08e87e5a390525946913390" dependencies = [ "glib-sys", "gobject-sys", @@ -1393,47 +1499,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - [[package]] name = "pin-project" version = "1.1.5" @@ -1499,18 +1564,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1585,9 +1650,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "relm4" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e0e187b58db367305e8486d3228158251da1c8ba1e18baa9de61894e822649" +checksum = "cf0363f92b6a7eefd985b47f27b7ae168dd2fd5cd4013a338c9b111c33744d1f" dependencies = [ "flume", "fragile", @@ -1595,6 +1660,7 @@ dependencies = [ "gtk4", "libadwaita", "once_cell", + "relm4-css", "relm4-macros", "tokio", "tracing", @@ -1602,20 +1668,26 @@ dependencies = [ [[package]] name = "relm4-components" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffcb6431605810fca4430b3da5d496fcf67d39f32db6a2799bcaac27469154b9" +checksum = "fb3d67f2982131c5e6047af4278d8fe750266767e57b58bc15f2e11e190eef36" dependencies = [ "once_cell", "relm4", "tracker", ] +[[package]] +name = "relm4-css" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3b924557df1cddc687b60b313c4b76620fdbf0e463afa4b29f67193ccf37f9" + [[package]] name = "relm4-macros" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0774e846889823aa5766f5b62cface3189a5b36280e65b2faaa6df0319da1726" +checksum = "fc5885640821d60062497737dd42fd04248d13c7ecccee620caaa4b210fe9905" dependencies = [ "proc-macro2", "quote", @@ -1624,9 +1696,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "base64", "bytes", @@ -1639,6 +1711,7 @@ dependencies = [ "http-body", "http-body-util", "hyper", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -1665,6 +1738,21 @@ dependencies = [ "winreg", ] +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + [[package]] name = "rusb" version = "0.9.4" @@ -1702,13 +1790,26 @@ version = "0.38.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", "windows-sys 0.48.0", ] +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + [[package]] name = "rustls-pemfile" version = "2.1.2" @@ -1725,6 +1826,17 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "ryu" version = "1.0.15" @@ -1777,18 +1889,18 @@ checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -1797,9 +1909,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -1808,9 +1920,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -1827,6 +1939,17 @@ dependencies = [ "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 = "shlex" version = "1.2.0" @@ -1834,10 +1957,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] -name = "siphasher" -version = "0.3.11" +name = "signal-hook-registry" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] [[package]] name = "slab" @@ -1873,11 +1999,17 @@ dependencies = [ "lock_api", ] +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "syn" -version = "2.0.37" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -1886,9 +2018,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "system-configuration" @@ -1913,12 +2045,12 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.1" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" dependencies = [ "cfg-expr", - "heck 0.4.1", + "heck", "pkg-config", "toml", "version-compare", @@ -1986,18 +2118,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", + "signal-hook-registry", "socket2", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2010,6 +2142,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.9" @@ -2026,14 +2169,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.19.15", + "toml_edit 0.22.16", ] [[package]] @@ -2047,26 +2190,26 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", - "serde", - "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.15", ] [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" dependencies = [ "indexmap", + "serde", + "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.16", ] [[package]] @@ -2129,18 +2272,18 @@ dependencies = [ [[package]] name = "tracker" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff9636d15e370187f6bf55b79ce62ebf4221998bc0ba1774d7fa208b007f6bf8" +checksum = "ce5c98457ff700aaeefcd4a4a492096e78a2af1dd8523c66e94a3adb0fdbd415" dependencies = [ "tracker-macros", ] [[package]] name = "tracker-macros" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca029746fbe0efda3298205de77bf759d7fef23ac97902641e0b49a623b0455f" +checksum = "dc19eb2373ccf3d1999967c26c3d44534ff71ae5d8b9dacf78f4b13132229e48" dependencies = [ "proc-macro2", "quote", @@ -2153,6 +2296,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + [[package]] name = "unicode-bidi" version = "0.3.13" @@ -2180,6 +2329,12 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.1" @@ -2193,9 +2348,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "rand", @@ -2209,15 +2364,21 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vte4" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666a15c7ac6316a3c1bf8c5bc30d687e7405a8cba120c50569a7adeeabbbd1c6" +checksum = "7759016227e58e3239b8dca9c4a70086345844872b1f27cba0dba990fef5cb44" dependencies = [ "cairo-rs", "gdk4", @@ -2232,9 +2393,9 @@ dependencies = [ [[package]] name = "vte4-sys" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d893a06a0907d5b843f34400ff0a7990332011e53faa7435635f0b12aacc3f88" +checksum = "2c1aa57d29283c6eeac2e34c16791436275d254ac02b8590b02698feef197234" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -2519,6 +2680,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.52.0" @@ -2528,3 +2698,15 @@ dependencies = [ "cfg-if", "windows-sys 0.48.0", ] + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index 136491c5c1423..732af75ddd013 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -1,42 +1,43 @@ { - lib, - stdenv, - fetchFromGitLab, - writeScript, appstream-glib, - cargo, - meson, - ninja, - pkg-config, - rustPlatform, - rustc, - wrapGAppsHook4, cairo, + cargo, desktop-file-utils, + fetchFromGitLab, gdb, gdk-pixbuf, + git, glib, gtk4, gtksourceview5, + lib, libadwaita, libgit2, libusb1, + meson, + ninja, + nix-update-script, openssl, + openxr-loader, pango, + pkg-config, + rustPlatform, + rustc, + stdenv, vte-gtk4, + wrapGAppsHook4, zlib, - unstableGitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "envision-unwrapped"; - version = "0-unstable-2024-07-03"; + version = "0-unstable-2024-09-28"; src = fetchFromGitLab { owner = "gabmus"; repo = "envision"; - rev = "6cf5e40b96d1cbd99a3cfcef1f03899356e79448"; - hash = "sha256-a/IUNGoq9OKEC3uCg6PUp2TRHkfm4mTT3QQ8SfA29RU="; + rev = "56d500a9f914ce2ddad038223711192e4d1dcbe1"; + hash = "sha256-8wU2sjhH026l6a11XZ5Qdu5x/EbI+ZqwE7AixsYMCFk="; }; strictDeps = true; @@ -44,7 +45,8 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "libmonado-rs-0.1.0" = "sha256-PsNgfpgso3HhIMXKky/u6Xw8phk1isRpNXKLhvN1wIE="; + "libmonado-rs-0.1.0" = "sha256-xztevBUaYBm5G3A0ZTb+3GV3g1IAU3SzfSS5BBqfp1Y="; + "openxr-0.18.0" = "sha256-ktkbhmExstkNJDYM/HYOwAwv3acex7P9SP0KMAOKhQk="; }; }; @@ -52,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { appstream-glib desktop-file-utils cargo + git meson ninja pkg-config @@ -70,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: { libgit2 libusb1 openssl + openxr-loader pango vte-gtk4 zlib @@ -80,11 +84,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH : "${lib.makeBinPath [ gdb ]}" ''; - passthru.updateScript = writeScript "envision-update" '' - source ${builtins.head (unstableGitUpdater { })} - - cp $tmpdir/Cargo.lock ./pkgs/by-name/en/envision-unwrapped/Cargo.lock - ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; }; meta = { description = "UI for building, configuring and running Monado, the open source OpenXR runtime"; diff --git a/pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch similarity index 100% rename from pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch rename to pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch diff --git a/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch similarity index 100% rename from pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch rename to pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch diff --git a/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch similarity index 100% rename from pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch rename to pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch diff --git a/pkgs/by-name/en/envoy/package.nix b/pkgs/by-name/en/envoy/package.nix new file mode 100644 index 0000000000000..b6a0b7701410c --- /dev/null +++ b/pkgs/by-name/en/envoy/package.nix @@ -0,0 +1,210 @@ +{ + lib, + bazel_6, + bazel-gazelle, + buildBazelPackage, + fetchFromGitHub, + stdenv, + cmake, + gn, + go, + jdk, + ninja, + patchelf, + python3, + linuxHeaders, + nixosTests, + + # v8 (upstream default), wavm, wamr, wasmtime, disabled + wasmRuntime ? "wamr", +}: + +let + srcVer = { + # We need the commit hash, since Bazel stamps the build with it. + # However, the version string is more useful for end-users. + # These are contained in a attrset of their own to make it obvious that + # people should update both. + version = "1.31.2"; + rev = "cc4a75482810de4b84c301d13deb551bd3147339"; + hash = "sha256-mfQpEGLMJV3UKqcUdbhy6/pP1sWut26zjwN6vDE7LmA="; + }; + + # these need to be updated for any changes to fetchAttrs + depsHash = + { + x86_64-linux = "sha256-9KXZdSvRfi5mWOSotG//+ljsx64I4bYwzbeQFuCIwDE="; + aarch64-linux = "sha256-knrCfUYUL+bYuHSNrNeX3SwoGDf2rLYNXuukEmj4BjA="; + } + .${stdenv.system} or (throw "unsupported system ${stdenv.system}"); +in +buildBazelPackage { + pname = "envoy"; + inherit (srcVer) version; + bazel = bazel_6; + src = fetchFromGitHub { + owner = "envoyproxy"; + repo = "envoy"; + inherit (srcVer) hash rev; + + postFetch = '' + chmod -R +w $out + rm $out/.bazelversion + echo ${srcVer.rev} > $out/SOURCE_VERSION + ''; + }; + + postPatch = '' + sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch + sed -i '/javabase=/d' .bazelrc + sed -i '/"-Werror"/d' bazel/envoy_internal.bzl + ''; + + patches = [ + # use system Python, not bazel-fetched binary Python + ./0001-nixpkgs-use-system-Python.patch + + # use system Go, not bazel-fetched binary Go + ./0002-nixpkgs-use-system-Go.patch + + # use system C/C++ tools + ./0003-nixpkgs-use-system-C-C-toolchains.patch + ]; + + nativeBuildInputs = [ + cmake + python3 + gn + go + jdk + ninja + patchelf + ]; + + buildInputs = [ linuxHeaders ]; + + fetchAttrs = { + sha256 = depsHash; + dontUseCmakeConfigure = true; + dontUseGnConfigure = true; + preInstall = '' + # Strip out the path to the build location (by deleting the comment line). + find $bazelOut/external -name requirements.bzl | while read requirements; do + sed -i '/# Generated from /d' "$requirements" + done + + # Remove references to paths in the Nix store. + sed -i \ + -e 's,${python3},__NIXPYTHON__,' \ + -e 's,${stdenv.shellPackage},__NIXSHELL__,' \ + $bazelOut/external/com_github_luajit_luajit/build.py \ + $bazelOut/external/local_config_sh/BUILD \ + $bazelOut/external/*_pip3/BUILD.bazel + + rm -r $bazelOut/external/go_sdk + rm -r $bazelOut/external/local_jdk + rm -r $bazelOut/external/bazel_gazelle_go_repository_tools/bin + + # Remove compiled python + find $bazelOut -name '*.pyc' -delete + + # Remove Unix timestamps from go cache. + rm -rf $bazelOut/external/bazel_gazelle_go_repository_cache/{gocache,pkg/mod/cache,pkg/sumdb} + + # fix tcmalloc failure https://github.com/envoyproxy/envoy/issues/30838 + sed -i '/TCMALLOC_GCC_FLAGS = \[/a"-Wno-changes-meaning",' $bazelOut/external/com_github_google_tcmalloc/tcmalloc/copts.bzl + ''; + }; + buildAttrs = { + dontUseCmakeConfigure = true; + dontUseGnConfigure = true; + dontUseNinjaInstall = true; + preConfigure = '' + # Make executables work, for the most part. + find $bazelOut/external -type f -executable | while read execbin; do + file "$execbin" | grep -q ': ELF .*, dynamically linked,' || continue + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + "$execbin" + done + + ln -s ${bazel-gazelle}/bin $bazelOut/external/bazel_gazelle_go_repository_tools/bin + + sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/foreign_cc/private/framework/toolchains/linux_commands.bzl + + # Add paths to Nix store back. + sed -i \ + -e 's,__NIXPYTHON__,${python3},' \ + -e 's,__NIXSHELL__,${stdenv.shellPackage},' \ + $bazelOut/external/com_github_luajit_luajit/build.py \ + $bazelOut/external/local_config_sh/BUILD \ + $bazelOut/external/*_pip3/BUILD.bazel + ''; + installPhase = '' + install -Dm0755 bazel-bin/source/exe/envoy-static $out/bin/envoy + ''; + }; + + removeRulesCC = false; + removeLocalConfigCc = true; + removeLocal = false; + bazelTargets = [ "//source/exe:envoy-static" ]; + bazelBuildFlags = + [ + "-c opt" + "--spawn_strategy=standalone" + "--noexperimental_strict_action_env" + "--cxxopt=-Wno-error" + "--linkopt=-Wl,-z,noexecstack" + + # Force use of system Java. + "--extra_toolchains=@local_jdk//:all" + "--java_runtime_version=local_jdk" + "--tool_java_runtime_version=local_jdk" + + # undefined reference to 'grpc_core::*Metadata*::*Memento* + # + # During linking of the final binary, we see undefined references to grpc_core related symbols. + # The missing symbols would be instantiations of a template class from https://github.com/grpc/grpc/blob/v1.59.4/src/core/lib/transport/metadata_batch.h + # "ParseMemento" and "MementoToValue" are only implemented for some types + # and appear unused and unimplemented for the undefined cases reported by the linker. + "--linkopt=-Wl,--unresolved-symbols=ignore-in-object-files" + + "--define=wasm=${wasmRuntime}" + ] + ++ (lib.optionals stdenv.hostPlatform.isAarch64 [ + # external/com_github_google_tcmalloc/tcmalloc/internal/percpu_tcmalloc.h:611:9: error: expected ':' or '::' before '[' token + # 611 | : [end_ptr] "=&r"(end_ptr), [cpu_id] "=&r"(cpu_id), + # | ^ + "--define=tcmalloc=disabled" + ]); + + bazelFetchFlags = [ + "--define=wasm=${wasmRuntime}" + + # https://github.com/bazelbuild/rules_go/issues/3844 + "--repo_env=GOPROXY=https://proxy.golang.org,direct" + "--repo_env=GOSUMDB=sum.golang.org" + ]; + + requiredSystemFeatures = [ "big-parallel" ]; + + passthru.tests = { + envoy = nixosTests.envoy; + # tested as a core component of Pomerium + pomerium = nixosTests.pomerium; + }; + + meta = with lib; { + homepage = "https://envoyproxy.io"; + changelog = "https://github.com/envoyproxy/envoy/releases/tag/v${version}"; + description = "Cloud-native edge and service proxy"; + mainProgram = "envoy"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +} diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix index 9ef4b303828bd..43973562e9862 100644 --- a/pkgs/by-name/eo/eog/package.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/eog/${lib.versions.major version}/eog-${version}.tar.xz"; - sha256 = "sha256-tQ8yHHCsZK97yqW0Rg3GdbPKYP2tOFYW86x7dw4GZv4="; + hash = "sha256-tQ8yHHCsZK97yqW0Rg3GdbPKYP2tOFYW86x7dw4GZv4="; }; patches = [ @@ -118,6 +118,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME image viewer"; homepage = "https://gitlab.gnome.org/GNOME/eog"; + changelog = "https://gitlab.gnome.org/GNOME/eog/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/pkgs/by-name/ep/epoll-shim/package.nix b/pkgs/by-name/ep/epoll-shim/package.nix index bbb49c8ec7c02..63deaaf9df9ed 100644 --- a/pkgs/by-name/ep/epoll-shim/package.nix +++ b/pkgs/by-name/ep/epoll-shim/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/jiixyj/epoll-shim/issues/41 # https://github.com/jiixyj/epoll-shim/pull/34 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Small epoll implementation using kqueue"; diff --git a/pkgs/by-name/er/era/package.nix b/pkgs/by-name/er/era/package.nix new file mode 100644 index 0000000000000..cbe15bd7b47e3 --- /dev/null +++ b/pkgs/by-name/er/era/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + deno, + makeWrapper, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "era"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "kyoheiu"; + repo = "era"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-OOPVLY9kg4TmKSrpHgsOmAmeDPbX5df0bX51lA6DvcY="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + cp -r $src/{src,LICENSE,README.md} $out/lib + makeWrapper ${lib.getExe deno} $out/bin/era \ + --set DENO_NO_UPDATE_CHECK "1" \ + --add-flags "run -A $out/lib/src/main.ts" + + runHook postInstall + ''; + + meta = { + description = "Rainy clock in your terminal"; + homepage = "https://github.com/kyoheiu/era"; + changelog = "https://github.com/kyoheiu/era/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "era"; + inherit (deno.meta) platforms; + }; +}) diff --git a/pkgs/by-name/er/eris-go/package.nix b/pkgs/by-name/er/eris-go/package.nix index 7787f345c31ea..3e05cc65d3513 100644 --- a/pkgs/by-name/er/eris-go/package.nix +++ b/pkgs/by-name/er/eris-go/package.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "eris-go"; - version = "20240826"; + version = "20240920"; outputs = [ "out" "man" ]; src = fetchFromGitea { @@ -10,7 +10,7 @@ buildGoModule rec { owner = "eris"; repo = "eris-go"; rev = version; - hash = "sha256-qw3HdHtyMuWqwkuGzVzQ8bXnXlJJPDpiYrQZb0lIYj8="; + hash = "sha256-ZC4MBt1ucbZOn3sgs2xEiLLSDq7mz5Nj/in/TzydAbk="; }; vendorHash = "sha256-TnB4BSO2Yb9AtcHgdEgNrFHAQJ7u4IzmhLdcSjbZ7SA="; diff --git a/pkgs/by-name/es/eslint/package-lock.json b/pkgs/by-name/es/eslint/package-lock.json index 13028885985cb..071051a7aee9c 100644 --- a/pkgs/by-name/es/eslint/package-lock.json +++ b/pkgs/by-name/es/eslint/package-lock.json @@ -1,19 +1,20 @@ { "name": "eslint", - "version": "9.9.1", + "version": "9.10.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "eslint", - "version": "9.9.1", + "version": "9.10.0", "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.11.0", "@eslint/config-array": "^0.18.0", "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.9.1", + "@eslint/js": "9.10.0", + "@eslint/plugin-kit": "^0.1.0", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.3.0", "@nodelib/fs.walk": "^1.2.8", @@ -36,7 +37,6 @@ "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", @@ -50,10 +50,11 @@ "devDependencies": { "@babel/core": "^7.4.3", "@babel/preset-env": "^7.4.3", - "@eslint/core": "^0.4.0", - "@eslint/json": "^0.3.0", + "@eslint/core": "^0.5.0", + "@eslint/json": "^0.4.0", "@trunkio/launcher": "^1.3.0", "@types/estree": "^1.0.5", + "@types/json-schema": "^7.0.15", "@types/node": "^20.11.5", "@wdio/browser-runner": "^9.0.5", "@wdio/cli": "^9.0.5", @@ -131,6 +132,7 @@ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" @@ -144,6 +146,7 @@ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/highlight": "^7.24.7", "picocolors": "^1.0.0" @@ -157,6 +160,7 @@ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz", "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -166,6 +170,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", "dev": true, + "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.24.7", @@ -196,17 +201,19 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/generator": { - "version": "7.25.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.5.tgz", - "integrity": "sha512-abd43wyLfbWoxC6ahM8xTkqLpGB2iWBVyuKC9/srhFunCd1SDNrV1s72bBpK4hLj8KLzHBBcOblvLQZBNw9r3w==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", + "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.25.4", + "@babel/types": "^7.25.6", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -220,6 +227,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz", "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.24.7" }, @@ -232,6 +240,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz", "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/traverse": "^7.24.7", "@babel/types": "^7.24.7" @@ -245,6 +254,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/compat-data": "^7.25.2", "@babel/helper-validator-option": "^7.24.8", @@ -261,6 +271,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -270,6 +281,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz", "integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", "@babel/helper-member-expression-to-functions": "^7.24.8", @@ -291,6 +303,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -300,6 +313,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz", "integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", "regexpu-core": "^5.3.1", @@ -317,6 +331,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -326,6 +341,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz", "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-compilation-targets": "^7.22.6", "@babel/helper-plugin-utils": "^7.22.5", @@ -342,6 +358,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz", "integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/traverse": "^7.24.8", "@babel/types": "^7.24.8" @@ -355,6 +372,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/traverse": "^7.24.7", "@babel/types": "^7.24.7" @@ -368,6 +386,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.24.7", "@babel/helper-simple-access": "^7.24.7", @@ -386,6 +405,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz", "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.24.7" }, @@ -398,6 +418,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz", "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -407,6 +428,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz", "integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", "@babel/helper-wrap-function": "^7.25.0", @@ -424,6 +446,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz", "integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-member-expression-to-functions": "^7.24.8", "@babel/helper-optimise-call-expression": "^7.24.7", @@ -441,6 +464,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/traverse": "^7.24.7", "@babel/types": "^7.24.7" @@ -454,6 +478,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz", "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/traverse": "^7.24.7", "@babel/types": "^7.24.7" @@ -467,6 +492,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -476,6 +502,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -485,6 +512,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -494,6 +522,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz", "integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/template": "^7.25.0", "@babel/traverse": "^7.25.0", @@ -504,13 +533,14 @@ } }, "node_modules/@babel/helpers": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz", - "integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", + "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", "dev": true, + "license": "MIT", "dependencies": { "@babel/template": "^7.25.0", - "@babel/types": "^7.25.0" + "@babel/types": "^7.25.6" }, "engines": { "node": ">=6.9.0" @@ -521,6 +551,7 @@ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.24.7", "chalk": "^2.4.2", @@ -536,6 +567,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^1.9.0" }, @@ -548,6 +580,7 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -562,6 +595,7 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "1.1.3" } @@ -570,13 +604,15 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@babel/highlight/node_modules/escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.0" } @@ -586,6 +622,7 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -595,6 +632,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -603,12 +641,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.4.tgz", - "integrity": "sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", + "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.25.4" + "@babel/types": "^7.25.6" }, "bin": { "parser": "bin/babel-parser.js" @@ -622,6 +661,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz", "integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8", "@babel/traverse": "^7.25.3" @@ -638,6 +678,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz", "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8" }, @@ -653,6 +694,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz", "integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8" }, @@ -668,6 +710,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz", "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", @@ -685,6 +728,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz", "integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8", "@babel/traverse": "^7.25.0" @@ -701,6 +745,7 @@ "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==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" }, @@ -713,6 +758,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -725,6 +771,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" }, @@ -737,6 +784,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -752,6 +800,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -764,6 +813,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.3" }, @@ -772,12 +822,13 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz", - "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz", + "integrity": "sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -787,12 +838,13 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz", - "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz", + "integrity": "sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" @@ -806,6 +858,7 @@ "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==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -818,6 +871,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -830,6 +884,7 @@ "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==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -842,6 +897,7 @@ "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==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -854,6 +910,7 @@ "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==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -866,6 +923,7 @@ "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==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -878,6 +936,7 @@ "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==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -890,6 +949,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -902,6 +962,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -917,6 +978,7 @@ "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==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -932,6 +994,7 @@ "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==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.18.6", "@babel/helper-plugin-utils": "^7.18.6" @@ -948,6 +1011,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz", "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" }, @@ -963,6 +1027,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz", "integrity": "sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8", "@babel/helper-remap-async-to-generator": "^7.25.0", @@ -981,6 +1046,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz", "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.24.7", "@babel/helper-plugin-utils": "^7.24.7", @@ -998,6 +1064,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz", "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" }, @@ -1013,6 +1080,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz", "integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8" }, @@ -1028,6 +1096,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz", "integrity": "sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.25.4", "@babel/helper-plugin-utils": "^7.24.8" @@ -1044,6 +1113,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz", "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.24.7", "@babel/helper-plugin-utils": "^7.24.7", @@ -1061,6 +1131,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz", "integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", "@babel/helper-compilation-targets": "^7.25.2", @@ -1081,6 +1152,7 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -1090,6 +1162,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz", "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "@babel/template": "^7.24.7" @@ -1106,6 +1179,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz", "integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8" }, @@ -1121,6 +1195,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz", "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.24.7", "@babel/helper-plugin-utils": "^7.24.7" @@ -1137,6 +1212,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz", "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" }, @@ -1152,6 +1228,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz", "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.25.0", "@babel/helper-plugin-utils": "^7.24.8" @@ -1168,6 +1245,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz", "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-dynamic-import": "^7.8.3" @@ -1184,6 +1262,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz", "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7", "@babel/helper-plugin-utils": "^7.24.7" @@ -1200,6 +1279,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz", "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-export-namespace-from": "^7.8.3" @@ -1216,6 +1296,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz", "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" @@ -1232,6 +1313,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz", "integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-compilation-targets": "^7.24.8", "@babel/helper-plugin-utils": "^7.24.8", @@ -1249,6 +1331,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz", "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-json-strings": "^7.8.3" @@ -1265,6 +1348,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz", "integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8" }, @@ -1280,6 +1364,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz", "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" @@ -1296,6 +1381,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz", "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" }, @@ -1311,6 +1397,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz", "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.24.7", "@babel/helper-plugin-utils": "^7.24.7" @@ -1327,6 +1414,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz", "integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.24.8", "@babel/helper-plugin-utils": "^7.24.8", @@ -1344,6 +1432,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz", "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.25.0", "@babel/helper-plugin-utils": "^7.24.8", @@ -1362,6 +1451,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz", "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.24.7", "@babel/helper-plugin-utils": "^7.24.7" @@ -1378,6 +1468,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz", "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.24.7", "@babel/helper-plugin-utils": "^7.24.7" @@ -1394,6 +1485,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz", "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" }, @@ -1409,6 +1501,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz", "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" @@ -1425,6 +1518,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz", "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-numeric-separator": "^7.10.4" @@ -1441,6 +1535,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz", "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-compilation-targets": "^7.24.7", "@babel/helper-plugin-utils": "^7.24.7", @@ -1459,6 +1554,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz", "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "@babel/helper-replace-supers": "^7.24.7" @@ -1475,6 +1571,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz", "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" @@ -1491,6 +1588,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz", "integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8", "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", @@ -1508,6 +1606,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" }, @@ -1523,6 +1622,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz", "integrity": "sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.25.4", "@babel/helper-plugin-utils": "^7.24.8" @@ -1539,6 +1639,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz", "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.24.7", "@babel/helper-create-class-features-plugin": "^7.24.7", @@ -1557,6 +1658,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz", "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" }, @@ -1572,6 +1674,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz", "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "regenerator-transform": "^0.15.2" @@ -1588,6 +1691,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz", "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" }, @@ -1603,6 +1707,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz", "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" }, @@ -1618,6 +1723,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz", "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7", "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7" @@ -1634,6 +1740,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz", "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" }, @@ -1649,6 +1756,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz", "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" }, @@ -1664,6 +1772,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz", "integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.8" }, @@ -1679,6 +1788,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz", "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.24.7" }, @@ -1694,6 +1804,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz", "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.24.7", "@babel/helper-plugin-utils": "^7.24.7" @@ -1710,6 +1821,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz", "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.24.7", "@babel/helper-plugin-utils": "^7.24.7" @@ -1726,6 +1838,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz", "integrity": "sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.25.2", "@babel/helper-plugin-utils": "^7.24.8" @@ -1742,6 +1855,7 @@ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz", "integrity": "sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/compat-data": "^7.25.4", "@babel/helper-compilation-targets": "^7.25.2", @@ -1839,6 +1953,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -1848,6 +1963,7 @@ "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", "@babel/types": "^7.4.4", @@ -1861,13 +1977,15 @@ "version": "0.8.0", "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@babel/runtime": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.4.tgz", - "integrity": "sha512-DSgLeL/FNcpXuzav5wfYvHCGvynXkJbn3Zvc3823AEe9nPwW9IK4UoCSS5yGymmQzN0pCPvivtgS6/8U2kkm1w==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz", + "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==", "dev": true, + "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -1876,10 +1994,11 @@ } }, "node_modules/@babel/standalone": { - "version": "7.25.5", - "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.25.5.tgz", - "integrity": "sha512-46bI7GJHwgWfWszOWMvJIsJjXd+LBMIlaiw4R54+b7GvDfxTVE6ytsqR8uEiI/zYECoB33ChwfN0wq/MLHLFXg==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.25.6.tgz", + "integrity": "sha512-Kf2ZcZVqsKbtYhlA7sP0z5A3q5hmCVYMKMWRWNK/5OVwHIve3JY1djVRmIVAx8FMueLIfZGKQDIILK2w8zO4mg==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=6.9.0" @@ -1890,6 +2009,7 @@ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.24.7", "@babel/parser": "^7.25.0", @@ -1900,16 +2020,17 @@ } }, "node_modules/@babel/traverse": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.4.tgz", - "integrity": "sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", + "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.4", - "@babel/parser": "^7.25.4", + "@babel/generator": "^7.25.6", + "@babel/parser": "^7.25.6", "@babel/template": "^7.25.0", - "@babel/types": "^7.25.4", + "@babel/types": "^7.25.6", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -1922,15 +2043,17 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/@babel/types": { - "version": "7.25.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.4.tgz", - "integrity": "sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", + "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.24.8", "@babel/helper-validator-identifier": "^7.24.7", @@ -1944,13 +2067,15 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.0.0" } @@ -1960,6 +2085,7 @@ "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.46.0.tgz", "integrity": "sha512-C3Axuq1xd/9VqFZpW4YAzOx5O9q/LP46uIQy/iNDpHG3fmPa6TBtvfglMCs3RBiBxAIi0Go97r8+jvTt55XMyQ==", "dev": true, + "license": "MIT", "dependencies": { "comment-parser": "1.4.1", "esquery": "^1.6.0", @@ -1969,503 +2095,964 @@ "node": ">=16" } }, - "node_modules/@esbuild/linux-x64": { + "node_modules/@esbuild/aix-ppc64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz", + "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", - "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "cpu": [ - "x64" + "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ - "linux" + "android" ], "peer": true, "engines": { "node": ">=12" } }, - "node_modules/@eslint-community/eslint-plugin-eslint-comments": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-4.4.0.tgz", - "integrity": "sha512-yljsWl5Qv3IkIRmJ38h3NrHXFCm4EUl55M8doGTF6hvzvFF8kRpextgSrg2dwHev9lzBZyafCr9RelGIyQm6fw==", + "node_modules/@esbuild/android-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "cpu": [ + "arm64" + ], "dev": true, - "dependencies": { - "escape-string-regexp": "^4.0.0", - "ignore": "^5.2.4" - }, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "peer": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0" + "node": ">=12" } }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, + "node_modules/@esbuild/android-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "peer": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + "node": ">=12" } }, - "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "node_modules/@esbuild/darwin-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "peer": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "node": ">=12" } }, - "node_modules/@eslint-community/regexpp": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", - "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "node_modules/@esbuild/darwin-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "peer": true, "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + "node": ">=12" } }, - "node_modules/@eslint/config-array": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", - "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==", - "dependencies": { - "@eslint/object-schema": "^2.1.4", - "debug": "^4.3.1", - "minimatch": "^3.1.2" - }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "peer": true, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=12" } }, - "node_modules/@eslint/core": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.4.0.tgz", - "integrity": "sha512-dJzhhN5oSbpaoFWmfA1iEBTINf7gYyt3ZNjqDm0xw1UMz6QlA1YjcclWhPhGQSR1XbwAIon00y259kaBmjFgNg==", - "dev": true, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "peer": true, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=12" } }, - "node_modules/@eslint/eslintrc": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", - "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^10.0.1", - "globals": "^14.0.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, + "node_modules/@esbuild/linux-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "node": ">=12" } }, - "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==", + "node_modules/@esbuild/linux-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=12" } }, - "node_modules/@eslint/js": { - "version": "9.9.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz", - "integrity": "sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==", + "node_modules/@esbuild/linux-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=12" } }, - "node_modules/@eslint/json": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@eslint/json/-/json-0.3.0.tgz", - "integrity": "sha512-fdih4NZ6sGMI3YFZUqShMJ/AWvDzDrNepqDlTwRQUfgR434jmajVYIMNc2Vs2M2cHjxZpcHG6FRsrxuiwYvprA==", + "node_modules/@esbuild/linux-loong64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "cpu": [ + "loong64" + ], "dev": true, - "dependencies": { - "@humanwhocodes/momoa": "^3.2.0" - }, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "peerDependencies": { - "eslint": "^9.6.0" + "node": ">=12" } }, - "node_modules/@eslint/object-schema": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", - "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "node_modules/@esbuild/linux-mips64el": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=12" } }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "node_modules/@esbuild/linux-ppc64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" + "node": ">=12" } }, - "node_modules/@humanwhocodes/momoa": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/momoa/-/momoa-3.2.0.tgz", - "integrity": "sha512-xvLEGSmd8qxcqlKFnTxdnmqQFsYGC4GhpuhHgdFoZBV9zxvmSlTuasj2D3vei3IsBGmjP/ITwPFejNAG/w+jsw==", + "node_modules/@esbuild/linux-riscv64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "cpu": [ + "riscv64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@humanwhocodes/retry": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", - "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "node_modules/@esbuild/linux-s390x": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" + "node": ">=12" } }, - "node_modules/@inquirer/checkbox": { - "version": "2.4.7", - "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.4.7.tgz", - "integrity": "sha512-5YwCySyV1UEgqzz34gNsC38eKxRBtlRDpJLlKcRtTjlYA/yDKuc1rfw+hjw+2WJxbAZtaDPsRl5Zk7J14SBoBw==", + "node_modules/@esbuild/linux-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.2", - "ansi-escapes": "^4.3.2", - "yoctocolors-cjs": "^2.1.2" - }, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@inquirer/confirm": { - "version": "3.1.22", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.22.tgz", - "integrity": "sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==", + "node_modules/@esbuild/netbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2" - }, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "peer": true, "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@inquirer/core": { - "version": "9.0.10", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.0.10.tgz", - "integrity": "sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA==", + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz", + "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==", + "cpu": [ + "arm64" + ], "dev": true, - "dependencies": { - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.2", - "@types/mute-stream": "^0.0.4", - "@types/node": "^22.1.0", - "@types/wrap-ansi": "^3.0.0", - "ansi-escapes": "^4.3.2", - "cli-spinners": "^2.9.2", - "cli-width": "^4.1.0", - "mute-stream": "^1.0.0", - "signal-exit": "^4.1.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^6.2.0", - "yoctocolors-cjs": "^2.1.2" - }, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], "engines": { "node": ">=18" } }, - "node_modules/@inquirer/core/node_modules/@types/node": { - "version": "22.5.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.1.tgz", - "integrity": "sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==", + "node_modules/@esbuild/openbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "undici-types": "~6.19.2" + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "peer": true, + "engines": { + "node": ">=12" } }, - "node_modules/@inquirer/core/node_modules/cli-spinners": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", - "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "node_modules/@esbuild/sunos-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "cpu": [ + "x64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "peer": true, "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=12" } }, - "node_modules/@inquirer/editor": { - "version": "2.1.22", - "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.1.22.tgz", - "integrity": "sha512-K1QwTu7GCK+nKOVRBp5HY9jt3DXOfPGPr6WRDrPImkcJRelG9UTx2cAtK1liXmibRrzJlTWOwqgWT3k2XnS62w==", + "node_modules/@esbuild/win32-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "cpu": [ + "arm64" + ], "dev": true, - "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2", - "external-editor": "^3.1.0" - }, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "peer": true, "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@inquirer/expand": { - "version": "2.1.22", - "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.1.22.tgz", - "integrity": "sha512-wTZOBkzH+ItPuZ3ZPa9lynBsdMp6kQ9zbjVPYEtSBG7UulGjg2kQiAnUjgyG4SlntpTce5bOmXAPvE4sguXjpA==", + "node_modules/@esbuild/win32-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "cpu": [ + "ia32" + ], "dev": true, - "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2", - "yoctocolors-cjs": "^2.1.2" - }, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "peer": true, "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@inquirer/figures": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.5.tgz", - "integrity": "sha512-79hP/VWdZ2UVc9bFGJnoQ/lQMpL74mGgzSYX1xUqCVk7/v73vJCMw1VuyWN1jGkZ9B3z7THAbySqGbCNefcjfA==", + "node_modules/@esbuild/win32-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "cpu": [ + "x64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "peer": true, "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@inquirer/input": { - "version": "2.2.9", - "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.2.9.tgz", - "integrity": "sha512-7Z6N+uzkWM7+xsE+3rJdhdG/+mQgejOVqspoW+w0AbSZnL6nq5tGMEVASaYVWbkoSzecABWwmludO2evU3d31g==", + "node_modules/@eslint-community/eslint-plugin-eslint-comments": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-4.4.0.tgz", + "integrity": "sha512-yljsWl5Qv3IkIRmJ38h3NrHXFCm4EUl55M8doGTF6hvzvFF8kRpextgSrg2dwHev9lzBZyafCr9RelGIyQm6fw==", "dev": true, + "license": "MIT", "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2" + "escape-string-regexp": "^4.0.0", + "ignore": "^5.2.4" }, "engines": { - "node": ">=18" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0" } }, - "node_modules/@inquirer/number": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.0.10.tgz", - "integrity": "sha512-kWTxRF8zHjQOn2TJs+XttLioBih6bdc5CcosXIzZsrTY383PXI35DuhIllZKu7CdXFi2rz2BWPN9l0dPsvrQOA==", - "dev": true, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "license": "MIT", "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2" + "eslint-visitor-keys": "^3.3.0" }, "engines": { - "node": ">=18" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, - "node_modules/@inquirer/password": { - "version": "2.1.22", - "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.1.22.tgz", - "integrity": "sha512-5Fxt1L9vh3rAKqjYwqsjU4DZsEvY/2Gll+QkqR4yEpy6wvzLxdSgFhUcxfDAOtO4BEoTreWoznC0phagwLU5Kw==", - "dev": true, - "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2", - "ansi-escapes": "^4.3.2" + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", + "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "license": "MIT", "engines": { - "node": ">=18" + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, - "node_modules/@inquirer/prompts": { - "version": "5.3.8", - "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.3.8.tgz", - "integrity": "sha512-b2BudQY/Si4Y2a0PdZZL6BeJtl8llgeZa7U2j47aaJSCeAl1e4UI7y8a9bSkO3o/ZbZrgT5muy/34JbsjfIWxA==", - "dev": true, + "node_modules/@eslint/config-array": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", + "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==", + "license": "Apache-2.0", "dependencies": { - "@inquirer/checkbox": "^2.4.7", - "@inquirer/confirm": "^3.1.22", - "@inquirer/editor": "^2.1.22", - "@inquirer/expand": "^2.1.22", - "@inquirer/input": "^2.2.9", - "@inquirer/number": "^1.0.10", - "@inquirer/password": "^2.1.22", - "@inquirer/rawlist": "^2.2.4", - "@inquirer/search": "^1.0.7", - "@inquirer/select": "^2.4.7" + "@eslint/object-schema": "^2.1.4", + "debug": "^4.3.1", + "minimatch": "^3.1.2" }, "engines": { - "node": ">=18" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@inquirer/rawlist": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.2.4.tgz", - "integrity": "sha512-pb6w9pWrm7EfnYDgQObOurh2d2YH07+eDo3xQBsNAM2GRhliz6wFXGi1thKQ4bN6B0xDd6C3tBsjdr3obsCl3Q==", + "node_modules/@eslint/core": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.5.0.tgz", + "integrity": "sha512-d7dQItxTFa0mgeYhU+E1sN28mYYX4Z5FRw0DRszhD8OQr92Tbd00dtSVU/HWj9+Q0iKPQUMtPcExqI/QvkHUow==", "dev": true, - "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2", - "yoctocolors-cjs": "^2.1.2" - }, + "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@inquirer/search": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.0.7.tgz", - "integrity": "sha512-p1wpV+3gd1eST/o5N3yQpYEdFNCzSP0Klrl+5bfD3cTTz8BGG6nf4Z07aBW0xjlKIj1Rp0y3x/X4cZYi6TfcLw==", - "dev": true, + "node_modules/@eslint/eslintrc": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", + "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", + "license": "MIT", "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.2", - "yoctocolors-cjs": "^2.1.2" + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^10.0.1", + "globals": "^14.0.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" }, "engines": { - "node": ">=18" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, - "node_modules/@inquirer/select": { - "version": "2.4.7", - "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.4.7.tgz", - "integrity": "sha512-JH7XqPEkBpNWp3gPCqWqY8ECbyMoFcCZANlL6pV9hf59qK6dGmkOlx1ydyhY+KZ0c5X74+W6Mtp+nm2QX0/MAQ==", - "dev": true, - "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.2", - "ansi-escapes": "^4.3.2", - "yoctocolors-cjs": "^2.1.2" - }, + "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==", + "license": "MIT", "engines": { "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@inquirer/type": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.2.tgz", - "integrity": "sha512-w9qFkumYDCNyDZmNQjf/n6qQuvQ4dMC3BJesY4oF+yr0CxR5vxujflAVeIcS6U336uzi9GM0kAfZlLrZ9UTkpA==", + "node_modules/@eslint/js": { + "version": "9.10.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz", + "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==", + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/json": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@eslint/json/-/json-0.4.0.tgz", + "integrity": "sha512-1yhWrmsE0H97cS9FUEOY81FzndRJ69KmP3E6rjjL0vFq2A5wRM1JAmuZ67q4pFD/Ni3LzlwJ/EfeGiLNiYM9uQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "mute-stream": "^1.0.0" + "@humanwhocodes/momoa": "^3.2.0" }, "engines": { - "node": ">=18" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "peerDependencies": { + "eslint": "^9.6.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==", - "dev": true, + "node_modules/@eslint/object-schema": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", + "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz", + "integrity": "sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==", + "license": "Apache-2.0", "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" + "levn": "^0.4.1" }, "engines": { - "node": ">=12" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "license": "Apache-2.0", "engines": { - "node": ">=12" + "node": ">=12.22" }, "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" + "type": "github", + "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "node_modules/@humanwhocodes/momoa": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/momoa/-/momoa-3.2.1.tgz", + "integrity": "sha512-3l+O+FZENSlXe2qiZcRHr4GlJ9NOG6fibMvOlgwK5Cc0KgfTEh2SQEMKdXVoFFpzDhVG9zXZ6H0jqiVG+UbWow==", "dev": true, + "license": "Apache-2.0", "engines": { - "node": ">=12" + "node": ">=18" + } + }, + "node_modules/@humanwhocodes/retry": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", + "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" }, "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "type": "github", + "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "node_modules/@inquirer/checkbox": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.5.0.tgz", + "integrity": "sha512-sMgdETOfi2dUHT8r7TT1BTKOwNvdDGFDXYWtQ2J69SvlYNntk9I/gJe7r5yvMwwsuKnYbuRs3pNhx4tgNck5aA==", "dev": true, + "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "@inquirer/core": "^9.1.0", + "@inquirer/figures": "^1.0.5", + "@inquirer/type": "^1.5.3", + "ansi-escapes": "^4.3.2", + "yoctocolors-cjs": "^2.1.2" }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" + "node": ">=18" } }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "node_modules/@inquirer/confirm": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.2.0.tgz", + "integrity": "sha512-oOIwPs0Dvq5220Z8lGL/6LHRTEr9TgLHmiI99Rj1PJ1p1czTys+olrgBqZk4E2qC0YTzeHprxSQmoHioVdJ7Lw==", "dev": true, + "license": "MIT", "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3" }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "node": ">=18" } }, - "node_modules/@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "node_modules/@inquirer/core": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.1.0.tgz", + "integrity": "sha512-RZVfH//2ytTjmaBIzeKT1zefcQZzuruwkpTwwbe/i2jTl4o9M+iML5ChULzz6iw1Ok8iUBBsRCjY2IEbD8Ft4w==", "dev": true, + "license": "MIT", "dependencies": { - "camelcase": "^5.3.1", + "@inquirer/figures": "^1.0.5", + "@inquirer/type": "^1.5.3", + "@types/mute-stream": "^0.0.4", + "@types/node": "^22.5.2", + "@types/wrap-ansi": "^3.0.0", + "ansi-escapes": "^4.3.2", + "cli-spinners": "^2.9.2", + "cli-width": "^4.1.0", + "mute-stream": "^1.0.0", + "signal-exit": "^4.1.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^6.2.0", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/core/node_modules/@types/node": { + "version": "22.5.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz", + "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.2" + } + }, + "node_modules/@inquirer/core/node_modules/cli-spinners": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@inquirer/editor": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.2.0.tgz", + "integrity": "sha512-9KHOpJ+dIL5SZli8lJ6xdaYLPPzB8xB9GZItg39MBybzhxA16vxmszmQFrRwbOA918WA2rvu8xhDEg/p6LXKbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3", + "external-editor": "^3.1.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/expand": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.3.0.tgz", + "integrity": "sha512-qnJsUcOGCSG1e5DTOErmv2BPQqrtT6uzqn1vI/aYGiPKq+FgslGZmtdnXbhuI7IlT7OByDoEEqdnhUnVR2hhLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/figures": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.5.tgz", + "integrity": "sha512-79hP/VWdZ2UVc9bFGJnoQ/lQMpL74mGgzSYX1xUqCVk7/v73vJCMw1VuyWN1jGkZ9B3z7THAbySqGbCNefcjfA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/input": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.3.0.tgz", + "integrity": "sha512-XfnpCStx2xgh1LIRqPXrTNEEByqQWoxsWYzNRSEUxJ5c6EQlhMogJ3vHKu8aXuTacebtaZzMAHwEL0kAflKOBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/number": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.1.0.tgz", + "integrity": "sha512-ilUnia/GZUtfSZy3YEErXLJ2Sljo/mf9fiKc08n18DdwdmDbOzRcTv65H1jjDvlsAuvdFXf4Sa/aL7iw/NanVA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/password": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.2.0.tgz", + "integrity": "sha512-5otqIpgsPYIshqhgtEwSspBQE40etouR8VIxzpJkv9i0dVHIpyhiivbkH9/dGiMLdyamT54YRdGJLfl8TFnLHg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3", + "ansi-escapes": "^4.3.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/prompts": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.5.0.tgz", + "integrity": "sha512-BHDeL0catgHdcHbSFFUddNzvx/imzJMft+tWDPwTm3hfu8/tApk1HrooNngB2Mb4qY+KaRWF+iZqoVUPeslEog==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/checkbox": "^2.5.0", + "@inquirer/confirm": "^3.2.0", + "@inquirer/editor": "^2.2.0", + "@inquirer/expand": "^2.3.0", + "@inquirer/input": "^2.3.0", + "@inquirer/number": "^1.1.0", + "@inquirer/password": "^2.2.0", + "@inquirer/rawlist": "^2.3.0", + "@inquirer/search": "^1.1.0", + "@inquirer/select": "^2.5.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/rawlist": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.3.0.tgz", + "integrity": "sha512-zzfNuINhFF7OLAtGHfhwOW2TlYJyli7lOUoJUXw/uyklcwalV6WRXBXtFIicN8rTRK1XTiPWB4UY+YuW8dsnLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/type": "^1.5.3", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/search": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.1.0.tgz", + "integrity": "sha512-h+/5LSj51dx7hp5xOn4QFnUaKeARwUCLs6mIhtkJ0JYPBLmEYjdHSYh7I6GrLg9LwpJ3xeX0FZgAG1q0QdCpVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/figures": "^1.0.5", + "@inquirer/type": "^1.5.3", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/select": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.5.0.tgz", + "integrity": "sha512-YmDobTItPP3WcEI86GvPo+T2sRHkxxOq/kXmsBjHS5BVXUgvgZ5AfJjkvQvZr03T81NnI3KrrRuMzeuYUQRFOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@inquirer/core": "^9.1.0", + "@inquirer/figures": "^1.0.5", + "@inquirer/type": "^1.5.3", + "ansi-escapes": "^4.3.2", + "yoctocolors-cjs": "^2.1.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@inquirer/type": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.3.tgz", + "integrity": "sha512-xUQ14WQGR/HK5ei+2CvgcwoH9fQ4PgPGmVFSN0pc1+fVyDL3MREhyAY7nxEErSu6CkllBM3D7e3e+kOvtu+eIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "mute-stream": "^1.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "camelcase": "^5.3.1", "find-up": "^4.1.0", "get-package-type": "^0.1.0", "js-yaml": "^3.13.1", @@ -2480,6 +3067,7 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, + "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" } @@ -2489,6 +3077,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -2502,6 +3091,7 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -2515,6 +3105,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -2527,6 +3118,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, + "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -2542,6 +3134,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -2554,6 +3147,7 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -2562,13 +3156,15 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -2578,6 +3174,7 @@ "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", "dev": true, + "license": "MIT", "dependencies": { "jest-get-type": "^29.6.3" }, @@ -2590,6 +3187,7 @@ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, + "license": "MIT", "dependencies": { "@sinclair/typebox": "^0.27.8" }, @@ -2602,6 +3200,7 @@ "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", @@ -2619,6 +3218,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -2633,6 +3233,7 @@ "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" } @@ -2642,6 +3243,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -2651,6 +3253,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25" @@ -2660,13 +3263,15 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -2683,6 +3288,7 @@ "resolved": "https://registry.npmjs.org/@keyvhq/core/-/core-2.1.1.tgz", "integrity": "sha512-wVnnVFWmtAvQP8v/Ugm8KSl4glrVZjb5uqVc1n5tbGzj45lZhG7F/YxCJ6qHGDfBtDEw5cp1nJ2qImdmaG/JEQ==", "dev": true, + "license": "MIT", "dependencies": { "json-buffer": "~3.0.1" }, @@ -2695,6 +3301,7 @@ "resolved": "https://registry.npmjs.org/@keyvhq/memoize/-/memoize-2.1.5.tgz", "integrity": "sha512-BtwBDZjqZmhabWHfh4O/psDPbmcZotF2JEi40lRorViQkggaG0yuS8dy47LgKjEZN3P+wDQF7NE2iFBLf+oSFQ==", "dev": true, + "license": "MIT", "dependencies": { "@keyvhq/core": "^2.1.1", "mimic-fn": "~3.0.0" @@ -2708,6 +3315,7 @@ "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.45.22.tgz", "integrity": "sha512-9fOXBEgxdiBedT1qB1obDCHqkU5hmqoJ/xr7CqI0u1h54zPe845Kj4ZQgMqSoF+Azg3fe43AAV1R9MwQlko3Mw==", "dev": true, + "license": "MIT", "dependencies": { "audio-extensions": "0.0.0", "chrono-node": "~2.7.6", @@ -2742,6 +3350,7 @@ "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" }, @@ -2753,6 +3362,7 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -2765,6 +3375,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "license": "MIT", "engines": { "node": ">= 8" } @@ -2773,6 +3384,7 @@ "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", "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -2786,6 +3398,7 @@ "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", "dev": true, + "license": "ISC", "dependencies": { "agent-base": "^7.1.0", "http-proxy-agent": "^7.0.0", @@ -2801,13 +3414,15 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/@npmcli/fs": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", "dev": true, + "license": "ISC", "dependencies": { "semver": "^7.3.5" }, @@ -2816,14 +3431,15 @@ } }, "node_modules/@nuxt/kit": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-3.13.0.tgz", - "integrity": "sha512-gbhSbDvYfkGQ0R2ztqTLQLHRMv+7g50kAKKuN6mbF4tL9jg7NPnQ8bAarn2I4Qx8xtmwO+qY1ABkmYMn5S1CpA==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-3.13.1.tgz", + "integrity": "sha512-FkUL349lp/3nVfTIyws4UDJ3d2jyv5Pk1DC1HQUCOkSloYYMdbRcQAUcb4fe2TCLNWvHM+FhU8jnzGTzjALZYA==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { - "@nuxt/schema": "3.13.0", - "c12": "^1.11.1", + "@nuxt/schema": "3.13.1", + "c12": "^1.11.2", "consola": "^3.2.3", "defu": "^6.1.4", "destr": "^2.0.3", @@ -2835,12 +3451,12 @@ "knitwork": "^1.1.0", "mlly": "^1.7.1", "pathe": "^1.1.2", - "pkg-types": "^1.1.3", + "pkg-types": "^1.2.0", "scule": "^1.3.0", "semver": "^7.6.3", "ufo": "^1.5.4", "unctx": "^2.3.1", - "unimport": "^3.11.0", + "unimport": "^3.11.1", "untyped": "^1.4.2" }, "engines": { @@ -2848,10 +3464,11 @@ } }, "node_modules/@nuxt/schema": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@nuxt/schema/-/schema-3.13.0.tgz", - "integrity": "sha512-JBGSjF9Hd8guvTV2312eM1RulCMJc50yR3CeMZPLDsI02A8TXQnABS8EbgvGRvxD43q/ITjj21B2ffG1wEVrnQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/@nuxt/schema/-/schema-3.13.1.tgz", + "integrity": "sha512-ishbhzVGspjshG9AG0hYnKYY6LWXzCtua7OXV7C/DQ2yA7rRcy1xHpzKZUDbIRyxCHHCAcBd8jfHEUmEuhEPrA==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "compatx": "^0.1.8", @@ -2859,12 +3476,12 @@ "defu": "^6.1.4", "hookable": "^5.5.3", "pathe": "^1.1.2", - "pkg-types": "^1.1.3", + "pkg-types": "^1.2.0", "scule": "^1.3.0", "std-env": "^3.7.0", "ufo": "^1.5.4", "uncrypto": "^0.1.3", - "unimport": "^3.11.0", + "unimport": "^3.11.1", "untyped": "^1.4.2" }, "engines": { @@ -2876,16 +3493,35 @@ "resolved": "https://registry.npmjs.org/@originjs/vite-plugin-commonjs/-/vite-plugin-commonjs-1.0.3.tgz", "integrity": "sha512-KuEXeGPptM2lyxdIEJ4R11+5ztipHoE7hy8ClZt3PYaOVQ/pyngd2alaSrPnwyFeOW1UagRBaQ752aA1dTMdOQ==", "dev": true, + "license": "MulanPSL2", "dependencies": { "esbuild": "^0.14.14" } }, + "node_modules/@originjs/vite-plugin-commonjs/node_modules/@esbuild/linux-loong64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz", + "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@originjs/vite-plugin-commonjs/node_modules/esbuild": { "version": "0.14.54", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz", "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==", "dev": true, "hasInstallScript": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -2921,6 +3557,7 @@ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=14" @@ -2931,6 +3568,7 @@ "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz", "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==", "dev": true, + "license": "MIT", "engines": { "node": "^12.20.0 || ^14.18.0 || >=16.0.0" }, @@ -2939,9 +3577,9 @@ } }, "node_modules/@promptbook/utils": { - "version": "0.67.5", - "resolved": "https://registry.npmjs.org/@promptbook/utils/-/utils-0.67.5.tgz", - "integrity": "sha512-aYKt+Rl4A8XkAsQK2klMifne97ovySnTku5DykwgQ2tLDFpepR5RT/O4JciVeUaaH2856G1HngM9J9FfcGQP8g==", + "version": "0.70.0-1", + "resolved": "https://registry.npmjs.org/@promptbook/utils/-/utils-0.70.0-1.tgz", + "integrity": "sha512-qd2lLRRN+sE6UuNMi2tEeUUeb4zmXnxY5EMdfHVXNE+bqBDpUC7/aEfXgA3jnUXEr+xFjQ8PTFQgWvBMaKvw0g==", "dev": true, "funding": [ { @@ -2953,15 +3591,17 @@ "url": "https://github.com/webgptorg/promptbook/blob/main/README.md#%EF%B8%8F-contributing" } ], + "license": "CC-BY-4.0", "dependencies": { "spacetrim": "0.11.39" } }, "node_modules/@puppeteer/browsers": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz", - "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.0.tgz", + "integrity": "sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==", "dev": true, + "license": "Apache-2.0", "dependencies": { "debug": "^4.3.6", "extract-zip": "^2.0.1", @@ -2984,6 +3624,7 @@ "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-3.0.2.tgz", "integrity": "sha512-10monEYsBp3scM4/ND4LNH5Rxvh3e/cVeL3jWTgZ2SrQ+BmUoQcopVQvnaMcOnykb1VkxUFuDAN+0FnpTFRy2A==", "dev": true, + "license": "MIT", "engines": { "node": ">=14.0.0" }, @@ -3001,6 +3642,7 @@ "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", "dev": true, + "license": "MIT", "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^2.0.2", @@ -3018,36 +3660,250 @@ } } }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz", + "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz", + "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz", + "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz", + "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz", + "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz", + "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz", + "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz", + "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz", + "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz", + "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz", + "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.1.tgz", - "integrity": "sha512-kXQVcWqDcDKw0S2E0TmhlTLlUgAmMVqPrJZR+KpH/1ZaZhLSl23GZpQVmawBQGVhyP5WXIsIQ/zqbDBBYmxm5w==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz", + "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz", + "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ] }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz", + "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz", + "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz", + "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@sec-ant/readable-stream": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz", "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@sindresorhus/is": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -3060,6 +3916,7 @@ "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz", "integrity": "sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -3072,6 +3929,7 @@ "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "type-detect": "4.0.8" } @@ -3081,6 +3939,7 @@ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -3090,6 +3949,7 @@ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz", "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^1.7.0" } @@ -3099,6 +3959,7 @@ "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.3.tgz", "integrity": "sha512-nhOb2dWPeb1sd3IQXL/dVPnKHDOAFfvichtBf4xV00/rU1QbPCQqKMbvIheIjqwVjh7qIgf2AHTHi391yMOMpQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^1.6.0", "lodash.get": "^4.4.2", @@ -3109,13 +3970,15 @@ "version": "0.7.3", "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", - "dev": true + "dev": true, + "license": "(Unlicense OR Apache-2.0)" }, "node_modules/@snyk/github-codeowners": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@snyk/github-codeowners/-/github-codeowners-1.1.0.tgz", "integrity": "sha512-lGFf08pbkEac0NYgVf4hdANpAgApRjNByLXB+WBip3qj1iendOIyAwP2GKkKbQMNVy2r1xxDf0ssfWscoiC+Vw==", "dev": true, + "license": "MIT", "dependencies": { "commander": "^4.1.1", "ignore": "^5.1.8", @@ -3133,6 +3996,7 @@ "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.21.0.tgz", "integrity": "sha512-v50lnVbzS8mpMSnEVxR+G75XpvxHKtkJaQrNPE8+/fF6Ppr5z4bcdcBhcP8LPfEW+4BZcic6VifMXRwTopc+kw==", "dev": true, + "license": "MIT", "optional": true, "bin": { "stencil": "bin/stencil" @@ -3143,11 +4007,12 @@ } }, "node_modules/@swc/core": { - "version": "1.7.19", - "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.7.19.tgz", - "integrity": "sha512-b1fnmplpMuG6vwu8EXNICYLSTWNOBOzThgF8p2KtmQ8VDVnxXtpwVX5TcrFY+iS25y40ooD/pgJmmfYXMNJUBw==", + "version": "1.7.23", + "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.7.23.tgz", + "integrity": "sha512-VDNkpDvDlreGh2E3tlDj8B3piiuLhhQA/7rIVZpiLUvG1YpucAa6N7iDXA7Gc/+Hah8spaCg/qvEaBkCmcIYCQ==", "dev": true, "hasInstallScript": true, + "license": "Apache-2.0", "dependencies": { "@swc/counter": "^0.1.3", "@swc/types": "^0.1.12" @@ -3160,16 +4025,16 @@ "url": "https://opencollective.com/swc" }, "optionalDependencies": { - "@swc/core-darwin-arm64": "1.7.19", - "@swc/core-darwin-x64": "1.7.19", - "@swc/core-linux-arm-gnueabihf": "1.7.19", - "@swc/core-linux-arm64-gnu": "1.7.19", - "@swc/core-linux-arm64-musl": "1.7.19", - "@swc/core-linux-x64-gnu": "1.7.19", - "@swc/core-linux-x64-musl": "1.7.19", - "@swc/core-win32-arm64-msvc": "1.7.19", - "@swc/core-win32-ia32-msvc": "1.7.19", - "@swc/core-win32-x64-msvc": "1.7.19" + "@swc/core-darwin-arm64": "1.7.23", + "@swc/core-darwin-x64": "1.7.23", + "@swc/core-linux-arm-gnueabihf": "1.7.23", + "@swc/core-linux-arm64-gnu": "1.7.23", + "@swc/core-linux-arm64-musl": "1.7.23", + "@swc/core-linux-x64-gnu": "1.7.23", + "@swc/core-linux-x64-musl": "1.7.23", + "@swc/core-win32-arm64-msvc": "1.7.23", + "@swc/core-win32-ia32-msvc": "1.7.23", + "@swc/core-win32-x64-msvc": "1.7.23" }, "peerDependencies": { "@swc/helpers": "*" @@ -3180,108 +4045,271 @@ } } }, - "node_modules/@swc/core-linux-x64-gnu": { - "version": "1.7.19", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.7.19.tgz", - "integrity": "sha512-uKDuYb8TnUA1c+aTdKEYGb4f9uNX+brneyvp5yCJHR9yfR3pRlEFeTXwJaWRtSm8fNvaF2fDzd2FNBRAFAxgJw==", + "node_modules/@swc/core-darwin-arm64": { + "version": "1.7.23", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.7.23.tgz", + "integrity": "sha512-yyOHPfti6yKlQulfVWMt7BVKst+SyEZYCWuQSGMn1KgmNCH/bYufRWfQXIhkGSj44ZkEepJmsJ8tDyIb4k5WyA==", "cpu": [ - "x64" + "arm64" ], "dev": true, + "license": "Apache-2.0 AND MIT", "optional": true, "os": [ - "linux" + "darwin" ], "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 - }, - "node_modules/@swc/types": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.12.tgz", - "integrity": "sha512-wBJA+SdtkbFhHjTMYH+dEH1y4VpfGdAc2Kw/LK09i9bXd/K6j6PkDcFCEzb6iVfZMkPRrl/q0e3toqTAJdkIVA==", + "node_modules/@swc/core-darwin-x64": { + "version": "1.7.23", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.7.23.tgz", + "integrity": "sha512-GzqHwQ0Y1VyjdI/bBKFX2GKm5HD3PIB6OhuAQtWZMTtEr2yIrlT0YK2T+XKh7oIg31JwxGBeQdBk3KTI7DARmQ==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "@swc/counter": "^0.1.3" + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=10" } }, - "node_modules/@szmarczak/http-timer": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", - "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", + "node_modules/@swc/core-linux-arm-gnueabihf": { + "version": "1.7.23", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.7.23.tgz", + "integrity": "sha512-qwX4gB41OS6/OZkHcpTqLFGsdmvoZyffnJIlgB/kZKwH3lfeJWzv6vx57zXtNpM/t7GoQEe0VZUVdmNjxSxBZw==", + "cpu": [ + "arm" + ], "dev": true, - "dependencies": { - "defer-to-connect": "^2.0.0" - }, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], "engines": { "node": ">=10" } }, - "node_modules/@tootallnate/quickjs-emscripten": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", - "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==", - "dev": true - }, - "node_modules/@trunkio/launcher": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@trunkio/launcher/-/launcher-1.3.1.tgz", - "integrity": "sha512-30gcw/pc+hmzXR8qHM0ND1kYgwnAjze3Xsnw3AUvxO9G4JzKF8u6FDy/6qbYKZxJ6Wr4SE0E0L7ZrAEA8Nia5Q==", + "node_modules/@swc/core-linux-arm64-gnu": { + "version": "1.7.23", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.7.23.tgz", + "integrity": "sha512-TsrbUZdMaUwzI7+g/8rHPLWbntMKYSu5Bn5IBSqVKPeyqaXxNnlIUnWXgXcUcRAc+T+Y8ADfr7EiFz9iz5DuSA==", + "cpu": [ + "arm64" + ], "dev": true, - "dependencies": { - "semver": "^7.5.4", - "tar": "^6.2.0", - "yaml": "^2.2.0" - }, - "bin": { - "trunk": "trunk.js", - "trunk_bash": "trunk" - }, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=18.0.0" + "node": ">=10" } }, - "node_modules/@types/cacheable-request": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", - "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", + "node_modules/@swc/core-linux-arm64-musl": { + "version": "1.7.23", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.7.23.tgz", + "integrity": "sha512-JEdtwdthazKq4PBz53KSubwwK8MvqODAihGSAzc8u3Unq4ojcvaS8b0CwLBeD+kTQ78HpxOXTt3DsFIxpgaCAA==", + "cpu": [ + "arm64" + ], "dev": true, - "dependencies": { - "@types/http-cache-semantics": "*", - "@types/keyv": "^3.1.4", - "@types/node": "*", - "@types/responselike": "^1.0.0" + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-x64-gnu": { + "version": "1.7.23", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.7.23.tgz", + "integrity": "sha512-V51gFPWaVAHbI1yg9ahsoya3aB4uawye3SZ5uQWgcP7wdCdiv60dw4F5nuPJf5Z1oXD3U/BslXuamv8Oh9vXqQ==", + "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.7.23", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.7.23.tgz", + "integrity": "sha512-BBqQi4+UdeRqag3yM4IJjaHG4yc1o3l9ksENHToE0o/u2DT0FY5+K/DiYGZLC1JHbSFzNqRCYsa7DIzRtZ0A1A==", + "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.7.23", + "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.7.23.tgz", + "integrity": "sha512-JPk6pvCKncL6bXG7p+NLZf8PWx4FakVvKNdwGeMrYunb+yk1IZf7qf9LJk8+GDGF5QviDXPs8opZrTrfsW80fA==", + "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.7.23", + "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.7.23.tgz", + "integrity": "sha512-2Whxi8d+bLQBzJcQ5qYPHlk02YYVGsMVav0fWk+FnX2z1QRREIu1L1xvrpi7gBpjXp6BIU40ya8GiKeekNT2bg==", + "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.7.23", + "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.7.23.tgz", + "integrity": "sha512-82fARk4/yJ40kwWKY/gdKDisPdtgJE9jgpl/vkNG3alyJxrCzuNM7+CtiKoYbXLeqM8GQTS3wlvCaJu9oQ8dag==", + "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.12", + "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.12.tgz", + "integrity": "sha512-wBJA+SdtkbFhHjTMYH+dEH1y4VpfGdAc2Kw/LK09i9bXd/K6j6PkDcFCEzb6iVfZMkPRrl/q0e3toqTAJdkIVA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@swc/counter": "^0.1.3" + } + }, + "node_modules/@szmarczak/http-timer": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", + "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", + "dev": true, + "license": "MIT", + "dependencies": { + "defer-to-connect": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@tootallnate/quickjs-emscripten": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", + "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@trunkio/launcher": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@trunkio/launcher/-/launcher-1.3.2.tgz", + "integrity": "sha512-b5XTWaCjfXDk1wrFKutBqhoc3jVBEjD6l36aUc9AI+QFWWOqX5bLjkgOMAa2krN1QqAjP834wDYIW4n3PvXhCA==", + "dev": true, + "license": "ISC", + "dependencies": { + "semver": "^7.5.4", + "tar": "^6.2.0", + "yaml": "^2.2.0" + }, + "bin": { + "trunk": "trunk.js" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@types/cacheable-request": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", + "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/http-cache-semantics": "*", + "@types/keyv": "^3.1.4", + "@types/node": "*", + "@types/responselike": "^1.0.0" } }, "node_modules/@types/estree": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/http-cache-semantics": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/istanbul-lib-report": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", "dev": true, + "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "*" } @@ -3291,6 +4319,7 @@ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.4.tgz", "integrity": "sha512-p+nSH0hBMLvuqgnT0rbBnDcfO3IuOZrLU+Yf4x0BhGVmXynB+gm9D35gAvWeMuk+riik5Rj12NBQm8rnzIPH3g==", "dev": true, + "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "*", "source-map": "^0.6.1" @@ -3301,6 +4330,7 @@ "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/istanbul-lib-report": "*" } @@ -3309,13 +4339,15 @@ "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/keyv": { "version": "3.1.4", "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } @@ -3324,22 +4356,25 @@ "version": "10.0.7", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.7.tgz", "integrity": "sha512-GN8yJ1mNTcFcah/wKEFIJckJx9iJLoMSzWcfRRuxz/Jk+U6KQNnml+etbtxFK8lPjzOw3zp4Ha/kjSst9fsHYw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/mute-stream": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz", "integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/node": { - "version": "20.16.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.2.tgz", - "integrity": "sha512-91s/n4qUPV/wg8eE9KHYW1kouTfDk2FPGjXbBMfRWP/2vg1rCXNQL1OCabwGs0XSdukuK+MwCDXE30QpSeMUhQ==", + "version": "20.16.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz", + "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==", "dev": true, + "license": "MIT", "dependencies": { "undici-types": "~6.19.2" } @@ -3348,19 +4383,22 @@ "version": "2.4.4", "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/parse-json": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/responselike": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz", "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } @@ -3369,31 +4407,36 @@ "version": "8.1.5", "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz", "integrity": "sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/stack-utils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.2.tgz", "integrity": "sha512-113D3mDkZDjo+EeUEHCFy0qniNc1ZpecGiAU7WSo7YDoSzolZIQKpYFHrPpjkB2nuyahcKfrmLXeQlh7gqJYdw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/wrap-ansi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz", "integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/ws": { "version": "8.5.12", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } @@ -3403,6 +4446,7 @@ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", "dev": true, + "license": "MIT", "dependencies": { "@types/yargs-parser": "*" } @@ -3411,13 +4455,15 @@ "version": "21.0.3", "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", - "dev": true + "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": "*" @@ -3427,13 +4473,15 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/@vitest/pretty-format": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.5.tgz", "integrity": "sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==", "dev": true, + "license": "MIT", "dependencies": { "tinyrainbow": "^1.2.0" }, @@ -3446,6 +4494,7 @@ "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.6.0.tgz", "integrity": "sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==", "dev": true, + "license": "MIT", "dependencies": { "magic-string": "^0.30.5", "pathe": "^1.1.1", @@ -3460,6 +4509,7 @@ "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.0.5.tgz", "integrity": "sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==", "dev": true, + "license": "MIT", "dependencies": { "tinyspy": "^3.0.0" }, @@ -3468,22 +4518,23 @@ } }, "node_modules/@wdio/browser-runner": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/@wdio/browser-runner/-/browser-runner-9.0.7.tgz", - "integrity": "sha512-v7VNSalUn7PMH/V2fkHg/O4vWhOh/dTaQ56UxOjbPvTDn9Snm7MJQ4Vg/f84yiaAIS7X5EHYjivMaKvt9K6ATA==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/@wdio/browser-runner/-/browser-runner-9.0.9.tgz", + "integrity": "sha512-3ysXRq5dzLNSdLOcOHSrNQK0OCXmgaUg81mpKUQs//iseZB/YhtrslCDrE7/C0RMIh/jTllX8Zpqfofbk/Oc2A==", "dev": true, + "license": "MIT", "dependencies": { "@originjs/vite-plugin-commonjs": "^1.0.3", "@types/istanbul-lib-source-maps": "^4.0.4", "@vitest/spy": "^2.0.4", - "@wdio/globals": "9.0.7", - "@wdio/local-runner": "9.0.7", - "@wdio/logger": "9.0.4", - "@wdio/mocha-framework": "9.0.6", - "@wdio/protocols": "9.0.4", - "@wdio/runner": "9.0.7", - "@wdio/types": "9.0.4", - "@wdio/utils": "9.0.6", + "@wdio/globals": "9.0.9", + "@wdio/local-runner": "9.0.9", + "@wdio/logger": "9.0.8", + "@wdio/mocha-framework": "9.0.8", + "@wdio/protocols": "9.0.8", + "@wdio/runner": "9.0.9", + "@wdio/types": "9.0.8", + "@wdio/utils": "9.0.8", "deepmerge-ts": "^7.0.3", "expect": "^29.7.0", "expect-webdriverio": "^5.0.1", @@ -3501,11 +4552,11 @@ "vite": "~5.4.0", "vite-plugin-istanbul": "^6.0.0", "vite-plugin-top-level-await": "^1.4.1", - "webdriver": "9.0.7", - "webdriverio": "9.0.7" + "webdriver": "9.0.8", + "webdriverio": "9.0.9" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" }, "optionalDependencies": { "@nuxt/kit": "^3.12.4", @@ -3514,19 +4565,20 @@ } }, "node_modules/@wdio/cli": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-9.0.7.tgz", - "integrity": "sha512-2f4gI5v+Xz3Bzed4OTeV9apLO0wQONWp/TTPOmNJ1I0I87fF/eDy7lQp6p6Cohw1Ytis+ItGDXdZQ1NOF+vatw==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-9.0.9.tgz", + "integrity": "sha512-/sY0pMpLhsnhWpWovG81F/PqYmC7EluskrUhQ8/7BW1XDcNkUminCsd685HgAqPE3nX6Npx1oRhCbNDL/7Z7pw==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "^20.1.1", "@vitest/snapshot": "^1.2.1", - "@wdio/config": "9.0.6", - "@wdio/globals": "9.0.7", - "@wdio/logger": "9.0.4", - "@wdio/protocols": "9.0.4", - "@wdio/types": "9.0.4", - "@wdio/utils": "9.0.6", + "@wdio/config": "9.0.8", + "@wdio/globals": "9.0.9", + "@wdio/logger": "9.0.8", + "@wdio/protocols": "9.0.8", + "@wdio/types": "9.0.8", + "@wdio/utils": "9.0.8", "async-exit-hook": "^2.0.1", "chalk": "^5.2.0", "chokidar": "^3.5.3", @@ -3542,14 +4594,14 @@ "read-pkg-up": "^10.0.0", "recursive-readdir": "^2.2.3", "tsx": "^4.7.2", - "webdriverio": "9.0.7", + "webdriverio": "9.0.9", "yargs": "^17.7.2" }, "bin": { "wdio": "bin/wdio.js" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" } }, "node_modules/@wdio/cli/node_modules/chalk": { @@ -3557,6 +4609,7 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", "dev": true, + "license": "MIT", "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" }, @@ -3565,18 +4618,19 @@ } }, "node_modules/@wdio/concise-reporter": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-9.0.4.tgz", - "integrity": "sha512-9yNIRtG9K4B/4hwo3AA8OfQV0OFk5/TgRc9Nl9yr3VimC8rZZO+CxjsW6gYhDj8a81oz2RHKdWPhI2tAFZVgqw==", + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-9.0.8.tgz", + "integrity": "sha512-FIekyKoQyEV5zdHoIkL/JEoy3x1edncyH/tfj6Gj+dYvj8V1wzvd6VqX6biJdDWq6es7/0OvRi5UhUw+/fy4MA==", "dev": true, + "license": "MIT", "dependencies": { - "@wdio/reporter": "9.0.4", - "@wdio/types": "9.0.4", + "@wdio/reporter": "9.0.8", + "@wdio/types": "9.0.8", "chalk": "^5.0.1", "pretty-ms": "^9.0.0" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" } }, "node_modules/@wdio/concise-reporter/node_modules/chalk": { @@ -3584,6 +4638,7 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", "dev": true, + "license": "MIT", "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" }, @@ -3592,60 +4647,64 @@ } }, "node_modules/@wdio/config": { - "version": "9.0.6", - "resolved": "https://registry.npmjs.org/@wdio/config/-/config-9.0.6.tgz", - "integrity": "sha512-WsACM5QjT3ZsoPVqHroYt8pOkZx4/6PTdNKm45VL8NHhQe5w9IFbl1fKxFHQ7ZkPI3F+EFvFvubO8puJ0OcSmQ==", + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/@wdio/config/-/config-9.0.8.tgz", + "integrity": "sha512-37L+hd+A1Nyehd/pgfTrLC6w+Ngbu0CIoFh9Vv6v8Cgu5Hih0TLofvlg+J1BNbcTd5eQ2tFKZBDeFMhQaIiTpg==", "dev": true, + "license": "MIT", "dependencies": { - "@wdio/logger": "9.0.4", - "@wdio/types": "9.0.4", - "@wdio/utils": "9.0.6", + "@wdio/logger": "9.0.8", + "@wdio/types": "9.0.8", + "@wdio/utils": "9.0.8", "decamelize": "^6.0.0", "deepmerge-ts": "^7.0.3", "glob": "^10.2.2", "import-meta-resolve": "^4.0.0" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" } }, "node_modules/@wdio/globals": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/@wdio/globals/-/globals-9.0.7.tgz", - "integrity": "sha512-3p/xKmK+TVN9k6zSULLP3GvlaF3Rl5Y5Ts/+ch1z7ZbKNDyXLnUTn0KxT78aIGmIASOxO/8Cby5Vd4K5byPzbA==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/@wdio/globals/-/globals-9.0.9.tgz", + "integrity": "sha512-Lmzf82NoNK+i+Z6slt/Ueu0iOfHMLMNxxWnvoC+en3g8A1xj2JxAinC4ymrc0iFC3uvG0SxMWlpVmGTk78wp2Q==", "dev": true, + "license": "MIT", "engines": { - "node": ">=18" + "node": ">=18.20.0" }, "optionalDependencies": { "expect-webdriverio": "^5.0.1", - "webdriverio": "9.0.7" + "webdriverio": "9.0.9" } }, "node_modules/@wdio/local-runner": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-9.0.7.tgz", - "integrity": "sha512-0ptiSVE6sm+ct5sblX6b4Fah2AA7VSLslkVdxeSmYUbAGxalq9H9/fw2FKO07xDfFJDM8eolJAphHNnICX+5Uw==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-9.0.9.tgz", + "integrity": "sha512-cqhCqHHO9PnH51+buvXd0ck3FB0HCnqPQLe/SLZuGI5tzywK1X7wFKlcAHkmqCPyu3xdV2mh8QZTEL4k8ayzsw==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "^20.1.0", - "@wdio/logger": "9.0.4", - "@wdio/repl": "9.0.4", - "@wdio/runner": "9.0.7", - "@wdio/types": "9.0.4", + "@wdio/logger": "9.0.8", + "@wdio/repl": "9.0.8", + "@wdio/runner": "9.0.9", + "@wdio/types": "9.0.8", "async-exit-hook": "^2.0.1", "split2": "^4.1.0", "stream-buffers": "^3.0.2" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" } }, "node_modules/@wdio/logger": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.4.tgz", - "integrity": "sha512-b6gcu0PTVb3fgK4kyAH/k5UUWN5FOUdAfhA4PAY/IZvxZTMFYMqnrZb0WRWWWqL6nu9pcrOVtCOdPBvj0cb+Nw==", + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.0.8.tgz", + "integrity": "sha512-uIyYIDBwLczmsp9JE5hN3ME8Xg+9WNBfSNXD69ICHrY9WPTzFf94UeTuavK7kwSKF3ro2eJbmNZItYOfnoovnw==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^5.1.2", "loglevel": "^1.6.0", @@ -3653,7 +4712,7 @@ "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" } }, "node_modules/@wdio/logger/node_modules/ansi-regex": { @@ -3661,6 +4720,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -3673,6 +4733,7 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", "dev": true, + "license": "MIT", "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" }, @@ -3685,6 +4746,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" }, @@ -3696,20 +4758,21 @@ } }, "node_modules/@wdio/mocha-framework": { - "version": "9.0.6", - "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-9.0.6.tgz", - "integrity": "sha512-V9VNRPlPOsnlU63CWmGFSSw2QcZii1YuXw//vlst4Adl91FMAmqr6ikZ7flmX/bYunQokJxcpow7irnSYYevGQ==", + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-9.0.8.tgz", + "integrity": "sha512-0zwnyybxN8zxeOaFsjCpqdcvZIyzb8QglZorQ17VH9GR0/giMtcRbC4usYJgh4W37e1FCwvyvQyij93JYSSkNA==", "dev": true, + "license": "MIT", "dependencies": { "@types/mocha": "^10.0.6", "@types/node": "^20.11.28", - "@wdio/logger": "9.0.4", - "@wdio/types": "9.0.4", - "@wdio/utils": "9.0.6", + "@wdio/logger": "9.0.8", + "@wdio/types": "9.0.8", + "@wdio/utils": "9.0.8", "mocha": "^10.3.0" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" } }, "node_modules/@wdio/mocha-framework/node_modules/brace-expansion": { @@ -3717,6 +4780,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -3726,6 +4790,7 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -3736,7 +4801,8 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@wdio/mocha-framework/node_modules/glob": { "version": "8.1.0", @@ -3744,6 +4810,7 @@ "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -3763,6 +4830,7 @@ "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -3775,6 +4843,7 @@ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -3791,6 +4860,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -3803,6 +4873,7 @@ "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz", "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-colors": "^4.1.3", "browser-stdout": "^1.3.1", @@ -3833,17 +4904,12 @@ "node": ">= 14.0.0" } }, - "node_modules/@wdio/mocha-framework/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - }, "node_modules/@wdio/mocha-framework/node_modules/serialize-javascript": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -3853,6 +4919,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -3867,6 +4934,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -3881,13 +4949,15 @@ "version": "6.5.1", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/@wdio/mocha-framework/node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -3905,6 +4975,7 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -3919,82 +4990,88 @@ } }, "node_modules/@wdio/protocols": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.0.4.tgz", - "integrity": "sha512-T9v8Jkp94NxLLil5J7uJ/+YHk5/7fhOggzGcN+LvuCHS6jbJFZ/11c4SUEuXw27Yqk01fFXPBbF6TwcTTOuW/Q==", - "dev": true + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.0.8.tgz", + "integrity": "sha512-xRH54byFf623/w/KW62xkf/C2mGyigSfMm+UT3tNEAd5ZA9X2VAWQWQBPzdcrsck7Fxk4zlQX8Kb34RSs7Cy4Q==", + "dev": true, + "license": "MIT" }, "node_modules/@wdio/repl": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-9.0.4.tgz", - "integrity": "sha512-5Bc5ARjWA7t6MZNnVJ9WvO1iDsy6iOsrSDWiP7APWAdaF/SJCP3SFE2c+PdQJpJWhr2Kk0fRGuyDM+GdsmZhwg==", + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-9.0.8.tgz", + "integrity": "sha512-3iubjl4JX5zD21aFxZwQghqC3lgu+mSs8c3NaiYYNCC+IT5cI/8QuKlgh9s59bu+N3gG988jqMJeCYlKuUv/iw==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "^20.1.0" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" } }, "node_modules/@wdio/reporter": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-9.0.4.tgz", - "integrity": "sha512-g55MiqToKEZ+L5quk7Ddk3m1fKgh2U2rq3zLG8bZUYU+3KFglfRC/Ld5yTso8S1tG4EDgl5HKSN5Bl8I5gncbg==", + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-9.0.8.tgz", + "integrity": "sha512-2T2XmCL31bLVkHN0UvHagg4KkkUHwzbXnHm1wjlWtd90BdVZ3lJyMhDh3TkKsyyDxPaZZJEhyDp9g/COwuF/bw==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "^20.1.0", - "@wdio/logger": "9.0.4", - "@wdio/types": "9.0.4", + "@wdio/logger": "9.0.8", + "@wdio/types": "9.0.8", "diff": "^5.0.0", "object-inspect": "^1.12.0" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" } }, "node_modules/@wdio/runner": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-9.0.7.tgz", - "integrity": "sha512-jIRY3GRJHMJ6cl/0ws9Nz1kq5YN/29+BpvHUTc2yNZz8KjEiz59hwFk+gzSj9HZDyYrhFV5O01BXEMxxgwJXeQ==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-9.0.9.tgz", + "integrity": "sha512-DIyFSt/mF7EVyFvgKztVAzf7lfunXsMxfYm3Hqjxgh0IQXJfjvOFKmT+R/T61tTHyzHHsx0JBQTu12WqHkNQtA==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "^20.11.28", - "@wdio/config": "9.0.6", - "@wdio/globals": "9.0.7", - "@wdio/logger": "9.0.4", - "@wdio/types": "9.0.4", - "@wdio/utils": "9.0.6", + "@wdio/config": "9.0.8", + "@wdio/globals": "9.0.9", + "@wdio/logger": "9.0.8", + "@wdio/types": "9.0.8", + "@wdio/utils": "9.0.8", "deepmerge-ts": "^7.0.3", "expect-webdriverio": "^5.0.1", "gaze": "^1.1.3", - "webdriver": "9.0.7", - "webdriverio": "9.0.7" + "webdriver": "9.0.8", + "webdriverio": "9.0.9" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" } }, "node_modules/@wdio/types": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.4.tgz", - "integrity": "sha512-MN7O4Uk3zPWvkN8d6SNdIjd7qHUlTxS7j0QfRPu6TdlYbHu6BJJ8Rr84y7GcUzCnTAJ1nOIpvUyR8MY3hOaVKg==", + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/@wdio/types/-/types-9.0.8.tgz", + "integrity": "sha512-pmz2iRWddTanrv8JC7v3wUGm17KRv2WyyJhQfklMSANn9V1ep6pw1RJG2WJnKq4NojMvH1nVv1sMZxXrYPhpYw==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "^20.1.0" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" } }, "node_modules/@wdio/utils": { - "version": "9.0.6", - "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.6.tgz", - "integrity": "sha512-cnPXeW/sfqyKFuRRmADRZDNvFwEBMr7j7wwWLO6q5opoW++dwOdJW4WV0wDZbPcXTtGFCSrGCDLLdGcTAWMb3A==", + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.0.8.tgz", + "integrity": "sha512-p3EgOdkhCvMxJFd3WTtSChqYFQu2mz69/5tOsljDaL+4QYwnRR7O8M9wFsL3/9XMVcHdnC4Ija2VRxQ/lb+hHQ==", "dev": true, + "license": "MIT", "dependencies": { "@puppeteer/browsers": "^2.2.0", - "@wdio/logger": "9.0.4", - "@wdio/types": "9.0.4", + "@wdio/logger": "9.0.8", + "@wdio/types": "9.0.8", "decamelize": "^6.0.0", "deepmerge-ts": "^7.0.3", "edgedriver": "^5.6.1", @@ -4007,7 +5084,7 @@ "wait-port": "^1.1.0" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" } }, "node_modules/@webassemblyjs/ast": { @@ -4015,6 +5092,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/helper-numbers": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6" @@ -4024,25 +5102,29 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-api-error": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-buffer": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-numbers": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/floating-point-hex-parser": "1.11.6", "@webassemblyjs/helper-api-error": "1.11.6", @@ -4053,13 +5135,15 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-wasm-section": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-buffer": "1.12.1", @@ -4072,6 +5156,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, + "license": "MIT", "dependencies": { "@xtuc/ieee754": "^1.2.0" } @@ -4081,6 +5166,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@xtuc/long": "4.2.2" } @@ -4089,13 +5175,15 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/wasm-edit": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-buffer": "1.12.1", @@ -4112,6 +5200,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", @@ -4125,6 +5214,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-buffer": "1.12.1", @@ -4137,6 +5227,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-api-error": "1.11.6", @@ -4151,6 +5242,7 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.12.1", "@xtuc/long": "4.2.2" @@ -4161,6 +5253,7 @@ "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", "dev": true, + "license": "MIT", "peerDependencies": { "webpack": "4.x.x || 5.x.x", "webpack-cli": "4.x.x" @@ -4171,6 +5264,7 @@ "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", "dev": true, + "license": "MIT", "dependencies": { "envinfo": "^7.7.3" }, @@ -4183,6 +5277,7 @@ "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", "dev": true, + "license": "MIT", "peerDependencies": { "webpack-cli": "4.x.x" }, @@ -4196,19 +5291,22 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/@zip.js/zip.js": { "version": "2.7.52", "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.52.tgz", "integrity": "sha512-+5g7FQswvrCHwYKNMd/KFxZSObctLSsQOgqBSi0LzwHo3li9Eh1w5cF5ndjQw9Zbr3ajVnd2+XyiX85gAetx1Q==", "dev": true, + "license": "BSD-3-Clause", "engines": { "bun": ">=0.7.0", "deno": ">=1.0.0", @@ -4219,13 +5317,15 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", "dev": true, + "license": "MIT", "dependencies": { "event-target-shim": "^5.0.0" }, @@ -4237,6 +5337,7 @@ "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -4249,6 +5350,7 @@ "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", "dev": true, + "license": "MIT", "peerDependencies": { "acorn": "^8" } @@ -4257,6 +5359,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -4266,6 +5369,7 @@ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.3.4" }, @@ -4278,6 +5382,7 @@ "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, + "license": "MIT", "dependencies": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" @@ -4290,6 +5395,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -4306,6 +5412,7 @@ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true, + "license": "MIT", "peerDependencies": { "ajv": "^6.9.1" } @@ -4315,6 +5422,7 @@ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -4324,6 +5432,7 @@ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "dev": true, + "license": "MIT", "dependencies": { "type-fest": "^0.21.3" }, @@ -4338,6 +5447,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -4346,6 +5456,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -4361,6 +5472,7 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -4374,6 +5486,7 @@ "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz", "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==", "dev": true, + "license": "MIT", "dependencies": { "archiver-utils": "^5.0.2", "async": "^3.2.4", @@ -4392,6 +5505,7 @@ "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz", "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==", "dev": true, + "license": "MIT", "dependencies": { "glob": "^10.0.0", "graceful-fs": "^4.2.0", @@ -4410,6 +5524,7 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -4422,6 +5537,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz", "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==", "dev": true, + "license": "MIT", "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", @@ -4438,6 +5554,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz", "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==", "dev": true, + "license": "MIT", "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", @@ -4454,6 +5571,7 @@ "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" } @@ -4461,13 +5579,15 @@ "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "license": "Python-2.0" }, "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" } @@ -4476,13 +5596,15 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/asn1.js": { "version": "4.10.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", "dev": true, + "license": "MIT", "dependencies": { "bn.js": "^4.0.0", "inherits": "^2.0.1", @@ -4493,13 +5615,15 @@ "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/assert": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz", "integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "is-nan": "^1.3.2", @@ -4513,6 +5637,7 @@ "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -4522,6 +5647,7 @@ "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz", "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.0.1" }, @@ -4534,6 +5660,7 @@ "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4542,13 +5669,15 @@ "version": "3.2.6", "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/async-exit-hook": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz", "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -4557,13 +5686,15 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/audio-extensions": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/audio-extensions/-/audio-extensions-0.0.0.tgz", "integrity": "sha512-yj9C819u3ED3/OyRd9mLKMXGy8wsElaf6bkkv6OqZEKrNAT461TjiznS4IfPBy8Mmh6DWaXCQCVYSq3+VHkpjQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4573,6 +5704,7 @@ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, + "license": "MIT", "dependencies": { "possible-typed-array-names": "^1.0.0" }, @@ -4588,6 +5720,7 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", "dev": true, + "license": "MIT", "dependencies": { "follow-redirects": "^1.14.0" } @@ -4596,13 +5729,15 @@ "version": "1.6.6", "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/babel-loader": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz", "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==", "dev": true, + "license": "MIT", "dependencies": { "find-cache-dir": "^3.3.1", "loader-utils": "^2.0.0", @@ -4622,6 +5757,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz", "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==", "dev": true, + "license": "MIT", "dependencies": { "@babel/compat-data": "^7.22.6", "@babel/helper-define-polyfill-provider": "^0.6.2", @@ -4636,6 +5772,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -4645,6 +5782,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz", "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-define-polyfill-provider": "^0.6.2", "core-js-compat": "^3.38.0" @@ -4658,6 +5796,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz", "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-define-polyfill-provider": "^0.6.2" }, @@ -4668,20 +5807,23 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" }, "node_modules/bare-events": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", "dev": true, + "license": "Apache-2.0", "optional": true }, "node_modules/bare-fs": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz", - "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.3.tgz", + "integrity": "sha512-7RYKL+vZVCyAsMLi5SPu7QGauGGT8avnP/HO571ndEuV4MYdGXvLhtW67FuLPeEI8EiIY7zbbRR9x7x7HU0kgw==", "dev": true, + "license": "Apache-2.0", "optional": true, "dependencies": { "bare-events": "^2.0.0", @@ -4690,10 +5832,11 @@ } }, "node_modules/bare-os": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz", - "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.2.tgz", + "integrity": "sha512-HZoJwzC+rZ9lqEemTMiO0luOePoGYNBgsLLgegKR/cljiJvcDNhDZQkzC+NC5Oh0aHbdBNSOHpghwMuB5tqhjg==", "dev": true, + "license": "Apache-2.0", "optional": true }, "node_modules/bare-path": { @@ -4701,18 +5844,21 @@ "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz", "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==", "dev": true, + "license": "Apache-2.0", "optional": true, "dependencies": { "bare-os": "^2.1.0" } }, "node_modules/bare-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.2.0.tgz", - "integrity": "sha512-+o9MG5bPRRBlkVSpfFlMag3n7wMaIZb4YZasU2+/96f+3HTQ4F9DKQeu3K/Sjz1W0umu6xvVq1ON0ipWdMlr3A==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.2.1.tgz", + "integrity": "sha512-YTB47kHwBW9zSG8LD77MIBAAQXjU2WjAkMHeeb7hUplVs6+IoM5I7uEVQNPMB7lj9r8I76UMdoMkGnCodHOLqg==", "dev": true, + "license": "Apache-2.0", "optional": true, "dependencies": { + "b4a": "^1.6.6", "streamx": "^2.18.0" } }, @@ -4734,13 +5880,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/basic-ftp": { "version": "5.0.5", "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz", "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.0.0" } @@ -4750,6 +5898,7 @@ "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -4759,6 +5908,7 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -4770,18 +5920,21 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4792,6 +5945,7 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, + "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -4803,19 +5957,22 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/browser-stdout": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/browserify-aes": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, + "license": "MIT", "dependencies": { "buffer-xor": "^1.0.3", "cipher-base": "^1.0.0", @@ -4830,6 +5987,7 @@ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", "dev": true, + "license": "MIT", "dependencies": { "browserify-aes": "^1.0.4", "browserify-des": "^1.0.0", @@ -4841,6 +5999,7 @@ "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", "dev": true, + "license": "MIT", "dependencies": { "cipher-base": "^1.0.1", "des.js": "^1.0.0", @@ -4853,6 +6012,7 @@ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", "dev": true, + "license": "MIT", "dependencies": { "bn.js": "^5.0.0", "randombytes": "^2.0.1" @@ -4863,6 +6023,7 @@ "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz", "integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==", "dev": true, + "license": "ISC", "dependencies": { "bn.js": "^5.2.1", "browserify-rsa": "^4.1.0", @@ -4884,6 +6045,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, + "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -4898,13 +6060,15 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/browserify-sign/node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" } @@ -4913,13 +6077,15 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/browserify-zlib": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, + "license": "MIT", "dependencies": { "pako": "~1.0.5" } @@ -4943,6 +6109,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "caniuse-lite": "^1.0.30001646", "electron-to-chromium": "^1.5.4", @@ -4975,6 +6142,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" @@ -4985,6 +6153,7 @@ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz", "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.0.0" } @@ -4993,19 +6162,22 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/builtin-modules": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" }, @@ -5017,13 +6189,15 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/c12": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/c12/-/c12-1.11.1.tgz", - "integrity": "sha512-KDU0TvSvVdaYcQKQ6iPHATGz/7p/KiVjPg4vQrB6Jg/wX9R0yl5RZxWm9IoZqaIHD2+6PZd81+KMGwRr/lRIUg==", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/c12/-/c12-1.11.2.tgz", + "integrity": "sha512-oBs8a4uvSDO9dm8b7OCFW7+dgtVrwmwnrVXYzLm43ta7ep2jCn/0MhoUFygIWtxhyy6+/MG7/agvpY0U1Iemew==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "chokidar": "^3.6.0", @@ -5036,7 +6210,7 @@ "ohash": "^1.1.3", "pathe": "^1.1.2", "perfect-debounce": "^1.0.0", - "pkg-types": "^1.1.1", + "pkg-types": "^1.2.0", "rc9": "^2.1.2" }, "peerDependencies": { @@ -5053,6 +6227,7 @@ "resolved": "https://registry.npmjs.org/c8/-/c8-7.14.0.tgz", "integrity": "sha512-i04rtkkcNcCf7zsQcSv/T9EbUn4RXQ6mropeMcjFOsQXQ0iGLAr/xT6TImQg4+U9hmNpN9XdvPkjUL1IzbgxJw==", "dev": true, + "license": "ISC", "dependencies": { "@bcoe/v8-coverage": "^0.2.3", "@istanbuljs/schema": "^0.1.3", @@ -5079,6 +6254,7 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -5089,13 +6265,15 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/c8/node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -5110,6 +6288,7 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -5127,6 +6306,7 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -5145,6 +6325,7 @@ "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", "dev": true, + "license": "ISC", "dependencies": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", @@ -5167,13 +6348,15 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/cacheable-lookup": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.6.0" } @@ -5183,6 +6366,7 @@ "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", "dev": true, + "license": "MIT", "dependencies": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -5201,6 +6385,7 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, + "license": "MIT", "dependencies": { "pump": "^3.0.0" }, @@ -5216,6 +6401,7 @@ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dev": true, + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -5234,6 +6420,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "license": "MIT", "engines": { "node": ">=6" } @@ -5243,14 +6430,15 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001653", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz", - "integrity": "sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw==", + "version": "1.0.30001658", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz", + "integrity": "sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==", "dev": true, "funding": [ { @@ -5265,13 +6453,15 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chai": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", "dev": true, + "license": "MIT", "dependencies": { "assertion-error": "^1.1.0", "check-error": "^1.0.3", @@ -5289,6 +6479,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -5304,13 +6495,15 @@ "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/check-error": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", "dev": true, + "license": "MIT", "dependencies": { "get-func-name": "^2.0.2" }, @@ -5323,6 +6516,7 @@ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", "integrity": "sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==", "dev": true, + "license": "MIT", "dependencies": { "css-select": "~1.2.0", "dom-serializer": "~0.1.0", @@ -5350,6 +6544,7 @@ "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz", "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0", "css-select": "^5.1.0", @@ -5367,6 +6562,7 @@ "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0", "css-what": "^6.1.0", @@ -5383,6 +6579,7 @@ "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">= 6" }, @@ -5395,6 +6592,7 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", "dev": true, + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", @@ -5414,13 +6612,15 @@ "type": "github", "url": "https://github.com/sponsors/fb55" } - ] + ], + "license": "BSD-2-Clause" }, "node_modules/cheerio-select/node_modules/domhandler": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.3.0" }, @@ -5436,6 +6636,7 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", @@ -5450,6 +6651,7 @@ "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" }, @@ -5462,6 +6664,7 @@ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0" }, @@ -5474,6 +6677,7 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, + "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -5498,6 +6702,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -5510,6 +6715,7 @@ "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -5519,6 +6725,7 @@ "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz", "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0" } @@ -5528,6 +6735,7 @@ "resolved": "https://registry.npmjs.org/chrono-node/-/chrono-node-2.7.6.tgz", "integrity": "sha512-yugKSRLHc6B6kXxm/DwNc94zhaddAjCSO9IOGH3w7NIWNM+gUoLl/2/XLndiw4I+XhU4H2LOhC5Ab2JjS6JWsA==", "dev": true, + "license": "MIT", "dependencies": { "dayjs": "^1.10.0" }, @@ -5546,6 +6754,7 @@ "url": "https://github.com/sponsors/sibiraj-s" } ], + "license": "MIT", "engines": { "node": ">=8" } @@ -5555,6 +6764,7 @@ "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -5565,6 +6775,7 @@ "resolved": "https://registry.npmjs.org/citty/-/citty-0.1.6.tgz", "integrity": "sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "consola": "^3.2.3" @@ -5575,6 +6786,7 @@ "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" }, @@ -5587,6 +6799,7 @@ "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" } @@ -5596,6 +6809,7 @@ "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -5605,6 +6819,7 @@ "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, + "license": "MIT", "dependencies": { "restore-cursor": "^3.1.0" }, @@ -5613,10 +6828,11 @@ } }, "node_modules/cli-spinners": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-3.1.0.tgz", - "integrity": "sha512-2MH0N34TpDAs9ROPVkZJfBWFoYfv4zfkJF14PBHY4v/qRY75SLcm4WaEKNCLScsXieosa/tY/+slJ+BDswJxHQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-3.2.0.tgz", + "integrity": "sha512-pXftdQloMZzjCr3pCTIRniDcys6dDzgpgVhAHHk6TKBDbRuP1MkuetTF5KSv4YUutbOPa7+7ZrAJ2kVtbMqyXA==", "dev": true, + "license": "MIT", "engines": { "node": ">=18.20" }, @@ -5629,6 +6845,7 @@ "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", "dev": true, + "license": "MIT", "dependencies": { "slice-ansi": "^3.0.0", "string-width": "^4.2.0" @@ -5644,13 +6861,15 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cli-truncate/node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -5665,6 +6884,7 @@ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz", "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==", "dev": true, + "license": "ISC", "engines": { "node": ">= 12" } @@ -5674,6 +6894,7 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -5687,13 +6908,15 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cliui/node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -5708,6 +6931,7 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -5725,6 +6949,7 @@ "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=0.8" @@ -5735,6 +6960,7 @@ "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, + "license": "MIT", "dependencies": { "is-plain-object": "^2.0.4", "kind-of": "^6.0.2", @@ -5749,6 +6975,7 @@ "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", "dev": true, + "license": "MIT", "dependencies": { "mimic-response": "^1.0.0" }, @@ -5760,6 +6987,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -5770,19 +6998,22 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" }, "node_modules/colorette": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz", "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, + "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" }, @@ -5795,6 +7026,7 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6" } @@ -5804,6 +7036,7 @@ "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz", "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 12.0.0" } @@ -5813,6 +7046,7 @@ "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4.0.0" } @@ -5821,13 +7055,15 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/compatx": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/compatx/-/compatx-0.1.8.tgz", "integrity": "sha512-jcbsEAR81Bt5s1qOFymBufmCbXCXbk0Ql+K5ouj6gCyx2yHlu6AgmGIi9HxfKixpUDO5bCFJUHQ5uM6ecbTebw==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/compress-commons": { @@ -5835,6 +7071,7 @@ "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz", "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==", "dev": true, + "license": "MIT", "dependencies": { "crc-32": "^1.2.0", "crc32-stream": "^6.0.0", @@ -5851,6 +7088,7 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -5863,6 +7101,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz", "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==", "dev": true, + "license": "MIT", "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", @@ -5877,13 +7116,15 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "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==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -5892,13 +7133,15 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz", "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/consola": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz", "integrity": "sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": "^14.18.0 || >=16.10.0" @@ -5914,13 +7157,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/core-js": { "version": "3.38.1", @@ -5928,6 +7173,7 @@ "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "funding": { "type": "opencollective", "url": "https://opencollective.com/core-js" @@ -5938,6 +7184,7 @@ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz", "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==", "dev": true, + "license": "MIT", "dependencies": { "browserslist": "^4.23.3" }, @@ -5950,13 +7197,15 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cosmiconfig": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", "dev": true, + "license": "MIT", "dependencies": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.2.1", @@ -5973,6 +7222,7 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -5982,6 +7232,7 @@ "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", "dev": true, + "license": "ISC", "engines": { "node": ">= 6" } @@ -5991,6 +7242,7 @@ "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", "dev": true, + "license": "Apache-2.0", "bin": { "crc32": "bin/crc32.njs" }, @@ -6003,6 +7255,7 @@ "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz", "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==", "dev": true, + "license": "MIT", "dependencies": { "crc-32": "^1.2.0", "readable-stream": "^4.0.0" @@ -6016,6 +7269,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz", "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==", "dev": true, + "license": "MIT", "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", @@ -6032,6 +7286,7 @@ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", "dev": true, + "license": "MIT", "dependencies": { "bn.js": "^4.1.0", "elliptic": "^6.5.3" @@ -6041,13 +7296,15 @@ "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/create-hash": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, + "license": "MIT", "dependencies": { "cipher-base": "^1.0.1", "inherits": "^2.0.1", @@ -6061,6 +7318,7 @@ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, + "license": "MIT", "dependencies": { "cipher-base": "^1.0.3", "create-hash": "^1.1.0", @@ -6074,6 +7332,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -6088,6 +7347,7 @@ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "dev": true, + "license": "MIT", "dependencies": { "browserify-cipher": "^1.0.0", "browserify-sign": "^4.0.0", @@ -6110,6 +7370,7 @@ "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==", "dev": true, + "license": "BSD-like", "dependencies": { "boolbase": "~1.0.0", "css-what": "2.1", @@ -6134,33 +7395,30 @@ "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": "*" } }, "node_modules/cssstyle": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz", - "integrity": "sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.1.0.tgz", + "integrity": "sha512-h66W1URKpBS5YMI/V8PyXvTMFT8SupJ1IzoIV8IeBC/ji8WVmrO8dGlTi+2dh6whmdk6BiKJLD/ZBkhWbcg6nA==", "dev": true, + "license": "MIT", "dependencies": { - "rrweb-cssom": "^0.6.0" + "rrweb-cssom": "^0.7.1" }, "engines": { "node": ">=18" } }, - "node_modules/cssstyle/node_modules/rrweb-cssom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz", - "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==", - "dev": true - }, "node_modules/data-uri-to-buffer": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz", "integrity": "sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 14" } @@ -6170,6 +7428,7 @@ "resolved": "https://registry.npmjs.org/data-uri-utils/-/data-uri-utils-1.0.8.tgz", "integrity": "sha512-LHm6O/aHmTdSsIKGI6d/BJ8gQyBiai/5g57s1XKDHFecVWbq0HYlEXheohwiLbpsEHjpdHNf+D50Q/onMnNIYQ==", "dev": true, + "license": "MIT", "dependencies": { "data-uri-to-buffer": "~5.0.0" }, @@ -6182,6 +7441,7 @@ "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", "dev": true, + "license": "MIT", "dependencies": { "whatwg-mimetype": "^4.0.0", "whatwg-url": "^14.0.0" @@ -6195,6 +7455,7 @@ "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -6203,14 +7464,16 @@ "version": "1.11.13", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -6227,6 +7490,7 @@ "integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==", "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -6236,6 +7500,7 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz", "integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==", "dev": true, + "license": "MIT", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, @@ -6247,13 +7512,15 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/decompress-response": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", "dev": true, + "license": "MIT", "dependencies": { "mimic-response": "^3.1.0" }, @@ -6269,6 +7536,7 @@ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -6281,6 +7549,7 @@ "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz", "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==", "dev": true, + "license": "MIT", "dependencies": { "type-detect": "^4.0.0" }, @@ -6291,13 +7560,15 @@ "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "license": "MIT" }, "node_modules/deepmerge-ts": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.0.tgz", "integrity": "sha512-q6bNsfNBtgr8ZOQqmZbl94MmYWm+QcDNIkqCxVWiw1vKvf+y/N2dZQKdnDXn4c5Ygt/y63tDof6OCN+2YwWVEg==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=16.0.0" } @@ -6307,6 +7578,7 @@ "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "clone": "^1.0.2" @@ -6320,6 +7592,7 @@ "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" } @@ -6329,6 +7602,7 @@ "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dev": true, + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -6346,6 +7620,7 @@ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, + "license": "MIT", "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", @@ -6363,6 +7638,7 @@ "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz", "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/degenerator": { @@ -6370,6 +7646,7 @@ "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz", "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==", "dev": true, + "license": "MIT", "dependencies": { "ast-types": "^0.13.4", "escodegen": "^2.1.0", @@ -6384,6 +7661,7 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -6393,6 +7671,7 @@ "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -6402,6 +7681,7 @@ "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz", "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==", "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" @@ -6412,6 +7692,7 @@ "resolved": "https://registry.npmjs.org/destr/-/destr-2.0.3.tgz", "integrity": "sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/dezalgo": { @@ -6419,6 +7700,7 @@ "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", "dev": true, + "license": "ISC", "dependencies": { "asap": "^2.0.0", "wrappy": "1" @@ -6429,6 +7711,7 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -6438,6 +7721,7 @@ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, + "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } @@ -6447,6 +7731,7 @@ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, + "license": "MIT", "dependencies": { "bn.js": "^4.1.0", "miller-rabin": "^4.0.0", @@ -6457,13 +7742,15 @@ "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/dom-serializer": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", "dev": true, + "license": "MIT", "dependencies": { "domelementtype": "^1.3.0", "entities": "^1.1.1" @@ -6474,6 +7761,7 @@ "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.23.0.tgz", "integrity": "sha512-ArzcM/II1wCCujdCNyQjXrAFwS4mrLh4C7DZWlaI8mdh7h3BfKdNd3bKXITfl2PT9FtfQqaGvhi1vPRQPimjGA==", "dev": true, + "license": "Artistic-2.0", "engines": { "node": ">=10" }, @@ -6485,13 +7773,15 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", - "dev": true + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/domhandler": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "1" } @@ -6511,6 +7801,7 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=12" }, @@ -6522,13 +7813,15 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/easy-table": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.2.0.tgz", "integrity": "sha512-OFzVOv03YpvtcWGe5AayU5G2hgybsg3iqA6drU8UaoZyB9jLGMTrz9+asnLp/E+6qPh88yEI1gvyZFZ41dmgww==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -6541,6 +7834,7 @@ "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-3.0.5.tgz", "integrity": "sha512-sB7vSrDnFa4ezWQk9nZ/n0FdpdUuC6R1EOrlU3DL+bovcNFK28rqu2emmAUjujYEJTWIgQGqgVVWUZXMnc8iWg==", "dev": true, + "license": "MIT", "dependencies": { "@types/which": "^2.0.1", "which": "^2.0.2" @@ -6558,6 +7852,7 @@ "integrity": "sha512-3Ve9cd5ziLByUdigw6zovVeWJjVs8QHVmqOB0sJ0WNeVPcwf4p18GnxMmVvlFmYRloUwf5suNuorea4QzwBIOA==", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "@wdio/logger": "^8.38.0", "@zip.js/zip.js": "^2.7.48", @@ -6576,6 +7871,7 @@ "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.38.0.tgz", "integrity": "sha512-kcHL86RmNbcQP+Gq/vQUGlArfU6IIcbbnNp32rRIraitomZow+iEoc519rdQmSVusDozMS5DZthkgDdxK+vz6Q==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^5.1.2", "loglevel": "^1.6.0", @@ -6591,6 +7887,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -6603,6 +7900,7 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", "dev": true, + "license": "MIT", "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" }, @@ -6615,6 +7913,7 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=16" } @@ -6624,6 +7923,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" }, @@ -6639,6 +7939,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^3.1.1" }, @@ -6654,6 +7955,7 @@ "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "jake": "^10.8.5" }, @@ -6665,16 +7967,18 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz", - "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==", - "dev": true + "version": "1.5.18", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz", + "integrity": "sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==", + "dev": true, + "license": "ISC" }, "node_modules/elliptic": { "version": "6.5.7", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", "dev": true, + "license": "MIT", "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", @@ -6689,19 +7993,22 @@ "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/emojis-list": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } @@ -6711,6 +8018,7 @@ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "iconv-lite": "^0.6.2" @@ -6721,6 +8029,7 @@ "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz", "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==", "dev": true, + "license": "MIT", "dependencies": { "iconv-lite": "^0.6.3", "whatwg-encoding": "^3.1.1" @@ -6734,6 +8043,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -6746,6 +8056,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -6759,6 +8070,7 @@ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "dev": true, + "license": "MIT", "dependencies": { "once": "^1.4.0" } @@ -6768,6 +8080,7 @@ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -6781,6 +8094,7 @@ "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-colors": "^4.1.1", "strip-ansi": "^6.0.1" @@ -6793,13 +8107,15 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", - "dev": true + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/env-paths": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -6809,6 +8125,7 @@ "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz", "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==", "dev": true, + "license": "MIT", "bin": { "envinfo": "dist/cli.js" }, @@ -6820,13 +8137,15 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, + "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" } @@ -6836,6 +8155,7 @@ "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", "dev": true, + "license": "MIT", "dependencies": { "get-intrinsic": "^1.2.4" }, @@ -6848,6 +8168,7 @@ "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -6856,7 +8177,8 @@ "version": "1.5.4", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/esbuild": { "version": "0.18.20", @@ -6864,6 +8186,7 @@ "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "dev": true, "hasInstallScript": true, + "license": "MIT", "peer": true, "bin": { "esbuild": "bin/esbuild" @@ -6896,40 +8219,366 @@ "@esbuild/win32-x64": "0.18.20" } }, - "node_modules/esbuild-linux-64": { + "node_modules/esbuild-android-64": { "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz", - "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==", + "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz", + "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ - "linux" + "android" ], "engines": { "node": ">=12" } }, - "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "node_modules/esbuild-android-arm64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz", + "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==", + "cpu": [ + "arm64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], "engines": { - "node": ">=6" + "node": ">=12" } }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "node_modules/esbuild-darwin-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz", + "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=12" + } + }, + "node_modules/esbuild-darwin-arm64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz", + "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz", + "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-arm64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz", + "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-32": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz", + "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz", + "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-arm": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz", + "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-arm64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz", + "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-mips64le": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz", + "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-ppc64le": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz", + "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-riscv64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz", + "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-s390x": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz", + "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-netbsd-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz", + "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-openbsd-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz", + "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-sunos-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz", + "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-32": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz", + "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz", + "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-arm64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz", + "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/escodegen": { @@ -6937,6 +8586,7 @@ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esprima": "^4.0.1", "estraverse": "^5.2.0", @@ -6962,6 +8612,7 @@ "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" }, @@ -6985,6 +8636,7 @@ "https://github.com/sponsors/ota-meshi", "https://opencollective.com/eslint" ], + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.1.2", "@eslint-community/regexpp": "^4.11.0", @@ -7002,6 +8654,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-6.2.0.tgz", "integrity": "sha512-+SSHlThUMBb6MhXl/CqNhKvnUY3111s/1vEcu+paOwTJzniTanRZCfl0kQXNfK57XsWJ5aRsiwMlPg/FgnYsag==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "estraverse": "^5.3.0" @@ -7018,6 +8671,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.11.0.tgz", "integrity": "sha512-d12JHJDPNo7IFwTOAItCeJY1hcqoIxE0lHA8infQByLilQ9xkqrRa6laWCnsuCrf+8rUnvxXY1XuTbibRBNylA==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@es-joy/jsdoccomment": "~0.46.0", "are-docs-informative": "^0.0.2", @@ -7043,6 +8697,7 @@ "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", "spdx-license-ids": "^3.0.0" @@ -7053,6 +8708,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.10.2.tgz", "integrity": "sha512-e+s4eAf5NtJaxPhTNu3qMO0Iz40WANS93w9LQgYcvuljgvDmWi/a3rh+OrNyMHeng6aOWGJO0rCg5lH4zi8yTw==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "enhanced-resolve": "^5.17.0", @@ -7078,6 +8734,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -7087,6 +8744,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -7102,6 +8760,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-52.0.0.tgz", "integrity": "sha512-1Yzm7/m+0R4djH0tjDjfVei/ju2w3AzUGjG6q8JnuNIL5xIwsflyCooW5sfBvQp2pMYQFSWWCFONsjCax1EHng==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", "@eslint-community/eslint-utils": "^4.4.0", @@ -7135,6 +8794,7 @@ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, + "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -7164,6 +8824,7 @@ "url": "https://github.com/sponsors/sibiraj-s" } ], + "license": "MIT", "engines": { "node": ">=8" } @@ -7173,6 +8834,7 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -7185,6 +8847,7 @@ "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -7202,6 +8865,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -7215,6 +8879,7 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, + "license": "MIT", "dependencies": { "type-fest": "^0.20.2" }, @@ -7230,6 +8895,7 @@ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", "dev": true, + "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, @@ -7242,6 +8908,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -7254,6 +8921,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, + "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -7269,6 +8937,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -7281,6 +8950,7 @@ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", "dev": true, + "license": "MIT", "dependencies": { "@types/normalize-package-data": "^2.4.0", "normalize-package-data": "^2.5.0", @@ -7296,6 +8966,7 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", "dev": true, + "license": "MIT", "dependencies": { "find-up": "^4.1.0", "read-pkg": "^5.2.0", @@ -7313,6 +8984,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=8" } @@ -7322,6 +8994,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=8" } @@ -7331,6 +9004,7 @@ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.10.0.tgz", "integrity": "sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "jsesc": "~0.5.0" }, @@ -7352,6 +9026,7 @@ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", "dev": true, + "license": "MIT", "dependencies": { "min-indent": "^1.0.0" }, @@ -7364,6 +9039,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -7376,6 +9052,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-1.14.0.tgz", "integrity": "sha512-ESUpgYPOcAYQO9czugcX5OqRvn/ydDVwGCPXY4YjPqc09rHaUVUA6IE6HLQys4rXk/S+qx3EwTd1wHCwam/OWQ==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.3.2", "eslint-compat-utils": "^0.5.0", @@ -7398,6 +9075,7 @@ "resolved": "https://registry.npmjs.org/eslint-release/-/eslint-release-3.2.2.tgz", "integrity": "sha512-D606ic8e3WMx9Q8btEJu7dA9WjaHyPVac1IQHMp+YcW+pQRP/SSct0X1A+53a9l1XQqka9J+jTrY/Y/T46kEEg==", "dev": true, + "license": "MIT", "dependencies": { "dateformat": "^3.0.3", "github-api": "^3.2.2", @@ -7418,6 +9096,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -7427,6 +9106,7 @@ "resolved": "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz", "integrity": "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==", "dev": true, + "license": "MIT", "engines": { "node": ">=4.0.0" } @@ -7435,6 +9115,7 @@ "version": "8.0.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==", + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -7450,6 +9131,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -7462,6 +9144,7 @@ "resolved": "https://registry.npmjs.org/eslump/-/eslump-3.0.0.tgz", "integrity": "sha512-TAhAytVHCHMk0yDxCbS881uuAEPfoqdnmp2mkwDgBoM5lVBfoE9nYxq0LCdgJS8NASV8V8NIUF3N4YjhiuuTBg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", "mkdirp": "^1.0.4", @@ -7481,6 +9164,7 @@ "version": "10.1.0", "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", + "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.12.0", "acorn-jsx": "^5.3.2", @@ -7498,6 +9182,7 @@ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true, + "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -7510,6 +9195,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -7521,6 +9207,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -7532,6 +9219,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } @@ -7540,12 +9228,14 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } @@ -7555,6 +9245,7 @@ "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -7564,6 +9255,7 @@ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.x" } @@ -7573,6 +9265,7 @@ "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", "dev": true, + "license": "MIT", "dependencies": { "md5.js": "^1.3.4", "safe-buffer": "^5.1.1" @@ -7583,6 +9276,7 @@ "resolved": "https://registry.npmjs.org/execa/-/execa-9.3.1.tgz", "integrity": "sha512-gdhefCCNy/8tpH/2+ajP9IQc14vXchNdd0weyzSJEFURhRMGncQ+zKFxwjAufIewPEJm9BPOaJnvg2UtlH2gPQ==", "dev": true, + "license": "MIT", "dependencies": { "@sindresorhus/merge-streams": "^4.0.0", "cross-spawn": "^7.0.3", @@ -7609,6 +9303,7 @@ "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/expect-utils": "^29.7.0", "jest-get-type": "^29.6.3", @@ -7625,6 +9320,7 @@ "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-5.0.2.tgz", "integrity": "sha512-vkUwoUvURH25pRClX1I5oCIObju8cT9kN5jQH4RN5QxKXK7hdowYd8dbDXD5JKOE/OutdYx67YtCl8vpZq/uSg==", "dev": true, + "license": "MIT", "dependencies": { "@vitest/snapshot": "^2.0.5", "expect": "^29.7.0", @@ -7656,6 +9352,7 @@ "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.5.tgz", "integrity": "sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==", "dev": true, + "license": "MIT", "dependencies": { "@vitest/pretty-format": "2.0.5", "magic-string": "^0.30.10", @@ -7669,13 +9366,15 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", "dev": true, + "license": "MIT", "dependencies": { "is-extendable": "^0.1.0" }, @@ -7688,6 +9387,7 @@ "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, + "license": "MIT", "dependencies": { "chardet": "^0.7.0", "iconv-lite": "^0.4.24", @@ -7702,6 +9402,7 @@ "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", @@ -7722,6 +9423,7 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, + "license": "MIT", "dependencies": { "pump": "^3.0.0" }, @@ -7735,19 +9437,22 @@ "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "license": "MIT" }, "node_modules/fast-fifo": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-glob": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -7764,6 +9469,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -7774,17 +9480,19 @@ "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "license": "MIT" }, "node_modules/fast-xml-parser": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz", - "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz", + "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==", "dev": true, "funding": [ { @@ -7796,6 +9504,7 @@ "url": "https://paypal.me/naturalintelligence" } ], + "license": "MIT", "dependencies": { "strnum": "^1.0.5" }, @@ -7808,6 +9517,7 @@ "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4.9.1" } @@ -7816,6 +9526,7 @@ "version": "1.17.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "license": "ISC", "dependencies": { "reusify": "^1.0.4" } @@ -7825,6 +9536,7 @@ "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" } @@ -7844,6 +9556,7 @@ "url": "https://paypal.me/jimmywarting" } ], + "license": "MIT", "dependencies": { "node-domexception": "^1.0.0", "web-streams-polyfill": "^3.0.3" @@ -7857,6 +9570,7 @@ "resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz", "integrity": "sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==", "dev": true, + "license": "MIT", "dependencies": { "is-unicode-supported": "^2.0.0" }, @@ -7871,6 +9585,7 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "license": "MIT", "dependencies": { "flat-cache": "^4.0.0" }, @@ -7883,6 +9598,7 @@ "resolved": "https://registry.npmjs.org/file-extension/-/file-extension-4.0.5.tgz", "integrity": "sha512-l0rOL3aKkoi6ea7MNZe6OHgqYYpn48Qfflr8Pe9G9JPPTx5A+sfboK91ZufzIs59/lPqh351l0eb6iKU9J5oGg==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4" } @@ -7892,6 +9608,7 @@ "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", "dev": true, + "license": "Apache-2.0", "dependencies": { "minimatch": "^5.0.1" } @@ -7901,6 +9618,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -7910,6 +9628,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -7922,6 +9641,7 @@ "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", "integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==", "dev": true, + "license": "MIT", "dependencies": { "is-object": "~1.0.1", "merge-descriptors": "~1.0.0" @@ -7935,6 +9655,7 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -7947,6 +9668,7 @@ "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-2.0.2.tgz", "integrity": "sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -7956,6 +9678,7 @@ "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", "dev": true, + "license": "MIT", "dependencies": { "commondir": "^1.0.1", "make-dir": "^3.0.2", @@ -7972,6 +9695,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -7988,6 +9712,7 @@ "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true, + "license": "BSD-3-Clause", "bin": { "flat": "cli.js" } @@ -7996,6 +9721,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "license": "MIT", "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.4" @@ -8007,12 +9733,13 @@ "node_modules/flatted": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==" + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", "dev": true, "funding": [ { @@ -8020,6 +9747,7 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -8034,6 +9762,7 @@ "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", "dev": true, + "license": "MIT", "dependencies": { "is-callable": "^1.1.3" } @@ -8043,6 +9772,7 @@ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", "dev": true, + "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^3.0.2" @@ -8055,13 +9785,15 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/form-data": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -8076,6 +9808,7 @@ "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", "dev": true, + "license": "MIT", "dependencies": { "fetch-blob": "^3.1.2" }, @@ -8088,6 +9821,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -8102,6 +9836,7 @@ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^7.0.3" }, @@ -8114,6 +9849,7 @@ "resolved": "https://registry.npmjs.org/fs-teardown/-/fs-teardown-0.1.3.tgz", "integrity": "sha512-Z84BPdaEeFI+SGiq/TKZgSVSgAsrNhbZ62cWmIpL2z9Ly40W6PKAzafnytJk0Wg2qnoXMA7gPyEXgnLjAi63iA==", "dev": true, + "license": "MIT", "dependencies": { "fs-extra": "^10.0.0" } @@ -8122,13 +9858,30 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "dev": true, + "license": "ISC" + }, + "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/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -8138,6 +9891,7 @@ "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, + "license": "MIT", "dependencies": { "globule": "^1.0.0" }, @@ -8146,11 +9900,12 @@ } }, "node_modules/geckodriver": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-4.4.3.tgz", - "integrity": "sha512-79rvaq8pvKVUtuM9XBjQApb04kOVkl3TFRX+zTt1wlmL+wqpt85ocWCdqiENU/3zIzg2Me21eClUcnE7F1kL2w==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-4.4.4.tgz", + "integrity": "sha512-0zaw19tcmWeluqx7+Y559JGBtidu1D0Lb8ElYKiNEQu8r3sCfrLUf5V10xypl8u29ZLbgRV7WflxCJVTCkCMFA==", "dev": true, "hasInstallScript": true, + "license": "MPL-2.0", "dependencies": { "@wdio/logger": "^9.0.0", "@zip.js/zip.js": "^2.7.48", @@ -8173,6 +9928,7 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=16" } @@ -8182,6 +9938,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^3.1.1" }, @@ -8197,6 +9954,7 @@ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -8206,6 +9964,7 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -8215,6 +9974,7 @@ "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -8224,6 +9984,7 @@ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dev": true, + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -8242,13 +10003,15 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/get-package-type": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.0.0" } @@ -8258,6 +10021,7 @@ "resolved": "https://registry.npmjs.org/get-port/-/get-port-7.1.0.tgz", "integrity": "sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==", "dev": true, + "license": "MIT", "engines": { "node": ">=16" }, @@ -8270,6 +10034,7 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz", "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==", "dev": true, + "license": "MIT", "dependencies": { "@sec-ant/readable-stream": "^0.4.1", "is-stream": "^4.0.1" @@ -8282,10 +10047,11 @@ } }, "node_modules/get-tsconfig": { - "version": "4.7.6", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.6.tgz", - "integrity": "sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.0.tgz", + "integrity": "sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==", "dev": true, + "license": "MIT", "dependencies": { "resolve-pkg-maps": "^1.0.0" }, @@ -8298,6 +10064,7 @@ "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz", "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==", "dev": true, + "license": "MIT", "dependencies": { "basic-ftp": "^5.0.2", "data-uri-to-buffer": "^6.0.2", @@ -8313,6 +10080,7 @@ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz", "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 14" } @@ -8322,6 +10090,7 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -8336,6 +10105,7 @@ "resolved": "https://registry.npmjs.org/giget/-/giget-1.2.3.tgz", "integrity": "sha512-8EHPljDvs7qKykr6uw8b+lqLiUc/vUg+KVTI0uND4s63TdsZM2Xus3mflvF0DDG9SiM4RlCkFGL+7aAjRmV7KA==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "citty": "^0.1.6", @@ -8356,6 +10126,7 @@ "resolved": "https://registry.npmjs.org/github-api/-/github-api-3.4.0.tgz", "integrity": "sha512-2yYqYS6Uy4br1nw0D3VrlYWxtGTkUhIZrumBrcBwKdBOzMT8roAe8IvI6kjIOkxqxapKR5GkEsHtz3Du/voOpA==", "dev": true, + "license": "BSD-3-Clause-Clear", "dependencies": { "axios": "^0.21.1", "debug": "^2.2.0", @@ -8368,6 +10139,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -8376,13 +10148,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "dev": true, + "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", @@ -8402,6 +10176,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "license": "ISC", "dependencies": { "is-glob": "^4.0.3" }, @@ -8413,13 +10188,15 @@ "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 + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/glob/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -8429,6 +10206,7 @@ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", "dev": true, + "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -8445,6 +10223,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -8460,6 +10239,7 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-15.9.0.tgz", "integrity": "sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -8472,6 +10252,7 @@ "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz", "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "@sindresorhus/merge-streams": "^2.1.0", @@ -8493,6 +10274,7 @@ "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=18" @@ -8506,6 +10288,7 @@ "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz", "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==", "dev": true, + "license": "MIT", "dependencies": { "glob": "~7.1.1", "lodash": "^4.17.21", @@ -8521,6 +10304,7 @@ "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -8541,6 +10325,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -8553,6 +10338,7 @@ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "dev": true, + "license": "MIT", "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -8565,6 +10351,7 @@ "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", "dev": true, + "license": "MIT", "dependencies": { "@sindresorhus/is": "^4.0.0", "@szmarczak/http-timer": "^4.0.5", @@ -8589,19 +10376,22 @@ "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 + "dev": true, + "license": "ISC" }, "node_modules/grapheme-splitter": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/gray-matter": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz", "integrity": "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==", "dev": true, + "license": "MIT", "dependencies": { "js-yaml": "^3.13.1", "kind-of": "^6.0.2", @@ -8617,6 +10407,7 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, + "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" } @@ -8626,6 +10417,7 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -8638,13 +10430,15 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/growl": { "version": "1.10.5", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4.x" } @@ -8654,6 +10448,7 @@ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^2.0.0" }, @@ -8666,6 +10461,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -8674,6 +10470,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -8683,6 +10480,7 @@ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dev": true, + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0" }, @@ -8695,6 +10493,7 @@ "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -8707,6 +10506,7 @@ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -8719,6 +10519,7 @@ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, + "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" }, @@ -8734,6 +10535,7 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-2.0.1.tgz", "integrity": "sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w==", "dev": true, + "license": "MIT", "dependencies": { "kind-of": "^6.0.2" }, @@ -8746,6 +10548,7 @@ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==", "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -8759,6 +10562,7 @@ "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/hash.js": { @@ -8766,6 +10570,7 @@ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "minimalistic-assert": "^1.0.1" @@ -8776,6 +10581,7 @@ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "dev": true, + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -8788,6 +10594,7 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true, + "license": "MIT", "bin": { "he": "bin/he" } @@ -8797,6 +10604,7 @@ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", "dev": true, + "license": "MIT", "dependencies": { "hash.js": "^1.0.3", "minimalistic-assert": "^1.0.0", @@ -8808,19 +10616,22 @@ "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz", "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/html-encoding-sniffer": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", "dev": true, + "license": "MIT", "dependencies": { "whatwg-encoding": "^3.1.1" }, @@ -8832,19 +10643,22 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/htmlfy": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/htmlfy/-/htmlfy-0.2.1.tgz", "integrity": "sha512-HoomFHQ3av1uhq+7FxJTq4Ns0clAD+tGbQNrSd0WFY3UAjjUk6G3LaWEqdgmIXYkY4pexZiyZ3ykZJhQlM0J5A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/htmlparser2": { "version": "3.10.1", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", "dev": true, + "license": "MIT", "dependencies": { "domelementtype": "^1.3.1", "domhandler": "^2.3.0", @@ -8858,13 +10672,15 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", - "dev": true + "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" @@ -8878,6 +10694,7 @@ "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", "dev": true, + "license": "MIT", "dependencies": { "quick-lru": "^5.1.1", "resolve-alpn": "^1.0.0" @@ -8890,13 +10707,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/https-proxy-agent": { "version": "7.0.5", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -8910,6 +10729,7 @@ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.0.tgz", "integrity": "sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=18.18.0" } @@ -8919,6 +10739,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -8944,12 +10765,14 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "BSD-3-Clause" }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", "engines": { "node": ">= 4" } @@ -8959,6 +10782,7 @@ "resolved": "https://registry.npmjs.org/image-extensions/-/image-extensions-1.1.0.tgz", "integrity": "sha512-P0t7ByhK8Jk9TU05ct/7+f7h8dNuXq5OY4m0IO/T+1aga/qHkpC0Wf472x3FLdq/zFDG17pgapCM3JDTxwZzow==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -8967,12 +10791,14 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -8989,6 +10815,7 @@ "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", "dev": true, + "license": "MIT", "dependencies": { "pkg-dir": "^4.2.0", "resolve-cwd": "^3.0.0" @@ -9008,6 +10835,7 @@ "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz", "integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -9017,6 +10845,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "license": "MIT", "engines": { "node": ">=0.8.19" } @@ -9026,6 +10855,7 @@ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -9036,6 +10866,7 @@ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -9045,16 +10876,19 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/inquirer": { - "version": "10.1.8", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-10.1.8.tgz", - "integrity": "sha512-syxGpOzLyqVeZi1KDBjRTnCn5PiGWySGHP0BbqXbqsEK0ckkZk3egAepEWslUjZXj0rhkUapVXM/IpADWe4D6w==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-10.2.2.tgz", + "integrity": "sha512-tyao/4Vo36XnUItZ7DnUXX4f1jVao2mSrleV/5IPtW/XAEA26hRVsbc68nuTEKWcr5vMP/1mVoT2O7u8H4v1Vg==", "dev": true, + "license": "MIT", "dependencies": { - "@inquirer/prompts": "^5.3.8", - "@inquirer/type": "^1.5.2", + "@inquirer/core": "^9.1.0", + "@inquirer/prompts": "^5.5.0", + "@inquirer/type": "^1.5.3", "@types/mute-stream": "^0.0.4", "ansi-escapes": "^4.3.2", "mute-stream": "^1.0.0", @@ -9070,6 +10904,7 @@ "resolved": "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.3.5.tgz", "integrity": "sha512-gZHC7f/cJgXz7MXlHFBxPVMsvIbev1OQN1uKQYKVJDydGNm9oYf9JstbU4Atnh/eSvk41WtEovoRm+8IF686xg==", "dev": true, + "license": "BSD-3-Clause", "bin": { "install-from-cache": "bin/install-from-cache.js", "save-to-github-cache": "bin/save-to-github-cache.js" @@ -9080,6 +10915,7 @@ "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.10" } @@ -9089,6 +10925,7 @@ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", "dev": true, + "license": "MIT", "dependencies": { "jsbn": "1.1.0", "sprintf-js": "^1.1.3" @@ -9102,6 +10939,7 @@ "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz", "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -9111,6 +10949,7 @@ "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz", "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -9120,6 +10959,7 @@ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -9135,13 +10975,15 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -9154,6 +10996,7 @@ "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", "dev": true, + "license": "MIT", "dependencies": { "builtin-modules": "^3.3.0" }, @@ -9169,6 +11012,7 @@ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -9181,6 +11025,7 @@ "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz", "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==", "dev": true, + "license": "MIT", "dependencies": { "ci-info": "^1.5.0" }, @@ -9192,13 +11037,15 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-core-module": { "version": "2.15.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", "dev": true, + "license": "MIT", "dependencies": { "hasown": "^2.0.2" }, @@ -9214,6 +11061,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -9222,6 +11070,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -9231,6 +11080,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -9240,6 +11090,7 @@ "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", "dev": true, + "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -9254,6 +11105,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -9265,13 +11117,15 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-nan": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz", "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.0", "define-properties": "^1.1.3" @@ -9288,6 +11142,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -9297,6 +11152,7 @@ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -9306,6 +11162,7 @@ "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz", "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -9314,6 +11171,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -9323,6 +11181,7 @@ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz", "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -9335,6 +11194,7 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, + "license": "MIT", "dependencies": { "isobject": "^3.0.1" }, @@ -9346,13 +11206,15 @@ "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 + "dev": true, + "license": "MIT" }, "node_modules/is-regexp": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -9362,6 +11224,7 @@ "resolved": "https://registry.npmjs.org/is-relative-url/-/is-relative-url-3.0.0.tgz", "integrity": "sha512-U1iSYRlY2GIMGuZx7gezlB5dp1Kheaym7zKzO1PV06mOihiWTXejLwm4poEJysPyXF+HtK/BEd0DVlcCh30pEA==", "dev": true, + "license": "MIT", "dependencies": { "is-absolute-url": "^3.0.0" }, @@ -9374,6 +11237,7 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz", "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -9386,6 +11250,7 @@ "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dev": true, + "license": "MIT", "dependencies": { "which-typed-array": "^1.1.14" }, @@ -9401,6 +11266,7 @@ "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.0.0.tgz", "integrity": "sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -9413,6 +11279,7 @@ "resolved": "https://registry.npmjs.org/is-uri/-/is-uri-1.2.6.tgz", "integrity": "sha512-kNciklu//Ki8BUmRseLTfG/WW55qDHavf3MKUic8wvXR3d7etbSMoQPTpjvDeLVekESSgJM4AG+BESIKU02u3A==", "dev": true, + "license": "MIT", "dependencies": { "parse-uri": "~1.0.3", "punycode2": "~1.0.0" @@ -9425,18 +11292,21 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "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==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -9447,6 +11317,7 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -9462,6 +11333,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=8" } @@ -9471,6 +11343,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@babel/core": "^7.23.9", "@babel/parser": "^7.23.9", @@ -9487,6 +11360,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "istanbul-lib-coverage": "^3.0.0", "make-dir": "^4.0.0", @@ -9501,6 +11375,7 @@ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, + "license": "MIT", "dependencies": { "semver": "^7.5.3" }, @@ -9516,6 +11391,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz", "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@jridgewell/trace-mapping": "^0.3.23", "debug": "^4.1.1", @@ -9530,6 +11406,7 @@ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "html-escaper": "^2.0.0", "istanbul-lib-report": "^3.0.0" @@ -9543,6 +11420,7 @@ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", "dev": true, + "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -9558,6 +11436,7 @@ "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "async": "^3.2.3", "chalk": "^4.0.2", @@ -9576,6 +11455,7 @@ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.0.0", "diff-sequences": "^29.6.3", @@ -9591,6 +11471,7 @@ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", "dev": true, + "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } @@ -9600,6 +11481,7 @@ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.0.0", "jest-diff": "^29.7.0", @@ -9615,6 +11497,7 @@ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", "@jest/types": "^29.6.3", @@ -9635,6 +11518,7 @@ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -9644,6 +11528,7 @@ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", @@ -9661,6 +11546,7 @@ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", @@ -9675,6 +11561,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -9690,6 +11577,7 @@ "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz", "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==", "dev": true, + "license": "MIT", "bin": { "jiti": "bin/jiti.js" } @@ -9698,18 +11586,21 @@ "version": "2.6.4", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -9721,13 +11612,15 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/jsdoc-type-pratt-parser": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz", "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=12.0.0" } @@ -9737,6 +11630,7 @@ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.3.tgz", "integrity": "sha512-MyL55p3Ut3cXbeBEG7Hcv0mVM8pp8PBNWxRqchZnSfAiES1v1mRnMeFfaHWIPULpwsYfvO+ZmMZz5tGCnjzDUQ==", "dev": true, + "license": "MIT", "dependencies": { "cssstyle": "^4.0.1", "data-urls": "^5.0.0", @@ -9777,6 +11671,7 @@ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true, + "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, @@ -9787,29 +11682,34 @@ "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "license": "MIT" }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "license": "MIT" }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, + "license": "MIT", "bin": { "json5": "lib/cli.js" }, @@ -9822,6 +11722,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -9834,6 +11735,7 @@ "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", "dev": true, + "license": "(MIT OR GPL-3.0-or-later)", "dependencies": { "lie": "~3.3.0", "pako": "~1.0.2", @@ -9846,6 +11748,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, + "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -9860,13 +11763,15 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/jszip/node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" } @@ -9875,12 +11780,14 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } @@ -9890,6 +11797,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -9899,15 +11807,16 @@ "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">= 8" } }, "node_modules/knip": { - "version": "5.27.4", - "resolved": "https://registry.npmjs.org/knip/-/knip-5.27.4.tgz", - "integrity": "sha512-7t1yqIKxaVGYD1cLI4raVLWi9cNqv+JNbngc8mgvTVJbomnxOg1pjxgCGEztB7eVgD+6VEwf7Jg5WHXzk+Kbpw==", + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/knip/-/knip-5.30.0.tgz", + "integrity": "sha512-QDpxtXosXK3OBnmWC2LJudjJROozAXyGzSi+aTuEx/Pf9/OKjmegQWix+X6uBYhPbMb8YEFcKWvI7qBnQCkIEA==", "dev": true, "funding": [ { @@ -9923,6 +11832,7 @@ "url": "https://polar.sh/webpro-nl" } ], + "license": "ISC", "dependencies": { "@nodelib/fs.walk": "1.2.8", "@snyk/github-codeowners": "1.1.0", @@ -9958,6 +11868,7 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -9970,6 +11881,7 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz", "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==", "dev": true, + "license": "MIT", "engines": { "node": ">=14.16" }, @@ -9982,6 +11894,7 @@ "resolved": "https://registry.npmjs.org/knitwork/-/knitwork-1.1.0.tgz", "integrity": "sha512-oHnmiBUVHz1V+URE77PNot2lv3QiYU2zQf1JjOVkMt3YDKGbu8NAFr+c4mcNOhdsGrB/VpVbRwPwhiXrPhxQbw==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/lazystream": { @@ -9989,6 +11902,7 @@ "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", "dev": true, + "license": "MIT", "dependencies": { "readable-stream": "^2.0.5" }, @@ -10001,6 +11915,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, + "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -10015,13 +11930,15 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "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==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" } @@ -10030,6 +11947,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -10043,6 +11961,7 @@ "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", "dev": true, + "license": "MIT", "dependencies": { "immediate": "~3.0.5" } @@ -10052,6 +11971,7 @@ "resolved": "https://registry.npmjs.org/linefix/-/linefix-0.1.1.tgz", "integrity": "sha512-fHYLcNWUGTs3QjR8GD8tzHmkVbIoTbjcB5MLXs1Iu1cZazTvcUKaCiuarDM0jVygLnpxLTVbbihLJevKARmqrA==", "dev": true, + "license": "MIT", "bin": { "linefix": "bin/fix.js" } @@ -10060,13 +11980,15 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true + "dev": true, + "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==", "dev": true, + "license": "MIT", "dependencies": { "uc.micro": "^1.0.1" } @@ -10076,6 +11998,7 @@ "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-11.2.6.tgz", "integrity": "sha512-Vti55pUnpvPE0J9936lKl0ngVeTdSZpEdTNhASbkaWX7J5R9OEifo1INBGQuGW4zmy6OG+TcWPJ3m5yuy5Q8Tg==", "dev": true, + "license": "MIT", "dependencies": { "cli-truncate": "2.1.0", "colorette": "^1.4.0", @@ -10104,6 +12027,7 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", "dev": true, + "license": "MIT", "engines": { "node": ">= 12" } @@ -10113,6 +12037,7 @@ "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, + "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", @@ -10136,6 +12061,7 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -10148,6 +12074,7 @@ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=10.17.0" } @@ -10157,6 +12084,7 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -10169,6 +12097,7 @@ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.0.0" }, @@ -10180,13 +12109,15 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/lint-staged/node_modules/strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -10196,6 +12127,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -10211,6 +12143,7 @@ "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz", "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==", "dev": true, + "license": "MIT", "dependencies": { "cli-truncate": "^2.1.0", "colorette": "^2.0.16", @@ -10237,19 +12170,22 @@ "version": "2.0.20", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/listr2/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/listr2/node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -10264,6 +12200,7 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -10281,6 +12218,7 @@ "resolved": "https://registry.npmjs.org/load-perf/-/load-perf-0.2.0.tgz", "integrity": "sha512-r+vDehLjDzxre+JyBp74Zwp7uUOuxr+IYMDGVh29/c2D7KXecb0k9OGDM3vBXjmPWKsKucR2PJ1fVKbGRsalhA==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^1.1.0", "object-assign": "^4.0.1", @@ -10299,6 +12237,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -10308,6 +12247,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -10317,6 +12257,7 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^2.2.1", "escape-string-regexp": "^1.0.2", @@ -10333,6 +12274,7 @@ "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" } @@ -10341,7 +12283,8 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz", "integrity": "sha512-hYsfI0s4lfQ2rHVFKXwAr/L/ZSbq9TZwgXtZqW7ANcn9o9GKvcbWxOnxx7jykXf/Ezv1V8TvaBEKcGK7DWKX5A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/load-perf/node_modules/levn": { "version": "0.2.5", @@ -10387,6 +12330,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^2.0.0" }, @@ -10399,6 +12343,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.0" } @@ -10408,6 +12353,7 @@ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "~1.1.2" }, @@ -10420,6 +12366,7 @@ "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.11.5" } @@ -10429,6 +12376,7 @@ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, + "license": "MIT", "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -10443,6 +12391,7 @@ "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz", "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==", "dev": true, + "license": "MIT", "engines": { "node": ">=14" }, @@ -10451,9 +12400,9 @@ } }, "node_modules/locate-app": { - "version": "2.4.32", - "resolved": "https://registry.npmjs.org/locate-app/-/locate-app-2.4.32.tgz", - "integrity": "sha512-2Dqy98qk0Rm1h9mSExxT/4NBSgVOLw0C6Nr41Go2+UWDkZ6MmjHPa6+5MCE7EJIAQV0JVRNA0iu5K9eJSlozlA==", + "version": "2.4.39", + "resolved": "https://registry.npmjs.org/locate-app/-/locate-app-2.4.39.tgz", + "integrity": "sha512-hl7NwJrpGKLlmVgNrMRxFLRJTjve6IIav08bnv4MQSjahFRUPPVp+R02PSYpll6wY/YZqMrha68uScTmRJeMeA==", "dev": true, "funding": [ { @@ -10465,8 +12414,9 @@ "url": "https://github.com/hejny/locate-app/blob/main/README.md#%EF%B8%8F-contributing" } ], + "license": "SEE LICENSE IN LICENSE", "dependencies": { - "@promptbook/utils": "0.67.5", + "@promptbook/utils": "0.70.0-1", "type-fest": "2.13.0", "userhome": "1.0.0" } @@ -10476,6 +12426,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.13.0.tgz", "integrity": "sha512-lPfAm42MxE4/456+QyIaaVBAwgpJb6xZ8PRu09utnhPdWwcyj9vgy6Sq0Z5yNbJ21EdxB5dRU/Qg8bsyAMtlcw==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=12.20" }, @@ -10487,6 +12438,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -10501,132 +12453,154 @@ "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.assignin": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", "integrity": "sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.bind": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz", "integrity": "sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.defaults": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.filter": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", "integrity": "sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.flatten": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.flattendeep": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.foreach": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.map": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", "integrity": "sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==", - "dev": true + "dev": true, + "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==" + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "license": "MIT" }, "node_modules/lodash.pick": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.pickby": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz", "integrity": "sha512-AZV+GsS/6ckvPOVQPXSiFFacKvKB4kOQu6ynt9wz0F3LO4R9Ij4K1ddYsIytDpSgLz88JHd9P+oaLeej5/Sl7Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.reduce": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz", "integrity": "sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.reject": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", "integrity": "sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.some": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.union": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.zip": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz", "integrity": "sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/log-symbols": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.0.0" }, @@ -10639,6 +12613,7 @@ "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", "dev": true, + "license": "MIT", "dependencies": { "ansi-escapes": "^4.3.0", "cli-cursor": "^3.1.0", @@ -10657,6 +12632,7 @@ "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -10670,10 +12646,11 @@ } }, "node_modules/loglevel": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.1.tgz", - "integrity": "sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg==", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.2.tgz", + "integrity": "sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6.0" }, @@ -10686,13 +12663,15 @@ "version": "0.8.4", "resolved": "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz", "integrity": "sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/loupe": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", "dev": true, + "license": "MIT", "dependencies": { "get-func-name": "^2.0.1" } @@ -10702,6 +12681,7 @@ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -10711,6 +12691,7 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^3.0.2" } @@ -10720,6 +12701,7 @@ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0" } @@ -10729,6 +12711,7 @@ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, + "license": "MIT", "dependencies": { "semver": "^6.0.0" }, @@ -10744,6 +12727,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -10753,6 +12737,7 @@ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", "dev": true, + "license": "ISC", "dependencies": { "@npmcli/agent": "^2.0.0", "cacache": "^18.0.0", @@ -10776,6 +12761,7 @@ "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz", "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1", "entities": "~2.1.0", @@ -10791,13 +12777,15 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/markdown-it-container/-/markdown-it-container-3.0.0.tgz", "integrity": "sha512-y6oKTq4BB9OQuY/KLfk/O3ysFhB3IMYoIWhGJEidXt1NQFocFK2sA2t0NYZAMyMShAGL6x5OPIbrmXPIqaN9rw==", - "dev": true + "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==", "dev": true, + "license": "BSD-2-Clause", "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -10807,6 +12795,7 @@ "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz", "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==", "dev": true, + "license": "MIT", "bin": { "marked": "bin/marked.js" }, @@ -10819,6 +12808,7 @@ "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", "dev": true, + "license": "MIT", "dependencies": { "hash-base": "^3.0.0", "inherits": "^2.0.1", @@ -10829,19 +12819,22 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/memoize-one": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz", "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/merge-descriptors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/sindresorhus" } @@ -10850,13 +12843,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } @@ -10866,6 +12861,7 @@ "resolved": "https://registry.npmjs.org/metascraper/-/metascraper-5.45.23.tgz", "integrity": "sha512-RLtEikq+2IggEqbxx/AajdoRGbipBNtmPAR0cJ9X2180g49767pfL9ogA9bDztur3w11r5bK7Fu1hYARPjZRKQ==", "dev": true, + "license": "MIT", "dependencies": { "@metascraper/helpers": "^5.45.22", "cheerio": "~1.0.0", @@ -10881,6 +12877,7 @@ "resolved": "https://registry.npmjs.org/metascraper-description/-/metascraper-description-5.45.22.tgz", "integrity": "sha512-z6z3MJrLcl366xagzSi+x56JOVSdTevAq5JMVh9NxLDKRfNSTmXYqCVC8mZmcJxjHCqJ2iinAMfgDvIdVgbVdA==", "dev": true, + "license": "MIT", "dependencies": { "@metascraper/helpers": "^5.45.22" }, @@ -10893,6 +12890,7 @@ "resolved": "https://registry.npmjs.org/metascraper-image/-/metascraper-image-5.45.22.tgz", "integrity": "sha512-oo0KHIReTrid2iVcJMi95hs+W0/D/u7rpMhyS9mJz30vpRC7j45Or4EGUC2yuUGq7wAqG1ehuWFwkuaJ9cF/mA==", "dev": true, + "license": "MIT", "dependencies": { "@metascraper/helpers": "^5.45.22" }, @@ -10905,6 +12903,7 @@ "resolved": "https://registry.npmjs.org/metascraper-logo/-/metascraper-logo-5.45.22.tgz", "integrity": "sha512-5jydNOnEWUhgcCE/OFMLL2qHcYINvY/GSQ4uIYbunLbgApozpDg5kR8S65itQU28O20PnjJJ4RZKfHu7g+CNSA==", "dev": true, + "license": "MIT", "dependencies": { "@metascraper/helpers": "^5.45.22", "lodash": "~4.17.21" @@ -10918,6 +12917,7 @@ "resolved": "https://registry.npmjs.org/metascraper-logo-favicon/-/metascraper-logo-favicon-5.45.22.tgz", "integrity": "sha512-Yya1Z661CQ7Olt6WR+IcJaiScmCSZxdD5oAA4ctkzSBJkiy4pc0CSRFiPJ1CZsElYZsnVXepm6OpDa5lr/rCHA==", "dev": true, + "license": "MIT", "dependencies": { "@keyvhq/memoize": "~2.1.1", "@metascraper/helpers": "^5.45.22", @@ -10933,6 +12933,7 @@ "resolved": "https://registry.npmjs.org/metascraper-title/-/metascraper-title-5.45.22.tgz", "integrity": "sha512-bjG29m8FLFtZU0QFdDJATeafuAxp2pkOOLxgeEZyRdx6QXl9HyCQenh9MnFNSK4PXH7v/9KVZt8S8e2pzY4uYA==", "dev": true, + "license": "MIT", "dependencies": { "@metascraper/helpers": "^5.45.22" }, @@ -10945,6 +12946,7 @@ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz", "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==", "dev": true, + "license": "MIT", "dependencies": { "cheerio-select": "^2.1.0", "dom-serializer": "^2.0.0", @@ -10970,6 +12972,7 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", "dev": true, + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", @@ -10989,13 +12992,15 @@ "type": "github", "url": "https://github.com/sponsors/fb55" } - ] + ], + "license": "BSD-2-Clause" }, "node_modules/metascraper/node_modules/domhandler": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.3.0" }, @@ -11011,6 +13016,7 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", @@ -11025,6 +13031,7 @@ "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" }, @@ -11044,6 +13051,7 @@ "url": "https://github.com/sponsors/fb55" } ], + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", @@ -11056,6 +13064,7 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" @@ -11069,6 +13078,7 @@ "resolved": "https://registry.npmjs.org/microsoft-capitalize/-/microsoft-capitalize-1.0.5.tgz", "integrity": "sha512-iqDMU9J643BHg8Zp7EMZNLTp6Pgs2f1S2SMnCW2VlUqMs17xCZ5vwVjalBJEGVcUfG+/1ePqeEGcMW3VfzHK5A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10" } @@ -11078,6 +13088,7 @@ "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", "dev": true, + "license": "MIT", "dependencies": { "bn.js": "^4.0.0", "brorand": "^1.0.1" @@ -11090,13 +13101,15 @@ "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true + "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==", "dev": true, + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -11109,6 +13122,7 @@ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -11118,6 +13132,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "dev": true, + "license": "MIT", "dependencies": { "mime-db": "1.52.0" }, @@ -11130,6 +13145,7 @@ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.0.0.tgz", "integrity": "sha512-PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -11139,6 +13155,7 @@ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -11148,6 +13165,7 @@ "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -11156,18 +13174,21 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/minimalistic-crypto-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -11180,6 +13201,7 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -11189,6 +13211,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "dev": true, + "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } @@ -11198,6 +13221,7 @@ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^7.0.3" }, @@ -11210,6 +13234,7 @@ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", "dev": true, + "license": "MIT", "dependencies": { "minipass": "^7.0.3", "minipass-sized": "^1.0.3", @@ -11227,6 +13252,7 @@ "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -11239,6 +13265,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -11250,13 +13277,15 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/minipass-pipeline": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -11269,6 +13298,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -11280,13 +13310,15 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/minipass-sized": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -11299,6 +13331,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -11310,13 +13343,15 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/minizlib": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "dev": true, + "license": "MIT", "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" @@ -11330,6 +13365,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -11341,13 +13377,15 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true, + "license": "MIT", "bin": { "mkdirp": "bin/cmd.js" }, @@ -11360,6 +13398,7 @@ "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz", "integrity": "sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==", "dev": true, + "license": "MIT", "dependencies": { "acorn": "^8.11.3", "pathe": "^1.1.2", @@ -11372,6 +13411,7 @@ "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==", "dev": true, + "license": "MIT", "dependencies": { "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", @@ -11416,6 +13456,7 @@ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -11425,6 +13466,7 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", "dev": true, + "license": "MIT", "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", @@ -11446,6 +13488,7 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -11457,6 +13500,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -11473,13 +13517,15 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/mocha/node_modules/diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -11488,7 +13534,8 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/mocha/node_modules/glob": { "version": "7.1.6", @@ -11496,6 +13543,7 @@ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -11516,6 +13564,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -11528,6 +13577,7 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -11540,6 +13590,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -11547,17 +13598,12 @@ "node": "*" } }, - "node_modules/mocha/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - }, "node_modules/mocha/node_modules/readdirp": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -11570,6 +13616,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -11584,6 +13631,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -11599,6 +13647,7 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -11616,6 +13665,7 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -11634,6 +13684,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -11643,6 +13694,7 @@ "resolved": "https://registry.npmjs.org/modern-node-polyfills/-/modern-node-polyfills-1.0.0.tgz", "integrity": "sha512-w1yb6ae5qSUJJ2u41krkUAxs+L7i9143Qam8EuXwDMeZHxl1JN8RfTSXG4S2bt0RHIRMeoWm/HCeO0pNIHmIYQ==", "dev": true, + "license": "MIT", "dependencies": { "@jspm/core": "^2.0.1", "@rollup/pluginutils": "^5.0.2", @@ -11659,34 +13711,39 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", "integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/mri": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=4" } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "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/multimap": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/multimap/-/multimap-1.1.0.tgz", "integrity": "sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/mute-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", "dev": true, + "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -11695,13 +13752,15 @@ "version": "2.20.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/nanoid": { "version": "3.1.20", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz", "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==", "dev": true, + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -11712,13 +13771,15 @@ "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "license": "MIT" }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -11727,13 +13788,15 @@ "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/netmask": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4.0" } @@ -11743,6 +13806,7 @@ "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz", "integrity": "sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.0", "@sinonjs/fake-timers": "^11.2.2", @@ -11756,6 +13820,7 @@ "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "type-detect": "4.0.8" } @@ -11765,6 +13830,7 @@ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.3.1.tgz", "integrity": "sha512-EVJO7nW5M/F5Tur0Rf2z/QoMo+1Ia963RiMtapiQrEWvY0iBUvADo8Beegwjpnle5BHkyHuoxSTW3jF43H1XRA==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1" } @@ -11774,6 +13840,7 @@ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -11793,6 +13860,7 @@ "url": "https://paypal.me/jimmywarting" } ], + "license": "MIT", "engines": { "node": ">=10.5.0" } @@ -11802,6 +13870,7 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", "dev": true, + "license": "MIT", "dependencies": { "data-uri-to-buffer": "^4.0.0", "fetch-blob": "^3.1.4", @@ -11820,6 +13889,7 @@ "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.4.tgz", "integrity": "sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/node-fetch/node_modules/data-uri-to-buffer": { @@ -11827,6 +13897,7 @@ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 12" } @@ -11836,6 +13907,7 @@ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", "dev": true, + "license": "MIT", "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", @@ -11860,6 +13932,7 @@ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", "dev": true, + "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -11869,6 +13942,7 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=16" } @@ -11878,6 +13952,7 @@ "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", "dev": true, + "license": "ISC", "dependencies": { "abbrev": "^2.0.0" }, @@ -11893,6 +13968,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^3.1.1" }, @@ -11908,6 +13984,7 @@ "resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-1.1.4.tgz", "integrity": "sha512-Z0XTKj1wRWO8o/Vjobsw5iOJCN+Sua3EZEUc2Ziy9CyVvmHKu6o+t4gUH9GOE0czyPR94LI6ZCV/PpcM8b5yow==", "dev": true, + "license": "MIT", "dependencies": { "assert": "^2.0.0", "browserify-zlib": "^0.2.0", @@ -11945,13 +14022,15 @@ "version": "2.0.18", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==", "dev": true, + "license": "ISC", "dependencies": { "abbrev": "1" }, @@ -11963,13 +14042,15 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/nopt-usage/-/nopt-usage-0.1.0.tgz", "integrity": "sha512-Tg2sISrWBbSsCRqpEMmdxn3KZfacrd0N2NYpZQIq0MHxGHMjwzYlxeB9pVIom/g7CBK28atDUQsTlOfG0wOsNA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", @@ -11982,6 +14063,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -11991,6 +14073,7 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -12000,6 +14083,7 @@ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -12031,6 +14115,7 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dev": true, + "license": "MIT", "dependencies": { "minimist": "^1.2.6" }, @@ -12042,13 +14127,15 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/npm-run-path": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^4.0.0" }, @@ -12064,6 +14151,7 @@ "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -12076,6 +14164,7 @@ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "boolbase": "~1.0.0" } @@ -12084,13 +14173,15 @@ "version": "2.2.12", "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz", "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/nypm": { "version": "0.3.11", "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.3.11.tgz", "integrity": "sha512-E5GqaAYSnbb6n1qZyik2wjPDZON43FqOJO59+3OkWrnmQtjggrMOVnsyzfjxp/tS6nlYJBA4zRA5jSM2YaadMg==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "citty": "^0.1.6", @@ -12112,6 +14203,7 @@ "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "cross-spawn": "^7.0.3", @@ -12136,6 +14228,7 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=16" @@ -12149,6 +14242,7 @@ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", "dev": true, + "license": "Apache-2.0", "optional": true, "engines": { "node": ">=16.17.0" @@ -12159,6 +14253,7 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" @@ -12172,6 +14267,7 @@ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=12" @@ -12185,6 +14281,7 @@ "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "mimic-fn": "^4.0.0" @@ -12201,6 +14298,7 @@ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=12" @@ -12214,6 +14312,7 @@ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -12223,6 +14322,7 @@ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -12235,6 +14335,7 @@ "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1" @@ -12251,6 +14352,7 @@ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -12260,6 +14362,7 @@ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.5", "define-properties": "^1.2.1", @@ -12278,6 +14381,7 @@ "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.3.tgz", "integrity": "sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/once": { @@ -12285,6 +14389,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, + "license": "ISC", "dependencies": { "wrappy": "1" } @@ -12294,6 +14399,7 @@ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, + "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" }, @@ -12309,6 +14415,7 @@ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -12317,6 +14424,7 @@ "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "license": "MIT", "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", @@ -12333,13 +14441,15 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -12349,6 +14459,7 @@ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -12358,6 +14469,7 @@ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -12366,6 +14478,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -12380,6 +14493,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -12395,6 +14509,7 @@ "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, + "license": "MIT", "dependencies": { "aggregate-error": "^3.0.0" }, @@ -12410,6 +14525,7 @@ "resolved": "https://registry.npmjs.org/p-reflect/-/p-reflect-2.1.0.tgz", "integrity": "sha512-paHV8NUz8zDHu5lhr/ngGWQiW067DK/+IbJ+RfZ4k+s8y4EKyYCz8pGYWjxCg35eHztpJAt+NUgvN4L+GCbPlg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -12419,6 +14535,7 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -12428,6 +14545,7 @@ "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz", "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==", "dev": true, + "license": "MIT", "dependencies": { "@tootallnate/quickjs-emscripten": "^0.23.0", "agent-base": "^7.0.2", @@ -12447,6 +14565,7 @@ "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz", "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==", "dev": true, + "license": "MIT", "dependencies": { "degenerator": "^5.0.0", "netmask": "^2.0.2" @@ -12459,24 +14578,28 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", - "dev": true + "dev": true, + "license": "BlueOak-1.0.0" }, "node_modules/package-license": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/package-license/-/package-license-0.1.2.tgz", "integrity": "sha512-Q5zmx+M9ZJneMpYS6MlYL77gqeMYWuyErXMnQ/83WCztmYQD7Z0U9XGLvX9OKFFXwRj2NzdzlM0y9Jzcww2O1Q==", - "dev": true + "dev": true, + "license": "Apache2" }, "node_modules/pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true + "dev": true, + "license": "(MIT AND Zlib)" }, "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==", + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -12489,6 +14612,7 @@ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz", "integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==", "dev": true, + "license": "ISC", "dependencies": { "asn1.js": "^4.10.1", "browserify-aes": "^1.2.0", @@ -12506,6 +14630,7 @@ "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.1.1.tgz", "integrity": "sha512-TDT4HqzUiTMO1wJRwg/t/hYk8Wdp3iF/ToMIlAoVQfL1Xs/sTxq1dKWSMjMbQmIarfWKymOyly40+zmPHXMqCA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "es-module-lexer": "^1.5.3", "slashes": "^3.0.12" @@ -12519,6 +14644,7 @@ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -12537,6 +14663,7 @@ "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz", "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -12549,6 +14676,7 @@ "resolved": "https://registry.npmjs.org/parse-uri/-/parse-uri-1.0.9.tgz", "integrity": "sha512-YZfRHHkEZa6qTfPF/xgZ1ErQYCABfud/Vcqp1Q1GNa7RKwv6Oe0YaxXfQQMnQsGdNTo3fwaT0GbVEX7dMAr7tw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.10" } @@ -12558,6 +14686,7 @@ "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", "dev": true, + "license": "MIT", "dependencies": { "entities": "^4.4.0" }, @@ -12570,6 +14699,7 @@ "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz", "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==", "dev": true, + "license": "MIT", "dependencies": { "domhandler": "^5.0.2", "parse5": "^7.0.0" @@ -12588,13 +14718,15 @@ "type": "github", "url": "https://github.com/sponsors/fb55" } - ] + ], + "license": "BSD-2-Clause" }, "node_modules/parse5-htmlparser2-tree-adapter/node_modules/domhandler": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.3.0" }, @@ -12610,6 +14742,7 @@ "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz", "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==", "dev": true, + "license": "MIT", "dependencies": { "parse5": "^7.0.0" }, @@ -12622,6 +14755,7 @@ "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" }, @@ -12633,12 +14767,14 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "license": "MIT", "engines": { "node": ">=8" } @@ -12648,6 +14784,7 @@ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -12656,6 +14793,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", "engines": { "node": ">=8" } @@ -12664,13 +14802,15 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/path-scurry": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "dev": true, + "license": "BlueOak-1.0.0", "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" @@ -12686,19 +14826,22 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/path-to-regexp": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz", "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/path-type": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=12" @@ -12711,13 +14854,15 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/pathval": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -12727,6 +14872,7 @@ "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", "dev": true, + "license": "MIT", "dependencies": { "create-hash": "^1.1.2", "create-hmac": "^1.1.4", @@ -12742,26 +14888,30 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/perfect-debounce": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz", "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", - "dev": true + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "dev": true, + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -12774,6 +14924,7 @@ "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6" } @@ -12783,6 +14934,7 @@ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, + "license": "MIT", "dependencies": { "find-up": "^4.0.0" }, @@ -12795,6 +14947,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -12808,6 +14961,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -12820,6 +14974,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, + "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -12835,6 +14990,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -12847,6 +15003,7 @@ "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.0.tgz", "integrity": "sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA==", "dev": true, + "license": "MIT", "dependencies": { "confbox": "^0.1.7", "mlly": "^1.7.1", @@ -12858,6 +15015,7 @@ "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz", "integrity": "sha512-yO5feByMzAp96LtP58wvPKSbaKAi/1C4kV9XpTctr6EepnP6F33RBNOiVrdz9BrPA98U2BMFsTNHo44TWcbQ2A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4.0" } @@ -12867,6 +15025,7 @@ "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==", "dev": true, + "license": "MIT", "dependencies": { "semver-compare": "^1.0.0" } @@ -12876,6 +15035,7 @@ "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz", "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -12885,14 +15045,15 @@ "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" } }, "node_modules/postcss": { - "version": "8.4.41", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz", - "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==", + "version": "8.4.45", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz", + "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==", "dev": true, "funding": [ { @@ -12908,6 +15069,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.0.1", @@ -12928,6 +15090,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -12939,6 +15102,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "license": "MIT", "engines": { "node": ">= 0.8.0" } @@ -12948,6 +15112,7 @@ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", @@ -12962,6 +15127,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -12974,6 +15140,7 @@ "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.1.0.tgz", "integrity": "sha512-o1piW0n3tgKIKCwk2vpM/vOV13zjJzvP37Ioze54YlTHE06m4tjEbzg9WsKkvTuyYln2DHjo5pY4qrZGI0otpw==", "dev": true, + "license": "MIT", "dependencies": { "parse-ms": "^4.0.0" }, @@ -12989,6 +15156,7 @@ "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", "dev": true, + "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -12998,6 +15166,7 @@ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6.0" } @@ -13006,13 +15175,15 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -13022,6 +15193,7 @@ "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", "dev": true, + "license": "MIT", "dependencies": { "err-code": "^2.0.2", "retry": "^0.12.0" @@ -13035,6 +15207,7 @@ "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz", "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "^7.0.2", "debug": "^4.3.4", @@ -13054,6 +15227,7 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, + "license": "ISC", "engines": { "node": ">=12" } @@ -13062,13 +15236,15 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/proxyquire": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz", "integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==", "dev": true, + "license": "MIT", "dependencies": { "fill-keys": "^1.0.2", "module-not-found-error": "^1.0.1", @@ -13079,19 +15255,22 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/public-encrypt": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", "dev": true, + "license": "MIT", "dependencies": { "bn.js": "^4.1.0", "browserify-rsa": "^4.0.0", @@ -13105,13 +15284,15 @@ "version": "4.12.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, + "license": "MIT", "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -13121,6 +15302,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "license": "MIT", "engines": { "node": ">=6" } @@ -13130,6 +15312,7 @@ "resolved": "https://registry.npmjs.org/punycode2/-/punycode2-1.0.1.tgz", "integrity": "sha512-+TXpd9YRW4YUZZPoRHJ3DILtWwootGc2DsgvfHmklQ8It1skINAuqSdqizt5nlTaBmwrYACHkHApCXjc9gHk2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10" } @@ -13139,6 +15322,7 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.6" }, @@ -13153,7 +15337,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.1.tgz", "integrity": "sha512-lT5yCqEBgfoMYpf3F2xQRK7zEr1rhIIZuceDK6+xRkJQ4NMbHTwXqk4NkwDwQMNqXgG9r9fyHnzwNVs6zV5KRw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/querystring-es3": { "version": "0.2.1", @@ -13168,7 +15353,8 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/queue-microtask": { "version": "1.2.3", @@ -13187,19 +15373,22 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/queue-tick": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/quick-lru": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -13212,6 +15401,7 @@ "resolved": "https://registry.npmjs.org/random-int/-/random-int-2.0.1.tgz", "integrity": "sha512-YALjWK2Rt9EMIv9BF/3mvlzFWQathsvb5UZmN1QmhfIOfcQYXc/UcLzg0ablqesSBpBVLt2Tlwv/eTuBh4LXUQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -13221,6 +15411,7 @@ "resolved": "https://registry.npmjs.org/random-item/-/random-item-3.1.0.tgz", "integrity": "sha512-0DyAT8LYBNQKSkqcPjia/HNoWCZ5JWBdAQWjBQVh5DMVv3Fv7V90I8/AuUf8NW4zdFn27i9qj8Kp6wI5JsiiOA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -13233,6 +15424,7 @@ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" } @@ -13242,6 +15434,7 @@ "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "dev": true, + "license": "MIT", "dependencies": { "randombytes": "^2.0.5", "safe-buffer": "^5.1.0" @@ -13252,6 +15445,7 @@ "resolved": "https://registry.npmjs.org/rc9/-/rc9-2.1.2.tgz", "integrity": "sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "defu": "^6.1.4", @@ -13264,6 +15458,7 @@ "integrity": "sha512-MVIfXWJmsP28mRsSt8HeL750ifb8H5+oF2UDIxGaiJCr8fkMqhLZ7kcX9ADRk2dC8qeGKedB7UVYRfBVpEiLfA==", "dev": true, "hasInstallScript": true, + "license": "BSD-3-Clause", "dependencies": { "install-artifact-from-github": "^1.3.5", "nan": "^2.20.0", @@ -13275,6 +15470,7 @@ "resolved": "https://registry.npmjs.org/reachable-url/-/reachable-url-1.8.1.tgz", "integrity": "sha512-6skrNl6GMGXF/H91T/bz1aznkLDd+y5ApwpqCE8h3OdJ9pQgzfK1j2wh4MFtRvfLq5TH69+oXLq5CsiHL+zN1g==", "dev": true, + "license": "MIT", "dependencies": { "got": "~11.8.0", "p-reflect": "~2.1.0" @@ -13287,7 +15483,8 @@ "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==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/read-installed": { "version": "4.0.3", @@ -13295,6 +15492,7 @@ "integrity": "sha512-O03wg/IYuV/VtnK2h/KXEt9VIbMUFbk3ERG0Iu4FhLZw0EP0T9znqrYDGn6ncbEsXUFaUjiVAWXHzxwt3lhRPQ==", "deprecated": "This package is no longer supported.", "dev": true, + "license": "ISC", "dependencies": { "debuglog": "^1.0.1", "read-package-json": "^2.0.0", @@ -13312,6 +15510,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -13322,6 +15521,7 @@ "integrity": "sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==", "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.", "dev": true, + "license": "ISC", "dependencies": { "glob": "^7.1.1", "json-parse-even-better-errors": "^2.3.0", @@ -13335,6 +15535,7 @@ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -13355,6 +15556,7 @@ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-8.1.0.tgz", "integrity": "sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/normalize-package-data": "^2.4.1", "normalize-package-data": "^6.0.0", @@ -13373,6 +15575,7 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-10.1.0.tgz", "integrity": "sha512-aNtBq4jR8NawpKJQldrQcSW9y/d+KWH4v24HWkHljOZ7H0av+YTGANBzRh9A5pw7v/bLVsLVPpOhJ7gHNVy8lA==", "dev": true, + "license": "MIT", "dependencies": { "find-up": "^6.3.0", "read-pkg": "^8.1.0", @@ -13390,6 +15593,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^7.1.0", "path-exists": "^5.0.0" @@ -13406,6 +15610,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^6.0.0" }, @@ -13421,6 +15626,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", "dev": true, + "license": "MIT", "dependencies": { "yocto-queue": "^1.0.0" }, @@ -13436,6 +15642,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^4.0.0" }, @@ -13451,15 +15658,17 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", "dev": true, + "license": "MIT", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } }, "node_modules/read-pkg-up/node_modules/type-fest": { - "version": "4.25.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.25.0.tgz", - "integrity": "sha512-bRkIGlXsnGBRBQRAY56UXBm//9qH4bmJfFvq83gSz41N282df+fjy8ofcEgc1sM8geNt5cl6mC2g9Fht1cs8Aw==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.0.tgz", + "integrity": "sha512-OduNjVJsFbifKb57UqZ2EMP1i4u64Xwow3NYXUtBbD4vIwJdQd4+xl8YDou1dlm4DVrtwT/7Ky8z8WyCULVfxw==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=16" }, @@ -13472,6 +15681,7 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz", "integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==", "dev": true, + "license": "MIT", "engines": { "node": ">=12.20" }, @@ -13484,6 +15694,7 @@ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz", "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^10.0.1" }, @@ -13496,6 +15707,7 @@ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", "dev": true, + "license": "MIT", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -13505,6 +15717,7 @@ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz", "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==", "dev": true, + "license": "MIT", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } @@ -13513,13 +15726,15 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/read-pkg/node_modules/normalize-package-data": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz", "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "hosted-git-info": "^7.0.0", "semver": "^7.3.5", @@ -13534,6 +15749,7 @@ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.1.1.tgz", "integrity": "sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.21.4", "error-ex": "^1.3.2", @@ -13553,6 +15769,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=14.16" }, @@ -13561,10 +15778,11 @@ } }, "node_modules/read-pkg/node_modules/type-fest": { - "version": "4.25.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.25.0.tgz", - "integrity": "sha512-bRkIGlXsnGBRBQRAY56UXBm//9qH4bmJfFvq83gSz41N282df+fjy8ofcEgc1sM8geNt5cl6mC2g9Fht1cs8Aw==", + "version": "4.26.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.0.tgz", + "integrity": "sha512-OduNjVJsFbifKb57UqZ2EMP1i4u64Xwow3NYXUtBbD4vIwJdQd4+xl8YDou1dlm4DVrtwT/7Ky8z8WyCULVfxw==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=16" }, @@ -13577,6 +15795,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -13591,6 +15810,7 @@ "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz", "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "minimatch": "^5.1.0" } @@ -13600,6 +15820,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -13609,6 +15830,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -13622,6 +15844,7 @@ "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==", "deprecated": "This functionality has been moved to @npmcli/fs", "dev": true, + "license": "ISC", "dependencies": { "debuglog": "^1.0.1", "dezalgo": "^1.0.0", @@ -13634,6 +15857,7 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -13646,6 +15870,7 @@ "resolved": "https://registry.npmjs.org/recast/-/recast-0.23.9.tgz", "integrity": "sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==", "dev": true, + "license": "MIT", "dependencies": { "ast-types": "^0.16.1", "esprima": "~4.0.0", @@ -13662,6 +15887,7 @@ "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz", "integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.0.1" }, @@ -13686,6 +15912,7 @@ "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==", "dev": true, + "license": "MIT", "dependencies": { "minimatch": "^3.0.5" }, @@ -13697,13 +15924,15 @@ "version": "1.4.2", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/regenerate-unicode-properties": { "version": "10.1.1", "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", "dev": true, + "license": "MIT", "dependencies": { "regenerate": "^1.4.2" }, @@ -13715,13 +15944,15 @@ "version": "0.14.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/regenerator-transform": { "version": "0.15.2", "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/runtime": "^7.8.4" } @@ -13731,6 +15962,7 @@ "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" } @@ -13740,6 +15972,7 @@ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/regjsgen": "^0.8.0", "regenerate": "^1.4.2", @@ -13757,6 +15990,7 @@ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "jsesc": "~0.5.0" }, @@ -13778,6 +16012,7 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -13786,13 +16021,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/resolve": { "version": "1.22.8", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dev": true, + "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -13809,13 +16046,15 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/resolve-cwd": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "dev": true, + "license": "MIT", "dependencies": { "resolve-from": "^5.0.0" }, @@ -13828,6 +16067,7 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -13836,6 +16076,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "license": "MIT", "engines": { "node": ">=4" } @@ -13845,6 +16086,7 @@ "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" } @@ -13854,6 +16096,7 @@ "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", "dev": true, + "license": "MIT", "dependencies": { "lowercase-keys": "^2.0.0" }, @@ -13866,6 +16109,7 @@ "resolved": "https://registry.npmjs.org/resq/-/resq-1.11.0.tgz", "integrity": "sha512-G10EBz+zAAy3zUd/CDoBbXRL6ia9kOo3xRHrMDsHljI0GDkhYlyjwoCx5+3eCC4swi1uCoZQhskuJkj7Gp57Bw==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^2.0.1" } @@ -13874,13 +16118,15 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, + "license": "MIT", "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -13893,13 +16139,15 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/retry": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } @@ -13908,6 +16156,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -13917,13 +16166,15 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/rgb2hex": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.5.tgz", "integrity": "sha512-22MOP1Rh7sAo1BZpDG6R5RFYzR2lYEgwq7HEmyW2qcsOqR2lQKmn+O//xV3YG/0rrhMC6KVX2hU+ZXuaw9a5bw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/rimraf": { "version": "3.0.2", @@ -13931,6 +16182,7 @@ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "glob": "^7.1.3" }, @@ -13947,6 +16199,7 @@ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -13967,16 +16220,18 @@ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, + "license": "MIT", "dependencies": { "hash-base": "^3.0.0", "inherits": "^2.0.1" } }, "node_modules/rollup": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.1.tgz", - "integrity": "sha512-ZnYyKvscThhgd3M5+Qt3pmhO4jIRR5RGzaSovB6Q7rGNrK5cUncrtLmcTTJVSdcKXyZjW8X8MB0JMSuH9bcAJg==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz", + "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==", "dev": true, + "license": "MIT", "dependencies": { "@types/estree": "1.0.5" }, @@ -13988,22 +16243,22 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.21.1", - "@rollup/rollup-android-arm64": "4.21.1", - "@rollup/rollup-darwin-arm64": "4.21.1", - "@rollup/rollup-darwin-x64": "4.21.1", - "@rollup/rollup-linux-arm-gnueabihf": "4.21.1", - "@rollup/rollup-linux-arm-musleabihf": "4.21.1", - "@rollup/rollup-linux-arm64-gnu": "4.21.1", - "@rollup/rollup-linux-arm64-musl": "4.21.1", - "@rollup/rollup-linux-powerpc64le-gnu": "4.21.1", - "@rollup/rollup-linux-riscv64-gnu": "4.21.1", - "@rollup/rollup-linux-s390x-gnu": "4.21.1", - "@rollup/rollup-linux-x64-gnu": "4.21.1", - "@rollup/rollup-linux-x64-musl": "4.21.1", - "@rollup/rollup-win32-arm64-msvc": "4.21.1", - "@rollup/rollup-win32-ia32-msvc": "4.21.1", - "@rollup/rollup-win32-x64-msvc": "4.21.1", + "@rollup/rollup-android-arm-eabi": "4.21.2", + "@rollup/rollup-android-arm64": "4.21.2", + "@rollup/rollup-darwin-arm64": "4.21.2", + "@rollup/rollup-darwin-x64": "4.21.2", + "@rollup/rollup-linux-arm-gnueabihf": "4.21.2", + "@rollup/rollup-linux-arm-musleabihf": "4.21.2", + "@rollup/rollup-linux-arm64-gnu": "4.21.2", + "@rollup/rollup-linux-arm64-musl": "4.21.2", + "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2", + "@rollup/rollup-linux-riscv64-gnu": "4.21.2", + "@rollup/rollup-linux-s390x-gnu": "4.21.2", + "@rollup/rollup-linux-x64-gnu": "4.21.2", + "@rollup/rollup-linux-x64-musl": "4.21.2", + "@rollup/rollup-win32-arm64-msvc": "4.21.2", + "@rollup/rollup-win32-ia32-msvc": "4.21.2", + "@rollup/rollup-win32-x64-msvc": "4.21.2", "fsevents": "~2.3.2" } }, @@ -14013,6 +16268,7 @@ "integrity": "sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==", "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-inject.", "dev": true, + "license": "MIT", "dependencies": { "estree-walker": "^0.6.1", "magic-string": "^0.25.3", @@ -14023,13 +16279,15 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/rollup-plugin-inject/node_modules/magic-string": { "version": "0.25.9", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", "dev": true, + "license": "MIT", "dependencies": { "sourcemap-codec": "^1.4.8" } @@ -14039,6 +16297,7 @@ "resolved": "https://registry.npmjs.org/rollup-plugin-node-polyfills/-/rollup-plugin-node-polyfills-0.2.1.tgz", "integrity": "sha512-4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==", "dev": true, + "license": "MIT", "dependencies": { "rollup-plugin-inject": "^3.0.0" } @@ -14048,6 +16307,7 @@ "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz", "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==", "dev": true, + "license": "MIT", "dependencies": { "estree-walker": "^0.6.1" } @@ -14056,19 +16316,22 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/rrweb-cssom": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz", "integrity": "sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/run-async": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz", "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -14091,6 +16354,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } @@ -14100,6 +16364,7 @@ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "tslib": "^2.1.0" } @@ -14108,7 +16373,8 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/safaridriver/-/safaridriver-0.1.2.tgz", "integrity": "sha512-4R309+gWflJktzPXBQCobbWEHlzC4aK3a+Ov3tz2Ib2aBxiwd11phkdIBH1l0EO22x24CJMUQkpKFumRriCSRg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/safe-buffer": { "version": "5.2.1", @@ -14128,13 +16394,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/safe-stringify": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/safe-stringify/-/safe-stringify-1.1.1.tgz", "integrity": "sha512-YSzQLuwp06fuvJD1h6+vVNFYZoXmDs5UUNPUbTvQK7Ap+L0qD4Vp+sN434C+pdS3prVVlUfQdNeiEIgxox/kUQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=16" }, @@ -14146,13 +16414,15 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "dev": true, + "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": { "xmlchars": "^2.2.0" }, @@ -14165,6 +16435,7 @@ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.5", "ajv": "^6.12.4", @@ -14183,6 +16454,7 @@ "resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz", "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/section-matter": { @@ -14190,6 +16462,7 @@ "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==", "dev": true, + "license": "MIT", "dependencies": { "extend-shallow": "^2.0.1", "kind-of": "^6.0.0" @@ -14203,6 +16476,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -14214,13 +16488,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/serialize-error": { "version": "11.0.3", "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz", "integrity": "sha512-2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==", "dev": true, + "license": "MIT", "dependencies": { "type-fest": "^2.12.2" }, @@ -14236,6 +16512,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=12.20" }, @@ -14248,6 +16525,7 @@ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -14257,6 +16535,7 @@ "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dev": true, + "license": "MIT", "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -14273,13 +16552,15 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/sha.js": { "version": "2.4.11", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, + "license": "(MIT AND BSD-3-Clause)", "dependencies": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" @@ -14293,6 +16574,7 @@ "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, + "license": "MIT", "dependencies": { "kind-of": "^6.0.2" }, @@ -14304,6 +16586,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -14315,6 +16598,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", "engines": { "node": ">=8" } @@ -14324,6 +16608,7 @@ "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "glob": "^7.0.0", "interpret": "^1.0.0", @@ -14342,6 +16627,7 @@ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -14361,13 +16647,15 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/shift-ast/-/shift-ast-6.1.0.tgz", "integrity": "sha512-Vj4XUIJIFPIh6VcBGJ1hjH/kM88XGer94Pr7Rvxa+idEylDsrwtLw268HoxGo5xReL6T3DdRl/9/Pr1XihZ/8Q==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/shift-codegen": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/shift-codegen/-/shift-codegen-7.0.3.tgz", "integrity": "sha512-dfCVVdBF0qZ6pkajQ3bjxRdNEltyxEITVe7tBJkQt2eCI3znUkSxq0VSe/tTWq1LKHeAS4HuOiqYEuHMFkSq9w==", "dev": true, + "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2", "object-assign": "^4.1.0", @@ -14379,6 +16667,7 @@ "resolved": "https://registry.npmjs.org/shift-fuzzer/-/shift-fuzzer-2.0.0.tgz", "integrity": "sha512-hgV4jqXELYR0UpEDlTnYcv0GXvhXV/y3lyYNyGtTq1Q6EdFIC9LLHjlrfVFt7d1VyzJqPkl/fME31ta0KrHiTQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "shift-ast": "6.1.0" } @@ -14388,6 +16677,7 @@ "resolved": "https://registry.npmjs.org/shift-parser/-/shift-parser-7.0.3.tgz", "integrity": "sha512-uYX2ORyZfKZrUc4iKKkO9KOhzUSxCrSBk7QK6ZmShId+BOo1gh1IwecVy97ynyOTpmhPWUttjC8BzsnQl65Zew==", "dev": true, + "license": "Apache-2.0", "dependencies": { "multimap": "^1.0.2", "shift-ast": "6.0.0", @@ -14399,13 +16689,15 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/shift-ast/-/shift-ast-6.0.0.tgz", "integrity": "sha512-XXxDcEBWVBzqWXfNYJlLyJ1/9kMvOXVRXiqPjkOrTCC5qRsBvEMJMRLLFhU3tn8ue56Y7IZyBE6bexFum5QLUw==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/shift-reducer": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/shift-reducer/-/shift-reducer-6.0.0.tgz", "integrity": "sha512-2rJraRP8drIOjvaE/sALa+0tGJmMVUzlmS3wIJerJbaYuCjpFAiF0WjkTOFVtz1144Nm/ECmqeG+7yRhuMVsMg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "shift-ast": "6.0.0" } @@ -14414,13 +16706,15 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/shift-ast/-/shift-ast-6.0.0.tgz", "integrity": "sha512-XXxDcEBWVBzqWXfNYJlLyJ1/9kMvOXVRXiqPjkOrTCC5qRsBvEMJMRLLFhU3tn8ue56Y7IZyBE6bexFum5QLUw==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/shift-regexp-acceptor": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/shift-regexp-acceptor/-/shift-regexp-acceptor-2.0.3.tgz", "integrity": "sha512-sxL7e5JNUFxm+gutFRXktX2D6KVgDAHNuDsk5XHB9Z+N5yXooZG6pdZ1GEbo3Jz6lF7ETYLBC4WAjIFm2RKTmA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "unicode-match-property-ecmascript": "1.0.4", "unicode-match-property-value-ecmascript": "1.0.2", @@ -14432,6 +16726,7 @@ "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -14441,6 +16736,7 @@ "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz", "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", "dev": true, + "license": "MIT", "dependencies": { "unicode-canonical-property-names-ecmascript": "^1.0.4", "unicode-property-aliases-ecmascript": "^1.0.4" @@ -14454,6 +16750,7 @@ "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz", "integrity": "sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -14463,6 +16760,7 @@ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "es-errors": "^1.3.0", @@ -14481,6 +16779,7 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, + "license": "ISC", "engines": { "node": ">=14" }, @@ -14494,6 +16793,7 @@ "integrity": "sha512-59237HChms4kg7/sXhiRcUzdSkKuydDeTiamT/jesUVHshBgL8XAmhgFo0GfK6RruMDM/iRSij1EybmMog9cJw==", "deprecated": "16.1.1", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^1.8.3", "@sinonjs/fake-timers": "^7.1.2", @@ -14512,6 +16812,7 @@ "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", "dev": true, + "license": "MIT", "optional": true, "engines": { "node": ">=14.16" @@ -14524,13 +16825,15 @@ "version": "3.0.12", "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz", "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/slice-ansi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -14545,6 +16848,7 @@ "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", "integrity": "sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==", "dev": true, + "license": "ISC", "engines": { "node": "*" } @@ -14554,6 +16858,7 @@ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6.0.0", "npm": ">= 3.0.0" @@ -14564,6 +16869,7 @@ "resolved": "https://registry.npmjs.org/smartquotes/-/smartquotes-2.3.2.tgz", "integrity": "sha512-0R6YJ5hLpDH4mZR7N5eZ12oCMLspvGOHL9A9SEm2e3b/CQmQidekW4SWSKEmor/3x6m3NCBBEqLzikcZC9VJNQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=4.0.0" } @@ -14573,6 +16879,7 @@ "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.3.0.tgz", "integrity": "sha512-tWpi2TsODPScmi48b/OQZGi2lgUmBCHy6SZrhi/FdnnHiU1GwebbCfuQuxsC3nHaLwtYeJGPrDZDIeodDOc4pA==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">= 18" }, @@ -14585,6 +16892,7 @@ "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", "dev": true, + "license": "MIT", "dependencies": { "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" @@ -14599,6 +16907,7 @@ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "^7.1.1", "debug": "^4.3.4", @@ -14613,6 +16922,7 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -14622,6 +16932,7 @@ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -14631,6 +16942,7 @@ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dev": true, + "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -14641,7 +16953,8 @@ "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", "deprecated": "Please use @jridgewell/sourcemap-codec instead", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/spacetrim": { "version": "0.11.39", @@ -14657,13 +16970,15 @@ "type": "github", "url": "https://github.com/hejny/spacetrim/blob/main/README.md#%EF%B8%8F-contributing" } - ] + ], + "license": "SEE LICENSE IN LICENSE" }, "node_modules/spdx-correct": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -14673,13 +16988,15 @@ "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 + "dev": true, + "license": "CC-BY-3.0" }, "node_modules/spdx-expression-parse": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, + "license": "MIT", "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -14689,13 +17006,15 @@ "version": "3.0.20", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", - "dev": true + "dev": true, + "license": "CC0-1.0" }, "node_modules/split2": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", "dev": true, + "license": "ISC", "engines": { "node": ">= 10.x" } @@ -14704,13 +17023,15 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/ssri": { "version": "10.0.6", "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^7.0.3" }, @@ -14723,6 +17044,7 @@ "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", "dev": true, + "license": "MIT", "dependencies": { "escape-string-regexp": "^2.0.0" }, @@ -14735,6 +17057,7 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -14744,6 +17067,7 @@ "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz", "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/stream-browserify": { @@ -14751,6 +17075,7 @@ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz", "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", "dev": true, + "license": "MIT", "dependencies": { "inherits": "~2.0.4", "readable-stream": "^3.5.0" @@ -14761,6 +17086,7 @@ "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.3.tgz", "integrity": "sha512-pqMqwQCso0PBJt2PQmDO0cFj0lyqmiwOMiMSkVtRokl7e+ZTRYgDHKnuZNbqjiJXgsg4nuqtD/zxuo9KqTp0Yw==", "dev": true, + "license": "Unlicense", "engines": { "node": ">= 0.10.0" } @@ -14770,6 +17096,7 @@ "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", "dev": true, + "license": "MIT", "dependencies": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.4", @@ -14778,10 +17105,11 @@ } }, "node_modules/streamx": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.19.0.tgz", - "integrity": "sha512-5z6CNR4gtkPbwlxyEqoDGDmWIzoNJqCBt4Eac1ICP9YaIT08ct712cFj0u1rx4F8luAuL+3Qc+RFIdI4OX00kg==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.0.tgz", + "integrity": "sha512-ZGd1LhDeGFucr1CUCTBOS58ZhEendd0ttpGT3usTvosS4ntIwKN9LJFp+OeCSprsCPL14BXVRZlHGRY1V9PVzQ==", "dev": true, + "license": "MIT", "dependencies": { "fast-fifo": "^1.3.2", "queue-tick": "^1.0.1", @@ -14796,6 +17124,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" } @@ -14805,6 +17134,7 @@ "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.6.19" } @@ -14814,6 +17144,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, + "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -14832,6 +17163,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -14845,13 +17177,15 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/string-width/node_modules/ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -14864,6 +17198,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" }, @@ -14879,6 +17214,7 @@ "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "get-own-enumerable-property-symbols": "^3.0.0", "is-obj": "^1.0.1", @@ -14892,6 +17228,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -14905,6 +17242,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -14917,6 +17255,7 @@ "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", "integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -14926,6 +17265,7 @@ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -14935,6 +17275,7 @@ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-4.0.0.tgz", "integrity": "sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -14947,6 +17288,7 @@ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz", "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -14955,6 +17297,7 @@ "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==", + "license": "MIT", "engines": { "node": ">=8" }, @@ -14967,6 +17310,7 @@ "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.1.0.tgz", "integrity": "sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "js-tokens": "^9.0.0" @@ -14980,24 +17324,28 @@ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.0.tgz", "integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/strnum": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/summary": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/summary/-/summary-2.1.0.tgz", "integrity": "sha512-nMIjMrd5Z2nuB2RZCKJfFMjgS3fygbeyGk9PxPPaJR1RIcyN9yn4A63Isovzm3ZtQuEkLBVgMdPup8UeLH7aQw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -15010,6 +17358,7 @@ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -15021,13 +17370,15 @@ "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 + "dev": true, + "license": "MIT" }, "node_modules/synckit": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz", "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==", "dev": true, + "license": "MIT", "dependencies": { "@pkgr/core": "^0.1.0", "tslib": "^2.6.2" @@ -15044,6 +17395,7 @@ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -15053,6 +17405,7 @@ "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dev": true, + "license": "ISC", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -15070,6 +17423,7 @@ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz", "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==", "dev": true, + "license": "MIT", "dependencies": { "pump": "^3.0.0", "tar-stream": "^3.1.5" @@ -15084,6 +17438,7 @@ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz", "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==", "dev": true, + "license": "MIT", "dependencies": { "b4a": "^1.6.4", "fast-fifo": "^1.2.0", @@ -15095,6 +17450,7 @@ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -15107,6 +17463,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -15119,6 +17476,7 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=8" } @@ -15127,13 +17485,15 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/terser": { "version": "5.31.6", "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz", "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", @@ -15152,6 +17512,7 @@ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.20", "jest-worker": "^27.4.5", @@ -15186,6 +17547,7 @@ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -15204,6 +17566,7 @@ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -15212,13 +17575,15 @@ "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==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", "dev": true, + "license": "ISC", "dependencies": { "@istanbuljs/schema": "^0.1.2", "glob": "^7.1.4", @@ -15234,6 +17599,7 @@ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -15254,6 +17620,7 @@ "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz", "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "b4a": "^1.6.4" } @@ -15261,19 +17628,22 @@ "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "license": "MIT" }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/timers-browserify": { "version": "2.0.12", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", "dev": true, + "license": "MIT", "dependencies": { "setimmediate": "^1.0.4" }, @@ -15285,13 +17655,15 @@ "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==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/tinyrainbow": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz", "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=14.0.0" } @@ -15301,6 +17673,7 @@ "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.0.tgz", "integrity": "sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==", "dev": true, + "license": "MIT", "engines": { "node": ">=14.0.0" } @@ -15310,33 +17683,37 @@ "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.254.0.tgz", "integrity": "sha512-YY4ei7K7gPGifqNSrfMaPdqTqiHcwYKUJ7zhLqQOK2ildlGgti5TSwJiXXN1YqG17I2GYZh5cZqv2r5fwBUM+w==", "dev": true, + "license": "MIT", "bin": { "tlds": "bin.js" } }, "node_modules/tldts": { - "version": "6.1.41", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.41.tgz", - "integrity": "sha512-RNpUkL5fYD2DTQQCdr8QMDp6UL0ThtpXT3q3+qPE05dIT+RK2I3M0VByVbQN1dEhLUGzimivVwxK2By9epLk6w==", + "version": "6.1.43", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.43.tgz", + "integrity": "sha512-5J2v/CbNH8CkwsQV+igsuu0+3eeTfRDn1CFf38a24ZD6FIrbm3DZFu4UrrpoOSejhuP4N1PNDNUvJcw+f4nXNw==", "dev": true, + "license": "MIT", "dependencies": { - "tldts-core": "^6.1.41" + "tldts-core": "^6.1.43" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.41", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.41.tgz", - "integrity": "sha512-SkwZgo1ZzMp2ziMBwci5VBnLR9VywCi02jSgMX5TO5kf9fdaBsxZkblLff3NlJNTcH0vfvEsgw2B7jVR556Vgw==", - "dev": true + "version": "6.1.43", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.43.tgz", + "integrity": "sha512-iO1G3F2NqtmJUYlTfcH2liSdaqDnjpYn6iGftbLRNx8DF6IRIjbknVt+q0ijwZ2KGZX3J8zeYGFoiI+ZtHT5MQ==", + "dev": true, + "license": "MIT" }, "node_modules/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, + "license": "MIT", "dependencies": { "os-tmpdir": "~1.0.2" }, @@ -15349,6 +17726,7 @@ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -15358,6 +17736,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -15370,6 +17749,7 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "psl": "^1.1.33", "punycode": "^2.1.1", @@ -15385,6 +17765,7 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4.0.0" } @@ -15394,6 +17775,7 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz", "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==", "dev": true, + "license": "MIT", "dependencies": { "punycode": "^2.3.1" }, @@ -15414,13 +17796,15 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/tsx": { "version": "4.19.0", "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.0.tgz", "integrity": "sha512-bV30kM7bsLZKZIOCHeMNVMJ32/LuJzLVajkQI/qf92J2Qr08ueLQvW00PUZGiuLPP760UINwupgUj8qrSCPUKg==", "dev": true, + "license": "MIT", "dependencies": { "esbuild": "~0.23.0", "get-tsconfig": "^4.7.5" @@ -15435,718 +17819,1508 @@ "fsevents": "~2.3.3" } }, - "node_modules/tsx/node_modules/@esbuild/linux-x64": { + "node_modules/tsx/node_modules/@esbuild/android-arm": { "version": "0.23.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz", - "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz", + "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==", "cpu": [ - "x64" + "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ - "linux" + "android" ], "engines": { "node": ">=18" } }, - "node_modules/tsx/node_modules/esbuild": { + "node_modules/tsx/node_modules/@esbuild/android-arm64": { "version": "0.23.1", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz", - "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz", + "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==", + "cpu": [ + "arm64" + ], "dev": true, - "hasInstallScript": true, - "bin": { - "esbuild": "bin/esbuild" - }, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], "engines": { "node": ">=18" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.23.1", - "@esbuild/android-arm": "0.23.1", - "@esbuild/android-arm64": "0.23.1", - "@esbuild/android-x64": "0.23.1", - "@esbuild/darwin-arm64": "0.23.1", - "@esbuild/darwin-x64": "0.23.1", - "@esbuild/freebsd-arm64": "0.23.1", - "@esbuild/freebsd-x64": "0.23.1", - "@esbuild/linux-arm": "0.23.1", - "@esbuild/linux-arm64": "0.23.1", - "@esbuild/linux-ia32": "0.23.1", - "@esbuild/linux-loong64": "0.23.1", - "@esbuild/linux-mips64el": "0.23.1", - "@esbuild/linux-ppc64": "0.23.1", - "@esbuild/linux-riscv64": "0.23.1", - "@esbuild/linux-s390x": "0.23.1", - "@esbuild/linux-x64": "0.23.1", - "@esbuild/netbsd-x64": "0.23.1", - "@esbuild/openbsd-arm64": "0.23.1", - "@esbuild/openbsd-x64": "0.23.1", - "@esbuild/sunos-x64": "0.23.1", - "@esbuild/win32-arm64": "0.23.1", - "@esbuild/win32-ia32": "0.23.1", - "@esbuild/win32-x64": "0.23.1" } }, - "node_modules/tty-browserify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", - "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==", - "dev": true - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-detect": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", - "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "node_modules/tsx/node_modules/@esbuild/android-x64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz", + "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==", + "cpu": [ + "x64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], "engines": { - "node": ">=4" + "node": ">=18" } }, - "node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "node_modules/tsx/node_modules/@esbuild/darwin-arm64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz", + "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==", + "cpu": [ + "arm64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=18" } }, - "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "node_modules/tsx/node_modules/@esbuild/darwin-x64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz", + "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==", + "cpu": [ + "x64" + ], "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">=14.17" - } - }, - "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==", - "dev": true - }, - "node_modules/ufo": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz", - "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==", - "dev": true - }, - "node_modules/unbzip2-stream": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", - "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", - "dev": true, - "dependencies": { - "buffer": "^5.2.1", - "through": "^2.3.8" + "node": ">=18" } }, - "node_modules/unbzip2-stream/node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz", + "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==", + "cpu": [ + "arm64" + ], "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } + "license": "MIT", + "optional": true, + "os": [ + "freebsd" ], - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" + "engines": { + "node": ">=18" } }, - "node_modules/uncrypto": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/uncrypto/-/uncrypto-0.1.3.tgz", - "integrity": "sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==", - "dev": true, - "optional": true - }, - "node_modules/unctx": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/unctx/-/unctx-2.3.1.tgz", - "integrity": "sha512-PhKke8ZYauiqh3FEMVNm7ljvzQiph0Mt3GBRve03IJm7ukfaON2OBK795tLwhbyfzknuRRkW0+Ze+CQUmzOZ+A==", + "node_modules/tsx/node_modules/@esbuild/freebsd-x64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz", + "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==", + "cpu": [ + "x64" + ], "dev": true, + "license": "MIT", "optional": true, - "dependencies": { - "acorn": "^8.8.2", - "estree-walker": "^3.0.3", - "magic-string": "^0.30.0", - "unplugin": "^1.3.1" + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" } }, - "node_modules/unctx/node_modules/estree-walker": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", - "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", + "node_modules/tsx/node_modules/@esbuild/linux-arm": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz", + "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==", + "cpu": [ + "arm" + ], "dev": true, + "license": "MIT", "optional": true, - "dependencies": { - "@types/estree": "^1.0.0" + "os": [ + "linux" + ], + "engines": { + "node": ">=18" } }, - "node_modules/underscore": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz", - "integrity": "sha512-ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ==", - "dev": true - }, - "node_modules/undici": { - "version": "6.19.8", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.8.tgz", - "integrity": "sha512-U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g==", + "node_modules/tsx/node_modules/@esbuild/linux-arm64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz", + "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==", + "cpu": [ + "arm64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=18.17" + "node": ">=18" } }, - "node_modules/undici-types": { - "version": "6.19.8", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", - "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", - "dev": true - }, - "node_modules/unicode-canonical-property-names-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", - "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", + "node_modules/tsx/node_modules/@esbuild/linux-ia32": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz", + "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==", + "cpu": [ + "ia32" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=4" + "node": ">=18" } }, - "node_modules/unicode-match-property-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", - "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", + "node_modules/tsx/node_modules/@esbuild/linux-loong64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz", + "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==", + "cpu": [ + "loong64" + ], "dev": true, - "dependencies": { - "unicode-canonical-property-names-ecmascript": "^2.0.0", - "unicode-property-aliases-ecmascript": "^2.0.0" - }, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=4" + "node": ">=18" } }, - "node_modules/unicode-match-property-ecmascript/node_modules/unicode-property-aliases-ecmascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", - "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", + "node_modules/tsx/node_modules/@esbuild/linux-mips64el": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz", + "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==", + "cpu": [ + "mips64el" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=4" + "node": ">=18" } }, - "node_modules/unicode-match-property-value-ecmascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", - "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", + "node_modules/tsx/node_modules/@esbuild/linux-ppc64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz", + "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==", + "cpu": [ + "ppc64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=4" + "node": ">=18" } }, - "node_modules/unicode-property-aliases-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz", - "integrity": "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==", + "node_modules/tsx/node_modules/@esbuild/linux-riscv64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz", + "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==", + "cpu": [ + "riscv64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=4" + "node": ">=18" } }, - "node_modules/unicorn-magic": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", - "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", + "node_modules/tsx/node_modules/@esbuild/linux-s390x": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz", + "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==", + "cpu": [ + "s390x" + ], "dev": true, + "license": "MIT", "optional": true, + "os": [ + "linux" + ], "engines": { "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/unimport": { - "version": "3.11.1", - "resolved": "https://registry.npmjs.org/unimport/-/unimport-3.11.1.tgz", - "integrity": "sha512-DuB1Uoq01LrrXTScxnwOoMSlTXxyKcULguFxbLrMDFcE/CO0ZWHpEiyhovN0mycPt7K6luAHe8laqvwvuoeUPg==", + "node_modules/tsx/node_modules/@esbuild/linux-x64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz", + "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==", + "cpu": [ + "x64" + ], "dev": true, + "license": "MIT", "optional": true, - "dependencies": { - "@rollup/pluginutils": "^5.1.0", - "acorn": "^8.12.1", - "escape-string-regexp": "^5.0.0", - "estree-walker": "^3.0.3", - "fast-glob": "^3.3.2", - "local-pkg": "^0.5.0", - "magic-string": "^0.30.11", - "mlly": "^1.7.1", - "pathe": "^1.1.2", - "pkg-types": "^1.2.0", - "scule": "^1.3.0", - "strip-literal": "^2.1.0", - "unplugin": "^1.12.2" + "os": [ + "linux" + ], + "engines": { + "node": ">=18" } }, - "node_modules/unimport/node_modules/escape-string-regexp": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", - "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "node_modules/tsx/node_modules/@esbuild/netbsd-x64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz", + "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==", + "cpu": [ + "x64" + ], "dev": true, + "license": "MIT", "optional": true, + "os": [ + "netbsd" + ], "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=18" } }, - "node_modules/unimport/node_modules/estree-walker": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", - "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", + "node_modules/tsx/node_modules/@esbuild/openbsd-x64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz", + "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==", + "cpu": [ + "x64" + ], "dev": true, + "license": "MIT", "optional": true, - "dependencies": { - "@types/estree": "^1.0.0" + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" } }, - "node_modules/unimport/node_modules/local-pkg": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", - "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==", + "node_modules/tsx/node_modules/@esbuild/sunos-x64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz", + "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==", + "cpu": [ + "x64" + ], "dev": true, + "license": "MIT", "optional": true, - "dependencies": { - "mlly": "^1.4.2", - "pkg-types": "^1.0.3" - }, + "os": [ + "sunos" + ], "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" + "node": ">=18" } }, - "node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "node_modules/tsx/node_modules/@esbuild/win32-arm64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz", + "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==", + "cpu": [ + "arm64" + ], "dev": true, - "dependencies": { - "unique-slug": "^4.0.0" - }, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=18" } }, - "node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "node_modules/tsx/node_modules/@esbuild/win32-ia32": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz", + "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==", + "cpu": [ + "ia32" + ], "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4" - }, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=18" } }, - "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "node_modules/tsx/node_modules/@esbuild/win32-x64": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz", + "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==", + "cpu": [ + "x64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">= 10.0.0" + "node": ">=18" } }, - "node_modules/unplugin": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.12.2.tgz", - "integrity": "sha512-bEqQxeC7rxtxPZ3M5V4Djcc4lQqKPgGe3mAWZvxcSmX5jhGxll19NliaRzQSQPrk4xJZSGniK3puLWpRuZN7VQ==", + "node_modules/tsx/node_modules/esbuild": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz", + "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==", "dev": true, - "optional": true, - "dependencies": { - "acorn": "^8.12.1", - "chokidar": "^3.6.0", - "webpack-sources": "^3.2.3", - "webpack-virtual-modules": "^0.6.2" + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.23.1", + "@esbuild/android-arm": "0.23.1", + "@esbuild/android-arm64": "0.23.1", + "@esbuild/android-x64": "0.23.1", + "@esbuild/darwin-arm64": "0.23.1", + "@esbuild/darwin-x64": "0.23.1", + "@esbuild/freebsd-arm64": "0.23.1", + "@esbuild/freebsd-x64": "0.23.1", + "@esbuild/linux-arm": "0.23.1", + "@esbuild/linux-arm64": "0.23.1", + "@esbuild/linux-ia32": "0.23.1", + "@esbuild/linux-loong64": "0.23.1", + "@esbuild/linux-mips64el": "0.23.1", + "@esbuild/linux-ppc64": "0.23.1", + "@esbuild/linux-riscv64": "0.23.1", + "@esbuild/linux-s390x": "0.23.1", + "@esbuild/linux-x64": "0.23.1", + "@esbuild/netbsd-x64": "0.23.1", + "@esbuild/openbsd-arm64": "0.23.1", + "@esbuild/openbsd-x64": "0.23.1", + "@esbuild/sunos-x64": "0.23.1", + "@esbuild/win32-arm64": "0.23.1", + "@esbuild/win32-ia32": "0.23.1", + "@esbuild/win32-x64": "0.23.1" } }, - "node_modules/untyped": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/untyped/-/untyped-1.4.2.tgz", - "integrity": "sha512-nC5q0DnPEPVURPhfPQLahhSTnemVtPzdx7ofiRxXpOB2SYnb3MfdU3DVGyJdS8Lx+tBWeAePO8BfU/3EgksM7Q==", + "node_modules/tty-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", + "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==", "dev": true, - "optional": true, + "license": "MIT" + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "license": "MIT", "dependencies": { - "@babel/core": "^7.23.7", - "@babel/standalone": "^7.23.8", - "@babel/types": "^7.23.6", - "defu": "^6.1.4", - "jiti": "^1.21.0", - "mri": "^1.2.0", - "scule": "^1.2.0" + "prelude-ls": "^1.2.1" }, - "bin": { - "untyped": "dist/cli.mjs" + "engines": { + "node": ">= 0.8.0" } }, - "node_modules/update-browserslist-db": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", - "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "node_modules/type-detect": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "escalade": "^3.1.2", - "picocolors": "^1.0.1" + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typescript": { + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "dev": true, + "license": "Apache-2.0", "bin": { - "update-browserslist-db": "cli.js" + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" }, - "peerDependencies": { - "browserslist": ">= 4.21.0" + "engines": { + "node": ">=14.17" } }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "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==", + "dev": true, + "license": "MIT" + }, + "node_modules/ufo": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz", + "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/unbzip2-stream": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", + "dev": true, + "license": "MIT", "dependencies": { - "punycode": "^2.1.0" + "buffer": "^5.2.1", + "through": "^2.3.8" } }, - "node_modules/url": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz", - "integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==", + "node_modules/unbzip2-stream/node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", "dependencies": { - "punycode": "^1.4.1", - "qs": "^6.12.3" - }, - "engines": { - "node": ">= 0.4" + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" } }, - "node_modules/url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "node_modules/uncrypto": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/uncrypto/-/uncrypto-0.1.3.tgz", + "integrity": "sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==", + "dev": true, + "license": "MIT", + "optional": true + }, + "node_modules/unctx": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/unctx/-/unctx-2.3.1.tgz", + "integrity": "sha512-PhKke8ZYauiqh3FEMVNm7ljvzQiph0Mt3GBRve03IJm7ukfaON2OBK795tLwhbyfzknuRRkW0+Ze+CQUmzOZ+A==", "dev": true, + "license": "MIT", + "optional": true, "dependencies": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" + "acorn": "^8.8.2", + "estree-walker": "^3.0.3", + "magic-string": "^0.30.0", + "unplugin": "^1.3.1" } }, - "node_modules/url-regex-safe": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/url-regex-safe/-/url-regex-safe-4.0.0.tgz", - "integrity": "sha512-BrnFCWKNFrFnRzKD66NtJqQepfJrUHNPvPxE5y5NSAhXBb4OlobQjt7907Jm4ItPiXaeX+dDWMkcnOd4jR9N8A==", + "node_modules/unctx/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", + "optional": true, "dependencies": { - "ip-regex": "4.3.0", - "tlds": "^1.242.0" - }, - "engines": { - "node": ">= 14" - }, - "peerDependencies": { - "re2": "^1.20.1" - }, - "peerDependenciesMeta": { - "re2": { - "optional": true - } + "@types/estree": "^1.0.0" } }, - "node_modules/url/node_modules/punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", - "dev": true - }, - "node_modules/urlpattern-polyfill": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", - "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "node_modules/underscore": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz", + "integrity": "sha512-ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ==", "dev": true }, - "node_modules/userhome": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/userhome/-/userhome-1.0.0.tgz", - "integrity": "sha512-ayFKY3H+Pwfy4W98yPdtH1VqH4psDeyW8lYYFzfecR9d6hqLpqhecktvYR3SEEXt7vG0S1JEpciI3g94pMErig==", + "node_modules/undici": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.8.tgz", + "integrity": "sha512-U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g==", "dev": true, + "license": "MIT", "engines": { - "node": ">= 0.8.0" + "node": ">=18.17" } }, - "node_modules/utf8": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", - "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==", - "dev": true + "node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "dev": true, + "license": "MIT" }, - "node_modules/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/unicode-canonical-property-names-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", + "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", "dev": 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" + "license": "MIT", + "engines": { + "node": ">=4" } }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true - }, - "node_modules/util-extend": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz", - "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==", - "dev": true + "node_modules/unicode-match-property-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", + "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "unicode-canonical-property-names-ecmascript": "^2.0.0", + "unicode-property-aliases-ecmascript": "^2.0.0" + }, + "engines": { + "node": ">=4" + } }, - "node_modules/uuid": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", - "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", + "node_modules/unicode-match-property-ecmascript/node_modules/unicode-property-aliases-ecmascript": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", + "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", "dev": true, - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "bin": { - "uuid": "dist/bin/uuid" + "license": "MIT", + "engines": { + "node": ">=4" } }, - "node_modules/v8-to-istanbul": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", - "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "node_modules/unicode-match-property-value-ecmascript": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", + "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", "dev": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.12", - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^2.0.0" - }, + "license": "MIT", "engines": { - "node": ">=10.12.0" + "node": ">=4" } }, - "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==", + "node_modules/unicode-property-aliases-ecmascript": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz", + "integrity": "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==", "dev": true, - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "license": "MIT", + "engines": { + "node": ">=4" } }, - "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==", + "node_modules/unicorn-magic": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", + "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", "dev": true, + "license": "MIT", + "optional": true, "engines": { - "node": ">=0.10.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/vite": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.2.tgz", - "integrity": "sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==", + "node_modules/unimport": { + "version": "3.11.1", + "resolved": "https://registry.npmjs.org/unimport/-/unimport-3.11.1.tgz", + "integrity": "sha512-DuB1Uoq01LrrXTScxnwOoMSlTXxyKcULguFxbLrMDFcE/CO0ZWHpEiyhovN0mycPt7K6luAHe8laqvwvuoeUPg==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@rollup/pluginutils": "^5.1.0", + "acorn": "^8.12.1", + "escape-string-regexp": "^5.0.0", + "estree-walker": "^3.0.3", + "fast-glob": "^3.3.2", + "local-pkg": "^0.5.0", + "magic-string": "^0.30.11", + "mlly": "^1.7.1", + "pathe": "^1.1.2", + "pkg-types": "^1.2.0", + "scule": "^1.3.0", + "strip-literal": "^2.1.0", + "unplugin": "^1.12.2" + } + }, + "node_modules/unimport/node_modules/escape-string-regexp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/unimport/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", + "optional": true, + "dependencies": { + "@types/estree": "^1.0.0" + } + }, + "node_modules/unimport/node_modules/local-pkg": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", + "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "mlly": "^1.4.2", + "pkg-types": "^1.0.3" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, + "node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dev": true, + "license": "ISC", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/unplugin": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.13.1.tgz", + "integrity": "sha512-6Kq1iSSwg7KyjcThRUks9LuqDAKvtnioxbL9iEtB9ctTyBA5OmrB8gZd/d225VJu1w3UpUsKV7eGrvf59J7+VA==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "acorn": "^8.12.1", + "webpack-virtual-modules": "^0.6.2" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "webpack-sources": "^3" + }, + "peerDependenciesMeta": { + "webpack-sources": { + "optional": true + } + } + }, + "node_modules/untyped": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/untyped/-/untyped-1.4.2.tgz", + "integrity": "sha512-nC5q0DnPEPVURPhfPQLahhSTnemVtPzdx7ofiRxXpOB2SYnb3MfdU3DVGyJdS8Lx+tBWeAePO8BfU/3EgksM7Q==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@babel/core": "^7.23.7", + "@babel/standalone": "^7.23.8", + "@babel/types": "^7.23.6", + "defu": "^6.1.4", + "jiti": "^1.21.0", + "mri": "^1.2.0", + "scule": "^1.2.0" + }, + "bin": { + "untyped": "dist/cli.mjs" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", + "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.1.2", + "picocolors": "^1.0.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/url": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz", + "integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "punycode": "^1.4.1", + "qs": "^6.12.3" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, + "node_modules/url-regex-safe": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/url-regex-safe/-/url-regex-safe-4.0.0.tgz", + "integrity": "sha512-BrnFCWKNFrFnRzKD66NtJqQepfJrUHNPvPxE5y5NSAhXBb4OlobQjt7907Jm4ItPiXaeX+dDWMkcnOd4jR9N8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ip-regex": "4.3.0", + "tlds": "^1.242.0" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "re2": "^1.20.1" + }, + "peerDependenciesMeta": { + "re2": { + "optional": true + } + } + }, + "node_modules/url/node_modules/punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/urlpattern-polyfill": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "dev": true, + "license": "MIT" + }, + "node_modules/userhome": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/userhome/-/userhome-1.0.0.tgz", + "integrity": "sha512-ayFKY3H+Pwfy4W98yPdtH1VqH4psDeyW8lYYFzfecR9d6hqLpqhecktvYR3SEEXt7vG0S1JEpciI3g94pMErig==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/utf8": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", + "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==", + "dev": true, + "license": "MIT" + }, + "node_modules/util": { + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", + "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", + "dev": true, + "license": "MIT", + "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" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/util-extend": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz", + "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==", + "dev": true, + "license": "MIT" + }, + "node_modules/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", + "dev": true, + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/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==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "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==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/vite": { + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz", + "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "^0.21.3", + "postcss": "^8.4.43", + "rollup": "^4.20.0" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^18.0.0 || >=20.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", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "sass-embedded": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.4.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + } + } + }, + "node_modules/vite-plugin-commonjs": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/vite-plugin-commonjs/-/vite-plugin-commonjs-0.10.1.tgz", + "integrity": "sha512-taP8R9kYGlCW5OzkVR0UIWRCnG6rSxeWWuA7tnU5b9t5MniibOnDY219NhisTeDhJAeGT8cEnrhVWZ9A5yD+vg==", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.8.2", + "fast-glob": "^3.2.12", + "magic-string": "^0.30.1", + "vite-plugin-dynamic-import": "^1.5.0" + } + }, + "node_modules/vite-plugin-dynamic-import": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/vite-plugin-dynamic-import/-/vite-plugin-dynamic-import-1.5.0.tgz", + "integrity": "sha512-Qp85c+AVJmLa8MLni74U4BDiWpUeFNx7NJqbGZyR2XJOU7mgW0cb7nwlAMucFyM4arEd92Nfxp4j44xPi6Fu7g==", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.8.2", + "es-module-lexer": "^1.2.1", + "fast-glob": "^3.2.12", + "magic-string": "^0.30.1" + } + }, + "node_modules/vite-plugin-istanbul": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/vite-plugin-istanbul/-/vite-plugin-istanbul-6.0.2.tgz", + "integrity": "sha512-0/sKwjEEIwbEyl43xX7onX3dIbMJAsigNsKyyVPalG1oRFo5jn3qkJbS2PUfp9wrr3piy1eT6qRoeeum2p4B2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@istanbuljs/load-nyc-config": "^1.1.0", + "espree": "^10.0.1", + "istanbul-lib-instrument": "^6.0.2", + "picocolors": "^1.0.0", + "source-map": "^0.7.4", + "test-exclude": "^6.0.0" + }, + "peerDependencies": { + "vite": ">=4 <=6" + } + }, + "node_modules/vite-plugin-istanbul/node_modules/source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">= 8" + } + }, + "node_modules/vite-plugin-top-level-await": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/vite-plugin-top-level-await/-/vite-plugin-top-level-await-1.4.4.tgz", + "integrity": "sha512-QyxQbvcMkgt+kDb12m2P8Ed35Sp6nXP+l8ptGrnHV9zgYDUpraO0CPdlqLSeBqvY2DToR52nutDG7mIHuysdiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rollup/plugin-virtual": "^3.0.2", + "@swc/core": "^1.7.0", + "uuid": "^10.0.0" + }, + "peerDependencies": { + "vite": ">=2.8" + } + }, + "node_modules/vite/node_modules/@esbuild/aix-ppc64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", + "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/android-arm": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", + "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/android-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", + "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/android-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", + "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/darwin-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", + "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/darwin-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", + "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/freebsd-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", + "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/freebsd-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", + "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-arm": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", + "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", + "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-ia32": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", + "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-loong64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", + "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-mips64el": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", + "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-ppc64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", + "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-riscv64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", + "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-s390x": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", + "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", + "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "esbuild": "^0.21.3", - "postcss": "^8.4.41", - "rollup": "^4.20.0" - }, - "bin": { - "vite": "bin/vite.js" - }, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": "^18.0.0 || >=20.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", - "less": "*", - "lightningcss": "^1.21.0", - "sass": "*", - "sass-embedded": "*", - "stylus": "*", - "sugarss": "*", - "terser": "^5.4.0" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "less": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "sass": { - "optional": true - }, - "sass-embedded": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "terser": { - "optional": true - } + "node": ">=12" } }, - "node_modules/vite-plugin-commonjs": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/vite-plugin-commonjs/-/vite-plugin-commonjs-0.10.1.tgz", - "integrity": "sha512-taP8R9kYGlCW5OzkVR0UIWRCnG6rSxeWWuA7tnU5b9t5MniibOnDY219NhisTeDhJAeGT8cEnrhVWZ9A5yD+vg==", + "node_modules/vite/node_modules/@esbuild/netbsd-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", + "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "acorn": "^8.8.2", - "fast-glob": "^3.2.12", - "magic-string": "^0.30.1", - "vite-plugin-dynamic-import": "^1.5.0" + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" } }, - "node_modules/vite-plugin-dynamic-import": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/vite-plugin-dynamic-import/-/vite-plugin-dynamic-import-1.5.0.tgz", - "integrity": "sha512-Qp85c+AVJmLa8MLni74U4BDiWpUeFNx7NJqbGZyR2XJOU7mgW0cb7nwlAMucFyM4arEd92Nfxp4j44xPi6Fu7g==", + "node_modules/vite/node_modules/@esbuild/openbsd-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", + "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "acorn": "^8.8.2", - "es-module-lexer": "^1.2.1", - "fast-glob": "^3.2.12", - "magic-string": "^0.30.1" + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" } }, - "node_modules/vite-plugin-istanbul": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/vite-plugin-istanbul/-/vite-plugin-istanbul-6.0.2.tgz", - "integrity": "sha512-0/sKwjEEIwbEyl43xX7onX3dIbMJAsigNsKyyVPalG1oRFo5jn3qkJbS2PUfp9wrr3piy1eT6qRoeeum2p4B2A==", + "node_modules/vite/node_modules/@esbuild/sunos-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", + "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "@istanbuljs/load-nyc-config": "^1.1.0", - "espree": "^10.0.1", - "istanbul-lib-instrument": "^6.0.2", - "picocolors": "^1.0.0", - "source-map": "^0.7.4", - "test-exclude": "^6.0.0" - }, - "peerDependencies": { - "vite": ">=4 <=6" + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" } }, - "node_modules/vite-plugin-istanbul/node_modules/source-map": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", - "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "node_modules/vite/node_modules/@esbuild/win32-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", + "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", + "cpu": [ + "arm64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">= 8" + "node": ">=12" } }, - "node_modules/vite-plugin-top-level-await": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/vite-plugin-top-level-await/-/vite-plugin-top-level-await-1.4.4.tgz", - "integrity": "sha512-QyxQbvcMkgt+kDb12m2P8Ed35Sp6nXP+l8ptGrnHV9zgYDUpraO0CPdlqLSeBqvY2DToR52nutDG7mIHuysdiw==", + "node_modules/vite/node_modules/@esbuild/win32-ia32": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", + "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", + "cpu": [ + "ia32" + ], "dev": true, - "dependencies": { - "@rollup/plugin-virtual": "^3.0.2", - "@swc/core": "^1.7.0", - "uuid": "^10.0.0" - }, - "peerDependencies": { - "vite": ">=2.8" + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" } }, - "node_modules/vite/node_modules/@esbuild/linux-x64": { + "node_modules/vite/node_modules/@esbuild/win32-x64": { "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", - "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", + "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ - "linux" + "win32" ], "engines": { "node": ">=12" @@ -16158,6 +19332,7 @@ "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -16194,13 +19369,15 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/w3c-xmlserializer": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", "dev": true, + "license": "MIT", "dependencies": { "xml-name-validator": "^5.0.0" }, @@ -16213,6 +19390,7 @@ "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-1.1.0.tgz", "integrity": "sha512-3e04qkoN3LxTMLakdqeWth8nih8usyg+sf1Bgdf9wwUkp05iuK1eSY/QpLvscT/+F/gA89+LpUmmgBtesbqI2Q==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.1.2", "commander": "^9.3.0", @@ -16230,6 +19408,7 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==", "dev": true, + "license": "MIT", "engines": { "node": "^12.20.0 || >=14" } @@ -16239,6 +19418,7 @@ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", "dev": true, + "license": "MIT", "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -16252,6 +19432,7 @@ "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", "dev": true, + "license": "MIT", "optional": true, "dependencies": { "defaults": "^1.0.3" @@ -16262,44 +19443,47 @@ "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/webdriver": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.0.7.tgz", - "integrity": "sha512-0PN4omqCGlgi3RG0LyrQXr0RUmlDCenNtpN+dfzikfYoV+CHiCw2GMnZp2XCuYUnU01MaCKgRQxLuGobyZov+A==", + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.0.8.tgz", + "integrity": "sha512-UnV0ANriSTUgypGk0pz8lApeQuHt+72WEDQG5hFwkkSvggtKLyWdT7+PQkNoXvDajTmiLIqUOq8XPI/Pm71rtw==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "^20.1.0", "@types/ws": "^8.5.3", - "@wdio/config": "9.0.6", - "@wdio/logger": "9.0.4", - "@wdio/protocols": "9.0.4", - "@wdio/types": "9.0.4", - "@wdio/utils": "9.0.6", + "@wdio/config": "9.0.8", + "@wdio/logger": "9.0.8", + "@wdio/protocols": "9.0.8", + "@wdio/types": "9.0.8", + "@wdio/utils": "9.0.8", "deepmerge-ts": "^7.0.3", "ws": "^8.8.0" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" } }, "node_modules/webdriverio": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.7.tgz", - "integrity": "sha512-/6CvJkKpUWYbX/59PNJCHXGLPwulQ/bXZwlIUrsF6MWKdf8Eb6yTaXkMJBaBy5x496b50PQcXkbe+qpfsnqXsg==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.0.9.tgz", + "integrity": "sha512-IwvKzhcJ9NjOL55xwj27uTTKkfxsg77dmAfqoKFSP5dQ70JzU+NgxiALEjjWQDybtt1yGIkHk7wjjxjboMU1uw==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "^20.11.30", "@types/sinonjs__fake-timers": "^8.1.5", - "@wdio/config": "9.0.6", - "@wdio/logger": "9.0.4", - "@wdio/protocols": "9.0.4", - "@wdio/repl": "9.0.4", - "@wdio/types": "9.0.4", - "@wdio/utils": "9.0.6", + "@wdio/config": "9.0.8", + "@wdio/logger": "9.0.8", + "@wdio/protocols": "9.0.8", + "@wdio/repl": "9.0.8", + "@wdio/types": "9.0.8", + "@wdio/utils": "9.0.8", "archiver": "^7.0.1", "aria-query": "^5.3.0", "cheerio": "^1.0.0-rc.12", @@ -16318,10 +19502,10 @@ "rgb2hex": "0.2.5", "serialize-error": "^11.0.3", "urlpattern-polyfill": "^10.0.0", - "webdriver": "9.0.7" + "webdriver": "9.0.8" }, "engines": { - "node": ">=18" + "node": ">=18.20.0" }, "peerDependencies": { "puppeteer-core": "^22.3.0" @@ -16337,6 +19521,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -16346,6 +19531,7 @@ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz", "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==", "dev": true, + "license": "MIT", "dependencies": { "cheerio-select": "^2.1.0", "dom-serializer": "^2.0.0", @@ -16371,6 +19557,7 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", "dev": true, + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", @@ -16390,13 +19577,15 @@ "type": "github", "url": "https://github.com/sponsors/fb55" } - ] + ], + "license": "BSD-2-Clause" }, "node_modules/webdriverio/node_modules/domhandler": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.3.0" }, @@ -16412,6 +19601,7 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", @@ -16426,6 +19616,7 @@ "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" }, @@ -16445,6 +19636,7 @@ "url": "https://github.com/sponsors/fb55" } ], + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", @@ -16457,6 +19649,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -16472,6 +19665,7 @@ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=12" } @@ -16481,6 +19675,7 @@ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", "dev": true, + "license": "MIT", "dependencies": { "@types/estree": "^1.0.5", "@webassemblyjs/ast": "^1.12.1", @@ -16527,6 +19722,7 @@ "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", "dev": true, + "license": "MIT", "dependencies": { "@discoveryjs/json-ext": "^0.5.0", "@webpack-cli/configtest": "^1.2.0", @@ -16573,13 +19769,15 @@ "version": "2.0.20", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/webpack-cli/node_modules/commander": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10" } @@ -16589,6 +19787,7 @@ "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.10" } @@ -16598,6 +19797,7 @@ "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", "dev": true, + "license": "MIT", "dependencies": { "resolve": "^1.9.0" }, @@ -16610,6 +19810,7 @@ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz", "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==", "dev": true, + "license": "MIT", "dependencies": { "clone-deep": "^4.0.1", "flat": "^5.0.2", @@ -16624,6 +19825,7 @@ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.13.0" } @@ -16633,6 +19835,7 @@ "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz", "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==", "dev": true, + "license": "MIT", "optional": true }, "node_modules/webpack/node_modules/eslint-scope": { @@ -16640,6 +19843,7 @@ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" @@ -16653,6 +19857,7 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } @@ -16662,6 +19867,7 @@ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -16680,6 +19886,7 @@ "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", "dev": true, + "license": "MIT", "dependencies": { "iconv-lite": "0.6.3" }, @@ -16692,6 +19899,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -16704,6 +19912,7 @@ "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": ">=18" } @@ -16713,6 +19922,7 @@ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz", "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==", "dev": true, + "license": "MIT", "dependencies": { "tr46": "^5.0.0", "webidl-conversions": "^7.0.0" @@ -16725,6 +19935,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -16740,6 +19951,7 @@ "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", "dev": true, + "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.7", @@ -16759,6 +19971,7 @@ "resolved": "https://registry.npmjs.org/whoops/-/whoops-4.1.7.tgz", "integrity": "sha512-weRPO7XE2Oko2/KQkddqvj6uAjLDOoiJdrXiE2ymgiV5Ugefi0/GJZPkeNr6OUUMfcqGAwUUPIZrG6UdSuBk2g==", "dev": true, + "license": "MIT", "dependencies": { "clean-stack": "~3.0.0", "mimic-fn": "~3.1.0" @@ -16772,6 +19985,7 @@ "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz", "integrity": "sha512-lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg==", "dev": true, + "license": "MIT", "dependencies": { "escape-string-regexp": "4.0.0" }, @@ -16787,6 +20001,7 @@ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz", "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -16796,6 +20011,7 @@ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^1.0.2 || 2" } @@ -16805,6 +20021,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -16814,6 +20031,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -16823,6 +20041,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, + "license": "MIT", "dependencies": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" @@ -16836,6 +20055,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^3.0.0" }, @@ -16847,12 +20067,14 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -16862,6 +20084,7 @@ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -16870,13 +20093,15 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -16892,6 +20117,7 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -16908,13 +20134,15 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/wrap-ansi-cjs/node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -16928,13 +20156,15 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/wrap-ansi/node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -16948,13 +20178,15 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/ws": { "version": "8.18.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -16976,6 +20208,7 @@ "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" } @@ -16984,13 +20217,15 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.4" } @@ -17000,6 +20235,7 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -17008,13 +20244,15 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/yaml": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", - "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz", + "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==", "dev": true, + "license": "ISC", "bin": { "yaml": "bin.mjs" }, @@ -17027,6 +20265,7 @@ "resolved": "https://registry.npmjs.org/yaml-eslint-parser/-/yaml-eslint-parser-1.2.3.tgz", "integrity": "sha512-4wZWvE398hCP7O8n3nXKu/vdq1HcH01ixYlCREaJL5NUMwQ0g3MaGFUBNSlmBtKmhbtVG/Cm6lyYmSVTEVil8A==", "dev": true, + "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.0.0", "lodash": "^4.17.21", @@ -17044,6 +20283,7 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -17056,6 +20296,7 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -17074,6 +20315,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -17083,6 +20325,7 @@ "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", "dev": true, + "license": "MIT", "dependencies": { "camelcase": "^6.0.0", "decamelize": "^4.0.0", @@ -17098,6 +20341,7 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -17110,6 +20354,7 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -17122,6 +20367,7 @@ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -17130,13 +20376,15 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/yargs/node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -17151,6 +20399,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, + "license": "ISC", "engines": { "node": ">=12" } @@ -17160,6 +20409,7 @@ "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" @@ -17170,6 +20420,7 @@ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -17178,6 +20429,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "license": "MIT", "engines": { "node": ">=10" }, @@ -17190,6 +20442,7 @@ "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.1.tgz", "integrity": "sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -17202,6 +20455,7 @@ "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz", "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -17215,6 +20469,7 @@ "integrity": "sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "execa": "^0.8.0", "is-ci": "^1.0.10", @@ -17230,6 +20485,7 @@ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==", "dev": true, + "license": "MIT", "dependencies": { "lru-cache": "^4.0.1", "shebang-command": "^1.2.0", @@ -17241,6 +20497,7 @@ "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz", "integrity": "sha512-zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA==", "dev": true, + "license": "MIT", "dependencies": { "cross-spawn": "^5.0.1", "get-stream": "^3.0.0", @@ -17259,6 +20516,7 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -17268,6 +20526,7 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -17277,6 +20536,7 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dev": true, + "license": "ISC", "dependencies": { "pseudomap": "^1.0.2", "yallist": "^2.1.2" @@ -17287,6 +20547,7 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz", "integrity": "sha512-7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -17296,6 +20557,7 @@ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^2.0.0" }, @@ -17308,6 +20570,7 @@ "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -17317,6 +20580,7 @@ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^1.0.0" }, @@ -17329,6 +20593,7 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -17337,13 +20602,15 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/yorkie/node_modules/which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -17355,13 +20622,15 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/zip-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz", "integrity": "sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==", "dev": true, + "license": "MIT", "dependencies": { "archiver-utils": "^5.0.0", "compress-commons": "^6.0.2", @@ -17376,6 +20645,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz", "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==", "dev": true, + "license": "MIT", "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", @@ -17392,6 +20662,7 @@ "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -17401,6 +20672,7 @@ "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.3.1.tgz", "integrity": "sha512-uFzCZz7FQis256dqw4AhPQgD6f3pzNca/Zh62RNELavlumQB3nDIUFbF5JQfFLcMbO1s02Q7Xg/gpcOBlEnYZA==", "dev": true, + "license": "MIT", "engines": { "node": ">=18.0.0" }, diff --git a/pkgs/by-name/es/eslint/package.nix b/pkgs/by-name/es/eslint/package.nix index 1523d321ceb30..6ad9acd2afc0f 100644 --- a/pkgs/by-name/es/eslint/package.nix +++ b/pkgs/by-name/es/eslint/package.nix @@ -2,24 +2,35 @@ lib, buildNpmPackage, fetchFromGitHub, + stdenv, + overrideSDK, }: - -buildNpmPackage rec { +let + buildNpmPackage' = buildNpmPackage.override { + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; +in +buildNpmPackage' rec { pname = "eslint"; - version = "9.9.1"; + version = "9.10.0"; src = fetchFromGitHub { owner = "eslint"; repo = "eslint"; rev = "refs/tags/v${version}"; - hash = "sha256-n07a50bigglwr3ItZqbyQxu0mPZawTSVunwIe8goJBQ="; + hash = "sha256-R5DO4xN3PkwGAIfyMkohs9SvFiLjWf1ddOwkY6wbsjA="; }; + # NOTE: Generating lock-file + # arch = [ x64 arm64 ] + # platform = [ darwin linux] + # npm install --package-lock-only --arch=<arch> --platform=<os> + # darwin seems to generate a cross platform compatible lockfile postPatch = '' cp ${./package-lock.json} package-lock.json ''; - npmDepsHash = "sha256-/E1JUsbPyHzWJ4kuNRg/blYRaAdATYbk+jnJFJyzHLE="; + npmDepsHash = "sha256-Nrcld0ONfjdSh/ItdbDMp6dXVFKoj83aaoGXDgoNE60="; dontNpmBuild = true; dontNpmPrune = true; diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix index 2b6baaf48e9f2..aad2b117ebb4c 100644 --- a/pkgs/by-name/es/espflash/package.nix +++ b/pkgs/by-name/es/espflash/package.nix @@ -32,9 +32,9 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/pkgs/by-name/ev/evebox/package.nix b/pkgs/by-name/ev/evebox/package.nix index 29062726c15eb..4b09fba8675b9 100644 --- a/pkgs/by-name/ev/evebox/package.nix +++ b/pkgs/by-name/ev/evebox/package.nix @@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/jasonish/evebox/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ felbinger ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ev/everforest-gtk-theme/package.nix b/pkgs/by-name/ev/everforest-gtk-theme/package.nix index 943c743f894d8..b20e4505a5c6b 100644 --- a/pkgs/by-name/ev/everforest-gtk-theme/package.nix +++ b/pkgs/by-name/ev/everforest-gtk-theme/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { owner = "Fausto-Korpsvart"; repo = "Everforest-GTK-Theme"; rev = "8481714cf9ed5148694f1916ceba8fe21e14937b"; - sha256 = "sha256-NO12ku8wnW/qMHKxi5TL/dqBxH0+cZbe+fU0iicb9JU="; + hash = "sha256-NO12ku8wnW/qMHKxi5TL/dqBxH0+cZbe+fU0iicb9JU="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 228e20ae0eabe..8dc34e2109481 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -30,7 +30,7 @@ , ninja , libkrb5 , openldap -, enableOAuth2 ? stdenv.isLinux +, enableOAuth2 ? stdenv.hostPlatform.isLinux , webkitgtk_4_1 , webkitgtk_6_0 , json-glib @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { libphonenumber boost protobuf - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ lib.optionals withGtk3 [ gtk3 @@ -141,14 +141,14 @@ stdenv.mkDerivation rec { "-DENABLE_OAUTH2_WEBKITGTK4=${lib.boolToString (withGtk4 && enableOAuth2)}" ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/modules/SetupBuildFlags.cmake \ --replace "-Wl,--no-undefined" "" substituteInPlace src/services/evolution-alarm-notify/e-alarm-notify.c \ --replace "G_OS_WIN32" "__APPLE__" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/evolution-data-server/*.dylib $out/lib/ ''; @@ -181,6 +181,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Unified backend for programs that work with contacts, tasks, and calendar information"; homepage = "https://gitlab.gnome.org/GNOME/evolution-data-server"; + changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/by-name/ew/eweb/package.nix similarity index 100% rename from pkgs/development/tools/literate-programming/eweb/default.nix rename to pkgs/by-name/ew/eweb/package.nix diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index f3cc565cab423..41bf6c7b5500a 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -67,12 +67,11 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ coffeeispower - eclairevoyant figsoda lom w-lfchen ]; mainProgram = "eww"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix new file mode 100644 index 0000000000000..63331bbf5a849 --- /dev/null +++ b/pkgs/by-name/ex/example-robot-data/package.nix @@ -0,0 +1,74 @@ +{ + cmake, + doxygen, + fetchFromGitHub, + fetchpatch, + lib, + pkg-config, + pythonSupport ? false, + python3Packages, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "example-robot-data"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "Gepetto"; + repo = "example-robot-data"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-Heq+c8SSYNO8ksTv5FphRBRStlTakm9T66jlPXon5tI="; + }; + + outputs = [ + "out" + "doc" + ]; + + strictDeps = true; + + patches = [ + # Temporary patch for pinocchio v3.0.0 compatibility. + # Should be removed on next example-robot-data release + (fetchpatch { + name = "pin3.patch"; + url = "https://github.com/Gepetto/example-robot-data/pull/217/commits/a605ceec857005cde153ec5895e227205eb7a5c3.patch"; + hash = "sha256-cvAWFytrU2XVggo/nCg8cuLcaZBTACXg6LxjL/6YMPs="; + }) + ]; + + nativeBuildInputs = + [ + cmake + doxygen + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; + + propagatedBuildInputs = lib.optionals pythonSupport [ python3Packages.pinocchio ]; + + cmakeFlags = [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) ]; + + doCheck = true; + # The package expect to find an `example-robot-data/robots` folder somewhere + # either in install prefix or in the sources + # where it can find the meshes for unit tests + preCheck = "ln -s source ../../${finalAttrs.pname}"; + pythonImportsCheck = [ "example_robot_data" ]; + + meta = with lib; { + description = "Set of robot URDFs for benchmarking and developed examples"; + homepage = "https://github.com/Gepetto/example-robot-data"; + license = licenses.bsd3; + maintainers = with maintainers; [ + nim65s + wegank + ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/ex/exificient/package.nix b/pkgs/by-name/ex/exificient/package.nix new file mode 100644 index 0000000000000..f64ee15654ad4 --- /dev/null +++ b/pkgs/by-name/ex/exificient/package.nix @@ -0,0 +1,44 @@ +{ + maven, + fetchFromGitHub, + lib, + makeWrapper, + jre, +}: + +maven.buildMavenPackage rec { + pname = "exificient"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "EXIficient"; + repo = "exificient"; + rev = "exificient-${version}"; + hash = "sha256-XrlZQf2BamYw8u1S2qQ6jV9mgyCEjBxKqPZCXMJzXmc="; + }; + + mvnHash = "sha256-/72Pi8WbKhPXu7Zb9r30znY1FHJc7FM42f7uQJqJnWo="; + + mvnParameters = "package assembly:single -Dmaven.test.skip=true"; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + ls -al target/classes/com/siemens/ + mkdir -p $out/bin $out/share/exificient + install -Dm644 target/exificient-jar-with-dependencies.jar $out/share/exificient + + makeWrapper ${jre}/bin/java $out/bin/exificient \ + --add-flags "-classpath $out/share/exificient/exificient-jar-with-dependencies.jar com.siemens.ct.exi.main.cmd.EXIficientCMD" + runHook postInstall + ''; + + meta = { + description = "Java implementation of the W3C Efficient Extensible Interchange (EXI) format specification"; + homepage = "http://exificient.github.io/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ samw ]; + mainProgram = "exificient"; + }; +} diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix new file mode 100644 index 0000000000000..a58e248c2d76b --- /dev/null +++ b/pkgs/by-name/ex/exo/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: +python3Packages.buildPythonApplication { + pname = "exo"; + version = "0-unstable-2024-10-03"; + pyproject = true; + + src = fetchFromGitHub { + owner = "exo-explore"; + repo = "exo"; + rev = "2b9dec20eb25f8708455e13eabc744d653b7a286"; + hash = "sha256-Iz65bs/ntTrxcifrPemAlK8zVjbwQfXsnUlcE1r4E/A="; + }; + + build-system = with python3Packages; [ setuptools ]; + + pythonRelaxDeps = true; + + pythonRemoveDeps = [ "uuid" ]; + + dependencies = with python3Packages; [ + aiohttp + aiohttp-cors + aiofiles + blobfile + grpcio + grpcio-tools + hf-transfer + huggingface-hub + jinja2 + netifaces + numpy + pillow + prometheus-client + protobuf + psutil + pynvml + requests + rich + safetensors + tailscale + tenacity + tiktoken + tokenizers + tqdm + transformers + tinygrad + ]; + + pythonImportsCheck = [ + "exo" + "exo.inference.tinygrad.models" + ]; + + nativeCheckInputs = with python3Packages; [ + mlx + pytestCheckHook + ]; + + disabledTestPaths = [ + "test/test_tokenizers.py" + ]; + + # Tests require `mlx` which is not supported on linux. + doCheck = stdenv.isDarwin; + + meta = { + description = "Run your own AI cluster at home with everyday devices"; + homepage = "https://github.com/exo-explore/exo"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "exo"; + }; +} diff --git a/pkgs/by-name/ex/ext4fuse/package.nix b/pkgs/by-name/ex/ext4fuse/package.nix index b083ec1c63f41..4ab5612fe8f5e 100644 --- a/pkgs/by-name/ex/ext4fuse/package.nix +++ b/pkgs/by-name/ex/ext4fuse/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { which ]; - buildInputs = [ (if stdenv.isDarwin then macfuse-stubs else fuse) ]; + buildInputs = [ (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse) ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 7a784afcd26b5..c24a7eea85a9d 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,20 +17,20 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.19.1"; + version = "0.20.1"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-VV8tqVJq+bsgfdNSxSzo1vqYtYT37D2pBX4HydY6cKs="; + hash = "sha256-dJrGPxqFfveb7lyCmDU0hnx5TkaDsdJgpKPtWyjj5ls="; }; - cargoHash = "sha256-SUvQxW3STsP1VrPJKK2NYbApuoGfbmfUiywZILvcvj4="; + cargoHash = "sha256-LM+ikA0aiSZmTH5cUcSQ0ikVd9kcADyCOR5qdCD1UJ4="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; buildNoDefaultFeatures = true; buildFeatures = lib.optional gitSupport "git"; @@ -38,9 +38,10 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "man" ]; postInstall = '' - pandoc --standalone -f markdown -t man man/eza.1.md > man/eza.1 - pandoc --standalone -f markdown -t man man/eza_colors.5.md > man/eza_colors.5 - pandoc --standalone -f markdown -t man man/eza_colors-explanation.5.md > man/eza_colors-explanation.5 + for page in eza.1 eza_colors.5 eza_colors-explanation.5; do + sed "s/\$version/v${version}/g" "man/$page.md" | + pandoc --standalone -f markdown -t man >"man/$page" + done installManPage man/eza.1 man/eza_colors.5 man/eza_colors-explanation.5 installShellCompletion \ --bash completions/bash/eza \ @@ -62,7 +63,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/eza-community/eza"; changelog = "https://github.com/eza-community/eza/releases/tag/v${version}"; - license = licenses.mit; + license = licenses.eupl12; mainProgram = "eza"; maintainers = with maintainers; [ cafkafk _9glenda ]; platforms = platforms.unix ++ platforms.windows; diff --git a/pkgs/by-name/f2/f2fs-tools/package.nix b/pkgs/by-name/f2/f2fs-tools/package.nix index 0c91e41da45fe..60ec724b8ad40 100644 --- a/pkgs/by-name/f2/f2fs-tools/package.nix +++ b/pkgs/by-name/f2/f2fs-tools/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v${version}.tar.gz"; - sha256 = "sha256-zNG1F//+BTBzlEc6qNVixyuCB6PMZD5Kf8pVK0ePYiA="; + hash = "sha256-zNG1F//+BTBzlEc6qNVixyuCB6PMZD5Kf8pVK0ePYiA="; }; nativeBuildInputs = [ @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { }) ]; + enableParallelBuilding = true; + meta = { homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/"; description = "Userland tools for the f2fs filesystem"; diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix new file mode 100644 index 0000000000000..9622ac2c598f8 --- /dev/null +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "fabric-ai"; + version = "1.4.26"; + + src = fetchFromGitHub { + owner = "danielmiessler"; + repo = "fabric"; + rev = "v${version}"; + hash = "sha256-KoGulBnQDLpRWB+Bogu+bvXDJ98ImyzTZrvoEaVh5BQ="; + }; + + vendorHash = "sha256-uWq+S6J/RInAaQOO0T3LkpQ89mHq0Wj+wXw+Tioxy70="; + + ldflags = [ + "-s" + "-w" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fabric is an open-source framework for augmenting humans using AI. It provides a modular framework for solving specific problems using a crowdsourced set of AI prompts that can be used anywhere"; + homepage = "https://github.com/danielmiessler/fabric"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jaredmontoya ]; + mainProgram = "fabric"; + }; +} diff --git a/pkgs/by-name/fa/facter/Gemfile.lock b/pkgs/by-name/fa/facter/Gemfile.lock index d980285ae0f32..2e80bd9192b49 100644 --- a/pkgs/by-name/fa/facter/Gemfile.lock +++ b/pkgs/by-name/fa/facter/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - facter (4.6.1) + facter (4.8.0) hocon (~> 1.3) - thor (>= 1.0.1, < 2.0) + thor (>= 1.0.1, < 1.3) hocon (1.4.0) - thor (1.3.1) + thor (1.2.2) PLATFORMS ruby @@ -14,4 +14,4 @@ DEPENDENCIES facter BUNDLED WITH - 2.5.6 + 2.5.16 diff --git a/pkgs/by-name/fa/facter/gemset.nix b/pkgs/by-name/fa/facter/gemset.nix index 6f1cf7a2b8b07..2f70d6047e011 100644 --- a/pkgs/by-name/fa/facter/gemset.nix +++ b/pkgs/by-name/fa/facter/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pxpldfcf40dr9khra3sa131ij7gzd97bba2vpw89c785pl736a7"; + sha256 = "1130mzk90pi0y9fnraqqak7gcfg61dhx92axwnhchbpw09akfl09"; type = "gem"; }; - version = "4.6.1"; + version = "4.8.0"; }; hocon = { groups = ["default"]; @@ -25,9 +25,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.3.1"; + version = "1.2.2"; }; } diff --git a/pkgs/by-name/fa/facter/package.nix b/pkgs/by-name/fa/facter/package.nix index fa92def6b1bc2..8d5f3bc03addc 100644 --- a/pkgs/by-name/fa/facter/package.nix +++ b/pkgs/by-name/fa/facter/package.nix @@ -35,7 +35,7 @@ bundlerApp { procps util-linux ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ iproute2 virt-what zfs diff --git a/pkgs/by-name/fa/factplusplus/package.nix b/pkgs/by-name/fa/factplusplus/package.nix new file mode 100644 index 0000000000000..b37bdf00d55ae --- /dev/null +++ b/pkgs/by-name/fa/factplusplus/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + lib, + fetchFromBitbucket, + jdk, +}: + +stdenv.mkDerivation rec { + pname = "factplusplus"; + version = "1.6.5"; + + src = fetchFromBitbucket { + owner = "dtsarkov"; + repo = "factplusplus"; + rev = "Release-${version}"; + sha256 = "wzK1QJsNN0Q73NM+vjaE/vLuGf8J1Zu5ZPAkZNiKnME="; + }; + + buildInputs = [ jdk ]; + + configurePhase = '' + runHook preConfigure + + sed -i 's/OS = MACOSX/OS = LINUX/g' Makefile.include + printf '%s\n%s\n' '#include <iostream>' "$(cat Kernel/AtomicDecomposer.cpp)" > Kernel/AtomicDecomposer.cpp + + runHook postConfigure + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 FaCT++.{C,JNI,KE,Kernel}/obj/*.{so,o} -t $out/lib/ + install -Dm755 FaCT++/obj/FaCT++ -t $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Tableaux-based reasoner for expressive Description Logics (DL)"; + homepage = "http://owl.cs.manchester.ac.uk/tools/fact/"; + maintainers = [ maintainers.mgttlinger ]; + license = licenses.gpl2Plus; + platforms = with platforms; linux ++ darwin ++ windows; + broken = !stdenv.hostPlatform.isLinux; + mainProgram = "FaCT++"; + }; +} diff --git a/pkgs/by-name/fa/fail2ban/package.nix b/pkgs/by-name/fa/fail2ban/package.nix index 20f89c501dde6..6943ccc447a0e 100644 --- a/pkgs/by-name/fa/fail2ban/package.nix +++ b/pkgs/by-name/fa/fail2ban/package.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; pythonPath = with python3.pkgs; - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ systemd pyinotify @@ -83,7 +83,7 @@ python3.pkgs.buildPythonApplication rec { rm $out/bin/fail2ban-python ln -s ${python3.interpreter} $out/bin/fail2ban-python - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # see https://github.com/NixOS/nixpkgs/issues/4968 rm -r "${sitePackages}/usr" ''; diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix index 555be83258262..49536d8e39aee 100644 --- a/pkgs/by-name/fa/fantomas/package.nix +++ b/pkgs/by-name/fa/fantomas/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "fantomas"; - version = "6.3.10"; + version = "6.3.15"; - nugetHash = "sha256-2m4YevDp9CRm/Ci2hguDXd6DUMElRg3hNAne9LHntWM="; + nugetHash = "sha256-Gjw7MxjUNckMWSfnOye4UTe5fZWnor6RHCls3PNsuG8="; meta = with lib; { description = "F# source code formatter"; diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix index b6270a6eaa73f..e230d97a76053 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 = "6.1.4"; + version = "6.1.6"; src = fetchFromGitHub { owner = "fastfloat"; repo = "fast_float"; rev = "v${finalAttrs.version}"; - hash = "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao="; + hash = "sha256-MEJMPQZZZhOFiKlPAKIi0zVzaJBvjAlbSyg3wLOQ1fg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/fa/fastcdr/package.nix b/pkgs/by-name/fa/fastcdr/package.nix index 438eac224aa49..4d342c6bbb29f 100644 --- a/pkgs/by-name/fa/fastcdr/package.nix +++ b/pkgs/by-name/fa/fastcdr/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastcdr"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-CDR"; rev = "v${finalAttrs.version}"; - hash = "sha256-x+lkbssrNQQXmnlfYM2cGMVQZRiONNeImHj5EPm93ls="; + hash = "sha256-R+StDJVqT0ktbr4cQBwEAPmju+pmBvxonezsIsPwmgc="; }; patches = [ diff --git a/pkgs/by-name/fa/fastcompmgr/package.nix b/pkgs/by-name/fa/fastcompmgr/package.nix new file mode 100644 index 0000000000000..6a02b0940296b --- /dev/null +++ b/pkgs/by-name/fa/fastcompmgr/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + fetchFromGitHub, + xorg, + pkgs, + lib, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "fastcompmgr"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "tycho-kirchner"; + repo = "fastcompmgr"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-FrPM6k4280SNnmi/jiwKU/O2eBue+5h8aNDCiIqZ3+c="; + }; + + nativeBuildInputs = [ pkgs.pkg-config ]; + + buildInputs = [ + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXfixes + xorg.libXrender + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp fastcompmgr $out/bin + + runHook postInstall + ''; + + meta = { + description = "Fast compositor for X11"; + homepage = "https://github.com/tycho-kirchner/fastcompmgr"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ camerondugan ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 60dce16443f65..3927b31b880bf 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -43,17 +43,17 @@ x11Support ? true, }: let - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.22.0"; + version = "2.26.1"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-ncaBMSV7n4RVA2376ExBv+a8bzuvuMttv3GlNaOH23k="; + hash = "sha256-0TRhMK45mfCft56R07lUbnxjfQrIAXONy4f6ykpc5X8="; }; outputs = [ @@ -77,7 +77,7 @@ stdenv'.mkDerivation (finalAttrs: { sqlite yyjson ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus dconf ddcutil @@ -103,8 +103,8 @@ stdenv'.mkDerivation (finalAttrs: { xorg.libXdmcp xorg.libXext ] - ++ lib.optionals (x11Support && (!stdenv.isDarwin)) [ xfce.xfconf ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [ xfce.xfconf ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ Apple80211 @@ -138,10 +138,10 @@ stdenv'.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_X11" x11Support) (lib.cmakeBool "ENABLE_XCB" x11Support) (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) - (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.isDarwin))) + (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.hostPlatform.isDarwin))) (lib.cmakeBool "ENABLE_XRANDR" x11Support) ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids") (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids") ]; @@ -167,7 +167,7 @@ stdenv'.mkDerivation (finalAttrs: { }; meta = { - description = "Like neofetch, but much faster because written in C"; + description = "An 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; diff --git a/pkgs/by-name/fa/fastqc/package.nix b/pkgs/by-name/fa/fastqc/package.nix index e7973ab0d602c..9c63a98e77113 100644 --- a/pkgs/by-name/fa/fastqc/package.nix +++ b/pkgs/by-name/fa/fastqc/package.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: { dontBuild = true; nativeBuildInputs = [ makeWrapper imagemagick ] - ++ lib.optional stdenv.isLinux copyDesktopItems # postInstallHook - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; #fixupOutputHook + ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems # postInstallHook + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; #fixupOutputHook buildInputs = [ jre perl]; desktopItem = (makeDesktopItem { diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix index e85eede1e2d92..87d66c67802a3 100644 --- a/pkgs/by-name/fa/fatrop/package.nix +++ b/pkgs/by-name/fa/fatrop/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ blasfeo ] ++ lib.optionals pythonSupport [ python3Packages.pybind11 ] - ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; cmakeFlags = [ (lib.cmakeBool "BUILD_DOCS" true) diff --git a/pkgs/by-name/fc/fcitx5-fluent/package.nix b/pkgs/by-name/fc/fcitx5-fluent/package.nix new file mode 100644 index 0000000000000..ab1c46e10f0b7 --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-fluent/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + jdupes, +}: + +stdenvNoCC.mkDerivation { + pname = "fcitx5-fluent"; + version = "0.4.0-unstable-2024-03-30"; + + src = fetchFromGitHub { + owner = "Reverier-Xu"; + repo = "Fluent-fcitx5"; + rev = "dc98bc13e8eadabed7530a68706f0a2a0a07340e"; + hash = "sha256-d1Y0MUOofBxwyeoXxUzQHrngL1qnL3TMa5DhDki7Pk8="; + }; + + nativeBuildInputs = [ jdupes ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fcitx5/themes + cp -r FluentDark FluentDark-solid FluentLight FluentLight-solid $out/share/fcitx5/themes + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + meta = with lib; { + description = "A fluent-design theme with blur effect and shadow"; + homepage = "https://github.com/Reverier-Xu/Fluent-fcitx5"; + license = licenses.mpl20; + platforms = platforms.all; + maintainers = with maintainers; [ oosquare ]; + }; +} diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index f65017a3ad4a7..7f1abd017617f 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 = "20240809"; + version = "20240909"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-2jSKzDgjxuz0/Agqefy4JrScmqM7SXnIuZlLMkqAGT0="; + hash = "sha256-+e4azEWHYSh3Gy9Xa+Y8E7f7rAA8YlWlbvbva9kNXCI="; }; dontUnpack = true; diff --git a/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix index c28c18ae63c57..347d70e480f59 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-zhwiki"; version = "0.2.5"; - date = "20240509"; + date = "20240909"; src = fetchurl { url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/zhwiki-${finalAttrs.date}.dict"; - hash = "sha256-uRpKPq+/xJ8akKB8ol/JRF79VfDIQ8L4SxLDXzpfPxg="; + hash = "sha256-djXrwl1MmiAf0U5Xvm4S7Fk2fKNRm5jtc94KUYIrcm8="; }; dontUnpack = true; diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix new file mode 100644 index 0000000000000..832b2d62cc079 --- /dev/null +++ b/pkgs/by-name/fd/fdroidserver/package.nix @@ -0,0 +1,105 @@ +{ + lib, + fetchFromGitLab, + python3Packages, + python3, + fetchPypi, + apksigner, + installShellFiles, +}: + +let + version = "2.3a2"; +in +python3Packages.buildPythonApplication { + pname = "fdroidserver"; + inherit version; + + pyproject = true; + + src = fetchFromGitLab { + owner = "fdroid"; + repo = "fdroidserver"; + rev = version; + hash = "sha256-nsAFBZqxo4XVWU6nBjo2T6VhU8U4I8h/FRXd1L240rk="; + }; + + pythonRelaxDeps = [ + "androguard" + "pyasn1" + "pyasn1-modules" + ]; + + postPatch = '' + substituteInPlace fdroidserver/common.py \ + --replace-fail "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" + ''; + + preConfigure = '' + ${python3.pythonOnBuildForHost.interpreter} setup.py compile_catalog + ''; + + postInstall = '' + patchShebangs gradlew-fdroid + install -m 0755 gradlew-fdroid $out/bin + installShellCompletion --cmd fdroid \ + --bash completion/bash-completion + ''; + + nativeBuildInputs = [ installShellFiles ]; + + build-system = with python3Packages; [ babel ]; + + dependencies = with python3Packages; [ + androguard + platformdirs + clint + defusedxml + gitpython + libcloud + mwclient + oscrypto + paramiko + pillow + pyasn1 + pyasn1-modules + pycountry + python-vagrant + pyyaml + qrcode + requests + (ruamel-yaml.overrideAttrs (old: { + src = fetchPypi { + pname = "ruamel.yaml"; + version = "0.17.21"; + hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; + }; + })) + sdkmanager + yamllint + ]; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + "${lib.makeBinPath [ apksigner ]}" + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "fdroidserver" ]; + + meta = { + homepage = "https://gitlab.com/fdroid/fdroidserver"; + changelog = "https://gitlab.com/fdroid/fdroidserver/-/blob/${version}/CHANGELOG.md"; + description = "Server and tools for F-Droid, the Free Software repository system for Android"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + linsui + jugendhacker + ]; + mainProgram = "fdroid"; + }; +} diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix index 6ef42e918f343..643775892bbd7 100644 --- a/pkgs/by-name/fe/feather/package.nix +++ b/pkgs/by-name/fe/feather/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feather"; - version = "2.6.7"; + version = "2.6.8"; src = fetchFromGitHub { owner = "feather-wallet"; repo = "feather"; rev = finalAttrs.version; - hash = "sha256-zXNpNhBOtDvuuxzZ8o2XDLqNSi/XK4I6eYAfWuiCgRI="; + hash = "sha256-l1kyNpUIqezMfInhrKgnTnArqeSjvhBwdqVi0aUlKF8="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix index 654046067dc80..5897fae85a1ab 100644 --- a/pkgs/by-name/fe/febio-studio/package.nix +++ b/pkgs/by-name/fe/febio-studio/package.nix @@ -25,7 +25,7 @@ let stdenv' = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then overrideSDK stdenv { darwinSdkVersion = "11.0"; darwinMinVersion = "10.15"; diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix index 01897ae760366..3f70ad711d761 100644 --- a/pkgs/by-name/fe/febio/package.nix +++ b/pkgs/by-name/fe/febio/package.nix @@ -14,7 +14,7 @@ }: let - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { @@ -56,7 +56,7 @@ stdenv'.mkDerivation (finalAttrs: { buildInputs = [ zlib ] ++ lib.optionals mklSupport [ mkl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.CoreVideo darwin.apple_sdk.frameworks.Accelerate diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index be8bc1f602e33..ca91966bbefad 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -17,23 +17,23 @@ let # Rust rocksdb bindings have C++ compilation/linking errors on Darwin when using newer clang # Forcing it to clang 12 fixes the issue. buildRustPackage = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then rustPlatform.buildRustPackage.override { stdenv = llvmPackages_12.stdenv; } else rustPlatform.buildRustPackage; in buildRustPackage rec { pname = "fedimint"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "fedimint"; repo = "fedimint"; rev = "v${version}"; - hash = "sha256-udQxFfLkAysDtD6P3TsW0xEcENA77l+GaDUSnkIBGXo="; + hash = "sha256-NUr1ZpYJozWIej46Oqlf/7feJ4kztYYvX3TEzQ5VoWo="; }; - cargoHash = "sha256-w1yQOEoumyam4JsDarAQffTs8Ype4VUyGJ0vgJfuHaU="; + cargoHash = "sha256-sky0Blh2fjP82UgFUfBH0vAIdBzHOfVGAfOW0rwNH00="; nativeBuildInputs = [ protobuf @@ -44,7 +44,7 @@ buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv Security diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index 8b4c8d8aac1ea..0ed5aed53c6a6 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -11,13 +11,13 @@ }: let pname = "feishin"; - version = "0.7.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; rev = "v${version}"; - hash = "sha256-UOY0wjWGK7sal/qQbbkHjFUIA49QtbO+Ei6hSTOyHWk="; + hash = "sha256-3gQ39GhYPme0kGAtM5DsG9RYwf23OAdkp3uVt7c1SQU="; }; electron = electron_31; @@ -26,7 +26,7 @@ buildNpmPackage { inherit pname version; inherit src; - npmDepsHash = "sha256-FLo8FCpxvh2Iqd3pkpgwRZ4f2viX4iET64VAuXN362g="; + npmDepsHash = "sha256-u+zbPB6u9EYVr9oHnLlKC0AyCLn4nq4TFVPSs2oWsbo="; npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true; @@ -34,8 +34,8 @@ buildNpmPackage { env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = - lib.optionals (stdenv.isLinux) [ copyDesktopItems ] - ++ lib.optionals stdenv.isDarwin [ darwin.autoSignDarwinBinariesHook ]; + lib.optionals (stdenv.hostPlatform.isLinux) [ copyDesktopItems ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.autoSignDarwinBinariesHook ]; postPatch = '' @@ -47,7 +47,7 @@ buildNpmPackage { substituteInPlace src/main/main.ts \ --replace-fail "autoUpdater.checkForUpdatesAndNotify();" "" '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' # https://github.com/electron/electron/issues/31121 substituteInPlace src/main/main.ts \ --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'" @@ -60,7 +60,7 @@ buildNpmPackage { inherit version; src = "${src}/release/app"; - npmDepsHash = "sha256-fQV2yqyNZCjeNUekBaXUsND2lIZYYz07YQ6TGoFxT9Q="; + npmDepsHash = "sha256-3qUmXRiAloGgLAErR16+BGEUT0ZwHHhCxMDQRCENQB4="; npmFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; @@ -77,7 +77,7 @@ buildNpmPackage { ''; postBuild = - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # electron-builder appears to build directly on top of Electron.app, by overwriting the files in the bundle. cp -r ${electron.dist}/Electron.app ./ find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw @@ -90,7 +90,7 @@ buildNpmPackage { + '' npm exec electron-builder -- \ --dir \ - -c.electronDist=${if stdenv.isDarwin then "./" else electron.dist} \ + -c.electronDist=${if stdenv.hostPlatform.isDarwin then "./" else electron.dist} \ -c.electronVersion=${electron.version} \ -c.npmRebuild=false ''; @@ -99,12 +99,12 @@ buildNpmPackage { '' runHook preInstall '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} cp -r release/build/**/Feishin.app $out/Applications/ makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/feishin pushd release/build/*/ cp -r locales resources{,.pak} $out/share/feishin diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 50526b45a1cb7..2a398506b3d8b 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.12.19"; + version = "8.14.0"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-/TGmUHMNowQFIw09OGw1ybiYE7ADPLbsZpAMPw3G5NE="; + hash = "sha256-hHgPtr25X2vZY+MKQn9FgkMLrF5vgklMQHzx4ksGrDk="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/ff/ffts/package.nix b/pkgs/by-name/ff/ffts/package.nix new file mode 100644 index 0000000000000..50ea6c26d21bd --- /dev/null +++ b/pkgs/by-name/ff/ffts/package.nix @@ -0,0 +1,30 @@ +{ + stdenv, + lib, + cmake, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "ffts"; + version = "0-unstable-2019-03-19"; + + src = fetchFromGitHub { + owner = "linkotec"; + repo = "ffts"; + rev = "2c8da4877588e288ff4cd550f14bec2dc7bf668c"; + hash = "sha256-Cj0n7fwFAu6+3ojgczL0Unobdx/XzGNFvNVMXdyHXE4="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DENABLE_SHARED=ON" ]; + + meta = { + description = "The Fastest Fourier Transform in the South"; + homepage = "https://github.com/linkotec/ffts"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bgamari ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/fg/fgqcanvas/package.nix b/pkgs/by-name/fg/fgqcanvas/package.nix index ec47740232205..e7d0352a0fbaf 100644 --- a/pkgs/by-name/fg/fgqcanvas/package.nix +++ b/pkgs/by-name/fg/fgqcanvas/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.code.sf.net/p/flightgear/flightgear"; rev = "3168828949d6b42959ccee6c202b8895493edb2b"; - sha256 = "sha256-QiIMkrzaB/ljVf6c+RJNFWKLZa84cIjYPO5nxEFDqjg="; + hash = "sha256-QiIMkrzaB/ljVf6c+RJNFWKLZa84cIjYPO5nxEFDqjg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fi/fido2luks/package.nix b/pkgs/by-name/fi/fido2luks/package.nix index 0504959697c6a..c19f7381a3bd7 100644 --- a/pkgs/by-name/fi/fido2luks/package.nix +++ b/pkgs/by-name/fi/fido2luks/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { owner = "shimunn"; repo = pname; rev = version; - sha256 = "sha256-bXwaFiRHURvS5KtTqIj+3GlGNbEulDgMDP51ZiO1w9o="; + hash = "sha256-bXwaFiRHURvS5KtTqIj+3GlGNbEulDgMDP51ZiO1w9o="; }; cargoPatches = [ diff --git a/pkgs/by-name/fi/file-roller/package.nix b/pkgs/by-name/fi/file-roller/package.nix index 497bfe4920c91..91c463802353e 100644 --- a/pkgs/by-name/fi/file-roller/package.nix +++ b/pkgs/by-name/fi/file-roller/package.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/file-roller"; + changelog = "https://gitlab.gnome.org/GNOME/file-roller/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Archive manager for the GNOME desktop environment"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/by-name/fi/filebot/package.nix b/pkgs/by-name/fi/filebot/package.nix new file mode 100644 index 0000000000000..196ec06c86065 --- /dev/null +++ b/pkgs/by-name/fi/filebot/package.nix @@ -0,0 +1,99 @@ +{ + lib, + stdenv, + fetchurl, + coreutils, + openjdk17, + makeWrapper, + autoPatchelfHook, + zlib, + libzen, + libmediainfo, + curlWithGnuTls, + libmms, + glib, + genericUpdater, + writeShellScript, +}: + +let + lanterna = fetchurl { + url = "https://search.maven.org/remotecontent?filepath=com/googlecode/lanterna/lanterna/3.1.1/lanterna-3.1.1.jar"; + hash = "sha256-7zxCeXYW5v9ritnvkwRpPKdgSptCmkT3HJOaNgQHUmQ="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "filebot"; + version = "5.1.5"; + + src = fetchurl { + url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz"; + hash = "sha256-fwyo9J5O728xxWHWvq63bTJMV4IAMAHZR0yr3Pb6d7U="; + }; + + unpackPhase = "tar xvf $src"; + + nativeBuildInputs = [ + makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + zlib + libzen + libmediainfo + curlWithGnuTls + libmms + glib + ]; + + postPatch = '' + # replace lanterna.jar to be able to specify `com.googlecode.lanterna.terminal.UnixTerminal.sttyCommand` + cp ${lanterna} jar/lanterna.jar + ''; + + dontBuild = true; + installPhase = '' + mkdir -p $out/opt $out/bin + # Since FileBot has dependencies on relative paths between files, all required files are copied to the same location as is. + cp -r filebot.sh lib/ jar/ $out/opt/ + # Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead. + substituteInPlace $out/opt/filebot.sh \ + --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ + --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' \ + --replace '-jar "$FILEBOT_HOME/jar/filebot.jar"' '-Dcom.googlecode.lanterna.terminal.UnixTerminal.sttyCommand=${coreutils}/bin/stty -jar "$FILEBOT_HOME/jar/filebot.jar"' + wrapProgram $out/opt/filebot.sh \ + --prefix PATH : ${lib.makeBinPath [ openjdk17 ]} + # Expose the binary in bin to make runnable. + ln -s $out/opt/filebot.sh $out/bin/filebot + ''; + + passthru.updateScript = genericUpdater { + versionLister = writeShellScript "filebot-versionLister" '' + curl -s https://www.filebot.net \ + | sed -rne 's,^.*FileBot_([0-9]*\.[0-9]+\.[0-9]+)-portable.tar.xz.*,\1,p' + ''; + }; + + meta = with lib; { + description = "Ultimate TV and Movie Renamer"; + longDescription = '' + FileBot is the ultimate tool for organizing and renaming your Movies, TV + Shows and Anime as well as fetching subtitles and artwork. It's smart and + just works. + ''; + homepage = "https://filebot.net"; + changelog = "https://www.filebot.net/forums/viewforum.php?f=7"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ + gleber + felschr + ]; + platforms = platforms.linux; + mainProgram = "filebot"; + }; +}) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 82aaa4af8a443..133cecf2d86f8 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.128"; + version = "2.13.141"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-oQ+mESm7/VkfX+8Yf3l7x7VSfUK2flndSthlhNpvjh0="; + hash = "sha256-UVD2zWas4QZD3W6Xro7tiGJDdbive60dYPDY1UTnl08="; }; - vendorHash = "sha256-h0dADEkiVNBudIh64Waqf9LtLa+I6dwAkmtYjuspEBs="; + vendorHash = "sha256-4HkIwyRqvbk7qIzCjZNTzF7wDNupNaDpOiqqdlx9UIo="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/filesender/package.nix b/pkgs/by-name/fi/filesender/package.nix index 6cf4f36fd8700..27a6cf73e76bb 100644 --- a/pkgs/by-name/fi/filesender/package.nix +++ b/pkgs/by-name/fi/filesender/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "filesender"; - version = "2.48"; + version = "2.49"; src = fetchFromGitHub { owner = "filesender"; repo = "filesender"; rev = "filesender-${finalAttrs.version}"; - hash = "sha256-lXA9XZ5gbfut2EQ5bF2w8rhAEM++8rQseWviKwfRWGk="; + hash = "sha256-GNhborbwV9G2x7pLDyxGVCtTf4AIaMYQGAKNJPzedzo="; }; patches = [ diff --git a/pkgs/by-name/fi/fim-rs/package.nix b/pkgs/by-name/fi/fim-rs/package.nix index f2b1cf85dff67..2b1cdc313ce39 100644 --- a/pkgs/by-name/fi/fim-rs/package.nix +++ b/pkgs/by-name/fi/fim-rs/package.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix index 7f93af1ced703..ffd22a70bf037 100644 --- a/pkgs/by-name/fi/firecracker/package.nix +++ b/pkgs/by-name/fi/firecracker/package.nix @@ -5,7 +5,7 @@ }: let - version = "1.8.0"; + version = "1.9.0"; # nixpkgs-update: no auto update suffix = @@ -32,8 +32,8 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-vImb2u+NCqew+vv0miv2R+AphVj0+u5Elw2HocbRri0="; - aarch64-linux = "sha256-ZLSc61MWfXYWv0/Sxz3vaWoyAlnqbgfPFEfJCRxfknE="; + x86_64-linux = "sha256-lcE3QMfKGm37QOD1HNCp7v7h8iPNLDU4dV0Dw6m6Ujc="; + aarch64-linux = "sha256-xVZOdt7CuOgJLFLw+KTF9FzzF5HpWpMC9DYKdx33j2k="; }; dontConfigure = true; 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 d647783f73818..106069c1e7ff3 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -13,13 +13,13 @@ let pname = "firefly-iii-data-importer"; - version = "1.5.4"; + version = "1.5.6"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; rev = "v${version}"; - hash = "sha256-XnPdoNtUoJpOpKVzQlFirh7u824H4xKAe2VRXfGIKeg="; + hash = "sha256-IIlcOGulcBJsYz7Yx3YWV/c6yvb8+82AvFghQ05dUcI="; }; in @@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-EjEco8zBR787eQuPhNsRScfuPQ6eS6TIJmMJOcmZA+Q="; + vendorHash = "sha256-j1rCcHt5E1aFwgnOKZZccaGPs5JfpBtN05edeSvId94="; npmDeps = fetchNpmDeps { inherit src; name = "${pname}-npm-deps"; - hash = "sha256-VP1wM0+ca17aQU4FJ9gSbT2Np/sxb8wZ4pCJ6FV1V7w="; + hash = "sha256-mdBQubfV5Bgk9NxsWokTS6zA4r3gggWVSwhrfKPUi5s="; }; composerRepository = php83.mkComposerRepository { diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index b84ec20440322..d3510ce802828 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -12,15 +12,15 @@ let pname = "firefly-iii"; - version = "6.1.19"; + version = "6.1.21"; phpPackage = php83; - npmDepsHash = "sha256-/oz0raI0/AV5NamvMWxlUdiQbVsSKHRplsw2/KrMOwg="; + npmDepsHash = "sha256-N4o7FKdya6bGakNKNq2QUV8HKRfuov5ahvbjR/rsimU="; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; rev = "v${version}"; - hash = "sha256-SIvYRmCCzQI+qUr5aA78NQLLmO+EPO1ZEL7vcqJ5puw="; + hash = "sha256-jadxzUhOb3G/DwJk8IV4IcwjmxgrrriVMVwj1cYFHEA="; }; in @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-qps/dWubCVqqvzgSizJJvx2MUzRZKiMeQCnWz08Ft+E="; + vendorHash = "sha256-d5WwrVOVG9ZRZEsG2iKcbp2fk27laHvcJPJUwY3YgDg="; npmDeps = fetchNpmDeps { inherit src; diff --git a/pkgs/by-name/fi/firefly/package.nix b/pkgs/by-name/fi/firefly/package.nix new file mode 100644 index 0000000000000..631627c3dd571 --- /dev/null +++ b/pkgs/by-name/fi/firefly/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "firefly"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "Brum3ns"; + repo = "firefly"; + rev = "refs/tags/v${version}"; + hash = "sha256-hhZw7u4NX+BvapUZv0k2Xu/UOdL7Pt8Idjat4aJzvIk="; + }; + + vendorHash = "sha256-eeVj0nU+cs1cZNVvwu4LgtQkpddtyYAYS91ANHyOjcY="; + + ldflags = [ + "-s" + "-w" + ]; + + preCheck = '' + # Test fails with invalid memory address or nil pointer dereference + substituteInPlace tests/httpfilter_test.go \ + --replace-fail "Test_HttpFilter" "Skip_HttpFilter" + ''; + + meta = { + description = "Black box fuzzer for web applications"; + homepage = "https://github.com/Brum3ns/firefly"; + # https://github.com/Brum3ns/firefly/issues/12 + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "firefly"; + }; +} diff --git a/pkgs/by-name/fi/firefoxpwa/Cargo.lock b/pkgs/by-name/fi/firefoxpwa/Cargo.lock index 66005e4280993..75237c9706b16 100644 --- a/pkgs/by-name/fi/firefoxpwa/Cargo.lock +++ b/pkgs/by-name/fi/firefoxpwa/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.25" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f90148830dac590fac7ccfe78ec4a8ea404c60f75a24e16407a71f0f40de775" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -33,6 +33,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "adler32" version = "1.2.0" @@ -86,47 +92,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -134,9 +141,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" [[package]] name = "arbitrary" @@ -157,21 +164,21 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-compression" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "brotli", "flate2", @@ -183,11 +190,17 @@ dependencies = [ "zstd-safe", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "av1-grain" @@ -214,25 +227,19 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.7.2", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -253,21 +260,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitstream-io" -version = "2.2.0" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", "arrayvec", @@ -278,9 +285,9 @@ dependencies = [ [[package]] name = "brotli" -version = "5.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -289,9 +296,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -299,9 +306,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" [[package]] name = "bumpalo" @@ -311,9 +318,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -329,9 +336,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "bzip2" @@ -356,13 +363,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.96" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -383,9 +390,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" @@ -397,14 +404,14 @@ dependencies = [ "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "clap" -version = "4.5.4" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -412,30 +419,30 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] name = "clap_complete" -version = "4.5.2" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" +checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck", "proc-macro2", @@ -445,9 +452,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "color_quant" @@ -457,30 +464,30 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "configparser" -version = "3.0.4" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec6d3da8e550377a85339063af6e3735f4b1d9392108da4e083a1b3b9820288" +checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b" [[package]] name = "const_format" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" dependencies = [ "proc-macro2", "quote", @@ -489,9 +496,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -505,15 +512,24 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "core_maths" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -539,9 +555,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -561,9 +577,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -571,23 +587,23 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", @@ -653,9 +669,9 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" @@ -674,9 +690,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -692,7 +708,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide 0.7.2", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -700,9 +716,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -726,14 +742,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -783,12 +799,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide 0.7.2", + "miniz_oxide 0.8.0", ] [[package]] @@ -814,18 +830,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ "roxmltree", ] [[package]] name = "fontdb" -version = "0.16.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb" dependencies = [ "fontconfig-parser", "log", @@ -927,9 +943,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -950,9 +966,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -962,17 +978,17 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http", - "indexmap 2.2.6", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -1032,9 +1048,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -1042,12 +1058,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http", "http-body", "pin-project-lite", @@ -1055,15 +1071,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", @@ -1079,6 +1095,23 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.6.0" @@ -1097,9 +1130,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -1126,7 +1159,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1166,12 +1199,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "exr", "gif", @@ -1189,19 +1222,19 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ "byteorder-lite", - "thiserror", + "quick-error 2.0.1", ] [[package]] name = "imagesize" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" +checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "imgref" @@ -1222,9 +1255,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1248,6 +1281,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.12.1" @@ -1265,9 +1304,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -1280,9 +1319,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1308,9 +1347,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lebe" @@ -1320,9 +1359,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libfuzzer-sys" @@ -1335,27 +1374,28 @@ dependencies = [ "once_cell", ] +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "libredox" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall", ] -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -1369,9 +1409,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "loop9" @@ -1389,14 +1429,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ "cfg-if", - "rayon", ] [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -1445,32 +1484,41 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -1506,11 +1554,10 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -1543,11 +1590,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -1555,23 +1601,13 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_threads" version = "0.1.7" @@ -1583,9 +1619,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -1598,11 +1634,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1630,18 +1666,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "300.3.2+3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1658,9 +1694,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "owned_ttf_parser" -version = "0.20.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ "ttf-parser", ] @@ -1693,9 +1729,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -1797,13 +1833,12 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", - "indexmap 2.2.6", - "line-wrap", + "base64", + "indexmap 2.5.0", "quick-xml", "serde", "time", @@ -1831,7 +1866,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.2", + "miniz_oxide 0.7.4", ] [[package]] @@ -1842,15 +1877,18 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1897,18 +1935,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1989,16 +2027,15 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.5" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" dependencies = [ "avif-serialize", "imgref", "loop9", "quick-error 2.0.1", "rav1e", - "rayon", "rgb", ] @@ -2024,18 +2061,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -2044,25 +2081,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -2073,18 +2110,18 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "async-compression", - "base64 0.22.1", + "base64", "bytes", "encoding_rs", "futures-channel", @@ -2095,6 +2132,7 @@ dependencies = [ "http-body", "http-body-util", "hyper", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -2120,84 +2158,125 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "windows-registry", ] [[package]] name = "resvg" -version = "0.41.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2327ced609dadeed3e9702fec3e6b2ddd208758a9268d13e06566c6101ba533" +checksum = "c7314563c59c7ce31c18e23ad3dd092c37b928a0fa4e1c0a1a6504351ab411d1" dependencies = [ "gif", - "jpeg-decoder", + "image-webp", "log", "pico-args", - "png 0.17.13", "rgb", "svgtypes", "tiny-skia", "usvg", + "zune-jpeg", ] [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + [[package]] name = "roxmltree" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", "windows-sys 0.52.0", ] +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64 0.22.1", + "base64", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] [[package]] name = "rustybuzz" -version = "0.13.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88117946aa1bfb53c2ae0643ceac6506337f44887f8c9fbfb43587b1cc52ba49" +checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", + "core_maths", + "log", "smallvec", "ttf-parser", "unicode-bidi-mirroring", @@ -2208,9 +2287,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "sanitize-filename" @@ -2224,11 +2303,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2239,11 +2318,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -2252,9 +2331,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -2262,18 +2341,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.199" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -2282,20 +2361,21 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2314,15 +2394,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ - "base64 0.22.1", + "base64", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -2332,9 +2412,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ "darling", "proc-macro2", @@ -2342,6 +2422,12 @@ dependencies = [ "syn", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "simd-adler32" version = "0.3.7" @@ -2452,12 +2538,6 @@ dependencies = [ "float-cmp", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -2487,11 +2567,17 @@ dependencies = [ "syn", ] +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "svgtypes" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca9a891c9c70da8139ac9d8e8ea36a210fa21bb50eccd75d4a9561c83e87f" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" dependencies = [ "kurbo", "siphasher 1.0.1", @@ -2499,9 +2585,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -2510,26 +2596,29 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -2550,9 +2639,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -2561,20 +2650,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2588,18 +2678,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -2678,9 +2768,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2693,18 +2783,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2717,11 +2806,22 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-socks" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" dependencies = [ "either", "futures-util", @@ -2731,23 +2831,22 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -2757,20 +2856,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.12" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", @@ -2790,20 +2889,19 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -2811,7 +2909,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-core", ] @@ -2833,15 +2930,18 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttf-parser" -version = "0.20.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +dependencies = [ + "core_maths", +] [[package]] name = "ulid" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" +checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289" dependencies = [ "getrandom", "rand", @@ -2857,15 +2957,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" +checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f" [[package]] name = "unicode-ccc" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" +checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42" [[package]] name = "unicode-ident" @@ -2884,9 +2984,9 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" [[package]] name = "unicode-script" @@ -2902,15 +3002,21 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -2926,11 +3032,11 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "usvg" -version = "0.41.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c704361d822337cfc00387672c7b59eaa72a1f0744f62b2a68aa228a0c6927d" +checksum = "6803057b5cbb426e9fb8ce2216f3a9b4ca1dd2c705ba3cbebc13006e437735fd" dependencies = [ - "base64 0.22.1", + "base64", "data-url", "flate2", "fontdb", @@ -2953,9 +3059,9 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "v_frame" @@ -2982,9 +3088,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "want" @@ -3003,19 +3109,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -3028,9 +3135,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -3040,9 +3147,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3050,9 +3157,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -3063,15 +3170,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -3127,11 +3234,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3142,12 +3249,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ - "windows-core", - "windows-targets 0.52.5", + "windows-core 0.58.0", + "windows-targets 0.52.6", ] [[package]] @@ -3156,7 +3263,72 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -3174,7 +3346,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -3194,18 +3375,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -3216,9 +3397,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3228,9 +3409,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3240,15 +3421,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -3258,9 +3439,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3270,9 +3451,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3282,9 +3463,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3294,15 +3475,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.7" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -3334,29 +3515,56 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + [[package]] name = "zstd" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.1.0" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", @@ -3379,9 +3587,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix index 25a9cccf58341..696c17ed26716 100644 --- a/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/pkgs/by-name/fi/firefoxpwa/package.nix @@ -28,13 +28,13 @@ rustPlatform.buildRustPackage rec { pname = "firefoxpwa"; - version = "2.12.1"; + version = "2.12.5"; src = fetchFromGitHub { owner = "filips123"; repo = "PWAsForFirefox"; rev = "v${version}"; - hash = "sha256-0Yyd0mJK/eDallg9ERimvZIRCOTeDkzeAVUfDeNP928="; + hash = "sha256-WAAZ35AkKzufhDm8RNTpSsGJjqCIm84THEOmXemvv2o="; }; sourceRoot = "${src.name}/native"; @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { libs = let libs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ cups ffmpeg libglvnd diff --git a/pkgs/by-name/fi/fireplace/package.nix b/pkgs/by-name/fi/fireplace/package.nix new file mode 100644 index 0000000000000..f7791438ec55a --- /dev/null +++ b/pkgs/by-name/fi/fireplace/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + ncurses, +}: +stdenv.mkDerivation { + pname = "fireplace"; + version = "0-unstable-2020-02-02"; + + buildInputs = [ ncurses ]; + + installPhase = '' + runHook preInstall + + install -Dm555 fireplace -t $out/bin + + runHook postInstall + ''; + + src = fetchFromGitHub { + owner = "Wyatt915"; + repo = "fireplace"; + rev = "aa2070b73be9fb177007fc967b066d88a37e3408"; + hash = "sha256-2NUE/zaFoGwkZxgvVCYXxToiL23aVUFwFNlQzEq9GEc="; + }; + + meta = { + description = "Cozy fireplace in your terminal"; + homepage = "https://github.com/Wyatt915/fireplace"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + multivac61 + ]; + mainProgram = "fireplace"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix new file mode 100644 index 0000000000000..e12db808ac2d0 --- /dev/null +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -0,0 +1,114 @@ +{ + fetchFromGitHub, + fetchPypi, + lib, + stdenv, + postgresql, + postgresqlTestHook, + python3, +}: +let + python = python3.override { + self = python; + packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy_1_4; + + flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "3.0.5"; + + src = fetchPypi { + pname = "flask_sqlalchemy"; + inherit version; + hash = "sha256-xXZeWMoUVAG1IQbA9GF4VpJDxdolVWviwjHsxghnxbE="; + }; + }); + }; + }; + +in +python.pkgs.buildPythonApplication rec { + pname = "fittrackee"; + version = "0.8.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "SamR1"; + repo = "FitTrackee"; + rev = "refs/tags/v${version}"; + hash = "sha256-raN6Ef/Z/JbdJDMKBIaBL8nmvFwvuZFX4rfC0ZgWgKI="; + }; + + build-system = [ + python.pkgs.poetry-core + ]; + + pythonRelaxDeps = [ + "authlib" + "flask-limiter" + "gunicorn" + "pyjwt" + "pyopenssl" + "pytz" + "sqlalchemy" + ]; + + dependencies = + with python.pkgs; + [ + authlib + babel + click + dramatiq + flask + flask-bcrypt + flask-dramatiq + flask-limiter + flask-migrate + flask-sqlalchemy + gpxpy + gunicorn + humanize + psycopg2-binary + pyjwt + pyopenssl + pytz + shortuuid + sqlalchemy + staticmap + ua-parser + ] + ++ dramatiq.optional-dependencies.redis + ++ flask-limiter.optional-dependencies.redis; + + pythonImportsCheck = [ "fittrackee" ]; + + nativeCheckInputs = with python.pkgs; [ + pytestCheckHook + freezegun + postgresqlTestHook + postgresql + time-machine + ]; + + pytestFlagsArray = [ + "fittrackee" + ]; + + postgresqlTestSetupPost = '' + export DATABASE_TEST_URL=postgresql://$PGUSER/$PGDATABASE?host=$PGHOST + ''; + + doCheck = !stdenv.hostPlatform.isDarwin; # tests are a bit flaky on darwin + + preCheck = '' + export TMP=$TMPDIR + ''; + + meta = { + description = "Self-hosted outdoor activity tracker"; + homepage = "https://github.com/SamR1/FitTrackee"; + changelog = "https://github.com/SamR1/FitTrackee/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ traxys ]; + }; +} diff --git a/pkgs/by-name/fi/five-or-more/package.nix b/pkgs/by-name/fi/five-or-more/package.nix index 7c66f4da4a61a..b78b26894c8bf 100644 --- a/pkgs/by-name/fi/five-or-more/package.nix +++ b/pkgs/by-name/fi/five-or-more/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/five-or-more-${version}.tar.xz"; - sha256 = "LRDXLu/esyS0R9YyrwwySW4l/BWjwB230vAMm1HQnvQ="; + hash = "sha256-LRDXLu/esyS0R9YyrwwySW4l/BWjwB230vAMm1HQnvQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fj/fjo/package.nix b/pkgs/by-name/fj/fjo/package.nix index d451f83426710..7671073cd3eeb 100644 --- a/pkgs/by-name/fj/fjo/package.nix +++ b/pkgs/by-name/fj/fjo/package.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.agpl3Only; mainProgram = "berg"; maintainers = with lib.maintainers; [ ehmry ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/fl/flac123/package.nix b/pkgs/by-name/fl/flac123/package.nix index 9837a48c426e0..6a2c4a442b0e1 100644 --- a/pkgs/by-name/fl/flac123/package.nix +++ b/pkgs/by-name/fl/flac123/package.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/flac123/flac123"; + changelog = "https://github.com/flac123/flac123/blob/${finalAttrs.src.rev}/NEWS"; description = "Command-line program for playing FLAC audio files"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ kiike ]; diff --git a/pkgs/by-name/fl/flaca/package.nix b/pkgs/by-name/fl/flaca/package.nix index bec47b7b302c2..6e5add17471a8 100644 --- a/pkgs/by-name/fl/flaca/package.nix +++ b/pkgs/by-name/fl/flaca/package.nix @@ -38,6 +38,7 @@ rustPlatform.buildRustPackage rec { description = "CLI tool to losslessly compress JPEG and PNG images"; longDescription = "A CLI tool for x86-64 Linux machines that simplifies the task of maximally, losslessly compressing JPEG and PNG images for use in production web environments"; homepage = "https://github.com/Blobfolio/flaca"; + changelog = "https://github.com/Blobfolio/flaca/releases/tag/v${version}"; maintainers = with maintainers; [ zzzsy ]; platforms = platforms.linux; license = licenses.wtfpl; diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index 5ccab79d97180..80512e1bf7d92 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-0iH5owyNfIpRz6nYwrJUoqd9lVGZ3T3K8rmsOk2UoGI="; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix new file mode 100644 index 0000000000000..cfe799a143e95 --- /dev/null +++ b/pkgs/by-name/fl/flake-edit/package.nix @@ -0,0 +1,57 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + installShellFiles, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "flake-edit"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "a-kenji"; + repo = "flake-edit"; + rev = "v${version}"; + hash = "sha256-dNTvAYBVZLeDlC1bsaonwojE7+1CD16/sCxtQVvT9WE="; + }; + + cargoHash = "sha256-ipLjbfnNqrUUD40awRnE8URX5pHhG4SwUM9JedoBM8Y="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + env.ASSET_DIR = "target/assets"; + + postInstall = '' + installManPage target/assets/flake-edit.1 + + installShellCompletion --bash --name flake-edit.bash target/assets/flake-edit.bash + installShellCompletion --fish --name flake-edit.fish target/assets/flake-edit.fish + installShellCompletion --zsh --name _flake-edit target/assets/_flake-edit + ''; + + meta = { + description = "Edit your flake inputs with ease"; + homepage = "https://github.com/a-kenji/flake-edit"; + changelog = "https://github.com/a-kenji/flake-edit/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ a-kenji ]; + mainProgram = "flake-edit"; + }; +} diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/by-name/fl/flam3/package.nix similarity index 100% rename from pkgs/tools/graphics/flam3/default.nix rename to pkgs/by-name/fl/flam3/package.nix diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index c9a5849b3b839..87cef92866877 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -1,25 +1,37 @@ -{ libsForQt5 -, stdenv -, lib -, fetchFromGitHub -, cmake -, nix-update-script -, fetchpatch -, grim -, makeBinaryWrapper -, enableWlrSupport ? false +{ + stdenv, + lib, + overrideSDK, + darwin, + fetchFromGitHub, + fetchpatch, + cmake, + imagemagick, + libicns, + libsForQt5, + grim, + makeBinaryWrapper, + nix-update-script, + enableWlrSupport ? false, + enableMonochromeIcon ? false, }: -stdenv.mkDerivation { +assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport); + +let + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in + +stdenv'.mkDerivation { pname = "flameshot"; # wlr screenshotting is currently only available on unstable version (>12.1.0) - version = "12.1.0-unstable-2024-08-02"; + version = "12.1.0-unstable-2024-09-01"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; - rev = "fd3772e2abb0b852573fcaa549ba13517f13555c"; - hash = "sha256-WXUxrirlevqJ+dnXZbN1C1l5ibuSI/DBi5fqPx9nOGQ="; + rev = "14a136777cd82ab70f42c13b4bc9418c756d91d2"; + hash = "sha256-xM99adstwfOOaeecKyWQU3yY0p65pQyFgoz7WJNra98="; }; patches = [ @@ -32,43 +44,92 @@ stdenv.mkDerivation { }) ]; - passthru = { - updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; - }; + cmakeFlags = + [ + (lib.cmakeBool "DISABLE_UPDATE_CHECKER" true) + (lib.cmakeBool "USE_MONOCHROME_ICON" enableMonochromeIcon) + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + (lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true) + (lib.cmakeBool "USE_WAYLAND_GRIM" enableWlrSupport) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeFeature "Qt5_DIR" "${libsForQt5.qtbase.dev}/lib/cmake/Qt5") + ]; - cmakeFlags = [ - (lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true) - (lib.cmakeBool "USE_WAYLAND_GRIM" enableWlrSupport) - ]; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - libsForQt5.qtsvg - libsForQt5.wrapQtAppsHook - makeBinaryWrapper - ]; + nativeBuildInputs = + [ + cmake + libsForQt5.qttools + libsForQt5.qtsvg + libsForQt5.wrapQtAppsHook + makeBinaryWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + imagemagick + libicns + ]; buildInputs = [ libsForQt5.qtbase libsForQt5.kguiaddons ]; - dontWrapQtApps = true; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Fix icns generation running concurrently with png generation + sed -E -i '/"iconutil -o/i\ + )\ + execute_process(\ + ' src/CMakeLists.txt + + # Replace unavailable commands + sed -E -i \ + -e 's/"sips -z ([0-9]+) ([0-9]+) +(.+) --out /"magick \3 -resize \1x\2\! /' \ + -e 's/"iconutil -o (.+) -c icns (.+)"/"png2icns \1 \2\/*{16,32,128,256,512}.png"/' \ + src/CMakeLists.txt + ''; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/Applications + mv $out/bin/flameshot.app $out/Applications + + ln -s $out/Applications/flameshot.app/Contents/MacOS/flameshot $out/bin/flameshot - postFixup = '' - wrapProgram $out/bin/flameshot \ - ${lib.optionalString enableWlrSupport "--prefix PATH : ${lib.makeBinPath [ grim ]}"} \ - ''${qtWrapperArgs[@]} + rm -r $out/share/applications + rm -r $out/share/dbus* + rm -r $out/share/icons + rm -r $out/share/metainfo ''; + dontWrapQtApps = true; + + postFixup = + let + binary = + if stdenv.hostPlatform.isDarwin then + "Applications/flameshot.app/Contents/MacOS/flameshot" + else + "bin/flameshot"; + in + '' + wrapProgram $out/${binary} \ + ${lib.optionalString enableWlrSupport "--prefix PATH : ${lib.makeBinPath [ grim ]}"} \ + ''${qtWrapperArgs[@]} + ''; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + }; + meta = with lib; { description = "Powerful yet simple to use screenshot software"; homepage = "https://github.com/flameshot-org/flameshot"; + changelog = "https://github.com/flameshot-org/flameshot/releases"; mainProgram = "flameshot"; - maintainers = with maintainers; [ scode oxalica ]; + maintainers = with maintainers; [ + scode + oxalica + ]; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix index 316f24cdf2061..8acf4040b44cf 100644 --- a/pkgs/by-name/fl/flarectl/package.nix +++ b/pkgs/by-name/fl/flarectl/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "flarectl"; - version = "0.103.0"; + version = "0.105.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-mYdZgHJz2Ajrk/JRbaDeghm39PWidnAIZvjJTvl8lpM="; + hash = "sha256-xUITOBXBy5Jt0DFRNffX7sRhAtgUPMEJOHa2SbjM1n0="; }; - vendorHash = "sha256-R3By8/cR4pZQgUSyNGDnnvWwcpZqraqk5GRZ8Om9JOU="; + vendorHash = "sha256-KMCwbbDpj4QAgvKLlOPDKSlrDyf+K/tGTMM/GBlvyuc="; subPackages = [ "cmd/flarectl" ]; diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix index 07e02231997c3..ef1bb7f224aef 100644 --- a/pkgs/by-name/fl/flaresolverr/package.nix +++ b/pkgs/by-name/fl/flaresolverr/package.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Proxy server to bypass Cloudflare protection"; homepage = "https://github.com/FlareSolverr/FlareSolverr"; + changelog = "https://github.com/FlareSolverr/FlareSolverr/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.mit; mainProgram = "flaresolverr"; maintainers = with maintainers; [ paveloom ]; diff --git a/pkgs/by-name/fl/flashgbx/package.nix b/pkgs/by-name/fl/flashgbx/package.nix index d6cd2eac6075e..07af37b5dce27 100644 --- a/pkgs/by-name/fl/flashgbx/package.nix +++ b/pkgs/by-name/fl/flashgbx/package.nix @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { requests setuptools qt6.qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix index 35bc3f18ca56d..d282c2f024837 100644 --- a/pkgs/by-name/fl/flashmq/package.nix +++ b/pkgs/by-name/fl/flashmq/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-HcpNPkG1gd5Gb5z//DrU8Rxf+dZWKMwHtj62k4N1S3U="; + hash = "sha256-T9ecw+UHe/DM8TSDda140lxG3oaf/wf+TEySOz6tboA="; }; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index 746ab572bb325..b70a559ac6454 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -9,7 +9,7 @@ , pkg-config , stdenv , withJlink ? true -, withGpio ? stdenv.isLinux +, withGpio ? stdenv.hostPlatform.isLinux }: stdenv.mkDerivation (finalAttrs: { @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libftdi1 libusb1 - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pciutils ] ++ lib.optionals (withJlink) [ libjaylink @@ -46,17 +46,17 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=$(out)" "CONFIG_JLINK_SPI=${yesNo withJlink}" "CONFIG_LINUX_GPIO_SPI=${yesNo withGpio}" - "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=${yesNo (!stdenv.isDarwin)}" - "CONFIG_INTERNAL_X86=${yesNo (!(stdenv.isDarwin) && stdenv.isx86_64)}" - "CONFIG_INTERNAL_DMI=${yesNo (!(stdenv.isDarwin) && stdenv.isx86_64)}" - "CONFIG_RAYER_SPI=${yesNo (!(stdenv.isDarwin) && stdenv.isx86_64)}" + "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=${yesNo (!stdenv.hostPlatform.isDarwin)}" + "CONFIG_INTERNAL_X86=${yesNo (!(stdenv.hostPlatform.isDarwin) && stdenv.hostPlatform.isx86_64)}" + "CONFIG_INTERNAL_DMI=${yesNo (!(stdenv.hostPlatform.isDarwin) && stdenv.hostPlatform.isx86_64)}" + "CONFIG_RAYER_SPI=${yesNo (!(stdenv.hostPlatform.isDarwin) && stdenv.hostPlatform.isx86_64)}" ]; meta = with lib; { homepage = "https://flashprog.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ felixsinger ]; + maintainers = with maintainers; [ felixsinger funkeleinhorn ]; platforms = platforms.all; mainProgram = "flashprog"; }; diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 6e98f54facc15..231b682cc2cbb 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, runCommand, appstream, autoreconfHook, @@ -120,6 +121,22 @@ stdenv.mkDerivation (finalAttrs: { # Try mounting fonts and icons from NixOS locations if FHS locations don't exist. # https://github.com/NixOS/nixpkgs/issues/119433 ./fix-fonts-icons.patch + + # TODO: Remove when updating to 1.16 + # Ensure flatpak uses the system's zoneinfo from $TZDIR + # https://github.com/NixOS/nixpkgs/issues/238386 + (fetchpatch { + url = "https://github.com/flatpak/flatpak/pull/5850/commits/a8a35bf4d9fc3d76e1a5049a6a591faec04a42fd.patch"; + hash = "sha256-JqkPbnzgZNZq/mplZqohhHFdjRrvYFjE4C02pI3feBo="; + }) + (fetchpatch { + url = "https://github.com/flatpak/flatpak/pull/5850/commits/5ea13b09612215559081c27b60df4fb720cb08d5.patch"; + hash = "sha256-BWbyQ2en3RtN4Ec5n62CULAhvywlQLhcl3Fmd4fsR1s="; + }) + (fetchpatch { + url = "https://github.com/flatpak/flatpak/pull/5850/commits/7c8a81f08908019bbf69358de199748a9bcb29e3.patch"; + hash = "sha256-RiG2jPmG+Igskxv8oQquOUYsG4srgdMXWe34ojMXslo="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/fl/flatpak/unset-env-vars.patch b/pkgs/by-name/fl/flatpak/unset-env-vars.patch index 0235022bbf567..ac0b95f188496 100644 --- a/pkgs/by-name/fl/flatpak/unset-env-vars.patch +++ b/pkgs/by-name/fl/flatpak/unset-env-vars.patch @@ -1,12 +1,12 @@ -diff --git a/common/flatpak-run.c b/common/flatpak-run.c index e3f031d4..ed131c0b 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -571,6 +571,7 @@ static const ExportData default_exports[] = { +@@ -571,6 +571,8 @@ static const ExportData default_exports[] = { {"XKB_CONFIG_ROOT", NULL}, {"GIO_EXTRA_MODULES", NULL}, {"GDK_BACKEND", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, ++ {"TZDIR", NULL}, {"VK_ADD_DRIVER_FILES", NULL}, {"VK_ADD_LAYER_PATH", NULL}, {"VK_DRIVER_FILES", NULL}, diff --git a/pkgs/by-name/fl/flatter/package.nix b/pkgs/by-name/fl/flatter/package.nix index bd8d5605edaad..5ef1b6a01444a 100644 --- a/pkgs/by-name/fl/flatter/package.nix +++ b/pkgs/by-name/fl/flatter/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { mpfr fplll eigen - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; diff --git a/pkgs/by-name/fl/flawz/package.nix b/pkgs/by-name/fl/flawz/package.nix index d149b41086241..fb40c65dc2180 100644 --- a/pkgs/by-name/fl/flawz/package.nix +++ b/pkgs/by-name/fl/flawz/package.nix @@ -52,6 +52,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "flawz"; maintainers = with lib.maintainers; [ anas ]; platforms = with lib.platforms; unix ++ windows; - broken = stdenv.isDarwin; # needing some apple_sdk packages + broken = stdenv.hostPlatform.isDarwin; # needing some apple_sdk packages }; } diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix index 15b3c083fb334..01a94176bcde0 100644 --- a/pkgs/by-name/fl/flet-client-flutter/package.nix +++ b/pkgs/by-name/fl/flet-client-flutter/package.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , pkg-config -, flutter319 +, flutter , gst_all_1 , libunwind , makeWrapper @@ -16,15 +16,15 @@ , flet-client-flutter }: -flutter319.buildFlutterApplication rec { +flutter.buildFlutterApplication rec { pname = "flet-client-flutter"; - version = "0.22.1"; + version = "0.24.1"; src = fetchFromGitHub { owner = "flet-dev"; repo = "flet"; rev = "v${version}"; - hash = "sha256-mjqPIm4LspW1LB4H08FVwEN0JOwTPTLaUxOjZ3n6u8A="; + hash = "sha256-cT1cWxMVpZ0fXoIaJpW96ifQKNe7+PLUXjIFJ3ALdyo="; }; sourceRoot = "${src.name}/client"; diff --git a/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json b/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json index 9fbdb49633bed..299bfddde3feb 100644 --- a/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json +++ b/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json @@ -4,21 +4,21 @@ "dependency": "transitive", "description": { "name": "archive", - "sha256": "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.10" + "version": "3.6.1" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.5.0" }, "async": { "dependency": "transitive", @@ -160,25 +160,15 @@ "source": "hosted", "version": "1.18.0" }, - "convert": { - "dependency": "transitive", - "description": { - "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" - }, "cross_file": { "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.4+1" + "version": "0.3.4+2" }, "crypto": { "dependency": "transitive", @@ -194,11 +184,21 @@ "dependency": "direct main", "description": { "name": "cupertino_icons", - "sha256": "d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "dart_earcut": { + "dependency": "transitive", + "description": { + "name": "dart_earcut", + "sha256": "41b493147e30a051efb2da1e3acb7f38fe0db60afba24ac1ea5684cee272721e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.6" + "version": "1.1.0" }, "dbus": { "dependency": "transitive", @@ -254,11 +254,11 @@ "dependency": "transitive", "description": { "name": "file_picker", - "sha256": "29c90806ac5f5fb896547720b73b17ee9aed9bba540dc5d91fe29f8c5745b10a", + "sha256": "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.3" + "version": "8.1.2" }, "fixnum": { "dependency": "transitive", @@ -274,11 +274,11 @@ "dependency": "transitive", "description": { "name": "fl_chart", - "sha256": "5a74434cc83bf64346efb562f1a06eefaf1bcb530dc3d96a104f631a1eff8d79", + "sha256": "d0f0d49112f2f4b192481c16d05b6418bd7820e021e265a3c22db98acf7ed7fb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.65.0" + "version": "0.68.0" }, "flet": { "dependency": "direct main", @@ -287,7 +287,7 @@ "relative": true }, "source": "path", - "version": "0.22.1" + "version": "0.24.1" }, "flet_audio": { "dependency": "direct main", @@ -296,7 +296,7 @@ "relative": true }, "source": "path", - "version": "0.22.1" + "version": "0.24.1" }, "flet_audio_recorder": { "dependency": "direct main", @@ -305,7 +305,25 @@ "relative": true }, "source": "path", - "version": "0.22.1" + "version": "0.24.1" + }, + "flet_flashlight": { + "dependency": "direct main", + "description": { + "path": "../packages/flet_flashlight", + "relative": true + }, + "source": "path", + "version": "0.24.1" + }, + "flet_geolocator": { + "dependency": "direct main", + "description": { + "path": "../packages/flet_geolocator", + "relative": true + }, + "source": "path", + "version": "0.24.1" }, "flet_lottie": { "dependency": "direct main", @@ -314,7 +332,25 @@ "relative": true }, "source": "path", - "version": "0.22.1" + "version": "0.24.1" + }, + "flet_map": { + "dependency": "direct main", + "description": { + "path": "../packages/flet_map", + "relative": true + }, + "source": "path", + "version": "0.24.1" + }, + "flet_permission_handler": { + "dependency": "direct main", + "description": { + "path": "../packages/flet_permission_handler", + "relative": true + }, + "source": "path", + "version": "0.24.1" }, "flet_rive": { "dependency": "direct main", @@ -323,7 +359,7 @@ "relative": true }, "source": "path", - "version": "0.22.1" + "version": "0.24.1" }, "flet_video": { "dependency": "direct main", @@ -332,7 +368,7 @@ "relative": true }, "source": "path", - "version": "0.22.1" + "version": "0.24.1" }, "flet_webview": { "dependency": "direct main", @@ -341,7 +377,7 @@ "relative": true }, "source": "path", - "version": "0.22.1" + "version": "0.24.1" }, "flutter": { "dependency": "direct main", @@ -391,25 +427,35 @@ "source": "sdk", "version": "0.0.0" }, + "flutter_map": { + "dependency": "transitive", + "description": { + "name": "flutter_map", + "sha256": "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.2" + }, "flutter_markdown": { "dependency": "transitive", "description": { "name": "flutter_markdown", - "sha256": "21b085a1c185e46701373866144ced56cfb7a0c33f63c916bb8fe2d0c1491278", + "sha256": "2e8a801b1ded5ea001a4529c97b1f213dcb11c6b20668e081cafb23468593514", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.19" + "version": "0.7.3" }, "flutter_plugin_android_lifecycle": { "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da", + "sha256": "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.17" + "version": "2.0.21" }, "flutter_redux": { "dependency": "transitive", @@ -425,11 +471,11 @@ "dependency": "transitive", "description": { "name": "flutter_svg", - "sha256": "d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c", + "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.9" + "version": "2.0.10+1" }, "flutter_test": { "dependency": "direct dev", @@ -449,15 +495,75 @@ "source": "sdk", "version": "0.0.0" }, + "geolocator": { + "dependency": "transitive", + "description": { + "name": "geolocator", + "sha256": "0ec58b731776bc43097fcf751f79681b6a8f6d3bc737c94779fe9f1ad73c1a81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "13.0.1" + }, + "geolocator_android": { + "dependency": "transitive", + "description": { + "name": "geolocator_android", + "sha256": "7aefc530db47d90d0580b552df3242440a10fe60814496a979aa67aa98b1fd47", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.6.1" + }, + "geolocator_apple": { + "dependency": "transitive", + "description": { + "name": "geolocator_apple", + "sha256": "bc2aca02423ad429cb0556121f56e60360a2b7d694c8570301d06ea0c00732fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.7" + }, + "geolocator_platform_interface": { + "dependency": "transitive", + "description": { + "name": "geolocator_platform_interface", + "sha256": "386ce3d9cce47838355000070b1d0b13efb5bc430f8ecda7e9238c8409ace012", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.4" + }, + "geolocator_web": { + "dependency": "transitive", + "description": { + "name": "geolocator_web", + "sha256": "2ed69328e05cd94e7eb48bb0535f5fc0c0c44d1c4fa1e9737267484d05c29b5e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "geolocator_windows": { + "dependency": "transitive", + "description": { + "name": "geolocator_windows", + "sha256": "53da08937d07c24b0d9952eb57a3b474e29aae2abf9dd717f7e1230995f13f0e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.3" + }, "graphs": { "dependency": "transitive", "description": { "name": "graphs", - "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "highlight": { "dependency": "transitive", @@ -473,11 +579,11 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "http_parser": { "dependency": "transitive", @@ -493,11 +599,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e", + "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.7" + "version": "4.2.0" }, "integration_test": { "dependency": "direct main", @@ -509,11 +615,11 @@ "dependency": "transitive", "description": { "name": "intl", - "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.18.1" + "version": "0.19.0" }, "js": { "dependency": "transitive", @@ -529,41 +635,51 @@ "dependency": "transitive", "description": { "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "latlong2": { + "dependency": "transitive", + "description": { + "name": "latlong2", + "sha256": "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.8.1" + "version": "0.9.1" }, "leak_tracker": { "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.0" + "version": "10.0.5" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.5" }, "leak_tracker_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_testing", - "sha256": "a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.1" }, "lints": { "dependency": "transitive", @@ -575,6 +691,26 @@ "source": "hosted", "version": "1.0.1" }, + "lists": { + "dependency": "transitive", + "description": { + "name": "lists", + "sha256": "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "logger": { + "dependency": "transitive", + "description": { + "name": "logger", + "sha256": "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, "logging": { "dependency": "transitive", "description": { @@ -589,21 +725,21 @@ "dependency": "transitive", "description": { "name": "lottie", - "sha256": "1f0ce68112072d66ea271a9841994fa8d16442e23d8cf8996c9fa74174e58b4e", + "sha256": "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "3.1.2" }, "markdown": { "dependency": "transitive", "description": { "name": "markdown", - "sha256": "1b134d9f8ff2da15cb298efe6cd8b7d2a78958c1b00384ebcbdf13fe340a6c90", + "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.1" + "version": "7.2.2" }, "matcher": { "dependency": "transitive", @@ -619,11 +755,11 @@ "dependency": "transitive", "description": { "name": "material_color_utilities", - "sha256": "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.0" + "version": "0.11.1" }, "media_kit": { "dependency": "transitive", @@ -719,31 +855,41 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.0" + "version": "1.15.0" + }, + "mgrs_dart": { + "dependency": "transitive", + "description": { + "name": "mgrs_dart", + "sha256": "fb89ae62f05fa0bb90f70c31fc870bcbcfd516c843fb554452ab3396f78586f7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" }, "package_info_plus": { "dependency": "transitive", "description": { "name": "package_info_plus", - "sha256": "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017", + "sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "8.0.2" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6", + "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.1" }, "path": { "dependency": "transitive", @@ -769,31 +915,31 @@ "dependency": "transitive", "description": { "name": "path_provider", - "sha256": "b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b", + "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "path_provider_android": { "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668", + "sha256": "490539678396d4c3c0b06efdaab75ae60675c3e0c66f72bc04c2e2c1e0e2abeb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.2.9" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.4.0" }, "path_provider_linux": { "dependency": "transitive", @@ -819,11 +965,71 @@ "dependency": "transitive", "description": { "name": "path_provider_windows", - "sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.3.0" + }, + "permission_handler": { + "dependency": "transitive", + "description": { + "name": "permission_handler", + "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.3.1" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "eaf2a1ec4472775451e88ca6a7b86559ef2f1d1ed903942ed135e38ea0097dca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.8" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.5" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3+2" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.2" + }, + "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", @@ -839,11 +1045,11 @@ "dependency": "transitive", "description": { "name": "platform", - "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.4" + "version": "3.1.5" }, "plugin_platform_interface": { "dependency": "transitive", @@ -855,15 +1061,15 @@ "source": "hosted", "version": "2.1.8" }, - "pointycastle": { + "polylabel": { "dependency": "transitive", "description": { - "name": "pointycastle", - "sha256": "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29", + "name": "polylabel", + "sha256": "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.7.4" + "version": "1.0.1" }, "process": { "dependency": "transitive", @@ -875,75 +1081,85 @@ "source": "hosted", "version": "5.0.2" }, + "proj4dart": { + "dependency": "transitive", + "description": { + "name": "proj4dart", + "sha256": "c8a659ac9b6864aa47c171e78d41bbe6f5e1d7bd790a5814249e6b68bc44324e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, "record": { "dependency": "transitive", "description": { "name": "record", - "sha256": "5c8e12c692a4800b33f5f8b6c821ea083b12bfdbd031b36ba9322c40a4eeecc9", + "sha256": "4a5cf4d083d1ee49e0878823c4397d073f8eb0a775f31215d388e2bc47a9e867", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.4" + "version": "5.1.2" }, "record_android": { "dependency": "transitive", "description": { "name": "record_android", - "sha256": "805ecaa232a671aff2ee9ec4730ef6addb97c548d2db6b1fbd5197f1d4f47a5a", + "sha256": "9ccf6a206dc72b486cf37893690e70c17610e8f05dba8da1a808e73dc2f49a04", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.2.4" }, "record_darwin": { "dependency": "transitive", "description": { "name": "record_darwin", - "sha256": "ee8cb1bb1712d7ce38140ecabe70e5c286c02f05296d66043bee865ace7eb1b9", + "sha256": "b038c26d1066eb81f4e7433bfb85f0d450ca3fac0002a7216b83a21b775ecf21", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.1.1" }, "record_linux": { "dependency": "transitive", "description": { "name": "record_linux", - "sha256": "7d0e70cd51635128fe9d37d89bafd6011d7cbba9af8dc323079ae60f23546aef", + "sha256": "74d41a9ebb1eb498a38e9a813dd524e8f0b4fdd627270bda9756f437b110a3e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.2" }, "record_platform_interface": { "dependency": "transitive", "description": { "name": "record_platform_interface", - "sha256": "3a4b56e94ecd2a0b2b43eb1fa6f94c5b8484334f5d38ef43959c4bf97fb374cf", + "sha256": "11f8b03ea8a0e279b0e306571dbe0db0202c0b8e866495c9fa1ad2281d5e4c15", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.2" + "version": "1.1.0" }, "record_web": { "dependency": "transitive", "description": { "name": "record_web", - "sha256": "24847cdbcf999f7a5762170792f622ac844858766becd0f2370ec8ae22f7526e", + "sha256": "656b7a865f90651fab997c2a563364f5fd60a0b527d5dadbb915d62d84fc3867", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "1.1.3" }, "record_windows": { "dependency": "transitive", "description": { "name": "record_windows", - "sha256": "39998b3ea7d8d28b04159d82220e6e5e32a7c357c6fb2794f5736beea272f6c3", + "sha256": "e653555aa3fda168aded7c34e11bd82baf0c6ac84e7624553def3c77ffefd36f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.2" + "version": "1.0.3" }, "redux": { "dependency": "transitive", @@ -1079,71 +1295,71 @@ "dependency": "transitive", "description": { "name": "shared_preferences", - "sha256": "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02", + "sha256": "c272f9cabca5a81adc9b0894381e9c1def363e980f960fa903c604c471b22f68", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.3.1" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06", + "sha256": "041be4d9d2dc6079cf342bc8b761b03787e3b71192d658220a56cac9c04a0294", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.3.0" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c", + "sha256": "671e7a931f55a08aa45be2a13fe7247f2a41237897df434b30d2012388191833", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.5" + "version": "2.5.0" }, "shared_preferences_linux": { "dependency": "transitive", "description": { "name": "shared_preferences_linux", - "sha256": "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa", + "sha256": "2ba0510d3017f91655b7543e9ee46d48619de2a2af38e5c790423f7007c7ccc1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.4.0" }, "shared_preferences_platform_interface": { "dependency": "transitive", "description": { "name": "shared_preferences_platform_interface", - "sha256": "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.4.1" }, "shared_preferences_web": { "dependency": "transitive", "description": { "name": "shared_preferences_web", - "sha256": "d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf", + "sha256": "59dc807b94d29d52ddbb1b3c0d3b9d0a67fc535a64e62a5542c8db0513fcb6c2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.4.1" }, "shared_preferences_windows": { "dependency": "transitive", "description": { "name": "shared_preferences_windows", - "sha256": "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59", + "sha256": "398084b47b7f92110683cac45c6dc4aae853db47e470e5ddcd52cab7f7196ab2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.4.0" }, "sky_engine": { "dependency": "transitive", @@ -1235,11 +1451,21 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "torch_light": { + "dependency": "transitive", + "description": { + "name": "torch_light", + "sha256": "a1397443a375c6991151547cb77361085df6cf8aa59999292e683db7385a0d15", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.1" + "version": "1.1.0" }, "typed_data": { "dependency": "transitive", @@ -1251,15 +1477,25 @@ "source": "hosted", "version": "1.3.2" }, + "unicode": { + "dependency": "transitive", + "description": { + "name": "unicode", + "sha256": "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, "universal_platform": { "dependency": "transitive", "description": { "name": "universal_platform", - "sha256": "d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc", + "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0+1" + "version": "1.1.0" }, "uri_parser": { "dependency": "transitive", @@ -1275,51 +1511,51 @@ "dependency": "transitive", "description": { "name": "url_launcher", - "sha256": "c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c", + "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.4" + "version": "6.3.0" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745", + "sha256": "94d8ad05f44c6d4e2ffe5567ab4d741b82d62e3c8e288cc1fcea45965edf47c9", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.0" + "version": "6.3.8" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03", + "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.4" + "version": "6.3.1" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811", + "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.2.0" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234", + "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.2.0" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -1335,21 +1571,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.3.3" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7", + "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "url_strategy": { "dependency": "direct main", @@ -1365,41 +1601,41 @@ "dependency": "transitive", "description": { "name": "uuid", - "sha256": "cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8", + "sha256": "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.3" + "version": "4.4.2" }, "vector_graphics": { "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "4ac59808bbfca6da38c99f415ff2d3a5d7ca0a6b4809c71d9cf30fba5daf9752", + "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.10+1" + "version": "1.1.11+1" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "f3247e7ab0ec77dc759263e68394990edc608fb2b480b80db8aa86ed09279e33", + "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.10+1" + "version": "1.1.11+1" }, "vector_graphics_compiler": { "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "18489bdd8850de3dd7ca8a34e0c446f719ec63e2bab2e7a8cc66a9028dd76c5a", + "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.10+1" + "version": "1.1.11+1" }, "vector_math": { "dependency": "transitive", @@ -1415,11 +1651,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", "url": "https://pub.dev" }, "source": "hosted", - "version": "13.0.0" + "version": "14.2.5" }, "volume_controller": { "dependency": "transitive", @@ -1435,41 +1671,41 @@ "dependency": "transitive", "description": { "name": "wakelock_plus", - "sha256": "f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d", + "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" + "version": "1.2.8" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385", + "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.2.1" }, "web": { "dependency": "transitive", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "1.0.0" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2", + "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "2.4.0" }, "webdriver": { "dependency": "transitive", @@ -1485,21 +1721,21 @@ "dependency": "transitive", "description": { "name": "webview_flutter", - "sha256": "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932", + "sha256": "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.7.0" + "version": "4.8.0" }, "webview_flutter_android": { "dependency": "transitive", "description": { "name": "webview_flutter_android", - "sha256": "3e5f4e9d818086b0d01a66fb1ff9cc72ab0cc58c71980e3d3661c5685ea0efb0", + "sha256": "c66651fba15f9d7ddd31daec42da8d6bce46c85610a7127e3ebcb39a4395c3c9", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.15.0" + "version": "3.16.6" }, "webview_flutter_platform_interface": { "dependency": "transitive", @@ -1515,31 +1751,31 @@ "dependency": "transitive", "description": { "name": "webview_flutter_wkwebview", - "sha256": "9bf168bccdf179ce90450b5f37e36fe263f591c9338828d6bf09b6f8d0f57f86", + "sha256": "9c62cc46fa4f2d41e10ab81014c1de470a6c6f26051a2de32111b2ee55287feb", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.12.0" + "version": "3.14.0" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8", + "sha256": "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.2.0" + "version": "5.5.3" }, "window_manager": { "dependency": "transitive", "description": { "name": "window_manager", - "sha256": "b3c895bdf936c77b83c5254bec2e6b3f066710c1f89c38b20b8acc382b525494", + "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.8" + "version": "0.3.9" }, "window_to_front": { "dependency": "transitive", @@ -1551,6 +1787,16 @@ "source": "hosted", "version": "0.0.3" }, + "wkt_parser": { + "dependency": "transitive", + "description": { + "name": "wkt_parser", + "sha256": "8a555fc60de3116c00aad67891bcab20f81a958e4219cc106e3c037aa3937f13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, "xdg_directories": { "dependency": "transitive", "description": { @@ -1583,7 +1829,7 @@ } }, "sdks": { - "dart": ">=3.3.0 <4.0.0", - "flutter": ">=3.16.6" + "dart": ">=3.4.0 <4.0.0", + "flutter": ">=3.22.0" } } diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index 79203498ec6ec..343fef81b3853 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.43"; + version = "3.11.46"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -13,21 +13,17 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-KX7Bvu4rt+Q7x2XkBiZMngAgqRKYu90EVi2oQ21o5AI="; + hash = "sha256-zaysfvfsuA4XTj46vN1FHggqEaL8rfHL0UJVILhrwjg="; }; - postPatch = '' - # remove dependency constraints but keep environment constraints - sed 's/[~<>=][^;]*//' -i requirements.txt - ''; + # relax dep constrains, keep environment constraints + pythonRelaxDeps = true; - build-system = with python3.pkgs; [ - setuptools - wheel - ]; + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ # See https://github.com/Flexget/Flexget/blob/master/pyproject.toml + # and https://github.com/Flexget/Flexget/blob/develop/requirements.txt apscheduler beautifulsoup4 colorama @@ -48,6 +44,7 @@ python3.pkgs.buildPythonApplication rec { rich rpyc sqlalchemy + zstandard # WebUI requirements cherrypy diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix index b4ba056ee3b44..f652cb11ccac2 100644 --- a/pkgs/by-name/fl/flip-link/package.nix +++ b/pkgs/by-name/fl/flip-link/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-x3JnqztoLol5dNMact/qMveQuvcMTg/jqHxW0lksB7Y="; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; checkFlags = [ # requires embedded toolchains diff --git a/pkgs/by-name/fl/flite/package.nix b/pkgs/by-name/fl/flite/package.nix index 1edb95c2d4b80..514ded67728a7 100644 --- a/pkgs/by-name/fl/flite/package.nix +++ b/pkgs/by-name/fl/flite/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - buildInputs = lib.optional stdenv.isLinux ( + buildInputs = lib.optional stdenv.hostPlatform.isLinux ( { alsa = alsa-lib; pulseaudio = libpulseaudio; @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--enable-shared" - ] ++ lib.optionals stdenv.isLinux [ "--with-audio=${audioBackend}" ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-audio=${audioBackend}" ]; # main/Makefile creates and removes 'flite_voice_list.c' from multiple targets: # make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 55a0017e69f2a..6d0aff14b5317 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -14,17 +14,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.1.6"; + version = "3.1.9"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-l33DDS7rk/uLCGTU5WTGvQH0JUEarKo3cxMrXn5eefc="; + hash = "sha256-SIBdiKgg444sZ8RUQscnOg8XzuAZcLvU4++0HY0G/ss="; }; # optional only to avoid linux rebuild - patches = lib.optionals stdenv.isDarwin [ ./macos-11-sdk-compat.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./macos-11-sdk-compat.patch ]; nativeBuildInputs = [ cmake @@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { libyaml postgresql ] - ++ lib.optionals stdenv.isLinux [ systemd ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.IOKit darwin.apple_sdk_11_0.frameworks.Foundation ]; @@ -49,11 +49,11 @@ stdenv.mkDerivation (finalAttrs: { "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" "-DFLB_OUT_PGSQL=ON" - ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; env.NIX_CFLAGS_COMPILE = toString ( # Used by the embedded luajit, but is not predefined on older mac SDKs. - lib.optionals stdenv.isDarwin [ "-DTARGET_OS_IPHONE=0" ] + lib.optionals stdenv.hostPlatform.isDarwin [ "-DTARGET_OS_IPHONE=0" ] # Assumes GNU version of strerror_r, and the posix version has an # incompatible return type. ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ "-Wno-int-conversion" ] diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/by-name/fl/fluxbox/package.nix similarity index 100% rename from pkgs/applications/window-managers/fluxbox/default.nix rename to pkgs/by-name/fl/fluxbox/package.nix diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index 782fcb50bf743..a1b520e5fe844 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -9,7 +9,7 @@ let version = "2.3.0"; - sha256 = "sha256-ZQs1rWI31qDo/BgjrmiNnEdR2OL8bUHVz+j5VceEp2k="; + hash = "sha256-ZQs1rWI31qDo/BgjrmiNnEdR2OL8bUHVz+j5VceEp2k="; manifestsSha256 = "sha256-PdhR+UDquIJWtpSymtT6V7qO5fVJOkFz6RGzAx7xeb4="; manifests = fetchzip { @@ -27,7 +27,7 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - hash = sha256; + inherit hash; }; vendorHash = "sha256-0YH3pgFrsnh5jIsZpj/sIgfiOCTtIlPltMS5mdGz1eM="; diff --git a/pkgs/by-name/fl/flye/package.nix b/pkgs/by-name/fl/flye/package.nix index 41e098609597a..95899f6a3e6e9 100644 --- a/pkgs/by-name/fl/flye/package.nix +++ b/pkgs/by-name/fl/flye/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication rec { pname = "flye"; - version = "2.9.4"; + version = "2.9.5"; pyproject = true; src = fetchFromGitHub { owner = "fenderglass"; repo = "flye"; rev = "refs/tags/${version}"; - hash = "sha256-lwiY0VTEsLMMXt1VowsS3jj44v30Z766xNRwQtQKr10="; + hash = "sha256-448PTdGueQVHFIDS5zMy+XKZCtEb0SqP8bspPLHMJn0="; }; patches = [ @@ -34,12 +34,6 @@ python3Packages.buildPythonApplication rec { url = "https://github.com/mikolmogorov/Flye/commit/fb34f1ccfdf569d186a4ce822ee18eced736636b.patch"; hash = "sha256-52bnZ8XyP0HsY2OpNYMU3xJgotNVdQc/O2w3XIReUdQ="; }) - (fetchpatch { - # https://github.com/mikolmogorov/Flye/pull/670 - name = "remove-find_module.patch"; - url = "https://github.com/mikolmogorov/Flye/commit/441b1c6eb0f60b7c4fb1a40d659c7dabb7ad41b6.patch"; - hash = "sha256-RytFIN1STK33/nvXpck6woQcwV/e1fmA8AgmptiIiDU="; - }) ]; postPatch = '' diff --git a/pkgs/by-name/fm/fm-tune/package.nix b/pkgs/by-name/fm/fm-tune/package.nix index 59c61dc4ed5bb..e5711af1a0a82 100644 --- a/pkgs/by-name/fm/fm-tune/package.nix +++ b/pkgs/by-name/fm/fm-tune/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "viraptor"; repo = "fm_tune"; rev = version; - sha256 = "pwL2G1Ni1Ixw/N0diSoGGIoVrtmF92mWZ5i57OOvkX4="; + hash = "sha256-pwL2G1Ni1Ixw/N0diSoGGIoVrtmF92mWZ5i57OOvkX4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fn/fnott/package.nix b/pkgs/by-name/fn/fnott/package.nix index c41f0ff96f7e0..e0069e18c8f05 100644 --- a/pkgs/by-name/fn/fnott/package.nix +++ b/pkgs/by-name/fn/fnott/package.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ mit zlib ]; maintainers = with lib.maintainers; [ jmbaur - eclairevoyant ]; mainProgram = "fnott"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fo/folder-color-switcher/package.nix b/pkgs/by-name/fo/folder-color-switcher/package.nix index b338b84d07717..e6fd9dd0e5691 100644 --- a/pkgs/by-name/fo/folder-color-switcher/package.nix +++ b/pkgs/by-name/fo/folder-color-switcher/package.nix @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { repo = pname; # They don't really do tags, this is just a named commit. rev = "c9d1a2b9c7f40ff7bb77ee74a277988bb8a4adf2"; - sha256 = "sha256-5k0YybA40MefqQixNFyQFMuy7t4aSGsI3BK0RbZDu28="; + hash = "sha256-5k0YybA40MefqQixNFyQFMuy7t4aSGsI3BK0RbZDu28="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix new file mode 100644 index 0000000000000..dba8ba8eb2cc2 --- /dev/null +++ b/pkgs/by-name/fo/follow/package.nix @@ -0,0 +1,107 @@ +{ + electron, + fetchFromGitHub, + imagemagick, + lib, + makeDesktopItem, + makeWrapper, + nodejs, + pnpm, + stdenv, +}: +stdenv.mkDerivation rec { + pname = "follow"; + + version = "0.0.1-alpha.17"; + + src = fetchFromGitHub { + owner = "RSSNext"; + repo = "Follow"; + rev = "v${version}"; + hash = "sha256-amW+jpJ2E7muKwiWbblONRFzH849js2SaT+poUWQWZI="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + makeWrapper + imagemagick + ]; + + pnpmDeps = pnpm.fetchDeps { + inherit pname version src; + hash = "sha256-JFAONU1C8pB2Hu4PJqqdqcXk9Ec+iPiAL8J+dk4oPj0="; + }; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + # This environment variables inject the production Vite config at build time. + # Copy from: + # 1. https://github.com/RSSNext/Follow/blob/0745ac07dd2a4a34e4251c034678ace15c302697/.github/workflows/build.yml#L18 + # 2. And logs in the corresponding GitHub Actions: https://github.com/RSSNext/Follow/actions/workflows/build.yml + VITE_WEB_URL = "https://app.follow.is"; + VITE_API_URL = "https://api.follow.is"; + VITE_IMGPROXY_URL = "https://thumbor.follow.is"; + VITE_SENTRY_DSN = "https://e5bccf7428aa4e881ed5cb713fdff181@o4507542488023040.ingest.us.sentry.io/4507570439979008"; + VITE_BUILD_TYPE = "production"; + VITE_POSTHOG_KEY = "phc_EZGEvBt830JgBHTiwpHqJAEbWnbv63m5UpreojwEWNL"; + }; + + desktopItem = makeDesktopItem { + name = "follow"; + desktopName = "Follow"; + comment = "Next generation information browser"; + icon = "follow"; + exec = "follow"; + categories = [ "Utility" ]; + mimeTypes = [ "x-scheme-handler/follow" ]; + }; + + icon = src + "/resources/icon.png"; + + buildPhase = '' + runHook preBuild + + pnpm --offline electron-vite build + # Remove dev dependencies. + pnpm --ignore-scripts prune --prod + # Clean up broken symlinks left behind by `pnpm prune` + find node_modules/.bin -xtype l -delete + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{applications,follow} + cp -r . $out/share/follow + rm -rf $out/share/follow/{.vscode,.github} + + makeWrapper "${electron}/bin/electron" "$out/bin/follow" \ + --inherit-argv0 \ + --add-flags --disable-gpu-compositing \ + --add-flags $out/share/follow \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + + install -m 444 -D "${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 + done + + runHook postInstall + ''; + + meta = { + description = "Next generation information browser"; + homepage = "https://github.com/RSSNext/Follow"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ iosmanthus ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "follow"; + }; +} diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/by-name/fo/fondo/package.nix similarity index 100% rename from pkgs/applications/graphics/fondo/default.nix rename to pkgs/by-name/fo/fondo/package.nix diff --git a/pkgs/by-name/fo/footswitch/package.nix b/pkgs/by-name/fo/footswitch/package.nix index dd7b31f11a27e..5df62b1c8aae6 100644 --- a/pkgs/by-name/fo/footswitch/package.nix +++ b/pkgs/by-name/fo/footswitch/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "rgerganov"; repo = "footswitch"; rev = "b7493170ecc956ac87df2c36183253c945be2dcf"; - sha256 = "sha256-vwjeWjIXQiFJ0o/wgEBrKP3hQi8Xa/azVS1IE/Q/MyY="; + hash = "sha256-vwjeWjIXQiFJ0o/wgEBrKP3hQi8Xa/azVS1IE/Q/MyY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix index 2b69b01e3e2f1..16b440b115c1d 100644 --- a/pkgs/by-name/fo/fooyin/package.nix +++ b/pkgs/by-name/fo/fooyin/package.nix @@ -9,17 +9,18 @@ , kdsingleapplication , pipewire , taglib +, libvgm }: stdenv.mkDerivation (finalAttrs: { pname = "fooyin"; - version = "0.5.3"; + version = "0.7.2"; src = fetchFromGitHub { owner = "ludouzi"; repo = "fooyin"; rev = "v" + finalAttrs.version; - hash = "sha256-h8unOzDSQ9ME6nbfLxau1EctJeNH8P2VG0IBQoqhwGs="; + hash = "sha256-9tNd0TDTxlm6jV2kkZGZbi8tZMj13jbp3+aKXOkNtIw="; }; buildInputs = [ @@ -31,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { kdePackages.qtbase kdePackages.qtsvg taglib + libvgm ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/forbidden/package.nix b/pkgs/by-name/fo/forbidden/package.nix index 57c1aa9fa7ec1..21fb34ccf9465 100644 --- a/pkgs/by-name/fo/forbidden/package.nix +++ b/pkgs/by-name/fo/forbidden/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "forbidden"; - version = "11.2"; + version = "12.5"; pyproject = true; src = fetchFromGitHub { owner = "ivan-sincek"; repo = "forbidden"; rev = "refs/tags/v${version}"; - hash = "sha256-XRN5zQgyBbMxDKAutW3XNIAbBVdAeXZtxsNbmjLyKRc="; + hash = "sha256-ZxEkkg1gFs/pSAnrW85UqDQKczXqLW1q4kW58TagEA0="; }; build-system = with python3.pkgs; [ @@ -20,6 +20,7 @@ python3.pkgs.buildPythonApplication rec { ]; dependencies = with python3.pkgs; [ + alive-progress colorama datetime pycurl diff --git a/pkgs/by-name/fo/forecast/Cargo.lock b/pkgs/by-name/fo/forecast/Cargo.lock new file mode 100644 index 0000000000000..49a40caae702a --- /dev/null +++ b/pkgs/by-name/fo/forecast/Cargo.lock @@ -0,0 +1,7017 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e08104bebc65a46f8bc7aa733d39ea6874bfa7156f41a46b805785e3af1587d" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.12.2" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" + +[[package]] +name = "accesskit_consumer" +version = "0.17.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_macos" +version = "0.11.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_consumer", + "icrate 0.1.2", + "objc2 0.5.0", + "once_cell", +] + +[[package]] +name = "accesskit_unix" +version = "0.7.1" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel", + "async-executor", + "async-task", + "atspi", + "futures-lite 1.13.0", + "futures-util", + "once_cell", + "serde", + "tokio", + "tokio-stream", + "zbus 3.15.2", +] + +[[package]] +name = "accesskit_windows" +version = "0.16.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_consumer", + "once_cell", + "paste", + "static_assertions", + "windows 0.48.0", +] + +[[package]] +name = "accesskit_winit" +version = "0.18.1" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +dependencies = [ + "accesskit", + "accesskit_macos", + "accesskit_unix", + "accesskit_windows", + "raw-window-handle", + "winit", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.5.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +dependencies = [ + "async-fs 2.1.2", + "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus 4.3.0", +] + +[[package]] +name = "ashpd" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus 4.3.0", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +dependencies = [ + "concurrent-queue", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-compression" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-executor" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.0.2", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.3.0", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.6.0", + "rustix 0.38.32", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io 2.3.2", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.32", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-process" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +dependencies = [ + "async-channel", + "async-io 2.3.2", + "async-lock 3.3.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.0", + "futures-lite 2.3.0", + "rustix 0.38.32", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.3.2", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.32", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" +dependencies = [ + "rustix 0.38.32", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "atspi" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" +dependencies = [ + "atspi-common", + "atspi-connection", + "atspi-proxies", +] + +[[package]] +name = "atspi-common" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" +dependencies = [ + "enumflags2", + "serde", + "static_assertions", + "zbus 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "atspi-connection" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" +dependencies = [ + "atspi-common", + "atspi-proxies", + "futures-lite 1.13.0", + "zbus 3.15.2", +] + +[[package]] +name = "atspi-proxies" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" +dependencies = [ + "atspi-common", + "serde", + "zbus 3.15.2", +] + +[[package]] +name = "autocfg" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + +[[package]] +name = "basic-toml" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" +dependencies = [ + "serde", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] + +[[package]] +name = "bitstream-io" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2 0.4.1", +] + +[[package]] +name = "block2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" +dependencies = [ + "block-sys", + "objc2 0.5.0", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "built" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" + +[[package]] +name = "bumpalo" +version = "3.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" + +[[package]] +name = "bytemuck" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.5.0", + "log", + "polling 3.6.0", + "rustix 0.38.32", + "slab", + "thiserror", +] + +[[package]] +name = "calloop" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +dependencies = [ + "bitflags 2.5.0", + "log", + "polling 3.6.0", + "rustix 0.38.32", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop 0.12.4", + "rustix 0.38.32", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" +dependencies = [ + "calloop 0.13.0", + "rustix 0.38.32", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cc" +version = "1.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.4", +] + +[[package]] +name = "clipboard-win" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" +dependencies = [ + "error-code", +] + +[[package]] +name = "clipboard_macos" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "objc", + "objc-foundation", + "objc_id", +] + +[[package]] +name = "clipboard_wayland" +version = "0.2.2" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "dnd", + "mime 0.1.0", + "smithay-clipboard", +] + +[[package]] +name = "clipboard_x11" +version = "0.4.2" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "thiserror", + "x11rb", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "com" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "atomicwrites", + "cosmic-config-derive", + "dirs", + "iced_futures", + "known-folders", + "notify", + "once_cell", + "ron", + "serde", + "tokio", + "tracing", + "xdg", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-ext-forecast" +version = "0.1.0" +dependencies = [ + "bytes", + "chrono", + "i18n-embed", + "i18n-embed-fl", + "include_dir", + "libcosmic", + "log", + "open", + "reqwest", + "rust-embed", + "serde", + "tokio", + "vergen", +] + +[[package]] +name = "cosmic-text" +version = "0.12.1" +source = "git+https://github.com/pop-os/cosmic-text.git#c7512170201910cfb8a021f8d749c4125dfed18d" +dependencies = [ + "bitflags 2.5.0", + "fontdb", + "log", + "rangemap", + "rayon", + "rustc-hash", + "rustybuzz 0.14.1", + "self_cell 1.0.3", + "smol_str", + "swash", + "sys-locale", + "ttf-parser 0.21.1", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "dirs", + "lazy_static", + "palette", + "ron", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "css-color" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "ctor-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b" + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "bitflags 2.5.0", + "libloading 0.8.3", + "winapi", +] + +[[package]] +name = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.71", +] + +[[package]] +name = "darling_macro" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "data-url" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.3", +] + +[[package]] +name = "dlv-list" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] + +[[package]] +name = "dnd" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "bitflags 2.5.0", + "mime 0.1.0", + "raw-window-handle", + "smithay-client-toolkit 0.19.2", + "smithay-clipboard", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "drm" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "rustix 0.38.32", +] + +[[package]] +name = "drm-ffi" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" +dependencies = [ + "drm-sys", + "rustix 0.38.32", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" +dependencies = [ + "libc", + "linux-raw-sys 0.6.4", +] + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enum-repr" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + +[[package]] +name = "etagere" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener 5.3.0", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell 0.10.3", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +dependencies = [ + "thiserror", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "font-types" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "fontconfig-parser" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.4", + "slotmap", + "tinyvec", + "ttf-parser 0.20.0", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f158e3ff0a1b334408dc9fb811cd99b446986f4d8b741bb08f9df1604085ae7" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8ef34245e0540c9a3ce7a28340b98d2c12b75da0d446da4e8224923fcaa0c16" +dependencies = [ + "dirs", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.0.2", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "glyphon" +version = "0.5.0" +source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.5.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "gpu-allocator" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +dependencies = [ + "log", + "presser", + "thiserror", + "winapi", + "windows 0.52.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.5.0", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" +dependencies = [ + "bitflags 2.5.0", + "com", + "libc", + "libloading 0.8.3", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "i18n-config" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9" +dependencies = [ + "basic-toml", + "log", + "serde", + "serde_derive", + "thiserror", + "unic-langid", +] + +[[package]] +name = "i18n-embed" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e901c87176ac0b615033c81dbe927c230f74700abfd60ed953a6f547c87bbe6d" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.1", + "rust-embed", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d73fe51b9655599147183495551696628b335f75b2dbfa225196b16d69d7288e" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.71", + "unic-langid", +] + +[[package]] +name = "i18n-embed-impl" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" +dependencies = [ + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "iced" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "dnd", + "iced_accessibility", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_sctk", + "iced_widget", + "iced_winit", + "image 0.24.9", + "mime 0.1.0", + "thiserror", + "window_clipboard", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "accesskit", + "accesskit_unix", + "accesskit_winit", +] + +[[package]] +name = "iced_core" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "bitflags 2.5.0", + "dnd", + "iced_accessibility", + "log", + "mime 0.1.0", + "num-traits", + "palette", + "raw-window-handle", + "serde", + "smithay-client-toolkit 0.19.2", + "smol_str", + "thiserror", + "web-time", + "window_clipboard", + "xxhash-rust", +] + +[[package]] +name = "iced_futures" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "futures", + "iced_core", + "log", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "cosmic-text", + "glam", + "half", + "iced_core", + "iced_futures", + "image 0.24.9", + "kamadak-exif", + "log", + "lyon_path", + "once_cell", + "raw-window-handle", + "rustc-hash", + "thiserror", + "unicode-segmentation", + "xxhash-rust", +] + +[[package]] +name = "iced_renderer" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "dnd", + "iced_accessibility", + "iced_core", + "iced_futures", + "smithay-client-toolkit 0.19.2", + "thiserror", + "window_clipboard", +] + +[[package]] +name = "iced_sctk" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "enum-repr", + "float-cmp", + "futures", + "iced_futures", + "iced_graphics", + "iced_runtime", + "iced_style", + "itertools", + "lazy_static", + "raw-window-handle", + "smithay-client-toolkit 0.19.2", + "thiserror", + "tracing", + "wayland-backend", + "wayland-protocols 0.32.3", + "window_clipboard", + "xkbcommon", + "xkbcommon-dl", + "xkeysym", +] + +[[package]] +name = "iced_style" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "resvg", + "rustc-hash", + "softbuffer", + "tiny-skia", + "xxhash-rust", +] + +[[package]] +name = "iced_wgpu" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "as-raw-xcb-connection", + "bitflags 2.5.0", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "raw-window-handle", + "resvg", + "rustix 0.38.32", + "smithay-client-toolkit 0.19.2", + "tiny-xlib", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.3", + "wayland-sys", + "wgpu", + "x11rb", +] + +[[package]] +name = "iced_widget" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "dnd", + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "thiserror", + "unicode-segmentation", + "window_clipboard", +] + +[[package]] +name = "iced_winit" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "dnd", + "iced_graphics", + "iced_runtime", + "iced_style", + "log", + "thiserror", + "tracing", + "web-sys", + "winapi", + "window_clipboard", + "winit", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2 0.3.0", + "dispatch", + "objc2 0.4.1", +] + +[[package]] +name = "icrate" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" +dependencies = [ + "block2 0.4.0", + "objc2 0.5.0", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif 0.13.1", + "jpeg-decoder", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "image" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "color_quant", + "exr", + "gif 0.13.1", + "image-webp", + "num-traits", + "png", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +dependencies = [ + "byteorder-lite", + "quick-error", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] +name = "include_dir" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.3", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "known-folders" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#71cd25c06d230a742ebf660297478b732cf1882b" +dependencies = [ + "apply", + "ashpd 0.9.1", + "chrono", + "cosmic-config", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_style", + "iced_tiny_skia", + "iced_wgpu", + "iced_widget", + "iced_winit", + "image 0.25.2", + "lazy_static", + "palette", + "rfd", + "serde", + "slotmap", + "taffy", + "thiserror", + "tokio", + "tracing", + "unicode-segmentation", + "url", + "zbus 4.3.0", +] + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.4", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.5.0", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "linux-raw-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "lyon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c67b5bc8123b352b2e7e742b47d1f236a13fe77619433be9568fbd888e9c0" +dependencies = [ + "float_next_after", + "lyon_path", + "num-traits", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "mime" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "smithay-clipboard", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.5.0", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.5.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases 0.1.1", + "libc", + "memoffset 0.9.1", +] + +[[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 = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.5.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9c7f0d511a4ce26b078183179dca908171cfc69f88986fe36c5138e1834476" +dependencies = [ + "objc-sys", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "open" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[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 = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox 0.0.2", +] + +[[package]] +name = "ordered-multimap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" +dependencies = [ + "dlv-list", + "hashbrown", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "owned_ttf_parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +dependencies = [ + "ttf-parser 0.20.0", +] + +[[package]] +name = "palette" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.2", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix 0.38.32", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.71", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quick-xml" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" + +[[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67376f469e7e7840d0040bbf4b9b3334005bb167f814621326e4c7ab8cd6e944" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + +[[package]] +name = "rayon" +version = "1.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 = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "read-fonts" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" +dependencies = [ + "bytemuck", + "font-types", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox 0.1.3", + "thiserror", +] + +[[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 = "renderdoc-sys" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" + +[[package]] +name = "reqwest" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +dependencies = [ + "async-compression", + "base64 0.22.0", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime 0.3.17", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "resvg" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" +dependencies = [ + "gif 0.12.0", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rfd" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +dependencies = [ + "ashpd 0.8.1", + "block", + "dispatch", + "js-sys", + "log", + "objc", + "objc-foundation", + "objc_id", + "pollster", + "raw-window-handle", + "urlencoding", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64 0.21.7", + "bitflags 2.5.0", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" + +[[package]] +name = "rust-embed" +version = "8.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.71", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-ini" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.0", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "rustybuzz" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "smallvec", + "ttf-parser 0.20.0", + "unicode-bidi-mirroring 0.1.0", + "unicode-ccc 0.1.2", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.21.1", + "unicode-bidi-mirroring 0.2.0", + "unicode-ccc 0.2.0", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sctk-adwaita" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +dependencies = [ + "ab_glyph", + "log", + "memmap2 0.9.4", + "smithay-client-toolkit 0.18.1", + "tiny-skia", +] + +[[package]] +name = "security-framework" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "self_cell" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.0.3", +] + +[[package]] +name = "self_cell" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" + +[[package]] +name = "serde" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "serde_json" +version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "skrifa" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +dependencies = [ + "bytemuck", + "read-fonts", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.5.0", + "calloop 0.12.4", + "calloop-wayland-source 0.2.0", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "rustix 0.38.32", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr 0.2.0", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "calloop 0.13.0", + "calloop-wayland-source 0.3.0", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "pkg-config", + "rustix 0.38.32", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.32.3", + "wayland-protocols-wlr 0.3.3", + "wayland-scanner", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.8.0" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007def49eb678d1144850c9ee04b80707c56a" +dependencies = [ + "libc", + "raw-window-handle", + "smithay-client-toolkit 0.19.2", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "softbuffer" +version = "0.4.1" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e98397d37cb187886d05969bc480995" +dependencies = [ + "as-raw-xcb-connection", + "bytemuck", + "cfg_aliases 0.2.0", + "cocoa", + "core-graphics", + "drm", + "fastrand 2.0.2", + "foreign-types 0.5.0", + "js-sys", + "log", + "memmap2 0.9.4", + "objc", + "raw-window-handle", + "redox_syscall 0.4.1", + "rustix 0.38.32", + "tiny-xlib", + "wasm-bindgen", + "wayland-backend", + "wayland-client", + "wayland-sys", + "web-sys", + "windows-sys 0.52.0", + "x11rb", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "svg_fmt" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" + +[[package]] +name = "svgtypes" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" +dependencies = [ + "skrifa", + "yazi", + "zeno", +] + +[[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.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml 0.8.12", + "version-compare", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.0.2", + "rustix 0.38.32", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-xlib" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" +dependencies = [ + "as-raw-xcb-connection", + "ctor-lite", + "libloading 0.8.3", + "pkg-config", + "tracing", +] + +[[package]] +name = "tinystr" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.6", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[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-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.9", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.5", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "ttf-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + +[[package]] +name = "type-map" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[package]] +name = "unic-langid" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +dependencies = [ + "serde", + "tinystr", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-ccc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[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-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + +[[package]] +name = "unicode-script" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "usvg" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" +dependencies = [ + "base64 0.21.7", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz 0.12.1", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path", +] + +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vergen" +version = "8.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" +dependencies = [ + "anyhow", + "cfg-if", + "rustversion", + "time", +] + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.71", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.32", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +dependencies = [ + "bitflags 2.5.0", + "rustix 0.38.32", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.5.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +dependencies = [ + "rustix 0.38.32", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.3", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "wgpu" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "arrayvec", + "cfg-if", + "cfg_aliases 0.1.1", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.5.0", + "cfg_aliases 0.1.1", + "codespan-reporting", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.5.0", + "block", + "cfg_aliases 0.1.1", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.3", + "log", + "metal", + "naga", + "objc", + "once_cell", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "bitflags 2.5.0", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "window_clipboard" +version = "0.4.1" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +dependencies = [ + "clipboard-win", + "clipboard_macos", + "clipboard_wayland", + "clipboard_x11", + "dnd", + "mime 0.1.0", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-implement" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-interface" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winit" +version = "0.29.10" +source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.5.0", + "bytemuck", + "calloop 0.12.4", + "cfg_aliases 0.1.1", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate 0.0.4", + "js-sys", + "libc", + "log", + "memmap2 0.9.4", + "ndk", + "ndk-sys", + "objc2 0.4.1", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "rustix 0.38.32", + "sctk-adwaita", + "smithay-client-toolkit 0.18.1", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading 0.8.3", + "once_cell", + "rustix 0.38.32", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.5.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "xxhash-rust" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast 0.5.1", + "async-executor", + "async-fs 1.6.0", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process 1.8.1", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" +dependencies = [ + "async-broadcast 0.7.1", + "async-executor", + "async-fs 2.1.2", + "async-io 2.3.2", + "async-lock 3.3.0", + "async-process 2.2.3", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.0", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.28.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.3.0", + "zbus_names 3.0.0", + "zvariant 4.1.2", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zbus_macros" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.71", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.1.2", +] + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", +] + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive 3.15.2", +] + +[[package]] +name = "zvariant" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "url", + "zvariant_derive 4.1.2", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.71", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix new file mode 100644 index 0000000000000..9caca19cafdb3 --- /dev/null +++ b/pkgs/by-name/fo/forecast/package.nix @@ -0,0 +1,105 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + + # nativeBuildInputs + autoPatchelfHook, + just, + pkg-config, + wrapGAppsHook3, + + # buildInputs + libxkbcommon, + openssl, + vulkan-loader, + wayland, + nix-update-script, + + cosmic-icons, +}: + +rustPlatform.buildRustPackage rec { + pname = "forecast"; + version = "0-unstable-2024-09-23"; + + src = fetchFromGitHub { + owner = "cosmic-utils"; + repo = "forecast"; + rev = "d3c274932847aa101fb7aacf1d01ded265b6fad4"; + hash = "sha256-6hlh9T0h1Yi8io2sMU/r8uMtP6isH6JJxE5LvZrj9Cs="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; + "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; + "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; + "cosmic-config-0.1.0" = "sha256-zamYPvxmIqh4IT4G+aqceP1mXNNBA1TAcJwAtjlbYAU="; + "cosmic-text-0.12.1" = "sha256-5Gk220HTiHuxDvyqwz1Dwr+BaLvH/6X7M14IirQzcsE="; + "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; + "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; + "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; + "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; + "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; + }; + }; + + nativeBuildInputs = [ + autoPatchelfHook + just + pkg-config + wrapGAppsHook3 + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + buildInputs = [ + libxkbcommon + openssl + vulkan-loader + wayland + ]; + + env = { + # COSMIC applications now uses vergen for the About page + VERGEN_GIT_COMMIT_DATE = "1970-01-01"; + VERGEN_GIT_SHA = src.rev; + }; + + runtimeDependencies = [ + libxkbcommon + wayland + ]; + + postFixup = '' + wrapProgram $out/bin/cosmic-ext-forecast \ + --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" + ''; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-ext-forecast" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Weather app written in rust and libcosmic"; + homepage = "https://github.com/cosmic-utils/forecast"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.linux; + mainProgram = "cosmic-ext-forecast"; + }; +} diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix index c8965fa3beea9..ee49edd29110c 100644 --- a/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/pkgs/by-name/fo/forgejo-cli/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage { openssl zlib ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index a2a1e51850bce..8ca9a12e96ac6 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -158,7 +158,7 @@ buildGoModule rec { changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ emilylange urandom bendlas adamcstephens ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "gitea"; }; } diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix index 7693d27f5502a..f7c446dedfd20 100644 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "7.0.8"; - hash = "sha256-m6yToQQFM+4g8xhs572O4n4r06xeS3DozYHtAKwMjUg="; - npmDepsHash = "sha256-OqtYRjftwGxgW1JgMxyWd+9DndpEkd3LdQHSECc40yU="; + version = "7.0.9"; + hash = "sha256-JoHF49n2HWMHl/LMWxQlj7utkmzyZ5pHEfeSU8gjyfU="; + npmDepsHash = "sha256-9U2I+JzDGQlfjyvZRbfPbDMmoHxIJ/SOBhMdn1la0EI="; vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw="; lts = true; nixUpdateExtraArgs = [ diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 8beb4a67c7640..6632a8a36522c 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "8.0.2"; - hash = "sha256-rjwZjwt0F9AhXgQ8CzOfsZ3acyBvzsDc/2LHRWieDzg="; - npmDepsHash = "sha256-6AMaZadgcTvOBsIXJjZQB6Q1rkdn+R82pclXdVvtdWY="; + version = "8.0.3"; + hash = "sha256-PvCWUiJIs9ktuJetPYZT0V8S8+OYahCDZiZQpvWWXhY="; + npmDepsHash = "sha256-E4eq4OompY8e+722PbSFCmcarpYBpO/n9X6GVU9AhDU="; vendorHash = "sha256-4l4kscwesW/cR8mZjE3G9HcVm0d1ukxbtBY6RXYRi8k="; lts = false; nixUpdateExtraArgs = [ diff --git a/pkgs/by-name/fo/fork-cleaner/package.nix b/pkgs/by-name/fo/fork-cleaner/package.nix index 30a670ab189bc..dbeee75f00684 100644 --- a/pkgs/by-name/fo/fork-cleaner/package.nix +++ b/pkgs/by-name/fo/fork-cleaner/package.nix @@ -14,7 +14,7 @@ buildGoModule { owner = "caarlos0"; repo = "fork-cleaner"; rev = "v${version}"; - sha256 = "sha256-JNmpcDwmxR+s4regOWz8FAJllBNRfOCmVwkDs7tlChA="; + hash = "sha256-JNmpcDwmxR+s4regOWz8FAJllBNRfOCmVwkDs7tlChA="; }; vendorHash = "sha256-QuIaXXkch5PCpX8P755X8j7MeNnbewWo7NB+Vue1/Pk="; diff --git a/pkgs/by-name/fo/formatjson5/package.nix b/pkgs/by-name/fo/formatjson5/package.nix index 6adfece33862a..112f94aa8358e 100644 --- a/pkgs/by-name/fo/formatjson5/package.nix +++ b/pkgs/by-name/fo/formatjson5/package.nix @@ -1,8 +1,10 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -19,13 +21,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-zPgaZPDyNVPmBXz6QwOYnmh/sbJ8aPST8znLMfIWejk="; - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoBuildFlags = [ - "--example formatjson5" - ]; + cargoBuildFlags = [ "--example formatjson5" ]; postInstall = let @@ -35,6 +33,8 @@ rustPlatform.buildRustPackage rec { install -D target/${cargoTarget}/release/examples/formatjson5 $out/bin/formatjson5 ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "JSON5 formatter"; homepage = "https://github.com/google/json5format"; diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index 1fd3783735d83..bea0bec5c4035 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-hxbvsAQsZWUAgj8QAlcxqBA5YagLO3/vz9lQGJMHUjw="; nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/fo/four-in-a-row/package.nix b/pkgs/by-name/fo/four-in-a-row/package.nix index f2b9b8335abe1..96c9c90475846 100644 --- a/pkgs/by-name/fo/four-in-a-row/package.nix +++ b/pkgs/by-name/fo/four-in-a-row/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${lib.versions.majorMinor version}/four-in-a-row-${version}.tar.xz"; - sha256 = "10ji60bdfdzb6wk5dkwjc3yww7hqi3yjcx1k1z7x2521h2dpdli1"; + hash = "sha256-IdJ2m4BBFNHPDzN0Jv2IGB7O/WCSz1YmN+s31xYwUYI="; }; nativeBuildInputs = [ @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/four-in-a-row"; + changelog = "https://gitlab.gnome.org/GNOME/four-in-a-row/-/blob/${version}/NEWS?ref_type=tags"; description = "Make lines of the same color to win"; mainProgram = "four-in-a-row"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/fr/fragment-mono/package.nix b/pkgs/by-name/fr/fragment-mono/package.nix new file mode 100644 index 0000000000000..6a860a27049f1 --- /dev/null +++ b/pkgs/by-name/fr/fragment-mono/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fragment-mono"; + version = "1.21"; + + src = fetchzip { + url = "https://github.com/weiweihuanghuang/fragment-mono/releases/download/${finalAttrs.version}/fragment-mono-${finalAttrs.version}.zip"; + hash = "sha256-H5s4rYDN2d0J+zVRgBzg8vfZXCA/jjHrGBV8o8Dxutc="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/ttf/*.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/weiweihuanghuang/fragment-mono"; + description = "Helvetica Monospace Coding Font"; + changelog = "https://github.com/weiweihuanghuang/fragment-mono/releases/tag/${finalAttrs.version}"; + longDescription = '' + Fragment Mono is a monospaced coding version of Helvetica created + by modifying and extending Nimbus Sans by URW Design Studio. + ''; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.noahgitsham ]; + }; +}) diff --git a/pkgs/by-name/fr/fragments/package.nix b/pkgs/by-name/fr/fragments/package.nix index 7976a2add11b4..a3077697781de 100644 --- a/pkgs/by-name/fr/fragments/package.nix +++ b/pkgs/by-name/fr/fragments/package.nix @@ -1,41 +1,42 @@ -{ lib -, stdenv -, fetchFromGitLab -, appstream-glib -, cargo -, dbus -, desktop-file-utils -, git -, glib -, gtk4 -, libadwaita -, meson -, ninja -, openssl -, pkg-config -, rustPlatform -, rustc -, sqlite -, transmission_4 -, wrapGAppsHook4 +{ + lib, + stdenv, + fetchFromGitLab, + appstream-glib, + cargo, + dbus, + desktop-file-utils, + git, + glib, + gtk4, + libadwaita, + meson, + ninja, + openssl, + pkg-config, + rustPlatform, + rustc, + sqlite, + transmission_4, + wrapGAppsHook4, }: stdenv.mkDerivation rec { pname = "fragments"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Fragments"; rev = version; - hash = "sha256-HtulyB1XYBsA595ghJN0EmyJT7DjGUbtJKaMGM3f0I8="; + hash = "sha256-lTOO6ZQWImaFqYZ3qerYYHWj/eOLYU/2k2Wh/ju9Njw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-EUE+Qc+MqsKPqHMYJflZQ6zm3ErW+KLuJq/7HEBf8VM="; + hash = "sha256-7TIjd1ewazJGY8uG6f1B97ol+7+uLjnZVGC2/2DlUdQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index da6d32c5c7b87..9cae030df8391 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -19,9 +19,9 @@ let phpEmbedWithZts = php.override { embedSupport = true; ztsSupport = true; - staticSupport = stdenv.isDarwin; + staticSupport = stdenv.hostPlatform.isDarwin; zendSignalsSupport = false; - zendMaxExecutionTimersSupport = stdenv.isLinux; + zendMaxExecutionTimersSupport = stdenv.hostPlatform.isLinux; }; phpUnwrapped = phpEmbedWithZts.unwrapped; phpConfig = "${phpUnwrapped.dev}/bin/php-config"; @@ -45,7 +45,7 @@ in buildGoModule rec { vendorHash = "sha256-U2B0ok6TgqUPMwlnkzpPkJLG22S3VpoU80bWwZAeaJo="; buildInputs = [ phpUnwrapped brotli ] ++ phpUnwrapped.buildInputs; - nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config cctools darwin.autoSignDarwinBinariesHook ]; + nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkg-config cctools darwin.autoSignDarwinBinariesHook ]; subPackages = [ "frankenphp" ]; @@ -63,7 +63,7 @@ in buildGoModule rec { export CGO_LDFLAGS="-DFRANKENPHP_VERSION=${version} \ $(${phpConfig} --ldflags) \ $(${phpConfig} --libs)" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # replace hard-code homebrew path substituteInPlace ../frankenphp.go \ --replace "-L/opt/homebrew/opt/libiconv/lib" "-L${libiconv}/lib" diff --git a/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch b/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch index 27e5fb81b8d07..185d6effa25ef 100644 --- a/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch +++ b/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch @@ -1,44 +1,43 @@ -From c4f452ef6ae083ed21095313582f6d1bd775cbf3 Mon Sep 17 00:00:00 2001 -From: Andreas Rammhold <andreas@rammhold.de> -Date: Thu, 2 Nov 2023 17:32:07 +0100 -Subject: [PATCH] NIXOS: don't ignore PYTHONPATH +commit c534a831c2f7186ebabe4e17f1e1df6d11ebff89 +Author: Samuel Rounce <me@samuelrounce.co.uk> +Date: Thu Sep 5 22:17:21 2024 +0100 -On NixOS or rather within nixpkgs we provide the runtime Python -packages via the PYTHONPATH environment variable. FreeCAD tries its -best to ignore Python environment variables that are being inherited -from the environment. For Python versions >=3.11 it also tries to -initialize the interpreter config without any environmental data. We -have to initialize the configuration *with* the information from the -environment for our packaging to work. - -Upstream has purposely isolated the environments AFAIK and thus -shouldn't accept this patch (as is). What they might accept (once -support for older Python versions has been dropped) is removing the -PYTHONPATH specific putenv calls. + [PATCH] NIXOS: don't ignore PYTHONPATH + + On NixOS or rather within nixpkgs we provide the runtime Python + packages via the PYTHONPATH environment variable. FreeCAD tries its + best to ignore Python environment variables that are being inherited + from the environment. For Python versions >=3.11 it also tries to + initialize the interpreter config without any environmental data. We + have to initialize the configuration *with* the information from the + environment for our packaging to work. + + Upstream has purposely isolated the environments AFAIK and thus + shouldn't accept this patch (as is). What they might accept (once + support for older Python versions has been dropped) is removing the + PYTHONPATH specific putenv calls. --- - src/Base/Interpreter.cpp | 2 +- + src/Base/Interpreter.cpp | 1 + src/Main/MainGui.cpp | 3 --- - 2 files changed, 1 insertion(+), 4 deletions(-) + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp -index 52c47168af..9966bd0013 100644 +index 2bdc54ccff..ee4f7fc070 100644 --- a/src/Base/Interpreter.cpp +++ b/src/Base/Interpreter.cpp -@@ -554,7 +554,9 @@ void initInterpreter(int argc,char *argv[]) - { - PyStatus status; +@@ -593,6 +593,7 @@ void initInterpreter(int argc, char* argv[]) PyConfig config; PyConfig_InitIsolatedConfig(&config); -+ config.isolated = 0; + config.isolated = 0; + config.use_environment = 1; + config.user_site_directory = 1; status = PyConfig_SetBytesArgv(&config, argc, argv); - if (PyStatus_Exception(status)) { diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp -index 48ae847ef4..28813df383 100644 +index 36087cffd6..89d49d2cc6 100644 --- a/src/Main/MainGui.cpp +++ b/src/Main/MainGui.cpp -@@ -112,17 +112,14 @@ int main( int argc, char ** argv ) +@@ -114,10 +114,8 @@ int main(int argc, char** argv) // See https://forum.freecad.org/viewtopic.php?f=18&t=20600 // See Gui::Application::runApplication() putenv("LC_NUMERIC=C"); @@ -49,13 +48,11 @@ index 48ae847ef4..28813df383 100644 #elif defined(__MINGW32__) const char* mingw_prefix = getenv("MINGW_PREFIX"); const char* py_home = getenv("PYTHONHOME"); - if (!py_home && mingw_prefix) +@@ -125,7 +123,6 @@ int main(int argc, char** argv) _putenv_s("PYTHONHOME", mingw_prefix); + } #else - _putenv("PYTHONPATH="); // https://forum.freecad.org/viewtopic.php?f=4&t=18288 // https://forum.freecad.org/viewtopic.php?f=3&t=20515 const char* fc_py_home = getenv("FC_PYTHONHOME"); --- -2.42.0 - diff --git a/pkgs/by-name/fr/freecad/0002-FreeCad-OndselSolver-pkgconfig.patch b/pkgs/by-name/fr/freecad/0002-FreeCad-OndselSolver-pkgconfig.patch new file mode 100644 index 0000000000000..194220ec6e140 --- /dev/null +++ b/pkgs/by-name/fr/freecad/0002-FreeCad-OndselSolver-pkgconfig.patch @@ -0,0 +1,7 @@ +--- a/src/3rdParty/OndselSolver/OndselSolver.pc.in ++++ b/src/3rdParty/OndselSolver/OndselSolver.pc.in +@@ -3,2 +3,2 @@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_INCLUDEDIR@ diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index f272988ee5558..adb558c7e4065 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -9,12 +9,12 @@ , gfortran , gts , hdf5 -, libGLU -, libXmu , libf2c +, libGLU , libredwg , libsForQt5 , libspnav +, libXmu , medfile , mpi , ninja @@ -23,12 +23,13 @@ , pkg-config , python311Packages , runCommand # for passthru.tests -, spaceNavSupport ? stdenv.isLinux +, spaceNavSupport ? stdenv.hostPlatform.isLinux , stdenv , swig , vtk , wrapGAppsHook3 , xercesc +, yaml-cpp , zlib , withWayland ? false }: @@ -50,6 +51,7 @@ let matplotlib pivy ply + pybind11 pycollada pyside2 pyside2-tools @@ -61,13 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freecad"; - version = "0.21.2"; + version = "1.0rc2"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = finalAttrs.version; - hash = "sha256-OX4s9rbGsAhH7tLJkUJYyq2A2vCdkq/73iqYo9adogs="; + hash = "sha256-kPmfx/C1fCYwBqh6ZOKZAVNVR9m3VryPmBKu3ksDD5E="; + fetchSubmodules = true; }; nativeBuildInputs = [ @@ -100,6 +103,7 @@ stdenv.mkDerivation (finalAttrs: { opencascade-occt pivy ply # for openSCAD file support + pybind11 pycollada pyside2 pyside2-tools @@ -116,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: { swig vtk xercesc + yaml-cpp zlib ] ++ lib.optionals spaceNavSupport [ @@ -125,12 +130,17 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch + ./0002-FreeCad-OndselSolver-pkgconfig.patch ]; cmakeFlags = [ "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on "-DBUILD_FLAT_MESH:BOOL=ON" "-DBUILD_QT5=ON" + "-DBUILD_DRAWING=ON" + "-DBUILD_FLAT_MESH:BOOL=ON" + "-DINSTALL_TO_SITEPACKAGES=OFF" + "-DFREECAD_USE_PYBIND11=ON" "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include" "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" ( @@ -201,7 +211,7 @@ stdenv.mkDerivation (finalAttrs: { right at home with FreeCAD. ''; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ gebner AndersonTorres ]; + maintainers = with lib.maintainers; [ gebner AndersonTorres srounce ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/applications/networking/p2p/freenet/deps.json b/pkgs/by-name/fr/freenet/deps.json similarity index 100% rename from pkgs/applications/networking/p2p/freenet/deps.json rename to pkgs/by-name/fr/freenet/deps.json diff --git a/pkgs/by-name/fr/freenet/freenetWrapper b/pkgs/by-name/fr/freenet/freenetWrapper new file mode 100755 index 0000000000000..5e4e43d08a1b9 --- /dev/null +++ b/pkgs/by-name/fr/freenet/freenetWrapper @@ -0,0 +1,17 @@ +#! @bash@/bin/bash +set -eo pipefail +PATH=@coreutils@/bin:$PATH +export CLASSPATH=@CLASSPATH@ + +export FREENET_HOME="$HOME/.local/share/freenet" +if [ -n "$XDG_DATA_HOME" ] ; then + FREENET_HOME="$XDG_DATA_HOME/freenet" +fi + +mkdir -p -- $FREENET_HOME + +cp -u -- @seednodes@/seednodes.fref $FREENET_HOME/seednodes.fref +chmod u+rw -- $FREENET_HOME/seednodes.fref + +cd -- $FREENET_HOME +exec @jre@/bin/java -Xmx1024M freenet.node.NodeStarter "$@" diff --git a/pkgs/by-name/fr/freenet/package.nix b/pkgs/by-name/fr/freenet/package.nix new file mode 100644 index 0000000000000..96aae5ebdbc02 --- /dev/null +++ b/pkgs/by-name/fr/freenet/package.nix @@ -0,0 +1,130 @@ +{ + lib, + stdenv, + fetchurl, + fetchFromGitHub, + jdk17_headless, + jre17_minimal, + gradle_7, + bash, + coreutils, + substituteAll, + nixosTests, + fetchpatch, + writeText, +}: + +let + gradle = gradle_7; + jdk = jdk17_headless; + # Reduce closure size + jre = jre17_minimal.override { + modules = [ + "java.base" + "java.logging" + "java.naming" + "java.sql" + "java.desktop" + "java.management" + ]; + jdk = jdk17_headless; + }; + + version = "01497"; + + freenet_ext = fetchurl { + url = "https://github.com/freenet/fred/releases/download/build01495/freenet-ext.jar"; + hash = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158="; + }; + + seednodes = fetchFromGitHub { + name = "freenet-seednodes"; + owner = "hyphanet"; + repo = "seedrefs"; + rev = "9df1bf93ab64aba634bdfc5f4d0e960571ce4ba5"; + hash = "sha256-nvwJvKw5IPhItPe4k/jnOGaa8H4DtOi8XxKFOKFMAuY="; + postFetch = '' + cat $out/* > $out/seednodes.fref + ''; + }; + + patches = [ + # gradle 7 support + # https://github.com/freenet/fred/pull/827 + (fetchpatch { + url = "https://github.com/freenet/fred/commit/8991303493f2c0d9933f645337f0a7a5a979e70a.patch"; + hash = "sha256-T1zymxRTADVhhwp2TyB+BC/J4gZsT/CUuMrT4COlpTY="; + }) + ]; + +in +stdenv.mkDerivation rec { + pname = "freenet"; + inherit version patches; + + src = fetchFromGitHub { + owner = "freenet"; + repo = "fred"; + rev = "refs/tags/build${version}"; + hash = "sha256-pywNPekofF/QotNVF28McojqK7c1Zzucds5rWV0R7BQ="; + }; + + postPatch = '' + rm gradle/verification-{keyring.keys,metadata.xml} + ''; + + nativeBuildInputs = [ + gradle + jdk + ]; + + wrapper = substituteAll { + src = ./freenetWrapper; + inherit + bash + coreutils + jre + seednodes + ; + }; + + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; + + # using reproducible archives breaks the build + gradleInitScript = writeText "empty-init-script.gradle" ""; + + gradleFlags = [ "-Dorg.gradle.java.home=${jdk}" ]; + + gradleBuildTask = "jar"; + + installPhase = '' + runHook preInstall + + install -Dm644 build/libs/freenet.jar $out/share/freenet/freenet.jar + ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar + mkdir -p $out/bin + install -Dm755 ${wrapper} $out/bin/freenet + export CLASSPATH="$(find ${mitmCache} -name "*.jar"| sort | grep -v bcprov-jdk15on-1.48.jar|tr $'\n' :):$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar" + substituteInPlace $out/bin/freenet \ + --subst-var-by CLASSPATH "$CLASSPATH" + + runHook postInstall + ''; + + passthru.tests = { + inherit (nixosTests) freenet; + }; + + meta = { + description = "Decentralised and censorship-resistant network"; + homepage = "https://freenetproject.org/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ nagy ]; + platforms = with lib.platforms; linux; + changelog = "https://github.com/freenet/fred/blob/build${version}/NEWS.md"; + }; +} diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix index 6cc8b189e7651..57d8de7846e18 100644 --- a/pkgs/by-name/fr/fretboard/package.nix +++ b/pkgs/by-name/fr/fretboard/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { glib gtk4 libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; @@ -65,6 +65,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "fretboard"; maintainers = with maintainers; [ michaelgrahamevans ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/fr/friture/package.nix b/pkgs/by-name/fr/friture/package.nix index a0649dd728038..9f729bda96f36 100644 --- a/pkgs/by-name/fr/friture/package.nix +++ b/pkgs/by-name/fr/friture/package.nix @@ -7,20 +7,18 @@ python3Packages.buildPythonApplication rec { pname = "friture"; - version = "0.49-unstable-2024-06-02"; + version = "0.51"; pyproject = true; src = fetchFromGitHub { owner = "tlecomte"; - repo = pname; - rev = "405bffa585ece0cb535c32d0f4f6ace932b40103"; - hash = "sha256-4xvIlRuJ7WCFj1dEyvO9UOsye70nFlWjb9XU0owwgiM="; + repo = "friture"; + rev = "v${version}"; + hash = "sha256-1Swkk7bhQTSo17Gj0i1VNiIt+fSXgDIeWfJ9LpoUEHg="; }; - pythonRelaxDeps = true; - postPatch = '' - sed -i -e '/packages=\[/a "friture.playback",' pyproject.toml + sed -i -e 's/==.*"/"/' -e '/packages=\[/a "friture.playback",' pyproject.toml ''; nativeBuildInputs = diff --git a/pkgs/by-name/fs/fscryptctl/package.nix b/pkgs/by-name/fs/fscryptctl/package.nix new file mode 100644 index 0000000000000..b4ff999b37021 --- /dev/null +++ b/pkgs/by-name/fs/fscryptctl/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pandoc, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fscryptctl"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "fscryptctl"; + rev = "v${finalAttrs.version}"; + hash = "sha256-5suEdSpX8alDkSnSnyiIjUmZq98eK0ZPVAtDKhOs65c="; + }; + + nativeBuildInputs = [ pandoc ]; + + strictDeps = true; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = { + description = "Small C tool for Linux filesystem encryption"; + mainProgram = "fscryptctl"; + longDescription = '' + fscryptctl is a low-level tool written in C that handles raw keys and + manages policies for Linux filesystem encryption, specifically the + "fscrypt" kernel interface which is supported by the ext4, f2fs, and + UBIFS filesystems. + fscryptctl is mainly intended for embedded systems which can't use the + full-featured fscrypt tool, or for testing or experimenting with the + kernel interface to Linux filesystem encryption. fscryptctl does not + handle key generation, key stretching, key wrapping, or PAM integration. + Most users should use the fscrypt tool instead, which supports these + features and generally is much easier to use. + As fscryptctl is intended for advanced users, you should read the kernel + documentation for filesystem encryption before using fscryptctl. + ''; + inherit (finalAttrs.src.meta) homepage; + changelog = "https://github.com/google/fscryptctl/blob/master/NEWS.md"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ primeos ]; + }; +}) diff --git a/pkgs/by-name/fs/fsnotifier/package.nix b/pkgs/by-name/fs/fsnotifier/package.nix index 2b48dfe15ed91..3c21479508974 100644 --- a/pkgs/by-name/fs/fsnotifier/package.nix +++ b/pkgs/by-name/fs/fsnotifier/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "JetBrains"; repo = "intellij-community"; rev = "0f6d9ccb67b8fcad0d802cd76209d503c4ed66a6"; - sha256 = "3TAiVvKi50JQRrVG6J7LUJKTiuOTDyKt4DhoA1QmbrM="; + hash = "sha256-3TAiVvKi50JQRrVG6J7LUJKTiuOTDyKt4DhoA1QmbrM="; sparseCheckout = [ "native/fsNotifier/linux" ]; }; diff --git a/pkgs/by-name/ft/ftgl/package.nix b/pkgs/by-name/ft/ftgl/package.nix new file mode 100644 index 0000000000000..ee2a3e2457bf2 --- /dev/null +++ b/pkgs/by-name/ft/ftgl/package.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, doxygen +, libglut +, freetype +, libGL +, libGLU +, pkg-config +, darwin +}: + +let + inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; +in +stdenv.mkDerivation rec { + pname = "ftgl"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "frankheckenbach"; + repo = "ftgl"; + rev = "v${version}"; + hash = "sha256-6TDNGoMeBLnucmHRgEDIVWcjlJb7N0sTluqBwRMMWn4="; + }; + + # GL_DYLIB is hardcoded to an impure path + # /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib + # and breaks build on recent macOS versions + postPatch = '' + substituteInPlace m4/gl.m4 \ + --replace ' -dylib_file $GL_DYLIB: $GL_DYLIB' "" + ''; + + nativeBuildInputs = [ + autoreconfHook + doxygen + pkg-config + ]; + buildInputs = [ + freetype + ] ++ (if stdenv.hostPlatform.isDarwin then [ + OpenGL + GLUT + ] else [ + libGL + libGLU + libglut + ]); + + configureFlags = [ + "--with-ft-prefix=${lib.getDev freetype}" + ]; + + enableParallelBuilding = true; + + postInstall = '' + install -Dm644 src/FTSize.h -t ${placeholder "out"}/include/FTGL + install -Dm644 src/FTFace.h -t ${placeholder "out"}/include/FTGL + ''; + + meta = with lib; { + homepage = "https://github.com/frankheckenbach/ftgl"; + description = "Font rendering library for OpenGL applications"; + longDescription = '' + FTGL is a free cross-platform Open Source C++ library that uses Freetype2 + to simplify rendering fonts in OpenGL applications. FTGL supports bitmaps, + pixmaps, texture maps, outlines, polygon mesh, and extruded polygon + rendering modes. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/ft/ftjam/package.nix b/pkgs/by-name/ft/ftjam/package.nix new file mode 100644 index 0000000000000..7bfdc5f804a48 --- /dev/null +++ b/pkgs/by-name/ft/ftjam/package.nix @@ -0,0 +1,117 @@ +{ + lib, + bison, + buildPackages, + fetchurl, + installShellFiles, + pkgsBuildTarget, + stdenv, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ftjam"; + version = "2.5.2"; + + src = fetchurl { + url = "https://downloads.sourceforge.net/project/freetype/ftjam/${finalAttrs.version}/ftjam-${finalAttrs.version}.tar.bz2"; + hash = "sha256-6JdzUAqSkS3pGOn+v/q+S2vOedaa8ZRDX04DK4ptZqM="; + }; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ + bison + installShellFiles + ]; + + # Doesn't understand how to cross compile once bootstrapped, so we'll just use + # the Makefile for the bootstrapping portion + configurePlatforms = [ + "build" + "target" + ]; + + configureFlags = [ + "CC=${buildPackages.stdenv.cc.targetPrefix}cc" + "--host=${stdenv.buildPlatform.config}" + ]; + + makeFlags = [ + "CC=${buildPackages.stdenv.cc.targetPrefix}cc" + ]; + + env = { + LOCATE_TARGET = "bin.unix"; + # Jam uses c89 conventions + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=c89"; + }; + + enableParallelBuilding = true; + + strictDeps = true; + + # Jambase expects ar to have flags. + preConfigure = '' + export AR="$AR rc" + ''; + + # When cross-compiling, we need to set the preprocessor macros + # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the host + # platform. This looks a little ridiculous because the vast majority of build + # tools don't embed target-specific information into their binary, but in this + # case we behave more like a compiler than a make(1)-alike. + postPatch = + '' + substituteInPlace Jamfile \ + --replace "strip" "${stdenv.cc.targetPrefix}strip" + '' + + lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' + cat >>jam.h <<EOF + #undef OSMAJOR + #undef OSMINOR + #undef OSPLAT + $( + ${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc -E -dM jam.h | grep -E '^#define (OSMAJOR|OSMINOR|OSPLAT) ' + ) + EOF + ''; + + buildPhase = '' + runHook preBuild + make $makeFlags jam0 + ./jam0 -j$NIX_BUILD_CORES -sCC=${buildPackages.stdenv.cc.targetPrefix}cc jambase.c + ./jam0 -j$NIX_BUILD_CORES + runHook postBuild + ''; + + # The configure script does not recognize --docdir; because of it, the outputs + # can't be split + installPhase = '' + runHook preInstall + + installBin bin.unix/jam + install -Dm644 -t ''${!outputDoc}/share/doc/jam-${finalAttrs.version}/ *.html + + runHook postInstall + ''; + + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "jam -v"; + }; + }; + + meta = { + homepage = "https://freetype.org/jam/"; + description = "FreeType's enhanced, backwards-compatible Jam clone"; + license = lib.licenses.free; + mainProgram = "jam"; + maintainers = with lib.maintainers; [ + impl + AndersonTorres + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/development/tools/literate-programming/funnelweb/default.nix b/pkgs/by-name/fu/funnelweb/package.nix similarity index 100% rename from pkgs/development/tools/literate-programming/funnelweb/default.nix rename to pkgs/by-name/fu/funnelweb/package.nix diff --git a/pkgs/by-name/fu/furmark/package.nix b/pkgs/by-name/fu/furmark/package.nix index c3e84546f826b..adc2f9dc66d41 100644 --- a/pkgs/by-name/fu/furmark/package.nix +++ b/pkgs/by-name/fu/furmark/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGL libGLU - ] ++ lib.optionals stdenv.isAarch64 [ libxcrypt-legacy ]; + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ libxcrypt-legacy ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index b121a091de5d1..47917784aa79c 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "furnace"; - version = "0.6.5"; + version = "0.6.7"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-szDRaujlstRHbvuddi8HdYb00uHNyvAz+/Ex1mKfMXY="; + hash = "sha256-G5yjqsep+hDGXCqGNBKoMvV7JOD7ZZTxTPBl9VmG8RM="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' @@ -88,8 +88,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_GLES" (withGL && preferGLES)) (lib.cmakeBool "WITH_RENDER_METAL" false) # fails to build (lib.cmakeBool "WITH_RENDER_OPENGL1" (withGL && !preferGLES)) - # New l10n code still has some fortify bugs - (lib.cmakeBool "WARNINGS_ARE_ERRORS" false) (lib.cmakeBool "FORCE_APPLE_BIN" true) ]; diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index f366b9290a966..523253607e852 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -67,7 +67,7 @@ let haveDell = isx86; # only redfish for x86_64 - haveRedfish = stdenv.isx86_64; + haveRedfish = stdenv.hostPlatform.isx86_64; # only use msr if x86 (requires cpuid) haveMSR = isx86; @@ -121,7 +121,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.24"; + version = "1.9.25"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-jAR/c8hedprteCj5wrjST4yo8TxJ4JmLbPXSwBO3gJs="; + hash = "sha256-Yfj2Usto4BSnnBSvffdF02UeK4Ys8ZKzEsxrd2/XZe8="; }; patches = [ diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix index a2e2e3826543b..fafe2a36a3bee 100644 --- a/pkgs/by-name/fy/fyne/package.nix +++ b/pkgs/by-name/fy/fyne/package.nix @@ -40,7 +40,7 @@ buildGoModule rec { libXrandr libXxf86vm ] - ++ (lib.optionals stdenv.isDarwin ( + ++ (lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ Carbon diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/by-name/g-/g-wrap/package.nix similarity index 100% rename from pkgs/development/tools/guile/g-wrap/default.nix rename to pkgs/by-name/g-/g-wrap/package.nix diff --git a/pkgs/by-name/g3/g3kb-switch/package.nix b/pkgs/by-name/g3/g3kb-switch/package.nix index 75e8e010503c4..49ccd04573dad 100644 --- a/pkgs/by-name/g3/g3kb-switch/package.nix +++ b/pkgs/by-name/g3/g3kb-switch/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "lyokha"; repo = "g3kb-switch"; rev = version; - sha256 = "sha256-kTJfV0xQmWuxibUlfC1qJX2J2nrZ4wimdf/nGciQq0Y="; + hash = "sha256-kTJfV0xQmWuxibUlfC1qJX2J2nrZ4wimdf/nGciQq0Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ga/galculator/package.nix b/pkgs/by-name/ga/galculator/package.nix new file mode 100644 index 0000000000000..b1f45a1432d93 --- /dev/null +++ b/pkgs/by-name/ga/galculator/package.nix @@ -0,0 +1,69 @@ +{ + lib, + autoreconfHook, + fetchFromGitHub, + fetchpatch2, + flex, + gtk3, + intltool, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "galculator"; + version = "2.1.4"; + + src = fetchFromGitHub { + owner = "galculator"; + repo = "galculator"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XLDQdUGin7b9SgYV1kwMChBF+l0mYc9sAscY4YRZEGA="; + }; + + patches = [ + # Pul patch pending upstream inclusion for -fno-common toolchain support: + # https://github.com/galculator/galculator/pull/45 + (fetchpatch2 { + name = "fno-common.patch"; + url = "https://github.com/galculator/galculator/commit/501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6.patch"; + hash = "sha256-qVJHcfJTtl0hK8pzSp6MjhYAh1NbIIWr3rBDodIYBvk="; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + flex + intltool + pkg-config + ]; + + buildInputs = [ + gtk3 + ]; + + # BUG: when set as true, complains with: + # configure.in:76: error: possibly undefined macro: AM_GLIB_GNU_GETTEXT + strictDeps = false; + + meta = { + homepage = "http://galculator.sourceforge.net/"; + description = "GTK algebraic and RPN calculator"; + longDescription = '' + galculator is a GTK-based calculator. Its main features include: + + - Algebraic, RPN (Reverse Polish Notation), Formula Entry and Paper modes; + - Basic and Scientific Modes + - Decimal, hexadecimal, octal and binary number base + - Radiant, degree and grad support + - User defined constants and functions + - A bunch of common functions + - Binary arithmetic of configurable bit length and signedness + - Quad-precision floating point arithmetic, and 112-bit binary arithmetic + ''; + license = lib.licenses.gpl2Plus; + mainProgram = "galculator"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (gtk3.meta) platforms; + }; +}) diff --git a/pkgs/by-name/ga/gambit-project/package.nix b/pkgs/by-name/ga/gambit-project/package.nix index 630549a59caa4..1c254e0251906 100644 --- a/pkgs/by-name/ga/gambit-project/package.nix +++ b/pkgs/by-name/ga/gambit-project/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optional withGui wxGTK31 - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; strictDeps = true; diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 3c31cf6cf4352..02451f7774807 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -33,6 +33,7 @@ , lib , makeBinaryWrapper , nix-update-script +, writeShellScriptBin , enableExecutable ? true , enableWsi ? true }: @@ -46,14 +47,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.15.2"; + version = "3.15.11"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-g6H68dYMmpQYlwhZ6b84yY/qbAP18iNrmYOWf9rL5gc="; + hash = "sha256-O2pxaPDwEr9ko7Zplv65qRUDzIk1Q54Q7Rgs94VkTII="; }; patches = [ @@ -98,6 +99,9 @@ stdenv.mkDerivation (finalAttrs: { edid-decode # For OpenVR cmake + + # calls git describe to encode its own version into the build + (writeShellScriptBin "git" "echo ${finalAttrs.version}") ] ++ lib.optionals enableExecutable [ makeBinaryWrapper glslang diff --git a/pkgs/by-name/ga/gancio/package.json b/pkgs/by-name/ga/gancio/package.json new file mode 100644 index 0000000000000..fcc48351ed9e2 --- /dev/null +++ b/pkgs/by-name/ga/gancio/package.json @@ -0,0 +1,145 @@ +{ + "name": "gancio", + "version": "1.19.4", + "description": "A shared agenda for local communities", + "author": "lesion", + "scripts": { + "build": "nuxt build --modern", + "start:inspect": "NODE_ENV=production node --inspect node_modules/.bin/nuxt start --modern", + "dev": "nuxt dev", + "dev:inspect": "node --inspect node_modules/.bin/nuxt dev", + "test-sqlite": "export NODE_ENV=test; export DB=sqlite; jest --forceExit --runInBand --bail=1 --testTimeout=10000", + "test-mariadb": "export NODE_ENV=test; export DB=mariadb; jest --runInBand --bail=1", + "test-postgresql": "export NODE_ENV=test; export DB=postgresql; jest --runInBand --bail=1", + "start": "nuxt start --modern", + "doc": "cd docs && bundle exec jekyll b", + "doc:dev": "cd docs && bundle exec jekyll s --drafts", + "migrate": "NODE_ENV=production sequelize db:migrate", + "migrate:dev": "sequelize db:migrate", + "analyze": "nuxt build --analyze", + "build:wc": "cd webcomponents; yarn build:lib; cp dist/gancio-events.js ../wp-plugin/js/gancio-events.es.js; cp dist/gancio-events.js ../assets/gancio-events.es.js; cp dist/gancio-events.js ../docs/assets/js/gancio-events.es.js; cp dist/gancio-events.js ../static/gancio-events.es.js;" + }, + "files": [ + "server/", + "assets/", + "modules/", + "nuxt.config.js", + "static/", + "views/", + "locales/email/", + "locales/", + "store/", + ".nuxt/", + "gancio_plugins", + "yarn.lock" + ], + "engines": { + "node": ">=14 <=22" + }, + "dependencies": { + "@mdi/js": "^7.4.47", + "@nuxtjs/auth": "^4.9.1", + "@nuxtjs/axios": "^5.13.6", + "@nuxtjs/i18n": "^7.3.1", + "@nuxtjs/sitemap": "^2.4.0", + "@peertube/http-signature": "^1.7.0", + "accept-language": "^3.0.18", + "bcryptjs": "^2.4.3", + "body-parser": "^2.0.0-beta.2", + "cookie-parser": "^1.4.6", + "cookie-session": "^2.1.0", + "cookie-universal-nuxt": "^2.2.2", + "cors": "^2.8.5", + "dayjs": "^1.11.11", + "dompurify": "^3.1.5", + "email-templates": "^11.1.1", + "express": "^4.19.2", + "express-async-errors": "^3.1.1", + "express-rate-limit": "^7.3.1", + "https-proxy-agent": "^7.0.4", + "ical.js": "^2.0.1", + "ics": "^3.7.6", + "jsdom": "^24.1.0", + "leaflet": "^1.9.4", + "linkify-html": "^4.1.3", + "linkifyjs": "4.1.3", + "lodash": "^4.17.21", + "luxon": "^3.4.4", + "mariadb": "^2.5.6", + "memory-cache": "^0.2.0", + "microformat-node": "^2.0.4", + "minify-css-string": "^1.0.0", + "mkdirp": "^3.0.1", + "multer": "^1.4.5-lts.1", + "nuxt-edge": "2.17.2-28258581.6132947", + "oauth2orize": "^1.12.0", + "passport": "^0.7.0", + "passport-anonymous": "^1.0.1", + "passport-custom": "^1.1.1", + "passport-http": "^0.3.0", + "passport-http-bearer": "^1.0.1", + "passport-oauth2-client-password": "^0.1.2", + "passport-oauth2-client-public": "^0.0.1", + "pg": "^8.12.0", + "semver": "^7.6.2", + "sequelize": "^6.37.3", + "sequelize-slugify": "^1.6.2", + "sharp": "^0.27.2", + "sqlite3": "^5.1.7", + "telegraf": "^4.16.3", + "tiptap": "^1.32.2", + "tiptap-extensions": "^1.35.2", + "umzug": "^2.3.0", + "v-calendar": "^2.4.2", + "vue2-leaflet": "^2.7.1", + "vuetify": "2.6.14", + "winston": "^3.13.0", + "winston-daily-rotate-file": "^5.0.0", + "yargs": "^17.7.2" + }, + "devDependencies": { + "@nuxtjs/vuetify": "^1.12.3", + "@vue/language-plugin-pug": "^1.8.27", + "jest": "^29.7.0", + "jest-environment-node": "^29.7.0", + "prettier": "^2.8.8", + "pug": "^3.0.3", + "pug-plain-loader": "^1.1.0", + "sass": "^1.77.6", + "sequelize-cli": "^6.6.2", + "supertest": "^6.3.4", + "webpack": "^4.47.0", + "webpack-cli": "^4.10.0" + }, + "resolutions": { + "vue": "2.7.16", + "vue-template-compiler": "2.7.16", + "vue-server-renderer": "2.7.16" + }, + "bin": { + "gancio": "server/cli.js" + }, + "bugs": { + "email": "lesion@autistici.org", + "url": "https://framagit.org/les/gancio/issues" + }, + "homepage": "https://gancio.org", + "keywords": [ + "AP", + "gancio", + "events", + "federation", + "activitypub", + "event", + "server", + "self-host", + "app" + ], + "license": "AGPL-3.0", + "repository": { + "type": "git", + "url": "https://framagit.org/les/gancio" + }, + "snyk": true, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" +} diff --git a/pkgs/by-name/ga/gancio/package.nix b/pkgs/by-name/ga/gancio/package.nix new file mode 100644 index 0000000000000..d0b4dfff9f19f --- /dev/null +++ b/pkgs/by-name/ga/gancio/package.nix @@ -0,0 +1,101 @@ +{ + mkYarnPackage, + fetchFromGitLab, + fetchYarnDeps, + python3, + pkg-config, + nodePackages, + node-gyp, + vips, + lib, + nixosTests, +}: +mkYarnPackage rec { + inherit (nodePackages) nodejs; + version = "1.19.4"; + + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "les"; + repo = "gancio"; + rev = "v${version}"; + hash = "sha256-x8s7eBVmHCY3kAjHjACotCncvZq6OBiLPJGF6hvfawE="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-LXeAyxZSZOm6GxRuJb5rlHTlQpYa1fdKSENVjwLY4tU="; + }; + + packageJSON = ./package.json; + + # for pkg-config dependencies: + yarnPreBuild = '' + export npm_config_nodedir=${nodePackages.nodejs} + ''; + # So that sqlite can be found: + pkgConfig.sqlite3 = { + nativeBuildInputs = [ + pkg-config + nodePackages.prebuild-install + node-gyp + python3 + ]; + postInstall = '' + yarn --offline run install + ''; + }; + # Sharp need to find a vips library + pkgConfig.sharp = { + nativeBuildInputs = [ + pkg-config + python3 + node-gyp + nodePackages.semver + ]; + buildInputs = [ vips ]; + postInstall = '' + yarn --offline run install + ''; + }; + + # build need a writeable node_modules + configurePhase = '' + runHook preConfigure + + cp -r $node_modules node_modules + chmod -R +w node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + yarn --offline build + yarn --offline pack --filename gancio.tgz + mkdir -p deps/gancio + tar -C deps/gancio/ --strip-components=1 -xf gancio.tgz + rm gancio.tgz + + runHook postBuild + ''; + + passthru = { + updateScript = ./update.sh; + tests = { + inherit (nixosTests) gancio; + }; + }; + + meta = { + description = "Shared agenda for local communities, running on nodejs"; + homepage = "https://gancio.org/"; + changelog = "https://framagit.org/les/gancio/-/raw/master/CHANGELOG.md"; + license = lib.licenses.agpl3Plus; + platforms = lib.platforms.linux; + mainProgram = "gancio"; + maintainers = with lib.maintainers; [ jbgi ]; + }; +} diff --git a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix new file mode 100644 index 0000000000000..519b7a1347b00 --- /dev/null +++ b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix @@ -0,0 +1,45 @@ +{ + mkYarnPackage, + nodejs, + fetchFromGitLab, + fetchYarnDeps, + lib, +}: +mkYarnPackage rec { + inherit nodejs; + version = "1.0.4"; + + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "bcn.convocala"; + repo = "gancio-plugin-telegram-bridge"; + rev = "v${version}"; + hash = "sha256-Da8PxCX1Z1dKJu9AiwdRDfb1r1P2KiZe8BClYB9Rz48="; + }; + + offlineCache = fetchYarnDeps { + inherit yarnLock; + hash = "sha256-BcRVmVA5pnFzpg2gN/nKLzENnoEdwrE0EgulDizq8Ok="; + }; + + packageJSON = ./package.json; + + # upstream doesn't provide a yarn.lock file + yarnLock = ./yarn.lock; + + doDist = false; + + postInstall = '' + rmdir $out/bin + ln -s $out/libexec/gancio-plugin-telegram/deps/gancio-plugin-telegram/index.js $out/ + ln -s $out/libexec/gancio-plugin-telegram/node_modules $out/ + ''; + + meta = { + description = "Telegram bridge for Gancio, republishes content to Telegram channels or groups"; + homepage = "https://framagit.org/bcn.convocala/gancio-plugin-telegram-bridge"; + license = lib.licenses.agpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jbgi ]; + }; +} diff --git a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/package.json b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/package.json new file mode 100644 index 0000000000000..83e9d58228a65 --- /dev/null +++ b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/package.json @@ -0,0 +1,16 @@ +{ + "name": "gancio-plugin-telegram", + "version": "1.0.1", + "description": "Telegram bridge plugin for Gancio", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "AGPL-3.0-or-later", + "dependencies": { + "telegraf": "^4.8.5", + "dompurify": "^3.0.2", + "jsdom": "^21.1.0" + } +} diff --git a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/yarn.lock b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/yarn.lock new file mode 100644 index 0000000000000..92541abddcb84 --- /dev/null +++ b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/yarn.lock @@ -0,0 +1,452 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@telegraf/types@^6.9.1": + version "6.9.1" + resolved "https://registry.yarnpkg.com/@telegraf/types/-/types-6.9.1.tgz#ee2d335164f582db55337d77cc440c1faeadd510" + integrity sha512-bzqwhicZq401T0e09tu8b1KvGfJObPmzKU/iKCT5V466AsAZZWQrBYQ5edbmD1VZuHLEwopoOVY5wPP4HaLtug== + +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== + +abab@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== + +abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + +acorn-globals@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3" + integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q== + dependencies: + acorn "^8.1.0" + acorn-walk "^8.0.2" + +acorn-walk@^8.0.2: + version "8.3.1" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.1.tgz#2f10f5b69329d90ae18c58bf1fa8fccd8b959a43" + integrity sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw== + +acorn@^8.1.0, acorn@^8.8.2: + version "8.11.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" + integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== + +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +cssstyle@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a" + integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg== + dependencies: + rrweb-cssom "^0.6.0" + +data-urls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4" + integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g== + dependencies: + abab "^2.0.6" + whatwg-mimetype "^3.0.0" + whatwg-url "^12.0.0" + +debug@4, debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +decimal.js@^10.4.3: + version "10.4.3" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" + integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + +domexception@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" + integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== + dependencies: + webidl-conversions "^7.0.0" + +dompurify@^3.0.2: + version "3.0.8" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.8.tgz#e0021ab1b09184bc8af7e35c7dd9063f43a8a437" + integrity sha512-b7uwreMYL2eZhrSCRC4ahLTeZcPZxSmYfmcQGXGkXiZSNW1X85v+SDM5KsWcpivIiUBH47Ji7NtyUdpLeF5JZQ== + +entities@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== + +escodegen@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17" + integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w== + dependencies: + esprima "^4.0.1" + estraverse "^5.2.0" + esutils "^2.0.2" + optionalDependencies: + source-map "~0.6.1" + +esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +estraverse@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +event-target-shim@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +html-encoding-sniffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" + integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== + dependencies: + whatwg-encoding "^2.0.0" + +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== + dependencies: + "@tootallnate/once" "2" + agent-base "6" + debug "4" + +https-proxy-agent@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== + dependencies: + agent-base "6" + debug "4" + +iconv-lite@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== + +jsdom@^21.1.0: + version "21.1.2" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.1.2.tgz#6433f751b8718248d646af1cdf6662dc8a1ca7f9" + integrity sha512-sCpFmK2jv+1sjff4u7fzft+pUh2KSUbUrEHYHyfSIbGTIcmnjyp83qg6qLwdJ/I3LpTXx33ACxeRL7Lsyc6lGQ== + dependencies: + abab "^2.0.6" + acorn "^8.8.2" + acorn-globals "^7.0.0" + cssstyle "^3.0.0" + data-urls "^4.0.0" + decimal.js "^10.4.3" + domexception "^4.0.0" + escodegen "^2.0.0" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.4" + parse5 "^7.1.2" + rrweb-cssom "^0.6.0" + saxes "^6.0.0" + symbol-tree "^3.2.4" + tough-cookie "^4.1.2" + w3c-xmlserializer "^4.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^12.0.1" + ws "^8.13.0" + xml-name-validator "^4.0.0" + +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +mri@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" + integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA== + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +node-fetch@^2.6.8: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== + dependencies: + whatwg-url "^5.0.0" + +nwsapi@^2.2.4: + version "2.2.7" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" + integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== + +p-timeout@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-4.1.0.tgz#788253c0452ab0ffecf18a62dff94ff1bd09ca0a" + integrity sha512-+/wmHtzJuWii1sXn3HCuH/FTwGhrp4tmJTxSKJbfS+vkipci6osxXM5mY0jUiRzWKMTgUT8l7HFbeSwZAynqHw== + +parse5@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + dependencies: + entities "^4.4.0" + +psl@^1.1.33: + version "1.9.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" + integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== + +punycode@^2.1.1, punycode@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" + integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== + +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + +rrweb-cssom@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1" + integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw== + +safe-compare@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/safe-compare/-/safe-compare-1.1.4.tgz#5e0128538a82820e2e9250cd78e45da6786ba593" + integrity sha512-b9wZ986HHCo/HbKrRpBJb2kqXMK9CEWIE1egeEvZsYn69ay3kdfl9nG3RyOcR+jInTDf7a86WQ1d4VJX7goSSQ== + dependencies: + buffer-alloc "^1.2.0" + +"safer-buffer@>= 2.1.2 < 3.0.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sandwich-stream@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/sandwich-stream/-/sandwich-stream-2.0.2.tgz#6d1feb6cf7e9fe9fadb41513459a72c2e84000fa" + integrity sha512-jLYV0DORrzY3xaz/S9ydJL6Iz7essZeAfnAavsJ+zsJGZ1MOnsS52yRjU3uF3pJa/lla7+wisp//fxOwOH8SKQ== + +saxes@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" + integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== + dependencies: + xmlchars "^2.2.0" + +source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + +telegraf@^4.8.5: + version "4.15.3" + resolved "https://registry.yarnpkg.com/telegraf/-/telegraf-4.15.3.tgz#72e28e62c3cc7f97b88b5f1b04a0e0700a7df251" + integrity sha512-pm2ZQAisd0YlUvnq6xdymDfoQR++8wTalw0nfw7Tjy0va+V/0HaBLzM8kMNid8pbbt7GHTU29lEyA5CAAr8AqA== + dependencies: + "@telegraf/types" "^6.9.1" + abort-controller "^3.0.0" + debug "^4.3.4" + mri "^1.2.0" + node-fetch "^2.6.8" + p-timeout "^4.1.0" + safe-compare "^1.1.4" + sandwich-stream "^2.0.2" + +tough-cookie@^4.1.2: + version "4.1.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + +tr46@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469" + integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw== + dependencies: + punycode "^2.3.0" + +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== + +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + +w3c-xmlserializer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" + integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== + dependencies: + xml-name-validator "^4.0.0" + +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== + +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + +whatwg-encoding@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" + integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== + dependencies: + iconv-lite "0.6.3" + +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== + +whatwg-url@^12.0.0, whatwg-url@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c" + integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ== + dependencies: + tr46 "^4.1.1" + webidl-conversions "^7.0.0" + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + +ws@^8.13.0: + version "8.16.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" + integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== + +xml-name-validator@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" + integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== + +xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== diff --git a/pkgs/by-name/ga/gancio/plugins.nix b/pkgs/by-name/ga/gancio/plugins.nix new file mode 100644 index 0000000000000..c3816f7e2a5e3 --- /dev/null +++ b/pkgs/by-name/ga/gancio/plugins.nix @@ -0,0 +1,4 @@ +{ callPackage, nodejs }: +{ + telegram-bridge = callPackage ./plugin-telegram-bridge { inherit nodejs; }; +} diff --git a/pkgs/by-name/ga/gancio/update.sh b/pkgs/by-name/ga/gancio/update.sh new file mode 100755 index 0000000000000..732f39f3ca36f --- /dev/null +++ b/pkgs/by-name/ga/gancio/update.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts jq nix prefetch-yarn-deps + +set -eux -o pipefail + +latest_version=$(curl -s https://framagit.org/api/v4/projects/48668/repository/tags | jq --raw-output '.[0].name' | sed 's/^v//') + +nixFile=$(nix-instantiate --eval --strict -A "gancio.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') +nixFolder=$(dirname "$nixFile") + +curl -o "$nixFolder/package.json" -s "https://framagit.org/les/gancio/-/raw/v$latest_version/package.json" +curl -o "$nixFolder/yarn.lock" -s "https://framagit.org/les/gancio/-/raw/v$latest_version/yarn.lock" + +old_yarn_hash=$(nix-instantiate --eval --strict -A "gancio.offlineCache.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g') +new_yarn_hash=$(nix hash to-sri --type sha256 $(prefetch-yarn-deps "$nixFolder/yarn.lock")) +sed -i "$nixFile" -re "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|" +rm "$nixFolder/yarn.lock" + +update-source-version gancio "$latest_version" diff --git a/pkgs/by-name/ga/gapcast/package.nix b/pkgs/by-name/ga/gapcast/package.nix new file mode 100644 index 0000000000000..c68e19f64022d --- /dev/null +++ b/pkgs/by-name/ga/gapcast/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + libpcap, + xorg, +}: + +buildGoModule rec { + pname = "gapcast"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "ANDRVV"; + repo = "gapcast"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ei5XfcnbUoegB8lNEEQ3PrCzNJGaVeVd2lfrMWYoODw="; + }; + + vendorHash = "sha256-jn0zTorp/rkd91+ZGDbsNVcTxEndFMMrsb+/dGrZcy4="; + + buildInputs = [ + libpcap + xorg.libX11 + ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "802.11 broadcast analyzer & injector"; + homepage = "https://github.com/ANDRVV/gapcast"; + changelog = "https://github.com/ANDRVV/gapcast/releases/tag/v${version}"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "gapcast"; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix index 775b09ae42992..da55f8db87698 100644 --- a/pkgs/by-name/ga/gate/package.nix +++ b/pkgs/by-name/ga/gate/package.nix @@ -5,7 +5,7 @@ let pname = "gate"; - version = "0.39.2"; + version = "0.41.0"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "minekube"; repo = "gate"; rev = "refs/tags/v${version}"; - hash = "sha256-ocstveux4nSev6jUx0niGxjKk0ljEhhagmHpUKncrQY="; + hash = "sha256-tQO1ClfZasRdnazFOMOWeqnXaEda84lQMQKw5640YCI="; }; - vendorHash = "sha256-e+XIftRRP0Dig6nIRdxE1x60RU8oXChTyyLIEGOQ5Yc="; + vendorHash = "sha256-Nl6NGz+sEdwcTzbL+OwHuaQzi2lHX/cN2lE6HNi1uJQ="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix index a7d2ae07a5f42..10ff2d7365748 100644 --- a/pkgs/by-name/ga/gatus/package.nix +++ b/pkgs/by-name/ga/gatus/package.nix @@ -1,26 +1,34 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, +}: buildGoModule rec { pname = "gatus"; - version = "5.12.0"; + version = "5.12.1"; src = fetchFromGitHub { owner = "TwiN"; repo = "gatus"; rev = "v${version}"; - hash = "sha256-fxRHO37lxFb/rGr3TWLR817sNXaSClucuVtI1XgWrgM="; + hash = "sha256-K9jEepcxfV1sAC3YKqkvDA9HHlobksJPwsAcqD3gcmQ="; }; vendorHash = "sha256-jRRFj4NdxsjC9CM+Vm5+gV0ZMbz45YtGyE3FaGaGp28="; subPackages = [ "." ]; - meta = with lib; - { - description = "Automated developer-oriented status page"; - homepage = "https://gatus.io"; - license = licenses.asl20; - maintainers = with maintainers; [ undefined-moe ]; - mainProgram = "gatus"; - }; + passthru.tests = { + inherit (nixosTests) gatus; + }; + + meta = with lib; { + description = "Automated developer-oriented status page"; + homepage = "https://gatus.io"; + license = licenses.asl20; + maintainers = with maintainers; [ undefined-moe ]; + mainProgram = "gatus"; + }; } diff --git a/pkgs/by-name/ga/gavin-bc/package.nix b/pkgs/by-name/ga/gavin-bc/package.nix new file mode 100644 index 0000000000000..58c9ce61033d2 --- /dev/null +++ b/pkgs/by-name/ga/gavin-bc/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitea +, editline +, readline +, historyType ? "internal" +, predefinedBuildType ? "BSD" +}: + +assert lib.elem historyType [ "editline" "readline" "internal" ]; +assert lib.elem predefinedBuildType [ "BSD" "GNU" "GDH" "DBG" "" ]; +stdenv.mkDerivation (finalAttrs: { + pname = "gavin-bc"; + version = "6.5.0"; + + src = fetchFromGitea { + domain = "git.gavinhoward.com"; + owner = "gavin"; + repo = "bc"; + rev = finalAttrs.version; + hash = "sha256-V0L5OmpcI0Zu5JvESjuhp4wEs5Bu/CvjF6B5WllTEqo="; + }; + + buildInputs = + (lib.optional (historyType == "editline") editline) + ++ (lib.optional (historyType == "readline") readline); + + configureFlags = [ + "--disable-nls" + ] + ++ (lib.optional (predefinedBuildType != "") "--predefined-build-type=${predefinedBuildType}") + ++ (lib.optional (historyType == "editline") "--enable-editline") + ++ (lib.optional (historyType == "readline") "--enable-readline") + ++ (lib.optional (historyType == "internal") "--enable-internal-history"); + + meta = { + homepage = "https://git.gavinhoward.com/gavin/bc"; + description = "Gavin Howard's BC calculator implementation"; + changelog = "https://git.gavinhoward.com/gavin/bc/raw/tag/${finalAttrs.version}/NEWS.md"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; + }; +}) +# TODO: cover most of configure settings diff --git a/pkgs/tools/misc/gay/default.nix b/pkgs/by-name/ga/gay/package.nix similarity index 100% rename from pkgs/tools/misc/gay/default.nix rename to pkgs/by-name/ga/gay/package.nix diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix index 954128a40ba1a..20c52faeb4e6e 100644 --- a/pkgs/by-name/gc/gcs/package.nix +++ b/pkgs/by-name/gc/gcs/package.nix @@ -3,6 +3,8 @@ buildGoModule, buildNpmPackage, fetchFromGitHub, + cacert, + unzip, pkg-config, libGL, libX11, @@ -20,13 +22,28 @@ buildGoModule rec { pname = "gcs"; - version = "5.21.0"; + version = "5.27.0"; src = fetchFromGitHub { owner = "richardwilkes"; repo = "gcs"; - rev = "v${version}"; - hash = "sha256-mes1aXh4R1re4sW3xYDWtSIcW7lwkWoAxbcbdyT/W+o="; + rev = "refs/tags/v${version}"; + + nativeBuildInputs = [ + cacert + unzip + ]; + + # also fetch pdf.js files + # note: the version is locked in the file + postFetch = '' + cd $out/server/pdf + substituteInPlace refresh-pdf.js.sh \ + --replace-fail '/bin/rm' 'rm' + . refresh-pdf.js.sh + ''; + + hash = "sha256-QVkyemBQ7RrV3dpP3n7Pg0XljdxWtCphZIj2T77nKtU="; }; modPostBuild = '' @@ -34,15 +51,14 @@ buildGoModule rec { sed -i 's|-lmupdf[^ ]* |-lmupdf |g' vendor/github.com/richardwilkes/pdf/pdf.go ''; - vendorHash = "sha256-H5GCrrqmDwpCneXawu7kZsRfrQ8hcsbqhpAAG6FCawg="; + vendorHash = "sha256-+vCc1g5noAl/iwEYhNZJYPiScKqKGKlsuruoUO/4tiU="; frontend = buildNpmPackage { name = "${pname}-${version}-frontend"; inherit src; sourceRoot = "${src.name}/server/frontend"; - - npmDepsHash = "sha256-wP6sjdcjljzmTs0GUMbF2BPo83LKpfdn15sUuMEIn6E="; + npmDepsHash = "sha256-VWTJg/pluRYVVBDiJ+t2uhyodRuIFfHpzCZMte1krDM="; installPhase = '' runHook preInstall @@ -71,7 +87,7 @@ buildGoModule rec { fontconfig freetype ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Carbon darwin.apple_sdk_11_0.frameworks.Cocoa darwin.apple_sdk_11_0.frameworks.Kernel @@ -92,7 +108,7 @@ buildGoModule rec { ''; meta = { - changelog = "https://github.com/richardwilkes/gcs/releases/tag/${src.rev}"; + changelog = "https://github.com/richardwilkes/gcs/releases/tag/v${version}"; description = "Stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system"; homepage = "https://gurpscharactersheet.com/"; license = lib.licenses.mpl20; @@ -100,6 +116,6 @@ buildGoModule rec { maintainers = with lib.maintainers; [ tomasajt ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; # incompatible vendor/github.com/richardwilkes/unison/internal/skia/libskia_linux.a - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/gd/gdlv/package.nix b/pkgs/by-name/gd/gdlv/package.nix new file mode 100644 index 0000000000000..3c7900c80a999 --- /dev/null +++ b/pkgs/by-name/gd/gdlv/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + AppKit, + CoreGraphics, + Foundation, + Metal, +}: +buildGoModule rec { + pname = "gdlv"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "aarzilli"; + repo = "gdlv"; + rev = "v${version}"; + hash = "sha256-6NU7bhURdXM4EjVnsXVf9XFOUgHyVEI0kr15q9OnUTQ="; + }; + + vendorHash = null; + subPackages = "."; + + preBuild = + lib.optionalString + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") + '' + export MACOSX_DEPLOYMENT_TARGET=10.15 + ''; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + AppKit + CoreGraphics + Foundation + Metal + ]; + + meta = with lib; { + description = "GUI frontend for Delve"; + mainProgram = "gdlv"; + homepage = "https://github.com/aarzilli/gdlv"; + maintainers = with maintainers; [ mmlb ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index 0055b0cd378be..ab29a466ad3a5 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -197,6 +197,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Program that manages graphical display servers and handles graphical user logins"; homepage = "https://gitlab.gnome.org/GNOME/gdm"; + changelog = "https://gitlab.gnome.org/GNOME/gdm/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix index 238e803cc8757..acaa80af9693e 100644 --- a/pkgs/by-name/ge/gearlever/package.nix +++ b/pkgs/by-name/ge/gearlever/package.nix @@ -16,18 +16,19 @@ appimage-run, gtk4, bintools, + libnotify, }: python3Packages.buildPythonApplication rec { pname = "gearlever"; - version = "2.0.6"; + version = "2.0.7"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "mijorus"; repo = "gearlever"; - rev = version; - hash = "sha256-+JuF0SL+2yVgkKPItt9Vq6SLcnxaMSWxIeVhY9XLX28="; + rev = "refs/tags/${version}"; + hash = "sha256-Zp0w6ZJFRV5IANF0sY/n8jqgG+3h9J2eV/dUP+we8PY="; }; postPatch = @@ -79,6 +80,7 @@ python3Packages.buildPythonApplication rec { desktop-file-utils # update-desktop-database gtk4.dev # gtk4-launch bintools # readelf + libnotify # notify-send ] }" ]; diff --git a/pkgs/by-name/ge/geary/package.nix b/pkgs/by-name/ge/geary/package.nix index 66f7bc222c27e..0b85d3af0776f 100644 --- a/pkgs/by-name/ge/geary/package.nix +++ b/pkgs/by-name/ge/geary/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/geary/${lib.versions.major version}/geary-${version}.tar.xz"; - sha256 = "r60VEwKBfd8Ji15BbnrH8tXupWejuAu5C9PGKv0TuaE="; + hash = "sha256-r60VEwKBfd8Ji15BbnrH8tXupWejuAu5C9PGKv0TuaE="; }; nativeBuildInputs = [ @@ -148,6 +148,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/geary"; + changelog = "https://gitlab.gnome.org/GNOME/geary/-/blob/${version}/NEWS?ref_type=tags"; description = "Mail client for GNOME 3"; maintainers = teams.gnome.members; license = licenses.lgpl21Plus; diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix index c6ab0bec46af4..7393705254d74 100644 --- a/pkgs/by-name/ge/geesefs/package.nix +++ b/pkgs/by-name/ge/geesefs/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -let version = "0.41.1"; +let version = "0.41.3"; in buildGoModule { pname = "geesefs"; inherit version; @@ -12,7 +12,7 @@ in buildGoModule { owner = "yandex-cloud"; repo = "geesefs"; rev = "v${version}"; - hash = "sha256-4uPq4NUd6upsOxuKAVqay7UTMfiHlCKwVvJed0jdeyc="; + hash = "sha256-KdxqOkz8U8ts/pU/sTMuDIBLxwvdtrkkGptYboh06Qo="; }; # hashes differ per architecture otherwise. diff --git a/pkgs/by-name/ge/geist-font/package.nix b/pkgs/by-name/ge/geist-font/package.nix index 34dd5dae26b8f..12ba112d04a91 100644 --- a/pkgs/by-name/ge/geist-font/package.nix +++ b/pkgs/by-name/ge/geist-font/package.nix @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation rec { description = "Font family created by Vercel in collaboration with Basement Studio"; homepage = "https://vercel.com/font"; license = lib.licenses.ofl; - maintainers = with lib.maintainers; [ eclairevoyant x0ba ]; + maintainers = with lib.maintainers; [ x0ba ]; platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix index f574f30a9c85b..d48e9b6ea9ac8 100644 --- a/pkgs/by-name/ge/gemmi/package.nix +++ b/pkgs/by-name/ge/gemmi/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gemmi"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "project-gemmi"; repo = "gemmi"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-S31oCp6kLSYgmRaW7Q9/dMhjJ5Y0sK3WPpg2/ZMPyMg="; + hash = "sha256-Y7gQSh9C7smoXuGWgpJI3hPIg06Jns+1dBpmMxuCrKE="; }; nativeBuildInputs = diff --git a/pkgs/by-name/ge/gen-license/package.nix b/pkgs/by-name/ge/gen-license/package.nix new file mode 100644 index 0000000000000..a69b44d784738 --- /dev/null +++ b/pkgs/by-name/ge/gen-license/package.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "gen-license"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "nexxeln"; + repo = "license-generator"; + rev = "${version}"; + hash = "sha256-VOmt8JXd2+ykhkhupv/I4RfXz9P0eEesW3JGAoXStUI="; + }; + + cargoHash = "sha256-TEsWACxEs4eJ8rO4RnKJWpwT1KcDoBEGftHSJt4YXVw="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Create licenses for your projects right from your terminal"; + mainProgram = "gen-license"; + homepage = "https://github.com/nexxeln/license-generator"; + license = licenses.mit; + maintainers = [ maintainers.ryanccn ]; + }; +} diff --git a/pkgs/by-name/ge/geo/package.nix b/pkgs/by-name/ge/geo/package.nix new file mode 100644 index 0000000000000..2edea658c43d6 --- /dev/null +++ b/pkgs/by-name/ge/geo/package.nix @@ -0,0 +1,50 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + testers, + geo, +}: + +buildGoModule rec { + pname = "geo"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "MetaCubeX"; + repo = "geo"; + rev = "v${version}"; + hash = "sha256-lwFBevf3iP90LgnfUqweCjPBJPr2vMFtRqQXXUC+cRA="; + }; + + postPatch = '' + substituteInPlace constant.go \ + --replace-fail 'Version = "0.1"' 'Version = "${version}"' + ''; + + vendorHash = "sha256-FXvuojlMZRzi8TIQ2aPiDH7F9c+2dpe4PYzYWljfUIc="; + + ldflags = [ + "-s" + "-w" + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = geo; + command = "${lib.getExe geo} --help"; + version = "v${version}"; + }; + }; + + meta = { + description = "Easy way to manage all your Geo resources"; + homepage = "https://github.com/MetaCubeX/geo"; + changelog = "https://github.com/MetaCubeX/geo/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ oluceps ]; + mainProgram = "geo"; + }; +} diff --git a/pkgs/by-name/ge/geopard/package.nix b/pkgs/by-name/ge/geopard/package.nix index 4562b95d442a9..348bd10500428 100644 --- a/pkgs/by-name/ge/geopard/package.nix +++ b/pkgs/by-name/ge/geopard/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) pname version src; + inherit (finalAttrs) src; hash = "sha256-YVbaXGGwQaqjUkA47ryW1VgJpZTx5ApRGdCcB5aA71M="; }; diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index e0b1f491aa157..76a68eea8c3a9 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: rec { src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - sha256 = "sha256-EmW3i0qi7P48AftCz7tqI2Wtvdy3cpyR57+s42dYwt8="; + hash = "sha256-EmW3i0qi7P48AftCz7tqI2Wtvdy3cpyR57+s42dYwt8="; }; patches = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: rec { installPhase = let inputs = finalAttrs.buildInputs or [ ]; - ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + ldLibraryPathEnvName = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' runHook preInstall diff --git a/pkgs/by-name/ge/gepetto-viewer-corba/package.nix b/pkgs/by-name/ge/gepetto-viewer-corba/package.nix new file mode 100644 index 0000000000000..1760bea79abbe --- /dev/null +++ b/pkgs/by-name/ge/gepetto-viewer-corba/package.nix @@ -0,0 +1,69 @@ +{ + boost, + cmake, + doxygen, + fetchFromGitHub, + fontconfig, + gepetto-viewer, + lib, + pkg-config, + python3Packages, + libsForQt5, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gepetto-viewer-corba"; + version = "5.8.0"; + pyproject = false; # CMake + + src = fetchFromGitHub { + owner = "gepetto"; + repo = "gepetto-viewer-corba"; + rev = "v${finalAttrs.version}"; + hash = "sha256-/bpAs4ca/+QjWEGuHhuDT8Ts2Ggg+DZWETZfjho6E0w="; + }; + + outputs = [ + "out" + "doc" + ]; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace-fail "ARGUMENTS $" "ARGUMENTS -p${python3Packages.omniorbpy}/${python3Packages.python.sitePackages} $" \ + --replace-fail '$'{CMAKE_SOURCE_DIR}/cmake '$'{JRL_CMAKE_MODULES} + ''; + + buildInputs = [ libsForQt5.qtbase ]; + + nativeBuildInputs = [ + cmake + doxygen + libsForQt5.wrapQtAppsHook + pkg-config + python3Packages.omniorb + ]; + + propagatedBuildInputs = [ + python3Packages.boost + python3Packages.gepetto-viewer + python3Packages.omniorbpy + ]; + + doCheck = true; + + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + # Fontconfig error: No writable cache directories + preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + + meta = { + homepage = "https://github.com/gepetto/gepetto-viewer-corba"; + description = "CORBA client/server for gepetto-viewer."; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ge/gepetto-viewer/package.nix b/pkgs/by-name/ge/gepetto-viewer/package.nix new file mode 100644 index 0000000000000..8e87bb3b18915 --- /dev/null +++ b/pkgs/by-name/ge/gepetto-viewer/package.nix @@ -0,0 +1,140 @@ +{ + boost, + cmake, + darwin, + doxygen, + fetchFromGitHub, + fetchpatch, + fontconfig, + lib, + jrl-cmakemodules, + libsForQt5, + makeWrapper, + openscenegraph, + osgqt, + pkg-config, + python3Packages, + qgv, + stdenv, + runCommand, +}: +let + gepetto-viewer = stdenv.mkDerivation (finalAttrs: { + pname = "gepetto-viewer"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "gepetto"; + repo = "gepetto-viewer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-A2J3HidG+OHJO8LpLiOEvORxDtViTdeVD85AmKkkOg8="; + }; + + patches = [ + # fix use of CMAKE_INSTALL_BINDIR for $bin output + (fetchpatch { + url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/9b1b3a61da016934c3e766e6b491c1d6f3fc80d6.patch"; + hash = "sha256-dpviEkOyCZpTYntZ4sCG1AvobljJphPQxg7gA6JxfWs="; + }) + # fix use of CMAKE_INSTALL_FULL_INCLUDEDIR for $dev output + (fetchpatch { + url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/4e1c2bbe063db20b605e51495e9f9eca40138cca.patch"; + hash = "sha256-HrecvW1ulCSt9+DUaQVBOoDkilGRqU2+GUx7NUw7hqc="; + }) + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.hostPlatform.isDarwin)) + (lib.cmakeBool "BUILD_PY_QGV" (!stdenv.hostPlatform.isDarwin)) + ]; + + outputs = [ + "out" + "dev" + "bin" + "doc" + ]; + + buildInputs = [ + python3Packages.boost + python3Packages.python-qt + libsForQt5.qtbase + ]; + + nativeBuildInputs = + [ + cmake + doxygen + libsForQt5.wrapQtAppsHook + pkg-config + python3Packages.python + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + darwin.autoSignDarwinBinariesHook + ]; + + propagatedBuildInputs = [ + jrl-cmakemodules + openscenegraph + osgqt + qgv + ]; + + doCheck = true; + + # wrapQtAppsHook uses isMachO, which fails to detect binaries without this + # ref. https://github.com/NixOS/nixpkgs/pull/138334 + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin "export LC_ALL=C"; + + postFixup = '' + # CMake is not aware exports are in $dev + substituteInPlace $dev/lib/cmake/gepetto-viewer/gepetto-viewerConfig.cmake --replace-fail \ + "$out/lib/cmake" \ + "$dev/lib/cmake" + + # wrapQtAppsHook does only wrap stuff in $out, we want $bin + echo wrapping $bin/bin/gepetto-gui + wrapQtApp $bin/bin/gepetto-gui + ''; + + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + # Fontconfig error: No writable cache directories + preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + + passthru.withPlugins = + plugins: + runCommand "gepetto-gui" + { + meta = { + # can't just "inherit (gepetto-viewer) meta;" because: + # error: derivation '/nix/store/…-gepetto-gui.drv' does not have wanted outputs 'bin' + inherit (gepetto-viewer.meta) + description + homepage + license + maintainers + mainProgram + platforms + ; + }; + nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = plugins; + } + '' + makeWrapper ${lib.getExe gepetto-viewer} $out/bin/gepetto-gui \ + --set GEPETTO_GUI_PLUGIN_DIRS ${lib.makeLibraryPath plugins} + ''; + + meta = { + description = "Graphical Interface for Pinocchio and HPP."; + homepage = "https://github.com/gepetto/gepetto-viewer"; + license = lib.licenses.lgpl3Only; + maintainers = [ lib.maintainers.nim65s ]; + mainProgram = "gepetto-gui"; + platforms = lib.platforms.unix; + }; + }); +in +gepetto-viewer diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix new file mode 100644 index 0000000000000..969f8caa41171 --- /dev/null +++ b/pkgs/by-name/ge/gersemi/package.nix @@ -0,0 +1,32 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "gersemi"; + version = "0.15.1"; + + src = fetchFromGitHub { + owner = "BlankSpruce"; + repo = "gersemi"; + rev = version; + hash = "sha256-MyiGmMITD6TlZ98qsSDalQWOWnpqelTrXKn6MmBGYS0="; + }; + + propagatedBuildInputs = with python3Packages; [ + appdirs + colorama + lark + pyyaml + ]; + + meta = { + description = "Formatter to make your CMake code the real treasure"; + homepage = "https://github.com/BlankSpruce/gersemi"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ xeals ]; + mainProgram = "gersemi"; + }; +} diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix index bcd02935045b2..3ba6da5b42c6a 100644 --- a/pkgs/by-name/ge/getmail6/package.nix +++ b/pkgs/by-name/ge/getmail6/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.19.04"; + version = "6.19.05"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; rev = "refs/tags/v${version}"; - hash = "sha256-mKYAk3rXWBMgyxXenVRTGXIUG6ruz5/CxLmh8rpinfI="; + hash = "sha256-GjB53bl2gh3SA+kqC9rrQ9I4rP0z69G/bamInmq8W+I="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix new file mode 100644 index 0000000000000..b23169f058e2f --- /dev/null +++ b/pkgs/by-name/ge/gex/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + libgit2, + darwin, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "gex"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "Piturnah"; + repo = "gex"; + rev = "v${version}"; + hash = "sha256-Xer7a3UtFIv3idchI7DfZ5u6qgDW/XFWi5ihtcREXqo="; + }; + + nativeBuildInputs = [ pkg-config ]; + + passthru.updateScript = nix-update-script { }; + + buildInputs = + [ + libgit2 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + env = { + LIBGIT2_NO_VENDOR = 1; + }; + + cargoPatches = [ + ./patch-libgit2.patch + ]; + + cargoHash = "sha256-GEQ4Zv14Dzo9mt1YIDmXEBHLPD6G0/O1ggmUTnSYD+k="; + + meta = with lib; { + description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; + homepage = "https://github.com/Piturnah/gex"; + changelog = "https://github.com/Piturnah/gex/releases/tag/${src.rev}"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ + azd325 + bot-wxt1221 + evanrichter + piturnah + ]; + mainProgram = "gex"; + }; +} diff --git a/pkgs/by-name/ge/gex/patch-libgit2.patch b/pkgs/by-name/ge/gex/patch-libgit2.patch new file mode 100644 index 0000000000000..df7bd7cdff246 --- /dev/null +++ b/pkgs/by-name/ge/gex/patch-libgit2.patch @@ -0,0 +1,54 @@ +From 3f9183a4de984c5d24caa9379274461e369926ed Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Sun, 8 Sep 2024 18:36:46 +0800 +Subject: [PATCH] tt + +--- + Cargo.lock | 8 ++++---- + Cargo.toml | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 5101c2e..0cb59d2 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -246,9 +246,9 @@ dependencies = [ + + [[package]] + name = "git2" +-version = "0.18.1" ++version = "0.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" ++checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" + dependencies = [ + "bitflags 2.3.3", + "libc", +@@ -316,9 +316,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + + [[package]] + name = "libgit2-sys" +-version = "0.16.1+1.7.1" ++version = "0.17.0+1.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" ++checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" + dependencies = [ + "cc", + "libc", +diff --git a/Cargo.toml b/Cargo.toml +index 26cef3f..f947945 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -16,7 +16,7 @@ anyhow = "1.0.75" + clap = { version = "4.4.7", features = ["cargo", "derive"] } + crossterm = { version = "0.27.0", features = ["serde"] } + dirs = "5.0.1" +-git2 = { version = "0.18.1", default-features = false } ++git2 = { version = "0.19.0", default-features = false } + itertools = "0.11.0" + nom = "7.1.3" + paste = "1.0.14" +-- +2.46.0 + diff --git a/pkgs/by-name/gf/gfal2/package.nix b/pkgs/by-name/gf/gfal2/package.nix index 3b3debaf7fef5..205f6e192bc44 100644 --- a/pkgs/by-name/gf/gfal2/package.nix +++ b/pkgs/by-name/gf/gfal2/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { lfc = false; # Break because of redundant `-luuid`. This needs to be fixed from the gfal2 upstream. # TODO: Change back to `true` once fixed. - mock = !stdenv.isDarwin; + mock = !stdenv.hostPlatform.isDarwin; rfio = false; sftp = true; srm = false; diff --git a/pkgs/by-name/gf/gfortran48/package.nix b/pkgs/by-name/gf/gfortran48/package.nix deleted file mode 100644 index e31c9d0c6ebd4..0000000000000 --- a/pkgs/by-name/gf/gfortran48/package.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ wrapCC, gcc48 }: -wrapCC ( - gcc48.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - } -) diff --git a/pkgs/by-name/gf/gfortran49/package.nix b/pkgs/by-name/gf/gfortran49/package.nix deleted file mode 100644 index 8016f9ff42bae..0000000000000 --- a/pkgs/by-name/gf/gfortran49/package.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ wrapCC, gcc49 }: -wrapCC ( - gcc49.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - } -) diff --git a/pkgs/by-name/gf/gfortran6/package.nix b/pkgs/by-name/gf/gfortran6/package.nix deleted file mode 100644 index c6a91e99bf541..0000000000000 --- a/pkgs/by-name/gf/gfortran6/package.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ wrapCC, gcc6 }: -wrapCC ( - gcc6.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - } -) diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix new file mode 100644 index 0000000000000..9ca0383c17f32 --- /dev/null +++ b/pkgs/by-name/gg/gg-jj/package.nix @@ -0,0 +1,80 @@ +{ + rustPlatform, + callPackage, + pkg-config, + lib, + fetchFromGitHub, + libayatana-appindicator, + openssl, + webkitgtk_4_1, +}: + +rustPlatform.buildRustPackage rec { + pname = "gg-jj"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "gulbanana"; + repo = "gg"; + rev = "refs/tags/v${version}"; + hash = "sha256-xOi/AUlH0FeenTXz3hsDYixCEl+yr22PGy6Ow4TKxY0="; + }; + + sourceRoot = "${src.name}/src-tauri"; + + webui = callPackage ./webui.nix { + inherit + src + pname + version + meta + ; + }; + + env = { + OPENSSL_NO_VENDOR = 1; + }; + + buildInputs = [ + webkitgtk_4_1 + openssl + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + cargoHash = "sha256-u3SkRA7327ZwqEnB+Xq2JDbI0k5HfeKzV17dvQ8B6xk="; + + postPatch = '' + buildRoot=$(pwd) + pushd $cargoDepsCopy/libappindicator-sys + oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) + substituteInPlace src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + substituteInPlace .cargo-checksum.json \ + --replace-fail $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) + popd + + pushd $cargoDepsCopy/jj-cli + oldHash=$(sha256sum build.rs | cut -d " " -f 1) + substituteInPlace build.rs \ + --replace-fail 'let path = std::env::var("CARGO_MANIFEST_DIR").unwrap();' "let path = \"$buildRoot\";" + substituteInPlace .cargo-checksum.json \ + --replace-fail $oldHash $(sha256sum build.rs | cut -d " " -f 1) + popd + + substituteInPlace ./tauri.conf.json \ + --replace-fail '"frontendDist": "../dist"' '"frontendDist": "${webui}"' \ + --replace-fail '"beforeBuildCommand": "npm run build"' '"beforeBuildCommand": ""' + ''; + + meta = { + homepage = "https://github.com/gulbanana/gg"; + changelog = "https://github.com/gulbanana/gg/releases/tag/v${version}"; + description = "GUI for jj users"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + mainProgram = "gg"; + license = lib.licenses.apsl20; + }; +} diff --git a/pkgs/by-name/gg/gg-jj/webui.nix b/pkgs/by-name/gg/gg-jj/webui.nix new file mode 100644 index 0000000000000..8d5ef5260c767 --- /dev/null +++ b/pkgs/by-name/gg/gg-jj/webui.nix @@ -0,0 +1,31 @@ +{ + version, + src, + pname, + pnpm, + meta, + buildNpmPackage, +}: + +buildNpmPackage { + inherit version src meta; + pname = "${pname}-webui"; + + npmDepsHash = "sha256-oHBFuX65D/FgnGa03jjpIKAdH8Q4c2NrpD64bhfe720="; + + buildPhase = '' + runHook preBuild + + node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist $out + + runHook postInstall + ''; +} diff --git a/pkgs/by-name/gg/gg/package.nix b/pkgs/by-name/gg/gg/package.nix index 91d0b04da0650..9a5d381a4e1d0 100644 --- a/pkgs/by-name/gg/gg/package.nix +++ b/pkgs/by-name/gg/gg/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec{ pname = "gg"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - hash = "sha256-07fP3dVFs4MZrFOH/8/4e3LHjFGZd7pNu6J3LBOWAd8="; + hash = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU="; }; vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14="; diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index c9043495bc4c0..674fa06bd62b9 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.5.4"; + version = "4.7.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-RGl947fWoifw6+YHykL/k7uie5WqZqEAKWK7NZT+Upo="; + hash = "sha256-+tUG+ReP8y6wI4XZsR2Look4LAwK79CZf9fWUgkx4O0="; }; - vendorHash = "sha256-zrHDxMqIzMQ2En8/sZ0BZjKM8JZrDjrRq9eWisSY3N0="; + vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE="; ldflags = [ "-s" diff --git a/pkgs/by-name/gh/gh-eco/package.nix b/pkgs/by-name/gh/gh-eco/package.nix index 002362001848a..4918546f79610 100644 --- a/pkgs/by-name/gh/gh-eco/package.nix +++ b/pkgs/by-name/gh/gh-eco/package.nix @@ -2,10 +2,9 @@ lib, fetchFromGitHub, buildGoModule, - fetchpatch, }: let - version = "0.1.3"; + version = "0.1.5"; in buildGoModule { pname = "gh-eco"; @@ -15,19 +14,10 @@ buildGoModule { owner = "jrnxf"; repo = "gh-eco"; rev = "refs/tags/v${version}"; - hash = "sha256-TE1AymNlxjUtkBnBO/VBjYaqLuRyxL75s6sMidKUXTE="; + hash = "sha256-Xtlz+u31hO81M53V0ZUtxmOgJ60zlspgVyCr181QrRE="; }; - patches = [ - # Fix package breaking on runtime by updating deps - (fetchpatch { - name = "update-deps.patch"; - url = "https://github.com/jrnxf/gh-eco/commit/d45b1e7de8cbcb692def0e94111262cdeff2835d.patch"; - hash = "sha256-vW5YX6C552dVYjBkYVoDbzT2PP8CaZzxh5g1TKHjrbU="; - }) - ]; - - vendorHash = "sha256-O3FQ+Z3KVYgTafwVXUhrGRuOAWlWlOhtVegKVoZBnDE="; + vendorHash = "sha256-mPZQPjZ+nnsRMYnSWDM9rYeAPvPwAp3vLZXwTNNHSx0="; ldflags = [ "-s" diff --git a/pkgs/by-name/gh/gh-f/package.nix b/pkgs/by-name/gh/gh-f/package.nix index 6b10219f8a81e..ba2beb4fb440e 100644 --- a/pkgs/by-name/gh/gh-f/package.nix +++ b/pkgs/by-name/gh/gh-f/package.nix @@ -22,13 +22,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "gh-f"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "gh-f"; rev = "v${version}"; - hash = "sha256-ITl8T8Oe21m047ygFlxWVjzUYPG4rlcTjfSpsropYJw="; + hash = "sha256-F98CqsSRymL/8s8u7P2Pqt6+ipLoG9Z9Q8bB+IWZTpI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 0160d117a12e6..a8e11244ae450 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -11,7 +11,7 @@ buildDotnetModule rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F1sxT9wh/K6VP7n1SlmmvmHlcgxDJw6Rht2hPIiRFjE="; + hash = "sha256-F1sxT9wh/K6VP7n1SlmmvmHlcgxDJw6Rht2hPIiRFjE="; }; projectFile = "src/gei/gei.csproj"; diff --git a/pkgs/by-name/gh/gh-markdown-preview/package.nix b/pkgs/by-name/gh/gh-markdown-preview/package.nix index 0690f3b36fec6..7e829bd19f89a 100644 --- a/pkgs/by-name/gh/gh-markdown-preview/package.nix +++ b/pkgs/by-name/gh/gh-markdown-preview/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gh-markdown-preview"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "yusukebe"; repo = "gh-markdown-preview"; rev = "v${version}"; - hash = "sha256-yfl50izjjyPmyV0Er0al/PPd87Yizqc8PnFV/FMpfEU="; + hash = "sha256-y9AiHmBfDSJ6oCevUAUkg18qHe/oP7A6PLiz3MZqU0s="; }; vendorHash = "sha256-O6Q9h5zcYAoKLjuzGu7f7UZY0Y5rL2INqFyJT2QZJ/E="; diff --git a/pkgs/by-name/gh/gh-notify/package.nix b/pkgs/by-name/gh/gh-notify/package.nix index 402d409e6cae5..891b8843c9261 100644 --- a/pkgs/by-name/gh/gh-notify/package.nix +++ b/pkgs/by-name/gh/gh-notify/package.nix @@ -23,13 +23,13 @@ let in stdenvNoCC.mkDerivation { pname = "gh-notify"; - version = "0-unstable-2024-04-24"; + version = "0-unstable-2024-08-01"; src = fetchFromGitHub { owner = "meiji163"; repo = "gh-notify"; - rev = "5c2db4cffe39f312d25979dc366f2bc219def9a2"; - hash = "sha256-AgpNjeRz0RHf8D3ib7x1zixBxh32UUZJleub5W/suuM="; + rev = "556df2eecdc0f838244a012759da0b76bcfeb2e7"; + hash = "sha256-WKv/1AW8wtl7kQ3PE7g2N0ELvdHtons7pYb0K8wsfWg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix index b505e405e1733..db5353c92653d 100644 --- a/pkgs/by-name/gh/ghciwatch/package.nix +++ b/pkgs/by-name/gh/ghciwatch/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-bE2cNgmq1TxtEDmLuyJVJpaj0Gbt73fnD1j/X42OL/w="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/by-name/gh/ghdl/package.nix b/pkgs/by-name/gh/ghdl/package.nix index 5125f463e6d98..181647ca4e2e4 100644 --- a/pkgs/by-name/gh/ghdl/package.nix +++ b/pkgs/by-name/gh/ghdl/package.nix @@ -120,6 +120,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; mainProgram = "ghdl"; maintainers = with lib.maintainers; [ lucus16 thoughtpolice ]; - platforms = lib.platforms.linux; + platforms = + lib.platforms.linux + ++ lib.optionals (backend == "mcode" || backend == "llvm") [ "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index 0d81d0ba969f8..69e4c0f94ff00 100644 --- a/pkgs/by-name/gh/ghex/package.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" "-Dvapi=true" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # mremap does not exist on darwin "-Dmmap-buffer-backend=false" ]; @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/ghex"; + changelog = "https://gitlab.gnome.org/GNOME/ghex/-/blob/${version}/NEWS?ref_type=tags"; description = "Hex editor for GNOME desktop environment"; mainProgram = "ghex"; platforms = platforms.linux; diff --git a/pkgs/by-name/gi/gickup/package.nix b/pkgs/by-name/gi/gickup/package.nix index 8d6d3dc710078..7c97c654a762c 100644 --- a/pkgs/by-name/gi/gickup/package.nix +++ b/pkgs/by-name/gi/gickup/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gickup"; - version = "0.10.31"; + version = "0.10.36"; src = fetchFromGitHub { owner = "cooperspencer"; repo = "gickup"; rev = "refs/tags/v${version}"; - hash = "sha256-6du9x5QQN1VJzAABJ+8Fm3YscfoRwKVYZO9tTMz22AQ="; + hash = "sha256-Os26Il/FhH5cpgpaMZGfOljZ4p3XlCrRPEvzKD6kgpg="; }; - vendorHash = "sha256-Nmt7T6sDWVHQZuINvON24Mq638Q04r5bpOBnz2vp4vM="; + vendorHash = "sha256-x+K3qXV0F4OKsldsnNcR5w4fmwYyt7V7IDrcHBNPttI="; ldflags = [ "-X main.version=${version}" ]; diff --git a/pkgs/by-name/gi/gifsicle/package.nix b/pkgs/by-name/gi/gifsicle/package.nix index 7e604d6c536a1..974d7f3ed7dac 100644 --- a/pkgs/by-name/gi/gifsicle/package.nix +++ b/pkgs/by-name/gi/gifsicle/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.lcdf.org/gifsicle/gifsicle-${version}.tar.gz"; - sha256 = "sha256-snEWRwCf0qExMPO+FgUy7UZTjnYr/A8CDepQYYp9yVA="; + hash = "sha256-snEWRwCf0qExMPO+FgUy7UZTjnYr/A8CDepQYYp9yVA="; }; buildInputs = lib.optionals gifview [ xorgproto libXt libX11 ]; diff --git a/pkgs/by-name/gi/gimoji/package.nix b/pkgs/by-name/gi/gimoji/package.nix new file mode 100644 index 0000000000000..02fe472ab39e5 --- /dev/null +++ b/pkgs/by-name/gi/gimoji/package.nix @@ -0,0 +1,32 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "gimoji"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "zeenix"; + repo = "gimoji"; + rev = version; + hash = "sha256-X1IiDnnRXiZBL/JBDfioKc/724TnVKaEjZLrNwX5SoA="; + }; + + cargoHash = "sha256-4B+IRYnqwIqkxjRjlxER8O414Zd/8Are4fu1OxA+dWI="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ]; + + meta = with lib; { + description = "Easily add emojis to your git commit messages"; + homepage = "https://github.com/zeenix/gimoji"; + license = licenses.mit; + mainProgram = "gimoji"; + maintainers = with maintainers; [ a-kenji ]; + }; +} diff --git a/pkgs/by-name/gi/girouette/package.nix b/pkgs/by-name/gi/girouette/package.nix index 2c2a733c3117a..09b0d61fccc93 100644 --- a/pkgs/by-name/gi/girouette/package.nix +++ b/pkgs/by-name/gi/girouette/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ dbus openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/gi/git-agecrypt/package.nix b/pkgs/by-name/gi/git-agecrypt/package.nix index a9c2d85ff63cb..bdd9beba175db 100644 --- a/pkgs/by-name/gi/git-agecrypt/package.nix +++ b/pkgs/by-name/gi/git-agecrypt/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config git ]; buildInputs = [ libgit2 zlib ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; meta = with lib; { diff --git a/pkgs/by-name/gi/git-codeowners/package.nix b/pkgs/by-name/gi/git-codeowners/package.nix index 7df57966f89b8..aff55a0a89773 100644 --- a/pkgs/by-name/gi/git-codeowners/package.nix +++ b/pkgs/by-name/gi/git-codeowners/package.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { owner = "softprops"; repo = "git-codeowners"; rev = "v${version}"; - sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq"; + hash = "sha256-eF6X+fLkQ8lZIk4WPzlW7l05P90gB5nxD5Ss32Im+C8="; }; cargoHash = "sha256-TayvqcVNCFHF5UpR1pPVRe076Pa8LS4duhnZLzYxkQM="; diff --git a/pkgs/by-name/gi/git-fixup/package.nix b/pkgs/by-name/gi/git-fixup/package.nix index af975e6e54ae3..467870e33f321 100644 --- a/pkgs/by-name/gi/git-fixup/package.nix +++ b/pkgs/by-name/gi/git-fixup/package.nix @@ -1,4 +1,14 @@ -{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, git, coreutils, gnused, gnugrep }: +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + git, + coreutils, + gnused, + gnugrep, + nix-update-script, +}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "git-fixup"; @@ -8,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "keis"; repo = "git-fixup"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Mue2xgYxJSEu0VoDmB7rnoSuzyT038xzETUO1fwptrs="; + hash = "sha256-Mue2xgYxJSEu0VoDmB7rnoSuzyT038xzETUO1fwptrs="; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,9 +38,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { postInstall = '' wrapProgram $out/bin/git-fixup \ - --prefix PATH : "${lib.makeBinPath [ git coreutils gnused gnugrep ]}" + --prefix PATH : "${ + lib.makeBinPath [ + git + coreutils + gnused + gnugrep + ] + }" ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Fighting the copy-paste element of your rebase workflow"; homepage = "https://github.com/keis/git-fixup"; diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix index 96a03ed49e946..a50d389c04d05 100644 --- a/pkgs/by-name/gi/git-gr/package.nix +++ b/pkgs/by-name/gi/git-gr/package.nix @@ -35,11 +35,11 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [installShellFiles] - ++ lib.optional stdenv.isLinux pkg-config; + ++ lib.optional stdenv.hostPlatform.isLinux pkg-config; buildInputs = - lib.optional stdenv.isLinux openssl - ++ lib.optionals stdenv.isDarwin [ + lib.optional stdenv.hostPlatform.isLinux openssl + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix index f44d33f4f4ea1..65ee35a5e763f 100644 --- a/pkgs/by-name/gi/git-igitt/package.nix +++ b/pkgs/by-name/gi/git-igitt/package.nix @@ -6,6 +6,8 @@ libgit2, oniguruma, zlib, + stdenv, + darwin, nix-update-script, }: @@ -31,7 +33,7 @@ rustPlatform.buildRustPackage { libgit2 oniguruma zlib - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/pkgs/by-name/gi/git-instafix/package.nix b/pkgs/by-name/gi/git-instafix/package.nix index d05e9fab87265..18ab6f5fa0bd8 100644 --- a/pkgs/by-name/gi/git-instafix/package.nix +++ b/pkgs/by-name/gi/git-instafix/package.nix @@ -37,6 +37,6 @@ rustPlatform.buildRustPackage { license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ mightyiam quodlibetor ]; changelog = "https://github.com/quodlibetor/git-instafix/releases/tag/v${version}"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/gi/git-my/package.nix b/pkgs/by-name/gi/git-my/package.nix index 9af49a536b4f8..7ad13dda2f6ef 100644 --- a/pkgs/by-name/gi/git-my/package.nix +++ b/pkgs/by-name/gi/git-my/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "davidosomething"; repo = "git-my"; rev = finalAttrs.version; - sha256 = "0jji5zw25jygj7g4f6f3k0p0s9g37r8iad8pa0s67cxbq2v4sc0v"; + hash = "sha256-GzBNtsCrs2M0UBc1FVE+4yUNLpjDGUfekc/LIvgvUUo="; }; buildInputs = [ bash ]; diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index e820781045d33..08e9260361b77 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -1,23 +1,23 @@ { lib, - buildGoModule, + buildGo123Module, fetchFromGitHub, git, nix-update-script, }: -buildGoModule rec { +buildGo123Module rec { pname = "git-spice"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; rev = "refs/tags/v${version}"; - hash = "sha256-D+kwH7fBRvi+H0/L7Gezn1FMBk3AkL9MbLULAwvrzrg="; + hash = "sha256-VODBN+3xDa+sGynhnWnnhPy0VEKPWOQeh2Ge75OTS0A="; }; - vendorHash = "sha256-24jtlvp8xSMzNejyzqt+MiQHRKprps132Q+rP9wlA30="; + vendorHash = "sha256-irYXuh0KmCmeZ2fKNduu7zpVqDQmmR7H2bNTMa2zOjI="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gi/git-standup/package.nix b/pkgs/by-name/gi/git-standup/package.nix index ba8af35849f42..bd85ca57229fd 100644 --- a/pkgs/by-name/gi/git-standup/package.nix +++ b/pkgs/by-name/gi/git-standup/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "kamranahmedse"; repo = "git-standup"; rev = finalAttrs.version; - sha256 = "1xnn0jjha56v7l2vj45zzxncl6m5x2hq6nkffgc1bcikhp1pidn7"; + hash = "sha256-x7Z4w4UzshXYc25ag6HopRrKbP+/ELkFPdsUBaUE1vY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix index e71668a83a73f..44ae1249a59c3 100644 --- a/pkgs/by-name/gi/git-together/package.nix +++ b/pkgs/by-name/gi/git-together/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin darwin.Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.Security; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix index f038db5a9dacc..d94ca080b630e 100644 --- a/pkgs/by-name/gi/git-upstream/package.nix +++ b/pkgs/by-name/gi/git-upstream/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let pname = "git-upstream"; - version = "1.1.0"; + version = "1.2.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -14,17 +14,17 @@ in owner = "9999years"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Pq0Z1WwrTP7dCwk6V/E0zu9sLLWr3kNuT3aJRZuRzhI="; + hash = "sha256-GnsqZSztDLXMO4T16nfcOKMKXap88CJzJ5nObzGwhMA="; }; - cargoHash = "sha256-jNpleFrOvt1m2TXTeBXfhTSjWNpCknNoKooF2xsO46w="; + cargoHash = "sha256-a12C/fpeo0ZJ0MFQlKHVZER9dVrXF95YI1i8MwCTCJo="; - meta = with lib; { + meta = { homepage = "https://github.com/9999years/git-upstream"; changelog = "https://github.com/9999years/git-upstream/releases/tag/v${version}"; description = "Shortcut for `git push --set-upstream`"; - license = [licenses.mit]; - maintainers = [maintainers._9999years]; + license = [lib.licenses.mit]; + maintainers = [lib.maintainers._9999years]; mainProgram = "git-upstream"; }; diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index 66da05851ddec..68679cfcfea4d 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -18,10 +18,12 @@ libsoup, moreutils, openssl, + rust, webkitgtk, nix-update-script, cacert, }: + rustPlatform.buildRustPackage rec { pname = "gitbutler"; version = "0.12.16"; @@ -33,11 +35,10 @@ rustPlatform.buildRustPackage rec { hash = "sha256-L4PVaNb3blpLIcyA7XLc71qwUPUADclxvbOkq1Jc1no="; }; - # deactivate the upstream updater in tauri configuration - # TODO: use `tauri build`'s `--config` flag with the release configuration instead of manually merging - # them. it doesn't seem to like using paths currently, even though it should. + # deactivate the upstream updater in tauri configuration & set the version postPatch = '' - jq --slurp ".[0] * .[1] | .tauri.updater.active = false" crates/gitbutler-tauri/tauri.conf{,.release}.json | sponge crates/gitbutler-tauri/tauri.conf.json + tauri_conf="crates/gitbutler-tauri/tauri.conf.release.json" + jq '.package.version = "${version}" | .tauri.updater.active = false' "$tauri_conf" | sponge "$tauri_conf" ''; cargoLock = { @@ -54,7 +55,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ - cargo-tauri + cargo-tauri.hook desktop-file-utils jq moreutils @@ -67,12 +68,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking libsoup webkitgtk ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit @@ -82,7 +83,15 @@ rustPlatform.buildRustPackage rec { ] ); + # extended release configuration + tauriBuildFlags = [ "--config crates/gitbutler-tauri/tauri.conf.release.json" ]; + env = { + # make sure `crates/gitbutler-tauri/inject-git-binaries.sh` can find our + # target dir + # https://github.com/gitbutlerapp/gitbutler/blob/56b64d778042d0e93fa362f808c35a7f095ab1d1/crates/gitbutler-tauri/inject-git-binaries.sh#L10C10-L10C26 + TRIPLE_OVERRIDE = rust.envVars.rustHostPlatformSpec; + # `pnpm`'s `fetchDeps` and `configHook` uses a specific version of pnpm, not upstream's COREPACK_ENABLE_STRICT = 0; @@ -95,14 +104,6 @@ rustPlatform.buildRustPackage rec { # we also need to have `tracing` support in `tokio` for `console-subscriber` RUSTFLAGS = "--cfg tokio_unstable"; - tauriBundle = - { - Linux = "deb"; - Darwin = "app"; - } - .${stdenv.hostPlatform.uname.system} - or (throw "No tauri bundle available for ${stdenv.hostPlatform.uname.system}"); - ESBUILD_BINARY_PATH = lib.getExe ( esbuild.override { buildGoModule = @@ -128,39 +129,23 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; }; - buildPhase = '' - runHook preBuild - + preBuild = '' pushd packages/ui pnpm package popd - - cargo tauri build --bundles "$tauriBundle" - - runHook postBuild ''; - installPhase = - '' - runHook preInstall - '' - + lib.optionalString stdenv.isDarwin '' - mkdir -p $out/bin - cp -r target/release/bundle/macos $out/Applications + postInstall = + lib.optionalString stdenv.hostPlatform.isDarwin '' mv $out/Applications/GitButler.app/Contents/MacOS/GitButler $out/bin/git-butler ln -s $out/bin/git-butler $out/Applications/GitButler.app/Contents/MacOS/GitButler '' - + lib.optionalString stdenv.isLinux '' - cp -r target/release/bundle/"$tauriBundle"/*/data/usr $out - + + lib.optionalString stdenv.hostPlatform.isLinux '' desktop-file-edit \ --set-comment "A Git client for simultaneous branches on top of your existing workflow." \ --set-key="Keywords" --set-value="git;" \ --set-key="StartupWMClass" --set-value="GitButler" \ $out/share/applications/git-butler.desktop - '' - + '' - runHook postInstall ''; # the `gitbutler-git` crate's checks do not support release mode diff --git a/pkgs/by-name/gi/gitea-actions-runner/package.nix b/pkgs/by-name/gi/gitea-actions-runner/package.nix new file mode 100644 index 0000000000000..d84c0de480b2c --- /dev/null +++ b/pkgs/by-name/gi/gitea-actions-runner/package.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchFromGitea, + buildGo123Module, + testers, + gitea-actions-runner, +}: + +buildGo123Module rec { + pname = "gitea-actions-runner"; + version = "0.2.11"; + + src = fetchFromGitea { + domain = "gitea.com"; + owner = "gitea"; + repo = "act_runner"; + rev = "v${version}"; + hash = "sha256-PmDa8XIe1uZ4SSrs9zh5HBmFaOuj+uuLm7jJ4O5V1dI="; + }; + + vendorHash = "sha256-lYJFySGqkhT89vHDp1FcTiiC7DG4ziQ1DaBHLh/kXQc="; + + ldflags = [ + "-s" + "-w" + "-X gitea.com/gitea/act_runner/internal/pkg/ver.version=v${version}" + ]; + + passthru.tests.version = testers.testVersion { + package = gitea-actions-runner; + version = "v${version}"; + }; + + meta = with lib; { + mainProgram = "act_runner"; + maintainers = with maintainers; [ techknowlogick ]; + license = licenses.mit; + changelog = "https://gitea.com/gitea/act_runner/releases/tag/v${version}"; + homepage = "https://gitea.com/gitea/act_runner"; + description = "Runner for Gitea based on act"; + }; +} diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index f9792f89c7157..3b5e5ccdf5798 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , makeWrapper @@ -20,7 +19,7 @@ let pname = "gitea-frontend"; inherit (gitea) src version; - npmDepsHash = "sha256-gXBBiDIIS0aW6qK37HcF0AuJOliblinznRVXoo6DV1s="; + npmDepsHash = "sha256-Sp3xBe5IXys2Qro4x4HKs9dQOnlbstAmtIG6xOOktEk="; # use webpack directly instead of 'make frontend' as the packages are already installed buildPhase = '' @@ -34,16 +33,18 @@ let }; in buildGoModule rec { pname = "gitea"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${gitea.version}"; - hash = "sha256-s7su3gMdXv2sT1uYYtx29n7QDvmPU9QB3QR6ctOlE58="; + hash = "sha256-PwA23cbRgw5crzZmngDjAAIODMtguwBCqc9NqWMjF3o="; }; - vendorHash = "sha256-nzhjIfQMzSf1nuBMTIe0xn+NMDFbDZ9jRHu8Nwzmp4w="; + proxyVendor = true; + + vendorHash = "sha256-rMTKmztQNse/9CK1qFGWmSwqunwh918EvcuIHk6BSTY="; outputs = [ "out" "data" ]; diff --git a/pkgs/by-name/gi/gitg/package.nix b/pkgs/by-name/gi/gitg/package.nix index 5c99f00c12068..c5071267ae8cf 100644 --- a/pkgs/by-name/gi/gitg/package.nix +++ b/pkgs/by-name/gi/gitg/package.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gitg"; + changelog = "https://gitlab.gnome.org/GNOME/gitg/-/blob/v${version}/NEWS?ref_type=tags"; description = "GNOME GUI client to view git repositories"; mainProgram = "gitg"; maintainers = with maintainers; [ domenkozar Luflosi ]; diff --git a/pkgs/by-name/gi/githooks/package.nix b/pkgs/by-name/gi/githooks/package.nix index fbfc407b8101d..54acd52929234 100644 --- a/pkgs/by-name/gi/githooks/package.nix +++ b/pkgs/by-name/gi/githooks/package.nix @@ -9,13 +9,13 @@ }: buildGoModule rec { pname = "githooks"; - version = "3.0.2"; + version = "3.0.4"; src = fetchFromGitHub { owner = "gabyx"; repo = "githooks"; rev = "v${version}"; - hash = "sha256-gTvbvW+AFyZUBt7gSKJGc9lrl7CAy+cOElcADlIvuRk="; + hash = "sha256-pTSC8ruNiPzQO1C6j+G+WFX3pz/mWPukuWkKUSYdfHw="; }; modRoot = "./githooks"; diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index cbd89cda3c21b..88f8b5620b45d 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -2,8 +2,7 @@ , lib , fetchurl , autoPatchelfHook -, wrapGAppsHook3 -, makeWrapper +, buildPackages , gnome-keyring , libsecret , git @@ -44,7 +43,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook - (wrapGAppsHook3.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index ff69321e65bd4..a2923b66b3b90 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -113,7 +113,7 @@ buildDotnetModule rec { nativeBuildInputs = [ which git - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; @@ -230,7 +230,7 @@ buildDotnetModule rec { substituteInPlace $out/lib/github-runner/config.sh \ --replace './bin/Runner.Listener' "$out/bin/Runner.Listener" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/lib/github-runner/config.sh \ --replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \ --replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${dotnet-runtime}/shared/Microsoft.NETCore.App/${dotnet-runtime.version}/' \ @@ -256,7 +256,7 @@ buildDotnetModule rec { install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js mkdir -p $out/lib/github-runner/checkScripts install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH makeWrapperArgs=() @@ -318,7 +318,7 @@ buildDotnetModule rec { description = "Self-hosted runner for GitHub Actions"; homepage = "https://github.com/actions/runner"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse zimbatm ]; + maintainers = with maintainers; [ veehaitch kfollesdal aanderse zimbatm ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index 5f53540cde4ac..46655e74505d3 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -2,20 +2,22 @@ , fetchFromGitHub , lib , nix-update-script +, gitlab-ci-local +, testers }: buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.52.2"; + version = "4.53.0"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-x63am8FIfczA4CkoBkDeZTkp2sqc7nN5CV1hiq+vvjU="; + hash = "sha256-VLBVfA4x4gaj7e37W7EqehJpYhmEgTatIL2IrO4i+Z8="; }; - npmDepsHash = "sha256-t26QoIBw5XGqHn8FHSL2MSfFV2wGuQWf3GH2GvSYByg="; + npmDepsHash = "sha256-HAat2D45XeIjDW207Fn5M7O1sqjHOV2gxm2Urzxw+PU="; postPatch = '' # remove cleanup which runs git commands @@ -23,7 +25,12 @@ buildNpmPackage rec { --replace-fail "npm run cleanup" "true" ''; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = gitlab-ci-local; + }; + }; meta = with lib;{ description = "Run gitlab pipelines locally as shell executor or docker executor"; diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix new file mode 100644 index 0000000000000..a7a85c977fc27 --- /dev/null +++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -0,0 +1,38 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + darwin, + openssl, + pkg-config, + stdenv, +}: + +rustPlatform.buildRustPackage rec { + pname = "gitlab-ci-ls"; + version = "0.21.3"; + src = fetchFromGitHub { + owner = "alesbrelih"; + repo = "gitlab-ci-ls"; + rev = "${version}"; + hash = "sha256-3PqGnknP5ilwPCDsD8GwIEamZC24lEnuQhipTo8RDI0="; + }; + + cargoHash = "sha256-c31madEElZpHbzyKHqUDyPW/maVrkNKlldX24Y3iFGQ="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + meta = with lib; { + homepage = "https://github.com/alesbrelih/gitlab-ci-ls"; + description = "GitLab CI Language Server (gitlab-ci-ls)"; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + platforms = platforms.unix; + mainProgram = "gitlab-ci-ls"; + }; +} diff --git a/pkgs/by-name/gi/gitlab-release-cli/package.nix b/pkgs/by-name/gi/gitlab-release-cli/package.nix index 64f1f24e744b2..28119445dc2b9 100644 --- a/pkgs/by-name/gi/gitlab-release-cli/package.nix +++ b/pkgs/by-name/gi/gitlab-release-cli/package.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU="; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # Skip failing test "-skip TestHTTPSCustomCA" ]; diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index a4806b80c2447..61d2af6ac7c87 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -70,6 +70,6 @@ buildGoModule rec { license = licenses.mit; homepage = "https://docs.gitlab.com/runner/"; platforms = platforms.unix ++ platforms.darwin; - maintainers = with maintainers; [ bachp zimbatm ] ++ teams.gitlab.members; + maintainers = with maintainers; [ zimbatm ] ++ teams.gitlab.members; }; } diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix index 4a7778ab95bc6..c0dc2a2a61536 100644 --- a/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -11,23 +11,23 @@ rustPlatform.buildRustPackage rec { pname = "gitlab-timelogs"; - version = "0.3.0"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - hash = "sha256-n+Jvm4RqHkXIeQcY55iOEBgwvbr77vLMhqxXgdau5MQ="; + hash = "sha256-EWFzMNuNquHR0grmmi14vuraIwvrmkw88QAYkvbO2QM="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration iconv ]; - cargoHash = "sha256-REE7DWY0l4TTDTwWFWVr3Zk/oLQlOjrbFEWSFUlBEig="; + cargoHash = "sha256-IXiIrX+nR7uB7UYqdVgKR+IHJlRl0i0cklwITGF5jAg="; meta = { description = " CLI utility to support you with your time logs in GitLab"; diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix index 04c4c8c32bb01..8dfca387e94ac 100644 --- a/pkgs/by-name/gi/gittuf/package.nix +++ b/pkgs/by-name/gi/gittuf/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gittuf"; - version = "0.5.2"; + version = "0.6.2"; src = fetchFromGitHub { owner = "gittuf"; repo = pname; rev = "v${version}"; - hash = "sha256-mes+6Bs6KhLkcHRzI07ciT1SuSJU/YxjXt0MCDeVCUk="; + hash = "sha256-iPaYwZUnIu9GeyY4kBhj+9gIINYx+pGSWJqPekh535g="; }; - vendorHash = "sha256-7z7+ycV6e24JUlLIxRCAgJwxRcRgGWBYPgbXgGqatEE="; + vendorHash = "sha256-mafN+Nrr0AtfMjnXNoEIuz90kJa58pgY2vUOlv7v+TE="; ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${version}" ]; diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index febc9a88c6802..33eb8d0c9bea5 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-ERowsPJujsN27uKD0yW1kPADV9YOKH7KR3/4r1iISvc="; + hash = "sha256-DqJ/O87LdNXmJNmoBCdAvLod8uDRHlNuMzAv+kEew1w="; }; - cargoHash = "sha256-VhcCFh1seqanecRT3lER0ZSYFRoKn9V5sbGYlNg49DQ="; + cargoHash = "sha256-rfj2rDqO/sMaghpou2TCTfqrUmPxh0qooR6hhqlS4PM="; nativeBuildInputs = [ pkg-config @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix index a93cad786827f..df3adcb0e39f6 100644 --- a/pkgs/by-name/gi/gitui/package.nix +++ b/pkgs/by-name/gi/gitui/package.nix @@ -25,8 +25,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isLinux xclip - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isLinux xclip + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/by-name/gi/giza/package.nix b/pkgs/by-name/gi/giza/package.nix new file mode 100644 index 0000000000000..1658970c8b335 --- /dev/null +++ b/pkgs/by-name/gi/giza/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + gfortran, + cairo, + freetype, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "giza"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "danieljprice"; + repo = "giza"; + rev = "v${finalAttrs.version}"; + hash = "sha256-spb46IoySf6DM454adcWmqqLlzNA2HK9z29TzOCECJ4="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + gfortran + ]; + + buildInputs = [ + cairo + freetype + ]; + + meta = { + description = "Scientific plotting library for C/Fortran"; + inherit (finalAttrs.src.meta) homepage; + changelog = "${finalAttrs.src.meta.homepage}/blob/${finalAttrs.src.rev}/ChangeLog"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ doronbehar ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index 11ba4a35406de..fe4aa35a56d3e 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "glance"; - version = "0.5.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; rev = "v${version}"; - hash = "sha256-ebHSnzTRmWw2YBnVIR4h2zdZvbUHbKVzmQYPHDTvZDQ="; + hash = "sha256-A2EFIDwJbIzRDAxFKW7znZFYKYpqOMEixUG0yUDx7zc="; }; - vendorHash = "sha256-Okme73vLc3Pe9+rNlmG8Bj1msKaVb5PaIBsAAeTer6s="; + vendorHash = "sha256-BLWaYiWcLX+/DW7Zzp6/Mtw5uVxIVtfubB895hrZ+08="; excludedPackages = [ "scripts/build-and-ship" ]; diff --git a/pkgs/by-name/gl/glas/package.nix b/pkgs/by-name/gl/glas/package.nix index ee3c6a3bb0baf..589d649fa46de 100644 --- a/pkgs/by-name/gl/glas/package.nix +++ b/pkgs/by-name/gl/glas/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { owner = "maurobalbi"; repo = "glas"; rev = "v${version}"; - sha256 = "sha256-jMpFxzosaCedwsJ8URlR3Gd/mnlgSBEfA3oIymmEPFU="; + hash = "sha256-jMpFxzosaCedwsJ8URlR3Gd/mnlgSBEfA3oIymmEPFU="; }; cargoHash = "sha256-zESRtefoObpUsu4RfTsqJAyBNylouXffpNK3W/X+w9M="; diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix index 254a27f2cca04..f4b03a4b8d27b 100644 --- a/pkgs/by-name/gl/glasskube/package.nix +++ b/pkgs/by-name/gl/glasskube/package.nix @@ -1,18 +1,19 @@ { lib -, buildGoModule +, buildGo123Module , buildNpmPackage , fetchFromGitHub , nix-update-script , installShellFiles +, versionCheckHook }: let - version = "0.17.0"; + version = "0.23.0"; gitSrc = fetchFromGitHub { owner = "glasskube"; repo = "glasskube"; rev = "refs/tags/v${version}"; - hash = "sha256-uo612trSSdbj6XpZHddXELNQideJ/M/qh+LLdzVZL6U="; + hash = "sha256-X9XXQ/Ke3toXLIkSCzGrypd1lKDfslpJ96zmDHBDbl8="; }; web-bundle = buildNpmPackage rec { inherit version; @@ -20,7 +21,7 @@ let src = gitSrc; - npmDepsHash = "sha256-s3ViR6zBUTTu864fiD06N1ouMUYXccj6AMXt5pj+BSc="; + npmDepsHash = "sha256-9BicZfnrJEFrtaJ0uGmLnnY99KplnL8qdmG5FMo70uI="; dontNpmInstall = true; @@ -34,13 +35,13 @@ let ''; }; -in buildGoModule rec { +in buildGo123Module rec { inherit version; pname = "glasskube"; src = gitSrc; - vendorHash = "sha256-KzoFPhySX2w7ndU6nndx/KqoUfE8o6OT/9a2DEz5YuI="; + vendorHash = "sha256-xpN/5VmRPFQegP+ORpb875N/+AKgxiqyZWk4Px+SCZ4="; CGO_ENABLED = 0; @@ -54,6 +55,8 @@ in buildGoModule rec { subPackages = [ "cmd/glasskube" "cmd/package-operator" ]; nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; preBuild = '' cp -r ${web-bundle}/bundle internal/web/root/static/bundle diff --git a/pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch b/pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch new file mode 100644 index 0000000000000..70cec99815e9b --- /dev/null +++ b/pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch @@ -0,0 +1,59 @@ +From 9997ae55a47de469ea26f8437c30b51483abda5f Mon Sep 17 00:00:00 2001 +From: Dan Klishch <danilklishch@gmail.com> +Date: Sat, 30 Sep 2023 23:38:05 -0400 +Subject: Defer setting cursor position until the cursor is locked + +--- + src/wl_platform.h | 3 +++ + src/wl_window.c | 14 ++++++++++++-- + 2 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/wl_platform.h b/src/wl_platform.h +index ca34f66e..cd1f227f 100644 +--- a/src/wl_platform.h ++++ b/src/wl_platform.h +@@ -403,6 +403,9 @@ typedef struct _GLFWwindowWayland + int scaleSize; + int compositorPreferredScale; + ++ double askedCursorPosX, askedCursorPosY; ++ GLFWbool didAskForSetCursorPos; ++ + struct zwp_relative_pointer_v1* relativePointer; + struct zwp_locked_pointer_v1* lockedPointer; + struct zwp_confined_pointer_v1* confinedPointer; +diff --git a/src/wl_window.c b/src/wl_window.c +index 1de26558..0df16747 100644 +--- a/src/wl_window.c ++++ b/src/wl_window.c +@@ -2586,8 +2586,9 @@ void _glfwGetCursorPosWayland(_GLFWwindow* window, double* xpos, double* ypos) + + void _glfwSetCursorPosWayland(_GLFWwindow* window, double x, double y) + { +- _glfwInputError(GLFW_FEATURE_UNAVAILABLE, +- "Wayland: The platform does not support setting the cursor position"); ++ window->wl.didAskForSetCursorPos = true; ++ window->wl.askedCursorPosX = x; ++ window->wl.askedCursorPosY = y; + } + + void _glfwSetCursorModeWayland(_GLFWwindow* window, int mode) +@@ -2819,6 +2820,15 @@ static const struct zwp_relative_pointer_v1_listener relativePointerListener = + static void lockedPointerHandleLocked(void* userData, + struct zwp_locked_pointer_v1* lockedPointer) + { ++ _GLFWwindow* window = userData; ++ ++ if (window->wl.didAskForSetCursorPos) ++ { ++ window->wl.didAskForSetCursorPos = false; ++ zwp_locked_pointer_v1_set_cursor_position_hint(window->wl.lockedPointer, ++ wl_fixed_from_double(window->wl.askedCursorPosX), ++ wl_fixed_from_double(window->wl.askedCursorPosY)); ++ } + } + + static void lockedPointerHandleUnlocked(void* userData, +-- +2.42.0 + diff --git a/pkgs/by-name/gl/glfw3/package.nix b/pkgs/by-name/gl/glfw3/package.nix new file mode 100644 index 0000000000000..ba77795b05c89 --- /dev/null +++ b/pkgs/by-name/gl/glfw3/package.nix @@ -0,0 +1,77 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config +, libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext +, darwin, fixDarwinDylibNames +, wayland +, wayland-scanner, wayland-protocols, libxkbcommon, libdecor +, withMinecraftPatch ? false +}: +let + version = "3.4"; +in +stdenv.mkDerivation { + pname = "glfw${lib.optionalString withMinecraftPatch "-minecraft"}"; + inherit version; + + src = fetchFromGitHub { + owner = "glfw"; + repo = "GLFW"; + rev = version; + hash = "sha256-FcnQPDeNHgov1Z07gjFze0VMz2diOrpbKZCsI96ngz0="; + }; + + # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) + patches = [ + ./x11.patch + ] ++ lib.optionals withMinecraftPatch [ + ./0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch + ]; + + propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ libGL ]; + + nativeBuildInputs = [ cmake pkg-config ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]; + + buildInputs = + lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa Kernel ]) + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXinerama + libXcursor + libXi + libXext + ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWindows) [ + "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" + "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" + ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace src/wl_init.c \ + --replace-fail "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" \ + --replace-fail "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0" \ + --replace-fail "libwayland-client.so.0" "${lib.getLib wayland}/lib/libwayland-client.so.0" \ + --replace-fail "libwayland-cursor.so.0" "${lib.getLib wayland}/lib/libwayland-cursor.so.0" \ + --replace-fail "libwayland-egl.so.1" "${lib.getLib wayland}/lib/libwayland-egl.so.1" + ''; + + # glfw may dlopen libwayland-client.so: + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + patchelf ''${!outputLib}/lib/libglfw.so --add-rpath ${lib.getLib wayland}/lib + ''; + + meta = with lib; { + description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; + homepage = "https://www.glfw.org/"; + license = licenses.zlib; + maintainers = with maintainers; [ marcweber Scrumplex twey ]; + platforms = platforms.unix ++ platforms.windows; + }; +} diff --git a/pkgs/development/libraries/glfw/x11.patch b/pkgs/by-name/gl/glfw3/x11.patch similarity index 100% rename from pkgs/development/libraries/glfw/x11.patch rename to pkgs/by-name/gl/glfw3/x11.patch diff --git a/pkgs/by-name/gl/glibtool/package.nix b/pkgs/by-name/gl/glibtool/package.nix new file mode 100644 index 0000000000000..286ba6dc95c2b --- /dev/null +++ b/pkgs/by-name/gl/glibtool/package.nix @@ -0,0 +1,7 @@ +{ libtool }: + +libtool.overrideAttrs { + pname = "glibtool"; + meta.mainProgram = "glibtool"; + configureFlags = [ "--program-prefix=g" ]; +} diff --git a/pkgs/development/libraries/glpng/default.nix b/pkgs/by-name/gl/glpng/package.nix similarity index 100% rename from pkgs/development/libraries/glpng/default.nix rename to pkgs/by-name/gl/glpng/package.nix diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix index 076eeb295d99d..af11d0a666656 100644 --- a/pkgs/by-name/gl/glrnvim/package.nix +++ b/pkgs/by-name/gl/glrnvim/package.nix @@ -14,12 +14,12 @@ rustPlatform.buildRustPackage rec { owner = "beeender"; repo = "glrnvim"; rev = "v${version}"; - sha256 = "sha256-n3t3s3fzmBGXRDydYxNJ13itKul8dyLNW6HP8Di4hY0="; + hash = "sha256-n3t3s3fzmBGXRDydYxNJ13itKul8dyLNW6HP8Di4hY0="; }; cargoHash = "sha256-cHEse+pXwgPTL8GJyY4s1mhWXGTY8Fnn2rFpA5SNerY="; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ DiskArbitration Foundation ]); diff --git a/pkgs/by-name/gm/gmetronome/package.nix b/pkgs/by-name/gm/gmetronome/package.nix index ff501861b8952..7dcd816c31b41 100644 --- a/pkgs/by-name/gm/gmetronome/package.nix +++ b/pkgs/by-name/gm/gmetronome/package.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ aleksana ]; mainProgram = "gmetronome"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix index 5d097f13f5c62..539b766464e6d 100644 --- a/pkgs/by-name/gm/gmic-qt/package.nix +++ b/pkgs/by-name/gm/gmic-qt/package.nix @@ -12,6 +12,7 @@ , libpng , libsForQt5 , libtiff +, llvmPackages , ninja , nix-update-script , openexr @@ -49,13 +50,13 @@ assert lib.assertMsg stdenv.mkDerivation (finalAttrs: { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.4.0"; + version = "3.4.2"; src = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${finalAttrs.version}"; - hash = "sha256-IZMvvhWQwbnyxF3CkvEjySl3o3DB6UucpjqOFR9NjQ0="; + hash = "sha256-fM6dBxBC2b1/v+rfiP//QaAcTJmMtYPn4OUNwVqKhYk="; }; nativeBuildInputs = [ @@ -79,7 +80,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ (with libsForQt5; [ qtbase qttools - ]) ++ variants.${variant}.extraDeps; + ]) ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + ] ++ variants.${variant}.extraDeps; postPatch = '' patchShebangs \ diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 824db435e2498..38f3f8ba22615 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -13,9 +13,12 @@ , gnused , graphicsmagick , jq +, libX11 +, libXext , libjpeg , libpng , libtiff +, llvmPackages , ninja , opencv , openexr @@ -26,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gmic"; - version = "3.4.0"; + version = "3.4.2"; outputs = [ "out" "lib" "dev" "man" ]; @@ -34,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GreycLab"; repo = "gmic"; rev = "v.${finalAttrs.version}"; - hash = "sha256-uK/kgzlUvEAxRB8Wc3Inspv4/8vnjXrCilP1g/QMuCs="; + hash = "sha256-oyhwdX/eWbb5i7j/Aw7ocJk3KrGdxfKJx+P4Hzemlw8="; }; # TODO: build this from source @@ -42,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { gmic_stdlib = fetchurl { name = "gmic_stdlib_community.h"; url = "https://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; - hash = "sha256-LoqK8ADwzPpxhy2GvaxVjGyYEHAbhspyoIXuBXCLRtQ="; + hash = "sha256-quzQ0g6kmbJFygUOlKdTn9Fe9J7jhlLOiNal1kX3iHY="; }; nativeBuildInputs = [ @@ -55,25 +58,31 @@ stdenv.mkDerivation (finalAttrs: { cimg fftw graphicsmagick + libX11 + libXext libjpeg libpng libtiff opencv openexr zlib + ] ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp ]; cmakeFlags = [ (lib.cmakeBool "BUILD_LIB_STATIC" false) (lib.cmakeBool "ENABLE_CURL" false) (lib.cmakeBool "ENABLE_DYNAMIC_LINKING" true) + (lib.cmakeBool "ENABLE_OPENCV" true) + (lib.cmakeBool "ENABLE_XSHM" true) (lib.cmakeBool "USE_SYSTEM_CIMG" true) ]; postPatch = '' cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib_community.h '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" ''; diff --git a/pkgs/by-name/gn/gnome-2048/package.nix b/pkgs/by-name/gn/gnome-2048/package.nix new file mode 100644 index 0000000000000..2a1e8cf1c613f --- /dev/null +++ b/pkgs/by-name/gn/gnome-2048/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchurl, + fetchpatch, + wrapGAppsHook3, + meson, + vala, + pkg-config, + ninja, + itstool, + clutter-gtk, + libgee, + libgnome-games-support, + gnome, + gtk3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-twenty-forty-eight"; + version = "3.38.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor finalAttrs.version}/gnome-2048-${finalAttrs.version}.tar.xz"; + hash = "sha256-4nNn9cCaATZYHTNfV5E6r1pfGA4ymcxcGjDYWD55rmg="; + }; + + patches = [ + # Fix build with meson 0.61 + # https://gitlab.gnome.org/GNOME/gnome-2048/-/merge_requests/21 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-2048/-/commit/194e22699f7166a016cd39ba26dd719aeecfc868.patch"; + hash = "sha256-Qpn/OJJwblRm5Pi453aU2HwbrNjsf+ftmSnns/5qZ9E="; + }) + ]; + + nativeBuildInputs = [ + itstool + meson + ninja + pkg-config + vala + wrapGAppsHook3 + ]; + + buildInputs = [ + clutter-gtk + libgee + libgnome-games-support + gtk3 + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-2048"; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-2048"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-2048/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + description = "Obtain the 2048 tile"; + mainProgram = "gnome-2048"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/gn/gnome-applets/package.nix b/pkgs/by-name/gn/gnome-applets/package.nix new file mode 100644 index 0000000000000..739475b78082c --- /dev/null +++ b/pkgs/by-name/gn/gnome-applets/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + fetchurl, + gettext, + itstool, + libxml2, + pkg-config, + gnome-panel, + gtk3, + glib, + libwnck, + libgtop, + libnotify, + upower, + wirelesstools, + linuxPackages, + adwaita-icon-theme, + libgweather, + gucharmap, + tracker, + polkit, + gnome, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-applets"; + version = "3.52.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-applets/${lib.versions.majorMinor finalAttrs.version}/gnome-applets-${finalAttrs.version}.tar.xz"; + hash = "sha256-bz07QoZW/21bHT7lzLfs49Kxi1S/BFes9DtxHlXi1iw="; + }; + + nativeBuildInputs = [ + gettext + itstool + pkg-config + libxml2 + ]; + + buildInputs = [ + gnome-panel + gtk3 + glib + libxml2 + libwnck + libgtop + libnotify + upower + adwaita-icon-theme + libgweather + gucharmap + tracker + polkit + wirelesstools + linuxPackages.cpupower + ]; + + enableParallelBuilding = true; + + doCheck = true; + + # Don't try to install modules to gnome panel's directory, as it's read only + PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-applets"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Applets for use with the GNOME panel"; + mainProgram = "cpufreq-selector"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-applets"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-applets/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/gn/gnome-autoar/package.nix b/pkgs/by-name/gn/gnome-autoar/package.nix index 75c971559f7b3..3fd81f68de469 100644 --- a/pkgs/by-name/gn/gnome-autoar/package.nix +++ b/pkgs/by-name/gn/gnome-autoar/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/gnome-autoar-${version}.tar.xz"; - sha256 = "wK++MzvPPLFEGh9XTMjsexuBl3eRRdTt7uKJb9rPw8I="; + hash = "sha256-wK++MzvPPLFEGh9XTMjsexuBl3eRRdTt7uKJb9rPw8I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix index f9bf5ecf4ab58..3feadbad989c2 100644 --- a/pkgs/by-name/gn/gnome-backgrounds/package.nix +++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Default wallpaper set for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/gnome-backgrounds"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.cc-by-sa-30; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix b/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix new file mode 100644 index 0000000000000..815252650fc73 --- /dev/null +++ b/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix @@ -0,0 +1,105 @@ +{ + stdenv, + lib, + fetchurl, + fetchpatch, + gnome, + adwaita-icon-theme, + meson, + ninja, + pkg-config, + gtk3, + gettext, + glib, + udev, + itstool, + libxml2, + wrapGAppsHook3, + libnotify, + libcanberra-gtk3, + gobject-introspection, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_43, + python3, + gsettings-desktop-schemas, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-bluetooth"; + version = "3.34.5"; + + # TODO: split out "lib" + outputs = [ + "out" + "dev" + "devdoc" + "man" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.majorMinor finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz"; + hash = "sha256-bJSeUsi+zCBU2qzWBJAfZs5c9wml+pHEu3ysyTm1Pqk="; + }; + + patches = [ + # Fix build with meson 0.61. + # sendto/meson.build:24:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/commit/755fd758f866d3a3f7ca482942beee749f13a91e.patch"; + hash = "sha256-N0MJ0pYO411o2CTNZHWmEoG2m5TGUjR6YW6HSXHTR/A="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + gettext + itstool + pkg-config + libxml2 + wrapGAppsHook3 + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + python3 + ]; + + buildInputs = [ + glib + gtk3 + udev + libnotify + libcanberra-gtk3 + adwaita-icon-theme + gsettings-desktop-schemas + ]; + + mesonFlags = [ + "-Dicon_update=false" + "-Dgtk_doc=true" + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-bluetooth"; + attrPath = "gnome-bluetooth_1_0"; + freeze = true; + }; + }; + + meta = with lib; { + homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; + description = "Application that let you manage Bluetooth in the GNOME destkop"; + mainProgram = "bluetooth-sendto"; + maintainers = [ ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/gn/gnome-bluetooth/package.nix b/pkgs/by-name/gn/gnome-bluetooth/package.nix new file mode 100644 index 0000000000000..715a2d6c453ac --- /dev/null +++ b/pkgs/by-name/gn/gnome-bluetooth/package.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + fetchurl, + gnome, + meson, + mesonEmulatorHook, + ninja, + pkg-config, + gtk4, + libadwaita, + gettext, + glib, + udev, + upower, + itstool, + libxml2, + wrapGAppsHook4, + libnotify, + gsound, + gobject-introspection, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_43, + python3, + gsettings-desktop-schemas, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-bluetooth"; + version = "46.1"; + + # TODO: split out "lib" + outputs = [ + "out" + "dev" + "devdoc" + "man" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz"; + hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw="; + }; + + nativeBuildInputs = [ + meson + ninja + gettext + itstool + pkg-config + libxml2 + wrapGAppsHook4 + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + python3 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; + + buildInputs = [ + glib + gtk4 + libadwaita + udev + upower + libnotify + gsound + gsettings-desktop-schemas + ]; + + mesonFlags = [ "-Dgtk_doc=true" ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-bluetooth"; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-bluetooth"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + description = "Application that lets you manage Bluetooth in the GNOME desktop"; + mainProgram = "bluetooth-sendto"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/gn/gnome-color-manager/package.nix b/pkgs/by-name/gn/gnome-color-manager/package.nix index eddc4c5d432f5..4c9a0eac04add 100644 --- a/pkgs/by-name/gn/gnome-color-manager/package.nix +++ b/pkgs/by-name/gn/gnome-color-manager/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-color-manager/${lib.versions.majorMinor version}/gnome-color-manager-${version}.tar.xz"; - sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; + hash = "sha256-fDwXj6rPy/EdVt4izSZZRqfViqEOPNlowpOOL79Q/e4="; }; patches = [ ./0001-Fix-build-with-Exiv2-0.28.patch ]; diff --git a/pkgs/by-name/gn/gnome-common/package.nix b/pkgs/by-name/gn/gnome-common/package.nix index 1954088e6587a..df7eede7fa51d 100644 --- a/pkgs/by-name/gn/gnome-common/package.nix +++ b/pkgs/by-name/gn/gnome-common/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/gnome-common-${version}.tar.xz"; - sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; + hash = "sha256-IlaeNwrnVeBFJ7djKL78THO2K/1KVySZ/eEWuDGK+M8="; }; passthru = { diff --git a/pkgs/by-name/gn/gnome-connections/package.nix b/pkgs/by-name/gn/gnome-connections/package.nix index 0ae01fc27aeeb..5f684618b910b 100644 --- a/pkgs/by-name/gn/gnome-connections/package.nix +++ b/pkgs/by-name/gn/gnome-connections/package.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/connections"; + changelog = "https://gitlab.gnome.org/GNOME/connections/-/blob/${version}/NEWS?ref_type=tags"; description = "Remote desktop client for the GNOME desktop environment"; mainProgram = "gnome-connections"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix new file mode 100644 index 0000000000000..d5b1dd84c9252 --- /dev/null +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -0,0 +1,220 @@ +{ + fetchurl, + lib, + stdenv, + substituteAll, + accountsservice, + adwaita-icon-theme, + colord, + colord-gtk4, + cups, + dbus, + docbook-xsl-nons, + fontconfig, + gdk-pixbuf, + gettext, + glib, + glib-networking, + gcr_4, + glibc, + gnome-bluetooth, + gnome-color-manager, + gnome-desktop, + gnome-online-accounts, + gnome-settings-daemon, + gnome-tecla, + gnome, + gsettings-desktop-schemas, + gsound, + gst_all_1, + gtk4, + ibus, + json-glib, + libgtop, + libgudev, + libadwaita, + libkrb5, + libjxl, + libpulseaudio, + libpwquality, + librsvg, + webp-pixbuf-loader, + libsecret, + libsoup_3, + libwacom, + libXi, + libxml2, + libxslt, + meson, + modemmanager, + mutter, + networkmanager, + networkmanagerapplet, + libnma-gtk4, + ninja, + pkg-config, + polkit, + python3, + samba, + setxkbmap, + shadow, + shared-mime-info, + sound-theme-freedesktop, + tracker, + tracker-miners, + tzdata, + udisks2, + upower, + libepoxy, + gnome-user-share, + gnome-remote-desktop, + wrapGAppsHook4, + xorgserver, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-control-center"; + version = "46.4"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; + hash = "sha256-Wb0wWDl3v6KOVCJ+7iEeqG9If81tORXtIfWTJCZxAeA="; + }; + + patches = [ + (substituteAll { + src = ./paths.patch; + gcm = gnome-color-manager; + inherit glibc tzdata shadow; + inherit cups networkmanagerapplet; + }) + ]; + + nativeBuildInputs = [ + docbook-xsl-nons + gettext + libxslt + meson + ninja + pkg-config + python3 + shared-mime-info + wrapGAppsHook4 + ]; + + buildInputs = [ + accountsservice + adwaita-icon-theme + colord + colord-gtk4 + cups + fontconfig + gdk-pixbuf + glib + glib-networking + gcr_4 + gnome-bluetooth + gnome-desktop + gnome-online-accounts + gnome-remote-desktop # optional, sharing panel + gnome-settings-daemon + gnome-tecla + gnome-user-share # optional, sharing panel + gsettings-desktop-schemas + gsound + gtk4 + ibus + json-glib + libepoxy + libgtop + libgudev + libadwaita + libkrb5 + libnma-gtk4 + libpulseaudio + libpwquality + librsvg + libsecret + libsoup_3 + libwacom + libXi + libxml2 + modemmanager + mutter # schemas for the keybindings + networkmanager + polkit + samba + tracker + tracker-miners # for search locations dialog + udisks2 + upower + # For animations in Mouse panel. + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + ]; + + nativeCheckInputs = [ + dbus + python3.pkgs.pygobject3 # for test-networkmanager-service.py + python3.pkgs.python-dbusmock + setxkbmap + xorgserver # for Xvfb + ]; + + doCheck = true; + + preConfigure = '' + # For ITS rules + addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" + ''; + + preCheck = '' + # Basically same as https://github.com/NixOS/nixpkgs/pull/141299 + export ADW_DISABLE_PORTAL=1 + export XDG_DATA_DIRS=${glib.getSchemaDataDirPath gsettings-desktop-schemas} + ''; + + postInstall = '' + # Pull in WebP and JXL support for gnome-backgrounds. + # In postInstall to run before gappsWrapperArgsHook. + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + libjxl + librsvg + webp-pixbuf-loader + ]; + } + }" + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" + # Thumbnailers (for setting user profile pictures) + --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" + # WM keyboard shortcuts + --prefix XDG_DATA_DIRS : "${mutter}/share" + ) + for i in $out/share/applications/*; do + substituteInPlace $i --replace "Exec=gnome-control-center" "Exec=$out/bin/gnome-control-center" + done + ''; + + separateDebugInfo = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-control-center"; + }; + }; + + meta = with lib; { + description = "Utilities to configure the GNOME desktop"; + mainProgram = "gnome-control-center"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/by-name/gn/gnome-control-center/paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-control-center/paths.patch rename to pkgs/by-name/gn/gnome-control-center/paths.patch diff --git a/pkgs/by-name/gn/gnome-dictionary/package.nix b/pkgs/by-name/gn/gnome-dictionary/package.nix deleted file mode 100644 index 7e11d1dec189f..0000000000000 --- a/pkgs/by-name/gn/gnome-dictionary/package.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, meson -, ninja -, pkg-config -, desktop-file-utils -, appstream-glib -, libxslt -, libxml2 -, gettext -, itstool -, wrapGAppsHook3 -, docbook_xsl -, docbook_xml_dtd_43 -, gnome -, adwaita-icon-theme -, gtk3 -, glib -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-dictionary"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/gnome-dictionary-${version}.tar.xz"; - sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"; - }; - - patches = [ - # Fix test dependencies with meson 0.57, can be removed on next bump - # We need to explicitly depend on the generated files. - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/gnome-dictionary/-/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e.patch"; - sha256 = "tKesWeOK3OqOxrXm4dZvCZHHdTD7AQbYDjtYDCsLd3A="; - }) - # Fix build with meson 0.61, can be removed on next bump - # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/gnome-dictionary/-/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68.patch"; - sha256 = "cIRM6ACqsnEo2JWYvr6EBye5o0BudugZMShCe1U5hz8="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wrapGAppsHook3 - libxml2 - gettext - itstool - desktop-file-utils - appstream-glib - libxslt - docbook_xsl - docbook_xml_dtd_43 - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - adwaita-icon-theme - ]; - - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-dictionary"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/Archive/gnome-dictionary"; - description = "Dictionary is the GNOME application to look up definitions"; - mainProgram = "gnome-dictionary"; - maintainers = [ ]; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index dd65e5727623d..f93a877bc0188 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -15,6 +15,7 @@ , libnotify , itstool , gnome +, gnome-settings-daemon , adwaita-icon-theme , libxml2 , gsettings-desktop-schemas @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { udisks2 adwaita-icon-theme systemd - gnome.gnome-settings-daemon + gnome-settings-daemon gsettings-desktop-schemas ]; diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix new file mode 100644 index 0000000000000..cd7f737651895 --- /dev/null +++ b/pkgs/by-name/gn/gnome-flashback/package.nix @@ -0,0 +1,223 @@ +{ + stdenv, + lib, + autoreconfHook, + fetchurl, + gettext, + glib, + gnome-bluetooth, + gnome-desktop, + gnome-panel, + gnome-session, + gnome, + gsettings-desktop-schemas, + gtk3, + ibus, + libcanberra-gtk3, + libpulseaudio, + libxkbfile, + libxml2, + pkg-config, + polkit, + gdm, + systemd, + upower, + pam, + wrapGAppsHook3, + writeTextFile, + xkeyboard_config, + xorg, + nixosTests, + runCommand, + buildEnv, +}: + +let + # From data/sessions/Makefile.am + requiredComponentsCommon = enableGnomePanel: [ ] ++ lib.optional enableGnomePanel "gnome-panel"; + requiredComponentsGsd = [ + "org.gnome.SettingsDaemon.A11ySettings" + "org.gnome.SettingsDaemon.Color" + "org.gnome.SettingsDaemon.Datetime" + "org.gnome.SettingsDaemon.Housekeeping" + "org.gnome.SettingsDaemon.Keyboard" + "org.gnome.SettingsDaemon.MediaKeys" + "org.gnome.SettingsDaemon.Power" + "org.gnome.SettingsDaemon.PrintNotifications" + "org.gnome.SettingsDaemon.Rfkill" + "org.gnome.SettingsDaemon.ScreensaverProxy" + "org.gnome.SettingsDaemon.Sharing" + "org.gnome.SettingsDaemon.Smartcard" + "org.gnome.SettingsDaemon.Sound" + "org.gnome.SettingsDaemon.UsbProtection" + "org.gnome.SettingsDaemon.Wacom" + "org.gnome.SettingsDaemon.XSettings" + ]; + requiredComponents = + wmName: enableGnomePanel: + "RequiredComponents=${ + lib.concatStringsSep ";" ( + [ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd + ) + };"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-flashback"; + version = "3.52.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-flashback/${lib.versions.majorMinor finalAttrs.version}/gnome-flashback-${finalAttrs.version}.tar.xz"; + hash = "sha256-ugRhPNrbYr2iBkN8BHKZ4WAlzeG9gJXglKp3dpx4YDo="; + }; + + # make .desktop Execs absolute + postPatch = '' + patch -p0 <<END_PATCH + +++ data/applications/gnome-flashback.desktop.in + @@ -4 +4 @@ + -Exec=gnome-flashback + +Exec=$out/bin/gnome-flashback + END_PATCH + ''; + + postInstall = '' + # Check that our expected RequiredComponents match the stock session files, but then don't install them. + # They can be installed using mkSessionForWm. + grep '${requiredComponents "metacity" true}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false) + + rm -r $out/share/gnome-session + rm -r $out/share/xsessions + rm $out/libexec/gnome-flashback-metacity + ''; + + nativeBuildInputs = [ + autoreconfHook + gettext + libxml2 + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + glib + gnome-bluetooth + gnome-desktop + gsettings-desktop-schemas + gtk3 + ibus + libcanberra-gtk3 + libpulseaudio + libxkbfile + xorg.libXxf86vm + polkit + gdm + gnome-panel + systemd + upower + pam + xkeyboard_config + ]; + + doCheck = true; + + enableParallelBuilding = true; + + PKG_CONFIG_LIBGNOME_PANEL_LAYOUTSDIR = "${placeholder "out"}/share/gnome-panel/layouts"; + PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-flashback"; + versionPolicy = "odd-unstable"; + }; + + mkWmApplication = + { + wmName, + wmLabel, + wmCommand, + }: + writeTextFile { + name = "gnome-flashback-${wmName}-wm"; + destination = "/share/applications/${wmName}.desktop"; + text = '' + [Desktop Entry] + Type=Application + Encoding=UTF-8 + Name=${wmLabel} + Exec=${wmCommand} + NoDisplay=true + X-GNOME-WMName=${wmLabel} + X-GNOME-Autostart-Phase=WindowManager + X-GNOME-Provides=windowmanager + X-GNOME-Autostart-Notify=false + ''; + }; + + mkGnomeSession = + { + wmName, + wmLabel, + enableGnomePanel, + }: + writeTextFile { + name = "gnome-flashback-${wmName}-gnome-session"; + destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session"; + text = '' + [GNOME Session] + Name=GNOME Flashback (${wmLabel}) + ${requiredComponents wmName enableGnomePanel} + ''; + }; + + mkSessionForWm = + { + wmName, + wmLabel, + wmCommand, + }: + writeTextFile { + name = "gnome-flashback-${wmName}-xsession"; + destination = "/share/xsessions/gnome-flashback-${wmName}.desktop"; + text = '' + [Desktop Entry] + Name=GNOME Flashback (${wmLabel}) + Comment=This session logs you into GNOME Flashback with ${wmLabel} + Exec=${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName} + TryExec=${wmCommand} + Type=Application + DesktopNames=GNOME-Flashback;GNOME; + ''; + } + // { + providedSessions = [ "gnome-flashback-${wmName}" ]; + }; + + mkSystemdTargetForWm = + { + wmName, + wmLabel, + wmCommand, + enableGnomePanel, + }: + runCommand "gnome-flashback-${wmName}.target" { } '' + mkdir -p $out/lib/systemd/user + cp -r "${finalAttrs.finalPackage}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \ + "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d" + ''; + + tests = { + inherit (nixosTests) gnome-flashback; + }; + }; + + meta = with lib; { + description = "GNOME 2.x-like session for GNOME 3"; + mainProgram = "gnome-flashback"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-flashback"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-flashback/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + license = licenses.gpl2; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/gn/gnome-initial-setup/package.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix index e2d3e9eefdcbf..fb1a34e57c6c7 100644 --- a/pkgs/by-name/gn/gnome-initial-setup/package.nix +++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Simple, easy, and safe way to prepare a new system"; homepage = "https://gitlab.gnome.org/GNOME/gnome-initial-setup"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-keyring/package.nix b/pkgs/by-name/gn/gnome-keyring/package.nix index c26662eaec0b7..959a3de5890f4 100644 --- a/pkgs/by-name/gn/gnome-keyring/package.nix +++ b/pkgs/by-name/gn/gnome-keyring/package.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; homepage = "https://gitlab.gnome.org/GNOME/gnome-keyring"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/gn/gnome-klotski/package.nix b/pkgs/by-name/gn/gnome-klotski/package.nix index 11680d5466b23..eed4c62178bd6 100644 --- a/pkgs/by-name/gn/gnome-klotski/package.nix +++ b/pkgs/by-name/gn/gnome-klotski/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-klotski/${lib.versions.majorMinor version}/gnome-klotski-${version}.tar.xz"; - sha256 = "1qm01hdd5yp8chig62bj10912vclbdvywwczs84sfg4zci2phqwi"; + hash = "sha256-kWN4RWSfPKcJ0p9x7ndblG0REghyCfMiZOj60hoMoOI="; }; nativeBuildInputs = [ @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-klotski"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-klotski/-/blob/${version}/NEWS?ref_type=tags"; description = "Slide blocks to solve the puzzle"; mainProgram = "gnome-klotski"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-mahjongg/package.nix b/pkgs/by-name/gn/gnome-mahjongg/package.nix index 85b4e5b933070..168e9a7962903 100644 --- a/pkgs/by-name/gn/gnome-mahjongg/package.nix +++ b/pkgs/by-name/gn/gnome-mahjongg/package.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-mahjongg"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/blob/${version}/NEWS?ref_type=tags"; description = "Disassemble a pile of tiles by removing matching pairs"; mainProgram = "gnome-mahjongg"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index 85515a19ad704..789e0c4d9bc0c 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-lAtBuXQLCBMyXjkWdYcWz4+g7k4MkZHyYM7AbZITWDU="; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ gettext diff --git a/pkgs/by-name/gn/gnome-mines/package.nix b/pkgs/by-name/gn/gnome-mines/package.nix index a1b6bc46f32c2..bff53731d0405 100644 --- a/pkgs/by-name/gn/gnome-mines/package.nix +++ b/pkgs/by-name/gn/gnome-mines/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${lib.versions.major version}/gnome-mines-${version}.tar.xz"; - sha256 = "NQLps/ccs7LnEcDmAZGH/rzCvKh349RW3KtwD3vjEnI="; + hash = "sha256-NQLps/ccs7LnEcDmAZGH/rzCvKh349RW3KtwD3vjEnI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-monitor-config/package.nix b/pkgs/by-name/gn/gnome-monitor-config/package.nix index ef399902ef657..589f3dcdddcab 100644 --- a/pkgs/by-name/gn/gnome-monitor-config/package.nix +++ b/pkgs/by-name/gn/gnome-monitor-config/package.nix @@ -1,14 +1,15 @@ -{ lib -, fetchFromGitHub -, stdenv -, meson -, ninja -, pkg-config -, cairo -, glib +{ + lib, + fetchFromGitHub, + stdenv, + meson, + ninja, + pkg-config, + cairo, + glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-monitor-config"; version = "0-unstable-2023-09-26"; @@ -19,10 +20,17 @@ stdenv.mkDerivation rec { hash = "sha256-uVWhQ5SCyadDkeOd+pY2cYZAQ0ZvWMlgndcr1ZIEf50="; }; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config + glib ]; buildInputs = [ @@ -30,11 +38,10 @@ stdenv.mkDerivation rec { glib ]; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mv src/gnome-monitor-config $out/bin - runHook postInstall + postPatch = '' + substituteInPlace src/meson.build \ + --replace-fail "executable('gnome-monitor-config', src" \ + "executable('gnome-monitor-config', src, install : true" ''; meta = with lib; { diff --git a/pkgs/by-name/gn/gnome-nettool/package.nix b/pkgs/by-name/gn/gnome-nettool/package.nix index 781851e18c895..2860fdefaaea5 100644 --- a/pkgs/by-name/gn/gnome-nettool/package.nix +++ b/pkgs/by-name/gn/gnome-nettool/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-nettool/${lib.versions.major version}/gnome-nettool-${version}.tar.xz"; - sha256 = "pU8p7vIDiu5pVRyLGcpPdY5eueIJCkvGtWM9/wGIdR8="; + hash = "sha256-pU8p7vIDiu5pVRyLGcpPdY5eueIJCkvGtWM9/wGIdR8="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gnome-nettool/-/merge_requests/3 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gnome-nettool/-/commit/1124c3e1fdb8472d30b7636500229aa16cdc1244.patch"; - sha256 = "fbpfL8Xb1GsadpQzAdmu8FSPs++bsGCVdcwnzQWttGY="; + hash = "sha256-fbpfL8Xb1GsadpQzAdmu8FSPs++bsGCVdcwnzQWttGY="; }) ]; diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix index aba0819d96213..e6d018028da15 100644 --- a/pkgs/by-name/gn/gnome-nibbles/package.nix +++ b/pkgs/by-name/gn/gnome-nibbles/package.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Guide a worm around a maze"; mainProgram = "gnome-nibbles"; homepage = "https://gitlab.gnome.org/GNOME/gnome-nibbles"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix index c246cb5b912ee..0f4c8dbfc5dc2 100644 --- a/pkgs/by-name/gn/gnome-notes/package.nix +++ b/pkgs/by-name/gn/gnome-notes/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/bijiben/${lib.versions.major version}/bijiben-${version}.tar.xz"; - sha256 = "1gvvb2klkzbmyzwkjgmscdiqcl8lyz9b0rxb4igjz079csq6z805"; + hash = "sha256-BaBvsGbpgC9fJKtnsNL3FFGGY2O6Pjn593X9SadYe78="; }; patches = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/994af76ce5144062d55d141129bf6bf5fab002ee.patch"; - sha256 = "sha256-z7dPOLZzaqvdqUIDy6+V3dKossRbG0EDjBu2oJCF6b4="; + hash = "sha256-z7dPOLZzaqvdqUIDy6+V3dKossRbG0EDjBu2oJCF6b4="; }) ]; diff --git a/pkgs/by-name/gn/gnome-packagekit/package.nix b/pkgs/by-name/gn/gnome-packagekit/package.nix index 699e24fba18e3..173d6d4bd7c51 100644 --- a/pkgs/by-name/gn/gnome-packagekit/package.nix +++ b/pkgs/by-name/gn/gnome-packagekit/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-packagekit/${lib.versions.major version}/gnome-packagekit-${version}.tar.xz"; - sha256 = "zaRVplKpI7LqL3Axa9D92Clve2Lu8/r9nOUMjmbF8ZU="; + hash = "sha256-zaRVplKpI7LqL3Axa9D92Clve2Lu8/r9nOUMjmbF8ZU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/misc/gnome-panel/modulesdir-env-var.patch b/pkgs/by-name/gn/gnome-panel/modulesdir-env-var.patch similarity index 100% rename from pkgs/desktops/gnome/misc/gnome-panel/modulesdir-env-var.patch rename to pkgs/by-name/gn/gnome-panel/modulesdir-env-var.patch diff --git a/pkgs/by-name/gn/gnome-panel/package.nix b/pkgs/by-name/gn/gnome-panel/package.nix new file mode 100644 index 0000000000000..46a9fe58898d1 --- /dev/null +++ b/pkgs/by-name/gn/gnome-panel/package.nix @@ -0,0 +1,113 @@ +{ + stdenv, + lib, + fetchurl, + autoreconfHook, + dconf, + evolution-data-server, + gdm, + geocode-glib_2, + gettext, + glib, + gnome-desktop, + gnome-menus, + gnome, + gtk3, + itstool, + libgweather, + libwnck, + libxml2, + pkg-config, + polkit, + systemd, + wrapGAppsHook3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-panel"; + version = "3.52.0"; + + outputs = [ + "out" + "dev" + "man" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-panel/${lib.versions.majorMinor finalAttrs.version}/gnome-panel-${finalAttrs.version}.tar.xz"; + hash = "sha256-nim6iHPN5A1AwpNKRk+PQ7ousbUisZFEfKon3XhTxdQ="; + }; + + patches = [ + # Load modules from path in `NIX_GNOME_PANEL_MODULESDIR` environment variable + # instead of gnome-panel’s libdir so that the NixOS module can make gnome-panel + # load modules from other packages as well. + ./modulesdir-env-var.patch + ]; + + # make .desktop Exec absolute + postPatch = '' + patch -p0 <<END_PATCH + +++ gnome-panel/gnome-panel.desktop.in + @@ -7 +7 @@ + -Exec=gnome-panel + +Exec=$out/bin/gnome-panel + END_PATCH + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome-menus}/share" + --prefix XDG_CONFIG_DIRS : "${gnome-menus}/etc/xdg" + ) + ''; + + nativeBuildInputs = [ + autoreconfHook + gettext + itstool + libxml2 + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + dconf + evolution-data-server + gdm + geocode-glib_2 + glib + gnome-desktop + gnome-menus + gtk3 + libgweather + libwnck + polkit + systemd + ]; + + configureFlags = [ + "--enable-eds" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-panel"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Component of Gnome Flashback that provides panels and default applets for the desktop"; + mainProgram = "gnome-panel"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-panel"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-panel/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/gn/gnome-panel/wrapper.nix b/pkgs/by-name/gn/gnome-panel/wrapper.nix new file mode 100644 index 0000000000000..9fb6d3c2d1ddd --- /dev/null +++ b/pkgs/by-name/gn/gnome-panel/wrapper.nix @@ -0,0 +1,73 @@ +{ + stdenv, + lib, + buildEnv, + gnome-panel, + gnome-flashback, + xorg, + glib, + wrapGAppsHook3, + panelModulePackages ? [ ], +}: + +let + # We always want to find the built-in panel applets. + selectedPanelModulePackages = [ + gnome-panel + gnome-flashback + ] ++ panelModulePackages; + + panelModulesEnv = buildEnv { + name = "gnome-panel-modules-env"; + paths = selectedPanelModulePackages; + pathsToLink = [ "/lib/gnome-panel/modules" ]; + }; +in +stdenv.mkDerivation { + pname = "${gnome-panel.pname}-with-modules"; + inherit (gnome-panel) version; + + nativeBuildInputs = [ + glib + wrapGAppsHook3 + ]; + + buildInputs = + selectedPanelModulePackages + ++ lib.forEach selectedPanelModulePackages (x: x.buildInputs or [ ]); + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + preferLocalBuild = true; + allowSubstitutes = false; + + installPhase = '' + runHook preInstall + + mkdir -p $out + ${xorg.lndir}/bin/lndir -silent ${gnome-panel} $out + + rm -r $out/lib/gnome-panel/modules + ${xorg.lndir}/bin/lndir -silent ${panelModulesEnv} $out + + rm $out/share/applications/gnome-panel.desktop + + substitute ${gnome-panel}/share/applications/gnome-panel.desktop \ + $out/share/applications/gnome-panel.desktop --replace \ + "Exec=${gnome-panel}/bin/gnome-panel" "Exec=$out/bin/gnome-panel" + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --set NIX_GNOME_PANEL_MODULESDIR "$out/lib/gnome-panel/modules" + ) + ''; + + meta = gnome-panel.meta // { + outputsToInstall = [ "out" ]; + }; +} diff --git a/pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch b/pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch index 0750d01f86757..b7e6dfaa327b8 100644 --- a/pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch +++ b/pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch @@ -1,29 +1,3 @@ -diff --git a/data/meson.build b/data/meson.build -index 5e4ce69..982b3c9 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -31,7 +31,7 @@ i18n.merge_file( - - install_data( - 'org.gnome.pomodoro.gschema.xml', -- install_dir: get_option('datadir') / 'glib-2.0' / 'schemas', -+ install_dir: gschema_dir, - ) - - subdir('icons') -diff --git a/meson-post-install.sh b/meson-post-install.sh -index bf4013a..c87fba4 100644 ---- a/meson-post-install.sh -+++ b/meson-post-install.sh -@@ -7,7 +7,7 @@ datadir="${prefix}/$1" - # want/need us to do the below - if [ -z "${DESTDIR}" ]; then - echo "Compiling GSchema..." -- glib-compile-schemas "${datadir}/glib-2.0/schemas" -+ glib-compile-schemas "${datadir}/gsettings-schemas/@pname@-@version@/glib-2.0/schemas" - - echo "Updating icon cache..." - gtk-update-icon-cache -f -t "${datadir}/icons/hicolor" diff --git a/meson.build b/meson.build index 09857a1..a07d27c 100644 --- a/meson.build @@ -38,3 +12,12 @@ index 09857a1..a07d27c 100644 plugin_libdir = get_option('prefix') / get_option('libdir') / meson.project_name() / 'plugins' extension_dir = get_option('prefix') / get_option('datadir') / 'gnome-shell' / 'extensions' / 'pomodoro@arun.codito.in' +@@ -134,7 +135,7 @@ + subdir('tests') + + gnome.post_install( +- glib_compile_schemas: true, ++ glib_compile_schemas: false, + gtk_update_icon_cache: true, + update_desktop_database: true, + ) diff --git a/pkgs/by-name/gn/gnome-pomodoro/package.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix index b470feab03f78..6c7ee5e234318 100644 --- a/pkgs/by-name/gn/gnome-pomodoro/package.nix +++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix @@ -1,36 +1,36 @@ -{ lib -, stdenv -, fetchFromGitHub -, substituteAll -, meson -, ninja -, pkg-config -, wrapGAppsHook3 -, desktop-file-utils -, libcanberra -, gst_all_1 -, vala -, gtk3 -, gom -, sqlite -, libxml2 -, glib -, gobject-introspection -, json-glib -, libpeas -, gsettings-desktop-schemas -, gettext +{ + lib, + stdenv, + fetchFromGitHub, + substituteAll, + meson, + ninja, + pkg-config, + wrapGAppsHook3, + desktop-file-utils, + libcanberra, + gst_all_1, + vala, + gtk3, + gom, + sqlite, + libxml2, + glib, + gobject-introspection, + json-glib, + libpeas, + gsettings-desktop-schemas, + gettext, }: - stdenv.mkDerivation rec { pname = "gnome-pomodoro"; - version = "0.24.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-Ml3znMz1Q9593rMgfAST8k9QglxMG9ocFD7W8kaFWCw="; + hash = "sha256-icyS/K6H90/DWYvqJ7f7XXTTuIwLea3k+vDDEBYil6o="; }; patches = [ @@ -42,6 +42,13 @@ stdenv.mkDerivation rec { }) ]; + # Manually compile schemas for package since meson option + # gnome.post_install(glib_compile_schemas) used by package tries to compile in + # the wrong dir. + preFixup = '' + glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} + ''; + nativeBuildInputs = [ meson ninja @@ -76,7 +83,10 @@ stdenv.mkDerivation rec { This GNOME utility helps to manage time according to Pomodoro Technique. It intends to improve productivity and focus by taking short breaks. ''; - maintainers = [ ]; + maintainers = with maintainers; [ + aleksana + herschenglime + ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/gn/gnome-power-manager/package.nix b/pkgs/by-name/gn/gnome-power-manager/package.nix index 607c5f0841393..ac807494d33d2 100644 --- a/pkgs/by-name/gn/gnome-power-manager/package.nix +++ b/pkgs/by-name/gn/gnome-power-manager/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-power-manager/${lib.versions.major version}/gnome-power-manager-${version}.tar.xz"; - sha256 = "faq0i73bMOnfKrplDLYNBeZnyfiFrOagoeeVDgy90y8="; + hash = "sha256-faq0i73bMOnfKrplDLYNBeZnyfiFrOagoeeVDgy90y8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index 31896fef41b0d..3c3e319767a37 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/blob/${version}/NEWS?ref_type=tags"; description = "GNOME Remote Desktop server"; mainProgram = "grdctl"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-robots/package.nix b/pkgs/by-name/gn/gnome-robots/package.nix index 5a4ceb8efb651..dfe37b8dff4c4 100644 --- a/pkgs/by-name/gn/gnome-robots/package.nix +++ b/pkgs/by-name/gn/gnome-robots/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/gnome-robots-${version}.tar.xz"; - sha256 = "04fbykj576dq1h6cycgfhh8wd6yxmlsqykvj188sbwahay42zgvg"; + hash = "sha256-b78viFdQ8aURCnJPjzWt3ZvGEYTuMc8MDLiZU+T0yxE="; }; nativeBuildInputs = [ @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-robots"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-robots/-/blob/${version}/NEWS?ref_type=tags"; description = "Avoid the robots and make them crash into each other"; mainProgram = "gnome-robots"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-screenshot/package.nix b/pkgs/by-name/gn/gnome-screenshot/package.nix index 7af7cec11bfc3..ec62a734686ee 100644 --- a/pkgs/by-name/gn/gnome-screenshot/package.nix +++ b/pkgs/by-name/gn/gnome-screenshot/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-screenshot/${lib.versions.major version}/gnome-screenshot-${version}.tar.xz"; - sha256 = "Stt97JJkKPdCY9V5ZnPPFC5HILbnaPVGio0JM/mMlZc="; + hash = "sha256-Stt97JJkKPdCY9V5ZnPPFC5HILbnaPVGio0JM/mMlZc="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gnome-screenshot/-/issues/186 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gnome-screenshot/-/commit/b60dad3c2536c17bd201f74ad8e40eb74385ed9f.patch"; - sha256 = "Js83h/3xxcw2hsgjzGa5lAYFXVrt6MPhXOTh5dZTx/w="; + hash = "sha256-Js83h/3xxcw2hsgjzGa5lAYFXVrt6MPhXOTh5dZTx/w="; }) ]; diff --git a/pkgs/desktops/gnome/core/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix similarity index 85% rename from pkgs/desktops/gnome/core/gnome-session/ctl.nix rename to pkgs/by-name/gn/gnome-session/ctl.nix index 10b59d660bef1..fbdad96f92368 100644 --- a/pkgs/desktops/gnome/core/gnome-session/ctl.nix +++ b/pkgs/by-name/gn/gnome-session/ctl.nix @@ -1,12 +1,13 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, glib -, systemd -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + glib, + systemd, + wrapGAppsHook3, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch b/pkgs/by-name/gn/gnome-session/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-session/fix-paths.patch rename to pkgs/by-name/gn/gnome-session/fix-paths.patch diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix new file mode 100644 index 0000000000000..9b3dcd14718dd --- /dev/null +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -0,0 +1,142 @@ +{ + fetchurl, + lib, + stdenv, + substituteAll, + meson, + ninja, + pkg-config, + gnome, + adwaita-icon-theme, + glib, + gtk3, + gsettings-desktop-schemas, + gnome-desktop, + gnome-settings-daemon, + gnome-shell, + dbus, + json-glib, + libICE, + xmlto, + docbook_xsl, + docbook_xml_dtd_412, + python3, + libxslt, + gettext, + makeWrapper, + systemd, + xorg, + libepoxy, + bash, + gnome-session-ctl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-session"; + # Also bump ./ctl.nix when bumping major version. + version = "46.0"; + + outputs = [ + "out" + "sessions" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz"; + hash = "sha256-xuFiSvYJC8ThoZH+Imir+nqN4HgxynpX8hfmeb97mlQ="; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + gsettings = "${glib.bin}/bin/gsettings"; + dbusLaunch = "${dbus.lib}/bin/dbus-launch"; + bash = "${bash}/bin/bash"; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + makeWrapper + xmlto + libxslt + docbook_xsl + docbook_xml_dtd_412 + python3 + dbus # for DTD + ]; + + buildInputs = [ + glib + gtk3 + libICE + gnome-desktop + json-glib + xorg.xtrans + adwaita-icon-theme + gnome-settings-daemon + gsettings-desktop-schemas + systemd + libepoxy + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + + # Use our provided `gnome-session-ctl` + original="@libexecdir@/gnome-session-ctl" + replacement="${gnome-session-ctl}/libexec/gnome-session-ctl" + + find data/ -type f -name "*.service.in" -exec sed -i \ + -e s,$original,$replacement,g \ + {} + + ''; + + # We move the GNOME sessions to another output since gnome-session is a dependency of + # GDM itself. If we do not hide them, it will show broken GNOME sessions when GDM is + # enabled without proper GNOME installation. + postInstall = '' + mkdir $sessions + moveToOutput share/wayland-sessions "$sessions" + moveToOutput share/xsessions "$sessions" + + # Our provided one is being used + rm -rf $out/libexec/gnome-session-ctl + ''; + + # `bin/gnome-session` will reset the environment when run in wayland, we + # therefor wrap `libexec/gnome-session-binary` instead which is the actual + # binary needing wrapping + preFixup = '' + wrapProgram "$out/libexec/gnome-session-binary" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : "${gnome-shell}/share" \ + --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg" + ''; + + separateDebugInfo = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-session"; + }; + providedSessions = [ + "gnome" + "gnome-xorg" + ]; + }; + + meta = with lib; { + description = "GNOME session manager"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-session"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-session/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix b/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix new file mode 100644 index 0000000000000..23d0a8eaa7206 --- /dev/null +++ b/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix @@ -0,0 +1,128 @@ +{ + stdenv, + lib, + fetchpatch, + substituteAll, + fetchurl, + meson, + ninja, + pkg-config, + perl, + gettext, + gtk3, + glib, + libnotify, + libgnomekbd, + lcms2, + libpulseaudio, + alsa-lib, + libcanberra-gtk3, + upower, + colord, + libgweather, + polkit, + gsettings-desktop-schemas, + geoclue2, + systemd, + libgudev, + libwacom, + libxslt, + libxml2, + modemmanager, + networkmanager, + gnome-desktop, + geocode-glib_2, + docbook_xsl, + wrapGAppsHook3, + python3, + tzdata, + nss, + gcr_4, + gnome-session-ctl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-settings-daemon"; + version = "43.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz"; + hash = "sha256-NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A="; + }; + + patches = [ + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/aae1e774dd9de22fe3520cf9eb2bfbf7216f5eb0.patch"; + hash = "sha256-O4m0rOW8Zrgu3Q0p0OA8b951VC0FjYbOUk9MLzB9icI="; + }) + + (substituteAll { + src = ./fix-paths.patch; + inherit tzdata; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + perl + gettext + libxml2 + libxslt + docbook_xsl + wrapGAppsHook3 + python3 + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + modemmanager + networkmanager + libnotify + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema + gnome-desktop + lcms2 + libpulseaudio + alsa-lib + libcanberra-gtk3 + upower + colord + libgweather + nss + polkit + geocode-glib_2 + geoclue2 + systemd + libgudev + libwacom + gcr_4 + ]; + + mesonFlags = [ + "-Dudev_dir=${placeholder "out"}/lib/udev" + "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" + ]; + + # Default for release buildtype but passed manually because + # we're using plain + env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; + + postPatch = '' + for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do + chmod +x $f + patchShebangs $f + done + ''; + + meta = with lib; { + description = "GNOME Settings Daemon"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"; + license = licenses.gpl2Plus; + maintainers = teams.pantheon.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch b/pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch rename to pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/add-gnome-session-ctl-option.patch b/pkgs/by-name/gn/gnome-settings-daemon/add-gnome-session-ctl-option.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-settings-daemon/add-gnome-session-ctl-option.patch rename to pkgs/by-name/gn/gnome-settings-daemon/add-gnome-session-ctl-option.patch diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch b/pkgs/by-name/gn/gnome-settings-daemon/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch rename to pkgs/by-name/gn/gnome-settings-daemon/fix-paths.patch diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix new file mode 100644 index 0000000000000..8f9b06f0dfda6 --- /dev/null +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -0,0 +1,125 @@ +{ + stdenv, + lib, + substituteAll, + fetchurl, + meson, + ninja, + pkg-config, + gnome, + perl, + gettext, + gtk3, + glib, + libnotify, + libgnomekbd, + libpulseaudio, + alsa-lib, + libcanberra-gtk3, + upower, + colord, + libgweather, + polkit, + gsettings-desktop-schemas, + geoclue2, + systemd, + libgudev, + libwacom, + libxslt, + libxml2, + modemmanager, + networkmanager, + gnome-desktop, + geocode-glib_2, + docbook_xsl, + wrapGAppsHook3, + python3, + tzdata, + gcr_4, + gnome-session-ctl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-settings-daemon"; + version = "46.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz"; + hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c="; + }; + + patches = [ + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 + ./add-gnome-session-ctl-option.patch + + (substituteAll { + src = ./fix-paths.patch; + inherit tzdata; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + perl + gettext + libxml2 + libxslt + docbook_xsl + wrapGAppsHook3 + python3 + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + modemmanager + networkmanager + libnotify + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema + gnome-desktop + libpulseaudio + alsa-lib + libcanberra-gtk3 + upower + colord + libgweather + polkit + geocode-glib_2 + geoclue2 + systemd + libgudev + libwacom + gcr_4 + ]; + + mesonFlags = [ + "-Dudev_dir=${placeholder "out"}/lib/udev" + "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" + ]; + + # Default for release buildtype but passed manually because + # we're using plain + env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; + + postPatch = '' + for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do + chmod +x $f + patchShebangs $f + done + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-settings-daemon"; + }; + }; + + meta = with lib; { + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index dbcf91b5bc49d..f0a7bf588822f 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Modify and extend GNOME Shell functionality and behavior"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch b/pkgs/by-name/gn/gnome-shell/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch rename to pkgs/by-name/gn/gnome-shell/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch b/pkgs/by-name/gn/gnome-shell/greeter-logo-size.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch rename to pkgs/by-name/gn/gnome-shell/greeter-logo-size.patch diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix new file mode 100644 index 0000000000000..c2f2a1bb42f30 --- /dev/null +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -0,0 +1,246 @@ +{ + fetchurl, + fetchpatch, + substituteAll, + lib, + stdenv, + meson, + ninja, + pkg-config, + gnome, + json-glib, + gettext, + libsecret, + python3, + polkit, + networkmanager, + gi-docgen, + at-spi2-core, + unzip, + shared-mime-info, + libgweather, + libjxl, + librsvg, + webp-pixbuf-loader, + geoclue2, + perl, + desktop-file-utils, + libpulseaudio, + libical, + gobject-introspection, + wrapGAppsHook4, + libxslt, + gcr_4, + accountsservice, + gdk-pixbuf, + gdm, + upower, + ibus, + libnma-gtk4, + gnome-desktop, + gsettings-desktop-schemas, + gnome-keyring, + glib, + gjs, + mutter, + evolution-data-server-gtk4, + gtk4, + libadwaita, + sassc, + systemd, + pipewire, + gst_all_1, + adwaita-icon-theme, + gnome-bluetooth, + gnome-clocks, + gnome-settings-daemon, + gnome-autoar, + gnome-tecla, + asciidoc, + bash-completion, + mesa, + libGL, + libXi, + libX11, + libxml2, +}: + +let + pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]); +in +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-shell"; + version = "46.4"; + + outputs = [ + "out" + "devdoc" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; + hash = "sha256-GIRo/nLpCsSyNOnU0HB9YH/q85oT0lvTqj63XlWj4FI="; + }; + + patches = [ + # Hardcode paths to various dependencies so that they can be found at runtime. + (substituteAll { + src = ./fix-paths.patch; + glib_compile_schemas = "${glib.dev}/bin/glib-compile-schemas"; + gsettings = "${glib.bin}/bin/gsettings"; + tecla = "${lib.getBin gnome-tecla}/bin/tecla"; + unzip = "${lib.getBin unzip}/bin/unzip"; + }) + + # Use absolute path for libshew installation to make our patched gobject-introspection + # aware of the location to hardcode in the generated GIR file. + ./shew-gir-path.patch + + # Make D-Bus services wrappable. + ./wrap-services.patch + + # Fix greeter logo being too big. + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2591 + # Reverts https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1101 + ./greeter-logo-size.patch + + # Work around failing fingerprint auth + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/dcd112d9708954187e7490564c2229d82ba5326f/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; + hash = "sha256-mgXty5HhiwUO1UV3/eDgWtauQKM0cRFQ0U7uocST25s="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gi-docgen + perl + wrapGAppsHook4 + sassc + desktop-file-utils + libxslt.bin + asciidoc + gobject-introspection + ]; + + buildInputs = [ + systemd + gsettings-desktop-schemas + gnome-keyring + glib + gcr_4 + accountsservice + libsecret + polkit + gdk-pixbuf + librsvg + networkmanager + gjs + mutter + libpulseaudio + evolution-data-server-gtk4 + libical + gtk4 + libadwaita + gdm + geoclue2 + adwaita-icon-theme + gnome-bluetooth + gnome-clocks # schemas needed + at-spi2-core + upower + ibus + gnome-desktop + gnome-settings-daemon + mesa + libGL # for egl, required by mutter-clutter + libXi # required by libmutter + libX11 + libxml2 + + # recording + pipewire + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + + # not declared at build time, but typelib is needed at runtime + libgweather + libnma-gtk4 + + # for gnome-extension tool + bash-completion + gnome-autoar + json-glib + + # for tools + pythonEnv + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Dtests=false" + ]; + + postPatch = '' + patchShebangs src/data-to-c.pl + + # We can generate it ourselves. + rm -f man/gnome-shell.1 + rm data/theme/gnome-shell-{light,dark}.css + ''; + + postInstall = '' + # Pull in WebP and JXL support for gnome-backgrounds. + # In postInstall to run before gappsWrapperArgsHook. + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + libjxl + librsvg + webp-pixbuf-loader + ]; + } + }" + ''; + + preFixup = '' + gappsWrapperArgs+=( + # Until glib’s xdgmime is patched + # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format” + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + postFixup = '' + # The services need typelibs. + for svc in org.gnome.ScreenSaver org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do + wrapGApp $out/share/gnome-shell/$svc + done + + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + separateDebugInfo = true; + + passthru = { + mozillaPlugin = "/lib/mozilla/plugins"; + updateScript = gnome.updateScript { + packageName = "gnome-shell"; + }; + }; + + meta = with lib; { + description = "Core user interface for the GNOME 3 desktop"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-shell"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; + +}) diff --git a/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch rename to pkgs/by-name/gn/gnome-shell/shew-gir-path.patch diff --git a/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch b/pkgs/by-name/gn/gnome-shell/wrap-services.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch rename to pkgs/by-name/gn/gnome-shell/wrap-services.patch diff --git a/pkgs/by-name/gn/gnome-sound-recorder/package.nix b/pkgs/by-name/gn/gnome-sound-recorder/package.nix index 846624fe62809..059e30b7aacc9 100644 --- a/pkgs/by-name/gn/gnome-sound-recorder/package.nix +++ b/pkgs/by-name/gn/gnome-sound-recorder/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-sound-recorder/${lib.versions.major version}/gnome-sound-recorder-${version}.tar.xz"; - sha256 = "bbbbmjsbUv0KtU+aW/Tymctx5SoTrF/fw+dOtGmFpOY="; + hash = "sha256-bbbbmjsbUv0KtU+aW/Tymctx5SoTrF/fw+dOtGmFpOY="; }; nativeBuildInputs = [ @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { description = "Simple and modern sound recorder"; mainProgram = "gnome-sound-recorder"; homepage = "https://gitlab.gnome.org/World/vocalis"; + changelog = "https://gitlab.gnome.org/World/vocalis/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index 8e45b5e155ff3..be14eb6d74a00 100644 --- a/pkgs/by-name/gn/gnome-sudoku/package.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-sudoku"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-sudoku/-/blob/${version}/NEWS?ref_type=tags"; description = "Test your logic skills in this number grid puzzle"; mainProgram = "gnome-sudoku"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-taquin/package.nix b/pkgs/by-name/gn/gnome-taquin/package.nix index e570d9148b45a..8cc7aac2c8528 100644 --- a/pkgs/by-name/gn/gnome-taquin/package.nix +++ b/pkgs/by-name/gn/gnome-taquin/package.nix @@ -26,18 +26,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/gnome-taquin-${version}.tar.xz"; - sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn"; + hash = "sha256-lts9j61JeSSnOQrRCKPvckMqHWLSRWyuXhk0BXAYgU8="; }; patches = [ # Fix build with recent Vala. (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/99dea5e7863e112f33f16e59898c56a4f1a547b3.patch"; - sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; + hash = "sha256-U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; }) (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/66be44dc20d114e449fc33156e3939fd05dfbb16.patch"; - sha256 = "RN41RCLHlJyXTARSH9qjsmpYi1UFeMRssoYxRsbngDQ="; + hash = "sha256-RN41RCLHlJyXTARSH9qjsmpYi1UFeMRssoYxRsbngDQ="; }) ]; diff --git a/pkgs/by-name/gn/gnome-tetravex/package.nix b/pkgs/by-name/gn/gnome-tetravex/package.nix index cdf2c28e291d5..dc2752f552b92 100644 --- a/pkgs/by-name/gn/gnome-tetravex/package.nix +++ b/pkgs/by-name/gn/gnome-tetravex/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/gnome-tetravex-${version}.tar.xz"; - sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z"; + hash = "sha256-H83xCXm5o1JgCdeDociKOJkY82DaTttE+6JccfGGkRs="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # Taken from https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gnome-tetravex/-/commit/80912d06f5e588f6aca966fa516103275e58d94e.patch"; - sha256 = "2+nFw5sJzbInibKaq3J10Ufbl3CnZWlgnUtzRTZ5G0I="; + hash = "sha256-2+nFw5sJzbInibKaq3J10Ufbl3CnZWlgnUtzRTZ5G0I="; }) ]; diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix new file mode 100644 index 0000000000000..2edd058907b03 --- /dev/null +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + meson, + fetchurl, + python3, + pkg-config, + gtk4, + glib, + gtksourceview5, + gsettings-desktop-schemas, + wrapGAppsHook4, + ninja, + gnome, + cairo, + enchant, + icu, + itstool, + libadwaita, + editorconfig-core-c, + libxml2, + desktop-file-utils, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-text-editor"; + version = "46.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz"; + hash = "sha256-AFtIEEqQm+Zq4HRI0rxXBsfRE3gQV6JP9tpVvfMkxz0="; + }; + + nativeBuildInputs = [ + desktop-file-utils + itstool + libxml2 # for xmllint + meson + ninja + pkg-config + python3 + wrapGAppsHook4 + ]; + + buildInputs = [ + cairo + enchant + icu + glib + gsettings-desktop-schemas + gtk4 + gtksourceview5 + libadwaita + editorconfig-core-c + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-text-editor"; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-text-editor"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-text-editor/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + description = "Text Editor for GNOME"; + mainProgram = "gnome-text-editor"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/gn/gnome-themes-extra/package.nix b/pkgs/by-name/gn/gnome-themes-extra/package.nix index c40c81b8245f7..64d3d4c1a0fe3 100644 --- a/pkgs/by-name/gn/gnome-themes-extra/package.nix +++ b/pkgs/by-name/gn/gnome-themes-extra/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gnome-themes-extra/${lib.versions.majorMinor version}/gnome-themes-extra-${version}.tar.xz"; - sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw"; + hash = "sha256-fEugv/AB8G2Jg8/BBa2qxC3x0SZ6JZF5ingLrFV6WBk="; }; passthru = { diff --git a/pkgs/by-name/gn/gnome-tour/package.nix b/pkgs/by-name/gn/gnome-tour/package.nix new file mode 100644 index 0000000000000..db5fd2e68c107 --- /dev/null +++ b/pkgs/by-name/gn/gnome-tour/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + rustPlatform, + gettext, + meson, + ninja, + fetchurl, + pkg-config, + gtk4, + glib, + gdk-pixbuf, + desktop-file-utils, + appstream-glib, + wrapGAppsHook4, + python3, + gnome, + libadwaita, + librsvg, + rustc, + cargo, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-tour"; + version = "46.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-tour/${lib.versions.major finalAttrs.version}/gnome-tour-${finalAttrs.version}.tar.xz"; + hash = "sha256-8yZSqp1+8GQ3YM5jkyCCz9NkHnczt2xCm3jQl4O3xGo="; + }; + + cargoVendorDir = "vendor"; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + appstream-glib + cargo + desktop-file-utils + gettext + glib # glib-compile-resources + meson + ninja + pkg-config + python3 + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + gdk-pixbuf + glib + gtk4 + libadwaita + librsvg + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-tour"; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-tour"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-tour/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + description = "GNOME Greeter & Tour"; + mainProgram = "gnome-tour"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix index 0e3e44f345d55..075b2d777ec3f 100644 --- a/pkgs/by-name/gn/gnome-tweaks/package.nix +++ b/pkgs/by-name/gn/gnome-tweaks/package.nix @@ -8,6 +8,8 @@ , glib , gnome , gnome-desktop +, gnome-settings-daemon +, gnome-shell , gnome-shell-extensions , gobject-introspection , gsettings-desktop-schemas @@ -17,6 +19,7 @@ , libgudev , libnotify , libxml2 +, mutter , pkg-config , python3Packages , wrapGAppsHook4 @@ -48,11 +51,11 @@ python3Packages.buildPythonApplication rec { gdk-pixbuf glib gnome-desktop - gnome.gnome-settings-daemon - gnome.gnome-shell + gnome-settings-daemon + gnome-shell # Makes it possible to select user themes through the `user-theme` extension gnome-shell-extensions - gnome.mutter + mutter gsettings-desktop-schemas gtk4 libadwaita diff --git a/pkgs/by-name/gn/gnome-user-share/package.nix b/pkgs/by-name/gn/gnome-user-share/package.nix index 1d2368478bb1c..1f7f8a0a3aaa9 100644 --- a/pkgs/by-name/gn/gnome-user-share/package.nix +++ b/pkgs/by-name/gn/gnome-user-share/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major finalAttrs.version}/gnome-user-share-${finalAttrs.version}.tar.xz"; - sha256 = "DfMGqgVYMT81Pvf1G/onwDYoGtxFZ34c+/p8n4YVOM4="; + hash = "sha256-DfMGqgVYMT81Pvf1G/onwDYoGtxFZ34c+/p8n4YVOM4="; }; preConfigure = '' @@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-user-share"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-user-share/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Service that exports the contents of the Public folder in your home directory on the local network"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; diff --git a/pkgs/development/compilers/gnu-smalltalk/0000-fix_mkorder.patch b/pkgs/by-name/gn/gnu-smalltalk/0000-fix_mkorder.patch similarity index 100% rename from pkgs/development/compilers/gnu-smalltalk/0000-fix_mkorder.patch rename to pkgs/by-name/gn/gnu-smalltalk/0000-fix_mkorder.patch diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/by-name/gn/gnu-smalltalk/package.nix similarity index 100% rename from pkgs/development/compilers/gnu-smalltalk/default.nix rename to pkgs/by-name/gn/gnu-smalltalk/package.nix diff --git a/pkgs/by-name/gn/gnuastro/package.nix b/pkgs/by-name/gn/gnuastro/package.nix index a7ad1342eec0b..3d38dbcfd4c87 100644 --- a/pkgs/by-name/gn/gnuastro/package.nix +++ b/pkgs/by-name/gn/gnuastro/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gnuastro/gnuastro-${version}.tar.gz"; - sha256 = "sha256-+X53X/tZgcY/it++lY/Ov5FHwT8OfpZAfd398zs/dwI="; + hash = "sha256-+X53X/tZgcY/it++lY/Ov5FHwT8OfpZAfd398zs/dwI="; }; nativeBuildInputs = [ libtool ]; diff --git a/pkgs/by-name/gn/gnucap/package.nix b/pkgs/by-name/gn/gnucap/package.nix index d67fc5d2c74b3..2713a2283de6d 100644 --- a/pkgs/by-name/gn/gnucap/package.nix +++ b/pkgs/by-name/gn/gnucap/package.nix @@ -20,7 +20,7 @@ It performs nonlinear dc and transient analyses, fourier analysis, and ac analys changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}"; license = licenses.gpl3Plus; platforms = platforms.all; - broken = stdenv.isDarwin; # Relies on LD_LIBRARY_PATH + broken = stdenv.hostPlatform.isDarwin; # Relies on LD_LIBRARY_PATH maintainers = [ maintainers.raboof ]; mainProgram = "gnucap"; }; diff --git a/pkgs/applications/office/gnucash/0001-disable-date-and-time-tests.patch b/pkgs/by-name/gn/gnucash/0001-disable-date-and-time-tests.patch similarity index 100% rename from pkgs/applications/office/gnucash/0001-disable-date-and-time-tests.patch rename to pkgs/by-name/gn/gnucash/0001-disable-date-and-time-tests.patch diff --git a/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch b/pkgs/by-name/gn/gnucash/0002-disable-gnc-fq-update.patch similarity index 100% rename from pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch rename to pkgs/by-name/gn/gnucash/0002-disable-gnc-fq-update.patch diff --git a/pkgs/applications/office/gnucash/0003-remove-valgrind.patch b/pkgs/by-name/gn/gnucash/0003-remove-valgrind.patch similarity index 100% rename from pkgs/applications/office/gnucash/0003-remove-valgrind.patch rename to pkgs/by-name/gn/gnucash/0003-remove-valgrind.patch diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch b/pkgs/by-name/gn/gnucash/0004-exec-fq-wrapper.patch similarity index 100% rename from pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch rename to pkgs/by-name/gn/gnucash/0004-exec-fq-wrapper.patch diff --git a/pkgs/applications/office/gnucash/0005-disable-test-lots.patch b/pkgs/by-name/gn/gnucash/0005-disable-test-lots.patch similarity index 100% rename from pkgs/applications/office/gnucash/0005-disable-test-lots.patch rename to pkgs/by-name/gn/gnucash/0005-disable-test-lots.patch diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/by-name/gn/gnucash/package.nix similarity index 100% rename from pkgs/applications/office/gnucash/default.nix rename to pkgs/by-name/gn/gnucash/package.nix diff --git a/pkgs/applications/office/gnucash/update.sh b/pkgs/by-name/gn/gnucash/update.sh similarity index 100% rename from pkgs/applications/office/gnucash/update.sh rename to pkgs/by-name/gn/gnucash/update.sh diff --git a/pkgs/by-name/gn/gnucobol/package.nix b/pkgs/by-name/gn/gnucobol/package.nix new file mode 100644 index 0000000000000..75341f91bbb96 --- /dev/null +++ b/pkgs/by-name/gn/gnucobol/package.nix @@ -0,0 +1,148 @@ +{ + lib, + stdenv, + fetchurl, + autoconf269, + automake, + libtool, + pkg-config, + # libs + cjson, + db, + gmp, + libxml2, + ncurses, + # docs + help2man, + texinfo, + texliveBasic, + # test + perl, +}: +let + nistTestSuite = fetchurl { + # Used to check GnuCOBOL with the NIST test suite + url = "mirror://sourceforge/gnucobol/newcob.val.tar.gz"; + hash = "sha256-5FE/JqmziRH3v4gv49MzmoC0XKvCyvheswVbD1zofuA="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "gnucobol"; + version = "3.2"; + + src = fetchurl { + url = "mirror://gnu/gnucobol/gnucobol-${finalAttrs.version}.tar.xz"; + hash = "sha256-O7SK9GztR3n6z0H9wu5g5My4bqqZ0BCzZoUxXfOcLuI="; + }; + + nativeBuildInputs = [ + pkg-config + autoconf269 + automake + help2man + libtool + perl + texinfo + texliveBasic + ]; + + buildInputs = [ + cjson + db + gmp + libxml2 + ncurses + ]; + + outputs = [ + "bin" + "dev" + "lib" + "out" + ]; + # XXX: Without this, we get a cycle between bin and dev + propagatedBuildOutputs = [ ]; + + # Skips a broken test + postPatch = '' + sed -i '/^AT_CHECK.*crud\.cob/i AT_SKIP_IF([true])' tests/testsuite.src/listings.at + # upstream reports the following tests as known failures + # test 843 (runtime check: write to internal storage (1)) + sed -i "/^843;/d" tests/testsuite + # test 875 (INDEXED sample) + sed -i "/^875;/d" tests/testsuite + ''; + + preConfigure = + '' + autoconf + aclocal + automake + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # when building with nix on darwin, configure will use GNU strip, + # which fails due to using --strip-unneeded, which is not supported + substituteInPlace configure --replace-fail '"GNU strip"' 'FAKE GNU strip' + ''; + + # error: call to undeclared function 'xmlCleanupParser' + # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + env.CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=implicit-function-declaration"; + + enableParallelBuilding = true; + + installFlags = [ + "install-pdf" + "install-html" + "localedir=$out/share/locale" + ]; + + # Tests must run after install. + doCheck = false; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # Run tests + TESTSUITEFLAGS="--jobs=$NIX_BUILD_CORES" make check + + # Run NIST tests + cp -v ${nistTestSuite} ./tests/cobol85/newcob.val.tar.gz + TESTSUITEFLAGS="--jobs=$NIX_BUILD_CORES" make test + + # Sanity check + message="Hello, COBOL!" + # XXX: Don't for a second think you can just get rid of these spaces, they + # are load bearing. + tee hello.cbl <<EOF + IDENTIFICATION DIVISION. + PROGRAM-ID. HELLO. + + PROCEDURE DIVISION. + DISPLAY "$message". + STOP RUN. + EOF + $bin/bin/cobc -x -o hello-cobol "hello.cbl" + hello="$(./hello-cobol | tee >(cat >&2))" + [[ "$hello" == "$message" ]] || exit 1 + + runHook postInstallCheck + ''; + + meta = with lib; { + description = "Free/libre COBOL compiler"; + homepage = "https://gnu.org/software/gnucobol/"; + license = with licenses; [ + gpl3Only + lgpl3Only + ]; + maintainers = with maintainers; [ + ericsagnes + lovesegfault + techknowlogick + kiike + ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix index 65f845a4dd4d0..20172d75473eb 100644 --- a/pkgs/by-name/go/go-camo/package.nix +++ b/pkgs/by-name/go/go-camo/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xNdikp3Kd/VAzn7QjqIrNvifFI0mMTJ5U+zk+QbJAk0="; + hash = "sha256-2iclQVkj813xW9Ff3yh5dxCun0LxsPn4YpSLeMwsNbY="; }; - vendorHash = "sha256-xN0FJntfQ2V2IsxD8dEi0vR+psnjGR7G6+ssxNTuzc4="; + vendorHash = "sha256-GbBFGbNxsijcUIogjSv8RcIQn6VQ+j21Qlm9eQWzTtc="; ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index fc8d252636cf8..ef8fbcb190d20 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -9,17 +9,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.14.8"; + version = "1.14.9"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y831v6ar1RdDvGQMZf2lZKgq2IQzAAQrNwDCL0xbj24="; + hash = "sha256-W0wHQMvbQJC3PdCZLVpE3cTasii/CkF+gdVOV2MX2Mo="; }; proxyVendor = true; - vendorHash = "sha256-CLGf64Fftu4u8Vaj66Q4xuRKBEMNZmpltUyaUMVyVJk="; + vendorHash = "sha256-Fxl8fisdCH0nlUFOS5NLMnvfpqIhlTd6/BbR+qIzlKQ="; doCheck = false; @@ -50,7 +50,7 @@ in buildGoModule rec { # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = - lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit ]; passthru.tests = { inherit (nixosTests) geth; }; diff --git a/pkgs/by-name/go/go-secdump/package.nix b/pkgs/by-name/go/go-secdump/package.nix index 13c073def1bf2..5b92d99204892 100644 --- a/pkgs/by-name/go/go-secdump/package.nix +++ b/pkgs/by-name/go/go-secdump/package.nix @@ -29,5 +29,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "go-secdump"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/go/go-symbols/package.nix b/pkgs/by-name/go/go-symbols/package.nix index 6333921008899..786e9d93a700b 100644 --- a/pkgs/by-name/go/go-symbols/package.nix +++ b/pkgs/by-name/go/go-symbols/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { owner = "acroca"; repo = "go-symbols"; rev = "v${version}"; - sha256 = "0yyzw6clndb2r5j9isyd727njs98zzp057v314vfvknsm8g7hqrz"; + hash = "sha256-P2N4Hqrazu02CWOfAu7/KGlpjzjN65hkyWI1S5nh33s="; }; patches = [ diff --git a/pkgs/by-name/go/goat/package.nix b/pkgs/by-name/go/goat/package.nix index 7dfc187191032..77c1e61605f32 100644 --- a/pkgs/by-name/go/goat/package.nix +++ b/pkgs/by-name/go/goat/package.nix @@ -1,26 +1,31 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, }: + buildGoModule { pname = "goat"; - version = "unstable-2022-08-15"; # Upstream currently isn't doing tags/releases. + version = "0-unstable-2024-07-31"; # Upstream currently isn't doing tags/releases. src = fetchFromGitHub { owner = "blampe"; repo = "goat"; - rev = "07bb911fe3106cc3c1d1097318a9fffe816b59fe"; - hash = "sha256-gSSDp9Q2hGH85dkE7RoER5ig+Cz1oSOD0FNRBeTZM4U="; + rev = "177de93b192b8ffae608e5d9ec421cc99bf68402"; + hash = "sha256-/DR6RN7dCROp18P7dgm4DMppwdtYl0AOVNMEtXz8ldk="; }; vendorHash = "sha256-24YllmSUzRcqWbJ8NLyhsJaoGG2+yE8/eXX6teJ1nV8="; - meta = with lib; { + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { description = "Go ASCII Tool. Render ASCII art as SVG diagrams"; homepage = "https://github.com/blampe/goat"; - license = licenses.mit; - maintainers = with maintainers; [ katexochen ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ katexochen ]; mainProgram = "goat"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/go/goatcounter/package.nix b/pkgs/by-name/go/goatcounter/package.nix index 83e05473ae606..a19bf73d31000 100644 --- a/pkgs/by-name/go/goatcounter/package.nix +++ b/pkgs/by-name/go/goatcounter/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { owner = "arp242"; repo = "goatcounter"; rev = "v${version}"; - sha256 = "sha256-lwiLk/YYxX4QwSDjpU/mAikumGXYMzleRzmPjZGruZU="; + hash = "sha256-lwiLk/YYxX4QwSDjpU/mAikumGXYMzleRzmPjZGruZU="; }; vendorHash = "sha256-YAb3uBWQc6hWzF1Z5cAg8RzJQSJV+6dkppfczKS832s="; diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix index 2889747b07387..aaefff5aa3b81 100644 --- a/pkgs/by-name/go/gobang/package.nix +++ b/pkgs/by-name/go/gobang/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { buildInputs = with darwin.apple_sdk.frameworks; - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security SystemConfiguration diff --git a/pkgs/by-name/go/goda/package.nix b/pkgs/by-name/go/goda/package.nix new file mode 100644 index 0000000000000..7aabe29df5dbf --- /dev/null +++ b/pkgs/by-name/go/goda/package.nix @@ -0,0 +1,30 @@ +{ + lib, + nix-update-script, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "goda"; + version = "0.5.11"; + + src = fetchFromGitHub { + owner = "loov"; + repo = "goda"; + rev = "v${version}"; + hash = "sha256-UeXn+JAR4TExZahwFozjbwXHF3QEcJvh5SzU/8VAmLg="; + }; + + vendorHash = "sha256-FYjlOYB0L4l6gF8hYtJroV1qMQD0ZmKWXBarjyConRs="; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/loov/goda"; + description = "Go Dependency Analysis toolkit"; + maintainers = with maintainers; [ michaeladler ]; + license = licenses.mit; + mainProgram = "goda"; + }; +} diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/by-name/go/gofish/package.nix similarity index 100% rename from pkgs/servers/gopher/gofish/default.nix rename to pkgs/by-name/go/gofish/package.nix diff --git a/pkgs/by-name/go/gogup/package.nix b/pkgs/by-name/go/gogup/package.nix index af226e688c8e2..a015caf4ef789 100644 --- a/pkgs/by-name/go/gogup/package.nix +++ b/pkgs/by-name/go/gogup/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gogup"; - version = "0.27.4"; + version = "0.27.5"; src = fetchFromGitHub { owner = "nao1215"; repo = "gup"; rev = "v${version}"; - hash = "sha256-vCp513WpB3kWMN0nkohtvpuMN1WBndg1E6pF0Cd5FgE="; + hash = "sha256-I4l/sDqafc/ZO8kKc4iOSMFLS0YZrAqRFOXn0N7Myo4="; }; vendorHash = "sha256-rtdbPwVZHwofpGccYU8NBiaikzNMIwSDggbRdnGTBu8="; diff --git a/pkgs/by-name/go/goldwarden/package.nix b/pkgs/by-name/go/goldwarden/package.nix index e6938d3be6940..21852f3d647ea 100644 --- a/pkgs/by-name/go/goldwarden/package.nix +++ b/pkgs/by-name/go/goldwarden/package.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "goldwarden"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "quexten"; repo = "goldwarden"; rev = "v${version}"; - hash = "sha256-s00ZgRmp+0UTp4gpoQgZZqSJMRGsGuUxoX2DEryG+XM="; + hash = "sha256-LAnhCQmyubWeZtTVaW8IoNmfipvMIlAnY4pKwrURPDs="; }; postPatch = '' @@ -38,7 +38,7 @@ buildGoModule rec { --replace-fail "@PATH@" "$out/bin/goldwarden" ''; - vendorHash = "sha256-TSmYqLMeS/G1rYNxVfh3uIK9bQJhsd7mos50yIXQoT4="; + vendorHash = "sha256-rMs7FP515aClzt9sjgIQHiYo5SYa2tDHrVRhtT+I8aM="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/go/golex/package.nix b/pkgs/by-name/go/golex/package.nix new file mode 100644 index 0000000000000..99884d4d2d029 --- /dev/null +++ b/pkgs/by-name/go/golex/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitLab, + fetchpatch2, +}: + +buildGoModule rec { + pname = "golex"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "cznic"; + repo = "golex"; + rev = "v${version}"; + hash = "sha256-0Z2oE00vGnH2BBNmKAjRhy//fEbT5AQ+CKLIUr+NPwY="; + }; + + patches = [ + # fix a unicode mismatch to make test pass + (fetchpatch2 { + url = "https://gitlab.com/cznic/golex/-/commit/a735a3b62b5fb36a715ba4e280270f9ca91c5e59.patch"; + hash = "sha256-Q/Vyh91IwL3ConWpJU0akslkaVhHTkBmrMbmDVU3Txs="; + }) + ]; + + vendorHash = "sha256-Ig4cxZepvmI1EH0j2fuQ33jHOLWfS40UE+A4UHdo8oE="; + + meta = { + description = "Lex/flex like utility rendering .l formated data to Go source code"; + homepage = "https://pkg.go.dev/modernc.org/golex"; + license = lib.licenses.bsd3; + mainProgram = "golex"; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index 14fe785c499ac..16ba288e1daa9 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "goofcord"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "Milkshiift"; repo = "GoofCord"; rev = "v${finalAttrs.version}"; - hash = "sha256-hG8nHAuEHw/tjFnGKhSXwO+2l91OOnQUIAK05SvEquU="; + hash = "sha256-fx/RKnUhXhaWVd/KYPVxr19/Q8o1ovm2TgMTcTYjE3Q="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio pipewire stdenv.cc.cc.lib @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm'.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-wF7G8rs1Fg7whEftQ554s4C2CixP5/1oFudR5yY07Rk="; + hash = "sha256-8i/ip0ZIo80bLb7UNO/h856CD7i3DV9QaPaNrxhViqE="; }; env = { @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Milkshiift/GoofCord"; downloadPage = "https://github.com/Milkshiift/GoofCord"; license = lib.licenses.osl3; - maintainers = with lib.maintainers; [ nyanbinary ]; + maintainers = with lib.maintainers; [ nyabinary ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 49b712351787d..d0fa310bcfa15 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -44,6 +44,7 @@ nss, pango, pipewire, + vulkan-loader, wayland, # ozone/wayland # Command line programs @@ -152,6 +153,7 @@ let speechd-minimal systemd util-linux + vulkan-loader wayland wget ] @@ -164,11 +166,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "128.0.6613.84"; + version = "129.0.6668.89"; 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-4hABtHDq/8lIP6YbpU1VJdmgZNmLN2qb0VMPYw3dsBg="; + hash = "sha256-7siTsIW29x4XZ+Zut9b5BFSTtc5tuhxusxnkJPouG1w="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -209,9 +211,12 @@ let exe=$out/bin/google-chrome-$dist mkdir -p $out/bin $out/share + cp -v -a opt/* $out/share + cp -v -a usr/share/* $out/share - cp -a opt/* $out/share - cp -a usr/share/* $out/share + # replace bundled vulkan-loader + rm -v $out/share/google/$appname/libvulkan.so.1 + ln -v -s -t "$out/share/google/$appname" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" substituteInPlace $out/share/google/$appname/google-$appname \ --replace-fail 'CHROME_WRAPPER' 'WRAPPER' @@ -236,6 +241,7 @@ let mv "$icon_file" "$logo_output_path/google-$appname.png" done + # "--simulate-outdated-no-au" disables auto updates and browser outdated popup makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \ --prefix LD_LIBRARY_PATH : "$rpath" \ --prefix PATH : "$binpath" \ @@ -243,8 +249,12 @@ let --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ --set CHROME_WRAPPER "google-chrome-$dist" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ --add-flags ${lib.escapeShellArg commandLineArgs} + # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so + patchelf --set-rpath $rpath $out/share/google/$appname/lib*GL* + for elf in $out/share/google/$appname/{chrome,chrome-sandbox,chrome_crashpad_handler}; do patchelf --set-rpath $rpath $elf patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf @@ -256,11 +266,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "128.0.6613.85"; + version = "129.0.6668.90"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/adnfqet5f4kxrux64zb25vwits5a_128.0.6613.85/GoogleChrome-128.0.6613.85.dmg"; - hash = "sha256-mWTNwfMfCLPV+w1VCMUdv7lFtYSEVr4mnDgKURlDV3Q="; + url = "http://dl.google.com/release2/chrome/n4gcpoygckhm4y53qwq7lkpnqu_129.0.6668.90/GoogleChrome-129.0.6668.90.dmg"; + hash = "sha256-viQSX8ogY5ywPqgVmMToHdZysxLuC8U78UJ9fIUrGCs="; }; dontPatch = true; @@ -282,9 +292,11 @@ let cp -r *.app $out/Applications mkdir -p $out/bin + + # "--simulate-outdated-no-au" disables auto updates and browser outdated popup makeWrapper $out/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome $out/bin/google-chrome-stable \ + --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ --add-flags ${lib.escapeShellArg commandLineArgs} - runHook postInstall ''; }); @@ -305,4 +317,4 @@ let mainProgram = "google-chrome-stable"; }; in -if stdenvNoCC.isDarwin then darwin else linux +if stdenvNoCC.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/go/google-chrome/update.sh b/pkgs/by-name/go/google-chrome/update.sh index 0e63c9bb60908..cf5113eac6a80 100755 --- a/pkgs/by-name/go/google-chrome/update.sh +++ b/pkgs/by-name/go/google-chrome/update.sh @@ -10,7 +10,7 @@ get_version_info() { local start_pattern="$2" local end_pattern="$3" - local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases" + local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases?filter=endtime=none,fraction>=0.5&order_by=version%20desc" local response local version local current_version diff --git a/pkgs/by-name/go/gopls/package.nix b/pkgs/by-name/go/gopls/package.nix index 655a6a8c1ff4e..b9f44017da96a 100644 --- a/pkgs/by-name/go/gopls/package.nix +++ b/pkgs/by-name/go/gopls/package.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-4RpQrlFj0stefVBouxyYN3Pf0PkYZ4cn4IKIskqUhVY="; + hash = "sha256-amy00VMUcmyjDoZ4d9/+YswfcZ+1/cGvFsA4sAmc1dA="; }; modRoot = "gopls"; - vendorHash = "sha256-D+ew0XyHRns1i9KAdV5vhCs3Uu338EujYjwU6IIZ8OY="; + vendorHash = "sha256-ta94xPboFtSxFeuMtPX76XiC1O7osNl4oLk64wIyyz4="; # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30 ldflags = [ "-X main.version=v${version}" ]; diff --git a/pkgs/by-name/go/goreman/package.nix b/pkgs/by-name/go/goreman/package.nix index 5b83b1885bc75..062993654e64c 100644 --- a/pkgs/by-name/go/goreman/package.nix +++ b/pkgs/by-name/go/goreman/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "mattn"; repo = "goreman"; rev = "v${version}"; - sha256 = "sha256-Z6b245tC6UsTaHTTlKEFH0egb5z8HTmv/554nkileng="; + hash = "sha256-Z6b245tC6UsTaHTTlKEFH0egb5z8HTmv/554nkileng="; }; vendorHash = "sha256-Qbi2GfBrVLFbH9SMZOd1JqvD/afkrVOjU4ECkFK+dFA="; diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix index 5ae4b5d8dc8b2..bfa2fba409a9a 100644 --- a/pkgs/by-name/go/gosmee/package.nix +++ b/pkgs/by-name/go/gosmee/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "chmouel"; repo = "gosmee"; rev = "v${version}"; - sha256 = "sha256-UnGzPkbw7x8l1+9xEXFiJZFzJT5yu7MCgPKkKzaFqkk="; + hash = "sha256-UnGzPkbw7x8l1+9xEXFiJZFzJT5yu7MCgPKkKzaFqkk="; }; vendorHash = null; diff --git a/pkgs/by-name/go/goss/package.nix b/pkgs/by-name/go/goss/package.nix index 3f3a7fcebc02f..cbe9930a10592 100644 --- a/pkgs/by-name/go/goss/package.nix +++ b/pkgs/by-name/go/goss/package.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "goss"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "goss-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xabGzCTzWwT8568xg6sdlE32OYPXlG9Fei0DoyAoXgo="; + hash = "sha256-GdkLasokpWegjK4kZzAskp1NGwcuMjrjjau75cEo8kg="; }; - vendorHash = "sha256-BPW4nC9gxDbyhA5UOfFAtOIusNvwJ7pQiprZsqTiak0="; + vendorHash = "sha256-Rf6Xt54y1BN2o90rDW0WvEm4H5pPfsZ786MXFjsAFaM="; CGO_ENABLED = 0; @@ -37,7 +37,7 @@ buildGoModule rec { postInstall = let runtimeDependencies = [ bash getent ] - ++ lib.optionals stdenv.isLinux [ systemd ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]; in '' wrapProgram $out/bin/goss \ --prefix PATH : "${lib.makeBinPath runtimeDependencies}" diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix index e5588618369ed..518539351cd0e 100644 --- a/pkgs/by-name/go/gossip/package.nix +++ b/pkgs/by-name/go/gossip/package.nix @@ -1,19 +1,21 @@ -{ cmake -, darwin -, fetchFromGitHub -, ffmpeg -, fontconfig -, git -, lib -, libGL -, libxkbcommon -, makeDesktopItem -, openssl -, pkg-config -, rustPlatform -, stdenv -, wayland -, xorg +{ + cmake, + darwin, + fetchFromGitHub, + ffmpeg, + fontconfig, + git, + lib, + libGL, + libxkbcommon, + makeDesktopItem, + openssl, + pkg-config, + rustPlatform, + stdenv, + wayland, + wayland-scanner, + xorg, }: rustPlatform.buildRustPackage rec { @@ -47,32 +49,45 @@ rustPlatform.buildRustPackage rec { RUSTFLAGS = "--cfg tokio_unstable"; # Some users might want to add "rustls-tls(-native)" for Rust TLS instead of OpenSSL. - buildFeatures = [ "video-ffmpeg" "lang-cjk" ]; - - nativeBuildInputs = [ - cmake - git - pkg-config - rustPlatform.bindgenHook + buildFeatures = [ + "video-ffmpeg" + "lang-cjk" ]; - buildInputs = [ - ffmpeg - fontconfig - libGL - libxkbcommon - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.Foundation - ] ++ lib.optionals stdenv.isLinux [ - wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - ]; + nativeBuildInputs = + [ + cmake + git + pkg-config + rustPlatform.bindgenHook + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wayland-scanner + ]; + + buildInputs = + [ + ffmpeg + fontconfig + libGL + libxkbcommon + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.ForceFeedback + darwin.apple_sdk.frameworks.AVFoundation + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wayland + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + ]; # Tests rely on local files, so disable them. (I'm too lazy to patch it.) doCheck = false; @@ -84,9 +99,15 @@ rustPlatform.buildRustPackage rec { ln -s $out/logo/gossip.png $out/share/icons/hicolor/128x128/apps/gossip.png ''; - postFixup = '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' patchelf $out/bin/gossip \ - --add-rpath ${lib.makeLibraryPath [ libGL libxkbcommon wayland ]} + --add-rpath ${ + lib.makeLibraryPath [ + libGL + libxkbcommon + wayland + ] + } ''; desktopItems = [ @@ -96,7 +117,11 @@ rustPlatform.buildRustPackage rec { icon = "gossip"; comment = meta.description; desktopName = "Gossip"; - categories = [ "Chat" "Network" "InstantMessaging" ]; + categories = [ + "Chat" + "Network" + "InstantMessaging" + ]; startupWMClass = "gossip"; }) ]; diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index 942e758972ff7..d872cd7960422 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -21,26 +21,26 @@ }: let - stdenv' = if stdenv.isDarwin && stdenv.isx86_64 + stdenv' = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "got"; - version = "0.102"; + version = "0.103"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-qstQ6mZLCdYL5uQauMt7nGlEdPkPneGfu36RbaboN3c="; + hash = "sha256-MkBek/NTpU+rylSS5abFQl8Vm3phRFCQkpnI3INJKHg="; }; nativeBuildInputs = [ pkg-config bison ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ libressl libbsd libevent libuuid libmd zlib ncurses ] - ++ lib.optionals stdenv.isDarwin [ libossp_uuid ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libossp_uuid ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' # The configure script assumes dependencies on Darwin are installed via # Homebrew or MacPorts and hardcodes assumptions about the paths of # dependencies which fails the nixpkgs configurePhase. @@ -53,12 +53,12 @@ stdenv'.mkDerivation (finalAttrs: { ] ++ lib.optionals withSsh [ ''-DGOT_DIAL_PATH_SSH="${lib.getExe openssh}"'' ''-DGOT_TAG_PATH_SSH_KEYGEN="${lib.getExe' openssh "ssh-keygen"}"'' - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ ''-DGOT_TAG_PATH_SIGNIFY="${lib.getExe signify}"'' ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-error=implicit-function-declaration" "-Wno-error=int-conversion" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # error: conflicting types for 'strmode' "-DHAVE_STRMODE=1" # Undefined symbols for architecture arm64: "_bsd_getopt" diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix index c68a6255fd25d..e783eb806944b 100644 --- a/pkgs/by-name/go/gotenberg/package.nix +++ b/pkgs/by-name/go/gotenberg/package.nix @@ -88,6 +88,7 @@ buildGoModule rec { meta = { description = "Converts numerous document formats into PDF files"; + mainProgram = "gotenberg"; homepage = "https://gotenberg.dev"; changelog = "https://github.com/gotenberg/gotenberg/releases/tag/v${version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/go/gotestsum/package.nix b/pkgs/by-name/go/gotestsum/package.nix new file mode 100644 index 0000000000000..810fe5438fe8b --- /dev/null +++ b/pkgs/by-name/go/gotestsum/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: +let + version = "1.12.0"; +in +buildGoModule { + pname = "gotestsum"; + + # move back to stable releases when build is successful + version = "${version}-unstable-2024-09-17"; + + src = fetchFromGitHub { + owner = "gotestyourself"; + repo = "gotestsum"; + rev = "2f61a73f997821b2e5a1823496e8362630e213f9"; + hash = "sha256-5zgchATcpoM4g5Mxex9wYanzrR0Pie9GYqx48toORkM="; + }; + + vendorHash = "sha256-DR4AyEhgD71hFFEAnPfSxaWYFFV7FlPugZBHUjDynEE="; + + doCheck = false; + + ldflags = [ + "-s" + "-w" + "-X gotest.tools/gotestsum/cmd.version=${version}" + ]; + + subPackages = [ "." ]; + + meta = { + homepage = "https://github.com/gotestyourself/gotestsum"; + changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${version}"; + description = "Human friendly `go test` runner"; + mainProgram = "gotestsum"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ isabelroses ]; + }; +} diff --git a/pkgs/by-name/go/gotools/package.nix b/pkgs/by-name/go/gotools/package.nix new file mode 100644 index 0000000000000..486aede88b9aa --- /dev/null +++ b/pkgs/by-name/go/gotools/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "gotools"; + version = "0.25.0"; + + # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse + src = fetchFromGitHub { + owner = "golang"; + repo = "tools"; + rev = "v${version}"; + hash = "sha256-iM6mGIQF+TOo1iV8hH9/4iOPdNiS9ymPmhslhDVnIIs="; + }; + + postPatch = '' + # The gopls folder contains a Go submodule which causes a build failure + # and lives in its own package named gopls. + rm -r gopls + ''; + + vendorHash = "sha256-9NSgtranuyRqtBq1oEnHCPIDFOIUJdVh5W/JufqN2Ko="; + + doCheck = false; + + # Set GOTOOLDIR for derivations adding this to buildInputs + postInstall = '' + mkdir -p $out/nix-support + substitute ${./setup-hook.sh} $out/nix-support/setup-hook \ + --subst-var-by bin $out + ''; + + meta = with lib; { + description = "Additional tools for Go development"; + longDescription = '' + This package contains tools like: godoc, goimports, callgraph, digraph, stringer or toolstash. + ''; + homepage = "https://go.googlesource.com/tools"; + license = licenses.bsd3; + maintainers = with maintainers; [ + SuperSandro2000 + techknowlogick + ]; + }; +} diff --git a/pkgs/development/tools/gotools/setup-hook.sh b/pkgs/by-name/go/gotools/setup-hook.sh similarity index 100% rename from pkgs/development/tools/gotools/setup-hook.sh rename to pkgs/by-name/go/gotools/setup-hook.sh diff --git a/pkgs/by-name/go/govers/package.nix b/pkgs/by-name/go/govers/package.nix index eb483438acc08..29a690bbf10a3 100644 --- a/pkgs/by-name/go/govers/package.nix +++ b/pkgs/by-name/go/govers/package.nix @@ -12,7 +12,7 @@ buildGoModule { owner = "rogpeppe"; repo = "govers"; rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43"; - sha256 = "sha256-lpc8wFKAB+A8mBm9q3qNzTM8ktFS1MYdIvZVFP0eiIs="; + hash = "sha256-lpc8wFKAB+A8mBm9q3qNzTM8ktFS1MYdIvZVFP0eiIs="; }; vendorHash = null; diff --git a/pkgs/by-name/go/gowall/package.nix b/pkgs/by-name/go/gowall/package.nix index 7ec23d59c96bb..cd79fa1c3770d 100644 --- a/pkgs/by-name/go/gowall/package.nix +++ b/pkgs/by-name/go/gowall/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gowall"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "Achno"; repo = "gowall"; rev = "v${version}"; - hash = "sha256-R7dOONfyzj6V3101Rp/WhUcFpqrSKWEkVm4a2riXZAI="; + hash = "sha256-r2IvwpvtWMlIKG0TNM4cLUPKFRgUV8E06VzkPSVCorI="; }; vendorHash = "sha256-H2Io1K2LEFmEPJYVcEaVAK2ieBrkV6u+uX82XOvNXj4="; diff --git a/pkgs/by-name/gp/gpaste/package.nix b/pkgs/by-name/gp/gpaste/package.nix index 16da276b64b55..02c6199f0958e 100644 --- a/pkgs/by-name/gp/gpaste/package.nix +++ b/pkgs/by-name/gp/gpaste/package.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/Keruspe/GPaste"; + changelog = "https://github.com/Keruspe/GPaste/blob/v${finalAttrs.version}/NEWS"; description = "Clipboard management system with GNOME integration"; mainProgram = "gpaste-client"; license = licenses.bsd2; diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix new file mode 100644 index 0000000000000..e1199c9ed372b --- /dev/null +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -0,0 +1,50 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + libsoup, + openssl, + pkg-config, + perl, + webkitgtk, +}: + +rustPlatform.buildRustPackage rec { + pname = "gpauth"; + version = "2.3.7"; + + src = fetchFromGitHub { + owner = "yuezk"; + repo = "GlobalProtect-openconnect"; + rev = "v${version}"; + hash = "sha256-Zr888II65bUjrbStZfD0AYCXKY6VdKVJHQhbKwaY3is="; + }; + + buildAndTestSubdir = "apps/gpauth"; + cargoHash = "sha256-AuYw8CC0bMJzIJJQXhcQajQ4SACz4aKv6rG4HMq7U18="; + + nativeBuildInputs = [ + perl + pkg-config + ]; + buildInputs = [ + libsoup + openssl + webkitgtk + ]; + + meta = with lib; { + changelog = "https://github.com/${src.owner}/${src.repo}/blob/${src.rev}/changelog.md"; + description = "A CLI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method"; + longDescription = '' + A CLI for GlobalProtect VPN, based on OpenConnect, supports the SSO + authentication method. Inspired by gp-saml-gui. + + The CLI version is always free and open source in this repo. It has almost + the same features as the GUI version. + ''; + homepage = "https://github.com/${src.owner}/${src.repo}"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ binary-eater ]; + }; +} diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix new file mode 100644 index 0000000000000..786123e74d443 --- /dev/null +++ b/pkgs/by-name/gp/gpclient/package.nix @@ -0,0 +1,41 @@ +{ + rustPlatform, + gpauth, + openconnect, + openssl, + perl, + vpnc-scripts, +}: + +rustPlatform.buildRustPackage rec { + pname = "gpclient"; + + inherit (gpauth) version src meta; + + buildAndTestSubdir = "apps/gpclient"; + cargoHash = "sha256-aJYFBvVrj1n2+9WLLBH5WTRRzTle19LsdJ2DielJYik="; + + nativeBuildInputs = [ perl ]; + buildInputs = [ + gpauth + openconnect + openssl + ]; + + preConfigure = '' + substituteInPlace crates/gpapi/src/lib.rs \ + --replace-fail /usr/bin/gpauth ${gpauth}/bin/gpauth + substituteInPlace crates/common/src/vpn_utils.rs \ + --replace-fail /usr/sbin/vpnc-script ${vpnc-scripts}/bin/vpnc-script + ''; + + postInstall = '' + mkdir -p $out/share/applications + cp packaging/files/usr/share/applications/gpgui.desktop $out/share/applications/gpgui.desktop + ''; + + postFixup = '' + substituteInPlace $out/share/applications/gpgui.desktop \ + --replace-fail /usr/bin/gpclient $out/bin/gpclient + ''; +} diff --git a/pkgs/by-name/gp/gpscorrelate/package.nix b/pkgs/by-name/gp/gpscorrelate/package.nix index 130ca82d7bc59..bb72042c21c5e 100644 --- a/pkgs/by-name/gp/gpscorrelate/package.nix +++ b/pkgs/by-name/gp/gpscorrelate/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "dfandrich"; repo = "gpscorrelate"; rev = version; - sha256 = "sha256-1t9XUY12hVaUNOg785dMJCiaMMCI2XCcif1DkKYXOoo="; + hash = "sha256-1t9XUY12hVaUNOg785dMJCiaMMCI2XCcif1DkKYXOoo="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libxslt pkg-config wrapGAppsHook3 - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ exiv2 @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { doCheck = true; + preCheck = '' + # https://github.com/dfandrich/gpscorrelate/issues/29 + rm tests/data/test005.* + ''; + installTargets = [ "install" "install-po" "install-desktop-file" ]; meta = with lib; { diff --git a/pkgs/by-name/gp/gpsprune/package.nix b/pkgs/by-name/gp/gpsprune/package.nix index 90cb23f7740c3..ed78ef40e1314 100644 --- a/pkgs/by-name/gp/gpsprune/package.nix +++ b/pkgs/by-name/gp/gpsprune/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-wGg7WPj61yx7zMBIdH9ls18BnD1R713U5Vgc/kL9qYs="; + hash = "sha256-wGg7WPj61yx7zMBIdH9ls18BnD1R713U5Vgc/kL9qYs="; }; dontUnpack = true; diff --git a/pkgs/by-name/gp/gpt4all/embedding-local.patch b/pkgs/by-name/gp/gpt4all/embedding-local.patch new file mode 100644 index 0000000000000..fb15635232236 --- /dev/null +++ b/pkgs/by-name/gp/gpt4all/embedding-local.patch @@ -0,0 +1,53 @@ +commit 425b33877c819dd88f3692aae37452c767371f6b +Author: Simon Gardling <titaniumtown@proton.me> +Date: Thu Sep 19 10:00:39 2024 -0400 + + use locally downloaded embeddings + +diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt +index 900307ae..802fc31a 100644 +--- a//CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,6 +120,7 @@ elseif (APPLE) + endif() + + # Embedding model ++#[[ + set(LOCAL_EMBEDDING_MODEL "nomic-embed-text-v1.5.f16.gguf") + set(LOCAL_EMBEDDING_MODEL_MD5 "a5401e7f7e46ed9fcaed5b60a281d547") + set(LOCAL_EMBEDDING_MODEL_PATH "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}") +@@ -134,6 +135,7 @@ message(STATUS "Embedding model downloaded to ${LOCAL_EMBEDDING_MODEL_PATH}") + if (APPLE) + list(APPEND CHAT_EXE_RESOURCES "${LOCAL_EMBEDDING_MODEL_PATH}") + endif() ++]] + + set(QAPPLICATION_CLASS QGuiApplication) + add_subdirectory(deps/SingleApplication) +@@ -348,11 +350,13 @@ if (LLMODEL_CUDA) + endif() + endif() + ++#[[ + if (NOT APPLE) + install(FILES "${LOCAL_EMBEDDING_MODEL_PATH}" + DESTINATION resources + COMPONENT ${COMPONENT_NAME_MAIN}) + endif() ++]] + + set(CPACK_GENERATOR "IFW") + set(CPACK_VERBATIM_VARIABLES YES) +diff --git a/gpt4all-chat/src/embllm.cpp b/gpt4all-chat/src/embllm.cpp +index 81b1e9e1..e3266cc7 100644 +--- a/src/embllm.cpp ++++ b/src/embllm.cpp +@@ -84,7 +84,7 @@ bool EmbeddingLLMWorker::loadModel() + + QString filePath = embPathFmt.arg(QCoreApplication::applicationDirPath(), LOCAL_EMBEDDING_MODEL); + if (!QFileInfo::exists(filePath)) { +- qWarning() << "embllm WARNING: Local embedding model not found"; ++ qWarning() << "embllm WARNING: Local embedding model not found: " << filePath; + return false; + } + diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 60a6e05de211b..938b9166897ff 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -2,6 +2,7 @@ , config , stdenv , fetchFromGitHub +, fetchurl , cmake , qt6 , fmt @@ -10,20 +11,30 @@ , wayland , cudaSupport ? config.cudaSupport , cudaPackages ? { } +, autoAddDriverRunpath }: stdenv.mkDerivation (finalAttrs: { pname = "gpt4all"; - version = "2.8.0"; + version = "3.3.0"; src = fetchFromGitHub { fetchSubmodules = true; - hash = "sha256-aSz37+1K26Xizf4cpV45a2DnSsl959VQok/ppFRk/hs="; + hash = "sha256-aez/APsei30Tp1em/RDCuq+v8hOavHq4O9qZahrsF/g="; owner = "nomic-ai"; repo = "gpt4all"; rev = "v${finalAttrs.version}"; }; + embed_model = fetchurl { + url = "https://gpt4all.io/models/gguf/nomic-embed-text-v1.5.f16.gguf"; + hash = "sha256-969vZoAvTfhu2hD+m7z8dcOVYr7Ujvas5xmiUc8cL9s="; + }; + + patches = [ + ./embedding-local.patch + ]; + sourceRoot = "${finalAttrs.src.name}/gpt4all-chat"; nativeBuildInputs = [ @@ -31,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { qt6.wrapQtAppsHook ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc + autoAddDriverRunpath ]; buildInputs = [ @@ -41,16 +53,18 @@ stdenv.mkDerivation (finalAttrs: { qt6.qthttpserver qt6.qtwebengine qt6.qt5compat + qt6.qttools shaderc vulkan-headers wayland ] ++ lib.optionals cudaSupport ( - with cudaPackages; - [ - cuda_cccl - cuda_cudart - libcublas - ]); + with cudaPackages; + [ + cuda_cccl + cuda_cudart + libcublas + ] + ); cmakeFlags = [ "-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF" @@ -64,8 +78,9 @@ stdenv.mkDerivation (finalAttrs: { rm -rf $out/include rm -rf $out/lib/*.a mv $out/bin/chat $out/bin/${finalAttrs.meta.mainProgram} + install -D ${finalAttrs.embed_model} $out/resources/nomic-embed-text-v1.5.f16.gguf install -m 444 -D $src/gpt4all-chat/flatpak-manifest/io.gpt4all.gpt4all.desktop $out/share/applications/io.gpt4all.gpt4all.desktop - install -m 444 -D $src/gpt4all-chat/icons/logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg + install -m 444 -D $src/gpt4all-chat/icons/nomic_logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg substituteInPlace $out/share/applications/io.gpt4all.gpt4all.desktop \ --replace-fail 'Exec=chat' 'Exec=${finalAttrs.meta.mainProgram}' ''; @@ -76,6 +91,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/nomic-ai/gpt4all"; license = lib.licenses.mit; mainProgram = "gpt4all"; - maintainers = with lib.maintainers; [ polygon ]; + maintainers = with lib.maintainers; [ polygon titaniumtown ]; }; }) diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix index 515cb79553707..a034a08aa7216 100644 --- a/pkgs/by-name/gp/gptscript/package.nix +++ b/pkgs/by-name/gp/gptscript/package.nix @@ -19,7 +19,7 @@ buildGoModule rec { vendorHash = "sha256-Kf/ckUuG+SA8WQN2MKL+Xrz91RGPuA7X2/MjryRXsts="; propagatedBuildInputs = with darwin; - lib.optionals stdenv.isDarwin [Security]; + lib.optionals stdenv.hostPlatform.isDarwin [Security]; ldflags = [ "-s" diff --git a/pkgs/by-name/gp/gpu-burn/package.nix b/pkgs/by-name/gp/gpu-burn/package.nix new file mode 100644 index 0000000000000..d2b2bd45ea3a1 --- /dev/null +++ b/pkgs/by-name/gp/gpu-burn/package.nix @@ -0,0 +1,81 @@ +{ + autoAddDriverRunpath, + config, + cudaPackages, + fetchFromGitHub, + lib, +}: +let + inherit (lib.attrsets) getBin; + inherit (lib.lists) last map optionals; + inherit (lib.trivial) boolToString; + inherit (config) cudaSupport; + inherit (cudaPackages) + backendStdenv + cuda_cccl + cuda_cudart + cuda_nvcc + libcublas + ; + inherit (cudaPackages.cudaFlags) cudaCapabilities dropDot isJetsonBuild; +in +backendStdenv.mkDerivation { + pname = "gpu-burn"; + version = "unstable-2024-04-09"; + + strictDeps = true; + + src = fetchFromGitHub { + owner = "wilicc"; + repo = "gpu-burn"; + rev = "9aefd7c0cc603bbc8c3c102f5338c6af26f8127c"; + hash = "sha256-Nz0yaoHGfodaYl2HJ7p+1nasqRmxwPJ9aL9oxitXDpM="; + }; + + postPatch = '' + substituteInPlace gpu_burn-drv.cpp \ + --replace-fail \ + '#define COMPARE_KERNEL "compare.ptx"' \ + "#define COMPARE_KERNEL \"$out/share/compare.ptx\"" + ''; + + nativeBuildInputs = [ + autoAddDriverRunpath + cuda_nvcc + ]; + + buildInputs = [ + cuda_cccl # <nv/target> + cuda_cudart # driver_types.h + cuda_nvcc # crt/host_defines.h + libcublas # cublas_v2.h + ]; + + makeFlags = [ + "CUDAPATH=${getBin cuda_nvcc}" + "COMPUTE=${last (map dropDot cudaCapabilities)}" + "IS_JETSON=${boolToString isJetsonBuild}" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share} + install -Dm755 gpu_burn $out/bin/ + install -Dm644 compare.ptx $out/share/ + runHook postInstall + ''; + + # NOTE: Certain packages may be missing from cudaPackages on non-Linux platforms. To avoid evaluation failure, + # we only include the platforms where we know the package is available -- thus the conditionals setting the + # platforms and badPlatforms fields. + meta = { + badPlatforms = optionals (!cudaSupport) lib.platforms.all; + broken = !cudaSupport; + description = "Multi-GPU CUDA stress test"; + homepage = "http://wili.cc/blog/gpu-burn.html"; + license = lib.licenses.bsd2; + mainProgram = "gpu_burn"; + maintainers = with lib.maintainers; [ connorbaker ]; + platforms = optionals cudaSupport lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/gp/gpu-viewer/package.nix b/pkgs/by-name/gp/gpu-viewer/package.nix new file mode 100644 index 0000000000000..83d54b1e91555 --- /dev/null +++ b/pkgs/by-name/gp/gpu-viewer/package.nix @@ -0,0 +1,90 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + + # nativeBuildInputs + gobject-introspection, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + + # buildInputs + gdk-pixbuf, + gtk4, + libadwaita, + vulkan-tools, + + # wrapper + python3, + clinfo, + lsb-release, + mesa-demos, + vdpauinfo, +}: + +python3Packages.buildPythonApplication rec { + pname = "gpu-viewer"; + version = "3.06"; + + format = "other"; + + src = fetchFromGitHub { + owner = "arunsivaramanneo"; + repo = "gpu-viewer"; + rev = "refs/tags/v${version}"; + hash = "sha256-vFU2VdafY1HmPGRa20PwT6n+Xf4bKBzKJ5jWpvwyMWg="; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + gdk-pixbuf + gtk4 + libadwaita + vulkan-tools + ]; + + pythonPath = with python3Packages; [ + click + pygobject3 + ]; + + # Prevent double wrapping + dontWrapGApps = true; + + postFixup = '' + makeWrapper ${python3.interpreter} $out/bin/gpu-viewer \ + --prefix PATH : "${ + lib.makeBinPath [ + clinfo + lsb-release + mesa-demos + vdpauinfo + vulkan-tools + ] + }" \ + --add-flags "$out/share/gpu-viewer/Files/GPUViewer.py" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --chdir "$out/share/gpu-viewer/Files" \ + ''${makeWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} + ''; + + meta = { + homepage = "https://github.com/arunsivaramanneo/GPU-Viewer"; + description = "Front-end to glxinfo, vulkaninfo, clinfo and es2_info"; + changelog = "https://github.com/arunsivaramanneo/GPU-Viewer/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ GaetanLepage ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + mainProgram = "gpu-viewer"; + }; +} diff --git a/pkgs/by-name/gp/gpustat/package.nix b/pkgs/by-name/gp/gpustat/package.nix index 428c2c583a0c2..38e513bd80673 100644 --- a/pkgs/by-name/gp/gpustat/package.nix +++ b/pkgs/by-name/gp/gpustat/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { owner = "arduano"; repo = "gpustat"; rev = "v${version}"; - sha256 = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg="; + hash = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg="; }; cargoHash = "sha256-po/pEMZEtySZnz7l2FI7Wqbmp2CiWBijchKGkqlIMPU="; diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index e9eb1133f1f17..e465a4f66eba6 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -16,17 +16,17 @@ buildGoModule rec { pname = "grafana-alloy"; - version = "1.3.1"; + version = "1.4.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "alloy"; - hash = "sha256-6YjQUIHZmuguzqTeaLgkrM/WdBPZu/KUXUDOmEB7rNQ="; + hash = "sha256-/LCp4PUt85HR+ig0/v7KlS1cFcFGpI8TXHk3IlcEkvk="; }; proxyVendor = true; - vendorHash = "sha256-eMtwmADYbvpIm4FHTHieQ1i4xCty5xCwsZ/JD9r94/8="; + vendorHash = "sha256-fhUoQGNRoWNbU5U21X45s+eJ8XjCkvYULTRShyq0f3E="; nativeBuildInputs = [ fixup-yarn-lock yarn nodejs installShellFiles ]; @@ -55,9 +55,14 @@ buildGoModule rec { "." ]; + # Skip building the frontend in the goModules FOD + overrideModAttrs = (_: { + preBuild = null; + }); + yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/internal/web/ui/yarn.lock"; - hash = "sha256-Jk+zqR/+NBde9ywncIEJM4kgavqiDvcIAjxJCSMrZDc="; + hash = "sha256-Y0WcmjFtiNXue2kcJGlvHVBGmMLewGICISoRHnBPHGw="; }; preBuild = '' @@ -79,7 +84,7 @@ buildGoModule rec { # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isLinux [ "-I${lib.getDev systemd}/include" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.hostPlatform.isLinux [ "-I${lib.getDev systemd}/include" ]; checkFlags = [ "-tags nonetwork" # disable network tests @@ -89,7 +94,7 @@ buildGoModule rec { # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at # runtime. # Add to RUNPATH so it can be found. - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/alloy)" \ $out/bin/alloy diff --git a/pkgs/by-name/gr/grafana-reporter/package.nix b/pkgs/by-name/gr/grafana-reporter/package.nix index 309ce2ecba03e..c7cb567d5722d 100644 --- a/pkgs/by-name/gr/grafana-reporter/package.nix +++ b/pkgs/by-name/gr/grafana-reporter/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { rev = "v${version}"; owner = "IzakMarais"; repo = "reporter"; - sha256 = "sha256-lsraJwx56I2Gn8CePWUlQu1qdMp78P4xwPzLxetYUcw="; + hash = "sha256-lsraJwx56I2Gn8CePWUlQu1qdMp78P4xwPzLxetYUcw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/by-name/gr/grafx2/package.nix similarity index 100% rename from pkgs/applications/graphics/grafx2/default.nix rename to pkgs/by-name/gr/grafx2/package.nix diff --git a/pkgs/by-name/gr/granian/Cargo.lock b/pkgs/by-name/gr/granian/Cargo.lock new file mode 100644 index 0000000000000..f6a3c5cd67369 --- /dev/null +++ b/pkgs/by-name/gr/granian/Cargo.lock @@ -0,0 +1,1421 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "zeroize", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "granian" +version = "1.6.0" +dependencies = [ + "anyhow", + "crossbeam-channel", + "futures", + "http-body-util", + "hyper", + "hyper-util", + "itertools", + "log", + "mimalloc", + "pem", + "percent-encoding", + "pin-project", + "pkcs8", + "pyo3", + "pyo3-log", + "rustls-pemfile", + "socket2", + "tikv-jemallocator", + "tls-listener", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tokio-util", +] + +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[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 = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libmimalloc-sys" +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mimalloc" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys", +] + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[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", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "pem" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +dependencies = [ + "base64", + "serde", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs5" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6" +dependencies = [ + "aes", + "cbc", + "der", + "pbkdf2", + "scrypt", + "sha2", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "pkcs5", + "rand_core", + "spki", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" +dependencies = [ + "anyhow", + "cfg-if", + "indoc", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" +dependencies = [ + "once_cell", + "python3-dll-a", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-log" +version = "0.11.0" +source = "git+https://github.com/vorner/pyo3-log?rev=b62a250533#b62a250533f0a85e245dfcd189cadb368b1c73fc" +dependencies = [ + "arc-swap", + "log", + "pyo3", +] + +[[package]] +name = "pyo3-macros" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "python3-dll-a" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0b78171a90d808b319acfad166c4790d9e9759bbc14ac8273fe133673dd41b" +dependencies = [ + "cc", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "pbkdf2", + "salsa20", + "sha2", +] + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "tls-listener" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a296135fdab7b3a1f708c338c50bab570bcd77d44080cde9341df45c0c6d73" +dependencies = [ + "futures-util", + "pin-project-lite", + "thiserror", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/gr/granian/package.nix b/pkgs/by-name/gr/granian/package.nix new file mode 100644 index 0000000000000..ce2b033f2773f --- /dev/null +++ b/pkgs/by-name/gr/granian/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + python3Packages, + libiconv, +}: + +python3Packages.buildPythonApplication rec { + pname = "granian"; + version = "1.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "emmett-framework"; + repo = "granian"; + rev = "v${version}"; + hash = "sha256-ZIwZrLl7goweYUj3t5e0yaOqeppFHXvK9PL3chNZZRw="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "pyo3-log-0.11.0" = "sha256-UU8064vM7cf20lwfifyPC205CY4tIgif0slDz/Pjf9Q="; + }; + }; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + buildInputs = [ + libiconv + ]; + + dependencies = [ + python3Packages.uvloop + python3Packages.click + ]; + + meta = { + description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications"; + homepage = "https://github.com/emmett-framework/granian"; + license = lib.licenses.bsd3; + mainProgram = "granian"; + maintainers = with lib.maintainers; [ lucastso10 ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix new file mode 100644 index 0000000000000..9c9454bf17793 --- /dev/null +++ b/pkgs/by-name/gr/granted/package.nix @@ -0,0 +1,66 @@ +{ bash +, buildGoModule +, fetchFromGitHub + +, withFish ? false +, fish + +, lib +, makeWrapper +, xdg-utils +}: + +buildGoModule rec { + pname = "granted"; + version = "0.34.1"; + + src = fetchFromGitHub { + owner = "common-fate"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-iNGagF4+Lz73Ctvh8Qs90E+xvuGi7LWHV/VbjjqMqRY="; + }; + + vendorHash = "sha256-uKzs+plk1W2S7iPv2J1Mi1Ff88+82zrIXLy2eTzD/Hc="; + + nativeBuildInputs = [ makeWrapper ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/common-fate/granted/internal/build.Version=v${version}" + "-X github.com/common-fate/granted/internal/build.Commit=${src.rev}" + "-X github.com/common-fate/granted/internal/build.Date=1970-01-01-00:00:01" + "-X github.com/common-fate/granted/internal/build.BuiltBy=Nix" + ]; + + subPackages = [ + "cmd/granted" + ]; + + postInstall = '' + ln -s $out/bin/granted $out/bin/assumego + + # Install shell script + install -Dm755 $src/scripts/assume $out/bin/assume + substituteInPlace $out/bin/assume \ + --replace /bin/bash ${bash}/bin/bash + + wrapProgram $out/bin/assume \ + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + + '' + lib.optionalString withFish '' + # Install fish script + install -Dm755 $src/scripts/assume.fish $out/share/assume.fish + substituteInPlace $out/share/assume.fish \ + --replace /bin/fish ${fish}/bin/fish + ''; + + meta = with lib; { + description = "Easiest way to access your cloud"; + homepage = "https://github.com/common-fate/granted"; + changelog = "https://github.com/common-fate/granted/releases/tag/${version}"; + license = licenses.mit; + maintainers = [ maintainers.ivankovnatsky ]; + }; +} diff --git a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix index c92fc2c398cff..aca52d75dc5bc 100644 --- a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix +++ b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GrapheneOS"; repo = "hardened_malloc"; rev = finalAttrs.version; - sha256 = "sha256-1j7xzhuhK8ZRAJm9dJ95xiTIla7lh3LBiWc/+x/kjp0="; + hash = "sha256-1j7xzhuhK8ZRAJm9dJ95xiTIla7lh3LBiWc/+x/kjp0="; }; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index 1bed406de7574..5a449d959f754 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -14,6 +14,7 @@ , libtool , libwebp , libxml2 +, libheifSupport ? true, libheif , nukeReferences , pkg-config , quantumdepth ? 8 @@ -47,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { libwebp libxml2 zlib - ]; + ] ++ lib.optionals libheifSupport [ libheif ]; nativeBuildInputs = [ nukeReferences diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index dc5a8f42f57ae..7a5780d2f79c7 100644 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.4.3", + "version": "1.4.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.4.3", + "version": "1.4.5", "hasInstallScript": true, "license": "None", "dependencies": { @@ -27,6 +27,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -35,6 +36,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -49,6 +51,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -64,6 +67,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -77,6 +81,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -87,17 +92,20 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", "engines": { "node": ">=6" } @@ -106,6 +114,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -114,6 +123,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -122,6 +132,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", "engines": { "node": ">=8" } @@ -130,6 +141,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -138,6 +150,7 @@ "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -149,6 +162,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -162,6 +176,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -173,6 +188,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -184,6 +200,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -200,6 +217,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", + "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -220,6 +238,7 @@ "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", "engines": { "node": ">=10" } @@ -228,6 +247,7 @@ "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -245,6 +265,7 @@ "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "license": "ISC", "engines": { "node": ">=12" } diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index 1692badcca6ec..4b268f294c360 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,14 +7,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.4.3"; + version = "1.4.5"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-ITROAsDlkNJx5z1DN41Y3kOQzlm2CmciPVn9IrtjCQc="; + hash = "sha256-ftTJPI3h/v2W3t5CQHn0CdHTYcDeoOdGjfJcRZi58Bc="; }; - npmDepsHash = "sha256-G2J0yu/loihlrgGSMEJmVK496bVwJehLwYAPh0f8UbM="; + npmDepsHash = "sha256-jXrH8HltxnIU/TIllYZyUueqCEI3Q9rhUY1tzHvXvSE="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/gr/grcov/0001-update-time-rs.patch b/pkgs/by-name/gr/grcov/0001-update-time-rs.patch new file mode 100644 index 0000000000000..e3eb06eea9392 --- /dev/null +++ b/pkgs/by-name/gr/grcov/0001-update-time-rs.patch @@ -0,0 +1,193 @@ +From cd983416673fabf7bc55c0888c0f73f209f35e4e Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Fri, 27 Sep 2024 16:03:44 +0800 +Subject: [PATCH] update time-rs + +--- + Cargo.lock | 63 ++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 44 insertions(+), 19 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index af7c7f2..30cb4c3 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -353,7 +353,7 @@ dependencies = [ + "heck", + "proc-macro2", + "quote", +- "syn 2.0.25", ++ "syn 2.0.32", + ] + + [[package]] +@@ -463,6 +463,15 @@ dependencies = [ + "uuid", + ] + ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] ++ + [[package]] + name = "deunicode" + version = "0.4.3" +@@ -871,6 +880,12 @@ dependencies = [ + "bitflags 1.3.2", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-traits" + version = "0.2.15" +@@ -970,7 +985,7 @@ dependencies = [ + "pest_meta", + "proc-macro2", + "quote", +- "syn 2.0.25", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1029,6 +1044,12 @@ version = "0.3.27" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -1275,22 +1296,22 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.171" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" ++checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.171" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" ++checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.25", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1323,7 +1344,7 @@ checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" + dependencies = [ + "log", + "termcolor", +- "time 0.3.23", ++ "time 0.3.36", + ] + + [[package]] +@@ -1403,9 +1424,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.25" ++version = "2.0.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" ++checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" + dependencies = [ + "proc-macro2", + "quote", +@@ -1536,7 +1557,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.25", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1561,13 +1582,16 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.23" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -1575,16 +1599,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.10" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -1762,7 +1787,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.25", ++ "syn 2.0.32", + "wasm-bindgen-shared", + ] + +@@ -1784,7 +1809,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.25", ++ "syn 2.0.32", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +-- +2.46.0 + diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix new file mode 100644 index 0000000000000..1c2276bf46c5c --- /dev/null +++ b/pkgs/by-name/gr/grcov/package.nix @@ -0,0 +1,48 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "grcov"; + version = "0.8.19"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "grcov"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-1t+hzB9sSApLScCkjBnLk9i2dsoEwZmWCFukEOvHhZI="; + }; + + cargoPatches = [ + ./0001-update-time-rs.patch + ]; + + cargoHash = "sha256-zbraeXyuXgif46tRFQpEZVZ6bInrgKbrqRArmjFIgU8="; + + # tests do not find grcov path correctly + checkFlags = + let + skipList = [ + "test_coveralls_service_job_id_is_not_sufficient" + "test_coveralls_service_name_is_not_sufficient" + "test_coveralls_works_with_just_service_name_and_job_id_args" + "test_coveralls_works_with_just_token_arg" + "test_integration" + "test_integration_guess_single_file" + "test_integration_zip_dir" + "test_integration_zip_zip" + ]; + skipFlag = test: "--skip " + test; + in + builtins.concatStringsSep " " (builtins.map skipFlag skipList); + + meta = { + description = "Rust tool to collect and aggregate code coverage data for multiple source files"; + mainProgram = "grcov"; + homepage = "https://github.com/mozilla/grcov"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ DieracDelta ]; + }; +} diff --git a/pkgs/by-name/gr/gren/generated-package.nix b/pkgs/by-name/gr/gren/generated-package.nix new file mode 100644 index 0000000000000..5fb245debbf95 --- /dev/null +++ b/pkgs/by-name/gr/gren/generated-package.nix @@ -0,0 +1,101 @@ +# This file has been autogenerated with cabal2nix. +# Update via ./update.sh +{ + mkDerivation, + ansi-terminal, + ansi-wl-pprint, + base, + base64-bytestring, + binary, + bytestring, + containers, + directory, + edit-distance, + fetchgit, + filelock, + filepath, + ghc-prim, + haskeline, + hspec, + hspec-discover, + indexed-traversable, + lib, + mtl, + prettyprint-avh4, + process, + raw-strings-qq, + scientific, + text, + time, + utf8-string, + vector, +}: +mkDerivation { + pname = "gren"; + version = "0.4.5"; + src = fetchgit { + url = "https://github.com/gren-lang/compiler.git"; + sha256 = "0hbxzn14m9y7sqwk347yj7hblwmj5fyzmy7kjqc8zjd63gmrkdh8"; + rev = "0efe25e3f48663a36eec525d2df0d957f53c9b4e"; + fetchSubmodules = true; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal + ansi-wl-pprint + base + base64-bytestring + binary + bytestring + containers + directory + edit-distance + filelock + filepath + ghc-prim + haskeline + indexed-traversable + mtl + prettyprint-avh4 + process + raw-strings-qq + scientific + text + time + utf8-string + vector + ]; + testHaskellDepends = [ + ansi-terminal + ansi-wl-pprint + base + base64-bytestring + binary + bytestring + containers + directory + edit-distance + filelock + filepath + ghc-prim + haskeline + hspec + indexed-traversable + mtl + prettyprint-avh4 + process + raw-strings-qq + scientific + text + time + utf8-string + vector + ]; + testToolDepends = [ hspec-discover ]; + jailbreak = true; + homepage = "https://gren-lang.org"; + description = "The `gren` command line interface"; + license = lib.licenses.bsd3; + mainProgram = "gren"; +} diff --git a/pkgs/by-name/gr/gren/package.nix b/pkgs/by-name/gr/gren/package.nix new file mode 100644 index 0000000000000..aea0293fe2eaf --- /dev/null +++ b/pkgs/by-name/gr/gren/package.nix @@ -0,0 +1,21 @@ +{ + lib, + haskell, + haskellPackages, +}: + +let + inherit (haskell.lib.compose) overrideCabal; + + raw-pkg = (haskellPackages.callPackage ./generated-package.nix { }).overrideScope ( + final: prev: { + ansi-wl-pprint = final.ansi-wl-pprint_0_6_9; + } + ); + + overrides = { + maintainers = with lib.maintainers; [ tomasajt ]; + passthru.updateScript = ./update.sh; + }; +in +overrideCabal overrides raw-pkg diff --git a/pkgs/by-name/gr/gren/update.sh b/pkgs/by-name/gr/gren/update.sh new file mode 100755 index 0000000000000..1b697ecb88dd8 --- /dev/null +++ b/pkgs/by-name/gr/gren/update.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p cabal2nix curl jq nixfmt-rfc-style + +set -euo pipefail + +# This is the directory of this update.sh script. +script_dir="$(dirname "${BASH_SOURCE[0]}")" +derivation_file="${script_dir}/generated-package.nix" +latest_version="$(curl --silent 'https://api.github.com/repos/gren-lang/compiler/releases/latest' | jq --raw-output '.tag_name')" + +echo "Updating gren to version ${latest_version}." +echo "Running cabal2nix and outputting to ${derivation_file}..." + +cat > "${derivation_file}" << EOF +# This file has been autogenerated with cabal2nix. +# Update via ./update.sh +EOF + +cabal2nix 'https://github.com/gren-lang/compiler.git' --revision "${latest_version}" --jailbreak >> "${derivation_file}" +nixfmt "${derivation_file}" + +echo 'Finished.' diff --git a/pkgs/by-name/gr/grim/package.nix b/pkgs/by-name/gr/grim/package.nix new file mode 100644 index 0000000000000..9055acb96dd86 --- /dev/null +++ b/pkgs/by-name/gr/grim/package.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchFromSourcehut, + libjpeg, + libpng, + meson, + ninja, + pixman, + pkg-config, + scdoc, + stdenv, + wayland, + wayland-protocols, + wayland-scanner, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "grim"; + version = "1.4.1"; + + src = fetchFromSourcehut { + owner = "~emersion"; + repo = "grim"; + rev = "v${finalAttrs.version}"; + hash = "sha256-5csJqRLNqhyeXR4dEQtnPUSwuZ8oY+BIt6AVICkm1+o="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + + buildInputs = [ + pixman + libpng + libjpeg + wayland + wayland-protocols + ]; + + mesonFlags = [ (lib.mesonBool "werror" false) ]; + + strictDeps = true; + + meta = { + homepage = "https://github.com/emersion/grim"; + description = "Grab images from a Wayland compositor"; + license = lib.licenses.mit; + mainProgram = "grim"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; + }; +}) diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index f9c85dbcf6e98..19f81b25989c0 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-07-22"; + version = "0-unstable-2024-09-12"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "f14a99e1369a6348a4ecd4a5b2d9c067b83f7b2a"; - hash = "sha256-WuZX2A5nLk8vMlK0ZlDlbeb79wCCWrGUf2CbqfnbUzk="; + rev = "48faf6afee9eea5f3b8c277c936bcb9f76bd95f7"; + hash = "sha256-LAMVTDVCxjk+reS/StsVdTlsx0DrCxNLClWk6za5D5o="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix index ff5e1411b8b1f..b182026972aa5 100644 --- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix +++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "SylEleuth"; repo = "gruvbox-plus-icon-pack"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-G7F+69K2aJVBM3yOQIMTH2pDXBfLmYScKIIAza3YNw8="; + hash = "sha256-G7F+69K2aJVBM3yOQIMTH2pDXBfLmYScKIIAza3YNw8="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 6d5809e30381e..93336b33aac04 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.80.0"; + version = "0.81.0"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-28/BR4oKOW7CK4gv4ESVZsvsyd6gKwW2XPvA1vU8/Wc="; + hash = "sha256-iFPUvqdYjSlrGlDrrb0w1HNeU5iAQ7PD4ojeZT3pHZ8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-F8r332smhjVRxAQ42CvJDmBl2rjxgwUZpoMDhFsBYSA="; + vendorHash = "sha256-PXx5SyuKvxOZwJBspIiL8L7QzXzort6ZU3ZfrE8o700="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gt/gtimelog/package.nix b/pkgs/by-name/gt/gtimelog/package.nix index d37e2a60eb3f2..f2abb96e3fea9 100644 --- a/pkgs/by-name/gt/gtimelog/package.nix +++ b/pkgs/by-name/gt/gtimelog/package.nix @@ -4,16 +4,20 @@ python3Packages.buildPythonApplication rec { pname = "gtimelog"; - version = "unstable-2023-10-05"; - format = "setuptools"; + version = "0.12.0"; + pyproject = true; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "ba606cbe8eef0e3dc098c6ab3bcbe381bf7ef410"; - hash = "sha256-+iBHfbUJtAtI/vcHj0Y8f9OxAp1SnhQyMqedVzSYPZQ="; + owner = "gtimelog"; + repo = "gtimelog"; + rev = "refs/tags/${version}"; + hash = "sha256-NlKAgAnZWodXF4eybcNOSxexjhegRgQEWoAPd+KWzsw="; }; + build-system = with python3Packages; [ + setuptools-scm + ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ glibcLocales gtk3 libsoup_3 libsecret ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/gt/gtkhtml/package.nix b/pkgs/by-name/gt/gtkhtml/package.nix index 0820e69d85a96..97782684a54d8 100644 --- a/pkgs/by-name/gt/gtkhtml/package.nix +++ b/pkgs/by-name/gt/gtkhtml/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/gtkhtml-${version}.tar.xz"; - sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; + hash = "sha256-yjtkJPssesXZy4/a+2kxj6LoJcnPbtF9HjjZsp5WBsM="; }; patches = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { (fetchpatch { name = "enchant-2.patch"; url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43"; - sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI="; + hash = "sha256-f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI="; extraPrefix = ""; }) ]; diff --git a/pkgs/by-name/gu/gucharmap/package.nix b/pkgs/by-name/gu/gucharmap/package.nix index 17f8465f380bf..c22eae1514021 100644 --- a/pkgs/by-name/gu/gucharmap/package.nix +++ b/pkgs/by-name/gu/gucharmap/package.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "gucharmap"; rev = finalAttrs.version; - sha256 = "sha256-PG86D8QvqHdmo3aJseCerngmuWUqtSMdWzbixWE2HOQ="; + hash = "sha256-PG86D8QvqHdmo3aJseCerngmuWUqtSMdWzbixWE2HOQ="; }; strictDeps = true; diff --git a/pkgs/by-name/gu/guile-avahi/package.nix b/pkgs/by-name/gu/guile-avahi/package.nix index c75d4ee0f079e..3a8c9be42998f 100644 --- a/pkgs/by-name/gu/guile-avahi/package.nix +++ b/pkgs/by-name/gu/guile-avahi/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-unused-function"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-unused-function"; meta = with lib; { description = "Bindings to Avahi for GNU Guile"; diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/by-name/gu/guile-cairo/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-cairo/default.nix rename to pkgs/by-name/gu/guile-cairo/package.nix diff --git a/pkgs/by-name/gu/guile-chickadee/package.nix b/pkgs/by-name/gu/guile-chickadee/package.nix index f4a454bf4e45f..aa34a0d36df9b 100644 --- a/pkgs/by-name/gu/guile-chickadee/package.nix +++ b/pkgs/by-name/gu/guile-chickadee/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { command = "chickadee -v"; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Game development toolkit for Guile Scheme with SDL2 and OpenGL"; @@ -75,6 +75,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ chito ]; mainProgram = "chickadee"; platforms = guile.meta.platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/development/guile-modules/guile-commonmark/default.nix b/pkgs/by-name/gu/guile-commonmark/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-commonmark/default.nix rename to pkgs/by-name/gu/guile-commonmark/package.nix diff --git a/pkgs/development/guile-modules/guile-config/default.nix b/pkgs/by-name/gu/guile-config/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-config/default.nix rename to pkgs/by-name/gu/guile-config/package.nix diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/by-name/gu/guile-fibers/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-fibers/default.nix rename to pkgs/by-name/gu/guile-fibers/package.nix diff --git a/pkgs/by-name/gu/guile-gcrypt/package.nix b/pkgs/by-name/gu/guile-gcrypt/package.nix new file mode 100644 index 0000000000000..3b6aa220ae923 --- /dev/null +++ b/pkgs/by-name/gu/guile-gcrypt/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitea +, guile +, libgcrypt +, autoreconfHook +, pkg-config +, texinfo +}: + +stdenv.mkDerivation rec { + pname = "guile-gcrypt"; + version = "0.4.0"; + + src = fetchFromGitea { + domain = "notabug.org"; + owner = "cwebber"; + repo = "guile-gcrypt"; + rev = "v${version}"; + hash = "sha256-vbm31EsOJiMeTs2tu5KPXckxPcAQbi3/PGJ5EHCC5VQ="; + }; + + strictDeps = true; + nativeBuildInputs = [ + autoreconfHook guile libgcrypt pkg-config texinfo + ]; + buildInputs = [ + guile + ]; + propagatedBuildInputs = [ + libgcrypt + ]; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + doCheck = true; + + # In procedure bytevector-u8-ref: Argument 2 out of range + dontStrip = stdenv.hostPlatform.isDarwin; + + meta = with lib; { + description = "Bindings to Libgcrypt for GNU Guile"; + homepage = "https://notabug.org/cwebber/guile-gcrypt"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ethancedwards8 ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/by-name/gu/guile-git/package.nix b/pkgs/by-name/gu/guile-git/package.nix new file mode 100644 index 0000000000000..f092238929bf4 --- /dev/null +++ b/pkgs/by-name/gu/guile-git/package.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitLab +, guile +, libgit2 +, scheme-bytestructures +, autoreconfHook +, pkg-config +, texinfo +}: + +stdenv.mkDerivation rec { + pname = "guile-git"; + version = "0.8.0"; + + src = fetchFromGitLab { + owner = "guile-git"; + repo = pname; + rev = "v${version}"; + hash = "sha256-EZ2uGyk1K2YCl/U7EzTKri6CEe8CGDRy4pNRVjp7ZZY="; + }; + + strictDeps = true; + nativeBuildInputs = [ + autoreconfHook guile pkg-config texinfo + ]; + buildInputs = [ + guile + ]; + propagatedBuildInputs = [ + libgit2 scheme-bytestructures + ]; + doCheck = !stdenv.hostPlatform.isDarwin; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + enableParallelBuilding = true; + + # Skipping proxy tests since it requires network access. + postConfigure = '' + sed -i -e '94i (test-skip 1)' ./tests/proxy.scm + ''; + + meta = with lib; { + description = "Bindings to Libgit2 for GNU Guile"; + homepage = "https://gitlab.com/guile-git/guile-git"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ethancedwards8 ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/by-name/gu/guile-gnutls/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-gnutls/default.nix rename to pkgs/by-name/gu/guile-gnutls/package.nix diff --git a/pkgs/by-name/gu/guile-goblins/package.nix b/pkgs/by-name/gu/guile-goblins/package.nix index aa5bcbc4bced5..4175b9c5d79b4 100644 --- a/pkgs/by-name/gu/guile-goblins/package.nix +++ b/pkgs/by-name/gu/guile-goblins/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; # tests hang on darwin, and fail randomly on aarch64-linux on ofborg - doCheck = !stdenv.isDarwin && !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64; meta = with lib; { description = "Spritely Goblins for Guile"; diff --git a/pkgs/development/tools/guile/guile-hall/default.nix b/pkgs/by-name/gu/guile-hall/package.nix similarity index 100% rename from pkgs/development/tools/guile/guile-hall/default.nix rename to pkgs/by-name/gu/guile-hall/package.nix diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/by-name/gu/guile-json/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-json/default.nix rename to pkgs/by-name/gu/guile-json/package.nix diff --git a/pkgs/by-name/gu/guile-lib/package.nix b/pkgs/by-name/gu/guile-lib/package.nix new file mode 100644 index 0000000000000..5143c959ccd5f --- /dev/null +++ b/pkgs/by-name/gu/guile-lib/package.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchurl +, autoreconfHook +, guile +, pkg-config +, texinfo +}: + +stdenv.mkDerivation rec { + pname = "guile-lib"; + version = "0.2.8.1"; + + src = fetchurl { + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-E3TC2Dnmoz0ZDNHavZx/h3U/g4T1W4ZvPhQhVcIrSbE="; + }; + + strictDeps = true; + nativeBuildInputs = [ + autoreconfHook + guile + pkg-config + ]; + buildInputs = [ + guile + texinfo + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace 'SITEDIR="$datadir/guile-lib"' 'SITEDIR=$datadir/guile/site/$GUILE_EFFECTIVE_VERSION' \ + --replace 'SITECCACHEDIR="$libdir/guile-lib/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' 'SITECCACHEDIR="$libdir/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' + ''; + + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + doCheck = !stdenv.hostPlatform.isDarwin; + + preCheck = '' + # Make `libgcc_s.so' visible for `pthread_cancel'. + export LD_LIBRARY_PATH=\ + "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + ''; + + meta = with lib; { + homepage = "https://www.nongnu.org/guile-lib/"; + description = "Collection of useful Guile Scheme modules"; + longDescription = '' + guile-lib is intended as an accumulation place for pure-scheme Guile + modules, allowing for people to cooperate integrating their generic Guile + modules into a coherent library. Think "a down-scaled, limited-scope CPAN + for Guile". + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ vyp foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/by-name/gu/guile-lzlib/package.nix b/pkgs/by-name/gu/guile-lzlib/package.nix index 21c9c6c53950b..a465849470b04 100644 --- a/pkgs/by-name/gu/guile-lzlib/package.nix +++ b/pkgs/by-name/gu/guile-lzlib/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; # tests fail on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "GNU Guile library providing bindings to lzlib"; diff --git a/pkgs/by-name/gu/guile-lzma/package.nix b/pkgs/by-name/gu/guile-lzma/package.nix index 89a361ef9e4c9..9f7b941f068f8 100644 --- a/pkgs/by-name/gu/guile-lzma/package.nix +++ b/pkgs/by-name/gu/guile-lzma/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; # In procedure bytevector-u8-ref: Argument 2 out of range - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://ngyro.com/software/guile-lzma.html"; diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/by-name/gu/guile-ncurses/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-ncurses/default.nix rename to pkgs/by-name/gu/guile-ncurses/package.nix diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/by-name/gu/guile-opengl/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-opengl/default.nix rename to pkgs/by-name/gu/guile-opengl/package.nix diff --git a/pkgs/by-name/gu/guile-quickcheck/package.nix b/pkgs/by-name/gu/guile-quickcheck/package.nix index 0a7a0c836a640..2c3c0f9c4b9bf 100644 --- a/pkgs/by-name/gu/guile-quickcheck/package.nix +++ b/pkgs/by-name/gu/guile-quickcheck/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ guile pkg-config ]; buildInputs = [ guile ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://ngyro.com/software/guile-quickcheck.html"; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/by-name/gu/guile-reader/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-reader/default.nix rename to pkgs/by-name/gu/guile-reader/package.nix diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/by-name/gu/guile-sdl2/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-sdl2/default.nix rename to pkgs/by-name/gu/guile-sdl2/package.nix diff --git a/pkgs/by-name/gu/guile-ssh/package.nix b/pkgs/by-name/gu/guile-ssh/package.nix new file mode 100644 index 0000000000000..ad3a8c5474428 --- /dev/null +++ b/pkgs/by-name/gu/guile-ssh/package.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, guile +, libssh +, autoreconfHook +, pkg-config +, texinfo +, which +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "guile-ssh"; + version = "0.16.3"; + + src = fetchFromGitHub { + owner = "artyom-poptsov"; + repo = "guile-ssh"; + rev = "v${finalAttrs.version}"; + hash = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/artyom-poptsov/guile-ssh/pull/31/commits/38636c978f257d5228cd065837becabf5da16854.patch"; + hash = "sha256-J+TDgdjihKoEjhbeH+BzqrHhjpVlGdscRj3L/GAFgKg="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + guile + pkg-config + texinfo + which + ]; + + buildInputs = [ + guile + ]; + + propagatedBuildInputs = [ + libssh + ]; + + enableParallelBuilding = true; + + # FAIL: server-client.scm + doCheck = !stdenv.hostPlatform.isDarwin; + + postInstall = '' + mv $out/bin/*.scm $out/share/guile-ssh + rmdir $out/bin + ''; + + meta = with lib; { + description = "Bindings to Libssh for GNU Guile"; + homepage = "https://github.com/artyom-poptsov/guile-ssh"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ethancedwards8 foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +}) diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/by-name/gu/guile-xcb/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-xcb/default.nix rename to pkgs/by-name/gu/guile-xcb/package.nix diff --git a/pkgs/by-name/gu/guile-zstd/package.nix b/pkgs/by-name/gu/guile-zstd/package.nix index 70fea933eabbf..2c0f9b8d0425b 100644 --- a/pkgs/by-name/gu/guile-zstd/package.nix +++ b/pkgs/by-name/gu/guile-zstd/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zstd ]; makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "GNU Guile library providing bindings to zstd"; diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix index d3ea63a413114..90eb4dfefec4a 100644 --- a/pkgs/by-name/gu/guix/package.nix +++ b/pkgs/by-name/gu/guix/package.nix @@ -154,6 +154,7 @@ stdenv.mkDerivation rec { Guix is based on the Nix package manager. ''; homepage = "http://www.gnu.org/software/guix"; + changelog = "https://git.savannah.gnu.org/cgit/guix.git/plain/NEWS?h=v${version}"; license = licenses.gpl3Plus; mainProgram = "guix"; maintainers = with maintainers; [ cafkafk foo-dogsquared ]; diff --git a/pkgs/by-name/gu/gungnir/package.nix b/pkgs/by-name/gu/gungnir/package.nix index 571a9e1ac7f79..5ca7388338efe 100644 --- a/pkgs/by-name/gu/gungnir/package.nix +++ b/pkgs/by-name/gu/gungnir/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gungnir"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "g0ldencybersec"; repo = "gungnir"; rev = "v${version}"; - hash = "sha256-A4MPRsUSeYwKlhCHByty6T33wEp/BopZMDWOnOqlQqQ="; + hash = "sha256-iMawBuSPPeJztQ3Pdd2dUKSNaWCbbKcUW/IGBFifyng="; }; - vendorHash = "sha256-r2aU59L0fnSdc/lpR04K/GQ1eZ7ihV+tKlyuS6sPX2o="; + vendorHash = "sha256-2RCIZS8oawaXtAYZDiLgNsco9llWCxNwQcA67F51rag="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/emulators/gxemul/0001-fix-attributes.patch b/pkgs/by-name/gx/gxemul/0001-fix-attributes.patch similarity index 100% rename from pkgs/applications/emulators/gxemul/0001-fix-attributes.patch rename to pkgs/by-name/gx/gxemul/0001-fix-attributes.patch diff --git a/pkgs/applications/emulators/gxemul/default.nix b/pkgs/by-name/gx/gxemul/package.nix similarity index 100% rename from pkgs/applications/emulators/gxemul/default.nix rename to pkgs/by-name/gx/gxemul/package.nix diff --git a/pkgs/by-name/gx/gxml/package.nix b/pkgs/by-name/gx/gxml/package.nix index 7ff34db4327d9..3540336c81787 100644 --- a/pkgs/by-name/gx/gxml/package.nix +++ b/pkgs/by-name/gx/gxml/package.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "GXml provides a GObject API for manipulating XML and a Serializable framework from GObject to XML"; homepage = "https://gitlab.gnome.org/GNOME/gxml"; + changelog = "https://gitlab.gnome.org/GNOME/gxml/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ jmarmstrong1207 ] ++ teams.gnome.members; diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix new file mode 100644 index 0000000000000..1856d479426d3 --- /dev/null +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -0,0 +1,125 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + SDL2, + bzip2, + cmake, + fluidsynth, + game-music-emu, + gtk3, + imagemagick, + libGL, + libjpeg, + libsndfile, + libvpx, + libwebp, + mpg123, + ninja, + openal, + pkg-config, + vulkan-loader, + zlib, + zmusic, +}: + +stdenv.mkDerivation rec { + pname = "gzdoom"; + version = "4.12.2"; + + src = fetchFromGitHub { + owner = "ZDoom"; + repo = "gzdoom"; + rev = "g${version}"; + fetchSubmodules = true; + hash = "sha256-taie1Iod3pXvuxxBC7AArmtndkIV0Di9mtJoPvPkioo="; + }; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + cmake + copyDesktopItems + imagemagick + makeWrapper + ninja + pkg-config + ]; + + buildInputs = [ + SDL2 + bzip2 + fluidsynth + game-music-emu + gtk3 + libGL + libjpeg + libsndfile + libvpx + libwebp + mpg123 + openal + vulkan-loader + zlib + zmusic + ]; + + postPatch = '' + substituteInPlace tools/updaterevision/UpdateRevision.cmake \ + --replace-fail "ret_var(Tag)" "ret_var(\"${src.rev}\")" \ + --replace-fail "ret_var(Timestamp)" "ret_var(\"1970-00-00 00:00:00 +0000\")" \ + --replace-fail "ret_var(Hash)" "ret_var(\"${src.rev}\")" \ + --replace-fail "<unknown version>" "${src.rev}" + ''; + + cmakeFlags = [ + "-DDYN_GTK=OFF" + "-DDYN_OPENAL=OFF" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "gzdoom"; + exec = "gzdoom"; + desktopName = "GZDoom"; + comment = meta.description; + icon = "gzdoom"; + categories = [ "Game" ]; + }) + ]; + + postInstall = '' + mv $out/bin/gzdoom $out/share/games/doom/gzdoom + makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom \ + --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]} + + for size in 16 24 32 48 64 128; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + magick $src/src/win32/icon1.ico -background none -resize "$size"x"$size" -flatten \ + $out/share/icons/hicolor/"$size"x"$size"/apps/gzdoom.png + done; + ''; + + meta = { + homepage = "https://github.com/ZDoom/gzdoom"; + description = "Modder-friendly OpenGL and Vulkan source port based on the DOOM engine"; + mainProgram = "gzdoom"; + longDescription = '' + GZDoom is a feature centric port for all DOOM engine games, based on + ZDoom, adding an OpenGL renderer and powerful scripting capabilities. + ''; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + azahi + lassulus + Gliczy + ]; + }; +} diff --git a/pkgs/applications/window-managers/hackedbox/default.nix b/pkgs/by-name/ha/hackedbox/package.nix similarity index 100% rename from pkgs/applications/window-managers/hackedbox/default.nix rename to pkgs/by-name/ha/hackedbox/package.nix diff --git a/pkgs/by-name/ha/hackgregator/package.nix b/pkgs/by-name/ha/hackgregator/package.nix new file mode 100644 index 0000000000000..d914a9fc9fa94 --- /dev/null +++ b/pkgs/by-name/ha/hackgregator/package.nix @@ -0,0 +1,65 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + pkg-config, + wrapGAppsHook4, + libadwaita, + openssl, + webkitgtk_6_0, + sqlite, + glib-networking, +}: + +rustPlatform.buildRustPackage { + pname = "hackgregator"; + version = "0.5.0-unstable-2023-12-05"; + + src = fetchFromGitLab { + owner = "gunibert"; + repo = "hackgregator"; + rev = "594bdcdc3919c7216d611ddbbc77ab4d0c1f4f2b"; + hash = "sha256-RE0x4YWquWAcQzxGk9zdNjEp1pijrBtjV1EMBu9c5cs="; + }; + + cargoHash = "sha256-OPlYFUhAFRHqXS2vad0QYlhcwyyxdxi1kjpTxVlgyxs="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + openssl + webkitgtk_6_0 + sqlite + glib-networking + ]; + + # 'error[E0432]: unresolved import' when compiling checks + doCheck = false; + + postInstall = '' + rm $out/bin/xtask + mkdir -p $out/share + pushd hackgregator/data + cp -r icons $out/share/icons + install -Dm644 de.gunibert.Hackgregator.desktop -t $out/share/applications + install -Dm644 de.gunibert.Hackgregator.appdata.xml -t $out/share/appdata + popd + ''; + + meta = { + description = "Comfortable GTK reader application for news.ycombinator.com"; + homepage = "https://gitlab.com/gunibert/hackgregator"; + license = with lib.licenses; [ + gpl3Plus + # and + cc0 + ]; + mainProgram = "hackgregator"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix index d828d36bc1ae1..a4fae90fb606a 100644 --- a/pkgs/by-name/ha/hadolint-sarif/package.nix +++ b/pkgs/by-name/ha/hadolint-sarif/package.nix @@ -7,14 +7,14 @@ }: rustPlatform.buildRustPackage rec { pname = "hadolint-sarif"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit pname version; - hash = "sha256-wMb/taAAR0W8YVowNik0S8nFSmsD6LAQ5Egn0k52U74="; + hash = "sha256-v1rbM1HEZpSIS07x4GyICu6OR7PfH89wNywlXXPh1to="; }; - cargoHash = "sha256-OpUUmte/NfMNbyO3H4ikJF5ALnvfNkUBwFhIN9vefd0="; + cargoHash = "sha256-lojb6tESIl2kbVDUyoDf1CntvzJOtoZZJEyDs9PR7Gw="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ha/halloy/Cargo.lock b/pkgs/by-name/ha/halloy/Cargo.lock index b8f19e6443391..6bbad68198497 100644 --- a/pkgs/by-name/ha/halloy/Cargo.lock +++ b/pkgs/by-name/ha/halloy/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.26" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -78,6 +78,27 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +[[package]] +name = "alsa" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" +dependencies = [ + "alsa-sys", + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + [[package]] name = "android-activity" version = "0.6.0" @@ -85,14 +106,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", "jni-sys", "libc", "log", - "ndk", + "ndk 0.9.0", "ndk-context", "ndk-sys 0.6.0+11769913", "num_enum", @@ -137,9 +158,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -205,9 +226,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -241,9 +262,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock", "cfg-if", @@ -255,7 +276,7 @@ dependencies = [ "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -271,9 +292,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.3" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ "async-channel", "async-io", @@ -286,7 +307,7 @@ dependencies = [ "futures-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -297,14 +318,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ "async-io", "async-lock", @@ -315,7 +336,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -326,13 +347,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -380,6 +401,26 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.74", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -409,9 +450,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -464,22 +505,22 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -490,9 +531,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "bytesize" @@ -506,7 +547,21 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +dependencies = [ + "bitflags 2.6.0", "log", "polling", "rustix", @@ -520,7 +575,19 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ - "calloop", + "calloop 0.12.4", + "rustix", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" +dependencies = [ + "calloop 0.13.0", "rustix", "wayland-backend", "wayland-client", @@ -528,13 +595,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.99" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -543,6 +610,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -573,14 +649,31 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading 0.8.5", ] +[[package]] +name = "claxon" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" + [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -681,6 +774,26 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const_format" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -693,9 +806,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -721,32 +834,77 @@ dependencies = [ "libc", ] +[[package]] +name = "coreaudio-rs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" +dependencies = [ + "bindgen", +] + [[package]] name = "cosmic-text" -version = "0.10.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71" +checksum = "59fd57d82eb4bfe7ffa9b1cec0c05e2fd378155b47f255a67983cb4afe0e80c2" dependencies = [ + "bitflags 2.6.0", "fontdb", - "libm", "log", "rangemap", - "rustc-hash", + "rayon", + "rustc-hash 1.1.0", "rustybuzz", "self_cell", "swash", "sys-locale", + "ttf-parser 0.21.1", "unicode-bidi", "unicode-linebreak", "unicode-script", "unicode-segmentation", ] +[[package]] +name = "cpal" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "dasp_sample", + "jni", + "js-sys", + "libc", + "mach2", + "ndk 0.8.0", + "ndk-context", + "oboe", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.54.0", +] + [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -819,8 +977,8 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", + "bitflags 2.6.0", + "libloading 0.8.5", "winapi", ] @@ -840,6 +998,12 @@ dependencies = [ "zbus", ] +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + [[package]] name = "data" version = "0.1.0" @@ -847,14 +1011,17 @@ dependencies = [ "base64 0.21.7", "bytes", "chrono", + "const_format", "dirs-next", "flate2", "futures", "hex", "iced_core", "irc", - "itertools", + "itertools 0.12.1", "log", + "nom", + "once_cell", "palette", "rand", "rand_chacha", @@ -870,6 +1037,7 @@ dependencies = [ "tokio-stream", "toml", "url", + "walkdir", "xdg", ] @@ -957,7 +1125,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading 0.8.5", ] [[package]] @@ -983,7 +1151,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "drm-ffi", "drm-fourcc", @@ -1013,20 +1181,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" dependencies = [ "libc", - "linux-raw-sys 0.6.4", + "linux-raw-sys 0.6.5", ] [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embed-resource" -version = "2.4.2" +version = "2.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602" dependencies = [ "cc", "memchr", @@ -1069,7 +1237,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -1196,9 +1364,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "miniz_oxide", @@ -1221,34 +1389,34 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.5.5" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" dependencies = [ "bytemuck", ] [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ "roxmltree", ] [[package]] name = "fontdb" -version = "0.15.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.8.0", + "memmap2", "slotmap", "tinyvec", - "ttf-parser 0.19.2", + "ttf-parser 0.20.0", ] [[package]] @@ -1278,7 +1446,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -1372,7 +1540,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -1469,6 +1637,12 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "glow" version = "0.13.1" @@ -1493,12 +1667,12 @@ dependencies = [ [[package]] name = "glyphon" version = "0.5.0" -source = "git+https://github.com/hecrj/glyphon.git?rev=f07e7bab705e69d39a5e6e52c73039a93c4552f8#f07e7bab705e69d39a5e6e52c73039a93c4552f8" +source = "git+https://github.com/hecrj/glyphon.git?rev=feef9f5630c2adb3528937e55f7bfad2da561a65#feef9f5630c2adb3528937e55f7bfad2da561a65" dependencies = [ "cosmic-text", "etagere", "lru", - "rustc-hash", + "rustc-hash 2.0.0", "wgpu", ] @@ -1508,7 +1682,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -1518,7 +1692,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -1540,7 +1714,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", "hashbrown 0.14.5", ] @@ -1551,7 +1725,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -1606,17 +1780,20 @@ dependencies = [ "iced", "image", "ipc", + "itertools 0.13.0", "log", "notify-rust", "once_cell", "open", "palette", "rfd", + "rodio", "thiserror", "timeago", "tokio", "unicode-segmentation", "uuid", + "windows_exe_info", ] [[package]] @@ -1644,10 +1821,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "thiserror", "widestring", "winapi", @@ -1683,6 +1860,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +[[package]] +name = "hound" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f" + [[package]] name = "http" version = "1.1.0" @@ -1696,9 +1879,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -1725,9 +1908,9 @@ checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", @@ -1778,9 +1961,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -1822,7 +2005,7 @@ dependencies = [ [[package]] name = "iced" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "iced_core", "iced_futures", @@ -1836,9 +2019,9 @@ dependencies = [ [[package]] name = "iced_core" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "dark-light", "glam", @@ -1846,7 +2029,7 @@ dependencies = [ "num-traits", "once_cell", "palette", - "rustc-hash", + "rustc-hash 2.0.0", "smol_str", "thiserror", "web-time", @@ -1855,12 +2038,12 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "futures", "iced_core", "log", - "rustc-hash", + "rustc-hash 2.0.0", "tokio", "wasm-bindgen-futures", "wasm-timer", @@ -1869,9 +2052,9 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "cosmic-text", "half", @@ -1882,7 +2065,7 @@ dependencies = [ "log", "once_cell", "raw-window-handle", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", ] @@ -1890,7 +2073,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -1902,7 +2085,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "bytes", "iced_core", @@ -1914,14 +2097,14 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "bytemuck", "cosmic-text", "iced_graphics", "kurbo", "log", - "rustc-hash", + "rustc-hash 2.0.0", "softbuffer", "tiny-skia", ] @@ -1929,9 +2112,9 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "futures", "glam", @@ -1940,7 +2123,7 @@ dependencies = [ "iced_graphics", "log", "once_cell", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "wgpu", ] @@ -1948,13 +2131,14 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "iced_renderer", "iced_runtime", "num-traits", + "once_cell", "ouroboros", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", ] @@ -1962,13 +2146,13 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=19db068bbbebcda1756720525da247f35bd3a5e0#19db068bbbebcda1756720525da247f35bd3a5e0" +source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" dependencies = [ "iced_futures", "iced_graphics", "iced_runtime", "log", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "tracing", "wasm-bindgen-futures", @@ -2008,9 +2192,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -2093,7 +2277,7 @@ dependencies = [ name = "irc_proto" version = "0.1.0" dependencies = [ - "itertools", + "itertools 0.12.1", "nom", "thiserror", ] @@ -2135,6 +2319,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2165,9 +2358,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -2183,9 +2376,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2206,7 +2399,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.3", + "libloading 0.8.5", "pkg-config", ] @@ -2226,17 +2419,40 @@ dependencies = [ "smallvec", ] +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "lebe" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" +[[package]] +name = "lewton" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" +dependencies = [ + "byteorder", + "ogg", + "tinyvec", +] + [[package]] name = "libc" -version = "0.2.155" +version = "0.2.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" [[package]] name = "libloading" @@ -2250,12 +2466,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2270,7 +2486,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -2281,7 +2497,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -2293,9 +2509,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" +checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" [[package]] name = "lock_api" @@ -2309,15 +2525,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" [[package]] name = "mac-notification-sys" @@ -2332,6 +2548,15 @@ dependencies = [ "time", ] +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -2347,15 +2572,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" -dependencies = [ - "libc", -] - [[package]] name = "memmap2" version = "0.9.4" @@ -2380,7 +2596,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -2413,13 +2629,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2435,13 +2652,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" dependencies = [ "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "codespan-reporting", "hexf-parse", "indexmap", "log", "num-traits", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -2465,13 +2682,27 @@ dependencies = [ "tempfile", ] +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum", + "thiserror", +] + [[package]] name = "ndk" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", "ndk-sys 0.6.0+11769913", @@ -2506,13 +2737,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.1.1", + "cfg_aliases 0.2.1", "libc", "memoffset", ] @@ -2529,9 +2760,9 @@ dependencies = [ [[package]] name = "notify-rust" -version = "4.11.0" +version = "4.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" +checksum = "26a1d03b6305ecefdd9c6c60150179bb8d9f0cd4e64bbcad1e41419e7bf5e414" dependencies = [ "log", "mac-notification-sys", @@ -2546,6 +2777,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -2567,23 +2809,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -2629,7 +2871,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "libc", "objc2", @@ -2645,7 +2887,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "objc2", "objc2-core-location", @@ -2669,7 +2911,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "objc2", "objc2-foundation", @@ -2711,7 +2953,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "dispatch", "libc", @@ -2736,7 +2978,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "objc2", "objc2-foundation", @@ -2748,7 +2990,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "objc2", "objc2-foundation", @@ -2771,7 +3013,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "objc2", "objc2-cloud-kit", @@ -2803,7 +3045,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "objc2", "objc2-core-location", @@ -2830,13 +3072,45 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] +[[package]] +name = "oboe" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" +dependencies = [ + "jni", + "ndk 0.8.0", + "ndk-context", + "num-derive", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" +dependencies = [ + "cc", +] + +[[package]] +name = "ogg" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" +dependencies = [ + "byteorder", +] + [[package]] name = "once_cell" version = "1.19.0" @@ -2845,9 +3119,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.1.4" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ca541f22b1c46d4bb9801014f234758ab4297e7870b904b6a8415b980a7388" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ "is-wsl", "libc", @@ -2856,11 +3130,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -2877,7 +3151,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -2888,9 +3162,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -2945,20 +3219,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" dependencies = [ "heck", - "itertools", + "itertools 0.12.1", "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] name = "owned_ttf_parser" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ - "ttf-parser 0.21.1", + "ttf-parser 0.24.1", ] [[package]] @@ -2982,7 +3256,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -3034,9 +3308,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3087,7 +3361,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -3116,7 +3390,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -3133,9 +3407,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand", @@ -3163,9 +3437,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", @@ -3173,7 +3447,7 @@ dependencies = [ "pin-project-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3190,9 +3464,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "presser" @@ -3211,9 +3488,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -3226,7 +3503,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", "version_check", "yansi", ] @@ -3255,6 +3532,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "quick-xml" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.36" @@ -3334,9 +3620,9 @@ dependencies = [ [[package]] name = "read-fonts" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" +checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" dependencies = [ "bytemuck", "font-types", @@ -3362,11 +3648,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3382,9 +3668,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -3497,10 +3783,24 @@ dependencies = [ ] [[package]] -name = "roxmltree" +name = "rodio" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6006a627c1a38d37f3d3a85c6575418cfe34a5392d60a686d0071e1c8d427acb" +dependencies = [ + "claxon", + "cpal", + "hound", + "lewton", + "symphonia", + "thiserror", +] + +[[package]] +name = "roxmltree" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rust-ini" @@ -3524,6 +3824,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -3539,7 +3845,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys 0.4.14", @@ -3548,9 +3854,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.10" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "once_cell", "ring", @@ -3562,9 +3868,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3575,9 +3881,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -3585,15 +3891,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -3602,15 +3908,15 @@ dependencies = [ [[package]] name = "rustybuzz" -version = "0.11.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "bytemuck", "libm", "smallvec", - "ttf-parser 0.20.0", + "ttf-parser 0.21.1", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -3655,14 +3961,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de61fa7334ee8ee1f5c3c58dcc414fb9361e7e8f5bff9d45f4d69eeb89a7169" +checksum = "7555fcb4f753d095d734fdefebb0ad8c98478a21db500492d87c55913d3b0086" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.4", - "smithay-client-toolkit", + "memmap2", + "smithay-client-toolkit 0.18.1", "tiny-skia", ] @@ -3674,11 +3980,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3687,9 +3993,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3709,31 +4015,32 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -3746,14 +4053,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -3792,6 +4099,12 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -3815,9 +4128,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "skrifa" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" dependencies = [ "bytemuck", "read-fonts", @@ -3853,33 +4166,58 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ - "bitflags 2.5.0", - "calloop", - "calloop-wayland-source", + "bitflags 2.6.0", + "calloop 0.12.4", + "calloop-wayland-source 0.2.0", "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2", "rustix", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr 0.2.0", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" +dependencies = [ + "bitflags 2.6.0", + "calloop 0.13.0", + "calloop-wayland-source 0.3.0", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.32.3", + "wayland-protocols-wlr 0.3.3", "wayland-scanner", "xkeysym", ] [[package]] name = "smithay-clipboard" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ "libc", - "smithay-client-toolkit", + "smithay-client-toolkit 0.19.2", "wayland-backend", ] @@ -3904,9 +4242,9 @@ dependencies = [ [[package]] name = "softbuffer" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae0d2e93c874cca74fe830bccbd1132299318932d273d2a3c77ad77476a3d7e" +checksum = "d623bff5d06f60d738990980d782c8c866997d9194cfe79ecad00aa2f76826dd" dependencies = [ "as-raw-xcb-connection", "bytemuck", @@ -3917,13 +4255,13 @@ dependencies = [ "foreign-types 0.5.0", "js-sys", "log", - "memmap2 0.9.4", + "memmap2", "objc2", "objc2-app-kit", "objc2-foundation", "objc2-quartz-core", "raw-window-handle", - "redox_syscall 0.5.2", + "redox_syscall 0.5.3", "rustix", "tiny-xlib", "wasm-bindgen", @@ -3959,7 +4297,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3976,9 +4314,9 @@ checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "svg_fmt" @@ -3988,15 +4326,64 @@ checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" [[package]] name = "swash" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" +checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" dependencies = [ "skrifa", "yazi", "zeno", ] +[[package]] +name = "symphonia" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9" +dependencies = [ + "lazy_static", + "symphonia-bundle-mp3", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-bundle-mp3" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-core" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3" +dependencies = [ + "arrayvec", + "bitflags 1.3.2", + "bytemuck", + "lazy_static", + "log", +] + +[[package]] +name = "symphonia-metadata" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c" +dependencies = [ + "encoding_rs", + "lazy_static", + "log", + "symphonia-core", +] + [[package]] name = "syn" version = "1.0.109" @@ -4010,9 +4397,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -4061,21 +4448,22 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" dependencies = [ - "quick-xml", + "quick-xml 0.31.0", "windows 0.56.0", "windows-version", ] [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4089,22 +4477,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -4181,16 +4569,16 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading 0.8.3", + "libloading 0.8.5", "pkg-config", "tracing", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4209,33 +4597,32 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -4285,21 +4672,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -4317,15 +4704,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.18", ] [[package]] @@ -4345,15 +4732,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4374,7 +4761,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -4392,12 +4779,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "ttf-parser" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" - [[package]] name = "ttf-parser" version = "0.20.0" @@ -4410,6 +4791,12 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" +[[package]] +name = "ttf-parser" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" + [[package]] name = "typenum" version = "1.17.0" @@ -4435,15 +4822,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" [[package]] name = "unicode-ccc" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" [[package]] name = "unicode-ident" @@ -4522,9 +4909,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", ] @@ -4537,9 +4924,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vswhom" @@ -4588,34 +4975,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4625,9 +5013,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4635,22 +5023,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-timer" @@ -4669,9 +5057,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" dependencies = [ "cc", "downcast-rs", @@ -4683,11 +5071,11 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "rustix", "wayland-backend", "wayland-scanner", @@ -4699,16 +5087,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" +checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" dependencies = [ "rustix", "wayland-client", @@ -4721,7 +5109,19 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" +dependencies = [ + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -4733,10 +5133,10 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-scanner", ] @@ -4746,29 +5146,42 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" +dependencies = [ + "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.32.3", "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.31.2" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ "proc-macro2", - "quick-xml", + "quick-xml 0.34.0", "quote", ] [[package]] name = "wayland-sys" -version = "0.31.2" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" dependencies = [ "dlib", "log", @@ -4778,9 +5191,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4835,7 +5248,7 @@ checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases 0.1.1", "codespan-reporting", "indexmap", @@ -4845,7 +5258,7 @@ dependencies = [ "parking_lot 0.12.3", "profiling", "raw-window-handle", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "web-sys", @@ -4855,15 +5268,15 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.19.4" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3" +checksum = "bfabcfc55fd86611a855816326b2d54c3b2fd7972c27ce414291562650552703" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "cfg_aliases 0.1.1", "core-graphics-types", @@ -4877,7 +5290,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "log", "metal", "naga", @@ -4889,7 +5302,7 @@ dependencies = [ "range-alloc", "raw-window-handle", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -4904,7 +5317,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "web-sys", ] @@ -4933,11 +5346,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4967,7 +5380,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.6", ] [[package]] @@ -4977,7 +5400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ "windows-core 0.56.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4986,7 +5409,17 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -4998,7 +5431,7 @@ dependencies = [ "windows-implement", "windows-interface", "windows-result", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5009,7 +5442,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -5020,7 +5453,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -5029,7 +5462,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5056,7 +5489,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -5091,18 +5533,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -5111,7 +5553,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5128,9 +5570,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5146,9 +5588,18 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_exe_info" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "f7e7bfd02caf5cd98a197cec15c852685c8c42605f91d7be3083541a0b40a7ff" +dependencies = [ + "embed-resource", +] [[package]] name = "windows_i686_gnu" @@ -5164,15 +5615,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -5188,9 +5639,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5206,9 +5657,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5224,9 +5675,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5242,9 +5693,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" @@ -5254,10 +5705,10 @@ dependencies = [ "ahash 0.8.11", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", "block2", "bytemuck", - "calloop", + "calloop 0.12.4", "cfg_aliases 0.2.1", "concurrent-queue", "core-foundation", @@ -5266,8 +5717,8 @@ dependencies = [ "dpi", "js-sys", "libc", - "memmap2 0.9.4", - "ndk", + "memmap2", + "ndk 0.9.0", "objc2", "objc2-app-kit", "objc2-foundation", @@ -5279,7 +5730,7 @@ dependencies = [ "redox_syscall 0.4.1", "rustix", "sctk-adwaita", - "smithay-client-toolkit", + "smithay-client-toolkit 0.18.1", "smol_str", "tracing", "unicode-segmentation", @@ -5287,7 +5738,7 @@ dependencies = [ "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-protocols-plasma", "web-sys", "web-time", @@ -5308,9 +5759,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -5354,7 +5805,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "once_cell", "rustix", "x11rb-protocol", @@ -5368,9 +5819,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg" @@ -5380,12 +5831,12 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5394,7 +5845,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -5409,9 +5860,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" [[package]] name = "yansi" @@ -5427,9 +5878,9 @@ checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" [[package]] name = "zbus" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", @@ -5466,14 +5917,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", "zvariant_utils", ] @@ -5496,22 +5947,23 @@ checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] @@ -5531,9 +5983,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", @@ -5545,24 +5997,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index 44fd206c57498..04af62588db55 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -13,25 +13,26 @@ vulkan-loader, wayland, xorg, + alsa-lib, }: rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "2024.8"; + version = "2024.11"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; rev = "refs/tags/${version}"; - hash = "sha256-OxxXjenZjP+3KrkxyXYxOXRFmrYm3deeiCuGrhpnF2I="; + hash = "sha256-kmdsC0SQoL5gppzBhnF0LfOFj14zeI3C6SdCBiVoKj0="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "dpi-0.1.1" = "sha256-25sOvEBhlIaekTeWvy3UhjPI1xrJbOQvw/OkTg12kQY="; - "glyphon-0.5.0" = "sha256-+z2my51aUeK9txLZKVAyQcWJ6f2YDY1mjxfc8Xsqi8E="; - "iced-0.13.0-dev" = "sha256-eHlauEZibbuqK5mdkNP6gsy1z9qxqEDn/xfFw7W5TcY="; + "glyphon-0.5.0" = "sha256-OGXLqiMjaZ7gR5ANkuCgkfn/I7c/4h9SRE6MZZMW3m4="; + "iced-0.13.0-dev" = "sha256-XQUaI16lGEMGFxqK3UNd8jQfUiBzomxlT/I+yeZncFo="; }; }; @@ -43,6 +44,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ + alsa-lib libxkbcommon openssl vulkan-loader @@ -51,7 +53,7 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreGraphics @@ -61,7 +63,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.QuartzCore darwin.apple_sdk.frameworks.Security ] - ++ lib.optionals stdenv.isLinux [ wayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]; desktopItems = [ (makeDesktopItem { @@ -87,7 +89,7 @@ rustPlatform.buildRustPackage rec { }) ]; - postFixup = lib.optional stdenv.isLinux ( + postFixup = lib.optional stdenv.hostPlatform.isLinux ( let rpathWayland = lib.makeLibraryPath [ wayland @@ -104,7 +106,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -Dm644 assets/linux/icons/hicolor/128x128/apps/org.squidowl.halloy.png \ $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' APP_DIR="$out/Applications/Halloy.app/Contents" mkdir -p "$APP_DIR/MacOS" diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 8caaddf8b465d..80abccbf14601 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.18.0"; + version = "2.19.3"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-XFV+cdqtBJID/s0I3Z6TBfeyzN/e9euUoQVTWy64NYM="; + hash = "sha256-Re0L+2P/Sxzj+fnuZi5uK2Hk72d8EvQGdjhglVbt41M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/handbrake/package.nix b/pkgs/by-name/ha/handbrake/package.nix new file mode 100644 index 0000000000000..264520341ece3 --- /dev/null +++ b/pkgs/by-name/ha/handbrake/package.nix @@ -0,0 +1,369 @@ +# Upstream distributes HandBrake with bundle of according versions of libraries +# and patches to them. This derivation patches HandBrake to use Nix closure +# dependencies. +# +# NOTE: 2019-07-19: This derivation does not currently support the native macOS +# GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would +# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that +# requires invoking the Xcode build system, which is non-trivial for now. + +{ + stdenv, + lib, + fetchFromGitHub, + # For tests + testers, + runCommand, + fetchurl, + # Main build tools + pkg-config, + autoconf, + automake, + libtool, + m4, + xz, + python3, + numactl, + writeText, + # Processing, video codecs, containers + ffmpeg_7-full, + nv-codec-headers, + libogg, + x264, + x265, + libvpx, + libtheora, + dav1d, + zimg, + svt-av1, + # Codecs, audio + libopus, + lame, + libvorbis, + a52dec, + speex, + libsamplerate, + # Text processing + libiconv, + fribidi, + fontconfig, + freetype, + libass, + jansson, + libxml2, + harfbuzz, + libjpeg_turbo, + # Optical media + libdvdread, + libdvdnav, + libdvdcss, + libbluray, + # Darwin-specific + darwin, + # GTK + # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus, + # which in turn depends on systemd. systemd is not supported on Darwin, so + # for now we disable GTK GUI support on Darwin. (It may be possible to remove + # this restriction later.) + useGtk ? !stdenv.hostPlatform.isDarwin, + appstream, + desktop-file-utils, + meson, + ninja, + wrapGAppsHook4, + intltool, + glib, + gtk4, + libappindicator-gtk3, + libnotify, + gst_all_1, + dbus-glib, + udev, + libgudev, + hicolor-icon-theme, + # FDK + useFdk ? false, + fdk_aac, +}: + +let + inherit (darwin.apple_sdk.frameworks) + AudioToolbox + Foundation + VideoToolbox + ; + inherit (darwin) libobjc; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "HandBrake"; + repo = "HandBrake"; + # uses version commit for logic in version.txt + rev = "77f199ab02ff2e3bca4ca653e922e9fef67dec43"; + hash = "sha256-vxvmyo03NcO2Nbjg76JLZqmYw7RiK4FehiB+iE3CgOw="; + }; + + # Handbrake maintains a set of ffmpeg patches. In particular, these + # patches are required for subtitle timing to work correctly. See: + # 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.0.2"; + ffmpeg-hb = + (ffmpeg_7-full.override { + version = ffmpeg-version; + hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs="; + }).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-dvdsubdec-fix-processing-of-partial-packets.patch" + "${src}/contrib/ffmpeg/A06-dvdsubdec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A07-dvdsubdec-use-pts-of-initial-packet.patch" + "${src}/contrib/ffmpeg/A08-dvdsubdec-do-not-discard-zero-sized-rects.patch" + "${src}/contrib/ffmpeg/A09-ccaption_dec-fix-pts-in-real_time-mode.patch" + "${src}/contrib/ffmpeg/A10-matroskaenc-aac-extradata-updated.patch" + "${src}/contrib/ffmpeg/A11-videotoolbox-disable-H.264-10-bit-on-Intel-macOS.patch" + + # patch to fix <https://github.com/HandBrake/HandBrake/issues/5011> + # commented out because it causes ffmpeg's filter-pixdesc-p010le test to fail. + # "${src}/contrib/ffmpeg/A12-libswscale-fix-yuv420p-to-p01xle-color-conversion-bu.patch" + + "${src}/contrib/ffmpeg/A13-qsv-fix-decode-10bit-hdr.patch" + "${src}/contrib/ffmpeg/A14-amfenc-Add-support-for-pict_type-field.patch" + "${src}/contrib/ffmpeg/A15-amfenc-Fixes-the-color-information-in-the-ou.patch" + "${src}/contrib/ffmpeg/A16-amfenc-HDR-metadata.patch" + "${src}/contrib/ffmpeg/A17-av1dec-dovi-rpu.patch" + "${src}/contrib/ffmpeg/A18-avformat-mov-add-support-audio-fallback-track-ref.patch" + ]; + }); + + x265-hb = x265.overrideAttrs (old: { + # 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-threads-priority.patch + patch -p1 < ${src}/contrib/x265/A02-threads-pool-adjustments.patch + patch -p1 < ${src}/contrib/x265/A03-sei-length-crash-fix.patch + patch -p1 < ${src}/contrib/x265/A04-ambient-viewing-enviroment-sei.patch + # patch -p1 < ${src}/contrib/x265/A05-memory-leaks.patch + # patch -p1 < ${src}/contrib/x265/A06-crosscompile-fix.patch + popd + ''; + }); + + versionFile = writeText "version.txt" '' + URL=${src.meta.homepage}.git + HASH=${src.rev} + SHORTHASH=${lib.substring 0 9 src.rev} + TAG=${version} + TAG_HASH=${src.rev} + REV=0 + BRANCH= + REMOTE=${src.meta.homepage}.git + DATE=1970-01-01 00:00:01 +0000 + ''; + + inherit (lib) + optional + optionals + optionalString + versions + ; + + self = stdenv.mkDerivation rec { + pname = "handbrake"; + inherit version src; + + postPatch = + '' + install -Dm444 ${versionFile} ${versionFile.name} + + patchShebangs scripts + patchShebangs gtk/data/ + + substituteInPlace libhb/hb.c \ + --replace-fail 'return hb_version;' 'return "${version}";' + + # Force using nixpkgs dependencies + sed -i '/MODULES += contrib/d' make/include/main.defs + sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ + -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ + -i make/configure.py + '' + + optionalString stdenv.hostPlatform.isDarwin '' + # Prevent the configure script from failing if xcodebuild isn't available, + # which it isn't in the Nix context. (The actual build goes fine without + # xcodebuild.) + sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py + '' + + optionalString useGtk '' + substituteInPlace gtk/module.rules \ + --replace-fail '$(MESON.exe)' 'meson' \ + --replace-fail '$(NINJA.exe)' 'ninja' \ + # Force using nixpkgs dependencies + substituteInPlace gtk/meson.build \ + --replace-fail \ + "hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')" \ + "hb_incdirs = include_directories(hb_dir / 'libhb')" + substituteInPlace gtk/ghb.spec \ + --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache" + substituteInPlace gtk/data/post_install.py \ + --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + + nativeBuildInputs = + [ + autoconf + automake + libtool + m4 + pkg-config + python3 + ] + ++ optionals useGtk [ + appstream + desktop-file-utils + intltool + meson + ninja + wrapGAppsHook4 + ]; + + buildInputs = + [ + a52dec + dav1d + ffmpeg-hb + fontconfig + freetype + fribidi + harfbuzz + jansson + lame + libass + libbluray + libdvdcss + libdvdnav + libdvdread + libiconv + libjpeg_turbo + libogg + libopus + libsamplerate + libtheora + libvorbis + libvpx + libxml2 + speex + svt-av1 + x264 + x265-hb + xz + zimg + ] + ++ optional (!stdenv.hostPlatform.isDarwin) numactl + ++ optionals useGtk [ + dbus-glib + glib + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer + gtk4 + hicolor-icon-theme + libappindicator-gtk3 + libgudev + libnotify + udev + ] + ++ optional useFdk fdk_aac + ++ optionals stdenv.hostPlatform.isDarwin [ + AudioToolbox + Foundation + libobjc + VideoToolbox + ] + # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, + # look at ./make/configure.py search "enable_nvenc" + ++ optional stdenv.hostPlatform.isLinux nv-codec-headers; + + configureFlags = + [ + "--disable-df-fetch" + "--disable-df-verify" + ] + ++ optional (!useGtk) "--disable-gtk" + ++ optional useFdk "--enable-fdk-aac" + ++ optional stdenv.hostPlatform.isDarwin "--disable-xcode" + ++ optional stdenv.hostPlatform.isx86 "--harden"; + + # NOTE: 2018-12-27: Check NixOS HandBrake test if changing + NIX_LDFLAGS = [ "-lx265" ]; + + # meson/ninja are used only for the subprojects, not the toplevel + dontUseMesonConfigure = true; + dontUseMesonInstall = true; + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + + makeFlags = [ "--directory=build" ]; + + passthru = { + # for convenience + inherit ffmpeg-hb x265-hb; + + tests.basic-conversion = + let + # Big Buck Bunny example, licensed under CC Attribution 3.0. + testMkv = fetchurl { + url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true"; + hash = "sha256-CZajCf8glZELnTDVJTsETWNxVCl9330L2n863t9a3cE="; + }; + in + runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } '' + mkdir -p $out + cd $out + HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160 + test -e test.mp4 + HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160 + test -e test.mkv + ''; + + tests.version = testers.testVersion { + package = self; + command = "HandBrakeCLI --version"; + }; + }; + + meta = with lib; { + homepage = "https://handbrake.fr/"; + description = "Tool for converting video files and ripping DVDs"; + longDescription = '' + Tool for converting and remuxing video files + into selection of modern and widely supported codecs + and containers. Very versatile and customizable. + Package provides: + CLI - `HandbrakeCLI` + GTK GUI - `ghb` + ''; + license = licenses.gpl2Only; + maintainers = with maintainers; [ + Anton-Latukha + wmertens + ]; + mainProgram = "HandBrakeCLI"; + platforms = with platforms; unix; + broken = stdenv.hostPlatform.isDarwin; # https://github.com/NixOS/nixpkgs/pull/297984#issuecomment-2016503434 + }; + }; +in +self diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index c0a289250704f..9d816c17f61ca 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -8,14 +8,14 @@ }: python3.pkgs.buildPythonApplication rec { pname = "handheld-daemon"; - version = "3.3.8"; + version = "3.3.15"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; rev = "refs/tags/v${version}"; - hash = "sha256-15vG+e509CEagZ+G9FcfRmsdD8Jex8xUfdvEKlY+FaI="; + hash = "sha256-NniHOxe77hBHn81pVtlaSeIK+Hp+Lw3xBHolO6Acbho="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/ha/hap-py/package.nix b/pkgs/by-name/ha/hap-py/package.nix index 7082dc6e8ae5c..9f06c822ae96f 100644 --- a/pkgs/by-name/ha/hap-py/package.nix +++ b/pkgs/by-name/ha/hap-py/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { owner = "Illumina"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K8XXhioMGMHw56MKvp0Eo8S6R36JczBzGRaBz035zRQ="; + hash = "sha256-K8XXhioMGMHw56MKvp0Eo8S6R36JczBzGRaBz035zRQ="; }; # For illumina script BOOST_ROOT = "${boost.out}"; diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix new file mode 100644 index 0000000000000..eb5c80011081b --- /dev/null +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -0,0 +1,76 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + harlequin, + testers, + nix-update-script, + versionCheckHook, + withPostgresAdapter ? true, + withBigQueryAdapter ? true, +}: +python3Packages.buildPythonApplication rec { + pname = "harlequin"; + version = "1.24.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tconbeer"; + repo = "harlequin"; + rev = "refs/tags/v${version}"; + hash = "sha256-3Rb47zkWsC6RJhk1btQc/kwxpFFWVnxY2PJooHB7IzQ="; + }; + + build-system = with python3Packages; [ + poetry-core + ]; + + dependencies = + with python3Packages; + [ + textual + textual-fastdatatable + textual-textarea + click + rich-click + duckdb + sqlfmt + platformdirs + importlib-metadata + tomlkit + questionary + numpy + packaging + ] + ++ lib.optionals withPostgresAdapter [ harlequin-postgres ] + ++ lib.optionals withBigQueryAdapter [ harlequin-bigquery ]; + + pythonRelaxDeps = [ + "textual" + ]; + + pythonImportsCheck = [ + "harlequin" + "harlequin_duckdb" + "harlequin_sqlite" + "harlequin_vscode" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + nativeCheckInputs = [ + versionCheckHook + ]; + + meta = { + description = "The SQL IDE for Your Terminal"; + homepage = "https://harlequin.sh"; + mainProgram = "harlequin"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + platforms = lib.platforms.unix; + changelog = "https://github.com/tconbeer/harlequin/releases/tag/v${version}"; + }; +} diff --git a/pkgs/by-name/ha/harmonia/package.nix b/pkgs/by-name/ha/harmonia/package.nix index bf29a431d4081..61cbc8c842c45 100644 --- a/pkgs/by-name/ha/harmonia/package.nix +++ b/pkgs/by-name/ha/harmonia/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "harmonia"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "harmonia"; rev = "refs/tags/harmonia-v${version}"; - hash = "sha256-K4pll1YUqCkiqUxyWMgPKzNEJ2AMf3C/5YVBOn0SFtw="; + hash = "sha256-72nDVSvUfZsLa2HbyricOpA0Eb8gxs/VST25b6DNBpM="; }; - cargoHash = "sha256-1ITnTlLVgSC0gsXtELHOPqM4jPZd0TeVgM5GYkqaNVA="; + cargoHash = "sha256-gW/OljEngDQddIovtgwghu7uHLFVZHvWIijPgbOOkDc="; doCheck = false; diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index e09609e1cf149..a18ab300af247 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.9.5"; + version = "0.11.0"; src = fetchFromGitHub { owner = "elijah-potter"; repo = "harper"; rev = "v${version}"; - hash = "sha256-Tk2YOY9myAGHrNTpgwyqo+P6gGQ+2cpKAJbsA3ZfhUA="; + hash = "sha256-83Fg1oywYuvyc5aFeujH/g8Czi8r0wBUr1Bj6vwxNec="; }; - cargoHash = "sha256-9ITfjrtc8LPQ3u3G59xESzqky/PCiea5mJiTIiEAmSA="; + cargoHash = "sha256-Bt2KZ+m7VJXw4FYWt+ioo1XjZHNzbg/8fo8xrfEd6lI="; meta = { description = "Grammar Checker for Developers"; diff --git a/pkgs/by-name/ha/harvid/package.nix b/pkgs/by-name/ha/harvid/package.nix index cdb6e4115b870..efbe45d667c04 100644 --- a/pkgs/by-name/ha/harvid/package.nix +++ b/pkgs/by-name/ha/harvid/package.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "x42"; repo = "harvid"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-p0W+rKHH/iuGOcRjl6b4s6jQYkm7bqWCz849SDI/7fQ="; + hash = "sha256-p0W+rKHH/iuGOcRjl6b4s6jQYkm7bqWCz849SDI/7fQ="; }; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ which unixtools.xxd ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { libpng ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace libharvid/Makefile \ --replace-fail /usr/bin/libtool ${cctools}/bin/libtool ''; diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index 5ae22d698f219..ef827725267e9 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec { setuptools ] ++ [ cargo ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.ps ]; @@ -100,7 +100,7 @@ python3Packages.buildPythonApplication rec { # Could not read ELF interpreter from any of the following paths: /bin/sh, /usr/bin/env, /bin/dash, /bin/ls "test_new_selected_python" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/NixOS/nixpkgs/issues/209358 "test_scripts_no_environment" @@ -114,9 +114,9 @@ python3Packages.buildPythonApplication rec { "test_macos_archflags" "test_macos_max_compat" ] - ++ lib.optionals stdenv.isAarch64 [ "test_resolve" ]; + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_resolve" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # AssertionError: assert [call('test h...2p32/bin/sh')] == [call('test h..., shell=True)] # At index 0 diff: # call('test hatch-test.py3.10', shell=True, executable='/nix/store/b34ianga4diikh0kymkpqwmvba0mmzf7-bash-5.2p32/bin/sh') diff --git a/pkgs/by-name/ha/haunt/package.nix b/pkgs/by-name/ha/haunt/package.nix index a4434ba1f4800..6f39fed07bb94 100644 --- a/pkgs/by-name/ha/haunt/package.nix +++ b/pkgs/by-name/ha/haunt/package.nix @@ -1,41 +1,26 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, autoreconfHook -, callPackage -, guile -, guile-commonmark -, guile-reader -, makeWrapper -, pkg-config +{ + lib, + stdenv, + fetchurl, + fetchpatch, + autoreconfHook, + callPackage, + guile, + guile-commonmark, + guile-reader, + makeWrapper, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "haunt"; - version = "0.2.6"; + version = "0.3.0"; src = fetchurl { url = "https://files.dthompson.us/haunt/haunt-${finalAttrs.version}.tar.gz"; - hash = "sha256-vPKLQ9hDJdimEAXwIBGgRRlefM8/77xFQoI+0J/lkNs="; + hash = "sha256-mLq+0GvlSgZsPryUQQqR63zEg2fpTVKBMdO6JxSZmSs="; }; - # Symbol not found: inotify_init - patches = [ - (fetchpatch { - url = "https://git.dthompson.us/haunt.git/patch/?id=ab0b722b0719e3370a21359e4d511af9c4f14e60"; - hash = "sha256-TPNJKGlbDkV9RpdN274qMLoN3HlwfH/yHpxlpqOPw58="; - }) - (fetchpatch { - url = "https://git.dthompson.us/haunt.git/patch/?id=7d0b71f6a3f0e714da5a5c43e52408e27f44c383"; - hash = "sha256-CW/h8CqsALKDuKRoN1bd/WEtFTvFj0VxtgmpatyrLm8="; - }) - (fetchpatch { - url = "https://git.dthompson.us/haunt.git/patch/?id=1a91f3d0568fc095d8b0875c6553ef15b76efa4c"; - hash = "sha256-+3wUlTuzbyGibAsCiYWKvzPqUrFs7VwdhnADjnPuWIY="; - }) - ]; - nativeBuildInputs = [ autoreconfHook makeWrapper diff --git a/pkgs/by-name/ha/havoc/package.nix b/pkgs/by-name/ha/havoc/package.nix index b37550240386e..81b8177c4ec89 100644 --- a/pkgs/by-name/ha/havoc/package.nix +++ b/pkgs/by-name/ha/havoc/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "havoc"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ii8"; repo = "havoc"; rev = finalAttrs.version; - hash = "sha256-jvGm2gFdMS61otETF7gOEpYn6IuLfqI95IpEVfIv+C4="; + hash = "sha256-YCZdAlIDptVLMUko40gfp2BCAbhGNsYyVTDB14VTNSE="; }; depsBuildBuild = [ @@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "havoc"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; - broken = stdenv.isDarwin; # fatal error: 'sys/epoll.h' file not found + broken = stdenv.hostPlatform.isDarwin; # fatal error: 'sys/epoll.h' file not found }; }) diff --git a/pkgs/development/libraries/hax11/default.nix b/pkgs/by-name/ha/hax11/package.nix similarity index 100% rename from pkgs/development/libraries/hax11/default.nix rename to pkgs/by-name/ha/hax11/package.nix diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix index ed7487766bbab..4c30a16cd468f 100644 --- a/pkgs/by-name/ha/hayabusa/package.nix +++ b/pkgs/by-name/ha/hayabusa/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { description = "Swift rust fetch program"; homepage = "https://github.com/notarin/hayabusa"; license = lib.licenses.cc-by-nc-nd-40; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "hayabusa"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ha/haylxon/package.nix b/pkgs/by-name/ha/haylxon/package.nix index c4a781d7cde63..5f8f71f4114f3 100644 --- a/pkgs/by-name/ha/haylxon/package.nix +++ b/pkgs/by-name/ha/haylxon/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-6vVsm4gdcFCxKvvmOi3wlHkFoZp8CG+u50NfxIZqCl8="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = { description = "Save screenshots of urls and webpages from terminal"; diff --git a/pkgs/by-name/hd/hdr10plus_tool/Cargo.lock b/pkgs/by-name/hd/hdr10plus_tool/Cargo.lock new file mode 100644 index 0000000000000..eaf881d7fc1eb --- /dev/null +++ b/pkgs/by-name/hd/hdr10plus_tool/Cargo.lock @@ -0,0 +1,1479 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" + +[[package]] +name = "assert_cmd" +version = "2.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d" +dependencies = [ + "anstyle", + "bstr", + "doc-comment", + "libc", + "predicates", + "predicates-core", + "predicates-tree", + "wait-timeout", +] + +[[package]] +name = "assert_fs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efdb1fdb47602827a342857666feb372712cbc64b414172bd6b167a02927674" +dependencies = [ + "anstyle", + "doc-comment", + "globwalk", + "predicates", + "predicates-core", + "predicates-tree", + "tempfile", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bitstream-io" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" + +[[package]] +name = "bitvec_helpers" +version = "3.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9a6aff977a34114f146bd3379c9d170a8eafcffcdeecbb7cc3bd2470a39709a" +dependencies = [ + "bitstream-io", +] + +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cc" +version = "1.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "shlex", +] + +[[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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", + "terminal_size", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[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 = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "core-text" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" +dependencies = [ + "core-foundation", + "core-graphics", + "foreign-types", + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dwrote" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c" +dependencies = [ + "lazy_static", + "libc", + "winapi", + "wio", +] + +[[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 = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "flate2" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +dependencies = [ + "crc32fast", + "miniz_oxide 0.8.0", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float-ord" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" + +[[package]] +name = "font-kit" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520" +dependencies = [ + "bitflags 2.6.0", + "byteorder", + "core-foundation", + "core-graphics", + "core-text", + "dirs", + "dwrote", + "float-ord", + "freetype-sys", + "lazy_static", + "libc", + "log", + "pathfinder_geometry", + "pathfinder_simd", + "walkdir", + "winapi", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "freetype-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "globset" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "globwalk" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" +dependencies = [ + "bitflags 2.6.0", + "ignore", + "walkdir", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "hdr10plus" +version = "2.1.3" +dependencies = [ + "anyhow", + "bitvec_helpers", + "hevc_parser", + "libc", + "serde", + "serde_json", +] + +[[package]] +name = "hdr10plus_tool" +version = "1.6.1" +dependencies = [ + "anyhow", + "assert_cmd", + "assert_fs", + "bitvec_helpers", + "clap", + "hdr10plus", + "hevc_parser", + "indicatif", + "plotters", + "predicates", + "serde_json", + "thiserror", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hevc_parser" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72930110fcf33e323721aefb8effbe172dc02a669a32657b8bbf9da948b87cf5" +dependencies = [ + "anyhow", + "bitvec_helpers", + "nom", + "regex", +] + +[[package]] +name = "ignore" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "jpeg-decoder", + "num-traits", + "png", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +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 = "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[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 = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "once_cell" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "owned_ttf_parser" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" +dependencies = [ + "ttf-parser 0.24.1", +] + +[[package]] +name = "pathfinder_geometry" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" +dependencies = [ + "log", + "pathfinder_simd", +] + +[[package]] +name = "pathfinder_simd" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cf07ef4804cfa9aea3b04a7bbdd5a40031dbb6b4f2cbaf2b011666c80c5b4f2" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plotters" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "ab_glyph", + "font-kit", + "lazy_static", + "num-traits", + "once_cell", + "pathfinder_geometry", + "plotters-backend", + "plotters-bitmap", + "ttf-parser 0.20.0", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-bitmap" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ce181e3f6bf82d6c1dc569103ca7b1bd964c60ba03d7e6cdfbb3e3eb7f7405" +dependencies = [ + "image", + "plotters-backend", +] + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.4", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "difflib", + "float-cmp", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" + +[[package]] +name = "predicates-tree" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "indexmap", + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix", + "windows-sys 0.48.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.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "ttf-parser" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + +[[package]] +name = "yeslogic-fontconfig-sys" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503a066b4c037c440169d995b869046827dbc71263f6e8f3be6d77d4f3229dbd" +dependencies = [ + "dlib", + "once_cell", + "pkg-config", +] diff --git a/pkgs/by-name/hd/hdr10plus_tool/package.nix b/pkgs/by-name/hd/hdr10plus_tool/package.nix new file mode 100644 index 0000000000000..d7177166f946f --- /dev/null +++ b/pkgs/by-name/hd/hdr10plus_tool/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + fontconfig, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "hdr10plus_tool"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "quietvoid"; + repo = "hdr10plus_tool"; + rev = "refs/tags/${version}"; + hash = "sha256-eP77LHADP9oenMACctPKU6xPzg4atC0dPOqyrFse/1s="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ fontconfig ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + doCheck = false; + + meta = with lib; { + description = "CLI utility to work with HDR10+ in HEVC files."; + homepage = "https://github.com/quietvoid/hdr10plus_tool"; + changelog = "https://github.com/quietvoid/hdr10plus_tool/releases"; + license = licenses.mit; + maintainers = with maintainers; [ johnrtitor ]; + mainProgram = "hdr10plus_tool"; + }; +} diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix old mode 100755 new mode 100644 index 23f9070a31256..74f9f0e03e57d --- a/pkgs/by-name/hd/hdrop/package.nix +++ b/pkgs/by-name/hd/hdrop/package.nix @@ -1,26 +1,27 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, makeWrapper -, scdoc -, coreutils -, util-linux -, jq -, libnotify -, withHyprland ? true -, hyprland -, gawk +{ + coreutils, + fetchFromGitHub, + gawk, + hyprland, + jq, + lib, + libnotify, + makeWrapper, + scdoc, + stdenvNoCC, + util-linux, + withHyprland ? true, }: stdenvNoCC.mkDerivation rec { pname = "hdrop"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Schweber"; repo = "hdrop"; rev = "v${version}"; - hash = "sha256-iginpMlgANSPWgFxNC2TYMjf2NKSSzzrjIN8lIsAvX8="; + hash = "sha256-0GkZBqpORJqhhC19bsJHvkbHKOno1ZyBBA7nhzfqLZw="; }; nativeBuildInputs = [ @@ -32,14 +33,18 @@ stdenvNoCC.mkDerivation rec { postInstall = '' wrapProgram $out/bin/hdrop --prefix PATH ':' \ - "${lib.makeBinPath ([ - coreutils - util-linux - jq - libnotify - gawk - ] - ++ lib.optional withHyprland hyprland)}" + "${ + lib.makeBinPath ( + [ + coreutils + util-linux + jq + libnotify + gawk + ] + ++ lib.optional withHyprland hyprland + ) + }" ''; meta = with lib; { diff --git a/pkgs/by-name/he/headphones-toolbox/package.nix b/pkgs/by-name/he/headphones-toolbox/package.nix index 4b03fb273111d..2b71ad126eff0 100644 --- a/pkgs/by-name/he/headphones-toolbox/package.nix +++ b/pkgs/by-name/he/headphones-toolbox/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "UI for configuring Ploopy Headphones"; homepage = "https://github.com/ploopyco/headphones-toolbox/"; - maintainers = with maintainers; [ knarkzel nyanbinary ]; + maintainers = with maintainers; [ knarkzel nyabinary ]; license = licenses.gpl3Only; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/he/heliocron/package.nix b/pkgs/by-name/he/heliocron/package.nix new file mode 100644 index 0000000000000..00ca02f3c5b3a --- /dev/null +++ b/pkgs/by-name/he/heliocron/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "heliocron"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "mfreeborn"; + repo = "heliocron"; + rev = "v${version}"; + hash = "sha256-5rzFz29Bpy2GR6bEt2DdCq9RtpdcY3SK/KnZrBrHUvk="; + }; + + cargoHash = "sha256-RjYE2TBvHnBgiwJi/Ys+wAmJoMHJuimcD07FOqwkcis="; + + meta = { + description = "Execute tasks relative to sunset, sunrise and other solar events"; + longDescription = "A simple command line application that integrates with `cron` to execute tasks relative to sunset, sunrise and other such solar events."; + homepage = "https://github.com/mfreeborn/heliocron"; + changelog = "https://github.com/mfreeborn/heliocron/releases/tag/v${version}"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ TheColorman ]; + mainProgram = "heliocron"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/he/hello-go/package.nix b/pkgs/by-name/he/hello-go/package.nix new file mode 100644 index 0000000000000..e68c0b8c98fe4 --- /dev/null +++ b/pkgs/by-name/he/hello-go/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, +}: + +buildGoModule { + name = "hello-go"; + + src = ./src; + + vendorHash = null; + + CGO_ENABLED = 0; + + # go installs binary into $out/bin/$GOOS_$GOARCH/hello-go in cross compilation + postInstall = '' + [[ -f "$out/bin/hello-go" ]] || ln -s ./''${GOOS}_''${GOARCH}/hello-go $out/bin/hello-go + ''; + + meta = { + description = "Simple program printing hello world in Go"; + longDescription = '' + hello-go is a simple program printing "Hello, world!" written in Go, + aiming at testing programs that involves analyzing executables or + emulating foreign architectures, without pulling in a heavy cross + toolchain. + + Specify target platform by setting GOOS and GOARCH: + + ```nix + hello-go.overrideAttrs { + GOOS = "linux"; + GOARCH = "arm64"; + } + ``` + + See https://pkg.go.dev/internal/platform#pkg-variables for a list + of available platforms. + ''; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + mainProgram = "hello-go"; + }; +} diff --git a/pkgs/by-name/he/hello-go/src/go.mod b/pkgs/by-name/he/hello-go/src/go.mod new file mode 100644 index 0000000000000..4dc8dec9f4d0f --- /dev/null +++ b/pkgs/by-name/he/hello-go/src/go.mod @@ -0,0 +1,3 @@ +module hello-go + +go 1.22.7 diff --git a/pkgs/by-name/he/hello-go/src/main.go b/pkgs/by-name/he/hello-go/src/main.go new file mode 100644 index 0000000000000..ef25884d828c2 --- /dev/null +++ b/pkgs/by-name/he/hello-go/src/main.go @@ -0,0 +1,7 @@ +package main + +import "fmt" + +func main() { + fmt.Println("Hello, world!") +} diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix index 487bc033a23fc..659899bd5f9b5 100644 --- a/pkgs/by-name/he/hello/package.nix +++ b/pkgs/by-name/he/hello/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-jZkUKv2SV28wsM18tCqNxoCZmLxdYH2Idh9RLibH2yA="; + hash = "sha256-jZkUKv2SV28wsM18tCqNxoCZmLxdYH2Idh9RLibH2yA="; }; doCheck = true; @@ -31,12 +31,6 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = hello; }; - - invariant-under-noXlibs = - testers.testEqualDerivation - "hello must not be rebuilt when environment.noXlibs is set." - hello - (nixos { environment.noXlibs = true; }).pkgs.hello; }; passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index 4511dbe6baf52..8614e8b152bfd 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.35.4"; + version = "1.40.0"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-JFIC5a0W8pmiPxgkymE8d+iULM80U85xGOF0M2vu/PI="; + hash = "sha256-EnGn3N8dJ7bx60eY8u1LxgQaLkU/RR+ANEG817XfaS0="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/he/hercules/package.nix b/pkgs/by-name/he/hercules/package.nix index 080d3a849beb4..c5635d960fbb0 100644 --- a/pkgs/by-name/he/hercules/package.nix +++ b/pkgs/by-name/he/hercules/package.nix @@ -6,7 +6,7 @@ , cmake , zlib , bzip2 -, enableRexx ? stdenv.isLinux, regina +, enableRexx ? stdenv.hostPlatform.isLinux, regina }: let herculesCpu = @@ -105,13 +105,13 @@ let in stdenv.mkDerivation rec { pname = "hercules"; - version = "4.6"; + version = "4.7"; src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "hyperion"; rev = "Release_${version}"; - hash = "sha256-ZhMTun6tmTsmIiFPTRFudwRXzWydrih61RsLyv0p24U="; + hash = "sha256-5Kvs2OWQrlsRZpmx7vet8GCky5xAISBNAqn+NHgicOM"; }; postPatch = '' diff --git a/pkgs/by-name/he/hexbinhex/package.nix b/pkgs/by-name/he/hexbinhex/package.nix index 8386ee9128ddf..7c0a417a84fc9 100644 --- a/pkgs/by-name/he/hexbinhex/package.nix +++ b/pkgs/by-name/he/hexbinhex/package.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/dj-on-github/hexbinhex"; + changelog = "https://github.com/dj-on-github/hexbinhex/releases/tag/${src.rev}"; description = '' Six utility programs to convert between hex, binary, ascii-binary and the oddball NIST format for 90B testing. diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix index 52440b774bf10..eb17fd5687665 100644 --- a/pkgs/by-name/he/hextazy/package.nix +++ b/pkgs/by-name/he/hextazy/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hextazy"; - version = "0.4"; + version = "0.7"; src = fetchFromGitHub { owner = "0xfalafel"; repo = "hextazy"; rev = "${version}"; - hash = "sha256-5ZT6oXG3dWJ8vPX0oieWQsYJQYCTwtlb1B8kmGlLv0k="; + hash = "sha256-j8KY8OTYG+Hl86OppbMyAFBSA89TO7hc8mcNgTGTlgM="; }; - cargoHash = "sha256-n1HvkWNbHU8UUlqsCnuKESKQznk1WTe6eQiUJjVVXYE="; + cargoHash = "sha256-Ue7ukYkpNkoD9IRy/EWMsB5kMzwWny8onVNeN+3WWgQ="; meta = { description = "TUI hexeditor in Rust with colored bytes"; diff --git a/pkgs/by-name/he/hexxy/package.nix b/pkgs/by-name/he/hexxy/package.nix index ceed202985eda..3864da545207f 100644 --- a/pkgs/by-name/he/hexxy/package.nix +++ b/pkgs/by-name/he/hexxy/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "hexxy"; - version = "0-unstable-2024-02-23"; + version = "0-unstable-2024-09-29"; src = fetchFromGitHub { owner = "sweetbbak"; repo = "hexxy"; # upstream does not publish releases, i.e., there are no tags - rev = "30e0aa5549bbafeb8204fe34b0d37019f9acc975"; - hash = "sha256-KBgxZD95UT7i/eYeKLm0LVLliKgK/KiJYXVY9zzwbvk="; + rev = "36174e436f9d57421b9e9515db32ca1425c382bd"; + hash = "sha256-5r8yaKlRkIcZXubHBMhdGV0u52rs2WnEaWatm+D56Fs="; }; vendorHash = "sha256-qkBpSVLWZPRgS9bqOVUWHpyj8z/nheQJON3vJOwPUj4="; diff --git a/pkgs/by-name/hi/hidviz/package.nix b/pkgs/by-name/hi/hidviz/package.nix index 6e92eed1c65e9..14c40f30054d7 100644 --- a/pkgs/by-name/hi/hidviz/package.nix +++ b/pkgs/by-name/hi/hidviz/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "hidviz"; repo = "hidviz"; rev = "v${version}"; - sha256 = "sha256-9crHFYVNNxJjwJojwqB8qdAGyr1Ieux9qC3m3rpIJw0="; + hash = "sha256-9crHFYVNNxJjwJojwqB8qdAGyr1Ieux9qC3m3rpIJw0="; }; preConfigure = '' diff --git a/pkgs/by-name/hi/hieroglyphic/package.nix b/pkgs/by-name/hi/hieroglyphic/package.nix index 4cb0ebf507e5f..71f245d996f43 100644 --- a/pkgs/by-name/hi/hieroglyphic/package.nix +++ b/pkgs/by-name/hi/hieroglyphic/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { gtk4 libadwaita ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Foundation ]; diff --git a/pkgs/by-name/hi/highs/package.nix b/pkgs/by-name/hi/highs/package.nix index 2fc2441314156..75afbbdfa41c8 100644 --- a/pkgs/by-name/hi/highs/package.nix +++ b/pkgs/by-name/hi/highs/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ERGO-Code"; repo = "HiGHS"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-q18TfKbZyTZzzPZ8z3U57Yt8q2PSvbkg3qqqiPMgy5Q="; + hash = "sha256-q18TfKbZyTZzzPZ8z3U57Yt8q2PSvbkg3qqqiPMgy5Q="; }; strictDeps = true; diff --git a/pkgs/by-name/hi/himalaya/package.nix b/pkgs/by-name/hi/himalaya/package.nix index 5a271432a0ccc..027254e2423a2 100644 --- a/pkgs/by-name/hi/himalaya/package.nix +++ b/pkgs/by-name/hi/himalaya/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8="; - NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ + NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-F${darwin.apple_sdk.frameworks.AppKit}/Library/Frameworks" "-framework" "AppKit" @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional (installManPages || installShellCompletions) installShellFiles; buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa Security ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa Security ]) ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme; diff --git a/pkgs/by-name/hi/hitori/package.nix b/pkgs/by-name/hi/hitori/package.nix index b0fc149d42dab..ad321c355dadd 100644 --- a/pkgs/by-name/hi/hitori/package.nix +++ b/pkgs/by-name/hi/hitori/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/hitori/${lib.versions.major finalAttrs.version}/hitori-${finalAttrs.version}.tar.xz"; - sha256 = "QicL1PlSXRgNMVG9ckUzXcXPJIqYTgL2j/kw2nmeWDs="; + hash = "sha256-QicL1PlSXRgNMVG9ckUzXcXPJIqYTgL2j/kw2nmeWDs="; }; nativeBuildInputs = [ @@ -55,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/hitori"; + changelog = "https://gitlab.gnome.org/GNOME/hitori/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "GTK application to generate and let you play games of Hitori"; mainProgram = "hitori"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 96c4aef56d392..34892c8a386df 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -5,7 +5,9 @@ , findutils , gettext , gnused +, inetutils , installShellFiles +, jq , less , ncurses , nixos-option @@ -16,14 +18,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-08-18"; + version = "0-unstable-2024-09-26"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "2598861031b78aadb4da7269df7ca9ddfc3e1671"; - hash = "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY="; + rev = "ffe2d07e771580a005e675108212597e5b367d2d"; + hash = "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs="; }; nativeBuildInputs = [ @@ -40,9 +42,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -D -m755 home-manager/home-manager $out/bin/home-manager install -D -m755 lib/bash/home-manager.sh $out/share/bash/home-manager.sh - installShellCompletion --bash --name home-manager.bash home-manager/completion.bash - installShellCompletion --fish --name home-manager.fish home-manager/completion.fish - installShellCompletion --zsh --name _home-manager home-manager/completion.zsh + installShellCompletion --cmd home-manager \ + --bash home-manager/completion.bash \ + --fish home-manager/completion.fish \ + --zsh home-manager/completion.zsh for pofile in home-manager/po/*.po; do lang="''${pofile##*/}" @@ -63,15 +66,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { findutils gettext gnused + jq less ncurses nixos-option - unixtools.hostname + inetutils # for `hostname` ] }" \ - --subst-var-by HOME_MANAGER_LIB '${placeholder "out"}/share/bash/home-manager.sh' \ + --subst-var-by HOME_MANAGER_LIB "$out/share/bash/home-manager.sh" \ --subst-var-by HOME_MANAGER_PATH "${finalAttrs.src}" \ - --subst-var-by OUT '${placeholder "out"}' + --subst-var-by OUT "$out" ''; passthru.updateScript = unstableGitUpdater { @@ -89,7 +93,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; mainProgram = "home-manager"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres bryango ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ho/homeassistant-satellite/package.nix b/pkgs/by-name/ho/homeassistant-satellite/package.nix index cf69238d8af5c..40a489aa68de0 100644 --- a/pkgs/by-name/ho/homeassistant-satellite/package.nix +++ b/pkgs/by-name/ho/homeassistant-satellite/package.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { aiohttp ]; - passthru.optional-dependencies = { + optional-dependencies = { pulseaudio = with python3.pkgs; [ pasimple pulsectl diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix new file mode 100644 index 0000000000000..ff5a4f5e86fb6 --- /dev/null +++ b/pkgs/by-name/ho/homebank/package.nix @@ -0,0 +1,24 @@ +{ fetchurl, lib, stdenv, gtk3, pkg-config, libofx, intltool, wrapGAppsHook3 +, libsoup_3, adwaita-icon-theme }: + +stdenv.mkDerivation rec { + pname = "homebank"; + version = "5.8.3"; + src = fetchurl { + url = + "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; + hash = "sha256-5Ag9UjAdxT5R6cYV6VT7ktaVHqd0kzQoLCpfS5q5xMI="; + }; + + nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; + buildInputs = [ gtk3 libofx libsoup_3 adwaita-icon-theme ]; + + meta = with lib; { + description = "Free, easy, personal accounting for everyone"; + mainProgram = "homebank"; + homepage = "https://www.gethomebank.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pSub frlan ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index 74a7309df9d15..2745805fbc6ed 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -74,7 +74,7 @@ buildGoModule { meta = { mainProgram = "api"; - homepage = "https://hay-kot.github.io/homebox/"; + homepage = "https://homebox.software/"; description = "Inventory and organization system built for the Home User"; maintainers = with lib.maintainers; [ patrickdag ]; license = lib.licenses.agpl3Only; diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index a798f05c7ef46..1484afa5a55ea 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -1,30 +1,34 @@ -{ lib -, stdenv -, fetchurl -, appimageTools -, undmg +{ + lib, + stdenv, + fetchurl, + appimageTools, + undmg, }: let pname = "hoppscotch"; - version = "24.3.3-1"; + version = "24.8.1-0"; - src = fetchurl { - aarch64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-litOYRsUOx6VpkA1LPx7aGGagqIVL9fgNsYoP5n/2mo="; - }; - x86_64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-UG89Fv9J8SnzPVoIO16LOprxPmZuu/zyox1b+jn+eNw="; - }; - x86_64-linux = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-110l1DTyvH2M0ex1r35Q+55NiJ8nYum1KdWQXDvAdxo="; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + src = + fetchurl + { + aarch64-darwin = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; + hash = "sha256-Tc6lQbMZHX4Wl0R3fGClRr27fFTrYTxMtAkSPCw8mrw="; + }; + x86_64-darwin = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; + hash = "sha256-c3UHntrLRoXfmz8LL3Xu8mjBtyf952/tYMFqbTyECR0="; + }; + x86_64-linux = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; + hash = "sha256-Aegc4kiLPtY+hlQtfYR3uztqs8Gj9fbUcAZ1XB8i1Pw="; + }; + } + .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - meta = with lib; { + meta = { description = "Open source API development ecosystem"; longDescription = '' Hoppscotch is a lightweight, web-based API development suite. It was built @@ -34,41 +38,56 @@ let ''; homepage = "https://hoppscotch.com"; downloadPage = "https://hoppscotch.com/downloads"; - changelog = "https://hoppscotch.com/changelog"; - license = licenses.mit; - maintainers = with maintainers; [ DataHearth ]; + changelog = "https://github.com/hoppscotch/hoppscotch/releases/tag/20${lib.head (lib.splitString "-" version)}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ DataHearth ]; mainProgram = "hoppscotch"; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; in -if stdenv.isDarwin then stdenv.mkDerivation -{ - inherit pname version src meta; +if stdenv.hostPlatform.isDarwin then + stdenv.mkDerivation { + inherit + pname + version + src + meta + ; - sourceRoot = "."; + sourceRoot = "."; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ undmg ]; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p "$out/Applications" - mv Hoppscotch.app $out/Applications/ + mkdir -p "$out/Applications" + mv Hoppscotch.app $out/Applications/ - runHook postInstall - ''; -} -else appimageTools.wrapType2 { - inherit pname version src meta; - - extraInstallCommands = - let - appimageContents = appimageTools.extractType2 { inherit pname version src; }; - in - '' - # Install .desktop files - install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps + runHook postInstall ''; -} + } +else + appimageTools.wrapType2 { + inherit + pname + version + src + meta + ; + + extraInstallCommands = + let + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + # Install .desktop files + install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps + ''; + } diff --git a/pkgs/by-name/hp/hpcg/package.nix b/pkgs/by-name/hp/hpcg/package.nix new file mode 100644 index 0000000000000..7a02f5adad8f9 --- /dev/null +++ b/pkgs/by-name/hp/hpcg/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchurl, + mpi, +}: + +stdenv.mkDerivation rec { + pname = "hpcg"; + version = "3.1"; + + src = fetchurl { + url = "http://www.hpcg-benchmark.org/downloads/hpcg-${version}.tar.gz"; + sha256 = "197lw2nwmzsmfsbvgvi8z7kj69n374kgfzzp8pkmk7mp2vkk991k"; + }; + + buildInputs = [ mpi ]; + + makeFlags = [ "arch=Linux_MPI" ]; + + enableParallelBuilding = true; + + dontConfigure = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/hpcg + + cp bin/xhpcg $out/bin + cp bin/hpcg.dat $out/share/hpcg + + runHook postInstall + ''; + + meta = with lib; { + description = "HPC conjugate gradient benchmark"; + homepage = "https://www.hpcg-benchmark.org"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + mainProgram = "xhpcg"; + }; +} diff --git a/pkgs/by-name/hp/hpipm/package.nix b/pkgs/by-name/hp/hpipm/package.nix index a33efcc436773..88899d752b91b 100644 --- a/pkgs/by-name/hp/hpipm/package.nix +++ b/pkgs/by-name/hp/hpipm/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DHPIPM_FIND_BLASFEO=ON" "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optionals (!stdenv.isx86_64) [ "-DTARGET=GENERIC" ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DTARGET=GENERIC" ]; meta = { description = "High-performance interior-point-method QP and QCQP solvers"; diff --git a/pkgs/by-name/hp/hpp-fcl/package.nix b/pkgs/by-name/hp/hpp-fcl/package.nix new file mode 100644 index 0000000000000..80e715425034d --- /dev/null +++ b/pkgs/by-name/hp/hpp-fcl/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + doxygen, + boost, + eigen, + assimp, + octomap, + qhull, + pythonSupport ? false, + python3Packages, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hpp-fcl"; + version = "2.4.5"; + + src = fetchFromGitHub { + owner = "humanoid-path-planner"; + repo = "hpp-fcl"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-0OORdtT7vMpvK3BPJvtvuLcz0+bfu1+nVvzs3y+LyQw="; + }; + + strictDeps = true; + + nativeBuildInputs = + [ + cmake + doxygen + ] + ++ lib.optionals pythonSupport [ + python3Packages.numpy + python3Packages.pythonImportsCheckHook + ]; + + propagatedBuildInputs = + [ + assimp + qhull + octomap + zlib + ] + ++ lib.optionals (!pythonSupport) [ + boost + eigen + ] + ++ lib.optionals pythonSupport [ + python3Packages.boost + python3Packages.eigenpy + ]; + + cmakeFlags = [ + (lib.cmakeBool "HPP_FCL_HAS_QHULL" true) + (lib.cmakeBool "INSTALL_DOCUMENTATION" true) + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + ]; + + doCheck = true; + pythonImportsCheck = [ "hppfcl" ]; + + outputs = [ + "dev" + "out" + "doc" + ]; + postFixup = '' + moveToOutput share/ament_index "$dev" + moveToOutput share/${finalAttrs.pname} "$dev" + ''; + + meta = { + description = "Extension of the Flexible Collision Library"; + homepage = "https://github.com/humanoid-path-planner/hpp-fcl"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/hr/hred/package.nix b/pkgs/by-name/hr/hred/package.nix new file mode 100644 index 0000000000000..b7c77d3ecdda9 --- /dev/null +++ b/pkgs/by-name/hr/hred/package.nix @@ -0,0 +1,33 @@ +{ lib, buildNpmPackage, fetchFromGitHub, runCommand, hred, jq }: + +buildNpmPackage rec { + pname = "hred"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "danburzo"; + repo = "hred"; + rev = "v${version}"; + hash = "sha256-+0+WQRI8rdIMbPN0eBUdsWUMWDCxZhTRLiFo1WRd2xc="; + }; + + npmDepsHash = "sha256-kNNvSxZqN6cDZIG+lvqxgjAVCJUJrCvZThxrur5kozU="; + + dontNpmBuild = true; + + passthru.tests = { + simple = runCommand "${pname}-test" {} '' + set -e -o pipefail + echo '<i id="foo">bar</i>' | ${hred}/bin/hred 'i#foo { @id => id, @.textContent => text }' -c | ${jq}/bin/jq -c > $out + [ "$(cat $out)" = '{"id":"foo","text":"bar"}' ] + ''; + }; + + meta = { + description = "Command-line tool to extract data from HTML"; + mainProgram = "hred"; + license = lib.licenses.mit; + homepage = "https://github.com/danburzo/hred"; + maintainers = with lib.maintainers; [ tejing ]; + }; +} diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index dbbe025bf661d..df3c8cde12751 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -38,9 +38,9 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gnome-keyring - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/ht/htcondor/package.nix b/pkgs/by-name/ht/htcondor/package.nix index c1cf23d22abb4..3cb4665f5e480 100644 --- a/pkgs/by-name/ht/htcondor/package.nix +++ b/pkgs/by-name/ht/htcondor/package.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ evey ]; # cannot find -lpthread: No such file or directory - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/ht/hterm/package.nix b/pkgs/by-name/ht/hterm/package.nix new file mode 100644 index 0000000000000..22acf86af8925 --- /dev/null +++ b/pkgs/by-name/ht/hterm/package.nix @@ -0,0 +1,72 @@ +{ + stdenv, + lib, + fetchurl, + cairo, + pango, + libpng, + expat, + fontconfig, + gtk2, + xorg, + autoPatchelfHook, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "hterm"; + version = "0.8.9"; + + src = + let + versionWithoutDots = builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version; + in + if stdenv.targetPlatform.is64bit then + fetchurl { + url = "https://www.der-hammer.info/terminal/hterm${versionWithoutDots}-linux-64.tgz"; + hash = "sha256-DY+X7FaU1UBbNf/Kgy4TzBZiocQ4/TpJW3KLW1iu0M0="; + } + else + fetchurl { + url = "https://www.der-hammer.info/terminal/hterm${versionWithoutDots}-linux-32.tgz"; + hash = "sha256-7wJFCpeXNMX94tk0QVc0T22cbv3ODIswFge5Cs0JhI8="; + }; + sourceRoot = "."; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + cairo + pango + libpng + expat + fontconfig.lib + gtk2 + xorg.libSM + ]; + + installPhase = '' + runHook preInstall + install -m755 -D hterm $out/bin/hterm + install -m644 -D desktop/hterm.png $out/share/pixmaps/hterm.png + install -m644 -D desktop/hterm.desktop $out/share/applications/hterm.desktop + runHook postInstall + ''; + + passthru = { + updateScript = ./update.sh; + }; + + meta = { + homepage = "https://www.der-hammer.info/pages/terminal.html"; + changelog = "https://www.der-hammer.info/terminal/CHANGELOG.txt"; + description = "A terminal program for serial communication"; + # See https://www.der-hammer.info/terminal/LICENSE.txt + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + maintainers = with lib.maintainers; [ zebreus ]; + mainProgram = "hterm"; + }; +}) diff --git a/pkgs/by-name/ht/hterm/update.sh b/pkgs/by-name/ht/hterm/update.sh new file mode 100755 index 0000000000000..31966eec66d09 --- /dev/null +++ b/pkgs/by-name/ht/hterm/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl +# shellcheck shell=bash + +set -eu -o pipefail + +# The first valid version in the changelog should always be the latest version. +version="$(curl https://www.der-hammer.info/terminal/CHANGELOG.txt | grep -m1 -Po '[0-9]+\.[0-9]+\.[0-9]+')" + +function update_hash_for_system() { + local system="$1" + # Reset the version number so the second architecture update doesn't get ignored. + update-source-version hterm 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" --system="$system" + update-source-version hterm "$version" --system="$system" +} + +update_hash_for_system x86_64-linux +update_hash_for_system i686-linux diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix new file mode 100644 index 0000000000000..6fa7bc4baaacc --- /dev/null +++ b/pkgs/by-name/ht/htgettoken/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + python3, + makeWrapper, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "htgettoken"; + version = "2.0-2"; + + src = fetchFromGitHub { + owner = "fermitools"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-1rF72zo/Jj4ZeEG2Nk6Wla+AfaDo5iPZhZP1j9WAK5I="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + makeWrapper + ]; + + postInstall = with python3.pkgs; '' + wrapProgram $out/bin/htgettoken \ + --set PYTHONPATH "${ + makePythonPath [ + gssapi + paramiko + urllib3 + ] + }" + ''; + + meta = with lib; { + description = "Gets OIDC authentication tokens for High Throughput Computing via a Hashicorp vault server "; + license = licenses.bsd3; + homepage = "https://github.com/fermitools/htgettoken"; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index 7c94776ed431b..109744ae92cac 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.42.0"; + version = "0.43.2"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - hash = "sha256-2NvTo+EDw7GcDbND7epHWnHehcVBo11QyuZ0PoJf7Nc="; + hash = "sha256-8oG40pxhWd2MRxUSzZ3lgcsC9M1W5yBUZ0t5tO3B86U="; }; - cargoHash = "sha256-YSpYg10IeuqUAmjIQzrA59IT7r86/q8DtEKnazjo9rQ="; + cargoHash = "sha256-KKvpI3U6/cByP5M2ZiNtVrYyh2Nqe9cee2ObKqRBEyg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ht/httpdirfs/package.nix b/pkgs/by-name/ht/httpdirfs/package.nix index 99a84769459e1..6b6ed108fd451 100644 --- a/pkgs/by-name/ht/httpdirfs/package.nix +++ b/pkgs/by-name/ht/httpdirfs/package.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation (finalAttrs: { owner = "fangfufu"; repo = "httpdirfs"; rev = "refs/tags/${finalAttrs.version}"; - sha256 = "sha256-PUYsT0VDEzerPqwrLJrET4kSsWsQhtnfmLepeaqtA+I="; + hash = "sha256-PUYsT0VDEzerPqwrLJrET4kSsWsQhtnfmLepeaqtA+I="; }; - postPatch = lib.optional stdenv.isDarwin '' + postPatch = lib.optional stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace-fail '-fanalyzer' '-Xanalyzer' ''; @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { # Disabled for Darwin because requires macFUSE installed outside NixOS - tests.version = lib.optionalAttrs stdenv.isLinux ( + tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux ( testers.testVersion { command = "${lib.getExe finalAttrs.finalPackage} --version"; package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/ht/httpie-desktop/package.nix b/pkgs/by-name/ht/httpie-desktop/package.nix index d5d3d32198391..05b943a39608b 100644 --- a/pkgs/by-name/ht/httpie-desktop/package.nix +++ b/pkgs/by-name/ht/httpie-desktop/package.nix @@ -3,15 +3,29 @@ lib, fetchurl, }: + appimageTools.wrapType2 rec { pname = "httpie-desktop"; version = "2024.1.2"; src = fetchurl { url = "https://github.com/httpie/desktop/releases/download/v${version}/HTTPie-${version}.AppImage"; - sha256 = "sha256-OOP1l7J2BgO3nOPSipxfwfN/lOUsl80UzYMBosyBHrM="; + hash = "sha256-OOP1l7J2BgO3nOPSipxfwfN/lOUsl80UzYMBosyBHrM="; }; + extraInstallCommands = + let + contents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + mkdir -p $out/share + cp -r ${contents}/usr/share/* $out/share + chmod +w $out/share + install -Dm644 ${contents}/httpie.desktop $out/share/applications/httpie.desktop + substituteInPlace $out/share/applications/httpie.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=httpie-desktop' + ''; + meta = with lib; { description = "Cross-platform API testing client for humans. Painlessly test REST, GraphQL, and HTTP APIs"; homepage = "https://github.com/httpie/desktop"; diff --git a/pkgs/by-name/ht/httping/package.nix b/pkgs/by-name/ht/httping/package.nix index 85fcc843ef0f7..1318c5d236142 100644 --- a/pkgs/by-name/ht/httping/package.nix +++ b/pkgs/by-name/ht/httping/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "httping"; - version = "3.6"; + version = "4.1.0"; src = fetchFromGitHub { owner = "folkertvanheusden"; repo = "HTTPing"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-lDgQC3VzfcLqMOQSaRZ/znMamAAGYq/9C9bHgI4G7B8="; + hash = "sha256-JtsPtrj/ZineBokEytbkZdAfjVLTkiaNcGtKVJlKm38="; }; nativeBuildInputs = [ @@ -35,10 +35,6 @@ stdenv.mkDerivation (finalAttrs: { openssl ]; - cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") - ]; - installPhase = '' runHook preInstall install -D httping $out/bin/httping diff --git a/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch b/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch new file mode 100644 index 0000000000000..3d36c01d2ca46 --- /dev/null +++ b/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch @@ -0,0 +1,39 @@ +diff --git a/pack.ts b/pack.ts +index aba98cc..03ce86a 100644 +--- a/pack.ts ++++ b/pack.ts +@@ -75,33 +75,7 @@ const packageApp = async () => { + delete pJson.scripts.prepack; // We don't want to rebuild - all built code will be in the packed content + await fs.writeJson(path.join(OUTPUT_DIR, 'package.json'), pJson); + +- const buildScript = path.join(OUTPUT_DIR, 'build-release.sh'); +- +- // Run build-release in this folder, for each platform. For each bundle, we copy in +- // only the relevant platform-specific NSS files. +- console.log('Building for Linux'); +- await fs.mkdir(path.join(OUTPUT_DIR, 'nss')); +- await fs.copy(path.join(__dirname, 'nss', 'linux'), path.join(OUTPUT_DIR, 'nss', 'linux')); +- await spawn(buildScript, ['linux'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- +- console.log('Building for Darwin'); +- await fs.remove(path.join(OUTPUT_DIR, 'nss', 'linux')); +- await fs.copy(path.join(__dirname, 'nss', 'darwin'), path.join(OUTPUT_DIR, 'nss', 'darwin')); +- await spawn(buildScript, ['darwin'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- +- console.log('Building for Win32'); +- await fs.remove(path.join(OUTPUT_DIR, 'nss', 'darwin')); +- await fs.copy(path.join(__dirname, 'nss', 'win32'), path.join(OUTPUT_DIR, 'nss', 'win32')); +- await spawn(buildScript, ['win32'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); +- +- // Oclif builds a nodeless platform-agnostic bundle too (although in our case, nothing is +- // really platform agnostic). Not necessary, probably won't work - drop it. +- await fs.remove(path.join( +- OUTPUT_DIR, +- 'dist', +- `v${pJson.version}`, +- `httptoolkit-server-v${pJson.version}.tar.gz` +- )); ++ await spawn('npm', ['exec', '--', 'oclif-dev', 'pack', '--targets=linux-x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' }); + } + + packageApp().catch(e => { diff --git a/pkgs/by-name/ht/httptoolkit-server/package.nix b/pkgs/by-name/ht/httptoolkit-server/package.nix new file mode 100644 index 0000000000000..1bc90738b120f --- /dev/null +++ b/pkgs/by-name/ht/httptoolkit-server/package.nix @@ -0,0 +1,173 @@ +{ + lib, + nodejs_20, + buildNpmPackage, + fetchFromGitHub, + writeShellScriptBin, + nss, + cmake, + pkg-config, + openssl, + libdatachannel, +}: + +let + nodejs = nodejs_20; + buildNpmPackage' = buildNpmPackage.override { inherit nodejs; }; + + version = "1.19.0"; + + src = fetchFromGitHub { + owner = "httptoolkit"; + repo = "httptoolkit-server"; + rev = "refs/tags/v${version}"; + hash = "sha256-S4Io4X5Hlvm/5HoKIQ/OTor9jZvMz6me5RyfZ8FwOdM="; + }; + + overridesNodeModules = buildNpmPackage' { + pname = "httptoolkit-server-overrides-node-modules"; + inherit version src; + sourceRoot = "${src.name}/overrides/js"; + + npmDepsHash = "sha256-GRN6ua3FY1AE61bB7PM2wgbKPZI/zJeXa5HOOh/2N2Y="; + + dontBuild = true; + + installPhase = '' + mkdir -p $out + cp -r node_modules $out/node_modules + ''; + }; + + nodeDatachannel = buildNpmPackage' { + pname = "node-datachannel"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "murat-dogan"; + repo = "node-datachannel"; + rev = "refs/tags/v${nodeDatachannel.version}"; + hash = "sha256-BlfeocqSG+pqbK0onnCf0VKbQw8Qq4qMxhAcfGlFYR8="; + }; + + npmFlags = [ "--ignore-scripts" ]; + + makeCacheWritable = true; + + npmDepsHash = "sha256-pgcOOjiuWKlpD+WJyPj/c9ZhDjYuEnybpLS/BPmzeFM="; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + openssl + libdatachannel + ]; + + dontUseCmakeConfigure = true; + + env.NIX_CFLAGS_COMPILE = "-I${nodejs}/include/node"; + env.CXXFLAGS = "-include stdexcept"; # for GCC13 + + preBuild = '' + # don't use static libs and don't use FetchContent + substituteInPlace CMakeLists.txt \ + --replace-fail 'OPENSSL_USE_STATIC_LIBS TRUE' 'OPENSSL_USE_STATIC_LIBS FALSE' \ + --replace-fail 'if(NOT libdatachannel)' 'if(false)' \ + --replace-fail 'datachannel-static' 'datachannel' + + # don't fetch node headers + substituteInPlace node_modules/cmake-js/lib/dist.js \ + --replace-fail '!this.downloaded' 'false' + + npm rebuild --verbose + ''; + + installPhase = '' + runHook preInstall + install -Dm755 build/Release/*.node -t $out/build/Release + runHook postInstall + ''; + }; +in +buildNpmPackage' { + pname = "httptoolkit-server"; + inherit version src; + + patches = [ ./only-build-for-one-platform.patch ]; + + npmDepsHash = "sha256-njSNdpo+CIfS9LTnshawJ7297tFc8ssjUqJcHk8kBZE="; + + npmFlags = [ "--ignore-scripts" ]; + + makeCacheWritable = true; + + nativeBuildInputs = [ + # the build system uses the `git` executable to get the current revision + # we use a fake git to provide it with a fake revision + (writeShellScriptBin "git" "echo '???'") + ]; + + postConfigure = '' + # make sure `oclif-dev' doesn't fetch `node` binary to bundle with the app + substituteInPlace node_modules/@oclif/dev-cli/lib/tarballs/node.js --replace-fail \ + 'async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {' \ + 'async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) { return;' + + # manually place our prebuilt `node-datachannel` binary into its place, since we used '--ignore-scripts' + ln -s ${nodeDatachannel}/build node_modules/node-datachannel/build + + cp -r ${overridesNodeModules}/node_modules overrides/js/node_modules + + # don't run `npm ci` in `overrides/js` since we already copied node_modules into the directory + substituteInPlace prepare.ts --replace-fail "'ci', '--production'" "'--version'" + + patchShebangs *.sh + ''; + + preBuild = '' + npm run build:src + ''; + + npmBuildScript = "build:release"; + + installPhase = '' + runHook preInstall + + # we don't actually use any of the generated tarballs, we just copy from the tmp directory, since that's easier + mkdir -p $out/share/httptoolkit-server + cp -r build/tmp/httptoolkit-server/* -r $out/share/httptoolkit-server + + # remove unneeded executables + rm -r $out/share/httptoolkit-server/bin/httptoolkit-server* + + # since `oclif-dev pack` ran `npm install` again, we need to place the prebuilt binary here again + ln -s ${nodeDatachannel}/build $out/share/httptoolkit-server/node_modules/node-datachannel/build + + # disable updating functionality + substituteInPlace $out/share/httptoolkit-server/node_modules/@oclif/plugin-update/lib/commands/update.js \ + --replace-fail "await this.skipUpdate()" "'cannot update nix based package'" + + # the app determines if it's in production by checking if HTTPTOOLKIT_SERVER_BINPATH is set to anything + makeWrapper $out/share/httptoolkit-server/bin/run $out/bin/httptoolkit-server \ + --set HTTPTOOLKIT_SERVER_BINPATH dummy \ + --prefix PATH : ${lib.makeBinPath [ nss.tools ]} + + runHook postInstall + ''; + + passthru = { + inherit nodeDatachannel; + }; + + meta = { + description = "Backend for HTTP Toolkit"; + homepage = "https://httptoolkit.com/"; + license = lib.licenses.agpl3Plus; + mainProgram = "httptoolkit-server"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix new file mode 100644 index 0000000000000..5b2acf02bb0d1 --- /dev/null +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + electron, + httptoolkit-server, +}: + +buildNpmPackage rec { + pname = "httptoolkit"; + version = "1.19.0"; + + src = fetchFromGitHub { + owner = "httptoolkit"; + repo = "httptoolkit-desktop"; + rev = "refs/tags/v${version}"; + hash = "sha256-e+ngBZMwMTvwzY1K7IaxlNoRkZUPDdJvKxvxuCsc9pw="; + }; + + npmDepsHash = "sha256-XgJIs4P1ezCEPPitIIfYpNkX0/3dPdajeIiDwHm7DSU="; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + # disable code signing on Darwin + CSC_IDENTITY_AUTO_DISCOVERY = "false"; + }; + + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; + + npmBuildScript = "build:src"; + + postBuild = '' + substituteInPlace package.json --replace-fail \ + '"forceCodeSigning": true' \ + '"forceCodeSigning": false' + + 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} + ''; + + installPhase = '' + runHook preInstall + + ${lib.optionalString stdenv.hostPlatform.isLinux '' + mkdir -p $out/share/httptoolkit + cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/httptoolkit + + ln -s ${httptoolkit-server} $out/share/httptoolkit/resources/httptoolkit-server + + install -Dm644 src/icons/icon.svg $out/share/icons/hicolor/scalable/apps/httptoolkit.svg + + makeWrapper ${lib.getExe electron} $out/bin/httptoolkit \ + --add-flags $out/share/httptoolkit/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --inherit-argv0 + ''} + + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + cp -r dist/mac*/"HTTP Toolkit.app" $out/Applications + + ln -s ${httptoolkit-server} "$out/Applications/HTTP Toolkit.app/Contents/Resources/httptoolkit-server" + + makeWrapper "$out/Applications/HTTP Toolkit.app/Contents/MacOS/HTTP Toolkit" $out/bin/httptoolkit + ''} + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "httptoolkit"; + desktopName = "HTTP Toolkit"; + exec = "httptoolkit %U"; + terminal = false; + icon = "httptoolkit"; + startupWMClass = "HTTP Toolkit"; + comment = meta.description; + categories = [ "Development" ]; + startupNotify = true; + }) + ]; + + meta = { + description = "HTTP(S) debugging, development & testing tool"; + homepage = "https://httptoolkit.com/"; + license = lib.licenses.agpl3Plus; + mainProgram = "httptoolkit"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = electron.meta.platforms; + }; +} diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 58e970715b33f..ffc22665098e1 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, buildGo123Module +, buildGoModule , fetchFromGitHub , installShellFiles , buildPackages @@ -8,18 +8,18 @@ , hugo }: -buildGo123Module rec { +buildGoModule rec { pname = "hugo"; - version = "0.133.1"; + version = "0.135.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-vTUhUSaUvj3gBoiYOJwmxScCpl2Z6/xRWvyV3ivPBTo="; + hash = "sha256-WCWaEVD2HON6feOev9HBfpqBWYIFmfevu6LH0OMtv2Q="; }; - vendorHash = "sha256-+1wNCavx9pVWlFeP3NF/OAMgTVfIqAQdCkq4fW9RZxc="; + vendorHash = "sha256-XIFgmT0VyhRrUNfwy85Ac7YIO9fij0KqVmqb/s3IDVg="; doCheck = false; diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix index b758e779705f9..7132d2f9ed0f2 100644 --- a/pkgs/by-name/hu/hurl/package.nix +++ b/pkgs/by-name/hu/hurl/package.nix @@ -8,30 +8,21 @@ , openssl , stdenv , curl +, versionCheckHook }: rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "4.3.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "Orange-OpenSource"; - repo = pname; - rev = version; - hash = "sha256-gSkiNwRR47CZ1YjVa5o8EByCzWBAYPfsMRXydTwFwp0="; + repo = "hurl"; + rev = "refs/tags/${version}"; + hash = "sha256-+GmIKxD5wHovhKXuV2IbDX43gbD8OxJzWvH3Z0MwwV4="; }; - cargoHash = "sha256-dY00xcMnOCWhdRzC+3mTHSIqeYEPUDBJeYd/GiLM/38="; - - patches = [ - # Fix for rust 1.79, see https://github.com/Orange-OpenSource/hurl/issues/3057 - # We should be able to remove this at the next hurl version bump - (fetchpatch { - name = "hurl-fix-rust-1.79"; - url = "https://github.com/Orange-OpenSource/hurl/commit/d51c275fc63d1ee5bbdc6fc70279ec8dae86a9c1.patch"; - hash = "sha256-peA4Zq5J8ynL7trvydQ3ZqyHpJWrRmJeFeMKH9XT2n4="; - }) - ]; + cargoHash = "sha256-exAEJhHm7zTzXykkLyz46C0GJ7/7HYEwdfCd8zUDZ/A="; nativeBuildInputs = [ pkg-config @@ -41,12 +32,15 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libxml2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ]; - # Tests require network access to a test server + nativeInstallCheckInputs = [ versionCheckHook ]; + + # The actual tests require network access to a test server, but we can run an install check doCheck = false; + doInstallCheck = true; postInstall = '' installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1 diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix index c0de2d264862e..14e922df1533a 100644 --- a/pkgs/by-name/hw/hwinfo/package.nix +++ b/pkgs/by-name/hw/hwinfo/package.nix @@ -14,6 +14,8 @@ runCommand, validatePkgConfig, gitUpdater, + buildPackages, + perlPackages, }: stdenv.mkDerivation (finalAttrs: { @@ -30,15 +32,21 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ flex validatePkgConfig + perl + perlPackages.XMLWriter + perlPackages.XMLParser ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libuuid libx86emu - perl ]; postPatch = '' + # used by the build system + echo ${finalAttrs.version} > VERSION + # Replace /usr paths with Nix store paths substituteInPlace Makefile \ --replace-fail "/sbin" "/bin" \ @@ -56,13 +64,32 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "/sbin/rmmod" "${kmod}/bin/rmmod" \ --replace-fail "/usr/bin/udevinfo" "${systemdMinimal}/bin/udevinfo" \ --replace-fail "/usr/bin/udevadm" "${systemdMinimal}/bin/udevadm" + + ''; + + # The pci/usb ids in hwinfo are ancient. We can get a more up-to-date list simply by copying from systemd + preBuild = '' + # since we don't have .git, we cannot run this. + rm git2log + pushd src/ids + cp ${systemdMinimal.src}/hwdb.d/pci.ids src/pci + cp ${systemdMinimal.src}/hwdb.d/usb.ids src/usb + # taken from https://github.com/openSUSE/hwinfo/blob/c87f449f1d4882c71b0a1e6dc80638224a5baeed/src/ids/update_pci_usb + perl -pi -e 'undef $_ if /^C\s/..1' src/usb + perl ./convert_hd src/pci + perl ./convert_hd src/usb + popd + + # build tools for build arch + make -C src/ids CC=$CC_FOR_BUILD -j $NIX_BUILD_CORES check_hd + make -C src/isdn/cdb CC=$CC_FOR_BUILD -j $NIX_BUILD_CORES isdn_cdb mk_isdnhwdb ''; makeFlags = [ "LIBDIR=/lib" - "HWINFO_VERSION=${finalAttrs.version}" + "CC=${stdenv.cc.targetPrefix}cc" + "ARCH=${stdenv.hostPlatform.uname.processor}" ]; - installFlags = [ "DESTDIR=$(out)" ]; passthru = { diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 1b6bf433ce81b..8c88d03c21a1e 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -44,6 +44,7 @@ , glibcLocales , fetchFromGitHub , nixosTests +, unstableGitUpdater }: let @@ -123,13 +124,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2024-08-27"; + version = "0-unstable-2024-09-20"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "2d79b0a4da9e2a8ff97c1173aa56fe92e1f4629b"; - hash = "sha256-ZU8/LzdZ0nbUxVxTsRZyMpTGEtps9oG0Yx2cpS9J8I4="; + rev = "44248d3cf4162944ec2e6a45f8cc058758bf5a86"; + hash = "sha256-WJ7M/1a8j5gRJJVzCJL6JrkGPckD5ZhKzTlmiKNdtm0="; }; buildInputs = [ @@ -172,7 +173,7 @@ stdenv.mkDerivation (finalAttrs: { darcs gnused breezy - ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ rpm dpkg cdrkit ] ); nativeBuildInputs = [ @@ -194,9 +195,10 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; - env.NIX_CFLAGS_COMPILE = "-pthread"; - - OPENLDAP_ROOT = openldap; + env = { + NIX_CFLAGS_COMPILE = "-pthread"; + OPENLDAP_ROOT = openldap; + }; shellHook = '' PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH @@ -231,6 +233,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit nix perlDeps; tests.basic = nixosTests.hydra.hydra; + updateScript = unstableGitUpdater {}; }; meta = with lib; { diff --git a/pkgs/by-name/hy/hyperhdr/package.nix b/pkgs/by-name/hy/hyperhdr/package.nix new file mode 100644 index 0000000000000..1866e7212e1f1 --- /dev/null +++ b/pkgs/by-name/hy/hyperhdr/package.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, alsa-lib +, flatbuffers +, libjpeg_turbo +, mbedtls +, mdns +, pipewire +, qt6Packages +, qmqtt +, xz +}: + +let + inherit (lib) + cmakeBool + ; +in + +stdenv.mkDerivation rec { + pname = "hyperhdr"; + version = "20.0.0.0"; + + src = fetchFromGitHub { + owner = "awawa-dev"; + repo = "HyperHDR"; + rev = "refs/tags/v${version}"; + hash = "sha256-agIWtDlMwjD0sGX2ntFwqROzUsl8tY3nRbmFvvOVh4o="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt6Packages.wrapQtAppsHook + ]; + + cmakeFlags = [ + "-DPLATFORM=linux" + (cmakeBool "USE_SYSTEM_MQTT_LIBS" true) + (cmakeBool "USE_SYSTEM_FLATBUFFERS_LIBS" true) + (cmakeBool "USE_SYSTEM_MBEDTLS_LIBS" true) + ]; + + buildInputs = [ + alsa-lib + flatbuffers + libjpeg_turbo + mdns + mbedtls + pipewire + qmqtt + qt6Packages.qtbase + qt6Packages.qtserialport + xz + ]; + + meta = with lib; { + description = "Highly optimized open source ambient lighting implementation based on modern digital video and audio stream analysis for Windows, macOS and Linux (x86 and Raspberry Pi / ARM"; + homepage = "https://github.com/awawa-dev/HyperHDR"; + changelog = "https://github.com/awawa-dev/HyperHDR/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + mainProgram = "hyperhdr"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/hy/hyprland-activewindow/package.nix b/pkgs/by-name/hy/hyprland-activewindow/package.nix index 82de87a7ccb93..13f9920c23f5d 100644 --- a/pkgs/by-name/hy/hyprland-activewindow/package.nix +++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-activewindow"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "FieldOfClay"; repo = "hyprland-activewindow"; rev = "v${version}"; - hash = "sha256-kRxA2DLbbABPJFwv/L7yeNJ8eqNUbuV6U/PB5iJNoAw="; + hash = "sha256-2pIOZMBPqheqAz3YEvHP2ehLXhqIclOXXAFa5EXXZPk="; }; - cargoHash = "sha256-s3Ho0+OzuLuWqFvaBu9NLXoasByHSuun9eJGAAISOJc="; + cargoHash = "sha256-5JhNBgP6VQX7TVPaFUGvknDWrn6F06Mm3mGfuajg9yQ="; meta = with lib; { description = "Multi-monitor-aware Hyprland workspace widget helper"; diff --git a/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix index 73c7ebe1ec420..dd96593d5d186 100644 --- a/pkgs/by-name/hy/hyprland-workspaces/package.nix +++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-workspaces"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "FieldofClay"; repo = "hyprland-workspaces"; rev = "v${version}"; - hash = "sha256-GhUjvFMlgjTdgtV9ASW7IqE2dBktPyOlRwg6qM1r7vc="; + hash = "sha256-cTIh/UwtVVAWdJEcwOxKmYHBA6XXAaAQz/yW0Xs0y1k="; }; - cargoHash = "sha256-RZVQSkegX8Fa9SNY7tGNxyu312oeDjXK4U1+1/UIAyA="; + cargoHash = "sha256-NPphNQ2FLUrYLbquc2IzxuEjfmov+IPa1ixS6VGomPs="; meta = with lib; { description = "Multi-monitor aware Hyprland workspace widget"; diff --git a/pkgs/by-name/hy/hyprland/asahi-fix.patch b/pkgs/by-name/hy/hyprland/asahi-fix.patch deleted file mode 100644 index 80791045e285a..0000000000000 --- a/pkgs/by-name/hy/hyprland/asahi-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp -index 0fbf832e..c6077114 100644 ---- a/src/protocols/LinuxDMABUF.cpp -+++ b/src/protocols/LinuxDMABUF.cpp -@@ -492,9 +492,8 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const - return; - } - } else { -- protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null"); -+ protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf checks", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null"); - drmFreeDevice(&device); -- removeGlobal(); - } - }); - } diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 1b81e86848422..850a0cb050db0 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { "branch": "main", - "commit_hash": "9a09eac79b85c846e3a865a9078a3f8ff65a9259", - "commit_message": "props: bump version to 0.42.0", - "date": "2024-08-07", - "tag": "v0.42.0" + "commit_hash": "0f594732b063a90d44df8c5d402d658f27471dfe", + "commit_message": "props: bump version to 0.43.0", + "date": "2024-09-08", + "tag": "v0.43.0" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 9d3fbdd0889df..99a80aa301873 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, pkg-config, makeWrapper, cmake, @@ -11,34 +10,23 @@ binutils, cairo, epoll-shim, - expat, - fribidi, git, - hwdata, hyprcursor, hyprlang, hyprutils, hyprwayland-scanner, jq, libGL, - libdatrie, - libdisplay-info, libdrm, libexecinfo, libinput, - libliftoff, - libselinux, - libsepol, - libthai, libuuid, libxkbcommon, mesa, pango, pciutils, - pcre2, pkgconf, python3, - seatd, systemd, tomlplusplus, wayland, @@ -66,26 +54,19 @@ assert lib.assertMsg (!hidpiXWayland) stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE="; + hash = "sha256-+wE97utoDfhQP6AMdZHUmBeL8grbce/Jv2i5M+6AbaE="; }; patches = [ - # Fixes broken OpenGL applications on Apple silicon (Asahi Linux) - # Based on commit https://github.com/hyprwm/Hyprland/commit/279ec1c291021479b050c83a0435ac7076c1aee0 - ./asahi-fix.patch - - # https://github.com/hyprwm/Hyprland/pull/7467 - (fetchpatch { - url = "https://github.com/hyprwm/Hyprland/commit/a437e44a6af8e8f42966ffe3a26c1d562fce6b33.diff"; - hash = "sha256-Y0P4rY6HyPN8Y5Kowlgyj0PiAHh6nqPRAQ4iFT0l4E8="; - }) + # forces GCC to use -std=c++26 on CMake < 3.30 + "${finalAttrs.src}/nix/stdcxx.patch" ]; postPatch = '' @@ -131,29 +112,18 @@ stdenv.mkDerivation (finalAttrs: { [ aquamarine cairo - expat - fribidi git - hwdata hyprcursor.dev hyprlang hyprutils libGL - libdatrie - libdisplay-info libdrm libinput - libliftoff - libselinux - libsepol - libthai libuuid libxkbcommon mesa pango pciutils - pcre2 - seatd tomlplusplus wayland wayland-protocols @@ -164,9 +134,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableXWayland [ xorg.libxcb xorg.libXdmcp - xorg.xcbutil xorg.xcbutilerrors - xorg.xcbutilrenderutil xorg.xcbutilwm xwayland ] diff --git a/pkgs/by-name/hy/hyprnotify/package.nix b/pkgs/by-name/hy/hyprnotify/package.nix index 3289d6fd0cacd..1be9b8b114cf7 100644 --- a/pkgs/by-name/hy/hyprnotify/package.nix +++ b/pkgs/by-name/hy/hyprnotify/package.nix @@ -8,20 +8,20 @@ buildGoModule rec { pname = "hyprnotify"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "codelif"; repo = "hyprnotify"; rev = "v${version}"; - hash = "sha256-dL+W+iMwRNw9042bs2XUFPMCCqIvDENXOMzhcLh+RL4="; + hash = "sha256-+vBOHXaCWEoQ/Lk9VwP55XqlhSzSS9hoVg4FQOj8dIU="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; - vendorHash = "sha256-AZDtaiSNq7em876Q9f+YeDxboqVwA8IE9dDM6zggFXs="; + vendorHash = "sha256-2BuWJ57jELtfj7SGr+dLdC2KFc5sD2bC8MgjUHaIXUs="; meta = { description = "DBus Implementation of Freedesktop Notification spec for 'hyprctl notify'"; diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index bb8b059f7eb2a..076b77604958d 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs="; + hash = "sha256-PNnIpwGqpTvMU3N2r0wMQwK1E+t4Bb5fbJwblQvr+80="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index b0a73bbceff85..c6c46e9fb15e9 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprwayland-scanner"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprwayland-scanner"; rev = "v${finalAttrs.version}"; - hash = "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU="; + hash = "sha256-HIPEXyRRVZoqD6U+lFS1B0tsIU7p83FaB9m7KT/x6mQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/i2/i2p/package.nix b/pkgs/by-name/i2/i2p/package.nix index 6b001806299a9..a4f9c53daf029 100644 --- a/pkgs/by-name/i2/i2p/package.nix +++ b/pkgs/by-name/i2/i2p/package.nix @@ -97,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Applications and router for I2P, anonymity over the Internet"; homepage = "https://geti2p.net"; + changelog = "https://github.com/i2p/i2p.i2p/releases/tag/i2p-${finalAttrs.version}"; sourceProvenance = with sourceTypes; [ fromSource binaryBytecode # source bundles dependencies as jars diff --git a/pkgs/by-name/i3/i3-back/package.nix b/pkgs/by-name/i3/i3-back/package.nix new file mode 100644 index 0000000000000..e21914435f7a3 --- /dev/null +++ b/pkgs/by-name/i3/i3-back/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + testers, + i3-back, +}: +rustPlatform.buildRustPackage rec { + pname = "i3-back"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "Cretezy"; + repo = "i3-back"; + rev = "refs/tags/v${version}"; + hash = "sha256-xGfX7ttWrcIVhy+MkR5RZr2DCAwIKwGu7zkafHcrjaE="; + }; + + # The tool needs a nightly compiler. + RUSTC_BOOTSTRAP = 1; + + cargoHash = "sha256-Ot8f/58bAlpDSB11l14paCx2yjVoAYaHVIXaOzT1z/c="; + + passthru.tests.version = testers.testVersion { package = i3-back; }; + + meta = { + description = "i3/Sway utility to switch focus to your last focused window"; + homepage = "https://github.com/Cretezy/i3-back"; + changelog = "https://github.com/Cretezy/i3-back/blob/main/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gabyx ]; + platforms = lib.platforms.linux; + mainProgram = "i3-back"; + }; +} diff --git a/pkgs/by-name/i3/i3bar-river/package.nix b/pkgs/by-name/i3/i3bar-river/package.nix index b0101f323b74b..0cd000a97e72a 100644 --- a/pkgs/by-name/i3/i3bar-river/package.nix +++ b/pkgs/by-name/i3/i3bar-river/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "i3bar-river"; - version = "0.1.9"; + version = "1.0.0"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "i3bar-river"; rev = "v${version}"; - hash = "sha256-tG23bdEKp8+9RMS1fpW8EVe+bAdjQp7nVW0eHl3eYSQ="; + hash = "sha256-Xa/9xDfVadwFEelxoXVjvPgOojNtol6XeDoBbDLbdS0="; }; - cargoHash = "sha256-nSzGWpnyGRus9qCTPAd+BM4KsujSNyRmFUCc4Lg4D5k="; + cargoHash = "sha256-k4bWJjcOkYKh3WOnTM1+otWLw4C7sVzF6IVkYmpiNeQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ]; diff --git a/pkgs/by-name/i3/i3pystatus/package.nix b/pkgs/by-name/i3/i3pystatus/package.nix index b06de1abe9848..84b5809f94202 100644 --- a/pkgs/by-name/i3/i3pystatus/package.nix +++ b/pkgs/by-name/i3/i3pystatus/package.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { owner = "enkore"; repo = "i3pystatus"; rev = "f3c539ad78ad1c54fc36e8439bf3905a784ccb34"; - sha256 = "3AGREY+elHQk8kaoFp8AHEzk2jNC/ICGYPh2hXo2G/w="; + hash = "sha256-3AGREY+elHQk8kaoFp8AHEzk2jNC/ICGYPh2hXo2G/w="; }; patches = [ diff --git a/pkgs/by-name/ia/iagno/package.nix b/pkgs/by-name/ia/iagno/package.nix index f5fa71b094b95..8e5aff5838c6e 100644 --- a/pkgs/by-name/ia/iagno/package.nix +++ b/pkgs/by-name/ia/iagno/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/iagno/${lib.versions.majorMinor version}/iagno-${version}.tar.xz"; - sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4"; + hash = "sha256-hLnzLOA4l1iiHWPH6xwifbcRa1HTFJqg6uNQkWjg7SQ="; }; patches = [ @@ -34,12 +34,12 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/15 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/e8a0aeec350ea80349582142c0e8e3cd3f1bce38.patch"; - sha256 = "OO1x0Yx56UFzHTBsPAMYAjnJHlnTjdO1Vk7q6XU8wKQ="; + hash = "sha256-OO1x0Yx56UFzHTBsPAMYAjnJHlnTjdO1Vk7q6XU8wKQ="; }) # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/13 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/508c0f94e5f182e50ff61be6e04f72574dee97cb.patch"; - sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; + hash = "sha256-U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; }) ]; diff --git a/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix similarity index 100% rename from pkgs/tools/misc/iam-policy-json-to-terraform/default.nix rename to pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix diff --git a/pkgs/by-name/id/ida-free/package.nix b/pkgs/by-name/id/ida-free/package.nix index 237080eced38f..594163049b3af 100644 --- a/pkgs/by-name/id/ida-free/package.nix +++ b/pkgs/by-name/id/ida-free/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "https://www.hex-rays.com/products/ida/news/8_1/images/icon_free.png" "https://web.archive.org/web/20221105181231if_/https://hex-rays.com/products/ida/news/8_1/images/icon_free.png" ]; - sha256 = "sha256-widkv2VGh+eOauUK/6Sz/e2auCNFAsc8n9z0fdrSnW0="; + hash = "sha256-widkv2VGh+eOauUK/6Sz/e2auCNFAsc8n9z0fdrSnW0="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix index 8818869b60367..8d6a67529b726 100644 --- a/pkgs/by-name/id/ideamaker/package.nix +++ b/pkgs/by-name/id/ideamaker/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "https://download.raise3d.com/ideamaker/release/${semver}/ideaMaker_${finalAttrs.version}-ubuntu_amd64.deb"; - sha256 = "sha256-aTVWCTgnVKD16uhJUVz0vR7KPGJqCVj0xoL53Qi3IKM="; + hash = "sha256-aTVWCTgnVKD16uhJUVz0vR7KPGJqCVj0xoL53Qi3IKM="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.0.1u"; src = fetchurl { url = "https://www.openssl.org/source/openssl-1.0.1u.tar.gz"; - sha256 = "0fb7y9pwbd76pgzd7xzqfrzibmc0vf03sl07f34z5dhm2b5b84j3"; + hash = "sha256-QxK0yhIVtvLJcAdQPYDbgNUVf3b499P+u+a0xW/yZzk="; }; patches = [ ]; withDocs = false; @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { version = "7.47.0"; src = fetchzip { url = "https://curl.se/download/curl-7.47.0.tar.lzma"; - sha256 = "sha256-XlZk1nJbSmiQp7jMSE2QRCY4C9w2us8BgosBSzlD4dE="; + hash = "sha256-XlZk1nJbSmiQp7jMSE2QRCY4C9w2us8BgosBSzlD4dE="; }; configureFlags = previous.configureFlags ++ [ "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" @@ -216,6 +216,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.raise3d.com/ideamaker/"; + changelog = "https://www.raise3d.com/download/ideamaker-release-notes/"; description = "Raise3D's 3D slicer software"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix index fdce5e94c6a41..4ad62dff661a4 100644 --- a/pkgs/by-name/ig/igir/package.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "igir"; - version = "2.9.2"; + version = "2.11.0"; src = fetchFromGitHub { owner = "emmercm"; repo = "igir"; rev = "v${version}"; - hash = "sha256-3lEU3uK/Wp09TOhVJVNslOCx9vTVp0gBTbkQXB13i9Y="; + hash = "sha256-NG0ZP8LOm7fZVecErTuLOfbp1yvXwHnwPkWTBzUJXWE="; }; - npmDepsHash = "sha256-gJvJwostQgEq14zDmMOatfWmkEYNAqGCL9MJPrv5kwk="; + npmDepsHash = "sha256-ADIEzr6PkGaJz27GKSVyTsrbz5zbud7BUb+OXPtP1Vo="; # I have no clue why I have to do this postPatch = '' @@ -38,6 +38,7 @@ buildNpmPackage rec { description = "Video game ROM collection manager to help filter, sort, patch, archive, and report on collections on any OS"; mainProgram = "igir"; homepage = "https://igir.io"; + changelog = "https://github.com/emmercm/igir/releases/tag/${src.rev}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix index 9039db759dfba..0db9b0a99b6fa 100644 --- a/pkgs/by-name/ig/ignite-cli/package.nix +++ b/pkgs/by-name/ig/ignite-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "ignite-cli"; - version = "28.5.1"; + version = "28.5.3"; src = fetchFromGitHub { repo = "cli"; owner = "ignite"; rev = "v${version}"; - hash = "sha256-JgcLW+CoxLaz9WKGkSDpUEZJtEeP35LveW0B3arnNw0="; + hash = "sha256-ziuzSV7LjRgR1wNE1QD+OszIeXiip7pPU4/BD8fhV5s="; }; - vendorHash = "sha256-NEjva9KDPz7rykqcKcTOwSKBR3n4oFSYARX/BQzhgqY="; + vendorHash = "sha256-5Z5AuZtPwfENKp8wMYfRqmnkX4W4fWTjWulT5uNusPo="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ig/igvm-tooling/package.nix b/pkgs/by-name/ig/igvm-tooling/package.nix index e5cb4a564b790..557bcee8aa0d9 100644 --- a/pkgs/by-name/ig/igvm-tooling/package.nix +++ b/pkgs/by-name/ig/igvm-tooling/package.nix @@ -1,9 +1,11 @@ -{ lib -, python3 -, fetchFromGitHub -, fetchpatch -, which -, acpica-tools +{ + lib, + python3, + fetchFromGitHub, + fetchpatch, + which, + acpica-tools, + nix-update-script, }: python3.pkgs.buildPythonApplication rec { @@ -24,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { (fetchpatch { name = "0001-setup.py-remove-unused-libclang-dependency.patch"; url = "https://github.com/microsoft/igvm-tooling/commit/7182e925de9b5e9f5c8c3a3ce6e3942a92506064.patch"; - sha256 = "sha256-tcVxcuLxknyEdo2YjeHOqSG9xQna8US+YyvlcfX+Htw="; + hash = "sha256-tcVxcuLxknyEdo2YjeHOqSG9xQna8US+YyvlcfX+Htw="; stripLen = 1; }) ]; @@ -38,18 +40,20 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ acpica-tools ]; - propagatedBuildInputs = (with python3.pkgs; [ - setuptools - ecdsa - cstruct - pyelftools - pytest - cached-property - frozendict - ]) ++ [ - acpica-tools - which - ]; + propagatedBuildInputs = + (with python3.pkgs; [ + setuptools + ecdsa + cstruct + pyelftools + pytest + cached-property + frozendict + ]) + ++ [ + acpica-tools + which + ]; postInstall = '' mkdir -p $out/share/igvm-tooling/acpi/acpi-clh @@ -58,11 +62,16 @@ python3.pkgs.buildPythonApplication rec { find $out/share/igvm-tooling/acpi -name "*.dsl" -exec iasl -f {} \; ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "IGVM Image Generator"; homepage = "https://github.com/microsoft/igvm-tooling"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ malt3 katexochen ]; + maintainers = with lib.maintainers; [ + malt3 + katexochen + ]; changelog = "https://github.com/microsoft/igvm-tooling/releases/tag/igvm-${version}"; mainProgram = "igvmgen"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/im/imgpkg/package.nix b/pkgs/by-name/im/imgpkg/package.nix new file mode 100644 index 0000000000000..66b32695c2127 --- /dev/null +++ b/pkgs/by-name/im/imgpkg/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "imgpkg"; + version = "0.43.1"; + + src = fetchFromGitHub { + owner = "carvel-dev"; + repo = "imgpkg"; + rev = "v${version}"; + hash = "sha256-RjTVJjuzjNTZrg1VZ4NrDf1SZmS+CGzofYTBQEZNIag="; + }; + + vendorHash = null; + + subPackages = [ "cmd/imgpkg" ]; + + CGO_ENABLED = "0"; + ldflags = [ "-X=carvel.dev/imgpkg/pkg/imgpkg/cmd.Version=${version}" ]; + + meta = { + description = "Store application configuration files in Docker/OCI registries"; + homepage = "https://carvel.dev/imgpkg"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ benchand ]; + mainProgram = "imgpkg"; + }; +} diff --git a/pkgs/by-name/im/immersed-vr/package.nix b/pkgs/by-name/im/immersed-vr/package.nix index f057d192ca979..874cac3bf5d67 100644 --- a/pkgs/by-name/im/immersed-vr/package.nix +++ b/pkgs/by-name/im/immersed-vr/package.nix @@ -6,16 +6,16 @@ }: let pname = "immersed-vr"; - version = "9.10"; + version = "10.5.0"; sources = rec { x86_64-linux = { - url = "https://web.archive.org/web/20240210075929/https://static.immersed.com/dl/Immersed-x86_64.AppImage"; - hash = "sha256-Mx8UnV4fZSebj9ah650ZqsL/EIJpM6jl8tYmXJZiJpA="; + url = "https://web.archive.org/web/20240909144905if_/https://static.immersed.com/dl/Immersed-x86_64.AppImage"; + hash = "sha256-/fc/URYJZftZPyVicmZjyvcGPLaHrnlsrERlQFN5E98="; }; x86_64-darwin = { - url = "https://web.archive.org/web/20240210075929/https://static.immersed.com/dl/Immersed.dmg"; - hash = "sha256-CR2KylovlS7zerZIEScnadm4+ENNhib5QnS6z5Ihv1Y="; + url = "https://web.archive.org/web/20240910022037if_/https://static.immersed.com/dl/Immersed.dmg"; + hash = "sha256-UkfB151bX0D5k0IBZczh36TWOOYJbBe5e6LIErON214="; }; aarch64-darwin = x86_64-darwin; }; @@ -31,6 +31,6 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; -in if stdenv.isDarwin +in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname version src meta; } else callPackage ./linux.nix { inherit pname version src meta; } diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix new file mode 100644 index 0000000000000..d41dc764f26d8 --- /dev/null +++ b/pkgs/by-name/im/immich-cli/package.nix @@ -0,0 +1,36 @@ +{ + lib, + immich, + buildNpmPackage, + nodejs, + makeWrapper, +}: +buildNpmPackage { + pname = "immich-cli"; + src = "${immich.src}/cli"; + inherit (immich.sources.components.cli) version npmDepsHash; + + nativeBuildInputs = [ makeWrapper ]; + + inherit (immich.web) preBuild; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv package.json package-lock.json node_modules dist $out/ + + makeWrapper ${lib.getExe nodejs} $out/bin/immich --add-flags $out/dist/index.js + + runHook postInstall + ''; + + meta = { + description = "Self-hosted photo and video backup solution (command line interface)"; + homepage = "https://immich.app/docs/features/command-line-interface"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ jvanbruegge ]; + inherit (nodejs.meta) platforms; + mainProgram = "immich"; + }; +} diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix new file mode 100644 index 0000000000000..94cc69f50ed1b --- /dev/null +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -0,0 +1,115 @@ +{ + lib, + fetchFromGitHub, + immich, + python3, + nixosTests, +}: +let + python = python3.override { + self = python; + + packageOverrides = self: super: { + pydantic = super.pydantic_1; + + versioningit = super.versioningit.overridePythonAttrs (_: { + doCheck = false; + }); + + albumentations = super.albumentations.overridePythonAttrs (old: rec { + version = "1.4.3"; + src = fetchFromGitHub { + owner = "albumentations-team"; + repo = "albumentations"; + rev = version; + hash = "sha256-JIBwjYaUP4Sc1bVM/zlj45cz9OWpb/LOBsIqk1m+sQA="; + }; + dependencies = old.dependencies ++ [ + self.scikit-learn + ]; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { + pname = "immich-machine-learning"; + inherit (immich) version; + src = "${immich.src}/machine-learning"; + pyproject = true; + + postPatch = '' + substituteInPlace pyproject.toml --replace-fail 'fastapi-slim' 'fastapi' + + # AttributeError: module 'cv2' has no attribute 'Mat' + substituteInPlace app/test_main.py --replace-fail ": cv2.Mat" "" + ''; + + pythonRelaxDeps = [ "setuptools" ]; + pythonRemoveDeps = [ "opencv-python-headless" ]; + + build-system = with python.pkgs; [ + poetry-core + cython + ]; + + dependencies = + with python.pkgs; + [ + insightface + opencv4 + pillow + fastapi + uvicorn + aiocache + rich + ftfy + setuptools + python-multipart + orjson + gunicorn + huggingface-hub + tokenizers + pydantic + ] + ++ uvicorn.optional-dependencies.standard; + + nativeCheckInputs = with python.pkgs; [ + httpx + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + postInstall = '' + mkdir -p $out/share/immich + cp log_conf.json $out/share/immich + + cp -r ann $out/${python.sitePackages}/ + + makeWrapper ${lib.getExe python.pkgs.gunicorn} "''${!outputBin}"/bin/machine-learning \ + --prefix PYTHONPATH : "$out/${python.sitePackages}:${python.pkgs.makePythonPath dependencies}" \ + --set-default MACHINE_LEARNING_WORKERS 1 \ + --set-default MACHINE_LEARNING_WORKER_TIMEOUT 120 \ + --set-default MACHINE_LEARNING_CACHE_FOLDER /var/cache/immich \ + --set-default IMMICH_HOST "[::]" \ + --set-default IMMICH_PORT 3003 \ + --add-flags "app.main:app -k app.config.CustomUvicornWorker \ + -w \"\$MACHINE_LEARNING_WORKERS\" \ + -b \"\$IMMICH_HOST:\$IMMICH_PORT\" \ + -t \"\$MACHINE_LEARNING_WORKER_TIMEOUT\" + --log-config-json $out/share/immich/log_conf.json" + ''; + + passthru.tests = { + inherit (nixosTests) immich; + }; + + meta = { + description = "Self-hosted photo and video backup solution (machine learning component)"; + homepage = "https://immich.app/"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ jvanbruegge ]; + mainProgram = "machine-learning"; + inherit (immich.meta) platforms; + }; +} diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix new file mode 100644 index 0000000000000..fe62f0ddc3545 --- /dev/null +++ b/pkgs/by-name/im/immich/package.nix @@ -0,0 +1,232 @@ +{ + lib, + stdenvNoCC, + buildNpmPackage, + fetchFromGitHub, + python3, + nodejs, + node-gyp, + runCommand, + nixosTests, + immich-machine-learning, + # build-time deps + glib, + pkg-config, + makeWrapper, + curl, + cacert, + unzip, + # runtime deps + ffmpeg-headless, + imagemagick, + libraw, + libheif, + vips, + perl, +}: +let + buildNpmPackage' = buildNpmPackage.override { inherit nodejs; }; + sources = lib.importJSON ./sources.json; + inherit (sources) version; + + buildLock = { + sources = + builtins.map + (p: { + name = p.pname; + inherit (p) version; + inherit (p.src) rev; + }) + [ + imagemagick + libheif + libraw + ]; + + packages = [ ]; + }; + + # The geodata website is not versioned, so we use the internet archive + geodata = + runCommand "immich-geodata" + { + outputHash = "sha256-imqSfzXaEMNo9T9tZr80sr/89n19kiFc8qwidFzRUaY="; + outputHashMode = "recursive"; + nativeBuildInputs = [ + cacert + curl + unzip + ]; + + meta.license = lib.licenses.cc-by-40; + } + '' + mkdir $out + url="https://web.archive.org/web/20240724153050/http://download.geonames.org/export/dump" + curl -Lo ./cities500.zip "$url/cities500.zip" + curl -Lo $out/admin1CodesASCII.txt "$url/admin1CodesASCII.txt" + curl -Lo $out/admin2Codes.txt "$url/admin2Codes.txt" + curl -Lo $out/ne_10m_admin_0_countries.geojson \ + https://raw.githubusercontent.com/nvkelso/natural-earth-vector/ca96624a56bd078437bca8184e78163e5039ad19/geojson/ne_10m_admin_0_countries.geojson + + unzip ./cities500.zip -d $out/ + echo "2024-07-24T15:30:50Z" > $out/geodata-date.txt + ''; + + src = fetchFromGitHub { + owner = "immich-app"; + repo = "immich"; + rev = "v${version}"; + inherit (sources) hash; + }; + + openapi = buildNpmPackage' { + pname = "immich-openapi-sdk"; + inherit version; + src = "${src}/open-api/typescript-sdk"; + inherit (sources.components."open-api/typescript-sdk") npmDepsHash; + + installPhase = '' + runHook preInstall + + npm config delete cache + npm prune --omit=dev --omit=optional + + mkdir -p $out + mv package.json package-lock.json node_modules build $out/ + + runHook postInstall + ''; + }; + + web = buildNpmPackage' { + pname = "immich-web"; + inherit version; + src = "${src}/web"; + inherit (sources.components.web) npmDepsHash; + + preBuild = '' + rm node_modules/@immich/sdk + ln -s ${openapi} node_modules/@immich/sdk + # Rollup does not find the dependency otherwise + ln -s node_modules/@immich/sdk/node_modules/@oazapfts node_modules/ + ''; + + installPhase = '' + runHook preInstall + + cp -r build $out + + runHook postInstall + ''; + }; + + node-addon-api = stdenvNoCC.mkDerivation rec { + pname = "node-addon-api"; + version = "8.0.0"; + src = fetchFromGitHub { + owner = "nodejs"; + repo = "node-addon-api"; + rev = "v${version}"; + hash = "sha256-k3v8lK7uaEJvcaj1sucTjFZ6+i5A6w/0Uj9rYlPhjCE="; + }; + installPhase = '' + mkdir $out + cp -r *.c *.h *.gyp *.gypi index.js package-support.json package.json tools $out/ + ''; + }; + + vips' = vips.overrideAttrs (prev: { + mesonFlags = prev.mesonFlags ++ [ "-Dtiff=disabled" ]; + }); +in +buildNpmPackage' { + pname = "immich"; + inherit version; + src = "${src}/server"; + inherit (sources.components.server) npmDepsHash; + + nativeBuildInputs = [ + pkg-config + python3 + makeWrapper + glib + node-gyp + ]; + + buildInputs = [ + ffmpeg-headless + imagemagick + libraw + libheif + vips' # Required for sharp + ]; + + # Required because vips tries to write to the cache dir + makeCacheWritable = true; + + preBuild = '' + cd node_modules/sharp + + mkdir node_modules + ln -s ${node-addon-api} node_modules/node-addon-api + + ${lib.getExe nodejs} install/check + + rm -r node_modules + + cd ../.. + rm -r node_modules/@img/sharp* + ''; + + installPhase = '' + runHook preInstall + + npm config delete cache + npm prune --omit=dev + + mkdir -p $out/build + mv package.json package-lock.json node_modules dist resources $out/ + ln -s ${web} $out/build/www + ln -s ${geodata} $out/build/geodata + + echo '${builtins.toJSON buildLock}' > $out/build/build-lock.json + + makeWrapper ${lib.getExe nodejs} $out/bin/admin-cli --add-flags $out/dist/main --add-flags cli + makeWrapper ${lib.getExe nodejs} $out/bin/server --add-flags $out/dist/main --chdir $out \ + --set IMMICH_BUILD_DATA $out/build --set NODE_ENV production \ + --suffix PATH : "${ + lib.makeBinPath [ + perl + ffmpeg-headless + ] + }" + + runHook postInstall + ''; + + passthru = { + tests = { + inherit (nixosTests) immich; + }; + + machine-learning = immich-machine-learning; + + inherit + src + sources + web + geodata + ; + updateScript = ./update.sh; + }; + + meta = { + description = "Self-hosted photo and video backup solution"; + homepage = "https://immich.app/"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ jvanbruegge ]; + platforms = lib.platforms.linux; + mainProgram = "server"; + }; +} diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json new file mode 100644 index 0000000000000..28fa298d1a663 --- /dev/null +++ b/pkgs/by-name/im/immich/sources.json @@ -0,0 +1,22 @@ +{ + "version": "1.117.0", + "hash": "sha256-v4TxKL+NaaAFxlJx/AG/5JxWnPK9uO6GjM4aoW53nzQ=", + "components": { + "cli": { + "npmDepsHash": "sha256-ARjrBHx4aOiNy2PbHWS7kP9Z8QiNyTeyImSxIsXwPnU=", + "version": "2.2.23" + }, + "server": { + "npmDepsHash": "sha256-RjaTRqfZpDhI8lMVvsgICUn8g4NFnqcPptem/AwRr38=", + "version": "1.117.0" + }, + "web": { + "npmDepsHash": "sha256-TZnpbLJbTNFwI2Kvng88z0T1jFf4Tj2xwR0X0wCLaD0=", + "version": "1.117.0" + }, + "open-api/typescript-sdk": { + "npmDepsHash": "sha256-G+iivJ0jibRCw/RChv5heVwY7c7oY/EG4bL+kpjoADQ=", + "version": "1.117.0" + } + } +} diff --git a/pkgs/by-name/im/immich/update.sh b/pkgs/by-name/im/immich/update.sh new file mode 100755 index 0000000000000..a1a5e2e0585c3 --- /dev/null +++ b/pkgs/by-name/im/immich/update.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq prefetch-npm-deps nix-prefetch-github coreutils + +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +old_version=$(jq -r ".version" sources.json || echo -n "0.0.1") +version=$(curl -s "https://api.github.com/repos/immich-app/immich/releases/latest" | jq -r ".tag_name") +version="${version#v}" + +echo "Updating to $version" + +if [[ "$old_version" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +echo "Fetching src" +src_hash=$(nix-prefetch-github immich-app immich --rev "v${version}" | jq -r .hash) +upstream_src="https://raw.githubusercontent.com/immich-app/immich/v$version" + +sources_tmp="$(mktemp)" +cat <<EOF > "$sources_tmp" +{ + "version": "$version", + "hash": "$src_hash", + "components": {} +} +EOF + +lock=$(mktemp) +for npm_component in cli server web "open-api/typescript-sdk"; do + echo "fetching $npm_component" + curl -s -o "$lock" "$upstream_src/$npm_component/package-lock.json" + hash=$(prefetch-npm-deps "$lock") + echo "$(jq --arg npm_component "$npm_component" \ + --arg hash "$hash" \ + --arg version "$(jq -r '.version' <"$lock")" \ + '.components += {($npm_component): {npmDepsHash: $hash, version: $version}}' \ + "$sources_tmp")" > "$sources_tmp" +done + +rm "$lock" +mv "$sources_tmp" sources.json diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix index 0ae303747bfe5..6a775dc25433b 100644 --- a/pkgs/by-name/im/impala/package.nix +++ b/pkgs/by-name/im/impala/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "impala"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "pythops"; repo = "impala"; rev = "v${version}"; - hash = "sha256-0ULcknkZKYEvuqlcY8E1kZtpA0lPxxjRV2/zfak+FKU="; + hash = "sha256-4LQmM4VTW3ykh6eDWKxBe3jxlJphgAytgeaQZNwivsQ="; }; - cargoHash = "sha256-1jFUfpinqXBu8eTFAA1dRDk1F1IhNjcA7CkJmaIjkFQ="; + cargoHash = "sha256-IMvlGAD9DB00luu9F4UKxwSYt0sV+IU8Pb7r10VtyYg="; meta = { description = "TUI for managing wifi"; diff --git a/pkgs/by-name/im/implot/demos/default.nix b/pkgs/by-name/im/implot/demos/default.nix index b3a369668c1d3..677448924dee5 100644 --- a/pkgs/by-name/im/implot/demos/default.nix +++ b/pkgs/by-name/im/implot/demos/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/epezent/implot_demos"; broken = stdenv.hostPlatform.isAarch64 # Target "mandel" relies on AVX2 - || stdenv.isDarwin; + || stdenv.hostPlatform.isDarwin; license = lib.licenses.mit; maintainers = with lib.maintainers; [ SomeoneSerge ]; mainProgram = "implot-demos"; diff --git a/pkgs/by-name/im/imsprog/package.nix b/pkgs/by-name/im/imsprog/package.nix index a8042eaef1faa..113281f5702e1 100644 --- a/pkgs/by-name/im/imsprog/package.nix +++ b/pkgs/by-name/im/imsprog/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "imsprog"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "bigbigmdm"; repo = "IMSProg"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-FAvGGxw7qDuucAbyaq9gDhMvHL9mJCQApRzzQ7Kh0c8="; + hash = "sha256-dhBg0f7pIbBS8IiUXd1UlAxgGrv6HapzooXafkHIEK8="; }; strictDeps = true; diff --git a/pkgs/by-name/in/incus/0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch b/pkgs/by-name/in/incus/0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch new file mode 100644 index 0000000000000..d4f9cfccc21a1 --- /dev/null +++ b/pkgs/by-name/in/incus/0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch @@ -0,0 +1,29 @@ +From 0c37b7e3ec65b4d0e166e2127d9f1835320165b8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org> +Date: Fri, 6 Sep 2024 17:07:11 -0400 +Subject: [PATCH] incusd/instance/qemu: Make O_DIRECT conditional on + directCache +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Stéphane Graber <stgraber@stgraber.org> +--- + internal/server/instance/drivers/driver_qemu.go | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go +index 5a94c9db43..9609b73c1b 100644 +--- a/internal/server/instance/drivers/driver_qemu.go ++++ b/internal/server/instance/drivers/driver_qemu.go +@@ -4276,7 +4276,9 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] + permissions = unix.O_RDONLY + } + +- permissions |= unix.O_DIRECT ++ if directCache { ++ permissions |= unix.O_DIRECT ++ } + + f, err := os.OpenFile(driveConf.DevPath, permissions, 0) + if err != nil { diff --git a/pkgs/by-name/in/incus/572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch b/pkgs/by-name/in/incus/572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch new file mode 100644 index 0000000000000..e918deb8569c4 --- /dev/null +++ b/pkgs/by-name/in/incus/572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch @@ -0,0 +1,28 @@ +From 572afb06f66f83ca95efa1b9386fceeaa1c9e11b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org> +Date: Fri, 6 Sep 2024 15:51:35 -0400 +Subject: [PATCH] incusd/instance/qemu: Set O_DIRECT when passing in FDs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is required in most cases with QEMU 9.1.0. + +Signed-off-by: Stéphane Graber <stgraber@stgraber.org> +--- + internal/server/instance/drivers/driver_qemu.go | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go +index 37da21f42f..e25aab0667 100644 +--- a/internal/server/instance/drivers/driver_qemu.go ++++ b/internal/server/instance/drivers/driver_qemu.go +@@ -4277,6 +4277,8 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] + permissions = unix.O_RDONLY + } + ++ permissions |= unix.O_DIRECT ++ + f, err := os.OpenFile(driveConf.DevPath, permissions, 0) + if err != nil { + return fmt.Errorf("Failed opening file descriptor for disk device %q: %w", driveConf.DevName, err) diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix index 7ffdc1c83ec4c..4216710c02809 100644 --- a/pkgs/by-name/in/incus/generic.nix +++ b/pkgs/by-name/in/incus/generic.nix @@ -128,8 +128,8 @@ buildGoModule rec { ui = callPackage ./ui.nix { }; - updateScript = writeScript "ovs-update.nu" '' - ${./update.nu} ${updateScriptArgs} + updateScript = writeScript "ovs-update.py" '' + ${./update.py} ${updateScriptArgs} ''; }; diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index 3e266bd1e446e..98fe4f2e7c5de 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -1,8 +1,12 @@ import ./generic.nix { - hash = "sha256-8GgzMiXn/78HkMuJ49cQA9BEQVAzPbG7jOxTScByR6Q="; - version = "6.0.1"; - vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA="; - patches = [ ]; + hash = "sha256-roPBHqy5toYF0X9mATl6QYb5GGlgPoGZYOC9vKpca88="; + version = "6.0.2"; + vendorHash = "sha256-TP1NaUpsHF54mWQDcHS4uabfRJWu3k51ANNPdA4k1Go="; + patches = [ + # qemu 9.1 compat, remove when added to LTS + ./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch + ./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch + ]; lts = true; - updateScriptArgs = "--lts=true --regex '6.0.*'"; + updateScriptArgs = "--lts --regex '6.0.*'"; } diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index 2f458bc84da6a..5819ee61744f4 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - hash = "sha256-fWc+qUAFlqMuiDhZzEY99rXHjKq40GPzplSN8ggId9g="; - version = "6.4.0"; - vendorHash = "sha256-j+ywLnN+/6HvMKOEr1FuXTLxUMX7VtU4eG3GGx3yAOo="; + hash = "sha256-hjBJGtIBYwgPpnWb1337RP1jU9rQNLQ3yp1AnwBH13o="; + version = "6.6.0"; + vendorHash = "sha256-Cpbgn2WHMVKtPrAzuNnXkS1rYvzLwde6oTcKTKW3XHs="; patches = [ ]; } diff --git a/pkgs/by-name/in/incus/update.nu b/pkgs/by-name/in/incus/update.nu deleted file mode 100755 index 754da9b59abfc..0000000000000 --- a/pkgs/by-name/in/incus/update.nu +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i nu -p nushell common-updater-scripts gnused - -def main [--lts = false, --regex: string] { - let attr = $"incus(if $lts {"-lts"})" - let file = $"(pwd)/pkgs/by-name/in/incus/(if $lts { "lts" } else { "package" }).nix" - - let tags = list-git-tags --url=https://github.com/lxc/incus | lines | sort --natural | str replace v '' - let latest_tag = if $regex == null { $tags } else { $tags | find --regex $regex } | last - let current_version = nix eval --raw -f default.nix $"($attr).version" | str trim - - if $latest_tag != $current_version { - print $"Updating: new ($latest_tag) != old ($current_version)" - update-source-version $attr $latest_tag $"--file=($file)" - - let oldVendorHash = nix-instantiate . --eval --strict -A $"($attr).goModules.drvAttrs.outputHash" --json | from json - let checkBuild = do { nix-build -A $"($attr).goModules" } | complete - let vendorHash = $checkBuild.stderr | lines | str trim | find --regex 'got:[[:space:]]*sha256' | split row ' ' | last - - if $vendorHash != null { - open $file | str replace $oldVendorHash $vendorHash | save --force $file - } else { - print $checkBuild.stderr - exit 1 - } - } - - {"lts?": $lts, before: $current_version, after: $latest_tag} -} diff --git a/pkgs/by-name/in/incus/update.py b/pkgs/by-name/in/incus/update.py new file mode 100755 index 0000000000000..1db118a596f91 --- /dev/null +++ b/pkgs/by-name/in/incus/update.py @@ -0,0 +1,87 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python -p python3 python3Packages.looseversion common-updater-scripts nurl + +import argparse +import json +import os +import re +from looseversion import LooseVersion +from subprocess import run + +parser = argparse.ArgumentParser() +parser.add_argument("--lts", action="store_true") +parser.add_argument("--regex") +args = parser.parse_args() + +nixpkgs_path = os.environ["PWD"] + +attr = "incus" +file = f"pkgs/by-name/in/incus/package.nix" +if args.lts: + attr = "incus-lts" + file = f"pkgs/by-name/in/incus/lts.nix" + +tags = ( + run(["list-git-tags", "--url=https://github.com/lxc/incus"], capture_output=True) + .stdout.decode("utf-8") + .splitlines() +) +tags = [t.lstrip("v") for t in tags] + +latest_version = "0" +for tag in tags: + if args.regex != None and not re.match(args.regex, tag): + continue + + if LooseVersion(tag) > LooseVersion(latest_version): + latest_version = tag + +current_version = ( + run( + ["nix", "eval", "--raw", "-f", "default.nix", f"{attr}.version"], + capture_output=True, + ) + .stdout.decode("utf-8") + .strip() +) + +if LooseVersion(latest_version) <= LooseVersion(current_version): + print("No update available") + exit(0) + +print(f"Found new version {latest_version} > {current_version}") + +run(["update-source-version", attr, latest_version, f"--file={file}"]) + +current_vendor_hash = ( + run( + [ + "nix-instantiate", + ".", + "--eval", + "--strict", + "-A", + f"{attr}.goModules.drvAttrs.outputHash", + "--json", + ], + capture_output=True, + ) + .stdout.decode("utf-8") + .strip() + .strip('"') +) + +latest_vendor_hash = ( + run( + ["nurl", "--expr", f"(import {nixpkgs_path} {{}}).{attr}.goModules"], + capture_output=True, + ) + .stdout.decode("utf-8") + .strip() +) + +with open(file, "r+") as f: + file_content = f.read() + file_content = re.sub(current_vendor_hash, latest_vendor_hash, file_content) + f.seek(0) + f.write(file_content) diff --git a/pkgs/by-name/in/inflow/package.nix b/pkgs/by-name/in/inflow/package.nix index 79f3acb58237a..8545c48071b89 100644 --- a/pkgs/by-name/in/inflow/package.nix +++ b/pkgs/by-name/in/inflow/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "stephen-huan"; repo = "inflow"; rev = "v${version}"; - sha256 = "sha256-xKUqkrPwITai8g6U1NiNieAip/AzISgFfFtvR30hLNk="; + hash = "sha256-xKUqkrPwITai8g6U1NiNieAip/AzISgFfFtvR30hLNk="; }; buildPhase = '' diff --git a/pkgs/by-name/in/inhibridge/package.nix b/pkgs/by-name/in/inhibridge/package.nix new file mode 100644 index 0000000000000..4340d4a3e8696 --- /dev/null +++ b/pkgs/by-name/in/inhibridge/package.nix @@ -0,0 +1,29 @@ +{ + lib, + rustPlatform, + fetchFromGitea, +}: +rustPlatform.buildRustPackage rec { + pname = "inhibridge"; + version = "0.3.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "Scrumplex"; + repo = "inhibridge"; + rev = version; + hash = "sha256-cKVw3Gd4Ml8BeXjZqTN6ToeRzO9PI+Sn45gpltlRuWM="; + }; + + cargoHash = "sha256-uKSbxAsGUR2nYfdtiTR/bgPBQunqYLzx3+CmszNilPQ="; + + meta = with lib; { + homepage = "https://codeberg.org/Scrumplex/inhibridge"; + description = "Simple daemon that bridges freedesktop.org ScreenSaver inhibitions to systemd-inhibit"; + platforms = platforms.linux; + license = licenses.agpl3Plus; + maintainers = with maintainers; [Scrumplex]; + mainProgram = "inhibridge"; + }; +} + diff --git a/pkgs/by-name/in/inshellisense/package.nix b/pkgs/by-name/in/inshellisense/package.nix index 5e9610d0c2f9b..3b2a84ace0c55 100644 --- a/pkgs/by-name/in/inshellisense/package.nix +++ b/pkgs/by-name/in/inshellisense/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "inshellisense"; - version = "0.0.1-rc.15"; + version = "0.0.1-rc.16"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/6pU8ubasONPMe1qnE+Db0nzdHRQTo9fhMr7Xxjgsos="; + hash = "sha256-jqLYN251ZvLOjYsSQJmvQ1TupO4jz3Q23aDpKX+Puvs="; }; - npmDepsHash = "sha256-rOyvFA5X3o1TCgY54XxNSg0+QotA8IUauLngTtJuRj4="; + npmDepsHash = "sha256-rGUyA0RLnNZ6ocmHPXfBLJ6ZmeeTN9w+TJTtfTQQ24M="; # Needed for dependency `@homebridge/node-pty-prebuilt-multiarch` # On Darwin systems the build fails with, @@ -20,8 +20,8 @@ buildNpmPackage rec { # npm ERR! int ret = openpty(&master, &slave, nullptr, NULL, static_cast<winsi ze*>(&winp)); # # when `node-gyp` tries to build the dep. The below allows `npm` to download the prebuilt binary. - makeCacheWritable = stdenv.isDarwin; - nativeBuildInputs = lib.optional stdenv.isDarwin cacert; + makeCacheWritable = stdenv.hostPlatform.isDarwin; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin cacert; meta = with lib; { description = "IDE style command line auto complete"; diff --git a/pkgs/by-name/in/installShellFiles/package.nix b/pkgs/by-name/in/installShellFiles/package.nix new file mode 100644 index 0000000000000..f1cf436a9b79a --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/package.nix @@ -0,0 +1,16 @@ +{ + lib, + callPackage, + makeSetupHook, +}: + +# See the header comment in ./setup-hook.sh for example usage. +makeSetupHook { + name = "install-shell-files"; + passthru = { + tests = lib.packagesFromDirectoryRecursive { + inherit callPackage; + directory = ./tests; + }; + }; +} ./setup-hook.sh diff --git a/pkgs/by-name/in/installShellFiles/setup-hook.sh b/pkgs/by-name/in/installShellFiles/setup-hook.sh new file mode 100644 index 0000000000000..b348939165418 --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/setup-hook.sh @@ -0,0 +1,256 @@ +# shellcheck shell=bash +# Setup hook for the `installShellFiles` package. +# +# Example usage in a derivation: +# +# { …, installShellFiles, … }: +# stdenv.mkDerivation { +# … +# nativeBuildInputs = [ installShellFiles ]; +# postInstall = '' +# installManPage share/doc/foobar.1 +# installShellCompletion share/completions/foobar.{bash,fish,zsh} +# ''; +# … +# } +# +# See comments on each function for more details. + +# installManPage <path> [...<path>] +# +# Each argument is checked for its man section suffix and installed into the appropriate +# share/man/man<n>/ directory. The function returns an error if any paths don't have the man +# section suffix (with optional .gz compression). +installManPage() { + local path + for path in "$@"; do + if test -z "$path"; then + nixErrorLog "${FUNCNAME[0]}: path cannot be empty" + return 1 + fi + nixInfoLog "${FUNCNAME[0]}: installing $path" + local basename + basename=$(stripHash "$path") # use stripHash in case it's a nix store path + local trimmed=${basename%.gz} # don't get fooled by compressed manpages + local suffix=${trimmed##*.} + if test -z "$suffix" -o "$suffix" = "$trimmed"; then + nixErrorLog "${FUNCNAME[0]}: path missing manpage section suffix: $path" + return 1 + fi + local outRoot + if test "$suffix" = 3; then + outRoot=${!outputDevman:?} + else + outRoot=${!outputMan:?} + fi + local outPath="${outRoot}/share/man/man$suffix/$basename" + install -D --mode=644 --no-target-directory "$path" "$outPath" + done +} + +# installShellCompletion [--cmd <name>] ([--bash|--fish|--zsh] [--name <name>] <path>)... +# +# Each path is installed into the appropriate directory for shell completions for the given shell. +# If one of `--bash`, `--fish`, or `--zsh` is given the path is assumed to belong to that shell. +# Otherwise the file extension will be examined to pick a shell. If the shell is unknown a warning +# will be logged and the command will return a non-zero status code after processing any remaining +# paths. Any of the shell flags will affect all subsequent paths (unless another shell flag is +# given). +# +# If the shell completion needs to be renamed before installing the optional `--name <name>` flag +# may be given. Any name provided with this flag only applies to the next path. +# +# If all shell completions need to be renamed before installing the optional `--cmd <name>` flag +# may be given. This will synthesize a name for each file, unless overridden with an explicit +# `--name` flag. For example, `--cmd foobar` will synthesize the name `_foobar` for zsh and +# `foobar.bash` for bash. +# +# For zsh completions, if the `--name` flag is not given, the path will be automatically renamed +# such that `foobar.zsh` becomes `_foobar`. +# +# A path may be a named fd, such as produced by the bash construct `<(cmd)`. When using a named fd, +# the shell type flag must be provided, and either the `--name` or `--cmd` flag must be provided. +# This might look something like: +# +# installShellCompletion --zsh --name _foobar <($out/bin/foobar --zsh-completion) +# +# This command accepts multiple shell flags in conjunction with multiple paths if you wish to +# install them all in one command: +# +# installShellCompletion share/completions/foobar.{bash,fish} --zsh share/completions/_foobar +# +# However it may be easier to read if each shell is split into its own invocation, especially when +# renaming is involved: +# +# installShellCompletion --bash --name foobar.bash share/completions.bash +# installShellCompletion --fish --name foobar.fish share/completions.fish +# installShellCompletion --zsh --name _foobar share/completions.zsh +# +# Or to use shell newline escaping to split a single invocation across multiple lines: +# +# installShellCompletion --cmd foobar \ +# --bash <($out/bin/foobar --bash-completion) \ +# --fish <($out/bin/foobar --fish-completion) \ +# --zsh <($out/bin/foobar --zsh-completion) +# +# If any argument is `--` the remaining arguments will be treated as paths. +installShellCompletion() { + local shell='' name='' cmdname='' retval=0 parseArgs=1 arg + while { arg=$1; shift; }; do + # Parse arguments + if (( parseArgs )); then + case "$arg" in + --bash|--fish|--zsh) + shell=${arg#--} + continue;; + --name) + name=$1 + shift || { + nixErrorLog "${FUNCNAME[0]}: --name flag expected an argument" + return 1 + } + continue;; + --name=*) + # treat `--name=foo` the same as `--name foo` + name=${arg#--name=} + continue;; + --cmd) + cmdname=$1 + shift || { + nixErrorLog "${FUNCNAME[0]}: --cmd flag expected an argument" + return 1 + } + continue;; + --cmd=*) + # treat `--cmd=foo` the same as `--cmd foo` + cmdname=${arg#--cmd=} + continue;; + --?*) + nixWarnLog "${FUNCNAME[0]}: unknown flag ${arg%%=*}" + retval=2 + continue;; + --) + # treat remaining args as paths + parseArgs=0 + continue;; + esac + fi + nixInfoLog "${FUNCNAME[0]}: installing $arg${name:+ as $name}" + # if we get here, this is a path or named pipe + # Identify shell and output name + local curShell=$shell + local outName='' + if [[ -z "$arg" ]]; then + nixErrorLog "${FUNCNAME[0]}: empty path is not allowed" + return 1 + elif [[ -p "$arg" ]]; then + # this is a named fd or fifo + if [[ -z "$curShell" ]]; then + nixErrorLog "${FUNCNAME[0]}: named pipe requires one of --bash, --fish, or --zsh" + return 1 + elif [[ -z "$name" && -z "$cmdname" ]]; then + nixErrorLog "${FUNCNAME[0]}: named pipe requires one of --cmd or --name" + return 1 + fi + else + # this is a path + local argbase + argbase=$(stripHash "$arg") + if [[ -z "$curShell" ]]; then + # auto-detect the shell + case "$argbase" in + ?*.bash) curShell=bash;; + ?*.fish) curShell=fish;; + ?*.zsh) curShell=zsh;; + *) + if [[ "$argbase" = _* && "$argbase" != *.* ]]; then + # probably zsh + nixWarnLog "${FUNCNAME[0]}: assuming path \`$arg' is zsh; please specify with --zsh" + curShell=zsh + else + nixWarnLog "${FUNCNAME[0]}: unknown shell for path: $arg" >&2 + retval=2 + continue + fi;; + esac + fi + outName=$argbase + fi + # Identify output path + if [[ -n "$name" ]]; then + outName=$name + elif [[ -n "$cmdname" ]]; then + case "$curShell" in + bash|fish) outName=$cmdname.$curShell;; + zsh) outName=_$cmdname;; + *) + # Our list of shells is out of sync with the flags we accept or extensions we detect. + nixErrorLog "${FUNCNAME[0]}: internal: shell $curShell not recognized" + return 1;; + esac + fi + local sharePath + case "$curShell" in + bash) sharePath=bash-completion/completions;; + fish) sharePath=fish/vendor_completions.d;; + zsh) + sharePath=zsh/site-functions + # only apply automatic renaming if we didn't have a manual rename + if [[ -z "$name" && -z "$cmdname" ]]; then + # convert a name like `foo.zsh` into `_foo` + outName=${outName%.zsh} + outName=_${outName#_} + fi;; + *) + # Our list of shells is out of sync with the flags we accept or extensions we detect. + nixErrorLog "${FUNCNAME[0]}: internal: shell $curShell not recognized" + return 1;; + esac + # Install file + local outDir="${!outputBin:?}/share/$sharePath" + local outPath="$outDir/$outName" + if [[ -p "$arg" ]]; then + # install handles named pipes on NixOS but not on macOS + mkdir -p "$outDir" \ + && cat "$arg" > "$outPath" + else + install -D --mode=644 --no-target-directory "$arg" "$outPath" + fi + + if [ ! -s "$outPath" ]; then + nixErrorLog "${FUNCNAME[0]}: installed shell completion file \`$outPath' does not exist or has zero size" + return 1 + fi + # Clear the per-path flags + name= + done + if [[ -n "$name" ]]; then + nixErrorLog "${FUNCNAME[0]}: --name flag given with no path" >&2 + return 1 + fi + return $retval +} + +# installBin <path> [...<path>] +# +# Install each argument to $outputBin +installBin() { + local path + for path in "$@"; do + if test -z "$path"; then + nixErrorLog "${FUNCNAME[0]}: path cannot be empty" + return 1 + fi + nixInfoLog "${FUNCNAME[0]}: installing $path" + + local basename + # use stripHash in case it's a nix store path + basename=$(stripHash "$path") + + local outRoot + outRoot=${!outputBin:?} + + local outPath="${outRoot}/bin/$basename" + install -D --mode=755 --no-target-directory "$path" "${outRoot}/bin/$basename" + done +} diff --git a/pkgs/by-name/in/installShellFiles/tests/install-bin-output.nix b/pkgs/by-name/in/installShellFiles/tests/install-bin-output.nix new file mode 100644 index 0000000000000..900f1eaa7e71e --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-bin-output.nix @@ -0,0 +1,31 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-bin-output" + { + outputs = [ + "out" + "bin" + ]; + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + mkdir -p bin + echo "echo hello za warudo" > bin/hello + echo "echo amigo me gusta mucho" > bin/amigo + + installBin bin/* + + # assert it didn't go into $out + [[ ! -f $out/bin/amigo ]] + [[ ! -f $out/bin/hello ]] + + cmp bin/amigo ''${!outputBin}/bin/amigo + cmp bin/hello ''${!outputBin}/bin/hello + + touch $out + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-bin.nix b/pkgs/by-name/in/installShellFiles/tests/install-bin.nix new file mode 100644 index 0000000000000..ba00c59b21be7 --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-bin.nix @@ -0,0 +1,21 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-bin" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + mkdir -p bin + echo "echo hello za warudo" > bin/hello + echo "echo amigo me gusta mucho" > bin/amigo + + installBin bin/* + + cmp bin/amigo $out/bin/amigo + cmp bin/hello $out/bin/hello + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-cmd.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-cmd.nix new file mode 100644 index 0000000000000..a8687ccc2c7d0 --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-cmd.nix @@ -0,0 +1,24 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-completion-cmd" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + echo foo > foo.bash + echo bar > bar.zsh + echo baz > baz.fish + echo qux > qux.fish + + installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish + + cmp foo.bash $out/share/bash-completion/completions/foobar.bash + cmp bar.zsh $out/share/zsh/site-functions/_foobar + cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish + cmp qux.fish $out/share/fish/vendor_completions.d/qux + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-fifo.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-fifo.nix new file mode 100644 index 0000000000000..2c777f0fb68a1 --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-fifo.nix @@ -0,0 +1,21 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-completion-fifo" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + installShellCompletion \ + --bash --name foo.bash <(echo foo) \ + --zsh --name _foo <(echo bar) \ + --fish --name foo.fish <(echo baz) + + [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; } + [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; } + [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; } + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-inference.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-inference.nix new file mode 100644 index 0000000000000..9a51965ccecbd --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-inference.nix @@ -0,0 +1,22 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-completion-inference" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + echo foo > foo.bash + echo bar > bar.zsh + echo baz > baz.fish + + installShellCompletion foo.bash bar.zsh baz.fish + + cmp foo.bash $out/share/bash-completion/completions/foo.bash + cmp bar.zsh $out/share/zsh/site-functions/_bar + cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-name.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-name.nix new file mode 100644 index 0000000000000..2473318dee2c1 --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-name.nix @@ -0,0 +1,22 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-completion-name" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + echo foo > foo + echo bar > bar + echo baz > baz + + installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz + + cmp foo $out/share/bash-completion/completions/foobar.bash + cmp bar $out/share/zsh/site-functions/_foobar + cmp baz $out/share/fish/vendor_completions.d/baz + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-output.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-output.nix new file mode 100644 index 0000000000000..380b241e4f017 --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-output.nix @@ -0,0 +1,27 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-completion-output" + { + outputs = [ + "out" + "bin" + ]; + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + echo foo > foo + + installShellCompletion --bash foo + + # assert it didn't go into $out + [[ ! -f $out/share/bash-completion/completions/foo ]] + + cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo + + touch $out + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion.nix new file mode 100644 index 0000000000000..2738dd647f566 --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-completion.nix @@ -0,0 +1,26 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-completion" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + echo foo > foo + echo bar > bar + echo baz > baz + echo qux > qux.zsh + echo quux > quux + + installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux + + cmp foo $out/share/bash-completion/completions/foo + cmp bar $out/share/bash-completion/completions/bar + cmp baz $out/share/zsh/site-functions/_baz + cmp qux.zsh $out/share/zsh/site-functions/_qux + cmp quux $out/share/fish/vendor_completions.d/quux + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-manpage-outputs.nix b/pkgs/by-name/in/installShellFiles/tests/install-manpage-outputs.nix new file mode 100644 index 0000000000000..4e249a9e5061b --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-manpage-outputs.nix @@ -0,0 +1,36 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-manpage-outputs" + { + outputs = [ + "out" + "man" + "devman" + ]; + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.3 + + installManPage doc/* + + # assert they didn't go into $out + [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]] + + # foo.1 alone went into man + cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1 + [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]] + + # bar.3 alone went into devman + cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3 + [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]] + + touch $out + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-manpage.nix b/pkgs/by-name/in/installShellFiles/tests/install-manpage.nix new file mode 100644 index 0000000000000..7b67d0aed94ca --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-manpage.nix @@ -0,0 +1,23 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-manpage" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.2.gz + echo baz > doc/baz.3 + + installManPage doc/* + + cmp doc/foo.1 $out/share/man/man1/foo.1 + cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz + cmp doc/baz.3 $out/share/man/man3/baz.3 + '' diff --git a/pkgs/by-name/in/intelephense/package-lock.json b/pkgs/by-name/in/intelephense/package-lock.json new file mode 100644 index 0000000000000..929b32e717509 --- /dev/null +++ b/pkgs/by-name/in/intelephense/package-lock.json @@ -0,0 +1,5673 @@ +{ + "name": "intelephense", + "version": "1.12.5", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "intelephense", + "version": "1.12.5", + "license": "SEE LICENSE IN LICENSE.txt", + "dependencies": { + "@bmewburn/js-beautify": "1.15.2", + "@bmewburn/vscode-html-languageserver": "1.11.0", + "applicationinsights": "~2.7.3", + "fast-glob": "~3.3.2", + "fs-extra": "~11.2.0", + "html-to-text": "~9.0.5", + "lru-cache": "~10.2.2", + "micromatch": "~4.0.7", + "protobufjs": "~7.3.2", + "proxy-agent": "^6.4.0", + "semver": "~7.6.2", + "turndown": "~7.2.0", + "turndown-plugin-gfm": "~1.0.2", + "vscode-languageserver": "9.0.1", + "vscode-languageserver-types": "3.17.5", + "vscode-uri": "~3.0.8" + }, + "bin": { + "intelephense": "lib/intelephense.js" + }, + "devDependencies": { + "@types/chai": "~4.3.16", + "@types/fs-extra": "~11.0.4", + "@types/html-to-text": "~9.0.4", + "@types/js-beautify": "~1.14.3", + "@types/micromatch": "~4.0.7", + "@types/mocha": "~10.0.6", + "@types/node": "20.x", + "@types/request": "~2.48.12", + "@types/semver": "~7.5.8", + "@types/sinon": "~17.0.3", + "banner-webpack-plugin": "~0.2.3", + "chai": "~4.4.1", + "copy-webpack-plugin": "~12.0.2", + "mocha": "~10.4.0", + "protobufjs-cli": "~1.1.2", + "sinon": "~18.0.0", + "terser-webpack-plugin": "~5.3.10", + "ts-loader": "~9.5.1", + "ts-node": "~10.9.2", + "typescript": "~5.4.5", + "webpack": "~5.92.1", + "webpack-cli": "~5.1.4" + }, + "funding": { + "url": "https://intelephense.com" + } + }, + "node_modules/@azure/abort-controller": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz", + "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==", + "license": "MIT", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/core-auth": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.8.0.tgz", + "integrity": "sha512-YvFMowkXzLbXNM11yZtVLhUCmuG0ex7JKOH366ipjmHBhL3vpDcPAeWF+jf0X+jVXwFqo3UhsWUq4kH0ZPdu/g==", + "license": "MIT", + "dependencies": { + "@azure/abort-controller": "^2.0.0", + "@azure/core-util": "^1.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/core-rest-pipeline": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz", + "integrity": "sha512-Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA==", + "license": "MIT", + "dependencies": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.4.0", + "@azure/core-tracing": "^1.0.1", + "@azure/core-util": "^1.0.0", + "@azure/logger": "^1.0.0", + "form-data": "^4.0.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "tslib": "^2.2.0", + "uuid": "^8.3.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@azure/core-rest-pipeline/node_modules/@azure/abort-controller": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz", + "integrity": "sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==", + "license": "MIT", + "dependencies": { + "tslib": "^2.2.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/@azure/core-rest-pipeline/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@azure/core-tracing": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.1.2.tgz", + "integrity": "sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==", + "license": "MIT", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/core-util": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.2.0.tgz", + "integrity": "sha512-ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng==", + "license": "MIT", + "dependencies": { + "@azure/abort-controller": "^1.0.0", + "tslib": "^2.2.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@azure/core-util/node_modules/@azure/abort-controller": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz", + "integrity": "sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==", + "license": "MIT", + "dependencies": { + "tslib": "^2.2.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/@azure/logger": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.1.4.tgz", + "integrity": "sha512-4IXXzcCdLdlXuCG+8UKEwLA1T1NHqUfanhXYHiQTn+6sfWCZXduqbtXDGceg3Ce5QxTGo7EqmbV6Bi+aqKuClQ==", + "license": "MIT", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/opentelemetry-instrumentation-azure-sdk": { + "version": "1.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@azure/opentelemetry-instrumentation-azure-sdk/-/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.6.tgz", + "integrity": "sha512-JP6TJ7vDNX6r0gN2+EQBINTNqZ86frl1RAj5STtbLP1ClgIhcdXXb0hvq7CuEOv7InrroHMDoEYG80OQcWChug==", + "license": "MIT", + "dependencies": { + "@azure/core-tracing": "^1.0.0", + "@azure/logger": "^1.0.0", + "@opentelemetry/api": "^1.9.0", + "@opentelemetry/core": "^1.25.1", + "@opentelemetry/instrumentation": "^0.52.1", + "tslib": "^2.2.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", + "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", + "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.25.6" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/types": { + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", + "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.24.8", + "@babel/helper-validator-identifier": "^7.24.7", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@bmewburn/js-beautify": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.15.2.tgz", + "integrity": "sha512-TGLBQLYEow0ncfCap5ZSTeU7z/LlUemNvwirys5la3A44P+NZVIvuJSFCbo8+Sjsau/nthTLuwe76oiSthvm7Q==", + "license": "MIT", + "dependencies": { + "config-chain": "^1.1.13", + "editorconfig": "^1.0.4", + "glob": "^10.3.3", + "js-cookie": "^3.0.5", + "nopt": "^7.2.0" + }, + "bin": { + "css-beautify": "js/bin/css-beautify.js", + "html-beautify": "js/bin/html-beautify.js", + "js-beautify": "js/bin/js-beautify.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@bmewburn/vscode-html-languageserver": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.11.0.tgz", + "integrity": "sha512-9uyCkXlu5eHyQB4Knux5mHJzuAglJXoix7B8i8xxurM+03lhSJz3QJ9LeBTP2YSSCnE/vTu4vCXDGDzANA4R7g==", + "license": "MIT", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "typescript": "^5.4.5", + "vscode-css-languageservice": "^6.2.14", + "vscode-html-languageservice": "^5.2.0", + "vscode-languageserver": "^9.0.1", + "vscode-languageserver-protocol": "~3.17.5", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-types": "~3.17.5", + "vscode-uri": "^3.0.8" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@discoveryjs/json-ext": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", + "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.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": ">=12" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", + "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@jsdoc/salty": { + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.8.tgz", + "integrity": "sha512-5e+SFVavj1ORKlKaKr2BmTOekmXbelU7dC0cDkQLqag7xfuTPuGMUFx7KWJuv4bYZrTsoL2Z18VVCOKYxzoHcg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "lodash": "^4.17.21" + }, + "engines": { + "node": ">=v12.0.0" + } + }, + "node_modules/@microsoft/applicationinsights-web-snippet": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.2.1.tgz", + "integrity": "sha512-+Cy9zFqdQgdAbMK1dpm7B+3DUnrByai0Tq6XG9v737HJpW6G1EiNNbTuFeXdPWyGaq6FIx9jxm/SUcxA6/Rxxg==", + "license": "MIT" + }, + "node_modules/@mixmark-io/domino": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@mixmark-io/domino/-/domino-2.2.0.tgz", + "integrity": "sha512-Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw==", + "license": "BSD-2-Clause" + }, + "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==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@one-ini/wasm": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz", + "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==", + "license": "MIT" + }, + "node_modules/@opentelemetry/api": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", + "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==", + "license": "Apache-2.0", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/@opentelemetry/api-logs": { + "version": "0.52.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.52.1.tgz", + "integrity": "sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/api": "^1.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@opentelemetry/core": { + "version": "1.26.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.26.0.tgz", + "integrity": "sha512-1iKxXXE8415Cdv0yjG3G6hQnB5eVEsJce3QaawX8SjDn0mAS0ZM8fAbZZJD4ajvhC15cePvosSCut404KrIIvQ==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.27.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/instrumentation": { + "version": "0.52.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.52.1.tgz", + "integrity": "sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/api-logs": "0.52.1", + "@types/shimmer": "^1.0.2", + "import-in-the-middle": "^1.8.1", + "require-in-the-middle": "^7.1.1", + "semver": "^7.5.2", + "shimmer": "^1.2.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/resources": { + "version": "1.26.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.26.0.tgz", + "integrity": "sha512-CPNYchBE7MBecCSVy0HKpUISEeJOniWqcHaAHpmasZ3j9o6V3AyBzhRc90jdmemq0HOxDr6ylhUbDhBqqPpeNw==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "1.26.0", + "@opentelemetry/semantic-conventions": "1.27.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/sdk-trace-base": { + "version": "1.26.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.26.0.tgz", + "integrity": "sha512-olWQldtvbK4v22ymrKLbIcBi9L2SpMO84sCPY54IVsJhP9fRsxJT194C/AVaAuJzLE30EdhhM1VmvVYR7az+cw==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "1.26.0", + "@opentelemetry/resources": "1.26.0", + "@opentelemetry/semantic-conventions": "1.27.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.10.0" + } + }, + "node_modules/@opentelemetry/semantic-conventions": { + "version": "1.27.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz", + "integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==", + "license": "BSD-3-Clause" + }, + "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==", + "license": "BSD-3-Clause", + "dependencies": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==", + "license": "BSD-3-Clause" + }, + "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" + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==", + "license": "BSD-3-Clause" + }, + "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==", + "license": "BSD-3-Clause" + }, + "node_modules/@selderee/plugin-htmlparser2": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.11.0.tgz", + "integrity": "sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==", + "license": "MIT", + "dependencies": { + "domhandler": "^5.0.3", + "selderee": "^0.11.0" + }, + "funding": { + "url": "https://ko-fi.com/killymxi" + } + }, + "node_modules/@sindresorhus/merge-streams": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", + "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@sinonjs/commons": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/commons/node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz", + "integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.0" + } + }, + "node_modules/@sinonjs/samsam": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz", + "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1", + "lodash.get": "^4.4.2", + "type-detect": "^4.1.0" + } + }, + "node_modules/@sinonjs/text-encoding": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", + "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", + "dev": true, + "license": "(Unlicense OR Apache-2.0)" + }, + "node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tootallnate/quickjs-emscripten": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", + "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==", + "license": "MIT" + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/braces": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/braces/-/braces-3.0.4.tgz", + "integrity": "sha512-0WR3b8eaISjEW7RpZnclONaLFDf7buaowRHdqLp4vLj54AsSAYWfh3DRbfiYJY9XDxMgx1B4sE1Afw2PGpuHOA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/caseless": { + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.5.tgz", + "integrity": "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/chai": { + "version": "4.3.19", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.19.tgz", + "integrity": "sha512-2hHHvQBVE2FiSK4eN0Br6snX9MtolHaTo/batnLjlGRhoQzlCL61iVpxoqO7SfFyOw+P/pwv+0zNHzKoGWz9Cw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/eslint": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, + "node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/fs-extra": { + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz", + "integrity": "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/jsonfile": "*", + "@types/node": "*" + } + }, + "node_modules/@types/html-to-text": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@types/html-to-text/-/html-to-text-9.0.4.tgz", + "integrity": "sha512-pUY3cKH/Nm2yYrEmDlPR1mR7yszjGx4DrwPjQ702C4/D5CwHuZTgZdIdwPkRbcuhs7BAh2L5rg3CL5cbRiGTCQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/js-beautify": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/@types/js-beautify/-/js-beautify-1.14.3.tgz", + "integrity": "sha512-FMbQHz+qd9DoGvgLHxeqqVPaNRffpIu5ZjozwV8hf9JAGpIOzuAf4wGbRSo8LNITHqGjmmVjaMggTT5P4v4IHg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/jsonfile": { + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.4.tgz", + "integrity": "sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/linkify-it": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz", + "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/markdown-it": { + "version": "14.1.2", + "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz", + "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/linkify-it": "^5", + "@types/mdurl": "^2" + } + }, + "node_modules/@types/mdurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/micromatch": { + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.9.tgz", + "integrity": "sha512-7V+8ncr22h4UoYRLnLXSpTxjQrNUXtWHGeMPRJt1nULXI57G9bIcpyrHlmrQ7QK24EyyuXvYcSSWAM8GA9nqCg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/braces": "*" + } + }, + "node_modules/@types/mocha": { + "version": "10.0.8", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.8.tgz", + "integrity": "sha512-HfMcUmy9hTMJh66VNcmeC9iVErIZJli2bszuXc6julh5YGuRb/W5OnkHjwLNYdFlMis0sY3If5SEAp+PktdJjw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "20.16.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz", + "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==", + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.2" + } + }, + "node_modules/@types/request": { + "version": "2.48.12", + "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.12.tgz", + "integrity": "sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/caseless": "*", + "@types/node": "*", + "@types/tough-cookie": "*", + "form-data": "^2.5.0" + } + }, + "node_modules/@types/semver": { + "version": "7.5.8", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/shimmer": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.2.0.tgz", + "integrity": "sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==", + "license": "MIT" + }, + "node_modules/@types/sinon": { + "version": "17.0.3", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.3.tgz", + "integrity": "sha512-j3uovdn8ewky9kRBG19bOwaZbexJu/XjtkHyjvUgt4xfPFz18dcORIMqnYh66Fx3Powhcr85NT5+er3+oViapw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/sinonjs__fake-timers": "*" + } + }, + "node_modules/@types/sinonjs__fake-timers": { + "version": "8.1.5", + "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz", + "integrity": "sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/tough-cookie": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz", + "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@vscode/l10n": { + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", + "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==", + "license": "MIT" + }, + "node_modules/@webassemblyjs/ast": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", + "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + } + }, + "node_modules/@webassemblyjs/floating-point-hex-parser": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@webassemblyjs/helper-api-error": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@webassemblyjs/helper-buffer": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", + "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@webassemblyjs/helper-numbers": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@webassemblyjs/helper-wasm-section": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", + "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.12.1" + } + }, + "node_modules/@webassemblyjs/ieee754": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "node_modules/@webassemblyjs/leb128": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/utf8": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@webassemblyjs/wasm-edit": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", + "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-opt": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1", + "@webassemblyjs/wast-printer": "1.12.1" + } + }, + "node_modules/@webassemblyjs/wasm-gen": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", + "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wasm-opt": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", + "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1" + } + }, + "node_modules/@webassemblyjs/wasm-parser": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", + "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wast-printer": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", + "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webpack-cli/configtest": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz", + "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "node_modules/@webpack-cli/info": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz", + "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + } + }, + "node_modules/@webpack-cli/serve": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz", + "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.15.0" + }, + "peerDependencies": { + "webpack": "5.x.x", + "webpack-cli": "5.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "node_modules/@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@xtuc/long": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/acorn": { + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", + "license": "MIT", + "peerDependencies": { + "acorn": "^8" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/ajv": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "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/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/applicationinsights": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-2.7.3.tgz", + "integrity": "sha512-JY8+kTEkjbA+kAVNWDtpfW2lqsrDALfDXuxOs74KLPu2y13fy/9WB52V4LfYVTVcW1/jYOXjTxNS2gPZIDh1iw==", + "license": "MIT", + "dependencies": { + "@azure/core-auth": "^1.5.0", + "@azure/core-rest-pipeline": "1.10.1", + "@azure/core-util": "1.2.0", + "@azure/opentelemetry-instrumentation-azure-sdk": "^1.0.0-beta.5", + "@microsoft/applicationinsights-web-snippet": "^1.0.1", + "@opentelemetry/api": "^1.4.1", + "@opentelemetry/core": "^1.15.2", + "@opentelemetry/sdk-trace-base": "^1.15.2", + "@opentelemetry/semantic-conventions": "^1.15.2", + "cls-hooked": "^4.2.2", + "continuation-local-storage": "^3.2.1", + "diagnostic-channel": "1.1.1", + "diagnostic-channel-publishers": "1.0.7" + }, + "engines": { + "node": ">=8.0.0" + }, + "peerDependencies": { + "applicationinsights-native-metrics": "*" + }, + "peerDependenciesMeta": { + "applicationinsights-native-metrics": { + "optional": true + } + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true, + "license": "MIT" + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/ast-types": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz", + "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/async-hook-jl": { + "version": "1.7.6", + "resolved": "https://registry.npmjs.org/async-hook-jl/-/async-hook-jl-1.7.6.tgz", + "integrity": "sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==", + "license": "MIT", + "dependencies": { + "stack-chain": "^1.3.7" + }, + "engines": { + "node": "^4.7 || >=6.9 || >=7.3" + } + }, + "node_modules/async-listener": { + "version": "0.6.10", + "resolved": "https://registry.npmjs.org/async-listener/-/async-listener-0.6.10.tgz", + "integrity": "sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==", + "license": "BSD-2-Clause", + "dependencies": { + "semver": "^5.3.0", + "shimmer": "^1.1.0" + }, + "engines": { + "node": "<=0.11.8 || >0.11.10" + } + }, + "node_modules/async-listener/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" + }, + "node_modules/banner-webpack-plugin": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/banner-webpack-plugin/-/banner-webpack-plugin-0.2.3.tgz", + "integrity": "sha512-ixXfB9nmsDKidoFnM9mbXleZ6mveajZRgxIsl4xPLcWjLohia6cxlbzh9STWwVQBDRIUvD/pW4UTNIED9IUSQw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4.0.0", + "npm": ">=3.0.0" + } + }, + "node_modules/basic-ftp": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz", + "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==", + "license": "MIT", + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "dev": true, + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true, + "license": "ISC" + }, + "node_modules/browserslist": { + "version": "4.23.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", + "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "caniuse-lite": "^1.0.30001646", + "electron-to-chromium": "^1.5.4", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001660", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz", + "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/catharsis": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz", + "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.17.15" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/chai": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz", + "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", + "pathval": "^1.1.1", + "type-detect": "^4.0.8" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chalk/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/check-error": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-func-name": "^2.0.2" + }, + "engines": { + "node": "*" + } + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "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" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/chrome-trace-event": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz", + "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0" + } + }, + "node_modules/cjs-module-lexer": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz", + "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==", + "license": "MIT" + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/cls-hooked": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/cls-hooked/-/cls-hooked-4.2.2.tgz", + "integrity": "sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==", + "license": "BSD-2-Clause", + "dependencies": { + "async-hook-jl": "^1.7.6", + "emitter-listener": "^1.0.1", + "semver": "^5.4.1" + }, + "engines": { + "node": "^4.7 || >=6.9 || >=7.3 || >=8.2.1" + } + }, + "node_modules/cls-hooked/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/colorette": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/config-chain": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", + "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", + "license": "MIT", + "dependencies": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, + "node_modules/continuation-local-storage": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz", + "integrity": "sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==", + "license": "BSD-2-Clause", + "dependencies": { + "async-listener": "^0.6.0", + "emitter-listener": "^1.1.1" + } + }, + "node_modules/copy-webpack-plugin": { + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz", + "integrity": "sha512-SNwdBeHyII+rWvee/bTnAYyO8vfVdcSTud4EIb6jcZ8inLeWucJE0DnxXQBjlQ5zlteuuvooGQy3LIyGxhvlOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-glob": "^3.3.2", + "glob-parent": "^6.0.1", + "globby": "^14.0.0", + "normalize-path": "^3.0.0", + "schema-utils": "^4.2.0", + "serialize-javascript": "^6.0.2" + }, + "engines": { + "node": ">= 18.12.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + } + }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/data-uri-to-buffer": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz", + "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==", + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, + "node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-eql": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz", + "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-detect": "^4.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/degenerator": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz", + "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==", + "license": "MIT", + "dependencies": { + "ast-types": "^0.13.4", + "escodegen": "^2.1.0", + "esprima": "^4.0.1" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/degenerator/node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/diagnostic-channel": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-1.1.1.tgz", + "integrity": "sha512-r2HV5qFkUICyoaKlBEpLKHjxMXATUf/l+h8UZPGBHGLy4DDiY2sOLcIctax4eRnTw5wH2jTMExLntGPJ8eOJxw==", + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + } + }, + "node_modules/diagnostic-channel-publishers": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.7.tgz", + "integrity": "sha512-SEECbY5AiVt6DfLkhkaHNeshg1CogdLLANA8xlG/TKvS+XUgvIKl7VspJGYiEdL5OUyzMVnr7o0AwB7f+/Mjtg==", + "license": "MIT", + "peerDependencies": { + "diagnostic-channel": "*" + } + }, + "node_modules/diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dom-serializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "BSD-2-Clause" + }, + "node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "license": "BSD-2-Clause", + "dependencies": { + "domelementtype": "^2.3.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "license": "BSD-2-Clause", + "dependencies": { + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "license": "MIT" + }, + "node_modules/editorconfig": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz", + "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==", + "license": "MIT", + "dependencies": { + "@one-ini/wasm": "0.1.1", + "commander": "^10.0.0", + "minimatch": "9.0.1", + "semver": "^7.5.3" + }, + "bin": { + "editorconfig": "bin/editorconfig" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.5.24", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.24.tgz", + "integrity": "sha512-0x0wLCmpdKFCi9ulhvYZebgcPmHTkFVUfU2wzDykadkslKwT4oAmDTHEKLnlrDsMGZe4B+ksn8quZfZjYsBetA==", + "dev": true, + "license": "ISC" + }, + "node_modules/emitter-listener": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.1.2.tgz", + "integrity": "sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==", + "license": "BSD-2-Clause", + "dependencies": { + "shimmer": "^1.2.0" + } + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "license": "MIT" + }, + "node_modules/enhanced-resolve": { + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/envinfo": { + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz", + "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==", + "dev": true, + "license": "MIT", + "bin": { + "envinfo": "dist/cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/es-module-lexer": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", + "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", + "dev": true, + "license": "MIT" + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=4.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/escodegen/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/eslint-scope/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.x" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "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.4" + }, + "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", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-uri": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", + "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastest-levenshtein": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4.9.1" + } + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "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", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "license": "BSD-3-Clause", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/foreground-child": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/form-data": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", + "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "dev": true, + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/fs-extra": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/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/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/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-func-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/get-uri": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz", + "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==", + "license": "MIT", + "dependencies": { + "basic-ftp": "^5.0.2", + "data-uri-to-buffer": "^6.0.2", + "debug": "^4.3.4", + "fs-extra": "^11.2.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/glob-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/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/globby": { + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz", + "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sindresorhus/merge-streams": "^2.1.0", + "fast-glob": "^3.3.2", + "ignore": "^5.2.4", + "path-type": "^5.0.0", + "slash": "^5.1.0", + "unicorn-magic": "^0.1.0" + }, + "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==", + "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/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "license": "MIT", + "bin": { + "he": "bin/he" + } + }, + "node_modules/html-to-text": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.5.tgz", + "integrity": "sha512-qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg==", + "license": "MIT", + "dependencies": { + "@selderee/plugin-htmlparser2": "^0.11.0", + "deepmerge": "^4.3.1", + "dom-serializer": "^2.0.0", + "htmlparser2": "^8.0.2", + "selderee": "^0.11.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/htmlparser2": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", + "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "entities": "^4.4.0" + } + }, + "node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "license": "MIT", + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-in-the-middle": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.11.0.tgz", + "integrity": "sha512-5DimNQGoe0pLUHbR9qK84iWaWjjbsxiqXnw6Qz64+azRgleqv9k2kTt5fw7QsOpmaGYtuxxursnPPsnTKEx10Q==", + "license": "Apache-2.0", + "dependencies": { + "acorn": "^8.8.2", + "acorn-import-attributes": "^1.9.5", + "cjs-module-lexer": "^1.2.2", + "module-details-from-path": "^1.0.3" + } + }, + "node_modules/import-local": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", + "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", + "dev": true, + "license": "MIT", + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "license": "ISC" + }, + "node_modules/interpret": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", + "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "license": "MIT", + "dependencies": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, + "engines": { + "node": ">= 12" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-core-module": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", + "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==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "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-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, + "license": "MIT", + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" + }, + "node_modules/isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/jest-worker": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/js-cookie": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", + "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/js2xmlparser": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz", + "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "xmlcreate": "^2.0.4" + } + }, + "node_modules/jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", + "license": "MIT" + }, + "node_modules/jsdoc": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.3.tgz", + "integrity": "sha512-Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/parser": "^7.20.15", + "@jsdoc/salty": "^0.2.1", + "@types/markdown-it": "^14.1.1", + "bluebird": "^3.7.2", + "catharsis": "^0.9.0", + "escape-string-regexp": "^2.0.0", + "js2xmlparser": "^4.0.2", + "klaw": "^3.0.0", + "markdown-it": "^14.1.0", + "markdown-it-anchor": "^8.6.7", + "marked": "^4.0.10", + "mkdirp": "^1.0.4", + "requizzle": "^0.2.3", + "strip-json-comments": "^3.1.0", + "underscore": "~1.13.2" + }, + "bin": { + "jsdoc": "jsdoc.js" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/jsdoc/node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "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/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/just-extend": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", + "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", + "dev": true, + "license": "MIT" + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/klaw": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz", + "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.9" + } + }, + "node_modules/leac": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz", + "integrity": "sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==", + "license": "MIT", + "funding": { + "url": "https://ko-fi.com/killymxi" + } + }, + "node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/linkify-it": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", + "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "uc.micro": "^2.0.0" + } + }, + "node_modules/loader-runner": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.11.5" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/long": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", + "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==", + "license": "Apache-2.0" + }, + "node_modules/loupe": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-func-name": "^2.0.1" + } + }, + "node_modules/lru-cache": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", + "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", + "license": "ISC", + "engines": { + "node": "14 || >=16.14" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true, + "license": "ISC" + }, + "node_modules/markdown-it": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", + "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1", + "entities": "^4.4.0", + "linkify-it": "^5.0.0", + "mdurl": "^2.0.0", + "punycode.js": "^2.3.1", + "uc.micro": "^2.1.0" + }, + "bin": { + "markdown-it": "bin/markdown-it.mjs" + } + }, + "node_modules/markdown-it-anchor": { + "version": "8.6.7", + "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz", + "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==", + "dev": true, + "license": "Unlicense", + "peerDependencies": { + "@types/markdown-it": "*", + "markdown-it": "*" + } + }, + "node_modules/marked": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz", + "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==", + "dev": true, + "license": "MIT", + "bin": { + "marked": "bin/marked.js" + }, + "engines": { + "node": ">= 12" + } + }, + "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==", + "dev": true, + "license": "MIT" + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true, + "license": "MIT" + }, + "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/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimatch": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz", + "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz", + "integrity": "sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.3", + "debug": "4.3.4", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "8.1.0", + "he": "1.2.0", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "5.0.1", + "ms": "2.1.3", + "serialize-javascript": "6.0.0", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "workerpool": "6.2.1", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha.js" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/mocha/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/mocha/node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/mocha/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/mocha/node_modules/minimatch": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha/node_modules/serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/module-details-from-path": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz", + "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==", + "license": "MIT" + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/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==", + "dev": true, + "license": "MIT" + }, + "node_modules/netmask": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", + "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==", + "license": "MIT", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/nise": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz", + "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.1", + "@sinonjs/text-encoding": "^0.7.3", + "just-extend": "^6.2.0", + "path-to-regexp": "^8.1.0" + } + }, + "node_modules/nise/node_modules/@sinonjs/fake-timers": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.2.tgz", + "integrity": "sha512-4Bb+oqXZTSTZ1q27Izly9lv8B9dlV61CROxPiVtywwzv5SnytJqhvYe6FclHYuXml4cd1VHPo1zd5PmTeJozvA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1" + } + }, + "node_modules/node-releases": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "dev": true, + "license": "MIT" + }, + "node_modules/nopt": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "license": "ISC", + "dependencies": { + "abbrev": "^2.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/pac-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz", + "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==", + "license": "MIT", + "dependencies": { + "@tootallnate/quickjs-emscripten": "^0.23.0", + "agent-base": "^7.0.2", + "debug": "^4.3.4", + "get-uri": "^6.0.1", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.5", + "pac-resolver": "^7.0.1", + "socks-proxy-agent": "^8.0.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/pac-proxy-agent/node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "license": "MIT", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/pac-resolver": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz", + "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==", + "license": "MIT", + "dependencies": { + "degenerator": "^5.0.0", + "netmask": "^2.0.2" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "license": "BlueOak-1.0.0" + }, + "node_modules/parseley": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/parseley/-/parseley-0.12.1.tgz", + "integrity": "sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==", + "license": "MIT", + "dependencies": { + "leac": "^0.6.0", + "peberminta": "^0.9.0" + }, + "funding": { + "url": "https://ko-fi.com/killymxi" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "license": "MIT" + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-to-regexp": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.1.0.tgz", + "integrity": "sha512-Bqn3vc8CMHty6zuD+tG23s6v2kwxslHEhTj4eYaVKGIEB+YX/2wd0/rgXLFD9G9id9KCtbVy/3ZgmvZjpa0UdQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + } + }, + "node_modules/path-type": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", + "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pathval": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/peberminta": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/peberminta/-/peberminta-0.9.0.tgz", + "integrity": "sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==", + "license": "MIT", + "funding": { + "url": "https://ko-fi.com/killymxi" + } + }, + "node_modules/picocolors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", + "license": "ISC" + }, + "node_modules/protobufjs": { + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.3.tgz", + "integrity": "sha512-HaYi2CVjiPoBR1d2zTVKVHXr9IUnpJizCjUu19vxdD3B8o4z+vfOHpIEB1358w8nv8dfUNEfDHFvMsH7QlLt/Q==", + "hasInstallScript": true, + "license": "BSD-3-Clause", + "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/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/node": ">=13.7.0", + "long": "^5.0.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/protobufjs-cli": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.1.3.tgz", + "integrity": "sha512-MqD10lqF+FMsOayFiNOdOGNlXc4iKDCf0ZQPkPR+gizYh9gqUeGTWulABUCdI+N67w5RfJ6xhgX4J8pa8qmMXQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "chalk": "^4.0.0", + "escodegen": "^1.13.0", + "espree": "^9.0.0", + "estraverse": "^5.1.0", + "glob": "^8.0.0", + "jsdoc": "^4.0.0", + "minimist": "^1.2.0", + "semver": "^7.1.2", + "tmp": "^0.2.1", + "uglify-js": "^3.7.7" + }, + "bin": { + "pbjs": "bin/pbjs", + "pbts": "bin/pbts" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "protobufjs": "^7.0.0" + } + }, + "node_modules/protobufjs-cli/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/protobufjs-cli/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/proxy-agent": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz", + "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "^4.3.4", + "http-proxy-agent": "^7.0.1", + "https-proxy-agent": "^7.0.3", + "lru-cache": "^7.14.1", + "pac-proxy-agent": "^7.0.1", + "proxy-from-env": "^1.1.0", + "socks-proxy-agent": "^8.0.2" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/proxy-agent/node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "license": "MIT", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/proxy-agent/node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/proxy-agent/node_modules/https-proxy-agent": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/proxy-agent/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/punycode.js": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", + "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "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/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/rechoir": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", + "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-in-the-middle": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.4.0.tgz", + "integrity": "sha512-X34iHADNbNDfr6OTStIAHWSAvvKQRYgLO6duASaVf7J2VA3lvmNYboAHOuLC2huav1IwgZJtyEcJCKVzFxOSMQ==", + "license": "MIT", + "dependencies": { + "debug": "^4.3.5", + "module-details-from-path": "^1.0.3", + "resolve": "^1.22.8" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/requizzle": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz", + "integrity": "sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.17.21" + } + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "license": "MIT", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/schema-utils": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "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": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/selderee": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/selderee/-/selderee-0.11.0.tgz", + "integrity": "sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==", + "license": "MIT", + "dependencies": { + "parseley": "^0.12.0" + }, + "funding": { + "url": "https://ko-fi.com/killymxi" + } + }, + "node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "dev": true, + "license": "MIT", + "dependencies": { + "kind-of": "^6.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/shimmer": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz", + "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==", + "license": "BSD-2-Clause" + }, + "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/sinon": { + "version": "18.0.1", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-18.0.1.tgz", + "integrity": "sha512-a2N2TDY1uGviajJ6r4D1CyRAkzE9NNVlYOV1wX5xQDuAk0ONgzgRl0EjCQuRCPxOwp13ghsMwt9Gdldujs39qw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "11.2.2", + "@sinonjs/samsam": "^8.0.0", + "diff": "^5.2.0", + "nise": "^6.0.0", + "supports-color": "^7" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/sinon" + } + }, + "node_modules/sinon/node_modules/diff": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/sinon/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/slash": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", + "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "license": "MIT", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", + "license": "MIT", + "dependencies": { + "ip-address": "^9.0.5", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.1", + "debug": "^4.3.4", + "socks": "^2.8.3" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/socks-proxy-agent/node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "license": "MIT", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "devOptional": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "license": "BSD-3-Clause" + }, + "node_modules/stack-chain": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz", + "integrity": "sha512-D8cWtWVdIe/jBA7v5p5Hwl5yOSOrmZPWDPe2KxQ5UAGD+nxbxU0lKXA4h85Ta6+qgdKVL3vUxsbIZjc1kBG7ug==", + "license": "MIT" + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/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==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-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==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/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/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/terser": { + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.32.0.tgz", + "integrity": "sha512-v3Gtw3IzpBJ0ugkxEX8U0W6+TnPKRRCWGh1jC/iM/e3Ki5+qvO1L1EAZ56bZasc64aXHwRHNIQEzm6//i5cemQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/terser-webpack-plugin": { + "version": "5.3.10", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", + "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.20", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.26.0" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, + "node_modules/terser-webpack-plugin/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "ajv": "^6.9.1" + } + }, + "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/terser-webpack-plugin/node_modules/schema-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + }, + "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", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/tmp": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.14" + } + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "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==", + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/ts-loader": { + "version": "9.5.1", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz", + "integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "enhanced-resolve": "^5.0.0", + "micromatch": "^4.0.0", + "semver": "^7.3.4", + "source-map": "^0.7.4" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "typescript": "*", + "webpack": "^5.0.0" + } + }, + "node_modules/ts-loader/node_modules/source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">= 8" + } + }, + "node_modules/ts-node": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/ts-node/node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/tslib": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "license": "0BSD" + }, + "node_modules/turndown": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/turndown/-/turndown-7.2.0.tgz", + "integrity": "sha512-eCZGBN4nNNqM9Owkv9HAtWRYfLA4h909E/WGAWWBpmB275ehNhZyk87/Tpvjbp0jjNl9XwCsbe6bm6CqFsgD+A==", + "license": "MIT", + "dependencies": { + "@mixmark-io/domino": "^2.2.0" + } + }, + "node_modules/turndown-plugin-gfm": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.2.tgz", + "integrity": "sha512-vwz9tfvF7XN/jE0dGoBei3FXWuvll78ohzCZQuOb+ZjWrs3a0XhQVomJEb2Qh4VHTPNRO4GPZh0V7VRbiWwkRg==", + "license": "MIT" + }, + "node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/typescript": { + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "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" + }, + "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==", + "dev": true, + "license": "BSD-2-Clause", + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/underscore": { + "version": "1.13.7", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz", + "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==", + "dev": true, + "license": "MIT" + }, + "node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "license": "MIT" + }, + "node_modules/unicorn-magic": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", + "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", + "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.1.2", + "picocolors": "^1.0.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/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", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true, + "license": "MIT" + }, + "node_modules/vscode-css-languageservice": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.1.tgz", + "integrity": "sha512-1BzTBuJfwMc3A0uX4JBdJgoxp74cjj4q2mDJdp49yD/GuAq4X0k5WtK6fNcMYr+FfJ9nqgR6lpfCSZDkARJ5qQ==", + "license": "MIT", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "vscode-languageserver-textdocument": "^1.0.12", + "vscode-languageserver-types": "3.17.5", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/vscode-html-languageservice": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.1.tgz", + "integrity": "sha512-ysUh4hFeW/WOWz/TO9gm08xigiSsV/FOAZ+DolgJfeLftna54YdmZ4A+lIn46RbdO3/Qv5QHTn1ZGqmrXQhZyA==", + "license": "MIT", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "vscode-languageserver-textdocument": "^1.0.12", + "vscode-languageserver-types": "^3.17.5", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/vscode-jsonrpc": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/vscode-languageserver": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz", + "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==", + "license": "MIT", + "dependencies": { + "vscode-languageserver-protocol": "3.17.5" + }, + "bin": { + "installServerIntoExtension": "bin/installServerIntoExtension" + } + }, + "node_modules/vscode-languageserver-protocol": { + "version": "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==", + "license": "MIT", + "dependencies": { + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" + } + }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", + "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==", + "license": "MIT" + }, + "node_modules/vscode-languageserver-types": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", + "license": "MIT" + }, + "node_modules/vscode-uri": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz", + "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==", + "license": "MIT" + }, + "node_modules/watchpack": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", + "dev": true, + "license": "MIT", + "dependencies": { + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/webpack": { + "version": "5.92.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz", + "integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", + "acorn": "^8.7.1", + "acorn-import-attributes": "^1.9.5", + "browserslist": "^4.21.10", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.17.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.11", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", + "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "node_modules/webpack-cli": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", + "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", + "colorette": "^2.0.14", + "commander": "^10.0.1", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^3.1.1", + "rechoir": "^0.8.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true + }, + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { + "optional": true + } + } + }, + "node_modules/webpack-merge": { + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz", + "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/webpack-sources": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/webpack/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/webpack/node_modules/ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "ajv": "^6.9.1" + } + }, + "node_modules/webpack/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/webpack/node_modules/schema-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wildcard": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/workerpool": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", + "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/xmlcreate": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz", + "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/pkgs/by-name/in/intelephense/package.nix b/pkgs/by-name/in/intelephense/package.nix new file mode 100644 index 0000000000000..21d561e108b07 --- /dev/null +++ b/pkgs/by-name/in/intelephense/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildNpmPackage, + fetchurl, + nix-update-script, +}: +let + version = "1.12.6"; +in +buildNpmPackage { + pname = "intelephense"; + inherit version; + + src = fetchurl { + url = "https://registry.npmjs.org/intelephense/-/intelephense-${version}.tgz"; + hash = "sha256-p2x5Ayipoxk77x0v+zRhg86dbRHuBBk1Iegk/FaZrU4="; + }; + + postPatch = '' + cp ${./package-lock.json} package-lock.json + ''; + + npmDepsHash = "sha256-C60qxPuaiJZ8uQDfDwY+KJUHhXMioPrHnDNJ0bH7N9o="; + + dontNpmBuild = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Professional PHP tooling for any Language Server Protocol capable editor"; + homepage = "https://intelephense.com/"; + license = lib.licenses.unfree; + mainProgram = "intelephense"; + maintainers = with lib.maintainers; [ patka ]; + }; +} diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/by-name/in/intercal/package.nix similarity index 100% rename from pkgs/development/compilers/intercal/default.nix rename to pkgs/by-name/in/intercal/package.nix diff --git a/pkgs/by-name/in/inv-sig-helper/package.nix b/pkgs/by-name/in/inv-sig-helper/package.nix new file mode 100644 index 0000000000000..31f78a23b5f71 --- /dev/null +++ b/pkgs/by-name/in/inv-sig-helper/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + + # nativeBuildInputs + pkg-config, + + # buildInputs + openssl, + darwin, +}: + +rustPlatform.buildRustPackage { + pname = "inv-sig-helper"; + version = "0-unstable-2024-08-17"; + + src = fetchFromGitHub { + owner = "iv-org"; + repo = "inv_sig_helper"; + rev = "215d32c76e5e9e598de6e4f8542316f80dd92f57"; + hash = "sha256-Ge0XoWrscyZSrkmtDPkAnv96IVylKZTcgGgonbFV43I="; + }; + + cargoHash = "sha256-JVpLUhNJ7/4WZwLn/zOurpP8kF5WblF3nphJh6keHG8="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + meta = { + description = "Rust service that decrypts YouTube signatures and manages player information"; + homepage = "https://github.com/iv-org/inv_sig_helper"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "inv_sig_helper_rust"; + }; +} diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index d61e0076f957a..5ac25de4e2a28 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -2,29 +2,33 @@ lib, buildGoModule, fetchFromGitLab, -}: let - version = "1.1"; + nix-update-script, +}: +let + version = "1.2"; in - buildGoModule { - pname = "invidious-router"; - inherit version; +buildGoModule { + pname = "invidious-router"; + inherit version; - src = fetchFromGitLab { - owner = "gaincoder"; - repo = "invidious-router"; - rev = version; - hash = "sha256-t8KQqMPkBbVis1odDcSu+H0uvyvoFqCmtWoHqVRxmfc="; - }; + src = fetchFromGitLab { + owner = "gaincoder"; + repo = "invidious-router"; + rev = "refs/tags/${version}"; + hash = "sha256-YcMtZq4VMHr6XqHcsAAEmMF6jF1j1wb7Lq4EK42QAEo="; + }; - vendorHash = "sha256-c03vYidm8SkoesRVQZdg/bCp9LIpdTmpXdfwInlHBKk="; + vendorHash = "sha256-c03vYidm8SkoesRVQZdg/bCp9LIpdTmpXdfwInlHBKk="; - doCheck = true; + passthru.updateScript = nix-update-script { }; - 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]; - maintainers = with lib.maintainers; [sils]; - mainProgram = "invidious-router"; - }; - } + doCheck = true; + + 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 ]; + maintainers = with lib.maintainers; [ sils ]; + mainProgram = "invidious-router"; + }; +} diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index 8ec3a32529074..416af017b6cdc 100644 --- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -13,7 +13,6 @@ libusb1, openssl, - ios-webkit-debug-proxy, nix-update-script, testers, }: @@ -61,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = ios-webkit-debug-proxy; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = with lib; { @@ -72,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { to MobileSafari and UIWebViews on real and simulated iOS devices. ''; homepage = "https://github.com/google/ios-webkit-debug-proxy"; + changelog = "https://github.com/google/ios-webkit-debug-proxy/releases/tag/${finalAttrs.src.rev}"; license = licenses.bsd3; mainProgram = "ios_webkit_debug_proxy"; maintainers = with maintainers; [ diff --git a/pkgs/by-name/io/iotools/package.nix b/pkgs/by-name/io/iotools/package.nix new file mode 100644 index 0000000000000..ba33fda97f5f2 --- /dev/null +++ b/pkgs/by-name/io/iotools/package.nix @@ -0,0 +1,46 @@ +{ + stdenv, + lib, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "iotools"; + version = "unstable-2017-12-11"; + + src = fetchFromGitHub { + owner = "adurbin"; + repo = pname; + rev = "18949fdc4dedb1da3f51ee83a582b112fb9f2c71"; + hash = "sha256-tlGXJn3n27mQDupMIVYDd86YaWazVwel/qs0QqCy1W8="; + }; + + makeFlags = [ + "DEBUG=0" + "STATIC=0" + ]; + + installPhase = '' + install -Dm755 iotools -t $out/bin + ''; + + meta = with lib; { + description = "Set of simple command line tools which allow access to + hardware device registers"; + longDescription = '' + Provides a set of simple command line tools which allow access to + hardware device registers. Supported register interfaces include PCI, + IO, memory mapped IO, SMBus, CPUID, and MSR. Also included are some + utilities which allow for simple arithmetic, logical, and other + operations. + ''; + homepage = "https://github.com/adurbin/iotools"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ felixsinger ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + mainProgram = "iotools"; + }; +} diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix new file mode 100644 index 0000000000000..baf3e92a60b00 --- /dev/null +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -0,0 +1,144 @@ +{ + stdenv, + lib, + fetchFromGitHub, + unstableGitUpdater, + buildPackages, + gnu-efi, + mtools, + openssl, + perl, + xorriso, + xz, + syslinux, + embedScript ? null, + additionalTargets ? { }, + additionalOptions ? [ ], +}: + +let + targets = + additionalTargets + // lib.optionalAttrs stdenv.hostPlatform.isx86_64 { + "bin-x86_64-efi/ipxe.efi" = null; + "bin-x86_64-efi/ipxe.efirom" = null; + "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb"; + "bin-x86_64-efi/snp.efi" = null; + } + // lib.optionalAttrs stdenv.hostPlatform.isx86 { + "bin/ipxe.dsk" = null; + "bin/ipxe.usb" = null; + "bin/ipxe.iso" = null; + "bin/ipxe.lkrn" = null; + "bin/undionly.kpxe" = null; + } + // lib.optionalAttrs stdenv.hostPlatform.isAarch32 { + "bin-arm32-efi/ipxe.efi" = null; + "bin-arm32-efi/ipxe.efirom" = null; + "bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb"; + "bin-arm32-efi/snp.efi" = null; + } + // lib.optionalAttrs stdenv.hostPlatform.isAarch64 { + "bin-arm64-efi/ipxe.efi" = null; + "bin-arm64-efi/ipxe.efirom" = null; + "bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb"; + "bin-arm64-efi/snp.efi" = null; + }; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "ipxe"; + version = "1.21.1-unstable-2024-09-27"; + + nativeBuildInputs = [ + gnu-efi + mtools + openssl + perl + xorriso + xz + ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + strictDeps = true; + + src = fetchFromGitHub { + owner = "ipxe"; + repo = "ipxe"; + rev = "3f4f843920afdc1d808a8b20354cf3eca481401a"; + hash = "sha256-+Zpl8xhiWrnkFVL+DLuV0N9pn6hjw5JxDMxeDmfcNS4="; + }; + + # Calling syslinux on a FAT image isn't going to work on Aarch64. + postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' + substituteInPlace src/util/genfsimg --replace " syslinux " " true " + ''; + + # Hardening is not possible due to assembler code. + hardeningDisable = [ + "pic" + "stackprotector" + ]; + + makeFlags = [ + "ECHO_E_BIN_ECHO=echo" + "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. + "CROSS=${stdenv.cc.targetPrefix}" + ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; + + enabledOptions = [ + "PING_CMD" + "IMAGE_TRUST_CMD" + "DOWNLOAD_PROTO_HTTP" + "DOWNLOAD_PROTO_HTTPS" + ] ++ additionalOptions; + + configurePhase = + '' + runHook preConfigure + for opt in ${lib.escapeShellArgs finalAttrs.enabledOptions}; do echo "#define $opt" >> src/config/general.h; done + substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo + '' + + lib.optionalString stdenv.hostPlatform.isx86 '' + substituteInPlace src/util/genfsimg --replace /usr/lib/syslinux ${syslinux}/share/syslinux + '' + + '' + runHook postConfigure + ''; + + preBuild = "cd src"; + + buildFlags = lib.attrNames targets; + + installPhase = '' + runHook preInstall + + mkdir -p $out + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList ( + from: to: if to == null then "cp -v ${from} $out" else "cp -v ${from} $out/${to}" + ) targets + )} + + # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending + # let's provide it as a symlink to be compatible in this case. + ln -s undionly.kpxe $out/undionly.kpxe.0 + + runHook postInstall + ''; + + enableParallelBuilding = true; + + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; + + meta = { + description = "Network boot firmware"; + homepage = "https://ipxe.org/"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ sigmasquadron ]; + }; +}) diff --git a/pkgs/by-name/ir/iredis/package.nix b/pkgs/by-name/ir/iredis/package.nix index 8a5956e52a69b..7521bab9d9a8c 100644 --- a/pkgs/by-name/ir/iredis/package.nix +++ b/pkgs/by-name/ir/iredis/package.nix @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { "--deselect=tests/unittests/test_render_functions.py::test_render_time" # Only execute unittests, because cli tests require a running Redis "tests/unittests/" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Flaky tests "--deselect=tests/unittests/test_entry.py::test_command_shell_options_higher_priority" "--deselect=tests/unittests/test_utils.py::test_timer" diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index 1b4c49e57dd06..1161e9a881e5d 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "irpf"; - version = "2024-1.3"; + version = "2024-1.4"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { year = lib.head (lib.splitVersion finalAttrs.version); in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip"; - hash = "sha256-UMzoQSSlmOi7TIqPF0vfeelum5JSa6ne4c7ZFREuDr8="; + hash = "sha256-223PZyGlLSK5GzR143IlGzhmJlXmvtBdscC2roPiQhc="; }; passthru.updateScript = writeScript "update-irpf" '' diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix index f2e4b2f5103c8..7f60b7aec8d6a 100644 --- a/pkgs/by-name/ir/irust/package.nix +++ b/pkgs/by-name/ir/irust/package.nix @@ -21,16 +21,16 @@ rustPlatform.buildRustPackage rec { pname = "irust"; - version = "1.71.23"; + version = "1.71.24"; src = fetchFromGitHub { owner = "sigmaSd"; repo = "IRust"; rev = "irust@${version}"; - hash = "sha256-+kl22m2Is8CdLlqGSFOglw4/fM1exayaMH05YSuTsbw="; + hash = "sha256-L9iSTa0KlAXVYA1PgLaxB0eHoOGrzGE49Km3jBq4jWo="; }; - cargoHash = "sha256-4aQ1IOTcUAkgiQucUG8cg9pVShtlu2IJeqNCGO+6VYY="; + cargoHash = "sha256-nF6tmA7IcgPG8EoFzwJa7zYKx9ezhpjIIa1tZLO0rvQ="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/is/isabelle/components/isabelle-linter.nix b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix index 1be4ac532d05e..bcf02c1489307 100644 --- a/pkgs/by-name/is/isabelle/components/isabelle-linter.nix +++ b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "isabelle-prover"; repo = "isabelle-linter"; rev = "Isabelle2024-v1.0.1"; - sha256 = "sha256-oTrwcfJgbkpkIweDIyc6lZjAvdS9J4agPoJgZzH+PuQ="; + hash = "sha256-oTrwcfJgbkpkIweDIyc6lZjAvdS9J4agPoJgZzH+PuQ="; }; nativeBuildInputs = [ isabelle ]; diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index 3adf58f467a3e..1012d06542ecc 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -30,7 +30,7 @@ let hash = "sha256-DB/ETVZhbT82IMZA97TmHG6gJcGpFavxDKDTwPzIF80="; }; - buildPhase = (if stdenv.isDarwin then '' + buildPhase = (if stdenv.hostPlatform.isDarwin then '' LDFLAGS="-dynamic -undefined dynamic_lookup -lSystem" '' else '' LDFLAGS="-fPIC -shared" @@ -52,7 +52,7 @@ in stdenv.mkDerivation (finalAttrs: rec { dirname = "Isabelle${version}"; src = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then fetchurl { @@ -74,14 +74,14 @@ in stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ java ]; buildInputs = [ polyml veriT vampire eprover-ho nettools ] - ++ lib.optionals (!stdenv.isDarwin) [ java procps ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ java procps ]; - sourceRoot = "${dirname}${lib.optionalString stdenv.isDarwin ".app"}"; + sourceRoot = "${dirname}${lib.optionalString stdenv.hostPlatform.isDarwin ".app"}"; doCheck = stdenv.hostPlatform.system != "aarch64-linux"; checkPhase = "bin/isabelle build -v HOL-SMT_Examples"; - postUnpack = lib.optionalString stdenv.isDarwin '' + postUnpack = lib.optionalString stdenv.hostPlatform.isDarwin '' mv $sourceRoot ${dirname} sourceRoot=${dirname} ''; @@ -144,10 +144,10 @@ in stdenv.mkDerivation (finalAttrs: rec { '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' substituteInPlace lib/scripts/isabelle-platform \ --replace-fail 'ISABELLE_APPLE_PLATFORM64=arm64-darwin' "" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' arch=${if stdenv.hostPlatform.system == "aarch64-linux" then "arm64-linux" else stdenv.hostPlatform.system} for f in contrib/*/$arch/{z3,nunchaku,spass,zipperposition}; do - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"${lib.optionalString stdenv.isAarch64 " || true"} + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"${lib.optionalString stdenv.hostPlatform.isAarch64 " || true"} done patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process for d in contrib/kodkodi-*/jni/$arch; do @@ -221,7 +221,7 @@ in stdenv.mkDerivation (finalAttrs: rec { license = licenses.bsd3; maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; passthru.withComponents = f: diff --git a/pkgs/by-name/is/isponsorblocktv/package.nix b/pkgs/by-name/is/isponsorblocktv/package.nix new file mode 100644 index 0000000000000..2ed625e7ebaa5 --- /dev/null +++ b/pkgs/by-name/is/isponsorblocktv/package.nix @@ -0,0 +1 @@ +{ python3Packages }: python3Packages.callPackage ./pypackage.nix { } diff --git a/pkgs/by-name/is/isponsorblocktv/pypackage.nix b/pkgs/by-name/is/isponsorblocktv/pypackage.nix new file mode 100644 index 0000000000000..949895763e117 --- /dev/null +++ b/pkgs/by-name/is/isponsorblocktv/pypackage.nix @@ -0,0 +1,69 @@ +{ + buildPythonApplication, + fetchFromGitHub, + lib, + hatchling, + hatch-requirements-txt, + aiohttp, + appdirs, + async-cache, + pyytlounge, + rich-click, + rich, + ssdp, + textual-slider, + textual, + xmltodict, + pythonRelaxDepsHook, +}: +buildPythonApplication rec { + pname = "iSponsorBlockTV"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "dmunozv04"; + repo = "iSponsorBlockTV"; + rev = "v${version}"; + hash = "sha256-v5NF6o+9IxusYNebs2a9fgHCHZNN9hHLQurujhmdsgU="; + }; + + pyproject = true; + + build-system = [ + hatchling + hatch-requirements-txt + ]; + + dependencies = [ + aiohttp + appdirs + async-cache + pyytlounge + rich-click + rich + ssdp + textual-slider + textual + xmltodict + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRemoveDeps = [ "argparse" ]; + + pythonRelaxDeps = [ + "aiohttp" + "pyytlounge" + "textual-slider" + "textual" + ]; + + meta = { + homepage = "https://github.com/dmunozv04/iSponsorBlockTV"; + description = "SponsorBlock client for all YouTube TV clients"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ lukegb ]; + mainProgram = "iSponsorBlockTV"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/it/itch/package.nix b/pkgs/by-name/it/itch/package.nix index e49f389babd8c..29558080375f3 100644 --- a/pkgs/by-name/it/itch/package.nix +++ b/pkgs/by-name/it/itch/package.nix @@ -91,6 +91,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper ${steam-run}/bin/steam-run $out/bin/itch \ --add-flags ${electron}/bin/electron \ --add-flags $out/share/itch/resources/app \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set BROTH_USE_LOCAL butler,itch-setup \ --prefix PATH : ${butler}:${itch-setup} ''; diff --git a/pkgs/by-name/iu/iucode-tool/package.nix b/pkgs/by-name/iu/iucode-tool/package.nix new file mode 100644 index 0000000000000..fc92bb67e6c47 --- /dev/null +++ b/pkgs/by-name/iu/iucode-tool/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + fetchpatch, + argp-standalone, +}: + +stdenv.mkDerivation rec { + pname = "iucode-tool"; + version = "2.3.1"; + + src = fetchFromGitLab { + owner = "iucode-tool"; + repo = "iucode-tool"; + rev = "v${version}"; + hash = "sha256-ajDpywgyerbvgern0b8T4jJUWisMzwrhwKO1g7iOtBE="; + }; + + patches = [ + # build fix for musl libc, pending upstream review + # https://gitlab.com/iucode-tool/iucode-tool/-/merge_requests/4 + (fetchpatch { + url = "https://gitlab.com/iucode-tool/iucode-tool/-/commit/fda4aaa4727601dbe817fac001f234c19420351a.patch"; + hash = "sha256-BxYrXALpZFyJtFrgU5jFmzd1dIMPmpNgvYArgkwGt/w="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = lib.optional stdenv.hostPlatform.isMusl argp-standalone; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Intel® 64 and IA-32 processor microcode tool"; + mainProgram = "iucode_tool"; + homepage = "https://gitlab.com/iucode-tool/iucode-tool"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ peterhoeg ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + }; +} diff --git a/pkgs/by-name/iv/iverilog/package.nix b/pkgs/by-name/iv/iverilog/package.nix index 06e8a94a4c537..3dbbd8056dd37 100644 --- a/pkgs/by-name/iv/iverilog/package.nix +++ b/pkgs/by-name/iv/iverilog/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # (see https://github.com/steveicarus/iverilog/issues/917) # so disable the full suite for now. doCheck = true; - doInstallCheck = !stdenv.isAarch64; + doInstallCheck = !stdenv.hostPlatform.isAarch64; nativeInstallCheckInputs = [ perl diff --git a/pkgs/by-name/iw/iwqr/package.nix b/pkgs/by-name/iw/iwqr/package.nix new file mode 100644 index 0000000000000..5609c70d4c3b8 --- /dev/null +++ b/pkgs/by-name/iw/iwqr/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitea, + nix-update-script, + testers, + iwqr, +}: + +rustPlatform.buildRustPackage rec { + pname = "iwqr"; + version = "0.1.1"; + + src = fetchFromGitea { + domain = "git.kroner.dev"; + owner = "kreny"; + repo = "iwqr"; + rev = "v${version}"; + hash = "sha256-z9CjCJvi6MlZGghZKx13gGSKwUnECAf0cr9P2ABskh0="; + }; + + cargoHash = "sha256-EFen2x/+a5xLsDmodNCkuGBR7+Oy2fdXcxzANLcWWZs="; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = iwqr; + }; + }; + + meta = with lib; { + description = "Tool for generating qr codes for iwd networks"; + homepage = "https://git.kroner.dev/kreny/iwqr"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ h7x4 ]; + mainProgram = "iwqr"; + }; +} diff --git a/pkgs/development/interpreters/j/fix-install-path.patch b/pkgs/by-name/j/j/fix-install-path.patch similarity index 100% rename from pkgs/development/interpreters/j/fix-install-path.patch rename to pkgs/by-name/j/j/fix-install-path.patch diff --git a/pkgs/by-name/j/j/package.nix b/pkgs/by-name/j/j/package.nix new file mode 100644 index 0000000000000..f7b36dfa35396 --- /dev/null +++ b/pkgs/by-name/j/j/package.nix @@ -0,0 +1,88 @@ +{ lib +, stdenv +, fetchFromGitHub +, which +, gmp +, avx2Support ? stdenv.hostPlatform.avx2Support +}: + +stdenv.mkDerivation rec { + pname = "j"; + version = "9.5.1"; + + src = fetchFromGitHub { + owner = "jsoftware"; + repo = "jsource"; + rev = "${version}"; + hash = "sha256-QRQhE8138+zaGQOdq9xUOrifkVIprzbJWbmMK+WhEOU="; + }; + + nativeBuildInputs = [ which ]; + buildInputs = [ gmp ]; + + patches = [ + ./fix-install-path.patch + ]; + + enableParallelBuilding = true; + + dontConfigure = true; + + # Emulate jplatform64.sh configuration variables + jplatform = + if stdenv.hostPlatform.isDarwin then "darwin" + else if stdenv.hostPlatform.isAarch then "raspberry" + else if stdenv.hostPlatform.isLinux then "linux" + else "unsupported"; + + j64x = + if stdenv.hostPlatform.is32bit then "j32" + else if stdenv.hostPlatform.isx86_64 then + if stdenv.hostPlatform.isLinux && avx2Support then "j64avx2" else "j64" + else if stdenv.hostPlatform.isAarch64 then + if stdenv.hostPlatform.isDarwin then "j64arm" else "j64" + else "unsupported"; + + env.NIX_LDFLAGS = "-lgmp"; + + buildPhase = '' + runHook preBuild + MAKEFLAGS+=" ''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" \ + jplatform=${jplatform} j64x=${j64x} make2/build_all.sh + cp -v bin/${jplatform}/${j64x}/* jlibrary/bin/ + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/j + cp -r jlibrary/{addons,system} $out/share/j/ + cp -r jlibrary/bin $out/ + runHook postInstall + ''; + + doInstallCheck = false; # The "gregex" test fails due to not finding PCRE2 + + installCheckPhase = '' + runHook preInstallCheck + HOME="$TMPDIR" $out/bin/jconsole -lib $out/bin/libj* script/testga.ijs + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://jsoftware.com/"; + changelog = "https://code.jsoftware.com/wiki/System/ReleaseNotes"; + description = "J programming language, an ASCII-based APL successor"; + longDescription = '' + J is a high-level, general-purpose programming language that is + particularly suited to the mathematical, statistical, and logical analysis + of data. It is a powerful tool for developing algorithms and exploring + problems that are not already well understood. + ''; + license = licenses.gpl3Only; + maintainers = with maintainers; [ raskin synthetica AndersonTorres ]; + broken = stdenv.hostPlatform.isDarwin; + platforms = platforms.all; + mainProgram = "jconsole"; + }; +} diff --git a/pkgs/by-name/ja/jailer/package.nix b/pkgs/by-name/ja/jailer/package.nix index 4a41c0eb9dfcf..3acbe488083c9 100644 --- a/pkgs/by-name/ja/jailer/package.nix +++ b/pkgs/by-name/ja/jailer/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Wisser"; repo = "Jailer"; rev = "bc00c6883bac0d09b549e35a10e202da477e4cb1"; - sha256 = "sha256-nXxTKbhvrBlorNqiF3wZDEgf1VrBamWw8ZSQSUqpGT8="; + hash = "sha256-nXxTKbhvrBlorNqiF3wZDEgf1VrBamWw8ZSQSUqpGT8="; }; diff --git a/pkgs/by-name/ja/jam/package.nix b/pkgs/by-name/ja/jam/package.nix new file mode 100644 index 0000000000000..b721f58f9b6a0 --- /dev/null +++ b/pkgs/by-name/ja/jam/package.nix @@ -0,0 +1,113 @@ +{ + lib, + bison, + buildPackages, + fetchurl, + installShellFiles, + pkgsBuildTarget, + stdenv, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "jam"; + version = "2.6.1"; + + src = fetchurl { + url = "https://swarm.workshop.perforce.com/downloads/guest/perforce_software/jam/jam-${finalAttrs.version}.tar"; + hash = "sha256-rOayJ8GpmFk0/RPJwK5Pf/RBccbe2Lg7s9p15u/cs6c="; + }; + + outputs = [ + "out" + "doc" + ]; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ + bison + installShellFiles + ]; + + makeFlags = [ + "CC=${buildPackages.stdenv.cc.targetPrefix}cc" + ]; + + env = { + LOCATE_TARGET = "bin.unix"; + # Jam uses c89 conventions + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=c89"; + }; + + enableParallelBuilding = true; + + strictDeps = true; + + # Jambase expects ar to have flags. + preConfigure = '' + export AR="$AR rc" + ''; + + # When cross-compiling, we need to set the preprocessor macros + # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the host + # platform. This looks a little ridiculous because the vast majority of build + # tools don't embed target-specific information into their binary, but in this + # case we behave more like a compiler than a make(1)-alike. + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' + cat >>jam.h <<EOF + #undef OSMAJOR + #undef OSMINOR + #undef OSPLAT + $( + ${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc -E -dM jam.h | grep -E '^#define (OSMAJOR|OSMINOR|OSPLAT) ' + ) + EOF + ''; + + buildPhase = '' + runHook preBuild + make $makeFlags jam0 + ./jam0 -j$NIX_BUILD_CORES -sCC=${buildPackages.stdenv.cc.targetPrefix}cc jambase.c + ./jam0 -j$NIX_BUILD_CORES + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + installBin bin.unix/jam + install -Dm644 -t ''${!outputDoc}/share/doc/jam-${finalAttrs.version}/ *.html + + runHook postInstall + ''; + + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "jam -v"; + }; + }; + + meta = { + homepage = "https://swarm.workshop.perforce.com/projects/perforce_software-jam"; + description = "Just Another Make"; + longDescription = '' + Jam is a program construction tool, like make(1). + + Jam recursively builds target files from source files, using dependency + information and updating actions expressed in the Jambase file, which is + written in jam's own interpreted language. The default Jambase is compiled + into jam and provides a boilerplate for common use, relying on a + user-provide file "Jamfile" to enumerate actual targets and sources. + ''; + license = lib.licenses.free; + mainProgram = "jam"; + maintainers = with lib.maintainers; [ + impl + orivej + AndersonTorres + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index d423d8e8b5685..eb0a8c9e49586 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -5,10 +5,10 @@ let pname = "jan"; - version = "0.5.1"; + version = "0.5.4"; src = fetchurl { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; - hash = "sha256-6AbV7rly4dLNX5xMKxitt5kli3xs5Hx0Vy+/HPsyEPc="; + hash = "sha256-BrNfpf9v8yAs4y3vaPlqtOI9SE7IFfZm/CYegcuZT3c="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix new file mode 100644 index 0000000000000..5f64b12e5ab3b --- /dev/null +++ b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "jawiki-all-titles-in-ns0"; + version = "0-unstable-2024-10-01"; + + src = fetchFromGitHub { + owner = "musjj"; + repo = "jawiki-archive"; + rev = "1e26e5efa36eea5322f55b178a5c4d5a5439feb9"; + hash = "sha256-8jzsECzrrcHeMvV2K89WagSiCXHjEDEfUwLDanVVuas="; + }; + + installPhase = '' + runHook preInstall + + mkdir $out + cp jawiki-latest-all-titles-in-ns0.gz $out/jawiki-all-titles-in-ns0.gz + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "A jawiki dump list of page titles in main namespace"; + homepage = "https://dumps.wikimedia.org/backup-index.html"; + license = with lib.licenses; [ + fdl13Only + cc-by-sa-30 + ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides a dump gz file + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/by-name/jc/jcli/package.nix b/pkgs/by-name/jc/jcli/package.nix index 6fd632af1a6a0..6de7a5096d9aa 100644 --- a/pkgs/by-name/jc/jcli/package.nix +++ b/pkgs/by-name/jc/jcli/package.nix @@ -43,6 +43,7 @@ buildGoModule rec { description = "Jenkins CLI allows you to manage your Jenkins in an easy way"; mainProgram = "jcli"; homepage = "https://github.com/jenkins-zh/jenkins-cli"; + changelog = "https://github.com/jenkins-zh/jenkins-cli/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sikmir ]; }; diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix index acdf3197af84c..268599a385ec1 100644 --- a/pkgs/by-name/jd/jdt-language-server/package.nix +++ b/pkgs/by-name/jd/jdt-language-server/package.nix @@ -6,15 +6,15 @@ }: let - timestamp = "202408011337"; + timestamp = "202408291433"; in stdenv.mkDerivation (finalAttrs: { pname = "jdt-language-server"; - version = "1.38.0"; + version = "1.39.0"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz"; - hash = "sha256-uml3iKGfK6V7FjAqums0PGSZKMlfdrDRcElKwS0XrHg="; + hash = "sha256-8EbY8Il05udz8u1HQmbqsJiJxkWfJmNXn4t9SXvTRyk="; }; sourceRoot = "."; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { # The application ships with different config directories for each platform. # Note the application come with ARM variants as well, although the # current included wrapper doesn't use them. - configDir = if stdenv.isDarwin then "config_mac" else "config_linux"; + configDir = if stdenv.hostPlatform.isDarwin then "config_mac" else "config_linux"; in '' runHook preInstall diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index e61aa25d1a2e9..ee5622baabd6f 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -16,7 +16,7 @@ let # node-canvas builds code that requires aligned_alloc, # which on Darwin requires at least the 10.15 SDK stdenv' = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.15"; darwinSdkVersion = "11.0"; @@ -27,7 +27,7 @@ let in buildNpmPackage' rec { pname = "jellyfin-web"; - version = "10.9.10"; + version = "10.9.11"; src = assert version == jellyfin.version; @@ -35,18 +35,18 @@ buildNpmPackage' rec { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-6t/kCuMbSug1q1EdQFAMqf/sWa+LAO46OUG0FL84UiE="; + hash = "sha256-zt0Exx/4B5gqiN3fxvQuVh1MqRNNtJG6/G0/reqVHRc="; }; - npmDepsHash = "sha256-R4myooMkKdvOFvyNqKIlZ2GozNOkg8YNTvomkt4aRIU="; + npmDepsHash = "sha256-kQxfh8o8NBshKmmjQrLdxiOQK83LG+lxhZwzDkEJwEo="; npmBuildScript = [ "build:production" ]; - nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = [ pango ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib darwin.apple_sdk.frameworks.CoreText ]; diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index 65182e433a678..6022bae3db843 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.9.10"; # ensure that jellyfin-web has matching version + version = "10.9.11"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - sha256 = "sha256-tkSQ7BKic/MD7xcvAPHeFb/RDz++KTLhmAzR4cv1q10="; + hash = "sha256-gZJIsNKXwhUUVgJh8vXuGSu9DEyrVY8NuIeyZHHQKN4="; }; propagatedBuildInputs = [ sqlite ]; diff --git a/pkgs/by-name/ji/jikken/package.nix b/pkgs/by-name/ji/jikken/package.nix index aa4ab81845781..15a96f7516a16 100644 --- a/pkgs/by-name/ji/jikken/package.nix +++ b/pkgs/by-name/ji/jikken/package.nix @@ -10,22 +10,22 @@ }: rustPlatform.buildRustPackage rec { pname = "jikken"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jikkenio"; repo = "jikken"; rev = "v${version}"; - hash = "sha256-bV9NjwTcX1euk8zRJMGkAULegQmiT8z4jxngOwOPr+M="; + hash = "sha256-e1n5Q1bF/n9ELA93ucdaIeXx3LPhd7cWkLxWRRdGlo4="; }; - cargoHash = "sha256-gJg/l7L19qk6DELqo4fYc2ZWTHqKeUFEF3YU3+uyFjQ="; + cargoHash = "sha256-DALY88q5xsjnoaGJxnVWx/5v4yE80+HNGT/vdFdzkXk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.IOKit darwin.apple_sdk_11_0.frameworks.Security darwin.apple_sdk_11_0.frameworks.SystemConfiguration diff --git a/pkgs/by-name/ji/jinja2-cli/package.nix b/pkgs/by-name/ji/jinja2-cli/package.nix index 921d668952cda..fb322d161e003 100644 --- a/pkgs/by-name/ji/jinja2-cli/package.nix +++ b/pkgs/by-name/ji/jinja2-cli/package.nix @@ -27,11 +27,11 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ jinja2 - ] ++ lib.attrVals extras passthru.optional-dependencies; + ] ++ lib.attrVals extras optional-dependencies; pythonImportsCheck = [ "jinja2cli" ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { hjson = [ hjson ]; json5 = [ json5 ]; toml = [ toml ]; diff --git a/pkgs/by-name/ji/jira-cli-go/package.nix b/pkgs/by-name/ji/jira-cli-go/package.nix new file mode 100644 index 0000000000000..3d4382a9f99fd --- /dev/null +++ b/pkgs/by-name/ji/jira-cli-go/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + jira-cli-go, + less, + more, + nix-update-script, + testers, +}: + +buildGoModule rec { + pname = "jira-cli-go"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "ankitpokhrel"; + repo = "jira-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-Wp6uDvnTiNixn8GyEn8SeKPdXanUNN3b7yr9dT1D6uo="; + }; + + vendorHash = "sha256-a11ZO/iV/Yhaq/cu504p2C/OkKJ04PeMMSoHrl7edvM="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/ankitpokhrel/jira-cli/internal/version.GitCommit=${src.rev}" + "-X github.com/ankitpokhrel/jira-cli/internal/version.SourceDateEpoch=0" + "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd jira \ + --bash <($out/bin/jira completion bash) \ + --fish <($out/bin/jira completion fish) \ + --zsh <($out/bin/jira completion zsh) + + $out/bin/jira man --generate --output man + installManPage man/* + ''; + + nativeCheckInputs = [ + less + more + ]; # Tests expect a pager in $PATH + + passthru = { + tests.version = testers.testVersion { + package = jira-cli-go; + command = "jira version"; + inherit version; + }; + updateScript = nix-update-script { }; + }; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Feature-rich interactive Jira command line"; + homepage = "https://github.com/ankitpokhrel/jira-cli"; + changelog = "https://github.com/ankitpokhrel/jira-cli/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ + bryanasdev000 + anthonyroussel + ]; + mainProgram = "jira"; + }; +} diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index ecb59dad37759..6257fbeede662 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-xF0sxoSo7z7lxrF3wFAmU7edREoWKBFBnZ6Xq22c8q0="; - buildInputs = lib.optional stdenv.isDarwin ( + buildInputs = lib.optional stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ CoreGraphics diff --git a/pkgs/by-name/jo/job-security/package.nix b/pkgs/by-name/jo/job-security/package.nix index 3912f03daf6b9..1d057f6ecd019 100644 --- a/pkgs/by-name/jo/job-security/package.nix +++ b/pkgs/by-name/jo/job-security/package.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { license = with lib.licenses; [ asl20 mit mpl20 ]; maintainers = with lib.maintainers; [ fgaz ]; mainProgram = "jobs"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/by-name/jo/joe/package.nix similarity index 100% rename from pkgs/applications/editors/joe/default.nix rename to pkgs/by-name/jo/joe/package.nix diff --git a/pkgs/by-name/jo/jogger/package.nix b/pkgs/by-name/jo/jogger/package.nix new file mode 100644 index 0000000000000..465e5478ff2c3 --- /dev/null +++ b/pkgs/by-name/jo/jogger/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitea, + rustPlatform, + meson, + ninja, + pkg-config, + cargo, + rustc, + blueprint-compiler, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + libshumate, + alsa-lib, + espeak, + sqlite, + glib-networking, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "jogger"; + version = "1.2.4-unstable-2024-04-05"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "baarkerlounger"; + repo = "jogger"; + rev = "09386b9503a9b996b86ea4638268403868b24d6a"; + hash = "sha256-oGjqYRHkYk22/RzDc5c0066SlOPGRGC6z/BTn1DM03o="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) pname version src; + hash = "sha256-+8mMJgLHLUdFLOwjhXolHcVUP+s/j6PlWeRh8sGRYTc="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + cargo + rustc + blueprint-compiler + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + libshumate + alsa-lib + espeak + sqlite + glib-networking + ]; + + meta = { + description = "App for Gnome Mobile to Track running and other workouts"; + homepage = "https://codeberg.org/baarkerlounger/jogger"; + license = with lib.licenses; [ + gpl3Plus + cc0 + ]; + mainProgram = "jogger"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/jo/jogl/package.nix b/pkgs/by-name/jo/jogl/package.nix index a12b6b7622201..d8a626ee15c02 100644 --- a/pkgs/by-name/jo/jogl/package.nix +++ b/pkgs/by-name/jo/jogl/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { --delete '//*[@if="setup.addNativeBroadcom"]' \ jogl/make/build-newt.xml '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/if="use.macos/d' gluegen/make/gluegen-cpptasks-base.xml rm -r jogl/oculusvr-sdk ''; @@ -67,11 +67,11 @@ stdenv.mkDerivation { git xmlstarlet stripJavaArchivesHook - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev xorg.libX11 xorg.libXrandr @@ -81,7 +81,7 @@ stdenv.mkDerivation { xorg.libXxf86vm xorg.libXrender mesa - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.Cocoa ]; diff --git a/pkgs/by-name/jo/joshuto/package.nix b/pkgs/by-name/jo/joshuto/package.nix index 18ef1ea063696..0d35b905a99bf 100644 --- a/pkgs/by-name/jo/joshuto/package.nix +++ b/pkgs/by-name/jo/joshuto/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix index 48b92f55bec36..920b294562d17 100644 --- a/pkgs/by-name/jo/josm/package.nix +++ b/pkgs/by-name/jo/josm/package.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "19160"; + version = "19207"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-a0Tu0GkXH/MYR5llmVaVcEBvmr50sX4oSsCZSzo5dkE="; + hash = "sha256-dYDJmGXIKd2GhjyKBpQjoIfz9giBsgFdC0TaKplxiPY="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; - hash = "sha256-5sn4Wo4VMIZ79v/FegKrFQ62cngAQLc1luTnvhCO7y8="; + hash = "sha256-A34nd+RBipON5zOKBD57L1l2KACYEUHNjxs0N6xqoXc="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-L7P6FtqKLB4e+ezPzXePM33qj5esNoRlTFXi0/GhdsA="; + hash = "sha256-L7P6FtqKLB4e+ezPzXePM33qj5esNoRlTFXi0/GhdsA="; }; }; @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ jre ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ jre ]; installPhase = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications ${unzip}/bin/unzip ${srcs.macosx} 'JOSM.app/*' -d $out/Applications '' else '' diff --git a/pkgs/by-name/jo/jove/package.nix b/pkgs/by-name/jo/jove/package.nix new file mode 100644 index 0000000000000..8c4c171707533 --- /dev/null +++ b/pkgs/by-name/jo/jove/package.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, groff +, makeWrapper +, ncurses +, runtimeShell +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "jove"; + version = "4.17.5.3"; + + src = fetchFromGitHub { + owner = "jonmacs"; + repo = "jove"; + rev = finalAttrs.version; + hash = "sha256-ZBq2zCml637p9VgedpOrUn2jSc5L0pthdgRS7YsB3zs="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + groff + ncurses + ]; + + postPatch = '' + patchShebangs testbuild.sh testmailer.sh teachjove jmake.sh + ''; + + dontConfigure = true; + + preBuild = '' + makeFlagsArray+=(SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \ + JTMPDIR=$TMPDIR + TERMCAPLIB=-lncurses \ + SHELL=${runtimeShell} \ + DFLTSHELL=${runtimeShell} \ + JOVEHOME=${placeholder "out"}) + ''; + + postInstall = '' + wrapProgram $out/bin/teachjove \ + --prefix PATH ":" "$out/bin" + ''; + + meta = { + homepage = "https://github.com/jonmacs/jove"; + description = "Jonathan's Own Version of Emacs"; + changelog = "https://github.com/jonmacs/jove/releases/tag/${finalAttrs.version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + # never built on Hydra: https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; + }; +}) diff --git a/pkgs/by-name/jp/jp-zip-codes/package.nix b/pkgs/by-name/jp/jp-zip-codes/package.nix new file mode 100644 index 0000000000000..adf99b7ab1cd9 --- /dev/null +++ b/pkgs/by-name/jp/jp-zip-codes/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "jp-zip-code"; + version = "0-unstable-2024-10-01"; + + # This package uses a mirror as the source because the + # original provider uses the same URL for updated content. + src = fetchFromGitHub { + owner = "musjj"; + repo = "jp-zip-codes"; + rev = "94ddc993224a6e2c65480f9109564f7f68125665"; + hash = "sha256-/2f/HXxrxKc6dv5E67S59xIpdJUkh0fX0lyTuo2y1N4="; + }; + + installPhase = '' + runHook preInstall + install -Dt $out ken_all.zip + install -Dt $out jigyosyo.zip + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Zip files containing japanese zip codes"; + longDescription = "Zip files with japanese zip codes for japanese IME dictionaries"; + homepage = "https://github.com/musjj/jp-zip-codes"; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/by-name/jr/jrl-cmakemodules/package.nix b/pkgs/by-name/jr/jrl-cmakemodules/package.nix index 8dc01688de669..22c9bafe6425d 100644 --- a/pkgs/by-name/jr/jrl-cmakemodules/package.nix +++ b/pkgs/by-name/jr/jrl-cmakemodules/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "jrl-cmakemodules"; - version = "0-unstable-2024-08-05"; + version = "0-unstable-2024-09-17"; src = fetchFromGitHub { owner = "jrl-umi3218"; repo = "jrl-cmakemodules"; - rev = "88d3cb561d1f9faa3c6281da7b2b8d6aa76b04d5"; - hash = "sha256-3Su/tGtV39/tto1Hs5sgGgjpFWkBCvI2SZKqBIIDAjA="; + rev = "31e46019beda968ba9e516ad645a951c64256eed"; + hash = "sha256-pe21tE0ngUYGhEuGSI71TMdwyqTmZhc53hPKHngkTGQ="; }; nativeBuildInputs = [ cmake ]; @@ -23,5 +23,6 @@ stdenv.mkDerivation { homepage = "https://github.com/jrl-umi3218/jrl-cmakemodules"; license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.nim65s ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/js/json2ts/package.nix b/pkgs/by-name/js/json2ts/package.nix new file mode 100644 index 0000000000000..1518898b3de4d --- /dev/null +++ b/pkgs/by-name/js/json2ts/package.nix @@ -0,0 +1,26 @@ +{ + buildNpmPackage, + fetchFromGitHub, + lib, +}: +buildNpmPackage { + name = "json2ts"; + version = "15.0.2"; + src = fetchFromGitHub { + owner = "bcherny"; + repo = "json-schema-to-typescript"; + rev = "118d6a8e7a5a9397d1d390ce297f127ae674a623"; + hash = "sha256-ldAFfw3E0A0lIJyDSsshgPRPR7OmV/FncPsDhC3waT8="; + }; + npmDepsHash = "sha256-kLKau4SBxI9bMAd7X8/FQfCza2sYl/+0bg2LQcOQIJo="; + + meta = with lib; { + mainProgram = "json2ts"; + description = "Compile JSON Schema to TypeScript type declarations"; + homepage = "https://github.com/bcherny/json-schema-to-typescript"; + changelog = "https://github.com/bcherny/json-schema-to-typescript/blob/master/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hsjobeki ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix new file mode 100644 index 0000000000000..a978063acaa00 --- /dev/null +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -0,0 +1,124 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, + pkg-config, + zstd, + libgit2, + libssh2, + openssl, + darwin, + libiconv, + git, + gnupg, + openssh, + buildPackages, + nix-update-script, + testers, + jujutsu, +}: + +let + version = "0.22.0"; +in + +rustPlatform.buildRustPackage { + pname = "jujutsu"; + inherit version; + + src = fetchFromGitHub { + owner = "martinvonz"; + repo = "jj"; + rev = "v${version}"; + hash = "sha256-GbKmX1Ev/8di3A1XT5ZIRjzn2zP6DMye2NpA26PGVIs="; + }; + + cargoHash = "sha256-+3oO2M2293Nba6P8bejgZD5OxgCpkIRdcPICDswJyEU="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = + [ + zstd + libgit2 + libssh2 + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + libiconv + ]; + + nativeCheckInputs = [ + git + gnupg + openssh + ]; + + cargoBuildFlags = [ + # Don’t install the `gen-protos` build tool. + "--bin" + "jj" + ]; + + useNextest = true; + + cargoTestFlags = [ + # Don’t build the `gen-protos` build tool when running tests. + "-p" + "jj-lib" + "-p" + "jj-cli" + ]; + + env = { + # Disable vendored libraries. + ZSTD_SYS_USE_PKG_CONFIG = "1"; + LIBGIT2_NO_VENDOR = "1"; + LIBSSH2_SYS_USE_PKG_CONFIG = "1"; + }; + + postInstall = + let + jj = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/jj"; + in + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' + ${jj} util mangen > ./jj.1 + installManPage ./jj.1 + + installShellCompletion --cmd jj \ + --bash <(${jj} util completion bash) \ + --fish <(${jj} util completion fish) \ + --zsh <(${jj} util completion zsh) + ''; + + passthru = { + updateScript = nix-update-script { }; + tests = { + version = testers.testVersion { + package = jujutsu; + command = "jj --version"; + }; + }; + }; + + meta = { + description = "Git-compatible DVCS that is both simple and powerful"; + homepage = "https://github.com/martinvonz/jj"; + changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + _0x4A6F + thoughtpolice + emily + bbigras + ]; + mainProgram = "jj"; + }; +} diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/by-name/ju/jupp/package.nix similarity index 100% rename from pkgs/applications/editors/jupp/default.nix rename to pkgs/by-name/ju/jupp/package.nix diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 3dfcd639f5d10..1698299526414 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-X3noVDRnnrR6xuOBfoH4JPdcPLOBHbGQb6opNvzK/TE="; nativeBuildInputs = [ installShellFiles mdbook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; preCheck = '' # USER must not be empty diff --git a/pkgs/by-name/ju/just/setup-hook.sh b/pkgs/by-name/ju/just/setup-hook.sh index 0ffcfc187ebfa..d171ac7610bbc 100644 --- a/pkgs/by-name/ju/just/setup-hook.sh +++ b/pkgs/by-name/ju/just/setup-hook.sh @@ -1,7 +1,10 @@ +# shellcheck shell=bash + justBuildPhase() { runHook preBuild - local flagsArray=($justFlags "${justFlagsArray[@]}") + local flagsArray=() + concatTo flagsArray justFlags justFlagsArray echoCmd 'build flags' "${flagsArray[@]}" just "${flagsArray[@]}" @@ -14,17 +17,15 @@ justCheckPhase() { if [ -z "${checkTarget:-}" ]; then if just -n test >/dev/null 2>&1; then - checkTarget=test + checkTarget="test" fi fi if [ -z "${checkTarget:-}" ]; then echo "no test target found in just, doing nothing" else - local flagsArray=( - $justFlags "${justFlagsArray[@]}" - $checkTarget - ) + local flagsArray=() + concatTo flagsArray justFlags justFlagsArray checkTarget echoCmd 'check flags' "${flagsArray[@]}" just "${flagsArray[@]}" @@ -36,8 +37,8 @@ justCheckPhase() { justInstallPhase() { runHook preInstall - # shellcheck disable=SC2086 - local flagsArray=($justFlags "${justFlagsArray[@]}" ${installTargets:-install}) + local flagsArray=() + concatTo flagsArray justFlags justFlagsArray installTargets=install echoCmd 'install flags' "${flagsArray[@]}" just "${flagsArray[@]}" @@ -45,14 +46,14 @@ justInstallPhase() { runHook postInstall } -if [ -z "${dontUseJustBuild-}" -a -z "${buildPhase-}" ]; then +if [ -z "${dontUseJustBuild-}" ] && [ -z "${buildPhase-}" ]; then buildPhase=justBuildPhase fi -if [ -z "${dontUseJustCheck-}" -a -z "${checkPhase-}" ]; then +if [ -z "${dontUseJustCheck-}" ] && [ -z "${checkPhase-}" ]; then checkPhase=justCheckPhase fi -if [ -z "${dontUseJustInstall-}" -a -z "${installPhase-}" ]; then +if [ -z "${dontUseJustInstall-}" ] && [ -z "${installPhase-}" ]; then installPhase=justInstallPhase fi diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 76f73a888def6..86274edd4f3e2 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -34,17 +34,17 @@ stdenv.mkDerivation rec { owner = "just-buildsystem"; repo = "justbuild"; rev = "v${version}"; - sha256 = "sha256-kv7HpDEYZml5uk06s8Cxt5rEpxaJBz9s+or6Od1q4Io="; + hash = "sha256-kv7HpDEYZml5uk06s8Cxt5rEpxaJBz9s+or6Od1q4Io="; }; bazelapi = fetchurl { url = "https://github.com/bazelbuild/remote-apis/archive/e1fe21be4c9ae76269a5a63215bb3c72ed9ab3f0.tar.gz"; - sha256 = "7421abd5352ccf927c2050453a4dbfa1f7b1c7170ec3e8702b6fe2d39b8805fe"; + hash = "sha256-dCGr1TUsz5J8IFBFOk2/ofexxxcOw+hwK2/i05uIBf4="; }; googleapi = fetchurl { url = "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz"; - sha256 = "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0"; + hash = "sha256-W7awJTzPZLU9bHJJYlp+P2w7xkAqvVLTd4v6SCWHA6A="; }; nativeBuildInputs = @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { mv etc/repos.json.patched etc/repos.json jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py ''; @@ -166,7 +166,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Generic build tool"; homepage = "https://github.com/just-buildsystem/justbuild"; license = licenses.asl20; diff --git a/pkgs/by-name/jw/jwasm/package.nix b/pkgs/by-name/jw/jwasm/package.nix index 8a1390aac9f5c..eaf30e58356e0 100644 --- a/pkgs/by-name/jw/jwasm/package.nix +++ b/pkgs/by-name/jw/jwasm/package.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation (finalAttrs: { --replace "/usr/local/bin" "${placeholder "out"}/bin" ''; + preInstall = '' + mkdir -p ${placeholder "out"}/bin + ''; + postInstall = '' install -Dpm644 $src/Html/License.html \ $src/Html/Manual.html \ @@ -36,10 +40,11 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Baron-von-Riedesel/JWasm/"; description = "MASM-compatible x86 assembler"; changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/${finalAttrs.src.rev}"; + mainProgram = "jwasm"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) # TODO: generalize for Windows builds diff --git a/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix b/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix new file mode 100644 index 0000000000000..17c12ad9e415a --- /dev/null +++ b/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix @@ -0,0 +1,66 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + testers, + k8s-manifest-sigstore, + gitUpdater, +}: + +buildGoModule rec { + pname = "k8s-manifest-sigstore"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "sigstore"; + repo = pname; + rev = "v${version}"; + hash = "sha256-BDBkPXDg9DruIt5f7RrpStFeuTGiOOpsb6JiKaCTOOk="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + vendorHash = "sha256-dIReCe+Qoq/chBrd/X5s4hucuDquvd7OTUSj0WpcIDE="; + + subPackages = [ "cmd/kubectl-sigstore" ]; + + ldflags = + let + prefix = "github.com/sigstore/k8s-manifest-sigstore/pkg/util"; + in + [ + "-s" + "-w" + # https://github.com/sigstore/k8s-manifest-sigstore/blob/e740581a4652dd44eb65495ed071fd0258dcbeb4/Makefile#L22 + "-X ${prefix}.buildDate=1970-01-01T00:00:00Z" + "-X ${prefix}.gitCommit=v${version}" + "-X ${prefix}.gitTreeState=clean" + "-X ${prefix}.GitVersion=v${version}" + ]; + + postInstall = '' + installShellCompletion --cmd kubectl-sigstore \ + --bash <($out/bin/kubectl-sigstore completion bash) \ + --fish <($out/bin/kubectl-sigstore completion fish) \ + --zsh <($out/bin/kubectl-sigstore completion zsh) + ''; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.version = testers.testVersion { + package = k8s-manifest-sigstore; + command = "kubectl-sigstore version"; + version = "v${version}"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/sigstore/k8s-manifest-sigstore"; + changelog = "https://github.com/sigstore/k8s-manifest-sigstore/releases/tag/v${version}"; + description = "Kubectl plugin for signing Kubernetes manifest YAML files with sigstore"; + mainProgram = "kubectl-sigstore"; + license = licenses.asl20; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix new file mode 100644 index 0000000000000..49c04df4dd03f --- /dev/null +++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchFromSourcehut, + nix-update-script, + testers, + kak-tree-sitter-unwrapped, +}: + +rustPlatform.buildRustPackage rec { + pname = "kak-tree-sitter-unwrapped"; + version = "1.1.2"; + + src = fetchFromSourcehut { + owner = "~hadronized"; + repo = "kak-tree-sitter"; + rev = "kak-tree-sitter-v${version}"; + hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA="; + }; + + cargoHash = "sha256-v0DNcWPoHdquOlyPoPLoFulz66yCPR1W1Z3uuTjli5k="; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = kak-tree-sitter-unwrapped; }; + }; + + meta = { + 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 ]; + maintainers = with lib.maintainers; [ lelgenio ]; + }; +} diff --git a/pkgs/by-name/ka/kak-tree-sitter/package.nix b/pkgs/by-name/ka/kak-tree-sitter/package.nix new file mode 100644 index 0000000000000..e80edb2f369e6 --- /dev/null +++ b/pkgs/by-name/ka/kak-tree-sitter/package.nix @@ -0,0 +1,27 @@ +{ + lib, + makeWrapper, + symlinkJoin, + tinycc, + kak-tree-sitter-unwrapped, +}: + +symlinkJoin rec { + pname = lib.replaceStrings [ "-unwrapped" ] [ "" ] kak-tree-sitter-unwrapped.pname; + inherit (kak-tree-sitter-unwrapped) version; + name = "${pname}-${version}"; + + paths = [ kak-tree-sitter-unwrapped ]; + nativeBuildInputs = [ makeWrapper ]; + + # Tree-Sitter grammars are C programs that need to be compiled + # Use tinycc as cc to reduce closure size + postBuild = '' + mkdir -p $out/libexec/tinycc/bin + ln -s ${lib.getExe tinycc} $out/libexec/tinycc/bin/cc + wrapProgram "$out/bin/ktsctl" \ + --suffix PATH : $out/libexec/tinycc/bin + ''; + + inherit (kak-tree-sitter-unwrapped) meta; +} diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 29e9fb4eef094..42176134371bb 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -18,14 +18,14 @@ rustPlatform.buildRustPackage rec { owner = "kakoune-lsp"; repo = "kakoune-lsp"; rev = "v${version}"; - sha256 = "sha256-NZDp98Ne6z7DlJ2vZiqGzw5ukusOkEjb+eyvmxB+IKI="; + hash = "sha256-NZDp98Ne6z7DlJ2vZiqGzw5ukusOkEjb+eyvmxB+IKI="; }; patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ]; cargoHash = "sha256-QonOqdcdp1vbxzLnF46X0DLVay2Up1LvHZ/ZZ04LqlE="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/pkgs/by-name/ka/kana/package.nix b/pkgs/by-name/ka/kana/package.nix index 3fc7e8d3c2577..e0260d1363d68 100644 --- a/pkgs/by-name/ka/kana/package.nix +++ b/pkgs/by-name/ka/kana/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { gst-plugins-base gst-plugins-bad gst-plugins-good - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/ka/kanha/package.nix b/pkgs/by-name/ka/kanha/package.nix index c3f713d0370d2..583671f38433f 100644 --- a/pkgs/by-name/ka/kanha/package.nix +++ b/pkgs/by-name/ka/kanha/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index 4a62729927879..cfa9e43ba7ff6 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -24,7 +24,7 @@ }: let - arch = if stdenv.isx86_64 then "x86_64" else "generic"; + arch = if stdenv.hostPlatform.isx86_64 then "x86_64" else "generic"; in rustPlatform.buildRustPackage rec { pname = "kanidm"; @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml"; profile = { admin_bind_path = "/run/kanidmd/sock"; - cpu_flags = if stdenv.isx86_64 then "x86_64_legacy" else "none"; + cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none"; default_config_path = "/etc/kanidm/server.toml"; default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash"; htmx_ui_pkg_path = "@htmx_ui_pkg_path@"; diff --git a/pkgs/by-name/ka/kara/package.nix b/pkgs/by-name/ka/kara/package.nix new file mode 100644 index 0000000000000..89789a0d891dd --- /dev/null +++ b/pkgs/by-name/ka/kara/package.nix @@ -0,0 +1,39 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + kdePackages, + ... +}: +stdenv.mkDerivation (finalAttrs: { + pname = "kara"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "dhruv8sh"; + repo = "kara"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-G+sLHcHnNuzIRE+6bvEeXaWYVdoqqxcp5kGF8ZhD/34="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/plasma/plasmoids/org.dhruv8sh.kara + cp metadata.json $out/share/plasma/plasmoids/org.dhruv8sh.kara + cp -r contents $out/share/plasma/plasmoids/org.dhruv8sh.kara + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "KDE Plasma Applet for use as a desktop/workspace pager"; + homepage = "https://github.com/dhruv8sh/kara"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + inherit (kdePackages.kwindowsystem.meta) platforms; + }; +}) diff --git a/pkgs/by-name/ka/kas/package.nix b/pkgs/by-name/ka/kas/package.nix index f17b7bfed3b09..51cbae22afdb0 100644 --- a/pkgs/by-name/ka/kas/package.nix +++ b/pkgs/by-name/ka/kas/package.nix @@ -2,16 +2,16 @@ python3.pkgs.buildPythonApplication rec { pname = "kas"; - version = "4.2"; + version = "4.5"; src = fetchFromGitHub { owner = "siemens"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NjNPcCqmjFeydTgNdN8QRrFG5Mys2jL4I8TiznO2rSA="; + hash = "sha256-J64yy2G8+5uT31Vpwhge5R7ZqId+NzE5ykXBHjc0qgQ="; }; - propagatedBuildInputs = with python3.pkgs; [ setuptools kconfiglib jsonschema distro pyyaml ]; + propagatedBuildInputs = with python3.pkgs; [ setuptools kconfiglib jsonschema distro pyyaml gitpython ]; # Tests require network as they try to clone repos doCheck = false; diff --git a/pkgs/by-name/ka/kazv/package.nix b/pkgs/by-name/ka/kazv/package.nix new file mode 100644 index 0000000000000..048bc2c837cda --- /dev/null +++ b/pkgs/by-name/ka/kazv/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitLab, + boost, + cmake, + cmark, + cryptopp, + extra-cmake-modules, + immer, + kdePackages, + lager, + libkazv, + nlohmann_json, + olm, + pkg-config, + qt6, + zug, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kazv"; + version = "0.5.0"; + + src = fetchFromGitLab { + domain = "lily-is.land"; + owner = "kazv"; + repo = "kazv"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-WBS7TJJw0t57V4+NxsG8V8q4UKQXB8kRpWocvNy1Eto="; + }; + + nativeBuildInputs = [ + cmake + kdePackages.extra-cmake-modules + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + boost + cmark + cryptopp + immer + kdePackages.kio + kdePackages.kirigami + kdePackages.kirigami-addons + kdePackages.knotifications + lager + libkazv + nlohmann_json + olm + qt6.qtbase + qt6.qtimageformats + qt6.qtmultimedia + qt6.qtwayland + zug + ]; + + strictDeps = true; + + meta = { + description = "Convergent matrix client and instant messaging app"; + homepage = "https://kazv.chat/"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ fgaz ]; + mainProgram = "kazv"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/kb/kbld/package.nix b/pkgs/by-name/kb/kbld/package.nix new file mode 100644 index 0000000000000..6b2a7f9969890 --- /dev/null +++ b/pkgs/by-name/kb/kbld/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "kbld"; + version = "0.44.1"; + + src = fetchFromGitHub { + owner = "carvel-dev"; + repo = "kbld"; + rev = "v${version}"; + hash = "sha256-sEzCA32r3nSY1hT1r4EPPWsF9Kgn0rXnaAKlatFjZIo="; + }; + + vendorHash = null; + + subPackages = [ "cmd/kbld" ]; + + CGO_ENABLED = 0; + + ldflags = [ + "-X=carvel.dev/kbld/pkg/kbld/version.Version=${version}" + ]; + + meta = { + description = "Seamlessly incorporates image building and image pushing into your development and deployment workflows"; + homepage = "https://carvel.dev/kbld/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ benchand ]; + mainProgram = "kbld"; + }; +} diff --git a/pkgs/by-name/kc/kchat/package.nix b/pkgs/by-name/kc/kchat/package.nix index 22a3496f6a81d..baec68b0a5731 100644 --- a/pkgs/by-name/kc/kchat/package.nix +++ b/pkgs/by-name/kc/kchat/package.nix @@ -5,12 +5,12 @@ appimageTools.wrapType2 rec { pname = "kchat"; - version = "3.3.1"; + version = "3.3.3"; src = fetchurl { url = "https://download.storage5.infomaniak.com/kchat/kchat-desktop-${version}-linux-x86_64.AppImage"; name = "kchat-${version}.AppImage"; - hash = "sha256-f9wWgZSPSMP7bLZGfR5F6l/eAVHVhRmF1c7S6/qLgIA="; + hash = "sha256-5Nk2IMGk7BDDL7fuoOBO3wEcbtJDDDnQvUiqa8Pt8yU="; }; extraInstallCommands = diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index 84012a3a59bb6..b016abe16bb9a 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -23,7 +23,7 @@ buildGoModule rec { vendorHash = "sha256-DGYYH5sKhpcWHYoUim4NyflzqsXFc4MCOqIw5jIfIiM="; # By default, libs and bins are stripped. KCL will crash on darwin if they are. - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; ldflags = [ "-w -s" @@ -33,7 +33,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = [ kclvm kclvm_cli ] ++ ( - lib.optional stdenv.isDarwin [ + lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix index 08864ba0b65a5..17e9cefc8f9a8 100644 --- a/pkgs/by-name/kc/kclvm/package.nix +++ b/pkgs/by-name/kc/kclvm/package.nix @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = [ rustc ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ rustc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libkclvm_cli_cdylib.dylib $out/lib/libkclvm_cli_cdylib.dylib ''; diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index bfac990017be6..79b3b10f66646 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -9,21 +9,21 @@ }: rustPlatform.buildRustPackage rec { pname = "kclvm_cli"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; rev = "v${version}"; - hash = "sha256-nk5oJRTBRj0LE2URJqno8AoZ+/342C2tEt8d6k2MAc8="; + hash = "sha256-OMPo2cT0ngwHuGghVSfGoDgf+FThj2GsZ3Myb1wSxQM="; }; sourceRoot = "${src.name}/cli"; - cargoHash = "sha256-LZUE2J/UYepl5BGf4T4eWKIZfN3mVJtMDLtm0uUmvI8="; + cargoHash = "sha256-hILG2YcwsAzzJPJno+2KzAHM226HYmQPQt9JVVYn9Jk="; cargoPatches = [ ./cargo_lock.patch ]; buildInputs = [ kclvm rustc ] ++ ( - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/ke/keeweb/package.nix b/pkgs/by-name/ke/keeweb/package.nix new file mode 100644 index 0000000000000..48b9a603d8417 --- /dev/null +++ b/pkgs/by-name/ke/keeweb/package.nix @@ -0,0 +1,139 @@ +{ + lib, + libGL, + stdenv, + fetchurl, + undmg, + dpkg, + autoPatchelfHook, + wrapGAppsHook3, + alsa-lib, + at-spi2-atk, + gdk-pixbuf, + nss, + udev, + gnome-keyring, + mesa, + gtk3, + libusb1, + libsecret, + libappindicator, + xdotool, + libX11, + libXcomposite, + libXext, + libXrandr, + libXScrnSaver, + libXtst, + libxshmfence, +}: +let + pname = "keeweb"; + version = "1.18.7"; + + srcs = { + x86_64-linux = fetchurl { + 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="; + }; + }; + src = + srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + libraries = [ + alsa-lib + at-spi2-atk + gdk-pixbuf + libGL + nss + udev + libX11 + libXcomposite + libXext + libXrandr + libXScrnSaver + libXtst + libxshmfence + gnome-keyring + mesa + gtk3 + libusb1 + libsecret + libappindicator + xdotool + ]; + + meta = { + description = "Free cross-platform password manager compatible with KeePass"; + mainProgram = "keeweb"; + homepage = "https://keeweb.info/"; + changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = builtins.attrNames srcs; + }; +in +if stdenv.hostPlatform.isDarwin then + stdenv.mkDerivation { + inherit + pname + version + src + meta + ; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; + } +else + stdenv.mkDerivation { + inherit + pname + version + src + meta + ; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook3 + ]; + + buildInputs = libraries; + + unpackPhase = '' + ${dpkg}/bin/dpkg-deb --fsys-tarfile $src | tar --extract + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r usr/share $out/share + + runHook postInstall + ''; + + postFixup = '' + makeWrapper $out/share/keeweb-desktop/keeweb $out/bin/keeweb \ + --argv0 "keeweb" \ + --add-flags "$out/share/keeweb-desktop/resources/app.asar" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libraries}" \ + ''${gappsWrapperArgs[@]} + ''; + } diff --git a/pkgs/by-name/ke/keto/package.nix b/pkgs/by-name/ke/keto/package.nix index 8f50762bfeb26..c85c5750a95ab 100644 --- a/pkgs/by-name/ke/keto/package.nix +++ b/pkgs/by-name/ke/keto/package.nix @@ -15,7 +15,7 @@ buildGoModule { owner = "ory"; repo = "keto"; rev = "v${version}"; - sha256 = "sha256-0yylaaXogN2HWXY8Tb7ScN4jdyeHecJ0gBYlVvcwaNE="; + hash = "sha256-0yylaaXogN2HWXY8Tb7ScN4jdyeHecJ0gBYlVvcwaNE="; }; vendorHash = "sha256-lgwV4Ysjmd9e850Rf5c0wSZtMW3U34/piwwG7dQEUV4="; diff --git a/pkgs/by-name/ke/key-rack/package.nix b/pkgs/by-name/ke/key-rack/package.nix index dfe104303b2c8..dcb5ac1c82ff9 100644 --- a/pkgs/by-name/ke/key-rack/package.nix +++ b/pkgs/by-name/ke/key-rack/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ''; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) pname version src; + inherit (finalAttrs) src; hash = "sha256-wCJTm0W+g3+O1t1fR4maqJoxpPM0NeJG7d54MMAH33c="; }; diff --git a/pkgs/by-name/ke/keycard-cli/package.nix b/pkgs/by-name/ke/keycard-cli/package.nix index 017990084c56a..1b815533d0abf 100644 --- a/pkgs/by-name/ke/keycard-cli/package.nix +++ b/pkgs/by-name/ke/keycard-cli/package.nix @@ -24,6 +24,6 @@ buildGoModule rec { homepage = "https://keycard.status.im"; license = licenses.mpl20; maintainers = [ maintainers.zimbatm ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/keycard-cli.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/keycard-cli.x86_64-darwin }; } diff --git a/pkgs/by-name/ke/keycastr/package.nix b/pkgs/by-name/ke/keycastr/package.nix index 8259a8bb400de..5eca502af1470 100644 --- a/pkgs/by-name/ke/keycastr/package.nix +++ b/pkgs/by-name/ke/keycastr/package.nix @@ -24,6 +24,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = { homepage = "https://github.com/keycastr/keycastr"; description = "Open-source keystroke visualizer"; diff --git a/pkgs/by-name/ke/keycastr/update.sh b/pkgs/by-name/ke/keycastr/update.sh new file mode 100755 index 0000000000000..b564ff9f52e06 --- /dev/null +++ b/pkgs/by-name/ke/keycastr/update.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq gnused + +set -euo pipefail + +cd "$(dirname "$0")" || exit 1 + +# Grab latest release version +LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/keycastr/keycastr/releases/latest" | jq -r '.tag_name' | sed 's/^v//')" +CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)" + +if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then + echo "keycastr is up-to-date" + exit 0 +fi + +HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/keycastr/keycastr/releases/download/v${LATEST_VER}/KeyCastr.app.zip")")" + +sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix +sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix diff --git a/pkgs/by-name/ke/keydb/package.nix b/pkgs/by-name/ke/keydb/package.nix index f33b51a0fbffd..265f8a884fcb6 100644 --- a/pkgs/by-name/ke/keydb/package.nix +++ b/pkgs/by-name/ke/keydb/package.nix @@ -48,18 +48,18 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=${placeholder "out"}" "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" - "USEASM=${if stdenv.isx86_64 then "true" else "false"}" + "USEASM=${if stdenv.hostPlatform.isx86_64 then "true" else "false"}" ] ++ lib.optionals (!tlsSupport) [ "BUILD_TLS=no" ] ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ] - ++ lib.optionals (!stdenv.isx86_64) [ "MALLOC=libc" ]; + ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "MALLOC=libc" ]; enableParallelBuilding = true; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; # darwin currently lacks a pure `pgrep` which is extensively used here - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ which tcl diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix index 31365c7431ceb..420b7ff0de6a9 100644 --- a/pkgs/by-name/ke/keypunch/package.nix +++ b/pkgs/by-name/ke/keypunch/package.nix @@ -18,19 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "keypunch"; - version = "1.0"; + version = "3.1"; src = fetchFromGitHub { owner = "bragefuglseth"; repo = "keypunch"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-S4RckHwrVVQrxy9QngTisNM4+cMM+1dXucwEDnM98Rg="; + hash = "sha256-2S5S7SvMYdEOOrF3SiwpbijsgHcSIyWEVJB41jbrn1A="; }; cargoDeps = rustPlatform.fetchCargoTarball { - name = "${finalAttrs.pname}-${finalAttrs.version}"; - inherit (finalAttrs) src; - hash = "sha256-YzENAGy7zEu1dyuhme+x+gJQlE74Vw0JZvRso0vNQXs="; + inherit (finalAttrs) pname version src; + hash = "sha256-sD+wy1D6nl333PxlDz73YtnfBEmDzb+kNZkZI8JbfSg="; }; strictDeps = true; diff --git a/pkgs/by-name/ki/ki/package.nix b/pkgs/by-name/ki/ki/package.nix index e4d95d64234bc..6c2e6ca89451b 100644 --- a/pkgs/by-name/ki/ki/package.nix +++ b/pkgs/by-name/ki/ki/package.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "langfield"; repo = pname; rev = "eb32fbd3229dc1a60bcc76a937ad63f3eb869f65"; - sha256 = "sha256-5mQhJhvJQC9835goL3t3DRbD+c4P3KxnOflxvqmxL58="; + hash = "sha256-5mQhJhvJQC9835goL3t3DRbD+c4P3KxnOflxvqmxL58="; }; patches = [ diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/by-name/ki/kirc/package.nix similarity index 100% rename from pkgs/applications/networking/irc/kirc/default.nix rename to pkgs/by-name/ki/kirc/package.nix diff --git a/pkgs/by-name/ki/kissfft/package.nix b/pkgs/by-name/ki/kissfft/package.nix index 1480d73b537e4..03d0e7d04584a 100644 --- a/pkgs/by-name/ki/kissfft/package.nix +++ b/pkgs/by-name/ki/kissfft/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { # Required for `test/testcpp.c`. env = { - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__MATH_LONG_DOUBLE_CONSTANTS=1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D__MATH_LONG_DOUBLE_CONSTANTS=1"; }; doCheck = true; diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix index ee1f5fcf85fff..cde4f5d62c141 100644 --- a/pkgs/by-name/ki/kitex/package.nix +++ b/pkgs/by-name/ki/kitex/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kitex"; - version = "0.10.3"; + version = "0.11.3"; src = fetchFromGitHub { owner = "cloudwego"; repo = "kitex"; rev = "v${version}"; - hash = "sha256-aSvN8yjCHxhzLHwQovWFMaoD6ljy8aikxI7jUoeRvDs="; + hash = "sha256-FjFhbkEMxuBUVfytPk27mrBaAlGXZ9RPWeBy+m0bPV8="; }; - vendorHash = "sha256-nscMcJGFZ1YPPynTV+Mp8tXndtlIcszDZm36zMbNBYs="; + vendorHash = "sha256-e98x8lSwO/u8lFbqDmbVNjVG57Y93/P0ls2UUgRvkH0="; subPackages = [ "tool/cmd/kitex" ]; diff --git a/pkgs/by-name/ki/kittysay/package.nix b/pkgs/by-name/ki/kittysay/package.nix index 35f9dc99de5fe..6facdced8d635 100644 --- a/pkgs/by-name/ki/kittysay/package.nix +++ b/pkgs/by-name/ki/kittysay/package.nix @@ -13,7 +13,7 @@ in owner = "uncenter"; repo = "kittysay"; rev = "v${version}"; - sha256 = "sha256-ZYHrDBJ8cTqJAh2KUGSCsS1bY/emHRodPxZX2vxAhDs="; + hash = "sha256-ZYHrDBJ8cTqJAh2KUGSCsS1bY/emHRodPxZX2vxAhDs="; }; cargoHash = "sha256-F0WAtpAjBwL5YfzGtPgn7WTL6lgx3bjZFBQdDpjCr3I="; diff --git a/pkgs/by-name/ki/kiwitalk/package.nix b/pkgs/by-name/ki/kiwitalk/package.nix index efc9c55337d3b..b700b198bc372 100644 --- a/pkgs/by-name/ki/kiwitalk/package.nix +++ b/pkgs/by-name/ki/kiwitalk/package.nix @@ -1,16 +1,15 @@ { lib , fetchFromGitHub -, copyDesktopItems , stdenv , rustc , rustPlatform , cargo , cargo-tauri +, desktop-file-utils , openssl , libayatana-appindicator , webkitgtk , pkg-config -, makeDesktopItem , pnpm , nodejs }: @@ -49,10 +48,10 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook cargo rustc - cargo-tauri + cargo-tauri.hook + desktop-file-utils nodejs pnpm.configHook - copyDesktopItems pkg-config ]; @@ -62,28 +61,13 @@ stdenv.mkDerivation (finalAttrs: { webkitgtk ]; - preBuild = '' - cargo tauri build -b deb + postInstall = lib.optionalString stdenv.isLinux '' + desktop-file-edit \ + --set-comment "An UNOFFICIAL cross-platform KakaoTalk client" \ + --set-key="Categories" --set-value="Network;InstantMessaging;" \ + $out/share/applications/kiwi-talk.desktop ''; - preInstall = '' - mv target/release/bundle/deb/*/data/usr/ $out - # delete the generated desktop entry - rm -r $out/share/applications - ''; - - desktopItems = [ - (makeDesktopItem { - name = "KiwiTalk"; - exec = "kiwi-talk"; - icon = "kiwi-talk"; - desktopName = "KiwiTalk"; - comment = "An UNOFFICIAL cross-platform KakaoTalk client"; - categories = [ "Network" "InstantMessaging" ]; - terminal = false; - }) - ]; - meta = with lib; { description = "UNOFFICIAL cross-platform KakaoTalk client written in TypeScript & Rust (SolidJS, tauri)"; homepage = "https://github.com/KiwiTalk/KiwiTalk"; diff --git a/pkgs/by-name/kl/klong/package.nix b/pkgs/by-name/kl/klong/package.nix new file mode 100644 index 0000000000000..e5ffb916dfd8d --- /dev/null +++ b/pkgs/by-name/kl/klong/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchurl, + fetchFromSourcehut, + installShellFiles, + makeBinaryWrapper, + gv, +}: + +stdenv.mkDerivation rec { + pname = "klong"; + version = "20221212"; + + src = fetchurl { + url = "https://t3x.org/klong/klong${version}.tgz"; + hash = "sha256-XhpIdyKKPGQ6mdv9LXPmC8P6hW4mFawv54yANw5/lrQ="; + }; + + docs = fetchFromSourcehut { + owner = "~nut"; + repo = "klong-docs"; + rev = "350da558709e3728df60ddf45fafe09e3fb89139"; + hash = "sha256-yfvXljjJwCETWPa70zXhaQJOHhZYR2k+BKAd0Dw/U70="; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + installShellFiles + ]; + + installPhase = '' + runHook preInstall + install -m 555 -Dt $out/bin kg kplot + install -m 444 -Dt $out/lib/klong lib/*.kg + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/kg --prefix KLONGPATH : $out/lib/klong + wrapProgram $out/bin/kplot --prefix PATH : ${ + lib.makeBinPath [ + "$out" + gv + ] + } + installManPage $docs/*.1 + ''; + + meta = { + description = "Simple Array programming language"; + homepage = "https://t3x.org/klong"; + mainProgram = "kg"; + maintainers = [ lib.maintainers.casaca ]; + platforms = lib.platforms.all; + license = with lib.licenses; [ + publicDomain + cc0 + ]; + }; +} diff --git a/pkgs/by-name/kn/knossosnet/deps.nix b/pkgs/by-name/kn/knossosnet/deps.nix index 233d43f5c0fe8..e0481a153b294 100644 --- a/pkgs/by-name/kn/knossosnet/deps.nix +++ b/pkgs/by-name/kn/knossosnet/deps.nix @@ -2,114 +2,115 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.5"; sha256 = "1l8vpw7dmkgll197i42r98ikkl0g08469wkl1kxkcv8f0allgah6"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.5"; sha256 = "0w1909yjg1s1h6zzxbfw1dazvlknpgk9v7d03ik7ihd14lxzr1i2"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.5"; sha256 = "14nr767zhxcqwis901sn5s9qala0wf2ip4pic3ncdvkhyhq6w9fs"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.5"; sha256 = "1zqp8whkvm95zxhjpwska7rhkbxjfkv2fz3821pn782931pn59ah"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.5"; sha256 = "1plr03dgq24gjlcx39qlbcg2ywh7in58yfkkq9snvnagh8yk3ifi"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.5"; sha256 = "0sn6c3mqvc62vhy8ssmz515wbcaq418qfrck67zysp2qzw5iyv9v"; }) - (fetchNuGet { pname = "Avalonia.HtmlRenderer"; version = "11.0.0"; sha256 = "1glnc82dasxcajb84h41273cfaa5apxwfrh12bgd294hfzbza40c"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.5"; sha256 = "1n41g1z36sgvhfl7bdavc3j7ccr3qkbqjc4znimqazzyfifh0m99"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.5"; sha256 = "0a6a8lbpna3z5bcall7a953r3xjibcl90ic21gimwhipyp29sfn1"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.5"; sha256 = "008pqpim91i6mya0nfn3g9gclh0dw5mqmhi2fdalbh62sa8a18xc"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.5"; sha256 = "1zhg11c8iah06gkv6gk7vzs0q9lbx1whfma5p2s00k3kyhv9lcqi"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.5"; sha256 = "1i6xpihpw32i9mywzzhw0nyc2gkifmri6ylila21y8xb0jdazdyv"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.5"; sha256 = "03rbx4msnl8jvw1017wi88rxvgg8iz7idy7wajp3nzk9m0c4pilx"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.5"; sha256 = "1bixdr5yzd9spyjc4n2kf1bwg52q3p5akj9xsr25xp310j3kgyxf"; }) - (fetchNuGet { pname = "CommunityToolkit.Mvvm"; version = "8.2.2"; sha256 = "01kkwhz3r7l9d70p6mcgpdc0f05dad0lv6dmcj4sq9ry9ic6pnmx"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) - (fetchNuGet { pname = "ini-parser-netstandard"; version = "2.5.2"; sha256 = "14alsxh7ik07xl9xab8bdi108f4xhz8vcchxvxy1k5w3zf3gdml9"; }) - (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "7.0.0"; sha256 = "196b13zkkq0fhfgigkhwcw1hhaj4dj5pc27z7d5niaizzx6ycwiw"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.33.0"; sha256 = "1j94hfjvkygpp97svv75jay0rmnx9ygg86d5syyahl9hayns4ig9"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; sha256 = "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.6"; sha256 = "0cg38xgddww1y93xrnbfn40sin63yl39j5zm7gm5pdgp5si0cf2n"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; sha256 = "1fp9h8c8k6sbsh48b69dc6461isd4dajq7yw5i7j6fhkas78q4zf"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.6"; sha256 = "02wpxwqwknhdhkl00in766samqfzi7r6jmhxs4d047v0fmygv1h8"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; sha256 = "1w2mwcwkqvrg4x4ybc4674xnkqwh1n2ihg520gqgpnqfc11ghc4n"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) + (fetchNuGet { pname = "AnimatedImage.Avalonia"; version = "1.0.7"; hash = "sha256-E3wguYRmXYbdP7qcVER5IdxvB5S7rbGoZD7+jwrk5zM="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.5"; hash = "sha256-BqpHqQIObTb7DHTyZAgCD9A5I0pZkHhSoPTN2g6/G9E="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.5"; hash = "sha256-Iob8OyWhwXhmHKCdnea7dtL9VQvcrf6/gUGHJ30CKXA="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.5"; hash = "sha256-2iVuMPRw7sbsYPGSG4XjQFGFky5WB5B05Jh1+I852ZI="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.5"; hash = "sha256-UKVibxhJoGNvEGh8J/Z0sq8J81FT8yth/yXVPSFHF/8="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.5"; hash = "sha256-0cUxPYJP2W11wnM6j4qNB3IvHlsUp9EZlY8I/NoAmd4="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.5"; hash = "sha256-O20fC/9YXO3/MZNlh1EgWLHFSyi/ao083MKwjetgxmo="; }) + (fetchNuGet { pname = "Avalonia.HtmlRenderer"; version = "11.0.0"; hash = "sha256-DBD113eQJNHeEgFmx/tVRSnHxhGBQIKWVKxr1QRilr4="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.5"; hash = "sha256-KVUAXXT+f4VrtJ8widfEIzN25GBbtXWog/tpM354gdg="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.5"; hash = "sha256-wTqdxPU3Ql7jC4JFkChbUfaRR0nqUKrYKn8oexdFyig="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.5"; hash = "sha256-rKOgkNLCwEVVcyLCimvhDUDKXnrDOguUryaGVOPFFwE="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.5"; hash = "sha256-ETOaNvRzTAC0uEVVB3noiyYM9N9nPrPnMwCqiFgID/4="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.5"; hash = "sha256-27evmgSrIx+EopF6E3N1cT7BvAUc/s99TVEMfmG83cQ="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.5"; hash = "sha256-ncZLGKhpfjuuVPz4Fs+P6L3dM0KRnwAC3xJRqyvpKw8="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.5"; hash = "sha256-rvs3hwRh3F5E1j3JqcodWJTHV3BTWMKkvzq170tuPa4="; }) + (fetchNuGet { pname = "CommunityToolkit.Mvvm"; version = "8.2.2"; hash = "sha256-vdprWEw+J6yJZLWZTUFTrQAHWLuPVXPBaYmePD7kcwY="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="; }) + (fetchNuGet { pname = "ini-parser-netstandard"; version = "2.5.2"; hash = "sha256-idb2hvuDlxl83x0yttGHnTgEQmwLLdUT7QfMeGDXVJE="; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; hash = "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; hash = "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "7.0.0"; hash = "sha256-PHLmTf8/qmhLO/8IdotsRCoIA2cczhefgw7gOf8Iy6Q="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; hash = "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; hash = "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; hash = "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; hash = "sha256-AGnfNNDvZDGZ0Er9JQxeyLoUbVH+jfXF3anFr12qk6w="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.33.0"; hash = "sha256-6UWirVcwUai816UZ9J5P3dYMvJLl7K1Puvf5uaWDJMk="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; hash = "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.6"; hash = "sha256-VjgGoi73tVvqO/UXmQb1w9ioAbFu2dxH8oHz1l5H4zE="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; hash = "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.6"; hash = "sha256-CIb9fHVgHwIa0R1WafKJ3+GqtDHHRgDohA3ayTHvlws="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; hash = "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) ] diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index a6a41e20fc739..b621f549ccf57 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -1,21 +1,19 @@ { buildDotnetModule , fetchFromGitHub - , fontconfig , lib , openal - , xorg }: buildDotnetModule rec { pname = "knossosnet"; - version = "1.2.0"; + version = "1.2.3"; src = fetchFromGitHub { owner = "KnossosNET"; repo = "Knossos.NET"; rev = "v${version}"; - hash = "sha256-4GVbwBykagSMGF3TxyZeoRb7Km+yLEMFOO8fCkH3U5A="; + hash = "sha256-5FNb+L+ABkR/ubSZXuV4hlzy6pIWEXaTXl4piNsmkmw="; }; patches = [ ./targetframework.patch ]; @@ -23,7 +21,7 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; executables = [ "Knossos.NET" ]; - runtimeDeps = [ fontconfig openal xorg.libX11 xorg.libICE xorg.libSM ]; + runtimeDeps = [ openal ]; meta = with lib; { homepage = "https://github.com/KnossosNET/Knossos.NET"; diff --git a/pkgs/by-name/kn/knxd/package.nix b/pkgs/by-name/kn/knxd/package.nix index 38e09d5797453..bcbe85fcefc21 100644 --- a/pkgs/by-name/kn/knxd/package.nix +++ b/pkgs/by-name/kn/knxd/package.nix @@ -10,7 +10,7 @@ , fmt_9 , libev , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd -, withUsb ? stdenv.isLinux, libusb1 +, withUsb ? stdenv.hostPlatform.isLinux, libusb1 }: stdenv.mkDerivation (finalAttrs: { @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fmt_9 libev ] ++ lib.optional withSystemd systemd ++ lib.optional withUsb libusb1 - ++ lib.optional stdenv.isDarwin argp-standalone; + ++ lib.optional stdenv.hostPlatform.isDarwin argp-standalone; configureFlags = [ (lib.enableFeature withSystemd "systemd") diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 124cdbebd4709..4d1a69a3b0bec 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -16,7 +16,7 @@ config, cudaPackages ? { }, - openblasSupport ? !stdenv.isDarwin, + openblasSupport ? !stdenv.hostPlatform.isDarwin, openblas, cublasSupport ? config.cudaSupport, @@ -24,14 +24,14 @@ # For example if you're on an GTX 1080 that means you're using "Pascal" and you need to pass "sm_60" cudaArches ? cudaPackages.cudaFlags.realArches or [ ], - clblastSupport ? stdenv.isLinux, + clblastSupport ? stdenv.hostPlatform.isLinux, clblast, ocl-icd, vulkanSupport ? true, vulkan-loader, - metalSupport ? stdenv.isDarwin && stdenv.isAarch64, + metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64, march ? "", mtune ? "", }: @@ -44,7 +44,7 @@ let ''; darwinFrameworks = - if (stdenv.isDarwin && stdenv.isx86_64) then + if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then darwin.apple_sdk.frameworks else darwin.apple_sdk_11_0.frameworks; @@ -53,13 +53,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.73.1"; + version = "1.75.2"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-LRXtmQ5u+/vgcU6YC9IN2CazfDtg5+jZnJV2o9jEAaY="; + hash = "sha256-olMlYzde97RSx0OmDULSOFlM3imUq3AVxQdXyYBPd3Q="; }; enableParallelBuilding = true; @@ -74,7 +74,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { buildInputs = [ tk ] ++ finalAttrs.pythonInputs - ++ lib.optionals effectiveStdenv.isDarwin [ + ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ darwinFrameworks.Accelerate darwinFrameworks.CoreVideo darwinFrameworks.CoreGraphics @@ -100,7 +100,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { pythonPath = finalAttrs.pythonInputs; - darwinLdFlags = lib.optionals stdenv.isDarwin [ + darwinLdFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-F${darwinFrameworks.CoreServices}/Library/Frameworks" "-F${darwinFrameworks.Accelerate}/Library/Frameworks" "-framework CoreServices" diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix index 8738bad387fcf..7810bcacaa056 100644 --- a/pkgs/by-name/ko/kokkos/package.nix +++ b/pkgs/by-name/ko/kokkos/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kokkos"; - version = "4.3.01"; + version = "4.4.01"; src = fetchFromGitHub { owner = "kokkos"; repo = "kokkos"; rev = finalAttrs.version; - hash = "sha256-x496DKEBMNUUZ2rBNT2MPBV8Obi5aUKQuHwjLiNPMhk="; + hash = "sha256-VpUbvSQ6PQhhm9ovj97U9XEdbfro9K+LSmeSiNpqHuI="; }; nativeBuildInputs = [ @@ -40,6 +40,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ asl20-llvm ]; maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 61f41cd5c58d3..3e5186ec4851b 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage { dbus openssl zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/ko/koodo-reader/package.nix b/pkgs/by-name/ko/koodo-reader/package.nix index a57c44b0c37f5..2d5132fb4cbea 100644 --- a/pkgs/by-name/ko/koodo-reader/package.nix +++ b/pkgs/by-name/ko/koodo-reader/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { yarnBuildHook nodejs ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems wrapGAppsHook3 ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -Dm644 assets/icons/256x256.png $out/share/icons/hicolor/256x256/apps/koodo-reader.png install -Dm644 ${./mime-types.xml} $out/share/mime/packages/koodo-reader.xml @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/lib/koodo-reader ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r dist/mac*/"Koodo Reader.app" $out/Applications makeWrapper "$out/Applications/Koodo Reader.app/Contents/MacOS/Koodo Reader" $out/bin/koodo-reader @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # we use makeShellWrapper instead of the makeBinaryWrapper provided by wrapGAppsHook for proper shell variable expansion - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' makeShellWrapper ${lib.getExe electron} $out/bin/koodo-reader \ --add-flags $out/share/lib/koodo-reader/resources/app.asar \ "''${gappsWrapperArgs[@]}" \ diff --git a/pkgs/by-name/kr/krelay/package.nix b/pkgs/by-name/kr/krelay/package.nix new file mode 100644 index 0000000000000..fdf8e90c0477c --- /dev/null +++ b/pkgs/by-name/kr/krelay/package.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "krelay"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "knight42"; + repo = pname; + rev = "v${version}"; + hash = "sha256-TonkGh4j+xLGgSpspCedg6c2NpIZIzp5pv8VtWFssPk="; + }; + + vendorHash = "sha256-Qz3q/503A5QmsgEaDqChxS2tcUEJGmeT6YE6R3LBbcY="; + + subPackages = [ "cmd/client" ]; + + ldflags = [ "-s" "-w" "-X github.com/knight42/krelay/pkg/constants.ClientVersion=${version}" ]; + + postInstall = '' + mv $out/bin/client $out/bin/kubectl-relay + ''; + + meta = with lib; { + description = "Drop-in replacement for `kubectl port-forward` with some enhanced features"; + homepage = "https://github.com/knight42/krelay"; + changelog = "https://github.com/knight42/krelay/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ivankovnatsky ]; + mainProgram = "kubectl-relay"; + }; +} diff --git a/pkgs/by-name/kr/krun/package.nix b/pkgs/by-name/kr/krun/package.nix index d851203a30fde..430916abaa5a8 100644 --- a/pkgs/by-name/kr/krun/package.nix +++ b/pkgs/by-name/kr/krun/package.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fetchpatch , rustPlatform -, libiconv , libkrun , makeWrapper , passt diff --git a/pkgs/by-name/kt/ktor-cli/package.nix b/pkgs/by-name/kt/ktor-cli/package.nix new file mode 100644 index 0000000000000..073f9dbbf5e1c --- /dev/null +++ b/pkgs/by-name/kt/ktor-cli/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "ktor-cli"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "ktorio"; + repo = "ktor-cli"; + rev = "refs/tags/${version}"; + hash = "sha256-rIXyLqXEfbw0YR8+0N5XyntsB8H0D5DvJTneatuC48s="; + }; + + subPackages = "cmd/ktor"; + + vendorHash = "sha256-gu/tuQPScSN0qsNd3fz/tz1ck6OGj/lupnNd/xLJxmk="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + meta = { + description = "Command-line tool for creating Ktor projects"; + homepage = "https://github.com/ktorio/ktor-cli"; + changelog = "https://github.com/ktorio/ktor-cli/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nartsiss ]; + mainProgram = "ktor"; + }; +} diff --git a/pkgs/by-name/kt/kty/package.nix b/pkgs/by-name/kt/kty/package.nix new file mode 100644 index 0000000000000..65ba33a0a8069 --- /dev/null +++ b/pkgs/by-name/kt/kty/package.nix @@ -0,0 +1,51 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "kty"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "grampelberg"; + repo = "kty"; + rev = "refs/tags/v${version}"; + hash = "sha256-E9PqWDBKYJFYOUNyjiK+AM2WULMiwupFWTOQlBH+6d4="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + env = { + OPENSSL_NO_VENDOR = 1; + }; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk; + [ + frameworks.SystemConfiguration + ] + ); + + cargoHash = "sha256-mhXi4YgYT2NfIjtESjvSP5TMOl3UH3CJFwKlJriZ0/4="; + + meta = { + homepage = "https://kty.dev/"; + changelog = "https://github.com/grampelberg/kty/releases/tag/v${version}"; + description = "Terminal for Kubernetes"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + mainProgram = "kty"; + }; +} diff --git a/pkgs/by-name/ku/kubecolor/package.nix b/pkgs/by-name/ku/kubecolor/package.nix new file mode 100644 index 0000000000000..f51d0a8a6af1a --- /dev/null +++ b/pkgs/by-name/ku/kubecolor/package.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub, kubectl, installShellFiles }: + +buildGoModule rec { + pname = "kubecolor"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-jOFeTAfV7X8+z+DBOBOFVcspxZ8QssKFWRGK9HnqBO0="; + }; + + vendorHash = "sha256-b99HAM1vsncq9Q5XJiHZHyv7bjQs6GGyNAMONmGpxms="; + + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; + + subPackages = [ + "." + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # kubecolor re-uses the completions of kubectl for its own executable + + installShellCompletion --cmd kubecolor \ + --bash <(${lib.getExe kubectl} completion bash) \ + --fish <(${lib.getExe kubectl} completion fish) \ + --zsh <(${lib.getExe kubectl} completion zsh) + + # https://kubecolor.github.io/setup/shells/bash/ + echo 'complete -o default -F __start_kubectl kubecolor' >> $out/share/bash-completion/completions/kubecolor.bash + + # https://kubecolor.github.io/setup/shells/fish/ + echo -e 'function kubecolor --wraps kubectl\n command kubecolor $argv\nend' >> $out/share/fish/vendor_completions.d/kubecolor.fish + + # https://kubecolor.github.io/setup/shells/zsh/ + echo 'compdef kubecolor=kubectl' >> $out/share/zsh/site-functions/_kubecolor + ''; + + meta = with lib; { + description = "Colorizes kubectl output"; + mainProgram = "kubecolor"; + homepage = "https://github.com/kubecolor/kubecolor"; + changelog = "https://github.com/kubecolor/kubecolor/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ivankovnatsky SuperSandro2000 applejag ]; + }; +} diff --git a/pkgs/by-name/ku/kubectl-doctor/package.nix b/pkgs/by-name/ku/kubectl-doctor/package.nix index 050192b86c9f4..670c7d0638dc5 100644 --- a/pkgs/by-name/ku/kubectl-doctor/package.nix +++ b/pkgs/by-name/ku/kubectl-doctor/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "emirozer"; repo = pname; rev = version; - sha256 = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY="; + hash = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY="; }; patches = [ @@ -16,7 +16,7 @@ buildGoModule rec { # https://github.com/emirozer/kubectl-doctor/pull/21 name = "go-1.19-client-go-0.25.patch"; url = "https://github.com/emirozer/kubectl-doctor/commit/a987ef58063e305409034af280d688a11682dbb9.patch"; - sha256 = "sha256-NQd/WxUfYwBDowhnoUWaOV8k7msiOhff3Bjux+a9R9E="; + hash = "sha256-NQd/WxUfYwBDowhnoUWaOV8k7msiOhff3Bjux+a9R9E="; }) ]; diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix new file mode 100644 index 0000000000000..5126591d79603 --- /dev/null +++ b/pkgs/by-name/ku/kubectl-gadget/package.nix @@ -0,0 +1,44 @@ +{ lib, buildGoModule, fetchFromGitHub, kubectl-gadget, testers }: + +buildGoModule rec { + pname = "kubectl-gadget"; + version = "0.32.0"; + + src = fetchFromGitHub { + owner = "inspektor-gadget"; + repo = "inspektor-gadget"; + rev = "v${version}"; + hash = "sha256-c6hy7B8zaU/LnTMAohc9KPzu1ocOVFJ9wL4GOIwxqkw="; + }; + + vendorHash = "sha256-7HfYCHxQUapDo33IAzxCp2iaL4G7oOqK0KyjqbmbR/w="; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" "-w" + "-X github.com/inspektor-gadget/inspektor-gadget/internal/version.version=v${version}" + "-X main.gadgetimage=ghcr.io/inspektor-gadget/inspektor-gadget:v${version}" + "-extldflags=-static" + ]; + + tags = [ + "withoutebpf" + ]; + + subPackages = [ "cmd/kubectl-gadget" ]; + + passthru.tests.version = testers.testVersion { + package = kubectl-gadget; + command = "kubectl-gadget version || true"; # mask non-zero return code if no kubeconfig present + version = "v${version}"; + }; + + meta = with lib; { + description = "Collection of gadgets for troubleshooting Kubernetes applications using eBPF"; + mainProgram = "kubectl-gadget"; + homepage = "https://inspektor-gadget.io"; + license = licenses.asl20; + maintainers = with maintainers; [ kranurag7 devusb ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubectl-images/default.nix b/pkgs/by-name/ku/kubectl-images/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-images/default.nix rename to pkgs/by-name/ku/kubectl-images/package.nix diff --git a/pkgs/applications/networking/cluster/kubectl-ktop/default.nix b/pkgs/by-name/ku/kubectl-ktop/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-ktop/default.nix rename to pkgs/by-name/ku/kubectl-ktop/package.nix diff --git a/pkgs/applications/networking/cluster/kubectl-tree/default.nix b/pkgs/by-name/ku/kubectl-tree/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-tree/default.nix rename to pkgs/by-name/ku/kubectl-tree/package.nix diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix new file mode 100644 index 0000000000000..efc658aae6a8c --- /dev/null +++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGo123Module, + fetchFromGitHub, +}: + +buildGo123Module rec { + pname = "kubelogin"; + version = "1.30.1"; + + src = fetchFromGitHub { + owner = "int128"; + repo = "kubelogin"; + rev = "v${version}"; + hash = "sha256-aoLPT3lX+q426QlxAPsjeQyTZMnmqMGh85jJPU7lQVU="; + }; + + subPackages = [ "." ]; + ldflags = [ + "-s" + "-w" + "-X main.version=v${version}" + ]; + + vendorHash = "sha256-gr+SsC7MiLj/MZ8kca5Hcfge+7Pm4y963TfwyKHEhBY="; + + # test all packages + preCheck = '' + unset subPackages + ''; + + # Rename the binary instead of symlinking to avoid conflict with the + # Azure version of kubelogin + postInstall = '' + mv $out/bin/kubelogin $out/bin/kubectl-oidc_login + ''; + + meta = { + description = "Kubernetes credential plugin implementing OpenID Connect (OIDC) authentication"; + mainProgram = "kubectl-oidc_login"; + inherit (src.meta) homepage; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + benley + nevivurn + ]; + }; +} diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix new file mode 100644 index 0000000000000..4c4ce328215b4 --- /dev/null +++ b/pkgs/by-name/ku/kubetui/package.nix @@ -0,0 +1,42 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "kubetui"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "sarub0b0"; + repo = "kubetui"; + rev = "refs/tags/v${version}"; + hash = "sha256-0K0h/MaQClJDqgF0qQO2INb+hpzxfSikAti+751MX/8="; + }; + + checkFlags = [ + "--skip=workers::kube::store::tests::kubeconfigからstateを生成" + ]; + + buildInputs = lib.optionals (stdenv.isDarwin) ( + with darwin.apple_sdk; + [ + frameworks.CoreGraphics + frameworks.AppKit + ] + ); + cargoHash = "sha256-kfAErXqjdLn2jaCtr+eI0+0v4TcE8Hpx0DDECnuYp5w="; + + meta = { + homepage = "https://github.com/sarub0b0/kubetui"; + changelog = "https://github.com/sarub0b0/kubetui/releases/tag/v${version}"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.mit; + description = "Intuitive TUI tool for real-time monitoring and exploration of Kubernetes resources"; + mainProgram = "kubetui"; + }; +} diff --git a/pkgs/by-name/ku/kulala-fmt/package.nix b/pkgs/by-name/ku/kulala-fmt/package.nix index 406d73d4118b0..204aaa00ad32b 100644 --- a/pkgs/by-name/ku/kulala-fmt/package.nix +++ b/pkgs/by-name/ku/kulala-fmt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kulala-fmt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala-fmt"; rev = "v${version}"; - hash = "sha256-mnOUYRRVNXkI0yRQFLnuL7yC+YdtWVS0+syJOcHmO6w="; + hash = "sha256-yq7DMrt+g5wM/tynI7Cf6MBJs/d+fP3IppndKnTJMTw="; }; vendorHash = "sha256-GazDEm/qv0nh8vYT+Tf0n4QDGHlcYtbMIj5rlZBvpKo="; diff --git a/pkgs/by-name/kw/kwok/package.nix b/pkgs/by-name/kw/kwok/package.nix new file mode 100644 index 0000000000000..cf11b9dadb0e3 --- /dev/null +++ b/pkgs/by-name/kw/kwok/package.nix @@ -0,0 +1,29 @@ +{ + buildGoModule, + lib, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "kwok"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "kwok"; + rev = "refs/tags/v${version}"; + hash = "sha256-3g8enPxxh2SaxiDgDwJpAfSjv/iRoBRmTnXwDtuMdFA="; + }; + + vendorHash = "sha256-YVGXYN7PgGgBzxhx6piP3NHRAsR1/pCj97UWB21WNMg="; + + doCheck = false; # docker is need for test + + meta = { + description = "Simulate massive Kubernetes clusters with low resource usage locally without kubelet"; + homepage = "https://kwok.sigs.k8s.io"; + changelog = "https://github.com/kubernetes-sigs/kwok/releases/tag/v${version}"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + }; +} diff --git a/pkgs/by-name/ky/kyua/package.nix b/pkgs/by-name/ky/kyua/package.nix index ba399a44ab749..c3d4b7fc49b1f 100644 --- a/pkgs/by-name/ky/kyua/package.nix +++ b/pkgs/by-name/ky/kyua/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'CLI_LIBS = ' 'CLI_LIBS = libutils.a ' '' # These tests fail on Darwin or are unreliable. - + lib.optionalString (finalAttrs.doInstallCheck && stdenv.isDarwin) '' + + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isDarwin) '' sed -i utils/process/Makefile.am.inc -e '/executor_pid_test/d' substituteInPlace utils/process/Kyuafile \ --replace-fail 'atf_test_program{name="executor_pid_test"}' "" @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'atf_add_test_case premature_exit' "" '' # fchflags and UF_NOUNLINK are not supported on Linux. Other tests also fail. - + lib.optionalString (finalAttrs.doInstallCheck && stdenv.isLinux) '' + + lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isLinux) '' sed -i utils/process/Makefile.am.inc -e '/executor_pid_test/d' substituteInPlace utils/process/Kyuafile \ --replace-fail 'atf_test_program{name="executor_pid_test"}' "" @@ -111,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Testing framework for infrastructure software"; homepage = "https://github.com/freebsd/kyua/"; + changelog = "https://github.com/freebsd/kyua/blob/master/NEWS.md"; license = lib.licenses.bsd3; mainProgram = "kyua"; maintainers = with lib.maintainers; [ reckenrode ]; diff --git a/pkgs/by-name/la/labctl/package.nix b/pkgs/by-name/la/labctl/package.nix index 231d0984b2075..987b5461611df 100644 --- a/pkgs/by-name/la/labctl/package.nix +++ b/pkgs/by-name/la/labctl/package.nix @@ -36,6 +36,7 @@ buildGoModule rec { meta = with lib; { description = "collection of helper tools for network engineers, while configuring and experimenting with their own network labs"; homepage = "https://labctl.net"; + changelog = "https://github.com/labctl/labctl/releases"; license = licenses.asl20; maintainers = [ ]; mainProgram = "labctl"; diff --git a/pkgs/by-name/la/labelle/package.nix b/pkgs/by-name/la/labelle/package.nix index 3441d4056c97b..3b2a7c98c86ad 100644 --- a/pkgs/by-name/la/labelle/package.nix +++ b/pkgs/by-name/la/labelle/package.nix @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { ]; meta = { - changelog = "https://github.com/labelle-org/labelle/releases/tag/${src.rev}"; + changelog = "https://github.com/labelle-org/labelle/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; description = "Print labels with LabelManager PnP from Dymo"; homepage = "https://github.com/labelle-org/labelle"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/la/labwc-menu-generator/package.nix b/pkgs/by-name/la/labwc-menu-generator/package.nix index da51d9d73a7a0..a7a4f781edd92 100644 --- a/pkgs/by-name/la/labwc-menu-generator/package.nix +++ b/pkgs/by-name/la/labwc-menu-generator/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-menu-generator"; - version = "0.1.0-unstable-2024-07-09"; + version = "0.1.0-unstable-2024-09-19"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-menu-generator"; - rev = "a2b3e8e46068d82e97168772e7c194d6b6e03e3d"; - hash = "sha256-Y5gBaTgVu3OzZQwGDNLsmQkfS0txBm/vD0MG5av2Gv0="; + rev = "ebb8240bfd39ab2ffbe98d5cfe26f9c1b678822d"; + hash = "sha256-4WGBrqY30wVXmnjZ5QPhfNfauvnxqrTE6DFuITfTI4M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix index a5ded72c8fb99..59e3da8c08d15 100644 --- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix +++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-tweaks-gtk"; - version = "0-unstable-2024-05-22"; + version = "0-unstable-2024-09-30"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-tweaks-gtk"; - rev = "485961aaaaa3c0158b6b31efd6e504db3c58dc27"; - hash = "sha256-+X/inkxVPN26AYMqtq3uvfGPlVVhxQpEtF1A9uYAmfY="; + rev = "19ae222b6bab778d0f8a900d39c25ab020e33631"; + hash = "sha256-coA8gU2AKeHs6OENxBWholk5sEL/oketxNFLd8M1kTM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lacus/package.nix b/pkgs/by-name/la/lacus/package.nix index 5350408e8c0a6..4f1e42f0e70e3 100644 --- a/pkgs/by-name/la/lacus/package.nix +++ b/pkgs/by-name/la/lacus/package.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -16,6 +17,7 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "gunicorn" "psutil" "redis" ]; diff --git a/pkgs/by-name/la/lammps-mpi/package.nix b/pkgs/by-name/la/lammps-mpi/package.nix new file mode 100644 index 0000000000000..1ac2e6a8bcb22 --- /dev/null +++ b/pkgs/by-name/la/lammps-mpi/package.nix @@ -0,0 +1,13 @@ +{ + lammps, + mpi, + lowPrio, +}: + +lowPrio ( + lammps.override { + extraBuildInputs = [ + mpi + ]; + } +) diff --git a/pkgs/by-name/la/lammps/package.nix b/pkgs/by-name/la/lammps/package.nix new file mode 100644 index 0000000000000..496ea81b0b482 --- /dev/null +++ b/pkgs/by-name/la/lammps/package.nix @@ -0,0 +1,127 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libpng, + gzip, + fftw, + blas, + lapack, + python3, + cmake, + autoAddDriverRunpath, + pkg-config, + # Available list of packages can be found near here: + # + # - https://github.com/lammps/lammps/blob/develop/cmake/CMakeLists.txt#L222 + # - https://docs.lammps.org/Build_extras.html + packages ? { + ASPHERE = true; + BODY = true; + CLASS2 = true; + COLLOID = true; + COMPRESS = true; + CORESHELL = true; + DIPOLE = true; + GRANULAR = true; + KSPACE = true; + MANYBODY = true; + MC = true; + MISC = true; + MOLECULE = true; + OPT = true; + PERI = true; + QEQ = true; + REPLICA = true; + RIGID = true; + SHOCK = true; + ML-SNAP = true; + SRD = true; + REAXFF = true; + PYTHON = true; + }, + # Extra cmakeFlags to add as "-D${attr}=${value}" + extraCmakeFlags ? { }, + # Extra `buildInputs` - meant for packages that require more inputs + extraBuildInputs ? [ ], +}: + +stdenv.mkDerivation (finalAttrs: { + # LAMMPS has weird versioning convention. Updates should go smoothly with: + # nix-update --commit lammps --version-regex 'stable_(.*)' + version = "29Aug2024_update1"; + pname = "lammps"; + + src = fetchFromGitHub { + owner = "lammps"; + repo = "lammps"; + rev = "stable_${finalAttrs.version}"; + hash = "sha256-B2oMs9bVYO+G3yL1DGJVK/INIfANMDREV7AtC4kH3H8="; + }; + preConfigure = '' + cd cmake + ''; + 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 + ]; + + passthru = { + # Remove these at some point - perhaps after release 23.11. See discussion at: + # https://github.com/NixOS/nixpkgs/pull/238771#discussion_r1235459961 + mpi = throw "`lammps-mpi.passthru.mpi` was removed in favor of `extraBuildInputs`"; + inherit packages; + inherit extraCmakeFlags; + inherit extraBuildInputs; + }; + cmakeFlags = + [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + ] + ++ (lib.mapAttrsToList (n: v: lib.cmakeBool "PKG_${n}" v) packages) + ++ (lib.mapAttrsToList (n: v: "-D${n}=${v}") extraCmakeFlags); + + buildInputs = [ + fftw + libpng + blas + lapack + gzip + ] ++ lib.optionals packages.PYTHON [ python3 ] ++ extraBuildInputs; + + postInstall = '' + # For backwards compatibility + ln -s $out/bin/lmp $out/bin/lmp_serial + # Install vim and neovim plugin + install -Dm644 ../../tools/vim/lammps.vim $out/share/vim-plugins/lammps/syntax/lammps.vim + install -Dm644 ../../tools/vim/filetype.vim $out/share/vim-plugins/lammps/ftdetect/lammps.vim + mkdir -p $out/share/nvim + ln -s $out/share/vim-plugins/lammps $out/share/nvim/site + ''; + + meta = { + description = "Classical Molecular Dynamics simulation code"; + longDescription = '' + LAMMPS is a classical molecular dynamics simulation code designed to + run efficiently on parallel computers. It was developed at Sandia + National Laboratories, a US Department of Energy facility, with + funding from the DOE. It is an open-source code, distributed freely + under the terms of the GNU Public License (GPL). + ''; + homepage = "https://www.lammps.org"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + # compiling lammps with 64 bit support blas and lapack might cause runtime + # segfaults. In anycase both blas and lapack should have the same #bits + # support. + broken = (blas.isILP64 && lapack.isILP64); + maintainers = with lib.maintainers; [ + costrouc + doronbehar + ]; + mainProgram = "lmp"; + }; +}) diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix index dff74b1b7958c..b9bf9b2ddb02c 100644 --- a/pkgs/by-name/la/lan-mouse/package.nix +++ b/pkgs/by-name/la/lan-mouse/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { libX11 libXtst ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreGraphics; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.CoreGraphics; cargoHash = "sha256-pDdpmZPaClU8KjFHO7v3FDQp9D83GQN+SnFg53q2fjs="; diff --git a/pkgs/by-name/la/lanraragi/install.patch b/pkgs/by-name/la/lanraragi/install.patch index 1f99a38892b52..42138483389a7 100644 --- a/pkgs/by-name/la/lanraragi/install.patch +++ b/pkgs/by-name/la/lanraragi/install.patch @@ -1,5 +1,5 @@ diff --git a/tools/install.pl b/tools/install.pl -index b7c7adb..a63de58 100644 +index f09218f..a63de58 100644 --- a/tools/install.pl +++ b/tools/install.pl @@ -9,6 +9,7 @@ use Config; @@ -10,7 +10,7 @@ index b7c7adb..a63de58 100644 #Vendor dependencies my @vendor_css = ( -@@ -90,34 +91,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) { +@@ -90,32 +91,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) { $cpanopt = " -l " . $ENV{HOMEBREW_FORMULA_PREFIX} . "/libexec"; } @@ -30,11 +30,9 @@ index b7c7adb..a63de58 100644 - -#Check for GhostScript -say("Checking for GhostScript..."); --if ( can_run('gs') ) { -- say("OK!"); --} else { -- warn 'NOT FOUND! PDF support will not work properly. Please install the "gs" tool.'; --} +-can_run('gs') +- or warn 'NOT FOUND! PDF support will not work properly. Please install the "gs" tool.'; +-say("OK!"); - -#Check for libarchive -say("Checking for libarchive..."); @@ -45,7 +43,7 @@ index b7c7adb..a63de58 100644 #Check for PerlMagick say("Checking for ImageMagick/PerlMagick..."); my $imgk; -@@ -137,37 +110,11 @@ if ($@) { +@@ -135,37 +110,11 @@ if ($@) { say("OK!"); } @@ -83,7 +81,7 @@ index b7c7adb..a63de58 100644 make_path getcwd . "/public/css/vendor"; make_path getcwd . "/public/css/webfonts"; make_path getcwd . "/public/js/vendor"; -@@ -214,19 +161,3 @@ sub cp_node_module { +@@ -212,19 +161,3 @@ sub cp_node_module { } diff --git a/pkgs/by-name/la/lanraragi/package.nix b/pkgs/by-name/la/lanraragi/package.nix index 91289c816b46d..24eab34147ed1 100644 --- a/pkgs/by-name/la/lanraragi/package.nix +++ b/pkgs/by-name/la/lanraragi/package.nix @@ -10,13 +10,13 @@ buildNpmPackage rec { pname = "lanraragi"; - version = "0.9.10"; + version = "0.9.21"; src = fetchFromGitHub { owner = "Difegue"; repo = "LANraragi"; rev = "v.${version}"; - hash = "sha256-mW2cVd+SPbjc/+b0KY3je1eqw5ZT/GKFruE4Y/eFdD4="; + hash = "sha256-2YdQeBW1MQiUs5nliloISaxG0yhFJ6ulkU/Urx8PN3Y="; }; patches = [ @@ -61,7 +61,7 @@ buildNpmPackage rec { TimeLocal YAMLPP StringSimilarity - ] ++ lib.optionals stdenv.isLinux [ LinuxInotify2 ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ LinuxInotify2 ]; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/la/laszip/package.nix b/pkgs/by-name/la/laszip/package.nix index 65c2e6934a244..ded2abb03fec8 100644 --- a/pkgs/by-name/la/laszip/package.nix +++ b/pkgs/by-name/la/laszip/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/by-name/la/laszip_2/package.nix b/pkgs/by-name/la/laszip_2/package.nix index 8af9cae261fea..e7a7bb00302d7 100644 --- a/pkgs/by-name/la/laszip_2/package.nix +++ b/pkgs/by-name/la/laszip_2/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "LASzip"; repo = "LASzip"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA="; + hash = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/la/latexminted/package.nix b/pkgs/by-name/la/latexminted/package.nix index 313084f41d47f..4816f4f99c50f 100644 --- a/pkgs/by-name/la/latexminted/package.nix +++ b/pkgs/by-name/la/latexminted/package.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "latexminted"; - version = "0.1.0b9"; + version = "0.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QUFfoX1jv5pVQDEBGaVd1madfqbTWTJyXPh4gw7P5UE="; + hash = "sha256-vJziNgVYcnJfmAnok2OeYZEOwGtGfhZyup3D3+BuZsU="; }; build-system = with python3Packages; [ @@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ pygments latex2pydata + latexrestricted ]; passthru = { diff --git a/pkgs/by-name/la/latte-integrale/package.nix b/pkgs/by-name/la/latte-integrale/package.nix index 7eb485974ff21..822e0f2382141 100644 --- a/pkgs/by-name/la/latte-integrale/package.nix +++ b/pkgs/by-name/la/latte-integrale/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/latte-int/latte/releases/download/version_${lib.replaceStrings ["."] ["_"] finalAttrs.version}/latte-int-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-AGwQ6+XVv9ybFZy6YmSkQyhh/nY84F/oIWJKt9P8IXA="; + hash = "sha256-AGwQ6+XVv9ybFZy6YmSkQyhh/nY84F/oIWJKt9P8IXA="; }; patches = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { url = "https://github.com/latte-int/latte/commit/6dbf7f07d5c9e1f3afe793f782d191d4465088ae.patch"; excludes = [ "code/latte/sqlite/IntegrationDB.h" ]; - sha256 = "sha256-i7c11y54OLuJ0m7PBnhEoAzJzxC842JU7A6TOtTz06k="; + hash = "sha256-i7c11y54OLuJ0m7PBnhEoAzJzxC842JU7A6TOtTz06k="; }) ]; diff --git a/pkgs/applications/misc/lavalauncher/default.nix b/pkgs/by-name/la/lavalauncher/package.nix similarity index 100% rename from pkgs/applications/misc/lavalauncher/default.nix rename to pkgs/by-name/la/lavalauncher/package.nix diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 4f7134692ba5f..c9ccf34d2e40c 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "lazygit"; - version = "0.43.1"; + version = "0.44.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - hash = "sha256-iFx/ffaijhOqEDRW1QVzhQMvSgnS4lKFOzq1YdlkUzc="; + hash = "sha256-BP5PMgRq8LHLuUYDrWaX1PgfT9VEhj3xeLE2aDMAPF0="; }; vendorHash = null; diff --git a/pkgs/by-name/la/lazymc/package.nix b/pkgs/by-name/la/lazymc/package.nix index 9202d32b2e8a5..8df8352d8a51b 100644 --- a/pkgs/by-name/la/lazymc/package.nix +++ b/pkgs/by-name/la/lazymc/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index dd9199847248a..8d6e2c93fad09 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "lazysql"; - version = "0.2.5"; + version = "0.2.9"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-QzvaQMSr0PjeAGJr5ThAQ/U0dRMa17E5hiPnc2ViUNo="; + hash = "sha256-6aJrLkmebOhLrnVhl9cnbW1ZBt0vq8lR7Lhz9nPFr8Q="; }; vendorHash = "sha256-celee8uyoirX+vtAww2iQJtRwJEHyfHL2mZA2muSRiQ="; - buildInputs = lib.optionals stdenv.isLinux [ xorg.libX11 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; meta = with lib; { description = "A cross-platform TUI database management tool written in Go"; diff --git a/pkgs/by-name/lb/lbreakouthd/package.nix b/pkgs/by-name/lb/lbreakouthd/package.nix index 45911bacf7704..2675718466930 100644 --- a/pkgs/by-name/lb/lbreakouthd/package.nix +++ b/pkgs/by-name/lb/lbreakouthd/package.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "lbreakouthd"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (SDL2.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index 2b00fdfb62dbd..1ca2291506325 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -142,13 +142,16 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; - buildInputs = [ - libtapi - llvm - libunwind - openssl - xar - ] ++ lib.optionals stdenv.isDarwin [ darwin.dyld ] ++ lib.optionals stdenv.isLinux [ libdispatch ]; + buildInputs = + [ + libtapi + llvm + libunwind + openssl + xar + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.dyld ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libdispatch ]; # Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations, # which trigger libc++ debug assertions due to trying to take the address of the first element of an emtpy vector. diff --git a/pkgs/by-name/ld/ldid-procursus/package.nix b/pkgs/by-name/ld/ldid-procursus/package.nix new file mode 100644 index 0000000000000..1b964935fb242 --- /dev/null +++ b/pkgs/by-name/ld/ldid-procursus/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + fetchpatch, + pkg-config, + libplist, + openssl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ldid-procursus"; + version = "2.1.5-procursus7"; + + src = fetchFromGitHub { + owner = "ProcursusTeam"; + repo = "ldid"; + rev = "v${finalAttrs.version}"; + hash = "sha256-QnSmWY9zCOPYAn2VHc5H+VQXjTCyr0EuosxvKGGpDtQ="; + }; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + buildInputs = [ + libplist + openssl + ]; + + stripDebugFlags = [ "--strip-unneeded" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + dontConfigure = true; + + patches = [ + (fetchpatch { + name = "fix-memory-issues-with-various-entitlements.patch"; + url = "https://github.com/ProcursusTeam/ldid/commit/f38a095aa0cc721c40050cb074116c153608a11b.patch"; + hash = "sha256-D5o/E2tCbuNOv2D9UVaLEx8ZiwSB/wT0hf7XaTGzxE0="; + }) + ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "pkg-config" "$PKG_CONFIG" + ''; + + postInstall = '' + installShellCompletion --cmd ldid --zsh _ldid + ''; + + meta = with lib; { + mainProgram = "ldid"; + description = "Put real or fake signatures in a Mach-O binary"; + homepage = "https://github.com/ProcursusTeam/ldid"; + maintainers = with maintainers; [ keto ]; + platforms = platforms.unix; + license = licenses.agpl3Only; + }; +}) diff --git a/pkgs/by-name/le/leaf/package.nix b/pkgs/by-name/le/leaf/package.nix index bda0c6d2afb07..1bd44f23d3049 100644 --- a/pkgs/by-name/le/leaf/package.nix +++ b/pkgs/by-name/le/leaf/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-2I0XusAI98WLzGcwEorPmtcK3VkpwpkIn0JKwn3gT1c="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/le/ledger-autosync/package.nix b/pkgs/by-name/le/ledger-autosync/package.nix index 1f4e6a3413f08..16c273f75a784 100644 --- a/pkgs/by-name/le/ledger-autosync/package.nix +++ b/pkgs/by-name/le/ledger-autosync/package.nix @@ -2,7 +2,6 @@ lib, python3Packages, fetchFromGitHub, - fetchpatch2, ledger, hledger, }: diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix index 0194260f5beb7..b4fcfd9aad0a1 100644 --- a/pkgs/by-name/le/leetgo/package.nix +++ b/pkgs/by-name/le/leetgo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "leetgo"; - version = "1.4.8"; + version = "1.4.9"; src = fetchFromGitHub { owner = "j178"; repo = "leetgo"; rev = "v${version}"; - hash = "sha256-4Y/NwgLNBdd2uL7oiIdM1I08ZnLjreHf397s/vhS+Ac="; + hash = "sha256-FlQYTNz1Fh0igwnufjVXN4bsUYBB1kls19D+/v7Ztps="; }; - vendorHash = "sha256-zpS+6Z31m6g67we4JaQ0sPodqC315lgftqGzZkelDCU="; + vendorHash = "sha256-DdAe9yyusA6Ac8ioKqLiM5lcOt9Xy7F77gMG6yBTl7Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 947fbaace104e..fef662e3c2774 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.7.14"; + version = "1.7.17"; in buildGoModule { inherit pname version; @@ -15,10 +15,10 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-yGxEeNn6YnzivvQW+HXMAkSaKZ5mmAflyDlNYfjqguc="; + hash = "sha256-r7Tss0NHdEfjfDunWSTxpaV1B5KHGYu0xj9nnyhk8tQ="; }; - vendorHash = "sha256-YrBFcRQoqZPe/USZj3oJK5KR7y0LimCVGS9w4uNMG6M="; + vendorHash = "sha256-rJdtax3r5Nwew+ptY4kIAUtxqPguwrFMMRk78zrZUcU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/le/leftwm-config/package.nix b/pkgs/by-name/le/leftwm-config/package.nix new file mode 100644 index 0000000000000..90c91a261e0d9 --- /dev/null +++ b/pkgs/by-name/le/leftwm-config/package.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage { + pname = "leftwm-config"; + version = "0-unstable-2024-03-13"; + + src = fetchFromGitHub { + owner = "leftwm"; + repo = "leftwm-config"; + rev = "a9f2f21ece3a01d6c36610295ae3163644d3f99e"; + hash = "sha256-wyb/26EyNyBJeTDUvnMxlMiQjaCGBES8t4VteNY1I/A="; + }; + + cargoHash = "sha256-U3mgbG9h2cDqr0aqxbI2CJUOweIoDXDxmsWg0zxolSo="; + + meta = { + description = "Little satellite utility for LeftWM"; + homepage = "https://github.com/leftwm/leftwm-config"; + maintainers = with lib.maintainers; [ denperidge ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/le/leftwm-theme/package.nix b/pkgs/by-name/le/leftwm-theme/package.nix new file mode 100644 index 0000000000000..c10601a0f1f99 --- /dev/null +++ b/pkgs/by-name/le/leftwm-theme/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + openssl, + pkg-config, +}: + +rustPlatform.buildRustPackage { + pname = "leftwm-theme"; + version = "unstable-2024-03-05"; + + src = fetchFromGitHub { + owner = "leftwm"; + repo = "leftwm-theme"; + rev = "b394824ff874b269a90c29e2d45b0cacc4d209f5"; + hash = "sha256-cV4tY1qKNluSSGf+WwKFK3iVE7cMevafl6qQvhy1flE="; + }; + + cargoHash = "sha256-VEQn1LFXiZCVR2WgOFoHo18d3cdIoq9/zNjg8GMs0j8="; + + checkFlags = [ + # direct writing /tmp + "--skip=models::config::test::test_config_new" + # with network access when testing + "--skip=operations::update::test::test_update_repos" + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + env = { + OPENSSL_NO_VENDOR = 1; + }; + + meta = { + description = "Theme manager for LeftWM"; + homepage = "https://github.com/leftwm/leftwm-theme"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ denperidge ]; + }; +} diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix index 3f2453a13d86d..efb9a351340b9 100644 --- a/pkgs/by-name/le/legba/package.nix +++ b/pkgs/by-name/le/legba/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-viDfJ214Zf5segjrLSTbHav5T5e219NAF+MvuPow+JQ="; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl.dev samba ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl.dev samba ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/le/leiningen/package.nix b/pkgs/by-name/le/leiningen/package.nix new file mode 100644 index 0000000000000..04b81464ec0ac --- /dev/null +++ b/pkgs/by-name/le/leiningen/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchurl, + makeWrapper, + coreutils, + jdk, + rlwrap, + gnupg, +}: +let + pname = "leiningen"; + version = "2.11.2"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://codeberg.org/leiningen/leiningen/raw/tag/${version}/bin/lein-pkg"; + hash = "sha256-KKGmJmjF9Ce0E6hnfjdq/6qZXwI7H80G4tTJisHfXz4="; + }; + + jarsrc = fetchurl { + url = "https://codeberg.org/leiningen/leiningen/releases/download/${version}/leiningen-${version}-standalone.jar"; + hash = "sha256-fTGuI652npJ0OLDNVdFak+faurCf1PwVh3l5Fh4Qh3Q="; + }; + + JARNAME = "${pname}-${version}-standalone.jar"; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ jdk ]; + + # the jar is not in share/java, because it's a standalone jar and should + # never be picked up by set-java-classpath.sh + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + cp -v $src $out/bin/lein + cp -v $jarsrc $out/share/$JARNAME + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + + chmod +x $out/bin/lein + patchShebangs $out/bin/lein + substituteInPlace $out/bin/lein \ + --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME" + wrapProgram $out/bin/lein \ + --prefix PATH ":" "${ + lib.makeBinPath [ + rlwrap + coreutils + ] + }" \ + --set LEIN_GPG ${gnupg}/bin/gpg \ + --set JAVA_CMD ${jdk}/bin/java + + runHook postFixup + ''; + + meta = { + homepage = "https://leiningen.org/"; + description = "Project automation for Clojure"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.epl10; + platforms = jdk.meta.platforms; + maintainers = with lib.maintainers; [ momeemt ]; + mainProgram = "lein"; + }; +} diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix index e0a3d022163e9..bdd32121a5c00 100644 --- a/pkgs/by-name/lg/lgogdownloader/package.nix +++ b/pkgs/by-name/lg/lgogdownloader/package.nix @@ -15,19 +15,18 @@ html-tidy, libsForQt5, testers, - lgogdownloader, enableGui ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lgogdownloader"; version = "3.15"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-h2N5pRwwZZ3jAvRrT4Ebk4N5WO9tQjDrp8KRqriwUi4="; }; @@ -56,7 +55,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON"; passthru.tests = { - version = testers.testVersion { package = lgogdownloader; }; + version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = { @@ -67,4 +66,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ _0x4A6F ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix index 25f72398ad408..ab9b9e15cfd09 100644 --- a/pkgs/by-name/li/liana/package.nix +++ b/pkgs/by-name/li/liana/package.nix @@ -38,7 +38,7 @@ let in rustPlatform.buildRustPackage rec { pname = "liana"; - version = "6.0"; + version = "6.0"; # keep in sync with lianad src = fetchFromGitHub { owner = "wizardsardine"; @@ -94,6 +94,6 @@ rustPlatform.buildRustPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ dunxen ]; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/li/lianad/package.nix b/pkgs/by-name/li/lianad/package.nix new file mode 100644 index 0000000000000..094044274699f --- /dev/null +++ b/pkgs/by-name/li/lianad/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + udev, +}: + +rustPlatform.buildRustPackage rec { + pname = "lianad"; + version = "6.0"; # keep in sync with liana + + src = fetchFromGitHub { + owner = "wizardsardine"; + repo = "liana"; + rev = "v${version}"; + hash = "sha256-LLDgo4GoRTVYt72IT0II7O5wiMDrvJhe0f2yjzxQgsE="; + }; + + cargoHash = "sha256-a4hLtDXnEeTa0e1LcMkEPKEqGBp5bzWseq5Pe5ZYF1M="; + + buildInputs = [ udev ]; + + postInstall = '' + install -Dm0644 ./contrib/lianad_config_example.toml $out/etc/liana/config.toml + ''; + + # bypass broken unit tests + doCheck = false; + + meta = { + mainProgram = "lianad"; + description = "Bitcoin wallet leveraging on-chain timelocks for safety and recovery"; + homepage = "https://wizardsardine.com/liana"; + license = lib.licenses.bsd3; + maintainers = [ + lib.maintainers.dunxen + lib.maintainers.plebhash + ]; + platforms = lib.platforms.linux; + broken = stdenv.hostPlatform.isAarch64; + }; +} diff --git a/pkgs/by-name/li/lib25519/package.nix b/pkgs/by-name/li/lib25519/package.nix index 90d377948f936..68d35a796a03a 100644 --- a/pkgs/by-name/li/lib25519/package.nix +++ b/pkgs/by-name/li/lib25519/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { libcpucycles ]; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id "$out/lib/lib25519.1.dylib" "$out/lib/lib25519.1.dylib" for f in $out/bin/*; do install_name_tool -change "lib25519.1.dylib" "$out/lib/lib25519.1.dylib" "$f" @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # failure: crypto_pow does not handle p=q overlap - doInstallCheck = !stdenv.isDarwin; + doInstallCheck = !stdenv.hostPlatform.isDarwin; installCheckPhase = '' runHook preInstallCheck $out/bin/lib25519-test diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix new file mode 100644 index 0000000000000..402514a647457 --- /dev/null +++ b/pkgs/by-name/li/libarchive/package.nix @@ -0,0 +1,138 @@ +{ lib +, stdenv +, fetchFromGitHub +, acl +, attr +, autoreconfHook +, bzip2 +, e2fsprogs +, glibcLocalesUtf8 +, lzo +, openssl +, pkg-config +, sharutils +, xz +, zlib +, zstd +# Optional but increases closure only negligibly. Also, while libxml2 builds +# fine on windows, libarchive has trouble linking windows things it depends on +# for some reason. +, xarSupport ? stdenv.hostPlatform.isUnix, libxml2 + +# for passthru.tests +, cmake +, nix +, samba + +# for passthru.lore +, binlore +}: + +assert xarSupport -> libxml2 != null; +stdenv.mkDerivation (finalAttrs: { + pname = "libarchive"; + version = "3.7.4"; + + src = fetchFromGitHub { + owner = "libarchive"; + repo = "libarchive"; + rev = "v${finalAttrs.version}"; + hash = "sha256-czNKXHoEn1x4deNErnqp/NZfCglF1CxNoLtZ8tcl394="; + }; + + outputs = [ "out" "lib" "dev" ]; + + postPatch = let + skipTestPaths = [ + # test won't work in nix sandbox + "libarchive/test/test_write_disk_perms.c" + # the filesystem does not necessarily have sparse capabilities + "libarchive/test/test_sparse_basic.c" + # the filesystem does not necessarily have hardlink capabilities + "libarchive/test/test_write_disk_hardlink.c" + # access-time-related tests flakey on some systems + "cpio/test/test_option_a.c" + "cpio/test/test_option_t.c" + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ + # only on some aarch64-linux systems? + "cpio/test/test_basic.c" + "cpio/test/test_format_newc.c" + ]; + removeTest = testPath: '' + substituteInPlace Makefile.am --replace-fail "${testPath}" "" + rm "${testPath}" + ''; + in '' + substituteInPlace Makefile.am --replace-fail '/bin/pwd' "$(type -P pwd)" + + ${lib.concatStringsSep "\n" (map removeTest skipTestPaths)} + ''; + + nativeBuildInputs = [ + autoreconfHook + glibcLocalesUtf8 # test_I test requires an UTF-8 locale + pkg-config + ]; + + buildInputs = [ + bzip2 + lzo + openssl + xz + zlib + zstd + ] ++ lib.optional stdenv.hostPlatform.isUnix sharutils + ++ lib.optionals stdenv.hostPlatform.isLinux [ acl attr e2fsprogs ] + ++ lib.optional xarSupport libxml2; + + # Without this, pkg-config-based dependencies are unhappy + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ attr acl ]; + + configureFlags = lib.optional (!xarSupport) "--without-xml2"; + + preBuild = lib.optionalString stdenv.hostPlatform.isCygwin '' + echo "#include <windows.h>" >> config.h + ''; + + # https://github.com/libarchive/libarchive/issues/1475 + doCheck = !stdenv.hostPlatform.isMusl; + + preCheck = '' + # Need an UTF-8 locale for test_I test. + export LANG=en_US.UTF-8 + ''; + + preFixup = '' + sed -i $lib/lib/libarchive.la \ + -e 's|-lcrypto|-L${lib.getLib openssl}/lib -lcrypto|' \ + -e 's|-llzo2|-L${lzo}/lib -llzo2|' + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "http://libarchive.org"; + description = "Multi-format archive and compression library"; + longDescription = '' + The libarchive project develops a portable, efficient C library that can + read and write streaming archives in a variety of formats. It also + includes implementations of the common tar, cpio, and zcat command-line + tools that use the libarchive library. + ''; + changelog = "https://github.com/libarchive/libarchive/releases/tag/v${finalAttrs.version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ jcumming AndersonTorres ]; + platforms = platforms.all; + }; + + passthru.tests = { + inherit cmake nix samba; + }; + + # bsdtar is detected as "cannot" because its exec is internal to + # calls it makes into libarchive itself. If binlore gains support + # for detecting another layer down into libraries, this can be cut. + passthru.binlore.out = binlore.synthesize finalAttrs.finalPackage '' + execer can bin/bsdtar + ''; +}) diff --git a/pkgs/by-name/li/libaribcaption/package.nix b/pkgs/by-name/li/libaribcaption/package.nix index 7d39841ec6fe4..936991ef6a875 100644 --- a/pkgs/by-name/li/libaribcaption/package.nix +++ b/pkgs/by-name/li/libaribcaption/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ fontconfig freetype - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices CoreFoundation CoreGraphics diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/by-name/li/libast/package.nix similarity index 100% rename from pkgs/development/libraries/libast/default.nix rename to pkgs/by-name/li/libast/package.nix diff --git a/pkgs/by-name/li/libation/deps.nix b/pkgs/by-name/li/libation/deps.nix index e537d6e43bd8b..2792c1f90ca44 100644 --- a/pkgs/by-name/li/libation/deps.nix +++ b/pkgs/by-name/li/libation/deps.nix @@ -125,8 +125,6 @@ (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) - (fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-DpU+PGIUCtaK6gQEl/OWSO/JKg/TA9yeD01Zzxaxy5k="; }) - (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-+TMflNyjP+Lf5bge0xVN5AKxMAk4/caWY6zZrqtyAJw="; }) (fetchNuGet { pname = "Serilog"; version = "2.10.0"; hash = "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE="; }) (fetchNuGet { pname = "Serilog"; version = "2.8.0"; hash = "sha256-MBL9AWGV8UthhiHXnqH3EsfIyXnxdLWqAdFa6QvQ2To="; }) (fetchNuGet { pname = "Serilog"; version = "3.1.0"; hash = "sha256-1CDAp+AjfFjQqoLvKYp/j6pKTUfNOGfKVlWyqCGHo7k="; }) diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index fc61d7c0d48f8..c116293827435 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -6,14 +6,6 @@ dotnetCorePackages, wrapGAppsHook3, - libX11, - libICE, - libSM, - libXi, - libXcursor, - libXext, - libXrandr, - fontconfig, glew, gtk3, }: @@ -36,7 +28,11 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; - dotnetFlags = [ "-p:PublishReadyToRun=false" ]; + dotnetFlags = [ + "-p:PublishReadyToRun=false" + # for some reason this is set to win-x64 in the project files + "-p:RuntimeIdentifier=" + ]; projectFile = [ "LibationAvalonia/LibationAvalonia.csproj" @@ -48,14 +44,6 @@ buildDotnetModule rec { runtimeDeps = [ # For Avalonia UI - libX11 - libICE - libSM - libXi - libXcursor - libXext - libXrandr - fontconfig glew # For file dialogs gtk3 diff --git a/pkgs/by-name/li/libayatana-indicator/package.nix b/pkgs/by-name/li/libayatana-indicator/package.nix new file mode 100644 index 0000000000000..852c61d3ea133 --- /dev/null +++ b/pkgs/by-name/li/libayatana-indicator/package.nix @@ -0,0 +1,43 @@ +{ + ayatana-ido, + cmake, + fetchFromGitHub, + glib, + gtk3, + lib, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "libayatana-indicator"; + version = "0.9.4"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = "libayatana-indicator"; + rev = version; + sha256 = "sha256-OsguZ+jl274uPSCTFHq/ZwUE3yHR7MlUPHCpfmn1F7A="; + }; + + nativeBuildInputs = [ + cmake + glib # for glib-mkenums + pkg-config + ]; + + buildInputs = [ gtk3 ]; + + propagatedBuildInputs = [ ayatana-ido ]; + + strictDeps = true; + + meta = with lib; { + description = "Ayatana Indicators Shared Library"; + homepage = "https://github.com/AyatanaIndicators/libayatana-indicator"; + changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${version}/ChangeLog"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.nickhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/li/libbase58/package.nix b/pkgs/by-name/li/libbase58/package.nix new file mode 100644 index 0000000000000..94f7c4ec8bc74 --- /dev/null +++ b/pkgs/by-name/li/libbase58/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libgcrypt, + pkg-config, +}: + +stdenv.mkDerivation rec { + pname = "libbase58"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "bitcoin"; + repo = "libbase58"; + rev = "v${version}"; + hash = "sha256-CU55V89GbcYnrhwTPFMd13EGeCk/x9nQswUZ2JsYsUU="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ libgcrypt ]; + + meta = { + description = "C library for Bitcoin's base58 encoding"; + homepage = "https://github.com/bitcoin/libbase58"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nagy ]; + mainProgram = "base58"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/li/libbde/package.nix b/pkgs/by-name/li/libbde/package.nix new file mode 100644 index 0000000000000..acbdb3e1aa303 --- /dev/null +++ b/pkgs/by-name/li/libbde/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchurl, + fuse, + ncurses, + python3, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libbde"; + version = "20240502"; + + src = fetchurl { + url = "https://github.com/libyal/libbde/releases/download/${finalAttrs.version}/libbde-alpha-${finalAttrs.version}.tar.gz"; + hash = "sha256-La6rzBOfyBIXDn78vXb8GUt8jgQkzsqM38kRZ7t3Fp0="; + }; + + buildInputs = [ + fuse + ncurses + python3 + ]; + + preInstall = '' + substituteInPlace pybde/Makefile \ + --replace-fail '$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install' ' ' + ''; + + configureFlags = [ "--enable-python" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Library to access the BitLocker Drive Encryption (BDE) format"; + homepage = "https://github.com/libyal/libbde/"; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ + eliasp + bot-wxt1221 + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix new file mode 100644 index 0000000000000..bd395682cc145 --- /dev/null +++ b/pkgs/by-name/li/libbytesize/package.nix @@ -0,0 +1,63 @@ +{ + lib, + autoreconfHook, + docbook_xml_dtd_43, + docbook_xsl, + fetchFromGitHub, + gettext, + gmp, + gtk-doc, + libxslt, + mpfr, + pcre2, + pkg-config, + python3, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libbytesize"; + version = "2.11"; + + src = fetchFromGitHub { + owner = "storaged-project"; + repo = "libbytesize"; + rev = finalAttrs.version; + hash = "sha256-scOnucn7xp6KKEtkpwfyrdzcntJF2l0h0fsQotcceLc="; + }; + + outputs = [ + "out" + "dev" + "devdoc" + "man" + ]; + + nativeBuildInputs = [ + autoreconfHook + docbook_xml_dtd_43 + docbook_xsl + gettext + gtk-doc + libxslt + pkg-config + python3 + ]; + + buildInputs = [ + gmp + mpfr + pcre2 + ]; + + strictDeps = true; + + meta = { + homepage = "https://github.com/storaged-project/libbytesize"; + description = "Tiny library providing a C 'class' for working with arbitrary big sizes in bytes"; + license = lib.licenses.lgpl2Plus; + mainProgram = "bscalc"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/li/libcaca/package.nix b/pkgs/by-name/li/libcaca/package.nix new file mode 100644 index 0000000000000..bb0d571687663 --- /dev/null +++ b/pkgs/by-name/li/libcaca/package.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, imlib2 +, xorg +, ncurses +, pkg-config +, zlib +, x11Support ? !stdenv.hostPlatform.isDarwin +}: + +stdenv.mkDerivation rec { + pname = "libcaca"; + version = "0.99.beta20"; + + src = fetchFromGitHub { + owner = "cacalabs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-N0Lfi0d4kjxirEbIjdeearYWvStkKMyV6lgeyNKXcVw="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + ncurses + zlib + (imlib2.override { inherit x11Support; }) + ] ++ lib.optionals x11Support [ + xorg.libX11 + xorg.libXext + ]; + + outputs = [ "bin" "dev" "out" "man" ]; + + configureFlags = [ + (if x11Support then "--enable-x11" else "--disable-x11") + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; + + postInstall = '' + mkdir -p $dev/bin + mv $bin/bin/caca-config $dev/bin/caca-config + ''; + + meta = with lib; { + homepage = "http://caca.zoy.org/wiki/libcaca"; + description = "Graphics library that outputs text instead of pixels"; + longDescription = '' + libcaca is a graphics library that outputs text instead of pixels, so that + it can work on older video cards or text terminals. It is not unlike the + famous ​AAlib library, with the following improvements: + + - Unicode support + - 2048 available colours (some devices can only handle 16) + - dithering of colour images + - advanced text canvas operations (blitting, rotations) + + Libcaca works in a text terminal (and should thus work on all Unix systems + including Mac OS X) using the S-Lang or ncurses libraries. It also works + natively on DOS and Windows. + + Libcaca was written by Sam Hocevar and Jean-Yves Lamoureux. + ''; + license = licenses.wtfpl; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/li/libclipboard/package.nix b/pkgs/by-name/li/libclipboard/package.nix index 1febf35d1c8f8..eec120bcd62d5 100644 --- a/pkgs/by-name/li/libclipboard/package.nix +++ b/pkgs/by-name/li/libclipboard/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ libxcb libXau libXdmcp ] - ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ++ lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/by-name/li/libcpucycles/package.nix b/pkgs/by-name/li/libcpucycles/package.nix index 4e88903de66d3..84292201640ba 100644 --- a/pkgs/by-name/li/libcpucycles/package.nix +++ b/pkgs/by-name/li/libcpucycles/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (librandombytes) hardeningDisable configurePlatforms env; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id "$out/lib/libcpucycles.1.dylib" "$out/lib/libcpucycles.1.dylib" install_name_tool -change "libcpucycles.1.dylib" "$out/lib/libcpucycles.1.dylib" "$out/bin/cpucycles-info" ''; diff --git a/pkgs/by-name/li/libcpuid/package.nix b/pkgs/by-name/li/libcpuid/package.nix index 8378a804fdcf0..077c441f5c80e 100644 --- a/pkgs/by-name/li/libcpuid/package.nix +++ b/pkgs/by-name/li/libcpuid/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcpuid"; - version = "0.6.5"; + version = "0.7.0"; src = fetchFromGitHub { owner = "anrieff"; repo = "libcpuid"; rev = "v${version}"; - sha256 = "sha256-Bq16UH4IUR7dU57bGHKq8P6JsjaB4arOJ4zFeNyxXSg="; + hash = "sha256-OZfsEk6sTTvwgAetjilSWbkfC1nMQnPH3oL0IeuqObA="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/li/libcsa/package.nix b/pkgs/by-name/li/libcsa/package.nix new file mode 100644 index 0000000000000..5308a71d962df --- /dev/null +++ b/pkgs/by-name/li/libcsa/package.nix @@ -0,0 +1,30 @@ +{ + stdenv, + lib, + fetchFromGitHub, + unstableGitUpdater, +}: +stdenv.mkDerivation (finalAttrs: { + name = "csa"; + version = "1.26-unstable-2024-03-22"; + + src = fetchFromGitHub { + owner = "sakov"; + repo = "csa-c"; + rev = "7b48134613d1d3b337af6d5762df9999a703fb1a"; + hash = "sha256-G/VhXpdvXBT9I6pwiQXVqCoXhc29wJQpGyLeM3kgv7I="; + }; + + sourceRoot = "${finalAttrs.src.name}/csa"; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "C code for cubic spline approximation of 2D scattered data"; + homepage = "https://github.com/sakov/csa-c/"; + platforms = platforms.unix; + license = licenses.bsd3; + maintainers = with maintainers; [ mkez ]; + mainProgram = "csabathy"; + }; +}) diff --git a/pkgs/by-name/li/libcutl/package.nix b/pkgs/by-name/li/libcutl/package.nix new file mode 100644 index 0000000000000..b6620c9555371 --- /dev/null +++ b/pkgs/by-name/li/libcutl/package.nix @@ -0,0 +1,40 @@ +{ + build2, + fetchgit, + gccStdenv, + lib, + xercesc, +}: + +gccStdenv.mkDerivation (finalAttrs: { + pname = "libcutl"; + version = "1.11.0"; + + src = fetchgit { + url = "https://git.codesynthesis.com/libcutl/libcutl.git"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-LY2ZyxduI6xftVjVqjNkhYPFTL5bvHC289Qcei1Kiw4="; + }; + + nativeBuildInputs = [ build2 ]; + + buildInputs = [ xercesc ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = { + description = "C++ utility library from Code Synthesis"; + longDescription = '' + libcutl is a C++ utility library. + It contains a collection of generic and independent components such as + meta-programming tests, smart pointers, containers, compiler building blocks, etc. + ''; + homepage = "https://codesynthesis.com/projects/libcutl/"; + changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/log/"; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.xzfc ]; + license = lib.licenses.mit; + }; +}) diff --git a/pkgs/by-name/li/libcyaml/package.nix b/pkgs/by-name/li/libcyaml/package.nix new file mode 100644 index 0000000000000..a1bbd17753cab --- /dev/null +++ b/pkgs/by-name/li/libcyaml/package.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchFromGitHub +, libyaml +}: + +stdenv.mkDerivation rec { + pname = "libcyaml"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "tlsa"; + repo = "libcyaml"; + rev = "v${version}"; + hash = "sha256-JIN/cvh9PRl4/K0Z3WZtSCA3casBxyaxNxjXZZdQRWQ="; + }; + + buildInputs = [ libyaml ]; + + makeFlags = [ "VARIANT=release" "PREFIX=$(out)" ]; + + meta = with lib; { + homepage = "https://github.com/tlsa/libcyaml"; + description = "C library for reading and writing YAML"; + changelog = "https://github.com/tlsa/libcyaml/raw/v${version}/CHANGES.md"; + license = licenses.isc; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/li/libdeltachat/Cargo.lock b/pkgs/by-name/li/libdeltachat/Cargo.lock index a10f1fc1c63b7..7f24f43faac86 100644 --- a/pkgs/by-name/li/libdeltachat/Cargo.lock +++ b/pkgs/by-name/li/libdeltachat/Cargo.lock @@ -1353,7 +1353,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.142.7" +version = "1.142.12" dependencies = [ "ansi_term", "anyhow", @@ -1444,7 +1444,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.142.7" +version = "1.142.12" dependencies = [ "anyhow", "async-channel 2.3.1", @@ -1469,7 +1469,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.142.7" +version = "1.142.12" dependencies = [ "ansi_term", "anyhow", @@ -1484,7 +1484,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.142.7" +version = "1.142.12" dependencies = [ "anyhow", "deltachat", @@ -1513,7 +1513,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.142.7" +version = "1.142.12" dependencies = [ "anyhow", "deltachat", diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index be37573e2e73a..237e48a7c3ea0 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -29,13 +29,13 @@ let }; in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.142.7"; + version = "1.142.12"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-Wj7fmhp67a3OtzxPbfqOpZCzM9WokzKiaWNQS9qYyCo="; + hash = "sha256-WjzmRRHdi31Eg3UAy4rD2xrx1LVew9Y4bb50Zyv+8JA="; }; patches = [ @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { pkg-config rustPlatform.cargoSetupHook cargo - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { openssl sqlcipher sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/li/liberasurecode/package.nix b/pkgs/by-name/li/liberasurecode/package.nix new file mode 100644 index 0000000000000..1f4cb055cc99f --- /dev/null +++ b/pkgs/by-name/li/liberasurecode/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + autoreconfHook, + doxygen, + fetchFromGitHub, + installShellFiles, + testers, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "liberasurecode"; + version = "1.6.4"; + + outputs = [ + "out" + "dev" + "doc" + ]; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "liberasurecode"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-KYXlRjUudWhFbhyv9V1fmqwBw3/vTBfusxafaNG+Q40="; + }; + + postPatch = '' + substituteInPlace doc/doxygen.cfg.in \ + --replace-fail "GENERATE_MAN = NO" "GENERATE_MAN = YES" + + substituteInPlace Makefile.am src/Makefile.am \ + --replace-fail "-Werror" "" + ''; + + nativeBuildInputs = [ + autoreconfHook + doxygen + installShellFiles + ]; + + buildInputs = [ zlib ]; + + configureFlags = [ + "--disable-werror" + "--enable-doxygen" + ]; + + postInstall = '' + # remove useless man pages about directories + rm doc/man/man*/_* + installManPage doc/man/man*/* + + moveToOutput share/liberasurecode/ $doc + ''; + + checkTarget = "test"; + + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + + meta = with lib; { + description = "Erasure Code API library written in C with pluggable Erasure Code backends"; + homepage = "https://github.com/openstack/liberasurecode"; + license = licenses.bsd2; + maintainers = teams.openstack.members; + pkgConfigModules = [ "erasurecode-1" ]; + }; +}) diff --git a/pkgs/by-name/li/libetebase/package.nix b/pkgs/by-name/li/libetebase/package.nix index d039cad84201e..c76b5a2320f71 100644 --- a/pkgs/by-name/li/libetebase/package.nix +++ b/pkgs/by-name/li/libetebase/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { description = "A C library for Etebase"; homepage = "https://www.etebase.com/"; license = licenses.bsd3; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ laalsaas ]; pkgConfigModules = [ "etebase" ]; }; diff --git a/pkgs/by-name/li/libeufin/deps.json b/pkgs/by-name/li/libeufin/deps.json index 13eee51c0fd73..a8bd14c571029 100644 --- a/pkgs/by-name/li/libeufin/deps.json +++ b/pkgs/by-name/li/libeufin/deps.json @@ -2,14 +2,28 @@ "!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": { + "ch/qos/logback#logback-classic/1.5.6": { + "jar": "sha256-YRXGysXtHZ24ENFPL39N1qnyHwrLuoAW5NqsoroPXrg=", + "pom": "sha256-SysA32EjwOKmHnG1vis/AHOWeLtLBplA1cScJN9T9Zo=" + }, + "ch/qos/logback#logback-core/1.5.6": { + "jar": "sha256-iYx9EgGZ834azIEY2XqxWk0CsOcuJ7qfBYQ8s3ThYMY=", + "pom": "sha256-BpPQaN02h3R1rYCQbjHHvA1RlbgtTAB1HcGcHqUR5xE=" + }, + "ch/qos/logback#logback-parent/1.5.6": { + "pom": "sha256-e9/LJJJGgaSRRNujSpJ7i9B5INCS6sw972H55kevTeg=" + }, "com/fasterxml#oss-parent/38": { "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" }, "com/fasterxml#oss-parent/41": { "pom": "sha256-r2UPpN1AC8V2kyC87wjtk4E/NJyr6CE9RprK+72UXYo=" }, - "com/fasterxml#oss-parent/48": { - "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" }, "com/fasterxml/jackson#jackson-base/2.12.7": { "pom": "sha256-F55U/ibI1N/pJf7jHUqH0cwl+LfgCUik5laxIp4rdq4=" @@ -17,14 +31,14 @@ "com/fasterxml/jackson#jackson-bom/2.12.7": { "pom": "sha256-GVVDL22K8ygG2C2CGP7f5L47s+I9WadNgUSf/HS/e9E=" }, - "com/fasterxml/jackson#jackson-bom/2.14.1": { - "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + "com/fasterxml/jackson#jackson-bom/2.16.1": { + "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs=" }, "com/fasterxml/jackson#jackson-parent/2.12": { "pom": "sha256-YqocFnmt4J8XPb8bbDLTXFXnWAAjj9XkjxOqQzfAh1s=" }, - "com/fasterxml/jackson#jackson-parent/2.14": { - "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" }, "com/fasterxml/jackson/core#jackson-annotations/2.12.7": { "jar": "sha256-PKzvcUqJ89aLafoRJjr6VaaqL97x//k97SLKoWtUaHw=", @@ -63,467 +77,136 @@ "jar": "sha256-X6c01QUPCXQFqAECLQk3e7yB6BHvmhfNAnntMnn0laU=", "pom": "sha256-EOfKWazmMwqKqW4zMs+Sn8BmcWnei0EvvPxfOgFMVNE=" }, - "com/github/johnrengelman#shadow/8.1.1": { - "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=", - "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=", - "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU=" - }, - "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { - "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA=" - }, - "com/sun/activation#all/1.2.1": { - "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U=" - }, - "commons-io#commons-io/2.11.0": { - "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", - "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" - }, - "io/fabric8#kubernetes-client-bom/5.12.2": { - "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" - }, - "io/netty#netty-bom/4.1.86.Final": { - "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" - }, - "jakarta/activation#jakarta.activation-api/1.2.1": { - "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=", - "pom": "sha256-QlhcsH3afyOqBOteCUAGGUSiRqZ609FpQvvlaf8DzTE=" - }, - "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { - "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" - }, - "jakarta/platform#jakartaee-api-parent/9.0.0": { - "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" - }, - "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.2": { - "pom": "sha256-FaVbfVN8n5lwrq0o0q+XwFn2X/YQL3a70p8SR92Kbfs=" - }, - "jakarta/xml/bind#jakarta.xml.bind-api/2.3.2": { - "jar": "sha256-aRVjBAeb3u2fwK47OTifGbPMS6REO8gFCJlTlOrXQuo=", - "pom": "sha256-tTeziNurTMBpC50vsMdBJNZyUxc0VnrPblMTDqsTGtY=" - }, - "org/apache#apache/23": { - "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" - }, - "org/apache#apache/27": { - "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" - }, - "org/apache/ant#ant-launcher/1.10.13": { - "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=", - "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o=" - }, - "org/apache/ant#ant-parent/1.10.13": { - "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk=" - }, - "org/apache/ant#ant/1.10.13": { - "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=", - "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o=" - }, - "org/apache/commons#commons-parent/52": { - "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" - }, - "org/apache/logging#logging-parent/7": { - "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" - }, - "org/apache/logging/log4j#log4j-api/2.20.0": { - "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", - "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" - }, - "org/apache/logging/log4j#log4j-bom/2.20.0": { - "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" - }, - "org/apache/logging/log4j#log4j-core/2.20.0": { - "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", - "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" - }, - "org/apache/logging/log4j#log4j/2.20.0": { - "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" - }, - "org/codehaus/groovy#groovy-bom/3.0.14": { - "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" - }, - "org/codehaus/plexus#plexus-utils/3.5.1": { - "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", - "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI=" - }, - "org/codehaus/plexus#plexus/10": { - "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" - }, - "org/codehaus/woodstox#stax2-api/4.2.1": { - "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", - "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" - }, - "org/eclipse/ee4j#project/1.0.2": { - "pom": "sha256-dJWgenl+iOQ8O8GodCG9ix/FXjIpH6GOTjLYAx3chz8=" - }, - "org/eclipse/ee4j#project/1.0.5": { - "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" - }, - "org/eclipse/ee4j#project/1.0.6": { - "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" - }, - "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { - "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" - }, - "org/jdom#jdom2/2.0.6.1": { - "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", - "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" - }, - "org/jetbrains#annotations/23.0.0": { - "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", - "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" - }, - "org/jetbrains/dokka#dokka-core/1.9.20": { - "jar": "sha256-EhizoInIX41byc7lNGp4f2QUPW/HtPBLBRtqW3Sv3IY=", - "module": "sha256-w+z7y6JqmLbouDusckOZKz6d/jilB9d6UnvL5E75ua0=", - "pom": "sha256-N9LsB2+hsvlR92bUjxHVHXOrjlNwkGy/XXnMPkbRjxI=" - }, - "org/jetbrains/dokka#dokka-gradle-plugin/1.9.20": { - "jar": "sha256-7dbOLDEoeI2k6lPe3sB/8LhI6p+mg8Ywv3k1Vw+7QhA=", - "module": "sha256-RMEY9JsqY95tLAdVYixHNKhVGviWx9ZAuEDSGL4M2CA=", - "pom": "sha256-cmyCm7TGy1h9pYYJVLLxJN8NQ9W/LxaQ7Rk9r2JSGGI=" - }, - "org/jetbrains/dokka#org.jetbrains.dokka.gradle.plugin/1.9.20": { - "pom": "sha256-J7WLy2erfv8EO20nz2Oo9C18bx3AlzoQ53gDTXIrDpw=" - }, - "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { - "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", - "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" - }, - "org/jetbrains/kotlin#kotlin-android-extensions/1.9.23": { - "jar": "sha256-Yf12SPkx/06b2/9JvwmHcFdj+7qce7ALJkgRo20RGsE=", - "pom": "sha256-0+vFk7FzrT4tHiVgtpwzFKRpDI2jJ0ch6DqWrtwWEaA=" - }, - "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.23": { - "jar": "sha256-gvhH4lRXtGSDfv7x2oUC7JJTLedAbnkgUWbODs9PxSE=", - "pom": "sha256-CWkjtiXJfGZzZ5ZsxM6Sv5TE6f98U8sdOEhgEax1DVg=" - }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.23": { - "jar": "sha256-zJQGSXS/nr9ZlF4xIXzy0WoM66rySH6wdI/By9F4eUM=", - "pom": "sha256-WLI81NgtWqkWpcnMmbMhjuxVaWBoova3C+3fbDaR/RU=" - }, - "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.23": { - "jar": "sha256-yFlaPhcRx0U8f5YKrxKhcNtL2j1vy6Sf/I4yy/0ADKE=", - "pom": "sha256-KebjEpGbdf6aOHjflRHPQhDcJuWTQcsu4iSDt7Tgcv4=" - }, - "org/jetbrains/kotlin#kotlin-daemon-client/1.9.23": { - "jar": "sha256-5jFUJUkZ/XBv6ZN8SNuTfqkGimMfht5lWlFLwWIPmI0=", - "pom": "sha256-X70GastuQIU5gCdsaDUWmSj2Zqt8RlEsJvJMnQMIF9M=" - }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.23": { - "jar": "sha256-bztmG5gmetJOL4+3rV0Gvn0u1hpdBcJn9OTKp433g9k=", - "pom": "sha256-WFRgOL5Go4NmOFPRMd12xPsnQ4MLqXt0sno1zxAtPQI=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/1.9.23": { - "jar": "sha256-HaitBgpbw4KwTxVycdPNrWgwcUovTfSvfEAIjUuSIWQ=", - "pom": "sha256-69aRc06Qr9Wj6PoqkTrw+Q6YL4a6IYWhcDIqGwiQpgU=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.23": { - "jar": "sha256-WTzAhC1fwJe5XgpgK/+Mekifc3Q7hzywuO7JL86KQVs=", - "module": "sha256-zmi7IanW8gt7DnKf4y+aVHu2SyXjEPD14vcMUJ1n7cQ=", - "pom": "sha256-WMjnhsjGUvTpgqQlh5FZTL4L+JKiaGCVTKa1Ue7mN+8=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.23/gradle82": { - "jar": "sha256-WTzAhC1fwJe5XgpgK/+Mekifc3Q7hzywuO7JL86KQVs=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/1.9.23": { - "jar": "sha256-i7/a0U08PFCzK/a/4PHHAnvlQoXEba95gnz5O1y0PX8=", - "pom": "sha256-x0cp9NYFkAEhZptBEO1FuvVeB1q1O2OmQrkLOv95NCI=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/1.9.23": { - "jar": "sha256-jRr4djLZUUjxIqn6CuKQPBnub6t9AeAX924NLJoCLCA=", - "module": "sha256-G+uiuitRE94FM+UV4X9W1TZOm1QiX/MftNj+yfcV2Cw=", - "pom": "sha256-KemtQ1rc9Q/ljTiQ65lePyuNdQEZqaEsIfwwo2DNCOA=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.9.23": { - "jar": "sha256-Pljfrl5D/Ig2X1LfOjRCCMAQDJdacqlKLEoJ9mHTIxc=", - "module": "sha256-Evmlol5YCDEXnl2jBJoBMRi9B2zeCkUuZo8qsWCaz70=", - "pom": "sha256-sh8qITWUXCtLatLIi+Dnl1WH9HVgiTnn23sG2CfQNXg=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.23": { - "module": "sha256-YL2BUHBNWByO6tTBlAh26LAor+ixS0lAEMUJIEclRKc=", - "pom": "sha256-TgznuA0cN7kRzb/kFf77ZdzvGCalGLF3vWAvlaloqMU=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.23/gradle82": { - "jar": "sha256-vMdKB8ad0RyUsmCx7ophiWlinMrqwubqCnedo8P37D8=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/1.9.23": { - "module": "sha256-1yNF4lW/IKOperXQEIa2CMXX0M8/Z3inHoXKy61BQlo=", - "pom": "sha256-2Ive7tm5RMrHGM3PKUD4FdgiXuzNIb7KB93QgfDSQow=" - }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.9.23": { - "jar": "sha256-XfEWTbHDRdhtChqkFJCeNnr7l4L+P7yvDir3qL9iuDk=", - "pom": "sha256-sSWp19ccGThHr5KiJxxlUbPSl1VFSxyF03SySudVwz4=" - }, - "org/jetbrains/kotlin#kotlin-native-utils/1.9.23": { - "jar": "sha256-X9AUhb1z5he+VWv/SZL/ASquufDZwAhPN8tdiKO8rYQ=", - "pom": "sha256-eCaL6luL9QqV7nYxKuNjzAvWqt1d9HQwrBNaIG7467Y=" - }, - "org/jetbrains/kotlin#kotlin-project-model/1.9.23": { - "jar": "sha256-j8s85RKrtFLX1DHbssMS1cRQXRdiSTtRsQavwUfZk2c=", - "pom": "sha256-nvSy89nZ9Zqwwr9+uO92MgUUmTjg540qIxxHiSHHl0U=" - }, - "org/jetbrains/kotlin#kotlin-scripting-common/1.9.23": { - "jar": "sha256-ii5Wfz2/Nz5hwBrNeIRjHshThGWrjul4rGMpb4zJr0Y=", - "pom": "sha256-/CiXW5TcQMDZD9EXXiKxtka60sY368+fT2qy1Oe8XdU=" - }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.23": { - "jar": "sha256-e4A5/wt3nVVs7QCSMDWr0TNPDl8qiHlhgtArpF+SbSA=", - "pom": "sha256-7Y6//r5Ume1iSG+oGBJ7td1QHXTEq5XFfnwB7z+NuWg=" - }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.23": { - "jar": "sha256-kOU90S9i3NgjQ8EsDLMUrc/wy8OYjtsRjR5miZYOnWM=", - "pom": "sha256-923kmO12xGroZlZnmAf3J2EiPD+hChExgyAGpKs5Xe0=" - }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.23": { - "jar": "sha256-0/yn7JUf94Jvl6dZifjcr/YM+eHna73CIO33eDdqbmQ=", - "pom": "sha256-4u8r+y628hp7croS7cWaFQx/IXbCssVP4uhg7oAjDYc=" - }, - "org/jetbrains/kotlin#kotlin-serialization/1.9.23": { - "module": "sha256-HgxSwYSenFBVDtog62tKVoTfjao9Ch0oEytUeiY/AX0=", - "pom": "sha256-8NXaRS3RR2HgRTqOOvT3AmH3s3zDMwAuYd5p3iOKaIU=" - }, - "org/jetbrains/kotlin#kotlin-serialization/1.9.23/gradle82": { - "jar": "sha256-H0s1sl/VpvsXt0k5luFzu0+J3ZzI8NjghJkDzBoBogQ=" - }, - "org/jetbrains/kotlin#kotlin-tooling-core/1.9.23": { - "jar": "sha256-iTjrl+NjINqj5vsqYP0qBbIy/0pVcXPFAZ8EW4gy2fQ=", - "pom": "sha256-fiA0VIj7v1uf6ZeHNgvT7HRKb+qRppm9EbVhwygbB9g=" - }, - "org/jetbrains/kotlin#kotlin-util-io/1.9.23": { - "jar": "sha256-em3OQOeKy+Zvx9Z463Qch3hFo8/Rx2xNK7+OyEXS2Sk=", - "pom": "sha256-rNHyN4Ce4nWpwJ5EAt1FOdBN7DaMCQbsecP4A6vwZ8g=" - }, - "org/jetbrains/kotlin#kotlin-util-klib/1.9.23": { - "jar": "sha256-5AGLa4+8keTQo3q4HAUKgTloaAdRCM2FCCuSXHnTvG0=", - "pom": "sha256-+z5FhH1dIS5MK120RFGQPJ4fDjL2mH4fWbnMEcTDiYo=" - }, - "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/1.9.23": { - "pom": "sha256-WLZeZTaFOa3P34XUv/KcpJUc9ceroM7wp4MMkTlPzk8=" - }, - "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/1.9.23": { - "pom": "sha256-35/uhYzdH4SamCIcPNE09eQeujRHhkBkrVASc95pyyw=" - }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.3": { - "pom": "sha256-Tl0ZAOY3nvP1lw0EqPMFKa3IL4WejMEHwhzoFJ72ZsQ=" - }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": { - "module": "sha256-yIXdAoEHbFhDgm3jF+PLzcPYhZ2+71OuHPrNG5xg+W4=", - "pom": "sha256-U2IuA3eN+EQPwBIgGjW7S9/kAWTv7GErvvze7LL/wqs=" - }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.7.3": { - "jar": "sha256-GrOsw48+c1XE+dHsYhB6RvpzyJnzBw0FXl1Dc9/mfhI=", - "module": "sha256-NNbumbdqwGK1FVW0pwvhg0n+VWbaeaGQYU8XHIC2U44=", - "pom": "sha256-dThYdT3su7I5c0PiuHHwYvaXgS6UIuQcnuRqZrk+7jA=" - }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.7.3": { - "module": "sha256-f7FiOWWU7CjhtqRBG0V5SadnD14SAZF2d04f1rlHG78=", - "pom": "sha256-7W6wOYcXA14p8cHWCk4927iYWPPbnge1etdZ03Ta6Ck=" - }, - "org/junit#junit-bom/5.7.2": { - "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", - "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" - }, - "org/junit#junit-bom/5.9.1": { - "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", - "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" - }, - "org/ow2#ow2/1.5.1": { - "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" - }, - "org/ow2/asm#asm-commons/9.4": { - "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=", - "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk=" - }, - "org/ow2/asm#asm-tree/9.4": { - "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", - "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" - }, - "org/ow2/asm#asm/9.4": { - "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", - "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/springframework#spring-framework-bom/5.3.24": { - "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", - "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" - }, - "org/vafer#jdependency/2.8.0": { - "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=", - "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0=" - } - }, - "https://repo.maven.apache.org/maven2": { - "ch/qos/logback#logback-classic/1.5.3": { - "jar": "sha256-tf6W/VZV+Usbyogdtc4WQ9CLnb3Ni2/jYeMuRXjVYTs=", - "pom": "sha256-a1TxNgVxhl+cbEvsDkhUiE63o268ZGWlKpYGU6iwZ8Y=" - }, - "ch/qos/logback#logback-core/1.5.3": { - "jar": "sha256-eFRQelmtXFgijcS8Pas9eSJTl/XvJDDts6zlREXgER8=", - "pom": "sha256-sZGeCDrFrpwZZq+FnI/FEgTIW384Nf5pnF7eZtQv2Bg=" - }, - "ch/qos/logback#logback-parent/1.5.3": { - "pom": "sha256-DFvLSOq4iEJD6SEv0+XzOME4PitMsa8xMyCZQfgtCk8=" - }, - "com/fasterxml#oss-parent/38": { - "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" - }, - "com/fasterxml#oss-parent/41": { - "pom": "sha256-r2UPpN1AC8V2kyC87wjtk4E/NJyr6CE9RprK+72UXYo=" - }, - "com/fasterxml/jackson#jackson-base/2.12.7": { - "pom": "sha256-F55U/ibI1N/pJf7jHUqH0cwl+LfgCUik5laxIp4rdq4=" - }, - "com/fasterxml/jackson#jackson-bom/2.12.7": { - "pom": "sha256-GVVDL22K8ygG2C2CGP7f5L47s+I9WadNgUSf/HS/e9E=" - }, - "com/fasterxml/jackson#jackson-parent/2.12": { - "pom": "sha256-YqocFnmt4J8XPb8bbDLTXFXnWAAjj9XkjxOqQzfAh1s=" - }, - "com/fasterxml/jackson/core#jackson-annotations/2.12.7": { - "jar": "sha256-PKzvcUqJ89aLafoRJjr6VaaqL97x//k97SLKoWtUaHw=", - "module": "sha256-udQUijW0OBPvz4AbJj7+jpyvHXWfbT6c/xIXrUs0uRQ=", - "pom": "sha256-u7b3aEXxQjrbJwnPw2M4OlKR/Blf407OEoYn/j9Z/dA=" - }, - "com/fasterxml/jackson/core#jackson-core/2.12.7": { - "jar": "sha256-OYemozUEbiJuVrgdaWaPtakbFV6n/ZawhRrbt9SsHKY=", - "module": "sha256-B0jdOm9PbdgkSwkZ8RQPWw9oQm8LCkq2n7z1au+XnKw=", - "pom": "sha256-hmQUWI/gqPtzQbqph/b+4FZxuYWeKMMstjvFKfQqY6k=" + "com/fasterxml/woodstox#woodstox-core/6.5.1": { + "jar": "sha256-ySjWBmXGQV+xw5d1z5XPxE9/RYDPWrAbHDgOv/12iH8=", + "pom": "sha256-SDllThaxcU509Rq8s3jYNWgUq49NUnPR3S8c6KOQrdw=" }, - "com/fasterxml/jackson/core#jackson-databind/2.12.7.1": { - "jar": "sha256-P1BMrEBc4GbVZl/2lUFITVMi81rHp+xhBM+GoBAI4C0=", - "module": "sha256-00wrIwGY2LLTmirRRxDWySJxwHhIxDKkDh1HFZSiKaY=", - "pom": "sha256-BXeRSYclRKUn7oo4VYqRcJeVMvSAb0/jz4k6EHaKj7I=" + "com/github/ajalt/clikt#clikt-jvm/4.4.0": { + "jar": "sha256-3UJMfEETwRTvwQPaP6uCzL7nSElwEpwHZKRXi1hnc3E=", + "module": "sha256-+7VuRAdirxrynHnd26lK40PX+e8ha6m57IjMkaxhoMs=", + "pom": "sha256-EsmrEMyQ/YPRPASDj5a8q/NksORNjdJ65V4VLGMxPA4=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.12.7": { - "jar": "sha256-udi0WaP98IcES8TzYWOxhaCtsISpOQ3422J7EVCH76A=", - "module": "sha256-bxysptOpUrBBDJgcx7yLkG2d/V9EazYUQLkq1yVfg88=", - "pom": "sha256-G45KhlzmFyf9DuDR7sJWvoXfklfqNj83/N4/DlZEol8=" - }, - "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.12.7": { - "jar": "sha256-hGhu9Umr8FPuNjKSWwJL4/MwvG809+Fm8FN3mef5Db0=", - "module": "sha256-wDgW20RCyzvDuEg3XZte4z0cjjmZnT6e/eVHzq8U20A=", - "pom": "sha256-9sHbW2XrT34FtcQu6/fXwzBtwn8gRkGreobv9+UCsWs=" + "com/github/ajalt/clikt#clikt/4.4.0": { + "jar": "sha256-pGJRQhCAqew0Cm92KHhUIOuyx9Ccw7BVOZ+j+676doY=", + "module": "sha256-Z84+Rk1+r4GaBRQVd6IERrjkWbfk6RqCzoh7WKiOrWg=", + "pom": "sha256-lrjYoujSS0misWTzN9LnAW3aiURAFFgNv/R4nilVZGk=" }, - "com/fasterxml/jackson/module#jackson-module-kotlin/2.12.7": { - "jar": "sha256-f0WUsO31GzPYnBpUV3vOqz46hbg3PORiLySxJKsyC7Y=", - "module": "sha256-KFgSNtUkPvn4QIbqYSnl+onOmomANlBHJ+tP0gthWN8=", - "pom": "sha256-n3uQJAkenbt/rP6uXhDF1a2TvRMste4UFlRfn6+Rf24=" + "com/github/ajalt/colormath#colormath-jvm/3.5.0": { + "jar": "sha256-Q5NdsGVYtKrD3ZAKd1vj6JtUyfSIYBRX3yfSoXQxZ7A=", + "module": "sha256-51pnwJ14NuUBlxvoNHiCxmFpsgcn3S4sQjmT8VLuAns=", + "pom": "sha256-YGXSHOrrGuPcE0P00XWKWojHTj5hwg60TUknp8G3MtY=" }, - "com/fasterxml/jackson/module#jackson-modules-base/2.12.7": { - "pom": "sha256-EhnfADQxBTWu+hl6YsSgr7gjqIIu1Ch9F3kDElMmoVw=" + "com/github/ajalt/colormath#colormath/3.5.0": { + "jar": "sha256-vSKbrzuv1VbRid5yRx2dF8KaofXTJEVgJwvvjmOiMZo=", + "module": "sha256-WgMLkC+VqHlsIUX2sppgwpeNxmQR4I6miLT7eK6p7wk=", + "pom": "sha256-HZZBrdkDXN1gex2qgJ7sFks8m6zFTysQOFHu1FHRefc=" }, - "com/fasterxml/woodstox#woodstox-core/6.2.4": { - "jar": "sha256-X6c01QUPCXQFqAECLQk3e7yB6BHvmhfNAnntMnn0laU=", - "pom": "sha256-EOfKWazmMwqKqW4zMs+Sn8BmcWnei0EvvPxfOgFMVNE=" + "com/github/ajalt/mordant#mordant-jvm/2.5.0": { + "jar": "sha256-E9wdFUB0kM+j6bxUAQ8DHWpcUrc100FcxxRPC0aAqtc=", + "module": "sha256-HDNjczAEy0z54b/mT9xjIiW8dTXVbrhxApdGf8V7wK8=", + "pom": "sha256-095n7fFjX1ytZvkcVnXx+IfJDTuVlPfngQUgfxK04F0=" }, - "com/github/ajalt/clikt#clikt-jvm/4.2.2": { - "jar": "sha256-DEkQ6MU/TtWj11g0+RcrnrGcfDAL4vFljvgKiRdWLjE=", - "module": "sha256-t7xsmPLS4XOdnkOglZrdzpjosuxIvTSSaJGFTJ3ySJc=", - "pom": "sha256-ibGmH+a8ul7YhGNRPr72ZW3r/mXOc02JAInjNEi8eo0=" + "com/github/ajalt/mordant#mordant/2.5.0": { + "jar": "sha256-j80uWaxhZQy8d7paxqDaZlMD6xvVURejzZSpi+ir0xM=", + "module": "sha256-KMoVBsOzOqA5GK9FWSHfiv49oLtN3O5sezdOAG3g4bY=", + "pom": "sha256-CM7jeOmaKfiAw1DUfe6R2H1ypc75WfaoysEd2FYT4VU=" }, - "com/github/ajalt/colormath#colormath-jvm/3.3.1": { - "jar": "sha256-JhMoNBXi4SZhaX3HKVra2g9g7Bfs/K8+8cTuD9t4iRM=", - "module": "sha256-K/dgVNyyOnblJlGQa8aiUFW6btBa/ja3kggwnyvokk8=", - "pom": "sha256-5neriCzRIBZKj0diPoqP3AGS1cdk4jQsS6P3777xOrI=" + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" }, - "com/github/ajalt/colormath#colormath/3.3.1": { - "jar": "sha256-uAv0eqNH23e34PtFGK9+hCUgJ8R+LEQ8OLBPqXnYuX0=", - "module": "sha256-AdTWjQLyoy0wMkcviLHSweDIv6s73TTgA9ssAxnq0Lo=", - "pom": "sha256-gMVPKp3C6yFQELVmlVAvb1Gseh8rFX8t5vT/OSBxuIk=" + "com/google/code/gson#gson/2.8.9": { + "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" }, - "com/github/ajalt/mordant#mordant-jvm/2.2.0": { - "jar": "sha256-L6WeW4GvzHG2q2EosnZ2/8YR0KPBguvA5DezZmq1YgE=", - "module": "sha256-pBEiZJIyB65iFkJJi1cvpoimOHmheofC37dgUS71OfI=", - "pom": "sha256-7kQyTDf8M0oNmj8qn83usit+RyaePq7Ad67OtE6dpeI=" + "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/8.3.0": { + "pom": "sha256-v4nrgYvl5YKQuLGSYalP1ycSEJWE2vjPXXRDsNEpN/o=" }, - "com/github/ajalt/mordant#mordant/2.2.0": { - "jar": "sha256-aFf/hhBGGgwN8XMYxYmLhichc8rOx2ojCcHCpYMFOFw=", - "module": "sha256-PZssDh6kPGPNyZu+qao4tUOmyMiJUo69Kl5OU+I0Hic=", - "pom": "sha256-wQN/2QjFbifYOyz1aECrgETj24rgvwvqFM2SAJdWfZQ=" + "com/gradleup/shadow#shadow-gradle-plugin/8.3.0": { + "jar": "sha256-mNZNyTlAaZ+ko08P2CnncTSnaPriB6fi7HY8pnOsQz4=", + "module": "sha256-dFY5K5OxTedRzEyztww70HaO3M9WjwUUdNSNjgQEYyA=", + "pom": "sha256-ozYhcmY11AgiPW2oCANhI+iD8CEtVa8kAa9BhKPZuX8=" }, - "com/itextpdf#barcodes/8.0.3": { - "jar": "sha256-R0KqmKk1JTnfzrkkoYmnFfi7AFrosiCd+UWfHEo6S6k=", - "pom": "sha256-G46+1Eg5/ZabY5GfBSfyfCTK+182UnyScaeWlnFE1tI=" + "com/itextpdf#barcodes/8.0.5": { + "jar": "sha256-JxLhfu2Mxizw7c7ZfZI+WBSo9Py3PiiZmBfy7ePTNUI=", + "pom": "sha256-dV3DovvZRqf/5Y0xu2VldhdYPQrQQJzVVKv/jdX6FVo=" }, - "com/itextpdf#bouncy-castle-connector/8.0.3": { - "jar": "sha256-DOFzJ7x4zfnXNQxc07lD3tpW55C/V+2t+7URENI5fC0=", - "pom": "sha256-O/vYVHEY2pnAUPKLZaez0KldBzw3cu3MsL8Yn+6AEsc=" + "com/itextpdf#bouncy-castle-connector/8.0.5": { + "jar": "sha256-0MT4RPSbUGKzPiBWiC92dr/UQ6J5ThchjmEvvmUdQD8=", + "pom": "sha256-6LQh/7hqJkLMpPTG+/P9fkajoFgTA74NtkEhDMxqTwI=" }, - "com/itextpdf#commons/8.0.3": { - "jar": "sha256-LwdPt7X7ycjYFT5SrcbJfqWXbvsQWNj/I1/lmuFnCPU=", - "pom": "sha256-XnXXshdQoOQ2/jgVeBY9cCrftcgOKp4cfwr7YnAzYFE=" + "com/itextpdf#commons/8.0.5": { + "jar": "sha256-1t1r+kuzlCX6dzF4krg8mL4rkqmB2A3gM/ZbjdrRtxQ=", + "pom": "sha256-6PNV2C/nt/XFpTj9z2T4Es43s7/tV9uf6Szi3uIwQmQ=" }, - "com/itextpdf#font-asian/8.0.3": { - "jar": "sha256-G6R2sTgg5LxmH1eC37O9HQ/DHdeVXWalZ6QS/J+3uIU=", - "pom": "sha256-eCnurFi9ZnGqttz1GfOSgCa6ljjY/0zbn62J2z1ptDA=" + "com/itextpdf#font-asian/8.0.5": { + "jar": "sha256-sugz7zzgkE9m8VCFcC6lMQyRP9rJEGSXH/FxSfRLp7I=", + "pom": "sha256-6xNuoW0+4NSC4HrYMeNw7sK6mBYDPBjQLkUmBiJzk5o=" }, - "com/itextpdf#forms/8.0.3": { - "jar": "sha256-W7Yrs7UkzCNuQBjQKn9P8cYwotjHxcQN7vG8yTTs82M=", - "pom": "sha256-z8D6s59hUBSC9Z9JjrlUUHeJ+lYlz+W2YLlbpSOwc/w=" + "com/itextpdf#forms/8.0.5": { + "jar": "sha256-4jVgN9+9WY3sspbehpiMc8vrsacIVAIzRpjjcVGmIcE=", + "pom": "sha256-tAI0lgxgvxjO5ZQiEKV2Ln71K9az1x9mxX4W6jm8pYg=" }, - "com/itextpdf#hyph/8.0.3": { - "jar": "sha256-mZE203RplM15th3DhohcDvE421/V+B1Pz5ZnVg1gv/o=", - "pom": "sha256-vK5P5UPEgnwoK13MAuj4pleeZyMrYJPLMBNMb2OP0oY=" + "com/itextpdf#hyph/8.0.5": { + "jar": "sha256-odACrUGK5MksEuZ04hma501lI0mqDJIramQg23e1AF4=", + "pom": "sha256-zUjk+IM1QOasxIf4tsEmhKycFqszB6t2OIYONTmhLiQ=" }, - "com/itextpdf#io/8.0.3": { - "jar": "sha256-EhbRvm+OchmRMCCtSzWB9EJsrHDSwJpX4e48Gt+WBi0=", - "pom": "sha256-s41UJtlvCTE/WS/Fw3Tnvuwnm8iZo+MgySstBfz3vS8=" + "com/itextpdf#io/8.0.5": { + "jar": "sha256-v3f/mTx/yb3kPbUExylCuIU7oqXGw0I2wZdJfUZSqsg=", + "pom": "sha256-n+SFi3+dTykLQ1lLDPn3pQTj6atVydNgVXHPuUYu3so=" }, - "com/itextpdf#itext-core/8.0.3": { - "pom": "sha256-+tpwjS/dLMIUtk4NXKjAZGq2nNWhlAJ3bPZOMWR0UFc=" + "com/itextpdf#itext-core/8.0.5": { + "pom": "sha256-pTfMOsGOW3iUy5vQXD371UmhKDQ0Bm+gNPTBY3Yp4T8=" }, - "com/itextpdf#kernel/8.0.3": { - "jar": "sha256-Z2+1IKARpcrBrl3WHQ4Kps+x17tt8QpQdSRuph/L554=", - "pom": "sha256-PK/xJ9cm21FZroT/MBfITJFEBr7uEa8z2mtuN/zmZzw=" + "com/itextpdf#kernel/8.0.5": { + "jar": "sha256-RFWOysn0+Nnm2GJx01yb4x3DJdPdp1WAiO6ZG9CMH0g=", + "pom": "sha256-ttY1sI6VnG67f7d8E11sCQ/wmyQxvHetGE3OEs9EW6c=" }, - "com/itextpdf#layout/8.0.3": { - "jar": "sha256-WBU+ZyK07RZX6pD+bsHThzQTzvfOCUBWW8MHsXdqMlE=", - "pom": "sha256-BQgvvdUt2GsStFwE8xtbJySsZhu98yYWQHVy3U0yFtM=" + "com/itextpdf#layout/8.0.5": { + "jar": "sha256-l8QdV2mtUWUA6n7pjvkodk8QcLSO9ORuvBZlklPY7hU=", + "pom": "sha256-L8rwWrNaQIx87BPGWkgaV0BhKRA8Z7eS4RH6xitArL4=" }, - "com/itextpdf#pdfa/8.0.3": { - "jar": "sha256-e4ODUZA0nAZAur2nYUz9Gm94VlnDZD1/AW6rIEG2QlU=", - "pom": "sha256-yfbJv/IRi3uKxySTeD2ZjvO+dmNYMnp8zeXbhGVBBHQ=" + "com/itextpdf#pdfa/8.0.5": { + "jar": "sha256-zSTIgUjonvYRRHE04583gaf/+K7VxhO4zxzhgee6TkY=", + "pom": "sha256-xS3rP6rseGc4b813BkBFQJ+tVJLVfPYydW6e7PpeXx8=" }, - "com/itextpdf#pdfua/8.0.3": { - "jar": "sha256-riwweVpcBNvlp5Pc89uuVmEpr5HgpBxkbKx0/fef+p8=", - "pom": "sha256-N1VCL2ecSmQPnHfX9MGqba0igonoPbfYXLvDcOb7sdk=" + "com/itextpdf#pdfua/8.0.5": { + "jar": "sha256-VU+L0O2xFcB9N3ek+GvzNzbIaxvnDm5tMdbEufSBBeA=", + "pom": "sha256-p5mIqCo4mpAfXORVNFasqQkHAF7WDFd6D3NOL8BjRfc=" }, - "com/itextpdf#root/8.0.3": { - "pom": "sha256-NMRtXuf3mn5U7xQIvgVEbdZkeHiF4VhzktNkxyKTyiI=" + "com/itextpdf#root/8.0.5": { + "pom": "sha256-73FcJOWH2D5/EmQe8GasDBNMGcrkaPbg8nTodaVZLOA=" }, - "com/itextpdf#sign/8.0.3": { - "jar": "sha256-jptunXFW7iOj/LCIOdq9TZbJ91kTl37TaoPUN9EH+4U=", - "pom": "sha256-A5W3Jehz+ODO/+GJRHC8BG0BvdKKPZXXOBXvITD+dA8=" + "com/itextpdf#sign/8.0.5": { + "jar": "sha256-u8W77EReI/a0WMUtV8GKyoM7VM9vO4gw9UzeEptkdhA=", + "pom": "sha256-xJ10X2YI6uK65oNJ0F1RhyKPrqVEJ67aMSOFNldaYTQ=" }, - "com/itextpdf#styled-xml-parser/8.0.3": { - "jar": "sha256-xBSIy3lkNyVJODa1oD3702HDcbkC+M3k6Xq4AqvflDA=", - "pom": "sha256-qf2Z+W7UQbo7FvPHAZRtwkzhZkN5bIhL9v6+fMYfA7k=" + "com/itextpdf#styled-xml-parser/8.0.5": { + "jar": "sha256-hyGESBZFgHg6q5v4c+erRpryUxp02nZYudy2eK5SO1c=", + "pom": "sha256-zGoKA7HTlzRMuuOcYEW07dfZGY0ZiLsGoGVlWRmUKBk=" }, - "com/itextpdf#svg/8.0.3": { - "jar": "sha256-86vrCetewNRDFyl3D6Ga5pWTPw78DqThh5+GlYYighw=", - "pom": "sha256-JsKo077u2NfIm7KPHpF1ghDT0vS3T2Pk3DXzcGxWksU=" + "com/itextpdf#svg/8.0.5": { + "jar": "sha256-P3XR7KqtP/nBoCRE5Te6xasxgcuU6tPLotFY+QkIOGo=", + "pom": "sha256-ZyRMu8oNwyJ6H+w75zWKHRM2i5biTzgz8TQzztgGt78=" }, - "com/kohlschutter#kohlschutter-parent-multirelease/1.6.7": { - "pom": "sha256-2x0Pgt2IaDGIXPS1xc8nLdTHjzOdQBHnY1PojsIZHPA=" + "com/kohlschutter#kohlschutter-parent-multirelease/1.7.3": { + "pom": "sha256-6DgZawRZPyy3ORdGe0Vc0tIxgwOJ/jXZ2G5PsVTjIh8=" }, - "com/kohlschutter#kohlschutter-parent/1.6.7": { - "pom": "sha256-52NpBTS3jqI4xCs3beSo53eqrD5525+SQiDemqpVL4o=" + "com/kohlschutter#kohlschutter-parent/1.7.3": { + "pom": "sha256-EJ4IdUJFTv6SA9to/SXg4lnGxQrZAfnC3Ertx+HxlvA=" }, - "com/kohlschutter/junixsocket#junixsocket-common/2.9.0": { - "jar": "sha256-HxH+VKffsOQQ4k54fTO0jAfn9P5lFPSbY9YP17R3B4c=", - "pom": "sha256-CQyX5oCk5VdZGEDizxIq6qo/y7iyZCJ5dg1SJkaaCu0=" + "com/kohlschutter/junixsocket#junixsocket-common/2.10.0": { + "jar": "sha256-g/e2Qij4EECSqw+HvkpYg1RfHkyHGaxej+70LjRpD7U=", + "pom": "sha256-yeTNYUy1zlSVY5yDYtGhlIgIzwsJ4yrhsnjwSZVaPkE=" }, - "com/kohlschutter/junixsocket#junixsocket-core/2.9.0": { - "pom": "sha256-GHfVzE0bCiwH/oCqYbVn99NgAm527Ob6l0SuRjUmJJI=" + "com/kohlschutter/junixsocket#junixsocket-core/2.10.0": { + "pom": "sha256-KqC24es8CcF2S8Zn4tKYbxJfBgDbnfpahWdpoOOhZ3I=" }, - "com/kohlschutter/junixsocket#junixsocket-native-common/2.9.0": { - "jar": "sha256-A+nB2+kg5BJod4JbvkZrxjU7lAF/rP4zfFf0qMqn6sM=", - "pom": "sha256-sWaGFaHMzgEvJD2v7kMU5S4ZqcBWZuaqNr0zxZXIFQg=" + "com/kohlschutter/junixsocket#junixsocket-native-common/2.10.0": { + "jar": "sha256-WZMCw5dpJDbc+gWkVatla2vRJlFGJHTQVitmUsAs1FQ=", + "pom": "sha256-GqkDQJqo17kCq7NWwSrIsZHh9ZHzojNW7UHKHLGd5IM=" }, - "com/kohlschutter/junixsocket#junixsocket/2.9.0": { - "pom": "sha256-Let6FG+mmbcyUNW8Zmk8Rbk0uKkZsRitD8CO5LfK25o=" + "com/kohlschutter/junixsocket#junixsocket/2.10.0": { + "pom": "sha256-ZN0FeWBTfzdVjwqAxm7PeX9HgPdD+0NYyRKDVPO7Flw=" }, "com/sun/activation#all/1.2.1": { "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U=" @@ -540,304 +223,361 @@ "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" }, + "commons-io#commons-io/2.16.1": { + "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", + "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" + }, "commons-logging#commons-logging/1.2": { "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" }, - "io/ktor#ktor-client-apache-jvm/2.3.9": { - "jar": "sha256-5l8SqMndypg5N7vwICSq443Gm+AuTmwLvUtU8shwEI4=", - "module": "sha256-CSE5Uo3OYnbwDLsW3RCWw1UdUy/Jeic6+Fq/y0IQHUY=", - "pom": "sha256-1IJajV6ZwtFwuu/BpitDMP2xWcf+GPRHt/qBIu6eEh8=" + "io/fabric8#kubernetes-client-bom/5.12.4": { + "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A=" }, - "io/ktor#ktor-client-apache/2.3.9": { - "jar": "sha256-Wkb9vED9LXglmIPEzG6vO14pDdB9HEbqiO6j1I9QV3I=", - "module": "sha256-LUChb1ElZpknesEMFyVt/hC7tO3A5OcnPH2X1nYYy0U=", - "pom": "sha256-7zur2sPplaxsQJwFv8zyYNA+obT9WKIKTLk6p3mCxDI=" + "io/ktor#ktor-client-apache-jvm/2.3.12": { + "jar": "sha256-jUdk/2jpo3wGi4rV04IGUXoEDblJo64QvGBrOkh+fVU=", + "module": "sha256-2VWmd8iv3LAP/q8AN9VgZfv1dC/AiX642ge16vnnABA=", + "pom": "sha256-tgneuINzcp57HNI9mDkHXflDGpXiWnPtRFftVKA4fb4=" + }, + "io/ktor#ktor-client-apache/2.3.12": { + "module": "sha256-uZxHiSkKmjGTyilTXqRckq4cRXPv7yc4A4TFPxUmYvY=", + "pom": "sha256-mjzG7D1nR7fj8R7xESIFvI4BgcPw7F4Pj7VMv4YQ7qE=" }, - "io/ktor#ktor-client-cio-jvm/2.3.9": { - "jar": "sha256-SuFHjJWrOAnjrMkuwBNx4sqWKUnuFNm1VvbBmlr+Rdo=", - "module": "sha256-u5y2B4PuKX8yCaAzgUYtxKXCses18epy1xZiV1qQhng=", - "pom": "sha256-0Q/azlH/i04aWVe5vYrNs28rZonyFumq122jtKEbXHQ=" + "io/ktor#ktor-client-cio-jvm/2.3.12": { + "jar": "sha256-dwqtl12squdWroW/1r8Q5K3YRN8wOkv7TeXmL/EFrxw=", + "module": "sha256-zqEPvAP6bwO1d3CqcTy2mKeAgaUP3ZcZWxlpwkxcvr4=", + "pom": "sha256-qS1354DZM0X8oSzbkopMr8s4qsf+OHkO1s/8EhnSmDo=" }, - "io/ktor#ktor-client-cio/2.3.9": { + "io/ktor#ktor-client-cio/2.3.12": { "jar": "sha256-vTqw/pFlL+KLl5wgDI0x7oZv8Jj6D0q0koQiJ5aN/84=", - "module": "sha256-uz6qXhnsZrJNVELvpNkGPIL6k+Fx18cXgYZUtvVR3LI=", - "pom": "sha256-K3uIGypGh9t27DlwPt3Ju0DDRhdvYzBeyoK4WrYMW2k=" + "module": "sha256-KOFohTgJHMPuoiIwaLt3qw++6U4RJ/k/Bor+ObW43cQ=", + "pom": "sha256-mz5GwlJlufGAK9Ec5xEgd6CwpxpAgLYUy+2wThqurSc=" }, - "io/ktor#ktor-client-core-jvm/2.3.9": { - "jar": "sha256-eMjFnRnlvx27SOI4svssmOtn2MSyh97Xa8fwmJFhpHw=", - "module": "sha256-E7+2qQSvKKL694Re4sxj6Fcf6Bq4pkS7tBeXB8pnbl0=", - "pom": "sha256-VnMYeVWFIOb+wTB1w1nW0xpQb654OJwqCmabYdqlrrQ=" + "io/ktor#ktor-client-core-jvm/2.3.12": { + "jar": "sha256-tAeoHZLmzUH5LBUPH9MGDV/KNJHOAq+39xNCRAQIHHo=", + "module": "sha256-tLgSabjOWrX2/g+F/kfRVoqOlZxKuUtn1XQn6XEzVh4=", + "pom": "sha256-DRlPg9ywetvZfpAp+cotuwCcqXJXd8bRuezOqvw7Fns=" }, - "io/ktor#ktor-client-core/2.3.9": { + "io/ktor#ktor-client-core/2.3.12": { "jar": "sha256-E/nV7COKqNoX8sCAUA0GipY6OKMaFkFQl7hA5fjDv/Y=", - "module": "sha256-+0XhKFAtCqjPS6ha2ovd+6EMDeHnGwv019eCZuoZUVo=", - "pom": "sha256-30e0Stir/E5PCOexj8EUCw/Pu/cAL0XaNwTguOnKI/w=" - }, - "io/ktor#ktor-client-mock-jvm/2.3.9": { - "jar": "sha256-ez//yB72EiihlWnQgZVkdbwndpx4dPqWHWZm7YV4LQU=", - "module": "sha256-Lu/lsISt/IJ/8jVzwDLCm+XjpspMIKZJ/RFFl0dCOGY=", - "pom": "sha256-pDVyP5A60+kaFa1jnLUK6Yzi2xXzmKrnsmUISL+CIsQ=" - }, - "io/ktor#ktor-events-jvm/2.3.9": { - "jar": "sha256-QGw59U3lHZQ+8LTcLthWTh2dAvoBXeL6BWI4AML2HIM=", - "module": "sha256-WgYQ9dxhmiBfONZzUqD20qXnFY2GHlf/XHpp/6cEWNE=", - "pom": "sha256-2Zq3wheCmWAaJG53BPx1dSUWZ1NeiDgpNSKrDpzSOcs=" - }, - "io/ktor#ktor-events/2.3.9": { - "jar": "sha256-qfTivW7ALrt5prOcEEr++k281IA7ufrV2e1XCTRX8G0=", - "module": "sha256-MvAB55ymxBYrsipIRvIdGBEPloEgtpay74LosYzAz5g=", - "pom": "sha256-73GICXQmgLF8GA8zKJa5nMACeLKjWgztz110+1xwNLI=" - }, - "io/ktor#ktor-http-cio-jvm/2.3.9": { - "jar": "sha256-rgF0pMgUvtrXgVgRUwvo9q748C9DobzDQFdJ545M0nE=", - "module": "sha256-bIXTiBs3zKDrJ6b4VgKqXJJ02B1hMwahMZ6+DhxxMds=", - "pom": "sha256-jPnYSgxnG5aDJltROn80OR7iqvuBx6Zjz06OPAEd56s=" - }, - "io/ktor#ktor-http-cio/2.3.9": { + "module": "sha256-hCfawQzvA9tUJUm9tArUlCSP/tB5Ar35BeSw6MVB7UU=", + "pom": "sha256-0rEDA3TSk+63skT9xwQxmThMh6oJh0Wv+OqCxcnj8fM=" + }, + "io/ktor#ktor-client-mock-jvm/2.3.12": { + "jar": "sha256-xjHU6dOxNznWeHyh9nA5hAB8HlC4gevgcGuxLuspsbw=", + "module": "sha256-wf5eFcAZC4lGfPbsxUYa1JjzeIOh8wIOOX4omMK52yQ=", + "pom": "sha256-F7t0BKMvUVYhoTyFB9iANwzzrCAa7SCMDNmdTl7f2T0=" + }, + "io/ktor#ktor-client-mock/2.3.12": { + "jar": "sha256-6L8mYY0u7NFcyHzqFJ4He1uo/ErfBUiqdbVJjbNpC4k=", + "module": "sha256-5BquV2y7T4t6TXW8CGAusXZmmp+4hEw45OIzEOkySzg=", + "pom": "sha256-3QYzQvethN844MCuAaFpa3rD1sJtQgn1XnGbWBG54FA=" + }, + "io/ktor#ktor-client-websockets-jvm/2.3.12": { + "jar": "sha256-1oyl95W+4IelVSiXQe9jhlFJuOUFuy0I5Fyh8x2MYuI=", + "module": "sha256-SNST0Ov+mK7puBx4WrgBR30iVTSC2UGUqEaeuPzp4cA=", + "pom": "sha256-VxEuZo1G9lKoq7yyVorduwzHbenEQb7+I86hrwYljNo=" + }, + "io/ktor#ktor-client-websockets/2.3.12": { + "jar": "sha256-qr3hPBfOOQOkZD+X89uWRfRiuDLtXQeDb2WBtNMMoz0=", + "module": "sha256-lBQ+mI228ZzeU2u7pdkwc2gxy+OFaPQoH5VSQgpanJ0=", + "pom": "sha256-DjRE95fKkOKxq4ZqH799sfnZBQguKl7v0YKoSrDxQyU=" + }, + "io/ktor#ktor-events-jvm/2.3.12": { + "jar": "sha256-RPCx3msJRxgtJUCNEQHFbPjAGnuAnuAVK9gdmtyapXY=", + "module": "sha256-wbvWTDPBa1jkGAsX84UjGAVQl72vhJFKSCNhkxLtJ7U=", + "pom": "sha256-PKeHv6OHkBQvbKaLwYR7+AAtHiSDh3nhihK1vwIna5A=" + }, + "io/ktor#ktor-events/2.3.12": { + "jar": "sha256-dQdvbe9/VwlGkWmYMw0n28OvdhfOyyXRZXyaDUKQFgQ=", + "module": "sha256-+Smg6nj7EudbLYIlbMUfGL77D+8ZpGHuuJOJyVG43q4=", + "pom": "sha256-OUMSxuErQx+I/6KbrRS7mTXvJRBgyWWhatNcLxEr56w=" + }, + "io/ktor#ktor-http-cio-jvm/2.3.12": { + "jar": "sha256-J4pcFmJwHbnYn0nnTqdyGO01rYMO//vfRFIuqGFHf0s=", + "module": "sha256-h8242b/858zMHPMNH+TENL5anBc2oOIDrwiEFAOm6Wc=", + "pom": "sha256-C960VxzRj9wpNqskIn931suo2bzCSD6zGFHQxoR97uQ=" + }, + "io/ktor#ktor-http-cio/2.3.12": { "jar": "sha256-gHWsxhXDR76RNDI84n5q+FaBdlDG6P+Ctz2sYq4Tr4Y=", - "module": "sha256-Pakptk01EA79n4MwCtgX1X/IpAibPzOG2AA5l33MsGc=", - "pom": "sha256-lGX9WjX4RxqIwSGlHniLHYnnZvbNQoWztwuGDF6JVyQ=" - }, - "io/ktor#ktor-http-jvm/2.3.9": { - "jar": "sha256-dqYd7yephR18Yt14IeKf+a+ipj1INBW9FkMj3n7jSeE=", - "module": "sha256-IrcQgRcCWBdZv8xXfrPgbm1D0XYUqqyyrMBRKDecsAw=", - "pom": "sha256-rv8ur5x8vlXmoj+qDV39MKx+etJvF90oaOh7+wayfRg=" - }, - "io/ktor#ktor-http/2.3.9": { - "jar": "sha256-9PADOhT6whJBqLu+HFzxkzvRA+3I6eJ37j7gwcvTRkI=", - "module": "sha256-4AxlLf6stQVYvnqM8uGTZLN05WFVtk3TODyDMQR1S1U=", - "pom": "sha256-2OL7EPMr9EKkUZT2jzKkAoiyKUdtwaAgBy+9W9nE4DM=" - }, - "io/ktor#ktor-io-jvm/2.3.9": { - "jar": "sha256-SevXoWUuOsqfBGLQVK90nd+tj2z1q3LViiw3nLTwFQE=", - "module": "sha256-zxJVkHt8mOzh2leM7kledvwVW30jTmgTGPUjBpKYt7E=", - "pom": "sha256-2skMC2W7UywojCeem8Bn8cg++PVse0Xg90p1294vVuw=" - }, - "io/ktor#ktor-io/2.3.9": { - "jar": "sha256-skZKEoTyY57muhpCVDIsxUsFMmWHpG+AFUy9tXAYC7I=", - "module": "sha256-yGRM0vkYYzcM5UZfYUkzKcovxHUx5rtrOs+i3kjm92g=", - "pom": "sha256-jtSz4Y2gP4h0GusTT60B03I2V0Prm7xa7s2h3RWdTJA=" - }, - "io/ktor#ktor-network-jvm/2.3.9": { - "jar": "sha256-VUVPmTFzkbxW3l4lhpKWw4KTCgrqpolfeozdCdV0Lws=", - "module": "sha256-Fn1KWTPwdruL65rf3tPl28FfftmdNqCp/sOgYStE0AM=", - "pom": "sha256-eXvPIxERoaqhvlTIP+yrZ9hqfOP3E3oGrh7+eKXypP0=" - }, - "io/ktor#ktor-network-tls-certificates-jvm/2.3.9": { - "jar": "sha256-XGU09dhpi9v/sCBkSp9upScz/zyPocvXIgEXXTXifKE=", - "module": "sha256-SgJSd9ojCII8byxwuwl7d9L1u4xk1yDYMliLrAjFsJo=", - "pom": "sha256-LU9Hp8ilTW/+eSt1IglZ1DtDJZDWpZnjPVh6odV137Y=" - }, - "io/ktor#ktor-network-tls-certificates/2.3.9": { - "jar": "sha256-Wkb9vED9LXglmIPEzG6vO14pDdB9HEbqiO6j1I9QV3I=", - "module": "sha256-nAYZSvWQIZHtkBEL0p+fPkXyQzEDhj4iMWu+s2adPIc=", - "pom": "sha256-rrvURSwUGpAVA+hgqDxMWNoCJthlk9RzOCmbPOuhqDg=" - }, - "io/ktor#ktor-network-tls-jvm/2.3.9": { - "jar": "sha256-LZZLZ9uwkrzDdTBH1kMlYOWLCmiG4rA57jG4c3y/Fb0=", - "module": "sha256-MK82tFgqXViZ0QE6W2mB6qe1ka7aG+UEbrOcLl/d20o=", - "pom": "sha256-ghkBoh8LS5f/2/ayFSJgNGwn2KCQcf/REIBoCZ759ek=" - }, - "io/ktor#ktor-network-tls/2.3.9": { + "module": "sha256-hn6EOqx1exbS59G7SoqD3/w4h419o+Oklu8HyJUcCrM=", + "pom": "sha256-aFfrGiF/QmxeLH8BdygdTm9cQYhrEbfN8Hkm/M8vp84=" + }, + "io/ktor#ktor-http-jvm/2.3.12": { + "jar": "sha256-kHERxDmzvUQz0t67aHkg1fjfjGIpto7VQIBdXjdjtqg=", + "module": "sha256-HbJfyAaPHE6s8LRgJCSSclOZItL3xCWOUR+F4FhSuMY=", + "pom": "sha256-QULK0p5v7rrjm64YKryEmVrsdwRk8lLfT+ZF4aXdfBM=" + }, + "io/ktor#ktor-http/2.3.12": { + "jar": "sha256-2RVRfiXE5feMUP0Yg3twtGKbhQ7sXmTz5GF8Jj5ovbc=", + "module": "sha256-97kqlGhYpGSFonWEZ7EolLEmNK3B1AKQN62Fiec7MOU=", + "pom": "sha256-urBNfz5lqaxHnOzij77ymx/UAVkT6ZUZfHbORE9uWGA=" + }, + "io/ktor#ktor-io-jvm/2.3.12": { + "jar": "sha256-HZOkVmX2dE/5bNe5ekX7hf/scltjvMMn0zomocfgX70=", + "module": "sha256-ZH9Yx3f3Z9IIkwbbiF9o9YyJjqGwm4+956NwUC/61BQ=", + "pom": "sha256-W8eJXaz7EhDj8C/Qchz7sSaQOaFqr5PppHGpMa9Ufe4=" + }, + "io/ktor#ktor-io/2.3.12": { + "jar": "sha256-n4jHL7xCPrCerCM9Qc4/npXZJQ4EntgD4HSoIeQsv3U=", + "module": "sha256-QCIhmbDLWK9t6Kv8UzMIVLv3h05GYpsma49J68XW54U=", + "pom": "sha256-WAtT3KPqyxvto29WIH+8uA3T9hk5h5/iEhd/G2RLJb8=" + }, + "io/ktor#ktor-network-jvm/2.3.12": { + "jar": "sha256-CVq4r6salAjlWmf8pvL5aEhXNRnd0i5+jrHBfcS8jRs=", + "module": "sha256-RY/WkadOYMNEVz1lTtAs7xDaPdV3uuyRkfWhP1/j8U8=", + "pom": "sha256-/kwlQPBd9w5Hte16eitwQM0+djEscT6Q6BSIHOEL5K8=" + }, + "io/ktor#ktor-network-tls-certificates-jvm/2.3.12": { + "jar": "sha256-LOTzE8BNgWmamFhibm8NvrAzw8MXiayyR4ZqGtU3Ctw=", + "module": "sha256-oOIhlv7kjsEGCmsIfnjDzsS5SVEbd1YfI82fM30fXIo=", + "pom": "sha256-qX7YO8bHjRnAkYPsf3Kyyoq7uLepCIqpL1xA/NHAveY=" + }, + "io/ktor#ktor-network-tls-certificates/2.3.12": { + "module": "sha256-md9Pi2llS898JAraQCpR7Bn9Cw/dKBgUjpKQkR0RAag=", + "pom": "sha256-lr4TldgKOyVB0kUY2ZhZRM/KFtvPzkaPci6xW1evCzw=" + }, + "io/ktor#ktor-network-tls-jvm/2.3.12": { + "jar": "sha256-K3S/ahd3ZlhSAQbeUTffncNd+Kwe0BYk+DQJli0SinU=", + "module": "sha256-j6Zi98C2xQwnB8qO+2zz5bJJ6+ca/yCBe6txZoWTVIw=", + "pom": "sha256-8G26Qv0GNX/7XnTmPHDXaTVI/gXAhDumMgQfMiG0ZOc=" + }, + "io/ktor#ktor-network-tls/2.3.12": { "jar": "sha256-pQkzuB2+4tWiAAC4Oc0hjNs9q/bmvDUVMsSM1qLJpqc=", - "module": "sha256-GALL81QNcXAJMtDIvncSysm6DCBjpadaEAtlYnF1f1s=", - "pom": "sha256-lcrYB/KXVVW8X51b0s8Uf0GIGi+HZ/rOuNgUb5rQ5gI=" - }, - "io/ktor#ktor-network/2.3.9": { - "jar": "sha256-1plp96O6Vc6tQ6phJHQgdihREclRsaBOilUsPek0ydg=", - "module": "sha256-HWJ+/Oa1PyC5AXhdTZR7D/sA9Y5OCatpzA+fzJKmQ3w=", - "pom": "sha256-xNkuWQsPrkpBmBXGWLVJhBNwmSZrCEV5OBu2M+lK5Sg=" - }, - "io/ktor#ktor-serialization-jvm/2.3.9": { - "jar": "sha256-NMC5ioiIY7KVWZWB1aTSgRaeLwIePRX8CVAkEzg24q8=", - "module": "sha256-5jt5N2oVWSHGXaS4oYt4wub04dglxILNvGG99cZYIMw=", - "pom": "sha256-uQ/i6vohNFqx8+gXpHDawsrSh662d/SS0B678AL4pwU=" - }, - "io/ktor#ktor-serialization-kotlinx-json-jvm/2.3.9": { - "jar": "sha256-8njCQLvzHVd89tlh4pworJXgt8Eadr8HhS6G2aBGV9Q=", - "module": "sha256-F425CwFVXBL129EpoJcb4j4ddUpITFXLBtE8STh4/hs=", - "pom": "sha256-XxowM98duq6qHfhsOmQB8eYpM2hMxI8R0dVVbNB3kIg=" - }, - "io/ktor#ktor-serialization-kotlinx-jvm/2.3.9": { - "jar": "sha256-euEM1OzG2axbSaE9LVS+nEWSwU57m/TagGfkeGW+L2g=", - "module": "sha256-xibOr0JjuMmQ+Cd/RqqcaG6DVPmDmrOnYMUYKobgDGo=", - "pom": "sha256-r6XRgy1CtHCr1eShGwkG9glqNA/JjbHF4J5YzbHGT+4=" - }, - "io/ktor#ktor-serialization-kotlinx/2.3.9": { + "module": "sha256-jjrtuQYKU5TcFUNc7bcC9w+LQedRkgGW3PzbL2KMSzU=", + "pom": "sha256-Jj+UZubuHisfJg63KR9ZSrKctZ4qW2VP1Brrwnbuwc4=" + }, + "io/ktor#ktor-network/2.3.12": { + "jar": "sha256-DtndmA73WUWELdRZzNbj2juMgEPqh7B1rlCwVNcwMaE=", + "module": "sha256-bfkcWAtGbzCli0Pvoy05ZehZj8Wo92nUIVPWARZllhY=", + "pom": "sha256-YiKMbrnpWXhKx7lk1Mt7PhqiXDHARQJoTJdkYLtkQII=" + }, + "io/ktor#ktor-serialization-jvm/2.3.12": { + "jar": "sha256-DgVTT7w7CUESe27znnBcNMNn2uiwoIKQcBxg6X6I+nI=", + "module": "sha256-GTKCfmbOzf9dgIaAjJdK/es3fM/bL50f+UBFdX8o1LE=", + "pom": "sha256-NrmT7RV8Xg2N6VDQjNIZyykQnY37JPYIyonzI062VzA=" + }, + "io/ktor#ktor-serialization-kotlinx-json-jvm/2.3.12": { + "jar": "sha256-S5nwc91m561Dy6YLUlmHb4WnXga4TOmzt4m5FZ+0Fwc=", + "module": "sha256-Tmgm6TN3WGWkhqV0PLOdO4Was6FvY6Wper644osYLyQ=", + "pom": "sha256-7leUKeRFBy7mX49AQ1YQ9RWopYKFH/ClUjha0OhqLEg=" + }, + "io/ktor#ktor-serialization-kotlinx-json/2.3.12": { + "jar": "sha256-qtaRy5Dm0tfu5aTALTpbyMxt23SrhXYyC6fiarMZm84=", + "module": "sha256-hVgEVad6tmzdj3yFJ9dgXTniwLb30IoGgx4Hs87XVMw=", + "pom": "sha256-P7B5ls1U5caVkKaHbVXdC93JqonQIK7T+dxZ3zVDR6A=" + }, + "io/ktor#ktor-serialization-kotlinx-jvm/2.3.12": { + "jar": "sha256-xhQnYJ9dbw45jfvySnyafftK1ZDon1TFwCHNfHEtSn8=", + "module": "sha256-UO9Nf4ee4QDi2uz81/tHpIX7/CPcNXDAPki21LZIfgg=", + "pom": "sha256-XbOFoQf2k+Mgk+TrG92VWfIqVsJdvxkN77eCrAtQocI=" + }, + "io/ktor#ktor-serialization-kotlinx/2.3.12": { "jar": "sha256-+lu+kbBqPGUW1olfbvKp15rAEJO5jDKAzCv/+kgktQg=", - "module": "sha256-T1vTZOu7WCuLp3da0VWXlNpEx+9emscNOhZJjiFRnAc=", - "pom": "sha256-G0drsy5X3it27TzMV8CF8BGBRS8sz+NV5ZY3OFmspGo=" + "module": "sha256-giYVZjIHuPTT72bZO+yzk1QhDhUEgOcHrI/LFkmYPRA=", + "pom": "sha256-1WBIrQOYmjq3ZFiYEZZ/Pt3edNBwPNGIQyS4LWCDHZc=" }, - "io/ktor#ktor-serialization/2.3.9": { + "io/ktor#ktor-serialization/2.3.12": { "jar": "sha256-I/oFsvofdMi+5JsvpNCmzRaXdvXLw7e00I5nfmr7n14=", - "module": "sha256-C4PT1kZjRvF7XTedtnnVQajoUMzD21Nq7Zrn2SFviFw=", - "pom": "sha256-I3i4QBnk0BZAgpTWf6mTO1igD9aK1lGpHE+pCir2osQ=" + "module": "sha256-k6tLV6lbcXNH6smUDI5QkhvQ2EBKw4j6mDlLRaqMRGo=", + "pom": "sha256-Q3WCoJTbZp2kPogfpctbs8IGJ+O+HgNkqk53hSqrG4Q=" }, - "io/ktor#ktor-server-call-logging-jvm/2.3.9": { - "jar": "sha256-8ReX1t//aPCf/ZIIWS6DZG8u4tFmn50dj5bNEn1UbEU=", - "module": "sha256-mhwATq8PiPesMIWLpxtOuvMAr85YjLQRQo8uyLTObu8=", - "pom": "sha256-g7XbG1sDinuF+u81bhRlEh2ismuqseaw3o7TFLY8U40=" + "io/ktor#ktor-server-call-logging-jvm/2.3.12": { + "jar": "sha256-2ZCFAv3jI23WSkP3y/oXle6p4IPPmzCkSFRPzMIIrGg=", + "module": "sha256-+J2mtOQ1mwqjIiUe8T6ky3EgQHGYAmaRp2TRDObvuG0=", + "pom": "sha256-TJ50lHBMUZo3HK8rEKLQc+N+Y+eILBKwkxgJRaGGBgo=" }, - "io/ktor#ktor-server-call-logging/2.3.9": { + "io/ktor#ktor-server-call-logging/2.3.12": { "jar": "sha256-9bcBSzx89lyNPJHPmlMZ2NvmMC36i3K1JdgM/j4rYVo=", - "module": "sha256-09CuUJIDuoc66HwO8rvNECF7SH0+xcO6LpJkfdii3f8=", - "pom": "sha256-9zy4LsFORUsRDxd6FcC58GXxgXRPIOpTD9n2dfWbrf4=" - }, - "io/ktor#ktor-server-content-negotiation-jvm/2.3.9": { - "jar": "sha256-9KdgPmXbnRtkXOQz2XHQxAc3umraSs9DZFaEJw8dAO8=", - "module": "sha256-xL9rA7ju59qa6x2G9JULposNx8quDQqYjUJUcc+mfAw=", - "pom": "sha256-tojZVBvuNn7hQdkAh5NJEF5Uvvug1g3AJl9LaUKSvwM=" + "module": "sha256-/gl5sCeKn7fHWqq40aZwG6sB1l4D8GnD01+owcbvbJ0=", + "pom": "sha256-ffw5Qb9VTBapmMGzVZRvj+dZxy/nSw+f35mKA/wnrGQ=" }, - "io/ktor#ktor-server-core-jvm/2.3.9": { - "jar": "sha256-e9modsIMbJSlqOQtavgrBZP6B0YeQPIEkKAeYPgoqO4=", - "module": "sha256-Y2GIxyhp8Nu4XwT35mZSICN/ewXmKXbrYnUBNrut7c4=", - "pom": "sha256-bGjP/o2jBoJVXf6ld62FhqAvZuIYLvAsC4zCs5LwD1o=" + "io/ktor#ktor-server-content-negotiation-jvm/2.3.12": { + "jar": "sha256-8z3S07/SLoQtPNs4mdxiP97xiFMSM+yKa3e5YQG5zyo=", + "module": "sha256-WXSV3kPdEANtI6+wRUzreZf2V1zsYZTSOCgxgEW94Lk=", + "pom": "sha256-hWxlgYry3cH5pS6I1SjPFSxEdRyayXDuu5CdfeQLRTU=" }, - "io/ktor#ktor-server-core/2.3.9": { - "jar": "sha256-PztUA1uh8KXfyq3LoJd62JDVDEUa7iLVPvTVa1Om/O4=", - "module": "sha256-Fj9IyooZ1Kq+2pjL4TkjLGNLCQD1A3JTYdUQZZjsJkc=", - "pom": "sha256-1+GcZ3Jf/3R2N/bJMHymzieRLI7txSN5BYqSa5gXrVM=" + "io/ktor#ktor-server-content-negotiation/2.3.12": { + "jar": "sha256-QIzMqhJQVC3Gi3IeChoqzrgcYscmJspE8CR6pwGwtmI=", + "module": "sha256-lsoYcODLo0DAiScd3BmRis714ZJ7GFxgpI4FYd1mJ5I=", + "pom": "sha256-IALFuzN7YJ+v2MRY/tYNCWd2ElitDT5y7jJfwO833e8=" }, - "io/ktor#ktor-server-cors-jvm/2.3.9": { - "jar": "sha256-VQPmblnQ7lMqTPylNPXq3U4Py8NNrPVl9gwWUl9bqlk=", - "module": "sha256-HQQf0CYpOBq/sHZa1IwPxXbrl0tk0wK7sPhBKopKePI=", - "pom": "sha256-Rm7YjuyzUMoKvVR7N5HC6Ge+0hCZScv/0JeSFRhhccw=" + "io/ktor#ktor-server-core-jvm/2.3.12": { + "jar": "sha256-87MLoTVXIKOf3iFGDODMOoMiJBcjbX3m/f/lQnZFNrk=", + "module": "sha256-52SohTBiijvw2ZKu+SW07XDSpqg8ifA2VvI1F9mrTL8=", + "pom": "sha256-cq2x0bdiWEQ67EiZYMT9LSF3K3PWHpgzrRJcJLUHQ34=" }, - "io/ktor#ktor-server-forwarded-header-jvm/2.3.9": { - "jar": "sha256-/IoV82DN/+/ywjgP9rZILCLgAEPg4Jcpqj/VZm7xXj4=", - "module": "sha256-l7C9he5/0SznYtlos+YfnVXZKH4zN6lXsT8Cn7z886Y=", - "pom": "sha256-9buBXtGYei6DpUVatAvICq/siv/1GfoHP6J75nqHV7c=" + "io/ktor#ktor-server-core/2.3.12": { + "jar": "sha256-PztUA1uh8KXfyq3LoJd62JDVDEUa7iLVPvTVa1Om/O4=", + "module": "sha256-dxeztTJwrTUrCERm26NRI/GEhF31hHbhQiN84n7p4f4=", + "pom": "sha256-guqcwPrUbOmUfZntglGkJehvBkEGhz2gsbBkLt+CT2o=" + }, + "io/ktor#ktor-server-cors-jvm/2.3.12": { + "jar": "sha256-xwTT3tMN9HlLRgNECdlNMhCPD3ocLQbn0Sr77fj+Xds=", + "module": "sha256-kFyfIXxcaklf2uCwwU6S+S5KspVDhXi3Frxpmp0AFps=", + "pom": "sha256-1iX13wJiGJScyoDJ+NoseRZZk/Aei7TEUDMiph/dVwI=" + }, + "io/ktor#ktor-server-cors/2.3.12": { + "jar": "sha256-fIHP5xLja3p1sC0m7muVaH3W2qJkcOeZ6HEtjNVdSo8=", + "module": "sha256-g1jmADVcZB6gsCt1cdT2QsA8/rPHIP3R9UrOncRfsdI=", + "pom": "sha256-XxeuBgyCjFqWa62syZ0Tk3sEH1OLg+h7+eT9nqP8HxE=" + }, + "io/ktor#ktor-server-forwarded-header-jvm/2.3.12": { + "jar": "sha256-PSYjHAFFbvj9l+lrt22wQfIrnDCEVHopoptivwTe1aw=", + "module": "sha256-Wp2PoyeUo3JnSJEV4e+I4HOwm1VWcdwSWQeMksSZhgw=", + "pom": "sha256-0SoFCtfFOsVuBjygUznMx+S0lLczzPQVMj9CZTDA/VU=" + }, + "io/ktor#ktor-server-forwarded-header/2.3.12": { + "jar": "sha256-rBeywfo/ojJHL/BeKB0Zvfm93jeb890IJNPNIFS3IoI=", + "module": "sha256-BNPJlnykEq8aRxuu04rcMg623ftRVAbyAeMfqgOUkws=", + "pom": "sha256-lqtff9lawr1yAleT934ws+tpU2N3E5mWVfRu5ikF0SA=" + }, + "io/ktor#ktor-server-host-common-jvm/2.3.12": { + "jar": "sha256-PqCwuI/69rOzyL9QbowWi3oK2Sb5YRY4kQ6PszSs+Y0=", + "module": "sha256-KaTlZZjUo/QHi1AsjAZDQI0kvFxKwqhvoINV+LpwWsA=", + "pom": "sha256-y8TqBs6yF4ydBR0mOgFpdMFsFP03vcarYvRe3BIqTHs=" + }, + "io/ktor#ktor-server-host-common/2.3.12": { + "jar": "sha256-rszGWDfMza0w0iSK/EGgMmYW4PtIEQ7MdC9FxHAueng=", + "module": "sha256-6SXz35o/7+m5wu6LuCJ+r4wzzBfeVQ+X4TPBVb/YxDc=", + "pom": "sha256-OrIB6jqq9j02JL7E1rkZ5Gs5ZDsolT9V8pjb21Cm3Mw=" }, - "io/ktor#ktor-server-host-common-jvm/2.3.9": { - "jar": "sha256-ZnjXBW4NHIGuejYjV1WnQifdwJ2/ZYf4bsiJtOSEzSo=", - "module": "sha256-vvIgNRiFDxiGexyDLlbYqQHVwAGUx3uzHVqIAIh01IM=", - "pom": "sha256-RBt5kWGklte2R36K4yJbmpPRTf/Gke+Hg2IWmuWupS0=" + "io/ktor#ktor-server-netty-jvm/2.3.12": { + "jar": "sha256-fB6Wuez726JFtTnCKRvZ/V6qk5EDJxNqhZenY9G3zKU=", + "module": "sha256-uPdqMoqrgXqUMo3zTPtJoXnGAdbgAKG6uybuXxWJmcI=", + "pom": "sha256-PShkR8o1JXiLOKF6rs/Qs8utUIUEpeeNTltQIwM5gtQ=" }, - "io/ktor#ktor-server-host-common/2.3.9": { - "jar": "sha256-rszGWDfMza0w0iSK/EGgMmYW4PtIEQ7MdC9FxHAueng=", - "module": "sha256-Q04xG2CeqDemcU60U2nMGeBvBd6zf7ujpF3g4Upn0LY=", - "pom": "sha256-azz8PS+aJcC3uwFNsF4/+KInj6iPPwiLjbEOUx6ise0=" - }, - "io/ktor#ktor-server-netty-jvm/2.3.9": { - "jar": "sha256-FntLW+0rNoGKJj0F1qpLD4Bv/Ic7ToJQmMh1Z9XeLU0=", - "module": "sha256-xmn+zYnO0VctNJ/Qbn2L2/4w7EfLWE0l/QroF22jQdw=", - "pom": "sha256-z2KtTmcCj/pSG6PU9hczv13IV57UQvUauhihnOka6W0=" - }, - "io/ktor#ktor-server-status-pages-jvm/2.3.9": { - "jar": "sha256-n3Lh38EPziT/6vWd+67e1YTo6zxeTKd/cD4zUFsw7iQ=", - "module": "sha256-dJoDEkT4Nppg8rHjvNEV3rPoRYA+6Wx4RJ04tp3b+48=", - "pom": "sha256-6qGtbgZNXlPms9itUci2cd03e5fsO61kkLs43zmWtbY=" - }, - "io/ktor#ktor-server-test-host-jvm/2.3.9": { - "jar": "sha256-PfVriXUzxE7cOQd4DoK5kjiuwZUveoW0Bhje+LWkXps=", - "module": "sha256-RT1n7Ady/VgZHMyW0PeKBzBTG8vMzeUk1jCJkAmCrxw=", - "pom": "sha256-RK1HKGa1aPrxBI4gRtbEbXNeZeAvRbgTSihxQ6oanVc=" - }, - "io/ktor#ktor-server-websockets-jvm/2.3.9": { - "jar": "sha256-20QCh8dMWH1FdKq4cDN2NeHhXzwyoXW/wWExubah7wk=", - "module": "sha256-npDU+qKlPdjuhil6qlqhhR/4ihxGpqO5FMDe9gFWP1A=", - "pom": "sha256-6QfSltly5BLAIAIDbhL6fFBwggBtpiRVBGdssNaFczc=" - }, - "io/ktor#ktor-server-websockets/2.3.9": { - "jar": "sha256-nVtef+NqQTIuIYDZ2E8d0Auyqqaw6+mzE51vv5MVYqo=", - "module": "sha256-0LHgcGjAbWynJTtFBymDfkJwCbpHYt7vpGMVPVK2PWU=", - "pom": "sha256-SSaCZw4i6CAV1+zWscMQXndlXU3rYn1fxB2budnV09U=" - }, - "io/ktor#ktor-test-dispatcher-jvm/2.3.9": { - "jar": "sha256-hy09SmOD6qA+O1szMJuP7MFKPGsK7bqPVtgLwy0OyYM=", - "module": "sha256-jr32NE4zoRWdiGYZkW+Jb0xGY/3SHUD0x8m49rRmuVc=", - "pom": "sha256-f2elTFfEiVOt7AHLTxdsk9pWwEbh/oN6uGJf4fWVUuY=" - }, - "io/ktor#ktor-test-dispatcher/2.3.9": { + "io/ktor#ktor-server-netty/2.3.12": { + "jar": "sha256-Wkb9vED9LXglmIPEzG6vO14pDdB9HEbqiO6j1I9QV3I=", + "module": "sha256-zdTXhSg8NRXKb3hybIzhm540a80u5nyzKWByFTsopMs=", + "pom": "sha256-OuuYhKZvErNF8KiUo2kg/9VRITL46mQExWJNao/g/R4=" + }, + "io/ktor#ktor-server-status-pages-jvm/2.3.12": { + "jar": "sha256-0BCgY9Z8xAZ/uVECbeo5YpCB9/3por8HTHjp4ymz32o=", + "module": "sha256-z6BiRbNtUJBj12FUc/zn1tgiv60/BeP7hKBGdA4/oGY=", + "pom": "sha256-fmR0X09A7841Xi5cvPO1paM/0mew7TshUdthpcGHIlY=" + }, + "io/ktor#ktor-server-status-pages/2.3.12": { + "jar": "sha256-1cJm3V9RVm8SvS+M/sf9cl4u4FSt3VTKzKrb8hcPDzw=", + "module": "sha256-uNoB5ZdeqdJcEOziZK66a55f8DeDUqDYLGSgvBArflg=", + "pom": "sha256-FJUnS6kEF6+rkfdoGkEVWS3H0eyQGLDiOHIo5CV+zcI=" + }, + "io/ktor#ktor-server-test-host-jvm/2.3.12": { + "jar": "sha256-0Y+qYjowBfvy3ta0WZCg4CUZ7S/NAqEebs7trSRHB4g=", + "module": "sha256-a3GD2blocgML02f1k6ZiwaZYAglMDBN9GdJmXf/RNKY=", + "pom": "sha256-zt86IcY+yAJNxU6MGTI2XHxKF9q0pN428Q8bYXl3UaU=" + }, + "io/ktor#ktor-server-test-host/2.3.12": { + "jar": "sha256-RaLXEGOGVhiWAnsk67ZOFU9hQuRzGYLpGtKhiWJgX8A=", + "module": "sha256-dLj9g4R9I6nRXjzWFC/WxnjhiTPT/sc/dAo6481zv0c=", + "pom": "sha256-6wWYAdVMCxSPHV7ltcT3B9SSayFnE5FYSSmB6dW/tC4=" + }, + "io/ktor#ktor-server-websockets-jvm/2.3.12": { + "jar": "sha256-W4FiW1RiVsaKYSrBJ/mbqJS8hVlyzMH0KssW9X87c0k=", + "module": "sha256-DMchLiP0ke8h0VY58khcgj1WPdVb92nvFaZP+Hl+uLo=", + "pom": "sha256-Z56Qmr0F3rPThB2pxIk++JTybhan+FLflikP2PqnB8M=" + }, + "io/ktor#ktor-server-websockets/2.3.12": { + "module": "sha256-iNhH2pdYDCZfRZOowbTPGkhmW0x8VzhE12+zy6BQnRI=", + "pom": "sha256-INYWpc8A9/yIRykFu1JwAwGfI4Xg0vUfEu8HOZuhNaw=" + }, + "io/ktor#ktor-test-dispatcher-jvm/2.3.12": { + "jar": "sha256-uLeCuPvzyY/wbbYL0/P4wxc/a/PWDYZpsdO3pLQWa24=", + "module": "sha256-ZvMSVFkDbgFKVHFEJti1cCOSJstiqIheExBP/xZoxp0=", + "pom": "sha256-NzeYrCfmSOP4Sevz5F2cOPMdd8iyMzP4UtLbH1kprmg=" + }, + "io/ktor#ktor-test-dispatcher/2.3.12": { "jar": "sha256-m1L5EwHLh9TSOmp8/mzYXlGTXSI8HKf+RF+UwNuee3E=", - "module": "sha256-vcCkosbfASSOKI4iqTQOhEHdpgtiGKjRBhEzNdyuOF0=", - "pom": "sha256-tMa8akOax89+KnU3ekA4a8jXDgE3PL+pyNswbhA4jSk=" + "module": "sha256-AaVKAzqbS8iPPWyQxQ8EEGMDKeVSgs0gyb1EYGNbylU=", + "pom": "sha256-0IfYPn6lFibhi2D1BEznni5qsujP4pHPWuHk7eIjzCw=" }, - "io/ktor#ktor-utils-jvm/2.3.9": { - "jar": "sha256-mH/r2kVD7/sdDg1ZBbLut7t3fJ9DLjnRIkFTxcbyNfE=", - "module": "sha256-Mwl+WxKFnjPIJYrZedrsZbdH6Dp/4z4qan51n8tVvGc=", - "pom": "sha256-sSbiYOBihXUK2TJHX0prVfxlHKw4XsQpDoz7mK1ejGY=" + "io/ktor#ktor-utils-jvm/2.3.12": { + "jar": "sha256-anLWhnMwBl7UYZUv/xnqVbqEQ1L3SM7Bhy9bx7Ie/AI=", + "module": "sha256-rYMuChkwgwCinDQNvY2I0pAcLzuw+CFhrWamLSB4VgQ=", + "pom": "sha256-Xi3ckkIaAAWDUdMPo45yB6qYsZ6fLYCYRFmIB3yPNGE=" }, - "io/ktor#ktor-utils/2.3.9": { - "jar": "sha256-uK8HnGG3oes6r5PipsehqhZjFyIIpmUJPNJpBuBJ6GQ=", - "module": "sha256-dkr1rxi1+CwLssTTS8cqhT1IANOfFl+oF34hfuDZ9Vo=", - "pom": "sha256-GiP4cvHRdU7rHCzq/d1JSShxrTpiCSMnIgTCDud4X4g=" + "io/ktor#ktor-utils/2.3.12": { + "jar": "sha256-SJeUj4AL85YHGPuaWv9QErcht7iWZjhZWCbGstp8TiU=", + "module": "sha256-Rxwq3h1BTGX6Y9C0LIdLqcuUhGsZQQnD0PAEOwtnt6E=", + "pom": "sha256-lIfQwBRDfsjcthP6Gl345WmTsc7wQqKXMPw99SQlsrg=" }, - "io/ktor#ktor-websocket-serialization-jvm/2.3.9": { - "jar": "sha256-jBCWBmWwSj67G/c3tYz/bWV58vHKKUtQdPO1buewn3c=", - "module": "sha256-Av42GI6AIQzW5Xhve3Fz5ApWdfkmuQrYWjM2cOdIaI8=", - "pom": "sha256-s05A9L0hUpspQOHCuS6fVQy52DaPes/jEfSQvmmmjgc=" + "io/ktor#ktor-websocket-serialization-jvm/2.3.12": { + "jar": "sha256-v/iQ16thcVUa5PBjLprsy5BI3zHW1zz1Cr1bMwCArTo=", + "module": "sha256-PeyRtQnxTtpFGjWpyOY+bmuNJz/4i2u74BK7dTzdOwk=", + "pom": "sha256-pqTtw4NX9DjErB5Zbqp4SILGmurmVz1ksaKrc/cNBp0=" }, - "io/ktor#ktor-websocket-serialization/2.3.9": { + "io/ktor#ktor-websocket-serialization/2.3.12": { "jar": "sha256-JCEwwgnDIoLZ8g7EnlfXSBihpyiADs2QLe7dzwURgMU=", - "module": "sha256-i2RUwpnw6wl9BFKo4mSfuiDCerE26As7zySHuKFxoXc=", - "pom": "sha256-2EWa4JTKJNbQ0VOQCz3ZsKrmJMvgE1MKqdwUhJK6Qxc=" + "module": "sha256-lbcbDeXFGs93fnTXkCAnFoZi59dR3aU7lJ/C+ChHSuE=", + "pom": "sha256-eU8LskUjFQQH8+ZTrYqUYzKptPmp1ryv/RBlvxN9iSw=" }, - "io/ktor#ktor-websockets-jvm/2.3.9": { - "jar": "sha256-rlniIJf1vDfrBWpf4NarGVKiVGjVfuSNCKlTsEmsOMo=", - "module": "sha256-qNVObtccVsXhVWErhYYwBYvV8vdmUc1u35775UQBP9M=", - "pom": "sha256-rqUJP2K2HwCJe0PjleNt2qrBM74A40ML1a1tsSng9uc=" + "io/ktor#ktor-websockets-jvm/2.3.12": { + "jar": "sha256-3DXMU59N+lpK2bORwU0GUn36xPZLPj8FD1FDzrIVvKQ=", + "module": "sha256-Xcz1g9dBybFg9pnYyGS53n6JrFz+f2fTHQIHvaejvl0=", + "pom": "sha256-Pc9D1TtWf3T3z2VvF/r7QfRtqztf+6AHZ2EsJH/W7Rw=" }, - "io/ktor#ktor-websockets/2.3.9": { + "io/ktor#ktor-websockets/2.3.12": { "jar": "sha256-XdKULp+AhVyqGFXiShT3DxqHWcg3tFTplRdqPMl3QVg=", - "module": "sha256-uhRGT5h1Nik+ztLdI07ztLUQKqhbKOnG2T+rSB7GFTU=", - "pom": "sha256-Gk52XnvtAwaY8phvbgzlsT94IGVj4RurRr77r7B0/PQ=" + "module": "sha256-7biouqRoijD0YqQtIuirAHY4HvISCkwKqyasIkTsQaw=", + "pom": "sha256-fikEQUdSd1ifC2TgEptfmZHQir9YQwZCzMXfiYbEh+E=" }, - "io/netty#netty-buffer/4.1.106.Final": { - "jar": "sha256-1QZ72+R21jy0MpOCKDKnSafDijjBxRYQfHPSV8Ob7SE=", - "pom": "sha256-2gY34YJ9Uw2h2PQwsObNaT7Ee32qBnQrKKw02xy1RqY=" + "io/netty#netty-bom/4.1.107.Final": { + "pom": "sha256-w2mXVYv7ThHyAN2m7i5BpF8t+eGu9njtoI553Yk4whA=" }, - "io/netty#netty-codec-http/4.1.106.Final": { - "jar": "sha256-uhd6A63Fh/pj6W8duunEb/JfWTl+o02WC0XgXQKWAm4=", - "pom": "sha256-DE+4Y7F3o8Z9NhZistW8Gx43Vgubamtxfbc+lnlW2Ro=" + "io/netty#netty-buffer/4.1.111.Final": { + "jar": "sha256-fZS2Cfs2r9iDBMc5IkEdCPOD95RaqIK1mhUhm17L+3Y=", + "pom": "sha256-avx+dR4KkNLLEWj2pIVNgL87qIgQSvqzAyM80xaE9LQ=" }, - "io/netty#netty-codec-http2/4.1.106.Final": { - "jar": "sha256-wrgh1XpzPNZx6iqwZCACsX4KK4kATKAmxuro9Tgc+B4=", - "pom": "sha256-JZlznLzUACvwLSkABPTYxyvdhZ2VOyGAR7HvdW55jEY=" + "io/netty#netty-codec-http/4.1.111.Final": { + "jar": "sha256-v1DCEsrsh2u2+6hbdPGEgtoteCTdB2bxgpyp+TqgGlI=", + "pom": "sha256-gDcuPm5huos6vmI5ZMmGN2VotrvscFrbKdKpWc17n4w=" }, - "io/netty#netty-codec/4.1.106.Final": { - "jar": "sha256-k4Y9/WkPes58JuTICP3CR4CtrUZbPNy3zj/HPEIt928=", - "pom": "sha256-NA+IHwoS9itNCY+bcQo0fASTjV/z38wvw8pw1X7a70s=" + "io/netty#netty-codec-http2/4.1.111.Final": { + "jar": "sha256-qeubBicEH0iR3pKqiWSZrjNM32B9ug3N+v01FqfQ7Mo=", + "pom": "sha256-x/AyWqTHXJ6uHjiDBtx9EEJsaipsj3Evh29YpLwVft4=" }, - "io/netty#netty-common/4.1.106.Final": { - "jar": "sha256-X/vgG9hFYXqRbeNhMBDV/aV8XraUFH040E95Hpg01cM=", - "pom": "sha256-4ayZMJpA1e76IEs6GBXHIcuS5K5t1UHsIoRQ2cnUgA0=" + "io/netty#netty-codec/4.1.111.Final": { + "jar": "sha256-pjrHE/YOwLjiu4GCZl0hZmLR9HSHLsXDaNJfFfVE9Lw=", + "pom": "sha256-bHMiRpMuE1Z6M8Liuf1KpR1zKvuqdxN8UmCoR+PQo38=" }, - "io/netty#netty-handler/4.1.106.Final": { - "jar": "sha256-WpGa2Ittnp8IwwaZgLxlamKSagDmui2lhZqg7k4gLkQ=", - "pom": "sha256-lhoCD6DBskT1io9MYS+egEEokLlgO/WTzmiUKaRlC0Y=" + "io/netty#netty-common/4.1.111.Final": { + "jar": "sha256-muEumon1nOJPsjOFH92T48Lfrrn6AsYGJ81n+nVhhx0=", + "pom": "sha256-uceDN2Fr+NVNVRW6tsuh3y20b9sBtBJDTMf7r+eDRcU=" }, - "io/netty#netty-parent/4.1.106.Final": { - "pom": "sha256-eV8c7NBEHGSvry5vEN+yHCRtRI9sQ1cFHt6mjpw+s2U=" + "io/netty#netty-handler/4.1.111.Final": { + "jar": "sha256-GgNGcsomyL5iRcjoZBspeF7SwBhhe7Ldfge+Offqcfw=", + "pom": "sha256-9XXURvpc1Ua+T84LvzTBRAQXYbidp3lx4wv4PUKQXRs=" }, - "io/netty#netty-resolver/4.1.106.Final": { - "jar": "sha256-QElYuPBZDuUmAT0BHNI1Tat4rbqtdD19RE2zOj+eq6w=", - "pom": "sha256-phbG6XmPmDwsK0BiFDvaWM8tD2mGnZ00yMJiPdZMXXc=" + "io/netty#netty-parent/4.1.111.Final": { + "pom": "sha256-lrBVrnr38eMts9cmGRjZAPuhXh5YnM1oL5z9V0QkmlE=" }, - "io/netty#netty-transport-classes-epoll/4.1.106.Final": { - "jar": "sha256-676g9nii85R+sgC+Az7X/lUwZ+Octd9Ldp0bn8aimHI=", - "pom": "sha256-kancuAlsq6lJCbohCze/4/M7qjAuZXAap/4nnWlRzGc=" + "io/netty#netty-resolver/4.1.111.Final": { + "jar": "sha256-eOc1dG0fmMqJeTF2NZyXrVu2OT7GPNKWLzDbQ74JDhs=", + "pom": "sha256-11JAU0WdQlycu7+T8Hk1BMTQFIx1+0naqz4U1OTTjvA=" }, - "io/netty#netty-transport-classes-kqueue/4.1.106.Final": { - "jar": "sha256-9o7UQlABZcajhz4HMeG2IIS0L4QtD0dmdHSA7x/Jdj4=", - "pom": "sha256-5VnP7dwvVFIUCbLypQY8gXefTgvpcG/+2QR0B3xBHU4=" + "io/netty#netty-transport-classes-epoll/4.1.111.Final": { + "jar": "sha256-0jDRaA0VF8fXsuJe9qmofCLrvPJkoNqOgHc08Vt8fK4=", + "pom": "sha256-S2Dz1R7m1+WtWC5bAbSLfemiOu1SHjiHmoWGJVlk5E8=" }, - "io/netty#netty-transport-native-epoll/4.1.106.Final": { - "jar": "sha256-ZgOaFRY1MCriM9/Rh9kcfddzoRrM0Sc1wWU7gndOd/A=", - "pom": "sha256-U51mdWvcdwISzdMD7mJMrY2xbu9KgZiyqOKEg+ljb04=" + "io/netty#netty-transport-classes-kqueue/4.1.111.Final": { + "jar": "sha256-YF/aKEplw4jiI1xWdmstmTiz1NHXJKSxe6P/8Fc8bto=", + "pom": "sha256-VkLEWRfCHoogtUYuQmEvNxbPFFs5oxxzzGk4DO5Wa4k=" }, - "io/netty#netty-transport-native-kqueue/4.1.106.Final": { - "jar": "sha256-FC/1C6Wcdbv2c6bBQ53Prjy3RprbgQXcP7ZqpAVRpK4=", - "pom": "sha256-BuxVaGByijbJpVnBVpIl5kzOGvQPqZ7T3GdZgmHMlOs=" + "io/netty#netty-transport-native-epoll/4.1.111.Final": { + "jar": "sha256-nURkDSonUsX2p1wTI8vv4tdfx2JAjnSiSB11TGYm/bk=", + "pom": "sha256-wUs+Z3QJhxrhy4BDbdBpRVka4gHOPMlttqUpV8e55XQ=" }, - "io/netty#netty-transport-native-unix-common/4.1.106.Final": { - "jar": "sha256-9S1LOMVxBmv6rpZKeGf6k38OVPtf9GfFdstlCiCoVOg=", - "pom": "sha256-h19sn7JG3Vygm8Lc/LF4wpsBxx6lE/M3jm/Osp1KCjo=" + "io/netty#netty-transport-native-kqueue/4.1.111.Final": { + "jar": "sha256-dTGy/wUYKY22fO7eO/EFbdL6otnvFMJX4A5uQERVShE=", + "pom": "sha256-0b9EjO2XA+QeY/U5+FIyRvKhY0NN30Mw0hMmLnMdVwc=" }, - "io/netty#netty-transport/4.1.106.Final": { - "jar": "sha256-I+qaOQCbQenQqhUVswc6+e5NpOFsLoabWqiqnxCdQlE=", - "pom": "sha256-qyxCFnnBmSuuT3UyvpdpbK5L9g5pbwskf/vPunrynM4=" + "io/netty#netty-transport-native-unix-common/4.1.111.Final": { + "jar": "sha256-7EvUV07h7HdqGxQTn7aZgt339QOagDCCB0qB9mBOytI=", + "pom": "sha256-LqcKGGSrOPzsK9woxp7pdW261YpGJsZkVU08hg1UCYE=" + }, + "io/netty#netty-transport/4.1.111.Final": { + "jar": "sha256-SaPMC200I0DwmA8EcCbbdBYcGeoqB3U6FLTSLuBlOqU=", + "pom": "sha256-hmK9XX9i03JUj0CtiWuH6lXCsdF5Ap75hYN9zkOlImk=" }, "it/unimi/dsi#fastutil-core/8.5.12": { "jar": "sha256-8xwg9bBjEvPV4G5hYKMuJ02BmqbOvydSiya2tcDB3xk=", @@ -847,6 +587,12 @@ "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=", "pom": "sha256-QlhcsH3afyOqBOteCUAGGUSiRqZ609FpQvvlaf8DzTE=" }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.2": { "pom": "sha256-FaVbfVN8n5lwrq0o0q+XwFn2X/YQL3a70p8SR92Kbfs=" }, @@ -884,9 +630,9 @@ "jar": "sha256-GQO8bYfzq5ICOVe5H0WpyOs1FbrQMDVs6XcgHlFBtyQ=", "pom": "sha256-C9pdmOS+kmHwnN+u5vokWYh5CDTX/K3I4v3ZPH1kGCU=" }, - "net/java/dev/jna#jna/5.13.0": { - "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", - "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + "net/java/dev/jna#jna/5.14.0": { + "jar": "sha256-NO0eHyf6iWvKUNvE6ZzzcylnzsOHp6DV40hsCWc/6MY=", + "pom": "sha256-4E4llRUB3yWtx7Hc22xTNzyUiXuE0+FJISknY+4Hrj0=" }, "net/java/dev/jna#jna/5.9.0": { "pom": "sha256-a8i4RZFQtZ6VmPPa2a0kWh7yFQ0IJYEBcYTrFj5ZKCk=" @@ -903,12 +649,29 @@ "org/apache#apache/21": { "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache/ant#ant-launcher/1.10.14": { + "jar": "sha256-8JCXJaeiTjk4iPP7tVg0er9QbOL368WB/yYzG5TZUaU=", + "pom": "sha256-nJ2qQSPp63BzVnk2UsOIo1UQqqWm0UW0T4VdCN1LK7w=" + }, + "org/apache/ant#ant-parent/1.10.14": { + "pom": "sha256-CBYQamBniMJw767yFWLPy9j0uvfafBG85RSetWYbMx8=" + }, + "org/apache/ant#ant/1.10.14": { + "jar": "sha256-TLvZJD3kwQQtYdmhXbTEPJD/k7FteLOUgdoclWyOlnE=", + "pom": "sha256-L6QmnmscRXI6iojmnZhKdm27IEzQ/pgUlMzfP+469lw=" + }, "org/apache/commons#commons-parent/34": { "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" }, "org/apache/commons#commons-parent/42": { "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" }, + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, "org/apache/httpcomponents#httpasyncclient/4.1.5": { "jar": "sha256-DBh3SJqdG6T6UPbPyrEdESNhiFjLMdVq+qta/dUGTZk=", "pom": "sha256-beSudsiSFXUj62TD2bFNvHSnWGNrQO5MxkVqwRmYKXU=" @@ -937,23 +700,81 @@ "jar": "sha256-PLrtCIxJmhD5bd5Y853A55hRcavYgTjKFlWocgEbsUI=", "pom": "sha256-Kaz+qoqIu2IPw0Nxows9QDKNxaecx0kCz0RsCUPBvms=" }, - "org/bouncycastle#bcpkix-jdk18on/1.77": { - "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=", - "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0=" + "org/apache/logging#logging-parent/10.6.0": { + "pom": "sha256-+CdHWECmQIO1heyNu/cJO2/QJiQpPOw31W7fn8NUEJ4=" + }, + "org/apache/logging/log4j#log4j-api/2.23.1": { + "jar": "sha256-kuwf02qzvAneYZjS18CRRoXA9xJ+qTGswy/S7N2C6ok=", + "pom": "sha256-tnzD0JgJJwSaO+sA1Qbs4oh0ZzKw3sgSJFxZ9FP7HKE=" + }, + "org/apache/logging/log4j#log4j-bom/2.23.1": { + "pom": "sha256-NyOW4EWNTNMsCWytq+DMkzDsEPT1f6O+LnT3m14XijU=" + }, + "org/apache/logging/log4j#log4j-core/2.23.1": { + "jar": "sha256-cHk2gAX8NPViSPV/iopTNhw6U+kAfVVtvGb8Zp3wgbU=", + "pom": "sha256-yJugwjdXURuSUrJ6cx0B6GOyjd/OUD597pSuIxjILdw=" + }, + "org/apache/logging/log4j#log4j/2.23.1": { + "pom": "sha256-bOFUBFU2S1PqIqGDQssSamOBYz9lPwlUZ/KqGYURps4=" }, - "org/bouncycastle#bcprov-jdk18on/1.77": { - "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", - "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" + "org/apache/maven#maven-api-meta/4.0.0-alpha-9": { + "jar": "sha256-MsT1yturaAw0lS+ctXBFehODzOxMmlewOSYH1xkcaUk=", + "pom": "sha256-2ePDXW/aysuNGLn2QoYJDH/65yjWbLJq9aJmgZUNvnk=" }, - "org/bouncycastle#bcutil-jdk18on/1.77": { - "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=", - "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug=" + "org/apache/maven#maven-api-xml/4.0.0-alpha-9": { + "jar": "sha256-KbJijQ8CgRlxWRaEnBnu1FsyzcZ+sTVReYxzr6SqI9Y=", + "pom": "sha256-N2bjAzOTTJIvUlj6M0uHXyi7ABJ/8D3vANl/KlOnrps=" + }, + "org/apache/maven#maven-api/4.0.0-alpha-9": { + "pom": "sha256-ZYvglXcymzX5TemWdb8O/HI26ZYbXHhfMyqkfyKUcfA=" + }, + "org/apache/maven#maven-bom/4.0.0-alpha-9": { + "pom": "sha256-4EfSnTUI/yd6Wsk1u5J/NUkQLMbTec5a4p4pYzeE0Rw=" + }, + "org/apache/maven#maven-parent/41": { + "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM=" + }, + "org/apache/maven#maven-xml-impl/4.0.0-alpha-9": { + "jar": "sha256-JucCuIHVeuTuiNAsAJQLpkBjcF7mkgWuiVi/g5qLBrE=", + "pom": "sha256-us0USYVzbUMmuuRChHM78eMTKX3NolNGTkYpsddoGPc=" + }, + "org/apache/maven#maven/4.0.0-alpha-9": { + "pom": "sha256-5QzZ/zefQ3H3/ywsrFF5YfPS9n7fgJCHU8e9UGuRPX4=" + }, + "org/bouncycastle#bcpkix-jdk18on/1.78.1": { + "jar": "sha256-S0jqCE5SMrnXnryhiHud4DexJJMYB81gcQdIwq7gjMk=", + "pom": "sha256-CVIrr36Zuqk6JRXRbPHLlT+iJ41+PEbIvv8n3AQXKDE=" + }, + "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.42.0": { "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=", "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=", "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo=" }, + "org/codehaus/groovy#groovy-bom/3.0.21": { + "pom": "sha256-ksw2r/0g9Wi1CSwLlOz1hd3rCigbbIunJWVwuxhdZTQ=" + }, + "org/codehaus/plexus#plexus-utils/4.0.1": { + "jar": "sha256-lrnMREORkdLQY1l04tROdoc2tPsqvLZflM2V5BkS+os=", + "pom": "sha256-vEI1qVzR665CZEyB67qcHUxSVl+B6WqyBLblbj43jME=" + }, + "org/codehaus/plexus#plexus-xml/4.0.4": { + "jar": "sha256-Bp54tTcQjcYSSmcHP8mYJkeR9rZJnpVaOOcrs+T+Gt8=", + "pom": "sha256-Ohb3yn7CRzFFtGHgpylREI1H4SThjIRMCFsaY3jGEVE=" + }, + "org/codehaus/plexus#plexus/17": { + "pom": "sha256-kVJu5mMnx/UPuyW9Qb/LkW4oRBS4aOMdUKIwBL197qc=" + }, + "org/codehaus/plexus#plexus/18": { + "pom": "sha256-tD7onIiQueW8SNB5/LTETwgrUTklM1bcRVgGozw92P0=" + }, "org/codehaus/woodstox#stax2-api/4.2.1": { "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" @@ -964,6 +785,12 @@ "org/eclipse/ee4j#project/1.0.5": { "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/jetty#jetty-bom/9.4.54.v20240208": { + "pom": "sha256-00QQSm7mGdplmEA8JdA6qqrw9U6WRv01EkWN9Xyarrg=" + }, "org/eclipse/jetty#jetty-parent/21": { "pom": "sha256-eXLp7G84UqjuHuXU0Q3Mnc1gd7El+TWqlrNnpsgjN/U=" }, @@ -989,6 +816,10 @@ "org/hamcrest#hamcrest-parent/1.3": { "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" }, + "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=" @@ -1002,11 +833,20 @@ "module": "sha256-fzA2ZgQteNJMVVEgyIJHjDCaIo7pK1G9ca2/+knDO1A=", "pom": "sha256-D58z0tjpkbt1C7VZ2q1YtsVH5raHQAA4Jne3XFtYpG0=" }, + "org/jetbrains#markdown-jvm/0.7.0": { + "jar": "sha256-yLRL4zhZiRLou4pJmLAX333RmBUszv/vAc8SipkAE54=", + "module": "sha256-PL1M+XdGeY3ODzCIf/TgGig9DvoO5m3en/CvARrLdAU=", + "pom": "sha256-0VsK0umlc/l87P+p7UDP5TTV/HazLigPhd0C/lVIn84=" + }, "org/jetbrains#markdown/0.5.2": { - "jar": "sha256-HGsba7nOgwSLhkiZCsHTQnv6z+vI5Y4y7pBD3dDcOio=", "module": "sha256-bpFAGmpLbnc1auIzdjDoovLcQawmG3BbOpZv/GI/I+Q=", "pom": "sha256-mH5hITw/ERPsyi/8I6b0hpvuig+zCR8n3xvfq1KMhSg=" }, + "org/jetbrains#markdown/0.7.0": { + "jar": "sha256-CyFbRlFaxzcfaK2efq6i+Pkr6R83v70DsAjLVvFnUCE=", + "module": "sha256-fRDYKtUAs+iccbTS3Byl1L3Xq/BIcostrtWzsPuVxzs=", + "pom": "sha256-AplTmbCmzpt9dfH4f1yR1QwUg+m0oSH2a0ZAcsVIVVU=" + }, "org/jetbrains/dokka#all-modules-page-plugin/1.9.20": { "jar": "sha256-l6FkXFrUKNN72nqMy/8xHyfAEdAUincdchFnj5qmVsU=", "module": "sha256-5ppgwoB44BoaFSdIs3M32r2RhmB0bS7rv3HexQYDjRs=", @@ -1031,6 +871,11 @@ "module": "sha256-w+z7y6JqmLbouDusckOZKz6d/jilB9d6UnvL5E75ua0=", "pom": "sha256-N9LsB2+hsvlR92bUjxHVHXOrjlNwkGy/XXnMPkbRjxI=" }, + "org/jetbrains/dokka#dokka-gradle-plugin/1.9.20": { + "jar": "sha256-7dbOLDEoeI2k6lPe3sB/8LhI6p+mg8Ywv3k1Vw+7QhA=", + "module": "sha256-RMEY9JsqY95tLAdVYixHNKhVGviWx9ZAuEDSGL4M2CA=", + "pom": "sha256-cmyCm7TGy1h9pYYJVLLxJN8NQ9W/LxaQ7Rk9r2JSGGI=" + }, "org/jetbrains/dokka#gfm-plugin/1.9.20": { "jar": "sha256-f5qvOPhLGwZGeCfnNvOkmeMefUg8unKHy77MU9WE8y8=", "module": "sha256-0cPvGZtJZTQ/TdEpr+tujKF+iAoQ0jPd6dyN+hOGvxs=", @@ -1051,6 +896,9 @@ "module": "sha256-P83z3bPpEvoFBXD0rL10ASc1vZqQ1HEE3WRnxfPcf1M=", "pom": "sha256-UnZTelL3jYHat+c2hCikLqqYemAPNzmyUeJsCEOm3QY=" }, + "org/jetbrains/dokka#org.jetbrains.dokka.gradle.plugin/1.9.20": { + "pom": "sha256-J7WLy2erfv8EO20nz2Oo9C18bx3AlzoQ53gDTXIrDpw=" + }, "org/jetbrains/dokka#templating-plugin/1.9.20": { "jar": "sha256-5dJx2ACr4mtAzTJrsbgz+agl4jcYuDDhTTnpFy9Fv4I=", "module": "sha256-+THUhm1wio69b+1YRA8qLI2tN1oxRUc3v+ezMlIWijw=", @@ -1060,37 +908,89 @@ "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" }, - "org/jetbrains/kotlin#kotlin-build-common/1.9.23": { - "jar": "sha256-IoJaHv4VSRN9GBPtedycyvVLSoonAKSsf3CNxmAki68=", - "pom": "sha256-2ePH5h9YSUkAFP6BC/wQSp6aRNVl7RhsWGu7P0/D0/s=" + "org/jetbrains/kotlin#kotlin-build-common/2.0.20": { + "jar": "sha256-NvDXXOmviQZNnbT9IeIsVQdyAP5OOufZnjREmCZ6oNs=", + "pom": "sha256-EOhYxaCAxN21Wx0GvujV6Ea4YQX1aw5A8ojj+mGWEXI=" + }, + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.20": { + "jar": "sha256-c6fXFRN1WzF9Kxttp2bW5reiXcmdzv5DEzJTNkIuzhE=", + "pom": "sha256-10GK0lyAbeg2FQvdNQsAvmwtJQmeXXQd3+PzgcUurY0=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.20": { + "jar": "sha256-V+1QIg547DnoqAAUMw8pXlSFtWOMESmvntfVPXhYxcI=", + "pom": "sha256-nHrVho+yGJsb9NbCL2yUmDs6jhopTpWlQSy4Lg9C3bI=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.20": { + "jar": "sha256-nOb4Gmmcw32zY6KDcVC8YqJJA9r2EhA00Sl5qpUBRGs=", + "pom": "sha256-DyiqOx3o2AWm+HlX08PWbDOeDEMmaZlc9Zf58r6J4II=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.20": { + "jar": "sha256-o2BL81DIvM4nECFYu7OD+k0YFLxIaq7VnyeOraUf9q0=", + "pom": "sha256-WXBD+4xlJ/QpmcoE7TUpY5Is0W5piKqlLT2zLaHbhZ0=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.20": { + "jar": "sha256-4DzwSwNA8a4VEhBjC10pFcKXmIxuIuTe206nz7dKz2c=", + "pom": "sha256-3M3xugxPzYvUIwNFroP6fb6SglY9ilP9XmHFM1tbcYA=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.23": { - "jar": "sha256-gvhH4lRXtGSDfv7x2oUC7JJTLedAbnkgUWbODs9PxSE=", - "pom": "sha256-CWkjtiXJfGZzZ5ZsxM6Sv5TE6f98U8sdOEhgEax1DVg=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.20": { + "jar": "sha256-cxUswf2CHQcTlHOry/jH0B0A5oaEuWHhkurogNycfaQ=", + "pom": "sha256-qUcReIj0z/tjk9QurqYRtj31ib8pYXgmzLclNxK/OsM=" }, - "org/jetbrains/kotlin#kotlin-build-tools-impl/1.9.23": { - "jar": "sha256-6sLwRmWHGVWn0K5FcZad8rCOfTN7LxIhAGb9PuAfWYE=", - "pom": "sha256-/OLyPE6fBzshdovfVqMa2W0zjNwD0FoVekWl/bL/7bE=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.20": { + "jar": "sha256-W9URO4WrhSjhkuK7P8GX9bw0SLzb0Fh5Czf9N/TuV68=", + "pom": "sha256-IZgoJm6keO7rQuT1L5bQuQfYykhHz4aq45FprYsupKU=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.23": { - "jar": "sha256-zJQGSXS/nr9ZlF4xIXzy0WoM66rySH6wdI/By9F4eUM=", - "pom": "sha256-WLI81NgtWqkWpcnMmbMhjuxVaWBoova3C+3fbDaR/RU=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.20": { + "jar": "sha256-i2O0/7e6aOKHIFaa1HqWzAZclFZO0WHuoVrIZIh7pN4=", + "pom": "sha256-D8eaPIg8fbbsD6lU1cimiugRBlIm+4WRbhy/9pnlwUc=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.23": { - "jar": "sha256-yFlaPhcRx0U8f5YKrxKhcNtL2j1vy6Sf/I4yy/0ADKE=", - "pom": "sha256-KebjEpGbdf6aOHjflRHPQhDcJuWTQcsu4iSDt7Tgcv4=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20": { + "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0=", + "module": "sha256-CJ8SCJE61calM09nu8pI/HsK+hCv0L2lFT+8tSzCqWw=", + "pom": "sha256-IQOK734wtxG0qE3grS1TO9MgXhOKrWfP1YnXl+/afII=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/1.9.23": { - "jar": "sha256-5jFUJUkZ/XBv6ZN8SNuTfqkGimMfht5lWlFLwWIPmI0=", - "pom": "sha256-X70GastuQIU5gCdsaDUWmSj2Zqt8RlEsJvJMnQMIF9M=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20/gradle85": { + "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.23": { - "jar": "sha256-bztmG5gmetJOL4+3rV0Gvn0u1hpdBcJn9OTKp433g9k=", - "pom": "sha256-WFRgOL5Go4NmOFPRMd12xPsnQ4MLqXt0sno1zxAtPQI=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.20": { + "jar": "sha256-Ce2wJ7mh899xYnGuyte7QaHdvC+cETFyl5ANTyvc6Iw=", + "pom": "sha256-wZireMJmzzvnodJHBeW7GIbUlF/cpPcX9U77hv9M10o=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/1.9.23": { - "jar": "sha256-uAo4tLuB+wPQ8wdHPQMtc7J3j6drA0Y4floQ3YM9co4=", - "pom": "sha256-iLBAO2Z/cVJX6gDXdiFkkzggk+727vUBslU6HVIHG2g=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.20": { + "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", + "module": "sha256-wy8Uw0SXgCqOjXk7K11nkj4gIlOUePNm4Yp+9kFOut4=", + "pom": "sha256-Vn7N8kaceWkMLgmdz6r8PhF67GTe3BejtJ/Uo/ptDgg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.20": { + "jar": "sha256-UUx/F9xeVO5dFqdhs2S500OVa8rUnf0I4IWWIldzfhk=", + "module": "sha256-HPn20+xtMFqgiQMqyJL/rogcwQUAP0VvLBX9PDAyCm4=", + "pom": "sha256-SEIbKUnHKiDU4OPybYcYxruScIbHbF/AlSCg1jbPumc=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20": { + "module": "sha256-aBPMpB7w+/FciL7MQB44cGuWlEwhtr7HPdiM+QoPIB4=", + "pom": "sha256-eEmYfUbGj7neKvOwReEq1nPm1mOvbqpf2MYRlCt3LF0=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20/gradle85": { + "jar": "sha256-gSn2LLfGJ7XOghh+QqbYfEKVK8e6ZLgFo1R/aFIxlmI=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.20": { + "module": "sha256-GwMjHvp7O20xsJNocpQfh+J6gZwANxiz0JiAt25j180=", + "pom": "sha256-TDLrNQlMFjWd943q7BHOUjvjYEB0FPoK7Miu/GftSkM=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.20": { + "jar": "sha256-QsQvvic/oDBOThf3OSxms56R+Z01+FwGixG91Wuemdw=", + "pom": "sha256-5f4GjE69XIhYw1w56GI6vrnIb4oXJUdC5/VZjkP62jw=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.0.20": { + "jar": "sha256-ZzHCVkuXOXGDWCVJAUC3rZ63Jtk4/gzvTr7y7Fkt6wM=", + "pom": "sha256-rVSg2nLxASl08e7sdp2EopMnzzfMrVUxt4cT/GD0tnY=" + }, + "org/jetbrains/kotlin#kotlin-native-prebuilt/2.0.20": { + "pom": "sha256-xYoRfPul4AVC+QrYLytqsh4Z46Ifzvy0mLq5k69FDwY=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.0.20": { + "jar": "sha256-wWbyBR6R0ZnpYP/HsnZEhcFRDNF2dN17jOPC/NBqhys=", + "pom": "sha256-mISZMftwkWhS6qfCDm2Pr1IsUNd627r9k2T1JrfN7EI=" }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", @@ -1104,29 +1004,36 @@ "jar": "sha256-d/MRyhOEgR1Rn9o4n8sSaL2qBY1gUEbg7edsA7DfPpc=", "pom": "sha256-xxLjWN97kxi2j1RjlxsIhnODf8DKQoXRw4LIEC7da18=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/1.9.23": { - "jar": "sha256-dRN+QUoaW0tNCQ+BLQ416zC08MkjpT1pWFRWuyT8Hfg=", - "pom": "sha256-LWx0sGpUDpicq9BTChbnZYGQUl8vTVpDq5sa/nQU/F8=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.20": { + "jar": "sha256-/pcAKmeY9yB1ZGSJGdbuzPszi5XcBLSIhthWZVvGSk4=", + "pom": "sha256-o6N2KcmFzt17+d12rGdJaz+ApZIoVB6WiAKg7obEuRQ=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.20": { + "jar": "sha256-XTdTOT5/7PHSG67l2314gyZ4K9v4qOxqKyzM97Ve5sY=", + "pom": "sha256-BesUmiCZ8ILJf1xFQ1HQuMphLFUwo6wyHSyMB12wEVU=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/1.9.23": { - "jar": "sha256-ii5Wfz2/Nz5hwBrNeIRjHshThGWrjul4rGMpb4zJr0Y=", - "pom": "sha256-/CiXW5TcQMDZD9EXXiKxtka60sY368+fT2qy1Oe8XdU=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.20": { + "jar": "sha256-Ie8wOrS54Pnzl8FIliU6rkkCV7+w3VAInBwcBPAYcXE=", + "pom": "sha256-zr8swRmuHPJqP2tECxidwrruhS0nASU06qNqrNue4VI=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.23": { - "jar": "sha256-e4A5/wt3nVVs7QCSMDWr0TNPDl8qiHlhgtArpF+SbSA=", - "pom": "sha256-7Y6//r5Ume1iSG+oGBJ7td1QHXTEq5XFfnwB7z+NuWg=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.20": { + "jar": "sha256-WgaucwO1TL0XdYnWEFumv9WbGxgur7W2aHJf9ypf0y0=", + "pom": "sha256-z6al9YOJy3K0SRLTABoB9eqL+vx5mbr6BRGz7t/LYdI=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.23": { - "jar": "sha256-kOU90S9i3NgjQ8EsDLMUrc/wy8OYjtsRjR5miZYOnWM=", - "pom": "sha256-923kmO12xGroZlZnmAf3J2EiPD+hChExgyAGpKs5Xe0=" + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.20": { + "jar": "sha256-sLtQD2MztLFsjraeo5TvaE8zRT+NNDEDSokHqfGNtvE=", + "pom": "sha256-m8uNHCOvcm21KpNrpbkXeyRoKSBYxT8Ckd5MwNpOzh4=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.23": { - "jar": "sha256-0/yn7JUf94Jvl6dZifjcr/YM+eHna73CIO33eDdqbmQ=", - "pom": "sha256-4u8r+y628hp7croS7cWaFQx/IXbCssVP4uhg7oAjDYc=" + "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.0.20": { + "jar": "sha256-zI9QG2dslESLAWgNyvZ68cjFfOqEFQKnFuttEX+Xy4Y=", + "pom": "sha256-X74y6I+ly4WFjb1wpPZKWsJTSaTijzlQ3zJrMSRmUGY=" }, - "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/1.9.23": { - "jar": "sha256-5YFdkGHmX984M/2neljFYPXu4uanONL7F5VA2Fj8efw=", - "pom": "sha256-Z4yRlsaPLbNOgRSEk1sVIGZL7K/AYiSTgDi8nWP4tAI=" + "org/jetbrains/kotlin#kotlin-serialization/2.0.20": { + "module": "sha256-rsyQ8DJ7IQJTYRNdyJQBDmHDVzVFBtLTP3pZeakRxGQ=", + "pom": "sha256-wYgmEN73pFKwREi8GVqr+D6CqMEcUSmFYUAbGyxfKCw=" + }, + "org/jetbrains/kotlin#kotlin-serialization/2.0.20/gradle85": { + "jar": "sha256-Jjd6xiKasd8/ojVJPYxWfkcLjYa2PolUSMwmbL/Ob1o=" }, "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.20": { "pom": "sha256-YFWRuJs3ISfmspxpMl+i9qjEb0aMRdCUEOeOtZ/IChc=" @@ -1138,9 +1045,9 @@ "module": "sha256-+Tyemr+NUtjo/Y6FGqgC7OxVEyFhxK7ufTzZJL95QkY=", "pom": "sha256-10k21oh1ZK63EOhCmLVCB/U+m88jpSrSv6IsIIZ3V2c=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.23": { - "module": "sha256-hjnwBfqZd67wjDL8jnonedoi7iYkZNcnMpiq/Ug3Fc0=", - "pom": "sha256-OuBxRYdw47aGCafTGet5emeJ9fBAyqQUQJgJmGhb5PY=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.20": { + "module": "sha256-tZe3Be/U4tgnFCCQw2BUJlVI7VG09SN38r+JxFlNU28=", + "pom": "sha256-o11/wINw+TE6S5U7zu7d2F4OHnLTEGLTe/jHeBs/b18=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.20": { "jar": "sha256-rx7EDDuVGv3MDCoBc8e4F2PFKBwtW6+/CoVEokxdzAw=", @@ -1154,10 +1061,6 @@ "jar": "sha256-t5eaeqyUBV8Nnx/TtHzl/+HLYDKoQrqfvnGG8IUokXg=", "pom": "sha256-wRB08MiYqYuGPGFEcdQ409+Soewzgqbjf5NdfXGVS1o=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { - "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", - "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" - }, "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.20": { "jar": "sha256-45i2eXdiJxi/GP+ZtznH2doGDzP7RYouJSAyIcFq8BA=", "pom": "sha256-OkYiFKM26ZVod2lTGx43sMgdjhDJlJzV6nrh14A6AjI=" @@ -1170,40 +1073,56 @@ "jar": "sha256-pZ+iT98f+1lLrs2/D9EAEPl3zqECNtSH/jRkl3pzd/o=", "pom": "sha256-ZNWY3YjiUEZnMeIDBKtvBsu7urfuMitHA7a1n4gcT5I=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { - "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", - "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" - }, "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": { "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=", "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=", "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM=" }, - "org/jetbrains/kotlin#kotlin-stdlib/1.9.23": { - "jar": "sha256-iRDMI4gH2G71UMsfCxDdXtQLNaTsGlJSX3YK7ehOrTc=", - "module": "sha256-UZUZOzfc2touHAqw1RLEIrKtdq81V4Q6G5w0gPTnHQ4=", - "pom": "sha256-wm0n8mcQrUDiPu2f/gpkuFkejBPSI8ypDFk+5j87KKs=" + "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { + "jar": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY=", + "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=", + "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.20/all": { + "jar": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg=" + }, + "org/jetbrains/kotlin#kotlin-test-junit/2.0.20": { + "jar": "sha256-ryZqI26bENE7D71MjJZizVs51mibQcnYLK2oaCLANcU=", + "module": "sha256-Q0jdPuxQxh/4DPBSBq0s8CErIjDySJ5QuOuf971YWQg=", + "pom": "sha256-0i0KJ5solDxw26YYkhvIc0QQqsTYl1q5xzfD+eG9qIk=" + }, + "org/jetbrains/kotlin#kotlin-test/2.0.20": { + "jar": "sha256-oVbXu3S7hHABkQ2s++5JyXF/jrZwxBQ3qSdoezN6Bf8=", + "module": "sha256-0wJTt8l9i4KWVQUITlTJ1qP2NWe4/G7H73kPR/gREcw=", + "pom": "sha256-yCDFnJRFdVYiqsuhkTg5lhSdfM3mBiMWLfHGnCxG+yE=" + }, + "org/jetbrains/kotlin#kotlin-test/2.0.20/all": { + "jar": "sha256-2iho+pWj+4814rTjMcouKTIUhnAZZex2a66CD5jgJ3w=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.20": { + "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", + "pom": "sha256-XhIxEeAQewRmSIOgpAjB/zvbXQR+SQH4L0xC8QV4Bi0=" }, - "org/jetbrains/kotlin#kotlin-stdlib/1.9.23/all": { - "jar": "sha256-zsOLwzAucqiq+c3kNrWpBx7gMx4q0F6E2LuJczTX6dQ=" + "org/jetbrains/kotlin#kotlin-util-io/2.0.20": { + "jar": "sha256-ZGTbjUFywhoXp5C20XiQIu1nrbN8UL5ri59YK1UrhSI=", + "pom": "sha256-LrBxVfqEF46ZVjnOe3aRcofK5UKjXSm1a7CZEB0oajw=" }, - "org/jetbrains/kotlin#kotlin-test-annotations-common/1.9.23": { - "jar": "sha256-8oGeK8nvB4cHkS/GcRZYC1OBtXbpVqCl5YZ3lYbrHq4=", - "pom": "sha256-JP1yLc/scsUlL75SKWtRz+mLWdJ8PuzpYYqJn7DQwrA=" + "org/jetbrains/kotlin#kotlin-util-klib/2.0.20": { + "jar": "sha256-h92Djcd3gsuVZ/GnYUmbPkpQ9SjABbJjii4+V0EKljs=", + "pom": "sha256-fbTRw72mdZvifuk35gfoscRpWNwIR3Ey/a7t4BbnOP8=" }, - "org/jetbrains/kotlin#kotlin-test-common/1.9.23": { - "jar": "sha256-+bdW+OFU7Rhf1yHRgolH8Cc8PF1fD3KboOdXDFPFiHI=", - "pom": "sha256-OVCJx1yFu9QVYoZed77yx6pbFW9RU46BKsoRU79Ub/E=" + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.20": { + "pom": "sha256-JyOoqUP6SkTTcD8VTEW31UcMcZ1OYKvz4ixzt3s4i5M=" }, - "org/jetbrains/kotlin#kotlin-test-junit/1.9.23": { - "jar": "sha256-WVql9FsSU9gixqy13iEqGwSFWAGuH4B++RGHS7I7gu4=", - "module": "sha256-HshhoTOmmnTRutGTyAf5vy2YCE5Vkz7JIoDvjnxlP0M=", - "pom": "sha256-wQ+vw+yTk/mO/MwcLksQeiaHPCEJGsewMuVvsBSRrlY=" + "org/jetbrains/kotlin/kotlin-native-prebuilt/2.0.20/kotlin-native-prebuilt-2.0.20-linux-x86_64": { + "tar.gz": "sha256-soKRi19RWLL41bU94ICTpyIG/CO5E4Lh3dJjDHIChCc=" }, - "org/jetbrains/kotlin#kotlin-test/1.9.23": { - "jar": "sha256-AKbs6XF7Mdf4G5pKfaVkQM/SiJqi7jtExTXWSZ9AA1E=", - "module": "sha256-/29gcCHEY4269aZw21kOboq5BPPx3OClrpOcXoQddGk=", - "pom": "sha256-gFqvBB1F6PmioIaCuyS/Ckei0PzN5UkgNp4iAQ9P2Ew=" + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.20": { + "pom": "sha256-0s2V9THwNRgW+fg0bsbWB2xxyt9jLz6PZX3dft+RukE=" + }, + "org/jetbrains/kotlinx#atomicfu/0.19.0": { + "module": "sha256-lDjpxD+24dVMUZvO8MaTmJTn9hrzIAXXu0Krp28tpX8=", + "pom": "sha256-FXTQlXamSA++51jvCiRwcRV3UUdcVmh60eHSwO6YQ6E=" }, "org/jetbrains/kotlinx#atomicfu/0.20.2": { "module": "sha256-LJleDoPFg+ElcG+6P+hRcAINF6iPidYpSlPNi9fEw4Q=", @@ -1217,19 +1136,22 @@ "module": "sha256-Pokf5ja1UQgZIQD884saObzRwlM+I8Ri/AdkTur8sg8=", "pom": "sha256-aIt5ABn0F87APmldZWexc7o7skGJVBZi8U/2ZEG1Pas=" }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.1": { "pom": "sha256-uSWqmIxApceqDHeyE3P+sYw5QUkmvVHHbvRENPW66cI=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.3": { "pom": "sha256-Tl0ZAOY3nvP1lw0EqPMFKa3IL4WejMEHwhzoFJ72ZsQ=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { - "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.1": { + "pom": "sha256-Vj5Kop+o/gmm4XRtCltRMI98fe3EaNxaDKgQpIWHcDA=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": { - "jar": "sha256-eNbMcTX4TWkv83Uvz9H6G74JQNffcGUuTx6u7Ax4r7s=", - "module": "sha256-yIXdAoEHbFhDgm3jF+PLzcPYhZ2+71OuHPrNG5xg+W4=", - "pom": "sha256-U2IuA3eN+EQPwBIgGjW7S9/kAWTv7GErvvze7LL/wqs=" + "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.7.1": { "jar": "sha256-dJbP/dPrEBCazdocMhL2rHgVeJ4JOA3J4szexJbbo/w=", @@ -1241,10 +1163,10 @@ "module": "sha256-NNbumbdqwGK1FVW0pwvhg0n+VWbaeaGQYU8XHIC2U44=", "pom": "sha256-dThYdT3su7I5c0PiuHHwYvaXgS6UIuQcnuRqZrk+7jA=" }, - "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-jvm/1.8.1": { + "jar": "sha256-89T13hw5G7zCDzs0Ncy6wBNSHna2kC19WWNewVwfeX4=", + "module": "sha256-CbgcnRHC3uvxM62HtweSfB8ECZy2Ee8AjHcls+swgyk=", + "pom": "sha256-R8alCxQVHo+vfzUKlSNcN9EqvDi/sFW2aJdCkxctryw=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.7.1": { "module": "sha256-qcwMK+48b8S6jQ51Oj8+cOGB2l3zolie5U6SgHszrM8=", @@ -1257,40 +1179,40 @@ "module": "sha256-f7FiOWWU7CjhtqRBG0V5SadnD14SAZF2d04f1rlHG78=", "pom": "sha256-7W6wOYcXA14p8cHWCk4927iYWPPbnge1etdZ03Ta6Ck=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.0": { - "jar": "sha256-IKpDS2qTDqZtLmGwDe764J/qPTL5ZA0uDCcTEogOCt0=", - "module": "sha256-FE7s1TZd4+MNe0YibAWAUeOZVbXBieMfpMfP+5nWILo=", - "pom": "sha256-yglaS/iLR0+trOgzLBCXC3nLgBu/XfBHo5Ov4Ql28yE=" + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.1": { + "jar": "sha256-2vUPHJQEsiSh1t1Shvjo7n1j/oB/eOqY9xeVwYO2Al8=", + "module": "sha256-CMuvMyW1Tg+O+NqF5OtZb32Ub4Q+XRYAOFRj8yaKTvA=", + "pom": "sha256-+IkY2/qHh8TRcasCVToUrR3viqmwxcLCDMmUVdMkHiI=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-debug/1.7.1": { "jar": "sha256-UzPLuaF/1FZC8/Bf8SQAbNZ0NUlBPC9To1z5rNEUHpE=", "module": "sha256-AeRqdLiVP/LovNqfCNdLjBcI6VxaDYcKdIACA288LQA=", "pom": "sha256-MjPHSkqNioWksCh/aWIKSSMmq9iIfT6AxhzApQTHcls=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-debug/1.8.0": { - "jar": "sha256-Zy1UU0UXCoyrgoeygZRL55DWdUWXK+vdVKor9MhsxT8=", - "module": "sha256-piquUrrd+ncw5Wey6kHzYOoQqbN8FiJDqNIaWnySHGI=", - "pom": "sha256-EZPR60nUsUgNqlrGIBctfcmZFidM2Ra+NpQVLA5vb3w=" + "org/jetbrains/kotlinx#kotlinx-coroutines-debug/1.8.1": { + "jar": "sha256-JFUwMZoX18m8ShFSb0LpV1Dkqz/IZMlA2evo9UjqGHA=", + "module": "sha256-CA+LzOocTvqCk+0p/5z3xKfR0s3ekBzIZKz3Ly6AdXI=", + "pom": "sha256-x9+Ci/O0+ofumYH7ATaN1NwHmV0XzLqPpmEhcTwF69Q=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-jdk8/1.7.1": { "jar": "sha256-uW9xRbpptI9JQFNMuOGcfhWcRUQ+J8NoIWJhSLoXEPI=", "module": "sha256-sJV+aTzxwefUrWJGqm4weV2/S/t1jB5LMv25wkQJuXM=", "pom": "sha256-x3kWU2lOpaVLnN1HCAgtv7i9apeKX0IYSxFBz7SjDnU=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-jdk8/1.8.0": { - "jar": "sha256-2EGf2zy6quxAfmKrFL5WQ20edrW/MyRMV2VWH8E/0Gs=", - "module": "sha256-HKyxz+5adTBFR1rzCF+4DcnMzjA3VKnVIApB3/W+AOk=", - "pom": "sha256-4ZIahLHW5/k6SUgCfRhUHXWjDi6KZNem5DEAMZVR8r0=" + "org/jetbrains/kotlinx#kotlinx-coroutines-jdk8/1.8.1": { + "jar": "sha256-2M+0w2PJHHczU7EVvUprWgRgjnkW/iNdOp2H78uZbAE=", + "module": "sha256-Ifl7EL6TJkGBfTULclRP+LoyQYf/uREMbo2IESdv2TM=", + "pom": "sha256-3uCuamO2M1ETIAqW2eHHgJ32DQ1CS7/xy7tTsxQWWvk=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.7.1": { "jar": "sha256-+7QMp+VaeAF/6siXGAvmT1YqLreBxqP2ybsv+I2SIj8=", "module": "sha256-I8EQcq7URvsrZsj57aP4mWbe09mP9bnfCg3LeTwBX/o=", "pom": "sha256-HEWyu0XLYIIjT06yJj46XBxzQ4Rm6NUlr2gZCxbIklM=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.8.0": { - "jar": "sha256-t9Trh6u1yDwoItyliI3DXi3X4JL4oBaKvww2gwFpjhs=", - "module": "sha256-gYS3Uh1HsiIXNR6xaUF+0K9mfHFQ61Loo7o6/uk/zWw=", - "pom": "sha256-PBPSiLo3agdLxeH5MSp5hMyYloD6ZXisHuMuhnj06RM=" + "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.8.1": { + "jar": "sha256-cuELwT27MkpWx0R2xIzu4HsHbbWY+SYBe+djkrnn+zo=", + "module": "sha256-X8jvr3vGkS1yLchCQBoTMMvwcUSlkXvIvulJX8tqmhE=", + "pom": "sha256-RJqCH80/zFLz1YP4kANiu1j/yHOXN8zIYoxCRLCgq88=" }, "org/jetbrains/kotlinx#kotlinx-html-jvm/0.9.1": { "jar": "sha256-to85zZrXtG3goOd+f1kI1OdmHz0MhdLZFxVD/NWxVvs=", @@ -1336,33 +1258,73 @@ "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/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, "org/mockito#mockito-bom/5.5.0": { "pom": "sha256-U8DSPp0xhzL7IFrt+rKcB/srOtUMd80ep1InLiCjjqc=" }, - "org/postgresql#postgresql/42.7.3": { - "jar": "sha256-omRMv7obqhRf9+jI71gqbu16fsTKeS9/BUEivex1Ymg=", - "pom": "sha256-wqy2hFfZlqjkntB3flklW3RlCXZSOVHxAa25QHXhWIU=" + "org/mockito#mockito-bom/5.7.0": { + "pom": "sha256-dlcAW89JAw1nzF1S3rxm3xj0jVTbs+1GZ/1yWwZ5+6A=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-commons/9.7": { + "jar": "sha256-OJvCR5WOBJ/JoECNOYySxtNwwYA1EgOV1Muh2dkwS3o=", + "pom": "sha256-Ws7j7nJS7ZC4B0x1XQInh0malfr/+YrEpoUQfE2kCbQ=" + }, + "org/ow2/asm#asm-tree/9.7": { + "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=", + "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw=" + }, + "org/ow2/asm#asm/9.7": { + "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=", + "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA=" + }, + "org/postgresql#postgresql/42.7.4": { + "jar": "sha256-GIl2ch6tjoYn622DidUA3MwMm+vYhSaKMEcYAnSmAx4=", + "pom": "sha256-3fwfCT5VJ6+bPQWhG+sJtGYfLCsv8zdkmnNp7qDMcd4=" }, "org/slf4j#slf4j-api/1.7.36": { "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" }, - "org/slf4j#slf4j-api/2.0.12": { - "jar": "sha256-p5UCuKvfvXIoRqJ2kSJqQIhoLW01ZU+bgOKpzKz37Uc=", - "pom": "sha256-Udh5pZmPWCJ0Dc9VIsDtaXGtXEpeowtw9bVGCT5rQmM=" + "org/slf4j#slf4j-api/2.0.13": { + "jar": "sha256-58KkjoUVuh9J+mN9V7Ti9ZCz9b2XQHrGmcOqXvsSBKk=", + "pom": "sha256-UYBc/agMoqyCBBuQbZhl056YI+NYoO62I3nf7UdcFXE=" }, - "org/slf4j#slf4j-bom/2.0.12": { - "pom": "sha256-SH70mE1wFY9Yw3zodmkxukx+VzdYZYhLdWORv9bQDDk=" + "org/slf4j#slf4j-bom/2.0.13": { + "pom": "sha256-evJy16c44rmHY3kf/diWBA6L6ymKiP1gYhRAeXbNMQo=" }, "org/slf4j#slf4j-parent/1.7.36": { "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" }, - "org/slf4j#slf4j-parent/2.0.12": { - "pom": "sha256-fGvEdX5NSZJN3w/sX1zkAvg6bGzz4QUtGVsSgqeFVd4=" + "org/slf4j#slf4j-parent/2.0.13": { + "pom": "sha256-Z/rP1R8Gk1zqhWFaBHddcNgL/QOtDzdnA1H5IO0LtYo=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" }, "org/sonatype/oss#oss-parent/9": { "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" }, + "org/springframework#spring-framework-bom/5.3.32": { + "module": "sha256-R6cJH2l8pjEYXtQY8Morhu7wyCqhbRdx3exLLDu3s70=", + "pom": "sha256-glr3ES49kupDa7DfeMGVFIhfXAFtD8YMiyTUdjoBWhA=" + }, + "org/vafer#jdependency/2.10": { + "jar": "sha256-Hc2DVauevO1odxW/ElLrKu5dDnRJeiAU/TOHz86N+F8=", + "pom": "sha256-q1PyWatfZIPT27AjVGngeNSiLP2JB3GrBPh9s6W0YGc=" + }, "uk/org/webcompere#system-stubs-core/2.1.6": { "jar": "sha256-3fwxmZiGbCWONnTTsanIfnZ049mwLaofTXUmATywhFM=", "pom": "sha256-SnIy8ZqLYl1GupI24+3d7Zb2SFUF17QtTSdxQ0hzcic=" diff --git a/pkgs/by-name/li/libeufin/package.nix b/pkgs/by-name/li/libeufin/package.nix index 5fc7b75bcf2c6..b6ef3d432d920 100644 --- a/pkgs/by-name/li/libeufin/package.nix +++ b/pkgs/by-name/li/libeufin/package.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libeufin"; - version = "0.11.3"; + version = "0.13.0"; src = fetchgit { url = "https://git.taler.net/libeufin.git/"; rev = "v${finalAttrs.version}"; - hash = "sha256-6bMYcpxwL1UJXt0AX6R97C0Orwqb7E+TZO2Sz1qode8="; + hash = "sha256-whGcFZYuyeFfhu+mIi7oUNJRXjaVGuL67sfUrHF85Fs="; fetchSubmodules = true; leaveDotGit = true; # required for correct submodule fetching # Delete .git folder for reproducibility (otherwise, the hash changes unexpectedly after fetching submodules) @@ -39,15 +39,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace build.gradle \ --replace-fail "commandLine 'git', 'rev-parse', '--short', 'HEAD'" 'commandLine "cat", "$projectDir/common/src/main/resources/HEAD.txt"' - # Gradle projects provide a .module metadata file as artifact. This artifact is used by gradle - # to download dependencies to the cache when needed, but do not provide the jar for the - # offline installation for our build phase. Since we make an offline Maven repo, we have to - # substitute the gradle deps for their maven counterpart to retrieve the .jar artifacts. - for dir in common bank nexus testbench; do - substituteInPlace $dir/build.gradle \ - --replace-fail ':$ktor_version' '-jvm:$ktor_version' \ - --replace-fail ':$clikt_version' '-jvm:$clikt_version' - done + # Use gradle repo to download dependencies + substituteInPlace build.gradle \ + --replace-fail 'mavenCentral()' "gradlePluginPortal()" runHook postPatch ''; diff --git a/pkgs/by-name/li/libewf-legacy/package.nix b/pkgs/by-name/li/libewf-legacy/package.nix index 3d2aee4d28741..fdd202f8c96db 100644 --- a/pkgs/by-name/li/libewf-legacy/package.nix +++ b/pkgs/by-name/li/libewf-legacy/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib openssl libuuid ] - ++ lib.optionals stdenv.isDarwin [ bzip2 ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ bzip2 ]; meta = { description = "Legacy library for support of the Expert Witness Compression Format"; diff --git a/pkgs/by-name/li/libgedit-amtk/package.nix b/pkgs/by-name/li/libgedit-amtk/package.nix index 4de7207660c91..00891ba921a59 100644 --- a/pkgs/by-name/li/libgedit-amtk/package.nix +++ b/pkgs/by-name/li/libgedit-amtk/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitLab , glib , gtk3 , meson @@ -17,15 +17,17 @@ stdenv.mkDerivation rec { pname = "libgedit-amtk"; - version = "5.8.0"; + version = "5.9.0"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchFromGitHub { - owner = "gedit-technology"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "gedit"; repo = "libgedit-amtk"; rev = version; - hash = "sha256-U77/KMZw9k9ukebCXVXAsCa4uJaTgw9irfZ/l0303kk="; + hash = "sha256-D6jZmadUHDtxedw/tCsKHzcWXobs6Vb7dyhbVKqu2Zc="; }; strictDeps = true; @@ -50,7 +52,7 @@ stdenv.mkDerivation rec { dbus # For dbus-run-session ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' runHook preCheck @@ -62,12 +64,11 @@ stdenv.mkDerivation rec { runHook postCheck ''; - passthru.updateScript = gitUpdater { - odd-unstable = true; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { - homepage = "https://github.com/gedit-technology/libgedit-amtk"; + homepage = "https://gitlab.gnome.org/World/gedit/libgedit-amtk"; + changelog = "https://gitlab.gnome.org/World/gedit/libgedit-amtk/-/blob/${version}/NEWS?ref_type=tags"; description = "Actions, Menus and Toolbars Kit for GTK applications"; maintainers = with maintainers; [ manveru bobby285271 ]; license = licenses.lgpl21Plus; diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix index 8964898851cf9..2d919479bc6fb 100644 --- a/pkgs/by-name/li/libgedit-gfls/package.nix +++ b/pkgs/by-name/li/libgedit-gfls/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitLab , docbook-xsl-nons , gobject-introspection , gtk-doc @@ -14,15 +14,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gfls"; - version = "0.1.0"; + version = "0.2.0"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchFromGitHub { - owner = "gedit-technology"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "gedit"; repo = "libgedit-gfls"; rev = finalAttrs.version; - hash = "sha256-tES8UGWcCT8lRd/fnOt9EN3wHkNSLRM4j8ONrCDPBK0="; + hash = "sha256-oxsqggn4O4SwGEas840qE103hKU4f+GP+ItOtD3M+ac="; }; nativeBuildInputs = [ @@ -46,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - homepage = "https://github.com/gedit-technology/libgedit-gfls"; + homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gfls"; description = "Module dedicated to file loading and saving"; maintainers = with lib.maintainers; [ bobby285271 ]; license = lib.licenses.lgpl3Plus; diff --git a/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/pkgs/by-name/li/libgedit-gtksourceview/package.nix index 70b3fb276e954..3e6a7fc5891ec 100644 --- a/pkgs/by-name/li/libgedit-gtksourceview/package.nix +++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitLab , docbook-xsl-nons , gobject-introspection , gtk-doc @@ -16,15 +16,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gtksourceview"; - version = "299.2.1"; + version = "299.3.0"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchFromGitHub { - owner = "gedit-technology"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "gedit"; repo = "libgedit-gtksourceview"; rev = finalAttrs.version; - hash = "sha256-fmYIZvsB3opstpPEd9vahcD9yUZKPBpSIrlNDs+eCdw="; + hash = "sha256-C2Bq01PlALJMr7kHsSr9VaSNcktc250yGevRYQ7Ipck="; }; patches = [ @@ -55,13 +57,11 @@ stdenv.mkDerivation (finalAttrs: { shared-mime-info ]; - passthru.updateScript = gitUpdater { - odd-unstable = true; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Source code editing widget for GTK"; - homepage = "https://github.com/gedit-technology/libgedit-gtksourceview"; + homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gtksourceview"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ bobby285271 ]; platforms = platforms.linux; diff --git a/pkgs/by-name/li/libgedit-tepl/package.nix b/pkgs/by-name/li/libgedit-tepl/package.nix index 5c2c84ac9a408..c3cebb631f17b 100644 --- a/pkgs/by-name/li/libgedit-tepl/package.nix +++ b/pkgs/by-name/li/libgedit-tepl/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitLab , meson , mesonEmulatorHook , ninja @@ -18,15 +18,17 @@ stdenv.mkDerivation rec { pname = "libgedit-tepl"; - version = "6.10.0"; + version = "6.11.0"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchFromGitHub { - owner = "gedit-technology"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "gedit"; repo = "libgedit-tepl"; rev = version; - hash = "sha256-lGmOaDNu+iqwpeaP0AL28exoTqx1j03Z8gdhTBgk1i8="; + hash = "sha256-8y3EQZKYRcx2ocG7aR7tGBCE/68yPdrBcPNm6O2lM4c="; }; strictDeps = true; @@ -54,7 +56,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/gedit-technology/libgedit-tepl"; + homepage = "https://gitlab.gnome.org/World/gedit/libgedit-tepl"; description = "Text editor product line"; maintainers = with maintainers; [ manveru bobby285271 ]; license = licenses.lgpl3Plus; diff --git a/pkgs/by-name/li/libgnome-keyring/package.nix b/pkgs/by-name/li/libgnome-keyring/package.nix index 4f30ebdae6126..5e6c6f0c02eac 100644 --- a/pkgs/by-name/li/libgnome-keyring/package.nix +++ b/pkgs/by-name/li/libgnome-keyring/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libgnome-keyring/${lib.versions.majorMinor finalAttrs.version}/libgnome-keyring-${finalAttrs.version}.tar.xz"; - sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; + hash = "sha256-xMF4+7BfcqzEhNIt2wVo91MsQJsKE+BlE/9UuR6Ud4M="; }; outputs = [ "out" "dev" ]; @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Framework for managing passwords and other secrets"; homepage = "https://gitlab.gnome.org/Archive/libgnome-keyring"; + changelog = "https://gitlab.gnome.org/Archive/libgnome-keyring/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; pkgConfigModules = [ "gnome-keyring-1" ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/li/libgpiod_1/package.nix b/pkgs/by-name/li/libgpiod_1/package.nix index ce5a4ac2833da..337229c25db77 100644 --- a/pkgs/by-name/li/libgpiod_1/package.nix +++ b/pkgs/by-name/li/libgpiod_1/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo="; + hash = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo="; }; patches = [ diff --git a/pkgs/by-name/li/libgrapheme/package.nix b/pkgs/by-name/li/libgrapheme/package.nix index 1aaed5f1a6044..44883d17d0c6e 100644 --- a/pkgs/by-name/li/libgrapheme/package.nix +++ b/pkgs/by-name/li/libgrapheme/package.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { hash = "sha256-pou93edr1Vul1kEWzl5CoT3wRcgcCFLemrYIlqoUMSU="; }; + postPatch = '' + substituteInPlace configure \ + --replace-fail "uname" "echo ${stdenv.hostPlatform.uname.system}" + ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" "RANLIB:=$(RANLIB)" "BUILD_CC=$(CC_FOR_BUILD)" ]; diff --git a/pkgs/by-name/li/libhttpserver/package.nix b/pkgs/by-name/li/libhttpserver/package.nix index d8e6ce8c3ab5a..a61342b99d07e 100644 --- a/pkgs/by-name/li/libhttpserver/package.nix +++ b/pkgs/by-name/li/libhttpserver/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "etr"; repo = pname; rev = version; - sha256 = "sha256-Pc3Fvd8D4Ymp7dG9YgU58mDceOqNfhWE1JtnpVaNx/Y="; + hash = "sha256-Pc3Fvd8D4Ymp7dG9YgU58mDceOqNfhWE1JtnpVaNx/Y="; }; nativeBuildInputs = [ autoconf automake libtool ]; @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ pongo1231 ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # configure: error: cannot find required auxiliary files: ltmain.sh + broken = stdenv.hostPlatform.isDarwin; # configure: error: cannot find required auxiliary files: ltmain.sh }; } diff --git a/pkgs/by-name/li/libiconv-darwin/package.nix b/pkgs/by-name/li/libiconv-darwin/package.nix index 5792568852ff6..e928cd999165f 100644 --- a/pkgs/by-name/li/libiconv-darwin/package.nix +++ b/pkgs/by-name/li/libiconv-darwin/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonBool "tests" finalAttrs.doInstallCheck) ]; postInstall = - lib.optionalString (stdenv.isDarwin && !hostPlatform.isStatic) '' + lib.optionalString (stdenv.hostPlatform.isDarwin && !hostPlatform.isStatic) '' ${stdenv.cc.targetPrefix}install_name_tool "$out/lib/libiconv.2.dylib" \ -change '@rpath/libcharset.1.dylib' "$out/lib/libcharset.1.dylib" '' diff --git a/pkgs/by-name/li/libiff/package.nix b/pkgs/by-name/li/libiff/package.nix index 40138dc2d6619..6a8fd441cc40f 100644 --- a/pkgs/by-name/li/libiff/package.nix +++ b/pkgs/by-name/li/libiff/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { owner = "svanderburg"; repo = "libiff"; rev = "b5f542a83c824f26e0816770c9a17c22bd388606"; - sha256 = "sha256-Arh3Ihd5TWg5tdemodrxz2EDxh/hwz9b2/AvrTONFy8="; + hash = "sha256-Arh3Ihd5TWg5tdemodrxz2EDxh/hwz9b2/AvrTONFy8="; }; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/by-name/li/libilbm/package.nix b/pkgs/by-name/li/libilbm/package.nix index 16f872df848bd..2a8ef532dade7 100644 --- a/pkgs/by-name/li/libilbm/package.nix +++ b/pkgs/by-name/li/libilbm/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { owner = "svanderburg"; repo = "libilbm"; rev = "586f5822275ef5780509a851cb90c7407b2633d9"; - sha256 = "sha256-EcsrspL/N40yFE15UFWGienpJHhoq1zd8zZe6x4nK6o="; + hash = "sha256-EcsrspL/N40yFE15UFWGienpJHhoq1zd8zZe6x4nK6o="; }; buildInputs = [ libiff ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libipuz/package.nix b/pkgs/by-name/li/libipuz/package.nix index 5cc94ca9a657a..5ea6b5527bb69 100644 --- a/pkgs/by-name/li/libipuz/package.nix +++ b/pkgs/by-name/li/libipuz/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for parsing .ipuz puzzle files"; homepage = "https://gitlab.gnome.org/jrb/libipuz"; + changelog = "https://gitlab.gnome.org/jrb/libipuz/-/blob/${version}/NEWS.md?ref_type=tags"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ aleksana ]; platforms = platforms.unix; diff --git a/pkgs/by-name/li/libisoburn/package.nix b/pkgs/by-name/li/libisoburn/package.nix index 7fc8c6aff60fa..498c3394d3e1d 100644 --- a/pkgs/by-name/li/libisoburn/package.nix +++ b/pkgs/by-name/li/libisoburn/package.nix @@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: { zlib libburn libisofs - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ acl attr ]; - propagatedBuildInputs = lib.optionals stdenv.isLinux [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ acl ]; diff --git a/pkgs/by-name/li/libisofs/package.nix b/pkgs/by-name/li/libisofs/package.nix index ac9c606b55523..52b807c6c8d23 100644 --- a/pkgs/by-name/li/libisofs/package.nix +++ b/pkgs/by-name/li/libisofs/package.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation (finalAttrs: { autoreconfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ acl attr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ [ zlib diff --git a/pkgs/by-name/li/libjaylink/package.nix b/pkgs/by-name/li/libjaylink/package.nix new file mode 100644 index 0000000000000..594726f6efe14 --- /dev/null +++ b/pkgs/by-name/li/libjaylink/package.nix @@ -0,0 +1,43 @@ +{ + fetchFromGitLab, + lib, + stdenv, + autoreconfHook, + pkg-config, + libusb1, +}: + +stdenv.mkDerivation rec { + pname = "libjaylink"; + version = "0.3.1"; + + src = fetchFromGitLab { + domain = "gitlab.zapb.de"; + owner = "libjaylink"; + repo = "libjaylink"; + rev = version; + hash = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ libusb1 ]; + + postPatch = '' + patchShebangs autogen.sh + ''; + + postInstall = '' + install -Dm644 contrib/99-libjaylink.rules $out/lib/udev/rules.d/libjaylink.rules + ''; + + meta = with lib; { + homepage = "https://gitlab.zapb.de/libjaylink/libjaylink"; + description = "libjaylink is a shared library written in C to access SEGGER J-Link and compatible devices"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ felixsinger ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/li/libkazv/package.nix b/pkgs/by-name/li/libkazv/package.nix new file mode 100644 index 0000000000000..f4d2afa5a3174 --- /dev/null +++ b/pkgs/by-name/li/libkazv/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitLab, + boost, + catch2_3, + cmake, + cryptopp, + immer, + lager, + libcpr, + libhttpserver, + libmicrohttpd, + nlohmann_json, + olm, + pkg-config, + zug, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libkazv"; + version = "0.7.0"; + + src = fetchFromGitLab { + domain = "lily-is.land"; + owner = "kazv"; + repo = "libkazv"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-bKujiuAR5otF7nc/BdVWVaEW9fSxdh2bcAgsQ5UO1Aw="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + boost + cryptopp + immer + lager + libcpr + libhttpserver + libmicrohttpd + olm + nlohmann_json + zug + ]; + + strictDeps = true; + + cmakeFlags = [ (lib.cmakeBool "libkazv_BUILD_TESTS" finalAttrs.doCheck) ]; + + doCheck = true; + + checkInputs = [ catch2_3 ]; + + meta = { + description = "Matrix client sdk built upon lager and the value-oriented design it enables"; + homepage = "https://lily-is.land/kazv/libkazv"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/li/libkvmi/package.nix b/pkgs/by-name/li/libkvmi/package.nix new file mode 100644 index 0000000000000..cc1a4efe93d63 --- /dev/null +++ b/pkgs/by-name/li/libkvmi/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + unstableGitUpdater, + autoreconfHook, + autoconf-archive, + pkg-config, + glib, + libuuid, +}: + +stdenv.mkDerivation { + pname = "libkvmi"; + version = "1.1.0-unstable-2023-12-13"; + + outputs = [ + "out" + "lib" + "dev" + ]; + + src = fetchFromGitHub { + owner = "bitdefender"; + repo = "libkvmi"; + rev = "bc80de986bda1b891a1106badf87587bb92dbbb3"; + hash = "sha256-evYRIwguaKgJ8pMhhKKkSc/65GDYnG6DoYRMSkLjowI="; + }; + + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + ]; + + buildInputs = [ + glib + libuuid + ]; + + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + + meta = { + description = "KVM virtual machine introspection library"; + homepage = "https://github.com/bitdefender/libkvmi"; + license = lib.licenses.lgpl3Only; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ sigmasquadron ]; + mainProgram = "hookguest-libkvmi"; + outputsToInstall = [ "lib" ]; + }; +} diff --git a/pkgs/by-name/li/libmatroska/package.nix b/pkgs/by-name/li/libmatroska/package.nix new file mode 100644 index 0000000000000..8de6786dfa649 --- /dev/null +++ b/pkgs/by-name/li/libmatroska/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libebml, + nix-update-script, + pkg-config, + testers, + validatePkgConfig, + libmatroska, +}: + +stdenv.mkDerivation rec { + pname = "libmatroska"; + version = "1.7.1"; + + outputs = [ + "dev" + "out" + ]; + + src = fetchFromGitHub { + owner = "Matroska-Org"; + repo = "libmatroska"; + rev = "release-${version}"; + hash = "sha256-hfu3Q1lIyMlWFWUM2Pu70Hie0rlQmua7Kq8kSIWnfHE="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + validatePkgConfig + ]; + + buildInputs = [ libebml ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" ]; + + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { package = libmatroska; }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "release-(.*)" + ]; + }; + }; + + meta = { + description = "Library to parse Matroska files"; + homepage = "https://matroska.org/"; + changelog = "https://github.com/Matroska-Org/libmatroska/blob/${src.rev}/NEWS.md"; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ getchoo ]; + platforms = lib.platforms.unix; + pkgConfigModules = [ "libmatroska" ]; + }; +} diff --git a/pkgs/by-name/li/libmpd/package.nix b/pkgs/by-name/li/libmpd/package.nix index bf2e6c70d2ad8..bb6c9ed45f8cc 100644 --- a/pkgs/by-name/li/libmpd/package.nix +++ b/pkgs/by-name/li/libmpd/package.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; # Getting DARWIN_NULL related errors - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/li/libmpdclient/package.nix b/pkgs/by-name/li/libmpdclient/package.nix index 691a1b76a2fbb..297ca698b0c94 100644 --- a/pkgs/by-name/li/libmpdclient/package.nix +++ b/pkgs/by-name/li/libmpdclient/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/by-name/li/libmsgraph/package.nix b/pkgs/by-name/li/libmsgraph/package.nix index 011d4bab9a81b..8a133e947135c 100644 --- a/pkgs/by-name/li/libmsgraph/package.nix +++ b/pkgs/by-name/li/libmsgraph/package.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library to access MS Graph API for Office 365"; homepage = "https://gitlab.gnome.org/GNOME/msgraph"; + changelog = "https://gitlab.gnome.org/GNOME/msgraph/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.lgpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnbd/libnbd-metadata b/pkgs/by-name/li/libnbd/libnbd-metadata similarity index 100% rename from pkgs/development/libraries/libnbd/libnbd-metadata rename to pkgs/by-name/li/libnbd/libnbd-metadata diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/by-name/li/libnbd/package.nix similarity index 100% rename from pkgs/development/libraries/libnbd/default.nix rename to pkgs/by-name/li/libnbd/package.nix diff --git a/pkgs/by-name/li/libnghttp2_asio/package.nix b/pkgs/by-name/li/libnghttp2_asio/package.nix index 7d286b2ffcb5e..7853e89d27de8 100644 --- a/pkgs/by-name/li/libnghttp2_asio/package.nix +++ b/pkgs/by-name/li/libnghttp2_asio/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "nghttp2"; repo = "nghttp2-asio"; rev = "e877868abe06a83ed0a6ac6e245c07f6f20866b5"; - sha256 = "sha256-XQXRHLz0kvaIQq1nbqkJnETHR51FXMB1P9F/hQeZh6A="; + hash = "sha256-XQXRHLz0kvaIQq1nbqkJnETHR51FXMB1P9F/hQeZh6A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libopus/package.nix b/pkgs/by-name/li/libopus/package.nix index cdf00a244ba4b..f809c40000e95 100644 --- a/pkgs/by-name/li/libopus/package.nix +++ b/pkgs/by-name/li/libopus/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "docs" false) ]; - doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails + doCheck = !stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isAarch32; # test_unit_LPC_inv_pred_gain fails passthru = { updateScript = gitUpdater { diff --git a/pkgs/by-name/li/libplacebo_5/package.nix b/pkgs/by-name/li/libplacebo_5/package.nix index 5bc799ddf8607..e75d44dcdf265 100644 --- a/pkgs/by-name/li/libplacebo_5/package.nix +++ b/pkgs/by-name/li/libplacebo_5/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { (lib.mesonBool "demos" false) # Don't build and install the demo programs (lib.mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer (lib.mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind` ]; diff --git a/pkgs/by-name/li/librandombytes/package.nix b/pkgs/by-name/li/librandombytes/package.nix index f36a94018e75c..5bb8175420de1 100644 --- a/pkgs/by-name/li/librandombytes/package.nix +++ b/pkgs/by-name/li/librandombytes/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl ]; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id "$out/lib/librandombytes-kernel.1.dylib" "$out/lib/librandombytes-kernel.1.dylib" install_name_tool -change "librandombytes-kernel.1.dylib" "$out/lib/librandombytes-kernel.1.dylib" "$out/bin/randombytes-info" ''; diff --git a/pkgs/by-name/li/librep/package.nix b/pkgs/by-name/li/librep/package.nix new file mode 100644 index 0000000000000..373f8232a8575 --- /dev/null +++ b/pkgs/by-name/li/librep/package.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchurl +, autoreconfHook +, gdbm +, gmp +, libffi +, pkg-config +, readline +, texinfo +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "librep"; + version = "0.92.7"; + + src = fetchurl { + url = "https://download.tuxfamily.org/librep/librep_${finalAttrs.version}.tar.xz"; + hash = "sha256-SKGWeax8BTCollfeGP/knFdZpf9w/IRJKLDl0AOVrK4="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + texinfo + ]; + + buildInputs = [ + gdbm + gmp + libffi + readline + ]; + + strictDeps = true; + + # ensure libsystem/ctype functions don't get duplicated when using clang + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CFLAGS=-std=gnu89" ]; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = "http://sawfish.tuxfamily.org/"; + description = "Fast, lightweight, and versatile Lisp environment"; + longDescription = '' + librep is a Lisp system for UNIX, comprising an interpreter, a byte-code + compiler, and a virtual machine. It can serve as an application extension + language but is also suitable for standalone scripts. + ''; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) +# TODO: investigate fetchFromGithub diff --git a/pkgs/development/libraries/librep/setup-hook.sh b/pkgs/by-name/li/librep/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/librep/setup-hook.sh rename to pkgs/by-name/li/librep/setup-hook.sh diff --git a/pkgs/by-name/li/libresample/package.nix b/pkgs/by-name/li/libresample/package.nix index 66fd57edbe666..2b8f3b2cd5a3c 100644 --- a/pkgs/by-name/li/libresample/package.nix +++ b/pkgs/by-name/li/libresample/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - cmake, meson, ninja, pkg-config, diff --git a/pkgs/by-name/li/libresplit/package.nix b/pkgs/by-name/li/libresplit/package.nix new file mode 100644 index 0000000000000..8ef17056ad059 --- /dev/null +++ b/pkgs/by-name/li/libresplit/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gtk3, + jansson, + luajit, + pkg-config, + unstableGitUpdater, + wrapGAppsHook3, + xxd, +}: + +stdenv.mkDerivation { + pname = "libresplit"; + version = "0-unstable-2024-09-24"; + + src = fetchFromGitHub { + owner = "wins1ey"; + repo = "LibreSplit"; + rev = "b56ce6743378fc09c9ab621713423754eac945a1"; + hash = "sha256-mhX5xyBmElPV6NUQRTz8KKL+H1on3WJ4DYatv89MRPo="; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + xxd + ]; + + buildInputs = [ + gtk3 + jansson + luajit + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/wins1ey/LibreSplit"; + description = "Speedrun timer with auto splitting and load removal for Linux"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fgaz ]; + mainProgram = "libresplit"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/li/librewolf-bin/package.nix b/pkgs/by-name/li/librewolf-bin/package.nix new file mode 100644 index 0000000000000..80c0875fa69cc --- /dev/null +++ b/pkgs/by-name/li/librewolf-bin/package.nix @@ -0,0 +1,35 @@ +{ + lib, + appimageTools, + fetchurl, +}: + +let + pname = "librewolf-bin"; + upstreamVersion = "129.0.2-1"; + version = lib.replaceStrings [ "-" ] [ "." ] upstreamVersion; + src = fetchurl { + url = "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${upstreamVersion}/LibreWolf.x86_64.AppImage"; + hash = "sha256-h4SZnI2BwCSsLADYIxTXu82Jyst1hqYGHt54MnluLss="; + }; + appimageContents = appimageTools.extract { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/{${pname},librewolf} + install -Dm444 ${appimageContents}/io.gitlab.LibreWolf.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/librewolf.png -t $out/share/pixmaps + ''; + + meta = { + description = "Fork of Firefox, focused on privacy, security and freedom (upstream AppImage release)"; + homepage = "https://librewolf.net"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "librewolf"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/li/librum/package.nix b/pkgs/by-name/li/librum/package.nix index 2d6612c680984..40158f72a1209 100644 --- a/pkgs/by-name/li/librum/package.nix +++ b/pkgs/by-name/li/librum/package.nix @@ -35,14 +35,14 @@ stdenv.mkDerivation rec { cmake qt6.qttools qt6.wrapQtAppsHook - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ qt6.qtbase qt6.qtsvg - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; diff --git a/pkgs/by-name/li/libsbml/package.nix b/pkgs/by-name/li/libsbml/package.nix index 513e72f322bc5..9fbb674f5d62d 100644 --- a/pkgs/by-name/li/libsbml/package.nix +++ b/pkgs/by-name/li/libsbml/package.nix @@ -2,43 +2,35 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, pkg-config, bzip2, libxml2, swig, + python ? null, + withPython ? false, }: stdenv.mkDerivation (attrs: { pname = "libsbml"; - version = "5.20.2"; + version = "5.20.4"; src = fetchFromGitHub { owner = "sbmlteam"; repo = "libsbml"; rev = "v${attrs.version}"; - hash = "sha256-8JT2r0zuf61VewtZaOAccaOUmDlQPnllA0fXE9rT5X8="; + hash = "sha256-qWTN033YU4iWzt+mXQaP5W/6IF5nebF4PwNVkyL8wTg="; }; - patches = [ - # This should be in next release, remember to remove fetchpatch - (fetchpatch { # https://github.com/sbmlteam/libsbml/pull/358 - name = "fix-xmlerror-conversion.patch"; - url = "https://github.com/sbmlteam/libsbml/commit/de2f77ee6766fe933a1472200f5e08e7c5ba6f8c.patch"; - hash = "sha256-uirG6XJ+w0hqBUEAGDnzhHoVtJVRdN1eqBYeneKMBao="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config swig - ]; + ] ++ lib.optional withPython python.pkgs.pythonImportsCheckHook; buildInputs = [ bzip2.dev libxml2 - ]; + ] ++ lib.optional withPython python; # libSBML doesn't always make use of pkg-config cmakeFlags = [ @@ -46,13 +38,19 @@ stdenv.mkDerivation (attrs: { "-DLIBXML_LIBRARY=${lib.getLib libxml2}/lib/libxml2${stdenv.hostPlatform.extensions.sharedLibrary}" "-DPKG_CONFIG_EXECUTABLE=${lib.getBin pkg-config}/bin/pkg-config" "-DSWIG_EXECUTABLE=${lib.getBin swig}/bin/swig" - ]; + ] ++ lib.optional withPython "-DWITH_PYTHON=ON"; + + postInstall = lib.optional withPython '' + mv $out/${python.sitePackages}/libsbml/libsbml.py $out/${python.sitePackages}/libsbml/__init__.py + ''; + + pythonImportsCheck = [ "libsbml" ]; meta = with lib; { description = "Library for manipulating Systems Biology Markup Language (SBML)"; homepage = "https://github.com/sbmlteam/libsbml"; license = licenses.lgpl21Only; - maintainers = [maintainers.kupac]; + maintainers = [ maintainers.kupac ]; platforms = platforms.all; }; }) diff --git a/pkgs/by-name/li/libscfg/package.nix b/pkgs/by-name/li/libscfg/package.nix index f9eb2a5b804b0..333433d8c42c0 100644 --- a/pkgs/by-name/li/libscfg/package.nix +++ b/pkgs/by-name/li/libscfg/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "~emersion"; repo = "libscfg"; rev = "v${version}"; - sha256 = "sha256-aTcvs7QuDOx17U/yP37LhvIGxmm2WR/6qFYRtfjRN6w="; + hash = "sha256-aTcvs7QuDOx17U/yP37LhvIGxmm2WR/6qFYRtfjRN6w="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/by-name/li/libsignal-ffi/Cargo.lock b/pkgs/by-name/li/libsignal-ffi/Cargo.lock index 20d21c2a25e58..83c23c72ac978 100644 --- a/pkgs/by-name/li/libsignal-ffi/Cargo.lock +++ b/pkgs/by-name/li/libsignal-ffi/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -130,9 +130,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] @@ -168,15 +168,15 @@ dependencies = [ [[package]] name = "array-concat" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9180feb72ccbc07cfe5ef7fa8bbf86ca71490d5dc9ef8ea02c7298ba94e7f7d" +checksum = "68b4d2c47ea522f4135657904891e533727daca3d2d852f29f5e4cc50960c77c" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -186,22 +186,22 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asn1" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "889adc8fd6c1344619926529e605cccad1f832b3a2a5a3fe6d7c8557c8f05368" +checksum = "532ceda058281b62096b2add4ab00ab3a453d30dee28b8890f62461a0109ebbd" dependencies = [ "asn1_derive", ] [[package]] name = "asn1_derive" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2271cec9b830009b9c3b9e21767083c553f51f996b690c476c27f541199aa99" +checksum = "56e6076d38cc17cc22b0f65f31170a2ee1975e6b07f0012893aefd86ce19c987" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -227,9 +227,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-compression" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "flate2", "futures-core", @@ -240,13 +240,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -269,6 +269,7 @@ dependencies = [ "assert_matches", "base64 0.21.7", "bitflags", + "blake2", "boring", "chacha20poly1305", "chrono", @@ -278,6 +279,7 @@ dependencies = [ "hex-literal", "lazy_static", "libc", + "libcrux-ml-kem", "log", "prost", "prost-build", @@ -293,6 +295,7 @@ dependencies = [ "thiserror", "uuid", "x25519-dalek", + "zerocopy", ] [[package]] @@ -303,9 +306,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -360,7 +363,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -380,9 +383,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitstream-io" @@ -419,8 +422,8 @@ dependencies = [ [[package]] name = "boring" -version = "4.6.0" -source = "git+https://github.com/signalapp/boring?tag=signal-v4.6.0#b9a75167dc08a3b16dd203e0af78c8962c5439bd" +version = "4.9.0" +source = "git+https://github.com/signalapp/boring?tag=signal-v4.9.0#59883d7e23599f6631f9e5087db4b797f2953feb" dependencies = [ "bitflags", "boring-sys", @@ -431,8 +434,8 @@ dependencies = [ [[package]] name = "boring-sys" -version = "4.6.0" -source = "git+https://github.com/signalapp/boring?tag=signal-v4.6.0#b9a75167dc08a3b16dd203e0af78c8962c5439bd" +version = "4.9.0" +source = "git+https://github.com/signalapp/boring?tag=signal-v4.9.0#59883d7e23599f6631f9e5087db4b797f2953feb" dependencies = [ "bindgen", "cmake", @@ -465,7 +468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.7", "serde", ] @@ -475,12 +478,6 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" -[[package]] -name = "bytemuck" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" - [[package]] name = "byteorder" version = "1.5.0" @@ -489,9 +486,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "cachemap2" @@ -516,13 +513,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" dependencies = [ "jobserver", "libc", - "once_cell", ] [[package]] @@ -582,7 +578,7 @@ dependencies = [ "num-traits 0.2.19", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -631,9 +627,9 @@ checksum = "b0fc239e0f6cb375d2402d48afb92f76f5404fd1df208a41930ec81eda078bea" [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -680,7 +676,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -724,6 +720,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "const-str" version = "0.5.7" @@ -881,7 +883,7 @@ source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve2551 dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -934,6 +936,16 @@ dependencies = [ "uuid", ] +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "deranged" version = "0.3.11" @@ -951,7 +963,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -987,15 +999,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -1007,6 +1019,12 @@ dependencies = [ "libc", ] +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "difflib" version = "0.4.0" @@ -1053,7 +1071,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1101,11 +1119,35 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek", + "ed25519", + "serde", + "sha2", + "subtle", + "zeroize", +] + [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" @@ -1125,7 +1167,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1139,35 +1181,24 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", -] - -[[package]] -name = "env_logger" -version = "0.10.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "c6dc8c8ff84895b051f07a0e65f975cf225131742531338752abfb324e4449ff" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", ] [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "06676b12debf7bba6903559720abca942d3a66b8acb88815fd2c7c6537e9ade1" dependencies = [ "anstream", "anstyle", "env_filter", + "humantime", "log", ] @@ -1239,7 +1270,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1329,7 +1360,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1396,9 +1427,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1466,6 +1497,43 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +[[package]] +name = "hax-lib" +version = "0.1.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b4c24729b7608f3a2f2b798b503e18ca3d46b5287e85e42c3e2a81a6431c20e" +dependencies = [ + "hax-lib-macros", + "num-bigint", + "num-traits 0.2.19", +] + +[[package]] +name = "hax-lib-macros" +version = "0.1.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e537b6582ecf0d2bc9761b6c129840c9a039263e71b933850af8e24d5e3a840" +dependencies = [ + "hax-lib-macros-types", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "hax-lib-macros-types" +version = "0.1.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1025439d93a495700d7099f7bd2285845837def514b2f97b2f8a4cd93fab5bd9" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_json", + "uuid", +] + [[package]] name = "headers" version = "0.3.9" @@ -1490,15 +1558,6 @@ dependencies = [ "http 0.2.12", ] -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.1" @@ -1618,9 +1677,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.1.0", @@ -1628,22 +1687,22 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1659,9 +1718,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -1683,16 +1742,16 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", "futures-util", "h2 0.4.5", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", "smallvec", "tokio", @@ -1701,15 +1760,15 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", - "hyper 1.3.1", + "http-body 1.0.1", + "hyper 1.4.1", "pin-project-lite", "tokio", ] @@ -1827,9 +1886,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1878,9 +1937,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -1907,9 +1966,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -1923,14 +1982,53 @@ version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +[[package]] +name = "libcrux-intrinsics" +version = "0.0.2-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9995f4888b0bbcb4bab293c271ac6f5a4fa6a06f76576cb2c31063ba618d9914" + +[[package]] +name = "libcrux-ml-kem" +version = "0.0.2-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cac73db2e2fa0382c2f37632e0d1e188201175deda0158b49a2632bc8deefe1" +dependencies = [ + "hax-lib", + "libcrux-intrinsics", + "libcrux-platform", + "libcrux-sha3", + "rand_core", +] + +[[package]] +name = "libcrux-platform" +version = "0.0.2-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "647e39666194b11df17c19451d1154b9be79df98b9821532560c2ecad0cf3410" +dependencies = [ + "libc", +] + +[[package]] +name = "libcrux-sha3" +version = "0.0.2-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee374451378a5b7ec908373d03a78cbf050c387cd1996a50724d88a392f4d1a5" +dependencies = [ + "hax-lib", + "libcrux-intrinsics", + "libcrux-platform", +] + [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1945,15 +2043,10 @@ version = "0.1.0" dependencies = [ "aes-gcm-siv", "assert_matches", - "async-trait", - "atomic-take", "attest", "base64 0.21.7", "bincode", - "bytemuck", - "derive-where", "device-transfer", - "displaydoc", "futures-util", "hkdf", "hmac", @@ -1967,29 +2060,21 @@ dependencies = [ "libsignal-protocol", "linkme", "log", - "mediasan-common", "neon", "nonzero_ext", - "num_enum", - "once_cell", - "partial-default", "paste", "prost", "rand", - "rayon", "scopeguard", - "serde", "sha2", "signal-crypto", "signal-media", - "signal-neon-futures", "signal-pin", "static_assertions", "strum", "subtle", "test-case", "testing_logger", - "thiserror", "tokio", "usernames", "uuid", @@ -2000,13 +2085,37 @@ dependencies = [ name = "libsignal-bridge-macros" version = "0.1.0" dependencies = [ - "heck 0.3.3", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "syn-mid", ] +[[package]] +name = "libsignal-bridge-testing" +version = "0.1.0" +dependencies = [ + "attest", + "futures-util", + "http 1.1.0", + "jni 0.21.1", + "libsignal-bridge-macros", + "libsignal-bridge-types", + "libsignal-message-backup", + "libsignal-net", + "libsignal-protocol", + "linkme", + "neon", + "nonzero_ext", + "paste", + "prost", + "scopeguard", + "strum", + "tokio", + "uuid", +] + [[package]] name = "libsignal-bridge-types" version = "0.1.0" @@ -2016,20 +2125,13 @@ dependencies = [ "async-trait", "atomic-take", "attest", - "base64 0.21.7", - "bincode", - "bytemuck", - "cfg-if", "derive-where", "device-transfer", "displaydoc", "futures-util", - "hex", - "hkdf", "hmac", "http 1.1.0", "jni 0.21.1", - "libsignal-bridge-macros", "libsignal-core", "libsignal-message-backup", "libsignal-net", @@ -2039,17 +2141,12 @@ dependencies = [ "log", "mediasan-common", "neon", - "nonzero_ext", "num_enum", "once_cell", "partial-default", "paste", - "prost", - "rand", "rayon", - "scopeguard", "serde", - "serde_derive", "sha2", "signal-crypto", "signal-media", @@ -2061,9 +2158,9 @@ dependencies = [ "test-case", "thiserror", "tokio", - "tokio-boring", "usernames", "uuid", + "zerocopy", "zkgroup", ] @@ -2080,11 +2177,12 @@ dependencies = [ [[package]] name = "libsignal-ffi" -version = "0.52.0" +version = "0.57.1" dependencies = [ "cpufeatures", "futures-util", "libsignal-bridge", + "libsignal-bridge-testing", "libsignal-net", "libsignal-protocol", "log", @@ -2094,7 +2192,7 @@ dependencies = [ [[package]] name = "libsignal-jni" -version = "0.52.0" +version = "0.57.1" dependencies = [ "cfg-if", "cpufeatures", @@ -2108,6 +2206,33 @@ dependencies = [ "signal-crypto", ] +[[package]] +name = "libsignal-jni-testing" +version = "0.57.1" +dependencies = [ + "jni 0.21.1", + "libsignal-bridge-testing", + "libsignal-bridge-types", + "log", +] + +[[package]] +name = "libsignal-keytrans" +version = "0.0.1" +dependencies = [ + "assert_matches", + "curve25519-dalek", + "displaydoc", + "ed25519-dalek", + "hex-literal", + "hmac", + "proptest", + "prost", + "prost-build", + "sha2", + "test-case", +] + [[package]] name = "libsignal-message-backup" version = "0.1.0" @@ -2125,29 +2250,31 @@ dependencies = [ "derive-where", "dir-test", "displaydoc", - "env_logger 0.10.2", + "env_logger", "futures", "hex", "hex-literal", "hkdf", "hmac", - "itertools 0.12.1", + "itertools 0.13.0", "json5", + "libsignal-core", "libsignal-message-backup", "libsignal-message-backup-macros", - "libsignal-protocol", "log", "macro_rules_attribute", "mediasan-common", "nonzero_ext", "num_enum", + "once_cell", + "pretty_assertions", "protobuf", "protobuf-codegen", "protobuf-json-mapping", + "serde", "serde_json", "sha2", "signal-crypto", - "smallvec", "strum", "strum_macros", "subtle", @@ -2165,10 +2292,10 @@ dependencies = [ name = "libsignal-message-backup-macros" version = "0.1.0" dependencies = [ - "heck 0.3.3", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "test-case", ] @@ -2190,7 +2317,7 @@ dependencies = [ "derive-where", "displaydoc", "either", - "env_logger 0.10.2", + "env_logger", "futures-util", "hex", "hex-literal", @@ -2198,9 +2325,10 @@ dependencies = [ "hmac", "http 1.1.0", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.1", "hyper-util", - "itertools 0.12.1", + "indexmap 2.2.6", + "itertools 0.13.0", "lazy_static", "libsignal-core", "libsignal-protocol", @@ -2215,34 +2343,40 @@ dependencies = [ "rand", "rand_core", "rcgen", - "rustls 0.23.8", + "rustls 0.23.12", "rustls-platform-verifier", "serde", "serde_json", "sha2", "snow", + "socks5-server", + "static_assertions", "strum", "test-case", + "test-log", "thiserror", "tls-parser", "tokio", "tokio-boring", + "tokio-socks", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.23.1", "tokio-util", - "tungstenite", + "tungstenite 0.23.0", "url", "uuid", "warp", + "zerocopy", ] [[package]] name = "libsignal-node" -version = "0.52.0" +version = "0.57.1" dependencies = [ "cmake", "futures", "libsignal-bridge", + "libsignal-bridge-testing", "libsignal-protocol", "log", "log-panics", @@ -2266,14 +2400,14 @@ dependencies = [ "curve25519-dalek", "derive-where", "displaydoc", - "env_logger 0.10.2", + "env_logger", "futures-util", "hex", "hex-literal", "hkdf", "hmac", "indexmap 2.2.6", - "itertools 0.12.1", + "itertools 0.13.0", "libsignal-core", "log", "num_enum", @@ -2298,8 +2432,8 @@ dependencies = [ name = "libsignal-svr3" version = "0.1.0" dependencies = [ + "aes-gcm-siv", "assert_matches", - "bytemuck", "criterion", "curve25519-dalek", "displaydoc", @@ -2307,33 +2441,36 @@ dependencies = [ "hex-literal", "hkdf", "nonzero_ext", + "proptest", "prost", "prost-build", "rand_core", "sha2", - "strum_macros", + "signal-crypto", + "strum", "subtle", "test-case", + "zerocopy", ] [[package]] name = "linkme" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833222afbfe72868ac8f9770c91a33673f0d5fefc37c9dbe94aa3548b571623f" +checksum = "ccb76662d78edc9f9bf56360d6919bdacc8b7761227727e5082f128eeb90bbf5" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f0dea92dbea3271557cc2e1848723967bba81f722f95026860974ec9283f08" +checksum = "f8dccda732e04fa3baf2e17cf835bfe2601c7c2edafd64417c627dabae3a8cda" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2344,9 +2481,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "log-panics" @@ -2397,9 +2534,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2418,9 +2555,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -2503,22 +2640,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2598,7 +2736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6813fde79b646e47e7ad75f480aa80ef76a5d9599e2717407961531169ee38b" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.72", "syn-mid", ] @@ -2652,9 +2790,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits 0.2.19", @@ -2674,7 +2812,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2705,42 +2843,32 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_enum" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -2753,9 +2881,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "opaque-debug" @@ -2792,7 +2920,7 @@ checksum = "7459127d7a18cb202d418e4b7df1103ffd6d82a106e9b2091c250624c2ace70d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2836,9 +2964,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -2847,9 +2975,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -2857,22 +2985,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "pest_meta" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", @@ -2944,7 +3072,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2959,6 +3087,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "plotters" version = "0.3.6" @@ -3105,6 +3243,16 @@ dependencies = [ "termtree", ] +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] + [[package]] name = "prettyplease" version = "0.2.20" @@ -3112,24 +3260,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "once_cell", "toml_edit", ] +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -3147,9 +3318,9 @@ dependencies = [ [[package]] name = "proptest" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ "bit-set", "bit-vec", @@ -3159,7 +3330,7 @@ dependencies = [ "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", "rusty-fork", "tempfile", "unarray", @@ -3176,9 +3347,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", "prost-derive", @@ -3186,13 +3357,13 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +checksum = "5bb182580f71dd070f88d01ce3de9f4da5021db7115d2e1c3605a754153b77c1" dependencies = [ "bytes", "heck 0.5.0", - "itertools 0.12.1", + "itertools 0.13.0", "log", "multimap", "once_cell", @@ -3201,28 +3372,28 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.66", + "syn 2.0.72", "tempfile", ] [[package]] name = "prost-derive" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" dependencies = [ "prost", ] @@ -3387,14 +3558,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -3408,13 +3579,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -3425,9 +3596,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "ring" @@ -3503,9 +3674,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.8" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "once_cell", "ring", @@ -3517,9 +3688,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3546,16 +3717,16 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-platform-verifier" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d" +checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1" dependencies = [ "core-foundation", "core-foundation-sys", "jni 0.19.0", "log", "once_cell", - "rustls 0.23.8", + "rustls 0.23.12", "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", @@ -3573,9 +3744,9 @@ checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -3653,14 +3824,14 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags", "core-foundation", @@ -3672,9 +3843,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3694,30 +3865,31 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.202" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -3748,9 +3920,9 @@ dependencies = [ [[package]] name = "sha1_smol" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "sha2" @@ -3839,11 +4011,21 @@ dependencies = [ "hex-literal", "hkdf", "hmac", + "rand_core", "sha2", "static_assertions", "thiserror", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core", +] + [[package]] name = "siphasher" version = "0.3.11" @@ -3873,7 +4055,7 @@ checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -3902,12 +4084,45 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "socks5-proto" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d91431c4672e25e372ef46bc554be8f315068c03608f99267a71ad32a12e8c4" +dependencies = [ + "bytes", + "thiserror", + "tokio", +] + +[[package]] +name = "socks5-server" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5223c26981806584cc38c74fddf58808dbdcf4724890471ced69e7a2e8d86345" +dependencies = [ + "async-trait", + "bytes", + "socks5-proto", + "tokio", +] + [[package]] name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -3922,9 +4137,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] @@ -3939,14 +4154,14 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -3961,9 +4176,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -3978,7 +4193,7 @@ checksum = "b5dc35bb08dd1ca3dfb09dce91fd2d13294d6711c88897d9a9d60acf39bce049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -3993,15 +4208,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "termtree" version = "0.4.1" @@ -4026,7 +4232,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4037,7 +4243,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "test-case-core", ] @@ -4047,7 +4253,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" dependencies = [ - "env_logger 0.11.3", + "env_logger", "test-log-macros", "tracing-subscriber", ] @@ -4060,7 +4266,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4074,22 +4280,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4145,9 +4351,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4174,25 +4380,24 @@ dependencies = [ [[package]] name = "tokio" -version = "1.37.0" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-boring" -version = "4.6.0" -source = "git+https://github.com/signalapp/boring?tag=signal-v4.6.0#b9a75167dc08a3b16dd203e0af78c8962c5439bd" +version = "4.9.0" +source = "git+https://github.com/signalapp/boring?tag=signal-v4.9.0#59883d7e23599f6631f9e5087db4b797f2953feb" dependencies = [ "boring", "boring-sys", @@ -4202,13 +4407,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4222,6 +4427,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.15" @@ -4242,7 +4459,19 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.21.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.23.0", ] [[package]] @@ -4266,9 +4495,9 @@ checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.2.6", "toml_datetime", @@ -4301,7 +4530,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4367,6 +4596,25 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "typenum" version = "1.17.0" @@ -4415,12 +4663,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - [[package]] name = "universal-hash" version = "0.5.1" @@ -4439,9 +4681,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -4479,16 +4721,18 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ + "getrandom", + "serde", "sha1_smol", ] @@ -4543,7 +4787,7 @@ dependencies = [ "futures-util", "headers", "http 0.2.12", - "hyper 0.14.28", + "hyper 0.14.30", "log", "mime", "mime_guess", @@ -4557,7 +4801,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-rustls", - "tokio-tungstenite", + "tokio-tungstenite 0.21.0", "tokio-util", "tower-service", "tracing", @@ -4590,7 +4834,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -4612,7 +4856,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4635,9 +4879,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -4710,7 +4954,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4737,7 +4981,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4772,18 +5016,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -4800,9 +5044,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4818,9 +5062,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4836,15 +5080,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4860,9 +5104,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4878,9 +5122,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4896,9 +5140,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4914,9 +5158,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -4939,6 +5183,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + [[package]] name = "yasna" version = "0.5.2" @@ -4948,11 +5198,32 @@ dependencies = [ "time", ] +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -4965,7 +5236,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index 458ca16aad1d3..bee05e01bfb51 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, runCommand, xcodebuild, protobuf, boringssl, darwin }: +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + runCommand, + xcodebuild, + protobuf, + boringssl, + darwin, +}: let # boring-sys expects the static libraries in build/ instead of lib/ boringssl-wrapper = runCommand "boringssl-wrapper" { } '' @@ -12,21 +22,22 @@ rustPlatform.buildRustPackage rec { pname = "libsignal-ffi"; # must match the version used in mautrix-signal # see https://github.com/mautrix/signal/issues/401 - version = "0.52.0"; + version = "0.57.1"; src = fetchFromGitHub { + fetchSubmodules = true; owner = "signalapp"; repo = "libsignal"; rev = "v${version}"; - hash = "sha256-MFTTrIJ9+1NgaL9KD4t0KYR2feHow+HtyYXQWJgKilM="; + hash = "sha256-13XhblN82lbIdv9RVjrabQfCgW1hEG1B6pp3/nQcVgY="; }; - buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ protobuf rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; env.BORING_BSSL_PATH = "${boringssl-wrapper}"; @@ -34,12 +45,15 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "boring-4.6.0" = "sha256-IjkpCKZ4Y1UTrFPg4g/bak+/mJFiyfUyxtTtT5uzcUY="; + "boring-4.9.0" = "sha256-RSpaMzMUXp+WuqqDwLErP5yLT0YhYGoOUWCuSt4jR3I="; "curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A="; }; }; - cargoBuildFlags = [ "-p" "libsignal-ffi" ]; + cargoBuildFlags = [ + "-p" + "libsignal-ffi" + ]; meta = with lib; { description = "C ABI library which exposes Signal protocol logic"; diff --git a/pkgs/by-name/li/libspatialindex/package.nix b/pkgs/by-name/li/libspatialindex/package.nix new file mode 100644 index 0000000000000..c420532351d93 --- /dev/null +++ b/pkgs/by-name/li/libspatialindex/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + fixDarwinDylibNames, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libspatialindex"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "libspatialindex"; + repo = "libspatialindex"; + rev = finalAttrs.version; + hash = "sha256-hZyAXz1ddRStjZeqDf4lYkV/g0JLqLy7+GrSUh75k20="; + }; + + postPatch = '' + patchShebangs test/ + ''; + + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) + + # The cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR + # correctly (setting it to an absolute path causes include files to go to + # $out/$out/include, because the absolute path is interpreted with root + # at $out). + # See: https://github.com/NixOS/nixpkgs/issues/144170 + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + + doCheck = true; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -change "@rpath/libspatialindex.7.dylib" "$out/lib/libspatialindex.7.dylib" $out/lib/libspatialindex_c.dylib + ''; + + meta = { + description = "Extensible spatial index library in C++"; + homepage = "https://libspatialindex.org"; + license = lib.licenses.mit; + maintainers = lib.teams.geospatial.members; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/by-name/li/libtap/package.nix similarity index 100% rename from pkgs/development/libraries/libtap/default.nix rename to pkgs/by-name/li/libtap/package.nix diff --git a/pkgs/by-name/li/libtapi/package.nix b/pkgs/by-name/li/libtapi/package.nix index b11de1756c90a..0e4f3db7611ea 100644 --- a/pkgs/by-name/li/libtapi/package.nix +++ b/pkgs/by-name/li/libtapi/package.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace tapi/test/CMakeLists.txt \ --replace-fail tapi-configs "" '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' # Remove Darwin-specific versioning flags. substituteInPlace tapi/tools/libtapi/CMakeLists.txt \ --replace-fail '-current_version ''${DYLIB_VERSION} -compatibility_version 1' "" diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/by-name/li/libtcod/package.nix similarity index 100% rename from pkgs/development/libraries/libtcod/default.nix rename to pkgs/by-name/li/libtcod/package.nix diff --git a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix index 928f827e32a5b..f5b388ea62700 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - sha256 = "05qm8mcyxsnb6zb8nckln1gkk8ncwzfhsz7d7p3fhx6gdsc8j71b"; + hash = "sha256-KxyJmG7PdOjGPe18Dd3nzKI5X7B0MovWN8vq7llFFRc="; }; enableParallelBuilding = true; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ automake autoconf libtool pkg-config ]; buildInputs = [ boostPython openssl zlib python311 libiconv ncurses ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; preConfigure = "./autotool.sh"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { description = "C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; platforms = platforms.unix; }; } 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 4c76d021a4059..3f85048e4eb71 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 @@ -23,7 +23,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ boostPython openssl zlib python3 ncurses ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; patches = [ # provide distutils alternative for python 3.12 diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix index e930d32190ecf..3f3e5a40ea46d 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent/package.nix @@ -10,18 +10,18 @@ , openssl , pkg-config , zlib -, unstableGitUpdater +, gitUpdater }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rakshasa-libtorrent"; - version = "0.13.8-unstable-2024-08-20"; + version = "0.14.0"; src = fetchFromGitHub { owner = "rakshasa"; repo = "libtorrent"; - rev = "71a487c66b136524bce5519cb1f9e855621a9101"; - hash = "sha256-DRdztKBp16aWYfIpGR7KIjSbveqPTx/CVz5KxT73u7k="; + rev = "v${version}"; + hash = "sha256-MDLAp7KFmVvHL+haWVYwWG8gnLkTh6g19ydRkbu9cIs="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation { zlib ]; - passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libtoxcore/package.nix b/pkgs/by-name/li/libtoxcore/package.nix index 00f145d17292e..6bad88293eb0b 100644 --- a/pkgs/by-name/li/libtoxcore/package.nix +++ b/pkgs/by-name/li/libtoxcore/package.nix @@ -11,7 +11,7 @@ , pkg-config }: -let buildToxAV = !stdenv.isAarch32; +let buildToxAV = !stdenv.hostPlatform.isAarch32; in stdenv.mkDerivation rec { pname = "libtoxcore"; version = "0.2.19"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { fetchurl { url = "https://github.com/TokTok/c-toxcore/releases/download/v${version}/c-toxcore-${version}.tar.gz"; - sha256 = "sha256-i0GPZHDbCFz1mpkVaFYTVWVW3yv0JxSPGBS3sRhihZQ="; + hash = "sha256-i0GPZHDbCFz1mpkVaFYTVWVW3yv0JxSPGBS3sRhihZQ="; }; cmakeFlags = [ diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix index b5b0812d0188a..cc308d86c842f 100644 --- a/pkgs/by-name/li/libui-ng/package.nix +++ b/pkgs/by-name/li/libui-ng/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hash = "sha256-W9LnUBUKwx1x3+BEeUanisBGR2Q4dnbcMM5k8mCondM="; }; - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace meson.build --replace "'-arch', 'arm64'" "" ''; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - if stdenv.isDarwin then [ + if stdenv.hostPlatform.isDarwin then [ darwin.libobjc darwin.apple_sdk_11_0.Libsystem darwin.apple_sdk_11_0.frameworks.Cocoa @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - (lib.mesonBool "examples" (!stdenv.isDarwin)) + (lib.mesonBool "examples" (!stdenv.hostPlatform.isDarwin)) ]; passthru.updateScript = unstableGitUpdater { diff --git a/pkgs/development/libraries/libverto/default.nix b/pkgs/by-name/li/libverto/package.nix similarity index 100% rename from pkgs/development/libraries/libverto/default.nix rename to pkgs/by-name/li/libverto/package.nix diff --git a/pkgs/by-name/li/libvmi/package.nix b/pkgs/by-name/li/libvmi/package.nix new file mode 100644 index 0000000000000..4eb6f54ba3369 --- /dev/null +++ b/pkgs/by-name/li/libvmi/package.nix @@ -0,0 +1,97 @@ +{ + lib, + stdenv, + fetchFromGitHub, + unstableGitUpdater, + autoreconfHook, + autoconf-archive, + bison, + flex, + glib, + pkg-config, + json_c, + libvirt, + + withVMIFS ? true, + fuse, + + legacyKVM ? false, + libkvmi, + + xenSupport ? true, + xen-slim, +}: + +let + pname = "libvmi"; + version = "0.14.0-unstable-2024-09-18"; + libVersion = "0.0.15"; + + src = fetchFromGitHub { + owner = "libvmi"; + repo = "libvmi"; + rev = "60ddb31abee62e9bf323c62d4af6ee59b7e2436a"; + hash = "sha256-IOMfOzp9o2M//GlwOg770aNzPG5IBdc6Omw9O1SEyD4="; + }; +in + +stdenv.mkDerivation { + inherit pname version src; + + outputs = [ + "out" + "lib" + "dev" + ]; + + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + bison + flex + pkg-config + ]; + + buildInputs = + [ + glib + json_c + libvirt + ] + ++ lib.optionals xenSupport [ xen-slim ] + ++ lib.optionals (!legacyKVM) [ libkvmi ] + ++ lib.optionals withVMIFS [ fuse ]; + + configureFlags = + lib.optionals (!xenSupport) [ "--disable-xen" ] + ++ lib.optionals legacyKVM [ "--enable-kvm-legacy" ] + ++ lib.optionals withVMIFS [ "--enable-vmifs" ]; + + # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here + postFixup = lib.optionalString xenSupport '' + libvmi="$lib/lib/libvmi.so.${libVersion}" + oldrpath=$(patchelf --print-rpath "$libvmi") + patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen-slim ]}" "$libvmi" + ''; + + passthru = { + updateScript = unstableGitUpdater { tagPrefix = "v"; }; + inherit libVersion; + }; + + meta = { + description = "C library for virtual machine introspection"; + longDescription = '' + LibVMI is a C library with Python bindings that makes it easy to monitor the low-level + details of a running virtual machine by viewing its memory, trapping on hardware events, + and accessing the vCPU registers. + ''; + homepage = "https://libvmi.com/"; + license = with lib.licenses; [ + gpl3Only + lgpl3Only + ]; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ sigmasquadron ]; + }; +} diff --git a/pkgs/by-name/li/libvpl/package.nix b/pkgs/by-name/li/libvpl/package.nix index ad155189f74d8..e4fb7e0180abe 100644 --- a/pkgs/by-name/li/libvpl/package.nix +++ b/pkgs/by-name/li/libvpl/package.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DENABLE_DRI3=ON" "-DENABLE_DRM=ON" "-DENABLE_VA=ON" diff --git a/pkgs/by-name/li/libxplayer-plparser/package.nix b/pkgs/by-name/li/libxplayer-plparser/package.nix index 67e394968da54..9a1ef21c014e6 100644 --- a/pkgs/by-name/li/libxplayer-plparser/package.nix +++ b/pkgs/by-name/li/libxplayer-plparser/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "6GMKsIpyQdiyHPxrjWHAHvuCouJxrAcYPIo9u6TLOA4="; + hash = "sha256-6GMKsIpyQdiyHPxrjWHAHvuCouJxrAcYPIo9u6TLOA4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libz/default.nix b/pkgs/by-name/li/libz/package.nix similarity index 100% rename from pkgs/development/libraries/libz/default.nix rename to pkgs/by-name/li/libz/package.nix diff --git a/pkgs/by-name/li/license-generator/package.nix b/pkgs/by-name/li/license-generator/package.nix new file mode 100644 index 0000000000000..47dcfc9488e67 --- /dev/null +++ b/pkgs/by-name/li/license-generator/package.nix @@ -0,0 +1,21 @@ +{ lib, fetchCrate, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "license-generator"; + version = "1.3.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-jp7NQfDh512oThZbLj0NbqcH7rxV2R0kDv1wsiTNf/M="; + }; + + cargoHash = "sha256-pjH+i7uG3++NLIZ9y+wg4r+TutmZF2+uO501pdPApQs="; + + meta = with lib; { + description = "Command-line tool for generating license files"; + homepage = "https://github.com/azu/license-generator"; + license = licenses.mit; + maintainers = with maintainers; [ loicreynier ]; + mainProgram = "license-generator"; + }; +} diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix index 8c7485ed0a432..97db16e1fcba6 100644 --- a/pkgs/by-name/li/licensure/package.nix +++ b/pkgs/by-name/li/licensure/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Ywfn+6qdKD9CG2/xdHR2XDsj5LF5XPJ2+XR5H1o2iXk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl git gitls ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/li/lightning/package.nix b/pkgs/by-name/li/lightning/package.nix index f85020499047d..ea99a5873dc82 100644 --- a/pkgs/by-name/li/lightning/package.nix +++ b/pkgs/by-name/li/lightning/package.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; license = with lib.licenses; [ lgpl3Plus ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; # failing tests + 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 a3f5f404593cc..cee6f869d3ccb 100644 --- a/pkgs/by-name/li/lightningcss/package.nix +++ b/pkgs/by-name/li/lightningcss/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "refs/tags/v${version}"; - hash = "sha256-ZPqRxHbca8iflWwsDT2/sVbTstWnKVFcExcgrBXgzGc="; + hash = "sha256-YOTFyIDQIdqnrbXtnnY5U32rk9/fZ+1NcSb3slgkxZU="; }; - cargoHash = "sha256-QYrjDJJTJo4BDQOqY1pZn7ph+uuQvbsMbzaAUr4siaE="; + cargoHash = "sha256-nzRvsdW+PfcS1ocg49JtRQ9RmFJ3iz65plH1ToQXSGU="; patches = [ # Backport fix for build error for lightningcss-napi @@ -48,6 +48,6 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ johnrtitor toastal ]; mainProgram = "lightningcss"; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/li/lightsoff/package.nix b/pkgs/by-name/li/lightsoff/package.nix index 02030cb169ccc..b1c6a82baa015 100644 --- a/pkgs/by-name/li/lightsoff/package.nix +++ b/pkgs/by-name/li/lightsoff/package.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/lightsoff"; + changelog = "https://gitlab.gnome.org/GNOME/lightsoff/-/blob/${version}/NEWS?ref_type=tags"; description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; mainProgram = "lightsoff"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/li/lime3ds/package.nix index 62c70f5b69f63..8dae667a6b548 100644 --- a/pkgs/by-name/li/lime3ds/package.nix +++ b/pkgs/by-name/li/lime3ds/package.nix @@ -7,7 +7,6 @@ , doxygen , enet , fetchzip -, fetchurl , fmt , ffmpeg-headless , gamemode @@ -42,11 +41,11 @@ inherit (lib) optional optionals cmakeBool optionalString getLib makeLibraryPath; in stdenv.mkDerivation (finalAttrs: { pname = "lime3ds"; - version = "2117.1"; + version = "2118.2"; src = fetchzip { url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-v6AHzbuk5n55nTDO0UndtmdhovfY4kngC5TJaNIV5S4="; + hash = "sha256-DovVkk5QolOizV3mfxtMNMeIJWYs3xAu96icrTcQN68="; }; nativeBuildInputs = [ @@ -110,7 +109,7 @@ in stdenv.mkDerivation (finalAttrs: { postInstall = let libs = makeLibraryPath [ vulkan-loader ]; in optionalString enableSdl2Frontend '' - for binfile in lime3ds-gui lime3ds-cli lime3ds-room + for binfile in lime3ds lime3ds-room do wrapProgram "$out/bin/$binfile" \ --prefix LD_LIBRARY_PATH : ${libs} @@ -122,17 +121,19 @@ in stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - (cmakeBool "CITRA_USE_PRECOMPILED_HEADERS" false) - (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) + (cmakeBool "LIME3DS_USE_PRECOMPILED_HEADERS" false) (cmakeBool "USE_SYSTEM_LIBS" true) (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true) (cmakeBool "DISABLE_SYSTEM_GLSLANG" true) (cmakeBool "DISABLE_SYSTEM_LODEPNG" true) (cmakeBool "DISABLE_SYSTEM_VMA" true) (cmakeBool "DISABLE_SYSTEM_XBYAK" true) + (cmakeBool "ENABLE_QT" enableQt) (cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend) (cmakeBool "ENABLE_CUBEB" enableCubeb) (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) + ] ++ optionals enableQt [ + (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) ]; meta = { @@ -140,7 +141,7 @@ in stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Lime3DS/Lime3DS"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ arthsmn ]; - mainProgram = if enableQt then "lime3ds-gui" else "lime3ds-cli"; + mainProgram = "lime3ds"; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index eade9bd2d6316..ea686fac52d5f 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -1,67 +1,117 @@ -# Builds limine with all available features. - +# Derivation containing the Limine host tool and the compiled bootloader { - # Helpers - stdenv -, fetchurl -, lib -, # Dependencies - llvmPackages -, mtools -, nasm + fetchurl, + lib, + llvmPackages_18, + mtools, + nasm, + # The following options map to configure flags. + enableAll ? false, + buildCDs ? false, + targets ? [ ], + # x86 specific flags + biosSupport ? false, + pxeSupport ? false, }: let - version = "7.9.1"; + llvmPackages = llvmPackages_18; + stdenv = llvmPackages.stdenv; + + version = "8.0.13"; + + hasI686 = + (if targets == [ ] then stdenv.hostPlatform.isx86_32 else (builtins.elem "i686" targets)) + || enableAll; + + hasX86_64 = + (if targets == [ ] then stdenv.hostPlatform.isx86_64 else (builtins.elem "x86_64" targets)) + || enableAll; + + uefiFlags = + target: + { + aarch64 = [ "--enable-uefi-aarch64" ]; + i686 = [ "--enable-uefi-ia32" ]; + loongarch64 = [ "--enable-uefi-loongarch64" ]; + riscv64 = [ "--enable-uefi-riscv64" ]; + x86_64 = [ "--enable-uefi-x86-64" ]; + } + .${target} or (throw "Unsupported target ${target}"); + + configureFlags = + lib.optionals enableAll [ "--enable-all" ] + ++ lib.optionals biosSupport [ "--enable-bios" ] + ++ lib.optionals (buildCDs && biosSupport) [ "--enable-bios-cd" ] + ++ lib.optionals buildCDs [ "--enable-uefi-cd" ] + ++ lib.optionals pxeSupport [ "--enable-bios-pxe" ] + ++ lib.concatMap uefiFlags ( + if targets == [ ] then [ stdenv.hostPlatform.parsed.cpu.name ] else targets + ); in + +assert lib.assertMsg (!(biosSupport && !hasI686)) "BIOS builds are possible only for x86"; + +assert lib.assertMsg (!(pxeSupport && !hasI686)) "PXE builds are possible only for x86"; + # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation { - inherit version; + inherit version configureFlags; pname = "limine"; # 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${version}/limine-${version}.tar.gz"; - sha256 = "sha256-cR6ilV5giwvbqUoOGbnXQnqZzUz/oL7OGZPYNoFKvy0="; + hash = "sha256-pg0tAn4YlfEzpyxb9QAAR0PApYmtnafMbIXfhHw+w3k="; }; - nativeBuildInputs = [ - llvmPackages.bintools - # gcc is used for the host tool, while clang is used for the bootloader. - llvmPackages.clang - llvmPackages.lld - mtools - nasm + hardeningDisable = [ + # clang doesn't support this for RISC-V target + "zerocallusedregs" ]; - configureFlags = [ - "--enable-all" - ]; + enableParallelBuilding = true; - installFlags = [ "destdir=$out" "manprefix=/share" ]; + nativeBuildInputs = + [ + llvmPackages.libllvm + llvmPackages.lld + ] + ++ lib.optionals (enableAll || buildCDs) [ + mtools + ] + ++ lib.optionals (hasI686 || hasX86_64) [ nasm ]; - outputs = [ "out" "doc" "dev" "man" ]; + outputs = [ + "out" + "dev" + "doc" + "man" + ]; meta = with lib; { homepage = "https://limine-bootloader.org/"; description = "Limine Bootloader"; + mainProgram = "limine"; + # The platforms on that the Limine binary and helper tools can run, not + # necessarily the platforms for that bootable images can be created. + platforms = platforms.unix; + badPlatforms = platforms.darwin; # Caution. Some submodules have different licenses. license = [ - licenses.bsd2 # limine, flanterm - licenses.bsd0 # freestanding-toolchain, freestanding-headers licenses.asl20 # cc-runtime + licenses.bsd0 # freestanding-toolchain, freestanding-headers + licenses.bsd2 # limine, flanterm licenses.mit # limine-efi, stb licenses.zlib # tinf ]; - # The platforms on that the Liminine binary and helper tools can run, not - # necessarily the platforms for that bootable images can be created. - platforms = platforms.unix; - badPlatforms = platforms.darwin; maintainers = [ maintainers._48cf maintainers.phip1611 + maintainers.sanana + maintainers.surfaceflinger ]; }; } diff --git a/pkgs/by-name/li/linien-gui/package.nix b/pkgs/by-name/li/linien-gui/package.nix index 1321fe076871f..374bb6951dc36 100644 --- a/pkgs/by-name/li/linien-gui/package.nix +++ b/pkgs/by-name/li/linien-gui/package.nix @@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec { pyqt5 superqt linien-client + requests ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 4500de64cb688..d802df0f3c609 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "15.2.9"; + version = "15.2.10"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-qEqjB6GBzKx4zRqumMPSRxFnWQ4j+sBKWTspaeorL6Q="; + hash = "sha256-Mtr3PXV4pSQgtP+RkPmXpDgmW5hFo7a+xb2GAi+wFg4="; }; - npmDepsHash = "sha256-VQ8UDdPIrhiLvDfpAWLMvCtBIhW/LtRj/CC1j2yEm5o="; + npmDepsHash = "sha256-Br/KlvRkr+jFe8y2KEiE38FYrwgSbY5WpvwVOO4LGuQ="; dontNpmBuild = true; diff --git a/pkgs/by-name/li/linux-wifi-hotspot/package.nix b/pkgs/by-name/li/linux-wifi-hotspot/package.nix index d4e1d9f747251..75ab89eef600d 100644 --- a/pkgs/by-name/li/linux-wifi-hotspot/package.nix +++ b/pkgs/by-name/li/linux-wifi-hotspot/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "lakinduakash"; repo = "linux-wifi-hotspot"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-+WHYWQ4EyAt+Kq0LHEgC7Kk5HpIqThz6W3PIdW8Wojk="; + hash = "sha256-+WHYWQ4EyAt+Kq0LHEgC7Kk5HpIqThz6W3PIdW8Wojk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/listmonk/package.nix b/pkgs/by-name/li/listmonk/package.nix index 800540a25ea55..a796a4ac5f314 100644 --- a/pkgs/by-name/li/listmonk/package.nix +++ b/pkgs/by-name/li/listmonk/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "knadh"; repo = "listmonk"; rev = "v${version}"; - sha256 = "sha256-eNX+2ens+mz2V8ZBHtFFHDVbi64AAiiREElMjh67Dd8="; + hash = "sha256-eNX+2ens+mz2V8ZBHtFFHDVbi64AAiiREElMjh67Dd8="; }; vendorHash = "sha256-XAm2VfX1nHWTuAV2COEn8qrqPNv0xbaWgTYCpjrEfMw="; diff --git a/pkgs/by-name/li/listmonk/stuffbin.nix b/pkgs/by-name/li/listmonk/stuffbin.nix index 2640ba8b85197..132a34a017e86 100644 --- a/pkgs/by-name/li/listmonk/stuffbin.nix +++ b/pkgs/by-name/li/listmonk/stuffbin.nix @@ -10,7 +10,7 @@ buildGoModule rec { owner = "knadh"; repo = "stuffbin"; rev = "v${version}"; - sha256 = "sha256-M72xNh7bKUMLzA+M8bJB++kJ5KCrkboQm1v8BasP3Yo="; + hash = "sha256-M72xNh7bKUMLzA+M8bJB++kJ5KCrkboQm1v8BasP3Yo="; }; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index 586fd60ec7b00..fdc95da3a70f3 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "litmusctl"; - version = "1.9.0"; + version = "1.10.0"; nativeBuildInputs = [ installShellFiles @@ -21,7 +21,7 @@ buildGoModule rec { owner = "litmuschaos"; repo = "litmusctl"; rev = "${version}"; - hash = "sha256-6H0trk/ZpUTeHElX8PaYtpYCPiQhQDw2mhuqxDx7pwY="; + hash = "sha256-0I07qgl/yyNAG19eAkZAXh7TkK3V1lnQTPXskF6k/L0="; }; vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0="; diff --git a/pkgs/by-name/li/littlefs-fuse/package.nix b/pkgs/by-name/li/littlefs-fuse/package.nix index a4150b8786b5d..f9a7693084917 100644 --- a/pkgs/by-name/li/littlefs-fuse/package.nix +++ b/pkgs/by-name/li/littlefs-fuse/package.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { mainProgram = "littlefs-fuse"; inherit (fuse.meta) platforms; # fatal error: 'linux/fs.h' file not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix index 1c430cad3be05..c218628eb1625 100644 --- a/pkgs/by-name/li/live-server/package.nix +++ b/pkgs/by-name/li/live-server/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ CoreServices diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index c629ff54ea6fc..c425b9743f89c 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; @@ -74,9 +74,9 @@ stdenv.mkDerivation (finalAttrs: { configurePhase = let platform = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then "macosx-catalina" else throw "Unsupported platform: ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/li/livi/package.nix b/pkgs/by-name/li/livi/package.nix index eec7878794232..daa6084989a44 100644 --- a/pkgs/by-name/li/livi/package.nix +++ b/pkgs/by-name/li/livi/package.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/guidog/livi"; + changelog = "https://gitlab.gnome.org/guidog/livi/-/blob/v${version}/NEWS?ref_type=tags"; description = "Small video player targeting mobile devices (also named μPlayer)"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 454f4b7043991..0dc1fc153a9c2 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -20,7 +20,7 @@ , blas , pkg-config -, metalSupport ? stdenv.isDarwin && stdenv.isAarch64 && !openclSupport +, metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && !openclSupport , vulkanSupport ? false , rpcSupport ? false , shaderc @@ -69,13 +69,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "3645"; + version = "3829"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-Vev4X9wXyTksHop4q9ysym0zEaMBt51CIOqIf5jymK0="; + hash = "sha256-ZveUZ3/aCLC/m9YugnKWpPp6S6wQXkHfVkUkXhJIKAg="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -98,7 +98,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { autoAddDriverRunpath ]; - buildInputs = optionals effectiveStdenv.isDarwin darwinBuildInputs + buildInputs = optionals effectiveStdenv.hostPlatform.isDarwin darwinBuildInputs ++ optionals cudaSupport cudaBuildInputs ++ optionals openclSupport [ clblast ] ++ optionals rocmSupport rocmBuildInputs @@ -163,6 +163,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ dit7ya elohmeier philiptaron ]; platforms = platforms.unix; badPlatforms = optionals (cudaSupport || openclSupport) lib.platforms.darwin; - broken = (metalSupport && !effectiveStdenv.isDarwin); + broken = (metalSupport && !effectiveStdenv.hostPlatform.isDarwin); }; }) diff --git a/pkgs/by-name/ll/llm-ls/fix-time-compilation-failure.patch b/pkgs/by-name/ll/llm-ls/fix-time-compilation-failure.patch new file mode 100644 index 0000000000000..bb7b2b2cb5d35 --- /dev/null +++ b/pkgs/by-name/ll/llm-ls/fix-time-compilation-failure.patch @@ -0,0 +1,97 @@ +From cb0a3da737d933614bcd011e91048f2009036d09 Mon Sep 17 00:00:00 2001 +From: a-kenji <aks.kenji@protonmail.com> +Date: Wed, 14 Aug 2024 09:29:18 +0200 +Subject: [PATCH] Fix `time` compilation failure + +This allows `llm-ls` to be compiled with `rustc --version`: 1.80, using +the Cargo.lock file. + +Reference: https://github.com/rust-lang/rust/issues/127343 +--- + Cargo.lock | 34 ++++++++++++++++++++++++++-------- + 1 file changed, 26 insertions(+), 8 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 1806f0be28f65ab1283954c5a72ae20594044624..e8328e602e50fd5e47ba55c5dc9c7881a308a0a5 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -487,9 +487,12 @@ dependencies = [ + + [[package]] + name = "deranged" +-version = "0.3.8" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] + + [[package]] + name = "derive_builder" +@@ -1210,6 +1213,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num_cpus" + version = "1.16.0" +@@ -1403,6 +1412,12 @@ version = "0.3.27" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -2033,12 +2048,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.28" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -2046,16 +2063,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.14" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + diff --git a/pkgs/by-name/ll/llm-ls/package.nix b/pkgs/by-name/ll/llm-ls/package.nix index 39b0e6e0aae93..c7a0aec58a228 100644 --- a/pkgs/by-name/ll/llm-ls/package.nix +++ b/pkgs/by-name/ll/llm-ls/package.nix @@ -1,8 +1,13 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub +, fetchpatch , pkg-config -, openssl +, libiconv +, darwin +, testers +, llm-ls }: let @@ -16,16 +21,34 @@ rustPlatform.buildRustPackage { owner = "huggingface"; repo = "llm-ls"; rev = version; - sha256 = "sha256-ICMM2kqrHFlKt2/jmE4gum1Eb32afTJkT3IRoqcjJJ8="; + hash = "sha256-ICMM2kqrHFlKt2/jmE4gum1Eb32afTJkT3IRoqcjJJ8="; }; - cargoHash = "sha256-Fat67JxTYIkxkdwGNAyTfnuLt8ofUGVJ2609sbn1frU="; + cargoHash = "sha256-m/w9aJZCCh1rgnHlkGQD/pUDoWn2/WRVt5X4pFx9nC4="; + + cargoPatches = [ + # https://github.com/huggingface/llm-ls/pull/102 + ./fix-time-compilation-failure.patch + (fetchpatch { + name = "fix-version.patch"; + url = "https://github.com/huggingface/llm-ls/commit/479401f3a5173f2917a888c8068f84e29b7dceed.patch?full_index=1"; + hash = "sha256-4gXasfMqlrrP8II+FiV/qGfO7a9qFkDQMiax7yEua5E="; + }) + ]; buildAndTestSubdir = "crates/llm-ls"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ + libiconv + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + passthru.tests.version = testers.testVersion { + package = llm-ls; + }; meta = with lib; { description = "LSP server leveraging LLMs for code completion (and more?)"; @@ -33,7 +56,6 @@ rustPlatform.buildRustPackage { license = licenses.asl20; maintainers = with maintainers; [ jfvillablanca ]; platforms = platforms.all; - badPlatforms = platforms.darwin; mainProgram = "llm-ls"; }; } diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index 778414a5db32e..4b2e56deee8fd 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -16,16 +16,19 @@ zlib, libSM, libICE, + stb, + openssl, }: stdenv.mkDerivation rec { pname = "lms"; - version = "3.51.1"; + version = "3.58.0"; + src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-5lEbrB218EVVHIzo1efvQYybut2OpfDKpLlRs0brhXg="; + hash = "sha256-sWlD/n9Qjwiu/UfZrxRxwv2rc4XwRZN35fyjIriGZPY="; }; strictDeps = true; @@ -46,6 +49,8 @@ stdenv.mkDerivation rec { zlib libSM libICE + stb + openssl ]; postPatch = '' @@ -55,8 +60,6 @@ stdenv.mkDerivation rec { substituteInPlace src/tools/cover/LmsCover.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - postInstall = '' substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/bin/ffmpeg" "${ffmpeg}/bin/ffmpeg" substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/Wt/resources" "${wt}/share/Wt/resources" @@ -75,12 +78,13 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath [libSM libICE]}" ''; - meta = with lib; { + meta = { homepage = "https://github.com/epoupon/lms"; + changelog = "https://github.com/epoupon/lms/releases/tag/${src.rev}"; description = "Lightweight Music Server - Access your self-hosted music using a web interface"; - license = licenses.gpl3Plus; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; mainProgram = "lms"; - maintainers = with maintainers; [ mksafavi ]; + maintainers = with lib.maintainers; [ mksafavi ]; }; } diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index 7c4701e5b2777..bd2fd80824c88 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { inherit meta pname version; src = fetchurl { - url = "https://releases.lmstudio.ai/darwin/arm64/${version}/LM%20Studio-${version}-arm64.dmg"; - hash = "sha256-8m+gLZqX1rz8kVxEo880FKvU046juaO2DneeBg7Sc70="; + url = "https://releases.lmstudio.ai/darwin/arm64/${version}/LM-Studio-${version}-arm64.dmg"; + hash = "sha256-PmXekM7rHY8EIp6l2XiLQlxyIB00MJS5C0gzFfe1i70="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index dafa97ea79e13..6058350f8dd56 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -6,8 +6,8 @@ }: let src = fetchurl { - url = "https://releases.lmstudio.ai/linux/x86/${version}/LM_Studio-${version}.AppImage"; - hash = "sha256-zkTSa0wgKcyKywnIZPF0b6ZzKtyHn3hqjrQPgILF0eI="; + url = "https://releases.lmstudio.ai/linux/x86/${version}/1/LM_Studio-${version}.AppImage"; + hash = "sha256-B+V0MOn/07IEzUXiubO2TG/XvfDZDgttnK/buL/nHQY="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 4e299deb4099d..d69b44d284cff 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -5,7 +5,7 @@ }: let pname = "lmstudio"; - version = "0.3.1"; + version = "0.3.3"; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; @@ -16,7 +16,7 @@ let sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; in - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname version meta; } else callPackage ./linux.nix { inherit pname version meta; } diff --git a/pkgs/by-name/lo/local-ai/lib.nix b/pkgs/by-name/lo/local-ai/lib.nix index 46f3ba88e5db7..bd0cc36d90beb 100644 --- a/pkgs/by-name/lo/local-ai/lib.nix +++ b/pkgs/by-name/lo/local-ai/lib.nix @@ -1,30 +1,39 @@ -{ lib -, writers -, writeText -, linkFarmFromDrvs -}: { - genModels = configs: +{ + lib, + writers, + writeText, + linkFarmFromDrvs, +}: +{ + genModels = + configs: let - name = lib.strings.sanitizeDerivationName - (builtins.concatStringsSep "_" ([ "local-ai-models" ] ++ (builtins.attrNames configs))); + name = lib.strings.sanitizeDerivationName ( + builtins.concatStringsSep "_" ([ "local-ai-models" ] ++ (builtins.attrNames configs)) + ); - genModelFiles = name: config: + genModelFiles = + name: config: let templateName = type: name + "_" + type; - config' = lib.recursiveUpdate config ({ - inherit name; - } // lib.optionalAttrs (lib.isDerivation config.parameters.model) { - parameters.model = config.parameters.model.name; - } // lib.optionalAttrs (config ? template) { - template = builtins.mapAttrs (n: _: templateName n) config.template; - }); + config' = lib.recursiveUpdate config ( + { + inherit name; + } + // lib.optionalAttrs (lib.isDerivation config.parameters.model) { + parameters.model = config.parameters.model.name; + } + // lib.optionalAttrs (config ? template) { + template = builtins.mapAttrs (n: _: templateName n) config.template; + } + ); in [ (writers.writeYAML "${name}.yaml" config') ] - ++ lib.optional (lib.isDerivation config.parameters.model) - config.parameters.model - ++ lib.optionals (config ? template) - (lib.mapAttrsToList (n: writeText "${templateName n}.tmpl") config.template); + ++ lib.optional (lib.isDerivation config.parameters.model) config.parameters.model + ++ lib.optionals (config ? template) ( + lib.mapAttrsToList (n: writeText "${templateName n}.tmpl") config.template + ); in linkFarmFromDrvs name (lib.flatten (lib.mapAttrsToList genModelFiles configs)); } diff --git a/pkgs/by-name/lo/local-ai/module.nix b/pkgs/by-name/lo/local-ai/module.nix index e26a3637820f8..12e8265d0f4d2 100644 --- a/pkgs/by-name/lo/local-ai/module.nix +++ b/pkgs/by-name/lo/local-ai/module.nix @@ -1,4 +1,9 @@ -{ pkgs, config, lib, ... }: +{ + pkgs, + config, + lib, + ... +}: let cfg = config.services.local-ai; inherit (lib) mkOption types; @@ -35,7 +40,13 @@ in }; logLevel = mkOption { - type = types.enum [ "error" "warn" "info" "debug" "trace" ]; + type = types.enum [ + "error" + "warn" + "info" + "debug" + "trace" + ]; default = "warn"; }; }; @@ -46,16 +57,18 @@ in environment.LLAMACPP_PARALLEL = toString cfg.parallelRequests; serviceConfig = { DynamicUser = true; - ExecStart = lib.escapeShellArgs ([ - "${cfg.package}/bin/local-ai" - "--address=:${toString cfg.port}" - "--threads=${toString cfg.threads}" - "--localai-config-dir=." - "--models-path=${cfg.models}" - "--log-level=${cfg.logLevel}" - ] - ++ lib.optional (cfg.parallelRequests > 1) "--parallel-requests" - ++ cfg.extraArgs); + ExecStart = lib.escapeShellArgs ( + [ + "${cfg.package}/bin/local-ai" + "--address=:${toString cfg.port}" + "--threads=${toString cfg.threads}" + "--localai-config-dir=." + "--models-path=${cfg.models}" + "--log-level=${cfg.logLevel}" + ] + ++ lib.optional (cfg.parallelRequests > 1) "--parallel-requests" + ++ cfg.extraArgs + ); RuntimeDirectory = "local-ai"; WorkingDirectory = "%t/local-ai"; }; diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index 84cb788ead4c5..8a1b4394d76a9 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -1,71 +1,87 @@ -{ config -, callPackages -, stdenv -, lib -, addDriverRunpath -, fetchFromGitHub -, protobuf -, protoc-gen-go -, protoc-gen-go-grpc -, grpc -, openssl -, llama-cpp +{ + config, + callPackages, + stdenv, + lib, + addDriverRunpath, + fetchFromGitHub, + protobuf, + protoc-gen-go, + protoc-gen-go-grpc, + grpc, + openssl, + llama-cpp, # needed for audio-to-text -, ffmpeg -, cmake -, pkg-config -, buildGoModule -, makeWrapper -, ncurses -, which + ffmpeg, + cmake, + pkg-config, + buildGoModule, + makeWrapper, + ncurses, + which, -, enable_upx ? true -, upx + enable_upx ? true, + upx, # apply feature parameter names according to # https://github.com/NixOS/rfcs/pull/169 # CPU extensions -, enable_avx ? true -, enable_avx2 ? true -, enable_avx512 ? stdenv.hostPlatform.avx512Support -, enable_f16c ? true -, enable_fma ? true - -, with_openblas ? false -, openblas - -, with_cublas ? config.cudaSupport -, cudaPackages - -, with_clblas ? false -, clblast -, ocl-icd -, opencl-headers - -, with_tinydream ? false # do not compile with cublas -, ncnn - -, with_stablediffusion ? true -, opencv - -, with_tts ? true -, onnxruntime -, sonic -, spdlog -, fmt -, espeak-ng -, piper-tts + enable_avx ? true, + enable_avx2 ? true, + enable_avx512 ? stdenv.hostPlatform.avx512Support, + enable_f16c ? true, + enable_fma ? true, + + with_openblas ? false, + openblas, + + with_cublas ? config.cudaSupport, + cudaPackages, + + with_clblas ? false, + clblast, + ocl-icd, + opencl-headers, + + with_tinydream ? false, # do not compile with cublas + ncnn, + + with_stablediffusion ? true, + opencv, + + with_tts ? true, + onnxruntime, + sonic, + spdlog, + fmt, + espeak-ng, + piper-tts, }: let BUILD_TYPE = - assert (lib.count lib.id [ with_openblas with_cublas with_clblas ]) <= 1; - if with_openblas then "openblas" - else if with_cublas then "cublas" - else if with_clblas then "clblas" - else ""; + assert + (lib.count lib.id [ + with_openblas + with_cublas + with_clblas + ]) <= 1; + if with_openblas then + "openblas" + else if with_cublas then + "cublas" + else if with_clblas then + "clblas" + else + ""; - inherit (cudaPackages) libcublas cuda_nvcc cuda_cccl cuda_cudart libcufft; + inherit (cudaPackages) + libcublas + cuda_nvcc + cuda_cccl + cuda_cudart + libcufft + ; go-llama = effectiveStdenv.mkDerivation { name = "go-llama"; @@ -81,13 +97,21 @@ let "BUILD_TYPE=${BUILD_TYPE}" ]; - buildInputs = [ ] - ++ lib.optionals with_cublas [ cuda_cccl cuda_cudart libcublas ] - ++ lib.optionals with_clblas [ clblast ocl-icd opencl-headers ] + buildInputs = + [ ] + ++ lib.optionals with_cublas [ + cuda_cccl + cuda_cudart + libcublas + ] + ++ lib.optionals with_clblas [ + clblast + ocl-icd + opencl-headers + ] ++ lib.optionals with_openblas [ openblas.dev ]; - nativeBuildInputs = [ cmake ] - ++ lib.optionals with_cublas [ cuda_nvcc ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals with_cublas [ cuda_nvcc ]; dontUseCmakeConfigure = true; @@ -98,82 +122,70 @@ let ''; }; - llama-cpp-rpc = (llama-cpp-grpc.overrideAttrs (prev: { - name = "llama-cpp-rpc"; - cmakeFlags = prev.cmakeFlags ++ [ - (lib.cmakeBool "GGML_AVX" false) - (lib.cmakeBool "GGML_AVX2" false) - (lib.cmakeBool "GGML_AVX512" false) - (lib.cmakeBool "GGML_FMA" false) - (lib.cmakeBool "GGML_F16C" false) - ]; - })).override { - cudaSupport = false; - openclSupport = false; - blasSupport = false; - rpcSupport = true; - }; - - llama-cpp-grpc = (llama-cpp.overrideAttrs (final: prev: { - name = "llama-cpp-grpc"; - src = fetchFromGitHub { - owner = "ggerganov"; - repo = "llama.cpp"; - rev = "ed9d2854c9de4ae1f448334294e61167b04bec2a"; - hash = "sha256-Xu2h9Zu+Q9utfFFmDWBOEu/EXth4xWRNoTMvPF5Fo/A="; - fetchSubmodules = true; - }; - postPatch = prev.postPatch + '' - cd examples - cp -r --no-preserve=mode ${src}/backend/cpp/llama grpc-server - cp llava/clip.* llava/llava.* grpc-server - printf "\nadd_subdirectory(grpc-server)" >> CMakeLists.txt - - cp ${src}/backend/backend.proto grpc-server - sed -i grpc-server/CMakeLists.txt \ - -e '/get_filename_component/ s;[.\/]*backend/;;' \ - -e '$a\install(TARGETS ''${TARGET} RUNTIME)' - cd .. - ''; - cmakeFlags = prev.cmakeFlags ++ [ - (lib.cmakeBool "BUILD_SHARED_LIBS" false) - (lib.cmakeBool "GGML_AVX" enable_avx) - (lib.cmakeBool "GGML_AVX2" enable_avx2) - (lib.cmakeBool "GGML_AVX512" enable_avx512) - (lib.cmakeBool "GGML_FMA" enable_fma) - (lib.cmakeBool "GGML_F16C" enable_f16c) - ]; - buildInputs = prev.buildInputs ++ [ - protobuf # provides also abseil_cpp as propagated build input - grpc - openssl - ]; - })).override { - cudaSupport = with_cublas; - rocmSupport = false; - openclSupport = with_clblas; - blasSupport = with_openblas; - }; - - gpt4all = stdenv.mkDerivation { - name = "gpt4all"; - src = fetchFromGitHub { - owner = "nomic-ai"; - repo = "gpt4all"; - rev = "27a8b020c36b0df8f8b82a252d261cda47cf44b8"; - hash = "sha256-djq1eK6ncvhkO3MNDgasDBUY/7WWcmZt/GJsHAulLdI="; - fetchSubmodules = true; - }; - makeFlags = [ "-C gpt4all-bindings/golang" ]; - buildFlags = [ "libgpt4all.a" ]; - dontUseCmakeConfigure = true; - nativeBuildInputs = [ cmake ]; - installPhase = '' - mkdir $out - tar cf - --exclude=CMakeFiles . \ - | tar xf - -C $out - ''; - }; + llama-cpp-rpc = + (llama-cpp-grpc.overrideAttrs (prev: { + name = "llama-cpp-rpc"; + cmakeFlags = prev.cmakeFlags ++ [ + (lib.cmakeBool "GGML_AVX" false) + (lib.cmakeBool "GGML_AVX2" false) + (lib.cmakeBool "GGML_AVX512" false) + (lib.cmakeBool "GGML_FMA" false) + (lib.cmakeBool "GGML_F16C" false) + ]; + })).override + { + cudaSupport = false; + openclSupport = false; + blasSupport = false; + rpcSupport = true; + }; + + llama-cpp-grpc = + (llama-cpp.overrideAttrs ( + final: prev: { + name = "llama-cpp-grpc"; + src = fetchFromGitHub { + owner = "ggerganov"; + repo = "llama.cpp"; + rev = "fc54ef0d1c138133a01933296d50a36a1ab64735"; + hash = "sha256-o87EhrA2Oa98pwyb6GSUgwERY0/GWJiX7kvlxDv4zb4="; + fetchSubmodules = true; + }; + postPatch = + prev.postPatch + + '' + cd examples + cp -r --no-preserve=mode ${src}/backend/cpp/llama grpc-server + cp llava/clip.* llava/llava.* grpc-server + printf "\nadd_subdirectory(grpc-server)" >> CMakeLists.txt + + cp ${src}/backend/backend.proto grpc-server + sed -i grpc-server/CMakeLists.txt \ + -e '/get_filename_component/ s;[.\/]*backend/;;' \ + -e '$a\install(TARGETS ''${TARGET} RUNTIME)' + cd .. + ''; + cmakeFlags = prev.cmakeFlags ++ [ + (lib.cmakeBool "BUILD_SHARED_LIBS" false) + (lib.cmakeBool "GGML_AVX" enable_avx) + (lib.cmakeBool "GGML_AVX2" enable_avx2) + (lib.cmakeBool "GGML_AVX512" enable_avx512) + (lib.cmakeBool "GGML_FMA" enable_fma) + (lib.cmakeBool "GGML_F16C" enable_f16c) + ]; + buildInputs = prev.buildInputs ++ [ + protobuf # provides also abseil_cpp as propagated build input + grpc + openssl + ]; + } + )).override + { + cudaSupport = with_cublas; + rocmSupport = false; + openclSupport = with_clblas; + blasSupport = with_openblas; + }; espeak-ng' = espeak-ng.overrideAttrs (self: { name = "espeak-ng'"; @@ -199,8 +211,14 @@ let name = "piper-phonemize"; inherit (go-piper) src; sourceRoot = "${go-piper.src.name}/piper-phonemize"; - buildInputs = [ espeak-ng' onnxruntime ]; - nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + espeak-ng' + onnxruntime + ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; cmakeFlags = [ (lib.cmakeFeature "ONNXRUNTIME_DIR" "${onnxruntime.dev}") (lib.cmakeFeature "ESPEAK_NG_DIR" "${espeak-ng'}") @@ -240,7 +258,15 @@ let -e '/CXXFLAGS *= / s;$; -DSPDLOG_FMT_EXTERNAL=1;' ''; buildFlags = [ "libpiper_binding.a" ]; - buildInputs = [ piper-tts' espeak-ng' piper-phonemize sonic fmt spdlog onnxruntime ]; + buildInputs = [ + piper-tts' + espeak-ng' + piper-phonemize + sonic + fmt + spdlog + onnxruntime + ]; installPhase = '' cp -r --no-preserve=mode $src $out mkdir -p $out/piper-phonemize/pi @@ -273,16 +299,28 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = "6739eb83c3ca5cf40d24c6fe8442a761a1eb6248"; - hash = "sha256-1yDdJVjIwYDJKn93zn4xOJXMoDTqaG2TvakjdHIMCxk="; + rev = "9e3c5345cd46ea718209db53464e426c3fe7a25e"; + hash = "sha256-JOptyveuaKRLzeZ6GuB3A70IM7dk4we95g5o25XVXJI="; }; - nativeBuildInputs = [ cmake pkg-config ] - ++ lib.optionals with_cublas [ cuda_nvcc ]; - - buildInputs = [ ] - ++ lib.optionals with_cublas [ cuda_cccl cuda_cudart libcublas libcufft ] - ++ lib.optionals with_clblas [ clblast ocl-icd opencl-headers ] + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals with_cublas [ cuda_nvcc ]; + + buildInputs = + [ ] + ++ lib.optionals with_cublas [ + cuda_cccl + cuda_cudart + libcublas + libcufft + ] + ++ lib.optionals with_clblas [ + clblast + ocl-icd + opencl-headers + ] ++ lib.optionals with_openblas [ openblas.dev ]; cmakeFlags = [ @@ -379,25 +417,26 @@ let meta.broken = lib.versionOlder go-tiny-dream.stdenv.cc.version "13"; }; - GO_TAGS = lib.optional with_tinydream "tinydream" + GO_TAGS = + lib.optional with_tinydream "tinydream" ++ lib.optional with_tts "tts" ++ lib.optional with_stablediffusion "stablediffusion"; effectiveStdenv = if with_cublas then - # It's necessary to consistently use backendStdenv when building with CUDA support, - # otherwise we get libstdc++ errors downstream. + # It's necessary to consistently use backendStdenv when building with CUDA support, + # otherwise we get libstdc++ errors downstream. cudaPackages.backendStdenv else stdenv; pname = "local-ai"; - version = "2.19.4"; + version = "2.20.1"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-aKq6/DI+4+BvIEw6eONqPr3mZXuz7rMFN+FBypVj0Gc="; + hash = "sha256-FeZZC0Tg9JT9Yj0e27GOLSdHEtWl17AHK3j7epwPyY8="; }; prepare-sources = @@ -407,53 +446,67 @@ let '' mkdir sources ${cp} ${go-llama} sources/go-llama.cpp - ${cp} ${gpt4all} sources/gpt4all ${cp} ${if with_tts then go-piper else go-piper.src} sources/go-piper ${cp} ${go-rwkv} sources/go-rwkv.cpp ${cp} ${whisper-cpp.src} sources/whisper.cpp cp ${whisper-cpp}/lib/lib*.a sources/whisper.cpp ${cp} ${go-bert} sources/go-bert.cpp - ${cp} ${if with_stablediffusion then go-stable-diffusion else go-stable-diffusion.src} sources/go-stable-diffusion + ${cp} ${ + if with_stablediffusion then go-stable-diffusion else go-stable-diffusion.src + } sources/go-stable-diffusion ${cp} ${if with_tinydream then go-tiny-dream else go-tiny-dream.src} sources/go-tiny-dream ''; self = buildGoModule.override { stdenv = effectiveStdenv; } { inherit pname version src; - vendorHash = "sha256-HEKE75+ixuNbM+KEuhbQQ/NYYEzVlGYOttPavftWKhk="; + vendorHash = "sha256-mDxp5frUIECSHKjxaJVqIP7mnIusvdT45Xlxc9+P5tE="; env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4"; - postPatch = '' - sed -i Makefile \ - -e '/mod download/ d' \ - -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-fallback/ d' \ - -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-avx/ d' \ - -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-cuda/ d' \ + postPatch = + '' + sed -i Makefile \ + -e '/mod download/ d' \ + -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-fallback/ d' \ + -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-avx/ d' \ + -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-cuda/ d' \ - '' + lib.optionalString with_cublas '' - sed -i Makefile \ - -e '/^CGO_LDFLAGS_WHISPER?=/ s;$;-L${libcufft}/lib -L${cuda_cudart}/lib;' - ''; + '' + + lib.optionalString with_cublas '' + sed -i Makefile \ + -e '/^CGO_LDFLAGS_WHISPER?=/ s;$;-L${libcufft}/lib -L${cuda_cudart}/lib;' + ''; - postConfigure = prepare-sources + '' - shopt -s extglob - mkdir -p backend-assets/grpc - cp ${llama-cpp-grpc}/bin/grpc-server backend-assets/grpc/llama-cpp-avx2 - cp ${llama-cpp-rpc}/bin/grpc-server backend-assets/grpc/llama-cpp-grpc + postConfigure = + prepare-sources + + '' + shopt -s extglob + mkdir -p backend-assets/grpc + cp ${llama-cpp-grpc}/bin/grpc-server backend-assets/grpc/llama-cpp-avx2 + cp ${llama-cpp-rpc}/bin/grpc-server backend-assets/grpc/llama-cpp-grpc - mkdir -p backend/cpp/llama/llama.cpp + mkdir -p backend/cpp/llama/llama.cpp - mkdir -p backend-assets/util - cp ${llama-cpp-rpc}/bin/llama-rpc-server backend-assets/util/llama-cpp-rpc-server + mkdir -p backend-assets/util + cp ${llama-cpp-rpc}/bin/llama-rpc-server backend-assets/util/llama-cpp-rpc-server - # avoid rebuild of prebuilt make targets - touch backend-assets/grpc/* backend-assets/util/* sources/**/lib*.a - ''; + # avoid rebuild of prebuilt make targets + touch backend-assets/grpc/* backend-assets/util/* sources/**/lib*.a + ''; - buildInputs = [ ] - ++ lib.optionals with_cublas [ cuda_cudart libcublas libcufft ] - ++ lib.optionals with_clblas [ clblast ocl-icd opencl-headers ] + buildInputs = + [ ] + ++ lib.optionals with_cublas [ + cuda_cudart + libcublas + libcufft + ] + ++ lib.optionals with_clblas [ + clblast + ocl-icd + opencl-headers + ] ++ lib.optionals with_openblas [ openblas.dev ] ++ lib.optionals with_stablediffusion go-stable-diffusion.buildInputs ++ lib.optionals with_tts go-piper.buildInputs; @@ -465,16 +518,16 @@ let makeWrapper ncurses # tput which - ] - ++ lib.optional enable_upx upx - ++ lib.optionals with_cublas [ cuda_nvcc ]; + ] ++ lib.optional enable_upx upx ++ lib.optionals with_cublas [ cuda_nvcc ]; enableParallelBuilding = false; - modBuildPhase = prepare-sources + '' - make protogen-go - go mod tidy -v - ''; + modBuildPhase = + prepare-sources + + '' + make protogen-go + go mod tidy -v + ''; proxyVendor = true; @@ -482,12 +535,13 @@ let # containing spaces env.GO_TAGS = builtins.concatStringsSep " " GO_TAGS; - makeFlags = [ - "VERSION=v${version}" - "BUILD_TYPE=${BUILD_TYPE}" - ] - ++ lib.optional with_cublas "CUDA_LIBPATH=${cuda_cudart}/lib" - ++ lib.optional with_tts "PIPER_CGO_CXXFLAGS=-DSPDLOG_FMT_EXTERNAL=1"; + makeFlags = + [ + "VERSION=v${version}" + "BUILD_TYPE=${BUILD_TYPE}" + ] + ++ lib.optional with_cublas "CUDA_LIBPATH=${cuda_cudart}/lib" + ++ lib.optional with_tts "PIPER_CGO_CXXFLAGS=-DSPDLOG_FMT_EXTERNAL=1"; buildPhase = '' runHook preBuild @@ -516,18 +570,25 @@ let # raises an segmentation fault postFixup = let - LD_LIBRARY_PATH = [ ] + LD_LIBRARY_PATH = + [ ] ++ lib.optionals with_cublas [ - # driverLink has to be first to avoid loading the stub version of libcuda.so - # https://github.com/NixOS/nixpkgs/issues/320145#issuecomment-2190319327 - addDriverRunpath.driverLink - (lib.getLib libcublas) - cuda_cudart - ] - ++ lib.optionals with_clblas [ clblast ocl-icd ] + # driverLink has to be first to avoid loading the stub version of libcuda.so + # https://github.com/NixOS/nixpkgs/issues/320145#issuecomment-2190319327 + addDriverRunpath.driverLink + (lib.getLib libcublas) + cuda_cudart + ] + ++ lib.optionals with_clblas [ + clblast + ocl-icd + ] ++ lib.optionals with_openblas [ openblas ] ++ lib.optionals with_tts [ piper-phonemize ] - ++ lib.optionals (with_tts && enable_upx) [ fmt spdlog ]; + ++ lib.optionals (with_tts && enable_upx) [ + fmt + spdlog + ]; in '' wrapProgram $out/bin/${pname} \ @@ -537,15 +598,30 @@ let passthru.local-packages = { inherit - go-tiny-dream go-rwkv go-bert go-llama gpt4all go-piper - llama-cpp-grpc whisper-cpp go-tiny-dream-ncnn espeak-ng' piper-phonemize - piper-tts' llama-cpp-rpc; + go-tiny-dream + go-rwkv + go-bert + go-llama + go-piper + llama-cpp-grpc + whisper-cpp + go-tiny-dream-ncnn + espeak-ng' + piper-phonemize + piper-tts' + llama-cpp-rpc + ; }; passthru.features = { inherit - with_cublas with_openblas with_tts with_stablediffusion - with_tinydream with_clblas; + with_cublas + with_openblas + with_tts + with_stablediffusion + with_tinydream + with_clblas + ; }; passthru.tests = callPackages ./tests.nix { inherit self; }; @@ -555,7 +631,10 @@ let description = "OpenAI alternative to run local LLMs, image and audio generation"; homepage = "https://localai.io"; license = licenses.mit; - maintainers = with maintainers; [ onny ck3d ]; + maintainers = with maintainers; [ + onny + ck3d + ]; platforms = platforms.linux; }; }; diff --git a/pkgs/by-name/lo/local-ai/tests.nix b/pkgs/by-name/lo/local-ai/tests.nix index 17119d2b250e5..eebc357489c7f 100644 --- a/pkgs/by-name/lo/local-ai/tests.nix +++ b/pkgs/by-name/lo/local-ai/tests.nix @@ -1,23 +1,26 @@ -{ self -, lib -, testers -, fetchzip -, fetchurl -, writers -, symlinkJoin -, jq -, prom2json +{ + self, + lib, + testers, + fetchzip, + fetchurl, + writers, + symlinkJoin, + jq, + prom2json, }: let - common-config = { config, ... }: { - imports = [ ./module.nix ]; - services.local-ai = { - enable = true; - package = self; - threads = config.virtualisation.cores; - logLevel = "debug"; + common-config = + { config, ... }: + { + imports = [ ./module.nix ]; + services.local-ai = { + enable = true; + package = self; + threads = config.virtualisation.cores; + logLevel = "debug"; + }; }; - }; inherit (self.lib) genModels; in @@ -52,7 +55,7 @@ in # Note: q4_0 and q4_1 models can not be loaded parameters.model = fetchurl { url = "https://huggingface.co/skeskinen/ggml/resolve/main/all-MiniLM-L6-v2/ggml-model-f16.bin"; - sha256 = "9c195b2453a4fef60a4f6be3a88a39211366214df6498a4fe4885c9e22314f50"; + hash = "sha256-nBlbJFOk/vYKT2vjqIo5IRNmIU32SYpP5IhcniIxT1A="; }; backend = "bert-embeddings"; embeddings = true; @@ -73,7 +76,9 @@ in virtualisation.memorySize = 2048; services.local-ai.models = models; }; - passthru = { inherit models requests; }; + passthru = { + inherit models requests; + }; testScript = let port = "8080"; @@ -93,7 +98,8 @@ in ''; }; -} // lib.optionalAttrs (!self.features.with_cublas && !self.features.with_clblas) { +} +// lib.optionalAttrs (!self.features.with_cublas && !self.features.with_clblas) { # https://localai.io/docs/getting-started/manual/ llama = let @@ -107,7 +113,7 @@ in # https://ai.meta.com/blog/meta-llama-3-1/ model = fetchurl { url = "https://huggingface.co/lmstudio-community/Meta-Llama-3.1-8B-Instruct-GGUF/resolve/main/Meta-Llama-3.1-8B-Instruct-Q4_K_M.gguf"; - sha256 = "f2be3e1a239c12c9f3f01a962b11fb2807f8032fdb63b0a5502ea42ddef55e44"; + hash = "sha256-8r4+GiOcEsnz8BqWKxH7KAf4Ay/bY7ClUC6kLd71XkQ="; }; # defaults from: # https://deepinfra.com/meta-llama/Meta-Llama-3.1-8B-Instruct @@ -146,7 +152,12 @@ in # https://localai.io/features/text-generation/#chat-completions chat-completions = { inherit model; - messages = [{ role = "user"; content = "1 + 2 = ?"; }]; + messages = [ + { + role = "user"; + content = "1 + 2 = ?"; + } + ]; }; # https://localai.io/features/text-generation/#edit-completions edit-completions = { @@ -172,7 +183,9 @@ in # TODO: Add test case parallel requests services.local-ai.parallelRequests = 2; }; - passthru = { inherit models requests; }; + passthru = { + inherit models requests; + }; testScript = let port = "8080"; @@ -196,80 +209,88 @@ in machine.succeed("curl -f http://localhost:${port}/v1/completions --json @${writers.writeJSON "request-completions.json" requests.completions} --output completions.json") machine.copy_from_vm("completions.json") machine.succeed("${jq}/bin/jq --exit-status 'debug | .object ==\"text_completion\"' completions.json") - machine.succeed("${jq}/bin/jq --exit-status '.usage.completion_tokens | debug == ${toString model-configs.${model}.parameters.max_tokens}' completions.json") + machine.succeed("${jq}/bin/jq --exit-status '.usage.completion_tokens | debug == ${ + toString model-configs.${model}.parameters.max_tokens + }' completions.json") machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json") machine.copy_from_vm("metrics.json") ''; }; -} // lib.optionalAttrs (self.features.with_tts && !self.features.with_cublas && !self.features.with_clblas) { - # https://localai.io/features/text-to-audio/#piper - tts = - let - model-stt = "whisper-en"; - model-configs.${model-stt} = { - backend = "whisper"; - parameters.model = fetchurl { - url = "https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-tiny.en-q5_1.bin"; - hash = "sha256-x3xXZvHO8JtrfUfyG1Rsvd1BV4hrO11tT3CekeZsfCs="; - }; - }; +} +// + lib.optionalAttrs + (self.features.with_tts && !self.features.with_cublas && !self.features.with_clblas) + { + # https://localai.io/features/text-to-audio/#piper + tts = + let + model-stt = "whisper-en"; + model-configs.${model-stt} = { + backend = "whisper"; + parameters.model = fetchurl { + url = "https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-tiny.en-q5_1.bin"; + hash = "sha256-x3xXZvHO8JtrfUfyG1Rsvd1BV4hrO11tT3CekeZsfCs="; + }; + }; - model-tts = "piper-en"; - model-configs.${model-tts} = { - backend = "piper"; - parameters.model = "en-us-danny-low.onnx"; - }; + model-tts = "piper-en"; + model-configs.${model-tts} = { + backend = "piper"; + parameters.model = "en-us-danny-low.onnx"; + }; - models = - let - models = genModels model-configs; - in - symlinkJoin { - inherit (models) name; - paths = [ - models - (fetchzip { - url = "https://github.com/rhasspy/piper/releases/download/v0.0.2/voice-en-us-danny-low.tar.gz"; - hash = "sha256-5wf+6H5HeQY0qgdqnAG1vSqtjIFM9lXH53OgouuPm0M="; - stripRoot = false; - }) - ]; - }; + models = + let + models = genModels model-configs; + in + symlinkJoin { + inherit (models) name; + paths = [ + models + (fetchzip { + url = "https://github.com/rhasspy/piper/releases/download/v0.0.2/voice-en-us-danny-low.tar.gz"; + hash = "sha256-5wf+6H5HeQY0qgdqnAG1vSqtjIFM9lXH53OgouuPm0M="; + stripRoot = false; + }) + ]; + }; - requests.request = { - model = model-tts; - input = "Hello, how are you?"; - }; - in - testers.runNixOSTest { - name = self.name + "-tts"; - nodes.machine = { - imports = [ common-config ]; - virtualisation.cores = 2; - services.local-ai.models = models; - }; - passthru = { inherit models requests; }; - testScript = - let - port = "8080"; + requests.request = { + model = model-tts; + input = "Hello, how are you?"; + }; in - '' - machine.wait_for_open_port(${port}) - machine.succeed("curl -f http://localhost:${port}/readyz") - machine.succeed("curl -f http://localhost:${port}/v1/models --output models.json") - machine.succeed("${jq}/bin/jq --exit-status 'debug' models.json") + testers.runNixOSTest { + name = self.name + "-tts"; + nodes.machine = { + imports = [ common-config ]; + virtualisation.cores = 2; + services.local-ai.models = models; + }; + passthru = { + inherit models requests; + }; + testScript = + let + port = "8080"; + in + '' + machine.wait_for_open_port(${port}) + machine.succeed("curl -f http://localhost:${port}/readyz") + machine.succeed("curl -f http://localhost:${port}/v1/models --output models.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug' models.json") - machine.succeed("curl -f http://localhost:${port}/tts --json @${writers.writeJSON "request.json" requests.request} --output out.wav") - machine.copy_from_vm("out.wav") + machine.succeed("curl -f http://localhost:${port}/tts --json @${writers.writeJSON "request.json" requests.request} --output out.wav") + machine.copy_from_vm("out.wav") - machine.succeed("curl -f http://localhost:${port}/v1/audio/transcriptions --header 'Content-Type: multipart/form-data' --form file=@out.wav --form model=${model-stt} --output transcription.json") - machine.copy_from_vm("transcription.json") - machine.succeed("${jq}/bin/jq --exit-status 'debug | .segments | first.text == \"${requests.request.input}\"' transcription.json") + machine.succeed("curl -f http://localhost:${port}/v1/audio/transcriptions --header 'Content-Type: multipart/form-data' --form file=@out.wav --form model=${model-stt} --output transcription.json") + machine.copy_from_vm("transcription.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .segments | first.text == \"${requests.request.input}\"' transcription.json") - machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json") - machine.copy_from_vm("metrics.json") - ''; - }; -} + machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json") + machine.copy_from_vm("metrics.json") + ''; + }; + } diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix index 504500cad7aa0..b2cb74054cc1b 100644 --- a/pkgs/by-name/lo/localsend/package.nix +++ b/pkgs/by-name/lo/localsend/package.nix @@ -112,4 +112,4 @@ let ]; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/lo/logiops/package.nix b/pkgs/by-name/lo/logiops/package.nix index 283f09eae41a9..3ffaf371d4bf3 100644 --- a/pkgs/by-name/lo/logiops/package.nix +++ b/pkgs/by-name/lo/logiops/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (oldAttrs: { pname = "logiops"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "PixlOne"; repo = "logiops"; rev = "v${oldAttrs.version}"; - hash = "sha256-IL7jQA3lGhxVLYCFRgeXdadaBlQr+Op9cedHBlLUCWY="; + hash = "sha256-GAnlPqjIFGyOWwYFs7gth2m9ITc1jyiaW0sWwQ2zFOs="; # In v0.3.0, the `ipcgull` submodule was added as a dependency # https://github.com/PixlOne/logiops/releases/tag/v0.3.0 fetchSubmodules = true; diff --git a/pkgs/by-name/lo/logiops_0_2_3/package.nix b/pkgs/by-name/lo/logiops_0_2_3/package.nix index c62e3bf9e320d..d57328cf1431e 100644 --- a/pkgs/by-name/lo/logiops_0_2_3/package.nix +++ b/pkgs/by-name/lo/logiops_0_2_3/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "pixlone"; repo = "logiops"; rev = "v${version}"; - sha256 = "sha256-1v728hbIM2ODtB+r6SYzItczRJCsbuTvhYD2OUM1+/E="; + hash = "sha256-1v728hbIM2ODtB+r6SYzItczRJCsbuTvhYD2OUM1+/E="; }; PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index 72bedaf64f368..06fc0d3fd0a3f 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -33,21 +33,21 @@ in { src = fetchurl { inherit hash; url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-${suffix}"; - name = lib.optionalString stdenv.isLinux "logseq-${version}.AppImage"; + name = lib.optionalString stdenv.hostPlatform.isLinux "logseq-${version}.AppImage"; }; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ] - ++ lib.optionals stdenv.isDarwin [ unzip ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; buildInputs = [ stdenv.cc.cc.lib ]; - dontUnpack = stdenv.isLinux; + dontUnpack = stdenv.hostPlatform.isLinux; dontConfigure = true; dontBuild = true; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isLinux ( + '' + lib.optionalString stdenv.hostPlatform.isLinux ( let appimageContents = appimageTools.extract { inherit pname src version; }; in @@ -68,7 +68,7 @@ in { substituteInPlace $out/share/applications/logseq.desktop \ --replace Exec=Logseq Exec=logseq \ --replace Icon=Logseq Icon=logseq - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications/Logseq.app,bin} cp -R . $out/Applications/Logseq.app makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq @@ -76,7 +76,7 @@ in { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs makeWrapper ${electron}/bin/electron $out/bin/logseq \ --set "LOCAL_GIT_DIRECTORY" ${git} \ @@ -92,7 +92,7 @@ in { changelog = "https://github.com/logseq/logseq/releases/tag/${version}"; license = lib.licenses.agpl3Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ cheeseecake ]; platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; mainProgram = "logseq"; }; diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/by-name/lo/lolcode/package.nix similarity index 100% rename from pkgs/development/interpreters/lolcode/default.nix rename to pkgs/by-name/lo/lolcode/package.nix diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index c5de24d28958c..19b3d5b486144 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/loupe"; + changelog = "https://gitlab.gnome.org/GNOME/loupe/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Simple image viewer application written with GTK4 and Rust"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jk ] ++ teams.gnome.members; diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 668e1e2d1a255..1852a7dc39907 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -19,19 +19,26 @@ , udev , wayland , xorgproto +, nix-update-script }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "louvre"; - version = "2.2.0-1"; - rev = "v${self.version}"; - hash = "sha256-Ds1TTxHFq0Z88djdpAunhtKAipOCTodKIKOh5oxF568="; + version = "2.9.0-1"; src = fetchFromGitHub { - inherit (self) rev hash; owner = "CuarzoSoftware"; repo = "Louvre"; + rev = "v${finalAttrs.version}"; + hash = "sha256-0M1Hl5kF8r4iFflkGBb9CWqwzauSZPVKSRNWZKFZC4U="; }; + sourceRoot = "${finalAttrs.src.name}/src"; + + postPatch = '' + substituteInPlace examples/meson.build \ + --replace-fail "/usr/local/share/wayland-sessions" "${placeholder "out"}/share/wayland-sessions" + ''; + nativeBuildInputs = [ meson ninja @@ -58,10 +65,9 @@ stdenv.mkDerivation (self: { outputs = [ "out" "dev" ]; - preConfigure = '' - # The root meson.build file is in src/ - cd src - ''; + passthru = { + updateScript = nix-update-script { }; + }; meta = { description = "C++ library for building Wayland compositors"; diff --git a/pkgs/by-name/lp/lpairs2/package.nix b/pkgs/by-name/lp/lpairs2/package.nix index 99a74382569a7..f4ae2ad7fa173 100644 --- a/pkgs/by-name/lp/lpairs2/package.nix +++ b/pkgs/by-name/lp/lpairs2/package.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "lpairs2"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/lp/lprint/package.nix b/pkgs/by-name/lp/lprint/package.nix index eb7353142c6c1..c5bb996b63a0d 100644 --- a/pkgs/by-name/lp/lprint/package.nix +++ b/pkgs/by-name/lp/lprint/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "michaelrsweet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1OOLGQ8S4oRNSJanX/AzJ+g5F+jYnE/+o+ie5ucY22U="; + hash = "sha256-1OOLGQ8S4oRNSJanX/AzJ+g5F+jYnE/+o+ie5ucY22U="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/by-name/lp/lprobe/package.nix b/pkgs/by-name/lp/lprobe/package.nix new file mode 100644 index 0000000000000..e0f24d96a7182 --- /dev/null +++ b/pkgs/by-name/lp/lprobe/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + libpcap, +}: + +buildGoModule rec { + pname = "lprobe"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "fivexl"; + repo = "lprobe"; + rev = "refs/tags/v${version}"; + hash = "sha256-q7lH0aLgQNM4jrrrq2ua+pt4/VknxlzKzDH5J4MwjfA="; + }; + + vendorHash = "sha256-B3lcE33Ny+XE7nK/QlVcV8yYgzYWNBfoecuL+AcavSk="; + + buildInputs = [ + libpcap + ]; + + meta = { + description = "A command-line tool to perform Local Health Check Probes inside Container Images (ECS, Docker)"; + homepage = "https://github.com/fivexl/lprobe"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ cageyv ]; + mainProgram = "lprobe"; + }; +} diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix index 40da20efbccec..0d77c2d09f226 100644 --- a/pkgs/by-name/lr/lrcget/package.nix +++ b/pkgs/by-name/lr/lrcget/package.nix @@ -69,11 +69,11 @@ rustPlatform.buildRustPackage rec { openssl gtk3 ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ webkitgtk alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreAudio darwin.apple_sdk.frameworks.WebKit ]; diff --git a/pkgs/by-name/ls/lsd/package.nix b/pkgs/by-name/ls/lsd/package.nix index 8cdf45c90d5ad..9be5a2ef0dd6b 100644 --- a/pkgs/by-name/ls/lsd/package.nix +++ b/pkgs/by-name/ls/lsd/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { pandoc ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postInstall = '' pandoc --standalone --to man doc/lsd.md -o lsd.1 diff --git a/pkgs/by-name/ls/lsd2dsl/package.nix b/pkgs/by-name/ls/lsd2dsl/package.nix index 4ab26b40a7c2e..95663588edaeb 100644 --- a/pkgs/by-name/ls/lsd2dsl/package.nix +++ b/pkgs/by-name/ls/lsd2dsl/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qt6.wrapQtAppsHook - ] ++ lib.optional stdenv.isLinux copyDesktopItems; + ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ boost diff --git a/pkgs/by-name/ls/lsp-ai/Cargo.lock b/pkgs/by-name/ls/lsp-ai/Cargo.lock new file mode 100644 index 0000000000000..226906ae4e6ac --- /dev/null +++ b/pkgs/by-name/ls/lsp-ai/Cargo.lock @@ -0,0 +1,4264 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" + +[[package]] +name = "assert_cmd" +version = "2.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" +dependencies = [ + "anstyle", + "bstr", + "doc-comment", + "predicates", + "predicates-core", + "predicates-tree", + "wait-timeout", +] + +[[package]] +name = "async-trait" +version = "0.1.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "auto_enums" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1899bfcfd9340ceea3533ea157360ba8fa864354eccbceab58e1006ecab35393" +dependencies = [ + "derive_utils", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.4.2", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.52", + "which", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +dependencies = [ + "serde", +] + +[[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 0.4.6", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +dependencies = [ + "jobserver", + "libc", + "once_cell", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.4", +] + +[[package]] +name = "clang-sys" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c937d4061031a6d0c8da4b9a4f98a172fc2976dfb1c19213a9cf7d0d3c837e36" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85379ba512b21a328adf887e85f7742d12e96eb31f3ef077df4ffc26b506ffed" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[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 = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +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.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[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 = "ctrlc" +version = "3.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +dependencies = [ + "nix", + "windows-sys 0.52.0", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +dependencies = [ + "darling_core 0.20.9", + "darling_macro 0.20.9", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.52", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +dependencies = [ + "darling_core 0.20.9", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] +name = "derive_utils" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[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" +dependencies = [ + "serde", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.6", + "regex-syntax 0.8.2", +] + +[[package]] +name = "h2" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.2.5", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.3", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hf-hub" +version = "0.3.2" +source = "git+https://github.com/huggingface/hf-hub#6303587576f8a1ce9f91f8274265a153b89afb6e" +dependencies = [ + "dirs", + "http 1.1.0", + "indicatif", + "log", + "native-tls", + "rand", + "serde", + "serde_json", + "thiserror", + "ureq", +] + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.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 0.4.6", + "same-file", + "walkdir", + "winapi-util", +] + +[[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.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", + "rayon", + "serde", +] + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "inherent" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "inquire" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33e7c1ddeb15c9abcbfef6029d8e29f69b52b6d6c891031b88ed91b5065803b" +dependencies = [ + "bitflags 1.3.2", + "crossterm", + "dyn-clone", + "lazy_static", + "newline-converter", + "thiserror", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.4", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "llama-cpp-2" +version = "0.1.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60ea3a10607d6d4417e221b5da470d0bed4591a7c020c7941a4ec4d437e37554" +dependencies = [ + "llama-cpp-sys-2", + "thiserror", + "tracing", +] + +[[package]] +name = "llama-cpp-sys-2" +version = "0.1.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c99197ef99dd5049767e3b64c10a6c752a6ba3bef95b13064ab1b796c2c92a8a" +dependencies = [ + "bindgen", + "cc", + "once_cell", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lopdf" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07c8e1b6184b1b32ea5f72f572ebdc40e5da1d2921fa469947ff7c480ad1f85a" +dependencies = [ + "chrono", + "encoding_rs", + "flate2", + "itoa", + "linked-hash-map", + "log", + "md5", + "nom", + "rayon", + "time", + "weezl", +] + +[[package]] +name = "lsp-ai" +version = "0.7.0" +dependencies = [ + "anyhow", + "assert_cmd", + "async-trait", + "cc", + "clap", + "directories", + "futures", + "fxhash", + "hf-hub", + "ignore", + "indexmap 2.2.5", + "llama-cpp-2", + "lsp-server", + "lsp-types", + "md5", + "minijinja", + "once_cell", + "ordered-float", + "parking_lot", + "pgml", + "rand", + "rayon", + "regex", + "reqwest", + "ropey", + "serde", + "serde_json", + "simsimd", + "splitter-tree-sitter", + "text-splitter", + "tokenizers", + "tokio", + "tracing", + "tracing-subscriber", + "tree-sitter", + "utils-tree-sitter", + "xxhash-rust", +] + +[[package]] +name = "lsp-server" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095" +dependencies = [ + "crossbeam-channel", + "log", + "serde", + "serde_json", +] + +[[package]] +name = "lsp-types" +version = "0.95.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984" +dependencies = [ + "bitflags 1.3.2", + "serde", + "serde_json", + "serde_repr", + "url", +] + +[[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memo-map" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374c335b2df19e62d4cb323103473cbc6510980253119180de862d89184f6a83" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minijinja" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe0ff215195a22884d867b547c70a0c4815cbbcc70991f281dca604b20d10ce" +dependencies = [ + "memo-map", + "self_cell", + "serde", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[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 = "monostate" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "878c2a1f1c70e5724fa28f101ca787b6a7e8ad5c5e4ae4ca3b0fa4a419fa9075" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f686d68a09079e63b1d2c64aa305095887ce50565f00a922ebfaeeee0d9ba6ce" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "newline-converter" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f71d09d5c87634207f894c6b31b6a2b2c64ea3bdcf71bd5599fdbbe1600c00f" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "300.2.3+3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" +dependencies = [ + "num-traits", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pgml" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94d4491d88033630eaf6e125d890051e1dc6481ebbcb5b3a41fc69028102291b" +dependencies = [ + "anyhow", + "async-trait", + "chrono", + "clap", + "colored", + "ctrlc", + "futures", + "indicatif", + "inquire", + "is-terminal", + "itertools 0.10.5", + "lopdf", + "md5", + "once_cell", + "parking_lot", + "regex", + "reqwest", + "sea-query", + "sea-query-binder", + "serde", + "serde_json", + "serde_with", + "sqlx", + "tokio", + "tracing", + "tracing-subscriber", + "url", + "uuid", + "walkdir", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "predicates" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +dependencies = [ + "anstyle", + "difflib", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" + +[[package]] +name = "predicates-tree" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "prettyplease" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +dependencies = [ + "proc-macro2", + "syn 2.0.52", +] + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.6", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reqwest" +version = "0.11.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "ropey" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5" +dependencies = [ + "smallvec", + "str_indices", +] + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pki-types" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sea-query" +version = "0.30.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4166a1e072292d46dc91f31617c2a1cdaf55a8be4b5c9f4bf2ba248e3ac4999b" +dependencies = [ + "inherent", + "sea-query-attr", + "sea-query-derive", + "serde_json", + "uuid", +] + +[[package]] +name = "sea-query-attr" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "878cf3d57f0e5bfacd425cdaccc58b4c06d68a7b71c63fc28710a20c88676808" +dependencies = [ + "darling 0.14.4", + "heck 0.4.1", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "sea-query-binder" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36bbb68df92e820e4d5aeb17b4acd5cc8b5d18b2c36a4dd6f4626aabfa7ab1b9" +dependencies = [ + "sea-query", + "serde_json", + "sqlx", + "uuid", +] + +[[package]] +name = "sea-query-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a82fcb49253abcb45cdcb2adf92956060ec0928635eb21b4f7a6d8f25ab0bc" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.52", + "thiserror", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "self_cell" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "serde_json" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.5", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +dependencies = [ + "darling 0.20.9", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simsimd" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efc843bc8f12d9c8e6b734a0fe8918fc497b42f6ae0f347dbfdad5b5138ab9b4" +dependencies = [ + "cc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "socks" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" +dependencies = [ + "byteorder", + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "splitter-tree-sitter" +version = "0.1.0" +dependencies = [ + "cc", + "thiserror", + "tree-sitter", + "tree-sitter-rust", + "tree-sitter-zig", +] + +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "sqlformat" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" +dependencies = [ + "itertools 0.12.1", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +dependencies = [ + "ahash", + "atoi", + "byteorder", + "bytes", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.2.5", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls 0.21.10", + "rustls-pemfile", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "time", + "tokio", + "tokio-stream", + "tracing", + "url", + "uuid", + "webpki-roots 0.25.4", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +dependencies = [ + "dotenvy", + "either", + "heck 0.4.1", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.4.2", + "byteorder", + "bytes", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.4.2", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "time", + "tracing", + "url", + "urlencoding", + "uuid", +] + +[[package]] +name = "str_indices" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9557cb6521e8d009c51a8666f09356f4b817ba9ba0981a305bd86aee47bd35c" + +[[package]] +name = "stringprep" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +dependencies = [ + "finl_unicode", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.52", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[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.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tempfile" +version = "3.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 = "text-splitter" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab9dc04b7cf08eb01c07c272bf699fa55679a326ddf7dd075e14094efc80fb9" +dependencies = [ + "ahash", + "auto_enums", + "either", + "itertools 0.13.0", + "once_cell", + "regex", + "strum", + "thiserror", + "unicode-segmentation", +] + +[[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.52", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokenizers" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9be88c795d8b9f9c4002b3a8f26a6d0876103a6f523b32ea3bac52d8560c17c" +dependencies = [ + "aho-corasick", + "clap", + "derive_builder", + "esaxx-rs", + "getrandom", + "indicatif", + "itertools 0.11.0", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax 0.7.5", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] +name = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[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-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-bash" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5244703ad2e08a616d859a0557d7aa290adcd5e0990188a692e628ffe9dce40" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-c" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f956d5351d62652864a4ff3ae861747e7a1940dc96c9998ae400ac0d3ce30427" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-c-sharp" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff899037068a1ffbb891891b7e94db1400ddf12c3d934b85b8c9e30be5cd18da" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-cpp" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537b7e0f0d8c89b8dd6f4d195814da94832f20720c09016c2a3ac3dc3c437993" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-css" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2f806f96136762b0121f5fdd7172a3dcd8f42d37a2f23ed7f11b35895e20eb4" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-elixir" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df94bf7f057768b1cab2ee1f14812ed4ae33f9e04d09254043eeaa797db4ef70" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-erlang" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8db61152e6d8a5b3b5895ecbb85848f85d028f84b4633a2368075c35e5817b34" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-go" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cb318be5ccf75f44e054acf6898a5c95d59b53443eed578e16be0cd7ec037f" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-haskell" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef25a7e6c73cc1cbe0c0b7dbd5406e7b3485b370bd61c5d8d852ae0781f9bf9a" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-html" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b3492b08a786bf5cc79feb0ef2ff3b115d5174364e0ddfd7860e0b9b088b53" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-java" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33bc21adf831a773c075d9d00107ab43965e6a6ea7607b47fd9ec6f3db4b481b" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-javascript" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fced510d43e6627cd8e19adfd994ac9cfa3b1d71b0d522b41f74145de37feef" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-json" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b737dcb73c35d74b7d64a5f3dde158113c86a012bf3cee2bfdf2150d23b05db" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-lua" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9fe6fc87bd480e1943fc1fcb02453fb2da050e4e8ce0daa67d801544046856" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-ocaml" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2f2e8e848902d12ca6778d31d0e66b5709fc1ad0c84fd8b0c078472fff20dd2" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-python" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4066c6cf678f962f8c2c4561f205945c84834cce73d981e71392624fdc390a9" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-rust" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "277690f420bf90741dea984f3da038ace46c4fe6047cba57a66822226cde1c93" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-zig" +version = "0.0.1" +source = "git+https://github.com/maxxnino/tree-sitter-zig#7c5a29b721d409be8842017351bf007d7e384401" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[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-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" +dependencies = [ + "base64 0.21.7", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls 0.22.2", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "serde", + "serde_json", + "socks", + "url", + "webpki-roots 0.26.1", +] + +[[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", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "utils-tree-sitter" +version = "0.1.0" +dependencies = [ + "cc", + "thiserror", + "tree-sitter", + "tree-sitter-bash", + "tree-sitter-c", + "tree-sitter-c-sharp", + "tree-sitter-cpp", + "tree-sitter-css", + "tree-sitter-elixir", + "tree-sitter-erlang", + "tree-sitter-go", + "tree-sitter-haskell", + "tree-sitter-html", + "tree-sitter-java", + "tree-sitter-javascript", + "tree-sitter-json", + "tree-sitter-lua", + "tree-sitter-ocaml", + "tree-sitter-python", + "tree-sitter-rust", +] + +[[package]] +name = "uuid" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.52", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall", + "wasite", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "write-json" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23f6174b2566cc4a74f95e1367ec343e7fa80c93cc8087f5c4a3d6a1088b2118" + +[[package]] +name = "xflags" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d9e15fbb3de55454b0106e314b28e671279009b363e6f1d8e39fdc3bf048944" +dependencies = [ + "xflags-macros", +] + +[[package]] +name = "xflags-macros" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "672423d4fea7ffa2f6c25ba60031ea13dc6258070556f125cc4d790007d4a155" + +[[package]] +name = "xshell" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db0ab86eae739efd1b054a8d3d16041914030ac4e01cd1dca0cf252fd8b6437" +dependencies = [ + "xshell-macros", +] + +[[package]] +name = "xshell-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852" + +[[package]] +name = "xtask" +version = "0.1.0" +dependencies = [ + "anyhow", + "flate2", + "time", + "write-json", + "xflags", + "xshell", + "zip", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", + "time", +] diff --git a/pkgs/by-name/ls/lsp-ai/package.nix b/pkgs/by-name/ls/lsp-ai/package.nix new file mode 100644 index 0000000000000..3e5a1b1c390d8 --- /dev/null +++ b/pkgs/by-name/ls/lsp-ai/package.nix @@ -0,0 +1,88 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, + pkg-config, + cmake, + openssl, + zlib, + perl, + gitUpdater, +}: + +rustPlatform.buildRustPackage rec { + pname = "lsp-ai"; + version = "0.7.1"; + src = fetchFromGitHub { + owner = "SilasMarvin"; + repo = "lsp-ai"; + rev = "refs/tags/v${version}"; + hash = "sha256-mBbaJn4u+Wlu/Y4G4a6YUBWnmN143INAGm0opiAjnIk="; + }; + + checkFlags = [ + # These integ tests require an account and network usage to work + "--skip=transformer_backends::open_ai::test::open_ai_completion_do_generate" + "--skip=transformer_backends::mistral_fim::test::mistral_fim_do_generate" + "--skip=transformer_backends::anthropic::test::anthropic_chat_do_generate" + "--skip=transformer_backends::open_ai::test::open_ai_chat_do_generate" + "--skip=transformer_backends::gemini::test::gemini_chat_do_generate" + "--skip=transformer_backends::ollama::test::ollama_chat_do_generate" + "--skip=transformer_backends::ollama::test::ollama_completion_do_generate" + "--skip=embedding_models::ollama::test::ollama_embeding" + "--skip=transformer_worker::tests::test_do_completion" + "--skip=transformer_worker::tests::test_do_generate" + "--skip=memory_backends::vector_store::tests::can_open_document" + "--skip=memory_backends::vector_store::tests::can_rename_document" + "--skip=memory_backends::vector_store::tests::can_build_prompt" + "--skip=memory_backends::vector_store::tests::can_change_document" + # These integ test require a LLM server to be running over the network + "--skip=lsp_ai::transformer_worker" + "--skip=lsp_ai::memory_worker" + "--skip=test_chat_sequence" + "--skip=test_completion_action_sequence" + "--skip=test_chat_completion_sequence" + "--skip=test_completion_sequence" + "--skip=test_fim_completion_sequence" + "--skip=test_refactor_action_sequence" + ]; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "hf-hub-0.3.2" = "sha256-1AcishEVkTzO3bU0/cVBI2hiCFoQrrPduQ1diMHuEwo="; + "tree-sitter-zig-0.0.1" = "sha256-UXJCh8GvXzn+sssTrIsLViXD3TiBZhLFABYCKM+fNMQ="; + }; + }; + + nativeBuildInputs = [ + pkg-config + cmake + perl + ]; + + buildInputs = + [ + openssl + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + darwin.apple_sdk.frameworks.CoreServices + ]; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = { + description = "Open-source language server that serves as a backend for AI-powered functionality"; + homepage = "https://github.com/SilasMarvin/lsp-ai"; + mainProgram = "lsp-ai"; + changelog = "https://github.com/SilasMarvin/lsp-ai/releases/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ projectinitiative ]; + }; +} diff --git a/pkgs/by-name/lt/ltris/package.nix b/pkgs/by-name/lt/ltris/package.nix index 82137b2fbec64..cb0da370cd8f4 100644 --- a/pkgs/by-name/lt/ltris/package.nix +++ b/pkgs/by-name/lt/ltris/package.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ltris"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (SDL.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/development/tools/luaformatter/fix-lib-paths.patch b/pkgs/by-name/lu/luaformatter/fix-lib-paths.patch similarity index 100% rename from pkgs/development/tools/luaformatter/fix-lib-paths.patch rename to pkgs/by-name/lu/luaformatter/fix-lib-paths.patch diff --git a/pkgs/by-name/lu/luaformatter/package.nix b/pkgs/by-name/lu/luaformatter/package.nix new file mode 100644 index 0000000000000..963d00991bc5f --- /dev/null +++ b/pkgs/by-name/lu/luaformatter/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + substituteAll, + antlr4_9, + libargs, + catch2, + cmake, + yaml-cpp, +}: +let + antlr4 = antlr4_9; +in +stdenv.mkDerivation rec { + pname = "luaformatter"; + version = "1.3.6"; + + src = fetchFromGitHub { + owner = "Koihik"; + repo = "LuaFormatter"; + rev = version; + sha256 = "14l1f9hrp6m7z3cm5yl0njba6gfixzdirxjl8nihp9val0685vm0"; + }; + + patches = [ + (substituteAll { + src = ./fix-lib-paths.patch; + antlr4RuntimeCpp = antlr4.runtime.cpp.dev; + inherit libargs catch2 yaml-cpp; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + antlr4.runtime.cpp + yaml-cpp + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.isDarwin && stdenv.isx86_64 + ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; + + meta = with lib; { + description = "Code formatter for Lua"; + homepage = "https://github.com/Koihik/LuaFormatter"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "lua-format"; + }; +} diff --git a/pkgs/by-name/lu/luarocks-packages-updater/package.nix b/pkgs/by-name/lu/luarocks-packages-updater/package.nix index 617bfa1057fbc..0659cd25aaf8e 100644 --- a/pkgs/by-name/lu/luarocks-packages-updater/package.nix +++ b/pkgs/by-name/lu/luarocks-packages-updater/package.nix @@ -4,10 +4,6 @@ , lib , nix-prefetch-scripts , luarocks-nix -, lua5_1 -, lua5_2 -, lua5_3 -, lua5_4 , pluginupdate }: let @@ -16,52 +12,44 @@ let nix nix-prefetch-scripts luarocks-nix ]; - luaversions = [ - lua5_1 - lua5_2 - lua5_3 - lua5_4 - ]; - + attrs = builtins.fromTOML (builtins.readFile ./pyproject.toml); + pname = attrs.project.name; + inherit (attrs.project) version; in + python3Packages.buildPythonApplication { - pname = "luarocks-packages-updater"; - version = "0.1"; + inherit pname version; + pyproject = true; - format = "other"; + src = lib.cleanSource ./.; - nativeBuildInputs = [ - makeWrapper - python3Packages.wrapPython + build-system = [ + python3Packages.setuptools ]; - propagatedBuildInputs = [ + + dependencies = [ python3Packages.gitpython ]; - dontUnpack = true; - - installPhase = - '' - mkdir -p $out/bin $out/lib - cp ${./updater.py} $out/bin/luarocks-packages-updater - cp ${pluginupdate} $out/lib/pluginupdate.py - - # wrap python scripts - makeWrapperArgs+=( --prefix PATH : "${path}" --prefix PYTHONPATH : "$out/lib" \ - --set LUA_51 ${lua5_1} \ - --set LUA_52 ${lua5_2} \ - --set LUA_53 ${lua5_3} \ - --set LUA_54 ${lua5_4} - ) - wrapPythonProgramsIn "$out" + postFixup = '' + echo "pluginupdate folder ${pluginupdate}" + wrapProgram $out/bin/luarocks-packages-updater \ + --prefix PYTHONPATH : "${pluginupdate}" \ + --prefix PATH : "${path}" ''; shellHook = '' - export PYTHONPATH="maintainers/scripts:$PYTHONPATH" + export PYTHONPATH="maintainers/scripts/pluginupdate-py:$PYTHONPATH" export PATH="${path}:$PATH" ''; - meta.mainProgram = "luarocks-packages-updater"; + meta = { + inherit (attrs.project) description; + license = lib.licenses.gpl3Only; + homepage = attrs.project.urls.Homepage; + mainProgram = "luarocks-packages-updater"; + maintainers = with lib.maintainers; [ teto ]; + }; } diff --git a/pkgs/by-name/lu/luarocks-packages-updater/pyproject.toml b/pkgs/by-name/lu/luarocks-packages-updater/pyproject.toml new file mode 100644 index 0000000000000..0f19ce5f832c7 --- /dev/null +++ b/pkgs/by-name/lu/luarocks-packages-updater/pyproject.toml @@ -0,0 +1,19 @@ +[build-system] +build-backend = "setuptools.build_meta" +requires = [ "setuptools" ] + +[project] +name = "luarocks-packages-updater" +version = "0.0.1" +description = """ +Module to update luarocks-packages""" + +[project.urls] +Homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/lu/luarocks-packages-updater" + +[project.scripts] +luarocks-packages-updater = "updater:main" + +[tool.ruff] +line-length = 120 +indent-width = 4 diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py index 335e15c444276..91194879b875e 100755 --- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py +++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py @@ -50,7 +50,7 @@ class LuaPlugin: name: str """Name of the plugin, as seen on luarocks.org""" rockspec: str - """Full path towards the rockspec""" + """Full URI towards the rockspec""" ref: Optional[str] """git reference (branch name/tag)""" version: Optional[str] @@ -60,7 +60,7 @@ class LuaPlugin: Its value can be 'http://luarocks.org/dev' """ luaversion: Optional[str] - """Attribue of the lua interpreter if a package is available only for a specific lua version""" + """lua version if a package is available only for a specific lua version""" maintainers: Optional[str] """ Optional string listing maintainers separated by spaces""" diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index 504490b825266..b9566d04a12e4 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "lubelogger"; - version = "1.3.6"; + version = "1.3.8"; src = fetchFromGitHub { owner = "hargata"; repo = "lubelog"; rev = "v${version}"; - hash = "sha256-gfnfxm/xxFx77UnEinr+D8GoIN/KMz3BEbjpCYqQ6as="; + hash = "sha256-f9lj2Er0gQpptzmLpZsxR8hSU6kJlJkwHwpZ7wAq6bk="; }; projectFile = "CarCareTracker.sln"; diff --git a/pkgs/by-name/lu/luckybackup/package.nix b/pkgs/by-name/lu/luckybackup/package.nix new file mode 100644 index 0000000000000..7fe889178cf78 --- /dev/null +++ b/pkgs/by-name/lu/luckybackup/package.nix @@ -0,0 +1,72 @@ +{ + lib, + fetchurl, + libtool, + openssh, + pkg-config, + qt5, + rsync, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "luckybackup"; + version = "0.5.0"; + + src = fetchurl { + url = "mirror://sourceforge/project/luckybackup/${finalAttrs.version}/source/luckybackup-${finalAttrs.version}.tar.gz"; + hash = "sha256-6AGvJIPL3WK8mvji3tJSxRrbrYFILikQQvWOIcPUkls="; + }; + + outputs = [ + "out" + "doc" + "man" + ]; + + nativeBuildInputs = [ + libtool + pkg-config + qt5.qmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + rsync + openssh + ]; + + strictDeps = true; + + prePatch = '' + for File in \ + luckybackup.pro \ + menu/luckybackup-pkexec \ + menu/luckybackup-su.desktop \ + menu/luckybackup.desktop \ + menu/net.luckybackup.su.policy \ + src/functions.cpp \ + src/global.cpp \ + src/scheduleDialog.cpp; do + substituteInPlace $File --replace "/usr" "$out" + done + ''; + + meta = { + homepage = "https://luckybackup.sourceforge.net/"; + description = "Powerful, fast and reliable backup & sync tool"; + longDescription = '' + luckyBackup is an application for data back-up and synchronization + powered by the rsync tool. + + It is simple to use, fast (transfers over only changes made and not + all data), safe (keeps your data safe by checking all declared directories + before proceeding in any data manipulation), reliable and fully + customizable. + ''; + license = lib.licenses.gpl3Plus; + mainProgram = "luckybackup"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/lu/lumafly/package.nix b/pkgs/by-name/lu/lumafly/package.nix index 14227990c4902..24e45cb087083 100644 --- a/pkgs/by-name/lu/lumafly/package.nix +++ b/pkgs/by-name/lu/lumafly/package.nix @@ -5,24 +5,20 @@ dotnetCorePackages, zlib, icu, - fontconfig, openssl, - libX11, - libICE, - libSM, icoutils, copyDesktopItems, makeDesktopItem, }: buildDotnetModule rec { pname = "lumafly"; - version = "3.2.0.0"; + version = "3.3.0.0"; src = fetchFromGitHub { owner = "TheMulhima"; repo = "lumafly"; rev = "v${version}"; - hash = "sha256-oDSM5Ev9SCjbvCgDZcpzm2bVnzG04yy/WaSwJyh0b18="; + hash = "sha256-GVPMAwxbq9XlKjMKd9G5yUol42f+6lSyHukN7NMCVDA="; }; projectFile = "Lumafly/Lumafly.csproj"; @@ -36,11 +32,7 @@ buildDotnetModule rec { runtimeDeps = [ zlib icu - fontconfig openssl - libX11 - libICE - libSM ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix index bb03aae9a2700..1fcc9ed4e745d 100644 --- a/pkgs/by-name/lu/lunacy/package.nix +++ b/pkgs/by-name/lu/lunacy/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lunacy"; - version = "9.6.2"; + version = "10.0.1"; src = fetchurl { url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb"; - hash = "sha256-iTne+vUnv+O/+QUKgSUr+ACdZpXrvRQkZmqghJH1fDw="; + hash = "sha256-roD/bKv1N2sru/tZ6Zl1J2AyY1mgj2ssB2a42kwBNHM="; }; unpackCmd = '' diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index d061aa3e593b1..0b5a93a1f52b2 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -6,17 +6,18 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.2.16"; + version = "3.2.19"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-p+a7zirfM4rR4CPsXGa6jPhh0sFvoQN1O/roSZYA+qbhhtRS0MgnvuSN6EKdH37M5cF2KoNOqfapWE3PWWK19A=="; + hash = "sha512-OLXp355IxMmhLtsxNVj0/ykl2lGJtwu1Ti3TOJZ1dwTsx/Y+tdeFT+WeDAju9fMC2AssciUnAeqqdp76sHxUgw=="; }; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/lunarclient \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -Dm444 ${contents}/lunarclient.desktop -t $out/share/applications/ diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix index beac59da3af4f..5c1cd965ef22b 100644 --- a/pkgs/by-name/lu/lutgen/package.nix +++ b/pkgs/by-name/lu/lutgen/package.nix @@ -1,38 +1,41 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, stdenv -, installShellFiles +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + installShellFiles, }: rustPlatform.buildRustPackage rec { pname = "lutgen"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "ozwaldorf"; repo = "lutgen-rs"; rev = "v${version}"; - hash = "sha256-Rj6y8ZiNWQsGn8B+iNMZvuE/U2703oYbJW+ZSdV3fl4="; + hash = "sha256-ybaapL9OUUQ+sO8P0JH1MuxCFmTihKp9gXJpM7KLY7U="; }; - cargoHash = "sha256-7yNr6Zc5A7rj6sUnplo2gB2xNUgZ3TLwUuBEfVKZfIQ="; + cargoHash = "sha256-Fxecnq7QKcDe6aAsKj9uye3sFdfkgFEKYmdqnvQDiAQ="; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd lutgen \ - --bash <($out/bin/lutgen completions bash) \ - --fish <($out/bin/lutgen completions fish) \ - --zsh <($out/bin/lutgen completions zsh) + --bash <($out/bin/lutgen --bpaf-complete-style-bash) \ + --fish <($out/bin/lutgen --bpaf-complete-style-fish) \ + --zsh <($out/bin/lutgen --bpaf-complete-style-zsh) ''; meta = with lib; { description = "Blazingly fast interpolated LUT generator and applicator for arbitrary and popular color palettes"; homepage = "https://github.com/ozwaldorf/lutgen-rs"; - maintainers = with maintainers; [ zzzsy donovanglover ]; + maintainers = with maintainers; [ + ozwaldorf + zzzsy + donovanglover + ]; mainProgram = "lutgen"; license = licenses.mit; }; diff --git a/pkgs/applications/window-managers/lwm/default.nix b/pkgs/by-name/lw/lwm/package.nix similarity index 100% rename from pkgs/applications/window-managers/lwm/default.nix rename to pkgs/by-name/lw/lwm/package.nix diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index 08d4967d8342e..ea066fc7ba3d1 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "lx-music-desktop"; - maintainers = with maintainers; [ oo-infty ]; + maintainers = with maintainers; [ oosquare ]; }; } diff --git a/pkgs/by-name/lx/lxc/package.nix b/pkgs/by-name/lx/lxc/package.nix index 409e550109f23..3f00ccb82b523 100644 --- a/pkgs/by-name/lx/lxc/package.nix +++ b/pkgs/by-name/lx/lxc/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxc"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "lxc"; repo = "lxc"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-fJMNdMXlV1z9q1pMDh046tNmLDuK6zh6uPahTWzWMvc="; + hash = "sha256-qc60oSs2KahQJpSmhrctXpV2Zumv7EvlnGFaOCSCX/E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix index db006cea566d9..7b7516ba72c67 100644 --- a/pkgs/by-name/lx/lxcfs/package.nix +++ b/pkgs/by-name/lx/lxcfs/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxcfs"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "v${version}"; - sha256 = "sha256-kJ9QaNI8v03E0//UyU6fsav1YGOlKGMxsbE8Pr1Dtic="; + hash = "sha256-5r1X/yUXTMC/2dNhpI+BVYeClIydefg2lurCGt7iA8Y="; }; patches = [ diff --git a/pkgs/by-name/lx/lxgw-fusionkai/package.nix b/pkgs/by-name/lx/lxgw-fusionkai/package.nix new file mode 100644 index 0000000000000..99c7a8e3e37f2 --- /dev/null +++ b/pkgs/by-name/lx/lxgw-fusionkai/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, +}: + +stdenvNoCC.mkDerivation rec { + pname = "lxgw-fusionkai"; + version = "24.134"; + + src = fetchFromGitHub { + owner = "lxgw"; + repo = "FusionKai"; + rev = "v${version}"; + hash = "sha256-pEISoFEsv8SJOGa2ud/nV1yvl8T9kakfKENu3mfYA5A="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/lxgw/FusionKai"; + description = "Simplified Chinese font derived from LXGW WenKai GB, iansui and Klee One"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ hellodword ]; + }; +} diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index 36a502d9855ad..72480f5c108aa 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.201"; + version = "1.207"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-2w25Jvbx7u9O0azsvLSX1TxfXANVNdfzjfNALhsxUZI="; + hash = "sha256-voFR2qkomj1CRv4OWtrYJmpVxoUl6db/HnkaobCmBzY="; }; dontUnpack = true; diff --git a/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix b/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix new file mode 100644 index 0000000000000..8719113c429a1 --- /dev/null +++ b/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix @@ -0,0 +1,31 @@ +{ + stdenvNoCC, + fetchurl, + lib, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "lxgw-wenkai-screen"; + version = "1.330"; + + src = fetchurl { + url = "https://github.com/lxgw/LxgwWenKai-Screen/releases/download/v${finalAttrs.version}/LXGWWenKaiScreen.ttf"; + hash = "sha256-3C6gZmL5Bn6+26TfI2UdCCnGI8Vw4UTFJRc8n6qlP5o="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + install -Dm644 "$src" "$out/share/fonts/truetype/LXGWWenKaiScreen.ttf" + runHook postInstall + ''; + + meta = { + description = "LXGW WenKai font optimized for screen reading"; + homepage = "https://github.com/lxgw/LxgwWenKai-Screen"; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ lebensterben ]; + }; +}) diff --git a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix index fc8bb799930fb..113d1c17b9336 100644 --- a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix @@ -5,10 +5,10 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai-tc"; - version = "1.330"; + version = "1.500"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/lxgw-wenkai-tc-v${version}.tar.gz"; - hash = "sha256-qpX5shH1HbGMa287u/R1rMFgQeAUC0wwKFVD+QSTyho="; + hash = "sha256-GuGIRgBQTmlKmarEVFmZ2RgYtlw6mz3nfFdWbjlm934="; }; installPhase = '' diff --git a/pkgs/by-name/lz/lzlib/package.nix b/pkgs/by-name/lz/lzlib/package.nix index db517669c5e8a..c44456bb45cad 100644 --- a/pkgs/by-name/lz/lzlib/package.nix +++ b/pkgs/by-name/lz/lzlib/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://savannah/lzip/lzlib/lzlib-${finalAttrs.version}.tar.lz"; - sha256 = "e362ecccd82d4dd297df6a51b952c65d2172f9bf41a5c4590d3604d83aa519d3"; + hash = "sha256-42LszNgtTdKX32pRuVLGXSFy+b9BpcRZDTYE2DqlGdM="; # hash from release email }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.in --replace '-Wl,--soname=' '-Wl,-install_name,$(out)/lib/' ''; @@ -30,4 +30,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ ehmry ]; }; -}) \ No newline at end of file +}) 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 98ab599b9ddc3..22a6e30a4151b 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix @@ -54,9 +54,10 @@ effectiveStdenv.mkDerivation (finalAttrs: { ] ); + cmakeBuildType = "None"; + cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None") (lib.cmakeBool "BUILD_SHARED_LIBS" true) ] ++ lib.optionals cudaSupport [ diff --git a/pkgs/by-name/ma/maa-assistant-arknights/package.nix b/pkgs/by-name/ma/maa-assistant-arknights/package.nix index 27ef0e428cc50..32d43f3d05b14 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/package.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/package.nix @@ -20,69 +20,71 @@ let sources = lib.importJSON ./pin.json; in # https://github.com/NixOS/nixpkgs/issues/314160 -(if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv).mkDerivation (finalAttr: { - pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta"; - version = if isBeta then sources.beta.version else sources.stable.version; +(if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv).mkDerivation + (finalAttr: { + pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta"; + version = if isBeta then sources.beta.version else sources.stable.version; - src = fetchFromGitHub { - owner = "MaaAssistantArknights"; - repo = "MaaAssistantArknights"; - rev = "v${finalAttr.version}"; - hash = if isBeta then sources.beta.hash else sources.stable.hash; - }; + src = fetchFromGitHub { + owner = "MaaAssistantArknights"; + repo = "MaaAssistantArknights"; + rev = "v${finalAttr.version}"; + hash = if isBeta then sources.beta.hash else sources.stable.hash; + }; - nativeBuildInputs = [ - asio - cmake - fastdeploy.cmake - ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + nativeBuildInputs = [ + asio + cmake + fastdeploy.cmake + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; - buildInputs = - [ - fastdeploy - libcpr - onnxruntime - opencv - ] - ++ lib.optionals cudaSupport ( - with cudaPackages; + buildInputs = [ - cuda_cccl # cub/cub.cuh - libcublas # cublas_v2.h - libcurand # curand.h - libcusparse # cusparse.h - libcufft # cufft.h - cudnn # cudnn.h - cuda_cudart + fastdeploy + libcpr + onnxruntime + opencv ] - ); + ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cccl # cub/cub.cuh + libcublas # cublas_v2.h + libcurand # curand.h + libcusparse # cusparse.h + libcufft # cufft.h + cudnn # cudnn.h + cuda_cudart + ] + ); - cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" true) - (lib.cmakeBool "INSTALL_FLATTEN" false) - (lib.cmakeBool "INSTALL_PYTHON" true) - (lib.cmakeBool "INSTALL_RESOURCE" true) - (lib.cmakeBool "USE_MAADEPS" false) - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None") - (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}") - ]; + cmakeBuildType = "None"; - passthru.updateScript = ./update.sh; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "INSTALL_FLATTEN" false) + (lib.cmakeBool "INSTALL_PYTHON" true) + (lib.cmakeBool "INSTALL_RESOURCE" true) + (lib.cmakeBool "USE_MAADEPS" false) + (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}") + ]; - postPatch = '' - cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/ - ''; + passthru.updateScript = ./update.sh; - postInstall = '' - mkdir -p $out/share/${finalAttr.pname} - mv $out/{Python,resource} $out/share/${finalAttr.pname} - ''; + postPatch = '' + cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/ + ''; - meta = with lib; { - description = "Arknights assistant"; - homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ Cryolitia ]; - platforms = platforms.linux ++ platforms.darwin; - }; -}) + postInstall = '' + mkdir -p $out/share/${finalAttr.pname} + mv $out/{Python,resource} $out/share/${finalAttr.pname} + ''; + + meta = with lib; { + description = "Arknights assistant"; + homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ Cryolitia ]; + platforms = platforms.linux ++ platforms.darwin; + }; + }) diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json index a764b8eca34f6..244cbb72fb41c 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -1,10 +1,10 @@ { "stable": { - "version": "5.5.11452", - "hash": "sha256-SIOzKgxuVKnMnjybY0LValAOBKso+XishfDVK5JfVPs=" + "version": "5.6.2", + "hash": "sha256-vnCHIKYMvMJPGjQdtGsVwZCEb1eId83yIemSnSuG0DU=" }, "beta": { - "version": "5.5.11452", - "hash": "sha256-SIOzKgxuVKnMnjybY0LValAOBKso+XishfDVK5JfVPs=" + "version": "5.7.0-beta.1", + "hash": "sha256-FFIL4HZtZaao90SefWeGWr016lqMoDVfRSaFt91q4Zk=" } } diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index 4b01e3631b640..69c54cafcad96 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix index 0d2730fd4dd47..568898652e4bf 100644 --- a/pkgs/by-name/ma/mactop/package.nix +++ b/pkgs/by-name/ma/mactop/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { meta = { description = "Terminal-based monitoring tool 'top' designed to display real-time metrics for Apple Silicon chips"; homepage = "https://github.com/context-labs/mactop"; - changelog = "https://github.com/context-labs/mactop/releases/tag/${src.rev}"; + changelog = "https://github.com/context-labs/mactop/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; mainProgram = "mactop"; diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix new file mode 100644 index 0000000000000..e0f83c3ba4d19 --- /dev/null +++ b/pkgs/by-name/ma/maestro/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchurl, + unzip, + makeWrapper, + jre_headless, + writeScript, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "maestro"; + version = "1.38.1"; + + src = fetchurl { + url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip"; + hash = "sha256-AogEVg8R73x5Q/LxZamGbFacCqB8JZeERqyf+UPXBx0="; + }; + + dontUnpack = true; + nativeBuildInputs = [ + unzip + makeWrapper + ]; + + installPhase = '' + mkdir $out + unzip $src -d $out + mv $out/maestro/* $out + rm -rf $out/maestro + ''; + + postFixup = '' + wrapProgram $out/bin/maestro --prefix PATH : "${lib.makeBinPath [ jre_headless ]}" + ''; + + passthru.updateScript = writeScript "update-maestro" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + set -o errexit -o nounset -o pipefail + + NEW_VERSION=$(curl --silent https://api.github.com/repos/mobile-dev-inc/maestro/releases | jq 'first(.[].tag_name | ltrimstr("cli-") | select(contains("dev.") | not))' --raw-output) + + update-source-version "maestro" "$NEW_VERSION" --print-changes + ''; + + meta = with lib; { + description = "Mobile UI Automation tool"; + homepage = "https://maestro.mobile.dev/"; + license = licenses.asl20; + platforms = lib.platforms.all; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + changelog = "https://github.com/mobile-dev-inc/maestro/blob/main/CHANGELOG.md"; + maintainers = with maintainers; [ SubhrajyotiSen ]; + mainProgram = "maestro"; + }; +}) diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/by-name/ma/magic-vlsi/package.nix similarity index 100% rename from pkgs/applications/science/electronics/magic-vlsi/default.nix rename to pkgs/by-name/ma/magic-vlsi/package.nix diff --git a/pkgs/by-name/ma/magicard-cups-driver/CMakeLists.patch b/pkgs/by-name/ma/magicard-cups-driver/CMakeLists.patch new file mode 100644 index 0000000000000..419c3d205bba1 --- /dev/null +++ b/pkgs/by-name/ma/magicard-cups-driver/CMakeLists.patch @@ -0,0 +1,52 @@ +--- a/CMakeLists.txt 2022-10-20 17:03:52.000000000 +0200 ++++ b/CMakeLists.txt 2024-09-05 21:39:27.172090291 +0200 +@@ -98,7 +98,9 @@ + src/magencd.c + src/rp2mag.c + src/utils.c +- src/rp2mag_encode.c) ++ src/rp2mag_encode.c ++ src/commandmb1.c ++ src/command_helper.c) + + target_compile_options(rastertoultra PRIVATE ${CUPS_CFLAGS}) + target_link_libraries(rastertoultra ${CUPS_LIBS}) +@@ -164,38 +166,3 @@ + ) + set(CPACK_VERBATIM_VARIABLES YES) + include(CPack) +- +-## TESTS +- +-add_subdirectory(test/unity EXCLUDE_FROM_ALL) +-add_executable(test_rp2_mag EXCLUDE_FROM_ALL test/test_rp2_mag.c +- src/rp2mag.c +- src/rp2mag_encode.c +- src/utils.c) +-target_compile_definitions(test_rp2_mag PRIVATE TEST) +-target_include_directories(test_rp2_mag PRIVATE src) +-target_link_libraries(test_rp2_mag unity) +- +-add_executable(test_dpi EXCLUDE_FROM_ALL test/test_dpi.c +- src/rastertoultra.c +- src/utils.c +- src/crc32.c +- src/rp2mag.c +- src/colrmtch.c +- src/rp2mag_encode.c +- src/magencd.c +- src/colour-profiles/magir2x.c +- src/colour-profiles/magiox.c +- src/colour-profiles/magiry.c) +-target_include_directories(test_dpi PRIVATE src) +-target_compile_definitions(test_dpi PRIVATE TEST) +-target_compile_options(test_dpi PRIVATE -Wno-unused-function) +-target_link_libraries(test_dpi unity m ${CUPS_LIBS}) +- +-enable_testing() +-add_test(test_rp2_mag test_rp2_mag) +-add_test(test_dpi test_dpi) +- +-# Autotools-style "make check" command +-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) +-add_dependencies(check test_rp2_mag test_dpi) diff --git a/pkgs/by-name/ma/magicard-cups-driver/package.nix b/pkgs/by-name/ma/magicard-cups-driver/package.nix new file mode 100644 index 0000000000000..5d1c597548914 --- /dev/null +++ b/pkgs/by-name/ma/magicard-cups-driver/package.nix @@ -0,0 +1,78 @@ +{ + stdenv, + lib, + fetchzip, + cmake, + cups, +}: + +stdenv.mkDerivation rec { + pname = "magicard-cups-driver"; + version = "1.4.0"; + + src = fetchzip { + # https://support.magicard.com/solution/linux-driver/ + url = "https://f08ddbe93aa02eaf9a6c-f08cd513e3a8c914f4f8f62af1786149.ssl.cf3.rackcdn.com/magicard_ltd-linux_driver-${version}.tar.gz"; + hash = "sha256-1k2Twn1JBizw/tzQ0xF1uJIecblRd6VurB7FAUop5F0="; + }; + + src_v1_3_4 = fetchzip { + url = "https://techs.magicard.com/linux/v1.3.4/magicard_ltd-linux_driver-1.3.4.tar.gz"; + hash = "sha256-6UIL2wyFOjOJeyGjYScfjbpURycN469raye6DnP19jg="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ cups ]; + + # Replace the supplied cmake generated makefile (which is useless on a different machine) + # with the CMakeLists.txt taken from v1.3.4 of the driver and patch it to make it compatible with v1.4.0 + prePatch = '' + cp ${src_v1_3_4}/CMakeLists.txt CMakeLists.txt + rm makefile + ''; + + patches = [ ./CMakeLists.patch ]; + + cmakeFlags = [ + "-DCUPS_SERVER_BIN=lib/cups" + "-DCUPS_DATA_DIR=share/cups" + ]; + + meta = { + description = "CUPS driver for Magicard Printers"; + longDescription = '' + This driver supports Magicard printers and rebrands sold at least under the following brands: + + - Aisino + - AlphaCard + - BOOD + - Brady + - Cardmaker + - Centena + - DTP + - Digital ID + - DoH + - Elliaden + - Fagoo + - Goodcard + - Gudecard + - IDentilam + - IDville + - ilinkcard + - Intersider + - Magicard + - Orphicard + - PPC ID + - Polaroid + - PriceCardPro + - Pridento + - ScreenCheck + - Titan + - Ying + ''; + homepage = "https://support.magicard.com/solution/linux-driver/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ _0x3f ]; + }; +} diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix index 176c81fae2b80..d549a46148d97 100644 --- a/pkgs/by-name/ma/magpie/package.nix +++ b/pkgs/by-name/ma/magpie/package.nix @@ -5,7 +5,7 @@ fetchpatch, stdenv, pkg-config, - gnome, + gnome-settings-daemon, gettext, gobject-introspection, cairo, @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { cairo glib gnome-desktop - gnome.gnome-settings-daemon + gnome-settings-daemon gobject-introspection gsettings-desktop-schemas gtk3 diff --git a/pkgs/by-name/ma/makejinja/package.nix b/pkgs/by-name/ma/makejinja/package.nix index e2e6755d9343e..e854d85f2e9f5 100644 --- a/pkgs/by-name/ma/makejinja/package.nix +++ b/pkgs/by-name/ma/makejinja/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "makejinja"; - version = "2.6.1"; + version = "2.6.2"; pyproject = true; src = fetchFromGitHub { owner = "mirkolenz"; repo = "makejinja"; rev = "refs/tags/v${version}"; - hash = "sha256-F56y+TxDD/B67ncnBTOd0FZGmXO/zjXitwbk/5aiekM="; + hash = "sha256-xrXyXFmh9df04I/zcSvQXsyUPrAvbOyyrhx8RNS3Ojs="; }; build-system = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/ma/mako/package.nix b/pkgs/by-name/ma/mako/package.nix index dbd6b7a08f77b..ccc6b61cfefcc 100644 --- a/pkgs/by-name/ma/mako/package.nix +++ b/pkgs/by-name/ma/mako/package.nix @@ -1,20 +1,21 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, scdoc -, systemd -, pango -, cairo -, gdk-pixbuf -, jq -, bash -, wayland -, wayland-scanner -, wayland-protocols -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + scdoc, + systemd, + pango, + cairo, + gdk-pixbuf, + jq, + bash, + wayland, + wayland-scanner, + wayland-protocols, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -25,13 +26,27 @@ stdenv.mkDerivation (finalAttrs: { owner = "emersion"; repo = "mako"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-QtYtondP7E5QXLRnmcaOQlAm9fKXctfjxeUFqK6FnnE="; + hash = "sha256-QtYtondP7E5QXLRnmcaOQlAm9fKXctfjxeUFqK6FnnE="; }; strictDeps = true; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook3 wayland-scanner ]; - buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-protocols + wrapGAppsHook3 + wayland-scanner + ]; + buildInputs = [ + systemd + pango + cairo + gdk-pixbuf + wayland + ]; mesonFlags = [ "-Dzsh-completions=true" @@ -40,15 +55,31 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ systemd /* for busctl */ jq bash ]}" + --prefix PATH : "${ + lib.makeBinPath [ + systemd # for busctl + jq + bash + ] + }" ) ''; + postInstall = '' + mkdir -p $out/lib/systemd/user + 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 + ''; + meta = { description = "Lightweight Wayland notification daemon"; homepage = "https://wayland.emersion.fr/mako/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dywedir synthetica ]; + maintainers = with lib.maintainers; [ + dywedir + synthetica + ]; platforms = lib.platforms.linux; mainProgram = "mako"; }; diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix index e5784c15399f8..aafae4ab84645 100644 --- a/pkgs/by-name/ma/manga-tui/package.nix +++ b/pkgs/by-name/ma/manga-tui/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage { openssl sqlite ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/by-name/ma/mangl/package.nix b/pkgs/by-name/ma/mangl/package.nix new file mode 100644 index 0000000000000..699babd5ae4ff --- /dev/null +++ b/pkgs/by-name/ma/mangl/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + fetchFromGitHub, + lib, + glfw, + freetype, + pkg-config, + bzip2, + zlib, +}: + +stdenv.mkDerivation { + pname = "mangl"; + version = "1.1.5-unstable-2024-07-10"; + src = fetchFromGitHub { + owner = "zigalenarcic"; + repo = "mangl"; + rev = "9d369fb0b9637969bbdfaafca73832fe8a31445b"; + hash = "sha256-22JnflZtlkjI3wr6UHweb77pOk9cMwF+c6KORutCSDM="; + }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + freetype + glfw + bzip2 + zlib + ]; + + installPhase = '' + runHook preInstall + + install -Dm0555 mangl -t $out/bin + install -Dm0444 mangl.1 -t $out/man/man1 + install -Dm0444 art/mangl.svg -t $out/share/icons/hicolor/scalable/apps + install -Dm0444 mangl.desktop -t $out/share/applications + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/zigalenarcic/mangl"; + description = "A graphical man page viewer based on the mandoc library"; + license = licenses.bsd2; + maintainers = with maintainers; [ nrabulinski ]; + platforms = platforms.linux; + mainProgram = "mangl"; + }; +} diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 822feef1debfc..6eafc1e001afc 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 = "2.5.1-unstable-2024-08-18"; + version = "2.5.1-unstable-2024-09-15"; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; - rev = "74e15b1574ebe6ae01d1fd2cffbe75aeeb7b8fab"; - hash = "sha256-T/uaiHNJvk16XobjJlVbawKJ2ktFaCtI63kTFc6Z5Fc="; + rev = "22c66051dfdbcefa2012e30dd12c9b5a20f89a01"; + hash = "sha256-Fbev5dTgXjXdC7fzWfHnypTBel++DiMns8OzN1bH1OA="; }; nativeBuildInputs = [ cmake ]; @@ -30,9 +30,9 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" "-DMANIFOLD_TEST=ON" + "-DMANIFOLD_CROSS_SECTION=ON" "-DMANIFOLD_PAR=TBB" ]; @@ -49,5 +49,6 @@ stdenv.mkDerivation (finalAttrs: { hzeller pca006132 ]; + platforms = lib.platforms.linux; # currently issues with Darwin }; }) diff --git a/pkgs/by-name/ma/mapcache/package.nix b/pkgs/by-name/ma/mapcache/package.nix index e0859a91a2fec..5d38ce3f0362f 100644 --- a/pkgs/by-name/ma/mapcache/package.nix +++ b/pkgs/by-name/ma/mapcache/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { (lib.cmakeFeature "APACHE_MODULE_DIR" "${placeholder "out"}/modules") ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-std=c99"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-std=c99"; meta = { description = "Server that implements tile caching to speed up access to WMS layers"; diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix new file mode 100644 index 0000000000000..ef39151c0104d --- /dev/null +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -0,0 +1,51 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +with python3.pkgs; +buildPythonApplication rec { + pname = "mapproxy"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "mapproxy"; + repo = "mapproxy"; + rev = version; + hash = "sha256-74hUJIy1+DaKjUsCgd4+2MdMPGqqDUuHDrhBCFNn8Dk="; + }; + + prePatch = '' + substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" + ''; + + dependencies = [ + boto3 # needed for caches service + future + jsonschema + pillow + pyyaml + pyproj + shapely + gdal + lxml + setuptools + werkzeug + ]; + # Tests are disabled: + # 1) Dependency list is huge. + # https://github.com/mapproxy/mapproxy/blob/master/requirements-tests.txt + # + # 2) There are security issues with package Riak + # https://github.com/NixOS/nixpkgs/issues/33876 + # https://github.com/NixOS/nixpkgs/pull/56480 + doCheck = false; + + meta = { + description = "Open source proxy for geospatial data"; + homepage = "https://mapproxy.org/"; + license = lib.licenses.asl20; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ rakesh4g ]); + }; +} diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index f91876752dede..5d1739d07c071 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "MapServer"; repo = "MapServer"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-kZEDC89yoQP0ma5avp6r+Hz8JMpErGlBVQkhlHO6UFw="; + hash = "sha256-kZEDC89yoQP0ma5avp6r+Hz8JMpErGlBVQkhlHO6UFw="; }; nativeBuildInputs = diff --git a/pkgs/by-name/ma/marble-shell-theme/package.nix b/pkgs/by-name/ma/marble-shell-theme/package.nix new file mode 100644 index 0000000000000..35374f8c1ee35 --- /dev/null +++ b/pkgs/by-name/ma/marble-shell-theme/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + python3, + colors ? [ "all" ], # Default to install all available colors + additionalInstallationTweaks ? [ ], # Additional installation tweaks +}: +assert lib.assertMsg (colors != [ ]) "The `colors` list can not be empty"; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "marble-shell-theme"; + version = "46.2.3"; + + src = fetchFromGitHub { + owner = "imarkoff"; + repo = "Marble-shell-theme"; + rev = "5971b15d8115c60c3a16b1d219ecffd2cfcdb323"; + hash = "sha256-TX6BSS29EAi2PjL1fMvEKD12RjB9xrfqPSQsJJrUcJg="; + }; + + nativeBuildInputs = [ python3 ]; + + patchPhase = '' + runHook prePatch + substituteInPlace scripts/config.py \ + --replace-fail "~/.themes" ".themes" + runHook postPatch + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + python install.py ${ + lib.escapeShellArgs (map (color: "--${color}") colors) + } ${lib.escapeShellArgs additionalInstallationTweaks} + cp -r .themes/* $out/share/themes/ + runHook postInstall + ''; + + meta = { + description = "Shell theme for GNOME DE"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + homepage = "https://github.com/imarkoff/Marble-shell-theme"; + changelog = "https://github.com/imarkoff/Marble-shell-theme/releases/tag/${finalAttrs.version}"; + maintainers = with lib.maintainers; [ aucub ]; + }; +}) diff --git a/pkgs/by-name/ma/mariadb-galera/package.nix b/pkgs/by-name/ma/mariadb-galera/package.nix index 0d85c9f3d56b8..ebb3eb23c9545 100644 --- a/pkgs/by-name/ma/mariadb-galera/package.nix +++ b/pkgs/by-name/ma/mariadb-galera/package.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Only; maintainers = with maintainers; [ izorkin ] ++ teams.helsinki-systems.members; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ma/markuplinkchecker/package.nix b/pkgs/by-name/ma/markuplinkchecker/package.nix index f42ea53ff9925..fac663fa9833e 100644 --- a/pkgs/by-name/ma/markuplinkchecker/package.nix +++ b/pkgs/by-name/ma/markuplinkchecker/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/development/compilers/marst/default.nix b/pkgs/by-name/ma/marst/package.nix similarity index 100% rename from pkgs/development/compilers/marst/default.nix rename to pkgs/by-name/ma/marst/package.nix diff --git a/pkgs/by-name/ma/marwaita-mint/package.nix b/pkgs/by-name/ma/marwaita-mint/package.nix index d8fc37c332ee3..432ad3dcea211 100644 --- a/pkgs/by-name/ma/marwaita-mint/package.nix +++ b/pkgs/by-name/ma/marwaita-mint/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "marwaita-mint"; - version = "20.3.1"; + version = "21"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "marwaita-mint"; rev = finalAttrs.version; - hash = "sha256-0IgQbBragalLO0zVU36ZWxF3Q47cfEQ15HxQ2j9QhIc="; + hash = "sha256-RzQmBD4nlnzZN1BCS6EOqbuSxmjHPAgf/uv99xgAUYU="; }; buildInputs = [ diff --git a/pkgs/by-name/ma/marwaita-orange/package.nix b/pkgs/by-name/ma/marwaita-orange/package.nix index 2079e209b0dbe..16de4362c4fd0 100644 --- a/pkgs/by-name/ma/marwaita-orange/package.nix +++ b/pkgs/by-name/ma/marwaita-orange/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-orange"; - version = "20.3.1"; + version = "21"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-DdtFAUoIT51kGrEz1IpLvuJMEL+pMDICobuNV6UfC6Q="; + hash = "sha256-LJvlbvbgNH5nnfDAG8BpOBrO2W6VyDeH2yDcjRamUQI="; }; buildInputs = [ diff --git a/pkgs/by-name/ma/marwaita-red/package.nix b/pkgs/by-name/ma/marwaita-red/package.nix index bb647ae1977c7..685d0df7d8adc 100644 --- a/pkgs/by-name/ma/marwaita-red/package.nix +++ b/pkgs/by-name/ma/marwaita-red/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-red"; - version = "20.3.1"; + version = "22"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-cMZDd/WQFrfr6Zrq1/1It26OmML3cf7+ZU/I8IMjuX4="; + hash = "sha256-oUJ74MNAFbbM123v7i+b29UEFFumswPI3DmqeeahMd4="; }; buildInputs = [ diff --git a/pkgs/by-name/ma/marwaita-teal/package.nix b/pkgs/by-name/ma/marwaita-teal/package.nix index 6e06211e2c039..b9d2b3f15a6b5 100644 --- a/pkgs/by-name/ma/marwaita-teal/package.nix +++ b/pkgs/by-name/ma/marwaita-teal/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-teal"; - version = "20.3.1"; + version = "22"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-0OKG7JOpPiYbofiHWtLfkqHsZZIeGJPhl/tW1CIO3co="; + hash = "sha256-aSzeF4winpea21gADa/HT+a+FZ4Ykrpue/ePmveJU8E="; }; buildInputs = [ diff --git a/pkgs/by-name/ma/marwaita-x/package.nix b/pkgs/by-name/ma/marwaita-x/package.nix index ddeeb5e39b514..9c05736e84f66 100644 --- a/pkgs/by-name/ma/marwaita-x/package.nix +++ b/pkgs/by-name/ma/marwaita-x/package.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "darkomarko42"; repo = "marwaita-x"; rev = finalAttrs.version; - sha256 = "sha256-x5b3aaasYbxFGvdNNF6vIrF/ZZWBGbdS2kEuB1rwOlA="; + hash = "sha256-x5b3aaasYbxFGvdNNF6vIrF/ZZWBGbdS2kEuB1rwOlA="; }; buildInputs = [ diff --git a/pkgs/by-name/ma/marwaita/package.nix b/pkgs/by-name/ma/marwaita/package.nix index 95339811740a2..66f4d31b971d0 100644 --- a/pkgs/by-name/ma/marwaita/package.nix +++ b/pkgs/by-name/ma/marwaita/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "marwaita"; - version = "21"; + version = "22"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-5igOzHfkW+HJtll2wLT5qWtLavoPCo170M8v4ID0Wf8="; + hash = "sha256-Aa6qJGLQ+MLn/QeZzjMj/O5vEp/Cr/g7n8JFFlSgfOc="; }; buildInputs = [ diff --git a/pkgs/by-name/ma/massdns/package.nix b/pkgs/by-name/ma/massdns/package.nix index 9b90c674adb75..b47e162861ce5 100644 --- a/pkgs/by-name/ma/massdns/package.nix +++ b/pkgs/by-name/ma/massdns/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "PROJECT_FLAGS=-DMASSDNS_REVISION='\"v${version}\"'" ]; - buildFlags = if stdenv.isLinux then "all" else "nolinux"; + buildFlags = if stdenv.hostPlatform.isLinux then "all" else "nolinux"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ma/masterpdfeditor/package.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix index 5d75cfb335c4c..34086ab5b9e54 100644 --- a/pkgs/by-name/ma/masterpdfeditor/package.nix +++ b/pkgs/by-name/ma/masterpdfeditor/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; - sha256 = "sha256-CbrhhQJ0iiXz8hUJEi+/xb2ZGbunuPuIIgmCRgJhNVU="; + hash = "sha256-CbrhhQJ0iiXz8hUJEi+/xb2ZGbunuPuIIgmCRgJhNVU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/materialgram/package.nix b/pkgs/by-name/ma/materialgram/package.nix index 8ecbc725601fe..20ca6112a5a4c 100644 --- a/pkgs/by-name/ma/materialgram/package.nix +++ b/pkgs/by-name/ma/materialgram/package.nix @@ -6,14 +6,14 @@ telegram-desktop.overrideAttrs ( finalAttrs: previousAttrs: { pname = "materialgram"; - version = "5.4.1.1"; + version = "5.5.4.1"; src = fetchFromGitHub { owner = "kukuruzka165"; repo = "materialgram"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-enA/8mIXcRTPGyZFgZ5Wg4fWq4fD4rtjH7bm/32FZaE"; + hash = "sha256-LfeIhnCQ/b3Z7F3jUEdutlbZjSQoGr+zXP3oBiqe3XY="; }; meta = previousAttrs.meta // { diff --git a/pkgs/applications/science/math/mathmod/fix-paths.patch b/pkgs/by-name/ma/mathmod/fix-paths.patch similarity index 100% rename from pkgs/applications/science/math/mathmod/fix-paths.patch rename to pkgs/by-name/ma/mathmod/fix-paths.patch diff --git a/pkgs/by-name/ma/mathmod/package.nix b/pkgs/by-name/ma/mathmod/package.nix new file mode 100644 index 0000000000000..df64cf723125e --- /dev/null +++ b/pkgs/by-name/ma/mathmod/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libsForQt5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mathmod"; + version = "12.0"; + + src = fetchFromGitHub { + owner = "parisolab"; + repo = "mathmod"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-h1iI7bheJVfE2+0m6Yk7QNCkl9Vye97tqb/WkQExVcQ="; + }; + + patches = [ ./fix-paths.patch ]; + + postPatch = '' + substituteInPlace MathMod.pro --subst-var out + ''; + + nativeBuildInputs = with libsForQt5; [ + qmake + wrapQtAppsHook + ]; + + meta = { + changelog = "https://github.com/parisolab/mathmod/releases/tag/${finalAttrs.version}"; + description = "Mathematical modelling software"; + homepage = "https://github.com/parisolab/mathmod"; + license = lib.licenses.gpl2Plus; + mainProgram = "MathMod"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock b/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock new file mode 100644 index 0000000000000..e9013801de04c --- /dev/null +++ b/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock @@ -0,0 +1,7602 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli 0.29.0", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "aide" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0e3b97a21e41ec5c19bfd9b4fc1f7086be104f8b988681230247ffc91cc8ed" +dependencies = [ + "aide-macros", + "axum", + "axum-extra", + "bytes", + "cfg-if", + "http", + "indexmap 2.5.0", + "schemars", + "serde", + "serde_json", + "serde_qs", + "thiserror", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "aide-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0487f8598afe49e6bc950a613a678bd962c4a6f431022ded62643c8b990301a" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[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 = "apalis-core" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1deb48475efcdece1f23a0553209ee842f264c2a5e9bcc4928bfa6a15a044cde" +dependencies = [ + "async-stream", + "async-trait", + "chrono", + "futures", + "graceful-shutdown", + "http", + "log", + "pin-project-lite", + "serde", + "strum 0.25.0", + "thiserror", + "tokio", + "tower", + "tracing", + "ulid", +] + +[[package]] +name = "apalis-cron" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43310b7e0132f9520b09224fb6faafb32eec82a672aa79c09e46b5b488ed505b" +dependencies = [ + "apalis-core", + "async-stream", + "chrono", + "cron", + "futures", + "tokio", + "tower", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "argon2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" +dependencies = [ + "base64ct", + "blake2", + "cpufeatures", + "password-hash", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "ascii_utils" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" + +[[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "assert_matches" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.3.1", + "async-executor", + "async-io 2.3.3", + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", + "once_cell", +] + +[[package]] +name = "async-graphql" +version = "7.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d37c3e9ba322eb00e9e5e997d58f08e8b6de037325b9367ac59bca8e3cd46af" +dependencies = [ + "async-graphql-derive", + "async-graphql-parser", + "async-graphql-value", + "async-stream", + "async-trait", + "base64 0.22.1", + "bytes", + "chrono", + "fast_chemail", + "fnv", + "futures-timer", + "futures-util", + "handlebars", + "http", + "indexmap 2.5.0", + "mime", + "multer", + "num-traits", + "once_cell", + "pin-project-lite", + "regex", + "serde", + "serde_json", + "serde_urlencoded", + "static_assertions_next", + "tempfile", + "thiserror", + "tracing", + "tracing-futures", + "url", +] + +[[package]] +name = "async-graphql-derive" +version = "7.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1141703c11c6ad4fa9b3b0e1e476dea01dbd18a44db00f949b804afaab2f344" +dependencies = [ + "Inflector", + "async-graphql-parser", + "darling 0.20.10", + "proc-macro-crate", + "proc-macro2", + "quote", + "strum 0.26.3", + "syn 2.0.68", + "thiserror", +] + +[[package]] +name = "async-graphql-parser" +version = "7.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f66edcce4c38c18f7eb181fdf561c3d3aa2d644ce7358fc7a928c00a4ffef17" +dependencies = [ + "async-graphql-value", + "pest", + "serde", + "serde_json", +] + +[[package]] +name = "async-graphql-value" +version = "7.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0206011cad065420c27988f17dd7fe201a0e056b20c262209b7bffcd6fa176" +dependencies = [ + "bytes", + "indexmap 2.5.0", + "serde", + "serde_json", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-signal" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel 1.9.0", + "async-global-executor", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite 1.13.0", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "aws-lc-rs" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e89b6941c2d1a7045538884d6e760ccfffdf8e1ffc2613d8efa74305e1f3752" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-extra" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" +dependencies = [ + "axum", + "axum-core", + "bytes", + "cookie", + "futures-util", + "headers", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "serde", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00c055ee2d014ae5981ce1016374e8213682aa14d9bf40e48ab48b5f3ef20eaa" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bcrypt" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e65938ed058ef47d92cf8b346cc76ef48984572ade631927e9937b5ffc7662c7" +dependencies = [ + "base64 0.22.1", + "blowfish", + "getrandom", + "subtle", + "zeroize", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.68", + "which", +] + +[[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.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel 2.3.1", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "blowfish" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" +dependencies = [ + "byteorder", + "cipher", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +dependencies = [ + "serde", +] + +[[package]] +name = "calendrical_calculations" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec493b209a1b81fa32312d7ceca1b547d341c7b5f16a3edbf32b1d8b455bbdf" +dependencies = [ + "core_maths", + "displaydoc", +] + +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "chrono-tz" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "chronoutil" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9b58b07a67cadda9502b270eca5e0f1cd3afd08445e0ab1d52d909db01b4543" +dependencies = [ + "chrono", +] + +[[package]] +name = "chumsky" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" +dependencies = [ + "hashbrown 0.14.5", + "stacker", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "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 = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +dependencies = [ + "aes-gcm", + "base64 0.22.1", + "hkdf", + "percent-encoding", + "rand", + "sha2", + "subtle", + "time", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa" +dependencies = [ + "cookie", + "idna 0.5.0", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time", + "url", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "cranelift-bforest" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6b33d7e757a887989eb18b35712b2a67d96171ec3149d1bfb657b29b7b367c" +dependencies = [ + "cranelift-entity", +] + +[[package]] +name = "cranelift-codegen" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9acf15cb22be42d07c3b57d7856329cb228b7315d385346149df2566ad5e4aa" +dependencies = [ + "bumpalo", + "cranelift-bforest", + "cranelift-codegen-meta", + "cranelift-codegen-shared", + "cranelift-control", + "cranelift-entity", + "cranelift-isle", + "gimli 0.28.1", + "hashbrown 0.14.5", + "log", + "regalloc2", + "rustc-hash", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e934d301392b73b3f8b0540391fb82465a0f179a3cee7c726482ac4727efcc97" +dependencies = [ + "cranelift-codegen-shared", +] + +[[package]] +name = "cranelift-codegen-shared" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb2a2566b3d54b854dfb288b3b187f6d3d17d6f762c92898207eba302931da" + +[[package]] +name = "cranelift-control" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0100f33b704cdacd01ad66ff41f8c5030d57cbff078e2a4e49ab1822591299fa" +dependencies = [ + "arbitrary", +] + +[[package]] +name = "cranelift-entity" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8cfdc315e5d18997093e040a8d234bea1ac1e118a716d3e30f40d449e78207b" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "cranelift-frontend" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f74b84f16af2e982b0c0c72233503d9d55cbfe3865dbe807ca28dc6642a28b5" +dependencies = [ + "cranelift-codegen", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-isle" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adf306d3dde705fb94bd48082f01d38c4ededc74293a4c007805f610bf08bc6e" + +[[package]] +name = "cranelift-native" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ea0ebdef7aff4a79bcbc8b6495f31315f16b3bf311152f472eaa8d679352581" +dependencies = [ + "cranelift-codegen", + "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-wasm" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d549108a1942065cdbac3bb96c2952afa0e1b9a3beff4b08c4308ac72257576d" +dependencies = [ + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "itertools 0.12.1", + "log", + "smallvec", + "wasmparser", + "wasmtime-types", +] + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cron" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07" +dependencies = [ + "chrono", + "nom", + "once_cell", +] + +[[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 = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core 0.20.10", + "darling_macro 0.20.10", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.68", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core 0.20.10", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "deadpool" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" +dependencies = [ + "async-trait", + "deadpool-runtime", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "serde", + "uuid", +] + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core", + "syn 2.0.68", +] + +[[package]] +name = "dialoguer" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" +dependencies = [ + "console", + "fuzzy-matcher", + "shell-words", + "tempfile", + "thiserror", + "zeroize", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "duration-str" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709d653e7c92498eb29fb86a2a6f0f3502b97530f33aedb32ef848d4d28b31a3" +dependencies = [ + "rust_decimal", + "thiserror", + "winnow 0.6.13", +] + +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "email-encoding" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" +dependencies = [ + "base64 0.22.1", + "memchr", +] + +[[package]] +name = "email_address" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" + +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[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 = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "fast_chemail" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "495a39d30d624c2caabe6312bfead73e7717692b44e0b32df168c275a2e8e9e4" +dependencies = [ + "ascii_utils", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "figment" +version = "0.10.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" +dependencies = [ + "atomic", + "parking_lot", + "pear", + "serde", + "serde_yaml", + "tempfile", + "uncased", + "version_check", +] + +[[package]] +name = "fixed_decimal" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0febbeb1118a9ecdee6e4520ead6b54882e843dd0592ad233247dbee84c53db8" +dependencies = [ + "displaydoc", + "smallvec", + "writeable", +] + +[[package]] +name = "fluent-uri" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + +[[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 = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fuzzy-matcher" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +dependencies = [ + "thread_local", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +dependencies = [ + "fallible-iterator", + "indexmap 2.5.0", + "stable_deref_trait", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "governor" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" +dependencies = [ + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot", + "portable-atomic", + "quanta", + "rand", + "smallvec", + "spinning_top", +] + +[[package]] +name = "graceful-shutdown" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3effbaf774a1da3462925bb182ccf975c284cf46edca5569ea93420a657af484" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap 2.5.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "handlebars" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b" +dependencies = [ + "log", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", + "serde", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "headers" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if", + "libc", + "windows", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a397c49fec283e3d6211adbe480be95aae5f304cfb923e9970e08956d5168a" + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icu_calendar" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb932a690c92f87955e923106181ee0d5682e688ff37fb5c7b296e1fe806edb" +dependencies = [ + "calendrical_calculations", + "displaydoc", + "icu_calendar_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_calendar_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22aec7d032735d9acb256eeef72adcac43c3b7572f19b51576a63d664b524ca2" + +[[package]] +name = "icu_datetime" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1508c7ed627cc0b031c81203eb98f34433e24b32b39d5b2c0238e4962a00957d" +dependencies = [ + "displaydoc", + "either", + "fixed_decimal", + "icu_calendar", + "icu_datetime_data", + "icu_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_timezone", + "smallvec", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_datetime_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6abc569cb4ee80b30707566f05c5c9ed4bed765f91ce41e7f5a37c5e6a75b3f" + +[[package]] +name = "icu_decimal" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf994f9ed8061c17bb313f28fba6cffc736f0a16c7fab827efc9b73fd3f7778" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "writeable", +] + +[[package]] +name = "icu_decimal_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2de3548316b697c70f30dec1395c9212db09df1d86a27624ee24872b71326c" + +[[package]] +name = "icu_list" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe6c04ec71ad1bacdbfb47164d4801f80a0533d9340f94f1a880f521eff59f54" +dependencies = [ + "displaydoc", + "icu_list_data", + "icu_locid_transform", + "icu_provider", + "regex-automata 0.2.0", + "writeable", +] + +[[package]] +name = "icu_list_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f6afcf7a9a7fedece70b7f17d7a7ecdfb8df145d37ae46d0277cd1e3932532" + +[[package]] +name = "icu_locid" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" + +[[package]] +name = "icu_plurals" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d807b123eb2a9ae8f12080fb8cce479f5c8a761fba0bb5ab52da6dd5e31a03" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals_data", + "icu_provider", + "zerovec", +] + +[[package]] +name = "icu_plurals_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3acd5f1f2f988ed2dae9316c3d3560dfe4e03a7516d142b4b89b92252ada41a" + +[[package]] +name = "icu_provider" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_adapters" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a229f978260da7c3aabb68cb7dc7316589936680570fe55e50fdd3f97711a4dd" +dependencies = [ + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "icu_relativetime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47825312a5eb0790bad7b718fa8d41a8ea1e0ba597b4f7bb84bcfe97d7fc5aba" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_relativetime_data", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_relativetime_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b55cc15ea8981fbba78e9347d0c4003d4490c85f76e9adc7f270290046cae8" + +[[package]] +name = "icu_timezone" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35aabe571a7c653c0f543ff1512b8a1b2ad481cfa24b3d25115298d2ff3b50f" +dependencies = [ + "displaydoc", + "icu_calendar", + "icu_locid", + "icu_provider", + "icu_timezone_data", + "tinystr", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_timezone_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceee21e181cce2ab44e95923da6b3418df75369f570df82264c29c51ca398d4" + +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "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.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inherent" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "insta" +version = "1.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "serde", + "similar", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "ipnetwork" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" +dependencies = [ + "schemars", + "serde", +] + +[[package]] +name = "iri-string" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f5f6c2df22c009ac44f6f1499308e7a3ac7ba42cd2378475cc691510e1eef1b" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" +dependencies = [ + "jsonptr", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "jsonptr" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" +dependencies = [ + "fluent-uri", + "serde", + "serde_json", +] + +[[package]] +name = "k256" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", + "signature", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "language-tags" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" +dependencies = [ + "serde", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "lettre" +version = "0.11.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a62049a808f1c4e2356a2a380bd5f2aca3b011b0b482cf3b914ba1731426969" +dependencies = [ + "async-std", + "async-trait", + "base64 0.22.1", + "chumsky", + "email-encoding", + "email_address", + "fastrand 2.1.0", + "futures-io", + "futures-util", + "hostname", + "httpdate", + "idna 0.5.0", + "mime", + "nom", + "percent-encoding", + "quoted_printable", + "rustls", + "rustls-pemfile", + "socket2 0.5.7", + "tokio", + "tokio-rustls", + "tracing", + "url", + "webpki-roots", +] + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libloading" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libsqlite3-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "listenfd" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0500463acd96259d219abb05dc57e5a076ef04b2db9a2112846929b5f174c96" +dependencies = [ + "libc", + "uuid", + "winapi", +] + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "value-bag", +] + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "mas-axum-utils" +version = "0.12.0" +dependencies = [ + "async-trait", + "axum", + "axum-extra", + "bytes", + "chrono", + "data-encoding", + "futures-util", + "headers", + "http", + "http-body", + "http-body-util", + "hyper-util", + "icu_locid", + "mas-data-model", + "mas-http", + "mas-iana", + "mas-jose", + "mas-keystore", + "mas-storage", + "mas-templates", + "mime", + "oauth2-types", + "rand", + "sentry", + "serde", + "serde_json", + "serde_urlencoded", + "serde_with", + "thiserror", + "tokio", + "tower", + "tracing", + "ulid", + "url", +] + +[[package]] +name = "mas-cli" +version = "0.12.0" +dependencies = [ + "anyhow", + "axum", + "bytes", + "camino", + "clap", + "console", + "dialoguer", + "dotenvy", + "figment", + "http", + "http-body", + "http-body-util", + "httpdate", + "hyper", + "ipnetwork", + "itertools 0.13.0", + "listenfd", + "mas-config", + "mas-data-model", + "mas-email", + "mas-handlers", + "mas-http", + "mas-i18n", + "mas-iana", + "mas-keystore", + "mas-listener", + "mas-matrix", + "mas-matrix-synapse", + "mas-policy", + "mas-router", + "mas-spa", + "mas-storage", + "mas-storage-pg", + "mas-tasks", + "mas-templates", + "mas-tower", + "oauth2-types", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-jaeger-propagator", + "opentelemetry-otlp", + "opentelemetry-prometheus", + "opentelemetry-resource-detectors", + "opentelemetry-semantic-conventions", + "opentelemetry-stdout", + "opentelemetry_sdk", + "prometheus", + "rand", + "rand_chacha", + "rustls", + "sentry", + "sentry-tower", + "sentry-tracing", + "serde_json", + "serde_yaml", + "sqlx", + "tokio", + "tower", + "tower-http", + "tracing", + "tracing-appender", + "tracing-opentelemetry", + "tracing-subscriber", + "url", + "zeroize", +] + +[[package]] +name = "mas-config" +version = "0.12.0" +dependencies = [ + "anyhow", + "camino", + "chrono", + "figment", + "governor", + "indoc", + "ipnetwork", + "mas-iana", + "mas-jose", + "mas-keystore", + "pem-rfc7468", + "rand", + "rand_chacha", + "rustls-pemfile", + "rustls-pki-types", + "schemars", + "serde", + "serde_json", + "serde_with", + "thiserror", + "tokio", + "tracing", + "ulid", + "url", +] + +[[package]] +name = "mas-data-model" +version = "0.12.0" +dependencies = [ + "chrono", + "crc", + "mas-iana", + "mas-jose", + "oauth2-types", + "rand", + "rand_chacha", + "regex", + "serde", + "thiserror", + "ulid", + "url", + "woothee", +] + +[[package]] +name = "mas-email" +version = "0.12.0" +dependencies = [ + "async-trait", + "headers", + "lettre", + "mas-templates", + "thiserror", + "tracing", +] + +[[package]] +name = "mas-handlers" +version = "0.12.0" +dependencies = [ + "aide", + "anyhow", + "argon2", + "async-graphql", + "async-trait", + "axum", + "axum-extra", + "axum-macros", + "base64ct", + "bcrypt", + "camino", + "chrono", + "cookie_store", + "futures-util", + "governor", + "headers", + "hyper", + "indexmap 2.5.0", + "insta", + "lettre", + "mas-axum-utils", + "mas-config", + "mas-data-model", + "mas-http", + "mas-i18n", + "mas-iana", + "mas-jose", + "mas-keystore", + "mas-matrix", + "mas-oidc-client", + "mas-policy", + "mas-router", + "mas-spa", + "mas-storage", + "mas-storage-pg", + "mas-templates", + "mime", + "minijinja", + "nonzero_ext", + "oauth2-types", + "opentelemetry", + "opentelemetry-semantic-conventions", + "pbkdf2", + "psl", + "rand", + "rand_chacha", + "rustls", + "schemars", + "sentry", + "serde", + "serde_json", + "serde_urlencoded", + "serde_with", + "sqlx", + "thiserror", + "time", + "tokio", + "tower", + "tower-http", + "tracing", + "tracing-subscriber", + "ulid", + "url", + "zeroize", + "zxcvbn", +] + +[[package]] +name = "mas-http" +version = "0.12.0" +dependencies = [ + "anyhow", + "async-trait", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "mas-tower", + "opentelemetry", + "opentelemetry-semantic-conventions", + "pin-project-lite", + "rustls", + "rustls-platform-verifier", + "serde", + "serde_json", + "serde_urlencoded", + "thiserror", + "tokio", + "tower", + "tower-http", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "mas-i18n" +version = "0.12.0" +dependencies = [ + "camino", + "icu_calendar", + "icu_datetime", + "icu_list", + "icu_locid", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_provider_adapters", + "icu_relativetime", + "pad", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", + "writeable", +] + +[[package]] +name = "mas-i18n-scan" +version = "0.12.0" +dependencies = [ + "camino", + "clap", + "mas-i18n", + "minijinja", + "serde_json", + "tracing", + "tracing-subscriber", + "walkdir", +] + +[[package]] +name = "mas-iana" +version = "0.12.0" +dependencies = [ + "schemars", + "serde", +] + +[[package]] +name = "mas-iana-codegen" +version = "0.12.0" +dependencies = [ + "anyhow", + "async-trait", + "camino", + "convert_case", + "csv", + "futures-util", + "reqwest", + "serde", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mas-jose" +version = "0.12.0" +dependencies = [ + "base64ct", + "chrono", + "digest", + "ecdsa", + "elliptic-curve", + "generic-array", + "hmac", + "insta", + "k256", + "mas-iana", + "p256", + "p384", + "rand", + "rand_chacha", + "rsa", + "schemars", + "sec1", + "serde", + "serde_json", + "serde_with", + "sha2", + "signature", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "mas-keystore" +version = "0.12.0" +dependencies = [ + "aead", + "base64ct", + "chacha20poly1305", + "const-oid", + "der", + "ecdsa", + "elliptic-curve", + "generic-array", + "insta", + "k256", + "mas-iana", + "mas-jose", + "p256", + "p384", + "pem-rfc7468", + "pkcs1", + "pkcs8", + "rand", + "rand_chacha", + "rsa", + "sec1", + "spki", + "thiserror", +] + +[[package]] +name = "mas-listener" +version = "0.12.0" +dependencies = [ + "anyhow", + "bytes", + "event-listener 5.3.1", + "futures-util", + "http-body", + "hyper", + "hyper-util", + "libc", + "pin-project-lite", + "rustls-pemfile", + "socket2 0.5.7", + "thiserror", + "tokio", + "tokio-rustls", + "tokio-test", + "tower", + "tower-http", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mas-matrix" +version = "0.12.0" +dependencies = [ + "anyhow", + "async-trait", + "http", + "serde", + "tokio", + "url", +] + +[[package]] +name = "mas-matrix-synapse" +version = "0.12.0" +dependencies = [ + "anyhow", + "async-trait", + "http", + "mas-axum-utils", + "mas-http", + "mas-matrix", + "serde", + "serde_json", + "tower", + "tracing", + "url", + "urlencoding", +] + +[[package]] +name = "mas-oidc-client" +version = "0.12.0" +dependencies = [ + "assert_matches", + "base64ct", + "bitflags 2.6.0", + "bytes", + "chrono", + "form_urlencoded", + "futures-util", + "headers", + "http", + "http-body-util", + "language-tags", + "mas-http", + "mas-iana", + "mas-jose", + "mas-keystore", + "mime", + "oauth2-types", + "rand", + "rand_chacha", + "rustls", + "serde", + "serde_json", + "serde_urlencoded", + "serde_with", + "thiserror", + "tokio", + "tower", + "tracing", + "url", + "wiremock", +] + +[[package]] +name = "mas-policy" +version = "0.12.0" +dependencies = [ + "anyhow", + "mas-data-model", + "oauth2-types", + "opa-wasm", + "schemars", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "mas-router" +version = "0.12.0" +dependencies = [ + "axum", + "serde", + "serde_urlencoded", + "ulid", + "url", +] + +[[package]] +name = "mas-spa" +version = "0.12.0" +dependencies = [ + "camino", + "serde", + "thiserror", +] + +[[package]] +name = "mas-storage" +version = "0.12.0" +dependencies = [ + "apalis-core", + "async-trait", + "chrono", + "futures-util", + "mas-data-model", + "mas-iana", + "mas-jose", + "oauth2-types", + "opentelemetry", + "rand_core", + "serde", + "serde_json", + "thiserror", + "tracing", + "tracing-opentelemetry", + "ulid", + "url", +] + +[[package]] +name = "mas-storage-pg" +version = "0.12.0" +dependencies = [ + "async-trait", + "chrono", + "futures-util", + "mas-data-model", + "mas-iana", + "mas-jose", + "mas-storage", + "oauth2-types", + "opentelemetry-semantic-conventions", + "rand", + "rand_chacha", + "sea-query", + "sea-query-binder", + "serde", + "serde_json", + "sqlx", + "thiserror", + "tracing", + "ulid", + "url", + "uuid", +] + +[[package]] +name = "mas-tasks" +version = "0.12.0" +dependencies = [ + "anyhow", + "apalis-core", + "apalis-cron", + "async-stream", + "async-trait", + "chrono", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "mas-data-model", + "mas-email", + "mas-i18n", + "mas-matrix", + "mas-router", + "mas-storage", + "mas-storage-pg", + "mas-templates", + "mas-tower", + "opentelemetry", + "rand", + "rand_chacha", + "serde", + "serde_json", + "sqlx", + "thiserror", + "tokio", + "tower", + "tracing", + "tracing-opentelemetry", + "ulid", + "url", +] + +[[package]] +name = "mas-templates" +version = "0.12.0" +dependencies = [ + "anyhow", + "arc-swap", + "camino", + "chrono", + "http", + "mas-data-model", + "mas-i18n", + "mas-router", + "mas-spa", + "minijinja", + "oauth2-types", + "rand", + "serde", + "serde_json", + "serde_urlencoded", + "thiserror", + "tokio", + "tracing", + "ulid", + "url", + "v_htmlescape", + "walkdir", +] + +[[package]] +name = "mas-tower" +version = "0.12.0" +dependencies = [ + "http", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-semantic-conventions", + "pin-project-lite", + "tower", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memfd" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" +dependencies = [ + "rustix 0.38.34", +] + +[[package]] +name = "memo-map" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374c335b2df19e62d4cb323103473cbc6510980253119180de862d89184f6a83" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minijinja" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7d3e3a3eece1fa4618237ad41e1de855ced47eab705cec1c9a920e1d1c5aad" +dependencies = [ + "memo-map", + "self_cell", + "serde", + "serde_json", + "v_htmlescape", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + +[[package]] +name = "multer" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http", + "httparse", + "memchr", + "mime", + "spin", + "version_check", +] + +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "oauth2-types" +version = "0.12.0" +dependencies = [ + "assert_matches", + "chrono", + "data-encoding", + "http", + "language-tags", + "mas-iana", + "mas-jose", + "serde", + "serde_json", + "serde_with", + "sha2", + "thiserror", + "url", +] + +[[package]] +name = "object" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +dependencies = [ + "crc32fast", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "opa-wasm" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4b727ebe10814d69fb4c1f538e1a0772e1f9b258d30c5a097d04158f8d6017" +dependencies = [ + "anyhow", + "base64 0.22.1", + "chrono", + "chrono-tz", + "chronoutil", + "digest", + "duration-str", + "form_urlencoded", + "hex", + "hmac", + "json-patch", + "md-5", + "parse-size", + "rand", + "rayon", + "semver", + "serde", + "serde_json", + "serde_yaml", + "sha1", + "sha2", + "sprintf", + "thiserror", + "tokio", + "tracing", + "urlencoding", + "wasmtime", +] + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "opentelemetry" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry-http" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad31e9de44ee3538fb9d64fe3376c1362f406162434609e79aea2a41a0af78ab" +dependencies = [ + "async-trait", + "bytes", + "http", + "http-body-util", + "hyper", + "hyper-util", + "opentelemetry", + "tokio", +] + +[[package]] +name = "opentelemetry-jaeger-propagator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a68a13b92fc708d875ad659b08b35d08b8ef2403e01944b39ca21e5b08b17" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b925a602ffb916fb7421276b86756027b37ee708f9dce2dbdcc51739f07e727" +dependencies = [ + "async-trait", + "futures-core", + "http", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-proto", + "opentelemetry_sdk", + "prost", + "thiserror", +] + +[[package]] +name = "opentelemetry-prometheus" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc4191ce34aa274621861a7a9d68dbcf618d5b6c66b10081631b61fd81fbc015" +dependencies = [ + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "prometheus", + "protobuf", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" +dependencies = [ + "opentelemetry", + "opentelemetry_sdk", + "prost", + "tonic", +] + +[[package]] +name = "opentelemetry-resource-detectors" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a7e965924ad5234917f135243605ef6f2ae3f4da8d3363065d679b2c150f2a" +dependencies = [ + "opentelemetry", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05" + +[[package]] +name = "opentelemetry-stdout" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d408d4345b8be6129a77c46c3bfc75f0d3476f3091909c7dd99c1f3d78582287" +dependencies = [ + "async-trait", + "chrono", + "futures-util", + "opentelemetry", + "opentelemetry_sdk", + "ordered-float", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry", + "percent-encoding", + "rand", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "ordered-float" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" +dependencies = [ + "num-traits", +] + +[[package]] +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde", + "windows-sys 0.52.0", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "pad" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.2", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "parse-size" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae" + +[[package]] +name = "parse-zoneinfo" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" +dependencies = [ + "regex", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", + "password-hash", + "rayon", + "sha2", +] + +[[package]] +name = "pear" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "pest_meta" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs5" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6" +dependencies = [ + "aes", + "cbc", + "der", + "pbkdf2", + "scrypt", + "sha2", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "pkcs5", + "rand_core", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "postcard" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +dependencies = [ + "cobs", + "embedded-io", + "serde", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.68", +] + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "version_check", + "yansi", +] + +[[package]] +name = "prometheus" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" +dependencies = [ + "cfg-if", + "fnv", + "lazy_static", + "memchr", + "parking_lot", + "protobuf", + "thiserror", +] + +[[package]] +name = "prost" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "protobuf" +version = "2.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" + +[[package]] +name = "psl" +version = "2.1.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce9398ad066421139b2e3afe16ea46772ffda30bd9ba57554dc035df5e26edc8" +dependencies = [ + "psl-types", +] + +[[package]] +name = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "publicsuffix" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] + +[[package]] +name = "quanta" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", +] + +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "quoted_printable" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "raw-cpuid" +version = "11.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +dependencies = [ + "bitflags 2.6.0", +] + +[[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.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regalloc2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" +dependencies = [ + "hashbrown 0.13.2", + "log", + "rustc-hash", + "slice-group-by", + "smallvec", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782" +dependencies = [ + "memchr", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "windows-registry", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rust_decimal" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +dependencies = [ + "arrayvec", + "num-traits", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "aws-lc-rs", + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-roots", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "aws-lc-rs", + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "chrono", + "dyn-clone", + "indexmap 1.9.3", + "indexmap 2.5.0", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.68", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "pbkdf2", + "salsa20", + "sha2", +] + +[[package]] +name = "sea-query" +version = "0.32.0-rc.1" +source = "git+https://github.com/sandhose/sea-query?branch=binder/relax-sqlx-dependency#513cee7ea623fd5d26a80fbd6132ace8d17acf22" +dependencies = [ + "chrono", + "inherent", + "sea-query-attr", + "sea-query-derive", + "uuid", +] + +[[package]] +name = "sea-query-attr" +version = "0.1.2" +source = "git+https://github.com/sandhose/sea-query?branch=binder/relax-sqlx-dependency#513cee7ea623fd5d26a80fbd6132ace8d17acf22" +dependencies = [ + "darling 0.14.4", + "heck 0.4.1", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "sea-query-binder" +version = "0.7.0-rc.1" +source = "git+https://github.com/sandhose/sea-query?branch=binder/relax-sqlx-dependency#513cee7ea623fd5d26a80fbd6132ace8d17acf22" +dependencies = [ + "chrono", + "sea-query", + "sqlx", + "uuid", +] + +[[package]] +name = "sea-query-derive" +version = "0.4.1" +source = "git+https://github.com/sandhose/sea-query?branch=binder/relax-sqlx-dependency#513cee7ea623fd5d26a80fbd6132ace8d17acf22" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.68", + "thiserror", +] + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "num-bigint", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "self_cell" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "sentry" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066" +dependencies = [ + "sentry-backtrace", + "sentry-contexts", + "sentry-core", + "sentry-panic", + "sentry-tower", + "sentry-tracing", +] + +[[package]] +name = "sentry-backtrace" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a" +dependencies = [ + "backtrace", + "once_cell", + "regex", + "sentry-core", +] + +[[package]] +name = "sentry-contexts" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910" +dependencies = [ + "hostname", + "libc", + "os_info", + "rustc_version", + "sentry-core", + "uname", +] + +[[package]] +name = "sentry-core" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30" +dependencies = [ + "once_cell", + "rand", + "sentry-types", + "serde", + "serde_json", +] + +[[package]] +name = "sentry-panic" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc74f229c7186dd971a9491ffcbe7883544aa064d1589bd30b83fb856cd22d63" +dependencies = [ + "sentry-backtrace", + "sentry-core", +] + +[[package]] +name = "sentry-tower" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c90802b38c899a2c9e557dff25ad186362eddf755d5f5244001b172dd03bead" +dependencies = [ + "http", + "pin-project", + "sentry-core", + "tower-layer", + "tower-service", + "url", +] + +[[package]] +name = "sentry-tracing" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c5faf2103cd01eeda779ea439b68c4ee15adcdb16600836e97feafab362ec" +dependencies = [ + "sentry-backtrace", + "sentry-core", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sentry-types" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f" +dependencies = [ + "debugid", + "hex", + "rand", + "serde", + "serde_json", + "thiserror", + "time", + "url", + "uuid", +] + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_json" +version = "1.0.127" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +dependencies = [ + "indexmap 2.5.0", + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_qs" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd34f36fe4c5ba9654417139a9b3a20d2e1de6012ee678ad14d240c22c78d8d6" +dependencies = [ + "axum", + "futures", + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.5.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.5.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "similar" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slice-group-by" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sprintf" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e0732124cafd6bf2c9bc15f330fce49acb262beb57c877a2997898244e7f8a" +dependencies = [ + "thiserror", +] + +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + +[[package]] +name = "sqlformat" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" +dependencies = [ + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcfa89bea9500db4a0d038513d7a060566bfc51d46d1c014847049a45cce85e8" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06e2f2bd861719b1f3f0c7dbe1d80c30bf59e76cf019f07d9014ed7eefb8e08" +dependencies = [ + "atoi", + "byteorder", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "either", + "event-listener 5.3.1", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.14.5", + "hashlink", + "hex", + "indexmap 2.5.0", + "ipnetwork", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "uuid", + "webpki-roots", +] + +[[package]] +name = "sqlx-macros" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f998a9defdbd48ed005a89362bd40dd2117502f15294f61c8d47034107dbbdc" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 2.0.68", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d100558134176a2629d46cec0c8891ba0be8910f7896abfdb75ef4ab6f4e7ce" +dependencies = [ + "dotenvy", + "either", + "heck 0.5.0", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 2.0.68", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cac0ab331b14cb3921c62156d913e4c15b74fb6ec0f3146bd4ef6e4fb3c12" +dependencies = [ + "atoi", + "base64 0.22.1", + "bitflags 2.6.0", + "byteorder", + "bytes", + "chrono", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9734dbce698c67ecf67c442f768a5e90a49b2a4d61a9f1d59f73874bd4cf0710" +dependencies = [ + "atoi", + "base64 0.22.1", + "bitflags 2.6.0", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "ipnetwork", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75b419c3c1b1697833dd927bdc4c6545a620bc1bbafabd44e1efbe9afcd337e" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "serde_urlencoded", + "sqlx-core", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] +name = "static_assertions_next" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7beae5182595e9a8b683fa98c4317f956c9a2dec3b9716990d20023cc60c766" + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros 0.25.3", +] + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.68", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.68", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[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.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-test" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.5.0", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "tonic" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" +dependencies = [ + "async-trait", + "base64 0.22.1", + "bytes", + "http", + "http-body", + "http-body-util", + "percent-encoding", + "pin-project", + "prost", + "tokio-stream", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "http-range-header", + "httpdate", + "iri-string", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "tokio", + "tokio-util", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror", + "time", + "tracing-subscriber", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "futures", + "futures-task", + "pin-project", + "tracing", +] + +[[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-opentelemetry" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "tracing", + "tracing-core", + "tracing-subscriber", + "web-time", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[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 = "ulid" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289" +dependencies = [ + "getrandom", + "rand", + "serde", + "uuid", + "web-time", +] + +[[package]] +name = "uname" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" +dependencies = [ + "libc", +] + +[[package]] +name = "uncased" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-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-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + +[[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 = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "serde", +] + +[[package]] +name = "v_htmlescape" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" + +[[package]] +name = "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 = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-encoder" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4a05336882dae732ce6bd48b7e11fe597293cb72c13da4f35d7d5f8d53b2a7" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasmparser" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" +dependencies = [ + "ahash", + "bitflags 2.6.0", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "semver", + "serde", +] + +[[package]] +name = "wasmprinter" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceca8ae6eaa8c7c87b33c25c53bdf299f8c2a764aee1179402ff7652ef3a6859" +dependencies = [ + "anyhow", + "wasmparser", +] + +[[package]] +name = "wasmtime" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "786d8b5e7a4d54917c5ebe555b9667337e5f93383f49bddaaeec2eba68093b45" +dependencies = [ + "anyhow", + "async-trait", + "bumpalo", + "cc", + "cfg-if", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "libc", + "libm", + "log", + "mach2", + "memfd", + "memoffset", + "object", + "once_cell", + "paste", + "postcard", + "psm", + "rayon", + "rustix 0.38.34", + "serde", + "serde_derive", + "smallvec", + "sptr", + "target-lexicon", + "wasmparser", + "wasmtime-asm-macros", + "wasmtime-component-macro", + "wasmtime-cranelift", + "wasmtime-environ", + "wasmtime-fiber", + "wasmtime-jit-icache-coherence", + "wasmtime-slab", + "wasmtime-versioned-export-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-asm-macros" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d697d99c341d4a9ffb72f3af7a02124d233eeb59aee010f36d88e97cca553d5e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "wasmtime-component-macro" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b29b462b068e73b5b27fae092a27f47e5937cabf6b26be2779c978698a52feca" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn 2.0.68", + "wasmtime-component-util", + "wasmtime-wit-bindgen", + "wit-parser", +] + +[[package]] +name = "wasmtime-component-util" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d2912c53d9054984b380dfbd7579f9c3681b2a73b903a56bd71a1c4f175f1e" + +[[package]] +name = "wasmtime-cranelift" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3975deafea000457ba84355c7c0fce0372937204f77026510b7b454f28a3a65" +dependencies = [ + "anyhow", + "cfg-if", + "cranelift-codegen", + "cranelift-control", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", + "gimli 0.28.1", + "log", + "object", + "target-lexicon", + "thiserror", + "wasmparser", + "wasmtime-environ", + "wasmtime-versioned-export-macros", +] + +[[package]] +name = "wasmtime-environ" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f444e900e848b884d8a8a2949b6f5b92af642a3e663ff8fbe78731143a55be61" +dependencies = [ + "anyhow", + "cranelift-entity", + "gimli 0.28.1", + "indexmap 2.5.0", + "log", + "object", + "postcard", + "serde", + "serde_derive", + "target-lexicon", + "wasm-encoder", + "wasmparser", + "wasmprinter", + "wasmtime-types", +] + +[[package]] +name = "wasmtime-fiber" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ded58eb2d1bf0dcd2182d0ccd7055c4b10b50d711514f1d73f61515d0fa829d" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "rustix 0.38.34", + "wasmtime-asm-macros", + "wasmtime-versioned-export-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5afe2f0499542f9a4bcfa1b55bfdda803b6ade4e7c93c6b99e0f39dba44b0a91" +dependencies = [ + "anyhow", + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-slab" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a7de1f2bec5bbb35d532e61c85c049dc84ae671df60492f90b954ecf21169e7" + +[[package]] +name = "wasmtime-types" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "412463e9000e14cf6856be48628d2213c20c153e29ffc22b036980c892ea6964" +dependencies = [ + "cranelift-entity", + "serde", + "serde_derive", + "smallvec", + "wasmparser", +] + +[[package]] +name = "wasmtime-versioned-export-macros" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de5a9bc4f44ceeb168e9e8e3be4e0b4beb9095b468479663a9e24c667e36826f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "wasmtime-wit-bindgen" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc077306b38288262e5ba01d4b21532a6987416cdc0aedf04bb06c22a68fdc" +dependencies = [ + "anyhow", + "heck 0.4.1", + "indexmap 2.5.0", + "wit-parser", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.34", +] + +[[package]] +name = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall 0.4.1", + "wasite", +] + +[[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-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "wiremock" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a59f8ae78a4737fb724f20106fb35ccb7cfe61ff335665d3042b3aa98e34717" +dependencies = [ + "assert-json-diff", + "async-trait", + "base64 0.21.7", + "deadpool", + "futures", + "http", + "http-body-util", + "hyper", + "hyper-util", + "log", + "once_cell", + "regex", + "serde", + "serde_json", + "tokio", + "url", +] + +[[package]] +name = "wit-parser" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e79b9e3c0b6bb589dec46317e645851e0db2734c44e2be5e251b03ff4a51269" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.5.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] + +[[package]] +name = "woothee" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "896174c6a4779d4d7d4523dd27aef7d46609eda2497e370f6c998325c6bf6971" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "zerotrie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "zxcvbn" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad76e35b00ad53688d6b90c431cabe3cbf51f7a4a154739e04b63004ab1c736c" +dependencies = [ + "chrono", + "derive_builder", + "fancy-regex", + "itertools 0.13.0", + "lazy_static", + "regex", + "time", + "wasm-bindgen", + "web-sys", +] diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index be17eeffcb4fc..96318e3d4b0b7 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -1,35 +1,42 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, fetchNpmDeps -, npmHooks -, nodejs -, python3 -, pkg-config -, sqlite -, zstd -, stdenv -, darwin -, open-policy-agent +{ + lib, + rustPlatform, + fetchFromGitHub, + fetchNpmDeps, + npmHooks, + nodejs, + python3, + pkg-config, + sqlite, + zstd, + stdenv, + darwin, + open-policy-agent, + cctools, }: rustPlatform.buildRustPackage rec { pname = "matrix-authentication-service"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { - owner = "matrix-org"; + owner = "element-hq"; repo = "matrix-authentication-service"; rev = "refs/tags/v${version}"; - hash = "sha256-cZJ9ibBtxVBBVCBTGhtfM6lQTFvgUnO1WPO1WmDGuks="; + hash = "sha256-QLtyYxV2yXHJtwWgGcyi7gRcKypYoy9Z8bkEuTopVXc="; }; - cargoHash = "sha256-mUHN1uEc1qM1Bm/J7qf0zyMKaJvyt9YbQ8TxvxG+vcM="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "sea-query-0.32.0-rc.1" = "sha256-Q/NFiIBu8L5rQj4jwcIo8ACmAhLBy4HSTcJv06UdK8E="; + }; + }; npmDeps = fetchNpmDeps { name = "${pname}-${version}-npm-deps"; src = "${src}/${npmRoot}"; - hash = "sha256-CMdnHS3sj9gXLpVlmuKvqFJ28+7fddG2Ld6t2nSFp24="; + hash = "sha256-EfDxbdjzF0yLQlueIYKmdpU4v9dx7g8bltU63mIWfo0="; }; npmRoot = "frontend"; @@ -40,16 +47,18 @@ rustPlatform.buildRustPackage rec { npmHooks.npmConfigHook nodejs (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp - ]; + ] ++ lib.optional stdenv.isDarwin cctools; # libtool used by gyp; - buildInputs = [ - sqlite - zstd - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.frameworks.SystemConfiguration - ]; + buildInputs = + [ + sqlite + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk_11_0.frameworks.CoreFoundation + darwin.apple_sdk_11_0.frameworks.Security + darwin.apple_sdk_11_0.frameworks.SystemConfiguration + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; @@ -75,7 +84,7 @@ rustPlatform.buildRustPackage rec { (cd "$npmRoot" && npm run build) ''; - # Adopted from https://github.com/matrix-org/matrix-authentication-service/blob/main/Dockerfile + # Adopted from https://github.com/element-hq/matrix-authentication-service/blob/main/Dockerfile postInstall = '' install -Dm444 -t "$out/share/$pname" "policies/policy.wasm" install -Dm444 -t "$out/share/$pname/assets" "$npmRoot/dist/"* @@ -83,12 +92,15 @@ rustPlatform.buildRustPackage rec { cp -r translations "$out/share/$pname/translations" ''; - meta = with lib; { + meta = { description = "OAuth2.0 + OpenID Provider for Matrix Homeservers"; - homepage = "https://github.com/matrix-org/matrix-authentication-service"; - changelog = "https://github.com/matrix-org/matrix-authentication-service/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ teutat3s ]; + homepage = "https://github.com/element-hq/matrix-authentication-service"; + changelog = "https://github.com/element-hq/matrix-authentication-service/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ teutat3s ]; mainProgram = "mas-cli"; + # Note: broken on x86_64-darwin because of aligned_alloc, can be revisited after + # https://github.com/NixOS/nixpkgs/pull/346043 is merged + badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix index 2733c97598e8b..a51347e908b89 100644 --- a/pkgs/by-name/ma/matrix-brandy/package.nix +++ b/pkgs/by-name/ma/matrix-brandy/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "matrix-brandy"; - version = "1.23.2"; + version = "1.23.3"; src = fetchFromGitHub { owner = "stardot"; repo = "MatrixBrandy"; rev = "V${version}"; - hash = "sha256-alyg4AQ1nSISk3NwniTurRVWeUp1q/SQjK2loek8bfI="; + hash = "sha256-jw5SxCQ2flvCjO/JO3BHpnpt31wBsBxDkVH7uwVxTS0="; }; buildInputs = [ diff --git a/pkgs/by-name/ma/matrix-commander-rs/package.nix b/pkgs/by-name/ma/matrix-commander-rs/package.nix index 6215f7ddc69cb..78e0abebe88e1 100644 --- a/pkgs/by-name/ma/matrix-commander-rs/package.nix +++ b/pkgs/by-name/ma/matrix-commander-rs/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/ma/matrix-gtk-theme/package.nix b/pkgs/by-name/ma/matrix-gtk-theme/package.nix index 77283781bcaaa..5477ad89d6042 100644 --- a/pkgs/by-name/ma/matrix-gtk-theme/package.nix +++ b/pkgs/by-name/ma/matrix-gtk-theme/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, - gnome, + gnome-shell, sassc, gnome-themes-extra, gtk-engine-murrine, @@ -82,7 +82,7 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib propagatedUserEnvPkgs = [ gtk-engine-murrine ]; nativeBuildInputs = [ - gnome.gnome-shell + gnome-shell sassc ]; buildInputs = [ gnome-themes-extra ]; diff --git a/pkgs/by-name/ma/matrix-hebbot/package.nix b/pkgs/by-name/ma/matrix-hebbot/package.nix new file mode 100644 index 0000000000000..76517fdf22c04 --- /dev/null +++ b/pkgs/by-name/ma/matrix-hebbot/package.nix @@ -0,0 +1,67 @@ +{ + lib, + fetchFromGitHub, + stdenv, + rustPlatform, + pkg-config, + cmake, + openssl, + autoconf, + automake, + darwin, + unstableGitUpdater, + sqlite, +}: + +rustPlatform.buildRustPackage rec { + pname = "hebbot"; + version = "2.1-unstable-2024-09-20"; + + src = fetchFromGitHub { + owner = "haecker-felix"; + repo = "hebbot"; + rev = "4c7152a3ce88ecfbac06f823abd4fd849e0c30d1"; + hash = "sha256-y+KpxiEzVAggFoPvTOy0IEmAo2V6mOpM0VzEScUOtsM="; + }; + + cargoHash = "sha256-7AEWQIUHpeK4aNFzzU10YeJErD0fJ6yQSHwFe4utOFo="; + + nativeBuildInputs = + [ + pkg-config + cmake + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + autoconf + automake + ]; + + buildInputs = + [ + openssl + ] + ++ lib.optional stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + env = { + OPENSSL_NO_VENDOR = 1; + }; + + NIX_CFLAGS_LINK = [ + "-L${lib.getLib openssl}/lib" + "-L${lib.getLib sqlite}/lib" + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + 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/v${version}"; + license = with lib.licenses; [ agpl3Only ]; + mainProgram = "hebbot"; + maintainers = with lib.maintainers; [ a-kenji ]; + }; +} diff --git a/pkgs/by-name/ma/matrix-zulip-bridge/package.nix b/pkgs/by-name/ma/matrix-zulip-bridge/package.nix new file mode 100644 index 0000000000000..89d577665a1ae --- /dev/null +++ b/pkgs/by-name/ma/matrix-zulip-bridge/package.nix @@ -0,0 +1,57 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "MatrixZulipBridge"; + version = "0.4.1"; + pyproject = true; + + disabled = python3Packages.pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "GearKite"; + repo = "MatrixZulipBridge"; + rev = "v${version}"; + hash = "sha256-5bDqZb8xx5SjThZUSmOcctwo6B15cjkIwA26QNfED2A="; + }; + + build-system = with python3Packages; [ + poetry-core + ]; + + dependencies = with python3Packages; [ + zulip + beautifulsoup4 + bidict + coloredlogs + emoji + markdownify + mautrix + python-dotenv + ruamel-yaml + zulip-emoji-mapping + ]; + + pythonRelaxDeps = [ + "bidict" + "markdownify" + "ruamel-yaml" + "zulip-emoji-mapping" + ]; + + pythonImportsCheck = [ + "matrixzulipbridge" + ]; + + meta = { + description = "Matrix puppeting appservice bridge for Zulip"; + homepage = "https://github.com/GearKite/MatrixZulipBridge"; + changelog = "https://github.com/GearKite/MatrixZulipBridge/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ robertrichter ]; + mainProgram = "matrix-zulip-bridge"; + }; +} diff --git a/pkgs/by-name/ma/matterbridge/package.nix b/pkgs/by-name/ma/matterbridge/package.nix new file mode 100644 index 0000000000000..d847c02f3aa24 --- /dev/null +++ b/pkgs/by-name/ma/matterbridge/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule { + pname = "matterbridge"; + version = "1.26.0-unstable-2024-08-27"; + + src = fetchFromGitHub { + owner = "42wim"; + repo = "matterbridge"; + rev = "c4157a4d5b49fce79c80a30730dc7c404bacd663"; + hash = "sha256-ZnNVDlrkZd/I0NWmQMZzJ3RIruH0ARoVKJ4EyYVdMiw="; + }; + + subPackages = [ "." ]; + + vendorHash = null; + + 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 ]; + maintainers = with lib.maintainers; [ ryantm ]; + mainProgram = "matterbridge"; + }; +} diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index c4dffa14bc954..b147e74c22948 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-pD1NKUJmvMTnYKWjRrGnvbA0zVvGpWRIlf/9ovP9Jq4="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index d075c1882bb91..fa7eb781c1e40 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -13,18 +13,18 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-SjINeNtCbyMp3U+Op7ey+8lV7FYxLVpmO5g1a01ouBs="; + hash = "sha256-kFhY2ixZZrSA/YxLCQDLPjLqNWQI3zl5V1MLTPqQH60="; }; - cargoHash = "sha256-xJafCgpCeihyORj3gIVUus74vu9h3N1xuyKvkxSqYK4="; + cargoHash = "sha256-ik6kFS66umiHf0M1fE+6++zpZF4gJrN9LQ2l+vi9SSY="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 17639dc432e34..bf9ed2523006e 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -1,26 +1,34 @@ { buildGoModule , fetchFromGitHub +, nix-update-script , lib , nixosTests , olm +# This option enables the use of an experimental pure-Go implementation of the +# Olm protocol instead of libolm for end-to-end encryption. Using goolm is not +# recommended by the mautrix developers, but they are interested in people +# trying it out in non-production-critical environments and reporting any +# issues they run into. +, withGoolm ? false }: buildGoModule rec { pname = "mautrix-meta"; - version = "0.3.2"; + version = "0.4.0"; - subPackages = [ "." ]; + subPackages = [ "cmd/mautrix-meta" ]; src = fetchFromGitHub { owner = "mautrix"; repo = "meta"; rev = "v${version}"; - hash = "sha256-whBqhdB2FSFfrbtGtq8v3pjXW7QMt+I0baHTXVGPWVg="; + hash = "sha256-KJuLBJy/g4ShcylkqIG4OuUalwboUSErSif3p7x4Zo4="; }; - buildInputs = [ olm ]; + buildInputs = lib.optional (!withGoolm) olm; + tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-rP9wvF6yYW0TdQ+vQV6ZcVMxnCtqz8xRcd9v+4pYYio="; + vendorHash = "sha256-ErY40xIDhhOHQI/jYa8DcnfjOI998neIMgb/IQNP/JQ="; passthru = { tests = { @@ -29,13 +37,16 @@ buildGoModule rec { mautrix-meta-sqlite ; }; + + updateScript = nix-update-script { }; }; + meta = { homepage = "https://github.com/mautrix/meta"; - description = "Matrix <-> Facebook and Mautrix <-> Instagram hybrid puppeting/relaybot bridge"; + description = "Matrix <-> Facebook and Matrix <-> Instagram hybrid puppeting/relaybot bridge"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ rutherther ]; + maintainers = with lib.maintainers; [ rutherther eyjhb ]; mainProgram = "mautrix-meta"; }; } diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index 3808d40c6f9fc..a84cd64ee43c8 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/pkgs/by-name/ma/maven/build-maven-package.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation (builtins.removeAttrs args [ "mvnFetchExtraArgs" ] // { runHook preBuild mvnDeps=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd) + runHook afterDepsSetup mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnSkipTests} ${mvnParameters} runHook postBuild diff --git a/pkgs/by-name/mb/mbtileserver/package.nix b/pkgs/by-name/mb/mbtileserver/package.nix new file mode 100644 index 0000000000000..6c1b248a4af81 --- /dev/null +++ b/pkgs/by-name/mb/mbtileserver/package.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "mbtileserver"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "consbio"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-RLaAhc24zdCFvpSN2LZXNyS1ygg9zCi4jEj8owdreWU="; + }; + + vendorHash = "sha256-yn7LcR/DvHDSRicUnWLrFZKqZti+YQoLSk3mZkDIj10="; + + meta = with lib; { + description = "Simple Go-based server for map tiles stored in mbtiles format"; + mainProgram = "mbtileserver"; + homepage = "https://github.com/consbio/mbtileserver"; + changelog = "https://github.com/consbio/mbtileserver/blob/v${version}/CHANGELOG.md"; + license = licenses.isc; + maintainers = teams.geospatial.members; + }; +} diff --git a/pkgs/by-name/mc/mcdreforged/package.nix b/pkgs/by-name/mc/mcdreforged/package.nix index 31c53dfbe3f71..d9c216271205a 100644 --- a/pkgs/by-name/mc/mcdreforged/package.nix +++ b/pkgs/by-name/mc/mcdreforged/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mcdreforged"; - version = "2.13.1"; + version = "2.13.2"; pyproject = true; src = fetchFromGitHub { owner = "MCDReforged"; repo = "MCDReforged"; rev = "refs/tags/v${version}"; - hash = "sha256-Um4XSpkpJupBy5h/hUuHNyXnaDvjL1IIcmSqBHKycEM="; + hash = "sha256-4podJ3InBnNc+t4BpCQrg2QbJ9ZJr5fmroXyzo7JrZw="; }; build-system = [ python3.pkgs.setuptools ]; diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/by-name/mc/mcpp/package.nix similarity index 100% rename from pkgs/development/compilers/mcpp/default.nix rename to pkgs/by-name/mc/mcpp/package.nix diff --git a/pkgs/development/compilers/mcpp/readlink.patch b/pkgs/by-name/mc/mcpp/readlink.patch similarity index 100% rename from pkgs/development/compilers/mcpp/readlink.patch rename to pkgs/by-name/mc/mcpp/readlink.patch diff --git a/pkgs/by-name/mc/mcumgr-client/package.nix b/pkgs/by-name/mc/mcumgr-client/package.nix index f8909e8e2018b..db03704cbf262 100644 --- a/pkgs/by-name/mc/mcumgr-client/package.nix +++ b/pkgs/by-name/mc/mcumgr-client/package.nix @@ -27,8 +27,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = - lib.optionals stdenv.isLinux [ udev ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + lib.optionals stdenv.hostPlatform.isLinux [ udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; meta = with lib; { description = "Client for mcumgr commands"; diff --git a/pkgs/development/tools/literate-programming/md-tangle/default.nix b/pkgs/by-name/md/md-tangle/package.nix similarity index 100% rename from pkgs/development/tools/literate-programming/md-tangle/default.nix rename to pkgs/by-name/md/md-tangle/package.nix diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index 743616e8dc612..e781cd8a4f8d7 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security @@ -38,7 +38,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/henriklovhaug/md-tui"; changelog = "https://github.com/henriklovhaug/md-tui/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ + GaetanLepage + anas + ]; platforms = lib.platforms.all; mainProgram = "mdt"; }; diff --git a/pkgs/by-name/md/mdbook-alerts/package.nix b/pkgs/by-name/md/mdbook-alerts/package.nix index d3bb146a60f0f..085c191b92bc1 100644 --- a/pkgs/by-name/md/mdbook-alerts/package.nix +++ b/pkgs/by-name/md/mdbook-alerts/package.nix @@ -7,7 +7,7 @@ CoreServices ? darwin.apple_sdk.frameworks.CoreServices, }: let - version = "0.6.4"; + version = "0.6.6"; in rustPlatform.buildRustPackage { pname = "mdbook-alerts"; @@ -17,12 +17,12 @@ rustPlatform.buildRustPackage { owner = "lambdalisue"; repo = "rs-mdbook-alerts"; rev = "v${version}"; - hash = "sha256-bg3X7M2H553tGxH8cEkkT0XK20fWwkp2nTVEgtZ819s="; + hash = "sha256-npPQU53l/VtTH23YYT6SOa11eUPNcA96al06S5HNNFE="; }; - cargoHash = "sha256-MMhpH3WIAXnjw6xOl2HNfrIFEwjHfVDPquWnFhhZCMU="; + cargoHash = "sha256-1wumxZoNr1QIit+KjgioG5WlSLSsWfcisChUEISoGQE="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = { description = "Preprocessor for mdbook to support the inclusion of Markdown alerts"; diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index 8b30e7fea45cd..8b8a032654df2 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-lZ92vvRYXEBMx6ka8RP1wXctf73QNp5rNE8n7O96AEc="; doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index 8c33bb64e990f..4734394cd7e79 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -19,14 +19,14 @@ rustPlatform.buildRustPackage { owner = "rust-lang"; repo = "mdBook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-GGQK2Mf3EK1rwBMzQkAzWAaK6Fh0Qqqf8dtDjZPxOMA="; + hash = "sha256-GGQK2Mf3EK1rwBMzQkAzWAaK6Fh0Qqqf8dtDjZPxOMA="; }; cargoHash = "sha256-jriSQHn+Y+EWtwDJeMTAuCCHR7fEtWsErAxbG9a4pts="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd mdbook \ diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/by-name/md/mdds/package.nix similarity index 100% rename from pkgs/development/libraries/mdds/default.nix rename to pkgs/by-name/md/mdds/package.nix diff --git a/pkgs/by-name/md/mdns/package.nix b/pkgs/by-name/md/mdns/package.nix new file mode 100644 index 0000000000000..245b5a234c3e3 --- /dev/null +++ b/pkgs/by-name/md/mdns/package.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "mdns"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "mjansson"; + repo = "mdns"; + rev = version; + hash = "sha256-2uv+Ibnbl6hsdjFqPhcHXbv+nIEIT4+tgtwGndpZCqo="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Public domain mDNS/DNS-SD library in C"; + homepage = "https://github.com/mjansson/mdns"; + changelog = "https://github.com/mjansson/mdns/blob/${src.rev}/CHANGELOG"; + license = licenses.unlicense; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/md/mdt/package.nix b/pkgs/by-name/md/mdt/package.nix deleted file mode 100644 index 40090acf46e39..0000000000000 --- a/pkgs/by-name/md/mdt/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, darwin -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "mdt"; - version = "0.8.5"; - - src = fetchFromGitHub { - owner = "henriklovhaug"; - repo = "md-tui"; - rev = "v${version}"; - hash = "sha256-HUrL/+uXQ3753Qb5FZkftGZO+u+MsocFO3L3OzarEhg="; - }; - - cargoHash = "sha256-O25cb4aNQiU4T2SzxgzjFqL+pCzbM0d+DkkZHvCkMv8="; - - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; - - meta = { - description = "Markdown renderer in the terminal"; - homepage = "https://github.com/henriklovhaug/md-tui"; - changelog = "https://github.com/henriklovhaug/md-tui/releases/tag/v${version}"; - license = lib.licenses.agpl3Only; - mainProgram = "mdt"; - maintainers = with lib.maintainers; [ anas ]; - platforms = with lib.platforms; unix ++ windows; - }; -} diff --git a/pkgs/by-name/me/measureme/Cargo.lock b/pkgs/by-name/me/measureme/Cargo.lock new file mode 100644 index 0000000000000..4a0bc5493ceb3 --- /dev/null +++ b/pkgs/by-name/me/measureme/Cargo.lock @@ -0,0 +1,844 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "analyzeme" +version = "12.0.0" +dependencies = [ + "decodeme 10.1.3", + "decodeme 12.0.0", + "flate2", + "measureme 10.1.3", + "measureme 12.0.0", + "memchr", + "rustc-hash", + "serde", +] + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bytemuck" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" + +[[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.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crox" +version = "12.0.0" +dependencies = [ + "analyzeme", + "clap", + "measureme 12.0.0", + "rustc-hash", + "serde", + "serde_json", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "decodeme" +version = "10.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8907b810935b1fc70e90f415d88e5e3fb1fc0d17058c7da49d5e294eab89decf" +dependencies = [ + "measureme 10.1.3", + "memchr", + "rustc-hash", + "serde", + "serde_json", +] + +[[package]] +name = "decodeme" +version = "12.0.0" +dependencies = [ + "measureme 12.0.0", + "memchr", + "rustc-hash", + "serde", + "serde_json", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + +[[package]] +name = "flamegraph" +version = "12.0.0" +dependencies = [ + "analyzeme", + "clap", + "inferno", + "measureme 12.0.0", +] + +[[package]] +name = "flate2" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "inferno" +version = "0.11.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" +dependencies = [ + "ahash", + "is-terminal", + "itoa", + "log", + "num-format", + "once_cell", + "quick-xml", + "rgb", + "str_stack", +] + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags", + "libc", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "measureme" +version = "10.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f0c6afa424b30bee598dc5e8116cd01359bc57919cb10ac38cf9e0914f16c0b" +dependencies = [ + "log", + "memmap2", + "parking_lot", + "perf-event-open-sys", + "rustc-hash", + "smallvec", +] + +[[package]] +name = "measureme" +version = "12.0.0" +dependencies = [ + "log", + "memmap2", + "parking_lot", + "perf-event-open-sys", + "rustc-hash", + "smallvec", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4" +dependencies = [ + "libc", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mmedit" +version = "12.0.0" +dependencies = [ + "clap", + "decodeme 12.0.0", + "measureme 12.0.0", +] + +[[package]] +name = "mmview" +version = "12.0.0" +dependencies = [ + "analyzeme", + "clap", + "measureme 12.0.0", +] + +[[package]] +name = "num-format" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" +dependencies = [ + "arrayvec", + "itoa", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[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", +] + +[[package]] +name = "perf-event-open-sys" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b29be2ba35c12c6939f6bc73187f728bba82c3c062ecdc5fa90ea739282a1f58" +dependencies = [ + "libc", +] + +[[package]] +name = "prettytable-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" +dependencies = [ + "csv", + "encode_unicode", + "is-terminal", + "lazy_static", + "term", + "unicode-width", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "rgb" +version = "0.8.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.127" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "stack_collapse" +version = "12.0.0" +dependencies = [ + "analyzeme", + "clap", + "measureme 12.0.0", +] + +[[package]] +name = "str_stack" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "summarize" +version = "12.0.0" +dependencies = [ + "analyzeme", + "clap", + "measureme 12.0.0", + "prettytable-rs", + "rustc-hash", + "serde", + "serde_json", +] + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/by-name/me/measureme/package.nix b/pkgs/by-name/me/measureme/package.nix new file mode 100644 index 0000000000000..4a0e426d3f6fe --- /dev/null +++ b/pkgs/by-name/me/measureme/package.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "measureme"; + version = "12.0.0"; + + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "measureme"; + rev = version; + hash = "sha256-Zgl8iyBDVwqZnbfqC06DMuo0S/hV6pl812hkiovmS+I="; + }; + + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + meta = with lib; { + description = "Support crate for rustc's self-profiling feature"; + homepage = "https://github.com/rust-lang/measureme"; + license = licenses.asl20; + maintainers = [ maintainers.t4ccer ]; + }; +} diff --git a/pkgs/by-name/me/med/package.nix b/pkgs/by-name/me/med/package.nix index 5edc2e3201bdd..0e122a900c55e 100644 --- a/pkgs/by-name/me/med/package.nix +++ b/pkgs/by-name/me/med/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "allencch"; repo = "med"; rev = version; - sha256 = "sha256-m2lVRSNaklB0Xfqgtyc0lNWXfTD8wTWsE06eGv4FOBE="; + hash = "sha256-m2lVRSNaklB0Xfqgtyc0lNWXfTD8wTWsE06eGv4FOBE="; }; nativeBuildInputs = [ qt6.wrapQtAppsHook cmake pkg-config ]; diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 2496b1f3495a7..4da1bfba070b9 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-yAG9F9helGM8/TjJiqMDUviHK6uEUvHGny2QklwB2JY="; + hash = "sha256-uN7u6/XRDpJFaZiMOYzLvTC7f0MIlKUGh6ter6aPzbI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix index 3c9da25e33a5d..b649afd83abe1 100644 --- a/pkgs/by-name/me/mediainfo-gui/package.nix +++ b/pkgs/by-name/me/mediainfo-gui/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libmediainfo wxGTK32 desktop-file-utils libSM imagemagick ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; sourceRoot = "MediaInfo/Project/GNU/GUI"; diff --git a/pkgs/by-name/me/megatools/package.nix b/pkgs/by-name/me/megatools/package.nix new file mode 100644 index 0000000000000..6e744f5d4b89f --- /dev/null +++ b/pkgs/by-name/me/megatools/package.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchgit +, asciidoc +, docbook_xml_dtd_45 +, docbook2x +, libxml2 +, meson +, ninja +, pkg-config +, curl +, glib +, fuse +}: + +stdenv.mkDerivation rec { + pname = "megatools"; + version = "1.11.0"; + + src = fetchgit { + url = "https://megous.com/git/megatools"; + rev = version; + sha256 = "sha256-Q9hMJBQBenufubbmeAw8Q8w+Oo+UcZLWathKNDwTv3s="; + }; + + nativeBuildInputs = [ + asciidoc + docbook_xml_dtd_45 + docbook2x + libxml2 + meson + ninja + pkg-config + ]; + + buildInputs = [ + curl + glib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse ]; + + enableParallelBuilding = true; + strictDeps = true; + + meta = with lib; { + description = "Command line client for Mega.co.nz"; + homepage = "https://megatools.megous.com/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix index ab5542bb8cb69..0fc8b082ca311 100644 --- a/pkgs/by-name/me/meli/package.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchzip +, fetchpatch , rustPlatform # native build inputs @@ -23,7 +24,7 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "0.8.6"; + version = "0.8.7"; src = fetchzip { urls = [ @@ -31,10 +32,19 @@ rustPlatform.buildRustPackage rec { "https://codeberg.org/meli/meli/archive/v${version}.tar.gz" "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz" ]; - hash = "sha256-7lSxXv2i8B6vRWIJqMiXlMqHH6fmgACy9X5qNKuj+IU="; + hash = "sha256-2+JIehi2wuWdARbhFPvNPIJ9ucZKWjNSORszEG9lyjw="; }; - cargoHash = "sha256-vZkMfaALnRBK9ZwMB2uvvJgQq+BdUX7enNnr9t5H+MY="; + cargoHash = "sha256-ZVhUkpiiPKbWcf56cXFgn3Nyr63STHLlD7mpYEetNIY="; + + cargoPatches = [ + (fetchpatch { + # https://github.com/NixOS/nixpkgs/issues/332957#issuecomment-2278578811 + name = "fix-rust-1.80-compat.patch"; + url = "https://git.meli-email.org/meli/meli/commit/6b05279a0987315c401516cac8ff0b016a8e02a8.patch"; + hash = "sha256-mh8H7wmHMXAe01UTvdY8vJeeLyH6ZFwylNLFFL+4LO0="; + }) + ]; # Needed to get openssl-sys to use pkg-config OPENSSL_NO_VENDOR=1; @@ -55,6 +65,7 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ file + gnum4 ]; postInstall = '' @@ -70,14 +81,13 @@ rustPlatform.buildRustPackage rec { ''; checkFlags = [ - "--skip=conf::test_config_parse" # panicking due to sandbox - "--skip=smtp::test::test_smtp" # requiring network - "--skip=utils::xdg::query_default_app" # doesn't build - "--skip=utils::xdg::query_mime_info" # doesn't build + "--skip=conf::tests::test_config_parse" # panicking due to sandbox + "--skip=utils::tests::test_shellexpandtrait_impls" # panicking due to sandbox + "--skip=utils::tests::test_shellexpandtrait" # panicking due to sandbox ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Terminal e-mail client and e-mail client library"; mainProgram = "meli"; homepage = "https://meli.delivery"; diff --git a/pkgs/by-name/me/melodeon/package.nix b/pkgs/by-name/me/melodeon/package.nix new file mode 100644 index 0000000000000..b7df31cebf794 --- /dev/null +++ b/pkgs/by-name/me/melodeon/package.nix @@ -0,0 +1,42 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + qt6, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "melodeon"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "CDrummond"; + repo = "melodeon"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-k74iJ3tmkMGUh4f538tjD7cv4ZXxm3x6M/d5HU25yPQ="; + fetchSubmodules = true; + }; + + buildInputs = [ + qt6.qtbase + qt6.qtwebengine + ]; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ]; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + meta = { + description = "QWebEngine wrapper for MaterialSkin on Lyrion Music Server (formerly Logitech Media Server)"; + mainProgram = "melodeon"; + homepage = "https://github.com/CDrummond/melodeon"; + changelog = "https://github.com/CDrummond/melodeon/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ edgar-vincent ]; + }; +}) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 6ab2a211b7104..d08bd3c5af835 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-08-21"; + version = "0.9.5-unstable-2024-09-29"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "4f6498c99c5dcdb780371fe936d49e32df148e6e"; - hash = "sha256-GfcPWWWAO9zQrqr2+CxNMaIxcfswZhDw1DFjrmpWZ2Q="; + rev = "e9446fa9dc3ba64c22f8e5bb611ad394b5729eda"; + hash = "sha256-0YNF9NPKaaKzC3d8cXG4Od3AUc1zxVtuB5u2Q8ruwr0="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { qtmultimedia zstd ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland qtwayland ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; qtWrapperArgs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ libpcap @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ] }" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" ]; diff --git a/pkgs/by-name/me/memtest_vulkan/package.nix b/pkgs/by-name/me/memtest_vulkan/package.nix index ee20010197167..cdbcc7982b839 100644 --- a/pkgs/by-name/me/memtest_vulkan/package.nix +++ b/pkgs/by-name/me/memtest_vulkan/package.nix @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "memtest_vulkan"; broken = stdenv.system == "aarch64-linux" # error: linker `aarch64-linux-gnu-gcc` not found - || stdenv.isDarwin; # Can't find Vulkan; might work though? + || stdenv.hostPlatform.isDarwin; # Can't find Vulkan; might work though? }; } diff --git a/pkgs/by-name/me/meow/package.nix b/pkgs/by-name/me/meow/package.nix new file mode 100644 index 0000000000000..afadac89b9b87 --- /dev/null +++ b/pkgs/by-name/me/meow/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "meow"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "PixelSergey"; + repo = "meow"; + rev = "v${version}"; + hash = "sha256-PB871c137uxxPaYbV6NB8kECVUrQWTeVz0ciVLHrph4="; + }; + + cargoHash = "sha256-4BoKZUgt4jf8jy2HU3J6RuT0GXNqkJnBUR09wNlNm7E="; + + postInstall = '' + ln -s $out/bin/meow-cli $out/bin/meow + ''; + + meta = { + description = "Print ASCII cats to your terminal"; + homepage = "https://github.com/PixelSergey/meow"; + license = lib.licenses.mit; + mainProgram = "meow"; + maintainers = with lib.maintainers; [ pixelsergey ]; + }; +} diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix index 7e2f34ed57929..c240538ccdb13 100644 --- a/pkgs/by-name/me/mercure/package.nix +++ b/pkgs/by-name/me/mercure/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "mercure"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "dunglas"; repo = "mercure"; rev = "v${version}"; - hash = "sha256-HqeF/Wr5ngf6hpFrZAL8kdHcMuxUslWsjtlOq4+C48s="; + hash = "sha256-mRBnjX9jXo2yoftDo8F6kNZeddFkFyUQ6eWxWoxzk2w="; }; sourceRoot = "${src.name}/caddy"; - vendorHash = "sha256-mRyzih46M635uQ9kIQ1vIe/ToN92xlvUcxQ7Bw/Qxiw="; + vendorHash = "sha256-ylPHBb/3lX9vwszyf7QzGPxGXE/Jt3cLKhsfmGMG8WM="; subPackages = [ "mercure" ]; excludedPackages = [ "../cmd/mercure" ]; diff --git a/pkgs/by-name/me/merge-ut-dictionaries/package.nix b/pkgs/by-name/me/merge-ut-dictionaries/package.nix new file mode 100644 index 0000000000000..ebe05f2fd1fd9 --- /dev/null +++ b/pkgs/by-name/me/merge-ut-dictionaries/package.nix @@ -0,0 +1,90 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, + python3, + jawiki-all-titles-in-ns0, + ibus-engines, + + mozcdic-ut-jawiki, + mozcdic-ut-personal-names, + mozcdic-ut-place-names, + mozcdic-ut-sudachidict, + + dictionaries ? [ + mozcdic-ut-jawiki + mozcdic-ut-personal-names + mozcdic-ut-place-names + mozcdic-ut-sudachidict + ], +}: + +assert lib.assertMsg (dictionaries != [ ]) "merge-ut-dictionaries needs at least one dictionary."; + +stdenvNoCC.mkDerivation { + pname = "merge-ut-dictionaries"; + version = "0-unstable-2024-09-09"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "merge-ut-dictionaries"; + rev = "35dfcca5c8657f2bf78bc000baa349c322ecb771"; + hash = "sha256-s6m430nXrG5v6iA+Fp2CKDPfFoAZirw/c3WahLrsaL4="; + }; + + nativeBuildInputs = [ python3 ]; + + preConfigure = '' + cd src + + substituteInPlace make.sh \ + --replace-fail "git" "true #" \ + --replace-fail "mv mozcdic-ut" "#" + + substituteInPlace count_word_hits.py \ + --replace-fail 'subprocess.run' "#" \ + --replace-fail "jawiki-latest-all-titles-in-ns0.gz" "${jawiki-all-titles-in-ns0}/jawiki-all-titles-in-ns0.gz" + + substituteInPlace remove_duplicate_ut_entries.py \ + --replace-fail "url =" 'url = "${ibus-engines.mozc.src}/src/data/dictionary_oss/id.def"#' \ + --replace-fail "urllib.request.urlopen" "open" \ + --replace-fail "read().decode()" "read()" + + for dir in ${lib.concatStringsSep " " dictionaries}; do + cp -v $dir/mozcdic-ut-*.txt.tar.bz2 . + done + ''; + + buildPhase = '' + runHook preBuild + + bash make.sh + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dt $out mozcdic-ut.txt + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT dictionaries are additional dictionaries for Mozc."; + homepage = "https://github.com/utuhiro78/merge-ut-dictionaries"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides a dictionary + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/by-name/me/merkaartor/package.nix b/pkgs/by-name/me/merkaartor/package.nix new file mode 100644 index 0000000000000..8d3abd715a434 --- /dev/null +++ b/pkgs/by-name/me/merkaartor/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + gdal, + proj, + protobuf, + qt5, + withGeoimage ? true, + exiv2, + withGpsdlib ? (!stdenv.hostPlatform.isDarwin), + gpsd, + withLibproxy ? false, + libproxy, + withZbar ? false, + zbar, +}: + +stdenv.mkDerivation rec { + pname = "merkaartor"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "openstreetmap"; + repo = "merkaartor"; + rev = version; + hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt5.qttools + qt5.wrapQtAppsHook + ]; + + buildInputs = + [ + gdal + proj + protobuf + qt5.qtnetworkauth + qt5.qtsvg + qt5.qtwebengine + ] + ++ lib.optional withGeoimage exiv2 + ++ lib.optional withGpsdlib gpsd + ++ lib.optional withLibproxy libproxy + ++ lib.optional withZbar zbar; + + cmakeFlags = [ + (lib.cmakeBool "GEOIMAGE" withGeoimage) + (lib.cmakeBool "GPSD" withGpsdlib) + (lib.cmakeBool "LIBPROXY" withLibproxy) + (lib.cmakeBool "WEBENGINE" true) + (lib.cmakeBool "ZBAR" withZbar) + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/merkaartor.app $out/Applications + # Prevent wrapping, otherwise plugins will not be loaded + chmod -x $out/Applications/merkaartor.app/Contents/plugins/background/*.dylib + makeWrapper $out/{Applications/merkaartor.app/Contents/MacOS,bin}/merkaartor + ''; + + meta = { + description = "OpenStreetMap editor"; + homepage = "http://merkaartor.be/"; + license = lib.licenses.gpl2Plus; + mainProgram = "merkaartor"; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/me/meson/0001-Revert-rust-recursively-pull-proc-macro-dependencies.patch b/pkgs/by-name/me/meson/0001-Revert-rust-recursively-pull-proc-macro-dependencies.patch deleted file mode 100644 index ff9440905310b..0000000000000 --- a/pkgs/by-name/me/meson/0001-Revert-rust-recursively-pull-proc-macro-dependencies.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 8304b645c655832c47ee9ca706d182c26d29eaff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Tue, 9 Apr 2024 06:35:39 +0000 -Subject: [PATCH] Revert "rust: recursively pull proc-macro dependencies as - well" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit aee941559c4b88a062e88186819a820c69c200ae. - -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> ---- - mesonbuild/build.py | 2 ++ - test cases/rust/18 proc-macro/lib.rs | 8 -------- - test cases/rust/18 proc-macro/meson.build | 11 ----------- - test cases/rust/18 proc-macro/subdir/meson.build | 1 - - .../rust/18 proc-macro/transitive-proc-macro.rs | 7 ------- - 5 files changed, 2 insertions(+), 27 deletions(-) - delete mode 100644 test cases/rust/18 proc-macro/lib.rs - delete mode 100644 test cases/rust/18 proc-macro/subdir/meson.build - delete mode 100644 test cases/rust/18 proc-macro/transitive-proc-macro.rs - -diff --git a/mesonbuild/build.py b/mesonbuild/build.py -index 6f0d6a2dd..7be9b497b 100644 ---- a/mesonbuild/build.py -+++ b/mesonbuild/build.py -@@ -1295,6 +1295,8 @@ def get_dependencies_recurse(self, result: OrderedSet[BuildTargetTypes], include - for t in self.link_targets: - if t in result: - continue -+ if t.rust_crate_type == 'proc-macro': -+ continue - if include_internals or not t.is_internal(): - result.add(t) - if isinstance(t, StaticLibrary): -diff --git a/test cases/rust/18 proc-macro/lib.rs b/test cases/rust/18 proc-macro/lib.rs -deleted file mode 100644 -index 5242886cc..000000000 ---- a/test cases/rust/18 proc-macro/lib.rs -+++ /dev/null -@@ -1,8 +0,0 @@ --extern crate proc_macro_examples; --use proc_macro_examples::make_answer; -- --make_answer!(); -- --pub fn func() -> u32 { -- answer() --} -diff --git a/test cases/rust/18 proc-macro/meson.build b/test cases/rust/18 proc-macro/meson.build -index e8b28eda1..c5f0dfc82 100644 ---- a/test cases/rust/18 proc-macro/meson.build -+++ b/test cases/rust/18 proc-macro/meson.build -@@ -31,14 +31,3 @@ main = executable( - ) - - test('main_test2', main) -- --subdir('subdir') -- --staticlib = static_library('staticlib', 'lib.rs', -- link_with: pm_in_subdir, -- rust_dependency_map : {'proc_macro_examples3' : 'proc_macro_examples'} --) -- --executable('transitive-proc-macro', 'transitive-proc-macro.rs', -- link_with: staticlib, --) -diff --git a/test cases/rust/18 proc-macro/subdir/meson.build b/test cases/rust/18 proc-macro/subdir/meson.build -deleted file mode 100644 -index 04842c431..000000000 ---- a/test cases/rust/18 proc-macro/subdir/meson.build -+++ /dev/null -@@ -1 +0,0 @@ --pm_in_subdir = rust.proc_macro('proc_macro_examples3', '../proc.rs') -diff --git a/test cases/rust/18 proc-macro/transitive-proc-macro.rs b/test cases/rust/18 proc-macro/transitive-proc-macro.rs -deleted file mode 100644 -index 4c804b3b6..000000000 ---- a/test cases/rust/18 proc-macro/transitive-proc-macro.rs -+++ /dev/null -@@ -1,7 +0,0 @@ --extern crate staticlib; --use staticlib::func; -- -- --fn main() { -- assert_eq!(42, func()); --} --- -2.44.0 - diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index d817c63708be0..db59daf3a6a8f 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -108,7 +108,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -116,7 +116,7 @@ python3.pkgs.buildPythonApplication rec { OpenAL OpenGL openldap - ] ++ lib.optionals (stdenv.cc.isClang && !stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.cc.isClang && !stdenv.hostPlatform.isDarwin) [ # https://github.com/mesonbuild/meson/blob/bd3f1b2e0e70ef16dfa4f441686003212440a09b/test%20cases/common/184%20openmp/meson.build llvmPackages.openmp # https://github.com/mesonbuild/meson/blob/1670fca36fcb1a4fe4780e96731e954515501a35/test%20cases/frameworks/29%20blocks/meson.build @@ -144,10 +144,10 @@ python3.pkgs.buildPythonApplication rec { ''test cases/linuxlike/14 static dynamic linkage'' # Nixpkgs cctools does not have bitcode support. ''test cases/osx/7 bitcode'' - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # requires llvmPackages.openmp, creating cyclic dependency ''test cases/common/184 openmp'' - ] ++ lib.optionals stdenv.isFreeBSD [ + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ # pch doesn't work quite right on FreeBSD, I think ''test cases/common/13 pch'' ])) diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix index b4661d096efb9..e1e0a3b771c13 100644 --- a/pkgs/by-name/me/mesonlsp/package.nix +++ b/pkgs/by-name/me/mesonlsp/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mesonlsp"; - version = "4.3.3"; + version = "4.3.5"; src = fetchFromGitHub { owner = "JCWasmx86"; repo = "mesonlsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-6p+IufgUCZj21ylkZiYS8kVAdFgDZpOST5Lgb0mXDhQ="; + hash = "sha256-E2XKnvARq45AjAc0iBVyb2ssNyJOUye4MWOofZV2ahs="; }; patches = [ ./disable-tests-that-require-network-access.patch ]; @@ -52,11 +52,11 @@ stdenv.mkDerivation (finalAttrs: { libpkgconf nlohmann_json ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libossp_uuid pkgsStatic.fmt ] - ++ lib.optionals stdenv.isLinux [ libuuid ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libuuid ]; mesonFlags = [ "-Dbenchmarks=false" ]; diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix index 3904fb25edb2d..c5691dd8fab78 100644 --- a/pkgs/by-name/me/metacity/package.nix +++ b/pkgs/by-name/me/metacity/package.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Window manager used in Gnome Flashback"; homepage = "https://gitlab.gnome.org/GNOME/metacity"; + changelog = "https://gitlab.gnome.org/GNOME/metacity/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix index 0911b800ee2a4..6b5b6c7e8fe75 100644 --- a/pkgs/by-name/me/metacubexd/package.nix +++ b/pkgs/by-name/me/metacubexd/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "metacubexd"; - version = "1.146.1"; + version = "1.150.0"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "metacubexd"; rev = "v${finalAttrs.version}"; - hash = "sha256-Vm2DPdfHx0WtB8RFq0wfCvBVdGVaX6PXrN/nAtNKv1E="; + hash = "sha256-UItmZmrcCSO7705TzEO80IVGSsCrDjm9Apw17XAQ9jY="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-G95Iu268vnYwFsbD/kTy8n/Fu5Da9qXdy3LadbrsUHc="; + hash = "sha256-jIotwZmFzzv3jN4iXV4aonxnVDuIGzxNH8RGD0r7t0c="; }; buildPhase = '' diff --git a/pkgs/by-name/me/meteor-git/package.nix b/pkgs/by-name/me/meteor-git/package.nix index 46676277aec0e..0f922c2dfcac0 100644 --- a/pkgs/by-name/me/meteor-git/package.nix +++ b/pkgs/by-name/me/meteor-git/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "meteor-git"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "stefanlogue"; repo = "meteor"; rev = "v${version}"; - hash = "sha256-UA6bye9ti9AwnZkBIGjljDElkIEOhsiJ0NyYdKbF5m0="; + hash = "sha256-APsP9kzO5QMCgqIaMF01/NB3bT17gNNFZ1mxFThfvgQ="; }; vendorHash = "sha256-jKd/eJwp5SZvTrP3RN7xT7ibAB0PQondGR3RT+HQXIo="; diff --git a/pkgs/by-name/me/metronome/package.nix b/pkgs/by-name/me/metronome/package.nix index f21a941a9e378..6c75f65dd3d7a 100644 --- a/pkgs/by-name/me/metronome/package.nix +++ b/pkgs/by-name/me/metronome/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/me/mev-boost/package.nix b/pkgs/by-name/me/mev-boost/package.nix index bb1a91010382a..4e66b0e49f6d4 100644 --- a/pkgs/by-name/me/mev-boost/package.nix +++ b/pkgs/by-name/me/mev-boost/package.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "mev-boost"; - version = "1.7.1"; + version = "1.8"; src = fetchFromGitHub { owner = "flashbots"; repo = "mev-boost"; rev = "v${version}"; - hash = "sha256-4Vxs1Jo7rkw9l0pXfi+J7YmzQawt7tc19I1MdHQgjBA="; + hash = "sha256-EFPVBSSIef3cTrYp3X1xCEOtYcGpuW/GZXHXX+0wGd8="; }; - vendorHash = "sha256-yfWDGVfgCfsmzI5oxEmhHXKCUAHe6wWTkaMkBN5kQMw="; + vendorHash = "sha256-xkncfaqNfgPt5LEQ3JyYXHHq6slOUchomzqwkZCgCOM="; meta = with lib; { description = "Ethereum block-building middleware"; diff --git a/pkgs/by-name/mf/mfcj880dwcupswrapper/package.nix b/pkgs/by-name/mf/mfcj880dwcupswrapper/package.nix index 38ff805770714..5fbc3948f0325 100644 --- a/pkgs/by-name/mf/mfcj880dwcupswrapper/package.nix +++ b/pkgs/by-name/mf/mfcj880dwcupswrapper/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.brother.com/welcome/dlf102044/mfcj880dw_cupswrapper_GPL_source_${version}.tar.gz"; - sha256 = "bf291fe31d64afeaefb5b0e606f4baf80c41d80009e34b32b77d56f759e9cf94"; + hash = "sha256-vykf4x1kr+rvtbDmBvS6+AxB2AAJ40syt31W91npz5Q="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mf/mfcj880dwlpr/package.nix b/pkgs/by-name/mf/mfcj880dwlpr/package.nix index cbfcd2b54b9c4..a1d0a9c44f064 100644 --- a/pkgs/by-name/mf/mfcj880dwlpr/package.nix +++ b/pkgs/by-name/mf/mfcj880dwlpr/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.brother.com/welcome/dlf102038/mfcj880dwlpr-${version}.i386.deb"; - sha256 = "1680b301f660a407fe0b69f5de59c7473d2d66dc472a1589b0cd9f51736bfea7"; + hash = "sha256-FoCzAfZgpAf+C2n13lnHRz0tZtxHKhWJsM2fUXNr/qc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mi/micro/package.nix b/pkgs/by-name/mi/micro/package.nix index e7c25d77bc40c..8f2bb8488db38 100644 --- a/pkgs/by-name/mi/micro/package.nix +++ b/pkgs/by-name/mi/micro/package.nix @@ -1,26 +1,14 @@ { lib, - stdenv, buildGoModule, + callPackage, fetchFromGitHub, installShellFiles, - callPackage, - wl-clipboard, - xclip, - makeWrapper, - # Boolean flags - withXclip ? stdenv.isLinux, - withWlClipboard ? - if withWlclip != null then - lib.warn '' - withWlclip is deprecated and will be removed; - use withWlClipboard instead. - '' withWlclip - else - stdenv.isLinux, + stdenv, # Deprecated options - # Remove them before or right after next version update from Nixpkgs or this - # package itself + # Remove them as soon as possible + withXclip ? null, + withWlClipboard ? null, withWlclip ? null, }: @@ -38,10 +26,7 @@ let vendorHash = "sha256-ePhObvm3m/nT+7IyT0W6K+y+9UNkfd2kYjle2ffAd9Y="; - nativeBuildInputs = [ - installShellFiles - makeWrapper - ]; + nativeBuildInputs = [ installShellFiles ]; outputs = [ "out" @@ -73,22 +58,12 @@ let install -Dm644 assets/micro-logo-mark.svg $out/share/icons/hicolor/scalable/apps/micro.svg ''; - postFixup = - let - clipboardPackages = - lib.optionals withXclip [ xclip ] - ++ lib.optionals withWlClipboard [ wl-clipboard ]; - in - lib.optionalString (withXclip || withWlClipboard) '' - wrapProgram "$out/bin/micro" \ - --prefix PATH : "${lib.makeBinPath clipboardPackages}" - ''; - passthru = { tests = lib.packagesFromDirectoryRecursive { inherit callPackage; directory = ./tests; }; + wrapper = callPackage ./wrapper.nix { micro = self; }; }; meta = { @@ -114,4 +89,11 @@ let }; }; in -self +lib.warnIf (withXclip != null || withWlClipboard != null || withWlclip != null) '' + The options `withXclip`, `withWlClipboard`, `withWlclip` were removed. If + you are seeking for clipboard support, please consider the following + packages: + - `micro-with-wl-clipboard` + - `micro-with-xclip` + - `micro-full` +'' self diff --git a/pkgs/by-name/mi/micro/wrapper.nix b/pkgs/by-name/mi/micro/wrapper.nix new file mode 100644 index 0000000000000..1455fb44c4479 --- /dev/null +++ b/pkgs/by-name/mi/micro/wrapper.nix @@ -0,0 +1,33 @@ +{ + lib, + micro, + makeWrapper, + symlinkJoin, + # configurable options + extraPackages ? [ ], +}: + +symlinkJoin { + name = "micro-wrapped-${micro.version}"; + inherit (micro) pname version outputs; + + nativeBuildInputs = [ makeWrapper ]; + + paths = [ micro ]; + + postBuild = '' + ${lib.concatMapStringsSep "\n" ( + output: "ln --verbose --symbolic --no-target-directory ${micro.${output}} \$${output}" + ) (lib.remove "out" micro.outputs)} + + pushd $out/bin + for f in *; do + rm $f + makeWrapper ${micro}/bin/$f $f \ + --prefix PATH ":" "${lib.makeBinPath extraPackages}" + done + popd + ''; + + meta = micro.meta; +} diff --git a/pkgs/by-name/mi/microcode-amd/package.nix b/pkgs/by-name/mi/microcode-amd/package.nix new file mode 100644 index 0000000000000..44399fdb7ca8f --- /dev/null +++ b/pkgs/by-name/mi/microcode-amd/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + linux-firmware, + libarchive, +}: + +stdenv.mkDerivation { + pname = "amd-ucode"; + version = linux-firmware.version; + + src = linux-firmware; + + sourceRoot = "."; + + nativeBuildInputs = [ libarchive ]; + + buildPhase = '' + mkdir -p kernel/x86/microcode + find ${linux-firmware}/lib/firmware/amd-ucode -name \*.bin -print0 | sort -z |\ + xargs -0 -I{} sh -c 'cat {} >> kernel/x86/microcode/AuthenticAMD.bin' + ''; + + installPhase = '' + mkdir -p $out + touch -d @$SOURCE_DATE_EPOCH kernel/x86/microcode/AuthenticAMD.bin + echo kernel/x86/microcode/AuthenticAMD.bin | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- > $out/amd-ucode.img + ''; + + meta = with lib; { + description = "AMD Processor microcode patch"; + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; + license = licenses.unfreeRedistributableFirmware; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; + }; +} diff --git a/pkgs/by-name/mi/microcode-intel/package.nix b/pkgs/by-name/mi/microcode-intel/package.nix new file mode 100644 index 0000000000000..26916216f437a --- /dev/null +++ b/pkgs/by-name/mi/microcode-intel/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libarchive, + iucode-tool, +}: + +stdenv.mkDerivation rec { + pname = "microcode-intel"; + version = "20240910"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "Intel-Linux-Processor-Microcode-Data-Files"; + rev = "microcode-${version}"; + hash = "sha256-cn0qK81dwbamh5PBlPuC9KtDWyT2NwSxDD0XlCRAv6s="; + }; + + nativeBuildInputs = [ + iucode-tool + libarchive + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out kernel/x86/microcode + iucode_tool -w kernel/x86/microcode/GenuineIntel.bin intel-ucode/ + touch -d @$SOURCE_DATE_EPOCH kernel/x86/microcode/GenuineIntel.bin + echo kernel/x86/microcode/GenuineIntel.bin | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- > $out/intel-ucode.img + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.intel.com/"; + changelog = "https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/${src.rev}"; + description = "Microcode for Intel processors"; + license = licenses.unfreeRedistributableFirmware; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; + maintainers = with maintainers; [ felixsinger ]; + }; +} diff --git a/pkgs/by-name/mi/microdnf/package.nix b/pkgs/by-name/mi/microdnf/package.nix index ec9a1daf59451..ae890fec7c29d 100644 --- a/pkgs/by-name/mi/microdnf/package.nix +++ b/pkgs/by-name/mi/microdnf/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-R7jOeH6pw/THLXxLezp2AmE8lUBagKMRJ0XfXgdLi2E="; + hash = "sha256-R7jOeH6pw/THLXxLezp2AmE8lUBagKMRJ0XfXgdLi2E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index dc7c362bc5a38..7177480ad8f41 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.18.7"; + version = "1.18.9"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-+9tVkMOOGwdmOXhoXanOpp8/7TEGGLR2aTeOsw+FzKc="; + hash = "sha256-WVzJymXmtPV5AGYYuFDlrhy5Hh9eUBOFG8UhAnFZ22g="; }; - vendorHash = "sha256-wbJgJY1EH3ajmoWXWRCSpD2C0eknajkwD1DaQz2EsUU="; + vendorHash = "sha256-A10XICoieWc0FJAn2G2aolefLjguwL72qrr4KjMFYZE="; excludedPackages = [ "./test" ]; diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix new file mode 100644 index 0000000000000..c3e590e80fd41 --- /dev/null +++ b/pkgs/by-name/mi/miniflux/package.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests, nix-update-script }: + +buildGoModule rec { + pname = "miniflux"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "miniflux"; + repo = "v2"; + rev = "refs/tags/${version}"; + hash = "sha256-b4slACQl+3vDsioULVKscBhS8LvTxCUPDnO7GlT46CM="; + }; + + vendorHash = "sha256-PL5tc6MQRHloc3Dfw+FpWdqrXErFPjEb8RNPmHr7jSk="; + + nativeBuildInputs = [ installShellFiles ]; + + checkFlags = [ "-skip=TestClient" ]; # skip client tests as they require network access + + ldflags = [ + "-s" "-w" "-X miniflux.app/v2/internal/version.Version=${version}" + ]; + + postInstall = '' + mv $out/bin/miniflux.app $out/bin/miniflux + installManPage miniflux.1 + ''; + + passthru = { + tests = nixosTests.miniflux; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Minimalist and opinionated feed reader"; + homepage = "https://miniflux.app/"; + license = licenses.asl20; + maintainers = with maintainers; [ rvolosatovs benpye emilylange ]; + mainProgram = "miniflux"; + }; +} diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 84aa6de0ba0db..f88c314b693ff 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-ctFer7KPvES/tSV2e3G3rRIe7z2U4wgViB2qxBZuTUM="; + hash = "sha256-fASPxNSkSQtg05hmSK48AAEd9MpcoFqCt5hkk2vIR2A="; }; - cargoHash = "sha256-kDWmUg86aZP99ebkv/1aKT2YJv7DdTT5oxnegxpD9gQ="; + cargoHash = "sha256-dPNWeuBAWV7ynh9t+DEaR0xb0cAa27Pp44Hm68mWTwI="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index c939951885027..2a6ff5f5c53ef 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -10,6 +10,7 @@ glib, glm, gtest, + json_c, libevdev, libglvnd, libnotify, @@ -26,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.3.2"; + version = "0.3.6"; src = fetchFromGitHub { owner = "mattkae"; repo = "miracle-wm"; rev = "v${finalAttrs.version}"; - hash = "sha256-T5KDnUy/+wRL74v48i3D1OQrHuIoI1WUeybx9D7y+8Y="; + hash = "sha256-fK/g6DhcxJMvxujZDZXs1yXRu2FGZQKmhxw7/czAQiY="; }; patches = [ @@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { boost glib glm + json_c libevdev libglvnd libnotify diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix index 48f990e902c1b..c842e475ca1aa 100644 --- a/pkgs/by-name/mi/miru/package.nix +++ b/pkgs/by-name/mi/miru/package.nix @@ -36,7 +36,7 @@ let updateScript = ./update.sh; }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index fb9db7dce80d9..c611ccdd7eaf0 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; rev = "refs/tags/v${version}"; - hash = "sha256-1ggiNO5ZYYmV44ub80IpzsHCcsEYhRlWcZtX012hJxQ="; + hash = "sha256-mi3lM/BQ16dCVX/kVRNhIis4sh6M0TMuK05q/pXJiS8="; }; - vendorHash = "sha256-hx03o4LaqFNylStCkt/MFtgwvsOZFFcEC/c54g1kCNk="; + vendorHash = "sha256-aABtsS39yxBBFMN98fjr4gy6QeF3dobrZqeZmmv2ywQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/mi/mission-center/Cargo.lock b/pkgs/by-name/mi/mission-center/Cargo.lock new file mode 100644 index 0000000000000..32d323310e39f --- /dev/null +++ b/pkgs/by-name/mi/mission-center/Cargo.lock @@ -0,0 +1,1189 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "cairo-rs" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a0ea147c94108c9613235388f540e4d14c327f7081c9e471fc8ee8a2533e69" +dependencies = [ + "bitflags", + "cairo-sys-rs", + "glib", + "libc", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "cc" +version = "1.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-expr" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345c78335be0624ed29012dc10c49102196c6882c12dde65d9f35b02da2aada8" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "dlv-list" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f7083207e75d4435df450dc6413612d97fe5a441477aba02484f9f7f77057e" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8730751991b97419fc3f0c2dca2c9e45b48edf46e48e0f965964ecf33889812f" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ffbf649fd5b1c8c0f0feeb015b7533c3ef92da2887fb95ddd338bc2b1644a7c" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk4-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gettext-rs" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gio" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "pin-project-lite", + "smallvec", +] + +[[package]] +name = "gio-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "windows-sys", +] + +[[package]] +name = "glib" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95648aac01b75503000bb3bcaa5ec7a7a2dd61e43636b8b1814854de94dd80e4" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "smallvec", +] + +[[package]] +name = "glib-macros" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302f1d633c9cdef4350330e7b68fd8016e2834bb106c93fdf9789fcde753c1ab" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "graphene-rs" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80aac87f74e81c0e13433e892a047237abdc37945c86887f5eed905038356e69" +dependencies = [ + "glib", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2f91ecd32989efad60326cc20a8fb252bd2852239a08e4e70cde8c100de9ca" +dependencies = [ + "glib-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gsk4" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" +dependencies = [ + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk4" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fe572bf318e5dbc6f5a2f8a25d853f1ae3f42768c0b08af6ca20a18f4057e1" +dependencies = [ + "cairo-rs", + "field-offset", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gtk4-macros" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e7b362c8fccd2712297903717d65d30defdab2b509bc9d209cbe5ffb9fabaf" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "gtk4-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libadwaita" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" +dependencies = [ + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita-sys", + "libc", + "pango", +] + +[[package]] +name = "libadwaita-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" +dependencies = [ + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "missioncenter" +version = "0.6.0" +dependencies = [ + "dbus", + "errno-sys", + "gettext-rs", + "gtk4", + "lazy_static", + "libadwaita", + "libc", + "libudev-sys", + "regex", + "rusqlite", + "rust-ini", + "serde", + "serde_json", + "static_assertions", + "textdistance", +] + +[[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 = "ordered-multimap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" +dependencies = [ + "dlv-list", + "hashbrown", +] + +[[package]] +name = "pango" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5764e5a174a5a0ec054fe5962ce6d4fc7052e2d0dcc23bbc77202b40a4a403d3" +dependencies = [ + "gio", + "glib", + "libc", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd317e1de76b14b3d3efe05518c08b360327f1ab7fec150473a89ffcad4b072d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "rusqlite" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" +dependencies = [ + "bitflags", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rust-ini" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f" +dependencies = [ + "cfg-if", + "ordered-multimap", + "trim-in-place", +] + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "070a0a5e7da2d24be457809c4b3baa57a835fd2829ad8b86f9a049052fe71031" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "temp-dir" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" + +[[package]] +name = "textdistance" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f1835c76a9d443834c04539860f3ce46b9d93ef8c260057f939e967ca81180a" + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "trim-in-place" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock similarity index 76% rename from pkgs/applications/misc/mission-center/gatherer-Cargo.lock rename to pkgs/by-name/mi/mission-center/gatherer-Cargo.lock index d6ad543585a4f..420af7d5c1677 100644 --- a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ b/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock @@ -3,10 +3,10 @@ version = 3 [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aho-corasick" @@ -19,15 +19,25 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" + +[[package]] +name = "app-rummage" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c015066de1a3af6e3582d1c4bf19f481fe7536e495c30fae84ec63cb08f90622" +dependencies = [ + "log", + "nix", +] [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "ash" @@ -55,15 +65,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.3.2" +version = "2.6.0" 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" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -76,9 +80,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -86,18 +90,18 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.1" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "369cfaf2a5bed5d8f8202073b2e093c9f508251de1551a0deb4253e4c7d80909" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", @@ -106,9 +110,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e977de2867ec90a1654882ff95ca5849a526e893bab588f84664cfcdb11c0a" +checksum = "cc680c90073156fb5280c0c0127b779eef1f6292e41f7d6621acba3041e81c7d" dependencies = [ "anyhow", "core-foundation", @@ -116,7 +120,7 @@ dependencies = [ "hex", "ignore", "jobserver", - "libc 0.2.155", + "libc 0.2.158", "miow", "same-file", "sha2", @@ -129,9 +133,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -165,6 +172,15 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -172,22 +188,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", - "libc 0.2.155", + "libc 0.2.158", ] [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ - "libc 0.2.155", + "libc 0.2.158", ] [[package]] @@ -246,7 +262,7 @@ version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" dependencies = [ - "libc 0.2.155", + "libc 0.2.158", "libdbus-sys", "winapi", ] @@ -285,7 +301,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" dependencies = [ - "bitflags 2.5.0", + "bitflags", "bytemuck", "drm-ffi", "drm-fourcc", @@ -314,8 +330,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" dependencies = [ - "libc 0.2.155", - "linux-raw-sys 0.6.4", + "libc 0.2.158", + "linux-raw-sys 0.6.5", ] [[package]] @@ -325,14 +341,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a373bc9844200b1ff15bd1b245931d1c20d09d06e4ec09f361171f29a4b0752d" dependencies = [ "khronos", - "libc 0.2.155", + "libc 0.2.158", ] [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "errno" @@ -340,33 +356,33 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "libc 0.2.155", + "libc 0.2.158", "windows-sys 0.52.0", ] [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", - "libc 0.2.155", - "redox_syscall", - "windows-sys 0.52.0", + "libc 0.2.158", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "miniz_oxide", @@ -383,22 +399,25 @@ dependencies = [ [[package]] name = "gatherer" -version = "0.5.2" +version = "0.6.0" dependencies = [ "anyhow", + "app-rummage", "arrayvec", "ash", "bincode", "cargo-util", "cc", + "convert_case", "dbus", "dbus-crossroads", "drm", "egl", "flate2", "gbm", + "glob", "lazy_static", - "libc 0.2.155", + "libc 0.2.158", "libloading", "log", "nix", @@ -420,11 +439,11 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a" dependencies = [ - "bitflags 2.5.0", + "bitflags", "drm", "drm-fourcc", "gbm-sys", - "libc 0.2.155", + "libc 0.2.158", ] [[package]] @@ -433,7 +452,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58" dependencies = [ - "libc 0.2.155", + "libc 0.2.158", ] [[package]] @@ -453,15 +472,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", - "libc 0.2.155", + "libc 0.2.158", "wasi", ] +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -494,9 +519,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" dependencies = [ "crossbeam-deque", "globset", @@ -516,11 +541,11 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ - "libc 0.2.155", + "libc 0.2.158", ] [[package]] @@ -534,9 +559,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" @@ -546,9 +571,9 @@ checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libdbus-sys" @@ -562,12 +587,23 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags", + "libc 0.2.158", + "redox_syscall", ] [[package]] @@ -578,29 +614,29 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" +checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] @@ -618,10 +654,10 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags", "cfg-if", "cfg_aliases", - "libc 0.2.155", + "libc 0.2.158", ] [[package]] @@ -660,18 +696,18 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -698,18 +734,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -718,9 +754,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "ring" @@ -731,7 +767,7 @@ dependencies = [ "cc", "cfg-if", "getrandom", - "libc 0.2.155", + "libc 0.2.158", "spin", "untrusted", "windows-sys 0.52.0", @@ -739,9 +775,9 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" +checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f" dependencies = [ "cfg-if", "ordered-multimap", @@ -750,24 +786,25 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.5.0", + "bitflags", "errno", - "libc 0.2.155", + "libc 0.2.158", "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -777,15 +814,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -809,18 +846,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.202" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -829,11 +866,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -855,6 +893,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "spin" version = "0.9.8" @@ -869,15 +913,15 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -886,41 +930,42 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", - "libc 0.2.155", + "libc 0.2.158", "xattr", ] [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -938,9 +983,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -958,21 +1003,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "pin-project-lite", - "tracing-attributes", "tracing-core", ] -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "tracing-core" version = "0.1.32" @@ -1002,9 +1035,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" @@ -1015,6 +1048,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + [[package]] name = "untrusted" version = "0.9.0" @@ -1023,9 +1062,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64", "flate2", @@ -1033,16 +1072,15 @@ dependencies = [ "once_cell", "rustls", "rustls-pki-types", - "rustls-webpki", "url", "webpki-roots", ] [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -1051,9 +1089,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -1073,9 +1111,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -1098,11 +1136,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1126,7 +1164,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -1146,18 +1193,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -1168,9 +1215,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -1180,9 +1227,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -1192,15 +1239,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -1210,9 +1257,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -1222,9 +1269,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -1234,9 +1281,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -1246,9 +1293,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "xattr" @@ -1256,13 +1303,13 @@ version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ - "libc 0.2.155", + "libc 0.2.158", "linux-raw-sys 0.4.14", "rustix", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix new file mode 100644 index 0000000000000..b5ec03ec85e6d --- /dev/null +++ b/pkgs/by-name/mi/mission-center/package.nix @@ -0,0 +1,145 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchFromGitLab, + rustPlatform, + symlinkJoin, + + # nativeBuildInputs + blueprint-compiler, + cargo, + libxml2, + meson, + ninja, + pkg-config, + python3, + rustc, + wrapGAppsHook4, + + # buildInputs + appstream-glib, + cairo, + cmake, + dbus, + desktop-file-utils, + gdk-pixbuf, + gettext, + glib, + graphene, + gtk4, + libGL, + libadwaita, + libdrm, + mesa, + pango, + sqlite, + udev, + wayland, + + vulkan-loader, +}: + +let + nvtop = fetchFromGitHub { + owner = "Syllo"; + repo = "nvtop"; + rev = "20ea55dbd1eeb4342ff0112fae3ee2a0bfe352ea"; + hash = "sha256-8lNvxmNAqkmBPFeiYIGtpW0hYXA9N0l4HURew5loj+g="; + }; +in +stdenv.mkDerivation rec { + pname = "mission-center"; + version = "0.6.0"; + + src = fetchFromGitLab { + owner = "mission-center-devs"; + repo = "mission-center"; + rev = "v${version}"; + hash = "sha256-MHCQHQFMd+YFgwY+k5iVZG08UeYBvEhrZGhHmzR+cLc="; + }; + + cargoDeps = symlinkJoin { + name = "cargo-vendor-dir"; + paths = [ + (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }) + (rustPlatform.importCargoLock { lockFile = ./gatherer-Cargo.lock; }) + ]; + }; + + nativeBuildInputs = [ + blueprint-compiler + cargo + libxml2 + meson + ninja + pkg-config + python3 + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + appstream-glib + blueprint-compiler + cairo + cmake + dbus + desktop-file-utils + gdk-pixbuf + gettext + glib + graphene + gtk4 + libGL + libadwaita + libdrm + mesa + pango + sqlite + udev + wayland + ]; + + postPatch = '' + substituteInPlace src/sys_info_v2/gatherer.rs \ + --replace-fail '"missioncenter-gatherer"' '"${placeholder "out"}/bin/missioncenter-gatherer"' + + substituteInPlace $cargoDepsCopy/gl_loader-*/src/glad.c \ + --replace-fail "libGL.so.1" "${libGL}/lib/libGL.so.1" + + substituteInPlace $cargoDepsCopy/ash-*/src/entry.rs \ + --replace-fail '"libvulkan.so.1"' '"${vulkan-loader}/lib/libvulkan.so.1"' + + SRC_GATHERER=$NIX_BUILD_TOP/source/src/sys_info_v2/gatherer + SRC_GATHERER_NVTOP=$SRC_GATHERER/3rdparty/nvtop + + substituteInPlace $SRC_GATHERER_NVTOP/nvtop.json \ + --replace-fail "nvtop-${nvtop.rev}" "nvtop-src" + + GATHERER_BUILD_DEST=$NIX_BUILD_TOP/source/build/src/sys_info_v2/gatherer/src/debug/build/native + mkdir -p $GATHERER_BUILD_DEST + NVTOP_SRC=$GATHERER_BUILD_DEST/nvtop-src + + cp -r --no-preserve=mode,ownership "${nvtop}" $NVTOP_SRC + pushd $NVTOP_SRC + mkdir -p include/libdrm + for patchfile in $(ls $SRC_GATHERER_NVTOP/patches/nvtop*.patch); do + patch -p1 < $patchfile + done + popd + + patchShebangs data/hwdb/generate_hwdb.py + ''; + + meta = { + description = "Monitor your CPU, Memory, Disk, Network and GPU usage"; + homepage = "https://gitlab.com/mission-center-devs/mission-center"; + changelog = "https://gitlab.com/mission-center-devs/mission-center/-/releases/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.linux; + mainProgram = "missioncenter"; + }; +} diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 1c364e7c3a5ff..b655159815f21 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -11,6 +11,7 @@ jemalloc, ffmpeg-headless, writeShellScript, + xcbuild, ... }: @@ -32,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pnpm.configHook makeWrapper python3 - ]; + ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ]; # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm pnpmDeps = pnpm.fetchDeps { diff --git a/pkgs/by-name/mi/mistral-rs/Cargo.lock b/pkgs/by-name/mi/mistral-rs/Cargo.lock index edc87e02386e0..f2ec794e49b37 100644 --- a/pkgs/by-name/mi/mistral-rs/Cargo.lock +++ b/pkgs/by-name/mi/mistral-rs/Cargo.lock @@ -20,9 +20,9 @@ checksum = "415ed64958754dbe991900f3940677e6a7eefb4d7367afd70d642677b0c7d19d" [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -33,6 +33,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.8.11" @@ -60,12 +66,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1763692fc1416554cf051efc56a3de5595eca47299d731cc5c2b583adf8b4d2f" -[[package]] -name = "aligned-vec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" - [[package]] name = "allocator-api2" version = "0.2.18" @@ -89,9 +89,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -104,33 +104,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -138,9 +138,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" dependencies = [ "backtrace", ] @@ -155,31 +155,26 @@ dependencies = [ ] [[package]] -name = "arg_enum_proc_macro" -version = "0.3.4" +name = "arrayvec" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] -name = "arrayvec" -version = "0.7.4" +name = "as-any" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "5b8a30a44e99a1c83ccb2a6298c563c888952a1c9134953db26876528f84c93a" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -194,29 +189,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" -[[package]] -name = "av1-grain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" -dependencies = [ - "anyhow", - "arrayvec", - "log", - "nom", - "num-rational", - "v_frame", -] - -[[package]] -name = "avif-serialize" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" -dependencies = [ - "arrayvec", -] - [[package]] name = "axum" version = "0.7.5" @@ -274,17 +246,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -316,6 +288,16 @@ dependencies = [ "rayon", ] +[[package]] +name = "bindgen_cuda" +version = "0.1.6" +source = "git+https://github.com/guoqingbao/bindgen_cuda.git#fb7ed75f3901b146aa1ba460baaeed5b494f2e0d" +dependencies = [ + "glob", + "num_cpus", + "rayon", +] + [[package]] name = "bit_field" version = "0.10.2" @@ -330,15 +312,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "bitstream-io" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -365,17 +341,11 @@ dependencies = [ "proc-macro2", "quote", "str_inflector", - "syn 2.0.66", + "syn 2.0.77", "thiserror", "try_match", ] -[[package]] -name = "built" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" - [[package]] name = "bumpalo" version = "3.16.0" @@ -384,22 +354,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -416,14 +386,14 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "candle-core" -version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +version = "0.6.1" +source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38" dependencies = [ "accelerate-src", "byteorder", @@ -449,27 +419,27 @@ dependencies = [ [[package]] name = "candle-flash-attn" -version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +version = "0.6.1" +source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38" dependencies = [ "anyhow", - "bindgen_cuda", + "bindgen_cuda 0.1.5", "candle-core", "half", ] [[package]] name = "candle-kernels" -version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +version = "0.6.1" +source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38" dependencies = [ - "bindgen_cuda", + "bindgen_cuda 0.1.5", ] [[package]] name = "candle-metal-kernels" -version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +version = "0.6.1" +source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38" dependencies = [ "metal", "once_cell", @@ -479,8 +449,8 @@ dependencies = [ [[package]] name = "candle-nn" -version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +version = "0.6.1" +source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38" dependencies = [ "accelerate-src", "candle-core", @@ -497,23 +467,11 @@ dependencies = [ [[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-expr" -version = "0.15.8" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ - "smallvec", - "target-lexicon", + "shlex", ] [[package]] @@ -524,15 +482,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "cfgrammar" -version = "0.13.6" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec07af28018dd8b4b52e49eb6e57268b19dda0996d4824889eb07ee0ef67378c" +checksum = "6026d8cd82ada8bbcfe337805dd1eb6afdc9e80fa4d57e977b3a36315e0c5525" dependencies = [ "indexmap", "lazy_static", @@ -553,14 +511,14 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "chrono-tz" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" dependencies = [ "chrono", "chrono-tz-build", @@ -569,9 +527,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" dependencies = [ "parse-zoneinfo", "phf", @@ -580,9 +538,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -590,9 +548,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -602,27 +560,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "cli-table" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" +checksum = "b53f9241f288a7b12c56565f04aaeaeeab6b8923d42d99255d4ca428b4d97f89" dependencies = [ "cli-table-derive", "csv", @@ -632,9 +590,9 @@ dependencies = [ [[package]] name = "cli-table-derive" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af3bfb9da627b0a6c467624fb7963921433774ed435493b5c08a3053e829ad4" +checksum = "3e83a93253aaae7c74eb7428ce4faa6e219ba94886908048888701819f82fb94" dependencies = [ "proc-macro2", "quote", @@ -649,9 +607,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "console" @@ -678,9 +636,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics-types" @@ -695,9 +653,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -745,7 +703,7 @@ dependencies = [ "bitflags 1.3.2", "crossterm_winapi", "libc", - "mio", + "mio 0.8.11", "parking_lot", "signal-hook", "signal-hook-mio", @@ -800,19 +758,19 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.4" +version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ "nix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "cudarc" -version = "0.11.6" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89df33b4eb35d6d3f19ce8015fda23079131afef42cf6ede03e961ab8aeb29af" +checksum = "38cd60a9a42ec83a2ed7effb0b1f073270264ea99da7acfc44f7e8d74dee0384" dependencies = [ "half", "libloading", @@ -830,12 +788,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -854,16 +812,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -879,15 +837,21 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.9", + "darling_core 0.20.10", "quote", - "syn 2.0.66", + "syn 2.0.77", ] +[[package]] +name = "data-url" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + [[package]] name = "defmac" version = "0.1.3" @@ -902,7 +866,7 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -913,49 +877,49 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "derive_builder" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "derive_builder_macro" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" dependencies = [ "derive_builder_core", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -1000,15 +964,21 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "dyn-stack" version = "0.10.0" @@ -1021,9 +991,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" dependencies = [ "serde", ] @@ -1051,14 +1021,14 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1096,7 +1066,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -1114,9 +1084,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1129,24 +1099,24 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1191,7 +1161,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1271,7 +1241,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1455,14 +1425,14 @@ dependencies = [ [[package]] name = "getset" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" +checksum = "f636605b743120a8d32ed92fc27b6cde1a769f8f936c065151eb66f88ded513c" dependencies = [ - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -1477,9 +1447,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -1489,9 +1459,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -1530,12 +1500,6 @@ dependencies = [ "allocator-api2", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -1578,9 +1542,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -1601,9 +1565,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1613,9 +1577,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", @@ -1634,9 +1598,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http", @@ -1647,6 +1611,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", + "webpki-roots", ] [[package]] @@ -1667,9 +1632,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -1708,124 +1673,6 @@ dependencies = [ "cc", ] -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1834,24 +1681,22 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", + "unicode-bidi", + "unicode-normalization", ] [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "exr", "gif", @@ -1859,9 +1704,6 @@ dependencies = [ "num-traits", "png", "qoi", - "ravif", - "rayon", - "rgb", "tiff", "zune-core", "zune-jpeg", @@ -1869,20 +1711,14 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ "byteorder-lite", - "thiserror", + "quick-error", ] -[[package]] -name = "imgref" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" - [[package]] name = "indenter" version = "0.3.3" @@ -1891,9 +1727,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", @@ -1951,28 +1787,17 @@ dependencies = [ "walkdir", ] -[[package]] -name = "interpolate_name" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -2007,15 +1832,6 @@ 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 = "jpeg-decoder" version = "0.3.1" @@ -2024,18 +1840,18 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lebe" @@ -2045,29 +1861,18 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libfuzzer-sys" -version = "0.4.7" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" -dependencies = [ - "arbitrary", - "cc", - "once_cell", -] +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2082,8 +1887,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall", ] [[package]] @@ -2092,12 +1898,6 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - [[package]] name = "lock_api" version = "0.4.12" @@ -2110,24 +1910,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "loop9" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" -dependencies = [ - "imgref", -] +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lrtable" -version = "0.13.6" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fcefc5628209d1b1f4b2cd0bcefd0e50be80bdf178e886cb07317f5ce4f2856" +checksum = "d42d2752cb50a171efadda0cb6fa97432e8bf05accfff3eed320b87e80a2f69e" dependencies = [ "cfgrammar", "fnv", @@ -2176,16 +1967,6 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" -[[package]] -name = "maybe-rayon" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" -dependencies = [ - "cfg-if", - "rayon", -] - [[package]] name = "memchr" version = "2.7.4" @@ -2194,9 +1975,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", "stable_deref_trait", @@ -2217,7 +1998,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -2234,9 +2015,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -2244,18 +2025,19 @@ dependencies = [ [[package]] name = "minijinja" -version = "2.0.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e136ef580d7955019ab0a407b68d77c292a9976907e217900f3f76bc8f6dc1a4" +checksum = "6d7d3e3a3eece1fa4618237ad41e1de855ced47eab705cec1c9a920e1d1c5aad" dependencies = [ "serde", + "serde_json", ] [[package]] name = "minijinja-contrib" -version = "2.0.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15ee37078c98d31e510d6a7af488031a2c3ccacdb76c5c4fc98ddfe6d0e9da07" +checksum = "744a2b84dbd22398e347594ed2aef9d3f1b948934e3e6e94ef69ecd39d597f4b" dependencies = [ "minijinja", "serde", @@ -2269,14 +2051,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.8.11" @@ -2289,29 +2080,44 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "mistralrs" -version = "0.1.18" +version = "0.3.0" dependencies = [ "anyhow", "candle-core", "either", + "futures", "image", "indexmap", "mistralrs-core", + "rand", + "reqwest", + "serde", "serde_json", "tokio", ] [[package]] name = "mistralrs-bench" -version = "0.1.18" +version = "0.3.0" dependencies = [ "anyhow", "candle-core", "clap", "cli-table", - "either", "mistralrs-core", "serde", "serde_json", @@ -2321,21 +2127,25 @@ dependencies = [ [[package]] name = "mistralrs-core" -version = "0.1.18" +version = "0.3.0" dependencies = [ "accelerate-src", "akin", "anyhow", + "as-any", "async-trait", - "bindgen_cuda", + "base64 0.22.1", + "bindgen_cuda 0.1.5", "buildstructor", "bytemuck", + "bytemuck_derive", "candle-core", "candle-flash-attn", "candle-nn", "cfgrammar", "chrono", "clap", + "csv", "derive-new", "derive_more", "dirs", @@ -2352,19 +2162,27 @@ dependencies = [ "lrtable", "minijinja", "minijinja-contrib", + "mistralrs-paged-attn", + "mistralrs-quant", "mistralrs-vision", "once_cell", "pyo3", "radix_trie", "rand", "rand_isaac", - "range-checked", "rayon", + "regex", "regex-automata 0.4.7", + "reqwest", "rustc-hash", + "safetensors", + "schemars", "serde", "serde_json", + "serde_plain", + "serde_yaml", "strum", + "sysinfo", "thiserror", "tokenizers", "tokio", @@ -2373,17 +2191,30 @@ dependencies = [ "tqdm", "tracing", "tracing-subscriber", + "uuid 1.10.0", "variantly", "vob", ] +[[package]] +name = "mistralrs-paged-attn" +version = "0.3.0" +dependencies = [ + "anyhow", + "bindgen_cuda 0.1.6", + "candle-core", + "half", +] + [[package]] name = "mistralrs-pyo3" -version = "0.1.18" +version = "0.3.0" dependencies = [ "accelerate-src", + "anyhow", "base64 0.22.1", "candle-core", + "data-url", "either", "futures", "image", @@ -2396,19 +2227,36 @@ dependencies = [ "serde", "serde_json", "tokio", + "url", +] + +[[package]] +name = "mistralrs-quant" +version = "0.3.0" +dependencies = [ + "bindgen_cuda 0.1.5", + "byteorder", + "candle-core", + "candle-nn", + "half", + "lazy_static", + "paste", + "rayon", + "serde", + "tracing", ] [[package]] name = "mistralrs-server" -version = "0.1.18" +version = "0.3.0" dependencies = [ "accelerate-src", "anyhow", "axum", - "base64 0.22.1", "candle-core", "clap", "ctrlc", + "data-url", "either", "futures", "image", @@ -2422,13 +2270,14 @@ dependencies = [ "tokio", "tower-http", "tracing", + "url", "utoipa", "utoipa-swagger-ui", ] [[package]] name = "mistralrs-vision" -version = "0.1.18" +version = "0.3.0" dependencies = [ "candle-core", "image", @@ -2452,7 +2301,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2472,12 +2321,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - [[package]] name = "nibble_vec" version = "0.1.0" @@ -2489,11 +2332,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -2510,10 +2353,13 @@ dependencies = [ ] [[package]] -name = "noop_proc_macro" -version = "0.3.0" +name = "ntapi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] [[package]] name = "nu-ansi-term" @@ -2527,9 +2373,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -2545,17 +2391,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "num-integer" version = "0.1.46" @@ -2598,23 +2433,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2644,23 +2479,27 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] [[package]] name = "oci-spec" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e423c4f827362c0d8d8da4b1f571270f389ebde73bcd3240a3d23c6d6f61d0f0" +checksum = "3f5a3fe998d50101ae009351fec56d88a69f4ed182e11000e711068c2f5abf72" dependencies = [ "derive_builder", "getset", + "once_cell", + "regex", "serde", "serde_json", + "strum", + "strum_macros", "thiserror", ] @@ -2687,7 +2526,7 @@ dependencies = [ "toml", "ureq", "url", - "uuid 1.8.0", + "uuid 1.10.0", "walkdir", ] @@ -2721,11 +2560,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -2742,7 +2581,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2753,9 +2592,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -2803,9 +2642,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2884,7 +2723,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2915,28 +2754,31 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -2964,38 +2806,41 @@ dependencies = [ ] [[package]] -name = "proc-macro2" -version = "1.0.85" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ - "unicode-ident", + "proc-macro2", + "quote", ] [[package]] -name = "profiling" -version = "1.0.15" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ - "profiling-procmacros", + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.77", ] [[package]] -name = "profiling-procmacros" -version = "1.0.15" +name = "proc-macro2" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ - "quote", - "syn 2.0.66", + "unicode-ident", ] [[package]] name = "pulp" -version = "0.18.21" +version = "0.18.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec8d02258294f59e4e223b41ad7e81c874aa6b15bc4ced9ba3965826da0eed5" +checksum = "a0a01a0dc67cf4558d279f0c25b0962bd08fc6dec0137699eae304103e882fe6" dependencies = [ "bytemuck", "libm", @@ -3005,9 +2850,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" +checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" dependencies = [ "anyhow", "cfg-if", @@ -3022,7 +2867,8 @@ dependencies = [ "memoffset", "num-bigint", "num-complex", - "parking_lot", + "num-rational", + "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -3035,9 +2881,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" +checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" dependencies = [ "once_cell", "target-lexicon", @@ -3045,9 +2891,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" +checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" dependencies = [ "libc", "pyo3-build-config", @@ -3055,27 +2901,27 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" +checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "pyo3-macros-backend" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" +checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -3093,11 +2939,59 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" +[[package]] +name = "quinn" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3161,61 +3055,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "range-checked" -version = "0.1.0" -source = "git+https://github.com/EricLBuehler/range-checked.git#655349cc093fcd4965f35b25de394a24ff4b0c7b" - -[[package]] -name = "rav1e" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" -dependencies = [ - "arbitrary", - "arg_enum_proc_macro", - "arrayvec", - "av1-grain", - "bitstream-io", - "built", - "cfg-if", - "interpolate_name", - "itertools 0.12.1", - "libc", - "libfuzzer-sys", - "log", - "maybe-rayon", - "new_debug_unreachable", - "noop_proc_macro", - "num-derive", - "num-traits", - "once_cell", - "paste", - "profiling", - "rand", - "rand_chacha", - "simd_helpers", - "system-deps", - "thiserror", - "v_frame", - "wasm-bindgen", -] - -[[package]] -name = "ravif" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" -dependencies = [ - "avif-serialize", - "imgref", - "loop9", - "quick-error", - "rav1e", - "rayon", - "rgb", -] - [[package]] name = "raw-cpuid" version = "10.7.0" @@ -3264,27 +3103,18 @@ checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" [[package]] name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -3293,9 +3123,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -3337,9 +3167,9 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "base64 0.22.1", "bytes", @@ -3363,13 +3193,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", "rustls", "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "system-configuration", "tokio", "tokio-native-tls", @@ -3380,16 +3211,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots", - "winreg", -] - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", + "windows-registry", ] [[package]] @@ -3409,9 +3231,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" +checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -3420,22 +3242,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" +checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.66", + "syn 2.0.77", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" +checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d" dependencies = [ "sha2", "walkdir", @@ -3443,9 +3265,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.35.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", "num-traits", @@ -3459,26 +3281,26 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -3487,11 +3309,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -3501,9 +3324,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -3511,15 +3334,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -3540,9 +3363,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safetensors" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ced76b22c7fba1162f11a5a75d9d8405264b467a07ae0c9c29be119b9297db9" +checksum = "44560c11236a6130a46ce36c836a62936dc81ebf8c36a37947423571be0e55b6" dependencies = [ "serde", "serde_json", @@ -3559,11 +3382,35 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", +] + +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.77", ] [[package]] @@ -3574,11 +3421,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3587,9 +3434,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3609,31 +3456,43 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -3648,11 +3507,20 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_plain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" +dependencies = [ + "serde", +] + [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -3669,6 +3537,19 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + [[package]] name = "sha2" version = "0.10.8" @@ -3689,6 +3570,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook" version = "0.3.17" @@ -3701,12 +3588,12 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio", + "mio 0.8.11", "signal-hook", ] @@ -3725,15 +3612,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" -[[package]] -name = "simd_helpers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" -dependencies = [ - "quote", -] - [[package]] name = "siphasher" version = "0.3.11" @@ -3828,9 +3706,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] @@ -3841,18 +3719,18 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -3867,9 +3745,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -3887,6 +3765,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -3896,7 +3777,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -3905,7 +3786,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "enum-as-inner", "libc", @@ -3913,40 +3794,42 @@ dependencies = [ "walkdir", ] +[[package]] +name = "sysinfo" +version = "0.30.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "windows", +] + [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", ] -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck 0.5.0", - "pkg-config", - "toml", - "version-compare", -] - [[package]] name = "tar" version = "0.4.41" @@ -3960,20 +3843,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3987,22 +3871,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -4027,15 +3911,20 @@ dependencies = [ ] [[package]] -name = "tinystr" -version = "0.7.6" +name = "tinyvec" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ - "displaydoc", - "zerovec", + "tinyvec_macros", ] +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "tokenizers" version = "0.19.1" @@ -4070,32 +3959,31 @@ dependencies = [ [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -4120,9 +4008,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", "rustls-pki-types", @@ -4131,9 +4019,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -4144,47 +4032,36 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.14" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow", ] [[package]] @@ -4209,7 +4086,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "http", "http-body", @@ -4221,15 +4098,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tqdm" @@ -4262,7 +4139,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -4312,22 +4189,22 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "try_match" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ae3c1941e8859e30d28e572683fbfa89ae5330748b45139aedf488389e2be4" +checksum = "b065c869a3f832418e279aa4c1d7088f9d5d323bde15a60a08e20c2cd4549082" dependencies = [ "try_match_inner", ] [[package]] name = "try_match_inner" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a91713132798caecb23c977488945566875e7b61b902fb111979871cbff34e" +checksum = "b9c81686f7ab4065ccac3df7a910c4249f8c0f3fb70421d6ddec19b9311f63f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -4351,11 +4228,26 @@ dependencies = [ "version_check", ] +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[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-normalization-alignments" @@ -4368,9 +4260,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" @@ -4390,6 +4282,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "untrusted" version = "0.9.0" @@ -4398,9 +4296,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64 0.22.1", "flate2", @@ -4409,7 +4307,6 @@ dependencies = [ "once_cell", "rustls", "rustls-pki-types", - "rustls-webpki", "serde", "serde_json", "url", @@ -4418,27 +4315,15 @@ dependencies = [ [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - [[package]] name = "utf8parse" version = "0.2.2" @@ -4467,7 +4352,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -4499,24 +4384,13 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", ] -[[package]] -name = "v_frame" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" -dependencies = [ - "aligned-vec", - "num-traits", - "wasm-bindgen", -] - [[package]] name = "valuable" version = "0.1.0" @@ -4543,17 +4417,11 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vob" @@ -4593,34 +4461,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4630,9 +4499,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4640,28 +4509,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4669,9 +4538,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.2" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -4700,11 +4569,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4713,13 +4582,53 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -4737,7 +4646,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4757,18 +4675,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -4779,9 +4697,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4791,9 +4709,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4803,15 +4721,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4821,9 +4739,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4833,9 +4751,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4845,9 +4763,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4857,50 +4775,19 @@ 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 = "winnow" -version = "0.5.40" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - [[package]] name = "xattr" version = "1.3.1" @@ -4932,28 +4819,29 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -4973,7 +4861,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "synstructure", ] @@ -4983,28 +4871,6 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -[[package]] -name = "zerovec" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "zip" version = "1.1.4" @@ -5038,9 +4904,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index 4c5324e8d856e..1453a4c4ce8da 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -19,6 +19,7 @@ testers, mistral-rs, + nix-update-script, cudaPackages, cudaCapability ? null, @@ -56,14 +57,14 @@ let cudaCapability; cudaCapability' = lib.toInt (cudaPackages.cudaFlags.dropDot cudaCapabilityString); - # TODO Should we assert mklAccel -> stdenv.isLinux && stdenv.isx86_64 ? mklSupport = assert accelIsValid; (acceleration == "mkl"); metalSupport = assert accelIsValid; - (acceleration == "metal") || (stdenv.isDarwin && stdenv.isAarch64 && (acceleration == null)); + (acceleration == "metal") + || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && (acceleration == null)); darwinBuildInputs = with darwin.apple_sdk.frameworks; @@ -80,27 +81,23 @@ in rustPlatform.buildRustPackage rec { pname = "mistral-rs"; - version = "0.1.18"; + version = "0.3.1"; src = fetchFromGitHub { owner = "EricLBuehler"; repo = "mistral.rs"; rev = "refs/tags/v${version}"; - hash = "sha256-lMDFWNv9b0UfckqLmyWRVwnqmGe6nxYsUHzoi2+oG84="; + hash = "sha256-ljGr8V6WkpXPV90SiHJ0t7wzBPx0J0FOB52YdLLIeoM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "candle-core-0.6.0" = "sha256-DxGBWf2H7MamrbboTJ4zHy1HeE8ZVT7QvE3sTYrRxBc="; - "range-checked-0.1.0" = "sha256-S+zcF13TjwQPFWZLIbUDkvEeaYdaxCOtDLtI+JRvum8="; + "bindgen_cuda-0.1.6" = "sha256-OWGcQxT+x5HyIFskNVWpPr6Qfkh6Mv/g4PVSm5oA27g="; + "candle-core-0.6.1" = "sha256-AtKjMTtbMBI2DbZXoWimhqcHmsz2DnRXJorqA0QYNHw="; }; }; - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - nativeBuildInputs = [ pkg-config python3 @@ -112,24 +109,31 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart cudaPackages.cuda_nvrtc cudaPackages.libcublas cudaPackages.libcurand ] ++ lib.optionals mklSupport [ mkl ] - ++ lib.optionals stdenv.isDarwin darwinBuildInputs; + ++ lib.optionals stdenv.hostPlatform.isDarwin darwinBuildInputs; cargoBuildFlags = - lib.optionals cudaSupport [ "--features=cuda" ] + [ + # This disables the plotly crate which fails to build because of the kaleido feature requiring + # network access at build-time. + # See https://github.com/NixOS/nixpkgs/pull/323788#issuecomment-2206085825 + "--no-default-features" + ] + ++ lib.optionals cudaSupport [ "--features=cuda" ] ++ lib.optionals mklSupport [ "--features=mkl" ] - ++ lib.optionals (stdenv.isDarwin && metalSupport) [ "--features=metal" ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && metalSupport) [ "--features=metal" ]; env = { SWAGGER_UI_DOWNLOAD_URL = let # When updating: - # - Look for the version of `utopia-swagger-ui` at: + # - Look for the version of `utoipa-swagger-ui` at: # https://github.com/EricLBuehler/mistral.rs/blob/v<MISTRAL-RS-VERSION>/mistralrs-server/Cargo.toml # - Look at the corresponding version of `swagger-ui` at: # https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-<UTOPIA-SWAGGER-UI-VERSION>/utoipa-swagger-ui/build.rs#L21-L22 @@ -166,20 +170,31 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=gguf::gguf_tokenizer::tests::test_decode_gpt2" "--skip=gguf::gguf_tokenizer::tests::test_decode_llama" + "--skip=gguf::gguf_tokenizer::tests::test_encode_decode_gpt2" + "--skip=gguf::gguf_tokenizer::tests::test_encode_decode_llama" "--skip=gguf::gguf_tokenizer::tests::test_encode_gpt2" "--skip=gguf::gguf_tokenizer::tests::test_encode_llama" "--skip=sampler::tests::test_argmax" "--skip=sampler::tests::test_gumbel_speculative" + "--skip=util::tests::test_parse_image_url" ]; passthru = { tests = { version = testers.testVersion { package = mistral-rs; }; - withMkl = mistral-rs.override { acceleration = "mkl"; }; - withCuda = mistral-rs.override { acceleration = "cuda"; }; - withMetal = mistral-rs.override { acceleration = "metal"; }; + # TODO: uncomment when mkl support will be fixed + withMkl = lib.optionalAttrs (stdenv.hostPlatform == "x86_64-linux") ( + mistral-rs.override { acceleration = "mkl"; } + ); + withCuda = lib.optionalAttrs stdenv.hostPlatform.isLinux ( + mistral-rs.override { acceleration = "cuda"; } + ); + withMetal = lib.optionalAttrs (stdenv.hostPlatform == "aarch64-darwin") ( + mistral-rs.override { acceleration = "metal"; } + ); }; + updateScript = nix-update-script { }; }; meta = { @@ -194,6 +209,8 @@ rustPlatform.buildRustPackage rec { lib.platforms.linux else if metalSupport then [ "aarch64-darwin" ] + else if mklSupport then + [ "x86_64-linux" ] else lib.platforms.unix; broken = mklSupport; diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix index 1f485d42aab9c..c5537d5f2ca01 100644 --- a/pkgs/by-name/ml/mlx42/package.nix +++ b/pkgs/by-name/ml/mlx42/package.nix @@ -1,11 +1,12 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, glfw -, darwin -, enableShared ? !stdenv.hostPlatform.isStatic -, enableDebug ? false +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + glfw, + darwin, + enableShared ? !stdenv.hostPlatform.isStatic, + enableDebug ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -15,24 +16,35 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "codam-coding-college"; repo = "MLX42"; - rev = "v${finalAttrs.version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-c4LoTePHhQeZTx33V1K3ZyXmT7vjB6NdkGVAiSuJKfI="; }; - postPatch = '' - patchShebangs ./tools - '' - + lib.optionalString enableShared '' - substituteInPlace CMakeLists.txt \ - --replace "mlx42 STATIC" "mlx42 SHARED" - ''; + postPatch = + '' + patchShebangs --build ./tools + '' + + lib.optionalString enableShared '' + substituteInPlace CMakeLists.txt \ + --replace-fail "mlx42 STATIC" "mlx42 SHARED" + ''; + + strictDeps = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ glfw ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL Cocoa IOKit ]); + buildInputs = + [ glfw ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + OpenGL + Cocoa + IOKit + ] + ); - cmakeFlags = [ "-DDEBUG=${toString enableDebug}" ]; + cmakeFlags = [ (lib.cmakeBool "DEBUG" enableDebug) ]; postInstall = '' mkdir -p $out/lib/pkgconfig @@ -40,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - changelog = "https://github.com/codam-coding-college/MLX42/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/codam-coding-college/MLX42/releases/tag/v${finalAttrs.version}"; description = "Simple cross-platform graphics library that uses GLFW and OpenGL"; homepage = "https://github.com/codam-coding-college/MLX42"; license = lib.licenses.gpl2Only; diff --git a/pkgs/by-name/mo/modelscan/package.nix b/pkgs/by-name/mo/modelscan/package.nix new file mode 100644 index 0000000000000..aff4446489aa2 --- /dev/null +++ b/pkgs/by-name/mo/modelscan/package.nix @@ -0,0 +1,57 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "modelscan"; + version = "0.8.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "protectai"; + repo = "modelscan"; + rev = "refs/tags/v${version}"; + hash = "sha256-90VnIVQFjtKgLCHc+tmOtDdgJP8aaH4h5ZiOOejnXgQ="; + }; + + build-system = with python3.pkgs; [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = with python3.pkgs; [ + click + numpy + rich + tomlkit + ]; + + optional-dependencies = with python3.pkgs; { + h5py = [ h5py ]; + # tensorflow = [ tensorflow ]; + }; + + nativeCheckInputs = + with python3.pkgs; + [ + dill + pytestCheckHook + ] + ++ lib.flatten (builtins.attrValues optional-dependencies); + + # tensorflow doesn0t support Python 3.12 + doCheck = false; + + pythonImportsCheck = [ "modelscan" ]; + + meta = with lib; { + description = "Protection against Model Serialization Attacks"; + homepage = "https://github.com/protectai/modelscan"; + changelog = "https://github.com/protectai/modelscan/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "modelscan"; + }; +} diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index c9c5cbdc73f5c..c53296c3b0270 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { owner = "modrinth"; repo = "theseus"; rev = "v${modrinth-app-unwrapped.version}"; - sha256 = "sha256-JWR0e2vOBvOLosr22Oo2mAlR0KAhL+261RRybhNctlM="; + hash = "sha256-JWR0e2vOBvOLosr22Oo2mAlR0KAhL+261RRybhNctlM="; }; cargoLock = { @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage { }); nativeBuildInputs = [ - cargo-tauri + cargo-tauri.hook desktop-file-utils pnpm_8 nodejs @@ -85,11 +85,11 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libsoup webkitgtk ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit @@ -100,14 +100,6 @@ rustPlatform.buildRustPackage { ); env = { - tauriBundle = - { - Linux = "deb"; - Darwin = "app"; - } - .${stdenv.hostPlatform.uname.system} - or (builtins.throw "No tauri bundle available for ${stdenv.hostPlatform.uname.system}!"); - ESBUILD_BINARY_PATH = lib.getExe ( esbuild.override { buildGoModule = args: buildGoModule (args // rec { @@ -137,26 +129,12 @@ rustPlatform.buildRustPackage { popd ''; - buildPhase = '' - runHook preBuild - - cargo tauri build --bundles "$tauriBundle" - - runHook postBuild - ''; - - installPhase = - '' - runHook preInstall - '' - + lib.optionalString stdenv.isDarwin '' - mkdir -p "$out"/bin - cp -r target/release/bundle/macos "$out"/Applications + postInstall = + lib.optionalString stdenv.hostPlatform.isDarwin '' mv "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App "$out"/bin/modrinth-app ln -s "$out"/bin/modrinth-app "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App '' - + lib.optionalString stdenv.isLinux '' - cp -r target/release/bundle/"$tauriBundle"/*/data/usr "$out" + + lib.optionalString stdenv.hostPlatform.isLinux '' desktop-file-edit \ --set-comment "Modrinth's game launcher" \ --set-key="StartupNotify" --set-value="true" \ @@ -164,9 +142,6 @@ rustPlatform.buildRustPackage { --set-key="Keywords" --set-value="game;minecraft;mc;" \ --set-key="StartupWMClass" --set-value="ModrinthApp" \ $out/share/applications/modrinth-app.desktop - '' - + '' - runHook postInstall ''; passthru = { @@ -189,6 +164,6 @@ rustPlatform.buildRustPackage { maintainers = with lib.maintainers; [ getchoo ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; # this builds on architectures like aarch64, but the launcher itself does not support them yet - broken = !stdenv.isx86_64; + broken = !stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix index 12e13017ad331..c92b6319d5a57 100644 --- a/pkgs/by-name/mo/modrinth-app/package.nix +++ b/pkgs/by-name/mo/modrinth-app/package.nix @@ -37,7 +37,7 @@ symlinkJoin rec { wrapGAppsHook3 ]; - runtimeDependencies = lib.optionalString stdenv.isLinux (lib.makeLibraryPath [ + runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux (lib.makeLibraryPath [ addDriverRunpath.driverLink flite # narrator support @@ -57,7 +57,7 @@ symlinkJoin rec { postBuild = '' gappsWrapperArgs+=( --prefix PATH : ${lib.makeSearchPath "bin/java" jdks} - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' --prefix PATH : ${lib.makeBinPath [xorg.xrandr]} --set LD_LIBRARY_PATH $runtimeDependencies ''} diff --git a/pkgs/by-name/mo/mods/package.nix b/pkgs/by-name/mo/mods/package.nix index ae5fc333cba84..5a5bb912cb2fe 100644 --- a/pkgs/by-name/mo/mods/package.nix +++ b/pkgs/by-name/mo/mods/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "mods"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "mods"; rev = "v${version}"; - hash = "sha256-Niap2qsIJwlDRITkPD2Z7NCiJubkyy8/pvagj5Beq84="; + hash = "sha256-1Qx3P1q7zmrzNqmiivri0BxdEsRYgS1cOp17S44jRPI="; }; - vendorHash = "sha256-DaSbmu1P/umOAhG901aC+TKa3xXSvUbpYsaiYTr2RJs="; + vendorHash = "sha256-LarOXYkyhSCMXkD2G3/XYHnj5bDcL6nwWxlMAYy+9d8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix index 383abc8f77b83..b96a53f9749a1 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; rev = "v${version}"; - hash = "sha256-685Tn2/XFhGSk7Onnw1W9VfgDSFNwDETc3KoiKMCS3M="; + hash = "sha256-QH9mtigVqt9ZrVBUyQcgUMW/8jtXHSYDWz6pprt6Hlk="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { tbb zlib zstd - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ mimalloc ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "-DMOLD_USE_SYSTEM_TBB:BOOL=ON" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-faligned-allocation" ]); @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { in { version = testers.testVersion { package = mold; }; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { adapter-gcc = helloTest "adapter-gcc" (hello.override (old: { stdenv = useMoldLinker gccStdenv; })); adapter-llvm = helloTest "adapter-llvm" (hello.override (old: { stdenv = useMoldLinker clangStdenv; })); wrapped = helloTest "wrapped" (hello.overrideAttrs (previousAttrs: { diff --git a/pkgs/by-name/mo/mollysocket/package.nix b/pkgs/by-name/mo/mollysocket/package.nix index c5772f2edc4be..6c9e18cc8f153 100644 --- a/pkgs/by-name/mo/mollysocket/package.nix +++ b/pkgs/by-name/mo/mollysocket/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index ba527df395642..a7ee195c9874d 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -45,15 +45,11 @@ stdenv.mkDerivation (finalAttrs: { or (throw "unsupported system: ${stdenv.hostPlatform.system}") ); - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dontStrip = true; buildInputs = [ - # Remove this after https://github.com/NixOS/nixpkgs/pull/336712 - # has landed in `nixpkgs-unstable` - (curl.overrideAttrs (old: { - configureFlags = old.configureFlags ++ [ "--enable-versioned-symbols" ]; - })).dev + curl.dev openssl.dev stdenv.cc.cc.lib ]; diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index 7e85d98a3b38d..acca4f2474489 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -17,6 +17,7 @@ gtk3, lib, libdrm, + libGL, libnotify, libsecret, libuuid, @@ -33,7 +34,7 @@ }: let - version = "1.43.6"; + version = "1.44.4"; rpath = lib.makeLibraryPath [ alsa-lib @@ -51,6 +52,7 @@ let glib gtk3 libdrm + libGL libnotify libsecret libuuid @@ -82,7 +84,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - hash = "sha256-pAjOFwQdzxvDs1rx6xuvr2W59/jPwZakoShG9h6qfJE="; + hash = "sha256-0b0bdKRw+l4m144OVaH/KHB+UtAZ0zIA7KlP9zOE7A8="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; @@ -134,7 +136,10 @@ stdenv.mkDerivation { meta = { description = "GUI for MongoDB"; - maintainers = with lib.maintainers; [ bryanasdev000 ]; + maintainers = with lib.maintainers; [ + bryanasdev000 + friedow + ]; homepage = "https://github.com/mongodb-js/compass"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.sspl; diff --git a/pkgs/by-name/mo/monitorets/package.nix b/pkgs/by-name/mo/monitorets/package.nix new file mode 100644 index 0000000000000..4234bbf0904fa --- /dev/null +++ b/pkgs/by-name/mo/monitorets/package.nix @@ -0,0 +1,61 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, +}: + +python3Packages.buildPythonApplication rec { + pname = "monitorets"; + version = "0.10.1"; + # built with meson, not a python format + pyproject = false; + + src = fetchFromGitHub { + owner = "jorchube"; + repo = "monitorets"; + rev = "refs/tags/${version}"; + hash = "sha256-Y6cd9Wf2IzHwdxzLUP/U4rervlPUr8s2gKSW8y5I7bg="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ libadwaita ]; + + dependencies = with python3Packages; [ + pygobject3 + xdg + psutil + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + description = "Simple and quick view at the usage of your computer resources"; + homepage = "https://github.com/jorchube/monitorets"; + license = with lib.licenses; [ + gpl3Plus + cc0 + ]; + mainProgram = "monitorets"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index c32943ff76cf5..76f81c3b2846c 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -11,7 +11,7 @@ }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "2.11.0"; + version = "2.15.0"; pyproject = false; sourceRoot = "${src.name}/source"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "zehkira"; repo = "monophony"; rev = "v${version}"; - hash = "sha256-OGUj1NNJNerYx/nBtg4g9xMbz6u4YSqKO6HeMNeYpE8="; + hash = "sha256-fC+XXOGBpG5pIQW1tCNtQaptBCyLM+YGgsZLjWrMoDA="; }; pythonPath = with python3Packages; [ diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix index a0ca66b61e644..62a3b556a3a31 100644 --- a/pkgs/by-name/mo/moonlight-qt/package.nix +++ b/pkgs/by-name/mo/moonlight-qt/package.nix @@ -32,7 +32,7 @@ let Cocoa VideoToolbox ; - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation rec { @@ -64,7 +64,7 @@ stdenv'.mkDerivation rec { buildInputs = [ - (SDL2.override { drmSupport = stdenv.isLinux; }) + (SDL2.override { drmSupport = stdenv.hostPlatform.isLinux; }) SDL2_ttf ffmpeg libopus @@ -73,7 +73,7 @@ stdenv'.mkDerivation rec { qt6.qtsvg openssl ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio libva @@ -83,7 +83,7 @@ stdenv'.mkDerivation rec { wayland libdrm ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation AppKit AudioUnit @@ -93,7 +93,7 @@ stdenv'.mkDerivation rec { qmakeFlags = [ "CONFIG+=disable-prebuilts" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications $out/bin mv app/Moonlight.app $out/Applications ln -s $out/Applications/Moonlight.app/Contents/MacOS/Moonlight $out/bin/moonlight diff --git a/pkgs/by-name/mo/mos/package.nix b/pkgs/by-name/mo/mos/package.nix index a0065584800d1..803148c91be33 100644 --- a/pkgs/by-name/mo/mos/package.nix +++ b/pkgs/by-name/mo/mos/package.nix @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/Caldis/Mos/releases/download/${finalAttrs.version}/Mos.Versions.${finalAttrs.version}.dmg"; - sha256 = "38ea33e867815506414323484147b882b6d97df4af9759bca0a64d98c95029b3"; + hash = "sha256-OOoz6GeBVQZBQyNIQUe4grbZffSvl1m8oKZNmMlQKbM="; }; sourceRoot = "."; diff --git a/pkgs/by-name/mo/mosdepth/package.nix b/pkgs/by-name/mo/mosdepth/package.nix index 3317f28edef3f..b629f492af33e 100644 --- a/pkgs/by-name/mo/mosdepth/package.nix +++ b/pkgs/by-name/mo/mosdepth/package.nix @@ -10,7 +10,7 @@ buildNimPackage (finalAttrs: { owner = "brentp"; repo = "mosdepth"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-vHJgIo9qO/L1lZ9DqgXVwv9Pn/6ZMOBfPsY4DEAEImI="; + hash = "sha256-vHJgIo9qO/L1lZ9DqgXVwv9Pn/6ZMOBfPsY4DEAEImI="; }; lockFile = ./lock.json; diff --git a/pkgs/by-name/mo/motoc/Cargo.lock b/pkgs/by-name/mo/motoc/Cargo.lock new file mode 100644 index 0000000000000..e6b1027f6726b --- /dev/null +++ b/pkgs/by-name/mo/motoc/Cargo.lock @@ -0,0 +1,1058 @@ +# 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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", +] + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bytemuck" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" + +[[package]] +name = "cc" +version = "1.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "shlex", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "cmake" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +dependencies = [ + "cc", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[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 = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "dlopen2" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6" +dependencies = [ + "dlopen2_derive", + "libc", + "once_cell", + "winapi", +] + +[[package]] +name = "dlopen2_derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[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 = "flagset" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3ea1ec5f8307826a5b71094dd91fc04d4ae75d5709b20ad351c7fb4815c86ec" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[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 = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[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 = "indicatif-log-bridge" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63703cf9069b85dbe6fe26e1c5230d013dee99d3559cd3d02ba39e099ef7ab02" +dependencies = [ + "indicatif", + "log", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libmonado-rs" +version = "0.1.0" +source = "git+https://github.com/technobaboo/libmonado-rs.git?rev=8982759c936ddf3d0fffc96ec404bfe53971276d#8982759c936ddf3d0fffc96ec404bfe53971276d" +dependencies = [ + "bindgen 0.69.4", + "cmake", + "convert_case", + "dlopen2", + "flagset", + "mint", + "semver", + "serde", + "serde_json", + "xdg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "matrixmultiply" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" +dependencies = [ + "autocfg", + "rawpointer", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "mint" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" +dependencies = [ + "serde", +] + +[[package]] +name = "motoc" +version = "0.3.1" +dependencies = [ + "anyhow", + "bindgen 0.70.1", + "clap", + "colored", + "env_logger", + "indicatif", + "indicatif-log-bridge", + "libmonado-rs", + "log", + "mint", + "nalgebra", + "openxr", + "serde", + "serde_json", + "xdg", +] + +[[package]] +name = "nalgebra" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c4b5f057b303842cf3262c27e465f4c303572e7f6b0648f60e16248ac3397f4" +dependencies = [ + "approx", + "matrixmultiply", + "mint", + "nalgebra-macros", + "num-complex", + "num-rational", + "num-traits", + "serde", + "simba", + "typenum", +] + +[[package]] +name = "nalgebra-macros" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[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 = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openxr" +version = "0.19.0" +source = "git+https://github.com/Ralith/openxrs.git?rev=6c7747aee678048642dc16aad8bab3d6961dce03#6c7747aee678048642dc16aad8bab3d6961dce03" +dependencies = [ + "libc", + "ndk-context", + "openxr-sys", +] + +[[package]] +name = "openxr-sys" +version = "0.11.0" +source = "git+https://github.com/Ralith/openxrs.git?rev=6c7747aee678048642dc16aad8bab3d6961dce03#6c7747aee678048642dc16aad8bab3d6961dce03" +dependencies = [ + "libc", + "mint", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "prettyplease" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[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.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags", + "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 = "safe_arch" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "simba" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa" +dependencies = [ + "approx", + "num-complex", + "num-traits", + "paste", + "wide", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[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 = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "wide" +version = "0.7.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690" +dependencies = [ + "bytemuck", + "safe_arch", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" diff --git a/pkgs/by-name/mo/motoc/package.nix b/pkgs/by-name/mo/motoc/package.nix new file mode 100644 index 0000000000000..23b0b6b135a49 --- /dev/null +++ b/pkgs/by-name/mo/motoc/package.nix @@ -0,0 +1,42 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + openxr-loader, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "motoc"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "galister"; + repo = "motoc"; + rev = "refs/tags/v${version}"; + hash = "sha256-119RWsAM5kKjsxA6wGdjhB99G31QaYlZBRaFCg5TtmI="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "libmonado-rs-0.1.0" = "sha256-bbbo/Mkix6nUGLwplvj6m8IXOcZY5UoWc1xZnI67IlU="; + "openxr-0.19.0" = "sha256-kbEYoN4UvUEaZA9LJWEKx1X1r+l91GjTWs1hNXhr7cw="; + }; + }; + + buildInputs = [ + openxr-loader + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "MOnado Tracking Origin Calibration program"; + homepage = "https://github.com/galister/motoc"; + changelog = "https://github.com/galister/motoc/releases"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ pandapip1 ]; + mainProgram = "motoc"; + }; +} diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index 127b623d27136..68533127f9bad 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.8.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-0SygSRp2HXgLhW0BscRhH3H/WUstAf6VbQPJ35ffrRM="; + hash = "sha256-8t/gAz08jFRuF0q3bo4y8tiIq4iYgAkXf5udYNIccu0="; fetchSubmodules = true; }; - cargoHash = "sha256-nkTvVfbpi5yvWpRd1Tm6INi3PrR6mP8VkBpIVeCEkw0="; + cargoHash = "sha256-Fz7LfAn78JVip0QshoL5KMAEHMtG8bkLzz4v95/qt3E="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 diff --git a/pkgs/by-name/mo/mousai/package.nix b/pkgs/by-name/mo/mousai/package.nix index b67ef0d86452d..7bdb7dd7ec2ca 100644 --- a/pkgs/by-name/mo/mousai/package.nix +++ b/pkgs/by-name/mo/mousai/package.nix @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-FjnRI1vHA9YF/Uw2+hDtMJmeJVa5RcxaYoG4XgXa9Ds="; }; 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 new file mode 100644 index 0000000000000..7d07d034c0fb5 --- /dev/null +++ b/pkgs/by-name/mo/mouse-actions-gui/80-mouse-actions.rules @@ -0,0 +1,2 @@ +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 new file mode 100644 index 0000000000000..01478b8015b19 --- /dev/null +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -0,0 +1,86 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + npmHooks, + fetchNpmDeps, + nodejs, + + rustPlatform, + cargo, + rustc, + cargo-tauri, + + pkg-config, + wrapGAppsHook3, + libXtst, + libevdev, + gtk3, + libsoup, + webkitgtk, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mouse-actions-gui"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "jersou"; + repo = "mouse-actions"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-44F4CdsDHuN2FuijnpfmoFy4a/eAbYOoBYijl9mOctg="; + }; + + sourceRoot = "${finalAttrs.src.name}/config-editor"; + + nativeBuildInputs = [ + npmHooks.npmConfigHook + nodejs + rustPlatform.cargoSetupHook + cargo + rustc + cargo-tauri.hook + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + # Base deps + libXtst + libevdev + + # Tauri deps + gtk3 + libsoup + webkitgtk + ]; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src sourceRoot; + hash = "sha256-amDTYAvEoDHb7+dg39+lUne0dv0M9vVe1vHoXk2agZA="; + }; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) pname version src; + sourceRoot = "${finalAttrs.sourceRoot}/${finalAttrs.cargoRoot}"; + hash = "sha256-H8TMpYFJWp227jPA5H2ZhSqTMiT/U6pT6eLyjibuoLU="; + }; + + postInstall = '' + install -Dm644 ${./80-mouse-actions.rules} $out/etc/udev/rules.d/80-mouse-actions.rules + ''; + + meta = { + changelog = "https://github.com/jersou/mouse-actions/blob/${finalAttrs.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/mouse_m908/package.nix b/pkgs/by-name/mo/mouse_m908/package.nix index 905b8fb1ef1e7..f9491674659b4 100644 --- a/pkgs/by-name/mo/mouse_m908/package.nix +++ b/pkgs/by-name/mo/mouse_m908/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "dokutan"; repo = "mouse_m908"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-sCAvjNpJYkp4G0KkDJtHOBR1vc80DZJtWR2W9gakkzQ="; + hash = "sha256-sCAvjNpJYkp4G0KkDJtHOBR1vc80DZJtWR2W9gakkzQ="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/pkgs/by-name/mo/mov-cli/mov-cli-test.nix b/pkgs/by-name/mo/mov-cli/mov-cli-test.nix index f135d863c1d57..7c34524eabcda 100644 --- a/pkgs/by-name/mo/mov-cli/mov-cli-test.nix +++ b/pkgs/by-name/mo/mov-cli/mov-cli-test.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "A mov-cli plugin that let's you test mov-cli's capabilities by watching free films and animations in the creative commons"; homepage = "https://github.com/mov-cli/mov-cli-test"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ roshaen ]; + maintainers = with lib.maintainers; [ youhaveme9 ]; }; } diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix index e840f9e56da99..21a27905a702b 100644 --- a/pkgs/by-name/mo/mov-cli/package.nix +++ b/pkgs/by-name/mo/mov-cli/package.nix @@ -8,7 +8,7 @@ let pname = "mov-cli"; - version = "4.4.8"; + version = "4.4.15"; in python3.pkgs.buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonPackage { owner = "mov-cli"; repo = "mov-cli"; rev = "refs/tags/${version}"; - hash = "sha256-MpSwSYsHsrG7ceXXJnFMg1bgadOhe23eNVCNMxlY0pQ="; + hash = "sha256-mHtKQtLhHYwd2GEA0rCZQ4C/DEgsc6Rk7ZLpXFyW5d8="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 665b0d5cd8899..ef5dac3d58fed 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -38,13 +38,13 @@ let in php.buildComposerProject (finalAttrs: { pname = "movim"; - version = "0.27.1"; + version = "0.28"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-7/8d+GU/hLaiFqo4Rl0ardhOwEpSeJ3GfJMNpGbNlnU="; + hash = "sha256-mjBeBu1seH5XMls+e4ON13ayVeugKogbNTzbjp1pUjE="; }; php = php.buildEnv ({ @@ -67,7 +67,7 @@ php.buildComposerProject (finalAttrs: { # pinned commonmark composerStrictValidation = false; - vendorHash = "sha256-wDnOh1CdJOovqmr4k45ksycuylYwL0Dm/UTl4EETf1k="; + vendorHash = "sha256-ZfMUpkIRCAsiQf6PEVPrMpljZWjP9JXf+nEFA/LunsQ="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/ibus-setup-mozc-jp.desktop b/pkgs/by-name/mo/mozc/ibus-setup-mozc-jp.desktop similarity index 100% rename from pkgs/tools/inputmethods/ibus-engines/ibus-mozc/ibus-setup-mozc-jp.desktop rename to pkgs/by-name/mo/mozc/ibus-setup-mozc-jp.desktop diff --git a/pkgs/by-name/mo/mozc/package.nix b/pkgs/by-name/mo/mozc/package.nix new file mode 100644 index 0000000000000..b374329d23ff9 --- /dev/null +++ b/pkgs/by-name/mo/mozc/package.nix @@ -0,0 +1,110 @@ +{ + lib, + buildBazelPackage, + fetchFromGitHub, + qt6, + pkg-config, + bazel, + ibus, + unzip, + xdg-utils, + jp-zip-codes, + dictionaries ? [ ], + merge-ut-dictionaries, +}: + +let + ut-dictionary = merge-ut-dictionaries.override { inherit dictionaries; }; +in +buildBazelPackage rec { + pname = "ibus-mozc"; + version = "2.30.5544.102"; + + src = fetchFromGitHub { + owner = "google"; + repo = "mozc"; + rev = version; + hash = "sha256-w0bjoMmq8gL7DSehEG7cKqp5e4kNOXnCYLW31Zl9FRs="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + qt6.wrapQtAppsHook + pkg-config + unzip + ]; + + buildInputs = [ + ibus + qt6.qtbase + ]; + + dontAddBazelOpts = true; + removeRulesCC = false; + + inherit bazel; + + fetchAttrs = { + sha256 = "sha256-+N7AhSemcfhq6j0IUeWZ0DyVvr1l5FbAkB+kahTy3pM="; + + # remove references of buildInputs and zip code files + preInstall = '' + rm -rv $bazelOut/external/{ibus,qt_linux,zip_code_*} + ''; + }; + + bazelFlags = [ + "--config" + "oss_linux" + "--compilation_mode" + "opt" + ]; + + bazelTargets = [ "package" ]; + + postPatch = '' + substituteInPlace src/config.bzl \ + --replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" \ + --replace-fail "/usr" "$out" + substituteInPlace src/WORKSPACE.bazel \ + --replace-fail "https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip" "file://${jp-zip-codes}/ken_all.zip" \ + --replace-fail "https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip" "file://${jp-zip-codes}/jigyosyo.zip" + ''; + + preConfigure = + '' + cd src + '' + + lib.optionalString (dictionaries != [ ]) '' + cat ${ut-dictionary}/mozcdic-ut.txt >> data/dictionary_oss/dictionary00.txt + ''; + + buildAttrs.installPhase = '' + runHook preInstall + + unzip bazel-bin/unix/mozc.zip -x "tmp/*" -d / + + # create a desktop file for gnome-control-center + # copied from ubuntu + mkdir -p $out/share/applications + cp ${./ibus-setup-mozc-jp.desktop} $out/share/applications/ibus-setup-mozc-jp.desktop + substituteInPlace $out/share/applications/ibus-setup-mozc-jp.desktop \ + --replace-fail "@mozc@" "$out" + + runHook postInstall + ''; + + meta = with lib; { + isIbusEngine = true; + description = "Japanese input method from Google"; + mainProgram = "mozc_emacs_helper"; + homepage = "https://github.com/google/mozc"; + license = licenses.free; + platforms = platforms.linux; + maintainers = with maintainers; [ + gebner + ericsagnes + pineapplehunter + ]; + }; +} diff --git a/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix b/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix new file mode 100644 index 0000000000000..40295db08ce59 --- /dev/null +++ b/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-alt-cannadic"; + version = "0-unstable-2024-07-28"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-alt-cannadic"; + rev = "50fee0397b87fe508f9edd45bac56f5290d8ce66"; + hash = "sha256-KKUj3d9yR2kTTTFbroZQs+OZR4KUyAUYE/X3z9/vQvM="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-alt-cannadic.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT Alt-Cannadic Dictionary is a dictionary converted from Alt-Cannadic for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-alt-cannadic"; + license = with lib.licenses; [ + asl20 + gpl2 + ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix b/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix new file mode 100644 index 0000000000000..37551d7e0d043 --- /dev/null +++ b/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-edict2"; + version = "0-unstable-2024-07-28"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-edict2"; + rev = "b2112277d0d479b9218f42772356da3601b3e8cf"; + hash = "sha256-DIIp8FooWxyHMrQmq+2KUGEmYHKy+H6NtHrvRldxXqc="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-edict2.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT EDICT2 Dictionary is a dictionary converted from EDICT2 for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-sudachidict"; + license = with lib.licenses; [ + asl20 + cc-by-sa-40 + ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix b/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix new file mode 100644 index 0000000000000..e7ab1d99a11c3 --- /dev/null +++ b/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-jawiki"; + version = "0-unstable-2024-09-27"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-jawiki"; + rev = "773cc08e71c4daa3c06fc577853f715a2bb4d9aa"; + hash = "sha256-TDZvB8/ZrUtkAbCr3vMfyFfhQ4v5SYWEqPNjuGB1Ve4="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-jawiki.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT Jawiki Dictionary is a dictionary generated from the Japanese Wikipedia for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-jawiki"; + license = with lib.licenses; [ + asl20 + cc-by-sa-40 + ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix new file mode 100644 index 0000000000000..686fe1e9fefb5 --- /dev/null +++ b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-neologd"; + version = "0-unstable-2024-07-28"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-neologd"; + rev = "b7035b88db25ad1a933f05a33f193711c6c3b2db"; + hash = "sha256-JPTrWaDtdNs/Z0uLRwaS8Qc/l4/Y7NtwLanivyefXnk="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-neologd.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT NEologd Dictionary is a dictionary converted from mecab-ipadic-NEologd for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-neologd"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix b/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix new file mode 100644 index 0000000000000..fb3c430c4597f --- /dev/null +++ b/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-personal-names"; + version = "0-unstable-2024-09-21"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-personal-names"; + rev = "b61a5af7992d6fcdc82fa08b67b1c9771bbc4449"; + hash = "sha256-xcfhfO5GIiOVxLfqX3izLHYuSFZCgOlbQE3N3U+HTW4="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-personal-names.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT Personal Name Dictionary is a dictionary for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-personal-names"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix b/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix new file mode 100644 index 0000000000000..8cfb509f5b43b --- /dev/null +++ b/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-place-names"; + version = "0-unstable-2024-09-03"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-place-names"; + rev = "4525819546a26fc994d7ca4a2e883fde14bf908c"; + hash = "sha256-oiSBR2QhOYyurftdEn2w6hNK1ucddlvLqGTiZk9G/4k="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-place-names.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT Place Name Dictionary is a dictionary converted from the Japan Post's ZIP code data for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-place-names"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix b/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix new file mode 100644 index 0000000000000..264490ad61267 --- /dev/null +++ b/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-skk-jisyo"; + version = "0-unstable-2024-07-27"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-skk-jisyo"; + rev = "7300f19e6a3f27334ed7af64589de8782549a13f"; + hash = "sha256-LJ1rP+uyh8K3IWCgKMDYt0EwEDiQqQL+wBdQCFbZM/k="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-skk-jisyo.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT SKK-JISYO Dictionary is a dictionary converted from SKK-JISYO for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-sudachidict"; + license = with lib.licenses; [ + asl20 + gpl2Plus + ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix new file mode 100644 index 0000000000000..2ddb8fe5d2b5d --- /dev/null +++ b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "mozcdic-ut-sudachidict"; + version = "0-unstable-2024-07-28"; + + src = fetchFromGitHub { + owner = "utuhiro78"; + repo = "mozcdic-ut-sudachidict"; + rev = "a754f1fff5fded62cc066aa6be0ab0169059a144"; + hash = "sha256-WzhWNpqtiG9TtFHEOSbHG1mbb4ak0zCkO13g9ZWqyBE="; + }; + + installPhase = '' + runHook preInstall + + install -Dt $out mozcdic-ut-sudachidict.txt.tar.bz2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + description = "Mozc UT SudachiDict Dictionary is a dictionary converted from SudachiDict for Mozc."; + homepage = "https://github.com/utuhiro78/mozcdic-ut-sudachidict"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ pineapplehunter ]; + platforms = lib.platforms.all; + # this does not need to be separately built + # it only provides some zip files + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix new file mode 100644 index 0000000000000..828300f4e5ff7 --- /dev/null +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -0,0 +1,120 @@ +{ + _experimental-update-script-combinators, + buildGoModule, + cargo, + cmake, + fetchFromGitHub, + go, + lib, + libcap, + libgcrypt, + libgpg-error, + libsecret, + nix-update-script, + pkg-config, + python3, + qt6, + rustPlatform, + rustc, + stdenv, + wireguard-tools, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mozillavpn"; + version = "2.24.1"; + src = fetchFromGitHub { + owner = "mozilla-mobile"; + repo = "mozilla-vpn-client"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-X2rtHAZ9vbWjuOmD3B/uPasUQ1Q+b4SkNqk4MqGMaYo="; + }; + patches = [ ]; + + netfilter = buildGoModule { + pname = "${finalAttrs.pname}-netfilter"; + inherit (finalAttrs) + version + src + patches + ; + modRoot = "linux/netfilter"; + vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src patches; + hash = "sha256-ryJFvnJIiDKf2EqlzHj79hSPYrD+3UtZ5lT/QeFv6V0="; + }; + + buildInputs = [ + libcap + libgcrypt + libgpg-error + libsecret + qt6.qt5compat + qt6.qtbase + qt6.qtnetworkauth + qt6.qtsvg + qt6.qtwayland + qt6.qtwebsockets + ]; + nativeBuildInputs = [ + cargo + cmake + go + pkg-config + python3 + python3.pkgs.glean-parser + python3.pkgs.pyyaml + python3.pkgs.setuptools + qt6.qttools + qt6.wrapQtAppsHook + rustPlatform.cargoSetupHook + rustc + ]; + + postPatch = '' + substituteInPlace src/cmake/linux.cmake \ + --replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \ + --replace '/usr/share/dbus-1' "$out/share/dbus-1" \ + --replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" + + substituteInPlace extension/CMakeLists.txt \ + --replace '/etc' "$out/etc" + + ln -s '${finalAttrs.netfilter.goModules}' linux/netfilter/vendor + ''; + + cmakeFlags = [ + "-DQT_LCONVERT_EXECUTABLE=${qt6.qttools.dev}/bin/lconvert" + "-DQT_LUPDATE_EXECUTABLE=${qt6.qttools.dev}/bin/lupdate" + "-DQT_LRELEASE_EXECUTABLE=${qt6.qttools.dev}/bin/lrelease" + ]; + dontFixCmake = true; + + qtWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ wireguard-tools ]) + ]; + + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { }) + (nix-update-script { + attrPath = "mozillavpn.netfilter"; + extraArgs = [ "--version=skip" ]; + }) + ]; + + meta = { + description = "Client for the Mozilla VPN service"; + mainProgram = "mozillavpn"; + homepage = "https://vpn.mozilla.org/"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ andersk ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/mp/mpack/package.nix b/pkgs/by-name/mp/mpack/package.nix index d428fbe664c92..5f2fa1124dee7 100644 --- a/pkgs/by-name/mp/mpack/package.nix +++ b/pkgs/by-name/mp/mpack/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.andrew.cmu.edu/pub/mpack/mpack-${version}.tar.gz"; - sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97"; + hash = "sha256-J0EIuzo5mCpO/BT7OmUpjmbI5xNnw9q/STOBYtIHqUw="; }; patches = [ diff --git a/pkgs/by-name/mp/mpris-notifier/package.nix b/pkgs/by-name/mp/mpris-notifier/package.nix index 43f455a37b189..3b3016a1d2481 100644 --- a/pkgs/by-name/mp/mpris-notifier/package.nix +++ b/pkgs/by-name/mp/mpris-notifier/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "mpris-notifier"; - version = "0.1.7"; + version = "0.1.10"; src = fetchFromGitHub { owner = "l1na-forever"; repo = "mpris-notifier"; rev = "v${version}"; - hash = "sha256-B1nfVsn95oe2FlHFjb9O4tfL/EqsZZ4JGF0mbJcCg2Y="; + hash = "sha256-X9d410ijZZcHvf8+f6DgnMl8ETGeY/fN13Gpz6q3BBA="; }; - cargoHash = "sha256-8WzG712/soPgooyR35L8aFIRfPC2MvV3vCcPbkTgoF0="; + cargoHash = "sha256-f8BCnjgv7OLWQ/2X3dTUuAarCl+u+4CRARSQsO+09zE="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix index dec4322046222..2aa7a6ba68913 100644 --- a/pkgs/by-name/mq/mqtt-explorer/package.nix +++ b/pkgs/by-name/mq/mqtt-explorer/package.nix @@ -51,13 +51,13 @@ stdenv.mkDerivation rec { typescript fixup-yarn-lock makeWrapper - ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ]; 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.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export CSC_IDENTITY_AUTO_DISCOVERY=false ''; @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/share/mqtt-explorer"/{app,icons/hicolor} cp -r build/*-unpacked/{locales,resources{,.pak}} "$out/share/mqtt-explorer/app" @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { --inherit-argv0 ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv "build/mac/MQTT Explorer.app" $out/Applications diff --git a/pkgs/by-name/mq/mqttui/package.nix b/pkgs/by-name/mq/mqttui/package.nix index e4bbd4974f31e..d2617f51e1ddc 100644 --- a/pkgs/by-name/mq/mqttui/package.nix +++ b/pkgs/by-name/mq/mqttui/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ln -sf ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; meta = with lib; { description = "Terminal client for MQTT"; diff --git a/pkgs/by-name/mq/mqttx/package.nix b/pkgs/by-name/mq/mqttx/package.nix index 975db394ab189..1e36ad57ab41e 100644 --- a/pkgs/by-name/mq/mqttx/package.nix +++ b/pkgs/by-name/mq/mqttx/package.nix @@ -7,17 +7,17 @@ let pname = "mqttx"; - version = "1.9.9"; + version = "1.10.1"; suffixedUrl = suffix: "https://github.com/emqx/MQTTX/releases/download/v${version}/MQTTX-${version}${suffix}.AppImage"; sources = { "aarch64-linux" = fetchurl { url = suffixedUrl "-arm64"; - hash = "sha256-mCCRvLS6diKoKYZNUMsyiWyFWmyYYB0pAxNT0yriJHI="; + hash = "sha256-QumOqOOFXOXf0oqXWVaz0+69kHDk3HQKvNcQl8X7Fp8="; }; "x86_64-linux" = fetchurl { url = suffixedUrl ""; - hash = "sha256-InGfGiT3c5M8ueFZl5/hFmYRPeXnwSCUPhAqmz0jsU8="; + hash = "sha256-+TyZnx3/qraoA3rcpIDKedGyTzFvdaAE/v4pzXrB0zU="; }; }; diff --git a/pkgs/by-name/ms/mscp/package.nix b/pkgs/by-name/ms/mscp/package.nix new file mode 100644 index 0000000000000..f95b0a249d5f9 --- /dev/null +++ b/pkgs/by-name/ms/mscp/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + zlib, + openssl, + krb5, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "mscp"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "upa"; + repo = "mscp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-TWwvPLqGLhh/IE+hIz/jwaGLBoASs78Iqai1TxN7Wps="; + fetchSubmodules = true; + }; + + postPatch = '' + echo ${lib.escapeShellArg finalAttrs.version} > VERSION + patch -d libssh -p1 < patch/libssh-0.10.6-2-g6f1b1e76.patch + ''; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + krb5 + openssl + zlib + ]; + + meta = { + description = "Transfer files over multiple SSH (SFTP) connections"; + homepage = "https://github.com/upa/mscp"; + mainProgram = "mscp"; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.deshaw.members; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ms/msecli/package.nix b/pkgs/by-name/ms/msecli/package.nix new file mode 100644 index 0000000000000..6a2991f90ec4b --- /dev/null +++ b/pkgs/by-name/ms/msecli/package.nix @@ -0,0 +1,65 @@ +{ + autoPatchelfHook, + buildFHSEnv, + fetchurl, + lib, + stdenv, + zlib, +}: + +let + pname = "msecli"; + version = "10.01.012024.00"; + + src = fetchurl { + url = "https://web.archive.org/web/20240916144249/https://www.micron.com/content/dam/micron/global/public/products/software/storage-executive-software/msecli/msecli-linux.run"; + hash = "sha256-IszdD/9fAh+JA26bSR1roXSo8LDU/rf4CuRI3HjU1xc="; + }; + + buildEnv = buildFHSEnv { name = "msecli-buildEnv"; }; +in +stdenv.mkDerivation { + inherit pname version src; + + buildInputs = [ zlib ]; + + nativeBuildInputs = [ autoPatchelfHook ]; + + unpackPhase = '' + runHook preUnpack + + cp "$src" ${src.name} + chmod +x ${src.name} + + runHook postUnpack + ''; + + buildPhase = '' + runHook prebuild + + # ignore the exit code as the installer + # fails at optional steps due to read only FHS + ${buildEnv}/bin/${buildEnv.name} -c "./${src.name} --mode unattended --prefix bin || true" + + runHook postbuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -v bin/msecli $out/bin + + runHook postInstall + ''; + + meta = { + description = "Micron Storage Executive CLI"; + homepage = "https://www.micron.com/sales-support/downloads/software-drivers/storage-executive-software"; + license = lib.licenses.unfree; + mainProgram = "msecli"; + maintainers = with lib.maintainers; [ diadatp ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index db05acd3bbced..b4e43dbe5cfc6 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msolve"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "algebraic-solving"; repo = "msolve"; rev = "v${finalAttrs.version}"; - hash = "sha256-f1AtZ0tyHg3fqz44GK7eCsye+wiKeBbpKK9JWXpV/tk="; + hash = "sha256-p7fD954aMApyBP58cvGrPwHEqhkxWlaiDHUlQT7kX4c="; }; postPatch = '' @@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library for polynomial system solving through algebraic methods"; mainProgram = "msolve"; homepage = "https://msolve.lip6.fr"; + changelog = "https://github.com/algebraic-solving/msolve/releases/tag/${finalAttrs.src.rev}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ wegank ]; platforms = platforms.unix; diff --git a/pkgs/os-specific/linux/msr/000-include-sysmacros.patch b/pkgs/by-name/ms/msr/000-include-sysmacros.patch similarity index 100% rename from pkgs/os-specific/linux/msr/000-include-sysmacros.patch rename to pkgs/by-name/ms/msr/000-include-sysmacros.patch diff --git a/pkgs/os-specific/linux/msr/default.nix b/pkgs/by-name/ms/msr/package.nix similarity index 100% rename from pkgs/os-specific/linux/msr/default.nix rename to pkgs/by-name/ms/msr/package.nix diff --git a/pkgs/by-name/mu/muffon/package.nix b/pkgs/by-name/mu/muffon/package.nix index 43a5f135b8444..6184aa0ac3ad8 100644 --- a/pkgs/by-name/mu/muffon/package.nix +++ b/pkgs/by-name/mu/muffon/package.nix @@ -17,8 +17,9 @@ in appimageTools.wrapType2 { inherit pname src version; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/muffon \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -m 444 -D ${appimageContents}/muffon.desktop -t $out/share/applications diff --git a/pkgs/applications/science/robotics/mujoco/mujoco-system-deps-dont-fetch.patch b/pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch similarity index 100% rename from pkgs/applications/science/robotics/mujoco/mujoco-system-deps-dont-fetch.patch rename to pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix new file mode 100644 index 0000000000000..291fe8e546cdc --- /dev/null +++ b/pkgs/by-name/mu/mujoco/package.nix @@ -0,0 +1,196 @@ +{ + cereal_1_3_2, + cmake, + fetchFromGitHub, + fetchFromGitLab, + glfw, + glm, + lib, + spdlog, + stdenv, +}: + +let + pin = { + # TODO: Check the following file and ensure the dependencies are up-to-date + # See https://github.com/google-deepmind/mujoco/blob/<VERSION>/cmake/MujocoDependencies.cmake#L17-L64 + abseil-cpp = fetchFromGitHub { + owner = "abseil"; + repo = "abseil-cpp"; + rev = "4447c7562e3bc702ade25105912dce503f0c4010"; + hash = "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4="; + }; + benchmark = fetchFromGitHub { + owner = "google"; + repo = "benchmark"; + rev = "7c8ed6b082aa3c7a3402f18e50da4480421d08fd"; + hash = "sha256-xX3o4wX7RUvw1x2gOlT6sGhutDYLBZ/JzFnv68qN6E8="; + }; + ccd = fetchFromGitHub { + owner = "danfis"; + repo = "libccd"; + rev = "7931e764a19ef6b21b443376c699bbc9c6d4fba8"; + hash = "sha256-TIZkmqQXa0+bSWpqffIgaBela0/INNsX9LPM026x1Wk="; + }; + eigen3 = fetchFromGitLab { + owner = "libeigen"; + repo = "eigen"; + rev = "f33af052e0e60d4aa367328e7d9dffc9dedca6d8"; + hash = "sha256-93I6MFIZ8tvdwTmiMihOaVVCdkWOTvXWZ5vYXzsMP+Q="; + }; + googletest = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "b514bdc898e2951020cbdca1304b75f5950d1f59"; + hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM="; + }; + lodepng = fetchFromGitHub { + owner = "lvandeve"; + repo = "lodepng"; + rev = "b4ed2cd7ecf61d29076169b49199371456d4f90b"; + hash = "sha256-5cCkdj/izP4e99BKfs/Mnwu9aatYXjlyxzzYiMD/y1M="; + }; + qhull = fetchFromGitHub { + owner = "qhull"; + repo = "qhull"; + rev = "0c8fc90d2037588024d9964515c1e684f6007ecc"; + hash = "sha256-Ptzxad3ewmKJbbcmrBT+os4b4SR976zlCG9F0nq0x94="; + }; + tinyobjloader = fetchFromGitHub { + owner = "tinyobjloader"; + repo = "tinyobjloader"; + rev = "1421a10d6ed9742f5b2c1766d22faa6cfbc56248"; + hash = "sha256-9z2Ne/WPCiXkQpT8Cun/pSGUwgClYH+kQ6Dx1JvW6w0="; + }; + tinyxml2 = fetchFromGitHub { + owner = "leethomason"; + repo = "tinyxml2"; + rev = "9a89766acc42ddfa9e7133c7d81a5bda108a0ade"; + hash = "sha256-YGAe4+Ttv/xeou+9FoJjmQCKgzupTYdDhd+gzvtz/88="; + }; + marchingcubecpp = fetchFromGitHub { + owner = "aparis69"; + repo = "MarchingCubeCpp"; + rev = "f03a1b3ec29b1d7d865691ca8aea4f1eb2c2873d"; + hash = "sha256-90ei0lpJA8XuVGI0rGb3md0Qtq8/bdkU7dUCHpp88Bw="; + }; + + tmd = stdenv.mkDerivation rec { + name = "TriangleMeshDistance"; + + src = fetchFromGitHub { + owner = "InteractiveComputerGraphics"; + repo = name; + rev = "e55a15c20551f36242fd6368df099a99de71d43a"; + hash = "sha256-vj6TMMT8mp7ciLa5nzVAhMWPcAHXq+ZwHlWsRA3uCmg="; + }; + + installPhase = '' + mkdir -p $out/include/tmd + cp ${name}/include/tmd/${name}.h $out/include/tmd/ + ''; + }; + + sdflib = stdenv.mkDerivation rec { + name = "SdfLib"; + + src = fetchFromGitHub { + owner = "UPC-ViRVIG"; + repo = name; + rev = "1927bee6bb8225258a39c8cbf14e18a4d50409ae"; + hash = "sha256-+SFUOdZ6pGZvnQa0mT+yfbTMHWe2CTOlroXcuVBHdOE="; + }; + + patches = [ ./sdflib-system-deps.patch ]; + + cmakeFlags = [ + "-DSDFLIB_USE_ASSIMP=OFF" + "-DSDFLIB_USE_OPENMP=OFF" + "-DSDFLIB_USE_ENOKI=OFF" + "-DSDFLIB_USE_SYSTEM_GLM=ON" + "-DSDFLIB_USE_SYSTEM_SPDLOG=ON" + "-DSDFLIB_USE_SYSTEM_CEREAL=ON" + "-DSDFLIB_USE_SYSTEM_TRIANGLEMESHDISTANCE=ON" + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + pin.tmd + + # Mainline. The otherwise pinned glm realease from 2018 does + # not build due to test failures and missing files. + glm + + spdlog + cereal_1_3_2 + ]; + }; + + }; + +in +stdenv.mkDerivation rec { + pname = "mujoco"; + version = "3.2.3"; + + # Bumping version? Make sure to look though the MuJoCo's commit + # history for bumped dependency pins! + src = fetchFromGitHub { + owner = "google-deepmind"; + repo = "mujoco"; + rev = "refs/tags/${version}"; + hash = "sha256-WMh96sJK9A5QcVmIjy4STN+vMrxLxcDPHMfEnTmSXSU="; + }; + + patches = [ ./mujoco-system-deps-dont-fetch.patch ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + pin.sdflib + glm + + # non-numerical + spdlog + cereal_1_3_2 + glfw + ]; + + cmakeFlags = [ + "-DMUJOCO_USE_SYSTEM_sdflib=ON" + "-DMUJOCO_SIMULATE_USE_SYSTEM_GLFW=ON" + "-DMUJOCO_SAMPLES_USE_SYSTEM_GLFW=ON" + ]; + + # 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 + ln -s ${pin.ccd} build/_deps/ccd-src + ln -s ${pin.eigen3} build/_deps/eigen3-src + ln -s ${pin.googletest} build/_deps/googletest-src + ln -s ${pin.lodepng} build/_deps/lodepng-src + ln -s ${pin.qhull} build/_deps/qhull-src + ln -s ${pin.tinyobjloader} build/_deps/tinyobjloader-src + ln -s ${pin.tinyxml2} build/_deps/tinyxml2-src + ln -s ${pin.marchingcubecpp} build/_deps/marchingcubecpp-src + ''; + + passthru.pin = { + inherit (pin) lodepng eigen3 abseil-cpp; + }; + + meta = { + description = "Multi-Joint dynamics with Contact. A general purpose physics simulator"; + homepage = "https://mujoco.org/"; + changelog = "https://github.com/google-deepmind/mujoco/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + GaetanLepage + samuela + tmplt + ]; + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/applications/science/robotics/mujoco/sdflib-system-deps.patch b/pkgs/by-name/mu/mujoco/sdflib-system-deps.patch similarity index 100% rename from pkgs/applications/science/robotics/mujoco/sdflib-system-deps.patch rename to pkgs/by-name/mu/mujoco/sdflib-system-deps.patch diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 876cf96d50779..8c847f3c365b2 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -29,10 +29,10 @@ , pciutils , zlib -, libnotifySupport ? stdenv.isLinux +, libnotifySupport ? stdenv.hostPlatform.isLinux , libnotify -, waylandSupport ? stdenv.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , libxkbcommon , libdrm , libGL @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.5.2"; + version = "13.5.6"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,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-CXcaJLgG448tjTlOcxGwT/w1qWaokpVXbBZ6cLxWcNc="; + hash = "sha256-AayGWFfsdAK9Ku4J4nDolJxnQn0HhGeZeEf//9OspWA="; }; }; diff --git a/pkgs/by-name/mu/mullvad-browser/update.nix b/pkgs/by-name/mu/mullvad-browser/update.nix index 04b69d8ce208c..7faf4c31efbf0 100644 --- a/pkgs/by-name/mu/mullvad-browser/update.nix +++ b/pkgs/by-name/mu/mullvad-browser/update.nix @@ -56,7 +56,7 @@ in writeShellScript "update-${pname}" '' for platform in ${lib.escapeShellArgs meta.platforms}; do arch="''${platforms[$platform]}" - sha256=$(grep "${name}-$arch-$version.tar.xz" "$HOME/shasums" | cut -d" " -f1) + sha256=$(grep "${name}-$arch-$version.tar.xz" "$HOME/shasums" | head -1 | cut -d" " -f1) hash=$(nix hash to-sri --type sha256 "$sha256") update-source-version "${pname}" "$version" "$hash" --ignore-same-version --source-key="sources.$platform" diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/by-name/mu/multimarkdown/package.nix similarity index 100% rename from pkgs/tools/typesetting/multimarkdown/default.nix rename to pkgs/by-name/mu/multimarkdown/package.nix diff --git a/pkgs/by-name/mu/multiplex/package.nix b/pkgs/by-name/mu/multiplex/package.nix index 8486bf9441246..f5d13a7570c5c 100644 --- a/pkgs/by-name/mu/multiplex/package.nix +++ b/pkgs/by-name/mu/multiplex/package.nix @@ -4,39 +4,44 @@ fetchFromGitHub, pkg-config, gobject-introspection, + blueprint-compiler, wrapGAppsHook4, libadwaita, }: buildGoModule rec { pname = "multiplex"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "pojntfx"; repo = "multiplex"; rev = "v${version}"; - hash = "sha256-6xZ46LeFuJXwd7s63YKekUIdb8ytdLk+rp+tFox27zY="; + hash = "sha256-qc8RHvU7uGbqtMGy/mYXHCxqvE6gekgfFOWwej33+zQ="; }; - vendorHash = "sha256-S14dMAejoVTVn3rRdZyG+npM5kNehHwntJkeW3M7Stk="; + vendorHash = "sha256-VLlco6CeedoUM5gy8+5yLffAtMsjH/RQ+U4VYvY5mcg="; nativeBuildInputs = [ pkg-config gobject-introspection + blueprint-compiler wrapGAppsHook4 ]; buildInputs = [ libadwaita ]; - # recursively generate all files requested by go:generate + # generate files requested by go:generate + # don't generate in goModules because buildInputs isn't available preBuild = '' - go generate ./... + if [[ ! $name == *"-go-modules" ]]; then + go generate ./internal/resources/resources.go + fi ''; postInstall = '' install -Dm644 -t $out/share/applications com.pojtinger.felicitas.Multiplex.desktop - install -Dm644 -t $out/share/metainfo com.pojtinger.felicitas.Multiplex.metainfo.xml + install -Dm644 -t $out/share/metainfo internal/resources/com.pojtinger.felicitas.Multiplex.metainfo.xml # The provided pixmap icons appears to be a bit blurry so not installing them install -Dm644 docs/icon.svg $out/share/icons/hicolor/scalable/apps/com.pojtinger.felicitas.Multiplex.svg install -Dm644 docs/icon-symbolic.svg $out/share/icons/hicolor/symbolic/apps/com.pojtinger.felicitas.Multiplex-symbolic.svg diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index a02d7901617ea..7d0e3e154cb4f 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/coin-or-tools/ThirdParty-Mumps/blob/stable/3.0/get.Mumps#L66 cp libseq/mpi.h libseq/mumps_mpi.h '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/Makefile --replace-fail \ "-Wl,\''$(SONAME),libmumps_common" \ "-Wl,-install_name,$out/lib/libmumps_common" @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { ''; makeFlags = - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ "SONAME=" "LIBEXT_SHARED=.dylib" ] ++ [ "LSCOTCHDIR=${scotch}/lib" - "ISCOTCH=-I${scotch}/include" + "ISCOTCH=-I${scotch.dev}/include" "LMETISDIR=${metis}/lib" "IMETIS=-I${metis}/include" "allshared" @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { scotch ]; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool \ -change libmpiseq.dylib \ $out/lib/libmpiseq.dylib \ diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix new file mode 100644 index 0000000000000..0e38f4f8e9932 --- /dev/null +++ b/pkgs/by-name/mu/muon/package.nix @@ -0,0 +1,139 @@ +{ lib +, stdenv +, fetchFromSourcehut +, fetchurl +, curl +, libarchive +, libpkgconf +, pkgconf +, python3 +, samurai +, scdoc +, zlib +, embedSamurai ? false +, buildDocs ? true +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "muon" + + lib.optionalString embedSamurai "-embedded-samurai"; + version = "0.2.0"; + + src = fetchFromSourcehut { + name = "muon-src"; + owner = "~lattis"; + repo = "muon"; + rev = finalAttrs.version; + hash = "sha256-ZHWyUV/BqM3ihauXDqDVkZURDDbBiRcEzptyGQmw94I="; + }; + + outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ]; + + nativeBuildInputs = [ + pkgconf + samurai + ] + ++ lib.optionals buildDocs [ + (python3.withPackages (ps: [ ps.pyyaml ])) + scdoc + ]; + + buildInputs = [ + curl + libarchive + libpkgconf + samurai + zlib + ]; + + strictDeps = true; + + postUnpack = let + # URLs manually extracted from subprojects directory + meson-docs-wrap = fetchurl { + name = "meson-docs-wrap"; + url = "https://mochiro.moe/wrap/meson-docs-1.0.1-19-gdd8d4ee22.tar.gz"; + hash = "sha256-jHSPdLFR5jUeds4e+hLZ6JOblor5iuCV5cIwoc4K9gI="; + }; + + samurai-wrap = fetchurl { + name = "samurai-wrap"; + url = "https://mochiro.moe/wrap/samurai-1.2-32-g81cef5d.tar.gz"; + hash = "sha256-aPMAtScqweGljvOLaTuR6B0A0GQQQrVbRviXY4dpCoc="; + }; + in '' + pushd $sourceRoot/subprojects + ${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap}"} + ${lib.optionalString embedSamurai "tar xvf ${samurai-wrap}"} + popd + ''; + + postPatch = '' + patchShebangs bootstrap.sh + '' + + lib.optionalString buildDocs '' + patchShebangs subprojects/meson-docs/docs/genrefman.py + ''; + + # tests try to access "~" + postConfigure = '' + export HOME=$(mktemp -d) + ''; + + buildPhase = let + muonBool = lib.mesonBool; + muonEnable = lib.mesonEnable; + + cmdlineForMuon = lib.concatStringsSep " " [ + (muonBool "static" stdenv.targetPlatform.isStatic) + (muonEnable "docs" buildDocs) + (muonEnable "samurai" embedSamurai) + ]; + cmdlineForSamu = "-j$NIX_BUILD_CORES"; + in '' + runHook preBuild + + ./bootstrap.sh stage-1 + + ./stage-1/muon setup ${cmdlineForMuon} stage-2 + samu ${cmdlineForSamu} -C stage-2 + + stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3 + samu ${cmdlineForSamu} -C stage-3 + + runHook postBuild + ''; + + # tests are failing because they don't find Python + doCheck = false; + + checkPhase = '' + runHook preCheck + + ./stage-3/muon -C stage-3 test + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + stage-3/muon -C stage-3 install + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://muon.build/"; + description = "Implementation of Meson build system in C99"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + broken = stdenv.hostPlatform.isDarwin; # typical `ar failure` + mainProgram = "muon"; + }; +}) +# TODO LIST: +# 1. automate sources acquisition (especially wraps) +# 2. setup hook +# 3. tests diff --git a/pkgs/by-name/mu/muse-sounds-manager/package.nix b/pkgs/by-name/mu/muse-sounds-manager/package.nix new file mode 100644 index 0000000000000..8466c767eda1b --- /dev/null +++ b/pkgs/by-name/mu/muse-sounds-manager/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + dpkg, + fontconfig, + zlib, + icu, + libX11, + libXext, + libXi, + libXrandr, + libICE, + libSM, + openssl, +}: + +stdenv.mkDerivation rec { + pname = "muse-sounds-manager"; + version = "1.1.0.587"; + + # 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_Beta.deb + # then replace the date in the URL below with date when the SHA1 + # changes (currently A3NX3WHFZWXCHZVME2ABUL2VRENTWOD5) and replace + # the version above with the version in the .deb metadata (or in the + # settings of muse-sounds-manager). + src = fetchurl { + url = "https://web.archive.org/web/20240826143936/https://muse-cdn.com/Muse_Sounds_Manager_Beta.deb"; + hash = "sha256-wzZAIjme1cv8+jMLiKT7kUQvCb+UhsvOnLDV4hCL3hw="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + fontconfig + stdenv.cc.cc + zlib + ] ++ runtimeDependencies; + + runtimeDependencies = map lib.getLib [ + icu + libX11 + libXext + libXi + libXrandr + libICE + libSM + openssl + ]; + + unpackPhase = "dpkg -x $src ."; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv usr/* opt $out/ + substituteInPlace $out/bin/muse-sounds-manager --replace-fail /opt/ $out/opt/ + + runHook postInstall + ''; + + meta = { + description = "Manage Muse Sounds (Muse Hub) libraries for MuseScore"; + homepage = "https://musescore.org/"; + license = lib.licenses.unfree; + mainProgram = "muse-sounds-manager"; + maintainers = with lib.maintainers; [ orivej ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index 679277118a992..f3e00cf20908b 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { - version = "photos-v0.9.30"; + version = "photos-v0.9.35"; pname = "museum"; src = fetchFromGitHub { @@ -15,7 +15,7 @@ buildGoModule rec { repo = "ente"; sparseCheckout = [ "server" ]; rev = version; - hash = "sha256-R85eI8n9jQB55l8V4881X74RGH3k0JhGS+phLBrZHvc="; + hash = "sha256-A/M2OhDzzOMGXnaqFFV9Z8bn/3HeZc50p2mIv++Q0uE="; }; sourceRoot = "${src.name}/server"; diff --git a/pkgs/by-name/mu/music-assistant/ffmpeg.patch b/pkgs/by-name/mu/music-assistant/ffmpeg.patch index cb815203aa757..e0356bd4189b8 100644 --- a/pkgs/by-name/mu/music-assistant/ffmpeg.patch +++ b/pkgs/by-name/mu/music-assistant/ffmpeg.patch @@ -1,8 +1,8 @@ diff --git a/music_assistant/server/helpers/audio.py b/music_assistant/server/helpers/audio.py -index 6b7b5c8e..ec3b92d7 100644 +index 80310604..0a72bcfc 100644 --- a/music_assistant/server/helpers/audio.py +++ b/music_assistant/server/helpers/audio.py -@@ -214,7 +214,7 @@ async def crossfade_pcm_parts( +@@ -74,7 +74,7 @@ async def crossfade_pcm_parts( await outfile.write(fade_out_part) args = [ # generic args @@ -11,16 +11,16 @@ index 6b7b5c8e..ec3b92d7 100644 "-hide_banner", "-loglevel", "quiet", -@@ -277,7 +277,7 @@ async def strip_silence( +@@ -135,7 +135,7 @@ async def strip_silence( + reverse: bool = False, ) -> bytes: """Strip silence from begin or end of pcm audio using ffmpeg.""" - fmt = ContentType.from_bit_depth(bit_depth) - args = ["ffmpeg", "-hide_banner", "-loglevel", "quiet"] + args = ["@ffmpeg@", "-hide_banner", "-loglevel", "quiet"] args += [ "-acodec", - fmt.name.lower(), -@@ -824,7 +824,7 @@ async def get_ffmpeg_stream( + pcm_format.content_type.name.lower(), +@@ -812,7 +812,7 @@ async def get_file_stream( async def check_audio_support() -> tuple[bool, bool, str]: """Check if ffmpeg is present (with/without libsoxr support).""" # check for FFmpeg presence @@ -29,7 +29,7 @@ index 6b7b5c8e..ec3b92d7 100644 ffmpeg_present = returncode == 0 and "FFmpeg" in output.decode() # use globals as in-memory cache -@@ -878,7 +878,7 @@ async def get_silence( +@@ -866,7 +866,7 @@ async def get_silence( return # use ffmpeg for all other encodings args = [ @@ -38,7 +38,11 @@ index 6b7b5c8e..ec3b92d7 100644 "-hide_banner", "-loglevel", "quiet", -@@ -972,7 +972,7 @@ def get_ffmpeg_args( +diff --git a/music_assistant/server/helpers/ffmpeg.py b/music_assistant/server/helpers/ffmpeg.py +index 0aaa9dcf..88cd9cdb 100644 +--- a/music_assistant/server/helpers/ffmpeg.py ++++ b/music_assistant/server/helpers/ffmpeg.py +@@ -200,7 +200,7 @@ def get_ffmpeg_args( # generic args generic_args = [ @@ -48,21 +52,21 @@ index 6b7b5c8e..ec3b92d7 100644 "-loglevel", loglevel, diff --git a/music_assistant/server/helpers/tags.py b/music_assistant/server/helpers/tags.py -index d17b55f6..b7b56c04 100644 +index c60ea526..162c4ab7 100644 --- a/music_assistant/server/helpers/tags.py +++ b/music_assistant/server/helpers/tags.py -@@ -380,7 +380,7 @@ async def parse_tags( - file_path = input_file if isinstance(input_file, str) else "-" - +@@ -401,7 +401,7 @@ async def parse_tags(input_file: str, file_size: int | None = None) -> AudioTags + Input_file may be a (local) filename or URL accessible by ffmpeg. + """ args = ( - "ffprobe", + "@ffprobe@", "-hide_banner", "-loglevel", "fatal", -@@ -471,7 +471,7 @@ async def get_embedded_image(input_file: str | AsyncGenerator[bytes, None]) -> b +@@ -462,7 +462,7 @@ async def get_embedded_image(input_file: str) -> bytes | None: + Input_file may be a (local) filename or URL accessible by ffmpeg. """ - file_path = input_file if isinstance(input_file, str) else "-" args = ( - "ffmpeg", + "@ffmpeg@", diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix index 6b06397a5dbeb..f01e7f4bba41b 100644 --- a/pkgs/by-name/mu/music-assistant/frontend.nix +++ b/pkgs/by-name/mu/music-assistant/frontend.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "music-assistant-frontend"; - version = "2.8.9"; + version = "2.8.13"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vXdBqMe5+GfB2D9G1YceUJ0ksqQAtUktpYrJgDZcBGU="; + hash = "sha256-bbNIYVFASAdeF1c+Nrcb92wMEBhrCMI8NdQvYhGvbLI="; }; postPatch = '' diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 531e0b00a2156..654fdfedafe94 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -24,14 +24,14 @@ in python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.2.2"; + version = "2.2.6"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; rev = "refs/tags/${version}"; - hash = "sha256-7PIyo3srKwftakDiaxvZjrzo/1I9LGUwG+QGfIU5pRA="; + hash = "sha256-BEbcIq+qtJ1OffT2we6qajzvDYDu09rMcmJF1F06xZQ="; }; patches = [ @@ -91,9 +91,15 @@ python.pkgs.buildPythonApplication rec { pytest-cov-stub pytestCheckHook syrupy + pytest-timeout ] ++ lib.flatten (lib.attrValues optional-dependencies); + pytestFlagsArray = [ + # blocks in setup + "--deselect=tests/server/providers/jellyfin/test_init.py::test_initial_sync" + ]; + pythonImportsCheck = [ "music_assistant" ]; passthru = { diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index 3fa13fe8b57c8..d085e4f1e89ec 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,13 +1,13 @@ # Do not edit manually, run ./update-providers.py { - version = "2.2.2"; + version = "2.2.6"; providers = { - airplay = [ + airplay = ps: [ ]; - apple_music = [ + apple_music = ps: [ ]; # missing pywidevine - builtin = [ + builtin = ps: [ ]; chromecast = ps: with ps; [ pychromecast @@ -18,23 +18,24 @@ dlna = ps: with ps; [ async-upnp-client ]; - fanarttv = [ + fanarttv = ps: [ ]; - filesystem_local = [ + filesystem_local = ps: [ ]; - filesystem_smb = [ + filesystem_smb = ps: [ ]; fully_kiosk = ps: with ps; [ python-fullykiosk ]; - hass = [ - ]; # missing hass-client - hass_players = [ + hass = ps: with ps; [ + hass-client + ]; + hass_players = ps: [ ]; jellyfin = ps: with ps; [ aiojellyfin ]; - musicbrainz = [ + musicbrainz = ps: [ ]; opensubsonic = ps: with ps; [ py-opensonic @@ -42,7 +43,7 @@ plex = ps: with ps; [ plexapi ]; - qobuz = [ + qobuz = ps: [ ]; radiobrowser = ps: with ps; [ radios @@ -59,23 +60,23 @@ soco sonos-websocket ]; - soundcloud = [ + soundcloud = ps: [ ]; # missing soundcloudpy spotify = ps: with ps; [ pkce ]; - template_player_provider = [ + template_player_provider = ps: [ ]; - test = [ + test = ps: [ ]; - theaudiodb = [ + theaudiodb = ps: [ ]; tidal = ps: with ps; [ tidalapi ]; - tunein = [ + tunein = ps: [ ]; - ugp = [ + ugp = ps: [ ]; ytmusic = ps: with ps; [ yt-dlp diff --git a/pkgs/by-name/mu/music-assistant/update-providers.py b/pkgs/by-name/mu/music-assistant/update-providers.py index ca5d0c52b40de..cb2683120b14d 100755 --- a/pkgs/by-name/mu/music-assistant/update-providers.py +++ b/pkgs/by-name/mu/music-assistant/update-providers.py @@ -24,7 +24,7 @@ version = "{{ version }}"; providers = { {%- for provider in providers | sort(attribute='domain') %} - {{ provider.domain }} = {% if provider.available %}ps: with ps; {% endif %}[ + {{ provider.domain }} = {% if provider.available %}ps: with ps;{% else %}ps:{% endif %} [ {%- for requirement in provider.available | sort %} {{ requirement }} {%- endfor %} diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix new file mode 100644 index 0000000000000..2f2a54d36fca7 --- /dev/null +++ b/pkgs/by-name/mu/music-player/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + alsa-lib, + darwin, + fetchFromGitHub, + pkg-config, + protobuf, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "music-player"; + version = "0.2.0-alpha.14-unstable-2024-08-24"; + + src = fetchFromGitHub { + owner = "tsirysndr"; + repo = "music-player"; + # No patch for 0.2.0, diff patch has a big size, temporarily until the next release + rev = "cf01ae4d2dcf5c804559250f2c7f922d870ae26d"; + hash = "sha256-8C8uFnXSBalLD2MUgzzfg4ylvTVecyPJOSUri5jbvkM="; + }; + + cargoHash = "sha256-JmyuA5p6/7jtNuOMWuAuspYYid+dGOeollIlS0DRCIE="; + + nativeBuildInputs = + [ + protobuf + rustPlatform.bindgenHook + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + ]; + + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.AudioUnit + ]; + + meta = with lib; { + description = "Extensible music player daemon written in Rust"; + homepage = "https://github.com/tsirysndr/music-player"; + changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; + license = licenses.mit; + maintainers = [ ]; + mainProgram = "music-player"; + }; +} diff --git a/pkgs/by-name/mu/musicpod/package.nix b/pkgs/by-name/mu/musicpod/package.nix new file mode 100644 index 0000000000000..d8d1b59746a1f --- /dev/null +++ b/pkgs/by-name/mu/musicpod/package.nix @@ -0,0 +1,55 @@ +{ + lib, + flutter324, + fetchFromGitHub, + mpv-unwrapped, + libass, + pulseaudio, +}: + +flutter324.buildFlutterApplication rec { + pname = "musicpod"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "ubuntu-flutter-community"; + repo = "musicpod"; + rev = "refs/tags/v${version}"; + hash = "sha256-gsreA8ZTLcSvIAtODZ2gopZ78iyoN18gsSi9/IoY5/0="; + }; + + postPatch = '' + substituteInPlace snap/gui/musicpod.desktop \ + --replace-fail 'Icon=''${SNAP}/meta/gui/musicpod.png' 'Icon=musicpod' + ''; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + gitHashes = { + audio_service_mpris = "sha256-QRZ4a3w4MZP8/A4yXzP4P9FPwEVNXlntmBwE8I+s2Kk="; + media_kit_native_event_loop = "sha256-JBtFTYlztDQvN/qQcDxkK27mka2fSG+iiIIxk2mqEpY="; + media_kit_video = "sha256-JBtFTYlztDQvN/qQcDxkK27mka2fSG+iiIIxk2mqEpY="; + phoenix_theme = "sha256-5kgPAnK61vFi/sJ1jr3c5D2UZbxItW8YOk/IJEtHkZo="; + }; + + buildInputs = [ + mpv-unwrapped + libass + ]; + + runtimeDependencies = [ pulseaudio ]; + + postInstall = '' + install -Dm644 snap/gui/musicpod.desktop -t $out/share/applications + install -Dm644 snap/gui/musicpod.png -t $out/share/pixmaps + ''; + + meta = { + description = "Music, radio, television and podcast player"; + homepage = "https://github.com/ubuntu-flutter-community/musicpod"; + license = lib.licenses.gpl3Only; + mainProgram = "musicpod"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/mu/musicpod/pubspec.lock.json b/pkgs/by-name/mu/musicpod/pubspec.lock.json new file mode 100644 index 0000000000000..d9864f8519b2e --- /dev/null +++ b/pkgs/by-name/mu/musicpod/pubspec.lock.json @@ -0,0 +1,2268 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "72.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.7.0" + }, + "animated_emoji": { + "dependency": "direct main", + "description": { + "name": "animated_emoji", + "sha256": "0af5508ce0ccb44caa6d3776d01900be6f6e70676881bfa8ce1a1bb9bf91a6a7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "animated_vector": { + "dependency": "transitive", + "description": { + "name": "animated_vector", + "sha256": "e15c6596549ca6e2e7491c11fbe168a1dead87475a828a4bc81cf104feca0432", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "animated_vector_annotations": { + "dependency": "transitive", + "description": { + "name": "animated_vector_annotations", + "sha256": "baa6b4ed98407220f2c9634f7da3cfa5eedb46798e090466f441e666e2f7c8c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "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": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "audio_metadata_reader": { + "dependency": "direct main", + "description": { + "name": "audio_metadata_reader", + "sha256": "40bd155e2ab0de725656235c51bb8441d2af49e793f0a643653801e05a693eb4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.6" + }, + "audio_service": { + "dependency": "direct main", + "description": { + "name": "audio_service", + "sha256": "9dd5ba7e77567b290c35908b1950d61485b4dfdd3a0ac398e98cfeec04651b75", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.18.15" + }, + "audio_service_mpris": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "ad6f743b73e320670449026fa1852d9978438bb9", + "resolved-ref": "ad6f743b73e320670449026fa1852d9978438bb9", + "url": "https://github.com/Feichtmeier/audio-service-mpris" + }, + "source": "git", + "version": "0.1.3" + }, + "audio_service_platform_interface": { + "dependency": "transitive", + "description": { + "name": "audio_service_platform_interface", + "sha256": "8431a455dac9916cc9ee6f7da5620a666436345c906ad2ebb7fa41d18b3c1bf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "audio_service_web": { + "dependency": "transitive", + "description": { + "name": "audio_service_web", + "sha256": "4cdc2127cd4562b957fb49227dc58e3303fafb09bde2573bc8241b938cf759d9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "audio_session": { + "dependency": "transitive", + "description": { + "name": "audio_session", + "sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.21" + }, + "basic_utils": { + "dependency": "direct main", + "description": { + "name": "basic_utils", + "sha256": "2064b21d3c41ed7654bc82cc476fd65542e04d60059b74d5eed490a4da08fc6c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.7.0" + }, + "blur": { + "dependency": "direct main", + "description": { + "name": "blur", + "sha256": "c17450404bceea429100e0838d19bbfaa6ad1f3053e7bac78a0264bbd60cfe01", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_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": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.12" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.2" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "cached_network_image": { + "dependency": "direct main", + "description": { + "name": "cached_network_image", + "sha256": "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.1" + }, + "cached_network_image_platform_interface": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_platform_interface", + "sha256": "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "cached_network_image_web": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_web", + "sha256": "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "charset": { + "dependency": "transitive", + "description": { + "name": "charset", + "sha256": "27802032a581e01ac565904ece8c8962564b1070690794f0072f6865958ce8b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "connectivity_plus": { + "dependency": "direct main", + "description": { + "name": "connectivity_plus", + "sha256": "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.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" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "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": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.17.3" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.7" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "desktop_notifications": { + "dependency": "direct main", + "description": { + "name": "desktop_notifications", + "sha256": "6d92694ad6e9297a862c5ff7dd6b8ff64c819972557754769f819d2209612927", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.3" + }, + "device_info_plus": { + "dependency": "transitive", + "description": { + "name": "device_info_plus", + "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.2" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.7.0" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.2" + }, + "file_selector": { + "dependency": "direct main", + "description": { + "name": "file_selector", + "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "file_selector_android": { + "dependency": "transitive", + "description": { + "name": "file_selector_android", + "sha256": "b8c9717a0177ca6fa035554b82cd6c83b838ddc66b7704eb6df0f77f027ecc90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1+7" + }, + "file_selector_ios": { + "dependency": "transitive", + "description": { + "name": "file_selector_ios", + "sha256": "38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.3" + }, + "file_selector_linux": { + "dependency": "direct main", + "description": { + "name": "file_selector_linux", + "sha256": "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.2+1" + }, + "file_selector_macos": { + "dependency": "transitive", + "description": { + "name": "file_selector_macos", + "sha256": "f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4" + }, + "file_selector_platform_interface": { + "dependency": "transitive", + "description": { + "name": "file_selector_platform_interface", + "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "file_selector_web": { + "dependency": "transitive", + "description": { + "name": "file_selector_web", + "sha256": "c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4+2" + }, + "file_selector_windows": { + "dependency": "transitive", + "description": { + "name": "file_selector_windows", + "sha256": "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+2" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_cache_manager": { + "dependency": "direct main", + "description": { + "name": "flutter_cache_manager", + "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.1" + }, + "flutter_html": { + "dependency": "direct main", + "description": { + "name": "flutter_html", + "sha256": "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0-beta.2" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_markdown": { + "dependency": "direct main", + "description": { + "name": "flutter_markdown", + "sha256": "a23c41ee57573e62fc2190a1f36a0480c4d90bde3a8a8d7126e5d5992fb53fb7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3+1" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.22" + }, + "flutter_rust_bridge": { + "dependency": "transitive", + "description": { + "name": "flutter_rust_bridge", + "sha256": "02720226035257ad0b571c1256f43df3e1556a499f6bcb004849a0faaa0e87f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.82.6" + }, + "flutter_staggered_grid_view": { + "dependency": "transitive", + "description": { + "name": "flutter_staggered_grid_view", + "sha256": "f0b6d8c0fa7b4b444985cdde68492c0138a4fb6fc57a641b24cb234b7ee0f5c4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "flutter_tabler_icons": { + "dependency": "direct main", + "description": { + "name": "flutter_tabler_icons", + "sha256": "8096ec5754fe9449723a093fdfce8f9c301999edaedb464c851466eaed3c6657", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.41.0" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "functional_listener": { + "dependency": "transitive", + "description": { + "name": "functional_listener", + "sha256": "ee8ffc29b2448981d96addf44ac9b4af2ba4ca2627979e77d3e6fe59b967ca4f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "get_it": { + "dependency": "transitive", + "description": { + "name": "get_it", + "sha256": "ff97e5e7b2e82e63c82f5658c6ba2605ea831f0f7489b0d2fb255d817ec4eb5e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.0" + }, + "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": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "gsettings": { + "dependency": "transitive", + "description": { + "name": "gsettings", + "sha256": "1b0ce661f5436d2db1e51f3c4295a49849f03d304003a7ba177d01e3a858249c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.8" + }, + "gtk": { + "dependency": "direct main", + "description": { + "name": "gtk", + "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "handy_window": { + "dependency": "direct main", + "description": { + "name": "handy_window", + "sha256": "56b813e58a68b0ee2ab22051400b8b1f1b5cfe88b8cd32288623defb3926245a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "irondash_engine_context": { + "dependency": "transitive", + "description": { + "name": "irondash_engine_context", + "sha256": "cd7b769db11a2b5243b037c8a9b1ecaef02e1ae27a2d909ffa78c1dad747bb10", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.4" + }, + "irondash_message_channel": { + "dependency": "transitive", + "description": { + "name": "irondash_message_channel", + "sha256": "b4101669776509c76133b8917ab8cfc704d3ad92a8c450b92934dd8884a2f060", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "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" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.5" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "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": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "list_counter": { + "dependency": "transitive", + "description": { + "name": "list_counter", + "sha256": "c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "lottie": { + "dependency": "transitive", + "description": { + "name": "lottie", + "sha256": "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "m3u_parser_nullsafe": { + "dependency": "direct main", + "description": { + "name": "m3u_parser_nullsafe", + "sha256": "7f65c30d1a2cd75e4114a43c2c96ab7f8490ee53f530bf86b1725605e1677fcf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" + }, + "markdown": { + "dependency": "transitive", + "description": { + "name": "markdown", + "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.2.2" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "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": "transitive", + "description": { + "name": "media_kit_libs_android_video", + "sha256": "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.6" + }, + "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": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "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": "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "media_kit_libs_windows_video": { + "dependency": "transitive", + "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 overridden", + "description": { + "path": "media_kit_native_event_loop", + "ref": "13f6b3f0ef9ccf8a711e396bc49cb05af9b3e497", + "resolved-ref": "13f6b3f0ef9ccf8a711e396bc49cb05af9b3e497", + "url": "https://github.com/media-kit/media-kit" + }, + "source": "git", + "version": "1.0.8" + }, + "media_kit_video": { + "dependency": "direct main", + "description": { + "path": "media_kit_video", + "ref": "13f6b3f0ef9ccf8a711e396bc49cb05af9b3e497", + "resolved-ref": "13f6b3f0ef9ccf8a711e396bc49cb05af9b3e497", + "url": "https://github.com/media-kit/media-kit" + }, + "source": "git", + "version": "1.2.4" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "direct main", + "description": { + "name": "mime", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "mime_type": { + "dependency": "direct main", + "description": { + "name": "mime_type", + "sha256": "d652b613e84dac1af28030a9fba82c0999be05b98163f9e18a0849c6e63838bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "mockito": { + "dependency": "direct main", + "description": { + "name": "mockito", + "sha256": "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.4.4" + }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "octo_image": { + "dependency": "transitive", + "description": { + "name": "octo_image", + "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.2" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "palette_generator": { + "dependency": "direct main", + "description": { + "name": "palette_generator", + "sha256": "d50fbcd69abb80c5baec66d700033b1a320108b1aa17a5961866a12c0abb7c0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.3+4" + }, + "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": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.10" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.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" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "phoenix_theme": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "fe7b369cdf03a15c735c866584a251da68f3a716", + "resolved-ref": "fe7b369cdf03a15c735c866584a251da68f3a716", + "url": "https://github.com/ubuntu-flutter-community/phoenix_theme" + }, + "source": "git", + "version": "1.0.1" + }, + "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": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "platform_linux": { + "dependency": "transitive", + "description": { + "name": "platform_linux", + "sha256": "856cfc9871e3ff3df6926991729d24bba9b70d0229ae377fa08b562344baaaa8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "pls": { + "dependency": "direct main", + "description": { + "name": "pls", + "sha256": "268fc553655be2ea494789b444aa847dcb21ab5da5a174f5363c95874c0df8fa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "podcast_search": { + "dependency": "direct main", + "description": { + "name": "podcast_search", + "sha256": "c2ca2529a7f561827cc62db6c4fba6cade0249936455912a902688125c90bd5c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "pointycastle": { + "dependency": "transitive", + "description": { + "name": "pointycastle", + "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.9.1" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "puppeteer": { + "dependency": "transitive", + "description": { + "name": "puppeteer", + "sha256": "fc33b2a12731e0b9e16c40cd91ea2b6886bcc24037a435fceb59b786d4074f2b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.15.0" + }, + "radio_browser_api": { + "dependency": "direct main", + "description": { + "name": "radio_browser_api", + "sha256": "73da0aa774ebfb28315d7c4590f4b231105772860fe1a4ba5c20ee05cf0e8d63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0+1" + }, + "reorderableitemsview": { + "dependency": "direct main", + "description": { + "name": "reorderableitemsview", + "sha256": "13f1a0394e158fea6f440557b2025bba7c61364885eaa9d71e1c4ba818c8d79c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "rss_dart": { + "dependency": "transitive", + "description": { + "name": "rss_dart", + "sha256": "81bbcc1a5205546f2a85ebadf8f29f5b090ccb5781f400f3713cf02f1cc992ee", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.10" + }, + "rxdart": { + "dependency": "transitive", + "description": { + "name": "rxdart", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.28.0" + }, + "safe_change_notifier": { + "dependency": "direct main", + "description": { + "name": "safe_change_notifier", + "sha256": "e7cce266bfede647355866fa3bd054feda57c220d2383f4203f28d4dcdb3b82e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, + "safe_local_storage": { + "dependency": "transitive", + "description": { + "name": "safe_local_storage", + "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "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": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.9" + }, + "scroll_to_index": { + "dependency": "direct main", + "description": { + "name": "scroll_to_index", + "sha256": "b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.2" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "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": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "shimmer": { + "dependency": "direct main", + "description": { + "name": "shimmer", + "sha256": "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "smtc_windows": { + "dependency": "direct main", + "description": { + "name": "smtc_windows", + "sha256": "0fd64d0c6a0c8ea4ea7908d31195eadc8f6d45d5245159fc67259e9e8704100f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "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" + }, + "sqflite": { + "dependency": "transitive", + "description": { + "name": "sqflite", + "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3+1" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "4058172e418eb7e7f2058dcb7657d451a8fc264afa0dea4dbd0f304a57131611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4+3" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "state_notifier": { + "dependency": "transitive", + "description": { + "name": "state_notifier", + "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "super_clipboard": { + "dependency": "transitive", + "description": { + "name": "super_clipboard", + "sha256": "cfeb142360fac67e0da1ca339accb892eb790c6528a218a008eef1709d96ed0f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.22" + }, + "super_drag_and_drop": { + "dependency": "direct main", + "description": { + "name": "super_drag_and_drop", + "sha256": "25158161d1b114ffba0d358c3508f5a4b88a18becacffcd785c17574670204d6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.22" + }, + "super_native_extensions": { + "dependency": "transitive", + "description": { + "name": "super_native_extensions", + "sha256": "6a7cfb7d212da7023b86fb99c736081e9c2cd982265d15dc5fe6381a32dbc875", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.22" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "51b08572b9f091f8c3eb4d9d4be253f196ff0075d5ec9b10a884026d5b55d7bc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0+2" + }, + "system_theme": { + "dependency": "direct main", + "description": { + "name": "system_theme", + "sha256": "9396b69e74cdd1524daf26c0c33f4968d5ada1ff948a31f031cf6398869b589f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "system_theme_web": { + "dependency": "transitive", + "description": { + "name": "system_theme_web", + "sha256": "900c92c5c050ce58048f241ef9a17e5cd8629808325a05b473dc62a6e99bae77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "tuple": { + "dependency": "transitive", + "description": { + "name": "tuple", + "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.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": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.10" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "uuid": { + "dependency": "direct overridden", + "description": { + "name": "uuid", + "sha256": "f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.0" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "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": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.8" + }, + "wakelock_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus_platform_interface", + "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "watch_it": { + "dependency": "direct main", + "description": { + "name": "watch_it", + "sha256": "a45ea7d5e841e96f904896f4783cc1820257c591f130d1513e89eaceaa528a28", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "win32": { + "dependency": "direct main", + "description": { + "name": "win32", + "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.4" + }, + "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": "ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "xdg_directories": { + "dependency": "direct main", + "description": { + "name": "xdg_directories", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "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": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaru": { + "dependency": "direct main", + "description": { + "name": "yaru", + "sha256": "9e07131b9c3b9997d7784c3cb6ad24a218f8e0507d82f8fb07b7e160e111236d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.2.1" + }, + "yaru_window": { + "dependency": "direct main", + "description": { + "name": "yaru_window", + "sha256": "bc2a1df3c6f33477b47f84bf0a9325df411dbb7bd483ac88e5bc1c019d2f2560", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1+1" + }, + "yaru_window_linux": { + "dependency": "direct main", + "description": { + "name": "yaru_window_linux", + "sha256": "46a1a0743dfd45794cdaf8c5b3a48771ab73632b50a693f59c83b07988e96689", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "yaru_window_manager": { + "dependency": "transitive", + "description": { + "name": "yaru_window_manager", + "sha256": "b36c909fa082a7cb6e2f259d4357e16f08d3d8ab086685b81d1916e457100d1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2+1" + }, + "yaru_window_platform_interface": { + "dependency": "transitive", + "description": { + "name": "yaru_window_platform_interface", + "sha256": "93493d7e17a9e887ffa94c518bc5a4b3eb5425c009446e3294c689cb1a87b7e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2+1" + }, + "yaru_window_web": { + "dependency": "transitive", + "description": { + "name": "yaru_window_web", + "sha256": "31468aeb515f72d5eeddcd62773094a4f48fee96f7f0494f8ce53ad3b38054f1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3+1" + } + }, + "sdks": { + "dart": ">=3.5.0 <4.0.0", + "flutter": ">=3.24.3" + } +} diff --git a/pkgs/by-name/mu/musikcube/package.nix b/pkgs/by-name/mu/musikcube/package.nix index 8eb5536f39ba2..8c59e98339857 100644 --- a/pkgs/by-name/mu/musikcube/package.nix +++ b/pkgs/by-name/mu/musikcube/package.nix @@ -72,11 +72,11 @@ stdenv.mkDerivation (finalAttrs: { taglib ] ++ lib.optionals systemdSupport [ systemd ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib pulseaudio ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Cocoa @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DDISABLE_STRIP=true" ]; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath $out/share/musikcube $out/share/musikcube/musikcube install_name_tool -add_rpath $out/share/musikcube $out/share/musikcube/musikcubed ''; diff --git a/pkgs/by-name/mu/mutter/43/default.nix b/pkgs/by-name/mu/mutter/43/default.nix new file mode 100644 index 0000000000000..bea00d83f794e --- /dev/null +++ b/pkgs/by-name/mu/mutter/43/default.nix @@ -0,0 +1,201 @@ +{ + fetchurl, + runCommand, + lib, + fetchpatch, + stdenv, + pkg-config, + gettext, + gobject-introspection, + cairo, + colord, + lcms2, + pango, + json-glib, + libstartup_notification, + libcanberra, + ninja, + xvfb-run, + xkeyboard_config, + libxcvt, + libxkbfile, + libXdamage, + libxkbcommon, + libXtst, + libinput, + libdrm, + gsettings-desktop-schemas, + glib, + gtk3, + gnome-desktop, + pipewire, + libgudev, + libwacom, + xwayland, + mesa, + meson, + gnome-settings-daemon, + xorgserver, + python3, + wayland-scanner, + wrapGAppsHook3, + gi-docgen, + sysprof, + libsysprof-capture, + desktop-file-utils, + libcap_ng, + egl-wayland, + graphene, + wayland, + wayland-protocols, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mutter"; + version = "43.8"; + + outputs = [ + "out" + "dev" + "man" + "devdoc" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; + hash = "sha256-TjTh8XWTS9hJqEvZX6Nb8G6EEuAt8loDbC8RNdUz8oE="; + }; + + patches = [ + # Fix build with separate sysprof. + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; + hash = "sha256-/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; + }) + + # Remove support for window shading. + # The corresponding key was removed in gsettings-desktop-schemas 45.alpha. + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2884 + # + # Fetch the patch from magpie as they share same code base and this feature + # is never supported on wayland (note that magpie 0.9.x won't support wayland). + # https://github.com/BuddiesOfBudgie/magpie/issues/9 + (fetchpatch { + url = "https://github.com/BuddiesOfBudgie/magpie/commit/4177c466375462ca8ed8fdb60913df4422f19144.patch"; + hash = "sha256-NVx40WDnlUL050D529KVohvNBdVrheXxmJ73U3+KSeQ="; + }) + ]; + + mesonFlags = [ + "-Degl_device=true" + "-Dinstalled_tests=false" # TODO: enable these + "-Dwayland_eglstream=true" + "-Dprofiler=true" + "-Dxwayland_path=${lib.getExe xwayland}" + # This should be auto detected, but it looks like it manages a false + # positive. + "-Dxwayland_initfd=disabled" + "-Ddocs=true" + ]; + + propagatedBuildInputs = [ + # required for pkg-config to detect mutter-clutter + json-glib + libXtst + libcap_ng + graphene + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + libxcvt + mesa # needed for gbm + meson + ninja + xvfb-run + pkg-config + python3 + wayland-scanner + wrapGAppsHook3 + gi-docgen + xorgserver + gobject-introspection + ]; + + buildInputs = [ + cairo + egl-wayland + glib + gnome-desktop + gnome-settings-daemon + gsettings-desktop-schemas + gtk3 + libcanberra + libdrm + libgudev + libinput + libstartup_notification + libwacom + libxkbcommon + libxkbfile + libXdamage + colord + lcms2 + pango + pipewire + sysprof # for D-Bus interfaces + libsysprof-capture + xkeyboard_config + xwayland + wayland + wayland-protocols + ]; + + postPatch = '' + patchShebangs src/backends/native/gen-default-modes.py + + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3187 + substituteInPlace meson.build \ + --replace "dependency('sysprof-4')" "dependency('sysprof-6')" + ''; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + # TODO: Move this into a directory devhelp can find. + moveToOutput "share/mutter-11/doc" "$devdoc" + ''; + + # Install udev files into our own tree. + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + + separateDebugInfo = true; + + passthru = { + libdir = "${finalAttrs.finalPackage}/lib/mutter-11"; + + tests = { + libdirExists = runCommand "mutter-libdir-exists" { } '' + if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then + echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one." + exit 1 + fi + touch $out + ''; + }; + }; + + meta = with lib; { + description = "Window manager for GNOME"; + mainProgram = "mutter"; + homepage = "https://gitlab.gnome.org/GNOME/mutter"; + license = licenses.gpl2Plus; + maintainers = teams.pantheon.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix new file mode 100644 index 0000000000000..720c785260709 --- /dev/null +++ b/pkgs/by-name/mu/mutter/package.nix @@ -0,0 +1,215 @@ +{ + fetchurl, + runCommand, + lib, + stdenv, + pkg-config, + gnome, + gettext, + gobject-introspection, + cairo, + colord, + lcms2, + pango, + libstartup_notification, + libcanberra, + ninja, + xvfb-run, + libxcvt, + libICE, + libX11, + libXcomposite, + libXcursor, + libXdamage, + libXext, + libXfixes, + libXi, + libXtst, + libxkbfile, + xkeyboard_config, + libxkbcommon, + libXrender, + libxcb, + libXrandr, + libXinerama, + libXau, + libinput, + libdrm, + libei, + libdisplay-info, + gsettings-desktop-schemas, + glib, + atk, + gtk4, + fribidi, + harfbuzz, + gnome-desktop, + pipewire, + libgudev, + libwacom, + libSM, + xwayland, + mesa, + meson, + gnome-settings-daemon, + xorgserver, + python3, + wayland-scanner, + wrapGAppsHook4, + gi-docgen, + sysprof, + libsysprof-capture, + desktop-file-utils, + egl-wayland, + graphene, + wayland, + wayland-protocols, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mutter"; + version = "46.4"; + + outputs = [ + "out" + "dev" + "man" + "devdoc" + ]; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; + hash = "sha256-YRvZz5gq21ZZfOKzQiQnL9phm7O7kSpoTXXG8sN1AuQ="; + }; + + mesonFlags = [ + "-Degl_device=true" + "-Dinstalled_tests=false" # TODO: enable these + "-Dtests=false" + "-Dwayland_eglstream=true" + "-Dprofiler=true" + "-Dxwayland_path=${lib.getExe xwayland}" + # This should be auto detected, but it looks like it manages a false + # positive. + "-Dxwayland_initfd=disabled" + "-Ddocs=true" + ]; + + propagatedBuildInputs = [ + # required for pkg-config to detect mutter-mtk + graphene + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + libxcvt + mesa # needed for gbm + meson + ninja + xvfb-run + pkg-config + python3 + wayland-scanner + wrapGAppsHook4 + gi-docgen + xorgserver + gobject-introspection + ]; + + buildInputs = [ + cairo + egl-wayland + glib + gnome-desktop + gnome-settings-daemon + gsettings-desktop-schemas + atk + fribidi + harfbuzz + libcanberra + libdrm + libei + libdisplay-info + libgudev + libinput + libstartup_notification + libwacom + libSM + colord + lcms2 + pango + pipewire + sysprof # for D-Bus interfaces + libsysprof-capture + xwayland + wayland + wayland-protocols + # X11 client + gtk4 + libICE + libX11 + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXtst + libxkbfile + xkeyboard_config + libxkbcommon + libXrender + libxcb + libXrandr + libXinerama + libXau + ]; + + postPatch = '' + patchShebangs src/backends/native/gen-default-modes.py + ''; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + # TODO: Move this into a directory devhelp can find. + moveToOutput "share/mutter-14/doc" "$devdoc" + ''; + + # Install udev files into our own tree. + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + + separateDebugInfo = true; + + passthru = { + libdir = "${finalAttrs.finalPackage}/lib/mutter-14"; + + tests = { + libdirExists = runCommand "mutter-libdir-exists" { } '' + if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then + echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one." + exit 1 + fi + touch $out + ''; + }; + + updateScript = gnome.updateScript { + packageName = "mutter"; + }; + }; + + meta = with lib; { + description = "Window manager for GNOME"; + mainProgram = "mutter"; + homepage = "https://gitlab.gnome.org/GNOME/mutter"; + changelog = "https://gitlab.gnome.org/GNOME/mutter/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/my/mybbscan/package.nix b/pkgs/by-name/my/mybbscan/package.nix old mode 100755 new mode 100644 diff --git a/pkgs/by-name/my/mycelium/Cargo.lock b/pkgs/by-name/my/mycelium/Cargo.lock index 6aac9ba0f592e..fda202d245c17 100644 --- a/pkgs/by-name/my/mycelium/Cargo.lock +++ b/pkgs/by-name/my/mycelium/Cargo.lock @@ -170,9 +170,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "8f43644eed690f5374f1af436ecd6aea01cd201f6fbdf0178adaf6907afb2cec" dependencies = [ "async-trait", "axum-core", @@ -196,16 +196,16 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower", + "tower 0.5.1", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "5e6b8ba012a258d63c9adfa28b9ddcf66149da6f986c5b5452e629d5ee64bf00" dependencies = [ "async-trait", "bytes", @@ -216,7 +216,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", ] @@ -425,9 +425,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -435,9 +435,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -447,9 +447,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", @@ -727,19 +727,20 @@ dependencies = [ [[package]] name = "etherparse" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21696e6dfe1057a166a042c6d27b89a46aad2ee1003e6e1e03c49d54fd3270d7" +checksum = "b8d8a704b617484e9d867a0423cd45f7577f008c4068e2e33378f8d3860a6d73" dependencies = [ "arrayvec", ] [[package]] name = "faster-hex" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" +checksum = "7223ae2d2f179b803433d9c830478527e92b8117eab39460edae7f1614d9fb73" dependencies = [ + "heapless", "serde", ] @@ -928,6 +929,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "hash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -949,6 +959,16 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +[[package]] +name = "heapless" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +dependencies = [ + "hash32", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.5.0" @@ -1049,7 +1069,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] @@ -1097,9 +1117,9 @@ checksum = "8e537132deb99c0eb4b752f0346b6a836200eaaa3516dd7e5514b63930a09e5d" [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -1242,12 +1262,6 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" -[[package]] -name = "memalloc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" - [[package]] name = "memchr" version = "2.7.2" @@ -1298,7 +1312,7 @@ dependencies = [ [[package]] name = "mycelium" -version = "0.5.4" +version = "0.5.5" dependencies = [ "aes-gcm", "arc-swap", @@ -1333,7 +1347,7 @@ dependencies = [ [[package]] name = "mycelium-api" -version = "0.5.4" +version = "0.5.5" dependencies = [ "axum", "base64 0.22.1", @@ -1346,7 +1360,7 @@ dependencies = [ [[package]] name = "mycelium-cli" -version = "0.5.4" +version = "0.5.5" dependencies = [ "base64 0.22.1", "byte-unit", @@ -1363,7 +1377,7 @@ dependencies = [ [[package]] name = "mycelium-metrics" -version = "0.5.4" +version = "0.5.5" dependencies = [ "axum", "mycelium", @@ -1374,7 +1388,7 @@ dependencies = [ [[package]] name = "myceliumd" -version = "0.5.4" +version = "0.5.5" dependencies = [ "base64 0.22.1", "byte-unit", @@ -1398,13 +1412,13 @@ dependencies = [ [[package]] name = "netdev" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7516ad2c46cc25da098ed7d6b9a0cbe9e1fbffbd04b1596148b95f2841179c83" +checksum = "f901362e84cd407be6f8cd9d3a46bccf09136b095792785401ea7d283c79b91d" dependencies = [ "dlopen2", + "ipnet", "libc", - "memalloc", "netlink-packet-core", "netlink-packet-route 0.17.1", "netlink-sys", @@ -1871,15 +1885,15 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.0.0", + "rustc-hash", "rustls", "socket2", "thiserror", @@ -1889,14 +1903,14 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.2" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand", "ring", - "rustc-hash 1.2.0", + "rustc-hash", "rustls", "slab", "thiserror", @@ -2189,12 +2203,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3450ed37fe9609abb6bc3b8891b6e078404e4c53c7332350e2e15126a95229bf" - [[package]] name = "rustc-hash" version = "2.0.0" @@ -2225,9 +2233,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "once_cell", "ring", @@ -2245,9 +2253,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -2292,18 +2300,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -2312,9 +2320,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -2425,6 +2433,12 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "strsim" version = "0.11.1" @@ -2611,9 +2625,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -2639,9 +2653,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -2651,9 +2665,9 @@ dependencies = [ [[package]] name = "tokio-tun" -version = "0.11.5" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5381752d5832fc811f89d54fc334951aa435022f494190ba7151661f206df" +checksum = "fde69666e881ea060a36a0f39442beb843e2204beeeb2062fdfaa183add47013" dependencies = [ "libc", "nix 0.29.0", @@ -2663,9 +2677,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -2734,17 +2748,32 @@ dependencies = [ "tower-service", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix index 266448a438eb9..10118b45c3906 100644 --- a/pkgs/by-name/my/mycelium/package.nix +++ b/pkgs/by-name/my/mycelium/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "mycelium"; - version = "0.5.4"; + version = "0.5.5"; sourceRoot = "${src.name}/myceliumd"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { owner = "threefoldtech"; repo = "mycelium"; rev = "v${version}"; - hash = "sha256-sWpy6Q7Lh0AOzWKMsb/NQ6oFcxOKXB/To9+PFmcjSks="; + hash = "sha256-IfWS7U52pviRL8oySOjBYCogwqUqoMLmvtHFSjWghHg="; }; cargoLock = { @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ versionCheckHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 1d47d5da808e0..a024ddd8f9c2a 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "myks"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; rev = "refs/tags/v${version}"; - hash = "sha256-jI5u/xaAt7BOug/okrrRoZXZVJOr+ahGtFJE3PbPQ7k="; + hash = "sha256-sf+X+qafR0kpJTNIYoLr8q6stm+DgiD/yhVRyBRPA/s="; }; - vendorHash = "sha256-Ka+zVKQBAd6ChOYOw4FYzqJCfdzpN2OppDJsoT/5I0c="; + vendorHash = "sha256-aWXU2UG4/U8g4dgspjyIfTT2J++WoJlLHAo6K3CSLxc="; subPackages = "."; diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix index b245404420d79..1c4d655efd4b9 100644 --- a/pkgs/by-name/my/mysql84/package.nix +++ b/pkgs/by-name/my/mysql84/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ bison cmake pkg-config ] - ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; patches = [ ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf_21 re2 readline zlib zstd libfido2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl libtirpc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.apple_sdk.frameworks.CoreServices darwin.developer_cmds darwin.DarwinTools ]; diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index ab790be5204bc..f0a16544096ce 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "mystmd"; - version = "1.3.4"; + version = "1.3.8"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-aZUDIQs4n2s842tq23pU/ZUW+1fF4XXEmgnapdZH8wQ="; + hash = "sha256-SGjukKIthrCHD5u+QoD37xfw6XmaOCVquveuawBltMI="; }; - npmDepsHash = "sha256-IXdmzuQaBEbwjXssYaDLvxyTl+i2U/JTalg8lSGvuR0="; + npmDepsHash = "sha256-97DOfFADaCZ0hlprRvJvMqhhmpjc4lU0Sw45NTc8IlE="; dontNpmInstall = true; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 11f59068bd558..48081b49f2f63 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -18,18 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.55.3"; + version = "1.61.0"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; rev = "n8n@${finalAttrs.version}"; - hash = "sha256-SgDw0je16Qf0ohzrVUjJM6FFovWxM2mvZjvfKkEESos="; + hash = "sha256-9hIwpid/uly7wUcrBgLkSw+Aah8OQ66MgrMQbs/5v1Y="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-KvSsWf1EHCQ46M4Z4wqyYb4mW9y9kNwB9e090YC1ZWs="; + hash = "sha256-OUZpPXXGWW7ceWxpHqjQolCr+OVeVO4DgRwsU8VvgWo="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { node-gyp # required to build sqlite3 bindings cacert # required for rustls-native-certs (dependency of turbo build tool) makeWrapper - ] ++ lib.optional stdenv.isDarwin [ xcbuild ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = [ nodejs @@ -100,7 +100,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ freezeboy gepbird - k900 ]; license = licenses.sustainableUse; mainProgram = "n8n"; diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index ba20cacf8d0c6..a342c091f7086 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true) (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_ZSTD" true) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeFeature "CMAKE_OSX_DEPLOYMENT_TARGET" "10.14") # For aligned allocation ]; diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index fd6807d7b025b..58c4872b2c6a0 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.389"; + version = "0.0.392"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-UtHUqintxcNSHDfrK2vWQxsHBXQ63vZZ5bm/RSA6DSc="; + hash = "sha256-o0/kAat8vEhVE9ut179yBpvLuMFw6bNha2qT1ddvs7E="; }; - vendorHash = "sha256-MQAEvJcu8cXPZbk7HTb7eD1yECvMcQXytvNQwG+4ky0="; + vendorHash = "sha256-XO/Fj66w17zLJIQHv6F6czReqtqyCORAgCRtjwRaTbo="; subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/by-name/na/nanoflann/package.nix similarity index 100% rename from pkgs/development/libraries/nanoflann/default.nix rename to pkgs/by-name/na/nanoflann/package.nix diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix index 728445a1da2ea..93161f889efd8 100644 --- a/pkgs/by-name/na/naps2/package.nix +++ b/pkgs/by-name/na/naps2/package.nix @@ -55,7 +55,7 @@ buildDotnetModule rec { maintainers = with lib.maintainers; [ eliandoran ]; platforms = lib.platforms.linux; mainProgram = "naps2"; - broken = stdenv.isAarch64; # Google.Protobuf.Tools dependency fails to build. + broken = stdenv.hostPlatform.isAarch64; # Google.Protobuf.Tools dependency fails to build. }; } diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix index d7cff844020ed..ff46f58ad2a77 100644 --- a/pkgs/by-name/na/narsil/package.nix +++ b/pkgs/by-name/na/narsil/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { pname = "narsil"; - version = "1.3.0-85-g68f1491ca"; + version = "1.3.0-234-g228c4f0cb"; src = fetchFromGitHub { owner = "NickMcConnell"; repo = "NarSil"; rev = version; - hash = "sha256-uiueTkfucYcK6BQ0WpXp8Sye7E0D1uxd/InowWznBjY="; + hash = "sha256-82ph8LTtaruaV97gdnqSQI8IfqO9wzYbR7WTGx086pQ="; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix index 971471041b69c..89cfd60e3ebfb 100644 --- a/pkgs/by-name/na/navidrome/package.nix +++ b/pkgs/by-name/na/navidrome/package.nix @@ -1,4 +1,4 @@ -{ buildGoModule +{ buildGo123Module , buildPackages , fetchFromGitHub , fetchNpmDeps @@ -15,25 +15,25 @@ , ffmpegSupport ? true }: -buildGoModule rec { +buildGo123Module rec { pname = "navidrome"; - version = "0.52.5"; + version = "0.53.3"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${version}"; - hash = "sha256-M1BxR4Mmkfbr9Wb2YwWEeVGgKOCtD/8pgFZiv8mTi7s="; + hash = "sha256-RLmGjkeBHuvVdxXaGvlIFPI+6beAdtSLukVmwe6Hnag="; }; - vendorHash = "sha256-puldHJs5GiaXvyvwuzAX00nMLUxoBESpxLOEtBYD7o4="; + vendorHash = "sha256-XjiRMRfsmcw/4RLZXN36BbzbCKu98BgD3cn89e/vra4="; npmRoot = "ui"; npmDeps = fetchNpmDeps { inherit src; sourceRoot = "${src.name}/ui"; - hash = "sha256-OZvEPC+MobCJn16d3MsMtrStbsmRD9Ef0/leVSXtVZ8="; + hash = "sha256-0vHInRly5xirjfV7tcYVNVLaMk4YtJeB7Ky0mrDDDnY="; }; nativeBuildInputs = [ @@ -82,6 +82,6 @@ buildGoModule rec { sourceProvenance = with lib.sourceTypes; [ fromSource ]; maintainers = with lib.maintainers; [ aciceri squalus ]; # Broken on Darwin: sandbox-exec: pattern serialization length exceeds maximum (NixOS/nix#4119) - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/na/nawk/package.nix b/pkgs/by-name/na/nawk/package.nix index cb8766c8c6b0c..d2132c25f2772 100644 --- a/pkgs/by-name/na/nawk/package.nix +++ b/pkgs/by-name/na/nawk/package.nix @@ -34,7 +34,8 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm755 a.out "$out/bin/nawk" + mv a.out nawk + installBin nawk mv awk.1 nawk.1 installManPage nawk.1 runHook postInstall diff --git a/pkgs/by-name/nb/nb-cli/package.nix b/pkgs/by-name/nb/nb-cli/package.nix index 5362c16e3ae2a..12d6456359c37 100644 --- a/pkgs/by-name/nb/nb-cli/package.nix +++ b/pkgs/by-name/nb/nb-cli/package.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nb-cli"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchPypi { pname = "nb_cli"; inherit version; - hash = "sha256-kI3Uy79mv0b+h5wjrRN3My9jOFzryhkStieqaG0YFvM="; + hash = "sha256-HZey1RVpx/fHNxdEue1LczYbwYUxEb3i3fHpkKHhn+8="; }; build-system = [ diff --git a/pkgs/by-name/nb/nbqa/package.nix b/pkgs/by-name/nb/nbqa/package.nix index f4b1a8fdf527e..07fdcdde271a7 100644 --- a/pkgs/by-name/nb/nbqa/package.nix +++ b/pkgs/by-name/nb/nbqa/package.nix @@ -4,112 +4,114 @@ fetchFromGitHub, # optional-dependencies - black, - blacken-docs, ruff, - # passthru - testers, - nbqa, + # tests + versionCheckHook, }: -python3.pkgs.buildPythonApplication rec { - pname = "nbqa"; - version = "1.9.0"; - pyproject = true; - src = fetchFromGitHub { - owner = "nbQA-dev"; - repo = "nbQA"; - rev = "refs/tags/${version}"; - hash = "sha256-9s+q2unh+jezU0Er7ZH0tvgntmPFts9OmsgAMeQXRrY="; - }; +let + nbqa = python3.pkgs.buildPythonApplication rec { + pname = "nbqa"; + version = "1.9.0"; + pyproject = true; - build-system = with python3.pkgs; [ - setuptools - ]; + src = fetchFromGitHub { + owner = "nbQA-dev"; + repo = "nbQA"; + rev = "refs/tags/${version}"; + hash = "sha256-9s+q2unh+jezU0Er7ZH0tvgntmPFts9OmsgAMeQXRrY="; + }; - passthru.optional-dependencies = { - black = [ black ]; - blacken-docs = [ blacken-docs ]; - flake8 = [ python3.pkgs.flake8 ]; - isort = [ python3.pkgs.isort ]; - jupytext = [ python3.pkgs.jupytext ]; - mypy = [ python3.pkgs.mypy ]; - pylint = [ python3.pkgs.pylint ]; - pyupgrade = [ python3.pkgs.pyupgrade ]; - ruff = [ ruff ]; - }; + build-system = with python3.pkgs; [ + setuptools + ]; - dependencies = - with python3.pkgs; - [ + optional-dependencies.toolchain = + (with python3.pkgs; [ + black + blacken-docs + flake8 + isort + jupytext + mypy + pylint + pyupgrade + ]) + ++ [ + ruff + ]; + + dependencies = with python3.pkgs; [ autopep8 ipython tokenize-rt tomli - ] - ++ builtins.attrValues passthru.optional-dependencies; + ]; - postPatch = '' - # Force using the Ruff executable rather than the Python package - substituteInPlace nbqa/__main__.py --replace 'if shell:' 'if shell or main_command == "ruff":' - ''; + postPatch = '' + # Force using the Ruff executable rather than the Python package + substituteInPlace nbqa/__main__.py --replace 'if shell:' 'if shell or main_command == "ruff":' + ''; - preCheck = '' - # Allow the tests to run `nbqa` itself from the path - export PATH="$out/bin":"$PATH" - ''; + preCheck = '' + # Allow the tests to run `nbqa` itself from the path + export PATH="$out/bin":"$PATH" + ''; - nativeCheckInputs = - [ - black - ruff - ] - ++ (with python3.pkgs; [ - autoflake - distutils - flake8 - isort - jupytext - mdformat - pre-commit-hooks - pydocstyle - pylint - pytestCheckHook - pyupgrade - yapf - ]); + nativeCheckInputs = + (with python3.pkgs; [ + autoflake + distutils + mdformat + pre-commit-hooks + pydocstyle + pytestCheckHook + yapf + ]) + ++ lib.flatten (lib.attrValues optional-dependencies) + ++ [ versionCheckHook ]; - disabledTests = [ - # Test data not found - "test_black_multiple_files" - "test_black_return_code" - "test_grep" - "test_jupytext_on_folder" - "test_mypy_works" - "test_running_in_different_dir_works" - "test_unable_to_reconstruct_message_pythonpath" - "test_with_subcommand" - "test_pylint_works" - ]; + disabledTests = [ + # Test data not found + "test_black_multiple_files" + "test_black_return_code" + "test_grep" + "test_jupytext_on_folder" + "test_mypy_works" + "test_running_in_different_dir_works" + "test_unable_to_reconstruct_message_pythonpath" + "test_with_subcommand" + "test_pylint_works" + ]; - disabledTestPaths = [ - # Test data not found - "tests/test_include_exclude.py" - ]; + disabledTestPaths = [ + # Test data not found + "tests/test_include_exclude.py" + ]; - passthru = { - tests.version = testers.testVersion { - package = nbqa; + passthru = { + # selector is a function mapping pythonPackages to a list of code quality + # tools, e.g. nbqa.withTools (ps: [ ps.black ]) + withTools = + selector: + nbqa.overridePythonAttrs ( + { dependencies, ... }: + { + dependencies = dependencies ++ selector python3.pkgs; + doCheck = false; + } + ); }; - }; - meta = { - homepage = "https://github.com/nbQA-dev/nbQA"; - changelog = "https://nbqa.readthedocs.io/en/latest/history.html"; - description = "Run ruff, isort, pyupgrade, mypy, pylint, flake8, black, blacken-docs, and more on Jupyter Notebooks"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ l0b0 ]; - mainProgram = "nbqa"; + meta = { + homepage = "https://github.com/nbQA-dev/nbQA"; + changelog = "https://nbqa.readthedocs.io/en/latest/history.html"; + description = "Run ruff, isort, pyupgrade, mypy, pylint, flake8, black, blacken-docs, and more on Jupyter Notebooks"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ l0b0 ]; + mainProgram = "nbqa"; + }; }; -} +in +nbqa diff --git a/pkgs/by-name/nc/nc4nix/package.nix b/pkgs/by-name/nc/nc4nix/package.nix index cba2af827d1df..1abfe72236e3f 100644 --- a/pkgs/by-name/nc/nc4nix/package.nix +++ b/pkgs/by-name/nc/nc4nix/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "nc4nix"; - version = "0-unstable-2024-08-01"; + version = "0-unstable-2024-09-18"; src = fetchFromGitHub { owner = "helsinki-systems"; repo = "nc4nix"; - rev = "827bb7244a3529e71c9474fe1f74aed51a4b08d5"; - hash = "sha256-ToT+VvdXiUMmy0dNJAeyMlzMx87QhZPIwzxPXm2fR7s="; + rev = "3474a6a0c686f3deb2ba6022cfd1164632d8af5c"; + hash = "sha256-txpWJ/RHyfxJOhUCeb4Z3mzjdMxPDM1/nLEFO/8/9VQ="; }; vendorHash = "sha256-qntRsv3KvAbV3lENjAHKkQOqh3uTo3gacfwase489tQ="; diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix new file mode 100644 index 0000000000000..df72bce1cb024 --- /dev/null +++ b/pkgs/by-name/nc/nchat/package.nix @@ -0,0 +1,74 @@ +{ + lib, + fetchFromGitHub, + file, # for libmagic + ncurses, + openssl, + readline, + sqlite, + zlib, + cmake, + gperf, + stdenv, + darwin, +}: + +stdenv.mkDerivation rec { + pname = "nchat"; + version = "5.2.11"; + + src = fetchFromGitHub { + owner = "d99kris"; + repo = "nchat"; + rev = "refs/tags/v${version}"; + hash = "sha256-LcTVftLKlzHstSaJjdtqoEmQ7kiqft9dbXRXoYjbaus="; + }; + + postPatch = '' + substituteInPlace lib/tgchat/ext/td/CMakeLists.txt \ + --replace "get_git_head_revision" "#get_git_head_revision" + substituteInPlace lib/tgchat/CMakeLists.txt \ + --replace-fail "list(APPEND OPENSSL_ROOT_DIR" "#list(APPEND OPENSSL_ROOT_DIR" + ''; + + nativeBuildInputs = [ + cmake + gperf + ]; + + buildInputs = + [ + file # for libmagic + ncurses + openssl + readline + sqlite + zlib + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + Cocoa + Foundation + ] + ); + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DHAS_WHATSAPP=OFF" # go module build required + ]; + + meta = { + description = "Terminal-based chat client with support for Telegram and WhatsApp"; + changelog = "https://github.com/d99kris/nchat/releases/tag/v${version}"; + homepage = "https://github.com/d99kris/nchat"; + license = lib.licenses.mit; + mainProgram = "nchat"; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + sikmir + ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/nd/ndn-cxx/package.nix b/pkgs/by-name/nd/ndn-cxx/package.nix new file mode 100644 index 0000000000000..144d79262c84a --- /dev/null +++ b/pkgs/by-name/nd/ndn-cxx/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchFromGitHub, + doxygen, + pkg-config, + python3, + python3Packages, + wafHook, + boost, + openssl, + sqlite, +}: + +stdenv.mkDerivation rec { + pname = "ndn-cxx"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "named-data"; + repo = "ndn-cxx"; + rev = "ndn-cxx-${version}"; + sha256 = "sha256-u9+QxqdCET1f5B54HF+Jk/YuQvhcYWsPNIVHi5l0XTM="; + }; + + nativeBuildInputs = [ + doxygen + pkg-config + python3 + python3Packages.sphinx + wafHook + ]; + + buildInputs = [ + boost + openssl + sqlite + ]; + + wafConfigureFlags = [ + "--with-openssl=${openssl.dev}" + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + "--with-tests" + ]; + + doCheck = false; # some tests fail in upstream, some fail because of the sandbox environment + checkPhase = '' + runHook preCheck + LD_PRELOAD=build/libndn-cxx.so build/unit-tests + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://named-data.net/"; + description = "Named Data Networking (NDN) or Content Centric Networking (CCN) abstraction"; + longDescription = '' + ndn-cxx is a C++ library, implementing Named Data Networking (NDN) + primitives that can be used to implement various NDN applications. + NDN operates by addressing and delivering Content Objects directly + by Name instead of merely addressing network end-points. In addition, + the NDN security model explicitly secures individual Content Objects + rather than securing the connection or “pipe”. Named and secured + content resides in distributed caches automatically populated on + demand or selectively pre-populated. When requested by name, NDN + delivers named content to the user from the nearest cache, thereby + traversing fewer network hops, eliminating redundant requests, + and consuming less resources overall. + ''; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ + sjmackenzie + bertof + ]; + }; +} diff --git a/pkgs/by-name/nd/ndn-tools/package.nix b/pkgs/by-name/nd/ndn-tools/package.nix new file mode 100644 index 0000000000000..52941aa57fce1 --- /dev/null +++ b/pkgs/by-name/nd/ndn-tools/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + boost ? ndn-cxx.boost, + fetchFromGitHub, + libpcap, + ndn-cxx, + openssl, + pkg-config, + sphinx, + wafHook, +}: + +stdenv.mkDerivation rec { + pname = "ndn-tools"; + version = "24.07"; + + src = fetchFromGitHub { + owner = "named-data"; + repo = "ndn-tools"; + rev = "ndn-tools-${version}"; + sha256 = "sha256-rzGd+8SkztrkXRXcEcQm6rOtAGnF7h/Jg8jaBb7FP9w="; + }; + + nativeBuildInputs = [ + pkg-config + sphinx + wafHook + ]; + buildInputs = [ + libpcap + ndn-cxx + openssl + ]; + + wafConfigureFlags = [ + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + "--with-tests" + ]; + + doCheck = false; # some tests fail because of the sandbox environment + checkPhase = '' + runHook preCheck + build/unit-tests + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://named-data.net/"; + description = "Named Data Networking (NDN) Essential Tools"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ bertof ]; + }; +} diff --git a/pkgs/by-name/ne/nemo-fileroller/package.nix b/pkgs/by-name/ne/nemo-fileroller/package.nix index 2a279c926fe29..be45cd9193cbf 100644 --- a/pkgs/by-name/ne/nemo-fileroller/package.nix +++ b/pkgs/by-name/ne/nemo-fileroller/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = "nemo-extensions"; rev = version; - sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA="; + hash = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA="; }; sourceRoot = "${src.name}/nemo-fileroller"; diff --git a/pkgs/by-name/ne/nemo-python/package.nix b/pkgs/by-name/ne/nemo-python/package.nix index 867000c8d71d2..7397149f41a7e 100644 --- a/pkgs/by-name/ne/nemo-python/package.nix +++ b/pkgs/by-name/ne/nemo-python/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = "nemo-extensions"; rev = version; - sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA="; + hash = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA="; }; sourceRoot = "${src.name}/nemo-python"; diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix index e5dece818fe2f..8a7cee2c85a47 100644 --- a/pkgs/by-name/ne/nemo/package.nix +++ b/pkgs/by-name/ne/nemo/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-1GJLsUlptwXcZUWIOztskV0nHA9BnPmnVeTgUwJ+QDQ="; + hash = "sha256-1GJLsUlptwXcZUWIOztskV0nHA9BnPmnVeTgUwJ+QDQ="; }; patches = [ diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index 232bc4664eeaf..dc49789cf5df9 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -20,7 +20,7 @@ , darwin , libglvnd , libxkbcommon -, enableWayland ? stdenv.isLinux +, enableWayland ? stdenv.hostPlatform.isLinux , wayland }: @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pkg-config python3 # skia removeReferencesTo - ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; nativeCheckInputs = [ neovim ]; @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { SDL2 fontconfig rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; @@ -96,11 +96,11 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { --prefix LD_LIBRARY_PATH : ${libPath} ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r extra/osx/Neovide.app $out/Applications ln -s $out/bin $out/Applications/Neovide.app/Contents/MacOS - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' for n in 16x16 32x32 48x48 256x256; do install -m444 -D "assets/neovide-$n.png" \ "$out/share/icons/hicolor/$n/apps/neovide.png" diff --git a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix index 0cd07e2711bc9..1e8c13ede81bc 100644 --- a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "sha256-BitFHHwL2aqBUpY/8eHaZIFvnDCeABC6w33Vmbx0z2g="; + hash = "sha256-BitFHHwL2aqBUpY/8eHaZIFvnDCeABC6w33Vmbx0z2g="; }; cmakeFlags = [ diff --git a/pkgs/by-name/ne/neovim-qt/package.nix b/pkgs/by-name/ne/neovim-qt/package.nix index aa7b2607fb709..6251559eba274 100644 --- a/pkgs/by-name/ne/neovim-qt/package.nix +++ b/pkgs/by-name/ne/neovim-qt/package.nix @@ -6,7 +6,7 @@ in libsForQt5.mkDerivation { pname = "neovim-qt"; version = unwrapped.version; - buildCommand = if stdenv.isDarwin then '' + buildCommand = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications diff --git a/pkgs/by-name/ne/neovim-remote/package.nix b/pkgs/by-name/ne/neovim-remote/package.nix index f85d379faa85c..e0f88180542f8 100644 --- a/pkgs/by-name/ne/neovim-remote/package.nix +++ b/pkgs/by-name/ne/neovim-remote/package.nix @@ -13,7 +13,7 @@ with python3.pkgs; buildPythonApplication rec { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "0lbz4w8hgxsw4k1pxafrl3rhydrvi5jc6vnsmkvnhh6l6rxlmvmq"; + hash = "sha256-uO5KezbUQGj3rNpuw2SJOzcP86DZqX7DJFz3BxEnf1E="; }; patches = [ @@ -35,7 +35,7 @@ with python3.pkgs; buildPythonApplication rec { pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME="$(mktemp -d)" diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index c66597da3ae88..886444b9442f1 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation (finalAttrs: let - nvim-lpeg-dylib = luapkgs: if stdenv.isDarwin + nvim-lpeg-dylib = luapkgs: if stdenv.hostPlatform.isDarwin then (luapkgs.lpeg.overrideAttrs (oa: { preConfigure = '' # neovim wants clang .dylib @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: nativeBuildInputs = oa.nativeBuildInputs ++ ( - lib.optional stdenv.isDarwin fixDarwinDylibNames + lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ); })) else luapkgs.lpeg; @@ -66,15 +66,15 @@ stdenv.mkDerivation (finalAttrs: in { pname = "neovim-unwrapped"; - version = "0.10.1"; + version = "0.10.2"; __structuredAttrs = true; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; - rev = "v${finalAttrs.version}"; - hash = "sha256-OsHIacgorYnB/dPbzl1b6rYUzQdhTtsJYLsFLJxregk="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-+qjjelYMB3MyjaESfCaGoeBURUzSVh/50uxUqStxIfY="; }; patches = [ @@ -104,7 +104,7 @@ in { neovimLuaEnv tree-sitter unibilium - ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ glibcLocales procps ] ; @@ -168,7 +168,7 @@ in { "-DLUA_PRG=${neovimLuaEnvOnBuild}/bin/luajit" ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" '' + '' mkdir -p $out/lib/nvim/parser diff --git a/pkgs/by-name/ne/nerdfetch/package.nix b/pkgs/by-name/ne/nerdfetch/package.nix index 659cc3deb9c3e..c470b12e114dc 100644 --- a/pkgs/by-name/ne/nerdfetch/package.nix +++ b/pkgs/by-name/ne/nerdfetch/package.nix @@ -5,13 +5,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "nerdfetch"; - version = "8.2.1"; + version = "8.3.0"; src = fetchFromGitHub { owner = "ThatOneCalculator"; repo = "NerdFetch"; rev = "v${finalAttrs.version}"; - hash = "sha256-9S7mS+lUCT8/Q65fqlrnTksuK3mhynPX+jWPaV8U8Dg="; + hash = "sha256-CQjIxXGuEUdUbbdclVKshsz/AdkgDTTACoNCVFrHqas="; }; dontUnpack = true; diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index f8a6ecb8291a0..1c54ea57330e4 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.3.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-4aZ7WGLhjpTHOggJ+sRdln0YOG3jf7TKT9/bH/n3LmQ="; + hash = "sha256-PissALQ/3gARnm2hiURABFqF2OKkFITMKf2Rww56hEM="; }; - npmDepsHash = "sha256-ts3UuThIMf+wwSr3DpZ+k1i9RnHi/ltvhD/7lomVxQk="; + npmDepsHash = "sha256-A8wzM8gYxYHIhPwxZeIWkNwHJ3skSD7MyNA5qWmX0q8="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix index 9634c2b07a80d..5ac4e9f7a4512 100644 --- a/pkgs/by-name/ne/netclient/package.nix +++ b/pkgs/by-name/ne/netclient/package.nix @@ -19,8 +19,8 @@ buildGoModule rec { vendorHash = "sha256-DzTTESPxYuZYNGjEG3PufLoS02+R9275arVcUzImpBU="; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa - ++ lib.optional stdenv.isLinux libX11; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa + ++ lib.optional stdenv.hostPlatform.isLinux libX11; hardeningEnabled = [ "pie" ]; diff --git a/pkgs/by-name/ne/netfetch/package.nix b/pkgs/by-name/ne/netfetch/package.nix new file mode 100644 index 0000000000000..b262e03cca9c0 --- /dev/null +++ b/pkgs/by-name/ne/netfetch/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + stdenv, +}: +buildGoModule rec { + pname = "netfetch"; + version = "5.2.10"; + + src = fetchFromGitHub { + owner = "deggja"; + repo = "netfetch"; + rev = "refs/tags/${version}"; + hash = "sha256-N3wKpWdG92cXH0TwAkcsld9TRrfPRkbw0uZY/X4d+xk="; + }; + + vendorHash = "sha256-/Em3hx5tiQjThLBPJDHGsqxUV3eXeymJ5pY9c601OW0="; + + proxyVendor = true; + + subPackages = [ "backend" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/deggja/netfetch/backend/cmd.Version=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + mv $out/bin/backend $out/bin/$pname + installShellCompletion --cmd $pname \ + --bash <($out/bin/$pname completion bash) \ + --fish <($out/bin/$pname completion fish) \ + --zsh <($out/bin/$pname completion zsh) + ''; + + meta = { + homepage = "https://github.com/deggja/netfetch"; + description = "Kubernetes tool for scanning clusters for network policies and identifying unprotected workloads"; + license = lib.licenses.mit; + mainProgram = "netfetch"; + maintainers = with lib.maintainers; [ banh-canh ]; + }; +} diff --git a/pkgs/by-name/ne/netproc/package.nix b/pkgs/by-name/ne/netproc/package.nix index 3f5bd8cbd86bb..16f8cabe5fbef 100644 --- a/pkgs/by-name/ne/netproc/package.nix +++ b/pkgs/by-name/ne/netproc/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "berghetti"; repo = "netproc"; rev = finalAttrs.version; - sha256 = "sha256-OQWlFwCga33rTseLeO8rAd+pkLHbSNf3YI5OSwrdIyk="; + hash = "sha256-OQWlFwCga33rTseLeO8rAd+pkLHbSNf3YI5OSwrdIyk="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index 516ca5aa11ec9..8bca17373560a 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -6,7 +6,7 @@ }: let pname = "netscanner"; - version = "0.5.2"; + version = "0.5.3"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "Chleba"; repo = "netscanner"; rev = "refs/tags/v${version}"; - hash = "sha256-gVwI5dGQqSQf2wR7oKMTRIqseUbAEDTTuQ51S6dvEFw="; + hash = "sha256-rqUGi7UF9y3VZ0KoctCesQVgJbR1WfqhFA6aYFFimNk="; }; - cargoHash = "sha256-30VSeBbaVWVEO14eUx28HSymfkCxH0IZmEN4cnJ9wIk="; + cargoHash = "sha256-VP6L3lXDXadimSWC2L4yfzTRfTcUilJtZ7TeHARAKAY="; postFixup = '' wrapProgram $out/bin/netscanner \ diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix index 9b51e9715906f..5c4bd81fa83c4 100644 --- a/pkgs/by-name/ne/neverest/package.nix +++ b/pkgs/by-name/ne/neverest/package.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional (installManPages || installShellCompletions) installShellFiles; buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa Security ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa Security ]) ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch; # TODO: unit tests temporarily broken, remove this line for the next diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix new file mode 100644 index 0000000000000..5c6bfcfd88525 --- /dev/null +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -0,0 +1,114 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + stfl, + sqlite, + curl, + gettext, + pkg-config, + libxml2, + json_c, + ncurses, + darwin, + asciidoctor, + libiconv, + makeWrapper, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "newsboat"; + version = "2.37"; + + src = fetchFromGitHub { + owner = "newsboat"; + repo = "newsboat"; + rev = "r${version}"; + hash = "sha256-RNvzGGvicujqkRWVHBwnlROuhpH5XqPNWmx6q7n4g+U="; + }; + + cargoHash = "sha256-EBA+ucegXr3YtU2K7bhwli8O+knnugMMUuSksDuaY9E="; + + # TODO: Check if that's still needed + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Allow other ncurses versions on Darwin + substituteInPlace config.sh \ + --replace "ncurses5.4" "ncurses" + ''; + + nativeBuildInputs = + [ + pkg-config + asciidoctor + gettext + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeWrapper + ncurses + ]; + + buildInputs = + [ + stfl + sqlite + curl + libxml2 + json_c + ncurses + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Security + Foundation + libiconv + gettext + ] + ); + + postBuild = '' + make -j $NIX_BUILD_CORES prefix="$out" + ''; + + # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set + # these for all platforms, since upstream's gettext crate behavior might + # change in the future. + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; + + doCheck = true; + + preCheck = '' + make -j $NIX_BUILD_CORES test + ''; + + postInstall = + '' + make -j $NIX_BUILD_CORES prefix="$out" install + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" + done + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://newsboat.org/"; + changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md"; + description = "Fork of Newsbeuter, an RSS/Atom feed reader for the text console"; + maintainers = with lib.maintainers; [ + dotlambda + nicknovitski + ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + mainProgram = "newsboat"; + }; +} diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix index 9b00d388b5784..b3dee524f7a74 100644 --- a/pkgs/by-name/ne/nextpnr/package.nix +++ b/pkgs/by-name/ne/nextpnr/package.nix @@ -27,7 +27,7 @@ let owner = "YosysHQ"; repo = "nextpnr-tests"; rev = "00c55a9eb9ea2e062b51fe0d64741412b185d95d"; - sha256 = "sha256-83suMftMtnaRFq3T2/I7Uahb11WZlXhwYt6Q/rqi2Yo="; + hash = "sha256-83suMftMtnaRFq3T2/I7Uahb11WZlXhwYt6Q/rqi2Yo="; name = "nextpnr-tests"; }; in @@ -47,9 +47,13 @@ stdenv.mkDerivation rec { ++ (lib.optional enableGui qtbase) ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); - cmakeFlags = - [ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}" - "-DARCH=generic;ice40;ecp5;gowin" + cmakeFlags = let + # the specified version must always start with "nextpnr-", so add it if + # missing (e.g. if the user overrides with a git hash) + rev = main_src.rev; + version = if (lib.hasPrefix "nextpnr-" rev) then rev else "nextpnr-${rev}"; + in ["-DCURRENT_GIT_VERSION=${version}" + "-DARCH=generic;ice40;ecp5;gowin;himbaechel" "-DBUILD_TESTS=ON" "-DICESTORM_INSTALL_PREFIX=${icestorm}" "-DTRELLIS_INSTALL_PREFIX=${trellis}" @@ -58,9 +62,10 @@ stdenv.mkDerivation rec { "-DUSE_OPENMP=ON" # warning: high RAM usage "-DSERIALIZE_CHIPDBS=OFF" + "-DHIMBAECHEL_GOWIN_DEVICES=all" ] ++ (lib.optional enableGui "-DBUILD_GUI=ON") - ++ (lib.optional (enableGui && stdenv.isDarwin) + ++ (lib.optional (enableGui && stdenv.hostPlatform.isDarwin) "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"); patchPhase = with builtins; '' @@ -80,6 +85,7 @@ stdenv.mkDerivation rec { wrapQtApp $out/bin/nextpnr-ice40 wrapQtApp $out/bin/nextpnr-ecp5 wrapQtApp $out/bin/nextpnr-gowin + wrapQtApp $out/bin/nextpnr-himbaechel ''; strictDeps = true; diff --git a/pkgs/by-name/ne/nexus/package.nix b/pkgs/by-name/ne/nexus/package.nix index 68822ba5dcb84..401511fedd68d 100644 --- a/pkgs/by-name/ne/nexus/package.nix +++ b/pkgs/by-name/ne/nexus/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.69.0-02"; + version = "3.70.1-02"; src = fetchurl { url = "https://download.sonatype.com/nexus/3/nexus-${version}-unix.tar.gz"; - hash = "sha256-7sgLPuM93mFEPlTd3qJY+FGVHErvgcTGJWwSBcqBgWI="; + hash = "sha256-oBappm8WRcgyD5HWqJKPbMHjlwCUo9y5+FtB2Kq1PCE="; }; preferLocalBuild = true; diff --git a/pkgs/by-name/ne/nexusmods-app/deps.nix b/pkgs/by-name/ne/nexusmods-app/deps.nix index 02fe55e32d794..98af9a96d33b2 100644 --- a/pkgs/by-name/ne/nexusmods-app/deps.nix +++ b/pkgs/by-name/ne/nexusmods-app/deps.nix @@ -2,675 +2,675 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Argon"; version = "0.11.0"; sha256 = "0pn7b48qilhfy5hmk4dnsn6x7m3vl4168qha3chibj8hkwq5lkkc"; }) - (fetchNuGet { pname = "Argon"; version = "0.17.0"; sha256 = "027fng81s6fj9hsl1pc4frrb2mkchbmmh9848ksdxixb05j5dclf"; }) - (fetchNuGet { pname = "AutoFixture"; version = "4.18.1"; sha256 = "0whinrvkr2xbhkwd02jbcnws3wz7vlc25hk6w0iw4g92hrmgxqxd"; }) - (fetchNuGet { pname = "AutoFixture.Xunit2"; version = "4.18.1"; sha256 = "1xs5dbj410h29spdl5c07vrxqkdl3rcyl2fv4jv4g7vq3kanc5p6"; }) - (fetchNuGet { pname = "Avalonia"; version = "11.0.0"; sha256 = "0wfbwrr8p5hg9f809d44gh2zfkfwnwayfw84vs33hh7ms0r380gd"; }) - (fetchNuGet { pname = "Avalonia"; version = "11.0.10"; sha256 = "0mvsc6fg8qbvdqkdkia61jkprb3yhvvgvq6s8hgd09v6lzjsbq8n"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.28"; sha256 = "0d9hyc1zmyvzlb320arwrv12ncp45llq98hibv711b7ibm11dm7c"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.10"; sha256 = "0s2wn7sf0dsa861gh6ghfgf881p6bvyahfpl583rcnsi6ci2hjhv"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.10"; sha256 = "13g5sac0ba8dy1pn21j2g4fin57x1vs1pl07gzgv53bl8nz1xznj"; }) - (fetchNuGet { pname = "Avalonia.Controls.TreeDataGrid"; version = "11.0.2"; sha256 = "1b8hymad7rhr6zrj493i1hwlib5cg24dsj8k4v5lxpkc94lnhz0g"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.10"; sha256 = "0s27ajknbrymnchv66rybrs3snzh825iy0nqby72yk726znp52vw"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.10"; sha256 = "1c7hv9ypvn1ncg6cmzn2cs0nkax0y0pnbx1h1asjzn8rnbwcvnca"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.10"; sha256 = "18f9vpsxfaak4qpqvcz9rdygx3k8dhzb64iqlhva88nhahwlwlxr"; }) - (fetchNuGet { pname = "Avalonia.Headless"; version = "11.0.10"; sha256 = "0pr6l2cagg7xbxs9lnvk9jwbvmhf6c8crsxf2cp7x391h5jg9xjs"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.10"; sha256 = "06pihfddbvdw1s3rs6v183ljch1bsxym80fclfqrh3npa3ag9n1z"; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.10"; sha256 = "1qarrbbmdglw1034pl2ga3b10n6kav67g9n8hf4jcr3y6nkdybmk"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; sha256 = "1b5031k8slwiz7bncih67fjl6ny234yd4skqxk611l9zp5snjic2"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.10"; sha256 = "0p75z6k4ivzhdn9y9gwqsqmja7x03d4mxaicbccjbnz06irybnxa"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; sha256 = "1ra1kd0kkblppr5zy7rzdbwllggrzvp9lkxblf9mg3y8rnp6fk83"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.10"; sha256 = "0w45j4ypqnwmsh3byzaghn43ycfkfnn8415i5lw2q5ip7vp3a9fm"; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0.14"; sha256 = "0b95h42kflbjlfw0ky58cxd0745wf7ad9phfgdyn3w7x3bjfn0x3"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.10"; sha256 = "1jqkwhpvnnbbjwr6992ahlkwgwj7l0k1141317qy1wprirn4mpv1"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.10"; sha256 = "0vssdz6rng0k85qsv2xn6x0dldaalnnx718n7plwxg3j1pddr1z7"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.10"; sha256 = "1gh3fad9ya56qwzhk7590bdzkky76yx1jjj60rqr013b97qbd3gs"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.10"; sha256 = "1x09mp8q3mrj5fijqk7qp5qivrysqnbc2bkj2ssvawb9rjy6497w"; }) - (fetchNuGet { pname = "Bannerlord.LauncherManager"; version = "1.0.76"; sha256 = "1vkjbh7mqpyqxphqgk2qq8xndhfvc09d04l51y0jj4yklq20ik18"; }) - (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.13.12"; sha256 = "1pbfr2d2jl1qpbljny1sgv3614dh6ahhqr49ak4idm4fsyff3bjy"; }) - (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.13.12"; sha256 = "0sxz5vdsszm8a2s64yhjpz3wlqdv53drf1n5pxyvlzdldipx2w5z"; }) - (fetchNuGet { pname = "BitFaster.Caching"; version = "2.4.1"; sha256 = "1rlk9isns57dxnxifb59mllk36ldmqczcvm381frxrv4hlf6kx2q"; }) - (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; sha256 = "1caf4878nvjid3cw3rw18p9cn53brfs5x8dkvf82xvcdwc3i0nd1"; }) - (fetchNuGet { pname = "CliWrap"; version = "3.6.6"; sha256 = "02pmshsxfp0xjkyd49r2dkq3cpr8qb7nmjphjzhr60v0qyambxyr"; }) - (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.2"; sha256 = "0zvdgpg6r142zhldam5kcpmjpi0qjxsm40cy491gb9ynrj39hrhn"; }) - (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) - (fetchNuGet { pname = "coverlet.collector"; version = "6.0.0"; sha256 = "12j34vrkmph8lspbafnqmfnj2qvysz1jcrks2khw798s6dwv0j90"; }) - (fetchNuGet { pname = "DiffEngine"; version = "12.3.0"; sha256 = "07b9hzxf1bvy35zb49czaffp089w6jr24s3h8bpyhqv5sz7xk2mw"; }) - (fetchNuGet { pname = "DiffEngine"; version = "15.2.1"; sha256 = "1nm8wghxyk8742hl8lxrag9pwhip055jc8w0kzz947hmrvpybqbb"; }) - (fetchNuGet { pname = "DiffEngine"; version = "15.3.0"; sha256 = "0291rgxr9knk6nsw7vqjhzkcvrgn02cklxmw3mi3s2p6scv8hs2s"; }) - (fetchNuGet { pname = "DiffPlex"; version = "1.5.0"; sha256 = "033xgpxj37iwhs67kzlyrx57y8f1fagpmfkw066yz7w2kklh0z78"; }) - (fetchNuGet { pname = "DotNetZip"; version = "1.16.0"; sha256 = "14ggqkcjxfzkbpk1961gp9fzikbf037s985zjb8jpi63xs8cfp26"; }) - (fetchNuGet { pname = "DynamicData"; version = "7.13.1"; sha256 = "0hy2ba2nkhgp23glkinhfx3v892fkkf4cr9m41daaahnl2r2l8y1"; }) - (fetchNuGet { pname = "DynamicData"; version = "8.3.27"; sha256 = "19y1zk2zga464jfv77qir8nlw7mx8lsfpgdswkgz5s3pbhpmzxl8"; }) - (fetchNuGet { pname = "EmptyFiles"; version = "4.5.1"; sha256 = "05iwlpyi4l6173qsz07lxrn8c27xm6i2iglpvw202yf5ycypaqpf"; }) - (fetchNuGet { pname = "EmptyFiles"; version = "8.1.0"; sha256 = "1jf73vgfx22ah71gv8s15lyakr1f740knvyqmxhpl28zivlqi2lm"; }) - (fetchNuGet { pname = "EmptyFiles"; version = "8.2.0"; sha256 = "10g2fyc1gvpnndbh5s6r6kfmlavv83w2xhbqi9h2qry3g25bqc7j"; }) - (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; sha256 = "1likxhccg4l4g4i65z4dfzp9059hij6h1q7prx2sgakvk8zzmw9k"; }) - (fetchNuGet { pname = "Fare"; version = "2.1.1"; sha256 = "1gagj8k2w5m2z6nlywrzhqx1q9n880yriwk0lsq3vcda9lcggmcz"; }) - (fetchNuGet { pname = "FetchBannerlordVersion"; version = "1.0.6.45"; sha256 = "0xz79h1y0ffz9m72gwsgq1kkqih1z1d8rmjbz98dg4nv9k9ia2gz"; }) - (fetchNuGet { pname = "FetchBannerlordVersion.Models"; version = "1.0.6.45"; sha256 = "1bsqjvr5fh1jwnj32sss3a99g3dk5iv202sfbhhf8ws6cp3bmgfm"; }) - (fetchNuGet { pname = "FluentAssertions"; version = "6.12.0"; sha256 = "04fhn67930zv3i0d8xbrbw5vwz99c83bbvgdwqiir55vw5xlys9c"; }) - (fetchNuGet { pname = "FluentAssertions.Analyzers"; version = "0.31.0"; sha256 = "1k3maha460l253300xka55ahgc4lbq3q45805r629kryyx5qy03r"; }) - (fetchNuGet { pname = "FluentAssertions.OneOf"; version = "0.0.5"; sha256 = "0fkkqq5d48nlmxcfda4ggsvi528ryq0kwm52mxsah47h2fjv7z2g"; }) - (fetchNuGet { pname = "FluentResults"; version = "3.15.2"; sha256 = "1p13dh2dkca29qnsvs6d81yly6sr8z7dn6qcw4430p30p2qbn51n"; }) - (fetchNuGet { pname = "Fody"; version = "6.8.0"; sha256 = "1y159433n5wzlvc8hjjrhjarf7mjvngbmh34jkd452zlrjqrhmns"; }) - (fetchNuGet { pname = "FomodInstaller.Interface"; version = "1.2.0"; sha256 = "0s627hlrdcxkvgk6k3y8jdnianqjj43irl0nny0jdfiv81aaa75k"; }) - (fetchNuGet { pname = "FomodInstaller.Scripting"; version = "1.0.0"; sha256 = "0j0a7dk9zk175cgmv53qnzx0z64rd7r0j50m9s6sclx55wnrpnhq"; }) - (fetchNuGet { pname = "FomodInstaller.Scripting.XmlScript"; version = "1.0.0"; sha256 = "1rkr1x9p3hm8a0cm5p6s2d7wwfvq5svcsd291z84hzx7ijia9dvx"; }) - (fetchNuGet { pname = "FomodInstaller.Utils"; version = "1.0.0"; sha256 = "0wj40cf40czxyv9y0pkdmir53nznckbalwybcahs2fxcv7pmqh8z"; }) - (fetchNuGet { pname = "GameFinder"; version = "4.2.0"; sha256 = "02z94xbpm9kp2b9dw7a77zdqfy4fhqidk7z7if898ap6rwyibwiv"; }) - (fetchNuGet { pname = "GameFinder.Common"; version = "2.4.0"; sha256 = "08kfyj422slf2lj29c07jv4fkyzvi0n7r7w3rp4l2jzalys82w0w"; }) - (fetchNuGet { pname = "GameFinder.Common"; version = "4.2.0"; sha256 = "0xdgfjxr1vf2r6mlvx3fsmh7iy2yk3dwx55fc7xb4xnl1ys8lh4x"; }) - (fetchNuGet { pname = "GameFinder.RegistryUtils"; version = "2.4.0"; sha256 = "0hvihgwjggr9fxa37s89xxaiafgbr38acn4dy8jza1chwdj27nsw"; }) - (fetchNuGet { pname = "GameFinder.RegistryUtils"; version = "4.2.0"; sha256 = "1gsva2sabxj4g16wx6vr1cp81qz7ynqfkjvz0qskw2h1h2743vx1"; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.EADesktop"; version = "4.2.0"; sha256 = "0li6r92x7wvn16yivhqfk0xg2y67ksi56fyhrxlx0y41l27g6fpb"; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.EGS"; version = "4.2.0"; sha256 = "0w6rh4mdwi4l1d7ag37qk2g73qlahkbgfab2550x171q0v5vxzbn"; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.GOG"; version = "2.4.0"; sha256 = "0p2qpk908sd9hl1gil6pmh2fqrkz09vzhgwypmslikvvs0bdza1b"; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.GOG"; version = "4.2.0"; sha256 = "0w5infnkbz7q8pc9q9bxqlkz8dvnsnvb4lj5qp2zqwvvrlavqfpv"; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.Origin"; version = "4.2.0"; sha256 = "0lfa5l013shhwjd0n88zgpa348ssd7yligcap67a2jp1bcsa6npf"; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.Steam"; version = "2.4.0"; sha256 = "05rp101d401qwcknwh9dlk41slp5byjsfcm46653hian2b17lrs8"; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.Steam"; version = "4.2.0"; sha256 = "0165qjz7sqcrqskij7zgsd8vhimdq6y2gxngjphpwx4g39a5b23y"; }) - (fetchNuGet { pname = "GameFinder.StoreHandlers.Xbox"; version = "4.2.0"; sha256 = "1qcprjpx1a5gxiynl4h9xhmkdfbfj5bblblj5xxm7v81jldi90yd"; }) - (fetchNuGet { pname = "GameFinder.Wine"; version = "4.2.0"; sha256 = "0h61piw0szbf2w2wh47h4ap2nyqwf9xqvwi4s880w2mx8635jjaq"; }) - (fetchNuGet { pname = "Gee.External.Capstone"; version = "2.3.0"; sha256 = "119yll2zpc9m176i17lcan31zcvww47zsvw573vbwb0jbzy17mn1"; }) - (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.3.3"; sha256 = "12rpibz66bm4img2v1knjhawp4g94qmb78pfbpbhmg60zpnmjg7x"; }) - (fetchNuGet { pname = "Google.Protobuf"; version = "3.19.4"; sha256 = "134wlbj1d3l3p81z2q3cwjwpg3s4288h1bgis0x8cpagk4k1ads7"; }) - (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.43.0"; sha256 = "0aywd270inzfy3nizdvz7z1c083m11xfd76016q0c9sbmwrhv20j"; }) - (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.43.0"; sha256 = "1yxm894lpn5sg6xg7i5ldd9bh7xg2s2c6xsx0yf7zrachy1bqbar"; }) - (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.43.0"; sha256 = "17gn73ccqq5aap7r8i6nir1260f5ndav2yc67wk2gnp94nsavbm2"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; sha256 = "1rqcmdyzxz9kc0k8594hbpksjc23mkakmjybi4b8702qycxx0lrf"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; sha256 = "0i9gaiyjgmcpnfn1fixbxq8shqlh4ahng7j4dxlf38zlln1f6h80"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; sha256 = "1b5ng37bwk75cifw7p1hzn8z6sswi8h7h510qgwlbvgmlrs5r0ga"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; sha256 = "0dcmclnyryb82wzsky1dn0gbjsvx84mfx46v984f5fmg4v238lpm"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; sha256 = "1hyvmz7rfbrxbcpnwyvb64gdk1hifcpz3rln58yyb7g1pnbpnw2s"; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.52"; sha256 = "01046w7j63404wvhxglaik8k89pimsnyr4q4mr6fs92ajsp1hrp7"; }) - (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) - (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) - (fetchNuGet { pname = "Humanizer.Core"; version = "2.2.0"; sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; }) - (fetchNuGet { pname = "Humanizer.Core.af"; version = "2.14.1"; sha256 = "197lsky6chbmrixgsg6dvxbdbbpis0an8mn6vnwjcydhncis087h"; }) - (fetchNuGet { pname = "Humanizer.Core.ar"; version = "2.14.1"; sha256 = "03rz12mxrjv5afm1hn4rrpimkkb8wdzp17634dcq10fhpbwhy6i5"; }) - (fetchNuGet { pname = "Humanizer.Core.az"; version = "2.14.1"; sha256 = "138kdhy86afy5n72wy12qlb25q4034z73lz5nbibmkixxdnj9g5r"; }) - (fetchNuGet { pname = "Humanizer.Core.bg"; version = "2.14.1"; sha256 = "0scwzrvv8332prijkbp4y11n172smjb4sf7ygia6bi3ibhzq7zjy"; }) - (fetchNuGet { pname = "Humanizer.Core.bn-BD"; version = "2.14.1"; sha256 = "1322kn7ym46mslh32sgwkv07l3jkkx7cw5wjphql2ziphxw536p8"; }) - (fetchNuGet { pname = "Humanizer.Core.cs"; version = "2.14.1"; sha256 = "1zl3vsdd2pw3nm05qpnr6c75y7gacgaghg9sj07ksvsjmklgqqih"; }) - (fetchNuGet { pname = "Humanizer.Core.da"; version = "2.14.1"; sha256 = "10rmrvzwp212fpxv0sdq8f0sjymccsdn71k99f845kz0js83r70s"; }) - (fetchNuGet { pname = "Humanizer.Core.de"; version = "2.14.1"; sha256 = "0j7kld0jdiqwin83arais9gzjj85mpshmxls64yi58qhl7qjzk0j"; }) - (fetchNuGet { pname = "Humanizer.Core.el"; version = "2.14.1"; sha256 = "143q1321qh5506wwvcpy0fj7hpbd9i1k75247mqs2my05x9vc8n0"; }) - (fetchNuGet { pname = "Humanizer.Core.es"; version = "2.14.1"; sha256 = "011kscy671mgyx412h55b0x9a1ngmdsgqzqq1w0l10xhf90y4hc8"; }) - (fetchNuGet { pname = "Humanizer.Core.fa"; version = "2.14.1"; sha256 = "184dxwkf251c27h7gg9y5zciixgcwy1cmdrs0bqrph7gg69kp6yq"; }) - (fetchNuGet { pname = "Humanizer.Core.fi-FI"; version = "2.14.1"; sha256 = "144jlnlipr3pnbcyhbgrd2lxibx8vy00lp2zn60ihxppgbisircc"; }) - (fetchNuGet { pname = "Humanizer.Core.fr"; version = "2.14.1"; sha256 = "0klnfy8n659sp8zngd87gy7qakd56dwr1axjjzk0zph1zvww09jq"; }) - (fetchNuGet { pname = "Humanizer.Core.fr-BE"; version = "2.14.1"; sha256 = "0b70illi4m58xvlqwcvar0smh6292zadzk2r8c25ryijh6d5a9qv"; }) - (fetchNuGet { pname = "Humanizer.Core.he"; version = "2.14.1"; sha256 = "08xkiv88qqd1b0frpalb2npq9rvz2q1yz48k6dikrjvy6amggirh"; }) - (fetchNuGet { pname = "Humanizer.Core.hr"; version = "2.14.1"; sha256 = "12djmwxfg03018j2bqq5ikwkllyma8k7zmvpw61vxs7cv4izc6wh"; }) - (fetchNuGet { pname = "Humanizer.Core.hu"; version = "2.14.1"; sha256 = "0lw13p9b2kbqf96lif5kx59axxiahd617h154iswjfka9kxdw65x"; }) - (fetchNuGet { pname = "Humanizer.Core.hy"; version = "2.14.1"; sha256 = "1bgm0yabhvsv70amzmkvf3mls32lvd7yyr59yxf3xc96msqczgjh"; }) - (fetchNuGet { pname = "Humanizer.Core.id"; version = "2.14.1"; sha256 = "1w0bnyac46f2321l09ckb6vz66s1bxl27skfww1iwrmf03i7m2cw"; }) - (fetchNuGet { pname = "Humanizer.Core.is"; version = "2.14.1"; sha256 = "10w1fprlhxm1qy3rh0qf6z86ahrv8fcza3wrsx55idlmar1x9jyz"; }) - (fetchNuGet { pname = "Humanizer.Core.it"; version = "2.14.1"; sha256 = "1msrmih8cp7r4yj7r85kr0l5h4yln80450mivliy1x322dav8xz2"; }) - (fetchNuGet { pname = "Humanizer.Core.ja"; version = "2.14.1"; sha256 = "04ry6z0v85y4y5vzbqlbxppfdm04i02dxbxaaykbps09rwqaa250"; }) - (fetchNuGet { pname = "Humanizer.Core.ko-KR"; version = "2.14.1"; sha256 = "156641v0ilrpbzprscvbzfha57pri4y1i66n9v056nc8bm10ggbg"; }) - (fetchNuGet { pname = "Humanizer.Core.ku"; version = "2.14.1"; sha256 = "1scz21vgclbm1xhaw89f0v8s0vx46yv8yk3ij0nr6shsncgq9f7h"; }) - (fetchNuGet { pname = "Humanizer.Core.lv"; version = "2.14.1"; sha256 = "1909dsbxiv2sgj6myfhn8lbbmvkp2hjahj0knawypyq3jw9sq86g"; }) - (fetchNuGet { pname = "Humanizer.Core.ms-MY"; version = "2.14.1"; sha256 = "1dmjrxb0kb297ycr8xf7ni3l7y4wdqrdhqbhy8xnm8dx90nmj9x5"; }) - (fetchNuGet { pname = "Humanizer.Core.mt"; version = "2.14.1"; sha256 = "0b183r1apzfa1hasimp2f27yfjkfp87nfbd8qdyrqdigw6nzcics"; }) - (fetchNuGet { pname = "Humanizer.Core.nb"; version = "2.14.1"; sha256 = "12rd75f83lv6z12b5hbwnarv3dkk29pvc836jpg2mzffm0g0kxj2"; }) - (fetchNuGet { pname = "Humanizer.Core.nb-NO"; version = "2.14.1"; sha256 = "1n033yfw44sjf99mv51c53wggjdffz8b9wv7gwm3q7i6g7ck4vv1"; }) - (fetchNuGet { pname = "Humanizer.Core.nl"; version = "2.14.1"; sha256 = "0q4231by40bsr6mjy93n0zs365pz6da32pwkxcz1cc2hfdlkn0vd"; }) - (fetchNuGet { pname = "Humanizer.Core.pl"; version = "2.14.1"; sha256 = "0h2wbwrlcmjk8b2mryyd8rbb1qmripvg0zyg61gg0hifiqfg3cr2"; }) - (fetchNuGet { pname = "Humanizer.Core.pt"; version = "2.14.1"; sha256 = "0pg260zvyhqz8h1c96px1vs9q5ywvd0j2ixsq21mj96dj7bl5fay"; }) - (fetchNuGet { pname = "Humanizer.Core.ro"; version = "2.14.1"; sha256 = "04mr28bjcb9hs0wmpb4nk2v178i0fjr0ymc78dv9bbqkmrzfsmcn"; }) - (fetchNuGet { pname = "Humanizer.Core.ru"; version = "2.14.1"; sha256 = "060abvk7mrgawipjgw0h4hrvizby7acmj58w2g35fv54g43isgcl"; }) - (fetchNuGet { pname = "Humanizer.Core.sk"; version = "2.14.1"; sha256 = "182xiqf71kiqp42b8yqrag6z57wzqraqi10bnhx0crrc1gxq8v0j"; }) - (fetchNuGet { pname = "Humanizer.Core.sl"; version = "2.14.1"; sha256 = "12ygvzyqa0km7a0wz42zssq8qqakvghh96x1ng7qvwcrna3v2rdi"; }) - (fetchNuGet { pname = "Humanizer.Core.sr"; version = "2.14.1"; sha256 = "1ggj15qksyr16rilq2w76x38bxp6a6z75b30c9b7w5ni88nkgc7x"; }) - (fetchNuGet { pname = "Humanizer.Core.sr-Latn"; version = "2.14.1"; sha256 = "0lwr0gnashirny8lgaw0qnbb7x0qrjg8fs11594x8l7li3mahzz3"; }) - (fetchNuGet { pname = "Humanizer.Core.sv"; version = "2.14.1"; sha256 = "1c7yx59haikdqx7k7vqll6223jjmikgwbl3dzmrcs3laywgfnmgn"; }) - (fetchNuGet { pname = "Humanizer.Core.th-TH"; version = "2.14.1"; sha256 = "0kyyi5wc23i2lcag3zvrhga9gsnba3ahl4kdlaqvvg2jhdfarl4m"; }) - (fetchNuGet { pname = "Humanizer.Core.tr"; version = "2.14.1"; sha256 = "0rdvp0an263b2nj3c5v11hvdwgmj86ljf2m1h3g1x28pygbcx6am"; }) - (fetchNuGet { pname = "Humanizer.Core.uk"; version = "2.14.1"; sha256 = "0a2p6mhh0ajn0y7x98zbfasln1l04iiknd50sgf3svna99wybnxd"; }) - (fetchNuGet { pname = "Humanizer.Core.uz-Cyrl-UZ"; version = "2.14.1"; sha256 = "1jfzfgnk6wz5na2md800vq0djm6z194x618yvwxbnk2c7wikbjj2"; }) - (fetchNuGet { pname = "Humanizer.Core.uz-Latn-UZ"; version = "2.14.1"; sha256 = "0vimhw500rq60naxfari8qm6gjmjm8h9j6c04k67fs447djy8ndi"; }) - (fetchNuGet { pname = "Humanizer.Core.vi"; version = "2.14.1"; sha256 = "1yr0l73cy2qypkssmmjwfbbqgdplam62dqnzk9vx6x47dzpys077"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) - (fetchNuGet { pname = "Iced"; version = "1.17.0"; sha256 = "1999xavgpy2h83rh4indiq5mx5l509swqdi1raxj3ab6zvk49zpb"; }) - (fetchNuGet { pname = "ini-parser-netstandard"; version = "2.5.2"; sha256 = "14alsxh7ik07xl9xab8bdi108f4xhz8vcchxvxy1k5w3zf3gdml9"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) - (fetchNuGet { pname = "K4os.Compression.LZ4"; version = "1.3.5"; sha256 = "1nv9inhz0n25lhkw9xgp6g5xbqmcdccdhx6mwrli0pdp6hjmlh9k"; }) - (fetchNuGet { pname = "K4os.Compression.LZ4"; version = "1.3.7-beta"; sha256 = "1dq0pdpj6sv0rwsn234i3jkj4k4z7zlmy840vr2s374pnhq4ihwq"; }) - (fetchNuGet { pname = "K4os.Compression.LZ4.Streams"; version = "1.3.5"; sha256 = "09m0jxq6558r1v1l4rsc8c0n6nlacz2d8c03as6kvvvz2gr7h506"; }) - (fetchNuGet { pname = "K4os.Hash.xxHash"; version = "1.0.8"; sha256 = "0vz1f81z4rh7a576fdzbc6wmj7p4gaca1rch3anvh1s5qd7xdd10"; }) - (fetchNuGet { pname = "LinqGen"; version = "0.3.1"; sha256 = "1nlgmmpw6f93mh357avjpzs63ayqrg44zkw813ah32j752wpaav3"; }) - (fetchNuGet { pname = "Loqui"; version = "2.60.0"; sha256 = "1kb7a7pz4srg6gwbfx5d2yf2pbbfbxp435lgngaxihn02w0cx6x9"; }) - (fetchNuGet { pname = "Magick.NET-Q16-AnyCPU"; version = "13.6.0"; sha256 = "0m04xwcrsmwqbx6y9kb6754sam98b530525bbr463k27w7fnvlg0"; }) - (fetchNuGet { pname = "Magick.NET.Core"; version = "13.6.0"; sha256 = "0rskzm986ayjzapima66y1dzslgbwdbykivns4vwyn96v0pdybpp"; }) - (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.2"; sha256 = "1mz229r42f1p320xkjl45pdv72lycn9cqk46arycm9km45jgzzgl"; }) - (fetchNuGet { pname = "MartinCostello.Logging.XUnit"; version = "0.3.0"; sha256 = "1l2bp67lfpmm502gxa0zrdyizwz5gl9sjzwnsn0qcr9n1iri25s6"; }) - (fetchNuGet { pname = "MemoryPack"; version = "1.10.0"; sha256 = "1h3i2zxzmi0nhk993fldi1i5kzsgy2dxdzly6l44x8kgr3fmld0z"; }) - (fetchNuGet { pname = "MemoryPack.Core"; version = "1.10.0"; sha256 = "02mcavp807q88nbay7hz43g50vzpmmqn6kvqxcqld6n6yqgqfl4m"; }) - (fetchNuGet { pname = "MemoryPack.Generator"; version = "1.10.0"; sha256 = "0x4dxnxxp8ffjdwa8wj2r51z6hmmcmsxiccrkm3r6f238xli5amj"; }) - (fetchNuGet { pname = "MemoryPack.Streaming"; version = "1.10.0"; sha256 = "1km24ajy3igq7l1rs33aqb7qaf3a4pbnj4zr7k1n531zjmzyzgj1"; }) - (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "8.0.3"; sha256 = "1jfwlk75db63ziar5rczw69dxn75byci2sb87wja3g6w3sswffp0"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; sha256 = "0055f69q3hbagqp8gl3nk0vfn4qyqyxsxyy7pd0g7wm3z28byzmx"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzer.Testing"; version = "1.1.1"; sha256 = "1vqyrj82li1jli1h90skx1vrp6np9xfg82mny93sdms6m38f03nz"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "1.0.1"; sha256 = "0vsc1ds60mk417v7faiihrmx0mmi0gyy1gar2w0jh8fjn5vasdcf"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.1.0"; sha256 = "1mbwbp0gq6fnh2fkvsl9yzry9bykcar58gbzx22y6x6zw74lnx43"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.8.0"; sha256 = "0gmbxn91h4r23fhzpl1dh56cpva4sg2h659kdbdazayrajfj50fw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.1.0"; sha256 = "005dj0w0ika9s7b0qrd2zk4rj35ld8y5d1nhyf9788srzig5dkx4"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.8.0"; sha256 = "0idaksbib90zgi8xlycmdzk77dlxichspp23wpnfrzfxkdfafqrj"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing"; version = "1.1.1"; sha256 = "0n80xxvzsl0502d67jcpv46da5bijx118w9zf2wc4vrgz94hczlx"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit"; version = "1.1.1"; sha256 = "0rh7s809nkrjfnf5339n3yvz07gpfxs4j0xcpaybzcixjgp3q120"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "3.8.0"; sha256 = "1jfbqfngwwjx3x1cyqaamf26s7j6wag86ig1n7bh99ny85gd78wb"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.8.0"; sha256 = "00bgzgr9kw35iz3bgndprfrxcaibc73mhd72i3pk7awam7xxrp2q"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.SourceGenerators.Testing"; version = "1.1.1"; sha256 = "1y6nclzsb7l1pwla511c2byc96xkbaph3ilp44q31x6p702yi33p"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Testing.Verifiers.XUnit"; version = "1.1.1"; sha256 = "0xw2zxzimjcqjsnvz7xi2dnf69iihav8hk4zq2cs06z4hjj39sjq"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "1.0.1"; sha256 = "0nrds4x3hja3r8mnd4qh8x9zc0n98cb71argb82fm12bms90y9px"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "3.8.0"; sha256 = "0qbirv7wxllzw5120pfa42wailfgzvl10373yhacankmfmbz2gnw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.8.0"; sha256 = "10r2qci44syk8v45rp8pq73q4c76bxbasplyi8lzhfwmjm57ii2z"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.9.0"; sha256 = "1gljgi69k0fz8vy8bn6xlyxabj6q4vls2zza9wz7ng6ix3irm89r"; }) - (fetchNuGet { pname = "Microsoft.Composition"; version = "1.0.27"; sha256 = "1la5s2n2kwzi3fxg2dvsn79zkpm8big2wyxvm03jyn2f7kgykz8v"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "8.0.3"; sha256 = "1v1vs0cmx8lcwc8x5n794ky0y7ck9qq6742nm54kdqixz2y501a2"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.3"; sha256 = "1c9ajcjkszwnx6p0ba93cxa7hb3m5b98mvn4g151bgx2izcv656d"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.251802"; sha256 = "0h4mc6gx95l1mwcxhj7m7drsfgbhp0ssr6l8wr7k42y0nypgi4gm"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.2.332302"; sha256 = "1n64ya4fq6305xv8ybk7f22v0f39rylkqap7n9blhr1h98mp27z5"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.0.2"; sha256 = "14swfz2myqv4zxznf5450b3485q629pk0zc483yszvq0956a4yq4"; }) - (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.1"; sha256 = "0244czr3jflvzcj6axq61j10dkl0f16ad34rw81ryg57v4cvlwx6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.0"; sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.1"; sha256 = "0b4bn0cf39c6jlc8xnpi1d8f3pz0qhf8ng440yb95y5jv5q4fdyw"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.0"; sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.1.1"; sha256 = "0n91s6cjfv8plf5swhr307s849jmq2pa3i1rbpb0cb0grxml0mqm"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.0"; sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "6.0.0"; sha256 = "1hb4qrq9xdxzh2px515pv1vkz1jigwaxw1hfg9w8s6pgl8z04l4c"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "8.0.0"; sha256 = "026f7f2iv6ph2dc5rnslll0bly8qcx5clmh2nn9hgyqjizzc4qvy"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; sha256 = "13qb8wz3k59ihq0mjcqz1kwrpyzxn5da4dhk2pvcgc42z9kcbf7r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; sha256 = "1jrmlfzy4h32nzf1nm5q8bhkpx958b0ww9qx1k1zm4pyaf6mqb04"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "6.0.0"; sha256 = "1c6l5szma1pdn61ncq1kaqibg0dz65hbma2xl626a8d1m6awn353"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; sha256 = "1n3ss26v1lq6b69fxk1vz3kqv9ppxq8ypgdqpd7415xrq66y4bqn"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "6.0.0"; sha256 = "0rqsdjm37wifi0rcxbmicmgd6h9p539mb88hcsgy16yl30fvgv3g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "8.0.0"; sha256 = "1br01zhzhnxjzqx63bxd25x48y9xs69hcs71pjni8y9kl50zja7z"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.0"; sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.1"; sha256 = "0rn0925aqm1fsbaf0n8jy6ng2fm1cy97lp7yikvx31m6178k9i84"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.0"; sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.1"; sha256 = "1wyhpamm1nqjfi3r463dhxljdlr6rm2ax4fvbgq2s0j3jhpdhd4p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; sha256 = "0ghwkld91k20hcbmzg2137w81mzzdh8hfaapdwckhza0vipya4kw"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; sha256 = "15m4j6w9n8h0mj7hlfzb83hd3wn7aq1s7fxbicm16slsjfwzj82i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; sha256 = "05wxjvjbx79ir7vfkri6b28k8zl8fa6bbr0i7gahqrim2ijvkp6v"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; sha256 = "1igf2bqism22fxv7km5yv028r4rg12a4lki2jh4xg3brjkagiv7q"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "6.0.0"; sha256 = "0h7yh9hm3pzqphsav54lrpjf12lqqdz4dq7hr61bcjycwd29l7dv"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "8.0.0"; sha256 = "1f2af5m1yny8b43251gsj75hjd9ixni1clcldy8cg91z1vxxm8dh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "6.0.0"; sha256 = "1mwjx6li4a82nb589763whpnhf5hfy1bpv1dzqqvczb1lhxhzhlj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; sha256 = "00d5dwmzw76iy8z40ly01hy9gly49a7rpf7k7m99vrid1kxp346h"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.1.1"; sha256 = "12pag6rf01xfa8x1h30mf4czfhlhg2kgi5q712jicy3h12c02w8y"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.1.0"; sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.1"; sha256 = "1sgpwj0sa0ac7m5fnkb482mnch8fsv8hfbvk53c6lyh47s1xhdjg"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.0.3"; sha256 = "1wj871vl1azasbn2lrzzycvzkk72rvaxywnj193xwv11420b0mjh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.0"; sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.1"; sha256 = "0i9pgmk60b8xlws3q9z890gim1xjq42dhyh6dj4xvbycmgg1x1sd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "3.1.0"; sha256 = "00bx95j2j0lkrr1znm53qicigvrj4sbc7snh27nqwsp4vkjnpz5h"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; sha256 = "1d9b734vnll935661wqkgl7ry60rlh5p876l2bsa930mvfsaqfcv"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; sha256 = "1mvp3ipw7k33v2qw2yrvc4vl5yzgpk3yxa94gg0gz7wmcmhzvmkd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "6.0.0"; sha256 = "0aql9kc45g2d6z1hmwr3p1a2qy9m3f36bds3054givsnpnis81wk"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "8.0.0"; sha256 = "1h7mg97lj0ss47kq7zwnihh9c6xcrkwrr8ffhc16qcsrh36sg6q0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "6.0.0"; sha256 = "0j3g2k8sr99kr73w66yk4ghq469syyxzayq6fjfnjjgj1y7x05fl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "8.0.0"; sha256 = "05vfrxw7mlwlwhsl6r4yrhxk3sd8dv5sl0hdlcpgw62n53incw5x"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "6.0.0"; sha256 = "0ck8r63qal88349kkbj1i98fd8z9kcp41s13yyz8cpkygn15wq4g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "8.0.0"; sha256 = "0gbjll6p03rmw0cf8fp0p8cxzn9awmzv8hvnyqbczrkax5h7p94i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.3"; sha256 = "0h9i862qnnczix3ldai49djphd2cgpcg4wyaz1xsqv0i8gll65sp"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.1.1"; sha256 = "0wgpsi874gzzjj099xbdmmsifslkbdjkxd5xrzpc5xdglpkw08vl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.0"; sha256 = "0akccwhpn93a4qrssyb3rszdsp3j4p9hlxbsb7yhqb78xydaqhyh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "3.1.0"; sha256 = "13bhi1q4s79k4qb19m4p94364543jr3a1f8kacjvdhigpmqa732r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.1"; sha256 = "033rkqdffybq5prhc7nn6v68zij393n00s5a82yf2n86whwvdfwx"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.0"; sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "8.0.3"; sha256 = "00rr4fcbwc0zf2iczdi91cdmh6w3gb1x02zv7smhcqqpgzrvidqa"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; sha256 = "0xrr8yd34ij7dqnyddkp2awfmf9qn3c89xmw2f3npaa4wnajmx81"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; sha256 = "1gdx7n45wwia3yvang3ls92sk3wrymqcx9p349j8wba2lyjf9m44"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.1"; sha256 = "0agmphcspyg4pmpzfrfpbmgqf3wd3kqqvs87xls0i1139pa8ryi9"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; }) - (fetchNuGet { pname = "Microsoft.VisualBasic"; version = "10.0.1"; sha256 = "0q6vv9qfkbwn7gz8qf1gfcn33r87m260hsxdsk838mcbqmjz6wgc"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Composition"; version = "16.1.8"; sha256 = "0x4ln1f4y2dyc0l5cckwzs56wr022cdwfh7p21wm9pr4fnvzhm68"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Composition.NetFxAttributes"; version = "16.1.8"; sha256 = "00dhyk24v438iilynjy6hygmh7iyhx0glmlf7sa1bwd6dwhacmql"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.0.82"; sha256 = "0ms0167bi97hps5d5pw0rd2vkf24qchzxqfl2bn5h7fry41mm4gc"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.7.0"; sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; }) - (fetchNuGet { pname = "Mutagen.Bethesda.Core"; version = "0.42.0"; sha256 = "1wncsnmwbc11ardl38ii81jkspilzlnq3p4jhcwfmykiang9dr50"; }) - (fetchNuGet { pname = "Mutagen.Bethesda.Kernel"; version = "0.42.0"; sha256 = "1bpaqxqygjr0vbhxg6iwj3shqak0gz28kmpjc364y4vchhhvczwk"; }) - (fetchNuGet { pname = "Mutagen.Bethesda.Skyrim"; version = "0.42.0"; sha256 = "1ippwgiicl4rp7a2cv88axwnrjgx2pbpxwdqpw9w8wqlm5rdp2ql"; }) - (fetchNuGet { pname = "NetEscapades.EnumGenerators"; version = "1.0.0-beta07"; sha256 = "01n7h7bgarmkar1ll7s4qrvl9j0avd5pfylcnpp2lvkna29jx0j9"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) - (fetchNuGet { pname = "NexusMods.Archives.Nx"; version = "0.3.8"; sha256 = "067wgxqby7kiya6cnx64mq824csbz1h8vx30i5w8wax3ppaxbgp2"; }) - (fetchNuGet { pname = "NexusMods.Hashing.xxHash64"; version = "2.0.0"; sha256 = "003jwn9hnmszfzwa9xd36hspc9xh8mcldkh169sj84rxsw0xliri"; }) - (fetchNuGet { pname = "NexusMods.Paths"; version = "0.1.8"; sha256 = "0gid7zdhcfilhlvs1fm19z6sgp63zcjx522fw1ghgngj7dwgqpp6"; }) - (fetchNuGet { pname = "NexusMods.Paths"; version = "0.4.0"; sha256 = "0kyhpn2dha2d9fri3nm2zfpd5ly2lgc1bqs1k06fxnmsxljy7vd8"; }) - (fetchNuGet { pname = "NexusMods.Paths"; version = "0.8.0"; sha256 = "0sw49xdj6h3n38kdzb46gc99z05klhgjr33fjrdg0ln8j1m9q3gv"; }) - (fetchNuGet { pname = "NexusMods.Paths"; version = "0.9.2"; sha256 = "0a550hb48rdj5y9pazixl90gzyvwqf6zhmam5q90z11k2mifp0gp"; }) - (fetchNuGet { pname = "NexusMods.Paths.TestingHelpers"; version = "0.8.0"; sha256 = "0wcmpskfn9pw0jhjq7hdwgnvflqpl9a1rasx3ck3ansmh0my1f3z"; }) - (fetchNuGet { pname = "NexusMods.ProxyConsole"; version = "0.6.0"; sha256 = "1iajcv1z2xc6851h4xxymbp4085hh236la9pwivd71rlcilikjln"; }) - (fetchNuGet { pname = "NexusMods.ProxyConsole.Abstractions"; version = "0.6.0"; sha256 = "10icz41zjd0jfyg9v8c4cfjm5ivg23klll3cbsyj4k8v70dwf7x0"; }) - (fetchNuGet { pname = "NexusMods.SingleProcess"; version = "0.6.0"; sha256 = "1ibkvric5gpn89qdic7bgg8knap64m4svjgc8xgnc4f4l6wi1802"; }) - (fetchNuGet { pname = "NexusMods.Telemetry"; version = "1.0.0"; sha256 = "18v3kqk3nldk8qvp7yky8l33vjgp16bsgzfvfz6a0z4n7l1wxwhq"; }) - (fetchNuGet { pname = "NexusMods.Telemetry.OpenTelemetry"; version = "1.0.0"; sha256 = "0885nhmx6hln9r7psfrg6101z5mx949g6a73w9ini13z4cx5fvgb"; }) - (fetchNuGet { pname = "NLog"; version = "5.2.8"; sha256 = "1z3h20m5rjnizm1jbf5j0vpdc1f373rzzkg6478p1lxv5j385c12"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.8"; sha256 = "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8"; }) - (fetchNuGet { pname = "Noggog.CSharpExt"; version = "2.60.0"; sha256 = "1p6ih9a30y1mir3y4cchbnmhj9pv7rsmqfhmn10gm4apf68fid0n"; }) - (fetchNuGet { pname = "NSubstitute"; version = "5.1.0"; sha256 = "0vjl2pgw4b6366x47xyc0nfz33rx96bwjpnn0diq8mksaxn6w6ir"; }) - (fetchNuGet { pname = "NSubstitute.Analyzers.CSharp"; version = "1.0.17"; sha256 = "1gkr7xw4my7577dhyb4a5ylw5qlfdfddcyxr4l5p0yrkjcs228qz"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "5.6.0"; sha256 = "1y7z537xrq2flfhsr63da1lxq9xgnja5d0ssp8ih7fhzjw5f1kxr"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "5.6.0"; sha256 = "1lk9gf8pyyic6r6vfz09cmh1s2h8y8qgh9c2cl7kygsnxzm3m41b"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.6.0"; sha256 = "1dzmma2qm6brmsy3nfh3w7y04aijyzzq4xwa8f8ykg9f6wqrril8"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "5.6.0"; sha256 = "02d101kfljcsvrn7wq756nnwvvn1qsl3ijlw3azhn9680vaw0pvf"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "5.6.0"; sha256 = "1zsi1gdlyjwmmxpqbbzmc524nmcs8v50xyql2m8dr0rq9723g9kx"; }) - (fetchNuGet { pname = "NuGet.Resolver"; version = "5.6.0"; sha256 = "0kn751hxvwy4c0bzmpk5fin435iav4wx56ndwg7jid29a1380260"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "5.6.0"; sha256 = "10jfafhscgh2y92a70lbn1jq7k3v8mjx6ryfchjfqkk1g1dv0wnw"; }) - (fetchNuGet { pname = "OneOf"; version = "2.1.125"; sha256 = "0yrvf99gspbz4k19zrklpxrwr3i75ml1ygwn6rr57hhc44sh2yfx"; }) - (fetchNuGet { pname = "OneOf"; version = "3.0.263"; sha256 = "08jiy5ff6nx3bbmia7iqcfrva0bynr87m0m4nxkzm5ri21w49ri1"; }) - (fetchNuGet { pname = "OneOf.Extended"; version = "2.1.125"; sha256 = "0j0nvwc2p4xc0amx1v74mgj7m550qjk7j4wk99q3c5ydvkiv75n0"; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.5.1"; sha256 = "11viab672mdiyw5pl7fk43lmn0i1wyjrnx4nwfh44m3vj1x0a7xn"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.5.1"; sha256 = "0wybx4zjsfzxn8gqjcy6impi634swy0s50fq9af7hrhwa4mwsr5w"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.5.1"; sha256 = "0rb092l5hsivk8giiz2iqh9y1040m8zvyg4k4ikgzfr7xz00zlh9"; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.OpenTelemetryProtocol"; version = "1.5.1"; sha256 = "17d6a9hvs3g4vkbbv5jsjl74ixvb4anvgfkav72nv6c2j6qrdlcd"; }) - (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.5.1"; sha256 = "1l83hivr1596mnjd51j0mjsfswm2mz7b5az9krwc80yhyxdhkba3"; }) - (fetchNuGet { pname = "Pathoschild.Http.FluentClient"; version = "4.3.0"; sha256 = "157cv084sdy463qx57wqnsj437magqs25dcd38brv35jnbk3vkqp"; }) - (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; sha256 = "012aqqi3y3nfikqmn26yajpwd52c04zlzp0p91iyslw7mf26qncy"; }) - (fetchNuGet { pname = "Projektanker.Icons.Avalonia"; version = "9.1.2"; sha256 = "1a28f02n7zxgbi2wpx83krjq9ribylalwny2anabfk8y5lc4xw8n"; }) - (fetchNuGet { pname = "Projektanker.Icons.Avalonia.MaterialDesign"; version = "9.1.2"; sha256 = "0w8x94d7bqwgpcnlxxf27zcjxh1frv3mb647wv0k7lj3bvnpmkdl"; }) - (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; }) - (fetchNuGet { pname = "ReactiveUI"; version = "19.5.41"; sha256 = "1sbs76x4b3kqc5aba6bvp0430nngq28qbjaw74mfijara3b47iqn"; }) - (fetchNuGet { pname = "ReactiveUI.Fody"; version = "19.5.41"; sha256 = "0hwrayh0ji6f35z56c5qj0plriha16spghs75w5r80hz20pq9wid"; }) - (fetchNuGet { pname = "Reloaded.Memory"; version = "9.3.0"; sha256 = "08jyxwj2jh8dlhdf43f2mqi5cg2pxzrlh1b7bhsx0yp1hgzh58pr"; }) - (fetchNuGet { pname = "Reloaded.Memory"; version = "9.4.1"; sha256 = "1yv9c49zp4fvl329q7nwa71zkp2plvxvicdr62i2izby9h0r6xkd"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0"; sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SHA3.Net"; version = "2.0.0"; sha256 = "11wmqx6gvkl8kvbhsavk2hsj8nplnv8ai3apwiyv7ndrpkv29p5c"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) - (fetchNuGet { pname = "SharpZstd.Interop"; version = "1.5.5-beta1"; sha256 = "1jdwd00pgl86k9k5sz5jk7vckd0bi4818kg52pwpc0byjn8wqfgg"; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.14"; sha256 = "0gdzvkrg63a4nqh4z2dxqiwmw07if08vdffmmgbck6j4nblx11qh"; }) - (fetchNuGet { pname = "SimpleInfoName"; version = "2.1.1"; sha256 = "08rbvnk5aln1dbfv69rqnzkld5m3bvb2j4z367s297fb5ci4s87g"; }) - (fetchNuGet { pname = "SimpleInfoName"; version = "2.2.0"; sha256 = "0dd68biqqzi81p8jz8z61181hachpikqphk73xw12s7w33xqf8x0"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; sha256 = "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; sha256 = "0f6wbk9dnjiffb9ycjachy1m9zw3pai2m503nym07qgb0izxm792"; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.6"; sha256 = "1h61vk9ibavwwrxqgclzsxmchighvfaqlcqrj0dpi2fzw57f54c2"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; sha256 = "0p0z6nxkkmabv46wmxhs3yr0xy24i6jzn54gk0hsm3h1a8vi3m21"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; sha256 = "1fp9h8c8k6sbsh48b69dc6461isd4dajq7yw5i7j6fhkas78q4zf"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; sha256 = "05xwa1izzvqz4gznvx2x31qnpvl1lc65hm5p9sscjg5afisya0ss"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; sha256 = "1k2hfasgbv01navc55zzwdwzfxcw4186jni35c00zykgwhbwb250"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; sha256 = "1w2mwcwkqvrg4x4ybc4674xnkqwh1n2ihg520gqgpnqfc11ghc4n"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; sha256 = "119mlbh5hmlis7vb111s95dwg5p1anm2hmv7cm6fz7gy18473d7v"; }) - (fetchNuGet { pname = "Spectre.Console"; version = "0.47.0"; sha256 = "0gc9ana660an7d76w9qd8l62lv66dc69vr5lslr896b1313ywakp"; }) - (fetchNuGet { pname = "Spectre.Console"; version = "0.48.0"; sha256 = "0v3zijim9k5lcmhn0ajlsix0japvx3c20r9b7x7f7gvraa8w3gl6"; }) - (fetchNuGet { pname = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; }) - (fetchNuGet { pname = "Splat"; version = "14.8.12"; sha256 = "09gigvphgq6w3n251wgi5r3wbyk9j19cpn6g5wigqdymy5hfr97l"; }) - (fetchNuGet { pname = "Splat.Microsoft.Extensions.Logging"; version = "14.8.12"; sha256 = "0gbwyr1sbadbkrf7wgc4jcxv73q96dybwvnkrxhr3igi2hidsn29"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; sha256 = "0pzgdfl707pd9fz108xaff22w7c2y27yaix6wfp36phqkdnzz43m"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; sha256 = "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; sha256 = "0g959z7r3h43nwzm7z3jiib1xvyx146lxyv0x6fl8ll5wivpjyxq"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; sha256 = "1vs1c7yhi0mdqrd35ji289cxkhg7dxdnn6wgjjbngvqxkdhkyxyc"; }) - (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.14"; sha256 = "1x4cc9npxfl22wgy34pxglp7aja7h6q4vkc5ms0xknr2j9b7x5j6"; }) - (fetchNuGet { pname = "Svg.Model"; version = "1.0.0.14"; sha256 = "03g343r1adaclnybj35p33bskwkn2scr9gka1l3cf13d3rz1hxal"; }) - (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.14"; sha256 = "18rnn88gfkry72vzknwa89vfkclsn06hz4wqx3iy1x81pf1az4qq"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "5.0.0"; sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "8.0.0"; sha256 = "0zyzd15v0nf8gla7nz243m1kff8ia6vqp471i3g7xgawgj5n21dv"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.1.36"; sha256 = "0bgwv02alikabdp8ax7wbrp8ym4nbbfa65lhz042cy5g9hn35xf7"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.2.0"; sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; sha256 = "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp"; }) - (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.3.0"; sha256 = "1ab25njbjgqbnvkazv41ndc0fc7gx0dnnhzb57d2wbd7ljxm21fd"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) - (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "4.5.0"; sha256 = "196ihd17in5idnxq5l5xvpa1fhqamnihjg3mcmv1k4n8bjrrj5y7"; }) - (fetchNuGet { pname = "System.Composition"; version = "1.0.31"; sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; }) - (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "1.0.31"; sha256 = "1ipyb86hvw754kmk47vjmzyilvj5hymg9nqabz70sbgsz1fygrdv"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; sha256 = "1cxrp0sk5b2gihhkn503iz8fa99k860js2qyzjpsw9rn547pdkny"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "1.0.31"; sha256 = "00gqcdrql7vhynxh4xq0s9j5nw27kghmn2n773v7lhzjh3ash18r"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; sha256 = "1nbyn42xys0kv247jf45r748av6fp8kp27f1582lfhnj2n8290rp"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "1.0.31"; sha256 = "1f1bnk3j7ndx9r7zpzibmrhw78clys1pspl20j2dhnmkiwhl23vy"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; sha256 = "0wqbjxgggskfn45ilvg86grqci3zx9xj34r5sradca4mqqc90n7f"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "1.0.31"; sha256 = "1shfybfzsn4g6aim4pggb5ha31g0fz2kkk0519c4vj6m166g39ws"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; sha256 = "1p9xpqzx42s8cdizv6nh15hcjvl2km0rwby66nfkj4cb472l339s"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "1.0.31"; sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; sha256 = "0syz7y6wgnxxgjvfqgymn9mnaa5fjy1qp06qnsvh3agr9mvcv779"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v"; }) - (fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.0"; sha256 = "1jxhvsh5mzdf0sgb4dfmbys1b12ylyr5pcfyj1map354fiq3qsgm"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; }) - (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; sha256 = "08y1x2d5w2hnhkh9r1998pjc7r4qp0rmzax062abha85s11chifd"; }) - (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; sha256 = "1xnvcidh2qf6k7w8ij1rvj0viqkq84cq47biw0c98xhxg5rk3pxf"; }) - (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "4.7.0"; sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "19.1.5"; sha256 = "1dkzkglkdj0alrsmn0bxjx6i7x5xc5svrp0jihyzpkmk9ycs5nwp"; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "19.2.1"; sha256 = "1v6aazxwmfgy4y95dcbk1wycm4mc53n4pm1cck93nagrwcgbs9y6"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Hashing"; version = "7.0.0"; sha256 = "0vilmb817wnw8w13kkps831p05zzc41dldigpbr3wqi0hsrf8ad9"; }) - (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; sha256 = "1hg5i9hiihj9x4d0mlvhfddmivzrhzz83dyh26fqw1nd8jvqccxk"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; sha256 = "00f36lqz1wf3x51kwk23gznkjjrf5nmqic9n7073nhrgrvb43nid"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Management"; version = "5.0.0"; sha256 = "09hyv3p0zd549577clydlb2szl84m4gvdjnsry73n8b12ja7d75s"; }) - (fetchNuGet { pname = "System.Management"; version = "6.0.2"; sha256 = "190bxmg0y5dmzh0yv9gzh8k6safdz20gqaifpnl8v7yw3z5wcpgj"; }) - (fetchNuGet { pname = "System.Management"; version = "8.0.0"; sha256 = "1zbwj6ii8axa4w8ymjzi9d9pj28nhswygahyqppvzaxypw6my2hz"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) - (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; sha256 = "1mkvx1fwychpczksy6svfmniqhbm3xqblxqik6178l12xgq7aw45"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.0.21"; sha256 = "0jq1jvjxwgaxi9wama5wy5b3lspvd2kz4rcp8gc9xhqs3idq6ank"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.3.0"; sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.3.0"; sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "4.5.0"; sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "4.7.0"; sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "8.0.3"; sha256 = "0jkl986gnh2a39v5wbab47qyh1g9a64dgh5s67vppcay8hd42c4n"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.6.0"; sha256 = "0a1davr71wssyn4z1hr75lk82wqa0daz0vfwkmg1fm3kckfd72k1"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "4.7.0"; sha256 = "11dmyx3j0jafjx5r9mkj1v4w2a4rzrdn8fgwm2d1g7fs1ayqcvy9"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "19.1.5"; sha256 = "0c4iis3zdmkmhy5mnkq18qyb56a1w3lzp39k0mpsdajal82bzmva"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "19.2.1"; sha256 = "0b5grv4pqjyz9qwfpfaycgizcy392csdf3yrdqsvlimk8g1j968x"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "19.1.5"; sha256 = "1igvpn8crzbv53x6kc1dbyp0ljlzbxhzzas3yzq2ya0lhqf3g2jl"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "19.2.1"; sha256 = "0n57wg3sb0m635c1hlqh2klhc3rsgsx7l503g384kvafp3bcgdxl"; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) - (fetchNuGet { pname = "TransparentValueObjects"; version = "1.0.1"; sha256 = "1c7ygykkvfwibj8an2xnf0fqldfd3pv0qgchi7nlr9zl70vcjfcx"; }) - (fetchNuGet { pname = "Validation"; version = "2.4.18"; sha256 = "0ljc5bzz3h00ba0iwf1y3wgdpzflwafnj4gjb0jmiagc51ai68h7"; }) - (fetchNuGet { pname = "ValveKeyValue"; version = "0.8.2.162"; sha256 = "1f1vmvvrqq4m96y3r6bwfz0qipqacf4h3rh367b5h4x578lwbjin"; }) - (fetchNuGet { pname = "ValveKeyValue"; version = "0.9.0.267"; sha256 = "1i25kjh06dv93700s03miv3p9ay4zhw32d0hxdzzd2aszag6ppnp"; }) - (fetchNuGet { pname = "Verify"; version = "21.3.0"; sha256 = "1qc61h7ga1d0qmhvhxz90fdq1sylg4w0risgj8vwn7qbxapvg8z8"; }) - (fetchNuGet { pname = "Verify"; version = "23.2.1"; sha256 = "0qi86z0m9hgv7pv9jq20sra9j3wqdfx39s384pbrfbbbg9h42d09"; }) - (fetchNuGet { pname = "Verify"; version = "23.5.0"; sha256 = "14wsn6nwywqlcrb9shvy2wviklhl5dsz0g4xsy2driwmn45l67mw"; }) - (fetchNuGet { pname = "Verify.ImageMagick"; version = "3.3.0"; sha256 = "15lgc11l55gq2rz25448d2kjafw3555vmcppmxys1grgiwhy93rh"; }) - (fetchNuGet { pname = "Verify.SourceGenerators"; version = "2.2.0"; sha256 = "0rf2rc7z7r2z02l2rp3h7481nlb6qp7ksh24j2jagmjs264k9qhq"; }) - (fetchNuGet { pname = "Verify.Xunit"; version = "23.5.0"; sha256 = "05bclxkd1g50s3mb66r11fsqhz2fmc6n76vas6f364g8rsk4n083"; }) - (fetchNuGet { pname = "Vogen"; version = "3.0.20"; sha256 = "0z43k2g18f4sq804lvaya6q8r249p2n1fbxnl3a61a0vx7sx73i9"; }) - (fetchNuGet { pname = "Vogen"; version = "3.0.24"; sha256 = "1531iavcjfkz64yxm3634wh88laj9vxiagr3krxfmwx08ggzzg3s"; }) - (fetchNuGet { pname = "xunit"; version = "2.7.0"; sha256 = "0qs7yaz8qdhi75is7grgdxwxm09j36wv9c2ifyj2xd5jfzvlkc71"; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.1"; sha256 = "0c7zkf3i8n1mhc457q859klk067bw1xbf31lyxlwc5hlx9aqz65z"; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.2"; sha256 = "1cfpdhzrmqywsg8w899w9x5bxbhszipsm4791il1gf7cdq4hz463"; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "1.11.0"; sha256 = "0qfmc6s5g2cnfvbdp837jvkgk1sq7hrql8bip6qjsy33liqwfx2m"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.3.0"; sha256 = "07z9xhad8r3lii3p4y6qfn2daqxp1pxqx559l6k7b80h864qvpwl"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.7.0"; sha256 = "14g5pvv709ykkz3lgqbdisksqfll72792fkrg4qr0s8jcp38kpyc"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.7.0"; sha256 = "0s31kxc383xa9132hz9nkm21d10xvay78yzpnz2pabaxld2mwdz9"; }) - (fetchNuGet { pname = "Xunit.DependencyInjection"; version = "8.9.1"; sha256 = "1shcda3055g2hcbjcz790gxh0009ac91rl0lfxajaim6bkkgsd02"; }) - (fetchNuGet { pname = "Xunit.DependencyInjection.Logging"; version = "8.1.0"; sha256 = "019h3pwbhzq1pnivl2prwsb5ssj572884d5y3w65cigfysmifjs7"; }) - (fetchNuGet { pname = "Xunit.DependencyInjection.SkippableFact"; version = "8.1.0"; sha256 = "0f656lrmpn6nnpymvikbrn5j4kl9xzlcq98n5wssy5b2xx1ikh0p"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.2.0"; sha256 = "0l9fl09l709dq671r5yvmcrk9vhxgszmxf3ny1h9ja2sp9xx5pbs"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.0"; sha256 = "0qd834mv1017j13bjz7g0byiiqzpflnnqhm15zvnk309q48rgfrd"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.2"; sha256 = "1h0a62xddsd82lljfjldn1nqy17imga905jb7j0ddr10wi8cqm62"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.7.0"; sha256 = "0n4xc0fmj9a7rhsavs66n292g4vx5bsa27566k2g5dak4x1lvdv8"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.0"; sha256 = "0bpy9iw4dkx884ld10dlijlyfp13afxrb3akhprdvazhmh8lj53j"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.2"; sha256 = "0r9gczqz4bc59cwl6d6wali6pvlw210i97chc1nlwn2qh383m54p"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.7.0"; sha256 = "1pmgl10wipvzq739gmlwdcmicpshb6620v1180p8yhham36ppy5i"; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.7"; sha256 = "07wan383cbxldlczjrxcn8s75jc7i2yv70s8sghv8n860mfsks96"; }) - (fetchNuGet { pname = "Xunit.SkippableFact"; version = "1.4.13"; sha256 = "1z0mxzjxlsfh34mymrnkc4wvcn0j7xwq6mcdsl7ack58zp9p3fx4"; }) + (fetchNuGet { pname = "Argon"; version = "0.11.0"; hash = "sha256-bE5aMJ8QyRUhGwpiZAKhe9TTjdW2kVlh8Q7SiBFZx14="; }) + (fetchNuGet { pname = "Argon"; version = "0.17.0"; hash = "sha256-jrJWZAGrx970RAQlWOuCbFaxcnaE3UA1TNIZHdCz7gg="; }) + (fetchNuGet { pname = "AutoFixture"; version = "4.18.1"; hash = "sha256-reP+aoYiPcIj4GbCIhjd5/OhuWVLCtD4hKuLPHe2EXI="; }) + (fetchNuGet { pname = "AutoFixture.Xunit2"; version = "4.18.1"; hash = "sha256-5hZm1Rx4n0e2JNsJ6lketE3c8z6AFdquTgKCQORqRfc="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.0"; hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.1.0"; hash = "sha256-HVcwSKc+f69vuRHJ9CT0QL46WFM/gggnY6Wn8IUQq+U="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.1.3"; hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.22045.20230930"; hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; }) + (fetchNuGet { pname = "Avalonia.AvaloniaEdit"; version = "11.1.0"; hash = "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.28"; hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.3"; hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.1.3"; hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc="; }) + (fetchNuGet { pname = "Avalonia.Controls.TreeDataGrid"; version = "11.0.10"; hash = "sha256-1R2AFOKQQPemN7qXsdxCGXcfMSRztRiC86DLqiV6CpY="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.1.3"; hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.1.3"; hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.1.3"; hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI="; }) + (fetchNuGet { pname = "Avalonia.Headless"; version = "11.1.3"; hash = "sha256-n/kRyxocJvlPM8ZZufHr1teo3E7BCu53HprUMRS6yTs="; }) + (fetchNuGet { pname = "Avalonia.Labs.Panels"; version = "11.1.0"; hash = "sha256-OiZYvUZG7BiWwCBQtLGBOE3JJ+Q88Kb/MIJflIEj99A="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.1.3"; hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.1.3"; hash = "sha256-1VCFAJPKpLx9KyM5AK/8XbGtxNpGriQEFqidgN9eCtE="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.0"; hash = "sha256-MAguJ8qTdwvgtEq5SYxyzFNsC90gcBfZxXPkFBEWx5E="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.3"; hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; hash = "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.0"; hash = "sha256-w4ozV8lIs5vxoYP5D5Lut2iTMiJKVPbjdtqDB1sb0MI="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.3"; hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.1.0"; hash = "sha256-6TvmqslBd3l2Fd+HFCyY381EUkCNUGAqzNKEYwQf9qg="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.3"; hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.3"; hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.3"; hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.1.3"; hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw="; }) + (fetchNuGet { pname = "AvaloniaEdit.TextMate"; version = "11.1.0"; hash = "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM="; }) + (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.13.12"; hash = "sha256-Xq7hnNeO1BbJVIlkDKEysJFgxn46eCvpujhQKZrIbt0="; }) + (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.13.12"; hash = "sha256-v3DRb2y0fbp9v8UGl9sou2HKx78SemK0UKh+rdsuv2s="; }) + (fetchNuGet { pname = "BitFaster.Caching"; version = "2.5.0"; hash = "sha256-HUGbbOYdGnWS2XYpgmDsWaAWCZzQFkdPCqfl9OBd5eA="; }) + (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; hash = "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="; }) + (fetchNuGet { pname = "CliWrap"; version = "3.6.6"; hash = "sha256-2fdVlcdgA5Phl/DKas/CKF828GwiJ9L8lB1c1zXU9Qo="; }) + (fetchNuGet { pname = "ColorDocument.Avalonia"; version = "11.0.3-a1"; hash = "sha256-Pkh5FX+4pBzep5oCCyhIiR559QyFCEb1vrfEgG0wREw="; }) + (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.3-a1"; hash = "sha256-fWJuApxnJLISayQJIKEBVOt/t1Qyj+0s+RezZkMnPio="; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; hash = "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="; }) + (fetchNuGet { pname = "coverlet.collector"; version = "6.0.2"; hash = "sha256-LdSQUrOmjFug47LjtqgtN2MM6BcfG0HR5iL+prVHlDo="; }) + (fetchNuGet { pname = "DiffEngine"; version = "12.3.0"; hash = "sha256-vIrZz9dlY+jvQnBoIrI0PCFwnVOfJbJ+GX6v4PqHaR0="; }) + (fetchNuGet { pname = "DiffEngine"; version = "15.4.0"; hash = "sha256-ZzsgNMLghDPQcTJytqBgcJQ6MwL7/MavgCGislckC/0="; }) + (fetchNuGet { pname = "DiffPlex"; version = "1.5.0"; hash = "sha256-6HwA6ZyCn++NAXy6ep9ywSF/Ss+e/nmMhjyeIft9fQw="; }) + (fetchNuGet { pname = "DynamicData"; version = "8.3.27"; hash = "sha256-iPZfL1x36PLf5Lq96zRFvR5OLcoRn7OdJIao98X8wac="; }) + (fetchNuGet { pname = "DynamicData"; version = "8.4.1"; hash = "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4="; }) + (fetchNuGet { pname = "DynamicData"; version = "9.0.4"; hash = "sha256-3pyiJeWRwfaT7p1ArsoR13aI78Jo13aHOEw3BelTS9g="; }) + (fetchNuGet { pname = "EmptyFiles"; version = "4.5.1"; hash = "sha256-7mJ1PfPFeQEE35e+KKKp/QiGbO70gK/xOMFQEv2lPBY="; }) + (fetchNuGet { pname = "EmptyFiles"; version = "8.2.0"; hash = "sha256-8jC8injDZyxginjBLvhAeyta3TTZ6AJXs/buF5h34oE="; }) + (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; hash = "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="; }) + (fetchNuGet { pname = "Fare"; version = "2.1.1"; hash = "sha256-n9X3GE2qsT2wpmDymD1AyCYcOoY/c0+t+aIWLiaST70="; }) + (fetchNuGet { pname = "FlatSharp.Compiler"; version = "7.6.0"; hash = "sha256-bYRnKdem5I/0YAHupyIzpHfndPFNH22QU3MAxlKQ5uQ="; }) + (fetchNuGet { pname = "FlatSharp.Runtime"; version = "7.6.0"; hash = "sha256-rLiWZ8hmDSq5qawXc00zcMxrH/Zi/IlZOrXRx4e6SdQ="; }) + (fetchNuGet { pname = "FluentAssertions"; version = "6.12.0"; hash = "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE="; }) + (fetchNuGet { pname = "FluentAssertions.Analyzers"; version = "0.31.0"; hash = "sha256-eQCPS/c+zyRMLgAVggdelLAHVSlqdgDGKIICQxRUdcw="; }) + (fetchNuGet { pname = "FluentAssertions.OneOf"; version = "0.0.5"; hash = "sha256-T/yzpRPwEKh0r6JUPgH2GYkSt36PqOZYr9Qi0grGczo="; }) + (fetchNuGet { pname = "FluentResults"; version = "3.15.2"; hash = "sha256-NhS7sLhgXDAI4Qwb285HWRtPfUDN6K0tTkKx2QRsI9w="; }) + (fetchNuGet { pname = "Fody"; version = "6.8.0"; hash = "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg="; }) + (fetchNuGet { pname = "FomodInstaller.Interface"; version = "1.2.0"; hash = "sha256-sxylVEA7uiaBtxbQHAeRElsVbZPIj2nm27Ozlik8wmg="; }) + (fetchNuGet { pname = "FomodInstaller.Scripting"; version = "1.0.0"; hash = "sha256-GNqbLS+lU6aNThUUCfJpmZgP+rd4lF0fKyfMn2Y7Ckg="; }) + (fetchNuGet { pname = "FomodInstaller.Scripting.XmlScript"; version = "1.0.0"; hash = "sha256-fbekooynf0jQD0k0zbYueDvOTxPa3FIZUKjCcVMPeeY="; }) + (fetchNuGet { pname = "FomodInstaller.Utils"; version = "1.0.0"; hash = "sha256-H0Fc79msO6GhYstzqtZk9ttRcqxtXuDT9v0zQBwDRHI="; }) + (fetchNuGet { pname = "GameFinder"; version = "4.2.4"; hash = "sha256-weK14/DduSymh7G5SaxQH3PsJsvAe9sDdRrrQOsX0aM="; }) + (fetchNuGet { pname = "GameFinder.Common"; version = "4.2.4"; hash = "sha256-YPVBPHoBDreQlITXIff/jbQpDczZPQ4mKNrcz3xKzyQ="; }) + (fetchNuGet { pname = "GameFinder.RegistryUtils"; version = "4.2.4"; hash = "sha256-xqr6HK6smT2JHUL2+vV8qj1pfywjJbhIwEGxK0PJV0s="; }) + (fetchNuGet { pname = "GameFinder.StoreHandlers.EADesktop"; version = "4.2.4"; hash = "sha256-kRuw1sYg+9Zv92prYhFKdihD/IazeAFb9GO3oeHxF+I="; }) + (fetchNuGet { pname = "GameFinder.StoreHandlers.EGS"; version = "4.2.4"; hash = "sha256-cJNt7RJ/Zeo+9ECPWKxaseomm9alkrkYMl8uHuy6B6I="; }) + (fetchNuGet { pname = "GameFinder.StoreHandlers.GOG"; version = "4.2.4"; hash = "sha256-YwqM2j0FVB+afVkkcw1jOTiRkqehaJM3fvw66f3zz8U="; }) + (fetchNuGet { pname = "GameFinder.StoreHandlers.Origin"; version = "4.2.4"; hash = "sha256-npSZ4VieuOSe5BnunF6aDoKuH+4gX2RZtnKhUZVF1Cc="; }) + (fetchNuGet { pname = "GameFinder.StoreHandlers.Steam"; version = "4.2.4"; hash = "sha256-GFQe3JszsCaq7WBX6+DDXyQEubnV6uoGmBGVMgGj+bA="; }) + (fetchNuGet { pname = "GameFinder.StoreHandlers.Xbox"; version = "4.2.4"; hash = "sha256-TuUqhl4RDz40x6iYqiaAZT0yfP+N801h+7k22bXWIMs="; }) + (fetchNuGet { pname = "GameFinder.Wine"; version = "4.2.4"; hash = "sha256-wdZ4ulm7jbEpWXWtmErQ73Mj7Pbe9GFugjWdQID8YYg="; }) + (fetchNuGet { pname = "Gee.External.Capstone"; version = "2.3.0"; hash = "sha256-wdYT/F8SLL72OIVv/Q/hfLMfhlWMnhDNCTWx+wWlPoU="; }) + (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.3.3"; hash = "sha256-/TxZ7f3AvArXXe6isyom6ZHLFZR2hi1ejaQuY/6KN4s="; }) + (fetchNuGet { pname = "Google.Protobuf"; version = "3.22.5"; hash = "sha256-KuPCqobX6vE9RYElAN9vw+FPonFipms7kE/cRDCLmSQ="; }) + (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.52.0"; hash = "sha256-ISgN3zWwvV8qD7JFkaYveLbke09+UtUBy3Tux+ZHLNc="; }) + (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.52.0"; hash = "sha256-4Rhb8PIoV2BiohfRwzx1GYDPbcfqxGAmL2uB0atFFTk="; }) + (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.52.0"; hash = "sha256-XoY+jt+JIt6SzvCjUSXKKa9Q8Bu5UrNJv2z1hCBKDrY="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; hash = "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; hash = "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0.2"; hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; hash = "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; }) + (fetchNuGet { pname = "HotChocolate.Language.SyntaxTree"; version = "13.9.12"; hash = "sha256-P3URpDpomujoYqFrBxj8uwJsuUJvvfyDKkXw0v6ROrY="; }) + (fetchNuGet { pname = "HotChocolate.Transport.Abstractions"; version = "13.9.12"; hash = "sha256-Mnlmb0OYEuWpbNhvm1GHaUmyEXsuijGmFZXRlfG7Sxo="; }) + (fetchNuGet { pname = "HotChocolate.Transport.Http"; version = "13.9.12"; hash = "sha256-3aW+ZSy8h6AB3nLuq8hYtp0i5slviA3ZpB//AOPOqP4="; }) + (fetchNuGet { pname = "HotChocolate.Utilities"; version = "13.9.12"; hash = "sha256-PW88yHRQIOW5Rmvp98oRxDMkGRCFC1ajxWHadYHuaok="; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.52"; hash = "sha256-52YYrpZKJO1MrgST7K2u8SY00YyKvg43J4AMIw83BAQ="; }) + (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; hash = "sha256-1wGwf5KAmDeiH0Dz8KcTdZw+UMkiNsjKOIOt/VJnnqE="; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.2.0"; hash = "sha256-5Q6oRaV8wHPONHreKvB74VjV2FW36mwC3n+05It5vyI="; }) + (fetchNuGet { pname = "Humanizer.Core.af"; version = "2.14.1"; hash = "sha256-8CCgI7OweSa53cZWZBXQ8a7VVt/NPP16zHVBZvzU9KQ="; }) + (fetchNuGet { pname = "Humanizer.Core.ar"; version = "2.14.1"; hash = "sha256-JRoP+brQgYBZI8OccH/jaM1Z482ZWBiqU2XL3KsIPw8="; }) + (fetchNuGet { pname = "Humanizer.Core.az"; version = "2.14.1"; hash = "sha256-ubwkbes9zrrisuXTcT4ZgOAiFsUieC6OLd4pgzxsE40="; }) + (fetchNuGet { pname = "Humanizer.Core.bg"; version = "2.14.1"; hash = "sha256-Xv6DP1xxxGVUfP44TZasWpxgQ/DkriljvmIMtHf+nGk="; }) + (fetchNuGet { pname = "Humanizer.Core.bn-BD"; version = "2.14.1"; hash = "sha256-6JpReIc3fkExvJIXzk6fUw56wJ78aTEg1dWQ6o+dQow="; }) + (fetchNuGet { pname = "Humanizer.Core.cs"; version = "2.14.1"; hash = "sha256-MGL86KxSbz0PkDo9+NRj6h1fDjPZXlxAtYNf0Zreg/4="; }) + (fetchNuGet { pname = "Humanizer.Core.da"; version = "2.14.1"; hash = "sha256-Gpw8kJbgz0KQS2mGY5tmrHqpgUO4abD7dSKIy//ONYM="; }) + (fetchNuGet { pname = "Humanizer.Core.de"; version = "2.14.1"; hash = "sha256-Eswv8aEQoxI9MZr2CvWtBUn5X9JRZTWQjRzHJkGj80g="; }) + (fetchNuGet { pname = "Humanizer.Core.el"; version = "2.14.1"; hash = "sha256-wCK2Uy/AV6FxPUSUM0NMbV14pAP+ss25AaVAHMQIeJA="; }) + (fetchNuGet { pname = "Humanizer.Core.es"; version = "2.14.1"; hash = "sha256-iEHiQXKwg0ABDxh//HSrzwaVOlilQBFI96+GYzzTMwQ="; }) + (fetchNuGet { pname = "Humanizer.Core.fa"; version = "2.14.1"; hash = "sha256-2Js7k3nvwJvxAjq3yoLn7PUY2S8+vXfgESwU4SbvjaA="; }) + (fetchNuGet { pname = "Humanizer.Core.fi-FI"; version = "2.14.1"; hash = "sha256-jOWo43r3dhiBsV9cCoDfqK/YqWj5LejZsnfkG6mlkpA="; }) + (fetchNuGet { pname = "Humanizer.Core.fr"; version = "2.14.1"; hash = "sha256-WCbA+f4B3g/ml7KrkHkzpU2Fj38HtWc/ujoVY5F3lk4="; }) + (fetchNuGet { pname = "Humanizer.Core.fr-BE"; version = "2.14.1"; hash = "sha256-GydVmoEy+lwEQ1nM39QXSRhYNchqM47p7qhUEimN4Cw="; }) + (fetchNuGet { pname = "Humanizer.Core.he"; version = "2.14.1"; hash = "sha256-MMf3qjJ+yzxjMxOR7wMWf+eErxWLqpsdWKFhjNCOsyM="; }) + (fetchNuGet { pname = "Humanizer.Core.hr"; version = "2.14.1"; hash = "sha256-kBv2I9ns6L6D4XfXfyZS1VM6+YwF4yUkCmCA5zqvsok="; }) + (fetchNuGet { pname = "Humanizer.Core.hu"; version = "2.14.1"; hash = "sha256-vRje+kxqOsl1JCXAE0yDKvauUumzuEhNcnhNsdIdgVM="; }) + (fetchNuGet { pname = "Humanizer.Core.hy"; version = "2.14.1"; hash = "sha256-UL7PsK4msT5c96lk70/bVAxN63B71l8VOFtvuJQH9a0="; }) + (fetchNuGet { pname = "Humanizer.Core.id"; version = "2.14.1"; hash = "sha256-nIl64gCuZh4D527qI2hfQRvzt1mTJUCDGMIZwpS3C/A="; }) + (fetchNuGet { pname = "Humanizer.Core.is"; version = "2.14.1"; hash = "sha256-38vUQ1aVtlhK15kP9ZlDO0Nl0DcOA5iHx6F2SPN1gYM="; }) + (fetchNuGet { pname = "Humanizer.Core.it"; version = "2.14.1"; hash = "sha256-4ne0VRNi9OAj3bGCQgCy1BNYKMizoHykJ/lchmCsWdc="; }) + (fetchNuGet { pname = "Humanizer.Core.ja"; version = "2.14.1"; hash = "sha256-oAilMM8J6LumV6qv3gSIBNTm7u2L4vV38cQXtME3PhM="; }) + (fetchNuGet { pname = "Humanizer.Core.ko-KR"; version = "2.14.1"; hash = "sha256-b70HQl2IWVPATtaYGDyJ+Z6ioPtrM53vXzfTCHYgxpQ="; }) + (fetchNuGet { pname = "Humanizer.Core.ku"; version = "2.14.1"; hash = "sha256-8LiEH7MaapMtkHFMj7Y3pG+g0QYuIa5gD3VR9nYQn+k="; }) + (fetchNuGet { pname = "Humanizer.Core.lv"; version = "2.14.1"; hash = "sha256-zyCsE5cD++u5shNIqCQUd+66FkUWOl+NfFrs2JduCaQ="; }) + (fetchNuGet { pname = "Humanizer.Core.ms-MY"; version = "2.14.1"; hash = "sha256-pSdZLUi9oWo78nBh2DJunPhDR7THdZSZP0msCVbPsrY="; }) + (fetchNuGet { pname = "Humanizer.Core.mt"; version = "2.14.1"; hash = "sha256-mkX2reEvNpx9w6gtZw+6bkrnj3Di1qgVDMr9q0IeKCw="; }) + (fetchNuGet { pname = "Humanizer.Core.nb"; version = "2.14.1"; hash = "sha256-QvYJHqjO/SrelWYgtm8Sc7axs7J8wbJE+GbTgVw5LYs="; }) + (fetchNuGet { pname = "Humanizer.Core.nb-NO"; version = "2.14.1"; hash = "sha256-YW8y2XkmHjwqf2fztNB3rsn3+CgslF1TclITwp0fA9g="; }) + (fetchNuGet { pname = "Humanizer.Core.nl"; version = "2.14.1"; hash = "sha256-bQM7aXNQMBY+65NfMVQz/xYz9Ad2JC+ryXoB4lcYgmA="; }) + (fetchNuGet { pname = "Humanizer.Core.pl"; version = "2.14.1"; hash = "sha256-IrPxHI4uQvBeMM9/8PaNueKwVkbN+1zFQlNWRjNfXEA="; }) + (fetchNuGet { pname = "Humanizer.Core.pt"; version = "2.14.1"; hash = "sha256-XrlC15HNJFmDwLpHIUHb3Bec9A79msQCRB9Dvz8w4l0="; }) + (fetchNuGet { pname = "Humanizer.Core.ro"; version = "2.14.1"; hash = "sha256-llXtfq4Tr5V2Q4dVD7J0IKITtpiWrFs50DAtJhcSuRI="; }) + (fetchNuGet { pname = "Humanizer.Core.ru"; version = "2.14.1"; hash = "sha256-lD0dB3mkbFfGExwVWZk6fv24MyQQ8Cdv5OrleuZeChg="; }) + (fetchNuGet { pname = "Humanizer.Core.sk"; version = "2.14.1"; hash = "sha256-EmyE+wssZwY6tAuEiFXGn5/yzVMZe7QEuTjOcByOXaA="; }) + (fetchNuGet { pname = "Humanizer.Core.sl"; version = "2.14.1"; hash = "sha256-sWWxh7KZ8Y3Ps6GbBOHbU2GMsNZfkM+BOnUChf3fz4s="; }) + (fetchNuGet { pname = "Humanizer.Core.sr"; version = "2.14.1"; hash = "sha256-/bA3LULRFn5WYmCscr5R5vaFRjeHC0xjNiF7PXEJ8r0="; }) + (fetchNuGet { pname = "Humanizer.Core.sr-Latn"; version = "2.14.1"; hash = "sha256-43+o6oj0UNRJKiFoh57MGPSzlsWAq0eRtzlCrewDmVM="; }) + (fetchNuGet { pname = "Humanizer.Core.sv"; version = "2.14.1"; hash = "sha256-9lXrHveKDs1y/W3Qxd+MVcohhKEU7zNPx21GBVPp/rA="; }) + (fetchNuGet { pname = "Humanizer.Core.th-TH"; version = "2.14.1"; hash = "sha256-ldCsXINSvL2xom0SCtVQy+qX1IN5//EUoyIOwXiJ3k8="; }) + (fetchNuGet { pname = "Humanizer.Core.tr"; version = "2.14.1"; hash = "sha256-VZnO1vMXiR7egKEKJ6lBsj7eNgxhFzakFWsYYRW4u2U="; }) + (fetchNuGet { pname = "Humanizer.Core.uk"; version = "2.14.1"; hash = "sha256-rdvleUrKbj3c06A0O2MkgAZLtXLro9SPB1YqAGE1Vyg="; }) + (fetchNuGet { pname = "Humanizer.Core.uz-Cyrl-UZ"; version = "2.14.1"; hash = "sha256-Qso1Iz9MTLs63x4F00kK31TZAN4AoFaFsuVzM+1z38k="; }) + (fetchNuGet { pname = "Humanizer.Core.uz-Latn-UZ"; version = "2.14.1"; hash = "sha256-sVnkZTuEaHfMJIAZmSCqsspnKkYxK9eVBQZnAAqHNW4="; }) + (fetchNuGet { pname = "Humanizer.Core.vi"; version = "2.14.1"; hash = "sha256-5wDt72+HdNN3mt/iJkxV9LaH13Jc1qr1vB4Lz8ahIPs="; }) + (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; hash = "sha256-Z3qfFWyovcVT4Hqy51lgW2xGwyfI//Yfv90E0Liy1sw="; }) + (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; hash = "sha256-BTGkMEkQYJKRp858EU7hwNOdsHRT+w6vAMa6H8JIyX4="; }) + (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; hash = "sha256-N3D1z5aoGwAZ6+ZxrWMtXgacvQcgDG+aLrQQI9uysmM="; }) + (fetchNuGet { pname = "Iced"; version = "1.17.0"; hash = "sha256-6/5E5v5mqSG7yiE2zHUChZZeC47NRgLzQFD4+7bqKaU="; }) + (fetchNuGet { pname = "ini-parser-netstandard"; version = "2.5.2"; hash = "sha256-idb2hvuDlxl83x0yttGHnTgEQmwLLdUT7QfMeGDXVJE="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; hash = "sha256-/Eykez68qYMO5mlmUelzAke8aJehyp8fspO5Z+yt5G4="; }) + (fetchNuGet { pname = "K4os.Compression.LZ4"; version = "1.3.7-beta"; hash = "sha256-mMNIMLSXnKFF3oAgX+k/n0wipxyRDGE1z2BrI2+7ALc="; }) + (fetchNuGet { pname = "LinqGen"; version = "0.3.1"; hash = "sha256-Yyt1uShHigHVCIjPT8jL2Kth9L9yq1MGrCM5w2+tj9o="; }) + (fetchNuGet { pname = "LiveChartsCore"; version = "2.0.0-rc2"; hash = "sha256-JSw2bwHOvUDx+axSufcvKSD9RPmqi366tbiIcsym3As="; }) + (fetchNuGet { pname = "LiveChartsCore.SkiaSharpView"; version = "2.0.0-rc2"; hash = "sha256-tKBTT75B77po0jDqWJL0mOzXkCKmHAGPlQV3biKtZdw="; }) + (fetchNuGet { pname = "LiveChartsCore.SkiaSharpView.Avalonia"; version = "2.0.0-rc2"; hash = "sha256-pHMtCkoz4sz2MLlVGFbFwwONLC3vzy+9Cg0OmEJ+f/s="; }) + (fetchNuGet { pname = "Magick.NET-Q16-AnyCPU"; version = "13.8.0"; hash = "sha256-KbnkvMxZiw8P/YYU1wKN8ptFzbSTd8KRMj7tvdxwI5Y="; }) + (fetchNuGet { pname = "Magick.NET.Core"; version = "13.8.0"; hash = "sha256-7nxM6i4VbMOi3ETLGLf59KQg1ZUhLLBzPJQU4flNYsE="; }) + (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.3-a1"; hash = "sha256-KkRzr8BXmUCGCVv/64gg1aiXHUY0yGj5t12OsYAidcw="; }) + (fetchNuGet { pname = "MartinCostello.Logging.XUnit"; version = "0.3.0"; hash = "sha256-RhcRcww2ZYaB1ZZ/qRN95fMffcsfqP4EKLVeR4+5S9A="; }) + (fetchNuGet { pname = "MemoryPack"; version = "1.21.1"; hash = "sha256-FMtUCr66kAFj/6oFZyCg16BVh9yTJK+vKLSKo2VZFac="; }) + (fetchNuGet { pname = "MemoryPack.Core"; version = "1.21.1"; hash = "sha256-Frjo5sha/5O3OsLG6ProZ5eAXSxicedjyXfPCx2dM0E="; }) + (fetchNuGet { pname = "MemoryPack.Generator"; version = "1.21.1"; hash = "sha256-o86imC1OyV5teN+sKujffkPDvcITk1l763jFNYyILDY="; }) + (fetchNuGet { pname = "MemoryPack.Streaming"; version = "1.21.1"; hash = "sha256-eOttUpzWeMD0s+49p0sxFc1h+FM7wkU/n2Q4e0S8d2s="; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) + (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; hash = "sha256-CCytWp0v8C6NZa+o4cRXvA2u/ZOEA3TiG9+luszAwes="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "8.0.7"; hash = "sha256-s6p/nbnuzbLDtZgICsLTXah9wFVSBMwoW7BV7UhB2LQ="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; hash = "sha256-QYVojfqSZKbF8P6D/aacfxfumMaRUD9SEEQbzw73Bbc="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzer.Testing"; version = "1.1.1"; hash = "sha256-3w7g0KhG16ZH8rYK9FxP15qbd+hTgwRDpDJEKpDMHu8="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; hash = "sha256-pDeaMqX7a01Hp1Qd9P/y/B2rEGAv2eIY0Ld/klBZW5g="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; hash = "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "1.0.1"; hash = "sha256-jjWtdrHSISgBF1m94P0DsVbQa4YxKnf2CWRWYHQLTG8="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.1.0"; hash = "sha256-g3RLyeHfdOOF6H89VLJi06/k8/eJ6j2dgNYZ/MBdfNU="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.7.0"; hash = "sha256-nDDpCy8WQADxo7LzWkDupuxs0GCjvuhX8EeKpjTnRP4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.8.0"; hash = "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.1.0"; hash = "sha256-pM9WXvxZI3SS89CGVjxqtAyZyfyiZQzW0UnNCDiQrQA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.7.0"; hash = "sha256-0FoP+zHqbhLhyjTPx8I7MCfHqCbmhwE8aRCVe4eC49M="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.8.0"; hash = "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing"; version = "1.1.1"; hash = "sha256-nX4GSfovb8K4cD9xFEKXcRXVDNmXyWOaAAVQ/XfvAFk="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit"; version = "1.1.1"; hash = "sha256-QAQ87pM9sr+8uqwDSXR39x3wtx82jVGcdTJPmwDSB2Y="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "3.8.0"; hash = "sha256-i6PTXkHepgTXseFFg57iRh5thKtKYc9CH11y/qzDy8k="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.8.0"; hash = "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.SourceGenerators.Testing"; version = "1.1.1"; hash = "sha256-d4zoBTjX9DAwIZfGAa9as5vE/BIshKIov4GepT9l1vg="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Testing.Verifiers.XUnit"; version = "1.1.1"; hash = "sha256-WOo0pITkG6CZwJ9MiLaCMSbjbBOxn7+tlpjJGn//gnc="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "1.0.1"; hash = "sha256-/SYPkq5LhOoEWi+rcBZDyQL2U0cQk2YrykNJODrRLVs="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "3.8.0"; hash = "sha256-3D7xV3V1WsUU9OMMEOj+z9GouCDKXSBC4Z/Szs/OcWE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.8.0"; hash = "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; }) + (fetchNuGet { pname = "Microsoft.Composition"; version = "1.0.27"; hash = "sha256-G/3p3zxOWC8HqLt7Ll5cqN7507F6N/G6G/HzKazQRdE="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.251802"; hash = "sha256-9ZH4rrfACzJP5oiarDW4cD2nczv1SNgZr4GW1J9hlUA="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.2.332302"; hash = "sha256-5R9xK0owZEhXsucqPKnPaTiwhXBnLo92L2AY7IjyxNg="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.0.2"; hash = "sha256-BHuiTEkA76/9QIR9MG8SBhdExgKFFGd//2RjX8V3XJM="; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; hash = "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.AmbientMetadata.Application"; version = "8.8.0"; hash = "sha256-NpjB1NRrxvP9jxKE7PIkZX8NqV0ezvqUpIf6zdAseOY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Compliance.Abstractions"; version = "8.8.0"; hash = "sha256-1rTxblh/CF/Zj9UZEFXzGNdVTIxJk6XLaI7DUJtf4sY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.1"; hash = "sha256-pnO6GdmnPJ8D4pmMpkxwgM4GggwGd2Uk+5s6OfJnhAg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.1"; hash = "sha256-3DdHcNmy+JKWB4Q8ixzE4N/hUAvx2o4YlYal4Riwiyw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.1.1"; hash = "sha256-FVdAa88PLAbWXTnEoa7AVSaC9AEjQ66LoxdtJ5nRIVk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.1"; hash = "sha256-KYPQYYspiBGiez7JshmEjy4kFt7ASzVxQeVsygIEvHA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.2"; hash = "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "8.0.0"; hash = "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; hash = "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; hash = "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; hash = "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "8.0.0"; hash = "sha256-/yj5QaEzeRStvOFoBpPRPXlEehGtr2E6/rJb+OEPIK8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; hash = "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.1"; hash = "sha256-BMU00QmmhtH3jP5cepJnoTrxrPESWeDU0i5UrIpIwGY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.1"; hash = "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.AutoActivation"; version = "8.8.0"; hash = "sha256-uTm4lum+ZW3pE3gk6MAsMWfOflSW053krTKB89l6rHU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; hash = "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.ExceptionSummarization"; version = "8.8.0"; hash = "sha256-Z5jSViqaNyhKWeco9TG0vfpQjLSo9DQVPaPUFUM9rKE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; hash = "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; hash = "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "8.0.0"; hash = "sha256-sKHa+w4/pMeQb5RRFqLtMTUJy5H6hSIGWchbH2pxSrg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "8.0.0"; hash = "sha256-UgljypOLld1lL7k7h1noazNzvyEHIJw+r+6uGzucFSY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http.Diagnostics"; version = "8.8.0"; hash = "sha256-EmAaQp4kZoqRtNFyNJRi7NRNtBtG9QgphbURD6N2XMg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http.Resilience"; version = "8.8.0"; hash = "sha256-jb3xaCWOq2398OBNVJW5fN6vI6Lrh/LrReFqLajmQAM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; hash = "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.1.1"; hash = "sha256-HnEBmAhweBalCAeX+KZ4kEL3GXEVDBg6Uq4H4LJ56oo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; hash = "sha256-cBBNcoREIdCDnwZtnTG+BoAFmVb71P1nhFOAH07UsfQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.1"; hash = "sha256-TzbYgz4EemrYKHMvB9HWDkFmq0BkTetKPUwBpYHk9+k="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.0.3"; hash = "sha256-UFawgCAhbN5HCtJy39XO4sz5N/P/Zyrs0uqrQHc4SPI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.1"; hash = "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; hash = "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; hash = "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "8.0.0"; hash = "sha256-AJunzYBZM2wCg86hnPnMrBuWIIyW/4PnIVoDSU969cA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "8.0.0"; hash = "sha256-vXBm4yhWGP4uow0CqstuqOkxO8yeZEM15JTTenjPbhc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "8.0.0"; hash = "sha256-kaR7YOlq5s8W9nZDtH/lKtnfGbrgOuQY4DUPcA2lcj0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.0"; hash = "sha256-FxFr5GC0y6vnp5YD2A2vISXYizAz3k/QyrH7sBXP5kg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.6"; hash = "sha256-GnQgqdQTsoLj09avT9k7ypbbTHKoD61J2Pma4Jm/Pq8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.7"; hash = "sha256-/EEXpvNddZkw4gbPXIFnAtk8XynR4Q9Mjt+LUHFUOfk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.8"; hash = "sha256-9AZmxZ4YcUgHOxxdmklJdIlQSGg7C9BLVz9cvaDdu5c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; hash = "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.1.1"; hash = "sha256-dCPA56Wv9cLuz720PmVbk2oXda1t9ZSAlP8/clDU93E="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.2"; hash = "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; hash = "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.1"; hash = "sha256-nbu2OeQGWeG8QKpoAOxIQ8aPzDbWHgbzLXh55xqeeQw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Resilience"; version = "8.8.0"; hash = "sha256-DC50kxl/0uLUvgj/HkTroWijAG44NF73Mj4KB5xzOEU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Telemetry"; version = "8.8.0"; hash = "sha256-IFc6yDT5sQdNku6CQ2+KgVOpo9XREXzKyeDCf8m0gtg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Telemetry.Abstractions"; version = "8.8.0"; hash = "sha256-cqLl/v1oxP1mHhZ1lC3zcYK+C1YAif38vKyfs8ls2FU="; }) + (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.0"; hash = "sha256-WBXkqxC5g4tJ481sa1uft39LqA/5hx5yOfiTfMRMg/4="; }) + (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "8.0.7"; hash = "sha256-mCj/NsgRdeMx+PS7sFUzLMUQfi4rEbwcpJ0mJUlddWM="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.1"; hash = "sha256-KfqM1E0jhAg07QfpjfEcjQ+HX13XZfdvveT5qxm89Sk="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; }) + (fetchNuGet { pname = "Microsoft.VisualBasic"; version = "10.0.1"; hash = "sha256-7HHzZcWLVTTQ1K1rCIyoB+UxLHMvOIz+O5av6XDa22A="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Composition"; version = "16.1.8"; hash = "sha256-yFT4t3Uk31R5EPdAxxsTAmRuiv58MlYoYL4JT1ywlHQ="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Composition.NetFxAttributes"; version = "16.1.8"; hash = "sha256-FFemIG+m8RWUPo5W+kCHPh5Yn4fGS+tpjGiQTcT0sAE="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.10.48"; hash = "sha256-WL8c7TjDBHGjsVLMMPf9cin8rirzOdxusEBQlkUfiVU="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.48"; hash = "sha256-EvZGbyxtrJDvHZwsQbZDXtVfWiy0f58oCdTdSzD34wI="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.0.82"; hash = "sha256-7JFaA/HZHVjsEtTh/iHDRLi5RcuA39KKvvCkuI4JQFc="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; hash = "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; hash = "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; hash = "sha256-50XwFbyRfZkTD/bBn76WV/NIpOy/mzXD3MMEVFX/vr8="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) + (fetchNuGet { pname = "Nerdbank.FullDuplexStream"; version = "1.1.12"; hash = "sha256-PZwy+qQ8nOdH5gRRQ24go2yh+YmZQhziwbyWC+1qoJc="; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.11.74"; hash = "sha256-asIdaqCIjZspTA+hhtjKNajpCo+ZQi3erZLCpBQ5No4="; }) + (fetchNuGet { pname = "NetEscapades.EnumGenerators"; version = "1.0.0-beta07"; hash = "sha256-SYIuk1B2birutYx6d0vbCshEd8ZEH0pDVrNm9daBxwY="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; hash = "sha256-ExWI1EKDCRishcfAeHVS/RoJphqSqohmJIC/wz3ZtVo="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; hash = "sha256-qofIFqViDsdBOE/X0IvzfGUklSrULaH8MoZQ+YrcMOQ="; }) + (fetchNuGet { pname = "NexusMods.Archives.Nx"; version = "0.5.0"; hash = "sha256-wt5kkxSotShfW8W+hgxVx/OaWLH006WfGknDFc9TbIU="; }) + (fetchNuGet { pname = "NexusMods.Hashing.xxHash64"; version = "2.0.1"; hash = "sha256-LSSle8oclFougCUt3dS4syTa856WOWfSZmlBcl7QYhc="; }) + (fetchNuGet { pname = "NexusMods.MnemonicDB"; version = "0.9.81"; hash = "sha256-THWqUE2Vy1slRlivaJ54Cy9klippTkae7QeF5hIGnAA="; }) + (fetchNuGet { pname = "NexusMods.MnemonicDB.Abstractions"; version = "0.9.81"; hash = "sha256-kRSCLCG4FUBsMtu+DOap1CzsNZ1wgZ3ioa6w1vH4Zmc="; }) + (fetchNuGet { pname = "NexusMods.MnemonicDB.SourceGenerator"; version = "0.9.81"; hash = "sha256-+GfWUx/Og2bdvriOyNULh+kOX6di6KgLW3azLSkTRDo="; }) + (fetchNuGet { pname = "NexusMods.Paths"; version = "0.10.0"; hash = "sha256-tzUKPBrGNyZvVgScDAP0qvVF5nV6635v3NlBvzpnz1M="; }) + (fetchNuGet { pname = "NexusMods.Paths"; version = "0.9.4"; hash = "sha256-W8dIcHvJjhTX2AqjrPBCDpGhDBrJLZ9IewSVo7ffwog="; }) + (fetchNuGet { pname = "NexusMods.Paths"; version = "0.9.5"; hash = "sha256-30IlPuu35i0VrUJSaLy86wSYwVCIDgdZc2HctnKuo6o="; }) + (fetchNuGet { pname = "NexusMods.Paths.Extensions.Nx"; version = "0.10.0"; hash = "sha256-DktYpARh+UwtrjSYck5dtuQ3YyroZqTJysAZ6jxneEU="; }) + (fetchNuGet { pname = "NexusMods.Paths.TestingHelpers"; version = "0.9.5"; hash = "sha256-X8NtP1fqlmywOFk036zE0pDu88NOHzO3zKPzZSd2Aew="; }) + (fetchNuGet { pname = "NLog"; version = "5.3.2"; hash = "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc="; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; hash = "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g="; }) + (fetchNuGet { pname = "Noggog.CSharpExt"; version = "2.64.0"; hash = "sha256-t1V6l01P299yJCQiMtCsUp6tW61vfLZBeAUEAqYuLRg="; }) + (fetchNuGet { pname = "NSubstitute"; version = "5.1.0"; hash = "sha256-ORpubFd6VoRjA9ZeyZdJPY/xnQXM90O6McMswt8VVG4="; }) + (fetchNuGet { pname = "NSubstitute.Analyzers.CSharp"; version = "1.0.17"; hash = "sha256-HyMhNJMze3ALJbl71pprjuLCqS+KLA/bOeX4Sng/eb4="; }) + (fetchNuGet { pname = "NuGet.Common"; version = "5.6.0"; hash = "sha256-uc/gCpcfugMjulqDVpS0ryfcaVBtmKyho07g3M8o//g="; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "5.6.0"; hash = "sha256-K5A66u9WPz8PZYIl+DDyCAodYGUJfLdNNix6f5F7adI="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.6.0"; hash = "sha256-iMacMTcuvemRQ4p3gv/3MioC/OEDOju8rnmZioWq9bc="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; hash = "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g="; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "5.6.0"; hash = "sha256-bl/A1QbIJAu/GpzKOKjGwe7NrTXlYH5s3ppJ6mYAoQk="; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "5.6.0"; hash = "sha256-faY3xEk4g9xQFRT7DspGmlVLRGH1r4Vvr5VLT9sLUf8="; }) + (fetchNuGet { pname = "NuGet.Resolver"; version = "5.6.0"; hash = "sha256-wAiARlBJtCjP482a0jnZKpZBbHRl3voXYMTz3WEox04="; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "5.6.0"; hash = "sha256-3HKwW3hhTuwkZM5n02VFe8yDZbCLgqNE8gI+pqFTToI="; }) + (fetchNuGet { pname = "ObservableCollections"; version = "3.0.1"; hash = "sha256-68fxRcRCABrtaXdRIPJfYLf0N3t9Ef/39x1PYACmhhc="; }) + (fetchNuGet { pname = "ObservableCollections.R3"; version = "3.0.1"; hash = "sha256-/bVupneAnYJw3v7ZIcmBmCHSK0bnEMPHxkjqLNqBrf0="; }) + (fetchNuGet { pname = "OneOf"; version = "2.1.125"; hash = "sha256-3XkBNSEMwlNyNpY/H2gtJ47Mc7905p/CJH9d/VJyO3s="; }) + (fetchNuGet { pname = "OneOf"; version = "3.0.271"; hash = "sha256-tFWy8Jg/XVJfVOddjXeCAizq/AUljJrq6J8PF6ArYSU="; }) + (fetchNuGet { pname = "OneOf.Extended"; version = "2.1.125"; hash = "sha256-wJaz49zNFzZwSpMTeabEoJR65Kvk7NCrAqyTKxjfFkg="; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.1"; hash = "sha256-AldbsateY7uhKy/0JM2sEgiOF1wGr5CwTifsuH6Tnuo="; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.1"; hash = "sha256-xdMOKY90bGTcvRdBsBqj08Du3qRmDC1BecX+aK3dTTA="; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.1"; hash = "sha256-j4XUh9cnF5SbyhRoNwjOWS3EXIl9ZSEFgkJZjQEN2lM="; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.OpenTelemetryProtocol"; version = "1.8.1"; hash = "sha256-smQQOI5i7lG0nnv5CHvzIjCQkago1z+E4W/rnn19iCA="; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.1"; hash = "sha256-uA8Lfof/cvQknxBoSDBxTdljAA+oMCOSiUVIsbBOcQc="; }) + (fetchNuGet { pname = "Pathoschild.Http.FluentClient"; version = "4.3.0"; hash = "sha256-F8895rKyjJ0XGo21IjR+qp5BpLaYn9LxMMQ3TRDY7JQ="; }) + (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; hash = "sha256-nllshKuHU+1jSBfcTz8BTJTGr1TeCFvxjM4OPyLGSgQ="; }) + (fetchNuGet { pname = "Polly"; version = "8.4.1"; hash = "sha256-CPFw0j6f2P5LfcoFAHo1RRDnCx6SXnp8gzHnwYDnYhY="; }) + (fetchNuGet { pname = "Polly.Core"; version = "8.4.1"; hash = "sha256-EksA3U5cmsri2joM+SMtbdwOUMUVxIXT8DnH4DSAIpA="; }) + (fetchNuGet { pname = "Polly.Extensions"; version = "8.4.1"; hash = "sha256-uLBo6enk9L+S1bPtazfZ/GmUKjDNQOnX3lsqJj7wyrE="; }) + (fetchNuGet { pname = "Polly.RateLimiting"; version = "8.4.1"; hash = "sha256-J6wvD0bVk9+KRb80LkCe9qWRjSd5O2rH/dMDVTKL53A="; }) + (fetchNuGet { pname = "Projektanker.Icons.Avalonia"; version = "9.3.0"; hash = "sha256-rg5XoaMV88f66i4wl7Pe0AMWrPHUwu9QJfPVYnFOgsI="; }) + (fetchNuGet { pname = "Projektanker.Icons.Avalonia.MaterialDesign"; version = "9.3.0"; hash = "sha256-VZR5fR28aLGFKiThbZriPQxbwRFk2Pfrggff8aCO/bs="; }) + (fetchNuGet { pname = "R3"; version = "1.0.0"; hash = "sha256-CikGDRUi/EDN2j32cBRl0g+QtdCVYPUizBt41oSVlUA="; }) + (fetchNuGet { pname = "R3"; version = "1.2.8"; hash = "sha256-XUKt8G668ZhjGVuiyaCtqrrVWj8EBL5CqbOiI5fADz4="; }) + (fetchNuGet { pname = "R3Extensions.Avalonia"; version = "1.2.8"; hash = "sha256-zZ/woG2RkecT60/0167Tk0MC4K1sc+/BdR8owW+Vg9Q="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "19.5.41"; hash = "sha256-FsdD1lBZyegqOVzJhZHAz1owCLh7GbVUYXiORbo5euk="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "20.1.1"; hash = "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE="; }) + (fetchNuGet { pname = "ReactiveUI.Fody"; version = "19.5.41"; hash = "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM="; }) + (fetchNuGet { pname = "Reloaded.Memory"; version = "9.4.1"; hash = "sha256-bXaTAUx+/SiiMLmxuPumV9z5w1HcHpzEoNuR+xNhafs="; }) + (fetchNuGet { pname = "RocksDB"; version = "8.11.3.46984"; hash = "sha256-kCSgenerSMTh5h/hHoueV45uuAARRsJi94c62L2mVEQ="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0"; hash = "sha256-085JrZxNEwIHdBWKKKFsh1JzpF0AblvrUsz5T8kH4jQ="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.0.1"; hash = "sha256-5nWnTQrA1T6t9r8MqIiV4yTNu+IH0of2OX1qteoS+8E="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; hash = "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "SHA3.Net"; version = "2.0.0"; hash = "sha256-rNwk9ry52bN95FeNqNC29FokNRRzKw3XnojO/UzHlYc="; }) + (fetchNuGet { pname = "SharpZstd.Interop"; version = "1.5.6"; hash = "sha256-Y1sCo7RTRtXjkTG2ZAPFx/qXzX4yW8BEaot7Ngfbg8g="; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "2.0.0"; hash = "sha256-xW0amMDf1ExXs9SBP9S3Slgl4SiGjSkCiLErZ1hlGNM="; }) + (fetchNuGet { pname = "SimpleInfoName"; version = "2.1.1"; hash = "sha256-7yBNIivLnST0MeMTKdZeo5ZG57c4J7PdasFSVabdKyM="; }) + (fetchNuGet { pname = "SimpleInfoName"; version = "2.2.0"; hash = "sha256-oCOH+xj8aBF4H2fCi2e8kCkYUAjmoy/RDSh+jONCpjU="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; hash = "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.6"; hash = "sha256-gpHiTuHfiXgbkBkzipXb8EXIatefsod75nyrFdPcwcA="; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.8"; hash = "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; hash = "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; hash = "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; hash = "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; hash = "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.8"; hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; hash = "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; hash = "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; }) + (fetchNuGet { pname = "Spectre.Console"; version = "0.49.1"; hash = "sha256-tqSVojyuQjuB34lXo759NOcyLgNIw815mKXJPq5JFDo="; }) + (fetchNuGet { pname = "Spectre.Console.Cli"; version = "0.49.1"; hash = "sha256-sar9rhft1ivDMj1kU683+4KxUPUZL+Fb++ewMA6RD4Q="; }) + (fetchNuGet { pname = "Spectre.Console.Testing"; version = "0.49.1"; hash = "sha256-NFZE0ubRmjeOOnkf8EXCp8lya0XK1tclMmtodxJPt1I="; }) + (fetchNuGet { pname = "Splat"; version = "14.4.1"; hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; }) + (fetchNuGet { pname = "Splat"; version = "14.8.12"; hash = "sha256-9KTsYPHVN/wiL8/Yy1KQafrFRy7x8VCEHdzgB+9+8SU="; }) + (fetchNuGet { pname = "Splat"; version = "15.0.1"; hash = "sha256-IDI88gPTOHrBBp4fIwT85K7CkK1AK1FJwgQkCHrgZg0="; }) + (fetchNuGet { pname = "Splat"; version = "15.1.1"; hash = "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg="; }) + (fetchNuGet { pname = "Splat.Microsoft.Extensions.Logging"; version = "15.0.1"; hash = "sha256-Nk+ktdAIuXfSOj2dBcC0TbCe4ghEW1yOOhp5gcBOpb8="; }) + (fetchNuGet { pname = "StrawberryShake.Core"; version = "13.9.12"; hash = "sha256-f5BirgBloRc4b0CQxwO7qIOCOXmVbrfdayLaZMou17A="; }) + (fetchNuGet { pname = "StrawberryShake.Resources"; version = "13.9.12"; hash = "sha256-6eaWUu5996Sj/Fc+gZorYfM5jzrN7/R1rUURk5ni2ec="; }) + (fetchNuGet { pname = "StrawberryShake.Server"; version = "13.9.12"; hash = "sha256-Pq9c3RABhk+UKpVxgmU2RfD8wB+20VKNeURnPkWrlTI="; }) + (fetchNuGet { pname = "StrawberryShake.Transport.Http"; version = "13.9.12"; hash = "sha256-GLC9ETwAKF/gyO2IidlzDHu6F3b1HwPT1tT5gGlXvtk="; }) + (fetchNuGet { pname = "StrawberryShake.Transport.WebSockets"; version = "13.9.12"; hash = "sha256-J3qCENJfcBdk5yNgbE8mAHuQcWH97CZ1NWZa0I3cAIA="; }) + (fetchNuGet { pname = "Svg.Custom"; version = "2.0.0"; hash = "sha256-/iy8eithVIqzSA9p5zj1igiu47mX0KhMQiM0l6gRFFY="; }) + (fetchNuGet { pname = "Svg.Model"; version = "2.0.0"; hash = "sha256-ThGAwPyEv/ZLfRu9LRU91RO13T+MPED/i+ojOOZkCYM="; }) + (fetchNuGet { pname = "Svg.Skia"; version = "2.0.0"; hash = "sha256-wjVvUQTZD1f5TGk4ytJCJTXzkwKp04kXxN/OXxhrLB4="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; hash = "sha256-+YUymoyS0O+xVyF2+LiAdZlMww8nofPN4ja9ylYqRo8="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) + (fetchNuGet { pname = "System.CodeDom"; version = "5.0.0"; hash = "sha256-UNqyPrK9eshU5kgJukvPamkaxLAp9BmR/J22OjEX+pM="; }) + (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; hash = "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="; }) + (fetchNuGet { pname = "System.CodeDom"; version = "8.0.0"; hash = "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; hash = "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.1.36"; hash = "sha256-x/UyLEyveCYI+JAWo9xallSPbl78dIVuW2pGqgTY/C0="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.2.0"; hash = "sha256-FQ3l+ulbLSPhQ0JcQCC4D4SzjTnHsRqcOj56Ywy7pMo="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; hash = "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.3.0"; hash = "sha256-zQVRu6SnLS7aKetDaxvo7zAHWLOB7K/mtgs/uaQtYqk="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; }) + (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "4.5.0"; hash = "sha256-xxeZs1zIkhl2ZXU8CaOtCkMX1N290IK7bbHYeEKD0aQ="; }) + (fetchNuGet { pname = "System.Composition"; version = "1.0.31"; hash = "sha256-wcQEG6MCRa1S03s3Yb3E3tfsIBZid99M7WDhcb48Qik="; }) + (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; hash = "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "1.0.31"; hash = "sha256-u+XnXfj6LQ3OXwrb9KqHRW4a/a9yHzLrJOXwDQ1a/sY="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; hash = "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "1.0.31"; hash = "sha256-GQWo1YDyQ3r2OMcKW+GbR3BbZNIAdwK79XAfinNj+AE="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; hash = "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "1.0.31"; hash = "sha256-fg9BIY+zWtiEBIJefYP2lKHDYa4r/vtPTr3ZI8e0K7g="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; hash = "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "1.0.31"; hash = "sha256-mqfxjAnVyE1YCgXMOcV34IWhYFnvXVKjMo9Y/d3yDuo="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; hash = "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "1.0.31"; hash = "sha256-w9ApcUJr7jYP4Vf5+efIIqoWmr5v9R56W4uC0n8KktQ="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; hash = "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; hash = "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I="; }) + (fetchNuGet { pname = "System.Console"; version = "4.0.0"; hash = "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.0"; hash = "sha256-i3zFUgxQd1NqPVQS9dIY+H6kPP/a2/7JNKXPkPGEPog="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; hash = "sha256-dYh9UoFesuGcHY+ewsI+z2WnNy+bwHPsHQ3t85cbzNg="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; hash = "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; hash = "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; hash = "sha256-Rzo24qXhuJDDgrGNHr2eQRHhwLmsYmWDqAg/P5fOlzw="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.0"; hash = "sha256-TYGBFoRvTXG8HpuuJMhDXS2O9fVlFpwhgH54nyG7Nss="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; hash = "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.0"; hash = "sha256-H/5dMWOOuPh7n/tw8fhysuRh/yPL1AMq3dJhojHNQwk="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; hash = "sha256-EJN3LbN+b0O9Dr2eg7kfThCYpne0iJ/H/GIyUTNVYC8="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; hash = "sha256-zLtkPryJwqTGcJqMC6zoMMvMrT+aAL5GoumjmMtqUEI="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "20.0.28"; hash = "sha256-Sol8py0Mb2JywBChk7AFUvQwJGkZV7LX/5pNYoGSEJE="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; hash = "sha256-UT4KEfJNZOk7b4X0AqLFUsqfHu6myVH/BhbRKYc+1Uc="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; hash = "sha256-An0Twb9JODl/nuVm6MR0kJ3aj4WxGpI/1/vVp5b94kA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "7.0.0"; hash = "sha256-qSnksoYgYj7yui822gJh/xdww0D6zjkCR9zyE9CqNG4="; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; hash = "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; hash = "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; hash = "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.0.0"; hash = "sha256-35erMNo/BY47a6y+Q3ejR3giRdHJz+J/j1NiPoBDPNk="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; hash = "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Management"; version = "5.0.0"; hash = "sha256-upx2lBRhITuOz9rKth+pBNGvxaLNU3ZOSaS0D+7YHiY="; }) + (fetchNuGet { pname = "System.Management"; version = "6.0.2"; hash = "sha256-8l3Gyx/cn42ovS4q/ID4zSltJoL/pe0B/LUVD17tC6Q="; }) + (fetchNuGet { pname = "System.Management"; version = "8.0.0"; hash = "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; hash = "sha256-7JhQNSvE6JigM1qmmhzOX3NiZ6ek82R4whQNb+FpBzg="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; hash = "sha256-y6PnGuObJvOkhl9CXNFJQcV3SXuEz5yRLOCxGGTEucQ="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.Http.Json"; version = "8.0.0"; hash = "sha256-DUSAYDU0jvlTDnHE/nW5z0RjeRJDy1EsitRQaI2bLHA="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; hash = "sha256-2YSijNhCdw/ZU2yfH7vE+ReA8pgxRCXPnWr+ab36v4M="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; hash = "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; }) + (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; hash = "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="; }) + (fetchNuGet { pname = "System.Reactive"; version = "6.0.1"; hash = "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.0.0"; hash = "sha256-R5ti/45m2PUY0E4uY32/fEOAdzgQJGGKlnEXMjxM7P8="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; hash = "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.0.21"; hash = "sha256-0yqDWxwaw57YQ5dl8qdo+2o6VvG8qKp4il093uWWAUs="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.3.0"; hash = "sha256-a/RQr++mSsziWaOTknicfIQX/zJrwPFExfhK6PM0tfg="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; hash = "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.0"; hash = "sha256-lVcTbDGt86Nk/tP/w7EtyEqHq2DiEKtjZ984myBxhYU="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.0.0"; hash = "sha256-Jrzty9irg5zTbNG07Fnex/rjElhITsoFHLAB8fkY/S4="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; hash = "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; hash = "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; hash = "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; hash = "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; hash = "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; hash = "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; hash = "sha256-BelNIpEyToEp/VYKnje/q1P7KNEpQNtOzGPU18pLGpE="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; hash = "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; hash = "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; hash = "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; hash = "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; hash = "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.3.0"; hash = "sha256-CbfRZFmnJZCAsx9cx9UehCtzsbnVo+ce+n4pXDsx4s0="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; hash = "sha256-sBUUhJP+yYDXvcjNMKqNpn8yzGUpVABwK9vVUvYKjzI="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "4.5.0"; hash = "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; hash = "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "8.0.0"; hash = "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg="; }) + (fetchNuGet { pname = "System.Threading.RateLimiting"; version = "8.0.0"; hash = "sha256-KOEWEt6ZthvZHJ2Wp70d9nBhBrPqobGQDi2twlKYh/w="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.0"; hash = "sha256-xMxjhMOu9xPrOQFWkFyVHz6LPVd2U99EKYZIdB93XKc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.6.0"; hash = "sha256-YYrT3GRzVBdendxt8FUDCnOBJi0nw/CJ9VrzcPJWLSg="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; hash = "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; hash = "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "20.0.28"; hash = "sha256-SwR51XEqt10sMgvrq9lSPgOIhtgzgA+GnzMqSL6RgtY="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "20.0.28"; hash = "sha256-evySmax2pcTz1Hb7+W/Pc7UiIpqaWM3o3A1nqU3CzXU="; }) + (fetchNuGet { pname = "TextMateSharp"; version = "1.0.59"; hash = "sha256-qfAGSgVpTrWMZSk0TFDVP1IgWWi6O1jEEvWc0Pvw9i0="; }) + (fetchNuGet { pname = "TextMateSharp.Grammars"; version = "1.0.59"; hash = "sha256-ru5VxQK4PFRJhHu+MvCzDt3EwbC/94n1whtDovUAUDA="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.16.0"; hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; }) + (fetchNuGet { pname = "TransparentValueObjects"; version = "1.0.1"; hash = "sha256-nTnJNjj0p0ztiZA9DPYdzTWKHXC2C6uQXJG7Pad//rA="; }) + (fetchNuGet { pname = "Validation"; version = "2.3.7"; hash = "sha256-VTSUT1Ij87fN8zlz7w2HTIUMMx3NBRdbfXmMtFvV5es="; }) + (fetchNuGet { pname = "Validation"; version = "2.4.18"; hash = "sha256-ByITVSjsqVglWPIRaZ3i1P3bHh8+OB6BWgDA8f8qTFI="; }) + (fetchNuGet { pname = "ValveKeyValue"; version = "0.10.0.360"; hash = "sha256-LPQ6isUsA3cQKiO6ADijrCQ2ucx4TD01+kGzei3jIGY="; }) + (fetchNuGet { pname = "Verify"; version = "21.3.0"; hash = "sha256-6KO3r+oLH8s3kk/HDDh51OuAmwPpd7hhxaAF9Q4MhuE="; }) + (fetchNuGet { pname = "Verify"; version = "24.2.0"; hash = "sha256-wYm+h4wNoljNb3TZ+m25l6m0bGztZUkvygQektZrezA="; }) + (fetchNuGet { pname = "Verify.ImageMagick"; version = "3.4.2"; hash = "sha256-FOS9yiV90VSb1QD5bEM3aorLc/MDqXZtfJGp8H3qsDw="; }) + (fetchNuGet { pname = "Verify.SourceGenerators"; version = "2.2.0"; hash = "sha256-GOI0iRFa1qekkERAPc/FZlEbEDlw3CyoAF/k8w/LwmU="; }) + (fetchNuGet { pname = "Verify.Xunit"; version = "24.2.0"; hash = "sha256-6ZlWbfAbWUq9UX8dFN7FVYaocfOR/nMuKu3s3QU7i74="; }) + (fetchNuGet { pname = "Vogen"; version = "3.0.20"; hash = "sha256-KY7T9ekbqGDUoLYvF6y4iYiMsFFebUoAwpo4FJ6Yg3w="; }) + (fetchNuGet { pname = "Vogen"; version = "3.0.24"; hash = "sha256-erz/30Og8+p6niM/FftOUlGEICfDjNo9MX86ybaKYZQ="; }) + (fetchNuGet { pname = "xunit"; version = "2.8.0"; hash = "sha256-drOe69C30RlLfictLW7Cf8rf+vmdemCjSM5VsUwWsfQ="; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.1"; hash = "sha256-v5iPVeoUFsZp9zQMt3rg6xgw6UwF4VMIgzVYFIeb/zA="; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.2"; hash = "sha256-w5APCW7suBdoDOmQqm/8Gq6+Sk88JcTR09zjmj9s17E="; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.13.0"; hash = "sha256-K8cGR9+MdJknNPjlPbxQ1GhzXG+fK466jCfYxMwCK10="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.3.0"; hash = "sha256-lN+NiUEQoHWmoamUjvsNt2PVhHXYeHJHjHRk1BTs6R8="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.8.0"; hash = "sha256-y1maXa/fi+xt8EoViDQreLW70xiWfL+Ka2S7TO9BXU0="; }) + (fetchNuGet { pname = "xunit.core"; version = "2.8.0"; hash = "sha256-nzHNl/fnEGsTSpkCrfGqEaqw4fUV+JZEmQ3B7g5I394="; }) + (fetchNuGet { pname = "Xunit.DependencyInjection"; version = "9.3.0"; hash = "sha256-AEiF6OffWTAx+mQv4cNWwGOvLn5O++pmgOZSTbr355o="; }) + (fetchNuGet { pname = "Xunit.DependencyInjection.Logging"; version = "9.0.0"; hash = "sha256-9MerQYIgsByxcZmczyp/fW6ZWgzo4ql6j9Iv/Y47E4A="; }) + (fetchNuGet { pname = "Xunit.DependencyInjection.SkippableFact"; version = "9.0.0"; hash = "sha256-Ub6eSd9/bIhgbqQO+yWtiGfuLIkxSgl6TWfUL4ABkFI="; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.2.0"; hash = "sha256-et3Se7paKJlg8Ha4Xr9+He40M6vblxyOwS2BQxOgLlE="; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.0"; hash = "sha256-LbuXEcEJjGn3L6FCbC119+MY/QLvfLlGkCeAsCsZqGE="; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.2"; hash = "sha256-wlTMUOQg5NaAPEsWkNSr8QSPbbCNSicpFajp1rowCsA="; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.8.0"; hash = "sha256-0p5ywaDIlfoD2xf9irimlgpHPtY9fr+vJWptwHePqPY="; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.0"; hash = "sha256-chRJEazwq93yhVONlbtTI1znqYy0gdAoQajPRnhM/i4="; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.2"; hash = "sha256-l5Q60IBYWE5tYJCdFEEQnO5rIlXcNEM5S4Ut8vFnL2U="; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.8.0"; hash = "sha256-I/duyJVsnXwR+ILpT+cvj/kjqlngAqvtZP/Hjie8OF0="; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.8.0"; hash = "sha256-pZzKEO3zMO/kgPQ6UuWcBJZUzccs/sTnFp8ClQDad2c="; }) + (fetchNuGet { pname = "Xunit.SkippableFact"; version = "1.4.13"; hash = "sha256-pLtx0/2oTKYO1Y1Vg3k/Eli2OWHT5uorGdBp2uXvFfw="; }) ] diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 9d4c3947d97a7..3c311548baa8d 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -1,30 +1,41 @@ { _7zz, + avalonia, buildDotnetModule, copyDesktopItems, desktop-file-utils, dotnetCorePackages, fetchFromGitHub, - fontconfig, + imagemagick, lib, - libICE, - libSM, - libX11, runCommand, + xdg-utils, pname ? "nexusmods-app", }: +let + # From https://nexus-mods.github.io/NexusMods.App/developers/Contributing/#for-package-maintainers + constants = [ + # Tell the app it is a distro package; affects wording in update prompts + "INSTALLATION_METHOD_PACKAGE_MANAGER" + + # Don't include upstream's 7zz binary; we use the nixpkgs version + "NEXUSMODS_APP_USE_SYSTEM_EXTRACTOR" + ]; +in buildDotnetModule (finalAttrs: { inherit pname; - version = "0.4.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Nexus-Mods"; repo = "NexusMods.App"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-FzQphMhiC1g+6qmk/R1v4rq2ldy35NcaWm0RR1UlwLA="; + hash = "sha256-OmWDJVsXtUOYBeUXLx6EkQ1/RuH/3wIe40R5KgpmEC4="; }; + enableParallelBuilding = false; + # If the whole solution is published, there seems to be a race condition where # it will sometimes publish the wrong version of a dependent assembly, for # example: Microsoft.Extensions.Hosting.dll 6.0.0 instead of 8.0.0. @@ -33,63 +44,94 @@ buildDotnetModule (finalAttrs: { projectFile = "src/NexusMods.App/NexusMods.App.csproj"; testProjectFile = "NexusMods.App.sln"; - nativeBuildInputs = [ copyDesktopItems ]; + buildInputs = [ + # TODO: bump avalonia to 11.1.3 + # avalonia + ]; + + nativeCheckInputs = [ _7zz ]; + + nativeBuildInputs = [ + copyDesktopItems + imagemagick # For resizing SVG icon in postInstall + ]; nugetDeps = ./deps.nix; + mapNuGetDependencies = true; dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; - preConfigure = '' - substituteInPlace Directory.Build.props \ - --replace '</PropertyGroup>' '<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles></PropertyGroup>' - ''; - postPatch = '' - ln --force --symbolic "${lib.getExe _7zz}" src/ArchiveManagement/NexusMods.FileExtractor/runtimes/linux-x64/native/7zz - # for some reason these tests fail (intermittently?) with a zero timestamp touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png ''; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath finalAttrs.runtimeInputs}" - # Make associating with nxm links work on Linux - "--set APPIMAGE ${placeholder "out"}/bin/NexusMods.App" ]; - runtimeInputs = [ desktop-file-utils ]; + postInstall = '' + # Desktop entry + # As per #308324, use mainProgram from PATH, instead of $out/bin/NexusMods.App + install -D -m 444 -t $out/share/applications src/NexusMods.App/com.nexusmods.app.desktop + substituteInPlace $out/share/applications/com.nexusmods.app.desktop \ + --replace-fail '${"$"}{INSTALL_EXEC}' "${finalAttrs.meta.mainProgram}" + + # AppStream metadata + install -D -m 444 -t $out/share/metainfo src/NexusMods.App/com.nexusmods.app.metainfo.xml + + # Icon + icon=src/NexusMods.App/icon.svg + install -D -m 444 -T $icon $out/share/icons/hicolor/scalable/apps/com.nexusmods.app.svg + + # Bitmap icons + for i in 16 24 48 64 96 128 256 512; do + size=''${i}x''${i} + dir=$out/share/icons/hicolor/$size/apps + mkdir -p $dir + convert -background none -resize $size $icon $dir/com.nexusmods.app.png + done + ''; - runtimeDeps = [ - fontconfig - libICE - libSM - libX11 + runtimeInputs = [ + _7zz + desktop-file-utils + xdg-utils ]; executables = [ "NexusMods.App" ]; + dotnetBuildFlags = [ + # From https://github.com/Nexus-Mods/NexusMods.App/blob/v0.6.1/src/NexusMods.App/app.pupnet.conf#L38 + "--property:Version=${finalAttrs.version}" + "--property:TieredCompilation=true" + "--property:PublishReadyToRun=true" + "--property:DefineConstants=${lib.strings.concatStringsSep "%3B" constants}" + ]; + doCheck = true; dotnetTestFlags = [ "--environment=USER=nobody" - ( - "--filter=" - + lib.strings.concatStringsSep "&" ( - [ - "Category!=Disabled" - "FlakeyTest!=True" - "RequiresNetworking!=True" - "FullyQualifiedName!=NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_RemoteImage" - "FullyQualifiedName!=NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_ImageStoredFile" - ] - ++ lib.optionals (!_7zz.meta.unfree) [ - "FullyQualifiedName!=NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar" - ] - ) - ) + "--property:DefineConstants=${lib.strings.concatStringsSep "%3B" constants}" ]; + testFilters = [ + "Category!=Disabled" + "FlakeyTest!=True" + "RequiresNetworking!=True" + ]; + + disabledTests = + [ + "NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_RemoteImage" + "NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_ImageStoredFile" + ] + ++ lib.optionals (!_7zz.meta.unfree) [ + "NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar" + ]; + passthru = { tests = let diff --git a/pkgs/by-name/nf/nf-test/package.nix b/pkgs/by-name/nf/nf-test/package.nix index 81a5d52ee72b0..ceea014962fa7 100644 --- a/pkgs/by-name/nf/nf-test/package.nix +++ b/pkgs/by-name/nf/nf-test/package.nix @@ -18,14 +18,7 @@ stdenv.mkDerivation rec { }; sourceRoot = "."; - buildInputs = [ - makeWrapper - ]; - - nativeBuildInputs = [ - nextflow - ]; - + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall @@ -36,7 +29,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${openjdk11}/bin/java $out/bin/nf-test \ --add-flags "-jar $out/share/nf-test/nf-test.jar" \ - --prefix PATH : ${lib.makeBinPath nativeBuildInputs} \ + --prefix PATH : ${lib.makeBinPath [ nextflow ]} \ runHook postInstall ''; diff --git a/pkgs/by-name/nf/nfd/package.nix b/pkgs/by-name/nf/nfd/package.nix new file mode 100644 index 0000000000000..49730f44848de --- /dev/null +++ b/pkgs/by-name/nf/nfd/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + boost, + fetchFromGitHub, + libpcap, + ndn-cxx, + openssl, + pkg-config, + sphinx, + systemd, + wafHook, + websocketpp, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + withWebSocket ? true, +}: + +stdenv.mkDerivation rec { + pname = "nfd"; + version = "24.07"; + + src = fetchFromGitHub { + owner = "named-data"; + repo = "NFD"; + rev = "NFD-${version}"; + hash = "sha256-HbKPO3gwQWOZf4QZE+N7tAiqsNl1GrcwE4EUGjWmf5s="; + }; + + prePatch = lib.optional withWebSocket '' + ln -s ${websocketpp}/include/websocketpp websocketpp + ''; + + nativeBuildInputs = [ + pkg-config + sphinx + wafHook + ]; + buildInputs = [ + libpcap + ndn-cxx + openssl + ] ++ lib.optional withWebSocket websocketpp ++ lib.optional withSystemd systemd; + wafConfigureFlags = [ + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + ] ++ lib.optional (!withWebSocket) "--without-websocket"; + + meta = with lib; { + homepage = "https://named-data.net/"; + description = "Named Data Networking (NDN) Forwarding Daemon"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ bertof ]; + }; +} diff --git a/pkgs/by-name/ng/ngrok/package.nix b/pkgs/by-name/ng/ngrok/package.nix index daf9da5c8f2f5..bb47cd4d73671 100644 --- a/pkgs/by-name/ng/ngrok/package.nix +++ b/pkgs/by-name/ng/ngrok/package.nix @@ -7,20 +7,20 @@ let versions = lib.importJSON ./versions.json; arch = - if stdenv.isi686 then + if stdenv.hostPlatform.isi686 then "386" - else if stdenv.isx86_64 then + else if stdenv.hostPlatform.isx86_64 then "amd64" - else if stdenv.isAarch32 then + else if stdenv.hostPlatform.isAarch32 then "arm" - else if stdenv.isAarch64 then + else if stdenv.hostPlatform.isAarch64 then "arm64" else throw "Unsupported architecture"; os = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then "darwin" else throw "Unsupported os"; @@ -58,7 +58,7 @@ stdenv.mkDerivation { passthru.updateScript = ./update.sh; # Stripping causes SEGFAULT on darwin - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; meta = { description = "Allows you to expose a web server running on your local machine to the internet"; diff --git a/pkgs/by-name/ng/ngrok/versions.json b/pkgs/by-name/ng/ngrok/versions.json index 1b1ef45e785ca..8f45214d411b1 100644 --- a/pkgs/by-name/ng/ngrok/versions.json +++ b/pkgs/by-name/ng/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/bCqkEJHChUv/ngrok-v3-3.14.0-linux-386", - "sha256": "0fc0fcb097ae9caa47b8887e4aca71ce3850bc97343cea93b8cf13d48d5d7c5a", - "version": "3.14.0" + "url": "https://bin.equinox.io/a/2pDJvg1WeN6/ngrok-v3-3.16.0-linux-386", + "sha256": "225ea2210a068f977a608352dd22fd20be619473cf3501df271c39c63905a521", + "version": "3.16.0" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/8oZyZn8Sh2k/ngrok-v3-3.14.0-linux-amd64", - "sha256": "80d5ea4de774ad7f579d7381a492b6531c1d83c2a0476d236bd87b1aaaac3c7e", - "version": "3.14.0" + "url": "https://bin.equinox.io/a/kxzmCLDbo6M/ngrok-v3-3.16.0-linux-amd64", + "sha256": "fc1973917b056ac11d74687b0ba513a0fbab41f923e648875b8882d3e6cf07e0", + "version": "3.16.0" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/cMuwPWbrN4a/ngrok-v3-3.14.0-linux-arm", - "sha256": "8baeb05eab0bf3c4adde0a3aba63ec21cdd53f2ade8d1b556dea716597242fb1", - "version": "3.14.0" + "url": "https://bin.equinox.io/a/iE6KPEx6SuX/ngrok-v3-3.16.0-linux-arm", + "sha256": "3cb21e33be918ad4e547db5f0401d0c6fea61876ae46c14daf39f1038f80a1af", + "version": "3.16.0" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/3H9YcER9Em2/ngrok-v3-3.14.0-linux-arm64", - "sha256": "021e698af6ccff051184e72bf02de4a5ce45b8e4ace28e000f004e8af841db23", - "version": "3.14.0" + "url": "https://bin.equinox.io/a/3gbE6TuMrs4/ngrok-v3-3.16.0-linux-arm64", + "sha256": "e9cb9a3e65f92fa095101884291f9e5ed0989633cff480353a65877cf710399e", + "version": "3.16.0" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/25F8KjXtZLM/ngrok-v3-3.14.0-darwin-amd64", - "sha256": "f82d9521e8cb4d8e08b0a2b7d7f6ff4c4db2123c64d9e02ed59de71b8c6f98c5", - "version": "3.14.0" + "url": "https://bin.equinox.io/a/aWAe4Kvgqei/ngrok-v3-3.16.0-darwin-amd64", + "sha256": "5c2fb13ab825876f183bcff82f98b0979f9f5250638a8cb88e5f987f2b109b6c", + "version": "3.16.0" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/3bTR91HsBHY/ngrok-v3-3.14.0-darwin-arm64", - "sha256": "da5112d50a4b4d27163373effff66a09acaa966a733be4197cc96ca5776432fa", - "version": "3.14.0" + "url": "https://bin.equinox.io/a/4wpGQDJrfrm/ngrok-v3-3.16.0-darwin-arm64", + "sha256": "3fe7cc8f0d6b1978487c502cd6b832a1963287ad0f7c171904ac2c27d81bf9be", + "version": "3.16.0" } } diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 5a2de242e3e18..58a9f84b07cff 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -10,7 +10,7 @@ , nix-output-monitor }: let - version = "3.5.21"; + version = "3.5.26"; runtimeDeps = [ nvd nix-output-monitor ]; in rustPlatform.buildRustPackage { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "viperML"; repo = "nh"; rev = "refs/tags/v${version}"; - hash = "sha256-Ujo6MQvwolE1eWSkPXCC9WFJeLtRfnMpvxoeAGNcbFI="; + hash = "sha256-p38Uini6lChBCF0mZndHXTAy7ZH/OQLY696BFCHg92g="; }; strictDeps = true; @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage { makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; preFixup = '' mkdir completions @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-UFWw59puUWgs8/oHuMqwmjS7ZZQ/WIC1/p8odEtUzVU="; + cargoHash = "sha256-ejjgtjDNB7XBKi83R48xG3HLhTmm26Sdqdgh0xRVtNA="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nh/nhost-cli/package.nix b/pkgs/by-name/nh/nhost-cli/package.nix index 74538079e6a7b..6d6dbbd295282 100644 --- a/pkgs/by-name/nh/nhost-cli/package.nix +++ b/pkgs/by-name/nh/nhost-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nhost-cli"; - version = "1.22.3"; + version = "1.24.0"; src = fetchFromGitHub { owner = "nhost"; repo = "cli"; rev = "v${version}"; - hash = "sha256-Rpjgsc+pinM440SqnvVHijUP4Y2ArHi4sdalRDWzaJQ="; + hash = "sha256-8kul3tiwEJF6Pu1os29MteeYP+85X9hH12MojMpW9bY="; }; vendorHash = null; diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index dbc004302e47f..5c82059e76417 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; rev = "refs/tags/${version}"; - hash = "sha256-EwiZg0iyF9EQ0Z65Re5WgeV7xgs/wPtTQ9XA0iEMEIQ="; + hash = "sha256-hlcF04m3SI66d1C9U1onog2QoEMfqtHb7V++47ZmeW4="; }; - cargoHash = "sha256-JwuBjCWETIlBX5xswdznOAmzkL0Rn6cv7pxM6DwAkOs="; + cargoHash = "sha256-VFjZb7lsqOSt5Rc94dhS4Br/5i/HXPHZMqC1c0/LzHU="; cargoBuildFlags = [ "-p nickel-lang-cli" "-p nickel-lang-lsp" ]; diff --git a/pkgs/by-name/ni/nicstat/package.nix b/pkgs/by-name/ni/nicstat/package.nix index d8da45a6082c5..1e1e346b822b1 100644 --- a/pkgs/by-name/ni/nicstat/package.nix +++ b/pkgs/by-name/ni/nicstat/package.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ juliusrickert ]; mainProgram = "nicstat"; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix index 80107f2c0796e..aa8a2d6cb629d 100644 --- a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix +++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix @@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2024-07-22"; + version = "0-unstable-2024-09-12"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Nightfox-GTK-Theme"; - rev = "1ef2f7092526658a24312bde230a5746b49b7d95"; - hash = "sha256-Rnm0C8mmO54u5ntovIKnu2AdpdnjsQFABvlRPG5+cdo="; + rev = "c1f8a03a50cef5a4479ecdb2e7887ab4181404f2"; + hash = "sha256-2froJpEzniF0q7Tc6ruSFQ8I52FCKW6qkHaWWY0kq80="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/by-name/ni/nimlangserver/lock.json b/pkgs/by-name/ni/nimlangserver/lock.json index 891c26cba301a..7d493fca5a96b 100644 --- a/pkgs/by-name/ni/nimlangserver/lock.json +++ b/pkgs/by-name/ni/nimlangserver/lock.json @@ -1,217 +1,239 @@ { "depends": [ { - "method": "fetchzip", - "path": "/nix/store/l4zs1l1yw4yhf1f8q7r5x5z2szjygr6d-source", - "rev": "ba143e029f35fd9b4cd3d89d007cc834d0d5ba3c", - "sha256": "1lv3l9c4ifqzlfgpwpvpq2z3994zz1nirg8f59xrnfb7zgbv8l3i", + "method": "git", + "path": "/nix/store/jvk4kr8wws3dbjqnlag2zcysg0d7xnhz-nim-chronos-c04576d", + "rev": "c04576d829b8a0a1b12baaa8bc92037501b3a4a0", + "sha256": "0plwammxi4iis59p2416g7420f5fx38jziwhmi082c5lm2x658x9", "srcDir": "", - "url": "https://github.com/status-im/nim-chronos/archive/ba143e029f35fd9b4cd3d89d007cc834d0d5ba3c.tar.gz", + "url": "https://github.com/status-im/nim-chronos", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ "chronos" ] }, { - "method": "fetchzip", - "path": "/nix/store/q42j4w2f70qfihcrpzgl3fspxihfsadb-source", - "rev": "c0ae9e10a9238883d18226fa28a5435c4d305e45", - "sha256": "0dxhjg5nf4sc4ga2zrxqcmr1v3ki9irkl603x0y3pz5sd8jdi731", + "method": "git", + "path": "/nix/store/rxh6hjns335dl5zn13dl78hlj6ign33m-nim-http-utils-8b88ad6", + "rev": "8b88ad6dd9a6326c29f82067800c483d9410d873", + "sha256": "1c20yhzm7c69xkcdzxwbm8ldid565nrmvgr5jk3g6cghh6z9b63n", "srcDir": "", - "url": "https://github.com/status-im/nim-stint/archive/c0ae9e10a9238883d18226fa28a5435c4d305e45.tar.gz", + "url": "https://github.com/status-im/nim-http-utils", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ - "stint" + "httputils" ] }, { - "method": "fetchzip", - "path": "/nix/store/jmgpadmdabybhij1srd81xfr873zgfmm-source", - "rev": "5065d2cf18dcb9812e25cc0e2c50eb357bde04cf", - "sha256": "069fw3h9cjn0hab9vhfri8ibld7yihb8ggyg1nv5vxz6i3x026m5", + "method": "git", + "path": "/nix/store/ngj2jlgi2ygv3xvnqvhlpws2s069fh6c-nim-stint-7c81df9", + "rev": "7c81df9adc80088f46a4c2b8bf2a46c26fab057c", + "sha256": "0gl8hxk3a29p5f2l3x5v3hscbydnwy8470bl9xjsawysbpa41jq0", "srcDir": "", - "url": "https://github.com/status-im/nim-http-utils/archive/5065d2cf18dcb9812e25cc0e2c50eb357bde04cf.tar.gz", + "url": "https://github.com/status-im/nim-stint", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ - "httputils" + "stint" ] }, { - "method": "fetchzip", - "path": "/nix/store/wdj38hf9hdyb1skgb6v0z00kxkdmnq04-source", - "rev": "b178f47527074964f76c395ad0dfc81cf118f379", - "sha256": "1ir20z9m4wmm0bs2dd2qiq75w0x3skv0yj7sqp6bqfh98ni44xdc", + "method": "git", + "path": "/nix/store/fvqlv9l67gdbvdq48w76y7dm48s52viw-nim-unittest2-e96f321", + "rev": "e96f3215030cbfa13abc2f5827069b6f8ba87e38", + "sha256": "0q919mswsspk3fdhb9a742y7yv0pk14yc965afx2jza57m4fw2a2", "srcDir": "", - "url": "https://github.com/status-im/nim-unittest2/archive/b178f47527074964f76c395ad0dfc81cf118f379.tar.gz", + "url": "https://github.com/status-im/nim-unittest2", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ "unittest2" ] }, { - "method": "fetchzip", - "path": "/nix/store/yad26q3iv3r2lw9xs655kyx3hvflxi1p-source", - "rev": "2c3ae3137f3c9cb48134285bd4a47186fa51f0e8", - "sha256": "09pkxzsnahljkqyp540v1wwiqcnbkz5ji5bz9q9cwn3axpmqc3v7", + "method": "git", + "path": "/nix/store/ggzfksc7mbfllfdr2va5rmyx757c7nfx-nim-websock-63bcc29", + "rev": "63bcc2902d884c63101e144555ad99421734a70a", + "sha256": "0rxdz62pns7ywwzh4r1pjj9qyhx7djj06y5yhf83j7dc30qi7wp2", "srcDir": "", - "url": "https://github.com/status-im/nim-websock/archive/2c3ae3137f3c9cb48134285bd4a47186fa51f0e8.tar.gz", + "url": "https://github.com/status-im/nim-websock", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ "websock" ] }, { - "method": "fetchzip", - "path": "/nix/store/siwfngb840kcdjdviy5rhlpvdpkw14sk-source", - "rev": "8bfd753649aa7e870ec45e93f1453d3bfcf66733", - "sha256": "0hvs4kfr4aais7ixvh9d7na2r2zjnvaw3m3rpklafn9qld2wpaav", - "srcDir": "src", - "url": "https://github.com/status-im/news/archive/8bfd753649aa7e870ec45e93f1453d3bfcf66733.tar.gz", - "subDir": "", - "packages": [ - "news" - ] - }, - { - "method": "fetchzip", - "path": "/nix/store/ss096qz8svm5my0mjhk3imyrc2nm2x0y-source", - "rev": "4d541ec43454809904fc4c3c0a7436410ad597d2", - "sha256": "1a5x0fsxxkqpambz9q637dz0jrzv9q1jb3cya12k6106vc65lyf8", + "method": "git", + "path": "/nix/store/4q5lil0j6wdxjbkk4nbwnvz0swhxph4v-nim-serialization-298a955", + "rev": "298a9554a885b2df59737bb3461aac8d0d339724", + "sha256": "1skh778gkml33n0pz7s8fxybdn2rqg2hg10nyp8jip9x6rbpgz6g", "srcDir": "", - "url": "https://github.com/status-im/nim-serialization/archive/4d541ec43454809904fc4c3c0a7436410ad597d2.tar.gz", + "url": "https://github.com/status-im/nim-serialization", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ "serialization" ] }, { - "method": "fetchzip", - "path": "/nix/store/90rwcr71bq13cid74v4aazikv2s924r1-source", - "rev": "d9400ddea08341a65102cffdb693d3a7131efef4", - "sha256": "0gkmh63izhp0bxyfmwfvyp81bxnzwnc3r7nxr5a05xpl8crk85w2", + "method": "git", + "path": "/nix/store/1k3vziq26ynmmm9j9savsfm8d7glmrax-nim-stew-d4634c5", + "rev": "d4634c5405ac188e7050d348332edb6c3b09a527", + "sha256": "15ii11644vxs55jix64krg8h0ninnhlgqnc7klmskycbcr4a1xgh", "srcDir": "", - "url": "https://github.com/status-im/nim-stew/archive/d9400ddea08341a65102cffdb693d3a7131efef4.tar.gz", + "url": "https://github.com/status-im/nim-stew", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ "stew" ] }, { - "method": "fetchzip", - "path": "/nix/store/4nj341ypj07hjvxv0462wpnywhkj02b5-source", - "rev": "422971502bd641703bf78a27cb20429e77fcfb8b", - "sha256": "0snzh904f8f3wn33liy6817q9ccx8mvsl88blhr49qh69mzbgnba", + "method": "git", + "path": "/nix/store/3x156nly2vr6nixgw1zk5jp5n6bgi6rk-nim-faststreams-dbc4a95", + "rev": "dbc4a95df60238157dcf286f6125188cb72f37c1", + "sha256": "1zvh1lgjmszdd074993qkj01w2v7fjxcawjf7iplwq0rvjpszdy0", "srcDir": "", - "url": "https://github.com/status-im/nim-faststreams/archive/422971502bd641703bf78a27cb20429e77fcfb8b.tar.gz", + "url": "https://github.com/status-im/nim-faststreams", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ "faststreams" ] }, { - "method": "fetchzip", - "path": "/nix/store/qkwz2w5haw8px691c6gkklvxxp38j9d3-source", - "rev": "2f95909c767605e06670dc70f5cffd6b9284f192", - "sha256": "1qdq9wpm6xahqczmvdn3a7yvvrw5x42ylvzmbybdwjzd8vmgg0zv", + "method": "git", + "path": "/nix/store/7k5blrxbh2zzsxrmz54l5i6v6dj4mp3g-with-91c51ec", + "rev": "91c51ec1051bf0cb518cf9bb78114e2a84b03da7", + "sha256": "170hfdc2z2qp9cxgvpqswzr4bmzljybh4lnn0k5kganwvf0ffz9p", "srcDir": "", - "url": "https://github.com/zevv/with/archive/2f95909c767605e06670dc70f5cffd6b9284f192.tar.gz", + "url": "https://github.com/zevv/with", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ "with" ] }, { - "method": "fetchzip", - "path": "/nix/store/hn5r1ywl4qzzjl9zj62w5m6f8bqkjn8q-source", - "rev": "dfc4c1b39f9ded9baf6365014de2b4bfb4dafc34", - "sha256": "0fi59m8yvayzlh1ajbl98ddy43i3ikjqh3s5px16y0s3cidg4fai", + "method": "git", + "path": "/nix/store/jw9y4cm15y80h3v9xjz5s1r0rnyi5x4i-nim-testutils-e4fb95c", + "rev": "e4fb95cbe36ad1e231661c922da04b81e0ffeed9", + "sha256": "0gqhag91f8dkdv0v2mg6pz5q6afl70bbnk628i52p4wsi4bl49jj", "srcDir": "", - "url": "https://github.com/status-im/nim-testutils/archive/dfc4c1b39f9ded9baf6365014de2b4bfb4dafc34.tar.gz", + "url": "https://github.com/status-im/nim-testutils", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ "testutils" ] }, { - "method": "fetchzip", - "path": "/nix/store/szg3jxcg0bf6zv224nyisqhnibkd2pxw-source", - "rev": "c8a5cbe26917e6716b1597dae2d08166f3ce789a", - "sha256": "1l1y4psbcd5w68j1zz172rlwsk7jxbwlr14r2kwnkj7xc7lfwlnx", + "method": "git", + "path": "/nix/store/sskmpq7fqax2x2wydb1lhyac4ikx5p6p-nim-results-57b2392", + "rev": "57b2392ad69849e3e2d02b74a8a0feee2c3d9570", + "sha256": "1wma3dhrrdfxn05ds6yiv9mj071czv90x06bm7f5rslzk0s7m1af", "srcDir": "", - "url": "https://github.com/yyoncho/nim-json-rpc/archive/c8a5cbe26917e6716b1597dae2d08166f3ce789a.tar.gz", + "url": "https://github.com/arnetheduck/nim-results", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ - "json_rpc" + "results" ] }, { - "method": "fetchzip", - "path": "/nix/store/dnj20qh97ylf57nka9wbxs735wbw7yxv-source", - "rev": "4014ef939b51e02053c2e16dd3481d47bc9267dd", - "sha256": "1kgqr2lqaffglc1fgbanwcvhkqcbbd20d5b6w4lf0nksfl9c357a", + "method": "git", + "path": "/nix/store/06gaz1ks9rc13bxr7wkig4sfiz0mb3xw-nim-json-rpc-e27c10a", + "rev": "e27c10ad4172e67f71a78044f53de073e7401390", + "sha256": "16f1lz2c6pzyjwmnqxxzl3sf635kzvzggmk2gl7mqifz4v31wjbq", "srcDir": "", - "url": "https://github.com/cheatfate/nimcrypto/archive/4014ef939b51e02053c2e16dd3481d47bc9267dd.tar.gz", + "url": "https://github.com/status-im/nim-json-rpc", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ - "nimcrypto" + "json_rpc" ] }, { - "method": "fetchzip", - "path": "/nix/store/drj65wylnxdbv4jqhymf7biiyjfb75v8-source", - "rev": "9372f27a25d0718d3527afad6cc936f6a853f86e", - "sha256": "152zbyqx12fmmjl4wn6kqqk1jzp1ywm4xvjd28ll9037f1pyd5ic", + "method": "git", + "path": "/nix/store/narxn874mr56chm56iya8zdmnadvg61d-nimcrypto-71bca15", + "rev": "71bca15508e2c0548f32b42a69bcfb1ccd9ab9ff", + "sha256": "0iizdwgxdrfa94572874dr5d3q2g9j6yk33xzywci7ig3w58rm82", "srcDir": "", - "url": "https://github.com/status-im/nim-bearssl/archive/9372f27a25d0718d3527afad6cc936f6a853f86e.tar.gz", + "url": "https://github.com/cheatfate/nimcrypto", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ - "bearssl" + "nimcrypto" ] }, { - "method": "fetchzip", - "path": "/nix/store/h0xl7qnw7bh513rb24k1n805x3n1rimw-source", - "rev": "d9394dc7286064902d825bbc1203d03d7218633a", - "sha256": "102m7jaxjip24a6hrnk0nvfb0vmdx5zq4m9i4xyzq8m782xyqp94", + "method": "git", + "path": "/nix/store/mki47dpj9mi8wa7gwhp3n0q6z9lhn1mv-nim-bearssl-667b404", + "rev": "667b40440a53a58e9f922e29e20818720c62d9ac", + "sha256": "0a4mf9g7p7zdhlzzfl9iikmhkyl7w5kf2mrn0bv4w4n30sl98m4s", "srcDir": "", - "url": "https://github.com/status-im/nim-json-serialization/archive/d9394dc7286064902d825bbc1203d03d7218633a.tar.gz", + "url": "https://github.com/status-im/nim-bearssl", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ - "json_serialization" + "bearssl" ] }, { - "method": "fetchzip", - "path": "/nix/store/ffz78k6z9wf8vj2kv1jdj5dq2rxf61j7-source", - "rev": "2a2681b60289aaf7895b7056f22616081eb1a882", - "sha256": "0n8awgrmn9f6vd7ibv1jlyxk61lrs7hc51fghilrw6g6xq5w9rxq", + "method": "git", + "path": "/nix/store/cfs80kvd9s3np81i5bfr0pvhsv046vxm-nim-json-serialization-8a4ed98", + "rev": "8a4ed98bbd0a9479df15af2fa31da38a586ea6d5", + "sha256": "1r6acznzdyd3r5ixfhxbcqsrm6iqcyvrg5i93pzna1q4h9mgmf5f", "srcDir": "", - "url": "https://github.com/status-im/nim-chronicles/archive/2a2681b60289aaf7895b7056f22616081eb1a882.tar.gz", + "url": "https://github.com/status-im/nim-json-serialization", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ - "chronicles" + "json_serialization" ] }, { - "method": "fetchzip", - "path": "/nix/store/51nf7pb5cwg2n441ka6w6g6c4hdjsdj4-source", - "rev": "bb01d965a2ad0f08eaff6a53874f028ddbab4909", - "sha256": "0v4n7maskd07qsx8rsr9v0bs7nzbncmvxsn7j9jsk9azcy803v49", + "method": "git", + "path": "/nix/store/vnxrmzlkma85rsf82abcr81ywrgr5dya-nim-chronicles-32ac867", + "rev": "32ac8679680ea699f7dbc046e8e0131cac97d41a", + "sha256": "0w3ya0rpy0rp997nnfakq0cshpk4vyva195mmgrw5c9zp4pwv2hm", "srcDir": "", - "url": "https://github.com/nickysn/asynctools/archive/bb01d965a2ad0f08eaff6a53874f028ddbab4909.tar.gz", + "url": "https://github.com/status-im/nim-chronicles", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ - "asynctools" + "chronicles" ] }, { - "method": "fetchzip", - "path": "/nix/store/br78rad2jnl6zka2q89qi6pkfiyn10fv-source", - "rev": "f34ca261efd90f118dc1647beefd2f7a69b05d93", - "sha256": "1k8y7m1ry1z8jm8hj8pa3vlqprshaa59cdwq2a4acrfw9ks5w482", + "method": "git", + "path": "/nix/store/ngqb4fpv1yi4zn5x7sn3p3yvxmmbn2z1-nim-zlib-45b06fc", + "rev": "45b06fca15ce0f09586067d950da30c10227865a", + "sha256": "1gcvl59j7yj698sl4l35drq0cmvy2zsywgi7b0dv9ci3klss4cxb", "srcDir": "", - "url": "https://github.com/status-im/nim-zlib/archive/f34ca261efd90f118dc1647beefd2f7a69b05d93.tar.gz", + "url": "https://github.com/status-im/nim-zlib", "subDir": "", + "fetchSubmodules": true, + "leaveDotGit": false, "packages": [ "zlib" ] diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix index 2a5f7d36e14de..be91a0ac2a4f8 100644 --- a/pkgs/by-name/ni/nimlangserver/package.nix +++ b/pkgs/by-name/ni/nimlangserver/package.nix @@ -3,29 +3,32 @@ buildNimPackage, fetchFromGitHub, }: -buildNimPackage (final: prev: { - pname = "nimlangserver"; - version = "1.2.0"; +buildNimPackage ( + final: prev: rec { + pname = "nimlangserver"; + version = "1.6.0"; - # lock.json generated with github.com/daylinmorgan/nnl - lockFile = ./lock.json; + # nix build ".#nimlangserver.src" + # nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --force-git + lockFile = ./lock.json; - src = fetchFromGitHub { - owner = "nim-lang"; - repo = "langserver"; - rev = "71b59bfa77dabf6b8b381f6e18a1d963a1a658fc"; - hash = "sha256-dznegEhRHvztrNhBcUhW83RYgJpduwdGLWj/tJ//K8c="; - }; + src = fetchFromGitHub { + owner = "nim-lang"; + repo = "langserver"; + rev = "v${version}"; + hash = "sha256-rTlkbNuJbL9ke1FpHYVYduiYHUON6oACg20pBs0MaP4="; + }; - doCheck = false; + doCheck = false; - meta = with lib; - final.src.meta - // { - description = "Nim language server implementation (based on nimsuggest)"; - homepage = "https://github.com/nim-lang/langserver"; - license = licenses.mit; - mainProgram = "nimlangserver"; - maintainers = with maintainers; [daylinmorgan]; - }; -}) + meta = + final.src.meta + // (with lib; { + description = "Nim language server implementation (based on nimsuggest)"; + homepage = "https://github.com/nim-lang/langserver"; + license = licenses.mit; + mainProgram = "nimlangserver"; + maintainers = with maintainers; [ daylinmorgan ]; + }); + } +) diff --git a/pkgs/by-name/ni/nimlsp/package.nix b/pkgs/by-name/ni/nimlsp/package.nix index 0cd648b74790d..36b9b3d3af015 100644 --- a/pkgs/by-name/ni/nimlsp/package.nix +++ b/pkgs/by-name/ni/nimlsp/package.nix @@ -20,7 +20,7 @@ buildNimPackage (finalAttrs: { owner = "PMunch"; repo = "jsonschema"; rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf"; - sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz"; + hash = "sha256-f9F1oam/ZXwDKXqGMUUQ5+tMZKTe7t4UlZ4U1LAkRss="; }; in [ jsonSchemaSrc ]; diff --git a/pkgs/by-name/ni/ninja/setup-hook.sh b/pkgs/by-name/ni/ninja/setup-hook.sh index 4f3bc5b5acfa4..4573aceea3c67 100644 --- a/pkgs/by-name/ni/ninja/setup-hook.sh +++ b/pkgs/by-name/ni/ninja/setup-hook.sh @@ -65,8 +65,7 @@ ninjaInstallPhase() { local flagsArray=( "-j$buildCores" ) - : "${installTargets:=install}" - concatTo flagsArray ninjaFlags ninjaFlagsArray installTargets + concatTo flagsArray ninjaFlags ninjaFlagsArray installTargets=install echoCmd 'install flags' "${flagsArray[@]}" TERM=dumb ninja "${flagsArray[@]}" diff --git a/pkgs/by-name/ni/niri/Cargo.lock b/pkgs/by-name/ni/niri/Cargo.lock index 66763334c61df..00bedd343d2b3 100644 --- a/pkgs/by-name/ni/niri/Cargo.lock +++ b/pkgs/by-name/ni/niri/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.8.11" @@ -133,9 +139,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" [[package]] name = "appendlist" @@ -163,9 +169,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-raw-xcb-connection" @@ -197,13 +203,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -242,9 +248,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock 3.4.0", "cfg-if", @@ -252,11 +258,11 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -292,7 +298,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.34", + "rustix 0.38.37", "windows-sys 0.48.0", ] @@ -304,25 +310,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "async-signal" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix 0.38.37", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -333,13 +339,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -365,17 +371,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -411,7 +417,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -486,22 +492,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.3" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -518,15 +524,14 @@ checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cairo-rs" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "797fd5a634dcb0ad0d7d583df794deb0a236d88e759cd34b7da20198c6c9d145" +checksum = "e8a0ea147c94108c9613235388f540e4d14c327f7081c9e471fc8ee8a2533e69" dependencies = [ "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", - "thiserror", ] [[package]] @@ -537,7 +542,7 @@ checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" dependencies = [ "glib-sys", "libc", - "system-deps 7.0.1", + "system-deps 7.0.2", ] [[package]] @@ -548,25 +553,25 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.6.0", "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "thiserror", ] [[package]] name = "calloop" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58a38167d6fba8c67cce63c4a91f2a73ca42cbdaf6fb9ba164f1e07b43ecc10" +checksum = "a1ead1e1514bce44c0f40e027899fbc595907fc112635bed21b3b5d975c0a5e7" dependencies = [ "async-task", "bitflags 2.6.0", "futures-io", - "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", + "tracing", ] [[package]] @@ -576,19 +581,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop 0.13.0", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.1.8" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -616,6 +622,16 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cfg-expr" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345c78335be0624ed29012dc10c49102196c6882c12dde65d9f35b02da2aada8" +dependencies = [ + "smallvec", + "target-lexicon", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -660,9 +676,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.14" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c937d4061031a6d0c8da4b9a4f98a172fc2976dfb1c19213a9cf7d0d3c837e36" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -670,9 +686,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.14" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85379ba512b21a328adf887e85f7742d12e96eb31f3ef077df4ffc26b506ffed" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -689,7 +705,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -763,9 +779,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -793,9 +809,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -955,7 +971,7 @@ dependencies = [ "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -965,7 +981,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53" dependencies = [ "drm-sys", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -981,7 +997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" dependencies = [ "libc", - "linux-raw-sys 0.6.4", + "linux-raw-sys 0.6.5", ] [[package]] @@ -990,12 +1006,6 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" -[[package]] -name = "edid-rs" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c" - [[package]] name = "either" version = "1.13.0" @@ -1020,7 +1030,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1088,9 +1098,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1113,12 +1123,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1145,7 +1155,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1232,7 +1242,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -1247,7 +1257,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1306,9 +1316,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bb53ecb56857c683c9ec859908e076dd3969c7d67598bd8b1ce095d211304a" +checksum = "8730751991b97419fc3f0c2dca2c9e45b48edf46e48e0f965964ecf33889812f" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1318,15 +1328,15 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f6681a0c1330d1d3968bec1529f7172d62819ef0bdbb0d18022320654158b03" +checksum = "1ffbf649fd5b1c8c0f0feeb015b7533c3ef92da2887fb95ddd338bc2b1644a7c" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps 7.0.1", + "system-deps 7.0.2", ] [[package]] @@ -1358,14 +1368,14 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 7.0.1", + "system-deps 7.0.2", ] [[package]] name = "generator" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979f00864edc7516466d6b3157706e06c032f22715700ddd878228a91d02bc56" +checksum = "dbb949699c3e4df3a183b1d2142cb24277057055ed23c68ed58894f76c517223" dependencies = [ "cfg-if", "libc", @@ -1407,15 +1417,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "gio" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398e3da68749fdc32783cbf7521ec3f65c9cf946db8c7774f8460af49e52c6e2" +checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52" dependencies = [ "futures-channel", "futures-core", @@ -1426,19 +1436,18 @@ dependencies = [ "libc", "pin-project-lite", "smallvec", - "thiserror", ] [[package]] name = "gio-sys" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63" +checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 7.0.1", + "system-deps 7.0.2", "windows-sys 0.52.0", ] @@ -1459,7 +1468,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1475,15 +1484,15 @@ dependencies = [ [[package]] name = "glam" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" +checksum = "c28091a37a5d09b555cb6628fd954da299b536433834f5b8e59eba78e0cbbf8a" [[package]] name = "glib" -version = "0.20.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" +checksum = "95648aac01b75503000bb3bcaa5ec7a7a2dd61e43636b8b1814854de94dd80e4" dependencies = [ "bitflags 2.6.0", "futures-channel", @@ -1498,30 +1507,29 @@ dependencies = [ "libc", "memchr", "smallvec", - "thiserror", ] [[package]] name = "glib-macros" -version = "0.20.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef" +checksum = "302f1d633c9cdef4350330e7b68fd8016e2834bb106c93fdf9789fcde753c1ab" dependencies = [ "heck 0.5.0", - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "glib-sys" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60" +checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163" dependencies = [ "libc", - "system-deps 7.0.1", + "system-deps 7.0.2", ] [[package]] @@ -1532,20 +1540,20 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8" +checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a" dependencies = [ "glib-sys", "libc", - "system-deps 7.0.1", + "system-deps 7.0.2", ] [[package]] name = "graphene-rs" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630e940ad5824f90221d6579043a9cd1f8bec86b4a17faaf7827d58eb16e8c1f" +checksum = "80aac87f74e81c0e13433e892a047237abdc37945c86887f5eed905038356e69" dependencies = [ "glib", "graphene-sys", @@ -1554,14 +1562,14 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8fade7b754982f47ebbed241fd2680816fdd4598321784da10b9e1168836a" +checksum = "cc2f91ecd32989efad60326cc20a8fb252bd2852239a08e4e70cde8c100de9ca" dependencies = [ "glib-sys", "libc", "pkg-config", - "system-deps 7.0.1", + "system-deps 7.0.2", ] [[package]] @@ -1592,14 +1600,14 @@ dependencies = [ "graphene-sys", "libc", "pango-sys", - "system-deps 7.0.1", + "system-deps 7.0.2", ] [[package]] name = "gtk4" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaffc6c743c9160514cc9b67eace364e5dc5798369fa809cdb04e035c21c5c5d" +checksum = "f4fe572bf318e5dbc6f5a2f8a25d853f1ae3f42768c0b08af6ca20a18f4057e1" dependencies = [ "cairo-rs", "field-offset", @@ -1618,14 +1626,14 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "188211f546ce5801f6d0245c37b6249143a2cb4fa040e54829ca1e76796e9f09" +checksum = "e9e7b362c8fccd2712297903717d65d30defdab2b509bc9d209cbe5ffb9fabaf" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1644,7 +1652,7 @@ dependencies = [ "gsk4-sys", "libc", "pango-sys", - "system-deps 7.0.1", + "system-deps 7.0.2", ] [[package]] @@ -1702,9 +1710,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", @@ -1758,11 +1766,11 @@ checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -1827,9 +1835,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1847,7 +1855,7 @@ dependencies = [ "libc", "proc-macro2", "regex", - "syn 2.0.72", + "syn 2.0.77", "terminal_size 0.2.6", ] @@ -1933,14 +1941,44 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps 7.0.1", + "system-deps 7.0.2", ] [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libdisplay-info" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6dd47a677df2378a8bb88d08a593f51e8dddf4b61d2db5f2ceb35e67f9389d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "libdisplay-info-derive", + "libdisplay-info-sys", + "thiserror", +] + +[[package]] +name = "libdisplay-info-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "libdisplay-info-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea8cec1fa7872b621f40c756bc1304b1a975461282e250b0e76737b037c0c236" [[package]] name = "libloading" @@ -2049,9 +2087,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" +checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" [[package]] name = "log" @@ -2074,9 +2112,9 @@ dependencies = [ [[package]] name = "mac-notification-sys" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" +checksum = "dce8f34f3717aa37177e723df6c1fc5fb02b2a1087374ea3fe0ea42316dc8f91" dependencies = [ "cc", "dirs-next", @@ -2165,7 +2203,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -2184,6 +2222,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "ndk" version = "0.9.0" @@ -2216,7 +2263,7 @@ dependencies = [ [[package]] name = "niri" -version = "0.1.8" +version = "0.1.9" dependencies = [ "anyhow", "approx 0.5.1", @@ -2226,11 +2273,11 @@ dependencies = [ "atomic", "bitflags 2.6.0", "bytemuck", - "calloop 0.14.0", + "calloop 0.14.1", "clap", "directories", "drm-ffi", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-util", "git-version", "glam", @@ -2238,6 +2285,7 @@ dependencies = [ "k9", "keyframe", "libc", + "libdisplay-info", "log", "niri-config", "niri-ipc", @@ -2260,6 +2308,8 @@ dependencies = [ "tracing-subscriber", "tracy-client", "url", + "wayland-backend", + "wayland-scanner", "xcursor", "xshell", "zbus", @@ -2267,10 +2317,11 @@ dependencies = [ [[package]] name = "niri-config" -version = "0.1.8" +version = "0.1.9" dependencies = [ "bitflags 2.6.0", "csscolorparser", + "k9", "knuffel", "miette", "niri-ipc", @@ -2283,7 +2334,7 @@ dependencies = [ [[package]] name = "niri-ipc" -version = "0.1.8" +version = "0.1.9" dependencies = [ "clap", "schemars", @@ -2293,7 +2344,7 @@ dependencies = [ [[package]] name = "niri-visual-tests" -version = "0.1.8" +version = "0.1.9" dependencies = [ "anyhow", "gtk4", @@ -2392,10 +2443,10 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -2632,9 +2683,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -2693,9 +2744,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "pango" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54768854025df6903061d0084fd9702a253ddfd60db7d9b751d43b76689a7f0a" +checksum = "5764e5a174a5a0ec054fe5962ce6d4fc7052e2d0dcc23bbc77202b40a4a403d3" dependencies = [ "gio", "glib", @@ -2705,21 +2756,21 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07cc57d10cee4ec661f718a6902cee18c2f4cfae08e87e5a390525946913390" +checksum = "fd317e1de76b14b3d3efe05518c08b360327f1ab7fec150473a89ffcad4b072d" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 7.0.1", + "system-deps 7.0.2", ] [[package]] name = "pangocairo" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "902cd6e53493a475f4524e7b3f4c09ef60ee87c7be16f08f1b41882fc74dac46" +checksum = "50e67bf91c19fccbf9394049d98c67cccec183dd73cbe54a0205da983d4174e7" dependencies = [ "cairo-rs", "glib", @@ -2730,22 +2781,22 @@ dependencies = [ [[package]] name = "pangocairo-sys" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc23a5ea756e709ab1598f8446a64c799b10c99ec59aa2310965218bc1915853" +checksum = "025f26935d210969dda291fa21afee60da792c4976269581170ea715e00f09c0" dependencies = [ "cairo-sys-rs", "glib-sys", "libc", "pango-sys", - "system-deps 7.0.1", + "system-deps 7.0.2", ] [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "paste" @@ -2789,7 +2840,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -2818,7 +2869,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -2835,12 +2886,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] @@ -2904,7 +2955,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] @@ -2925,17 +2976,17 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2981,11 +3032,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.20", ] [[package]] @@ -3038,7 +3089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3069,7 +3120,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3089,18 +3140,18 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3161,9 +3212,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox 0.1.3", @@ -3228,9 +3279,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] @@ -3251,9 +3302,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -3322,7 +3373,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3345,22 +3396,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.205" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.205" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3371,14 +3422,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -3394,7 +3445,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3477,11 +3528,11 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/Smithay/smithay.git#c4844428f8de024222a44cd906060f2af77f4ba1" +source = "git+https://github.com/Smithay/smithay.git#f364c73cae953aebfa189075e9f118f9008e100b" dependencies = [ "appendlist", "bitflags 2.6.0", - "calloop 0.14.0", + "calloop 0.14.1", "cc", "cgmath", "cursor-icon", @@ -3503,7 +3554,7 @@ dependencies = [ "pkg-config", "profiling", "rand", - "rustix 0.38.34", + "rustix 0.38.37", "scan_fmt", "smallvec", "tempfile", @@ -3536,7 +3587,7 @@ dependencies = [ "libc", "log", "memmap2", - "rustix 0.38.34", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", @@ -3551,10 +3602,10 @@ dependencies = [ [[package]] name = "smithay-drm-extras" version = "0.1.0" -source = "git+https://github.com/Smithay/smithay.git#c4844428f8de024222a44cd906060f2af77f4ba1" +source = "git+https://github.com/Smithay/smithay.git#f364c73cae953aebfa189075e9f118f9008e100b" dependencies = [ "drm", - "edid-rs", + "libdisplay-info", ] [[package]] @@ -3629,9 +3680,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -3644,7 +3695,7 @@ version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "cfg-expr", + "cfg-expr 0.15.8", "heck 0.5.0", "pkg-config", "toml", @@ -3653,11 +3704,11 @@ dependencies = [ [[package]] name = "system-deps" -version = "7.0.1" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" +checksum = "070a0a5e7da2d24be457809c4b3baa57a835fd2829ad8b86f9a049052fe71031" dependencies = [ - "cfg-expr", + "cfg-expr 0.16.0", "heck 0.5.0", "pkg-config", "toml", @@ -3687,9 +3738,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", + "fastrand 2.1.1", "once_cell", - "rustix 0.38.34", + "rustix 0.38.37", "windows-sys 0.59.0", ] @@ -3741,7 +3792,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3820,17 +3871,6 @@ dependencies = [ "winnow 0.5.40", ] -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.20" @@ -3850,6 +3890,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3863,7 +3904,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3907,9 +3948,9 @@ dependencies = [ [[package]] name = "tracy-client" -version = "0.17.1" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63de1e1d4115534008d8fd5788b39324d6f58fc707849090533828619351d855" +checksum = "373db47331c3407b343538df77eea2516884a0b126cdfb4b135acfd400015dd7" dependencies = [ "loom", "once_cell", @@ -3918,9 +3959,9 @@ dependencies = [ [[package]] name = "tracy-client-sys" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b98232a2447ce0a58f9a0bfb5f5e39647b5c597c994b63945fcccd1306fafb" +checksum = "49cf0064dcb31c99aa1244c1b93439359e53f72ed217eef5db50abd442241e9a" dependencies = [ "cc", ] @@ -3968,9 +4009,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-linebreak" @@ -4067,34 +4108,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4104,9 +4146,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4114,32 +4156,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wayland-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.34", + "rustix 0.38.37", "scoped-tls", "smallvec", "wayland-sys", @@ -4147,12 +4189,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.5" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ "bitflags 2.6.0", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-scanner", ] @@ -4170,20 +4212,20 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.5" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "wayland-client", "xcursor", ] [[package]] name = "wayland-egl" -version = "0.32.3" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f878665a24396ce3a8509116e03fb19d5401620e59daa303e256a657ee096204" +checksum = "4e3cb8b84ff95310fe59ce6c61f1fa344ec22f4c240c369a2b20f15caebfede4" dependencies = [ "wayland-backend", "wayland-sys", @@ -4191,9 +4233,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.3" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -4204,9 +4246,9 @@ dependencies = [ [[package]] name = "wayland-protocols-misc" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfe44d48a0e51909c89da297f6b43bb814b881c78b69e254a4558a5fa8752887" +checksum = "d40dd9d2f7f2713724d84b920d6f73ff878f6a353712942f75f78f4dadb72886" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -4217,9 +4259,9 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4" +checksum = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -4230,9 +4272,9 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" +checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -4244,34 +4286,34 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", - "quick-xml 0.34.0", + "quick-xml 0.36.1", "quote", ] [[package]] name = "wayland-server" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a4bab6d420ee4a609b63ef4d5f9b5d309c6b93a029fccab70f2594c0cb3ae" +checksum = "0f18d47038c0b10479e695d99ed073e400ccd9bdbb60e6e503c96f62adcb12b6" dependencies = [ "bitflags 2.6.0", "downcast-rs", "io-lifetimes 2.0.3", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-scanner", ] [[package]] name = "wayland-sys" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "libc", @@ -4283,9 +4325,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4382,7 +4424,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4393,7 +4435,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4661,7 +4703,7 @@ dependencies = [ "pin-project", "raw-window-handle", "redox_syscall", - "rustix 0.38.34", + "rustix 0.38.37", "smithay-client-toolkit", "smol_str", "tracing", @@ -4720,7 +4762,7 @@ dependencies = [ "libc", "libloading", "once_cell", - "rustix 0.38.34", + "rustix 0.38.37", "x11rb-protocol", ] @@ -4732,9 +4774,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d491ee231a51ae64a5b762114c3ac2104b967aadba1de45c86ca42cf051513b7" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg-home" @@ -4778,9 +4820,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.21" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" [[package]] name = "xshell" @@ -4896,7 +4938,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 45667d2b83149..3748f3dbf819c 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , nix-update-script , pkg-config +, libdisplay-info , libxkbcommon , pango , pipewire @@ -20,19 +21,19 @@ rustPlatform.buildRustPackage rec { pname = "niri"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "YaLTeR"; repo = "niri"; rev = "v${version}"; - hash = "sha256-13xynDWoOqogUKZTf6lz267hEQGdCE+BE6acs2G3j8k="; + hash = "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "smithay-0.3.0" = "sha256-4lmCbdW+fOnPWEDAbKk4LFcr9KK+akjUJqiwm0pK8Uw="; + "smithay-0.3.0" = "sha256-/3BO66yVoo63+5rwrZzoxhSTncvLyHdvtSaApFj3fBg="; "libspa-0.8.0" = "sha256-R68TkFbzDFA/8Btcar+0omUErLyBMm4fsmQlCvfqR9o="; }; }; @@ -48,6 +49,7 @@ rustPlatform.buildRustPackage rec { wayland systemd # For libudev seatd # For libseat + libdisplay-info libxkbcommon libinput mesa # For libgbm diff --git a/pkgs/by-name/ni/nitch/package.nix b/pkgs/by-name/ni/nitch/package.nix index 772f259ba6fcf..e241bcd7e61e7 100644 --- a/pkgs/by-name/ni/nitch/package.nix +++ b/pkgs/by-name/ni/nitch/package.nix @@ -13,7 +13,7 @@ buildNimPackage { patches = [ (fetchpatch { url = "https://github.com/unxsh/nitch/commit/6831cf96144f58c4da298a0bc9b50d33056f6c08.patch"; - sha256 = "sha256-uZUzUBLHBsssNqDxZ0NuTRMN9/gBxIlIiGgQkqCqEFc="; + hash = "sha256-uZUzUBLHBsssNqDxZ0NuTRMN9/gBxIlIiGgQkqCqEFc="; }) (fetchpatch { url = "https://github.com/ssleert/nitch/commit/ff10dea47dbc4d9736bd839b87869f53166cf395.patch"; diff --git a/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix b/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix new file mode 100644 index 0000000000000..843a3637a8559 --- /dev/null +++ b/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitHub, + writeShellScriptBin, + gcc-arm-embedded, + pynitrokey, + python3, + + # The make target to run + makeTarget ? "release-buildv", + # Whether the firmware should include the production public key for the bootloader + release ? true, +}: + +let + # The latest release is found on the releases page; do not rely on the latest tag. + # They normally contain the suffix `.nitrokey`. + # https://github.com/Nitrokey/nitrokey-fido2-firmware/releases + version = "2.4.1"; + + # The firmware version is pulled from `git` so we stub it here to avoid pulling the whole program. + fakeGit = writeShellScriptBin "git" '' + echo "${version}.nitrokey" + ''; + +in +stdenv.mkDerivation { + pname = "nitrokey-fido2-firmware"; + inherit version; + + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "nitrokey-fido2-firmware"; + rev = "${version}.nitrokey"; + hash = "sha256-7AsnxRf8mdybI6Mup2mV01U09r5C/oUX6fG2ymkkOOo="; + fetchSubmodules = true; + }; + + postPatch = '' + # Remove a duplicate firmware_version definition. Without this, + # firmware_version is defined multiple times, triggering a build error. + substituteInPlace fido2/version.h \ + --replace-fail "const version_t firmware_version ;" "" + ''; + + nativeBuildInputs = [ + fakeGit + # only gcc-arm-embedded includes libc_nano.a + gcc-arm-embedded + pynitrokey + python3 + ]; + + preBuild = '' + cd targets/stm32l432 + ''; + + makeFlags = [ + "${makeTarget}" + "RELEASE=${toString release}" + ]; + + installPhase = '' + runHook preInstall + cp -r release $out + runHook postInstall + ''; + + meta = { + description = "Firmware for the Nitrokey FIDO2 device"; + homepage = "https://github.com/Nitrokey/nitrokey-fido2-firmware"; + maintainers = with lib.maintainers; [ + amerino + kiike + imadnyc + ]; + license = with lib.licenses; [ + asl20 + mit + ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix b/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix new file mode 100644 index 0000000000000..8c14178fc7440 --- /dev/null +++ b/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitHub, + writeShellScriptBin, + python3, + srecord, + gcc-arm-embedded, +}: + +let + version = "0.15"; + + # The firmware version is pulled from `git` so we stub it here to avoid pulling the whole program. + fakeGit = writeShellScriptBin "git" '' + echo "${version}.nitrokey" + ''; + +in + +stdenv.mkDerivation { + pname = "nitrokey-pro-firmware"; + inherit version; + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "nitrokey-pro-firmware"; + rev = "v${version}"; + hash = "sha256-q+kbEOLA05xR6weAWDA1hx4fVsaN9UNKiOXGxPRfXuI="; + fetchSubmodules = true; + }; + + postPatch = '' + patchShebangs dapboot/libopencm3/scripts + ''; + + nativeBuildInputs = [ + fakeGit + gcc-arm-embedded + python3 + srecord + ]; + + installPhase = '' + runHook preInstall + install -D build/gcc/bootloader.hex $out/bootloader.hex + install -D build/gcc/nitrokey-pro-firmware.hex $out/firmware.hex + runHook postInstall + ''; + + meta = { + description = "Firmware for the Nitrokey Pro device"; + homepage = "https://github.com/Nitrokey/nitrokey-pro-firmware"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + imadnyc + kiike + amerino + ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/ni/nitrokey-start-firmware/package.nix b/pkgs/by-name/ni/nitrokey-start-firmware/package.nix new file mode 100644 index 0000000000000..f4b20b56ea714 --- /dev/null +++ b/pkgs/by-name/ni/nitrokey-start-firmware/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gcc-arm-embedded, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nitrokey-start-firmware"; + version = "13"; + + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "nitrokey-start-firmware"; + rev = "RTM.${finalAttrs.version}"; + hash = "sha256-POW1d/fgOyYa7127FSTCtHGyMWYzKW0qqA1WUyvNc3w="; + fetchSubmodules = true; + }; + + sourceRoot = "source/src"; + + postPatch = '' + patchShebangs configure + ''; + + # Avoid additional arguments are added to configureFlags + configurePlatforms = [ ]; + + # from release/Makefile + configureFlags = [ + "--target=NITROKEY_START-g" + "--vidpid=20a0:4211" + "--enable-factory-reset" + "--enable-certdo" + ]; + + nativeBuildInputs = [ gcc-arm-embedded ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + mkdir $out + cp build/gnuk.{bin,hex} $out/ + runHook postInstall + ''; + + meta = { + description = "Firmware for the Nitrokey Start device"; + homepage = "https://github.com/Nitrokey/nitrokey-start-firmware"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + amerino + imadnyc + kiike + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ni/nitrokey-trng-rs232-firmware/package.nix b/pkgs/by-name/ni/nitrokey-trng-rs232-firmware/package.nix new file mode 100644 index 0000000000000..dea4e7e1dbf98 --- /dev/null +++ b/pkgs/by-name/ni/nitrokey-trng-rs232-firmware/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkgsCross, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nitrokey-trng-rs232-firmware"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "nitrokey-trng-rs232-firmware"; + rev = "v${finalAttrs.version}"; + hash = "sha256-vY/9KAGB6lTkkjW9zUiHA3wD2d35cEBVBTr12bHCy4k="; + }; + + nativeBuildInputs = [ pkgsCross.avr.stdenv.cc ]; + + sourceRoot = "source/src"; + + makeFlags = [ "all" ]; + + installPhase = '' + runHook preInstall + install -D TRNGSerial.bin $out/TRNGSerial.bin + runHook postInstall + ''; + + meta = { + description = "Firmware for the Nitrokey TRNG RS232 device"; + longDescription = '' + This package does not provide an executable. It should be built using `nix-build -A nitrokey-trng-rs232-firmware` or `nix build nixpkgs#nitrokey-trng-rs232-firmware` and flashed using `libnitrokey` + ''; + homepage = "https://github.com/Nitrokey/nitrokey-trng-rs232-firmware"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + amerino + imadnyc + kiike + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ni/nix-btm/package.nix b/pkgs/by-name/ni/nix-btm/package.nix index 42496a5bff030..a7d94b4863b58 100644 --- a/pkgs/by-name/ni/nix-btm/package.nix +++ b/pkgs/by-name/ni/nix-btm/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-qUZ3zJjQrteFQerBKFH/+Ys0uOzvI7DH9rCaVtseJMM="; - buildInputs = lib.optionals stdenv.isDarwin + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices SystemConfiguration ]); meta = with lib; { diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix index 214c603ee2ded..ff56c097c29a5 100644 --- a/pkgs/by-name/ni/nix-direnv/package.nix +++ b/pkgs/by-name/ni/nix-direnv/package.nix @@ -1,23 +1,25 @@ -{ resholve, lib, coreutils, direnv, nix, fetchFromGitHub }: +{ + resholve, + lib, + coreutils, + nix, + fetchFromGitHub, + writeText, +}: # resholve does not yet support `finalAttrs` call pattern hence `rec` # https://github.com/abathur/resholve/issues/107 resholve.mkDerivation rec { pname = "nix-direnv"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - hash = "sha256-imUlc5v/Ow7dgjCjTyEeet+4lNHLeEwfqGQcB4dKcao="; + hash = "sha256-oNqhPqgQT92yxbKmcgX4F3e2yTUPyXYG7b2xQm3TvQw="; }; - # skip min version checks which are redundant when built with nix - postPatch = '' - sed -i 1iNIX_DIRENV_SKIP_VERSION_CHECK=1 direnvrc - ''; - installPhase = '' runHook preInstall install -m400 -D direnvrc $out/share/nix-direnv/direnvrc @@ -28,7 +30,7 @@ resholve.mkDerivation rec { default = { scripts = [ "share/nix-direnv/direnvrc" ]; interpreter = "none"; - inputs = [ coreutils nix ]; + inputs = [ coreutils ]; fake = { builtin = [ "PATH_add" @@ -43,23 +45,36 @@ resholve.mkDerivation rec { # cannot be reached when built with nix "shasum" ]; + external = [ + # We want to reference the ambient Nix when possible, and have custom logic + # for the fallback + "nix" + ]; }; keep = { "$cmd" = true; "$direnv" = true; + + # Nix fallback implementation + "$_nix_direnv_nix" = true; + "$ambient_nix" = true; + "$NIX_DIRENV_FALLBACK_NIX" = true; }; - execer = [ - "cannot:${direnv}/bin/direnv" - "cannot:${nix}/bin/nix" - ]; + prologue = + (writeText "prologue.sh" '' + NIX_DIRENV_FALLBACK_NIX=''${NIX_DIRENV_FALLBACK_NIX:-${lib.getExe nix}} + '').outPath; }; }; meta = { description = "Fast, persistent use_nix implementation for direnv"; - homepage = "https://github.com/nix-community/nix-direnv"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ mic92 bbenne10 ]; + homepage = "https://github.com/nix-community/nix-direnv"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + mic92 + bbenne10 + ]; }; } diff --git a/pkgs/by-name/ni/nix-health/package.nix b/pkgs/by-name/ni/nix-health/package.nix index 3cb4fc881c7b0..2081714d50a99 100644 --- a/pkgs/by-name/ni/nix-health/package.nix +++ b/pkgs/by-name/ni/nix-health/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libiconv openssl ] # Use a newer SDK for CoreFoundation, because the sysinfo crate requires # it, https://github.com/GuillaumeGomez/sysinfo/issues/915 - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ IOKit CoreFoundation ]); diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix index 36b6917fcf40b..94c4068cb7358 100644 --- a/pkgs/by-name/ni/nix-ld/package.nix +++ b/pkgs/by-name/ni/nix-ld/package.nix @@ -6,17 +6,18 @@ lib, }: -rustPlatform.buildRustPackage { - name = "nix-ld"; +rustPlatform.buildRustPackage rec { + pname = "nix-ld"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mic92"; repo = "nix-ld"; - rev = "2.0.0"; - sha256 = "sha256-rmSXQ4MYQe/OFDBRlqqw5kyp9b/aeEg0Fg9c167xofg="; + rev = version; + hash = "sha256-rmSXQ4MYQe/OFDBRlqqw5kyp9b/aeEg0Fg9c167xofg="; }; - cargoHash = "sha256-w6CQx9kOyBtM2nMwdFb+LtU4oHVEYrTNVmH1A6R5DHM="; + cargoHash = "sha256-BVulfs4zm3Iruq00H49QcxR3V+iZvePtLBTytdXfLP4="; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix new file mode 100644 index 0000000000000..0b78c43ba6f19 --- /dev/null +++ b/pkgs/by-name/ni/nix-plugin-pijul/package.nix @@ -0,0 +1,90 @@ +{ + lib, + stdenv, + fetchzip, + cmake, + pkg-config, + boost, + howard-hinnant-date, + nix, + + # for tests + runCommand, + pijul, + nixVersions, + nix-plugin-pijul, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "nix-plugin-pijul"; + version = "0.1.4"; + + src = fetchzip { + url = "https://dblsaiko.net/pub/nix-plugin-pijul/nix-plugin-pijul-${finalAttrs.version}.tar.gz"; + hash = "sha256-X25tFqcAgNWmkMxbfXGx8KJ25BV6sFWAQM9NvjQeSmQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + boost + howard-hinnant-date + nix + ]; + + passthru.tests = let + localRepoCheck = nix: + runCommand "localRepoCheck-${nix.name}" + { + nativeBuildInputs = [ + pijul + nix + ]; + } + '' + export HOME=$(mktemp -d) + export EDITOR=true + pijul identity new --no-link --no-prompt --display-name 'Test User' --email 'test@example.com' + + pijul init repo + cd repo + + echo "it works" > foo + pijul add foo + pijul record --message 'Add foo' + + output=$( + nix \ + --option plugin-files ${nix-plugin-pijul.override {inherit nix;}}/lib/nix/plugins/pijul.so \ + --extra-experimental-features 'nix-command flakes' \ + eval --impure --raw --expr "builtins.readFile ((builtins.fetchTree \"pijul+file://$PWD\") + \"/foo\")" + ) + + echo $output + + [[ "$output" = "it works" ]] + + mkdir $out + ''; + in { + stable = localRepoCheck nixVersions.stable; + latest = localRepoCheck nixVersions.latest; + git = localRepoCheck nixVersions.git; + nix_2_18 = localRepoCheck nixVersions.nix_2_18; + nix_2_19 = localRepoCheck nixVersions.nix_2_19; + nix_2_20 = localRepoCheck nixVersions.nix_2_20; + nix_2_21 = localRepoCheck nixVersions.nix_2_21; + nix_2_22 = localRepoCheck nixVersions.nix_2_22; + nix_2_23 = localRepoCheck nixVersions.nix_2_23; + }; + + meta = { + description = "Plugin to add Pijul support to the Nix package manager"; + homepage = "https://nest.pijul.com/dblsaiko/nix-plugin-pijul"; + license = lib.licenses.lgpl3Plus; + maintainers = [lib.maintainers.dblsaiko]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix b/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix index 158e8e6056a29..6d2633af06517 100644 --- a/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix +++ b/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { owner = "tweag"; repo = "nix-store-gcs-proxy"; rev = "v${version}"; - sha256 = "0804p65px4wd7gzxggpdxsazkd1hbz1p15zzaxf9ygc6sh26ncln"; + hash = "sha256-ljJrBNSGPZ9cV/+XcMNfMLT5le7tvtf/O42Tfou5BCA="; }; vendorHash = "sha256-Bm3yFzm2LXOPYWQDk/UBusV0lPfc/BCKIb3pPlWgDFo="; diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix new file mode 100644 index 0000000000000..3cb661703114d --- /dev/null +++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix @@ -0,0 +1,43 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + systemd, +}: + +rustPlatform.buildRustPackage rec { + pname = "nix-store-veritysetup-generator"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "nikstur"; + repo = "nix-store-veritysetup-generator"; + rev = version; + hash = "sha256-kQ+mFBnvxmEH2+z1sDaehGInEsBpfZu8LMAseGjZ3/I="; + }; + + sourceRoot = "${src.name}/rust"; + + cargoHash = "sha256-NCxPLsBJX4Dp8LcWrjVrocqDBvWc587DF3WPXZg1uFY="; + + env = { + SYSTEMD_VERITYSETUP_PATH = "${systemd}/lib/systemd/systemd-veritysetup"; + SYSTEMD_ESCAPE_PATH = "${systemd}/bin/systemd-escape"; + }; + + # Use a fake path in tests so that they are not dependent on specific Nix + # Store paths and thus don't break on different Nixpkgs invocations. This is + # relevant so that this package can be compiled on different architectures. + preCheck = '' + export SYSTEMD_VERITYSETUP_PATH="systemd-veritysetup"; + ''; + + stripAllList = [ "bin" ]; + + meta = with lib; { + description = "Systemd unit generator for a verity protected Nix Store"; + homepage = "https://github.com/nikstur/nix-store-veritysetup-generator"; + license = licenses.mit; + maintainers = with lib.maintainers; [ nikstur ]; + }; +} diff --git a/pkgs/by-name/ni/nix-top/package.nix b/pkgs/by-name/ni/nix-top/package.nix index 55170ec40896d..fa69693781e0b 100644 --- a/pkgs/by-name/ni/nix-top/package.nix +++ b/pkgs/by-name/ni/nix-top/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/nix-top \ --prefix PATH : "$out/libexec/nix-top:${additionalPath}" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s /bin/stty $out/libexec/nix-top '' + '' diff --git a/pkgs/by-name/ni/nix-update/nix-update-script.nix b/pkgs/by-name/ni/nix-update/nix-update-script.nix new file mode 100644 index 0000000000000..82da510d50616 --- /dev/null +++ b/pkgs/by-name/ni/nix-update/nix-update-script.nix @@ -0,0 +1,11 @@ +{ + lib, + nix-update, +}: + +{ + attrPath ? null, + extraArgs ? [ ], +}: + +[ "${lib.getExe nix-update}" ] ++ extraArgs ++ lib.optionals (attrPath != null) [ attrPath ] diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index ecd3788847678..c7212f1a313c7 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -1,42 +1,62 @@ -{ lib -, python3 -, fetchFromGitHub -, nix -, nix-prefetch-git -, nixpkgs-review +{ + lib, + callPackage, + fetchFromGitHub, + nix, + nix-prefetch-git, + nixpkgs-review, + python3Packages, }: -python3.pkgs.buildPythonApplication rec { - pname = "nix-update"; - version = "1.5.0"; - pyproject = true; +let + self = python3Packages.buildPythonApplication { + pname = "nix-update"; + version = "1.5.2"; + pyproject = true; - src = fetchFromGitHub { - owner = "Mic92"; - repo = pname; - rev = version; - hash = "sha256-zWkJs6anDddTiUestnqGVfG1GErLJr5EarWI3DcKZpU="; - }; + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nix-update"; + rev = "refs/tags/${self.version}"; + hash = "sha256-6kR4UEBZvbQNoR3l8/It5ZTCC+mB14jzj7MNnFoQJwE="; + }; + + build-system = [ python3Packages.setuptools ]; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ + nix + nix-prefetch-git + nixpkgs-review + ]) + ]; + + checkPhase = '' + runHook preCheck + + $out/bin/nix-update --help >/dev/null + + runHook postCheck + ''; + + passthru = { + nix-update-script = callPackage ./nix-update-script.nix { nix-update = self; }; + }; - nativeBuildInputs = [ - python3.pkgs.setuptools - ]; - - makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch-git nixpkgs-review ]) - ]; - - checkPhase = '' - $out/bin/nix-update --help >/dev/null - ''; - - meta = with lib; { - description = "Swiss-knife for updating nix packages"; - inherit (src.meta) homepage; - changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda mic92 ]; - mainProgram = "nix-update"; - platforms = platforms.all; + meta = { + homepage = "https://github.com/Mic92/nix-update/"; + description = "Swiss-knife for updating nix packages"; + changelog = "https://github.com/Mic92/nix-update/releases/tag/${self.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + figsoda + mic92 + ]; + mainProgram = "nix-update"; + }; }; -} +in +self diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix new file mode 100644 index 0000000000000..02f31ee19739e --- /dev/null +++ b/pkgs/by-name/ni/nix-weather/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + darwin, + libiconv, + installShellFiles, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "nix-weather"; + version = "0.0.4"; + + # fetch from GitHub and not upstream forgejo because cafkafk doesn't want to + # pay for bandwidth + src = fetchFromGitHub { + owner = "cafkafk"; + repo = "nix-weather"; + rev = "v${version}"; + hash = "sha256-15FUA4fszbAVXop3IyOHfxroyTt9/SkWZsSTUh9RtwY="; + }; + + cargoHash = "sha256-vMeljXNWfFRyeQ4ZQ/Qe1vcW5bg5Y14aEH5HgEwOX3Q="; + cargoExtraArgs = "-p nix-weather"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = + [ + openssl + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + outputs = [ + "out" + "man" + ]; + + # This is where `build.rs` puts manpages + MAN_OUT = "./man"; + + postInstall = '' + cd crates/nix-weather + installManPage man/nix-weather.1 + installShellCompletion \ + --fish man/nix-weather.fish \ + --bash man/nix-weather.bash \ + --zsh man/_nix-weather + mkdir -p $out + cd ../.. + ''; + + # We are the only distro that will ever package this, thus ryanbot will not + # be able to find updates through repology and we need this. + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Check Cache Availablility of NixOS Configurations"; + longDescription = '' + Fast rust tool to check availability of your entire system in caches. It + so to speak "checks the weather" before going to update. Useful for + debugging cache utilization and timing updates and deployments. + + Heavily inspired by guix weather. + ''; + homepage = "https://git.fem.gg/cafkafk/nix-weather"; + changelog = "https://git.fem.gg/cafkafk/nix-weather/releases/tag/v${version}"; + license = licenses.eupl12; + mainProgram = "nix-weather"; + maintainers = with maintainers; [ + cafkafk + freyacodes + ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix index ad97b1356b3e1..21d6c9f15d0cd 100644 --- a/pkgs/by-name/ni/nix-web/package.nix +++ b/pkgs/by-name/ni/nix-web/package.nix @@ -26,8 +26,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-romL/RALr/pmwUA8/SN4AOwc+Vndspd1Yrqs0AHPYRY="; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional (!stdenv.isDarwin) openssl - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); + buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) openssl + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); postPatch = '' substituteInPlace nix-web/nix-web.service \ diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix new file mode 100644 index 0000000000000..ed007d20a686d --- /dev/null +++ b/pkgs/by-name/ni/nix-your-shell/package.nix @@ -0,0 +1,30 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: +rustPlatform.buildRustPackage rec { + pname = "nix-your-shell"; + version = "1.4.6"; + + src = fetchFromGitHub { + owner = "MercuryTechnologies"; + repo = "nix-your-shell"; + rev = "v${version}"; + hash = "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c="; + }; + + cargoHash = "sha256-2NgN2/dr48ogkcjOq6UE4jDQBeewceWzdpRlXqi744s="; + + meta = { + mainProgram = "nix-your-shell"; + 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/tags/v${version}"; + license = [ lib.licenses.mit ]; + maintainers = with lib.maintainers; [ _9999years ]; + }; + + passthru.updateScript = nix-update-script { }; +} diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index 55a7deb1b4424..bc449ce11245a 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-AdSrhQhJb9ObCgM1iXnoIBBl+6cjRbuTST4Lt02AP5Q="; + hash = "sha256-ssx6Y665uoOO3PX6Mp9NAF8sqoGb7Ezfw+bTY69aGlE="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/pkgs/by-name/ni/nixos-build-vms/build-vms.nix similarity index 87% rename from nixos/modules/installer/tools/nixos-build-vms/build-vms.nix rename to pkgs/by-name/ni/nixos-build-vms/build-vms.nix index 21a257378a633..12b3c44746a40 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix +++ b/pkgs/by-name/ni/nixos-build-vms/build-vms.nix @@ -1,5 +1,6 @@ { system ? builtins.currentSystem , config ? {} +, nixpkgs , networkExpr }: @@ -9,9 +10,9 @@ let imports = [ module ]; }) (import networkExpr); - pkgs = import ../../../../.. { inherit system config; }; + pkgs = import nixpkgs { inherit system config; }; - testing = import ../../../../lib/testing-python.nix { + testing = import "${pkgs.path}/nixos/lib/testing-python.nix" { inherit system pkgs; }; diff --git a/nixos/modules/installer/tools/manpages/nixos-build-vms.8 b/pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.8 similarity index 100% rename from nixos/modules/installer/tools/manpages/nixos-build-vms.8 rename to pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.8 diff --git a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.sh similarity index 86% rename from nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh rename to pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.sh index 490ede04e6bb0..d55eb5d0620f8 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh +++ b/pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.sh @@ -49,5 +49,6 @@ then fi # Build a network of VMs -nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \ - --argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}" +nix-build @buildVms@ \ + --argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}" \ + --arg nixpkgs "<nixpkgs>" diff --git a/pkgs/by-name/ni/nixos-build-vms/package.nix b/pkgs/by-name/ni/nixos-build-vms/package.nix new file mode 100644 index 0000000000000..fc8b4f403e94c --- /dev/null +++ b/pkgs/by-name/ni/nixos-build-vms/package.nix @@ -0,0 +1,22 @@ +{ + substituteAll, + runtimeShell, + installShellFiles, +}: +substituteAll { + name = "nixos-build-vms"; + src = ./nixos-build-vms.sh; + inherit runtimeShell; + buildVms = ./build-vms.nix; + + dir = "bin"; + isExecutable = true; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage ${./nixos-build-vms.8} + ''; + + meta.mainProgram = "nixos-build-vms"; +} diff --git a/nixos/modules/installer/tools/manpages/nixos-enter.8 b/pkgs/by-name/ni/nixos-enter/nixos-enter.8 similarity index 100% rename from nixos/modules/installer/tools/manpages/nixos-enter.8 rename to pkgs/by-name/ni/nixos-enter/nixos-enter.8 diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/pkgs/by-name/ni/nixos-enter/nixos-enter.sh similarity index 99% rename from nixos/modules/installer/tools/nixos-enter.sh rename to pkgs/by-name/ni/nixos-enter/nixos-enter.sh index 9141cc2857024..214ab7dfbda49 100755 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/pkgs/by-name/ni/nixos-enter/nixos-enter.sh @@ -3,6 +3,8 @@ set -e +export PATH=@path@:$PATH + # Re-exec ourselves in a private mount namespace so that our bind # mounts get cleaned up automatically. if [ -z "$NIXOS_ENTER_REEXEC" ]; then diff --git a/pkgs/by-name/ni/nixos-enter/package.nix b/pkgs/by-name/ni/nixos-enter/package.nix new file mode 100644 index 0000000000000..38fe2de663fd3 --- /dev/null +++ b/pkgs/by-name/ni/nixos-enter/package.nix @@ -0,0 +1,34 @@ +{ + lib, + substituteAll, + runtimeShell, + installShellFiles, + util-linuxMinimal, +}: +substituteAll { + name = "nixos-enter"; + src = ./nixos-enter.sh; + + inherit runtimeShell; + + path = lib.makeBinPath [ + util-linuxMinimal + ]; + + dir = "bin"; + isExecutable = true; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage ${./nixos-enter.8} + ''; + + meta = { + description = "Run a command in a NixOS chroot environment"; + homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nixos-install"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + mainProgram = "nixos-enter"; + }; +} diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix new file mode 100644 index 0000000000000..4d0bb4abb3822 --- /dev/null +++ b/pkgs/by-name/ni/nixos-facter/package.nix @@ -0,0 +1,71 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + hwinfo, + libusb1, + gcc, + pkg-config, + util-linux, + pciutils, + stdenv, +}: +let + # We are waiting on some changes to be merged upstream: https://github.com/openSUSE/hwinfo/pulls + hwinfoOverride = hwinfo.overrideAttrs { + src = fetchFromGitHub { + owner = "numtide"; + repo = "hwinfo"; + rev = "a559f34934098d54096ed2078e750a8245ae4044"; + hash = "sha256-3abkWPr98qXXQ17r1Z43gh2M5hl/DHjW2hfeWl+GSAs="; + }; + }; +in +buildGoModule rec { + pname = "nixos-facter"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "numtide"; + repo = "nixos-facter"; + rev = "v${version}"; + hash = "sha256-vlPmvCrgX64dcf//BPtQszBt7dkq35JpgQg+/LW0AqM="; + }; + + vendorHash = "sha256-5leiTNp3FJmgFd0SKhu18hxYZ2G9SuQPhZJjki2SDVs="; + + CGO_ENABLED = 1; + + buildInputs = [ + libusb1 + hwinfoOverride + ]; + + nativeBuildInputs = [ + gcc + pkg-config + ]; + + runtimeInputs = [ + libusb1 + util-linux + pciutils + ]; + + ldflags = [ + "-s" + "-w" + "-X git.numtide.com/numtide/nixos-facter/build.Name=nixos-facter" + "-X git.numtide.com/numtide/nixos-facter/build.Version=v${version}" + "-X github.com/numtide/nixos-facter/pkg/build.System=${stdenv.hostPlatform.system}" + ]; + + meta = { + description = "Declarative hardware configuration for NixOS"; + homepage = "https://github.com/numtide/nixos-facter"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.brianmcgee ]; + mainProgram = "nixos-facter"; + platforms = lib.platforms.linux; + }; +} diff --git a/nixos/modules/installer/tools/manpages/nixos-install.8 b/pkgs/by-name/ni/nixos-install/nixos-install.8 similarity index 100% rename from nixos/modules/installer/tools/manpages/nixos-install.8 rename to pkgs/by-name/ni/nixos-install/nixos-install.8 diff --git a/nixos/modules/installer/tools/nixos-install.sh b/pkgs/by-name/ni/nixos-install/nixos-install.sh similarity index 99% rename from nixos/modules/installer/tools/nixos-install.sh rename to pkgs/by-name/ni/nixos-install/nixos-install.sh index a76b4ffb44444..6098aac7d3785 100755 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/pkgs/by-name/ni/nixos-install/nixos-install.sh @@ -245,6 +245,7 @@ if [[ -z $noBootLoader ]]; then ln -sfn /proc/mounts "$mountPoint"/etc/mtab export mountPoint NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -c "$(cat <<'EOF' + set -e # Create a bind mount for each of the mount points inside the target file # system. This preserves the validity of their absolute paths after changing # the root with `nixos-enter`. diff --git a/pkgs/by-name/ni/nixos-install/package.nix b/pkgs/by-name/ni/nixos-install/package.nix new file mode 100644 index 0000000000000..fbe75619674ed --- /dev/null +++ b/pkgs/by-name/ni/nixos-install/package.nix @@ -0,0 +1,38 @@ +{ + lib, + substituteAll, + runtimeShell, + installShellFiles, + nix, + jq, + nixos-enter, + util-linuxMinimal, +}: +substituteAll { + name = "nixos-install"; + src = ./nixos-install.sh; + + inherit runtimeShell nix; + + path = lib.makeBinPath [ + jq + nixos-enter + util-linuxMinimal + ]; + + dir = "bin"; + isExecutable = true; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage ${./nixos-install.8} + ''; + + meta = { + description = "Install bootloader and NixOS"; + homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nixos-install"; + license = lib.licenses.mit; + mainProgram = "nixos-install"; + }; +} diff --git a/pkgs/by-name/ni/nixpkgs-fmt/package.nix b/pkgs/by-name/ni/nixpkgs-fmt/package.nix index cbb2ae1d90176..e1d329acc699e 100644 --- a/pkgs/by-name/ni/nixpkgs-fmt/package.nix +++ b/pkgs/by-name/ni/nixpkgs-fmt/package.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6Ut4/ix915EoaPCewoG3KhKBA+OaggpDqnx2nvKxEpQ="; + hash = "sha256-6Ut4/ix915EoaPCewoG3KhKBA+OaggpDqnx2nvKxEpQ="; }; cargoHash = "sha256-yIwCBm46sgrpTt45uCyyS7M6V0ReGUXVu7tyrjdNqeQ="; diff --git a/pkgs/by-name/ni/nixtract/package.nix b/pkgs/by-name/ni/nixtract/package.nix index e046e49d84f48..2885a13f300de 100644 --- a/pkgs/by-name/ni/nixtract/package.nix +++ b/pkgs/by-name/ni/nixtract/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/nm/nmap/package.nix b/pkgs/by-name/nm/nmap/package.nix index 6b6a83c7eae9a..32a6f1a322ec2 100644 --- a/pkgs/by-name/nm/nmap/package.nix +++ b/pkgs/by-name/nm/nmap/package.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "sha256-4Uq1MOR7Wv2I8ciiusf4nNj+a0eOItJVxbm923ocV3g="; + hash = "sha256-4Uq1MOR7Wv2I8ciiusf4nNj+a0eOItJVxbm923ocV3g="; }; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace libz/configure \ --replace /usr/bin/libtool ar \ --replace 'AR="libtool"' 'AR="ar"' \ @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { install -m 444 -D nselib/data/passwords.lst $out/share/wordlists/nmap.lst ''; + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -change liblinear.so.5 ${liblinear.out}/lib/liblinear.5.dylib $out/bin/nmap + ''; + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.bintools.targetPrefix}ar" "RANLIB=${stdenv.cc.bintools.targetPrefix}ranlib" @@ -62,6 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Free and open source utility for network discovery and security auditing"; homepage = "http://www.nmap.org"; + changelog = "https://nmap.org/changelog.html#${version}"; license = lib.licenses.gpl2Only; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/nm/nmapsi4/package.nix b/pkgs/by-name/nm/nmapsi4/package.nix index a9574b4baa012..682e7f1f2d12b 100644 --- a/pkgs/by-name/nm/nmapsi4/package.nix +++ b/pkgs/by-name/nm/nmapsi4/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "nmapsi4"; repo = "nmapsi4"; rev = "v${version}"; - sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY="; + hash = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY="; }; nativeBuildInputs = [ @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt frontend for nmap"; mainProgram = "nmapsi4"; + changelog = "https://github.com/nmapsi4/nmapsi4/releases/tag/${src.rev}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ peterhoeg ]; inherit (src.meta) homepage; diff --git a/pkgs/by-name/nn/nncp/package.nix b/pkgs/by-name/nn/nncp/package.nix index 23a85760940b1..bbacef76fbb02 100644 --- a/pkgs/by-name/nn/nncp/package.nix +++ b/pkgs/by-name/nn/nncp/package.nix @@ -3,7 +3,7 @@ , fetchurl , lib , genericUpdater -, go_1_21 +, go , perl , stdenv , writeShellScript @@ -11,16 +11,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "nncp"; - version = "8.10.0"; + version = "8.11.0"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/nncp-${finalAttrs.version}.tar.xz"; - sha256 = "154e13ba15c0ea93f54525793b0699e496b2db7281e1555f08d785a528f3f7fc"; + hash = "sha256-7EEUvNkYSqh4HzjbqjqgQlXfu6nDU2v3WWnma8M0r/I="; }; nativeBuildInputs = [ - go_1_21 + go ]; # Build parameters @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; changelog = "http://www.nncpgo.org/News.html"; description = "Secure UUCP-like store-and-forward exchanging"; downloadPage = "http://www.nncpgo.org/Tarballs.html"; diff --git a/pkgs/by-name/no/nodemon/package.nix b/pkgs/by-name/no/nodemon/package.nix index 03e432628f650..cc51b9263fc8b 100644 --- a/pkgs/by-name/no/nodemon/package.nix +++ b/pkgs/by-name/no/nodemon/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "nodemon"; - version = "3.1.4"; + version = "3.1.7"; src = fetchFromGitHub { owner = "remy"; repo = "nodemon"; rev = "v${version}"; - hash = "sha256-bAsq1eoeQ03VhNYgdYJQnZRCxyvt46C+3scihGp+9GU="; + hash = "sha256-1hwkPXCPBLYPsg9WwWxId/9v5KF0Iu13qWHRzYJUh+E="; }; npmDepsHash = "sha256-cZHfaUWhKZYKRe4Foc2UymZ8hTPrGLzlcXe1gMsW1pU="; diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 1dce0beba51fd..84a98183a0472 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; rev = "v${version}"; - hash = "sha256-0CWiSDE9DbkvfKq06DwufhQucaR80vEhQU+X5Lg0HWI="; + hash = "sha256-V4ppqHQjPkkRKHkDHzEr05vOyv3BhiLnYxEftIn08XU="; }; vendorHash = "sha256-xolhwdWRjYZMgwI4jq0fGzvxnNjx6EplvZC7XMvBw+M="; diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix index 6e03d7397fb7f..45333177d0702 100644 --- a/pkgs/by-name/no/nomacs/package.nix +++ b/pkgs/by-name/no/nomacs/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" ] # man pages are not installed on Darwin, see cmake/{Mac,Unix}BuildTarget.cmake - ++ lib.optionals (!stdenv.isDarwin) [ "man" ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "man" ]; sourceRoot = "${finalAttrs.src.name}/ImageLounge"; @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # see: https://github.com/NixOS/nixpkgs/pull/314186#issuecomment-2129974277 (lib.getOutput "cxxdev" opencv4) ] ++ (with libsForQt5; [ + kimageformats qtbase qtimageformats qtsvg @@ -59,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SYSTEM_QUAZIP" true) ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,lib} mv $out/nomacs.app $out/Applications/nomacs.app mv $out/libnomacsCore.dylib $out/lib/libnomacsCore.dylib diff --git a/pkgs/by-name/no/nomad-driver-containerd/package.nix b/pkgs/by-name/no/nomad-driver-containerd/package.nix new file mode 100644 index 0000000000000..bf50bd1aeb62d --- /dev/null +++ b/pkgs/by-name/no/nomad-driver-containerd/package.nix @@ -0,0 +1,57 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + fetchpatch, + containerd, +}: + +buildGoModule rec { + pname = "nomad-driver-containerd"; + version = "0.9.4"; + + src = fetchFromGitHub { + owner = "Roblox"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-11K1ACk2hhEi+sAlI932eKpyy82Md7j1edRWH2JJ8sI="; + }; + + # bump deps to fix CVE that isn't in a tagged release yet + patches = [ + (fetchpatch { + url = "https://github.com/Roblox/nomad-driver-containerd/commit/80b9be1353f701b9d47d874923a9e8ffed4dbd98.patch"; + hash = "sha256-d4C/YwemmZQAt0fTAnQkJVKn8cK4kmxB+wQEHycdn9U="; + }) + (fetchpatch { + url = "https://github.com/Roblox/nomad-driver-containerd/commit/cc0da224669a8f85a8b695288fe5ea748fb270c2.patch"; + hash = "sha256-W8ZOKMkv1814cPNyqTaXUGhh44WfMizZNL4cNX+FOqg="; + }) + ]; + + # replace version in file as it's defined using const, and thus cannot be overriden by ldflags + postPatch = '' + substituteInPlace containerd/driver.go --replace-warn 'PluginVersion = "v0.9.3"' 'PluginVersion = "v${version}"' + ''; + + CGO_ENABLED = "1"; + + vendorHash = "sha256-OO+a5AqhB0tf6lyodhYl9HUSaWvtXWwevRHYy1Q6VoU="; + subPackages = [ "." ]; + + buildInputs = [ containerd ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + homepage = "https://www.github.com/Roblox/nomad-driver-containerd"; + description = "Containerd task driver for Nomad"; + mainProgram = "nomad-driver-containerd"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/by-name/no/nomnatong/package.nix b/pkgs/by-name/no/nomnatong/package.nix index f0107ff16bf8a..7a08a43c1bb16 100644 --- a/pkgs/by-name/no/nomnatong/package.nix +++ b/pkgs/by-name/no/nomnatong/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nomnatong"; - version = "5.11"; + version = "5.12"; src = fetchFromGitHub { owner = "nomfoundation"; repo = "font"; rev = "v${finalAttrs.version}"; - hash = "sha256-LaMggMZIehQynA6tokOte28bbV3H0kagJRsbE8ZczsM="; + hash = "sha256-DMKL5a830V07U4Pogp2EQtGQUJ26d3F4u7ce5aWPAI8="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "http://nomfoundation.org/nom-tools/Nom-Font"; description = "Hán-Nôm Coded Character Set and Nom Na Tong Regular Reference Font"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix index e862247b0df53..8404231fa3921 100644 --- a/pkgs/by-name/no/normcap/package.nix +++ b/pkgs/by-name/no/normcap/package.nix @@ -7,6 +7,8 @@ , wl-clipboard , libnotify , xorg +, makeDesktopItem +, copyDesktopItems }: let @@ -17,7 +19,7 @@ let leptonica tesseract4 libnotify - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wl-clipboard ]; @@ -37,12 +39,6 @@ ps.buildPythonApplication rec { hash = "sha256-iMlW8oEt4OSipJaQ2XzBZeBVqiZP/C1sM0f5LYjv7/A="; }; - postPatch = '' - # disable coverage testing - substituteInPlace pyproject.toml \ - --replace-fail "addopts = [" "addopts_ = [" - ''; - pythonRemoveDeps = [ "pyside6-essentials" ]; @@ -51,9 +47,15 @@ ps.buildPythonApplication rec { "shiboken6" ]; - nativeBuildInputs = [ + build-system = [ ps.hatchling ps.babel + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ps.toml + ]; + + nativeBuildInputs = [ + copyDesktopItems ]; dependencies = [ @@ -69,25 +71,32 @@ ps.buildPythonApplication rec { ) ''; + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' + mkdir -p $out/share/pixmaps + ln -s $out/${python3.sitePackages}/normcap/resources/icons/normcap.png $out/share/pixmaps/ + ''; + nativeCheckInputs = wrapperDeps ++ [ ps.pytestCheckHook + ps.pytest-cov-stub + ps.pytest-instafail ps.pytest-qt ps.toml - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ ps.pytest-xvfb xorg.xvfb ]; preCheck = '' export HOME=$(mktemp -d) - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # setup a virtual x11 display export DISPLAY=:$((2000 + $RANDOM % 1000)) Xvfb $DISPLAY -screen 5 1024x768x8 & xvfb_pid=$! ''; - postCheck = lib.optionalString stdenv.isLinux '' + postCheck = lib.optionalString stdenv.hostPlatform.isLinux '' # cleanup the virtual x11 display sleep 0.5 kill $xvfb_pid @@ -106,11 +115,16 @@ ps.buildPythonApplication rec { "test_synchronized_capture" # flaky "test_normcap_ocr_testcases" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # requires display + "test_send_via_qt_tray" + "test_screens" # requires impure pbcopy "test_get_copy_func_with_pbcopy" "test_get_copy_func_without_pbcopy" "test_perform_pbcopy" + "test_pbcopy" + "test_copy" # NSXPCSharedListener endpointForReply:withListenerName:replyErrorCode: # while obtaining endpoint 'ClientCallsAuxiliary': Connection interrupted # since v5.0.0 @@ -128,12 +142,34 @@ ps.buildPythonApplication rec { # RuntimeError("Internal C++ object (PySide6.QtGui.QHideEvent) already deleted.") # AttributeError("'LoadingIndicator' object has no attribute 'timer'") "tests/tests_gui/test_loading_indicator.py" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # requires a display "tests/integration/test_normcap.py" "tests/integration/test_tray_menu.py" + "tests/integration/test_settings_menu.py" + "tests/tests_clipboard/test_handlers/test_qtclipboard.py" + "tests/tests_gui/test_tray.py" + "tests/tests_gui/test_window.py" + "tests/tests_screengrab/" # failure unknown, crashes in first test with `.show()` "tests/tests_gui/test_loading_indicator.py" + "tests/tests_gui/test_menu_button.py" + "tests/tests_gui/test_resources.py" + "tests/tests_gui/test_update_check.py" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "com.github.dynobo.normcap"; + desktopName = "NormCap"; + genericName = "OCR powered screen-capture tool"; + comment = "Extract text from an image directly into clipboard"; + exec = "normcap"; + icon = "normcap"; + terminal = false; + categories = ["Utility" "Office"]; + keywords = ["Text" "Extraction" "OCR"]; + }) ]; meta = with lib; { @@ -142,6 +178,5 @@ ps.buildPythonApplication rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ cafkafk pbsds ]; mainProgram = "normcap"; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix index e3d1890665a5b..d3d3d4c4f4b9c 100644 --- a/pkgs/by-name/no/nosql-workbench/package.nix +++ b/pkgs/by-name/no/nosql-workbench/package.nix @@ -4,26 +4,29 @@ fetchurl, jdk21, stdenv, - _7zz + _7zz, }: let pname = "nosql-workbench"; - version = "3.11.0"; + version = "3.13.0"; - src = fetchurl { - x86_64-darwin = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; - hash = "sha256-KM3aDDsQGZwUKU/or0eOoP8okAOPH7q8KL46RwfqhzM="; - }; - aarch64-darwin = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; - hash = "sha256-LzHiCMrDOWDuMNkkojLgKn+UG7x76wSAz0BapyWkAzU="; - }; - x86_64-linux = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-linux-${version}.AppImage"; - hash = "sha256-cDOSbhAEFBHvAluxTxqVpva1GJSlFhiozzRfuM4MK5c="; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + src = + fetchurl + { + x86_64-darwin = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; + hash = "sha256-Dof1F1LTD478wh7jTR5zwFmbrvyCOWVO/C1QXTebi3c="; + }; + aarch64-darwin = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; + hash = "sha256-QD0F6onP3GhMRIzNifx/RZkxPIS/GMtnF4zro5ygucg="; + }; + x86_64-linux = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-linux-${version}.AppImage"; + hash = "sha256-ewlaaaWxPHxaOdAMbkHChzbxAB5MNdZS/p8ROD/SvcQ="; + }; + } + .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); meta = { description = "Visual tool that provides data modeling, data visualization, and query development features to help you design, create, query, and manage DynamoDB tables"; @@ -31,49 +34,67 @@ let changelog = "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/WorkbenchDocumentHistory.html"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ DataHearth ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; }; in -if stdenv.isDarwin then stdenv.mkDerivation { - inherit pname version src meta; +if stdenv.hostPlatform.isDarwin then + stdenv.mkDerivation { + inherit + pname + version + src + meta + ; - sourceRoot = "."; + sourceRoot = "."; - # DMG file is using APFS which is unsupported by "undmg". - # Instead, use "7zz" to extract the contents. - # "undmg" issue: https://github.com/matthewbauer/undmg/issues/4 - nativeBuildInputs = [ _7zz ]; + # DMG file is using APFS which is unsupported by "undmg". + # Instead, use "7zz" to extract the contents. + # "undmg" issue: https://github.com/matthewbauer/undmg/issues/4 + nativeBuildInputs = [ _7zz ]; - buildInputs = [ jdk21 ]; + buildInputs = [ jdk21 ]; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p "$out/Applications" - mv NoSQL\ Workbench.app $out/Applications/ + mkdir -p "$out/Applications" + mv NoSQL\ Workbench.app $out/Applications/ - runHook postInstall - ''; + runHook postInstall + ''; -} else appimageTools.wrapType2 { - inherit pname version src meta; + } +else + appimageTools.wrapType2 { + inherit + pname + version + src + meta + ; - extraPkgs = pkgs: [ - # Required to run DynamoDB locally - pkgs.jdk21 - ]; + extraPkgs = pkgs: [ + # Required to run DynamoDB locally + pkgs.jdk21 + ]; - extraInstallCommands = let - appimageContents = appimageTools.extract { - inherit pname version src; - }; - in '' - # Install XDG Desktop file and its icon - install -Dm444 ${appimageContents}/nosql-workbench.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/nosql-workbench.png -t $out/share/pixmaps + extraInstallCommands = + let + appimageContents = appimageTools.extract { inherit pname version src; }; + internal_filename = "@amznnosql-workbench"; + in + '' + # Install XDG Desktop file and its icon + install -Dm444 ${appimageContents}/${internal_filename}.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/${internal_filename}.png -t $out/share/pixmaps - # Replace wrong exec statement in XDG Desktop file - substituteInPlace $out/share/applications/nosql-workbench.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' - ''; -} + # Replace wrong exec statement in XDG Desktop file + substituteInPlace $out/share/applications/${internal_filename}.desktop \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' + ''; + } diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix index 6fbd71ac2d05e..9c4f32004849c 100644 --- a/pkgs/by-name/no/nostui/package.nix +++ b/pkgs/by-name/no/nostui/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RCD11KdzM66Mkydc51r6fG+q8bmKl5eZma58YoARwPo="; }; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk; [ frameworks.SystemConfiguration ] ); diff --git a/pkgs/by-name/no/notary/package.nix b/pkgs/by-name/no/notary/package.nix index 1f35222ee9600..0feb21091df69 100644 --- a/pkgs/by-name/no/notary/package.nix +++ b/pkgs/by-name/no/notary/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { owner = "notaryproject"; repo = "notary"; rev = "9d2b3b35929392c9945d976b8bdecbe2f53a299e"; - sha256 = "sha256-u19BfTJwRWholK0b3BcgSmcMM9AR7OeXo64AOi87r0A="; + hash = "sha256-u19BfTJwRWholK0b3BcgSmcMM9AR7OeXo64AOi87r0A="; }; vendorHash = null; diff --git a/pkgs/by-name/no/notation/package.nix b/pkgs/by-name/no/notation/package.nix new file mode 100644 index 0000000000000..213b91cfa854f --- /dev/null +++ b/pkgs/by-name/no/notation/package.nix @@ -0,0 +1,49 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, notation }: + +buildGoModule rec { + pname = "notation"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "notaryproject"; + repo = pname; + rev = "v${version}"; + hash = "sha256-TliXrI5G+1Zw5vhrpEtcjDv2EjRjUsGEfwKOOf8vtZg="; + }; + + vendorHash = "sha256-kK4iwpzSz0JFnY1DbA7rjIzrqZO3imTCOfgtQKd0oV8="; + + nativeBuildInputs = [ + installShellFiles + ]; + + # This is a Go sub-module and cannot be built directly (e2e tests). + excludedPackages = [ "./test" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/notaryproject/notation/internal/version.Version=${version}" + "-X github.com/notaryproject/notation/internal/version.BuildMetadata=" + ]; + + postInstall = '' + installShellCompletion --cmd notation \ + --bash <($out/bin/notation completion bash) \ + --fish <($out/bin/notation completion fish) \ + --zsh <($out/bin/notation completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = notation; + command = "notation version"; + }; + + meta = with lib; { + description = "CLI tool to sign and verify OCI artifacts and container images"; + homepage = "https://notaryproject.dev/"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "notation"; + }; +} diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix new file mode 100644 index 0000000000000..4fca583a6264f --- /dev/null +++ b/pkgs/by-name/no/notcurses/package.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libdeflate +, libunistring +, ncurses +, pandoc +, pkg-config +, zlib +, multimediaSupport ? true, ffmpeg +, qrcodegenSupport ? true, qrcodegen +}: + +stdenv.mkDerivation rec { + pname = "notcurses"; + version = "3.0.11"; + + src = fetchFromGitHub { + owner = "dankamongmen"; + repo = "notcurses"; + rev = "v${version}"; + sha256 = "sha256-3ddiHzPZ74GN2Hu+6Oe1DaNFn6S9gegGwXSX8fbtPp8="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + pandoc + pkg-config + ]; + + buildInputs = [ + libdeflate + libunistring + ncurses + zlib + ] + ++ lib.optional qrcodegenSupport qrcodegen + ++ lib.optional multimediaSupport ffmpeg; + + cmakeFlags = + lib.optional (qrcodegenSupport) "-DUSE_QRCODEGEN=ON" + ++ lib.optional (!multimediaSupport) "-DUSE_MULTIMEDIA=none"; + + # https://github.com/dankamongmen/notcurses/issues/2661 + postPatch = '' + substituteInPlace tools/notcurses-core.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace tools/notcurses-ffi.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace tools/notcurses++.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace tools/notcurses.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + + meta = with lib; { + homepage = "https://github.com/dankamongmen/notcurses"; + description = "Blingful TUIs and character graphics"; + longDescription = '' + Notcurses is a library facilitating complex TUIs on modern terminal + emulators, supporting vivid colors, multimedia, and Unicode to the maximum + degree possible. Things can be done with Notcurses that simply can't be + done with NCURSES. + + It is not a source-compatible X/Open Curses implementation, nor a + replacement for NCURSES on existing systems. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (ncurses.meta) platforms; + }; +} diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/by-name/no/notejot/package.nix similarity index 100% rename from pkgs/applications/misc/notejot/default.nix rename to pkgs/by-name/no/notejot/package.nix diff --git a/pkgs/by-name/no/notes/package.nix b/pkgs/by-name/no/notes/package.nix new file mode 100644 index 0000000000000..83af624af20c4 --- /dev/null +++ b/pkgs/by-name/no/notes/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + qt6, + darwin, + overrideSDK, +}: +let + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { + pname = "notes"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "nuttyartist"; + repo = "notes"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Z89Z7Il9K9pOxvNfFCoRUkRs0Wf5a6TQACDbBrQhGyw="; + fetchSubmodules = true; + }; + + cmakeFlags = [ "-DUPDATE_CHECKER=OFF" ]; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ]; + + buildInputs = + [ + qt6.qtbase + qt6.qtdeclarative + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Cocoa + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/Applications + mv $out/bin/Notes.app $out/Applications + ''; + + meta = { + description = "Fast and beautiful note-taking app"; + homepage = "https://github.com/nuttyartist/notes"; + mainProgram = "notes"; + license = lib.licenses.mpl20; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ zendo ]; + }; +}) diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index 101783ee607d2..f33aa1b03a426 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "2.5.1"; + version = "2.5.2"; in python3.pkgs.buildPythonApplication { pname = "novelwriter"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { owner = "vkbo"; repo = "novelWriter"; rev = "v${version}"; - hash = "sha256-DgeDAPE5IkZtzi+Xq2BpGfpgTRonzNjaa1NTcwnqdNo="; + hash = "sha256-xRSq6lBZ6jHtNve027uF2uNs3/40s0YdFN9F9O7m5VU="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication { export QT_QPA_PLATFORM_PLUGIN_PATH=${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins/platforms ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/{icons,applications,pixmaps,mime/packages} cp -r setup/data/hicolor $out/share/icons @@ -68,6 +68,6 @@ python3.pkgs.buildPythonApplication { mainProgram = "novelwriter"; platforms = with lib.platforms; unix ++ windows; - broken = stdenv.isDarwin; # TODO awaiting build instructions for Darwin + broken = stdenv.hostPlatform.isDarwin; # TODO awaiting build instructions for Darwin }; } diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix index a254f734178ab..44edb7f329530 100644 --- a/pkgs/by-name/no/novops/package.nix +++ b/pkgs/by-name/no/novops/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl # required for openssl-sys - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/nr/nrf-command-line-tools/package.nix b/pkgs/by-name/nr/nrf-command-line-tools/package.nix old mode 100755 new mode 100644 diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix new file mode 100644 index 0000000000000..b72c55b55736b --- /dev/null +++ b/pkgs/by-name/nr/nrfutil/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenvNoCC, + fetchurl, + makeWrapper, + libusb1, + segger-jlink-headless, +}: + +let + source = import ./source.nix; + supported = removeAttrs source [ "version" ]; + + platform = supported.${stdenvNoCC.system} or (throw "unsupported platform ${stdenvNoCC.system}"); + +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "nrfutil"; + inherit (source) version; + + src = fetchurl { + url = "https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/packages/nrfutil/nrfutil-${platform.name}-${finalAttrs.version}.tar.gz"; + inherit (platform) hash; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv data/* $out/ + + wrapProgram $out/bin/nrfutil \ + --prefix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + segger-jlink-headless + libusb1 + ] + }" + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "CLI tool for managing Nordic Semiconductor devices"; + homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Util"; + changelog = "https://docs.nordicsemi.com/bundle/nrfutil/page/guides/revision_history.html"; + license = licenses.unfree; + platforms = attrNames supported; + maintainers = with maintainers; [ h7x4 ]; + mainProgram = "nrfutil"; + }; +}) diff --git a/pkgs/by-name/nr/nrfutil/source.nix b/pkgs/by-name/nr/nrfutil/source.nix new file mode 100644 index 0000000000000..6d48b72741205 --- /dev/null +++ b/pkgs/by-name/nr/nrfutil/source.nix @@ -0,0 +1,15 @@ +{ + version = "7.13.0"; + x86_64-linux = { + name = "x86_64-unknown-linux-gnu"; + hash = "sha256-R3OF/340xEab+0zamfwvejY16fjy/3TrzMvQaBlVxHw="; + }; + x86_64-darwin = { + name = "x86_64-apple-darwin"; + hash = "sha256-cnZkVkTbQ/+ciITPEx2vxxZchCC54T0JOApB4HKp8e0="; + }; + aarch64-darwin = { + name = "aarch64-apple-darwin"; + hash = "sha256-5VxDQ25tW+qTXHwkltpaAm4AnQvA18qGMaflYQzE2pQ="; + }; +} diff --git a/pkgs/by-name/nr/nrfutil/update.sh b/pkgs/by-name/nr/nrfutil/update.sh new file mode 100755 index 0000000000000..a7efb9d49aae8 --- /dev/null +++ b/pkgs/by-name/nr/nrfutil/update.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq nix nix-prefetch-github + +nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" + +narhash() { + nix --extra-experimental-features nix-command store prefetch-file --json "$1" | jq -r .hash +} + +set -euo pipefail + +declare -A architectures +declare -A versions +declare -A hashes + +architectures["x86_64-linux"]="x86_64-unknown-linux-gnu" +architectures["x86_64-darwin"]="x86_64-apple-darwin" +architectures["aarch64-darwin"]="aarch64-apple-darwin" + +BASE_URL="https://files.nordicsemi.com/artifactory/swtools/external/nrfutil" + +for a in ${!architectures[@]}; do + versions["$a"]=$(curl "$BASE_URL/index/${architectures[${a}]}/index.json" | jq -r '.packages.nrfutil.latest_version') + hashes["$a"]=$(narhash "$BASE_URL/packages/nrfutil/nrfutil-${architectures[${a}]}-${versions[${a}]}.tar.gz") +done + +{ + printf "{\n" + printf " version = \"${versions["x86_64-linux"]}\";\n" + for a in ${!architectures[@]}; do + printf " ${a} = {\n" + printf " name = \"${architectures[${a}]}\";\n" + printf " hash = \"${hashes[${a}]}\";\n" + printf " };\n" + done + printf "}\n" +} > "${nixpkgs}/pkgs/by-name/nr/nrfutil/source.nix" diff --git a/pkgs/by-name/nr/nrpl/package.nix b/pkgs/by-name/nr/nrpl/package.nix index c75fe1d5a512d..c842d16ba9a98 100644 --- a/pkgs/by-name/nr/nrpl/package.nix +++ b/pkgs/by-name/nr/nrpl/package.nix @@ -8,7 +8,7 @@ buildNimPackage { owner = "wheineman"; repo = "nrpl"; rev = "6d6c189ab7d1c905cc29dc678d66e9e132026f69"; - sha256 = "1cly9lhrawnc42r31b7r0p0i6hcx8r00aa17gv7w9pcpj8ngb4v2"; + hash = "sha256-YpP1LJKX3cTPficoBUBGnUETwQX5rDCyIMxylSFNnrI="; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,7 +18,7 @@ buildNimPackage { (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/wheineman/nrpl/pull/12.patch"; name = "update_for_new_nim.patch"; - sha256 = "1zff7inhn3l1jnxcnidy705lzi3wqib1chf4rayh1g9i23an7wg1"; + hash = "sha256-4fFj1RAxvQC9ysRBFlbEfMRPCzi+Rcu6lYEOC208zv0="; }) ]; diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index 0cf4c2bb0b1fc..0c7aa77aca1dd 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-F2JlUErplSRQwSAEavQPNDMcXYc2waeYwjGuzmZq8sc="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.IOKit diff --git a/pkgs/by-name/ns/nsxiv/package.nix b/pkgs/by-name/ns/nsxiv/package.nix index ba267571a9004..b54c8ce55f4ea 100644 --- a/pkgs/by-name/ns/nsxiv/package.nix +++ b/pkgs/by-name/ns/nsxiv/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { libXft libexif libwebp - ] ++ lib.optional stdenv.isDarwin libinotify-kqueue; + ] ++ lib.optional stdenv.hostPlatform.isDarwin libinotify-kqueue; postPatch = lib.optionalString (conf != null) '' cp ${(builtins.toFile "config.def.h" conf)} config.def.h ''; - env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-linotify"; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-linotify"; makeFlags = [ "CC:=$(CC)" ]; diff --git a/pkgs/by-name/nt/ntfy-alertmanager/package.nix b/pkgs/by-name/nt/ntfy-alertmanager/package.nix new file mode 100644 index 0000000000000..f90edac4745d8 --- /dev/null +++ b/pkgs/by-name/nt/ntfy-alertmanager/package.nix @@ -0,0 +1,27 @@ +{ + buildGoModule, + fetchurl, + lib, +}: + +buildGoModule rec { + pname = "ntfy-alertmanager"; + version = "0.3.0"; + + src = fetchurl { + url = "https://git.xenrox.net/~xenrox/ntfy-alertmanager/refs/download/v${version}/ntfy-alertmanager-${version}.tar.gz"; + hash = "sha256-8VDHeK77dcbATSFfqknlhMSP93OlDNmkzRJxLN4rCVE="; + }; + + vendorHash = "sha256-WKImEc7FvZm/6noC2+Lz4g+ASFEuRBE8nzTEDbXaWic="; + + meta = with lib; { + description = "A bridge between ntfy and Alertmanager."; + homepage = "https://git.xenrox.net/~xenrox/ntfy-alertmanager"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ + bleetube + fpletz + ]; + }; +} diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index 9bd6934cd58cc..df3089013d861 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -14,18 +14,20 @@ rustPlatform.buildRustPackage rec { pname = "ntpd-rs"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "pendulum-project"; repo = "ntpd-rs"; - rev = "v${version}"; - hash = "sha256-Yf1cPv4SpmbL3o9uf3fJ/n0/ZW0wdhW/bbe2hRxDdyY="; + rev = "refs/tags/v${version}"; + hash = "sha256-0fbl50kugqYHeS+9a/kCkwy1wPDqDCYwPIGZ37NFa/Y="; }; - cargoHash = "sha256-H3pK/MSv7/YDEtnW2mi2xt5x2t3ugCc4IN43wohM4Ig="; + cargoHash = "sha256-9HLbGC6j0Wq/lG//CeEAfnYzlGG14CnDpmluL1moHWQ="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Security + ]; nativeBuildInputs = [ pandoc installShellFiles @@ -60,7 +62,7 @@ rustPlatform.buildRustPackage rec { passthru = { tests = { - nixos = lib.optionalAttrs stdenv.isLinux nixosTests.ntpd-rs; + nixos = lib.optionalAttrs stdenv.hostPlatform.isLinux nixosTests.ntpd-rs; version = testers.testVersion { package = ntpd-rs; inherit version; @@ -74,7 +76,6 @@ rustPlatform.buildRustPackage rec { description = "Full-featured implementation of the Network Time Protocol"; homepage = "https://tweedegolf.nl/en/pendulum"; changelog = "https://github.com/pendulum-project/ntpd-rs/blob/v${version}/CHANGELOG.md"; - mainProgram = "ntp-ctl"; license = with lib.licenses; [ mit # or asl20 @@ -83,7 +84,8 @@ rustPlatform.buildRustPackage rec { fpletz getchoo ]; + mainProgram = "ntp-ctl"; # note: Undefined symbols for architecture x86_64: "_ntp_adjtime" - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/by-name/nu/nuclear/package.nix b/pkgs/by-name/nu/nuclear/package.nix index 1ed6df2779c0f..201e25b5a6a08 100644 --- a/pkgs/by-name/nu/nuclear/package.nix +++ b/pkgs/by-name/nu/nuclear/package.nix @@ -5,7 +5,7 @@ }: let pname = "nuclear"; - version = "0.6.31"; + version = "0.6.39"; src = fetchurl { # Nuclear currenntly only publishes AppImage releases for x86_64, which is hardcoded in @@ -13,7 +13,7 @@ let # provide more arches, we should use stdenv.hostPlatform to determine the arch and choose # source URL accordingly. url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - hash = "sha256-ezho69fDP4OiLpC8KNKc8OIZ++TX4GUinFB6o8MLx3I="; + hash = "sha256-X5IQ9NlFTFTEYDhuCyrzkPGmvNK66nCSdbmJZxObkBo="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index a1d1ffbb412b7..196abb001faa7 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.9.3"; + version = "10.0.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-Iw2TbDQWRy3W7eaybtGG3C+RaciKfjWpYblrCPa8SCE="; + hash = "sha256-unQ/c3S1uJGSE7DoDsKnnI0n7YGe7s8F0g+yUNB4xH4="; }; installPhase = '' diff --git a/pkgs/by-name/nu/nuget/package.nix b/pkgs/by-name/nu/nuget/package.nix index dd0af4ab22441..9473a95f43e4c 100644 --- a/pkgs/by-name/nu/nuget/package.nix +++ b/pkgs/by-name/nu/nuget/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (attrs: { owner = "mono"; repo = "linux-packaging-nuget"; rev = "upstream/${attrs.version}.bin"; - sha256 = "sha256-9/dSeVshHbpYIgGE/8OzrB4towrWVB3UxDi8Esmbu7Y="; + hash = "sha256-9/dSeVshHbpYIgGE/8OzrB4towrWVB3UxDi8Esmbu7Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nu/nulloy/package.nix b/pkgs/by-name/nu/nulloy/package.nix index 8e82b6ae0638a..203ddf84c4099 100644 --- a/pkgs/by-name/nu/nulloy/package.nix +++ b/pkgs/by-name/nu/nulloy/package.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { mainProgram = "nulloy"; maintainers = with maintainers; [ aleksana ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index 829b1bf8a4a4f..ce3c954b88c24 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-t6vxJ0UIQJILCGv4PO5V4/QF5de/wtMQDkb8gPtE70E="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/by-name/nu/nuweb/package.nix similarity index 100% rename from pkgs/development/tools/literate-programming/nuweb/default.nix rename to pkgs/by-name/nu/nuweb/package.nix diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix index f2ff4bafaf776..9690be4d7735a 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "NVIDIA"; repo = pname; rev = "v${version}"; - sha256 = "1n1k7fnimky67s12p2ycaq9mgk245fchq62vgd7bl3bzfcbg0z4h"; + hash = "sha256-kHzwFnN/DbpOe1sYDJkrRMxXE1bMiyuCPsbPGq07M9g="; }; buildPhase = '' diff --git a/pkgs/by-name/nv/nvidia-texture-tools/package.nix b/pkgs/by-name/nv/nvidia-texture-tools/package.nix index 3f2bd5ad36a35..13f285bc66e8d 100644 --- a/pkgs/by-name/nv/nvidia-texture-tools/package.nix +++ b/pkgs/by-name/nv/nvidia-texture-tools/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { # Make a recently added pure virtual function just virtual, # to keep compatibility. sed -i 's/virtual void endImage() = 0;/virtual void endImage() {}/' src/nvtt/nvtt.h - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' # remove x86_64-only libraries sed -i '/bc1enc/d' src/nvtt/tests/CMakeLists.txt sed -i '/libsquish/d;/CMP_Core/d' extern/CMakeLists.txt diff --git a/pkgs/by-name/nw/nwg-clipman/package.nix b/pkgs/by-name/nw/nwg-clipman/package.nix new file mode 100644 index 0000000000000..2db08263729a2 --- /dev/null +++ b/pkgs/by-name/nw/nwg-clipman/package.nix @@ -0,0 +1,68 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + gobject-introspection, + wrapGAppsHook3, + gtk-layer-shell, + gtk3, + wl-clipboard, + cliphist, + nix-update-script, +}: + +python3Packages.buildPythonPackage rec { + pname = "nwg-clipman"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = "nwg-clipman"; + rev = "refs/tags/v${version}"; + hash = "sha256-qpI/yg7yBSwcgpv6lOBysxxsX0pI+ixZghkm+U6XIrs="; + }; + + build-system = [ python3Packages.setuptools ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook3 + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + buildInputs = [ + gtk-layer-shell + gtk3 + ]; + + dependencies = with python3Packages; [ pygobject3 ]; + + nativeCheckInputs = [ + wl-clipboard + cliphist + ]; + + postInstall = '' + install -Dm644 nwg-clipman.desktop -t $out/share/applications/ + install -Dm644 nwg-clipman.svg -t $out/share/pixmaps/ + ''; + + strictDeps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "GTK3-based GUI for cliphist"; + homepage = "https://github.com/nwg-piotr/nwg-clipman"; + changelog = "https://github.com/nwg-piotr/nwg-clipman/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ averyanalex ]; + platforms = lib.platforms.linux; + mainProgram = "nwg-clipman"; + }; +} diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index aee0747973c09..c5ba0f1e396f6 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -12,16 +12,16 @@ let pname = "nwg-drawer"; - version = "0.4.9"; + version = "0.5.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-drawer"; rev = "v${version}"; - hash = "sha256-KhgALKJNS7Y+u5pAfpvTup0W1+Vi6r1uaVFQZRiv4Dk="; + hash = "sha256-0ksvat0NDC2P+T0TyDAKh7YNLYhH+znxqLCqQ/5GDj8="; }; - vendorHash = "sha256-J7r3YyfV5lRZbjKo7ZNHQrOqR1GNbUB7GxRMlXuuw/c="; + vendorHash = "sha256-KULOXphc6GWIGP79C9sgfAIRMoqwcjaVp4jVyF6of/E="; in buildGoModule { inherit pname version src vendorHash; diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix index 359d57cda5b02..fba077d5c556e 100644 --- a/pkgs/by-name/nw/nwg-panel/package.nix +++ b/pkgs/by-name/nw/nwg-panel/package.nix @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.38"; + version = "0.9.40"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "refs/tags/v${version}"; - hash = "sha256-5vq/5QovvoDUDu9IiAeI9c06g0iy9YLi7CdpEhXbLqI="; + hash = "sha256-MymxhQxPS07qZlD+TsiMyMtOrmIuqi3LAhc0Huxwxjs="; }; # No tests diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix index 094008cb10081..c4b85cac55bbe 100644 --- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix +++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix @@ -6,8 +6,8 @@ }: let - bits = if stdenv.is64bit then "x64" else "ia32"; - version = "0.90.0"; + bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32"; + version = "0.92.0"; in stdenv.mkDerivation { pname = "nwjs-ffmpeg-prebuilt"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { src = let hashes = { - "x64" = "sha256-AAKV896AuOm9dMV98tkEdHIpdUOSBx1QKyPR01VpqSw="; - "ia32" = "sha256-AAKV896AuOm9dMV98tkEdHIpdUOSBx1QKyPR01VpqSw="; + "x64" = "sha256-0Y0m9wGZGqH78LTPSWw+OCTvxd6kmIjuYzSaepwt9/I="; + "ia32" = "sha256-0Y0m9wGZGqH78LTPSWw+OCTvxd6kmIjuYzSaepwt9/I="; }; in fetchurl { diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix index eef59f5bd650e..db143bf1a5138 100644 --- a/pkgs/by-name/nz/nzbhydra2/package.nix +++ b/pkgs/by-name/nz/nzbhydra2/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "7.5.0"; + version = "7.7.0"; src = fetchzip { url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip"; - hash = "sha256-jnClKsWSdRWCxNFO9RSnjdoDjOmtv9CrOL9KyaZ8PTc="; + hash = "sha256-8Q/aTMwHFy7OG+VyoSRYlXp4l247nUSPP0YCMkv9Cec="; stripRoot = false; }; diff --git a/pkgs/by-name/oa/oama/package.nix b/pkgs/by-name/oa/oama/package.nix index c408ef4e87f86..e938805bac866 100644 --- a/pkgs/by-name/oa/oama/package.nix +++ b/pkgs/by-name/oa/oama/package.nix @@ -2,6 +2,7 @@ haskell, haskellPackages, lib, + stdenv, }: let inherit (haskell.lib.compose) overrideCabal justStaticExecutables; @@ -25,5 +26,7 @@ let in lib.pipe raw-pkg [ (overrideCabal overrides) - justStaticExecutables + # FIXME: eliminate all erroneous references on aarch64-darwin manually, + # see https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else justStaticExecutables) ] diff --git a/pkgs/by-name/oa/oauth2l/package.nix b/pkgs/by-name/oa/oauth2l/package.nix index 612575d2b2668..c6d7070486bd5 100644 --- a/pkgs/by-name/oa/oauth2l/package.nix +++ b/pkgs/by-name/oa/oauth2l/package.nix @@ -23,7 +23,7 @@ buildGoModule rec { preCheck = "export HOME=$(mktemp -d)"; # tests fail on linux for some reason - doCheck = stdenv.isDarwin; + doCheck = stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Simple CLI for interacting with Google API authentication"; diff --git a/pkgs/by-name/ob/oboete/Cargo.lock b/pkgs/by-name/ob/oboete/Cargo.lock index 181d46ed0bdca..1128cf55e2da4 100644 --- a/pkgs/by-name/ob/oboete/Cargo.lock +++ b/pkgs/by-name/ob/oboete/Cargo.lock @@ -89,9 +89,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -102,6 +102,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.8.11" @@ -207,15 +213,15 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-raw-xcb-connection" @@ -237,6 +243,25 @@ name = "ashpd" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +dependencies = [ + "async-fs 2.1.2", + "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus 4.4.0", +] + +[[package]] +name = "ashpd" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "async-fs 2.1.2", "async-net", @@ -250,8 +275,8 @@ dependencies = [ "url", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", - "zbus 4.3.1", + "wayland-protocols 0.32.4", + "zbus 4.4.0", ] [[package]] @@ -290,13 +315,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -346,9 +371,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock 3.4.0", "cfg-if", @@ -356,11 +381,11 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -389,7 +414,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "blocking", "futures-lite 2.3.0", ] @@ -407,18 +432,18 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.34", + "rustix 0.38.37", "windows-sys 0.48.0", ] [[package]] name = "async-process" -version = "2.2.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "async-signal", "async-task", @@ -426,9 +451,8 @@ dependencies = [ "cfg-if", "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", ] [[package]] @@ -439,25 +463,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix 0.38.37", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -468,13 +492,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -497,7 +521,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "tempfile", "windows-sys 0.48.0", ] @@ -552,23 +576,23 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -577,12 +601,27 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "basic-toml" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" +dependencies = [ + "serde", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -690,22 +729,22 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -716,9 +755,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "calloop" @@ -728,8 +767,8 @@ checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ "bitflags 2.6.0", "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "thiserror", ] @@ -742,8 +781,8 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.6.0", "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "thiserror", ] @@ -755,7 +794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop 0.12.4", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] @@ -767,20 +806,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop 0.13.0", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.1.0" +version = "1.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -993,9 +1032,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -1024,7 +1063,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1040,13 +1079,13 @@ dependencies = [ "tokio", "tracing", "xdg", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "quote", "syn 1.0.109", @@ -1055,15 +1094,15 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#cd21ddcb1b5cbfc80ab84b34d3c8b1ff3d81179a" +source = "git+https://github.com/pop-os/dbus-settings-bindings#931f5db558bf3fcb572ff4e18f7f1618a7430046" dependencies = [ - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] name = "cosmic-text" -version = "0.12.0" -source = "git+https://github.com/pop-os/cosmic-text.git#0e2d050a8d87c2e97e94ae205c9beda5858123b6" +version = "0.12.1" +source = "git+https://github.com/pop-os/cosmic-text.git#4fe90bb6126c22f589b46768d7754d65ae300c5e" dependencies = [ "bitflags 2.6.0", "fontdb", @@ -1073,6 +1112,7 @@ dependencies = [ "rustc-hash", "rustybuzz 0.14.1", "self_cell 1.0.4", + "smol_str", "swash", "sys-locale", "ttf-parser 0.21.1", @@ -1085,7 +1125,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "almost", "cosmic-config", @@ -1101,9 +1141,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1225,7 +1265,7 @@ version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.4", + "libloading 0.8.5", "winapi", ] @@ -1249,8 +1289,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", - "syn 2.0.70", + "strsim", + "syn 2.0.79", ] [[package]] @@ -1261,17 +1301,18 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] name = "dashmap" -version = "5.5.3" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", - "hashbrown", + "crossbeam-utils", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core 0.9.10", @@ -1314,7 +1355,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -1364,7 +1405,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -1373,7 +1414,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.4", + "libloading 0.8.5", ] [[package]] @@ -1393,7 +1434,7 @@ dependencies = [ "bitflags 2.6.0", "mime", "raw-window-handle", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "smithay-clipboard", ] @@ -1419,7 +1460,7 @@ dependencies = [ "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -1429,7 +1470,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -1445,7 +1486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" dependencies = [ "libc", - "linux-raw-sys 0.6.4", + "linux-raw-sys 0.6.5", ] [[package]] @@ -1481,7 +1522,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -1502,9 +1543,9 @@ dependencies = [ [[package]] name = "error-code" -version = "3.2.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" +checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" [[package]] name = "etagere" @@ -1529,9 +1570,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.10" +version = "0.22.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" dependencies = [ "num-traits", ] @@ -1584,7 +1625,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -1607,29 +1648,29 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox 0.1.3", + "windows-sys 0.59.0", ] [[package]] @@ -1638,17 +1679,17 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" dependencies = [ - "toml 0.5.11", + "toml", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1726,20 +1767,20 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.5.5" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29" +checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" dependencies = [ "bytemuck", ] [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree", + "roxmltree 0.20.0", ] [[package]] @@ -1750,7 +1791,7 @@ checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "slotmap", "tinyvec", "ttf-parser 0.20.0", @@ -1774,7 +1815,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -1794,9 +1835,9 @@ dependencies = [ [[package]] name = "fraction" -version = "0.14.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a78dd758a47a7305478e0e054f9fde4e983b9f9eccda162bf7ca03b79e9d40" +checksum = "0f158e3ff0a1b334408dc9fb811cd99b446986f4d8b741bb08f9df1604085ae7" dependencies = [ "lazy_static", "num", @@ -1905,7 +1946,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -1920,7 +1961,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -2006,9 +2047,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "gl_generator" @@ -2099,7 +2140,7 @@ checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ "bitflags 2.6.0", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -2147,13 +2188,19 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -2165,7 +2212,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.4", + "libloading 0.8.5", "thiserror", "widestring", "winapi", @@ -2176,9 +2223,12 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -2233,23 +2283,23 @@ dependencies = [ [[package]] name = "i18n-config" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" +checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9" dependencies = [ + "basic-toml", "log", "serde", "serde_derive", "thiserror", - "toml 0.8.14", "unic-langid", ] [[package]] name = "i18n-embed" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" +checksum = "e901c87176ac0b615033c81dbe927c230f74700abfd60ed953a6f547c87bbe6d" dependencies = [ "arc-swap", "fluent", @@ -2269,9 +2319,9 @@ dependencies = [ [[package]] name = "i18n-embed-fl" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8241a781f49e923415e106fcd1f89c3fab92cc9f699a521c56e95dee273903d3" +checksum = "d73fe51b9655599147183495551696628b335f75b2dbfa225196b16d69d7288e" dependencies = [ "dashmap", "find-crate", @@ -2283,8 +2333,8 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.70", + "strsim", + "syn 2.0.79", "unic-langid", ] @@ -2298,14 +2348,14 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2327,7 +2377,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "dnd", "iced_accessibility", @@ -2345,7 +2395,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "accesskit", "accesskit_winit", @@ -2354,7 +2404,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "bitflags 2.6.0", "dnd", @@ -2374,7 +2424,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "futures", "iced_core", @@ -2387,7 +2437,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2411,7 +2461,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2423,7 +2473,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "dnd", "iced_core", @@ -2435,7 +2485,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "iced_core", "once_cell", @@ -2445,7 +2495,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "bytemuck", "cosmic-text", @@ -2462,8 +2512,9 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ + "as-raw-xcb-connection", "bitflags 2.6.0", "bytemuck", "futures", @@ -2476,19 +2527,21 @@ dependencies = [ "once_cell", "raw-window-handle", "resvg", - "rustix 0.38.34", - "smithay-client-toolkit 0.19.1", + "rustix 0.38.37", + "smithay-client-toolkit 0.19.2", + "tiny-xlib", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.2", + "wayland-protocols 0.32.4", "wayland-sys", "wgpu", + "x11rb", ] [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "dnd", "iced_renderer", @@ -2504,7 +2557,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "dnd", "iced_graphics", @@ -2582,12 +2635,12 @@ checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", ] [[package]] @@ -2698,9 +2751,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -2716,9 +2769,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2739,7 +2792,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.4", + "libloading 0.8.5", "pkg-config", ] @@ -2751,11 +2804,11 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "known-folders" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" +checksum = "b7d9a1740cc8b46e259a0eb787d79d855e79ff10b9855a5eba58868d5da7927c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2804,17 +2857,17 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" +source = "git+https://github.com/pop-os/libcosmic.git#228eb4d70d581be88bacb1e261106a58603d847b" dependencies = [ "apply", - "ashpd", + "ashpd 0.9.1", "chrono", "cosmic-config", "cosmic-settings-daemon", @@ -2844,7 +2897,7 @@ dependencies = [ "tracing", "unicode-segmentation", "url", - "zbus 4.3.1", + "zbus 4.4.0", ] [[package]] @@ -2859,9 +2912,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -2892,13 +2945,14 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall 0.5.7", ] [[package]] name = "libsqlite3-sys" -version = "0.27.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -2919,9 +2973,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" +checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" [[package]] name = "locale_config" @@ -2954,11 +3008,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -3049,9 +3103,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -3110,6 +3164,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", "simd-adler32", ] @@ -3125,6 +3188,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "mutate_once" version = "0.1.1" @@ -3230,7 +3305,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.48.0", ] @@ -3348,23 +3423,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -3446,18 +3521,18 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] [[package]] name = "oboete" -version = "0.1.5" +version = "0.1.6" dependencies = [ - "ashpd", + "ashpd 0.9.1", "dirs", "futures", "i18n-embed", @@ -3480,9 +3555,12 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "open" @@ -3517,7 +3595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -3547,11 +3625,11 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -3566,7 +3644,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ - "ttf-parser 0.24.0", + "ttf-parser 0.24.1", ] [[package]] @@ -3591,14 +3669,14 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -3643,7 +3721,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -3705,7 +3783,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -3737,12 +3815,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] @@ -3769,21 +3847,21 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -3804,17 +3882,17 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3823,11 +3901,20 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "presser" @@ -3847,11 +3934,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.22", ] [[package]] @@ -3904,18 +3991,18 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.34.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3996,9 +4083,9 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "read-fonts" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d" +checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" dependencies = [ "bytemuck", "font-types", @@ -4033,18 +4120,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox 0.1.3", @@ -4053,9 +4140,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -4065,9 +4152,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -4076,9 +4163,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "renderdoc-sys" @@ -4109,7 +4196,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" dependencies = [ - "ashpd", + "ashpd 0.8.1", "block", "dispatch", "js-sys", @@ -4128,9 +4215,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.44" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -4156,7 +4243,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64", + "base64 0.21.7", "bitflags 2.6.0", "serde", "serde_derive", @@ -4168,6 +4255,12 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +[[package]] +name = "roxmltree" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + [[package]] name = "rsa" version = "0.9.6" @@ -4208,7 +4301,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.70", + "syn 2.0.79", "walkdir", ] @@ -4260,9 +4353,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -4273,31 +4366,41 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ + "once_cell", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64", + "rustls-pki-types", ] +[[package]] +name = "rustls-pki-types" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" + [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] @@ -4361,16 +4464,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sctk-adwaita" version = "0.8.3" @@ -4379,7 +4472,7 @@ checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "smithay-client-toolkit 0.18.1", "tiny-skia", ] @@ -4401,32 +4494,33 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] @@ -4439,15 +4533,18 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] -name = "serde_spanned" -version = "0.6.6" +name = "serde_urlencoded" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ + "form_urlencoded", + "itoa", + "ryu", "serde", ] @@ -4482,6 +4579,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -4524,9 +4627,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "skrifa" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" dependencies = [ "bytemuck", "read-fonts", @@ -4555,6 +4658,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "smithay-client-toolkit" @@ -4568,8 +4674,8 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2 0.9.4", - "rustix 0.38.34", + "memmap2 0.9.5", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", @@ -4583,9 +4689,9 @@ dependencies = [ [[package]] name = "smithay-client-toolkit" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "837d3067369e24aeda699a5d9fc5aa14ca14a84dd70aeed7156bfa04a5605b32" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -4594,16 +4700,16 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "pkg-config", - "rustix 0.38.34", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.2", - "wayland-protocols-wlr 0.3.2", + "wayland-protocols 0.32.4", + "wayland-protocols-wlr 0.3.4", "wayland-scanner", "xkbcommon", "xkeysym", @@ -4612,11 +4718,11 @@ dependencies = [ [[package]] name = "smithay-clipboard" version = "0.8.0" -source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#d099e82a4c1e7d3e88dc34b7333de21928b1b22c" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007def49eb678d1144850c9ee04b80707c56a" dependencies = [ "libc", "raw-window-handle", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit 0.19.2", "wayland-backend", ] @@ -4660,15 +4766,15 @@ dependencies = [ "cocoa", "core-graphics", "drm", - "fastrand 2.1.0", + "fastrand 2.1.1", "foreign-types", "js-sys", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "objc", "raw-window-handle", "redox_syscall 0.4.1", - "rustix 0.38.34", + "rustix 0.38.37", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -4709,9 +4815,9 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" +checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" dependencies = [ "nom", "unicode_categories", @@ -4719,9 +4825,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4732,23 +4838,23 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" dependencies = [ - "ahash", "atoi", "byteorder", "bytes", "crc", "crossbeam-queue", "either", - "event-listener 2.5.3", + "event-listener 5.3.1", "futures-channel", "futures-core", "futures-intrusive", "futures-io", "futures-util", + "hashbrown 0.14.5", "hashlink", "hex", "indexmap", @@ -4774,26 +4880,26 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657" dependencies = [ "proc-macro2", "quote", "sqlx-core", "sqlx-macros-core", - "syn 1.0.109", + "syn 2.0.79", ] [[package]] name = "sqlx-macros-core" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5" dependencies = [ "dotenvy", "either", - "heck", + "heck 0.5.0", "hex", "once_cell", "proc-macro2", @@ -4803,8 +4909,9 @@ dependencies = [ "sha2", "sqlx-core", "sqlx-mysql", + "sqlx-postgres", "sqlx-sqlite", - "syn 1.0.109", + "syn 2.0.79", "tempfile", "tokio", "url", @@ -4812,12 +4919,12 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" dependencies = [ "atoi", - "base64", + "base64 0.22.1", "bitflags 2.6.0", "byteorder", "bytes", @@ -4854,12 +4961,12 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" dependencies = [ "atoi", - "base64", + "base64 0.22.1", "bitflags 2.6.0", "byteorder", "crc", @@ -4892,9 +4999,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" dependencies = [ "atoi", "flume", @@ -4907,10 +5014,10 @@ dependencies = [ "log", "percent-encoding", "serde", + "serde_urlencoded", "sqlx-core", "tracing", "url", - "urlencoding", ] [[package]] @@ -4939,12 +5046,6 @@ dependencies = [ "unicode-properties", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -4975,9 +5076,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" +checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" dependencies = [ "skrifa", "yazi", @@ -4997,9 +5098,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.70" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -5028,14 +5129,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", + "fastrand 2.1.1", + "once_cell", + "rustix 0.38.37", + "windows-sys 0.59.0", ] [[package]] @@ -5049,22 +5151,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -5131,7 +5233,7 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading 0.8.4", + "libloading 0.8.5", "pkg-config", "tracing", ] @@ -5162,40 +5264,39 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -5211,26 +5312,11 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.15", -] - [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" @@ -5245,26 +5331,13 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.20", ] [[package]] @@ -5287,7 +5360,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -5352,9 +5425,9 @@ checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" [[package]] name = "ttf-parser" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" [[package]] name = "type-map" @@ -5433,9 +5506,9 @@ checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-linebreak" @@ -5445,30 +5518,30 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-vo" @@ -5478,15 +5551,15 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unicode_categories" @@ -5524,7 +5597,7 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" dependencies = [ - "base64", + "base64 0.21.7", "log", "pico-args", "usvg-parser", @@ -5544,7 +5617,7 @@ dependencies = [ "imagesize", "kurbo", "log", - "roxmltree", + "roxmltree 0.19.0", "simplecss", "siphasher", "svgtypes", @@ -5593,9 +5666,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "waker-fn" @@ -5627,34 +5700,35 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -5664,9 +5738,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5674,22 +5748,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-timer" @@ -5708,13 +5782,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.34", + "rustix 0.38.37", "scoped-tls", "smallvec", "wayland-sys", @@ -5722,12 +5796,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.4" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ "bitflags 2.6.0", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-scanner", ] @@ -5745,11 +5819,11 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.4" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09414bcf0fd8d9577d73e9ac4659ebc45bcc9cff1980a350543ad8e50ee263b2" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "wayland-client", "xcursor", ] @@ -5768,9 +5842,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.2" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1794d82d869f38439d15c24b26f06f6c8603d27d47b4f786d5197c99044de415" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -5806,22 +5880,22 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa43c961473aed713d44c1f616f775186249dfca657f256d8841ca0690366aba" +checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.2", + "wayland-protocols 0.32.4", "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", "quick-xml", @@ -5830,9 +5904,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", @@ -5842,9 +5916,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -5862,9 +5936,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "weezl" @@ -5944,7 +6021,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.4", + "libloading 0.8.5", "log", "metal", "naga", @@ -5976,11 +6053,11 @@ dependencies = [ [[package]] name = "whoami" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ - "redox_syscall 0.4.1", + "redox_syscall 0.5.7", "wasite", ] @@ -6008,11 +6085,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6115,6 +6192,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -6312,7 +6398,7 @@ dependencies = [ "js-sys", "libc", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "ndk", "ndk-sys", "objc2 0.4.1", @@ -6321,7 +6407,7 @@ dependencies = [ "percent-encoding", "raw-window-handle", "redox_syscall 0.3.5", - "rustix 0.38.34", + "rustix 0.38.37", "sctk-adwaita", "smithay-client-toolkit 0.18.1", "smol_str", @@ -6351,9 +6437,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -6378,9 +6464,9 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.4", + "libloading 0.8.5", "once_cell", - "rustix 0.38.34", + "rustix 0.38.37", "x11rb-protocol", ] @@ -6392,9 +6478,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg" @@ -6404,12 +6490,12 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6447,9 +6533,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" [[package]] name = "xmlwriter" @@ -6459,9 +6545,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xxhash-rust" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" [[package]] name = "yazi" @@ -6512,16 +6598,16 @@ dependencies = [ [[package]] name = "zbus" -version = "4.3.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast 0.7.1", "async-executor", "async-fs 2.1.2", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", - "async-process 2.2.3", + "async-process 2.3.0", "async-recursion", "async-task", "async-trait", @@ -6544,9 +6630,9 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros 4.3.1", + "zbus_macros 4.4.0", "zbus_names 3.0.0", - "zvariant 4.1.2", + "zvariant 4.2.0", ] [[package]] @@ -6565,15 +6651,15 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.3.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.70", - "zvariant_utils 2.0.0", + "syn 2.0.79", + "zvariant_utils 2.1.0", ] [[package]] @@ -6595,7 +6681,7 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant 4.1.2", + "zvariant 4.2.0", ] [[package]] @@ -6610,6 +6696,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] @@ -6621,7 +6708,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] [[package]] @@ -6655,16 +6742,16 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.1.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", "url", - "zvariant_derive 4.1.2", + "zvariant_derive 4.2.0", ] [[package]] @@ -6682,15 +6769,15 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.70", - "zvariant_utils 2.0.0", + "syn 2.0.79", + "zvariant_utils 2.1.0", ] [[package]] @@ -6706,11 +6793,11 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.79", ] diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix index 1e524d116ab52..a2158918b8b1b 100644 --- a/pkgs/by-name/ob/oboete/package.nix +++ b/pkgs/by-name/ob/oboete/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "oboete"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "mariinkys"; repo = "oboete"; rev = "refs/tags/${version}"; - hash = "sha256-y3lHiAIhIt5XL/88HBuCqVQlRzNcw9VAKjqgQJmyziU="; + hash = "sha256-tiYZ8xMIxMvRdQCf9+LI2B1lXbJz7MFyyeAOkJR+8Vk="; }; cargoLock = { @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec { "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; - "cosmic-config-0.1.0" = "sha256-p/1ABYyXGSr34ZC7ozu2syBjkmElA9oI2bzyWhaxKnc="; - "cosmic-settings-daemon-0.1.0" = "sha256-+1XB7r45Uc71fLnNR4U0DUF2EB8uzKeE4HIrdvKhFXo="; - "cosmic-text-0.12.0" = "sha256-VUUCcW5XnkmCB8cQ5t2xT70wVD5WKXEOPNgNd2xod2A="; + "cosmic-config-0.1.0" = "sha256-joMHmFbgMAuaXtSvJutahE/8y+4AL7dd8bb9bs6Usc0="; + "cosmic-settings-daemon-0.1.0" = "sha256-mklNPKVMO6iFrxki2DwiL5K78KiWpGxksisYldaASIE="; + "cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w="; "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; - "smithay-clipboard-0.8.0" = "sha256-pBQZ+UXo9hZ907mfpcZk+a+8pKrIWdczVvPkjT3TS8U="; + "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index e537ea521a7db..466d776194c6a 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "obs-cmd"; - version = "0.17.6"; + version = "0.17.8"; src = fetchFromGitHub { owner = "grigio"; repo = "obs-cmd"; rev = "v${version}"; - hash = "sha256-bZ3N0wCTXyCv6iBQDlieMDFa80yNu1XrI4W5EaN5y/I="; + hash = "sha256-IOGdy3X0/r/kuEXAvLeJk2HXtcGI+vbh4Dn1/yOpkmM="; }; - cargoHash = "sha256-gIJOkWlBD1rv6bKf++v/pyI8/awdnZBo/U/5PFnEcvg="; + cargoHash = "sha256-oCu/ygjZxEqxE+5Vca3l1mZP3hd+r+5gi2iogQMnEcU="; meta = with lib; { description = "Minimal CLI to control OBS Studio via obs-websocket"; diff --git a/pkgs/by-name/oc/ocis-bin/package.nix b/pkgs/by-name/oc/ocis-bin/package.nix index a0b8a62ed4629..e853e40b35bcd 100644 --- a/pkgs/by-name/oc/ocis-bin/package.nix +++ b/pkgs/by-name/oc/ocis-bin/package.nix @@ -18,9 +18,9 @@ let ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); os = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then "darwin" else throw "Unsupported OS"; diff --git a/pkgs/by-name/oc/ocsinventory-agent/package.nix b/pkgs/by-name/oc/ocsinventory-agent/package.nix index 7e5782cba0f1f..d3f77414e049d 100644 --- a/pkgs/by-name/oc/ocsinventory-agent/package.nix +++ b/pkgs/by-name/oc/ocsinventory-agent/package.nix @@ -32,7 +32,7 @@ perlPackages.buildPerlPackage rec { hash = "sha256-aFzBrUsVttUhpYGEYd/yYuXmE90PGCiBmBsVjtHcHLg="; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; buildInputs = with perlPackages; [ perl @@ -48,9 +48,9 @@ perlPackages.buildPerlPackage rec { ProcDaemon ProcPIDFile XMLSimple - ] ++ lib.optionals stdenv.isLinux (with perlPackages; [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux (with perlPackages; [ NetCUPS # cups-filters is broken on darwin - ]) ++ lib.optionals stdenv.isDarwin (with perlPackages; [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin (with perlPackages; [ MacSysProfile ]); @@ -62,14 +62,14 @@ perlPackages.buildPerlPackage rec { ipmitool # ipmitool nmap # nmap pciutils # lspci - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dmidecode # dmidecode iproute2 # ip lvm2 # pvs usbutils # lsusb util-linux # last, lsblk, mount ]; - in lib.optionalString stdenv.isDarwin '' + in lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/ocsinventory-agent '' + '' wrapProgram $out/bin/ocsinventory-agent --prefix PATH : ${lib.makeBinPath runtimeDependencies} diff --git a/pkgs/by-name/oc/octoscan/package.nix b/pkgs/by-name/oc/octoscan/package.nix new file mode 100644 index 0000000000000..b6ca64b5a97cc --- /dev/null +++ b/pkgs/by-name/oc/octoscan/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "octoscan"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "synacktiv"; + repo = "octoscan"; + rev = "refs/tags/v${version}"; + hash = "sha256-KoNM+Wqv+NmlXHYUn5YIXrG4rHkccVk2QWsNd0iK8YI="; + }; + + vendorHash = "sha256-9IT8qTFzn8otWGTBP7ODcT8iBckIJ/3+jkbF1dq6aDw="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Static vulnerability scanner for GitHub action workflows"; + homepage = "https://github.com/synacktiv/octoscan"; + changelog = "https://github.com/synacktiv/octoscan/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "octoscan"; + }; +} diff --git a/pkgs/by-name/oc/octosql/package.nix b/pkgs/by-name/oc/octosql/package.nix index 675375cb09411..e81ca18179c7c 100644 --- a/pkgs/by-name/oc/octosql/package.nix +++ b/pkgs/by-name/oc/octosql/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { owner = "cube2222"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kzbIts5d2KmFfaAnOdpIXI1fiqBYXe5t981g4Uyk/cc="; + hash = "sha256-kzbIts5d2KmFfaAnOdpIXI1fiqBYXe5t981g4Uyk/cc="; }; vendorHash = "sha256-p/2UsvxxywQKtk/9wDa5fjS0z6xLLzDONuQ5AtnUonk="; diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix index 305b9d329d02f..4a14bfa443aaa 100644 --- a/pkgs/by-name/od/odin/package.nix +++ b/pkgs/by-name/od/odin/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { }; postPatch = - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/linker.cpp \ --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} '' @@ -46,7 +46,7 @@ stdenv.mkDerivation { which ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; diff --git a/pkgs/by-name/od/odoo15/package.nix b/pkgs/by-name/od/odoo15/package.nix index 0ea859435e9ec..ca2a1444a02c6 100644 --- a/pkgs/by-name/od/odoo15/package.nix +++ b/pkgs/by-name/od/odoo15/package.nix @@ -17,8 +17,6 @@ let hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; }; - nativeBuildInputs = [ ]; - nativeCheckInputs = with self; [ pytestCheckHook pillow ]; }); flask = super.flask.overridePythonAttrs (old: rec { diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index af8b81d00eb04..4d23cd3a611c6 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -1,21 +1,27 @@ -{ lib -, nix-update-script -, python3 -, fetchPypi +{ + lib, + nix-update-script, + python3Packages, + fetchFromGitHub, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "oelint-adv"; - version = "5.7.2"; - format = "setuptools"; + version = "6.1.0"; + pyproject = true; - src = fetchPypi { - inherit version; - pname = "oelint_adv"; - hash = "sha256-nHtOSOAKbmbmihaL8qvXBOB76LaC9E95UFQ479X/Rgo="; + src = fetchFromGitHub { + owner = "priv-kweihmann"; + repo = "oelint-adv"; + rev = "refs/tags/${version}"; + hash = "sha256-bDttjeHcIK90W7zPrKNAS4B1L9mibaRjQdnUAU2N8as="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ anytree argcomplete colorama @@ -23,14 +29,32 @@ python3.pkgs.buildPythonApplication rec { urllib3 ]; - pythonRelaxDeps = [ "urllib3" ]; - pythonImportsCheck = [ "oelint_adv" ]; + nativeCheckInputs = with python3Packages; [ + pytest-cov-stub + pytest-forked + pytest-xdist + pytestCheckHook + ]; - # Fail to run inside the code the build. - doCheck = false; + disabledTests = [ + # requires network access + "TestClassOelintVarsHomepagePing" + ]; + + pythonRelaxDeps = [ "argcomplete" ]; + + pythonImportsCheck = [ "oelint_adv" ]; passthru.updateScript = nix-update-script { }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "--random-order-bucket=global" "" \ + --replace-fail "--random-order" "" \ + --replace-fail "--force-sugar" "" \ + --replace-fail "--old-summary" "" + ''; + meta = with lib; { description = "Advanced bitbake-recipe linter"; mainProgram = "oelint-adv"; diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index 2ffa742e7b555..46bbba00f771a 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -18,6 +18,8 @@ python3.pkgs.buildPythonApplication rec { sourceRoot = "${src.name}/src"; + pythonRelaxDeps = [ "setuptools" ]; + build-system = with python3.pkgs; [ poetry-core ]; dependencies = with python3.pkgs; [ @@ -31,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { tenacity ]; - passthru.optional-dependencies = { + optional-dependencies = { api = with python3.pkgs; [ fastapi uvicorn diff --git a/pkgs/data/fonts/office-code-pro/default.nix b/pkgs/by-name/of/office-code-pro/package.nix similarity index 100% rename from pkgs/data/fonts/office-code-pro/default.nix rename to pkgs/by-name/of/office-code-pro/package.nix diff --git a/pkgs/by-name/og/oguri/package.nix b/pkgs/by-name/og/oguri/package.nix new file mode 100644 index 0000000000000..b7cc17014ed3e --- /dev/null +++ b/pkgs/by-name/og/oguri/package.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, cairo +, gdk-pixbuf +, wayland +, wayland-protocols +, wayland-scanner +}: + +stdenv.mkDerivation rec { + pname = "oguri"; + version = "unstable-2020-12-19"; + + src = fetchFromGitHub { + owner = "vilhalmer"; + repo = pname; + rev = "6937fee10a9b0ef3ad8f94f606c0e0d9e7dec564"; + sha256 = "sXNvpI/YPDPd2cXQAfRO4ut21gSCXxbo1DpaZmHJDYQ="; + }; + + strictDeps = true; + nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ]; + buildInputs = [ + cairo + gdk-pixbuf + wayland + wayland-protocols + ]; + + meta = with lib; { + homepage = "https://github.com/vilhalmer/oguri/"; + description = "Very nice animated wallpaper daemon for Wayland compositors"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; + broken = stdenv.hostPlatform.isDarwin; # this should be enfoced by wayland platforms in the future + }; +} diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index c212aaa2e32cb..d861e5bcf20d3 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "23.4.0"; + version = "23.15.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LvgK8h877jXXYWzuy2x1hiRC4YOhj+TeCRjT5nFy1gI="; + hash = "sha256-gZCR7cDSI0gRaTnYADOLpyHe26URo27JXJjnNxr4Jwc="; }; - vendorHash = "sha256-ra0jec3ta8LcBpc6vXz8SEzweOLCTA+BPIFQEhUUHjI="; + vendorHash = "sha256-EBLfbdTV15wSTOThzBY0d2KrSJzRaB8vNH53Uwc+XfM="; sourceRoot = "${src.name}/src"; diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix index 30f144ce9c197..bfcc2accc9add 100644 --- a/pkgs/by-name/oi/oidc-agent/package.nix +++ b/pkgs/by-name/oi/oidc-agent/package.nix @@ -1,26 +1,27 @@ -{ lib -, stdenv -, fetchFromGitHub -, curl -, webkitgtk -, libmicrohttpd -, libsecret -, qrencode -, libsodium -, pkg-config -, help2man -, nix-update-script +{ + lib, + stdenv, + fetchFromGitHub, + curl, + webkitgtk, + libmicrohttpd, + libsecret, + qrencode, + libsodium, + pkg-config, + help2man, + nix-update-script, }: stdenv.mkDerivation rec { pname = "oidc-agent"; - version = "5.1.0"; + version = "5.2.2"; src = fetchFromGitHub { owner = "indigo-dc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cOK/rZ/jnyALLuhDM3+qvwwe4Fjkv8diQBkw7NfVo0c="; + hash = "sha256-OW0hCDVC+AqmXP1dQK/7lnXeG8RbXzFLbKLEvc/8spY="; }; nativeBuildInputs = [ @@ -39,14 +40,23 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" "BIN_PATH=$(out)" "LIB_PATH=$(out)/lib" ]; + makeFlags = [ + "PREFIX=$(out)" + "BIN_PATH=$(out)" + "PROMPT_BIN_PATH=$(out)" + "LIB_PATH=$(out)/lib" + ]; - installTargets = [ "install_bin" "install_lib" "install_conf" ]; + installTargets = [ + "install_bin" + "install_lib" + "install_conf" + ]; postFixup = '' # Override with patched binary to be used by help2man cp -r $out/bin/* bin - make install_man PREFIX=$out + make install_man PREFIX=$out MAN_PATH=$out/share/man PROMPT_MAN_PATH=$out/share/man ''; passthru.updateScript = nix-update-script { }; @@ -58,4 +68,3 @@ stdenv.mkDerivation rec { license = licenses.mit; }; } - diff --git a/pkgs/by-name/oi/oink/package.nix b/pkgs/by-name/oi/oink/package.nix index cd7d271997a22..405e807e4c337 100644 --- a/pkgs/by-name/oi/oink/package.nix +++ b/pkgs/by-name/oi/oink/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "oink"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "rlado"; repo = "oink"; rev = "v${version}"; - hash = "sha256-ojvuA5IlayPMNajl2+a4lx8NU06Da0vp9TJHCQVMtlo="; + hash = "sha256-nA1M+TIj2mWhaftS5y4D2zIs7HAI4eDRjSdmLUifGKg="; }; vendorHash = null; diff --git a/pkgs/by-name/ok/okolors/package.nix b/pkgs/by-name/ok/okolors/package.nix index 411021f9593ee..8d20c7432e8e2 100644 --- a/pkgs/by-name/ok/okolors/package.nix +++ b/pkgs/by-name/ok/okolors/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { owner = "Ivordir"; repo = "Okolors"; rev = "v${version}"; - sha256 = "sha256-U7rLynXZGHCeZjaXoXx2IRDgUFv7zOKfb4BPgDROzBc="; + hash = "sha256-U7rLynXZGHCeZjaXoXx2IRDgUFv7zOKfb4BPgDROzBc="; }; cargoHash = "sha256-xRCxpmIocvkg1ErYVqBLHb/jXV2eWeWHg4IO/QsnnF0="; diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index a90c465f2c5de..0970b4f0f0112 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.30.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-6t9lkn2voxE6rbBtD7AcO9aRLcLVe2JDFPIj8XR86KU="; + hash = "sha256-TxZdHR6SNHrIAdrrg3X9TnWCR8bjos93d7k7eaKpvQ8="; }; - vendorHash = "sha256-7XZImCS9hv8ILYfGcoY3tMk0grswWbfpQrBKhghTfsY="; + vendorHash = "sha256-GiA/fmLT9x3gGF066bHTBWDd1yhygeG9snwCpwhOlMM="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/pkgs/by-name/ol/ollama/disable-git.patch b/pkgs/by-name/ol/ollama/disable-git.patch index 5f9b4b3323b6a..5248905302dc2 100644 --- a/pkgs/by-name/ol/ollama/disable-git.patch +++ b/pkgs/by-name/ol/ollama/disable-git.patch @@ -1,15 +1,17 @@ +diff --git a/llm/generate/gen_common.sh b/llm/generate/gen_common.sh +index 3825c155..d22eccd2 100644 --- a/llm/generate/gen_common.sh +++ b/llm/generate/gen_common.sh -@@ -65,6 +65,8 @@ - echo 'add_subdirectory(../ext_server ext_server) # ollama' >>${LLAMACPP_DIR}/CMakeLists.txt - fi +@@ -69,6 +69,8 @@ git_module_setup() { + } + apply_patches() { + return + - if [ -n "$(ls -A ../patches/*.diff)" ]; then - # apply temporary patches until fix is upstream - for patch in ../patches/*.diff; do -@@ -110,6 +112,8 @@ + # apply temporary patches until fix is upstream + for patch in ../patches/*.patch; do + git -c 'user.name=nobody' -c 'user.email=<>' -C ${LLAMACPP_DIR} am ${patch} +@@ -133,6 +135,8 @@ install() { # Keep the local tree clean after we're done with the build cleanup() { diff --git a/pkgs/by-name/ol/ollama/disable-lib-check.patch b/pkgs/by-name/ol/ollama/disable-lib-check.patch deleted file mode 100644 index 8ce5fcb04e256..0000000000000 --- a/pkgs/by-name/ol/ollama/disable-lib-check.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/llm/generate/gen_linux.sh -+++ b/llm/generate/gen_linux.sh -@@ -245,7 +245,6 @@ - if [ $(cat "${BUILD_DIR}/bin/deps.txt" | wc -l ) -lt 8 ] ; then - cat "${BUILD_DIR}/bin/deps.txt" - echo "ERROR: deps file short" -- exit 1 - fi - compress - fi diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 87a9a0af891a2..78eda05aaf570 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -2,13 +2,13 @@ lib, buildGoModule, fetchFromGitHub, - fetchpatch, buildEnv, linkFarm, overrideCC, makeWrapper, stdenv, addDriverRunpath, + nix-update-script, cmake, gcc12, @@ -40,43 +40,18 @@ assert builtins.elem acceleration [ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.3.5"; + version = "0.3.12"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-2lPOkpZ9AmgDFoIHKi+Im1AwXnTxSY3LLtyui1ep3Dw="; + hash = "sha256-K1FYXEP0bTZa8M+V4/SxI+Q+LWs2rsAMZ/ETJCaO7P8="; fetchSubmodules = true; }; vendorHash = "sha256-hSxcREAujhvzHVNwnRTfhi0MKI3s8HNavER2VLz6SYk="; - # ollama's patches of llama.cpp's example server - # `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream" - # each update, these patches should be synchronized with the contents of `ollama/llm/patches/` - llamacppPatches = [ - (preparePatch "01-load-progress.diff" "sha256-UTmnBS5hQjIL3eXDZc8RBDNJunLlkqJWH20LpXNiGRQ=") - (preparePatch "02-clip-log.diff" "sha256-rMWbl3QgrPlhisTeHwD7EnGRJyOhLB4UeS7rqa0tdXM=") - (preparePatch "03-load_exception.diff" "sha256-NJkT/k8Mf8HcEMb0XkaLmyUNKV3T+384JRPnmwDI/sk=") - (preparePatch "04-metal.diff" "sha256-bPBCfoT3EjZPjWKfCzh0pnCUbM/fGTj37yOaQr+QxQ4=") - (preparePatch "05-default-pretokenizer.diff" "sha256-PQ0DgfzycUQ8t6S6/yjsMHHx/nFJ0w8AH6afv5Po89w=") - (preparePatch "06-embeddings.diff" "sha256-lqg2SI0OapD9LCoAG6MJW6HIHXEmCTv7P75rE9yq/Mo=") - (preparePatch "07-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=") - (preparePatch "08-pooling.diff" "sha256-7meKWbr06lbVrtxau0AU9BwJ88Z9svwtDXhmHI+hYBk=") - (preparePatch "09-lora.diff" "sha256-tNtI3WHHjBq+PJZGJCBsXHa15dlNJeJm+IiaUbFC0LE=") - (preparePatch "11-phi3-sliding-window.diff" "sha256-VbcR4SLa9UXoh8Jq/bPVBerxfg68JZyWALRs7fz7hEs=") - ]; - - preparePatch = - patch: hash: - fetchpatch { - url = "file://${src}/llm/patches/${patch}"; - inherit hash; - stripLen = 1; - extraPrefix = "llm/llama.cpp/"; - }; - validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [ "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, " "but they are mutually exclusive; falling back to cpu" @@ -87,8 +62,8 @@ let rocmRequested = shouldEnable "rocm" config.rocmSupport; cudaRequested = shouldEnable "cuda" config.cudaSupport; - enableRocm = rocmRequested && stdenv.isLinux; - enableCuda = cudaRequested && stdenv.isLinux; + enableRocm = rocmRequested && stdenv.hostPlatform.isLinux; + enableCuda = cudaRequested && stdenv.hostPlatform.isLinux; rocmLibs = [ rocmPackages.clr @@ -105,13 +80,16 @@ let paths = rocmLibs ++ [ rocmClang ]; }; + cudaLibs = [ + cudaPackages.cuda_cudart + cudaPackages.libcublas + cudaPackages.cuda_cccl + ]; cudaToolkit = buildEnv { name = "cuda-merged"; - paths = [ - (lib.getBin (cudaPackages.cuda_nvcc.__spliced.buildHost or cudaPackages.cuda_nvcc)) - (lib.getLib cudaPackages.cuda_cudart) + paths = map lib.getLib cudaLibs ++ [ (lib.getOutput "static" cudaPackages.cuda_cudart) - (lib.getLib cudaPackages.libcublas) + (lib.getBin (cudaPackages.cuda_nvcc.__spliced.buildHost or cudaPackages.cuda_nvcc)) ]; }; @@ -133,6 +111,9 @@ let ++ lib.optionals enableRocm [ "--suffix LD_LIBRARY_PATH : '${rocmPath}/lib'" "--set-default HIP_PATH '${rocmPath}'" + ] + ++ lib.optionals enableCuda [ + "--suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath (map lib.getLib cudaLibs)}'" ]; wrapperArgs = builtins.concatStringsSep " " wrapperOptions; @@ -140,77 +121,90 @@ let if enableCuda then buildGoModule.override { stdenv = overrideCC stdenv gcc12; } else buildGoModule; inherit (lib) licenses platforms maintainers; in -goBuild ( - (lib.optionalAttrs enableRocm { - ROCM_PATH = rocmPath; - CLBlast_DIR = "${clblast}/lib/cmake/CLBlast"; - }) - // (lib.optionalAttrs enableCuda { CUDA_LIB_DIR = "${cudaToolkit}/lib"; }) - // { - inherit - pname - version - src - vendorHash - ; - - nativeBuildInputs = - [ cmake ] - ++ lib.optionals enableRocm [ rocmPackages.llvm.bintools ] - ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ] - ++ lib.optionals (enableRocm || enableCuda) [ - makeWrapper - autoAddDriverRunpath - ] - ++ lib.optionals stdenv.isDarwin metalFrameworks; - - buildInputs = - lib.optionals enableRocm (rocmLibs ++ [ libdrm ]) - ++ lib.optionals enableCuda [ - cudaPackages.cuda_cudart - cudaPackages.cuda_cccl - cudaPackages.libcublas - ] - ++ lib.optionals stdenv.isDarwin metalFrameworks; - - patches = [ - # disable uses of `git` in the `go generate` script - # ollama's build script assumes the source is a git repo, but nix removes the git directory - # this also disables necessary patches contained in `ollama/llm/patches/` - # those patches are added to `llamacppPatches`, and reapplied here in the patch phase - ./disable-git.patch - # disable a check that unnecessarily exits compilation during rocm builds - # since `rocmPath` is in `LD_LIBRARY_PATH`, ollama uses rocm correctly - ./disable-lib-check.patch - ] ++ llamacppPatches; - postPatch = '' - # replace inaccurate version number with actual release version - substituteInPlace version/version.go --replace-fail 0.0.0 '${version}' - ''; - preBuild = '' - # disable uses of `git`, since nix removes the git directory - export OLLAMA_SKIP_PATCHING=true - # build llama.cpp libraries for ollama - go generate ./... +goBuild { + inherit + pname + version + src + vendorHash + ; + + env = + lib.optionalAttrs enableRocm { + ROCM_PATH = rocmPath; + CLBlast_DIR = "${clblast}/lib/cmake/CLBlast"; + } + // lib.optionalAttrs enableCuda { CUDA_LIB_DIR = "${cudaToolkit}/lib"; }; + + nativeBuildInputs = + [ cmake ] + ++ lib.optionals enableRocm [ rocmPackages.llvm.bintools ] + ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ] + ++ lib.optionals (enableRocm || enableCuda) [ + makeWrapper + autoAddDriverRunpath + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin metalFrameworks; + + buildInputs = + lib.optionals enableRocm (rocmLibs ++ [ libdrm ]) + ++ lib.optionals enableCuda cudaLibs + ++ lib.optionals stdenv.hostPlatform.isDarwin metalFrameworks; + + patches = [ + # disable uses of `git` in the `go generate` script + # ollama's build script assumes the source is a git repo, but nix removes the git directory + # this also disables necessary patches contained in `ollama/llm/patches/` + # those patches are applied in `postPatch` + ./disable-git.patch + + # we provide our own deps at runtime + ./skip-rocm-cp.patch + ]; + + postPatch = '' + # replace inaccurate version number with actual release version + substituteInPlace version/version.go --replace-fail 0.0.0 '${version}' + + # apply ollama's patches to `llama.cpp` submodule + for diff in llm/patches/*; do + patch -p1 -d llm/llama.cpp < $diff + done + ''; + + overrideModAttrs = ( + finalAttrs: prevAttrs: { + # don't run llama.cpp build in the module fetch phase + preBuild = ""; + } + ); + + preBuild = '' + # disable uses of `git`, since nix removes the git directory + export OLLAMA_SKIP_PATCHING=true + # build llama.cpp libraries for ollama + go generate ./... + ''; + + postFixup = + '' + # the app doesn't appear functional at the moment, so hide it + mv "$out/bin/app" "$out/bin/.ollama-app" + '' + + lib.optionalString (enableRocm || enableCuda) '' + # expose runtime libraries necessary to use the gpu + wrapProgram "$out/bin/ollama" ${wrapperArgs} ''; - postFixup = - '' - # the app doesn't appear functional at the moment, so hide it - mv "$out/bin/app" "$out/bin/.ollama-app" - '' - + lib.optionalString (enableRocm || enableCuda) '' - # expose runtime libraries necessary to use the gpu - wrapProgram "$out/bin/ollama" ${wrapperArgs} - ''; - - ldflags = [ - "-s" - "-w" - "-X=github.com/ollama/ollama/version.Version=${version}" - "-X=github.com/ollama/ollama/server.mode=release" - ]; - passthru.tests = + ldflags = [ + "-s" + "-w" + "-X=github.com/ollama/ollama/version.Version=${version}" + "-X=github.com/ollama/ollama/server.mode=release" + ]; + + passthru = { + tests = { inherit ollama; version = testers.testVersion { @@ -218,29 +212,29 @@ goBuild ( package = ollama; }; } - // lib.optionalAttrs stdenv.isLinux { + // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit ollama-rocm ollama-cuda; service = nixosTests.ollama; service-cuda = nixosTests.ollama-cuda; service-rocm = nixosTests.ollama-rocm; }; - - meta = { - description = - "Get up and running with large language models locally" - + lib.optionalString rocmRequested ", using ROCm for AMD GPU acceleration" - + lib.optionalString cudaRequested ", using CUDA for NVIDIA GPU acceleration"; - homepage = "https://github.com/ollama/ollama"; - changelog = "https://github.com/ollama/ollama/releases/tag/v${version}"; - license = licenses.mit; - platforms = if (rocmRequested || cudaRequested) then platforms.linux else platforms.unix; - mainProgram = "ollama"; - maintainers = with maintainers; [ - abysssol - dit7ya - elohmeier - roydubnium - ]; - }; - } -) + } // lib.optionalAttrs (!enableRocm && !enableCuda) { updateScript = nix-update-script { }; }; + + meta = { + description = + "Get up and running with large language models locally" + + lib.optionalString rocmRequested ", using ROCm for AMD GPU acceleration" + + lib.optionalString cudaRequested ", using CUDA for NVIDIA GPU acceleration"; + homepage = "https://github.com/ollama/ollama"; + changelog = "https://github.com/ollama/ollama/releases/tag/v${version}"; + license = licenses.mit; + platforms = if (rocmRequested || cudaRequested) then platforms.linux else platforms.unix; + mainProgram = "ollama"; + maintainers = with maintainers; [ + abysssol + dit7ya + elohmeier + roydubnium + ]; + }; +} diff --git a/pkgs/by-name/ol/ollama/skip-rocm-cp.patch b/pkgs/by-name/ol/ollama/skip-rocm-cp.patch new file mode 100644 index 0000000000000..672b3f24b4975 --- /dev/null +++ b/pkgs/by-name/ol/ollama/skip-rocm-cp.patch @@ -0,0 +1,14 @@ +diff --git a/llm/generate/gen_linux.sh b/llm/generate/gen_linux.sh +index 48d08fd0..e50f7b36 100755 +--- a/llm/generate/gen_linux.sh ++++ b/llm/generate/gen_linux.sh +@@ -284,9 +284,6 @@ if [ -z "${OLLAMA_SKIP_ROCM_GENERATE}" -a -d "${ROCM_PATH}" ]; then + mkdir -p "${ROCM_DIST_DIR}" + for dep in $(ldd "${BUILD_DIR}/bin/ollama_llama_server" | grep "=>" | cut -f2 -d= | cut -f2 -d' ' | grep -v "${GOARCH}/rocm${ROCM_VARIANT}" | grep -e rocm -e amdgpu -e libtinfo -e libnuma -e libelf ); do + cp -a "${dep}"* "${ROCM_DIST_DIR}" +- if [ $(readlink -f "${dep}") != "${dep}" ] ; then +- cp $(readlink -f "${dep}") "${ROCM_DIST_DIR}" +- fi + done + install + dist diff --git a/pkgs/by-name/om/omekasy/package.nix b/pkgs/by-name/om/omekasy/package.nix new file mode 100644 index 0000000000000..ec2b53644c2fb --- /dev/null +++ b/pkgs/by-name/om/omekasy/package.nix @@ -0,0 +1,29 @@ +{ + stdenv, + rustPlatform, + fetchFromGitHub, + lib, +}: +rustPlatform.buildRustPackage rec { + pname = "omekasy"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "ikanago"; + repo = "omekasy"; + rev = "v${version}"; + hash = "sha256-wI+xN6pyNoP4xknjHHDydHq275Gb1nyp7YtqmABlTBA="; + }; + + cargoHash = "sha256-6CU2ff4o7Y3CmZSf/xs2SSGco2mu4oRLJYIciCld8zo="; + + buildNoDefaultFeatures = stdenv.targetPlatform.isWasi; + + meta = { + description = "Command line application that converts alphanumeric characters to various styles defined in Unicode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jcaesar ]; + homepage = "https://github.com/ikanago/omekasy"; + mainProgram = "omekasy"; + }; +} diff --git a/pkgs/by-name/om/omniorbpy/package.nix b/pkgs/by-name/om/omniorbpy/package.nix deleted file mode 100644 index a288dc34c6481..0000000000000 --- a/pkgs/by-name/om/omniorbpy/package.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - omniorb, - pkg-config, - python3, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "omniorbpy"; - version = "4.3.2"; - - src = fetchurl { - url = "http://downloads.sourceforge.net/omniorb/omniORBpy-${finalAttrs.version}.tar.bz2"; - hash = "sha256-y1cX1BKhAbr0MPWYysfWkjGITa5DctjirfPd7rxffrs="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - propagatedBuildInputs = [ - omniorb - ]; - - configureFlags = [ - "--with-omniorb=${omniorb}" - "PYTHON_PREFIX=$out" - "PYTHON=${lib.getExe python3}" - ]; - - # Transform omniidl_be into a PEP420 namespace - postInstall = '' - rm $out/${python3.sitePackages}/omniidl_be/__init__.py - rm $out/${python3.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc - ''; - - # Ensure both python & cxx backends are available - doInstallCheck = true; - postInstallCheck = '' - export PYTHONPATH=$out/${python3.sitePackages}:${omniorb}/${python3.sitePackages}:$PYTHONPATH - ${lib.getExe python3} -c "import omniidl_be.cxx; import omniidl_be.python" - ''; - - - meta = with lib; { - description = "Python backend for omniorb"; - homepage = "http://omniorb.sourceforge.net"; - license = with licenses; [ gpl2Plus lgpl21Plus ]; - maintainers = with maintainers; [ nim65s ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/by-name/om/omnom/0001-fix-minimal-go-version.patch b/pkgs/by-name/om/omnom/0001-fix-minimal-go-version.patch new file mode 100644 index 0000000000000..64f63f1bf6ffa --- /dev/null +++ b/pkgs/by-name/om/omnom/0001-fix-minimal-go-version.patch @@ -0,0 +1,83 @@ +Bump the minimal Go version as some features require Go 1.17 and higher to work + +--- + go.mod | 48 ++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 38 insertions(+), 10 deletions(-) + +diff --git a/go.mod b/go.mod +index 1756ffe..81f7fa2 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,31 +1,59 @@ + module github.com/asciimoo/omnom + +-go 1.15 ++go 1.17 + + require ( +- github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect +- github.com/bytedance/sonic v1.12.1 // indirect +- github.com/gabriel-vasile/mimetype v1.4.5 // indirect + github.com/gin-contrib/multitemplate v1.0.1 + github.com/gin-gonic/contrib v0.0.0-20240508051311-c1c6bf0061b0 + github.com/gin-gonic/gin v1.10.0 ++ github.com/spf13/cobra v1.8.1 ++ github.com/xhit/go-simple-mail/v2 v2.16.0 ++ golang.org/x/net v0.27.0 ++ gopkg.in/yaml.v2 v2.4.0 ++ gorm.io/driver/sqlite v1.5.6 ++ gorm.io/gorm v1.25.11 ++) ++ ++require ( ++ github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect ++ github.com/bytedance/sonic v1.12.1 // indirect ++ github.com/bytedance/sonic/loader v0.2.0 // indirect ++ github.com/cloudwego/base64x v0.1.4 // indirect ++ github.com/cloudwego/iasm v0.2.0 // indirect ++ github.com/gabriel-vasile/mimetype v1.4.5 // indirect ++ github.com/gin-contrib/sse v0.1.0 // indirect ++ github.com/go-playground/locales v0.14.1 // indirect ++ github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.22.0 // indirect + github.com/go-test/deep v1.1.1 // indirect + github.com/goccy/go-json v0.10.3 // indirect ++ github.com/gomodule/redigo v2.0.0+incompatible // indirect ++ github.com/google/go-cmp v0.6.0 // indirect + github.com/gorilla/context v1.1.2 // indirect ++ github.com/gorilla/securecookie v1.1.2 // indirect + github.com/gorilla/sessions v1.3.0 // indirect ++ github.com/inconshreveable/mousetrap v1.1.0 // indirect ++ github.com/jinzhu/inflection v1.0.0 // indirect ++ github.com/jinzhu/now v1.1.5 // indirect ++ github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect + github.com/kr/pretty v0.3.0 // indirect ++ github.com/leodido/go-urn v1.4.0 // indirect ++ github.com/mattn/go-isatty v0.0.20 // indirect ++ github.com/mattn/go-sqlite3 v1.14.22 // indirect ++ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect ++ github.com/modern-go/reflect2 v1.0.2 // indirect ++ github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/rogpeppe/go-internal v1.8.0 // indirect +- github.com/spf13/cobra v1.8.1 ++ github.com/spf13/pflag v1.0.5 // indirect + github.com/toorop/go-dkim v0.0.0-20240103092955-90b7d1423f92 // indirect +- github.com/xhit/go-simple-mail/v2 v2.16.0 ++ github.com/twitchyliquid64/golang-asm v0.15.1 // indirect ++ github.com/ugorji/go/codec v1.2.12 // indirect + golang.org/x/arch v0.9.0 // indirect +- golang.org/x/net v0.27.0 ++ golang.org/x/crypto v0.25.0 // indirect + golang.org/x/sys v0.23.0 // indirect ++ golang.org/x/text v0.16.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect +- gopkg.in/yaml.v2 v2.4.0 +- gorm.io/driver/sqlite v1.5.6 +- gorm.io/gorm v1.25.11 ++ gopkg.in/yaml.v3 v3.0.1 // indirect + ) +-- +2.45.2 + diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix new file mode 100644 index 0000000000000..20660906a712f --- /dev/null +++ b/pkgs/by-name/om/omnom/package.nix @@ -0,0 +1,60 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + makeWrapper, +}: + +buildGoModule { + pname = "omnom"; + version = "0-unstable-2024-08-29"; + + src = fetchFromGitHub { + owner = "asciimoo"; + repo = "omnom"; + rev = "1fcd7787886503f703bbcd31b193d4c93acc5610"; + hash = "sha256-o/n8rgngQkYEn8J0aFpCiD4qrWVFaaa305OxiscU6+8="; + fetchSubmodules = true; + }; + + vendorHash = "sha256-dsS5w8JXIwkneWScOFzLSDiXq+clgK+RdYiMw0+FnvY="; + + patches = [ ./0001-fix-minimal-go-version.patch ]; + + nativeBuildInputs = [ makeWrapper ]; + + ldflags = [ + "-s" + "-w" + ]; + + postPatch = '' + # For the default config to work, we have to put `static/data` and + # `db.sqlite3` in a temporary directory since they need to be writeable. + # + # NOTE: Currently, `static/data` only holds the snapshots directory. + substituteInPlace config.yml \ + --replace-fail 'root: "./static/data"' 'root: "/tmp/omnom/static/data"' \ + --replace-fail 'connection: "./db.sqlite3"' 'connection: "/tmp/omnom/db.sqlite3"' \ + --replace-fail 'debug: true' 'debug: false' + ''; + + postInstall = '' + mkdir -p $out/share + cp -r config.yml static templates $out/share + + wrapProgram $out/bin/omnom \ + --chdir $out/share \ + --set-default GIN_MODE release + ''; + + meta = { + description = "A webpage bookmarking and snapshotting service"; + homepage = "https://github.com/asciimoo/omnom"; + license = lib.licenses.agpl3Only; + maintainers = [ + # maintained by the team working on NGI-supported software, no group for this yet + ]; + mainProgram = "omnom"; + }; +} diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix index db108ec5057c5..ae59c1c10ac95 100644 --- a/pkgs/by-name/on/onedrive/package.nix +++ b/pkgs/by-name/on/onedrive/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "onedrive"; - version = "2.5.0-rc3"; + version = "2.5.2"; src = fetchFromGitHub { owner = "abraunegg"; repo = "onedrive"; rev = "v${finalAttrs.version}"; - hash = "sha256-UOtCRCHTBpPScFB/OcGalGFjVUslULBO3KIED+0Hs+M="; + hash = "sha256-neJi5lIx45GsuwZPzzwwEm1bfrL2DFSysVkxa4fCBww"; }; outputs = [ diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix index 53dda082e8d56..76dac0203c20f 100644 --- a/pkgs/by-name/on/onedrivegui/package.nix +++ b/pkgs/by-name/on/onedrivegui/package.nix @@ -1,15 +1,16 @@ -{ lib -, python3Packages -, fetchFromGitHub -, writeText -, copyDesktopItems -, makeDesktopItem -, makeWrapper -, onedrive +{ + lib, + python3Packages, + fetchFromGitHub, + writeText, + copyDesktopItems, + makeDesktopItem, + makeWrapper, + onedrive, }: let - version = "1.0.3"; + version = "1.1.0"; setupPy = writeText "setup.py" '' from setuptools import setup @@ -31,12 +32,18 @@ python3Packages.buildPythonApplication rec { owner = "bpozdena"; repo = "OneDriveGUI"; rev = "v${version}"; - hash = "sha256-HutziAzhIDYP8upNPieL2GNrxPBHUCVs09FFxdSqeBs="; + hash = "sha256-d5NAcT3x9R/2DVQKZsw4GH63nTlVFsvkWwMrb42s18s="; }; - nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; - propagatedBuildInputs = with python3Packages; [ pyside6 requests ]; + propagatedBuildInputs = with python3Packages; [ + pyside6 + requests + ]; # wrap manually to avoid having a bash script in $out/bin with a .py extension dontWrapPythonPrograms = true; @@ -73,7 +80,9 @@ python3Packages.buildPythonApplication rec { makeWrapper ${python3Packages.python.interpreter} $out/bin/onedrivegui \ --prefix PATH : ${lib.makeBinPath [ onedrive ]} \ - --prefix PYTHONPATH : ${python3Packages.makePythonPath (propagatedBuildInputs ++ [(placeholder "out")])} \ + --prefix PYTHONPATH : ${ + python3Packages.makePythonPath (propagatedBuildInputs ++ [ (placeholder "out") ]) + } \ --add-flags $out/${python3Packages.python.sitePackages}/OneDriveGUI.py ''; diff --git a/pkgs/by-name/on/onlyoffice-bin/package.nix b/pkgs/by-name/on/onlyoffice-bin/package.nix deleted file mode 100644 index 5156778b7e254..0000000000000 --- a/pkgs/by-name/on/onlyoffice-bin/package.nix +++ /dev/null @@ -1,198 +0,0 @@ -{ stdenv -, lib -, fetchurl -, buildFHSEnv - # Alphabetic ordering below -, alsa-lib -, at-spi2-atk -, atk -, autoPatchelfHook -, cairo -, curl -, dbus -, dconf -, dpkg -, fontconfig -, gcc-unwrapped -, gdk-pixbuf -, glib -, glibc -, gsettings-desktop-schemas -, gst_all_1 -, gtk2 -, gtk3 -, libpulseaudio -, libudev0-shim -, libdrm -, makeWrapper -, mesa -, noto-fonts-cjk-sans -, nspr -, nss -, pulseaudio -, qt5 -, wrapGAppsHook3 -, xkeyboard_config -, xorg -}: -let - - # Note on fonts: - # - # OnlyOffice does not distribute unfree fonts, but makes it easy to pick up - # any fonts you install. See: - # - # * https://helpcenter.onlyoffice.com/en/installation/docs-community-install-fonts-linux.aspx - # * https://www.onlyoffice.com/blog/2020/04/how-to-add-new-fonts-to-onlyoffice-desktop-editors/ - # - # As recommended there, you should download - # - # arial.ttf, calibri.ttf, cour.ttf, symbol.ttf, times.ttf, wingding.ttf - # - # into `~/.local/share/fonts/`, otherwise the default template fonts, and - # things like bullet points, will not look as expected. - - # TODO: Find out which of these fonts we'd be allowed to distribute along - # with this package, or how to make this easier for users otherwise. - - runtimeLibs = lib.makeLibraryPath [ - curl - glibc - gcc-unwrapped.lib - libudev0-shim - pulseaudio - ]; - - derivation = stdenv.mkDerivation rec { - pname = "onlyoffice-desktopeditors"; - version = "8.1.0"; - minor = null; - src = fetchurl { - url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-hS1+gLN17sP3EFud3fQXRWeFiQbrumBONLjqXEl89Js="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - wrapGAppsHook3 - ]; - - buildInputs = [ - alsa-lib - at-spi2-atk - atk - cairo - dbus - dconf - fontconfig - gdk-pixbuf - glib - gsettings-desktop-schemas - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - gtk2 - gtk3 - libpulseaudio - libdrm - nspr - nss - mesa # libgbm - qt5.qtbase - qt5.qtdeclarative - qt5.qtsvg - qt5.qtwayland - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - ]; - - dontWrapQtApps = true; - - unpackPhase = '' - dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,lib,share} - - mv usr/bin/* $out/bin - mv usr/share/* $out/share/ - mv opt/onlyoffice/desktopeditors $out/share - - for f in $out/share/desktopeditors/asc-de-*.png; do - size=$(basename "$f" ".png" | cut -d"-" -f3) - res="''${size}x''${size}" - mkdir -pv "$out/share/icons/hicolor/$res/apps" - ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png" - done; - - substituteInPlace $out/bin/onlyoffice-desktopeditors \ - --replace "/opt/onlyoffice/" "$out/share/" - - ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ - --set QT_QPA_PLATFORM "xcb" - # the bundled version of qt does not support wayland - ) - ''; - }; - -in - -# In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it. -# Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. -# Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them -buildFHSEnv { - inherit (derivation) pname version; - - targetPkgs = pkgs': [ - curl - derivation - noto-fonts-cjk-sans - ]; - - runScript = "/bin/onlyoffice-desktopeditors"; - - extraInstallCommands = '' - mkdir -p $out/share - ln -s ${derivation}/share/icons $out/share - cp -r ${derivation}/share/applications $out/share - substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \ - --replace "/usr/bin/onlyoffice-desktopeditors" "$out/bin/onlyoffice-desktopeditors" - ''; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; - mainProgram = "onlyoffice-desktopeditors"; - homepage = "https://www.onlyoffice.com/"; - downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; - changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ nh2 gtrunsec ]; - }; -} diff --git a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix new file mode 100644 index 0000000000000..0670385f2c42e --- /dev/null +++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix @@ -0,0 +1,201 @@ +{ + stdenv, + lib, + fetchurl, + buildFHSEnv, + # Alphabetic ordering below + alsa-lib, + at-spi2-atk, + atk, + autoPatchelfHook, + cairo, + curl, + dbus, + dconf, + dpkg, + fontconfig, + gcc-unwrapped, + gdk-pixbuf, + glib, + glibc, + gsettings-desktop-schemas, + gst_all_1, + gtk2, + gtk3, + libpulseaudio, + libudev0-shim, + libdrm, + makeWrapper, + mesa, + noto-fonts-cjk-sans, + nspr, + nss, + pulseaudio, + qt5, + wrapGAppsHook3, + xkeyboard_config, + xorg, +}: +let + + # Note on fonts: + # + # OnlyOffice does not distribute unfree fonts, but makes it easy to pick up + # any fonts you install. See: + # + # * https://helpcenter.onlyoffice.com/en/installation/docs-community-install-fonts-linux.aspx + # * https://www.onlyoffice.com/blog/2020/04/how-to-add-new-fonts-to-onlyoffice-desktop-editors/ + # + # As recommended there, you should download + # + # arial.ttf, calibri.ttf, cour.ttf, symbol.ttf, times.ttf, wingding.ttf + # + # into `~/.local/share/fonts/`, otherwise the default template fonts, and + # things like bullet points, will not look as expected. + + # TODO: Find out which of these fonts we'd be allowed to distribute along + # with this package, or how to make this easier for users otherwise. + + runtimeLibs = lib.makeLibraryPath [ + curl + glibc + gcc-unwrapped.lib + libudev0-shim + pulseaudio + ]; + + derivation = stdenv.mkDerivation rec { + pname = "onlyoffice-desktopeditors"; + version = "8.1.1"; + minor = null; + src = fetchurl { + url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; + hash = "sha256-RwWIYcbYljDqWRJcXCDODjVeYnp9xreNGO2l2aqWJ9w="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + wrapGAppsHook3 + ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + atk + cairo + dbus + dconf + fontconfig + gdk-pixbuf + glib + gsettings-desktop-schemas + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gtk2 + gtk3 + libpulseaudio + libdrm + nspr + nss + mesa # libgbm + qt5.qtbase + qt5.qtdeclarative + qt5.qtsvg + qt5.qtwayland + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst + ]; + + dontWrapQtApps = true; + + unpackPhase = '' + dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib,share} + + mv usr/bin/* $out/bin + mv usr/share/* $out/share/ + mv opt/onlyoffice/desktopeditors $out/share + + for f in $out/share/desktopeditors/asc-de-*.png; do + size=$(basename "$f" ".png" | cut -d"-" -f3) + res="''${size}x''${size}" + mkdir -pv "$out/share/icons/hicolor/$res/apps" + ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png" + done; + + substituteInPlace $out/bin/onlyoffice-desktopeditors \ + --replace "/opt/onlyoffice/" "$out/share/" + + ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QT_QPA_PLATFORM "xcb" + # the bundled version of qt does not support wayland + ) + ''; + }; + +in + +# In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it. +# Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. +# Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them +buildFHSEnv { + inherit (derivation) pname version; + + targetPkgs = pkgs': [ + curl + derivation + noto-fonts-cjk-sans + ]; + + runScript = "/bin/onlyoffice-desktopeditors"; + + extraInstallCommands = '' + mkdir -p $out/share + ln -s ${derivation}/share/icons $out/share + cp -r ${derivation}/share/applications $out/share + substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \ + --replace "/usr/bin/onlyoffice-desktopeditors" "$out/bin/onlyoffice-desktopeditors" + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; + homepage = "https://www.onlyoffice.com/"; + downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; + changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + nh2 + gtrunsec + ]; + }; +} diff --git a/pkgs/by-name/on/onlyoffice-bin/update.sh b/pkgs/by-name/on/onlyoffice-desktopeditors/update.sh similarity index 100% rename from pkgs/by-name/on/onlyoffice-bin/update.sh rename to pkgs/by-name/on/onlyoffice-desktopeditors/update.sh diff --git a/pkgs/by-name/on/onscripter-en/package.nix b/pkgs/by-name/on/onscripter-en/package.nix index 74b440b427732..64c7cd931fa2f 100644 --- a/pkgs/by-name/on/onscripter-en/package.nix +++ b/pkgs/by-name/on/onscripter-en/package.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "onscripter-en"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/on/onthespot/package.nix b/pkgs/by-name/on/onthespot/package.nix index 696a7e51f78e5..ebda24f086969 100644 --- a/pkgs/by-name/on/onthespot/package.nix +++ b/pkgs/by-name/on/onthespot/package.nix @@ -1,16 +1,17 @@ -{ lib -, copyDesktopItems -, fetchFromGitHub -, makeDesktopItem -, python3 -, libsForQt5 -, ffmpeg +{ + lib, + copyDesktopItems, + fetchFromGitHub, + makeDesktopItem, + python3, + libsForQt5, + ffmpeg, }: python3.pkgs.buildPythonApplication rec { pname = "onthespot"; version = "0.5"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "casualsnek"; @@ -19,12 +20,23 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg="; }; + pythonRemoveDeps = [ + "PyQt5-Qt5" + "PyQt5-stubs" + # Doesn't seem to be used in the sources and causes + # build issues + "PyOgg" + ]; + + pythonRelaxDeps = true; + nativeBuildInputs = with python3.pkgs; [ copyDesktopItems libsForQt5.wrapQtAppsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ + async-timeout charset-normalizer defusedxml ffmpeg @@ -43,16 +55,6 @@ python3.pkgs.buildPythonApplication rec { zeroconf ]; - pythonRemoveDeps = [ - "PyQt5-Qt5" - "PyQt5-stubs" - # Doesn't seem to be used in the sources and causes - # build issues - "PyOgg" - ]; - - pythonRelaxDeps = true; - postInstall = '' install -Dm444 $src/src/onthespot/resources/icon.png $out/share/icons/hicolor/256x256/apps/onthespot.png ''; @@ -72,13 +74,13 @@ python3.pkgs.buildPythonApplication rec { }) ]; - meta = with lib; { + meta = { description = "QT based Spotify music downloader written in Python"; homepage = "https://github.com/casualsnek/onthespot"; changelog = "https://github.com/casualsnek/onthespot/releases/tag/v${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ onny ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ onny ]; + platforms = lib.platforms.linux; mainProgram = "onthespot_gui"; }; } diff --git a/pkgs/by-name/op/open-fprintd/package.nix b/pkgs/by-name/op/open-fprintd/package.nix index 45aac839e399e..06f46d217dfb9 100644 --- a/pkgs/by-name/op/open-fprintd/package.nix +++ b/pkgs/by-name/op/open-fprintd/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { owner = "uunicorn"; repo = pname; rev = version; - sha256 = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU="; + hash = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU="; }; nativeBuildInputs = [ wrapGAppsNoGuiHook gobject-introspection ]; diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index 33d4e47c76fb8..1028cfb68250b 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { gtk4 libadwaita pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreBluetooth darwin.apple_sdk.frameworks.CoreGraphics diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 7fc0530e6cf52..dc209b312f3eb 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,25 +7,25 @@ }: let pname = "open-webui"; - version = "0.3.16"; + version = "0.3.30"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; - rev = "v${version}"; - hash = "sha256-AxD7WHL5fGM0CBKi7zc/gmoSJQBohDh0HgIDU1/BQ7w="; + rev = "refs/tags/v${version}"; + hash = "sha256-zGgCISGpna9L8Eqze0WWagIx26DwhLpeOLCVslpcJ08="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-Ik+wXymso3jdKXQgLydnhhWvpHl0d82pwYSmUR0yfPE="; + npmDepsHash = "sha256-508AjFAzQvWPkn+kMv/YQUeG0jikZJJxNkFqfkKi9Ks="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. postPatch = '' substituteInPlace package.json \ - --replace-fail "npm run pyodide:fetch && vite build" "vite build" \ + --replace-fail "npm run pyodide:fetch && vite build" "vite build" ''; env.CYPRESS_INSTALL_BINARY = "0"; # disallow cypress from downloading binaries in sandbox @@ -76,8 +76,10 @@ python3.pkgs.buildPythonApplication rec { black boto3 chromadb + colbert-ai docx2txt duckduckgo-search + einops extract-msg fake-useragent fastapi @@ -103,6 +105,7 @@ python3.pkgs.buildPythonApplication rec { psycopg2 pydub pyjwt + pymilvus pymongo pymysql pypandoc diff --git a/pkgs/by-name/op/open62541/package.nix b/pkgs/by-name/op/open62541/package.nix index cad730b4b32a3..dd32cfbe844c7 100644 --- a/pkgs/by-name/op/open62541/package.nix +++ b/pkgs/by-name/op/open62541/package.nix @@ -168,6 +168,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/open62541/open62541/releases/tag/v${finalAttrs.version}"; license = licenses.mpl20; maintainers = with maintainers; [ panicgh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix new file mode 100644 index 0000000000000..a4445a6a56704 --- /dev/null +++ b/pkgs/by-name/op/openapi-python-client/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + darwin, + python3Packages, + fetchFromGitHub, + installShellFiles, + ruff, + testers, + openapi-python-client, +}: + +python3Packages.buildPythonApplication rec { + pname = "openapi-python-client"; + version = "0.21.5"; + pyproject = true; + + src = fetchFromGitHub { + inherit version; + owner = "openapi-generators"; + repo = "openapi-python-client"; + rev = "refs/tags/v${version}"; + hash = "sha256-/m/XXNqsr0FjYSEGMSw4zIUpWJDOqu9BzNuJKyb7fKY="; + }; + + nativeBuildInputs = + [ + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.ps + ]; + + build-system = with python3Packages; [ + hatchling + ]; + + dependencies = + (with python3Packages; [ + attrs + httpx + jinja2 + pydantic + python-dateutil + ruamel-yaml + shellingham + typer + typing-extensions + ]) + ++ [ ruff ]; + + # ruff is not packaged as a python module in nixpkgs + pythonRemoveDeps = [ "ruff" ]; + + postInstall = '' + # see: https://github.com/fastapi/typer/blob/5889cf82f4ed925f92e6b0750bf1b1ed9ee672f3/typer/completion.py#L54 + # otherwise shellingham throws exception on darwin + export _TYPER_COMPLETE_TEST_DISABLE_SHELL_DETECTION=1 + installShellCompletion --cmd openapi-python-client \ + --bash <($out/bin/openapi-python-client --show-completion bash) \ + --fish <($out/bin/openapi-python-client --show-completion fish) \ + --zsh <($out/bin/openapi-python-client --show-completion zsh) + ''; + + passthru = { + tests.version = testers.testVersion { + package = openapi-python-client; + }; + }; + + meta = { + description = "Generate modern Python clients from OpenAPI"; + homepage = "https://github.com/openapi-generators/openapi-python-client"; + changelog = "https://github.com/openapi-generators/openapi-python-client/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "openapi-python-client"; + maintainers = with lib.maintainers; [ konradmalik ]; + }; +} diff --git a/pkgs/by-name/op/openapi-tui/package.nix b/pkgs/by-name/op/openapi-tui/package.nix index a7473ec66937c..6673dd6e9ca14 100644 --- a/pkgs/by-name/op/openapi-tui/package.nix +++ b/pkgs/by-name/op/openapi-tui/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "openapi-tui"; - version = "0.9.4"; + version = "0.10.0"; src = fetchFromGitHub { owner = "zaghaghi"; repo = "openapi-tui"; rev = version; - hash = "sha256-y8A43FV3PfYHaMMHE3uGRBaftga/pVSivCfV4iwUROA="; + hash = "sha256-EUWL16cHgPF88CoCD9sqnxLOlmWoe1tu5ps01AYwwzc="; }; - cargoHash = "sha256-I1eTJDtQM9WKluOZJGfQT4Wn9TFyTu6ZcPFuh8wZIWI="; + cargoHash = "sha256-sINwuMgBbc/Xn73Gy+Wwb0QtIHGGB02fVyz/K/tg5Ys="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index 0d034ea1b8d1c..1f3a1f15ebee9 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openasar"; - version = "0-unstable-2024-06-30"; + version = "0-unstable-2024-09-06"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "5c875eb048e96543f1ec711fae522ace5e4a836c"; - hash = "sha256-dlf4X+2W2GfL2E46ZM35PqpcoKHoZ4fhroOCLpye1D0="; + rev = "f92ee8c3dc6b6ff9829f69a1339e0f82a877929c"; + hash = "sha256-V2oZ0mQbX+DHDZfTj8sV4XS6r9NOmJYHvYOGK6X/+HU="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencomposite-helper/package.nix b/pkgs/by-name/op/opencomposite-helper/package.nix deleted file mode 100644 index f19f5e8681393..0000000000000 --- a/pkgs/by-name/op/opencomposite-helper/package.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ writeShellApplication - -, monado -, opencomposite -}: -writeShellApplication { - name = "opencomposite-helper"; - text = '' - # Tell Proton to use OpenComposite instead of OpenVR - export VR_OVERRIDE=${opencomposite}/lib/opencomposite - # Help OpenComposite find the OpenXR runtime - export XR_RUNTIME_JSON=${monado}/share/openxr/1/openxr_monado.json - # Tell Steam Pressure Vessel to allow access to Monado - export PRESSURE_VESSEL_FILESYSTEMS_RW=$XDG_RUNTIME_DIR/monado_comp_ipc - exec "$@" - ''; -} - diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index db42ea0f9f784..50877ded84ca8 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation { pname = "opencomposite"; - version = "0-unstable-2024-07-23"; + version = "0-unstable-2024-10-02"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "632e5cc50b913e93194ca2970e6f13021182579f"; - hash = "sha256-KQmNyGRlbUrntTPNn5rzTyyR+Bvh3EfSqBgyNGGDo04="; + rev = "f969a972e9a151de776fa8d1bd6e67056f0a5d5d"; + hash = "sha256-CE+ushwNv8kQSXtrQ6K5veBmpQvQaMKk6P9G1wV2uvM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/op/openctm/package.nix b/pkgs/by-name/op/openctm/package.nix index 169e4469abcd8..4d380543857f1 100644 --- a/pkgs/by-name/op/openctm/package.nix +++ b/pkgs/by-name/op/openctm/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { "MAN1DIR=$(man)/share/man//man1" ]; - makefile = if stdenv.isDarwin then "Makefile.macosx" else "Makefile.linux"; + makefile = if stdenv.hostPlatform.isDarwin then "Makefile.macosx" else "Makefile.linux"; preInstall = "mkdir -p $bin/bin $dev/include $out/lib $man/share/man/man1"; diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix index a1ca9738b61b8..cbab08367bf3c 100644 --- a/pkgs/by-name/op/openfga-cli/package.nix +++ b/pkgs/by-name/op/openfga-cli/package.nix @@ -7,7 +7,7 @@ let pname = "openfga-cli"; - version = "0.5.3"; + version = "0.6.1"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "cli"; rev = "v${version}"; - hash = "sha256-74wHhVGhLiuszRZBjxGGk9jfN+D6T1eZg8OFEkE3gPE="; + hash = "sha256-cAfBEhgHnzmSD8/pVi8VVjnC3O+WgokzdPSzvE5hDec="; }; - vendorHash = "sha256-TDjXy5zR5LJWVmIfAolHgzM7JElgyksHbv0NAS97QnU="; + vendorHash = "sha256-jIcuyt4tzfz+WkyQnMZs6viLnmwtGbVawgnz9M/xAS8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index a1f4d8cf2e921..0fc5da79bfbf1 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,7 +7,7 @@ let pname = "openfga"; - version = "1.5.9"; + version = "1.6.1"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "openfga"; rev = "v${version}"; - hash = "sha256-btk7I1jHWJfV1KgWpPXbKbn1f/2MnLrqA0HuHD3fSQc="; + hash = "sha256-NdMv81XUHawey/xO7UUsTpbBF/4F77N7VtyYCKZjjkU="; }; - vendorHash = "sha256-rU45E9yEh7a1MrbnzFFuNeMpfbODO2O7tqEaiv7CA9Y="; + vendorHash = "sha256-4f681Qq6cAAQpla+xcvDXCYwa0ZBqsYSWWDyq5jbdd0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/openfst/package.nix b/pkgs/by-name/op/openfst/package.nix new file mode 100644 index 0000000000000..318a4107a813c --- /dev/null +++ b/pkgs/by-name/op/openfst/package.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "openfst"; + version = "1.8.3"; + + src = fetchurl { + url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; + hash = "sha256-B3cUFZ1c8+OKgLbGZW08zCyLi2xQu0G7ZcX+wQeWv1M="; + }; + + configureFlags = [ + "--enable-compact-fsts" + "--enable-compress" + "--enable-const-fsts" + "--enable-far" + "--enable-linear-fsts" + "--enable-lookahead-fsts" + "--enable-mpdt" + "--enable-ngram-fsts" + "--enable-pdt" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Library for working with finite-state transducers"; + longDescription = '' + Library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs). + FSTs have key applications in speech recognition and synthesis, machine translation, optical character recognition, + pattern matching, string processing, machine learning, information extraction and retrieval among others + ''; + homepage = "https://www.openfst.org/twiki/bin/view/FST/WebHome"; + license = licenses.asl20; + maintainers = [ maintainers.dfordivam ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/op/opengrm-ngram/package.nix b/pkgs/by-name/op/opengrm-ngram/package.nix new file mode 100644 index 0000000000000..ec1b297da8342 --- /dev/null +++ b/pkgs/by-name/op/opengrm-ngram/package.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, autoreconfHook, fetchurl, openfst }: + +stdenv.mkDerivation rec { + pname = "opengrm-ngram"; + version = "1.3.16"; + + src = fetchurl { + url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz"; + hash = "sha256-pcwP0VVW8H+0Y2Fsmh4WaH4whPPJlE3WyBI4VJfsES4="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ openfst ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Library to make and modify n-gram language models encoded as weighted finite-state transducers"; + homepage = "https://www.openfst.org/twiki/bin/view/GRM/NGramLibrary"; + license = licenses.asl20; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/op/opengv/package.nix b/pkgs/by-name/op/opengv/package.nix index a0025a29dba77..23b1b7e1d83db 100644 --- a/pkgs/by-name/op/opengv/package.nix +++ b/pkgs/by-name/op/opengv/package.nix @@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: { eigen ]; - cmakeFlakes = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") - ]; - meta = { description = "Collection of computer vision methods for solving geometric vision problems"; homepage = "https://github.com/laurentkneip/opengv"; diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix index ebd93572e29ed..12048b593dd02 100644 --- a/pkgs/by-name/op/openh264/package.nix +++ b/pkgs/by-name/op/openh264/package.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch2 , gtest , meson , nasm @@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ai7lcGcQQqpsLGSwHkSs7YAoEfGCIbxdClO6JpGA+MI="; }; + patches = [ + # build: fix build with meson on riscv64 + # https://github.com/cisco/openh264/pull/3773 + (fetchpatch2 { + name = "openh264-riscv64.patch"; + url = "https://github.com/cisco/openh264/commit/cea886eda8fae7ba42c4819e6388ce8fc633ebf6.patch"; + hash = "sha256-ncXuGgogXA7JcCOjGk+kBprmOErFohrYjYzZYzAbbDQ="; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ @@ -45,7 +56,8 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; # See meson.build platforms = lib.platforms.windows ++ lib.intersectLists - (lib.platforms.x86 ++ lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.loongarch64) + (lib.platforms.x86 ++ lib.platforms.arm ++ lib.platforms.aarch64 ++ + lib.platforms.loongarch64 ++ lib.platforms.riscv64) (lib.platforms.linux ++ lib.platforms.darwin); }; }) diff --git a/pkgs/by-name/op/openjph/package.nix b/pkgs/by-name/op/openjph/package.nix index 5fcebb7af663a..8e8538e1cc4f7 100644 --- a/pkgs/by-name/op/openjph/package.nix +++ b/pkgs/by-name/op/openjph/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openjph"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "aous72"; repo = "openjph"; rev = finalAttrs.version; - hash = "sha256-v4rqBTS6rk5fgDQqvqPwFAYxLNxtsRhZuQsj+y3sE3o="; + hash = "sha256-ljvdCrvKL3slVGqX97Ui65/6Doyucf2kdUEw6NWW9og="; }; nativeBuildInputs = [ cmake validatePkgConfig ]; diff --git a/pkgs/applications/emulators/openmsx/custom-nix.mk b/pkgs/by-name/op/openmsx/custom-nix.mk similarity index 100% rename from pkgs/applications/emulators/openmsx/custom-nix.mk rename to pkgs/by-name/op/openmsx/custom-nix.mk diff --git a/pkgs/by-name/op/openmsx/package.nix b/pkgs/by-name/op/openmsx/package.nix new file mode 100644 index 0000000000000..0680d48ebecd3 --- /dev/null +++ b/pkgs/by-name/op/openmsx/package.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, SDL2 +, SDL2_image +, SDL2_ttf +, alsa-lib +, freetype +, glew +, libGL +, libogg +, libpng +, libtheora +, libvorbis +, python3 +, tcl +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "openmsx"; + version = "20_0"; + + src = fetchFromGitHub { + owner = "openMSX"; + repo = "openMSX"; + rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; + hash = "sha256-iY+oZ7fHZnnEGunM4kOxOGH2Biqj2PfdLhbT8J4mYrA="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pkg-config + python3 + ]; + + buildInputs = [ + SDL2 + SDL2_image + SDL2_ttf + alsa-lib + freetype + glew + libGL + libogg + libpng + libtheora + libvorbis + tcl + zlib + ]; + + postPatch = '' + cp ${./custom-nix.mk} build/custom.mk + ''; + + dontAddPrefix = true; + + # Many thanks @mthuurne from OpenMSX project for providing support to + # Nixpkgs! :) + TCL_CONFIG="${tcl}/lib/"; + + meta = with lib; { + homepage = "https://openmsx.org"; + description = "MSX emulator that aims for perfection"; + longDescription = '' + OpenMSX is an emulator for the MSX home computer system. Its goal is + to emulate all aspects of the MSX with 100% accuracy. + ''; + license = with licenses; [ bsd2 boost gpl2Plus ]; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + mainProgram = "openmsx"; + }; +}) diff --git a/pkgs/by-name/op/openorienteering-mapper/package.nix b/pkgs/by-name/op/openorienteering-mapper/package.nix index 4a1519337034d..5d9fb8e256cdd 100644 --- a/pkgs/by-name/op/openorienteering-mapper/package.nix +++ b/pkgs/by-name/op/openorienteering-mapper/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # https://github.com/OpenOrienteering/mapper/pull/1907 (fetchpatch { url = "https://github.com/OpenOrienteering/mapper/commit/bc52aa567e90a58d6963b44d5ae1909f3f841508.patch"; - sha256 = "1bkckapzccn6k0ri6bgrr0nhis9498fnwj7b32s2ysym8zcg0355"; + hash = "sha256-pQzw2EfVay+0GOtIbh1KJOkILcj5LRMzmMYy9q+abK4="; }) ]; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { # See https://github.com/NixOS/nixpkgs/issues/85306 (lib.cmakeBool "LICENSING_PROVIDER" false) (lib.cmakeBool "Mapper_MANUAL_QTHELP" false) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # FindGDAL is broken and always finds /Library/Framework unless this is # specified (lib.cmakeFeature "GDAL_INCLUDE_DIR" "${gdal}/include") diff --git a/pkgs/by-name/op/openpgl/package.nix b/pkgs/by-name/op/openpgl/package.nix index 76e61b6658d6c..db0ba62beb0f6 100644 --- a/pkgs/by-name/op/openpgl/package.nix +++ b/pkgs/by-name/op/openpgl/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { "-DTBB_ROOT=${tbb.out}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isAarch64 && !stdenv.isDarwin) "-flax-vector-conversions"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin) "-flax-vector-conversions"; meta = { description = "Intel Open Path Guiding Library"; diff --git a/pkgs/by-name/op/openpgp-ca/package.nix b/pkgs/by-name/op/openpgp-ca/package.nix index e97087ccf5964..e2397c5413dbd 100644 --- a/pkgs/by-name/op/openpgp-ca/package.nix +++ b/pkgs/by-name/op/openpgp-ca/package.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { sqlite pcsclite nettle - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ PCSC Security SystemConfiguration ]); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ PCSC Security SystemConfiguration ]); # Most tests rely on gnupg being able to write to /run/user # gnupg refuses to respect the XDG_RUNTIME_DIR variable, so we skip the tests diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index 00a4be3e9ece3..03d8282044495 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; - buildInputs = [ pcsclite ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ pcsclite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.PCSC darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index 4e3237a682926..8a96876d65dd3 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -28,6 +28,7 @@ , libsForQt5 , libspnav , libzip +, manifold , mesa , mpfr , python3 @@ -36,61 +37,23 @@ , wayland-protocols , wrapGAppsHook3 , xorg +, mimalloc +, opencsg }: -let - # get cccl from source to avoid license issues - nvidia-cccl = clangStdenv.mkDerivation { - pname = "nvidia-cccl"; - # note, after v2.2.0, manifold dependency fails with some swap() ambiguities - version = "2.2.0"; - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "cccl"; - fetchSubmodules = true; - rev = "v2.2.0"; - hash = "sha256-azHDAuK0rAHrH+XkN3gHDrbwZOclP3zbEMe8VRpMjDQ="; - }; - patches = [ ./thrust-cmake.patch ]; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ tbb_2021_11 ]; - cmakeFlags = [ - # only enable what we need - "-DCCCL_ENABLE_CUB=OFF" - "-DCCCL_ENABLE_LIBCUDACXX=ON" - "-DCCCL_ENABLE_THRUST=ON" - "-DCCCL_ENABLE_TESTING=OFF" - "-DCCCL_ENABLE_EXAMPLES=OFF" - - "-DTHRUST_DEVICE_SYSTEM=TBB" - "-DTHRUST_HOST_SYSTEM=CPP" - "-DTHRUST_ENABLE_HEADER_TESTING=OFF" - "-DTHRUST_ENABLE_TESTING=OFF" - "-DTHRUST_ENABLE_EXAMPLES=OFF" - - "-DLIBCUDACXX_ENABLE_CUDA=OFF" - "-DLIBCUDACXX_ENABLE_STATIC_LIBRARY=OFF" - "-DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=OFF" - ]; - meta = with lib; { - description = "CUDA C++ Core Libraries"; - homepage = "https://github.com/NVIDIA/cccl"; - license = licenses.asl20; - platforms = platforms.unix; - }; - }; -in # clang consume much less RAM than GCC clangStdenv.mkDerivation rec { pname = "openscad-unstable"; - version = "2024-08-17"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "a16ca2a670840cfecb76254967380385d4d573cb"; - hash = "sha256-YadbrYaxxdVNejasFW0MbcYwjwTHHQbVjqen9PKEsYQ="; - fetchSubmodules = true; + rev = "1cf4e97ed488d606c823f107dcc361f218aa84ca"; + hash = "sha256-5WzLAQnjH+4JjJhh9pCgY3j8+lyNPrtY9a104tzkglo="; + fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD }; + patches = [ ./test.diff ]; + nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ numpy pillow ])) bison @@ -103,12 +66,10 @@ clangStdenv.mkDerivation rec { pkg-config ]; buildInputs = with libsForQt5; with qt5; [ - # manifold dependencies clipper2 glm tbb_2021_11 - nvidia-cccl - + mimalloc boost cairo cgal_5 @@ -119,17 +80,19 @@ clangStdenv.mkDerivation rec { ghostscript glib gmp + opencsg harfbuzz hidapi lib3mf libspnav libzip + manifold mpfr qscintilla qtbase qtmultimedia ] - ++ lib.optionals clangStdenv.isLinux [ + ++ lib.optionals clangStdenv.hostPlatform.isLinux [ xorg.libXdmcp libICE libSM @@ -138,12 +101,13 @@ clangStdenv.mkDerivation rec { qtwayland libGLU ] - ++ lib.optional clangStdenv.isDarwin qtmacextras + ++ lib.optional clangStdenv.hostPlatform.isDarwin qtmacextras ; cmakeFlags = [ "-DEXPERIMENTAL=ON" # enable experimental options "-DSNAPSHOT=ON" # nightly icons - "-DUSE_BUILTIN_OPENCSG=ON" # bundled latest opencsg + "-DUSE_BUILTIN_OPENCSG=OFF" + "-DUSE_BUILTIN_MANIFOLD=OFF" "-DOPENSCAD_VERSION=\"${builtins.replaceStrings ["-"] ["."] version}\"" "-DCMAKE_UNITY_BUILD=ON" # faster build # IPO diff --git a/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch b/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch deleted file mode 100644 index 56422f0992183..0000000000000 --- a/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/thrust/thrust/cmake/thrust-header-search.cmake.in b/thrust/thrust/cmake/thrust-header-search.cmake.in -index 8529d89fe..94879ee01 100644 ---- a/thrust/thrust/cmake/thrust-header-search.cmake.in -+++ b/thrust/thrust/cmake/thrust-header-search.cmake.in -@@ -7,7 +7,6 @@ set(from_install_prefix "@from_install_prefix@") - find_path(_THRUST_VERSION_INCLUDE_DIR thrust/version.h - NO_CMAKE_FIND_ROOT_PATH # Don't allow CMake to re-root the search - NO_DEFAULT_PATH # Only search explicit paths below: -- PATHS -- "${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@" -+ PATHS "@CMAKE_INSTALL_INCLUDEDIR@" - ) - set_property(CACHE _THRUST_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL) diff --git a/pkgs/by-name/op/openscap/package.nix b/pkgs/by-name/op/openscap/package.nix old mode 100755 new mode 100644 diff --git a/pkgs/by-name/op/opensplat/package.nix b/pkgs/by-name/op/opensplat/package.nix index d808a403e7bd8..71e66a0dc69e7 100644 --- a/pkgs/by-name/op/opensplat/package.nix +++ b/pkgs/by-name/op/opensplat/package.nix @@ -18,7 +18,7 @@ autoAddDriverRunpath, }: let - version = "1.1.3"; + version = "1.1.4"; torch = python3.pkgs.torch.override { inherit cudaSupport; }; # Using a normal stdenv with cuda torch gives # ld: /nix/store/k1l7y96gv0nc685cg7i3g43i4icmddzk-python3.11-torch-2.2.1-lib/lib/libc10.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32' @@ -32,7 +32,7 @@ stdenv'.mkDerivation { owner = "pierotofy"; repo = "OpenSplat"; rev = "refs/tags/v${version}"; - hash = "sha256-2NcKb2SWU/vNsnd2KhdU85J60fJPuc44ZxIle/1UT6g="; + hash = "sha256-u2UmD0O3sUWELYb4CjQE19i4HUjLMcaWqOinQH0PPTM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index 97a7af508fb69..47f4d7b73155d 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./0001-Disable-tests-requiring-network-access.patch - ] ++ lib.optional stdenv.isDarwin ./0002-Disable-segfaulting-test-on-Darwin.patch; + ] ++ lib.optional stdenv.hostPlatform.isDarwin ./0002-Disable-segfaulting-test-on-Darwin.patch; nativeBuildInputs = [ cmake ]; @@ -66,6 +66,11 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + postInstall = '' + substituteInPlace $out/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-target.cmake \ + --replace-fail "\''${_IMPORT_PREFIX}/include" "$dev/include" + ''; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index 58ca6a4139b59..5d62a61c2e951 100644 --- a/pkgs/by-name/op/openturns/package.nix +++ b/pkgs/by-name/op/openturns/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.psutil python3Packages.python ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate ]; diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 5fa7966cd5c10..38411adb4ea2b 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.8.5"; + version = "23.9.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-0zVhrnDimmSg5auIT1NQaNRsilASkkXK6tVimoWsXn8="; + hash = "sha256-vdqIM0qkCpOjohmMP245Og87wOmejlCBEIceBfwEB8U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/openvas-smb/package.nix b/pkgs/by-name/op/openvas-smb/package.nix index 16a9120179759..cc62976283294 100644 --- a/pkgs/by-name/op/openvas-smb/package.nix +++ b/pkgs/by-name/op/openvas-smb/package.nix @@ -15,7 +15,7 @@ let heimdalConfigHeader = fetchurl { url = "https://raw.githubusercontent.com/heimdal/heimdal/d8c10e68a61f10c8fca62b227a0766d294bda4a0/include/heim_threads.h"; - sha256 = "08345hkb5jbdcgh2cx3d624w4c8wxmnnsjxlw46wsnm39k4l0ihw"; + hash = "sha256-HEZAyUyjWs0N4bRLbW3tHDHCiTBtdCbgY23JsiYsZCA="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/by-name/op/openvr/package.nix b/pkgs/by-name/op/openvr/package.nix index 7d309065df9ee..ed17bb7c8976e 100644 --- a/pkgs/by-name/op/openvr/package.nix +++ b/pkgs/by-name/op/openvr/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ jsoncpp libGL - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Foundation ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting"; homepage = "https://github.com/ValveSoftware/openvr"; license = lib.licenses.bsd3; diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix index 4502031120c01..e6c891b22674a 100644 --- a/pkgs/by-name/op/openvswitch/package.nix +++ b/pkgs/by-name/op/openvswitch/package.nix @@ -1,40 +1,37 @@ { + withDPDK ? false, + lib, stdenv, - fetchFromGitHub, + autoconf, automake, + dpdk, + fetchFromGitHub, installShellFiles, iproute2, - kernel ? null, libcap_ng, + libpcap, libtool, + makeWrapper, nix-update-script, + nixosTests, + numactl, openssl, perl, pkg-config, procps, python3, - tcpdump, sphinxHook, + tcpdump, util-linux, which, - makeWrapper, - withDPDK ? false, - dpdk, - numactl, - libpcap, }: -let - _kernel = kernel; -in stdenv.mkDerivation rec { pname = if withDPDK then "openvswitch-dpdk" else "openvswitch"; version = "3.4.0"; - kernel = lib.optional (_kernel != null) _kernel.dev; - src = fetchFromGitHub { owner = "openvswitch"; repo = "ovs"; @@ -84,14 +81,11 @@ stdenv.mkDerivation rec { preConfigure = "./boot.sh"; - configureFlags = - [ - "--localstatedir=/var" - "--sharedstatedir=/var" - "--sbindir=$(out)/bin" - ] - ++ (lib.optionals (_kernel != null) [ "--with-linux" ]) - ++ (lib.optionals withDPDK [ "--with-dpdk=shared" ]); + configureFlags = [ + "--localstatedir=/var" + "--sharedstatedir=/var" + "--sbindir=$(out)/bin" + ] ++ (lib.optionals withDPDK [ "--with-dpdk=shared" ]); # Leave /var out of this! installFlags = [ @@ -131,7 +125,14 @@ stdenv.mkDerivation rec { setuptools ]); - passthru.updateScript = nix-update-script { }; + passthru = { + tests = { + default = nixosTests.openvswitch; + incus = nixosTests.incus-lts.openvswitch; + }; + + updateScript = nix-update-script { }; + }; meta = with lib; { changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; diff --git a/pkgs/by-name/op/ophcrack/package.nix b/pkgs/by-name/op/ophcrack/package.nix index 13709ad9973a1..bee8b7dd76f61 100644 --- a/pkgs/by-name/op/ophcrack/package.nix +++ b/pkgs/by-name/op/ophcrack/package.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook; buildInputs = [ openssl ] - ++ (if enableGui then [ libsForQt5.qtcharts ] else [ expat ]) ++ lib.optional stdenv.isDarwin expat; + ++ (if enableGui then [ libsForQt5.qtcharts ] else [ expat ]) + ++ lib.optional stdenv.hostPlatform.isDarwin expat; configureFlags = [ "--with-libssl" ] @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { [ "--disable-gui" ] ); - installPhase = lib.optional stdenv.isDarwin '' + installPhase = lib.optional stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin cp -R src/ophcrack $out/bin ''; diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix index f8fbc3484e12d..6e9cee2539feb 100644 --- a/pkgs/by-name/or/orbiton/package.nix +++ b/pkgs/by-name/or/orbiton/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorHash = null; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace "-Wl,--as-needed" "" diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 0e52c45ebdd38..bf6f04f6a4062 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.22.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-GdcDouGL6wshCdzKZ7TAm/Ty3c8dAsWQSNRlGIUIq2Y="; + hash = "sha256-N54wkqe05Hm9o+kQmWTJREoU+0GnivaVTJngtBDL8+U="; # 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; @@ -19,7 +19,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-Xf/d0Zv+aSzJhE2+XtKFqhNnPZrtaNhM3IKnNb8JOTQ="; + vendorHash = "sha256-R4KsR00VAq0fUxHM48212GWy8KJoIOM0R8ycVjjjMO4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index 517258d3f4ba8..cc5257d6189b0 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "ord"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "ordinals"; repo = "ord"; rev = version; - hash = "sha256-psZ0NrCjRuRepatEcEMSVbw8JHD5Nh/vUXSxiGqDyfg="; + hash = "sha256-qTTAViVZEw4XgYADoonsVZPulp43lFFkX2xE5OFbL3s="; }; - cargoHash = "sha256-gxIQZm5uZqdJ1ou6lghinj4Roi/L5HHb+d+i0t5HdaU="; + cargoHash = "sha256-QSeAAaT1LbcWLmML8i2sgRtTnimZfKgLq6qhnpQr8cc="; nativeBuildInputs = [ pkg-config @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/os/oscar/package.nix b/pkgs/by-name/os/oscar/package.nix new file mode 100644 index 0000000000000..1af7233bb20ac --- /dev/null +++ b/pkgs/by-name/os/oscar/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + qt5, + fetchFromGitLab, + libGLU, +}: +qt5.mkDerivation rec { + pname = "oscar"; + version = "1.5.1"; + + src = fetchFromGitLab { + owner = "pholy"; + repo = "OSCAR-code"; + rev = "v${version}"; + hash = "sha256-FBHbPtMZeIgcR1pQflfEWK2FS8bquctXaeY/yaZofHg="; + }; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtserialport + libGLU + ]; + nativeBuildInputs = [ qt5.qmake ]; + postPatch = '' + substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}" + ''; + + qmakeFlags = [ "OSCAR_QT.pro" ]; + + installPhase = '' + runHook preInstall + install -d $out/bin + install -d $out/share/OSCAR/Help + install -d $out/share/OSCAR/Html + install -d $out/share/OSCAR/Translations + install -d $out/share/icons/OSCAR + install -d $out/share/applications + install -T oscar/OSCAR $out/bin/OSCAR + # help browser was removed 'temporarily' in https://gitlab.com/pholy/OSCAR-code/-/commit/57c3e4c33ccdd2d0eddedbc24c0e4f2969da3841 + # install oscar/Help/* $out/share/OSCAR/Help + install oscar/Html/* $out/share/OSCAR/Html + install oscar/Translations/* $out/share/OSCAR/Translations + install -T Building/Linux/OSCAR.png $out/share/icons/OSCAR/OSCAR.png + install -T Building/Linux/OSCAR.desktop $out/share/applications/OSCAR.desktop + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.sleepfiles.com/OSCAR/"; + description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea"; + mainProgram = "OSCAR"; + license = licenses.gpl3Only; + maintainers = [ maintainers.roconnor ]; + # Someone needs to create a suitable installPhase for Darwin and Windows. + # See https://gitlab.com/pholy/OSCAR-code/-/tree/master/Building. + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/os/oscavmgr/Cargo.lock b/pkgs/by-name/os/oscavmgr/Cargo.lock new file mode 100644 index 0000000000000..0abdf26f72f64 --- /dev/null +++ b/pkgs/by-name/os/oscavmgr/Cargo.lock @@ -0,0 +1,2228 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alvr_common" +version = "20.10.0" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +dependencies = [ + "anyhow", + "backtrace", + "glam", + "log", + "once_cell", + "parking_lot", + "paste", + "semver", + "serde", + "settings-schema", +] + +[[package]] +name = "alvr_events" +version = "20.10.0" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +dependencies = [ + "alvr_common", + "alvr_packets", + "alvr_session", + "serde", + "serde_json", +] + +[[package]] +name = "alvr_filesystem" +version = "20.10.0" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +dependencies = [ + "dirs", + "once_cell", +] + +[[package]] +name = "alvr_packets" +version = "20.10.0" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +dependencies = [ + "alvr_common", + "alvr_session", + "serde", + "serde_json", +] + +[[package]] +name = "alvr_session" +version = "20.10.0" +source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2" +dependencies = [ + "alvr_common", + "alvr_filesystem", + "bytemuck", + "regex", + "serde", + "serde_json", + "settings-schema", +] + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +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" +dependencies = [ + "backtrace", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "cc" +version = "1.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" +dependencies = [ + "shlex", +] + +[[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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[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 = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[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 = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[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 = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glam" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" +dependencies = [ + "mint", + "serde", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[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 = "if-addrs" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a78a89907582615b19f6f0da1af18abf6ff08be259395669b834b057a7ee92d8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[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 = "indicatif-log-bridge" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63703cf9069b85dbe6fe26e1c5230d013dee99d3559cd3d02ba39e099ef7ab02" +dependencies = [ + "indicatif", + "log", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "mdns-sd" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66b18c39a781e986434d14398b94993f3d7659ea4b255a79b00ed40a31f4a97d" +dependencies = [ + "flume", + "if-addrs", + "log", + "polling", + "socket2", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mint" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "openxr" +version = "0.19.0" +source = "git+https://github.com/galister/openxrs#17642d0ccac65dbf7e24da84db56cc500592afff" +dependencies = [ + "libc", + "ndk-context", + "openxr-sys", +] + +[[package]] +name = "openxr-sys" +version = "0.11.0" +source = "git+https://github.com/galister/openxrs#17642d0ccac65dbf7e24da84db56cc500592afff" +dependencies = [ + "libc", + "mint", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "oscavmgr" +version = "0.4.1" +dependencies = [ + "alvr_common", + "alvr_events", + "anyhow", + "clap", + "colored", + "env_logger", + "glam", + "glob", + "indicatif", + "indicatif-log-bridge", + "log", + "mdns-sd", + "mint", + "once_cell", + "openxr", + "regex", + "reqwest", + "rosc", + "serde", + "serde_json", + "strum", + "sysinfo", + "tokio", + "websocket-lite", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-registry", +] + +[[package]] +name = "rosc" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e63d9e6b0d090be1485cf159b1e04c3973d2d3e1614963544ea2ff47a4a981" +dependencies = [ + "byteorder", + "nom", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustix" +version = "0.38.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "settings-schema" +version = "0.2.0" +source = "git+https://github.com/alvr-org/settings-schema-rs?rev=676185f#676185f35869f05a90fcc81f66a4bbd9d86f9c12" +dependencies = [ + "serde", + "serde_json", + "settings-schema-derive", +] + +[[package]] +name = "settings-schema-derive" +version = "0.2.0" +source = "git+https://github.com/alvr-org/settings-schema-rs?rev=676185f#676185f35869f05a90fcc81f66a4bbd9d86f9c12" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1_smol" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + +[[package]] +name = "sysinfo" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" +dependencies = [ + "core-foundation-sys", + "libc", + "memchr", + "ntapi", + "rayon", + "windows", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[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-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +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 = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "websocket-codec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2108c9c18a6e746addc085c18cedb66b672e8ffea6a993712decc295b0d8ae55" +dependencies = [ + "base64 0.13.1", + "byteorder", + "bytes", + "httparse", + "rand", + "sha1", + "tokio-util", +] + +[[package]] +name = "websocket-lite" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6cae39139c6e837afebd915935e7adc8af5c28425935de606d0e8c9d3268f6" +dependencies = [ + "base64 0.13.1", + "bytes", + "futures", + "native-tls", + "rand", + "tokio", + "tokio-native-tls", + "tokio-util", + "url", + "websocket-codec", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/by-name/os/oscavmgr/package.nix b/pkgs/by-name/os/oscavmgr/package.nix new file mode 100644 index 0000000000000..5267ac08ff1ee --- /dev/null +++ b/pkgs/by-name/os/oscavmgr/package.nix @@ -0,0 +1,63 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + openssl, + openvr, + openxr-loader, + pkg-config, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "oscavmgr"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "galister"; + repo = "oscavmgr"; + rev = "refs/tags/v${version}"; + hash = "sha256-1cpisSevAU2zGNrpVEGvulBcWB5rWkWAIYI/0vjzRQE="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "alvr_common-20.10.0" = "sha256-2d5+9rxCpqgLMab7i1pLKaY1qSKRxzPI7pgh54rQBdg="; + "openxr-0.19.0" = "sha256-kbEYoN4UvUEaZA9LJWEKx1X1r+l91GjTWs1hNXhr7cw="; + "settings-schema-0.2.0" = "sha256-luEdAKDTq76dMeo5kA+QDTHpRMFUg3n0qvyQ7DkId0k="; + }; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + openxr-loader + ]; + + postPatch = '' + alvr_session=$(echo $cargoDepsCopy/alvr_session-*/) + substituteInPlace "$alvr_session/build.rs" \ + --replace-fail \ + 'alvr_filesystem::workspace_dir().join("openvr/headers/openvr_driver.h")' \ + '"${openvr}/include/openvr/openvr_driver.h"' + + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Face tracking & utilities for Resonite and VRChat"; + homepage = "https://github.com/galister/oscavmgr"; + changelog = "https://github.com/galister/oscavmgr/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + pandapip1 + Scrumplex + ]; + mainProgram = "oscavmgr"; + }; +} diff --git a/pkgs/by-name/os/osgqt/package.nix b/pkgs/by-name/os/osgqt/package.nix new file mode 100644 index 0000000000000..12e88648edd85 --- /dev/null +++ b/pkgs/by-name/os/osgqt/package.nix @@ -0,0 +1,49 @@ +{ + cmake, + fetchFromGitHub, + lib, + libsForQt5, + openscenegraph, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "osgQt"; + version = "3.5.7"; + + src = fetchFromGitHub { + owner = "openscenegraph"; + repo = "osgQt"; + rev = finalAttrs.version; + hash = "sha256-iUeIqRDlcAHdKXWAi4WhEaOCxa7ZivQw0K5E7ccEKnM="; + }; + + buildInputs = [ libsForQt5.qtbase ]; + + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; + + propagatedBuildInputs = [ openscenegraph ]; + + cmakeFlags = [ + "-DDESIRED_QT_VERSION=5" + "-DOpenGL_GL_PREFERENCE=GLVND" + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "FIND_PACKAGE(Qt5Widgets REQUIRED)" \ + "FIND_PACKAGE(Qt5Widgets REQUIRED) + FIND_PACKAGE(Qt5OpenGL REQUIRED)" + ''; + + meta = { + description = "Qt bindings for OpenSceneGraph"; + homepage = "https://github.com/openscenegraph/osgQt"; + license = "OpenSceneGraph Public License - free LGPL-based license"; + maintainers = [ lib.maintainers.nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix index 0ddfb737fcee1..85bd3dcac2e7c 100644 --- a/pkgs/by-name/os/osm2pgsql/package.nix +++ b/pkgs/by-name/os/osm2pgsql/package.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , expat -, fmt +, fmt_11 , proj , bzip2 , cli11 @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.11.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "osm2pgsql-dev"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-95B4WVaf3AwaC+S6dCJpUq/1J47rOZjWUBxmRqHCu4w="; + hash = "sha256-YtG/cwEyCIsNjoEhDikMoI/SUqx8fEtPuolpNkLGTlE="; }; postPatch = '' @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { bzip2 cli11 expat - fmt + fmt_11 libosmium nlohmann_json opencv diff --git a/pkgs/by-name/os/osqp-eigen/package.nix b/pkgs/by-name/os/osqp-eigen/package.nix new file mode 100644 index 0000000000000..016fbe8b0acaa --- /dev/null +++ b/pkgs/by-name/os/osqp-eigen/package.nix @@ -0,0 +1,44 @@ +{ + catch2, + cmake, + eigen, + fetchFromGitHub, + lib, + osqp, + stdenv, + valgrind, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "osqp-eigen"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "robotology"; + repo = "osqp-eigen"; + rev = "v${finalAttrs.version}"; + hash = "sha256-mN9oU+qXm+Kob8M4rtxv4qNSbXlFCqpN+s8dHedU8Mo="; + }; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_TESTING" true) + (lib.cmakeBool "OSQPEIGEN_RUN_Valgrind_tests" stdenv.hostPlatform.isLinux) + ]; + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ + eigen + osqp + ]; + checkInputs = [ catch2 ]; + nativeCheckInputs = lib.optional stdenv.hostPlatform.isLinux valgrind; + + doCheck = true; + + meta = { + description = "Simple Eigen-C++ wrapper for OSQP library"; + homepage = "https://github.com/robotology/osqp-eigen"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nim65s ]; + }; +}) diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix index 8eb6df45db9a0..ee8e0a99a9488 100644 --- a/pkgs/by-name/os/ossia-score/package.nix +++ b/pkgs/by-name/os/ossia-score/package.nix @@ -111,7 +111,7 @@ clangStdenv.mkDerivation (finalAttrs: { "-DSuil_INCLUDE_DIR=${suil}/include/suil-0" ]; - # Needed for libraries that get dlopen'd + # Needed for libraries that get dlopen'd env.NIX_LDFLAGS = toString [ "-lasound" "-llilv-0" diff --git a/pkgs/by-name/ou/outfox/package.nix b/pkgs/by-name/ou/outfox/package.nix index b38e096823ec2..b3ac739d96639 100644 --- a/pkgs/by-name/ou/outfox/package.nix +++ b/pkgs/by-name/ou/outfox/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = { i686-linux = fetchurl { url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Linux-14.04-32bit-i386-i386-legacy-date-20231227.tar.gz"; - sha256 = "sha256-NFjNoqJ7Fq4A7Y0k6oQcWjykV+/b/MiRtJ1p6qlZdjs="; + hash = "sha256-NFjNoqJ7Fq4A7Y0k6oQcWjykV+/b/MiRtJ1p6qlZdjs="; }; x86_64-linux = fetchurl { url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Linux-22.04-amd64-current-date-20231224.tar.gz"; diff --git a/pkgs/development/tools/overcommit/Gemfile b/pkgs/by-name/ov/overcommit/Gemfile similarity index 100% rename from pkgs/development/tools/overcommit/Gemfile rename to pkgs/by-name/ov/overcommit/Gemfile diff --git a/pkgs/by-name/ov/overcommit/Gemfile.lock b/pkgs/by-name/ov/overcommit/Gemfile.lock new file mode 100644 index 0000000000000..fbdb66f8a49d7 --- /dev/null +++ b/pkgs/by-name/ov/overcommit/Gemfile.lock @@ -0,0 +1,21 @@ +GEM + remote: https://rubygems.org/ + specs: + childprocess (5.1.0) + logger (~> 1.5) + iniparse (1.5.0) + logger (1.6.1) + overcommit (0.64.0) + childprocess (>= 0.6.3, < 6) + iniparse (~> 1.4) + rexml (~> 3.2) + rexml (3.3.7) + +PLATFORMS + ruby + +DEPENDENCIES + overcommit + +BUNDLED WITH + 2.5.16 diff --git a/pkgs/by-name/ov/overcommit/gemset.nix b/pkgs/by-name/ov/overcommit/gemset.nix new file mode 100644 index 0000000000000..ed1b0fd5351e0 --- /dev/null +++ b/pkgs/by-name/ov/overcommit/gemset.nix @@ -0,0 +1,54 @@ +{ + childprocess = { + dependencies = ["logger"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v5nalaarxnfdm6rxb7q6fmc6nx097jd630ax6h9ch7xw95li3cs"; + type = "gem"; + }; + version = "5.1.0"; + }; + iniparse = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wb1qy4i2xrrd92dc34pi7q7ibrjpapzk9y465v0n9caiplnb89n"; + type = "gem"; + }; + version = "1.5.0"; + }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; + }; + overcommit = { + dependencies = ["childprocess" "iniparse" "rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lpl1ppjrqwsmywsb4srfjfm31dna30jrjyx2lkmws7s2jchy94v"; + type = "gem"; + }; + version = "0.64.0"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09shc1dvg88c4yx83d4c9wf26z838nlapa3cmlq8iqdci39a98v2"; + type = "gem"; + }; + version = "3.3.7"; + }; +} diff --git a/pkgs/by-name/ov/overcommit/package.nix b/pkgs/by-name/ov/overcommit/package.nix new file mode 100644 index 0000000000000..8100ba20db422 --- /dev/null +++ b/pkgs/by-name/ov/overcommit/package.nix @@ -0,0 +1,42 @@ +{ + lib, + bundlerApp, + bundlerUpdateScript, + git, + makeWrapper, + overcommit, + testers, +}: + +bundlerApp { + pname = "overcommit"; + gemdir = ./.; + exes = [ "overcommit" ]; + + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/overcommit --prefix PATH : ${lib.makeBinPath [ git ]} + ''; + + passthru = { + tests.version = testers.testVersion { + package = overcommit; + version = (import ./gemset.nix).overcommit.version; + }; + updateScript = bundlerUpdateScript "overcommit"; + }; + + meta = with lib; { + description = "Tool to manage and configure Git hooks"; + homepage = "https://github.com/sds/overcommit"; + changelog = "https://github.com/sds/overcommit/blob/main/CHANGELOG.md"; + license = licenses.mit; + mainProgram = "overcommit"; + maintainers = with maintainers; [ + Br1ght0ne + anthonyroussel + ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/ov/overlayed/Cargo.lock b/pkgs/by-name/ov/overlayed/Cargo.lock new file mode 100644 index 0000000000000..ff8b531c03ac9 --- /dev/null +++ b/pkgs/by-name/ov/overlayed/Cargo.lock @@ -0,0 +1,5432 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-process" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +dependencies = [ + "async-channel", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "async-signal" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "atk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[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 = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "brotli" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +dependencies = [ + "serde", +] + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "cargo_toml" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +dependencies = [ + "serde", + "toml 0.7.8", +] + +[[package]] +name = "cc" +version = "1.0.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779e6b7d17797c0b42023d417228c02889300190e700cb074c3438d9c541d332" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] +name = "cfg-expr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "serde", + "windows-targets 0.52.5", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.68", +] + +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn 2.0.68", +] + +[[package]] +name = "darling" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.68", +] + +[[package]] +name = "darling_macro" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.68", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "embed-resource" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml 0.8.14", + "vswhom", + "winreg 0.52.0", +] + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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 = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset 0.9.1", + "rustc_version", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.2.2", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps 6.2.2", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps 6.2.2", + "x11", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +dependencies = [ + "atk", + "bitflags 1.3.2", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps 6.2.2", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +dependencies = [ + "anyhow", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.11", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.11", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "httparse", + "httpdate", + "itoa 1.0.11", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ico" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "ico" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.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 0.4.7", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", +] + +[[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.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "infer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a" +dependencies = [ + "cfb", +] + +[[package]] +name = "infer" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" +dependencies = [ + "cfb", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "kuchikiki" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +dependencies = [ + "cssparser", + "html5ever", + "indexmap 1.9.3", + "matches", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libappindicator" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "line-wrap" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mac-notification-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minisign-verify" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset 0.9.1", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "notify-rust" +version = "4.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" +dependencies = [ + "log", + "mac-notification-sys", + "serde", + "tauri-winrt-notification", + "zbus 4.3.0", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "open" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +dependencies = [ + "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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 = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde", + "windows-sys 0.52.0", +] + +[[package]] +name = "overlayed" +version = "0.0.0" +dependencies = [ + "anyhow", + "cocoa 0.25.0", + "objc", + "serde", + "tauri", + "tauri-build", + "tauri-nspanel", + "tauri-plugin-single-instance", + "tauri-plugin-websocket", + "tauri-plugin-window-state", + "tokio", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags 1.3.2", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.2", + "smallvec", + "windows-targets 0.52.5", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plist" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +dependencies = [ + "base64 0.21.7", + "indexmap 2.2.6", + "line-wrap", + "quick-xml", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.15", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom 0.2.15", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg 0.50.0", +] + +[[package]] +name = "rfd" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +dependencies = [ + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "lazy_static", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.37.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.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.68", +] + +[[package]] +name = "serde_json" +version = "1.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" +dependencies = [ + "indexmap 2.2.6", + "itoa 1.0.11", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa 1.0.11", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.6", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "soup2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +dependencies = [ + "bitflags 1.3.2", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", +] + +[[package]] +name = "soup2-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags 1.3.2", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "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.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sys-locale" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" +dependencies = [ + "js-sys", + "libc", + "wasm-bindgen", + "web-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" +dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml 0.5.11", + "version-compare 0.0.11", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr 0.15.8", + "heck 0.5.0", + "pkg-config", + "toml 0.8.14", + "version-compare 0.2.0", +] + +[[package]] +name = "tao" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "cc", + "cocoa 0.24.1", + "core-foundation", + "core-graphics 0.22.3", + "crossbeam-channel", + "dirs-next", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkwayland-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libappindicator", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "tao-macros", + "unicode-segmentation", + "uuid", + "windows 0.39.0", + "windows-implement 0.39.0", + "x11-dl", +] + +[[package]] +name = "tao-macros" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "tauri" +version = "1.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77567d2b3b74de4588d544147142d02297f3eaa171a25a065252141d8597a516" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytes", + "cocoa 0.24.1", + "dirs-next", + "dunce", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "getrandom 0.2.15", + "glib", + "glob", + "gtk", + "heck 0.5.0", + "http 0.2.12", + "ico 0.2.0", + "ignore", + "indexmap 1.9.3", + "infer 0.9.0", + "minisign-verify", + "nix 0.26.4", + "notify-rust", + "objc", + "once_cell", + "open", + "os_info", + "percent-encoding", + "png", + "rand 0.8.5", + "raw-window-handle", + "regex", + "reqwest", + "rfd", + "semver", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "state", + "sys-locale", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "time", + "tokio", + "url", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "zip", +] + +[[package]] +name = "tauri-build" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs-next", + "heck 0.5.0", + "json-patch", + "semver", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", + "walkdir", +] + +[[package]] +name = "tauri-codegen" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8" +dependencies = [ + "base64 0.21.7", + "brotli", + "ico 0.3.0", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "regex", + "semver", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 1.0.109", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-nspanel" +version = "0.0.0" +source = "git+https://github.com/ahkohd/tauri-nspanel?branch=v1#9bf268429c8b0bebff0f5e63a18ab51b90c728de" +dependencies = [ + "bitflags 2.6.0", + "block", + "cocoa 0.25.0", + "core-foundation", + "core-graphics 0.23.2", + "objc", + "objc-foundation", + "objc_id", + "tauri", +] + +[[package]] +name = "tauri-plugin-single-instance" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#81676da7ab0155c630dc56cd704cfa985867ab51" +dependencies = [ + "log", + "serde", + "serde_json", + "tauri", + "thiserror", + "windows-sys 0.52.0", + "zbus 3.15.2", +] + +[[package]] +name = "tauri-plugin-websocket" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#81676da7ab0155c630dc56cd704cfa985867ab51" +dependencies = [ + "futures-util", + "http 1.1.0", + "log", + "rand 0.8.5", + "serde", + "serde_json", + "tauri", + "thiserror", + "tokio", + "tokio-tungstenite", +] + +[[package]] +name = "tauri-plugin-window-state" +version = "0.1.1" +source = "git+https://github.com/Hacksore/plugins-workspace?branch=v1#ad0b46f5fb5dae87b9ef2db5bce640e10a096b6b" +dependencies = [ + "bincode", + "bitflags 2.6.0", + "log", + "serde", + "serde_json", + "tauri", + "thiserror", +] + +[[package]] +name = "tauri-runtime" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4" +dependencies = [ + "gtk", + "http 0.2.12", + "http-range", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "url", + "uuid", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-runtime-wry" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655" +dependencies = [ + "cocoa 0.24.1", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35" +dependencies = [ + "brotli", + "ctor", + "dunce", + "glob", + "heck 0.5.0", + "html5ever", + "infer 0.13.0", + "json-patch", + "kuchikiki", + "log", + "memchr", + "phf 0.11.2", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows-version", +] + +[[package]] +name = "tauri-winres" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" +dependencies = [ + "embed-resource", + "toml 0.7.8", +] + +[[package]] +name = "tauri-winrt-notification" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" +dependencies = [ + "quick-xml", + "windows 0.56.0", + "windows-version", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "thin-slice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + +[[package]] +name = "thiserror" +version = "1.0.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.68", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa 1.0.11", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[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-tungstenite" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" +dependencies = [ + "futures-util", + "log", + "native-tls", + "tokio", + "tokio-native-tls", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.14", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "native-tls", + "rand 0.8.5", + "sha1", + "thiserror", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[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 = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +dependencies = [ + "getrandom 0.2.15", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.2.2", +] + +[[package]] +name = "webview2-com" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement 0.39.0", +] + +[[package]] +name = "webview2-com-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "webview2-com-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", +] + +[[package]] +name = "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-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +dependencies = [ + "windows_aarch64_msvc 0.37.0", + "windows_i686_gnu 0.37.0", + "windows_i686_msvc 0.37.0", + "windows_x86_64_gnu 0.37.0", + "windows_x86_64_msvc 0.37.0", +] + +[[package]] +name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows-implement 0.39.0", + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core 0.56.0", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-bindgen" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" +dependencies = [ + "windows-metadata", + "windows-tokens", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement 0.56.0", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" +dependencies = [ + "syn 1.0.109", + "windows-tokens", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-metadata" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.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-tokens" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + +[[package]] +name = "windows-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" + +[[package]] +name = "windows_i686_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.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.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" + +[[package]] +name = "windows_i686_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wry" +version = "0.24.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45" +dependencies = [ + "base64 0.13.1", + "block", + "cocoa 0.24.1", + "core-graphics 0.22.3", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http 0.2.12", + "kuchikiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2", + "soup2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement 0.39.0", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys 0.4.14", + "rustix 0.38.34", +] + +[[package]] +name = "xdg-home" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast 0.5.1", + "async-executor", + "async-fs 1.6.0", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process 1.8.1", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" +dependencies = [ + "async-broadcast 0.7.1", + "async-executor", + "async-fs 2.1.2", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-process 2.2.3", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.1", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.28.0", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.3.0", + "zbus_names 3.0.0", + "zvariant 4.1.1", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zbus_macros" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.1.1", +] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive 3.15.2", +] + +[[package]] +name = "zvariant" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive 4.1.1", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix new file mode 100644 index 0000000000000..19452d768d5b3 --- /dev/null +++ b/pkgs/by-name/ov/overlayed/package.nix @@ -0,0 +1,70 @@ +{ + rustPlatform, + lib, + callPackage, + pkg-config, + openssl, + libsoup, + webkitgtk, + fetchFromGitHub, + libayatana-appindicator, +}: + +rustPlatform.buildRustPackage rec { + pname = "overlayed"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "overlayeddev"; + repo = "overlayed"; + rev = "refs/tags/v${version}"; + hash = "sha256-yS1u7pp7SfmqzoH0QOAH060uo3nFb/N9VIng0T21tVw="; + }; + + sourceRoot = "${src.name}/apps/desktop/src-tauri"; + + webui = callPackage ./webui.nix { + inherit meta src version; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + webkitgtk + libsoup + ]; + + env = { + OPENSSL_NO_VENDOR = 1; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tauri-plugin-window-state-0.1.1" = "sha256-2cdO+5YAP7MOK0/YKclQemK4N9ci2JX3AfmMaeauwNI="; + "tauri-nspanel-0.0.0" = "sha256-tQHY0OX37b4dqhs89phYIzw7JzEPmMJo5e/jlyzxdMg="; + "tauri-plugin-single-instance-0.0.0" = "sha256-S1nsT/Dr0aIJdiPnW1FGamCth7CDMNAp4v34tpWqjHg="; + }; + }; + + postPatch = '' + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + substituteInPlace ./tauri.conf.json \ + --replace-fail '"distDir": "../dist",' '"distDir": "${webui}",' \ + --replace-fail '"beforeBuildCommand": "pnpm build"' '"beforeBuildCommand": ""' + ''; + + meta = { + description = "Modern discord voice chat overlay"; + homepage = "https://github.com/overlayeddev/overlayed"; + changelog = "https://github.com/overlayeddev/overlayed/releases/tag/v${version}"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.agpl3Plus; + mainProgram = "overlayed"; + }; +} diff --git a/pkgs/by-name/ov/overlayed/webui.nix b/pkgs/by-name/ov/overlayed/webui.nix new file mode 100644 index 0000000000000..7105dc8eae747 --- /dev/null +++ b/pkgs/by-name/ov/overlayed/webui.nix @@ -0,0 +1,40 @@ +{ + src, + meta, + version, + stdenv, + nodejs, + pnpm, +}: + +stdenv.mkDerivation (finalAttrs: { + inherit version src meta; + pname = "overlayed-webui"; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) src pname version; + hash = "sha256-FBJrVXTgKh8Op7TiZjA/i2LY2OOIKmqGR+GwGUecqVI="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + buildPhase = '' + runHook preBuild + + cd apps/desktop + node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist $out + + runHook postInstall + ''; +}) diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix index e57c281c665a6..bade7387f4106 100644 --- a/pkgs/by-name/ov/overskride/package.nix +++ b/pkgs/by-name/ov/overskride/package.nix @@ -4,7 +4,7 @@ owner = "kaii-lb"; name = "overskride"; -version = "0.5.7"; +version = "0.6.0"; in rustPlatform.buildRustPackage { @@ -15,10 +15,10 @@ in rustPlatform.buildRustPackage { inherit owner; repo = name; rev = "v${version}"; - hash = "sha256-vuCpUTn/Re2wZIoCmKHwBRPdfpHDzNHi42iwvBFYjXo="; + hash = "sha256-TbakYKYbVe8wEFOrfj97m2bdAb1BJ7zoi/lyYLobw/k="; }; - cargoHash = "sha256-hX3GHRiE/CbeT/zblQHzbxLPEc/grDddXgqoAe64zUM="; + cargoHash = "sha256-p2PmcLoHfeRUEG2v33vVyiKBkOjpNDbVteSmH5R3RmI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ov/ovh-ttyrec/package.nix b/pkgs/by-name/ov/ovh-ttyrec/package.nix index 550df6531ced7..88ec7e2c95702 100644 --- a/pkgs/by-name/ov/ovh-ttyrec/package.nix +++ b/pkgs/by-name/ov/ovh-ttyrec/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "ovh"; repo = "ovh-ttyrec"; rev = "v${version}"; - sha256 = "sha256-VTF9WLwAIWWn+W0sLQaoFBFro+pSXKwcTO6q6MW6JD8="; + hash = "sha256-VTF9WLwAIWWn+W0sLQaoFBFro+pSXKwcTO6q6MW6JD8="; }; nativeBuildInputs = [ zstd ]; diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index 95823c5798d6d..e9c53a53e2032 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "ovn"; - version = "24.03.3"; + version = "24.09.0"; src = fetchFromGitHub { owner = "ovn-org"; repo = "ovn"; rev = "refs/tags/v${version}"; - hash = "sha256-W25Tq5Z7SYIBkq6doNz9WPiPsdDhnbys03rmF4m02eM="; + hash = "sha256-0KXr9oxZqIhPD0HIkDUECCjfEK50JkkJxx8xsZIoAnc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index 23db013295115..92809dab62430 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -35,9 +35,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zstd libsoup_3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/ow/owncloud-client/package.nix b/pkgs/by-name/ow/owncloud-client/package.nix index 31f2b52b00bb2..0de43753d13fb 100644 --- a/pkgs/by-name/ow/owncloud-client/package.nix +++ b/pkgs/by-name/ow/owncloud-client/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { qt6Packages.qtkeychain libre-graph-api-cpp-qt-client kdsingleapplication - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libinotify-kqueue sparkleshare ]; diff --git a/pkgs/by-name/pa/pablodraw/package.nix b/pkgs/by-name/pa/pablodraw/package.nix index 793abf7f0158e..012961c99b19a 100644 --- a/pkgs/by-name/pa/pablodraw/package.nix +++ b/pkgs/by-name/pa/pablodraw/package.nix @@ -64,6 +64,6 @@ buildDotnetModule rec { mainProgram = "PabloDraw"; maintainers = with maintainers; [ aleksana kip93 ]; platforms = platforms.all; - broken = stdenv.isDarwin; # Eto.Platform.Mac64 not found in nugetSource + broken = stdenv.hostPlatform.isDarwin; # Eto.Platform.Mac64 not found in nugetSource }; } diff --git a/pkgs/by-name/pa/pantheon-tweaks/package.nix b/pkgs/by-name/pa/pantheon-tweaks/package.nix index fc49c062d907b..ab266b16c43a2 100644 --- a/pkgs/by-name/pa/pantheon-tweaks/package.nix +++ b/pkgs/by-name/pa/pantheon-tweaks/package.nix @@ -5,47 +5,47 @@ , meson , ninja , pkg-config -, python3 +, sassc , vala -, wrapGAppsHook3 -, gtk3 +, wrapGAppsHook4 +, gtk4 , libgee +, pango , pantheon }: stdenv.mkDerivation rec { pname = "pantheon-tweaks"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "pantheon-tweaks"; repo = pname; rev = version; - hash = "sha256-7a6maEpvmIS+Raawr9ec44nCbuj83EUnd+8RqYgWy24="; + hash = "sha256-NrDBr7Wtfxf9UA/sbi9ilgrlxK6QGQAopuz3TV2ITjs="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 + sassc vala - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ - gtk3 + gtk4 libgee + pango ] ++ (with pantheon; [ elementary-files # settings schemas elementary-terminal # settings schemas - granite + granite7 + switchboard ]); postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - substituteInPlace src/Settings/ThemeSettings.vala \ --replace-fail "/usr/share/" "/run/current-system/sw/share/" ''; diff --git a/pkgs/by-name/pa/paper-plane/package.nix b/pkgs/by-name/pa/paper-plane/package.nix index d308a9325425a..2028e7a848f20 100644 --- a/pkgs/by-name/pa/paper-plane/package.nix +++ b/pkgs/by-name/pa/paper-plane/package.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , gtk4 -, wrapGAppsHook3 , libadwaita , tdlib , rlottie @@ -18,6 +17,7 @@ , libshumate , gst_all_1 , darwin +, buildPackages }: let @@ -36,7 +36,7 @@ let gtk4-paperplane = gtk4.overrideAttrs (prev: { patches = (prev.patches or []) ++ [ "${src}/build-aux/gtk-reversed-list.patch" ]; }); - wrapPaperPlaneHook = wrapGAppsHook3.override { + wrapPaperPlaneHook = buildPackages.wrapGAppsHook3.override { gtk3 = gtk4-paperplane; }; # libadwaita has gtk4 in propagatedBuildInputs so it must be overrided @@ -101,7 +101,7 @@ stdenv.mkDerivation { gst_all_1.gst-libav gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/by-name/pa/paperkey/package.nix similarity index 100% rename from pkgs/tools/security/paperkey/default.nix rename to pkgs/by-name/pa/paperkey/package.nix diff --git a/pkgs/by-name/pa/paperlib/package.nix b/pkgs/by-name/pa/paperlib/package.nix index c03f0434b3d82..d39e35be942ba 100644 --- a/pkgs/by-name/pa/paperlib/package.nix +++ b/pkgs/by-name/pa/paperlib/package.nix @@ -39,7 +39,7 @@ let sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index efab205c5a8bf..2ea94a1c34282 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -28,7 +28,7 @@ , gi-docgen , libgxps , withLibsecret ? true -, supportNautilus ? (!stdenv.isDarwin) +, supportNautilus ? (!stdenv.hostPlatform.isDarwin) , libadwaita , exempi , cargo @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { libsecret ] ++ lib.optionals supportNautilus [ nautilus - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; @@ -111,6 +111,11 @@ stdenv.mkDerivation (finalAttrs: { stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16" ) "-Wno-error=incompatible-function-pointer-types"; + postInstall = '' + substituteInPlace $out/share/thumbnailers/papers.thumbnailer \ + --replace-fail '=papers-thumbnailer' "=$out/bin/papers-thumbnailer" + ''; + preFixup = '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" @@ -118,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.gnome.org/GNOME/Incubator/papers/-/issues/176 --prefix PATH : "$out/bin" ) - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "$out/lib" "$out/bin/papers" ''; @@ -129,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://wiki.gnome.org/Apps/papers"; + changelog = "https://gitlab.gnome.org/GNOME/Incubator/papers/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "GNOME's document viewer"; longDescription = '' diff --git a/pkgs/by-name/pa/parallel-hashmap/package.nix b/pkgs/by-name/pa/parallel-hashmap/package.nix index 7b23f14045f78..5feab9c3c805c 100644 --- a/pkgs/by-name/pa/parallel-hashmap/package.nix +++ b/pkgs/by-name/pa/parallel-hashmap/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "parallel-hashmap"; - version = "1.3.12"; + version = "1.4.0"; src = fetchFromGitHub { owner = "greg7mdp"; repo = "parallel-hashmap"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-6KhzXUxa4WOsRrPmSSgguFxRGTOTIaxiJBFFSzOhch0="; + hash = "sha256-19rWcnMtWgqYlLylUjgI/p3aAM0Ois3CKoMuMmLQHmM="; }; postPatch = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Family of header-only, very fast and memory-friendly hashmap and btree containers"; homepage = "https://github.com/greg7mdp/parallel-hashmap"; - changelog = "https://github.com/greg7mdp/parallel-hashmap/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/greg7mdp/parallel-hashmap/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ natsukium ]; diff --git a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix index 2c9d7a48f0455..1fc1d263a9e91 100644 --- a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix +++ b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "parinfer-rust-emacs"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "justinbarclay"; repo = "parinfer-rust-emacs"; rev = "v${version}"; - hash = "sha256-SNs/75beomxvexfE4+3v/l9Xl5w5SY0EWcORHvRitOw="; + hash = "sha256-JYKFfbfpkvBRxYUDw2d6DD1mO27OKzdquSOhBk0lXr0="; }; - cargoHash = "sha256-LmfcY9iR7BGh3dF/raSZTIwburtaQRI3I3XvOZG343M="; + cargoHash = "sha256-E3x/Jy21qP1onABRmbrq51ZKrlqwiWIwSaqOCh28lKw="; meta = with lib; { description = "Emacs centric fork of parinfer-rust"; diff --git a/pkgs/by-name/pa/paru/Cargo.lock b/pkgs/by-name/pa/paru/Cargo.lock deleted file mode 100644 index 21d35fc90c51f..0000000000000 --- a/pkgs/by-name/pa/paru/Cargo.lock +++ /dev/null @@ -1,2593 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "alpm" -version = "3.0.4" -source = "git+https://github.com/archlinux/alpm.rs?rev=306342#306342efc6f24739c92de64c432f962a22891e63" -dependencies = [ - "alpm-sys", - "bitflags 2.4.2", -] - -[[package]] -name = "alpm-sys" -version = "3.0.0" -source = "git+https://github.com/archlinux/alpm.rs?rev=306342#306342efc6f24739c92de64c432f962a22891e63" -dependencies = [ - "bindgen", - "pkg-config", -] - -[[package]] -name = "alpm-utils" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a65e48b9a950d1297b865a436733d496b6cdd966133a02fdadc6127dfe37e7" -dependencies = [ - "alpm", - "pacmanconf", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" -dependencies = [ - "backtrace", -] - -[[package]] -name = "async-compression" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-trait" -version = "0.1.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "aur-depends" -version = "3.0.0" -source = "git+https://github.com/Morganamilo/aur-depends?rev=30c2c1#30c2c15019f8dd80e803c9deefce3279079806af" -dependencies = [ - "alpm", - "alpm-utils", - "bitflags 2.4.2", - "log", - "raur", - "srcinfo", -] - -[[package]] -name = "aur-fetch" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a34f46003cfac97808c0200c3338152275029ffc59e296611eef27de61074e" -dependencies = [ - "crossbeam", - "log", - "url", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "bindgen" -version = "0.66.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" -dependencies = [ - "bitflags 2.4.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.52", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "chrono" -version = "0.4.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "windows-targets 0.52.4", -] - -[[package]] -name = "cini" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8628d1f5b9a7b1196ce1aa660e3ba7e2559d350649cbe94993519c127df667f2" - -[[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "console" -version = "0.15.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 = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[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.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "cssparser" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa", - "phf 0.11.2", - "smallvec", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.52", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dtoa-short" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" -dependencies = [ - "dtoa", -] - -[[package]] -name = "ego-tree" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591" - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "h2" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "html5ever" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "htmlescape" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "2.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" -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 = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets 0.52.4", -] - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.2", - "libc", - "redox_syscall", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markup5ever" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.4.2", - "cfg-if", - "cfg_aliases", - "libc", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "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 = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.4.2", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[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.101" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "pacmanconf" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d9811f947c6ffc56eeafb789dfad44a7ea7cc383ac3bc6c9b23cd27100bbb1" -dependencies = [ - "cini", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paru" -version = "2.0.3" -dependencies = [ - "alpm", - "alpm-utils", - "ansi_term", - "anyhow", - "async-trait", - "aur-depends", - "aur-fetch", - "bitflags 2.4.2", - "chrono", - "cini", - "dirs", - "env_logger", - "futures", - "globset", - "htmlescape", - "indicatif", - "log", - "nix", - "once_cell", - "pacmanconf", - "raur", - "regex", - "reqwest", - "rss", - "scraper", - "serde", - "serde_json", - "signal-hook", - "smart-default", - "srcinfo", - "tempfile", - "terminal_size", - "tokio", - "toml", - "tr", - "unicode-width", - "url", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.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 = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "encoding_rs", - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "raur" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dafb3f375eedbb68b8c57a79cb220171ad1b716196fa35d4ab059f5fda21cc17" -dependencies = [ - "async-trait", - "reqwest", - "serde", - "serde_derive", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "reqwest" -version = "0.11.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" -dependencies = [ - "async-compression", - "base64", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-socks", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "rss" -version = "2.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b2c77eb4450d7d5f98df52c381cd6c4e19b75dad9209a9530b85a44510219a" -dependencies = [ - "quick-xml", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" -dependencies = [ - "bitflags 2.4.2", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "scraper" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b80b33679ff7a0ea53d37f3b39de77ea0c75b12c5805ac43ec0c33b3051af1b" -dependencies = [ - "ahash", - "cssparser", - "ego-tree", - "getopts", - "html5ever", - "once_cell", - "selectors", - "tendril", -] - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "selectors" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" -dependencies = [ - "bitflags 2.4.2", - "cssparser", - "derive_more", - "fxhash", - "log", - "new_debug_unreachable", - "phf 0.10.1", - "phf_codegen", - "precomputed-hash", - "servo_arc", - "smallvec", -] - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "serde_json" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "servo_arc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "smart-default" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "srcinfo" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceaee0d48949e3aa5365945de3e467e797b30b4f8636c2e580121a293fd77519" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "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.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "temp-dir" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" - -[[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 = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[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-socks" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tr" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21111d9e56891e526f1acf8edc6d69a8a0434240319419d33911c182f1897a76" -dependencies = [ - "gettext-rs", - "lazy_static", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[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-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[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 = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "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 = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.52", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "winnow" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] diff --git a/pkgs/by-name/pa/paru/cargo-lock.patch b/pkgs/by-name/pa/paru/cargo-lock.patch new file mode 100644 index 0000000000000..5f95bdd9272a2 --- /dev/null +++ b/pkgs/by-name/pa/paru/cargo-lock.patch @@ -0,0 +1,35 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 404b5cd..bba31c1 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2613,13 +2613,3 @@ dependencies = [ + "quote", + "syn", + ] +- +-[[patch.unused]] +-name = "alpm" +-version = "3.0.4" +-source = "git+https://github.com/archlinux/alpm.rs?rev=306342#306342efc6f24739c92de64c432f962a22891e63" +- +-[[patch.unused]] +-name = "aur-depends" +-version = "3.0.0" +-source = "git+https://github.com/Morganamilo/aur-depends?rev=30c2c1#30c2c15019f8dd80e803c9deefce3279079806af" +diff --git a/Cargo.toml b/Cargo.toml +index 020c5c2..f74e9d1 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -70,12 +70,3 @@ static = ["alpm/static"] + mock = ["async-trait"] + mock_chroot = ["mock"] + #default = ["git", "generate"] +- +-[patch.crates-io] +-#alpm = { path = "../alpm.rs/alpm" } +-#alpm-utils = { path = "../alpm.rs/alpm-utils" } +-alpm = { git = "https://github.com/archlinux/alpm.rs", rev = "306342" } +-#alpm-utils = { git = "https://github.com/archlinux/alpm.rs", rev = "8da396" } +-#aur-depends = { path = "../aur-depends" } +-aur-depends = { git = "https://github.com/Morganamilo/aur-depends", rev = "30c2c1"} +-#aur-fetch = { path = "../aur-fetch" } diff --git a/pkgs/by-name/pa/paru/package.nix b/pkgs/by-name/pa/paru/package.nix index b8c457f8b58c2..03441cf1ac622 100644 --- a/pkgs/by-name/pa/paru/package.nix +++ b/pkgs/by-name/pa/paru/package.nix @@ -11,34 +11,22 @@ stdenv, }: -let - # only libalpm v14.x.x is supported - pacman_6 = pacman.overrideAttrs (previousAttrs: { - version = "6.1.0"; - src = previousAttrs.src.overrideAttrs { - outputHash = "sha256-uHBq1A//YSqFATlyqjC5ZgmvPkNKqp7sVew+nbmLH78="; - }; - hardeningDisable = [ "fortify3" ]; - }); -in rustPlatform.buildRustPackage rec { pname = "paru"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "Morganamilo"; repo = "paru"; rev = "v${version}"; - hash = "sha256-0+N1WkjHd2DREoS1pImXXvlJ3wXoXEBxFBtupjXqyP8="; + hash = "sha256-VFIeDsIuPbWGf+vio5i8qGUBB+spP/7SwYwmQkMjtL8="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "alpm-3.0.4" = "sha256-cfIOCUyb+kDAT3Bn50oKuJzIyMyeFyOPBFQMkAgMocI="; - "aur-depends-3.0.0" = "sha256-Z/vCd4g3ic29vC0DXFHTT167xFAXYxzO2YQc0XQOerE="; - }; - }; + cargoPatches = [ + ./cargo-lock.patch + ]; + + cargoHash = "sha256-z8hYZu/3RV99hOTpnv4ExgXymhzuITDcGjJhcHLWcH8="; nativeBuildInputs = [ gettext @@ -50,11 +38,13 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libarchive openssl - pacman_6 + pacman ]; - # https://aur.archlinux.org/packages/paru#comment-961914 - buildFeatures = lib.optionals stdenv.isAarch64 [ "generate" ]; + # https://github.com/Morganamilo/paru/issues/1154#issuecomment-2002357898 + buildFeatures = lib.optionals stdenv.hostPlatform.isAarch64 [ + "generate" + ]; postBuild = '' sh ./scripts/mkmo locale/ diff --git a/pkgs/by-name/pa/passes/package.nix b/pkgs/by-name/pa/passes/package.nix index a20a1fe80b84a..74d34f682b0d4 100644 --- a/pkgs/by-name/pa/passes/package.nix +++ b/pkgs/by-name/pa/passes/package.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - broken = stdenv.isDarwin; # Crashes + broken = stdenv.hostPlatform.isDarwin; # Crashes }; }) diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index 8db2c9a981e4d..f54be84167415 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "passt"; - version = "2024_07_26.57a21d2"; + version = "2024_09_06.6b38f07"; src = fetchurl { url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz"; - hash = "sha256-UK3Klpo3cp4EH42W16qh5WbZlCxb+ETQtWbpgatL/Dc="; + hash = "sha256-Qf1neJOkYXR5p9Owk60qtc22A+au4EY45Qt9PfJ+Lrs="; }; makeFlags = [ diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index a563034ee0e39..93188ebfc5587 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.26.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-7mN5tp0QUlITCPeotMU61FUl0xmr78RMxUsIlq+F3DE="; + hash = "sha256-Pr2h5iezn//oyvuUoq5B49wEL1cUXOHhHjR3ylMXowQ="; }; - vendorHash = "sha256-YRhB0L1kIPZahS0K94vKr2iexhXkwl3GaNsk16WiLAU="; + vendorHash = "sha256-6w49XQNElSHpOamEZNpvvr67vYrZYXy2Sm7dWMh6OiU="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/pa/paup/package.nix b/pkgs/by-name/pa/paup/package.nix new file mode 100644 index 0000000000000..62bb5206587aa --- /dev/null +++ b/pkgs/by-name/pa/paup/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenvNoCC, + fetchurl, + autoPatchelfHook, + curl, + gfortran, + zlib, +}: + +stdenvNoCC.mkDerivation { + pname = "paup"; + version = "4.0a168"; + + src = fetchurl { + url = "http://phylosolutions.com/paup-test/paup4a168_centos64.gz"; + hash = "sha256-41dZswlrIQ05f1zJzId78DKmPf0QH1SfrexzvCAUxq8="; + }; + + unpackPhase = '' + runHook preUnpack + + gunzip -c $src > paup + + runHook postUnpack + ''; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ + curl + gfortran + zlib + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 paup -t $out/bin + + runHook postInstall + ''; + + meta = { + description = "A software package for inferring evolutionary trees"; + homepage = "http://phylosolutions.com/paup-test/"; + license = lib.licenses.unfree; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = with lib.maintainers; [ pandapip1 ]; + mainProgram = "paup"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix index cb38ebac1c761..6a343140cab71 100644 --- a/pkgs/by-name/pc/pcsx2-bin/package.nix +++ b/pkgs/by-name/pc/pcsx2-bin/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "pcsx2-bin"; - version = "2.1.17"; + version = "2.1.136"; src = fetchurl { url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz"; - hash = "sha256-WuxvMcGuCyTAc99JkUjG0qcV7SXWy9fmaZR0+8iGepQ="; + hash = "sha256-TAyOQLBOHOe+EBjirmST7Dmg6F13e/9SACr24/7FVgE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pc/pcsx2-bin/update.sh b/pkgs/by-name/pc/pcsx2-bin/update.sh index 872899694278c..8748a75a3bbc6 100755 --- a/pkgs/by-name/pc/pcsx2-bin/update.sh +++ b/pkgs/by-name/pc/pcsx2-bin/update.sh @@ -3,41 +3,18 @@ set -euo pipefail -ROOT="$(dirname "$(readlink -f "$0")")" -if [[ ! "$(basename "$ROOT")" == "pcsx2-bin" || ! -f "$ROOT/package.nix" ]]; then - echo "error: Not in the pcsx2-bin folder" >&2 - exit 1 -fi - -PACKAGE_NIX="$ROOT/package.nix" +cd "$(dirname "$0")" || exit 1 -# Grab latest (pre)release version -PCSX2_LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases" | jq -r '.[0].tag_name' | sed 's/^v//')" -PCSX2_CURRENT_VER="$(grep -oP 'version = "\K[^"]+' "$PACKAGE_NIX")" +# Grab latest version, ignoring "latest" and "preview" tags +LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases" | jq -r '.[0].tag_name' | sed 's/^v//')" +CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)" -if [[ "$PCSX2_LATEST_VER" == "$PCSX2_CURRENT_VER" ]]; then +if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then echo "pcsx2-bin is up-to-date" exit 0 fi -get_hash() { - # $1: URL - nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "$1")" -} - -replace_hash_in_file() { - # $1: file - # $2: new hash - sed -i "s#hash = \".*\"#hash = \"$2\"#g" "$1" -} - -replace_version_in_file() { - # $1: file - # $2: new version - sed -i "s#version = \".*\";#version = \"$2\";#g" "$1" -} - -PCSX2_DARWIN_HASH="$(get_hash "https://github.com/PCSX2/pcsx2/releases/download/v${PCSX2_LATEST_VER}/pcsx2-v${PCSX2_LATEST_VER}-macos-Qt.tar.xz")" +HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/PCSX2/pcsx2/releases/download/v${LATEST_VER}/pcsx2-v${LATEST_VER}-macos-Qt.tar.xz")")" -replace_hash_in_file "$PACKAGE_NIX" "$PCSX2_DARWIN_HASH" -replace_version_in_file "$PACKAGE_NIX" "$PCSX2_LATEST_VER" +sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix +sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix diff --git a/pkgs/by-name/pc/pcsx2/sources.nix b/pkgs/by-name/pc/pcsx2/sources.nix index 77441f29adc5a..6483d98e77d21 100644 --- a/pkgs/by-name/pc/pcsx2/sources.nix +++ b/pkgs/by-name/pc/pcsx2/sources.nix @@ -9,14 +9,14 @@ let pcsx2 = let self = { pname = "pcsx2"; - version = "2.1.102"; + version = "2.1.127"; src = fetchFromGitHub { pname = "pcsx2-source"; inherit (self) version; owner = "PCSX2"; repo = "pcsx2"; rev = "v${self.version}"; - hash = "sha256-OBxrdZVx6HbSFO6sc2D2HP6iYH3ZKDj+uEqM7cxZNm0="; + hash = "sha256-zvvrGxGjIQjSmo18BDG2J3+PoysXj8WxpwtrcXK8LH8="; }; }; in @@ -27,14 +27,14 @@ let pcsx2_patches = let self = { pname = "pcsx2_patches"; - version = "0-unstable-2024-08-12"; + version = "0-unstable-2024-09-05"; src = fetchFromGitHub { pname = "pcsx2_patches-source"; inherit (self) version; owner = "PCSX2"; repo = "pcsx2_patches"; - rev = "9ea7fca481e1e4c2263ca69f9a5c9a70c92626dc"; - hash = "sha256-T0yTTW6P/NrZsANoduj+gCXyd5qqDRETxLblmnVnP/o="; + rev = "377f30ae19acde655cc412086fa1840d16d54a93"; + hash = "sha256-g2SMMC/oHSF0G3+zwvk1vOoQgYFrPd3eaZ0jgGJIr5g="; }; }; in diff --git a/pkgs/by-name/pd/pdfannots2json/package.nix b/pkgs/by-name/pd/pdfannots2json/package.nix index 23776a452752b..90db280c8b9af 100644 --- a/pkgs/by-name/pd/pdfannots2json/package.nix +++ b/pkgs/by-name/pd/pdfannots2json/package.nix @@ -11,7 +11,7 @@ in owner = "mgmeyers"; repo = "pdfannots2json"; rev = "refs/tags/${version}"; - sha256 = "sha256-qk4OSws/6SevN/Q0lsyxw+fZkm2uy1WwOYYL7CB7QUk="; + hash = "sha256-qk4OSws/6SevN/Q0lsyxw+fZkm2uy1WwOYYL7CB7QUk="; }; vendorHash = null; diff --git a/pkgs/by-name/pd/pdi/package.nix b/pkgs/by-name/pd/pdi/package.nix new file mode 100644 index 0000000000000..7159af6a03aec --- /dev/null +++ b/pkgs/by-name/pd/pdi/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # nativeBuildInputs + python3, + cmake, + gfortran, + pkg-config, + hdf5-mpi, + zpp, + + # buildInputs + gbenchmark, + libyaml, + mpi, + spdlog, + + # passthru + nix-update-script, + testers, + pdi, +}: +let + python = python3.withPackages ( + p: with p; [ + distutils + setuptools + ] + ); +in +stdenv.mkDerivation rec { + pname = "pdi"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "pdidev"; + repo = "pdi"; + rev = "refs/tags/${version}-gh"; + hash = "sha256-VTbXsUUJb/6zNyn4QXNHajgzzgjSwdW/d+bTSDcpRaE="; + }; + + # Current hdf5 version in nixpkgs is 1.14.4.3 which is 4 numbers long and doesn't match the 3 number regex. :') + # Patch it to make it match a 4 number-long version. + postPatch = '' + substituteInPlace plugins/decl_hdf5/cmake/FindHDF5.cmake \ + --replace-fail '"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+)' '"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)' + ''; + + nativeBuildInputs = [ + cmake + gfortran + pkg-config + python + hdf5-mpi + zpp + ]; + + buildInputs = [ + gbenchmark + hdf5-mpi + libyaml + mpi + spdlog + ]; + + cmakeFlags = [ + # Force using nix gbenchmark instead of vendored version + "-DUSE_benchmark=SYSTEM" + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = pdi; + command = "pdirun"; + }; + }; + + meta = { + description = "PDI supports loose coupling of simulation codes with data handling libraries"; + homepage = "https://pdi.dev/master/"; + license = lib.licenses.bsd3; + mainProgram = "pdirun"; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix index 191b405e03c45..58c6f2d4bdf5a 100644 --- a/pkgs/by-name/pd/pdns-recursor/package.nix +++ b/pkgs/by-name/pd/pdns-recursor/package.nix @@ -8,17 +8,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns-recursor"; - version = "5.0.6"; + version = "5.1.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2"; - hash = "sha256-2QiF0qu33f6XQc2Pv1ubppAilsd7L1Ekh3kGZZHvPzI="; + hash = "sha256-W3q3k6zoIilKPzgJL+cu5kdI/wy7ilKD3Hf0B4BgWuk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; sourceRoot = "pdns-recursor-${finalAttrs.version}/settings/rust"; - hash = "sha256-XHzuYkO91TJNU2DYqMlafqrc2zR1WvIrNLjFHL2FcwA="; + hash = "sha256-1CHhnW8s4AA06HAgW+A/mx1jGTynj4CvIc/I7n0h+VY"; }; cargoRoot = "settings/rust"; diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix index 95a2d501cf375..3913938d025e4 100644 --- a/pkgs/by-name/pe/peergos/package.nix +++ b/pkgs/by-name/pe/peergos/package.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "peergos"; - version = "0.19.0"; + version = "0.20.0"; src = fetchurl { url = "https://github.com/Peergos/web-ui/releases/download/v${version}/Peergos.jar"; - hash = "sha256-GxJI33EVNSZfmrj5H70kwW9RE8YuJKt36qYmdWKtEJ8="; + hash = "sha256-Kk0ahAsvfTYkmVZTDE+QhyDFHQFY6lpWhmIOYBeJ1xk="; }; dontUnpack = true; diff --git a/pkgs/by-name/pe/peertube-viewer/package.nix b/pkgs/by-name/pe/peertube-viewer/package.nix new file mode 100644 index 0000000000000..3981fb69f3119 --- /dev/null +++ b/pkgs/by-name/pe/peertube-viewer/package.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitLab, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "peertube-viewer"; + version = "1.8.6"; + + src = fetchFromGitLab { + owner = "peertube-viewer"; + repo = "peertube-viewer-rs"; + rev = "v1.8.6"; + hash = "sha256-ZzeWk01migUrKR7GndtNo0kLYSCUXCg0H0eCXgrDXaM=="; + }; + + cargoHash = "sha256-5u5240PL5cKhnHsT7sRdccrbZBAbRN+fa+FhJP1gX/4=="; + + meta = with lib; { + description = "A simple CLI browser for the peertube federated video platform"; + homepage = "https://gitlab.com/peertube-viewer/peertube-viewer-rs"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ haruki7049 ]; + }; +} diff --git a/pkgs/by-name/pe/pegtl/package.nix b/pkgs/by-name/pe/pegtl/package.nix index 5e1704cdeb78e..28052ee7513bd 100644 --- a/pkgs/by-name/pe/pegtl/package.nix +++ b/pkgs/by-name/pe/pegtl/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pegtl"; - version = "3.2.7"; + version = "3.2.8"; src = fetchFromGitHub { owner = "taocpp"; repo = "PEGTL"; rev = finalAttrs.version; - hash = "sha256-IV5YNGE4EWVrmg2Sia/rcU8jCuiBynQGJM6n3DCWTQU="; + hash = "sha256-nPWSO2wPl/qenUQgvQDQu7Oy1dKa/PnNFSclmkaoM8A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pe/perf_data_converter/package.nix b/pkgs/by-name/pe/perf_data_converter/package.nix index 217640f2fbff1..827be3d7d242c 100644 --- a/pkgs/by-name/pe/perf_data_converter/package.nix +++ b/pkgs/by-name/pe/perf_data_converter/package.nix @@ -26,7 +26,7 @@ buildBazelPackage rec { ]; fetchAttrs = { - sha256 = "sha256-Qm6Ng9cXvKx043P7qyNHyyMvdGK9aNarX1ZKeCp3mgY="; + hash = "sha256-Qm6Ng9cXvKx043P7qyNHyyMvdGK9aNarX1ZKeCp3mgY="; }; nativeBuildInputs = [ jdk ]; diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 2ea48a54a7933..498a14c96dc38 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { lapack ] ++ lib.optional hdf5-support hdf5 ++ lib.optional petsc-withp4est p4est ++ lib.optionals withParmetis [ metis parmetis ]; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config/install.py \ --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool ''; diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/by-name/pf/pforth/package.nix similarity index 100% rename from pkgs/development/compilers/pforth/default.nix rename to pkgs/by-name/pf/pforth/package.nix diff --git a/pkgs/by-name/pg/pg-gvm/package.nix b/pkgs/by-name/pg/pg-gvm/package.nix index 96aa7a2f68b96..dca83ea0bdd6a 100644 --- a/pkgs/by-name/pg/pg-gvm/package.nix +++ b/pkgs/by-name/pg/pg-gvm/package.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + postgresql ]; buildInputs = [ diff --git a/pkgs/by-name/pg/pgagroal/package.nix b/pkgs/by-name/pg/pgagroal/package.nix index 72eb5c153a48a..2b89773af833d 100644 --- a/pkgs/by-name/pg/pgagroal/package.nix +++ b/pkgs/by-name/pg/pgagroal/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake docutils ]; buildInputs = [ cjson libev openssl ] - ++ lib.optionals stdenv.isLinux [ systemd ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]; meta = with lib; { description = "High-performance connection pool for PostgreSQL"; diff --git a/pkgs/by-name/pg/pgcopydb/package.nix b/pkgs/by-name/pg/pgcopydb/package.nix index 0df2ab9c04f74..1fda00a750e91 100644 --- a/pkgs/by-name/pg/pgcopydb/package.nix +++ b/pkgs/by-name/pg/pgcopydb/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { readline sqlite zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pam ]; diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-pie.nix b/pkgs/by-name/pg/pgf-pie/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgf-pie.nix rename to pkgs/by-name/pg/pgf-pie/package.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlcd.nix b/pkgs/by-name/pg/pgf-umlcd/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlcd.nix rename to pkgs/by-name/pg/pgf-umlcd/package.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix b/pkgs/by-name/pg/pgf-umlsd/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix rename to pkgs/by-name/pg/pgf-umlsd/package.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-1.x.nix b/pkgs/by-name/pg/pgf1/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgf-1.x.nix rename to pkgs/by-name/pg/pgf1/package.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-2.x.nix b/pkgs/by-name/pg/pgf2/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgf-2.x.nix rename to pkgs/by-name/pg/pgf2/package.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-3.x.nix b/pkgs/by-name/pg/pgf3/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgf-3.x.nix rename to pkgs/by-name/pg/pgf3/package.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgfplots.nix b/pkgs/by-name/pg/pgfplots/package.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgfplots.nix rename to pkgs/by-name/pg/pgfplots/package.nix diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index dfd15033e83a8..bbfb6df67d5bf 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-HDFvU7TjOENFvBorn11ludy8QQb4/IC6hEyyzvrJ2lU="; + hash = "sha256-gB6iArOYwOh8UPGl4x5Tf3H2FSxSXxpfKrwvgmtFFcs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ph/pharo/package.nix b/pkgs/by-name/ph/pharo/package.nix index 5831cebc911e7..8e6d7bf311276 100644 --- a/pkgs/by-name/ph/pharo/package.nix +++ b/pkgs/by-name/ph/pharo/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pharo"; - version = "10.0.9-de76067"; + version = "10.3.1-6cdb1e5"; src = fetchzip { # It is necessary to download from there instead of from the repository because that archive # also contains artifacts necessary for the bootstrapping. url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-${finalAttrs.version}-Linux-x86_64-c-src.zip"; - hash = "sha256-INeQGYCxBu7DvFmlDRXO0K2nhxcd9K9Xwp55iNdlvhk="; + hash = "sha256-Oskbo0ZMh2Wr8uY9BjA54AhFVDEuzs4AN8cpO02gdfY="; }; strictDeps = true; diff --git a/pkgs/by-name/ph/photini/package.nix b/pkgs/by-name/ph/photini/package.nix index 732c835edfbe7..4afc67386d57b 100644 --- a/pkgs/by-name/ph/photini/package.nix +++ b/pkgs/by-name/ph/photini/package.nix @@ -7,20 +7,19 @@ python3Packages.buildPythonApplication rec { pname = "photini"; - version = "2024.5.0"; + version = "2024.9.1"; pyproject = true; src = fetchFromGitHub { owner = "jim-easterbrook"; repo = "Photini"; rev = "refs/tags/${version}"; - hash = "sha256-iTaFyQpC585QPInLvFzgk65+Znvb1kTTsrzEQvy1quY="; + hash = "sha256-0jr1mNejCF0yW9LkrrsOTcE4ZPGZrMU9Pnt0eXD+3YQ="; }; build-system = with python3Packages; [ setuptools-scm ]; dependencies = with python3Packages; [ - pyqt6 - pyqt6-webengine + pyside6 cachetools appdirs chardet @@ -33,6 +32,7 @@ python3Packages.buildPythonApplication rec { gpxpy keyring pillow + toml ]; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index ff80e9bc1542b..6e66d6885efc4 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { qt6Packages.poppler zxing-cpp ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ mpv qt6.qtwayland ]; @@ -59,12 +59,12 @@ stdenv.mkDerivation rec { (lib.cmakeBool "CHROMECAST" false) (lib.cmakeBool "FREEIMAGE" false) (lib.cmakeBool "IMAGEMAGICK" false) - (lib.cmakeBool "VIDEO_MPV" (!stdenv.isDarwin)) + (lib.cmakeBool "VIDEO_MPV" (!stdenv.hostPlatform.isDarwin)) ]; env.MAGICK_LOCATION = "${graphicsmagick}/include/GraphicsMagick"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/photoqt.app $out/Applications makeWrapper $out/{Applications/photoqt.app/Contents/MacOS,bin}/photoqt diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 55d6064f5dbfd..dc3b9d470b2c2 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -1,23 +1,29 @@ -{ lib -, fetchFromGitHub -, nix-update-script -, php +{ + lib, + fetchFromGitHub, + nix-update-script, + php, + phpunit, + testers, }: php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "11.3.1"; + version = "11.3.6"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-uTH5LlXabhsu86Te/oNnIrvq88MhAqYbVTyKEaPtTuU="; + hash = "sha256-bJdatRBrORR7KPcpRVIPYo2picQSfh8Pa0waeOZAH8Q="; }; - vendorHash = "sha256-cOy5kipPr73LbxmQAsqqR0GfegQp1ARrbqei2zi5JHc="; + vendorHash = "sha256-wRgYEwbvvEGCp7/Rat+WUkvv04JqFHssHXtJjeQZo3o="; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = phpunit; }; + }; meta = { changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md"; diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix index 8f5664d5c2a5d..aba0a4013b406 100644 --- a/pkgs/by-name/ph/phraze/package.nix +++ b/pkgs/by-name/ph/phraze/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "phraze"; - version = "0.3.14"; + version = "0.3.15"; src = fetchFromGitHub { owner = "sts10"; repo = "phraze"; rev = "v${version}"; - hash = "sha256-wfvnzKoxFgIizbPrt8v9na6n/qjnjS368P1iOEh5VNw="; + hash = "sha256-gpdXgR7TK3xJHHXcZdfMZApA3SvtNmCroi/5ChfrQOs="; }; doCheck = true; - cargoHash = "sha256-HEsXGlNpr/1NiJobjtwftI8HIfz0AnRtxMvh3Pf2gDo="; + cargoHash = "sha256-tYQ/kcwCNAcgEUmwrrdogLd1AugBnVfqaLX9fjjpOUE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pi/picocom/lrzsz-path.patch b/pkgs/by-name/pi/picocom/lrzsz-path.patch new file mode 100644 index 0000000000000..86e9759db2de7 --- /dev/null +++ b/pkgs/by-name/pi/picocom/lrzsz-path.patch @@ -0,0 +1,15 @@ +diff --git a/picocom.c b/picocom.c +index ba2f9bd666..d4df60f2d3 100644 +--- a/picocom.c ++++ b/picocom.c +@@ -243,8 +243,8 @@ + .send_cmd = "", + .receive_cmd = "", + #else +- .send_cmd = "sz -vv", +- .receive_cmd = "rz -vv -E", ++ .send_cmd = "@lrzsz@/bin/sz -vv", ++ .receive_cmd = "@lrzsz@/bin/rz -vv -E", + #endif + .imap = M_I_DFL, + .omap = M_O_DFL, diff --git a/pkgs/by-name/pi/picocom/package.nix b/pkgs/by-name/pi/picocom/package.nix new file mode 100644 index 0000000000000..4a549e27921c5 --- /dev/null +++ b/pkgs/by-name/pi/picocom/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitLab, + replaceVars, + pkg-config, + go-md2man, + installShellFiles, + linenoise, + darwin, + lrzsz, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "picocom"; + version = "2024-07"; + + src = fetchFromGitLab { + owner = "wsakernel"; + repo = "picocom"; + rev = finalAttrs.version; + hash = "sha256-cQoEfi75iltjeAm26NvXgfrL7d1Hm+1veQ4dVe0S1q8="; + }; + + patches = [ + ./use-system-linenoise.patch + (replaceVars ./lrzsz-path.patch { inherit lrzsz; }) + ]; + + nativeBuildInputs = [ + pkg-config + go-md2man + installShellFiles + ]; + + buildInputs = [ + linenoise + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + + makeFlags = [ + "HISTFILE=.cache/picocom_history" + "all" + "doc" + ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + install -Dm555 -t $out/bin picocom + installManPage picocom.1 + installShellCompletion --bash bash_completion/picocom + + runHook postInstall + ''; + + meta = { + description = "Minimal dumb-terminal emulation program"; + homepage = "https://gitlab.com/wsakernel/picocom"; + changelog = "https://gitlab.com/wsakernel/picocom/-/releases"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + mainProgram = "picocom"; + }; +}) diff --git a/pkgs/by-name/pi/picocom/use-system-linenoise.patch b/pkgs/by-name/pi/picocom/use-system-linenoise.patch new file mode 100644 index 0000000000000..455c18010bfc2 --- /dev/null +++ b/pkgs/by-name/pi/picocom/use-system-linenoise.patch @@ -0,0 +1,30 @@ +diff --git a/Makefile b/Makefile +index 8fca24ee38..33b59b5b96 100644 +--- a/Makefile ++++ b/Makefile +@@ -39,9 +39,9 @@ + ## Comment these out to disable "linenoise"-library support + HISTFILE = .picocom_history + CPPFLAGS += -DHISTFILE=\"$(HISTFILE)\" \ +- -DLINENOISE +-OBJS += linenoise-1.0/linenoise.o +-linenoise-1.0/linenoise.o : linenoise-1.0/linenoise.c linenoise-1.0/linenoise.h ++ -DLINENOISE \ ++ $(shell $(PKG_CONFIG) --cflags linenoise) ++LDFLAGS += $(shell $(PKG_CONFIG) --libs linenoise) + + ## Comment this in to enable (force) custom baudrate support + ## even on systems not enabled by default. +diff --git a/picocom.c b/picocom.c +index 775ee9c3bb..ba2f9bd666 100644 +--- a/picocom.c ++++ b/picocom.c +@@ -48,7 +48,7 @@ + #include "split.h" + #include "term.h" + #ifdef LINENOISE +-#include "linenoise-1.0/linenoise.h" ++#include <linenoise.h> + #endif + + #include "custbaud.h" diff --git a/pkgs/by-name/pi/picocrypt-cli/package.nix b/pkgs/by-name/pi/picocrypt-cli/package.nix index 392082ecb8bc7..931043d6dcd75 100644 --- a/pkgs/by-name/pi/picocrypt-cli/package.nix +++ b/pkgs/by-name/pi/picocrypt-cli/package.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "picocrypt-cli"; - version = "2.06"; + version = "2.08"; src = fetchFromGitHub { owner = "Picocrypt"; repo = "CLI"; rev = version; - hash = "sha256-vxHYTgNVhTTN1yQkqjvlzqq7pV0XiQqTHI9HqIUVyR4="; + hash = "sha256-6/VmacOXQOCkjLFyzDPyohOueF3WKJu7XCAD9oiFXEc="; }; sourceRoot = "${src.name}/picocrypt"; - vendorHash = "sha256-Nuo4oIJxp+liNLNXRvbFTE1ElEIM1OBp5CTb0KEV/7g="; + vendorHash = "sha256-QIeuqdoC17gqxFgKJ/IU024dgofBCizWTj2S7CCmED4="; ldflags = [ "-s" diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix index 4a6cd51f222da..d77509135d0e5 100644 --- a/pkgs/by-name/pi/picocrypt/package.nix +++ b/pkgs/by-name/pi/picocrypt/package.nix @@ -15,18 +15,18 @@ buildGoModule rec { pname = "picocrypt"; - version = "1.41"; + version = "1.43"; src = fetchFromGitHub { owner = "Picocrypt"; repo = "Picocrypt"; rev = "refs/tags/${version}"; - hash = "sha256-jbZW9JqRVEH48RmGSQzSKaoTRSnA85N7iDHIQqTF6JQ="; + hash = "sha256-xxlmerEGujBvghC+OpMW0gkDl7zPOW4r6cM7T6qOc6A="; }; sourceRoot = "${src.name}/src"; - vendorHash = "sha256-S5iR0eeR+nqxNzE3+KDN1Yw7nmycN0IhhMZjIdVb6WQ="; + vendorHash = "sha256-QeNFXmWeA/hkYdFzJoHj61bo/DmGWakdhFRLtSYG7+Y="; ldflags = [ "-s" @@ -37,7 +37,7 @@ buildGoModule rec { # Depends on a vendored, patched GLFW. glfw.buildInputs or [ ] ++ glfw.propagatedBuildInputs or [ ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk3 xorg.libXxf86vm ]; diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index 8337b0f694b4e..686e9c371bb94 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -4,20 +4,22 @@ writeShellScript, fetchFromGitHub, pcre, + asciidoctor, unstableGitUpdater }: picom.overrideAttrs (previousAttrs: { pname = "picom-pijulius"; - version = "8.2-unstable-2024-07-01"; + version = "8.2-unstable-2024-09-27"; src = fetchFromGitHub { owner = "pijulius"; repo = "picom"; - rev = "b8fe9323e7606709d692976a7fe7d2455b328bc6"; - hash = "sha256-bXeoWg1ZukXv+6ZNeRc8gGNsbtBztyW5lpfK0lQK+DE="; + rev = "d1d5a32d9ac125e1db1c2235834060fd0535b262"; + hash = "sha256-1ycxVHaWpqGD1GuWQ8dpKrbmSSSQS8CoaY56wM18bWk="; }; buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; + nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ asciidoctor ]; meta = { inherit (previousAttrs.meta) diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix index 8074e38cf5010..200ad56d1e2b4 100644 --- a/pkgs/by-name/pi/picom/package.nix +++ b/pkgs/by-name/pi/picom/package.nix @@ -1,4 +1,4 @@ -{ asciidoc +{ asciidoctor , dbus , docbook_xml_dtd_45 , docbook_xsl @@ -33,20 +33,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "picom"; - version = "11.2"; + version = "12.1"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${finalAttrs.version}"; - hash = "sha256-7ohtI890CutwprPEY5njqWou0fD6T9eu51EBSQ2/lWs="; + hash = "sha256-XBFSPSrG6C4n5oQUQbWXyy9iCuEdrdaxU0CPR73juzk="; fetchSubmodules = true; }; strictDeps = true; nativeBuildInputs = [ - asciidoc + asciidoctor docbook_xml_dtd_45 docbook_xsl makeWrapper diff --git a/pkgs/by-name/pi/pietrasanta-traceroute/package.nix b/pkgs/by-name/pi/pietrasanta-traceroute/package.nix index 195ea1ad97b07..78ec9b5372896 100644 --- a/pkgs/by-name/pi/pietrasanta-traceroute/package.nix +++ b/pkgs/by-name/pi/pietrasanta-traceroute/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pietrasanta-traceroute"; - version = "0.0.5-unstable-2024-06-11"; + version = "0.0.5-unstable-2024-09-06"; src = fetchFromGitHub { owner = "catchpoint"; repo = "Networking.traceroute"; - rev = "5b9f9cd2cbd5b8d90442d4ddb71ab788297e2153"; - hash = "sha256-/WsBh42brVCRP31LnCPS34kRaQKMvP+XEENyD5MjCfw="; + rev = "e4a5cf94dccd646e03b9b75a762e9b014e3a3128"; + hash = "sha256-5FbuITewgSh6UFUU1vttkokk8uZ2IrzkDwsCuWJPKlM="; }; passthru.updateScript = unstableGitUpdater { }; @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { mainProgram = "traceroute"; maintainers = with maintainers; [ nicoo ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/pi/pigeon/package.nix b/pkgs/by-name/pi/pigeon/package.nix index 2277d4c3616a8..bfd6672530bf2 100644 --- a/pkgs/by-name/pi/pigeon/package.nix +++ b/pkgs/by-name/pi/pigeon/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "mna"; repo = "pigeon"; rev = "v${version}"; - sha256 = "sha256-0Cp/OnFvVZj9UZgl3F5MCzemBaHI4smGWU46VQnhLOg="; + hash = "sha256-0Cp/OnFvVZj9UZgl3F5MCzemBaHI4smGWU46VQnhLOg="; }; vendorHash = "sha256-JbBXRkxnB7LeeWdBLIQvyjvWo0zZ1EOuEUPXxHWiq+E="; diff --git a/pkgs/by-name/pi/pinit/package.nix b/pkgs/by-name/pi/pinit/package.nix new file mode 100644 index 0000000000000..b4d467c58810e --- /dev/null +++ b/pkgs/by-name/pi/pinit/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + blueprint-compiler, + wrapGAppsHook4, + libadwaita, + libgee, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pinit"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "ryonakano"; + repo = "pinit"; + rev = finalAttrs.version; + hash = "sha256-unvlMytZdjVbrWlwkpw90NZoFw9A6Ga0bB2XqFEPuVE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + blueprint-compiler + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + libgee + ]; + + meta = { + description = "Pin portable apps to the launcher"; + homepage = "https://github.com/ryonakano/pinit"; + license = with lib.licenses; [ + gpl3Plus + cc0 + ]; + mainProgram = "com.github.ryonakano.pinit"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/pi/pinocchio/package.nix b/pkgs/by-name/pi/pinocchio/package.nix new file mode 100644 index 0000000000000..7284be49df7ca --- /dev/null +++ b/pkgs/by-name/pi/pinocchio/package.nix @@ -0,0 +1,119 @@ +{ + boost, + casadi, + casadiSupport ? true, + cmake, + collisionSupport ? true, + console-bridge, + doxygen, + eigen, + example-robot-data, + fetchFromGitHub, + hpp-fcl, + jrl-cmakemodules, + lib, + pkg-config, + pythonSupport ? false, + python3Packages, + stdenv, + urdfdom, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pinocchio"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "stack-of-tasks"; + repo = "pinocchio"; + rev = "v${finalAttrs.version}"; + hash = "sha256-8V+n1TwFojXKOVkGG8k9aXVadt2NBFlZKba93L+NRNU="; + }; + + outputs = [ + "out" + "doc" + ]; + + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 + prePatch = lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) '' + substituteInPlace unittest/algorithm/utils/CMakeLists.txt \ + --replace-fail "add_pinocchio_unit_test(force)" "" + ''; + + postPatch = '' + # example-robot-data models are used in checks. + # Upstream provide them as git submodule, but we can use our own version instead. + test -d models/example-robot-data && rmdir models/example-robot-data + ln -s ${example-robot-data.src} models/example-robot-data + + # allow package:// uri use in examples + export ROS_PACKAGE_PATH=${example-robot-data}/share + + # silence matplotlib warning + export MPLCONFIGDIR=$(mktemp -d) + ''; + + # CMAKE_BUILD_TYPE defaults to Release in this package, + # which enable -O3, which break some tests + # ref. https://github.com/stack-of-tasks/pinocchio/issues/2304#issuecomment-2231018300 + postConfigure = '' + substituteInPlace CMakeCache.txt --replace-fail '-O3' '-O2' + ''; + + strictDeps = true; + + nativeBuildInputs = + [ + cmake + doxygen + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; + + propagatedBuildInputs = + [ + console-bridge + jrl-cmakemodules + urdfdom + ] + ++ lib.optionals (!pythonSupport) [ + boost + eigen + ] + ++ lib.optionals (!pythonSupport && collisionSupport) [ hpp-fcl ] + ++ lib.optionals pythonSupport [ + python3Packages.boost + python3Packages.eigenpy + ] + ++ lib.optionals (pythonSupport && collisionSupport) [ python3Packages.hpp-fcl ] + ++ lib.optionals (!pythonSupport && casadiSupport) [ casadi ] + ++ lib.optionals (pythonSupport && casadiSupport) [ python3Packages.casadi ]; + + checkInputs = lib.optionals (pythonSupport && casadiSupport) [ python3Packages.matplotlib ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "BUILD_WITH_LIBPYTHON" pythonSupport) + (lib.cmakeBool "BUILD_WITH_CASADI_SUPPORT" casadiSupport) + (lib.cmakeBool "BUILD_WITH_COLLISION_SUPPORT" collisionSupport) + (lib.cmakeBool "INSTALL_DOCUMENTATION" true) + ]; + + doCheck = true; + pythonImportsCheck = [ "pinocchio" ]; + + meta = { + description = "Fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"; + homepage = "https://github.com/stack-of-tasks/pinocchio"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ + nim65s + wegank + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/pi/pinokio/package.nix b/pkgs/by-name/pi/pinokio/package.nix index 97b9ad7514e72..f71f7800c4620 100644 --- a/pkgs/by-name/pi/pinokio/package.nix +++ b/pkgs/by-name/pi/pinokio/package.nix @@ -31,7 +31,7 @@ let }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname version src meta; diff --git a/pkgs/by-name/pi/pio/package.nix b/pkgs/by-name/pi/pio/package.nix index 01aa886c3002a..f79c12256e234 100644 --- a/pkgs/by-name/pi/pio/package.nix +++ b/pkgs/by-name/pi/pio/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jVOpk+Z3yEEoDexvxT9I0aVHJKVq47y8km/9ltoqrDA="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; diff --git a/pkgs/by-name/pi/pipet/package.nix b/pkgs/by-name/pi/pipet/package.nix new file mode 100644 index 0000000000000..335b6256d969e --- /dev/null +++ b/pkgs/by-name/pi/pipet/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: + +buildGoModule rec { + pname = "pipet"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "bjesus"; + repo = "pipet"; + rev = version; + hash = "sha256-NhqrNehmL6LLLEOVT/s2PdQ7HtSCfoM4MST1IHVrJXE="; + }; + + vendorHash = "sha256-jNIjF5jxcpNLAjuWo7OG/Ac4l6NpQNCKzYUgdAoL+C4="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.currentSha=${src.rev}" + ]; + + doCheck = false; # Requires network + + meta = { + homepage = "https://github.com/bjesus/pipet"; + description = "Scraping and extracting data from online assets"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bjesus ]; + mainProgram = "pipet"; + }; +} diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix index d1c35d815341b..5a8f25000efc0 100644 --- a/pkgs/by-name/pi/piv-agent/package.nix +++ b/pkgs/by-name/pi/piv-agent/package.nix @@ -24,10 +24,10 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.shortCommit=${src.rev}" ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.PCSC ] else [ pcsclite ]; diff --git a/pkgs/by-name/pi/pix/package.nix b/pkgs/by-name/pi/pix/package.nix index b7804eafeae18..854b4559165ad 100644 --- a/pkgs/by-name/pi/pix/package.nix +++ b/pkgs/by-name/pi/pix/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-WL9EW7oKeQwufw1VYDigbqAt52GQTpc5RgDEmnKO6vc="; + hash = "sha256-WL9EW7oKeQwufw1VYDigbqAt52GQTpc5RgDEmnKO6vc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/pixelorama/package.nix b/pkgs/by-name/pi/pixelorama/package.nix index dfe9abf9632ff..22eb4f3854ed3 100644 --- a/pkgs/by-name/pi/pixelorama/package.nix +++ b/pkgs/by-name/pi/pixelorama/package.nix @@ -19,25 +19,26 @@ }: let + presets = { + "i686-linux" = "Linux 32-bit"; + "x86_64-linux" = "Linux 64-bit"; + "aarch64-linux" = "Linux ARM64"; + }; preset = - if stdenv.isLinux then - if stdenv.is64bit then "Linux/X11 64-bit" else "Linux/X11 32-bit" - else if stdenv.isDarwin then - "Mac OSX" - else - throw "unsupported platform"; + presets.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); godot_version_folder = lib.replaceStrings [ "-" ] [ "." ] godot_4.version; in stdenv.mkDerivation (finalAttrs: { pname = "pixelorama"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Orama-Interactive"; repo = "Pixelorama"; rev = "v${finalAttrs.version}"; - hash = "sha256-lfim5ZiykOhI1kgsu0ni2frUVHPRIPJdrGx6TuUQcSY="; + hash = "sha256-IMHv5pOLxj7sqRtWmddziCiOX3T20bcMp2+ZzyhcIFg="; }; strictDeps = true; @@ -95,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" + "aarch64-linux" ]; maintainers = with maintainers; [ felschr ]; mainProgram = "pixelorama"; diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 6c0ed9ebc0e20..85413acc64ed5 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 openssl - ] ++ lib.optionals stdenv.isDarwin ( + ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ CoreFoundation IOKit SystemConfiguration Security ] ); @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { # There are some CI failures with Rattler. Tests on Aarch64 has been skipped. # See https://github.com/prefix-dev/pixi/pull/241. - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; preCheck = '' export HOME="$(mktemp -d)" @@ -81,7 +81,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_task_with_env" "--skip=test_pixi_only_env_activation" "--skip=cli::shell_hook::tests::test_environment_json" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=task::task_environment::tests::test_find_ambiguous_task" "--skip=task::task_environment::tests::test_find_task_dual_defined" "--skip=task::task_environment::tests::test_find_task_explicit_defined" diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix index 811b74b9724f9..31435c52f0178 100644 --- a/pkgs/by-name/pi/pizauth/package.nix +++ b/pkgs/by-name/pi/pizauth/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postInstall = '' installShellCompletion --cmd pizauth \ diff --git a/pkgs/by-name/pl/plantuml-c4/package.nix b/pkgs/by-name/pl/plantuml-c4/package.nix new file mode 100644 index 0000000000000..a17aedefee262 --- /dev/null +++ b/pkgs/by-name/pl/plantuml-c4/package.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + fetchzip, + jre, + makeWrapper, + plantuml-c4, + plantuml, + runCommand, +}: + +# The C4-PlantUML docs say that it suffices to run plantuml with the +# -DRELATIVE_INCLUDE="..." arg to make plantuml find the C4 templates +# when included like "!include C4_Container.puml". +# Unfortunately, this is not sufficient in practise, when the path is not ".". +# What helps is setting -Dplantuml.include.path="..." *before* the jar +# parameter. +# The -DRELATIVE_INCLUDE param then *still* needs to be set (*after* the jar +# argument), because the C4 template vars check for existence of this variable +# and if it is not set, reference paths in the internet. + +let + c4-lib = fetchzip { + url = "https://github.com/plantuml-stdlib/C4-PlantUML/archive/refs/tags/v2.10.0.zip"; + hash = "sha256-p9Njb7VauXVf6yOBDQrO9mS+za9NntFUCK5tig0mH3U="; + }; + + sprites = fetchzip { + url = "https://github.com/tupadr3/plantuml-icon-font-sprites/archive/refs/tags/v3.0.0.zip"; + hash = "sha256-I/cR1VPR7aKyTZF9X/4GkgcxV9+sLgNpTZugvCy0Dvs="; + }; + + # In order to pre-fix the plantuml.jar parameter with the argument + # -Dplantuml.include.path=..., we post-fix the java command using a wrapper. + # This way the plantuml derivation can remain unchanged. + plantumlWithExtraPath = + let + plantumlIncludePath = lib.concatStringsSep ":" [ + c4-lib + sprites + ]; + includeFlag = "-Dplantuml.include.path=${lib.escapeShellArg plantumlIncludePath}"; + postFixedJre = runCommand "jre-postfixed" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/bin + + makeWrapper ${jre}/bin/java $out/bin/java \ + --add-flags ${lib.escapeShellArg includeFlag} + ''; + in + plantuml.override { jre = postFixedJre; }; +in + +stdenv.mkDerivation { + pname = "plantuml-c4"; + version = "2.10.0"; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + + makeWrapper ${plantumlWithExtraPath}/bin/plantuml $out/bin/plantuml \ + --add-flags "-DRELATIVE_INCLUDE=\"${c4-lib}\"" + + $out/bin/plantuml -help + ''; + + passthru.tests.example-c4-diagram = + runCommand "c4-plantuml-sample.png" { nativeBuildInputs = [ plantuml-c4 ]; } + '' + sed 's/https:.*\///' "${c4-lib}/samples/C4_Context Diagram Sample - enterprise.puml" > sample.puml + plantuml sample.puml -o $out + + sed 's/!include ..\//!include /' ${sprites}/examples/complex-example.puml > sprites.puml + plantuml sprites.puml -o $out + ''; + + meta = with lib; { + description = "PlantUML bundled with C4-Plantuml and plantuml sprites library"; + mainProgram = "plantuml"; + homepage = "https://github.com/plantuml-stdlib/C4-PlantUML"; + license = licenses.mit; + maintainers = with maintainers; [ + tfc + anthonyroussel + ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/pl/plantuml-server/package.nix b/pkgs/by-name/pl/plantuml-server/package.nix new file mode 100644 index 0000000000000..189da083d1ef2 --- /dev/null +++ b/pkgs/by-name/pl/plantuml-server/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchurl, + nixosTests, +}: + +stdenv.mkDerivation rec { + pname = "plantuml-server"; + version = "1.2024.7"; + + src = fetchurl { + url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; + hash = "sha256-9YTclV+FoiNbcpeNtlbbozqjB1BN9EJn03CzyHDbC+8="; + }; + + dontUnpack = true; + + postInstall = '' + mkdir -p "$out/webapps" + cp "$src" "$out/webapps/plantuml.war" + ''; + + passthru.tests = { + inherit (nixosTests) plantuml-server; + }; + + meta = with lib; { + description = "Web application to generate UML diagrams on-the-fly"; + homepage = "https://plantuml.com/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ + truh + anthonyroussel + ]; + }; +} diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix new file mode 100644 index 0000000000000..cfb35e1d7c632 --- /dev/null +++ b/pkgs/by-name/pl/plantuml/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenvNoCC, + fetchurl, + graphviz, + jre, + makeBinaryWrapper, + testers, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "plantuml"; + version = "1.2024.7"; + + src = fetchurl { + url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar"; + hash = "sha256-8BlAPc2BeojyTcZVboUA6+sOA5AO5eG871mSIWinm5E="; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + buildCommand = '' + install -Dm644 $src $out/lib/plantuml.jar + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/plantuml \ + --argv0 plantuml \ + --set GRAPHVIZ_DOT ${graphviz}/bin/dot \ + --add-flags "-jar $out/lib/plantuml.jar" + ''; + + doInstallCheck = true; + + postCheckInstall = '' + $out/bin/plantuml -help + $out/bin/plantuml -testdot + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "plantuml --version"; + }; + + meta = { + description = "Draw UML diagrams using a simple and human readable text description"; + homepage = "https://plantuml.com/"; + # "plantuml -license" says GPLv3 or later + license = lib.licenses.gpl3Plus; + mainProgram = "plantuml"; + maintainers = with lib.maintainers; [ + bjornfor + Mogria + anthonyroussel + ]; + platforms = lib.platforms.unix; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + }; +}) diff --git a/pkgs/by-name/pl/plasma-applet-commandoutput/package.nix b/pkgs/by-name/pl/plasma-applet-commandoutput/package.nix new file mode 100644 index 0000000000000..f8589b98edb55 --- /dev/null +++ b/pkgs/by-name/pl/plasma-applet-commandoutput/package.nix @@ -0,0 +1,40 @@ +{ + fetchFromGitHub, + lib, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "plasma-applet-commandoutput"; + version = "13"; + + src = fetchFromGitHub { + owner = "Zren"; + repo = "plasma-applet-commandoutput"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-Tjnm26EYKXtBM9JBHKI73AMvOW/rQ3qOw2JDYey7EfQ="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/plasma/plasmoids + cp -r package $out/share/plasma/plasmoids/com.github.zren.commandoutput + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/Zren/plasma-applet-commandoutput/blob/${finalAttrs.src.rev}/Changelog.md"; + description = "Run a command periodically and render its output"; + homepage = "https://github.com/Zren/plasma-applet-commandoutput"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + matthiasbeyer + oliver-ni + ]; + }; +}) diff --git a/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix b/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix index b6fc12d6484a3..7975785134c73 100644 --- a/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix +++ b/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasma-plugin-blurredwallpaper"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "bouteillerAlan"; repo = "blurredwallpaper"; rev = "v${finalAttrs.version}"; - hash = "sha256-+MjnVsGHqitQytxiAH39Kx9SXuTEFfIC14Ayzu4yE4I="; + hash = "sha256-P/N7g/cl2K0R4NKebfqZnr9WQkHPSvHNbKbWiOxs76k="; }; installPhase = '' diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix index 73afe152d627d..28c991a763768 100644 --- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "plasmusic-toolbar"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ccatterina"; repo = "plasmusic-toolbar"; rev = "v${finalAttrs.version}"; - hash = "sha256-22eSrvigJHmwVB396APkDtiJjavpijUMuZ4mqQGVwf4="; + hash = "sha256-tZ2xcoGZp2GWoKd4XjO2K4he3tKBHgxi0PdqY+5ULn0="; }; installPhase = '' diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index dcc33000da72a..33387121b9846 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -33,11 +33,11 @@ }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "24.1.8"; + version = "24.2.3"; src = fetchurl { url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; - hash = "sha256-Hh1yf3JqzMEvorWztLvoTcnDAk48cNe7NcCLrvNQCzo="; + hash = "sha256-iiVh4k5r5PXN1/VJZcropTMu36N2B/ECq2L5e59QxJY="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/pl/platformsh/package.nix b/pkgs/by-name/pl/platformsh/package.nix index 683e34a87a0b5..730990f103ff4 100644 --- a/pkgs/by-name/pl/platformsh/package.nix +++ b/pkgs/by-name/pl/platformsh/package.nix @@ -8,11 +8,11 @@ }: let versions = lib.importJSON ./versions.json; - arch = if stdenvNoCC.isx86_64 then "amd64" - else if stdenvNoCC.isAarch64 then "arm64" + arch = if stdenvNoCC.hostPlatform.isx86_64 then "amd64" + else if stdenvNoCC.hostPlatform.isAarch64 then "arm64" else throw "Unsupported architecture"; - os = if stdenvNoCC.isLinux then "linux" - else if stdenvNoCC.isDarwin then "darwin" + os = if stdenvNoCC.hostPlatform.isLinux then "linux" + else if stdenvNoCC.hostPlatform.isDarwin then "darwin" else throw "Unsupported os"; versionInfo = versions."${os}-${arch}"; inherit (versionInfo) hash url; diff --git a/pkgs/by-name/pl/platformsh/versions.json b/pkgs/by-name/pl/platformsh/versions.json index 9fcf186237981..0712f76623d1c 100644 --- a/pkgs/by-name/pl/platformsh/versions.json +++ b/pkgs/by-name/pl/platformsh/versions.json @@ -1,19 +1,19 @@ { - "version": "5.0.19", + "version": "5.0.21", "darwin-amd64": { - "hash": "sha256-PGld4gvUnB5I++vPQjEFWp7XRowi4fRfLL6wSzdyaAY=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.19/platform_5.0.19_darwin_all.tar.gz" + "hash": "sha256-NtouEhpSzfMxna2A91cdPybvqDM11xf7CCroJYSmZYk=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.21/platform_5.0.21_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-PGld4gvUnB5I++vPQjEFWp7XRowi4fRfLL6wSzdyaAY=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.19/platform_5.0.19_darwin_all.tar.gz" + "hash": "sha256-NtouEhpSzfMxna2A91cdPybvqDM11xf7CCroJYSmZYk=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.21/platform_5.0.21_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-UtyN/0UolohIVtrxGcKieHZfoRDJhjRApq+Mm44LjSo=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.19/platform_5.0.19_linux_amd64.tar.gz" + "hash": "sha256-O6systY+fRhyDu/clXfuQB6lv2HgzoIe2ku4MwgrQoI=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.21/platform_5.0.21_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-upMEN/c3hxuFlocelC1hX/Nia02Jeg3+VWPsA48kjhs=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.19/platform_5.0.19_linux_arm64.tar.gz" + "hash": "sha256-tGUXrq96zSEp5VHXeaQdmZdUera/NrMOQxTT8CznJlA=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.21/platform_5.0.21_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix index 50080c0153c96..a52794e81eea4 100644 --- a/pkgs/by-name/pl/plex-desktop/package.nix +++ b/pkgs/by-name/pl/plex-desktop/package.nix @@ -32,8 +32,8 @@ }: let pname = "plex-desktop"; - version = "1.96.0"; - rev = "69"; + version = "1.101.0"; + rev = "75"; meta = { homepage = "https://plex.tv/"; description = "Streaming media player for Plex"; @@ -64,7 +64,7 @@ let src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/qc6MFRM433ZhI1XjVzErdHivhSOhlpf0_${rev}.snap"; - hash = "sha512-rECc8rK1ENAL5mXdabO8ynudCaSzz0yygOyg4gMbCtddgqwSOanP24/oguzPLr3zdRMC3VSf9B3hr2BGQ54tzg=="; + hash = "sha512-3ofO4a8HDWeUfjsv+4A5bC0jlQwxIew1CnL39Oa0bjnqShwRQjMW1vSHOjsJ1AHMkbp3h5W/2tFRxPL2C/Heqg=="; }; nativeBuildInputs = [ squashfsTools ]; diff --git a/pkgs/by-name/pl/pls/package.nix b/pkgs/by-name/pl/pls/package.nix index 1db958dcf6be4..af2be4c57adaf 100644 --- a/pkgs/by-name/pl/pls/package.nix +++ b/pkgs/by-name/pl/pls/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "pls"; - version = "0.0.1-beta.7"; + version = "0.0.1-beta.8"; src = fetchFromGitHub { owner = "pls-rs"; repo = "pls"; rev = "v${version}"; - hash = "sha256-X4HGVwBZdDXH5RuBiugEd4I+aXRqZvXoRDZnm8GY3cM="; + hash = "sha256-gJufm2krZSTdBbbfZ+355M9e3MJQbDEpSPf0EbZEayQ="; }; - cargoHash = "sha256-d6HfIEROudINn2Jbnc3EEDZCD833FFFeUk6mvlu0ErA="; + cargoHash = "sha256-cDAHzK3pgpn5zEFdLBltf1e28yFFkXOzcF+nvDb8aWI="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/pl/plumber/package.nix b/pkgs/by-name/pl/plumber/package.nix index 8571bd7ca096b..fc907e880241c 100644 --- a/pkgs/by-name/pl/plumber/package.nix +++ b/pkgs/by-name/pl/plumber/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "plumber"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "streamdal"; repo = pname; rev = "v${version}"; - hash = "sha256-20rc9TLiCkt9k/Gtr5aoheGiiqOp1eURSqg4p1jTnkE="; + hash = "sha256-L8vpaqt9yCIP3TLPSNUrOC6hXc71mzl4lqiaoNS6zls="; }; vendorHash = null; diff --git a/pkgs/by-name/pl/plzip/package.nix b/pkgs/by-name/pl/plzip/package.nix index db7d3101d7e28..4e361f6a32116 100644 --- a/pkgs/by-name/pl/plzip/package.nix +++ b/pkgs/by-name/pl/plzip/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://savannah/lzip/plzip/plzip-${finalAttrs.version}.tar.lz"; - sha256 = "51f48d33df659bb3e1e7e418275e922ad752615a5bc984139da08f1e6d7d10fd"; + hash = "sha256-UfSNM99lm7Ph5+QYJ16SKtdSYVpbyYQTnaCPHm19EP0="; # hash from release email }; diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index a1c3717c2188a..cee9a0b13b7e5 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { pmb_test = "${src}/test"; # Tests depend on sudo - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; build-system = [ python3Packages.setuptools diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index aa2f3ea918532..47afc221df151 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pmtiles"; - version = "1.20.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; rev = "v${version}"; - hash = "sha256-ZwTZtMNgQE0AIbxdjA+8CFKSp1B9QnV5wmP+z/JoIpg="; + hash = "sha256-r3gp0f771Cfy4JNekilnct+FKu4nOb+8y+B1A+anJ5Y="; }; - vendorHash = "sha256-Buzk+rPSPrs0q+g6MWVb47cAIKMxsNXlj3CWA0JINXM="; + vendorHash = "sha256-5oKcq1eTrcjQKWySDOsEFFbKkld9g494D5Tg9Bej8JQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; @@ -22,7 +22,7 @@ buildGoModule rec { description = "Single-file utility for creating and working with PMTiles archives"; homepage = "https://github.com/protomaps/go-pmtiles"; license = licenses.bsd3; - maintainers = [ maintainers.theaninova ]; + maintainers = teams.geospatial.members ++ (with maintainers; [ theaninova ]); mainProgram = "pmtiles"; }; } diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index 8841cc3c13200..c92ea01778d06 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-Is4qpN6i8zBK0WNYbb/YhtzsrgOth9sQdUT81sx7i7g="; + hash = "sha256-ldFlW0QNjOvuJGyd2SzmMWA3ofS2ZW5krvCJRU83NXs="; }; vendorHash = null; @@ -16,7 +16,7 @@ buildGoModule rec { CGO_ENABLED = 0; tags = [ "containers_image_openpgp" "remote" ] - ++ lib.optional stdenv.isDarwin "darwin"; + ++ lib.optional stdenv.hostPlatform.isDarwin "darwin"; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix index 4b6de6ef201f9..8179b9c7e7d00 100644 --- a/pkgs/by-name/po/poethepoet/package.nix +++ b/pkgs/by-name/po/poethepoet/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "poethepoet"; - version = "0.27.0"; + version = "0.28.0"; pyproject = true; src = fetchFromGitHub { owner = "nat-n"; repo = "poethepoet"; rev = "refs/tags/v${version}"; - hash = "sha256-2AxNu4/tTTH5aW02ec83jxhLJoDKSogY/fm8PUm1cSg="; + hash = "sha256-um17UHFLX7zLQXLWbYnEnaLUwMgFSxdGt85fjMBEhjQ="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { tomli ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { poetry_plugin = [ poetry ]; @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Task runner that works well with poetry"; homepage = "https://github.com/nat-n/poethepoet"; - changelog = "https://github.com/nat-n/poethepoet/releases/tag/${src.rev}"; + changelog = "https://github.com/nat-n/poethepoet/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; mainProgram = "poe"; diff --git a/pkgs/by-name/po/poke/package.nix b/pkgs/by-name/po/poke/package.nix new file mode 100644 index 0000000000000..0f392f3cbe8d8 --- /dev/null +++ b/pkgs/by-name/po/poke/package.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, fetchurl +, help2man +, pkg-config +, texinfo +, boehmgc +, readline +, nbdSupport ? !stdenv.hostPlatform.isDarwin, libnbd +, textStylingSupport ? true, gettext +, dejagnu + + # update script only +, writeScript +}: + +let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; +in +stdenv.mkDerivation (finalAttrs: { + pname = "poke"; + version = "4.2"; + + src = fetchurl { + url = "mirror://gnu/poke/poke-${finalAttrs.version}.tar.gz"; + hash = "sha256-iq825h42elMUDqQOJVnp7FEud5xCvuNOesJLNLoRm94="; + }; + + outputs = [ "out" "dev" "info" "lib" ] + # help2man can't cross compile because it runs `poke --help` to + # generate the man page + ++ lib.optional (!isCross) "man"; + + postPatch = '' + patchShebangs . + ''; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + texinfo + ] ++ lib.optionals (!isCross) [ + help2man + ]; + + buildInputs = [ boehmgc readline ] + ++ lib.optional nbdSupport libnbd + ++ lib.optional textStylingSupport gettext + ++ lib.optional finalAttrs.finalPackage.doCheck dejagnu; + + configureFlags = [ + # libpoke depends on $datadir/poke, so we specify the datadir in + # $lib, and later move anything else it doesn't depend on to $out + "--datadir=${placeholder "lib"}/share" + ]; + + enableParallelBuilding = true; + + doCheck = true; + nativeCheckInputs = [ dejagnu ]; + + postInstall = '' + moveToOutput share/emacs "$out" + moveToOutput share/vim "$out" + ''; + + passthru = { + updateScript = writeScript "update-poke" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of '<a href="...">poke 2.0</a>' + new_version="$(curl -s https://www.jemarch.net/poke | + pcregrep -o1 '>poke ([0-9.]+)</a>')" + update-source-version poke "$new_version" + ''; + }; + + meta = { + description = "Interactive, extensible editor for binary data"; + homepage = "http://www.jemarch.net/poke"; + changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres kira-bruneau ]; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; + }; +}) diff --git a/pkgs/by-name/po/pokemmo-installer/package.nix b/pkgs/by-name/po/pokemmo-installer/package.nix new file mode 100644 index 0000000000000..a4adf5a8eba1e --- /dev/null +++ b/pkgs/by-name/po/pokemmo-installer/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + fetchFromGitLab, + makeWrapper, + coreutils, + findutils, + gnugrep, + jre, + openssl, + util-linux, + wget, + which, + zenity, + libGL, + libpulseaudio, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pokemmo-installer"; + version = "1.4.8"; + + src = fetchFromGitLab { + owner = "coringao"; + repo = "pokemmo-installer"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-uSbnXBpkeGM9X6DU7AikT7hG/emu67PXuGdm6xfB8To="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installFlags = [ + "PREFIX=${placeholder "out"}" + + # BINDIR defaults to $(PREFIX)/games + "BINDIR=${placeholder "out"}/bin" + ]; + + postFixup = '' + wrapProgram "$out/bin/pokemmo-installer" \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + findutils + gnugrep + jre + openssl + util-linux + wget + which + zenity + ] + } \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libGL + libpulseaudio + ] + } + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Installer and Launcher for the PokeMMO emulator"; + homepage = "https://pokemmo.eu"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ kira-bruneau ]; + platforms = platforms.linux; + mainProgram = "pokemmo-installer"; + }; +}) diff --git a/pkgs/by-name/po/pokemon-cursor/package.nix b/pkgs/by-name/po/pokemon-cursor/package.nix index c5718e365ec1d..eeaec0a8b68bf 100644 --- a/pkgs/by-name/po/pokemon-cursor/package.nix +++ b/pkgs/by-name/po/pokemon-cursor/package.nix @@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "ful1e5"; repo = "pokemon-cursor"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-EL6Ztbzjm1YuQP+8ZbrhbuBXn+GFiJGG0iGNWzU/rBY="; + hash = "sha256-EL6Ztbzjm1YuQP+8ZbrhbuBXn+GFiJGG0iGNWzU/rBY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/polenum/package.nix b/pkgs/by-name/po/polenum/package.nix new file mode 100644 index 0000000000000..728b47ed4e8df --- /dev/null +++ b/pkgs/by-name/po/polenum/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "polenum"; + version = "1.6.1-unstable-2024-07-30"; + format = "other"; + + src = fetchFromGitHub { + owner = "Wh1t3Fox"; + repo = "polenum"; + rev = "6f95ce0f9936d8c20820e199a4bb1ea68d2f061f"; + hash = "sha256-aCX7dByfkUSFHjhRAjrFhbbeIgYNGixnB5pHE/lftng="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + impacket + ]; + + installPhase = '' + runHook preInstall + + install -vD $pname.py $out/bin/$pname + + runHook postInstall + ''; + + meta = with lib; { + description = "Tool to get the password policy from a windows machine"; + homepage = "https://github.com/Wh1t3Fox/polenum"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ exploitoverload ]; + mainProgram = "polenum"; + }; +} diff --git a/pkgs/by-name/po/polkit_gnome/package.nix b/pkgs/by-name/po/polkit_gnome/package.nix index 68779415b09ee..d738e6c6bb3ad 100644 --- a/pkgs/by-name/po/polkit_gnome/package.nix +++ b/pkgs/by-name/po/polkit_gnome/package.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://gitlab.gnome.org/Archive/policykit-gnome"; + changelog = "https://gitlab.gnome.org/Archive/policykit-gnome/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Dbus session bus service that is used to bring up authentication dialogs"; license = lib.licenses.lgpl2Plus; maintainers = [ ]; diff --git a/pkgs/by-name/po/pololu-tic/package.nix b/pkgs/by-name/po/pololu-tic/package.nix index f34f8d27affac..322ff8fa6455c 100644 --- a/pkgs/by-name/po/pololu-tic/package.nix +++ b/pkgs/by-name/po/pololu-tic/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "pololu"; repo = "pololu-tic-software"; rev = "refs/tags/${finalAttrs.version}"; - sha256 = "sha256-C/v5oaC5zZwm+j9CbFaDW+ebzHxPVb8kZLg9c0HyPbc="; + hash = "sha256-C/v5oaC5zZwm+j9CbFaDW+ebzHxPVb8kZLg9c0HyPbc="; }; outputs = [ diff --git a/pkgs/servers/http/pomerium/0001-envoy-allow-specification-of-external-binary.patch b/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch similarity index 91% rename from pkgs/servers/http/pomerium/0001-envoy-allow-specification-of-external-binary.patch rename to pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch index d595dc6ccae29..d43242b6cc14e 100644 --- a/pkgs/servers/http/pomerium/0001-envoy-allow-specification-of-external-binary.patch +++ b/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch @@ -1,4 +1,4 @@ -From fa51c56049a99ef17d86b0327bcf66f47338da45 Mon Sep 17 00:00:00 2001 +From e82f2949b86d127aec908d90d872dfd6feb509e5 Mon Sep 17 00:00:00 2001 From: Morgan Helton <mhelton@gmail.com> Date: Sun, 26 May 2024 12:17:01 -0500 Subject: [PATCH] envoy: allow specification of external binary @@ -8,7 +8,7 @@ Subject: [PATCH] envoy: allow specification of external binary 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go -index 62f2d34c..879001cd 100644 +index 6639d4bd..c6ca198f 100644 --- a/pkg/envoy/envoy.go +++ b/pkg/envoy/envoy.go @@ -8,9 +8,9 @@ import ( @@ -35,7 +35,7 @@ index 62f2d34c..879001cd 100644 type serverOptions struct { services string logLevel config.LogLevel -@@ -58,17 +62,16 @@ type Server struct { +@@ -59,17 +63,16 @@ type Server struct { // NewServer creates a new server with traffic routed by envoy. func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Builder) (*Server, error) { @@ -59,5 +59,5 @@ index 62f2d34c..879001cd 100644 grpcPort: src.GetConfig().GRPCPort, httpPort: src.GetConfig().HTTPPort, -- -2.44.1 +2.46.0 diff --git a/pkgs/servers/http/pomerium/package.json b/pkgs/by-name/po/pomerium/package.json similarity index 100% rename from pkgs/servers/http/pomerium/package.json rename to pkgs/by-name/po/pomerium/package.json diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix new file mode 100644 index 0000000000000..75c13df48390c --- /dev/null +++ b/pkgs/by-name/po/pomerium/package.nix @@ -0,0 +1,130 @@ +{ buildGo123Module +, fetchFromGitHub +, lib +, envoy +, mkYarnPackage +, fetchYarnDeps +, nixosTests +, pomerium-cli +}: + +let + inherit (lib) concatStringsSep concatMap id mapAttrsToList; +in +buildGo123Module rec { + pname = "pomerium"; + version = "0.27.1"; + src = fetchFromGitHub { + owner = "pomerium"; + repo = "pomerium"; + rev = "v${version}"; + hash = "sha256-+RKWl/weUYktS7jUB1lYpZCBKEfh7RMfKgRDbYV8Bjs="; + }; + + vendorHash = "sha256-/iYUZp6EASDGApLymNuR10395PH8D3zPU+TlmmAN8Zc="; + + ui = mkYarnPackage { + inherit version; + src = "${src}/ui"; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/ui/yarn.lock"; + sha256 = lib.fileContents ./yarn-hash; + }; + + buildPhase = '' + runHook preBuild + yarn --offline build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp -R deps/pomerium/dist $out + runHook postInstall + ''; + + doDist = false; + }; + + subPackages = [ + "cmd/pomerium" + ]; + + # patch pomerium to allow use of external envoy + patches = [ + ./0001-envoy-allow-specification-of-external-binary.patch + ]; + + ldflags = let + # Set a variety of useful meta variables for stamping the build with. + setVars = { + "github.com/pomerium/pomerium/internal/version" = { + Version = "v${version}"; + BuildMeta = "nixpkgs"; + ProjectName = "pomerium"; + ProjectURL = "github.com/pomerium/pomerium"; + }; + "github.com/pomerium/pomerium/pkg/envoy" = { + OverrideEnvoyPath = "${envoy}/bin/envoy"; + }; + }; + concatStringsSpace = list: concatStringsSep " " list; + mapAttrsToFlatList = fn: list: concatMap id (mapAttrsToList fn list); + varFlags = concatStringsSpace ( + mapAttrsToFlatList (package: packageVars: + mapAttrsToList (variable: value: + "-X ${package}.${variable}=${value}" + ) packageVars + ) setVars); + in [ + "${varFlags}" + ]; + + preBuild = '' + # Replace embedded envoy with nothing. + # We set OverrideEnvoyPath above, so rawBinary should never get looked at + # but we still need to set a checksum/version. + rm pkg/envoy/files/files_{darwin,linux}*.go + cat <<EOF >pkg/envoy/files/files_external.go + package files + + import _ "embed" // embed + + var rawBinary []byte + + //go:embed envoy.sha256 + var rawChecksum string + + //go:embed envoy.version + var rawVersion string + EOF + sha256sum '${envoy}/bin/envoy' > pkg/envoy/files/envoy.sha256 + echo '${envoy.version}' > pkg/envoy/files/envoy.version + + # put the built UI files where they will be picked up as part of binary build + cp -r ${ui}/* ui/dist + ''; + + installPhase = '' + install -Dm0755 $GOPATH/bin/pomerium $out/bin/pomerium + ''; + + passthru = { + tests = { + inherit (nixosTests) pomerium; + inherit pomerium-cli; + }; + updateScript = ./updater.sh; + }; + + meta = with lib; { + homepage = "https://pomerium.io"; + description = "Authenticating reverse proxy"; + mainProgram = "pomerium"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb devusb ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/pkgs/servers/http/pomerium/updater.sh b/pkgs/by-name/po/pomerium/updater.sh similarity index 100% rename from pkgs/servers/http/pomerium/updater.sh rename to pkgs/by-name/po/pomerium/updater.sh diff --git a/pkgs/by-name/po/pomerium/yarn-hash b/pkgs/by-name/po/pomerium/yarn-hash new file mode 100644 index 0000000000000..6f871e034fe35 --- /dev/null +++ b/pkgs/by-name/po/pomerium/yarn-hash @@ -0,0 +1 @@ +0bdrczn8mj5iidmba7xzkcyvsnwmbvcvrc1vgks2x4pxqbfyxaiv diff --git a/pkgs/by-name/po/pop-launcher/package.nix b/pkgs/by-name/po/pop-launcher/package.nix index 4f2a6e382fd3d..4d3c9a31ccb32 100644 --- a/pkgs/by-name/po/pop-launcher/package.nix +++ b/pkgs/by-name/po/pop-launcher/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { owner = "pop-os"; repo = "launcher"; rev = version; - sha256 = "sha256-BQAO9IodZxGgV8iBmUaOF0yDbAMVDFslKCqlh3pBnb0="; + hash = "sha256-BQAO9IodZxGgV8iBmUaOF0yDbAMVDFslKCqlh3pBnb0="; }; postPatch = '' diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix index aaa80787e8c91..12872711f56a9 100644 --- a/pkgs/by-name/po/portablemc/package.nix +++ b/pkgs/by-name/po/portablemc/package.nix @@ -17,7 +17,7 @@ openal, udev, - textToSpeechSupport ? stdenv.isLinux, + textToSpeechSupport ? stdenv.hostPlatform.isLinux, flite, }: @@ -89,7 +89,7 @@ python3Packages.buildPythonApplication rec { Including fast and easy installation of common mod loaders such as Fabric, Forge, NeoForge and Quilt. This launcher is compatible with the standard Minecraft directories. ''; - changelog = "https://github.com/mindstorm38/portablemc/releases/tag/${src.rev}"; + changelog = "https://github.com/mindstorm38/portablemc/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.gpl3Only; mainProgram = "portablemc"; maintainers = with lib.maintainers; [ tomasajt ]; diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 6142aa26813a3..468d56e8d418e 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -33,13 +33,13 @@ let webkitgtk ]; in -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.70.3"; + version = "0.71.2"; src = fetchurl { - url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-mT8cIoWTVzXyEktuybkC9sTtwlNCftiaMeyHYcyHV8A="; + url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; + hash = "sha256-TVrxYz6hFWn2C0CrBnNCPxkfQkTjCXkNSeQp6eC/fjc="; }; nativeBuildInputs = [ @@ -68,12 +68,12 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = gitUpdater { url = "https://github.com/buchen/portfolio.git"; }; - meta = with lib; { + meta = { description = "Simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.epl10; - maintainers = with maintainers; [ + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.epl10; + maintainers = with lib.maintainers; [ kilianar oyren shawn8901 @@ -81,4 +81,4 @@ stdenvNoCC.mkDerivation rec { mainProgram = "portfolio"; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/po/postlight-parser/package.nix b/pkgs/by-name/po/postlight-parser/package.nix index fd0617ede1f2e..bf72c9a19c3ed 100644 --- a/pkgs/by-name/po/postlight-parser/package.nix +++ b/pkgs/by-name/po/postlight-parser/package.nix @@ -4,8 +4,8 @@ , fetchYarnDeps , yarnConfigHook , yarnBuildHook +, yarnInstallHook , nodejs -, npmHooks }: stdenv.mkDerivation (finalAttrs: { @@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarnConfigHook yarnBuildHook + yarnInstallHook nodejs - npmHooks.npmInstallHook ]; # Upstream doesn't include a script in package.json that only builds without # testing, and tests fail because they need to access online websites. Hence @@ -39,8 +39,6 @@ stdenv.mkDerivation (finalAttrs: { postBuild = '' yarn --offline run rollup -c ''; - # Tries to download stuff from the internet in this phase. - dontNpmPrune = true; meta = { changelog = "https://github.com/postlight/parser/blob/${finalAttrs.src.rev}/CHANGELOG.md"; diff --git a/pkgs/by-name/po/postmoogle/package.nix b/pkgs/by-name/po/postmoogle/package.nix new file mode 100644 index 0000000000000..5e6c60aba67a6 --- /dev/null +++ b/pkgs/by-name/po/postmoogle/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "postmoogle"; + version = "0.9.21"; + + src = fetchFromGitHub { + owner = "etkecc"; + repo = "postmoogle"; + rev = "refs/tags/v${version}"; + hash = "sha256-/AuxrIvxoKb08uf4EOYXorl7vJ99KgEH9DZYLidDzI4="; + }; + + tags = [ + "timetzdata" + "goolm" + ]; + + vendorHash = null; + + postInstall = '' + mv $out/bin/cmd $out/bin/postmoogle + ''; + + meta = with lib; { + description = "Postmoogle is Matrix <-> Email bridge in a form of an SMTP server"; + homepage = "https://github.com/etkecc/postmoogle"; + changelog = "https://github.com/etkecc/postmoogle/releases/tag/v0.9.21"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ amuckstot30 ]; + mainProgram = "postmoogle"; + }; +} diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix index daf547cf47e5a..72f6dd5e28896 100644 --- a/pkgs/by-name/po/pot/package.nix +++ b/pkgs/by-name/po/pot/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook cargo rustc - cargo-tauri + cargo-tauri.hook nodejs pnpm.configHook wrapGAppsHook3 @@ -101,15 +101,6 @@ stdenv.mkDerivation (finalAttrs: { chmod +w .. ''; - preBuild = '' - # Use cargo-tauri from nixpkgs instead of pnpm tauri from npm - cargo tauri build -b deb - ''; - - preInstall = '' - mv target/release/bundle/deb/*/data/usr/ $out - ''; - meta = with lib; { description = "Cross-platform translation software"; mainProgram = "pot"; diff --git a/pkgs/by-name/po/power-profiles-daemon/package.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix new file mode 100644 index 0000000000000..d66292e80a52f --- /dev/null +++ b/pkgs/by-name/po/power-profiles-daemon/package.nix @@ -0,0 +1,147 @@ +{ + stdenv, + lib, + bash-completion, + pkg-config, + meson, + mesonEmulatorHook, + ninja, + fetchFromGitLab, + libgudev, + glib, + polkit, + dbus, + gobject-introspection, + wrapGAppsNoGuiHook, + gettext, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_412, + libxml2, + libxslt, + upower, + umockdev, + systemd, + python3, + nixosTests, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "power-profiles-daemon"; + version = "0.23"; + + outputs = [ + "out" + "devdoc" + ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "upower"; + repo = "power-profiles-daemon"; + rev = finalAttrs.version; + hash = "sha256-kX8adu+GXxkaHtARUKp51K3Jf9xO+l12vctsJzIavyM="; + }; + + nativeBuildInputs = + [ + pkg-config + meson + ninja + gettext + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_412 + libxml2 # for xmllint for stripping GResources + libxslt # for xsltproc for building docs + gobject-introspection + wrapGAppsNoGuiHook + # checkInput but checked for during the configuring + (python3.pythonOnBuildForHost.withPackages ( + ps: with ps; [ + pygobject3 + dbus-python + python-dbusmock + argparse-manpage + shtab + ] + )) + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + buildInputs = [ + bash-completion + libgudev + systemd + upower + glib + polkit + # for cli tool + (python3.withPackages (ps: [ + ps.pygobject3 + ])) + ]; + + strictDeps = true; + + checkInputs = [ + umockdev + ]; + + nativeCheckInputs = [ + umockdev + dbus + ]; + + mesonFlags = [ + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "-Dgtk_doc=true" + "-Dpylint=disabled" + "-Dzshcomp=${placeholder "out"}/share/zsh/site-functions" + "-Dtests=${lib.boolToString (stdenv.buildPlatform.canExecute stdenv.hostPlatform)}" + ]; + + doCheck = true; + + # Only need to wrap the Python tool (powerprofilectl) + dontWrapGApps = true; + + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; + + postPatch = '' + patchShebangs --build \ + tests/integration-test.py \ + tests/unittest_inspector.py + + patchShebangs --host \ + src/powerprofilesctl + ''; + + postFixup = '' + wrapGApp "$out/bin/powerprofilesctl" + ''; + + passthru = { + updateScript = nix-update-script { }; + tests = { + nixos = nixosTests.power-profiles-daemon; + }; + }; + + meta = with lib; { + changelog = "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/releases/${finalAttrs.version}"; + homepage = "https://gitlab.freedesktop.org/upower/power-profiles-daemon"; + description = "Makes user-selected power profiles handling available over D-Bus"; + mainProgram = "powerprofilesctl"; + platforms = platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + mvnetbiz + picnoir + lyndeno + ]; + }; +}) diff --git a/pkgs/by-name/po/powermode-indicator/package.nix b/pkgs/by-name/po/powermode-indicator/package.nix new file mode 100644 index 0000000000000..b4d5781b55352 --- /dev/null +++ b/pkgs/by-name/po/powermode-indicator/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + gtkmm3, + glibmm, + libappindicator, +}: +stdenv.mkDerivation { + pname = "powermode-indicator"; + version = "0-unstable-2024-07-13"; + + src = fetchFromGitHub { + owner = "PiyushXCoder"; + repo = "powermode-indicator"; + rev = "0a67f63290b087f1eeff2c6c6869c2122ac78e6f"; + hash = "sha256-qqV99s+uNYCUx/xGY3gQL38eG9siuKTRT0bA2UoN6Sk="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + libappindicator + gtkmm3 + glibmm + ]; + + meta = with lib; { + homepage = "https://github.com/PiyushXCoder/powermode-indicator"; + description = "Tray tool for power profiles management"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.aacebedo ]; + mainProgram = "powermode-indicator"; + }; +} diff --git a/pkgs/by-name/po/powertop/package.nix b/pkgs/by-name/po/powertop/package.nix new file mode 100644 index 0000000000000..e5bca7571a203 --- /dev/null +++ b/pkgs/by-name/po/powertop/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + autoconf-archive, + autoreconfHook, + fetchFromGitHub, + gettext, + libnl, + ncurses, + nix-update-script, + pciutils, + pkg-config, + powertop, + testers, + xorg, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "powertop"; + version = "2.15"; + + src = fetchFromGitHub { + owner = "fenrus75"; + repo = "powertop"; + rev = "refs/tags/v${version}"; + hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M="; + }; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + pkg-config + ]; + + buildInputs = [ + gettext + libnl + ncurses + pciutils + zlib + ]; + + postPatch = '' + substituteInPlace src/main.cpp --replace-fail "/sbin/modprobe" "modprobe" + substituteInPlace src/calibrate/calibrate.cpp --replace-fail "/usr/bin/xset" "${lib.getExe xorg.xset}" + substituteInPlace src/tuning/bluetooth.cpp --replace-fail "/usr/bin/hcitool" "hcitool" + ''; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = powertop; + command = "powertop --version"; + inherit version; + }; + }; + + meta = with lib; { + inherit (src.meta) homepage; + changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}"; + description = "Analyze power consumption on Intel-based laptops"; + mainProgram = "powertop"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ + fpletz + anthonyroussel + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix index 5b5ee466a16cf..7cac519f039ff 100644 --- a/pkgs/by-name/pr/pragtical/package.nix +++ b/pkgs/by-name/pr/pragtical/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.4.2"; + version = "3.5.0"; pluginManagerVersion = "1.2.9"; src = fetchFromGitHub { @@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'revision = head' 'revision = v${finalAttrs.pluginManagerVersion}' ${lib.getExe meson} subprojects download \ - colors plugins ppm + colors widget plugins ppm find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-mYLYRyyKfjTCD8mi1KrQNLqwd8QX1wgpJtpWASQCLQU="; + hash = "sha256-a9LnLKtJ33YHtlnhWmKBeW5dOjjwa7PmaZjYh0+Nx9g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index d2915f4f8a135..1ee721828e195 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { # Crashes at runtime on darwin with: # Library not loaded: .../out/lib/libsixel.1.dylib - buildFeatures = lib.optionals (!stdenv.isDarwin) [ "sixel" ]; + buildFeatures = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "sixel" ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 2c6e7ccc16db5..ec6a4fc70f180 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -51,13 +51,13 @@ let }; pname = "pretix"; - version = "2024.8.0"; + version = "2024.9.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-3flZoDzS3SI7nAi1skEqVPXJM9vSBrGN+F0esbYKQDw="; + hash = "sha256-L6mTfLIx8kD/5s0Dfp24TEATmjxBXERQjynB0szH3DM="; }; npmDeps = buildNpmPackage { @@ -65,7 +65,7 @@ let inherit version src; sourceRoot = "${src.name}/src/pretix/static/npm_dir"; - npmDepsHash = "sha256-ZS+80LLyS2UBnVGRclYhwVwF1BR17D/79F2moQtqh80="; + npmDepsHash = "sha256-zUui5tYINTDKA91WgRV51ilIPFBJpZ+S2fJwW85KJ9k="; dontBuild = true; diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix index f493f6ec3dab3..4014fa91050ec 100644 --- a/pkgs/by-name/pr/previewqt/package.nix +++ b/pkgs/by-name/pr/previewqt/package.nix @@ -1,64 +1,98 @@ { lib, - vips, - resvg, - mpv, - libraw, - imagemagick, - libdevil, - stdenv, - fetchFromGitLab, cmake, + exiv2, + extra-cmake-modules, + fetchFromGitLab, + imagemagick, libarchive, + libdevil, + libraw, + mpv, + pkg-config, qt6Packages, - extra-cmake-modules, - exiv2, + resvg, + stdenv, + vips, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "previewqt"; version = "3.0"; src = fetchFromGitLab { + name = "previewqt-sources-${finalAttrs.version}"; owner = "lspies"; repo = "previewqt"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-cDtqgezKGgSdhw8x1mM4cZ0H3SfUPEyWP6rRD+kRwXc="; }; - # can't find qtquick3d - strictDeps = false; - nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config qt6Packages.wrapQtAppsHook ]; - buildInputs = [ - exiv2 - imagemagick - qt6Packages.poppler - qt6Packages.qtmultimedia - qt6Packages.qtquick3d - qt6Packages.qtsvg - qt6Packages.qttools - qt6Packages.qtwebengine - libarchive - libdevil - libraw - mpv - resvg - vips - ]; + buildInputs = + [ + exiv2 + extra-cmake-modules + imagemagick + libarchive + libdevil + libraw + mpv + resvg + vips + ] + ++ [ + qt6Packages.poppler + qt6Packages.qtmultimedia + qt6Packages.qtquick3d + qt6Packages.qtsvg + qt6Packages.qttools + qt6Packages.qtwebengine + ]; + + strictDeps = true; meta = { + homepage = "https://previewqt.org/"; description = "Qt-based file previewer"; - homepage = "https://photoqt.org/previewqt"; - changelog = "https://gitlab.com/lspies/previewqt/-/blob/v${version}/CHANGELOG"; + longDescription = '' + PhotoQt is an image viewer that provides a simple and uncluttered + interface. Yet, hidden beneath the surface awaits a large array of + features. Here are some of its main features (not an exhaustive + list). Suggestions for new features are always welcome. + + - Support of ImageMagick/GraphicsMagick, Libraw, FreeImage, DevIL, + libvips, Poppler, libarchive, and video files. + - Touchscreen support + - Support for Motion Photos and Apple Live Photos + - Support for (partial) photo spheres and 360 degree panoramas using + equirectangular projection + - Explore images on an interactive map according to their embedded GPS + location + - Chromecast support + - Basic image manipulations + - Convert images between formats + - Keyboard and mouse shortcuts + - Upload images directly to imgur.com + - Set image as wallpaper directly from inside PhotoQt + - Slideshow feature + - Display Exif information (including tagging of faces) + - Detect and display bar codes and QR codes in images + - Thumbnail Cache + - System Tray Usage + - Command Line Options + - Several translations available (help wanted) + - and much more... + ''; + changelog = "https://gitlab.com/lspies/previewqt/-/blob/v${finalAttrs.version}/CHANGELOG"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ eclairevoyant ]; mainProgram = "previewqt"; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pr/prevo-data/package.nix b/pkgs/by-name/pr/prevo-data/package.nix index c73af66dd69c0..15f7eb66187ce 100644 --- a/pkgs/by-name/pr/prevo-data/package.nix +++ b/pkgs/by-name/pr/prevo-data/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "bpeel"; repo = "revo"; rev = "1e8d7197c0bc831e2127909e77e64dfc26906bdd"; - sha256 = "1ldhzpi3d5cbssv8r7acsn7qwxcl8qpqi8ywpsp7cbgx3w7hhkyz"; + hash = "sha256-308IDx/9LXauvtyjiC9GlHWOj9VMnYy21ouVNuL9sNE="; }; nativeBuildInputs = [ prevo-tools ]; diff --git a/pkgs/by-name/pr/prevo-tools/package.nix b/pkgs/by-name/pr/prevo-tools/package.nix index 4feb518103d4f..741e6e80d87c3 100644 --- a/pkgs/by-name/pr/prevo-tools/package.nix +++ b/pkgs/by-name/pr/prevo-tools/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "bpeel"; repo = "prevodb"; rev = version; - sha256 = "1fyrc4g9qdq04nxs4g8x0krxfani5xady6v9m0qfqpbh4xk2ry2d"; + hash = "sha256-TfgsZidwXewwqGkb31Qv0SrX8wQdPaK7JQA3nB5h2bs="; }; nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ]; diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index 2a08500693179..e5fb12a80c148 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -17,7 +17,7 @@ zlib, msaClientID ? null, - gamemodeSupport ? stdenv.isLinux, + gamemodeSupport ? stdenv.hostPlatform.isLinux, }: let @@ -30,7 +30,7 @@ let in assert lib.assertMsg ( - gamemodeSupport -> stdenv.isLinux + gamemodeSupport -> stdenv.hostPlatform.isLinux ) "gamemodeSupport is only available on Linux."; stdenv.mkDerivation (finalAttrs: { @@ -66,10 +66,10 @@ stdenv.mkDerivation (finalAttrs: { tomlplusplus zlib ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ lib.optional gamemodeSupport gamemode; - hardeningEnable = lib.optionals stdenv.isLinux [ "pie" ]; + hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ]; cmakeFlags = [ @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (lib.versionOlder kdePackages.qtbase.version "6") [ (lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" "5") ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # we wrap our binary manually (lib.cmakeFeature "INSTALL_BUNDLE" "nodeps") # disable built-in updater diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix index c1425a3099bde..ab9b7144b9224 100644 --- a/pkgs/by-name/pr/prismlauncher/package.nix +++ b/pkgs/by-name/pr/prismlauncher/package.nix @@ -1,65 +1,55 @@ { - lib, - stdenv, - symlinkJoin, - prismlauncher-unwrapped, addDriverRunpath, alsa-lib, flite, gamemode, - glfw, - glfw-wayland-minecraft, - mesa-demos, - jdk8, + glfw3-minecraft, jdk17, jdk21, + jdk8, kdePackages, + lib, libGL, + libX11, + libXcursor, + libXext, + libXrandr, + libXxf86vm, libjack2, libpulseaudio, libusb1, - makeWrapper, + mesa-demos, openal, pciutils, pipewire, + prismlauncher-unwrapped, + stdenv, + symlinkJoin, udev, vulkan-loader, - xorg, + xrandr, additionalLibs ? [ ], additionalPrograms ? [ ], - controllerSupport ? stdenv.isLinux, - gamemodeSupport ? stdenv.isLinux, + controllerSupport ? stdenv.hostPlatform.isLinux, + gamemodeSupport ? stdenv.hostPlatform.isLinux, jdks ? [ jdk21 jdk17 jdk8 ], msaClientID ? null, - textToSpeechSupport ? stdenv.isLinux, - - # Adds `glfw-wayland-minecraft` to `LD_LIBRARY_PATH` - # when launched on wayland, allowing for the game to be run natively. - # Make sure to enable "Use system installation of GLFW" in instance settings - # for this to take effect - # - # Warning: This build of glfw may be unstable, and the launcher - # itself can take slightly longer to start - withWaylandGLFW ? false, + textToSpeechSupport ? stdenv.hostPlatform.isLinux, }: assert lib.assertMsg ( - controllerSupport -> stdenv.isLinux + controllerSupport -> stdenv.hostPlatform.isLinux ) "controllerSupport only has an effect on Linux."; assert lib.assertMsg ( - textToSpeechSupport -> stdenv.isLinux + textToSpeechSupport -> stdenv.hostPlatform.isLinux ) "textToSpeechSupport only has an effect on Linux."; -assert lib.assertMsg ( - withWaylandGLFW -> stdenv.isLinux -) "withWaylandGLFW is only available on Linux."; - let prismlauncher' = prismlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; }; in @@ -69,11 +59,7 @@ symlinkJoin { paths = [ prismlauncher' ]; - nativeBuildInputs = - [ kdePackages.wrapQtAppsHook ] - # purposefully using a shell wrapper here for variable expansion - # see https://github.com/NixOS/nixpkgs/issues/172583 - ++ lib.optional withWaylandGLFW makeWrapper; + nativeBuildInputs = [ kdePackages.wrapQtAppsHook ]; buildInputs = [ @@ -81,33 +67,20 @@ symlinkJoin { kdePackages.qtsvg ] ++ lib.optional ( - lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.isLinux + lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.hostPlatform.isLinux ) kdePackages.qtwayland; - env = { - waylandPreExec = lib.optionalString withWaylandGLFW '' - if [ -n "$WAYLAND_DISPLAY" ]; then - export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH" - fi - ''; - }; - - postBuild = - lib.optionalString withWaylandGLFW '' - qtWrapperArgs+=(--run "$waylandPreExec") - '' - + '' - wrapQtAppsHook - ''; + postBuild = '' + wrapQtAppsHook + ''; qtWrapperArgs = let runtimeLibs = [ - # lwjgl stdenv.cc.cc.lib ## native versions - glfw + glfw3-minecraft openal ## openal @@ -118,11 +91,11 @@ symlinkJoin { ## glfw libGL - xorg.libX11 - xorg.libXext - xorg.libXcursor - xorg.libXrandr - xorg.libXxf86vm + libX11 + libXcursor + libXext + libXrandr + libXxf86vm udev # oshi @@ -136,12 +109,12 @@ symlinkJoin { runtimePrograms = [ mesa-demos pciutils # need lspci - xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 + xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 ] ++ additionalPrograms; in [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "--set LD_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}" "--prefix PATH : ${lib.makeBinPath runtimePrograms}" ]; diff --git a/pkgs/by-name/pr/privatebin/package.nix b/pkgs/by-name/pr/privatebin/package.nix new file mode 100644 index 0000000000000..a6508f53badb3 --- /dev/null +++ b/pkgs/by-name/pr/privatebin/package.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nixosTests, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "privatebin"; + version = "1.7.4"; + src = fetchFromGitHub { + owner = "PrivateBin"; + repo = "PrivateBin"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-RFP6rhzfBzTmqs4eJXv7LqdniWoeBJpQQ6fLdoGd5Fk="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -R $src/* $out + runHook postInstall + ''; + + passthru.tests = nixosTests.privatebin; + + meta = { + changelog = "https://github.com/PrivateBin/PrivateBin/releases/tag/${finalAttrs.version}"; + description = "Minimalist, open source online pastebin where the server has zero knowledge of pasted data."; + homepage = "https://privatebin.info"; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.savyajha ]; + }; +}) diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix index 64b014517c63e..b072922e732f2 100644 --- a/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -34,9 +34,9 @@ rustPlatform.buildRustPackage rec { # https://github.com/probe-rs/probe-rs/pull/2492 gitMinimal pkg-config - ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; - buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; checkFlags = [ # require a physical probe diff --git a/pkgs/by-name/pr/project-lemonlime/package.nix b/pkgs/by-name/pr/project-lemonlime/package.nix new file mode 100644 index 0000000000000..c49682b641169 --- /dev/null +++ b/pkgs/by-name/pr/project-lemonlime/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + qt6, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "project-lemonlime"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "Project-LemonLime"; + repo = "Project_LemonLime"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-h/aE1+ED+RkXqFcsb23rboA+Dd7kiom3XiIRqb4oYkQ="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ]; + + cmakeFlags = [ + (lib.cmakeBool "LEMON_QT6" true) + ]; + + buildInputs = [ + qt6.qtbase + qt6.qttools + qt6.qtwayland + ]; + + meta = { + description = "Lightweight evaluation system based on Lemon + LemonPlus for OI competitions"; + homepage = "https://github.com/Project-LemonLime/Project_LemonLime"; + changelog = "https://github.com/Project-LemonLime/Project_LemonLime/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + sigmanificient + bot-wxt1221 + ]; + platforms = lib.platforms.unix; + mainProgram = "lemon"; + }; +}) diff --git a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix index ad02307ffa0e2..9aef55d3ae197 100644 --- a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix @@ -1,34 +1,32 @@ { lib, + borgmatic, fetchFromGitHub, python3Packages, - borgmatic, }: + python3Packages.buildPythonApplication rec { pname = "prometheus-borgmatic-exporter"; version = "0.2.5"; - pyproject = true; + pyproject = true; src = fetchFromGitHub { owner = "maxim-mityutko"; repo = "borgmatic-exporter"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-SgP1utu4Eqs9214pYOT9wP0Ms7AUQH1A3czQF8+qBRo="; }; - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - pytest-mock - ]; + pythonRelaxDeps = [ "prometheus-client" ]; - buildInputs = [python3Packages.poetry-core]; + build-system = with python3Packages; [ poetry-core ]; propagatedBuildInputs = [ borgmatic ] ++ (with python3Packages; [ - flask arrow click + flask loguru pretty-errors prometheus-client @@ -36,9 +34,15 @@ python3Packages.buildPythonApplication rec { waitress ]); + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-mock + ]; + meta = with lib; { description = "Prometheus exporter for Borgmatic"; homepage = "https://github.com/maxim-mityutko/borgmatic-exporter"; + changelog = "https://github.com/maxim-mityutko/borgmatic-exporter/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ flandweber ]; mainProgram = "borgmatic-exporter"; diff --git a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix new file mode 100644 index 0000000000000..45df05913b85a --- /dev/null +++ b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix @@ -0,0 +1,26 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "elasticsearch_exporter"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "prometheus-community"; + repo = "elasticsearch_exporter"; + rev = "v${version}"; + hash = "sha256-8WPDBlp6ftBmY/lu0wuuvs3A9KAzEM/A6RqSvYYLm7w="; + }; + + vendorHash = "sha256-jbPFxwrXWwxPamMnbBxFvGBrt38YG7N5fTweAYULEYQ="; + + meta = with lib; { + description = "Elasticsearch stats exporter for Prometheus"; + mainProgram = "elasticsearch_exporter"; + homepage = "https://github.com/prometheus-community/elasticsearch_exporter"; + license = licenses.asl20; + maintainers = teams.deshaw.members; + }; +} diff --git a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix index 40f2a982bf4b9..890107dd07f51 100644 --- a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix @@ -1,17 +1,17 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "tynany"; repo = "frr_exporter"; rev = "v${version}"; - hash = "sha256-sjC6ee7VMbr5zlahAA/i4wrZIu8CBUF+LYaq6uEvukk="; + hash = "sha256-SDtI7CvCeuRL1cXNsWGCl/zupVbgMxv5bzYYqJWTrMw="; }; in buildGoModule { pname = "prometheus-frr-exporter"; - vendorHash = "sha256-xckGN/FKN2bwFPll6IRDBOGGUm2JTzoZDwKC6ZkoD/Y="; + vendorHash = "sha256-G+S4XORrg0AEKoAqYdmg+uW6x0Ub5diQTyQGY0iebHg="; inherit src version; ldflags = [ diff --git a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix index 49ca4c9d6d840..4c317159f5521 100644 --- a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix +++ b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation ( version = "1.0.1"; src = fetchurl { url = "mirror://maven/io/prometheus/jmx/jmx_prometheus_javaagent/${finalAttrs.version}/${jarName}"; - sha256 = "sha256-fWH3N/1mFhDMwUrqeXZPqh6pSjQMvI8AKbPS7eo9gME="; + hash = "sha256-fWH3N/1mFhDMwUrqeXZPqh6pSjQMvI8AKbPS7eo9gME="; }; dontUnpack = true; diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index 7ddf75a893aab..5f1e9c50cc6bf 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { # FIXME: tests fail due to read-only nix store doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation IOKit ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation IOKit ]); excludedPackages = [ "docs/node-mixin" ]; diff --git a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix index 217449b85bb40..0dc4acd2c0bbb 100644 --- a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "boynux"; repo = "squid-exporter"; rev = "v${version}"; - sha256 = "sha256-low1nIL7FbIYfIP7KWPskAQ50Hh+d7JI+ryYoR+mP10="; + hash = "sha256-low1nIL7FbIYfIP7KWPskAQ50Hh+d7JI+ryYoR+mP10="; }; vendorHash = "sha256-0BNhjNveUDd0+X0do4Md58zJjXe3+KN27MPEviNuF3g="; diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 8b94e30b9cb06..04618f14d5e9f 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.40.2"; + version = "0.41.3"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${version}"; - hash = "sha256-GpTNU/kaxo9BgMh5FdeJghpENIuC7Tdy+K1uXcPIQuY="; + hash = "sha256-FkuHKfrMH+l/k9lfFhbG619KoDIxmEYwoaniHSPF8hQ="; }; - cargoHash = "sha256-CjdIjJ6Nvckihp3mo86lzmqJD1aXSwKoyrLWMhOVy8w="; + cargoHash = "sha256-vll9ckegcECmzoOkTCe2q2M1r4s5JlUnv2DtzJEQ7bY="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; diff --git a/pkgs/by-name/pr/protoc-gen-connect-es/package.nix b/pkgs/by-name/pr/protoc-gen-connect-es/package.nix index a245ee5e4f02f..06fe46ec28663 100644 --- a/pkgs/by-name/pr/protoc-gen-connect-es/package.nix +++ b/pkgs/by-name/pr/protoc-gen-connect-es/package.nix @@ -7,20 +7,20 @@ buildNpmPackage rec { pname = "protoc-gen-connect-es"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "connectrpc"; repo = "connect-es"; rev = "refs/tags/v${version}"; - hash = "sha256-qCIwr4Hyc5PARUa7tMntuyWRmO6ognmtjxN0myo8FXc="; + hash = "sha256-pur1OJuud2ZwPAfd6pSuTAx2vtW6kQM9rntDmtvVj3c="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-OGwEpXZqzMSIES+cmseQlo6/vzkx5ztO0gM/rUB0tGY="; + npmDepsHash = "sha256-wObMmeFCP/zZ6P5cCVkFnn5X0h9/4ePsSj9uBd6C1/Y="; npmWorkspace = "packages/protoc-gen-connect-es"; diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix index fe36c239a8a7e..ada1eca94b36c 100644 --- a/pkgs/by-name/pr/protoc-gen-es/package.nix +++ b/pkgs/by-name/pr/protoc-gen-es/package.nix @@ -29,6 +29,13 @@ buildNpmPackage rec { npm run --workspace=packages/protoplugin build ''; + # copy npm workspace modules while properly resolving symlinks + # TODO: workaround can be removed once this is merged: https://github.com/NixOS/nixpkgs/pull/333759 + postInstall = '' + rm -rf $out/lib/node_modules/protobuf-es/node_modules/@bufbuild + cp -rL node_modules/@bufbuild $out/lib/node_modules/protobuf-es/node_modules/ + ''; + passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/by-name/pr/protoc-gen-js/package.nix b/pkgs/by-name/pr/protoc-gen-js/package.nix index 78d03e9b2b7be..debf368cdf191 100644 --- a/pkgs/by-name/pr/protoc-gen-js/package.nix +++ b/pkgs/by-name/pr/protoc-gen-js/package.nix @@ -17,9 +17,9 @@ buildBazelPackage rec { removeRulesCC = false; removeLocalConfigCC = false; - LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; + LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool"; - fetchAttrs.sha256 = "sha256-WOBlZ0XNrl5UxIaSDxZeOfzS2a8ZkrKdTLKHBDC9UNQ="; + fetchAttrs.hash = "sha256-WOBlZ0XNrl5UxIaSDxZeOfzS2a8ZkrKdTLKHBDC9UNQ="; buildAttrs.installPhase = '' mkdir -p $out/bin diff --git a/pkgs/by-name/pr/protoc-go-inject-tag/package.nix b/pkgs/by-name/pr/protoc-go-inject-tag/package.nix index 4bb673449ea6f..cddd70559d912 100644 --- a/pkgs/by-name/pr/protoc-go-inject-tag/package.nix +++ b/pkgs/by-name/pr/protoc-go-inject-tag/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { owner = "favadi"; repo = "protoc-go-inject-tag"; rev = "v${version}"; - sha256 = "01jsrx83pygvjx3nzfnwvb2vn5gagl79m9i67v7cfg1lzz168spj"; + hash = "sha256-8mpkwv80PMfOPiammg596hW7xdrcum9Hl/v5O1DPWgY="; }; vendorHash = "sha256-tMpcJ37yGr7i91Kwz57FmJ+u2x0CAus0+yWOR10fJLo="; diff --git a/pkgs/by-name/pr/protols/package.nix b/pkgs/by-name/pr/protols/package.nix new file mode 100644 index 0000000000000..835b17603a259 --- /dev/null +++ b/pkgs/by-name/pr/protols/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "protols"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "coder3101"; + repo = "protols"; + rev = "refs/tags/${version}"; + hash = "sha256-2dP3papZsZxvpSfgGTdoRVSZTcOC0iHPBfMmlzB5iJQ="; + }; + + cargoHash = "sha256-94URDioPZXKSSFINTdPBYcES2eGCbhJ46tvcVRWt06o="; + + meta = { + description = "Protocol Buffers language server written in Rust"; + homepage = "https://github.com/coder3101/protols"; + changelog = "https://github.com/coder3101/protols/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nartsiss ]; + mainProgram = "protols"; + }; +} diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 1d31e09525995..81262e2cf0513 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-11"; + version = "GE-Proton9-15"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-OGsgR56R/MaFxahsb/42kA9CEexGDF/aTZlyf6v8tXo="; + hash = "sha256-WeqntQxez6XPRZxpPNUAQ8/7sw6TzOKU1yrtPHmQNh0="; }; outputs = [ diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index afcd0483eb60e..be85c54ffc17d 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.22.1"; + version = "1.23.0"; src = fetchurl { - url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb"; - hash = "sha256-DIA54xxJ8Nhh8wb4p13yjdenqgTgenAH4Tmbqk3IXwo="; + url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; + hash = "sha256-ewrPk3v1jgF87uY+7P8oQdWARcuFKdfiM1BzulMPBpg="; }; dontConfigure = true; diff --git a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix index 2b15e67908d42..3cb289b614269 100644 --- a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix +++ b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix @@ -62,17 +62,14 @@ stdenv.mkDerivation (finalAttrs: { sed -i "/add_subdirectory(bridge-gui-tester)/d" CMakeLists.txt ''; - preConfigure = '' - cmakeFlagsArray+=( - "-DCMAKE_BUILD_TYPE=Release" - "-DBRIDGE_APP_FULL_NAME=Proton Mail Bridge" - "-DBRIDGE_VENDOR=Proton AG" - "-DBRIDGE_REVISION=${finalAttrs.src.rev}" - "-DBRIDGE_TAG=${finalAttrs.version}" - "-DBRIDGE_BUILD_ENV=Nix" - "-DBRIDGE_APP_VERSION=${finalAttrs.version}" - ) - ''; + cmakeFlags = [ + "-DBRIDGE_APP_FULL_NAME=Proton Mail Bridge" + "-DBRIDGE_VENDOR=Proton AG" + "-DBRIDGE_REVISION=${finalAttrs.src.rev}" + "-DBRIDGE_TAG=${finalAttrs.version}" + "-DBRIDGE_BUILD_ENV=Nix" + "-DBRIDGE_APP_VERSION=${finalAttrs.version}" + ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 2d937677045d6..81866b4fd3a16 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/Proton.Mail-darwin-universal-${version}.zip" else "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/proton-mail_${version}_amd64.deb"; @@ -38,14 +38,16 @@ stdenv.mkDerivation rec { .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; - sourceRoot = lib.optionalString stdenv.isDarwin "."; + sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "."; dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ - makeWrapper - ] ++ lib.optional stdenv.isLinux dpkg ++ lib.optional stdenv.isDarwin unzip; + nativeBuildInputs = + [ + makeWrapper + ] + ++ lib.optional stdenv.hostPlatform.isLinux dpkg ++ lib.optional stdenv.hostPlatform.isDarwin unzip; installPhase = let @@ -65,12 +67,12 @@ stdenv.mkDerivation rec { '' runHook preInstall - ${if stdenv.isDarwin then darwin else linux} + ${if stdenv.hostPlatform.isDarwin then darwin else linux} runHook postInstall ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \ --add-flags $out/share/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix new file mode 100644 index 0000000000000..55e138ccfcd62 --- /dev/null +++ b/pkgs/by-name/pr/prow/package.nix @@ -0,0 +1,81 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, +}: + +buildGoModule rec { + pname = "prow"; + version = "0-unstable-2024-08-27"; + rev = "195f38540f39dd3ec95ca2d7086487ec19922e61"; + + src = fetchFromGitHub { + inherit rev; + + owner = "kubernetes-sigs"; + repo = "prow"; + hash = "sha256-/OhlJdxPa4rTuT7XIklx8vxprbENfasJYwiJxD4CeXY="; + }; + + vendorHash = "sha256-bJ0P/rHp+0zB/Dtp3F3n4AN3xF/A5qoq3lCQVBK+L4w="; + + # doCheck = false; + + subPackages = [ + "cmd/admission" + "cmd/branchprotector" + "cmd/checkconfig" + "cmd/clonerefs" + "cmd/cm2kc" + "cmd/config-bootstrapper" + "cmd/crier" + "cmd/deck" + "cmd/entrypoint" + "cmd/exporter" + "cmd/external-plugins" + "cmd/gangway" + "cmd/gcsupload" + "cmd/generic-autobumper" + "cmd/gerrit" + "cmd/ghproxy" + "cmd/hmac" + "cmd/hook" + "cmd/horologium" + "cmd/initupload" + "cmd/invitations-accepter" + "cmd/jenkins-operator" + "cmd/mkpj" + "cmd/mkpod" + "cmd/moonraker" + "cmd/peribolos" + "cmd/phony" + "cmd/pipeline" + "cmd/prow-controller-manager" + "cmd/sidecar" + "cmd/sinker" + "cmd/status-reconciler" + "cmd/sub" + "cmd/tackle" + "cmd/tide" + "cmd/tot" + "cmd/webhook-server" + ]; + + nativeCheckInputs = [ git ]; + + meta = { + description = "Kubernetes based CI/CD system developed to serve the Kubernetes community"; + longDescription = '' + Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various + types of events and report their status to many different services. In + addition to job execution, Prow provides GitHub automation in the form of + policy enforcement, chat-ops via /foo style commands, and automatic PR + merging. + ''; + homepage = "https://github.com/kubernetes-sigs/prow"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kalbasit ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/pr/prox/package.nix b/pkgs/by-name/pr/prox/package.nix index d1917e3766250..7f3713364196a 100644 --- a/pkgs/by-name/pr/prox/package.nix +++ b/pkgs/by-name/pr/prox/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "fgrosse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KSHTlcAmnuU8F17N0LBS0s5b/k6Of0OEHVd3v50bH3g="; + hash = "sha256-KSHTlcAmnuU8F17N0LBS0s5b/k6Of0OEHVd3v50bH3g="; }; vendorHash = "sha256-i4QJ84Tne1E8s2Fprd5xeWlTQBIb/9tvwws80yHXhbg="; diff --git a/pkgs/by-name/pr/proxsuite-nlp/package.nix b/pkgs/by-name/pr/proxsuite-nlp/package.nix new file mode 100644 index 0000000000000..194ff2fe967d8 --- /dev/null +++ b/pkgs/by-name/pr/proxsuite-nlp/package.nix @@ -0,0 +1,89 @@ +{ + cmake, + doxygen, + eigenrand, + example-robot-data, + fetchFromGitHub, + fetchpatch, + fmt, + fontconfig, + graphviz, + lib, + stdenv, + pinocchio, + pkg-config, + proxsuite, + python3Packages, + pythonSupport ? false, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "proxsuite-nlp"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "Simple-Robotics"; + repo = "proxsuite-nlp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Dy8+pPTv/B6vVdpGndVOV16WSLiENJfaIrn1+FYwcI0="; + }; + + outputs = [ + "out" + "doc" + ]; + + patches = [ + # Fix use of system jrl-cmakemodules + # This patch was merged upstream and can be removed on next release + (fetchpatch { + url = "https://github.com/Simple-Robotics/proxsuite-nlp/pull/109/commits/9bf741ce6010052a773071472891f42adc6cbbea.patch"; + hash = "sha256-sluMVrTw7EXLFa0dqkoZTkpGjKe7zODqIqbJxCdfSwY="; + }) + ]; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + pkg-config + ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; + checkInputs = [ eigenrand ] ++ lib.optional pythonSupport python3Packages.pytest; + propagatedBuildInputs = + [ + example-robot-data + fmt + ] + ++ lib.optionals pythonSupport [ + python3Packages.pinocchio + python3Packages.proxsuite + ] + ++ lib.optionals (!pythonSupport) [ + pinocchio + proxsuite + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "BUILD_WITH_PINOCCHIO_SUPPORT" true) + (lib.cmakeBool "BUILD_WITH_PROXSUITE_SUPPORT" true) + ]; + + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + # Fontconfig error: No writable cache directories + preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + + doCheck = true; + pythonImportsCheck = [ "proxsuite_nlp" ]; + + meta = { + description = "Primal-dual augmented Lagrangian solver for nonlinear programming on manifolds"; + homepage = "https://github.com/Simple-Robotics/proxsuite-nlp"; + changelog = "https://github.com/Simple-Robotics/proxsuite-nlp/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index dcaf8bc6f7f23..6aba0e20c76ed 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -3,10 +3,12 @@ stdenv, fetchFromGitHub, fetchpatch, - cereal, + cereal_1_3_2, cmake, doxygen, eigen, + fontconfig, + graphviz, jrl-cmakemodules, simde, matio, @@ -15,47 +17,24 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "proxsuite"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "simple-robotics"; repo = "proxsuite"; rev = "v${finalAttrs.version}"; - hash = "sha256-3kzFYADk3sCMU827KowilPlmOqgv69DJ3mOb7623Qdg="; + hash = "sha256-iKc55WDHArmmIM//Wir6FHrNV84HnEDcBUlwnsbtMME="; }; patches = [ - # Allow use of system jrl-cmakemodules - # This was merged upstream, and can be removed on next release + # Fix use of system cereal + # This was merged upstream and can be removed on next release (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite/pull/334/commits/2bcadd4993a9940c545136faa71bf1e97a972735.patch"; - hash = "sha256-BPtwogSwSXcEd5FM4eTTCq6LpGWvQ1SOCFmv/GVhl18="; - }) - # Allow use of system cereal - # This was merged upstream, and can be removed on next release - (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite/pull/334/commits/878337c6284c9fd73b19f1f80d5fa802def8cdc6.patch"; - hash = "sha256-+HWYHLGtygjlvjM+FSD9WFDIwO+qPLlzci+7q42bo0I="; - }) - # Allow use of system pybind11 - # upstream will move to nanobind for next release, so this can be dismissed - (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite/pull/337/commits/bbed9bdfb214da7c6c6909582971bd8b877f87c2.patch"; - hash = "sha256-pYikPZinjmk7gsagiaIcQspmGFYwlhdiKdZPnqo7pcQ="; + url = "https://github.com/Simple-Robotics/proxsuite/pull/352/commits/8305864f13ca7dff7210f89004a56652b71f8891.patch"; + hash = "sha256-XMS/zHFVrEp1P6aDlGrLbrcmuKq42+GdZRH9ObewNCY="; }) ]; - postPatch = '' - # discard failing tests for now - substituteInPlace test/CMakeLists.txt \ - --replace-fail "proxsuite_test(dense_maros_meszaros src/dense_maros_meszaros.cpp)" "" \ - --replace-fail "proxsuite_test(sparse_maros_meszaros src/sparse_maros_meszaros.cpp)" "" - - # fix CMake syntax - substituteInPlace bindings/python/CMakeLists.txt \ - --replace-fail "SYSTEM PRIVATE" "PRIVATE" - ''; - outputs = [ "doc" "out" @@ -76,9 +55,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake doxygen - ]; + graphviz + ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; propagatedBuildInputs = [ - cereal + cereal_1_3_2 eigen jrl-cmakemodules simde @@ -90,12 +70,20 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.scipy ]; + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + # Fontconfig error: No writable cache directories + preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + doCheck = true; + pythonImportsCheck = [ "proxsuite" ]; meta = { description = "The Advanced Proximal Optimization Toolbox"; homepage = "https://github.com/Simple-Robotics/proxsuite"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/pr/prr/package.nix b/pkgs/by-name/pr/prr/package.nix index 46576e1a18222..ba07cd6fe0c95 100644 --- a/pkgs/by-name/pr/prr/package.nix +++ b/pkgs/by-name/pr/prr/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-vCZjgmBYO+I6MZLCOMp50bWEeHwLbZsxSz5gRmBykvI="; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix index de604217cc942..922f5e5aa94fd 100644 --- a/pkgs/by-name/pr/prrte/package.nix +++ b/pkgs/by-name/pr/prrte/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "openpmix"; repo = "prrte"; rev = "v${version}"; - sha256 = "sha256-0JHtUpGFdPKmgUk0+MNxTfZIUDz/vY/CV+Mqbmv0JFw="; + hash = "sha256-0JHtUpGFdPKmgUk0+MNxTfZIUDz/vY/CV+Mqbmv0JFw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pt/pterm/package.nix b/pkgs/by-name/pt/pterm/package.nix index c0d96e44f124a..463a05ac06978 100644 --- a/pkgs/by-name/pt/pterm/package.nix +++ b/pkgs/by-name/pt/pterm/package.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sarcasticadmin ]; mainProgram = "pterm"; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/pu/pulsar/001-patch-wrapper.patch b/pkgs/by-name/pu/pulsar/001-patch-wrapper.patch deleted file mode 100644 index 2270ad3c8aea8..0000000000000 --- a/pkgs/by-name/pu/pulsar/001-patch-wrapper.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/resources/pulsar.sh 2023-03-16 04:11:14.000000000 +0100 -+++ b/resources/pulsar.sh 2023-03-24 14:37:13.468813964 +0100 -@@ -123,7 +123,7 @@ - elif [ $OS == 'Linux' ]; then - SCRIPT=$(readlink -f "$0") - -- PULSAR_PATH="/opt/Pulsar/pulsar" -+ # PULSAR_PATH is set-up via `wrapProgram` in the postFixup phase - - #Set tmpdir only if tmpdir is unset - : ${TMPDIR:=/tmp} diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index 1f7123e468b7c..83b1d4416a7fd 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -7,6 +7,7 @@ , alsa-lib , at-spi2-atk , cairo +, coreutils , cups , dbus , expat @@ -34,13 +35,13 @@ let pname = "pulsar"; - version = "1.120.0"; + version = "1.121.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-35/ZMi6YsXs27icV3kXuKl3Kl8IHLLYbV0aO49qMJ2Q="; + x86_64-linux.hash = "sha256-xouxKl4GTNZkT5wn8qbG2W2PbVAbsK9povmIL/Mikk4="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-N1CAWeBHePd2KnnePEJQnvIKfIxal1RQ5UB8pxpVJCk="; + aarch64-linux.hash = "sha256-qRBX8jO5xDXkZ/6TWkgNa1NS3l+z8K/JyJDAa/3me5Q="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); newLibpath = lib.makeLibraryPath [ @@ -86,10 +87,6 @@ stdenv.mkDerivation { inherit hash; }; - patches = [ - ./001-patch-wrapper.patch - ]; - nativeBuildInputs = [ wrapGAppsHook3 copyDesktopItems @@ -187,10 +184,11 @@ stdenv.mkDerivation { asar p $asarBundle $opt/resources/app.asar rm -rf $asarBundle - # We have patched the original wrapper, but now it needs the "PULSAR_PATH" env var + # Pulsar uses `PULSAR_PATH` to know where it is intalled mkdir -p $out/bin wrapProgram $opt/resources/pulsar.sh \ - --prefix "PULSAR_PATH" : "$opt/pulsar" + --suffix "PATH" : "${lib.makeBinPath [ coreutils ]}" \ + --set "PULSAR_PATH" "$opt" ln -s $opt/resources/pulsar.sh $out/bin/pulsar ln -s $opt/resources/app/ppm/bin/apm $out/bin/ppm @@ -230,7 +228,7 @@ stdenv.mkDerivation { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ bryango ]; + maintainers = with lib.maintainers; [ bryango pbsds ]; knownVulnerabilities = [ # electron 12.2.3, efforts are in place to bump it "CVE-2023-5217" diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix index 1249b31e8a1ce..b9fc15444e621 100644 --- a/pkgs/by-name/pu/pulumi-esc/package.nix +++ b/pkgs/by-name/pu/pulumi-esc/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "pulumi-esc"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "esc"; rev = "v${version}"; - hash = "sha256-9K7pP4MOShHPTxTuKaUMY87Z4rDkGHrV9Ds1guUpFqM="; + hash = "sha256-SeHO8N8NwAF4f6Eo46V2mBElVgJc5ijVrjsBHWtUMc0="; }; subPackages = "cmd/esc"; - vendorHash = "sha256-uVw8jc7dZOHdJt9uVDJGaJWkD7dz0rQ3W1pJXSrcW5w="; + vendorHash = "sha256-xJtlTyhGyoxefE2pFcLGHMapn9L2F/PKuNt49J41viE="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index 7ca133d9b9ddb..b89d472dfb7b4 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "pupdate"; - version = "3.12.0"; + version = "3.18.0"; src = fetchFromGitHub { owner = "mattpannella"; repo = "pupdate"; rev = "${version}"; - hash = "sha256-55tFnkF+zjvrGbG5AzBGc4nLqbPPMZ8+/muzav4dnsQ="; + hash = "sha256-GTdca47Jp/q1IpX1IAMZgOgHjBPNSotFSL9O6bfTfnM="; }; buildInputs = [ diff --git a/pkgs/by-name/pu/puppet-bolt/Gemfile.lock b/pkgs/by-name/pu/puppet-bolt/Gemfile.lock index a0156a8912e49..43c5bea6e0b7a 100644 --- a/pkgs/by-name/pu/puppet-bolt/Gemfile.lock +++ b/pkgs/by-name/pu/puppet-bolt/Gemfile.lock @@ -5,24 +5,24 @@ GEM base64 nkf rexml - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.899.0) - aws-sdk-core (3.191.4) + aws-partitions (1.968.0) + aws-sdk-core (3.201.5) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.444.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.8.0) + aws-sdk-ec2 (1.470.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - bigdecimal (3.1.7) + bigdecimal (3.1.8) bindata (2.5.0) - bolt (3.28.0) + bolt (3.30.0) CFPropertyList (>= 2.2) addressable (~> 2.5) aws-sdk-ec2 (~> 1) @@ -45,13 +45,13 @@ GEM terminal-table (~> 3.0) winrm (~> 2.0) winrm-fs (~> 1.3) - builder (3.2.4) + builder (3.3.0) colored2 (3.1.2) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - cri (2.15.11) + cri (2.15.12) deep_merge (1.2.2) - erubi (1.12.0) + erubi (1.13.0) facter (4.6.1) hocon (~> 1.3) thor (>= 1.0.1, < 2.0) @@ -73,16 +73,18 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fast_gettext (2.3.0) - ffi (1.16.3) + fast_gettext (2.4.0) + prime + ffi (1.17.0) forwardable (1.3.3) + getoptlong (0.2.1) gettext (3.4.9) erubi locale (>= 2.0.5) @@ -101,31 +103,33 @@ GEM hiera-eyaml (3.4.0) highline optimist - highline (3.0.1) + highline (3.1.0) + reline hocon (1.4.0) httpclient (2.8.3) + io-console (0.7.2) jmespath (1.6.2) jwt (2.7.1) little-plugger (1.1.4) locale (2.1.4) log4r (1.1.10) - logging (2.3.1) + logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) - minitar (0.9) + minitar (0.12.1) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.4.0) + multipart-post (2.4.1) net-http-persistent (4.0.2) connection_pool (~> 2.2) net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) - net-ssh (7.2.1) + net-ssh (7.2.3) net-ssh-krb (0.5.1) gssapi (~> 1.3.0) net-ssh (>= 2.0) nkf (0.2.0) - nori (2.7.0) + nori (2.7.1) bigdecimal optimist (3.1.0) orchestrator_client (0.7.0) @@ -134,12 +138,13 @@ GEM prime (0.1.2) forwardable singleton - public_suffix (5.0.4) - puppet (8.5.1) + public_suffix (6.0.1) + puppet (8.8.1) concurrent-ruby (~> 1.0) deep_merge (~> 1.0) facter (>= 4.3.0, < 5) - fast_gettext (>= 2.1, < 3) + fast_gettext (>= 2.1, < 4) + getoptlong (~> 0.2.0) locale (~> 2.1) multi_json (~> 1.13) puppet-resource_api (~> 1.5) @@ -158,7 +163,7 @@ GEM puppetfile-resolver (0.6.3) molinillo (~> 0.6) semantic_puppet (~> 1.0) - r10k (3.16.0) + r10k (3.16.2) colored2 (= 3.1.2) cri (>= 2.15.10) fast_gettext (>= 1.1.0, < 3.0.0) @@ -169,33 +174,39 @@ GEM minitar (~> 0.9) multi_json (~> 1.10) puppet_forge (>= 2.3.0, < 4.0.0) - racc (1.7.3) - rexml (3.2.6) + racc (1.8.1) + reline (0.5.9) + io-console (~> 0.5) + rexml (3.3.6) + strscan rgen (0.9.1) ruby2_keywords (0.0.5) ruby_smb (1.1.0) bindata rubyntlm windows_error - rubyntlm (0.6.3) + rubyntlm (0.6.5) + base64 rubyzip (2.3.2) scanf (1.0.0) semantic_puppet (1.1.0) singleton (0.2.0) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) text (1.3.1) thor (1.3.1) unicode-display_width (2.5.0) windows_error (0.1.5) - winrm (2.3.6) + winrm (2.3.9) builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) - nori (~> 2.0) + nori (~> 2.0, >= 2.7.1) + rexml (~> 3.0) rubyntlm (~> 0.6.0, >= 0.6.3) winrm-fs (1.3.5) erubi (~> 1.8) @@ -211,4 +222,4 @@ DEPENDENCIES bolt BUNDLED WITH - 2.5.6 + 2.5.16 diff --git a/pkgs/by-name/pu/puppet-bolt/gemset.nix b/pkgs/by-name/pu/puppet-bolt/gemset.nix index df8e2c3fb8ced..72746d92dc0d7 100644 --- a/pkgs/by-name/pu/puppet-bolt/gemset.nix +++ b/pkgs/by-name/pu/puppet-bolt/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; aws-eventstream = { groups = ["default"]; @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mydgvc5wn4adsic86907hzyfhgvzaq6nr394pnvk83ryv4zx77p"; + sha256 = "0m74rrlwv741wlp2imw5y93ybrzczx0r2jvcgp1v4zq299z3zy29"; type = "gem"; }; - version = "1.899.0"; + version = "1.968.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dlalj0pw6nfmmfqddjj8b5rv6lq1hqdq19im3s8fjq5ln5ij8lr"; + sha256 = "0l5c37gvarb3p3zsip1p9mpmir0zdccp0aibgx9cy61im4pwaj0q"; type = "gem"; }; - version = "3.191.4"; + version = "3.201.5"; }; aws-sdk-ec2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19gfcb07kvywx9ymdf80k4i3yc61h41cdxnygp7197h92ff4qxhv"; + sha256 = "0z7zk5z9zyqqljh8fxhq8ngp8pixbm85pa9ygpr0nmgdl2b1i7ff"; type = "gem"; }; - version = "1.444.0"; + version = "1.470.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -58,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; + sha256 = "0yf396fxashbqn0drbnvd9srxfg7w06v70q8kqpzi04zqchf6lvp"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.1"; }; base64 = { groups = ["default"]; @@ -78,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.8"; }; bindata = { groups = ["default"]; @@ -99,20 +99,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1abj694v2asrlzpr68shy3whf73ajk6626zqy6mhmyy8qmg8i19h"; + sha256 = "0krs4mmy1db531gyibhzaxmghb606yjmqqyfghvriy7b9sgi6bq8"; type = "gem"; }; - version = "3.28.0"; + version = "3.30.0"; }; builder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; }; CFPropertyList = { dependencies = ["base64" "nkf" "rexml"]; @@ -140,10 +140,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -160,10 +160,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bhsgnjav94mz5vf3305gxz1g34gm9kxvnrn1dkz530r8bpj0hr5"; + sha256 = "1rank6i9p2drwdcmhan6ifkzrz1v3mwpx47fwjl75rskxwjfkgwa"; type = "gem"; }; - version = "2.15.11"; + version = "2.15.12"; }; deep_merge = { groups = ["default"]; @@ -180,10 +180,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; facter = { dependencies = ["hocon" "thor"]; @@ -263,10 +263,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; faraday-net_http_persistent = { groups = ["default"]; @@ -320,24 +320,25 @@ version = "1.2.0"; }; fast_gettext = { + dependencies = ["prime"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "112gsrqah2w03kgi9mjsn6hl74mrwckphf223h36iayc4djf4lq2"; + sha256 = "1gsz2ywvnms7b4w7bs4dg7cykhgx7z74fa7xy0sbw45a0v2c89px"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; forwardable = { groups = ["default"]; @@ -349,6 +350,16 @@ }; version = "1.3.3"; }; + getoptlong = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx"; + type = "gem"; + }; + version = "0.2.1"; + }; gettext = { dependencies = ["erubi" "locale" "prime" "racc" "text"]; groups = ["default"]; @@ -405,14 +416,15 @@ version = "3.4.0"; }; highline = { + dependencies = ["reline"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02ghhvigqbq4252gsi4w8a9klkdkybmbz29ghfp1y6sqzlcb466a"; + sha256 = "1sxqnaz6wvkwbwzsipwsqcg1zw2kn67x7l362whv87zl5133w60l"; type = "gem"; }; - version = "3.0.1"; + version = "3.1.0"; }; hocon = { groups = ["default"]; @@ -434,6 +446,16 @@ }; version = "2.8.3"; }; + io-console = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h"; + type = "gem"; + }; + version = "0.7.2"; + }; jmespath = { groups = ["default"]; platforms = []; @@ -490,20 +512,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02"; + sha256 = "1jqcq2yxh973f3aw63nd3wxhqyhkncz3pf8v2gs3df0iqair725s"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; minitar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13"; + sha256 = "0f307mpj4j0gp7iq77xj4p149f4krcvbll9rismng3jcijpbn79s"; type = "gem"; }; - version = "0.9"; + version = "0.12.1"; }; molinillo = { groups = ["default"]; @@ -530,10 +552,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1033p35166d9p97y4vajbbvr13pmkk9zwn7sylxpmk9jrpk8ri67"; + sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; net-http-persistent = { dependencies = ["connection_pool"]; @@ -562,10 +584,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; + sha256 = "0sqbq5aks9xxnldbd2hy20ypnd59zcra98ql0r7jjc26s5rgc18n"; type = "gem"; }; - version = "7.2.1"; + version = "7.2.3"; }; net-ssh-krb = { dependencies = ["gssapi" "net-ssh"]; @@ -594,10 +616,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql"; + sha256 = "0qb84bbi74q0zgs09sdkq750jf2ri3lblbry0xi4g1ard4rwsrk1"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; optimist = { groups = ["default"]; @@ -636,21 +658,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.4"; + version = "6.0.1"; }; puppet = { - dependencies = ["concurrent-ruby" "deep_merge" "facter" "fast_gettext" "locale" "multi_json" "puppet-resource_api" "scanf" "semantic_puppet"]; + dependencies = ["concurrent-ruby" "deep_merge" "facter" "fast_gettext" "getoptlong" "locale" "multi_json" "puppet-resource_api" "scanf" "semantic_puppet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dhax5d40c03n0lffy10mvs0c3mgfqq1dsc3gb5ihgb2l1sbs0a7"; + sha256 = "0v2jqkan3nidifxdlpm7lk0ih5s8khl9ps0nz62wj3zlywck0wsi"; type = "gem"; }; - version = "8.5.1"; + version = "8.8.1"; }; puppet-resource_api = { dependencies = ["hocon"]; @@ -702,30 +724,42 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "198bar06xqap19j9y831j98ahd3w4ky2k0klwaa39sa1p6fpcjdi"; + sha256 = "1f9fwfmr44lbnx31fdiabm7sb41nsbf10awm96zl79clp8kafxcp"; type = "gem"; }; - version = "3.16.0"; + version = "3.16.2"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; + type = "gem"; + }; + version = "1.8.1"; + }; + reline = { + dependencies = ["io-console"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y6kyz7kcilwdpfy3saqfgnar38vr5ys9sp40ndffy6h1znxfbax"; type = "gem"; }; - version = "1.7.3"; + version = "0.5.9"; }; rexml = { + dependencies = ["strscan"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "1ik3in0957l9s6iwdm3nsk4za072cj27riiqgpx6zzcd22flbw3s"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.6"; }; rgen = { groups = ["default"]; @@ -759,14 +793,15 @@ version = "1.1.0"; }; rubyntlm = { + dependencies = ["base64"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + sha256 = "1x8l0d1v88m40mby4jvgal46137cv8gga2lk7zlrxqlsp41380a7"; type = "gem"; }; - version = "0.6.3"; + version = "0.6.5"; }; rubyzip = { groups = ["default"]; @@ -808,6 +843,16 @@ }; version = "0.2.0"; }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + type = "gem"; + }; + version = "3.1.0"; + }; terminal-table = { dependencies = ["unicode-display_width"]; groups = ["default"]; @@ -860,15 +905,15 @@ version = "0.1.5"; }; winrm = { - dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; + dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rexml" "rubyntlm"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; + sha256 = "01jxpshw5kx5ha21ymaaj14vibv5bvm0dd80ccc6xl3jaxy7cszg"; type = "gem"; }; - version = "2.3.6"; + version = "2.3.9"; }; winrm-fs = { dependencies = ["erubi" "logging" "rubyzip" "winrm"]; diff --git a/pkgs/applications/networking/cluster/pv-migrate/default.nix b/pkgs/by-name/pv/pv-migrate/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/pv-migrate/default.nix rename to pkgs/by-name/pv/pv-migrate/package.nix diff --git a/pkgs/by-name/pw/pwndbg/package.nix b/pkgs/by-name/pw/pwndbg/package.nix index bad009b07ab2f..5c612e7bfaa96 100644 --- a/pkgs/by-name/pw/pwndbg/package.nix +++ b/pkgs/by-name/pw/pwndbg/package.nix @@ -12,7 +12,7 @@ let binPath = lib.makeBinPath ([ python3.pkgs.pwntools # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/wrappers/checksec.py#L8 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ python3.pkgs.ropper # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/ropper.py#L30 python3.pkgs.ropgadget # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32 ]); @@ -64,6 +64,6 @@ stdenv.mkDerivation { platforms = platforms.all; maintainers = with maintainers; [ mic92 patryk4815 msanft ]; # not supported on aarch64-darwin see: https://inbox.sourceware.org/gdb/3185c3b8-8a91-4beb-a5d5-9db6afb93713@Spark/ - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/pw/pwru/package.nix b/pkgs/by-name/pw/pwru/package.nix index f4d601ca9654d..1b83c51649a43 100644 --- a/pkgs/by-name/pw/pwru/package.nix +++ b/pkgs/by-name/pw/pwru/package.nix @@ -1,19 +1,19 @@ { lib -, buildGoModule +, buildGo123Module , fetchFromGitHub , clang , libpcap }: -buildGoModule rec { +buildGo123Module rec { pname = "pwru"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "cilium"; repo = "pwru"; rev = "v${version}"; - hash = "sha256-BjiFuM06YDlPyB578p2hweBay+4z0bOn7fUoxSvrDY8="; + hash = "sha256-HK8t+IaeFLuyqUTuVSShbO426uaFyZcr+jZyz0wo4jw="; }; vendorHash = null; diff --git a/pkgs/by-name/py/pybibget/package.nix b/pkgs/by-name/py/pybibget/package.nix index a3f8febc7d07b..c57d74bf5d2d3 100644 --- a/pkgs/by-name/py/pybibget/package.nix +++ b/pkgs/by-name/py/pybibget/package.nix @@ -9,7 +9,7 @@ let src = fetchPypi { inherit pname version; - sha256 = "1n4as3kdsgrcmxxyjz9klm0v0pb24rsa1b7r43j7wmnfsir8i81k"; + hash = "sha256-M6CIctTOVn7kIPmsoHQmYl2wQaUzfel7ryw/3ebQitg="; }; in diff --git a/pkgs/by-name/py/pylyzer/Cargo.lock b/pkgs/by-name/py/pylyzer/Cargo.lock index e8e4f697e5311..89f9d2e69d9b5 100644 --- a/pkgs/by-name/py/pylyzer/Cargo.lock +++ b/pkgs/by-name/py/pylyzer/Cargo.lock @@ -10,18 +10,18 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" @@ -37,29 +37,29 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets", ] [[package]] @@ -99,9 +99,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.1.12" +version = "1.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" dependencies = [ "shlex", ] @@ -134,7 +134,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.74", + "syn 2.0.79", ] [[package]] @@ -145,9 +145,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "els" -version = "0.1.54-nightly.5" +version = "0.1.58-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc6282121d9e2871553e0731cfb88119cbfe76ce8aab08ac2be01f5644e3bee" +checksum = "eed2c90d92d8be15be9e928f06d34e0cfe03c8c10e6351326859cecf3789dcac" dependencies = [ "erg_common", "erg_compiler", @@ -159,21 +159,22 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.42-nightly.5" +version = "0.6.46-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0dfc622cc65f230a05a284a21f62c8f4a3c964c51c97881cc4e01202ef2a3c0" +checksum = "4758c25017a49a7f3d8cb3287360deae39c696936a6747cf9e3d9f81cb94c010" dependencies = [ "backtrace-on-stack-overflow", "erg_proc_macros", "parking_lot", "thread_local", + "w-boson", ] [[package]] name = "erg_compiler" -version = "0.6.42-nightly.5" +version = "0.6.46-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42247c4ab1eb33ed3e2e9e74f4773565eba4491f76bfbda4b965015938704ca1" +checksum = "8c5c7fad1c74774dcbc293b79bb62a024135fcde4faf13411a3490761cb71a98" dependencies = [ "erg_common", "erg_parser", @@ -181,9 +182,9 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.42-nightly.5" +version = "0.6.46-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c921c178517c2071e45418e8c5b35e0c3a19021e4459283fd8f6997b89ba216" +checksum = "c564e2914429af720277cb61256362762790da8c635558f77c4d6ae4c3a64f3a" dependencies = [ "erg_common", "erg_proc_macros", @@ -192,9 +193,9 @@ dependencies = [ [[package]] name = "erg_proc_macros" -version = "0.6.42-nightly.5" +version = "0.6.46-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1381ca7a7a0781834cb1d617cd8361cca23f880cb9c515d249905d585832734" +checksum = "3fac38f9d18406130093186708186dad6f59efc04b0eddc0a8d0364be9361a90" dependencies = [ "quote", "syn 1.0.109", @@ -231,9 +232,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "hashbrown" @@ -263,7 +264,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.79", ] [[package]] @@ -289,9 +290,9 @@ checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" [[package]] name = "libc" -version = "0.2.156" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libm" @@ -330,9 +331,9 @@ dependencies = [ [[package]] name = "malachite" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6ea071913d15f7e0566bc4768aae3918906ea77f0abbb387ca7c0dc9303f90" +checksum = "5616515d632967cd329b6f6db96be9a03ea0b3a49cdbc45b0016803dad8a77b7" dependencies = [ "malachite-base", "malachite-nz", @@ -341,9 +342,9 @@ dependencies = [ [[package]] name = "malachite-base" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c817c713ff9f16e06cfdc23baa3fecf1b71eaaac714816a98a560f4e350aa6" +checksum = "46059721011b0458b7bd6d9179be5d0b60294281c23320c207adceaecc54d13b" dependencies = [ "hashbrown", "itertools", @@ -366,9 +367,9 @@ dependencies = [ [[package]] name = "malachite-nz" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "603729facf62429736ac17a9fc9fe1bf7e0eb8bde3da3b18cc2b6153150464d5" +checksum = "1503b27e825cabd1c3d0ff1e95a39fb2ec9eab6fd3da6cfa41aec7091d273e78" dependencies = [ "itertools", "libm", @@ -377,9 +378,9 @@ dependencies = [ [[package]] name = "malachite-q" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73844ccbf0e9baaf34d4a6d187f0d6a925ce8e74ef37a67d238e7d65529b38c" +checksum = "a475503a70a3679dbe3b9b230a23622516742528ba614a7b2490f180ea9cb514" dependencies = [ "itertools", "malachite-base", @@ -403,11 +404,11 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] @@ -454,18 +455,21 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "parking_lot" @@ -540,6 +544,12 @@ dependencies = [ "siphasher", ] +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + [[package]] name = "ppv-lite86" version = "0.2.20" @@ -560,7 +570,7 @@ dependencies = [ [[package]] name = "py2erg" -version = "0.0.61" +version = "0.0.64" dependencies = [ "erg_common", "erg_compiler", @@ -570,7 +580,7 @@ dependencies = [ [[package]] name = "pylyzer" -version = "0.0.61" +version = "0.0.64" dependencies = [ "els", "erg_common", @@ -580,7 +590,7 @@ dependencies = [ [[package]] name = "pylyzer_core" -version = "0.0.61" +version = "0.0.64" dependencies = [ "erg_common", "erg_compiler", @@ -591,7 +601,7 @@ dependencies = [ [[package]] name = "pylyzer_wasm" -version = "0.0.61" +version = "0.0.64" dependencies = [ "erg_common", "erg_compiler", @@ -601,9 +611,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -640,9 +650,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -661,9 +671,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] @@ -741,29 +751,29 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.79", ] [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -779,7 +789,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.79", ] [[package]] @@ -819,9 +829,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.74" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -916,42 +926,42 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unicode_names2" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677" +checksum = "d1673eca9782c84de5f81b82e4109dcfb3611c8ba0d52930ec4a9478f547b2dd" dependencies = [ "phf", "unicode_names2_generator", @@ -959,9 +969,9 @@ dependencies = [ [[package]] name = "unicode_names2_generator" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f444b8bba042fe3c1251ffaca35c603f2dc2ccc08d595c65a8c4f76f3e8426c0" +checksum = "b91e5b84611016120197efd7dc93ef76774f4e084cd73c9fb3ea4a86c570c56e" dependencies = [ "getopts", "log", @@ -987,6 +997,15 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "w-boson" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df84793b18c52e3ee62d71ba13278004205c84641c1646f367fb583ef5f3510a" +dependencies = [ + "windows", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -1015,7 +1034,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -1037,7 +1056,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1048,6 +1067,70 @@ version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core", + "windows-targets", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -1130,5 +1213,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.79", ] diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 0aa0865c97da8..dd6d8de012b08 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -10,19 +10,18 @@ darwin, which, nix-update-script, - testers, - pylyzer, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.61"; + version = "0.0.64"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-t0BzNNofjeBlNqf6iqaWrTzVpzEACyyrZ3YKDYz713U="; + hash = "sha256-ShH394FgmuDrArIvz+okVJKWffVVFhsuVWaWFquW2GU="; }; cargoLock = { @@ -36,9 +35,11 @@ rustPlatform.buildRustPackage rec { git python3 makeWrapper - ] ++ lib.optionals stdenv.isDarwin [ (writeScriptBin "diskutil" "") ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (writeScriptBin "diskutil" "") ]; - buildInputs = [ python3 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ + python3 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; preBuild = '' export HOME=$TMPDIR @@ -61,9 +62,14 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/pylyzer --set ERG_PATH $out/lib/erg ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = pylyzer; }; }; meta = { diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix new file mode 100644 index 0000000000000..4c1077dd7571d --- /dev/null +++ b/pkgs/by-name/py/pyradio/package.nix @@ -0,0 +1,53 @@ +{ lib +, python3Packages +, fetchFromGitHub +, installShellFiles +}: + +python3Packages.buildPythonApplication rec { + pname = "pyradio"; + version = "0.9.3.11"; + + src = fetchFromGitHub { + owner = "coderholic"; + repo = "pyradio"; + rev = "refs/tags/${version}"; + hash = "sha256-JvvnzIA5xhHgH87g0j60Ul0FHGhA88knsEFf1n2MQ84="; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + propagatedBuildInputs = with python3Packages; [ + dnspython + netifaces + psutil + python-dateutil + requests + rich + ]; + + postPatch = '' + # Disable update check + substituteInPlace pyradio/config \ + --replace-fail "distro = None" "distro = NixOS" + ''; + + checkPhase = '' + $out/bin/pyradio --help + ''; + + postInstall = '' + installManPage *.1 + ''; + + meta = with lib; { + homepage = "http://www.coderholic.com/pyradio/"; + description = "Curses based internet radio player"; + mainProgram = "pyradio"; + changelog = "https://github.com/coderholic/pyradio/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ contrun yayayayaka ]; + }; +} diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index b520b2e502b00..6a515a4d72ca6 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.378"; + version = "1.1.382"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-GFrVnMGYR57IKUybAuVyriwgOLfPBwf7H9NjJNvsTNE="; + hash = "sha256-/qmDCx1bkqCF/4T3jNz2xiUYwnVYw5IOguRW8DYVQZg="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-Osz5c0HeJG1CgGiLuNUfIc5jvpY35a+y496JMt3FD+I="; + npmDepsHash = "sha256-zITMHDiZTEbRy/1aqeCrnr9NaO1IUZ1enDw4LXjUjxs="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-XvswAKYGRoydha+areiXfGN6nXQObQmOWKp49Rhmbv0="; + npmDepsHash = "sha256-Ibeg9LgqUhxCgnNryk8ZYu4wNOmVbFHz8ZklNH6msoM="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix index fd1206a9fd050..cba36667a2397 100644 --- a/pkgs/by-name/py/pyspread/package.nix +++ b/pkgs/by-name/py/pyspread/package.nix @@ -9,10 +9,10 @@ let # get rid of rec pname = "pyspread"; - version = "2.2.3"; + version = "2.3"; src = fetchPypi { inherit pname version; - hash = "sha256-oNMDDXpl6Y0N7j+qgboSTJA9SR5KzKxhoMh/44ngjdA="; + hash = "sha256-vbDZo/kYtnxmOd3JSEG9+0yD0nfM/BGcAySfBD2xogw="; }; inherit (libsForQt5) qtsvg diff --git a/pkgs/by-name/py/pysqlrecon/package.nix b/pkgs/by-name/py/pysqlrecon/package.nix index 32c98e42fdd62..664c6b7c88e8f 100644 --- a/pkgs/by-name/py/pysqlrecon/package.nix +++ b/pkgs/by-name/py/pysqlrecon/package.nix @@ -1,31 +1,32 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "pysqlrecon"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Tw1sm"; repo = "PySQLRecon"; rev = "refs/tags/v${version}"; - hash = "sha256-AJCvGpOjnh5ih5HrrpI+x0zyB7P6rMGL70707UunhEM="; + hash = "sha256-+pme4uOgsh6iZEL73PaR1Y55r+Z/SPEVD2QWBsnMsNs="; }; pythonRelaxDeps = [ + "impacket" "rich" "typer" ]; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; propagatedBuildInputs = with python3.pkgs; [ impacket + pycryptodome rich typer ]; @@ -33,9 +34,7 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "pysqlrecon" - ]; + pythonImportsCheck = [ "pysqlrecon" ]; meta = with lib; { description = "Offensive MSSQL toolkit"; diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix index 0afe8ad3bc442..4e6d13cd7189c 100644 --- a/pkgs/by-name/py/pytr/package.nix +++ b/pkgs/by-name/py/pytr/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "pytr"; - version = "0.2.2"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "pytr-org"; repo = "pytr"; - rev = "refs/tags/${version}"; - hash = "sha256-0ekUpkuyT0TB2YQi7CUMwosLI2tR0owJE2XQBaiy8Iw="; + rev = "refs/tags/v${version}"; + hash = "sha256-9FKG4QgRBU+DaaYJIDMDqqxFMCAguv5iRUUrQr6RMz8="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/py/pyxel/package.nix b/pkgs/by-name/py/pyxel/package.nix index 23a7836164e4d..1103dbba46199 100644 --- a/pkgs/by-name/py/pyxel/package.nix +++ b/pkgs/by-name/py/pyxel/package.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ SDL2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.IOKit ]; diff --git a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix index 261b729d49226..7b73e1f660c91 100644 --- a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix +++ b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qbittorrent-enhanced"; - version = "4.6.6.10"; + version = "4.6.7.10"; src = fetchFromGitHub { owner = "c0re100"; repo = "qBittorrent-Enhanced-Edition"; rev = "release-${version}"; - hash = "sha256-mmM/1eU8FTWAciq2rh7fRa96fOkovMk4ScoehnqHdIQ="; + hash = "sha256-Mr376nH2pE6NMF9IdDhZULwqkRr7472OZnKO86hb6ZI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix index 5105e6c30a1ca..736a6e09c1b2a 100644 --- a/pkgs/by-name/qd/qdiskinfo/package.nix +++ b/pkgs/by-name/qd/qdiskinfo/package.nix @@ -29,8 +29,9 @@ stdenv.mkDerivation (finalAttrs: { smartmontools ]; + cmakeBuildType = "MinSizeRel"; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE:STRING=MinSizeRel" "-DQT_VERSION_MAJOR=6" ]; diff --git a/pkgs/by-name/qd/qdrant-web-ui/package.nix b/pkgs/by-name/qd/qdrant-web-ui/package.nix index c9bfd482fd79d..a2f630a51f65d 100644 --- a/pkgs/by-name/qd/qdrant-web-ui/package.nix +++ b/pkgs/by-name/qd/qdrant-web-ui/package.nix @@ -5,16 +5,16 @@ }: buildNpmPackage rec { pname = "qdrant-web-ui"; - version = "0.1.30"; + version = "0.1.31"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant-web-ui"; rev = "refs/tags/v${version}"; - hash = "sha256-bHE/ZBc1PvjnIXhkh9BFS0x3Urnh4LOHH4MoKgqVVJ4="; + hash = "sha256-NNX//0ZkXYMaP14TI4BLMQI4jN+Mxc7uZu4rDZTXHG8="; }; - npmDepsHash = "sha256-3w3imfe9XbK3eSh6kOd2G/ei75+Ub08L/hBej1iy9R4="; + npmDepsHash = "sha256-ZCHsVIbtnfrksBmXbYkZLv4WH+DBNazHCOtsgi+PKPc="; npmBuildScript = "build-qdrant"; diff --git a/pkgs/by-name/qg/qgrep/package.nix b/pkgs/by-name/qg/qgrep/package.nix index 57c3d20db2836..f485aa0d9147e 100644 --- a/pkgs/by-name/qg/qgrep/package.nix +++ b/pkgs/by-name/qg/qgrep/package.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.CoreFoundation ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=unused-command-line-argument" "-Wno-error=unqualified-std-cast-call" ]); diff --git a/pkgs/by-name/qg/qgroundcontrol/package.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix new file mode 100644 index 0000000000000..b27e6bb51b4ac --- /dev/null +++ b/pkgs/by-name/qg/qgroundcontrol/package.nix @@ -0,0 +1,106 @@ +{ + lib, + stdenv, + fetchFromGitHub, + SDL2, + libsForQt5, + gst_all_1, + wayland, + pkg-config, +}: + +stdenv.mkDerivation rec { + pname = "qgroundcontrol"; + version = "4.4.2"; + + propagatedBuildInputs = with libsForQt5; [ + qtbase + qtcharts + qtlocation + qtserialport + qtsvg + qtquickcontrols2 + qtgraphicaleffects + qtspeech + qtx11extras + ]; + + gstInputs = with gst_all_1; [ + gstreamer + gst-plugins-base + (gst-plugins-good.override { qt5Support = true; }) + gst-plugins-bad + gst-libav + wayland + ]; + + buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs; + nativeBuildInputs = + [ pkg-config ] + ++ (with libsForQt5; [ + qmake + qttools + wrapQtAppsHook + ]); + + preConfigure = '' + mkdir build + cd build + ''; + + qmakeFlags = [ + "CONFIG+=StableBuild" + # Default install tries to copy Qt files into package + "CONFIG+=QGC_DISABLE_BUILD_SETUP" + # Tries to download x86_64-only prebuilt binaries + "DEFINES+=DISABLE_AIRMAP" + "../qgroundcontrol.pro" + ]; + + installPhase = '' + runHook preInstall + + cd .. + + mkdir -p $out/share/applications + sed 's/Exec=.*$/Exec=QGroundControl/g' --in-place deploy/qgroundcontrol.desktop + cp -v deploy/qgroundcontrol.desktop $out/share/applications + + mkdir -p $out/bin + cp -v build/staging/QGroundControl "$out/bin/" + + mkdir -p $out/share/qgroundcontrol + cp -rv resources/ $out/share/qgroundcontrol + + mkdir -p $out/share/pixmaps + cp -v resources/icons/qgroundcontrol.png $out/share/pixmaps + + runHook postInstall + ''; + + postInstall = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + # TODO: package mavlink so we can build from a normal source tarball + src = fetchFromGitHub { + owner = "mavlink"; + repo = "qgroundcontrol"; + rev = "v${version}"; + hash = "sha256-2Bc4uC/2e+PTsvFZ4RjnTzkOiBO9vsYHeLPkcwpDRrg="; + fetchSubmodules = true; + }; + + meta = { + description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; + homepage = "https://qgroundcontrol.com/"; + changelog = "https://github.com/mavlink/qgroundcontrol/blob/master/ChangeLog.md"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + lopsided98 + pandapip1 + ]; + mainProgram = "QGroundControl"; + }; +} diff --git a/pkgs/by-name/qg/qgv/package.nix b/pkgs/by-name/qg/qgv/package.nix new file mode 100644 index 0000000000000..d9ab3c7fc437a --- /dev/null +++ b/pkgs/by-name/qg/qgv/package.nix @@ -0,0 +1,44 @@ +{ + cmake, + fetchFromGitHub, + graphviz, + jrl-cmakemodules, + lib, + libsForQt5, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qgv"; + version = "1.3.5"; + + src = fetchFromGitHub { + owner = "gepetto"; + repo = "qgv"; + rev = "v${finalAttrs.version}"; + hash = "sha256-NUMCVqXw7euwxm4vISU8qYFfvV5HbAJsj/IjyxEjCPw="; + }; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qttools + ]; + + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; + + propagatedBuildInputs = [ + graphviz + jrl-cmakemodules + ]; + + meta = { + description = "Interactive Qt graphViz display"; + homepage = "https://github.com/gepetto/qgv"; + license = lib.licenses.lgpl3Only; + maintainers = [ lib.maintainers.nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/qm/qmqtt/package.nix b/pkgs/by-name/qm/qmqtt/package.nix new file mode 100644 index 0000000000000..6ccf272f61e26 --- /dev/null +++ b/pkgs/by-name/qm/qmqtt/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qt5 +}: + +stdenv.mkDerivation rec { + pname = "qmqtt"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "emqx"; + repo = "qmqtt"; + rev = "v${version}"; + hash = "sha256-JLGwEF5e/IKzPzCQBzB710REGWbc/MW+r5AHmyYUkUI="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + qt5.qtbase + ]; + + meta = with lib; { + description = "MQTT client for Qt"; + homepage = "https://github.com/emqx/qmqtt"; + license = licenses.epl10; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix index 0167146e57853..6615c4133f8af 100644 --- a/pkgs/by-name/qq/qq/package.nix +++ b/pkgs/by-name/qq/qq/package.nix @@ -87,8 +87,8 @@ stdenv.mkDerivation { makeShellWrapper $out/opt/QQ/qq $out/bin/qq \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libuuid]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libuuid ]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ "''${gappsWrapperArgs[@]}" diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index 8621a5af53089..f3783a8ba5113 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-08-10 +# Last updated: 2024-09-28 { - version = "3.2.12"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240808_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240808_arm64_01.deb"; - arm64_hash = "sha256-fx1+CNabeWNCRHzYh/nRnnBeFt5WyrMBIfzuw7e/CTc="; - amd64_hash = "sha256-gzoM8xq51iUwzHWirXLd7LPMPQ36KxOyp0iS6az3y6E="; + version = "3.2.12-2024.9.27"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240927_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240927_arm64_01.deb"; + arm64_hash = "sha256-VfM+p2cTNkDZc7sTftfTuRSMKVWwE6TerW25pA1MIR0="; + amd64_hash = "sha256-xBGSSxXDu+qUwj203i3iAkfI97iLtGOuGMGfEU6kCyQ="; } diff --git a/pkgs/by-name/qq/qq/update.sh b/pkgs/by-name/qq/qq/update.sh index 777ea2a90103a..fd6658a8177f5 100755 --- a/pkgs/by-name/qq/qq/update.sh +++ b/pkgs/by-name/qq/qq/update.sh @@ -9,7 +9,7 @@ payload=$(curl https://im.qq.com/rainbow/linuxQQDownload | grep -oP "var params= amd64_url=$(jq -r .x64DownloadUrl.deb <<< "$payload") arm64_url=$(jq -r .armDownloadUrl.deb <<< "$payload") -version=$(grep -oP "(?<=/QQ_).*(?=_[0-9]{6})" <<< "$amd64_url") +version=$(jq -r .version <<< "$payload")-$(jq -r .updateDate <<< "$payload") amd64_hash=$(nix-prefetch-url $amd64_url) arm64_hash=$(nix-prefetch-url $arm64_url) diff --git a/pkgs/development/libraries/qrcodegen/default.nix b/pkgs/by-name/qr/qrcodegen/package.nix similarity index 100% rename from pkgs/development/libraries/qrcodegen/default.nix rename to pkgs/by-name/qr/qrcodegen/package.nix diff --git a/pkgs/by-name/qr/qrcp/package.nix b/pkgs/by-name/qr/qrcp/package.nix new file mode 100644 index 0000000000000..748412e17cba6 --- /dev/null +++ b/pkgs/by-name/qr/qrcp/package.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "qrcp"; + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "claudiodangelis"; + repo = "qrcp"; + rev = version; + hash = "sha256-MmWBcDtZUDX5IV7XXifBp7KfeRh+0qU4vdfCoMv/UNk="; + }; + + vendorHash = "sha256-lqGPPyoSO12MyeYIuYcqDVHukj7oR3zmHgsS6SxY3yo="; + + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" "-X github.com/claudiodangelis/qrcp/version.version=${version}" ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd qrcp \ + --bash <($out/bin/qrcp completion bash) \ + --fish <($out/bin/qrcp completion fish) \ + --zsh <($out/bin/qrcp completion zsh) + ''; + + meta = { + homepage = "https://qrcp.sh/"; + description = "Transfer files over wifi by scanning a QR code from your terminal"; + longDescription = '' + qrcp binds a web server to the address of your Wi-Fi network + interface on a random port and creates a handler for it. The default + handler serves the content and exits the program when the transfer is + complete. + ''; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fgaz ]; + mainProgram = "qrcp"; + }; +} diff --git a/pkgs/by-name/qr/qrq/package.nix b/pkgs/by-name/qr/qrq/package.nix new file mode 100644 index 0000000000000..47113716ab8e5 --- /dev/null +++ b/pkgs/by-name/qr/qrq/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + ncurses, + pulseaudio, +}: + +stdenv.mkDerivation rec { + pname = "qrq"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "dj1yfk"; + repo = "qrq"; + rev = "qrq-${version}"; + hash = "sha256-uuETGbv5qm0Z+45+kK66SBHhQ0Puu6I5z+TWIh3iR2g="; + }; + + buildInputs = [ + ncurses + pulseaudio + ]; + + makeFlags = [ + "BUILD_INFO=nix" + "DESTDIR=${builtins.placeholder "out"}" + ]; + + postPatch = '' + substituteInPlace src/qrq.c \ + --replace-fail '[80]' '[4000]' \ + --replace-fail '80,' '4000,' + ''; + + meta = { + description = "High Speed Morse trainer - mirror of https://git.fkurz.net/dj1yfk/qrq"; + homepage = "https://github.com/dj1yfk/qrq"; + changelog = "https://github.com/dj1yfk/qrq/blob/${src.rev}/ChangeLog"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ pkharvey ]; + mainProgram = "qrq"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/qr/qrrs/package.nix b/pkgs/by-name/qr/qrrs/package.nix index c995bf5a6b9a1..4b43473a3cf2f 100644 --- a/pkgs/by-name/qr/qrrs/package.nix +++ b/pkgs/by-name/qr/qrrs/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { owner = "lenivaya"; repo = "qrrs"; rev = "v${version}"; - sha256 = "sha256-L8sqvLbh85b8Ds9EvXNkyGVXm8BF3ejFd8ZH7QoxJdU="; + hash = "sha256-L8sqvLbh85b8Ds9EvXNkyGVXm8BF3ejFd8ZH7QoxJdU="; }; cargoHash = "sha256-RLxQ7tG5e3q4vqYJU0eNvvcEnnyNc9R9at0/ACLYJiY="; diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index 8748c58c376b5..1743b5e511d09 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitLab, + fetchFromGitHub, rustPlatform, asciidoctor, installShellFiles, @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; - version = "0.11.4"; + version = "0.11.5"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - hash = "sha256-lD/xi2k5baZGUUixy/032jTBevr0uQIT/JmX+d+kPyA="; + hash = "sha256-2Msc8VTEzpK5eQHxJxNekj6YSqFRX/DN206hvYshiOg="; }; - cargoHash = "sha256-lR/LusIgdA+G7YeSLHjxdcC96tOSqSyalVamS42ORs0="; + cargoHash = "sha256-wBEimPiht7VN3lQfPlflrG2L47bfNnipK/JmurKqHrg="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix index ba0280c19bd8e..c59ad323f86bb 100644 --- a/pkgs/by-name/qs/qsv/package.nix +++ b/pkgs/by-name/qs/qsv/package.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage { sqlite zstd ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit diff --git a/pkgs/by-name/qt/qtalarm/package.nix b/pkgs/by-name/qt/qtalarm/package.nix new file mode 100644 index 0000000000000..457e6d1659c02 --- /dev/null +++ b/pkgs/by-name/qt/qtalarm/package.nix @@ -0,0 +1,81 @@ +{ + stdenv, + lib, + fetchFromGitHub, + libsForQt5, + qt5, + makeDesktopItem, + nix-update-script, + copyDesktopItems, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qtalarm"; + version = "2.5.1"; + + src = fetchFromGitHub { + owner = "CountMurphy"; + repo = "QTalarm"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-87w5YFQ9olLnCfPF04jOnIMn1NtE2M2n5WZX4e69UGU="; + }; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qtmultimedia + ]; + + installPhase = + '' + runHook preInstall + '' + + ( + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/Applications + mv qtalarm.app $out/Applications + '' + else + '' + install -Dm755 qtalarm -t $out/bin + install -Dm644 Icons/1349069370_Alarm_Clock.png $out/share/icons/hicolor/48x48/apps/qtalarm.png + install -Dm644 Icons/1349069370_Alarm_Clock24.png $out/share/icons/hicolor/24x24/apps/qtalarm.png + install -Dm644 Icons/1349069370_Alarm_Clock16.png $out/share/icons/hicolor/16x16/apps/qtalarm.png + '' + ) + + '' + runHook postInstall + ''; + + nativeBuildInputs = [ + qt5.wrapQtAppsHook + qt5.qmake + copyDesktopItems + ]; + + passthru.updateScript = nix-update-script { }; + + desktopItems = [ + (makeDesktopItem { + name = "QTalarm"; + exec = "qtalarm"; + icon = "qtalarm"; + desktopName = "QTalarm"; + genericName = "Nifty alarm clock"; + categories = [ + "Application" + "Utility" + ]; + terminal = false; + }) + ]; + meta = { + description = "Nifty alarm clock written in QT"; + changelog = "https://github.com/CountMurphy/QTalarm/releases/tag/${finalAttrs.version}"; + homepage = "https://github.com/CountMurphy/QTalarm"; + license = lib.licenses.gpl3Only; + mainProgram = "qtalarm"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix index c56c67996d562..877bae48a72f7 100644 --- a/pkgs/by-name/qt/qtractor/package.nix +++ b/pkgs/by-name/qt/qtractor/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "1.0.0"; + version = "1.1.1"; src = fetchurl { url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz"; - hash = "sha256-yoVxRUXUhZrIzJVWLKA6G4hBf52dvJdr7FlfM+ZHUeo="; + hash = "sha256-Q/6AS9mZwsG+wF/h0xt77s8qpuLwcO1CjoVaX9ta9Qc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix index 38578e8eb5047..7c04bf6f2e70b 100644 --- a/pkgs/by-name/qu/quadrapassel/package.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/quadrapassel/${lib.versions.major version}/quadrapassel-${version}.tar.xz"; - sha256 = "C9giQUIHxzEj7WpJ9yPaWsjdTfXTXtwJn/6i4TmcwAo="; + hash = "sha256-C9giQUIHxzEj7WpJ9yPaWsjdTfXTXtwJn/6i4TmcwAo="; }; nativeBuildInputs = [ @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { description = "Classic falling-block game, Tetris"; mainProgram = "quadrapassel"; homepage = "https://gitlab.gnome.org/GNOME/quadrapassel"; + changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index afd37f8511735..1afbff315203b 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.13.2"; + version = "3.15.1"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-6rt40cQde6ck0Eq3YRfN+l2QP18CHTxFj2EJyiPgkrE="; + hash = "sha256-cvZ1jEIeEQOgmAiQba6AYob+84ozM0AQcnVpgRLSIIc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/qu/quick-lookup/package.nix b/pkgs/by-name/qu/quick-lookup/package.nix new file mode 100644 index 0000000000000..ffd8d48a2c515 --- /dev/null +++ b/pkgs/by-name/qu/quick-lookup/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + gjs, + webkitgtk_6_0, + glib-networking, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "quick-lookup"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "johnfactotum"; + repo = "quick-lookup"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-I6a8J/Z1yJhdqWES+1mIlvJq6FBOX0GiW0muNP/iSjE="; + }; + + postPatch = '' + substituteInPlace post_install.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + gjs + webkitgtk_6_0 + glib-networking + ]; + + meta = { + description = "Simple GTK dictionary application powered by Wiktionary"; + homepage = "https://github.com/johnfactotum/quick-lookup"; + license = lib.licenses.gpl3Plus; + mainProgram = "quick-lookup"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix index 35ffc1694fef0..cfd3838c9c514 100644 --- a/pkgs/by-name/qu/quickemu/package.nix +++ b/pkgs/by-name/qu/quickemu/package.nix @@ -48,7 +48,7 @@ let xrandr zsync ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ mesa-demos usbutils xdg-user-dirs diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix index 35a71244cab65..92c0aaa57b520 100644 --- a/pkgs/by-name/qu/quickjs-ng/package.nix +++ b/pkgs/by-name/qu/quickjs-ng/package.nix @@ -1,23 +1,30 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -, testers -, texinfo +{ + lib, + cmake, + fetchFromGitHub, + stdenv, + testers, + texinfo, }: stdenv.mkDerivation (finalAttrs: { pname = "quickjs-ng"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "quickjs-ng"; repo = "quickjs"; rev = "v${finalAttrs.version}"; - hash = "sha256-4CC7IxA5t+L99H4Rvkx0xkXFHuqNP3HTmS46JEuy7Vs="; + hash = "sha256-7IAkmlzgiPVd8yRv7LU5a7HWCB+eQk1Ur1KwZupwty0="; }; - outputs = [ "bin" "out" "dev" "doc" "info" ]; + outputs = [ + "out" + "bin" + "dev" + "doc" + "info" + ]; nativeBuildInputs = [ cmake @@ -25,18 +32,28 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" + (lib.cmakeBool "BUILD_SHARED_LIBS" true) (lib.cmakeBool "BUILD_STATIC_QJS_EXE" stdenv.hostPlatform.isStatic) ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ - "-Wno-error=stringop-overflow" - ]); + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + "-Wno-error=stringop-overflow" + ] + ); + + strictDeps = true; + + postBuild = '' + pushd ../doc + makeinfo *texi + popd + ''; postInstall = '' - (cd ../doc - makeinfo --output quickjs.info quickjs.texi - install -Dt $info/share/info/ quickjs.info) + pushd ../doc + install -Dm644 -t ''${!outputInfo}/share/info *info + popd ''; passthru.tests = { @@ -46,12 +63,12 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { - description = "Mighty JavaScript engine"; + meta = { homepage = "https://github.com/quickjs-ng/quickjs"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; + description = "Mighty JavaScript engine"; + license = lib.licenses.mit; mainProgram = "qjs"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/qu/quickjs/package.nix b/pkgs/by-name/qu/quickjs/package.nix new file mode 100644 index 0000000000000..c22e3e5b6c58d --- /dev/null +++ b/pkgs/by-name/qu/quickjs/package.nix @@ -0,0 +1,130 @@ +{ + lib, + fetchurl, + stdenv, + testers, + texinfo, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "quickjs"; + version = "2024-01-13"; + + src = fetchurl { + url = "https://bellard.org/quickjs/quickjs-${finalAttrs.version}.tar.xz"; + hash = "sha256-PEv4+JW/pUvrSGyNEhgRJ3Hs/FrDvhA2hR70FWghLgM="; + }; + + outputs = [ + "out" + "info" + ]; + + nativeBuildInputs = [ + texinfo + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + doInstallCheck = true; + + enableParallelBuilding = true; + + strictDeps = true; + + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace Makefile \ + --replace "CONFIG_LTO=y" "" + ''; + + postBuild = '' + pushd doc + makeinfo *texi + popd + ''; + + postInstall = '' + pushd doc + install -Dm644 -t ''${!outputInfo}/share/info *info + popd + ''; + + installCheckPhase = lib.concatStringsSep "\n" [ + '' + runHook preInstallCheck + '' + + '' + PATH="$out/bin:$PATH" + '' + # Programs exit with code 1 when testing help, so grep for a string + '' + set +o pipefail + qjs --help 2>&1 | grep "QuickJS version" + qjscalc --help 2>&1 | grep "QuickJS version" + set -o pipefail + '' + + '' + temp=$(mktemp).js + echo "console.log('Output from compiled program');" > "$temp" + set -o verbose + out=$(mktemp) && qjsc -o "$out" "$temp" && "$out" | grep -q "Output from compiled program" + out=$(mktemp) && qjsc -flto -o "$out" "$temp" && "$out" | grep -q "Output from compiled program" + '' + + '' + runHook postInstallCheck + '' + ]; + + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "qjs --help || true"; + }; + }; + + meta = { + homepage = "https://bellard.org/quickjs/"; + description = "Small and embeddable Javascript engine"; + longDescription = '' + QuickJS is a small and embeddable Javascript engine. It supports the + ES2023 specification including modules, asynchronous generators, proxies + and BigInt. + + It optionally supports mathematical extensions such as big decimal + floating point numbers (BigDecimal), big binary floating point numbers + (BigFloat) and operator overloading. + + Main Features: + + - Small and easily embeddable: just a few C files, no external + dependency, 210 KiB of x86 code for a simple hello world program. + - Fast interpreter with very low startup time: runs the 76000 tests of + the ECMAScript Test Suite in less than 2 minutes on a single core of a + desktop PC. The complete life cycle of a runtime instance completes in + less than 300 microseconds. + - Almost complete ES2023 support including modules, asynchronous + generators and full Annex B support (legacy web compatibility). + - Passes nearly 100% of the ECMAScript Test Suite tests when selecting + the ES2023 features. A summary is available at Test262 Report. + - Can compile Javascript sources to executables with no external dependency. + - Garbage collection using reference counting (to reduce memory usage and + have deterministic behavior) with cycle removal. + - Mathematical extensions: BigDecimal, BigFloat, operator overloading, + bigint mode, math mode. + - Command line interpreter with contextual colorization implemented in + Javascript. + - Small built-in standard library with C library wrappers. + + ''; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + stesie + AndersonTorres + ]; + mainProgram = "qjs"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index 22d042828ec7b..2b60fde524506 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "quill-log"; - version = "6.1.2"; + version = "7.2.2"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; rev = "v${version}"; - hash = "sha256-hnSdyaVOPppa6KCgD6NoD4PKn0jI4iGGPg3Tnx0KX3w="; + hash = "sha256-au3cuzWm+MUCMDnHb93gy9b/8ITbLTQ1PYCjonh7QKw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/qw/qwerty-fr/package.nix b/pkgs/by-name/qw/qwerty-fr/package.nix index f898073f77c1b..f406f17795c33 100644 --- a/pkgs/by-name/qw/qwerty-fr/package.nix +++ b/pkgs/by-name/qw/qwerty-fr/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "qwerty-fr"; repo = "qwerty-fr"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-TD67wKdaPaXzJzjKFCfRZl3WflUfdnUSQl/fnjr9TF8="; + hash = "sha256-TD67wKdaPaXzJzjKFCfRZl3WflUfdnUSQl/fnjr9TF8="; }; installPhase = '' diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix index 77f856dcb7642..e47a41260b60f 100644 --- a/pkgs/by-name/r0/r0vm/package.nix +++ b/pkgs/by-name/r0/r0vm/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { owner = "risc0"; repo = "risc0"; rev = "v${version}"; - sha256 = "sha256-jtROtI5/4W2pNvn1ZYR/wQAZmECTr7YxuZGu2Ns9paw="; + hash = "sha256-jtROtI5/4W2pNvn1ZYR/wQAZmECTr7YxuZGu2Ns9paw="; }; buildAndTestSubdir = "risc0/r0vm"; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl.dev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { recursionZkr = fetchurl { name = "recursion_zkr.zip"; url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${sha256Hash}.zip"; - sha256 = "sha256-ToSWRp4e+gDvs2MNJhq/NF5rKQX7ZLTzope+iOvfg9I="; + hash = "sha256-ToSWRp4e+gDvs2MNJhq/NF5rKQX7ZLTzope+iOvfg9I="; }; in '' diff --git a/pkgs/by-name/r1/r10k/Gemfile.lock b/pkgs/by-name/r1/r10k/Gemfile.lock index 2fa564f46cbdf..e82d217dbf371 100644 --- a/pkgs/by-name/r1/r10k/Gemfile.lock +++ b/pkgs/by-name/r1/r10k/Gemfile.lock @@ -1,16 +1,19 @@ GEM remote: https://rubygems.org/ specs: + base64 (0.2.0) colored2 (3.1.2) - cri (2.15.11) - erubi (1.12.0) - faraday (2.9.0) + cri (2.15.12) + erubi (1.13.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) + logger faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http - fast_gettext (2.3.0) + fast_gettext (2.4.0) + prime forwardable (1.3.3) gettext (3.4.9) erubi @@ -22,31 +25,33 @@ GEM fast_gettext (~> 2.1) gettext (~> 3.4) locale - jwt (2.7.1) + jwt (2.8.2) + base64 locale (2.1.4) log4r (1.1.10) - minitar (0.9) + logger (1.6.0) + minitar (0.12.1) multi_json (1.15.0) net-http (0.4.1) uri prime (0.1.2) forwardable singleton - puppet_forge (5.0.3) + puppet_forge (5.0.4) faraday (~> 2.0) faraday-follow_redirects (~> 0.3.0) - minitar + minitar (< 1.0.0) semantic_puppet (~> 1.0) - r10k (4.0.1) + r10k (4.1.0) colored2 (= 3.1.2) cri (>= 2.15.10) gettext-setup (>= 0.24, < 2.0) - jwt (>= 2.2.3, < 2.8.0) + jwt (>= 2.2.3, < 3) log4r (= 1.1.10) minitar (~> 0.9) multi_json (~> 1.10) puppet_forge (>= 4.1, < 6) - racc (1.7.3) + racc (1.8.1) semantic_puppet (1.1.0) singleton (0.2.0) text (1.3.1) @@ -59,4 +64,4 @@ DEPENDENCIES r10k BUNDLED WITH - 2.5.6 + 2.5.16 diff --git a/pkgs/by-name/r1/r10k/gemset.nix b/pkgs/by-name/r1/r10k/gemset.nix index d004466905661..dc0e87c20aea3 100644 --- a/pkgs/by-name/r1/r10k/gemset.nix +++ b/pkgs/by-name/r1/r10k/gemset.nix @@ -1,4 +1,14 @@ { + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; colored2 = { groups = ["default"]; platforms = []; @@ -14,31 +24,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bhsgnjav94mz5vf3305gxz1g34gm9kxvnrn1dkz530r8bpj0hr5"; + sha256 = "1rank6i9p2drwdcmhan6ifkzrz1v3mwpx47fwjl75rskxwjfkgwa"; type = "gem"; }; - version = "2.15.11"; + version = "2.15.12"; }; erubi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; faraday = { - dependencies = ["faraday-net_http"]; + dependencies = ["faraday-net_http" "logger"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; + sha256 = "104s7n9505488p923cs0pl3jlgn4naam28clkm2885hrysizpjbb"; type = "gem"; }; - version = "2.9.0"; + version = "2.10.1"; }; faraday-follow_redirects = { dependencies = ["faraday"]; @@ -57,20 +67,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; + sha256 = "0f49frpfdr8czwm2mjkfny4pini6fy49b6hamw4jrppl4vsg14ys"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.1"; }; fast_gettext = { + dependencies = ["prime"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "112gsrqah2w03kgi9mjsn6hl74mrwckphf223h36iayc4djf4lq2"; + sha256 = "1gsz2ywvnms7b4w7bs4dg7cykhgx7z74fa7xy0sbw45a0v2c89px"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; forwardable = { groups = ["default"]; @@ -105,14 +116,15 @@ version = "1.1.0"; }; jwt = { + dependencies = ["base64"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; + sha256 = "04mw326i9vsdcqwm4bf0zvnqw237f8l7022nhlbmak92bqqpg62s"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.2"; }; locale = { groups = ["default"]; @@ -134,15 +146,25 @@ }; version = "1.1.10"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa"; + type = "gem"; + }; + version = "1.6.0"; + }; minitar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13"; + sha256 = "0f307mpj4j0gp7iq77xj4p149f4krcvbll9rismng3jcijpbn79s"; type = "gem"; }; - version = "0.9"; + version = "0.12.1"; }; multi_json = { groups = ["default"]; @@ -182,10 +204,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "168w15y5rnsm6wspqxn0wg543r89cbajc8wky0sg9vzpgpr27176"; + sha256 = "0d65zri1nmpph8iki5iigdzfqd6rfyc1mlgdfhg69q3566rcff06"; type = "gem"; }; - version = "5.0.3"; + version = "5.0.4"; }; r10k = { dependencies = ["colored2" "cri" "gettext-setup" "jwt" "log4r" "minitar" "multi_json" "puppet_forge"]; @@ -193,20 +215,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g7bx9k112mnxpnasj59zaz2c7x51ia856b5q41kfr3i9y2q3k78"; + sha256 = "0k3fr2f0pwyrabs12wqig31f37sqrqs8qza7jrn01d6blvhvkrb4"; type = "gem"; }; - version = "4.0.1"; + version = "4.1.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; semantic_puppet = { groups = ["default"]; diff --git a/pkgs/by-name/ra/radicle-explorer/0001-remove-dependency-on-plausible.patch b/pkgs/by-name/ra/radicle-explorer/0001-remove-dependency-on-plausible.patch new file mode 100644 index 0000000000000..06b3511d40782 --- /dev/null +++ b/pkgs/by-name/ra/radicle-explorer/0001-remove-dependency-on-plausible.patch @@ -0,0 +1,77 @@ +From cc4718cbea1bd70de21a2be515a944802246ffc7 Mon Sep 17 00:00:00 2001 +From: Vincent Ambo <mail@tazj.in> +Date: Sun, 15 Sep 2024 03:08:28 +0300 +Subject: [PATCH] remove dependency on plausible + +--- + package-lock.json | 9 --------- + package.json | 1 - + src/App.svelte | 8 -------- + 3 files changed, 18 deletions(-) + +diff --git a/package-lock.json b/package-lock.json +index d52de6c0..d96e342f 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -29,7 +29,6 @@ + "marked-katex-extension": "^5.1.1", + "marked-linkify-it": "^3.1.11", + "md5": "^2.3.0", +- "plausible-tracker": "^0.3.9", + "svelte": "^4.2.19", + "twemoji": "^14.0.2", + "zod": "^3.23.8" +@@ -3697,14 +3696,6 @@ + "url": "https://github.com/sponsors/jonschlinkert" + } + }, +- "node_modules/plausible-tracker": { +- "version": "0.3.9", +- "resolved": "https://registry.npmjs.org/plausible-tracker/-/plausible-tracker-0.3.9.tgz", +- "integrity": "sha512-hMhneYm3GCPyQon88SZrVJx+LlqhM1kZFQbuAgXPoh/Az2YvO1B6bitT9qlhpiTdJlsT5lsr3gPmzoVjb5CDXA==", +- "engines": { +- "node": ">=10" +- } +- }, + "node_modules/playwright": { + "version": "1.46.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.1.tgz", +diff --git a/package.json b/package.json +index 6d569ad9..61e8d892 100644 +--- a/package.json ++++ b/package.json +@@ -73,7 +73,6 @@ + "marked-katex-extension": "^5.1.1", + "marked-linkify-it": "^3.1.11", + "md5": "^2.3.0", +- "plausible-tracker": "^0.3.9", + "svelte": "^4.2.19", + "twemoji": "^14.0.2", + "zod": "^3.23.8" +diff --git a/src/App.svelte b/src/App.svelte +index 8161c390..4281ba61 100644 +--- a/src/App.svelte ++++ b/src/App.svelte +@@ -1,6 +1,4 @@ + <script lang="ts"> +- import Plausible from "plausible-tracker"; +- + import * as router from "@app/lib/router"; + import { unreachable } from "@app/lib/utils"; + +@@ -28,12 +26,6 @@ + + void router.loadFromLocation(); + +- if (import.meta.env.PROD) { +- const plausible = Plausible({ domain: "app.radicle.xyz" }); +- +- plausible.enableAutoPageviews(); +- } +- + $: document.documentElement.setAttribute("data-codefont", $codeFont); + $: document.documentElement.setAttribute("data-theme", $theme); + </script> +-- +2.46.0 + diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix new file mode 100644 index 0000000000000..21c37268662bf --- /dev/null +++ b/pkgs/by-name/ra/radicle-explorer/package.nix @@ -0,0 +1,130 @@ +{ + radicle-httpd, + fetchFromGitHub, + fetchgit, + lib, + buildNpmPackage, + writeText, + jq, + runCommand, +}: + +let + # radicle-explorer bundles these freely available Emoji assets, but does not + # redistribute them. + twemojiAssets = fetchFromGitHub { + owner = "twitter"; + repo = "twemoji"; + rev = "v14.0.2"; + hash = "sha256-YoOnZ5uVukzi/6bLi22Y8U5TpplPzB7ji42l+/ys5xI="; + meta.license = [ lib.licenses.cc-by-40 ]; + }; + + mkPassthru = self: args: { + # radicle-explorer is configured through static build time configuration. + # + # Using this function you can override the this configuration, for example, + # to configure alternative preferred peers (which are shown in the UI by + # default). + # + # Example usage: + # + # ```nix + # radicle-explorer.withConfig { + # preferredSeeds = [{ + # hostname = "seed.example.com"; + # port = 443; + # scheme = "https"; + # }]; + # } + # ``` + withConfig = + config: + let + overrides = writeText "config-overrides.json" (builtins.toJSON config); + newConfig = runCommand "config.json" { } '' + ${jq}/bin/jq -s '.[0] * .[1]' ${(self args).src}/config/default.json ${overrides} > $out + ''; + in + lib.fix ( + final: + (self args).overrideAttrs (prev: { + preBuild = '' + ${prev.preBuild or ""} + cp ${newConfig} config/local.json + ''; + + passthru = prev.passthru // mkPassthru final args; + }) + ); + + # By default, radicle-explorer includes a dependency that sends requests + # to a web analytics tracking service. Using this attribute yields a + # version of radicle-explorer with this dependency removed. + withoutTrackers = self { + patches = [ ./0001-remove-dependency-on-plausible.patch ]; + npmDepsHash = "sha256:1hbrzfjkfc0q8qk03yi6qb9zqm57h7hnkn7fl0yxkrzbrljaljaz"; + }; + }; +in +lib.fix ( + self: + lib.makeOverridable ( + { + npmDepsHash ? "sha256:0kw6rvqm0s21j1rss35idvgcrzzczfy6qi3323y385djw4ygk5xs", + patches ? [ ], + }@args: + buildNpmPackage { + pname = "radicle-explorer"; + version = radicle-httpd.version; + inherit patches npmDepsHash; + + # radicle-explorer uses the radicle-httpd API, and they are developed in the + # same repo. For this reason we pin the sources to each other, but due to + # radicle-httpd using a more limited sparse checkout we need to carry a + # separate hash. + src = fetchgit { + inherit (radicle-httpd.src) url rev; + hash = "sha256:09m13238h6j7g02r6332ihgyyzbjx90pgz14rz29pgv7936h6il8"; + }; + + postPatch = '' + patchShebangs --build ./scripts + mkdir -p "public/twemoji" + cp -t public/twemoji -r -- ${twemojiAssets}/assets/svg/* + : >scripts/install-twemoji-assets + ''; + + dontConfigure = true; + doCheck = false; + + installPhase = '' + runHook preInstall + mkdir -p "$out" + cp -r -t "$out" build/* + runHook postInstall + ''; + + passthru = mkPassthru self args; + + meta = { + description = "Web frontend for Radicle"; + longDescription = '' + Radicle Explorer is a web-frontend for Radicle which supports browsing + repositories, issues and patches on publicly available Radicle seeds. + + This package builds the web interface, ready to be served by any web + server. + ''; + + homepage = "https://radicle.xyz"; + license = lib.licenses.gpl3; + + maintainers = with lib.maintainers; [ + tazjin + lorenzleutgeb + ]; + }; + } + ) +) { } diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index dc06524034adb..a42bc9a8a1102 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -13,17 +13,19 @@ }: rustPlatform.buildRustPackage rec { pname = "radicle-httpd"; - version = "0.15.0"; + version = "0.17.0"; env.RADICLE_VERSION = version; + # You must update the radicle-explorer source hash when changing this. src = fetchgit { url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git"; rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}"; - hash = "sha256-wd+ST8ax988CpGcdFb3LUcA686U7BLmbi1k8Y3GAEIc="; + hash = "sha256-nstyb1rSll3Sl0DlA9JAAwvr6JN8okJ03WoQnE4dXEk="; sparseCheckout = [ "radicle-httpd" ]; }; + sourceRoot = "${src.name}/radicle-httpd"; - cargoHash = "sha256-YIux5/BFAZNI9ZwP4lVKj4UGQ4lKrhZ675bCdUaXN70="; + cargoHash = "sha256-M4tDtUXS99/Zb1Z71CTdW9gMgRR30rbwA6wK7nlwblQ="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 2161d39de8284..8482cf0b7ea55 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -18,15 +18,15 @@ , xdg-utils }: rustPlatform.buildRustPackage rec { pname = "radicle-node"; - version = "1.0.0-rc.14"; + version = "1.0.0"; env.RADICLE_VERSION = version; src = fetchgit { url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}"; - hash = "sha256-vqLDutaLeRuqRu8R9+0x2sDKxBrDeJ1RgKAiedkTvAw="; + hash = "sha256-sb0GroWfZWC9YCGby88eiPnhFCdDA9EUhVpoyuAA+Mk="; }; - cargoHash = "sha256-Qipt1IstoFGo1qQn/ZSwm3d1jrqj4mwIJep/A+/21WY="; + cargoHash = "sha256-+VjYX1gGf5aIGSQRMtvK6JI118X50HaxFwg5H14Vq7g="; nativeBuildInputs = [ asciidoctor installShellFiles makeWrapper ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/ra/radio-cli/package.nix b/pkgs/by-name/ra/radio-cli/package.nix new file mode 100644 index 0000000000000..655e416b554af --- /dev/null +++ b/pkgs/by-name/ra/radio-cli/package.nix @@ -0,0 +1,44 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + makeWrapper, + pkg-config, + openssl, + mpv, +}: +rustPlatform.buildRustPackage rec { + pname = "radio-cli"; + version = "2.3.1"; + + src = fetchFromGitHub { + owner = "margual56"; + repo = "radio-cli"; + rev = "v${version}"; + hash = "sha256-XN0IzU7+V0zUUXfOygWrZXQX09IEpVo2Rhwfv+Lny/E="; + }; + + cargoHash = "sha256-XCzDNUZpyfu4gJr1lUx1/VbLkEv3OnJvYku0eEJbK5s="; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + postInstall = '' + wrapProgram "$out/bin/radio-cli" \ + --suffix PATH : ${lib.makeBinPath [ mpv ]} + ''; + + meta = { + description = "Simple radio CLI written in rust"; + homepage = "https://github.com/margual56/radio-cli"; + changelog = "https://github.com/margual56/radio-cli/releases/tag/v${version}"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + mainProgram = "radio-cli"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix index d32478ba7069a..eab58d3c5d5af 100644 --- a/pkgs/by-name/ra/raffi/package.nix +++ b/pkgs/by-name/ra/raffi/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "raffi"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "chmouel"; repo = "raffi"; rev = "v${version}"; - hash = "sha256-i4PM82vGb9Z2pwW006114/h9crokVLUpLxNjr7tgAU8="; + hash = "sha256-25dH6LprqcZq9Px5nFNrGHk/2Tn23TZMLVZVic0unU8="; }; - cargoHash = "sha256-DS56H2XjEgdXC9TKLjwyfLpFHB9dUThhr8pNFEJuAZE="; + cargoHash = "sha256-bkNjlX8WH8+q4I+VfYZeraf2vyHtDFZQCbXzsdehCZQ="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix index a6024ace31765..0c41c5a553681 100644 --- a/pkgs/by-name/ra/rage/package.nix +++ b/pkgs/by-name/ra/rage/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 16fbe65fb8abc..18a0246cfa76a 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -12,22 +12,22 @@ let in rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.13.0"; + version = "3.15.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-uCgL08HADAtSt4OGqvHNGq95RG23QRYXHt0vIqCtjno="; + hash = "sha256-2/Yaz+eqZEOh/bCme9DuQep4XDkatr9kw32zN1yn9DQ="; }; - cargoHash = "sha256-UblS3jhn5yJTog/qblnoHVaJbXZKYRnw+ZgabZ+pPcI="; + cargoHash = "sha256-9fO8YmmqyqVp0FYndUnTD6+nSvlV9jzjT+G/iNlZYLo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix new file mode 100644 index 0000000000000..2152374e14528 --- /dev/null +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -0,0 +1,44 @@ +{ + lib, + darwin, + fetchFromGitHub, + nix-update-script, + rustPlatform, + stdenv, +}: +let + version = "0.2.6"; +in +rustPlatform.buildRustPackage { + inherit version; + pname = "rainfrog"; + + src = fetchFromGitHub { + owner = "achristmascarl"; + repo = "rainfrog"; + rev = "refs/tags/v${version}"; + hash = "sha256-yY4F5Aw+duXknESjl6hoOUV3er84DkTtIBoX3humWxA="; + }; + + cargoHash = "sha256-QMZUReWrOS0P+hxsV5c/eJxnwYX977+4oI7MPfz4dgg="; + + buildInputs = lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + CoreGraphics + SystemConfiguration + ] + ); + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/achristmascarl/rainfrog/releases/tag/v${version}"; + description = "A database management TUI for postgres"; + homepage = "https://github.com/achristmascarl/rainfrog"; + license = lib.licenses.mit; + mainProgram = "rainfrog"; + maintainers = with lib.maintainers; [ patka ]; + }; +} diff --git a/pkgs/by-name/ra/rana/package.nix b/pkgs/by-name/ra/rana/package.nix new file mode 100644 index 0000000000000..2fa2df8272b78 --- /dev/null +++ b/pkgs/by-name/ra/rana/package.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "rana"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "grunch"; + repo = "rana"; + rev = "refs/tags/v${version}"; + hash = "sha256-NgbWRuwD+nfNbB6WRbDjUPJneysb85z5eqXmU31U6Mo="; + }; + + cargoHash = "sha256-FMJisCR1bomswFHjIIu/24ywvQn1pv/7QHiEmaBV4a8="; + + meta = { + description = "Nostr public key mining tool"; + homepage = "https://github.com/grunch/rana"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jigglycrumb ]; + mainProgram = "rana"; + }; +} diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index e31e4c0354a2f..787de21b448cb 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rasm"; - version = "2.2.6"; + version = "2.2.7"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; rev = "v${version}"; - hash = "sha256-DX+i9G+HK0Iek6qmsYQFbieHUtRazKkcyv+gYQ748X0="; + hash = "sha256-X3GEQJdfw4znqVyUIi2teUkQZpOV5X1EpF5Zob9g8PI="; }; # by default the EXEC variable contains `rasm.exe` diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index 4c72c2a4fd5ed..db4d4cac9296f 100644 --- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix +++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -12,13 +12,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "raspberrypi-eeprom"; - version = "2024.06.05-2712"; + version = "2024.09.23-2712"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-VcMDDnM0VNr+Y+16ZChZdlEcmlHx6mYNCK0mrPMJHes="; + hash = "sha256-5qqcHMoRT5XfhIX392j4Q1DcKjYGq6NMqy1VrWxg5+4="; }; buildInputs = [ python3 ]; @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { for i in rpi-eeprom-update rpi-eeprom-config; do wrapProgram $out/bin/$i \ --set FIRMWARE_ROOT "$out/lib/firmware/raspberrypi/bootloader" \ - ${lib.optionalString stdenvNoCC.isAarch64 "--set VCMAILBOX ${libraspberrypi}/bin/vcmailbox"} \ + ${lib.optionalString stdenvNoCC.hostPlatform.isAarch64 "--set VCMAILBOX ${libraspberrypi}/bin/vcmailbox"} \ --prefix PATH : "${lib.makeBinPath ([ binutils-unwrapped findutils @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { kmod pciutils (placeholder "out") - ] ++ lib.optionals stdenvNoCC.isAarch64 [ + ] ++ lib.optionals stdenvNoCC.hostPlatform.isAarch64 [ libraspberrypi ])}" done diff --git a/pkgs/by-name/ra/ratchet/package.nix b/pkgs/by-name/ra/ratchet/package.nix index 6d94200fcc9c7..6f94432e5b078 100644 --- a/pkgs/by-name/ra/ratchet/package.nix +++ b/pkgs/by-name/ra/ratchet/package.nix @@ -6,7 +6,7 @@ }: buildGoModule rec { pname = "ratchet"; - version = "0.9.2"; + version = "0.10.0"; # ratchet uses the git sha-1 in the version string, e.g. # @@ -19,8 +19,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "sethvargo"; repo = "ratchet"; - rev = "d57cc1a53c022d3f87c4820bc6b64384a06c8a07"; - hash = "sha256-gQ98uD9oPUsECsduv/lqGdYNmtHetU49ETfWCE8ft8U="; + rev = "ebb7f24e0cbc288ab913b635480412934a2a5371"; + hash = "sha256-Wt1/ahKQ8DOquXU5u6p+an9FJ5kYRl7F2EXOv/2rHlA="; }; proxyVendor = true; diff --git a/pkgs/by-name/ra/rathole/package.nix b/pkgs/by-name/ra/rathole/package.nix index 38d163daf8d8e..19754ba11cdb9 100644 --- a/pkgs/by-name/ra/rathole/package.nix +++ b/pkgs/by-name/ra/rathole/package.nix @@ -24,9 +24,11 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices ]); + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices ]); __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix index 50cf9bef9e1e4..e8834ac131e4f 100644 --- a/pkgs/by-name/ra/rav1e/package.nix +++ b/pkgs/by-name/ra/rav1e/package.nix @@ -37,14 +37,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library # and linking it with cctools ld64. - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")' # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern. substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"' diff --git a/pkgs/by-name/ra/raze/package.nix b/pkgs/by-name/ra/raze/package.nix index 8739aa1108a1b..5ba50c533e89f 100644 --- a/pkgs/by-name/ra/raze/package.nix +++ b/pkgs/by-name/ra/raze/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ZDoom"; repo = "Raze"; - rev = finalAttrs.version; + rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-R3Sm/cibg+D2QPS4UisRp91xvz3Ine2BUR8jF5Rbj1g="; leaveDotGit = true; postFetch = '' @@ -54,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") (lib.cmakeBool "DYN_GTK" false) (lib.cmakeBool "DYN_OPENAL" false) ]; @@ -68,7 +67,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' mv $out/bin/raze $out/share/raze - makeWrapper $out/share/raze/raze $out/bin/raze + makeWrapper $out/share/raze/raze $out/bin/raze \ + --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]} install -Dm644 ../source/platform/posix/org.zdoom.Raze.256.png $out/share/pixmaps/org.zdoom.Raze.png install -Dm644 ../source/platform/posix/org.zdoom.Raze.desktop $out/share/applications/org.zdoom.Raze.desktop install -Dm644 ../soundfont/raze.sf2 $out/share/raze/soundfonts/raze.sf2 diff --git a/pkgs/tools/misc/rcm/fix-rcmlib-path.patch b/pkgs/by-name/rc/rcm/fix-rcmlib-path.patch similarity index 100% rename from pkgs/tools/misc/rcm/fix-rcmlib-path.patch rename to pkgs/by-name/rc/rcm/fix-rcmlib-path.patch diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/by-name/rc/rcm/package.nix similarity index 100% rename from pkgs/tools/misc/rcm/default.nix rename to pkgs/by-name/rc/rcm/package.nix diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index 941926696c1d6..bc4be1730178a 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "rcp"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "wykurz"; repo = "rcp"; rev = "v${version}"; - hash = "sha256-TQTn91FDqDpdPv6dn2cwseGF+3EcJ17sglHKD7EQLeY="; + hash = "sha256-INLXVruiaK5yv5old0NOWFcg9y13M6Dm7bBMmcPFY1I="; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); - cargoHash = "sha256-uhE1AphdYKL6pFY8vsmdMGxHxFiVw75oDXNP8qGykBc="; + cargoHash = "sha256-JXDM97uGuGh3qHK3Gh8Nd/YSZq/Kcj81PpufJJMqQQI="; RUSTFLAGS = "--cfg tokio_unstable"; @@ -37,6 +37,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "rcp"; maintainers = with maintainers; [ wykurz ]; # = note: Undefined symbols for architecture x86_64: "_utimensat" - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index d792eee00af3d..17d6d1c1e5b0d 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "rcu"; - version = "2024.001p"; + version = "2024.001q"; format = "other"; src = let src-tarball = requireFile { name = "rcu-d${version}-source.tar.gz"; - sha256 = "15559537bjrviq5n87yz4q6n3y3l3bwip8rxg34zf0w9zmr4zmqn"; + hash = "sha256-Ywk28gJBMSSQL6jEcHE8h253KOsXIGwVOag6PBWs8kg="; url = "http://www.davisr.me/projects/rcu/"; }; in runCommand "${src-tarball.name}-unpacked" {} '' @@ -148,5 +148,6 @@ python3Packages.buildPythonApplication rec { homepage = "http://www.davisr.me/projects/rcu/"; license = licenses.agpl3Plus; maintainers = with maintainers; [ OPNA2608 ]; + hydraPlatforms = [ ]; # requireFile used as src }; } diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix index 740a036d3c4d4..3636131db8326 100644 --- a/pkgs/by-name/re/reaction/package.nix +++ b/pkgs/by-name/re/reaction/package.nix @@ -14,7 +14,7 @@ in buildGoModule { owner = "ppom"; repo = "reaction"; rev = "v${version}"; - sha256 = "sha256-UL3ck+gejZAu/mZS3ZiZ78a2/I+OesaSRZUhHirgu9o="; + hash = "sha256-UL3ck+gejZAu/mZS3ZiZ78a2/I+OesaSRZUhHirgu9o="; }; vendorHash = "sha256-THUIoWFzkqaTofwH4clBgsmtUlLS9WIB2xjqW7vkhpg="; diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix index e76189e1ac8dd..34914df2987e3 100644 --- a/pkgs/by-name/re/realm/package.nix +++ b/pkgs/by-name/re/realm/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EvXafTujqTdQwfK4NXgT7lGKGnrpyP9ouplD6DmJUKU="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix index 6f1f113665e9c..bde3c440f4ea2 100644 --- a/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl rec { name = "VNC-Viewer-${finalAttrs.version}-MacOSX-universal.dmg"; url = "https://downloads.realvnc.com/download/file/viewer.files/${name}"; - hash = "sha256-haD2QsBF9Dps1V/2tkkALAc7+kUY3PSNj7BjTIqnNcU="; + hash = "sha256-SiBlw9ihKDLDWBPUxn3cfM0jbUaWDxQ9JDaeDNczQ7c="; }; sourceRoot = "."; diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix index 3d13bfdf9dc4f..9be2308705c92 100644 --- a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" = fetchurl rec { name = "VNC-Viewer-${finalAttrs.version}-Linux-x64.rpm"; url = "https://downloads.realvnc.com/download/file/viewer.files/${name}"; - hash = "sha256-KJZbH3mfxuyUslkYvB/RKquEsB7ayJSv6yNqfLmAsGI="; + hash = "sha256-fwMfQdOyLnYVfdBj80JHWT+CnKpq/9oM5oNF3aP+jgo="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/package.nix b/pkgs/by-name/re/realvnc-vnc-viewer/package.nix index 6e1dc6762b141..b25f227eff19a 100644 --- a/pkgs/by-name/re/realvnc-vnc-viewer/package.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/package.nix @@ -4,7 +4,7 @@ }: let pname = "realvnc-vnc-viewer"; - version = "7.12.0"; + version = "7.12.1"; meta = { description = "VNC remote desktop client software by RealVNC"; @@ -20,5 +20,5 @@ let mainProgram = "vncviewer"; }; in -if stdenv.isDarwin then callPackage ./darwin.nix { inherit pname version meta; } +if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname version meta; } else callPackage ./linux.nix { inherit pname version meta; } diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix index 503358c565ed9..4b0ccc0109aa5 100644 --- a/pkgs/by-name/re/rectangle/package.nix +++ b/pkgs/by-name/re/rectangle/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.82"; + version = "0.83"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-Uwo98Mf7Ce6vbRRoNSsxtJh1zS5/p8Sicd/vcjczmVk="; + hash = "sha256-R364m1X0NQky/W9NzszUzP+2f06ZqBuJKh5m2uOXLmo="; }; sourceRoot = "."; diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/by-name/re/recutils/package.nix similarity index 100% rename from pkgs/tools/misc/recutils/default.nix rename to pkgs/by-name/re/recutils/package.nix diff --git a/pkgs/by-name/re/recyclarr/deps.nix b/pkgs/by-name/re/recyclarr/deps.nix index 3009c268aacd3..d789f33c90b16 100644 --- a/pkgs/by-name/re/recyclarr/deps.nix +++ b/pkgs/by-name/re/recyclarr/deps.nix @@ -15,13 +15,13 @@ }) (fetchNuGet { pname = "Autofac"; - version = "8.0.0"; - hash = "sha256-7XhDXw8hatQFjQMTIorQ5XrfDCc7EVNVyi6bGbc5fnA="; + version = "8.1.0"; + hash = "sha256-eDULsT32tESiX89CZTwvL061LwmPjjsxMvU8sYvJYE4="; }) (fetchNuGet { pname = "Autofac.Extensions.DependencyInjection"; - version = "9.0.0"; - hash = "sha256-hEqvbTkJqcI4S4LpxVOMyc5m+KeN0nRLk7FqQHSLRd4="; + version = "10.0.0"; + hash = "sha256-ACQwFG8a5LMoqGyHI/YpwVyXZQYqM5+wnk0q2BbGVZ4="; }) (fetchNuGet { pname = "Autofac.Extras.AggregateService"; @@ -90,8 +90,8 @@ }) (fetchNuGet { pname = "dotnet-sonarscanner"; - version = "7.1.1"; - hash = "sha256-fMx2rfRlqpD7Urg+earDe5oDnQBn3zeItzXHxXDEkdA="; + version = "8.0.2"; + hash = "sha256-XlfoSkhs3hvyGFH1afi3zPqMwfEN35LqWKCPEZGzTd8="; }) (fetchNuGet { pname = "DynamicData"; @@ -105,8 +105,8 @@ }) (fetchNuGet { pname = "FluentAssertions"; - version = "6.12.0"; - hash = "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE="; + version = "6.12.1"; + hash = "sha256-R/Fi9eee6T8t8JECxL9+HFd8jAxRMkCg18j+fAQLNqM="; }) (fetchNuGet { pname = "FluentAssertions.Analyzers"; @@ -135,13 +135,13 @@ }) (fetchNuGet { pname = "GitVersion.MsBuild"; - version = "6.0.0"; - hash = "sha256-Ve9Ys4u+p8uYBSvX7vT6Qpile6Fj7q3y0sHNIMaue90="; + version = "6.0.2"; + hash = "sha256-Xn1oMWSWGWuZpKnVwh6N40KOSNVkNYpzYYTu7TBQcgo="; }) (fetchNuGet { pname = "GitVersion.Tool"; - version = "6.0.0"; - hash = "sha256-aee5HFhFfkmJnkoDnP/rZJpn/7McS3PQIlrAJKSRqnk="; + version = "6.0.2"; + hash = "sha256-VPzU5WaDXFeaDkWPPqzZyOxYOrcocr2mJdawoZGl11M="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; @@ -150,8 +150,8 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; - version = "8.0.6"; - hash = "sha256-RC0i30AziI9MTgICW6WdpUj73KyzfePd2PvRIC5WnKc="; + version = "8.0.8"; + hash = "sha256-jhb4iDyzVduz6IRPyUIilLnXEYlIGl9tf99WNEfby/A="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Components"; @@ -160,8 +160,8 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Components"; - version = "8.0.6"; - hash = "sha256-UnN6Mp/ZCpyem4IEGLPeit/CM6R9sIZ4t8byhuaBAD8="; + version = "8.0.8"; + hash = "sha256-EqVGGD1yXpKlFou3jR7QvniI1MSPV1bigZT7ZkfaBo0="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Components.Analyzers"; @@ -170,18 +170,18 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Components.Analyzers"; - version = "8.0.6"; - hash = "sha256-lw+MuNK8XenRtC2pNt43+1CQs0qFtuYlOlQZf8ZZvFM="; + version = "8.0.8"; + hash = "sha256-lJ5jGfnDNB56j47XHn16jrKKiI4SR0TRB1JTxNmybJY="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Components.Forms"; - version = "8.0.6"; - hash = "sha256-0pj0SSYltkS6LYizVbIixNxJm7mnOen/ZS2pc1qoDZ4="; + version = "8.0.8"; + hash = "sha256-QbDDKFnPD4TlCDAXZ5C9vsm/BPEKv6NZKkhG7xYKrQ0="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Components.Web"; - version = "8.0.6"; - hash = "sha256-p4HCxjja7i5ZBM65+p7QJ50/7xYnH+glDn92dWEzaPc="; + version = "8.0.8"; + hash = "sha256-EEO0FSj1HC888PSfTct1UmfapQ6XezwF2JNhlSd8aI0="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Metadata"; @@ -190,8 +190,8 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Metadata"; - version = "8.0.6"; - hash = "sha256-lsfqs4xc6OlB2vgjIsf3vL2OodM6bp5JDhUbOBjDfJ0="; + version = "8.0.8"; + hash = "sha256-eyxHj0o790VC4TuXDVbxjqMpKwQVRgRxDVUzBGPebZM="; }) (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; @@ -200,8 +200,8 @@ }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; - version = "17.10.0"; - hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; + version = "17.11.1"; + hash = "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; @@ -235,8 +235,8 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; - version = "8.0.0"; - hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; + version = "8.0.1"; + hash = "sha256-m8daXRK1Qn9y2c8SmtWu9ysLHwFJtEWiUQoAnMalw7s="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; @@ -255,13 +255,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Localization"; - version = "8.0.6"; - hash = "sha256-IUrCg2/pkAxFcf29GEh4/Q3P6QQdbeXh/PN2jHDmoAs="; + version = "8.0.8"; + hash = "sha256-dX8HUYxWuzQUJfMW3WyH6mPFlh5i+J9UdND1rhkjwMs="; }) (fetchNuGet { pname = "Microsoft.Extensions.Localization.Abstractions"; - version = "8.0.6"; - hash = "sha256-S6xL+ZG71Z/IpdWLOHtuR7aEFyO6CA0B2aFFq33u67I="; + version = "8.0.8"; + hash = "sha256-DfzIHT+S86FYQDtTKxrdwpiEgUFp+zQlIdlMytNksnQ="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; @@ -305,13 +305,13 @@ }) (fetchNuGet { pname = "Microsoft.JSInterop"; - version = "8.0.6"; - hash = "sha256-lKOvph7MvyvGuuNZZGa0ZGcSH87n6vVxUgc9C/rsC3E="; + version = "8.0.8"; + hash = "sha256-Mexoz07Bb3SRp1Gjfuvb25ZgPUnpmOq3wjZZhnBP0X0="; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; - version = "17.10.0"; - hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; + version = "17.11.1"; + hash = "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; @@ -338,10 +338,15 @@ version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) + (fetchNuGet { + pname = "Microsoft.TestPlatform.ObjectModel"; + version = "17.11.1"; + hash = "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4="; + }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; - version = "17.10.0"; - hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; + version = "17.11.1"; + hash = "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU="; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; @@ -350,8 +355,8 @@ }) (fetchNuGet { pname = "MudBlazor"; - version = "7.3.0"; - hash = "sha256-EiHcGTTSi1ID9GpjyDGX3nqPc/fz4Xx5H6udqinRGHs="; + version = "7.8.0"; + hash = "sha256-DZbe5vCKh2awrYdrs4YUtzKUQVyx3TymYDAD0asBNsA="; }) (fetchNuGet { pname = "NETStandard.Library"; @@ -375,13 +380,13 @@ }) (fetchNuGet { pname = "NUnit"; - version = "4.1.0"; - hash = "sha256-srzj0lf2ReKw41TnigZwf8rqKKNzGRRVrgN3hR/vRjo="; + version = "4.2.2"; + hash = "sha256-+0OS67ITalmG9arYCgQF/+YbmPRnB3pIIykew0kvoCc="; }) (fetchNuGet { pname = "NUnit.Analyzers"; - version = "4.2.0"; - hash = "sha256-+YtDcIIWo1vOEXjQ/M6a+OrdzgTqinDKM2vVNmy4tSo="; + version = "4.3.0"; + hash = "sha256-L/agsdfGdIICWmBeD/dm3lHGnTDyOF0hArLd42n09SY="; }) (fetchNuGet { pname = "NUnit3TestAdapter"; @@ -680,8 +685,8 @@ }) (fetchNuGet { pname = "Serilog.AspNetCore"; - version = "8.0.1"; - hash = "sha256-a07P+0co6QuLuUw09PvvpLf9gix88Nw3dACsnSRcuW4="; + version = "8.0.2"; + hash = "sha256-cRZHG2bqrESOxPVxq2v+mHx+oZBzZEPksrleGVXO1p0="; }) (fetchNuGet { pname = "Serilog.Expressions"; @@ -705,8 +710,8 @@ }) (fetchNuGet { pname = "Serilog.Settings.Configuration"; - version = "8.0.0"; - hash = "sha256-JQ39fvhOFSUHE6r9DXJvLaZI+Lk7AYzuskQu3ux+hQg="; + version = "8.0.2"; + hash = "sha256-iHRQt6vDk85/6HpMXiJluAwhkjgwEnL3IKavfDgFX0k="; }) (fetchNuGet { pname = "Serilog.Sinks.Console"; @@ -740,8 +745,8 @@ }) (fetchNuGet { pname = "Spectre.Console.Analyzer"; - version = "0.49.1"; - hash = "sha256-1HISNHRyzsNKTCimvJaYudsJm7lE+/pxcMdedqrtyWQ="; + version = "1.0.0"; + hash = "sha256-Om2PRAfm4LoPImty4zpGo/uoqha6ZnuCU6iNcAvKiUE="; }) (fetchNuGet { pname = "Spectre.Console.Cli"; @@ -850,18 +855,8 @@ }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; - version = "4.3.0"; - hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; - }) - (fetchNuGet { - pname = "System.Diagnostics.DiagnosticSource"; - version = "7.0.2"; - hash = "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E="; - }) - (fetchNuGet { - pname = "System.Diagnostics.DiagnosticSource"; - version = "8.0.0"; - hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; + version = "8.0.1"; + hash = "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; @@ -1225,7 +1220,7 @@ }) (fetchNuGet { pname = "YamlDotNet"; - version = "16.0.0"; - hash = "sha256-wCKzDkAuIpQ65MKe39Zn/K8iX8FKdkw49OHIi7m6GHU="; + version = "16.1.0"; + hash = "sha256-SUUiPnsuArPmD5GPD/eBS7p0ueRsh9Wb9ImcRHG6m58="; }) ] diff --git a/pkgs/by-name/re/recyclarr/package.nix b/pkgs/by-name/re/recyclarr/package.nix index 1ec4192bdd9c1..30afe7807b7ef 100644 --- a/pkgs/by-name/re/recyclarr/package.nix +++ b/pkgs/by-name/re/recyclarr/package.nix @@ -19,13 +19,13 @@ let in buildDotnetModule (finalAttrs: { pname = "recyclarr"; - version = "7.2.1"; + version = "7.2.4"; src = fetchFromGitHub { owner = "recyclarr"; repo = "recyclarr"; rev = "v${finalAttrs.version}"; - hash = "sha256-KXFGT1fprRKN+V+3k0hpjjaI/xpw6UDAk+jj9zMek7k="; + hash = "sha256-FFaGyMOXivorXVqCcYskEibnHnzhJ/AlxR46AtWFkI4="; }; projectFile = "Recyclarr.sln"; @@ -40,6 +40,8 @@ buildDotnetModule (finalAttrs: { ''; patches = [ ./001-Git-Version.patch ]; + enableParallelBuilding = false; + dotnetRestoreFlags = [ "--configfile=${nuget-config}" ]; doCheck = false; diff --git a/pkgs/by-name/re/redict/package.nix b/pkgs/by-name/re/redict/package.nix index 54820d6eb096b..a916cfcd3ba7e 100644 --- a/pkgs/by-name/re/redict/package.nix +++ b/pkgs/by-name/re/redict/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withSystemd systemd ++ lib.optionals tlsSupport [ openssl ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/Makefile --replace "-flto" "" ''; @@ -49,12 +49,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); # darwin currently lacks a pure `pgrep` which is extensively used here - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; checkPhase = '' runHook preCheck diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index 3497bc9ba4d13..51c80078e3725 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -1,42 +1,50 @@ -{ lib -, stdenv -, cacert -, nixosTests -, rustPlatform -, fetchFromGitHub -, darwin +{ + lib, + stdenv, + cacert, + nixosTests, + rustPlatform, + fetchFromGitHub, + darwin, }: rustPlatform.buildRustPackage rec { pname = "redlib"; - version = "0.35.1"; + version = "0.35.1-unstable-2024-09-22"; src = fetchFromGitHub { owner = "redlib-org"; repo = "redlib"; - rev = "refs/tags/v${version}"; - hash = "sha256-W1v7iOE60/6UyZSHQW+L+wHCoKnKUNb3kpm4LVLPZ6c="; + rev = "d5f137ce47de39e2c8c4ed09d13ba1f809bee560"; + hash = "sha256-12XKeBCKciKummI43oTbKGkkY0mghA82ir2C3LhnwSs="; }; - cargoHash = "sha256-3NQWiu/nTtHrivYL1pgxqQxEuIW0xfjxwK0ZEa2y1Kk="; + cargoHash = "sha256-XSmeJAK18J9WxrG5orFbAB9hWVLQQ50oB223oHT3OOk="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; checkFlags = [ # All these test try to connect to Reddit. + # utils.rs "--skip=test_fetching_subreddit_quarantined" "--skip=test_fetching_nsfw_subreddit" "--skip=test_fetching_ws" + # client.rs "--skip=test_obfuscated_share_link" "--skip=test_share_link_strip_json" - "--skip=test_localization_popular" + + # subreddit.rs "--skip=test_fetching_subreddit" + "--skip=test_gated_and_quarantined" + + # user.rs "--skip=test_fetching_user" # These try to connect to the oauth client + # oauth.rs "--skip=test_oauth_client" "--skip=test_oauth_client_refresh" "--skip=test_oauth_token_exists" diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix index f15b9b365a4b2..f4b66763daa18 100644 --- a/pkgs/by-name/re/redmine/package.nix +++ b/pkgs/by-name/re/redmine/package.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }: +{ lib, stdenv, fetchurl, bundlerEnv, ruby_3_2, makeWrapper, nixosTests }: let version = "5.1.3"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; - inherit ruby; + ruby = ruby_3_2; gemdir = ./.; groups = [ "development" "ldap" "markdown" "common_mark" "minimagick" "test" ]; }; diff --git a/pkgs/by-name/re/redo/package.nix b/pkgs/by-name/re/redo/package.nix new file mode 100644 index 0000000000000..8e3e138501e96 --- /dev/null +++ b/pkgs/by-name/re/redo/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + perl, +}: + +stdenv.mkDerivation { + pname = "redo"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "jdebp"; + repo = "redo"; + rev = "91f5462339ef6373f9ac80902cfae2b614e2902b"; + hash = "sha256-cA8UN4aQnJ8VyMW3mDOIPna4Ucw1kp8CirZTDhSoCpU="; + }; + + nativeBuildInputs = [ + perl # for pod2man + ]; + + buildPhase = '' + package/compile + ''; + + installPhase = '' + package/export $out/ + ''; + + meta = { + homepage = "https://github.com/jdebp/redo"; + description = "System for building target files from source files"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ momeemt ]; + mainProgram = "redo"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/tools/bootloaders/refind/0001-toolchain.patch b/pkgs/by-name/re/refind/0001-toolchain.patch similarity index 100% rename from pkgs/tools/bootloaders/refind/0001-toolchain.patch rename to pkgs/by-name/re/refind/0001-toolchain.patch diff --git a/pkgs/tools/bootloaders/refind/0002-preserve-dates.patch b/pkgs/by-name/re/refind/0002-preserve-dates.patch similarity index 100% rename from pkgs/tools/bootloaders/refind/0002-preserve-dates.patch rename to pkgs/by-name/re/refind/0002-preserve-dates.patch diff --git a/pkgs/by-name/re/refind/package.nix b/pkgs/by-name/re/refind/package.nix new file mode 100644 index 0000000000000..2958d3be85fd7 --- /dev/null +++ b/pkgs/by-name/re/refind/package.nix @@ -0,0 +1,154 @@ +{ lib +, stdenv +, fetchurl +, gnu-efi +, nixosTests +, efibootmgr +, openssl +, withSbsigntool ? false # currently, cross compiling sbsigntool is broken, so default to false +, sbsigntool +, makeWrapper +}: + +let + archids = { + x86_64-linux = { hostarch = "x86_64"; efiPlatform = "x64"; }; + i686-linux = rec { hostarch = "ia32"; efiPlatform = hostarch; }; + aarch64-linux = { hostarch = "aarch64"; efiPlatform = "aa64"; }; + }; + + inherit + (archids.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}")) + hostarch efiPlatform; +in + +stdenv.mkDerivation rec { + pname = "refind"; + version = "0.14.2"; + + src = fetchurl { + url = "mirror://sourceforge/project/refind/${version}/refind-src-${version}.tar.gz"; + hash = "sha256-99k86A2na4bFZygeoiW2qHkHzob/dyM8k1elIsEVyPA="; + }; + + patches = [ + # Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds. + ./0001-toolchain.patch + # Avoid leaking the build timestamp + # https://sourceforge.net/p/refind/code/merge-requests/53/ + ./0002-preserve-dates.patch + ]; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gnu-efi ]; + + hardeningDisable = [ "stackprotector" ]; + + makeFlags = + [ "prefix=" + "EFIINC=${gnu-efi}/include/efi" + "EFILIB=${gnu-efi}/lib" + "GNUEFILIB=${gnu-efi}/lib" + "EFICRT0=${gnu-efi}/lib" + "HOSTARCH=${hostarch}" + "ARCH=${hostarch}" + ] ++ lib.optional stdenv.hostPlatform.isAarch64 [ + # aarch64 is special for GNU-EFI, see BUILDING.txt + "GNUEFI_ARM64_TARGET_SUPPORT=y" + ]; + + buildFlags = [ "gnuefi" "fs_gnuefi" ]; + + installPhase = '' + runHook preInstall + + install -d $out/bin/ + install -d $out/share/refind/drivers_${efiPlatform}/ + install -d $out/share/refind/tools_${efiPlatform}/ + install -d $out/share/refind/docs/html/ + install -d $out/share/refind/docs/Styles/ + install -d $out/share/refind/fonts/ + install -d $out/share/refind/icons/ + install -d $out/share/refind/images/ + install -d $out/share/refind/keys/ + + # refind uefi app + install -D -m0644 refind/refind_${efiPlatform}.efi $out/share/refind/refind_${efiPlatform}.efi + + # uefi drivers + install -D -m0644 drivers_${efiPlatform}/*.efi $out/share/refind/drivers_${efiPlatform}/ + + # uefi apps + install -D -m0644 gptsync/gptsync_${efiPlatform}.efi $out/share/refind/tools_${efiPlatform}/gptsync_${efiPlatform}.efi + + # helper scripts + install -D -m0755 refind-install $out/bin/refind-install + install -D -m0755 mkrlconf $out/bin/refind-mkrlconf + install -D -m0755 mvrefind $out/bin/refind-mvrefind + install -D -m0755 fonts/mkfont.sh $out/bin/refind-mkfont + + # sample config files + install -D -m0644 refind.conf-sample $out/share/refind/refind.conf-sample + + # docs + install -D -m0644 docs/refind/* $out/share/refind/docs/html/ + install -D -m0644 docs/Styles/* $out/share/refind/docs/Styles/ + install -D -m0644 README.txt $out/share/refind/docs/README.txt + install -D -m0644 NEWS.txt $out/share/refind/docs/NEWS.txt + install -D -m0644 BUILDING.txt $out/share/refind/docs/BUILDING.txt + install -D -m0644 CREDITS.txt $out/share/refind/docs/CREDITS.txt + + # fonts + install -D -m0644 fonts/* $out/share/refind/fonts/ + rm -f $out/share/refind/fonts/mkfont.sh + + # icons + install -D -m0644 icons/*.png $out/share/refind/icons/ + + # images + install -D -m0644 images/*.{png,bmp} $out/share/refind/images/ + + # keys + install -D -m0644 keys/* $out/share/refind/keys/ + + # Fix variable definition of 'RefindDir' which is used to locate ressource files. + sed -i "s,\bRefindDir=\"\$This.*,RefindDir=$out/share/refind,g" $out/bin/refind-install + + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/refind-install \ + --prefix PATH : ${lib.makeBinPath ( [ efibootmgr openssl ] ++ lib.optional withSbsigntool sbsigntool )} + wrapProgram $out/bin/refind-mvrefind \ + --prefix PATH : ${lib.makeBinPath [ efibootmgr ]} + ''; + + passthru.tests = { + uefiCdrom = nixosTests.boot.uefiCdrom; + }; + + meta = with lib; { + description = "Graphical {,U}EFI boot manager"; + longDescription = '' + rEFInd is a graphical boot manager for EFI- and UEFI-based + computers, such as all Intel-based Macs and recent (most 2011 + and later) PCs. rEFInd presents a boot menu showing all the EFI + boot loaders on the EFI-accessible partitions, and optionally + BIOS-bootable partitions on Macs. EFI-compatible OSes, including + Linux, provide boot loaders that rEFInd can detect and + launch. rEFInd can launch Linux EFI boot loaders such as ELILO, + GRUB Legacy, GRUB 2, and 3.3.0 and later kernels with EFI stub + support. EFI filesystem drivers for ext2/3/4fs, ReiserFS, HFS+, + and ISO-9660 enable rEFInd to read boot loaders from these + filesystems, too. rEFInd's ability to detect boot loaders at + runtime makes it very easy to use, particularly when paired with + Linux kernels that provide EFI stub support. + ''; + homepage = "http://refind.sourceforge.net/"; + maintainers = with maintainers; [ AndersonTorres chewblacka ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; + license = licenses.gpl3Plus; + }; + +} diff --git a/pkgs/by-name/re/refinery-cli/package.nix b/pkgs/by-name/re/refinery-cli/package.nix index c70e69bee9885..59a5dd255ba69 100644 --- a/pkgs/by-name/re/refinery-cli/package.nix +++ b/pkgs/by-name/re/refinery-cli/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; meta = with lib; { description = "Run migrations for the Refinery ORM for Rust via the CLI"; diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index 7372fac744363..19bf4bbb4b4f9 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -2,16 +2,22 @@ buildGoModule rec { name = "regal"; - version = "0.25.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "StyraInc"; repo = "regal"; rev = "v${version}"; - hash = "sha256-yhlkvvNkZtpVx2uZVvXjr3eqBFXHDJ5qyO6k5EPNfww="; + hash = "sha256-IGf7iIL2q3w7qIJ0oxDILxcNjexuEr4bsYK+v24Ae+c="; }; - vendorHash = "sha256-gZYQEJAlm8qslHGfUsA8np43zdiPDYyhKm8HZIBR3ys="; + vendorHash = "sha256-Yl8ZFEiAJRAetc3e2ZdrbTdYhx/Ek9nr3mMQ0H7+aGM="; + + ldflags = [ + "-s" "-w" + "-X github.com/styrainc/regal/pkg/version.Version=${version}" + "-X github.com/styrainc/regal/pkg/version.Commit=${version}" + ]; meta = with lib; { description = "Linter and language server for Rego"; diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index da5b97c8ef470..d176accf9d567 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -41,6 +41,6 @@ rustPlatform.buildRustPackage rec { license = with lib.licenses; [ asl20 mit ]; maintainers = with lib.maintainers; [ dannixon ]; mainProgram = "release-plz"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index 78ae694b16599..1bf1df34ba275 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -15,11 +15,11 @@ tcl.mkTclDerivation rec { pname = "remind"; - version = "05.00.02"; + version = "05.00.06"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - hash = "sha256-XxVjAV3TGDPI8XaFXXSminsMffq8m8ljw68YMIC2lYg="; + hash = "sha256-uGGh1eRPT6bGYF4F9e79D+aMnpOQukktlmJbyM2uRco="; }; propagatedBuildInputs = lib.optionals withGui [ @@ -38,7 +38,7 @@ tcl.mkTclDerivation rec { --replace-fail 'set Rem2PDF "rem2pdf"' "set Rem2PDF \"$out/bin/rem2pdf\"" ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ # On Darwin setenv and unsetenv are defined in stdlib.h from libSystem "-DHAVE_SETENV" "-DHAVE_UNSETENV" diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 0351c28fcf651..5df3689928c1e 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.16.107"; + version = "1.16.116"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-U3m8daxJzM5lp6AAPOgNdaxWaHvhkt7KRCisHQghY9Y="; + hash = "sha256-H89ge4b8Xm6YJXQSiPA/FBnlbekAG0Vobr2EQ4459q4="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix new file mode 100644 index 0000000000000..17d161aa707b3 --- /dev/null +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -0,0 +1,143 @@ +{ + lib, + addDriverRunpath, + autoconf, + automake, + bison, + cmake, + fetchFromGitHub, + libXdmcp, + libglvnd, + libpthreadstubs, + makeWrapper, + nix-update-script, + pcre, + pkg-config, + python311Packages, + qt5, + stdenv, + vulkan-loader, + wayland, + # Boolean flags + waylandSupport ? true, +}: + +let + custom_swig = fetchFromGitHub { + owner = "baldurk"; + repo = "swig"; + rev = "renderdoc-modified-7"; + hash = "sha256-RsdvxBBQvwuE5wSwL8OBXg5KMSpcO6EuMS0CzWapIpc="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "renderdoc"; + version = "1.35"; + + src = fetchFromGitHub { + owner = "baldurk"; + repo = "renderdoc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-iBe3JNtG9P1IAd00s/fL2RcImMrTwruld98OFHrIhp4="; + }; + + outputs = [ + "out" + "dev" + "doc" + ]; + + buildInputs = + [ + libXdmcp + libpthreadstubs + python311Packages.pyside2 + python311Packages.pyside2-tools + python311Packages.shiboken2 + qt5.qtbase + qt5.qtsvg + vulkan-loader + ] + ++ lib.optionals waylandSupport [ + wayland + ]; + + nativeBuildInputs = [ + addDriverRunpath + autoconf + automake + bison + cmake + makeWrapper + pcre + pkg-config + python311Packages.python + qt5.qtx11extras + qt5.wrapQtAppsHook + ]; + + cmakeFlags = [ + (lib.cmakeFeature "BUILD_VERSION_HASH" finalAttrs.src.rev) + (lib.cmakeFeature "BUILD_VERSION_DIST_NAME" "NixOS") + (lib.cmakeFeature "BUILD_VERSION_DIST_VER" finalAttrs.version) + (lib.cmakeFeature "BUILD_VERSION_DIST_CONTACT" "https://github.com/NixOS/nixpkgs/") + (lib.cmakeBool "BUILD_VERSION_STABLE" true) + (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) + ]; + + dontWrapQtApps = true; + + strictDeps = true; + + postUnpack = '' + cp -r ${custom_swig} swig + chmod -R +w swig + patchShebangs swig/autogen.sh + ''; + + # TODO: define these in the above array via placeholders, once those are + # widely supported + preConfigure = '' + cmakeFlagsArray+=( + "-DRENDERDOC_SWIG_PACKAGE=$PWD/../swig" + "-DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" + ) + ''; + + preFixup = + let + libPath = lib.makeLibraryPath [ + libglvnd + vulkan-loader + ]; + in + '' + wrapQtApp $out/bin/qrenderdoc \ + --suffix LD_LIBRARY_PATH : "$out/lib:${libPath}" + wrapProgram $out/bin/renderdoccmd \ + --suffix LD_LIBRARY_PATH : "$out/lib:${libPath}" + ''; + + # The only documentation for this so far is in the setup-hook.sh script from + # add-opengl-runpath + postFixup = '' + addDriverRunpath $out/lib/librenderdoc.so + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://renderdoc.org/"; + description = "Single-frame graphics debugger"; + longDescription = '' + RenderDoc is a free MIT licensed stand-alone graphics debugger that + allows quick and easy single-frame capture and detailed introspection + of any application using Vulkan, D3D11, OpenGL or D3D12 across + Windows 7 - 10, Linux or Android. + ''; + license = lib.licenses.mit; + mainProgram = "renderdoccmd"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.i686); + }; +}) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 87a6ece3d0351..5e81fa72b270d 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-08-20"; + version = "0-unstable-2024-09-27"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "ca0e43957140ee0cd7795b7a42ffb04fdcb98328"; - hash = "sha256-6SgnYFta9FgHhc6Da1ItFO/UK2UtXU14bTl+sjX0I9s="; + rev = "9963f8eb0ef9d356b2d1bfa031c2e136ce4a5509"; + hash = "sha256-RrKnLSBCtXUfdC9PNXddIAFFBbT39ZYxJJqYwKHYLP0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index f5ed94e77400e..5f2d0f79be040 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.2+20240829gitfedcdbdaf"; + version = "1.15.3+20240927gitbb819bb49"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-pZ8+wxu7357jXGhFFgG9RQ0Jy8a3CfKpe3x31VbsgfQ="; + hash = "sha256-IcQKAslgmN+ChYJLsS0umR1/FSAicWyP6Ek/v668+40="; }; passthru.updateScript = diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index be29c275905cc..edea55abb82de 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -7,7 +7,6 @@ overrideSDK, pnpm_9, python3, - renovate, testers, xcbuild, nixosTests, @@ -21,13 +20,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "renovate"; - version = "38.55.4"; + version = "38.93.1"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-62nijbuHCNG6ht2W3EJB6fwNvYhZHzDp+RyH1prBWVQ="; + hash = "sha256-4NvFS4WWdV3Csuv28/wq6EvB+in5bo1N4Fn602bi4rE="; }; postPatch = '' @@ -44,7 +43,7 @@ stdenv'.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-wdlGYIVGHLB2D4wSA5pjFRSHoetyLLN7v50K8nXxMO0="; + hash = "sha256-cjk7PS4DUAgmg+mLUaWJFTjQv2GcPdr1VchNRjJgqsk="; }; env.COREPACK_ENABLE_STRICT = 0; @@ -91,7 +90,7 @@ stdenv'.mkDerivation (finalAttrs: { passthru = { tests = { - version = testers.testVersion { package = renovate; }; + version = testers.testVersion { package = finalAttrs.finalPackage; }; vm-test = nixosTests.renovate; }; updateScript = nix-update-script { }; diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix index d31ad9ced8641..5cc7a0970556b 100644 --- a/pkgs/by-name/re/renpy/package.nix +++ b/pkgs/by-name/re/renpy/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - python3, + python311, pkg-config, SDL2, libpng, @@ -22,8 +22,8 @@ let # base_version is of the form major.minor.patch # vc_version is of the form YYMMDDCC # version corresponds to the tag on GitHub - base_version = "8.2.1"; - vc_version = "24030407"; + base_version = "8.3.1"; + vc_version = "24090601"; version = "${base_version}.${vc_version}"; in stdenv.mkDerivation { @@ -34,7 +34,7 @@ stdenv.mkDerivation { owner = "renpy"; repo = "renpy"; rev = version; - hash = "sha256-07Hj8mJGR0+Pn1DQ+sK5YQ3x3CTMsZ5h5yEoz44b2TM="; + hash = "sha256-k8mcDzaFngRF3Xl9cinUFU0T9sjxNIVrECUguARJVZ4="; }; nativeBuildInputs = [ @@ -42,8 +42,8 @@ stdenv.mkDerivation { makeWrapper # Ren'Py currently does not compile on Cython 3.x. # See https://github.com/renpy/renpy/issues/5359 - python3.pkgs.cython_0 - python3.pkgs.setuptools + python311.pkgs.cython_0 + python311.pkgs.setuptools ]; buildInputs = @@ -59,7 +59,7 @@ stdenv.mkDerivation { zlib harfbuzz ] - ++ (with python3.pkgs; [ + ++ (with python311.pkgs; [ python pygame-sdl2 tkinter @@ -100,13 +100,13 @@ stdenv.mkDerivation { EOF ''; - buildPhase = with python3.pkgs; '' + buildPhase = with python311.pkgs; '' runHook preBuild ${python.pythonOnBuildForHost.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES runHook postBuild ''; - installPhase = with python3.pkgs; '' + installPhase = with python311.pkgs; '' runHook preInstall ${python.pythonOnBuildForHost.interpreter} module/setup.py install_lib -d $out/${python.sitePackages} @@ -120,7 +120,7 @@ stdenv.mkDerivation { runHook postInstall ''; - env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}"; + env.NIX_CFLAGS_COMPILE = with python311.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}"; meta = { description = "Visual Novel Engine"; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/by-name/re/rep-gtk/package.nix similarity index 100% rename from pkgs/development/libraries/rep-gtk/default.nix rename to pkgs/by-name/re/rep-gtk/package.nix diff --git a/pkgs/development/libraries/rep-gtk/setup-hook.sh b/pkgs/by-name/re/rep-gtk/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/rep-gtk/setup-hook.sh rename to pkgs/by-name/re/rep-gtk/setup-hook.sh diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix index 2c906b0311d67..cd3f2edec7132 100644 --- a/pkgs/by-name/re/reposilite/package.nix +++ b/pkgs/by-name/re/reposilite/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "Reposilite"; - version = "3.5.16"; + version = "3.5.17"; src = fetchurl { url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar"; - hash = "sha256-zketAvn0XgBRAS+Bb3KcUcpdydbQQruS+gZ5Bfrjiig="; + hash = "sha256-O2dDkjypTLRu3tWRLEQQSwgX53doTsTxGSEfA2k0hlI="; }; dontUnpack = true; diff --git a/pkgs/by-name/re/rerun/0001-re_space_view_time_series-utils-patch-out-doctests-w.patch b/pkgs/by-name/re/rerun/0001-re_space_view_time_series-utils-patch-out-doctests-w.patch deleted file mode 100644 index d43ae339641eb..0000000000000 --- a/pkgs/by-name/re/rerun/0001-re_space_view_time_series-utils-patch-out-doctests-w.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f6c5dde13a39bd149d892162e2ef72267f4c4a57 Mon Sep 17 00:00:00 2001 -From: Someone Serge <sergei.kozlukov@aalto.fi> -Date: Thu, 15 Feb 2024 18:05:16 +0000 -Subject: [PATCH] re_space_view_time_series: utils: patch out doctests w - unstable features - ---- - crates/re_space_view_time_series/src/util.rs | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/crates/re_space_view_time_series/src/util.rs b/crates/re_space_view_time_series/src/util.rs -index 83ce5362f..59d3b9734 100644 ---- a/crates/re_space_view_time_series/src/util.rs -+++ b/crates/re_space_view_time_series/src/util.rs -@@ -288,12 +288,7 @@ fn add_series_runs( - /// is finite `x == x.next_up().next_down()` also holds. - /// - /// ```rust --/// #![feature(float_next_up_down)] --/// // f64::EPSILON is the difference between 1.0 and the next number up. --/// assert_eq!(1.0f64.next_up(), 1.0 + f64::EPSILON); --/// // But not for most numbers. --/// assert!(0.1f64.next_up() < 0.1 + f64::EPSILON); --/// assert_eq!(9007199254740992f64.next_up(), 9007199254740994.0); -+/// // PATCHED OUT THE UNSTABLE float_next_up_down - /// ``` - /// - /// [`NEG_INFINITY`]: f64::NEG_INFINITY --- -2.43.0 - diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 4d9c8da8041c0..41d4f7828884f 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -22,28 +22,24 @@ rustPlatform.buildRustPackage rec { pname = "rerun"; - version = "0.13.0"; - + version = "0.18.2"; src = fetchFromGitHub { owner = "rerun-io"; repo = "rerun"; rev = version; - hash = "sha256-HgzzuvCpzKgWC8it0PSq62hBjjqpdgYtQQ50SNbr3do="; + sha256 = "sha256-mQjjgRKNFSts34Lphfje9H1BLY9nybCrJ2V09nMzVDM="; }; - patches = [ - # Disables a doctest that depends on a nightly feature - ./0001-re_space_view_time_series-utils-patch-out-doctests-w.patch - - # "Fix cell size test now that the overhead has shrunk" - # https://github.com/rerun-io/rerun/pull/5917 - (fetchpatch { - url = "https://github.com/rerun-io/rerun/commit/933fc5cc1f3ee262a78bd4647257295747671152.patch"; - hash = "sha256-jCeGfzKt0oYqIea+7bA2V/U9VIjhVvfQzLRrYG4jaHY="; - }) - ]; + cargoHash = "sha256-ZyjRe4M6RabSKhKCLa1ed1fsF6dkUt2a1c8C/1E48+M="; + # the crate uses an old rust version (currently 1.76) + # nixpkgs only works with the latest rust (currently 1.80) + # so we patch this + cargoPatches = [ ./rust-version.patch ]; - cargoHash = "sha256-qvnkOlcjADV4b+JfFAy9yNaZGaf0ZO7hh9HBg5XmPi0="; + cargoBuildFlags = [ "--package rerun-cli" ]; + cargoTestFlags = [ "--package rerun-cli" ]; + buildNoDefaultFeatures = true; + buildFeatures = [ "native_viewer" ]; nativeBuildInputs = [ (lib.getBin binaryen) # wasm-opt @@ -65,7 +61,7 @@ rustPlatform.buildRustPackage rec { libxkbcommon vulkan-loader ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreGraphics @@ -76,7 +72,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.QuartzCore darwin.apple_sdk.frameworks.Security ] - ++ lib.optionals stdenv.isLinux [ (lib.getLib wayland) ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ]; addDlopenRunpaths = map (p: "${lib.getLib p}/lib") ( lib.optionals stdenv.hostPlatform.isLinux [ @@ -105,13 +101,8 @@ rustPlatform.buildRustPackage rec { postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ]; - cargoTestFlags = [ - "-p" - "rerun" - "--workspace" - "--exclude=crates/rerun/src/lib.rs" - ]; - + # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work + patches = [ ./tests.patch ]; passthru.tests = { inherit (python3Packages) rerun-sdk; }; @@ -124,7 +115,10 @@ rustPlatform.buildRustPackage rec { asl20 mit ]; - maintainers = with maintainers; [ SomeoneSerge ]; + maintainers = with maintainers; [ + SomeoneSerge + robwalt + ]; mainProgram = "rerun"; }; } diff --git a/pkgs/by-name/re/rerun/rust-version.patch b/pkgs/by-name/re/rerun/rust-version.patch new file mode 100644 index 0000000000000..c7147c0081fae --- /dev/null +++ b/pkgs/by-name/re/rerun/rust-version.patch @@ -0,0 +1,436 @@ + BUILD.md | 4 ++-- + CHANGELOG.md | 4 ++-- + Cargo.toml | 2 +- + clippy.toml | 2 +- + crates/build/re_build_info/src/build_info.rs | 2 +- + crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md | 2 +- + crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md | 2 +- + docs/content/getting-started/installing-viewer.md | 2 +- + docs/content/getting-started/quick-start/rust.md | 2 +- + examples/rust/clock/Cargo.toml | 2 +- + examples/rust/custom_data_loader/Cargo.toml | 2 +- + examples/rust/custom_space_view/Cargo.toml | 2 +- + examples/rust/custom_store_subscriber/Cargo.toml | 2 +- + examples/rust/dna/Cargo.toml | 2 +- + examples/rust/extend_viewer_ui/Cargo.toml | 2 +- + examples/rust/external_data_loader/Cargo.toml | 2 +- + examples/rust/incremental_logging/Cargo.toml | 2 +- + examples/rust/log_file/Cargo.toml | 2 +- + examples/rust/minimal/Cargo.toml | 2 +- + examples/rust/minimal_options/Cargo.toml | 2 +- + examples/rust/minimal_serve/Cargo.toml | 2 +- + examples/rust/objectron/Cargo.toml | 2 +- + examples/rust/raw_mesh/Cargo.toml | 2 +- + examples/rust/shared_recording/Cargo.toml | 2 +- + examples/rust/spawn_viewer/Cargo.toml | 2 +- + examples/rust/stdio/Cargo.toml | 2 +- + examples/rust/template/Cargo.toml | 2 +- + rust-toolchain | 2 +- + scripts/clippy_wasm/clippy.toml | 2 +- + scripts/lint.py | 2 +- + 30 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/BUILD.md b/BUILD.md +index c0bc6e074..a74f86967 100644 +--- a/BUILD.md ++++ b/BUILD.md +@@ -23,12 +23,12 @@ cd rerun + + Now install the `pixi` package manager: <https://github.com/prefix-dev/pixi?tab=readme-ov-file#installation> + +-Make sure `cargo --version` prints `1.76.0` once you are done. ++Make sure `cargo --version` prints `1.80.0` once you are done. + + If you are using an Apple-silicon Mac (M1, M2), make sure `rustc -vV` outputs `host: aarch64-apple-darwin`. If not, this should fix it: + + ```sh +-rustup set default-host aarch64-apple-darwin && rustup install 1.76.0 ++rustup set default-host aarch64-apple-darwin && rustup install 1.80.0 + ``` + + ## Building and running the Viewer +diff --git a/CHANGELOG.md b/CHANGELOG.md +index 7efd062ea..82da0d411 100644 +--- a/CHANGELOG.md ++++ b/CHANGELOG.md +@@ -672,7 +672,7 @@ As always there's a lot going on under the hood: + - New data APIs 6: cached archetype queries [#5673](https://github.com/rerun-io/rerun/pull/5673) + - Remove justfile & fully replace remaining commands with Pixi [#5892](https://github.com/rerun-io/rerun/pull/5892) + - Replace requirements-docs.txt with a Python doc Pixi environment [#5909](https://github.com/rerun-io/rerun/pull/5909) +-- Update to Rust 1.76 [#5908](https://github.com/rerun-io/rerun/pull/5908) ++- Update to Rust 1.80 [#5908](https://github.com/rerun-io/rerun/pull/5908) + - Remove all dev/ci requirements.txt and fully replace with Pixi [#5939](https://github.com/rerun-io/rerun/pull/5939) + - Markdown linter [#6181](https://github.com/rerun-io/rerun/pull/6181) + +@@ -1337,7 +1337,7 @@ Check out our [migration guide](https://www.rerun.io/docs/reference/migration/mi + + #### 📦 Dependencies + - Update egui and wgpu [#4111](https://github.com/rerun-io/rerun/pull/4111) +-- Update Rust to 1.76.0 [#4390](https://github.com/rerun-io/rerun/pull/4390) ++- Update Rust to 1.80.0 [#4390](https://github.com/rerun-io/rerun/pull/4390) + + #### 🤷 Other + #### 🤷 Other +diff --git a/Cargo.toml b/Cargo.toml +index 48ab565a3..a479a5394 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -24,7 +24,7 @@ homepage = "https://rerun.io" + include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"] + license = "MIT OR Apache-2.0" + repository = "https://github.com/rerun-io/rerun" +-rust-version = "1.76" ++rust-version = "1.80" + version = "0.18.2" + + [workspace.dependencies] +diff --git a/clippy.toml b/clippy.toml +index 70ff980b8..f3d9d04b4 100644 +--- a/clippy.toml ++++ b/clippy.toml +@@ -3,7 +3,7 @@ + # ----------------------------------------------------------------------------- + # Section identical to the main scripts/clippy_wasm/clippy.toml: + +-msrv = "1.76" ++msrv = "1.80" + + allow-unwrap-in-tests = true + +diff --git a/crates/build/re_build_info/src/build_info.rs b/crates/build/re_build_info/src/build_info.rs +index 55abb7290..6efb10e3b 100644 +--- a/crates/build/re_build_info/src/build_info.rs ++++ b/crates/build/re_build_info/src/build_info.rs +@@ -153,7 +153,7 @@ fn crate_version_from_build_info_string() { + patch: 0, + meta: Some(crate::crate_version::Meta::DevAlpha(7)), + }, +- rustc_version: "1.76.0 (d5c2e9c34 2023-09-13)", ++ rustc_version: "1.80.0 (d5c2e9c34 2023-09-13)", + llvm_version: "16.0.5", + git_hash: "", + git_branch: "", +diff --git a/crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md b/crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md +index 1130ccd7e..c5b748b77 100644 +--- a/crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md ++++ b/crates/viewer/re_viewer/data/quick_start_guides/rust_connect.md +@@ -10,7 +10,7 @@ Let's try it out in a brand-new Rust project: + cargo init cube && cd cube && cargo add rerun --features native_viewer + ``` + +-Note that the Rerun SDK requires a working installation of Rust 1.76+. ++Note that the Rerun SDK requires a working installation of Rust 1.80+. + + ## Logging your own data + +diff --git a/crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md b/crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md +index fc9cfc1c6..cde772f1a 100644 +--- a/crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md ++++ b/crates/viewer/re_viewer/data/quick_start_guides/rust_spawn.md +@@ -10,7 +10,7 @@ Let's try it out in a brand-new Rust project: + cargo init cube && cd cube && cargo add rerun + ``` + +-Note that the Rerun SDK requires a working installation of Rust 1.76+. ++Note that the Rerun SDK requires a working installation of Rust 1.80+. + + ## Logging your own data + +diff --git a/docs/content/getting-started/installing-viewer.md b/docs/content/getting-started/installing-viewer.md +index 8327753b2..55ebc55e8 100644 +--- a/docs/content/getting-started/installing-viewer.md ++++ b/docs/content/getting-started/installing-viewer.md +@@ -40,7 +40,7 @@ There are many ways to install the viewer. Please pick whatever works best for y + - Download `rerun-cli` for your platform from the [GitHub Release artifacts](https://github.com/rerun-io/rerun/releases/latest/). + - Via Cargo + - `cargo binstall rerun-cli` - download binaries via [`cargo binstall`](https://github.com/cargo-bins/cargo-binstall) +- - `cargo install rerun-cli --locked` - build it from source (this requires Rust 1.76+) ++ - `cargo install rerun-cli --locked` - build it from source (this requires Rust 1.80+) + - Together with the Rerun [Python SDK](./quick-start/python.md): + - `pip3 install rerun-sdk` - download it via pip + - `conda install -c conda-forge rerun-sdk` - download via Conda +diff --git a/docs/content/getting-started/quick-start/rust.md b/docs/content/getting-started/quick-start/rust.md +index 45d1beb1a..c79bc34db 100644 +--- a/docs/content/getting-started/quick-start/rust.md ++++ b/docs/content/getting-started/quick-start/rust.md +@@ -5,7 +5,7 @@ order: 3 + + ## Setup + +-The Rerun SDK for Rust requires a working installation of Rust 1.76+. ++The Rerun SDK for Rust requires a working installation of Rust 1.80+. + + After you have [installed the viewer](../installing-viewer.md#installing-the-viewer) you can simply add [the Rerun crate](https://crates.io/crates/rerun) to your project with `cargo add rerun`. + +diff --git a/examples/rust/clock/Cargo.toml b/examples/rust/clock/Cargo.toml +index ba2999675..7c038ebc4 100644 +--- a/examples/rust/clock/Cargo.toml ++++ b/examples/rust/clock/Cargo.toml +@@ -2,7 +2,7 @@ + name = "clock" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/custom_data_loader/Cargo.toml b/examples/rust/custom_data_loader/Cargo.toml +index e5df4cf66..37cbe80cb 100644 +--- a/examples/rust/custom_data_loader/Cargo.toml ++++ b/examples/rust/custom_data_loader/Cargo.toml +@@ -2,7 +2,7 @@ + name = "custom_data_loader" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/custom_space_view/Cargo.toml b/examples/rust/custom_space_view/Cargo.toml +index ae1babd40..5c012cf7c 100644 +--- a/examples/rust/custom_space_view/Cargo.toml ++++ b/examples/rust/custom_space_view/Cargo.toml +@@ -2,7 +2,7 @@ + name = "custom_space_view" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/custom_store_subscriber/Cargo.toml b/examples/rust/custom_store_subscriber/Cargo.toml +index 627f21d7b..52d8d923e 100644 +--- a/examples/rust/custom_store_subscriber/Cargo.toml ++++ b/examples/rust/custom_store_subscriber/Cargo.toml +@@ -2,7 +2,7 @@ + name = "custom_store_subscriber" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/dna/Cargo.toml b/examples/rust/dna/Cargo.toml +index 57909e2fe..f5332a40c 100644 +--- a/examples/rust/dna/Cargo.toml ++++ b/examples/rust/dna/Cargo.toml +@@ -2,7 +2,7 @@ + name = "dna" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/extend_viewer_ui/Cargo.toml b/examples/rust/extend_viewer_ui/Cargo.toml +index 0a753fe36..e2442a638 100644 +--- a/examples/rust/extend_viewer_ui/Cargo.toml ++++ b/examples/rust/extend_viewer_ui/Cargo.toml +@@ -2,7 +2,7 @@ + name = "extend_viewer_ui" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/external_data_loader/Cargo.toml b/examples/rust/external_data_loader/Cargo.toml +index a57a27743..7ee67583d 100644 +--- a/examples/rust/external_data_loader/Cargo.toml ++++ b/examples/rust/external_data_loader/Cargo.toml +@@ -2,7 +2,7 @@ + name = "rerun-loader-rust-file" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/incremental_logging/Cargo.toml b/examples/rust/incremental_logging/Cargo.toml +index c7cfe3965..2bc68c06c 100644 +--- a/examples/rust/incremental_logging/Cargo.toml ++++ b/examples/rust/incremental_logging/Cargo.toml +@@ -2,7 +2,7 @@ + name = "incremental_logging" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/log_file/Cargo.toml b/examples/rust/log_file/Cargo.toml +index 4f3b5a220..b78f3a49b 100644 +--- a/examples/rust/log_file/Cargo.toml ++++ b/examples/rust/log_file/Cargo.toml +@@ -2,7 +2,7 @@ + name = "log_file" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/minimal/Cargo.toml b/examples/rust/minimal/Cargo.toml +index 77588cfb0..f5bc05637 100644 +--- a/examples/rust/minimal/Cargo.toml ++++ b/examples/rust/minimal/Cargo.toml +@@ -2,7 +2,7 @@ + name = "minimal" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/minimal_options/Cargo.toml b/examples/rust/minimal_options/Cargo.toml +index 2f34f4890..6c9afe8c8 100644 +--- a/examples/rust/minimal_options/Cargo.toml ++++ b/examples/rust/minimal_options/Cargo.toml +@@ -2,7 +2,7 @@ + name = "minimal_options" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/minimal_serve/Cargo.toml b/examples/rust/minimal_serve/Cargo.toml +index d2efcb718..7ca9ca96a 100644 +--- a/examples/rust/minimal_serve/Cargo.toml ++++ b/examples/rust/minimal_serve/Cargo.toml +@@ -2,7 +2,7 @@ + name = "minimal_serve" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/objectron/Cargo.toml b/examples/rust/objectron/Cargo.toml +index 25d732cde..bf1029d56 100644 +--- a/examples/rust/objectron/Cargo.toml ++++ b/examples/rust/objectron/Cargo.toml +@@ -2,7 +2,7 @@ + name = "objectron" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/raw_mesh/Cargo.toml b/examples/rust/raw_mesh/Cargo.toml +index a41df4804..a3d3b7081 100644 +--- a/examples/rust/raw_mesh/Cargo.toml ++++ b/examples/rust/raw_mesh/Cargo.toml +@@ -2,7 +2,7 @@ + name = "raw_mesh" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/shared_recording/Cargo.toml b/examples/rust/shared_recording/Cargo.toml +index ded88fbfb..a238033d3 100644 +--- a/examples/rust/shared_recording/Cargo.toml ++++ b/examples/rust/shared_recording/Cargo.toml +@@ -2,7 +2,7 @@ + name = "shared_recording" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/spawn_viewer/Cargo.toml b/examples/rust/spawn_viewer/Cargo.toml +index 8a73efc91..7495735d8 100644 +--- a/examples/rust/spawn_viewer/Cargo.toml ++++ b/examples/rust/spawn_viewer/Cargo.toml +@@ -2,7 +2,7 @@ + name = "spawn_viewer" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/stdio/Cargo.toml b/examples/rust/stdio/Cargo.toml +index f55cea217..78493677e 100644 +--- a/examples/rust/stdio/Cargo.toml ++++ b/examples/rust/stdio/Cargo.toml +@@ -2,7 +2,7 @@ + name = "stdio" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/examples/rust/template/Cargo.toml b/examples/rust/template/Cargo.toml +index 6e1ebafe4..eda133daa 100644 +--- a/examples/rust/template/Cargo.toml ++++ b/examples/rust/template/Cargo.toml +@@ -2,7 +2,7 @@ + name = "template" + version = "0.18.2" + edition = "2021" +-rust-version = "1.76" ++rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + +diff --git a/rust-toolchain b/rust-toolchain +index 871f56248..38e5e90f3 100644 +--- a/rust-toolchain ++++ b/rust-toolchain +@@ -5,6 +5,6 @@ + # to the user in the error, instead of "error: invalid channel name '[toolchain]'". + + [toolchain] +-channel = "1.76.0" ++channel = "1.80.0" + components = ["rustfmt", "clippy"] + targets = ["wasm32-unknown-unknown"] +diff --git a/scripts/clippy_wasm/clippy.toml b/scripts/clippy_wasm/clippy.toml +index 75729af1e..627a3650e 100644 +--- a/scripts/clippy_wasm/clippy.toml ++++ b/scripts/clippy_wasm/clippy.toml +@@ -6,7 +6,7 @@ + # ----------------------------------------------------------------------------- + # Section identical to the main clippy.toml: + +-msrv = "1.76" ++msrv = "1.80" + + allow-unwrap-in-tests = true + +diff --git a/scripts/lint.py b/scripts/lint.py +index 695d12b6b..32a2c41e1 100755 +--- a/scripts/lint.py ++++ b/scripts/lint.py +@@ -599,7 +599,7 @@ def test_lint_workspace_deps() -> None: + name = "clock" + version = "0.6.0-alpha.0" + edition = "2021" +- rust-version = "1.76" ++ rust-version = "1.80" + license = "MIT OR Apache-2.0" + publish = false + diff --git a/pkgs/by-name/re/rerun/tests.patch b/pkgs/by-name/re/rerun/tests.patch new file mode 100644 index 0000000000000..69a5ad5399b75 --- /dev/null +++ b/pkgs/by-name/re/rerun/tests.patch @@ -0,0 +1,16 @@ + rerun_py/build.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rerun_py/build.rs b/rerun_py/build.rs +index 3d292c55b..28e54f06b 100644 +--- a/rerun_py/build.rs ++++ b/rerun_py/build.rs +@@ -17,7 +17,7 @@ fn main() { + #[cfg(not(target_os = "windows"))] + let rerun_bin = std::env::current_dir() + .expect("std::env::current_dir() failed") +- .join("rerun_sdk/rerun_cli/rerun"); ++ .join("rerun_sdk/rerun"); + + if !rerun_bin.exists() { + eprintln!("ERROR: Expected to find `rerun` at `{rerun_bin:?}`."); diff --git a/pkgs/by-name/re/resticprofile/package.nix b/pkgs/by-name/re/resticprofile/package.nix index 57d1f1c95d1c7..fb814cdf392cd 100644 --- a/pkgs/by-name/re/resticprofile/package.nix +++ b/pkgs/by-name/re/resticprofile/package.nix @@ -1,6 +1,6 @@ { lib, - buildGoModule, + buildGo123Module, fetchFromGitHub, installShellFiles, restic, @@ -9,15 +9,15 @@ resticprofile, }: -buildGoModule rec { +buildGo123Module rec { pname = "resticprofile"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "creativeprojects"; repo = "resticprofile"; rev = "refs/tags/v${version}"; - hash = "sha256-HHFeWsEO1KUzL5Y6Iwy7MylA//JYzY3h1EwKrUHfXpY="; + hash = "sha256-Ab+XesAw/GkNEGwAp1ERUlfDlI9Kxmd0UnS52v+nWIs="; }; postPatch = '' @@ -32,7 +32,7 @@ buildGoModule rec { ''; - vendorHash = "sha256-t2R5uNsliSn+rIvRM0vT6lQJY62DhhozXnONiCJ9CMc="; + vendorHash = "sha256-LLFdVB4n07Sq/QH1C7rutdpzfhkJvM9lvRg5exyYixM="; ldflags = [ "-X main.commit=${src.rev}" diff --git a/pkgs/by-name/re/retool/package.nix b/pkgs/by-name/re/retool/package.nix index a22ce582b9eb3..15e2c15a5e85c 100644 --- a/pkgs/by-name/re/retool/package.nix +++ b/pkgs/by-name/re/retool/package.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ qt6.qtbase ] ++ - lib.optionals (stdenv.isLinux) [ + lib.optionals (stdenv.hostPlatform.isLinux) [ qt6.qtwayland ]; diff --git a/pkgs/by-name/re/retrospy/deps.nix b/pkgs/by-name/re/retrospy/deps.nix index ba40f58191cf4..1c0186bf83e81 100644 --- a/pkgs/by-name/re/retrospy/deps.nix +++ b/pkgs/by-name/re/retrospy/deps.nix @@ -2,135 +2,68 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.11"; hash = "sha256-vyX1hwqHQBIckXl/IYctR7BtYzM/62iZ6Y3Hsrlgww8="; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.1.3"; hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.22045.20230930"; hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; }) (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.10"; hash = "sha256-G0ooIjNRW5YHKvQ6qPxe5gaE3HPwGfiCQUo34PSxXGg="; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.10"; hash = "sha256-0v4evkV0jbLffwfQG/QO/RQbHXlCBmFv8A2pBZjS5Y0="; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.11"; hash = "sha256-62JpECNZV60qiS1KCTm9ojnUXOx5yEP4Mjo3/OZszMQ="; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.10"; hash = "sha256-itnN+LIZ2S+1CjD0ZS/woKtpgWbC/srMYzbYfX3a8LA="; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.11"; hash = "sha256-fVM+D16obEbRwRu+QF617jpQQWiHpA/Lzx2m0qK7BZ4="; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.11"; hash = "sha256-8Co6wR74u5jdAeN0Fx7LJf8vOUt84auomZz3TFSdlWw="; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.11"; hash = "sha256-8/ixQaKhkv6Jk8Y/VF6HtCkm/9M6MEV7XFNLwOsjtzo="; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.10"; hash = "sha256-qtvlczTg2yUZWyyqXkkboB8lK9aYv+STbfDvSKb55Vw="; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.11"; hash = "sha256-A4X9fY26YtydAn4TjJ7bYdBi7R+Ncghr4F2DTl/Riaw="; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.11"; hash = "sha256-s5fmFi207DZVRejw5PlvnPsdo9voet/l2VJtgwLDJYs="; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.11"; hash = "sha256-cvLzWHt2P2dmJ690mv0wejk2VCa0n1xX4sYCim+7Gxo="; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.10"; hash = "sha256-54fc2g1yvM7pPRaF062lSjXaQDe2i61xQRM8m81vWm8="; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.11"; hash = "sha256-NvAN79jLjoqZrp5yWkJoihjO83r49j8N57PAWDY/kwE="; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.11"; hash = "sha256-1hsU8zBxQGUp/wAx3qSQfxte+fGsSmH9TN3OHW0rNOk="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.3"; hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.1.3"; hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.1.3"; hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.1.3"; hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.1.3"; hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.1.3"; hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.1.3"; hash = "sha256-1VCFAJPKpLx9KyM5AK/8XbGtxNpGriQEFqidgN9eCtE="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.3"; hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.3"; hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.3"; hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.3"; hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.3"; hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.1.3"; hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw="; }) (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.2"; hash = "sha256-FmaYhszWp/VCIp4BUnWXGMQr62WzVNUo/IKEbN59bX8="; }) (fetchNuGet { pname = "Desktop.Robot"; version = "1.5.0"; hash = "sha256-ITeVX2oAcST/HMbG4Ygg+inPuciXZaBVJ5Ozk/Zl6Pg="; }) (fetchNuGet { pname = "DialogHost.Avalonia"; version = "0.7.7"; hash = "sha256-pXRv4P4i/zxZ1Ucq3kaGs9HKNG+4CNB4n33YswbjEio="; }) (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; hash = "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; hash = "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; hash = "sha256-AEHjgqX0o+Fob0SeZ6EikGKoEe6rRxess5fVJ31UL0U="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; hash = "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; hash = "sha256-9VI0xCavuuIIStuQ7ipBfWu5HrAt+Kk/F2j57C1llTU="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; hash = "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0.2"; hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; }) (fetchNuGet { pname = "LibUsbDotNet"; version = "3.0.102-alpha"; hash = "sha256-oJGtzJvnKM53fcZLnvQZKvBOwjAiH/T7o+b8IhUyHxY="; }) (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.2"; hash = "sha256-9P3/ZCF1psp8VoZMzJJlnoqz2y2EytmBGDc4QXIS4tc="; }) - (fetchNuGet { pname = "MessageBox.Avalonia"; version = "3.1.5.1"; hash = "sha256-C15vOuNgsvdXq4e0G2C2Umwmq2rF7IoHxV5lUSSMFdA="; }) + (fetchNuGet { pname = "MessageBox.Avalonia"; version = "3.1.6"; hash = "sha256-Jg7Ul2JkLq9eUvd42vD8B7itsZYtxHhm4XRQWHkhLN0="; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) (fetchNuGet { pname = "NodaTime"; version = "3.1.11"; hash = "sha256-ZvJlCEjq61KS3qr4Lw/C+yyagic4rESZ7qa0RGul/sU="; }) (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) (fetchNuGet { pname = "runtime.linux-arm.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-m5+od7ZhlzImwSE9E7Qq1nH3A3muXwCnsvrVUoJ7+WE="; }) (fetchNuGet { pname = "runtime.linux-arm64.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-IgbG3HT3A0VItWl5asE7Hk0zaQjQneKQS9f65cQAjLI="; }) (fetchNuGet { pname = "runtime.linux-x64.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-44oujSHhc0Nl2WCvLYkScrAyqNAlbGfOnlzPwCofwlA="; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) (fetchNuGet { pname = "runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-BqExVU/zHj7o++mzOpY9y+i9yZZVbcGmO/D4mRzigY8="; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) (fetchNuGet { pname = "runtime.osx-arm64.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-oFMF60yyTy3fXwLlXJkNUtzdRz4EyxevAUIcfcVESCE="; }) (fetchNuGet { pname = "runtime.osx-x64.runtime.native.System.IO.Ports"; version = "8.0.0"; hash = "sha256-b2J9DcunMtChpuyNC0XN39Z01Wr738HI/syJW1n9bfE="; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.1.2-beta"; hash = "sha256-wM8plHp9m+pnKPK0vu9BRburPMIL2lwxdRkQFEhjbDk="; }) (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.1.2-beta"; hash = "sha256-VGmWpeLV4v8gfqtJKKU43rUad9CDgdIO+lmUUa65XJE="; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; hash = "sha256-zOqHVIInvJiqmx4JF+8USYvdKAGRZVUqQpdncrrjRjM="; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; hash = "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; hash = "sha256-QdQRN1IBjqohmI8U+6WJRPgOsh8a9soN2UvVObs1H1w="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; hash = "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; hash = "sha256-oIjFF+Rv+g8AKyNaaVAgnHX3eeP/l8K2sgHs9bRyUMw="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; hash = "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.5"; hash = "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.8"; hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; }) (fetchNuGet { pname = "Splat"; version = "14.4.1"; hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; }) - (fetchNuGet { pname = "SSH.NET"; version = "2024.0.0"; hash = "sha256-WfJc+ykcWQaYkTkMgy3fBbC1MrwVptF8Cb9PI0iQEMo="; }) + (fetchNuGet { pname = "SSH.NET"; version = "2024.1.0"; hash = "sha256-R1KYZTq0XGO2gIiCeGzgw36ByQRxb+2Oip/NvDeZqzs="; }) (fetchNuGet { pname = "System.CodeDom"; version = "8.0.0"; hash = "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338="; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; hash = "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; hash = "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) (fetchNuGet { pname = "System.IO.Ports"; version = "8.0.0"; hash = "sha256-G8j9c0erBzZfJAVlW08XoE58gPhiNWJE78sFaBV2e4Q="; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) (fetchNuGet { pname = "System.Management"; version = "8.0.0"; hash = "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; hash = "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="; }) (fetchNuGet { pname = "System.Reactive"; version = "6.0.1"; hash = "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.16.0"; hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; }) (fetchNuGet { pname = "Vortice.DirectInput"; version = "3.5.0"; hash = "sha256-TxUIn0YXlzWHGyMAOVVC0SiNaM2vFqa0ddFpoWH0fwI="; }) (fetchNuGet { pname = "Vortice.DirectX"; version = "3.5.0"; hash = "sha256-cHoY2+czSdj3w3qcGeCTN0iU2nY9xbMrfK80RGEoDzk="; }) (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.7.8"; hash = "sha256-8tHkHDvHMT3iDKDkVIms9tZnspBaw0nbvYyXUsUGv8A="; }) diff --git a/pkgs/by-name/re/retrospy/package.nix b/pkgs/by-name/re/retrospy/package.nix index 7757fb9c44a0e..a207150e1e472 100644 --- a/pkgs/by-name/re/retrospy/package.nix +++ b/pkgs/by-name/re/retrospy/package.nix @@ -4,21 +4,16 @@ , copyDesktopItems , makeDesktopItem , lib -, fontconfig -, libX11 -, libXcursor -, libICE -, libSM , runCommandLocal }: let - version = "6.5"; + version = "6.6"; src = fetchFromGitHub { owner = "retrospy"; repo = "RetroSpy"; rev = "v${version}"; - hash = "sha256-gnk/cOxCZuBNrBgvzvEeUjGIeCGtC1uXpYBrWwTqeCQ="; + hash = "sha256-vYhFpmP9CmZz/lqNwNAvpf7pQnhKR/pdetPJqorUtMY="; }; executables = [ @@ -43,14 +38,6 @@ buildDotnetModule { copyDesktopItems ]; - runtimeDeps = [ - fontconfig - libX11 - libICE - libXcursor - libSM - ]; - projectFile = [ "RetroSpyX/RetroSpyX.csproj" "GBPemuX/GBPemuX.csproj" diff --git a/pkgs/by-name/re/revolt-desktop/package.nix b/pkgs/by-name/re/revolt-desktop/package.nix index 85e8ed70ab0a7..f941225770b24 100644 --- a/pkgs/by-name/re/revolt-desktop/package.nix +++ b/pkgs/by-name/re/revolt-desktop/package.nix @@ -31,11 +31,11 @@ let inherit (prev) pname version; in - if stdenvNoCC.isLinux then + if stdenvNoCC.hostPlatform.isLinux then { src = fetchurl { url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-linux.AppImage"; - sha256 = "sha256-Wsm6ef2Reenq3/aKGaP2yzlOuLKaxKtRHCLLMxvWUUY="; + hash = "sha256-Wsm6ef2Reenq3/aKGaP2yzlOuLKaxKtRHCLLMxvWUUY="; }; appimageContents = appimageTools.extractType2 { inherit (final) src pname version; }; @@ -64,7 +64,7 @@ ''; } else - assert stdenvNoCC.isDarwin; + assert stdenvNoCC.hostPlatform.isDarwin; { src = fetchzip { url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-${version}-mac.zip"; diff --git a/pkgs/by-name/re/revpfw3/package.nix b/pkgs/by-name/re/revpfw3/package.nix new file mode 100644 index 0000000000000..d7ae4ac43fbee --- /dev/null +++ b/pkgs/by-name/re/revpfw3/package.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchgit, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "revpfw3"; + version = "0.4.0"; + + src = fetchgit { + url = "https://git.tudbut.de/tudbut/revpfw3"; + rev = "v${version}"; + hash = "sha256-v8BtgQYdELui5Yu8kpE5f97MSo/WhNah+e1xXhZGJwM="; + }; + + cargoHash = "sha256-0AVp6fQq/NCkvKcK5ALbFNxNkt0NgbOmGlmDBGxwONQ="; + + meta = { + description = "Reverse proxy to bypass the need for port forwarding"; + homepage = "https://git.tudbut.de/tudbut/revpfw3"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tudbut ]; + mainProgram = "revpfw3"; + }; +} diff --git a/pkgs/by-name/rh/rHttp/package.nix b/pkgs/by-name/rh/rHttp/package.nix index bd28007dc3611..d3213be96915e 100644 --- a/pkgs/by-name/rh/rHttp/package.nix +++ b/pkgs/by-name/rh/rHttp/package.nix @@ -12,7 +12,7 @@ buildGoModule { owner = "1buran"; repo = "rHttp"; rev = "9b7da3a0f7c2e35c9d326e7920ded15f806f8113"; - sha256 = "1nz3f6zgpbxlwn6c5rqxa8897ygi5r7h7f6624i27rq9kr729cra"; + hash = "sha256-KrMkTp4J5yMiEca4A08u8fmTEFId58KM5bSv+75x49s="; }; vendorHash = "sha256-NR1q44IUSME+x1EOcnXXRoIXw8Av0uH7iXhD+cdd99I="; diff --git a/pkgs/by-name/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix index 8bbc781bb4f53..99ebaff5a1cd9 100644 --- a/pkgs/by-name/ri/ricochet-refresh/package.nix +++ b/pkgs/by-name/ri/ricochet-refresh/package.nix @@ -44,9 +44,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + cmakeBuildType = "MinSizeRel"; + # https://github.com/blueprint-freespeech/ricochet-refresh/blob/main/BUILDING.md cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "MinSizeRel") (lib.cmakeBool "RICOCHET_REFRESH_INSTALL_DESKTOP" true) (lib.cmakeBool "USE_SUBMODULE_FMT" true) ]; diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix index 9706b388dbf70..8c9f239dc1d80 100644 --- a/pkgs/by-name/ri/ride/package.nix +++ b/pkgs/by-name/ri/ride/package.nix @@ -89,14 +89,14 @@ buildNpmPackage rec { zip makeWrapper ] - ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ] - ++ lib.optionals stdenv.isDarwin [ cctools ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; # Fix error: no member named 'aligned_alloc' in the global namespace env.NIX_CFLAGS_COMPILE = lib.optionalString ( - stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0" + stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0" ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; npmBuildFlags = platformInfo.buildCmd; @@ -122,7 +122,7 @@ buildNpmPackage rec { install -Dm644 ThirdPartyNotices.txt -t $out/share/doc/ride - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -Dm644 $src/D.png $out/share/icons/hicolor/64x64/apps/ride.png install -Dm644 $src/D.svg $out/share/icons/hicolor/scalable/apps/ride.svg @@ -134,7 +134,7 @@ buildNpmPackage rec { --inherit-argv0 ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r Ride-*.app $out/Applications makeWrapper $out/Applications/Ride-*.app/Contents/MacOS/Ride-* $out/bin/ride diff --git a/pkgs/by-name/ri/ringfairy/package.nix b/pkgs/by-name/ri/ringfairy/package.nix index 1b4295d1f6341..67563b58315c7 100644 --- a/pkgs/by-name/ri/ringfairy/package.nix +++ b/pkgs/by-name/ri/ringfairy/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage { buildInputs = [openssl] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security SystemConfiguration diff --git a/pkgs/by-name/ri/rippkgs/package.nix b/pkgs/by-name/ri/rippkgs/package.nix index 96763f000bde0..ae64a4d93bee6 100644 --- a/pkgs/by-name/ri/rippkgs/package.nix +++ b/pkgs/by-name/ri/rippkgs/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { description = "CLI for indexing and searching packages in Nix expressions"; homepage = "https://github.com/replit/rippkgs"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ eclairevoyant cdmistman ]; + maintainers = with lib.maintainers; [ cdmistman ]; mainProgram = "rippkgs"; }; } diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix index 41d0594ebd5f4..d60bedc482cdd 100644 --- a/pkgs/by-name/ri/ripunzip/package.nix +++ b/pkgs/by-name/ri/ripunzip/package.nix @@ -12,19 +12,19 @@ rustPlatform.buildRustPackage rec { pname = "ripunzip"; - version = "1.2.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "google"; repo = "ripunzip"; rev = "v${version}"; - hash = "sha256-9aBAksX4h8DlHTl95xd2QvFi3ZV/6i69b68OFa4B1Ew="; + hash = "sha256-O9R7SmhKQ6VB9TWbLsQmK/0tDWhJ1QWIPwW7VtibqAk="; }; - cargoHash = "sha256-QyVhEHm1W4kb5b4dngBui3lT7vKBGDS5ZObMWua96KM="; + cargoHash = "sha256-1ZHAbJIWRQh876rshMYeuCz7UMlwdqrScO0eIkGjZao="; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); nativeBuildInputs = [ pkg-config ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/by-name/rk/rkboot/package.nix b/pkgs/by-name/rk/rkboot/package.nix index 5cf424a43c3a2..f352446e7a1b1 100644 --- a/pkgs/by-name/rk/rkboot/package.nix +++ b/pkgs/by-name/rk/rkboot/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { do # The proprietary, statically linked binaries to perform boot_merge are # x86_64 only. Though we use box64 to emulate if building on aarch64-linux - ${lib.optionalString stdenv.isAarch64 "${qemu}/bin/qemu-x86_64"} ./tools/boot_merger "$i" || true + ${lib.optionalString stdenv.hostPlatform.isAarch64 "${qemu}/bin/qemu-x86_64"} ./tools/boot_merger "$i" || true done ''; diff --git a/pkgs/by-name/rl/rl_json/package.nix b/pkgs/by-name/rl/rl_json/package.nix index 81076dd07677d..ac6e7950f4114 100644 --- a/pkgs/by-name/rl/rl_json/package.nix +++ b/pkgs/by-name/rl/rl_json/package.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ fgaz ]; platforms = tcl.meta.platforms; # From version 0.15.1: 'endian.h' file not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix index 44d7b02d721da..315ac8ec43b12 100644 --- a/pkgs/by-name/rm/rmfakecloud/package.nix +++ b/pkgs/by-name/rm/rmfakecloud/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "ddvk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J8oB5C5FYZTVq9zopHoL6WYpfTyiiyrQ4YSGu+2eaKw="; + hash = "sha256-J8oB5C5FYZTVq9zopHoL6WYpfTyiiyrQ4YSGu+2eaKw="; }; vendorHash = "sha256-S43qNDAlDWhrkfSffCooveemR1Z7KXS18t97UoolgBM="; diff --git a/pkgs/by-name/rm/rmfakecloud/webui.nix b/pkgs/by-name/rm/rmfakecloud/webui.nix index 98c4822a90b3a..91efa1c78d9da 100644 --- a/pkgs/by-name/rm/rmfakecloud/webui.nix +++ b/pkgs/by-name/rm/rmfakecloud/webui.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/ui/yarn.lock"; - sha256 = "sha256-JLCrpzytMKejmW+WlM6yybsoIZiimiJdPG5dSIn1L14="; + hash = "sha256-JLCrpzytMKejmW+WlM6yybsoIZiimiJdPG5dSIn1L14="; }; nativeBuildInputs = [ fixup-yarn-lock yarn nodejs ]; diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 4dd9ac30d648d..50c6e4306ffec 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { "-DUSE_ANGRYLION=${lib.boolToString withAngrylionRdpPlus}" ]; - qtWrapperArgs = lib.optionals stdenv.isLinux [ + qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" ] ++ lib.optional withWayland "--set RMG_WAYLAND 1"; diff --git a/pkgs/by-name/rm/rmpc/Cargo.lock.patch b/pkgs/by-name/rm/rmpc/Cargo.lock.patch deleted file mode 100644 index 404baea3e1658..0000000000000 --- a/pkgs/by-name/rm/rmpc/Cargo.lock.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index e4e2d1a..72839b4 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -198,9 +198,9 @@ dependencies = [ - - [[package]] - name = "bitstream-io" --version = "2.5.0" -+version = "2.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" -+checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" - - [[package]] - name = "built" -@@ -1376,9 +1376,9 @@ dependencies = [ - - [[package]] - name = "ravif" --version = "0.11.8" -+version = "0.11.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12" -+checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" - dependencies = [ - "avif-serialize", - "imgref", diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix index 4ac072cb81c7b..6efe7b07a43ab 100644 --- a/pkgs/by-name/rm/rmpc/package.nix +++ b/pkgs/by-name/rm/rmpc/package.nix @@ -2,44 +2,41 @@ lib, rustPlatform, fetchFromGitHub, - fetchpatch, + installShellFiles, pkg-config, cmake, }: rustPlatform.buildRustPackage rec { pname = "rmpc"; - version = "0.2.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "mierak"; repo = "rmpc"; rev = "v${version}"; - hash = "sha256-g+yzW0DfaBhJKTikYZ8eqe4pX8nJvbpJ1xaZ3W/O/bo="; + hash = "sha256-eWscMWOjTGmFCNGwf/6lMU0JbULC7/AFCPbznGQYRQI="; }; - cargoHash = "sha256-wFrHgB4wYGeXvfdGf4SJAAL8fE6dAKDLL51Ohmn+1HQ="; - - cargoPatches = [ - # Patch Cargo.lock to make rmpc compile with older versions of rustc - # Remove when Rust 1.79.0 is in master - ./Cargo.lock.patch - ]; - - patches = [ - # Fix release mode tests compilation issues - # Remove when next rmpc version comes out - (fetchpatch { - url = "https://github.com/mierak/rmpc/commit/f12be6f606f5319523f41576e7c463b6008b9069.patch"; - hash = "sha256-4L/MrdC/ydTqnkt3qd5H8hLZimiqct6sOkEq8rJN0F4="; - }) - ]; + cargoHash = "sha256-PieGA8/C7d8Q5rdu7oRdVuCLNhwGp5LZYz/rM4agqng="; nativeBuildInputs = [ + installShellFiles pkg-config cmake ]; + env.VERGEN_GIT_DESCRIBE = version; + + postInstall = '' + installManPage target/man/rmpc.1 + + installShellCompletion --cmd rmpc \ + --bash target/completions/rmpc.bash \ + --fish target/completions/rmpc.fish \ + --zsh target/completions/_rmpc + ''; + meta = { changelog = "https://github.com/mierak/rmpc/releases/tag/${src.rev}"; description = "TUI music player client for MPD with album art support via kitty image protocol"; @@ -53,5 +50,6 @@ rustPlatform.buildRustPackage rec { ''; maintainers = with lib.maintainers; [ donovanglover ]; mainProgram = "rmpc"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/rn/rnote/package.nix b/pkgs/by-name/rn/rnote/package.nix index 792c9faa0450e..e2c569131ee29 100644 --- a/pkgs/by-name/rn/rnote/package.nix +++ b/pkgs/by-name/rn/rnote/package.nix @@ -75,9 +75,9 @@ stdenv.mkDerivation rec { libadwaita libxml2 poppler - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dotlambda gepbird yrd ]; platforms = platforms.unix; # compiler error since 2023-11-17 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix index a9b5bedbca0c8..50eaa4e1376d2 100644 --- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix +++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject (finalAttrs: { pname = "roave-backward-compatibility-check"; - version = "8.8.0"; + version = "8.9.0"; src = fetchFromGitHub { owner = "Roave"; repo = "BackwardCompatibilityCheck"; rev = finalAttrs.version; - hash = "sha256-/9nJqZcuBLzgzDyoX4NHW9And7L/F+Bsm/gLzQS7QzE="; + hash = "sha256-Bvqo2SmtRWvatXxtHbctBrY0xe0KA+knNmEg+KC8hgY="; }; - vendorHash = "sha256-I8JZ4CBrrQmZ38QF9SPZtkPirCAxqSCeTUpMg59Mz7U="; + vendorHash = "sha256-cMVOcLRvfwFbxd2mXJhDx1iaUTHPEsI4vh9/JCoOj3M="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/ro/robodoc/package.nix b/pkgs/by-name/ro/robodoc/package.nix index bc64a8315fe3e..4665548117208 100644 --- a/pkgs/by-name/ro/robodoc/package.nix +++ b/pkgs/by-name/ro/robodoc/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE="; }; - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Docs/makefile.am \ --replace 'man1_MANS = robodoc.1 robohdrs.1' 'man1_MANS =' ''; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/by-name/ro/rockbox-utility/package.nix similarity index 100% rename from pkgs/tools/misc/rockbox-utility/default.nix rename to pkgs/by-name/ro/rockbox-utility/package.nix diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix index 7b581363ee680..5d54a81b5f2d4 100644 --- a/pkgs/by-name/ro/rockcraft/package.nix +++ b/pkgs/by-name/ro/rockcraft/package.nix @@ -1,59 +1,20 @@ { lib, - python3, + python3Packages, fetchFromGitHub, dpkg, nix-update-script, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - craft-application = super.craft-application.overridePythonAttrs (old: rec { - version = "1.2.1"; - src = fetchFromGitHub { - owner = "canonical"; - repo = "craft-application"; - rev = "refs/tags/${version}"; - hash = "sha256-CXZEWVoE66dlQJp4G8tinufjyaDJaH1Muxz/qd/81oA="; - }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools==67.7.2" "setuptools" - ''; - preCheck = '' - export HOME=$(mktemp -d) - ''; - }); - pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec { - version = "0.11.2"; - src = fetchFromGitHub { - owner = "NowanIlfideme"; - repo = "pydantic-yaml"; - rev = "refs/tags/v${version}"; - hash = "sha256-AeUyVav0/k4Fz69Qizn4hcJKoi/CDR9eUan/nJhWsDY="; - }; - dependencies = with self; [ - deprecated - importlib-metadata - pydantic_1 - ruamel-yaml - types-deprecated - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "rockcraft"; - version = "1.2.3"; + version = "1.5.3"; src = fetchFromGitHub { owner = "canonical"; repo = "rockcraft"; - rev = "refs/tags/${version}"; - hash = "sha256-Qk7Fi4I/5TCf9llGTsTBQsAxUkeVmAlH6tFNYMsyZ1c="; + rev = "1d87e33cf207b3a2f16eb125743ec11546fa0cb1"; + hash = "sha256-QnW3BMu4Tuvj8PCt5eYJbNMiojXpyJ1uza6hpMxxSOE="; }; postPatch = '' @@ -64,17 +25,19 @@ python.pkgs.buildPythonApplication rec { --replace-fail "distutils.util" "setuptools.dist" ''; - build-system = with python.pkgs; [ setuptools-scm ]; + build-system = with python3Packages; [ setuptools-scm ]; - dependencies = with python.pkgs; [ + dependencies = with python3Packages; [ craft-application craft-archives + craft-platforms spdx-lookup ]; nativeCheckInputs = - with python.pkgs; + with python3Packages; [ + craft-platforms pytest-check pytest-mock pytest-subprocess diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index e4c928ce86da1..dcc5606ea4ea5 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2024-08-26"; + version = "0-unstable-2024-09-27"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "96d774a9ebae3fe61623029389d763e0c73aa362"; - hash = "sha256-re4uiXt4No4OEeNm6hc52lkQ8lqkAoF1xy2BjIIi3A8="; + rev = "a8c18f9b9418ac42922eee1e31b1e3c9f791c1dc"; + hash = "sha256-LUHU6Buh+91b99pF7d8jqmAoYD1EmkKzsAOxiP7w3So="; }; dontConfigure = true; diff --git a/pkgs/by-name/ro/rofi-blezz/package.nix b/pkgs/by-name/ro/rofi-blezz/package.nix index d8cc9512b4f3b..bc552f1e9344b 100644 --- a/pkgs/by-name/ro/rofi-blezz/package.nix +++ b/pkgs/by-name/ro/rofi-blezz/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { owner = "davatorium"; repo = "rofi-blezz"; rev = "3a00473471e7c56d2c349ad437937107b7d8e961"; - sha256 = "sha256-hY5UA7nyL6QoOBIZTjEiR0zjZFhkUkRa50r5rVZDnbg="; + hash = "sha256-hY5UA7nyL6QoOBIZTjEiR0zjZFhkUkRa50r5rVZDnbg="; }; patches = [ diff --git a/pkgs/by-name/ro/rofimoji/package.nix b/pkgs/by-name/ro/rofimoji/package.nix index 388c2de627a10..8cc67c634e465 100644 --- a/pkgs/by-name/ro/rofimoji/package.nix +++ b/pkgs/by-name/ro/rofimoji/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "rofimoji"; - version = "6.4.0"; + version = "6.5.0"; pyproject = true; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; rev = "refs/tags/${version}"; - hash = "sha256-QFwAlC3MwpslIOCvEAlS33tPFaz4T8G5+YCVznMhzes="; + hash = "sha256-CY+ddF2Rth92R22QKqOb/Us+rZhvWTaU/jKy8fljWqQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ro/rootbar/package.nix b/pkgs/by-name/ro/rootbar/package.nix new file mode 100644 index 0000000000000..1901a33f11ff8 --- /dev/null +++ b/pkgs/by-name/ro/rootbar/package.nix @@ -0,0 +1,47 @@ +{ lib, stdenv +, fetchhg +, pkg-config +, meson +, ninja +, gtk3 +, json_c +, libpulseaudio +, wayland +, wrapGAppsHook3 +}: + +stdenv.mkDerivation rec { + pname = "rootbar"; + version = "unstable-2020-11-13"; + + src = fetchhg { + url = "https://hg.sr.ht/~scoopta/rootbar"; + rev = "a018e10cfc5e"; + sha256 = "sha256-t6oDIYCVaCxaYy4bS1vxESaFDNxsx5JQLQK77eVuafE="; + }; + + nativeBuildInputs = [ + meson ninja pkg-config wrapGAppsHook3 + ]; + + buildInputs = [ + gtk3 + json_c + libpulseaudio + wayland + ]; + + meta = with lib; { + homepage = "https://hg.sr.ht/~scoopta/rootbar"; + description = "Bar for Wayland WMs"; + mainProgram = "rootbar"; + longDescription = '' + Root Bar is a bar for wlroots based wayland compositors such as sway and + was designed to address the lack of good bars for wayland. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix index 5660350587df2..67910a77f7e70 100644 --- a/pkgs/by-name/ro/rosa/package.nix +++ b/pkgs/by-name/ro/rosa/package.nix @@ -1,26 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, testers, rosa, nix-update-script }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, rosa, nix-update-script }: buildGoModule rec { pname = "rosa"; - version = "1.2.43"; + version = "1.2.45"; src = fetchFromGitHub { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-1/go7mL2uRzzV/iiTXsgZHGNW8EIONwEnb4jcMiKkv4="; + hash = "sha256-Yjsk2A5itmTtOYM5UxSzQXNrBV9m1C8eXM0QUDjX2cI="; }; vendorHash = null; - patches = [ - # https://github.com/openshift/rosa/pull/2326/ - # TODO: remove on next version bump - (fetchpatch { - url = "https://github.com/openshift/rosa/commit/9ed236880f91f0e9514ba0a6f3be93ee115d1689.patch"; - hash = "sha256-KNGqJRFyfzcDs336Lj/KwR1yd5M7zfehu7IO0z/KUtg="; - }) - ]; - ldflags = [ "-s" "-w" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/ro/roslyn-ls/deps.nix b/pkgs/by-name/ro/roslyn-ls/deps.nix index 27aa7a75d2685..1fb2f6ef9bbdc 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.nix +++ b/pkgs/by-name/ro/roslyn-ls/deps.nix @@ -2,21 +2,12 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ + (fetchNuGet { pname = "dotnet-format"; version = "7.0.360304"; hash = "sha256-TuhZIhearocl702hLzGJCcRd8+RWoI4tDY02Bf6Lus8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/dotnet-format/7.0.360304/dotnet-format.7.0.360304.nupkg"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/humanizer.core/2.14.1/humanizer.core.2.14.1.nupkg"; }) (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.1.1.7464"; hash = "sha256-71/e9zuQIfqRXOiWxZkUFW/tMAj63nE8tg/sR7bGzuM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/8.1.1.7464/icsharpcode.decompiler.8.1.1.7464.nupkg"; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; hash = "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.108/messagepack.2.5.108.nupkg"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; hash = "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.108/messagepack.annotations.2.5.108.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.32"; hash = "sha256-1mQTxwruzhm20YdlZefrYuy7xrBs17pH4Vo0K3Tl7Fc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/6.0.32/microsoft.aspnetcore.app.ref.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.7"; hash = "sha256-4jkbKvnRim+1K1KMDzHzzjZk9ALU2lYJVY1Fzr8Cmqs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/8.0.7/microsoft.aspnetcore.app.ref.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.32"; hash = "sha256-cIe0F+7rgwYSmh0VuFuQsUI9iEW5hn2KCD2H8Cs/k2g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/6.0.32/microsoft.aspnetcore.app.runtime.linux-arm64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.7"; hash = "sha256-YiBHc3PC2qms/39IvJkaLfe/Eug9W97bz78XKKkqax8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/8.0.7/microsoft.aspnetcore.app.runtime.linux-arm64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.32"; hash = "sha256-TkYv7h9NBr3I+FIaXeLU4MawJtgT2RWhs35ewGRDKx8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/6.0.32/microsoft.aspnetcore.app.runtime.linux-x64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.7"; hash = "sha256-s6pb37BjE7TMBO2lQexUoJ+m+uhPB3unTR/BGYG+mVI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/8.0.7/microsoft.aspnetcore.app.runtime.linux-x64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.32"; hash = "sha256-RaC37ZQcJn7ykXJrtV7ibxh0GcalRyPKncxlqOLou+I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/6.0.32/microsoft.aspnetcore.app.runtime.osx-arm64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.7"; hash = "sha256-zMBpSXV8dlGI/3ZB9Lx4qQnAHFNCwsjuEAuQzxHWDJU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/8.0.7/microsoft.aspnetcore.app.runtime.osx-arm64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.32"; hash = "sha256-vh/e46xM/HbhbBvL5eP5/DCHwCP2Bg7WoMS28nBXWV0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/6.0.32/microsoft.aspnetcore.app.runtime.osx-x64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.7"; hash = "sha256-TWXhiLxVkTem4aoBfWpVEhbWvfECfqJQqFP4X8BMhCY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/8.0.7/microsoft.aspnetcore.app.runtime.osx-x64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace"; version = "9.0.0-preview.24327.6"; hash = "sha256-lK1mJ36CZKI+a6RKjAfmM0TD3zYYnasTzVnq3nFmI7M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.24327.6/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.24327.6.nupkg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace"; version = "9.0.0-preview.24366.2"; hash = "sha256-SUZfSiONzmTwDQsaTd7VTkE6IrzSu80giAPwrjvuY7M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.24366.2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.24366.2.nupkg"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; hash = "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/8.0.0/microsoft.bcl.asyncinterfaces.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.10.4"; hash = "sha256-yaElGdmgcELCXR5fIe5/ingMx2qS/PM3tZGTPNHHjXo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.10.4/microsoft.build.17.10.4.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.4"; hash = "sha256-LHtjk4vxeVSLzAKAcG8BN+S20d2sUR2DAOsSXLNIy5U="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build/17.3.4/microsoft.build.17.3.4.nupkg"; }) @@ -41,7 +32,7 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.11.0-beta1.24081.1"; hash = "sha256-nXx0MSYXVzdr0jcNo9aZLocZU1ywN+n/vdD2kYBh5TI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.publicapianalyzers.3.11.0-beta1.24081.1.nupkg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; hash = "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader/2.0.0/microsoft.diasymreader.2.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "9.0.0-beta.24352.2"; hash = "sha256-ABdgrKht2runHUtSNpTsv7BTDQaRA3AenjSwaof+3nA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.24352.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.24352.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "9.0.0-beta.24416.2"; hash = "sha256-MMfwLKBLTEtaNt896ueqH50zb/XyeXqpGJAC0O8yifw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.24416.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.24416.2.nupkg"; }) (fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "9.0.0-beta.24076.5"; hash = "sha256-5cREL85PwcDwo4yyc2Eh908HQ/Cm36w9uZSIvVELZH0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.24076.5/microsoft.dotnet.xlifftasks.9.0.0-beta.24076.5.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration/8.0.0/microsoft.extensions.configuration.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.abstractions/8.0.0/microsoft.extensions.configuration.abstractions.8.0.0.nupkg"; }) @@ -56,29 +47,11 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options/8.0.0/microsoft.extensions.options.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options.configurationextensions/8.0.0/microsoft.extensions.options.configurationextensions.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.primitives/8.0.0/microsoft.extensions.primitives.8.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; hash = "sha256-pa3MT+QWrWeehQwUWtTS/Rwto8IIDgAt+zLqaUAQoJ0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.0/microsoft.io.redist.6.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.1"; hash = "sha256-IaATAy1M/MEBTid0mQiTrHj4aTwo2POCtckxSbLc3lU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.1/microsoft.io.redist.6.0.1.nupkg"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.10.4"; hash = "sha256-nXY7YaIx6sXn7aMqpF4bW4d2J5U1KNb9sXqRSd8MpOc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.10.4/microsoft.net.stringtools.17.10.4.nupkg"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.4"; hash = "sha256-xLPrrL8iS3gNMIa/C/Wv0fBfHIehUHeQ4Y+F+gbqkhk="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.net.stringtools/17.3.4/microsoft.net.stringtools.17.3.4.nupkg"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; hash = "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.4.0/microsoft.net.stringtools.17.4.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.7.2"; hash = "sha256-hQE07TCgcQuyu9ZHVq2gPDb0+xe8ECJUdrgh17bJP4o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.7.2/microsoft.net.stringtools.17.7.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.32"; hash = "sha256-yDOkSHEGuGG6u+rB5u+IC3rc2tQwvbjdqmgHcl7Gkn4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/6.0.32/microsoft.netcore.app.host.linux-arm64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.7"; hash = "sha256-ffTw2G+T5Jk7v57tx3C2DWOXbD0lCu4IJf7v61hNnu8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/8.0.7/microsoft.netcore.app.host.linux-arm64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.32"; hash = "sha256-2aDGkn0QqXXHUUSAwtQQbjKl5I6S0fcQWPciqPnOiM4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/6.0.32/microsoft.netcore.app.host.linux-x64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.7"; hash = "sha256-Hi/PhR7YDn7kKLcOGymy90BX+a9jOTmheLetKlOuhW0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/8.0.7/microsoft.netcore.app.host.linux-x64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.32"; hash = "sha256-n6hks4j88TRelq1O6SCeUH5GmxoSm5BWXGwnpnYJibI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/6.0.32/microsoft.netcore.app.host.osx-arm64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.7"; hash = "sha256-cNQHG7xlOgB6o3u0h2+n6uA4M8abci2YbYXwYaXnnbs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/8.0.7/microsoft.netcore.app.host.osx-arm64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.32"; hash = "sha256-nBBq4RYAgimBYOn/bN6JTFvJFYaqYXMHae2pmCzRaS8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/6.0.32/microsoft.netcore.app.host.osx-x64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.7"; hash = "sha256-jlJIQtWuE/CqRuwCam4ucYq1OROQzicouDeM3brpNTI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/8.0.7/microsoft.netcore.app.host.osx-x64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.32"; hash = "sha256-Fm3RUZNcro434rIu3c7unGviGeGBjXj2dGnr2mmrM2g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/6.0.32/microsoft.netcore.app.ref.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.7"; hash = "sha256-q35Ye0w5YqX12JOMXeAXp7ce4nvZQlv0K4GN6hSCz5g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/8.0.7/microsoft.netcore.app.ref.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.32"; hash = "sha256-kdj8ia/2du2oKGg4MJdO2XytpT3gQ9UOiHVCyfiX2V8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/6.0.32/microsoft.netcore.app.runtime.linux-arm64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.7"; hash = "sha256-cQfBGSoZfnuBu+G5dWWxdxy8MzChoIpxWDvkkN98Z8M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/8.0.7/microsoft.netcore.app.runtime.linux-arm64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.32"; hash = "sha256-/Hti30Ba12NDJQcG8pFTg6REVUDIrxZ/hRtEZNDlgxE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/6.0.32/microsoft.netcore.app.runtime.linux-x64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.7"; hash = "sha256-c3ekBpJZOS/2JD5KkktVQRVesPxTJmzpm05ROVR0mxo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/8.0.7/microsoft.netcore.app.runtime.linux-x64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.32"; hash = "sha256-A8MFGOMXFROH1QGUE7xzq5b5EskDyIQCQt7SLfGdSbU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/6.0.32/microsoft.netcore.app.runtime.osx-arm64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.7"; hash = "sha256-RNzRuZH5j1socRsKmzxRLDdQZ/V9FRrT7jdbxtbOSI8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/8.0.7/microsoft.netcore.app.runtime.osx-arm64.8.0.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.32"; hash = "sha256-y5YB62WlMrK10bR/+nNpI8luVRlD9W9ZG3GsX7AXzUM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/6.0.32/microsoft.netcore.app.runtime.osx-x64.6.0.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.7"; hash = "sha256-SN4fTW9O3m2uHQf0B15UXT5Cdxf23SJ03rQ4ye6FR4Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/8.0.7/microsoft.netcore.app.runtime.osx-x64.8.0.7.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.3/microsoft.netcore.targets.1.1.3.nupkg"; }) @@ -95,8 +68,8 @@ (fetchNuGet { pname = "Microsoft.VisualStudio.RemoteControl"; version = "16.3.52"; hash = "sha256-J/egIc9ovDi1MUrnyKnpadECQqAB1WUUyrbxINv4zRE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.remotecontrol/16.3.52/microsoft.visualstudio.remotecontrol.16.3.52.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "3.2.2146"; hash = "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Telemetry"; version = "17.11.8"; hash = "sha256-w6VeYf5feF1HGpz8g7u7ytEXH3Ve8LLkG+SM4uNpDj4="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.11.8/microsoft.visualstudio.telemetry.17.11.8.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.10.41"; hash = "sha256-amoJoKroXLRzlpMGH6HwBLnOge4LqgnOmEitQvz/XHQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading/17.10.41/microsoft.visualstudio.threading.17.10.41.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.41"; hash = "sha256-3hn7R+RHr6AInqPv3OrpsYiI7JdM2+qqIJlyG3kWptU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.10.41/microsoft.visualstudio.threading.analyzers.17.10.41.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.11.20"; hash = "sha256-yuNMLu4qKQpHcYHP2JN45u/dY8wvGHGaFFuHKizupcE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading/17.11.20/microsoft.visualstudio.threading.17.11.20.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.11.20"; hash = "sha256-mHYVKapahjHlrzeJ6JpQAtugg+Ub3IzesYSJ+UTybAU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.11.20/microsoft.visualstudio.threading.analyzers.17.11.20.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Utilities.Internal"; version = "16.3.73"; hash = "sha256-zwk4jWuCw2ANhG00TnwT9JE7n/h2EQkYKeq6o966ilo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.73/microsoft.visualstudio.utilities.internal.16.3.73.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; hash = "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.6.11/microsoft.visualstudio.validation.17.6.11.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; hash = "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.8.8/microsoft.visualstudio.validation.17.8.8.nupkg"; }) @@ -116,6 +89,7 @@ (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.8.0-rc.112"; hash = "sha256-geQh1fSRTp2FTzeilFL8gxFFq7q8u7YaakShPKiTwns="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.8.0-rc.112/nuget.projectmodel.6.8.0-rc.112.nupkg"; }) (fetchNuGet { pname = "NuGet.Protocol"; version = "6.8.0-rc.112"; hash = "sha256-6r/MJCo2ngibSAfNdH+xmeNUl38EPjQkaewKsTJpfvU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.8.0-rc.112/nuget.protocol.6.8.0-rc.112.nupkg"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "6.8.0-rc.112"; hash = "sha256-BzAWS5wpGnNj0gU33sfWao7BELGjrQBT4xj3EC7qRRE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.8.0-rc.112/nuget.versioning.6.8.0-rc.112.nupkg"; }) + (fetchNuGet { pname = "PowerShell"; version = "7.0.0"; hash = "sha256-ioasr71UIhDmeZ2Etw52lQ7QsioEd1pnbpVlEeCyUI4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/powershell/7.0.0/powershell.7.0.0.nupkg"; }) (fetchNuGet { pname = "RichCodeNav.EnvVarDump"; version = "0.1.1643-alpha"; hash = "sha256-bwND+Na9iEnkEdeL1elY34+m4/F4BYATBHv/2BEw4d4="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg"; }) (fetchNuGet { pname = "Roslyn.Diagnostics.Analyzers"; version = "3.11.0-beta1.24081.1"; hash = "sha256-wIOhKwvYetwytnuNX0uNC5oyBDU7xAhLqzTvyuGDVMM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.11.0-beta1.24081.1/roslyn.diagnostics.analyzers.3.11.0-beta1.24081.1.nupkg"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg"; }) @@ -208,7 +182,6 @@ (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; hash = "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg"; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "7.0.2"; hash = "sha256-qS5Z/Yo8J+f3ExVX5Qkcpj1Z57oUZqz5rWa1h5bVpl8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/7.0.2/system.security.cryptography.pkcs.7.0.2.nupkg"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/8.0.0/system.security.cryptography.protecteddata.8.0.0.nupkg"; }) @@ -220,7 +193,7 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/7.0.0/system.text.encoding.codepages.7.0.0.nupkg"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/8.0.0/system.text.encodings.web.8.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.0/system.text.json.8.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.4/system.text.json.8.0.4.nupkg"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.channels/7.0.0/system.threading.channels.7.0.0.nupkg"; }) (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; hash = "sha256-tUX099CChkqWiHyP/1e4jGYzZAjgIthMOdMmiOGMUNk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.overlapped/4.3.0/system.threading.overlapped.4.3.0.nupkg"; }) diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 3207eea29d093..df3eb2e3071f6 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -1,27 +1,44 @@ -{ lib, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, stdenvNoCC, testers, roslyn-ls, jq }: +{ + lib, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + stdenvNoCC, + testers, + roslyn-ls, + jq, +}: let pname = "roslyn-ls"; - dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_7_0 sdk_8_0 sdk_9_0 ]; + dotnet-sdk = + with dotnetCorePackages; + combinePackages [ + sdk_6_0 + sdk_7_0 + sdk_8_0 + sdk_9_0 + ]; # need sdk on runtime as well dotnet-runtime = dotnetCorePackages.sdk_9_0; + rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system; project = "Microsoft.CodeAnalysis.LanguageServer"; in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.39.29"; + vsVersion = "2.45.17"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-E0gha6jZnXyRVH5XUuXxa7H9+2lfD9XTlQcNSiQycHA="; + hash = "sha256-5u+5UkcWn5XKxhbAbZeUBWBAI4B1nuZFP4qDF4cHerU="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "4.12.0-1.24359.11"; + version = "4.12.0-2.24422.6"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.nix; @@ -32,11 +49,6 @@ buildDotnetModule rec { # Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version. jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp mv global.json.tmp global.json - - substituteInPlace $projectFile \ - --replace-fail \ - '>win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>' \ - '>linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>' ''; dotnetFlags = [ @@ -45,35 +57,33 @@ buildDotnetModule rec { # see this comment: https://github.com/NixOS/nixpkgs/pull/318497#issuecomment-2256096471 # we can remove below line after https://github.com/dotnet/roslyn/issues/73439 is fixed "-p:UsingToolMicrosoftNetCompilers=false" + "-p:TargetRid=${rid}" ]; # two problems solved here: # 1. --no-build removed -> BuildHost project within roslyn is running Build target during publish # 2. missing crossgen2 7.* in local nuget directory when PublishReadyToRun=true # the latter should be fixable here but unsure how - installPhase = - let - rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system; - in - '' - runHook preInstall + installPhase = '' + runHook preInstall - env dotnet publish $projectFile \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - -p:InformationalVersion=$version \ - -p:UseAppHost=true \ - -p:PublishTrimmed=false \ - -p:PublishReadyToRun=false \ - --configuration Release \ - --no-self-contained \ - --output "$out/lib/$pname" \ - --runtime ${rid} \ - ''${dotnetInstallFlags[@]} \ - ''${dotnetFlags[@]} + env dotnet publish $dotnetProjectFiles \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + -p:InformationalVersion=$version \ + -p:UseAppHost=true \ + -p:PublishTrimmed=false \ + -p:PublishReadyToRun=false \ + --configuration Release \ + --no-self-contained \ + --output "$out/lib/$pname" \ + --no-restore \ + --runtime ${rid} \ + ''${dotnetInstallFlags[@]} \ + ''${dotnetFlags[@]} - runHook postInstall - ''; + runHook postInstall + ''; passthru = { tests.version = testers.testVersion { package = roslyn-ls; }; diff --git a/pkgs/by-name/ro/rospo/package.nix b/pkgs/by-name/ro/rospo/package.nix new file mode 100644 index 0000000000000..088d0d04f61b7 --- /dev/null +++ b/pkgs/by-name/ro/rospo/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: + +buildGoModule rec { + pname = "rospo"; + version = "0.12.1"; + + src = fetchFromGitHub { + owner = "ferama"; + repo = "rospo"; + rev = "v${version}"; + hash = "sha256-cUah73wr0fKK9Lw3228r5SITDn5rNlpgQW5rHtbo6jU="; + }; + + vendorHash = "sha256-KbR8T7KwueQ9fc4AOX26GOTQFXuV9LgfSxgwCzQt4eE="; + + ldflags = [ + "-s" + "-w" + "-X github.com/ferama/rospo/cmd.Version=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + doCheck = false; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd rospo \ + --bash <($out/bin/rospo completion bash) \ + --fish <($out/bin/rospo completion fish) \ + --zsh <($out/bin/rospo completion zsh) + ''; + + meta = { + description = "Simple, reliable, persistent ssh tunnels with embedded ssh server"; + homepage = "https://github.com/ferama/rospo"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sikmir ]; + mainProgram = "rospo"; + }; +} diff --git a/pkgs/by-name/ro/route-detect/package.nix b/pkgs/by-name/ro/route-detect/package.nix new file mode 100644 index 0000000000000..ce09ce88f3cfc --- /dev/null +++ b/pkgs/by-name/ro/route-detect/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + python3, + semgrep, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "route-detect"; + version = "0.8.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mschwager"; + repo = "route-detect"; + rev = "refs/tags/${version}"; + hash = "sha256-4WkYjAQyteHJTJvSZoSfVUnBvsDQ3TWb5Ttp3uCgvdU="; + }; + + build-system = with python3.pkgs; [ poetry-core ]; + + dependencies = [ semgrep ]; + + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + + pythonImportsCheck = [ "routes" ]; + + meta = { + description = "Find authentication (authn) and authorization (authz) security bugs in web application routes"; + homepage = "https://github.com/mschwager/route-detect"; + changelog = "https://github.com/mschwager/route-detect/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "routes"; + }; +} diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix index e7199164ddd7d..14adef52117ad 100644 --- a/pkgs/by-name/ro/routinator/package.nix +++ b/pkgs/by-name/ro/routinator/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1JxAbQPCQqDVry3wGIdY4q18rzCXlJ7Dnc8LIvhkW1g="; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); meta = with lib; { description = "RPKI Validator written in Rust"; diff --git a/pkgs/applications/emulators/rpcemu/default.nix b/pkgs/by-name/rp/rpcemu/package.nix similarity index 100% rename from pkgs/applications/emulators/rpcemu/default.nix rename to pkgs/by-name/rp/rpcemu/package.nix diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index 9a73b6720aac7..12942225207df 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -33,10 +33,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16875-3b36df48e"; - rpcs3Version = "0.0.32-16875-3b36df48e"; - rpcs3Revision = "3b36df48e9682f257d4eb4151b7b7c390f952858"; - rpcs3Hash = "sha256-rGRMIbLwUYTC11ErJMYreinZbckIwxGJ9WXdySQ9j28="; + rpcs3GitVersion = "16999-938306a7b"; + rpcs3Version = "0.0.33-16999-938306a7b"; + rpcs3Revision = "938306a7bc86edd0dfdd995d28e818f36240bf8f"; + rpcs3Hash = "sha256-5XufzJ3LmhBpLiIscIW3KBgj/R9aSDD5zFiBo/D+p34="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in diff --git a/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch b/pkgs/by-name/rp/rpi-imager/lsblkCheckFix.patch similarity index 100% rename from pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch rename to pkgs/by-name/rp/rpi-imager/lsblkCheckFix.patch diff --git a/pkgs/by-name/rp/rpi-imager/package.nix b/pkgs/by-name/rp/rpi-imager/package.nix new file mode 100644 index 0000000000000..39a07b53d3c3e --- /dev/null +++ b/pkgs/by-name/rp/rpi-imager/package.nix @@ -0,0 +1,86 @@ +{ + lib, + stdenv, + cmake, + curl, + fetchFromGitHub, + libarchive, + nix-update-script, + pkg-config, + qt5, + testers, + util-linux, + xz, + enableTelemetry ? false, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rpi-imager"; + version = "1.8.5"; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = "rpi-imager"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-JrotKMyAgQO3Y5RsFAar9N5/wDpWiBcy8RfvBWDiJMs="; + }; + + sourceRoot = "${finalAttrs.src.name}/src"; + + # By default, the builder checks for JSON support in lsblk by running "lsblk --json", + # but that throws an error, as /sys/dev doesn't exist in the sandbox. + # This patch removes the check. + patches = [ ./lsblkCheckFix.patch ]; + + nativeBuildInputs = [ + cmake + pkg-config + qt5.wrapQtAppsHook + util-linux + ]; + + buildInputs = + [ + curl + libarchive + qt5.qtbase + qt5.qtdeclarative + qt5.qtgraphicaleffects + qt5.qtquickcontrols2 + qt5.qtsvg + qt5.qttools + xz + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + qt5.qtwayland + ]; + + # Disable telemetry and update check. + cmakeFlags = lib.optionals (!enableTelemetry) [ + "-DENABLE_CHECK_VERSION=OFF" + "-DENABLE_TELEMETRY=OFF" + ]; + + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "QT_QPA_PLATFORM=offscreen rpi-imager --version"; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Raspberry Pi Imaging Utility"; + homepage = "https://github.com/raspberrypi/rpi-imager/"; + changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${finalAttrs.version}"; + license = licenses.asl20; + mainProgram = "rpi-imager"; + maintainers = with maintainers; [ + ymarkus + anthonyroussel + ]; + platforms = platforms.all; + # does not build on darwin + broken = stdenv.hostPlatform.isDarwin; + }; +}) diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index d02fe269203bc..bdd27f02a8967 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; doCheck = false; diff --git a/pkgs/by-name/rr/rrdtool/package.nix b/pkgs/by-name/rr/rrdtool/package.nix index 733b981e42473..1a66700b17d9a 100644 --- a/pkgs/by-name/rr/rrdtool/package.nix +++ b/pkgs/by-name/rr/rrdtool/package.nix @@ -28,7 +28,7 @@ perl.pkgs.toPerlModule ( }; # Fix darwin build - patches = lib.optional stdenv.isDarwin (fetchpatch { + patches = lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { url = "https://github.com/oetiker/rrdtool-1.x/pull/1262.patch"; hash = "sha256-aP0rmDlILn6VC8Tg7HpRXbxL9+KD/PRTbXnbQ7HgPEg="; }); @@ -47,7 +47,7 @@ perl.pkgs.toPerlModule ( cairo groff ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ tcl darwin.apple_sdk.frameworks.ApplicationServices ]; diff --git a/pkgs/by-name/rs/rs/package.nix b/pkgs/by-name/rs/rs/package.nix index 9486c13cb1e26..ab5e4fcb4ddd2 100644 --- a/pkgs/by-name/rs/rs/package.nix +++ b/pkgs/by-name/rs/rs/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.mirbsd.org/MirOS/dist/mir/rs/rs-${version}.tar.gz"; - sha256 = "0gxwlfk7bzivpp2260w2r6gkyl7vdi05cggn1fijfnp8kzf1b4li"; + hash = "sha256-kZIV3J/oWiejC/Y9VkBs+1A/n8mCAyPEvTv+daajvD8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isx86_64 && stdenv.isDarwin; # missing strtonum() + broken = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin; # missing strtonum() }; } diff --git a/pkgs/by-name/rs/rsgain/package.nix b/pkgs/by-name/rs/rsgain/package.nix index 2a8fa32ec554c..0e2fb485dfb20 100644 --- a/pkgs/by-name/rs/rsgain/package.nix +++ b/pkgs/by-name/rs/rsgain/package.nix @@ -19,11 +19,9 @@ stdenv.mkDerivation rec { owner = "complexlogic"; repo = "rsgain"; rev = "v${version}"; - sha256 = "sha256-kTvIMsRI99U2ovkN5pC4OUS/bJWpRYSuRcvObvQRnbQ="; + hash = "sha256-kTvIMsRI99U2ovkN5pC4OUS/bJWpRYSuRcvObvQRnbQ="; }; - cmakeFlags = ["-DCMAKE_BUILD_TYPE='Release'"]; - nativeBuildInputs = [pkg-config cmake]; buildInputs = [libebur128 taglib ffmpeg inih fmt zlib]; diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index 72aa065f25339..469d3531e522e 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -4,34 +4,29 @@ makeBinaryWrapper, nodejs, pnpm, + replaceVars, stdenv, - substitute, }: stdenv.mkDerivation (finalAttrs: { pname = "rsshub"; - version = "0-unstable-2024-07-08"; + version = "0-unstable-2024-09-16"; src = fetchFromGitHub { owner = "DIYgod"; repo = "RSSHub"; - rev = "6a29ca395191e745f991b9a0643a2fa9a66c8730"; - hash = "sha256-K7qNPF1vdqhNEjWcysnj20Qaltu3rnhi1bVnIEOTiuk="; + rev = "6de50fb35dbdb93be43f315a8c2651e90c5195a9"; + hash = "sha256-fxkK1prrKfAmB5yqiOKdLPeJp/hO07KJNHLnYSQGPNE="; }; patches = [ - (substitute { - src = ./0001-fix-git-hash.patch; - substitutions = [ - "--subst-var-by" - "GIT_HASH" - finalAttrs.src.rev - ]; + (replaceVars ./0001-fix-git-hash.patch { + "GIT_HASH" = finalAttrs.src.rev; }) ]; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-1Djef4QRLiEKr6ERtL0/IQSYp9dMq3cOCHPW4QnfaZU="; + hash = "sha256-+tlBJGJTkxjsXS0zj6rsn2j4FIQNh70gj8pVdOa3mlU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rt/rtg-tools/package.nix b/pkgs/by-name/rt/rtg-tools/package.nix index 7872df77e61b0..3fe57e0e80aee 100644 --- a/pkgs/by-name/rt/rtg-tools/package.nix +++ b/pkgs/by-name/rt/rtg-tools/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "RealTimeGenomics"; repo = "rtg-tools"; rev = version; - sha256 = "sha256-fMrrjrgaGxBVxn6qMq2g0oFv6qtfhZcQlkvv1E9Os6Y="; + hash = "sha256-fMrrjrgaGxBVxn6qMq2g0oFv6qtfhZcQlkvv1E9Os6Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rt/rtl_fm_streamer/package.nix b/pkgs/by-name/rt/rtl_fm_streamer/package.nix index 05874d6461085..beb45686508a0 100644 --- a/pkgs/by-name/rt/rtl_fm_streamer/package.nix +++ b/pkgs/by-name/rt/rtl_fm_streamer/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "AlbrechtL"; repo = "rtl_fm_streamer"; rev = "ceb2bf06883f986ed01aa57c84989ba35b6b9a27"; - sha256 = "sha256-9M7GS6AC7HEJge04vl7V6ZdtwWvbMu/Rhaf9fwQa9WA="; + hash = "sha256-9M7GS6AC7HEJge04vl7V6ZdtwWvbMu/Rhaf9fwQa9WA="; }; postPatch = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "INSTALL_UDEV_RULES" stdenv.isLinux) + (lib.cmakeBool "INSTALL_UDEV_RULES" stdenv.hostPlatform.isLinux) ]; meta = { @@ -45,6 +45,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/AlbrechtL/rtl_fm_streamer"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ doronbehar ]; - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/pkgs/by-name/rt/rtlamr/package.nix b/pkgs/by-name/rt/rtlamr/package.nix new file mode 100644 index 0000000000000..95e8bc9497eef --- /dev/null +++ b/pkgs/by-name/rt/rtlamr/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: + +buildGoModule rec { + pname = "rtlamr"; + version = "0.9.3-unstable-2023-08-13"; + + src = fetchFromGitHub { + owner = "bemasher"; + repo = "rtlamr"; + rev = "dcdddc5a6e7717a038e9346d0adcf9669e4f60b7"; + sha256 = "sha256-r3dMCpNBCQsqSlFYYfOtVMMgPOagWks6PPWOn5PsLZs"; + }; + + vendorHash = "sha256-uT6zfsWgIot0EMNqwtwJNFXN/WaAyOGfcYJjuyOXT4g="; + + meta = { + description = "Rtl-sdr receiver for Itron ERT compatible smart meters"; + longDescription = '' + An rtl-sdr receiver for Itron ERT compatible smart meters operating + in the 900MHz ISM band + ''; + homepage = "https://github.com/bemasher/rtlamr"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ jmendyk ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 59b3461161470..b2739defd11ba 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -15,18 +15,18 @@ , xmlrpc_c , zlib , nixosTests -, unstableGitUpdater +, gitUpdater }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rakshasa-rtorrent"; - version = "0.9.8-unstable-2024-08-20"; + version = "0.10.0"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "eacf9798e2787df7dd4d5c800a46bac7931ac41c"; - hash = "sha256-VJ2QJfBRUgk0KcCZTHtlyBIMVhs0UfYWAPlTeA98VZU="; + rev = "v${version}"; + hash = "sha256-G/30Enycpqg/pWC95CzT9LY99kN4tI+S8aSQhnQO+M8="; }; outputs = [ "out" "man" ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation { ]; passthru = { - updateScript = unstableGitUpdater { tagPrefix = "v"; }; + updateScript = gitUpdater { rev-prefix = "v"; }; tests = { inherit (nixosTests) rtorrent; }; diff --git a/pkgs/by-name/ru/ruff-lsp/package.nix b/pkgs/by-name/ru/ruff-lsp/package.nix index c87b90ab5f5ae..344dce7755c6a 100644 --- a/pkgs/by-name/ru/ruff-lsp/package.nix +++ b/pkgs/by-name/ru/ruff-lsp/package.nix @@ -1,9 +1,13 @@ { lib, + stdenv, python3, fetchFromGitHub, - stdenv, + + # nativeCheckInputs ruff, + + # passthru nix-update-script, testers, ruff-lsp, @@ -11,15 +15,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ruff-lsp"; - version = "0.0.55"; + version = "0.0.57"; pyproject = true; - disabled = python3.pythonOlder "3.7"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-FFIZ8fDAPK03tnkjd2AUrz7iL8S9FziJQJKOxAisu48="; + hash = "sha256-w9NNdsDD+YLrCw8DHDhVx62MdwLhcN8QSmb/2rqlb5g="; }; postPatch = '' @@ -37,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { ]; # fails in linux sandbox - doCheck = stdenv.isDarwin; + doCheck = stdenv.hostPlatform.isDarwin; nativeCheckInputs = with python3.pkgs; [ pytestCheckHook diff --git a/pkgs/by-name/ru/ruff/Cargo.lock b/pkgs/by-name/ru/ruff/Cargo.lock index 67ad7f651000b..dadfc5b6b4723 100644 --- a/pkgs/by-name/ru/ruff/Cargo.lock +++ b/pkgs/by-name/ru/ruff/Cargo.lock @@ -129,9 +129,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "append-only-vec" @@ -161,6 +161,21 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "assert_fs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efdb1fdb47602827a342857666feb372712cbc64b414172bd6b167a02927674" +dependencies = [ + "anstyle", + "doc-comment", + "globwalk", + "predicates", + "predicates-core", + "predicates-tree", + "tempfile", +] + [[package]] name = "autocfg" version = "1.2.0" @@ -194,6 +209,15 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +[[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.10.0" @@ -201,7 +225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.8", "serde", ] @@ -231,6 +255,9 @@ name = "camino" version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] [[package]] name = "cast" @@ -326,9 +353,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -336,9 +363,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -379,9 +406,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", @@ -410,9 +437,9 @@ dependencies = [ [[package]] name = "codspeed" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a104ac948e0188b921eb3fcbdd55dcf62e542df4c7ab7e660623f6288302089" +checksum = "450a0e9df9df1c154156f4344f99d8f6f6e69d0fc4de96ef6e2e68b2ec3bce97" dependencies = [ "colored", "libc", @@ -421,9 +448,9 @@ dependencies = [ [[package]] name = "codspeed-criterion-compat" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "722c36bdc62d9436d027256ce2627af81ac7a596dfc7d13d849d0d212448d7fe" +checksum = "8eb1a6cb9c20e177fde58cdef97c1c7c9264eb1424fe45c4fccedc2fb078a569" dependencies = [ "codspeed", "colored", @@ -511,6 +538,15 @@ dependencies = [ "rustc-hash 1.1.0", ] +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + [[package]] name = "crc32fast" version = "1.4.0" @@ -616,6 +652,16 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "ctrlc" version = "3.4.5" @@ -676,9 +722,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", @@ -694,6 +740,22 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + [[package]] name = "dirs" version = "4.0.0" @@ -735,6 +797,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + [[package]] name = "drop_bomb" version = "0.1.5" @@ -811,9 +879,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fern" @@ -826,9 +894,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", @@ -879,6 +947,16 @@ dependencies = [ "libc", ] +[[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 = "getopts" version = "0.2.21" @@ -909,15 +987,26 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + +[[package]] +name = "globwalk" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" +dependencies = [ + "bitflags 2.6.0", + "ignore", + "walkdir", ] [[package]] @@ -1017,15 +1106,15 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" dependencies = [ "crossbeam-deque", "globset", "log", "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.8", "same-file", "walkdir", "winapi-util", @@ -1053,9 +1142,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", @@ -1104,14 +1193,16 @@ dependencies = [ [[package]] name = "insta" -version = "1.39.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "globset", "lazy_static", "linked-hash-map", + "pest", + "pest_derive", "regex", "serde", "similar", @@ -1256,9 +1347,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libcst" @@ -1314,9 +1405,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -1336,9 +1427,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lsp-server" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095" +checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9" dependencies = [ "crossbeam-channel", "log", @@ -1553,9 +1644,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordermap" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61d7d835be600a7ac71b24e39c92fe6fad9e818b3c71bfc379e3ba65e327d77f" +checksum = "31f2bd7b03bf2c767e1bb7b91505dbe022833776e60480275e6f2fb0db0c7503" dependencies = [ "indexmap", ] @@ -1707,6 +1798,51 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pest" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + [[package]] name = "phf" version = "0.11.2" @@ -1769,11 +1905,38 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "difflib", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" + +[[package]] +name = "predicates-tree" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +dependencies = [ + "predicates-core", + "termtree", +] + [[package]] name = "pretty_assertions" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" dependencies = [ "diff", "yansi", @@ -1803,9 +1966,9 @@ dependencies = [ [[package]] name = "quick-junit" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc1a6a5406a114913df2df8507998c755311b55b78584bed5f6e88f6417c4d4" +checksum = "62ffd2f9a162cfae131bed6d9d1ed60adced33be340a94f96952897d7cb0c240" dependencies = [ "chrono", "indexmap", @@ -1818,9 +1981,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" dependencies = [ "memchr", ] @@ -1920,9 +2083,8 @@ dependencies = [ "countme", "hashbrown", "insta", - "once_cell", "ordermap", - "path-slash", + "red_knot_vendored", "ruff_db", "ruff_index", "ruff_python_ast", @@ -1936,10 +2098,9 @@ dependencies = [ "smallvec", "static_assertions", "tempfile", + "test-case", "thiserror", "tracing", - "walkdir", - "zip", ] [[package]] @@ -1966,6 +2127,17 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "red_knot_vendored" +version = "0.0.0" +dependencies = [ + "once_cell", + "path-slash", + "ruff_db", + "walkdir", + "zip", +] + [[package]] name = "red_knot_wasm" version = "0.0.0" @@ -1991,12 +2163,14 @@ dependencies = [ "notify", "rayon", "red_knot_python_semantic", + "red_knot_vendored", "ruff_cache", "ruff_db", "ruff_python_ast", "ruff_text_size", "rustc-hash 2.0.0", "salsa", + "tempfile", "tracing", ] @@ -2031,14 +2205,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -2052,13 +2226,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.5", ] [[package]] @@ -2069,9 +2243,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "ring" @@ -2090,10 +2264,11 @@ dependencies = [ [[package]] name = "ruff" -version = "0.6.3" +version = "0.6.9" dependencies = [ "anyhow", "argfile", + "assert_fs", "bincode", "bitflags 2.6.0", "cachedir", @@ -2103,7 +2278,9 @@ dependencies = [ "clearscreen", "colored", "filetime", + "globwalk", "ignore", + "indoc", "insta", "insta-cmd", "is-macro", @@ -2115,7 +2292,9 @@ dependencies = [ "rayon", "regex", "ruff_cache", + "ruff_db", "ruff_diagnostics", + "ruff_graph", "ruff_linter", "ruff_macros", "ruff_notebook", @@ -2157,6 +2336,7 @@ dependencies = [ "ruff_python_formatter", "ruff_python_parser", "ruff_python_trivia", + "rustc-hash 2.0.0", "serde", "serde_json", "tikv-jemallocator", @@ -2183,7 +2363,7 @@ version = "0.0.0" dependencies = [ "camino", "countme", - "dashmap 6.0.1", + "dashmap 6.1.0", "filetime", "ignore", "insta", @@ -2198,6 +2378,7 @@ dependencies = [ "ruff_text_size", "rustc-hash 2.0.0", "salsa", + "serde", "tempfile", "thiserror", "tracing", @@ -2273,6 +2454,26 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "ruff_graph" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "once_cell", + "red_knot_python_semantic", + "ruff_cache", + "ruff_db", + "ruff_linter", + "ruff_macros", + "ruff_python_ast", + "ruff_python_parser", + "salsa", + "schemars", + "serde", + "zip", +] + [[package]] name = "ruff_index" version = "0.0.0" @@ -2283,7 +2484,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.6.3" +version = "0.6.9" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2603,7 +2804,7 @@ dependencies = [ [[package]] name = "ruff_wasm" -version = "0.6.3" +version = "0.6.9" dependencies = [ "console_error_panic_hook", "console_log", @@ -2646,6 +2847,7 @@ dependencies = [ "regex", "ruff_cache", "ruff_formatter", + "ruff_graph", "ruff_linter", "ruff_macros", "ruff_python_ast", @@ -2685,9 +2887,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -2743,12 +2945,12 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "salsa" version = "0.18.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=f608ff8b24f07706492027199f51132244034f29#f608ff8b24f07706492027199f51132244034f29" +source = "git+https://github.com/salsa-rs/salsa.git?rev=4a7c955255e707e64e43f3ce5eabb771ae067768#4a7c955255e707e64e43f3ce5eabb771ae067768" dependencies = [ "append-only-vec", "arc-swap", "crossbeam", - "dashmap 6.0.1", + "dashmap 6.1.0", "hashlink", "indexmap", "lazy_static", @@ -2763,12 +2965,12 @@ dependencies = [ [[package]] name = "salsa-macro-rules" version = "0.1.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=f608ff8b24f07706492027199f51132244034f29#f608ff8b24f07706492027199f51132244034f29" +source = "git+https://github.com/salsa-rs/salsa.git?rev=4a7c955255e707e64e43f3ce5eabb771ae067768#4a7c955255e707e64e43f3ce5eabb771ae067768" [[package]] name = "salsa-macros" version = "0.18.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=f608ff8b24f07706492027199f51132244034f29#f608ff8b24f07706492027199f51132244034f29" +source = "git+https://github.com/salsa-rs/salsa.git?rev=4a7c955255e707e64e43f3ce5eabb771ae067768#4a7c955255e707e64e43f3ce5eabb771ae067768" dependencies = [ "heck", "proc-macro2", @@ -2830,9 +3032,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -2850,9 +3052,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -2872,9 +3074,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -2934,6 +3136,17 @@ dependencies = [ "syn", ] +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -3033,9 +3246,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.76" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -3055,9 +3268,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -3089,6 +3302,12 @@ dependencies = [ "phf_codegen", ] +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + [[package]] name = "test-case" version = "3.3.1" @@ -3124,18 +3343,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -3334,6 +3553,18 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + [[package]] name = "unic-char-property" version = "0.9.0" @@ -3384,15 +3615,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -3405,9 +3636,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode_names2" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677" +checksum = "d1673eca9782c84de5f81b82e4109dcfb3611c8ba0d52930ec4a9478f547b2dd" dependencies = [ "phf", "unicode_names2_generator", @@ -3415,9 +3646,9 @@ dependencies = [ [[package]] name = "unicode_names2_generator" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f444b8bba042fe3c1251ffaca35c603f2dc2ccc08d595c65a8c4f76f3e8426c0" +checksum = "b91e5b84611016120197efd7dc93ef76774f4e084cd73c9fb3ea4a86c570c56e" dependencies = [ "getopts", "log", @@ -3903,9 +4134,9 @@ checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" [[package]] name = "yansi" -version = "0.5.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yansi-term" diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 472f46d10a88b..c760ebd8f336e 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -8,26 +8,25 @@ rust-jemalloc-sys, ruff-lsp, nix-update-script, - testers, - ruff, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.6.3"; + version = "0.6.9"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-5jS2NCl01kgUAd8hFtjJCOwRxi0XMM2x7VMpJLEgbOQ="; + hash = "sha256-O8iRCVxHrchBSf9kLdkdT0+oMi+5fLCAF9CMEsPrHqw="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ="; - "salsa-0.18.0" = "sha256-EjpCTOB6E7n5oNn1bvzNyznzs0uRJvAXrNsZggk4hgM="; + "salsa-0.18.0" = "sha256-zHXLNK6SCiJ3MmT0PMIauA1eolyJ4wfVWxN6wcvmhts="; }; }; @@ -35,7 +34,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ruff \ @@ -44,16 +43,17 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/ruff generate-shell-completion zsh) ''; - passthru.tests = { - inherit ruff-lsp; + passthru = { + tests = { + inherit ruff-lsp; + }; updateScript = nix-update-script { }; - version = testers.testVersion { package = ruff; }; }; # Failing on darwin for an unclear reason. # According to the maintainers, those tests are from an experimental crate that isn't actually # used by ruff currently and can thus be safely skipped. - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=changed_file" "--skip=changed_metadata" "--skip=changed_versions_file" @@ -73,6 +73,12 @@ rustPlatform.buildRustPackage rec { "--skip=unix::symlink_inside_workspace" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + meta = { description = "Extremely fast Python linter"; homepage = "https://github.com/astral-sh/ruff"; diff --git a/pkgs/by-name/ru/rush-parallel/package.nix b/pkgs/by-name/ru/rush-parallel/package.nix new file mode 100644 index 0000000000000..930eab157eedc --- /dev/null +++ b/pkgs/by-name/ru/rush-parallel/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "rush-parallel"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "shenwei356"; + repo = "rush"; + rev = "v${version}"; + hash = "sha256-u3KGjZ5C8jDuAKE/dy4zR+EEFb35aJtj2YkwIb+kad4="; + }; + + vendorHash = "sha256-zCloMhjHNkPZHYX1e1nx072IYbWHFWam4Af0l0s8a6M="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "A cross-platform command-line tool for executing jobs in parallel"; + homepage = "https://github.com/shenwei356/rush"; + changelog = "https://github.com/shenwei356/rush/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kranzes ]; + mainProgram = "rush-parallel"; + }; +} diff --git a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock index cb2a54f8a6636..406c1525a8f87 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock @@ -224,7 +224,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" version = "3.4.0" -source = "git+https://github.com/rustdesk-org/arboard#a04bdb1b368a99691822c33bf0f7ed497d6a7a35" +source = "git+https://github.com/rustdesk-org/arboard#747ab2d9b40a5c9c5102051cf3b0bb38b4845e60" dependencies = [ "clipboard-win", "core-graphics 0.23.2", @@ -860,6 +860,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -3037,7 +3043,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/hwcodec#6abd1898f3a03481ed0c038507b5218d6ea94267" +source = "git+https://github.com/rustdesk-org/hwcodec#f74410edec91435252b8394c38f8eeca87ad2a26" dependencies = [ "bindgen 0.59.2", "cc", @@ -3959,11 +3965,23 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", "memoffset 0.9.1", ] +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if 1.0.0", + "cfg_aliases 0.2.1", + "libc", +] + [[package]] name = "nom" version = "7.1.3" @@ -5179,7 +5197,7 @@ dependencies = [ [[package]] name = "rdev" version = "0.5.0-2" -source = "git+https://github.com/rustdesk-org/rdev#b3434caee84c92412b45a2f655a15ac5dad33488" +source = "git+https://github.com/rustdesk-org/rdev#d4c1759926d693ba269e2cb8cf9f87b13e424e4e" dependencies = [ "cocoa 0.24.1", "core-foundation 0.9.4", @@ -5454,7 +5472,7 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.3.0" +version = "1.3.1" dependencies = [ "android-wakelock", "android_logger", @@ -5486,6 +5504,7 @@ dependencies = [ "flutter_rust_bridge", "fon", "fruitbasket", + "gtk", "hbb_common", "hex", "hound", @@ -5500,6 +5519,7 @@ dependencies = [ "libpulse-simple-binding", "mac_address", "magnum-opus", + "nix 0.29.0", "num_cpus", "objc", "objc_id", @@ -5531,6 +5551,7 @@ dependencies = [ "system_shutdown", "tao", "tauri-winrt-notification", + "termios", "totp-rs", "tray-icon", "url", @@ -5551,7 +5572,7 @@ dependencies = [ [[package]] name = "rustdesk-portable-packer" -version = "1.3.0" +version = "1.3.1" dependencies = [ "brotli", "dirs 5.0.1", diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index aa403cc04b9ec..2dd1b134eaa63 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -1,32 +1,35 @@ -{ lib -, clangStdenv -, cargo -, copyDesktopItems -, fetchFromGitHub -, flutter316 -, ffmpeg -, gst_all_1 -, fuse3 -, libXtst -, libaom -, libopus -, libpulseaudio -, libva -, libvdpau -, libvpx -, libxkbcommon -, libyuv -, pam -, makeDesktopItem -, rustPlatform -, rustc -, rustfmt -, xdotool -}: let +{ + lib, + clangStdenv, + cargo, + copyDesktopItems, + fetchFromGitHub, + flutter319, + ffmpeg, + gst_all_1, + fuse3, + libXtst, + libaom, + libopus, + libpulseaudio, + libva, + libvdpau, + libvpx, + libxkbcommon, + libyuv, + pam, + makeDesktopItem, + rustPlatform, + libayatana-appindicator, + rustc, + rustfmt, + xdotool, +}: +let flutterRustBridge = rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.0/.github/workflows/bridge.yml#L10 + version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.1/.github/workflows/bridge.yml#L10 src = fetchFromGitHub { owner = "fzyzcjy"; @@ -36,20 +39,24 @@ }; cargoHash = "sha256-dDyiptG9TKes+fXx2atwx697SWH7Rltx6xVubtTn7FM="; - cargoBuildFlags = [ "--package" "flutter_rust_bridge_codegen" ]; + cargoBuildFlags = [ + "--package" + "flutter_rust_bridge_codegen" + ]; doCheck = false; }; sharedLibraryExt = rustc.stdenv.hostPlatform.extensions.sharedLibrary; -in flutter316.buildFlutterApplication rec { +in +flutter319.buildFlutterApplication rec { pname = "rustdesk"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - hash = "sha256-pDGURsF0eft2BkuXOzaMtNCHp9VFgZZh4bbNRa5NDII="; + hash = "sha256-PioaSdvgJ9oXC5DAbl+em7rxcGx1om9+sjCMdrvox90="; }; strictDeps = true; @@ -57,7 +64,7 @@ in flutter316.buildFlutterApplication rec { # Configure the Flutter/Dart build sourceRoot = "${src.name}/flutter"; - # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.0/flutter/pubspec.lock | yq > pubspec.lock.json + # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.1/flutter/pubspec.lock | yq > pubspec.lock.json pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow="; @@ -76,34 +83,34 @@ in flutter316.buildFlutterApplication rec { # and fixing the resulting errors by removing the other registry deps. lockFile = ./Cargo.lock; outputHashes = { - "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; - "arboard-3.4.0" = "sha256-lZIG5z115ExR6DcUut1rk9MrYFzSyCYH9kNGIikOPJM="; - "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; - "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA="; - "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; - "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; - "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; - "hwcodec-0.7.0" = "sha256-pfzcaD7h/U5ou+P7qRLR56iXOkm043rF74y+Q0FsVLo="; - "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; - "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; - "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; - "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; - "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE="; - "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; - "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; - "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw="; - "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; - "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; - "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E="; - "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; - "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; - "tfc-0.7.0" = "sha256-4plK8ttbHsBPat3/rS+4RhGzirq2Ked2wrU8cQEU1zo="; - "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; - "tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg="; - "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; - "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; - "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; - "x11-clipboard-0.8.1" = "sha256-PtqmSD2MwkbLVWbfTSXZW3WEvEnUlo04qieUTjN2whE="; + "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; + "arboard-3.4.0" = "sha256-xuMfMakHVj/zjiUr6PVFy+aNQxwsXtAAFlTYxUt12fU="; + "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; + "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA="; + "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; + "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; + "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; + "hwcodec-0.7.0" = "sha256-SswZI2BJ4pRXT379cziJlisPsc5sOiOiDqJ5WaPETnA="; + "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; + "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; + "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; + "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; + "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE="; + "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; + "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; + "rdev-0.5.0-2" = "sha256-G+PvnA5mZyN080uoI5CGj/dQ9B1J4h5iYd7214MKBR8="; + "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; + "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; + "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E="; + "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; + "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; + "tfc-0.7.0" = "sha256-4plK8ttbHsBPat3/rS+4RhGzirq2Ked2wrU8cQEU1zo="; + "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; + "tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg="; + "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; + "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; + "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; + "x11-clipboard-0.8.1" = "sha256-PtqmSD2MwkbLVWbfTSXZW3WEvEnUlo04qieUTjN2whE="; }; }; dontCargoBuild = true; @@ -147,11 +154,17 @@ in flutter316.buildFlutterApplication rec { prePatch = '' chmod -R +w .. ''; - patchFlags = [ "-p1" "-d" ".." ]; + patchFlags = [ + "-p1" + "-d" + ".." + ]; patches = [ ./make-build-reproducible.patch ]; postPatch = '' + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${lib.getLib libayatana-appindicator}/lib/libayatana-appindicator3.so.1" substituteInPlace ../Cargo.toml --replace-fail ", \"staticlib\", \"rlib\"" "" # The supplied Cargo.lock doesn't work with our fetcher so copy over the fixed version cp ${./Cargo.lock} ../Cargo.lock @@ -159,7 +172,7 @@ in flutter316.buildFlutterApplication rec { ''; preBuild = '' - # Disable static linking of ffmpeg since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84¶ + # Disable static linking of ffmpeg since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84 sed -i 's/static=//g' /build/cargo-vendor-dir/hwcodec-*/build.rs # Build the Flutter/Rust bridge bindings @@ -187,7 +200,6 @@ in flutter316.buildFlutterApplication rec { mkdir -p $out/share/polkit-1/actions $out/share/icons/hicolor/{256x256,scalable}/apps cp ../res/128x128@2x.png $out/share/icons/hicolor/256x256/apps/rustdesk.png cp ../res/scalable.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg - cp ../res/com.rustdesk.RustDesk.policy $out/share/polkit-1/actions/ ''; desktopItems = [ @@ -201,7 +213,11 @@ in flutter316.buildFlutterApplication rec { terminal = false; type = "Application"; startupNotify = true; - categories = [ "Network" "RemoteAccess" "GTK" ]; + categories = [ + "Network" + "RemoteAccess" + "GTK" + ]; keywords = [ "internet" ]; actions.new-window = { name = "Open a New Window"; diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json index a077b296731b4..a0a7ad0d80768 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json +++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json @@ -473,6 +473,26 @@ "source": "git", "version": "0.0.1+1" }, + "extended_text": { + "dependency": "direct main", + "description": { + "name": "extended_text", + "sha256": "7f382de3af12992e34bd72ddd36becf90c4720900af126cb9859f0189af71ffe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "13.0.0" + }, + "extended_text_library": { + "dependency": "transitive", + "description": { + "name": "extended_text_library", + "sha256": "55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.0" + }, "external_path": { "dependency": "direct main", "description": { @@ -633,8 +653,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "38951317afe79d953ab25733667bd96e172a80d3", - "resolved-ref": "38951317afe79d953ab25733667bd96e172a80d3", + "ref": "2ded7f146437a761ffe6981e2f742038f85ca68d", + "resolved-ref": "2ded7f146437a761ffe6981e2f742038f85ca68d", "url": "https://github.com/rustdesk-org/flutter_gpu_texture_renderer" }, "source": "git", @@ -2013,7 +2033,7 @@ } }, "sdks": { - "dart": ">=3.2.0 <4.0.0", - "flutter": ">=3.16.0" + "dart": ">=3.3.0 <4.0.0", + "flutter": ">=3.19.0" } } diff --git a/pkgs/by-name/ru/rustdesk/Cargo.lock b/pkgs/by-name/ru/rustdesk/Cargo.lock index 507a776657578..6ebeb4201503a 100644 --- a/pkgs/by-name/ru/rustdesk/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -17,43 +17,60 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aes" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if 1.0.0", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom", "once_cell", "version_check", ] +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", + "version_check", + "zerocopy 0.7.35", +] + [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allo-isolate" -version = "0.1.14" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ed55848be9f41d44c79df6045b680a74a78bc579e0813f7f196cd7928e22fb1" +checksum = "97b6d794345b06592d0ebeed8e477e41b71e5a0a49df4fc0e4184d5938b99509" dependencies = [ "anyhow", "atomic", @@ -76,16 +93,22 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + [[package]] name = "alsa" -version = "0.7.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" dependencies = [ "alsa-sys", - "bitflags", + "bitflags 2.6.0", + "cfg-if 1.0.0", "libc", - "nix 0.24.3", ] [[package]] @@ -98,20 +121,36 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android-wakelock" +version = "0.1.0" +source = "git+https://github.com/rustdesk-org/android-wakelock#d0292e5a367e627c4fa6f1ca6bdfad005dca7d90" +dependencies = [ + "jni 0.21.1", + "log", + "ndk-context", +] + [[package]] name = "android_log-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f0fc03f560e1aebde41c2398b691cb98b5ea5996a6184a7a67bbbb77448969" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" [[package]] name = "android_logger" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa490e751f3878eb9accb9f18988eca52c2337ce000a8bf31ef50d4c723ca9e" +checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f" dependencies = [ "android_log-sys", - "env_logger 0.10.0", + "env_logger 0.10.2", "log", "once_cell", ] @@ -136,114 +175,77 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "apple-bindgen" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f109ee76f68b4767848cb5dc93bfcc7c425deca849c4c81fa11cdce525e3d2" -dependencies = [ - "apple-sdk", - "bindgen 0.63.0", - "derive_more", - "regex", - "serde 1.0.163", - "thiserror", - "toml 0.6.0", -] - -[[package]] -name = "apple-sdk" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a04f192a700686ee70008ff4e4eb76fe7d11814ab93b7ee9d48c36b9a9f0bd2a" -dependencies = [ - "plist", - "serde 1.0.163", - "serde_json 1.0.96", -] - -[[package]] -name = "apple-sys" -version = "0.2.0" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b3a1c3342678cd72676d0c1644fde496c1f65ea41f51465f54a89cad3bdf34" -dependencies = [ - "apple-bindgen", - "apple-sdk", - "objc", -] +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" +version = "3.4.0" +source = "git+https://github.com/rustdesk-org/arboard#a04bdb1b368a99691822c33bf0f7ed497d6a7a35" dependencies = [ "clipboard-win", - "core-graphics", - "image", + "core-graphics 0.23.2", + "image 0.25.2", "log", - "objc", - "objc-foundation", - "objc_id", - "once_cell", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", - "thiserror", - "winapi 0.3.9", - "x11rb", + "serde 1.0.209", + "serde_derive", + "windows-sys 0.48.0", + "wl-clipboard-rs", + "x11rb 0.13.1", ] [[package]] @@ -252,32 +254,45 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-channel" -version = "1.8.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-compression" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +dependencies = [ + "flate2", "futures-core", + "memchr", + "pin-project-lite", + "tokio", ] [[package]] name = "async-executor" -version = "1.5.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ - "async-lock", "async-task", "concurrent-queue", - "fastrand", - "futures-lite", + "fastrand 2.1.1", + "futures-lite 2.3.0", "slab", ] @@ -287,10 +302,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", - "autocfg 1.1.0", + "async-lock 2.8.0", + "autocfg 1.3.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -299,113 +314,156 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", - "autocfg 1.1.0", + "async-lock 2.8.0", + "autocfg 1.3.0", "cfg-if 1.0.0", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix", + "polling 2.8.0", + "rustix 0.37.27", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +dependencies = [ + "async-lock 3.4.0", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.3", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener", + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", - "autocfg 1.1.0", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", "blocking", "cfg-if 1.0.0", - "event-listener", - "futures-lite", - "rustix", - "signal-hook", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] + +[[package]] +name = "async-signal" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +dependencies = [ + "async-io 2.3.4", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if 1.0.0", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.59.0", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "atk" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39991bc421ddf72f70159011b323ff49b0f783cc676a7287c59453da2e2531cf" +checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4" dependencies = [ "atk-sys", - "bitflags", - "glib 0.16.7", + "glib 0.18.5", "libc", ] [[package]] name = "atk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148" +checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] name = "atomic" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" -dependencies = [ - "autocfg 1.1.0", -] +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atty" @@ -424,35 +482,47 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] +[[package]] +name = "base32" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" + [[package]] name = "base64" -version = "0.21.0" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -466,7 +536,7 @@ version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "clap 2.34.0", @@ -475,8 +545,8 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "regex", "rustc-hash", "shlex", @@ -485,67 +555,45 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.63.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", "lazycell", "log", "peeking_take_while", - "proc-macro2 1.0.63", - "quote 1.0.27", + "prettyplease", + "proc-macro2 1.0.86", + "quote 1.0.37", "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.76", "which", ] [[package]] name = "bindgen" -version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2 1.0.63", - "quote 1.0.27", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", -] - -[[package]] -name = "bindgen" -version = "0.65.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags", + "bitflags 2.6.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "log", - "peeking_take_while", - "prettyplease", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "regex", "rustc-hash", "shlex", - "syn 2.0.15", - "which", + "syn 2.0.76", ] [[package]] @@ -560,6 +608,25 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde 1.0.209", +] + +[[package]] +name = "bitmask-enum" +version = "2.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" +dependencies = [ + "quote 1.0.37", + "syn 2.0.76", +] + [[package]] name = "bitvec" version = "1.0.1" @@ -587,26 +654,52 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +dependencies = [ + "objc-sys 0.2.0-beta.2", +] + +[[package]] +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "block-sys", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", +] + [[package]] name = "blocking" -version = "1.3.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock", "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "log", + "futures-io", + "futures-lite 2.3.0", + "piper", ] [[package]] name = "brotli" -version = "3.3.4" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -615,9 +708,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -631,29 +724,35 @@ checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" [[package]] name = "bumpalo" -version = "3.12.2" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.4.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", ] [[package]] @@ -677,15 +776,33 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "cacao" +version = "0.4.0-beta2" +source = "git+https://github.com/clslaid/cacao?branch=feat/set-file-urls#05e1536b0b43aaae308ec72c0eed703e875b7b95" +dependencies = [ + "bitmask-enum", + "block2 0.2.0-alpha.6", + "core-foundation 0.9.3", + "core-graphics 0.23.1", + "dispatch", + "lazy_static", + "libc", + "objc2 0.3.0-beta.2", + "os_info", + "percent-encoding", + "url", +] + [[package]] name = "cairo-rs" -version = "0.16.7" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags", + "bitflags 2.6.0", "cairo-sys-rs", - "glib 0.16.7", + "glib 0.18.5", "libc", "once_cell", "thiserror", @@ -693,72 +810,24 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.16.3" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ - "glib-sys 0.16.3", + "glib-sys 0.18.1", "libc", - "system-deps 6.1.0", -] - -[[package]] -name = "camino" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "cargo_metadata" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde 1.0.163", - "serde_json 1.0.96", -] - -[[package]] -name = "cbindgen" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb" -dependencies = [ - "clap 3.2.25", - "heck 0.4.1", - "indexmap", - "log", - "proc-macro2 1.0.63", - "quote 1.0.27", - "serde 1.0.163", - "serde_json 1.0.96", - "syn 1.0.109", - "tempfile", - "toml 0.5.11", + "system-deps 6.2.2", ] [[package]] name = "cc" -version = "1.0.79" +version = "1.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" dependencies = [ "jobserver", + "libc", + "shlex", ] [[package]] @@ -778,9 +847,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.1" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -798,52 +867,64 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", - "num-traits 0.2.15", - "time 0.1.45", + "num-traits 0.2.19", "wasm-bindgen", - "winapi 0.3.9", + "windows-targets 0.52.6", ] [[package]] name = "cidr-utils" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdfa36f04861d39453affe1cf084ce2d6554021a84eb6f31ebdeafb6fb92a01c" +checksum = "2315f7119b7146d6a883de6acd63ddf96071b5f79d9d98d2adaa84d749f6abf1" dependencies = [ "debug-helper", "num-bigint", - "num-traits 0.2.15", + "num-traits 0.2.19", "once_cell", "regex", ] [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading 0.8.5", ] [[package]] @@ -854,100 +935,87 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", - "textwrap 0.11.0", + "textwrap", "unicode-width", "vec_map", ] [[package]] name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags", - "clap_lex 0.2.4", - "indexmap", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.0", -] - -[[package]] -name = "clap" -version = "4.2.7" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", - "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.2.7" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", - "bitflags", - "clap_lex 0.4.1", - "strsim 0.10.0", -] - -[[package]] -name = "clap_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" -dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "clap_lex", + "strsim 0.11.1", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clipboard" version = "0.1.0" dependencies = [ + "cacao", "cc", + "dashmap", + "fuser", "hbb_common", "lazy_static", - "serde 1.0.163", + "libc", + "once_cell", + "parking_lot", + "percent-encoding", + "rand 0.8.5", + "serde 1.0.209", "serde_derive", "thiserror", + "utf16string", + "x11-clipboard 0.8.1", + "x11rb 0.12.0", +] + +[[package]] +name = "clipboard-master" +version = "4.0.0-beta.6" +source = "git+https://github.com/rustdesk-org/clipboard-master#4fb62e5b62fb6350d82b571ec7ba94b3cd466695" +dependencies = [ + "objc", + "objc-foundation", + "objc_id", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", + "windows-win", + "wl-clipboard-rs", + "x11-clipboard 0.9.2", + "x11rb 0.13.1", ] [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", - "str-buf", - "winapi 0.3.9", ] [[package]] @@ -956,14 +1024,14 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "cmake" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" dependencies = [ "cc", ] @@ -974,39 +1042,74 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" +dependencies = [ + "bitflags 2.6.0", + "block", + "cocoa-foundation 0.2.0", + "core-foundation 0.10.0", + "core-graphics 0.24.0", + "foreign-types 0.5.0", "libc", "objc", ] [[package]] name = "cocoa-foundation" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", - "core-foundation", - "core-graphics-types", - "foreign-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", "libc", "objc", ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "cocoa-foundation" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" dependencies = [ - "termcolor", - "unicode-width", + "bitflags 2.6.0", + "block", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", + "libc", + "objc", ] [[package]] @@ -1017,26 +1120,15 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "colored" -version = "1.9.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" -dependencies = [ - "atty", - "lazy_static", - "winapi 0.3.9", -] +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -1044,9 +1136,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -1054,10 +1146,10 @@ dependencies = [ [[package]] name = "confy" version = "0.4.0-2" -source = "git+https://github.com/open-trade/confy#7855cd3c32b1a60b44e5076ee8f6b4131da10350" +source = "git+https://github.com/rustdesk-org/confy#83db9ec19a2f97e9718aef69e4fc5611bb382479" dependencies = [ "directories-next", - "serde 1.0.163", + "serde 1.0.209", "thiserror", "toml 0.5.11", ] @@ -1074,28 +1166,28 @@ dependencies = [ [[package]] name = "const_fn" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" +checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d" [[package]] name = "const_format" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "unicode-xid 0.2.4", + "proc-macro2 1.0.86", + "quote 1.0.37", + "unicode-xid 0.2.5", ] [[package]] @@ -1105,179 +1197,242 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] -name = "convert_case" -version = "0.4.0" +name = "constant_time_eq" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" +dependencies = [ + "core-foundation-sys 0.8.6", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys 0.8.7", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys 0.8.7", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" +dependencies = [ + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] -name = "convert_case" -version = "0.5.0" +name = "core-graphics" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.3.2", + "libc", +] [[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +name = "core-graphics" +version = "0.23.1" +source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" dependencies = [ - "core-foundation-sys 0.8.4", + "bitflags 1.3.2", + "core-foundation 0.9.3", + "core-graphics-types 0.1.2", + "foreign-types 0.5.0", "libc", + "objc2-encode 2.0.0-pre.2", ] [[package]] -name = "core-foundation-sys" -version = "0.6.2" +name = "core-graphics" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.5.0", + "libc", +] [[package]] -name = "core-foundation-sys" -version = "0.8.4" +name = "core-graphics" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", + "foreign-types 0.5.0", + "libc", +] [[package]] -name = "core-graphics" -version = "0.22.3" +name = "core-graphics-types" +version = "0.1.2" +source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.3", + "libc", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ - "bitflags", - "core-foundation", - "core-graphics-types", - "foreign-types", + "bitflags 1.3.2", + "core-foundation 0.9.4", "libc", ] [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags", - "core-foundation", - "foreign-types", + "bitflags 2.6.0", + "core-foundation 0.10.0", "libc", ] [[package]] name = "coreaudio-rs" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ - "bitflags", - "core-foundation-sys 0.6.2", + "bitflags 1.3.2", + "core-foundation-sys 0.8.7", "coreaudio-sys", ] [[package]] name = "coreaudio-sys" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" dependencies = [ - "bindgen 0.64.0", + "bindgen 0.69.4", ] [[package]] name = "cpal" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ "alsa", - "core-foundation-sys 0.8.4", + "core-foundation-sys 0.8.7", "coreaudio-rs", "dasp_sample", - "jni 0.19.0", + "jni 0.21.1", "js-sys", "libc", "mach2", - "ndk", + "ndk 0.8.0", "ndk-context", "oboe", - "once_cell", - "parking_lot", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.46.0", + "windows 0.54.0", ] [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg 1.1.0", - "cfg-if 1.0.0", "crossbeam-utils", - "memoffset 0.8.0", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1297,82 +1452,34 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.2.5" +version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.26.2", - "windows-sys 0.45.0", + "nix 0.29.0", + "windows-sys 0.59.0", ] [[package]] -name = "cxx" -version = "1.0.94" +name = "dart-sys" +version = "4.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +checksum = "57967e4b200d767d091b961d6ab42cc7d0cc14fe9e052e75d0d3cf9eb732d895" dependencies = [ "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", ] [[package]] -name = "cxx-build" -version = "1.0.94" +name = "dashmap" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cc", - "codespan-reporting", + "cfg-if 1.0.0", + "hashbrown 0.14.5", + "lock_api", "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.27", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "dark-light" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62007a65515b3cd88c733dd3464431f05d2ad066999a824259d8edc3cf6f645" -dependencies = [ - "dconf_rs", - "detect-desktop-environment", - "dirs 4.0.0", - "objc", - "rust-ini", - "web-sys", - "winreg 0.10.1", - "zbus", - "zvariant", -] - -[[package]] -name = "dart-sys" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8b5680b5c2cc52f50acb2457d9b3a3b58adcca785db13a0e3655626f601de6" -dependencies = [ - "cc", + "parking_lot_core", ] [[package]] @@ -1514,12 +1621,6 @@ dependencies = [ "dbus", ] -[[package]] -name = "dconf_rs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7046468a81e6a002061c01e6a7c83139daf91b11c30e66795b13217c2d885c8b" - [[package]] name = "debug-helper" version = "0.3.13" @@ -1544,14 +1645,12 @@ dependencies = [ ] [[package]] -name = "delegate" -version = "0.8.0" +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "082a24a9967533dc5d743c602157637116fc1b52806d694a5a45e6f32567fcdd" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "powerfmt", ] [[package]] @@ -1560,35 +1659,16 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2 1.0.63", - "quote 1.0.27", - "rustc_version", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] -[[package]] -name = "detect-desktop-environment" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d8ad60dd5b13a4ee6bd8fa2d5d88965c597c67bce32b5fc49c94f55cb50810" - [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -1615,15 +1695,6 @@ dependencies = [ "dirs-sys 0.3.7", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - [[package]] name = "dirs" version = "5.0.1" @@ -1683,6 +1754,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.5", +] + [[package]] name = "dlopen" version = "0.1.8" @@ -1713,8 +1793,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a09ac8bb8c16a282264c379dffba707b9c998afc7506009137f3c6136888078" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] @@ -1743,10 +1823,22 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.163", + "serde 1.0.209", "strsim 0.10.0", ] +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + [[package]] name = "dtoa" version = "0.4.8" @@ -1760,7 +1852,7 @@ dependencies = [ "cc", "hbb_common", "lazy_static", - "serde 1.0.163", + "serde 1.0.209", "serde_derive", "thiserror", ] @@ -1776,28 +1868,15 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "embed-resource" -version = "2.1.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80663502655af01a2902dff3f06869330782267924bf1788410b74edcd93770a" -dependencies = [ - "cc", - "rustc_version", - "toml 0.7.3", - "vswhom", - "winreg 0.11.0", -] +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if 1.0.0", ] @@ -1806,13 +1885,13 @@ dependencies = [ name = "enigo" version = "0.0.14" dependencies = [ - "core-graphics", + "core-graphics 0.22.3", "hbb_common", "log", "objc", "pkg-config", "rdev", - "serde 1.0.163", + "serde 1.0.209", "serde_derive", "tfc", "unicode-segmentation", @@ -1820,76 +1899,53 @@ dependencies = [ ] [[package]] -name = "enum-iterator" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.2.1" +name = "enquote" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" +checksum = "06c36cb11dbde389f4096111698d8b567c0720e3452fd5ac3e6b4e47e1939932" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "thiserror", ] [[package]] name = "enum-map" -version = "2.5.0" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "988f0d17a0fa38291e5f41f71ea8d46a5d5497b9054d5a759fae2cbb819f2356" +checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" dependencies = [ "enum-map-derive", ] [[package]] name = "enum-map-derive" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4da76b3b6116d758c7ba93f7ec6a35d2e2cf24feda76c6e38a375f4d5c59f2" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.11" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" +checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ - "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", - "serde 1.0.163", + "serde 1.0.209", ] [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] @@ -1907,9 +1963,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -1920,44 +1976,35 @@ dependencies = [ [[package]] name = "epoll" -version = "4.3.1" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20df693c700404f7e19d4d6fae6b15215d2913c27955d2b9d6f2c0f537511cd0" +checksum = "74351c3392ea1ff6cd2628e0042d268ac2371cb613252ff383b6dfa50d22fa79" dependencies = [ - "bitflags", + "bitflags 2.6.0", "libc", ] [[package]] -name = "errno" -version = "0.3.1" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] name = "error-code" -version = "2.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "evdev" @@ -1975,17 +2022,49 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + [[package]] name = "exr" -version = "1.6.3" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", "half", "lebe", - "miniz_oxide 0.6.2", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -2001,62 +2080,63 @@ dependencies = [ ] [[package]] -name = "fdeflate" -version = "0.3.0" +name = "fastrand" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" -dependencies = [ - "simd-adler32", -] +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] -name = "fern" -version = "0.6.2" +name = "fdeflate" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ - "chrono", - "colored", - "log", + "simd-adler32", ] [[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.8.0", + "memoffset 0.9.1", "rustc_version", ] [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", + "libredox", + "windows-sys 0.59.0", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide 0.8.0", ] [[package]] name = "flexi_logger" -version = "0.25.4" +version = "0.27.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611de758a8869ffffa7524aafdb48658c64dae95cdce49654d68a8442e500d89" +checksum = "469e584c031833564840fb0cdbce99bdfe946fd45480a188545e73a76f45461c" dependencies = [ "chrono", "crossbeam-channel", @@ -2072,22 +2152,18 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin 0.9.8", + "spin", ] [[package]] name = "flutter_rust_bridge" -version = "1.75.3" +version = "1.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907f6624c3c6a5a1421b1c1eb9c2881104607730d5f67ce7ae50051efa7a2cf3" +checksum = "fd0305ebc9f097d9826530a55fc2acd63222e912c663f7adce3ab641ecc0f346" dependencies = [ "allo-isolate", "anyhow", @@ -2099,54 +2175,21 @@ dependencies = [ "dart-sys", "flutter_rust_bridge_macros", "js-sys", - "lazy_static", - "libc", - "log", - "parking_lot", - "threadpool", - "uuid", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "flutter_rust_bridge_codegen" -version = "1.75.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fdb2728cabeb86d1271ed4398ee1518b4a3d9f659756cf5021e5c5a91e3f25" -dependencies = [ - "anyhow", - "atty", - "cargo_metadata", - "cbindgen", - "chrono", - "clap 4.2.7", - "convert_case 0.5.0", - "delegate", - "enum-iterator", - "enum_dispatch", - "fern", - "itertools 0.10.5", - "lazy_static", - "log", - "pathdiff", - "quote 1.0.27", - "regex", - "serde 1.0.163", - "serde_yaml", - "strum_macros 0.24.3", - "syn 1.0.109", - "tempfile", - "thiserror", - "toml 0.5.11", - "topological-sort", + "lazy_static", + "libc", + "log", + "parking_lot", + "threadpool", + "uuid", + "wasm-bindgen", + "web-sys", ] [[package]] name = "flutter_rust_bridge_macros" -version = "1.75.3" +version = "1.82.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de66560e226cb4a5da7ab042a0872c0be4e165288f5bcde809a08f3f5ca22962" +checksum = "a7fe743d921bedf4578b9472346d03a9643a01cd565ca7df7961baebad534ba5" [[package]] name = "fnv" @@ -2169,7 +2212,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] @@ -2178,11 +2242,17 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -2212,11 +2282,26 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" +[[package]] +name = "fuser" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21370f84640642c8ea36dfb2a6bfc4c55941f476fcf431f6fef25a5ddcf0169b" +dependencies = [ + "libc", + "log", + "memchr", + "page_size", + "pkg-config", + "smallvec", + "zerocopy 0.6.6", +] + [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -2229,9 +2314,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -2239,15 +2324,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -2256,9 +2341,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -2266,7 +2351,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -2275,34 +2360,47 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -2318,87 +2416,86 @@ dependencies = [ [[package]] name = "gdk" -version = "0.16.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9cb33da481c6c040404a11f8212d193889e9b435db2c14fd86987f630d3ce1" +checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646" dependencies = [ - "bitflags", "cairo-rs", "gdk-pixbuf", "gdk-sys", "gio", - "glib 0.16.7", + "glib 0.18.5", "libc", "pango", ] [[package]] name = "gdk-pixbuf" -version = "0.16.7" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" dependencies = [ - "bitflags", "gdk-pixbuf-sys", "gio", - "glib 0.16.7", + "glib 0.18.5", "libc", + "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] name = "gdk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" +checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gio-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "pango-sys", "pkg-config", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] name = "gdkwayland-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4511710212ed3020b61a8622a37aa6f0dd2a84516575da92e9b96928dcbe83ba" +checksum = "a90fbf5c033c65d93792192a49a8efb5bb1e640c419682a58bb96f5ae77f3d4a" dependencies = [ "gdk-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "pkg-config", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] name = "gdkx11-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa2bf8b5b8c414bc5d05e48b271896d0fd3ddb57464a3108438082da61de6af" +checksum = "fee8f00f4ee46cad2939b8990f5c70c94ff882c3028f3cc5abf950fa4ab53043" dependencies = [ "gdk-sys", - "glib-sys 0.16.3", + "glib-sys 0.18.1", "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", "x11 2.21.0", ] @@ -2414,32 +2511,40 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" dependencies = [ "libc", "winapi 0.3.9", ] +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", - "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -2447,23 +2552,22 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" -version = "0.16.7" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" dependencies = [ - "bitflags", "futures-channel", "futures-core", "futures-io", "futures-util", "gio-sys", - "glib 0.16.7", + "glib 0.18.5", "libc", "once_cell", "pin-project-lite", @@ -2473,14 +2577,14 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.16.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", "winapi 0.3.9", ] @@ -2490,7 +2594,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -2503,7 +2607,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", @@ -2518,21 +2622,22 @@ dependencies = [ [[package]] name = "glib" -version = "0.16.7" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd4df61a866ed7259d6189b8bcb1464989a77f1d85d25d002279bbe9dd38b2f" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", "futures-task", "futures-util", "gio-sys", - "glib-macros 0.16.8", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-macros 0.18.5", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", + "memchr", "once_cell", "smallvec", "thiserror", @@ -2549,24 +2654,23 @@ dependencies = [ "itertools 0.9.0", "proc-macro-crate 0.1.5", "proc-macro-error", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] [[package]] name = "glib-macros" -version = "0.16.8" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" dependencies = [ - "anyhow", "heck 0.4.1", - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.2", "proc-macro-error", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] @@ -2581,12 +2685,12 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.16.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] @@ -2608,13 +2712,13 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ - "glib-sys 0.16.3", + "glib-sys 0.18.1", "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] @@ -2623,7 +2727,7 @@ version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ff5d0f7ff308ae37e6eb47b6ded17785bdea06e438a708cd09e0288c1862f33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "futures-channel", "futures-core", @@ -2634,7 +2738,7 @@ dependencies = [ "gstreamer-sys", "libc", "muldiv", - "num-rational 0.3.2", + "num-rational", "once_cell", "paste", "pretty-hex", @@ -2647,7 +2751,7 @@ version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc80888271338c3ede875d8cafc452eb207476ff5539dcbe0018a8f5b827af0e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-core", "futures-sink", "glib 0.10.3", @@ -2680,7 +2784,7 @@ version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bafd01c56f59cb10f4b5a10f97bb4bdf8c2b2784ae5b04da7e2d400cf6e6afcf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib 0.10.3", "glib-sys 0.10.1", "gobject-sys 0.10.0", @@ -2721,7 +2825,7 @@ version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7bbb1485d87469849ec45c08e03c2f280d3ea20ff3c439d03185be54e3ce98e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-util", "glib 0.10.3", @@ -2752,64 +2856,61 @@ dependencies = [ [[package]] name = "gtk" -version = "0.16.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d3507d43908c866c805f74c9dd593c0ce7ba5c38e576e41846639cdcd4bee6" +checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c" dependencies = [ "atk", - "bitflags", "cairo-rs", "field-offset", "futures-channel", "gdk", "gdk-pixbuf", "gio", - "glib 0.16.7", + "glib 0.18.5", "gtk-sys", "gtk3-macros", "libc", - "once_cell", "pango", "pkg-config", ] [[package]] name = "gtk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3" +checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" dependencies = [ "atk-sys", "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", "gio-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "pango-sys", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] name = "gtk3-macros" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "096eb63c6fedf03bafe65e5924595785eaf1bcb7200dac0f2cbe9c9738f05ad8" +checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e" dependencies = [ - "anyhow", "proc-macro-crate 1.3.1", "proc-macro-error", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "h2" -version = "0.3.18" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2826,10 +2927,11 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ + "cfg-if 1.0.0", "crunchy", ] @@ -2839,7 +2941,17 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.8", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash 0.8.11", + "allocator-api2", ] [[package]] @@ -2848,17 +2960,19 @@ version = "0.1.0" dependencies = [ "anyhow", "backtrace", + "base64 0.22.1", "bytes", "chrono", "confy", "directories-next", "dirs-next", "dlopen", - "env_logger 0.10.0", + "env_logger 0.10.2", "filetime", "flexi_logger", "futures", "futures-util", + "httparse", "lazy_static", "libc", "log", @@ -2867,22 +2981,27 @@ dependencies = [ "osascript", "protobuf", "protobuf-codegen", - "quinn", "rand 0.8.5", "regex", - "serde 1.0.163", + "rustls-pki-types", + "rustls-platform-verifier", + "serde 1.0.209", "serde_derive", - "serde_json 1.0.96", + "serde_json 1.0.127", "socket2 0.3.19", "sodiumoxide", "sysinfo", + "thiserror", "tokio", - "tokio-socks", + "tokio-native-tls", + "tokio-rustls 0.26.0", + "tokio-socks 0.5.2-1", "tokio-util", - "toml 0.7.3", + "toml 0.7.8", + "url", "uuid", "winapi 0.3.9", - "zstd 0.12.3+zstd.1.5.2", + "zstd 0.13.2", ] [[package]] @@ -2900,6 +3019,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2911,18 +3036,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -2939,28 +3061,46 @@ dependencies = [ "digest", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "hound" -version = "3.5.0" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f" + +[[package]] +name = "html-escape" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.6", + "itoa 1.0.11", ] [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -2969,15 +3109,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -2987,22 +3127,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" -version = "0.1.1" -source = "git+https://github.com/21pages/hwcodec?branch=stable#82cdc15457e42feaf14e1b38622506b2d54baf76" +version = "0.7.0" +source = "git+https://github.com/rustdesk-org/hwcodec#6abd1898f3a03481ed0c038507b5218d6ea94267" dependencies = [ "bindgen 0.59.2", "cc", "log", - "serde 1.0.163", + "serde 1.0.209", "serde_derive", - "serde_json 1.0.96", + "serde_json 1.0.127", ] [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -3013,9 +3153,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.6", + "itoa 1.0.11", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -3024,46 +3164,59 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", - "rustls 0.21.2", + "rustls 0.21.12", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", ] [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.4", + "core-foundation-sys 0.8.7", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core 0.52.0", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] name = "idna" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -3071,9 +3224,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", @@ -3081,57 +3234,69 @@ dependencies = [ "exr", "gif", "jpeg-decoder", - "num-rational 0.4.1", - "num-traits 0.2.15", + "num-traits 0.2.19", "png", "qoi", "tiff", ] +[[package]] +name = "image" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "num-traits 0.2.19", + "png", + "tiff", +] + [[package]] name = "impersonate_system" version = "0.1.0" -source = "git+https://github.com/21pages/impersonate-system#84b401893d5b6628c8b33b295328d13fbbe2674b" +source = "git+https://github.com/rustdesk-org/impersonate-system#2f429010a5a10b1fe5eceb553c6672fd53d20167" dependencies = [ "cc", ] [[package]] name = "include_dir" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" dependencies = [ "include_dir_macros", ] [[package]] name = "include_dir_macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", ] [[package]] name = "indexmap" -version = "1.9.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ - "autocfg 1.1.0", - "hashbrown", + "equivalent", + "hashbrown 0.14.5", ] [[package]] name = "inotify" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf888f9575c290197b2c948dc9e9ff10bd1a39ad1ea8585f734585fa6b9d3f9" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -3145,42 +3310,50 @@ dependencies = [ "libc", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -3189,6 +3362,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.9.0" @@ -3200,9 +3379,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.5" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -3215,9 +3394,9 @@ checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -3233,20 +3412,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "jni" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - [[package]] name = "jni" version = "0.21.1" @@ -3271,27 +3436,27 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" dependencies = [ "rayon", ] [[package]] name = "js-sys" -version = "0.3.62" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -3299,12 +3464,11 @@ dependencies = [ [[package]] name = "keepawake" version = "0.4.3" -source = "git+https://github.com/rustdesk-org/keepawake-rs#ac395ef826b32a077bc5d2fe108cf71fde8fe2e6" +source = "git+https://github.com/rustdesk-org/keepawake-rs#64d568586dd16551d02120e19668d2b0fec8e3c9" dependencies = [ "anyhow", - "apple-sys", "cfg-if 1.0.0", - "core-foundation", + "core-foundation 0.9.4", "shadow-rs", "windows 0.48.0", "winres", @@ -3323,20 +3487,20 @@ dependencies = [ [[package]] name = "keyboard-types" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags", - "serde 1.0.163", + "bitflags 2.6.0", + "serde 1.0.209", "unicode-segmentation", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -3352,11 +3516,11 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libappindicator" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e1edfdc9b0853358306c6dfb4b77c79c779174256fe93d80c0b5ebca451a2f" +checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" dependencies = [ - "glib 0.16.7", + "glib 0.18.5", "gtk", "gtk-sys", "libappindicator-sys", @@ -3365,9 +3529,9 @@ dependencies = [ [[package]] name = "libappindicator-sys" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08fcb2bea89cee9613982501ec83eaa2d09256b24540ae463c52a28906163918" +checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" dependencies = [ "gtk-sys", "libloading 0.7.4", @@ -3376,9 +3540,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.144" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libdbus-sys" @@ -3413,39 +3577,39 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.0" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if 1.0.0", - "windows-sys 0.48.0", + "windows-targets 0.52.6", ] [[package]] name = "libm" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libpulse-binding" -version = "2.27.1" +version = "2.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1745b20bfc194ac12ef828f144f0ec2d4a7fe993281fa3567a0bd4969aee6890" +checksum = "ed3557a2dfc380c8f061189a01c6ae7348354e0c9886038dc6c171219c08eaff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libpulse-sys", - "num-derive", - "num-traits 0.2.15", + "num-derive 0.3.3", + "num-traits 0.2.19", "winapi 0.3.9", ] [[package]] name = "libpulse-simple-binding" -version = "2.27.1" +version = "2.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ced94199e6e44133431374e4043f34e1f0697ebfb7b7d6c244a65bfaedf0e31" +checksum = "05fd6b68f33f6a251265e6ed1212dc3107caad7c5c6fdcd847b2e65ef58c308d" dependencies = [ "libpulse-binding", "libpulse-simple-sys", @@ -3454,9 +3618,9 @@ dependencies = [ [[package]] name = "libpulse-simple-sys" -version = "1.20.1" +version = "1.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e423d9c619c908ce9b4916080e65ab586ca55b8c4939379f15e6e72fb43842" +checksum = "ea6613b4199d8b9f0edcfb623e020cb17bbd0bee8dd21f3c7cc938de561c4152" dependencies = [ "libpulse-sys", "pkg-config", @@ -3464,17 +3628,28 @@ dependencies = [ [[package]] name = "libpulse-sys" -version = "1.20.1" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2191e6880818d1df4cf72eac8e91dce7a5a52ba0da4b2a5cdafabc22b937eadb" +checksum = "bc19e110fbf42c17260d30f6d3dc545f58491c7830d38ecb9aaca96e26067a9b" dependencies = [ "libc", - "num-derive", - "num-traits 0.2.15", + "num-derive 0.3.3", + "num-traits 0.2.19", "pkg-config", "winapi 0.3.9", ] +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.5.3", +] + [[package]] name = "libsamplerate-sys" version = "0.1.12" @@ -3517,9 +3692,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -3528,69 +3703,48 @@ dependencies = [ ] [[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.3.7" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "scopeguard", ] [[package]] name = "log" -version = "0.4.17" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "mac_address" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b238e3235c8382b7653c6408ed1b08dd379bdb9fdf990fb0bbae3db2cc0ae963" +checksum = "8836fae9d0d4be2c8b4efcdd79e828a2faa058a90d005abf42f91cac5493a08e" dependencies = [ - "nix 0.23.2", + "nix 0.28.0", "winapi 0.3.9", ] [[package]] name = "mach2" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -3598,7 +3752,7 @@ dependencies = [ [[package]] name = "machine-uid" version = "0.3.0" -source = "git+https://github.com/21pages/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542" +source = "git+https://github.com/rustdesk-org/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542" dependencies = [ "bindgen 0.59.2", "cc", @@ -3608,7 +3762,7 @@ dependencies = [ [[package]] name = "magnum-opus" version = "0.4.0" -source = "git+https://github.com/rustdesk/magnum-opus#5cd2bf989c148662fa3a2d9d539a71d71fd1d256" +source = "git+https://github.com/rustdesk-org/magnum-opus#5cd2bf989c148662fa3a2d9d539a71d71fd1d256" dependencies = [ "bindgen 0.59.2", "pkg-config", @@ -3638,9 +3792,9 @@ checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -3648,7 +3802,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -3657,16 +3811,16 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -3683,62 +3837,56 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", + "simd-adler32", ] [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", - "simd-adler32", + "adler2", ] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] -name = "miow" -version = "0.5.0" +name = "mio" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "mouce" -version = "0.2.1" -source = "git+https://github.com/rustdesk-org/mouce.git#ed83800d532b95d70e39915314f6052aa433e9b9" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ - "glob", + "hermit-abi 0.3.9", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", ] [[package]] name = "muda" -version = "0.5.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c820db003e601413e835a33b10cf51452b6415ef34ff1d862401826431c675" +checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1" dependencies = [ - "cocoa", + "cocoa 0.26.0", "crossbeam-channel", - "gdk", - "gdk-pixbuf", + "dpi", "gtk", "keyboard-types", "libxdo", @@ -3746,7 +3894,7 @@ dependencies = [ "once_cell", "png", "thiserror", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -3756,12 +3904,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" [[package]] -name = "nanorand" -version = "0.7.0" +name = "native-tls" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "getrandom", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "native-windows-gui" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7003a669f68deb6b7c57d74fff4f8e533c44a3f0b297492440ef4ff5a28454" +dependencies = [ + "bitflags 1.3.2", + "lazy_static", + "winapi 0.3.9", + "winapi-build", ] [[package]] @@ -3770,11 +3938,25 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "jni-sys", + "ndk-sys 0.4.1+23.1.7779620", + "num_enum 0.5.11", + "raw-window-handle 0.5.2", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.6.0", "jni-sys", - "ndk-sys", - "num_enum", - "raw-window-handle", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.3", "thiserror", ] @@ -3793,6 +3975,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + [[package]] name = "netlink-packet-core" version = "0.5.0" @@ -3812,7 +4003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea993e32c77d87f01236c38f572ecb6c311d592e56a06262a007fd2a6e31253c" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "netlink-packet-core", @@ -3833,9 +4024,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" dependencies = [ "bytes", "libc", @@ -3848,7 +4039,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 1.0.0", "libc", @@ -3857,46 +4048,49 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", + "memoffset 0.7.1", ] [[package]] name = "nix" -version = "0.26.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags", + "bitflags 2.6.0", "cfg-if 1.0.0", + "cfg_aliases 0.1.1", "libc", - "memoffset 0.7.1", - "static_assertions", + "memoffset 0.9.1", ] [[package]] -name = "nom" -version = "7.1.3" +name = "nix" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "memchr", - "minimal-lexical", + "bitflags 2.6.0", + "cfg-if 1.0.0", + "cfg_aliases 0.2.1", + "libc", ] [[package]] -name = "nom8" -version = "0.2.0" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", + "minimal-lexical", ] [[package]] @@ -3910,75 +4104,78 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" dependencies = [ - "overload", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg 1.1.0", "num-integer", - "num-traits 0.2.15", + "num-traits 0.2.19", ] [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ - "num-traits 0.2.15", + "num-traits 0.2.19", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-derive" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ - "autocfg 1.1.0", - "num-traits 0.2.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] -name = "num-rational" -version = "0.3.2" +name = "num-integer" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits 0.2.15", + "num-traits 0.2.19", ] [[package]] name = "num-rational" -version = "0.4.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "num-integer", - "num-traits 0.2.15", + "num-traits 0.2.19", ] [[package]] @@ -3987,25 +4184,25 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.15", + "num-traits 0.2.19", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.9", "libc", ] @@ -4015,7 +4212,16 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive 0.7.3", ] [[package]] @@ -4025,16 +4231,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate 2.0.2", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] + [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] @@ -4060,6 +4278,131 @@ dependencies = [ "objc_id", ] +[[package]] +name = "objc-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.3.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a49f420f16c8814efdcd6b4258664de9d9920cbc26b6f95d034a1ca9850ccc2c" +dependencies = [ + "block2 0.2.0-alpha.6", + "objc-sys 0.2.0-beta.2", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys 0.3.5", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys 0.2.0-beta.2", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -4080,47 +4423,67 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] [[package]] name = "oboe" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ - "jni 0.20.0", - "ndk", + "jni 0.21.1", + "ndk 0.8.0", "ndk-context", - "num-derive", - "num-traits 0.2.15", + "num-derive 0.4.2", + "num-traits 0.2.19", "oboe-sys", ] [[package]] name = "oboe-sys" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" dependencies = [ "cc", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "opaque-debug" -version = "0.3.0" +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if 1.0.0", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] [[package]] name = "openssl-probe" @@ -4128,6 +4491,18 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "option-ext" version = "0.2.0" @@ -4141,7 +4516,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" dependencies = [ "dlv-list", - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -4167,10 +4542,25 @@ dependencies = [ ] [[package]] -name = "os_str_bytes" -version = "6.5.0" +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde 1.0.209", + "windows-sys 0.52.0", +] + +[[package]] +name = "os_pipe" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] [[package]] name = "osascript" @@ -4178,21 +4568,25 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", "serde_derive", - "serde_json 1.0.96", + "serde_json 1.0.127", ] [[package]] -name = "overload" -version = "0.1.1" +name = "page_size" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" +dependencies = [ + "libc", + "winapi 0.3.9", +] [[package]] name = "pam" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/pam#10da2cbbabe32cbc9de22a66abe44738e7ec0ea0" +source = "git+https://github.com/rustdesk-org/pam#7bfd25510202cd269292cbdd7c71f3977a6fd762" dependencies = [ "libc", "pam-macros", @@ -4206,16 +4600,15 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c94f3b9b97df3c6d4e51a14916639b24e02c7d15d1dba686ce9b1118277cb811" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] [[package]] name = "pam-sys" version = "1.0.0-alpha4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9dfd42858f6a6bb1081079fd9dc259ca3e2aaece6cb689fd36b1058046c969" +source = "git+https://github.com/rustdesk-org/pam-sys?branch=fix/v1.0.0-alpha4_gnuc_va_list#3337c9bb9a9c68d7497ec8c93cad2368c26091b7" dependencies = [ "bindgen 0.59.2", "libc", @@ -4223,13 +4616,12 @@ dependencies = [ [[package]] name = "pango" -version = "0.16.5" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" dependencies = [ - "bitflags", "gio", - "glib 0.16.7", + "glib 0.18.5", "libc", "once_cell", "pango-sys", @@ -4237,25 +4629,24 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] name = "parity-tokio-ipc" -version = "0.7.3-2" -source = "git+https://github.com/open-trade/parity-tokio-ipc#a5b7861249107cbacc856cd43507cb95f40aef6e" +version = "0.7.3-4" +source = "git+https://github.com/rustdesk-org/parity-tokio-ipc#3623ec9ebef50c9b118e03b03df831008a4d1441" dependencies = [ "futures", "libc", "log", - "miow", "rand 0.8.5", "tokio", "winapi 0.3.9", @@ -4263,15 +4654,15 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -4279,15 +4670,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.5.3", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.52.6", ] [[package]] @@ -4303,15 +4694,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -4333,9 +4718,19 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap", +] [[package]] name = "phf" @@ -4377,29 +4772,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4407,60 +4802,94 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand 2.1.1", + "futures-io", +] + [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.4.3" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64", + "base64 0.22.1", "indexmap", - "line-wrap", - "quick-xml 0.28.2", - "serde 1.0.163", - "time 0.3.21", + "quick-xml 0.32.0", + "serde 1.0.209", + "time 0.3.36", ] [[package]] name = "png" -version = "0.17.8" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.4", ] [[package]] name = "polling" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg 1.3.0", + "bitflags 1.3.2", + "cfg-if 1.0.0", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ - "autocfg 1.1.0", - "bitflags", "cfg-if 1.0.0", "concurrent-queue", - "libc", - "log", + "hermit-abi 0.4.0", "pin-project-lite", - "windows-sys 0.48.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.59.0", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy 0.7.35", +] [[package]] name = "pretty-hex" @@ -4470,19 +4899,19 @@ checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" [[package]] name = "prettyplease" -version = "0.2.4" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ - "proc-macro2 1.0.63", - "syn 2.0.15", + "proc-macro2 1.0.86", + "syn 2.0.76", ] [[package]] name = "primal-check" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0" +checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08" dependencies = [ "num-integer", ] @@ -4503,7 +4932,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit 0.19.8", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +dependencies = [ + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -4513,8 +4952,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", "version_check", ] @@ -4525,8 +4964,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "version_check", ] @@ -4541,18 +4980,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "protobuf" -version = "3.2.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55bad9126f378a853655831eb7363b7b01b81d19f8cb1218861086ca4a1a61e" +checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6" dependencies = [ "bytes", "once_cell", @@ -4562,9 +5001,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.2.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd418ac3c91caa4032d37cb80ff0d44e2ebe637b2fb243b6234bf89cdac4901" +checksum = "c4d0cde5642ea4df842b13eb9f59ea6fafa26dcb43e3e1ee49120e9757556189" dependencies = [ "anyhow", "once_cell", @@ -4577,9 +5016,9 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.2.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d39b14605eaa1f6a340aec7f320b34064feb26c93aec35d6a9a2272a8ddfa49" +checksum = "1b0e9b447d099ae2c4993c0cbb03c7a9d6c937b17f2d56cfc0b1550e6fcfdb76" dependencies = [ "anyhow", "indexmap", @@ -4593,9 +5032,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.2.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d4d7b8601c814cfb36bcebb79f0e61e45e1e93640cf778837833bbed05c372" +checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9" dependencies = [ "thiserror", ] @@ -4609,6 +5048,23 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "qrcode-generator" +version = "4.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d06cb9646c7a14096231a2474d7f21e5e8c13de090c68d13bde6157cfe7f159" +dependencies = [ + "html-escape", + "image 0.24.9", + "qrcodegen", +] + +[[package]] +name = "qrcodegen" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" + [[package]] name = "quest" version = "0.3.0" @@ -4624,70 +5080,29 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.23.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] [[package]] -name = "quinn" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls 0.20.8", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash", - "rustls 0.20.8", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-udp" -version = "0.3.2" +name = "quick-xml" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" dependencies = [ - "libc", - "quinn-proto", - "socket2 0.4.9", - "tracing", - "windows-sys 0.42.0", + "memchr", ] [[package]] @@ -4701,11 +5116,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.27" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ - "proc-macro2 1.0.63", + "proc-macro2 1.0.86", ] [[package]] @@ -4856,11 +5271,17 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + [[package]] name = "rayon" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -4868,25 +5289,23 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "rdev" version = "0.5.0-2" -source = "git+https://github.com/rustdesk-org/rdev#2e8221d653f4995c831ad52966e79a514516b1fa" +source = "git+https://github.com/rustdesk-org/rdev#b3434caee84c92412b45a2f655a15ac5dad33488" dependencies = [ - "cocoa", - "core-foundation", - "core-foundation-sys 0.8.4", - "core-graphics", + "cocoa 0.24.1", + "core-foundation 0.9.4", + "core-foundation-sys 0.8.7", + "core-graphics 0.22.3", "dispatch", "enum-map", "epoll", @@ -4894,7 +5313,7 @@ dependencies = [ "lazy_static", "libc", "log", - "mio", + "mio 0.8.11", "strum 0.24.1", "strum_macros 0.24.3", "widestring", @@ -4913,47 +5332,59 @@ dependencies = [ [[package]] name = "realfft" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6b8e8f0c6d2234aa58048d7290c60bf92cd36fd2888cd8331c66ad4f2e1d2" +checksum = "953d9f7e5cdd80963547b456251296efc2626ed4e3cbf36c869d9564e0220571" dependencies = [ "rustfft", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.8.1" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -4962,9 +5393,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "repng" @@ -4978,10 +5409,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.18" -source = "git+https://github.com/rustdesk-org/reqwest#4cc834539d9c44f7b6bbc5d2f8805842dc5aa328" +version = "0.11.23" +source = "git+https://github.com/rustdesk-org/reqwest#9cb758c9fb2f4edc62eb790acfd45a6a3da21ed3" dependencies = [ - "base64", + "async-compression", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -4991,42 +5423,50 @@ dependencies = [ "http-body", "hyper", "hyper-rustls", + "hyper-tls", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.2", - "rustls-pemfile", - "serde 1.0.163", - "serde_json 1.0.96", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "rustls-pemfile 1.0.4", + "serde 1.0.209", + "serde_json 1.0.127", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", - "tokio-rustls", + "tokio-native-tls", + "tokio-rustls 0.24.1", + "tokio-socks 0.5.2", + "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.25.4", "winreg 0.50.0", ] [[package]] name = "ring" -version = "0.16.20" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if 1.0.0", + "getrandom", "libc", - "once_cell", - "spin 0.5.2", + "spin", "untrusted", - "web-sys", - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] @@ -5051,23 +5491,23 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.2.0" +version = "7.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" dependencies = [ "libc", "rtoolbox", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] name = "rtoolbox" -version = "0.0.1" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" dependencies = [ "libc", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -5078,18 +5518,20 @@ checksum = "cd70209c27d5b08f5528bdc779ea3ffb418954e28987f9f9775c6eac41003f9c" dependencies = [ "num-complex", "num-integer", - "num-traits 0.2.15", + "num-traits 0.2.19", "realfft", ] [[package]] name = "runas" -version = "1.0.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed87390fefd18965ff20baae5aeb9913bcf82d2b59dc04c0f6d8f17f7be56ff2" +checksum = "b96d6b6c505282b007a9b009f2aa38b2fd0359b81a0430ceacc60f69ade4c6a0" dependencies = [ - "cc", + "libc", + "security-framework-sys", "which", + "windows-sys 0.48.0", ] [[package]] @@ -5112,9 +5554,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -5133,27 +5575,27 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.2.3" +version = "1.3.0" dependencies = [ + "android-wakelock", "android_logger", "arboard", "async-process", "async-trait", - "base64", "bytes", "cc", "cfg-if 1.0.0", "chrono", "cidr-utils", - "clap 4.2.7", + "clap 4.5.16", "clipboard", - "cocoa", - "core-foundation", - "core-graphics", + "clipboard-master", + "cocoa 0.24.1", + "core-foundation 0.9.4", + "core-graphics 0.22.3", "cpal", "crossbeam-queue", "ctrlc", - "dark-light", "dasp", "dbus", "dbus-crossroads", @@ -5163,44 +5605,45 @@ dependencies = [ "errno", "evdev", "flutter_rust_bridge", - "flutter_rust_bridge_codegen", "fon", "fruitbasket", "hbb_common", "hex", "hound", - "image", + "image 0.24.9", "impersonate_system", "include_dir", "jni 0.21.1", "keepawake", "lazy_static", - "libloading 0.8.0", + "libloading 0.8.5", "libpulse-binding", "libpulse-simple-binding", "mac_address", "magnum-opus", - "mouce", "num_cpus", "objc", "objc_id", + "once_cell", "os-version", "pam", "parity-tokio-ipc", + "percent-encoding", + "qrcode-generator", "rdev", "repng", "reqwest", "ringbuf", - "rpassword 7.2.0", + "rpassword 7.3.1", "rubato", "runas", "rust-pulsectl", "samplerate", "sciter-rs", "scrap", - "serde 1.0.163", + "serde 1.0.209", "serde_derive", - "serde_json 1.0.96", + "serde_json 1.0.127", "serde_repr", "sha2", "shared_memory", @@ -5209,40 +5652,45 @@ dependencies = [ "system_shutdown", "tao", "tauri-winrt-notification", + "totp-rs", "tray-icon", "url", "users 0.11.0", "uuid", "virtual_display", + "wallpaper", "whoami", "winapi 0.3.9", "windows-service", "winreg 0.11.0", "winres", "wol-rs", + "x11-clipboard 0.8.1", + "x11rb 0.12.0", "zip", ] [[package]] name = "rustdesk-portable-packer" -version = "0.1.0" +version = "1.3.0" dependencies = [ "brotli", "dirs 5.0.1", - "embed-resource", "md5", + "native-windows-gui", "winapi 0.3.9", + "winres", ] [[package]] name = "rustfft" -version = "6.1.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" +checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" dependencies = [ "num-complex", "num-integer", - "num-traits 0.2.15", + "num-traits 0.2.19", "primal-check", "strength_reduce", "transpose", @@ -5251,89 +5699,167 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys 0.48.0", ] +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ + "log", "ring", + "rustls-webpki 0.101.7", "sct", - "webpki", ] [[package]] name = "rustls" -version = "0.21.2" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "log", + "once_cell", "ring", - "rustls-webpki", - "sct", + "rustls-pki-types", + "rustls-webpki 0.102.6", + "subtle", + "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 2.1.3", + "rustls-pki-types", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" dependencies = [ - "base64", + "core-foundation 0.9.4", + "core-foundation-sys 0.8.7", + "jni 0.19.0", + "log", + "once_cell", + "rustls 0.23.12", + "rustls-native-certs 0.7.2", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.6", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.3", + "winapi 0.3.9", ] +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", ] [[package]] -name = "rustversion" -version = "1.0.12" +name = "rustls-webpki" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] [[package]] -name = "ryu" -version = "1.0.13" +name = "rustversion" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] -name = "safemem" -version = "0.3.3" +name = "ryu" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -5355,17 +5881,17 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.52.0", ] [[package]] name = "sciter-rs" version = "0.5.57" -source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#fab913b7c2e779b05c249b0c5de5a08759b2c15d" +source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#5322f3a755a0e6bf999fbc60d1efc35246c0f821" dependencies = [ "lazy_static", "libc", @@ -5373,11 +5899,17 @@ dependencies = [ "objc-foundation", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrap" @@ -5397,30 +5929,25 @@ dependencies = [ "jni 0.21.1", "lazy_static", "log", - "ndk", + "ndk 0.7.0", + "ndk-context", "num_cpus", "pkg-config", "quest", "repng", - "serde 1.0.163", - "serde_json 1.0.96", + "serde 1.0.209", + "serde_json 1.0.127", "target_build_utils", "tracing", "webm", "winapi 0.3.9", ] -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", @@ -5428,35 +5955,33 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys 0.8.4", + "bitflags 2.6.0", + "core-foundation 0.9.4", + "core-foundation-sys 0.8.7", "libc", + "num-bigint", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ - "core-foundation-sys 0.8.4", + "core-foundation-sys 0.8.7", "libc", ] [[package]] name = "semver" -version = "1.0.17" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -dependencies = [ - "serde 1.0.163", -] +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" @@ -5466,22 +5991,22 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] @@ -5498,33 +6023,34 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ - "itoa 1.0.6", + "itoa 1.0.11", + "memchr", "ryu", - "serde 1.0.163", + "serde 1.0.209", ] [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", ] [[package]] @@ -5534,28 +6060,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.6", - "ryu", - "serde 1.0.163", -] - -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap", + "itoa 1.0.11", "ryu", - "serde 1.0.163", - "yaml-rust", + "serde 1.0.209", ] [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -5564,9 +6078,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -5582,8 +6096,8 @@ dependencies = [ "const_format", "git2", "is_debug", - "time 0.3.21", - "tzdb", + "time 0.3.36", + "tzdb 0.5.10", ] [[package]] @@ -5601,9 +6115,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "shutdown_hooks" @@ -5611,21 +6125,11 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6057adedbec913419c92996f395ba69931acbd50b7d56955394cd3f7bedbfa45" -[[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -5638,9 +6142,9 @@ checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "siphasher" @@ -5650,18 +6154,18 @@ checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -5676,14 +6180,24 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "sodiumoxide" version = "0.2.7" @@ -5693,15 +6207,9 @@ dependencies = [ "ed25519", "libc", "libsodium-sys", - "serde 1.0.163", + "serde 1.0.209", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -5717,12 +6225,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - [[package]] name = "strength_reduce" version = "0.2.4" @@ -5737,9 +6239,15 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "strsim" -version = "0.10.0" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -5760,8 +6268,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] @@ -5772,17 +6280,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "rustversion", "syn 1.0.109", ] [[package]] name = "subtle" -version = "2.4.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -5801,55 +6309,59 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.15" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "sys-locale" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" dependencies = [ "libc", - "windows-sys 0.45.0", ] [[package]] name = "sysinfo" -version = "0.29.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cb97a5a85a136d84e75d5c3cf89655090602efb1be0d8d5337b7e386af2908" +version = "0.29.10" +source = "git+https://github.com/rustdesk-org/sysinfo?branch=rlim_max#90b1705d909a4902dbbbdea37ee64db17841077d" dependencies = [ "cfg-if 1.0.0", - "core-foundation-sys 0.8.4", + "core-foundation-sys 0.8.7", "libc", "ntapi", "once_cell", "rayon", - "winapi 0.3.9", + "windows 0.51.1", ] [[package]] name = "system-configuration" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags", - "core-foundation", + "bitflags 1.3.2", + "core-foundation 0.9.4", "system-configuration-sys", ] @@ -5859,7 +6371,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ - "core-foundation-sys 0.8.4", + "core-foundation-sys 0.8.7", "libc", ] @@ -5880,15 +6392,15 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck 0.4.1", + "heck 0.5.0", "pkg-config", - "toml 0.7.3", - "version-compare 0.1.1", + "toml 0.8.2", + "version-compare 0.2.0", ] [[package]] @@ -5903,47 +6415,40 @@ dependencies = [ [[package]] name = "tao" -version = "0.22.2" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#1e5b97258cf42a30f80f85a6aa0b1a4aece1977e" +version = "0.25.0" +source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" dependencies = [ - "bitflags", - "cairo-rs", + "bitflags 1.3.2", "cc", - "cocoa", - "core-foundation", - "core-graphics", + "cocoa 0.25.0", + "core-foundation 0.9.4", + "core-graphics 0.23.2", "crossbeam-channel", "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", "gdkwayland-sys", "gdkx11-sys", - "gio", - "glib 0.16.7", - "glib-sys 0.16.3", "gtk", - "image", + "image 0.24.9", "instant", "jni 0.21.1", "lazy_static", "libc", "log", - "ndk", + "ndk 0.7.0", "ndk-context", - "ndk-sys", + "ndk-sys 0.4.1+23.1.7779620", "objc", "once_cell", "parking_lot", "png", - "raw-window-handle", + "raw-window-handle 0.6.2", "scopeguard", "tao-macros", "unicode-segmentation", "url", - "uuid", - "windows 0.48.0", + "windows 0.52.0", "windows-implement", + "windows-version", "x11-dl", "zbus", ] @@ -5951,10 +6456,10 @@ dependencies = [ [[package]] name = "tao-macros" version = "0.1.2" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#1e5b97258cf42a30f80f85a6aa0b1a4aece1977e" +source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] @@ -5966,9 +6471,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "target_build_utils" @@ -5983,32 +6488,32 @@ dependencies = [ [[package]] name = "tauri-winrt-notification" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f" +checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" dependencies = [ - "quick-xml 0.23.1", - "windows 0.39.0", + "quick-xml 0.30.0", + "windows 0.51.1", ] [[package]] name = "tempfile" -version = "3.5.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "fastrand 2.1.1", + "once_cell", + "rustix 0.38.34", + "windows-sys 0.59.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -6031,19 +6536,13 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "tfc" -version = "0.6.1" -source = "git+https://github.com/rustdesk-org/The-Fat-Controller#9dd86151525fd010dc93f6bc9b6aedd1a75cc342" +version = "0.7.0" +source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#87a6450f17659edba0cad669d9b57e8775479917" dependencies = [ "anyhow", - "core-graphics", + "core-graphics 0.23.2", "unicode-segmentation", "winapi 0.3.9", "x11 2.19.0", @@ -6051,22 +6550,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] @@ -6080,9 +6579,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -6102,38 +6601,42 @@ dependencies = [ [[package]] name = "time" -version = "0.3.21" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ - "itoa 1.0.6", + "deranged", + "itoa 1.0.11", "libc", + "num-conv", "num_threads", - "serde 1.0.163", + "powerfmt", + "serde 1.0.209", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -6146,32 +6649,41 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ - "autocfg 1.1.0", + "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.7", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "native-tls", + "tokio", ] [[package]] @@ -6180,14 +6692,25 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.2", + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.12", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-socks" -version = "0.5.1-2" -source = "git+https://github.com/open-trade/tokio-socks#14a5c2564fa20a2765ea53d03c573ee2b7e20421" +version = "0.5.2-1" +source = "git+https://github.com/rustdesk-org/tokio-socks#94e97c6d7c93b0bcbfa54f2dc397c1da0a6e43d3" dependencies = [ "bytes", "either", @@ -6200,22 +6723,33 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", "futures-util", - "hashbrown", + "hashbrown 0.14.5", "pin-project-lite", "slab", "tokio", - "tracing", ] [[package]] @@ -6224,96 +6758,96 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", ] [[package]] name = "toml" -version = "0.6.0" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", "serde_spanned", - "toml_datetime 0.5.1", - "toml_edit 0.18.1", + "toml_datetime", + "toml_edit 0.19.15", ] [[package]] name = "toml" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", "serde_spanned", - "toml_datetime 0.6.1", - "toml_edit 0.19.8", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] name = "toml_datetime" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", ] [[package]] name = "toml_edit" -version = "0.18.1" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", - "nom8", - "serde 1.0.163", + "serde 1.0.209", "serde_spanned", - "toml_datetime 0.5.1", + "toml_datetime", + "winnow", ] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap", - "serde 1.0.163", + "serde 1.0.209", "serde_spanned", - "toml_datetime 0.6.1", + "toml_datetime", "winnow", ] [[package]] -name = "topological-sort" -version = "0.2.2" +name = "totp-rs" +version = "5.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" +checksum = "17b2f27dad992486c26b4e7455f38aa487e838d6d61b57e72906ee2b8c287a90" +dependencies = [ + "base32", + "constant_time_eq 0.2.6", + "hmac", + "rand 0.8.5", + "sha1", + "sha2", + "url", + "urlencoding", +] [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -6321,29 +6855,29 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "transpose" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" +checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" dependencies = [ "num-integer", "strength_reduce", @@ -6351,33 +6885,48 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.5.1" -source = "git+https://github.com/rustdesk-org/tray-icon#ef98e7b98abed2e3da614277eced12a85bfb717c" +version = "0.15.1" +source = "git+https://github.com/tauri-apps/tray-icon#759f6a74fdcbcd979d3d39a2c9c2bc6a54e5e739" dependencies = [ - "cocoa", - "core-graphics", + "core-graphics 0.24.0", "crossbeam-channel", - "dirs-next", + "dirs 5.0.1", "libappindicator", "muda", - "objc", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", "once_cell", "png", "thiserror", - "windows-sys 0.48.0", + "windows-sys 0.59.0", +] + +[[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 = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "tz-rs" @@ -6390,20 +6939,42 @@ dependencies = [ [[package]] name = "tzdb" -version = "0.5.7" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a18ee5bde3433d683d41859650804a5ad89cad17f153a53f1e6a96e0da2d969" +dependencies = [ + "iana-time-zone", + "tz-rs", + "tzdb 0.6.1", +] + +[[package]] +name = "tzdb" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec758958f2fb5069cd7fae385be95cc8eceb8cdfd270c7d14de6034f0108d99e" +checksum = "1b580f6b365fa89f5767cdb619a55d534d04a4e14c2d7e5b9a31e94598687fb1" dependencies = [ "iana-time-zone", "tz-rs", + "tzdb_data", +] + +[[package]] +name = "tzdb_data" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1889fdffac09d65c1d95c42d5202e9b21ad8c758f426e9fe09088817ea998d6" +dependencies = [ + "tz-rs", ] [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.1", "tempfile", "winapi 0.3.9", ] @@ -6419,36 +6990,36 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -6458,28 +7029,34 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.3.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde 1.0.163", + "serde 1.0.209", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "users" version = "0.10.0" @@ -6500,17 +7077,32 @@ dependencies = [ "log", ] +[[package]] +name = "utf16string" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b62a1e85e12d5d712bf47a85f426b73d303e2d00a90de5f3004df3596e9d216" +dependencies = [ + "byteorder", +] + +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.3.2" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", ] @@ -6535,15 +7127,15 @@ checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "virtual_display" @@ -6553,49 +7145,41 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", ] +[[package]] +name = "wallpaper" +version = "3.2.0" +source = "git+https://github.com/rustdesk-org/wallpaper.rs#ce4a0cd3f58327c7cc44d15a63706fb0c022bacf" +dependencies = [ + "dirs 5.0.1", + "enquote", + "rust-ini", + "thiserror", + "winapi 0.3.9", + "winreg 0.11.0", +] + [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -6611,77 +7195,157 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" -version = "0.2.85" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if 1.0.0", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.85" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote 1.0.37", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "wayland-backend" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.34", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", - "wasm-bindgen-shared", + "bitflags 2.6.0", + "rustix 0.38.34", + "wayland-backend", + "wayland-scanner", ] [[package]] -name = "wasm-bindgen-futures" -version = "0.4.35" +name = "wayland-protocols" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" +checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", ] [[package]] -name = "wasm-bindgen-macro" -version = "0.2.85" +name = "wayland-protocols-wlr" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" +checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" dependencies = [ - "quote 1.0.27", - "wasm-bindgen-macro-support", + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", ] [[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.85" +name = "wayland-scanner" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", - "wasm-bindgen-backend", - "wasm-bindgen-shared", + "proc-macro2 1.0.86", + "quick-xml 0.34.0", + "quote 1.0.37", ] [[package]] -name = "wasm-bindgen-shared" -version = "0.2.85" +name = "wayland-sys" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +dependencies = [ + "dlib", + "log", + "pkg-config", +] [[package]] name = "web-sys" -version = "0.3.62" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -6689,73 +7353,69 @@ dependencies = [ [[package]] name = "webm" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb047148a12ef1fd8ab26302bca7e82036f005c3073b48e17cc1b44ec577136" +version = "1.1.0" +source = "git+https://github.com/rustdesk-org/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64" dependencies = [ "webm-sys", ] [[package]] name = "webm-sys" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ded6ec82ccf51fe265b0b2b1579cac839574ed910c17baac58e807f8a9de7f3" +version = "1.0.4" +source = "git+https://github.com/rustdesk-org/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64" dependencies = [ "cc", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.23.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ - "rustls-webpki", + "rustls-pki-types", ] [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.34", ] [[package]] name = "whoami" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.4.1", + "wasite", "web-sys", ] [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "win-sys" @@ -6796,18 +7456,18 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi 0.3.9", + "windows-sys 0.59.0", ] [[package]] name = "winapi-wsapoll" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" dependencies = [ "winapi 0.3.9", ] @@ -6846,66 +7506,111 @@ dependencies = [ [[package]] name = "windows" -version = "0.39.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" dependencies = [ - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", + "windows-targets 0.42.2", ] [[package]] name = "windows" -version = "0.44.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.48.5", ] [[package]] name = "windows" -version = "0.46.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-targets 0.42.2", + "windows-core 0.51.1", + "windows-targets 0.48.5", ] [[package]] name = "windows" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ + "windows-core 0.52.0", "windows-implement", "windows-interface", - "windows-targets 0.48.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] name = "windows-implement" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "windows-interface" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -6914,42 +7619,45 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "widestring", "windows-sys 0.45.0", ] [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.42.2", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.48.5", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -6969,17 +7677,51 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-win" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "58e23e33622b3b52f948049acbec9bcc34bf6e26d74176b88941f213c75cf2dc" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "error-code", ] [[package]] @@ -6990,9 +7732,15 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -7008,21 +7756,21 @@ checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_aarch64_msvc" -version = "0.39.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -7038,21 +7786,27 @@ checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_gnu" -version = "0.39.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -7068,21 +7822,21 @@ checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_i686_msvc" -version = "0.39.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -7098,21 +7852,21 @@ checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_gnu" -version = "0.39.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -7122,9 +7876,15 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -7140,40 +7900,31 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "windows_x86_64_msvc" -version = "0.39.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "winreg" version = "0.11.0" @@ -7203,11 +7954,30 @@ dependencies = [ "toml 0.5.11", ] +[[package]] +name = "wl-clipboard-rs" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4de22eebb1d1e2bad2d970086e96da0e12cde0b411321e5b0f7b2a1f876aa26f" +dependencies = [ + "libc", + "log", + "os_pipe", + "rustix 0.38.34", + "tempfile", + "thiserror", + "tree_magic_mini", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", +] + [[package]] name = "wol-rs" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dc5e486e34a31515518d370cdd8bf59ec696323fe8f92b858e43942e84a765" +checksum = "3c5a8a033ef9b208ec8b5946761958ed2b2693ac49b04f647fdc013000870b8f" [[package]] name = "wyz" @@ -7237,6 +8007,24 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "x11-clipboard" +version = "0.8.1" +source = "git+https://github.com/clslaid/x11-clipboard?branch=feat/store-batch#5fc2e73bc01ada3681159b34cf3ea8f0d14cd904" +dependencies = [ + "x11rb 0.12.0", +] + +[[package]] +name = "x11-clipboard" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98785a09322d7446e28a13203d2cae1059a0dd3dfb32cb06d0a225f023d8286" +dependencies = [ + "libc", + "x11rb 0.13.1", +] + [[package]] name = "x11-dl" version = "2.21.0" @@ -7250,72 +8038,82 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" +checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" dependencies = [ - "gethostname", - "nix 0.24.3", + "gethostname 0.3.0", + "nix 0.26.4", "winapi 0.3.9", "winapi-wsapoll", - "x11rb-protocol", + "x11rb-protocol 0.12.0", ] [[package]] -name = "x11rb-protocol" -version = "0.10.0" +name = "x11rb" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ - "nix 0.24.3", + "gethostname 0.4.3", + "rustix 0.38.34", + "x11rb-protocol 0.13.1", ] [[package]] -name = "xdg-home" -version = "1.0.0" +name = "x11rb-protocol" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" dependencies = [ - "nix 0.26.2", - "winapi 0.3.9", + "nix 0.26.4", ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xdg-home" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ - "linked-hash-map", + "libc", + "windows-sys 0.59.0", ] [[package]] name = "zbus" -version = "3.12.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", "async-recursion", "async-task", "async-trait", + "blocking", "byteorder", "derivative", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.2", + "nix 0.26.4", "once_cell", "ordered-stream", "rand 0.8.5", - "serde 1.0.163", + "serde 1.0.209", "serde_repr", "sha1", "static_assertions", @@ -7330,13 +8128,13 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.12.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "regex", "syn 1.0.109", "zvariant_utils", @@ -7344,32 +8142,80 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", "static_assertions", "zvariant", ] +[[package]] +name = "zerocopy" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" +dependencies = [ + "byteorder", + "zerocopy-derive 0.6.6", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy-derive" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + [[package]] name = "zip" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "aes", "byteorder", "bzip2", - "constant_time_eq", + "constant_time_eq 0.1.5", "crc32fast", "crossbeam-utils", "flate2", "hmac", "pbkdf2", "sha1", - "time 0.3.21", + "time 0.3.36", "zstd 0.11.2+zstd.1.5.2", ] @@ -7384,11 +8230,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.3+zstd.1.5.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ - "zstd-safe 6.0.5+zstd.1.5.4", + "zstd-safe 7.2.1", ] [[package]] @@ -7403,22 +8249,20 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", - "libc", "pkg-config", ] @@ -7433,38 +8277,38 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.12.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" dependencies = [ "byteorder", "enumflags2", "libc", - "serde 1.0.163", + "serde 1.0.209", "static_assertions", "zvariant_derive", ] [[package]] name = "zvariant_derive" -version = "3.12.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix index 39ba2dad76a88..b038c6c38333f 100644 --- a/pkgs/by-name/ru/rustdesk/package.nix +++ b/pkgs/by-name/ru/rustdesk/package.nix @@ -37,45 +37,53 @@ rustPlatform.buildRustPackage rec { pname = "rustdesk"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - hash = "sha256-6TdirqEnWvuPgKOLzNIAm66EgKNdGVjD7vf2maqlxI8="; + hash = "sha256-pDGURsF0eft2BkuXOzaMtNCHp9VFgZZh4bbNRa5NDII="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "confy-0.4.0-2" = "sha256-r5VeggXrIq5Cwxc2WSrxQDI5Gvbw979qIUQfMKHgBUI="; + "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; + "arboard-3.4.0" = "sha256-lZIG5z115ExR6DcUut1rk9MrYFzSyCYH9kNGIikOPJM="; + "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; + "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA="; + "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; + "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; - "hwcodec-0.1.1" = "sha256-EQGJr5kH8O48y1oSrzFF3QGGpGFKP3v4gn2JquAkdlY="; - "impersonate_system-0.1.0" = "sha256-qbaTw9gxMKDjX5pKdUrKlmIxCxWwb99YuWPDvD2A3kY="; - "keepawake-0.4.3" = "sha256-sLQf9q88dB2bkTN01UlxRWSpoF1kFsqqpYC4Sw6cbEY="; + "hwcodec-0.7.0" = "sha256-pfzcaD7h/U5ou+P7qRLR56iXOkm043rF74y+Q0FsVLo="; + "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; + "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; - "mouce-0.2.1" = "sha256-3PtNEmVMXgqKV4r3KiKTkk4oyCt4BKynniJREE+RyFk="; - "pam-0.7.0" = "sha256-qe2GH6sfGEUnqLiQucYLB5rD/GyAaVtm9pAxWRb1H3Q="; - "parity-tokio-ipc-0.7.3-2" = "sha256-WXDKcDBaJuq4K9gjzOKMozePOFiVX0EqYAFamAz/Yvw="; - "rdev-0.5.0-2" = "sha256-MJ4Uqp0yz1CcFvoZYyUYwNojUcfW1AyVowKShihhhbY="; - "reqwest-0.11.18" = "sha256-3k2wcVD+DzJEdP/+8BqP9qz3tgEWcbWZj5/CjrZz5LY="; + "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE="; + "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; + "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; + "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw="; + "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; - "sciter-rs-0.5.57" = "sha256-NQPDlMQ0sGY8c9lBMlplT82sNjbgJy2m/+REnF3fz8M="; - "tao-0.22.2" = "sha256-vZx7WM6vK9UarbFQ/FMnTNEEDS+tglhWcPXt/h7YMFA="; - "tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU="; - "tokio-socks-0.5.1-2" = "sha256-x3aFJKo0XLaCGkZLtG9GYA+A/cGGedVZ8gOztWiYVUY="; - "tray-icon-0.5.1" = "sha256-1VyUg8V4omgdRIYyXhfn8kUvhV5ef6D2cr2Djz2uQyc="; + "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E="; + "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; + "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; + "tfc-0.7.0" = "sha256-VAoOadgGajWjW7q1RCwmQ5gMmaA1oeZBSiL1tYSuIEI="; + "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; + "tray-icon-0.15.1" = "sha256-DvTVAsE3dB+o89SFk3RPRt5JzaWjPl4nlvC77zsVN/s="; + "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; + "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; + "x11-clipboard-0.8.1" = "sha256-PtqmSD2MwkbLVWbfTSXZW3WEvEnUlo04qieUTjN2whE="; }; }; - prePatch = '' - # Patch 404 repos - substituteInPlace Cargo.lock --replace-fail "fufesou" "rustdesk-org"; - substituteInPlace Cargo.toml --replace-fail "fufesou" "rustdesk-org"; - substituteInPlace libs/enigo/Cargo.toml --replace-fail "fufesou" "rustdesk-org"; + postPatch = '' + # Overwrite cargo.lock because the one in the upstream repo has duplicates entries. + # It should probably be removed in the next rustdesk update (if they fix their cargoLock) + ln -fs ${./Cargo.lock} Cargo.lock ''; desktopItems = [ @@ -98,7 +106,7 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - buildFeatures = lib.optionals stdenv.isLinux [ "linux-pkg-config" ]; + buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [ "linux-pkg-config" ]; # Checks require an active X server doCheck = false; @@ -128,7 +136,7 @@ rustPlatform.buildRustPackage rec { zlib zstd ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit @@ -141,7 +149,7 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ] ) - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib xdotool ]; @@ -153,7 +161,7 @@ rustPlatform.buildRustPackage rec { # .so needs to be next to the executable mv $out/bin/rustdesk $out/lib/rustdesk - ${lib.optionalString stdenv.isLinux "ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk"} + ${lib.optionalString stdenv.hostPlatform.isLinux "ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk"} makeWrapper $out/lib/rustdesk/rustdesk $out/bin/rustdesk \ --chdir "$out/share" @@ -163,7 +171,7 @@ rustPlatform.buildRustPackage rec { install -Dm0644 $src/res/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --add-rpath "${libayatana-appindicator}/lib" "$out/lib/rustdesk/rustdesk" ''; diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix index 97b5e107314d5..f03783cbc5e2c 100644 --- a/pkgs/by-name/ru/rusti-cal/package.nix +++ b/pkgs/by-name/ru/rusti-cal/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5eS+OMaNAVNyDMKFNfb0J0rLsikw2LCXhWk7MS9UV2k="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index d8f92de73f2af..14f1c30ace136 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "rustic"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; rev = "refs/tags/v${version}"; - hash = "sha256-4DQNg/pYoIVQpdOp2Yx1AGUdsJbfGSL09Ll5yJTeJlU="; + hash = "sha256-SOXuQIdebzMHyO/r+0bvhZvdc09pNPiCXgYfzMoZUZo="; }; - cargoHash = "sha256-YFVxTJNzw/A0lz7mH6B+zKjeW5FYqyKHEWckCSVs4A8="; + cargoHash = "sha256-5tXaq/FPC3T+f1p4RtihQGgwAptcO58mOKQhiOpjacc="; # At the time of writing, upstream defaults to "self-update", "tui", and "webdav". # "self-update" is a self-updater, which we don't want in nixpkgs. @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix index 25407298d2e91..2d05eee496f19 100644 --- a/pkgs/by-name/ru/rustlings/package.nix +++ b/pkgs/by-name/ru/rustlings/package.nix @@ -1,5 +1,7 @@ { lib, + stdenv, + darwin, rustPlatform, fetchFromGitHub, pkg-config, @@ -34,6 +36,10 @@ rustPlatform.buildRustPackage { makeWrapper ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; [ CoreServices ] + ); + postFixup = '' wrapProgram $out/bin/rustlings --suffix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index 015a3b9a72c98..e5317b40b78ce 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-gDQ9AFrJuV7SrzKCAHQBkKj6clXuPLO0DHhnvcBqRLs="; }; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ cargo rustPlatform.cargoSetupHook cargo-c validatePkgConfig ]; diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix index a519cf610d1a2..241a0b71dc63f 100644 --- a/pkgs/by-name/ru/rustmission/package.nix +++ b/pkgs/by-name/ru/rustmission/package.nix @@ -9,21 +9,21 @@ rustPlatform.buildRustPackage rec { pname = "rustmission"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "intuis"; repo = "rustmission"; rev = "v${version}"; - hash = "sha256-Vjbz3Yfcn14oVJ5+lRMYO09Zcim3xqpjWepkkRBD454="; + hash = "sha256-V9sy3rkoI3mKpeZjXT4D3Bs4NVETJ8h43iwOoDx1MKU="; }; - cargoHash = "sha256-KHLf6Ime76NoEQDLRFFaCvhfqpL9T3h37SwqVv/T/5Q="; + cargoHash = "sha256-KYg+SVAvlQn77kI1gyzXlzhKgPECYPZKICnmkcEnuh8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/ru/rutorrent/package.nix b/pkgs/by-name/ru/rutorrent/package.nix new file mode 100644 index 0000000000000..11c586b8d2aa5 --- /dev/null +++ b/pkgs/by-name/ru/rutorrent/package.nix @@ -0,0 +1,25 @@ +{stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "rutorrent"; + version = "4.2.10"; + + src = fetchFromGitHub { + owner = "Novik"; + repo = "ruTorrent"; + rev = "v${version}"; + hash = "sha256-Hkh2fWaZpJLxUYaojR97XVQWXTRzmFkQe4xKsmY1E8M="; + }; + + installPhase = '' + mkdir -p $out/ + cp -r . $out/ + ''; + + meta = with lib; { + description = "Yet another web front-end for rTorrent"; + homepage = "https://github.com/Novik/ruTorrent"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/terminal-emulators/rxvt/default.nix b/pkgs/by-name/rx/rxvt/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/rxvt/default.nix rename to pkgs/by-name/rx/rxvt/package.nix diff --git a/pkgs/by-name/ry/rye/Cargo.lock b/pkgs/by-name/ry/rye/Cargo.lock index e1a1be7c98094..615c6cb0f08bf 100644 --- a/pkgs/by-name/ry/rye/Cargo.lock +++ b/pkgs/by-name/ry/rye/Cargo.lock @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.39.0" +version = "0.41.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/by-name/ry/rye/package.nix b/pkgs/by-name/ry/rye/package.nix index 3719ae8988e8b..e851728233246 100644 --- a/pkgs/by-name/ry/rye/package.nix +++ b/pkgs/by-name/ry/rye/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.39.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-qDXD5vNoIppe1EWKxr1tssgAelEKoMdZ/y7Dq979PwI="; + hash = "sha256-JpCa+7SwShfVM4Z+uPo7W2bCEf1QYHxClE/LgGSyFY0="; }; cargoLock = { @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk; [ frameworks.CoreServices @@ -85,12 +85,16 @@ rustPlatform.buildRustPackage rec { "--skip=test_config_show_path" "--skip=test_dotenv" "--skip=test_empty_sync" + "--skip=test_exclude_hashes" "--skip=test_fetch" + "--skip=test_generate_hashes" "--skip=test_init_default" "--skip=test_init_lib" "--skip=test_init_script" "--skip=test_lint_and_format" + "--skip=test_list_never_overwrite" "--skip=test_list_not_rye_managed" + "--skip=test_lockfile" "--skip=test_publish_outside_project" "--skip=test_version" ]; diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index 66d2a5ffae8c4..a0cf6b55cf22e 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/rygel/${lib.versions.majorMinor finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz"; - sha256 = "R9JXBLYQiDdeJqq6Vr5HwXGJRy5vgMdSq+hvAu9OMwQ="; + hash = "sha256-R9JXBLYQiDdeJqq6Vr5HwXGJRy5vgMdSq+hvAu9OMwQ="; }; patches = [ @@ -100,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { 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"; + changelog = "https://gitlab.gnome.org/GNOME/rygel/-/blob/rygel-${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/ry/ryujinx/deps.nix b/pkgs/by-name/ry/ryujinx/deps.nix index e87153d17d9eb..6a1c37ce1a876 100644 --- a/pkgs/by-name/ry/ryujinx/deps.nix +++ b/pkgs/by-name/ry/ryujinx/deps.nix @@ -57,7 +57,7 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; hash = "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; hash = "sha256-1BLzyZJ1Hn03JToJeIlW4JGhdh0HHrgD1FFvZAN0hCE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.0.1"; hash = "sha256-zPWUKTCfGm4MWcYPU037NzezsFE1g8tEijjQkw5iooI="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.0.1"; hash = "sha256-Xv9MUnjb66U3xeR9drOcSX5n2DjOCIJZPMNSKjWHo9Y="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.0.1"; hash = "sha256-FfwrH/2eLT521Kqw+RBIoVfzlTNyYMqlWP3z+T6Wy2Y="; }) @@ -67,7 +67,6 @@ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; hash = "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; hash = "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU="; }) @@ -128,13 +127,10 @@ (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; hash = "sha256-+K7ObC9ucilwWY+Tlf9KcrAVoTFS65V6Di7JDWDSZTg="; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; hash = "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="; }) (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.18"; hash = "sha256-72NV+OuW8bCfI/EOXwgS6dleLZnomLJTYeQPPmfhuu8="; }) - (fetchNuGet { pname = "Silk.NET.Core"; version = "2.16.0"; hash = "sha256-E/QTCNV+2s6X22HWZlRXVw3YpTxb+Oz8rXZuFpVgeNY="; }) - (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; hash = "sha256-nouPkjBmdt0ZyWBYBVZ1LHd3gBTlU8C4wbeod3av5Wk="; }) - (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; hash = "sha256-brvWqisI0WwE7qRhLeRdWXDedztX4lOFon4h6oxDIRU="; }) - (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.KHR"; version = "2.16.0"; hash = "sha256-QU7xVauLOBAF6TDo8mcuRsA2sZWyVLqFq1M+Oc/WnMg="; }) - (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0"; hash = "sha256-kyAQcZZOdD50Lo7l7z8qnFMerJjlAV66HNBq7BI6TNM="; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.9"; hash = "sha256-5Gn8de23zgrlAzqH39kjVIHoGUrhNNxiVw1qNVJECvY="; }) - (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0"; hash = "sha256-IH+UVkem5kk6zWAWfWsrtyINZNMh+Em1cF1CCfjvBj4="; }) + (fetchNuGet { pname = "Silk.NET.Core"; version = "2.21.0"; hash = "sha256-D4ZUCm1Gf/EiRWrSwSLrdXT6U54icY2E/vrvCD/bRHw="; }) + (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.21.0"; hash = "sha256-Xnxl13+ziJ1+jNxMFSrEuh6NvL1FBrYmJ/d3HQXpgzY="; }) + (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.21.0"; hash = "sha256-udELG0ppCOP9eT2yl/sI9MgKOVOuK0py9znmoaBGDpk="; }) + (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.KHR"; version = "2.21.0"; hash = "sha256-KyiGHW6CNkXE3EdHk3ufwTVG7oLvSyHwx+MmIJhsiBk="; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; hash = "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; hash = "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="; }) @@ -199,10 +195,9 @@ (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; hash = "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; hash = "sha256-YJ5jJqkVPp+6fEzSXOmw1sNSdygB5Rx7TJ0TrNS/wq4="; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; hash = "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; hash = "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index d2b9d56e8b565..6e698c3314f05 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -1,7 +1,7 @@ { lib , buildDotnetModule , dotnetCorePackages -, fetchFromGitHub +, fetchzip , libX11 , libgdiplus , ffmpeg @@ -10,15 +10,14 @@ , sndio , pulseaudio , vulkan-loader +, glew +, libGL , libICE , libSM -, libXi , libXcursor , libXext +, libXi , libXrandr -, fontconfig -, glew -, libGL , udev , SDL2 , SDL2_mixer @@ -26,15 +25,15 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.1379"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1401"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml - src = fetchFromGitHub { - owner = "Ryujinx"; - repo = "Ryujinx"; - rev = "b45a81458a0b48acd519ce280c7b8f3970e0ffed"; - sha256 = "1w3nfhx496im06m3gc67xw8w1n6qprs9ggka2sq0g8w2ssz4iy7f"; + src = fetchzip { + url = "https://archive.org/download/ryujinx-5dbba-07e-33e-83c-9047dcbb-701c-9655edbbe-89086.tar/Ryujinx-5dbba07e33e83c9047dcbb701c9655edbbe89086.tar.gz"; + hash = "sha256-UeJ3KE5e5H9crqroAxjmxYTf/Z4cbj41a6/1HW2nLcA="; }; + enableParallelBuilding = false; + dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; @@ -53,14 +52,13 @@ buildDotnetModule rec { udev # Avalonia UI + glew libICE libSM - libXi libXcursor libXext + libXi libXrandr - fontconfig - glew # Headless executable libGL diff --git a/pkgs/by-name/ry/ryujinx/updater.sh b/pkgs/by-name/ry/ryujinx/updater.sh index 74b291640077e..bf6a41aa3e157 100755 --- a/pkgs/by-name/ry/ryujinx/updater.sh +++ b/pkgs/by-name/ry/ryujinx/updater.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl common-updater-scripts nix-prefetch-git jq +# shellcheck shell=bash set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -68,9 +69,10 @@ cd ../../../.. if [[ "${1-default}" != "--deps-only" ]]; then SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --quiet | jq -r '.sha256')" - update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT" + SRI=$(nix --experimental-features nix-command hash to-sri "sha256:$SHA") + update-source-version ryujinx "$NEW_VERSION" "$SRI" --rev="$COMMIT" fi echo "building Nuget lockfile" -$(nix-build -A ryujinx.fetch-deps --no-out-link) +eval "$(nix-build -A ryujinx.fetch-deps --no-out-link)" diff --git a/pkgs/by-name/s0/s0ix-selftest-tool/package.nix b/pkgs/by-name/s0/s0ix-selftest-tool/package.nix index fb53e52471085..b607fcc861f6a 100644 --- a/pkgs/by-name/s0/s0ix-selftest-tool/package.nix +++ b/pkgs/by-name/s0/s0ix-selftest-tool/package.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation { pname = "s0ix-selftest-tool"; - version = "0-unstable-2024-08-20"; + version = "0-unstable-2024-09-22"; src = fetchFromGitHub { owner = "intel"; repo = "S0ixSelftestTool"; - rev = "73b540d0b15d874ebb462eb3296399d4556aff64"; - hash = "sha256-p0IxhG0P0G+DQ5UykC+uVlMZUZQwrWG/iiJprdmsLm0="; + rev = "3af4af2009cb01da43ddae906f671d435494a0dc"; + hash = "sha256-phQxlbQB3J08tPtcw4vqupVgAT9gsSJxgPT044SMMNk="; }; # don't use the bundled turbostat binary diff --git a/pkgs/by-name/s3/s3proxy/package.nix b/pkgs/by-name/s3/s3proxy/package.nix index 72f18af79cc13..d24f3728da118 100644 --- a/pkgs/by-name/s3/s3proxy/package.nix +++ b/pkgs/by-name/s3/s3proxy/package.nix @@ -21,7 +21,7 @@ maven.buildMavenPackage { hash = "sha256-GhZPvo8wlXInHwg8rSmpwMMkZVw5SMpnZyKqFUYLbrE="; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/s3/s3scanner/package.nix b/pkgs/by-name/s3/s3scanner/package.nix index e2a9c89f2c11a..dde1360b2bfcf 100644 --- a/pkgs/by-name/s3/s3scanner/package.nix +++ b/pkgs/by-name/s3/s3scanner/package.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "s3scanner"; - version = "3.0.4"; + version = "3.1.1"; src = fetchFromGitHub { owner = "sa7mon"; repo = "s3scanner"; rev = "v${version}"; - hash = "sha256-f1r5ubH7iLKuuEhs4MPNY779FjyASW1xOXtMtXvF/CY="; + hash = "sha256-RS/+m/snJIm8OxCgvh/Bn1u9ghvRgS8tYvy1v1DV02I="; }; ldflags = [ "-s -w" ]; - vendorHash = "sha256-3Y1izt6xLg7aNJNqIEXROxR3IGAIIeptHlnoYEcuLew="; + vendorHash = "sha256-Ik5B01QnbhFQISAY3Bdb1g85Din+Ifcg1vbGZcbb1OY="; # Requires networking doCheck = false; diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix index 65e47bd76c62b..6723ccbd4ecd7 100644 --- a/pkgs/by-name/sa/sabnzbd/package.nix +++ b/pkgs/by-name/sa/sabnzbd/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-WJ58OawPSICCWMWQ042T4OmK5UBRZRU5tnLYxGPbDPc="; + hash = "sha256-WJ58OawPSICCWMWQ042T4OmK5UBRZRU5tnLYxGPbDPc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index ab1d90a21a1c0..ae4670a002bb3 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; - sha256 = "sha256-741O6C7amxSnOOTledF0izmVhiT79tFI4+EOtpNqP2Q="; + hash = "sha256-741O6C7amxSnOOTledF0izmVhiT79tFI4+EOtpNqP2Q="; }; sourceRoot = "saga-${version}/saga-gis"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ curl @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ] # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa unixODBC poppler @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - (lib.cmakeBool "OpenMP_SUPPORT" (!stdenv.isDarwin)) + (lib.cmakeBool "OpenMP_SUPPORT" (!stdenv.hostPlatform.isDarwin)) ]; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/by-name/sa/sakura/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/sakura/default.nix rename to pkgs/by-name/sa/sakura/package.nix diff --git a/pkgs/by-name/sa/salmon/package.nix b/pkgs/by-name/sa/salmon/package.nix index 09a2fec4c2578..bfc12deedd6b9 100644 --- a/pkgs/by-name/sa/salmon/package.nix +++ b/pkgs/by-name/sa/salmon/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { tbb_2021_11 xz zlib - ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/by-name/sa/salut/package.nix b/pkgs/by-name/sa/salut/package.nix index 83818dae8bdcb..5e61e524e4fa7 100644 --- a/pkgs/by-name/sa/salut/package.nix +++ b/pkgs/by-name/sa/salut/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { description = "Sleek notification daemon for Wayland"; homepage = "https://gitlab.com/snakedye/salut/-/wikis/Home"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "salut"; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/by-name/sa/samurai/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/samurai/default.nix rename to pkgs/by-name/sa/samurai/package.nix diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix index d448f5e07132f..f8577d3b8a15d 100644 --- a/pkgs/by-name/sa/sanjuuni/package.nix +++ b/pkgs/by-name/sa/sanjuuni/package.nix @@ -7,6 +7,8 @@ poco, ocl-icd, opencl-clhpp, + gitUpdater, + callPackage, }: stdenv.mkDerivation rec { @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "sanjuuni"; rev = version; - sha256 = "sha256-wJRPD4OWOTPiyDr9dYseRA7BI942HPfHONVJGTc/+wU="; + hash = "sha256-wJRPD4OWOTPiyDr9dYseRA7BI942HPfHONVJGTc/+wU="; }; nativeBuildInputs = [ pkg-config ]; @@ -37,13 +39,20 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + tests = { + run-on-nixos-artwork = callPackage ./tests/run-on-nixos-artwork.nix { }; + }; + updateScript = gitUpdater { }; + }; + meta = with lib; { homepage = "https://github.com/MCJack123/sanjuuni"; description = "Command-line tool that converts images and videos into a format that can be displayed in ComputerCraft"; changelog = "https://github.com/MCJack123/sanjuuni/releases/tag/${version}"; maintainers = [ maintainers.tomodachi94 ]; license = licenses.gpl2Plus; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "sanjuuni"; }; } diff --git a/pkgs/by-name/sa/sanjuuni/tests/run-on-nixos-artwork.nix b/pkgs/by-name/sa/sanjuuni/tests/run-on-nixos-artwork.nix new file mode 100644 index 0000000000000..e64c6c563df44 --- /dev/null +++ b/pkgs/by-name/sa/sanjuuni/tests/run-on-nixos-artwork.nix @@ -0,0 +1,34 @@ +{ + runCommand, + sanjuuni, + nixos-artwork, + lua5_2, +}: +let + makeCommand = derivation: baseFilename: '' + echo "sanjuuni-test-run-on-nixos-artwork: Running Sanjuuni on ${derivation}/share/backgrounds/nixos/${baseFilename}.png" + sanjuuni --lua --disable-opencl \ + --input ${derivation}/share/backgrounds/nixos/${baseFilename}.png \ + --output $out/${baseFilename}.lua + echo "sanjuuni-test-run-on-nixos-artwork: Checking syntax on $out/${baseFilename}.lua" + lua -e "loadfile(\"$out/${baseFilename}.lua\")" + ''; +in +runCommand "sanjuuni-test-run-on-nixos-artwork" + { + nativeBuildInputs = [ + sanjuuni + lua5_2 + nixos-artwork.wallpapers.simple-blue + nixos-artwork.wallpapers.simple-red + nixos-artwork.wallpapers.simple-dark-gray + nixos-artwork.wallpapers.stripes + ]; + } + '' + mkdir -p $out + ${makeCommand nixos-artwork.wallpapers.simple-blue "nix-wallpaper-simple-blue"} + ${makeCommand nixos-artwork.wallpapers.simple-red "nix-wallpaper-simple-red"} + ${makeCommand nixos-artwork.wallpapers.simple-dark-gray "nix-wallpaper-simple-dark-gray"} + ${makeCommand nixos-artwork.wallpapers.stripes "nix-wallpaper-stripes"} + '' diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index 0aab71d6c30c6..5fa852a6d1da6 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.20"; + version = "1.0.21"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-9F/YU3APIVNCzHbAl0zL5+wqUP/VnzeYhj6SppwkbvI="; + hash = "sha256-zoTZ0JwkV6zaKHw1PegzE6NiGGVptBZgCgD8O9ZHHGc="; }; sourceRoot = "."; diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix index c3dc24758ec51..6e3a236ed4e9e 100644 --- a/pkgs/by-name/sa/sarif-fmt/package.nix +++ b/pkgs/by-name/sa/sarif-fmt/package.nix @@ -8,19 +8,19 @@ }: rustPlatform.buildRustPackage rec { pname = "sarif-fmt"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit pname version; - hash = "sha256-Zflwjj5ArNmE/7Im/O09kG07ZekCyz5jU2S3vpnlXT8="; + hash = "sha256-0LyTXyycdIq0FuBTxE9D7FRFfn4iZnDKOt+Rk4P1HwU="; }; - cargoHash = "sha256-hCtVfGutgvncb05zt+lSNdlrDO+UruSUahzrxaERjFE="; + cargoHash = "sha256-UpVZtZ3d0N/uL9+yc1gIO3SQsoqvUBMEDjdl9SDSKd8="; # `test_clippy` (the only test we enable) is broken on Darwin # because `--enable-profiler` is not enabled in rustc on Darwin # error[E0463]: can't find crate for profiler_builtins - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkFlags = [ # these tests use nix so...no go diff --git a/pkgs/by-name/sa/sasquatch-v4be/package.nix b/pkgs/by-name/sa/sasquatch-v4be/package.nix new file mode 100644 index 0000000000000..10318b97045d6 --- /dev/null +++ b/pkgs/by-name/sa/sasquatch-v4be/package.nix @@ -0,0 +1,3 @@ +{ sasquatch }: + +sasquatch.override { bigEndian = true; } diff --git a/pkgs/by-name/sa/sasquatch/darwin.patch b/pkgs/by-name/sa/sasquatch/darwin.patch new file mode 100644 index 0000000000000..657971c5b0abb --- /dev/null +++ b/pkgs/by-name/sa/sasquatch/darwin.patch @@ -0,0 +1,357 @@ +Patch based on commits by Dave Vasilevsky <dave@vasilevsky.ca> and +Blake Riley <blake.riley@gmail.com>, squashed into a single patch, +with BSD-specific changes omitted. + +See also https://github.com/plougher/squashfs-tools/pull/69. + +diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c +index ea2f604..9c979f8 100644 +--- a/squashfs-tools/action.c ++++ b/squashfs-tools/action.c +@@ -39,6 +39,10 @@ + #include <errno.h> + #include <ctype.h> + ++#ifndef FNM_EXTMATCH /* glibc extension */ ++ #define FNM_EXTMATCH 0 ++#endif ++ + #include "squashfs_fs.h" + #include "mksquashfs.h" + #include "action.h" +@@ -2415,9 +2419,12 @@ static char *get_start(char *s, int n) + + static int subpathname_fn(struct atom *atom, struct action_data *action_data) + { +- return fnmatch(atom->argv[0], get_start(strdupa(action_data->subpath), ++ char *path = strdup(action_data->subpath); ++ int is_match = fnmatch(atom->argv[0], get_start(path, + count_components(atom->argv[0])), + FNM_PATHNAME|FNM_EXTMATCH) == 0; ++ free(path); ++ return is_match; + } + + /* +diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c +index 216b979..eea2ec9 100644 +--- a/squashfs-tools/info.c ++++ b/squashfs-tools/info.c +@@ -144,31 +144,22 @@ void dump_state() + void *info_thrd(void *arg) + { + sigset_t sigmask; +- struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 }; +- int sig, waiting = 0; ++ int sig, err, waiting = 0; + + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGQUIT); + sigaddset(&sigmask, SIGHUP); ++ sigaddset(&sigmask, SIGALRM); + + while(1) { +- if(waiting) +- sig = sigtimedwait(&sigmask, NULL, ×pec); +- else +- sig = sigwaitinfo(&sigmask, NULL); ++ err = sigwait(&sigmask, &sig); + +- if(sig == -1) { ++ if(err == -1) { + switch(errno) { +- case EAGAIN: +- /* interval timed out */ +- waiting = 0; +- /* FALLTHROUGH */ + case EINTR: +- /* if waiting, the wait will be longer, but +- that's OK */ + continue; + default: +- BAD_ERROR("sigtimedwait/sigwaitinfo failed " ++ BAD_ERROR("sigwait failed " + "because %s\n", strerror(errno)); + } + } +@@ -179,8 +170,12 @@ void *info_thrd(void *arg) + /* set one second interval period, if ^\ received + within then, dump queue and cache status */ + waiting = 1; +- } else ++ alarm(1); ++ } else if (sig == SIGQUIT) { + dump_state(); ++ } else if (sig == SIGALRM) { ++ waiting = 0; ++ } + } + } + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index 843f9f4..ed2c3a6 100644 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -35,7 +35,12 @@ + #include <stddef.h> + #include <sys/types.h> + #include <sys/stat.h> ++#ifndef linux ++#include <sys/sysctl.h> ++#else ++#include <sys/sysinfo.h> + #include <sys/sysmacros.h> ++#endif + #include <fcntl.h> + #include <errno.h> + #include <dirent.h> +@@ -50,7 +55,10 @@ + #include <sys/wait.h> + #include <limits.h> + #include <ctype.h> +-#include <sys/sysinfo.h> ++ ++#ifndef FNM_EXTMATCH /* glibc extension */ ++ #define FNM_EXTMATCH 0 ++#endif + + #ifndef linux + #include <sys/sysctl.h> +@@ -5064,6 +5072,7 @@ static void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGQUIT); + sigaddset(&sigmask, SIGHUP); ++ sigaddset(&sigmask, SIGALRM); + if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) + BAD_ERROR("Failed to set signal mask in intialise_threads\n"); + +@@ -5802,6 +5811,35 @@ static int get_physical_memory() + long long page_size = sysconf(_SC_PAGESIZE); + int phys_mem; + ++#ifndef linux ++ #ifdef HW_MEMSIZE ++ #define SYSCTL_PHYSMEM HW_MEMSIZE ++ #elif defined(HW_PHYSMEM64) ++ #define SYSCTL_PHYSMEM HW_PHYSMEM64 ++ #else ++ #define SYSCTL_PHYSMEM HW_PHYSMEM ++ #endif ++ ++ int mib[2]; ++ uint64_t sysctl_physmem = 0; ++ size_t sysctl_len = sizeof(sysctl_physmem); ++ ++ mib[0] = CTL_HW; ++ mib[1] = SYSCTL_PHYSMEM; ++ ++ if(sysctl(mib, 2, &sysctl_physmem, &sysctl_len, NULL, 0) == 0) { ++ /* some systems use 32-bit values, work with what we're given */ ++ if (sysctl_len == 4) ++ sysctl_physmem = *(uint32_t*)&sysctl_physmem; ++ phys_mem = sysctl_physmem >> 20; ++ } else { ++ ERROR_START("Failed to get amount of available " ++ "memory."); ++ ERROR_EXIT(" Defaulting to least viable amount\n"); ++ phys_mem = SQUASHFS_LOWMEM; ++ } ++ #undef SYSCTL_PHYSMEM ++#else + if(num_pages == -1 || page_size == -1) { + struct sysinfo sys; + int res = sysinfo(&sys); +@@ -5814,6 +5852,7 @@ static int get_physical_memory() + } + + phys_mem = num_pages * page_size >> 20; ++#endif + + if(phys_mem < SQUASHFS_LOWMEM) + BAD_ERROR("Mksquashfs requires more physical memory than is " +diff --git a/squashfs-tools/read_xattrs.c b/squashfs-tools/read_xattrs.c +index 2067f80..ca8b7f4 100644 +--- a/squashfs-tools/read_xattrs.c ++++ b/squashfs-tools/read_xattrs.c +@@ -31,13 +31,13 @@ + #include <stdio.h> + #include <string.h> + ++#include <stdlib.h> ++ + #include "squashfs_fs.h" + #include "squashfs_swap.h" + #include "xattr.h" + #include "error.h" + +-#include <stdlib.h> +- + extern int read_fs_bytes(int, long long, long long, void *); + extern int read_block(int, long long, long long *, int, void *); + +diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c +index d434b42..1208e45 100644 +--- a/squashfs-tools/unsquashfs.c ++++ b/squashfs-tools/unsquashfs.c +@@ -32,8 +32,12 @@ + #include "stdarg.h" + #include "fnmatch_compat.h" + ++#ifndef linux ++#include <sys/sysctl.h> ++#else + #include <sys/sysinfo.h> + #include <sys/sysmacros.h> ++#endif + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +@@ -1182,7 +1186,7 @@ int create_inode(char *pathname, struct inode *i) + break; + case SQUASHFS_SYMLINK_TYPE: + case SQUASHFS_LSYMLINK_TYPE: { +- struct timespec times[2] = { ++ struct timeval times[2] = { + { i->time, 0 }, + { i->time, 0 } + }; +@@ -1201,8 +1205,7 @@ int create_inode(char *pathname, struct inode *i) + goto failed; + } + +- res = utimensat(AT_FDCWD, pathname, times, +- AT_SYMLINK_NOFOLLOW); ++ res = lutimes(pathname, times); + if(res == -1) { + EXIT_UNSQUASH_STRICT("create_inode: failed to" + " set time on %s, because %s\n", +@@ -2687,6 +2690,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size, int cat_ + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGQUIT); + sigaddset(&sigmask, SIGHUP); ++ sigaddset(&sigmask, SIGALRM); + if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) + EXIT_UNSQUASH("Failed to set signal mask in initialise_threads\n"); + +diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h +index 1099678..5b6a038 100644 +--- a/squashfs-tools/unsquashfs.h ++++ b/squashfs-tools/unsquashfs.h +@@ -46,6 +46,10 @@ + #include <sys/ioctl.h> + #include <sys/time.h> + ++#ifndef FNM_EXTMATCH /* glibc extension */ ++ #define FNM_EXTMATCH 0 ++#endif ++ + #include "endian_compat.h" + #include "squashfs_fs.h" + #include "unsquashfs_error.h" +diff --git a/squashfs-tools/unsquashfs_info.c b/squashfs-tools/unsquashfs_info.c +index e906eaf..f1e68c2 100644 +--- a/squashfs-tools/unsquashfs_info.c ++++ b/squashfs-tools/unsquashfs_info.c +@@ -96,31 +96,22 @@ void dump_state() + void *info_thrd(void *arg) + { + sigset_t sigmask; +- struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 }; +- int sig, waiting = 0; ++ int sig, err, waiting = 0; + + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGQUIT); + sigaddset(&sigmask, SIGHUP); ++ sigaddset(&sigmask, SIGALRM); + + while(1) { +- if(waiting) +- sig = sigtimedwait(&sigmask, NULL, ×pec); +- else +- sig = sigwaitinfo(&sigmask, NULL); ++ err = sigwait(&sigmask, &sig); + +- if(sig == -1) { ++ if(err == -1) { + switch(errno) { +- case EAGAIN: +- /* interval timed out */ +- waiting = 0; +- /* FALLTHROUGH */ + case EINTR: +- /* if waiting, the wait will be longer, but +- that's OK */ + continue; + default: +- BAD_ERROR("sigtimedwait/sigwaitinfo failed " ++ BAD_ERROR("sigwait failed " + "because %s\n", strerror(errno)); + } + } +@@ -132,8 +123,12 @@ void *info_thrd(void *arg) + /* set one second interval period, if ^\ received + within then, dump queue and cache status */ + waiting = 1; +- } else ++ alarm(1); ++ } else if (sig == SIGQUIT) { + dump_state(); ++ } else if (sig == SIGALRM) { ++ waiting = 0; ++ } + } + } + +diff --git a/squashfs-tools/unsquashfs_xattr.c b/squashfs-tools/unsquashfs_xattr.c +index 61910e1..73e0090 100644 +--- a/squashfs-tools/unsquashfs_xattr.c ++++ b/squashfs-tools/unsquashfs_xattr.c +@@ -27,6 +27,11 @@ + + #include <sys/xattr.h> + ++#ifdef XATTR_NOFOLLOW /* Apple's xattrs */ ++ #define lsetxattr(path_, name_, val_, sz_, flags_) \ ++ setxattr(path_, name_, val_, sz_, 0, flags_ | XATTR_NOFOLLOW) ++#endif ++ + #define NOSPACE_MAX 10 + + extern int root_process; +diff --git a/squashfs-tools/xattr.c b/squashfs-tools/xattr.c +index b1c0089..6d7ed98 100644 +--- a/squashfs-tools/xattr.c ++++ b/squashfs-tools/xattr.c +@@ -22,6 +22,14 @@ + * xattr.c + */ + ++#ifndef linux ++#define __BYTE_ORDER BYTE_ORDER ++#define __BIG_ENDIAN BIG_ENDIAN ++#define __LITTLE_ENDIAN LITTLE_ENDIAN ++#else ++#include <endian.h> ++#endif ++ + #define TRUE 1 + #define FALSE 0 + +@@ -36,6 +44,13 @@ + #include <stdlib.h> + #include <sys/xattr.h> + ++#ifdef XATTR_NOFOLLOW /* Apple's xattrs */ ++ #define llistxattr(path_, buf_, sz_) \ ++ listxattr(path_, buf_, sz_, XATTR_NOFOLLOW) ++ #define lgetxattr(path_, name_, val_, sz_) \ ++ getxattr(path_, name_, val_, sz_, 0, XATTR_NOFOLLOW) ++#endif ++ + #include "squashfs_fs.h" + #include "squashfs_swap.h" + #include "mksquashfs.h" +-- +2.35.1 + diff --git a/pkgs/by-name/sa/sasquatch/package.nix b/pkgs/by-name/sa/sasquatch/package.nix new file mode 100644 index 0000000000000..1c71a75452fba --- /dev/null +++ b/pkgs/by-name/sa/sasquatch/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitHub, + lz4, + lzo, + which, + xz, + zlib, + zstd, + bigEndian ? false, +}: + +let + drv = stdenv.mkDerivation (finalAttrs: { + pname = "sasquatch"; + version = "4.5.1-4"; + + src = fetchFromGitHub { + owner = "onekey-sec"; + repo = "sasquatch"; + rev = "sasquatch-v${finalAttrs.version}"; + hash = "sha256-0itva+j5WMKvueiUaO253UQ1S6W29xgtFvV4i3yvMtU="; + }; + + patches = lib.optional stdenv.isDarwin ./darwin.patch; + + strictDeps = true; + nativeBuildInputs = [ which ]; + buildInputs = [ + zlib + xz + zstd + lz4 + lzo + ]; + + preBuild = '' + cd squashfs-tools + ''; + + installFlags = [ + "INSTALL_DIR=${placeholder "out"}/bin" + "INSTALL_MANPAGES_DIR=${placeholder "out"}/share/man/man1" + ]; + + makeFlags = [ + "GZIP_SUPPORT=1" + "LZ4_SUPPORT=1" + "LZMA_SUPPORT=1" + "LZO_SUPPORT=1" + "XZ_SUPPORT=1" + "ZSTD_SUPPORT=1" + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString bigEndian "-DFIX_BE"; + + postInstall = lib.optionalString bigEndian '' + mv $out/bin/sasquatch{,-v4be} + ''; + + meta = { + homepage = "https://github.com/onekey-sec/sasquatch"; + description = "Set of patches to the standard unsquashfs utility (part of squashfs-tools) that attempts to add support for as many hacked-up vendor-specific SquashFS implementations as possible"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ vlaci ]; + platforms = lib.platforms.unix; + mainProgram = if bigEndian then "sasquatch-v4be" else "sasquatch"; + }; + }); +in +drv diff --git a/pkgs/by-name/sa/satellite/package.nix b/pkgs/by-name/sa/satellite/package.nix index 2eb747758bd18..077c4bfef8ca9 100644 --- a/pkgs/by-name/sa/satellite/package.nix +++ b/pkgs/by-name/sa/satellite/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "satellite"; - version = "0.4.3"; + version = "0.5.0"; pyproject = true; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tpikonen"; repo = "satellite"; rev = version; - hash = "sha256-4L6zbHjWAIJJv2N3XKcfHSZUAUC2FPjK5hT9XGBtQ3w="; + hash = "sha256-61HCk0W07w0LybSVB4APvQX4PMSsqH9mKGzc+Rmno90="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sa/sauerbraten/package.nix b/pkgs/by-name/sa/sauerbraten/package.nix new file mode 100644 index 0000000000000..2951641fbf5f8 --- /dev/null +++ b/pkgs/by-name/sa/sauerbraten/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + fetchzip, + + # nativeBuildInputs + makeWrapper, + copyDesktopItems, + + # buildInputs + SDL2, + SDL2_image, + SDL2_mixer, + zlib, + + makeDesktopItem, +}: + +stdenv.mkDerivation rec { + pname = "sauerbraten"; + version = "2020-12-29"; + + src = fetchzip { + url = "mirror://sourceforge/sauerbraten/sauerbraten_${ + builtins.replaceStrings [ "-" ] [ "_" ] version + }_linux.tar.bz2"; + hash = "sha256-os3SmonqHRw1+5dIRVt7EeXfnSq298GiyKpusS1K3rM="; + }; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + SDL2 + SDL2_image + SDL2_mixer + zlib + ]; + + sourceRoot = "${src.name}/src"; + + enableParallelBuilding = true; + + desktopItems = [ + (makeDesktopItem { + name = "sauerbraten"; + exec = "sauerbraten_client %u"; + icon = "sauerbraten"; + desktopName = "Sauerbraten"; + comment = "FPS that uses an improved version of the Cube engine"; + categories = [ + "Application" + "Game" + "ActionGame" + ]; + }) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/icon/ $out/share/sauerbraten $out/share/doc/sauerbraten + cp -r "../docs/"* $out/share/doc/sauerbraten/ + cp sauer_client sauer_server $out/share/sauerbraten/ + cp -r ../packages ../data $out/share/sauerbraten/ + ln -s $out/share/sauerbraten/cube.png $out/share/icon/sauerbraten.png + + makeWrapper $out/share/sauerbraten/sauer_server $out/bin/sauerbraten_server \ + --chdir "$out/share/sauerbraten" + makeWrapper $out/share/sauerbraten/sauer_client $out/bin/sauerbraten_client \ + --chdir "$out/share/sauerbraten" \ + --add-flags "-q\''${HOME}/.config/sauerbraten" + + runHook postInstall + ''; + + meta = { + description = "Free multiplayer & singleplayer first person shooter, the successor of the Cube FPS"; + homepage = "http://sauerbraten.org"; + maintainers = with lib.maintainers; [ + raskin + ajs124 + ]; + mainProgram = "sauerbraten_client"; + hydraPlatforms = + # raskin: tested amd64-linux; + # not setting platforms because it is 0.5+ GiB of game data + [ ]; + license = "freeware"; # as an aggregate - data files have different licenses code is under zlib license + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix index a9aa0989fcaf5..587df043f050f 100644 --- a/pkgs/by-name/sa/saunafs/package.nix +++ b/pkgs/by-name/sa/saunafs/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "saunafs"; - version = "4.4.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "leil-io"; repo = "saunafs"; rev = "v${finalAttrs.version}"; - hash = "sha256-t2fb8AA9m2I7Qna/v4F2GNL02iCU0r7zz5TgajHUmrg="; + hash = "sha256-oMFS5eNNzCpaineCLn0hh3bXGw3SNdj+Pdvk3pevIZg="; }; patches = [ diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/by-name/sa/sawfish/package.nix similarity index 100% rename from pkgs/applications/window-managers/sawfish/default.nix rename to pkgs/by-name/sa/sawfish/package.nix diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix index a3cfb4be0ac3a..0390df3e05195 100644 --- a/pkgs/by-name/sb/sby/package.nix +++ b/pkgs/by-name/sb/sby/package.nix @@ -10,7 +10,6 @@ z3, aiger, btor2tools, - python3Packages, nix-update-script, }: @@ -20,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "sby"; - version = "0.44"; + version = "0.45"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "sby"; rev = "yosys-${version}"; - hash = "sha256-/oDbbdZuWPdg0Xrh+c4i283vML9QTfyWVu8kryb4WaE="; + hash = "sha256-HRQ5ZL0w3GLUySTFekE/T/VlxJLFIQQr0bW8l7rp/zs="; }; nativeBuildInputs = [ bash ]; diff --git a/pkgs/by-name/sc/scala-next/package.nix b/pkgs/by-name/sc/scala-next/package.nix new file mode 100644 index 0000000000000..edbe49945f1a1 --- /dev/null +++ b/pkgs/by-name/sc/scala-next/package.nix @@ -0,0 +1,10 @@ +{ scala, fetchurl }: + +scala.bare.overrideAttrs (oldAttrs: { + version = "3.5.1"; + pname = "scala-next"; + src = fetchurl { + inherit (oldAttrs.src) url; + hash = "sha256-pRfoCXFVnnEh3zyB9HbUZK3qrQ94Gq3iXX2fWGS/l9o="; + }; +}) diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index db17f1fad6ebd..6f488735670aa 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.32.0"; + version = "1.34.0"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = version; - hash = "sha256-kursqM0/HxTnEvrVxEd4YUiIG4I974JKZqkQTqP00ko="; + hash = "sha256-SJFQFOd9m+38TsclIs4FxAl9kejgcUG895qjy4iXKdk="; }; vendorHash = null; diff --git a/pkgs/by-name/sc/scenefx/package.nix b/pkgs/by-name/sc/scenefx/package.nix index 6514cec7fc1a6..d3704f1434ff2 100644 --- a/pkgs/by-name/sc/scenefx/package.nix +++ b/pkgs/by-name/sc/scenefx/package.nix @@ -16,6 +16,7 @@ mesa, validatePkgConfig, testers, + wayland-scanner, }: stdenv.mkDerivation (finalAttrs: { @@ -31,12 +32,15 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc validatePkgConfig + wayland-scanner ]; buildInputs = [ @@ -56,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects"; homepage = "https://github.com/wlrfx/scenefx"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "scenefx"; pkgConfigModules = [ "scenefx" ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/sc/schemamap/package.nix b/pkgs/by-name/sc/schemamap/package.nix index 95908de6e1c62..081cee9a23f6e 100644 --- a/pkgs/by-name/sc/schemamap/package.nix +++ b/pkgs/by-name/sc/schemamap/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk; [ frameworks.Security diff --git a/pkgs/by-name/sc/schemaspy/package.nix b/pkgs/by-name/sc/schemaspy/package.nix new file mode 100644 index 0000000000000..4c5ac81c879ad --- /dev/null +++ b/pkgs/by-name/sc/schemaspy/package.nix @@ -0,0 +1,53 @@ +{ + lib, + fetchFromGitHub, + graphviz, + jre, + makeWrapper, + maven, + nix-update-script, +}: + +maven.buildMavenPackage rec { + pname = "schemaspy"; + version = "6.2.4"; + + src = fetchFromGitHub { + owner = "schemaspy"; + repo = "schemaspy"; + rev = "refs/tags/v${version}"; + hash = "sha256-yEqhLpGrJ4hki8o+u+bigVXv+3YvEb8TvHDTYsEl8z4="; + }; + + mvnParameters = "-Dmaven.test.skip=true -Dmaven.buildNumber.skip=true"; + mvnHash = "sha256-LCPRiY/DDSUnLGnaFUS9PPKnh3TmSyAOqKfEKRLRjpg="; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + install -D target/${pname}-${version}-app.jar $out/share/java/${pname}-${version}.jar + + makeWrapper ${jre}/bin/java $out/bin/schemaspy \ + --add-flags "-jar $out/share/java/${pname}-${version}.jar" \ + --prefix PATH : ${lib.makeBinPath [ graphviz ]} + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://schemaspy.org"; + description = "Document your database simply and easily"; + mainProgram = "schemaspy"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ + jraygauthier + anthonyroussel + ]; + }; +} diff --git a/pkgs/by-name/sc/scons/setup-hook.sh b/pkgs/by-name/sc/scons/setup-hook.sh index bfd8f3cc07b92..3cdb7da42453b 100644 --- a/pkgs/by-name/sc/scons/setup-hook.sh +++ b/pkgs/by-name/sc/scons/setup-hook.sh @@ -8,14 +8,13 @@ sconsBuildPhase() { fi if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then - buildFlags="${prefixKey:-prefix=}$prefix $buildFlags" + prependToVar buildFlags "${prefixKey:-prefix=}$prefix" fi local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES}} - $sconsFlags ${sconsFlagsArray[@]} - $buildFlags ${buildFlagsArray[@]} ) + concatTo flagsArray sconsFlags sconsFlagsArray buildFlags buildFlagsArray echoCmd 'scons build flags' "${flagsArray[@]}" scons "${flagsArray[@]}" @@ -31,15 +30,13 @@ sconsInstallPhase() { fi if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then - installFlags="${prefixKey:-prefix=}$prefix $installFlags" + prependToVar installFlags "${prefixKey:-prefix=}$prefix" fi local flagsArray=( ${enableParallelInstalling:+-j${NIX_BUILD_CORES}} - $sconsFlags ${sconsFlagsArray[@]} - $installFlags ${installFlagsArray[@]} - ${installTargets:-install} ) + concatTo flagsArray sconsFlags sconsFlagsArray installFlags installFlagsArray installTargets=install echoCmd 'scons install flags' "${flagsArray[@]}" scons "${flagsArray[@]}" @@ -63,9 +60,8 @@ sconsCheckPhase() { else local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES}} - $sconsFlags ${sconsFlagsArray[@]} - ${checkFlagsArray[@]} ) + concatTo flagsArray sconsFlags sconsFlagsArray checkFlagsArray checkTarget echoCmd 'scons check flags' "${flagsArray[@]}" scons "${flagsArray[@]}" diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix new file mode 100644 index 0000000000000..9b13dcf52be53 --- /dev/null +++ b/pkgs/by-name/sc/scopehal-apps/package.nix @@ -0,0 +1,79 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + gtkmm3, + cairomm, + yaml-cpp, + glfw, + libtirpc, + liblxi, + libsigcxx, + glew, + zstd, + wrapGAppsHook4, + shaderc, + vulkan-headers, + vulkan-loader, + vulkan-tools, + glslang, + spirv-tools, + ffts, +}: + +stdenv.mkDerivation rec { + pname = "scopehal-apps"; + version = "0-unstable-2024-09-16"; + + src = fetchFromGitHub { + owner = "ngscopeclient"; + repo = "scopehal-apps"; + rev = "d2a1a2f17e9398a3f60c99483dd2f6dbc2e62efc"; + hash = "sha256-FQoaTuL6mEqnH8oNXwHpDcOEAPGExqj6lhrUhZ9VAQ4="; + fetchSubmodules = true; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + shaderc + spirv-tools + wrapGAppsHook4 + ]; + + buildInputs = [ + cairomm + ffts + glew + glfw + glslang + gtkmm3 + liblxi + libsigcxx + libtirpc + vulkan-headers + vulkan-loader + vulkan-tools + yaml-cpp + zstd + ]; + + # Targets InitializeSearchPaths + postPatch = '' + substituteInPlace lib/scopehal/scopehal.cpp \ + --replace-fail '"/share/' '"/../share/' + ''; + + meta = { + description = "Advanced test & measurement remote control and analysis suite"; + homepage = "https://www.ngscopeclient.org/"; + license = lib.licenses.bsd3; + mainProgram = "ngscopeclient"; + maintainers = with lib.maintainers; [ bgamari ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index 8455b4d22648f..e089a0666072b 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -14,16 +14,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "scotch"; - version = "7.0.4"; + version = "7.0.5"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "scotch"; repo = "scotch"; rev = "v${finalAttrs.version}"; - hash = "sha256-uaox4Q9pTF1r2BZjvnU2LE6XkZw3x9mGSKLdRVUobGU="; + hash = "sha256-XXkVwTr8cbYfzXWWkPERTmjfE86JHUUuU6yxjp9k6II="; }; + outputs = [ + "bin" + "dev" + "out" + ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + nativeBuildInputs = [ cmake gfortran diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix index 347f2559c962a..0deceb3f8c4af 100644 --- a/pkgs/by-name/sc/scrcpy/package.nix +++ b/pkgs/by-name/sc/scrcpy/package.nix @@ -16,12 +16,12 @@ }: let - version = "2.6.1"; + version = "2.7"; prebuilt_server = fetchurl { name = "scrcpy-server"; inherit version; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - hash = "sha256-ynq1Cy4loOWvdZnDA4PjZZg/pbgI5lzi4cG7pb/o3Ds="; + hash = "sha256-ojxWWfNsJg8QXAItJ7yz6v/6JgcOe6qe2mbQE3ehrbo="; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = "scrcpy"; rev = "refs/tags/v${version}"; - hash = "sha256-p5OQKi6JEam+bmtMKUY9WsQlI7tpExsIZQgGdgOj2sE="; + hash = "sha256-OBMm/GkiIdZaJd9X62vY4M6FVKiHTBwqRtH220bYej4="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { # runtime dep on `adb` to push the server wrapProgram "$out/bin/scrcpy" --prefix PATH : "${android-tools}/bin" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/scrcpy-console.desktop \ --replace "/bin/bash" "${runtimeShell}" ''; diff --git a/pkgs/by-name/sc/screego/package.nix b/pkgs/by-name/sc/screego/package.nix index 56783b74febd4..4b1b21f3823a4 100644 --- a/pkgs/by-name/sc/screego/package.nix +++ b/pkgs/by-name/sc/screego/package.nix @@ -1,6 +1,6 @@ { lib, - buildGoModule, + buildGo123Module, fetchFromGitHub, fetchYarnDeps, yarnConfigHook, @@ -10,13 +10,13 @@ }: let - version = "1.10.5"; + version = "1.11.0"; src = fetchFromGitHub { owner = "screego"; repo = "server"; rev = "v${version}"; - hash = "sha256-4WF9PfG6W1BLBqgWkKhTFEzed0+jDpRFMTsHw/1lPnQ="; + hash = "sha256-PTGIcv+jgX8t37otBypuZG6DaGIeo92+w6YlRynIkZE="; }; ui = stdenv.mkDerivation { @@ -27,7 +27,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/ui/yarn.lock"; - hash = "sha256-ye8UDkal10k/5uCd0VrZsG2FJGB727q+luExFTUmB/M="; + hash = "sha256-yjHxyKEqXMxYsm+KroPB9KulfqYSOU/7ghbKnlSFrd0="; }; nativeBuildInputs = [ @@ -36,6 +36,10 @@ let nodejs ]; + preConfigure = '' + export HOME=$(mktemp -d) + ''; + installPhase = '' cp -r build $out ''; @@ -44,12 +48,12 @@ let in -buildGoModule rec { +buildGo123Module rec { inherit src version; pname = "screego-server"; - vendorHash = "sha256-ry8LO+KmNU9MKL8/buk9qriDe/zq+2uIsws6wVZmoo4="; + vendorHash = "sha256-190Fp2QtnZis0sophGwhnWhXNWLhODWlnzE3bfScZ+Q="; ldflags = [ "-s" @@ -68,6 +72,8 @@ buildGoModule rec { mv $out/bin/server $out/bin/screego ''; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Screen sharing for developers"; homepage = "https://screego.net"; diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix index b851c49a5808a..141eca8d82c7f 100644 --- a/pkgs/by-name/sc/screen-pipe/package.nix +++ b/pkgs/by-name/sc/screen-pipe/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_12_3.frameworks; [ CoreAudio @@ -65,12 +65,12 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ] ) - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib xorg.libxcb ]; - buildFeatures = lib.optional stdenv.isDarwin "metal"; + buildFeatures = lib.optional stdenv.hostPlatform.isDarwin "metal"; env = { RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix index f508ebdf7d2a8..b93266bbdc253 100644 --- a/pkgs/by-name/sc/screenly-cli/package.nix +++ b/pkgs/by-name/sc/screenly-cli/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "screenly-cli"; - version = "0.2.8"; + version = "1.0.1"; src = fetchFromGitHub { owner = "screenly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-WAdQWOrrC85DBgkZ0bU91TJgYOTdxNukis5DJngHI1s="; + hash = "sha256-7Y9n6qo5kqaV8xHYn4BFbPBF/7mCV9DJJTSz4dqrgPc="; }; - cargoHash = "sha256-fGUwMDSs5jJsAZmeHwYghXuOZFWHG6/NClhV0YcPQVg="; + cargoHash = "sha256-4fPC/BW2irA1iTKkxBhPOsxzS4uSfM3vOXhrx/7qRxg="; nativeBuildInputs = [ pkg-config @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/sc/scrutiny-collector/package.nix b/pkgs/by-name/sc/scrutiny-collector/package.nix index b0efd81f76fae..905ade381218a 100644 --- a/pkgs/by-name/sc/scrutiny-collector/package.nix +++ b/pkgs/by-name/sc/scrutiny-collector/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { vendorHash = "sha256-SiQw6pq0Fyy8Ia39S/Vgp9Mlfog2drtVn43g+GXiQuI="; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; diff --git a/pkgs/by-name/sc/scs/package.nix b/pkgs/by-name/sc/scs/package.nix index 49911355e2dbf..1ba3eb5912b8f 100644 --- a/pkgs/by-name/sc/scs/package.nix +++ b/pkgs/by-name/sc/scs/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --replace "gcc" "cc" ''; - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ blas diff --git a/pkgs/development/libraries/SDL/find-headers.patch b/pkgs/by-name/sd/SDL1/find-headers.patch similarity index 100% rename from pkgs/development/libraries/SDL/find-headers.patch rename to pkgs/by-name/sd/SDL1/find-headers.patch diff --git a/pkgs/by-name/sd/SDL1/package.nix b/pkgs/by-name/sd/SDL1/package.nix new file mode 100644 index 0000000000000..bd793b5885bb3 --- /dev/null +++ b/pkgs/by-name/sd/SDL1/package.nix @@ -0,0 +1,156 @@ +{ lib +, alsa-lib +, audiofile +, config +, darwin +, fetchpatch +, fetchurl +, libGL +, libGLU +, libICE +, libXext +, libXrandr +, libcap +, libiconv +, libpulseaudio +, pkg-config +, stdenv +# Boolean flags +, alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid +, libGLSupported ? lib.meta.availableOn stdenv.hostPlatform libGL +, openglSupport ? libGLSupported +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio +, x11Support ? !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isAndroid +}: + +# NOTE: When editing this expression see if the same change applies to +# SDL2 expression too + +let + inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT; + extraPropagatedBuildInputs = [ ] + ++ lib.optionals x11Support [ libXext libICE libXrandr ] + ++ lib.optionals (openglSupport && stdenv.hostPlatform.isLinux) [ libGL ] + # libGLU doesn’t work with Android's SDL + ++ lib.optionals (openglSupport && stdenv.hostPlatform.isLinux && (!stdenv.hostPlatform.isAndroid)) [ libGLU ] + ++ lib.optionals (openglSupport && stdenv.hostPlatform.isDarwin) [ OpenGL GLUT ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; +in +stdenv.mkDerivation (finalAttrs: { + pname = "SDL"; + version = "1.2.15"; + + src = fetchurl { + url = "https://www.libsdl.org/release/SDL-${finalAttrs.version}.tar.gz"; + hash = "sha256-1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA="; + }; + + outputs = [ "out" "dev" ]; + outputBin = "dev"; # sdl-config + + nativeBuildInputs = [ pkg-config ] + ++ lib.optional stdenv.hostPlatform.isLinux libcap; + + propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs; + + buildInputs = + [ ] + ++ lib.optionals (!stdenv.hostPlatform.isMinGW && alsaSupport) [ audiofile ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; + + configureFlags = [ + "--disable-oss" + "--disable-video-x11-xme" + "--enable-rpath" + # Building without this fails on Darwin with + # + # ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32' + # SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) + # + # Please try revert the change that introduced this comment when updating SDL. + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-x11-shared" + ++ lib.optional (!x11Support) "--without-x" + ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" + ++ lib.optional stdenv.hostPlatform.isMusl "CFLAGS=-DICONV_INBUF_NONCONST"; + + patches = [ + ./find-headers.patch + + # Fix window resizing issues, e.g. for xmonad + # Ticket: http://bugzilla.libsdl.org/show_bug.cgi?id=1430 + (fetchpatch { + name = "fix_window_resizing.diff"; + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=fix_window_resizing.diff;att=2;bug=665779"; + hash = "sha256-hj3ykyOKeDh6uPDlvwNHSowQxmR+mfhvCnHvcdhXZfw="; + }) + # Fix drops of keyboard events for SDL_EnableUNICODE + (fetchpatch { + url = "https://github.com/libsdl-org/SDL-1.2/commit/0332e2bb18dc68d6892c3b653b2547afe323854b.patch"; + hash = "sha256-5V6K0oTN56RRi48XLPQsjgLzt0a6GsjajDrda3ZEhTw="; + }) + # Ignore insane joystick axis events + (fetchpatch { + url = "https://github.com/libsdl-org/SDL-1.2/commit/ab99cc82b0a898ad528d46fa128b649a220a94f4.patch"; + hash = "sha256-8CvKHvkmidm4tFCWYhxE059hN3gwOKz6nKs5rvQ4ZKw="; + }) + # https://bugzilla.libsdl.org/show_bug.cgi?id=1769 + (fetchpatch { + url = "https://github.com/libsdl-org/SDL-1.2/commit/5d79977ec7a6b58afa6e4817035aaaba186f7e9f.patch"; + hash = "sha256-t+60bC4gLFbslXm1n9nimiFrho2DnxdWdKr4H9Yp/sw="; + }) + # Workaround X11 bug to allow changing gamma + # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222 + (fetchpatch { + name = "SDL_SetGamma.patch"; + url = "https://src.fedoraproject.org/rpms/SDL/raw/7a07323e5cec08bea6f390526f86a1ce5341596d/f/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch"; + hash = "sha256-m7ZQ5GnfGlMkKJkrBSB3GrLz8MT6njgI9jROJAbRonQ="; + }) + # Fix a build failure on OS X Mavericks + # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085 + (fetchpatch { + url = "https://github.com/libsdl-org/SDL-1.2/commit/19039324be71738d8990e91b9ba341b2ea068445.patch"; + hash = "sha256-DCWZo0LzHJoWUr/5vL5pKIEmmz3pvr4TO6Ip8WykfDI="; + }) + (fetchpatch { + url = "https://github.com/libsdl-org/SDL-1.2/commit/7933032ad4d57c24f2230db29f67eb7d21bb5654.patch"; + hash = "sha256-Knq+ceL6y/zKcfJayC2gy+DKnoa8DLslBNl3laMzwa8="; + }) + (fetchpatch { + name = "CVE-2022-34568.patch"; + url = "https://github.com/libsdl-org/SDL-1.2/commit/d7e00208738a0bc6af302723fe64908ac35b777b.patch"; + hash = "sha256-fuxXsqZW94/C8CKu9LakppCU4zHupj66O2MngQ4BO9o="; + }) + ]; + + enableParallelBuilding = true; + + postInstall = '' + moveToOutput share/aclocal "$dev" + ''; + + # See the same place in the expression for SDL2 + postFixup = let + rpath = lib.makeLibraryPath extraPropagatedBuildInputs; + in '' + for lib in $out/lib/*.so* ; do + if [[ -L "$lib" ]]; then + patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib" + fi + done + ''; + + setupHook = ./setup-hook.sh; + + passthru = { inherit openglSupport; }; + + meta = { + homepage = "http://www.libsdl.org/"; + description = "Cross-platform multimedia library"; + license = lib.licenses.lgpl21; + mainProgram = "sdl-config"; + maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ lovek323 ]); + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/pkgs/by-name/sd/SDL1/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/SDL/setup-hook.sh rename to pkgs/by-name/sd/SDL1/setup-hook.sh diff --git a/pkgs/by-name/sd/SDL2_Pango/package.nix b/pkgs/by-name/sd/SDL2_Pango/package.nix index 9fbee142d6b9c..755c0a1af463f 100644 --- a/pkgs/by-name/sd/SDL2_Pango/package.nix +++ b/pkgs/by-name/sd/SDL2_Pango/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 freetype pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; diff --git a/pkgs/by-name/sd/SDL2_gfx/package.nix b/pkgs/by-name/sd/SDL2_gfx/package.nix index d74d859fefcbc..b5a68c23e49b6 100644 --- a/pkgs/by-name/sd/SDL2_gfx/package.nix +++ b/pkgs/by-name/sd/SDL2_gfx/package.nix @@ -7,7 +7,7 @@ testers, # Boolean flags enableMmx ? stdenv.hostPlatform.isx86, - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 2af81bd18cb7d..19028ab115a07 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -14,7 +14,7 @@ zlib, # Boolean flags ## Darwin headless will hang when trying to run the SDL test program - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: let @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libwebp zlib - ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; configureFlags = [ # Disable dynamically loaded dependencies @@ -52,9 +52,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature false "tif-shared") (lib.enableFeature false "webp-shared") (lib.enableFeature enableSdltest "sdltest") - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Don't use native macOS frameworks - # Caution: do not set this as (!stdenv.isDarwin) since it would be true + # Caution: do not set this as (!stdenv.hostPlatform.isDarwin) since it would be true # outside Darwin - and ImageIO does not exist outisde Darwin (lib.enableFeature false "imageio") ]; diff --git a/pkgs/by-name/sd/SDL2_mixer/package.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix index 976dc2f5fa924..bd2894f5583d4 100644 --- a/pkgs/by-name/sd/SDL2_mixer/package.nix +++ b/pkgs/by-name/sd/SDL2_mixer/package.nix @@ -15,8 +15,8 @@ stdenv, timidity, # Boolean flags - enableSdltest ? (!stdenv.isDarwin), - enableSmpegtest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), + enableSmpegtest ? (!stdenv.hostPlatform.isDarwin), }: let @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AudioUnit CoreServices diff --git a/pkgs/by-name/sd/SDL2_net/package.nix b/pkgs/by-name/sd/SDL2_net/package.nix index 0214e2cd5b4bb..0325e6aa4c120 100644 --- a/pkgs/by-name/sd/SDL2_net/package.nix +++ b/pkgs/by-name/sd/SDL2_net/package.nix @@ -6,7 +6,7 @@ pkg-config, stdenv, # Boolean flags - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; diff --git a/pkgs/by-name/sd/SDL2_sound/package.nix b/pkgs/by-name/sd/SDL2_sound/package.nix index 14f57cb49eab1..46517c42cb32b 100644 --- a/pkgs/by-name/sd/SDL2_sound/package.nix +++ b/pkgs/by-name/sd/SDL2_sound/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "icculus"; repo = "SDL_sound"; rev = "v${version}"; - sha256 = "sha256-N2znqy58tMHgYa07vEsSedWLRhoJzDoINcsUu0UYLnA="; + hash = "sha256-N2znqy58tMHgYa07vEsSedWLRhoJzDoINcsUu0UYLnA="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # https://github.com/icculus/SDL_sound/pull/32 - fix build on darwin # can be dropped on the next update url = "https://github.com/icculus/SDL_sound/commit/c15d75b7720113b28639baad284f45f943846294.patch"; - sha256 = "sha256-4GL8unsZ7eNkzjLXq9QdaxFQMzX2tdP0cBR1jTaRLc0="; + hash = "sha256-4GL8unsZ7eNkzjLXq9QdaxFQMzX2tdP0cBR1jTaRLc0="; }) ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSDLSOUND_DECODER_MIDI=1" ]; buildInputs = [ SDL2 flac libmikmod libvorbis timidity ] - ++ lib.optionals stdenv.isDarwin [ AudioToolbox CoreAudio ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox CoreAudio ]; meta = with lib; { description = "SDL2 sound library"; diff --git a/pkgs/by-name/sd/SDL2_ttf/package.nix b/pkgs/by-name/sd/SDL2_ttf/package.nix index b4cda24402377..dcc5fee21f33d 100644 --- a/pkgs/by-name/sd/SDL2_ttf/package.nix +++ b/pkgs/by-name/sd/SDL2_ttf/package.nix @@ -10,7 +10,7 @@ stdenv, testers, # Boolean flags - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-1Iy9HOR1ueF4IGvzty1Wtm2E1E9krAWAMyg5YjTWdyM="; + hash = "sha256-1Iy9HOR1ueF4IGvzty1Wtm2E1E9krAWAMyg5YjTWdyM="; }; nativeBuildInputs = [ @@ -32,10 +32,10 @@ stdenv.mkDerivation (finalAttrs: { freetype harfbuzz ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; diff --git a/pkgs/by-name/sd/SDL_Pango/package.nix b/pkgs/by-name/sd/SDL_Pango/package.nix index 8c4160d98684a..78e5d40d0a90d 100644 --- a/pkgs/by-name/sd/SDL_Pango/package.nix +++ b/pkgs/by-name/sd/SDL_Pango/package.nix @@ -8,7 +8,7 @@ pkg-config, stdenv, # Boolean flags - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix new file mode 100644 index 0000000000000..ac7d8ff68b81f --- /dev/null +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -0,0 +1,62 @@ +{ lib +, SDL2 +, cmake +, darwin +, fetchFromGitHub +, libGLU +, libiconv +, mesa +, pkg-config +, stdenv +# Boolean flags +, libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms +, openglSupport ? libGLSupported +}: + +let + inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin) autoSignDarwinBinariesHook; +in +stdenv.mkDerivation (finalAttrs: { + pname = "SDL_compat"; + version = "1.2.68"; + + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "sdl12-compat"; + rev = "release-" + finalAttrs.version; + hash = "sha256-f2dl3L7/qoYNl4sjik1npcW/W09zsEumiV9jHuKnUmM="; + }; + + nativeBuildInputs = [ cmake pkg-config ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; + + propagatedBuildInputs = [ SDL2 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ] + ++ lib.optionals openglSupport [ libGLU ]; + + enableParallelBuilding = true; + + setupHook = ./setup-hook.sh; + + postFixup = '' + for lib in $out/lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* ; do + if [[ -L "$lib" ]]; then + ${if stdenv.hostPlatform.isDarwin then '' + install_name_tool ${lib.strings.concatMapStrings (x: " -add_rpath ${lib.makeLibraryPath [x]} ") finalAttrs.propagatedBuildInputs} "$lib" + '' else '' + patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath finalAttrs.propagatedBuildInputs}" "$lib" + ''} + fi + done + ''; + + meta = { + homepage = "https://www.libsdl.org/"; + description = "Cross-platform multimedia library - build SDL 1.2 applications against 2.0"; + license = lib.licenses.zlib; + mainProgram = "sdl-config"; + maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ peterhoeg ]); + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/sd/SDL_compat/setup-hook.sh b/pkgs/by-name/sd/SDL_compat/setup-hook.sh new file mode 100644 index 0000000000000..54a9b3e8bfab4 --- /dev/null +++ b/pkgs/by-name/sd/SDL_compat/setup-hook.sh @@ -0,0 +1,16 @@ +addSDLPath () { + if [ -e "$1/include/SDL" ]; then + export SDL_PATH="${SDL_PATH-}${SDL_PATH:+ }$1/include/SDL" + # NB this doesn’t work with split dev packages because different packages + # will contain "include/SDL/" and "lib/" directories. + # + # However the SDL_LIB_PATH is consumed by SDL itself and serves to locate + # libraries like SDL_mixer, SDL_image, etc which are not split-package + # so the check above will only trigger on them. + if [ -e "$1/lib" ]; then + export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib" + fi + fi +} + +addEnvHooks "$hostOffset" addSDLPath diff --git a/pkgs/by-name/sd/SDL_gfx/package.nix b/pkgs/by-name/sd/SDL_gfx/package.nix index 558e1943a14b6..5677d62b7b937 100644 --- a/pkgs/by-name/sd/SDL_gfx/package.nix +++ b/pkgs/by-name/sd/SDL_gfx/package.nix @@ -4,7 +4,7 @@ fetchurl, stdenv, # Boolean flags - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix index ce6824b09d0bd..fdd0b5f373acb 100644 --- a/pkgs/by-name/sd/SDL_image/package.nix +++ b/pkgs/by-name/sd/SDL_image/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature false "png-shared") (lib.enableFeature false "tif-shared") (lib.enableFeature false "webp-shared") - (lib.enableFeature (!stdenv.isDarwin) "sdltest") + (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest") ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix index 470bd5559d7c1..84af162a73846 100644 --- a/pkgs/by-name/sd/SDL_mixer/package.nix +++ b/pkgs/by-name/sd/SDL_mixer/package.nix @@ -12,8 +12,8 @@ stdenv, # Boolean flags enableNativeMidi ? false, - enableSdltest ? (!stdenv.isDarwin), - enableSmpegtest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), + enableSmpegtest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/sd/SDL_net/package.nix b/pkgs/by-name/sd/SDL_net/package.nix index 4d45ff624e8f9..369f956fdf942 100644 --- a/pkgs/by-name/sd/SDL_net/package.nix +++ b/pkgs/by-name/sd/SDL_net/package.nix @@ -5,7 +5,7 @@ pkg-config, stdenv, # Boolean flags - enableSdltest ? (!stdenv.isDarwin) + enableSdltest ? (!stdenv.hostPlatform.isDarwin) }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/sd/SDL_sound/package.nix b/pkgs/by-name/sd/SDL_sound/package.nix index b5e93b3efdf27..e2fd8000c546d 100644 --- a/pkgs/by-name/sd/SDL_sound/package.nix +++ b/pkgs/by-name/sd/SDL_sound/package.nix @@ -7,7 +7,7 @@ libvorbis, stdenv, # Boolean flags - enableSdltest ? (!stdenv.isDarwin) + enableSdltest ? (!stdenv.hostPlatform.isDarwin) }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix index a44aeaa7f05b2..bd40d331b9b97 100644 --- a/pkgs/by-name/sd/SDL_ttf/package.nix +++ b/pkgs/by-name/sd/SDL_ttf/package.nix @@ -6,7 +6,7 @@ freetype, stdenv, # Boolean flags - enableSdltest ? (!stdenv.isDarwin), + enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/sd/sd-mux-ctrl/package.nix b/pkgs/by-name/sd/sd-mux-ctrl/package.nix index e1121eadc8551..28916ed78045b 100644 --- a/pkgs/by-name/sd/sd-mux-ctrl/package.nix +++ b/pkgs/by-name/sd/sd-mux-ctrl/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.tizen.org/cgit/tools/testlab/sd-mux"; rev = "9dd189d973da64e033a0c5c2adb3d94b23153d94"; - sha256 = "0fxl8m1zkkyxkc2zi8930m0njfgnd04a22acny6vljnzag2shjvg"; + hash = "sha256-b0uoxVPfSrqNt0wJoQho9jlpQQUjofgFm93P+UNFtDs="; }; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; diff --git a/pkgs/servers/seafile-server/libevhtp.nix b/pkgs/by-name/se/seafile-server/libevhtp.nix similarity index 80% rename from pkgs/servers/seafile-server/libevhtp.nix rename to pkgs/by-name/se/seafile-server/libevhtp.nix index 97cdc0804faa7..8eb1b3e22ff52 100644 --- a/pkgs/servers/seafile-server/libevhtp.nix +++ b/pkgs/by-name/se/seafile-server/libevhtp.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libevent }: +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + libevent, +}: stdenv.mkDerivation rec { pname = "libevhtp"; @@ -24,6 +30,10 @@ stdenv.mkDerivation rec { description = "Create extremely-fast and secure embedded HTTP servers with ease"; homepage = "https://github.com/criticalstack/libevhtp"; license = licenses.bsd3; - maintainers = with maintainers; [ greizgh schmittlauch ]; + maintainers = with maintainers; [ + greizgh + schmittlauch + melvyn2 + ]; }; } diff --git a/pkgs/by-name/se/seafile-server/package.nix b/pkgs/by-name/se/seafile-server/package.nix new file mode 100644 index 0000000000000..f9510c3c5fb6c --- /dev/null +++ b/pkgs/by-name/se/seafile-server/package.nix @@ -0,0 +1,93 @@ +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + python3, + autoreconfHook, + libuuid, + libmysqlclient, + sqlite, + glib, + libevent, + libsearpc, + openssl, + fuse, + libarchive, + libjwt, + curl, + which, + vala, + cmake, + oniguruma, + nixosTests, +}: + +let + # seafile-server relies on a specific version of libevhtp. + # It contains non upstreamed patches and is forked off an outdated version. + libevhtp = import ./libevhtp.nix { + inherit + stdenv + lib + fetchFromGitHub + cmake + libevent + ; + }; +in +stdenv.mkDerivation { + pname = "seafile-server"; + version = "11.0.12"; + + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seafile-server"; + rev = "5e6c0974e6abe5d92b8ba1db41c6ddbc1029f2d5"; # using a fixed revision because upstream may re-tag releases :/ + hash = "sha256-BVa4QZiHPkqRB5FvDlCSbEVxdnyxVy2KuCDb2orRMuI="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libuuid + libmysqlclient + sqlite + glib + libsearpc + libevent + python3 + fuse + libarchive + libjwt + which + vala + libevhtp + oniguruma + ]; + + postInstall = '' + mkdir -p $out/share/seafile/sql + cp -r scripts/sql $out/share/seafile + ''; + + passthru.tests = { + inherit (nixosTests) seafile; + }; + + meta = with lib; { + description = "File syncing and sharing software with file encryption and group sharing, emphasis on reliability and high performance"; + homepage = "https://github.com/haiwen/seafile-server"; + license = licenses.agpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ + greizgh + schmittlauch + melvyn2 + ]; + mainProgram = "seaf-server"; + }; +} diff --git a/pkgs/by-name/se/seahub/package.nix b/pkgs/by-name/se/seahub/package.nix new file mode 100644 index 0000000000000..b1df123cd8147 --- /dev/null +++ b/pkgs/by-name/se/seahub/package.nix @@ -0,0 +1,88 @@ +{ + lib, + fetchFromGitHub, + python3, + makeWrapper, + nixosTests, + seafile-server, +}: +python3.pkgs.buildPythonApplication rec { + pname = "seahub"; + version = "11.0.12"; + pyproject = false; + + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seahub"; + rev = "d998361dd890cac3f6d6ebec3af47a589e0332bc"; # using a fixed revision because upstream may re-tag releases :/ + hash = "sha256-n56sRZ9TVb37JA0+12ZoF2Mt7dADjaYk7V0PmdBY0EU="; + }; + + dontBuild = true; + + doCheck = false; # disabled because it requires a ccnet environment + + nativeBuildInputs = [ makeWrapper ]; + + propagatedBuildInputs = with python3.pkgs; [ + django + future + django-compressor + django-statici18n + django-webpack-loader + django-simple-captcha + django-picklefield + django-formtools + djangosaml2 + mysqlclient + pillow + python-dateutil + djangorestframework + openpyxl + requests + requests-oauthlib + chardet + pyjwt + pycryptodome + pyopenssl + python-ldap + qrcode + pysearpc + gunicorn + markdown + bleach + + (python3.pkgs.toPythonModule (seafile-server.override { inherit python3; })) + ]; + + postPatch = '' + substituteInPlace seahub/settings.py --replace-fail "SEAFILE_VERSION = '6.3.3'" "SEAFILE_VERSION = '${version}'" + ''; + + installPhase = '' + cp -dr --no-preserve='ownership' . $out/ + wrapProgram $out/manage.py \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:" + ''; + + passthru = { + inherit python3; + pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; + tests = { + inherit (nixosTests) seafile; + }; + inherit seafile-server; + }; + + meta = with lib; { + description = "Web end of seafile server"; + homepage = "https://github.com/haiwen/seahub"; + license = licenses.asl20; + maintainers = with maintainers; [ + greizgh + schmittlauch + melvyn2 + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/se/see-cat/package.nix b/pkgs/by-name/se/see-cat/package.nix new file mode 100644 index 0000000000000..c8c213272a521 --- /dev/null +++ b/pkgs/by-name/se/see-cat/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, +}: +rustPlatform.buildRustPackage rec { + pname = "see-cat"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "guilhermeprokisch"; + repo = "see"; + rev = "v${version}"; + hash = "sha256-VCUrPCaG2fKp9vpFLzNLcfCBu2NiwdY2+bo1pd7anZY="; + }; + + cargoHash = "sha256-lfpJ40QpZ9eQhDFJjLwiDU5DmaYAqCh5iJSjZ+jj+kk="; + + nativeBuildInputs = [ + pkg-config + ]; + + meta = { + description = "Cute cat(1) for the terminal"; + longDescription = '' + see is a powerful file visualization tool for the terminal, offering + advanced code viewing capabilities, Markdown rendering, and + more. It provides syntax highlighting, emoji support, and image + rendering capabilities, offering a visually appealing way to view + various file types directly in your console. + ''; + homepage = "https://github.com/guilhermeprokisch/see"; + license = lib.licenses.mit; + mainProgram = "see"; + maintainers = with lib.maintainers; [ louis-thevenet ]; + }; +} diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 47b6e2c16c16e..4877804ef897d 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1CPUOAfBfUeZt5S8t5SM3oyrNwXKHplhHG5idVy4YrE="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index 23690ec360ab2..f277c2a007c35 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.14.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-mAMoUBvZRMdRaMKo/vsOuel+Gp6vTxdkAfd2S0DUw50="; + hash = "sha256-YnabQ8YHDsFYu5RX3E2NvPARsl+qn4688q9KxZ5Fegc="; }; - cargoHash = "sha256-ggURSlBuL+EqMK8x/T/sGsWCLNALTAtvQqHRmu0QsH0="; + cargoHash = "sha256-yD40QKceLjtq80K6I98bT27sCAkCnkRkfE3m4eGjueU="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ SystemConfiguration ] diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix index 4183e235286f7..450113dda7422 100644 --- a/pkgs/by-name/se/sequoia-sq/package.nix +++ b/pkgs/by-name/se/sequoia-sq/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-sq"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sq"; rev = "v${version}"; - hash = "sha256-D22ECJvbGbnyvusWXfU5F1aLF/ETuMyhAStT5HPWR2U="; + hash = "sha256-Zzk7cQs5zD+houNjK8s3tP9kZ2/eAUV/OE3/GrNAXk8="; }; - cargoHash = "sha256-jFpqZKyRCMkMtOezsYJy3Fy1WXUPyn709wZxuwKlSYI="; + cargoHash = "sha256-Ou+YKfEOmMTZVg9unqoOibMQYsdNAYTq4ZoOANLRk2Y="; nativeBuildInputs = [ pkg-config @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite nettle - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); checkFlags = [ # https://gitlab.com/sequoia-pgp/sequoia-sq/-/issues/297 diff --git a/pkgs/by-name/se/sequoia-wot/package.nix b/pkgs/by-name/se/sequoia-wot/package.nix index d95066972cb83..09ae4d8bd9f27 100644 --- a/pkgs/by-name/se/sequoia-wot/package.nix +++ b/pkgs/by-name/se/sequoia-wot/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration # See comment near sequoia-openpgp/crypto- buildFeatures ] ++ lib.optionals (!stdenv.targetPlatform.isWindows) [ diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index e13b53b30fdc4..e59723c24ec7a 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "serie"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lusingander"; repo = "serie"; rev = "v${version}"; - hash = "sha256-0NQ/csgAoD15fyuXCDgABF6eDEITwJk98qPL81IptJA="; + hash = "sha256-RP9Tv6IrDfawjXCQp0nB0nd7b6IwkdykHcEfGEguFHo="; }; - cargoHash = "sha256-4Mic+hFBmId01k4AmOBA2matf28Py3mVOsVNWgqaMA0="; + cargoHash = "sha256-HxIyWlFKDRod5nSENZguNYz/vn+E9Ux0K3dMhX7I/zQ="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ CoreGraphics diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix index 3040b37a2c173..8a21f6d784327 100644 --- a/pkgs/by-name/se/serpl/package.nix +++ b/pkgs/by-name/se/serpl/package.nix @@ -8,7 +8,7 @@ }: let pname = "serpl"; - version = "0.1.34"; + version = "0.3.3"; in rustPlatform.buildRustPackage { inherit pname version; @@ -16,12 +16,12 @@ rustPlatform.buildRustPackage { owner = "yassinebridi"; repo = "serpl"; rev = version; - hash = "sha256-U6fcpFe95rM3GXu7OJhhGkpV1yQNUukqRpGeOtd8UhU="; + hash = "sha256-koD5aFqL+XVxc5Iq3reTYIHiPm0z7hAQ4K59IfbY4Hg="; }; nativeBuildInputs = [ makeWrapper ]; - cargoHash = "sha256-YAp7r7I/LX/4T93auGusTLPKpuZd3XzZ4HP6gOR0DZ0="; + cargoHash = "sha256-8XYEZQfoizVmOuh0hymzMj2UDiXNkSeHqBAWOqaMY84="; postFixup = '' # Serpl needs ripgrep to function properly. diff --git a/pkgs/by-name/se/servo/Cargo.lock b/pkgs/by-name/se/servo/Cargo.lock new file mode 100644 index 0000000000000..754f6fdf97fb2 --- /dev/null +++ b/pkgs/by-name/se/servo/Cargo.lock @@ -0,0 +1,8766 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accountable-refcell" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e2bba6f21fcf0ae382750eb6d9387c42807761fa7329d3a05fcd1334e8c3f2" +dependencies = [ + "backtrace", +] + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.6.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_log-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" + +[[package]] +name = "android_logger" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826" +dependencies = [ + "android_log-sys", + "env_filter", + "log", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "app_units" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3a46058e45b48cf55b729e4ae34007fa904ea70cfcf2a0fa21dacf1441e521c" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "arboard" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" +dependencies = [ + "clipboard-win", + "core-graphics", + "image", + "log", + "objc", + "objc-foundation", + "objc_id", + "parking_lot", + "thiserror", + "windows-sys 0.48.0", + "x11rb", +] + +[[package]] +name = "arrayref" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.38.0+1.3.281" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" +dependencies = [ + "libloading", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" +dependencies = [ + "futures-io", + "futures-util", + "log", + "pin-project-lite", + "tokio", + "tokio-rustls", + "tungstenite", + "webpki-roots", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomic_refcell" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "background_hang_monitor" +version = "0.0.1" +dependencies = [ + "background_hang_monitor_api", + "backtrace", + "base", + "crossbeam-channel", + "ipc-channel", + "libc", + "log", + "mach2", + "nix", + "serde_json", + "unwind-sys", +] + +[[package]] +name = "background_hang_monitor_api" +version = "0.0.1" +dependencies = [ + "base", + "ipc-channel", + "malloc_size_of", + "malloc_size_of_derive", + "parking_lot", + "serde", + "size_of_test", + "webrender_api", +] + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.7.4", + "object", + "rustc-demangle", +] + +[[package]] +name = "base" +version = "0.0.1" +dependencies = [ + "crossbeam-channel", + "ipc-channel", + "libc", + "mach2", + "malloc_size_of", + "malloc_size_of_derive", + "parking_lot", + "serde", + "size_of_test", + "time 0.3.36", + "webrender_api", + "windows-sys 0.59.0", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.10.5", + "lazy_static", + "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + +[[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.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2", +] + +[[package]] +name = "bluetooth" +version = "0.0.1" +dependencies = [ + "bitflags 2.6.0", + "bluetooth_traits", + "blurdroid", + "blurmac", + "blurmock", + "blurz", + "embedder_traits", + "ipc-channel", + "log", + "servo_config", + "servo_rand", + "uuid", +] + +[[package]] +name = "bluetooth_traits" +version = "0.0.1" +dependencies = [ + "embedder_traits", + "ipc-channel", + "regex", + "serde", +] + +[[package]] +name = "blurdroid" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b23557dd27704797128f9db2816416bef20dad62d4a9768714eeb65f07d296" + +[[package]] +name = "blurmac" +version = "0.1.0" +dependencies = [ + "log", + "objc", +] + +[[package]] +name = "blurmock" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c150fd617830fd121919bbd500a784507e8af1bae744efcf587591c65c375d4" +dependencies = [ + "hex", +] + +[[package]] +name = "blurz" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6dae8337ff67fe8ead29a28a0115605753e6a5205d4b6017e9f42f198c3c50a" +dependencies = [ + "dbus", + "hex", +] + +[[package]] +name = "brotli" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "build-parallel" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e3ff9db740167616e528c509b3618046fc05d337f8f3182d300f4aa977d2bb" +dependencies = [ + "crossbeam-utils", + "jobserver", + "num_cpus", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byte-slice-cast" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28346c117b50270785fbc123bd6e4ecad20d0c6d5f43d081dc80a3abcc62be64" + +[[package]] +name = "bytemuck" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "calendrical_calculations" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec493b209a1b81fa32312d7ceca1b547d341c7b5f16a3edbf32b1d8b455bbdf" +dependencies = [ + "core_maths", + "displaydoc", +] + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.6.0", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "canvas" +version = "0.0.1" +dependencies = [ + "app_units", + "bitflags 2.6.0", + "byteorder", + "canvas_traits", + "crossbeam-channel", + "cssparser", + "euclid", + "fnv", + "font-kit", + "fonts", + "half", + "ipc-channel", + "log", + "lyon_geom", + "net_traits", + "num-traits", + "parking_lot", + "pathfinder_geometry", + "pixels", + "range", + "raqote", + "servo_arc", + "sparkle", + "style", + "style_traits", + "surfman", + "unicode-script", + "webrender", + "webrender_api", + "webrender_traits", + "webxr", + "webxr-api", +] + +[[package]] +name = "canvas_traits" +version = "0.0.1" +dependencies = [ + "base", + "crossbeam-channel", + "euclid", + "ipc-channel", + "malloc_size_of", + "malloc_size_of_derive", + "pixels", + "serde", + "serde_bytes", + "servo_config", + "sparkle", + "style", + "webrender_api", + "webxr-api", +] + +[[package]] +name = "cc" +version = "1.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "cgl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" +dependencies = [ + "libc", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "clang-sys" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a483f3cbf7cec2e153d424d0e92329d816becc6421389bd494375c6065921b9b" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clipboard-win" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +dependencies = [ + "error-code", +] + +[[package]] +name = "cmake" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +dependencies = [ + "cc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "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 = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "compiletest_rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b0f4b0a27f9efcea6a012305682f0f7c5691df7097b9eaf6abb50b75c89a8af" +dependencies = [ + "diff", + "filetime", + "getopts", + "lazy_static", + "libc", + "log", + "miow", + "regex", + "rustfix", + "serde", + "serde_derive", + "serde_json", + "tempfile", + "tester", + "winapi", +] + +[[package]] +name = "compositing" +version = "0.0.1" +dependencies = [ + "base", + "canvas", + "compositing_traits", + "crossbeam-channel", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "gleam", + "image", + "ipc-channel", + "keyboard-types", + "libc", + "log", + "net", + "net_traits", + "pixels", + "profile_traits", + "script_traits", + "servo-media", + "servo_config", + "servo_geometry", + "servo_url", + "style_traits", + "surfman", + "time 0.1.45", + "tracing", + "webrender", + "webrender_api", + "webrender_traits", + "webxr", +] + +[[package]] +name = "compositing_traits" +version = "0.0.1" +dependencies = [ + "base", + "crossbeam-channel", + "embedder_traits", + "euclid", + "fonts_traits", + "ipc-channel", + "keyboard-types", + "log", + "pixels", + "script_traits", + "servo_url", + "style_traits", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "constellation" +version = "0.0.1" +dependencies = [ + "background_hang_monitor", + "background_hang_monitor_api", + "backtrace", + "base", + "bluetooth_traits", + "canvas_traits", + "compositing_traits", + "crossbeam-channel", + "devtools_traits", + "embedder_traits", + "euclid", + "fonts", + "fonts_traits", + "gaol", + "http", + "ipc-channel", + "keyboard-types", + "log", + "media", + "net", + "net_traits", + "parking_lot", + "profile_traits", + "script_layout_interface", + "script_traits", + "serde", + "servo_config", + "servo_rand", + "servo_url", + "style_traits", + "tracing", + "webgpu", + "webrender", + "webrender_api", + "webrender_traits", + "webxr-api", +] + +[[package]] +name = "content-security-policy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7225464dae1993d0045c023d0975f44d63337f35f85faddb998ff9abdfcd0f" +dependencies = [ + "base64", + "bitflags 2.6.0", + "once_cell", + "percent-encoding", + "regex", + "serde", + "sha2", + "url", +] + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "time 0.3.36", + "version_check", +] + +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +dependencies = [ + "time 0.3.36", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "core-text" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" +dependencies = [ + "core-foundation", + "core-graphics", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crown" +version = "0.0.1" +dependencies = [ + "compiletest_rs", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c66d1cd8ed61bf80b38432613a7a2f09401ab8d0501110655f8b341484a3e3" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "phf 0.11.2", + "serde", + "smallvec", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "data-url" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + +[[package]] +name = "dbus" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819" +dependencies = [ + "libc", + "libdbus-sys", +] + +[[package]] +name = "deny_public_fields" +version = "0.0.1" +dependencies = [ + "syn", + "synstructure", +] + +[[package]] +name = "deny_public_fields_tests" +version = "0.0.1" +dependencies = [ + "deny_public_fields", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_common" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "devtools" +version = "0.0.1" +dependencies = [ + "base", + "chrono", + "crossbeam-channel", + "devtools_traits", + "embedder_traits", + "headers", + "http", + "ipc-channel", + "log", + "serde", + "serde_json", + "servo_config", + "servo_rand", + "servo_url", + "uuid", +] + +[[package]] +name = "devtools_traits" +version = "0.0.1" +dependencies = [ + "base", + "bitflags 2.6.0", + "http", + "ipc-channel", + "malloc_size_of", + "malloc_size_of_derive", + "serde", + "servo_url", + "time 0.1.45", + "uuid", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "diplomat" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3137c640d2bac491dbfca7f9945c948f888dd8c95bdf7ee6b164fbdfa5d3efc2" +dependencies = [ + "diplomat_core", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "diplomat-runtime" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29f9efe348e178ba77b6035bc6629138486f8b461654e7ac7ad8afaa61bd4d98" +dependencies = [ + "log", +] + +[[package]] +name = "diplomat_core" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7aca1d8f9e7b73ad61785beedc9556ad79f84b15c15abaa7041377e42284c1" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "serde", + "smallvec", + "strck_ident", + "syn", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + +[[package]] +name = "dom" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "dom_struct" +version = "0.0.1" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "domobject_derive" +version = "0.0.1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dwrote" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c" +dependencies = [ + "lazy_static", + "libc", + "serde", + "serde_derive", + "winapi", + "wio", +] + +[[package]] +name = "ecolor" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8" +dependencies = [ + "bytemuck", + "emath", +] + +[[package]] +name = "egui" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798" +dependencies = [ + "ahash", + "emath", + "epaint", + "log", + "nohash-hasher", +] + +[[package]] +name = "egui-winit" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac4e066af341bf92559f60dbdf2020b2a03c963415349af5f3f8d79ff7a4926" +dependencies = [ + "ahash", + "arboard", + "egui", + "log", + "raw-window-handle", + "smithay-clipboard", + "web-time", + "winit", +] + +[[package]] +name = "egui_glow" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2bdc8b38cfa17cc712c4ae079e30c71c00cd4c2763c9e16dc7860a02769103" +dependencies = [ + "ahash", + "bytemuck", + "egui", + "egui-winit", + "glow 0.13.1", + "log", + "memoffset", + "wasm-bindgen", + "web-sys", + "winit", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "emath" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "embedder_traits" +version = "0.0.1" +dependencies = [ + "base", + "cfg-if", + "crossbeam-channel", + "ipc-channel", + "keyboard-types", + "log", + "num-derive", + "num-traits", + "serde", + "servo_url", + "webrender_api", + "webxr-api", +] + +[[package]] +name = "encoding_c" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9af727805f3b0d79956bde5b35732669fb5c5d45a94893798e7b7e70cfbf9cc1" +dependencies = [ + "encoding_rs", +] + +[[package]] +name = "encoding_c_mem" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a80a16821fe8c7cab96e0c67b57cd7090e021e9615e6ce6ab0cf866c44ed1f0" +dependencies = [ + "encoding_rs", +] + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "epaint" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f0dcc0a0771e7500e94cd1cb797bd13c9f23b9409bdc3c824e2cbc562b7fa01" +dependencies = [ + "ab_glyph", + "ahash", + "bytemuck", + "ecolor", + "emath", + "log", + "nohash-hasher", + "parking_lot", +] + +[[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 = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + +[[package]] +name = "etagere" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e2f1e3be19fb10f549be8c1bf013e8675b4066c445e36eb76d2ebb2f54ee495" +dependencies = [ + "euclid", + "serde", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide 0.7.4", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +dependencies = [ + "cfg-if", + "libc", + "libredox 0.1.3", + "windows-sys 0.59.0", +] + +[[package]] +name = "fixed_decimal" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0febbeb1118a9ecdee6e4520ead6b54882e843dd0592ad233247dbee84c53db8" +dependencies = [ + "displaydoc", + "ryu", + "smallvec", + "writeable", +] + +[[package]] +name = "fixedbitset" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +dependencies = [ + "crc32fast", + "miniz_oxide 0.8.0", +] + +[[package]] +name = "float-ord" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "font-kit" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520" +dependencies = [ + "bitflags 2.6.0", + "byteorder", + "core-foundation", + "core-graphics", + "core-text", + "dirs", + "dwrote", + "float-ord", + "freetype-sys", + "lazy_static", + "libc", + "log", + "pathfinder_geometry", + "pathfinder_simd", + "walkdir", + "winapi", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "fonts" +version = "0.0.1" +dependencies = [ + "app_units", + "atomic_refcell", + "base", + "bitflags 2.6.0", + "byteorder", + "core-foundation", + "core-graphics", + "core-text", + "crossbeam-channel", + "cssparser", + "dwrote", + "euclid", + "fnv", + "fonts_traits", + "fontsan", + "freetype-sys", + "harfbuzz-sys", + "ipc-channel", + "itertools 0.13.0", + "libc", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "net_traits", + "parking_lot", + "range", + "serde", + "servo_allocator", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_url", + "smallvec", + "style", + "surfman", + "truetype", + "unicode-bidi", + "unicode-properties", + "unicode-script", + "url", + "webrender_api", + "webrender_traits", + "xi-unicode", + "xml-rs", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "fonts_traits" +version = "0.0.1" +dependencies = [ + "ipc-channel", + "malloc_size_of", + "malloc_size_of_derive", + "range", + "serde", + "webrender_api", +] + +[[package]] +name = "fontsan" +version = "0.5.2" +source = "git+https://github.com/servo/fontsan#8fbc406506cfd1f8ab60e625d1e926a0e72e1d8a" +dependencies = [ + "cc", + "glob", + "libc", + "miniz-sys", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "freetype" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a440748e063798e4893ceb877151e84acef9bea9a8c6800645cf3f1b3a7806e" +dependencies = [ + "freetype-sys", + "libc", +] + +[[package]] +name = "freetype-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures 0.1.31", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gaol" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061957ca7a966a39a79ebca393a9a6c7babda10bf9dd6f11d00041558d929c22" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gilrs" +version = "0.10.6" +source = "git+https://gitlab.com/gilrs-project/gilrs?rev=eafb7f2ef488874188c5d75adce9aef486be9d4e#eafb7f2ef488874188c5d75adce9aef486be9d4e" +dependencies = [ + "fnv", + "gilrs-core", + "log", + "uuid", + "vec_map", +] + +[[package]] +name = "gilrs-core" +version = "0.5.12" +source = "git+https://gitlab.com/gilrs-project/gilrs?rev=eafb7f2ef488874188c5d75adce9aef486be9d4e#eafb7f2ef488874188c5d75adce9aef486be9d4e" +dependencies = [ + "core-foundation", + "inotify", + "io-kit-sys", + "js-sys", + "libc", + "libudev-sys", + "log", + "nix", + "uuid", + "vec_map", + "wasm-bindgen", + "web-sys", + "windows 0.48.0", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "gio-sys" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "windows-sys 0.52.0", +] + +[[package]] +name = "git2" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" +dependencies = [ + "bitflags 2.6.0", + "libc", + "libgit2-sys", + "log", + "url", +] + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "gleam" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0173481f2bb6e809bf4985de2e86c83876d84d2805830e3301cd37355e897f0f" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "glib" +version = "0.19.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" +dependencies = [ + "bitflags 2.6.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.19.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glow" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f865cbd94bd355b89611211e49508da98a1fce0ad755c1e8448fb96711b24528" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glslopt" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "913662ae8335df058d56e00f11340b20fa82e03e0276587797ef325ab01e50d4" +dependencies = [ + "cc", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "gobject-sys" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.6.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "gpu-allocator" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" +dependencies = [ + "log", + "presser", + "thiserror", + "windows 0.58.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" +dependencies = [ + "bitflags 2.6.0", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "gstreamer" +version = "0.22.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca0b90646bb67fccf80d228f5333f2a0745526818ccefbf5a97326c76d30e4d" +dependencies = [ + "cfg-if", + "futures-channel", + "futures-core", + "futures-util", + "glib", + "gstreamer-sys", + "itertools 0.13.0", + "libc", + "muldiv", + "num-integer", + "num-rational", + "once_cell", + "option-operations", + "paste", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gstreamer-app" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1363313eb1931d66ac0b82c9b477fdd066af9dc118ea844966f85b6d99f261fd" +dependencies = [ + "futures-core", + "futures-sink", + "glib", + "gstreamer", + "gstreamer-app-sys", + "gstreamer-base", + "libc", +] + +[[package]] +name = "gstreamer-app-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed667453517b47754b9f9d28c096074e5d565f1cc48c6fa2483b1ea10d7688d3" +dependencies = [ + "glib-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-audio" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cae69bbfce34108009117803fb808b1ef4d88d476c9e3e2f5f536aab1f6ae75" +dependencies = [ + "cfg-if", + "glib", + "gstreamer", + "gstreamer-audio-sys", + "gstreamer-base", + "libc", + "once_cell", + "smallvec", +] + +[[package]] +name = "gstreamer-audio-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b11267dce74a92bad96fbd58c37c43e330113dc460a0771283f7d6c390b827b7" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-base" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39d55668b23fc69f1843daa42b43d289c00fe38e9586c5453b134783d2dd75a3" +dependencies = [ + "atomic_refcell", + "cfg-if", + "glib", + "gstreamer", + "gstreamer-base-sys", + "libc", +] + +[[package]] +name = "gstreamer-base-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5448abb00c197e3ad306710293bf757303cbeab4036b5ccad21c7642b8bf00c9" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-gl" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2776369ce07de81b1e6f52786caec898db5be5d4678a8104e8fcbffdae68332d" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-base", + "gstreamer-gl-sys", + "gstreamer-video", + "libc", + "once_cell", +] + +[[package]] +name = "gstreamer-gl-egl" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be51a7ceaeabf411ba01a2de5af163ea2b8d79f157d0d924b4682fd217182c15" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-egl-sys", + "libc", +] + +[[package]] +name = "gstreamer-gl-egl-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bc9d114f161ec27822c203f28e43c88b6523f31cbde29b4cb8d8378a3825a4" +dependencies = [ + "glib-sys", + "gstreamer-gl-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-gl-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "050a2cf158354bd5633079baf73d12767a5c90efc6377b4f9507aca082734286" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-gl-x11" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4867cfe9333b04ee14672001e914ea995707a8b02d7b12c1b6f3e9f4a5c4f0d" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-x11-sys", + "libc", +] + +[[package]] +name = "gstreamer-gl-x11-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c628a2a3d216df2f85d37923f65a4e0fdafe4652f7cd06c9432f8c8ce8199aa9" +dependencies = [ + "glib-sys", + "gstreamer-gl-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-player" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2811897ea4e664f508cb6eda94b42944e12a33915d10830270b4626862c44a9" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-player-sys", + "gstreamer-video", + "libc", +] + +[[package]] +name = "gstreamer-player-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "786cfe2543b8a985bbc16fb8d0595a12aeac6edb92453b30eb36631f7e34a696" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-sdp" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3358eda88536ae1540b933d70ba8efaa6e5c9e5260322021b0b47a797b2075" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-sdp-sys", +] + +[[package]] +name = "gstreamer-sdp-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d0bc7f3e5cfdca6c9c5b9e9e15f47975c951a83e32b6e4b53b0c6dc5850487" +dependencies = [ + "glib-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71f147e7c6bc9313d5569eb15da61f6f64026ec69791922749de230583a07286" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-video" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25acba301f86b02584a642de0f224317be2bd0ceec3acda49a0ef111cbced98c" +dependencies = [ + "cfg-if", + "futures-channel", + "glib", + "gstreamer", + "gstreamer-base", + "gstreamer-video-sys", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gstreamer-video-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ec210495f94cabaa45d08003081b550095c2d4ab12d5320f64856a91f3f01c" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-webrtc" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd1a55fc34cd2ba2be1dc694a49cf3be71c67cbcd28e80213123eebeb9b2b9f" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-sdp", + "gstreamer-webrtc-sys", + "libc", +] + +[[package]] +name = "gstreamer-webrtc-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49c3bdbed1d328b7823f05a079b1319eea7b452c4b6a3e6776a1788827dad96c" +dependencies = [ + "glib-sys", + "gstreamer-sdp-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "harfbuzz-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb86e2fef3ba40cebffb8fa2cba811f06aa5c5fd296a4e469473e5398d166594" +dependencies = [ + "cc", + "core-graphics", + "core-text", + "foreign-types 0.5.0", + "freetype-sys", + "pkg-config", + "winapi", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "headers" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +dependencies = [ + "base64", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "hilog" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d5646a745e293209c82e88f05b40bb596479cd84738408410ea16d5242e7ad0" +dependencies = [ + "env_filter", + "hilog-sys", + "log", +] + +[[package]] +name = "hilog-sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de0e35e8534a70b5af5ccc943ffa3e2dcfe481b2b983c9fd514d7421a46b69e" +dependencies = [ + "log", +] + +[[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 = "html5ever" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ff6858c1f7e2a470c5403091866fa95b36fe0dbac5d771f932c15e5ff1ee501" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "log", + "rustls", + "tokio", + "tokio-rustls", + "webpki-roots", +] + +[[package]] +name = "hyper_serde" +version = "0.13.2" +dependencies = [ + "cookie 0.18.1", + "headers", + "http", + "hyper", + "mime", + "serde", + "serde_bytes", + "serde_test", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2", + "dispatch", + "objc2", +] + +[[package]] +name = "icu_calendar" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7265b2137f9a36f7634a308d91f984574bbdba8cfd95ceffe1c345552275a8ff" +dependencies = [ + "calendrical_calculations", + "displaydoc", + "icu_calendar_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_calendar_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e009b7f0151ee6fb28c40b1283594397e0b7183820793e9ace3dcd13db126d0" + +[[package]] +name = "icu_capi" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f73a82a8307633c08ca119631cd90b006e448009da2d4466f7d76ca8fedf3b1" +dependencies = [ + "diplomat", + "diplomat-runtime", + "fixed_decimal", + "icu_calendar", + "icu_casemap", + "icu_collator", + "icu_collections", + "icu_datetime", + "icu_decimal", + "icu_experimental", + "icu_list", + "icu_locid", + "icu_locid_transform", + "icu_normalizer", + "icu_plurals", + "icu_properties", + "icu_provider", + "icu_provider_adapters", + "icu_segmenter", + "icu_timezone", + "log", + "simple_logger", + "tinystr", + "unicode-bidi", + "writeable", +] + +[[package]] +name = "icu_casemap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff0c8ae9f8d31b12e27fc385ff9ab1f3cd9b17417c665c49e4ec958c37da75f" +dependencies = [ + "displaydoc", + "icu_casemap_data", + "icu_collections", + "icu_locid", + "icu_properties", + "icu_provider", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_casemap_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d57966d5ab748f74513be4046867f9a20e801e2775d41f91d04a0f560b61f08" + +[[package]] +name = "icu_collator" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d370371887d31d56f361c3eaa15743e54f13bc677059c9191c77e099ed6966b2" +dependencies = [ + "displaydoc", + "icu_collator_data", + "icu_collections", + "icu_locid_transform", + "icu_normalizer", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "zerovec", +] + +[[package]] +name = "icu_collator_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee3f88741364b7d6269cce6827a3e6a8a2cf408a78f766c9224ab479d5e4ae5" + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_datetime" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d115efb85e08df3fd77e77f52e7e087545a783fffba8be80bfa2102f306b1780" +dependencies = [ + "displaydoc", + "either", + "fixed_decimal", + "icu_calendar", + "icu_datetime_data", + "icu_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_timezone", + "smallvec", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_datetime_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ba7e7f7a01269b9afb0a39eff4f8676f693b55f509b3120e43a0350a9f88bea" + +[[package]] +name = "icu_decimal" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8fd98f86ec0448d85e1edf8884e4e318bb2e121bd733ec929a05c0a5e8b0eb" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal_data", + "icu_locid_transform", + "icu_provider", + "writeable", +] + +[[package]] +name = "icu_decimal_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d424c994071c6f5644f999925fc868c85fec82295326e75ad5017bc94b41523" + +[[package]] +name = "icu_experimental" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "844ad7b682a165c758065d694bc4d74ac67f176da1c499a04d85d492c0f193b7" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_collections", + "icu_decimal", + "icu_experimental_data", + "icu_locid", + "icu_locid_transform", + "icu_normalizer", + "icu_pattern", + "icu_plurals", + "icu_properties", + "icu_provider", + "litemap", + "num-bigint", + "num-rational", + "num-traits", + "smallvec", + "tinystr", + "writeable", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_experimental_data" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c178b9a34083fca5bd70d61f647575335e9c197d0f30c38e8ccd187babc69d0" + +[[package]] +name = "icu_list" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfeda1d7775b6548edd4e8b7562304a559a91ed56ab56e18961a053f367c365" +dependencies = [ + "displaydoc", + "icu_list_data", + "icu_locid_transform", + "icu_provider", + "regex-automata 0.2.0", + "writeable", +] + +[[package]] +name = "icu_list_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1825170d2c6679cb20dbd96a589d034e49f698aed9a2ef4fafc9a0101ed298f" + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_pattern" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7f36aafd098d6717de34e668a8120822275c1fba22b936e757b7de8a2fd7e4" +dependencies = [ + "displaydoc", + "either", + "writeable", + "yoke", + "zerofrom", +] + +[[package]] +name = "icu_plurals" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a70e7c025dbd5c501b0a5c188cd11666a424f0dadcd4f0a95b7dafde3b114" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_locid_transform", + "icu_plurals_data", + "icu_provider", + "zerovec", +] + +[[package]] +name = "icu_plurals_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3e8f775b215d45838814a090a2227247a7431d74e9156407d9c37f6ef0f208" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "unicode-bidi", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "log", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_adapters" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6324dfd08348a8e0374a447ebd334044d766b1839bb8d5ccf2482a99a77c0bc" +dependencies = [ + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "icu_segmenter" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a717725612346ffc2d7b42c94b820db6908048f39434504cb130e8b46256b0de" +dependencies = [ + "core_maths", + "displaydoc", + "icu_collections", + "icu_locid", + "icu_provider", + "icu_segmenter_data", + "utf8_iter", + "zerovec", +] + +[[package]] +name = "icu_segmenter_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df" + +[[package]] +name = "icu_timezone" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa91ba6a585939a020c787235daa8aee856d9bceebd6355e283c0c310bc6de96" +dependencies = [ + "displaydoc", + "icu_calendar", + "icu_provider", + "icu_timezone_data", + "tinystr", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_timezone_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c588878c508a3e2ace333b3c50296053e6483c6a7541251b546cc59dcd6ced8e" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd69211b9b519e98303c015e21a007e293db403b6c85b9b124e133d25e242cdd" +dependencies = [ + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imsz" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a49eaebc8750bcba241df1e1e47ebb51b81eb35c65e8f11ffa0aebac353f7f" + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown", + "serde", +] + +[[package]] +name = "inotify" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "io-kit-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b" +dependencies = [ + "core-foundation-sys", + "mach2", +] + +[[package]] +name = "io-surface" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "861c6093cbc05599e66436aedf380bb0a23cec2180738393d3a340b80dd135ef" +dependencies = [ + "cgl", + "core-foundation", + "leaky-cow", + "libc", +] + +[[package]] +name = "ipc-channel" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46231d1db8ea8f874012b1b87efb9e968f763c577220372a9c7caadce1448da" +dependencies = [ + "bincode", + "crossbeam-channel", + "fnv", + "lazy_static", + "libc", + "mio", + "rand", + "serde", + "tempfile", + "uuid", + "windows 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jstraceable_derive" +version = "0.0.1" +dependencies = [ + "proc-macro2", + "syn", + "synstructure", +] + +[[package]] +name = "keyboard-types" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" +dependencies = [ + "bitflags 2.6.0", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "layout_2013" +version = "0.0.1" +dependencies = [ + "app_units", + "atomic_refcell", + "base", + "bitflags 2.6.0", + "canvas_traits", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "html5ever", + "ipc-channel", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "net_traits", + "parking_lot", + "pixels", + "profile_traits", + "range", + "rayon", + "script_layout_interface", + "script_traits", + "serde", + "serde_json", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_geometry", + "servo_url", + "size_of_test", + "smallvec", + "style", + "style_traits", + "unicode-bidi", + "unicode-script", + "webrender_api", + "webrender_traits", + "xi-unicode", +] + +[[package]] +name = "layout_2020" +version = "0.0.1" +dependencies = [ + "app_units", + "atomic_refcell", + "base", + "bitflags 2.6.0", + "canvas_traits", + "data-url", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "fxhash", + "html5ever", + "icu_segmenter", + "ipc-channel", + "itertools 0.13.0", + "log", + "net_traits", + "parking_lot", + "pixels", + "quickcheck", + "range", + "rayon", + "script_layout_interface", + "script_traits", + "serde", + "serde_json", + "servo_arc", + "servo_config", + "servo_geometry", + "servo_url", + "style", + "style_traits", + "unicode-bidi", + "unicode-script", + "url", + "webrender_api", + "webrender_traits", + "xi-unicode", +] + +[[package]] +name = "layout_thread_2013" +version = "0.0.1" +dependencies = [ + "app_units", + "base", + "crossbeam-channel", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "fxhash", + "ipc-channel", + "layout_2013", + "log", + "malloc_size_of", + "metrics", + "net_traits", + "parking_lot", + "profile_traits", + "rayon", + "script", + "script_layout_interface", + "script_traits", + "serde_json", + "servo_allocator", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_url", + "style", + "style_traits", + "time 0.3.36", + "url", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "layout_thread_2020" +version = "0.0.1" +dependencies = [ + "app_units", + "base", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "fxhash", + "ipc-channel", + "layout_2020", + "log", + "malloc_size_of", + "metrics", + "net_traits", + "parking_lot", + "profile_traits", + "script", + "script_layout_interface", + "script_traits", + "servo_allocator", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_url", + "style", + "style_traits", + "url", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "leak" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd100e01f1154f2908dfa7d02219aeab25d0b9c7fa955164192e3245255a0c73" + +[[package]] +name = "leaky-cow" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40a8225d44241fd324a8af2806ba635fc7c8a7e9a7de4d5cf3ef54e71f5926fc" +dependencies = [ + "leak", +] + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libflate" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9135df43b1f5d0e333385cb6e7897ecd1a43d7d11b91ac003f4d2c2d2401fdd" +dependencies = [ + "adler32", + "crc32fast", + "rle-decode-fast", + "take_mut", +] + +[[package]] +name = "libgit2-sys" +version = "0.17.0+1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.5.1", +] + +[[package]] +name = "libservo" +version = "0.0.1" +dependencies = [ + "background_hang_monitor", + "base", + "bluetooth", + "bluetooth_traits", + "canvas", + "canvas_traits", + "cfg-if", + "compositing", + "compositing_traits", + "constellation", + "crossbeam-channel", + "devtools", + "devtools_traits", + "embedder_traits", + "env_logger 0.10.2", + "euclid", + "fonts", + "fonts_traits", + "gaol", + "gleam", + "gstreamer", + "ipc-channel", + "keyboard-types", + "layout_thread_2013", + "layout_thread_2020", + "log", + "media", + "mozangle", + "net", + "net_traits", + "profile", + "profile_traits", + "script", + "script_layout_interface", + "script_traits", + "servo-media", + "servo-media-dummy", + "servo-media-gstreamer", + "servo_config", + "servo_geometry", + "servo_url", + "sparkle", + "style", + "style_traits", + "surfman", + "tracing", + "webdriver_server", + "webgpu", + "webrender", + "webrender_api", + "webrender_traits", + "webxr", + "webxr-api", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "libz-sys" +version = "1.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +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 = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lyon_geom" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_size_of" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "accountable-refcell", + "app_units", + "content-security-policy", + "crossbeam-channel", + "cssparser", + "dom", + "euclid", + "http", + "indexmap", + "keyboard-types", + "selectors", + "serde", + "serde_bytes", + "servo_arc", + "smallbitvec", + "smallvec", + "string_cache", + "thin-vec", + "time 0.1.45", + "tokio", + "url", + "uuid", + "void", + "webrender_api", + "xml5ever", +] + +[[package]] +name = "malloc_size_of_derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f44db74bde26fdf427af23f1d146c211aed857c59e3be750cf2617f6b0b05c94" +dependencies = [ + "proc-macro2", + "syn", + "synstructure", +] + +[[package]] +name = "malloc_size_of_tests" +version = "0.0.1" +dependencies = [ + "malloc_size_of", + "servo_arc", +] + +[[package]] +name = "markup5ever" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d581ff8be69d08a2efa23a959d81aa22b739073f749f067348bd4f4ba4b69195" +dependencies = [ + "log", + "phf 0.11.2", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "media" +version = "0.0.1" +dependencies = [ + "euclid", + "fnv", + "ipc-channel", + "log", + "serde", + "servo-media", + "servo_config", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types 0.3.2", + "log", + "objc", +] + +[[package]] +name = "metal" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "metrics" +version = "0.0.1" +dependencies = [ + "base", + "fonts_traits", + "ipc-channel", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "profile_traits", + "script_traits", + "servo_config", + "servo_url", +] + +[[package]] +name = "metrics_tests" +version = "0.0.1" +dependencies = [ + "base", + "fonts_traits", + "ipc-channel", + "metrics", + "profile_traits", + "servo_url", + "time 0.1.45", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz-sys" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + +[[package]] +name = "miow" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" +dependencies = [ + "windows-sys 0.42.0", +] + +[[package]] +name = "mozangle" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b14af7d1a65278923835af94ac23d4c3662478001ac6e78075fe1210a7067e4b" +dependencies = [ + "bindgen", + "cc", + "gl_generator", + "lazy_static", + "libz-sys", + "walkdir", +] + +[[package]] +name = "mozjs" +version = "0.14.1" +source = "git+https://github.com/servo/mozjs#d90edd169aae1e16c1ef8b7bd4b2e0d93dda8ba2" +dependencies = [ + "bindgen", + "cc", + "lazy_static", + "libc", + "log", + "mozjs_sys", +] + +[[package]] +name = "mozjs_sys" +version = "0.128.0-9" +source = "git+https://github.com/servo/mozjs#d90edd169aae1e16c1ef8b7bd4b2e0d93dda8ba2" +dependencies = [ + "bindgen", + "cc", + "encoding_c", + "encoding_c_mem", + "flate2", + "icu_capi", + "libc", + "libz-sys", + "tar", + "walkdir", +] + +[[package]] +name = "muldiv" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" + +[[package]] +name = "multimap" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" + +[[package]] +name = "naga" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "rustc-hash", + "serde", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "napi-derive-backend-ohos" +version = "0.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6b18d697bedddd2d4c9f8f76b49fe65bd81ed1c55a7eec21ba40c176c236ddc" +dependencies = [ + "convert_case", + "once_cell", + "proc-macro2", + "quote", + "regex", + "syn", +] + +[[package]] +name = "napi-derive-ohos" +version = "0.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8462d74a2d6c7a671bd610f99f9ba34c739aadd2da4d8dd9f109a7e666cc2ad2" +dependencies = [ + "cfg-if", + "convert_case", + "napi-derive-backend-ohos", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "napi-ohos" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad5a3bbb2ae61f345b8c11776f2e79fc2bb71d1901af9a5f81f03c9238a05d86" +dependencies = [ + "bitflags 2.6.0", + "ctor", + "napi-sys-ohos", + "once_cell", +] + +[[package]] +name = "napi-sys-ohos" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f101404db01422d034db5afa63eefff6d9c8f66c0894278bc456b4c30954e166" +dependencies = [ + "libloading", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "net" +version = "0.0.1" +dependencies = [ + "async-recursion", + "async-tungstenite", + "base", + "base64", + "brotli", + "bytes", + "chrono", + "content-security-policy", + "cookie 0.18.1", + "crossbeam-channel", + "data-url", + "devtools_traits", + "embedder_traits", + "flate2", + "futures 0.3.30", + "generic-array", + "headers", + "http", + "hyper", + "hyper-rustls", + "hyper_serde", + "imsz", + "ipc-channel", + "libflate", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "mime", + "mime_guess", + "net_traits", + "percent-encoding", + "pixels", + "profile_traits", + "rayon", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "servo_allocator", + "servo_arc", + "servo_config", + "servo_url", + "sha2", + "time 0.1.45", + "tokio", + "tokio-rustls", + "tokio-stream", + "tokio-test", + "tungstenite", + "url", + "uuid", + "webpki-roots", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "net_traits" +version = "0.0.1" +dependencies = [ + "base", + "content-security-policy", + "cookie 0.18.1", + "embedder_traits", + "headers", + "http", + "hyper", + "hyper_serde", + "image", + "ipc-channel", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "mime", + "num-traits", + "percent-encoding", + "pixels", + "rustls", + "serde", + "servo_arc", + "servo_rand", + "servo_url", + "url", + "uuid", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", +] + +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[package]] +name = "ohos-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "491c77f0fe6b4336266f9da68b8dffb15d3bbe19c32ac0145b861851af3c8e41" + +[[package]] +name = "ohos-vsync" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5871e38034a33e8d43c711a40d39e24fd3500f43b61b9269b8586f608a70aec3" +dependencies = [ + "ohos-sys", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openxr" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d6934d2508f94fd4cbda6c2a326f111f60ce59fd9136df6d478564397dd40" +dependencies = [ + "libc", + "libloading", + "ndk-context", + "openxr-sys", +] + +[[package]] +name = "openxr-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f10e7e38c47f2175fc39363713b656db899fa0b4a14341029702cbdfa6f44d05" +dependencies = [ + "libc", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "option-operations" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" +dependencies = [ + "paste", +] + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox 0.0.2", +] + +[[package]] +name = "ordermap" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" +dependencies = [ + "ttf-parser", +] + +[[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 0.5.1", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pathfinder_geometry" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" +dependencies = [ + "log", + "pathfinder_simd", +] + +[[package]] +name = "pathfinder_simd" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cf07ef4804cfa9aea3b04a7bbdd5a40031dbb6b4f2cbaf2b011666c80c5b4f2" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "peek-poke" +version = "0.3.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "euclid", + "peek-poke-derive", +] + +[[package]] +name = "peek-poke-derive" +version = "0.3.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", + "unicode-xid", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" +dependencies = [ + "fixedbitset 0.1.9", + "ordermap", +] + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset 0.4.2", + "indexmap", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pixels" +version = "0.0.1" +dependencies = [ + "euclid", + "image", + "ipc-channel", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "serde", + "webrender_api", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plane-split" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1f7d82649829ecdef8e258790b0587acf0a8403f0ce963473d8e918acc1643" +dependencies = [ + "euclid", + "log", + "smallvec", +] + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.4", +] + +[[package]] +name = "polling" +version = "3.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "prettyplease" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profile" +version = "0.0.1" +dependencies = [ + "base", + "ipc-channel", + "libc", + "profile_traits", + "regex", + "serde", + "serde_json", + "servo_config", + "task_info", + "tikv-jemalloc-sys", + "time 0.3.36", +] + +[[package]] +name = "profile_tests" +version = "0.0.1" +dependencies = [ + "ipc-channel", + "profile", + "profile_traits", + "servo_config", + "time 0.3.36", +] + +[[package]] +name = "profile_traits" +version = "0.0.1" +dependencies = [ + "base", + "crossbeam-channel", + "ipc-channel", + "log", + "serde", + "servo_config", + "signpost", + "time 0.3.36", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" + +[[package]] +name = "prost" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +dependencies = [ + "bytes", + "heck", + "itertools 0.10.5", + "log", + "multimap", + "once_cell", + "petgraph 0.6.5", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prost-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost", +] + +[[package]] +name = "protobuf-src" +version = "2.1.0+27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7edafa3bcc668fa93efafcbdf58d7821bbda0f4b458ac7fae3d57ec0fec8167" +dependencies = [ + "cmake", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +dependencies = [ + "memchr", +] + +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "env_logger 0.8.4", + "log", + "rand", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_isaac" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac4373cd91b4f55722c553fb0f286edbb81ef3ff6eec7b99d1898a4110a0b28" +dependencies = [ + "rand_core", +] + +[[package]] +name = "range" +version = "0.0.1" +dependencies = [ + "malloc_size_of", + "malloc_size_of_derive", + "num-traits", + "serde", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "raqote" +version = "0.8.5" +source = "git+https://github.com/jrmuizel/raqote?rev=64716c8#64716c8d68436451ca151bb0c70ba300fd964f42" +dependencies = [ + "euclid", + "font-kit", + "lyon_geom", + "pathfinder_geometry", + "png", + "sw-composite", + "typed-arena", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[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.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox 0.1.3", + "thiserror", +] + +[[package]] +name = "ref_filter_map" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5ceb840e4009da4841ed22a15eb49f64fdd00a2138945c5beacf506b2fb5ed" + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782" +dependencies = [ + "memchr", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rle-decode-fast" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.6.0", + "serde", + "serde_derive", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustfix" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f5b7fc8060f4f8373f9381a630304b42e1183535d9beb1d3f596b236c9106a" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "rustix" +version = "0.38.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "script" +version = "0.0.1" +dependencies = [ + "accountable-refcell", + "app_units", + "arrayvec", + "atomic_refcell", + "background_hang_monitor_api", + "backtrace", + "base", + "base64", + "bincode", + "bitflags 2.6.0", + "bluetooth_traits", + "canvas_traits", + "chrono", + "content-security-policy", + "cookie 0.18.1", + "crossbeam-channel", + "cssparser", + "data-url", + "deny_public_fields", + "devtools_traits", + "dom", + "dom_struct", + "domobject_derive", + "embedder_traits", + "encoding_rs", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "fxhash", + "headers", + "html5ever", + "http", + "hyper_serde", + "image", + "indexmap", + "ipc-channel", + "itertools 0.13.0", + "jstraceable_derive", + "keyboard-types", + "libc", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "media", + "metrics", + "mime", + "mime_guess", + "mozangle", + "mozjs", + "net_traits", + "num-traits", + "num_cpus", + "parking_lot", + "percent-encoding", + "phf 0.10.1", + "phf_codegen", + "phf_shared 0.11.2", + "pixels", + "profile_traits", + "range", + "ref_filter_map", + "regex", + "script_layout_interface", + "script_traits", + "selectors", + "serde", + "serde_json", + "servo-media", + "servo_allocator", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_geometry", + "servo_rand", + "servo_url", + "smallvec", + "sparkle", + "style", + "style_traits", + "swapper", + "tempfile", + "tendril", + "time 0.1.45", + "time 0.3.36", + "unicode-bidi", + "unicode-segmentation", + "url", + "utf-8", + "uuid", + "webdriver", + "webgpu", + "webrender_api", + "webrender_traits", + "webxr-api", + "xml5ever", +] + +[[package]] +name = "script_layout_interface" +version = "0.0.1" +dependencies = [ + "app_units", + "atomic_refcell", + "base", + "canvas_traits", + "crossbeam-channel", + "euclid", + "fonts", + "fonts_traits", + "html5ever", + "ipc-channel", + "libc", + "malloc_size_of", + "malloc_size_of_derive", + "metrics", + "net_traits", + "pixels", + "profile_traits", + "range", + "script_traits", + "selectors", + "serde", + "servo_arc", + "servo_atoms", + "servo_url", + "style", + "style_traits", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "script_tests" +version = "0.0.1" +dependencies = [ + "euclid", + "keyboard-types", + "script", + "servo_url", +] + +[[package]] +name = "script_traits" +version = "0.0.1" +dependencies = [ + "background_hang_monitor_api", + "base", + "bitflags 2.6.0", + "bluetooth_traits", + "canvas_traits", + "cookie 0.18.1", + "crossbeam-channel", + "devtools_traits", + "embedder_traits", + "euclid", + "fonts_traits", + "http", + "hyper_serde", + "ipc-channel", + "keyboard-types", + "libc", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "media", + "net_traits", + "pixels", + "profile_traits", + "serde", + "servo_atoms", + "servo_url", + "smallvec", + "style_traits", + "uuid", + "webdriver", + "webgpu", + "webrender_api", + "webrender_traits", + "webxr-api", +] + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sctk-adwaita" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" +dependencies = [ + "ab_glyph", + "log", + "memmap2", + "smithay-client-toolkit", + "tiny-skia", +] + +[[package]] +name = "selectors" +version = "0.24.0" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "bitflags 2.6.0", + "cssparser", + "derive_more", + "fxhash", + "log", + "new_debug_unreachable", + "phf 0.11.2", + "phf_codegen", + "precomputed-hash", + "servo_arc", + "size_of_test", + "smallvec", + "to_shmem", + "to_shmem_derive", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_test" +version = "1.0.177" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "servo-display-link" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1060be2a0bbc35e712ec35ae98119b8def1071a5f2edbe392fd4c899bc2a5f4" +dependencies = [ + "foreign-types 0.3.2", + "objc", + "objc-foundation", + "thiserror", + "time-point", +] + +[[package]] +name = "servo-media" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "once_cell", + "servo-media-audio", + "servo-media-player", + "servo-media-streams", + "servo-media-traits", + "servo-media-webrtc", +] + +[[package]] +name = "servo-media-audio" +version = "0.2.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "byte-slice-cast", + "euclid", + "log", + "num-complex", + "num-traits", + "petgraph 0.4.13", + "serde", + "serde_derive", + "servo-media-derive", + "servo-media-player", + "servo-media-streams", + "servo-media-traits", + "smallvec", + "speexdsp-resampler", +] + +[[package]] +name = "servo-media-derive" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "servo-media-dummy" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "ipc-channel", + "servo-media", + "servo-media-audio", + "servo-media-player", + "servo-media-streams", + "servo-media-traits", + "servo-media-webrtc", +] + +[[package]] +name = "servo-media-gstreamer" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "byte-slice-cast", + "glib", + "glib-sys", + "gstreamer", + "gstreamer-app", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-player", + "gstreamer-sdp", + "gstreamer-sys", + "gstreamer-video", + "gstreamer-webrtc", + "ipc-channel", + "lazy_static", + "log", + "mime", + "once_cell", + "servo-media", + "servo-media-audio", + "servo-media-gstreamer-render", + "servo-media-gstreamer-render-android", + "servo-media-gstreamer-render-unix", + "servo-media-player", + "servo-media-streams", + "servo-media-traits", + "servo-media-webrtc", + "url", +] + +[[package]] +name = "servo-media-gstreamer-render" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "gstreamer", + "gstreamer-video", + "servo-media-player", +] + +[[package]] +name = "servo-media-gstreamer-render-android" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-egl", + "gstreamer-video", + "servo-media-gstreamer-render", + "servo-media-player", +] + +[[package]] +name = "servo-media-gstreamer-render-unix" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-egl", + "gstreamer-gl-x11", + "gstreamer-video", + "servo-media-gstreamer-render", + "servo-media-player", +] + +[[package]] +name = "servo-media-player" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "ipc-channel", + "serde", + "serde_derive", + "servo-media-streams", + "servo-media-traits", +] + +[[package]] +name = "servo-media-streams" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "lazy_static", + "uuid", +] + +[[package]] +name = "servo-media-traits" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" + +[[package]] +name = "servo-media-webrtc" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "lazy_static", + "log", + "servo-media-streams", + "uuid", +] + +[[package]] +name = "servo_allocator" +version = "0.0.1" +dependencies = [ + "libc", + "tikv-jemalloc-sys", + "tikv-jemallocator", + "windows-sys 0.59.0", +] + +[[package]] +name = "servo_arc" +version = "0.2.0" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "serde", + "stable_deref_trait", +] + +[[package]] +name = "servo_atoms" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "string_cache", + "string_cache_codegen", +] + +[[package]] +name = "servo_config" +version = "0.0.1" +dependencies = [ + "dirs", + "embedder_traits", + "euclid", + "getopts", + "log", + "num_cpus", + "serde", + "serde_json", + "servo_config_plugins", + "servo_geometry", + "servo_url", + "style_config", + "url", +] + +[[package]] +name = "servo_config_plugins" +version = "0.0.1" +dependencies = [ + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "servo_geometry" +version = "0.0.1" +dependencies = [ + "app_units", + "euclid", + "malloc_size_of", + "malloc_size_of_derive", + "webrender_api", +] + +[[package]] +name = "servo_rand" +version = "0.0.1" +dependencies = [ + "log", + "rand", + "rand_core", + "rand_isaac", + "uuid", +] + +[[package]] +name = "servo_url" +version = "0.0.1" +dependencies = [ + "malloc_size_of", + "malloc_size_of_derive", + "serde", + "servo_arc", + "servo_rand", + "to_shmem", + "url", + "uuid", +] + +[[package]] +name = "servoshell" +version = "0.0.1" +dependencies = [ + "android_logger", + "arboard", + "backtrace", + "cc", + "cfg-if", + "egui", + "egui-winit", + "egui_glow", + "env_filter", + "euclid", + "getopts", + "gilrs", + "gl_generator", + "gleam", + "glow 0.13.1", + "headers", + "hilog", + "http", + "image", + "ipc-channel", + "jni", + "keyboard-types", + "libc", + "libloading", + "libservo", + "log", + "mime_guess", + "napi-derive-ohos", + "napi-ohos", + "net", + "net_traits", + "nix", + "ohos-sys", + "ohos-vsync", + "raw-window-handle", + "serde_json", + "servo-media", + "servo_allocator", + "shellwords", + "sig", + "surfman", + "tinyfiledialogs", + "tokio", + "tracing", + "tracing-perfetto", + "tracing-subscriber", + "url", + "vergen", + "webxr", + "windows-sys 0.59.0", + "winit", + "winres", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellwords" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e515aa4699a88148ed5ef96413ceef0048ce95b43fbc955a33bde0a70fcae6" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "sig" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6567e29578f9bfade6a5d94a32b9a4256348358d2a3f448cab0021f9a02614a2" +dependencies = [ + "libc", +] + +[[package]] +name = "signpost" +version = "0.1.0" +source = "git+https://github.com/pcwalton/signpost.git#7ed712507f343c38646b9d1fefd049166f9c9a18" + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simple_logger" +version = "4.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e7e46c8c90251d47d08b28b8a419ffb4aede0f87c2eea95e17d1d5bacbf3ef1" +dependencies = [ + "colored", + "log", + "time 0.3.36", + "windows-sys 0.48.0", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "size_of_test" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallbitvec" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3fc564a4b53fd1e8589628efafe57602d91bde78be18186b5f61e8faea470" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.6.0", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +dependencies = [ + "libc", + "smithay-client-toolkit", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "sparkle" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fc6c6346da9177de9894230716709c223c62adbf910a5c1e6096b2ee2e58e0" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "speexdsp-resampler" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72d540d5c565dbe1f891d7e21ceb21d2649508306782f1066989fccb0b363d3" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "static_prefs" +version = "0.1.0" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" + +[[package]] +name = "strck" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be91090ded9d8f979d9fe921777342d37e769e0b6b7296843a7a38247240e917" + +[[package]] +name = "strck_ident" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1c3802b169b3858a44667f221c9a0b3136e6019936ea926fc97fbad8af77202" +dependencies = [ + "strck", + "unicode-ident", +] + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "style" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "app_units", + "arrayvec", + "atomic_refcell", + "bitflags 2.6.0", + "byteorder", + "cssparser", + "derive_more", + "dom", + "encoding_rs", + "euclid", + "fxhash", + "icu_segmenter", + "indexmap", + "itertools 0.10.5", + "itoa", + "lazy_static", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "markup5ever", + "matches", + "mime", + "new_debug_unreachable", + "num-derive", + "num-integer", + "num-traits", + "num_cpus", + "parking_lot", + "precomputed-hash", + "rayon", + "rayon-core", + "selectors", + "serde", + "servo_arc", + "servo_atoms", + "smallbitvec", + "smallvec", + "static_assertions", + "static_prefs", + "string_cache", + "style_config", + "style_derive", + "style_traits", + "thin-vec", + "time 0.1.45", + "to_shmem", + "to_shmem_derive", + "uluru", + "unicode-bidi", + "url", + "void", + "walkdir", +] + +[[package]] +name = "style_config" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "style_derive" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "darling", + "derive_common", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "style_tests" +version = "0.0.1" +dependencies = [ + "app_units", + "cssparser", + "euclid", + "html5ever", + "rayon", + "selectors", + "serde_json", + "servo_arc", + "servo_atoms", + "style", + "style_traits", + "url", +] + +[[package]] +name = "style_traits" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "app_units", + "bitflags 2.6.0", + "cssparser", + "euclid", + "lazy_static", + "malloc_size_of", + "malloc_size_of_derive", + "selectors", + "serde", + "servo_arc", + "servo_atoms", + "size_of_test", + "thin-vec", + "to_shmem", + "to_shmem_derive", + "url", + "webrender_api", +] + +[[package]] +name = "surfman" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb5f2d85c044920e1f2aaf5ad3795ae3b935025297271f2eadb021931571b4c3" +dependencies = [ + "bitflags 2.6.0", + "cfg_aliases 0.2.1", + "cgl", + "cocoa", + "core-foundation", + "core-graphics", + "euclid", + "fnv", + "gl_generator", + "io-surface", + "lazy_static", + "libc", + "log", + "mach2", + "metal 0.24.0", + "objc", + "raw-window-handle", + "servo-display-link", + "sparkle", + "wayland-sys 0.30.1", + "winapi", + "wio", + "x11", +] + +[[package]] +name = "svg_fmt" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" + +[[package]] +name = "sw-composite" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ac8fb7895b4afa060ad731a32860db8755da3449a47e796d5ecf758db2671d4" + +[[package]] +name = "swapper" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e454d048db5527d000bfddb77bd072bbf3a1e2ae785f16d9bd116e07c2ab45eb" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml 0.8.9", + "version-compare", +] + +[[package]] +name = "take_mut" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" + +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "task_info" +version = "0.0.1" +dependencies = [ + "cc", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "encoding_rs", + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "tester" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e8bf7e0eb2dd7b4228cc1b6821fc5114cd6841ae59f652a85488c016091e5f" +dependencies = [ + "cfg-if", + "getopts", + "libc", + "num_cpus", + "term", +] + +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread-id" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe8f25bbdd100db7e1d34acf7fd2dc59c4bf8f7483f505eaa7d4f12f76cc0ea" +dependencies = [ + "libc", + "winapi", +] + +[[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 = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "time-point" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06535c958d6abe68dc4b4ef9e6845f758fc42fe463d0093d0aca40254f03fb14" + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinyfiledialogs" +version = "3.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "848eb50d6d21430349d82418c2244f611b1ad3e1c52c675320338b3102d06554" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "to_shmem" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "cssparser", + "servo_arc", + "smallbitvec", + "smallvec", + "string_cache", + "thin-vec", +] + +[[package]] +name = "to_shmem_derive" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "darling", + "derive_common", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-test" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "topological-sort" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa7c7f42dea4b1b99439786f5633aeb9c14c1b53f75e282803c2ec2ad545873c" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-perfetto" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd21777b526dfcb57f11f65aa8a2024d83e1db52841993229b6e282e511978b7" +dependencies = [ + "anyhow", + "bytes", + "chrono", + "prost", + "prost-build", + "protobuf-src", + "rand", + "thread-id", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracy-rs" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce607aae8ab0ab3abf3a2723a9ab6f09bb8639ed83fdd888d857b8e556c868d8" + +[[package]] +name = "truetype" +version = "0.47.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fb887b8a8ee8832e5810114ad4ef84d89f0aae569d198baee7fb7f7363a4ca4" +dependencies = [ + "typeface", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "ttf-parser" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" + +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "rustls", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "typeface" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fdbc53aae2bf36c48f1bc36d73a62b84091b6535b08e4e15bca876ce5e8050" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uluru" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c8a2469e56e6e5095c82ccd3afb98dad95f7af7929aab6d8ba8d6e0f73657da" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +dependencies = [ + "serde", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-properties" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" + +[[package]] +name = "unicode-script" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" + +[[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 = "unicode-xid" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "unwind-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7a81ba64bc45243d442e9bb2a362f303df152b5078c56ce4a0dc7d813c8df91" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "url" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "vergen" +version = "8.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" +dependencies = [ + "anyhow", + "cfg-if", + "git2", + "rustversion", + "time 0.3.36", +] + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "warp" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "headers", + "http", + "hyper", + "log", + "mime", + "mime_guess", + "percent-encoding", + "pin-project", + "scoped-tls", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-util", + "tower-service", + "tracing", +] + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "wayland-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.5", +] + +[[package]] +name = "wayland-client" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" +dependencies = [ + "bitflags 2.6.0", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.6.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" +dependencies = [ + "rustix", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "lazy_static", + "log", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webdriver" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc8773336cf1ad6ffadae7d73fea436e5c4d6345a467292902876cb0f7b72107" +dependencies = [ + "base64", + "bytes", + "cookie 0.16.2", + "http", + "log", + "serde", + "serde_derive", + "serde_json", + "time 0.3.36", + "tokio", + "tokio-stream", + "unicode-segmentation", + "url", + "warp", +] + +[[package]] +name = "webdriver_server" +version = "0.0.1" +dependencies = [ + "base", + "base64", + "compositing_traits", + "cookie 0.18.1", + "crossbeam-channel", + "euclid", + "http", + "image", + "ipc-channel", + "keyboard-types", + "log", + "net_traits", + "pixels", + "script_traits", + "serde", + "serde_json", + "servo_config", + "servo_url", + "style_traits", + "uuid", + "webdriver", +] + +[[package]] +name = "webgpu" +version = "0.0.1" +dependencies = [ + "arrayvec", + "base", + "euclid", + "ipc-channel", + "log", + "malloc_size_of", + "serde", + "servo_config", + "smallvec", + "webrender", + "webrender_api", + "webrender_traits", + "wgpu-core", + "wgpu-types", +] + +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webrender" +version = "0.65.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "bincode", + "bitflags 2.6.0", + "build-parallel", + "byteorder", + "derive_more", + "etagere", + "euclid", + "fxhash", + "gleam", + "glslopt", + "lazy_static", + "log", + "malloc_size_of_derive", + "num-traits", + "peek-poke", + "plane-split", + "rayon", + "ron", + "serde", + "smallvec", + "svg_fmt", + "time 0.1.45", + "topological-sort", + "tracy-rs", + "webrender_api", + "webrender_build", + "wr_glyph_rasterizer", + "wr_malloc_size_of", +] + +[[package]] +name = "webrender_api" +version = "0.65.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "app_units", + "bitflags 2.6.0", + "byteorder", + "crossbeam-channel", + "euclid", + "malloc_size_of_derive", + "peek-poke", + "serde", + "serde_bytes", + "serde_derive", + "time 0.1.45", + "wr_malloc_size_of", +] + +[[package]] +name = "webrender_build" +version = "0.0.2" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "bitflags 2.6.0", + "lazy_static", +] + +[[package]] +name = "webrender_traits" +version = "0.0.1" +dependencies = [ + "base", + "crossbeam-channel", + "embedder_traits", + "euclid", + "ipc-channel", + "libc", + "log", + "serde", + "surfman", + "webrender_api", +] + +[[package]] +name = "webxr" +version = "0.0.1" +source = "git+https://github.com/servo/webxr#1a2186a5b33ae9e2e0b4fc15e9dc6095ae2e5fd0" +dependencies = [ + "crossbeam-channel", + "euclid", + "log", + "openxr", + "serde", + "sparkle", + "surfman", + "webxr-api", + "winapi", + "wio", +] + +[[package]] +name = "webxr-api" +version = "0.0.1" +source = "git+https://github.com/servo/webxr#1a2186a5b33ae9e2e0b4fc15e9dc6095ae2e5fd0" +dependencies = [ + "euclid", + "ipc-channel", + "log", + "serde", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "wgpu-core" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "document-features", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot", + "profiling", + "ron", + "rustc-hash", + "serde", + "smallvec", + "thiserror", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.6.0", + "block", + "cfg_aliases 0.1.1", + "core-graphics-types", + "glow 0.14.0", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "js-sys", + "khronos-egl", + "libc", + "libloading", + "log", + "metal 0.29.0", + "naga", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "windows 0.58.0", + "windows-core 0.58.0", +] + +[[package]] +name = "wgpu-types" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" +dependencies = [ + "bitflags 2.6.0", + "js-sys", + "serde", + "web-sys", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winit" +version = "0.29.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.6.0", + "bytemuck", + "calloop", + "cfg_aliases 0.1.1", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2", + "ndk", + "ndk-sys", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "rustix", + "sctk-adwaita", + "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winres" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + +[[package]] +name = "wr_glyph_rasterizer" +version = "0.1.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "core-foundation", + "core-graphics", + "core-text", + "dwrote", + "euclid", + "freetype", + "fxhash", + "lazy_static", + "libc", + "log", + "malloc_size_of_derive", + "objc", + "rayon", + "serde", + "smallvec", + "tracy-rs", + "webrender_api", + "wr_malloc_size_of", +] + +[[package]] +name = "wr_malloc_size_of" +version = "0.0.3" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "app_units", + "euclid", +] + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +dependencies = [ + "either", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading", + "once_cell", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xcursor" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" + +[[package]] +name = "xi-unicode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.6.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" + +[[package]] +name = "xml-rs" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" + +[[package]] +name = "xml5ever" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b906d34d867d216b2d79fb0e9470aaa7f4948ea86b44c27846efedd596076c" +dependencies = [ + "log", + "mac", + "markup5ever", +] + +[[package]] +name = "yeslogic-fontconfig-sys" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503a066b4c037c440169d995b869046827dbc71263f6e8f3be6d77d4f3229dbd" +dependencies = [ + "dlib", + "once_cell", + "pkg-config", +] + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix new file mode 100644 index 0000000000000..fc586d5ddcd91 --- /dev/null +++ b/pkgs/by-name/se/servo/package.nix @@ -0,0 +1,155 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + + # build deps + cargo-deny, + cmake, + dbus, + gcc, + git, + gnumake, + libxkbcommon, + llvm, + llvmPackages, + m4, + makeWrapper, + perl, + pkg-config, + python3, + taplo, + vulkan-loader, + which, + yasm, + zlib, + + # runtime deps + darwin, + fontconfig, + freetype, + gst_all_1, + libGL, + libunwind, + udev, + wayland, + xorg, +}: + +let + customPython = python3.withPackages ( + ps: with ps; [ + dbus + packaging + pip + six + virtualenv + ] + ); + runtimePaths = lib.makeLibraryPath [ + xorg.libXcursor + xorg.libXrandr + xorg.libXi + libxkbcommon + vulkan-loader + wayland + libGL + ]; +in + +rustPlatform.buildRustPackage { + pname = "servo"; + version = "0-unstable-2024-09-09"; + + src = fetchFromGitHub { + owner = "servo"; + repo = "servo"; + rev = "938fd8c12fc2489303e12538d3e3585bd771141f"; + hash = "sha256-CrpEBFYd8Qd0rxSnT81IvtxxEuYG0jWGJeHISvxalyY="; + }; + + # need to use a `Cargo.lock` as there are git dependencies + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "derive_common-0.0.1" = "sha256-z0I2fQQlbUqaFU1EX45eYDy5IbZJ4SIget7WHzq4St0="; + "fontsan-0.5.2" = "sha256-4id66xxQ8iu0+OvJKH77WYPUE0eoVa9oUHmr6lRFPa8="; + "gilrs-0.10.6" = "sha256-RIfowFShWTPqgVWliK8Fc4cJw0YKITLvmexmTC0SwQk="; + "mozjs-0.14.1" = "sha256-RMM28Rd0r58VLfNEJzjWw3Ze6oKEi5lC1Edv03tJbfY="; + "peek-poke-0.3.0" = "sha256-WCZYX68vZrPhaAZwpx9/lUp3bVsLMwtmlJSW8wNb2ks="; + "servo-media-0.1.0" = "sha256-+J/6ZJPM9eus6YHJA6ENJD63CBiJTtKZdfORq9n6Nf8="; + "signpost-0.1.0" = "sha256-xRVXwW3Gynace9Yk5r1q7xA60yy6xhC5wLAyMJ6rPRs="; + "webxr-0.0.1" = "sha256-HZ8oWm5BaBLBXo4dS2CbWjpExry7dzeB2ddRLh7+98w="; + "naga-22.0.0" = "sha256-Xi2lWZCv4V2mUbQmwV1aw3pcvIIcyltKvv/C+LVqqDI="; + "raqote-0.8.5" = "sha256-WLsz5q08VNmYBxUhQ0hOn0K0RVFnnjaWF/MuQGkO/Rg="; + }; + }; + + # Remap absolute path between modules to include SEMVER + # set `HOME` to a temp dir for write access + # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) + preConfigure = '' + sed -i -e 's/\/style\//\/style-0.0.1\//g' ../cargo-vendor-dir/servo_atoms-0.0.1/build.rs + export HOME=$TMPDIR + unset AS + ''; + + nativeBuildInputs = [ + cargo-deny + cmake + customPython + dbus + gcc + git + gnumake + llvm + llvmPackages.libstdcxxClang + m4 + makeWrapper + perl + pkg-config + python3 + taplo + which + yasm + zlib + ]; + + buildInputs = [ + fontconfig + freetype + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + libunwind + udev + wayland + libGL + xorg.libX11 + xorg.libxcb + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]); + + # copy resources into `$out` to be used during runtime + # link runtime libraries + postFixup = '' + mkdir -p $out/resources + cp -r ./resources $out/ + + wrapProgram $out/bin/servo \ + --prefix LD_LIBRARY_PATH : ${runtimePaths} + ''; + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + + meta = { + description = "The embeddable, independent, memory-safe, modular, parallel web rendering engine"; + homepage = "https://servo.org"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ supinie ]; + mainProgram = "servo"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix index 4460337967c12..ff5ce98448bfb 100644 --- a/pkgs/by-name/se/sesh/package.nix +++ b/pkgs/by-name/se/sesh/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "sesh"; - version = "1.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "joshmedeski"; repo = "sesh"; rev = "v${version}"; - hash = "sha256-nihyctFnDRLiDgHeXfn/q4G5IVEAOxh9MqFcsInK9UI="; + hash = "sha256-62w4I49ahXC4IHy0i/V4tArCqrg2Rch6f+IM/YoFQh8="; }; - vendorHash = "sha256-zt1/gE4bVj+3yr9n0kT2FMYMEmiooy3k1lQ77rN6sTk="; + vendorHash = "sha256-a45P6yt93l0CnL5mrOotQmE/1r0unjoToXqSJ+spimg="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/sf/sfcgal/cmake-fix.patch b/pkgs/by-name/sf/sfcgal/cmake-fix.patch new file mode 100644 index 0000000000000..7ba92b0cf1c47 --- /dev/null +++ b/pkgs/by-name/sf/sfcgal/cmake-fix.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3babfae..11ea637c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -209,7 +209,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})") + endif() + +-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") ++SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + #SET(CMAKE_MACOSX_RPATH ON) + +diff --git a/sfcgal-config.in b/sfcgal-config.in +index a0e992c5..49615c13 100755 +--- a/sfcgal-config.in ++++ b/sfcgal-config.in +@@ -1,6 +1,6 @@ + #!/bin/sh + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + + usage() + { +diff --git a/sfcgal.pc.in b/sfcgal.pc.in +index 968cb407..bf517d02 100644 +--- a/sfcgal.pc.in ++++ b/sfcgal.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + includedir=${prefix}/include + + Name: sfcgal diff --git a/pkgs/by-name/sf/sfcgal/package.nix b/pkgs/by-name/sf/sfcgal/package.nix new file mode 100644 index 0000000000000..50efa9ac749e1 --- /dev/null +++ b/pkgs/by-name/sf/sfcgal/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitLab, + cmake, + cgal, + boost, + mpfr, + gmp, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sfcgal"; + version = "1.5.2"; + + src = fetchFromGitLab { + owner = "sfcgal"; + repo = "SFCGAL"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-fK1PfLm6n05PhH/sT6N/hQtH5Z6+Xc1nUCS1NYpLDcY="; + }; + + buildInputs = [ + cgal + boost + mpfr + gmp + ]; + + nativeBuildInputs = [ cmake ]; + + patches = [ ./cmake-fix.patch ]; + + meta = { + description = "C++ wrapper library around CGAL with the aim of supporting ISO 191007:2013 and OGC Simple Features for 3D operations"; + homepage = "https://sfcgal.gitlab.io/SFCGAL/"; + changelog = "https://gitlab.com/sfcgal/SFCGAL/-/releases/v${finalAttrs.version}"; + license = lib.licenses.lgpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.fqidz ]; + }; +}) diff --git a/pkgs/by-name/sg/sgfutils/package.nix b/pkgs/by-name/sg/sgfutils/package.nix index f82bc4e59a6ab..586a3ab1e096d 100644 --- a/pkgs/by-name/sg/sgfutils/package.nix +++ b/pkgs/by-name/sg/sgfutils/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation hash = "sha256-KWYgTxz32WK3MKouj1WAJtZmleKt5giCpzQPwfWruZQ="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildPhase = '' runHook preBuild make all diff --git a/pkgs/by-name/sh/shab/package.nix b/pkgs/by-name/sh/shab/package.nix index bbc60921903d6..25e2baf034e20 100644 --- a/pkgs/by-name/sh/shab/package.nix +++ b/pkgs/by-name/sh/shab/package.nix @@ -10,7 +10,7 @@ let owner = "zimbatm"; repo = "shab"; rev = "v${version}"; - sha256 = "02lf1s6plhhcfyj9xha44wij9jbphb1x5q55xj3b5bx2ji2jsvji"; + hash = "sha256-UW4tRZSir7KG7KXg0sOCd8kkIydEwZ6kdwxCeo0Ojgo="; }; postPatch = '' diff --git a/pkgs/by-name/sh/shapelib/package.nix b/pkgs/by-name/sh/shapelib/package.nix index 8bcf103d8403f..fe93064e3f1f1 100644 --- a/pkgs/by-name/sh/shapelib/package.nix +++ b/pkgs/by-name/sh/shapelib/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.osgeo.org/shapelib/shapelib-${version}.tar.gz"; - sha256 = "sha256-XakKYOJUQPEI9OjpVzK/qD7eE8jgwrz4CuQQBsyOvCA="; + hash = "sha256-XakKYOJUQPEI9OjpVzK/qD7eE8jgwrz4CuQQBsyOvCA="; }; doCheck = true; diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix index 093bbaf33270e..4f3cda10bd763 100644 --- a/pkgs/by-name/sh/share-preview/package.nix +++ b/pkgs/by-name/sh/share-preview/package.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libadwaita openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.SystemConfiguration ]; env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ] + lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ] ); meta = { diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix index c038301d52d54..1bc064992f5d6 100644 --- a/pkgs/by-name/sh/shellcheck-sarif/package.nix +++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix @@ -7,14 +7,14 @@ }: rustPlatform.buildRustPackage rec { pname = "shellcheck-sarif"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit pname version; - hash = "sha256-fvOxZd6xLyOm1OjK24Xx6uHz2e8eyIklX1kUAuRGcyY="; + hash = "sha256-NPf8BkrpqM/MaVha9/AIuUXPQpslslLFv0l9a0lzYyc="; }; - cargoHash = "sha256-jHOCjZ6NAU8YmAc2T1aCSaa2Yx9wkP361LZ2MKAWVLA="; + cargoHash = "sha256-YUyZZcSaBqnc216Hu+BAv1raNFRzSnikedr+/n8wTbE="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/sh/sherlock/package.nix b/pkgs/by-name/sh/sherlock/package.nix index 9d96cc3da3828..50421ff991b6e 100644 --- a/pkgs/by-name/sh/sherlock/package.nix +++ b/pkgs/by-name/sh/sherlock/package.nix @@ -64,7 +64,6 @@ python3.pkgs.buildPythonApplication rec { jsonschema openpyxl stem - pythonRelaxDepsHook ]; pythonRelaxDeps = [ "stem" ]; diff --git a/pkgs/applications/file-managers/shfm/default.nix b/pkgs/by-name/sh/shfm/package.nix similarity index 100% rename from pkgs/applications/file-managers/shfm/default.nix rename to pkgs/by-name/sh/shfm/package.nix diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix index bb5227ad89a45..09bcb4447aed1 100644 --- a/pkgs/by-name/sh/shotcut/package.nix +++ b/pkgs/by-name/sh/shotcut/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "24.06.26"; + version = "24.09.13"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${finalAttrs.version}"; - hash = "sha256-9eQF3s4BAUK81/94z7cMkd2NWdNLVMraP08qsDmuAI8="; + hash = "sha256-hYpb3ZCRXd07KQVZ3xpNeEJY5HFLNDsqpPJp3b9UXtE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix index 7faf5dec439e8..b9842ae0a66bd 100644 --- a/pkgs/by-name/sh/showmethekey/package.nix +++ b/pkgs/by-name/sh/showmethekey/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "showmethekey"; rev = "refs/tags/v${version}"; - hash = "sha256-kifUp/neqTBPRuZKqNdW6JOinzh9LKfppyvW9AgxAYo="; + hash = "sha256-uBhciNkDBXrME8YRztlUdm3oV2y8YiA9Fhib9KLVeBY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix index 34c59c05c563a..2cb4489cff97a 100644 --- a/pkgs/by-name/sh/shpool/package.nix +++ b/pkgs/by-name/sh/shpool/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "shpool"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { owner = "shell-pool"; repo = "shpool"; rev = "v${version}"; - hash = "sha256-RzXlwzCMZ5nDnNfQHzqY9Wu7gvG8y39yR2W3cfl208w="; + hash = "sha256-0ykGGzYL29SxxT0etTaBHooIE8NEUJeTIr/6vTBgY0Q="; }; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin/shpool' "$out/bin/shpool" ''; - cargoHash = "sha256-Xb/ohGzgXR8B6Zfd2pUqgpxK6WQnk2xF4bbCyz1g2os="; + cargoHash = "sha256-cuLscDki8Y68qtEZh7xDaLp5B6MyTkPWTQX5gHNtULQ="; buildInputs = [ linux-pam diff --git a/pkgs/by-name/si/sieve-editor-gui/package.nix b/pkgs/by-name/si/sieve-editor-gui/package.nix new file mode 100644 index 0000000000000..ee374f8351699 --- /dev/null +++ b/pkgs/by-name/si/sieve-editor-gui/package.nix @@ -0,0 +1,70 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + electron, + nodejs_20, + nodePackages, + makeDesktopItem, + copyDesktopItems, +}: +buildNpmPackage rec { + pname = "sieve-editor-gui"; + version = "0.6.1-unstable-2024-01-06"; + nodejs = nodejs_20; + + src = fetchFromGitHub { + owner = "thsmi"; + repo = "sieve"; + rev = "5879679ed8d16a34af760ee56bfec16a1a322b4e"; + hash = "sha256-wl6dwKoGan+DrpXk2p1fD/QN/C2qT4h/g3N73gF8sOI="; + }; + + npmDepsHash = "sha256-a2I9csxFZJekG1uCOHqdRaLLi5v/BLTz4SU+uBd855A="; + + nativeBuildInputs = [ + electron + copyDesktopItems + nodePackages.gulp + ]; + + dontNpmBuild = true; + + buildPhase = '' + gulp -LLLL app:package + ''; + + installPhase = '' + runHook preInstall + mv build/ $out + runHook postInstall + ''; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + }; + + desktopItems = [ + (makeDesktopItem { + name = "sieve-editor-gui"; + exec = "sieve-editor-gui"; + desktopName = "Sieve Editor"; + icon = "sieve-editor-gui"; + categories = [ "Utility" ]; + }) + ]; + + postInstall = '' + makeWrapper ${lib.getExe electron} $out/bin/sieve-editor-gui \ + --add-flags $out/electron/resources/main_esm.js + ''; + + meta = { + description = "Activate, edit, delete and add Sieve scripts with a convenient interface"; + homepage = "https://github.com/thsmi/sieve"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ Silver-Golden ]; + platforms = lib.platforms.linux; + mainProgram = "sieve-editor-gui"; + }; +} diff --git a/pkgs/by-name/si/sig/package.nix b/pkgs/by-name/si/sig/package.nix new file mode 100644 index 0000000000000..c3f053ae53a46 --- /dev/null +++ b/pkgs/by-name/si/sig/package.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "sig"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "ynqa"; + repo = "sig"; + rev = "v${version}"; + hash = "sha256-nt/KV4ohFNZTJTwbNoSxb5v9zQwp+7ypvfMthL1yMus="; + }; + + cargoHash = "sha256-gZZ2aOsqVqGN3gCBZnBXzlFicMssNIEyRT688OuNMJc="; + + meta = { + description = "Interactive grep (for streaming)"; + homepage = "https://github.com/ynqa/sig"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qaidvoid ]; + mainProgram = "sig"; + }; +} diff --git a/pkgs/by-name/si/signal-backup-deduplicator/package.nix b/pkgs/by-name/si/signal-backup-deduplicator/package.nix index d5efff9e3f4d8..5c098d7d46dfe 100644 --- a/pkgs/by-name/si/signal-backup-deduplicator/package.nix +++ b/pkgs/by-name/si/signal-backup-deduplicator/package.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { mainProgram = "signal_backup_deduplicate"; platforms = lib.platforms.all; # ld: symbol(s) not found for architecture ... - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix index baff481f6f2ba..3b5d66508efbe 100644 --- a/pkgs/by-name/si/signaturepdf/package.nix +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "signaturepdf"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "24eme"; repo = "signaturepdf"; rev = "v${version}"; - hash = "sha256-WPcnG1iRT4l4S/CSZkj75lIiyzVLsrSyH3GUJa7Tedc="; + hash = "sha256-OFsTTF+QmjRv0LdfRTWig6LjRXq1TXWOLeyEX5Ak62o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/si/silicon/Cargo.lock b/pkgs/by-name/si/silicon/Cargo.lock index a02f14068eb6d..5c0816c299e1c 100644 --- a/pkgs/by-name/si/silicon/Cargo.lock +++ b/pkgs/by-name/si/silicon/Cargo.lock @@ -14,6 +14,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ansi_term" version = "0.12.1" @@ -23,11 +29,60 @@ dependencies = [ "winapi", ] +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "approx" @@ -51,15 +106,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "base64" -version = "0.21.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -78,9 +133,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -90,9 +145,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -102,11 +157,11 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.0.83" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ - "libc", + "shlex", ] [[package]] @@ -155,22 +210,11 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", ] [[package]] @@ -210,10 +254,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "const-cstr" -version = "0.3.0" +name = "colorchoice" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "conv" @@ -226,9 +270,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -236,9 +280,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -255,9 +299,9 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -278,44 +322,46 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "cstr" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "68523903c8ae5aacfa32a0d9ae60cadeb764e1da14ee0d26b1f3089f13a54636" dependencies = [ - "cfg-if", + "proc-macro2", + "quote", ] [[package]] @@ -326,18 +372,18 @@ checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] [[package]] name = "dirs" -version = "4.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ "dirs-sys", ] @@ -354,13 +400,14 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -385,9 +432,9 @@ dependencies = [ [[package]] name = "dwrote" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c" dependencies = [ "lazy_static", "libc", @@ -397,20 +444,30 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", +] [[package]] name = "env_logger" -version = "0.9.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ - "atty", + "anstream", + "anstyle", + "env_filter", "humantime", "log", - "termcolor", ] [[package]] @@ -421,54 +478,50 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "error-code" -version = "2.3.1" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] name = "float-ord" -version = "0.2.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e" +checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" [[package]] name = "fnv" @@ -478,11 +531,11 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-kit" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5" +checksum = "b0504fc23a34d36352540ae5eedcec2623c86607a4efe25494ca9641845c5a50" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "byteorder", "core-foundation", "core-graphics", @@ -518,9 +571,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "freetype" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6" +checksum = "5a440748e063798e4893ceb877151e84acef9bea9a8c6800645cf3f1b3a7806e" dependencies = [ "freetype-sys", "libc", @@ -528,11 +581,11 @@ dependencies = [ [[package]] name = "freetype-sys" -version = "0.13.1" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" +checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134" dependencies = [ - "cmake", + "cc", "libc", "pkg-config", ] @@ -550,9 +603,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -575,9 +628,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -605,15 +658,14 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "image" -version = "0.24.7" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", "jpeg-decoder", - "num-rational", "num-traits", "png", ] @@ -638,14 +690,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.10.5" @@ -657,59 +715,49 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" dependencies = [ "rayon", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-sys", + "windows-targets 0.52.6", ] [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "libc", - "redox_syscall", -] - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", ] [[package]] @@ -720,15 +768,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "malloc_buf" @@ -741,9 +789,9 @@ dependencies = [ [[package]] name = "matrixmultiply" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ "autocfg", "rawpointer", @@ -751,27 +799,27 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] -name = "memoffset" -version = "0.9.0" +name = "miniz_oxide" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ - "autocfg", + "adler", + "simd-adler32", ] [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", - "simd-adler32", + "adler2", ] [[package]] @@ -791,9 +839,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -805,20 +853,19 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -831,19 +878,18 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -852,11 +898,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -864,9 +909,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -902,9 +947,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "onig" @@ -928,15 +973,21 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "os_info" -version = "3.7.0" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", "serde", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -950,9 +1001,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pasteboard" @@ -978,27 +1029,26 @@ dependencies = [ [[package]] name = "pathfinder_simd" -version = "0.5.2" -source = "git+https://github.com/servo/pathfinder#a3ceb814cac4a817e2883da73df84c3eeddb70de" +version = "0.5.4" +source = "git+https://github.com/servo/pathfinder#1b7c8bcdaf9da3f045af6a650b5f5c00f0c5a7eb" dependencies = [ "rustc_version", ] [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plist" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64", "indexmap", - "line-wrap", "quick-xml", "serde", "time", @@ -1006,15 +1056,15 @@ dependencies = [ [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] @@ -1025,9 +1075,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro-error" @@ -1055,27 +1108,27 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1138,9 +1191,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -1148,60 +1201,51 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.15", "libredox", "thiserror", ] [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1216,25 +1260,19 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safe_arch" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" +checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a" dependencies = [ "bytemuck", ] -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - [[package]] name = "same-file" version = "1.0.6" @@ -1244,45 +1282,40 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -1293,13 +1326,19 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "silicon" version = "0.5.2" dependencies = [ "anyhow", "clipboard", - "clipboard-win 4.5.0", + "clipboard-win 5.4.0", "conv", "dirs", "env_logger", @@ -1311,6 +1350,7 @@ dependencies = [ "log", "pasteboard", "pathfinder_geometry", + "pathfinder_simd", "rayon", "shell-words", "structopt", @@ -1337,12 +1377,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" -[[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.8.0" @@ -1386,9 +1420,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -1397,9 +1431,9 @@ dependencies = [ [[package]] name = "syntect" -version = "5.1.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" +checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" dependencies = [ "bincode", "bitflags 1.3.2", @@ -1410,6 +1444,7 @@ dependencies = [ "plist", "regex-syntax", "serde", + "serde_derive", "serde_json", "thiserror", "walkdir", @@ -1418,15 +1453,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", + "once_cell", "rustix", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1439,15 +1474,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "termcolor" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" -dependencies = [ - "winapi-util", -] - [[package]] name = "textwrap" version = "0.11.0" @@ -1460,22 +1486,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.77", ] [[package]] @@ -1523,21 +1549,27 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "vec_map" @@ -1547,15 +1579,15 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -1575,9 +1607,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wide" -version = "0.7.13" +version = "0.7.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" +checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690" dependencies = [ "bytemuck", "safe_arch", @@ -1601,11 +1633,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -1620,7 +1652,25 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -1629,13 +1679,29 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -1644,42 +1710,90 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "wio" version = "0.2.2" @@ -1719,12 +1833,33 @@ dependencies = [ [[package]] name = "yeslogic-fontconfig-sys" -version = "3.2.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2bbd69036d397ebbff671b1b8e4d918610c181c5a16073b96f984a38d08c386" +checksum = "ffb6b23999a8b1a997bf47c7bb4d19ad4029c3327bb3386ebe0a5ff584b33c7a" dependencies = [ - "const-cstr", + "cstr", "dlib", "once_cell", "pkg-config", ] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] diff --git a/pkgs/by-name/si/silicon/package.nix b/pkgs/by-name/si/silicon/package.nix index cba16e706b8c8..2c0bb500e4a6b 100644 --- a/pkgs/by-name/si/silicon/package.nix +++ b/pkgs/by-name/si/silicon/package.nix @@ -17,31 +17,25 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - # Remove `postPatch` hack below when updating. - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - hash = "sha256-fk1qaR7z9taOuNmjMCSdq7RybgV/3u7njU0Gehb98Lk="; + hash = "sha256-lwwbjSXW5uonJNZTAqTK14Ib4QDOD4puxY2CsiJk4/Q="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "pathfinder_simd-0.5.2" = "sha256-b9RuxtTRKJ9Bnh0AWkoInRVrK/a3KV/2DCbXhN63yF0="; + "pathfinder_simd-0.5.4" = "sha256-RiivtlfdA44vQtFAzNQY9hu2FBwgq4aJ2hjQS8+Xucc="; }; }; - postPatch = '' - # Fix build with Rust 1.80; remove when fixed upstream - ln -sf ${./Cargo.lock} Cargo.lock - ''; - buildInputs = [ expat freetype fira-code fontconfig harfbuzz ] - ++ lib.optionals stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ libiconv AppKit CoreText @@ -49,7 +43,7 @@ rustPlatform.buildRustPackage rec { ]); nativeBuildInputs = [ cmake pkg-config rustPlatform.bindgenHook ] - ++ lib.optionals stdenv.isLinux [ python3 ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/by-name/si/silverbullet/package.nix b/pkgs/by-name/si/silverbullet/package.nix index cd66ed474f7f3..de86e6a7ec1ce 100644 --- a/pkgs/by-name/si/silverbullet/package.nix +++ b/pkgs/by-name/si/silverbullet/package.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "silverbullet"; - version = "0.9.2"; + version = "0.9.4"; src = fetchurl { url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet.js"; - hash = "sha256-USk15jzTLcy+t8IzLEAySRZJMlIompugIpqAJTcoxho="; + hash = "sha256-J0fy1e/ObpujBNSRKA55oU30kXNfus+5P2ebggEN6Dw="; }; dontUnpack = true; diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 42ee43f22ae31..8e841ac44636e 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "5.4.15"; + version = "5.5.0"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-oIrrI0Z5x1AvT9y0Ldg8zrkFJj1PZtebhJaL2UtEoB8="; + hash = "sha256-LEXx/b0DJZ9xxQX9+4YHjQCLFp2aXCE78Z6iPlXJjAw="; }; # Fix build on darwin diff --git a/pkgs/applications/emulators/simh/default.nix b/pkgs/by-name/si/simh/package.nix similarity index 100% rename from pkgs/applications/emulators/simh/default.nix rename to pkgs/by-name/si/simh/package.nix diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index 52dc9d7bc01e8..5529d594ff15f 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { interface is well tested. ''; homepage = "https://gitlab.gnome.org/GNOME/simple-scan"; + changelog = "https://gitlab.gnome.org/GNOME/simple-scan/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index fb667a0ea99d9..38df48bb1704d 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "6.0.3"; + version = "6.0.5"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-No3nS1AUOxhaxvaPvc8tLW+fj59P4AT/bt0dZobdGAw="; + hash = "sha256-z40Udd3+GWd4JSVNsqwFUm3GcbfNre+lFR/UP1+msyo="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/si/single-file-cli/package.nix b/pkgs/by-name/si/single-file-cli/package.nix index 13da0e896d15f..0af72089592a1 100644 --- a/pkgs/by-name/si/single-file-cli/package.nix +++ b/pkgs/by-name/si/single-file-cli/package.nix @@ -4,7 +4,6 @@ buildNpmPackage, fetchFromGitHub, chromium, - chromedriver, python3, }: buildNpmPackage { @@ -19,8 +18,8 @@ buildNpmPackage { }; npmDepsHash = "sha256-wiBpWw9nb/pWVGIc4Vl/IxxR5ic0LzLMMr3WxRNvYdM="; - nativeCheckInputs = [chromium chromedriver]; - doCheck = stdenv.isLinux; + nativeCheckInputs = [chromium]; + doCheck = stdenv.hostPlatform.isLinux; postBuild = '' patchShebangs ./single-file @@ -34,8 +33,7 @@ buildNpmPackage { ./single-file \ --browser-headless \ - --web-driver-executable-path=chromedriver \ - --back-end=webdriver-chromium \ + --browser-executable-path chromium-browser\ http://127.0.0.1:8000 grep -F 'Page saved with SingleFile' 'Directory listing for'*.html diff --git a/pkgs/by-name/si/sink-rotate/package.nix b/pkgs/by-name/si/sink-rotate/package.nix index 44fd2a7dc12d3..1f684cb796048 100644 --- a/pkgs/by-name/si/sink-rotate/package.nix +++ b/pkgs/by-name/si/sink-rotate/package.nix @@ -6,7 +6,7 @@ , makeWrapper }: let - version = "1.0.4"; + version = "2.2.0"; in rustPlatform.buildRustPackage { pname = "sink-rotate"; @@ -16,12 +16,12 @@ rustPlatform.buildRustPackage { owner = "mightyiam"; repo = "sink-rotate"; rev = "v${version}"; - hash = "sha256-q20uUr+7yLJlZc5YgEkY125YrZ2cuJrPv5IgWXaYRlo="; + hash = "sha256-ZHbisG9pdctkwfD1S3kxMZhBqPw0Ni5Q9qQG4RssnSw="; }; - cargoHash = "sha256-MPeyPTkxpi6iw/BT5m4S7jVBD0c2zG2rsv+UZWQxpUU="; + cargoHash = "sha256-TWuyU1+F3zEcFFd8ZeZmL3IvpKLLv3zimZ2WFVYFqyo="; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postFixup = '' wrapProgram $out/bin/sink-rotate \ @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { ''; meta = with lib; { - description = "Command that rotates default between two PipeWire audio sinks"; + description = "Command that rotates the default PipeWire audio sink"; homepage = "https://github.com/mightyiam/sink-rotate"; license = licenses.mit; maintainers = with maintainers; [ mightyiam ]; diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix index a962da0c865a7..d437eece8b217 100644 --- a/pkgs/by-name/si/sirius/package.nix +++ b/pkgs/by-name/si/sirius/package.nix @@ -21,6 +21,8 @@ , boost , eigen , libvdwxc +, enablePython ? false +, pythonPackages ? null , llvmPackages , cudaPackages , rocmPackages @@ -35,16 +37,17 @@ }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; +assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "SIRIUS"; - version = "7.6.0"; + version = "7.6.1"; src = fetchFromGitHub { owner = "electronic-structure"; repo = pname; rev = "v${version}"; - hash = "sha256-AdjqyHZRMl9zxwuTBzNXJkPi8EIhG/u98XJMEjHi/6k="; + hash = "sha256-JvI75AbthNThXep2jcriLTPC8GGiPgrg5nYCCbCi+EI="; }; @@ -81,10 +84,23 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (gpuBackend == "rocm") [ rocmPackages.clr rocmPackages.rocblas - ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp - ; - - propagatedBuildInputs = [ (lib.getBin mpi) ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + llvmPackages.openmp + ] ++ lib.optionals enablePython (with pythonPackages; [ + python + pybind11 + ]); + + propagatedBuildInputs = [ + (lib.getBin mpi) + ] ++ lib.optionals enablePython (with pythonPackages; [ + mpi4py + voluptuous + numpy + h5py + scipy + pyyaml + ]); CXXFLAGS = [ # GCC 13: error: 'uintptr_t' in namespace 'std' does not name a type @@ -92,20 +108,20 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DUSE_SCALAPACK=ON" - "-DBUILD_TESTING=ON" - "-DUSE_VDWXC=ON" - "-DCREATE_FORTRAN_BINDINGS=ON" - "-DUSE_OPENMP=ON" + "-DSIRIUS_USE_SCALAPACK=ON" + "-DSIRIUS_USE_VDWXC=ON" + "-DSIRIUS_CREATE_FORTRAN_BINDINGS=ON" + "-DSIRIUS_USE_OPENMP=ON" "-DBUILD_TESTING=ON" - ] - ++ lib.optionals (gpuBackend == "cuda") [ - "-DUSE_CUDA=ON" + ] ++ lib.optionals (gpuBackend == "cuda") [ + "-DSIRIUS_USE_CUDA=ON" "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}" - ] - ++ lib.optionals (gpuBackend == "rocm") [ - "-DUSE_ROCM=ON" + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) + ] ++ lib.optionals (gpuBackend == "rocm") [ + "-DSIRIUS_USE_ROCM=ON" "-DHIP_ROOT_DIR=${rocmPackages.clr}" + ] ++ lib.optionals enablePython [ + "-DSIRIUS_CREATE_PYTHON_MODULE=ON" ]; doCheck = true; diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 52b3c68ffc73f..888707fcf63d8 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -2,13 +2,16 @@ lib, stdenv, fetchFromGitHub, - buildGoModule, + buildGo123Module, substituteAll, pandoc, nodejs, pnpm_9, electron, makeWrapper, + makeDesktopItem, + copyDesktopItems, + nix-update-script, }: let @@ -20,23 +23,32 @@ let }; platformId = platformIds.${stdenv.system} or (throw "Unsupported platform: ${stdenv.system}"); + + desktopEntry = makeDesktopItem { + name = "siyuan"; + desktopName = "SiYuan"; + comment = "Refactor your thinking"; + icon = "siyuan"; + exec = "siyuan %U"; + categories = [ "Utility" ]; + }; in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.1.0"; + version = "3.1.8"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-UIPASTSW7YGpxJJHfCq28M/U6CzyqaJiISZGtE0aDPw="; + hash = "sha256-0sV3r3ETW/FeLJZQrkE95oqKeUKKiNA3vpOBPtHzeE8="; }; - kernel = buildGoModule { + kernel = buildGo123Module { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-s4dW43Qy3Lrc5WPpugQpN6BDEFVxqnorXpp40SGFk7I="; + vendorHash = "sha256-hxXCq03wxVLONaztZVqLjlqQ/fZNlV2iDF5JIayb5YY="; patches = [ (substituteAll { @@ -68,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs pnpm.configHook makeWrapper + copyDesktopItems ]; pnpmDeps = pnpm.fetchDeps { @@ -77,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-QSaBNs0m13Pfrvl8uUVqRpP3m8PoOBIY5VU5Cg/G2jY="; + hash = "sha256-g6O6YE1irE3Hy+Xu7MeH97Oc4bq32IDnfP1VLSiF/U4="; }; sourceRoot = "${finalAttrs.src.name}/app"; @@ -117,12 +130,21 @@ stdenv.mkDerivation (finalAttrs: { --chdir $out/share/siyuan/resources \ --add-flags $out/share/siyuan/resources/app \ --set ELECTRON_FORCE_IS_PACKAGED 1 \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --inherit-argv0 + install -Dm644 src/assets/icon.svg $out/share/icons/hicolor/scalable/apps/siyuan.svg + runHook postInstall ''; + desktopItems = [ desktopEntry ]; + + passthru = { + inherit (finalAttrs.kernel) goModules; # this tricks nix-update into also updating the kernel goModules FOD + updateScript = nix-update-script { }; + }; + meta = { description = "Privacy-first personal knowledge management system that supports complete offline usage, as well as end-to-end encrypted data sync"; homepage = "https://b3log.org/siyuan/"; diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index 0b1b4e21acd16..e0e2a004e6d78 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -29,7 +29,7 @@ let } .${system} or (throw "Unsupported system: ${system}"); - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "sketchybar"; diff --git a/pkgs/by-name/sk/skhd/package.nix b/pkgs/by-name/sk/skhd/package.nix index d3b3b9adb96a9..1876a43916a74 100644 --- a/pkgs/by-name/sk/skhd/package.nix +++ b/pkgs/by-name/sk/skhd/package.nix @@ -10,7 +10,7 @@ let inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa; - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "skhd"; diff --git a/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch b/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch deleted file mode 100644 index 1609e7347fdeb..0000000000000 --- a/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp -index 7d6fd62..2cca01d 100644 ---- a/src/ports/SkFontMgr_fontconfig.cpp -+++ b/src/ports/SkFontMgr_fontconfig.cpp -@@ -16,6 +16,7 @@ - #include "include/core/SkString.h" - #include "include/core/SkTypeface.h" - #include "include/core/SkTypes.h" -+#include "include/ports/SkFontMgr_fontconfig.h" - #include "include/private/base/SkDebug.h" - #include "include/private/base/SkMutex.h" - #include "include/private/base/SkTArray.h" diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix index f40279875d024..2790b77101d5f 100644 --- a/pkgs/by-name/sk/skia/package.nix +++ b/pkgs/by-name/sk/skia/package.nix @@ -18,7 +18,7 @@ , vulkan-memory-allocator , xcbuild -, enableVulkan ? !stdenv.isDarwin +, enableVulkan ? !stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation (finalAttrs: { @@ -26,22 +26,15 @@ stdenv.mkDerivation (finalAttrs: { # Version from https://skia.googlesource.com/skia/+/refs/heads/main/RELEASE_NOTES.md # or https://chromiumdash.appspot.com/releases # plus date of the tip of the corresponding chrome/m$version branch - version = "124-unstable-2024-05-22"; + version = "129-unstable-2024-09-18"; src = fetchgit { url = "https://skia.googlesource.com/skia.git"; # Tip of the chrome/m$version branch - rev = "a747f7ea37db6ea3871816dbaf2eb41b5776c826"; - hash = "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY="; + rev = "dda581d538cb6532cda841444e7b4ceacde01ec9"; + hash = "sha256-NZiZFsABebugszpYsBusVlTYnYda+xDIpT05cZ8Jals="; }; - patches = [ - # Package ladybird uses SkFontMgr_New_FontConfig, but this version of skia - # does not export it. - # https://skia.googlesource.com/skia/+/4bf56844d4a661d7317882cc545ecd978715a11e%5E!/? - ./export-SkFontMgr_New_FontConfig.patch - ]; - postPatch = '' # System zlib detection bug workaround substituteInPlace BUILD.gn \ @@ -53,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { gn ninja python3 - ] ++ lib.optional stdenv.isDarwin xcbuild; + ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; buildInputs = [ expat @@ -70,39 +63,34 @@ stdenv.mkDerivation (finalAttrs: { vulkan-memory-allocator ]; - configurePhase = let + gnFlags = let cpu = { "x86_64" = "x64"; "i686" = "x86"; "arm" = "arm"; "aarch64" = "arm64"; }.${stdenv.hostPlatform.parsed.cpu.name}; - in '' - runHook preConfigure - gn gen build --args='${toString ([ - # Build in release mode - "is_official_build=true" - "is_component_build=true" - # Don't use missing tools - "skia_use_dng_sdk=false" - "skia_use_wuffs=false" - # Use system dependencies - "extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" - "cc=\"${stdenv.cc.targetPrefix}cc\"" - "cxx=\"${stdenv.cc.targetPrefix}c++\"" - "ar=\"${stdenv.cc.targetPrefix}ar\"" - "target_cpu=\"${cpu}\"" - ] ++ map (lib: "skia_use_system_${lib}=true") [ - "zlib" - "harfbuzz" - "libpng" - "libwebp" - ] ++ lib.optionals enableVulkan [ - "skia_use_vulkan=true" - ])}' - cd build - runHook postConfigure - ''; + in [ + # Build in release mode + "is_official_build=true" + "is_component_build=true" + # Don't use missing tools + "skia_use_dng_sdk=false" + "skia_use_wuffs=false" + # Use system dependencies + "extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" + "cc=\"${stdenv.cc.targetPrefix}cc\"" + "cxx=\"${stdenv.cc.targetPrefix}c++\"" + "ar=\"${stdenv.cc.targetPrefix}ar\"" + "target_cpu=\"${cpu}\"" + ] ++ map (lib: "skia_use_system_${lib}=true") [ + "zlib" + "harfbuzz" + "libpng" + "libwebp" + ] ++ lib.optionals enableVulkan [ + "skia_use_vulkan=true" + ]; # Somewhat arbitrary, but similar to what other distros are doing installPhase = '' @@ -113,10 +101,10 @@ stdenv.mkDerivation (finalAttrs: { cp *.so *.a $out/lib # Includes - pushd ../include + pushd ../../include find . -name '*.h' -exec install -Dm644 {} $out/include/skia/{} \; popd - pushd ../modules + pushd ../../modules find . -name '*.h' -exec install -Dm644 {} $out/include/skia/modules/{} \; popd @@ -157,6 +145,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = with lib.platforms; arm ++ aarch64 ++ x86 ++ x86_64; pkgConfigModules = [ "skia" ]; # https://github.com/NixOS/nixpkgs/pull/325871#issuecomment-2220610016 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/sk/skribilo/package.nix b/pkgs/by-name/sk/skribilo/package.nix new file mode 100644 index 0000000000000..63083457bee51 --- /dev/null +++ b/pkgs/by-name/sk/skribilo/package.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchurl +, fig2dev +, gettext +, ghostscript +, guile +, guile-lib +, guile-reader +, imagemagick +, makeWrapper +, pkg-config +, enableEmacs ? false, emacs +, enableLout ? stdenv.hostPlatform.isLinux, lout +, enablePloticus ? stdenv.hostPlatform.isLinux, ploticus +, enableTex ? true, texliveSmall +}: + +let + inherit (lib) optional; +in stdenv.mkDerivation (finalAttrs: { + pname = "skribilo"; + version = "0.10.0"; + + src = fetchurl { + url = "http://download.savannah.nongnu.org/releases/skribilo/skribilo-${finalAttrs.version}.tar.gz"; + hash = "sha256-jP9I7hds7f1QMmSaNJpGlSvqUOwGcg+CnBzMopIS9Q4="; + }; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + + buildInputs = [ + fig2dev + gettext + ghostscript + guile + guile-lib + guile-reader + imagemagick + ] + ++ optional enableEmacs emacs + ++ optional enableLout lout + ++ optional enablePloticus ploticus + ++ optional enableTex texliveSmall; + + postInstall = '' + wrapProgram $out/bin/skribilo \ + --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" + ''; + + meta = { + homepage = "https://www.nongnu.org/skribilo/"; + description = "Ultimate Document Programming Framework"; + longDescription = '' + Skribilo is a free document production tool that takes a structured + document representation as its input and renders that document in a + variety of output formats: HTML and Info for on-line browsing, and Lout + and LaTeX for high-quality hard copies. + + The input document can use Skribilo's markup language to provide + information about the document's structure, which is similar to HTML or + LaTeX and does not require expertise. Alternatively, it can use a simpler, + "markup-less" format that borrows from Emacs' outline mode and from other + conventions used in emails, Usenet and text. + ''; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/sk/skypeexport/package.nix b/pkgs/by-name/sk/skypeexport/package.nix index c8af575c78957..028f70d2f19e4 100644 --- a/pkgs/by-name/sk/skypeexport/package.nix +++ b/pkgs/by-name/sk/skypeexport/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { owner = "Temptin"; repo = "SkypeExport"; rev = "v${finalAttrs.version}"; - sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak"; + hash = "sha256-Uy3bmylDm/3T7T48zBkuk3lbnWW6Ps4Huqz8NjSAk8Y="; }; patches = [ (fetchpatch { name = "boost167.patch"; url = "https://github.com/Temptin/SkypeExport/commit/ef60f2e4fc9e4a5764c8d083a73b585457bc10b1.patch"; - sha256 = "sha256-t+/v7c66OULmQCD/sNt+iDJeQ/6UG0CJ8uQY2PVSFQo="; + hash = "sha256-t+/v7c66OULmQCD/sNt+iDJeQ/6UG0CJ8uQY2PVSFQo="; }) ]; diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix index 0de05f358a5ac..1d818d11ae2d3 100644 --- a/pkgs/by-name/sk/skypeforlinux/package.nix +++ b/pkgs/by-name/sk/skypeforlinux/package.nix @@ -42,8 +42,8 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.127.0.200"; - revision = "359"; + version = "8.129.0.202"; + revision = "365"; rpath = lib.makeLibraryPath [ @@ -103,7 +103,7 @@ let fetchurl { name = "skypeforlinux-${version}-${revision}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap"; - hash = "sha512-C0UQ9mUhrt3CXBPG1BEz4CjjYfy/mRkgrBpjTxhYpeACJq0rNwTUMacicF7BHDgllQmfAdr2/feLyqbsr9HTBQ=="; + hash = "sha512-pxLh/dU/RK1H5gjFLB0V4mVddgQkO8ZcJowpNNihECsLaELgoeXmWXflhYFs2G7fdEzNMeujuc4/ZoGCFSZCvw=="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/sl/slang/package.nix b/pkgs/by-name/sl/slang/package.nix new file mode 100644 index 0000000000000..7d67d22eb3e0d --- /dev/null +++ b/pkgs/by-name/sl/slang/package.nix @@ -0,0 +1,102 @@ +{ lib, stdenv, fetchurl +, libiconv +, libpng +, ncurses +, pcre +, readline +, zlib +, writeScript +}: + +stdenv.mkDerivation rec { + pname = "slang"; + version = "2.3.3"; + + src = fetchurl { + url = "https://www.jedsoft.org/releases/slang/${pname}-${version}.tar.bz2"; + sha256 = "sha256-+RRQVK4TGXPGEgjqgkhtXdEOPFza0jt8SgYXdDyPWhg="; + }; + + outputs = [ "out" "dev" "man" "doc" ]; + + # Fix some wrong hardcoded paths + preConfigure = '' + sed -ie "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure + sed -ie "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" src/sltermin.c + sed -ie "s|/bin/ln|ln|" src/Makefile.in + sed -ie "s|-ltermcap|-lncurses|" ./configure + ''; + + configureFlags = [ + "--with-pcre=${pcre.dev}" + "--with-png=${libpng.dev}" + "--with-readline=${readline.dev}" + "--with-z=${zlib.dev}" + ]; + + buildInputs = [ + libpng + pcre + readline + zlib + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ libiconv ]; + + propagatedBuildInputs = [ ncurses ]; + + buildFlags = lib.optional stdenv.hostPlatform.isStatic "static"; + installTargets = lib.optional stdenv.hostPlatform.isStatic "install-static"; + + preBuild = '' + makeFlagsArray+=(AR_CR="${stdenv.cc.targetPrefix}ar cr") + ''; + + enableParallelBuilding = true; + + postInstall = '' + find "$out"/lib/ -name '*.so' -exec chmod +x "{}" \; + sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc + ''; + + passthru = { + updateScript = writeScript "update-slang" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of 'Version 2.3.3</td>' + new_version="$(curl -s https://www.jedsoft.org/slang/ | + pcregrep -o1 'Version ([0-9.]+)</td>')" + update-source-version ${pname} "$new_version" + ''; + }; + + meta = with lib; { + description = "Small, embeddable multi-platform programming library"; + longDescription = '' + S-Lang is an interpreted language that was designed from the start to be + easily embedded into a program to provide it with a powerful extension + language. Examples of programs that use S-Lang as an extension language + include the jed text editor and the slrn newsreader. Although S-Lang does + not exist as a separate application, it is distributed with a quite + capable program called slsh ("slang-shell") that embeds the interpreter + and allows one to execute S-Lang scripts, or simply experiment with S-Lang + at an interactive prompt. Many of the the examples in this document are + presented in the context of one of the above applications. + + S-Lang is also a programmer's library that permits a programmer to develop + sophisticated platform-independent software. In addition to providing the + S-Lang interpreter, the library provides facilities for screen management, + keymaps, low-level terminal I/O, etc. However, this document is concerned + only with the extension language and does not address these other features + of the S-Lang library. For information about the other components of the + library, the reader is referred to the S-Lang Library C Programmer's + Guide. + ''; + homepage = "http://www.jedsoft.org/slang/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "slsh"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/sl/sleek-grub-theme/package.nix b/pkgs/by-name/sl/sleek-grub-theme/package.nix index efeb01e4d8121..0fe50fcd41751 100644 --- a/pkgs/by-name/sl/sleek-grub-theme/package.nix +++ b/pkgs/by-name/sl/sleek-grub-theme/package.nix @@ -2,20 +2,20 @@ , stdenv , fetchFromGitHub , withBanner ? "Grub Bootloader" # use override to specify your own banner text -, withStyle ? "white" # use override to specify one of "dark" / "orange" / "bigSur" +, withStyle ? "light" # use override to specify one of "dark" / "orange" / "bigSur" }: -assert builtins.any (s: withStyle == s) ["white" "dark" "orange" "bigSur"]; +assert builtins.any (s: withStyle == s) ["light" "dark" "orange" "bigSur"]; stdenv.mkDerivation { pname = "sleek-grub-theme"; - version = "unstable-2022-06-04"; + version = "unstable-2024-08-11"; src = fetchFromGitHub ({ owner = "sandesh236"; repo = "sleek--themes"; - rev = "981326a8e35985dc23f1b066fdbe66ff09df2371"; - hash = "sha256-yD4JuoFGTXE/aI76EtP4rEWCc5UdFGi7Ojys6Yp8Z58="; + rev = "0c47e645ccc2d72aa165e9d994f9d09f58de9f6d"; + hash = "sha256-H4s4CSR8DaH8RT9w40hkguNNcC0U8gHKS2FLt+FApeA="; }); installPhase = '' diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix index b88f72b0d1181..abdb045e7cedd 100644 --- a/pkgs/by-name/sl/slimserver/package.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -24,7 +24,7 @@ let sox wavpack ] - ++ (lib.optional stdenv.isLinux monkeysAudio) + ++ (lib.optional stdenv.hostPlatform.isLinux monkeysAudio) ); libPath = lib.makeLibraryPath [ zlib @@ -117,8 +117,8 @@ perlPackages.buildPerlPackage rec { XMLSimple YAMLLibYAML ] - # ++ (lib.optional stdenv.isDarwin perlPackages.MacFSEvents) - ++ (lib.optional stdenv.isLinux perlPackages.LinuxInotify2); + # ++ (lib.optional stdenv.hostPlatform.isDarwin perlPackages.MacFSEvents) + ++ (lib.optional stdenv.hostPlatform.isLinux perlPackages.LinuxInotify2); prePatch = '' # remove vendored binaries @@ -179,6 +179,6 @@ perlPackages.buildPerlPackage rec { jecaro ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/sl/sloth-app/package.nix b/pkgs/by-name/sl/sloth-app/package.nix index c2959589d0bae..1da8d8aac54d5 100644 --- a/pkgs/by-name/sl/sloth-app/package.nix +++ b/pkgs/by-name/sl/sloth-app/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sloth-app"; - version = "3.2"; + version = "3.3"; src = fetchurl { url = "https://github.com/sveinbjornt/Sloth/releases/download/${finalAttrs.version}/sloth-${finalAttrs.version}.zip"; - hash = "sha256-8/x8I769V8kGxstDuXXUaMtGvg03n2vhrKvmaltSISo="; + hash = "sha256-LGaL7+NqoPqXZdYWq9x+yNEZFlZZmsZw+qcELC4rdjY="; }; dontUnpack = true; diff --git a/pkgs/by-name/sl/slskd/package.nix b/pkgs/by-name/sl/slskd/package.nix index ffe0ae1b4ba89..ed60e90b7c636 100644 --- a/pkgs/by-name/sl/slskd/package.nix +++ b/pkgs/by-name/sl/slskd/package.nix @@ -1,70 +1,82 @@ { lib, - buildNpmPackage, - fetchFromGitHub, - dotnetCorePackages, buildDotnetModule, + buildPackages, + dotnetCorePackages, + fetchFromGitHub, + fetchNpmDeps, mono, nodejs_18, + slskd, + testers, }: + let + nodejs = nodejs_18; + # https://github.com/NixOS/nixpkgs/blob/d88947e91716390bdbefccdf16f7bebcc41436eb/pkgs/build-support/node/build-npm-package/default.nix#L62 + npmHooks = buildPackages.npmHooks.override { inherit nodejs; }; +in +buildDotnetModule rec { pname = "slskd"; - version = "0.21.3"; + version = "0.21.4"; src = fetchFromGitHub { owner = "slskd"; repo = "slskd"; - rev = version; - sha256 = "sha256-qAS8uiXAG0JTOCW/bIVYhv6McUSBihAHFjJu3b5Ttoc="; + rev = "refs/tags/${version}"; + hash = "sha256-9EKlCmc+zdiuEPa8YNjoQ3QLTy8vt2qcZ+6D0sWgwEU="; }; - meta = with lib; { - description = "Modern client-server application for the Soulseek file sharing network"; - homepage = "https://github.com/slskd/slskd"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ - ppom - melvyn2 - ]; - platforms = platforms.linux; - }; + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; - wwwroot = buildNpmPackage { - inherit meta version; + runtimeDeps = [ mono ]; - pname = "slskd-web"; - src = "${src}/src/web"; - npmFlags = [ "--legacy-peer-deps" ]; - nodejs = nodejs_18; - npmDepsHash = "sha256-06qQ1y870TrkXhkHYADjnWVhdyiLWEqdDt3qrJ1BBFo="; - installPhase = '' - cp -r build $out - ''; + npmRoot = "src/web"; + npmDeps = fetchNpmDeps { + name = "${pname}-${version}-npm-deps"; + inherit src; + sourceRoot = "${src.name}/${npmRoot}"; + hash = "sha256-WANoxgPbBoMx6o8fjhSTsKBRZadO2QaeErMMMXk0tgE="; }; -in -buildDotnetModule { - inherit - pname - version - src - meta - ; - - runtimeDeps = [ mono ]; + projectFile = "slskd.sln"; + nugetDeps = ./deps.nix; dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; - projectFile = "slskd.sln"; - testProjectFile = "tests/slskd.Tests.Unit/slskd.Tests.Unit.csproj"; doCheck = true; - nugetDeps = ./deps.nix; + postBuild = '' + pushd "$npmRoot" + npm run build --legacy-peer-deps + popd + ''; postInstall = '' rm -r $out/lib/slskd/wwwroot - ln -s ${wwwroot} $out/lib/slskd/wwwroot + mv "$npmRoot"/build $out/lib/slskd/wwwroot ''; + + passthru = { + tests.version = testers.testVersion { package = slskd; }; + }; + + meta = { + description = "Modern client-server application for the Soulseek file sharing network"; + homepage = "https://github.com/slskd/slskd"; + changelog = "https://github.com/slskd/slskd/releases/tag/${version}"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + ppom + melvyn2 + getchoo + ]; + mainProgram = "slskd"; + platforms = lib.platforms.linux; + }; } diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 5c52ad9ad4846..aed0f3848c425 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "1.8.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "LucasPickering"; repo = "slumber"; rev = "refs/tags/v${version}"; - hash = "sha256-u+IONDK3X+4kPmW9YXa0qQbAezBD+UADnlNEH1coKNE="; + hash = "sha256-TfJAVXJssnKj/RREetFBWgJcGNdpCTF7KUu3CrigF08="; }; - cargoHash = "sha256-V/wPzEoUppLu8E5/SbBT4sPftz/SIg4s00/AHQL9R+o="; + cargoHash = "sha256-jLBid9MDQ2eMhG0knxU1gxbi+eRFlCPYRkzWnjCnyG0="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; meta = with lib; { description = "Terminal-based HTTP/REST client"; diff --git a/pkgs/by-name/sl/slweb/package.nix b/pkgs/by-name/sl/slweb/package.nix new file mode 100644 index 0000000000000..ceabcd001d1b0 --- /dev/null +++ b/pkgs/by-name/sl/slweb/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromSourcehut, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "slweb"; + version = "0.10.1"; + + src = fetchFromSourcehut { + owner = "~strahinja"; + repo = "slweb"; + rev = "v${finalAttrs.version}"; + hash = "sha256-AJg8qgbNUKizU0uyTnq9EviIXOUuaGvQowLAyTWhGTY="; + }; + + postPatch = '' + substituteInPlace config.mk \ + --replace-fail "/usr/local" "$out" + ''; + + env = { + FALLBACKVER = finalAttrs.version; + }; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + meta = { + description = "Static website generator which aims at being simplistic"; + homepage = "https://strahinja.srht.site/slweb/"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "slweb"; + }; +}) diff --git a/pkgs/by-name/sm/smartcat/package.nix b/pkgs/by-name/sm/smartcat/package.nix index bc81bfd0a2db4..fb7195bfeaee9 100644 --- a/pkgs/by-name/sm/smartcat/package.nix +++ b/pkgs/by-name/sm/smartcat/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { openssl libX11 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix index 15ca2dd6ac359..89b42204c16fc 100644 --- a/pkgs/by-name/sm/smassh/package.nix +++ b/pkgs/by-name/sm/smassh/package.nix @@ -11,25 +11,28 @@ let in python3.pkgs.buildPythonApplication rec { pname = "smassh"; - version = "3.1.4"; + version = "3.1.6"; pyproject = true; src = fetchFromGitHub { owner = "kraanzu"; repo = "smassh"; rev = "v${version}"; - hash = "sha256-MeLub6zeviY7yyPP2FI9b37nUwHZbxW6onuFXSkmvqk"; + hash = "sha256-P0fZHSsaKIwJspEBxM5MEK3Z4kemXJWlIOQI9cmvlF4="; }; nativeBuildInputs = with python3.pkgs; [ poetry-core ]; - pythonRelaxDeps = [ "textual" ]; + pythonRelaxDeps = [ + "platformdirs" + "textual" + ]; propagatedBuildInputs = with python3.pkgs; [ - textual - appdirs click + platformdirs requests + textual ]; # No tests available @@ -38,6 +41,7 @@ python3.pkgs.buildPythonApplication rec { passthru.tests.version = testers.testVersion { package = smassh; command = "HOME=$(mktemp -d) smassh --version"; + version = "smassh - v${version}"; }; meta = with lib; { @@ -45,7 +49,10 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/kraanzu/smassh"; changelog = "https://github.com/kraanzu/smassh/blob/main/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ aimpizza ]; + maintainers = with maintainers; [ + aimpizza + kraanzu + ]; mainProgram = "smassh"; }; } diff --git a/pkgs/by-name/sm/smatch/package.nix b/pkgs/by-name/sm/smatch/package.nix new file mode 100644 index 0000000000000..6acf05652319a --- /dev/null +++ b/pkgs/by-name/sm/smatch/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + sqlite, + openssl, + buildllvmsparse ? false, + buildc2xml ? false, + libllvm, + libxml2, +}: +let + version = "1.73"; +in +stdenv.mkDerivation { + pname = "smatch"; + inherit version; + + src = fetchFromGitHub { + owner = "error27"; + repo = "smatch"; + rev = version; + sha256 = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME="; + }; + + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ + "-Wno-incompatible-function-pointer-types" + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + sqlite + openssl + ] ++ lib.optionals buildllvmsparse [ libllvm ] ++ lib.optionals buildc2xml [ libxml2.dev ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; + + meta = { + description = "Semantic analysis tool for C"; + homepage = "https://sparse.docs.kernel.org/"; + maintainers = with lib.maintainers; [ momeemt ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/sm/smbclient-ng/package.nix b/pkgs/by-name/sm/smbclient-ng/package.nix new file mode 100644 index 0000000000000..7e4d4ef7cff9c --- /dev/null +++ b/pkgs/by-name/sm/smbclient-ng/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "smbclient-ng"; + version = "2.1.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "p0dalirius"; + repo = "smbclient-ng"; + rev = "refs/tags/${version}"; + hash = "sha256-5ObqmCvMoBuQOPbQATrIVzxnxrJtvB+iUJSS7sqs6hI="; + }; + + pythonRelaxDeps = [ + "impacket" + "pefile" + ]; + + build-system = with python3.pkgs; [ poetry-core ]; + + dependencies = with python3.pkgs; [ + charset-normalizer + impacket + pefile + rich + ]; + + pythonImportsCheck = [ "smbclientng" ]; + + meta = { + description = "Tool to interact with SMB shares"; + homepage = "https://github.com/p0dalirius/smbclient-ng"; + changelog = "https://github.com/p0dalirius/smbclient-ng/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "smbclientng"; + }; +} diff --git a/pkgs/by-name/sm/smc-fuzzer/package.nix b/pkgs/by-name/sm/smc-fuzzer/package.nix new file mode 100644 index 0000000000000..7d10da09bed51 --- /dev/null +++ b/pkgs/by-name/sm/smc-fuzzer/package.nix @@ -0,0 +1,47 @@ +{ + lib, + swiftPackages, + fetchFromGitHub, + stdenv, +}: + +stdenv.mkDerivation { + pname = "smc-fuzzer"; + version = "0-unstable-2020-12-23"; + + src = fetchFromGitHub { + repo = "smc-fuzzer"; + owner = "theopolis"; + rev = "ed60c4efeddea8a9778a976c49c650eee3840eac"; + hash = "sha256-FyiFSVeO46UnBrpC8AhSuGe7alo37pT8J1qQWGPqV2U="; + }; + + buildInputs = [ swiftPackages.apple_sdk.frameworks.AppKit ]; + + installPhase = '' + runHook preInstall + + install -Dm 755 smc -t $out/bin + + runHook postInstall + ''; + + meta = { + description = "Apple SMC (System Management Controller) API fuzzer"; + longDescription = '' + smc-fuzzer uses the AppleSMC IOKit interface and a userland API for + interacting with the System Management Controller (Mac embedded + controllers). The tool focuses on the SMC key/value API. + + smc-fuzzer is not just useful for fuzzing the SMC itself: it can also be + used to explicitly control or query the SMC. That makes it useful in + system management, e.g. controlling and querying the charge status of an + Apple laptop. + ''; + homepage = "https://github.com/theopolis/smc-fuzzer"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ hraban ]; + mainProgram = "smc"; + platforms = lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/sm/smtp4dev/deps.nix b/pkgs/by-name/sm/smtp4dev/deps.nix new file mode 100644 index 0000000000000..7879cd1b8ebaf --- /dev/null +++ b/pkgs/by-name/sm/smtp4dev/deps.nix @@ -0,0 +1,1946 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: +[ + (fetchNuGet { + pname = "Ardalis.GuardClauses"; + version = "4.5.0"; + hash = "sha256-YqVmWM9f57Lof1e1dUWoIig7D2M9G/c2slUNicCX6Hg="; + }) + (fetchNuGet { + pname = "AspNetCore.Authentication.Basic"; + version = "8.0.0"; + hash = "sha256-h8fIqP69qogLdzLhhNNN+KFzY6Ab0XbysyMKz4UnGzk="; + }) + (fetchNuGet { + pname = "BouncyCastle.Cryptography"; + version = "2.3.0"; + hash = "sha256-TIBOegJAEfFRyvtwuPakvKsQbqoPHj1RSTmK7SKYsf0="; + }) + (fetchNuGet { + pname = "CommandLiners"; + version = "1.0.45"; + hash = "sha256-ACFnha3sBLi2ejdOGMTBaoBaKK7nvcJWmRwwuPUB2I0="; + }) + (fetchNuGet { + pname = "CommandLiners.MonoOptions"; + version = "1.0.45"; + hash = "sha256-hRbnC9LkzNGVVLXleZJd7x2t80q9AnXypaxavEWyy0U="; + }) + (fetchNuGet { + pname = "DeepEqual"; + version = "5.0.0"; + hash = "sha256-tkmNXgjD+wS65uIqTqDQgRupq9EwW1JZwpobChwTjYM="; + }) + (fetchNuGet { + pname = "dotnet-ef"; + version = "8.0.4"; + hash = "sha256-9mxOR/6SU5sqBiWYNNMM8aah81XnfahEAg24/5Skn4A="; + }) + (fetchNuGet { + pname = "DotNet.Glob"; + version = "3.1.3"; + hash = "sha256-5uGSaGY1IqDjq4RCDLPJm0Lg9oyWmyR96OiNeGqSj84="; + }) + (fetchNuGet { + pname = "EntityFramework"; + version = "6.3.0"; + hash = "sha256-rh9cBlFA5NlFoppMMULpM0SSRQtKeDr10Caa/+GGTSY="; + }) + (fetchNuGet { + pname = "Esprima"; + version = "3.0.4"; + hash = "sha256-KyZHjy7QTh3WRdY/fUrqrcaoZOa0RnUAUFLTzSOBVYA="; + }) + (fetchNuGet { + pname = "HtmlAgilityPack"; + version = "1.11.61"; + hash = "sha256-exRJTP7mHNt31CKaejKSSkKPm74ratfnpGl50AqZwlY="; + }) + (fetchNuGet { + pname = "Humanizer.Core"; + version = "2.14.1"; + hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; + }) + (fetchNuGet { + pname = "Jint"; + version = "3.0.1"; + hash = "sha256-oOq7ze1QFYHK/9zNDF7ClbWZaW4A/478M4yQ/LQnUJ8="; + }) + (fetchNuGet { + pname = "LinqKit"; + version = "1.2.5"; + hash = "sha256-rF1/FIR41PrwZX4N6bkhXNG2BQsXbjZmx8/qfVdKiAI="; + }) + (fetchNuGet { + pname = "LinqKit.Core"; + version = "1.2.5"; + hash = "sha256-0z4RpAt+WvydeCN0GJu4vsMfCxzxmoi+LTE6fQ51NZY="; + }) + (fetchNuGet { + pname = "MailKit"; + version = "4.5.0"; + hash = "sha256-quU88XNBF+tzb1yr7+lSfx90kmvZpbX43+YJtdYgPzk="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.Hosting.WindowsServices"; + version = "8.0.4"; + hash = "sha256-sK7ZOyoQv/bwmaJLK0Dk7kGDJAFlIwUxVhru8kwvea0="; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.SpaServices.Extensions"; + version = "6.0.0"; + hash = "sha256-v8WhudwCRleMYqbNqn1pFulKkokHpyr3mgZBuuJKbg8="; + }) + (fetchNuGet { + pname = "Microsoft.Bcl.AsyncInterfaces"; + version = "6.0.0"; + hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; + }) + (fetchNuGet { + pname = "Microsoft.Bcl.AsyncInterfaces"; + version = "8.0.0"; + hash = "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="; + }) + (fetchNuGet { + pname = "Microsoft.Build"; + version = "15.7.0-preview-000011-1378327"; + hash = "sha256-iUlogwtK1EdkcpBvbkkY5SiASj0qLKrZPq7hJWJYiok="; + }) + (fetchNuGet { + pname = "Microsoft.Build.Framework"; + version = "15.7.0-preview-000011-1378327"; + hash = "sha256-QjkYwVeiXk0arEZUaHNMVgKbYQ02KZdP/IQT0Wkxubs="; + }) + (fetchNuGet { + pname = "Microsoft.Build.Runtime"; + version = "15.7.0-preview-000011-1378327"; + hash = "sha256-WJ8xnL5p46majDjeJ1RrPbHlbdjKOWqr9ZNyOWHM4dY="; + }) + (fetchNuGet { + pname = "Microsoft.Build.Tasks.Core"; + version = "15.7.0-preview-000011-1378327"; + hash = "sha256-5BRw+aylUxAmjC5s3bWUuVHexxeqMdukmGx4nrOshPw="; + }) + (fetchNuGet { + pname = "Microsoft.Build.Utilities.Core"; + version = "15.7.0-preview-000011-1378327"; + hash = "sha256-5YnOpuE5AvEaF+FfJtawTtUVSOSlJGLThkuMgjsdH0k="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Analyzers"; + version = "3.3.4"; + hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Common"; + version = "4.9.2"; + hash = "sha256-QU/nyiJWpdPQGHBdaOEVc+AghnGHcKBFBX0oyhRZ9CQ="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp"; + version = "4.9.2"; + hash = "sha256-j06Q4A9E65075SBXdXVCMRgeLxA63Rv1vxarydmmVAA="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; + version = "4.5.0"; + hash = "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Workspaces.Common"; + version = "4.5.0"; + hash = "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="; + }) + (fetchNuGet { + pname = "Microsoft.CSharp"; + version = "4.3.0"; + hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; + }) + (fetchNuGet { + pname = "Microsoft.CSharp"; + version = "4.6.0"; + hash = "sha256-16OdEKbPLxh+jLYS4cOiGRX/oU6nv3KMF4h5WnZAsHs="; + }) + (fetchNuGet { + pname = "Microsoft.Data.Sqlite.Core"; + version = "8.0.4"; + hash = "sha256-bbKpSaEHKYezjxSZECmDQr0gv9zYTN042dpuYQtZKQ4="; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore"; + version = "8.0.4"; + hash = "sha256-nkrtoqGn43RdVjSlwa/jzLaixnZ1CNDDTvvSubUmR5E="; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "8.0.4"; + hash = "sha256-ywVWOje6duVcJ8gSSC5HER2UO0mAzfg6VMtqloRmQfc="; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Analyzers"; + version = "8.0.4"; + hash = "sha256-Kqv9ZFl1nMJ1hRmT3kQbN5vSvMrRSZ5XOF9wzw5sS8A="; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Design"; + version = "8.0.4"; + hash = "sha256-TjDkQOUSFIM5OOFcm4+yNiXmAiKgs8Q3XpJl9eTEJdo="; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.InMemory"; + version = "8.0.4"; + hash = "sha256-m0zvYVaD72UVHnOc7Ea0/FwoVw/FhqKVladnacHkQlc="; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Relational"; + version = "8.0.4"; + hash = "sha256-TRP/Ior708EQjD03GGxKom2eLOxcUYN1MoFqzk3lYp8="; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Sqlite"; + version = "8.0.4"; + hash = "sha256-/IOzElVUh6k2eiTiMHhsdTSsBx4j3whX1lWSMgFYMUE="; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; + version = "8.0.4"; + hash = "sha256-gC8yod0XV1/xZAk1PDqTf+QlzJAOjj6kT8mJZ9LvQF0="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.ApiDescription.Server"; + version = "6.0.3"; + hash = "sha256-1G+68E/fg89Vkgo4V7pCGqWlDdBErZMFfW+AV1q5brA="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Caching.Abstractions"; + version = "8.0.0"; + hash = "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Caching.Memory"; + version = "8.0.0"; + hash = "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration"; + version = "3.1.2"; + hash = "sha256-GbxDDzVFQVZRY29OTQtSYVLFK3K6pkwlcoswlcrAsRk="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration"; + version = "8.0.0"; + hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.Abstractions"; + version = "3.1.2"; + hash = "sha256-aXGQ4z1msZ4Q956/9FJuSwp/rt0nfWH6SmmTTGd82tU="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.Abstractions"; + version = "8.0.0"; + hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.Binder"; + version = "8.0.0"; + hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.CommandLine"; + version = "8.0.0"; + hash = "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; + version = "8.0.0"; + hash = "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.FileExtensions"; + version = "8.0.0"; + hash = "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.Json"; + version = "8.0.0"; + hash = "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.UserSecrets"; + version = "8.0.0"; + hash = "sha256-/yj5QaEzeRStvOFoBpPRPXlEehGtr2E6/rJb+OEPIK8="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection"; + version = "6.0.0"; + hash = "sha256-gZuMaunMJVyvvepuzNodGPRc6eqKH//bks3957dYkPI="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection"; + version = "8.0.0"; + hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "6.0.0"; + hash = "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "8.0.0"; + hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "8.0.1"; + hash = "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyModel"; + version = "8.0.0"; + hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Diagnostics"; + version = "8.0.0"; + hash = "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Diagnostics.Abstractions"; + version = "8.0.0"; + hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.1.0-preview1-final"; + hash = "sha256-USAPBQM+PRzEvFm0VrCvKHUyGrrnpP58RoPfncKN+mM="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "6.0.0"; + hash = "sha256-uBjWjHKEXjZ9fDfFxMjOou3lhfTNhs1yO+e3fpWreLk="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "8.0.0"; + hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.FileProviders.Embedded"; + version = "8.0.0"; + hash = "sha256-TueGeSls8KFgMavmAqPyd4irQ61yKm0+W6GAru6Leuw="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.FileProviders.Physical"; + version = "2.1.0-preview1-final"; + hash = "sha256-aRQdm+7L8jZtDMvzbBY/TRaruijIHy9IgATyUjlxkzo="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.FileProviders.Physical"; + version = "6.0.0"; + hash = "sha256-5BAQOqnaEXM2YjdrmrCinXBeZ5FKxCWtebEXMdwcbMY="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.FileProviders.Physical"; + version = "8.0.0"; + hash = "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.FileSystemGlobbing"; + version = "2.1.0-preview1-final"; + hash = "sha256-VDnfVbb9ad6KY0idL54oNSWqaeQsNCl3uiNj+zyUhys="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.FileSystemGlobbing"; + version = "6.0.0"; + hash = "sha256-RAWHjkkfvGpjc49Q0kJbZyXgU6UEq/EJ0j557sj2/iU="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.FileSystemGlobbing"; + version = "8.0.0"; + hash = "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Hosting"; + version = "8.0.0"; + hash = "sha256-sKHa+w4/pMeQb5RRFqLtMTUJy5H6hSIGWchbH2pxSrg="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Hosting.Abstractions"; + version = "8.0.0"; + hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Hosting.WindowsServices"; + version = "8.0.0"; + hash = "sha256-+uYKf6LT/wN7UrHSgJ3diIqVKCi214yJQgh5oXqYi/c="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging"; + version = "6.0.0"; + hash = "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging"; + version = "8.0.0"; + hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Abstractions"; + version = "6.0.0"; + hash = "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Abstractions"; + version = "8.0.0"; + hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Abstractions"; + version = "8.0.1"; + hash = "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Configuration"; + version = "8.0.0"; + hash = "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Console"; + version = "8.0.0"; + hash = "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Debug"; + version = "8.0.0"; + hash = "sha256-AJunzYBZM2wCg86hnPnMrBuWIIyW/4PnIVoDSU969cA="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.EventLog"; + version = "8.0.0"; + hash = "sha256-vXBm4yhWGP4uow0CqstuqOkxO8yeZEM15JTTenjPbhc="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.EventSource"; + version = "8.0.0"; + hash = "sha256-kaR7YOlq5s8W9nZDtH/lKtnfGbrgOuQY4DUPcA2lcj0="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Options"; + version = "6.0.0"; + hash = "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Options"; + version = "8.0.0"; + hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; + version = "8.0.0"; + hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Primitives"; + version = "2.1.0-preview1-final"; + hash = "sha256-HaWN0+XlX/9d16n0eFoEN7sPbKPBH8pHRJ3Cvxj6J4o="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Primitives"; + version = "3.1.2"; + hash = "sha256-S6KkM0QugYT0l7QvNv02Uh6TC+NOg+rLetml0vJZDRI="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Primitives"; + version = "6.0.0"; + hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Primitives"; + version = "8.0.0"; + hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.App"; + version = "2.0.0"; + hash = "sha256-op2W8RQ55eC+5TKYD1ZvuT0h6zSRqdxq7h5qlbWeHUk="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.DotNetAppHost"; + version = "2.0.0"; + hash = "sha256-jT+oiSZkd9S88BeH5ZY0uXdQHvTXNFBotn9RncNsPXo="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.DotNetHostPolicy"; + version = "2.0.0"; + hash = "sha256-TnmtKfWidje2CVnwMb9Y0WcYroR3aHRoJFGxzb7z6f8="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.DotNetHostResolver"; + version = "2.0.0"; + hash = "sha256-qw/aGePgrpt97N8iKreCL5hzc2Cnoge2yefjVnEvxHc="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "3.0.0"; + hash = "sha256-ocB+U+mMvi/xVwII7bGsIfAqSXiKVSnEMLHCODLJaK4="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; + }) + (fetchNuGet { + pname = "Microsoft.TypeScript.MSBuild"; + version = "5.4.4"; + hash = "sha256-bE1F3XgGxF0g+zX8TLx0glAVK57k8ITRe/NI4Tf8mxw="; + }) + (fetchNuGet { + pname = "Microsoft.VisualStudio.Web.CodeGeneration.Contracts"; + version = "2.1.0-preview1-final"; + hash = "sha256-DF887hputDa4nhmHlQ1auJj76bIpb3WTxS+NBpeoH+E="; + }) + (fetchNuGet { + pname = "Microsoft.VisualStudio.Web.CodeGeneration.Tools"; + version = "2.1.0-preview1-final"; + hash = "sha256-/Ot4+uIBSkGLIy6CdaYAcYxyXP1HzzDtYwE5gkB+E5g="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + hash = "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Registry"; + version = "4.0.0"; + hash = "sha256-M/06F/Z2wTHCh4pZOgtCjUGLD1FJXEJKCmzOeFMl7uo="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Registry"; + version = "4.5.0"; + hash = "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Registry"; + version = "4.6.0"; + hash = "sha256-Wrj0Sc9srH5+ma0lCbgRYYP6gKgnlXcL6h7j7AU6nkQ="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.SystemEvents"; + version = "4.6.0"; + hash = "sha256-7BRoIg1Hm/OVHZBPGD+eugyyMTZHhmv0yLTV3HWOFd4="; + }) + (fetchNuGet { + pname = "MimeKit"; + version = "4.5.0"; + hash = "sha256-Nsk3Br9yLOC5wDLtRQyw04Kq205y5QCISpyiB13mwLU="; + }) + (fetchNuGet { + pname = "Mono.Options"; + version = "6.12.0.148"; + hash = "sha256-YKYb5juLBDFxDNC0u1oasGRjGZToDz1HUkA6xeRMah8="; + }) + (fetchNuGet { + pname = "Mono.TextTemplating"; + version = "2.2.1"; + hash = "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY="; + }) + (fetchNuGet { + pname = "Namotion.Reflection"; + version = "3.1.1"; + hash = "sha256-WXHT/prJSLS7yRoepu5pls5xe58pCbR6S8VjuR5uJR0="; + }) + (fetchNuGet { + pname = "NETStandard.Library"; + version = "1.6.0"; + hash = "sha256-ExWI1EKDCRishcfAeHVS/RoJphqSqohmJIC/wz3ZtVo="; + }) + (fetchNuGet { + pname = "NETStandard.Library"; + version = "2.0.0"; + hash = "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0="; + }) + (fetchNuGet { + pname = "NETStandard.Library"; + version = "2.0.1"; + hash = "sha256-s4UiH848a+p2yWwMH+8PaYGnQL2qnY0GmixoeLvkhDQ="; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "10.0.1"; + hash = "sha256-Gw7dQIsmYfmcR5ASTuMsB8cqaI4g3osw0j+LO1jEzJY="; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "13.0.3"; + hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; + }) + (fetchNuGet { + pname = "NJsonSchema"; + version = "11.0.0"; + hash = "sha256-MK/i30Y6lXotOKNDBZA7koeOVlcI5V9AQ5ZzxjHWxwo="; + }) + (fetchNuGet { + pname = "NJsonSchema.Annotations"; + version = "11.0.0"; + hash = "sha256-AVOWOj94Zw9DzpT07YebJa79/fCvRWa7E7zYG5e+/6w="; + }) + (fetchNuGet { + pname = "NJsonSchema.NewtonsoftJson"; + version = "11.0.0"; + hash = "sha256-ddnWplAPnLE9rDMm10f7FceY8bE/T8MpbOuiVPo3wsU="; + }) + (fetchNuGet { + pname = "NJsonSchema.Yaml"; + version = "11.0.0"; + hash = "sha256-MkUdfh/erCTFO0mgkKj1kWEKgie6rJtiwV1emsvYJzc="; + }) + (fetchNuGet { + pname = "NSwag.Annotations"; + version = "14.0.7"; + hash = "sha256-fQIIREC86xdjGvjPyV/vvHnZmcgtmFSG9SilgSO78ek="; + }) + (fetchNuGet { + pname = "NSwag.AspNetCore"; + version = "14.0.7"; + hash = "sha256-EOJrEUq1kgx0JvmTmcR6oRWk3Ci68kYhByVrZlBLtwA="; + }) + (fetchNuGet { + pname = "NSwag.Core"; + version = "14.0.7"; + hash = "sha256-t42U+Zl2QcfsvEWJGg6A3f+OWbenu/itjrnS8loszH4="; + }) + (fetchNuGet { + pname = "NSwag.Core.Yaml"; + version = "14.0.7"; + hash = "sha256-hGCff58hTcv9y4b8Dx3P7GhC5r8A5SyJaxACtS4yTK0="; + }) + (fetchNuGet { + pname = "NSwag.Generation"; + version = "14.0.7"; + hash = "sha256-nmYwfjwvkkozItdoNqIuNS/9BI2i6dPpVCxu16m0T8w="; + }) + (fetchNuGet { + pname = "NSwag.Generation.AspNetCore"; + version = "14.0.7"; + hash = "sha256-Jsa5MT9LjY7GVMIi/QTyP2de7BW+tu809dm1RPA2mdA="; + }) + (fetchNuGet { + pname = "NuGet.Frameworks"; + version = "4.7.0-preview1-4986"; + hash = "sha256-B8Fax4r73AjdTbcV3mF9dPGAV4P++UMUh2cbItNk0JE="; + }) + (fetchNuGet { + pname = "Rnwood.LumiSoft.Net"; + version = "1.0.2"; + hash = "sha256-Ud4K6lN2QMQXUUZn157HaPd2MtHTrKNmGBZn8N2hwxo="; + }) + (fetchNuGet { + pname = "runtime.any.System.Collections"; + version = "4.3.0"; + hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization"; + version = "4.3.0"; + hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; + }) + (fetchNuGet { + pname = "runtime.any.System.IO"; + version = "4.3.0"; + hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection"; + version = "4.3.0"; + hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; + }) + (fetchNuGet { + pname = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime"; + version = "4.3.0"; + hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; + }) + (fetchNuGet { + pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; + }) + (fetchNuGet { + pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="; + }) + (fetchNuGet { + pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; + }) + (fetchNuGet { + pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="; + }) + (fetchNuGet { + pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; + }) + (fetchNuGet { + pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="; + }) + (fetchNuGet { + pname = "runtime.native.System"; + version = "4.0.0"; + hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; + }) + (fetchNuGet { + pname = "runtime.native.System"; + version = "4.3.0"; + hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; + }) + (fetchNuGet { + pname = "runtime.native.System.Data.SqlClient.sni"; + version = "4.6.0"; + hash = "sha256-TenFWtugim8xFtilE3Z9br0FPnLCosdLQ5DV1uW3448="; + }) + (fetchNuGet { + pname = "runtime.native.System.IO.Compression"; + version = "4.1.0"; + hash = "sha256-085JrZxNEwIHdBWKKKFsh1JzpF0AblvrUsz5T8kH4jQ="; + }) + (fetchNuGet { + pname = "runtime.native.System.Net.Http"; + version = "4.0.1"; + hash = "sha256-5nWnTQrA1T6t9r8MqIiV4yTNu+IH0of2OX1qteoS+8E="; + }) + (fetchNuGet { + pname = "runtime.native.System.Net.Http"; + version = "4.3.0"; + hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; + }) + (fetchNuGet { + pname = "runtime.native.System.Net.Security"; + version = "4.3.0"; + hash = "sha256-I8vYld/7WtU2/rrD4XfSRgpO/DY3qXghG14VQjiU2DY="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + hash = "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="; + }) + (fetchNuGet { + pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; + }) + (fetchNuGet { + pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="; + }) + (fetchNuGet { + pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; + }) + (fetchNuGet { + pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="; + }) + (fetchNuGet { + pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; + }) + (fetchNuGet { + pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="; + }) + (fetchNuGet { + pname = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; + }) + (fetchNuGet { + pname = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; + }) + (fetchNuGet { + pname = "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni"; + version = "4.4.0"; + hash = "sha256-8xGiqk5g4kM79//SirozmDtDpqwVXH3CmvIs7GNwfh0="; + }) + (fetchNuGet { + pname = "runtime.win-x64.runtime.native.System.Data.SqlClient.sni"; + version = "4.4.0"; + hash = "sha256-HoXKGBkue0RJT1SZxAliVmT5rbfU3xD8mH8hfCvRxwQ="; + }) + (fetchNuGet { + pname = "runtime.win-x86.runtime.native.System.Data.SqlClient.sni"; + version = "4.4.0"; + hash = "sha256-jPnWzDcbufO51GLGjynWHy0b+5PBqNxM+VKmSrObeUw="; + }) + (fetchNuGet { + pname = "Serilog"; + version = "3.1.1"; + hash = "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="; + }) + (fetchNuGet { + pname = "Serilog.AspNetCore"; + version = "8.0.1"; + hash = "sha256-a07P+0co6QuLuUw09PvvpLf9gix88Nw3dACsnSRcuW4="; + }) + (fetchNuGet { + pname = "Serilog.Extensions.Hosting"; + version = "8.0.0"; + hash = "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="; + }) + (fetchNuGet { + pname = "Serilog.Extensions.Logging"; + version = "8.0.0"; + hash = "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="; + }) + (fetchNuGet { + pname = "Serilog.Formatting.Compact"; + version = "2.0.0"; + hash = "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="; + }) + (fetchNuGet { + pname = "Serilog.Settings.Configuration"; + version = "8.0.0"; + hash = "sha256-JQ39fvhOFSUHE6r9DXJvLaZI+Lk7AYzuskQu3ux+hQg="; + }) + (fetchNuGet { + pname = "Serilog.Sinks.Console"; + version = "5.0.1"; + hash = "sha256-aveoZM25ykc2haBHCXWD09jxZ2t2tYIGmaNTaO2V0jI="; + }) + (fetchNuGet { + pname = "Serilog.Sinks.Debug"; + version = "2.0.0"; + hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; + }) + (fetchNuGet { + pname = "Serilog.Sinks.EventLog"; + version = "3.1.0"; + hash = "sha256-oAzpAdcF9Hdf99JjpbWvgYa5BkN+Ec4gc7SPHFVH7As="; + }) + (fetchNuGet { + pname = "Serilog.Sinks.File"; + version = "5.0.0"; + hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; + }) + (fetchNuGet { + pname = "SQLitePCLRaw.bundle_e_sqlite3"; + version = "2.1.6"; + hash = "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="; + }) + (fetchNuGet { + pname = "SQLitePCLRaw.core"; + version = "2.1.6"; + hash = "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="; + }) + (fetchNuGet { + pname = "SQLitePCLRaw.lib.e_sqlite3"; + version = "2.1.6"; + hash = "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="; + }) + (fetchNuGet { + pname = "SQLitePCLRaw.provider.e_sqlite3"; + version = "2.1.6"; + hash = "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="; + }) + (fetchNuGet { + pname = "System.AppContext"; + version = "4.1.0"; + hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.0.0"; + hash = "sha256-+YUymoyS0O+xVyF2+LiAdZlMww8nofPN4ja9ylYqRo8="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.3.0"; + hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.5.1"; + hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; + }) + (fetchNuGet { + pname = "System.CodeDom"; + version = "4.4.0"; + hash = "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0="; + }) + (fetchNuGet { + pname = "System.CodeDom"; + version = "4.6.0"; + hash = "sha256-nKJQMD3qFkNX+J+aXOjsSVloB1CbZ3QNLb96Xiz7wK0="; + }) + (fetchNuGet { + pname = "System.Collections"; + version = "4.0.11"; + hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; + }) + (fetchNuGet { + pname = "System.Collections"; + version = "4.3.0"; + hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; + }) + (fetchNuGet { + pname = "System.Collections.Concurrent"; + version = "4.0.12"; + hash = "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8="; + }) + (fetchNuGet { + pname = "System.Collections.Concurrent"; + version = "4.3.0"; + hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "1.2.0"; + hash = "sha256-FQ3l+ulbLSPhQ0JcQCC4D4SzjTnHsRqcOj56Ywy7pMo="; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "8.0.0"; + hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="; + }) + (fetchNuGet { + pname = "System.Collections.NonGeneric"; + version = "4.0.1"; + hash = "sha256-jdCVXmGOsJ+2F0xAagCkiMZ91SGAm9iOhO2u4ksmKaU="; + }) + (fetchNuGet { + pname = "System.Collections.NonGeneric"; + version = "4.3.0"; + hash = "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="; + }) + (fetchNuGet { + pname = "System.Collections.Specialized"; + version = "4.3.0"; + hash = "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="; + }) + (fetchNuGet { + pname = "System.ComponentModel"; + version = "4.3.0"; + hash = "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="; + }) + (fetchNuGet { + pname = "System.ComponentModel.Annotations"; + version = "4.6.0"; + hash = "sha256-dn91soWaR30tghqyv3oIjc0UgMAnuErwG0oXRKFdl0w="; + }) + (fetchNuGet { + pname = "System.ComponentModel.Annotations"; + version = "5.0.0"; + hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; + }) + (fetchNuGet { + pname = "System.ComponentModel.Primitives"; + version = "4.3.0"; + hash = "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="; + }) + (fetchNuGet { + pname = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + hash = "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="; + }) + (fetchNuGet { + pname = "System.Composition"; + version = "6.0.0"; + hash = "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw="; + }) + (fetchNuGet { + pname = "System.Composition.AttributedModel"; + version = "6.0.0"; + hash = "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc="; + }) + (fetchNuGet { + pname = "System.Composition.Convention"; + version = "6.0.0"; + hash = "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo="; + }) + (fetchNuGet { + pname = "System.Composition.Hosting"; + version = "6.0.0"; + hash = "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4="; + }) + (fetchNuGet { + pname = "System.Composition.Runtime"; + version = "6.0.0"; + hash = "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8="; + }) + (fetchNuGet { + pname = "System.Composition.TypedParts"; + version = "6.0.0"; + hash = "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k="; + }) + (fetchNuGet { + pname = "System.Configuration.ConfigurationManager"; + version = "4.6.0"; + hash = "sha256-x54SBQYZLkU5AcCMOqx5VR6jM/43E2JFL894UtPAxE4="; + }) + (fetchNuGet { + pname = "System.Console"; + version = "4.0.0"; + hash = "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo="; + }) + (fetchNuGet { + pname = "System.Data.SqlClient"; + version = "4.7.0"; + hash = "sha256-fckcu7RCKtndbfbIvBKnOb2xgr8bZKZ5B2mx0pBRwZw="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Contracts"; + version = "4.0.1"; + hash = "sha256-Mq2MU+80m+zqhe92JazEIDi4rsgk8MHg3yjNYlObzXg="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Debug"; + version = "4.0.11"; + hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "4.0.0"; + hash = "sha256-dYh9UoFesuGcHY+ewsI+z2WnNy+bwHPsHQ3t85cbzNg="; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "6.0.0"; + hash = "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc="; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "8.0.0"; + hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; + }) + (fetchNuGet { + pname = "System.Diagnostics.EventLog"; + version = "4.5.0"; + hash = "sha256-tKBKgUhEM6D7XJlzmHc/F8ekqJx8rHO4QYUMjzbIs9I="; + }) + (fetchNuGet { + pname = "System.Diagnostics.EventLog"; + version = "8.0.0"; + hash = "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="; + }) + (fetchNuGet { + pname = "System.Diagnostics.FileVersionInfo"; + version = "4.0.0"; + hash = "sha256-Yy94jPhDXF2QHOF7qTmqKkn1048K9xkKryuBeDzsu+g="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Process"; + version = "4.1.0"; + hash = "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tools"; + version = "4.0.1"; + hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tools"; + version = "4.3.0"; + hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; + }) + (fetchNuGet { + pname = "System.Diagnostics.TraceSource"; + version = "4.0.0"; + hash = "sha256-cCjdPU7ow91HGf1hBIOLJMQGO6pNmF+N+5/Z38XJh9U="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tracing"; + version = "4.1.0"; + hash = "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tracing"; + version = "4.3.0"; + hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; + }) + (fetchNuGet { + pname = "System.Drawing.Common"; + version = "4.6.0"; + hash = "sha256-D6PMDq8M2aSrnDeBYfFftaX7hFLcxrOYFLrtxbERMAM="; + }) + (fetchNuGet { + pname = "System.Dynamic.Runtime"; + version = "4.0.11"; + hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; + }) + (fetchNuGet { + pname = "System.Dynamic.Runtime"; + version = "4.3.0"; + hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; + }) + (fetchNuGet { + pname = "System.Formats.Asn1"; + version = "8.0.0"; + hash = "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI="; + }) + (fetchNuGet { + pname = "System.Globalization"; + version = "4.0.11"; + hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; + }) + (fetchNuGet { + pname = "System.Globalization"; + version = "4.3.0"; + hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; + }) + (fetchNuGet { + pname = "System.Globalization.Calendars"; + version = "4.0.1"; + hash = "sha256-EJN3LbN+b0O9Dr2eg7kfThCYpne0iJ/H/GIyUTNVYC8="; + }) + (fetchNuGet { + pname = "System.Globalization.Calendars"; + version = "4.3.0"; + hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; + }) + (fetchNuGet { + pname = "System.Globalization.Extensions"; + version = "4.0.1"; + hash = "sha256-zLtkPryJwqTGcJqMC6zoMMvMrT+aAL5GoumjmMtqUEI="; + }) + (fetchNuGet { + pname = "System.Globalization.Extensions"; + version = "4.3.0"; + hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; + }) + (fetchNuGet { + pname = "System.IO"; + version = "4.1.0"; + hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; + }) + (fetchNuGet { + pname = "System.IO"; + version = "4.3.0"; + hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; + }) + (fetchNuGet { + pname = "System.IO.Compression"; + version = "4.1.0"; + hash = "sha256-UT4KEfJNZOk7b4X0AqLFUsqfHu6myVH/BhbRKYc+1Uc="; + }) + (fetchNuGet { + pname = "System.IO.Compression.ZipFile"; + version = "4.0.1"; + hash = "sha256-An0Twb9JODl/nuVm6MR0kJ3aj4WxGpI/1/vVp5b94kA="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem"; + version = "4.0.1"; + hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem"; + version = "4.3.0"; + hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; + }) + (fetchNuGet { + pname = "System.IO.Pipelines"; + version = "6.0.3"; + hash = "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="; + }) + (fetchNuGet { + pname = "System.IO.Pipes"; + version = "4.0.0"; + hash = "sha256-6qMAD6DCZ5c1wswLWi1msqwu8GwI8un1RzjpUhzbrjs="; + }) + (fetchNuGet { + pname = "System.Linq"; + version = "4.1.0"; + hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; + }) + (fetchNuGet { + pname = "System.Linq"; + version = "4.3.0"; + hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; + }) + (fetchNuGet { + pname = "System.Linq.Dynamic.Core"; + version = "1.3.14"; + hash = "sha256-tT9V1Y9vKfrzEmmBTYmGmzLPBfCHCXMZ8Jvluf3mliA="; + }) + (fetchNuGet { + pname = "System.Linq.Expressions"; + version = "4.1.0"; + hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; + }) + (fetchNuGet { + pname = "System.Linq.Expressions"; + version = "4.3.0"; + hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; + }) + (fetchNuGet { + pname = "System.Linq.Parallel"; + version = "4.0.1"; + hash = "sha256-TV1F3KYFipPmPnWFjX6hOZQNFsG2m729EdgPSFzqY0Q="; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.3"; + hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.5"; + hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; + }) + (fetchNuGet { + pname = "System.Net.Http"; + version = "4.1.0"; + hash = "sha256-y6PnGuObJvOkhl9CXNFJQcV3SXuEz5yRLOCxGGTEucQ="; + }) + (fetchNuGet { + pname = "System.Net.Primitives"; + version = "4.0.11"; + hash = "sha256-2YSijNhCdw/ZU2yfH7vE+ReA8pgxRCXPnWr+ab36v4M="; + }) + (fetchNuGet { + pname = "System.Net.Primitives"; + version = "4.3.0"; + hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; + }) + (fetchNuGet { + pname = "System.Net.Security"; + version = "4.3.2"; + hash = "sha256-CAuJ0uLmDKRqbG42rBhHjHcKelYTE5gpjRlrvYNigas="; + }) + (fetchNuGet { + pname = "System.Net.Sockets"; + version = "4.1.0"; + hash = "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0="; + }) + (fetchNuGet { + pname = "System.Numerics.Vectors"; + version = "4.4.0"; + hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; + }) + (fetchNuGet { + pname = "System.ObjectModel"; + version = "4.0.12"; + hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; + }) + (fetchNuGet { + pname = "System.ObjectModel"; + version = "4.3.0"; + hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; + }) + (fetchNuGet { + pname = "System.Private.DataContractSerialization"; + version = "4.1.1"; + hash = "sha256-OaE+ZcEfkpIkbdMOMAMiJa9vgiVP25FGuFrf+N/mafY="; + }) + (fetchNuGet { + pname = "System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; + }) + (fetchNuGet { + pname = "System.Reactive"; + version = "6.0.0"; + hash = "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.1.0"; + hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.3.0"; + hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit"; + version = "4.0.1"; + hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit"; + version = "4.3.0"; + hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; + }) + (fetchNuGet { + pname = "System.Reflection.Extensions"; + version = "4.0.1"; + hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; + }) + (fetchNuGet { + pname = "System.Reflection.Extensions"; + version = "4.3.0"; + hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; + }) + (fetchNuGet { + pname = "System.Reflection.Metadata"; + version = "1.3.0"; + hash = "sha256-a/RQr++mSsziWaOTknicfIQX/zJrwPFExfhK6PM0tfg="; + }) + (fetchNuGet { + pname = "System.Reflection.Metadata"; + version = "8.0.0"; + hash = "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.0.1"; + hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; + }) + (fetchNuGet { + pname = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; + }) + (fetchNuGet { + pname = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; + }) + (fetchNuGet { + pname = "System.Resources.Reader"; + version = "4.0.0"; + hash = "sha256-NOax26EYc/L4bfedL2a33fg4sFXVkBwzVTQ41saJTsk="; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.0.1"; + hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; + }) + (fetchNuGet { + pname = "System.Resources.Writer"; + version = "4.0.0"; + hash = "sha256-u9LxSndJMc3H/8GoelW6iyn7erRXy3YEvZs1OVEQFx4="; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.1.0"; + hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.3.0"; + hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.0-preview1-26216-02"; + hash = "sha256-xE1bUh7w/hZrknJ2kn1ZKIQO/vW2js9SJxaGXkGq3TI="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.3"; + hash = "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "6.0.0"; + hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.1.0"; + hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.0.1"; + hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices"; + version = "4.1.0"; + hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + hash = "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="; + }) + (fetchNuGet { + pname = "System.Runtime.Loader"; + version = "4.0.0"; + hash = "sha256-gE5/ehU3Qq5phhSxGuPmSv1DFVQeiyl1/+YyrO+I7lI="; + }) + (fetchNuGet { + pname = "System.Runtime.Numerics"; + version = "4.0.1"; + hash = "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg="; + }) + (fetchNuGet { + pname = "System.Runtime.Numerics"; + version = "4.3.0"; + hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; + }) + (fetchNuGet { + pname = "System.Runtime.Serialization.Formatters"; + version = "4.3.0"; + hash = "sha256-Feic7MGKVG4imh7kpLkPHmApQzYjq7SxHnazh2wZkoQ="; + }) + (fetchNuGet { + pname = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; + }) + (fetchNuGet { + pname = "System.Runtime.Serialization.Primitives"; + version = "4.3.0"; + hash = "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc="; + }) + (fetchNuGet { + pname = "System.Runtime.Serialization.Xml"; + version = "4.1.1"; + hash = "sha256-Mx/8hiqvp1E4I6ysJC3U8D2B9qhRQcVvEOivV6w65IQ="; + }) + (fetchNuGet { + pname = "System.Security.AccessControl"; + version = "4.5.0"; + hash = "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="; + }) + (fetchNuGet { + pname = "System.Security.AccessControl"; + version = "4.6.0"; + hash = "sha256-rspJ63MbjNVDve0owXby0Pu2vHjQvR2uuhCDCJ9vgfI="; + }) + (fetchNuGet { + pname = "System.Security.Claims"; + version = "4.3.0"; + hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + hash = "sha256-BelNIpEyToEp/VYKnje/q1P7KNEpQNtOzGPU18pLGpE="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + hash = "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + hash = "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + hash = "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + hash = "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Pkcs"; + version = "8.0.0"; + hash = "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + hash = "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.ProtectedData"; + version = "4.6.0"; + hash = "sha256-vmZTCnDlFMzMpsJX5SE4fVJTZh6jKN7AbHjKMftYg7s="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + hash = "sha256-sBUUhJP+yYDXvcjNMKqNpn8yzGUpVABwK9vVUvYKjzI="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; + }) + (fetchNuGet { + pname = "System.Security.Permissions"; + version = "4.5.0"; + hash = "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ="; + }) + (fetchNuGet { + pname = "System.Security.Permissions"; + version = "4.6.0"; + hash = "sha256-AByObHSxKL0vJvhTWuv4QPN01WnXDKKbnxfzG2tWrCA="; + }) + (fetchNuGet { + pname = "System.Security.Principal"; + version = "4.0.1"; + hash = "sha256-9wBgPnJfFOtrhKZ7wDXZ4q12GklQ49Ka02/9v7Frf9k="; + }) + (fetchNuGet { + pname = "System.Security.Principal"; + version = "4.3.0"; + hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; + }) + (fetchNuGet { + pname = "System.Security.Principal.Windows"; + version = "4.5.0"; + hash = "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="; + }) + (fetchNuGet { + pname = "System.Security.Principal.Windows"; + version = "4.6.0"; + hash = "sha256-lZeXm45RboVgqnPQVJ65y8b5b+9FSVr0MBciG777rso="; + }) + (fetchNuGet { + pname = "System.ServiceProcess.ServiceController"; + version = "8.0.0"; + hash = "sha256-mq/Qm8JeMUvitHf32/F8uvw1YJGx4prGnEI/VzdaFAI="; + }) + (fetchNuGet { + pname = "System.Text.Encoding"; + version = "4.0.11"; + hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; + }) + (fetchNuGet { + pname = "System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "4.0.1"; + hash = "sha256-wxtwWQSTv5tuFP79KhUAhaL6bL4d8lSzSWkCn9aolwM="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "8.0.0"; + hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; + }) + (fetchNuGet { + pname = "System.Text.Encodings.Web"; + version = "8.0.0"; + hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; + }) + (fetchNuGet { + pname = "System.Text.Json"; + version = "8.0.0"; + hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; + }) + (fetchNuGet { + pname = "System.Text.RegularExpressions"; + version = "4.1.0"; + hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; + }) + (fetchNuGet { + pname = "System.Text.RegularExpressions"; + version = "4.3.0"; + hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.0.11"; + hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.3.0"; + hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; + }) + (fetchNuGet { + pname = "System.Threading.AccessControl"; + version = "4.5.0"; + hash = "sha256-x3Na5DscrtkFGnZycNeZd3vc8zDsIWKnINL/1JGzcOI="; + }) + (fetchNuGet { + pname = "System.Threading.Channels"; + version = "6.0.0"; + hash = "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="; + }) + (fetchNuGet { + pname = "System.Threading.Overlapped"; + version = "4.0.1"; + hash = "sha256-CAWZlavcuBQHs+kaSX9CmkpHF7wC8rFrug3XPb5KJzo="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.0.11"; + hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Dataflow"; + version = "4.6.0"; + hash = "sha256-YYrT3GRzVBdendxt8FUDCnOBJi0nw/CJ9VrzcPJWLSg="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.5.4"; + hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Parallel"; + version = "4.0.1"; + hash = "sha256-5VyRZ97Fug4reK/cQ6wsCrJ5jH53aGu1a4ZkKMZrnIQ="; + }) + (fetchNuGet { + pname = "System.Threading.Thread"; + version = "4.0.0"; + hash = "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8="; + }) + (fetchNuGet { + pname = "System.Threading.ThreadPool"; + version = "4.0.10"; + hash = "sha256-/fowWjM/0ZZFC1Rwu0i5N71iRxV2JOd3jQV2Jn0wuTk="; + }) + (fetchNuGet { + pname = "System.Threading.ThreadPool"; + version = "4.3.0"; + hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; + }) + (fetchNuGet { + pname = "System.Threading.Timer"; + version = "4.0.1"; + hash = "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY="; + }) + (fetchNuGet { + pname = "System.Windows.Extensions"; + version = "4.6.0"; + hash = "sha256-08W7PEiGAJJIMIKXieRgesIvtj4+/bUnBaFGypdXRcU="; + }) + (fetchNuGet { + pname = "System.Xml.ReaderWriter"; + version = "4.0.11"; + hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; + }) + (fetchNuGet { + pname = "System.Xml.ReaderWriter"; + version = "4.3.0"; + hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; + }) + (fetchNuGet { + pname = "System.Xml.XDocument"; + version = "4.0.11"; + hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; + }) + (fetchNuGet { + pname = "System.Xml.XDocument"; + version = "4.3.0"; + hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; + }) + (fetchNuGet { + pname = "System.Xml.XmlDocument"; + version = "4.0.1"; + hash = "sha256-gdoFrPo54v1LjkBF79f8EvtltVVjHz9ZI9kc5ve0GkY="; + }) + (fetchNuGet { + pname = "System.Xml.XmlDocument"; + version = "4.3.0"; + hash = "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="; + }) + (fetchNuGet { + pname = "System.Xml.XmlSerializer"; + version = "4.0.11"; + hash = "sha256-v6x4d6W18dijG5cDqQmVHdtWRf6Y4OkdBolT3d5g3wY="; + }) + (fetchNuGet { + pname = "System.Xml.XPath"; + version = "4.0.1"; + hash = "sha256-lQCoK2M51SGRuGjfiuIW26Y2goABY2RLE6cZ4816WDo="; + }) + (fetchNuGet { + pname = "System.Xml.XPath.XmlDocument"; + version = "4.0.1"; + hash = "sha256-bK9AfAYrdSipdRbmo8Rk7394ku92UFNe2TEQF5+k/lA="; + }) + (fetchNuGet { + pname = "VueCliMiddleware"; + version = "6.0.0"; + hash = "sha256-0OvENncGlUduhcdRByS9LIHVnU3r7xy+7lUsaRWqwbU="; + }) + (fetchNuGet { + pname = "YamlDotNet"; + version = "13.7.1"; + hash = "sha256-v8w1hh8FCxJQMEPq+YUh9Oi4LE/ndi+vE2igLJazVNQ="; + }) +] diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix new file mode 100644 index 0000000000000..8c6299b22c565 --- /dev/null +++ b/pkgs/by-name/sm/smtp4dev/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + buildDotnetModule, + fetchFromGitHub, + nodejs, + npmHooks, + fetchNpmDeps, + dotnetCorePackages, +}: +let + version = "3.6.1"; + src = fetchFromGitHub { + owner = "rnwood"; + repo = "smtp4dev"; + rev = "refs/tags/${version}"; + hash = "sha256-T6ci7+xbzpOrNr8hpDCwk5qe01L2Ho5V1oM7Hhd8bgg="; + }; + npmRoot = "Rnwood.Smtp4dev/ClientApp"; +in +buildDotnetModule { + inherit version src npmRoot; + pname = "smtp4dev"; + + nativeBuildInputs = [ + nodejs + nodejs.python + npmHooks.npmConfigHook + stdenv.cc # c compiler is needed for compiling npm-deps + ]; + + npmDeps = fetchNpmDeps { + src = "${src}/${npmRoot}"; + hash = "sha256-/Z6sBxA2ReHlEbz0zJjlpn6IwzHDQiXN5ixEV1/iCJI="; + }; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + projectFile = "Rnwood.Smtp4dev/Rnwood.Smtp4dev.csproj"; + nugetDeps = ./deps.nix; + executables = [ "Rnwood.Smtp4dev" ]; + + postFixup = '' + mv $out/bin/Rnwood.Smtp4dev $out/bin/smtp4dev + ''; + + meta = { + description = "Fake smtp email server for development and testing"; + homepage = "https://github.com/rnwood/smtp4dev"; + license = lib.licenses.bsd3; + mainProgram = "smtp4dev"; + maintainers = with lib.maintainers; [ + rucadi + jchw + ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/sm/smuview/package.nix b/pkgs/by-name/sm/smuview/package.nix index 907e332279ca0..a030d649992dd 100644 --- a/pkgs/by-name/sm/smuview/package.nix +++ b/pkgs/by-name/sm/smuview/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config qt5.wrapQtAppsHook ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ glib @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { python3 pcre libsForQt5.qwt - ] ++ lib.optionals stdenv.isLinux [ bluez ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; meta = with lib; { description = "Qt based source measure unit GUI for sigrok"; diff --git a/pkgs/by-name/sm/smuxi/package.nix b/pkgs/by-name/sm/smuxi/package.nix index e8a743be45ad3..72354275e3981 100644 --- a/pkgs/by-name/sm/smuxi/package.nix +++ b/pkgs/by-name/sm/smuxi/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "smuxi"; version = "unstable-2023-07-01"; - runtimeLoaderEnvVariableName = if stdenv.isDarwin then + runtimeLoaderEnvVariableName = if stdenv.hostPlatform.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; @@ -30,11 +30,10 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ autoconf automake itstool intltool gettext mono - stfl - makeWrapper ] ++ lib.optionals (guiSupport) [ + stfl ] ++ lib.optionals (guiSupport) [ gtk-sharp-2_0 # loaded at runtime by GTK# gdk-pixbuf pango @@ -85,7 +84,7 @@ stdenv.mkDerivation rec { cp -a lib/Nini.dll $out/lib/smuxi/ # install GTK+ icon theme on Darwin - ${if guiSupport && stdenv.isDarwin then " + ${if guiSupport && stdenv.hostPlatform.isDarwin then " mkdir -p $out/lib/smuxi/icons/ cp -a images/Smuxi-Symbolic $out/lib/smuxi/icons/ " else ""} diff --git a/pkgs/by-name/sn/sn-pro/package.nix b/pkgs/by-name/sn/sn-pro/package.nix index b8e431c6efcfa..d1f916551a6ab 100644 --- a/pkgs/by-name/sn/sn-pro/package.nix +++ b/pkgs/by-name/sn/sn-pro/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sn-pro"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "supernotes"; repo = "sn-pro"; rev = version; - hash = "sha256-G/DIHWs91HYVbrV/jZ4aFsCCjqORo8YeqcHGN0LZ8p4="; + hash = "sha256-7GrCEYgP6kfdlAWjNddmkwJrB/s1mFmugMGPPOM34JA="; }; installPhase = '' diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix index 43eadd2c39402..6e9afcd4a1491 100644 --- a/pkgs/by-name/sn/sn0int/package.nix +++ b/pkgs/by-name/sn/sn0int/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ze4OFKUuc/t6tXgmoWFFDjpAQraSY6RIekkcDBctPJo="; + hash = "sha256-tiJLwlxZ9ndircgkH23ew+3QJeuuqt93JahAtFPcuG8="; }; - cargoHash = "sha256-PAKmoifqB1YC02fVF2SRbXAAGrMcB+Wlvr3FwuqmPVU="; + cargoHash = "sha256-3FrUlv6UxULsrvgyV5mlry9j3wFMiXZVoxk6z6pRM3I="; nativeBuildInputs = [ pkg-config @@ -31,9 +31,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libsodium sqlite - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libseccomp - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 68e0e09c5b55b..d8ae5e24b1cba 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -5,37 +5,14 @@ lib, makeWrapper, nix-update-script, - python3, + python3Packages, squashfsTools, stdenv, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec { - version = "0.11.2"; - src = fetchFromGitHub { - owner = "NowanIlfideme"; - repo = "pydantic-yaml"; - rev = "refs/tags/v${version}"; - hash = "sha256-AeUyVav0/k4Fz69Qizn4hcJKoi/CDR9eUan/nJhWsDY="; - }; - dependencies = with self; [ - deprecated - importlib-metadata - pydantic_1 - ruamel-yaml - types-deprecated - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "snapcraft"; - version = "8.3.2"; + version = "8.4.1"; pyproject = true; @@ -43,7 +20,7 @@ python.pkgs.buildPythonApplication rec { owner = "canonical"; repo = "snapcraft"; rev = "refs/tags/${version}"; - hash = "sha256-JlmVnSpbMjMpJBXyRxF/LqJ+0e5fty6BK+sCPJ2Uw9I="; + hash = "sha256-34LtQ0CV5Ov0RJvN2eNFYEvtccHebpqjaYlhExE/z4c="; }; patches = [ @@ -93,7 +70,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper ]; - dependencies = with python.pkgs; [ + dependencies = with python3Packages; [ attrs catkin-pkg click @@ -102,6 +79,7 @@ python.pkgs.buildPythonApplication rec { craft-cli craft-grammar craft-parts + craft-platforms craft-providers craft-store debian @@ -136,7 +114,7 @@ python.pkgs.buildPythonApplication rec { validators ]; - build-system = with python.pkgs; [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; pythonRelaxDeps = [ "docutils" @@ -151,7 +129,7 @@ python.pkgs.buildPythonApplication rec { ''; nativeCheckInputs = - with python.pkgs; + with python3Packages; [ pytest-check pytest-cov-stub @@ -196,7 +174,7 @@ python.pkgs.buildPythonApplication rec { "test_snap_command_fallback" "test_validate_architectures_supported" "test_validate_architectures_unsupported" - ] ++ lib.optionals stdenv.isAarch64 [ "test_load_project" ]; + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_load_project" ]; disabledTestPaths = [ "tests/unit/commands/test_remote.py" diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix index 1888a2df41861..31aa73db6a923 100644 --- a/pkgs/by-name/sn/snes9x/package.nix +++ b/pkgs/by-name/sn/snes9x/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { minizip zlib ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib pulseaudio libselinux @@ -137,6 +137,6 @@ stdenv.mkDerivation (finalAttrs: { sugar700 ]; platforms = lib.platforms.unix; - broken = (withGtk && stdenv.isDarwin); + broken = (withGtk && stdenv.hostPlatform.isDarwin); }; }) diff --git a/pkgs/by-name/sn/sng/package.nix b/pkgs/by-name/sn/sng/package.nix new file mode 100644 index 0000000000000..544a07165d2de --- /dev/null +++ b/pkgs/by-name/sn/sng/package.nix @@ -0,0 +1,47 @@ +{ + lib, + asciidoctor, + fetchurl, + libpng, + netpbm, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sng"; + version = "1.1.1"; + + src = fetchurl { + url = "mirror://sourceforge/sng/sng-${finalAttrs.version}.tar.xz"; + hash = "sha256-yb37gPWhfbGquTN7rtZKjr6lwN34KRXGiHuM+4fs5h4="; + }; + + nativeBuildInputs = [ asciidoctor ]; + + buildInputs = [ libpng ]; + + outputs = [ + "out" + "man" + ]; + + makeFlags = [ + "prefix=$(out)" + "MANDIR=$(outputMan)/share/man" + "RGBTXT=${netpbm.out}/share/netpbm/misc/rgb.txt" + ]; + + strictDeps = true; + + meta = { + homepage = "https://sng.sourceforge.net/"; + description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form"; + license = lib.licenses.zlib; + mainProgram = "sng"; + maintainers = with lib.maintainers; [ + dezgeg + AndersonTorres + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/sn/snicat/package.nix b/pkgs/by-name/sn/snicat/package.nix index d38a45f593899..38316a5dcfc76 100644 --- a/pkgs/by-name/sn/snicat/package.nix +++ b/pkgs/by-name/sn/snicat/package.nix @@ -1,31 +1,27 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, fetchpatch +{ + lib, + buildGoModule, + fetchFromGitHub, }: + buildGoModule rec { pname = "snicat"; - version = "0.0.1"; + version = "0.0.1-unstable-2024-09-05"; src = fetchFromGitHub { owner = "CTFd"; repo = "snicat"; - rev = version; - hash = "sha256-fFlTBOz127le2Y7F9KKhbcldcyFEpAU5QiJ4VCAPs9Y="; + rev = "8c8f06e59d5aedb9a97115a4e0eafa75b17a6cdf"; + hash = "sha256-71wVth+VzEnGW8ErWmj6XjhNtVpx/q8lViIA71njwqU="; }; - patches = [ - # Migrate to Go modules - (fetchpatch { - url = "https://github.com/CTFd/snicat/commit/098a5ce3141bae5d2e188338d78517d710d10f70.patch"; - hash = "sha256-pIdXViUz14nkvL1H3u3oFkm308XA2POtKIGZOKDO6p8="; - }) - ]; - vendorHash = "sha256-27ykI9HK1jFanxwa6QrN6ZS548JbFNSZHaXr4ciCVOE="; proxyVendor = true; - ldflags = [ "-s" "-X main.version=v${version}" ]; + ldflags = [ + "-s" + "-X main.version=v${version}" + ]; postInstall = '' mv $out/bin/snicat $out/bin/sc diff --git a/pkgs/by-name/sn/sniffglue/package.nix b/pkgs/by-name/sn/sniffglue/package.nix index eb7cff5b7a8ec..5bafa510776fe 100644 --- a/pkgs/by-name/sn/sniffglue/package.nix +++ b/pkgs/by-name/sn/sniffglue/package.nix @@ -9,22 +9,22 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - hash = "sha256-MOw0WBdpo6dYXsjbUrqoIJl/sjQ4wSAcm4dPxDgTYgY="; + hash = "sha256-Pp/SJJQFpEU/4GKZQB8BjRGS4hqB850QbSb5WoG6Wh4="; }; - cargoHash = "sha256-vnfviiXJ4L/j5M3N+LegOIvLuD6vYJB1QeBgZJVfDnI="; + cargoHash = "sha256-/MGrdo8cmodC3oVWk6y8C73gsLKROmNOI9aytPPzA8o="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libseccomp ]; diff --git a/pkgs/by-name/sn/snipaste/package.nix b/pkgs/by-name/sn/snipaste/package.nix index 4b62ab5dce438..45b35d04d68e1 100644 --- a/pkgs/by-name/sn/snipaste/package.nix +++ b/pkgs/by-name/sn/snipaste/package.nix @@ -5,20 +5,20 @@ }: appimageTools.wrapType2 rec { pname = "snipaste"; - version = "2.9-Beta2"; + version = "2.9.2-Beta"; src = fetchurl { url = "https://download.snipaste.com/archives/Snipaste-${version}-x86_64.AppImage"; - hash = "sha256-VJvw3M1Ohfji/PoIxn4gc9KcFl6H1wRYW5Pbf1p5rlg="; + hash = "sha256-oV69uABjzkbQdwb+1wRRxszhrwI4uyzhQZ4aXBnyeo8="; }; - meta = with lib; { + meta = { description = "Screenshot tools"; homepage = "https://www.snipaste.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ luftmensch-luftmensch ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; mainProgram = "snipaste"; platforms = [ "x86_64-linux" ]; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; } diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix index 4503f82e2ac66..da38ec7f58874 100644 --- a/pkgs/by-name/sn/snipe-it/package.nix +++ b/pkgs/by-name/sn/snipe-it/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject (finalAttrs: { pname = "snipe-it"; - version = "7.0.7"; + version = "7.0.12"; src = fetchFromGitHub { owner = "snipe"; repo = "snipe-it"; rev = "v${finalAttrs.version}"; - hash = "sha256-cka3ZczRYXmzeokiUg2WarArvW507AVsCIadPlVUYWo="; + hash = "sha256-CTOhnGDmvxcQrS7VPsMeap6aD9YajSZ/C25RcRbL65w="; }; - vendorHash = "sha256-nwzPmelTvInx055lyuhiTioWyF0JSCjNa2Ky8yQXwtc="; + vendorHash = "sha256-8YZD6Q1Mb5VUGL/KQnYTtXKL3aziPfAmwvVthDdyBYY="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" diff --git a/pkgs/by-name/sn/snips-sh/package.nix b/pkgs/by-name/sn/snips-sh/package.nix new file mode 100644 index 0000000000000..9d3ee7d58854c --- /dev/null +++ b/pkgs/by-name/sn/snips-sh/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + sqlite, + libtensorflow, + withTensorflow ? false, +}: +buildGoModule rec { + pname = "snips-sh"; + version = "0.4.0"; + vendorHash = "sha256-u2f9aHUrfuM4ZsTWA955sCkgcGBFlNhEU2Qlq2C2Kso="; + + src = fetchFromGitHub { + owner = "robherley"; + repo = "snips.sh"; + rev = "v${version}"; + hash = "sha256-gfZFLlTFofYQ72rQjgB8g012vbxFjk8bLYTVJwZNgMs="; + }; + + tags = (lib.optional (!withTensorflow) "noguesser"); + + buildInputs = [ sqlite ] ++ (lib.optional withTensorflow libtensorflow); + + meta = { + description = "passwordless, anonymous SSH-powered pastebin with a human-friendly TUI and web UI"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + homepage = "https://snips.sh"; + maintainers = with lib.maintainers; [ jeremiahs ]; + mainProgram = "snips.sh"; + }; +} diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix index a23964246f29b..5abe3dff4154c 100644 --- a/pkgs/by-name/sn/snpguest/package.nix +++ b/pkgs/by-name/sn/snpguest/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "snpguest"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "virtee"; repo = "snpguest"; - rev = "v${version}"; - hash = "sha256-9TchRaZPQKAsncs+mlHvzeie9IIVZeea/LfBLXOLuNg="; + rev = "refs/tags/v${version}"; + hash = "sha256-otsgMUdDp93J/ynquHDs6+oLh0CunyfqZwmcKXcXX0Q="; }; - cargoHash = "sha256-1UX5GiwH38W+IgZO+0EA3M86iWMylM8fgr48DRD187A="; + cargoHash = "sha256-n3gqw4R8NZP8l2PmHWag+cBXlLx1GQPPADBmaYRTe6Q="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sn/snphost/package.nix b/pkgs/by-name/sn/snphost/package.nix index fcee69dd53706..70911bedcc95f 100644 --- a/pkgs/by-name/sn/snphost/package.nix +++ b/pkgs/by-name/sn/snphost/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "snphost"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "virtee"; repo = "snphost"; - rev = "v${version}"; - hash = "sha256-ChB745I+4CuN/qvWW5e5gPWBdTDJdrUMiHO3LkmTwtk="; + rev = "refs/tags/v${version}"; + hash = "sha256-GaeNoLx/fV/NNUS2b2auGvylhW6MOFp98Xi0sdDV3VM="; }; - cargoHash = "sha256-yXjrTxCRI+1IMRmBYLw9+uHr9BVVhRXx6zU2q3sYf9s="; + cargoHash = "sha256-fG3MTCHfIfYeFK03Ee9uzq8e7f5NN/h8LIye7Y3+0uI="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/sn/snyk/package.nix b/pkgs/by-name/sn/snyk/package.nix new file mode 100644 index 0000000000000..4c90ad105a6fe --- /dev/null +++ b/pkgs/by-name/sn/snyk/package.nix @@ -0,0 +1,51 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + stdenv, + testers, + snyk, +}: + +let + version = "1.1293.1"; +in +buildNpmPackage { + pname = "snyk"; + inherit version; + + src = fetchFromGitHub { + owner = "snyk"; + repo = "cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-Vgt9h0LLIC5I9NZZKKWD9b1xnNOSkxApLxSGf2C0ODk="; + }; + + npmDepsHash = "sha256-1YtyQg14vj85KtOXP93vLkqIMmT+8DAJdG/ql+1ooyU="; + + postPatch = '' + substituteInPlace package.json \ + --replace-fail '"version": "1.0.0-monorepo"' '"version": "${version}"' + ''; + + env.NIX_CFLAGS_COMPILE = + # Fix error: no member named 'aligned_alloc' in the global namespace + lib.optionalString ( + stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 + ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; + + npmBuildScript = "build:prod"; + + passthru.tests.version = testers.testVersion { + package = snyk; + }; + + meta = { + description = "Scans and monitors projects for security vulnerabilities"; + homepage = "https://snyk.io"; + changelog = "https://github.com/snyk/cli/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ momeemt ]; + mainProgram = "snyk"; + }; +} diff --git a/pkgs/by-name/so/so/package.nix b/pkgs/by-name/so/so/package.nix index ce5077932b050..12c978a9b3aaf 100644 --- a/pkgs/by-name/so/so/package.nix +++ b/pkgs/by-name/so/so/package.nix @@ -11,7 +11,7 @@ }: let - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; self = rustPlatform.buildRustPackage { pname = "so"; version = "0.4.10"; @@ -31,9 +31,11 @@ let buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv + CoreServices Security + SystemConfiguration ]; strictDeps = true; @@ -56,7 +58,10 @@ let changelog = "https://github.com/samtay/so/blob/main/CHANGELOG.md"; mainProgram = "so"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ + AndersonTorres + unsolvedcypher + ]; }; }; in diff --git a/pkgs/by-name/so/softether/package.nix b/pkgs/by-name/so/softether/package.nix new file mode 100644 index 0000000000000..2f7cba3428087 --- /dev/null +++ b/pkgs/by-name/so/softether/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchurl, + openssl, + readline, + ncurses, + zlib, + dataDir ? "/var/lib/softether", +}: + +stdenv.mkDerivation rec { + pname = "softether"; + version = "4.38"; + build = "9760"; + + src = fetchurl { + url = "https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/releases/download/v${version}-${build}-rtm/softether-src-v${version}-${build}-rtm.tar.gz"; + sha256 = "0d8zahi9lkv72jh8yj66pwrsi4451vk113d3khzrzgbic6s2i0g6"; + }; + + buildInputs = [ + openssl + readline + ncurses + zlib + ]; + + preConfigure = '' + ./configure + ''; + + buildPhase = '' + mkdir -p $out/bin + sed -i \ + -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \ + -e "/_DIR=/s|/usr|${dataDir}|g" \ + -e "s|\$(INSTALL|$out/\$(INSTALL|g" \ + -e "/echo/s|echo $out/|echo |g" \ + Makefile + ''; + + meta = with lib; { + description = "Open-Source Free Cross-platform Multi-protocol VPN Program"; + homepage = "https://www.softether.org/"; + license = licenses.asl20; + maintainers = [ maintainers.rick68 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix index aa7bcd58936d7..614be9acbc5f8 100644 --- a/pkgs/by-name/so/solana-cli/package.nix +++ b/pkgs/by-name/so/solana-cli/package.nix @@ -32,7 +32,7 @@ }: let version = "1.17.31"; - sha256 = "sha256-5qPW199o+CVJlqGwiAegsquBRWEb5uDKITxjN5dQYAQ="; + hash = "sha256-5qPW199o+CVJlqGwiAegsquBRWEb5uDKITxjN5dQYAQ="; rocksdb = rocksdb_8_3; inherit (darwin.apple_sdk_11_0) Libsystem; @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { owner = "solana-labs"; repo = "solana"; rev = "v${version}"; - inherit sha256; + inherit hash; }; cargoLock = { @@ -70,8 +70,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles protobuf pkg-config ]; buildInputs = [ openssl rustPlatform.bindgenHook ] - ++ lib.optionals stdenv.isLinux [ udev ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libcxx IOKit Security @@ -96,8 +96,8 @@ rustPlatform.buildRustPackage rec { # Require this on darwin otherwise the compiler starts rambling about missing # cmath functions - CPPFLAGS = lib.optionals stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; - LDFLAGS = lib.optionals stdenv.isDarwin "-L${lib.getLib libcxx}/lib"; + CPPFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; + LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-L${lib.getLib libcxx}/lib"; # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/misc/solfege/css.patch b/pkgs/by-name/so/solfege/css.patch similarity index 100% rename from pkgs/misc/solfege/css.patch rename to pkgs/by-name/so/solfege/css.patch diff --git a/pkgs/misc/solfege/menubar.patch b/pkgs/by-name/so/solfege/menubar.patch similarity index 100% rename from pkgs/misc/solfege/menubar.patch rename to pkgs/by-name/so/solfege/menubar.patch diff --git a/pkgs/by-name/so/solfege/package.nix b/pkgs/by-name/so/solfege/package.nix new file mode 100644 index 0000000000000..d3c8d113f75c2 --- /dev/null +++ b/pkgs/by-name/so/solfege/package.nix @@ -0,0 +1,98 @@ +{ + lib, + alsa-utils, + autoconf, + automake, + csound, + fetchurl, + gdk-pixbuf, + gettext, + gobject-introspection, + gtk3, + librsvg, + lilypond, + mpg123, + pkg-config, + python3Packages, + texinfo, + timidity, + txt2man, + vorbis-tools, + wrapGAppsHook3, +}: + +python3Packages.buildPythonApplication rec { + pname = "solfege"; + version = "3.23.4"; + format = "other"; + + src = fetchurl { + url = "https://alpha.gnu.org/gnu/solfege/solfege-${version}.tar.gz"; + hash = "sha256-t6JJxgGk5hpN76o9snxtM07tkYnwpQ808M/8Ttw+gWk="; + }; + + patches = [ + ./css.patch + ./menubar.patch + ./texinfo.patch + ./webbrowser.patch + ]; + + preConfigure = '' + aclocal + autoconf + ''; + + nativeBuildInputs = [ + autoconf + automake + gdk-pixbuf + gettext + gobject-introspection + pkg-config + texinfo + txt2man + wrapGAppsHook3 + ]; + + buildInputs = [ + gtk3 + librsvg + ]; + + propagatedBuildInputs = with python3Packages; [ + pycairo + pygobject3 + ]; + + preBuild = '' + sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \ + -e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \ + -e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \ + -e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \ + -e 's|csound=.*|csound=${csound}/bin/csound|' \ + -e 's|lilypond-book=.*|lilypond-book=${lilypond}/bin/lilypond-book|' \ + default.config + ''; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Ear training program"; + homepage = "https://www.gnu.org/software/solfege/"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ + bjornfor + orivej + anthonyroussel + ]; + mainProgram = "solfege"; + }; +} diff --git a/pkgs/misc/solfege/texinfo.patch b/pkgs/by-name/so/solfege/texinfo.patch similarity index 100% rename from pkgs/misc/solfege/texinfo.patch rename to pkgs/by-name/so/solfege/texinfo.patch diff --git a/pkgs/misc/solfege/webbrowser.patch b/pkgs/by-name/so/solfege/webbrowser.patch similarity index 100% rename from pkgs/misc/solfege/webbrowser.patch rename to pkgs/by-name/so/solfege/webbrowser.patch diff --git a/pkgs/by-name/so/solo5/package.nix b/pkgs/by-name/so/solo5/package.nix index 1ca866c81e5e2..15344f6805904 100644 --- a/pkgs/by-name/so/solo5/package.nix +++ b/pkgs/by-name/so/solo5/package.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; - sha256 = "sha256-J1xcL/AdcLQ7Ph3TFwEaS9l4cWjDQsTaXTdBDcT7p6E="; + hash = "sha256-J1xcL/AdcLQ7Ph3TFwEaS9l4cWjDQsTaXTdBDcT7p6E="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/by-name/so/sonarr/deps.nix b/pkgs/by-name/so/sonarr/deps.nix index dbf3a2421aa4b..d668314809f91 100644 --- a/pkgs/by-name/so/sonarr/deps.nix +++ b/pkgs/by-name/so/sonarr/deps.nix @@ -36,7 +36,6 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; hash = "sha256-SIO/Q+OD2bG+Q0EoOXRgJYzZMhahGXDG1fXZn0VUvv0="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.1"; hash = "sha256-v55PAURxnSGYgbv9x+4/pMeI51H27ikRfHBuUB+N5nE="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.1"; hash = "sha256-UXWzOFT0lc2Jtt3zNJ4xCEv0LCRPnWCnSoHQO2s3kZg="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; hash = "sha256-0+ywPdqMkx32+HcMHqAp00cWBE7aCNc09Xh2eRObHTs="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; hash = "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; hash = "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "6.0.0"; hash = "sha256-jFACPqLvGo14eg4G3hV/UYY/d9i3hNKvgL+3nnDGZME="; }) @@ -45,12 +44,10 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "6.0.0"; hash = "sha256-owzLlamhIWWEoV2oumAxv4G3IlYzYGaDse0GVb8u1LA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "6.0.1"; hash = "sha256-YTbqJElzPCfph1Nxyq2PUGV5lSY5GXFdshpKOPdvTTk="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; hash = "sha256-k/3UKceE1hbgv1sfV9H85hzWvMwooE8PcasHvHMhe1M="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; hash = "sha256-RN478YJQE0YM0g+JztXp00w57CIF4bb48hSD/z3jTZc="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; hash = "sha256-gZuMaunMJVyvvepuzNodGPRc6eqKH//bks3957dYkPI="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.1"; hash = "sha256-V+CulDoU3NXWn5EjH64JhDVQ0h+ev5BW95T+2uL1hU4="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; hash = "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; hash = "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; hash = "sha256-0sfuxZ07HsMZJpKatDrW6I671uJBYWsUgAyoDZA2n50="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; hash = "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; hash = "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; hash = "sha256-7dFo5itkB2OgSgS7dN87h0Xf2p5/f6fl2Ka6+CTEhDY="; }) @@ -61,10 +58,8 @@ (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "6.0.1"; hash = "sha256-L57B/mAxkzK7QEipV0KtHzxMtsxEZ+a4FdFkn/3/XIY="; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "6.0.0"; hash = "sha256-ksIPO6RhfbYx/i3su4J3sDhoL+TDnITKsgIpEqnpktc="; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.WindowsServices"; version = "6.0.2"; hash = "sha256-hgLydinnGforEzR2SCq6568IWhjnIoX8vyR3Z8xRIxg="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; hash = "sha256-IyJiQk0xhESWjr231L7MsbFvFbphP6T8VwlKgVGgQeE="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; hash = "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.1"; hash = "sha256-J/NwPGVWtiNpwHP9M0tDR1eNUcFiz/r1Sn5v2xuE0tA="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; hash = "sha256-jJtcchUS8Spt/GddcDtWa4lN1RAVQ2sxDnu1cgwa6vs="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; hash = "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; hash = "sha256-IeMOza71UDzsEIVIlYuI0RYKk+d+VOC6zCqYCQs6nV4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; hash = "sha256-LQw/najhYDdvtrsogHEQue+U+/+YJcgyBP+3MTJYA40="; }) @@ -72,11 +67,9 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "6.0.0"; hash = "sha256-1BXQjw/ySWmddAZ79bv3OhmC4SPTG8PHyTOlrNEUb0g="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "6.0.0"; hash = "sha256-j2Begn1+Xoa+9yPoQC6b6aPmUIpBrjkTGQhRhYfJaDI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.1"; hash = "sha256-hbe+3YXlSQ3urCX11D2MIZl1XrWvr+mmnBc/bj53zfY="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; hash = "sha256-Xq2JIa2Rg9vnLnZ75k4ydyT4j2A+G6UUx6iDc959teU="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; hash = "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; hash = "sha256-au0Y13cGk/dQFKuvSA5NnP/++bErTk0oOTlgmHdI2Mw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; hash = "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; hash = "sha256-pj1BdHlmYm5HZifp/yB3lwDkdw0/jcIF0vYg6O1kmGs="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; }) (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.21.1"; hash = "sha256-Q+d1QuLmjIoNGNUxm5GWzQI4hthiP6qCEl0D6/CMn4U="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.8.0"; hash = "sha256-4mCms3v1kknXCgRp51SluUFy2o7BqHCMfGMwHmlFrok="; }) @@ -118,10 +111,10 @@ (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) - (fetchNuGet { pname = "NLog"; version = "4.7.11"; hash = "sha256-XEl2ISxP2sx5b+av3QVF6LWim4JPyepdnr8zA/H1b28="; }) - (fetchNuGet { pname = "NLog"; version = "4.7.14"; hash = "sha256-dogq2n5I62JnY+qsTnWHsLlhSvDqc5PRSjBvIBztU94="; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; hash = "sha256-RGQxi7tcoGLLn1kQbXc3cA3DUetwAwqHeDLJsXWaNNI="; }) - (fetchNuGet { pname = "NLog.Targets.Syslog"; version = "6.0.3"; hash = "sha256-3ZXMJzzKNFKkZn43adJgZx+fdA2TnMdfeMMl3SNkoZ0="; }) + (fetchNuGet { pname = "NLog"; version = "5.3.2"; hash = "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc="; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; hash = "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g="; }) + (fetchNuGet { pname = "NLog.Layouts.ClefJsonLayout"; version = "1.0.0"; hash = "sha256-WLtMT2pa+hQoZe8joknTEoJEVARNzdKRLYIn++L1kX0="; }) + (fetchNuGet { pname = "NLog.Targets.Syslog"; version = "7.0.0"; hash = "sha256-Yy6REt1UxkdFz+twa0zJVm635YHch7B6t9Pjj5FZUZc="; }) (fetchNuGet { pname = "NodaTime"; version = "3.0.0"; hash = "sha256-kOiGkTez5eIWsBJVYURe8WRuyIhQgMiq/c/m42+XZuY="; }) (fetchNuGet { pname = "Npgsql"; version = "7.0.7"; hash = "sha256-AvHPEO2QP7r0kCOHSLhXLJDzYMOLGH2dyhHgEUPSWuc="; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; hash = "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="; }) @@ -131,6 +124,7 @@ (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; hash = "sha256-ZlpEM9IQlqsRPmYPMN6yCbICfakSoY89y40xtMY3rE8="; }) (fetchNuGet { pname = "NunitXml.TestLogger"; version = "3.0.131"; hash = "sha256-5IqI/e+nm90CAaZHrcbYfCY+zu5FVcpAbV0CmsdOKyg="; }) (fetchNuGet { pname = "Polly"; version = "8.3.1"; hash = "sha256-VPPoVGvEJBHoUR4hU57sdY2pF3P9igLSQSBtPRLRB6c="; }) + (fetchNuGet { pname = "Polly.Contrib.WaitAndRetry"; version = "1.1.1"; hash = "sha256-InJ8IXAsZDAR4B/YzWCuEWRa/6Xf5oB049UJUkTOoSg="; }) (fetchNuGet { pname = "Polly.Core"; version = "8.3.1"; hash = "sha256-i1R9e4aKZ5U+y96+GOxTknsAtGn7fmeBNSdfzhqe1Jc="; }) (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; hash = "sha256-GOXM4TdTTodWlGzEfbMForTfTQI/ObJGnFZMSD6X8E4="; }) (fetchNuGet { pname = "RestSharp"; version = "106.15.0"; hash = "sha256-8UChXxz7AQmQpoozSBfwB6NVmt2+uJcN8TH7RtVfT7w="; }) @@ -200,7 +194,7 @@ (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlServer"; version = "3.3.2.9"; hash = "sha256-mDIfUT35CqEUbf858hrtJE0E65U7ZJlygoZAHi2Hlf8="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlserver/3.3.2.9/servarr.fluentmigrator.runner.sqlserver.3.3.2.9.nupkg"; }) (fetchNuGet { pname = "Servarr.FluentMigrator.Runner.SqlServerCe"; version = "3.3.2.9"; hash = "sha256-kx3ZjLj1zz/1buiWrAJPuB5GXCohpntpq4ak5WG1SR4="; url = "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/323efe4e-c7d8-4bcd-acfe-5afb38d520bf/nuget/v3/flat2/servarr.fluentmigrator.runner.sqlserverce/3.3.2.9/servarr.fluentmigrator.runner.sqlserverce.3.3.2.9.nupkg"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; hash = "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; hash = "sha256-zOqHVIInvJiqmx4JF+8USYvdKAGRZVUqQpdncrrjRjM="; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.5"; hash = "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; hash = "sha256-iL7TcRFy7g6EB8usWALwdOEaiqLsD0b+RXkepHk43+o="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; }) diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index 6ba68993bf49c..915599971ba48 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -1,4 +1,5 @@ { lib +, stdenvNoCC , fetchFromGitHub , buildDotnetModule , dotnetCorePackages @@ -17,13 +18,14 @@ , prefetch-yarn-deps }: let - version = "4.0.8.1874"; + version = "4.0.9.2244"; src = fetchFromGitHub { owner = "Sonarr"; repo = "Sonarr"; rev = "v${version}"; - hash = "sha256-4WjeuVqzuUmgbKIjcQOJCNrTnT9Wn6kpVxS+1T1hqyQ="; + hash = "sha256-RDhJUf8P2STTug69EGozW0q87qDE40jf5G7n7pezWeY="; }; + rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system; in buildDotnetModule { pname = "sonarr"; @@ -38,7 +40,7 @@ buildDotnetModule { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-dSZBifvUGJx5lj7C+Sj+kJprK8JG6SE5vg6+X6QdCZ8="; + hash = "sha256-qL8vNKf0XqpO/TUfKMXbfrmRVAqnvKLREAjcsAYDqeE="; }; ffprobe = lib.optionalDrvAttr withFFmpeg (lib.getExe' ffmpeg "ffprobe"); @@ -100,6 +102,7 @@ buildDotnetModule { "--property:Copyright=Copyright 2014-2024 sonarr.tv (GNU General Public v3)" "--property:AssemblyVersion=${version}" "--property:AssemblyConfiguration=main" + "--property:RuntimeIdentifier=${rid}" ]; # Skip manual, integration, automation and platform-dependent tests. diff --git a/pkgs/by-name/so/sonic-server/package.nix b/pkgs/by-name/so/sonic-server/package.nix new file mode 100644 index 0000000000000..bc10180a540c5 --- /dev/null +++ b/pkgs/by-name/so/sonic-server/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + nixosTests, + rustPlatform, + sonic-server, + testers, +}: + +rustPlatform.buildRustPackage rec { + pname = "sonic-server"; + version = "1.4.9"; + + src = fetchFromGitHub { + owner = "valeriansaliou"; + repo = "sonic"; + rev = "refs/tags/v${version}"; + hash = "sha256-PTujR3ciLRvbpiqStNMx3W5fkUdW2dsGmCj/iFRTKJM="; + }; + + cargoHash = "sha256-bH9u38gvH6QEySQ3XFXEHBiSqKKtB+kjcZRLjx4Z6XM="; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; + + postPatch = '' + substituteInPlace src/main.rs \ + --replace-fail "./config.cfg" "$out/etc/sonic/config.cfg" + ''; + + postInstall = '' + install -Dm444 -t $out/etc/sonic config.cfg + install -Dm444 -t $out/lib/systemd/system debian/sonic.service + + substituteInPlace $out/lib/systemd/system/sonic.service \ + --replace-fail /usr/bin/sonic $out/bin/sonic \ + --replace-fail /etc/sonic.cfg $out/etc/sonic/config.cfg + ''; + + # Found argument '--test-threads' which wasn't expected, or isn't valid in this context + doCheck = false; + + passthru = { + tests = { + inherit (nixosTests) sonic-server; + version = testers.testVersion { + command = "sonic --version"; + package = sonic-server; + }; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Fast, lightweight and schema-less search backend"; + homepage = "https://github.com/valeriansaliou/sonic"; + changelog = "https://github.com/valeriansaliou/sonic/releases/tag/v${version}"; + license = licenses.mpl20; + platforms = platforms.unix; + mainProgram = "sonic"; + maintainers = with maintainers; [ + pleshevskiy + anthonyroussel + ]; + }; +} diff --git a/pkgs/by-name/so/soplex/package.nix b/pkgs/by-name/so/soplex/package.nix index d4672a0b8ba3a..90d97c7077384 100644 --- a/pkgs/by-name/so/soplex/package.nix +++ b/pkgs/by-name/so/soplex/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "soplex"; - version = "7.1.0"; + version = "7.1.1"; src = fetchFromGitHub { owner = "scipopt"; repo = "soplex"; rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; - hash = "sha256-yoXqfaSGYLHJbUcmBkxhmik553L/9XZtb7FjouaIGCg="; + hash = "sha256-f4PMJz/VHCx5Uk7M9JdE+4Qpf29X3S/umoiAo8NXYrU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/so/soteria/package.nix b/pkgs/by-name/so/soteria/package.nix new file mode 100644 index 0000000000000..4ab043deb0e03 --- /dev/null +++ b/pkgs/by-name/so/soteria/package.nix @@ -0,0 +1,62 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + wrapGAppsHook4, + cairo, + gdk-pixbuf, + glib, + gtk4, + pango, + polkit, +}: +let + version = "0.1.0"; +in +rustPlatform.buildRustPackage { + pname = "soteria"; + inherit version; + + src = fetchFromGitHub { + owner = "imvaskel"; + repo = "soteria"; + rev = "refs/tags/v${version}"; + hash = "sha256-lhS+37DqSgZrgrYgKGUpKMC22Qjdq9LPNS5k/dqvkRY="; + }; + + cargoHash = "sha256-NMSGSqdCu/kW6vv8+C7UC6oitZqlTklO1sRKDcc1T9o="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + cairo + gdk-pixbuf + glib + gtk4 + pango + ]; + + # From upstream packaging: + # Takes advantage of nixpkgs manually editing PACKAGE_PREFIX by grabbing it from + # the binary itself. + # https://github.com/NixOS/nixpkgs/blob/9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b/pkgs/development/libraries/polkit/default.nix#L142 + # https://github.com/polkit-org/polkit/blob/d89c3604e2a86f4904566896c89e1e6b037a6f50/src/polkitagent/polkitagentsession.c#L599 + preBuild = '' + export POLKIT_AGENT_HELPER_PATH="$(strings ${polkit.out}/lib/libpolkit-agent-1.so | grep "polkit-agent-helper-1")" + ''; + + meta = { + description = "Polkit authentication agent written in GTK designed to be used with any desktop environment"; + homepage = "https://github.com/ImVaskel/soteria"; + license = lib.licenses.asl20; + mainProgram = "soteria"; + maintainers = with lib.maintainers; [ + NotAShelf + ]; + inherit (polkit.meta) platforms; + }; +} diff --git a/pkgs/by-name/so/sound-of-sorting/package.nix b/pkgs/by-name/so/sound-of-sorting/package.nix index c6cb6e6a1cf90..b7b14312e3588 100644 --- a/pkgs/by-name/so/sound-of-sorting/package.nix +++ b/pkgs/by-name/so/sound-of-sorting/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { wxGTK32 SDL2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/by-name/so/soupault/package.nix b/pkgs/by-name/so/soupault/package.nix index c38e58d181d97..9912146eb1653 100644 --- a/pkgs/by-name/so/soupault/package.nix +++ b/pkgs/by-name/so/soupault/package.nix @@ -9,7 +9,7 @@ ocamlPackages.buildDunePackage rec { pname = "soupault"; - version = "4.10.0"; + version = "4.11.0"; minimalOCamlVersion = "4.13"; @@ -18,10 +18,10 @@ ocamlPackages.buildDunePackage rec { "https://github.com/PataphysicalSociety/soupault/archive/${version}.tar.gz" "https://codeberg.org/PataphysicalSociety/soupault/archive/${version}.tar.gz" ]; - hash = "sha256-mkbRWw4Qj7pk2MQJERA9cAuC8DXD/fOShVXz2zPtXZ4="; + hash = "sha256-UABbrNNcNaN9NgtAjCs4HUoNXMaK4QvCuWERuEnMG6I="; }; - nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ darwin.sigtool ]; + nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.sigtool ]; buildInputs = with ocamlPackages; [ base64 diff --git a/pkgs/by-name/so/sourcery/package.nix b/pkgs/by-name/so/sourcery/package.nix index 79f469347a89a..6c35b807790b9 100644 --- a/pkgs/by-name/so/sourcery/package.nix +++ b/pkgs/by-name/so/sourcery/package.nix @@ -11,18 +11,20 @@ let platformInfos = { "x86_64-linux" = { platform = "manylinux1_x86_64"; - hash = "sha256-IJFuMtrddHciuHGeiCuv4hgco9E3GJveegL7dBmVmAw="; + hash = "sha256-aTANmCWyR8QVZVQGk1WbgjWjZeBSUN2ZVNg5ab9s6n0="; }; "x86_64-darwin" = { platform = "macosx_10_9_universal2"; - hash = "sha256-eTD8NnmDTMSB0dt5skPOlWbnW6AexxEkKZ9ABc+kUas="; + hash = "sha256-9ihkrgcREVbp7GDvl7w1MlpAWmpjHFusJYNqvBnQij4="; }; }; - platformInfo = platformInfos.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}"); + + inherit (stdenv.hostPlatform) system; + platformInfo = platformInfos.${system} or (throw "Unsupported platform ${system}"); in python3Packages.buildPythonApplication rec { pname = "sourcery"; - version = "1.19.0"; + version = "1.23.0"; format = "wheel"; src = fetchPypi { @@ -30,7 +32,7 @@ python3Packages.buildPythonApplication rec { inherit (platformInfo) platform hash; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ zlib ]; diff --git a/pkgs/by-name/so/sov/package.nix b/pkgs/by-name/so/sov/package.nix index abb204ed8fa77..fcc4e3a2da73d 100644 --- a/pkgs/by-name/so/sov/package.nix +++ b/pkgs/by-name/so/sov/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/milgra/sov"; license = lib.licenses.gpl3Only; mainProgram = "sov"; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix new file mode 100644 index 0000000000000..7fe0fc2bbf0a8 --- /dev/null +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "spacectl"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "spacelift-io"; + repo = "spacectl"; + rev = "v${version}"; + hash = "sha256-wEu7AmFn1782XTKKb7JxQWn/ZSHrQbuZ/SDldn6pUNo="; + }; + + vendorHash = "sha256-SYfXG6YM0Q2rCnoTM2tYvE17uBCD8yQiW/5DTCxMPWo="; + + meta = { + homepage = "https://github.com/spacelift-io/spacectl"; + description = "Spacelift client and CLI"; + changelog = "https://github.com/spacelift-io/spacectl/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kashw2 ]; + mainProgram = "spacectl"; + }; +} diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index dc738be669d96..89fa1d158208a 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -17,22 +17,22 @@ let pname = "spacedrive"; - version = "0.3.1"; + version = "0.4.2"; src = fetchurl { aarch64-darwin = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-aarch64.dmg"; - hash = "sha256-9E7h03zJtH8b6khDcbBsB46iVWwl48s+GJuBMOmEre4="; + hash = "sha256-W0nFNmBgrypTj1Y6r6vstdL0UUaP9jTOH5RgAirwxsY="; }; x86_64-darwin = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-x86_64.dmg"; - hash = "sha256-h+B7tc6jXJUFNEMhG6ZNch+grtgUeAzfa37BDoZ6M8Q="; + hash = "sha256-iX7aUs2k1fjOoDxkgXbePEYXYKFK3rGFlN9b0+gz378="; }; x86_64-linux = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.deb"; - hash = "sha256-E1mOODG4YzBc0TPZJmKgrt/c5hp5LwzLaYPl+J5dnkg="; + hash = "sha256-SbuL96xNEOPZ3Z5jd0gfJtNkUoEjO4W+P7K9mvyNmHA="; }; } .${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); @@ -59,7 +59,7 @@ let passthru.updateScript = nix-update-script { }; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname diff --git a/pkgs/by-name/sp/spade/Cargo.lock b/pkgs/by-name/sp/spade/Cargo.lock index 604659a01e9eb..274d64e6947bf 100644 --- a/pkgs/by-name/sp/spade/Cargo.lock +++ b/pkgs/by-name/sp/spade/Cargo.lock @@ -26,15 +26,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" version = "0.6.14" @@ -146,9 +137,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.4" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -156,9 +147,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", @@ -168,9 +159,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -435,9 +426,9 @@ checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -592,9 +583,9 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.49.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14" dependencies = [ "windows-sys 0.48.0", ] @@ -758,11 +749,11 @@ dependencies = [ [[package]] name = "prettydiff" -version = "0.6.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11" +checksum = "abec3fb083c10660b3854367697da94c674e9e82aa7511014dc958beeb7215e9" dependencies = [ - "ansi_term", + "owo-colors", "pad", ] @@ -1000,7 +991,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spade" -version = "0.9.0" +version = "0.10.0" dependencies = [ "clap", "codespan", @@ -1034,15 +1025,16 @@ dependencies = [ [[package]] name = "spade-ast" -version = "0.9.0" +version = "0.10.0" dependencies = [ + "itertools", "num", "spade-common", ] [[package]] name = "spade-ast-lowering" -version = "0.9.0" +version = "0.10.0" dependencies = [ "itertools", "local-impl", @@ -1060,14 +1052,13 @@ dependencies = [ [[package]] name = "spade-common" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", "logos", "num", "serde", - "tracing", ] [[package]] @@ -1086,30 +1077,21 @@ dependencies = [ [[package]] name = "spade-diagnostics" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", - "colored", "insta", "itertools", - "local-impl", - "logos", - "spade-ast", "spade-common", - "spade-macros", - "thiserror", - "tracing", ] [[package]] name = "spade-hir" -version = "0.9.0" +version = "0.10.0" dependencies = [ - "codespan-reporting 0.12.0", "colored", "itertools", - "local-impl", "num", "serde", "spade-common", @@ -1122,12 +1104,9 @@ dependencies = [ [[package]] name = "spade-hir-lowering" -version = "0.9.0" +version = "0.10.0" dependencies = [ - "codespan", - "codespan-reporting 0.12.0", "colored", - "indoc", "itertools", "local-impl", "num", @@ -1137,18 +1116,16 @@ dependencies = [ "spade-common", "spade-diagnostics", "spade-hir", - "spade-macros", "spade-mir", "spade-typeinference", "spade-types", "spade-wordlength-inference", - "thiserror", "tracing", ] [[package]] name = "spade-macros" -version = "0.9.0" +version = "0.10.0" dependencies = [ "proc-macro2", "quote", @@ -1158,7 +1135,7 @@ dependencies = [ [[package]] name = "spade-mir" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1166,7 +1143,6 @@ dependencies = [ "derive-where", "indoc", "itertools", - "logos", "nesty", "num", "pretty_assertions", @@ -1174,12 +1150,11 @@ dependencies = [ "serde", "spade-common", "spade-diagnostics", - "spade-macros", ] [[package]] name = "spade-parser" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan", "colored", @@ -1197,7 +1172,7 @@ dependencies = [ [[package]] name = "spade-python" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan-reporting 0.12.0", "color-eyre", @@ -1226,7 +1201,7 @@ dependencies = [ [[package]] name = "spade-simulation-ext" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan-reporting 0.12.0", "color-eyre", @@ -1254,7 +1229,7 @@ dependencies = [ [[package]] name = "spade-tests" -version = "0.9.0" +version = "0.10.0" dependencies = [ "codespan-reporting 0.12.0", "colored", @@ -1282,14 +1257,11 @@ dependencies = [ [[package]] name = "spade-typeinference" -version = "0.9.0" +version = "0.10.0" dependencies = [ "assert_matches", - "codespan", - "codespan-reporting 0.12.0", "colored", "itertools", - "local-impl", "num", "serde", "spade-ast", @@ -1305,7 +1277,7 @@ dependencies = [ [[package]] name = "spade-types" -version = "0.9.0" +version = "0.10.0" dependencies = [ "num", "serde", @@ -1314,24 +1286,15 @@ dependencies = [ [[package]] name = "spade-wordlength-inference" -version = "0.9.0" +version = "0.10.0" dependencies = [ - "codespan", - "codespan-reporting 0.12.0", - "colored", - "local-impl", "num", - "serde", - "spade-ast", "spade-common", "spade-diagnostics", "spade-hir", "spade-macros", - "spade-parser", "spade-typeinference", "spade-types", - "thiserror", - "tracing", ] [[package]] @@ -1509,11 +1472,11 @@ dependencies = [ [[package]] name = "tracing-tree" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65139ecd2c3f6484c3b99bc01c77afe21e95473630747c7aca525e78b0666675" +checksum = "f459ca79f1b0d5f71c54ddfde6debfc59c8b6eeb46808ae492077f739dc7b49c" dependencies = [ - "nu-ansi-term 0.49.0", + "nu-ansi-term 0.50.0", "tracing-core", "tracing-log", "tracing-subscriber", diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix index e154d7ccfd4e8..b312ce8683a40 100644 --- a/pkgs/by-name/sp/spade/package.nix +++ b/pkgs/by-name/sp/spade/package.nix @@ -3,21 +3,24 @@ rustPlatform, fetchFromGitLab, stdenv, + _experimental-update-script-combinators, + nix-update-script, nix-update, writeScript, git, python312, + swim, }: rustPlatform.buildRustPackage rec { pname = "spade"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitLab { owner = "spade-lang"; repo = "spade"; rev = "v${version}"; - hash = "sha256-DVvdCt/t7aA2IAs+cL6wT129PX8s3P5gHawcLAvAAGw="; + hash = "sha256-IAb9Vj5KwyXpARD2SIgYRXhz1ihwcgCTwx3zbgoN6dE="; # only needed for vatch, which contains test data fetchSubmodules = true; }; @@ -29,20 +32,31 @@ rustPlatform.buildRustPackage rec { }; }; - # rust + gitlab is a rare combo - passthru.updateScript = [ + # TODO: somehow respect https://nixos.org/manual/nixpkgs/stable/#var-passthru-updateScript-commit + passthru.updateScript = _experimental-update-script-combinators.sequence [ + # rust + gitlab + fetchgit is a rare combo (writeScript "update-spade" '' VERSION="$( ${lib.getExe git} ls-remote --tags --sort -version:refname ${lib.escapeShellArg src.gitRepoUrl} \ | cut -f2 | grep ^refs/tags/v | cut -d/ -f3- | cut -c2- \ | sort --version-sort --reverse | head -n1 )" - exec ${lib.getExe nix-update} --version "$VERSION" "$@" + exec ${lib.getExe nix-update} spade --version "$VERSION" "$@" --commit '') + (nix-update-script { + extraArgs = [ + "swim" + "--commit" + ]; + }) ]; - buildInputs = lib.optionals stdenv.isDarwin [ python312 ]; - env.NIX_CFLAGS_LINK = lib.optionals stdenv.isDarwin "-L${python312}/lib/python3.12/config-3.12-darwin -lpython3.12"; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ python312 ]; + env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-L${python312}/lib/python3.12/config-3.12-darwin -lpython3.12"; + + passthru.tests = { + inherit swim; + }; meta = with lib; { description = "Better hardware description language"; diff --git a/pkgs/by-name/sp/spades/package.nix b/pkgs/by-name/sp/spades/package.nix index daa748087b3cd..2270ba33909d7 100644 --- a/pkgs/by-name/sp/spades/package.nix +++ b/pkgs/by-name/sp/spades/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { readline ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; doCheck = true; diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index de37b40804867..550b8af9a5f12 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace speakersafetyd.service --replace "/usr" "$out" - substituteInPlace Makefile --replace "target/release" "target/${rust.lib.toRustTargetSpec stdenv.hostPlatform}/$cargoBuildType" + substituteInPlace Makefile --replace "target/release" "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType" # creating files in /var does not make sense in a nix package substituteInPlace Makefile --replace 'install -dDm0755 $(DESTDIR)/$(VARDIR)/lib/speakersafetyd/blackbox' "" ''; diff --git a/pkgs/by-name/sp/spfft/package.nix b/pkgs/by-name/sp/spfft/package.nix index 65e98b92b4f2f..9423978ed24ef 100644 --- a/pkgs/by-name/sp/spfft/package.nix +++ b/pkgs/by-name/sp/spfft/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { rocmPackages.clr rocmPackages.rocfft rocmPackages.hipfft - ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp + ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp ; cmakeFlags = [ diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 17749c01542bf..524d761d7cbc1 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.37.7"; + version = "2.38.3"; src = fetchFromGitHub { owner = "spicetify"; repo = "cli"; rev = "v${version}"; - hash = "sha256-Sfh2dvqCsV5rl6SmfqV6icJrTcsJy89RibCIRrf2p0k="; + hash = "sha256-la0zNYWzsU49Z6OKTefocN3xzoyNceaPAzG+CAFKMPc="; }; - vendorHash = "sha256-kv+bMyVOJTztn8mNNTK/kp4nvc5m1I5M041s3nPpob8="; + vendorHash = "sha256-BT/zmeNKr2pNBSCaRtT/Dxm3uCshd1j4IW0xU7b9Yz4="; ldflags = [ "-s -w" diff --git a/pkgs/by-name/sp/spip/package.nix b/pkgs/by-name/sp/spip/package.nix index 9f99a9e438e09..9c9c6e8a20ed6 100644 --- a/pkgs/by-name/sp/spip/package.nix +++ b/pkgs/by-name/sp/spip/package.nix @@ -18,12 +18,12 @@ let transcriptome19 = fetchurl { url = transcriptome-url + "/transcriptome_hg19.RData"; - sha256 = "sha256-E8UmHoNoySSIde+TRE6bxVP0PrccpKDvIHBGCvWnYOw="; + hash = "sha256-E8UmHoNoySSIde+TRE6bxVP0PrccpKDvIHBGCvWnYOw="; }; transcriptome38 = fetchurl { url = transcriptome-url + "/transcriptome_hg38.RData"; - sha256 = "sha256-mQMMZVN1byXMYjFoRdezmoZtnhUur2CHOP/j/pmw8as="; + hash = "sha256-mQMMZVN1byXMYjFoRdezmoZtnhUur2CHOP/j/pmw8as="; }; in @@ -36,7 +36,7 @@ stdenv.mkDerivation { owner = "raphaelleman"; repo = "SPiP"; rev = "cae95fe0ee7a2602630b7a4eacbf7cfa0e1763f0"; - sha256 = "sha256-/CufUaQYnsdo8Rij/24JmixPgMi7o1CApLxeTneWAVc="; + hash = "sha256-/CufUaQYnsdo8Rij/24JmixPgMi7o1CApLxeTneWAVc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/sp/spl/package.nix b/pkgs/by-name/sp/spl/package.nix new file mode 100644 index 0000000000000..c3e517d862919 --- /dev/null +++ b/pkgs/by-name/sp/spl/package.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchgit, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "spl"; + version = "0.4.0"; + src = fetchgit { + url = "https://git.tudbut.de/tudbut/spl"; + rev = "v${version}"; + hash = "sha256-/WjrQeE3zI71pvCil2yE9ZMaWkmyRG/tNmZ+XFF0nYw="; + }; + + cargoHash = "sha256-8xv7tXVklJDewnHqoRIMefsNWTD28+5WyV5ZI9imOh0="; + + meta = { + description = "Simple, concise, concatenative scripting language"; + homepage = "https://git.tudbut.de/tudbut/spl"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tudbut ]; + mainProgram = "spl"; + }; +} diff --git a/pkgs/by-name/sp/spla/package.nix b/pkgs/by-name/sp/spla/package.nix index eccf87258ace3..2e07da1cdb020 100644 --- a/pkgs/by-name/sp/spla/package.nix +++ b/pkgs/by-name/sp/spla/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (gpuBackend == "rocm") [ rocmPackages.clr rocmPackages.rocblas - ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp + ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp ; cmakeFlags = [ diff --git a/pkgs/by-name/sp/splash/package.nix b/pkgs/by-name/sp/splash/package.nix new file mode 100644 index 0000000000000..39d22a88b9d45 --- /dev/null +++ b/pkgs/by-name/sp/splash/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gfortran, + giza, + hdf5, + cairo, + freetype, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "splash"; + version = "3.10.3"; + + src = fetchFromGitHub { + owner = "danieljprice"; + repo = "splash"; + rev = "v${finalAttrs.version}"; + hash = "sha256-5ieJHUWZDGgsNj7U9tbdhtDIsN+wgbs03IxVd1xM+hw="; + }; + + nativeBuildInputs = [ + gfortran + ]; + + buildInputs = [ + giza + cairo + freetype + hdf5 + ]; + makeFlags = [ + "SYSTEM=gfortran" + "GIZA_DIR=${giza}" + "PREFIX=${placeholder "out"}" + ]; + # Upstream's simplistic makefile doesn't even `mkdir $(PREFIX)`, so we help + # it: + preInstall = '' + mkdir -p $out/bin + ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + meta = { + description = "An interactive visualisation and plotting tool using kernel interpolation, mainly used for Smoothed Particle Hydrodynamics simulations"; + inherit (finalAttrs.src.meta) homepage; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ doronbehar ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/sp/splitcode/add-stdint.patch b/pkgs/by-name/sp/splitcode/add-stdint.patch new file mode 100644 index 0000000000000..e502856b5596f --- /dev/null +++ b/pkgs/by-name/sp/splitcode/add-stdint.patch @@ -0,0 +1,12 @@ +diff --git a/src/SplitCode.h b/src/SplitCode.h +index 45c199c..fb05250 100644 +--- a/src/SplitCode.h ++++ b/src/SplitCode.h +@@ -18,6 +18,7 @@ + #include <stack> + #include <cmath> + #include <iomanip> ++#include <cstdint> + + #if defined(_MSVC_LANG) + #define SPLITCODE_CPP_VERSION _MSVC_LANG diff --git a/pkgs/by-name/sp/splitcode/package.nix b/pkgs/by-name/sp/splitcode/package.nix new file mode 100644 index 0000000000000..a63a9b43681ac --- /dev/null +++ b/pkgs/by-name/sp/splitcode/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libcxx, + zlib, +}: +let + version = "0.30.0"; +in +stdenv.mkDerivation { + pname = "splitcode"; + inherit version; + + src = fetchFromGitHub { + owner = "pachterlab"; + repo = "splitcode"; + rev = "v${version}"; + hash = "sha256-g38pJFP9uA2P5ktogAPXKgPtsEJn5vtnK5HClqqezmg="; + }; + + patches = [ ./add-stdint.patch ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libcxx + zlib + ]; + + doCheck = true; + checkPhase = '' + mkdir func_tests + cp $src/func_tests/* ./func_tests/ + bash ./func_tests/runtests.sh + ''; + + meta = { + description = "Tool for flexible, efficient parsing, interpreting, and editing of technical sequences in sequencing reads"; + homepage = "https://github.com/pachterlab/splitcode"; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ zimward ]; + mainProgram = "splitcode"; + }; +} diff --git a/pkgs/by-name/sp/sploitscan/package.nix b/pkgs/by-name/sp/sploitscan/package.nix index dcd8695e93652..63c2859408b0b 100644 --- a/pkgs/by-name/sp/sploitscan/package.nix +++ b/pkgs/by-name/sp/sploitscan/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sploitscan"; - version = "0.10.5"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "xaitax"; repo = "SploitScan"; - rev = "refs/tags/v${version}"; - hash = "sha256-41NR31x/pJttBxv66t5g3s2PwlSBgsk0ybiH7xFs18k="; + rev = "refs/tags/v.${version}"; + hash = "sha256-d9s0j/78arKnbDCgMJMdUVF/RPfnAl59WAiJ0UvCCUU="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/sp/spoofdpi/package.nix b/pkgs/by-name/sp/spoofdpi/package.nix index 5c3e30f342a60..1b7d67f8cd364 100644 --- a/pkgs/by-name/sp/spoofdpi/package.nix +++ b/pkgs/by-name/sp/spoofdpi/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, buildGoModule, ... @@ -8,20 +7,20 @@ buildGoModule rec { pname = "SpoofDPI"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "xvzc"; repo = "SpoofDPI"; rev = "v${version}"; - hash = "sha256-GdGOnaIDy7XWWo0MOu+HfQcLrW/PDlRxf0y1jjJrZNQ="; + hash = "sha256-m4fhFhZLuWT1diDlDTmTsNrckKTjhEZbhciv44FZcro="; }; vendorHash = "sha256-47Gt5SI6VXq4+1T0LxFvQoYNk+JqTt3DonDXLfmFBzw="; meta = { homepage = "https://github.com/xvzc/SpoofDPI"; - description = "A simple and fast anti-censorship tool written in Go"; + description = "Simple and fast anti-censorship tool written in Go"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ s0me1newithhand7s ]; }; diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index 0d2b6c185ca5e..45cce2754754a 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -6,15 +6,15 @@ rustPackages, pkg-config, openssl, - withALSA ? stdenv.isLinux, + withALSA ? stdenv.hostPlatform.isLinux, alsa-lib, - withJack ? stdenv.isLinux, + withJack ? stdenv.hostPlatform.isLinux, libjack2, - withPulseAudio ? config.pulseaudio or stdenv.isLinux, + withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio, - withPortAudio ? stdenv.isDarwin, + withPortAudio ? stdenv.hostPlatform.isDarwin, portaudio, - withMpris ? stdenv.isLinux, + withMpris ? stdenv.hostPlatform.isLinux, withKeyring ? true, dbus, nix-update-script, @@ -24,28 +24,28 @@ rustPackages.rustPlatform.buildRustPackage rec { pname = "spotifyd"; - version = "0.3.5-unstable-2024-08-13"; + version = "0.3.5-unstable-2024-09-05"; src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; - rev = "e342328550779423382f35cd10a18b1c76b81f40"; - hash = "sha256-eP783ZNdzePQuhQE8SWYHwqK8J4+fperDYXAHWM0hz8="; + rev = "e280d84124d854af3c2f9509ba496b1c2ba6a1ae"; + hash = "sha256-RFfM/5DY7IG0E79zc8IuXpSNAIjloMWI3ZVbyLxh4O8="; }; - cargoHash = "sha256-jmsfB96uWX4CzEsS2Grr2FCptMIebj2DSA5z6zG9AJg="; + cargoHash = "sha256-z3zcQD2v71FZg6nEvKfaMiQU/aRAPFNt69b9Rm+jpuY="; nativeBuildInputs = [ pkg-config ]; buildInputs = - lib.optionals stdenv.isLinux [ openssl ] + lib.optionals stdenv.hostPlatform.isLinux [ openssl ] ++ lib.optional (withALSA || withJack) alsa-lib ++ lib.optional withJack libjack2 ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio # The `dbus_keying` feature works on other platforms, but only requires # `dbus` on Linux - ++ lib.optional ((withMpris || withKeyring) && stdenv.isLinux) dbus; + ++ lib.optional ((withMpris || withKeyring) && stdenv.hostPlatform.isLinux) dbus; buildNoDefaultFeatures = true; buildFeatures = diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix index f2f9cbc23d27d..bdadcf424ee86 100644 --- a/pkgs/by-name/sp/spotube/package.nix +++ b/pkgs/by-name/sp/spotube/package.nix @@ -10,16 +10,19 @@ undmg, wrapGAppsHook3, + glib-networking, + gtk3, libappindicator, libnotify, - libsecret, + libsoup_3, mpv-unwrapped, xdg-user-dirs, + webkitgtk_4_1, }: let pname = "spotube"; - version = "3.7.1"; + version = "3.8.2"; meta = { description = "Open source, cross-platform Spotify client compatible across multiple platforms"; @@ -53,7 +56,7 @@ let src = fetchArtifact { filename = "Spotube-macos-universal.dmg"; - hash = "sha256-EYgjVXO/ztIsVYzEHe14YgXbQTclQIht9Qqr8ewHU8w="; + hash = "sha256-2nqWHQDxJ0PcwTiLAa8YZffqwsdnepMpXvpqRPX5JxM="; }; sourceRoot = "."; @@ -77,7 +80,7 @@ let src = fetchArtifact { filename = "Spotube-linux-x86_64.deb"; - hash = "sha256-JKp2RMYNfdBzywqlBpTaHL1iD+E71EL8xY+nzkdA3us="; + hash = "sha256-kDPNWbspmORClVMH91Lt3dLVsRwGxiBtB49CHSHxQxI="; }; nativeBuildInputs = [ @@ -88,10 +91,13 @@ let ]; buildInputs = [ + glib-networking + gtk3 libappindicator libnotify - libsecret + libsoup_3 mpv-unwrapped + webkitgtk_4_1 ]; dontWrapGApps = true; @@ -116,4 +122,4 @@ let ''; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/sp/spral/package.nix b/pkgs/by-name/sp/spral/package.nix index 720f0137338bd..19fc5c5a5ff07 100644 --- a/pkgs/by-name/sp/spral/package.nix +++ b/pkgs/by-name/sp/spral/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "subdir('ssids')" \ "" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Skipped test: lsmrt, segfault substituteInPlace tests/meson.build --replace-fail \ "['lsmrt', files('lsmr.f90')]," \ @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { blas lapack metis - ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; mesonFlags = [ (lib.mesonBool "tests" true) ]; - LDFLAGS = lib.optionals stdenv.isDarwin [ "-lomp" ]; + LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-lomp" ]; doCheck = true; diff --git a/pkgs/by-name/sq/sqlite-vec/package.nix b/pkgs/by-name/sq/sqlite-vec/package.nix index cb89114d7feb5..0eff5c9a6d1d9 100644 --- a/pkgs/by-name/sq/sqlite-vec/package.nix +++ b/pkgs/by-name/sq/sqlite-vec/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlite-vec"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "asg017"; repo = "sqlite-vec"; rev = "v${finalAttrs.version}"; - hash = "sha256-h5gCKyeEAgmXCpOpXVDzoZEtv7Yiq7GtgImuoF9uBm0="; + hash = "sha256-aMU4Spom1b0M5FQA0SconMuuBtEdOL8WNnUxzvAZ0VQ="; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/by-name/sq/sqlite-vss/package.nix b/pkgs/by-name/sq/sqlite-vss/package.nix index 5f25699c99206..bc3612ceebe01 100644 --- a/pkgs/by-name/sq/sqlite-vss/package.nix +++ b/pkgs/by-name/sq/sqlite-vss/package.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; buildInputs = [ nlohmann_json faiss sqlite ] - ++ lib.optional stdenv.isLinux gomp - ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + ++ lib.optional stdenv.hostPlatform.isLinux gomp + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; SQLITE_VSS_CMAKE_VERSION = finalAttrs.version; diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix new file mode 100644 index 0000000000000..6dfce36186f87 --- /dev/null +++ b/pkgs/by-name/sq/sqlitestudio/package.nix @@ -0,0 +1,75 @@ +{ + stdenv, + lib, + fetchFromGitHub, + libsForQt5, + readline, + tcl, + python3, + copyDesktopItems, + makeDesktopItem, +}: +stdenv.mkDerivation rec { + pname = "sqlitestudio"; + version = "3.4.4"; + + src = fetchFromGitHub { + owner = "pawelsalawa"; + repo = "sqlitestudio"; + rev = version; + hash = "sha256-5oBYv8WxyfVvvqr15XApvn6P/lBxR8b6E+2acRkvX0U="; + }; + + nativeBuildInputs = + [ copyDesktopItems ] + ++ (with libsForQt5.qt5; [ + qmake + qttools + wrapQtAppsHook + ]); + + buildInputs = + [ + readline + tcl + python3 + ] + ++ (with libsForQt5.qt5; [ + qtbase + qtsvg + qtdeclarative + qtscript + ]); + + qmakeFlags = [ "./SQLiteStudio3" ]; + + desktopItems = [ + (makeDesktopItem { + name = "sqlitestudio"; + desktopName = "SQLiteStudio"; + exec = "sqlitestudio"; + icon = "sqlitestudio"; + comment = "Database manager for SQLite"; + terminal = false; + startupNotify = false; + categories = [ "Development" ]; + }) + ]; + + postInstall = '' + install -Dm755 \ + ./SQLiteStudio3/guiSQLiteStudio/img/sqlitestudio.svg \ + $out/share/pixmaps/sqlitestudio.svg + ''; + + enableParallelBuilding = true; + + meta = { + description = "Free, open source, multi-platform SQLite database manager"; + homepage = "https://sqlitestudio.pl/"; + license = lib.licenses.gpl3; + mainProgram = "sqlitestudio"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asterismono ]; + }; +} diff --git a/pkgs/by-name/sq/sqlpkg-cli/package.nix b/pkgs/by-name/sq/sqlpkg-cli/package.nix index 0f58e490c45af..d084e817b6cbe 100644 --- a/pkgs/by-name/sq/sqlpkg-cli/package.nix +++ b/pkgs/by-name/sq/sqlpkg-cli/package.nix @@ -41,7 +41,7 @@ buildGoModule rec { badPlatforms = [ "aarch64-linux" # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: linux-arm64 "x86_64-darwin" # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: darwin-amd64 - "aach64-darwin" # install_test.go:22: installation error: failed to dequarantine files: exec: "xattr": executable file not found in $PATH + "aarch64-darwin" # install_test.go:22: installation error: failed to dequarantine files: exec: "xattr": executable file not found in $PATH ]; }; } diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix index 41d5f8c9d343d..5a07d3da948dd 100644 --- a/pkgs/by-name/sq/squeezelite/package.nix +++ b/pkgs/by-name/sq/squeezelite/package.nix @@ -9,8 +9,8 @@ libpulseaudio, libvorbis, mpg123, - audioBackend ? if stdenv.isLinux then "alsa" else "portaudio", - alsaSupport ? stdenv.isLinux, + audioBackend ? if stdenv.hostPlatform.isLinux then "alsa" else "portaudio", + alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib, dsdSupport ? true, faad2Support ? true, @@ -23,7 +23,7 @@ soxr, sslSupport ? true, openssl, - portaudioSupport ? stdenv.isDarwin, + portaudioSupport ? stdenv.hostPlatform.isDarwin, portaudio, slimserver, }: @@ -59,7 +59,7 @@ stdenv.mkDerivation { ++ optional pulseSupport libpulseaudio ++ optional alsaSupport alsa-lib ++ optional portaudioSupport portaudio - ++ optionals stdenv.isDarwin ( + ++ optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ CoreVideo @@ -75,7 +75,7 @@ stdenv.mkDerivation { ++ optional opusSupport opusfile ++ optional resampleSupport soxr ++ optional sslSupport openssl - ++ optional (stdenv.isAarch32 or stdenv.isAarch64) libgpiod; + ++ optional (stdenv.hostPlatform.isAarch32 or stdenv.hostPlatform.isAarch64) libgpiod; enableParallelBuilding = true; @@ -99,9 +99,9 @@ stdenv.mkDerivation { ++ optional pulseSupport "-DPULSEAUDIO" ++ optional resampleSupport "-DRESAMPLE" ++ optional sslSupport "-DUSE_SSL" - ++ optional (stdenv.isAarch32 or stdenv.isAarch64) "-DRPI"; + ++ optional (stdenv.hostPlatform.isAarch32 or stdenv.hostPlatform.isAarch64) "-DRPI"; - env = lib.optionalAttrs stdenv.isDarwin { LDADD = "-lportaudio -lpthread"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { LDADD = "-lportaudio -lpthread"; }; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix index 696bd36ddd8e4..cb1e0fc66bdd9 100644 --- a/pkgs/by-name/sr/srgn/package.nix +++ b/pkgs/by-name/sr/srgn/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "srgn"; - version = "0.12.0"; + version = "0.13.2"; src = fetchFromGitHub { owner = "alexpovel"; repo = "srgn"; rev = "srgn-v${version}"; - hash = "sha256-d53aSo1gzINC8WdMzjCHzU/8+9kvrrGglV4WsiCt+rM="; + hash = "sha256-yVjxNTftrtKb/KHRZG7E3JcsCEtixhfBiHl/6zdcLMo="; }; - cargoHash = "sha256-jy7KHcdkI+T8GbT6gH9ppJhQvhv/NPe+jRWKuybtQC4="; + cargoHash = "sha256-Z8y5gN4CzfllUzSMUyCc7TZKeIYVZtATnaIQIga5cAk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index a02741bb5dae2..e601e0e64e809 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.7.1-1"; + version = "0.7.2-1"; rev = "v${self.version}"; - hash = "sha256-cwZWEuht4XClVUQomMKUA3GScaxv7xBxj3tJhmDYG6Y="; + hash = "sha256-VxLiGA7AvNNjl8UjFbBE9Z/T+YrTj9Hb3LASgzE9iH0="; src = fetchFromGitHub { inherit (self) rev hash; diff --git a/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix b/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix index e677562fe3ed7..0b192024f239a 100644 --- a/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix +++ b/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/atj/ssh-askpass-fullscreen"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Small, fullscreen SSH askpass GUI using GTK+2"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "ssh-askpass-fullscreen"; diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix b/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix index d25b12ef6a645..cd90df9cb7744 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix @@ -1,6 +1,6 @@ # Ideally, this file would have been placed in # pkgs/by-name/ss/sshd-openpgp-auth/package.nix, but since `./generic.nix` is -# outside of the directory, the nixpkgs-check-by-name test will fail the CI. So +# outside of the directory, the `nixpkgs-vet` test will fail the CI. So # we call this file in all-packages.nix like in the old days. { callPackage }: diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix index 47edd91a4f3c1..4cfe2b6ec7c4e 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage { nettle openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreFoundation darwin.apple_sdk_11_0.frameworks.IOKit darwin.apple_sdk_11_0.frameworks.Security diff --git a/pkgs/by-name/ss/sshesame/package.nix b/pkgs/by-name/ss/sshesame/package.nix index 4a8baeb05cc8e..8f600712becce 100644 --- a/pkgs/by-name/ss/sshesame/package.nix +++ b/pkgs/by-name/ss/sshesame/package.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "sshesame"; - version = "0.0.38"; + version = "0.0.39"; src = fetchFromGitHub { owner = "jaksi"; repo = "sshesame"; rev = "v${version}"; - hash = "sha256-CSoDUfbYSf+V7jHVqXGhLc6Mrluy+XbZKCs6IA8reIw="; + hash = "sha256-h0qvi90gbWm4LCL3FeipW8BKkbuUt0xGMTjaaeYadnE="; }; - vendorHash = "sha256-tfxqr1yDXE+ACCfAtZ0xePpB/xktfwJe/xPU8qAVz54="; + vendorHash = "sha256-1v+cNMr2jpLPfxusPsgnFN31DwuNntXuq3sDNpWL0Rg="; ldflags = [ "-s" "-w" ]; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; passthru.updateScript = nix-update-script { }; @@ -33,7 +33,7 @@ buildGoModule rec { ''; homepage = "https://github.com/jaksi/sshesame"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "sshesame"; }; } diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 21be1dd81802b..70a4f00290c58 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.11.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-ioV5ki2Jkbo/Ax9XDp/gm9NFTFS9604VAwOgs8wkoKU="; + hash = "sha256-9s7F3pcamzwAESA/mKnCnSPpSmAX+L81fDoDpR71gzA="; }; - vendorHash = "sha256-1MM4P4eLBZvYgmdYjaihe30qnCvTuY7ZHnAZei3dHhQ="; + vendorHash = "sha256-QNi98VRy5BtML8jTxaDR3ZQfkXqjmfCf5IrcvGKE+rc="; subPackages = [ "." ]; diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index 8e0b953f178a7..fb0b02d559cd4 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "stackql"; - version = "0.5.724"; + version = "0.5.742"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-soaCU0jtFUyViSLTDVSC6dASG5S+z8ie2BcrDg8aIb0="; + hash = "sha256-GMc22n0y4lKv4DlG9069p/TrMJLyw0Zdiykuo41Tgys="; }; - vendorHash = "sha256-6T756bvSED919n9GvwbfM4YXyGlOZKM3khEXnpcrhlI="; + vendorHash = "sha256-dssGqcS9l3VipEypKErlCeRs087Tb5Kx4VXvkErZar4="; ldflags = [ "-s" diff --git a/pkgs/tools/wayland/stacktile/default.nix b/pkgs/by-name/st/stacktile/package.nix similarity index 100% rename from pkgs/tools/wayland/stacktile/default.nix rename to pkgs/by-name/st/stacktile/package.nix diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 045143f15b796..e77b69093b942 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -15,6 +15,7 @@ nix-update-script, nixosTests, rocksdb_8_11, + callPackage, }: let @@ -25,7 +26,7 @@ let # See upstream issue for rocksdb 9.X support # https://github.com/stalwartlabs/mail-server/issues/407 rocksdb = rocksdb_8_11; - version = "0.9.3"; + version = "0.10.2"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -35,21 +36,11 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "refs/tags/v${version}"; - hash = "sha256-XjHm9jBpBQcf1qaZJLDSSrPK9Nqi3olG0pMXHdNUjbg="; + hash = "sha256-wH26uwaYzfqiamiJ/oosVEiTfCOItwVGbHdRh6Ykpgk="; fetchSubmodules = true; }; - cargoHash = "sha256-sFYvEKZVTS5v37CpIl/KjoOY0iWCHLgIJFUdht5SjJY="; - - patches = [ - # Remove "PermissionsStartOnly" from systemd service files, - # which is deprecated and conflicts with our module's ExecPreStart. - # Upstream PR: https://github.com/stalwartlabs/mail-server/pull/528 - (fetchpatch { - url = "https://github.com/stalwartlabs/mail-server/pull/528/commits/6e292b3d7994441e58e367b87967c9a277bce490.patch"; - hash = "sha256-j/Li4bYNE7IppxG3FGfljra70/rHyhRvDgOkZOlhMHY="; - }) - ]; + cargoHash = "sha256-1AFDyZpkcvFzWBczMAPfajmhBmVl4ou4JdKnrK2KlQI="; nativeBuildInputs = [ pkg-config @@ -57,22 +48,31 @@ rustPlatform.buildRustPackage { rustPlatform.bindgenHook ]; - buildInputs = [ - bzip2 - openssl - sqlite - zstd - ] ++ lib.optionals stdenv.isLinux [ - foundationdb - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = + [ + bzip2 + openssl + sqlite + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ foundationdb ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; # skip defaults on darwin because foundationdb is not available - buildNoDefaultFeatures = stdenv.isDarwin; - buildFeatures = lib.optional (stdenv.isDarwin) [ "sqlite" "postgres" "mysql" "rocks" "elastic" "s3" "redis" ]; + buildNoDefaultFeatures = stdenv.hostPlatform.isDarwin; + buildFeatures = lib.optional (stdenv.hostPlatform.isDarwin) [ + "sqlite" + "postgres" + "mysql" + "rocks" + "elastic" + "s3" + "redis" + ]; env = { OPENSSL_NO_VENDOR = true; @@ -139,20 +139,30 @@ rustPlatform.buildRustPackage { # thread 'smtp::queue::concurrent::concurrent_queue' panicked at tests/src/smtp/inbound/mod.rs:65:9: # assertion `left == right` failed "--skip=smtp::queue::concurrent::concurrent_queue" + # Failed to read system DNS config: io error: No such file or directory (os error 2) + "--skip=smtp::inbound::auth::auth" + # Failed to read system DNS config: io error: No such file or directory (os error 2) + "--skip=smtp::inbound::vrfy::vrfy_expn" ]; - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); passthru = { + webadmin = callPackage ./webadmin.nix { }; update-script = nix-update-script { }; tests.stalwart-mail = nixosTests.stalwart-mail; }; - meta = with lib; { + meta = { description = "Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP)"; homepage = "https://github.com/stalwartlabs/mail-server"; - changelog = "https://github.com/stalwartlabs/mail-server/blob/${version}/CHANGELOG"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ happysalada onny oddlama ]; + changelog = "https://github.com/stalwartlabs/mail-server/blob/main/CHANGELOG.md"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + happysalada + onny + oddlama + pandapip1 + ]; }; } diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix new file mode 100644 index 0000000000000..645af460f681e --- /dev/null +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -0,0 +1,70 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + trunk-ng, + tailwindcss, + fetchNpmDeps, + nodejs, + npmHooks, + llvmPackages, + wasm-bindgen-cli, + binaryen, + zip, +}: + +rustPlatform.buildRustPackage rec { + pname = "webadmin"; + version = "0.1.15"; + + src = fetchFromGitHub { + owner = "stalwartlabs"; + repo = "webadmin"; + rev = "refs/tags/v${version}"; + hash = "sha256-YglpdxZT5CyFLla6uXTKPtq9EbA9SEQacyR9KNToYT0="; + }; + + npmDeps = fetchNpmDeps { + inherit src; + name = "${pname}-npm-deps"; + hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s="; + }; + + cargoHash = "sha256-piZ+oLL8FqS8Ishi7byYfdedkszreGuxI56pTLcYXn4="; + + postPatch = '' + # Using local tailwindcss for compilation + substituteInPlace Trunk.toml --replace-fail "npx tailwindcss" "tailwindcss" + ''; + + nativeBuildInputs = [ + binaryen + llvmPackages.bintools-unwrapped + nodejs + npmHooks.npmConfigHook + tailwindcss + trunk-ng + wasm-bindgen-cli + zip + ]; + + NODE_PATH = "$npmDeps"; + + buildPhase = '' + trunk-ng build --offline --verbose --release + ''; + + installPhase = '' + cd dist + mkdir -p $out + zip -r $out/webadmin.zip * + ''; + + meta = with lib; { + description = "Secure & modern all-in-one mail server Stalwart (webadmin module)"; + homepage = "https://github.com/stalwartlabs/webadmin"; + changelog = "https://github.com/stalwartlabs/mail-server/blob/${version}/CHANGELOG"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/by-name/st/static-server/package.nix b/pkgs/by-name/st/static-server/package.nix index 4ec8b8c20852a..3be8eec4b80df 100644 --- a/pkgs/by-name/st/static-server/package.nix +++ b/pkgs/by-name/st/static-server/package.nix @@ -36,7 +36,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; # tests sometimes fail with SIGQUIT on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index bfa58b5bb7c17..f37e4dfdb73b7 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.7"; + version = "2.11.11"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-UppO7Cky+9xYg292t/78GPJ822kJ0RMG9yvetxRMVsU="; + hash = "sha256-6USopfRy+ffxXYNAp14RcO/uKZa1yfnz2S3RP8HmCWw="; }; sourceRoot = "."; diff --git a/pkgs/by-name/st/status-im/package.nix b/pkgs/by-name/st/status-im/package.nix index 040d43d24c214..914050e1dfd66 100644 --- a/pkgs/by-name/st/status-im/package.nix +++ b/pkgs/by-name/st/status-im/package.nix @@ -12,7 +12,7 @@ let src = fetchzip { name = "StatusIm-Desktop-v${version}-${commit}-x86_64.AppImage"; url = "https://github.com/status-im/status-desktop/releases/download/${version}/StatusIm-Desktop-v${version}-${commit}-x86_64.tar.gz"; - sha256 = "sha256-i91E1eaN6paM+uZ8EvO1+Wj0Po9KnzQorG0tWKF4hn8="; + hash = "sha256-i91E1eaN6paM+uZ8EvO1+Wj0Po9KnzQorG0tWKF4hn8="; stripRoot = false; postFetch = '' mv $out/StatusIm-Desktop-v${version}-${commit}-x86_64.AppImage $TMPDIR/tmp @@ -31,7 +31,7 @@ let }; icon = fetchurl { url = "https://github.com/status-im/status-desktop/raw/afde83651724a555626b5d9a3d582918de6c3d59/status.png"; - sha256 = "sha256-ViGuOr9LskGs/P7pjPO9zYgosWaZlZZYVuPpliOA5dY="; + hash = "sha256-ViGuOr9LskGs/P7pjPO9zYgosWaZlZZYVuPpliOA5dY="; }; pname = "status-desktop"; in appimageTools.wrapType2 { diff --git a/pkgs/by-name/st/stc-cli/package.nix b/pkgs/by-name/st/stc-cli/package.nix new file mode 100644 index 0000000000000..d04fe5293c3a5 --- /dev/null +++ b/pkgs/by-name/st/stc-cli/package.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "stc"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "tenox7"; + repo = pname; + rev = version; + sha256 = "sha256-QdU480at8VvuHpYmEKagnBotjM7ikOsVLJeedJ2qtjw="; + }; + + vendorHash = "sha256-TnWCviLstm6kS34cNkrVGS9RZ21cVX/jmx8d+KytB0c="; + + meta = with lib; { + description = "Syncthing CLI Tool"; + homepage = "https://github.com/tenox7/stc"; + changelog = "https://github.com/tenox7/stc/releases/tag/${version}"; + license = licenses.asl20; + maintainers = [ maintainers.ivankovnatsky ]; + mainProgram = "stc"; + }; +} diff --git a/pkgs/by-name/st/steampipe/package.nix b/pkgs/by-name/st/steampipe/package.nix index d37cc6066df38..a16c3c9e40ba6 100644 --- a/pkgs/by-name/st/steampipe/package.nix +++ b/pkgs/by-name/st/steampipe/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "steampipe"; - version = "0.23.5"; + version = "0.24.2"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "refs/tags/v${version}"; - hash = "sha256-8Ca5PD4BlaNn+2sQOUCU1CcHr4C/L+IdFcbj4eE4Fzc="; + hash = "sha256-FBWKXj1BfB9jbFMAmeBOHmv0QXmiZ3y7u1n1L8anUEg="; }; - vendorHash = "sha256-XpexUOUG8qw6Gb5galrnNIucheixHxT6astnI/6KIwE="; + vendorHash = "sha256-m4cgYDCugI7mCLCpRbVlNe0SeWZf1aVpeggufxw64oI="; proxyVendor = true; postPatch = '' diff --git a/pkgs/tools/graphics/steghide/default.nix b/pkgs/by-name/st/steghide/package.nix similarity index 100% rename from pkgs/tools/graphics/steghide/default.nix rename to pkgs/by-name/st/steghide/package.nix diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix index e901cf614f093..18fb6de2b0825 100644 --- a/pkgs/by-name/st/step-cli/package.nix +++ b/pkgs/by-name/st/step-cli/package.nix @@ -6,7 +6,7 @@ installShellFiles, }: let - version = "0.27.2"; + version = "0.27.4"; in buildGoModule { pname = "step-cli"; @@ -16,7 +16,7 @@ buildGoModule { owner = "smallstep"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-9w7rUtlLa1kl9oVboWZWj4eoZh+pPdGsEEQDWYdEMns="; + hash = "sha256-dMqJZ8UWJ6umJZAkcvSYQNh8e8ktPeqw1QHYagE2CvA="; }; ldflags = [ @@ -30,7 +30,7 @@ buildGoModule { rm command/certificate/remote_test.go ''; - vendorHash = "sha256-GD9TAvWqE3nvgVpoy/4CkkdVxliNMy+GNBXJtGSNVqo="; + vendorHash = "sha256-t4L+nw2KJ+79drVRJseNjzO4/qczeOL2dmcd2mlXFVQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index d2d8ab08f1f9a..d48c4e5d42391 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.14.100"; + version = "3.14.115"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-6PdF/COJ7UA8ULHMJ2HEIwc6wwNDUxS/92r3D8f6N1E="; + hash = "sha256-Iw3NUY0rWF+/lbGcO6zn96oNnRWRH33+8gs4e5yA1vM="; }; outputs = [ diff --git a/pkgs/by-name/st/stirling-pdf/deps.json b/pkgs/by-name/st/stirling-pdf/deps.json index 30b8b7fe3293c..781070050a283 100644 --- a/pkgs/by-name/st/stirling-pdf/deps.json +++ b/pkgs/by-name/st/stirling-pdf/deps.json @@ -1,6 +1,19 @@ { "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, + "https://jitpack.io/com/github/Carleslc": { + "Simple-YAML#Simple-Configuration/1.8.4": { + "jar": "sha256-K5YPSECsaLsYFdk3yi1Y65sEwF5qm3aaTocMUqRygVY=", + "pom": "sha256-aY43joFqIg7fy3VP1MT32aj9OHFrkIH2P5h41LvzzdU=" + }, + "Simple-YAML#Simple-YAML-Parent/1.8.4": { + "pom": "sha256-uSmLh1GFvRO04wEYfusjTToaSxqHHdSnRh8ud3USE1c=" + }, + "Simple-YAML#Simple-Yaml/1.8.4": { + "jar": "sha256-1VjKV5J9S8OT6VIqrAz2DMYyqfb2DNZySqlLcAXh/Rg=", + "pom": "sha256-R/EAPNketsEbLJQb+J5yQortkua/7zJ7GJNd2ijrQHI=" + } + }, "https://plugins.gradle.org/m2": { "com/diffplug/durian#durian-collect/1.2.0": { "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", @@ -72,13 +85,13 @@ "com/fasterxml/jackson/module#jackson-modules-java8/2.14.2": { "pom": "sha256-Nup9rcsQxxU+9lp14Wmxt/k33tCaGEUODxD+IC3yrc0=" }, - "com/github/jk1#gradle-license-report/2.6": { - "jar": "sha256-P4Gsjr9QBSzza2Mqbp9/DtCVTYI+FTOZuYolKOz8YbE=", - "module": "sha256-f79/6rarYy/N+dQNR9CJmsoLlRucyAfoz+uE139Zr7M=", - "pom": "sha256-lagUHcf0R4CevR65cNtkDO4iTZwCwMEm8vbDySP93LI=" + "com/github/jk1#gradle-license-report/2.9": { + "jar": "sha256-6/1tqFFlTFMhbuqe2hSFwS4M1t5amRm/XalzWgIfMq8=", + "module": "sha256-QTmlCEgcNprg8mJ/qDh/HiDlhgDyA3zcHNqhZOBW8jU=", + "pom": "sha256-gbVLKUR0kUFfgeK6oNmL9YY+Hiz4ri3bunYHrsJQ2Qg=" }, - "com/github/jk1/dependency-license-report#com.github.jk1.dependency-license-report.gradle.plugin/2.6": { - "pom": "sha256-PHvB2j5eV/g+O4oz2FTAav5LTPGGVy58Y14/VJ+CcJI=" + "com/github/jk1/dependency-license-report#com.github.jk1.dependency-license-report.gradle.plugin/2.9": { + "pom": "sha256-p5yk3+Bp1zf68HXI9LbGRxwuXOqOFUaUauMz10f93wI=" }, "com/github/psxpaul#gradle-execfork-plugin/0.2.0": { "jar": "sha256-609z3xPuJPsZUuCpBUxWGO8H8NYjhr+tGgSZDfDLOmU=", @@ -134,29 +147,25 @@ "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" }, - "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.5": { - "pom": "sha256-Nplw/agsRFMGIjSqxiwBbqw5nY8C2VKdUe28QY0fzPs=" + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.6": { + "pom": "sha256-YqT2dSGQuevzCGngkuQVTkGixc2WBIrpigGRbyaERlo=" }, - "edu/sc/seis/launch4j#launch4j/3.0.5": { - "jar": "sha256-4x62k3vvPwCsxAPkraf7ihY4ATiQ0bNSVmiFBocx7WM=", - "module": "sha256-+hiZBJpE2pdEnjoBvCx9rC01t0npPPdsBDSuzjT9ux8=", - "pom": "sha256-UvTlC0T2dzuebNq7jmmveQc4IW+8ZxJ1G77tGKFCknk=" + "edu/sc/seis/launch4j#launch4j/3.0.6": { + "jar": "sha256-ao8ADG/aLrF0BrUW7AvijNrJAMu6AzGeV708Lxsa+gI=", + "module": "sha256-Cjjh2qt5oytWeQ20WAiBSMl74CF2Ti0tziWbmof+wEg=", + "pom": "sha256-MhJ0+5apc3nprkdy0A7DMlBOPS/dQxlLUpQBlSzxcZY=" }, "io/github/x-stream#mxparser/1.2.2": { "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" }, - "io/spring/dependency-management#io.spring.dependency-management.gradle.plugin/1.1.3": { - "pom": "sha256-IjgvRfuFgvBXWMuKSZjk4RsXHH4w8f2r9zBPcm7DV50=" - }, - "io/spring/gradle#dependency-management-plugin/1.1.3": { - "module": "sha256-RgDMe8BIFu+9g/D4OJ9hWSM527UUWo2Uv5f4O8dldsY=", - "pom": "sha256-I9snVxPLFDWY6BBdB6YhbGcJmpHSbV6j5iLoLScbJpM=" + "io/spring/dependency-management#io.spring.dependency-management.gradle.plugin/1.1.6": { + "pom": "sha256-CFq9cXivKRAHeHfvZcf75G9tqj6KlBLnm3+ROMd+vCI=" }, - "io/spring/gradle#dependency-management-plugin/1.1.4": { - "jar": "sha256-ilmvd2SN0H5rZ1HScdsvodAr8ubPfpqzf7mwjsybQ6E=", - "module": "sha256-tfZT8jN6BlFiyXmEiGD3kXGbd2qg740mmRSDXFeo/6A=", - "pom": "sha256-7dDEvl+Ooaigy0VhCvoRfn4e8m4wGlBZZI71BdZgj+s=" + "io/spring/gradle#dependency-management-plugin/1.1.6": { + "jar": "sha256-V2HXOkK3PAiFyXkzZz95G+1IXpZRGP/LMzu4tKodZHo=", + "module": "sha256-o0vXlzMjdIhpE8YYG16S/R3Bfd5iziAE3nSSuOg54tk=", + "pom": "sha256-/GVloBfXrODoCaOOuaGfKRfQZCMDDKEl0gvca9yGP34=" }, "io/swagger#swaggerhub/1.3.2": { "jar": "sha256-cDph6Wsjr4GyzuukoIG7MhLsACEa4wB0iz58yx8zvTI=", @@ -187,38 +196,38 @@ "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" }, - "org/apache#apache/23": { - "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" - }, "org/apache#apache/27": { "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" }, "org/apache#apache/29": { "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" }, - "org/apache/commons#commons-compress/1.21": { - "jar": "sha256-auz9VFlyillWAc+gcljRMZcv/Dm0kutIvdWWV3ovJEo=", - "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, + "org/apache/commons#commons-compress/1.25.0": { + "jar": "sha256-0OyAFOu7B0n0cYAxIrIXlq/d8umOGU5DdGIuX7r2n0k=", + "pom": "sha256-ulzaSWZDqQb8t3sfE8XH3oFxM8l3pBfoqDX+KKZRjs4=" }, "org/apache/commons#commons-lang3/3.13.0": { "jar": "sha256-gvUoz3GMejwvMPxbx4TjxqChCxdgXa254WyC7eEeYGQ=", "pom": "sha256-/3zqTrI53WIRdRDavlGo1fDJ5MxCa8PowsIhpxj4ZIQ=" }, - "org/apache/commons#commons-parent/52": { - "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" - }, "org/apache/commons#commons-parent/58": { "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, "org/apache/httpcomponents#httpcomponents-parent/13": { "pom": "sha256-5Ch4ZwNYVsc3QgNo3VhuXlfnAgmBNYQM89c+nINj17M=" }, - "org/apache/httpcomponents/client5#httpclient5-parent/5.2.3": { - "pom": "sha256-8GQi0fH4n6RqPfdmyHii3RoI4flVOh+mZgmZ47ispow=" + "org/apache/httpcomponents/client5#httpclient5-parent/5.3.1": { + "pom": "sha256-NoiUNOqs3KRwF0BreUEgOze895YkeN74+UiSlCQt7uQ=" }, - "org/apache/httpcomponents/client5#httpclient5/5.2.3": { - "jar": "sha256-fPTH5gM4qjNOhpnyQjrxyTvcOjEh8t8iN41hIi+lkQw=", - "pom": "sha256-8Dz23MD/7AFWSxfz0I5b5gFORHusRzWwH6cX+S+5XC8=" + "org/apache/httpcomponents/client5#httpclient5/5.3.1": { + "jar": "sha256-CDRqdXxhf27MZq+fCZJgrd4fOhNR+oHLIvwXSCsx+CM=", + "pom": "sha256-fuGd8eK2dpxAzXkwLISRYJXhz67EoxDAbVjkFQuIHyA=" }, "org/apache/httpcomponents/core5#httpcore5-h2/5.2.4": { "jar": "sha256-3BqV5z6wTbk0UVM9OQzgLFOzAaENw0PQjIYvKTSz0w4=", @@ -305,6 +314,14 @@ "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" }, + "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.9.3": { "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" @@ -333,33 +350,33 @@ "org/springdoc/openapi-gradle-plugin#org.springdoc.openapi-gradle-plugin.gradle.plugin/1.8.0": { "pom": "sha256-LRFzQyMeKb4i5Im8H0gl4dS771RZBeeTJE6VIhlXFU8=" }, - "org/springframework#spring-core/6.0.10": { - "jar": "sha256-HApr+czPqLvmq0nBOWPBq7Lt/4HYixr3RiYX3cfAl10=", - "module": "sha256-hbYoaLgyPn4yns3fCcR2oEMC2Ie7de4F+2RSVmrMFSA=", - "pom": "sha256-jKnCE+qV3MCO/lIfH27GsbaSAO+LdPr9Z7Jls/Ndp8k=" + "org/springframework#spring-core/6.0.23": { + "jar": "sha256-TOmcA/2FlH1DV/xCrN5OCAs2TVOjrLHPq52jmCQMQpE=", + "module": "sha256-eCrk9Me63PoSiLZ+lzw96kPqoMD4am2RCEIAn2i+l9w=", + "pom": "sha256-FU3YnVr9T1idQA4GJkk87ONTsYc2e/ODPvVx97KQ5kE=" }, - "org/springframework#spring-jcl/6.0.10": { - "jar": "sha256-MjIJyDN06eTAeFMRM0hi/vI3VbJMPA75SvVzEzNtbDA=", - "module": "sha256-3x5LmsRnzVg3yDb9b6D8wYBSxJNx4tpwNxGDVdzkNgM=", - "pom": "sha256-3PtOmzAEr32JWwzRxzVO7dbsO+5ZXFeAn8pG162DtPI=" + "org/springframework#spring-jcl/6.0.23": { + "jar": "sha256-zCnuRaX/A2qZwLue0aCEBls2HvWiSeD0XxZYzMP0dQQ=", + "module": "sha256-4F58rXbbpxI0nJWB/wt3dyzJ9jiRsOtI9Feyq36ObtQ=", + "pom": "sha256-JAilcZX6oBf25+ye+N2K7InB3Qa5ZyBopMpWiALKl7I=" }, - "org/springframework/boot#org.springframework.boot.gradle.plugin/3.2.4": { - "pom": "sha256-5DmvFjixGykdvMkP5+YMQnmEOCrOviVmsJQzFYF4Xf8=" + "org/springframework/boot#org.springframework.boot.gradle.plugin/3.3.3": { + "pom": "sha256-SHyRhpM1VBVPNMRGjdmXT7uP5RFIQufpX/+xRgByx2o=" }, - "org/springframework/boot#spring-boot-buildpack-platform/3.2.4": { - "jar": "sha256-wj8dASDMAWMUok49iOK7A8lfLRnpqWG5U84lhoVXzog=", - "module": "sha256-1W3+CczrqrcwXSIHKN6J1Zv4hMgqIy8denoZl2KhNIg=", - "pom": "sha256-k5+6HnB4vmBsg9SaiQB5KbBPKajR9om5faTP8Whiob4=" + "org/springframework/boot#spring-boot-buildpack-platform/3.3.3": { + "jar": "sha256-UEKb3MNeOZCt2ihxww/XUrAnGv7g5TjyE8PX5ZByLbs=", + "module": "sha256-m7CjJpiRH2Ihu7HZzDvnbl47Vwo6iDzo4SrDOG/bt/U=", + "pom": "sha256-+tXOpADAaQCnG2cd6bFlSbD09toq7OPD96/oVaLfZVY=" }, - "org/springframework/boot#spring-boot-gradle-plugin/3.2.4": { - "jar": "sha256-6V6gGlTW/Q4ocjRlXDCsSSWo9nEqGxZDfTfqTPptlJk=", - "module": "sha256-xbSUt50Fj/B2DvtjphAMAsvBPG/jPv2I0xYBmXocpMc=", - "pom": "sha256-cbraMCUInappn9Uz5yBrPnGBPSGg0xIFsQUrgzNXHlc=" + "org/springframework/boot#spring-boot-gradle-plugin/3.3.3": { + "jar": "sha256-ysPXrX3mx/HuKuuYYPPYRPmJ5aWID9584uJD+LX87to=", + "module": "sha256-eVyg3KXtRGn6y4ncKYXwLaTw0t/njtYQ0lqllgy2tS4=", + "pom": "sha256-C3vpjWCiOYC+vmjURltwZu6gIaYp3hhubccMPx7wVw0=" }, - "org/springframework/boot#spring-boot-loader-tools/3.2.4": { - "jar": "sha256-hwt3UejNc7ev0muh3ihyjnBwVY/2XyGz9gELX5N0Fac=", - "module": "sha256-7sSC123IGCd8bYK4V0BkLHa4XUiJ6ZWyrC+0mxMJzic=", - "pom": "sha256-gzfQx85z1gx3NLmGadxPldXd7uyJXD5UUVD8FFhgH5k=" + "org/springframework/boot#spring-boot-loader-tools/3.3.3": { + "jar": "sha256-t7GP3zNlrA7EpAx7SKKrCkG1pO/tG6hNCV6X2B6FKkA=", + "module": "sha256-71wjj5dj89YIFc+F9MWAhb87IXIN61BXtRSqXqvYacE=", + "pom": "sha256-L7qaHz+9geHzuzFVkS9Mx+i5GWWoZOeJGkGEiIGy8uM=" }, "org/tomlj#tomlj/1.0.0": { "jar": "sha256-Mml8dWeykhxHNnioILE/xkcAqoe7FFdu60jQ7VhHz9Q=", @@ -375,114 +392,116 @@ } }, "https://repo.maven.apache.org/maven2": { - "ch/qos/logback#logback-classic/1.5.3": { - "jar": "sha256-tf6W/VZV+Usbyogdtc4WQ9CLnb3Ni2/jYeMuRXjVYTs=", - "pom": "sha256-a1TxNgVxhl+cbEvsDkhUiE63o268ZGWlKpYGU6iwZ8Y=" + "ch/qos/logback#logback-classic/1.5.7": { + "jar": "sha256-fLF/axL9pO5pGRYEjKeprk0bDNvmgSWs+dbi2v2ywX0=", + "pom": "sha256-xu/O1xfr0JOrhQE78w+G8vw8KyrpOQtbEZkzQ+GJGMM=" }, - "ch/qos/logback#logback-core/1.5.3": { - "jar": "sha256-eFRQelmtXFgijcS8Pas9eSJTl/XvJDDts6zlREXgER8=", - "pom": "sha256-sZGeCDrFrpwZZq+FnI/FEgTIW384Nf5pnF7eZtQv2Bg=" + "ch/qos/logback#logback-core/1.5.7": { + "jar": "sha256-wyspr2nCAe/eaGIl+LQ5+QU+iOyqrBEMAvy+G0cj+tw=", + "pom": "sha256-wUBD7EJzFU9mAbrmNZ+EldTDIbC51lIDEi3PqS9ozpc=" }, - "ch/qos/logback#logback-parent/1.5.3": { - "pom": "sha256-DFvLSOq4iEJD6SEv0+XzOME4PitMsa8xMyCZQfgtCk8=" + "ch/qos/logback#logback-parent/1.5.7": { + "pom": "sha256-jKYZjNN538JvvZ9nzbMR8+pF0KQXlAaQsnVEuyK8kmM=" + }, + "com/bucket4j#bucket4j_jdk17-core/8.14.0": { + "jar": "sha256-bNVTaEKXO+mR8nzFrcvK87+UqNVCpKfSiqgu9unXkk4=", + "pom": "sha256-C7h/rINT5MsC6PZ4aqZTXyIq4ivbajuODKazSgZuT3g=" }, "com/datastax/oss#java-driver-bom/4.15.0": { "pom": "sha256-XJ4x7/lc83XFvf/4XOKCh9Wa/PUTS05qJKdj2xcaXmc=" }, - "com/datastax/oss#java-driver-bom/4.17.0": { - "pom": "sha256-GMs4z09H2+zY1bKnbEFzqUvrSEMgSS+G1pZGSXQxJn4=" - }, - "com/fasterxml#classmate/1.6.0": { - "jar": "sha256-0vy9lWg3pXocYA3aEY1WNBNsvWc/MIUiUeTw3ij9Tr8=", - "pom": "sha256-LjYTx1Xn2kJeRFiOZraoHmXVKUiVYksR9JfwqHcQO+o=" + "com/fasterxml#classmate/1.7.0": { + "jar": "sha256-y4aPIxxczrideV6gDm4bepO49Kwc4di+dt3jIt/0oEY=", + "pom": "sha256-ZHEa3vDskvH2zap7LqwGsuVmekppkez7i/rEZoHVuTE=" }, "com/fasterxml#oss-parent/50": { "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" }, - "com/fasterxml#oss-parent/55": { - "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" - }, "com/fasterxml#oss-parent/56": { "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" }, - "com/fasterxml/jackson#jackson-base/2.15.4": { - "pom": "sha256-dOOtPAiqNxApnzWCU44H7YxQJsPBKLZqYYl2PXTljIg=" + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-base/2.17.2": { + "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68=" }, "com/fasterxml/jackson#jackson-bom/2.15.2": { "pom": "sha256-Hq1jAlXEiMUbXgq1YMdsI3GtJq422t8JKcUmVy6ls4s=" }, - "com/fasterxml/jackson#jackson-bom/2.15.4": { - "pom": "sha256-bMLZJfyt9c0iUlTL9OSni7mvkZTQGHF3M9WYRh41/Zg=" - }, "com/fasterxml/jackson#jackson-bom/2.16.1": { "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs=" }, + "com/fasterxml/jackson#jackson-bom/2.17.1": { + "pom": "sha256-n0RhIo4SkQPu16MC3BABqy5Mgt086pFcKn27jMYe/SU=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, "com/fasterxml/jackson#jackson-parent/2.15": { "pom": "sha256-bN+XvGbzifY+NoUNL1UtEhZoj45aWHJ9P2qY7fhnXN4=" }, "com/fasterxml/jackson#jackson-parent/2.16": { "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" }, - "com/fasterxml/jackson/core#jackson-annotations/2.15.4": { - "jar": "sha256-8gTrvVUmFKIrhTH/41DUf4/ULEW7YFF8B5dNwnpaHdM=", - "module": "sha256-IEXd1K3wouVsBUAiBVyUn3xyKqBJhtg0HpbVwQb932I=", - "pom": "sha256-fV1brPhSbkv/LtX+zBk+SgPaKaKbWxssfqYiDdoAZ/U=" + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" }, - "com/fasterxml/jackson/core#jackson-core/2.15.4": { - "jar": "sha256-jckhDdKF2zZvRfUY3R5qnM/rDxqOGEqJn+ltKe3x/ZQ=", - "module": "sha256-G8EfZVih8qFaFvjR5+Grp6aKLu0aIzemhlniAW0oWM8=", - "pom": "sha256-c+IQW4TXUa6yDR85+StaU7M2IR7Jq+gjRSVTVfBXWhI=" + "com/fasterxml/jackson/core#jackson-annotations/2.17.2": { + "jar": "sha256-hzpgbiNQeWn5u76pOdXhknSoh3XqWhabp+LXlapRVuE=", + "module": "sha256-KMxD6Y54gYA+HoKFIeOKt67S+XejbCVR3ReQ9DDz688=", + "pom": "sha256-Q3gYTWCK3Nu7BKd4vGRmhj8HpFUqcgREZckQQD+ewLs=" }, - "com/fasterxml/jackson/core#jackson-databind/2.15.4": { - "jar": "sha256-D5n/dxnu8+6FYIs97m7PPGmAA/6dbjTqu/q8zcm1rCw=", - "module": "sha256-RHAqK/3Ro7KScRuTVikdsF35YdGAVVhJ0sv2DrnMsQE=", - "pom": "sha256-DOjRi5CswPz/3dowyl2pPqRFCydtBm2eMCnAOwknBaQ=" + "com/fasterxml/jackson/core#jackson-core/2.17.2": { + "jar": "sha256-choYkkHasFJdnoWOXLYE0+zA7eCB4t531vNPpXeaW0Y=", + "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=", + "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.15.4": { - "jar": "sha256-mkY6yM51+iDEwWNl9qceqICLvE7KNzbjFWZ80x4bVJw=", - "module": "sha256-ST1lmAcoS58VliOHPt06guPK4uuyeV2V6zXhZPI4wiU=", - "pom": "sha256-5ONWD32KBjSF2ZwBEAP96KtBCFf9v4nNAaqUFunv1rM=" + "com/fasterxml/jackson/core#jackson-databind/2.17.2": { + "jar": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw=", + "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=", + "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.4": { - "pom": "sha256-nc/Zaw46obazYDPnutgd8uodEExbDzsLLMjmHCSRw0c=" + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.2": { + "jar": "sha256-lBvNixOBuzsNcm+rQWJPqOzg7nts8oYK2V6BV85nM3Y=", + "module": "sha256-snbSUVf4i+6mnT9ENGWFZLcfMazeHUsaFPiYS+lTw0M=", + "pom": "sha256-7eVVk8YoXTmdlgc6GQy5v/QlZ5WqjWO5AXcrsxI+SDs=" }, - "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.15.4": { - "jar": "sha256-PvudVbYvUOZLEf4AYlgAKF/vh4Fza4C9IGZ3+1YECqw=", - "module": "sha256-r2tfmedOojijTzz7hRFwtDRtKTQQfqJXKs+UHl0Bzw4=", - "pom": "sha256-oYMOic9GPr6Nz9tzoEDwh8LNUO4F3H6bqRkSP+ckGbE=" + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.2": { + "pom": "sha256-5pgyMzCpqCySDlqJtlsPciXI5zPBIqGPeWoEpuMfpcs=" }, - "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.15.4": { - "jar": "sha256-RySYy7onJgEv+C+G/I/u+Vk2Y72hppWhfbgEpj+nM/8=", - "module": "sha256-7fQDOV9KMvjdq3CDS0mTNmkuFJQPK7nXELYufS3Dtn8=", - "pom": "sha256-u28bhQeGliTlTBoh0Bip5Lf06nX/zMcx599Ky2coxbE=" + "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.17.2": { + "jar": "sha256-qqmNPtq/UEJr2CL60UQvva2m5HCWkybLyrXCeY8XONk=", + "module": "sha256-eG+CJvp0Tkyw3/M7pt+MLv8kd2PixpwhkP1SesSrrmw=", + "pom": "sha256-3fwpGHlF2jpkLCK4cP1keg30smJYIK/DXLeldGkWjsQ=" }, - "com/fasterxml/jackson/module#jackson-module-parameter-names/2.15.4": { - "jar": "sha256-piDuEfid6ubizmzVpk2fLRSAvwi0XsLwcwvd+Rd/N/w=", - "module": "sha256-4sXPiLCT5prpdqWxJH7JB47YxmySoe/r6sRSPP5r3jE=", - "pom": "sha256-Os249wu/1EeTNai3Dy6EyYGUBlJR+VEYpKvrX47C4Pc=" + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.17.2": { + "jar": "sha256-m4ACSpgi5wsH9rsTgkx2wTfBBkobXrUYN0qxQYcP28w=", + "module": "sha256-hQ6bLt+rFU0bQVAbAZc1GtZ6K69+SCmmVmISIAJSpo0=", + "pom": "sha256-P1yG5fexCv31YydS8TV769ngDLNQmiB04NfnUqU04eg=" }, - "com/fasterxml/jackson/module#jackson-modules-java8/2.15.4": { - "pom": "sha256-OxSBaCFhP/9ZoNDHqEboIXxB78xQXYtjlqUMDJEamsw=" + "com/fasterxml/jackson/module#jackson-module-parameter-names/2.17.2": { + "jar": "sha256-HuXi81k9RHJrkAhoxvZNGlBjalaD1tQEJ/WYSmHeU8A=", + "module": "sha256-crBsxJRu9LXdDMpqDT6byf2rFxlTGOF1OOGfzj9lNng=", + "pom": "sha256-sm0FFho+BOejiIIRecARtkFXKrr4DiNdBOoRgTLQaDo=" }, - "com/fathzer#javaluator/3.0.3": { - "jar": "sha256-Q/0dt7ItMw5TwNI32BwfTb+gyeE/wUThwxQCDcS2eCs=", - "pom": "sha256-LJV70AFI9vLH9xNp15+7wVojSF5SFdD+2yPV9XOjbDk=" + "com/fasterxml/jackson/module#jackson-modules-java8/2.17.2": { + "pom": "sha256-PznFUQn1GiKIF7SxheQ1G57wUBwJ/B4aMHWulUfMLQM=" }, - "com/fathzer#parent-pom/1.0.3": { - "pom": "sha256-bGRS0s8XtqB7GJxI6UdeHQHIEvXnhG3rkkHnRhAcjzo=" + "com/fathzer#javaluator-parent-pom/1.0.1": { + "pom": "sha256-YRV0qFwGU9vwoDS7iJ9LrCZr0oZz6EZ2w2o6TNqWLfg=" }, - "com/formdev#flatlaf/1.0": { - "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=", - "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo=" + "com/fathzer#javaluator/3.0.5": { + "jar": "sha256-kRfz3GEP5z7oe7YtQRjxjpK4+lfj6U+sa+vDVL3aTJk=", + "pom": "sha256-y1S3+s1i4tvFhS2gx773uFnMeK+5Q3lTRiC2bxzLpr0=" + }, + "com/fathzer#parent-pom/1.0.8": { + "pom": "sha256-zRQ6tSZOnHOx0gQmT1GKVaAZpmgdV/J5C+s9s90sPCA=" }, "com/github/stephenc/jcip#jcip-annotations/1.0-1": { "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=", "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs=" }, - "com/github/vladimir-bukhtoyarov#bucket4j-core/7.6.0": { - "jar": "sha256-0XMQ4gZuWcBAT2GuXaGkD/lEKvoxNjqCvdwaTmJT/Yg=", - "pom": "sha256-OVtCWprjmQpylVV9ImeBPtDfUm7fQ/iO+xinuBt2Eq8=" - }, "com/google/zxing#core/3.5.3": { "jar": "sha256-jYBkwWNv2u9xid2QVcfVmVColAoS8ik5VkRuw8EJ/YI=", "pom": "sha256-2KEui/aQVOKt0j15U0FOrv3azskwFAqNFE0frJ5it98=" @@ -494,20 +513,14 @@ "jar": "sha256-1iPNwPYdIYz1SajQnxw5H/kQlhFrIuJHVHX85PvnK9A=", "pom": "sha256-UX4aBXKZSVISML9WJlvaxaI5/bkOrWyqhfDGppzX+AM=" }, + "com/h2database#h2/2.2.224": { + "pom": "sha256-DUUDoBpMemL5GuGmJxM5z4BvKkYt7+C+/17/1aYR45g=" + }, "com/jayway/jsonpath#json-path/2.9.0": { "jar": "sha256-Eanub4i7MfFFAQjRz2RBN33shKygdetrsjQ74VdXW+o=", "module": "sha256-5ikAQ9rpOnDZqz+hvrh56M9e1ajgqQGD+5bCUVqXCD4=", "pom": "sha256-DCU33em/ncKix5ZzAPwTvFIp0ZJnf8uItv2Jlmk2ZD8=" }, - "com/jgoodies#forms/1.2.1": { - "pom": "sha256-Rya6hKIwmKG9F6/xHe6waTOPmywM/X/Xuv4wZYCZsII=" - }, - "com/jgoodies#jgoodies-common/1.7.0": { - "pom": "sha256-MuhZojXD4ip33Q/Xzs9IaIBn2NjLxiGRfC7YBAmMUIY=" - }, - "com/jgoodies#jgoodies-looks/2.5.2": { - "pom": "sha256-ktKprZrAxUXdthqzVSvh1f0w3uG/tMaWEVl2MfPGSMk=" - }, "com/martiansoftware#jsap/2.1": { "jar": "sha256-MxdG+mLPvDNoJgxaLmYJNq0RvmEjCMEgoEThIDYdR04=", "pom": "sha256-ms9WqFecBb7dgZ2ZIyNj4r8yfo9zxnWY29mIWoRaPGk=" @@ -520,13 +533,13 @@ "jar": "sha256-6MHFlOJCW9vqLYYN5Vxptp/F1ZRURSRJoPCRPCpbijE=", "pom": "sha256-gksNfeeCer/GpH5u+UsP+qE4/vOK8IxWon9dOhUiEZ4=" }, - "com/nimbusds#nimbus-jose-jwt/9.24.4": { - "jar": "sha256-jViWMHIqTFY0kkhlJHf9qk4w35xzLE1urC8nFDckYwQ=", - "pom": "sha256-rEz2OglJyeyy+E23KZ+R2/8aEdLYbJT6xGdgtmfhXKE=" + "com/nimbusds#nimbus-jose-jwt/9.37.3": { + "jar": "sha256-Eq5KOiYAldeuuirep645bouVcNuLe0CeCagkwhnMBEQ=", + "pom": "sha256-r8Y7aJ2IFDm5XzQ7Hcp1A5HtrGO4c5K+TZDRnJTMr74=" }, - "com/nimbusds#oauth2-oidc-sdk/9.43.3": { - "jar": "sha256-YhaW4PEaGTvR8qUcvk977FxYLWRyfYlqSL8RZmLwSAs=", - "pom": "sha256-g3cIDcQCNyiNynUqBynnqNxeNodhdSRg7hcs3FwFnVE=" + "com/nimbusds#oauth2-oidc-sdk/9.43.4": { + "jar": "sha256-qq6G2BhiRNvDVm+qHw9nzjgKz3d3QwLO0g1SL8YTsK0=", + "pom": "sha256-RnCDbjnZ0P3CDuGqpf8bk3WYOptPlDzxipNYaktjH1U=" }, "com/opencsv#opencsv/5.9": { "jar": "sha256-ICOWm4bOlorYrlSWSKxYfRQcGa5oSppcZ8kQXzerDRw=", @@ -538,6 +551,9 @@ "com/querydsl#querydsl-bom/5.0.0": { "pom": "sha256-M9iKwC/Iwb2sEp3BGP/aOxf+lr9c+DVB3cAUoptiexs=" }, + "com/querydsl#querydsl-bom/5.1.0": { + "pom": "sha256-iFPc4TLJ7OTClcf01PPCgy7uDX1EkwhwwGZvpyBDylY=" + }, "com/squareup/okhttp3#okhttp-bom/4.10.0": { "module": "sha256-NLNP75zu3d2ihMXxVoc4lg0qU9VuHvz/jK6tPmZSpcM=", "pom": "sha256-vmLpNvEMNmU+XpGVrwBVq4bMugi4/sKo773exKzu71g=" @@ -565,68 +581,62 @@ "com/sun/xml/bind/mvn#jaxb-txw-parent/4.0.5": { "pom": "sha256-yu7EM19YqOOcl+oK6JvqnCtJro2bD82SUjjgKNOESU8=" }, - "com/thoughtworks/xstream#xstream-parent/1.4.15": { - "pom": "sha256-GDOZpW5OtAJkCjcZURmuZx61kW17OKX2PpTvGvkPuc4=" - }, - "com/thoughtworks/xstream#xstream/1.4.15": { - "pom": "sha256-sX3W1xyyywYmTZ6q0a6Mgg5FdhTx1jRcdgmSB3Ei1EY=" + "com/twelvemonkeys#twelvemonkeys/3.11.0": { + "pom": "sha256-ELLAgOMiZw7tfeBiRNhMx8WVOSfuWvPdjESGVaOAW78=" }, - "com/twelvemonkeys#twelvemonkeys/3.10.1": { - "pom": "sha256-k0AY2+dfgNCT9vl1ks+o2DGX70D36r0dfH9mqZ9R5eI=" + "com/twelvemonkeys/common#common-image/3.11.0": { + "jar": "sha256-Eh98YraQ0tUk6rzx8xrExnfBSPbDLXQpzMA6ZFFqr5M=", + "pom": "sha256-hY/Ng2sxCdCvls0v0+kjnlqrTneeS/o7VPgORp8q89U=" }, - "com/twelvemonkeys/common#common-image/3.10.1": { - "jar": "sha256-lg6bzhQGlNDXuP6VjcmrBPjWJcQo96qem/odfZzUFtE=", - "pom": "sha256-t/zu2VnQ4PFqYdUo91bSHK49WQJnxHFt3b8ia1MKW7s=" + "com/twelvemonkeys/common#common-io/3.11.0": { + "jar": "sha256-mdLCffXUw84CSaPaoq1Jw5ZDo99lPAfL4igpiIklWMo=", + "pom": "sha256-5AuxgXc7Nc23kjFV8TbM2yg9+HZdRH+TQlFbNwlGfHE=" }, - "com/twelvemonkeys/common#common-io/3.10.1": { - "jar": "sha256-VpH7etJAL4FV6XqXVTDBQ5eQNqvDQ2FknZO5ukHCzgE=", - "pom": "sha256-NuBRBgV8jwzhTiEVVLdloBBMx7RWCeq97nrErXZ2yk8=" + "com/twelvemonkeys/common#common-lang/3.11.0": { + "jar": "sha256-F7hKpUp7POYjD2FWfua6OTLL49AWRbBTh+0wcV07evo=", + "pom": "sha256-gkGjHq7rObaHS0h2amKKDOwrfzY8DvbCH7afao4JTvw=" }, - "com/twelvemonkeys/common#common-lang/3.10.1": { - "jar": "sha256-SdXsz3bfITxZgYlCnH03GmlqCzt3nlBSsPm7H9HtLxE=", - "pom": "sha256-15CiZZFWHhyk0I+N+3dHDZstsWYCK82yH2X60HcvVco=" + "com/twelvemonkeys/common#common/3.11.0": { + "pom": "sha256-HjI1GeG/W9NRqeBIInSmPZ+SqtTGT8mRhl+3GGedUBQ=" }, - "com/twelvemonkeys/common#common/3.10.1": { - "pom": "sha256-TIfgKQ3H+yFkJxkXuGnZ3Y+p4epC/eWfQPgF1Wkli+0=" + "com/twelvemonkeys/imageio#imageio-batik/3.11.0": { + "jar": "sha256-WzlZMd7U0c9RX2vm/AoiXXie+hjY7iVyrmzHLvf2IYA=", + "pom": "sha256-bRHxfhuLgrAUc9K2ntOXfeO+tv47Ona0shac6CX09/o=" }, - "com/twelvemonkeys/imageio#imageio-batik/3.10.1": { - "jar": "sha256-38a0g10xkrBfILqFt3b1XnjszN/PoSYLaFcDr5Ugfxc=", - "pom": "sha256-s0PhynnsDrM2ompLPbeGefmxA5Bz1/IkCYTEsNfy9jg=" + "com/twelvemonkeys/imageio#imageio-bmp/3.11.0": { + "jar": "sha256-rrHCUbjW2MXZHmEDeeiJby+Jvaa1bIEwTmyW2oLFYt4=", + "pom": "sha256-Ou/W593NxDEmOGSCXnReaxZI6z75TVuqyVEXeg3ktAk=" }, - "com/twelvemonkeys/imageio#imageio-bmp/3.10.1": { - "jar": "sha256-ICwyjVx+D1vWjyphRGhiT/H7GbteGvrA9xNIEiFGYtM=", - "pom": "sha256-G65QtRvRcMNXUkLf6mGM0F/jNdzhoP9bFij5YfO6oZY=" + "com/twelvemonkeys/imageio#imageio-core/3.11.0": { + "jar": "sha256-qlGUZvr/VPXhKXNxhWerSrPD0UxcW+1/wO7tQjmkjrk=", + "pom": "sha256-d8uK45DuE/xJIu4NYsJiZHaHQteb9ecMqA64gWAhNyM=" }, - "com/twelvemonkeys/imageio#imageio-core/3.10.1": { - "jar": "sha256-u5kr0a34nuP95oxzOOy6P50P7v6cwfaRaQizUNxiklQ=", - "pom": "sha256-wenZItSAc1DJNh3p3GZl61ImaZuJi5jZBnN5NNfBods=" + "com/twelvemonkeys/imageio#imageio-jpeg/3.11.0": { + "jar": "sha256-QpHkgCWdoU8AUTiSgRL2s1rO/HKpVF6pjZl+hDxV2z4=", + "pom": "sha256-1zL4MhQY/ADaI1fEDNXlIL3evP+UAdd8+I+Bp2xjxhQ=" }, - "com/twelvemonkeys/imageio#imageio-jpeg/3.10.1": { - "jar": "sha256-lsOMuoAmd3uDB77fcWsOqHlhQPTgWy/R2/UNXCZXK/U=", - "pom": "sha256-c07f2XbCK63LHUPMyh/tTwg+RrV60L0kTZOY8e/+23M=" + "com/twelvemonkeys/imageio#imageio-metadata/3.11.0": { + "jar": "sha256-3j07qmCDbvYGmKf5vP2z4YAugUCh1TQtZmFS5qmR5ZY=", + "pom": "sha256-5FipFdep0DcdTYgyq90rP8Q2GKWj9/BFcRrL0FKMBK8=" }, - "com/twelvemonkeys/imageio#imageio-metadata/3.10.1": { - "jar": "sha256-Tq1OX6/zA/eBvI/vG4b0rv+PmzXRXy+C9g6gdqNk5gI=", - "pom": "sha256-SHHCLjmKuSvHXTBrpXbG76OxRrhnfLv43ATvkx5P8cQ=" + "com/twelvemonkeys/imageio#imageio-tiff/3.11.0": { + "jar": "sha256-xEq8bYNS4rdXfquWKpS/CT+rftg3G9/dnJVd4y7NpRU=", + "pom": "sha256-/qrWPU1vaHuXMsWyRZ26lFtRnzSEloZypigWNX7ASW8=" }, - "com/twelvemonkeys/imageio#imageio-tiff/3.10.1": { - "jar": "sha256-2UTAU2SRfeSmveUJutzsgGxk0WNoIKjCTaJTjV2lDkA=", - "pom": "sha256-IhuryGIeZx1bb0Koes993F5waA+ctQMg+6NidvC1L44=" + "com/twelvemonkeys/imageio#imageio-webp/3.11.0": { + "jar": "sha256-dgoMoYgzlI/TCvs0UlxW9b/xk+d4PUhSILaODVQ8QUA=", + "pom": "sha256-E/tHQxNVJpNOwb3iLbn6kqQtxOWBX/SCEZs5knu3STU=" }, - "com/twelvemonkeys/imageio#imageio-webp/3.10.1": { - "jar": "sha256-DTMvXYB2vQ419nG4UvK/txYMPX1gfv2yHTZRV5OP+54=", - "pom": "sha256-W0OaTVQ99Llxhc7agNSw0ewtKT4uRaTUzcy+/KzlArM=" - }, - "com/twelvemonkeys/imageio#imageio/3.10.1": { - "pom": "sha256-wmu6VU5gjjPJAYJeCJXW/uUfaC3ZBVn3TfpgFKgRSC4=" + "com/twelvemonkeys/imageio#imageio/3.11.0": { + "pom": "sha256-VyQzrPzkVWEQr8x2N5AOyamDYJTMjtobIMDDuR/x24Q=" }, "com/vaadin/external/google#android-json/0.0.20131108.vaadin1": { "jar": "sha256-37e64vQEz+C3K00jlEaYy3FrdmUXGBKgpND1kmwPrHk=", "pom": "sha256-L/bBfZwGC4nNfvGPpICuJEbrqGhVpjPziSg3/DuEj+8=" }, - "com/zaxxer#HikariCP/5.0.1": { - "jar": "sha256-JtSSOX5ndbQpZzeokZvwQEev5YJ/3SwItFV1lUNrOis=", - "pom": "sha256-xHNfXT/2ylsyI0Xofw3diA9XkNiLzle6/hqfn8eeAq4=" + "com/zaxxer#HikariCP/5.1.0": { + "jar": "sha256-pHpu5iN5aU7lLDADbwkxty+a7iqAHVkDQe2CvYOeITQ=", + "pom": "sha256-M0sOCm5lucZJw/6Wc5ZjpEEOGpF2ZTgC5ZVJO4YYLyw=" }, "commons-beanutils#commons-beanutils/1.9.4": { "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", @@ -644,93 +654,96 @@ "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=", "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ=" }, - "commons-logging#commons-logging/1.2": { - "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" - }, "io/dropwizard/metrics#metrics-bom/4.2.19": { "pom": "sha256-+G9/Vev/HwNOTVHbypTh18FykokM79GdBDDugjrFxDo=" }, - "io/dropwizard/metrics#metrics-bom/4.2.25": { - "pom": "sha256-glrTe4OA+ZK1FQULvZVFL4VGb+rnuFbVwVDU5fcWqOk=" - }, "io/dropwizard/metrics#metrics-parent/4.2.19": { "pom": "sha256-lm7hDMMMk2UClsipjkFs11IpEj1WItPcHqV+UgjVgLY=" }, - "io/dropwizard/metrics#metrics-parent/4.2.25": { - "pom": "sha256-33tjcfmxVpjhI9mGHyCZyjLJ7JZtnwxgdVoqNMy/q8I=" - }, "io/fabric8#kubernetes-client-bom/5.12.4": { "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A=" }, - "io/github/pixee#java-security-toolkit/1.1.3": { - "jar": "sha256-eZW1qPrE0aZasCh5AHYWBOa7G+OOsoX0FdCR6PKLAFY=", - "module": "sha256-72CmAQlWmBzCsbpfl1BtbRr5vHdnfOxZfbNgVGypBi8=", - "pom": "sha256-REGk9EmIQBEsrcsUKSL5HqIrKzTgRWPwnemk4K6sdv4=" + "io/github/pixee#java-security-toolkit/1.2.0": { + "jar": "sha256-53T/9SmHY4UGG382VNyr8ef15Z/ctoFqvlPQtjydkJA=", + "module": "sha256-tTocVLs16ou6XTHb8tyimtPJKT1fg37aIWEtvnFrQ0c=", + "pom": "sha256-Bc4BBr4BbcQe9VbatoW157GwdSGi/NtTNaHqn8+E6mk=" }, "io/micrometer#micrometer-bom/1.11.2": { "pom": "sha256-2qo2vb6vKmnTVi6A92D+f4bU02uUGsBbqhjPpGtkvhA=" }, - "io/micrometer#micrometer-bom/1.12.4": { - "pom": "sha256-5db0qM57qkrlKtZ8hWlFcfr2XaUC9LYiKm2guglgJc0=" + "io/micrometer#micrometer-bom/1.13.3": { + "pom": "sha256-xD1wWkeHyOQp6bMFsKpiVfviCX1HcYPwCAndinZ2M2k=" }, - "io/micrometer#micrometer-commons/1.12.4": { - "jar": "sha256-YuRvO0biNOOPgzPPPjpf9U0KnzyokOS5dzZ00YDDaRQ=", - "pom": "sha256-TVSeACNoTzcRH5XKktaz2YI69rZasC5XxYy7hCwjgIs=" + "io/micrometer#micrometer-commons/1.13.3": { + "jar": "sha256-H8SQ4yL89PO7dTknt3bQVlKTRWwy/jCkWPDockT0LJA=", + "pom": "sha256-SoLrComRu0BDukTCGWKSaVFjbL/GLepXphAbYK1+HgA=" }, - "io/micrometer#micrometer-core/1.12.4": { - "jar": "sha256-whV432b5MDFUqiTuuC6o5rLC/RmFCGa0y+UdyWkKJAE=", - "pom": "sha256-vB3kn7iQlw0VQrspDUTFPGJmVYxcyKn135IYcZjtT6c=" + "io/micrometer#micrometer-core/1.13.3": { + "pom": "sha256-R+O5kmD9CNE6N+B79dGkPZH3xt3z0c+EMwWRtHgMFak=" }, - "io/micrometer#micrometer-jakarta9/1.12.4": { - "jar": "sha256-bfoEnUZuA5VwR+/LLAoYFWJorrydU0aQ48xam1RUMi4=", - "pom": "sha256-V02QPoQColDwQf8VUkxV3ATFCVluXFWY7MM//8FXu08=" + "io/micrometer#micrometer-core/1.13.4": { + "jar": "sha256-Hp4vjK5OA7J6UxU4JY6KxJltQGnc5qWHRpKx6sQ69M0=", + "pom": "sha256-mSMQXJGJa84JZLz+P4lYFfdYCUpWzo/CgsugHhfeX/0=" }, - "io/micrometer#micrometer-observation/1.12.4": { - "jar": "sha256-UaZwuzPPl5vKSbRjkb10TDpOI2mdCjBcITTvDQGpEPM=", - "pom": "sha256-xkVXuEggDQwjmPCzq65IIMIjI+j0dO06kbAYUAEpXjg=" + "io/micrometer#micrometer-jakarta9/1.13.3": { + "jar": "sha256-2/+Z75paecE+fMOcbCpOBiU9GsHZct7mxZEa3eawXOI=", + "pom": "sha256-USyflJ7tBuQj3a9rOyooy2lY2XV/ez6MjoqXSb1d/kM=" + }, + "io/micrometer#micrometer-observation/1.13.3": { + "jar": "sha256-KEQJqlIbvZTQ7kTtXNzYQa6SWVtOCX8cXtmRFLPXfq0=", + "pom": "sha256-kOBBaz0gKPFhoUHdOTOlaSnaOatb3y5e+LR8OudZ7qs=" }, "io/micrometer#micrometer-tracing-bom/1.1.3": { "pom": "sha256-fprbb3oR0grb8tb/f7NMCJ9FGvQdM7uRjr17kcXszJk=" }, - "io/micrometer#micrometer-tracing-bom/1.2.4": { - "pom": "sha256-57ZJO5fCoBH3POtaRdSCHXk4aLp5dN5kdcdddlj9iMc=" + "io/micrometer#micrometer-tracing-bom/1.3.3": { + "pom": "sha256-asg8mL5RXogZ6gCu+UC5waAhWbQwWMOv7bCMBQlYGLg=" }, "io/netty#netty-bom/4.1.107.Final": { "pom": "sha256-w2mXVYv7ThHyAN2m7i5BpF8t+eGu9njtoI553Yk4whA=" }, + "io/netty#netty-bom/4.1.109.Final": { + "pom": "sha256-ZjFy46WwvVMEUtlhTVh9KtU6Pdp+9CPaJbc0KSIqNJE=" + }, + "io/netty#netty-bom/4.1.112.Final": { + "pom": "sha256-u0u5kR+qJuoVQQ3khkTldI6uHDyYl7giipZDTIFIdkc=" + }, "io/netty#netty-bom/4.1.94.Final": { "pom": "sha256-FLsEPt93HvaT1f9ezBRm913JFpjwSn+oIrMJPT0COdE=" }, - "io/netty#netty-bom/4.1.97.Final": { - "pom": "sha256-eDs+5JRlAO5batDkP81p1/KbiPcknMkTPDn1PQGhUgA=" - }, "io/opentelemetry#opentelemetry-bom/1.25.0": { "module": "sha256-RHe55WRW2h7ZM64ig4bOAbusBl2bVLSZ7cKI4rumzLk=", "pom": "sha256-VsipemuNS6DjaRVWdCMISrVTq++a+XTaGTXcIeXjCR8=" }, - "io/opentelemetry#opentelemetry-bom/1.31.0": { - "module": "sha256-LeU7hvtjWgl0WtgKGg+yFZSCKjHuN605YQwM/QAiE6E=", - "pom": "sha256-EAmW9IHDQxgozgeqeBIPyyOLdLzW9FibCDVqRXCLf+A=" + "io/opentelemetry#opentelemetry-bom/1.37.0": { + "module": "sha256-0Kr0RXnLl0xznMMlPGOH6NzDYMP3FIJvrpIWdvPvoPQ=", + "pom": "sha256-wUCREcWoWtiQVjDhyk6q7qk3nyx4o6GTmIPACeb/JAk=" }, "io/projectreactor#reactor-bom/2022.0.9": { "module": "sha256-BfI8ABvRI1lpnqe+Y6bRi03YWoqRZ/PxehkRrwI9t7k=", "pom": "sha256-agI/PfE5yap6gWUR1YSSnd0PXrhIeb+i46VRTFsXYJI=" }, - "io/projectreactor#reactor-bom/2023.0.4": { - "module": "sha256-g7dS+AbTfh8yxIr2ZuFMDIW8D0taUAFkciD1drxSoLI=", - "pom": "sha256-jvedycp5GYn9t/4aIgnOVmg70kzzX1OPSQgQFvuIhEE=" + "io/projectreactor#reactor-bom/2023.0.9": { + "module": "sha256-vgQb/Qssr/3lUPq24GQ96BMDMtZebbjl4QU20H3oQvE=", + "pom": "sha256-jKuM4gyjXW9iffsW6evwiYCUt9Y00E2bN8jAFIQ+jiw=" + }, + "io/prometheus#client_java/1.2.1": { + "pom": "sha256-/I9/4rTvDO7chDk7iQCpPWSxnJg/+CFmyEozZnBwun0=" }, "io/prometheus#parent/0.16.0": { "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY=" }, + "io/prometheus#prometheus-metrics-bom/1.2.1": { + "pom": "sha256-jad6fZgGP0gVLr6LX1p+CnFj5Jn90iBI8ZZnVgIOans=" + }, "io/prometheus#simpleclient_bom/0.16.0": { "pom": "sha256-r0QdMpXeEacONf6+s9kZui7RdVJ1MWMyW5VNU1lNVcM=" }, "io/rest-assured#rest-assured-bom/5.3.1": { "pom": "sha256-Tg5ZUuRY6U+3dZ3nFM6hy9ru/ZFSJ4Z1if6R1EKJBUg=" }, - "io/rest-assured#rest-assured-bom/5.3.2": { - "pom": "sha256-zMdatMCunjb9B+ZfKP+dGWv1oY3jVldWdk8VpYz5X3g=" + "io/rest-assured#rest-assured-bom/5.4.0": { + "pom": "sha256-PwPaOF0/x5zMpbMiNuK9IORcgElQHNAxfn+NlmCC1qs=" }, "io/rsocket#rsocket-bom/1.1.3": { "pom": "sha256-5czY/tNBW7Q4Xk0Hh+PjNiTLLHwALSVQw5eI8rubD64=" @@ -763,12 +776,15 @@ "io/zipkin/brave#brave-bom/5.15.1": { "pom": "sha256-HX6AYLG4a9DsxU3Hv99gp9bgAHYaTL0zLCry1W9vvZs=" }, - "io/zipkin/brave#brave-bom/5.16.0": { - "pom": "sha256-vatLPlSHv9jhec+ipE71zoJLrMQqstaQs4SbIsZ67Gc=" + "io/zipkin/brave#brave-bom/6.0.3": { + "pom": "sha256-PRo+v/lZfRbomYoQU9/MWy5fEHc+XaZhYcQ9KIymFPE=" }, "io/zipkin/reporter2#zipkin-reporter-bom/2.16.3": { "pom": "sha256-3hWmaeME4kB8d2agw6vuCKTsAf+JOoBJoJFo5kPFpvw=" }, + "io/zipkin/reporter2#zipkin-reporter-bom/3.4.0": { + "pom": "sha256-6zJP9k1MgiRQa92V8Q4xXJAZ+SFFu95gh+XvcPcmnOo=" + }, "jakarta/activation#jakarta.activation-api/2.1.3": { "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=", "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg=" @@ -777,10 +793,25 @@ "jar": "sha256-X2X9r0JO7itV4diCupuzdr6T+wmze4CL5uIuiFHJCf4=", "pom": "sha256-r2UOyh3huYdBAGrNglB+RAjP/t0v7jOg6kY9YVCNt+w=" }, + "jakarta/enterprise#jakarta.enterprise.cdi-api/4.0.1": { + "jar": "sha256-vq90xPJhgYkwnj9KCcQ+/6tjPdlqofbcWKa6fuAEJxc=", + "pom": "sha256-i0Hh01UQWPe+A2ChrlfpMlAuFqDjiKAluthwW4FjUUY=" + }, + "jakarta/enterprise#jakarta.enterprise.cdi-parent/4.0.1": { + "pom": "sha256-X0kLdPY9vWy/0VpVeWSRzAP0tapSl5qJMxwQq/a13Bc=" + }, + "jakarta/enterprise#jakarta.enterprise.lang-model/4.0.1": { + "jar": "sha256-U6yv5ltu8Blfobig7yZQ5aoCTDLLQFnE3zctazIInNM=", + "pom": "sha256-HIxXS33140lAhNJHF5lO798m0rnh6DppQbUJb07KicE=" + }, "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.1.0": { + "jar": "sha256-73h9P3E/xv9PAs1LDb7Qj5PYrzQAyQy7Q/tLXAWDcQs=", + "pom": "sha256-0RTaY7IJPwvZwqllegFs5w/ro3YFCAalxZldiRPffV8=" + }, "jakarta/persistence#jakarta.persistence-api/3.1.0": { "jar": "sha256-R1OJRG01xvRsVlcot1bcUIwoRkTqJpBkTg2OfjOdQv0=", "pom": "sha256-+Hb8jYhnM1QPWYFat3sbmYvuxwgAMt+xUmyt5GzuzL0=" @@ -821,27 +852,24 @@ "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=", "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4=" }, - "net/bytebuddy#byte-buddy-agent/1.14.12": { - "jar": "sha256-KzCakwAJLgtpb3xHH9UdmWkAHfeEyKufB5l0N9dXrW0=", - "pom": "sha256-ZpifcNNV1gD9TZJtiDXke30b7/Z47r7FnRljY7XNTCw=" - }, - "net/bytebuddy#byte-buddy-parent/1.14.12": { - "pom": "sha256-m3/SvyklMayw6XTZVeSjbKQTMt0Nr+icJNj+Q5uuV7A=" + "net/bytebuddy#byte-buddy-agent/1.14.19": { + "jar": "sha256-nzOGemHnJhrw/kt46NhDQoS1dylZeFJNFoHlv7z96E0=", + "pom": "sha256-61VgCGre00h7uCvIw7/GVJoonQpBGOJAUSOryZ2dBdw=" }, - "net/bytebuddy#byte-buddy/1.14.12": { - "jar": "sha256-lwY2E01hwYOxn49Y+mMeMNLyq8o0SzeEijk8rHhj3XA=", - "pom": "sha256-XamVxw3nt/SoSKhUN8fd7oA9GrfKwtfY33GUw9XicU0=" + "net/bytebuddy#byte-buddy-parent/1.14.19": { + "pom": "sha256-Swuyl9Wz4gov5jLlorCt8Qoy27CdUuaeMbGtumfemm0=" }, - "net/java/abeille#abeille/3.0": { - "pom": "sha256-tV3TFjYwhIkWkPnb0dHwbJWcRbJaYOBWjqkVSDplZH8=" + "net/bytebuddy#byte-buddy/1.14.19": { + "jar": "sha256-hBWkTYQbLN7N9dc6BcKajPktwrYPyn/3s/Ic1DG1pOw=", + "pom": "sha256-fEn+DXvCCenqFWsqmFUbCJzxOTI1zNr9O7cr8NTaodg=" }, - "net/minidev#accessors-smart/2.5.0": { - "jar": "sha256-EjFPxogdZqQT/WY3B4etuhblBPv34ThpCw85UuP70yE=", - "pom": "sha256-VJelxIYeWCxm5xyHzFppgtauiz4hSUersbl7l70+HAc=" + "net/minidev#accessors-smart/2.5.1": { + "jar": "sha256-J5auhX0Me+S8NYDapNOCjVVSEjVfTIPTjdCvB0KzyBI=", + "pom": "sha256-SH53qNvZrDhEGRbIMFAYXDoeSGnOl1N3r+o5Mr9ire4=" }, - "net/minidev#json-smart/2.5.0": { - "jar": "sha256-QyueVFhIxBQbgHF7JuNn+DvzPxklCiKM512m6WfaK8c=", - "pom": "sha256-wyo2YQmypaNuoA4SGqolfa5W7jqbl9JEI+YzteIUVGY=" + "net/minidev#json-smart/2.5.1": { + "jar": "sha256-hsDBiVgbebV7Bxn0Q6ck6fYo/7ue72Rc95GU9Zc6EAE=", + "pom": "sha256-9GfdUfaGnmaD0QWmcop0I9oReTsIFevTK1DDq/QyH20=" }, "net/sf/launch4j#launch4j/3.50": { "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0=" @@ -856,12 +884,12 @@ "jar": "sha256-vX97XQe8CwR/EJFbMspLsd6eV9gEkJiILkRTyIwHal0=", "pom": "sha256-GY40+1rHWXsaPDGTAwHgjOlB5cpQQRbdVKOnU3iRSn8=" }, - "org/apache#apache/13": { - "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" - }, "org/apache#apache/16": { "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, "org/apache#apache/19": { "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" }, @@ -883,28 +911,31 @@ "org/apache#apache/31": { "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" }, + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" + }, "org/apache#apache/7": { "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" }, - "org/apache/ant#ant-launcher/1.10.9": { - "pom": "sha256-Ek3lb+ph22wNtJwHnR62XUiWwaxNEf8mVXvjaePb6ls=" + "org/apache/activemq#activemq-bom/6.1.3": { + "pom": "sha256-9psWXzrwS+S91wLXDv3brT3AMh0XlUhN05WKYndB03I=" }, - "org/apache/ant#ant-parent/1.10.9": { - "pom": "sha256-ytRkDglENOlwQa4RFy0QmA7AQpmERWC/Z+Rje+hFC5Y=" + "org/apache/activemq#artemis-bom/2.33.0": { + "pom": "sha256-AsD+oOjmq5RmO0Lv87cWE74rlBxUoKrY9dB8E3ICQvI=" }, - "org/apache/ant#ant/1.10.9": { - "pom": "sha256-tidgF89vKge3t7YneDMyN8pzQF/MOvHKnZX1L5f7eeE=" + "org/apache/activemq#artemis-project/2.33.0": { + "pom": "sha256-oezNKJD2HwdLoChQ5aelOs8w+ikOWC4TZceLrjgp0Wc=" + }, + "org/apache/cassandra#java-driver-bom/4.18.1": { + "pom": "sha256-hMhkOw8BrkR2LyLLeYIMSWHOWL21F0Myn28gOHE8m2U=" }, "org/apache/commons#commons-collections4/4.4": { "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" }, - "org/apache/commons#commons-lang3/3.13.0": { - "jar": "sha256-gvUoz3GMejwvMPxbx4TjxqChCxdgXa254WyC7eEeYGQ=", - "pom": "sha256-/3zqTrI53WIRdRDavlGo1fDJ5MxCa8PowsIhpxj4ZIQ=" - }, - "org/apache/commons#commons-parent/34": { - "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + "org/apache/commons#commons-lang3/3.14.0": { + "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=", + "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" }, "org/apache/commons#commons-parent/39": { "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" @@ -915,9 +946,6 @@ "org/apache/commons#commons-parent/48": { "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" }, - "org/apache/commons#commons-parent/58": { - "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" - }, "org/apache/commons#commons-parent/64": { "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" }, @@ -932,55 +960,68 @@ "module": "sha256-UMvUHEPhbMJKIJ7i2pNdeV1rN8VnNQlmtJJusxQwM6M=", "pom": "sha256-M5j/NPIIMkDWY0erSnMzudi3nTqVrN8vz03DAn2B5qs=" }, - "org/apache/groovy#groovy-bom/4.0.20": { - "module": "sha256-+HZJydeO91O7YLIw6bLPXDf5tlB9pLVmGuf+3NLmu8k=", - "pom": "sha256-VB0owxBiqdn/BwrqS9XRmSIQQijrho7qjabmkfJtPnQ=" + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" }, - "org/apache/logging#logging-parent/10.1.1": { - "pom": "sha256-NO01x8rCVD9sSDtIvT0B+rFcApjUXUoFkuJ1kZhiH7I=" + "org/apache/logging#logging-parent/10.6.0": { + "pom": "sha256-+CdHWECmQIO1heyNu/cJO2/QJiQpPOw31W7fn8NUEJ4=" }, "org/apache/logging#logging-parent/7": { "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" }, - "org/apache/logging/log4j#log4j-api/2.21.1": { - "jar": "sha256-HbSOGAiBvvHetQICIAagJaJI2PaiYYZ4mwx85IfGAtY=", - "pom": "sha256-reMKNdCtO0t0ts+8Sfx3+Uy0B+EAKZ377e4nJVPcvpg=" + "org/apache/logging/log4j#log4j-api/2.23.1": { + "jar": "sha256-kuwf02qzvAneYZjS18CRRoXA9xJ+qTGswy/S7N2C6ok=", + "pom": "sha256-tnzD0JgJJwSaO+sA1Qbs4oh0ZzKw3sgSJFxZ9FP7HKE=" }, "org/apache/logging/log4j#log4j-bom/2.20.0": { "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" }, - "org/apache/logging/log4j#log4j-bom/2.21.1": { - "pom": "sha256-Rv6OpW5KSk5E+fU8/0J/T1UL7y7WGyP6WR2DpeOVBjc=" + "org/apache/logging/log4j#log4j-bom/2.23.1": { + "pom": "sha256-NyOW4EWNTNMsCWytq+DMkzDsEPT1f6O+LnT3m14XijU=" + }, + "org/apache/logging/log4j#log4j-to-slf4j/2.23.1": { + "jar": "sha256-eTeoQFUVaRAjTjtCho9V5o/0t77Ltv/RAUb3L1v1TdU=", + "pom": "sha256-BVZJuX0nP8asOjx61a/Y3tPA/OAEeyur7RKZ3Bpzk4I=" + }, + "org/apache/logging/log4j#log4j/2.23.1": { + "pom": "sha256-bOFUBFU2S1PqIqGDQssSamOBYz9lPwlUZ/KqGYURps4=" + }, + "org/apache/pdfbox#fontbox/3.0.3": { + "jar": "sha256-ZWkMPzmwShTRLBf0mYwVGGzod9Pi7CIscIV348wCgDA=", + "pom": "sha256-sik+UDqncEMGEVD4hGg9f2FMz1Fjvi0PBSyinzx2d+I=" + }, + "org/apache/pdfbox#jbig2-imageio/3.0.4": { + "jar": "sha256-KcspUWIvEKz2H9BlbE5vpVYhlKkJX3odJqpCbi9rF+s=", + "pom": "sha256-KOp8SskuCYX3lqi8aJCnvviSZwetrf0eLIVsmwvho4s=" }, - "org/apache/logging/log4j#log4j-to-slf4j/2.21.1": { - "jar": "sha256-3hQ8Vluniw8sC+WPEyx67HXm4aEIRevaWk8XwqNdmZA=", - "pom": "sha256-H+pgZBIKmcgZUvNVxYE1e2wSxxzA/RmmEFY4Y+j5/CE=" + "org/apache/pdfbox#pdfbox-io/3.0.3": { + "jar": "sha256-Ej6jGHtJfFTmYdUMPIZ0eb93Zo/0UOUHEMZY8rtGh7o=", + "pom": "sha256-EXAbuMWnNaSzFA9zroM6KBzqCeO8P583kbmpenRekNQ=" }, - "org/apache/logging/log4j#log4j/2.21.1": { - "pom": "sha256-PFbCFYVfPiXOPPWi2Kgmmk8aPV8JjaAYfM3T8GxskjI=" + "org/apache/pdfbox#pdfbox-parent/3.0.3": { + "pom": "sha256-yGXhzv8Jq1Kwh+cmDE8V025bW4vk/+IERvqkCiygvcw=" }, - "org/apache/pdfbox#fontbox/3.0.2": { - "jar": "sha256-ds8EEOkD49txQDKvu0WNWiO5IlO5/fiAA18J6orTraw=", - "pom": "sha256-hthT5W8q+Yb6c1s/kH6jh6KXNCLH0F8TwDasuRNal90=" + "org/apache/pdfbox#pdfbox/3.0.3": { + "jar": "sha256-W+ONLsgWkbBdU163IN5NxWbF0H5aBHMfoAZo0VOotKY=", + "pom": "sha256-vgiV9rLCDzEdYjXJam/SqsECsxkE0/TDnqUll3WwcAg=" }, - "org/apache/pdfbox#pdfbox-io/3.0.2": { - "jar": "sha256-nW535C437zaC53aBEpwxRRXog9UKvB3aljguejHnDjg=", - "pom": "sha256-yD3gYR+UMN4W2dakjfXJEPgrkfHgU1xB9Woy9iYwz0c=" + "org/apache/pdfbox#xmpbox/3.0.3": { + "jar": "sha256-X7o5sziM5KOnf6ALCcQpY+Zw4IIE+qfsvzYeVrQ/TAg=", + "pom": "sha256-0QoW58RKxMdKydm1gPBz+Vds5DxXnyS0VQcW0Ha2Chc=" }, - "org/apache/pdfbox#pdfbox-parent/3.0.2": { - "pom": "sha256-kN6rEjTjkUu8B07Ax3Y7+kFHgICziISpOwtVVxnWY0g=" + "org/apache/pulsar#pulsar-bom/3.2.4": { + "pom": "sha256-tYnjUUDRq5YAR+TVHhioOwdpbqhZxtBizQpmFH91NP0=" }, - "org/apache/pdfbox#pdfbox/3.0.2": { - "jar": "sha256-yv4sysEB6ao63z9+p23/AuWIWislWLdfr/l0dvBIfuI=", - "pom": "sha256-wMNAwn6AF2V+Y81PaJUG8U03Y10NFebRpAjysZFGax8=" + "org/apache/tomcat/embed#tomcat-embed-core/10.1.28": { + "pom": "sha256-pFlWRkZovs3BsTLQ8PmOwBr7F/rpFcE1Qc/sH7HSuxc=" }, - "org/apache/pdfbox#xmpbox/3.0.2": { - "jar": "sha256-GJLj3icM8GdIRgZW0G0/sNFfScVLfRs4hB5sl0WwGuQ=", - "pom": "sha256-LOPcpcHUKiZOJw5rOrIcR5Dd0f2Vg3ZOkjfGoYqKkXc=" + "org/apache/tomcat/embed#tomcat-embed-el/10.1.28": { + "jar": "sha256-VR21zzai+YP+XyZstVwRVU8BJtBVjnXSM8KblFUuRpM=", + "pom": "sha256-x/zALShLPoogeyuFJVCOcOtdEWaL5MnWu+Tr8VcI8q4=" }, - "org/apache/tomcat/embed#tomcat-embed-el/10.1.19": { - "jar": "sha256-rNG5rYxgxyyZte0B0+9nR/hb5sUbWwRaNlaG3oib+uQ=", - "pom": "sha256-Za4PdNUBiVQs7BOlb5XEcoFf1jm7SbETbPUIFh0CMiw=" + "org/apache/tomcat/embed#tomcat-embed-websocket/10.1.28": { + "pom": "sha256-4DzQjxzE+dC4jvGMT93iqGbV5QB3V+i8os3LE5ZNeaQ=" }, "org/apache/xmlgraphics#batik-all/1.17": { "jar": "sha256-F0thbZPqTauabQwjwatfFGEjwO4lNAh5MWB/nuElMZE=", @@ -998,48 +1039,45 @@ "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" }, - "org/aspectj#aspectjweaver/1.9.21": { - "jar": "sha256-zDOX2dOhFIlHVvxnd5lB9fBLBuMuQaqUCFZMZxoVBLo=", - "pom": "sha256-Vhn7SZr9b1S5HpVum9/iIi8STjpgdx80OH1vZ3SUelw=" + "org/aspectj#aspectjweaver/1.9.22.1": { + "jar": "sha256-zS3QHsJCTAVmnfTVV/bGzX7YewUlfuPIZrTFsRaxing=", + "pom": "sha256-+G594K2zLOtcEF+YOz0as0AWYTEpmwtfqz7ccCWaaog=" }, "org/assertj#assertj-bom/3.24.2": { "pom": "sha256-EqxGrmTTYl80S79kKrVvoC4Vuu/lPvX1sGHhJLSEYgA=" }, - "org/assertj#assertj-build/3.24.2": { - "pom": "sha256-1/yMSqgAWDsmxGfrD67eCvXnynkMS+TU0jVDFYPSbq0=" + "org/assertj#assertj-bom/3.25.3": { + "pom": "sha256-kbehm3evVGLHKQuRrHxyxE1kg6/qC2JTaBbpj41T8lc=" }, - "org/assertj#assertj-core/3.24.2": { - "jar": "sha256-3z0LNI8f6Aa93csQ+krmPGZ56YiNS8cFXwmEhReXaqM=", - "pom": "sha256-f7mxojdOtQ7SubWYRcaScxEeoYOaQpj5QAqA4rLFyA4=" - }, - "org/assertj#assertj-parent/3.24.2": { - "pom": "sha256-DFAETrW96ehEI7yhOv9dX0PTdSqzxj9zva5p/EqxoKw=" + "org/assertj#assertj-core/3.25.3": { + "jar": "sha256-f73/oZltQ8wI4lduAQCLB+V7utK0dBqmw6tzzoUREw4=", + "pom": "sha256-ORcjDqozvPE+oz3TN6yvqdMmxzlmC/S2/FbIjXj+ufI=" }, "org/attoparser#attoparser/2.0.7.RELEASE": { "jar": "sha256-dd0cBFSSv/jhljqrsov+kDwgZOEeJ/4vDwr/GtPYRHY=", "pom": "sha256-sJ04k7/zYJkkXdPBnELIDdzLGAukcvlMGqti8A41vgg=" }, - "org/awaitility#awaitility-parent/4.2.0": { - "pom": "sha256-LasXIPpF4j2gj3qKOxw8Tbo2oM/xMJALiOZYlxJ1y0U=" + "org/awaitility#awaitility-parent/4.2.2": { + "pom": "sha256-X123oZqQMkVHlOJP5gCsfe0UJqKJGdxKwUxK7haMWiU=" }, - "org/awaitility#awaitility/4.2.0": { - "jar": "sha256-LSO3khH90ZA29pQMx4NUN3kyCq+G841uOFov8m2kEnI=", - "pom": "sha256-O9OMaPy2lPb+4pu1BCyWv209RqN9EyKU+HxivWs4ITo=" + "org/awaitility#awaitility/4.2.2": { + "jar": "sha256-6DH+4w7UAeIgjxvVoO+a3VONnLEQPA5DIWaRtke96cY=", + "pom": "sha256-huWduqlfl1kBmysOurS8nW4Mqgtp++oPwFPA0gbOyFk=" }, - "org/bouncycastle#bcpkix-jdk18on/1.77": { - "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=", - "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0=" + "org/bouncycastle#bcpkix-jdk18on/1.78.1": { + "jar": "sha256-S0jqCE5SMrnXnryhiHud4DexJJMYB81gcQdIwq7gjMk=", + "pom": "sha256-CVIrr36Zuqk6JRXRbPHLlT+iJ41+PEbIvv8n3AQXKDE=" }, - "org/bouncycastle#bcprov-jdk18on/1.77": { - "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", - "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" + "org/bouncycastle#bcprov-jdk18on/1.78.1": { + "jar": "sha256-rdWRXmrPxqtYNuH9il4hxkiFNqjB8h84bus78oC3Atc=", + "pom": "sha256-KJEtE5+e7RQcOUNx++W6b//5HnjxycuDSPlEok0gTtI=" }, - "org/bouncycastle#bcutil-jdk18on/1.77": { - "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=", - "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug=" + "org/bouncycastle#bcutil-jdk18on/1.78.1": { + "jar": "sha256-2fpW+XsPdhzjvI2ddMXXE3qYe/W9Or/hAD+br6RaHS8=", + "pom": "sha256-dB1Vy0XEwsiJtaQ2t0fcIVKSMTLkJr5u9VUA7uf6UxI=" }, - "org/codehaus/groovy#groovy-bom/3.0.19": { - "pom": "sha256-E+POc+1L+fxu4rVA2FVWh/astwf4SSOUFMgnfUMd7KE=" + "org/codehaus/groovy#groovy-bom/3.0.21": { + "pom": "sha256-ksw2r/0g9Wi1CSwLlOz1hd3rCigbbIunJWVwuxhdZTQ=" }, "org/commonmark#commonmark-ext-gfm-tables/0.22.0": { "jar": "sha256-yb02kBoKZ/DdTPhOiPizdps1klrE8rypEik29yCRXLI=", @@ -1071,139 +1109,139 @@ "org/eclipse/ee4j#project/1.0.9": { "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" }, - "org/eclipse/jetty#jetty-alpn-client/12.0.7": { - "jar": "sha256-YxdWV8ebpXlOZNZrhLePSD07SNZ5PyGFJ3+HFD0khKQ=", - "pom": "sha256-8Af80vHeqJfKKzDGBYaAEaNxlrMzx+xLrPFFBlEuOXc=" + "org/eclipse/jetty#jetty-alpn-client/12.0.12": { + "jar": "sha256-4mf9xsx02y6eJuwnll1aczAE12hLpsLtfAswpwQ0pHs=", + "pom": "sha256-FYdywozNsWimWZn3c88+69/nqgBSzolCCPYsA2poyi0=" }, - "org/eclipse/jetty#jetty-alpn/12.0.7": { - "pom": "sha256-+taXYU5Y0g/gS/WhYVh/ugFRo4TNHg/wi1uNJynIal4=" + "org/eclipse/jetty#jetty-alpn/12.0.12": { + "pom": "sha256-t7+M4tllKw6ld+lh8bCPkLaVV8+2jcb0vLW4JG8WZSg=" }, "org/eclipse/jetty#jetty-bom/11.0.15": { "pom": "sha256-+ksNDeuvyR9Q++wI7+RkInAzTzeOg562o1+jdqoaLPg=" }, - "org/eclipse/jetty#jetty-bom/12.0.7": { - "pom": "sha256-Tmywx2r+TZYMlnxr+27cy9Or02XwenkDKSMTDcClu9c=" + "org/eclipse/jetty#jetty-bom/12.0.12": { + "pom": "sha256-dzRoBQU3U3I2j/ipaQwnOuSIx7DdIIOHm0NB7WFQ6MQ=" }, - "org/eclipse/jetty#jetty-bom/9.4.53.v20231009": { - "pom": "sha256-+vlzoZh0JmzQhlsCmeup8WfLsHB13U/tvj1hVjV+ndU=" + "org/eclipse/jetty#jetty-bom/9.4.54.v20240208": { + "pom": "sha256-00QQSm7mGdplmEA8JdA6qqrw9U6WRv01EkWN9Xyarrg=" }, - "org/eclipse/jetty#jetty-client/12.0.7": { - "jar": "sha256-kRKisrw635zWQLQ9fSA46BWk3rvG/ZPiZuouK4G/vXM=", - "pom": "sha256-njK8Q0z4JHlF+OOQ21aeK1zRHXsTUeeB2h6DLPCCkGY=" + "org/eclipse/jetty#jetty-client/12.0.12": { + "jar": "sha256-1zfWnTUArGN/4dg4fmw25A5EK8ts4rofglh9V7iAIWE=", + "pom": "sha256-aCSLpuFN2qDN2FwS6NYSYvzwfryByhaFXcmZjvCJqIQ=" }, - "org/eclipse/jetty#jetty-core/12.0.7": { - "pom": "sha256-VVn/wpuShKsdqAs4jZw5kYw7lpXJIaTCwNVGWCrtTX0=" + "org/eclipse/jetty#jetty-core/12.0.12": { + "pom": "sha256-Upv+JBwPlFsDsxc7Kl5dw2FvFUjF8uOLC94L2aJ1Vgg=" }, - "org/eclipse/jetty#jetty-http/12.0.7": { - "jar": "sha256-uhczUMrRZYFufIrFyzcwqJV2PBCGNwGE90mkbEJkJ8w=", - "pom": "sha256-44BTqnBsi2HvGpZccB2/Uuu2WpeXcBkBlE8Ye3rbqz4=" + "org/eclipse/jetty#jetty-ee/12.0.12": { + "jar": "sha256-ejG2W8SyBrRlut4wbqsdTVmCmOPry0tmm2vE9qMX++A=", + "pom": "sha256-lvjEqFNJaRHSoKqIyJFYwRqNRB92cYF6IdJ3WtmtI1o=" }, - "org/eclipse/jetty#jetty-io/12.0.7": { - "jar": "sha256-AvScx82lsGMrsRSb7akttQ/WE6JR4cjvBvQLlOjPio8=", - "pom": "sha256-EBF7Ih+DdMuLdyonoZ2kJ1V7iBf/ghEGrhcb3w+G/qU=" + "org/eclipse/jetty#jetty-http/12.0.12": { + "jar": "sha256-g6fRsmj2qNyHmByqlrSoffbn9r2dkxUJmq5wVukbAs4=", + "pom": "sha256-G1wG3OoOY5GZxn2sHhUxE1e8QLFN0ZZ8vy9gIGX2b7o=" }, - "org/eclipse/jetty#jetty-jndi/12.0.7": { - "jar": "sha256-/k7+Xt9q58mrRwndO8rpohReCVt1JvVRHrhAuAAjE5E=", - "pom": "sha256-3w7T96MgcxKXq44zlYFFAkS1TGvr2MMuRMXFAuGk04E=" + "org/eclipse/jetty#jetty-io/12.0.12": { + "jar": "sha256-AYfbD3qZRnfKRPgGX1pGru5AXWpLfpG3SlDKJi3cuzk=", + "pom": "sha256-H9RV1Psn9s6q460D3mg5Nll8jG5YJ3ZeGAaruFn05xQ=" }, - "org/eclipse/jetty#jetty-plus/12.0.7": { - "jar": "sha256-nWKF154Wj88s7vrKDht8LOa1g5Q0HespP0el4BHMAfM=", - "pom": "sha256-XW+UR7cjLpqkrO5xDZAZ1YRNZUUoyHBx2iiVYB3ukgo=" + "org/eclipse/jetty#jetty-plus/12.0.12": { + "jar": "sha256-bMx+snI/x7x2CP3l0cdFFMhbMmktKNpZAupKG60fgz0=", + "pom": "sha256-QLRXmY/1wH4ACMrw7BxcndDmbbp4IX/rQcKiubufP5I=" }, - "org/eclipse/jetty#jetty-project/12.0.7": { - "pom": "sha256-kY4GfPOIuVqLydGaK2Z5hxsoKa1/NLKyANeBrIpMrO8=" + "org/eclipse/jetty#jetty-project/12.0.12": { + "pom": "sha256-sC2BLgmxK6YvgctyJRr+jDyCgO+CfbFGsmJmY+PAQUM=" }, - "org/eclipse/jetty#jetty-security/12.0.7": { - "jar": "sha256-Pa5/oMtzr1HhZ4gaQZdxBsi3RA2tfc79aKTtIdrjI0Y=", - "pom": "sha256-FpML7sOGfmKw2WTClbruIqXROKl6s9q6M9nUsObNZeA=" + "org/eclipse/jetty#jetty-security/12.0.12": { + "jar": "sha256-ta/GVeMrPnRwmO8aPwN0VLFXLRrJT/SYMvY17Gq6JT0=", + "pom": "sha256-K/r4acVb/WS6EiDpkGiT2TZ7ZDt/D0Mn4ThXDtUL66A=" }, - "org/eclipse/jetty#jetty-server/12.0.7": { - "jar": "sha256-hL5nXqZc2SEg566w7Uwz1lmZYFgYvYvEp5PKXY0uH3U=", - "pom": "sha256-RPrL4EpUuWksw9O2XSyiS2k18L2sPYCUvf2EljoXHpo=" + "org/eclipse/jetty#jetty-server/12.0.12": { + "jar": "sha256-KZuZLlDH2YcbRQ+jOqDjbVZBIYrhD/v0RJ9Z2EX+LiI=", + "pom": "sha256-gQWA463CC2hOmy/jjscrHlgSBvmROGPwTVIZmp9bW8M=" }, - "org/eclipse/jetty#jetty-session/12.0.7": { - "jar": "sha256-mcBZ9+WyQjpnQU4ZZEjD0FSoFjEJwJomTYdyhiP1Bf4=", - "pom": "sha256-VtoU55R8i4AucsMfcbiGpCe4sbufC2unszmofs5Hbj0=" + "org/eclipse/jetty#jetty-session/12.0.12": { + "jar": "sha256-ifbkwJzjVy1JUGtXTSNbmxz+w2feNd6nzkejk+vnXPY=", + "pom": "sha256-7AdduV9udDbFaXKznrsOOo/0XI3mJWQqAkzXBot7f6Q=" }, - "org/eclipse/jetty#jetty-util/12.0.7": { - "jar": "sha256-kwZqCVyspBBunz+ibDiN4fotLFVLmFmwRdjRqThjgXU=", - "pom": "sha256-ZzfyxZ8l8kOFIV4Z0f7Lzx/BRa2gRDK2CWTwA4Rejq8=" + "org/eclipse/jetty#jetty-util/12.0.12": { + "jar": "sha256-YYbEa6qOI2/evtsmxtK/oQIDkI2wgFDXJCX1rKcHwY0=", + "pom": "sha256-V1o5JPYPx3paSnsc72NQYyKI8DKuQQJUWkVmQk1S09k=" }, - "org/eclipse/jetty#jetty-xml/12.0.7": { - "jar": "sha256-9vBsQiYbN52/V8CDiv7uLNg8adUHv76PwJbDrqLDIOQ=", - "pom": "sha256-QrxwoV9AG21CQQ+Pd1pI0XHRsYgUNDl/ppOOsK2O3YE=" + "org/eclipse/jetty#jetty-xml/12.0.12": { + "jar": "sha256-Uvw8VZh0YNS+wdAYrPkvQx+OXkgcEA6ilc/NS7dUDzI=", + "pom": "sha256-gJ5nTeTqZ9cniJYF+/vnpIy0xOV4S5AEJbsTVCfoeJM=" }, - "org/eclipse/jetty/ee10#jetty-ee10-annotations/12.0.7": { - "jar": "sha256-4knkXT8UO9lH5tjnARbxJXt8Sy6wBTmDi1ZqndW8IF8=", - "pom": "sha256-OzT6LlWYLG68GSbDm8I87NELyLVuLE20T/w34TKWS2E=" + "org/eclipse/jetty/ee10#jetty-ee10-annotations/12.0.12": { + "jar": "sha256-b9pshCbAQkNfY0B2jsBviFFSOVEh8rttpuvZg2KsED0=", + "pom": "sha256-BR7X88+PpcbDDpmdawJWV11/9tDX27xsm8ko/9bfKZ8=" }, - "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.7": { - "pom": "sha256-hDBz9n7+k+EFLf7pjsECp9joYoKrUONpzMUEXzjhzd4=" + "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.12": { + "pom": "sha256-k7TEDwUFaFDXGo5rY55HhR8+FBR1FX1C6QrbzdtSpfY=" }, - "org/eclipse/jetty/ee10#jetty-ee10-plus/12.0.7": { - "jar": "sha256-E8NvjbRMI4D6XVkJgK1ky0avcO+WBI27YmQGx1QbPsQ=", - "pom": "sha256-gwEntcRmmqbiO7ch/N8XesiwihvFNue23kGvDpND46o=" + "org/eclipse/jetty/ee10#jetty-ee10-plus/12.0.12": { + "jar": "sha256-RlOwU7HOQHvX34uvHULJryR9IPSsnbuMQvL8KGHYCQA=", + "pom": "sha256-+5r7sujyqgDHsEThDpagvDTPF6NZqYErZ4ItbSo1X/4=" }, - "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.7": { - "jar": "sha256-natemJ6UaAq2azI96FpZJj0brLAA0qU8E6ivpWu4hcU=", - "pom": "sha256-JIoarzkdwzsZwFkvUKsnh0vC7NVWMSuhm19xpB9LKdM=" + "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.12": { + "jar": "sha256-34G3jxfDRU8V9mcfLMGi9CMYzHioVubnnqWkwv47nHo=", + "pom": "sha256-4atDXmtWqwM3vofgjc3yYvVXa/+eHf8VhDcQAkH57Lk=" }, - "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.7": { - "jar": "sha256-bOAryXT0xsKG1xA/avO2XhpRVyydl1un1aL6KHhAx8g=", - "pom": "sha256-vspY2FwraSssjKYyxnS9eaGAu/M+I5M0dQHI0QLEtFs=" + "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.12": { + "jar": "sha256-64AQ7QTWnJisRR7mD/EPFeprXr1uUTZIv/k7AP562/I=", + "pom": "sha256-K2u0CFNmKF00LgTYU3xIvxpNwqgKinWGJeot5tFxDhw=" }, - "org/eclipse/jetty/ee10#jetty-ee10-webapp/12.0.7": { - "jar": "sha256-y1KdrBSR+OfqceW3Sfz1ntlSldjBji9x51Htl6H0kMc=", - "pom": "sha256-ABmnbrthJAQGUphZCJ72a3OZ+fC7jxZQMqKAHxMTxzY=" + "org/eclipse/jetty/ee10#jetty-ee10-webapp/12.0.12": { + "jar": "sha256-TfoaPmyPnPv02LtVmO2nvokkGv6XqVh19Rmzk/eYfs8=", + "pom": "sha256-LK3Tjj2idBy5ITBQn8MJ5p6EDcZG+yrzS1FTwqaUHF4=" }, - "org/eclipse/jetty/ee10#jetty-ee10/12.0.7": { - "pom": "sha256-1FrfFrxnSVbeZxXd/dTNg/yJ8kx2IXGZI0/qsJdqClY=" + "org/eclipse/jetty/ee10#jetty-ee10/12.0.12": { + "pom": "sha256-PU7E8jbFs+6r9Wb10Sx2EstbHsR8VCOImrAw1v2gAJI=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-client/12.0.7": { - "jar": "sha256-vQoBjfy0yw2UZOpZ6ke5JVi5KKauDAWEqacv9LDaDeQ=", - "pom": "sha256-HE2aGex6gj6kY8r0FMWQdZxRzOoYeDbNtCXGjbAlbvA=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-client/12.0.12": { + "jar": "sha256-4ZcI+q7ZKVDnm2WZWTgGjV2NVMn7A2T1ObimEApp0tA=", + "pom": "sha256-dH6wuRPFZDlCCHa+lau6CyFOzTB+o0OK/Ko+uxJoRBw=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-common/12.0.7": { - "jar": "sha256-yBfr3NxzDFDA5s9BpfDoj0GCTewjBRBi3E01HnxMTNQ=", - "pom": "sha256-mqBhmkUImpBIkT148Fvt/pjbd27Z6TqdY1+rNEv99sU=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-common/12.0.12": { + "jar": "sha256-MBPT/F2Sr1/XWU7LWPW7x01zx29+WVPe1rYbeexmyWQ=", + "pom": "sha256-IhiPnL4qWDpTJKqOSsd9P1WNTbcbZviZGleW1RJGJyk=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-server/12.0.7": { - "jar": "sha256-A19hqfAVgm1o87Zweka/SYoFx4y5Q/8Iaz0QUoy3z1o=", - "pom": "sha256-o6pdb2eL+pnC6L1Q5lgNLi4oamIfFTsZvc0q2+OKfDM=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-server/12.0.12": { + "jar": "sha256-moBo1h2AEJOvawEjNgLF3uslpXs8tjcleYIkBni8Wzo=", + "pom": "sha256-7yxNOTJgnCDvCBm9yFBQKH7VHD+cVw622ScFPbXUumY=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jetty-server/12.0.7": { - "jar": "sha256-Ts74xCOob76QsDmFBcHZD8TKwM9g3VIuMQ7JJ1fsG18=", - "pom": "sha256-zE5zAM1radv2kWPRXEENPfKFxNGjKXDPS0HCl0/oaCk=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jetty-server/12.0.12": { + "jar": "sha256-xKebDmTGgZbH7DF8LiQ41Q7XZWHzWnSkMCjASV931Og=", + "pom": "sha256-sambI9rJ8IrB/uYVXUByTt3Lh0a4hPpyZZgP5o8IVLo=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-servlet/12.0.7": { - "jar": "sha256-7WAYEdZrzIKYO0Sv4zAjMU8koCLPrGtVdt5Tlgwy3y4=", - "pom": "sha256-2nbRYHjEV5q8c8+dDABV/1VZ0JW3kq2dmhhfAKoq00E=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-servlet/12.0.12": { + "jar": "sha256-BxNzPPmXmXk9zRBamSSSA2zo4rzT+dRc/h7MbMzxGg4=", + "pom": "sha256-uhS5/90KrkIh0L6Mi3Xgcrh8aXziptTwZizQbLOpdRI=" }, - "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket/12.0.7": { - "pom": "sha256-wtne5akTiixFGtAv+N5Yf+deZG+eqSfJJOmbHCJ7va0=" + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket/12.0.12": { + "pom": "sha256-SC7ohkYUVjPv0gqEv7YIj5u9YOIDF2/jm3LITpXbW8g=" }, - "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.0.7": { - "jar": "sha256-PISYNhMgHsu01x6Ndo6/EbvAIHhJG+HsX4XvzNkuTPY=", - "pom": "sha256-iEUsuxBfM0/j+yVIkOm7JjEYPINBhynK8AhepMY0l0M=" + "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.0.12": { + "jar": "sha256-7uCgNxXBJ/QipABBn1k39BZf/P8fjsiG02Yw0/3Glfc=", + "pom": "sha256-7qG/C0jWUhJHA3BMj9ig5R2b1Vc88Ep4i24V43JdxXk=" }, - "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.0.7": { - "jar": "sha256-HeOZnr5cS0JRMiKFNDz0QlSGwap5GrA5lbKVioIsv4k=", - "pom": "sha256-0Uvg308AGBopUyXYQQLnUSqTR+SznWc2h2VZ8jBRqVM=" + "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.0.12": { + "jar": "sha256-G9WmKF1E7466lxCB0ukUzZn0xEBWMJuhgj7BEdqev44=", + "pom": "sha256-8hkYN9bolAInBcv9z5utm3DCino9ogoFwrdD71IZRdM=" }, - "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.0.7": { - "jar": "sha256-9+SmIFMyhCOztVPwR0ODrTBF7mpsYFOCfslWuX0YUs4=", - "pom": "sha256-F5mF9191dWvfcTbip499FxUiB5Req3DwC+jsid8AANg=" + "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.0.12": { + "jar": "sha256-tPzDCMNA6G2opmlilRoPp3xuQ+YBysR2V7POGEd5vyQ=", + "pom": "sha256-qo56LVuDcL1rdiIloQo84MI6Szi0tBhWeU5ANNREl3o=" }, - "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.0.7": { - "jar": "sha256-TW0eky1ao6ANk79hheVDrPs8cHRBtCaxRgYzDdd8Ync=", - "pom": "sha256-SJJEq2meLe5aymiuecB3UPaPJEX8kakVRwrl0IcOGP8=" + "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.0.12": { + "jar": "sha256-UsUEn4qzzjSfdm6UYvV/rARRYSW/RE703xNxCMV6lB8=", + "pom": "sha256-eOVSVCtPyb3CEjy/iTDIvWVP31iLASwGHIrQCo2bvWY=" }, - "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.0.7": { - "jar": "sha256-lY3a0UIQBCTldkZxqRnPIdkYCg9E/yAI3hPqWfiNQs4=", - "pom": "sha256-ZXh1WuFEm4wghu1kVJ6OCP//SVRt/NyHtMUyTspySqg=" + "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.0.12": { + "jar": "sha256-hmOaTrEqDLKou60n8hrpmiDgDWkHVoaaIloQFOygvHU=", + "pom": "sha256-jk1dZZNxR2bNkO518I2FwQMNqhxjTGchwMhgQRIFpmk=" }, - "org/eclipse/jetty/websocket#jetty-websocket/12.0.7": { - "pom": "sha256-wxv6MC9SZtQx2ifh1+vOP7tZ+SKtcquE6m0zCfIti7Y=" + "org/eclipse/jetty/websocket#jetty-websocket/12.0.12": { + "pom": "sha256-5thUcMY/08Lp1VHFCTkkEyu2jgi0GjHroiepjhDpino=" }, "org/glassfish/jaxb#jaxb-bom/4.0.3": { "pom": "sha256-Zg8EhAYlliYXiumpcrA86VFmXDPDM8q0U7EXi40NJBU=" @@ -1226,50 +1264,53 @@ "org/glassfish/jersey#jersey-bom/3.1.2": { "pom": "sha256-WmsvkyguMAlcrhRpCiqrWpxTa1f/MuiQ6giu/4qEwT4=" }, - "org/glassfish/jersey#jersey-bom/3.1.5": { - "pom": "sha256-WoMNet3GCaIEQueBfK+fbHts6yV/x/oO0Y8WHe+0SVc=" + "org/glassfish/jersey#jersey-bom/3.1.8": { + "pom": "sha256-KlqyAV6x4PzvSYnUSPttyL7+LM87PROGPhhtYse77RY=" }, "org/hamcrest#hamcrest/2.2": { "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" }, - "org/hdrhistogram#HdrHistogram/2.1.12": { - "jar": "sha256-m0f7rkRP6qxLfgTw6ilFaeS8KCvGnYws4qw/I1dygeI=", - "pom": "sha256-f7PnkMFU0bXiMXC7jL9/cO8ICa8XIp8dywENd5llEIA=" + "org/hdrhistogram#HdrHistogram/2.2.2": { + "jar": "sha256-ItHUMWxOwTpotVnpjIJW1pBxWTcx2pYTZkD4ZPoU+tg=", + "pom": "sha256-JiM0ZTf3BvIgWbkRcgnLBoGwJBFFs1x10sXj7EGCZ2Y=" }, "org/hibernate/common#hibernate-commons-annotations/6.0.6.Final": { "jar": "sha256-zZdOCoSB+v26+bSg8Iu1pslpsDZUgnY+7fd+b9f0k7c=", "module": "sha256-WvzxkaqDNZY3NlnlROW1BnQmwbF0Hg3jcc6+K6wYOLs=", "pom": "sha256-hzhyRO2hjBgdDvEwH4zyeQ8HTO2LXrFl1qW9TtIH5MQ=" }, - "org/hibernate/orm#hibernate-core/6.4.4.Final": { - "jar": "sha256-oTJLfIDIAIJsml10thsN52gUH5Z8KwgmUMt79GdVcKc=", - "pom": "sha256-nKbm1A5oAPDV5aofZGeX3Ex9AvoGZvzvX4JXj/7KpE0=" + "org/hibernate/orm#hibernate-core/6.5.2.Final": { + "jar": "sha256-Y7IrSdqgt7kwtFMm99+B8ex08z5n06sf9cWMfgWXyCU=", + "pom": "sha256-AXES7zbj8hlq0fcaigaf+Mw5SAjHmADRF0mDtONtuTk=" }, - "org/infinispan#infinispan-bom/11.0.18.Final": { - "pom": "sha256-msM5qJN8P0WwSXPDuUiJJdnKGe/AZJVGJ0ml4LnPKSA=" + "org/hibernate/search#hibernate-search-bom/7.1.1.Final": { + "pom": "sha256-WO2Xg6v4mdqIAbTa++A39hdSeBklEdgXxuu6tiWc0/Q=" }, "org/infinispan#infinispan-bom/14.0.12.Final": { "pom": "sha256-morEX54P+bvW3iEsHdCHIrxPrmuhC/vN7zaL8jroDh4=" }, - "org/infinispan#infinispan-bom/14.0.27.Final": { - "pom": "sha256-4xy7kAucGCozFn8D8vglBkmE7PFZgMMztPzun9r6oNM=" + "org/infinispan#infinispan-bom/15.0.5.Final": { + "pom": "sha256-1qTKkMta/plIFuxQ2jX3GG5PG835+2eNC8ggZpvj9tk=" }, - "org/infinispan#infinispan-build-configuration-parent/11.0.18.Final": { - "pom": "sha256-8cAOWfuORG8HEL3BcZ5hlS8nwWFK5HhFLC8AEQNTIq4=" + "org/infinispan#infinispan-bom/15.0.7.Final": { + "pom": "sha256-WBOzn+0YV1/lSnwSp43HOw29ikxhFZH1jT0whVsy/+Q=" }, "org/infinispan#infinispan-build-configuration-parent/14.0.12.Final": { "pom": "sha256-WTir5k+BZwjr5C5mlla+UltuhfxMyAh3OkVqnp6ne6I=" }, - "org/infinispan#infinispan-build-configuration-parent/14.0.27.Final": { - "pom": "sha256-5eKwoVo9nMBdz+Ju7CroBCpbey9GMwFXDQPFjMqZcFQ=" + "org/infinispan#infinispan-build-configuration-parent/15.0.5.Final": { + "pom": "sha256-DAglqIiuar5Z8TLIQEnnXpNY9m8jXB+VFNR4V8wz5KE=" }, - "org/jboss#jboss-parent/36": { - "pom": "sha256-AA3WFimK69IanVcxh03wg9cphCS5HgN7c8vdB+vIPg4=" + "org/infinispan#infinispan-build-configuration-parent/15.0.7.Final": { + "pom": "sha256-uM6y236AO1bdaktGtBoKEchNP5Rpee4SnO/oT8kxYWI=" }, "org/jboss#jboss-parent/39": { "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ=" }, + "org/jboss#jboss-parent/43": { + "pom": "sha256-PDredvuIOs25qKAzVdHfQGb/ucjHjwmyGenA/Co/Qxc=" + }, "org/jboss/logging#jboss-logging/3.5.3.Final": { "jar": "sha256-exGUYN4XQZWspBLf7VLKC77w7OJsLXQwG2Fyz630/1k=", "pom": "sha256-GGFMhJXpXxL+1s8lR5syQwhTnRSUjmAoGLhH1Bld1Oo=" @@ -1280,14 +1321,14 @@ "org/jetbrains/kotlin#kotlin-bom/1.8.22": { "pom": "sha256-yNeU63YYiNNDaeZ33o6roLAfnop1bPv/UyFcz6XFjD8=" }, - "org/jetbrains/kotlin#kotlin-bom/1.9.23": { - "pom": "sha256-Gb8FhoXOaQ3AslVsVqux08SF+j4VXTXy08foBV+NeP8=" + "org/jetbrains/kotlin#kotlin-bom/1.9.25": { + "pom": "sha256-GZrnpYnroWgYRqlUmmlc87CkLB2SEZpQqDD/Erq7oCM=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.3": { - "pom": "sha256-Tl0ZAOY3nvP1lw0EqPMFKa3IL4WejMEHwhzoFJ72ZsQ=" + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.1": { + "pom": "sha256-Vj5Kop+o/gmm4XRtCltRMI98fe3EaNxaDKgQpIWHcDA=" }, "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.3": { "pom": "sha256-KdaYQrt9RJviqkreakp85qpVgn0KsT0Wh0X+bZVzkzI=" @@ -1300,47 +1341,43 @@ "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" }, - "org/junit#junit-bom/5.9.1": { - "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", - "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" - }, - "org/junit#junit-bom/5.9.2": { - "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", - "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" }, "org/junit#junit-bom/5.9.3": { "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" }, - "org/junit/jupiter#junit-jupiter-api/5.10.2": { - "jar": "sha256-r/93wYbNMXJ1gDhy+lEzqoAf1qxAvZHHimz4AJtLF8w=", - "module": "sha256-QRtKlsKm2wmY1uWOiZNn8NElQWPzBBydmOeu38o3RBk=", - "pom": "sha256-u12jBgImsbPOtUCEldxptZRlv1DX6+Y+75TyWQnPGQA=" + "org/junit/jupiter#junit-jupiter-api/5.10.3": { + "jar": "sha256-bv5uAcof95t79Mbx7tCykpLhZsJ+r3sArJgaFNTeYao=", + "module": "sha256-HH5GU3/EOyd29N5BmpCEpkAREQn6QLSHiUCynOI4vh4=", + "pom": "sha256-c0ocaMNMWt870vW8pL9JjLtPScSJ18JNgM8OIQK+bxQ=" }, - "org/junit/jupiter#junit-jupiter-engine/5.10.2": { - "jar": "sha256-tt812nUKVGrpMjdvEbPA34QfDJDHyylEzTmttDKIbks=", - "module": "sha256-FD7yda5mlRGdeCEqkyRazrv5I1tTdbn0wdSvcy87Uwo=", - "pom": "sha256-q+csj7+anI+e55usKbpkedMrDf+quICApQKRHSTTlGM=" + "org/junit/jupiter#junit-jupiter-engine/5.10.3": { + "jar": "sha256-u9POjcEemSUHHvlpHWivGrbnEvqmhR98UnW8iq/IhnM=", + "module": "sha256-t34vIrhuzSrvh/C3LGoHDwsOdqNKvaqKd1ECweDRYSE=", + "pom": "sha256-g+8P1otgv2vHmnj+sRiCxiXEgu9p1iv+LRFwQKZEgUQ=" }, - "org/junit/jupiter#junit-jupiter-params/5.10.2": { - "jar": "sha256-7bHkP/C4BnYm/7VeXp7sodmrJHgUGnx/JT0RWynMfPI=", - "module": "sha256-IMLmXVKjnIVJbo4XDgjG7Sk1x/NeZRAT2WTcG7dcgns=", - "pom": "sha256-8n19CW20igXW56/YQalUVEJOVcUj167RZoF4szpjy9c=" + "org/junit/jupiter#junit-jupiter-params/5.10.3": { + "jar": "sha256-fD7YzvsSSWt2xTw9qYbqjwvz9CZ4GGlHVVGuOlBsGtg=", + "module": "sha256-TnM9YVyqFuDs17mum/6I+YqUAgkpMzx+4rT6CaegTZE=", + "pom": "sha256-bNnfkGpi/mTMMBw9YAeX9iTb1CJff6UFpajtsx/5iQY=" }, - "org/junit/jupiter#junit-jupiter/5.10.2": { - "jar": "sha256-Jj5DRH9LQPEmrWsdy9ffN5RIQTve244NJAxby7p8ek8=", - "module": "sha256-cjF2bPGyuJLGehQsljkU5rc/u1BhpschROt/jnJ3DsE=", - "pom": "sha256-1bcMXC10Ui2mEM04d28iW6wDSsJZGEO+6Xl6urOIDqs=" + "org/junit/jupiter#junit-jupiter/5.10.3": { + "jar": "sha256-5vwJ+IHrqLjYp2YKbH9NWC+niB8wYTav4tgpZKLnwi8=", + "module": "sha256-hrCGx1WStDQ9pPdL6V4mhSxMqqWzToLVaqg/MYBLyBA=", + "pom": "sha256-Jd7AgvAkZ81iKQ7xOJv0smhu9QVKGo7d+xtbfVTeGZE=" }, - "org/junit/platform#junit-platform-commons/1.10.2": { - "jar": "sha256-tWpewACked9Jc7GLuiTJj+Dbj6oUyJB9PvRR2Mcf2K4=", - "module": "sha256-HoFCGmL4cryk0gIgs56hniexNfNre3gXBPkvrVQxlhg=", - "pom": "sha256-8/glx8o72JcU1IlEfHfHbifqOPAoX195ahAAoX/KS+c=" + "org/junit/platform#junit-platform-commons/1.10.3": { + "jar": "sha256-l4fwTUnbWTl83XVV1CGlvS0URWZpl9MnuU+F44vtV/E=", + "module": "sha256-n9gMr9DRm5pTrhnq4Eq94bIwVfQXXXbI52ibzkRImCs=", + "pom": "sha256-dZdXLFnxl1Ji+Nj8+I7GeDN2hUvwjOipPZnb3InuQ/k=" }, - "org/junit/platform#junit-platform-engine/1.10.2": { - "jar": "sha256-kFy6m0mYzMKdEjkIWn+x/g4oAk11JhUjVtgQ7ewKSaM=", - "module": "sha256-4dG63P7cJyRFQeC+XV6EtyoicNevYWhrJvEc/Edw2kI=", - "pom": "sha256-EqqGyhwNZIoiXU58aWBUwfx26IeCxcOft983muI7728=" + "org/junit/platform#junit-platform-engine/1.10.3": { + "jar": "sha256-33wyv3XPR8TI3dGUIJECeUen12XTC3Mf4AgwEV+voTM=", + "module": "sha256-D7CUb/Z+Q9A2K71CwjRNUUc4nkMVKCN3EW/rZOJrgNE=", + "pom": "sha256-b5uZvKDBfdwZ9RvAN+OxfKsPx+bx2nA4ejCrTgUgcig=" }, "org/latencyutils#LatencyUtils/2.0.3": { "jar": "sha256-oyqf+gay9OAcU2D4+d97xdlFSl03PNjzYTR/paVxZew=", @@ -1349,19 +1386,23 @@ "org/mockito#mockito-bom/4.11.0": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" }, + "org/mockito#mockito-bom/5.11.0": { + "pom": "sha256-nS9GsUwh/8yOt/ApAeN9ncVJfmWEMFAYTRohNAcdVrM=" + }, "org/mockito#mockito-bom/5.3.1": { "pom": "sha256-F8lglCSkwzBWhOTlZS9VQRAyV1wafKPXhZZiEEafJTU=" }, - "org/mockito#mockito-bom/5.7.0": { - "pom": "sha256-dlcAW89JAw1nzF1S3rxm3xj0jVTbs+1GZ/1yWwZ5+6A=" + "org/mockito#mockito-core/5.11.0": { + "jar": "sha256-8HbJax9JuNm8QuRrCWmq9WhMQMi1tnnUAOXYgAc6DgA=", + "pom": "sha256-ugsbXXA1CUlPmo5EWCIjh54zSKTElmfwx35odG5IHHg=" }, - "org/mockito#mockito-core/5.7.0": { - "jar": "sha256-261edGZUkQoRpZ7LTQHjhGHz5dFhYWidwliNVVRDJSE=", - "pom": "sha256-eeZzpTX0jKN+6/dst6xMaZ1JRs7tbwgrBAxZNtRDAO8=" + "org/mockito#mockito-inline/5.2.0": { + "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=", + "pom": "sha256-cG00cOVtMaO1YwaY0Qeb79uYMUWwGE5LorhNo4eo9oQ=" }, - "org/mockito#mockito-junit-jupiter/5.7.0": { - "jar": "sha256-4kFqJgw6Rbp31nTP4n1JQo5X7+Iaey3ernM+u1xdhb8=", - "pom": "sha256-imEoqpHW4uT0Glxw6kEkfhgUnORgiDUbIFl6Y82qWZE=" + "org/mockito#mockito-junit-jupiter/5.11.0": { + "jar": "sha256-ow6k/gSE5U9kzcFSaabG/xvYm8JqDUHkwny5HLeNxUg=", + "pom": "sha256-bmmXepSLvkTQn3UPXos2i3VFwy5JeJgrs0luiJQELl4=" }, "org/objenesis#objenesis-parent/3.3": { "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" @@ -1375,60 +1416,54 @@ "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" }, - "org/ow2#ow2/1.5": { - "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" - }, "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "org/ow2/asm#asm-bom/9.5": { - "pom": "sha256-cXVrNd2DfbY4gG8A9Ad+i7Nf6NgL1nToFBowfIEWNb8=" + "org/ow2/asm#asm-bom/9.7": { + "pom": "sha256-jIZR874EOzV43SihXAFhhhsV6wObf1JHZ5wMwNvwd4c=" }, - "org/ow2/asm#asm-bom/9.6": { - "pom": "sha256-ig5fYk/ikwt6jWmVb0OORe9TKZa01kQJthbErvSxrE4=" + "org/ow2/asm#asm-commons/9.7": { + "jar": "sha256-OJvCR5WOBJ/JoECNOYySxtNwwYA1EgOV1Muh2dkwS3o=", + "pom": "sha256-Ws7j7nJS7ZC4B0x1XQInh0malfr/+YrEpoUQfE2kCbQ=" }, - "org/ow2/asm#asm-commons/9.6": { - "jar": "sha256-eu/Q1cCQFwHGn3UT/tp2X7a+M68s56oXxXgfyHZXxRE=", - "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w=" - }, - "org/ow2/asm#asm-tree/9.6": { - "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=", - "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" - }, - "org/ow2/asm#asm/9.3": { - "pom": "sha256-jqwH4p+K6oOoFW17Kfo2j26/O+z7IJyaGsNqvZBhI+A=" + "org/ow2/asm#asm-tree/9.7": { + "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=", + "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw=" }, "org/ow2/asm#asm/9.6": { - "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" }, - "org/projectlombok#lombok/1.18.32": { - "jar": "sha256-l1dGdOKiX1Z6MTc2rOAN+Hh9RD3jFkB9V/yHfZ8Zpl0=", - "pom": "sha256-kJG8bAW2lzNJ2beLe33Y3abrt0zJ6nTieSlg+1A0ipI=" + "org/ow2/asm#asm/9.7": { + "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=", + "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA=" + }, + "org/projectlombok#lombok/1.18.34": { + "jar": "sha256-wn1rKv9WJB0bB/y8xrGDcJ5rQyyA9zdO6x2CPobUuBo=", + "pom": "sha256-4ZCf4nLP/In/KJsTIeibZB/vc5ghZhu2k6b5ZqF+2eU=" }, - "org/seleniumhq/selenium#selenium-bom/4.14.1": { - "pom": "sha256-lsHFVPuI0tI0gU1PEQAVtuSGzw5Ai96qnqWRnJYw71A=" + "org/seleniumhq/selenium#selenium-bom/4.19.1": { + "pom": "sha256-8QH5+xtuCznTc5SZoA6CHTXh8/boF2GRNzaCYJZM2mg=" }, "org/seleniumhq/selenium#selenium-bom/4.8.3": { "pom": "sha256-VjKTeC4Y0PLA1r3M6+vjQUjw7LuSuBjbCLhAXtOuCB4=" }, - "org/skyscreamer#jsonassert/1.5.1": { - "jar": "sha256-Hpp8RD0N1XmQZkbXZ/NwGRinjLiKkxEvUoMF/JCV0mE=", - "pom": "sha256-x07S0PFNq9SGOLgph7qMwFCZmEsFluBwbEzUXs/XgWc=" + "org/skyscreamer#jsonassert/1.5.3": { + "jar": "sha256-cZCVwH1CA5YTINpZNEHYs7ZDwY6x2Bqpjqkzu36zUbo=", + "pom": "sha256-xqiAc3trPIon2aBcYEhTanpwuzUMuR3OIza2cQorpig=" }, - "org/slf4j#jul-to-slf4j/2.0.12": { - "jar": "sha256-hPAoZMq4Zv+xlu0gIrG42mgupvs9ShYQaUKeg5HuKXk=", - "pom": "sha256-cSxGGjt/ZQhXk27ruv6k8afSqsHlVheuJM4+vjkorEg=" + "org/slf4j#jul-to-slf4j/2.0.16": { + "jar": "sha256-Dy7DluopyaRAiQ0fCf24L91XS0eymENXZCNUUcGThh0=", + "pom": "sha256-ZrmCqPWdeK480y5UaMHUjn78wYZruIPYqYgE2E3rZn8=" }, - "org/slf4j#slf4j-api/2.0.12": { - "jar": "sha256-p5UCuKvfvXIoRqJ2kSJqQIhoLW01ZU+bgOKpzKz37Uc=", - "pom": "sha256-Udh5pZmPWCJ0Dc9VIsDtaXGtXEpeowtw9bVGCT5rQmM=" + "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", + "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" }, - "org/slf4j#slf4j-bom/2.0.12": { - "pom": "sha256-SH70mE1wFY9Yw3zodmkxukx+VzdYZYhLdWORv9bQDDk=" + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" }, - "org/slf4j#slf4j-parent/2.0.12": { - "pom": "sha256-fGvEdX5NSZJN3w/sX1zkAvg6bGzz4QUtGVsSgqeFVd4=" + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" @@ -1451,238 +1486,250 @@ "org/springdoc#springdoc-openapi/2.2.0": { "pom": "sha256-Los3sS+E+doEZrqeLfbA2nneG1cyCSPFNW/oXbE0d2w=" }, - "org/springframework#spring-aop/6.1.5": { - "jar": "sha256-HgPayw2pkpOO9ZfaqWJxBJku/LWiJPywuhB2H1YD23A=", - "module": "sha256-Gs+T81Rc9Igs7E2kdpv/gDvHItPOmE4V/EA/0SpoYKs=", - "pom": "sha256-BOtzUrc6yG0txf0phEh9zJhtK7Dkr2iTL8+5pv/3O5E=" + "org/springframework#spring-aop/6.1.12": { + "jar": "sha256-fBLmk3hEpCgC1o7WmrMcnTNnXgxLLx7BL/t5U4vx8P4=", + "module": "sha256-eb5GsboCAyyRGfZa1kY4JCVJIn9DRA4OY/OFO5Urw8M=", + "pom": "sha256-4MOBWbo0jp6yZaavDnq9eSsujxJq81yGrWvoWdQIGuU=" }, - "org/springframework#spring-aspects/6.1.5": { - "jar": "sha256-f+u/HH9IX9naYVtN/YPBJWQR3nXO5j86olIYQeLwIO0=", - "module": "sha256-CV0KNwdOWgR53RCLw8BXxU5fpgBjhsz7wE7d58GzjKA=", - "pom": "sha256-6pqt6vIWz9OTzoRU96wGbadbXo1n3BO752bCNnNkQt8=" + "org/springframework#spring-aspects/6.1.12": { + "jar": "sha256-CcS/SjYtnK5dVGSzwY47o7Bk4S6jBhyGy0Rjiz1PEic=", + "module": "sha256-+4RoppA5n5CXzGFLxYUdJZ81FbHDYCZett5CdQ4VMtw=", + "pom": "sha256-UgHQPY4IDkWidn3s2zI+IqTL8XdOhgpHTTRehRNydJU=" }, - "org/springframework#spring-beans/6.1.5": { - "jar": "sha256-vc9hA2KT/DR1Jy50O2JdZ54G0VK3gRNJUckHsYXw9fE=", - "module": "sha256-Xl8vA+zEAsSsmrvB/ai17XvXrqeQq+zPo/oIt0tYsZU=", - "pom": "sha256-Xabx7e45f/XlcfEevU74LTGwV8gz5eGDDCX+z2AtON8=" + "org/springframework#spring-beans/6.1.12": { + "jar": "sha256-UDXoYsT6o0NJ+Z7vKDgN7fmUCjACIYw+UB1gqMyJPj8=", + "module": "sha256-x9ISxLxFi17XsVwZh59Nr+nzFlcni4qZ3Sq46HQcqwo=", + "pom": "sha256-zciJOknEs6M13llL6C/Vn7hW2MlzPDno1iKBTcwMkLM=" }, - "org/springframework#spring-context/6.1.5": { - "jar": "sha256-j4XrCr4egPYqgx90vhNePLvgWHpRBBevdP3S476k7sc=", - "module": "sha256-Q/+/GUNAYNYvULfuQ9+Nm4z93wPTEqreWJJNwCUCr3Q=", - "pom": "sha256-ZUYqy97G8s3HsWRrV9Yqho+g9R16vfcfph1TO5piBzg=" + "org/springframework#spring-context/6.1.12": { + "jar": "sha256-V2NQ6DkMWQV+fTOUQeCujCvwjh8sjh1ZQVwh3H7SyfA=", + "module": "sha256-6dRwpGQ6DsNpTtdYztMYGx99LIDXLhJmjtTs+mRyiCc=", + "pom": "sha256-hUnp0JGFg5yJFJljfAx3a8ogNw1kkAfwFbpUFFtLBTA=" }, - "org/springframework#spring-core/6.1.5": { - "jar": "sha256-R22sKFCbP0fQteiVpjn6dawiGPB0ziFORIMqg2xGn34=", - "module": "sha256-9y0utFaZs5m96BcHjDofP9w1h88rIPVj+YRlFOcFd4k=", - "pom": "sha256-lAoGKQS46H9ZNzhcr59XLhFhI1MpGDX74aiTTkfgIvI=" + "org/springframework#spring-core/6.1.12": { + "jar": "sha256-AQ1jmMf2W8LaPDi81sDrt5b0/jJVgAvAXnEvQ9T8p/s=", + "module": "sha256-KWYBRVUVcWZ06vLZydcD0m5q0BXf+lThEzNLr8y7HUs=", + "pom": "sha256-ncr5G5WfB+zIT68GdhMmrlHTwS6jzf9u7EUNvVdj3xo=" }, - "org/springframework#spring-expression/6.1.5": { - "jar": "sha256-Hze1DcrwkaQ7sQ2UYXj/9AgmdEl/2CFDgyeBXaFPf9A=", - "module": "sha256-BjxGmLzfA7yBy7p2C6QlORxmqCbr8oMV26qzaiDKXCU=", - "pom": "sha256-bGhL5Up+3D355xKaSvovDXHhPd15TGbDy8VFKRY7t4A=" + "org/springframework#spring-expression/6.1.12": { + "jar": "sha256-x4y58ZojPqg3uYV+w8hMImM71jN+s5rnPxayrfPWyiU=", + "module": "sha256-FxMjcUcyUZ1WLY+m/0hW8maC2p3ZI75DLhNA4o78i+o=", + "pom": "sha256-/dl5KKzEMdiziCvjeSOSQpmNwpihBF0G8PJhynxY6x0=" }, "org/springframework#spring-framework-bom/5.3.29": { "module": "sha256-pslWW9lncgrg50PCMmUst9yai4GAjvFDWv1/aJICE78=", "pom": "sha256-Bald+izdhQdNkd3pYqk/KW2v3tf6l9Eu2+jQ/21hMys=" }, + "org/springframework#spring-framework-bom/5.3.32": { + "module": "sha256-R6cJH2l8pjEYXtQY8Morhu7wyCqhbRdx3exLLDu3s70=", + "pom": "sha256-glr3ES49kupDa7DfeMGVFIhfXAFtD8YMiyTUdjoBWhA=" + }, "org/springframework#spring-framework-bom/6.0.11": { "module": "sha256-CV5xI53YkWkSRMjWvm19o05nC2UYaUeexdJBXZmrYZI=", "pom": "sha256-SK3yYlH1WiPKJZbVBuBZEdmnZ3fm0CxSgMGhd4wUMGc=" }, - "org/springframework#spring-framework-bom/6.1.5": { - "module": "sha256-7U7C7/BZdKQd6tLcvrGWx3zguWo0ASx1moJgekDyPkM=", - "pom": "sha256-yQDgm0NW62vBKuKjqnWvYyfM9k4xGSEtH6wUEs3j7RQ=" - }, - "org/springframework#spring-jcl/6.1.5": { - "jar": "sha256-xTVAQZ5IIkLIFdttaozYCvhaaoleODKbnZvWtGFlA+s=", - "module": "sha256-2cFwLKmfXbBVH0OfHVTdFTVFXp/mmorW8ITIcCuDufk=", - "pom": "sha256-zFNMIQNwPoP72KUfEIjB+IwxPFf8rBqVmbqUnYQrkuk=" - }, - "org/springframework#spring-jdbc/6.1.5": { - "jar": "sha256-EhoCQxcPwuz++fKlKfn9CbtGXZBeqg4pgjCOZFGTctU=", - "module": "sha256-EAKtC26LefaL7gxTpnG2f6mewMDp3ljqiBBUo0fR5x4=", - "pom": "sha256-bQmiCchhzxfOy+DlWfmFmSPPbmD0ifz4ozyMBwI9pJk=" - }, - "org/springframework#spring-orm/6.1.5": { - "jar": "sha256-1N5k8OxGyhSAsSDbVeuVOQSn5caNq7nf2WRrmh0qgso=", - "module": "sha256-NoB5v3YCe26jNlErhr+KuIuD7rWzG89K5Np2oAOnOTE=", - "pom": "sha256-bn/rmLIKcE49DTI04Jx4JnB69ptbX4tzvaArNtk5JDE=" - }, - "org/springframework#spring-test/6.1.5": { - "jar": "sha256-e1tYUlfSb4wr1dzN3MvFgAKK6sWS05CVBVEcbF7L9lc=", - "module": "sha256-3ZAJHhRe23LjjFnlg8qmqtJlPH/639b0iZ87T1aDOoc=", - "pom": "sha256-sU3+3yKLCJV+8ssDZaEMQQb3EdCvsSqJFrIL9vBRFD4=" - }, - "org/springframework#spring-tx/6.1.5": { - "jar": "sha256-u9Q3Y5H0yVCWD2vfTX3Px84cQDOWEEaKz6/dA2hdrUQ=", - "module": "sha256-MEDEuSz02m9hCZiuPn2iEIeE9BSIL0FqETnprzIYMJ8=", - "pom": "sha256-npsjXfHJoAKQF9jYdlrqT8SkAbKFlf9fWUedRBkUwiE=" - }, - "org/springframework#spring-web/6.1.5": { - "jar": "sha256-ufqr5wdENG3tLvi7eqj3LmN2IpSHiNAPxdHg8mR877I=", - "module": "sha256-zIS+644Hkn816yfX+yH5T6/vt7H3qFekxyBihh+mBpI=", - "pom": "sha256-+UyFgG1XKe4in7Y9xLIg4YAFpX6cJx2H+zuBE7DsZps=" - }, - "org/springframework#spring-webmvc/6.1.5": { - "jar": "sha256-9PvgwzbUxrM52EwmQYQoo0xeVAgyHaTlqwpXg7F5MiU=", - "module": "sha256-0w+TeO861HHMiUU9EpE0cjx0XAde+EHOoZx/JIxCN5s=", - "pom": "sha256-WGBut3Pi52sXgk130Nv/ow+JjtEM6WUaanNEdkVIT4E=" + "org/springframework#spring-framework-bom/6.1.12": { + "module": "sha256-qAd2W08tD0aUcxc2YkBjLvqq/fO1fpE/x/kREgfGs9Y=", + "pom": "sha256-5dIoSA7FyCwgv6QfpIlBcQ+R23xQ3bZxJVYOqPlYQmo=" + }, + "org/springframework#spring-jcl/6.1.12": { + "jar": "sha256-6JgP3HCrRL6yAZOVcSMt/EDtgE1UtxVU/I/Ihu1de/k=", + "module": "sha256-rtWyIwjzLzOCN5jqf3a14h84TBuP7Ef3/ZLnltEAOdk=", + "pom": "sha256-cfXigwQNj/CpOQgEEPJ5GiBfAjvTBBWRD1wOPmzwI54=" + }, + "org/springframework#spring-jdbc/6.1.12": { + "jar": "sha256-AoimhmOJmJ04ajKqrRU5RXXabXho3P6m6Q9Lpu1oXIs=", + "module": "sha256-d5mzq9Ryug7sMs4MfruN9TcfKCiB5JEtKeCUkPLw5sY=", + "pom": "sha256-76Nq1ppmJJC/OIhr2gt4XJSiAOAKmQfV6AqTzaiMC84=" + }, + "org/springframework#spring-orm/6.1.12": { + "jar": "sha256-bqsM2YZddpbUNpflzuTPgBsZbHhLBlSoAuR7fS6Yc1E=", + "module": "sha256-tbAqbAYaYC4/zupu/3FEEVdL2BFO9bBaM2kHfghHhIY=", + "pom": "sha256-3LiQSzxlkFQRNRhIAZfpwIqcnthC/4PqpDRteL3JhgA=" + }, + "org/springframework#spring-test/6.1.12": { + "jar": "sha256-BqWoDpNTOTwiuyscRHT+iAHYW42BcQU9XbkItudXmgE=", + "module": "sha256-5hX4INIATuHh9Bo3/9o1jCnLDT0A7rODj6PqC917iQ8=", + "pom": "sha256-Lb1NiCNsd7d32VSsaL7u9ppHh2dfh7R/O5dwBms9CA0=" + }, + "org/springframework#spring-tx/6.1.12": { + "jar": "sha256-cpbRDoc2KBFHOf5+o3wRYmc6m/9cvLCpUTkfq49ufGs=", + "module": "sha256-l8iUsJPidI05lpdxd+rkn7ifYMGFzBuImKvbOAyr9wU=", + "pom": "sha256-SNSMwvlBXa2BATN2aLqwF6X/uCMs9x/Viepvo/PZwo0=" + }, + "org/springframework#spring-web/6.1.12": { + "jar": "sha256-qeExXvr90qLygLd4Gc/P0JcOg8dopKyS1UvkSOgYl2Q=", + "module": "sha256-byUGRQ0WNtnZ6ag1syT3tzYQQ74yA03GcaBYmajNGYE=", + "pom": "sha256-5WpNnV8fg+nJoDi0r7SPYMosRixfMDpDPX8JiuFdjq8=" + }, + "org/springframework#spring-webmvc/6.1.12": { + "module": "sha256-UmPNrZVdGM2kiNE9nhWKcIlP9MYuw9mTvWdV9aSTiww=", + "pom": "sha256-TXHTQtGEjnxSN/UD4dbEFxwP8Gf43zQjqAKPRYdTJZE=" + }, + "org/springframework#spring-webmvc/6.1.9": { + "jar": "sha256-LEJrlcJ9UhC2/t+LqDVadSs+LWNx/lfvkVyRKTO6Y4w=", + "module": "sha256-4VH54rzAapzvtP4B6/f05bYOaXf1jIvAv1qmgm4C8bI=", + "pom": "sha256-S1Y5xzv/J671C2oLCO7dVdmxt43yRqx8XBkXy0KL3sY=" }, "org/springframework/amqp#spring-amqp-bom/3.0.6": { "pom": "sha256-sch8n8omH3LZPz+tDWBfn6FQECv1fU6eT9Ga0ltYvB4=" }, - "org/springframework/amqp#spring-amqp-bom/3.1.3": { - "module": "sha256-Q4DGAGtYET+GTeGA/GVbn/qlQi4hLOD+EqLgX7W6VUM=", - "pom": "sha256-RFfi3NUlrKZCKAmqZtNLnsj0RDc56LUj8I3ZgwiD3Gk=" + "org/springframework/amqp#spring-amqp-bom/3.1.7": { + "module": "sha256-V4RBJN1QOg+8JPUIUkNMFcSAjMhCvicZBqU+D0Xrq1M=", + "pom": "sha256-+A8UHBSgtP2fT9njnZ1s41LUal2VhEmPZS9Haq6cfAw=" }, "org/springframework/batch#spring-batch-bom/5.0.2": { "pom": "sha256-aDpeNRsQ0aR8gkN/CtTnhmTUICWhpXBtaPpDhCHt1uw=" }, - "org/springframework/batch#spring-batch-bom/5.1.1": { - "pom": "sha256-1R88KqBI9EqHD7C+H4i5MhfWHfQwW+NsfeXB23ENa80=" + "org/springframework/batch#spring-batch-bom/5.1.2": { + "pom": "sha256-sVvWVb7ESiLKe/VnhcpPfubUcAOBaqBwJtF0bbECwAg=" }, - "org/springframework/boot#spring-boot-actuator-autoconfigure/3.2.4": { - "jar": "sha256-Qm8Cl8uwX7gZ1SSCp4FoKivKCVUSPOgf4meTih5E0Z8=", - "module": "sha256-M7Yu8nhLidE4hVHgnQWLHwczE8XyuKbiJxthsFokWSc=", - "pom": "sha256-6sGp05pSESzuofYNPWh3B3BWy0ZIMVPbcCcUYDex6mY=" + "org/springframework/boot#spring-boot-actuator-autoconfigure/3.3.3": { + "jar": "sha256-y0kydzDBH/mKJpDYnyLtCNpYmXohKDuEzVCHEGzC+mE=", + "module": "sha256-FopZO/qHKQcKsgy+WEYdPKFUNWiWEi+MVcnzwZmdyeo=", + "pom": "sha256-woBs2IPedAKqYwfPKeIuYuJfD7x55yFHTlhWPEVcUD4=" }, - "org/springframework/boot#spring-boot-actuator/3.2.4": { - "jar": "sha256-3TmG65GkOvANXasDzRWA2y49Z3Lu7EMC/fqyu1AQcb8=", - "module": "sha256-qZsBKuzw2tJcKh6S2JGTD1EpzeGIHTWX2yFIzSt+WTg=", - "pom": "sha256-X74vIc9RpPbvHXfDiXl6QxQDsSxIdv65g8tHz6/jTUw=" + "org/springframework/boot#spring-boot-actuator/3.3.3": { + "jar": "sha256-YZbfrxKpRC0XKLq3pCVI89Ib5FtRBhASbyCANEw7Aww=", + "module": "sha256-8Zek/lcavWdjSJ/6AZ5GEhoMY5RuUn++bC82c+Cp1LQ=", + "pom": "sha256-Mc470SjHokTE2Hxc1vGee66p+d3Zs0hgrF9/MyG4ijo=" }, - "org/springframework/boot#spring-boot-autoconfigure/3.2.4": { - "jar": "sha256-FLRpThp4LqlGJkp2dtopNtJHSr8Ph1c5sa9do7t62Fs=", - "module": "sha256-9LuyO5Wgmt2QkeNe2jQ0yacJutGo8I7/cyN0jDKcaEg=", - "pom": "sha256-yb4pyPXeG7NfGk3ixkuiaK5zZGQEBAk13fNM1gWNycY=" + "org/springframework/boot#spring-boot-autoconfigure/3.3.3": { + "jar": "sha256-VFThf+bmkoU86euEK9ZMbHq9kIvNgUEVOSXk4M/V1vU=", + "module": "sha256-rmN63QYIyfb5RAoG+On/Dm03wkSVc/FuenP3S/zHvYg=", + "pom": "sha256-klhrwFBjQd7B2OrM5XYBhxJblZmJnBVWVllaH3S1/y0=" }, "org/springframework/boot#spring-boot-dependencies/3.1.2": { "pom": "sha256-DIaB6QfO2iWOWU6lt8/aByuKxHDamKrAGEqO62lQV9o=" }, - "org/springframework/boot#spring-boot-dependencies/3.2.4": { - "pom": "sha256-70YbfRmWkP/4qTa436J16BOHzXPaXRfnpuDhlX87ZHY=" - }, - "org/springframework/boot#spring-boot-devtools/3.2.4": { - "jar": "sha256-+ipJT83cd0DiM/MC7v1rhO2K2LPhIvPLA8ncn1U4jR8=", - "module": "sha256-TFz9e2WvdjtnUYPu5RsX3QDmsb6U4PXy+3k27HBOgEA=", - "pom": "sha256-AKmUsRZ4Syaop9bZtvG9m5POOhU4KtU1PHvcaPmyoj8=" - }, - "org/springframework/boot#spring-boot-starter-actuator/3.2.4": { - "jar": "sha256-PplRboWGYJGG2yTB3/10KTx0Pxy2iIPzUm4ewgGIA70=", - "module": "sha256-f/+Mys1QFcuaATkwqeLchgqUWRa1N1Vq8jGdg50dNzU=", - "pom": "sha256-n/JDazVblAkx+XO4ayvynkEigJ4FpHGNbzloSsJ6ETw=" - }, - "org/springframework/boot#spring-boot-starter-aop/3.2.4": { - "jar": "sha256-CXsCUrgjpzANh9TBGBunS0aNolOyayUMoivRg9hKlYM=", - "module": "sha256-TIejCWG4uVNixxbvkBeq5790bWo9r87+aSHub595pE8=", - "pom": "sha256-QSGWU4+tZOWjsqEzm3hbyBOq5r+CvOtXPU1OCIQ1j3g=" - }, - "org/springframework/boot#spring-boot-starter-data-jpa/3.2.4": { - "jar": "sha256-spfq4M7fVJBaKMSeVw9ka2o76mod9jYVOwPu+GSvi1g=", - "module": "sha256-tSzjyfv4FJnMJQt3Dj3CCFb4XsuDIIIlyA5FCtdboJc=", - "pom": "sha256-VLhpTsL5oAD3UQNxTrZiwHvyKyPwdNjGmZJes1LQJMo=" - }, - "org/springframework/boot#spring-boot-starter-jdbc/3.2.4": { - "jar": "sha256-1dLxE4kJ135ztyhmv6qgBSxnjvCyOH2XqP0Pb9tvbCY=", - "module": "sha256-FKXvpRN+Eo8h/KxYH/NRQnrYqOkM9R6H16pwP2Y/za0=", - "pom": "sha256-pUn2sXF1H71qk8L9+NuhAEXVKlyDTeQ053/W+JsRbOI=" - }, - "org/springframework/boot#spring-boot-starter-jetty/3.2.4": { - "jar": "sha256-jWRTsvLnHsEBsHw8gEn9ziHIlX5UjLVUnHR0YRLySL8=", - "module": "sha256-i9h7yYGoVNmPrcewZKn3peOXguU+f07bdIG67/hup6I=", - "pom": "sha256-KJYplMADbOGAmBRAc+goZYSQRc07IS8KTNJq+CBrqwk=" - }, - "org/springframework/boot#spring-boot-starter-json/3.2.4": { - "jar": "sha256-9I1Q6hnzGY0y7zVXvVcrX+JwSprWI52lbRzOQd+tQy4=", - "module": "sha256-VDviUkvA422Sm7VNmfzOOZ46bTKWRjw0yfgXxC1K+Gc=", - "pom": "sha256-2q8V85plreytydxTp5a7f3bdfmtMkk/5VqXxIKq85qM=" - }, - "org/springframework/boot#spring-boot-starter-logging/3.2.4": { - "jar": "sha256-NJCOp/RztUMcKTcUg4KU4fYwy5PWxBnLE3C3qzXPJCQ=", - "module": "sha256-CfVHe9vFckpo6tshH/1KSoCRG1Kn91To96xbQ+MQhcg=", - "pom": "sha256-jK8Fj0FUSTqX6PsvTOqzdlRMQW2Y02njpZVEcC02Nlw=" - }, - "org/springframework/boot#spring-boot-starter-oauth2-client/3.2.4": { - "jar": "sha256-kQGeJk9c475xKyE0vFgUnyt2gbFVWD1BcgLdSJUgrwo=", - "module": "sha256-obqnMV97fdb2AbnbxkXfidX8hHNMy4mxbmuLMG/KCJI=", - "pom": "sha256-nVhE8Nra1qNX8o5liNY7mX2BDkNxsLrbvOMUkVp1qF8=" + "org/springframework/boot#spring-boot-dependencies/3.3.3": { + "pom": "sha256-NuSuqGqUmgcjhBHAFojdSdyshdNCU6kLog+3L9yXMWo=" + }, + "org/springframework/boot#spring-boot-devtools/3.3.3": { + "jar": "sha256-ZaV86ii0NkH9erenzPWoQ0Mu/ez+0NV3AaXex0r1Qng=", + "module": "sha256-HIJnm4UwDQb4oKxQk2IkUcIhPuv3mdZIXs0RlvcnRbQ=", + "pom": "sha256-XllSdMXb1LzOe0Lyv/XNpHTuy6YiOqON9vqVFtZhMLk=" + }, + "org/springframework/boot#spring-boot-starter-actuator/3.3.3": { + "jar": "sha256-ZyKv+UNdrdw6aZfqxctXQq3c9rwSGOVvrFYlioP2VyI=", + "module": "sha256-J6oYeXViTIcefsF5x5+laOVZRBK8aLzH7+L/dfuENR4=", + "pom": "sha256-E60HIeEPdAt4HuATH/54JBXZPibSfkKAOybz8hR+rkY=" + }, + "org/springframework/boot#spring-boot-starter-aop/3.3.3": { + "jar": "sha256-U/LE92SlnA+TMQyzq2SZiI1yWr+GPxoZe7nKy8ZZ/Ds=", + "module": "sha256-X3I3RS7d0PonHsEAJbPUaS0cE7AM8OJP7U2JAG79VuA=", + "pom": "sha256-NRSb/k/ckZh9CfUPssqY8W2FiaMoiPOv4xNfGfgGSyU=" + }, + "org/springframework/boot#spring-boot-starter-data-jpa/3.3.3": { + "jar": "sha256-RIse6OgsBS62iDYNGoE4psungOK9f26Fphm7ANjePsY=", + "module": "sha256-pRAgmkIdEGxsy+s8lzSwbrgnxZLHCDr7a2bDN+Vtwxk=", + "pom": "sha256-JkfOyUCetcrFYNlF88R0QROjeEie7DIeVPDXuajCGUY=" + }, + "org/springframework/boot#spring-boot-starter-jdbc/3.3.3": { + "jar": "sha256-ZBrNyGxc+Iqw3yd7ljqApeBcdhez4BApEw1+npExKQk=", + "module": "sha256-ljtLAENxUwhcn3KJ0Q9UBsabcG2snlk5uuLB1OZTHpI=", + "pom": "sha256-2VpTuALfAbit1qHqC9id7VLRj3za2RKIMVPE0PhKc+w=" + }, + "org/springframework/boot#spring-boot-starter-jetty/3.3.3": { + "jar": "sha256-uEd57lFkN1/4U+0HppEB1rEQSvVINIXA5Te52N4JgN8=", + "module": "sha256-TJ7qufMibHsTI9kICxbvRcm801aQDO11xVwd0zHaU04=", + "pom": "sha256-jZma/FuAIo3ce6Qtgk8O9pZm1/B8eMbAVGsfaUTEDMQ=" + }, + "org/springframework/boot#spring-boot-starter-json/3.3.3": { + "jar": "sha256-X6ME0eqc1ZdVwP1x4QyzqXWd0YLOvlB0dE4sXXjZBTQ=", + "module": "sha256-IQWePrdHCNehiWf6tXiQdA5vjS4GMH90+v2qx1z7Qn8=", + "pom": "sha256-yaaxICYx3zCpYWiqGHnhmTFk4eBARI8NLhwgHqZqk5Y=" + }, + "org/springframework/boot#spring-boot-starter-logging/3.3.3": { + "jar": "sha256-G9bCZUeDegCf1QMokW9lKLcyiHWyZZ9DrzW5gWkwWjI=", + "module": "sha256-aG88tWFrlIRq9Jm5C4Frmpbq0cvw7c69wFsdtl1GcrI=", + "pom": "sha256-i5ywHoh0oZsCkz9zhpAG4vCI285Gz5xtZdBLc0KGP2U=" + }, + "org/springframework/boot#spring-boot-starter-oauth2-client/3.3.3": { + "jar": "sha256-R3TvNTp/VzY9nn+VjDMJ2S1Uuzw501mmmn3PojW/m2Y=", + "module": "sha256-PX9cgZRLXAgbHJ8t7pY8fD4fQIuigxK/9Dm6vOZLP+Y=", + "pom": "sha256-sZU/zDXdqBefv0Y2Twxsrj5InQhDU2sxFq75mWGnfnI=" }, "org/springframework/boot#spring-boot-starter-parent/3.1.2": { "pom": "sha256-TB9NCfr9cgJEhZCDvfx7VytHF22Bil965q1m0ZOODO4=" }, - "org/springframework/boot#spring-boot-starter-security/3.2.4": { - "jar": "sha256-z7u6be1UrrxNPuR0jlpjcMIHmyaS8sUPExXcuzJt500=", - "module": "sha256-pWm2RyqDlRJpa5HOHJSVxZytw7BkIrGCeMIJ3z2IDhA=", - "pom": "sha256-t6P8Kf0TVarO5elLBBTqdSKYAjVDHwdqsxpGYZNo9KE=" - }, - "org/springframework/boot#spring-boot-starter-test/3.2.4": { - "jar": "sha256-roiIYrffE8AbIjIBBaQZLM5o2FdBI2WfCMe3rrK51NA=", - "module": "sha256-Rn4w+w+o3k6LQoCUEtkbDUdab7/0BT1oDIfCZRUVTVQ=", - "pom": "sha256-g5hcN9j1HOND/K1RJv3egrarTEcBIhcqxkKoUc1T9pA=" - }, - "org/springframework/boot#spring-boot-starter-thymeleaf/3.2.4": { - "jar": "sha256-K6M/xhRjEXomVKNqTN2GpbMwAQWKM1OosPW96GRdu0I=", - "module": "sha256-c3xgISaYbfye+GcGN+INItEGsYZntSXEmED2dFsmo10=", - "pom": "sha256-2LsV8iADLSVxKM+VuDpER2PO4KTiaJpUS9urkabbNRk=" - }, - "org/springframework/boot#spring-boot-starter-web/3.2.4": { - "jar": "sha256-YD7sNOOuA+G/VZ8VM+g0tAxZ0gxysHXEa4ZlVehpcUA=", - "module": "sha256-5mNnkF/YqgUwA5nUYHKbh0yeVGHUQ5XF8RKMSScReDw=", - "pom": "sha256-Ls5mMK0u7d7UxrBnZ9SzTfx3+jm4549FRY+S9u0fjes=" - }, - "org/springframework/boot#spring-boot-starter/3.2.4": { - "jar": "sha256-L9hZRjMhRTEXoPndsX1GDU7MQz0Q7BDBLnkz4Dpc1tw=", - "module": "sha256-ZadNITSiaVlQI/pbKEqd8v6PFwa6NU6gJ4ts0K6GLGU=", - "pom": "sha256-8lZomjiyuFTAQoXap1041mwqacK/QK2Nz4dBDKmahPA=" - }, - "org/springframework/boot#spring-boot-test-autoconfigure/3.2.4": { - "jar": "sha256-xRGtoYwbzGwxuM6+Yk+78bN6mfsIT/1lHrN+6pHgYdY=", - "module": "sha256-B2KbO0M7AJgbZdDBW++/oBySubjqIxsTsy/a1Fv84Ag=", - "pom": "sha256-cJiOKwXyrLN9wyDKavIh4dtNA4QB0fgyYO1TvJzuZd4=" - }, - "org/springframework/boot#spring-boot-test/3.2.4": { - "jar": "sha256-4o9VYcRXVaI5JX32z62FZWKrpo57dGXLZFsfxIl/66c=", - "module": "sha256-A5GtDR82iY4hMpE/VdxO4UZ8luU604c7/etw8QqgteA=", - "pom": "sha256-ObCg+EFSTshH2N0orqQo0S6rKyAWhdiHdKG1l5tool0=" - }, - "org/springframework/boot#spring-boot/3.2.4": { - "jar": "sha256-+bu6EGY7vkZ1JkrrBxl2KfG7ysYRGJ+Jh6Rsgvf/uVo=", - "module": "sha256-sUyCr1mB59SKH92P6L2vzlc9kxx99ltnJMztRtXbRdc=", - "pom": "sha256-2+K06VhH4WLufDefQ6m8xes4kKhS7uxQDiJJWSsvPrs=" + "org/springframework/boot#spring-boot-starter-security/3.3.3": { + "jar": "sha256-CZIHz7uRJJcUffXLLLP+Flg0z7P9bVBxNVjEmFaedSM=", + "module": "sha256-FRjYKR/TgSaXG5Q2Tct2tyAf0PtHjaauc3K0PnIalNI=", + "pom": "sha256-HmJAJiOKA2e4EV4aURQM7P/IAteOlwLZJb6Od8KHo5k=" + }, + "org/springframework/boot#spring-boot-starter-test/3.3.3": { + "jar": "sha256-AI4ei5CNbpXTYRN14o7kafJvS6dqfzxCNPwy4AP605s=", + "module": "sha256-hh+ixlqrT4uXNdwbL2xRne+mSVlWbPMG9ZdI7Xra9uc=", + "pom": "sha256-whVzqqrU3vbalhRNWhJPEOqUipTIRVp7890QQ2ZqCdc=" + }, + "org/springframework/boot#spring-boot-starter-thymeleaf/3.3.3": { + "jar": "sha256-tyT8jyhlULdsrrwKs8Klv+q5zsWwLGuW21/5R5EHj7Q=", + "module": "sha256-uxKYSj1FcAGcMcg6LCchkqMhlPLlBeLVT7updLwy8g8=", + "pom": "sha256-0PnSxrEZGSmh62WyZqvUCkR+EYnyiY2KUmlbt1KKwNs=" + }, + "org/springframework/boot#spring-boot-starter-tomcat/3.3.3": { + "module": "sha256-gqNQsznFvFVvtrQa21SjZWa2P1GaCwciu4J+6ATNA40=", + "pom": "sha256-CIpedDvlnXcUjmHqsf/szbM0ej6czfxmerlQXIDnQIY=" + }, + "org/springframework/boot#spring-boot-starter-web/3.3.3": { + "jar": "sha256-4MUrXbgjmjzsXTvf84uolT4JejJflzTqyNjinJyXPw8=", + "module": "sha256-VwEcN82+JK3+GsCm/2vavD7qypw4bTGWQQw/0b/5278=", + "pom": "sha256-Ne4F6DhJkDCEHov0hvIEf6yhOMJk4pfAjyIm8y8xDSk=" + }, + "org/springframework/boot#spring-boot-starter/3.3.3": { + "jar": "sha256-ipNJmoxD/qwTEjX9S4hSB3jR2IngEiQknjOq5bkAod8=", + "module": "sha256-pHs7v7Qxy99nxYzoy+9lAR+oG728u3SgZAFsrPICXR4=", + "pom": "sha256-A0XHriNxIaMINYEhc02WiuViIQFZ0mXld+ZiypI1fWs=" + }, + "org/springframework/boot#spring-boot-test-autoconfigure/3.3.3": { + "jar": "sha256-P7TbxV/b78P6fwUY7owIOfWCC59Cxh+9tvLDkJQL7H8=", + "module": "sha256-utHcyo/rq7H7KMYyR9luQgwIvATNTdUaFGi+nAPr6TI=", + "pom": "sha256-nvanD0tVVKL4sqdCUOC98n/NzJCjiiSTR7FI8IL8yZY=" + }, + "org/springframework/boot#spring-boot-test/3.3.3": { + "jar": "sha256-S9qi4BovimkdlOf2TDrKZuzG52nSDH0x1kEzzLccIlg=", + "module": "sha256-WmigsG5CzkWLxm9O1zFrKwm8QMRnopAJ3f289bgcgQU=", + "pom": "sha256-MFM/JB4QlYhbsdS+wx2+pycXLCJ+ifvlDji61HMslVw=" + }, + "org/springframework/boot#spring-boot/3.3.3": { + "jar": "sha256-Zfnp+qEw6u+3i2X+TYk4NIZLqRF8/0v+IjnuExyjs6o=", + "module": "sha256-sDR7AWx8szcQRq1FsDUVhGUXfpE8ZHQbVR5dYyDwUGM=", + "pom": "sha256-pFVAtzdElmL+wgr5nVlYIx/Cg+F/aR9z7wPlmiRWQ0k=" }, "org/springframework/data#spring-data-bom/2023.0.2": { "pom": "sha256-r5JYFO1beGWJH9CGEGBVcLS7hFCi9Rv55bhjXNNoHgQ=" }, - "org/springframework/data#spring-data-bom/2023.1.4": { - "pom": "sha256-/o7BqXiJbhaY1SHehZAgxzcMuwwJcvg+ivelhjh2YLQ=" + "org/springframework/data#spring-data-bom/2024.0.3": { + "pom": "sha256-oRnTY0THGKAnk8SvmnB7rFEvlRQ8HhxTuSCHCkQ+dCI=" }, - "org/springframework/data#spring-data-commons/3.2.4": { - "jar": "sha256-NdlUQqtHbkbZrE1gB0+bnDCxjBBv0exx0daMANgID20=", - "pom": "sha256-mWK4Z7iOOkC3J3P2HeHPJXN2LHA5GKAnREg4Is2UW28=" + "org/springframework/data#spring-data-commons/3.3.3": { + "jar": "sha256-GDklxh/hxcbcpSP/BDINB0wAaSttlCIkFfB8MdD003g=", + "pom": "sha256-LAQzKSci9N15p1ftLprzyuie0xuZBbBhXYzOG91hpfg=" }, - "org/springframework/data#spring-data-jpa-parent/3.2.4": { - "pom": "sha256-nQUPSozvyh+SX0xF3rZaM2DBwYU7ugd9MGUheSxB4zk=" + "org/springframework/data#spring-data-jpa-parent/3.3.3": { + "pom": "sha256-jYLHGTBW0ZxrXgpkzQnMQECQ/L8+UoiJaFuga63BP2Q=" }, - "org/springframework/data#spring-data-jpa/3.2.4": { - "jar": "sha256-mCeFLgIRhSnHTNviPdQyacxVUMqksAz+baiUkgD8zJo=", - "pom": "sha256-m5x8wh8EuArrW5HaofqhCN3mRJrJqZnH9DmcnuX72tg=" + "org/springframework/data#spring-data-jpa/3.3.3": { + "jar": "sha256-xQy8pH1Z6qPXdhHjchljKiCcIW9IV9Nhjfyrvgtb7A0=", + "pom": "sha256-BxEkYRsRA73zgVF+63+CzPnD8ovOHjLvXInl5iYbVh8=" }, - "org/springframework/data/build#spring-data-build/3.2.4": { - "pom": "sha256-4yRJ0xvTcBm+/zrQr7Wylmme7BrALVpgYWlOjjmR+DY=" + "org/springframework/data/build#spring-data-build/3.3.3": { + "pom": "sha256-PR6nlloFVB5WlvrcsjPXd4lDpSGO+xBc9WBTJwSiMUA=" }, - "org/springframework/data/build#spring-data-parent/3.2.4": { - "pom": "sha256-ERQ+XCTTLtCF1jfagA/0ITmf2RUO/8UV380l8Y+pQa4=" + "org/springframework/data/build#spring-data-parent/3.3.3": { + "pom": "sha256-7lhfrM5yJbJjJYkVDT8zUdULhKtgzbudZNU0ehjS7KU=" }, "org/springframework/integration#spring-integration-bom/6.1.2": { "pom": "sha256-0mxOaZYUSD15O82BeZxUTtpYlXYrSzGXFX7tAo7GL+c=" }, - "org/springframework/integration#spring-integration-bom/6.2.3": { - "module": "sha256-NalcbsQOkaB/xJQh8OHI82Ae/Yg0P5GffYL62PpC318=", - "pom": "sha256-imipyWBFoXiOfs3aBwqvNwYT/jpyYfYrtbBBOXs3aI0=" + "org/springframework/integration#spring-integration-bom/6.3.3": { + "module": "sha256-4G2ff/AE5rIXIM7mTB4eTLz2p/F9YOX8a/hVcr+ZGAk=", + "pom": "sha256-Qtk7GmD4VaFBciWxl//uoIRX9OmSTP1lDApxGJ4oRuE=" }, - "org/springframework/pulsar#spring-pulsar-bom/1.0.4": { - "module": "sha256-zi4j7BIPd3hz/BoiscQVZW9aek2OZHFE1Y7nUYFhBwU=", - "pom": "sha256-GFpoIFAhC4R2imyGxL5DvjKfuqeCnIgDzUwZBTXHG74=" + "org/springframework/pulsar#spring-pulsar-bom/1.1.3": { + "module": "sha256-N+CeG+oqv+uQ18KW+Vt2LFKaluuDTg5CibNIRlsigaU=", + "pom": "sha256-OZFprHySNZldO5qv5NXem/Ucb7gRt34cTnZyTlICC9E=" }, "org/springframework/restdocs#spring-restdocs-bom/3.0.0": { "pom": "sha256-/8nEe+Wo60iO3pJozgiaeZyT6JT7G9P5QPYsRnpmEyM=" @@ -1698,55 +1745,55 @@ "module": "sha256-HMJ40imEfP7hLpBd9w5W5W4eo2m+LKd3S/u60EtbMos=", "pom": "sha256-P0nGqe8bTNCnKRAzAyshnLkmzIPX3KlutclyzSQnI44=" }, - "org/springframework/security#spring-security-bom/6.2.3": { - "module": "sha256-f84oRRxjgixv0HNVa/nTgKjHjB/SdlMxC2s5J22iNsE=", - "pom": "sha256-gMuEACI3nqzsIjYnas19+8DFenkhBnuAlrMspnein9w=" - }, - "org/springframework/security#spring-security-config/6.2.3": { - "jar": "sha256-DgdWeH0RK+ufxrA45sqKwJ8fF5Hn1BZ7p+d7C9jMtZU=", - "module": "sha256-xZyqjp8OT+xpiGpJnm+cmfIN64keizk/kkT+nSxAkkI=", - "pom": "sha256-NjSHendEXyFnJRwFFlwHSePBFeAvdeIADyI21eI9mOs=" - }, - "org/springframework/security#spring-security-core/6.2.3": { - "jar": "sha256-K/5zefSpk6lnCrn1ldzhDNDx2KpE02k1AG+uL8b7ro4=", - "module": "sha256-FSCaQ+9sWr+zqJ3zlrRHMOZirDsm5zMnGUA6y/COw6k=", - "pom": "sha256-kijsMZ42lwTLW3be6PjuE2YCNEJhcEY0TgWfeiDqjYQ=" - }, - "org/springframework/security#spring-security-crypto/6.2.3": { - "jar": "sha256-S4/0AkG0addIiMxuQSz7qDk7diCuMFImubLy0zhOojY=", - "module": "sha256-1Z819TgD+L3X6u5pfriOQmNk1fki0e+A9lXZSD8w5VQ=", - "pom": "sha256-tYVxm1x8aS1mIEgp74HqSRNzvkd+7Hz3Hz2kuyvIStg=" - }, - "org/springframework/security#spring-security-oauth2-client/6.2.3": { - "jar": "sha256-dQU2HZlKEc65EruqbBg4S91cKfNo08LLtlOhJUPWCh8=", - "module": "sha256-WFFQJVcahVA3bjvDbwiB51YZPYIs4nRS/g6VZAKdjoQ=", - "pom": "sha256-OZPCiABfsTWoh97Q2xiU1nJCcFna/Hr1K9lv3uPgkRs=" - }, - "org/springframework/security#spring-security-oauth2-core/6.2.3": { - "jar": "sha256-7GfsWYypjmSZu9+B3/iOOVg3PaYNme7Jv79q1AcATvg=", - "module": "sha256-tPQigzzqjx3uF2Ln9wSNVlwFU5WBFXgm/AmdzPHipZ4=", - "pom": "sha256-VhY1V59db2HsEzjLuMhcW0VxUQoxiUbkEYq9o5mHdqM=" - }, - "org/springframework/security#spring-security-oauth2-jose/6.2.3": { - "jar": "sha256-xeExSPNakMj0SD3YKXaxRwVJwii4iFsDB8MTIVdyX60=", - "module": "sha256-JoA2U5+6FHT1wfQCgSf3UH5YLboMdkssM2OCFvFXWlM=", - "pom": "sha256-z/1HGThaaSlzCcQH0a6Q3UUI6qJ/RVSYomVJIj98HKo=" - }, - "org/springframework/security#spring-security-web/6.2.3": { - "jar": "sha256-jn4vSk7LjAwHjMr2QKKqxyc4YJVKCpiLH60WfWN6J4g=", - "module": "sha256-SF+TouUqLcNDpsX/UtxcFgvBUwAA7JBfUfBpihtpXLQ=", - "pom": "sha256-ZZP6CHlOVrNi0/3cpN8ekWOFpE9bON5uwsoPzSMEAKk=" + "org/springframework/security#spring-security-bom/6.3.3": { + "module": "sha256-kTKmxBqYZ4xUDkUaNrv0ZCFJalswy0rXf73Dl5cnnLc=", + "pom": "sha256-5Y6DOSLjyl/6ZaRuBL+CY3TXB2n9+xDxBA71D3QptlY=" + }, + "org/springframework/security#spring-security-config/6.3.3": { + "jar": "sha256-672m0SlDFoZXbXZBW2O6Y9dt/NC+JUii5Q6JmStGYsI=", + "module": "sha256-dIEluCvITAfMoxhdGi1XN6x81kx+pRF2HTycDjnVAnw=", + "pom": "sha256-H13TQVrtRbAhWH+twdgjXLe+XpZd/fKU7+9MSThGWfc=" + }, + "org/springframework/security#spring-security-core/6.3.3": { + "jar": "sha256-1s6q03Ccx+MD8iulW1eTPneHva39FxqA/+latu6/+bg=", + "module": "sha256-HIz+YwaELL1vVbofztwdqEut+RSbcFm04/LT61459GY=", + "pom": "sha256-DJXgTi2a5q+mN0L68WtiforbQQlYXyAHZ4WkyViLlOY=" + }, + "org/springframework/security#spring-security-crypto/6.3.3": { + "jar": "sha256-xiH5rLR7Q15qgqzaAjh1zftCFuhlKzd2QqXq+zESQe0=", + "module": "sha256-u680Eu4WZIQXNU2V/mbgP1+9Re620KCvukct0GXLTQQ=", + "pom": "sha256-uIotsoiGNWVyfufPgCcq712Qsz7ROhh7rUQ50B+RRNc=" + }, + "org/springframework/security#spring-security-oauth2-client/6.3.3": { + "jar": "sha256-Xgkwluq82K0RzUYThPl4cEM0pt2tLVZCl+zdikD2cGI=", + "module": "sha256-oM2kD5ojLO6Qla5LFY3UoC/xJCqairVUqYOdY2vF640=", + "pom": "sha256-X7Q7AeudQZUidqdx4HAMxltQm67LfaR9xmROO9Gn+wc=" + }, + "org/springframework/security#spring-security-oauth2-core/6.3.3": { + "jar": "sha256-xu2bUUlLrtFs9VDk6etvgd+TtwsMyiJIslJuQzuxtWc=", + "module": "sha256-ZNjvScYEIVH/ljTFSKVQhRV9Uj01LBvJq602WwI7u2w=", + "pom": "sha256-psaXfbhPPyUJVe+ZN8YuqH5juNaTz98/XhkOhiYMU9Y=" + }, + "org/springframework/security#spring-security-oauth2-jose/6.3.3": { + "jar": "sha256-WeTRlrh2f0kmoBqidUaK+PAaq+nINpXDURr7AY7FwiA=", + "module": "sha256-gXJgEt1f1pXGpR3BTaDThSLg7v65mEhxQ2+Drt4z46k=", + "pom": "sha256-ohcRc2UqxxLnTo4m/E7m/hiesCcp4rtKnxHwk9s80AQ=" + }, + "org/springframework/security#spring-security-web/6.3.3": { + "jar": "sha256-Xk2dmWl4c31l+LI/OriqREtxXSDfsZNtRCrJw0Modvs=", + "module": "sha256-oC71Y2BWFpewD5hMf9I3YOhEARFC1p19SgM/PwDO6FQ=", + "pom": "sha256-H/FDVEt3wkM6XpCAkwxNZcJB1tQNjErZ0ekXkINj3V8=" }, "org/springframework/session#spring-session-bom/3.1.1": { "module": "sha256-1pUWyPsAHxEYTRTC/WPXiiXTt3H27w40+UMFo+/cYyc=", "pom": "sha256-yKH2TVmHtfeggnybjVe/dSegTYM/7o7EXlKD7kKTwV0=" }, - "org/springframework/session#spring-session-bom/3.2.2": { - "module": "sha256-HETW6djPKtvw3VzVzAgnvlyDfHKGLGvoYQdOdzMXhPo=", - "pom": "sha256-xUZFF0k+pgCmhLEeGlZNGrW4ebU48i+CjbXC7/623HM=" + "org/springframework/session#spring-session-bom/3.3.2": { + "module": "sha256-c8QjNnOut9RIA7C3VsORpxxJI8SczWRFKJ6nYY2LUUg=", + "pom": "sha256-JeeeGvx/vk1PpbtBeEDynti/+RknxUfnuySo1aDOG3E=" }, - "org/springframework/ws#spring-ws-bom/4.0.10": { - "pom": "sha256-1BQ8nGc3RNef88ZLWSPKP7oDaeLC+W4uPnx2LAyLY/o=" + "org/springframework/ws#spring-ws-bom/4.0.11": { + "pom": "sha256-ebcaocK/ikSdMKx+g6qJOo0Ah5L8KUvIYCYVUvoQ7fA=" }, "org/springframework/ws#spring-ws-bom/4.0.5": { "pom": "sha256-8OjPCyFD18APnTYVoZy7cPI+Qy+B8OcCi91a0/KBo/w=" @@ -1754,11 +1801,8 @@ "org/testcontainers#testcontainers-bom/1.18.3": { "pom": "sha256-l0dtYsuLXM/NHLrmkmHEk3v36BtWUw2oKmZJ4w3DHMw=" }, - "org/testcontainers#testcontainers-bom/1.19.3": { - "pom": "sha256-0L6xP4gXPdXI4XgioXWun7r17homxyAfafZYpW5SqeU=" - }, - "org/testcontainers#testcontainers-bom/1.19.7": { - "pom": "sha256-bDMp72KWE8iKyQI7fa4oHOHdh6AO+hg5ah2pErDJRPQ=" + "org/testcontainers#testcontainers-bom/1.19.8": { + "pom": "sha256-Nk8kRkvSboev9GTi1JF9PMTS9FNCwuMuupvmphk8lUs=" }, "org/thymeleaf#thymeleaf-lib/3.1.2.RELEASE": { "pom": "sha256-+BG2hU0QZoLGjwYOUMk3ONhXOaq8UKOYiP3FnWZlu+Q=" @@ -1808,12 +1852,6 @@ "xml-apis#xml-apis/1.4.01": { "jar": "sha256-qECWgXZkVoS7Aa7TduBnqzlhSIX57uRKvjWl8g6+f60=", "pom": "sha256-Cagv8VCshr+jEUXgpq/YmgLkUEeF9doRLk+uFCUCDpI=" - }, - "xmlpull#xmlpull/1.1.3.1": { - "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" - }, - "xpp3#xpp3_min/1.1.4c": { - "pom": "sha256-tbRqwMCdpBsE28dTRWtIkShWp/+7FJBnaRC1EMRx0T8=" } } } diff --git a/pkgs/by-name/st/stirling-pdf/package.nix b/pkgs/by-name/st/stirling-pdf/package.nix index f1bea01c79d55..565c2c1dfbc74 100644 --- a/pkgs/by-name/st/stirling-pdf/package.nix +++ b/pkgs/by-name/st/stirling-pdf/package.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "stirling-pdf"; - version = "0.26.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "Stirling-Tools"; repo = "Stirling-PDF"; rev = "v${finalAttrs.version}"; - hash = "sha256-msxP2n8Varc7/h9RVwYRBuD253JZu6/p7zQC1lmNmqc="; + hash = "sha256-pdk8TG+wtFjV3Opv42wovlZ0CNWl4jC/PSVYsDyH0Gw="; }; patches = [ @@ -58,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = { changelog = "https://github.com/Stirling-Tools/Stirling-PDF/releases/tag/v${finalAttrs.version}"; description = "Locally hosted web application that allows you to perform various operations on PDF files"; diff --git a/pkgs/by-name/st/stirling-pdf/update.sh b/pkgs/by-name/st/stirling-pdf/update.sh new file mode 100755 index 0000000000000..ca9a479c6ef0c --- /dev/null +++ b/pkgs/by-name/st/stirling-pdf/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update + +nix-update stirling-pdf +$(nix-build -A stirling-pdf.mitmCache.updateScript) + diff --git a/pkgs/by-name/st/stormlib/package.nix b/pkgs/by-name/st/stormlib/package.nix index 90a748ca801f5..090ada0d89f79 100644 --- a/pkgs/by-name/st/stormlib/package.nix +++ b/pkgs/by-name/st/stormlib/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { libtomcrypt zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Carbon ]; @@ -56,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ aanderse karolchmist ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin; # installation directory mismatch + broken = stdenv.hostPlatform.isDarwin; # installation directory mismatch }; }) diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix index 1549d2c6e1c9c..c739ffa83e0b9 100644 --- a/pkgs/by-name/st/streamdeck-ui/package.nix +++ b/pkgs/by-name/st/streamdeck-ui/package.nix @@ -11,35 +11,28 @@ xvfb-run, }: -let - # There are breaking changes between 6 and 7 - importlib-metadata_6 = python3Packages.importlib-metadata.overrideAttrs (_: rec { - version = "6.9.0"; - src = fetchPypi { - pname = "importlib_metadata"; - inherit version; - hash = "sha256-6Ky1I8M1qRgiZ04Um0bAOZ7E0yjE0fbknCc9pf8CAbk="; - }; - }); -in - python3Packages.buildPythonApplication rec { pname = "streamdeck-ui"; - version = "4.1.2"; + version = "4.1.3"; + pyproject = true; src = fetchFromGitHub { repo = "streamdeck-linux-gui"; owner = "streamdeck-linux-gui"; rev = "v${version}"; - hash = "sha256-CSsFPGnKVQUCND6YOA9kfO41KS85C57YL9LcrWlQRKo="; + hash = "sha256-KpsW3EycYRYU5YOg7NNGv5eeZbS9MAikj0Ke2ybPzAU="; }; - format = "pyproject"; + pythonRelaxDeps = [ + "importlib-metadata" + "pillow" + ]; - pythonRelaxDeps = [ "pillow" ]; + build-system = [ + python3Packages.poetry-core + ]; nativeBuildInputs = [ - python3Packages.poetry-core copyDesktopItems qt6.wrapQtAppsHook wrapGAppsHook3 @@ -56,10 +49,10 @@ python3Packages.buildPythonApplication rec { pyside6 streamdeck xlib - importlib-metadata_6 + importlib-metadata evdev ] - ++ lib.optionals stdenv.isLinux [ qt6.qtwayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; nativeCheckInputs = [ xvfb-run ] @@ -128,6 +121,7 @@ python3Packages.buildPythonApplication rec { ]; meta = { + changelog = "https://github.com/streamdeck-linux-gui/streamdeck-linux-gui/releases/tag/v${version}"; description = "Linux compatible UI for the Elgato Stream Deck"; downloadPage = "https://github.com/streamdeck-linux-gui/streamdeck-linux-gui/"; homepage = "https://streamdeck-linux-gui.github.io/streamdeck-linux-gui/"; diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix index e543f6ed5017b..49475a7f46a8a 100644 --- a/pkgs/by-name/st/strictdoc/package.nix +++ b/pkgs/by-name/st/strictdoc/package.nix @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { xlsxwriter ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { development = [ invoke tox diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix index 05c46f784ad7c..8dc8b8fcaba25 100644 --- a/pkgs/by-name/st/stu/package.nix +++ b/pkgs/by-name/st/stu/package.nix @@ -8,7 +8,7 @@ testers, }: let - version = "0.5.1"; + version = "0.6.3"; in rustPlatform.buildRustPackage { pname = "stu"; @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage { owner = "lusingander"; repo = "stu"; rev = "v${version}"; - hash = "sha256-JLsUMZDXK89QmHLlGG9i5L+1e/redjk5ff6NiZdNsYo="; + hash = "sha256-+hncQQSCYpVuRBQSHMNsfD89K+vL1LUJrCqrBIaRW1E="; }; - cargoHash = "sha256-1sAK+F0Wghz2X78OzYJ3QN+5sdpNQw/pxHof0IoJPQo="; + cargoHash = "sha256-tWgUVe8VLmEfroF4O3YfzU9yPerpKizuICWeSzsbV38="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreGraphics ]; diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix new file mode 100644 index 0000000000000..ddf631ff8de59 --- /dev/null +++ b/pkgs/by-name/st/stylelint/package.nix @@ -0,0 +1,32 @@ +{ + buildNpmPackage, + fetchFromGitHub, + lib, +}: + +let + version = "16.9.0"; +in +buildNpmPackage { + pname = "stylelint"; + inherit version; + + src = fetchFromGitHub { + owner = "stylelint"; + repo = "stylelint"; + rev = version; + hash = "sha256-yMj6X3VI/CKw1VdRXV+7FVJQ6rdZ4E4v069wJZq3+dg="; + }; + + npmDepsHash = "sha256-Ylkx4FPsfEZTy1y2Be0RURHooAev0Z8ew3MJ2wOXjO4="; + + dontNpmBuild = true; + + meta = { + description = "Mighty CSS linter that helps you avoid errors and enforce conventions"; + mainProgram = "stylelint"; + homepage = "https://stylelint.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ momeemt ]; + }; +} diff --git a/pkgs/by-name/su/su-exec/package.nix b/pkgs/by-name/su/su-exec/package.nix index f9ab5d503f5b2..2af4591784ab2 100644 --- a/pkgs/by-name/su/su-exec/package.nix +++ b/pkgs/by-name/su/su-exec/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "ncopa"; repo = "su-exec"; rev = "v${version}"; - sha256 = "12vqlnpv48cjfh25sn98k1myc7h2wiv5qw2y2awgp6sipzv88abv"; + hash = "sha256-eymE9r9Rm/u4El5wXHbkAh7ma5goWV0EdJIhsq+leIs="; }; installPhase = '' diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix index e672b04c2436a..7de6d0ba2f4a1 100644 --- a/pkgs/by-name/su/subtitleedit/package.nix +++ b/pkgs/by-name/su/subtitleedit/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "subtitleedit"; - version = "4.0.7"; + version = "4.0.8"; src = fetchzip { url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${ lib.replaceStrings [ "." ] [ "" ] version }.zip"; - hash = "sha256-7BTW0wqlxyxtXu4aBVQXMQ1mUdSINn+S6W7XPL5pcSI="; + hash = "sha256-pUCuAxCljRu1fXPQIBDWtkC17RBD+Bv6Nx5Tw/ACuXw="; stripRoot = false; }; diff --git a/pkgs/by-name/su/sums/package.nix b/pkgs/by-name/su/sums/package.nix new file mode 100644 index 0000000000000..bc0cc25d2c798 --- /dev/null +++ b/pkgs/by-name/su/sums/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + mpfr, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sums"; + version = "0.11"; + + src = fetchFromGitLab { + owner = "leesonwai"; + repo = "sums"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-D8BkrStS6IwkWy8J7YRHIhyJ68kX4Dky0Vbphn6CsVM="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + mpfr + ]; + + meta = { + description = "Simple GTK postfix calculator for GNOME"; + homepage = "https://gitlab.com/leesonwai/sums"; + license = lib.licenses.gpl3Plus; + mainProgram = "sums"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/su/sunpaper/package.nix b/pkgs/by-name/su/sunpaper/package.nix index 8aa569922bf95..fa9917a2d2af1 100644 --- a/pkgs/by-name/su/sunpaper/package.nix +++ b/pkgs/by-name/su/sunpaper/package.nix @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/hexive/sunpaper"; license = lib.licenses.asl20; mainProgram = "sunpaper"; - maintainers = with lib.maintainers; [ eclairevoyant jevy ]; + maintainers = with lib.maintainers; [ jevy ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index 9bb594a3751eb..d788afe3e88e3 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "superfile"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "yorukot"; repo = "superfile"; rev = "v${version}"; - hash = "sha256-ajLlXySf/YLHrwwacV5yIF8qU5pKvEoOwpDoxh49qaU="; + hash = "sha256-/MdcfZpYr7vvPIq0rqLrPRPPU+cyp2y0EyxQPf9znwQ="; }; - vendorHash = "sha256-vybe4KNj6ZhvXRTiN7e5+IhOewfK5L2jKPrcdCYGc4k="; + vendorHash = "sha256-8WGmksKH0rmfRH6Xxd0ACl1FS7YPphG7hsIB5/o38lQ="; ldflags = ["-s" "-w"]; diff --git a/pkgs/by-name/su/superhtml/deps.nix b/pkgs/by-name/su/superhtml/deps.nix new file mode 100644 index 0000000000000..c85582239480d --- /dev/null +++ b/pkgs/by-name/su/superhtml/deps.nix @@ -0,0 +1,61 @@ +{ + linkFarm, + fetchzip, + fetchgit, +}: +linkFarm "zig-packages" [ + { + name = "1220b9ce6dc0e1fbcd9e7b406ab164344f81774351495f860a90729187c3c058ef4f"; + path = fetchgit { + url = "https://github.com/kristoff-it/zig-lsp-kit"; + rev = "b4bf61d7fbf9cf7cfdb6f01b211947d2de3e42fd"; + hash = "sha256-6mlnPTLBXZQwWXstV+h1PAKtMq8RGcJM2dRJ8NqqqtU="; + }; + } + { + name = "1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d"; + path = fetchzip { + url = "https://github.com/ziglibs/diffz/archive/ef45c00d655e5e40faf35afbbde81a1fa5ed7ffb.tar.gz"; + hash = "sha256-5/3W0Xt9RjsvCb8Q4cdaM8dkJP7CdFro14JJLCuqASo="; + }; + } + { + name = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147"; + path = fetchgit { + url = "https://github.com/ziglibs/known-folders.git"; + rev = "0ad514dcfb7525e32ae349b9acc0a53976f3a9fa"; + hash = "sha256-X+XkFj56MkYxxN9LUisjnkfCxUfnbkzBWHy9pwg5M+g="; + }; + } + { + name = "122014e78d7c69d93595993b3231f3141368e22634b332b0b91a2fb73a8570f147a5"; + path = fetchgit { + url = "https://github.com/kristoff-it/scripty"; + rev = "df8c11380f9e9bec34809f2242fb116d27cf39d6"; + hash = "sha256-qVm8pIfT1mHL1zanqYdFm/6AVH8poXKqLtz4+2j+F/A="; + }; + } + { + name = "1220f2d8402bb7bbc4786b9c0aad73910929ea209cbd3b063842371d68abfed33c1e"; + path = fetchgit { + url = "https://github.com/kristoff-it/zig-afl-kit"; + rev = "f003bfe714f2964c90939fdc940d5993190a66ec"; + hash = "sha256-tJ6Ln1SY4WjFZXUWQmgggsUfkd59QgmIpgdInMuv4PI="; + }; + } + { + name = "1220010a1edd8631b2644476517024992f8e57f453bdb68668720bb590d168faf7c8"; + path = fetchgit { + url = "https://github.com/allyourcodebase/AFLplusplus"; + rev = "032984eabf5a35af386a3d0e542df7686da339c1"; + hash = "sha256-KB3QnKAQQ+5CKvJVrhMveMGpF3NTrlwpIyLHVIB96hs="; + }; + } + { + name = "12200966011c3dd6979d6aa88fe23061fdc6da1f584a6fb1f7682053a0b01e409dbc"; + path = fetchzip { + url = "https://github.com/AFLplusplus/AFLplusplus/archive/v4.21c.tar.gz"; + hash = "sha256-DKwPRxSO+JEJYWLldnfrAYqzwqukNzrbo4R5FzJqzzg="; + }; + } +] diff --git a/pkgs/by-name/su/superhtml/package.nix b/pkgs/by-name/su/superhtml/package.nix new file mode 100644 index 0000000000000..e12dfd5fbbd65 --- /dev/null +++ b/pkgs/by-name/su/superhtml/package.nix @@ -0,0 +1,35 @@ +{ + lib, + callPackage, + fetchFromGitHub, + stdenv, + zig, +}: +stdenv.mkDerivation rec { + pname = "superhtml"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "kristoff-it"; + repo = "superhtml"; + rev = "refs/tags/v${version}"; + hash = "sha256-E4IVDYps6K+SdemkfwtTjOE+Rdu8m4Itfd3Kv0XO7qk="; + }; + + nativeBuildInputs = [ + zig.hook + ]; + + postPatch = '' + ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ''; + + meta = with lib; { + description = "HTML Language Server and Templating Language Library"; + homepage = "https://github.com/kristoff-it/superhtml"; + license = licenses.mit; + mainProgram = "superhtml"; + maintainers = with maintainers; [ petertriho ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/su/supermariowar/package.nix b/pkgs/by-name/su/supermariowar/package.nix index dd813563ea60d..4199d48469e48 100644 --- a/pkgs/by-name/su/supermariowar/package.nix +++ b/pkgs/by-name/su/supermariowar/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "supermariowar"; - version = "2023-unstable-2024-07-16"; + version = "2023-unstable-2024-09-21"; src = fetchFromGitHub { owner = "mmatyas"; repo = "supermariowar"; - rev = "0ba445f425d03a444b3814bcd5898590ef8845b9"; - hash = "sha256-4a34m1f7LRA48RZwHLa2Sv3oeTakPZ3ezFv3rEuKmqM="; + rev = "7e7ebe39cadba5d0bd9d7e87a08264332c2f1f12"; + hash = "sha256-kBwaqw0GZvLWE5GqgfieLRU4s8wYFtTZyl1MgwWGbMc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/su/superscs/package.nix b/pkgs/by-name/su/superscs/package.nix index f558bec8a2089..ae5fb5537be43 100644 --- a/pkgs/by-name/su/superscs/package.nix +++ b/pkgs/by-name/su/superscs/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Qu7RM6Ew4hEmoIXO0utDDVmjmNX3yt3FxWZXCQ/Xjp4="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace-fail \ ".so" \ ".dylib" diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index a3674efe5d005..7964d31d96505 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -16,7 +16,7 @@ , waylandSupport ? false }: -assert waylandSupport -> stdenv.isLinux; +assert waylandSupport -> stdenv.hostPlatform.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; @@ -34,7 +34,7 @@ buildGoModule rec { nativeBuildInputs = [ copyDesktopItems pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; @@ -44,20 +44,20 @@ buildGoModule rec { buildInputs = [ libglvnd mpv-unwrapped - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libXxf86vm xorg.libX11 - ] ++ lib.optionals (stdenv.isLinux && !waylandSupport) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && !waylandSupport) [ xorg.libXrandr xorg.libXinerama xorg.libXcursor xorg.libXi xorg.libXext - ] ++ lib.optionals (stdenv.isLinux && waylandSupport) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && waylandSupport) [ wayland wayland-protocols libxkbcommon - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa darwin.apple_sdk_11_0.frameworks.Kernel darwin.apple_sdk_11_0.frameworks.OpenGL diff --git a/pkgs/by-name/su/surfer/Cargo.lock b/pkgs/by-name/su/surfer/Cargo.lock new file mode 100644 index 0000000000000..cdade57054fc5 --- /dev/null +++ b/pkgs/by-name/su/surfer/Cargo.lock @@ -0,0 +1,6184 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b" +dependencies = [ + "enumn", + "serde", +] + +[[package]] +name = "accesskit_consumer" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_macos" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" +dependencies = [ + "accesskit", + "accesskit_consumer", + "objc2 0.3.0-beta.3.patch-leaks.3", + "once_cell", +] + +[[package]] +name = "accesskit_unix" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f46c18d99ba61ad7123dd13eeb0c104436ab6af1df6a1cd8c11054ed394a08" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel", + "async-once-cell", + "atspi", + "futures-lite 1.13.0", + "once_cell", + "serde", + "zbus 3.15.2", +] + +[[package]] +name = "accesskit_windows" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b" +dependencies = [ + "accesskit", + "accesskit_consumer", + "once_cell", + "paste", + "static_assertions", + "windows", +] + +[[package]] +name = "accesskit_winit" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5284218aca17d9e150164428a0ebc7b955f70e3a9a78b4c20894513aabf98a67" +dependencies = [ + "accesskit", + "accesskit_macos", + "accesskit_unix", + "accesskit_windows", + "winit", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "serde", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.5.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[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.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +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 = "arboard" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +dependencies = [ + "clipboard-win", + "log", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot", + "x11rb", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ashpd" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus 4.2.2", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-broadcast" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy 0.5.2", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy 0.5.2", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.0", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-once-cell" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-process" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +dependencies = [ + "async-channel", + "async-io 2.3.2", + "async-lock 3.3.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "async-signal" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +dependencies = [ + "async-io 2.3.2", + "async-lock 3.3.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atspi" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" +dependencies = [ + "atspi-common", + "atspi-connection", + "atspi-proxies", +] + +[[package]] +name = "atspi-common" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" +dependencies = [ + "enumflags2", + "serde", + "static_assertions", + "zbus 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "atspi-connection" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" +dependencies = [ + "atspi-common", + "atspi-proxies", + "futures-lite 1.13.0", + "zbus 3.15.2", +] + +[[package]] +name = "atspi-proxies" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" +dependencies = [ + "atspi-common", + "serde", + "zbus 3.15.2", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "beef" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.5.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.66", + "which", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +dependencies = [ + "objc-sys 0.2.0-beta.2", +] + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys 0.3.5", +] + +[[package]] +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "block-sys 0.1.0-beta.1", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys 0.2.1", + "objc2 0.4.1", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "bytesize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.5.0", + "log", + "polling 3.7.0", + "rustix 0.38.34", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.34", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "camino" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +dependencies = [ + "serde", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +dependencies = [ + "jobserver", + "libc", + "once_cell", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cgl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" +dependencies = [ + "libc", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.52.5", +] + +[[package]] +name = "clang-sys" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f803f94ecf597339c7a34eed2036ef83f86aaba937f001f7c5b5e251f043f1f9" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "clipboard-win" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +dependencies = [ + "error-code", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan" +version = "0.12.0" +source = "git+https://gitlab.com/spade-lang/codespan.git?branch=master#a5656af9ed33460258fd1921bc6bede1ba0fb00e" +dependencies = [ + "codespan-reporting", + "serde", +] + +[[package]] +name = "codespan-reporting" +version = "0.12.0" +source = "git+https://gitlab.com/spade-lang/codespan.git?branch=master#a5656af9ed33460258fd1921bc6bede1ba0fb00e" +dependencies = [ + "serde", + "termcolor", + "unicode-width", +] + +[[package]] +name = "color-eyre" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "colored" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" +dependencies = [ + "is-terminal", + "lazy_static", + "winapi", +] + +[[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 = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "config" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" +dependencies = [ + "lazy_static", + "nom", + "pathdiff", + "serde", + "toml", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive-where" +version = "1.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dssim" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "602609b3cbc9836fecf7311edd130b8cd6c04302b1923dd0fc9589ea221bfa6d" +dependencies = [ + "crossbeam-channel", + "dssim-core", + "getopts", + "imgref", + "load_image", + "lodepng", + "ordered-channel", + "rayon", + "rgb", +] + +[[package]] +name = "dssim-core" +version = "3.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c074fca6cdf5e3faaaf03f71e29cd5d92ea533b1432cf78910dafffc2ce872b" +dependencies = [ + "imgref", + "itertools 0.12.1", + "rayon", + "rgb", +] + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "ecolor" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57539aabcdbb733b6806ef421b66dec158dc1582107ad6d51913db3600303354" +dependencies = [ + "bytemuck", + "serde", +] + +[[package]] +name = "eframe" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79c00143a1d564cf27570234c9a199cbe75dc3d43a135510fb2b93406a87ee8e" +dependencies = [ + "bytemuck", + "cocoa", + "egui", + "egui-winit", + "egui_glow", + "glow", + "glutin", + "glutin-winit", + "image 0.24.9", + "js-sys", + "log", + "objc", + "parking_lot", + "percent-encoding", + "raw-window-handle 0.5.2", + "static_assertions", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winapi", + "winit", +] + +[[package]] +name = "egui" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0bf640ed7f3bf3d14ebf00d73bacc09c886443ee84ca6494bde37953012c9e3" +dependencies = [ + "accesskit", + "ahash", + "epaint", + "log", + "nohash-hasher", + "serde", +] + +[[package]] +name = "egui-remixicon" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673b30730f1e0026b1596942a1fbb008a69d821562de38fd22116e6e82b2ac2c" + +[[package]] +name = "egui-winit" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d95d9762056c541bd2724de02910d8bccf3af8e37689dc114b21730e64f80a0" +dependencies = [ + "accesskit_winit", + "arboard", + "egui", + "log", + "raw-window-handle 0.5.2", + "smithay-clipboard", + "web-time 0.2.4", + "webbrowser", + "winit", +] + +[[package]] +name = "egui_extras" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "753c36d3e2f7a32425af5290af2e52efb3471ea3a263b87f003b5433351b0fd7" +dependencies = [ + "egui", + "enum-map", + "log", + "serde", +] + +[[package]] +name = "egui_glow" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb2ef815e80d117339c7d6b813f7678d23522d699ccd3243e267ef06166009b9" +dependencies = [ + "bytemuck", + "egui", + "glow", + "log", + "memoffset 0.7.1", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "egui_plot" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a159fffebf052f79d1fd26d48e68906a21fec2fce808f7c0a982ec14ed506be" +dependencies = [ + "egui", +] + +[[package]] +name = "egui_skia" +version = "0.5.0" +source = "git+https://github.com/TheZoq2/egui_skia.git#604a092ae1c24abac940e45fb83771dfc69c6620" +dependencies = [ + "egui", + "skia-safe", +] + +[[package]] +name = "either" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" + +[[package]] +name = "emath" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee58355767587db7ba3738930d93cad3052cd834c2b48b9ef6ef26fe4823b7e" +dependencies = [ + "bytemuck", + "serde", +] + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enum-iterator" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c280b9e6b3ae19e152d8e31cf47f18389781e119d4013a2a2bb0180e5facc635" +dependencies = [ + "enum-iterator-derive", +] + +[[package]] +name = "enum-iterator-derive" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "enum-map" +version = "2.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" +dependencies = [ + "enum-map-derive", + "serde", +] + +[[package]] +name = "enum-map-derive" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "enumn" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", +] + +[[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "log", +] + +[[package]] +name = "epaint" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e638cb066bff0903bbb6143116cfd134a42279c7d68f19c0352a94f15a402de7" +dependencies = [ + "ab_glyph", + "ahash", + "bytemuck", + "ecolor", + "emath", + "log", + "nohash-hasher", + "parking_lot", + "serde", +] + +[[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 = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "f128" +version = "0.2.9" +dependencies = [ + "f128_input", + "f128_internal", + "libc", + "num-traits", +] + +[[package]] +name = "f128_input" +version = "0.2.1" +dependencies = [ + "f128_internal", +] + +[[package]] +name = "f128_internal" +version = "0.2.2" +dependencies = [ + "cc", + "libc", + "num-traits", +] + +[[package]] +name = "fallible_collections" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" +dependencies = [ + "hashbrown 0.13.2", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "fern" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +dependencies = [ + "colored 1.9.4", + "log", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fst-native" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dd6d296401ddf3c26e65a5543a1551b9e7e7f802c464444a1d7b9c0ccc4d9b" +dependencies = [ + "flate2", + "lz4_flex", + "num_enum", + "tempfile", + "thiserror", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fuzzy-matcher" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +dependencies = [ + "thread_local", +] + +[[package]] +name = "fzcmd" +version = "0.1.0" +dependencies = [ + "fuzzy-matcher", + "lazy_static", + "regex", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[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", + "url", +] + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746" +dependencies = [ + "bitflags 2.5.0", + "cfg_aliases", + "cgl", + "core-foundation", + "dispatch", + "glutin_egl_sys", + "glutin_glx_sys", + "glutin_wgl_sys", + "icrate", + "libloading", + "objc2 0.4.1", + "once_cell", + "raw-window-handle 0.5.2", + "wayland-sys", + "windows-sys 0.48.0", + "x11-dl", +] + +[[package]] +name = "glutin-winit" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebcdfba24f73b8412c5181e56f092b5eff16671c514ce896b258a0a64bd7735" +dependencies = [ + "cfg_aliases", + "glutin", + "raw-window-handle 0.5.2", + "winit", +] + +[[package]] +name = "glutin_egl_sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77cc5623f5309ef433c3dd4ca1223195347fe62c413da8e2fdd0eb76db2d9bcd" +dependencies = [ + "gl_generator", + "windows-sys 0.48.0", +] + +[[package]] +name = "glutin_glx_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a165fd686c10dcc2d45380b35796e577eacfd43d4660ee741ec8ebe2201b3b4f" +dependencies = [ + "gl_generator", + "x11-dl", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[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 = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "human-sort" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140a09c9305e6d5e557e2ed7cbc68e05765a7d4213975b87cb04920689cc6219" + +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2 0.3.0", + "dispatch", + "objc2 0.4.1", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", + "png", +] + +[[package]] +name = "image" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +dependencies = [ + "bytemuck", + "byteorder", + "num-traits", + "png", +] + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "instruction-decoder" +version = "0.1.0" +dependencies = [ + "toml", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lcms2" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "680ec3fa42c36e0af9ca02f20a3742a82229c7f1ee0e6754294de46a80be6f74" +dependencies = [ + "bytemuck", + "foreign-types 0.5.0", + "lcms2-sys", +] + +[[package]] +name = "lcms2-sys" +version = "4.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "593265f9a3172180024fb62580ee31348f31be924b19416da174ebb7fb623d2e" +dependencies = [ + "cc", + "dunce", + "libc", + "pkg-config", +] + +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[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", + "libz-sys", + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.5", +] + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.5.0", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[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.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "load_image" +version = "3.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c73d7e075d05bdcc5ff4cf16b35b50b2be696b93c1be1b32201fb32c35a814" +dependencies = [ + "bytemuck", + "imgref", + "jpeg-decoder", + "lcms2", + "lodepng", + "quick-error", + "rexif", + "rgb", +] + +[[package]] +name = "local-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e36d656622c9ac5c84be07696931c71e483d27daf86914d7011d0fa6370418b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[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 = "lodepng" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a42d298694b14401847de29abd44adf278b42e989e516deac7b72018400002d8" +dependencies = [ + "crc32fast", + "fallible_collections", + "flate2", + "libc", + "rgb", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "logos" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c000ca4d908ff18ac99b93a062cb8958d331c3220719c52e77cb19cc6ac5d2c1" +dependencies = [ + "logos-derive", +] + +[[package]] +name = "logos-codegen" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc487311295e0002e452025d6b580b77bb17286de87b57138f3b5db711cded68" +dependencies = [ + "beef", + "fnv", + "proc-macro2", + "quote", + "regex-syntax 0.6.29", + "syn 2.0.66", +] + +[[package]] +name = "logos-derive" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbfc0d229f1f42d790440136d941afd806bc9e949e2bcb8faa813b0f00d1267e" +dependencies = [ + "logos-codegen", +] + +[[package]] +name = "lz4_flex" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" +dependencies = [ + "twox-hash", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.5.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.2", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nesty" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dac700f47763ee1984f0034c1b606e84fb00002cd2fbaabdd5a5473cf9e90ef5" + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset 0.9.1", +] + +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +dependencies = [ + "num-integer", + "num-traits", + "serde", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.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", + "serde", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.3.0-beta.3.patch-leaks.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +dependencies = [ + "block2 0.2.0-alpha.6", + "objc-sys 0.2.0-beta.2", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys 0.3.5", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys 0.3.5", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys 0.2.0-beta.2", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[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 = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox 0.0.2", +] + +[[package]] +name = "ordered-channel" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f0bc569ca0974cb90125f52cf76f7b6ad3a072301beba78eb0aa4174c4964ed" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" +dependencies = [ + "ttf-parser", +] + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.1", + "smallvec", + "windows-targets 0.52.5", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.3.9", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] + +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.66", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro2" +version = "1.0.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "project-root" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df" + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "pure-rust-locales" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1190fd18ae6ce9e137184f207593877e70f39b015040156b1e05081cdfe3733a" + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[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.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox 0.1.3", + "thiserror", +] + +[[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 0.4.6", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg", +] + +[[package]] +name = "rexif" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49352965b70522af9085d7a8c2a6df7494713c67ac58b9af02bcff7fb4ca1483" +dependencies = [ + "num", +] + +[[package]] +name = "rfd" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +dependencies = [ + "ashpd", + "block", + "dispatch", + "js-sys", + "log", + "objc", + "objc-foundation", + "objc_id", + "pollster", + "raw-window-handle 0.6.2", + "urlencoding", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64 0.21.7", + "bitflags 2.5.0", + "serde", + "serde_derive", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-webpki" +version = "0.102.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sctk-adwaita" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +dependencies = [ + "ab_glyph", + "log", + "memmap2", + "smithay-client-toolkit", + "tiny-skia", +] + +[[package]] +name = "security-framework" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +dependencies = [ + "bitflags 2.5.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[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 = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_stacker" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "babfccff5773ff80657f0ecf553c7c516bdc2eb16389c0918b36b73e7015276e" +dependencies = [ + "serde", + "stacker", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "skia-bindings" +version = "0.69.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b4b5af96ee7d895763fa606f4531fddfb11de034217edd0c7beb9ea181efe5b" +dependencies = [ + "bindgen", + "cc", + "flate2", + "heck 0.4.1", + "lazy_static", + "regex", + "serde_json", + "tar", + "toml", + "ureq", +] + +[[package]] +name = "skia-safe" +version = "0.69.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3d25acaedea0a8ed1dac52f383fc90276f5679a68e3f84c5fb7f7bde8934ff" +dependencies = [ + "bitflags 2.5.0", + "lazy_static", + "skia-bindings", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.5.0", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix 0.38.34", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +dependencies = [ + "libc", + "smithay-client-toolkit", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "softposit" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8091c9c836e6d8cd1d510e65c4b8e7eb42b9ad876d95723cd35982e5c38f7ee1" +dependencies = [ + "num-traits", +] + +[[package]] +name = "spade" +version = "0.6.0" +dependencies = [ + "atty", + "clap", + "codespan", + "codespan-reporting", + "color-eyre", + "colored 2.1.0", + "indoc", + "itertools 0.12.1", + "logos", + "ron", + "serde", + "spade-ast", + "spade-ast-lowering", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-hir-lowering", + "spade-macros", + "spade-mir", + "spade-parser", + "spade-typeinference", + "spade-types", + "spade-wordlength-inference", + "thiserror", + "tracing", + "tracing-subscriber", + "tracing-tree", +] + +[[package]] +name = "spade-ast" +version = "0.6.0" +dependencies = [ + "num", + "spade-common", +] + +[[package]] +name = "spade-ast-lowering" +version = "0.6.0" +dependencies = [ + "itertools 0.12.1", + "local-impl", + "num", + "pretty_assertions", + "spade-ast", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-macros", + "spade-types", + "tracing", +] + +[[package]] +name = "spade-common" +version = "0.6.0" +dependencies = [ + "codespan", + "codespan-reporting", + "logos", + "num", + "serde", + "tracing", +] + +[[package]] +name = "spade-diagnostics" +version = "0.6.0" +dependencies = [ + "codespan", + "codespan-reporting", + "colored 2.1.0", + "itertools 0.12.1", + "local-impl", + "logos", + "spade-ast", + "spade-common", + "spade-macros", + "thiserror", + "tracing", +] + +[[package]] +name = "spade-hir" +version = "0.6.0" +dependencies = [ + "codespan-reporting", + "colored 2.1.0", + "itertools 0.12.1", + "local-impl", + "num", + "serde", + "spade-common", + "spade-diagnostics", + "spade-types", + "tap", + "thiserror", + "tracing", +] + +[[package]] +name = "spade-hir-lowering" +version = "0.6.0" +dependencies = [ + "codespan", + "codespan-reporting", + "indoc", + "itertools 0.12.1", + "local-impl", + "num", + "serde", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-macros", + "spade-mir", + "spade-typeinference", + "spade-types", + "spade-wordlength-inference", + "thiserror", + "tracing", +] + +[[package]] +name = "spade-macros" +version = "0.6.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "spade-mir" +version = "0.6.0" +dependencies = [ + "codespan", + "codespan-reporting", + "derive-where", + "indoc", + "itertools 0.12.1", + "logos", + "nesty", + "num", + "serde", + "spade-common", + "spade-diagnostics", + "spade-macros", +] + +[[package]] +name = "spade-parser" +version = "0.6.0" +dependencies = [ + "codespan", + "codespan-reporting", + "colored 2.1.0", + "itertools 0.12.1", + "local-impl", + "logos", + "num", + "spade-ast", + "spade-common", + "spade-diagnostics", + "spade-macros", + "thiserror", + "tracing", +] + +[[package]] +name = "spade-typeinference" +version = "0.6.0" +dependencies = [ + "codespan", + "codespan-reporting", + "colored 2.1.0", + "itertools 0.12.1", + "local-impl", + "num", + "serde", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-macros", + "spade-types", + "thiserror", + "tracing", +] + +[[package]] +name = "spade-types" +version = "0.6.0" +dependencies = [ + "num", + "serde", + "spade-common", +] + +[[package]] +name = "spade-wordlength-inference" +version = "0.6.0" +dependencies = [ + "codespan", + "codespan-reporting", + "colored 2.1.0", + "local-impl", + "num", + "serde", + "spade-ast", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-macros", + "spade-parser", + "spade-typeinference", + "spade-types", + "thiserror", + "tracing", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "surfer" +version = "0.2.0" +dependencies = [ + "base64 0.22.1", + "bincode", + "bytes", + "bytesize", + "camino", + "chrono", + "clap", + "color-eyre", + "config", + "console_error_panic_hook", + "derivative", + "derive_more", + "directories", + "dssim", + "eframe", + "egui-remixicon", + "egui_extras", + "egui_plot", + "egui_skia", + "enum-iterator", + "f128", + "fern", + "futures", + "futures-core", + "futures-util", + "fuzzy-matcher", + "fzcmd", + "half", + "http-body-util", + "human-sort", + "hyper", + "hyper-util", + "image 0.25.1", + "instruction-decoder", + "itertools 0.13.0", + "lazy_static", + "log", + "lz4_flex", + "num", + "project-root", + "pure-rust-locales", + "rand", + "rayon", + "regex", + "reqwest", + "rfd", + "rgb", + "ron", + "serde", + "serde_json", + "serde_stacker", + "skia-safe", + "softposit", + "spade", + "spade-common", + "spade-hir-lowering", + "spade-types", + "sys-locale", + "test-log", + "tokio", + "toml", + "vergen", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "web-time 1.1.0", + "wellen", + "winapi", +] + +[[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 = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tar" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "test-log" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" +dependencies = [ + "env_logger", + "test-log-macros", + "tracing-subscriber", +] + +[[package]] +name = "test-log-macros" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[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 = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.13", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.9", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log 0.2.0", +] + +[[package]] +name = "tracing-tree" +version = "0.2.0" +source = "git+https://github.com/jonathanmorley/tracing-tree?rev=8b97ec6e50e3f755644d1a0aaf4c45a2112607b2#8b97ec6e50e3f755644d1a0aaf4c45a2112607b2" +dependencies = [ + "ansi_term", + "atty", + "tracing-core", + "tracing-log 0.1.4", + "tracing-subscriber", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "ttf-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[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.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-pki-types", + "rustls-webpki", + "url", + "webpki-roots", +] + +[[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", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vergen" +version = "8.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +dependencies = [ + "anyhow", + "cfg-if", + "git2", + "rustversion", + "time", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.66", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.34", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +dependencies = [ + "bitflags 2.5.0", + "rustix 0.38.34", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.5.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +dependencies = [ + "rustix 0.38.34", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webbrowser" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" +dependencies = [ + "core-foundation", + "home", + "jni", + "log", + "ndk-context", + "objc", + "raw-window-handle 0.5.2", + "url", + "web-sys", +] + +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "wellen" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "049e8d599dba738042de478fdd1ef007f5659a36a27c69e30cec30c7fe486935" +dependencies = [ + "bytesize", + "fst-native", + "leb128", + "lz4_flex", + "memmap2", + "num_enum", + "rayon", + "serde", + "thiserror", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.34", +] + +[[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-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-interface" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winit" +version = "0.29.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.5.0", + "bytemuck", + "calloop", + "cfg_aliases", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2", + "ndk", + "ndk-sys", + "objc2 0.4.1", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.2", + "redox_syscall 0.3.5", + "rustix 0.38.34", + "sctk-adwaita", + "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", + "web-sys", + "web-time 0.2.4", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading", + "once_cell", + "rustix 0.38.34", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys 0.4.14", + "rustix 0.38.34", +] + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.5.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast 0.5.1", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process 1.8.1", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" +dependencies = [ + "async-broadcast 0.7.0", + "async-process 2.2.2", + "async-recursion", + "async-trait", + "enumflags2", + "event-listener 5.3.1", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.28.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.2.2", + "zbus_names 3.0.0", + "zvariant 4.1.1", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zbus_macros" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.66", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.1.1", +] + +[[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive 3.15.2", +] + +[[package]] +name = "zvariant" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "url", + "zvariant_derive 4.1.1", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.66", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix new file mode 100644 index 0000000000000..52fc985cf0c91 --- /dev/null +++ b/pkgs/by-name/su/surfer/package.nix @@ -0,0 +1,77 @@ +{ + lib, + fetchFromGitLab, + rustPlatform, + pkg-config, + openssl, + wayland, + autoPatchelfHook, + libxkbcommon, + libGL, + libX11, + libXcursor, + libXi, + stdenv, + makeWrapper, + zenity, +}: +rustPlatform.buildRustPackage rec { + pname = "surfer"; + version = "0.2.0"; + + src = fetchFromGitLab { + owner = "surfer-project"; + repo = "surfer"; + rev = "v${version}"; + hash = "sha256-C5jyWLs7fdEn2oW5BORZYazQwjXNxf8ketYFwlVkHpA"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pkg-config + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + openssl + stdenv.cc.cc.lib + ]; + + # Wayland and X11 libs are required at runtime since winit uses dlopen + runtimeDependencies = [ + wayland + libxkbcommon + libGL + libX11 + libXcursor + libXi + ]; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "codespan-0.12.0" = "sha256-3F2006BR3hyhxcUTaQiOjzTEuRECKJKjIDyXonS/lrE="; + "egui_skia-0.5.0" = "sha256-dpkcIMPW+v742Ov18vjycLDwnn1JMsvbX6qdnuKOBC4="; + "tracing-tree-0.2.0" = "sha256-/JNeAKjAXmKPh0et8958yS7joORDbid9dhFB0VUAhZc="; + }; + }; + + # Avoid the network attempt from skia. See: https://github.com/cargo2nix/cargo2nix/issues/318 + doCheck = false; + + postFixup = '' + wrapProgram $out/bin/surfer \ + --prefix PATH : ${lib.makeBinPath [ zenity ]} + ''; + + meta = { + description = "Extensible and Snappy Waveform Viewer"; + homepage = "https://surfer-project.org/"; + changelog = "https://gitlab.com/surfer-project/surfer/-/releases/v${version}"; + license = lib.licenses.eupl12; + maintainers = with lib.maintainers; [ hakan-demirli ]; + platforms = lib.platforms.linux; + mainProgram = "surfer"; + }; +} diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 5f4ec81470ec9..a7065e119d123 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -16,20 +16,16 @@ let in rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "1.5.4"; + version = "2.0.2"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-KtR+qU2Xys4NkEARZBbO8mTPa7EI9JplWvXdtuLt2vE="; + hash = "sha256-kTTZx/IXXJrkC0qm4Nx0hYPbricNjwFshCq0aFYCTo0="; }; - cargoPatches = [ - ./time.patch # TODO: remove when https://github.com/surrealdb/surrealdb/pull/4565 merged - ]; - - cargoHash = "sha256-5qIIPdE6HYov5EIR4do+pMeZ1Lo3at39aKOP9scfMy8="; + cargoHash = "sha256-K62RqJqYyuAPwm8zLIiASH7kbw6raXS6ZzINMevWav0="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' @@ -50,7 +46,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; doCheck = false; diff --git a/pkgs/by-name/su/surrealdb/time.patch b/pkgs/by-name/su/surrealdb/time.patch deleted file mode 100644 index ef0ecfe698c47..0000000000000 --- a/pkgs/by-name/su/surrealdb/time.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 64b3955f..b4598827 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -6478,9 +6478,9 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.34" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", -@@ -6499,9 +6499,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.17" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ - "num-conv", - "time-core", diff --git a/pkgs/by-name/su/surrealist/0001-Cargo.patch b/pkgs/by-name/su/surrealist/0001-Cargo.patch new file mode 100644 index 0000000000000..9b175cc9a50e6 --- /dev/null +++ b/pkgs/by-name/su/surrealist/0001-Cargo.patch @@ -0,0 +1,148 @@ +diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock +index 55f480a8..a69f9ed9 100644 +--- a/src-tauri/Cargo.lock ++++ b/src-tauri/Cargo.lock +@@ -1839,6 +1839,22 @@ dependencies = [ + "tower-service", + ] + ++[[package]] ++name = "hyper-tls" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" ++dependencies = [ ++ "bytes", ++ "http-body-util", ++ "hyper", ++ "hyper-util", ++ "native-tls", ++ "tokio", ++ "tokio-native-tls", ++ "tower-service", ++] ++ + [[package]] + name = "hyper-util" + version = "0.1.3" +@@ -2302,6 +2318,23 @@ dependencies = [ + "windows-sys 0.52.0", + ] + ++[[package]] ++name = "native-tls" ++version = "0.2.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" ++dependencies = [ ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", ++] ++ + [[package]] + name = "ndk" + version = "0.7.0" +@@ -2511,6 +2544,12 @@ dependencies = [ + "syn 2.0.50", + ] + ++[[package]] ++name = "openssl-probe" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" ++ + [[package]] + name = "openssl-src" + version = "300.2.3+3.2.1" +@@ -3416,6 +3455,15 @@ dependencies = [ + "winapi-util", + ] + ++[[package]] ++name = "schannel" ++version = "0.1.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" ++dependencies = [ ++ "windows-sys 0.52.0", ++] ++ + [[package]] + name = "schemars" + version = "0.8.19" +@@ -3460,6 +3508,29 @@ version = "4.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + ++[[package]] ++name = "security-framework" ++version = "2.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" ++dependencies = [ ++ "bitflags 1.3.2", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "2.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ + [[package]] + name = "selectors" + version = "0.22.0" +@@ -3847,6 +3918,7 @@ name = "surrealist" + version = "0.0.0" + dependencies = [ + "dirs", ++ "hyper-tls", + "log", + "openssl", + "portpicker", +@@ -4563,6 +4635,16 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "tokio-native-tls" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" ++dependencies = [ ++ "native-tls", ++ "tokio", ++] ++ + [[package]] + name = "tokio-rustls" + version = "0.25.0" +diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml +index 3e3ab7ee..b6612f95 100644 +--- a/src-tauri/Cargo.toml ++++ b/src-tauri/Cargo.toml +@@ -28,6 +28,8 @@ time = { version = "0.3", default-features = false} + log = "^0.4" + url = "2" + ++hyper-tls = "0.6.0" ++ + [target.'cfg(target_os = "linux")'.dependencies] + openssl = { version = "0.10.64", features = ["vendored"] } + diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 69278f94bec30..849294960b47e 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -5,9 +5,10 @@ , esbuild , fetchFromGitHub , gdk-pixbuf +, glib-networking , gobject-introspection , lib -, libsoup +, libsoup_3 , makeBinaryWrapper , nodejs , openssl @@ -17,13 +18,29 @@ , rustc , rustPlatform , stdenv -, stdenvNoCC -, webkitgtk +, webkitgtk_4_1 }: let - - esbuild-20-2 = let version = "0.20.2"; + cargo-tauri_2 = let + version = "2.0.0-rc.3"; + src = fetchFromGitHub { + owner = "tauri-apps"; + repo = "tauri"; + rev = "tauri-v${version}"; + hash = "sha256-PV8m/MzYgbY4Hv71dZrqVbrxmxrwFfOAraLJIaQk6FQ="; + }; + in cargo-tauri.overrideAttrs (drv: { + inherit src version; + cargoDeps = drv.cargoDeps.overrideAttrs (lib.const { + inherit src; + name = "tauri-${version}-vendor.tar.gz"; + outputHash = "sha256-BrIH0JkGMp68O+4B+0g7X3lSdNSPXo+otlBgslCzPZE="; + }); + }); + + esbuild_21-5 = let + version = "0.21.5"; in esbuild.override { buildGoModule = args: buildGoModule (args // { @@ -32,7 +49,7 @@ let owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY="; + hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); @@ -40,86 +57,70 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "surrealist"; - version = "2.0.6"; + version = "2.1.6"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealist"; rev = "surrealist-v${finalAttrs.version}"; - hash = "sha256-5OiVqn+ujssxXZXC6pnGiG1Nw8cAhoDU5IIl9skywBw="; + hash = "sha256-jOjOdrVOcGPenFW5mkkXKA64C6c+/f9KzlvtUmw6vXc="; }; - sourceRoot = "${finalAttrs.src.name}/src-tauri"; - - ui = stdenvNoCC.mkDerivation { - inherit (finalAttrs) src version; - pname = "${finalAttrs.pname}-ui"; - - pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pname version src; - hash = "sha256-apvU7nanzueaF7PEQL7EKjVT5z1M6I7PZpEIJxfKuCQ="; - }; - - ESBUILD_BINARY_PATH = "${lib.getExe esbuild-20-2}"; - - nativeBuildInputs = [ nodejs pnpm.configHook ]; - - buildPhase = '' - runHook preBuild - - pnpm build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cp -r dist $out - - runHook postInstall - ''; - }; + # HACK: A dependency (surrealist -> tauri -> **reqwest**) contains hyper-tls + # as an actually optional dependency. It ends up in the `Cargo.lock` file of + # tauri, but not in the one of surrealist. We apply a patch to `Cargo.toml` + # and `Cargo.lock` to ensure that we have it in our vendor archive. This may + # be a result of the following bug: + # https://github.com/rust-lang/cargo/issues/10801 + patches = [ + ./0001-Cargo.patch + ]; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) src sourceRoot version; + inherit (finalAttrs) patches src; + sourceRoot = finalAttrs.cargoRoot; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-uE4r0smgSbl4l77/MsHtn1Ar5fqspsYcLC/u8TUrcu8="; + hash = "sha256-LtQS0kH+2P4odV7BJYiH6T51+iZHAM9W9mV96rNfNWs="; + }; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-zGs1MWJ8TEFuHOoekCNIKQo2PBnp95xLz+R8mzeJXh8="; }; nativeBuildInputs = [ cargo - cargo-tauri + (cargo-tauri.hook.override { cargo-tauri = cargo-tauri_2; }) + gobject-introspection makeBinaryWrapper + nodejs + pnpm.configHook pkg-config rustc rustPlatform.cargoSetupHook ]; - buildInputs = - [ cairo gdk-pixbuf gobject-introspection libsoup openssl pango webkitgtk ]; + buildInputs = [ + cairo + gdk-pixbuf + libsoup_3 + openssl + pango + webkitgtk_4_1 + ]; env = { + ESBUILD_BINARY_PATH = lib.getExe esbuild_21-5; OPENSSL_NO_VENDOR = 1; }; - postPatch = '' - substituteInPlace ./tauri.conf.json \ - --replace-fail '"distDir": "../dist",' '"distDir": "${finalAttrs.ui}",' \ - --replace-fail '"beforeBuildCommand": "pnpm build",' '"beforeBuildCommand": "",' - ''; - - postBuild = '' - cargo tauri build --bundles deb - ''; - - postInstall = '' - install -Dm555 target/release/bundle/deb/surrealist_${finalAttrs.version}_*/data/usr/bin/surrealist -t $out/bin - cp -r target/release/bundle/deb/surrealist_${finalAttrs.version}_*/data/usr/share $out - ''; + cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; postFixup = '' - wrapProgram "$out/bin/surrealist" --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + wrapProgram "$out/bin/surrealist" \ + --set GIO_EXTRA_MODULES ${glib-networking}/lib/gio/modules \ + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 ''; meta = with lib; { diff --git a/pkgs/by-name/su/sus-compiler/Cargo.lock b/pkgs/by-name/su/sus-compiler/Cargo.lock new file mode 100644 index 0000000000000..56bc269bde505 --- /dev/null +++ b/pkgs/by-name/su/sus-compiler/Cargo.lock @@ -0,0 +1,624 @@ +# 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 = "ariadne" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44055e597c674aef7cb903b2b9f6e4cba1277ed0d2d61dae7cd52d7ffa81f8e2" +dependencies = [ + "unicode-width", + "yansi", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cc" +version = "1.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800" +dependencies = [ + "shlex", +] + +[[package]] +name = "clap" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags", + "clap_lex", + "indexmap", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lsp-server" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9" +dependencies = [ + "crossbeam-channel", + "log", + "serde", + "serde_json", +] + +[[package]] +name = "lsp-types" +version = "0.94.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" +dependencies = [ + "bitflags", + "serde", + "serde_json", + "serde_repr", + "url", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "sus-proc-macro" +version = "0.0.1" +dependencies = [ + "quote", + "syn 1.0.109", + "tree-sitter", + "tree-sitter-sus", +] + +[[package]] +name = "sus_compiler" +version = "0.0.2" +dependencies = [ + "ariadne", + "clap", + "lsp-server", + "lsp-types", + "num", + "serde", + "serde_json", + "sus-proc-macro", + "tree-sitter", + "tree-sitter-sus", +] + +[[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.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-sus" +version = "0.0.2" +dependencies = [ + "cc", + "tree-sitter", +] + +[[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.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[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-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" diff --git a/pkgs/by-name/su/sus-compiler/package.nix b/pkgs/by-name/su/sus-compiler/package.nix new file mode 100644 index 0000000000000..adc2bf9b4e7da --- /dev/null +++ b/pkgs/by-name/su/sus-compiler/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "sus-compiler"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "pc2"; + repo = "sus-compiler"; + rev = "v${version}"; + hash = "sha256-f93uT6ELW3T2Xd539EfZCf2LSbxcYnEX+smmLzBAxqc="; + fetchSubmodules = true; + }; + + # no lockfile upstream + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/sus_compiler"; + + meta = { + description = "A new Hardware Design Language that keeps you in the driver's seat"; + homepage = "https://github.com/pc2/sus-compiler"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ pbsds ]; + mainProgram = "sus_compiler"; + }; +} diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix index fa2f495ffd12b..bbcaec75a4125 100644 --- a/pkgs/by-name/su/sushi/package.nix +++ b/pkgs/by-name/su/sushi/package.nix @@ -76,7 +76,8 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://en.wikipedia.org/wiki/Sushi_(software)"; + homepage = "https://gitlab.gnome.org/GNOME/sushi"; + changelog = "https://gitlab.gnome.org/GNOME/sushi/-/blob/${version}/NEWS?ref_type=tags"; description = "Quick previewer for Nautilus"; mainProgram = "sushi"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/sv/svelte-language-server/package-lock.json b/pkgs/by-name/sv/svelte-language-server/package-lock.json index 80a5d948e2e35..753fd47f09f37 100644 --- a/pkgs/by-name/sv/svelte-language-server/package-lock.json +++ b/pkgs/by-name/sv/svelte-language-server/package-lock.json @@ -1,32 +1,31 @@ { "name": "svelte-language-server", - "version": "0.16.14", + "version": "0.17.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "svelte-language-server", - "version": "0.16.14", + "version": "0.17.0", "license": "MIT", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.17", + "@jridgewell/trace-mapping": "^0.3.25", "@vscode/emmet-helper": "2.8.4", "chokidar": "^3.4.1", "estree-walker": "^2.0.1", - "fast-glob": "^3.2.7", + "fdir": "^6.2.0", "lodash": "^4.17.21", - "prettier": "~3.2.5", - "prettier-plugin-svelte": "^3.2.2", - "svelte": "^3.57.0", - "svelte-preprocess": "^5.1.3", + "prettier": "~3.3.3", + "prettier-plugin-svelte": "^3.2.6", + "svelte": "^4.2.19", "svelte2tsx": "~0.7.0", "typescript": "^5.5.2", "typescript-auto-import-cache": "^0.3.3", "vscode-css-languageservice": "~6.3.0", "vscode-html-languageservice": "~5.3.0", - "vscode-languageserver": "8.0.2", - "vscode-languageserver-protocol": "3.17.2", - "vscode-languageserver-types": "3.17.2", + "vscode-languageserver": "9.0.1", + "vscode-languageserver-protocol": "3.17.5", + "vscode-languageserver-types": "3.17.5", "vscode-uri": "~3.0.0" }, "bin": { @@ -36,8 +35,7 @@ "@types/estree": "^0.0.42", "@types/lodash": "^4.14.116", "@types/mocha": "^9.1.0", - "@types/node": "^16.0.0", - "@types/prettier": "^2.2.3", + "@types/node": "^18.0.0", "@types/sinon": "^7.5.2", "cross-env": "^7.0.2", "mocha": "^9.2.0", @@ -45,7 +43,20 @@ "ts-node": "^10.0.0" }, "engines": { - "node": ">= 12.0.0" + "node": ">= 18.0.0" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "license": "Apache-2.0", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" } }, "node_modules/@cspotcode/source-map-support": { @@ -53,6 +64,7 @@ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "0.3.9" }, @@ -65,6 +77,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -74,6 +87,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz", "integrity": "sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==", + "license": "MIT", "dependencies": { "@emmetio/scanner": "^1.0.4" } @@ -82,6 +96,7 @@ "version": "2.1.8", "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz", "integrity": "sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw==", + "license": "MIT", "dependencies": { "@emmetio/scanner": "^1.0.4" } @@ -89,12 +104,37 @@ "node_modules/@emmetio/scanner": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.4.tgz", - "integrity": "sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==" + "integrity": "sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==", + "license": "MIT" + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "license": "MIT", + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -102,54 +142,25 @@ "node_modules/@jridgewell/sourcemap-codec": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", - "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==" + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@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==", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/@sinonjs/commons": { "version": "1.8.6", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "type-detect": "4.0.8" } @@ -159,6 +170,7 @@ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz", "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^1.7.0" } @@ -168,6 +180,7 @@ "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.3.tgz", "integrity": "sha512-nhOb2dWPeb1sd3IQXL/dVPnKHDOAFfvichtBf4xV00/rU1QbPCQqKMbvIheIjqwVjh7qIgf2AHTHi391yMOMpQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^1.6.0", "lodash.get": "^4.4.2", @@ -175,86 +188,89 @@ } }, "node_modules/@sinonjs/text-encoding": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz", - "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==", - "dev": true + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", + "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", + "dev": true, + "license": "(Unlicense OR Apache-2.0)" }, "node_modules/@tsconfig/node10": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@tsconfig/node12": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@tsconfig/node14": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@tsconfig/node16": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/estree": { "version": "0.0.42", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz", "integrity": "sha512-K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ==", - "dev": true + "license": "MIT" }, "node_modules/@types/lodash": { "version": "4.17.7", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.7.tgz", "integrity": "sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/mocha": { "version": "9.1.1", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz", "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/node": { - "version": "16.18.104", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.104.tgz", - "integrity": "sha512-OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ==", - "dev": true - }, - "node_modules/@types/prettier": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz", - "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==", - "dev": true - }, - "node_modules/@types/pug": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@types/pug/-/pug-2.0.10.tgz", - "integrity": "sha512-Sk/uYFOBAB7mb74XcpizmH0KOR2Pv3D2Hmrh1Dmy5BmK3MpdSa5kqZcg6EKBdklU0bFXX9gCfzvpnyUehrPIuA==" + "version": "18.19.50", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.50.tgz", + "integrity": "sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/sinon": { "version": "7.5.2", "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.5.2.tgz", "integrity": "sha512-T+m89VdXj/eidZyejvmoP9jivXgBDdkOSBVQjU9kF349NEx10QdPNGxHeZUaj1IlJ32/ewdyXJjnJxyxJroYwg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@ungap/promise-all-settled": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/@vscode/emmet-helper": { "version": "2.8.4", "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz", "integrity": "sha512-lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg==", + "license": "MIT", "dependencies": { "emmet": "^2.3.0", "jsonc-parser": "^2.3.0", @@ -267,18 +283,20 @@ "node_modules/@vscode/emmet-helper/node_modules/vscode-uri": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz", - "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==" + "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==", + "license": "MIT" }, "node_modules/@vscode/l10n": { "version": "0.0.18", "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", - "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==" + "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==", + "license": "MIT" }, "node_modules/acorn": { "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", - "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -291,6 +309,7 @@ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", "dev": true, + "license": "MIT", "dependencies": { "acorn": "^8.11.0" }, @@ -303,6 +322,7 @@ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -312,6 +332,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -321,6 +342,7 @@ "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" }, @@ -335,6 +357,7 @@ "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" @@ -343,27 +366,62 @@ "node": ">= 8" } }, + "node_modules/anymatch/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "dev": true, + "license": "Python-2.0" + }, + "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==", + "license": "Apache-2.0", + "dependencies": { + "dequal": "^2.0.3" + } + }, + "node_modules/axobject-query": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz", + "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==", + "license": "Apache-2.0", + "engines": { + "node": ">= 0.4" + } }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" }, "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" }, @@ -375,6 +433,8 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -384,6 +444,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -395,21 +456,15 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "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==", - "engines": { - "node": ">=8.0.0" - } + "dev": true, + "license": "ISC" }, "node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -422,6 +477,7 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -438,6 +494,7 @@ "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" }, @@ -449,6 +506,7 @@ "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", @@ -473,17 +531,47 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", "wrap-ansi": "^7.0.0" } }, + "node_modules/code-red": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/code-red/-/code-red-1.0.4.tgz", + "integrity": "sha512-7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw==", + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.4.15", + "@types/estree": "^1.0.1", + "acorn": "^8.10.0", + "estree-walker": "^3.0.3", + "periscopic": "^3.1.0" + } + }, + "node_modules/code-red/node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "license": "MIT" + }, + "node_modules/code-red/node_modules/estree-walker": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", + "license": "MIT", + "dependencies": { + "@types/estree": "^1.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==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -495,24 +583,29 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" }, "node_modules/create-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cross-env": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", "dev": true, + "license": "MIT", "dependencies": { "cross-spawn": "^7.0.1" }, @@ -531,6 +624,7 @@ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -540,11 +634,25 @@ "node": ">= 8" } }, + "node_modules/css-tree": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", + "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", + "license": "MIT", + "dependencies": { + "mdn-data": "2.0.30", + "source-map-js": "^1.0.1" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" + } + }, "node_modules/debug": { "version": "4.3.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -561,13 +669,15 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/decamelize": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -578,14 +688,16 @@ "node_modules/dedent-js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dedent-js/-/dedent-js-1.0.1.tgz", - "integrity": "sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==" + "integrity": "sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==", + "license": "MIT" }, - "node_modules/detect-indent": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", - "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", + "node_modules/dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", + "license": "MIT", "engines": { - "node": ">=8" + "node": ">=6" } }, "node_modules/diff": { @@ -593,6 +705,7 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -601,6 +714,7 @@ "version": "2.4.7", "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.7.tgz", "integrity": "sha512-O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA==", + "license": "MIT", "workspaces": [ "./packages/scanner", "./packages/abbreviation", @@ -616,18 +730,15 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/es6-promise": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", - "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==" + "dev": true, + "license": "MIT" }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "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" } @@ -637,6 +748,7 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -647,35 +759,28 @@ "node_modules/estree-walker": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "license": "MIT" }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "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.4" + "node_modules/fdir": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.3.0.tgz", + "integrity": "sha512-QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ==", + "license": "MIT", + "peerDependencies": { + "picomatch": "^3 || ^4" }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dependencies": { - "reusify": "^1.0.4" + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } } }, "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" }, @@ -688,6 +793,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -704,6 +810,7 @@ "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true, + "license": "BSD-3-Clause", "bin": { "flat": "cli.js" } @@ -711,13 +818,16 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -731,6 +841,7 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -740,6 +851,8 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -759,6 +872,7 @@ "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" }, @@ -770,6 +884,8 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -777,16 +893,12 @@ "node": "*" } }, - "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==" - }, "node_modules/growl": { "version": "1.10.5", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4.x" } @@ -796,6 +908,7 @@ "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" } @@ -805,6 +918,7 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true, + "license": "MIT", "bin": { "he": "bin/he" } @@ -814,6 +928,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -822,12 +938,15 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" }, "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" }, @@ -839,6 +958,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -848,6 +968,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -856,6 +977,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -867,6 +989,7 @@ "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" } @@ -876,15 +999,26 @@ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, + "node_modules/is-reference": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.2.tgz", + "integrity": "sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==", + "license": "MIT", + "dependencies": { + "@types/estree": "*" + } + }, "node_modules/is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -896,13 +1030,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -913,19 +1049,28 @@ "node_modules/jsonc-parser": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz", - "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==" + "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==", + "license": "MIT" }, "node_modules/just-extend": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/locate-character": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz", + "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==", + "license": "MIT" }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -939,19 +1084,22 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "license": "MIT" }, "node_modules/lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -967,6 +1115,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "license": "MIT", "dependencies": { "tslib": "^2.0.3" } @@ -975,6 +1124,7 @@ "version": "0.30.11", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", + "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0" } @@ -983,41 +1133,21 @@ "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } + "dev": true, + "license": "ISC" }, - "node_modules/min-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", - "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", - "engines": { - "node": ">=4" - } + "node_modules/mdn-data": { + "version": "2.0.30", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", + "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", + "license": "CC0-1.0" }, "node_modules/minimatch": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz", "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1025,30 +1155,12 @@ "node": ">=10" } }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/mocha": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz", "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==", "dev": true, + "license": "MIT", "dependencies": { "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", @@ -1098,6 +1210,7 @@ "url": "https://paulmillr.com/funding/" } ], + "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -1118,13 +1231,15 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/nanoid": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", "dev": true, + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -1137,6 +1252,7 @@ "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz", "integrity": "sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.0", "@sinonjs/fake-timers": "^11.2.2", @@ -1150,23 +1266,26 @@ "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "type-detect": "4.0.8" } }, "node_modules/nise/node_modules/@sinonjs/fake-timers": { - "version": "11.2.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz", - "integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==", + "version": "11.3.1", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.3.1.tgz", + "integrity": "sha512-EVJO7nW5M/F5Tur0Rf2z/QoMo+1Ia963RiMtapiQrEWvY0iBUvADo8Beegwjpnle5BHkyHuoxSTW3jF43H1XRA==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { - "@sinonjs/commons": "^3.0.0" + "@sinonjs/commons": "^3.0.1" } }, "node_modules/no-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "license": "MIT", "dependencies": { "lower-case": "^2.0.2", "tslib": "^2.0.3" @@ -1176,6 +1295,7 @@ "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" } @@ -1184,6 +1304,8 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", "dependencies": { "wrappy": "1" } @@ -1193,6 +1315,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, + "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -1208,6 +1331,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -1222,6 +1346,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", + "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3" @@ -1232,6 +1357,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -1240,6 +1366,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -1249,6 +1377,7 @@ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -1257,23 +1386,54 @@ "version": "6.2.2", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz", "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/periscopic": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz", + "integrity": "sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==", + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0", + "estree-walker": "^3.0.0", + "is-reference": "^3.0.0" + } + }, + "node_modules/periscopic/node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "license": "MIT" + }, + "node_modules/periscopic/node_modules/estree-walker": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0" + } }, "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.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "license": "MIT", + "optional": true, + "peer": true, "engines": { - "node": ">=8.6" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" } }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, @@ -1288,35 +1448,18 @@ "version": "3.2.6", "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.2.6.tgz", "integrity": "sha512-Y1XWLw7vXUQQZmgv1JAEiLcErqUniAF2wO7QJsw8BVMvpLET2dI5WpEIEJx1r11iHVdSMzQxivyfrH9On9t2IQ==", + "license": "MIT", "peerDependencies": { "prettier": "^3.0.0", "svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0" } }, - "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" - } - ] - }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" } @@ -1325,6 +1468,7 @@ "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" }, @@ -1332,58 +1476,28 @@ "node": ">=8.10.0" } }, + "node_modules/readdirp/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "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" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -1402,23 +1516,14 @@ "type": "consulting", "url": "https://feross.org/support" } - ] - }, - "node_modules/sander": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/sander/-/sander-0.5.1.tgz", - "integrity": "sha512-3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA==", - "dependencies": { - "es6-promise": "^3.1.2", - "graceful-fs": "^4.1.3", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.2" - } + ], + "license": "MIT" }, "node_modules/semver": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -1431,6 +1536,7 @@ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -1440,6 +1546,7 @@ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -1452,6 +1559,7 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -1462,6 +1570,7 @@ "integrity": "sha512-59237HChms4kg7/sXhiRcUzdSkKuydDeTiamT/jesUVHshBgL8XAmhgFo0GfK6RruMDM/iRSij1EybmMog9cJw==", "deprecated": "16.1.1", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^1.8.3", "@sinonjs/fake-timers": "^7.1.2", @@ -1480,6 +1589,7 @@ "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" }, @@ -1487,18 +1597,13 @@ "node": ">=8" } }, - "node_modules/sorcery": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/sorcery/-/sorcery-0.11.1.tgz", - "integrity": "sha512-o7npfeJE6wi6J9l0/5LKshFzZ2rMatRiCDwYeDQaOzqdzRJwALhX7mk/A/ecg6wjMu7wdZbmXfD2S/vpOg0bdQ==", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.14", - "buffer-crc32": "^1.0.0", - "minimist": "^1.2.0", - "sander": "^0.5.0" - }, - "bin": { - "sorcery": "bin/sorcery" + "node_modules/source-map-js": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" } }, "node_modules/string-width": { @@ -1506,6 +1611,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -1520,6 +1626,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -1527,22 +1634,12 @@ "node": ">=8" } }, - "node_modules/strip-indent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", - "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", - "dependencies": { - "min-indent": "^1.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -1555,6 +1652,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -1566,78 +1664,50 @@ } }, "node_modules/svelte": { - "version": "3.59.2", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.59.2.tgz", - "integrity": "sha512-vzSyuGr3eEoAtT/A6bmajosJZIUWySzY2CzB3w2pgPvnkUjGqlDnsNnA0PMO+mMAhuyMul6C2uuZzY6ELSkzyA==", + "version": "4.2.19", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.19.tgz", + "integrity": "sha512-IY1rnGr6izd10B0A8LqsBfmlT5OILVuZ7XsI0vdGPEvuonFV7NYEUK4dAkm9Zg2q0Um92kYjTpS1CAP3Nh/KWw==", + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.1", + "@jridgewell/sourcemap-codec": "^1.4.15", + "@jridgewell/trace-mapping": "^0.3.18", + "@types/estree": "^1.0.1", + "acorn": "^8.9.0", + "aria-query": "^5.3.0", + "axobject-query": "^4.0.0", + "code-red": "^1.0.3", + "css-tree": "^2.3.1", + "estree-walker": "^3.0.3", + "is-reference": "^3.0.1", + "locate-character": "^3.0.0", + "magic-string": "^0.30.4", + "periscopic": "^3.1.0" + }, "engines": { - "node": ">= 8" + "node": ">=16" } }, - "node_modules/svelte-preprocess": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.1.4.tgz", - "integrity": "sha512-IvnbQ6D6Ao3Gg6ftiM5tdbR6aAETwjhHV+UKGf5bHGYR69RQvF1ho0JKPcbUON4vy4R7zom13jPjgdOWCQ5hDA==", - "hasInstallScript": true, + "node_modules/svelte/node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "license": "MIT" + }, + "node_modules/svelte/node_modules/estree-walker": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", + "license": "MIT", "dependencies": { - "@types/pug": "^2.0.6", - "detect-indent": "^6.1.0", - "magic-string": "^0.30.5", - "sorcery": "^0.11.0", - "strip-indent": "^3.0.0" - }, - "engines": { - "node": ">= 16.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.10.2", - "coffeescript": "^2.5.1", - "less": "^3.11.3 || ^4.0.0", - "postcss": "^7 || ^8", - "postcss-load-config": "^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", - "pug": "^3.0.0", - "sass": "^1.26.8", - "stylus": "^0.55.0", - "sugarss": "^2.0.0 || ^3.0.0 || ^4.0.0", - "svelte": "^3.23.0 || ^4.0.0-next.0 || ^4.0.0 || ^5.0.0-next.0", - "typescript": ">=3.9.5 || ^4.0.0 || ^5.0.0" - }, - "peerDependenciesMeta": { - "@babel/core": { - "optional": true - }, - "coffeescript": { - "optional": true - }, - "less": { - "optional": true - }, - "postcss": { - "optional": true - }, - "postcss-load-config": { - "optional": true - }, - "pug": { - "optional": true - }, - "sass": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "typescript": { - "optional": true - } + "@types/estree": "^1.0.0" } }, "node_modules/svelte2tsx": { - "version": "0.7.15", - "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.15.tgz", - "integrity": "sha512-91RbLJI448FR1UEZqXSS3ucVMERuWo8ACOhxfkBPK1CL2ocGMOC5bwc8tzFvb/Ji8NqZ7wmSGfvRebcUsiauKA==", + "version": "0.7.18", + "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.18.tgz", + "integrity": "sha512-PCOhH7uQaV472ZvNAcnkvShjFRMMkKUc/eNJImQMH9T4CyHeQpdatedFrEjaMCsweFb/oo3a6bv4qtdfaCPw8g==", + "license": "MIT", "dependencies": { "dedent-js": "^1.0.1", "pascal-case": "^3.1.1" @@ -1651,6 +1721,7 @@ "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==", + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -1663,6 +1734,7 @@ "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, + "license": "MIT", "dependencies": { "@cspotcode/source-map-support": "^0.8.0", "@tsconfig/node10": "^1.0.7", @@ -1706,20 +1778,23 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } }, "node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "license": "0BSD" }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -1728,6 +1803,7 @@ "version": "5.5.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -1740,101 +1816,110 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.3.tgz", "integrity": "sha512-ojEC7+Ci1ij9eE6hp8Jl9VUNnsEKzztktP5gtYNRMrTmfXVwA1PITYYAkpxCvvupdSYa/Re51B6KMcv1CTZEUA==", + "license": "MIT", "dependencies": { "semver": "^7.3.8" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true, + "license": "MIT" + }, "node_modules/v8-compile-cache-lib": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/vscode-css-languageservice": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.0.tgz", - "integrity": "sha512-nU92imtkgzpCL0xikrIb8WvedV553F2BENzgz23wFuok/HLN5BeQmroMy26pUwFxV2eV8oNRmYCUv8iO7kSMhw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.1.tgz", + "integrity": "sha512-1BzTBuJfwMc3A0uX4JBdJgoxp74cjj4q2mDJdp49yD/GuAq4X0k5WtK6fNcMYr+FfJ9nqgR6lpfCSZDkARJ5qQ==", + "license": "MIT", "dependencies": { "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "3.17.5", "vscode-uri": "^3.0.8" } }, - "node_modules/vscode-css-languageservice/node_modules/vscode-languageserver-types": { - "version": "3.17.5", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", - "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" - }, "node_modules/vscode-html-languageservice": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.0.tgz", - "integrity": "sha512-C4Z3KsP5Ih+fjHpiBc5jxmvCl+4iEwvXegIrzu2F5pktbWvQaBT3YkVPk8N+QlSSMk8oCG6PKtZ/Sq2YHb5e8g==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.1.tgz", + "integrity": "sha512-ysUh4hFeW/WOWz/TO9gm08xigiSsV/FOAZ+DolgJfeLftna54YdmZ4A+lIn46RbdO3/Qv5QHTn1ZGqmrXQhZyA==", + "license": "MIT", "dependencies": { "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "^3.17.5", "vscode-uri": "^3.0.8" } }, - "node_modules/vscode-html-languageservice/node_modules/vscode-languageserver-types": { - "version": "3.17.5", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", - "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" - }, "node_modules/vscode-jsonrpc": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz", - "integrity": "sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", + "license": "MIT", "engines": { "node": ">=14.0.0" } }, "node_modules/vscode-languageserver": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.2.tgz", - "integrity": "sha512-bpEt2ggPxKzsAOZlXmCJ50bV7VrxwCS5BI4+egUmure/oI/t4OlFzi/YNtVvY24A2UDOZAgwFGgnZPwqSJubkA==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz", + "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==", + "license": "MIT", "dependencies": { - "vscode-languageserver-protocol": "3.17.2" + "vscode-languageserver-protocol": "3.17.5" }, "bin": { "installServerIntoExtension": "bin/installServerIntoExtension" } }, "node_modules/vscode-languageserver-protocol": { - "version": "3.17.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz", - "integrity": "sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==", + "version": "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==", + "license": "MIT", "dependencies": { - "vscode-jsonrpc": "8.0.2", - "vscode-languageserver-types": "3.17.2" + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" } }, "node_modules/vscode-languageserver-textdocument": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", - "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==" + "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==", + "license": "MIT" }, "node_modules/vscode-languageserver-types": { - "version": "3.17.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz", - "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==" + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", + "license": "MIT" }, "node_modules/vscode-nls": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.2.0.tgz", - "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==" + "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==", + "license": "MIT" }, "node_modules/vscode-uri": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz", - "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==" + "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==", + "license": "MIT" }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -1849,13 +1934,15 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz", "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -1871,13 +1958,16 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -1887,6 +1977,7 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -1905,6 +1996,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -1914,6 +2006,7 @@ "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", "dev": true, + "license": "MIT", "dependencies": { "camelcase": "^6.0.0", "decamelize": "^4.0.0", @@ -1929,6 +2022,7 @@ "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -1938,6 +2032,7 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index 8391f4f2d40e6..f70c9e2461fb5 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -3,17 +3,17 @@ , fetchurl }: let - version = "0.16.14"; + version = "0.17.0"; in buildNpmPackage { pname = "svelte-language-server"; inherit version; src = fetchurl { url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz"; - hash = "sha256-vBnNrzjnWmlZZ1C5WO4VwlTI9+bNmxgFpLFzzExnW+U="; + hash = "sha256-3JcpdpvxkOAIMAMsZx5UF1Sp+O6zC3jwYJGRdoZNbQg="; }; - npmDepsHash = "sha256-TiabvRCxMccsuIFm7t8vhXstX4WRSbndKnm1nKRmBfw="; + npmDepsHash = "sha256-poUbH9U/zN9LiuCCI1FCz+MnoYt8De64pMLSbtmoN30="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix index 16eaf01be24d6..6552147449041 100644 --- a/pkgs/by-name/sv/svix-server/package.nix +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl protobuf - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration @@ -50,6 +50,6 @@ rustPlatform.buildRustPackage rec { "https://github.com/svix/svix-webhooks/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ techknowlogick ]; - broken = stdenv.isx86_64 && stdenv.isDarwin; # aws-lc-sys currently broken on darwin x86_64 + broken = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin; # aws-lc-sys currently broken on darwin x86_64 }; } diff --git a/pkgs/by-name/sv/svp/mpv.nix b/pkgs/by-name/sv/svp/mpv.nix index ac597bd91708e..8c4e7839c1cac 100644 --- a/pkgs/by-name/sv/svp/mpv.nix +++ b/pkgs/by-name/sv/svp/mpv.nix @@ -1,7 +1,7 @@ -{ lib -, mpv-unwrapped -, ocl-icd -, ... +{ + lib, + mpv-unwrapped, + ocl-icd, }: mpv-unwrapped.wrapper { diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix index 30e540ba74165..0978a9e64f697 100644 --- a/pkgs/by-name/sv/svp/package.nix +++ b/pkgs/by-name/sv/svp/package.nix @@ -1,25 +1,26 @@ -{ stdenv -, buildFHSEnv -, writeShellScriptBin -, fetchurl -, callPackage -, makeDesktopItem -, copyDesktopItems -, ffmpeg -, glibc -, jq -, lib -, libmediainfo -, libsForQt5 -, libusb1 -, ocl-icd -, p7zip -, patchelf -, socat -, vapoursynth -, xdg-utils -, xorg -, zenity +{ + stdenv, + buildFHSEnv, + writeShellScriptBin, + fetchurl, + callPackage, + makeDesktopItem, + copyDesktopItems, + ffmpeg, + glibc, + jq, + lib, + libmediainfo, + libsForQt5, + libusb1, + ocl-icd, + p7zip, + patchelf, + socat, + vapoursynth, + xdg-utils, + xorg, + zenity, }: let mpvForSVP = callPackage ./mpv.nix { }; @@ -60,13 +61,16 @@ let svp-dist = stdenv.mkDerivation rec { pname = "svp-dist"; - version = "4.5.210-2"; + version = "4.6.263"; src = fetchurl { url = "https://www.svp-team.com/files/svp4-linux.${version}.tar.bz2"; - hash = "sha256-dY9uQ9jzTHiN2XSnOrXtHD11IIJW6t9BUzGGQFfZ+yg="; + sha256 = "sha256-HyRDVFHVmTan/Si3QjGQpC3za30way10d0Hk79oXG98="; }; - nativeBuildInputs = [ p7zip patchelf ]; + nativeBuildInputs = [ + p7zip + patchelf + ]; dontFixup = true; unpackPhase = '' @@ -129,14 +133,25 @@ stdenv.mkDerivation { desktopName = "SVP 4 Linux"; genericName = "Real time frame interpolation"; icon = "svp-manager4"; - categories = [ "AudioVideo" "Player" "Video" ]; - mimeTypes = [ "video/x-msvideo" "video/x-matroska" "video/webm" "video/mpeg" "video/mp4" ]; + categories = [ + "AudioVideo" + "Player" + "Video" + ]; + mimeTypes = [ + "video/x-msvideo" + "video/x-matroska" + "video/webm" + "video/mpeg" + "video/mp4" + ]; terminal = false; startupNotify = true; }) ]; meta = with lib; { + mainProgram = "SVPManager"; description = "SmoothVideo Project 4 (SVP4) converts any video to 60 fps (and even higher) and performs this in real time right in your favorite video player"; homepage = "https://www.svp-team.com/wiki/SVP:Linux"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/sv/svt-av1-psy/package.nix b/pkgs/by-name/sv/svt-av1-psy/package.nix new file mode 100644 index 0000000000000..df45ea1734cc0 --- /dev/null +++ b/pkgs/by-name/sv/svt-av1-psy/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + nasm, + libdovi, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "svt-av1-psy"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "gianni-rosato"; + repo = "svt-av1-psy"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-4ds7yrUMp0O5/aWOkdnrANR1D3djajU/0ZeY6xJnpHI="; + }; + + cmakeBuildType = "Release"; + + cmakeFlags = lib.mapAttrsToList lib.cmakeFeature { + LIBDOVI_FOUND = lib.boolToString true; + # enable when libhdr10plus is available + # LIBHDR10PLUS_RS_FOUND = lib.boolToString true; + }; + + nativeBuildInputs = [ + cmake + nasm + ]; + + buildInputs = [ + libdovi + ]; + + meta = { + homepage = "https://github.com/gianni-rosato/svt-av1-psy"; + description = "Scalable Video Technology AV1 Encoder and Decoder"; + + longDescription = '' + SVT-AV1-PSY is the Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder) + with perceptual enhancements for psychovisually optimal AV1 encoding. + The goal is to create the best encoding implementation for perceptual quality with AV1. + ''; + + license = with lib.licenses; [ + aom + bsd3 + ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ johnrtitor ]; + }; +}) diff --git a/pkgs/by-name/sw/sway-assign-cgroups/package.nix b/pkgs/by-name/sw/sway-assign-cgroups/package.nix index 47acd2ae4d1d1..e92dc058eaef4 100644 --- a/pkgs/by-name/sw/sway-assign-cgroups/package.nix +++ b/pkgs/by-name/sw/sway-assign-cgroups/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { owner = "alebastr"; repo = "sway-systemd"; rev = "v${version}"; - sha256 = "sha256-wznYE1/lVJtvf5Nq96gbPYisxc2gWLahVydwcH1vwoQ="; + hash = "sha256-wznYE1/lVJtvf5Nq96gbPYisxc2gWLahVydwcH1vwoQ="; }; format = "other"; diff --git a/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix b/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix index 659eac2935f49..42c5421856492 100644 --- a/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix +++ b/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix @@ -9,15 +9,15 @@ , wayland-protocols , wayland-scanner }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "sway-audio-idle-inhibit"; - version = "unstable-2023-08-09"; + version = "0.1.2"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayAudioIdleInhibit"; - rev = "c850bc4812216d03e05083c69aa05326a7fab9c7"; - sha256 = "sha256-MKzyF5xY0uJ/UWewr8VFrK0y7ekvcWpMv/u9CHG14gs="; + rev = "v${finalAttrs.version}"; + hash = "sha256-6bdIkNosp/mzH5SiyK6Mox/z8kuFk5RLMmcFZ2VIi0g="; }; nativeBuildInputs = [ @@ -36,5 +36,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ rafaelrc ]; mainProgram = "sway-audio-idle-inhibit"; }; -} - +}) diff --git a/pkgs/by-name/sw/sway-easyfocus/package.nix b/pkgs/by-name/sw/sway-easyfocus/package.nix index bc19c7ebd01d7..3d3b73f7c93fe 100644 --- a/pkgs/by-name/sw/sway-easyfocus/package.nix +++ b/pkgs/by-name/sw/sway-easyfocus/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { description = "Tool to help efficiently focus windows in Sway, inspired by i3-easyfocus"; homepage = "https://github.com/edzdez/sway-easyfocus"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "sway-easyfocus"; }; } diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix index 1edc6d3d4cb96..bdd11a3d77633 100644 --- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix +++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix @@ -137,7 +137,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/WillPower3309/swayfx/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - eclairevoyant ricarch97 ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/sw/swayidle/package.nix b/pkgs/by-name/sw/swayidle/package.nix index 0ee08dc7ca1d9..35e66bd961a29 100644 --- a/pkgs/by-name/sw/swayidle/package.nix +++ b/pkgs/by-name/sw/swayidle/package.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols ] ++ lib.optionals systemdSupport [ systemd ]; diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index a6e1a4a8d48d9..b05395fc4c7cc 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -26,13 +26,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "2.3"; + version = "3.2"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; rev = "v${finalAttrs.version}"; - hash = "sha256-MAVxOUM1x6dkvbWPz/JS+sITi3BhCeaweKZZserkXz8="; + hash = "sha256-Eqs8U2BpjcweDi4oGS9nWpoyoXeuiD+6jviPA3s9/YY="; }; strictDeps = true; diff --git a/pkgs/tools/wayland/swaykbdd/default.nix b/pkgs/by-name/sw/swaykbdd/package.nix similarity index 100% rename from pkgs/tools/wayland/swaykbdd/default.nix rename to pkgs/by-name/sw/swaykbdd/package.nix diff --git a/pkgs/by-name/sw/swaylock-effects/package.nix b/pkgs/by-name/sw/swaylock-effects/package.nix index c5dbf3766f06c..0f5ba49711814 100644 --- a/pkgs/by-name/sw/swaylock-effects/package.nix +++ b/pkgs/by-name/sw/swaylock-effects/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "jirutka"; repo = "swaylock-effects"; rev = "v${version}"; - sha256 = "sha256-cuFM+cbUmGfI1EZu7zOsQUj4rA4Uc4nUXcvIfttf9zE="; + hash = "sha256-cuFM+cbUmGfI1EZu7zOsQUj4rA4Uc4nUXcvIfttf9zE="; }; postPatch = '' @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { ''; strictDeps = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix index 0ba3b727c9490..f76f7cdbf0b46 100644 --- a/pkgs/by-name/sw/swaylock/package.nix +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = "v${version}"; - hash = "sha256-ZsOLDqmkyhel8QAezdVZ51utruJrBZWqaZ7NzimXWQ4="; + hash = "sha256-1+AXxw1gH0SKAxUa0JIhSzMbSmsfmBPCBY5IKaYtldg="; }; strictDeps = true; diff --git a/pkgs/by-name/sw/swell-foop/package.nix b/pkgs/by-name/sw/swell-foop/package.nix index 85d6290e9354d..a08d951e55ed0 100644 --- a/pkgs/by-name/sw/swell-foop/package.nix +++ b/pkgs/by-name/sw/swell-foop/package.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/swell-foop"; + changelog = "https://gitlab.gnome.org/GNOME/swell-foop/-/tree/${version}?ref_type=tags"; description = "Puzzle game, previously known as Same GNOME"; mainProgram = "swell-foop"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/sw/swift-quit/package.nix b/pkgs/by-name/sw/swift-quit/package.nix new file mode 100644 index 0000000000000..80b7ef5f89a2a --- /dev/null +++ b/pkgs/by-name/sw/swift-quit/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenvNoCC, + fetchurl, + unzip, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "swift-quit"; + version = "1.5"; + + src = fetchurl { + url = "https://github.com/onebadidea/swiftquit/releases/download/v${finalAttrs.version}/Swift.Quit.zip"; + sha256 = "sha256-pORnyxOhTc/zykBHF5ujsWEZ9FjNauJGeBDz9bnHTvs="; + }; + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + unzip -d $out/Applications $src + + runHook postInstall + ''; + + meta = { + description = "Automatic quitting of macOS apps when closing their windows."; + homepage = "https://swiftquit.com/"; + license = lib.licenses.gpl3; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ Enzime ]; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix index defd4f4ffc3ca..7ea7c372a0696 100644 --- a/pkgs/by-name/sw/swiftlint/package.nix +++ b/pkgs/by-name/sw/swiftlint/package.nix @@ -7,11 +7,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "swiftlint"; - version = "0.56.1"; + version = "0.57.0"; src = fetchurl { url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip"; - hash = "sha256-EEOEKwZsLOdSdf24uj1oN6uyY4Ox+HIkClXIJ1d+wpk="; + hash = "sha256-m1+5hPze016ryyoQrs8CCbcLjWY3ONMn4Zgh6sReuBA="; }; dontPatch = true; diff --git a/pkgs/by-name/sw/swig/package.nix b/pkgs/by-name/sw/swig/package.nix new file mode 100644 index 0000000000000..1ccaf4fb13fe3 --- /dev/null +++ b/pkgs/by-name/sw/swig/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, + libtool, + bison, + pcre2, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "swig"; + version = "4.2.1"; + + src = fetchFromGitHub { + owner = "swig"; + repo = "swig"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VlUsiRZLScmbC7hZDzKqUr9481YXVwo0eXT/jy6Fda8="; + }; + + PCRE_CONFIG = "${pcre2.dev}/bin/pcre-config"; + nativeBuildInputs = [ + autoconf + automake + libtool + bison + ]; + buildInputs = [ pcre2 ]; + + configureFlags = [ "--without-tcl" ]; + + # Disable ccache documentation as it needs yodl + postPatch = '' + sed -i '/man1/d' CCache/Makefile.in + ''; + + preConfigure = '' + ./autogen.sh + ''; + + meta = { + changelog = "https://github.com/swig/swig/blob/${finalAttrs.src.rev}/CHANGES.current"; + description = "Interface compiler that connects C/C++ code to higher-level languages"; + homepage = "https://swig.org/"; + # Different types of licenses available: https://www.swig.org/Release/LICENSE . + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ orivej ]; + mainProgram = "swig"; + platforms = with lib.platforms; linux ++ darwin; + }; +}) diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix new file mode 100644 index 0000000000000..3fd19809f9073 --- /dev/null +++ b/pkgs/by-name/sw/swim/package.nix @@ -0,0 +1,69 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + pkg-config, + openssl, + spade, + stdenv, + darwin, + git, +}: + +rustPlatform.buildRustPackage rec { + pname = "swim"; + version = "0.10.0"; + + src = fetchFromGitLab { + owner = "spade-lang"; + repo = "swim"; + rev = "v${version}"; + hash = "sha256-Yuq1eYjxNnmrydzPyx+UWJJlZnC9sIEP3ZEleKmkzIM="; + }; + + cargoHash = "sha256-3WcMXvxlY0I7HnR+GTxHPAN+1HQsQLymjGFMM6q18xQ="; + + preConfigure = '' + # de-vendor spade git submodule + test "$version" = "${spade.version}" || { + >&2 echo ERROR: version mismatch between spade and swim! + false + } + ln -s ${spade.src} runt/spade + ''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + nativeCheckInputs = [ git ]; + + checkFlags = [ + # tries to clone https://gitlab.com/spade-lang/swim-templates + "--skip=init::tests::git_init_then_swim_init_works" + "--skip=init::tests::init_board_correctly_sets_project_name" + "--skip=init::tests::init_board_creates_required_files" + "--skip=plugin::test::deny_changes_to_plugins::edits_are_denied" + "--skip=plugin::test::deny_changes_to_plugins::restores_work" + ]; + + passthru = { + inherit (spade) updateScript; + }; + + meta = { + description = "Build tool for spade"; + homepage = "https://gitlab.com/spade-lang/swim"; + changelog = "https://gitlab.com/spade-lang/swim/-/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.eupl12; + maintainers = with lib.maintainers; [ pbsds ]; + mainProgram = "swim"; + }; +} diff --git a/pkgs/by-name/sw/swipe-guess/package.nix b/pkgs/by-name/sw/swipe-guess/package.nix index 2f6d5f8fe9a50..881dd9718a6f7 100644 --- a/pkgs/by-name/sw/swipe-guess/package.nix +++ b/pkgs/by-name/sw/swipe-guess/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://git.sr.ht/~earboxer/swipeGuess/"; license = lib.licenses.agpl3Only; mainProgram = "swipeGuess"; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock b/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock deleted file mode 100644 index 9b70ccfe23b3f..0000000000000 --- a/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock +++ /dev/null @@ -1,527 +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 = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "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 = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "libc", - "libdbus-sys", - "winapi", -] - -[[package]] -name = "dbus-codegen" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd91775d91fc83c7d526aa7c08078bac0b30f382706689901ac819fe6ddc812" -dependencies = [ - "clap", - "dbus", - "xml-rs", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libdbus-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "cfg_aliases", - "libc", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "ordered-multimap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" -dependencies = [ - "dlv-list", - "hashbrown", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "regex" -version = "1.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "rust-ini" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" -dependencies = [ - "cfg-if", - "ordered-multimap", - "trim-in-place", -] - -[[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", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "switch-to-configuration" -version = "0.1.0" -dependencies = [ - "anyhow", - "dbus", - "dbus-codegen", - "glob", - "log", - "nix", - "regex", - "rust-ini", - "syslog", -] - -[[package]] -name = "syn" -version = "2.0.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syslog" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc7e95b5b795122fafe6519e27629b5ab4232c73ebb2428f568e82b1a457ad3" -dependencies = [ - "error-chain", - "hostname", - "libc", - "log", - "time", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "trim-in-place" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-width" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "xml-rs" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml b/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml deleted file mode 100644 index 51d805dcd959d..0000000000000 --- a/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -name = "switch-to-configuration" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -anyhow = "1.0.82" -dbus = "0.9.7" -glob = "0.3.1" -log = "0.4.21" -nix = { version = "0.28.0", features = ["fs", "signal"] } -regex = "1.10.4" -rust-ini = "0.21.0" -syslog = "6.1.1" - -[build-dependencies] -dbus-codegen = "0.11.0" diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/package.nix b/pkgs/by-name/sw/switch-to-configuration-ng/package.nix index aa748a0c2b3d5..2bc473b2f093a 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/package.nix +++ b/pkgs/by-name/sw/switch-to-configuration-ng/package.nix @@ -10,17 +10,12 @@ rustPlatform.buildRustPackage { pname = "switch-to-configuration"; version = "0.1.0"; - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - ./Cargo.lock - ./Cargo.toml - ./build.rs - ./src - ]; - }; + src = ./src; - cargoLock.lockFile = ./Cargo.lock; + cargoLock = { + lockFile = ./src/Cargo.lock; + outputHashes."rust-ini-0.21.1" = "sha256-0nSBhme/g+mVsYdiq0Ash0ek9WEdvbf/b9FRxA7sauk="; + }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/.gitignore b/pkgs/by-name/sw/switch-to-configuration-ng/src/.gitignore similarity index 100% rename from pkgs/by-name/sw/switch-to-configuration-ng/.gitignore rename to pkgs/by-name/sw/switch-to-configuration-ng/src/.gitignore diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.lock b/pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.lock new file mode 100644 index 0000000000000..56913a9158c34 --- /dev/null +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.lock @@ -0,0 +1,526 @@ +# 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 = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "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 = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "dbus-codegen" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcd91775d91fc83c7d526aa7c08078bac0b30f382706689901ac819fe6ddc812" +dependencies = [ + "clap", + "dbus", + "xml-rs", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "dlv-list" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "ordered-multimap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" +dependencies = [ + "dlv-list", + "hashbrown", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "rust-ini" +version = "0.21.1" +source = "git+https://github.com/zonyitoo/rust-ini?rev=5748ae57a178216a920b88dfac1296618e967447#5748ae57a178216a920b88dfac1296618e967447" +dependencies = [ + "cfg-if", + "ordered-multimap", + "trim-in-place", +] + +[[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", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "switch-to-configuration" +version = "0.1.0" +dependencies = [ + "anyhow", + "dbus", + "dbus-codegen", + "glob", + "log", + "nix", + "regex", + "rust-ini", + "syslog", +] + +[[package]] +name = "syn" +version = "2.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syslog" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc7e95b5b795122fafe6519e27629b5ab4232c73ebb2428f568e82b1a457ad3" +dependencies = [ + "error-chain", + "hostname", + "libc", + "log", + "time", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "trim-in-place" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.toml b/pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.toml new file mode 100644 index 0000000000000..37ca687b3f1b3 --- /dev/null +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "switch-to-configuration" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +anyhow = "1.0.82" +dbus = "0.9.7" +glob = "0.3.1" +log = "0.4.21" +nix = { version = "0.28.0", features = ["fs", "signal"] } +regex = "1.10.4" +rust-ini = { git = "https://github.com/zonyitoo/rust-ini", rev = "5748ae57a178216a920b88dfac1296618e967447", features = [ + "inline-comment", +] } +syslog = "6.1.1" + +[build-dependencies] +dbus-codegen = "0.11.0" diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/build.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/build.rs similarity index 100% rename from pkgs/by-name/sw/switch-to-configuration-ng/build.rs rename to pkgs/by-name/sw/switch-to-configuration-ng/src/build.rs diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs similarity index 99% rename from pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs rename to pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs index 057604b031781..802b5e64f1014 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs @@ -1657,15 +1657,19 @@ won't take effect until you reboot the system. } Ok(users) => { for (uid, name, user_dbus_path) in users { - let gid: u32 = dbus_conn - .with_proxy( - "org.freedesktop.login1", - &user_dbus_path, - Duration::from_millis(5000), - ) + let proxy = dbus_conn.with_proxy( + "org.freedesktop.login1", + &user_dbus_path, + Duration::from_millis(5000), + ); + let gid: u32 = proxy .get("org.freedesktop.login1.User", "GID") .with_context(|| format!("Failed to get GID for {name}"))?; + let runtime_path: String = proxy + .get("org.freedesktop.login1.User", "RuntimePath") + .with_context(|| format!("Failed to get runtime directory for {name}"))?; + eprintln!("reloading user units for {}...", name); let myself = Path::new("/proc/self/exe") .canonicalize() @@ -1674,7 +1678,8 @@ won't take effect until you reboot the system. std::process::Command::new(&myself) .uid(uid) .gid(gid) - .env("XDG_RUNTIME_DIR", format!("/run/user/{}", uid)) + .env_clear() + .env("XDG_RUNTIME_DIR", runtime_path) .env("__NIXOS_SWITCH_TO_CONFIGURATION_PARENT_EXE", &myself) .spawn() .with_context(|| format!("Failed to spawn user activation for {name}"))? diff --git a/pkgs/by-name/sw/switcheroo/package.nix b/pkgs/by-name/sw/switcheroo/package.nix index 459f4a93793fa..d61c2a722f69e 100644 --- a/pkgs/by-name/sw/switcheroo/package.nix +++ b/pkgs/by-name/sw/switcheroo/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { glib gtk4 libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/sw/switchres/package.nix b/pkgs/by-name/sw/switchres/package.nix new file mode 100644 index 0000000000000..1c1818bc51c5c --- /dev/null +++ b/pkgs/by-name/sw/switchres/package.nix @@ -0,0 +1,63 @@ +{ + stdenv, + lib, + pkg-config, + fetchFromGitHub, + xorg, + libdrm, + SDL2, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "switchres"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "antonioginer"; + repo = "switchres"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-/21RcpumWYNBPck7gpH6krwC3Thz/rKDPgeJblN2BDA="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + xorg.libXrandr + xorg.xorgproto + libdrm + SDL2 + ]; + + patchPhase = '' + runHook preHook + + substituteInPlace ./custom_video_xrandr.cpp \ + --replace-fail libX11.so ${xorg.libX11}/lib/libX11.so \ + --replace-fail libXrandr.so ${xorg.libXrandr}/lib/libXrandr.so + + substituteInPlace ./custom_video_drmkms.cpp \ + --replace-fail libdrm.so ${libdrm}/lib/libdrm.so \ + + runHook postHook + ''; + + env = { + PREFIX = "$(out)"; + }; + + preInstall = '' + install -Dm755 switchres $out/bin/switchres + ''; + + meta = { + description = "Modeline generation engine for emulation"; + homepage = "https://github.com/antonioginer/switchres"; + changelog = "https://github.com/antonioginer/switchres/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl2Only; + mainProgram = "switchres"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index 49f2d4ce0f887..7f386779d47de 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.srcMetadataByPlatform = { x86_64-linux.platform = "gtk-linux-x86_64"; - x86_64-linux.sha256 = "17frac2nsx22hfa72264as31rn35hfh9gfgy0n6wvc3knl5d2716"; + x86_64-linux.hash = "sha256-JhzRCrVzsM2NBf65l6CDZdgchlbECHGUg0J0bQVT2Z0="; i686-linux.platform = "gtk-linux-x86"; - i686-linux.sha256 = "13ca17rga9yvdshqvh0sfzarmdcl4wv4pid0ls7v35v4844zbc8b"; + i686-linux.hash = "sha256-C7H1CUFkl7GPpqDFSzYnlLWa1XcawI2hbtsn9fIJio0="; x86_64-darwin.platform = "cocoa-macosx-x86_64"; - x86_64-darwin.sha256 = "0wjyxlw7i9zd2m8syd6k1q85fj8pzhxlfsrl8fpgsj37p698bd0a"; + x86_64-darwin.hash = "sha256-CrSFkrlnSP2uQzRrRzv8F0lXEA7TNK9RFe2neDjtXnI="; }; passthru.srcMetadata = finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null; @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { assert srcMetadata != null; fetchzip { url = "https://archive.eclipse.org/eclipse/downloads/drops4/R-${finalAttrs.fullVersion}/swt-${finalAttrs.version}-${srcMetadata.platform}.zip"; - inherit (srcMetadata) sha256; + inherit (srcMetadata) hash; stripRoot = false; postFetch = '' mkdir "$unpackDir" diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index 5013fef71923e..d22a28341aa07 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.11.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; rev = "refs/tags/v${version}"; - hash = "sha256-pHr0U7s4KOvPoLvcPbEANJeKN6CWI9Zfnu8/ZI1P3yw="; + hash = "sha256-4uANrPYqzyiPoqhTvrpbi0plkbJ3b8HzyYaBmj/hi58="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-DMS/oYD8jNdjDiuMWxDyYd/kSasfHEoRdd7l6SyacBo="; + vendorHash = "sha256-YM3DgkdappyEg3suV39gbikm/XJ7JqvEYbTF8+no7Qo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix index 35487a35401a0..473f9d64d652a 100644 --- a/pkgs/by-name/sy/symbolicator/package.nix +++ b/pkgs/by-name/sy/symbolicator/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { bzip2 openssl zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/sy/symphony/package.nix b/pkgs/by-name/sy/symphony/package.nix index 3e420421b0f52..37ac2e58a213b 100644 --- a/pkgs/by-name/sy/symphony/package.nix +++ b/pkgs/by-name/sy/symphony/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "coin-or"; repo = "SYMPHONY"; rev = "releases/${version}"; - sha256 = "sha256-OdTUMG3iVhjhw5uKtUnsLCZ4DfMjYHm8+/ozfmw7J6c="; + hash = "sha256-OdTUMG3iVhjhw5uKtUnsLCZ4DfMjYHm8+/ozfmw7J6c="; }; nativeBuildInputs = [ libtool pkg-config glpk gfortran coinmp osi coin-utils ]; diff --git a/pkgs/by-name/sy/syn2mas/package.nix b/pkgs/by-name/sy/syn2mas/package.nix index 5143a9c8f1280..667134361d53f 100644 --- a/pkgs/by-name/sy/syn2mas/package.nix +++ b/pkgs/by-name/sy/syn2mas/package.nix @@ -5,26 +5,26 @@ buildNpmPackage rec { pname = "syn2mas"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { - owner = "matrix-org"; + owner = "element-hq"; repo = "matrix-authentication-service"; rev = "v${version}"; - hash = "sha256-cZJ9ibBtxVBBVCBTGhtfM6lQTFvgUnO1WPO1WmDGuks="; + hash = "sha256-QLtyYxV2yXHJtwWgGcyi7gRcKypYoy9Z8bkEuTopVXc="; }; sourceRoot = "${src.name}/tools/syn2mas"; - npmDepsHash = "sha256-Dk/aSkCbuHiZN5H/f692/Yef+f5SJDSXuSMbePkU66g="; + npmDepsHash = "sha256-pRa5qqLsI8Hx9v5tMPDkehczXZjWWAOjfDfLLh2V6Q4="; dontBuild = true; - meta = with lib; { + meta = { description = "Tool to help with the migration of a Matrix Synapse installation to the Matrix Authentication Service"; - homepage = "https://github.com/matrix-org/matrix-authentication-service/tree/main/tools/syn2mas"; - license = licenses.asl20; - maintainers = with maintainers; [ teutat3s ]; + homepage = "https://github.com/element-hq/matrix-authentication-service/tree/main/tools/syn2mas"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ teutat3s ]; mainProgram = "syn2mas"; }; } diff --git a/pkgs/by-name/sy/sync/package.nix b/pkgs/by-name/sy/sync/package.nix deleted file mode 100644 index 2ac766a4efbd4..0000000000000 --- a/pkgs/by-name/sy/sync/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - autoreconfHook, - libgcrypt, - pkg-config, - curlWithGnuTls, - gnunet, - jansson, - libmicrohttpd, - libsodium, - libtool, - postgresql, - taler-exchange, - taler-merchant, - runtimeShell, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "sync"; - version = "0.11.0"; - - src = fetchgit { - url = "https://git.taler.net/sync.git"; - rev = "v${finalAttrs.version}"; - hash = "sha256-IGYc4Olbn9lVnN1THR2BXzllD1li/vhWwHg+1WU84YM="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - autoreconfHook - libgcrypt - pkg-config - ]; - - buildInputs = [ - curlWithGnuTls - gnunet - jansson - libgcrypt - libmicrohttpd - libsodium - libtool - postgresql - taler-exchange - taler-merchant - ]; - - preFixup = '' - substituteInPlace "$out/bin/sync-dbconfig" \ - --replace-fail "/bin/bash" "${runtimeShell}" - ''; - - meta = { - description = "Backup and synchronization service"; - homepage = "https://git.taler.net/sync.git"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ wegank ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/sy/syncthing-tray/package.nix b/pkgs/by-name/sy/syncthing-tray/package.nix index 2fc912de8519d..0f429fd36c24b 100644 --- a/pkgs/by-name/sy/syncthing-tray/package.nix +++ b/pkgs/by-name/sy/syncthing-tray/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { owner = "alex2108"; repo = "syncthing-tray"; rev = "v${version}"; - sha256 = "0869kinnsfzb8ydd0sv9fgqsi1sy5rhqg4whfdnrv82xjc71xyw3"; + hash = "sha256-g/seDpNdoJ1tc5CTh2EuXoeo8XNpa9CaR+s7bW2cySA="; }; vendorHash = "sha256-hGV5bivDUFEbOwU9sU+Eu5Wzz/aZtj6NUkpzHlmZTtw="; diff --git a/pkgs/by-name/sy/syncyomi/package.nix b/pkgs/by-name/sy/syncyomi/package.nix index ee2e6af318fc8..81f2982a05be4 100644 --- a/pkgs/by-name/sy/syncyomi/package.nix +++ b/pkgs/by-name/sy/syncyomi/package.nix @@ -70,7 +70,7 @@ buildGoModule rec { "-X main.version=v${version}" ]; - postInstall = lib.optionalString (!stdenvNoCC.isDarwin) '' + postInstall = lib.optionalString (!stdenvNoCC.hostPlatform.isDarwin) '' mv $out/bin/SyncYomi $out/bin/syncyomi ''; diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix index 581ba32caf147..9563739afaaf8 100644 --- a/pkgs/by-name/sy/syndicate-server/package.nix +++ b/pkgs/by-name/sy/syndicate-server/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { owner = "syndicate-lang"; repo = "syndicate-rs"; rev = "${pname}-v${version}"; - sha256 = "sha256-bTteZIlBSoQ1o5shgd9NeKVvEhZTyG3i2zbeVojWiO8="; + hash = "sha256-bTteZIlBSoQ1o5shgd9NeKVvEhZTyG3i2zbeVojWiO8="; }; cargoHash = "sha256-SIpdFXTk6MC/drjCLaaa49BbGsvCMNbPGCfTxAlCo9c="; nativeBuildInputs = [ diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix index 943b5ab4e8278..ee425f44d5d78 100644 --- a/pkgs/by-name/sy/syndicate_utils/package.nix +++ b/pkgs/by-name/sy/syndicate_utils/package.nix @@ -5,7 +5,6 @@ libxml2, libxslt, openssl, - pkg-config, postgresql, sqlite, }: diff --git a/pkgs/by-name/sy/syntax/package.nix b/pkgs/by-name/sy/syntax/package.nix index eceffd5aa0b4e..01b5ade160fbf 100644 --- a/pkgs/by-name/sy/syntax/package.nix +++ b/pkgs/by-name/sy/syntax/package.nix @@ -25,6 +25,6 @@ buildNpmPackage rec { license = licenses.mit; maintainers = with maintainers; [ h7x4 ]; mainProgram = "syntax-cli"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix index 007a951265e4c..c86a5849ac256 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -1,23 +1,23 @@ { - version = "1.15.0"; + version = "1.17.0"; x86_64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.15.0/linux/amd64/sysdig-cli-scanner"; - hash = "sha256-Mwpn8UWyR9gqLXq+buy9GaPUA0i6EOh6ymY4Ezv/vbs="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.17.0/linux/amd64/sysdig-cli-scanner"; + hash = "sha256-ls5iOdSTFFj3j1pc9Qd2PYqS9YP/BPQBvvE6tVdR0HU="; }; aarch64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.15.0/linux/arm64/sysdig-cli-scanner"; - hash = "sha256-UeztxyqRtbnF2eRprjMOEO5gAG95sUfrS6ZScvRx/Ag="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.17.0/linux/arm64/sysdig-cli-scanner"; + hash = "sha256-5R3wpYf+ooRLQbypVxKp7QNgSd/DHmEB+SmVo2qAbKA="; }; x86_64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.15.0/darwin/amd64/sysdig-cli-scanner"; - hash = "sha256-FjKfEtxwTPpMgepu3P0VeefSbhzAWUgb+8UFyQSjVPI="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.17.0/darwin/amd64/sysdig-cli-scanner"; + hash = "sha256-E4HAxADxOS6t4XnGCeakMFd+zA/rBudlCysUYRv0ALE="; }; aarch64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.15.0/darwin/arm64/sysdig-cli-scanner"; - hash = "sha256-neI+oSbFqIibupKMe2IR3SMMPtiQ7SQlRaxJld6qh6g="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.17.0/darwin/arm64/sysdig-cli-scanner"; + hash = "sha256-vcwWl0FgnwN4okIWDCHC86I82plJwOQbse/QfYCz8oQ="; }; } diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index 05229a47cbcf1..e8989bcf47b1d 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -2,8 +2,10 @@ lib, stdenv, fetchFromGitHub, + glibmm, gtk4-layer-shell, gtkmm4, + libevdev, nix-update-script, pkg-config, wireplumber, @@ -12,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2024-08-27"; + version = "0-unstable-2024-09-26"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "aa2c153f6aa15962c6b97a77dbe8c45708155fe0"; - hash = "sha256-SBpufr37K6LC4yc9ircUEBrzuRCKmJzD3C17N34qNGk="; + rev = "0b6e4958d8ea66b54bc67f0b5aa005fa3eaa4f6f"; + hash = "sha256-cyE7ZxesAmnepW7kI6b9Gp7R/v+yG2//EQAj4/X6c+c="; }; postPatch = '' @@ -32,8 +34,10 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + glibmm gtk4-layer-shell gtkmm4 + libevdev wireplumber ]; diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix index 87e556dbabaa2..1d3fc9df8dcc5 100644 --- a/pkgs/by-name/sy/syslogng/package.nix +++ b/pkgs/by-name/sy/syslogng/package.nix @@ -33,6 +33,9 @@ , libesmtp , rdkafka , gperf +, withGrpc ? true +, grpc +, protobuf }: let python-deps = ps: with ps; [ @@ -94,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { paho-mqtt-c hiredis rdkafka - ]; + ] ++ (lib.optionals withGrpc [ protobuf grpc ]); configureFlags = [ "--enable-manpages" @@ -111,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-systemd-journal=system" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--without-compile-date" - ]; + ] ++ (lib.optionals withGrpc [ "--enable-grpc" ]); outputs = [ "out" "man" ]; diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index 6ff4f6bfd2b1f..c220fcc8547a1 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "systemctl-tui"; - version = "0.3.7"; + version = "0.3.8"; src = fetchCrate { inherit pname version; - hash = "sha256-i0yCVXip1RcvKqxidflgW4wJFxAmUPRO04CeETzUgms="; + hash = "sha256-i2PKSvjsrITLp3a3EgfFF3IR464mkkDnh8ITLO+o0hU="; }; - cargoHash = "sha256-4gY9pQO2ljbyviaL20ikEqwdAHS4bqpzE6YyaBW/b7c="; + cargoHash = "sha256-6cFK1wMO5VICfi3tN140XH9inQOkkSfHVogKhTHtQb8="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; passthru = { updateScript = nix-update-script; diff --git a/pkgs/by-name/t-/t-rex/package.nix b/pkgs/by-name/t-/t-rex/package.nix index f26592e052d0c..7c92e49182ddd 100644 --- a/pkgs/by-name/t-/t-rex/package.nix +++ b/pkgs/by-name/t-/t-rex/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ gdal openssl ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; meta = with lib; { description = "Vector tile server specialized on publishing MVT tiles"; diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 4ebc77e741b1a..df01b5c4940a9 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -19,7 +19,7 @@ , rocmSupport ? config.rocmSupport , darwin -, metalSupport ? stdenv.isDarwin && stdenv.isAarch64 +, metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 # one of [ null "cpu" "rocm" "cuda" "metal" ]; , acceleration ? null @@ -55,16 +55,16 @@ let # If user did not not override the acceleration attribute, then try to use one of # - nixpkgs.config.cudaSupport # - nixpkgs.config.rocmSupport - # - metal if (stdenv.isDarwin && stdenv.isAarch64) + # - metal if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) # !! warn if multiple acceleration methods are enabled and default to the first one in the list featureDevice = if (builtins.isNull acceleration) then (warnIfMultipleAccelerationMethods availableAccelerations) else acceleration; - warnIfNotLinux = api: (lib.warnIfNot stdenv.isLinux + warnIfNotLinux = api: (lib.warnIfNot stdenv.hostPlatform.isLinux "building tabby with `${api}` is only supported on linux; falling back to cpu" - stdenv.isLinux); - warnIfNotDarwinAarch64 = api: (lib.warnIfNot (stdenv.isDarwin && stdenv.isAarch64) + stdenv.hostPlatform.isLinux); + warnIfNotDarwinAarch64 = api: (lib.warnIfNot (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "building tabby with `${api}` is only supported on Darwin-aarch64; falling back to cpu" - (stdenv.isDarwin && stdenv.isAarch64)); + (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)); validAccel = lib.assertOneOf "tabby.featureDevice" featureDevice [ "cpu" "rocm" "cuda" "metal" ]; @@ -88,7 +88,7 @@ let # TODO(ghthor): some of this can be removed darwinBuildInputs = [ llamaccpPackage ] - ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Foundation Accelerate CoreVideo @@ -143,7 +143,7 @@ rustPlatform.buildRustPackage { ]; buildInputs = [ openssl ] - ++ optionals stdenv.isDarwin darwinBuildInputs + ++ optionals stdenv.hostPlatform.isDarwin darwinBuildInputs ++ optionals enableCuda cudaBuildInputs ++ optionals enableRocm rocmBuildInputs ; @@ -164,6 +164,6 @@ rustPlatform.buildRustPackage { mainProgram = "tabby"; license = licenses.asl20; maintainers = [ maintainers.ghthor ]; - broken = stdenv.isDarwin && !stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix index f0ddde526f0bc..7934dfc60fcdb 100644 --- a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix +++ b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix @@ -1,9 +1,9 @@ { lib , tailscale -, buildGoModule +, buildGo123Module }: -buildGoModule { +buildGo123Module { inherit (tailscale) version src vendorHash CGO_ENABLED; pname = "tailscale-gitops-pusher"; @@ -23,6 +23,6 @@ buildGoModule { description = "Allows users to use a GitOps flow for managing Tailscale ACLs"; license = licenses.bsd3; mainProgram = "gitops-pusher"; - maintainers = with maintainers; [ xanderio ]; + maintainers = teams.cyberus.members; }; } diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix index 455374e03de86..9423cb2e46a6a 100644 --- a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix +++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildGoModule, tailscale }: +{ lib, stdenv, buildGo123Module, tailscale }: -buildGoModule { +buildGo123Module { pname = "tailscale-nginx-auth"; inherit (tailscale) version src vendorHash; @@ -15,7 +15,7 @@ buildGoModule { "-X tailscale.com/version.shortStamp=${tailscale.version}" ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mv $out/bin/nginx-auth $out/bin/tailscale.nginx-auth sed -i -e "s#/usr/sbin#$out/bin#" ./cmd/nginx-auth/tailscale.nginx-auth.service install -D -m0444 -t $out/lib/systemd/system ./cmd/nginx-auth/tailscale.nginx-auth.service diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index 06865660f79c5..f536741b60d8f 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -26,7 +26,7 @@ buildNpmPackage { npmDepsHash = "sha256-T7YNHunncSv+z86Td1QuBt4dMGF1ipo85ZhW7U9I0Zw="; npmWorkspace = "packages/tailwindcss-language-server"; - buildInputs = [ libsecret ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security AppKit ]); + buildInputs = [ libsecret ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security AppKit ]); nativeBuildInputs = [ python3 pkg-config ]; diff --git a/pkgs/by-name/ta/talecast/package.nix b/pkgs/by-name/ta/talecast/package.nix index df0f994d5144c..e18d5fd5f22c6 100644 --- a/pkgs/by-name/ta/talecast/package.nix +++ b/pkgs/by-name/ta/talecast/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ta/taler-challenger/package.nix b/pkgs/by-name/ta/taler-challenger/package.nix new file mode 100644 index 0000000000000..0a3404e94f583 --- /dev/null +++ b/pkgs/by-name/ta/taler-challenger/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + libgcrypt, + pkg-config, + texinfo, + curl, + gnunet, + jansson, + libgnurl, + libmicrohttpd, + libsodium, + libtool, + postgresql, + taler-exchange, + taler-merchant, + runtimeShell, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "taler-challenger"; + version = "0.13.0"; + + src = fetchgit { + url = "https://git.taler.net/challenger.git"; + rev = "v${finalAttrs.version}"; + hash = "sha256-OlUgE40Qo7on9VaMGKJ/MRWActDBqPe7Ja95dv1OFhA="; + }; + + # https://git.taler.net/challenger.git/tree/bootstrap + preAutoreconf = '' + # Generate Makefile.am in contrib/ + pushd contrib + rm -f Makefile.am + find wallet-core/challenger/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext + # Remove extra '\' at the end of the file + truncate -s -2 Makefile.am.ext + cat Makefile.am.in Makefile.am.ext >> Makefile.am + # Prevent accidental editing of the generated Makefile.am + chmod -w Makefile.am + popd + ''; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + libgcrypt + pkg-config + texinfo + ]; + + buildInputs = [ + curl + gnunet + jansson + libgcrypt + libgnurl + libmicrohttpd + libsodium + libtool + postgresql + taler-exchange + taler-merchant + ]; + + preFixup = '' + substituteInPlace $out/bin/challenger-{dbconfig,send-post.sh} \ + --replace-fail "/bin/bash" "${runtimeShell}" + ''; + + meta = { + description = "OAuth 2.0-based authentication service that validates user can receive messages at a certain address"; + homepage = "https://git.taler.net/challenger.git"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ta/taler-depolymerization/package.nix b/pkgs/by-name/ta/taler-depolymerization/package.nix new file mode 100644 index 0000000000000..d61478b32583a --- /dev/null +++ b/pkgs/by-name/ta/taler-depolymerization/package.nix @@ -0,0 +1,55 @@ +{ + lib, + rustPlatform, + fetchgit, + stdenv, + darwin, +}: +rustPlatform.buildRustPackage { + pname = "taler-depolymerization"; + version = "0-unstable-2024-06-17"; + + src = fetchgit { + url = "https://git.taler.net/depolymerization.git/"; + rev = "a0d27ac3bba22d4934ca9f7b244b0d9e45bb484f"; + hash = "sha256-HmQ/DPq/O6aODWms/bSsCVgBF7z246xxfYxiHrAkgYw="; + }; + + cargoHash = "sha256-NgoLCTHhEs45cnx21bU2ko3oWxePSzKgUpnCGqhjvTs="; + + outputs = [ + "out" + "doc" + ]; + + postPatch = '' + # fix missing expression in test docs + substituteInPlace common/src/status.rs \ + --replace-fail ' -> Requested' '() -> Requested' + ''; + + postInstall = '' + mkdir -p $doc/share/doc $out/share/examples + + cp -R docs $doc/share/doc/taler-depolymerization + cp docs/*.conf $out/share/examples + ''; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreFoundation + Security + SystemConfiguration + ] + ); + + meta = { + description = "Wire gateway for Bitcoin/Ethereum"; + homepage = "https://git.taler.net/depolymerization.git/"; + license = lib.licenses.agpl3Only; + maintainers = [ + # maintained by the team working on NGI-supported software, no group for this yet + ]; + }; +} diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix index 5460db04a5e4f..31c347b9e8c2e 100644 --- a/pkgs/by-name/ta/taler-exchange/package.nix +++ b/pkgs/by-name/ta/taler-exchange/package.nix @@ -20,18 +20,15 @@ texinfo, }: -let - version = "0.12.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "taler-exchange"; - inherit version; + version = "0.13.0"; src = fetchgit { url = "https://git.taler.net/exchange.git"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-yHRRMlqFA2OiFg0rBVzn7130wyVaxKn2dChFTPnVtbs="; + hash = "sha256-elVZUuiIMLOG058n+Egpy9oD9T2sLDC4TUCYZTCi0bw="; }; patches = [ ./0001-add-TALER_TEMPLATING_init_path.patch ]; @@ -63,9 +60,33 @@ stdenv.mkDerivation { preAutoreconf = '' ./contrib/gana-generate.sh pushd contrib - find wallet-core/aml-backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext + rm -f Makefile.am + { + echo 'dist_amlspapkgdata_DATA = \' + find wallet-core/aml-backoffice/ -type f | sort | awk '{print " " $1 " \\" }' + } >> Makefile.am.ext + # Remove extra '\' at the end of the file truncate -s -2 Makefile.am.ext + + { + echo "" + echo 'dist_kycspapkgdata_DATA = \' + find wallet-core/kyc/ -type f | sort | awk '{print " " $1 " \\" }' + } >> Makefile.am.ext + # Remove extra '\' at the end of the file + truncate -s -2 Makefile.am.ext + + { + echo "" + echo 'dist_auditorspapkgdata_DATA = \' + find wallet-core/auditor-backoffice/ -type f | sort | awk '{print " " $1 " \\" }' + } >> Makefile.am.ext + # Remove extra '\' at the end of the file + truncate -s -2 Makefile.am.ext + cat Makefile.am.in Makefile.am.ext >> Makefile.am + # Prevent accidental editing of the generated Makefile.am + chmod -w Makefile.am popd ''; @@ -80,7 +101,7 @@ stdenv.mkDerivation { checkTarget = "check"; - meta = with lib; { + meta = { description = '' Taler is an electronic payment system providing the ability to pay anonymously using digital cash. Taler consists of a network protocol @@ -93,8 +114,8 @@ stdenv.mkDerivation { ''; homepage = "https://taler.net/"; changelog = "https://git.taler.net/exchange.git/tree/ChangeLog"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ astro ]; - platforms = platforms.linux; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ astro ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix index dcc45968894f4..60350fcf57946 100644 --- a/pkgs/by-name/ta/taler-merchant/package.nix +++ b/pkgs/by-name/ta/taler-merchant/package.nix @@ -5,6 +5,7 @@ gnunet, qrencode, taler-exchange, + taler-wallet-core, libtool, pkg-config, autoreconfHook, @@ -12,25 +13,15 @@ jq, }: -let - version = "0.12.0"; - - taler-wallet-core = fetchgit { - url = "https://git.taler.net/wallet-core.git"; - # https://taler.net/en/news/2024-23.html - rev = "v0.12.7"; - hash = "sha256-5fyPPrRCKvHTgipIpKqHX3iH5f+wTuyfsAKgKmvl1nI="; - }; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "taler-merchant"; - inherit version; + version = "0.13.0"; src = fetchgit { url = "https://git.taler.net/merchant.git"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-BNIVlL+YPqqRZUhHOR/eH38dSHn/kNyCbMyz0ICxAMk="; + hash = "sha256-N3atOOE21OEks3G1LPOM5qo/kq0D5D9gmTfURCBZx6M="; }; postUnpack = '' @@ -88,7 +79,7 @@ stdenv.mkDerivation { checkTarget = "check"; - meta = with lib; { + meta = { description = '' This is the GNU Taler merchant backend. It provides the logic that should run at every GNU Taler merchant. The GNU Taler merchant is a RESTful backend that @@ -99,8 +90,8 @@ stdenv.mkDerivation { ''; homepage = "https://taler.net/"; changelog = "https://git.taler.net/merchant.git/tree/ChangeLog"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ astro ]; - platforms = platforms.linux; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ astro ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ta/taler-sync/package.nix b/pkgs/by-name/ta/taler-sync/package.nix new file mode 100644 index 0000000000000..08f872abe8034 --- /dev/null +++ b/pkgs/by-name/ta/taler-sync/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + libgcrypt, + pkg-config, + curlWithGnuTls, + gnunet, + jansson, + libmicrohttpd, + libsodium, + libtool, + postgresql, + taler-exchange, + taler-merchant, + runtimeShell, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "taler-sync"; + version = "0.13.1"; + + src = fetchgit { + url = "https://git.taler.net/sync.git"; + rev = "v${finalAttrs.version}"; + hash = "sha256-v5OQVpyTDWYGJrEbnOIDYu0nZlJcMN5AGunfn6G7s20="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + libgcrypt + pkg-config + ]; + + buildInputs = [ + curlWithGnuTls + gnunet + jansson + libgcrypt + libmicrohttpd + libsodium + libtool + postgresql + taler-exchange + taler-merchant + ]; + + preFixup = '' + substituteInPlace "$out/bin/sync-dbconfig" \ + --replace-fail "/bin/bash" "${runtimeShell}" + ''; + + meta = { + description = "Backup and synchronization service"; + homepage = "https://git.taler.net/sync.git"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index 7e1434e64aedb..944c0afc177e1 100644 --- a/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -37,12 +37,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taler-wallet-core"; - version = "0.12.12"; + version = "0.13.3"; src = fetchgit { url = "https://git.taler.net/wallet-core.git"; rev = "v${finalAttrs.version}"; - hash = "sha256-36P74gRFSdDzyas/OFyjdwnoIT3sjVmSs/N4ozld7sE="; + hash = "sha256-9pRhaQNnIzbhahMaTVVZqLTlAxh7GZxoz4Gf3TDldAA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tali/package.nix b/pkgs/by-name/ta/tali/package.nix index 8caab35e6c3cb..b84c123862fb5 100644 --- a/pkgs/by-name/ta/tali/package.nix +++ b/pkgs/by-name/ta/tali/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/tali-${version}.tar.xz"; - sha256 = "+p7eNm8KcuTKpSGJw6sLEMG1aoDHiFsBZgJVjETc59M="; + hash = "sha256-+p7eNm8KcuTKpSGJw6sLEMG1aoDHiFsBZgJVjETc59M="; }; nativeBuildInputs = [ @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/tali"; + changelog = "https://gitlab.gnome.org/GNOME/tali/-/blob/${version}/NEWS?ref_type=tags"; description = "Sort of poker with dice and less money"; mainProgram = "tali"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/ta/tangerine/package.nix b/pkgs/by-name/ta/tangerine/package.nix index 5615d441b80b4..1ec2d6b362b98 100644 --- a/pkgs/by-name/ta/tangerine/package.nix +++ b/pkgs/by-name/ta/tangerine/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { homepage = "https://github.com/Aeva/tangerine"; license = licenses.asl20; maintainers = [ maintainers.viraptor ]; - broken = stdenv.isDarwin; # third_party/naive-surface-nets doesn't find std::execution + broken = stdenv.hostPlatform.isDarwin; # third_party/naive-surface-nets doesn't find std::execution }; } diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/by-name/ta/tap-plugins/package.nix similarity index 100% rename from pkgs/applications/audio/tap-plugins/default.nix rename to pkgs/by-name/ta/tap-plugins/package.nix diff --git a/pkgs/by-name/ta/tarlz/package.nix b/pkgs/by-name/ta/tarlz/package.nix index 9873d2be13260..636c921d6c5a0 100644 --- a/pkgs/by-name/ta/tarlz/package.nix +++ b/pkgs/by-name/ta/tarlz/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/lzip/tarlz/tarlz-${version}.tar.lz"; - sha256 = "7d0bbe9c3a137bb93a10be56988fcf7362e4dbc65490639edc4255b704105fce"; + hash = "sha256-fQu+nDoTe7k6EL5WmI/Pc2Lk28ZUkGOe3EJVtwQQX84="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/ta/tartan/package.nix b/pkgs/by-name/ta/tartan/package.nix index d73ffdf99bb5a..56c18653dfb29 100644 --- a/pkgs/by-name/ta/tartan/package.nix +++ b/pkgs/by-name/ta/tartan/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Tools and Clang plugins for developing code with GLib"; homepage = "https://gitlab.freedesktop.org/tartan/tartan"; changelog = "https://gitlab.freedesktop.org/tartan/tartan/-/blob/main/NEWS"; diff --git a/pkgs/by-name/ta/tartufo/package.nix b/pkgs/by-name/ta/tartufo/package.nix new file mode 100644 index 0000000000000..1ee23cf2516c1 --- /dev/null +++ b/pkgs/by-name/ta/tartufo/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "tartufo"; + version = "5.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "godaddy"; + repo = "tartufo"; + rev = "refs/tags/v${version}"; + hash = "sha256-mwwenmSCxnzD2DLf1a/dsQjwJ2GetMgRGj/noqWJ/E0="; + }; + + pythonRelaxDeps = [ "tomlkit" ]; + + build-system = with python3.pkgs; [ poetry-core ]; + + dependencies = with python3.pkgs; [ + cached-property + click + colorama + gitpython + pygit2 + tomlkit + ]; + + pythonImportsCheck = [ "tartufo" ]; + + meta = { + description = "Tool to search through git repositories for high entropy strings and secrets"; + homepage = "https://github.com/godaddy/tartufo"; + changelog = "https://github.com/godaddy/tartufo/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "tartufo"; + }; +} diff --git a/pkgs/by-name/ta/taskchampion-sync-server/package.nix b/pkgs/by-name/ta/taskchampion-sync-server/package.nix index 74939e0a73d9d..1e41d4751f400 100644 --- a/pkgs/by-name/ta/taskchampion-sync-server/package.nix +++ b/pkgs/by-name/ta/taskchampion-sync-server/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { repo = "taskchampion-sync-server"; rev = "af918bdf0dea7f7b6e920680c947fc37b37ffffb"; fetchSubmodules = false; - sha256 = "sha256-BTGD7hZysmOlsT2W+gqj8+Sj6iBN9Jwiyzq5D03PDzM="; + hash = "sha256-BTGD7hZysmOlsT2W+gqj8+Sj6iBN9Jwiyzq5D03PDzM="; }; cargoHash = "sha256-/HfkE+R8JoNGkCCNQpE/JjGSqPHvjCPnTjOFPCFfJ7A="; diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 26b8d8ecd32cc..4be5fdd072c41 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { rustc rustPlatform.cargoSetupHook ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # darwin dependencies darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/by-name/ta/taxi/package.nix similarity index 100% rename from pkgs/applications/networking/ftp/taxi/default.nix rename to pkgs/by-name/ta/taxi/package.nix diff --git a/pkgs/by-name/td/tdl/package.nix b/pkgs/by-name/td/tdl/package.nix index 937fb02824410..da454bc57fcaf 100644 --- a/pkgs/by-name/td/tdl/package.nix +++ b/pkgs/by-name/td/tdl/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "tdl"; - version = "0.17.3"; + version = "0.17.5"; src = fetchFromGitHub { owner = "iyear"; repo = "tdl"; rev = "v${version}"; - hash = "sha256-PX6Ja7o7K/iq7hqn0g9jZHPPRp97sHau1Xd37m8RD2A="; + hash = "sha256-K8eq3cuPRgVSqd9VVjlE9DQJQKlyUGZKAhPRwpUTrTc="; }; - vendorHash = "sha256-NNTIigd8Gm+7jJzhizaRHc4jLwO7QKhFh4ce0lrYBh4="; + vendorHash = "sha256-X9gQ0mtuIgeo7s/IOAC5k6q3C8rBOKjTdQgeV7d3L60="; ldflags = [ "-s" diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index e8cbcb150711c..547af6be14c32 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -15,23 +15,23 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "1.9.5"; + version = "1.11.0"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-+rEGDg+/qvjCMhGHccb4p+CKOo/65RpkFT/WnCDlCgU="; + hash = "sha256-UNe4stYEOTcQc+ap1/v9EXjHTwKvLYd4t8EPuojDyqw="; }; - npmDepsHash = "sha256-vDRFFxkIQo5qU9gmkSwUhPz4FG2XbUNkTw6SCuvMqCc="; + npmDepsHash = "sha256-OpoPXcSiHnK4UYFimY+yOM6M3dAOcvZ82DdGc++oNLM="; nativeBuildInputs = [ makeWrapper versionCheckHook - ] ++ lib.optionals (stdenv.isLinux) [ copyDesktopItems ]; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ copyDesktopItems ]; - doInstallCheck = stdenv.isLinux; + doInstallCheck = stdenv.hostPlatform.isLinux; env = { # disable code signing on Darwin @@ -60,7 +60,7 @@ buildNpmPackage rec { runHook preInstall '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/{applications,teams-for-linux} cp dist/*-unpacked/resources/app.asar $out/share/teams-for-linux/ @@ -82,7 +82,7 @@ buildNpmPackage rec { --add-flags "$out/share/teams-for-linux/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r dist/mac*/teams-for-linux.app $out/Applications makeWrapper $out/Applications/teams-for-linux.app/Contents/MacOS/teams-for-linux $out/bin/teams-for-linux diff --git a/pkgs/applications/office/teapot/001-fix-warning.patch b/pkgs/by-name/te/teapot/001-fix-warning.patch similarity index 100% rename from pkgs/applications/office/teapot/001-fix-warning.patch rename to pkgs/by-name/te/teapot/001-fix-warning.patch diff --git a/pkgs/applications/office/teapot/002-remove-help.patch b/pkgs/by-name/te/teapot/002-remove-help.patch similarity index 100% rename from pkgs/applications/office/teapot/002-remove-help.patch rename to pkgs/by-name/te/teapot/002-remove-help.patch diff --git a/pkgs/applications/office/teapot/default.nix b/pkgs/by-name/te/teapot/package.nix similarity index 100% rename from pkgs/applications/office/teapot/default.nix rename to pkgs/by-name/te/teapot/package.nix diff --git a/pkgs/by-name/te/techmino/ccloader.nix b/pkgs/by-name/te/techmino/ccloader.nix index 3fe632a93785e..38a4b32c821ae 100644 --- a/pkgs/by-name/te/techmino/ccloader.nix +++ b/pkgs/by-name/te/techmino/ccloader.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { owner = "26F-Studio"; repo = "cold_clear_ai_love2d_wrapper"; rev = version; - hash = "sha256-zfTSMWqjFrAKW5m+9q3K2Je8bbSyhC6pC/vPAWDGCNg="; + fetchSubmodules = true; + hash = "sha256-sguV+Dw+etZH43tXZYL46NAdsI/qvyvGWCPUiTEjhy4="; }; buildInputs = [ libcoldclear luajit ]; diff --git a/pkgs/by-name/te/techmino/libcoldclear.nix b/pkgs/by-name/te/techmino/libcoldclear.nix index 4160e0bdcb87f..516f5c4dd9cdd 100644 --- a/pkgs/by-name/te/techmino/libcoldclear.nix +++ b/pkgs/by-name/te/techmino/libcoldclear.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, ccloader }: let @@ -17,12 +18,7 @@ rustPlatform.buildRustPackage { pname = "libcoldclear"; version = "0.1.0"; - src = fetchFromGitHub { - owner = "26F-Studio"; - repo = "cold-clear"; - rev = "1564ce9ad14aa60f32bf9a5120594933b3501548"; - hash = "sha256-6fZpKHEJ0dsOTp755GLnxa/befCUJhjqA3Zna5UkKVo="; - }; + src = "${ccloader.src}/cold-clear"; # remove workspace cargo.toml so we don't load all of workspace's deps postPatch = '' diff --git a/pkgs/by-name/te/techmino/package.nix b/pkgs/by-name/te/techmino/package.nix index 8b49abd693405..3d15feeb49fd5 100644 --- a/pkgs/by-name/te/techmino/package.nix +++ b/pkgs/by-name/te/techmino/package.nix @@ -6,7 +6,9 @@ , makeDesktopItem , love , luajit -, libcoldclear ? callPackage ./libcoldclear.nix { } +, writeShellScript +, nix-update +, libcoldclear ? callPackage ./libcoldclear.nix { inherit ccloader; } , ccloader ? callPackage ./ccloader.nix { inherit libcoldclear luajit; } }: @@ -31,15 +33,14 @@ in stdenv.mkDerivation rec { inherit pname; - version = "0.17.17"; + version = "0.17.21"; src = fetchurl { url = "https://github.com/26F-Studio/Techmino/releases/download/v${version}/Techmino_Bare.love"; - hash = "sha256-ExVdS2QXSRVMlRhrjD/Plo7fhQ3uUBHlwv6y91/S3uA="; + hash = "sha256-8gMIyNP1FS52LnbpQ+G9XNtK3rQruzkMDRz7Gk9LZcQ="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ love ccloader ]; dontUnpack = true; @@ -62,6 +63,11 @@ stdenv.mkDerivation rec { passthru = { inherit ccloader libcoldclear; + updateScript = writeShellScript "update-script.sh" '' + if ${lib.getExe nix-update} techmino | grep "Packages updated"; then + ${lib.getExe nix-update} techmino.ccloader + fi + ''; }; meta = with lib; { diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index 1844e08ddf8bd..d49899480e3b6 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -8,13 +8,13 @@ let technitium-library = buildDotnetModule rec { pname = "TechnitiumLibrary"; - version = "570ec570b57d8591daa3df682ca9e6f37f373db6"; + version = "5af89bb453dd67ae3119771597451e438a938591"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "TechnitiumLibrary"; rev = version; - hash = "sha256-xPwRoRp/XYrlGX3B9EiHUz2Tueh+hygbBopxFvdASLQ"; + hash = "sha256-ezYC2Nh5lgaN95OEP4TYcH6+3AbHbyTfv1RU19DXI3c="; name = "${pname}-${version}"; }; @@ -30,13 +30,13 @@ let in buildDotnetModule rec { pname = "technitium-dns-server"; - version = "12.2.1"; + version = "13.0.1"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; rev = "refs/tags/v${version}"; - hash = "sha256-2RB/pUlA9z7TJ4xd509nsbO1BnxY3mv2jou6OGRd/yM="; + hash = "sha256-O5QJAo6GjoKes5W4ajMcsYpR3j7EcR1vVMiKtTLcwDE="; name = "${pname}-${version}"; }; diff --git a/pkgs/by-name/te/tegola/package.nix b/pkgs/by-name/te/tegola/package.nix index f4847781f04f6..deb794f1c71c1 100644 --- a/pkgs/by-name/te/tegola/package.nix +++ b/pkgs/by-name/te/tegola/package.nix @@ -6,7 +6,7 @@ let owner = "go-spatial"; repo = "tegola"; rev = "v${version}"; - sha256 = "sha256-Jlpw3JaU5+DO7Z5qruEMoLRf95cPGd9Z+MeDGSgbMjc="; + hash = "sha256-Jlpw3JaU5+DO7Z5qruEMoLRf95cPGd9Z+MeDGSgbMjc="; }; frontend = buildNpmPackage { diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix new file mode 100644 index 0000000000000..cb98c85bf45bf --- /dev/null +++ b/pkgs/by-name/te/telegraf/package.nix @@ -0,0 +1,49 @@ +{ lib +, buildGo123Module +, fetchFromGitHub +, nixosTests +, stdenv +, testers +, telegraf +}: + +buildGo123Module rec { + pname = "telegraf"; + version = "1.32.0"; + + subPackages = [ "cmd/telegraf" ]; + + src = fetchFromGitHub { + owner = "influxdata"; + repo = "telegraf"; + rev = "v${version}"; + hash = "sha256-ITTlHsoWPXHbGtmNOE0x1sCbeADWi4liOEqXXKQUeGU="; + }; + + vendorHash = "sha256-wKl6Rutt2QrF4nLxB5Ic6QlekrPUfHwdFZyTTdbK0HU="; + proxyVendor = true; + + ldflags = [ + "-s" + "-w" + "-X=github.com/influxdata/telegraf/internal.Commit=${src.rev}" + "-X=github.com/influxdata/telegraf/internal.Version=${version}" + ]; + + passthru.tests = { + version = testers.testVersion { + package = telegraf; + }; + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { + inherit (nixosTests) telegraf; + }; + + meta = with lib; { + description = "Plugin-driven server agent for collecting & reporting metrics"; + mainProgram = "telegraf"; + homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; + changelog = "https://github.com/influxdata/telegraf/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 roblabla timstott zowoq ]; + }; +} diff --git a/pkgs/by-name/te/telescope/package.nix b/pkgs/by-name/te/telescope/package.nix index 1a4db30c90583..801cae0b123c5 100644 --- a/pkgs/by-name/te/telescope/package.nix +++ b/pkgs/by-name/te/telescope/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libgrapheme libressl ncurses - ] ++ lib.optional stdenv.isDarwin memstreamHook; + ] ++ lib.optional stdenv.hostPlatform.isDarwin memstreamHook; configureFlags = [ "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index 985b6036374d0..8e90a4823ffc2 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "templ"; - version = "0.2.771"; + version = "0.2.778"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${version}"; - hash = "sha256-1S8rdq+dRVh5NulXZw70TC5NjaWb6YdIfT6NcZTvx8U="; + hash = "sha256-lU8aVTw73HX0lNGPyD8Xnvtnr2VFTXv/S6xCVn6Lg74="; }; vendorHash = "sha256-ZWY19f11+UI18jeHYIEZjdb9Ii74mD6w+dYRLPkdfBU="; diff --git a/pkgs/by-name/te/termpaint/0001-meson.build-use-prefix.patch b/pkgs/by-name/te/termpaint/0001-meson.build-use-prefix.patch new file mode 100644 index 0000000000000..e645f8c61d4a0 --- /dev/null +++ b/pkgs/by-name/te/termpaint/0001-meson.build-use-prefix.patch @@ -0,0 +1,25 @@ +From 6275687b748bed9a6148164b085b82840b5e09c6 Mon Sep 17 00:00:00 2001 +From: laalsaas <laalsaas@systemli.org> +Date: Sun, 18 Aug 2024 11:59:13 +0200 +Subject: [PATCH] meson.build: use-prefix + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 8a0c39c..5eb2435 100644 +--- a/meson.build ++++ b/meson.build +@@ -111,7 +111,7 @@ main_lib_files = [ + ] + + main_lib_cargs += '-DTERMPAINT_RESCUE_EMBEDDED' +-main_lib_cargs += '-DTERMPAINT_RESCUE_PATH="@0@"'.format(get_option('ttyrescue-path')) ++main_lib_cargs += '-DTERMPAINT_RESCUE_PATH="@0@"'.format(get_option('prefix') / get_option('ttyrescue-path')) + main_lib = library('termpaint', main_lib_files, + dependencies: lib_rt, + c_args: main_lib_cargs, +-- +2.45.1 + diff --git a/pkgs/by-name/te/termpaint/package.nix b/pkgs/by-name/te/termpaint/package.nix new file mode 100644 index 0000000000000..217d279551920 --- /dev/null +++ b/pkgs/by-name/te/termpaint/package.nix @@ -0,0 +1,49 @@ +{ + stdenv, + lib, + fetchFromGitHub, + meson, + ninja, + pkg-config, + python3, +}: +stdenv.mkDerivation (final: { + name = "termpaint"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "termpaint"; + repo = "termpaint"; + rev = final.version; + hash = "sha256-AsbUJjz51pedmemI0racMgWRzpbIeNJrK/walFUniR4="; + }; + + patches = [ ./0001-meson.build-use-prefix.patch ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + ]; + + mesonFlags = [ + "-Dttyrescue-fexec-blob=false" + "-Dtools-path=libexec/" + "-Dttyrescue-path=libexec/" + "-Dttyrescue-install=true" + ]; + + doCheck = true; + + meta = { + description = "Low level terminal interface library"; + homepage = "https://github.com/termpaint/termpaint"; + platforms = lib.platforms.unix; + license = lib.licenses.boost; + maintainers = with lib.maintainers; [ + istoph + textshell + ]; + }; +}) diff --git a/pkgs/by-name/te/termsonic/package.nix b/pkgs/by-name/te/termsonic/package.nix index dda1c016fa319..a91433762f60d 100644 --- a/pkgs/by-name/te/termsonic/package.nix +++ b/pkgs/by-name/te/termsonic/package.nix @@ -7,14 +7,14 @@ }: buildGoModule rec { name = "termsonic"; - version = "0-unstable-2024-02-02"; + version = "0-unstable-2024-09-15"; src = fetchzip { - url = "https://git.sixfoisneuf.fr/termsonic/snapshot/termsonic-7a3aabee59e1a427aff755fc69759265ad9d0adc.zip"; - hash = "sha256-C5/4679qw4CAdUt9lXpPIR3yejrPdddvmjgbpLF3SvA="; + url = "https://git.sixfoisneuf.fr/termsonic/snapshot/termsonic-93328e0ca6c0ed2424550c7a164b4b1212a554b6.zip"; + hash = "sha256-qn0EB1lCU8nvgwcIuZ0Xt9yGTBz5bSnJelPF8mG6D1k="; }; - vendorHash = "sha256-wCtQD9f1mbN/0qUZnamPoVn9p4Ra5dQ34vlT+XjPF3k="; + vendorHash = "sha256-hBYgRKL9ZFzYy/wLCWacw8I6aqtD5O7lLsB9U5RmLjw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/te/terraform-compliance/package.nix b/pkgs/by-name/te/terraform-compliance/package.nix index f87cdff374f71..7914b32f8e819 100644 --- a/pkgs/by-name/te/terraform-compliance/package.nix +++ b/pkgs/by-name/te/terraform-compliance/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { owner = "terraform-compliance"; repo = "cli"; rev = "refs/tags/${version}"; - sha256 = "sha256-2nf/EJcC4KYTBItByX47UqTSs2EOgsUAgRbLEdB4Iyg="; + hash = "sha256-2nf/EJcC4KYTBItByX47UqTSs2EOgsUAgRbLEdB4Iyg="; }; postPatch = '' diff --git a/pkgs/by-name/te/terraform-local/package.nix b/pkgs/by-name/te/terraform-local/package.nix index 62470b74704d4..34f636cb9e55c 100644 --- a/pkgs/by-name/te/terraform-local/package.nix +++ b/pkgs/by-name/te/terraform-local/package.nix @@ -5,12 +5,12 @@ }: python3Packages.buildPythonApplication rec { pname = "terraform_local"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0E11eaEhz1pwP9MBVilqioj92fZP7wjLJcR4no79n9s="; + hash = "sha256-Lxx/gtjLufFZWzcvOiiSUUptM7JtFnigBN7DG+lhQxg="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix index 01e53dd08f2b1..fe93bb3d30985 100644 --- a/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { owner = "hashicorp"; repo = "terraform-plugin-docs"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UEF+CsY302AJApDhnrPoTo09EcR/VOo10bXSf0XgtZk="; + hash = "sha256-UEF+CsY302AJApDhnrPoTo09EcR/VOo10bXSf0XgtZk="; }; vendorHash = "sha256-ZSHCP0eZWCvSObbUOSl0ohiiX79MyGC2ALowzvMXMv4="; diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index fa5f133e27cc5..43edfeb3999c7 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.66.9"; + version = "0.67.9"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yL24oxuwdIMaMPQIZFHkp33B8x1TDwjXRkk9fQgMdrY="; + hash = "sha256-TDYYPR+Sak2Kv89Fp+sCi2XC8eYrwVS5RIgzUTXaCRc="; }; nativeBuildInputs = [ go-mockery ]; @@ -21,7 +21,7 @@ buildGoModule rec { make generate-mocks ''; - vendorHash = "sha256-Hg+9Zfv8IQpJEtLh5QHm6HLgn/RTlf723dePD4481fM="; + vendorHash = "sha256-NERvQoxT01ew/rCkEXrthsqF1mXjhxZANBL9ApTyd7o="; doCheck = false; diff --git a/pkgs/by-name/te/testlib/package.nix b/pkgs/by-name/te/testlib/package.nix new file mode 100644 index 0000000000000..9adb20ca208cd --- /dev/null +++ b/pkgs/by-name/te/testlib/package.nix @@ -0,0 +1,35 @@ +{ + fetchFromGitHub, + stdenvNoCC, + lib, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "testlib"; + version = "0.9.41"; + + src = fetchFromGitHub { + owner = "MikeMirzayanov"; + repo = "testlib"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-AttzDYLDlpfL3Zvds6yBR/m6W/3UZKR+1LVylqOTQcw="; + }; + + installPhase = '' + runHook preInstall + install -Dt $out/include/testlib testlib.h + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "C++ library to develop competitive programming problems"; + homepage = "https://github.com/MikeMirzayanov/testlib"; + changelog = "https://github.com/MikeMirzayanov/testlib/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/te/tetragon/package.nix b/pkgs/by-name/te/tetragon/package.nix index cbb940da53e42..c20fbd42ac0e2 100644 --- a/pkgs/by-name/te/tetragon/package.nix +++ b/pkgs/by-name/te/tetragon/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "cilium"; repo = "tetragon"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-KOR5MMRnhrlcMPqRjzjSJXvitiZQ8/tlxEnBiQG2x/Q="; + hash = "sha256-KOR5MMRnhrlcMPqRjzjSJXvitiZQ8/tlxEnBiQG2x/Q="; }; buildInputs = [ diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix index 56e2f60acc862..e42eed4589c17 100644 --- a/pkgs/by-name/te/tetrio-desktop/package.nix +++ b/pkgs/by-name/te/tetrio-desktop/package.nix @@ -1,21 +1,21 @@ -{ stdenv -, lib -, fetchzip -, dpkg -, makeWrapper -, callPackage -, addDriverRunpath -, electron -, withTetrioPlus ? false -, tetrio-plus ? null +{ + stdenv, + lib, + fetchzip, + dpkg, + makeWrapper, + addDriverRunpath, + electron, + withTetrioPlus ? false, + tetrio-plus, }: stdenv.mkDerivation (finalAttrs: { pname = "tetrio-desktop"; - version = "9.0.0"; + version = "9"; src = fetchzip { - url = "https://tetr.io/about/desktop/builds/${lib.versions.major finalAttrs.version}/TETR.IO%20Setup.deb"; + url = "https://tetr.io/about/desktop/builds/${finalAttrs.version}/TETR.IO%20Setup.deb"; hash = "sha256-TgegFy+sHjv0ILaiLO1ghyUhKXoj8v43ACJOJhKyI0c="; nativeBuildInputs = [ dpkg ]; }; @@ -26,20 +26,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = let - tetrio-plus' = - if tetrio-plus == null - then - callPackage ./tetrio-plus.nix - { - tetrio-src = finalAttrs.src; - tetrio-version = finalAttrs.version; - } - else tetrio-plus; - - asarPath = - if withTetrioPlus - then "${tetrio-plus'}/app.asar" - else "opt/TETR.IO/resources/app.asar"; + asarPath = if withTetrioPlus then tetrio-plus else "opt/TETR.IO/resources/app.asar"; in '' runHook preInstall @@ -59,22 +46,25 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' makeShellWrapper '${lib.getExe electron}' $out/bin/tetrio \ --prefix LD_LIBRARY_PATH : ${addDriverRunpath.driverLink}/lib \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags $out/share/TETR.IO/app.asar ''; meta = { changelog = "https://tetr.io/about/desktop/history/"; - description = "TETR.IO desktop client"; + description = "Desktop client for TETR.IO, an online stacker game"; downloadPage = "https://tetr.io/about/desktop/"; homepage = "https://tetr.io"; license = lib.licenses.unfree; longDescription = '' - TETR.IO is a modern yet familiar online stacker. - Play against friends and foes all over the world, or claim a spot on the leaderboards - the stacker future is yours! + TETR.IO is a free-to-win modern yet familiar online stacker. + Play multiplayer games against friends and foes all over the world, or claim a spot on the leaderboards - the stacker future is yours! ''; mainProgram = "tetrio"; - maintainers = with lib.maintainers; [ wackbyte huantian ]; + maintainers = with lib.maintainers; [ + wackbyte + huantian + ]; platforms = [ "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; }; diff --git a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix deleted file mode 100644 index 9c12dd1b9a454..0000000000000 --- a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix +++ /dev/null @@ -1,166 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, rustPlatform -, rustc -, wasm-pack -, wasm-bindgen-cli -, binaryen - -, fetchYarnDeps -, yarn -, fixup-yarn-lock -, nodejs -, asar - -, tetrio-src -, tetrio-version -}: - -let - version = "0.27.2"; - - src = fetchFromGitLab { - owner = "UniQMG"; - repo = "tetrio-plus"; - rev = "electron-v${version}-tetrio-v${lib.versions.major tetrio-version}"; - hash = "sha256-PvTivTt1Zuvk5gaCcQDcIBFsUf/ZG7TJYXqm0NP++Bw="; - fetchSubmodules = true; - - # tetrio-plus uses this info for displaying its version, - # so we need to deep clone to have all the revision history. - # After we're done, we emulate 'leaveDotGit = false' by removing - # all the .git folders. - leaveDotGit = true; - deepClone = true; - postFetch = '' - cd "$out" - git rev-parse --short HEAD~1 > resources/ci-commit-previous - git rev-parse --short HEAD > resources/ci-commit - find "$out" -name .git -print0 | xargs -0 rm -rf - ''; - }; - - wasm-bindgen-82 = wasm-bindgen-cli.override { - version = "0.2.82"; - hash = "sha256-BQ8v3rCLUvyCCdxo5U+NHh30l9Jwvk9Sz8YQv6fa0SU="; - cargoHash = "sha256-mP85+qi2KA0GieaBzbrQOBqYxBZNRJipvd2brCRGyOM="; - }; - - tpsecore = rustPlatform.buildRustPackage { - pname = "tpsecore"; - inherit version src; - - sourceRoot = "${src.name}/tpsecore"; - - cargoHash = "sha256-K9l8wQOtjf3l8gZMMdVnaNrgzVWGl62iBBcpA+ulJbw="; - - nativeBuildInputs = [ - wasm-pack - wasm-bindgen-82 - binaryen - rustc.llvmPackages.lld - ]; - - buildPhase = '' - HOME=$(mktemp -d) wasm-pack build --target web --release - ''; - - installPhase = '' - cp -r pkg/ $out - ''; - - doCheck = false; - - meta = { - description = "Self contained toolkit for creating, editing, and previewing TPSE files"; - homepage = "https://gitlab.com/UniQMG/tpsecore"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ huantian wackbyte ]; - platforms = lib.platforms.linux; - }; - }; - - offlineCache = fetchYarnDeps { - yarnLock = "${src}/resources/desktop-ci/yarn.lock"; - hash = "sha256-LfUC2bkUX+sFq3vMMOC1YVYbpDxUSnLO9GiKdoQBdAw="; - }; - -in -stdenv.mkDerivation (finalAttrs: { - pname = "tetrio-plus"; - inherit version src; - - nativeBuildInputs = [ - yarn - fixup-yarn-lock - nodejs - asar - ]; - - buildPhase = '' - runHook preBuild - - # 'out' is the directory that the tetrio-plus expects the vanilla asar to be - # and this is the directory that will contain the final result that we want - asar extract ${tetrio-src}/opt/TETR.IO/resources/app.asar out - cd out - - # Install custom package.json/yarn.lock that describe the additional node - # dependencies that tetrio-plus needs to run, and install them in our output - cp ../resources/desktop-ci/yarn.lock . - patch package.json ../resources/desktop-ci/package.json.diff - - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror ${offlineCache} - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ - - cd .. - - # The simple build script expects the vanilla asar located here - # This patches the vanilla code to load the tetrio-plus code - ln -s ${tetrio-src}/opt/TETR.IO/resources/app.asar app.asar - node ./scripts/build-electron.js - - # Finally, we install the tetrio-plus code where the above patch script expects - cp -r $src out/tetrioplus - chmod -R u+w out/tetrioplus - - # Disable the uninstall button in the tetrio-plus popup, - # as it doesn't make sense to mutably uninstall it in a nix package - substituteInPlace out/tetrioplus/desktop-manifest.js \ - --replace-fail '"show_uninstaller_button": true' '"show_uninstaller_button": false' - - # We don't need the tpsecore source code bundled - rm -rf out/tetrioplus/tpsecore/ - # since we install the compiled version here - cp ${tpsecore}/{tpsecore_bg.wasm,tpsecore.js} out/tetrioplus/source/lib/ - - runHook postBuild - ''; - - installPhase = '' - runHook preinstall - - mkdir -p $out - asar pack out $out/app.asar - - runHook postinstall - ''; - - meta = { - description = "TETR.IO customization tool suite"; - downloadPage = "https://gitlab.com/UniQMG/tetrio-plus/-/releases"; - homepage = "https://gitlab.com/UniQMG/tetrio-plus"; - license = [ - lib.licenses.mit - # while tetrio-plus is itself mit, the result of this derivation - # is a modified version of tetrio-desktop, which is unfree. - lib.licenses.unfree - ]; - maintainers = with lib.maintainers; [ huantian wackbyte ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/te/tetrio-plus/package.nix b/pkgs/by-name/te/tetrio-plus/package.nix new file mode 100644 index 0000000000000..86ee4bda8d703 --- /dev/null +++ b/pkgs/by-name/te/tetrio-plus/package.nix @@ -0,0 +1,166 @@ +{ + lib, + stdenv, + fetchFromGitLab, + rustPlatform, + rustc, + wasm-pack, + wasm-bindgen-cli, + binaryen, + + fetchYarnDeps, + yarn, + fixup-yarn-lock, + nodejs, + asar, + + tetrio-desktop, +}: + +let + version = "0.27.4"; + rev = "electron-v${version}-tetrio-v${tetrio-desktop.version}"; + + src = fetchFromGitLab { + owner = "UniQMG"; + repo = "tetrio-plus"; + inherit rev; + hash = "sha256-HwGFg8dxqtqghdP+PXWXr6Fi5vfgopThs+QNa3N1awk="; + fetchSubmodules = true; + }; + + wasm-bindgen-82 = wasm-bindgen-cli.override { + version = "0.2.82"; + hash = "sha256-BQ8v3rCLUvyCCdxo5U+NHh30l9Jwvk9Sz8YQv6fa0SU="; + cargoHash = "sha256-mP85+qi2KA0GieaBzbrQOBqYxBZNRJipvd2brCRGyOM="; + }; + + tpsecore = rustPlatform.buildRustPackage { + pname = "tpsecore"; + inherit version src; + + sourceRoot = "${src.name}/tpsecore"; + + cargoHash = "sha256-zqeoPeGZvSz7W3c7MXnvvq73hvavg1RGzPc3iTqAjBo="; + + nativeBuildInputs = [ + wasm-pack + wasm-bindgen-82 + binaryen + rustc.llvmPackages.lld + ]; + + buildPhase = '' + HOME=$(mktemp -d) wasm-pack build --target web --release + ''; + + installPhase = '' + cp -r pkg/ $out + ''; + + doCheck = false; + + meta = { + description = "Self contained toolkit for creating, editing, and previewing TPSE files"; + homepage = "https://gitlab.com/UniQMG/tpsecore"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + huantian + wackbyte + ]; + platforms = lib.platforms.linux; + }; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/resources/desktop-ci/yarn.lock"; + hash = "sha256-LfUC2bkUX+sFq3vMMOC1YVYbpDxUSnLO9GiKdoQBdAw="; + }; + +in +stdenv.mkDerivation (finalAttrs: { + pname = "tetrio-plus"; + inherit version src; + + nativeBuildInputs = [ + yarn + fixup-yarn-lock + nodejs + asar + ]; + + buildPhase = '' + runHook preBuild + + # tetrio-plus expects the vanilla asar to be extracted into 'out' and + # 'out' is the directory contianing the final patched asar's contents + asar extract ${tetrio-desktop.src}/opt/TETR.IO/resources/app.asar out + + # Install custom package.json/yarn.lock that describe the additional node + # dependencies that tetrio-plus needs to run, and install them in our output + cd out + + cp ../resources/desktop-ci/yarn.lock . + patch package.json ../resources/desktop-ci/package.json.diff + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror ${offlineCache} + fixup-yarn-lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + + cd .. + + # The included build script expects the vanilla asar located here + # This patches the vanilla code to load the tetrio-plus code + ln -s ${tetrio-desktop.src}/opt/TETR.IO/resources/app.asar app.asar + node ./scripts/build-electron.js + + # Actually install tetrio-plus where the above patch script expects + cp -r $src out/tetrioplus + chmod -R u+w out/tetrioplus + + # Install tpsecore + cp ${tpsecore}/{tpsecore_bg.wasm,tpsecore.js} out/tetrioplus/source/lib/ + # Remove uneeded tpsecore source code + rm -rf out/tetrioplus/tpsecore/ + + # Disable useless uninstall button in the tetrio-plus popup + substituteInPlace out/tetrioplus/desktop-manifest.js \ + --replace-fail '"show_uninstaller_button": true' '"show_uninstaller_button": false' + + # Display 'nixpkgs' next to version in tetrio-plus popup + echo "nixpkgs" > out/tetrioplus/resources/override-commit + + runHook postBuild + ''; + + installPhase = '' + runHook preinstall + + asar pack out $out + + runHook postinstall + ''; + + meta = { + description = "Modified TETR.IO desktop app.asar with many customization tools"; + longDescription = '' + To use this, `override` the `withTetrioPlus` attribute of `tetrio-desktop`. + ''; + homepage = "https://gitlab.com/UniQMG/tetrio-plus"; + downloadPage = "https://gitlab.com/UniQMG/tetrio-plus/-/releases"; + changelog = "https://gitlab.com/UniQMG/tetrio-plus/-/releases/${rev}"; + license = [ + lib.licenses.mit + # while tetrio-plus is itself mit, the result of this derivation + # is a modified version of tetrio-desktop, which is unfree. + lib.licenses.unfree + ]; + maintainers = with lib.maintainers; [ + huantian + wackbyte + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/te/tex-fmt/package.nix b/pkgs/by-name/te/tex-fmt/package.nix new file mode 100644 index 0000000000000..2a13821d7297b --- /dev/null +++ b/pkgs/by-name/te/tex-fmt/package.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "tex-fmt"; + version = "0.4.4"; + + src = fetchFromGitHub { + owner = "WGUNDERWOOD"; + repo = "tex-fmt"; + rev = "refs/tags/v${version}"; + hash = "sha256-o8TlD0qxz/0sS45tnBNXYNDzp+VAhH3Ym1odSleD/uw="; + }; + + cargoHash = "sha256-N3kCeBisjeOAG45QPQhplGRAvj5kebEX4U9pisM/GUQ="; + + meta = { + description = "LaTeX formatter written in Rust"; + homepage = "https://github.com/WGUNDERWOOD/tex-fmt"; + license = lib.licenses.mit; + mainProgram = "tex-fmt"; + maintainers = with lib.maintainers; [ wgunderwood ]; + }; +} diff --git a/pkgs/by-name/te/textlint-plugin-org/package.nix b/pkgs/by-name/te/textlint-plugin-org/package.nix new file mode 100644 index 0000000000000..71e32af51537e --- /dev/null +++ b/pkgs/by-name/te/textlint-plugin-org/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + buildNpmPackage, + textlint, + textlint-plugin-org, + textlint-rule-max-comma, +}: + +buildNpmPackage rec { + pname = "textlint-plugin-org"; + version = "0.3.7"; + + src = fetchFromGitHub { + owner = "kijimaD"; + repo = "textlint-plugin-org"; + rev = "refs/tags/v${version}"; + hash = "sha256-BW+b09nv9Mzl3cUcOOpHoRz8tGLxuGGo4UCY6kdUlXA="; + }; + + npmDepsHash = "sha256-J1ksstPED7FwB80N4CzfZ1i2xc3Wmu7s4T3acOrWA9s="; + + passthru.tests = textlint.testPackages { + inherit (textlint-plugin-org) pname; + rule = textlint-rule-max-comma; + plugin = textlint-plugin-org; + testFile = ./test.org; + }; + + meta = { + description = "Org mode support for textlint"; + homepage = "https://github.com/kijimaD/textlint-plugin-org"; + changelog = "https://github.com/kijimaD/textlint-plugin-org/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/by-name/te/textlint-plugin-org/test.org b/pkgs/by-name/te/textlint-plugin-org/test.org new file mode 100644 index 0000000000000..91c125e300718 --- /dev/null +++ b/pkgs/by-name/te/textlint-plugin-org/test.org @@ -0,0 +1,2 @@ +#+title: textlint-plugin-org test +Nix, is a tool, that takes a unique approach to package management and system configuration, Learn how to make reproducible, declarative, and reliable systems. diff --git a/pkgs/by-name/te/textlint-rule-abbr-within-parentheses/package.nix b/pkgs/by-name/te/textlint-rule-abbr-within-parentheses/package.nix index 96e3906930e26..cb49f5e203125 100644 --- a/pkgs/by-name/te/textlint-rule-abbr-within-parentheses/package.nix +++ b/pkgs/by-name/te/textlint-rule-abbr-within-parentheses/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Textlint rule check if write abbreviations within parentheses"; homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses"; - changelog = "https://github.com/azu/textlint-rule-abbr-within-parentheses/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/azu/textlint-rule-abbr-within-parentheses/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; platforms = textlint.meta.platforms; diff --git a/pkgs/by-name/te/textlint-rule-alex/package.nix b/pkgs/by-name/te/textlint-rule-alex/package.nix index 343cd6da82179..7f86de2156250 100644 --- a/pkgs/by-name/te/textlint-rule-alex/package.nix +++ b/pkgs/by-name/te/textlint-rule-alex/package.nix @@ -27,7 +27,7 @@ buildNpmPackage rec { meta = { description = "Textlint rule for alex"; homepage = "https://github.com/textlint-rule/textlint-rule-alex"; - changelog = "https://github.com/textlint-rule/textlint-rule-alex/releases/tag/${src.rev}"; + changelog = "https://github.com/textlint-rule/textlint-rule-alex/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/by-name/te/textlint-rule-en-max-word-count/package.nix b/pkgs/by-name/te/textlint-rule-en-max-word-count/package.nix index 893ed385dabb2..8482667f8fcec 100644 --- a/pkgs/by-name/te/textlint-rule-en-max-word-count/package.nix +++ b/pkgs/by-name/te/textlint-rule-en-max-word-count/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Textlint rule that specify the maximum word count of a sentence"; homepage = "https://github.com/textlint-rule/textlint-rule-en-max-word-count"; - changelog = "https://github.com/textlint-rule/textlint-rule-en-max-word-count/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/textlint-rule/textlint-rule-en-max-word-count/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; platforms = textlint.meta.platforms; diff --git a/pkgs/by-name/te/textlint-rule-max-comma/package.nix b/pkgs/by-name/te/textlint-rule-max-comma/package.nix index 5afea41bd8c76..46c9f21c19c28 100644 --- a/pkgs/by-name/te/textlint-rule-max-comma/package.nix +++ b/pkgs/by-name/te/textlint-rule-max-comma/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Textlint rule is that limit maximum comma(,) count of sentence"; homepage = "https://github.com/textlint-rule/textlint-rule-max-comma"; - changelog = "https://github.com/textlint-rule/textlint-rule-max-comma/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/textlint-rule/textlint-rule-max-comma/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; platforms = textlint.meta.platforms; diff --git a/pkgs/by-name/te/textlint-rule-no-start-duplicated-conjunction/package.nix b/pkgs/by-name/te/textlint-rule-no-start-duplicated-conjunction/package.nix index 1390e9ac54b12..e6771f8879fbd 100644 --- a/pkgs/by-name/te/textlint-rule-no-start-duplicated-conjunction/package.nix +++ b/pkgs/by-name/te/textlint-rule-no-start-duplicated-conjunction/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Textlint rule that check no start with duplicated conjunction"; homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction"; - changelog = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; platforms = textlint.meta.platforms; diff --git a/pkgs/by-name/te/textlint-rule-period-in-list-item/package.nix b/pkgs/by-name/te/textlint-rule-period-in-list-item/package.nix index 22397ccc42ff3..1e8c0436e5ea3 100644 --- a/pkgs/by-name/te/textlint-rule-period-in-list-item/package.nix +++ b/pkgs/by-name/te/textlint-rule-period-in-list-item/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Textlint rule that check with or without period in list item"; homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item"; - changelog = "https://github.com/textlint-rule/textlint-rule-period-in-list-item/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/textlint-rule/textlint-rule-period-in-list-item/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; platforms = textlint.meta.platforms; diff --git a/pkgs/by-name/te/textlint-rule-stop-words/package.nix b/pkgs/by-name/te/textlint-rule-stop-words/package.nix index f2fa8ca901cc2..425aa5cf45f48 100644 --- a/pkgs/by-name/te/textlint-rule-stop-words/package.nix +++ b/pkgs/by-name/te/textlint-rule-stop-words/package.nix @@ -29,7 +29,7 @@ buildNpmPackage rec { meta = { description = "Textlint rule to find filler words, buzzwords and clichés"; homepage = "https://github.com/sapegin/textlint-rule-stop-words"; - changelog = "https://github.com/sapegin/textlint-rule-stop-words/releases/tag/${src.rev}"; + changelog = "https://github.com/sapegin/textlint-rule-stop-words/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/by-name/te/textlint-rule-terminology/package.nix b/pkgs/by-name/te/textlint-rule-terminology/package.nix index ac6ab2dd8ff06..4352569b53254 100644 --- a/pkgs/by-name/te/textlint-rule-terminology/package.nix +++ b/pkgs/by-name/te/textlint-rule-terminology/package.nix @@ -29,7 +29,7 @@ buildNpmPackage rec { meta = { description = "Textlint rule to check correct terms spelling"; homepage = "https://github.com/sapegin/textlint-rule-terminology"; - changelog = "https://github.com/sapegin/textlint-rule-terminology/releases/tag/${src.rev}"; + changelog = "https://github.com/sapegin/textlint-rule-terminology/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/by-name/te/textlint-rule-unexpanded-acronym/package.nix b/pkgs/by-name/te/textlint-rule-unexpanded-acronym/package.nix index a0a7cc87bff04..aebf8bdae0a55 100644 --- a/pkgs/by-name/te/textlint-rule-unexpanded-acronym/package.nix +++ b/pkgs/by-name/te/textlint-rule-unexpanded-acronym/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Textlint rule that check unexpanded acronym"; homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym"; - changelog = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; platforms = textlint.meta.platforms; diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix new file mode 100644 index 0000000000000..4842cb0a7d426 --- /dev/null +++ b/pkgs/by-name/th/thanos/package.nix @@ -0,0 +1,64 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + go, + nix-update-script, + nixosTests, + testers, + thanos, +}: + +buildGoModule rec { + pname = "thanos"; + version = "0.36.1"; + + src = fetchFromGitHub { + owner = "thanos-io"; + repo = "thanos"; + rev = "refs/tags/v${version}"; + hash = "sha256-Zcc860kQkVP1DPyadBoalhcvwh5HF9CgQyjzWRdeXt0="; + }; + + vendorHash = "sha256-d+jHGmCfx9Ffm5pajm1RvKnMea99JswL0I8nmILXN50="; + + subPackages = "cmd/thanos"; + + ldflags = + let + t = "github.com/prometheus/common/version"; + in + [ + "-X ${t}.Version=${version}" + "-X ${t}.Revision=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + "-X ${t}.GoVersion=${lib.getVersion go}" + ]; + + doCheck = true; + + passthru = { + updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) thanos; + version = testers.testVersion { + command = "thanos --version"; + package = thanos; + }; + }; + }; + + meta = with lib; { + description = "Highly available Prometheus setup with long term storage capabilities"; + homepage = "https://github.com/thanos-io/thanos"; + changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}"; + license = licenses.asl20; + mainProgram = "thanos"; + maintainers = with maintainers; [ + basvandijk + anthonyroussel + ]; + }; +} diff --git a/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix b/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix index 8b43215c52dc0..e8f670f97ad06 100644 --- a/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix +++ b/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { owner = "tactikauan"; repo = "thcrap-steam-proton-wrapper"; rev = "2b636c3f5f1ce1b9b41f731aa9397aa68d2ce66b"; - sha256 = "sha256-J2O8F75NMdsxSaNVr8zLf+vLEJE6CHqWQIIscuuJZ3o="; + hash = "sha256-J2O8F75NMdsxSaNVr8zLf+vLEJE6CHqWQIIscuuJZ3o="; }; buildInputs = [ subversion ]; diff --git a/pkgs/by-name/th/the-legend-of-edgar/package.nix b/pkgs/by-name/th/the-legend-of-edgar/package.nix index 509c6e65524b3..5ab2fd0858a67 100644 --- a/pkgs/by-name/th/the-legend-of-edgar/package.nix +++ b/pkgs/by-name/th/the-legend-of-edgar/package.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "edgar"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix index 25da4e5d88183..771965b4068a9 100644 --- a/pkgs/by-name/th/the-powder-toy/package.nix +++ b/pkgs/by-name/th/the-powder-toy/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - ] ++ lib.optional stdenv.isLinux copyDesktopItems; + ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ bzip2 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { luajit SDL2 zlib - ] ++ lib.optional stdenv.isDarwin Cocoa; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ]; diff --git a/pkgs/by-name/th/thefuck/package.nix b/pkgs/by-name/th/thefuck/package.nix index 7d908b9f8d99f..e0cd1b7b5d0cb 100644 --- a/pkgs/by-name/th/thefuck/package.nix +++ b/pkgs/by-name/th/thefuck/package.nix @@ -33,7 +33,7 @@ python311Packages.buildPythonApplication rec { pytest-mock ]); - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_settings_defaults" "test_from_file" "test_from_env" diff --git a/pkgs/by-name/th/thonny/package.nix b/pkgs/by-name/th/thonny/package.nix new file mode 100644 index 0000000000000..f230b24d582a9 --- /dev/null +++ b/pkgs/by-name/th/thonny/package.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + fetchFromGitHub, + python3, + makeDesktopItem, + copyDesktopItems, + desktopToDarwinBundle, +}: + +with python3.pkgs; + +buildPythonApplication rec { + pname = "thonny"; + version = "4.1.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-/ms2RESnV3bsJpK1zYYLHNUu1FtA6PntaseTbKMfUMc="; + }; + + nativeBuildInputs = [ + copyDesktopItems + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; + + desktopItems = [ + (makeDesktopItem { + name = "Thonny"; + exec = "thonny"; + icon = "thonny"; + desktopName = "Thonny"; + comment = "Python IDE for beginners"; + categories = [ + "Development" + "IDE" + ]; + }) + ]; + + dependencies = + with python3.pkgs; + ( + [ + jedi + pyserial + tkinter + docutils + pylint + mypy + pyperclip + asttokens + send2trash + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus-next + ] + ); + + preFixup = '' + wrapProgram "$out/bin/thonny" \ + --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3.pkgs.jedi}) + ''; + + postInstall = '' + install -Dm644 ./packaging/icons/thonny-48x48.png $out/share/icons/hicolor/48x48/apps/thonny.png + ''; + + # Tests need a DISPLAY + doCheck = false; + + meta = { + description = "Python IDE for beginners"; + longDescription = '' + Thonny is a Python IDE for beginners. It supports different ways + of stepping through the code, step-by-step expression + evaluation, detailed visualization of the call stack and a mode + for explaining the concepts of references and heap. + ''; + homepage = "https://www.thonny.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ leenaars ]; + platforms = lib.platforms.unix; + mainProgram = "thonny"; + }; +} diff --git a/pkgs/by-name/th/thrift-ls/package.nix b/pkgs/by-name/th/thrift-ls/package.nix new file mode 100644 index 0000000000000..9eba51c0b6808 --- /dev/null +++ b/pkgs/by-name/th/thrift-ls/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "thrift-ls"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "joyme123"; + repo = "thrift-ls"; + rev = "v${version}"; + hash = "sha256-ywrb1pOpqHnVhb9MA2cgkF5croA9iqtvLxvVmeloOpE="; + }; + + vendorHash = "sha256-YoZ2dku84065Ygh9XU6dOwmCkuwX0r8a0Oo8c1HPsS4="; + + postInstall = '' + mv $out/bin/thrift-ls $out/bin/thriftls + ''; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Thrift Language Server"; + homepage = "https://github.com/joyme123/thrift-ls"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + callumio + hughmandalidis + ]; + mainProgram = "thriftls"; + }; +} diff --git a/pkgs/by-name/th/thumbdrives/package.nix b/pkgs/by-name/th/thumbdrives/package.nix new file mode 100644 index 0000000000000..f4f4015c8ed4f --- /dev/null +++ b/pkgs/by-name/th/thumbdrives/package.nix @@ -0,0 +1,66 @@ +{ + lib, + python3, + fetchFromSourcehut, + gtk3, + libhandy_0, + gobject-introspection, + meson, + pkg-config, + ninja, + gettext, + glib, + desktop-file-utils, + wrapGAppsHook3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "thumbdrives"; + version = "0.3.2"; + + format = "other"; + + src = fetchFromSourcehut { + owner = "~martijnbraam"; + repo = pname; + rev = version; + hash = "sha256-Mh3NSEYscnzw6kjR9m0XbTygj07cIQwdyLcdLpfKi3Y="; + }; + + postPatch = '' + patchShebangs build-aux/meson + ''; + + nativeBuildInputs = [ + meson + pkg-config + ninja + gettext + glib + gtk3 + desktop-file-utils + wrapGAppsHook3 + gobject-introspection + ]; + + buildInputs = [ + gtk3 + libhandy_0 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + pyxdg + ]; + + meta = with lib; { + description = "USB mass storage emulator for Linux handhelds"; + homepage = "https://sr.ht/~martijnbraam/thumbdrives/"; + license = licenses.mit; + maintainers = with maintainers; [ + chuangzhu + Luflosi + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ti/tidgi/package.nix b/pkgs/by-name/ti/tidgi/package.nix index 538b157dbec34..0717dd8239f44 100644 --- a/pkgs/by-name/ti/tidgi/package.nix +++ b/pkgs/by-name/ti/tidgi/package.nix @@ -9,18 +9,18 @@ stdenv.mkDerivation rec { version = "0.9.6"; src = - if stdenv.isAarch64 + if stdenv.hostPlatform.isAarch64 then fetchurl { url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${version}/TidGi-darwin-arm64-${version}.zip"; - sha256 = "sha256-1Z9lxZZWrUVQEhBO/Kt2AS/uNs2XfihdL0iGrguPQ5g="; + hash = "sha256-1Z9lxZZWrUVQEhBO/Kt2AS/uNs2XfihdL0iGrguPQ5g="; } else fetchurl { url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${version}/TidGi-darwin-x64-${version}.zip"; - sha256 = "sha256-5jHW/QrgzsGQfX4LvsRebdOJPzYTvhtC5mczxp2wPI8="; + hash = "sha256-5jHW/QrgzsGQfX4LvsRebdOJPzYTvhtC5mczxp2wPI8="; }; dontBuild = true; diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index 0d5bfea5f77bb..3961816fffbfa 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -1,51 +1,63 @@ -{ lib -, stdenv -, fetchFromGitHub -, zig_0_11 -, testers -, tigerbeetle -, nix-update-script +{ + lib, + stdenvNoCC, + fetchzip, + testers, + tigerbeetle, + nix-update-script, }: let - # Read [these comments](pkgs/development/compilers/zig/hook.nix#L12-L30) on the default Zig flags, and the associated links. tigerbeetle stopped exposing the `-Doptimize` build flag, so we can't use the default Nixpkgs zig hook as-is. tigerbeetle only exposes a boolean `-Drelease` flag which we'll add in the tigerbeetle derivation in this file. - custom_zig_hook = zig_0_11.hook.overrideAttrs (previousAttrs: { - zig_default_flags = builtins.filter (flag: builtins.match "-Doptimize.*" flag == null) previousAttrs.zig_default_flags; - }); + platform = + if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; + hash = builtins.getAttr platform { + "universal-macos" = "sha256-UfGVPPJAx+2oi+LwoLBfBPDFvcAbHlSxFReQ+PoKZ+0="; + "x86_64-linux" = "sha256-Ohi1dXAlkMvVlVl4B2VEwiIBbYlpBMoTPBOEtTIQM+E="; + "aarch64-linux" = "sha256-RIwcJzmS2wCr42NvE/0Mg/jy4Bn644ZvWSCFjb3Va2o="; + }; in -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.15.3"; + version = "0.16.3"; - src = fetchFromGitHub { - owner = "tigerbeetle"; - repo = "tigerbeetle"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-3+uCMoOnyvI//ltEaqTIXytUxxgJrfMnFly11WCh66Q="; + src = fetchzip { + url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; + inherit hash; }; - env.TIGERBEETLE_RELEASE = finalAttrs.version; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall - nativeBuildInputs = [ custom_zig_hook ]; + mkdir -p $out/bin + cp $src/tigerbeetle $out/bin/tigerbeetle - zigBuildFlags = [ - "-Drelease" - "-Dgit-commit=0000000000000000000000000000000000000000" - ]; + runHook postInstall + ''; passthru = { tests.version = testers.testVersion { package = tigerbeetle; command = "tigerbeetle version"; }; - updateScript = nix-update-script { }; + updateScript = ./update.sh; }; meta = { homepage = "https://tigerbeetle.com/"; description = "Financial accounting database designed to be distributed and fast"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ danielsidhion ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + danielsidhion + nwjsmith + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ] ++ lib.platforms.darwin; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; mainProgram = "tigerbeetle"; }; }) diff --git a/pkgs/by-name/ti/tigerbeetle/update.sh b/pkgs/by-name/ti/tigerbeetle/update.sh new file mode 100755 index 0000000000000..903d875df681b --- /dev/null +++ b/pkgs/by-name/ti/tigerbeetle/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nix mktemp unzip gnused + +set -euo pipefail + +latest_release_info=$(curl -s ${GITHUB_TOKEN:+ -H "Authorization: Bearer $GITHUB_TOKEN"} https://api.github.com/repos/tigerbeetle/tigerbeetle/releases?per_page=5 | jq -r "map(select(.properties.draft and .properties.prerelease | not)) | .[0]") +latestVersion=$(jq -r ".tag_name" <<< $latest_release_info) +currentVersion=$(nix-instantiate --eval -E "let pkgs = import ./. {}; in pkgs.tigerbeetle.version" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]] +then + echo "New version same as old version, nothing to do." >&2 + exit 0 +fi + +# Note: our own nix-prefetch-url impersonation because the way that nix-prefetch-url treats tigerbeetle's zip files (which are just a single executable, no directories) is different from how Nixpkgs's fetchzip treats them. +retrieved_hash="" +function retrieve_hash { + download_dir=$(mktemp -d) + curl -s --location $1 --output "$download_dir/tigerbeetle.zip" + unzip -q "$download_dir/tigerbeetle.zip" -d "$download_dir" + rm "$download_dir/tigerbeetle.zip" + retrieved_hash=$(nix --extra-experimental-features nix-command hash path "$download_dir") + rm -rf "$download_dir" +} + +nixFile=$(nix-instantiate --eval --strict -A "tigerbeetle.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') + +sed -i "s|\(version = \"\)\(.*\)\"|\1$latestVersion\"|" $nixFile +retrieve_hash "https://github.com/tigerbeetle/tigerbeetle/releases/download/${latestVersion}/tigerbeetle-x86_64-linux.zip" +sed -i "s|\(\"x86_64-linux\" = \"\)\(.*\)\"|\1$retrieved_hash\"|" $nixFile +retrieve_hash "https://github.com/tigerbeetle/tigerbeetle/releases/download/${latestVersion}/tigerbeetle-aarch64-linux.zip" +sed -i "s|\(\"aarch64-linux\" = \"\)\(.*\)\"|\1$retrieved_hash\"|" $nixFile +retrieve_hash "https://github.com/tigerbeetle/tigerbeetle/releases/download/${latestVersion}/tigerbeetle-universal-macos.zip" +sed -i "s|\(\"universal-macos\" = \"\)\(.*\)\"|\1$retrieved_hash\"|" $nixFile diff --git a/pkgs/by-name/ti/tile38/package.nix b/pkgs/by-name/ti/tile38/package.nix index 83a763eafcf6d..72194aebfbac2 100644 --- a/pkgs/by-name/ti/tile38/package.nix +++ b/pkgs/by-name/ti/tile38/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tile38"; - version = "1.33.2"; + version = "1.33.3"; src = fetchFromGitHub { owner = "tidwall"; repo = pname; rev = version; - sha256 = "sha256-+HclPZOVBa5cEAuUr5R40+CHI58yZJ6uo8qM06IAgQw="; + hash = "sha256-r13STmaDJz4OGboNPsrJSi668q72Bzffe5TRXJk6pdI="; }; vendorHash = "sha256-nnamNwowRPWQBKUMg800bFgijv8iHbdh/wUwTfX0NcY="; diff --git a/pkgs/applications/emulators/tiny8086/default.nix b/pkgs/by-name/ti/tiny8086/package.nix similarity index 100% rename from pkgs/applications/emulators/tiny8086/default.nix rename to pkgs/by-name/ti/tiny8086/package.nix diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index 36656d2cf59db..48f3ee316831c 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.7.8" @@ -81,9 +87,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -96,33 +102,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -130,9 +136,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "approx" @@ -145,11 +151,10 @@ dependencies = [ [[package]] name = "archery" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8967cd1cc9e9e1954f644e14fbd6042fe9a37da96c52a67e44a2ac18261f8561" +checksum = "eae2ed21cd55021f05707a807a5fc85695dafb98832921f6cfa06db67ca5b869" dependencies = [ - "static_assertions", "triomphe", ] @@ -161,9 +166,9 @@ checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -173,21 +178,27 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.3.0" @@ -202,17 +213,17 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -302,9 +313,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -346,9 +357,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -358,15 +369,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "camino" -version = "1.1.7" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -396,9 +407,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.0" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -478,9 +492,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -488,9 +502,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -503,18 +517,28 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.8" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae" +checksum = "8937760c3f4c60871870b8c3ee5f9b30771f792a7045c48bcbba999d7d6b3b8e" dependencies = [ "clap", ] [[package]] name = "clap_complete_fig" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4bc503cddc1cd320736fb555d6598309ad07c2ddeaa23891a10ffb759ee612" +checksum = "d494102c8ff3951810c72baf96910b980fb065ca5d3101243e6a8dc19747c86b" +dependencies = [ + "clap", + "clap_complete", +] + +[[package]] +name = "clap_complete_nushell" +version = "4.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe32110e006bccf720f8c9af3fee1ba7db290c724eab61544e1d3295be3a40e" dependencies = [ "clap", "clap_complete", @@ -522,27 +546,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clap_mangen" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50dde5bc0c853d6248de457e5eb6e5a674a54b93810a34ded88d882ca1fe2de" +checksum = "f17415fd4dfbea46e3274fcd8d368284519b358654772afb700dc2e8d2b24eeb" dependencies = [ "clap", "roff", @@ -572,9 +596,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "comemo" @@ -606,7 +630,7 @@ checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -617,7 +641,7 @@ checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -644,9 +668,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core_maths" @@ -659,9 +683,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -776,7 +800,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -787,7 +811,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -901,7 +925,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -940,6 +964,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "ena" version = "0.14.3" @@ -987,14 +1017,14 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -1002,9 +1032,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -1047,9 +1077,9 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1062,24 +1092,24 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1096,11 +1126,11 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree", + "roxmltree 0.20.0", ] [[package]] @@ -1212,7 +1242,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -1297,9 +1327,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "globmatch" @@ -1314,9 +1344,9 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -1337,7 +1367,26 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.5.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -1391,7 +1440,7 @@ dependencies = [ "biblatex", "ciborium", "citationberg", - "indexmap 2.2.6", + "indexmap 2.5.0", "numerals", "paste", "serde", @@ -1421,6 +1470,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -1460,6 +1515,29 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", +] + [[package]] name = "httparse" version = "1.9.4" @@ -1488,9 +1566,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -1502,6 +1580,27 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1510,7 +1609,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper", + "hyper 0.14.30", "rustls", "tokio", "tokio-rustls", @@ -1523,12 +1622,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.30", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-tungstenite" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69ce21dae6ce6e5f336a444d846e592faf42c5c28f70a5c8ff67893cbcb304d3" +dependencies = [ + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tokio-tungstenite", + "tungstenite", +] + +[[package]] +name = "hyper-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "tokio", +] + [[package]] name = "hypher" version = "0.1.5" @@ -1537,9 +1666,9 @@ checksum = "3b24ad5637230df201ab1034d593f1d09bf7f2a9274f2e8897638078579f4265" [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1680,7 +1809,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -1762,9 +1891,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1799,9 +1928,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.39.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "globset", @@ -1822,9 +1951,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-docker" @@ -1837,11 +1966,11 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -1858,9 +1987,9 @@ dependencies = [ [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -1894,9 +2023,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1936,7 +2065,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", ] [[package]] @@ -1947,9 +2076,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libm" @@ -1965,6 +2094,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall", ] [[package]] @@ -2016,9 +2146,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lsp-server" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095" +checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9" dependencies = [ "crossbeam-channel", "log", @@ -2047,9 +2177,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -2080,6 +2210,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mintex" version = "0.1.3" @@ -2098,6 +2237,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "mutate_once" version = "0.1.1" @@ -2141,7 +2292,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.48.0", ] @@ -2180,16 +2331,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_threads" version = "0.1.7" @@ -2207,9 +2348,9 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] name = "object" -version = "0.36.1" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -2233,9 +2374,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -2254,7 +2395,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -2265,9 +2406,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -2302,7 +2443,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -2323,7 +2464,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.2", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] @@ -2394,7 +2535,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -2446,7 +2587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64 0.22.1", - "indexmap 2.2.6", + "indexmap 2.5.0", "quick-xml 0.32.0", "serde", "time", @@ -2462,23 +2603,24 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" [[package]] name = "postcard" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" dependencies = [ "cobs", - "embedded-io", + "embedded-io 0.4.0", + "embedded-io 0.6.1", "serde", ] @@ -2490,9 +2632,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "pretty" @@ -2530,9 +2675,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" dependencies = [ "cc", ] @@ -2584,9 +2729,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2649,27 +2794,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -2712,7 +2848,7 @@ dependencies = [ "ecow 0.2.2", "futures", "fxhash", - "indexmap 2.2.6", + "indexmap 2.5.0", "log", "nohash-hasher", "notify", @@ -2776,7 +2912,7 @@ version = "0.5.0-rc7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea592d6cfc00420d0719170a6c0dd71580b1cea6682a5f543b3b683991ec3f6" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "log", "nohash-hasher", "parking_lot", @@ -2815,9 +2951,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2862,10 +2998,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.30", "hyper-rustls", "hyper-tls", "ipnet", @@ -2915,9 +3051,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.44" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -2939,9 +3075,9 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", @@ -2957,9 +3093,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ "proc-macro2", "quote", @@ -2968,9 +3104,9 @@ dependencies = [ [[package]] name = "roff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" +checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" [[package]] name = "roxmltree" @@ -2978,6 +3114,12 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +[[package]] +name = "roxmltree" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + [[package]] name = "rpds" version = "1.1.0" @@ -3030,18 +3172,18 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -3120,11 +3262,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3151,9 +3293,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", "core-foundation", @@ -3164,9 +3306,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -3183,31 +3325,32 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -3220,14 +3363,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -3246,15 +3389,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.3" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -3264,14 +3407,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.3" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3280,7 +3423,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "itoa", "ryu", "serde", @@ -3309,6 +3452,12 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -3332,9 +3481,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "similar" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "simplecss" @@ -3405,23 +3554,17 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "winapi", + "windows-sys 0.59.0", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strict-num" version = "0.1.1" @@ -3465,7 +3608,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3478,7 +3621,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3494,7 +3637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba36b330062be8497fd96597227a757b621b86c4d24d164b06e4522b52b3693e" dependencies = [ "image", - "miniz_oxide", + "miniz_oxide 0.7.4", "once_cell", "pdf-writer", "resvg", @@ -3525,9 +3668,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.70" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -3536,7 +3679,7 @@ dependencies = [ [[package]] name = "sync-lsp" -version = "0.11.20" +version = "0.11.22" dependencies = [ "anyhow", "clap", @@ -3568,7 +3711,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3633,14 +3776,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3675,7 +3819,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.20" +version = "0.11.22" dependencies = [ "insta", "lsp-server", @@ -3687,22 +3831,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3751,7 +3895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bytemuck", "cfg-if", "log", @@ -3772,7 +3916,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.20" +version = "0.11.22" dependencies = [ "anyhow", "async-trait", @@ -3783,6 +3927,7 @@ dependencies = [ "clap_builder", "clap_complete", "clap_complete_fig", + "clap_complete_nushell", "clap_mangen", "codespan-reporting", "comemo 0.4.0", @@ -3791,7 +3936,10 @@ dependencies = [ "dirs", "env_logger", "futures", - "hyper", + "http-body-util", + "hyper 1.4.1", + "hyper-tungstenite", + "hyper-util", "itertools 0.13.0", "log", "lsp-server", @@ -3800,7 +3948,6 @@ dependencies = [ "open", "parking_lot", "paste", - "pin-project-lite", "rayon", "reflexo", "reflexo-typst", @@ -3809,15 +3956,13 @@ dependencies = [ "serde_json", "serde_yaml", "sync-lsp", - "tinymist-assets 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.22 (registry+https://github.com/rust-lang/crates.io-index)", "tinymist-query", "tinymist-render", "tinymist-world", "tokio", "tokio-util", - "toml 0.8.14", - "tower-layer", - "tower-service", + "toml 0.8.19", "typlite", "typst", "typst-ansi-hl", @@ -3825,6 +3970,7 @@ dependencies = [ "typst-pdf", "typst-preview", "typst-render", + "typst-shim", "typst-svg", "typst-timing", "typstfmt_lib", @@ -3834,21 +3980,39 @@ dependencies = [ "walkdir", ] +[[package]] +name = "tinymist-analysis" +version = "0.11.22" +dependencies = [ + "base64 0.22.1", + "comemo 0.4.0", + "ecow 0.2.2", + "insta", + "log", + "regex", + "tinymist-world", + "toml 0.8.19", + "typst", + "typst-svg", + "typst-syntax 0.11.1", +] + [[package]] name = "tinymist-assets" -version = "0.11.20" +version = "0.11.22" [[package]] name = "tinymist-assets" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31caeaeb5d57c7ecd5f5e64aa77504f169f930c534822ba9fd12681866a686e9" +checksum = "133e31d88d00f03791f99009c4102a14b2b1a7474e8179ca7e2e42806c7134ef" [[package]] name = "tinymist-query" -version = "0.11.20" +version = "0.11.22" dependencies = [ "anyhow", + "base64 0.22.1", "biblatex", "chrono", "comemo 0.4.0", @@ -3859,7 +4023,7 @@ dependencies = [ "hashbrown 0.14.5", "hex", "if_chain", - "indexmap 2.2.6", + "indexmap 2.5.0", "insta", "itertools 0.13.0", "log", @@ -3880,11 +4044,15 @@ dependencies = [ "sha2", "siphasher 1.0.1", "strum 0.26.3", - "toml 0.8.14", + "tinymist-analysis", + "tinymist-world", + "toml 0.8.19", "triomphe", "ttf-parser", + "typlite", "typst", "typst-assets", + "typst-shim", "unscanny", "walkdir", "yaml-rust2", @@ -3892,7 +4060,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.20" +version = "0.11.22" dependencies = [ "base64 0.22.1", "log", @@ -3903,17 +4071,22 @@ dependencies = [ [[package]] name = "tinymist-world" -version = "0.11.20" +version = "0.11.22" dependencies = [ "anyhow", "chrono", "clap", "comemo 0.4.0", + "dirs", + "flate2", "log", + "parking_lot", "reflexo-typst", + "reqwest", "serde", "serde_json", - "tinymist-assets 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)", + "tar", + "tinymist-assets 0.11.22 (registry+https://github.com/rust-lang/crates.io-index)", "typst-assets", ] @@ -3945,32 +4118,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3995,9 +4167,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.21.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" dependencies = [ "futures-util", "log", @@ -4007,9 +4179,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -4033,21 +4205,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.15", + "toml_edit 0.22.21", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -4058,7 +4230,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", @@ -4067,28 +4239,22 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.15" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.18", ] -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4109,7 +4275,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -4141,9 +4307,9 @@ checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[package]] name = "tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" dependencies = [ "byteorder", "bytes", @@ -4154,7 +4320,6 @@ dependencies = [ "rand", "sha1", "thiserror", - "url", "utf-8", ] @@ -4183,14 +4348,14 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typlite" -version = "0.11.20" +version = "0.11.22" dependencies = [ "base64 0.22.1", "comemo 0.4.0", "ecow 0.2.2", "insta", "regex", - "tinymist-query", + "tinymist-analysis", "tinymist-world", "typst", "typst-svg", @@ -4202,6 +4367,7 @@ name = "typlite-cli" version = "0.0.0" dependencies = [ "clap", + "ecow 0.2.2", "tinymist-world", "typlite", ] @@ -4228,7 +4394,7 @@ dependencies = [ "icu_segmenter", "if_chain", "image", - "indexmap 2.2.6", + "indexmap 2.5.0", "kamadak-exif", "kurbo", "lipsum", @@ -4241,7 +4407,7 @@ dependencies = [ "qcms", "rayon", "regex", - "roxmltree", + "roxmltree 0.19.0", "rustybuzz", "serde", "serde_json", @@ -4251,7 +4417,7 @@ dependencies = [ "stacker", "syntect", "time", - "toml 0.8.14", + "toml 0.8.19", "ttf-parser", "two-face", "typed-arena", @@ -4296,7 +4462,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -4309,7 +4475,7 @@ dependencies = [ "comemo 0.4.0", "ecow 0.2.2", "image", - "miniz_oxide", + "miniz_oxide 0.7.4", "once_cell", "pdf-writer", "subsetter", @@ -4326,22 +4492,21 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.11.20" +version = "0.11.22" dependencies = [ "clap", "comemo 0.4.0", "env_logger", "futures", - "indexmap 2.2.6", + "indexmap 2.5.0", "log", "once_cell", "reflexo-typst", "reflexo-vec2svg", "serde", "serde_json", - "tinymist-assets 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.22 (registry+https://github.com/rust-lang/crates.io-index)", "tokio", - "tokio-tungstenite", "typst", "typst-assets", ] @@ -4357,7 +4522,7 @@ dependencies = [ "image", "pixglyph", "resvg", - "roxmltree", + "roxmltree 0.19.0", "tiny-skia", "ttf-parser", "typst", @@ -4366,6 +4531,15 @@ dependencies = [ "usvg", ] +[[package]] +name = "typst-shim" +version = "0.11.22" +dependencies = [ + "cfg-if", + "typst", + "typst-syntax 0.11.1", +] + [[package]] name = "typst-svg" version = "0.11.1" @@ -4443,9 +4617,9 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.32" +version = "0.11.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e79e77aac4d80934811be14abd1e2b0e7d3b4059653e24b841ab1ac5bae0" +checksum = "4c430c527e8048f19522448613e95da687ed64fb0a3b78969f0643e6e99a95ef" dependencies = [ "anyhow", "itertools 0.13.0", @@ -4502,9 +4676,9 @@ checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-math-class" @@ -4514,30 +4688,30 @@ checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-vo" @@ -4547,9 +4721,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unsafe-libyaml" @@ -4607,7 +4781,7 @@ dependencies = [ "imagesize", "kurbo", "log", - "roxmltree", + "roxmltree 0.19.0", "simplecss", "siphasher 0.3.11", "svgtypes", @@ -4688,9 +4862,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -4719,34 +4893,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4756,9 +4931,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4766,22 +4941,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasmi" @@ -4825,9 +5000,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4863,11 +5038,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4903,6 +5078,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -5035,9 +5219,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -5136,7 +5320,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", "synstructure", ] @@ -5146,6 +5330,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] @@ -5157,7 +5342,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -5177,7 +5362,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", "synstructure", ] @@ -5213,5 +5398,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 9928080dd117d..5b7c64811f34d 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.20"; + version = "0.11.22"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-wmXFMLLMjMFRuWX9AFk+gJz/4t0+DiOBrvcTx+LQ+tI="; + hash = "sha256-CQt6ptVwx86rYmXSgQ962fJupRQidLRFXU6yYkWasR0="; }; cargoLock = { @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreFoundation darwin.apple_sdk_11_0.frameworks.CoreServices darwin.apple_sdk_11_0.frameworks.Security @@ -53,9 +53,15 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=e2e" + # Fails because of missing `creation_timestamp` field # https://github.com/NixOS/nixpkgs/pull/328756#issuecomment-2241322796 "--skip=test_config_update" + + # Require internet access + "--skip=docs::tests::cetz" + "--skip=docs::tests::tidy" + "--skip=docs::tests::touying" ]; passthru = { diff --git a/pkgs/by-name/ti/tinyxxd/package.nix b/pkgs/by-name/ti/tinyxxd/package.nix new file mode 100644 index 0000000000000..a19f9d7ef3f35 --- /dev/null +++ b/pkgs/by-name/ti/tinyxxd/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + vim, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tinyxxd"; + version = "1.3.5"; + + src = fetchFromGitHub { + repo = "tinyxxd"; + owner = "xyproto"; + rev = "v${finalAttrs.version}"; + hash = "sha256-W7BrQga98ACrhTHF3UlGQMRmcdJaxgorDP6FpD5mr2A="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + installManPage tinyxxd.1 + + # Allow using `tinyxxd` as `xxd`. This is similar to the Arch packaging. + # https://gitlab.archlinux.org/archlinux/packaging/packages/tinyxxd/-/blob/main/PKGBUILD + ln -s $out/bin/{tiny,}xxd + ln -s $out/share/man/man1/{tiny,}xxd.1.gz + ''; + + meta = { + homepage = "https://github.com/xyproto/tinyxxd"; + description = "Drop-in replacement and standalone version of the hex dump utility that comes with ViM"; + license = [ + lib.licenses.mit # or + lib.licenses.gpl2Only + ]; + mainProgram = "tinyxxd"; + maintainers = with lib.maintainers; [ + emily + philiptaron + ]; + platforms = lib.platforms.unix; + + # If the two `xxd` providers are present, choose this one. + priority = (vim.xxd.meta.priority or lib.meta.defaultPriority) - 1; + }; +}) diff --git a/pkgs/by-name/ti/tio/package.nix b/pkgs/by-name/ti/tio/package.nix index ce14065456d84..b0c19c7036654 100644 --- a/pkgs/by-name/ti/tio/package.nix +++ b/pkgs/by-name/ti/tio/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tio"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "tio"; repo = "tio"; rev = "v${finalAttrs.version}"; - hash = "sha256-1NXp94AQOgMNKf+P2eJ6ifUhWSqIYllVeCraBO2pHxQ="; + hash = "sha256-/eXy1roYmeZaQlY4PjBchwRR7JwyTvVIqDmmf6upJqA="; }; strictDeps = true; diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index 66bcca14f0389..648921399aa23 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.60.0"; + version = "2.64.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-29jQiPyHotvBm/puoT/WOVgX1Y3N3Q94O+oJ1IjaoKM="; + hash = "sha256-5HMyqUdoNFwZccXlsFms4C+jyfMVLCiCcFapC6y7e+M="; }; buildInputs = [ sqlite zlib ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Build vector tilesets from large collections of GeoJSON features"; homepage = "https://github.com/felt/tippecanoe"; license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; platforms = platforms.unix; mainProgram = "tippecanoe"; }; diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix index 3a38389ae4a9d..22f8510650740 100644 --- a/pkgs/by-name/tk/tkey-ssh-agent/package.nix +++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "tillitis"; repo = "tkey-ssh-agent"; rev = "v${version}"; - sha256 = "sha256-Uf3VJJfZn4UYX1q79JdaOfrore+L/Mic3whzpP32JV0="; + hash = "sha256-Uf3VJJfZn4UYX1q79JdaOfrore+L/Mic3whzpP32JV0="; }; vendorHash = "sha256-SFyp1UB6+m7/YllRyY56SwweJ3X175bChXQYiG2M7zM="; diff --git a/pkgs/by-name/tl/tlclient/package.nix b/pkgs/by-name/tl/tlclient/package.nix new file mode 100644 index 0000000000000..04dc61b4e7034 --- /dev/null +++ b/pkgs/by-name/tl/tlclient/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + alsa-lib, + libX11, + pcsclite, + testers, +}: + +stdenv.mkDerivation ( + finalAttrs: + let + version = "4.17.0"; + buildNum = "3543"; + in + { + pname = "tlclient"; + version = "${version}-${buildNum}"; + + src = fetchurl { + url = "https://www.cendio.com/downloads/clients/tl-${finalAttrs.version}-client-linux-dynamic-x86_64.tar.gz"; + hash = "sha256-7pl97xGNFwSDpWMpBvkz/bfMsWquVsJVGB+feWJvRQY="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + alsa-lib + libX11 + pcsclite + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + cp -R lib "$out/" + cp -R lib/tlclient/share "$out/" + + install -Dm644 "lib/tlclient/EULA.txt" "$out/share/licenses/tlclient/EULA.txt" + install -m644 "lib/tlclient/open_source_licenses.txt" "$out/share/licenses/tlclient/open_source_licenses.txt" + substituteInPlace "$out/share/applications/thinlinc-client.desktop" \ + --replace-fail "/opt/thinlinc/bin/" "" + + install -Dm644 "etc/tlclient.conf" "$out/etc/tlclient.conf" + install -Dm755 bin/tlclient* -t "$out/bin" + install -Dm644 "lib/tlclient/thinlinc_128.png" "$out/share/icons/hicolor/128x128/apps/thinlinc-client.png" + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "${version} build ${buildNum}"; + }; + + meta = { + description = "Linux remote desktop client built on open source technology"; + license = { + fullName = "Cendio End User License Agreement 3.2"; + url = "https://www.cendio.com/thinlinc/docs/legal/eula"; + free = false; + }; + homepage = "https://www.cendio.com/"; + changelog = "https://www.cendio.com/thinlinc/docs/relnotes/${version}/"; + maintainers = with lib.maintainers; [ felixalbrigtsen ]; + platforms = with lib.platforms; linux ++ darwin ++ windows; + broken = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64); + mainProgram = "tlclient"; + }; + } +) diff --git a/pkgs/development/libraries/tllist/default.nix b/pkgs/by-name/tl/tllist/package.nix similarity index 100% rename from pkgs/development/libraries/tllist/default.nix rename to pkgs/by-name/tl/tllist/package.nix diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix index e0e46552352ae..86e9fe7861b85 100644 --- a/pkgs/by-name/tl/tlrc/package.nix +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/tm/tmpi/package.nix b/pkgs/by-name/tm/tmpi/package.nix index f61af72dc0f27..f745ce52e7485 100644 --- a/pkgs/by-name/tm/tmpi/package.nix +++ b/pkgs/by-name/tm/tmpi/package.nix @@ -5,7 +5,6 @@ , mpich , tmux , reptyr -, autoconf , makeWrapper }: @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ mpi mpich reptyr tmux ]; - buildInputs = [ autoconf makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/tm/tmsu/package.nix b/pkgs/by-name/tm/tmsu/package.nix index 9434f433a2c79..fb7e1fec4a6e8 100644 --- a/pkgs/by-name/tm/tmsu/package.nix +++ b/pkgs/by-name/tm/tmsu/package.nix @@ -13,7 +13,7 @@ buildGoModule { owner = "oniony"; repo = "tmsu"; rev = "0bf4b8031cbeffc0347007d85647062953e90571"; - sha256 = "sha256-5Rmelgiqs7YkdDBZNXZW4sBf0l/bwiq0xxB2tWpm1s8="; + hash = "sha256-5Rmelgiqs7YkdDBZNXZW4sBf0l/bwiq0xxB2tWpm1s8="; }; vendorHash = "sha256-r2wzVkPTsxWdVPFLO84tJgl3VJonoU7kNKLOBgHHdF8="; diff --git a/pkgs/by-name/tm/tmux-cssh/package.nix b/pkgs/by-name/tm/tmux-cssh/package.nix index 7da4293dc0c81..031acfff33a12 100644 --- a/pkgs/by-name/tm/tmux-cssh/package.nix +++ b/pkgs/by-name/tm/tmux-cssh/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "dennishafemann"; repo = "tmux-cssh"; rev = "21750733c5b6fa2fe23b9e50ce69d8564f2f742a"; - sha256 = "473e27f3b69864b905d1340d97917cd202705c761611eb3aec4c24521f69b52c"; + hash = "sha256-Rz4n87aYZLkF0TQNl5F80gJwXHYWEes67EwkUh9ptSw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/to/tocpdf/package.nix b/pkgs/by-name/to/tocpdf/package.nix new file mode 100644 index 0000000000000..ac830f7d1c9f5 --- /dev/null +++ b/pkgs/by-name/to/tocpdf/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3Packages, + fetchPypi, +}: + +python3Packages.buildPythonApplication rec { + pname = "tocpdf"; + version = "0.3.3"; + pyproject = true; + + src = fetchPypi { + pname = "tocPDF"; + inherit version; + hash = "sha256-B+UcvyjWceVErf1uDyGGTGwKBCGHmSOF19Vbk15cPp8="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + click + pdfplumber + pypdf + tika + tqdm + ]; + + # no test + doCheck = false; + + pythonImportsCheck = [ "tocPDF" ]; + + meta = { + description = "Automatic CLI tool for generating outline of PDFs based on the table of contents"; + homepage = "https://github.com/kszenes/tocPDF"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dansbandit ]; + mainProgram = "tocPDF"; + }; +} diff --git a/pkgs/by-name/to/todesk/package.nix b/pkgs/by-name/to/todesk/package.nix new file mode 100644 index 0000000000000..24f9ec992a414 --- /dev/null +++ b/pkgs/by-name/to/todesk/package.nix @@ -0,0 +1,144 @@ +{ + stdenv, + lib, + procps, + fetchurl, + dpkg, + writeShellScript, + buildFHSEnv, + nspr, + kmod, + systemdMinimal, + glib, + pulseaudio, + libXext, + libX11, + libXrandr, + glibc, + cairo, + libva, + libdrm, + coreutils, + libXi, + libGL, + bash, + libXcomposite, + libXdamage, + libXfixes, + libXtst, + nss, + libXxf86vm, + gtk3, + gdk-pixbuf, + pango, + libz, + libayatana-appindicator, +}: + +let + version = "4.7.2.0"; + todesk-unwrapped = stdenv.mkDerivation (finalAttrs: { + pname = "todesk-unwrapped"; + version = version; + src = fetchurl { + url = "https://newdl.todesk.com/linux/todesk-v${finalAttrs.version}-amd64.deb"; + hash = "sha256-v7VpXXFVaKI99RpzUWfAc6eE7NHGJeFrNeUTbVuX+yg="; + curlOptsList = [ + "--user-agent" + "Mozilla/5.0" + ]; + }; + nativeBuildInputs = [ dpkg ]; + + unpackPhase = '' + runHook preUnpack + dpkg -x $src ./todesk-src + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + mkdir -p "$out/lib" + cp -r todesk-src/* "$out" + cp "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" "$out/opt/todesk/bin/libappindicator3.so.1" + mv "$out/opt/todesk/bin" "$out/bin" + cp "$out/bin/libmfx.so.1" "$out/lib" + cp "$out/bin/libglut.so.3" "$out/lib" + mkdir "$out/opt/todesk/config" + mkdir "$out/opt/todesk/bin" + mkdir -p "$out/share/applications" + mkdir "$out/share/icons" + runHook postInstall + ''; + + }); + +in +buildFHSEnv { + inherit version; + name = "todesk"; + targetPkgs = pkgs: [ + todesk-unwrapped + pulseaudio + nspr + kmod + libXi + systemdMinimal + glib + libz + bash + coreutils + libX11 + libXext + libXrandr + glibc + libdrm + libGL + procps + cairo + libXcomposite + libXdamage + libXfixes + libXtst + nss + libXxf86vm + gtk3 + gdk-pixbuf + pango + libva + ]; + extraBwrapArgs = [ + "--bind /var/lib/todesk /opt/todesk/config" # create the folder before bind to avoid permission denided. + "--bind ${todesk-unwrapped}/bin /opt/todesk/bin" + "--bind /var/lib/todesk /etc/todesk" # service write uuid here. Such a pain! + ]; # soft link doesn't work so that we should bind ourselves + runScript = writeShellScript "ToDesk.sh" '' + export LIBVA_DRIVER_NAME=iHD + export LIBVA_DRIVERS_PATH=${todesk-unwrapped}/bin + if [ "''${1}" = 'service' ] + then + /opt/todesk/bin/ToDesk_Service + else + /opt/todesk/bin/ToDesk + fi + ''; # a small script to choose what to exec + extraInstallCommands = '' + mkdir -p "$out/share/applications" + mkdir -p "$out/share/icons" + cp ${todesk-unwrapped}/usr/share/applications/todesk.desktop $out/share/applications + cp -rf ${todesk-unwrapped}/usr/share/icons/* $out/share/icons + substituteInPlace "$out/share/applications/todesk.desktop" \ + --replace-fail '/opt/todesk/bin/ToDesk' "$out/bin/todesk desktop" + substituteInPlace "$out/share/applications/todesk.desktop" \ + --replace-fail '/opt/todesk/bin' "${todesk-unwrapped}/lib" + ''; + meta = { + description = "Remote Desktop Application"; + homepage = "https://www.todesk.com/linux.html"; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + mainProgram = "todesk"; + }; +} diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix index 2c402c008fa7f..cd4d28ca66218 100644 --- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix +++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, - gnome, + gnome-shell, sassc, gnome-themes-extra, gtk-engine-murrine, @@ -83,7 +83,7 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib propagatedUserEnvPkgs = [ gtk-engine-murrine ]; nativeBuildInputs = [ - gnome.gnome-shell + gnome-shell sassc ]; buildInputs = [ gnome-themes-extra ]; diff --git a/pkgs/applications/misc/tomato-c/default.nix b/pkgs/by-name/to/tomato-c/package.nix similarity index 100% rename from pkgs/applications/misc/tomato-c/default.nix rename to pkgs/by-name/to/tomato-c/package.nix diff --git a/pkgs/development/libraries/toml11/default.nix b/pkgs/by-name/to/toml11/package.nix similarity index 100% rename from pkgs/development/libraries/toml11/default.nix rename to pkgs/by-name/to/toml11/package.nix diff --git a/pkgs/development/libraries/tomlc99/default.nix b/pkgs/by-name/to/tomlc99/package.nix similarity index 100% rename from pkgs/development/libraries/tomlc99/default.nix rename to pkgs/by-name/to/tomlc99/package.nix diff --git a/pkgs/development/libraries/tomlcpp/default.nix b/pkgs/by-name/to/tomlcpp/package.nix similarity index 100% rename from pkgs/development/libraries/tomlcpp/default.nix rename to pkgs/by-name/to/tomlcpp/package.nix diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix index 6eb9d0d715b3e..1dc3a8db3c07b 100644 --- a/pkgs/by-name/to/tootik/package.nix +++ b/pkgs/by-name/to/tootik/package.nix @@ -23,7 +23,7 @@ buildGoModule rec { tags = [ "fts5" ]; - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); meta = { description = "Federated nanoblogging service with a Gemini frontend"; diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 85e068db0842b..43293874ddf62 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -29,10 +29,10 @@ , pciutils , zlib -, libnotifySupport ? stdenv.isLinux +, libnotifySupport ? stdenv.hostPlatform.isLinux , libnotify -, waylandSupport ? stdenv.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , libxkbcommon , libdrm , libGL @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.5.2"; + version = "13.5.6"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-f6bKRWirHuOe2BnCYegZi1j58Ou3p6Syw++NVLGUGdU="; + hash = "sha256-dEairGoBMsXF4gtnnqa2KsA8PpW9VwF8woUrInVWuKM="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-ye+l3aq3nV97SUyARZMcPhdtGLoAWoscbr81F5LdbS4="; + hash = "sha256-9WRN+iU7vvt9KvVudsS7qe0hoJwDP/J+yOTHW7nmrxs="; }; }; diff --git a/pkgs/by-name/to/tor-browser/update.nix b/pkgs/by-name/to/tor-browser/update.nix index 04b69d8ce208c..7faf4c31efbf0 100644 --- a/pkgs/by-name/to/tor-browser/update.nix +++ b/pkgs/by-name/to/tor-browser/update.nix @@ -56,7 +56,7 @@ in writeShellScript "update-${pname}" '' for platform in ${lib.escapeShellArgs meta.platforms}; do arch="''${platforms[$platform]}" - sha256=$(grep "${name}-$arch-$version.tar.xz" "$HOME/shasums" | cut -d" " -f1) + sha256=$(grep "${name}-$arch-$version.tar.xz" "$HOME/shasums" | head -1 | cut -d" " -f1) hash=$(nix hash to-sri --type sha256 "$sha256") update-source-version "${pname}" "$version" "$hash" --ignore-same-version --source-key="sources.$platform" diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix index 8c99d22f822cf..8baa3f884c805 100644 --- a/pkgs/by-name/to/totem/package.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -36,24 +36,24 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.major version}/totem-${version}.tar.xz"; - sha256 = "s202VZKLWJZGKk05+Dtq1m0328nJnc6wLqii43OUpB4="; + hash = "sha256-s202VZKLWJZGKk05+Dtq1m0328nJnc6wLqii43OUpB4="; }; patches = [ # Lower X11 dependency version since we do not have it. (fetchpatch { url = "https://gitlab.gnome.org/GNOME/totem/-/commit/140d9eea70c3101ef3234abb4de5974cb84b13db.patch"; - sha256 = "ohppxqMiH8Ksc9B2e3AXighfM6KVN+RNXYL+fLELSN8="; + hash = "sha256-ohppxqMiH8Ksc9B2e3AXighfM6KVN+RNXYL+fLELSN8="; revert = true; }) (fetchpatch { url = "https://gitlab.gnome.org/GNOME/totem/-/commit/2610b4536f73493587e4a5a38e01c9961fcabb96.patch"; - sha256 = "nPfzS+LQuAlyQOz67hCdtx93w2frhgWlg1KGX5bEU38="; + hash = "sha256-nPfzS+LQuAlyQOz67hCdtx93w2frhgWlg1KGX5bEU38="; revert = true; }) (fetchpatch { url = "https://gitlab.gnome.org/GNOME/totem/-/commit/5b871aee5292f25bbf39dca18045732e979e7a68.patch"; - sha256 = "LqQLdgyZkIVc+/hQ5sdBLqhtjCVIMDSs9tjVXwMFodg="; + hash = "sha256-LqQLdgyZkIVc+/hQ5sdBLqhtjCVIMDSs9tjVXwMFodg="; revert = true; }) ]; @@ -130,6 +130,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://apps.gnome.org/Totem/"; + changelog = "https://gitlab.gnome.org/GNOME/totem/-/blob/${version}/NEWS?ref_type=tags"; description = "Movie player for the GNOME desktop based on GStreamer"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins diff --git a/pkgs/by-name/to/toxic/package.nix b/pkgs/by-name/to/toxic/package.nix index d697420bf32ef..036c96dd47d53 100644 --- a/pkgs/by-name/to/toxic/package.nix +++ b/pkgs/by-name/to/toxic/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "TokTok"; repo = "toxic"; rev = "v${version}"; - sha256 = "sha256-+nOjlQED2pbYwGV6IGeKK1pymBSrDVWCWKjZ42vib7E="; + hash = "sha256-+nOjlQED2pbYwGV6IGeKK1pymBSrDVWCWKjZ42vib7E="; }; makeFlags = [ "PREFIX=$(out)"]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk-pixbuf libnotify - ] ++ lib.optionals (!stdenv.isAarch32) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isAarch32) [ openal libopus libvpx freealut qrencode ]; nativeBuildInputs = [ pkg-config libconfig ]; diff --git a/pkgs/by-name/tp/tparse/package.nix b/pkgs/by-name/tp/tparse/package.nix index cdef5f385800b..58e65af868d23 100644 --- a/pkgs/by-name/tp/tparse/package.nix +++ b/pkgs/by-name/tp/tparse/package.nix @@ -5,7 +5,7 @@ }: let pname = "tparse"; - version = "0.14.0"; + version = "0.15.0"; in buildGoModule { inherit pname version; @@ -14,10 +14,16 @@ buildGoModule { owner = "mfridman"; repo = pname; rev = "v${version}"; - hash = "sha256-siw9GihPo6f+OWKvSx0kqC919BuL/YoUI2dUBwTF19U="; + hash = "sha256-CxoVu3WH2I/1wT5o/RGIrGFrGCQOC4vcUKMiH/Gv3aY="; }; - vendorHash = "sha256-j+1B2zWONjFEGoyesX0EW964kD33Jy3O1aB1WEwlESA="; + vendorHash = "sha256-soIti6o8BUnarPf5/bcMJKdEG0oRpDLMkQM6RlbZQ5I="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; meta = { description = "CLI tool for summarizing go test output. Pipe friendly. CI/CD friendly"; diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 9e8bdca664018..ea58c45f579b1 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "tpnote"; - version = "1.24.7"; + version = "1.24.8"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; rev = "v${version}"; - hash = "sha256-BSq+9qjBdJZvx65mumyPbjhbBHpHXgWeGqdx/xevL50="; + hash = "sha256-tn6GCBX3DrqyZZz2FJLTn1vJd4eEbawyJM5huco21/8="; }; - cargoHash = "sha256-jwG68aAG4D+ulsQa+UEyJu5fVwbrHeeW9bJNQfcpg4o="; + cargoHash = "sha256-2qGObTu7g6GbUwd4obgqufig7bABFLBsCWSyZt8AVac="; nativeBuildInputs = [ cmake @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreServices SystemConfiguration diff --git a/pkgs/by-name/tp/tproxy/package.nix b/pkgs/by-name/tp/tproxy/package.nix new file mode 100644 index 0000000000000..47330b6825088 --- /dev/null +++ b/pkgs/by-name/tp/tproxy/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "tproxy"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "kevwan"; + repo = "tproxy"; + rev = "refs/tags/v${version}"; + hash = "sha256-LX3ciC3cMYuQPm6ekEkJPrSdTXH+WZ4flXyrsvJZgn8="; + }; + + vendorHash = "sha256-7s2gnd9UR/R7H5pcA8NcoenaabSVpMh3qzzkOr5RWnU="; + + ldflags = [ + "-w" + "-s" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI tool to proxy and analyze TCP connections"; + homepage = "https://github.com/kevwan/tproxy"; + changelog = "https://github.com/kevwan/tproxy/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ DCsunset ]; + mainProgram = "tproxy"; + }; +} diff --git a/pkgs/by-name/tr/tracker-miners/package.nix b/pkgs/by-name/tr/tracker-miners/package.nix index fb882da42b733..963df6517e35f 100644 --- a/pkgs/by-name/tr/tracker-miners/package.nix +++ b/pkgs/by-name/tr/tracker-miners/package.nix @@ -105,12 +105,12 @@ stdenv.mkDerivation (finalAttrs: { libxml2 poppler taglib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libseccomp networkmanager systemd upower - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ e2fsprogs ]; @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { # security issue since then. Despite a patch now being availab, we're opting # to be safe due to the general state of the project "-Dminer_rss=false" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Dbattery_detection=none" "-Dnetwork_manager=disabled" "-Dsystemd_user_services=false" diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix index 4e462bae4a3b1..5f03796e50acc 100644 --- a/pkgs/by-name/tr/tracy/package.nix +++ b/pkgs/by-name/tr/tracy/package.nix @@ -11,7 +11,7 @@ , pkg-config , tbb -, withWayland ? stdenv.isLinux +, withWayland ? stdenv.hostPlatform.isLinux , libxkbcommon , wayland }: @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "sha256-DN1ExvQ5wcIUyhMAfiakFbZkDsx+5l8VMtYGvSdboPA="; + hash = "sha256-DN1ExvQ5wcIUyhMAfiakFbZkDsx+5l8VMtYGvSdboPA="; }; - patches = lib.optionals (stdenv.isDarwin && !(lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")) [ + patches = lib.optionals (stdenv.hostPlatform.isDarwin && !(lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")) [ ./0001-remove-unifiedtypeidentifiers-framework ]; @@ -37,25 +37,25 @@ stdenv.mkDerivation rec { capstone freetype glfw - ] ++ lib.optionals (stdenv.isLinux && withWayland) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWayland) [ libxkbcommon wayland - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus hicolor-icon-theme tbb - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Carbon - ] ++ lib.optionals (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") [ darwin.apple_sdk.frameworks.UniformTypeIdentifiers ]; env.NIX_CFLAGS_COMPILE = toString ([ ] # Apple's compiler finds a format string security error on # ../../../server/TracyView.cpp:649:34, preventing building. - ++ lib.optional stdenv.isDarwin "-Wno-format-security" - ++ lib.optional stdenv.isLinux "-ltbb" + ++ lib.optional stdenv.hostPlatform.isDarwin "-Wno-format-security" + ++ lib.optional stdenv.hostPlatform.isLinux "-ltbb" ++ lib.optional stdenv.cc.isClang "-faligned-allocation"); buildPhase = '' @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { make -j $NIX_BUILD_CORES -C import-chrome/build/unix release make -j $NIX_BUILD_CORES -C library/unix release make -j $NIX_BUILD_CORES -C profiler/build/unix release \ - ${lib.optionalString (stdenv.isLinux && !withWayland) "LEGACY=1"} + ${lib.optionalString (stdenv.hostPlatform.isLinux && !withWayland) "LEGACY=1"} make -j $NIX_BUILD_CORES -C update/build/unix release runHook postBuild @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { cp -p public/client/*.{h,hpp} $out/include/Tracy/client cp -p public/common/*.{h,hpp} $out/include/Tracy/common cp -p public/tracy/*.{h,hpp} $out/include/Tracy/tracy - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace extra/desktop/tracy.desktop \ --replace Exec=/usr/bin/tracy Exec=tracy @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/tracy ''; diff --git a/pkgs/by-name/tr/transmission_3/package.nix b/pkgs/by-name/tr/transmission_3/package.nix index 21dfed11c543d..a97e2cbb3e7f8 100644 --- a/pkgs/by-name/tr/transmission_3/package.nix +++ b/pkgs/by-name/tr/transmission_3/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "transmission"; repo = "transmission"; rev = finalAttrs.version; - sha256 = "0ccg0km54f700x9p0jsnncnwvfnxfnxf7kcm7pcx1cj0vw78924z"; + hash = "sha256-n4iEDt9AstDZPZXN47p13brNLbNWS3BTB+A4UuoEjzE="; fetchSubmodules = true; }; @@ -88,8 +88,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ] ++ lib.optionals enableSystemd [ systemd ] - ++ lib.optionals stdenv.isLinux [ inotify-tools ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; postInstall = '' mkdir $apparmor @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { include "${apparmorRulesFromClosure { name = "transmission-daemon"; } ([ curl libevent openssl pcre zlib libnatpmp miniupnpc ] ++ lib.optionals enableSystemd [ systemd ] - ++ lib.optionals stdenv.isLinux [ inotify-tools ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ] )}" r @{PROC}/sys/kernel/random/uuid, r @{PROC}/sys/vm/overcommit_memory, diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index a632c7a4bae30..e6d66c9c020cd 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.55.25"; + version = "2.56.19"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-SQ80jT8uMOaQVr9ZmrV6IYbMMdNIcdxEJ2czsRHP2XI="; + hash = "sha256-B2IJU/dtPNUfDC3lFvS4J0zHf1hceoX9YEbyxVYgMt0="; }; postPatch = '' @@ -100,6 +100,6 @@ stdenv.mkDerivation (finalAttrs: { ]; mainProgram = "tpl"; platforms = lib.platforms.all; - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/pkgs/by-name/tr/trexio/package.nix b/pkgs/by-name/tr/trexio/package.nix index 2e61c9f41ea51..da9770a6dff6a 100644 --- a/pkgs/by-name/tr/trexio/package.nix +++ b/pkgs/by-name/tr/trexio/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "trexio"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "TREX-CoE"; repo = pname; rev = "v${version}"; - hash = "sha256-SE5cylLThpwDWyAcQZgawcdYGc/8iiIwL6EyQ+hOIYY="; + hash = "sha256-KP8tpwBr/ymjcXmCssdn+Xti0UKgazJSGTgVpvE+CiM="; }; postPatch = '' diff --git a/pkgs/by-name/tr/tridactyl-native/package.nix b/pkgs/by-name/tr/tridactyl-native/package.nix index 3506f82c0b799..cb9e411b1f0df 100644 --- a/pkgs/by-name/tr/tridactyl-native/package.nix +++ b/pkgs/by-name/tr/tridactyl-native/package.nix @@ -7,7 +7,7 @@ buildNimPackage { owner = "tridactyl"; repo = "native_messenger"; rev = "3059abd9fb3f14d598f6c299335c3ebac5bc689a"; - sha256 = "sha256-gicdpWAoimZMNGLc8w0vtJiFFxeqxB8P4lgWDun7unM="; + hash = "sha256-gicdpWAoimZMNGLc8w0vtJiFFxeqxB8P4lgWDun7unM="; }; lockFile = ./lock.json; diff --git a/pkgs/tools/misc/triehash/default.nix b/pkgs/by-name/tr/triehash/package.nix similarity index 100% rename from pkgs/tools/misc/triehash/default.nix rename to pkgs/by-name/tr/triehash/package.nix diff --git a/pkgs/by-name/tr/trigger-control/package.nix b/pkgs/by-name/tr/trigger-control/package.nix index 3398a3fe0aabb..838aae472d64e 100644 --- a/pkgs/by-name/tr/trigger-control/package.nix +++ b/pkgs/by-name/tr/trigger-control/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 dbus libnotify - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libdecor ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/trigger-control \ --prefix PATH : ${lib.makeBinPath [ zenity ]} ''; diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix index 90a45c133c732..d45aa2fafe65f 100644 --- a/pkgs/by-name/tr/triton-llvm/package.nix +++ b/pkgs/by-name/tr/triton-llvm/package.nix @@ -149,7 +149,7 @@ in stdenv.mkDerivation (finalAttrs: { substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' # Not sure why this fails rm test/tools/llvm-exegesis/AArch64/latency-by-opcode-name.s ''; @@ -161,7 +161,7 @@ in stdenv.mkDerivation (finalAttrs: { doCheck = buildTests; nativeCheckInputs = [ which ] - ++ lib.optionals stdenv.isDarwin [ sysctl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ sysctl ]; checkTarget = "check-all"; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index 2990037a28dbd..dec1e9f26d398 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "troubadix"; - version = "24.8.2"; + version = "24.9.4"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; rev = "refs/tags/v${version}"; - hash = "sha256-rBExXotfI4uG4ns3x1cJTQ0PGABG7ZlziBrqcsa3dOg="; + hash = "sha256-y7IVEDbXYiNi9/SIlbmrkZ5SxrLzYe3Yy8LkP+wID3w="; }; pythonRelaxDeps = [ "validators" ]; diff --git a/pkgs/by-name/tr/trunk-io/package.nix b/pkgs/by-name/tr/trunk-io/package.nix new file mode 100644 index 0000000000000..cb02c0b393d01 --- /dev/null +++ b/pkgs/by-name/tr/trunk-io/package.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation (finalAttrs: { + pname = "trunk-io"; + version = "1.3.2"; + + src = fetchurl { + url = "https://trunk.io/releases/launcher/${finalAttrs.version}/trunk"; + hash = "sha256-zrfnPWHFoFQkVtxPedKrL1Y1xLZSDX3JuF0qgo/hhnE="; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + install -D $src $out/bin/trunk + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + homepage = "https://trunk.io/"; + description = "Developer experience toolkit used to check, test, merge, and monitor code"; + license = licenses.unfree; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ aaronjheng ]; + }; +}) diff --git a/pkgs/development/tools/trunk-io/update.sh b/pkgs/by-name/tr/trunk-io/update.sh similarity index 100% rename from pkgs/development/tools/trunk-io/update.sh rename to pkgs/by-name/tr/trunk-io/update.sh diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix index 3a7f9bd5ba05a..73af1faaba29e 100644 --- a/pkgs/by-name/tr/trunk-ng/package.nix +++ b/pkgs/by-name/tr/trunk-ng/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = if stdenv.isDarwin + buildInputs = if stdenv.hostPlatform.isDarwin then [ libiconv CoreServices Security SystemConfiguration ] else [ openssl ]; diff --git a/pkgs/by-name/ts/tsid/package.nix b/pkgs/by-name/ts/tsid/package.nix new file mode 100644 index 0000000000000..0bd4b08b6025e --- /dev/null +++ b/pkgs/by-name/ts/tsid/package.nix @@ -0,0 +1,68 @@ +{ + cmake, + doxygen, + eiquadprog, + fetchFromGitHub, + lib, + osqp-eigen, + pkg-config, + pinocchio, + proxsuite, + stdenv, + pythonSupport ? false, + python3Packages, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tsid"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "stack-of-tasks"; + repo = "tsid"; + rev = "v${finalAttrs.version}"; + hash = "sha256-id6OCOX01o41Z5kqzwvjYa5uoQZtzhRaFBuOBhbLcTA="; + }; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "BUILD_WITH_OSQP" true) + (lib.cmakeBool "BUILD_WITH_PROXQP" true) + (lib.cmakeBool "INSTALL_DOCUMENTATION" true) + ]; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = + [ + doxygen + cmake + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; + + propagatedBuildInputs = + [ + eiquadprog + osqp-eigen + proxsuite + ] + ++ lib.optional (!pythonSupport) pinocchio ++ lib.optional pythonSupport python3Packages.pinocchio; + + doCheck = true; + pythonImportsCheck = [ "tsid" ]; + + meta = { + description = "Efficient Task Space Inverse Dynamics (TSID) based on Pinocchio"; + homepage = "https://github.com/stack-of-tasks/tsid"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ts/tsm-client/package.nix b/pkgs/by-name/ts/tsm-client/package.nix index c133aae1d671a..bf65c8d0cadc4 100644 --- a/pkgs/by-name/ts/tsm-client/package.nix +++ b/pkgs/by-name/ts/tsm-client/package.nix @@ -45,7 +45,7 @@ # point to this derivations `/dsmi_dir` directory symlink. # Other environment variables might be necessary, # depending on local configuration or usage; see: -# https://www.ibm.com/docs/en/storage-protect/8.1.23?topic=solaris-set-api-environment-variables +# https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=solaris-set-api-environment-variables # The newest version of TSM client should be discoverable by @@ -104,10 +104,10 @@ let unwrapped = stdenv.mkDerivation (finalAttrs: { name = "tsm-client-${finalAttrs.version}-unwrapped"; - version = "8.1.23.0"; + version = "8.1.24.0"; src = fetchurl { url = mkSrcUrl finalAttrs.version; - hash = "sha512-LydzEvzcv7sizSQkVmkbJ/WhunP6oJm32M6nstIfSginCLwYoSb5WbnjeQq2PM2xncFN8W/SteUtCPYbOVKaKA=="; + hash = "sha512-TqTDE2oJK/Wu/MNYUCqxmOE6asAqDLz4GtdcFZuKqvfT8pJUCYKz9yjRPIrM3u2XfLH0wDq+Q8ER4ui680mswA=="; }; inherit meta passthru; diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix new file mode 100644 index 0000000000000..7d8889079a7fa --- /dev/null +++ b/pkgs/by-name/ts/tsukimi/package.nix @@ -0,0 +1,96 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + mpv-unwrapped, + ffmpeg, + libadwaita, + gst_all_1, + openssl, + libepoxy, + wrapGAppsHook4, + makeDesktopItem, + copyDesktopItems, + stdenv, +}: +rustPlatform.buildRustPackage rec { + pname = "tsukimi"; + version = "0.12.2"; + + src = fetchFromGitHub { + owner = "tsukinaha"; + repo = "tsukimi"; + rev = "v${version}"; + hash = "sha256-pJ+SUNGQS/kqBdOg21GgDeZThcjnB0FhgG00qLfqxYA="; + }; + + cargoHash = "sha256-PCJiSyfEgK8inzoRmRvnAU50kLnyVhNrgLrwtBUFpIU="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + copyDesktopItems + ]; + + buildInputs = + [ + mpv-unwrapped + ffmpeg + libadwaita + openssl + libepoxy + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav + ]); + + doCheck = false; # tests require networking + + desktopItems = [ + (makeDesktopItem { + name = "Tsukimi"; + exec = "tsukimi"; + type = "Application"; + icon = "tsukimi"; + categories = [ "AudioVideo" ]; + startupWMClass = "moe.tsuna.tsukimi"; + desktopName = "Tsukimi"; + }) + ]; + + postPatch = '' + substituteInPlace build.rs \ + --replace-fail 'i18n/locale' "$out/share/locale" + + substituteInPlace src/main.rs \ + --replace-fail '/usr/share/locale' "$out/share/locale" + ''; + + postInstall = '' + install -Dm644 moe.tsuna.tsukimi.gschema.xml -t $out/share/glib-2.0/schemas + glib-compile-schemas $out/share/glib-2.0/schemas + + install -Dm644 resources/ui/icons/tsukimi.png -t $out/share/pixmaps + ''; + + meta = { + description = "Simple third-party Emby client, featured with GTK4-RS, MPV and GStreamer"; + homepage = "https://github.com/tsukinaha/tsukimi"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + merrkry + aleksana + ]; + mainProgram = "tsukimi"; + platforms = lib.platforms.linux; + # libmpv2 crate fail to compile + # expected raw pointer `*const u8` found raw pointer `*const i8` + broken = stdenv.hostPlatform.isAarch64; + }; +} diff --git a/pkgs/applications/misc/tty-solitaire/default.nix b/pkgs/by-name/tt/tty-solitaire/package.nix similarity index 100% rename from pkgs/applications/misc/tty-solitaire/default.nix rename to pkgs/by-name/tt/tty-solitaire/package.nix diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index 15706439a30ae..26b30a477da09 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -6,9 +6,9 @@ , gnome-themes-extra , qt6 , makeWrapper -, x11Support ? stdenv.isLinux +, x11Support ? stdenv.hostPlatform.isLinux # pypinput is marked as broken for darwin -, pynputSupport ? stdenv.isLinux +, pynputSupport ? stdenv.hostPlatform.isLinux # Experimental Drag & Drop support requires x11 & pyinput suport , hasDndSupport ? x11Support && pynputSupport , enableDragAndDrop ? false diff --git a/pkgs/by-name/tu/tup/package.nix b/pkgs/by-name/tu/tup/package.nix index c6614db17832a..db6a6058a00b5 100644 --- a/pkgs/by-name/tu/tup/package.nix +++ b/pkgs/by-name/tu/tup/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, sqlite, pcre2 }: let - fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; + fuse = if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse3; in stdenv.mkDerivation rec { pname = "tup"; version = "0.8"; @@ -71,6 +71,6 @@ in stdenv.mkDerivation rec { # ../../../../os-specific/darwin/apple-sdk/default.nix # # https://github.com/gittup/tup/commit/3697c74 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index d3f0959577d14..f9228f310cc1f 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { protobuf ] # https://github.com/vercel/turbo/blob/ea740706e0592b3906ab34c7cfa1768daafc2a84/CONTRIBUTING.md#linux-dependencies - ++ lib.optional stdenv.isLinux llvmPackages.bintools; + ++ lib.optional stdenv.hostPlatform.isLinux llvmPackages.bintools; buildInputs = [ @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { rust-jemalloc-sys zlib ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ CoreFoundation diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix new file mode 100644 index 0000000000000..f2f5d863c6886 --- /dev/null +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -0,0 +1,36 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + nix-update-script, + nixosTests, +}: + +rustPlatform.buildRustPackage rec { + pname = "turn-rs"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "mycrl"; + repo = "turn-rs"; + rev = "refs/tags/v${version}"; + hash = "sha256-uXMRDgSHrwT6+kejWRSE1WjXO8LaOR+fnffIXcL3A4I="; + }; + + cargoHash = "sha256-gO2vuOQMvl6KYp529k3CYDyma5ECzOr/lcSvP4OpUUo="; + + passthru = { + updateScript = nix-update-script { }; + tests.nixos = nixosTests.turn-rs; + }; + + meta = { + description = "Pure rust implemented turn server"; + homepage = "https://github.com/mycrl/turn-rs"; + changelog = "https://github.com/mycrl/turn-rs/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + mainProgram = "turn-server"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/tu/turtle/package.nix b/pkgs/by-name/tu/turtle/package.nix index 446a4bde3bed5..2bf54ee525fd5 100644 --- a/pkgs/by-name/tu/turtle/package.nix +++ b/pkgs/by-name/tu/turtle/package.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "turtle"; - version = "0.9"; + version = "0.10"; pyproject = true; src = fetchFromGitLab { @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { owner = "philippun1"; repo = "turtle"; rev = version; - hash = "sha256-jTO0xUh4VKhjCrmzcRSvxfGPw2j8WKD6uF4mg6nG16g="; + hash = "sha256-hWjxNAf0qy/aJ4Y7nLA5m69k3mEn3/1XaJ58aHQrWug="; }; postPatch = '' @@ -38,6 +38,7 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ pygobject3 pygit2 + secretstorage dbus-python ]; diff --git a/pkgs/by-name/tu/tuxmux/package.nix b/pkgs/by-name/tu/tuxmux/package.nix index 9ec0400e41d2f..49293f49557ad 100644 --- a/pkgs/by-name/tu/tuxmux/package.nix +++ b/pkgs/by-name/tu/tuxmux/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tuxmux"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "edeneast"; repo = pname; rev = "v${version}"; - hash = "sha256-WtcEPvNC1GLOfX0ULUnGHtVO8CyHWQYAPCKwsUlKEzc="; + hash = "sha256-WcHsFKpYexBEg382837NqGgNMTKzVUG3XIER9aa1zK8="; }; - cargoHash = "sha256-OBaFBEsFjK7Mf2zqI60q6uSG5JnZiohQg79+Fm++tK4="; + cargoHash = "sha256-ZftnJ6SYfPzwgsS44YgL9tbwL8Y+7PahI0EfFbKdlqA="; buildInputs = [ libiconv ]; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/pkgs/by-name/tw/twitch-dl/package.nix b/pkgs/by-name/tw/twitch-dl/package.nix index b98f88d300602..18c446dcf4987 100644 --- a/pkgs/by-name/tw/twitch-dl/package.nix +++ b/pkgs/by-name/tw/twitch-dl/package.nix @@ -3,18 +3,19 @@ , python3Packages , installShellFiles , scdoc +, ffmpeg }: python3Packages.buildPythonApplication rec { pname = "twitch-dl"; - version = "2.3.1"; + version = "2.9.2"; pyproject = true; src = fetchFromGitHub { owner = "ihabunek"; repo = "twitch-dl"; rev = "refs/tags/${version}"; - hash = "sha256-ixkIDJbysa3TOJiNmAG2SuJwCv5MaX6nCtUnS4901rg="; + hash = "sha256-BIE3+SDmc5ggF9P+qeloI1JYYrEtOJQ/8oDR76i0t6c="; }; pythonRelaxDeps = [ @@ -28,6 +29,7 @@ python3Packages.buildPythonApplication rec { scdoc ]; + propagatedBuildInputs = with python3Packages; [ click httpx @@ -47,7 +49,7 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "twitchdl" "twitchdl.cli" - "twitchdl.download" + "twitchdl.naming" "twitchdl.entities" "twitchdl.http" "twitchdl.output" @@ -58,17 +60,25 @@ python3Packages.buildPythonApplication rec { "twitchdl.commands" ]; + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ ffmpeg ]) + ]; + postInstall = '' scdoc < twitch-dl.1.scd > twitch-dl.1 installManPage twitch-dl.1 ''; + preInstallCheck = '' + export HOME="$(mktemp -d)" + ''; + meta = with lib; { description = "CLI tool for downloading videos from Twitch"; homepage = "https://github.com/ihabunek/twitch-dl"; changelog = "https://github.com/ihabunek/twitch-dl/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ pbsds ]; + maintainers = with maintainers; [ pbsds hausken ]; mainProgram = "twitch-dl"; }; } diff --git a/pkgs/by-name/tw/twm/package.nix b/pkgs/by-name/tw/twm/package.nix new file mode 100644 index 0000000000000..20e1d9290e44d --- /dev/null +++ b/pkgs/by-name/tw/twm/package.nix @@ -0,0 +1,48 @@ +{ lib +, darwin +, fetchFromGitHub +, stdenv +, rustPlatform +, openssl +, pkg-config +, nix-update-script +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "twm"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "vinnymeller"; + repo = "twm"; + rev = "refs/tags/v${version}"; + hash = "sha256-SiwLqUq/gC8Tr31jjblLc9YP4yBi9HL38W83kgh7eJI="; + }; + + cargoHash = "sha256-BjQ7dDXHzX+O/V328TTwl9wGtpOq+NjOMRiZwb9O7ZU="; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd twm \ + --bash <($out/bin/twm --print-bash-completion) \ + --zsh <($out/bin/twm --print-zsh-completion) \ + --fish <($out/bin/twm --print-fish-completion) + + $out/bin/twm --print-man > twm.1 + installManPage twm.1 + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Customizable workspace manager for tmux"; + homepage = "https://github.com/vinnymeller/twm"; + changelog = "https://github.com/vinnymeller/twm/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vinnymeller ]; + mainProgram = "twm"; + }; +} diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/by-name/tw/twolame/package.nix similarity index 100% rename from pkgs/development/libraries/twolame/default.nix rename to pkgs/by-name/tw/twolame/package.nix diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index 46e370cfa291c..748e18ae23e02 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typos-lsp"; # Please update the corresponding VSCode extension too. # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix - version = "0.1.19"; + version = "0.1.27"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-3bXOMW6aU4ryJqrUmpCIbBqRWrh4R6tlkEHPqpPSsVI="; + hash = "sha256-WiU6SRhW7LBDFJ/6qv0X/H86FiTYadN02iyi87oQRBY="; }; - cargoHash = "sha256-3GHVGjn4upI7U8GyxwlrLpchWALGFuMSektCrwLiIIM="; + cargoHash = "sha256-v9CwoLfqww5UNsVONAWb2D9F/ljq/YXTCCjrJaJWENE="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix new file mode 100644 index 0000000000000..b9bcf6e0aad42 --- /dev/null +++ b/pkgs/by-name/ty/typos/package.nix @@ -0,0 +1,34 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "typos"; + version = "1.25.0"; + + src = fetchFromGitHub { + owner = "crate-ci"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0JInvnQRINItUyAqnDBT0uRlF7zKRA4S/IyqxqmHnvQ="; + }; + + cargoHash = "sha256-44JBZu08PDkyeBMscchNp6N9aF99b5lZWDhp4K42xsY="; + + meta = with lib; { + description = "Source code spell checker"; + mainProgram = "typos"; + homepage = "https://github.com/crate-ci/typos"; + changelog = "https://github.com/crate-ci/typos/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ + figsoda + mgttlinger + ]; + }; +} diff --git a/pkgs/by-name/ty/typst-live/package.nix b/pkgs/by-name/ty/typst-live/package.nix index 8968adbb5e1bc..3912ed217b51a 100644 --- a/pkgs/by-name/ty/typst-live/package.nix +++ b/pkgs/by-name/ty/typst-live/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/by-name/ty/typst-lsp/package.nix b/pkgs/by-name/ty/typst-lsp/package.nix index e94dead15072a..047be6e535f01 100644 --- a/pkgs/by-name/ty/typst-lsp/package.nix +++ b/pkgs/by-name/ty/typst-lsp/package.nix @@ -39,14 +39,16 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; checkFlags = [ # requires internet access "--skip=workspace::package::external::remote_repo::test::full_download" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # both tests fail on darwin with 'Attempted to create a NULL object.' "--skip=workspace::fs::local::test::read" "--skip=workspace::package::external::manager::test::local_package" @@ -69,7 +71,7 @@ rustPlatform.buildRustPackage rec { description = "Brand-new language server for Typst"; homepage = "https://github.com/nvarner/typst-lsp"; mainProgram = "typst-lsp"; - changelog = "https://github.com/nvarner/typst-lsp/releases/tag/${src.rev}"; + changelog = "https://github.com/nvarner/typst-lsp/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = with lib.licenses; [ asl20 mit diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index aa71277fefab7..de06edfee2f36 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl xz - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 906a9738f7cd6..3749424844e2f 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.32"; + version = "0.11.34"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "refs/tags/v${version}"; - hash = "sha256-HHn3dPG+dWjuuhQrot2DaqPoj6klNxAdqSrplABIuuE="; + hash = "sha256-6z2jzs5PxsEsCPSm9+sZnBdzh0edLMylaLBvSSPoPNo="; }; - cargoHash = "sha256-ZWh2TfByabBi9vCvkpseLV49xzWTKLs8T4x8K/igEu0="; + cargoHash = "sha256-MaqsAQvh30nDzoxgnFKu7+wvRZ7WvwLgKYM3Fru8qfg="; nativeBuildInputs = [ pkg-config @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/u-/u-config/package.nix b/pkgs/by-name/u-/u-config/package.nix new file mode 100644 index 0000000000000..deeba46483b56 --- /dev/null +++ b/pkgs/by-name/u-/u-config/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "u-config"; + version = "0.33.1"; + + src = fetchFromGitHub { + owner = "skeeto"; + repo = "u-config"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-r1zcXKLqw/gK+9k3SX7OCBaZhvV2ya5VC9O3h+WdkyY="; + }; + + makeFlags = [ + "CROSS=${stdenv.cc.targetPrefix}" + "CC=${lib.getExe stdenv.cc}" + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildFlags = [ "pkg-config" ]; + + installPhase = '' + runHook preInstall + + install -Dm755 pkg-config -t $out/bin + + runHook postInstall + ''; + + meta = { + description = "Smaller, simpler, portable pkg-config clone"; + homepage = "https://github.com/skeeto/u-config"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ub/ubridge/package.nix b/pkgs/by-name/ub/ubridge/package.nix new file mode 100644 index 0000000000000..c5f467ad6a3b7 --- /dev/null +++ b/pkgs/by-name/ub/ubridge/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libpcap, + nix-update-script, + testers, + ubridge, +}: + +stdenv.mkDerivation rec { + pname = "ubridge"; + version = "0.9.19"; + + src = fetchFromGitHub { + owner = "GNS3"; + repo = "ubridge"; + rev = "refs/tags/v${version}"; + hash = "sha256-utzXLPF0VszMZORoik5/0lKhiyKO9heKuNO4KPsPVsI="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "/usr/local/bin" "$out/bin" \ + --replace-fail "setcap" "#setcap" + ''; + + buildInputs = [ libpcap ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 ubridge $out/bin/ubridge + + runHook postInstall + ''; + + passthru = { + tests.version = testers.testVersion { + package = ubridge; + command = "ubridge -v"; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Bridge for UDP tunnels, Ethernet, TAP, and VMnet interfaces"; + longDescription = '' + uBridge is a simple application to create user-land bridges between + various technologies. Currently bridging between UDP tunnels, Ethernet + and TAP interfaces is supported. Packet capture is also supported. + ''; + homepage = "https://github.com/GNS3/ubridge"; + changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}"; + license = licenses.gpl3Plus; + mainProgram = "ubridge"; + maintainers = with maintainers; [ + primeos + anthonyroussel + ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/by-name/uc/ucg/package.nix b/pkgs/by-name/uc/ucg/package.nix index 99d1b90c43dfe..7ac909b256868 100644 --- a/pkgs/by-name/uc/ucg/package.nix +++ b/pkgs/by-name/uc/ucg/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ucg"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isAarch64 || stdenv.isDarwin; + broken = stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin; }; }) # TODO: report upstream diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix index 10d8c5bccac43..8869dce9d187e 100644 --- a/pkgs/by-name/uc/uclibc-ng/package.nix +++ b/pkgs/by-name/uc/uclibc-ng/package.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, stdenvNoLibc , buildPackages , fetchurl , gitUpdater @@ -9,6 +9,7 @@ }: let + stdenv = stdenvNoLibc; isCross = (stdenv.buildPlatform != stdenv.hostPlatform); configParser = '' function parseconfig { @@ -48,7 +49,7 @@ let KERNEL_HEADERS "${linuxHeaders}/include" '' + lib.optionalString (stdenv.hostPlatform.gcc.float or "" == "soft") '' UCLIBC_HAS_FPU n - '' + lib.optionalString (stdenv.isAarch32 && isCross) '' + '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && isCross) '' CONFIG_ARM_EABI y ARCH_WANTS_BIG_ENDIAN n ARCH_BIG_ENDIAN n diff --git a/pkgs/applications/misc/udevil/device-info-sys-stat.patch b/pkgs/by-name/ud/udevil/device-info-sys-stat.patch similarity index 100% rename from pkgs/applications/misc/udevil/device-info-sys-stat.patch rename to pkgs/by-name/ud/udevil/device-info-sys-stat.patch diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/by-name/ud/udevil/package.nix similarity index 100% rename from pkgs/applications/misc/udevil/default.nix rename to pkgs/by-name/ud/udevil/package.nix diff --git a/pkgs/applications/misc/udiskie/locale-path.patch b/pkgs/by-name/ud/udiskie/locale-path.patch similarity index 100% rename from pkgs/applications/misc/udiskie/locale-path.patch rename to pkgs/by-name/ud/udiskie/locale-path.patch diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/by-name/ud/udiskie/package.nix similarity index 100% rename from pkgs/applications/misc/udiskie/default.nix rename to pkgs/by-name/ud/udiskie/package.nix diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/by-name/ud/udunits/package.nix similarity index 100% rename from pkgs/development/libraries/udunits/default.nix rename to pkgs/by-name/ud/udunits/package.nix diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index 78c1f817ad6ad..0422c54a9d16e 100644 --- a/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/pkgs/by-name/ue/ueberzugpp/package.nix @@ -18,14 +18,14 @@ , cli11 , libexif , range-v3 -, enableOpencv ? stdenv.isLinux +, enableOpencv ? stdenv.hostPlatform.isLinux , opencv -, enableWayland ? stdenv.isLinux +, enableWayland ? stdenv.hostPlatform.isLinux , extra-cmake-modules , wayland , wayland-protocols , wayland-scanner -, enableX11 ? stdenv.isLinux +, enableX11 ? stdenv.hostPlatform.isLinux , xorg }: @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ]; # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.14 or newer - preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' export MACOSX_DEPLOYMENT_TARGET=10.14 ''; diff --git a/pkgs/by-name/ug/ugm/package.nix b/pkgs/by-name/ug/ugm/package.nix index 4a5825219b96f..df62946c44522 100644 --- a/pkgs/by-name/ug/ugm/package.nix +++ b/pkgs/by-name/ug/ugm/package.nix @@ -35,6 +35,6 @@ buildGoModule rec { license = licenses.mit; mainProgram = "ugm"; platforms = platforms.linux; - maintainers = with maintainers; [ oo-infty ]; + maintainers = with maintainers; [ oosquare ]; }; } diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index 86c238328e3a9..5bcf16fdd8aa9 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -18,28 +18,28 @@ let in rustPlatform.buildRustPackage rec { pname = "uiua"; - version = "0.12.3"; + version = "0.13.0-dev.1"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; rev = version; - hash = "sha256-gI+FaiNN7Hql9HMsrl5skJuJDJv/mVarsFqslLXVvLU="; + hash = "sha256-dwiwv24bhn8/WVxrq8uReEPhU/5zn3oaH/AMjNJiA4M="; }; - cargoHash = "sha256-9mdspWwuZ+dLBnhklSqi4Lg2SjJyhhfn5Ax58evtkDA="; + cargoHash = "sha256-4XHKcmOeaeSGfl7uvQQdhm29DBWEdZLX021d9+Ebrww="; nativeBuildInputs = - lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ] + lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ] ++ lib.optionals audioSupport [ pkg-config ]; buildInputs = - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreServices ] - ++ lib.optionals (audioSupport && stdenv.isDarwin) [ AudioUnit ] - ++ lib.optionals (audioSupport && stdenv.isLinux) [ alsa-lib ]; + ++ lib.optionals (audioSupport && stdenv.hostPlatform.isDarwin) [ AudioUnit ] + ++ lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ]; buildFeatures = lib.optional audioSupport "audio"; diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix index 17fae99e313fe..54340d3fdeca1 100644 --- a/pkgs/by-name/um/umpire/package.nix +++ b/pkgs/by-name/um/umpire/package.nix @@ -2,8 +2,13 @@ , lib , fetchFromGitHub , cmake +, config +, cudaSupport ? config.cudaSupport +, cudaPackages ? null }: +assert cudaSupport -> cudaPackages != null; + stdenv.mkDerivation rec { pname = "umpire"; version = "2024.07.0"; @@ -16,7 +21,22 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + ]; + + buildInputs = lib.optionals cudaSupport (with cudaPackages; [ + cudatoolkit + cuda_cudart + ]); + + cmakeFlags = lib.optionals cudaSupport [ + "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}" + "-DENABLE_CUDA=ON" + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) + ]; meta = with lib; { description = "Application-focused API for memory management on NUMA & GPU architectures"; diff --git a/pkgs/by-name/un/unbook/package.nix b/pkgs/by-name/un/unbook/package.nix index 28c73451a18d0..3c50f83d5a5eb 100644 --- a/pkgs/by-name/un/unbook/package.nix +++ b/pkgs/by-name/un/unbook/package.nix @@ -1,22 +1,24 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper -, calibre +{ + lib, + rustPlatform, + fetchFromGitHub, + makeWrapper, + calibre, + gitUpdater, }: rustPlatform.buildRustPackage rec { pname = "unbook"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ludios"; repo = "unbook"; rev = version; - hash = "sha256-THCPJ4zOKSXKZDa5DuqpBfBKZ96TdFEuDMVw/HmO7Eo="; + hash = "sha256-whWWh/jQ4RkGA3T1VCmt6zhpQQCzh2jASYg69IlfEeo="; }; - cargoHash = "sha256-EbSayNz9cPmMDQOaOiyQAYmtlnb+4jzbffm1On0BBxI="; + cargoHash = "sha256-whmp4ST89TZuxQe9fnkW98A9t3rwpTdQCej49ZsDanE="; nativeBuildInputs = [ makeWrapper ]; @@ -24,6 +26,8 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/unbook --prefix PATH : ${lib.makeBinPath [ calibre ]} ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Ebook to self-contained-HTML converter"; homepage = "https://unbook.ludios.org"; diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 0d827159358f2..9c789a3b05641 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -36,7 +36,7 @@ , withRedis ? false # Avoid .lib depending on lib.getLib openssl # The build gets a little hacky, so in some cases we disable this approach. -, withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP +, withSlimLib ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP # enable support for python plugins in unbound: note this is distinct from pyunbound # see https://unbound.docs.nlnetlabs.nl/en/latest/developer/python-modules.html , withPythonModule ? false diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index 4b93afa1c5c7d..5188209732f51 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -10,6 +10,8 @@ , libXxf86vm }: let + version = "4.13.2-redo"; + desktopItem = makeDesktopItem { name = "unciv"; exec = "unciv"; @@ -20,11 +22,11 @@ let }; desktopIcon = fetchurl { - url = "https://github.com/yairm210/Unciv/blob/4.13.0-patch1/extraImages/Icons/Unciv%20icon%20v6.png?raw=true"; + url = "https://github.com/yairm210/Unciv/blob/${version}/extraImages/Icons/Unciv%20icon%20v6.png?raw=true"; hash = "sha256-Zuz+HGfxjGviGBKTiHdIFXF8UMRLEIfM8f+LIB/xonk="; }; - envLibPath = lib.makeLibraryPath (lib.optionals stdenv.isLinux [ + envLibPath = lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ libGL libpulseaudio libXxf86vm @@ -33,7 +35,7 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.13.0-patch1"; + inherit version; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; diff --git a/pkgs/by-name/un/undetected-chromedriver/package.nix b/pkgs/by-name/un/undetected-chromedriver/package.nix index 3976f3cc685b4..844bbe3b069c3 100644 --- a/pkgs/by-name/un/undetected-chromedriver/package.nix +++ b/pkgs/by-name/un/undetected-chromedriver/package.nix @@ -6,10 +6,9 @@ python3, testers, - undetected-chromedriver, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "undetected-chromedriver"; inherit (chromedriver) version; @@ -34,11 +33,11 @@ stdenv.mkDerivation { install -D -m 0555 chromedriver $out/bin/undetected-chromedriver ''; - passthru.tests.version = testers.testVersion { package = undetected-chromedriver; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = chromedriver.meta // { description = "Custom Selenium ChromeDriver that passes all bot mitigation systems"; mainProgram = "undetected-chromedriver"; maintainers = with lib.maintainers; [ paveloom ]; }; -} +}) diff --git a/pkgs/by-name/un/unhide-gui/package.nix b/pkgs/by-name/un/unhide-gui/package.nix old mode 100755 new mode 100644 index 5fd01f39b5033..a8c988ee6d2d1 --- a/pkgs/by-name/un/unhide-gui/package.nix +++ b/pkgs/by-name/un/unhide-gui/package.nix @@ -2,7 +2,6 @@ fetchFromGitHub, lib, python3Packages, - python3, unhide, }: diff --git a/pkgs/by-name/un/unhide/package.nix b/pkgs/by-name/un/unhide/package.nix old mode 100755 new mode 100644 diff --git a/pkgs/by-name/un/unicodeit/package.nix b/pkgs/by-name/un/unicodeit/package.nix new file mode 100644 index 0000000000000..c9abda9386aa1 --- /dev/null +++ b/pkgs/by-name/un/unicodeit/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: +with python3Packages; +toPythonApplication unicodeit diff --git a/pkgs/by-name/un/unimap/package.nix b/pkgs/by-name/un/unimap/package.nix index 7563c1f50535e..eafe26962cec1 100644 --- a/pkgs/by-name/un/unimap/package.nix +++ b/pkgs/by-name/un/unimap/package.nix @@ -30,16 +30,16 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles makeBinaryWrapper - ] ++ lib.optionals (stdenv.hostPlatform.isAarch && stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isLinux) [ pkg-config ]; # only depends on openssl on aarch/arm linux - buildInputs = lib.optionals (stdenv.hostPlatform.isAarch && stdenv.isLinux) [ + buildInputs = lib.optionals (stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isLinux) [ openssl ]; - env = lib.optionalAttrs (stdenv.hostPlatform.isAarch && stdenv.isLinux) { + env = lib.optionalAttrs (stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isLinux) { OPENSSL_NO_VENDOR = true; }; diff --git a/pkgs/by-name/un/unison-fsmonitor/package.nix b/pkgs/by-name/un/unison-fsmonitor/package.nix index b351071b6d307..84d367285c029 100644 --- a/pkgs/by-name/un/unison-fsmonitor/package.nix +++ b/pkgs/by-name/un/unison-fsmonitor/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-eKRayFU3xq2uo6YeFqcTPLInZYlympH6Z01vOCVsVqQ="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/by-name/un/unison/package.nix b/pkgs/by-name/un/unison/package.nix index 400c73e105b41..d0298c7f15849 100644 --- a/pkgs/by-name/un/unison/package.nix +++ b/pkgs/by-name/un/unison/package.nix @@ -6,7 +6,7 @@ , makeDesktopItem , wrapGAppsHook3 , gsettings-desktop-schemas -, enableX11 ? !stdenv.isDarwin +, enableX11 ? !stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation (finalAttrs: { @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ nevivurn ]; platforms = platforms.unix; - broken = stdenv.isDarwin && enableX11; # unison-gui and uimac are broken on darwin + broken = stdenv.hostPlatform.isDarwin && enableX11; # unison-gui and uimac are broken on darwin mainProgram = if enableX11 then "unison-gui" else "unison"; }; }) diff --git a/pkgs/development/tools/misc/universal-ctags/000-nixos-specific.patch b/pkgs/by-name/un/universal-ctags/000-nixos-specific.patch similarity index 100% rename from pkgs/development/tools/misc/universal-ctags/000-nixos-specific.patch rename to pkgs/by-name/un/universal-ctags/000-nixos-specific.patch diff --git a/pkgs/by-name/un/universal-ctags/package.nix b/pkgs/by-name/un/universal-ctags/package.nix new file mode 100644 index 0000000000000..eda2fc6a81763 --- /dev/null +++ b/pkgs/by-name/un/universal-ctags/package.nix @@ -0,0 +1,89 @@ +{ lib +, stdenv +, autoreconfHook +, buildPackages +, coreutils +, fetchFromGitHub +, jansson +, libiconv +, perl +, pkg-config +, python3 +, libseccomp +, libyaml +, pcre2 +, libxml2 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "universal-ctags"; + version = "6.1.0"; + + src = fetchFromGitHub { + owner = "universal-ctags"; + repo = "ctags"; + rev = "v${finalAttrs.version}"; + hash = "sha256-f8+Ifjn7bhSYozOy7kn+zCLdHGrH3iFupHUZEGynz9Y="; + }; + + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + (python3.withPackages (p: [ p.docutils ])) + ]; + + buildInputs = [ + libyaml + pcre2 + libxml2 + jansson + ] + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv + ++ lib.optional stdenv.hostPlatform.isLinux libseccomp; + + configureFlags = [ "--enable-tmpdir=/tmp" ]; + + patches = [ + ./000-nixos-specific.patch + ]; + + postPatch = '' + substituteInPlace Tmain/utils.sh \ + --replace /bin/echo ${coreutils}/bin/echo + # fails on sandbox + rm -fr Tmain/ptag-proc-cwd.d/ + patchShebangs misc/* + ''; + + # some tools like 'zoekt' want an unambiguous binary name, so give it to them + postInstall = '' + ln -s $out/bin/ctags $out/bin/universal-ctags + ''; + + doCheck = true; + + checkFlags = [ + "man-test" "tlib" "tmain" "tutil" "units" + ]; + + meta = with lib; { + homepage = "https://docs.ctags.io/en/latest/"; + description = "Maintained ctags implementation"; + longDescription = '' + Universal Ctags (abbreviated as u-ctags) is a maintained implementation of + ctags. ctags generates an index (or tag) file of language objects found in + source files for programming languages. This index makes it easy for text + editors and other tools to locate the indexed items. + ''; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.all; + mainProgram = "ctags"; + priority = 1; # over the emacs implementation + }; +}) diff --git a/pkgs/by-name/un/unl0kr/package.nix b/pkgs/by-name/un/unl0kr/package.nix index 345a07ea92911..4f3589bd5973e 100644 --- a/pkgs/by-name/un/unl0kr/package.nix +++ b/pkgs/by-name/un/unl0kr/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "unl0kr"; homepage = "https://gitlab.com/cherrypicker/unl0kr"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = []; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/un/unrar-free/package.nix b/pkgs/by-name/un/unrar-free/package.nix index ca6b7f7e526e3..72ca626c89338 100644 --- a/pkgs/by-name/un/unrar-free/package.nix +++ b/pkgs/by-name/un/unrar-free/package.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://gitlab.com/bgermann/unrar-free"; license = lib.licenses.gpl2Plus; - mainProgram = "unrar"; + mainProgram = "unrar-free"; maintainers = with lib.maintainers; [ thiagokokada ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/un/unsilence/package.nix b/pkgs/by-name/un/unsilence/package.nix index 76a362f279c33..d8bc2237e2d51 100644 --- a/pkgs/by-name/un/unsilence/package.nix +++ b/pkgs/by-name/un/unsilence/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { owner = "lagmoellertim"; repo = "unsilence"; rev = version; - sha256 = "sha256-M4Ek1JZwtr7vIg14aTa8h4otIZnPQfKNH4pZE4GpiBQ="; + hash = "sha256-M4Ek1JZwtr7vIg14aTa8h4otIZnPQfKNH4pZE4GpiBQ="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/archivers/unzoo/default.nix b/pkgs/by-name/un/unzoo/package.nix similarity index 100% rename from pkgs/tools/archivers/unzoo/default.nix rename to pkgs/by-name/un/unzoo/package.nix diff --git a/pkgs/by-name/up/upbound/package.nix b/pkgs/by-name/up/upbound/package.nix index a7e88f3cc0886..076761cf49ffd 100644 --- a/pkgs/by-name/up/upbound/package.nix +++ b/pkgs/by-name/up/upbound/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "upbound"; - version = "0.32.1"; + version = "0.33.0"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-E+9Goj2YppZ5Ka84vICmnjDeWcaW7kcxSsKyqZZoDs8="; + hash = "sha256-PJMOR/XpWqtSIb3x61o0iLwETCHA5e07etmEZYQtzXw="; }; vendorHash = "sha256-WLRXj4G49JEbQc2aFAjLLCpQrDhN94jazWxfM70hHqs="; diff --git a/pkgs/by-name/up/uplosi/package.nix b/pkgs/by-name/up/uplosi/package.nix index f58db5625ac2c..074bf872f9876 100644 --- a/pkgs/by-name/up/uplosi/package.nix +++ b/pkgs/by-name/up/uplosi/package.nix @@ -1,23 +1,29 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, installShellFiles +{ + lib, + fetchFromGitHub, + buildGoModule, + installShellFiles, + nix-update-script, }: + buildGoModule rec { pname = "uplosi"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "edgelesssys"; repo = pname; rev = "v${version}"; - hash = "sha256-i/RVCoeQLeOaPaEtJS/l+42CVohMucA6cBBt0mdJ4uE="; + hash = "sha256-AtsFZ92WkVkH8fd0Xa0D6/PR84/dtOH6gpM4mtn32Hk="; }; - vendorHash = "sha256-f8Yz99qlN0S0Ybewifc0VQanYXKinb1togBkUwDPSvw="; + vendorHash = "sha256-o7PPgW3JL47G6Na5n9h3RasRMfU25FD1U/wCMaydRmc="; CGO_ENABLED = "0"; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + ldflags = [ + "-s" + "-X main.version=${version}" + ]; nativeBuildInputs = [ installShellFiles ]; @@ -28,13 +34,18 @@ buildGoModule rec { --zsh <($out/bin/uplosi completion zsh) ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Upload OS images to cloud provider"; homepage = "https://github.com/edgelesssys/uplosi"; changelog = "https://github.com/edgelesssys/uplosi/releases/tag/v${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "uplosi"; - maintainers = with maintainers; [ katexochen malt3 ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ + katexochen + malt3 + ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/up/upower-notify/package.nix b/pkgs/by-name/up/upower-notify/package.nix index 83ef9e95fb673..f93fcce1237a2 100644 --- a/pkgs/by-name/up/upower-notify/package.nix +++ b/pkgs/by-name/up/upower-notify/package.nix @@ -18,7 +18,7 @@ buildGoModule { owner = "omeid"; repo = "upower-notify"; rev = "c05ffbba9b8d475573be0908d75ac7c64d74be2d"; - sha256 = "sha256-y+Cy3jkIfWiqF2HFopafdNSyGVA2ws4250Lg02rVxmo="; + hash = "sha256-y+Cy3jkIfWiqF2HFopafdNSyGVA2ws4250Lg02rVxmo="; }; vendorHash = "sha256-58zK6t3rb+19ilaQaNgsMVFQBYKPIV40ww8klrGbpnw="; diff --git a/pkgs/by-name/up/uppaal/package.nix b/pkgs/by-name/up/uppaal/package.nix new file mode 100644 index 0000000000000..f61425fbad559 --- /dev/null +++ b/pkgs/by-name/up/uppaal/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenvNoCC, + fetchzip, + makeWrapper, + jdk17, + makeDesktopItem, + copyDesktopItems, + wrapGAppsHook3, + shared-mime-info, + gdk-pixbuf, +}: + +stdenvNoCC.mkDerivation rec { + pname = "uppaal"; + version = "5.0"; + subversion = "0"; + platform = "linux64"; + + src = fetchzip { + url = "https://download.uppaal.org/uppaal-${version}/uppaal-${version}.${subversion}/uppaal-${version}.${subversion}-${platform}.zip"; + hash = "sha256-o71mP2/sDNRpmA1Qx59cvx6t4pk5pP0lrn1CogN3PuM="; + }; + + desktopItems = [ + (makeDesktopItem { + name = "uppaal"; + exec = "uppaal %U"; + icon = "uppaal"; + comment = "real-time modelling and verification tool"; + desktopName = "Uppaal"; + genericName = "Uppaal"; + categories = [ "Development" ]; + }) + ]; + + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook3 + copyDesktopItems + ]; + + buildInputs = [ + jdk17 + gdk-pixbuf + shared-mime-info + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/lib/uppaal + for size in 16 32 48 64 96 128; do + install -Dm444 res/icon-"$size"x"$size".png "$out"/share/icons/hicolor/"$size"x"$size"/apps/uppaal.png + done + + cp -r * $out/lib/uppaal + + chmod +x $out/lib/uppaal/uppaal + + makeWrapper $out/lib/uppaal/uppaal $out/bin/uppaal \ + --set JAVA_HOME ${jdk17} \ + --set PATH $out/lib/uppaal:$PATH \ + --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd + + runHook postInstall + ''; + + meta = with lib; { + description = "Integrated tool environment for modeling, validation and verification of real-time systems"; + homepage = "https://uppaal.org/"; + license = licenses.unfreeRedistributable; + platforms = with platforms; linux ++ darwin ++ windows; + broken = !(stdenvNoCC.hostPlatform.isLinux && stdenvNoCC.hostPlatform.isx86_64); + maintainers = with maintainers; [ mortenmunk ]; + mainProgram = "uppaal"; + }; +} diff --git a/pkgs/by-name/up/ups/package.nix b/pkgs/by-name/up/ups/package.nix index bfd743a8236d6..4da9d2f9f3ae0 100644 --- a/pkgs/by-name/up/ups/package.nix +++ b/pkgs/by-name/up/ups/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { owner = "rameshvarun"; repo = "ups"; rev = "v${version}"; - sha256 = "sha256-7AuZ1gyp8tAWHM0Ry54tKucPJ3enaGDtvrM1J8uBIT8="; + hash = "sha256-7AuZ1gyp8tAWHM0Ry54tKucPJ3enaGDtvrM1J8uBIT8="; }; vendorHash = "sha256-c6aE6iD6yCnnuSEDhhr3v1ArcfLmSP8QhS7Cz7rtVHs="; diff --git a/pkgs/by-name/up/upsun/package.nix b/pkgs/by-name/up/upsun/package.nix index b81390ffc9c18..fd1242e593307 100644 --- a/pkgs/by-name/up/upsun/package.nix +++ b/pkgs/by-name/up/upsun/package.nix @@ -3,34 +3,29 @@ lib, fetchurl, testers, + installShellFiles, upsun }: +let versions = lib.importJSON ./versions.json; + arch = if stdenvNoCC.hostPlatform.isx86_64 then "amd64" + else if stdenvNoCC.hostPlatform.isAarch64 then "arm64" + else throw "Unsupported architecture"; + os = if stdenvNoCC.hostPlatform.isLinux then "linux" + else if stdenvNoCC.hostPlatform.isDarwin then "darwin" + else throw "Unsupported os"; + versionInfo = versions."${os}-${arch}"; + inherit (versionInfo) hash url; + +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "upsun"; - version = "5.0.13"; - - src = - { - x86_64-darwin = fetchurl { - url = "https://github.com/platformsh/cli/releases/download/${finalAttrs.version}/upsun_${finalAttrs.version}_darwin_all.tar.gz"; - hash = "sha256-5JKXtAUnqrlufyNE05uZjEDfJv557auYPriTxvUbMJI="; - }; - aarch64-darwin = fetchurl { - url = "https://github.com/platformsh/cli/releases/download/${finalAttrs.version}/upsun_${finalAttrs.version}_darwin_all.tar.gz"; - hash = "sha256-5JKXtAUnqrlufyNE05uZjEDfJv557auYPriTxvUbMJI="; - }; - x86_64-linux = fetchurl { - url = "https://github.com/platformsh/cli/releases/download/${finalAttrs.version}/upsun_${finalAttrs.version}_linux_amd64.tar.gz"; - hash = "sha256-fjVL/sbO1wmaJ4qZpUMV/4Q4Jzf0p6qx0ElRdY5EUJU="; - }; - aarch64-linux = fetchurl { - url = "https://github.com/platformsh/cli/releases/download/${finalAttrs.version}/upsun_${finalAttrs.version}_linux_arm64.tar.gz"; - hash = "sha256-MNlQkwsg5SuIQJBDy7yVtcda1odpaUZezCgrat6OW2Q="; - }; - } - .${stdenvNoCC.system} - or (throw "${finalAttrs.pname}-${finalAttrs.version}: ${stdenvNoCC.system} is unsupported."); + inherit (versions) version; + + nativeBuildInputs = [ installShellFiles ]; + + # run ./update + src = fetchurl { inherit hash url; }; dontConfigure = true; dontBuild = true; @@ -41,10 +36,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -Dm755 upsun $out/bin/upsun + installShellCompletion completion/bash/upsun.bash \ + completion/zsh/_upsun + runHook postInstall ''; passthru = { + updateScript = ./update.sh; tests.version = testers.testVersion { inherit (finalAttrs) version; package = upsun; diff --git a/pkgs/by-name/up/upsun/update.sh b/pkgs/by-name/up/upsun/update.sh new file mode 100755 index 0000000000000..d01cef8a59e96 --- /dev/null +++ b/pkgs/by-name/up/upsun/update.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq +#shellcheck shell=bash + +set -eu -o pipefail + +version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/platformsh/cli/releases/latest | jq -e -r ".tag_name") + +linux_arm64_url=https://github.com/platformsh/cli/releases/download/$version/upsun_${version}_linux_arm64.tar.gz +linux_amd64_url=https://github.com/platformsh/cli/releases/download/$version/upsun_${version}_linux_amd64.tar.gz +darwin_all_url=https://github.com/platformsh/cli/releases/download/$version/upsun_${version}_darwin_all.tar.gz +linux_arm64_hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$linux_arm64_url")) +linux_amd64_hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$linux_amd64_url")) +darwin_all_hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$darwin_all_url")) +jq -n \ + --arg version "$version" \ + --arg darwin_all_hash "$darwin_all_hash" \ + --arg darwin_all_url "$darwin_all_url" \ + --arg linux_amd64_hash "$linux_amd64_hash" \ + --arg linux_amd64_url "$linux_amd64_url" \ + --arg linux_arm64_hash "$linux_arm64_hash" \ + --arg linux_arm64_url "$linux_arm64_url" \ + '{ "version": $version, + "darwin-amd64": { "hash": $darwin_all_hash, "url": $darwin_all_url }, + "darwin-arm64": { "hash": $darwin_all_hash, "url": $darwin_all_url }, + "linux-amd64": { "hash": $linux_amd64_hash, "url": $linux_amd64_url }, + "linux-arm64": { "hash": $linux_arm64_hash, "url": $linux_arm64_url } +}' > pkgs/by-name/up/upsun/versions.json diff --git a/pkgs/by-name/up/upsun/versions.json b/pkgs/by-name/up/upsun/versions.json new file mode 100644 index 0000000000000..dbf2a66f0d68c --- /dev/null +++ b/pkgs/by-name/up/upsun/versions.json @@ -0,0 +1,19 @@ +{ + "version": "5.0.21", + "darwin-amd64": { + "hash": "sha256-ePm8QOJcC87CqB1PbSAoMblopr7JsViHWW3BEQ+gjlQ=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.21/upsun_5.0.21_darwin_all.tar.gz" + }, + "darwin-arm64": { + "hash": "sha256-ePm8QOJcC87CqB1PbSAoMblopr7JsViHWW3BEQ+gjlQ=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.21/upsun_5.0.21_darwin_all.tar.gz" + }, + "linux-amd64": { + "hash": "sha256-1qbgXI3VtYoI/4EWPZ1jmWBVJEP+A60PIqXS38wnBPQ=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.21/upsun_5.0.21_linux_amd64.tar.gz" + }, + "linux-arm64": { + "hash": "sha256-pUdRvVtEokuf7gznUogyufTtloy4MuT5TMcJ4z1bcwo=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.21/upsun_5.0.21_linux_arm64.tar.gz" + } +} diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/by-name/ur/urjtag/package.nix similarity index 100% rename from pkgs/tools/misc/urjtag/default.nix rename to pkgs/by-name/ur/urjtag/package.nix diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix new file mode 100644 index 0000000000000..96406b3636028 --- /dev/null +++ b/pkgs/by-name/us/usage/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + usage, + testers, +}: + +rustPlatform.buildRustPackage rec { + pname = "jdx"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "jdx"; + repo = "usage"; + rev = "v${version}"; + hash = "sha256-9zQ+gkBVhzjqSIieGjxoD9vc7999lfRQ7awkvlEkseE="; + }; + + cargoHash = "sha256-4ebjD1Tf7F2YyNrF7eEi2yKonctprnyu4nMf+vE2whY="; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = usage; }; + }; + + meta = { + homepage = "https://usage.jdx.dev"; + description = "Specification for CLIs"; + changelog = "https://github.com/jdx/usage/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ konradmalik ]; + mainProgram = "usage"; + }; +} diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix index 5b0f14eb396f2..233a1ebb1264d 100644 --- a/pkgs/by-name/us/userborn/package.nix +++ b/pkgs/by-name/us/userborn/package.nix @@ -4,22 +4,24 @@ fetchFromGitHub, makeBinaryWrapper, mkpasswd, + nixosTests, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "userborn"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "nikstur"; repo = "userborn"; rev = version; - hash = "sha256-aptFDrL9RPPTu4wp2ee3LVaEruRdCWtLGIKdOgsR+/s="; + hash = "sha256-LEKdgmw1inBOi0sriG8laCrtx0ycqR5ftdnmszadx3U="; }; sourceRoot = "${src.name}/rust/userborn"; - cargoHash = "sha256-m39AC26E0Pxu1E/ap2kSwr5uznJNgExf5QUrZ+zTNX0="; + cargoHash = "sha256-Pjzu6db2WomNsC+jNK1fr1u7koZwUvWPIY5JHMo1gkA="; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -33,10 +35,24 @@ rustPlatform.buildRustPackage rec { stripAllList = [ "bin" ]; + passthru = { + updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) + userborn + userborn-mutable-users + userborn-mutable-etc + userborn-immutable-users + userborn-immutable-etc + ; + }; + }; + meta = with lib; { homepage = "https://github.com/nikstur/userborn"; description = "Declaratively bear (manage) Linux users and groups"; license = licenses.mit; + platforms = platforms.linux; maintainers = with lib.maintainers; [ nikstur ]; mainProgram = "userborn"; }; diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index 2e2652f411781..db063696996f1 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -24,7 +24,7 @@ let unpackGog = runCommand "ut1999-gog" { src = requireFile rec { name = "setup_ut_goty_2.0.0.5.exe"; - sha256 = "00v8jbqhgb1fry7jvr0i3mb5jscc19niigzjc989qrcp9pamghjc"; + hash = "sha256-TMJX1U2XZZxQYvK/GG0KjGlZVh0R5C2Pzy6sB/GSaAM="; message = '' Unreal Tournament 1999 requires the official GOG package, version 2.0.0.5. @@ -63,21 +63,21 @@ in stdenv.mkDerivation { stdenv.cc.cc ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems autoPatchelfHook imagemagick - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg ]; installPhase = let - outPrefix = if stdenv.isDarwin then "$out/UnrealTournament.app/Contents/MacOS" else "$out"; + outPrefix = if stdenv.hostPlatform.isDarwin then "$out/UnrealTournament.app/Contents/MacOS" else "$out"; in '' runHook preInstall mkdir -p $out/bin - cp -r ${if stdenv.isDarwin then "UnrealTournament.app" else "./*"} $out + cp -r ${if stdenv.hostPlatform.isDarwin then "UnrealTournament.app" else "./*"} $out chmod -R 755 $out cd ${outPrefix} @@ -86,7 +86,7 @@ in stdenv.mkDerivation { cp -n ${unpackGog}/Textures/* ./Textures || true cp -n ${unpackGog}/System/*.{u,int} ./System || true - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' ln -s "$out/${systemDir}/ut-bin" "$out/bin/ut1999" ln -s "$out/${systemDir}/ucc-bin" "$out/bin/ut1999-ucc" @@ -102,8 +102,9 @@ in stdenv.mkDerivation { runHook postInstall ''; - # .so files in the SystemARM64 directory are not loaded properly on aarch64-linux - appendRunpaths = lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # Bring in game's .so files into lookup. Otherwise game fails to start + # as: `Object not found: Class Render.Render` + appendRunpaths = [ "${placeholder "out"}/${systemDir}" ]; diff --git a/pkgs/by-name/uu/uuu/package.nix b/pkgs/by-name/uu/uuu/package.nix old mode 100755 new mode 100644 diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 3e644d082010f..569ebca0c44aa 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -43,21 +43,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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "anes" version = "0.1.6" @@ -115,9 +100,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arc-swap" @@ -127,15 +112,15 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "assert-json-diff" @@ -210,13 +195,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -229,7 +214,7 @@ dependencies = [ "futures", "http-content-range", "itertools 0.12.1", - "memmap2 0.9.4", + "memmap2 0.9.5", "reqwest", "reqwest-middleware", "thiserror", @@ -307,9 +292,9 @@ dependencies = [ [[package]] name = "axoupdater" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3adfac228780fcf162617739408bd8edeb1ae1d497c95082759c5e607cac1e71" +checksum = "fa6f92ef9ab41a352f403f709ef0f09cda1f461795de52085cd46ed831ead02e" dependencies = [ "axoasset", "axoprocess", @@ -339,17 +324,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -486,9 +471,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.16.3" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -549,18 +534,18 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.7" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] [[package]] name = "cargo-util" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14104698cb1694d43c2ff73492468ccf2bb0b047071a9838d999eeba9e984ffa" +checksum = "cc680c90073156fb5280c0c0127b779eef1f6292e41f7d6621acba3041e81c7d" dependencies = [ "anyhow", "core-foundation", @@ -587,12 +572,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.8" +version = "1.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" +checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -617,19 +603,6 @@ dependencies = [ "encoding_rs", ] -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "serde", - "windows-targets 0.52.6", -] - [[package]] name = "ciborium" version = "0.2.2" @@ -659,9 +632,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -669,9 +642,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -682,9 +655,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.13" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa3c596da3cf0983427b0df0dba359df9182c13bd5b519b585a482b0c351f4e8" +checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0" dependencies = [ "clap", ] @@ -719,7 +692,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -730,18 +703,18 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "cmake" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" dependencies = [ "cc", ] [[package]] name = "codspeed" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a104ac948e0188b921eb3fcbdd55dcf62e542df4c7ab7e660623f6288302089" +checksum = "450a0e9df9df1c154156f4344f99d8f6f6e69d0fc4de96ef6e2e68b2ec3bce97" dependencies = [ "colored", "libc", @@ -750,9 +723,9 @@ dependencies = [ [[package]] name = "codspeed-criterion-compat" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "722c36bdc62d9436d027256ce2627af81ac7a596dfc7d13d849d0d212448d7fe" +checksum = "8eb1a6cb9c20e177fde58cdef97c1c7c9264eb1424fe45c4fccedc2fb078a569" dependencies = [ "codspeed", "colored", @@ -821,15 +794,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -953,9 +926,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", @@ -995,17 +968,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "diff" version = "0.1.13" @@ -1078,6 +1040,7 @@ dependencies = [ "platform-tags", "pypi-types", "rkyv", + "rustc-hash", "schemars", "serde", "serde_json", @@ -1085,6 +1048,7 @@ dependencies = [ "tracing", "url", "urlencoding", + "uv-cache-info", "uv-fs", "uv-git", "uv-normalize", @@ -1188,9 +1152,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1203,9 +1167,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", @@ -1370,7 +1334,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1438,9 +1402,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -1450,9 +1414,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -1485,9 +1449,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -1545,6 +1509,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -1562,16 +1532,14 @@ dependencies = [ [[package]] name = "homedir" -version = "0.2.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22074da8bba2ef26fc1737ae6c777b5baab5524c2dc403b5c6a76166766ccda5" +checksum = "2bed305c13ce3829a09d627f5d43ff738482a09361ae4eb8039993b55fb10e5e" dependencies = [ "cfg-if", "nix 0.26.4", - "serde", "widestring", - "windows-sys 0.48.0", - "wmi", + "windows 0.57.0", ] [[package]] @@ -1658,16 +1626,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http", "hyper", "hyper-util", "rustls", - "rustls-native-certs", + "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", "tokio-rustls", @@ -1677,9 +1645,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -1695,29 +1663,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.52.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - [[package]] name = "idna" version = "0.5.0" @@ -1730,9 +1675,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" dependencies = [ "crossbeam-deque", "globset", @@ -1763,9 +1708,9 @@ checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf" [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1793,9 +1738,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "insta" -version = "1.39.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "lazy_static", @@ -1836,6 +1781,7 @@ dependencies = [ "tempfile", "thiserror", "tracing", + "uv-cache-info", "uv-fs", "uv-normalize", "uv-warnings", @@ -1857,17 +1803,17 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -1919,9 +1865,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jiff" -version = "0.1.10" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef8bc400f8312944a9f879db116fed372c4f0859af672eba2a80f79c767dd19" +checksum = "8a45489186a6123c128fdf6016183fcfab7113e1820eb813127e036e287233fb" dependencies = [ "jiff-tzdb-platform", "serde", @@ -1930,15 +1876,15 @@ dependencies = [ [[package]] name = "jiff-tzdb" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05fac328b3df1c0f18a3c2ab6cb7e06e4e549f366017d796e3e66b6d6889abe6" +checksum = "91335e575850c5c4c673b9bd467b0e025f164ca59d0564f69d0c2ee0ffad4653" [[package]] name = "jiff-tzdb-platform" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8da387d5feaf355954c2c122c194d6df9c57d865125a67984bb453db5336940" +checksum = "9835f0060a626fe59f160437bc725491a6af23133ea906500027d1bd2f8f4329" dependencies = [ "jiff-tzdb", ] @@ -1960,23 +1906,39 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "junction" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c9c415a9b7b1e86cd5738f39d34c9e78c765da7fb1756dbd7d31b3b0d2e7afa" +checksum = "72bbdfd737a243da3dfc1f99ee8d6e166480f17ab4ac84d7c34aacd73fc7bd16" dependencies = [ "scopeguard", "windows-sys 0.52.0", ] +[[package]] +name = "krata-tokio-tar" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8bd5fee9b96acb5fc36b401896d601e6fdcce52b0e651ce24a3b21fb524e79f" +dependencies = [ + "filetime", + "futures-core", + "libc", + "portable-atomic", + "redox_syscall 0.3.5", + "tokio", + "tokio-stream", + "xattr", +] + [[package]] name = "kurbo" version = "0.8.3" @@ -2003,9 +1965,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libmimalloc-sys" @@ -2025,7 +1987,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.4", ] [[package]] @@ -2135,9 +2097,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -2188,7 +2150,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2227,11 +2189,11 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "wasi", "windows-sys 0.52.0", @@ -2320,7 +2282,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] @@ -2332,9 +2294,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.3" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -2350,9 +2312,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe" [[package]] name = "oorandom" @@ -2380,15 +2342,15 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" +checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56" [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -2433,7 +2395,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.4", "smallvec", "windows-targets 0.52.6", ] @@ -2506,9 +2468,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" dependencies = [ "memchr", "thiserror", @@ -2517,9 +2479,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d" dependencies = [ "pest", "pest_generator", @@ -2527,22 +2489,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "pest_meta" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174" dependencies = [ "once_cell", "pest", @@ -2582,7 +2544,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2704,9 +2666,9 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" dependencies = [ "diff", "yansi", @@ -2714,9 +2676,9 @@ dependencies = [ [[package]] name = "priority-queue" -version = "2.0.3" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70c501afe3a2e25c9bd219aa56ec1e04cdb3fcdd763055be268778c13fa82c1f" +checksum = "560bcab673ff7f6ca9e270c17bf3affd8a05e3bd9207f123b0d45076fd8197e8" dependencies = [ "autocfg", "equivalent", @@ -2822,7 +2784,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2835,7 +2797,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2855,6 +2817,7 @@ dependencies = [ "serde", "thiserror", "toml", + "toml_edit", "tracing", "url", "uv-fs", @@ -2864,9 +2827,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "pin-project-lite", @@ -2882,9 +2845,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand", @@ -2899,15 +2862,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3007,18 +2970,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -3146,7 +3109,7 @@ dependencies = [ "pin-project-lite", "quinn", "rustls", - "rustls-native-certs", + "rustls-native-certs 0.7.3", "rustls-pemfile", "rustls-pki-types", "serde", @@ -3231,9 +3194,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.48" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f86ae463694029097b846d8f99fd5536740602ae00022c0c50c5600720b2f71" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -3355,9 +3318,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -3368,9 +3331,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "once_cell", "ring", @@ -3382,9 +3345,22 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3411,9 +3387,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -3453,11 +3429,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3482,7 +3458,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3508,7 +3484,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3548,22 +3524,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3574,14 +3550,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -3636,6 +3612,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -3738,9 +3720,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "supports-color" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f" +checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77" dependencies = [ "is_ci", ] @@ -3806,9 +3788,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.76" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -3908,7 +3890,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3919,7 +3901,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "test-case-core", ] @@ -3941,7 +3923,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3981,7 +3963,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4071,9 +4053,9 @@ source = "git+https://github.com/charliermarsh/tl.git?rev=6e25b2ee2513d75385101a [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -4095,7 +4077,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4111,9 +4093,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -4121,26 +4103,11 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-tar" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" -dependencies = [ - "filetime", - "futures-core", - "libc", - "redox_syscall 0.3.5", - "tokio", - "tokio-stream", - "xattr", -] - [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -4173,9 +4140,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap", "serde", @@ -4201,15 +4168,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4231,7 +4198,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4366,9 +4333,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-linebreak" @@ -4492,7 +4459,7 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "uv" -version = "0.4.1" +version = "0.4.11" dependencies = [ "anstream", "anyhow", @@ -4503,12 +4470,15 @@ dependencies = [ "byteorder", "cache-key", "clap", + "ctrlc", + "distribution-filename", "distribution-types", "etcetera", "filetime", "flate2", "fs-err", "futures", + "http", "ignore", "indexmap", "indicatif", @@ -4546,11 +4516,13 @@ dependencies = [ "url", "uv-auth", "uv-cache", + "uv-cache-info", "uv-cli", "uv-client", "uv-configuration", "uv-dispatch", "uv-distribution", + "uv-extract", "uv-fs", "uv-git", "uv-installer", @@ -4598,6 +4570,7 @@ dependencies = [ name = "uv-build" version = "0.0.1" dependencies = [ + "anstream", "anyhow", "distribution-types", "fs-err", @@ -4614,7 +4587,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "toml", + "toml_edit", "tracing", "uv-configuration", "uv-fs", @@ -4641,11 +4614,25 @@ dependencies = [ "tempfile", "tracing", "url", + "uv-cache-info", "uv-fs", "uv-normalize", "walkdir", ] +[[package]] +name = "uv-cache-info" +version = "0.0.1" +dependencies = [ + "fs-err", + "globwalk", + "schemars", + "serde", + "thiserror", + "toml", + "tracing", +] + [[package]] name = "uv-cli" version = "0.0.1" @@ -4691,7 +4678,6 @@ dependencies = [ "hyper", "hyper-util", "insta", - "install-wheel-rs", "itertools 0.13.0", "jiff", "pep440_rs", @@ -4717,6 +4703,7 @@ dependencies = [ "uv-cache", "uv-configuration", "uv-fs", + "uv-metadata", "uv-normalize", "uv-version", "uv-warnings", @@ -4727,8 +4714,8 @@ name = "uv-configuration" version = "0.0.1" dependencies = [ "anyhow", + "cache-key", "clap", - "distribution-types", "either", "pep508_rs", "platform-tags", @@ -4742,6 +4729,7 @@ dependencies = [ "url", "uv-auth", "uv-cache", + "uv-cache-info", "uv-normalize", ] @@ -4755,7 +4743,6 @@ dependencies = [ "distribution-filename", "distribution-types", "fs-err", - "install-wheel-rs", "itertools 0.13.0", "markdown", "mimalloc", @@ -4765,7 +4752,6 @@ dependencies = [ "pretty_assertions", "pypi-types", "resvg", - "rustc-hash", "schemars", "serde", "serde_json", @@ -4776,20 +4762,14 @@ dependencies = [ "tracing", "tracing-durations-export", "tracing-subscriber", - "uv-build", "uv-cache", "uv-cli", "uv-client", - "uv-configuration", - "uv-dispatch", - "uv-git", "uv-installer", "uv-macros", "uv-options-metadata", "uv-python", - "uv-resolver", "uv-settings", - "uv-types", "uv-workspace", "walkdir", ] @@ -4823,13 +4803,13 @@ name = "uv-distribution" version = "0.0.1" dependencies = [ "anyhow", + "cache-key", "distribution-filename", "distribution-types", "fs-err", "futures", "indoc", "insta", - "install-wheel-rs", "nanoid", "pep440_rs", "pep508_rs", @@ -4847,15 +4827,18 @@ dependencies = [ "tracing", "url", "uv-cache", + "uv-cache-info", "uv-client", "uv-configuration", "uv-extract", "uv-fs", "uv-git", + "uv-metadata", "uv-normalize", "uv-types", "uv-warnings", "uv-workspace", + "walkdir", "zip", ] @@ -4868,6 +4851,7 @@ dependencies = [ "distribution-filename", "fs-err", "futures", + "krata-tokio-tar", "md-5", "pypi-types", "rayon", @@ -4876,7 +4860,6 @@ dependencies = [ "sha2", "thiserror", "tokio", - "tokio-tar", "tokio-util", "tracing", "xz2", @@ -4949,6 +4932,7 @@ dependencies = [ "tracing", "url", "uv-cache", + "uv-cache-info", "uv-configuration", "uv-distribution", "uv-extract", @@ -4967,10 +4951,26 @@ version = "0.0.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "textwrap", ] +[[package]] +name = "uv-metadata" +version = "0.1.0" +dependencies = [ + "async_zip", + "distribution-filename", + "fs-err", + "futures", + "pypi-types", + "thiserror", + "tokio", + "tokio-util", + "uv-normalize", + "zip", +] + [[package]] name = "uv-normalize" version = "0.0.1" @@ -5037,6 +5037,7 @@ dependencies = [ "tracing", "url", "uv-cache", + "uv-cache-info", "uv-client", "uv-extract", "uv-fs", @@ -5044,7 +5045,7 @@ dependencies = [ "uv-warnings", "which", "windows-registry", - "windows-result", + "windows-result 0.2.0", "windows-sys 0.59.0", "winsafe 0.0.22", ] @@ -5091,14 +5092,12 @@ dependencies = [ "cache-key", "clap", "dashmap", - "derivative", "distribution-filename", "distribution-types", "either", "futures", "indexmap", "insta", - "install-wheel-rs", "itertools 0.13.0", "jiff", "once-map", @@ -5128,6 +5127,7 @@ dependencies = [ "uv-distribution", "uv-fs", "uv-git", + "uv-metadata", "uv-normalize", "uv-pubgrub", "uv-python", @@ -5170,6 +5170,7 @@ dependencies = [ "thiserror", "toml", "tracing", + "uv-cache-info", "uv-configuration", "uv-fs", "uv-macros", @@ -5249,7 +5250,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.4.1" +version = "0.4.11" [[package]] name = "uv-virtualenv" @@ -5280,6 +5281,8 @@ dependencies = [ name = "uv-workspace" version = "0.0.1" dependencies = [ + "anyhow", + "assert_fs", "either", "fs-err", "glob", @@ -5290,8 +5293,10 @@ dependencies = [ "pypi-types", "regex", "rustc-hash", + "same-file", "schemars", "serde", + "tempfile", "thiserror", "tokio", "toml", @@ -5354,34 +5359,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -5391,9 +5397,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5401,22 +5407,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" @@ -5448,9 +5454,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -5458,9 +5464,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -5523,13 +5529,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-core 0.52.0", - "windows-implement 0.52.0", - "windows-interface 0.52.0", + "windows-core 0.57.0", "windows-targets 0.52.6", ] @@ -5545,10 +5549,13 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ + "windows-implement 0.57.0", + "windows-interface 0.57.0", + "windows-result 0.1.2", "windows-targets 0.52.6", ] @@ -5560,20 +5567,20 @@ checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ "windows-implement 0.58.0", "windows-interface 0.58.0", - "windows-result", + "windows-result 0.2.0", "windows-strings", "windows-targets 0.52.6", ] [[package]] name = "windows-implement" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5584,18 +5591,18 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "windows-interface" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5606,7 +5613,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5615,11 +5622,20 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-strings", "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-result" version = "0.2.0" @@ -5635,7 +5651,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-targets 0.52.6", ] @@ -5820,13 +5836,13 @@ checksum = "7d6ad6cbd9c6e5144971e326303f0e453b61d82e4f72067fccf23106bccd8437" [[package]] name = "wiremock" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a59f8ae78a4737fb724f20106fb35ccb7cfe61ff335665d3042b3aa98e34717" +checksum = "7fff469918e7ca034884c7fd8f93fe27bacb7fcb599fd879df6c7b429a29b646" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "deadpool", "futures", "http", @@ -5842,20 +5858,6 @@ dependencies = [ "url", ] -[[package]] -name = "wmi" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f0a4062ca522aad4705a2948fd4061b3857537990202a8ddd5af21607f79a" -dependencies = [ - "chrono", - "futures", - "log", - "serde", - "thiserror", - "windows 0.52.0", -] - [[package]] name = "wyz" version = "0.5.1" @@ -5893,9 +5895,9 @@ dependencies = [ [[package]] name = "yansi" -version = "0.5.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "zerocopy" @@ -5915,7 +5917,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 8e7798b80b457..7b507ceebd621 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -16,14 +16,14 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.4.1"; + version = "0.4.11"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-gjACm0q9j5Kx9E1rxiR7Bvg4FoAATesQyO0y8kbsTJI="; + hash = "sha256-a8mN2wag26BSL+2b5i4P1XN34J8jt+lZm2poZQdsAzM="; }; cargoDeps = rustPlatform.importCargoLock { @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ libiconv - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; dontUseCmakeConfigure = true; diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index fa5ad6f3692bc..578cb2cbb7c4c 100644 --- a/pkgs/by-name/uw/uwsm/package.nix +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uwsm"; - version = "0.18.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "uwsm"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-/LmSc1AKNZ/VZ2rkUsOvwqpJmPgb6dThTtOu44BriQs="; + hash = "sha256-BtzW0jyYAVGjSBlocgkGHgY3JQUpWizDaSa2YBIX2Bs="; }; nativeBuildInputs = [ @@ -60,12 +60,9 @@ stdenv.mkDerivation (finalAttrs: { "uuctl" = uuctlSupport; "man-pages" = true; }) + (lib.mesonOption "python-bin" python.interpreter) ]; - passthru = { - updateScript = nix-update-script { }; - }; - postInstall = let wrapperArgs = '' @@ -85,9 +82,19 @@ stdenv.mkDerivation (finalAttrs: { ''} ''; + outputs = [ + "out" + "man" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Universal wayland session manager"; homepage = "https://github.com/Vladimir-csp/uwsm"; + changelog = "https://github.com/Vladimir-csp/uwsm/releases/tag/v${finalAttrs.version}"; mainProgram = "uwsm"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index a8fa5eb51aedd..0a9db5026aa32 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2024-08-25"; + version = "1.0-unstable-2024-09-20"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "6d5e3848bdbd76420b93ca47de148cbf46baf9f6"; - hash = "sha256-YTDL3NZSjbVqu6aPJBmUmsT3bDX2VUeufXq/Q+jn4Og="; + rev = "f8c53f59b012dd56d44ae50cdf90dd1dad6cce23"; + hash = "sha256-Ee4hN3OnqF/OhKieGtzT4XOhNJIhywCgP6Us0DZTVBI="; }; outputs = [ "out" "projects" ]; @@ -64,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; mainProgram = "uxnemu"; inherit (SDL2.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/va/vale-ls/package.nix b/pkgs/by-name/va/vale-ls/package.nix index b79f94c7627cc..0a09952d51afa 100644 --- a/pkgs/by-name/va/vale-ls/package.nix +++ b/pkgs/by-name/va/vale-ls/package.nix @@ -9,15 +9,15 @@ , vale }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "vale-ls"; - version = "0.3.7-unstable-2024-03-13"; + version = "0.3.8"; src = fetchFromGitHub { owner = "errata-ai"; repo = "vale-ls"; - rev = "473e16bc88ec48b35e2bd208adc174878c4d5396"; - hash = "sha256-ywJsnWMc9NSjYjsK6SXdMAQl+hcP+KQ7Xp1A99aeqAg="; + rev = "refs/tags/v${version}"; + hash = "sha256-+2peLqj3/ny0hDwJVKEp2XS68VO50IvpCB2fvZoEdJo="; }; nativeBuildInputs = [ @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]); checkFlags = [ # The following tests are reaching to the network. "--skip=vale::tests" - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # This test does not account for the existence of aarch64-linux machines, # despite upstream shipping artifacts for that architecture "--skip=utils::tests::arch" @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { env.OPENSSL_NO_VENDOR = true; - cargoHash = "sha256-ifKdSTmVWfDZF5Kn9b5JpzDxa160oRTfzjvxeL9POBg="; + cargoHash = "sha256-YurMB54jeMQIAOgDQhXEYrkYUYrSl02M9JG5Wtp6Eb8="; postInstall = '' wrapProgram $out/bin/vale-ls \ diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix new file mode 100644 index 0000000000000..3027258e7bd58 --- /dev/null +++ b/pkgs/by-name/va/vale/package.nix @@ -0,0 +1,65 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + makeBinaryWrapper, + symlinkJoin, + vale, + valeStyles, +}: + +buildGoModule rec { + pname = "vale"; + version = "3.7.1"; + + subPackages = [ "cmd/vale" ]; + + src = fetchFromGitHub { + owner = "errata-ai"; + repo = "vale"; + rev = "v${version}"; + hash = "sha256-jb+ap+XQMrSqstgexycpgO+M2YyENDeSmMQXrV2FiM4="; + }; + + vendorHash = "sha256-0AeG0/ALU/mkXxVKzqGhxXLqq2XYmnF/ZRaZkJ5eQxU="; + + ldflags = [ + "-s" + "-X main.version=${version}" + ]; + + # Tests require network access + doCheck = false; + + passthru.withStyles = + selector: + symlinkJoin { + name = "vale-with-styles-${vale.version}"; + paths = [ vale ] ++ selector valeStyles; + nativeBuildInputs = [ makeBinaryWrapper ]; + postBuild = '' + wrapProgram "$out/bin/vale" \ + --set VALE_STYLES_PATH "$out/share/vale/styles/" + ''; + meta = { + inherit (vale.meta) mainProgram; + }; + }; + + meta = { + description = "Syntax-aware linter for prose built with speed and extensibility in mind"; + longDescription = '' + Vale in Nixpkgs offers the helper `.withStyles` allow you to install it + predefined styles: + + ```nix + vale.withStyles (s: [ s.alex s.google ]) + ``` + ''; + homepage = "https://vale.sh/"; + changelog = "https://github.com/errata-ai/vale/releases/tag/v${version}"; + mainProgram = "vale"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/tools/text/vale/styles.nix b/pkgs/by-name/va/vale/styles.nix similarity index 80% rename from pkgs/tools/text/vale/styles.nix rename to pkgs/by-name/va/vale/styles.nix index 6022d38497a9f..6d2cd33577bda 100644 --- a/pkgs/tools/text/vale/styles.nix +++ b/pkgs/by-name/va/vale/styles.nix @@ -1,34 +1,47 @@ -{ lib, stdenvNoCC, fetchFromGitHub, fetchzip, nix-update-script }: +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, +}: let buildStyle = - { name - , stylePath ? name - , ... + { + name, + stylePath ? name, + ... }@args: - stdenvNoCC.mkDerivation ({ - pname = "vale-style-${lib.toLower name}"; + stdenvNoCC.mkDerivation ( + { + pname = "vale-style-${lib.toLower name}"; - dontConfigure = true; - dontBuild = true; - doCheck = false; - dontFixup = true; + dontConfigure = true; + dontBuild = true; + doCheck = false; + dontFixup = true; - installPhase = '' - runHook preInstall - mkdir -p $out/share/vale/styles - cp -R ${stylePath} "$out/share/vale/styles/${name}" - runHook postInstall - ''; + installPhase = '' + runHook preInstall + mkdir -p $out/share/vale/styles + cp -R ${stylePath} "$out/share/vale/styles/${name}" + runHook postInstall + ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { }; - meta = { - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ katexochen ]; - } // (args.meta or { }); - } // removeAttrs args [ "meta" "name" ]); + meta = { + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ katexochen ]; + } // (args.meta or { }); + } + // removeAttrs args [ + "meta" + "name" + ] + ); in + { alex = buildStyle rec { name = "alex"; diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix index 1a97c09ebd297..6a8fd54173d27 100644 --- a/pkgs/by-name/va/valkey/package.nix +++ b/pkgs/by-name/va/valkey/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "valkey"; - version = "7.2.6"; + version = "7.2.7"; src = fetchFromGitHub { owner = "valkey-io"; repo = "valkey"; rev = finalAttrs.version; - hash = "sha256-nWeuWlP000DHEmIBzW1UmGqN+BggCjTS5plbQ/NV6wY="; + hash = "sha256-2kbhUg+rNuIUF/Bna6jFLI6Vhg9TlSi+OZEy6jKl2X0="; }; patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch; @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withSystemd systemd ++ lib.optional tlsSupport openssl; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/Makefile --replace-fail "-flto" "" ''; @@ -42,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); # darwin currently lacks a pure `pgrep` which is extensively used here - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; checkPhase = '' runHook preCheck diff --git a/pkgs/by-name/va/vapoursynth-mvtools/package.nix b/pkgs/by-name/va/vapoursynth-mvtools/package.nix new file mode 100644 index 0000000000000..41ae1a11ccee9 --- /dev/null +++ b/pkgs/by-name/va/vapoursynth-mvtools/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + autoreconfHook, + vapoursynth, + nasm, + fftwFloat, +}: + +stdenv.mkDerivation rec { + pname = "vapoursynth-mvtools"; + version = "24"; + + src = fetchFromGitHub { + owner = "dubhater"; + repo = "vapoursynth-mvtools"; + rev = "v${version}"; + hash = "sha256-bEifU1PPNOBr6o9D6DGIzTaG4xjygBxkQYnZxd/4SwQ="; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + buildInputs = [ + nasm + vapoursynth + fftwFloat + ]; + + configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ]; + + meta = with lib; { + description = "Set of filters for motion estimation and compensation"; + homepage = "https://github.com/dubhater/vapoursynth-mvtools"; + license = licenses.gpl2; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/by-name/va/vapoursynth/editor.nix b/pkgs/by-name/va/vapoursynth/editor.nix index 76f11ddf97889..25d583148eb2b 100644 --- a/pkgs/by-name/va/vapoursynth/editor.nix +++ b/pkgs/by-name/va/vapoursynth/editor.nix @@ -20,7 +20,7 @@ let owner = "YomikoR"; repo = pname; rev = lib.toLower version; - sha256 = "sha256-+/9j9DJDGXbuTvE8ZXIu6wjcof39SyatS36Q6y9hLPg="; + hash = "sha256-+/9j9DJDGXbuTvE8ZXIu6wjcof39SyatS36Q6y9hLPg="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/by-name/va/vapoursynth/package.nix b/pkgs/by-name/va/vapoursynth/package.nix index 278cf1e567785..7a40f1eba1c24 100644 --- a/pkgs/by-name/va/vapoursynth/package.nix +++ b/pkgs/by-name/va/vapoursynth/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ] )) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ApplicationServices ]; @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; # see https://github.com/NixOS/nixpkgs/pull/189446 for partial fix + broken = stdenv.hostPlatform.isDarwin; # see https://github.com/NixOS/nixpkgs/pull/189446 for partial fix description = "Video processing framework with the future in mind"; homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/by-name/va/variety/package.nix similarity index 100% rename from pkgs/applications/misc/variety/default.nix rename to pkgs/by-name/va/variety/package.nix diff --git a/pkgs/by-name/va/vatprism/package.nix b/pkgs/by-name/va/vatprism/package.nix index c13e0b0cf0822..bdc406091d003 100644 --- a/pkgs/by-name/va/vatprism/package.nix +++ b/pkgs/by-name/va/vatprism/package.nix @@ -60,7 +60,7 @@ maven.buildMavenPackage rec { ]; mvnHash = - if (stdenv.isLinux && stdenv.isAarch64) then + if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then "sha256-x0nFt2C7dZqMdllI1+Io9SPBY2J/dVgBTVb9T24vFFI=" else "sha256-9uyNCUqnMgpiwm2kz544pWNB/SkRpASm2Dln0e4yZos="; diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix new file mode 100644 index 0000000000000..896597eb57923 --- /dev/null +++ b/pkgs/by-name/va/vault-bin/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + fetchzip, +}: + +stdenv.mkDerivation rec { + pname = "vault-bin"; + version = "1.17.6"; + + src = + let + inherit (stdenv.hostPlatform) system; + selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); + suffix = selectSystem { + x86_64-linux = "linux_amd64"; + aarch64-linux = "linux_arm64"; + i686-linux = "linux_386"; + x86_64-darwin = "darwin_amd64"; + aarch64-darwin = "darwin_arm64"; + }; + hash = selectSystem { + x86_64-linux = "sha256-K9yNZ4M8u8FfisWi6Y6TsBJy6FQytr3htNCsKh2MlyA="; + aarch64-linux = "sha256-KLHkxUGvekHT/bPtoIlmylCubTWH+I7Q0wJM0UG0Hp8="; + i686-linux = "sha256-jBS/nGKP27weFw4u6Q10athYwCqWLzpb7ph39v+QAN8="; + x86_64-darwin = "sha256-5KfWqtJldk66dO5ImYKivDau4JzacUIXBfAzWkkPfoE="; + aarch64-darwin = "sha256-wjmNY1lunJDjpkWDXl0upAeNBqBx8momlY4a3j+hMd0="; + }; + in + fetchzip { + url = "https://releases.hashicorp.com/vault/${version}/vault_${version}_${suffix}.zip"; + stripRoot = false; + inherit hash; + }; + + dontConfigure = true; + dontBuild = true; + dontStrip = stdenv.hostPlatform.isDarwin; + + installPhase = '' + runHook preInstall + install -D vault $out/bin/vault + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/vault --help + $out/bin/vault version + runHook postInstallCheck + ''; + + dontPatchELF = true; + dontPatchShebangs = true; + + passthru.updateScript = ./update-bin.sh; + + meta = with lib; { + description = "Tool for managing secrets, this binary includes the UI"; + homepage = "https://www.vaultproject.io"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.bsl11; + maintainers = + with maintainers; + teams.serokell.members + ++ [ + offline + psyanticy + Chili-Man + techknowlogick + mkaito + ]; + mainProgram = "vault"; + platforms = [ + "x86_64-linux" + "i686-linux" + "x86_64-darwin" + "aarch64-darwin" + "aarch64-linux" + ]; + }; +} diff --git a/pkgs/by-name/va/vault-bin/update-bin.sh b/pkgs/by-name/va/vault-bin/update-bin.sh new file mode 100755 index 0000000000000..cd91fe4b608d4 --- /dev/null +++ b/pkgs/by-name/va/vault-bin/update-bin.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused gawk nix-prefetch + +set -euo pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/vault-bin.nix" +if [ ! -f "$NIX_DRV" ]; then + echo "ERROR: cannot find vault-bin in $ROOT" + exit 1 +fi + +function calc_hash () { + local version=$1 + local arch=$2 + url="https://releases.hashicorp.com/vault/${version}/vault_${version}_${arch}.zip" + zip_hash=$(nix-prefetch-url --unpack $url) + nix hash to-sri --type sha256 "$zip_hash" +} + +replace_sha() { + sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" +} + +# https://releases.hashicorp.com/vault/1.9.4/vault_1.9.4_linux_arm64.zip +VAULT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/hashicorp/vault/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') + +VAULT_LINUX_X86_SHA256=$(calc_hash "$VAULT_VER" "linux_386") +VAULT_LINUX_X64_SHA256=$(calc_hash "$VAULT_VER" "linux_amd64") +VAULT_DARWIN_X64_SHA256=$(calc_hash "$VAULT_VER" "darwin_amd64") +VAULT_LINUX_AARCH64_SHA256=$(calc_hash "$VAULT_VER" "linux_arm64") +VAULT_DARWIN_AARCH64_SHA256=$(calc_hash "$VAULT_VER" "darwin_arm64") + +sed -i "s/version = \".*\"/version = \"$VAULT_VER\"/" "$NIX_DRV" + +replace_sha "i686-linux" "$VAULT_LINUX_X86_SHA256" +replace_sha "x86_64-linux" "$VAULT_LINUX_X64_SHA256" +replace_sha "x86_64-darwin" "$VAULT_DARWIN_X64_SHA256" +replace_sha "aarch64-linux" "$VAULT_LINUX_AARCH64_SHA256" +replace_sha "aarch64-darwin" "$VAULT_DARWIN_AARCH64_SHA256" diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix new file mode 100644 index 0000000000000..f34203cf96696 --- /dev/null +++ b/pkgs/by-name/va/vault/package.nix @@ -0,0 +1,84 @@ +{ + stdenv, + lib, + fetchFromGitHub, + buildGoModule, + installShellFiles, + nixosTests, + makeWrapper, + gawk, + glibc, +}: + +buildGoModule rec { + pname = "vault"; + version = "1.17.6"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "vault"; + rev = "v${version}"; + hash = "sha256-sd4gNNJ/DVpl7ReymykNemWz4NNisofMIH6lLNl+iVw="; + }; + + vendorHash = "sha256-V7aMf03U2DTNg1murp4LBfuOioA+7iG6jX9o05rhM2U="; + + proxyVendor = true; + + subPackages = [ "." ]; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; + + tags = [ "vault" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/hashicorp/vault/sdk/version.GitCommit=${src.rev}" + "-X github.com/hashicorp/vault/sdk/version.Version=${version}" + "-X github.com/hashicorp/vault/sdk/version.VersionPrerelease=" + ]; + + postInstall = + '' + echo "complete -C $out/bin/vault vault" > vault.bash + installShellCompletion vault.bash + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + wrapProgram $out/bin/vault \ + --prefix PATH ${ + lib.makeBinPath [ + gawk + glibc + ] + } + ''; + + passthru.tests = { + inherit (nixosTests) + vault + vault-postgresql + vault-dev + vault-agent + ; + }; + + meta = with lib; { + homepage = "https://www.vaultproject.io/"; + description = "Tool for managing secrets"; + changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md"; + license = licenses.bsl11; + mainProgram = "vault"; + maintainers = with maintainers; [ + rushmorem + lnl7 + offline + pradeepchhetri + Chili-Man + techknowlogick + ]; + }; +} diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 98c040af0d25f..532c6cb4e42d9 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2024.07.12"; + version = "2024.09.30"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-WE+BeF9BYR9/Gmi60g6ApXsWQ2vch2N6XhH1A9HAHsc="; + hash = "sha256-lPvThSB8xYZQBRKTJmFwoCKBd5lOHaAOttrtcuQDIUg="; leaveDotGit = true; postFetch = '' cd "$out" diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix new file mode 100644 index 0000000000000..65934fb56b8c4 --- /dev/null +++ b/pkgs/by-name/ve/velero/package.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "velero"; + version = "1.14.1"; + + + src = fetchFromGitHub { + owner = "vmware-tanzu"; + repo = "velero"; + rev = "v${version}"; + hash = "sha256-rXWBTPM3dCGON1DvpCOsA4C4mAuVDqV9YbrvP5yDCa0="; + }; + + ldflags = [ + "-s" "-w" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${version}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" + ]; + + vendorHash = "sha256-HpPJXYBrk5qfV01VOqXGpn4waEONJa61mqLbEsuwrEs="; + + excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; + + doCheck = false; # Tests expect a running cluster see https://github.com/vmware-tanzu/velero/tree/main/test/e2e + doInstallCheck = true; + installCheckPhase = '' + $out/bin/velero version --client-only | grep ${version} > /dev/null + ''; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + $out/bin/velero completion bash > velero.bash + $out/bin/velero completion zsh > velero.zsh + installShellCompletion velero.{bash,zsh} + ''; + + meta = with lib; { + description = + "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; + homepage = "https://velero.io/"; + changelog = + "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.mbode maintainers.bryanasdev000 ]; + }; +} diff --git a/pkgs/by-name/ve/vencord/package-lock.json b/pkgs/by-name/ve/vencord/package-lock.json deleted file mode 100644 index 2d6a5d1786e84..0000000000000 --- a/pkgs/by-name/ve/vencord/package-lock.json +++ /dev/null @@ -1,5912 +0,0 @@ -{ - "name": "vencord", - "version": "1.9.5", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "vencord", - "version": "1.9.5", - "license": "GPL-3.0-or-later", - "dependencies": { - "@sapphi-red/web-noise-suppressor": "0.3.3", - "@vap/core": "0.0.12", - "@vap/shiki": "0.10.5", - "eslint-plugin-simple-header": "^1.0.2", - "fflate": "^0.7.4", - "gifenc": "github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3", - "monaco-editor": "^0.50.0", - "nanoid": "^4.0.2", - "virtual-merge": "^1.0.1" - }, - "devDependencies": { - "@types/chrome": "^0.0.246", - "@types/diff": "^5.0.3", - "@types/lodash": "^4.14.194", - "@types/node": "^18.16.3", - "@types/react": "^18.2.0", - "@types/react-dom": "^18.2.1", - "@types/yazl": "^2.4.2", - "@typescript-eslint/eslint-plugin": "^5.59.1", - "@typescript-eslint/parser": "^5.59.1", - "diff": "^5.1.0", - "discord-types": "^1.3.26", - "esbuild": "^0.15.18", - "eslint": "^8.46.0", - "eslint-import-resolver-alias": "^1.1.2", - "eslint-plugin-path-alias": "^1.0.0", - "eslint-plugin-simple-import-sort": "^10.0.0", - "eslint-plugin-unused-imports": "^2.0.0", - "highlight.js": "10.6.0", - "html-minifier-terser": "^7.2.0", - "moment": "^2.29.4", - "puppeteer-core": "^19.11.1", - "standalone-electron-types": "^1.0.0", - "stylelint": "^15.6.0", - "stylelint-config-standard": "^33.0.0", - "ts-patch": "^3.1.2", - "tsx": "^3.12.7", - "type-fest": "^3.9.0", - "typescript": "^5.4.5", - "typescript-transform-paths": "^3.4.7", - "zip-local": "^0.3.5" - }, - "engines": { - "node": ">=18", - "pnpm": ">=9" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.24.7", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.24.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@csstools/css-parser-algorithms": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.7.1.tgz", - "integrity": "sha512-2SJS42gxmACHgikc1WGesXLIT8d/q2l0UFM7TaEeIzdFCE/FPMtTiizcPGGJtlPo2xuQzY09OhrLTzRxqJqwGw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "engines": { - "node": "^14 || ^16 || >=18" - }, - "peerDependencies": { - "@csstools/css-tokenizer": "^2.4.1" - } - }, - "node_modules/@csstools/css-tokenizer": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.4.1.tgz", - "integrity": "sha512-eQ9DIktFJBhGjioABJRtUucoWR2mwllurfnM8LuNGAqX3ViZXaUchqk+1s7jjtkFiT9ySdACsFEA3etErkALUg==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "engines": { - "node": "^14 || ^16 || >=18" - } - }, - "node_modules/@csstools/media-query-list-parser": { - "version": "2.1.13", - "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.13.tgz", - "integrity": "sha512-XaHr+16KRU9Gf8XLi3q8kDlI18d5vzKSKCY510Vrtc9iNR0NJzbY9hhTmwhzYZj/ZwGL4VmB3TA9hJW0Um2qFA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "engines": { - "node": "^14 || ^16 || >=18" - }, - "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.7.1", - "@csstools/css-tokenizer": "^2.4.1" - } - }, - "node_modules/@csstools/selector-specificity": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz", - "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "engines": { - "node": "^14 || ^16 || >=18" - }, - "peerDependencies": { - "postcss-selector-parser": "^6.0.13" - } - }, - "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" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", - "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", - "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", - "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", - "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", - "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", - "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", - "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", - "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", - "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "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" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", - "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", - "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", - "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", - "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", - "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", - "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", - "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", - "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", - "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", - "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", - "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" - } - }, - "node_modules/@eslint-community/regexpp": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", - "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", - "dev": true, - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", - "dev": true, - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", - "deprecated": "Use @eslint/config-array instead", - "dev": true, - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "deprecated": "Use @eslint/object-schema instead", - "dev": true - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/source-map": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", - "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", - "dev": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", - "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "dev": true, - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@puppeteer/browsers": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.5.0.tgz", - "integrity": "sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ==", - "dev": true, - "dependencies": { - "debug": "4.3.4", - "extract-zip": "2.0.1", - "https-proxy-agent": "5.0.1", - "progress": "2.0.3", - "proxy-from-env": "1.1.0", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "yargs": "17.7.1" - }, - "bin": { - "browsers": "lib/cjs/main-cli.js" - }, - "engines": { - "node": ">=14.1.0" - }, - "peerDependencies": { - "typescript": ">= 4.7.4" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@puppeteer/browsers/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@sapphi-red/web-noise-suppressor": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@sapphi-red/web-noise-suppressor/-/web-noise-suppressor-0.3.3.tgz", - "integrity": "sha512-gAC33DCXYwNTI/k1PxOVHmbbzakUSMbb/DHpoV6rn4pKZtPI1dduULSmAAm/y1ipgIlArnk2JcnQzw4n2tCZHw==" - }, - "node_modules/@types/chrome": { - "version": "0.0.246", - "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.246.tgz", - "integrity": "sha512-MxGxEomGxsJiL9xe/7ZwVgwdn8XVKWbPvxpVQl3nWOjrS0Ce63JsfzxUc4aU3GvRcUPYsfufHmJ17BFyKxeA4g==", - "dev": true, - "dependencies": { - "@types/filesystem": "*", - "@types/har-format": "*" - } - }, - "node_modules/@types/diff": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.2.1.tgz", - "integrity": "sha512-uxpcuwWJGhe2AR1g8hD9F5OYGCqjqWnBUQFD8gMZsDbv8oPHzxJF6iMO6n8Tk0AdzlxoaaoQhOYlIg/PukVU8g==", - "dev": true - }, - "node_modules/@types/filesystem": { - "version": "0.0.36", - "resolved": "https://registry.npmjs.org/@types/filesystem/-/filesystem-0.0.36.tgz", - "integrity": "sha512-vPDXOZuannb9FZdxgHnqSwAG/jvdGM8Wq+6N4D/d80z+D4HWH+bItqsZaVRQykAn6WEVeEkLm2oQigyHtgb0RA==", - "dev": true, - "dependencies": { - "@types/filewriter": "*" - } - }, - "node_modules/@types/filewriter": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.33.tgz", - "integrity": "sha512-xFU8ZXTw4gd358lb2jw25nxY9QAgqn2+bKKjKOYfNCzN4DKCFetK7sPtrlpg66Ywe3vWY9FNxprZawAh9wfJ3g==", - "dev": true - }, - "node_modules/@types/har-format": { - "version": "1.2.15", - "resolved": "https://registry.npmjs.org/@types/har-format/-/har-format-1.2.15.tgz", - "integrity": "sha512-RpQH4rXLuvTXKR0zqHq3go0RVXYv/YVqv4TnPH95VbwUxZdQlK1EtcMvQvMpDngHbt13Csh9Z4qT9AbkiQH5BA==", - "dev": true - }, - "node_modules/@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true - }, - "node_modules/@types/lodash": { - "version": "4.17.7", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.7.tgz", - "integrity": "sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==", - "dev": true - }, - "node_modules/@types/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", - "dev": true - }, - "node_modules/@types/node": { - "version": "18.19.40", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.40.tgz", - "integrity": "sha512-MIxieZHrm4Ee8XArBIc+Or9HINt2StOmCbgRcXGSJl8q14svRvkZPe7LJq9HKtTI1SK3wU8b91TjntUm7T69Pg==", - "dev": true, - "dependencies": { - "undici-types": "~5.26.4" - } - }, - "node_modules/@types/normalize-package-data": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", - "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", - "dev": true - }, - "node_modules/@types/prop-types": { - "version": "15.7.12", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", - "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==", - "dev": true - }, - "node_modules/@types/react": { - "version": "18.3.3", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz", - "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==", - "dev": true, - "dependencies": { - "@types/prop-types": "*", - "csstype": "^3.0.2" - } - }, - "node_modules/@types/react-dom": { - "version": "18.3.0", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz", - "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==", - "dev": true, - "dependencies": { - "@types/react": "*" - } - }, - "node_modules/@types/semver": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", - "dev": true - }, - "node_modules/@types/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, - "optional": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/yazl": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/@types/yazl/-/yazl-2.4.5.tgz", - "integrity": "sha512-qpmPfx32HS7vlGJf7EsoM9qJnLZhXJBf1KH0hzfdc+D794rljQWh4H0I/UrZy+6Nhqn0l2jdBZXBGZtR1vnHqw==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", - "dev": true, - "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", - "dev": true, - "dependencies": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "debug": "^4.3.4" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", - "dev": true, - "dependencies": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "*" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true - }, - "node_modules/@vap/core": { - "version": "0.0.12", - "resolved": "https://registry.npmjs.org/@vap/core/-/core-0.0.12.tgz", - "integrity": "sha512-3csHpkE1zUSRTZwl7xIf2uXg1cD4IhhtUm0F6K/dWydc95R5Nj+krB4OTNATuqkewIv/ViCbwjPfkafAgvZQSg==", - "dependencies": { - "eventemitter3": "^4.0.7" - } - }, - "node_modules/@vap/shiki": { - "version": "0.10.5", - "resolved": "https://registry.npmjs.org/@vap/shiki/-/shiki-0.10.5.tgz", - "integrity": "sha512-5BHVGvQT8qonbLSASon5aQFQ18OZU4FxSl9tLSj6oJ0sap3KdMbYcfGq25M9zFZR1g1dJN7fgjmZXBIS5omIdw==", - "dependencies": { - "jsonc-parser": "^3.0.0", - "vscode-oniguruma": "^1.6.1", - "vscode-textmate": "5.2.0" - } - }, - "node_modules/acorn": { - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", - "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==", - "dev": true - }, - "node_modules/atob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true, - "bin": { - "atob": "bin/atob.js" - }, - "engines": { - "node": ">= 4.5.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "node_modules/base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, - "dependencies": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/base/node_modules/define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "node_modules/cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true, - "dependencies": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "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, - "engines": { - "node": ">=6" - } - }, - "node_modules/camel-case": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", - "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", - "dev": true, - "dependencies": { - "pascal-case": "^3.1.2", - "tslib": "^2.0.3" - } - }, - "node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/camelcase-keys": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz", - "integrity": "sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==", - "dev": true, - "dependencies": { - "camelcase": "^6.3.0", - "map-obj": "^4.1.0", - "quick-lru": "^5.1.1", - "type-fest": "^1.2.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/camelcase-keys/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "dev": true - }, - "node_modules/chromium-bidi": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.7.tgz", - "integrity": "sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ==", - "dev": true, - "dependencies": { - "mitt": "3.0.0" - }, - "peerDependencies": { - "devtools-protocol": "*" - } - }, - "node_modules/class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "dev": true, - "dependencies": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-descriptor": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", - "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.1", - "is-data-descriptor": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/clean-css": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz", - "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==", - "dev": true, - "dependencies": { - "source-map": "~0.6.0" - }, - "engines": { - "node": ">= 10.0" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==", - "dev": true, - "dependencies": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - }, - "engines": { - "node": ">=0.10.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==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/colord": { - "version": "2.9.3", - "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", - "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", - "dev": true - }, - "node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", - "dev": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/component-emitter": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz", - "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "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 - }, - "node_modules/copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cosmiconfig": { - "version": "8.3.6", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", - "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", - "dev": true, - "dependencies": { - "import-fresh": "^3.3.0", - "js-yaml": "^4.1.0", - "parse-json": "^5.2.0", - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/d-fischer" - }, - "peerDependencies": { - "typescript": ">=4.9.5" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/cross-fetch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", - "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", - "dev": true, - "dependencies": { - "node-fetch": "2.6.7" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/css-functions-list": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.2.tgz", - "integrity": "sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==", - "dev": true, - "engines": { - "node": ">=12 || >=16" - } - }, - "node_modules/css-tree": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", - "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", - "dev": true, - "dependencies": { - "mdn-data": "2.0.30", - "source-map-js": "^1.0.1" - }, - "engines": { - "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" - } - }, - "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==", - "dev": true, - "bin": { - "cssesc": "bin/cssesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/csstype": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", - "dev": true - }, - "node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decamelize": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz", - "integrity": "sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/decamelize-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", - "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", - "dev": true, - "dependencies": { - "decamelize": "^1.1.0", - "map-obj": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/decamelize-keys/node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decamelize-keys/node_modules/map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decode-uri-component": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", - "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "node_modules/define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/devtools-protocol": { - "version": "0.0.1107588", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz", - "integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==", - "dev": true - }, - "node_modules/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/discord-types": { - "version": "1.3.26", - "resolved": "https://registry.npmjs.org/discord-types/-/discord-types-1.3.26.tgz", - "integrity": "sha512-ToG51AOCH+JTQf7b+8vuYQe5Iqwz7nZ7StpECAZ/VZcI1ZhQk13pvt9KkRTfRv1xNvwJ2qib4e3+RifQlo8VPQ==", - "dev": true, - "dependencies": { - "@types/react": "17.0.2", - "moment": "^2.29.1" - } - }, - "node_modules/discord-types/node_modules/@types/react": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.2.tgz", - "integrity": "sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==", - "dev": true, - "dependencies": { - "@types/prop-types": "*", - "csstype": "^3.0.2" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/dot-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", - "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", - "dev": true, - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "dev": true, - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, - "node_modules/esbuild": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz", - "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==", - "dev": true, - "hasInstallScript": 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" - } - }, - "node_modules/esbuild-android-64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz", - "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-android-arm64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz", - "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-darwin-64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz", - "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-darwin-arm64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz", - "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-freebsd-64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz", - "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-freebsd-arm64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz", - "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-32": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz", - "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz", - "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-arm": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz", - "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-arm64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz", - "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-mips64le": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz", - "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-ppc64le": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz", - "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-riscv64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz", - "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-s390x": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz", - "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-netbsd-64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz", - "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-openbsd-64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz", - "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-sunos-64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz", - "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-windows-32": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz", - "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-windows-64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz", - "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-windows-arm64": { - "version": "0.15.18", - "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz", - "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-import-resolver-alias": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz", - "integrity": "sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==", - "dev": true, - "engines": { - "node": ">= 4" - }, - "peerDependencies": { - "eslint-plugin-import": ">=1.4.0" - } - }, - "node_modules/eslint-plugin-path-alias": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-path-alias/-/eslint-plugin-path-alias-1.1.0.tgz", - "integrity": "sha512-fDsuIsB11cvZ+5LDaOMEn1CkLFeOLXdvp9Mqi/9ZL2sAnVlRPKlMH3UPT7onFTWcFrNllYwrQ/+7LbzagGOA9A==", - "dev": true, - "dependencies": { - "nanomatch": "^1.2.13" - }, - "peerDependencies": { - "eslint": "^7" - } - }, - "node_modules/eslint-plugin-simple-header": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-simple-header/-/eslint-plugin-simple-header-1.1.1.tgz", - "integrity": "sha512-xFK54pYcSEC2uULHTeo2aEgmTmdhZ9ry3zIV9OspLaEPb/Xg1oaFmOcmoNhk9WNJPwzUKrAmYyA8s4YDBfbD+g==" - }, - "node_modules/eslint-plugin-simple-import-sort": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz", - "integrity": "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==", - "dev": true, - "peerDependencies": { - "eslint": ">=5.0.0" - } - }, - "node_modules/eslint-plugin-unused-imports": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz", - "integrity": "sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==", - "dev": true, - "dependencies": { - "eslint-rule-composer": "^0.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "@typescript-eslint/eslint-plugin": "^5.0.0", - "eslint": "^8.0.0" - }, - "peerDependenciesMeta": { - "@typescript-eslint/eslint-plugin": { - "optional": true - } - } - }, - "node_modules/eslint-rule-composer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz", - "integrity": "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==", - "dev": true, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "dependencies": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", - "dev": true, - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esquery/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" - }, - "node_modules/extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", - "dev": true, - "dependencies": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "dev": true, - "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/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "dev": true, - "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.4" - }, - "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==", - "dev": true, - "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", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "node_modules/fast-uri": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", - "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", - "dev": true - }, - "node_modules/fastest-levenshtein": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", - "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", - "dev": true, - "engines": { - "node": ">= 4.9.1" - } - }, - "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dev": true, - "dependencies": { - "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, - "dependencies": { - "pend": "~1.2.0" - } - }, - "node_modules/fflate": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.7.4.tgz", - "integrity": "sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==" - }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.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==", - "dev": true, - "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", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", - "dev": true - }, - "node_modules/for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==", - "dev": true, - "dependencies": { - "map-cache": "^0.2.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "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, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "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==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-tsconfig": { - "version": "4.7.5", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.5.tgz", - "integrity": "sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==", - "dev": true, - "dependencies": { - "resolve-pkg-maps": "^1.0.0" - }, - "funding": { - "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" - } - }, - "node_modules/get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gifenc": { - "version": "1.0.3", - "resolved": "git+ssh://git@github.com/mattdesl/gifenc.git#64842fca317b112a8590f8fef2bf3825da8f6fe3", - "integrity": "sha512-TCgWVyjxLxM20WaQQT5neiMbdt2cuFL0BngwxcK8sV9x+M6IF0x3RIETc3VRVxfmRUxzZk+Yfv1b9cLdDnTRIw==" - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/global-modules": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", - "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", - "dev": true, - "dependencies": { - "global-prefix": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/global-prefix": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", - "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", - "dev": true, - "dependencies": { - "ini": "^1.3.5", - "kind-of": "^6.0.2", - "which": "^1.3.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/global-prefix/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globals/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globjoin": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", - "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==", - "dev": true - }, - "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 - }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true - }, - "node_modules/hard-rejection": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", - "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "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, - "engines": { - "node": ">=8" - } - }, - "node_modules/has-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==", - "dev": true, - "dependencies": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==", - "dev": true, - "dependencies": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-values/node_modules/kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/highlight.js": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.6.0.tgz", - "integrity": "sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/hosted-git-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", - "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/html-minifier-terser": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz", - "integrity": "sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==", - "dev": true, - "dependencies": { - "camel-case": "^4.1.2", - "clean-css": "~5.3.2", - "commander": "^10.0.0", - "entities": "^4.4.0", - "param-case": "^3.0.4", - "relateurl": "^0.2.7", - "terser": "^5.15.1" - }, - "bin": { - "html-minifier-terser": "cli.js" - }, - "engines": { - "node": "^14.13.1 || >=16.0.0" - } - }, - "node_modules/html-tags": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz", - "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/import-lazy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", - "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz", - "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "node_modules/is-accessor-descriptor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz", - "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==", - "dev": true, - "dependencies": { - "hasown": "^2.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/is-core-module": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz", - "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==", - "dev": true, - "dependencies": { - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-data-descriptor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz", - "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==", - "dev": true, - "dependencies": { - "hasown": "^2.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-descriptor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz", - "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.1", - "is-data-descriptor": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "dependencies": { - "is-plain-object": "^2.0.4" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "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, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true, - "engines": { - "node": ">=0.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==", - "dev": true - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "node_modules/isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, - "node_modules/jsonc-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", - "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==" - }, - "node_modules/jszip": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-2.7.0.tgz", - "integrity": "sha512-JIsRKRVC3gTRo2vM4Wy9WBC3TRcfnIZU8k65Phi3izkvPH975FowRYtKGT6PxevA0XnJ/yO8b0QwV0ydVyQwfw==", - "dev": true, - "dependencies": { - "pako": "~1.0.2" - } - }, - "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/known-css-properties": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz", - "integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==", - "dev": true - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "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==", - "dev": true - }, - "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "node_modules/lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", - "dev": true - }, - "node_modules/lower-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", - "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "dev": true, - "dependencies": { - "tslib": "^2.0.3" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/map-obj": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", - "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/map-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==", - "dev": true, - "dependencies": { - "object-visit": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/mathml-tag-names": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", - "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/mdn-data": { - "version": "2.0.30", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", - "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", - "dev": true - }, - "node_modules/meow": { - "version": "10.1.5", - "resolved": "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz", - "integrity": "sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==", - "dev": true, - "dependencies": { - "@types/minimist": "^1.2.2", - "camelcase-keys": "^7.0.0", - "decamelize": "^5.0.0", - "decamelize-keys": "^1.1.0", - "hard-rejection": "^2.1.0", - "minimist-options": "4.1.0", - "normalize-package-data": "^3.0.2", - "read-pkg-up": "^8.0.0", - "redent": "^4.0.0", - "trim-newlines": "^4.0.2", - "type-fest": "^1.2.2", - "yargs-parser": "^20.2.9" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", - "dev": true, - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/min-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", - "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minimist-options": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", - "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", - "dev": true, - "dependencies": { - "arrify": "^1.0.1", - "is-plain-obj": "^1.1.0", - "kind-of": "^6.0.3" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/mitt": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz", - "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==", - "dev": true - }, - "node_modules/mixin-deep": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", - "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", - "dev": true, - "dependencies": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "dev": true - }, - "node_modules/moment": { - "version": "2.30.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", - "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/monaco-editor": { - "version": "0.50.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.50.0.tgz", - "integrity": "sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA==" - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/nanoid": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz", - "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "bin": { - "nanoid": "bin/nanoid.js" - }, - "engines": { - "node": "^14 || ^16 || >=18" - } - }, - "node_modules/nanomatch": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", - "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, - "dependencies": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, - "node_modules/no-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", - "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "dev": true, - "dependencies": { - "lower-case": "^2.0.2", - "tslib": "^2.0.3" - } - }, - "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/normalize-package-data": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", - "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^4.0.1", - "is-core-module": "^2.5.0", - "semver": "^7.3.4", - "validate-npm-package-license": "^3.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==", - "dev": true, - "dependencies": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/is-descriptor": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", - "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.1", - "is-data-descriptor": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object-copy/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-visit": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==", - "dev": true, - "dependencies": { - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", - "dev": true, - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/optionator": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", - "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", - "dev": true, - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.5" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true - }, - "node_modules/param-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", - "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", - "dev": true, - "dependencies": { - "dot-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pascal-case": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", - "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", - "dev": true, - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, - "node_modules/pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "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 - }, - "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", - "dev": true - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/postcss": { - "version": "8.4.39", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz", - "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==", - "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" - } - ], - "dependencies": { - "nanoid": "^3.3.7", - "picocolors": "^1.0.1", - "source-map-js": "^1.2.0" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/postcss-resolve-nested-selector": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", - "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==", - "dev": true - }, - "node_modules/postcss-safe-parser": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz", - "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==", - "dev": true, - "engines": { - "node": ">=12.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - "peerDependencies": { - "postcss": "^8.3.3" - } - }, - "node_modules/postcss-selector-parser": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz", - "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==", - "dev": true, - "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 - }, - "node_modules/postcss/node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true - }, - "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/puppeteer-core": { - "version": "19.11.1", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.11.1.tgz", - "integrity": "sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA==", - "dev": true, - "dependencies": { - "@puppeteer/browsers": "0.5.0", - "chromium-bidi": "0.4.7", - "cross-fetch": "3.1.5", - "debug": "4.3.4", - "devtools-protocol": "0.0.1107588", - "extract-zip": "2.0.1", - "https-proxy-agent": "5.0.1", - "proxy-from-env": "1.1.0", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.13.0" - }, - "engines": { - "node": ">=14.14.0" - }, - "peerDependencies": { - "typescript": ">= 4.7.4" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/puppeteer-core/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", - "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)", - "dev": true, - "engines": { - "node": ">=0.6.0", - "teleport": ">=0.2.0" - } - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz", - "integrity": "sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==", - "dev": true, - "dependencies": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^3.0.2", - "parse-json": "^5.2.0", - "type-fest": "^1.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz", - "integrity": "sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==", - "dev": true, - "dependencies": { - "find-up": "^5.0.0", - "read-pkg": "^6.0.0", - "type-fest": "^1.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/redent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz", - "integrity": "sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==", - "dev": true, - "dependencies": { - "indent-string": "^5.0.0", - "strip-indent": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/regex-not": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, - "dependencies": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", - "dev": true, - "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/resolve-pkg-maps": { - "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, - "funding": { - "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" - } - }, - "node_modules/resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==", - "deprecated": "https://github.com/lydell/resolve-url#deprecated", - "dev": true - }, - "node_modules/ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true, - "engines": { - "node": ">=0.12" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==", - "dev": true, - "dependencies": { - "ret": "~0.1.10" - } - }, - "node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/set-value": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", - "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", - "dev": true, - "dependencies": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/set-value/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/set-value/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "dev": true, - "dependencies": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/snapdragon/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-descriptor": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", - "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.1", - "is-data-descriptor": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/snapdragon/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/snapdragon/node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-resolve": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", - "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", - "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", - "dev": true, - "dependencies": { - "atob": "^2.1.2", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/source-map-url": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", - "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", - "deprecated": "See https://github.com/lydell/source-map-url#deprecated", - "dev": true - }, - "node_modules/spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dev": true, - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", - "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", - "dev": true - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.18", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz", - "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==", - "dev": true - }, - "node_modules/split-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, - "dependencies": { - "extend-shallow": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/standalone-electron-types": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/standalone-electron-types/-/standalone-electron-types-1.0.0.tgz", - "integrity": "sha512-0HOi/tlTz3mjWhsAz4uRbpQcHMZ+ifj1JzWW9nugykOHClBBG77ps8QinrzX1eow4Iw2pnC+RFaSYRgufF4BOg==", - "dev": true, - "dependencies": { - "@types/node": "^18.8.4" - } - }, - "node_modules/static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==", - "dev": true, - "dependencies": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-descriptor": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", - "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.1", - "is-data-descriptor": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz", - "integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==", - "dev": true, - "dependencies": { - "min-indent": "^1.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "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, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/style-search": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", - "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==", - "dev": true - }, - "node_modules/stylelint": { - "version": "15.11.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.11.0.tgz", - "integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==", - "dev": true, - "dependencies": { - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0", - "@csstools/media-query-list-parser": "^2.1.4", - "@csstools/selector-specificity": "^3.0.0", - "balanced-match": "^2.0.0", - "colord": "^2.9.3", - "cosmiconfig": "^8.2.0", - "css-functions-list": "^3.2.1", - "css-tree": "^2.3.1", - "debug": "^4.3.4", - "fast-glob": "^3.3.1", - "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^7.0.0", - "global-modules": "^2.0.0", - "globby": "^11.1.0", - "globjoin": "^0.1.4", - "html-tags": "^3.3.1", - "ignore": "^5.2.4", - "import-lazy": "^4.0.0", - "imurmurhash": "^0.1.4", - "is-plain-object": "^5.0.0", - "known-css-properties": "^0.29.0", - "mathml-tag-names": "^2.1.3", - "meow": "^10.1.5", - "micromatch": "^4.0.5", - "normalize-path": "^3.0.0", - "picocolors": "^1.0.0", - "postcss": "^8.4.28", - "postcss-resolve-nested-selector": "^0.1.1", - "postcss-safe-parser": "^6.0.0", - "postcss-selector-parser": "^6.0.13", - "postcss-value-parser": "^4.2.0", - "resolve-from": "^5.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "style-search": "^0.1.0", - "supports-hyperlinks": "^3.0.0", - "svg-tags": "^1.0.0", - "table": "^6.8.1", - "write-file-atomic": "^5.0.1" - }, - "bin": { - "stylelint": "bin/stylelint.mjs" - }, - "engines": { - "node": "^14.13.1 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/stylelint" - } - }, - "node_modules/stylelint-config-recommended": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-12.0.0.tgz", - "integrity": "sha512-x6x8QNARrGO2sG6iURkzqL+Dp+4bJorPMMRNPScdvaUK8PsynriOcMW7AFDKqkWAS5wbue/u8fUT/4ynzcmqdQ==", - "dev": true, - "peerDependencies": { - "stylelint": "^15.5.0" - } - }, - "node_modules/stylelint-config-standard": { - "version": "33.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-33.0.0.tgz", - "integrity": "sha512-eyxnLWoXImUn77+ODIuW9qXBDNM+ALN68L3wT1lN2oNspZ7D9NVGlNHb2QCUn4xDug6VZLsh0tF8NyoYzkgTzg==", - "dev": true, - "dependencies": { - "stylelint-config-recommended": "^12.0.0" - }, - "peerDependencies": { - "stylelint": "^15.5.0" - } - }, - "node_modules/stylelint/node_modules/balanced-match": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", - "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", - "dev": true - }, - "node_modules/stylelint/node_modules/file-entry-cache": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.2.tgz", - "integrity": "sha512-TfW7/1iI4Cy7Y8L6iqNdZQVvdXn0f8B4QcIXmkIbtTIe/Okm/nSlHb4IwGzRVOd3WfSieCgvf5cMzEfySAIl0g==", - "dev": true, - "dependencies": { - "flat-cache": "^3.2.0" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/stylelint/node_modules/is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/stylelint/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-hyperlinks": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz", - "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - }, - "engines": { - "node": ">=14.18" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/svg-tags": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", - "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==", - "dev": true - }, - "node_modules/table": { - "version": "6.8.2", - "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz", - "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==", - "dev": true, - "dependencies": { - "ajv": "^8.0.1", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/table/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/table/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", - "dev": true, - "dependencies": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", - "pump": "^3.0.0", - "tar-stream": "^2.1.4" - } - }, - "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/terser": { - "version": "5.31.3", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.3.tgz", - "integrity": "sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==", - "dev": true, - "dependencies": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/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==", - "dev": true - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true - }, - "node_modules/to-object-path": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/to-object-path/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, - "dependencies": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/to-regex-range/node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true - }, - "node_modules/trim-newlines": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.1.1.tgz", - "integrity": "sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ts-patch": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ts-patch/-/ts-patch-3.2.1.tgz", - "integrity": "sha512-hlR43v+GUIUy8/ZGFP1DquEqPh7PFKQdDMTAmYt671kCCA6AkDQMoeFaFmZ7ObPLYOmpMgyKUqL1C+coFMf30w==", - "dev": true, - "dependencies": { - "chalk": "^4.1.2", - "global-prefix": "^3.0.0", - "minimist": "^1.2.8", - "resolve": "^1.22.2", - "semver": "^7.5.4", - "strip-ansi": "^6.0.1" - }, - "bin": { - "ts-patch": "bin/ts-patch.js", - "tspc": "bin/tspc.js" - } - }, - "node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", - "dev": true - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, - "node_modules/tsutils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/tsx": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.14.0.tgz", - "integrity": "sha512-xHtFaKtHxM9LOklMmJdI3BEnQq/D5F73Of2E1GDrITi9sgoVkvIsrQUTY1G8FlmGtA+awCI4EBlTRRYxkL2sRg==", - "dev": true, - "dependencies": { - "esbuild": "~0.18.20", - "get-tsconfig": "^4.7.2", - "source-map-support": "^0.5.21" - }, - "bin": { - "tsx": "dist/cli.mjs" - }, - "optionalDependencies": { - "fsevents": "~2.3.3" - } - }, - "node_modules/tsx/node_modules/@esbuild/android-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", - "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/tsx/node_modules/@esbuild/linux-loong64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", - "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/tsx/node_modules/esbuild": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", - "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", - "dev": true, - "hasInstallScript": true, - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/android-arm": "0.18.20", - "@esbuild/android-arm64": "0.18.20", - "@esbuild/android-x64": "0.18.20", - "@esbuild/darwin-arm64": "0.18.20", - "@esbuild/darwin-x64": "0.18.20", - "@esbuild/freebsd-arm64": "0.18.20", - "@esbuild/freebsd-x64": "0.18.20", - "@esbuild/linux-arm": "0.18.20", - "@esbuild/linux-arm64": "0.18.20", - "@esbuild/linux-ia32": "0.18.20", - "@esbuild/linux-loong64": "0.18.20", - "@esbuild/linux-mips64el": "0.18.20", - "@esbuild/linux-ppc64": "0.18.20", - "@esbuild/linux-riscv64": "0.18.20", - "@esbuild/linux-s390x": "0.18.20", - "@esbuild/linux-x64": "0.18.20", - "@esbuild/netbsd-x64": "0.18.20", - "@esbuild/openbsd-x64": "0.18.20", - "@esbuild/sunos-x64": "0.18.20", - "@esbuild/win32-arm64": "0.18.20", - "@esbuild/win32-ia32": "0.18.20", - "@esbuild/win32-x64": "0.18.20" - } - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-fest": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", - "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/typescript": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", - "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/typescript-transform-paths": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/typescript-transform-paths/-/typescript-transform-paths-3.4.7.tgz", - "integrity": "sha512-1Us1kdkdfKd2unbkBAOV2HHRmbRBYpSuk9nJ7cLD2hP4QmfToiM/VpxNlhJc1eezVwVqSKSBjNSzZsK/fWR/9A==", - "dev": true, - "dependencies": { - "minimatch": "^3.0.4" - }, - "peerDependencies": { - "typescript": ">=3.6.5" - } - }, - "node_modules/unbzip2-stream": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", - "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", - "dev": true, - "dependencies": { - "buffer": "^5.2.1", - "through": "^2.3.8" - } - }, - "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true - }, - "node_modules/union-value": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", - "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, - "dependencies": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/union-value/node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==", - "dev": true, - "dependencies": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/has-value": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==", - "dev": true, - "dependencies": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/has-value/node_modules/isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==", - "dev": true, - "dependencies": { - "isarray": "1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==", - "deprecated": "Please see https://github.com/lydell/urix#deprecated", - "dev": true - }, - "node_modules/use": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true, - "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==", - "dev": true - }, - "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==", - "dev": true, - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "node_modules/virtual-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/virtual-merge/-/virtual-merge-1.0.1.tgz", - "integrity": "sha512-h7rzV6n5fZJbDu2lP4iu+IOtsZ00uqECFUxFePK1uY0pz/S5B7FNDJpmdDVfyGL7poyJECEHfTaIpJaknNkU0Q==" - }, - "node_modules/vscode-oniguruma": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz", - "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==" - }, - "node_modules/vscode-textmate": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz", - "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==" - }, - "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 - }, - "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, - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "node_modules/write-file-atomic": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", - "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", - "dev": true, - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "node_modules/yargs": { - "version": "17.7.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz", - "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==", - "dev": true, - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs/node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", - "dev": true, - "dependencies": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/zip-local": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/zip-local/-/zip-local-0.3.5.tgz", - "integrity": "sha512-GRV3D5TJY+/PqyeRm5CYBs7xVrKTKzljBoEXvocZu0HJ7tPEcgpSOYa2zFIsCZWgKWMuc4U3yMFgFkERGFIB9w==", - "dev": true, - "dependencies": { - "async": "^1.4.2", - "graceful-fs": "^4.1.3", - "jszip": "^2.6.1", - "q": "^1.4.1" - } - } - } -} diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index b293cb96fc052..14f219d8bd0e4 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -1,65 +1,103 @@ -{ buildNpmPackage -, fetchFromGitHub -, lib -, esbuild -, buildWebExtension ? false +{ + curl, + esbuild, + fetchFromGitHub, + git, + jq, + lib, + nix-update, + nodejs, + pnpm, + stdenv, + writeShellScript, + buildWebExtension ? false, }: -let - version = "1.9.5"; - gitHash = "5bd10c8"; -in -buildNpmPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - inherit version; + version = "1.10.3"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; - rev = "v${version}"; - hash = "sha256-7eJkdcZX4D6PUnnpY+iucWWZx9/ned8z/zA0M5TRcaY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-PgQz6CNr5wkycSZ/M2saS3VtUQlC2rIolnCJlVPrxo8="; }; - ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { - version = "0.15.18"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${final.version}"; - hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - })); + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname src; - # Supresses an error about esbuild's version. - npmRebuildFlags = [ "|| true" ]; + hash = "sha256-bosCE9gBFCcM3Ww6sJmhps/cl4lovXKMieYpkqAMst8="; + }; + + nativeBuildInputs = [ + git + nodejs + pnpm.configHook + ]; + + env = { + ESBUILD_BINARY_PATH = lib.getExe ( + esbuild.overrideAttrs ( + final: _: { + version = "0.15.18"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${final.version}"; + hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ) + ); + VENCORD_REMOTE = "${finalAttrs.src.owner}/${finalAttrs.src.repo}"; + # TODO: somehow update this automatically + VENCORD_HASH = "deadbeef"; + }; + + buildPhase = '' + runHook preBuild - makeCacheWritable = true; - npmDepsHash = "sha256-GTjL6cjYPoa1ohtqslxDskCN9tKuu1OP1ZWIWtFx+E0="; - npmFlags = [ "--legacy-peer-deps" ]; - npmBuildScript = if buildWebExtension then "buildWeb" else "build"; - npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; + pnpm run ${if buildWebExtension then "buildWeb" else "build"} \ + -- --standalone --disable-updater - prePatch = '' - cp ${./package-lock.json} ./package-lock.json - chmod +w ./package-lock.json + runHook postBuild ''; - VENCORD_HASH = gitHash; - VENCORD_REMOTE = "${src.owner}/${src.repo}"; + installPhase = '' + runHook preInstall - installPhase = - if buildWebExtension then '' - cp -r dist/chromium-unpacked/ $out - '' else '' - cp -r dist/ $out - ''; + cp -r dist/${lib.optionalString buildWebExtension "chromium-unpacked/"} $out - passthru.updateScript = ./update.sh; + runHook postInstall + ''; + + # We need to fetch the latest *tag* ourselves, as nix-update can only fetch the latest *releases* from GitHub + # Vencord had a single "devbuild" release that we do not care about + passthru.updateScript = writeShellScript "update-vencord" '' + export PATH="${ + lib.makeBinPath [ + curl + jq + nix-update + ] + }:$PATH" + ghTags=$(curl ''${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/Vendicated/Vencord/tags") + latestTag=$(echo "$ghTags" | jq -r .[0].name) + + echo "Latest tag: $latestTag" + + exec nix-update --version "$latestTag" "$@" + ''; meta = with lib; { description = "Vencord web extension"; homepage = "https://github.com/Vendicated/Vencord"; license = licenses.gpl3Only; - maintainers = with maintainers; [ FlafyDev NotAShelf Scrumplex ]; + maintainers = with maintainers; [ + FlafyDev + NotAShelf + Scrumplex + ]; }; -} +}) diff --git a/pkgs/by-name/ve/vencord/update.sh b/pkgs/by-name/ve/vencord/update.sh deleted file mode 100755 index b9eb69660427b..0000000000000 --- a/pkgs/by-name/ve/vencord/update.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p curl jq common-updater-scripts prefetch-npm-deps nodejs -set -eou pipefail - -pkgDir="$(dirname "$(readlink -f "$0")")" - -tempDir=$(mktemp -d) - -ghTags=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/Vendicated/Vencord/tags") -latestTag=$(echo "$ghTags" | jq -r .[0].name) -gitHash=$(echo "$ghTags" | jq -r .[0].commit.sha) - -pushd "$tempDir" -curl "https://raw.githubusercontent.com/Vendicated/Vencord/$latestTag/package.json" -o package.json -npm install --legacy-peer-deps -f - -npmDepsHash=$(prefetch-npm-deps ./package-lock.json) -popd - -update-source-version vencord "${latestTag#v}" - -sed -E 's#\bgitHash = ".*?"#gitHash = "'"${gitHash:0:7}"'"#' -i "$pkgDir/package.nix" -sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i "$pkgDir/package.nix" -cp "$tempDir/package-lock.json" "$pkgDir/package-lock.json" diff --git a/pkgs/applications/misc/veracrypt/fix-paths.patch b/pkgs/by-name/ve/veracrypt/fix-paths.patch similarity index 100% rename from pkgs/applications/misc/veracrypt/fix-paths.patch rename to pkgs/by-name/ve/veracrypt/fix-paths.patch diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix new file mode 100644 index 0000000000000..fc41522a4b204 --- /dev/null +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + makeself, + yasm, + fuse, + wxGTK32, + lvm2, + substituteAll, + e2fsprogs, + exfat, + ntfs3g, + btrfs-progs, + pcsclite, + wrapGAppsHook3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "veracrypt"; + version = "1.26.15"; + + src = fetchurl { + url = "https://launchpad.net/veracrypt/trunk/${finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2"; + hash = "sha256-upcCUDDiG5sjMbfrCJcBFjwyr0t+BFNfM1uvjXSnSRY="; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + ext2 = "${e2fsprogs}/bin/mkfs.ext2"; + ext3 = "${e2fsprogs}/bin/mkfs.ext3"; + ext4 = "${e2fsprogs}/bin/mkfs.ext4"; + exfat = "${exfat}/bin/mkfs.exfat"; + ntfs = "${ntfs3g}/bin/mkfs.ntfs"; + btrfs = "${btrfs-progs}/bin/mkfs.btrfs"; + }) + ]; + + sourceRoot = "src"; + + nativeBuildInputs = [ + makeself + pkg-config + yasm + wrapGAppsHook3 + ]; + buildInputs = [ + fuse + lvm2 + wxGTK32 + pcsclite + ]; + + enableParallelBuilding = true; + + installPhase = '' + install -Dm 755 Main/veracrypt "$out/bin/veracrypt" + install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/veracrypt.xpm" + install -Dm 444 License.txt -t "$out/share/doc/veracrypt/" + install -d $out/share/applications + substitute Setup/Linux/veracrypt.desktop $out/share/applications/veracrypt.desktop \ + --replace-fail "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \ + --replace-fail "Icon=veracrypt" "Icon=veracrypt.xpm" + ''; + + meta = { + description = "Free Open-Source filesystem on-the-fly encryption"; + homepage = "https://www.veracrypt.fr/"; + license = with lib.licenses; [ + asl20 # and + unfree # TrueCrypt License version 3.0 + ]; + maintainers = with lib.maintainers; [ + dsferruzza + ryand56 + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix new file mode 100644 index 0000000000000..1b772e74ed94b --- /dev/null +++ b/pkgs/by-name/ve/verapdf/package.nix @@ -0,0 +1,80 @@ +{ + lib, + fetchFromGitHub, + maven, + makeWrapper, + stripJavaArchivesHook, + makeDesktopItem, + copyDesktopItems, + jre, +}: +maven.buildMavenPackage rec { + pname = "verapdf"; + version = "1.26.2"; + + mvnParameters = "-pl '!installer' -Dverapdf.timestamp=1980-01-01T00:00:02Z -Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"; + + src = fetchFromGitHub { + owner = "veraPDF"; + repo = "veraPDF-apps"; + rev = "v${version}"; + hash = "sha256-bWj4dX1qRQ2zzfF9GfskvMnrNU9pKC738Zllx6JsFww="; + }; + + patches = [ ./stable-maven-plugins.patch ]; + + mvnHash = "sha256-sVuzd4TUmrfvqhtiZL1L4obOF1DihMANbZNIy/LKyfw="; + + nativeBuildInputs = [ + makeWrapper + stripJavaArchivesHook + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + + install -Dm644 greenfield-apps/target/greenfield-apps-${lib.versions.majorMinor version}.0.jar $out/share/verapdf.jar + + makeWrapper ${jre}/bin/java $out/bin/verapdf-gui --add-flags "-jar $out/share/verapdf.jar" + makeWrapper ${jre}/bin/java $out/bin/verapdf --add-flags "-cp $out/share/verapdf.jar org.verapdf.apps.GreenfieldCliWrapper" + + install -Dm644 gui/src/main/resources/org/verapdf/gui/images/icon.png $out/share/icons/hicolor/256x256/apps/verapdf.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "veraPDF"; + comment = meta.description; + desktopName = "veraPDF"; + genericName = "PDF/A Conformance Checker"; + exec = "verapdf-gui"; + icon = "verapdf"; + categories = [ + "Development" + "Utility" + ]; + keywords = [ "PDF" ]; + mimeTypes = [ "application/pdf" ]; + }) + ]; + + meta = { + description = "Command line and GUI industry supported PDF/A and PDF/UA Validation"; + homepage = "https://github.com/veraPDF/veraPDF-apps"; + license = [ + lib.licenses.gpl3Plus + # or + lib.licenses.mpl20 + ]; + mainProgram = "verapdf-gui"; + maintainers = [ + lib.maintainers.mohe2015 + lib.maintainers.kilianar + ]; + }; +} diff --git a/pkgs/by-name/ve/verapdf/stable-maven-plugins.patch b/pkgs/by-name/ve/verapdf/stable-maven-plugins.patch new file mode 100644 index 0000000000000..77257b5f2dfb1 --- /dev/null +++ b/pkgs/by-name/ve/verapdf/stable-maven-plugins.patch @@ -0,0 +1,42 @@ +diff --git a/pom.xml b/pom.xml +index 015dca6..1557d54 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -125,6 +125,37 @@ + <build> + + <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-enforcer-plugin</artifactId> ++ <version>3.5.0</version> ++ <executions> ++ <execution> ++ <id>enforce-plugin-versions</id> ++ <goals> ++ <goal>enforce</goal> ++ </goals> ++ <configuration> ++ <rules> ++ <requirePluginVersions /> ++ </rules> ++ </configuration> ++ </execution> ++ </executions> ++ </plugin> ++ ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-install-plugin</artifactId> ++ <version>3.1.3</version> ++ </plugin> ++ ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ <version>3.4.2</version> ++ </plugin> ++ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> diff --git a/pkgs/by-name/ve/verible/package.nix b/pkgs/by-name/ve/verible/package.nix index 11ace1650d774..4bfc1a1ca2478 100644 --- a/pkgs/by-name/ve/verible/package.nix +++ b/pkgs/by-name/ve/verible/package.nix @@ -18,8 +18,8 @@ buildBazelPackage rec { # These environment variables are read in bazel/build-version.py to create # a build string shown in the tools --version output. # If env variables not set, it would attempt to extract it from .git/. - GIT_DATE = "2024-08-05"; - GIT_VERSION = "v0.0-3747-g79f6290d"; + GIT_DATE = "2024-09-17"; + GIT_VERSION = "v0.0-3791-g88bf4fb8"; # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION))); @@ -28,7 +28,7 @@ buildBazelPackage rec { owner = "chipsalliance"; repo = "verible"; rev = "${GIT_VERSION}"; - hash = "sha256-cixhB7QZStfG4DKjqEVipIeM9uUt6vibtbtZypzIcMo="; + hash = "sha256-Na91NpHhPRZ1k82pLQBvEcL8EWi/1imNN3dPNSl65DQ="; }; bazel = bazel_6; @@ -37,7 +37,7 @@ buildBazelPackage rec { ]; fetchAttrs = { - sha256 = "sha256-bKASgc5KftCWtMvJkGA4nweBAtgdnyC9uXIJxPjKYS0="; + hash = "sha256-bKASgc5KftCWtMvJkGA4nweBAtgdnyC9uXIJxPjKYS0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix new file mode 100644 index 0000000000000..0702a9d11438c --- /dev/null +++ b/pkgs/by-name/ve/veryl/package.nix @@ -0,0 +1,70 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + dbus, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "veryl"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "veryl-lang"; + repo = "veryl"; + rev = "v${version}"; + hash = "sha256-U4ikR2jRmHUwRycAL/t2XJtvHQniKu6skRKWn8XDIgM="; + fetchSubmodules = true; + }; + + cargoHash = "sha256-t2q3rbY84+0ayxt7a/TCD0exCm7KEs+8UbQjCtqZPoE="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + [ + dbus + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + checkFlags = [ + # takes over an hour + "--skip=tests::progress" + # tempfile::tempdir().unwrap() -> "No such file or directory" + "--skip=tests::bump_version" + "--skip=tests::bump_version_with_commit" + "--skip=tests::check" + "--skip=tests::load" + "--skip=tests::lockfile" + "--skip=tests::publish" + "--skip=tests::publish_with_commit" + # "Permission Denied", while making its cache dir? + "--skip=analyzer::test_25_dependency" + "--skip=analyzer::test_68_std" + "--skip=emitter::test_25_dependency" + "--skip=emitter::test_68_std" + + ]; + + meta = { + description = "Modern Hardware Description Language"; + homepage = "https://veryl-lang.org/"; + changelog = "https://github.com/veryl-lang/veryl/blob/${src.rev}/CHANGELOG.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ pbsds ]; + mainProgram = "veryl"; + }; +} diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 6d65fe99d89a3..4979bd32bd800 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs pnpm_9.configHook ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # vesktop uses venmic, which is a shipped as a prebuilt node module # and needs to be patched autoPatchelfHook @@ -57,12 +57,12 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/172583 makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # on macos we don't need to expand variables, so we can use the faster binary wrapper makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio pipewire stdenv.cc.cc.lib @@ -81,12 +81,12 @@ stdenv.mkDerivation (finalAttrs: { # 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.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export CSC_IDENTITY_AUTO_DISCOVERY=false ''; # electron builds must be writable on darwin - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' cp -r ${electron.dist}/Electron.app . chmod -R u+w Electron.app ''; @@ -98,13 +98,13 @@ stdenv.mkDerivation (finalAttrs: { pnpm exec electron-builder \ --dir \ -c.asarUnpack="**/*.node" \ - -c.electronDist=${if stdenv.isDarwin then "." else electron.dist} \ + -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \ -c.electronVersion=${electron.version} runHook postBuild ''; - postBuild = lib.optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.hostPlatform.isLinux '' pushd build ${libicns}/bin/icns2png -x icon.icns popd @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { '' runHook preInstall '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/opt/Vesktop cp -r dist/*unpacked/resources $out/opt/Vesktop/ @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png done '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv dist/mac*/Vesktop.App $out/Applications '' @@ -132,18 +132,18 @@ stdenv.mkDerivation (finalAttrs: { ''; postFixup = - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${electron}/bin/electron $out/bin/vesktop \ --add-flags $out/opt/Vesktop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/Vesktop.app/Contents/MacOS/Vesktop $out/bin/vesktop ''; - desktopItems = lib.optional stdenv.isLinux (makeDesktopItem { + desktopItems = lib.optional stdenv.hostPlatform.isLinux (makeDesktopItem { name = "vesktop"; desktopName = "Vesktop"; exec = "vesktop %U"; diff --git a/pkgs/by-name/vf/vfkit/package.nix b/pkgs/by-name/vf/vfkit/package.nix new file mode 100644 index 0000000000000..f51995d02c59c --- /dev/null +++ b/pkgs/by-name/vf/vfkit/package.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchurl, + stdenvNoCC, + testers, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "vfkit"; + version = "0.5.1"; + + src = fetchurl { + url = "https://github.com/crc-org/vfkit/releases/download/v${finalAttrs.version}/vfkit"; + hash = "sha256-at+KsvsKO359d4VUvcSuio2ej5hM6//U4Mj/jqXwhEc="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm755 $src $out/bin/vfkit + + runHook postInstall + ''; + + passthru.tests = { + version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; + + meta = { + description = "Simple command line tool to start VMs through the macOS Virtualization framework"; + homepage = "https://github.com/crc-org/vfkit"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sarcasticadmin ]; + platforms = lib.platforms.darwin; + # Source build will be possible after darwin SDK 12.0 bump + # https://github.com/NixOS/nixpkgs/pull/229210 + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + mainProgram = "vfkit"; + }; +}) diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix index 349981a5fb648..17ad8025789a0 100644 --- a/pkgs/by-name/vg/vgmstream/package.nix +++ b/pkgs/by-name/vg/vgmstream/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "vgmstream"; repo = "vgmstream"; rev = "refs/tags/r${version}"; - sha256 = "sha256-Wa0FAUHdJtG+u9y3ZOt8dxRIo78lekFPghiu67KJZ9s="; + hash = "sha256-Wa0FAUHdJtG+u9y3ZOt8dxRIo78lekFPghiu67KJZ9s="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix new file mode 100644 index 0000000000000..293990d4d5459 --- /dev/null +++ b/pkgs/by-name/vi/viddy/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "viddy"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "sachaos"; + repo = "viddy"; + rev = "v${version}"; + hash = "sha256-RewzToI7vhaH8r6ZWDLgfSJOOCm26Udkzh9+xkJP2jE="; + }; + + cargoHash = "sha256-NhgiaUEUTfsbVqFkBgLPc3A8XmtwgQ5tp673zFD4TGI="; + + # requires nightly features + env.RUSTC_BOOTSTRAP = 1; + + env.VERGEN_BUILD_DATE = "2024-09-30"; # managed via the update script + env.VERGEN_GIT_DESCRIBE = "Nixpkgs"; + + passthru.updateScript.command = [ ./update.sh ]; + + meta = with lib; { + description = "Modern watch command, time machine and pager etc."; + changelog = "https://github.com/sachaos/viddy/releases"; + homepage = "https://github.com/sachaos/viddy"; + license = licenses.mit; + maintainers = with maintainers; [ + j-hui + phanirithvij + ]; + mainProgram = "viddy"; + }; +} diff --git a/pkgs/tools/misc/viddy/update.sh b/pkgs/by-name/vi/viddy/update.sh similarity index 100% rename from pkgs/tools/misc/viddy/update.sh rename to pkgs/by-name/vi/viddy/update.sh diff --git a/pkgs/by-name/vi/vieb/package.nix b/pkgs/by-name/vi/vieb/package.nix index 6927cb3e24af6..af524a450e4d4 100644 --- a/pkgs/by-name/vi/vieb/package.nix +++ b/pkgs/by-name/vi/vieb/package.nix @@ -20,7 +20,7 @@ buildNpmPackage rec { dontNpmBuild = true; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isAarch64 python3; desktopItem = makeDesktopItem { name = "vieb"; diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index 9af6170d5663e..a62595242c3ea 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenv, nodejs, pnpm, buildGoModule, mage, writeShellScriptBin, nixosTests }: let - version = "0.24.1"; + version = "0.24.4"; src = fetchFromGitHub { owner = "go-vikunja"; repo = "vikunja"; rev = "v${version}"; - hash = "sha256-39S7Xl8He+unIkAZ9GnjqWHBOfdDj4rSUmrExB+Q6Vc="; + hash = "sha256-h3Jz28HYQYZC+oWGXNeKv2iNsrU0gbBRfWgOvuKijtw="; }; frontend = stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src sourceRoot; - hash = "sha256-iEcic/oQ33IO9tWqIQGfyjSY4YpJ8FckaI59qTgdq3c="; + hash = "sha256-pp4AZnoI7gON/meZalfXmaliKR/wSjkj9GTX3My678s="; }; nativeBuildInputs = [ @@ -67,7 +67,7 @@ buildGoModule { in [ fakeGit mage ]; - vendorHash = "sha256-oOa9qTy5jNYq05Tbp9hI4L0OBtKtglhk6Uz380nZH1Y="; + vendorHash = "sha256-d2BNzsBeWlpZGbU7PkXWO5e9FLJA/Wda5ImXwqh/WV4="; inherit frontend; diff --git a/pkgs/by-name/vi/villain/package.nix b/pkgs/by-name/vi/villain/package.nix index 35db4e3d3b7f9..ab40f15b50ae9 100644 --- a/pkgs/by-name/vi/villain/package.nix +++ b/pkgs/by-name/vi/villain/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "villain"; - version = "2.1.0"; + version = "2.2.0"; pyproject = false; src = fetchFromGitHub { owner = "t3l3machus"; repo = "Villain"; rev = "v${version}"; - hash = "sha256-8MOpbyw4HEJMcv84bNkNLBSZfEmIm3RDSUi0s62t9ko="; + hash = "sha256-7qZ91WEzQg9k9V/FlREW4YLlEnloeVkisDO8q/+bheo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix index 60be4b64a4026..da2bd69d0aba4 100644 --- a/pkgs/by-name/vi/vimcats/package.nix +++ b/pkgs/by-name/vi/vimcats/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "vimcats"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "vimcats"; rev = "v${version}"; - sha256 = "sha256-YZPLZgC0v5zw/+X3r0G1MZ+46c0K8J3ClFQYH5BqbUE="; + hash = "sha256-QV/eIy6yd6Lnmo8XV+E37/oCZCC3jlPu31emH0MgiO4="; }; buildFeatures = [ "cli" ]; - cargoHash = "sha256-gxCsB8lx9gTEsWV3uCX2TKTzxCUZ9JHo+1+voU7gKhY="; + cargoHash = "sha256-LBiuh7OkEoOkoPXCeGnDQLSlRIMkbiWyCv0dk0y7swk="; passthru.tests.version = testers.testVersion { package = vimcats; }; diff --git a/pkgs/by-name/vi/vinagre/package.nix b/pkgs/by-name/vi/vinagre/package.nix deleted file mode 100644 index 23c5cf6475547..0000000000000 --- a/pkgs/by-name/vi/vinagre/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, - pkg-config, - gtk3, - gnome, - adwaita-icon-theme, - vte, - libxml2, - gtk-vnc, - intltool, - libsecret, - itstool, - wrapGAppsHook3, - librsvg, -}: - -stdenv.mkDerivation rec { - pname = "vinagre"; - version = "3.22.0"; - - src = fetchurl { - url = "mirror://gnome/sources/vinagre/${lib.versions.majorMinor version}/vinagre-${version}.tar.xz"; - sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; - }; - - patches = [ - # Pull fix pending upstream inclusion for -fno-common toolchain support: - # https://gitlab.gnome.org/Archive/vinagre/-/merge_requests/8 - (fetchpatch { - name = "fno-common.patch"; - url = "https://gitlab.gnome.org/Archive/vinagre/-/commit/c51662cf4338516773d64776c3c92796917ff2bd.diff"; - sha256 = "0zn8cd93hjdz6rw2d7gfl1ghzkc9h0x40k9l0jx3n5qfwdq4sir8"; - }) - ]; - - nativeBuildInputs = [ - pkg-config - intltool - itstool - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - vte - libxml2 - gtk-vnc - libsecret - adwaita-icon-theme - librsvg - ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; - - passthru = { - updateScript = gnome.updateScript { packageName = "vinagre"; }; - }; - - meta = with lib; { - description = "Remote desktop viewer for GNOME"; - mainProgram = "vinagre"; - homepage = "https://gitlab.gnome.org/Archive/vinagre"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/by-name/vi/violet/package.nix b/pkgs/by-name/vi/violet/package.nix index 35e13eea544f8..e1fada3863af4 100644 --- a/pkgs/by-name/vi/violet/package.nix +++ b/pkgs/by-name/vi/violet/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, nix-update-script, stdenv, - violet, testers, }: @@ -24,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = nix-update-script { }; - tests = testers.testVersion { package = violet; }; + tests = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = { diff --git a/pkgs/by-name/vi/vis/package.nix b/pkgs/by-name/vi/vis/package.nix index 4872c53b841b7..7d37d022a86aa 100644 --- a/pkgs/by-name/vi/vis/package.nix +++ b/pkgs/by-name/vi/vis/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { rev = "v${version}"; - sha256 = "sha256-SYM3zlzhp3NdyOjtXc+pOiWY4/WA/Ax+qAWe18ggq3g="; + hash = "sha256-SYM3zlzhp3NdyOjtXc+pOiWY4/WA/Ax+qAWe18ggq3g="; repo = "vis"; owner = "martanne"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libtermkey luaEnv tre - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ acl libselinux ]; diff --git a/pkgs/applications/editors/viw/default.nix b/pkgs/by-name/vi/viw/package.nix similarity index 100% rename from pkgs/applications/editors/viw/default.nix rename to pkgs/by-name/vi/viw/package.nix diff --git a/pkgs/by-name/vl/vlc-bin/package.nix b/pkgs/by-name/vl/vlc-bin/package.nix index 275e768c7ea27..9e496883ccb8c 100644 --- a/pkgs/by-name/vl/vlc-bin/package.nix +++ b/pkgs/by-name/vl/vlc-bin/package.nix @@ -4,9 +4,9 @@ , stdenv , undmg , variant ? - if (stdenv.isDarwin && stdenv.isAarch64) + if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) then "arm64" - else if (stdenv.isDarwin && stdenv.isx86_64) + else if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then "intel64" else "universal" # not reachable by normal means }: diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index 83154aa249065..100d4661dec42 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -304,5 +304,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ AndersonTorres alois31 ]; platforms = lib.platforms.linux; + mainProgram = "vlc"; }; }) diff --git a/pkgs/by-name/vn/vndr/package.nix b/pkgs/by-name/vn/vndr/package.nix index 79cbc3e7e4e42..9e8f57b4e6eff 100644 --- a/pkgs/by-name/vn/vndr/package.nix +++ b/pkgs/by-name/vn/vndr/package.nix @@ -11,7 +11,7 @@ buildGoModule { owner = "LK4D4"; repo = "vndr"; rev = "87603e47e8ea2ddac96f508fc9e9d6fc17b198b0"; - sha256 = "sha256-L7OemAPCv7epOVmjrDDtiGqQqzscm5zj3C6dsZP4uUc="; + hash = "sha256-L7OemAPCv7epOVmjrDDtiGqQqzscm5zj3C6dsZP4uUc="; }; vendorHash = null; diff --git a/pkgs/by-name/vo/volk_2/package.nix b/pkgs/by-name/vo/volk_2/package.nix index b1cb2ab575fd2..57b849fcc28b9 100644 --- a/pkgs/by-name/vo/volk_2/package.nix +++ b/pkgs/by-name/vo/volk_2/package.nix @@ -23,27 +23,27 @@ stdenv.mkDerivation (finalAttrs: { owner = "gnuradio"; repo = "volk"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; + hash = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; fetchSubmodules = true; }; patches = [ (fetchpatch { url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; - sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; + hash = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; extraPrefix = ""; }) ]; cmakeFlags = [ (lib.cmakeBool "ENABLE_MODTOOL" enableModTool) ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05 # volk_32f_log2_32f: fail on arch neon "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) ''; diff --git a/pkgs/by-name/vp/vpcs/package.nix b/pkgs/by-name/vp/vpcs/package.nix new file mode 100644 index 0000000000000..0b8582c54a47c --- /dev/null +++ b/pkgs/by-name/vp/vpcs/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + testers, + vpcs, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vpcs"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "GNS3"; + repo = "vpcs"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-OKi4sC4fmKtkJkkpHZ6OfeIDaBafVrJXGXh1R6gLPFY="; + }; + + sourceRoot = "${finalAttrs.src.name}/src"; + + buildPhase = '' + runHook preBuild + + MKOPT="CC=${stdenv.cc.targetPrefix}cc" ./mk.sh ${stdenv.buildPlatform.linuxArch} + + runHook postBuild + ''; + + postInstall = '' + install -D -m555 vpcs $out/bin/vpcs + install -D -m444 ../man/vpcs.1 $out/share/man/man1/vpcs.1 + ''; + + enableParallelBuilding = true; + + passthru.tests.version = testers.testVersion { + package = vpcs; + command = "vpcs -v"; + }; + + meta = with lib; { + description = "Simple virtual PC simulator"; + longDescription = '' + The VPCS (Virtual PC Simulator) can simulate up to 9 PCs. You can + ping/traceroute them, or ping/traceroute the other hosts/routers from the + VPCS when you study the Cisco routers in the dynamips. + ''; + inherit (finalAttrs.src.meta) homepage; + license = licenses.bsd2; + platforms = platforms.linux ++ platforms.darwin; + mainProgram = "vpcs"; + maintainers = with maintainers; [ anthonyroussel ]; + }; +}) diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index 2fac21d32f2f0..9dac995970f47 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "vpl-gpu-rt"; rev = "intel-onevpl-${version}"; - sha256 = "sha256-WYlA8+i8TTFHsU4+doLcv75F9MR2V/BEuNGGLgM4p1s="; + hash = "sha256-WYlA8+i8TTFHsU4+doLcv75F9MR2V/BEuNGGLgM4p1s="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/by-name/vp/vpsfree-client/Gemfile b/pkgs/by-name/vp/vpsfree-client/Gemfile index 90fce7a5cbd5b..87c9aeebb90c1 100644 --- a/pkgs/by-name/vp/vpsfree-client/Gemfile +++ b/pkgs/by-name/vp/vpsfree-client/Gemfile @@ -2,4 +2,4 @@ source "https://rubygems.org" -gem "vpsfree-client", "0.18.0" +gem "vpsfree-client" diff --git a/pkgs/by-name/vp/vpsfree-client/Gemfile.lock b/pkgs/by-name/vp/vpsfree-client/Gemfile.lock index 7485c24ce1687..761b8a6db21a7 100644 --- a/pkgs/by-name/vp/vpsfree-client/Gemfile.lock +++ b/pkgs/by-name/vp/vpsfree-client/Gemfile.lock @@ -1,45 +1,48 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) base64 (0.2.0) - bigdecimal (3.1.6) - concurrent-ruby (1.2.3) + bigdecimal (3.1.8) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - curses (1.4.4) + curses (1.4.6) domain_name (0.6.20240107) drb (2.2.1) - haveapi-client (0.19.3) + haveapi-client (0.23.7) activesupport (>= 7.0) - highline (~> 2.1.0) + highline (~> 3.1) json require_all (~> 2.0.0) rest-client (~> 2.1.0) ruby-progressbar (~> 1.13.0) - highline (2.1.0) + highline (3.1.1) + reline http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.7) domain_name (~> 0.5) - i18n (1.14.3) + i18n (1.14.5) concurrent-ruby (~> 1.0) - racc (~> 1.7) - json (2.7.1) + io-console (0.7.2) + json (2.7.2) + logger (1.6.1) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) - minitest (5.22.2) - mutex_m (0.2.0) + mime-types-data (3.2024.0903) + minitest (5.25.1) netrc (0.11.0) - racc (1.7.3) + reline (0.5.10) + io-console (~> 0.5) require_all (2.0.0) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -47,20 +50,21 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) ruby-progressbar (1.13.0) + securerandom (0.3.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - vpsadmin-client (3.0.0.master.20231229.pre.0.51d41b07) + vpsadmin-client (4.0.0) curses - haveapi-client (~> 0.19.0) + haveapi-client (~> 0.23.6) json - vpsfree-client (0.18.0) - vpsadmin-client (= 3.0.0.master.20231229.pre.0.51d41b07) + vpsfree-client (0.19.0) + vpsadmin-client (~> 4.0) PLATFORMS ruby DEPENDENCIES - vpsfree-client (= 0.18.0) + vpsfree-client BUNDLED WITH - 2.4.22 + 2.5.9 diff --git a/pkgs/by-name/vp/vpsfree-client/gemset.nix b/pkgs/by-name/vp/vpsfree-client/gemset.nix index cdc9250b875eb..e19de26f92280 100644 --- a/pkgs/by-name/vp/vpsfree-client/gemset.nix +++ b/pkgs/by-name/vp/vpsfree-client/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d"; + sha256 = "094cv9kxa8hwlsw3c0njkvvayd0wszcz9b6xywv4yajrg83zlmvm"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.2.1"; }; base64 = { groups = ["default"]; @@ -25,20 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.8"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -55,10 +55,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00y9g79lzfffxarj3rmhnkblsnyx7izx91mh8c1sdcs9y2pdfq53"; + sha256 = "15pj04v9m06lj7xcq5xjk6b0nqfpq3kiaisjmh2pysmi6nvsg9ly"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.6"; }; domain_name = { groups = ["default"]; @@ -86,20 +86,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yjcf6yf90sqjsywlcxzfrfrl835ndw96x6bh4grvc75zbb5ijki"; + sha256 = "1a6k0milq4rfybf1pc8gzikpr18dmnzpz1wi2avzdkp0dpqkvaw3"; type = "gem"; }; - version = "0.19.3"; + version = "0.23.7"; }; highline = { + dependencies = ["reline"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn"; + sha256 = "1q0f7izfi542sp93gl276spm0xyws1kpqxm0alrwwmz06mz4i0ks"; type = "gem"; }; - version = "2.1.0"; + version = "3.1.1"; }; http-accept = { groups = ["default"]; @@ -117,72 +118,82 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; + sha256 = "0lr2yk5g5vvf9nzlmkn3p7mhh9mn55gpdc7kl2w21xs46fgkjynb"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.7"; }; i18n = { - dependencies = ["concurrent-ruby" "racc"]; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j9zl6ssshkdjdn21lckdhsfkkw1n4wcynqp8n67afa5qps2gmds"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.3"; + version = "1.14.5"; + }; + io-console = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h"; + type = "gem"; + }; + version = "0.7.2"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.2"; }; - mime-types = { - dependencies = ["mime-types-data"]; + logger = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; type = "gem"; }; - version = "3.5.2"; + version = "1.6.1"; }; - mime-types-data = { + mime-types = { + dependencies = ["mime-types-data"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455"; + sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; type = "gem"; }; - version = "3.2024.0305"; + version = "3.5.2"; }; - minitest = { + mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; + sha256 = "0d5bmxcq87nj6h5rx6b1fkdzq8256yba97s2vlkszpwhc47m9rfs"; type = "gem"; }; - version = "5.22.2"; + version = "3.2024.0903"; }; - mutex_m = { + minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "0.2.0"; + version = "5.25.1"; }; netrc = { groups = ["default"]; @@ -194,15 +205,16 @@ }; version = "0.11.0"; }; - racc = { + reline = { + dependencies = ["io-console"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0rl1jmxs7pay58l7lkxkrn6nkdpk52k8rvnfwqsd1swjlxlwjq0n"; type = "gem"; }; - version = "1.7.3"; + version = "0.5.10"; }; require_all = { groups = ["default"]; @@ -235,6 +247,16 @@ }; version = "1.13.0"; }; + securerandom = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; + type = "gem"; + }; + version = "0.3.1"; + }; tzinfo = { dependencies = ["concurrent-ruby"]; groups = ["default"]; @@ -252,10 +274,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d1bdyda8l42x8csf4ri2cqcr3xf6pcnv7s1k859rb8ysj7y8aqx"; + sha256 = "1qy0l0gyhsyz9hdbqdb324l4zlgs78hml1cnp3gx1jl5ndj62znc"; type = "gem"; }; - version = "3.0.0.master.20231229.pre.0.51d41b07"; + version = "4.0.0"; }; vpsfree-client = { dependencies = ["vpsadmin-client"]; @@ -263,9 +285,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038a57avnp4wmfqdya5a6r4a135nh6crzs6nf0khnhdhb9kkjfjg"; + sha256 = "0cl6r20r7hksd3g6sjqrgi9x21ykbvv170vszf2l06a8ifrrqlk7"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; } diff --git a/pkgs/by-name/vr/vrcadvert/deps.nix b/pkgs/by-name/vr/vrcadvert/deps.nix new file mode 100644 index 0000000000000..52926e314d9e3 --- /dev/null +++ b/pkgs/by-name/vr/vrcadvert/deps.nix @@ -0,0 +1,396 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: +[ + (fetchNuGet { + pname = "MeaMod.DNS"; + version = "1.0.70"; + hash = "sha256-Hl6ZmKBbS6YZX7cc1Jp4/Hz6ksZqlFR7ZllbZgHzeYw="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Abstractions"; + version = "6.0.2"; + hash = "sha256-VRyyMGCMBh25vIIzbLapMAqY8UffqJRvkF/kcYcjZfM="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.1.1"; + hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "13.0.1"; + hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; + }) + (fetchNuGet { + pname = "runtime.any.System.Collections"; + version = "4.3.0"; + hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization"; + version = "4.3.0"; + hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; + }) + (fetchNuGet { + pname = "runtime.any.System.IO"; + version = "4.3.0"; + hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection"; + version = "4.3.0"; + hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; + }) + (fetchNuGet { + pname = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime"; + version = "4.3.0"; + hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; + }) + (fetchNuGet { + pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="; + }) + (fetchNuGet { + pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="; + }) + (fetchNuGet { + pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="; + }) + (fetchNuGet { + pname = "runtime.native.System"; + version = "4.3.0"; + hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; + }) + (fetchNuGet { + pname = "runtime.native.System.Net.Http"; + version = "4.3.0"; + hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="; + }) + (fetchNuGet { + pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="; + }) + (fetchNuGet { + pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="; + }) + (fetchNuGet { + pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + hash = "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="; + }) + (fetchNuGet { + pname = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; + }) + (fetchNuGet { + pname = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.3.0"; + hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; + }) + (fetchNuGet { + pname = "System.Collections"; + version = "4.3.0"; + hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; + }) + (fetchNuGet { + pname = "System.Collections.Concurrent"; + version = "4.3.0"; + hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; + }) + (fetchNuGet { + pname = "System.CommandLine"; + version = "2.0.0-beta4.22272.1"; + hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Tracing"; + version = "4.3.0"; + hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; + }) + (fetchNuGet { + pname = "System.Globalization"; + version = "4.3.0"; + hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; + }) + (fetchNuGet { + pname = "System.Globalization.Calendars"; + version = "4.3.0"; + hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; + }) + (fetchNuGet { + pname = "System.Globalization.Extensions"; + version = "4.3.0"; + hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; + }) + (fetchNuGet { + pname = "System.IO"; + version = "4.3.0"; + hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem"; + version = "4.3.0"; + hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; + }) + (fetchNuGet { + pname = "System.Linq"; + version = "4.3.0"; + hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; + }) + (fetchNuGet { + pname = "System.Net.Http"; + version = "4.3.4"; + hash = "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="; + }) + (fetchNuGet { + pname = "System.Net.Primitives"; + version = "4.3.0"; + hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; + }) + (fetchNuGet { + pname = "System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.3.0"; + hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.3.0"; + hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; + }) + (fetchNuGet { + pname = "System.Runtime.Numerics"; + version = "4.3.0"; + hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; + }) + (fetchNuGet { + pname = "System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.3.0"; + hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; + }) + (fetchNuGet { + pname = "VRChat.OSCQuery"; + version = "0.0.7"; + hash = "sha256-qivB0feWMAGYa6qE2pNK1Mhxt5xiFCICj9bEgUu2W+w="; + }) +] diff --git a/pkgs/by-name/vr/vrcadvert/package.nix b/pkgs/by-name/vr/vrcadvert/package.nix new file mode 100644 index 0000000000000..79a07252a0776 --- /dev/null +++ b/pkgs/by-name/vr/vrcadvert/package.nix @@ -0,0 +1,30 @@ +{ + buildDotnetModule, + fetchFromGitHub, + lib, +}: + +buildDotnetModule rec { + pname = "VrcAdvert"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "galister"; + repo = "VrcAdvert"; + rev = "v${version}"; + hash = "sha256-noIu5LV0yva94Kmdr39zb0kKXDaIrQ8DIplCj3aTIbQ="; + }; + + nugetDeps = ./deps.nix; + + executables = [ "VrcAdvert" ]; + + meta = { + description = "Advertise your OSC app through OSCQuery"; + homepage = "https://github.com/galister/VrcAdvert"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ Scrumplex ]; + mainProgram = "VrcAdvert"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index 8020835f0be6e..1ecf3d9204d60 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "vsce"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${version}"; - hash = "sha256-FoJfpzrbui+tKCEq15wGC0o44iLCBAuVYBISiy+zOmE="; + hash = "sha256-k2jeYeDLpSVw3puiOqlrtQ1a156OV1Er/TqdJuJ+578="; }; - npmDepsHash = "sha256-TTFolysg+La605EoS87gmhEjlzwNUVYmnXKr49De7fk="; + npmDepsHash = "sha256-k6LdGCpVoBNpHe4z7NrS0T/gcB1EQBvBxGAM3zo+AAo="; postPatch = '' substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"' @@ -30,7 +30,7 @@ buildNpmPackage rec { nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libsecret ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Security ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Security ]); makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix index 5df0356f0637e..bde7ae2215177 100644 --- a/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -16,25 +16,25 @@ buildNpmPackage rec { pname = "vscode-js-debug"; - version = "1.91.0"; + version = "1.93.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-js-debug"; rev = "v${version}"; - hash = "sha256-3SZIIBHv599qLaW419CA0Nr7F6R7GB9wqUnOqbV4jKc="; + hash = "sha256-8+ZoTddzgwLwPUduT+G5zVgt/ZxLWKojz1PKvOxLX6o="; }; - npmDepsHash = "sha256-kZ5wCcmdpYtT6dqtV3i8R9LKFs20sq0rZC1W1w00XJQ="; + npmDepsHash = "sha256-4GTZevbQg1LhxVw6WQYGvWHVuaWTwpCf50gMZWAHE7c="; nativeBuildInputs = [ pkg-config node-gyp - ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = - lib.optionals (!stdenv.isDarwin) [ libsecret ] - ++ lib.optionals stdenv.isDarwin [ + lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security AppKit ]; diff --git a/pkgs/by-name/vu/vue-language-server/package-lock.json b/pkgs/by-name/vu/vue-language-server/package-lock.json index 3ce33bea69f57..5bbcd52f51e6e 100644 --- a/pkgs/by-name/vu/vue-language-server/package-lock.json +++ b/pkgs/by-name/vu/vue-language-server/package-lock.json @@ -1,19 +1,20 @@ { "name": "@vue/language-server", - "version": "2.0.29", + "version": "2.1.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@vue/language-server", - "version": "2.0.29", + "version": "2.1.6", "license": "MIT", "dependencies": { - "@volar/language-core": "~2.4.0-alpha.18", - "@volar/language-server": "~2.4.0-alpha.18", - "@vue/language-core": "2.0.29", - "@vue/language-service": "2.0.29", - "@vue/typescript-plugin": "2.0.29", + "@volar/language-core": "~2.4.1", + "@volar/language-server": "~2.4.1", + "@volar/test-utils": "~2.4.1", + "@vue/language-core": "2.1.6", + "@vue/language-service": "2.1.6", + "@vue/typescript-plugin": "2.1.6", "vscode-languageserver-protocol": "^3.17.5", "vscode-uri": "^3.0.8" }, @@ -25,6 +26,7 @@ "version": "7.24.8", "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -33,16 +35,18 @@ "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.25.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz", - "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", + "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", + "license": "MIT", "dependencies": { - "@babel/types": "^7.25.2" + "@babel/types": "^7.25.6" }, "bin": { "parser": "bin/babel-parser.js" @@ -52,9 +56,10 @@ } }, "node_modules/@babel/types": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz", - "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", + "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", + "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.24.8", "@babel/helper-validator-identifier": "^7.24.7", @@ -68,6 +73,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz", "integrity": "sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==", + "license": "MIT", "dependencies": { "@emmetio/scanner": "^1.0.4" } @@ -76,6 +82,7 @@ "version": "2.1.8", "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz", "integrity": "sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw==", + "license": "MIT", "dependencies": { "@emmetio/scanner": "^1.0.4" } @@ -84,6 +91,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/@emmetio/css-parser/-/css-parser-0.4.0.tgz", "integrity": "sha512-z7wkxRSZgrQHXVzObGkXG+Vmj3uRlpM11oCZ9pbaz0nFejvCDmAiNDpY75+wgXOcffKpj4rzGtwGaZxfJKsJxw==", + "license": "MIT", "dependencies": { "@emmetio/stream-reader": "^2.2.0", "@emmetio/stream-reader-utils": "^0.1.0" @@ -93,6 +101,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/@emmetio/html-matcher/-/html-matcher-1.3.0.tgz", "integrity": "sha512-NTbsvppE5eVyBMuyGfVu2CRrLvo7J4YHb6t9sBFLyY03WYhXET37qA4zOYUjBWFCRHO7pS1B9khERtY0f5JXPQ==", + "license": "ISC", "dependencies": { "@emmetio/scanner": "^1.0.0" } @@ -100,40 +109,45 @@ "node_modules/@emmetio/scanner": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.4.tgz", - "integrity": "sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==" + "integrity": "sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==", + "license": "MIT" }, "node_modules/@emmetio/stream-reader": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz", - "integrity": "sha512-fXVXEyFA5Yv3M3n8sUGT7+fvecGrZP4k6FnWWMSZVQf69kAq0LLpaBQLGcPR30m3zMmKYhECP4k/ZkzvhEW5kw==" + "integrity": "sha512-fXVXEyFA5Yv3M3n8sUGT7+fvecGrZP4k6FnWWMSZVQf69kAq0LLpaBQLGcPR30m3zMmKYhECP4k/ZkzvhEW5kw==", + "license": "MIT" }, "node_modules/@emmetio/stream-reader-utils": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/@emmetio/stream-reader-utils/-/stream-reader-utils-0.1.0.tgz", - "integrity": "sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A==" + "integrity": "sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A==", + "license": "MIT" }, "node_modules/@johnsoncodehk/pug-beautify": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/@johnsoncodehk/pug-beautify/-/pug-beautify-0.2.2.tgz", - "integrity": "sha512-qqNS/YD0Nck5wtQLCPHAfGVgWbbGafxSPjNh0ekYPFSNNqnDH2kamnduzYly8IiADmeVx/MfAE1njMEjVeHTMA==" + "integrity": "sha512-qqNS/YD0Nck5wtQLCPHAfGVgWbbGafxSPjNh0ekYPFSNNqnDH2kamnduzYly8IiADmeVx/MfAE1njMEjVeHTMA==", + "license": "MIT" }, "node_modules/@volar/language-core": { - "version": "2.4.0-alpha.18", - "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.18.tgz", - "integrity": "sha512-JAYeJvYQQROmVRtSBIczaPjP3DX4QW1fOqW1Ebs0d3Y3EwSNRglz03dSv0Dm61dzd0Yx3WgTW3hndDnTQqgmyg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.2.tgz", + "integrity": "sha512-sONt5RLvLL1SlBdhyUSthZzuKePbJ7DwFFB9zT0eyWpDl+v7GXGh/RkPxxWaR22bIhYtTzp4Ka1MWatl/53Riw==", + "license": "MIT", "dependencies": { - "@volar/source-map": "2.4.0-alpha.18" + "@volar/source-map": "2.4.2" } }, "node_modules/@volar/language-server": { - "version": "2.4.0-alpha.18", - "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.0-alpha.18.tgz", - "integrity": "sha512-dciHEE/R5kzI0bY71QfkoCVQ3cQI6g9MHfA4oIP6UhnJy0CdleUalWSygOXoD3Nq7Yk6wn2BRrb1PP5MsadY/Q==", - "dependencies": { - "@volar/language-core": "2.4.0-alpha.18", - "@volar/language-service": "2.4.0-alpha.18", - "@volar/snapshot-document": "2.4.0-alpha.18", - "@volar/typescript": "2.4.0-alpha.18", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.2.tgz", + "integrity": "sha512-BoGGGar5kzWnCxv41nnpplPQz+ntHgOSYshxH7CqNo5DOz5R3WXtkDA6T6bOpt70JeejoNyk/5kINV8KGeI17Q==", + "license": "MIT", + "dependencies": { + "@volar/language-core": "2.4.2", + "@volar/language-service": "2.4.2", + "@volar/typescript": "2.4.2", "path-browserify": "^1.0.1", "request-light": "^0.7.0", "vscode-languageserver": "^9.0.1", @@ -143,36 +157,42 @@ } }, "node_modules/@volar/language-service": { - "version": "2.4.0-alpha.18", - "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.0-alpha.18.tgz", - "integrity": "sha512-EuetrtbEtudi9buinWAG5U3Jam5dY27zXd/7GYnx542kBwanWOBM8i4DAQd0z7M11fOxXgybxPA933uaSyaOog==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.2.tgz", + "integrity": "sha512-tJAfl1RouBcSPfgY7ivV/CWH6G/cOzwflMUFnfR7qTLZht7azx4CwlndiyGiL7lGcnfi7OZBKXd8Oqy9jhKZCA==", + "license": "MIT", "dependencies": { - "@volar/language-core": "2.4.0-alpha.18", + "@volar/language-core": "2.4.2", "vscode-languageserver-protocol": "^3.17.5", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" } }, - "node_modules/@volar/snapshot-document": { - "version": "2.4.0-alpha.18", - "resolved": "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.4.0-alpha.18.tgz", - "integrity": "sha512-JAeclEly/wnILhR4Pu9MpgBLInZJH49O1zoy8fU+pk5I+zpv7JIEby5z2UFAS60+sIDnxBdAGd7rZ5VibE70vg==", + "node_modules/@volar/source-map": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.2.tgz", + "integrity": "sha512-qiGfGgeZ5DEarPX3S+HcFktFCjfDrFPCXKeXNbrlB7v8cvtPRm8YVwoXOdGG1NhaL5rMlv5BZPVQyu4EdWWIvA==", + "license": "MIT" + }, + "node_modules/@volar/test-utils": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@volar/test-utils/-/test-utils-2.4.2.tgz", + "integrity": "sha512-h20hce1FZCvlgsLAi4YJLrhJU3s4TSnfxditd3TDXnAD8poYvlowfhUfvgCrzFDgnvlZXnCwlP8gM7QK67NSyA==", + "license": "MIT", "dependencies": { - "vscode-languageserver-protocol": "^3.17.5", - "vscode-languageserver-textdocument": "^1.0.11" + "@volar/language-core": "2.4.2", + "@volar/language-server": "2.4.2", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-uri": "^3.0.8" } }, - "node_modules/@volar/source-map": { - "version": "2.4.0-alpha.18", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.18.tgz", - "integrity": "sha512-MTeCV9MUwwsH0sNFiZwKtFrrVZUK6p8ioZs3xFzHc2cvDXHWlYN3bChdQtwKX+FY2HG6H3CfAu1pKijolzIQ8g==" - }, "node_modules/@volar/typescript": { - "version": "2.4.0-alpha.18", - "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.0-alpha.18.tgz", - "integrity": "sha512-sXh5Y8sqGUkgxpMWUGvRXggxYHAVxg0Pa1C42lQZuPDrW6vHJPR0VCK8Sr7WJsAW530HuNQT/ZIskmXtxjybMQ==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.2.tgz", + "integrity": "sha512-m2uZduhaHO1SZuagi30OsjI/X1gwkaEAC+9wT/nCNAtJ5FqXEkKvUncHmffG7ESDZPlFFUBK4vJ0D9Hfr+f2EA==", + "license": "MIT", "dependencies": { - "@volar/language-core": "2.4.0-alpha.18", + "@volar/language-core": "2.4.2", "path-browserify": "^1.0.1", "vscode-uri": "^3.0.8" } @@ -181,6 +201,7 @@ "version": "2.9.3", "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.9.3.tgz", "integrity": "sha512-rB39LHWWPQYYlYfpv9qCoZOVioPCftKXXqrsyqN1mTWZM6dTnONT63Db+03vgrBbHzJN45IrgS/AGxw9iiqfEw==", + "license": "MIT", "dependencies": { "emmet": "^2.4.3", "jsonc-parser": "^2.3.0", @@ -192,49 +213,55 @@ "node_modules/@vscode/emmet-helper/node_modules/vscode-uri": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz", - "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==" + "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==", + "license": "MIT" }, "node_modules/@vscode/l10n": { "version": "0.0.18", "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", - "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==" + "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==", + "license": "MIT" }, "node_modules/@vue/compiler-core": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.35.tgz", - "integrity": "sha512-gKp0zGoLnMYtw4uS/SJRRO7rsVggLjvot3mcctlMXunYNsX+aRJDqqw/lV5/gHK91nvaAAlWFgdVl020AW1Prg==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.3.tgz", + "integrity": "sha512-adAfy9boPkP233NTyvLbGEqVuIfK/R0ZsBsIOW4BZNfb4BRpRW41Do1u+ozJpsb+mdoy80O20IzAsHaihRb5qA==", + "license": "MIT", "dependencies": { - "@babel/parser": "^7.24.7", - "@vue/shared": "3.4.35", + "@babel/parser": "^7.25.3", + "@vue/shared": "3.5.3", "entities": "^4.5.0", "estree-walker": "^2.0.2", "source-map-js": "^1.2.0" } }, "node_modules/@vue/compiler-dom": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.35.tgz", - "integrity": "sha512-pWIZRL76/oE/VMhdv/ovZfmuooEni6JPG1BFe7oLk5DZRo/ImydXijoZl/4kh2406boRQ7lxTYzbZEEXEhj9NQ==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.3.tgz", + "integrity": "sha512-wnzFArg9zpvk/811CDOZOadJRugf1Bgl/TQ3RfV4nKfSPok4hi0w10ziYUQR6LnnBAUlEXYLUfZ71Oj9ds/+QA==", + "license": "MIT", "dependencies": { - "@vue/compiler-core": "3.4.35", - "@vue/shared": "3.4.35" + "@vue/compiler-core": "3.5.3", + "@vue/shared": "3.5.3" } }, "node_modules/@vue/compiler-vue2": { "version": "2.7.16", "resolved": "https://registry.npmjs.org/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz", "integrity": "sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==", + "license": "MIT", "dependencies": { "de-indent": "^1.0.2", "he": "^1.2.0" } }, "node_modules/@vue/language-core": { - "version": "2.0.29", - "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.29.tgz", - "integrity": "sha512-o2qz9JPjhdoVj8D2+9bDXbaI4q2uZTHQA/dbyZT4Bj1FR9viZxDJnLcKVHfxdn6wsOzRgpqIzJEEmSSvgMvDTQ==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.1.6.tgz", + "integrity": "sha512-MW569cSky9R/ooKMh6xa2g1D0AtRKbL56k83dzus/bx//RDJk24RHWkMzbAlXjMdDNyxAaagKPRquBIxkxlCkg==", + "license": "MIT", "dependencies": { - "@volar/language-core": "~2.4.0-alpha.18", + "@volar/language-core": "~2.4.1", "@vue/compiler-dom": "^3.4.0", "@vue/compiler-vue2": "^2.7.16", "@vue/shared": "^3.4.0", @@ -253,44 +280,47 @@ } }, "node_modules/@vue/language-service": { - "version": "2.0.29", - "resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.0.29.tgz", - "integrity": "sha512-lY54t7KNp1WKXfYccTj9PizwE8zrswTZbYzYdLyoeLyLwcO/JlkMssTrt1G+64TLBwBptvV9PwvNw5Bp2YxJHg==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.1.6.tgz", + "integrity": "sha512-FZ3Fn0MslS/fdBm0U2A/JUmq0HBtvkm/6OcHfw23mE7olm0yCAOV0i8xKqqbrwZeSDoEfk48zzTSEE9Zj6RmBg==", + "license": "MIT", "dependencies": { - "@volar/language-core": "~2.4.0-alpha.18", - "@volar/language-service": "~2.4.0-alpha.18", - "@volar/typescript": "~2.4.0-alpha.18", + "@volar/language-core": "~2.4.1", + "@volar/language-service": "~2.4.1", + "@volar/typescript": "~2.4.1", "@vue/compiler-dom": "^3.4.0", - "@vue/language-core": "2.0.29", + "@vue/language-core": "2.1.6", "@vue/shared": "^3.4.0", - "@vue/typescript-plugin": "2.0.29", + "@vue/typescript-plugin": "2.1.6", "computeds": "^0.0.1", "path-browserify": "^1.0.1", - "volar-service-css": "0.0.59", - "volar-service-emmet": "0.0.59", - "volar-service-html": "0.0.59", - "volar-service-json": "0.0.59", - "volar-service-pug": "0.0.59", - "volar-service-pug-beautify": "0.0.59", - "volar-service-typescript": "0.0.59", - "volar-service-typescript-twoslash-queries": "0.0.59", + "volar-service-css": "0.0.62", + "volar-service-emmet": "0.0.62", + "volar-service-html": "0.0.62", + "volar-service-json": "0.0.62", + "volar-service-pug": "0.0.62", + "volar-service-pug-beautify": "0.0.62", + "volar-service-typescript": "0.0.62", + "volar-service-typescript-twoslash-queries": "0.0.62", "vscode-html-languageservice": "^5.2.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" } }, "node_modules/@vue/shared": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.35.tgz", - "integrity": "sha512-hvuhBYYDe+b1G8KHxsQ0diDqDMA8D9laxWZhNAjE83VZb5UDaXl9Xnz7cGdDSyiHM90qqI/CyGMcpBpiDy6VVQ==" + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.3.tgz", + "integrity": "sha512-Jp2v8nylKBT+PlOUjun2Wp/f++TfJVFjshLzNtJDdmFJabJa7noGMncqXRM1vXGX+Yo2V7WykQFNxusSim8SCA==", + "license": "MIT" }, "node_modules/@vue/typescript-plugin": { - "version": "2.0.29", - "resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.0.29.tgz", - "integrity": "sha512-cO/cP467bGONkm/imEVvcRg77/VmoWpLyO94jSwLAt8QV0X9l414SwsRdsae+wGMPV+6k7rweer0SP16A0HYdw==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.1.6.tgz", + "integrity": "sha512-FGwinnIuwZPELbRPZmtA+G4YyLT+lxjGSZQpNvgrzvy3MZBJZzm4UU87DIA7Lb2xbbYpTMAM6P6TAWwioCNZIg==", + "license": "MIT", "dependencies": { - "@volar/typescript": "~2.4.0-alpha.18", - "@vue/language-core": "2.0.29", + "@volar/typescript": "~2.4.1", + "@vue/language-core": "2.1.6", "@vue/shared": "^3.4.0" } }, @@ -298,6 +328,7 @@ "version": "7.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -308,12 +339,14 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" }, "node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -322,6 +355,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -340,6 +374,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz", "integrity": "sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==", + "license": "MIT", "dependencies": { "is-regex": "^1.0.3" } @@ -347,17 +382,20 @@ "node_modules/computeds": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/computeds/-/computeds-0.0.1.tgz", - "integrity": "sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==" + "integrity": "sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==", + "license": "MIT" }, "node_modules/de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", - "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==" + "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==", + "license": "MIT" }, "node_modules/define-data-property": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -374,6 +412,7 @@ "version": "2.4.7", "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.7.tgz", "integrity": "sha512-O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA==", + "license": "MIT", "workspaces": [ "./packages/scanner", "./packages/abbreviation", @@ -389,6 +428,7 @@ "version": "4.5.0", "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -400,6 +440,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "license": "MIT", "dependencies": { "get-intrinsic": "^1.2.4" }, @@ -411,6 +452,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -418,12 +460,14 @@ "node_modules/estree-walker": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "license": "MIT" }, "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" } @@ -432,6 +476,7 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -450,6 +495,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "license": "MIT", "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -461,6 +507,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0" }, @@ -472,6 +519,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -483,6 +531,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -494,6 +543,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" }, @@ -508,6 +558,7 @@ "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" }, @@ -519,6 +570,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "license": "MIT", "bin": { "he": "bin/he" } @@ -527,6 +579,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz", "integrity": "sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==", + "license": "MIT", "dependencies": { "acorn": "^7.1.1", "object-assign": "^4.1.1" @@ -536,6 +589,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -550,12 +604,14 @@ "node_modules/jsonc-parser": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz", - "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==" + "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==", + "license": "MIT" }, "node_modules/minimatch": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -569,12 +625,14 @@ "node_modules/muggle-string": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz", - "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==" + "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==", + "license": "MIT" }, "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" } @@ -582,17 +640,20 @@ "node_modules/path-browserify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", - "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==" + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", + "license": "MIT" }, "node_modules/pug-error": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.1.0.tgz", - "integrity": "sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg==" + "integrity": "sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg==", + "license": "MIT" }, "node_modules/pug-lexer": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz", "integrity": "sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==", + "license": "MIT", "dependencies": { "character-parser": "^2.2.0", "is-expression": "^4.0.0", @@ -603,6 +664,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz", "integrity": "sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==", + "license": "MIT", "dependencies": { "pug-error": "^2.0.0", "token-stream": "1.0.0" @@ -611,12 +673,14 @@ "node_modules/request-light": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz", - "integrity": "sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==" + "integrity": "sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==", + "license": "MIT" }, "node_modules/semver": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -628,6 +692,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "license": "MIT", "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -644,6 +709,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -652,6 +718,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "license": "MIT", "engines": { "node": ">=4" } @@ -659,27 +726,30 @@ "node_modules/token-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz", - "integrity": "sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==" + "integrity": "sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==", + "license": "MIT" }, "node_modules/typescript-auto-import-cache": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.3.tgz", "integrity": "sha512-ojEC7+Ci1ij9eE6hp8Jl9VUNnsEKzztktP5gtYNRMrTmfXVwA1PITYYAkpxCvvupdSYa/Re51B6KMcv1CTZEUA==", + "license": "MIT", "dependencies": { "semver": "^7.3.8" } }, "node_modules/volar-service-css": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.59.tgz", - "integrity": "sha512-gLNjJnECbalPvQB7qeJjhkDN8sR5M3ItbVYjnyio61aHaWptIiXm/HfDahcQ2ApwmvWidkMWWegjGq5L0BENDA==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.62.tgz", + "integrity": "sha512-JwNyKsH3F8PuzZYuqPf+2e+4CTU8YoyUHEHVnoXNlrLe7wy9U3biomZ56llN69Ris7TTy/+DEX41yVxQpM4qvg==", + "license": "MIT", "dependencies": { "vscode-css-languageservice": "^6.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -688,9 +758,10 @@ } }, "node_modules/volar-service-emmet": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.59.tgz", - "integrity": "sha512-6EynHcuMwMBETpK29TbZvIMmvzdVG+Tkokk9VWfZeI+SwDptk2tgdhEqiXXvIkqYNgbuu73Itp66lpH76cAU+Q==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.62.tgz", + "integrity": "sha512-U4dxWDBWz7Pi4plpbXf4J4Z/ss6kBO3TYrACxWNsE29abu75QzVS0paxDDhI6bhqpbDFXlpsDhZ9aXVFpnfGRQ==", + "license": "MIT", "dependencies": { "@emmetio/css-parser": "^0.4.0", "@emmetio/html-matcher": "^1.3.0", @@ -698,7 +769,7 @@ "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -707,16 +778,17 @@ } }, "node_modules/volar-service-html": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.59.tgz", - "integrity": "sha512-hEXOsYpILDlITZxnqRLV9OepVWD63GZBsyjMxszwdzlxvGZjzbGcBBinJGGJRwFIV8djdJwnt91bkdg1V5tj6Q==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.62.tgz", + "integrity": "sha512-Zw01aJsZRh4GTGUjveyfEzEqpULQUdQH79KNEiKVYHZyuGtdBRYCHlrus1sueSNMxwwkuF5WnOHfvBzafs8yyQ==", + "license": "MIT", "dependencies": { "vscode-html-languageservice": "^5.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -725,15 +797,16 @@ } }, "node_modules/volar-service-json": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-json/-/volar-service-json-0.0.59.tgz", - "integrity": "sha512-LfDOQhCvUpDBjA6CP9EogO0dn1yEFbInvV3Yk4OsEdyxwWUEYPLVjDacPlVUYcjCIKQN6NcTOWbVwpg4vYjw6A==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-json/-/volar-service-json-0.0.62.tgz", + "integrity": "sha512-Ot+jP+/LzKcaGF7nzrn+gwpzAleb4ej5buO05M8KxfwfODte7o1blARKRoJ3Nv7ls0DBM38Dd5vjzvA9c/9Jtg==", + "license": "MIT", "dependencies": { "vscode-json-languageservice": "^5.4.0", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -742,28 +815,30 @@ } }, "node_modules/volar-service-pug": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.59.tgz", - "integrity": "sha512-kmch7yoqeGNlJuDzpw/YL2b89ilzBmWDd0lJbpG412/RXc3PJVA4usUK+SQHdVoF+qi5IcZL6IDxlvRiIrDgWg==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.62.tgz", + "integrity": "sha512-C0/O8uGnRfijWKE0zFXxJ/o7BbLebzretsEaiMkvBDIxm5oe7HRDzQr6CgknV/WVgiohZ74v+0CwBPl2YmcPUQ==", + "license": "MIT", "dependencies": { - "@volar/language-service": "~2.4.0-alpha.12", + "@volar/language-service": "~2.4.0", "muggle-string": "^0.4.1", "pug-lexer": "^5.0.1", "pug-parser": "^6.0.0", - "volar-service-html": "0.0.59", + "volar-service-html": "0.0.62", "vscode-html-languageservice": "^5.3.0", "vscode-languageserver-textdocument": "^1.0.11" } }, "node_modules/volar-service-pug-beautify": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-pug-beautify/-/volar-service-pug-beautify-0.0.59.tgz", - "integrity": "sha512-SCLWHpBdgvWww3a9Vp8FX80ookozhnHx10gkKBTYW4wp7/rzEoVAPSyO7JKBwTdXmdKQv7YXfxLMVUGv0sYUKg==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-pug-beautify/-/volar-service-pug-beautify-0.0.62.tgz", + "integrity": "sha512-dAFNuNEwTnnVthYoNJhoStwhf/PojzglwCrdhOb2nBegTG3xXMWRFmQzb0JfIlt2wq2wfUq5j+JJswgSD3KluQ==", + "license": "MIT", "dependencies": { "@johnsoncodehk/pug-beautify": "^0.2.2" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -772,9 +847,10 @@ } }, "node_modules/volar-service-typescript": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.59.tgz", - "integrity": "sha512-VCOpfiu+lUo5lapWLB5L5vmQGtwzmNWn5MueV915eku7blpphmE+Z7hCNcL1NApn7AetXWhiblv8ZhmUx/dGIA==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.62.tgz", + "integrity": "sha512-p7MPi71q7KOsH0eAbZwPBiKPp9B2+qrdHAd6VY5oTo9BUXatsOAdakTm9Yf0DUj6uWBAaOT01BSeVOPwucMV1g==", + "license": "MIT", "dependencies": { "path-browserify": "^1.0.1", "semver": "^7.6.2", @@ -784,7 +860,7 @@ "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -793,14 +869,15 @@ } }, "node_modules/volar-service-typescript-twoslash-queries": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.59.tgz", - "integrity": "sha512-skm8e6yhCIkqLwJB6S9MqT5lO9LNFuMD3dYxKpmOZs1CKbXmCZZTmLfEaD5VkJae1xdleEDZFFTHl2O5HLjOGQ==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.62.tgz", + "integrity": "sha512-KxFt4zydyJYYI0kFAcWPTh4u0Ha36TASPZkAnNY784GtgajerUqM80nX/W1d0wVhmcOFfAxkVsf/Ed+tiYU7ng==", + "license": "MIT", "dependencies": { "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -809,35 +886,38 @@ } }, "node_modules/vscode-css-languageservice": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.0.tgz", - "integrity": "sha512-nU92imtkgzpCL0xikrIb8WvedV553F2BENzgz23wFuok/HLN5BeQmroMy26pUwFxV2eV8oNRmYCUv8iO7kSMhw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.1.tgz", + "integrity": "sha512-1BzTBuJfwMc3A0uX4JBdJgoxp74cjj4q2mDJdp49yD/GuAq4X0k5WtK6fNcMYr+FfJ9nqgR6lpfCSZDkARJ5qQ==", + "license": "MIT", "dependencies": { "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "3.17.5", "vscode-uri": "^3.0.8" } }, "node_modules/vscode-html-languageservice": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.0.tgz", - "integrity": "sha512-C4Z3KsP5Ih+fjHpiBc5jxmvCl+4iEwvXegIrzu2F5pktbWvQaBT3YkVPk8N+QlSSMk8oCG6PKtZ/Sq2YHb5e8g==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.1.tgz", + "integrity": "sha512-ysUh4hFeW/WOWz/TO9gm08xigiSsV/FOAZ+DolgJfeLftna54YdmZ4A+lIn46RbdO3/Qv5QHTn1ZGqmrXQhZyA==", + "license": "MIT", "dependencies": { "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "^3.17.5", "vscode-uri": "^3.0.8" } }, "node_modules/vscode-json-languageservice": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.4.0.tgz", - "integrity": "sha512-NCkkCr63OHVkE4lcb0xlUAaix6vE5gHQW4NrswbLEh3ArXj81lrGuFTsGEYEUXlNHdnc53vWPcjeSy/nMTrfXg==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.4.1.tgz", + "integrity": "sha512-5czFGNyVPxz3ZJYl8R3a3SuIj5gjhmGF4Wv05MRPvD4DEnHK6b8km4VbNMJNHBlTCh7A0aHzUbPVzo+0C18mCA==", + "license": "MIT", "dependencies": { "@vscode/l10n": "^0.0.18", - "jsonc-parser": "^3.3.0", - "vscode-languageserver-textdocument": "^1.0.11", + "jsonc-parser": "^3.3.1", + "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "^3.17.5", "vscode-uri": "^3.0.8" } @@ -845,12 +925,14 @@ "node_modules/vscode-json-languageservice/node_modules/jsonc-parser": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", - "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==" + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", + "license": "MIT" }, "node_modules/vscode-jsonrpc": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", + "license": "MIT", "engines": { "node": ">=14.0.0" } @@ -859,6 +941,7 @@ "version": "9.0.1", "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz", "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==", + "license": "MIT", "dependencies": { "vscode-languageserver-protocol": "3.17.5" }, @@ -870,6 +953,7 @@ "version": "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==", + "license": "MIT", "dependencies": { "vscode-jsonrpc": "8.2.0", "vscode-languageserver-types": "3.17.5" @@ -878,22 +962,26 @@ "node_modules/vscode-languageserver-textdocument": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", - "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==" + "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==", + "license": "MIT" }, "node_modules/vscode-languageserver-types": { "version": "3.17.5", "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", - "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", + "license": "MIT" }, "node_modules/vscode-nls": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.2.0.tgz", - "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==" + "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==", + "license": "MIT" }, "node_modules/vscode-uri": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz", - "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==" + "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==", + "license": "MIT" } } } diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index 584bc15c7a317..c45906517a0d9 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "vue-language-server"; - version = "2.0.29"; + version = "2.1.6"; src = fetchurl { url = "https://registry.npmjs.org/@vue/language-server/-/language-server-${version}.tgz"; - hash = "sha256-8NUtwBXVktsuNl9CBoInvbuM0GlO0UfIfGTQBsNATAo="; + hash = "sha256-/bwfssKZRwVLojAC5cQsXsb9qXxzBshFwdezRPr65AY="; }; - npmDepsHash = "sha256-0CLH8iUcaUeTL5lYXK/FKoAXgROMO3/owwVRy8EhWj8="; + npmDepsHash = "sha256-8Aq+b6yafFhhpjy4MB+CMgEwetUickRkjWTobsUoGmY="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix index 4ed32516210f8..41489f3b94585 100644 --- a/pkgs/by-name/vu/vulkan-memory-allocator/package.nix +++ b/pkgs/by-name/vu/vulkan-memory-allocator/package.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, fetchpatch , cmake }: @@ -15,6 +16,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-j0Z9OEwQx3RB2cni9eK3gYfwkhOc2ST213b6VseaVzg="; }; + patches = [ + # Allows specifying version constraints on the CMake module + # Remove when version > 3.1.0 + (fetchpatch { + name = "0001-vulkan-memory-allocator-add-cmake-package-version-file.patch"; + url = "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/257138b8f5686ae84491a3df9f90a77d5660c3bd.patch"; + hash = "sha256-qbQhIJho/WQqzAwB2zzWgGKx4QK9zKmbaGisbNOV8mg="; + }) + ]; + # A compiler is only required for the samples. This lets us use stdenvNoCC. postPatch = '' substituteInPlace CMakeLists.txt \ diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix index d65002027a174..378e32cd01a2f 100644 --- a/pkgs/by-name/vu/vulkan-volk/package.nix +++ b/pkgs/by-name/vu/vulkan-volk/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "zeux"; repo = "volk"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-AoUStYeSTu6YmdyKgx0n3O+p3asb39GU6HSHgOhhFhQ="; + hash = "sha256-SbTBwS4mJETrXRT7QMJX9F8ukcZmzz8+1atVbB/fid4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 49ca6562f59e2..5543834ea5a63 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,20 +7,21 @@ python3.pkgs.buildPythonApplication rec { pname = "vunnel"; - version = "0.23.2"; + version = "0.28.0"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; rev = "refs/tags/v${version}"; - hash = "sha256-wXBfrlb4i4G3Sm0SopvDVGcQ0/hRGtUdzUQYyUj8/Ps="; + hash = "sha256-KemiM+dCLSU3a6IIbI9VKtaIeY4SVcHsuE9QwZtzNxU="; }; pythonRelaxDeps = [ "defusedxml" "ijson" "sqlalchemy" + "xsdata" ]; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix index 92ecebc4b5187..471a84eecb892 100644 --- a/pkgs/by-name/vv/vvvvvv/package.nix +++ b/pkgs/by-name/vv/vvvvvv/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { dataZip = fetchurl { url = "https://thelettervsixtim.es/makeandplay/data.zip"; name = "data.zip"; - sha256 = "sha256-x2eAlZT2Ry2p9WE252ZX44ZA1YQWSkYRIlCsYpPswOo="; + hash = "sha256-x2eAlZT2Ry2p9WE252ZX44ZA1YQWSkYRIlCsYpPswOo="; meta.license = lib.licenses.unfree; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { physfs SDL2 tinyxml-2 - ] ++ lib.optionals stdenv.isDarwin [ Foundation IOKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation IOKit ]; cmakeDir = "../desktop_version"; diff --git a/pkgs/by-name/vw/vwsfriend/package.nix b/pkgs/by-name/vw/vwsfriend/package.nix index 63c7ff143401d..60a4995a13057 100644 --- a/pkgs/by-name/vw/vwsfriend/package.nix +++ b/pkgs/by-name/vw/vwsfriend/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vwsfriend"; - version = "0.24.5"; + version = "0.24.7"; pyproject = true; src = fetchFromGitHub { owner = "tillsteinbach"; repo = "VWsFriend"; rev = "refs/tags/v${version}"; - hash = "sha256-bKL0ExHV/wz3qwB5pMgZDkASr93sCUb01uTipkE5iJU="; + hash = "sha256-ZGH7rcGSAYDBSjv1jZjT/uGJIrFL71RYK6vX71RHz8E="; }; sourceRoot = "${src.name}/vwsfriend"; diff --git a/pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch b/pkgs/by-name/wa/waagent/dont-configure-sshd.patch similarity index 100% rename from pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch rename to pkgs/by-name/wa/waagent/dont-configure-sshd.patch diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix new file mode 100644 index 0000000000000..0f643690921f9 --- /dev/null +++ b/pkgs/by-name/wa/waagent/package.nix @@ -0,0 +1,77 @@ +{ + coreutils, + fetchFromGitHub, + lib, + python39, + bash, +}: + +let + # the latest python version that waagent test against according to https://github.com/Azure/WALinuxAgent/blob/28345a55f9b21dae89472111635fd6e41809d958/.github/workflows/ci_pr.yml#L75 + python = python39; + +in +python.pkgs.buildPythonApplication rec { + pname = "waagent"; + version = "2.11.1.12"; + src = fetchFromGitHub { + owner = "Azure"; + repo = "WALinuxAgent"; + rev = "refs/tags/v${version}"; + hash = "sha256-1MaPjz9hWb/kJxuyJAUWPk065vpSyx2jq1ZSlDB4yFo="; + }; + patches = [ + # Suppress the following error when waagent tries to configure sshd: + # Read-only file system: '/etc/ssh/sshd_config' + ./dont-configure-sshd.patch + ]; + doCheck = false; + + # Replace tools used in udev rules with their full path and ensure they are present. + postPatch = '' + substituteInPlace config/66-azure-storage.rules \ + --replace-fail readlink ${coreutils}/bin/readlink \ + --replace-fail cut ${coreutils}/bin/cut \ + --replace-fail /bin/sh ${bash}/bin/sh + substituteInPlace config/99-azure-product-uuid.rules \ + --replace-fail "/bin/chmod" "${coreutils}/bin/chmod" + ''; + + propagatedBuildInputs = [ python.pkgs.distro ]; + + # The udev rules are placed to the wrong place. + # Move them to their default location. + # Keep $out/${python.sitePackages}/usr/sbin/waagent where it is. + # waagent re-executes itself in UpdateHandler.run_latest, even if autoupdate + # is disabled, manually spawning a python interprever with argv0. + # We can't use the default python program wrapping mechanism, as it uses + # wrapProgram which doesn't support --argv0. + # So instead we make our own wrapper in $out/bin/waagent, setting PATH and + # PYTHONPATH. + # PATH contains our PYTHON, and PYTHONPATH stays set, so this should somewhat + # still work. + preFixup = '' + mv $out/${python.sitePackages}/etc $out/ + + buildPythonPath + + mkdir -p $out/bin + makeWrapper $out/${python.sitePackages}/usr/sbin/waagent $out/bin/waagent \ + --set PYTHONPATH $PYTHONPATH \ + --prefix PATH : $program_PATH \ + --argv0 $out/${python.sitePackages}/usr/sbin/waagent + ''; + + dontWrapPythonPrograms = false; + + meta = { + description = "Microsoft Azure Linux Agent (waagent)"; + mainProgram = "waagent"; + longDescription = '' + The Microsoft Azure Linux Agent (waagent) + manages Linux provisioning and VM interaction with the Azure + Fabric Controller''; + homepage = "https://github.com/Azure/WALinuxAgent"; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/pkgs/by-name/wa/waf/setup-hook.sh b/pkgs/by-name/wa/waf/setup-hook.sh index a154ae378a07c..692341fb5a04d 100644 --- a/pkgs/by-name/wa/waf/setup-hook.sh +++ b/pkgs/by-name/wa/waf/setup-hook.sh @@ -16,11 +16,8 @@ wafConfigurePhase() { export PKGCONFIG="${PKG_CONFIG}" fi - local flagsArray=( - $prefixFlag - $wafConfigureFlags "${wafConfigureFlagsArray[@]}" - ${wafConfigureTargets:-configure} - ) + local flagsArray=( $prefixFlag ) + concatTo flagsArray wafConfigureFlags wafConfigureFlagsArray wafConfigureTargets=configure echoCmd 'waf configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" @@ -41,15 +38,8 @@ wafConfigurePhase() { wafBuildPhase () { runHook preBuild - # set to empty if unset - : "${wafFlags=}" - - local flagsArray=( - ${enableParallelBuilding:+-j ${NIX_BUILD_CORES}} - $wafFlags ${wafFlagsArray[@]} - $wafBuildFlags ${wafBuildFlagsArray[@]} - ${wafBuildTargets:-build} - ) + local flagsArray=( ${enableParallelBuilding:+-j ${NIX_BUILD_CORES}} ) + concatTo flagsArray wafFlags wafFlagsArray wafBuildFlags wafBuildFlagsArray wafBuildTargets=build echoCmd 'waf build flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" @@ -64,12 +54,8 @@ wafInstallPhase() { mkdir -p "$prefix" fi - local flagsArray=( - ${enableParallelInstalling:+-j ${NIX_BUILD_CORES}} - $wafFlags ${wafFlagsArray[@]} - $wafInstallFlags ${wafInstallFlagsArray[@]} - ${wafInstallTargets:-install} - ) + local flagsArray=( ${enableParallelInstalling:+-j ${NIX_BUILD_CORES}} ) + concatTo flagsArray wafFlags wafFlagsArray wafInstallFlags wafInstallFlagsArray wafInstallTargets=install echoCmd 'waf install flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix index a5b804e3c9074..ab8176d6d42fb 100644 --- a/pkgs/by-name/wa/wait4x/package.nix +++ b/pkgs/by-name/wa/wait4x/package.nix @@ -4,7 +4,7 @@ }: let pname = "wait4x"; - version = "2.14.1"; + version = "2.14.2"; in buildGoModule { inherit pname version; @@ -13,10 +13,10 @@ buildGoModule { owner = "atkrad"; repo = pname; rev = "v${version}"; - hash = "sha256-7dm1KERBYkASuRWlCbpbLuHVc4uCMPWbSwegjZ8LwVU="; + hash = "sha256-fNPZ/qgAn4odd5iWnDK1RWPxeBhS/l4ffHLFB27SAoM="; }; - vendorHash = "sha256-CYE5wvBgNLYzCiibd9SWubIQ+22nffr4jpwgwSxhtGo="; + vendorHash = "sha256-Eio6CoYaChG59rHL4tfl7dNWliD7ksRyhoCPxMvMmrQ="; # Tests make network access doCheck = false; diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix new file mode 100644 index 0000000000000..ace3fbb24141d --- /dev/null +++ b/pkgs/by-name/wa/wakapi/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGo123Module, + fetchFromGitHub, +}: +let + version = "2.12.0"; +in +buildGo123Module { + pname = "wakapi"; + inherit version; + + src = fetchFromGitHub { + owner = "muety"; + repo = "wakapi"; + rev = "refs/tags/${version}"; + hash = "sha256-/aacT/VLA5S4PeGcxEGaCpgAw++b3VFD7T0CldZWcQI="; + }; + + vendorHash = "sha256-Q56Ud0MtkstB/dhn+QyAHTzIqHsmKvHEK+5PAt5lIMM="; + + # Not a go module required by the project, contains development utilities + excludedPackages = [ "scripts" ]; + + # Fix up reported version + postPatch = ''echo ${version} > version.txt''; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + homepage = "https://wakapi.dev/"; + changelog = "https://github.com/muety/wakapi/releases/tag/${version}"; + description = "Minimalist self-hosted WakaTime-compatible backend for coding statistics"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + t4ccer + isabelroses + ]; + mainProgram = "wakapi"; + }; +} diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix index a0e03a6cd7887..7524d82c62b86 100644 --- a/pkgs/by-name/wa/wakatime-cli/package.nix +++ b/pkgs/by-name/wa/wakatime-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "wakatime-cli"; - version = "1.98.3"; + version = "1.98.5"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - hash = "sha256-AoefP/hWdflCOjZtmKyjcjUfst3SXF+EHfJyPcACWPE="; + hash = "sha256-Ez5fzaZxvHOH8z4tQ7+PUnGrpzAd97vbAta1exEtvtQ="; }; vendorHash = "sha256-+9zdEIaKQlLcBwFaY5Fe5mpHWQDqfV+j1TPmDkdRjyk="; diff --git a/pkgs/tools/graphics/wallutils/000-add-nixos-dirs-to-default-wallpapers.patch b/pkgs/by-name/wa/wallutils/000-add-nixos-dirs-to-default-wallpapers.patch similarity index 100% rename from pkgs/tools/graphics/wallutils/000-add-nixos-dirs-to-default-wallpapers.patch rename to pkgs/by-name/wa/wallutils/000-add-nixos-dirs-to-default-wallpapers.patch diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/by-name/wa/wallutils/package.nix similarity index 100% rename from pkgs/tools/graphics/wallutils/default.nix rename to pkgs/by-name/wa/wallutils/package.nix diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix index afaaed863d675..420baa5baeb35 100644 --- a/pkgs/by-name/wa/wapm/package.nix +++ b/pkgs/by-name/wa/wapm/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { owner = "wasmerio"; repo = "wapm-cli"; rev = "v${version}"; - sha256 = "sha256-T7YEe8xg5iwI/npisW0m+6FLi+eaAQVgYNe6TvMlhAs="; + hash = "sha256-T7YEe8xg5iwI/npisW0m+6FLi+eaAQVgYNe6TvMlhAs="; }; cargoHash = "sha256-r4123NJ+nxNOVIg6svWr636xbxOJQ7tp76JoAi2m9p8="; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl ]; buildInputs = [ libiconv openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); doCheck = false; diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index 71c23dc8f751e..adb2b2614e828 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -109,6 +109,6 @@ meta = with lib; { }; in -if stdenvNoCC.isDarwin +if stdenvNoCC.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 2ae689c985281..73a360b88f05a 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-EDhj4Gb0ykFX8W2G8osusjggemcuHO7hkUKb151cQ6g=", - "version": "0.2024.08.20.08.02.stable_00" + "hash": "sha256-zbnOkld+6UnSeMfvc6P6qZ474KaHcx1Qzyr4HCWsv98=", + "version": "0.2024.09.24.08.02.stable_01" }, "linux_x86_64": { - "hash": "sha256-Uk5pSoAvEppjLnskLc5/ftcCaiJnXATJfCPDP2QpBo8=", - "version": "0.2024.08.20.08.02.stable_00" + "hash": "sha256-SeTzKFsY+p0oJFTmBEmj64tOPS7BlBLtYdoIJ9jmTD0=", + "version": "0.2024.09.24.08.02.stable_01" }, "linux_aarch64": { - "hash": "sha256-B0mUAwydIgi7Nhm/iUhEjkV3LL+qLfXZcOz6+7eDZGc=", - "version": "0.2024.08.20.08.02.stable_00" + "hash": "sha256-lAiu20udBEJhu29vqiS8vYauuu0fcX1LlvqEqYN5WXU=", + "version": "0.2024.09.24.08.02.stable_01" } } diff --git a/pkgs/by-name/wa/wash-cli/package.nix b/pkgs/by-name/wa/wash-cli/package.nix index d5b3ebecf8cdd..663273e54e4bb 100644 --- a/pkgs/by-name/wa/wash-cli/package.nix +++ b/pkgs/by-name/wa/wash-cli/package.nix @@ -24,7 +24,7 @@ in rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/by-name/wa/wasm-bindgen-cli/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli/package.nix new file mode 100644 index 0000000000000..d9b997805440c --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli/package.nix @@ -0,0 +1,49 @@ +{ + lib, + rustPlatform, + fetchCrate, + nix-update-script, + nodejs_latest, + pkg-config, + openssl, + stdenv, + curl, + darwin, + version ? "0.2.93", + hash ? "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=", + cargoHash ? "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=", +}: + +rustPlatform.buildRustPackage rec { + pname = "wasm-bindgen-cli"; + inherit version hash cargoHash; + + src = fetchCrate { inherit pname version hash; }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + curl + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ nodejs_latest ]; + + # tests require it to be ran in the wasm-bindgen monorepo + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://rustwasm.github.io/docs/wasm-bindgen/"; + license = with lib.licenses; [ + asl20 # or + mit + ]; + description = "Facilitating high-level interactions between wasm modules and JavaScript"; + maintainers = with lib.maintainers; [ rizary ]; + mainProgram = "wasm-bindgen"; + }; +} diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index cdc5feb24b801..f63429bff2488 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix new file mode 100644 index 0000000000000..cc1053d58fe21 --- /dev/null +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -0,0 +1,191 @@ +{ + lib, + stdenv, + fetchurl, + makeDesktopItem, + copyDesktopItems, + unzip, + autoPatchelfHook, + atk, + at-spi2-atk, + cups, + libdrm, + gtk3, + pango, + cairo, + libX11, + libXcomposite, + libXdamage, + libXext, + libXfixes, + libXrandr, + mesa, + expat, + libxcb, + alsa-lib, + nss, + nspr, + vips, + wrapGAppsHook3, + udev, + libGL, +}: + +let + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + pname = "waveterm"; + version = "0.8.8"; + + suffix = + { + x86_64-linux = "waveterm-linux-x64-${version}.zip"; + aarch64-linux = "waveterm-linux-arm64-${version}.zip"; + x86_64-darwin = "Wave-darwin-universal-${version}.zip "; + aarch64-darwin = "Wave-darwin-arm64-${version}.zip"; + } + .${system} or throwSystem; + + src = fetchurl { + url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/${suffix}"; + hash = + { + x86_64-linux = "sha256-hRpJTFVoBQZyJD06FTRbBPj/1DlYlDWPRjJ1IKeK7Cs="; + aarch64-linux = "sha256-T3VqsoHhPYYrAe/dEd0SUH+G4jpHjKpJTrFy8/AgoKI="; + x86_64-darwin = "sha256-UlyNl2Qu59L4hnK8rTeUV30YVD45L7ub5SP8f97aJrw="; + aarch64-darwin = "sha256-cP+z8DQsNBJc3p57xQdGqqq7jvYcRQRIa+P+6kD3eCc="; + } + .${system} or throwSystem; + }; + + desktopItems = [ + (makeDesktopItem { + name = "waveterm"; + exec = "waveterm --no-sandbox %U"; + icon = fetchurl { + url = "https://raw.githubusercontent.com/wavetermdev/waveterm/refs/tags/v${version}/build/appicon.png"; + hash = "sha256-qob27/64C9XPBtXghxg5/g0qRaiOUOpuFYL1n7/aEB0="; + }; + startupWMClass = "Wave"; + comment = "Open-Source AI-Native Terminal Built for Seamless Workflows"; + desktopName = "Wave"; + genericName = "Terminal Emulator"; + categories = [ + "Development" + "Utility" + "TerminalEmulator" + ]; + keywords = [ + "developer" + "terminal" + "emulator" + ]; + }) + ]; + + unpackPhase = '' + runHook preUnpack + unzip ${src} -d ./ + runHook postUnpack + ''; + + meta = { + description = "Open-source, cross-platform terminal for seamless workflows"; + homepage = "https://www.waveterm.dev"; + mainProgram = "waveterm"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.asl20; + platforms = [ + "aarch64-linux" + "aarch64-darwin" + "x86_64-linux" + "x86_64-darwin" + ]; + maintainers = with lib.maintainers; [ aucub ]; + }; + + linux = stdenv.mkDerivation { + inherit + pname + version + src + desktopItems + unpackPhase + ; + + nativeBuildInputs = [ + unzip + copyDesktopItems + autoPatchelfHook + wrapGAppsHook3 + ]; + + buildInputs = [ + atk + at-spi2-atk + cups + libdrm + gtk3 + pango + cairo + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXrandr + mesa + expat + libxcb + alsa-lib + nss + nspr + vips + ]; + + runtimeDependencies = map lib.getLib [ + udev + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/waveterm $out/bin + cp -r ./* $out/waveterm/ + runHook postInstall + ''; + + preFixup = '' + makeWrapper $out/waveterm/waveterm $out/bin/waveterm \ + --prefix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + libGL + ] + }" + ''; + }; + + darwin = stdenv.mkDerivation { + inherit + pname + version + src + unpackPhase + meta + ; + + nativeBuildInputs = [ + unzip + ]; + + sourceRoot = "Wave.app"; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications/Wave.app + cp -R . $out/Applications/Wave.app + runHook postInstall + ''; + }; +in +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index c92d04e5a9828..2c2cc2c2535f5 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -6,6 +6,7 @@ SDL2, alsa-lib, catch2_3, + fetchpatch, fftw, glib, gobject-introspection, @@ -36,6 +37,7 @@ scdoc, sndio, spdlog, + systemdMinimal, sway, udev, upower, @@ -52,13 +54,14 @@ inputSupport ? true, jackSupport ? true, mpdSupport ? true, - mprisSupport ? stdenv.isLinux, + mprisSupport ? stdenv.hostPlatform.isLinux, nlSupport ? true, pipewireSupport ? true, pulseSupport ? true, rfkillSupport ? true, runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, sndioSupport ? true, + systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, swaySupport ? true, traySupport ? true, udevSupport ? true, @@ -81,15 +84,27 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "waybar"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; - rev = finalAttrs.version; - hash = "sha256-/JW3WnRLpfz8j+9Zc9YkK63i8DjHrKwv9PWKIMz3MVI="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8="; }; + patches = [ + # Fix a regression introduced in release 0.11.0 + # TODO: remove this patch when updating to the next release + # Issue: https://github.com/Alexays/Waybar/issues/3597 + # PR: https://github.com/Alexays/Waybar/pull/3604 + (fetchpatch { + name = "fix-tray"; + url = "https://github.com/Alexays/Waybar/commit/0d02f6877d88551ea2be0cd151c1e6354e208b1c.patch"; + hash = "sha256-wpdK6AY+14jt85dOQy6xkh8tNGDN2F9GA9zOfAuOaIc="; + }) + ]; + postUnpack = lib.optional cavaSupport '' pushd "$sourceRoot" cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.2 @@ -140,12 +155,13 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional pulseSupport libpulseaudio ++ lib.optional sndioSupport sndio ++ lib.optional swaySupport sway + ++ lib.optional systemdSupport systemdMinimal ++ lib.optional traySupport libdbusmenu-gtk3 ++ lib.optional udevSupport udev ++ lib.optional upowerSupport upower ++ lib.optional wireplumberSupport wireplumber ++ lib.optional (cavaSupport || pipewireSupport) pipewire - ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; + ++ lib.optional (!stdenv.hostPlatform.isLinux) libinotify-kqueue; nativeCheckInputs = [ catch2_3 ]; doCheck = runTests; @@ -166,13 +182,17 @@ stdenv.mkDerivation (finalAttrs: { "pulseaudio" = pulseSupport; "rfkill" = rfkillSupport; "sndio" = sndioSupport; - "systemd" = false; + "systemd" = systemdSupport; "tests" = runTests; "upower_glib" = upowerSupport; "wireplumber" = wireplumberSupport; }) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); + env = lib.optionalAttrs systemdSupport { + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + }; + postPatch = '' substituteInPlace include/util/command.hpp \ --replace-fail /bin/sh ${lib.getExe' bash "sh"} diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index 73eb3146664ee..b8dd02dabded9 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -1,25 +1,27 @@ -{ lib -, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, qt6 -, wayland -, glib -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + qt6, + wayland, + glib, + wrapGAppsHook3, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "waycheck"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "serebit"; repo = "waycheck"; rev = "v${finalAttrs.version}"; - hash = "sha256-82jOYWhgD9JNDn24eCAeMm63R5BTy20lQVpiAwhDIOk="; + hash = "sha256-ZNUORCSeU+AGQoiIIfPpgW2o1ElX+j5Pcn2X/8pSpRI="; }; nativeBuildInputs = [ @@ -48,11 +50,16 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Simple GUI that displays the protocols implemented by a Wayland compositor"; homepage = "https://gitlab.freedesktop.org/serebit/waycheck"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ julienmalka ]; + maintainers = with lib.maintainers; [ + julienmalka + pandapip1 + ]; mainProgram = "waycheck"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix index 3ada850b803dd..ac49b80c5833e 100644 --- a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix +++ b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "wayland-pipewire-idle-inhibit"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "rafaelrc7"; repo = "wayland-pipewire-idle-inhibit"; rev = "v${version}"; - sha256 = "sha256-2akYbnQnJ0wb51S3bwrm3/EiZydxbwkfuSfsiTvtNz8="; + hash = "sha256-8oVTexYGQWyaAVJedrp4kIQ7VjBR47l65eByZr7oghg="; }; - cargoHash = "sha256-C4cispJN2OQRBQiW+H36B8ETNn1oukgdELRVk7V7BQU="; + cargoHash = "sha256-6MzV2JOVFezD9fVDbzZ6Zm9RWOexh5LPk6AWOleOc2Q="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/waylock/build.zig.zon.nix b/pkgs/by-name/wa/waylock/build.zig.zon.nix index a0d4d9ac09712..2ee83bc20cecc 100644 --- a/pkgs/by-name/wa/waylock/build.zig.zon.nix +++ b/pkgs/by-name/wa/waylock/build.zig.zon.nix @@ -4,17 +4,17 @@ linkFarm "zig-packages" [ { - name = "1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017"; + name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242"; path = fetchzip { - url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.1.0.tar.gz"; - hash = "sha256-xilmsDGWlkfpTiGff+/nb76jx87ANdr4zqYy6rKOBMg="; + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz"; + hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE="; }; } { - name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d"; + name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f"; path = fetchzip { - url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz"; - hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA="; + url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz"; + hash = "sha256-T+EZiStBfmxFUjaX05WhYkFJ8tRok/UQtpc9QY9NxZk="; }; } ] diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix index fe5d024585a30..42e5df06185c9 100644 --- a/pkgs/by-name/wa/waylock/package.nix +++ b/pkgs/by-name/wa/waylock/package.nix @@ -10,12 +10,12 @@ wayland, wayland-scanner, wayland-protocols, - zig_0_12, + zig_0_13, }: stdenv.mkDerivation (finalAttrs: { pname = "waylock"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitea { domain = "codeberg.org"; @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "waylock"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-U8xJucLpmeLdmSUc+AVSH/mlv6UOXsxotJPTMK7lnkA="; + hash = "sha256-i1Nd39666xrkzi7r08ZRIXJXvK9wmzb8zdmvmWEQaHE="; }; deps = callPackage ./build.zig.zon.nix { }; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config scdoc wayland-scanner - zig_0_12.hook + zig_0_13.hook ]; buildInputs = [ diff --git a/pkgs/by-name/wa/wayprompt/build.zig.zon.nix b/pkgs/by-name/wa/wayprompt/build.zig.zon.nix new file mode 100644 index 0000000000000..42deb3f11a67f --- /dev/null +++ b/pkgs/by-name/wa/wayprompt/build.zig.zon.nix @@ -0,0 +1,48 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ linkFarm, fetchzip }: + +linkFarm "zig-packages" [ + { + name = "12201bbf05e1fb73323a9b13d2599dc4bf82851e6d328d7523a1af5b861a87edf286"; + path = fetchzip { + url = "https://git.sr.ht/~leon_plickat/zig-ini/archive/879c74a3a801d49fa34343aebd55a22f591899b3.tar.gz"; + hash = "sha256-in7abjMSWtnmrri2tbTJW2WVL4ZLrKkTT8Bxy8njJT4="; + }; + } + { + name = "12202727aaaf0e742d4945be55af1ace8b25902095e0c1b0a24b70cc80a81b7ac518"; + path = fetchzip { + url = "https://git.sr.ht/~leon_plickat/zig-spoon/archive/fdba8e643c9558254bf4e6c600dfbd782fa7a267.tar.gz"; + hash = "sha256-c8V+HqtDMW6JBDKilzrC39GizvWPp1eMton1X4PpxJI="; + }; + } + { + name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz"; + hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE="; + }; + } + { + name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz"; + hash = "sha256-zcfZEMnipWDPuptl9UN0PoaJDjy2EHc7Wwi4GQq3hkY="; + }; + } + { + name = "1220a4029ee3ee70d3175c69878e2b70dccd000c4324bc74ba800d8a143b7250fb38"; + path = fetchzip { + url = "https://git.sr.ht/~novakane/zig-fcft/archive/1.1.0.tar.gz"; + hash = "sha256-JAR6Ticav9l/3aemJWGsjXMEUyHjuhUr3L0fznnLoEY="; + }; + } + { + name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz"; + hash = "sha256-T+EZiStBfmxFUjaX05WhYkFJ8tRok/UQtpc9QY9NxZk="; + }; + } +] diff --git a/pkgs/by-name/wa/wayprompt/package.nix b/pkgs/by-name/wa/wayprompt/package.nix new file mode 100644 index 0000000000000..ac4fdd35bfbc3 --- /dev/null +++ b/pkgs/by-name/wa/wayprompt/package.nix @@ -0,0 +1,58 @@ +{ + callPackage, + lib, + zig_0_13, + stdenv, + fetchFromSourcehut, + fcft, + libxkbcommon, + pixman, + pkg-config, + scdoc, + wayland, + wayland-protocols, + wayland-scanner, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wayprompt"; + version = "0.1.2"; + + src = fetchFromSourcehut { + owner = "~leon_plickat"; + repo = "wayprompt"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+9Zgq5/Zbb1I3CMH1pivPkddThaGDXM+vVCzWppXq+0="; + }; + + deps = callPackage ./build.zig.zon.nix { }; + + nativeBuildInputs = [ + zig_0_13.hook + pkg-config + wayland + wayland-scanner + scdoc + ]; + + buildInputs = [ + fcft + libxkbcommon + pixman + wayland-protocols + ]; + + zigBuildFlags = [ + "--system" + "${finalAttrs.deps}" + ]; + + meta = { + homepage = "https://git.sr.ht/~leon_plickat/wayprompt"; + description = "Multi-purpose (password-)prompt tool for Wayland"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ sg-qwt ]; + mainProgram = "pinentry-wayprompt"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix new file mode 100644 index 0000000000000..e70565ca4578f --- /dev/null +++ b/pkgs/by-name/wc/wchisp/package.nix @@ -0,0 +1,47 @@ +{ + stdenv, + lib, + rustPlatform, + fetchCrate, + pkg-config, + libusb1, + nix-update-script, + testers, + wchisp, +}: + +rustPlatform.buildRustPackage rec { + pname = "wchisp"; + version = "0.3.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-6WNXsRvbldEjAykMn1DCiuKctBrsTHGv1fJuRXBblu0="; + }; + + cargoHash = "sha256-5kJ0MK0rUzyJvLZH/3nje+gTAM6et0mNE3sxVoK1L5s="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libusb1 + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = wchisp; + }; + }; + + meta = with lib; { + description = "A command-line implementation of WCHISPTool, for flashing ch32 MCUs"; + homepage = "https://ch32-rs.github.io/wchisp/"; + changelog = "https://github.com/ch32-rs/wchisp/releases/tag/v${version}"; + license = with licenses; [ gpl2Only ]; + platforms = with platforms; linux ++ darwin ++ windows; + broken = !stdenv.hostPlatform.isLinux; + maintainers = with maintainers; [ jwillikers ]; + mainProgram = "wchisp"; + }; +} diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix new file mode 100644 index 0000000000000..7734b0d6f585e --- /dev/null +++ b/pkgs/by-name/we/weaver/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + darwin, + testers, + weaver, +}: + +rustPlatform.buildRustPackage rec { + pname = "weaver"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "open-telemetry"; + repo = "weaver"; + rev = "v${version}"; + hash = "sha256-hSoMt+4D1bpENBD9NmuVBLDUOJkau5Sk2OHS5RyDRYQ="; + }; + + cargoHash = "sha256-4rHDulSsFvKly5M5bo1AtEAl280N/hxhznTngCxw36Y="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk_11_0.frameworks; [ SystemConfiguration ] + ); + + checkFlags = [ + # Skip tests requiring network + "--skip=test_cli_interface" + ]; + + passthru.tests.version = testers.testVersion { + package = weaver; + }; + + meta = { + description = "OpenTelemetry tool for dealing with semantic conventions and application telemetry schemas"; + homepage = "https://github.com/open-telemetry/weaver"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ aaronjheng ]; + mainProgram = "weaver"; + }; +} diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index 0c147beaa7b18..ff3256cbf89a1 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -85,7 +85,6 @@ buildNpmPackage rec { license = lib.licenses.mit; mainProgram = "webcord"; maintainers = with lib.maintainers; [ - eclairevoyant huantian ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index f3eec5c4aa7c9..0993515eb1ae6 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -23,18 +23,12 @@ let # https://github.com/encode/django-rest-framework/discussions/9342 disabledTests = (old.disabledTests or [ ]) ++ [ "test_invalid_inputs" ]; }); - celery = prev.celery.overridePythonAttrs (old: { - dependencies = old.dependencies ++ prev.celery.optional-dependencies.redis; - }); - python-redis-lock = prev.python-redis-lock.overridePythonAttrs (old: { - dependencies = old.dependencies ++ prev.python-redis-lock.optional-dependencies.django; - }); }; }; in python.pkgs.buildPythonApplication rec { pname = "weblate"; - version = "5.7"; + version = "5.7.2"; pyproject = true; @@ -46,8 +40,8 @@ python.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "WeblateOrg"; repo = "weblate"; - rev = "weblate-${version}"; - sha256 = "sha256-h5+0lOMD+H0ehtZ0bngA9bI5va1I5KjZH9boaEtXJPo="; + rev = "refs/tags/weblate-${version}"; + hash = "sha256-cIwCNYXbg7l6z9OAkMAGJ783QI/nCOyrhLPURDcDv+Y="; }; patches = [ @@ -76,67 +70,71 @@ python.pkgs.buildPythonApplication rec { ${python.pythonOnBuildForHost.interpreter} manage.py compress ''; - dependencies = with python.pkgs; [ - aeidon - ahocorasick-rs - borgbackup - celery - certifi - charset-normalizer - django-crispy-bootstrap3 - cryptography - cssselect - cython - cyrtranslit - diff-match-patch - django-appconf - django-celery-beat - django-compressor - django-cors-headers - django-crispy-forms - django-filter - django-redis - django-otp - django-otp-webauthn - django - djangorestframework - filelock - fluent-syntax - gitpython - hiredis - html2text - iniparse - jsonschema - lxml - mistletoe - nh3 - openpyxl - packaging - phply - pillow - pycairo - pygments - pygobject3 - pyicumessageformat - pyparsing - python-dateutil - python-redis-lock - qrcode - rapidfuzz - redis - requests - ruamel-yaml - sentry-sdk - siphashc - social-auth-app-django - social-auth-core - tesserocr - translate-toolkit - translation-finder - user-agents - weblate-language-data - weblate-schemas - ]; + dependencies = + with python.pkgs; + [ + aeidon + ahocorasick-rs + (toPythonModule (borgbackup.override { python3 = python; })) + celery + certifi + charset-normalizer + django-crispy-bootstrap3 + cryptography + cssselect + cython + cyrtranslit + diff-match-patch + django-appconf + django-celery-beat + django-compressor + django-cors-headers + django-crispy-forms + django-filter + django-redis + django-otp + django-otp-webauthn + django + djangorestframework + filelock + fluent-syntax + gitpython + hiredis + html2text + iniparse + jsonschema + lxml + mistletoe + nh3 + openpyxl + packaging + phply + pillow + pycairo + pygments + pygobject3 + pyicumessageformat + pyparsing + python-dateutil + python-redis-lock + qrcode + rapidfuzz + redis + requests + ruamel-yaml + sentry-sdk + siphashc + social-auth-app-django + social-auth-core + tesserocr + translate-toolkit + translation-finder + user-agents + weblate-language-data + weblate-schemas + ] + ++ python-redis-lock.optional-dependencies.django + ++ celery.optional-dependencies.redis; optional-dependencies = { postgres = with python.pkgs; [ psycopg ]; @@ -164,7 +162,10 @@ python.pkgs.buildPythonApplication rec { meta = with lib; { description = "Web based translation tool with tight version control integration"; homepage = "https://weblate.org/"; - license = licenses.gpl3Plus; + license = with licenses; [ + gpl3Plus + mit + ]; platforms = platforms.linux; maintainers = with maintainers; [ erictapen ]; }; diff --git a/pkgs/by-name/we/websploit/package.nix b/pkgs/by-name/we/websploit/package.nix index 34b8ab8ff2574..c653b15658c08 100644 --- a/pkgs/by-name/we/websploit/package.nix +++ b/pkgs/by-name/we/websploit/package.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { owner = "f4rih"; repo = "websploit"; rev = "refs/tags/${version}"; - sha256 = "LpDfJmH2FbL37Fk86CAC/bxFqM035DBN6c6FPfGpaIw="; + hash = "sha256-LpDfJmH2FbL37Fk86CAC/bxFqM035DBN6c6FPfGpaIw="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/we/wechat-uos/libuosdevicea.c b/pkgs/by-name/we/wechat-uos/libuosdevicea.c new file mode 100644 index 0000000000000..0cdc0cecde7dc --- /dev/null +++ b/pkgs/by-name/we/wechat-uos/libuosdevicea.c @@ -0,0 +1,44 @@ +// taken from https://aur.archlinux.org/cgit/aur.git/tree/libuosdevicea.c?h=wechat-universal + +/* + * licensestub - compat layer for libuosdevicea + * Copyright (C) 2024 Zephyr Lykos <self@mochaa.ws> + * Copyright (C) 2024 Guoxin "7Ji" Pu <pugokushin@gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ +#define _GNU_SOURCE + +#include <string.h> + +#define declare_string_getter(suffix, constant) void uos_get_##suffix(char *const restrict out) { if (out) strcpy(out, constant); } + +declare_string_getter(mac, // MAC address with colon stripped + "000000000000") +declare_string_getter(hddsninfo, + "SN") +declare_string_getter(hwserial, // MD5 of hddsninfo + "92666505ce75444ee14be2ebc2f10a60") +declare_string_getter(mb_sn, // hardcoded + "E50022008800015957007202c59a1a8-3981-2020-0810-204909000000") +declare_string_getter(osver, + "UnionTech OS Desktop") +declare_string_getter(licensetoken, + "djEsdjEsMSwyLDk5QUFFN0FBQVdRQjk5OFhKS0FIU1QyOTQsMTAsOTI2NjY1MDVjZTc1NDQ0ZWUxNGJlMmViYzJmMTBhNjAsQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUE6ZjA3NjAwYzZkNmMyMDkyMDBkMzE5YzU2OThmNTc3MGRlYWY1NjAyZTY5MzUxZTczNjI2NjlhNzIyZTBkNTJiOTNhYzk0MmM3YTNkZTgxNjIxMmUwMDA1NTUwODg4N2NlMDQ4ODMyNTExY2JhNGFiMjdmYzlmZjMyYzFiNTYwNjMwZDI3ZDI2NmE5ZGIxZDQ0N2QxYjNlNTNlNTVlOTY1MmU5YTU4OGY0NWYzMTMwZDE0NDc4MTRhM2FmZjRlZGNmYmNkZjhjMmFiMDc5OWYwNGVmYmQ2NjdiNGYwYzEwNDhkYzExNjYwZWU1NTdlNTdmNzBlNjA1N2I0NThkMDgyOA==") + +int uos_is_active() { + return 0; +} diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index 959d05c9f10da..63b47dde85006 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -19,7 +19,6 @@ , mesa , alsa-lib , wayland -, openssl_1_1 , atk , qt6 , at-spi2-atk @@ -96,7 +95,7 @@ let { name = "license.tar.gz"; url = "https://www.uniontech.com"; - sha256 = "53760079c1a5b58f2fa3d5effe1ed35239590b288841d812229ef4e55b2dbd69"; + hash = "sha256-U3YAecGltY8vo9Xv/h7TUjlZCyiIQdgSIp705VstvWk="; } else uosLicense; installPhase = '' @@ -112,6 +111,40 @@ let outputHash = "sha256-pNftwtUZqBsKBSPQsEWlYLlb6h2Xd9j56ZRMi8I82ME="; }; + libuosdevicea = stdenv.mkDerivation rec { + name = "libuosdevicea"; + src = ./libuosdevicea.c; + + unpackPhase = '' + runHook preUnpack + + cp ${src} libuosdevicea.c + + runHook postUnpack + ''; + + buildPhase = '' + runHook preBuild + + $CC -shared -fPIC -o libuosdevicea.so libuosdevicea.c + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp libuosdevicea.so $out/lib/ + + runHook postInstall + ''; + + meta = with lib; { + license = licenses.gpl2Plus; + }; + }; + wechat-uos-runtime = with xorg; [ # Make sure our glibc without hardening gets picked up first (lib.hiPrio glibcWithoutHardening) @@ -173,7 +206,6 @@ let wayland pulseaudio qt6.qt5compat - openssl_1_1 bzip2 ]; @@ -199,22 +231,6 @@ let }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); - # Don't blame about this. WeChat requires some binary from here to work properly - uosSrc = { - x86_64-linux = fetchurl { - url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.weixin/com.tencent.weixin_2.1.5_amd64.deb"; - hash = "sha256-vVN7w+oPXNTMJ/g1Rpw/AVLIytMXI+gLieNuddyyIYE="; - }; - aarch64-linux = fetchurl { - url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.weixin/com.tencent.weixin_2.1.5_arm64.deb"; - hash = "sha256-XvGFPYJlsYPqRyDycrBGzQdXn/5Da1AJP5LgRVY1pzI="; - }; - loongarch64-linux = fetchurl { - url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.weixin/com.tencent.weixin_2.1.5_loongarch64.deb"; - hash = "sha256-oa6rLE6QXMCPlbebto9Tv7xT3fFqYIlXL6WHpB2U35s="; - }; - }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); - inherit uosLicense; nativeBuildInputs = [ dpkg ]; @@ -223,7 +239,6 @@ let runHook preUnpack dpkg -x $src ./wechat-uos - dpkg -x $uosSrc ./wechat-uos-old-source runHook postUnpack ''; @@ -237,7 +252,7 @@ let mkdir -pv $out/usr/lib/wechat-uos/license ln -s ${uosLicenseUnzipped}/* $out/usr/lib/wechat-uos/license/ - cp -r wechat-uos-old-source/usr/lib/license/libuosdevicea.so $out/usr/lib/wechat-uos/license/ + ln -s ${libuosdevicea}/lib/libuosdevicea.so $out/usr/lib/wechat-uos/license/ runHook postInstall ''; diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 4eb34b1cf1241..deafc456bab68 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "werf"; - version = "2.10.5"; + version = "2.10.7"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-pNKcBiZSZa8F8E5grEXbgPpqk9H+mu/TeiU3FSAalQE="; + hash = "sha256-pIgBYB0EEelpNgNPAxUu2jqFoT4myru5wAu3Oobmqn8="; }; - vendorHash = "sha256-OR2nIR2q3iRfaSQSQRKn+jbygETx2+WmkOIjOCIB9O8="; + vendorHash = "sha256-MSxqRU9TUYDoUoYubXPrxABwLL5gou52ia0dX7lzQ5Q="; proxyVendor = true; @@ -29,10 +29,10 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = - lib.optionals stdenv.isLinux [ btrfs-progs ] + lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs ] ++ lib.optionals stdenv.hostPlatform.isGnu [ stdenv.cc.libc.static ]; - CGO_ENABLED = if stdenv.isLinux then 1 else 0; + CGO_ENABLED = if stdenv.hostPlatform.isLinux then 1 else 0; ldflags = [ diff --git a/pkgs/by-name/wg/wgpu/Cargo.lock b/pkgs/by-name/wg/wgpu/Cargo.lock new file mode 100644 index 0000000000000..406f8c85bcc2b --- /dev/null +++ b/pkgs/by-name/wg/wgpu/Cargo.lock @@ -0,0 +1,4946 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.6.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk 0.8.0", + "ndk-context", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.2", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.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 = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "argh" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7af5ba06967ff7214ce4c7419c7d185be7ecd6cc4965a8f6e1d8ce0398aad219" +dependencies = [ + "argh_derive", + "argh_shared", +] + +[[package]] +name = "argh_derive" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56df0aeedf6b7a2fc67d06db35b09684c3e8da0c95f8f27685cb17e08413d87a" +dependencies = [ + "argh_shared", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "argh_shared" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5693f39141bda5760ecc4111ab08da40565d1771038c4a0250f03457ec707531" +dependencies = [ + "serde", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +dependencies = [ + "serde", +] + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.38.0+1.3.281" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" +dependencies = [ + "libloading 0.8.4", +] + +[[package]] +name = "async-trait" +version = "0.1.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64-simd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" +dependencies = [ + "simd-abstraction", +] + +[[package]] +name = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref 0.5.1", + "vsimd", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bit-set" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "arbitrary", + "serde", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" + +[[package]] +name = "calloop" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +dependencies = [ + "bitflags 1.3.2", + "log", + "nix 0.25.1", + "slotmap", + "thiserror", + "vec_map", +] + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.6.0", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop 0.12.4", + "rustix", + "wayland-backend", + "wayland-client 0.31.2", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cgl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" +dependencies = [ + "libc", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_derive" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "com" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "console_log" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f" +dependencies = [ + "log", + "web-sys", +] + +[[package]] +name = "const_panic" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "cooked-waker" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "core-text" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" +dependencies = [ + "core-foundation", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crossfont" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eb5a3822b594afc99b503cc1859b94686d3c3efdd60507a28587dab80ee1071" +dependencies = [ + "cocoa 0.25.0", + "core-foundation", + "core-foundation-sys", + "core-graphics 0.23.2", + "core-text", + "dwrote", + "foreign-types 0.5.0", + "freetype-rs", + "libc", + "log", + "objc", + "once_cell", + "pkg-config", + "servo-fontconfig", + "winapi", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn 2.0.71", +] + +[[package]] +name = "cts_runner" +version = "0.1.0" +dependencies = [ + "deno_console", + "deno_core", + "deno_url", + "deno_web", + "deno_webgpu", + "deno_webidl", + "termcolor", + "tokio", +] + +[[package]] +name = "cty" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "22.0.0" +dependencies = [ + "bitflags 2.6.0", + "libloading 0.8.4", + "winapi", +] + +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "serde", + "uuid", +] + +[[package]] +name = "deno_console" +version = "0.143.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f770d8deb0eb0bfd596d242d9eaef5312ef57f0130964cb53c7f6a8107d13be" +dependencies = [ + "deno_core", +] + +[[package]] +name = "deno_core" +version = "0.272.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07093891f2af763023614cfe2d1ce5f9ce5a7920c4fcf2f00911bd0d93083523" +dependencies = [ + "anyhow", + "bincode", + "bit-set", + "bit-vec", + "bytes", + "cooked-waker", + "deno_core_icudata", + "deno_ops", + "deno_unsync", + "futures", + "libc", + "log", + "memoffset 0.9.1", + "parking_lot", + "pin-project", + "serde", + "serde_json", + "serde_v8", + "smallvec", + "sourcemap", + "static_assertions", + "tokio", + "url", + "v8", +] + +[[package]] +name = "deno_core_icudata" +version = "0.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" + +[[package]] +name = "deno_ops" +version = "0.148.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc73fc07ad26e71715d5a726d1dd228587c0d121a591b1931a0fcf958a2ec3b" +dependencies = [ + "proc-macro-rules", + "proc-macro2", + "quote", + "strum", + "strum_macros", + "syn 2.0.71", + "thiserror", +] + +[[package]] +name = "deno_unsync" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c8b95582c2023dbb66fccc37421b374026f5915fa507d437cb566904db9a3a" +dependencies = [ + "parking_lot", + "tokio", +] + +[[package]] +name = "deno_url" +version = "0.143.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39d9e6ffd6a7157bfd3cf1385c59232e49587c9bbb898e64010f7f082242a203" +dependencies = [ + "deno_core", + "serde", + "urlpattern", +] + +[[package]] +name = "deno_web" +version = "0.174.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "708666b5b346e6880c1372006615814db7fc5ef36bd1785f0b0e4f8617082999" +dependencies = [ + "async-trait", + "base64-simd 0.8.0", + "bytes", + "deno_core", + "encoding_rs", + "flate2", + "futures", + "serde", + "tokio", + "uuid", + "windows-sys 0.48.0", +] + +[[package]] +name = "deno_webgpu" +version = "0.118.0" +dependencies = [ + "deno_core", + "raw-window-handle 0.6.2", + "serde", + "tokio", + "wgpu-core", + "wgpu-types", +] + +[[package]] +name = "deno_webidl" +version = "0.143.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddad93aa68e3c3c2d36976cd401af27a6ce750c23060e02401daf240f2acbe2" +dependencies = [ + "deno_core", +] + +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version 0.4.0", + "syn 2.0.71", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.4", +] + +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dwrote" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +dependencies = [ + "lazy_static", + "libc", + "serde", + "serde_derive", + "winapi", + "wio", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encase" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0265fa0e7bcdb058128cdf7597cdacea42e33911713663a04d971a39cad16afa" +dependencies = [ + "const_panic", + "encase_derive", + "glam", + "thiserror", +] + +[[package]] +name = "encase_derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b6f7502bafc52a60b5582560a2aaee16921eef79a742ae48dd411fe7a9263b" +dependencies = [ + "encase_derive_impl", +] + +[[package]] +name = "encase_derive_impl" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b36f2ddfca91251bed7f931f24b192e4eaf0a0e0fa70cf81cfb1416a1973620e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[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 = "expat-sys" +version = "2.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" +dependencies = [ + "cmake", + "pkg-config", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "fern" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +dependencies = [ + "log", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "freetype-rs" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" +dependencies = [ + "bitflags 1.3.2", + "freetype-sys", + "libc", +] + +[[package]] +name = "freetype-sys" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" +dependencies = [ + "cmake", + "libc", + "pkg-config", +] + +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generator" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186014d53bc231d0090ef8d6f03e0920c54d85a5ed22f4f2f74315ec56cf83fb" +dependencies = [ + "cc", + "cfg-if", + "libc", + "log", + "rustversion", + "windows 0.54.0", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glam" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444c9ad294fdcaf20ccf6726b78f380b5450275540c9b68ab62f49726ad1c713" +dependencies = [ + "cgl", + "cocoa 0.24.1", + "core-foundation", + "glutin_egl_sys", + "glutin_gles2_sys", + "glutin_glx_sys", + "glutin_wgl_sys 0.1.5", + "libloading 0.7.4", + "log", + "objc", + "once_cell", + "osmesa-sys", + "parking_lot", + "raw-window-handle 0.5.2", + "wayland-client 0.29.5", + "wayland-egl", + "winapi", + "winit 0.27.5", +] + +[[package]] +name = "glutin_egl_sys" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68900f84b471f31ea1d1355567eb865a2cf446294f06cef8d653ed7bcf5f013d" +dependencies = [ + "gl_generator", + "winapi", +] + +[[package]] +name = "glutin_gles2_sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094e708b730a7c8a1954f4f8a31880af00eb8a1c5b5bf85d28a0a3c6d69103" +dependencies = [ + "gl_generator", + "objc", +] + +[[package]] +name = "glutin_glx_sys" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93d0575865098580c5b3a423188cd959419912ea60b1e48e8b3b526f6d02468" +dependencies = [ + "gl_generator", + "x11-dl", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3da5951a1569dbab865c6f2a863efafff193a93caf05538d193e9e3816d21696" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.6.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "gpu-allocator" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" +dependencies = [ + "log", + "presser", + "thiserror", + "winapi", + "windows 0.52.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" +dependencies = [ + "bitflags 2.6.0", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "gzip-header" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95cc527b92e6029a62960ad99aa8a6660faa4555fe5f731aab13aa6a921795a2" +dependencies = [ + "crc32fast", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" +dependencies = [ + "bitflags 2.6.0", + "com", + "libc", + "libloading 0.8.4", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "hlsl-snapshots" +version = "0.1.0" +dependencies = [ + "anyhow", + "nanoserde", +] + +[[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 = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2", + "dispatch", + "objc2", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[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 = "if_chain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", + "png", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "arbitrary", + "equivalent", + "hashbrown", + "serde", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.4", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "ktx2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87d65e08a9ec02e409d27a0139eaa6b9756b4d81fe7cde71f6941a83730ce838" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +dependencies = [ + "cfg-if", + "windows-targets 0.52.5", +] + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libtest-mimic" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d8de370f98a6cb8a4606618e53e802f93b094ddec0f96988eaec2c27e6e9ce7" +dependencies = [ + "clap", + "termcolor", + "threadpool", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "loom" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "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 = "naga" +version = "22.1.0" +dependencies = [ + "arbitrary", + "arrayvec 0.7.4", + "bit-set", + "bitflags 2.6.0", + "cfg_aliases", + "codespan-reporting", + "diff", + "env_logger", + "hexf-parse", + "hlsl-snapshots", + "indexmap", + "log", + "petgraph", + "pp-rs", + "ron", + "rspirv", + "rustc-hash", + "serde", + "spirv 0.3.0+sdk-1.3.268.0", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "naga-cli" +version = "22.0.0" +dependencies = [ + "anyhow", + "argh", + "bincode", + "codespan-reporting", + "env_logger", + "naga", +] + +[[package]] +name = "naga-fuzz" +version = "0.0.0" +dependencies = [ + "arbitrary", + "libfuzzer-sys", + "naga", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "nanoserde" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de9cf844ab1e25a0353525bd74cb889843a6215fa4a0d156fd446f4857a1b99" +dependencies = [ + "nanoserde-derive", +] + +[[package]] +name = "nanoserde-derive" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e943b2c21337b7e3ec6678500687cdc741b7639ad457f234693352075c082204" + +[[package]] +name = "ndk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys 0.4.1+23.1.7779620", + "num_enum 0.5.11", + "raw-window-handle 0.5.2", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.2", + "raw-window-handle 0.6.2", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-glue" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" +dependencies = [ + "libc", + "log", + "ndk 0.7.0", + "ndk-context", + "ndk-macro", + "ndk-sys 0.4.1+23.1.7779620", + "once_cell", + "parking_lot", +] + +[[package]] +name = "ndk-macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" +dependencies = [ + "darling", + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ndk-sys" +version = "0.4.1+23.1.7779620" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "noise" +version = "0.8.2" +source = "git+https://github.com/Razaekel/noise-rs.git?rev=c6942d4fb70af26db4441edcf41f90fa115333f2#c6942d4fb70af26db4441edcf41f90fa115333f2" +dependencies = [ + "num-traits", + "rand", + "rand_xorshift", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", + "rand", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive 0.7.2", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "nv-flip" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec3c68ac226790270de1d9d0eb5853832d82a34b62199ab2a1a4756df1a1974" +dependencies = [ + "nv-flip-sys", +] + +[[package]] +name = "nv-flip-sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "932e1eed40002ba70fccac6dab3b64be3301607c3ee88bd14989c4d4e1c1c993" +dependencies = [ + "cc", +] + +[[package]] +name = "obj" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059c95245738cdc7b40078cdd51a23200252a4c0a0a6dd005136152b3f467a4a" + +[[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-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "object" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oorandom" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox", +] + +[[package]] +name = "osmesa-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" +dependencies = [ + "shared_library", +] + +[[package]] +name = "outref" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" + +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" +dependencies = [ + "ttf-parser", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.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 = [ + "backtrace", + "cfg-if", + "libc", + "petgraph", + "redox_syscall 0.5.1", + "smallvec", + "thread-id", + "windows-targets 0.52.5", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "player" +version = "22.1.0" +dependencies = [ + "env_logger", + "log", + "raw-window-handle 0.6.2", + "ron", + "serde", + "wgpu-core", + "wgpu-types", + "winit 0.29.15", +] + +[[package]] +name = "plotters" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" + +[[package]] +name = "plotters-svg" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[package]] +name = "pp-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-rules" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f" +dependencies = [ + "proc-macro-rules-macros", + "proc-macro2", + "syn 2.0.71", +] + +[[package]] +name = "proc-macro-rules-macros" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "207fffb0fe655d1d47f6af98cc2793405e85929bdbc420d685554ff07be27ac7" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "raw-window-handle" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" +dependencies = [ + "cty", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[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.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regex" +version = "1.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "renderdoc-sys" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.6.0", + "serde", + "serde_derive", +] + +[[package]] +name = "rspirv" +version = "0.11.0+sdk-1.2.198" +source = "git+https://github.com/gfx-rs/rspirv?rev=b969f175d5663258b4891e44b76c1544da9661ab#b969f175d5663258b4891e44b76c1544da9661ab" +dependencies = [ + "rustc-hash", + "spirv 0.2.0+sdk-1.2.198", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.23", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "safe_arch" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sctk-adwaita" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339" +dependencies = [ + "crossfont", + "log", + "smithay-client-toolkit 0.16.1", + "tiny-skia 0.7.0", +] + +[[package]] +name = "sctk-adwaita" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +dependencies = [ + "ab_glyph", + "log", + "memmap2 0.9.4", + "smithay-client-toolkit 0.18.1", + "tiny-skia 0.11.4", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "serde_json" +version = "1.0.120" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_v8" +version = "0.181.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd25bb66a20a1a405fb3733aaaf8a8a77a14fd55c8f5fd9db2a2e95bbd7eeab9" +dependencies = [ + "bytes", + "num-bigint", + "serde", + "smallvec", + "thiserror", + "v8", +] + +[[package]] +name = "servo-fontconfig" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" +dependencies = [ + "libc", + "servo-fontconfig-sys", +] + +[[package]] +name = "servo-fontconfig-sys" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" +dependencies = [ + "expat-sys", + "freetype-sys", + "pkg-config", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shared_library" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11" +dependencies = [ + "lazy_static", + "libc", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-abstraction" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" +dependencies = [ + "outref 0.1.0", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smithay-client-toolkit" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" +dependencies = [ + "bitflags 1.3.2", + "calloop 0.10.6", + "dlib", + "lazy_static", + "log", + "memmap2 0.5.10", + "nix 0.24.3", + "pkg-config", + "wayland-client 0.29.5", + "wayland-cursor 0.29.5", + "wayland-protocols 0.29.5", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.6.0", + "calloop 0.12.4", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-csd-frame", + "wayland-cursor 0.31.1", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr", + "wayland-scanner 0.31.1", + "xkeysym", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "sourcemap" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7768edd06c02535e0d50653968f46e1e0d3aa54742190d35dd9466f59de9c71" +dependencies = [ + "base64-simd 0.7.0", + "data-encoding", + "debugid", + "if_chain", + "rustc_version 0.2.3", + "serde", + "serde_json", + "unicode-id-start", + "url", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+sdk-1.2.198" +source = "git+https://github.com/gfx-rs/rspirv?rev=b969f175d5663258b4891e44b76c1544da9661ab#b969f175d5663258b4891e44b76c1544da9661ab" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.6.0", + "serde", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.71", +] + +[[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.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "thread-id" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" +dependencies = [ + "libc", + "winapi", +] + +[[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 = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "tiny-skia" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "bytemuck", + "cfg-if", + "png", + "safe_arch", + "tiny-skia-path 0.7.0", +] + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "bytemuck", + "cfg-if", + "log", + "tiny-skia-path 0.11.4", +] + +[[package]] +name = "tiny-skia-path" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c" +dependencies = [ + "arrayref", + "bytemuck", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracy-client" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fb931a64ff88984f86d3e9bcd1ae8843aa7fe44dd0f8097527bc172351741d" +dependencies = [ + "loom", + "once_cell", + "tracy-client-sys", +] + +[[package]] +name = "tracy-client-sys" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d104d610dfa9dd154535102cc9c6164ae1fa37842bc2d9e83f9ac82b0ae0882" +dependencies = [ + "cc", +] + +[[package]] +name = "ttf-parser" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a" + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-ucd-ident" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-id-start" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc3882f69607a2ac8cc4de3ee7993d8f68bb06f2974271195065b3bd07f2edea" + +[[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 = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlpattern" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" +dependencies = [ + "derive_more", + "regex", + "serde", + "unic-ucd-ident", + "url", +] + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "v8" +version = "0.89.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe2197fbef82c98f7953d13568a961d4e1c663793b5caf3c74455a13918cdf33" +dependencies = [ + "bitflags 2.6.0", + "fslock", + "gzip-header", + "home", + "miniz_oxide", + "once_cell", + "which", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] +name = "walkdir" +version = "2.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 = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.71", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b" +dependencies = [ + "console_error_panic_hook", + "js-sys", + "scoped-tls", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-macro" +version = "0.3.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "wayland-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.3", +] + +[[package]] +name = "wayland-client" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "libc", + "nix 0.24.3", + "scoped-tls", + "wayland-commons", + "wayland-scanner 0.29.5", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-client" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +dependencies = [ + "bitflags 2.6.0", + "rustix", + "wayland-backend", + "wayland-scanner 0.31.1", +] + +[[package]] +name = "wayland-commons" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +dependencies = [ + "nix 0.24.3", + "once_cell", + "smallvec", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.6.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +dependencies = [ + "nix 0.24.3", + "wayland-client 0.29.5", + "xcursor", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +dependencies = [ + "rustix", + "wayland-client 0.31.2", + "xcursor", +] + +[[package]] +name = "wayland-egl" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "402de949f81a012926d821a2d659f930694257e76dd92b6e0042ceb27be4107d" +dependencies = [ + "wayland-client 0.29.5", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +dependencies = [ + "bitflags 1.3.2", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-scanner 0.29.5", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-scanner 0.31.1", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-protocols 0.31.2", + "wayland-scanner 0.31.1", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-protocols 0.31.2", + "wayland-scanner 0.31.1", +] + +[[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-scanner" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +dependencies = [ + "dlib", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "wgpu" +version = "22.1.0" +dependencies = [ + "arrayvec 0.7.4", + "cfg_aliases", + "document-features", + "js-sys", + "log", + "naga", + "parking_lot", + "profiling", + "raw-window-handle 0.6.2", + "serde", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-benchmark" +version = "22.1.0" +dependencies = [ + "bincode", + "bytemuck", + "criterion", + "naga", + "nanorand", + "once_cell", + "pollster", + "profiling", + "rayon", + "tracy-client", + "wgpu", +] + +[[package]] +name = "wgpu-core" +version = "22.1.0" +dependencies = [ + "arrayvec 0.7.4", + "bit-vec", + "bitflags 2.6.0", + "bytemuck", + "cfg_aliases", + "document-features", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle 0.6.2", + "ron", + "rustc-hash", + "serde", + "smallvec", + "thiserror", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-examples" +version = "22.1.0" +dependencies = [ + "bytemuck", + "cfg-if", + "console_error_panic_hook", + "console_log", + "encase", + "env_logger", + "fern", + "flume", + "getrandom", + "glam", + "ktx2", + "log", + "nanorand", + "noise", + "obj", + "png", + "pollster", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test", + "web-sys", + "web-time", + "wgpu", + "wgpu-test", + "winit 0.29.15", +] + +[[package]] +name = "wgpu-hal" +version = "22.0.0" +dependencies = [ + "android_system_properties", + "arrayvec 0.7.4", + "ash", + "bit-set", + "bitflags 2.6.0", + "block", + "cfg-if", + "cfg_aliases", + "core-graphics-types", + "d3d12", + "env_logger", + "glam", + "glow", + "glutin", + "glutin_wgl_sys 0.6.0", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.7.4", + "log", + "metal", + "naga", + "ndk-sys 0.5.0+25.2.9519653", + "objc", + "once_cell", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle 0.6.2", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", + "winit 0.29.15", +] + +[[package]] +name = "wgpu-info" +version = "22.1.0" +dependencies = [ + "anyhow", + "bitflags 2.6.0", + "env_logger", + "pico-args", + "serde", + "serde_json", + "wgpu", +] + +[[package]] +name = "wgpu-macros" +version = "22.1.0" +dependencies = [ + "heck 0.5.0", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "wgpu-test" +version = "22.1.0" +dependencies = [ + "anyhow", + "arrayvec 0.7.4", + "bitflags 2.6.0", + "bytemuck", + "cfg-if", + "console_log", + "ctor", + "env_logger", + "futures-lite", + "image", + "itertools", + "js-sys", + "libtest-mimic", + "log", + "nv-flip", + "parking_lot", + "png", + "pollster", + "profiling", + "serde", + "serde_json", + "strum", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test", + "web-sys", + "wgpu", + "wgpu-macros", + "wgpu-types", +] + +[[package]] +name = "wgpu-types" +version = "22.0.0" +dependencies = [ + "bitflags 2.6.0", + "js-sys", + "serde", + "serde_json", + "web-sys", +] + +[[package]] +name = "which" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[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-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winit" +version = "0.27.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" +dependencies = [ + "bitflags 1.3.2", + "cocoa 0.24.1", + "core-foundation", + "core-graphics 0.22.3", + "dispatch", + "instant", + "libc", + "log", + "mio", + "ndk 0.7.0", + "ndk-glue", + "objc", + "once_cell", + "parking_lot", + "percent-encoding", + "raw-window-handle 0.4.3", + "raw-window-handle 0.5.2", + "sctk-adwaita 0.4.3", + "smithay-client-toolkit 0.16.1", + "wasm-bindgen", + "wayland-client 0.29.5", + "wayland-protocols 0.29.5", + "web-sys", + "windows-sys 0.36.1", + "x11-dl", +] + +[[package]] +name = "winit" +version = "0.29.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.6.0", + "bytemuck", + "calloop 0.12.4", + "cfg_aliases", + "core-foundation", + "core-graphics 0.23.2", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2 0.9.4", + "ndk 0.8.0", + "ndk-sys 0.5.0+25.2.9519653", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle 0.6.2", + "redox_syscall 0.3.5", + "rustix", + "sctk-adwaita 0.8.1", + "smithay-client-toolkit 0.18.1", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-protocols 0.31.2", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading 0.8.4", + "once_cell", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.6.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", +] diff --git a/pkgs/by-name/wg/wgpu/package.nix b/pkgs/by-name/wg/wgpu/package.nix new file mode 100644 index 0000000000000..6fd675b167950 --- /dev/null +++ b/pkgs/by-name/wg/wgpu/package.nix @@ -0,0 +1,65 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + nix-update-script, + cmake, + pkg-config, + fontconfig, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "wgpu"; + version = "22.1.0"; + + src = fetchFromGitHub { + owner = "gfx-rs"; + repo = "wgpu"; + rev = "refs/tags/wgpu-v${version}"; + hash = "sha256-Gtq0xYZoWNwW+BKVLqVVKGqc+4HjaD7NN1hlzyFP5g0="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "noise-0.8.2" = "sha256-7GvShJeSNfwMCBIfqLghXgKQv7EDMqVchJw0uxPhNr4="; + "rspirv-0.11.0+sdk-1.2.198" = "sha256-AcJqkcXBr/+SHdUDXd63sQ0h5eosMqRhV4aUREJH8Bw="; + }; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = + [ + fontconfig + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreServices + QuartzCore + AppKit + ] + ); + + #requires GPU + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://wgpu.rs/"; + description = "Cross-platform, safe, pure-Rust graphics API."; + changelog = "https://github.com/gfx-rs/wgpu/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = with lib.licenses; [ + mit + apsl20 + ]; + }; +} diff --git a/pkgs/by-name/wh/whatsie/package.nix b/pkgs/by-name/wh/whatsie/package.nix new file mode 100644 index 0000000000000..4dd6616668030 --- /dev/null +++ b/pkgs/by-name/wh/whatsie/package.nix @@ -0,0 +1,58 @@ +{ + fetchFromGitHub, + lib, + stdenv, + libX11, + libxcb, + qt5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "whatsie"; + version = "4.15.5"; + + src = fetchFromGitHub { + owner = "keshavbhatt"; + repo = "whatsie"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-6tczt9oPtcKvA59YqRHGOE2VFQLRNbyHpCJ6b4kzgks="; + }; + + sourceRoot = "${finalAttrs.src.name}/src"; + + buildInputs = [ + libX11 + libxcb + qt5.qtwebengine + ]; + + nativeBuildInputs = [ + qt5.wrapQtAppsHook + qt5.qmake + ]; + + strictDeps = false; + + enableParallelBuilding = true; + + preBuild = '' + export QT_WEBENGINE_ICU_DATA_DIR=${qt5.qtwebengine.out}/resources + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 whatsie -t $out/bin + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/keshavbhatt/whatsie"; + description = "Feature rich WhatsApp Client for Desktop Linux"; + license = lib.licenses.mit; + mainProgram = "whatsie"; + maintainers = with lib.maintainers; [ ajgon ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/wh/when-cli/package.nix b/pkgs/by-name/wh/when-cli/package.nix new file mode 100644 index 0000000000000..a15a99edf8e68 --- /dev/null +++ b/pkgs/by-name/wh/when-cli/package.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchCrate, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "when-cli"; + version = "0.4.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-LWssrLl2HKul24N3bJdf2ePqeR4PCROrTiVY5sqzB2M="; + }; + + cargoHash = "sha256-9emY0yhAKVzuk1Tlzi0kW8oR9jRqLdg8wbTcJMBrxMw="; + + meta = { + description = "Command line tool for converting between timezones"; + homepage = "https://github.com/mitsuhiko/when"; + mainProgram = "when"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ loicreynier ]; + }; +} diff --git a/pkgs/tools/networking/wifish/default.nix b/pkgs/by-name/wi/wifish/package.nix similarity index 100% rename from pkgs/tools/networking/wifish/default.nix rename to pkgs/by-name/wi/wifish/package.nix diff --git a/pkgs/by-name/wi/wiliwili/package.nix b/pkgs/by-name/wi/wiliwili/package.nix index 302b47b65b4e5..85cc143f45f60 100644 --- a/pkgs/by-name/wi/wiliwili/package.nix +++ b/pkgs/by-name/wi/wiliwili/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { curl libxkbcommon dbus - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libffi # needed for wayland wayland egl-wayland @@ -55,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "PLATFORM_DESKTOP" true) (lib.cmakeBool "INSTALL" true) - (lib.cmakeBool "GLFW_BUILD_WAYLAND" stdenv.isLinux) - (lib.cmakeBool "GLFW_BUILD_X11" stdenv.isLinux) + (lib.cmakeBool "GLFW_BUILD_WAYLAND" stdenv.hostPlatform.isLinux) + (lib.cmakeBool "GLFW_BUILD_X11" stdenv.hostPlatform.isLinux) # Otherwise cpr cmake will try to download zlib (lib.cmakeBool "CPR_FORCE_USE_SYSTEM_CURL" true) ]; diff --git a/pkgs/by-name/wi/win-pvdrivers/package.nix b/pkgs/by-name/wi/win-pvdrivers/package.nix new file mode 100644 index 0000000000000..275dd5e21205a --- /dev/null +++ b/pkgs/by-name/wi/win-pvdrivers/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: + +let + # Upstream versioned download links are broken + # NOTE: the archive.org timestamp must be updated if the version changes. + # See https://xenproject.org/downloads/ + files = [ + { + url = "https://web.archive.org/web/20230817070451if_/https://xenbits.xenproject.org/pvdrivers/win/xenbus.tar"; + hash = "sha256-sInkbVL/xkoUeZxgknLM3e2AXBVSqItF2Vpkon53Xec="; + } + { + url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xencons.tar"; + hash = "sha256-r8bxH5B4y0V9qgALi42KtpZW05UOevv29AqqXaIXMBo="; + } + { + url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenhid.tar"; + hash = "sha256-e7ztzaXi/6irMus9IH0cfbW5HiKSaybXV1C/rd5mEfA="; + } + { + url = "https://web.archive.org/web/20230817071133if_/https://xenbits.xenproject.org/pvdrivers/win/xeniface.tar"; + hash = "sha256-qPM0TjcGR2luPtOSAfXJ22k6yhwJOmOP3ot6kopEFsI="; + } + { + url = "https://web.archive.org/web/20230817071134if_/https://xenbits.xenproject.org/pvdrivers/win/xennet.tar"; + hash = "sha256-Vg1wSfXjIVRd2iXCa19W4Jdaf2LTVin0yac/D70UjPM="; + } + { + url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenvbd.tar"; + hash = "sha256-nLNM0TWqsEWiQBCYxARMldvRecRUcY5DBF5DNAG4490="; + } + { + url = "https://web.archive.org/web/20230817071225if_/https://xenbits.xenproject.org/pvdrivers/win/xenvif.tar"; + hash = "sha256-R8G5vG6Q4g0/UkA2oxcc9/jaHZQYb+u64NShCNt7s7U="; + } + { + url = "https://web.archive.org/web/20230817071153if_/https://xenbits.xenproject.org/pvdrivers/win/xenvkbd.tar"; + hash = "sha256-CaSxCKnT/KaZw8Ma60g2z+4lOOWIRisGRtzMveQqQmM="; + } + ]; + +in +stdenvNoCC.mkDerivation { + pname = "win-pvdrivers"; + version = "unstable-2023-08-17"; + + srcs = map ( + { hash, url }: + fetchurl { + inherit hash url; + # Wait & retry up to 3 times as archive.org can closes connection + # when an HTTP client makes too many requests + curlOpts = "--retry 3 --retry-delay 5"; + } + ) files; + + unpackPhase = '' + runHook preUnpack + + for _src in $srcs; do + mkdir -p $out + tar xfv $_src -C $out + done + + runHook postUnpack + ''; + + meta = with lib; { + description = "Xen Subproject: Windows PV Drivers"; + homepage = "https://xenproject.org/developers/teams/windows-pv-drivers/"; + license = licenses.bsd2; + maintainers = with maintainers; [ anthonyroussel ]; + platforms = platforms.linux; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/wi/win2xcur/package.nix b/pkgs/by-name/wi/win2xcur/package.nix index 94dcfb935f431..ee4ab9875a449 100644 --- a/pkgs/by-name/wi/win2xcur/package.nix +++ b/pkgs/by-name/wi/win2xcur/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { owner = "quantum5"; repo = "win2xcur"; rev = "v${version}"; - sha256 = "sha256-OjLj+QYg8YOJzDq3Y6/uyEXlNWbPm8VA/b1yP9jT6Jo="; + hash = "sha256-OjLj+QYg8YOJzDq3Y6/uyEXlNWbPm8VA/b1yP9jT6Jo="; }; propagatedBuildInputs = with python3Packages; [ numpy wand ]; diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix new file mode 100644 index 0000000000000..a3c9a7b83a9ac --- /dev/null +++ b/pkgs/by-name/wi/winbox4/package.nix @@ -0,0 +1,126 @@ +{ + autoPatchelfHook, + copyDesktopItems, + fetchurl, + fontconfig, + freetype, + lib, + libGL, + libxkbcommon, + makeDesktopItem, + makeWrapper, + stdenvNoCC, + unzip, + writeShellApplication, + xorg, + zlib, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "winbox"; + version = "4.0beta9"; + + src = fetchurl { + name = "WinBox_Linux-${finalAttrs.version}.zip"; + url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/WinBox_Linux.zip"; + hash = "sha256-129ejj3WxYx5kQTy6EOLtBolhx076yMVb5ymkAoXrwc="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + # makeBinaryWrapper does not support --run + makeWrapper + unzip + ]; + + buildInputs = [ + fontconfig + freetype + libGL + libxkbcommon + xorg.libxcb + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm + zlib + ]; + + installPhase = '' + runHook preInstall + + install -Dm644 "assets/img/winbox.png" "$out/share/pixmaps/winbox.png" + install -Dm755 "WinBox" "$out/bin/WinBox" + + wrapProgram "$out/bin/WinBox" --run "${lib.getExe finalAttrs.migrationScript}" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "winbox"; + desktopName = "Winbox"; + comment = "GUI administration for Mikrotik RouterOS"; + exec = "WinBox"; + icon = "winbox"; + categories = [ "Utility" ]; + }) + ]; + + migrationScript = writeShellApplication { + name = "winbox-migrate"; + text = '' + XDG_DATA_HOME=''${XDG_DATA_HOME:-$HOME/.local/share} + targetFile="$XDG_DATA_HOME/MikroTik/WinBox/Addresses.cdb" + + if [ -f "$targetFile" ]; then + echo "NixOS: WinBox 4 data already present at $(dirname "$targetFile"). Skipping automatic migration." + exit 0 + fi + + # cover both wine prefix variants + # latter was used until https://github.com/NixOS/nixpkgs/pull/329626 was merged on 2024/07/24 + winePrefixes=( + "''${WINEPREFIX:-$HOME/.wine}" + "''${WINBOX_HOME:-$XDG_DATA_HOME/winbox}/wine" + ) + sourceFilePathSuffix="drive_c/users/$USER/AppData/Roaming/Mikrotik/Winbox/Addresses.cdb" + selectedSourceFile="" + + for prefix in "''${winePrefixes[@]}" + do + echo "NixOS: Probing WinBox 3 data path at $prefix..." + if [ -f "$prefix/$sourceFilePathSuffix" ]; then + selectedSourceFile="$prefix/$sourceFilePathSuffix" + break + fi + done + + if [ -z "$selectedSourceFile" ]; then + echo "NixOS: WinBox 3 data not found. Skipping automatic migration." + exit 0 + fi + + echo "NixOS: Automatically migrating WinBox 3 data..." + install -Dvm644 "$selectedSourceFile" "$targetFile" + ''; + }; + + meta = { + description = "Graphical configuration utility for RouterOS-based devices"; + homepage = "https://mikrotik.com"; + downloadPage = "https://mikrotik.com/download"; + changelog = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/CHANGELOG"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + mainProgram = "WinBox"; + maintainers = with lib.maintainers; [ + Scrumplex + yrd + ]; + }; +}) diff --git a/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix b/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix new file mode 100644 index 0000000000000..bd873bd7ba333 --- /dev/null +++ b/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation { + pname = "wine-discord-ipc-bridge"; + version = "unstable-2023-08-09"; + + src = fetchFromGitHub { + owner = "0e4ef622"; + repo = "wine-discord-ipc-bridge"; + rev = "f8198c9d52e708143301017a296f7557c4387127"; + hash = "sha256-tAknITFlG63+gI5cN9SfUIUZkbIq/MgOPoGIcvoNo4Q="; + }; + + postPatch = '' + patchShebangs winediscordipcbridge-steam.sh + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp winediscordipcbridge.exe $out/bin + cp winediscordipcbridge-steam.sh $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Enable games running under wine to use Discord Rich Presence"; + homepage = "https://github.com/0e4ef622/wine-discord-ipc-bridge"; + license = licenses.mit; + maintainers = [ maintainers.uku3lig ]; + mainProgram = "winediscordipcbridge"; + platforms = [ "mingw32" ]; + }; +} diff --git a/pkgs/by-name/wi/wiper/package.nix b/pkgs/by-name/wi/wiper/package.nix index 3eb069de236a1..1540bbda4bc47 100644 --- a/pkgs/by-name/wi/wiper/package.nix +++ b/pkgs/by-name/wi/wiper/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-gYWTv0AXOmpx9Nc8akBMVWkESI0AtnGgvfH9hQZ0peo="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; meta = { description = "Disk analyser and cleanup tool"; diff --git a/pkgs/by-name/wi/wireguard-ui/package.nix b/pkgs/by-name/wi/wireguard-ui/package.nix new file mode 100644 index 0000000000000..b046bdc5a3028 --- /dev/null +++ b/pkgs/by-name/wi/wireguard-ui/package.nix @@ -0,0 +1,81 @@ +{ + buildGoModule, + lib, + fetchFromGitHub, + fetchYarnDeps, + yarn, + fixup-yarn-lock, + nodejs, + fetchpatch2, +}: + +buildGoModule rec { + pname = "wireguard-ui"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "ngoduykhanh"; + repo = "wireguard-ui"; + rev = "refs/tags/v${version}"; + hash = "sha256-fK7l9I2s0zSxG1g1oQ1KjJZUcypwS9DxnNN7lhVI+1s="; + }; + + patches = [ + (fetchpatch2 { + url = "https://github.com/ngoduykhanh/wireguard-ui/commit/2fdafd34ca6c8f7f1415a3a1d89498bb575a7171.patch?full_index=1"; + hash = "sha256-nq/TX+TKDB29NcPQ3pLWD0jcXubULuwqisn9IcEW8B8="; + }) + ]; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-ps/GtdtDKA3y5o1GZpRG+z08lSzk8d9zgxb95kjr/gc="; + }; + + vendorHash = "sha256-FTjZ6wf0ym6kFJ58Z3E3shmbq9SaMwlXWeueHQXwkX4="; + + nativeBuildInputs = [ + yarn + fixup-yarn-lock + nodejs + ]; + + ldflags = [ + "-X main.appVersion=v${version}" + ]; + + preConfigure = '' + # This is what prepare_assets.sh do. + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup-yarn-lock yarn.lock + yarn --offline install + + mkdir -p "./assets/dist/js" "./assets/dist/css" && \ + cp -r "./node_modules/admin-lte/dist/js/adminlte.min.js" "./assets/dist/js/adminlte.min.js" && \ + cp -r "./node_modules/admin-lte/dist/css/adminlte.min.css" "./assets/dist/css/adminlte.min.css" + + cp -r "./custom" "./assets" + + mkdir -p "./assets/plugins" && \ + cp -r "./node_modules/admin-lte/plugins/jquery" \ + "./node_modules/admin-lte/plugins/fontawesome-free" \ + "./node_modules/admin-lte/plugins/bootstrap" \ + "./node_modules/admin-lte/plugins/icheck-bootstrap" \ + "./node_modules/admin-lte/plugins/toastr" \ + "./node_modules/admin-lte/plugins/jquery-validation" \ + "./node_modules/admin-lte/plugins/select2" \ + "./node_modules/jquery-tags-input" \ + "./assets/plugins/" + ''; + + meta = { + description = "Web user interface to manage your WireGuard setup"; + changelog = "https://github.com/ngoduykhanh/wireguard-ui/releases/tag/v${version}"; + homepage = "https://github.com/ngoduykhanh/wireguard-ui"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + mainProgram = "wireguard-ui"; + }; +} diff --git a/pkgs/by-name/wi/wiseunpacker/package.nix b/pkgs/by-name/wi/wiseunpacker/package.nix index f5d42fa68f9f1..ed8825d733277 100644 --- a/pkgs/by-name/wi/wiseunpacker/package.nix +++ b/pkgs/by-name/wi/wiseunpacker/package.nix @@ -15,7 +15,7 @@ buildDotnetModule rec { owner = "mnadareski"; repo = pname; rev = version; - sha256 = "sha256-APbfo2D/p733AwNNByu5MvC9LA8WW4mAzq6t2w/YNrs="; + hash = "sha256-APbfo2D/p733AwNNByu5MvC9LA8WW4mAzq6t2w/YNrs="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index 179b9e47e8b6b..7404dd9063356 100644 --- a/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.30.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "v${version}"; - hash = "sha256-MeozLpwtOFnYxK2H+9bd7nG6BL6jSVqfBCVg1t3lErQ="; + hash = "sha256-+3tWqNdDZagJa9cLSz1OBaPtCr2F1joYyzB//BPqV34="; }; - cargoHash = "sha256-d6oMUAGyIFDWtjgXfIe0k3hx7QTFTfVuKnQ3XRux1HU="; + cargoHash = "sha256-3TrnSU7qXC8INlEZMbYTNwZsqiKMZ6j7tdGmz3DFl1g="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/by-name/wi/with-shell/package.nix similarity index 100% rename from pkgs/applications/misc/with-shell/default.nix rename to pkgs/by-name/wi/with-shell/package.nix diff --git a/pkgs/by-name/wi/wizer/package.nix b/pkgs/by-name/wi/wizer/package.nix index aaa7d5f28ff12..4aaad29db5669 100644 --- a/pkgs/by-name/wi/wizer/package.nix +++ b/pkgs/by-name/wi/wizer/package.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { pname = "wizer"; - version = "7.0.4"; + version = "7.0.5"; # the crate does not contain files which are necessary for the tests # see https://github.com/bytecodealliance/wizer/commit/3a95e27ce42f1fdaef07b52988e4699eaa221e04 @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec { owner = "bytecodealliance"; repo = "wizer"; rev = "refs/tags/v${version}"; - hash = "sha256-KIYgmKZ81oKHu25Iz1iVRZV/xcLnkkD1a5vpV1a38FQ="; + hash = "sha256-bx8V/jaKDpJdWRwYm6GrjsdXQpDyTulRMKVnQZlqLNE="; }; - cargoHash = "sha256-vAHBg1Ogqr8QTfvBhLaIGGsdZ3HjobSwMoJJXfqrcCY="; + cargoHash = "sha256-8iQ6ULdle8tJDPgIoPT9R3jfS32tBBfs4vZNQcV8vfs="; cargoBuildFlags = [ "--bin" pname ]; diff --git a/pkgs/by-name/wl/wl-clip-persist/package.nix b/pkgs/by-name/wl/wl-clip-persist/package.nix index 3b31f14f8c202..cfa8eced287fc 100644 --- a/pkgs/by-name/wl/wl-clip-persist/package.nix +++ b/pkgs/by-name/wl/wl-clip-persist/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ wayland ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Keep Wayland clipboard even after programs close"; homepage = "https://github.com/Linus789/wl-clip-persist"; inherit (wayland.meta) platforms; diff --git a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix new file mode 100644 index 0000000000000..64388cf0b7bec --- /dev/null +++ b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix @@ -0,0 +1,54 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + wayland, + libxkbcommon, + fontconfig, + pkg-config, + autoPatchelfHook, +}: + +rustPlatform.buildRustPackage { + pname = "wl-gammarelay-applet"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "lgbishop"; + repo = "wl-gammarelay-applet"; + rev = "8a0d9e6364d7445fc69c59b2f168cfec91c2fe87"; + sha256 = "sha256-t6bycmaquZ0IMs/WnAzkz5FnIWKIq0BTbeeoUFLeuYg="; + }; + + cargoHash = "sha256-1hJLu/ndnBYdzJ+NjLaCYENFszvAj9MYpLsZyLEq0Sg="; + + nativeBuildInputs = [ + pkg-config + autoPatchelfHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + ]; + + runtimeDependencies = [ + wayland + libxkbcommon + fontconfig.lib + ]; + + meta = { + description = "Control wl-gammarelay-rs via applet"; + longDescription = '' + wl-gammarelay-applet is a small desktop applet for controlling + wl-gammarelay-rs via DBus. This applet is written in Rust and + provides a Slint UI. + ''; + homepage = "https://github.com/lgbishop/wl-gammarelay-applet"; + mainProgram = "wl-gammarelay-applet"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ lgbishop ]; + }; +} diff --git a/pkgs/tools/wayland/wlay/default.nix b/pkgs/by-name/wl/wlay/package.nix similarity index 100% rename from pkgs/tools/wayland/wlay/default.nix rename to pkgs/by-name/wl/wlay/package.nix diff --git a/pkgs/by-name/wl/wlink/package.nix b/pkgs/by-name/wl/wlink/package.nix new file mode 100644 index 0000000000000..2b8e2c4a377fd --- /dev/null +++ b/pkgs/by-name/wl/wlink/package.nix @@ -0,0 +1,52 @@ +{ + stdenv, + lib, + rustPlatform, + fetchCrate, + pkg-config, + libusb1, + udev, + nix-update-script, + testers, + wlink, +}: + +rustPlatform.buildRustPackage rec { + pname = "wlink"; + version = "0.0.9"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-Jr494jsw9nStU88j1rHc3gyQR1jcMfDIyQ2u0SwkXt0="; + }; + + cargoHash = "sha256-rPiSEfRFESYxFOat92oMUABvmz0idZu/I1S7I3g5BgY="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libusb1 + udev + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = wlink; + }; + }; + + meta = with lib; { + description = "WCH-Link flash tool for WCH's RISC-V MCUs(CH32V, CH56X, CH57X, CH58X, CH59X, CH32L103, CH32X035, CH641, CH643)"; + homepage = "https://github.com/ch32-rs/wlink"; + changelog = "https://github.com/ch32-rs/wlink/releases/tag/v${version}"; + license = with licenses; [ + mit # or + asl20 + ]; + platforms = with platforms; linux ++ darwin ++ windows; + broken = !stdenv.hostPlatform.isLinux; + maintainers = with maintainers; [ jwillikers ]; + mainProgram = "wlink"; + }; +} diff --git a/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock b/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock index 2a9c2efe03bfe..ed12ab5dddc3a 100644 --- a/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock +++ b/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock @@ -225,11 +225,11 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.38.0+1.3.281" +version = "0.37.3+1.3.251" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" dependencies = [ - "libloading", + "libloading 0.7.4", ] [[package]] @@ -789,7 +789,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.8.5", ] [[package]] @@ -1264,7 +1264,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading", + "libloading 0.8.5", ] [[package]] @@ -2031,6 +2031,16 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + [[package]] name = "libloading" version = "0.8.5" @@ -2671,7 +2681,7 @@ version = "0.18.0" source = "git+https://github.com/galister/openxrs?rev=af4a55d#af4a55df60125491c80c61464c824219c6019b76" dependencies = [ "libc", - "libloading", + "libloading 0.8.5", "ndk-context", "openxr-sys", ] @@ -3472,12 +3482,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "slabbin" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8305086044614627ed85432d27b87cf9fc047204eaa036a11de6cf0120f273" - [[package]] name = "slice-of-array" version = "0.3.2" @@ -3908,7 +3912,7 @@ dependencies = [ [[package]] name = "vulkano" version = "0.34.0" -source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133" +source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" dependencies = [ "ahash", "ash", @@ -3918,17 +3922,16 @@ dependencies = [ "half", "heck 0.4.1", "indexmap 2.3.0", - "libloading", - "nom", + "libloading 0.8.5", "objc", "once_cell", "parking_lot", "proc-macro2", "quote", "raw-window-handle", + "regex", "serde", "serde_json", - "slabbin", "smallvec", "thread_local", "vk-parse", @@ -3938,7 +3941,7 @@ dependencies = [ [[package]] name = "vulkano-macros" version = "0.34.0" -source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133" +source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2", @@ -3949,7 +3952,7 @@ dependencies = [ [[package]] name = "vulkano-shaders" version = "0.34.0" -source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133" +source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" dependencies = [ "ahash", "heck 0.4.1", @@ -4556,7 +4559,7 @@ dependencies = [ [[package]] name = "wlx-capture" version = "0.3.12" -source = "git+https://github.com/galister/wlx-capture?tag=v0.3.12#14d2b8a13dad62849973fe90bed7be262aa07143" +source = "git+https://github.com/galister/wlx-capture?tag=v0.3.13#c375a7c1d4b57741655a052ebe8af9fb4774f92d" dependencies = [ "ashpd", "drm-fourcc", @@ -4574,7 +4577,7 @@ dependencies = [ [[package]] name = "wlx-overlay-s" -version = "0.4.4" +version = "0.6.0" dependencies = [ "anyhow", "ash", @@ -4644,7 +4647,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading", + "libloading 0.8.5", "once_cell", "rustix", "x11rb-protocol", diff --git a/pkgs/by-name/wl/wlx-overlay-s/package.nix b/pkgs/by-name/wl/wlx-overlay-s/package.nix index fb9404b3c8a40..df7f483bf1aa1 100644 --- a/pkgs/by-name/wl/wlx-overlay-s/package.nix +++ b/pkgs/by-name/wl/wlx-overlay-s/package.nix @@ -28,13 +28,13 @@ rustPlatform.buildRustPackage rec { pname = "wlx-overlay-s"; - version = "0.4.4"; + version = "0.6"; src = fetchFromGitHub { owner = "galister"; repo = "wlx-overlay-s"; rev = "v${version}"; - hash = "sha256-+pWhtaYOzh7LPSCQeUTlU+/IxtcQTqRci9X7xEUV18U="; + hash = "sha256-Gk/3m4eWFZqeQBphBUTGAUqe8SspXqut8n4JM8tTe6o="; }; cargoLock = { @@ -43,8 +43,8 @@ rustPlatform.buildRustPackage rec { "libmonado-rs-0.1.0" = "sha256-ja7OW/YSmfzaQoBhu6tec9v8fyNDknLekE2eY7McLPE="; "openxr-0.18.0" = "sha256-ktkbhmExstkNJDYM/HYOwAwv3acex7P9SP0KMAOKhQk="; "ovr_overlay-0.0.0" = "sha256-5IMEI0IPTacbA/1gibYU7OT6r+Bj+hlQjDZ3Kg0L2gw="; - "vulkano-0.34.0" = "sha256-o1KP/mscMG5j3U3xtei/2nMNEh7jLedcW1P0gL9Y1Rc="; - "wlx-capture-0.3.12" = "sha256-rZTJp7VhUvE/6lwESW2jKeGweFut6BvcxouG/nyl+GE="; + "vulkano-0.34.0" = "sha256-0ZIxU2oItT35IFnS0YTVNmM775x21gXOvaahg/B9sj8="; + "wlx-capture-0.3.12" = "sha256-32WnAnNUSfsAA8WB9da3Wqb4acVlXh6HWsY9tPzCHEE="; }; }; @@ -98,7 +98,7 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ Scrumplex ]; platforms = lib.platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "wlx-overlay-s"; }; } diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index 533f85a3f4a39..51b68e65a2806 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, + buildNpmPackage, fetchFromGitHub, nix-update-script, nixosTests, ... }: - -buildGoModule rec { +let pname = "workout-tracker"; version = "1.18.1"; @@ -18,8 +18,31 @@ buildGoModule rec { hash = "sha256-Sn6SOHrsp1ZgsPntc2+cmlAEPVBUrYv1vKLKAQvT9m4="; }; + assets = buildNpmPackage { + pname = "${pname}-assets"; + inherit version src; + npmDepsHash = "sha256-jHpvCMgjGvaAOfbslaIKfIRiPafScpn3WLnYamm+lbs="; + dontNpmBuild = true; + postPatch = '' + rm Makefile + ''; + installPhase = '' + runHook preInstall + cp -r . "$out" + runHook postInstall + ''; + }; +in +buildGoModule rec { + inherit pname version src; + vendorHash = null; + postPatch = '' + ln -s ${assets}/node_modules ./node_modules + make build-dist + ''; + passthru.updateScript = nix-update-script { }; passthru.tests = { diff --git a/pkgs/by-name/ws/wslay/package.nix b/pkgs/by-name/ws/wslay/package.nix index 45054f8130f15..85f3294ebabe9 100644 --- a/pkgs/by-name/ws/wslay/package.nix +++ b/pkgs/by-name/ws/wslay/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { checkInputs = [ cunit ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH=$(pwd)/lib/.libs ''; diff --git a/pkgs/by-name/ws/wstunnel/Cargo.lock b/pkgs/by-name/ws/wstunnel/Cargo.lock new file mode 100644 index 0000000000000..23168aeacee72 --- /dev/null +++ b/pkgs/by-name/ws/wstunnel/Cargo.lock @@ -0,0 +1,3231 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" + +[[package]] +name = "asn1-rs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "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-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-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "aws-lc-rs" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "untrusted 0.7.1", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bb8" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10cf871f3ff2ce56432fddc2615ac7acc3aa22ca321f8fea800846fbb32f188" +dependencies = [ + "async-trait", + "futures-util", + "parking_lot", + "tokio", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[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 = "bollard" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41711ad46fda47cd701f6908e59d1bd6b9a2b7464c0d0aeab95c6d37096ff8a" +dependencies = [ + "base64 0.22.1", + "bollard-stubs", + "bytes", + "futures-core", + "futures-util", + "hex", + "home", + "http 1.1.0", + "http-body-util", + "hyper", + "hyper-named-pipe", + "hyper-rustls", + "hyper-util", + "hyperlocal", + "log", + "pin-project-lite", + "rustls 0.23.13", + "rustls-native-certs 0.7.3", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "serde", + "serde_derive", + "serde_json", + "serde_repr", + "serde_urlencoded", + "thiserror", + "tokio", + "tokio-util", + "tower-service", + "url", + "winapi", +] + +[[package]] +name = "bollard-stubs" +version = "1.45.0-rc.26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7c5415e3a6bc6d3e99eff6268e488fd4ee25e7b28c10f08fa6760bd9de16e4" +dependencies = [ + "serde", + "serde_repr", + "serde_with", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" + +[[package]] +name = "cc" +version = "1.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "serde", + "windows-targets 0.52.6", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "cmake" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +dependencies = [ + "cc", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "mio 1.0.2", + "parking_lot", + "rustix", + "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 = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "docker_credential" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31951f49556e34d90ed28342e1df7e1cb7a229c4cab0aecc627b5d91edd41d07" +dependencies = [ + "base64 0.21.7", + "serde", + "serde_json", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "enum-as-inner" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[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 = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener", + "pin-project-lite", +] + +[[package]] +name = "fast-socks5" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89f36d4ee12370d30d57b16c7e190950a1a916e7dbbb5fd5a412f5ef913fe84" +dependencies = [ + "anyhow", + "async-trait", + "log", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "fastwebsockets" +version = "0.8.0" +source = "git+https://github.com/erebe/fastwebsockets.git#ef904598ec168d7748b28d77ec1803ba721932d8" +dependencies = [ + "base64 0.21.7", + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "pin-project", + "rand", + "sha1", + "simdutf8", + "thiserror", + "tokio", + "utf-8", +] + +[[package]] +name = "filetime" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +dependencies = [ + "cfg-if", + "libc", + "libredox", + "windows-sys 0.59.0", +] + +[[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 = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.6.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.6.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hickory-proto" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" +dependencies = [ + "async-trait", + "bytes", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "rustls-pemfile 1.0.4", + "thiserror", + "tinyvec", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "smallvec", + "thiserror", + "tokio", + "tokio-rustls 0.24.1", + "tracing", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-named-pipe" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" +dependencies = [ + "hex", + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", + "winapi", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper", + "hyper-util", + "rustls 0.23.13", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "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.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "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.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.0", + "serde", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2", + "widestring", + "windows-sys 0.48.0", + "winreg", +] + +[[package]] +name = "ipnet" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +dependencies = [ + "serde", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[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.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jsonwebtoken" +version = "9.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +dependencies = [ + "base64 0.21.7", + "js-sys", + "ring", + "serde", + "serde_json", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.5.7", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "log", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "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 = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.6.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio 0.8.11", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[package]] +name = "oid-registry" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" +dependencies = [ + "asn1-rs", +] + +[[package]] +name = "once_cell" +version = "1.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.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 0.5.7", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "parse-display" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914a1c2265c98e2446911282c6ac86d8524f495792c38c5bd884f80499c7538a" +dependencies = [ + "parse-display-derive", + "regex", + "regex-syntax 0.8.5", +] + +[[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 0.8.5", + "structmeta", + "syn", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppp" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d901d7dd743c478e14af9518bdbc33e53e50be56429233f812537f29dbf0d1" +dependencies = [ + "thiserror", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rcgen" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779" +dependencies = [ + "aws-lc-rs", + "ring", + "rustls-pki-types", + "time", + "yasna", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regex" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname", + "quick-error", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.23.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +dependencies = [ + "aws-lc-rs", + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.2.0", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted 0.9.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "aws-lc-rs", + "ring", + "rustls-pki-types", + "untrusted 0.9.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 = "schannel" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted 0.9.0", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_regex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" +dependencies = [ + "regex", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9720086b3357bcb44fce40117d769a4d068c70ecfa190850a980a71755f66fcc" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.6.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f1abbfe725f27678f4663bcacb75a83e829fd464c25d78dd038a3a29e307cec" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.6.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio 1.0.2", + "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 = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "structmeta" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" +dependencies = [ + "proc-macro2", + "quote", + "structmeta-derive", + "syn", +] + +[[package]] +name = "structmeta-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "testcontainers" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f40cc2bd72e17f328faf8ca7687fe337e61bccd8acf9674fa78dd3792b045e1" +dependencies = [ + "async-trait", + "bollard", + "bollard-stubs", + "bytes", + "docker_credential", + "either", + "etcetera", + "futures", + "log", + "memchr", + "parse-display", + "pin-project-lite", + "serde", + "serde_json", + "serde_with", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tar", + "tokio-util", + "url", +] + +[[package]] +name = "thiserror" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio 1.0.2", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-fd" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cedf0b897610a4baff98bf6116c060c5cfe7574d4339c50e9d23fe09377641d" +dependencies = [ + "libc", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.13", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tar" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" +dependencies = [ + "filetime", + "futures-core", + "libc", + "redox_syscall 0.3.5", + "tokio", + "tokio-stream", + "xattr", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "time", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-bidi" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wstunnel" +version = "10.1.3" +dependencies = [ + "ahash", + "anyhow", + "async-channel", + "async-trait", + "base64 0.22.1", + "bb8", + "bytes", + "clap", + "crossterm", + "fast-socks5", + "fastwebsockets", + "futures-util", + "hickory-resolver", + "http-body-util", + "hyper", + "hyper-util", + "ipnet", + "jsonwebtoken", + "log", + "nix", + "notify", + "parking_lot", + "pin-project", + "ppp", + "rcgen", + "regex", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.2.0", + "scopeguard", + "serde", + "serde_regex", + "serde_yaml", + "socket2", + "testcontainers", + "tokio", + "tokio-fd", + "tokio-rustls 0.26.0", + "tokio-stream", + "tokio-util", + "tracing", + "tracing-subscriber", + "url", + "urlencoding", + "uuid", + "x509-parser", +] + +[[package]] +name = "x509-parser" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +dependencies = [ + "asn1-rs", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ + "time", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index 46b9723e9559c..1ea48259ebce7 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -2,13 +2,15 @@ lib, fetchFromGitHub, rustPlatform, + stdenv, nixosTests, nix-update-script, versionCheckHook, + darwin, }: let - version = "10.1.0"; + version = "10.1.3"; in rustPlatform.buildRustPackage { @@ -19,12 +21,20 @@ rustPlatform.buildRustPackage { owner = "erebe"; repo = "wstunnel"; rev = "v${version}"; - hash = "sha256-nOks9OMA0z7e1nYnKxkSmEj5GXP00385E+jr67lzS5c="; + hash = "sha256-mrCDx9f+EeA6McRc1s9YwYL4RHKSla10fxXZc1WYPio="; }; - cargoHash = "sha256-QJ5Fb1M5CLDd2bZPy2p9zqh2A9KIoHp7PA1fxX2RDjI="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "fastwebsockets-0.8.0" = "sha256-eqtCh9fMOG2uvL/GLUVXNiSB+ovYLc/Apuq9zssn8hU="; + }; + }; nativeBuildInputs = [ versionCheckHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; doInstallCheck = true; diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix index b844b826a932a..0110caec8e50a 100644 --- a/pkgs/by-name/wt/wttrbar/package.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fuLKWooXn966RORH20D9wwbjNtyLEZOO8Y8RcjsFwqM="; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); cargoHash = "sha256-Of1tHKIL2XbzA6YFxtvaP9sa+KMw8uJTFG0n84g2Eog="; diff --git a/pkgs/by-name/wt/wtwitch/package.nix b/pkgs/by-name/wt/wtwitch/package.nix index 0035e184540c3..73bfe1c3fd626 100644 --- a/pkgs/by-name/wt/wtwitch/package.nix +++ b/pkgs/by-name/wt/wtwitch/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { install -Dm755 src/wtwitch $out/bin/wtwitch wrapProgram $out/bin/wtwitch \ --set-default LANG en_US.UTF-8 \ - --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isLinux [ vlc ] ++ [ + --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ vlc ] ++ [ bash coreutils-prefixed curl diff --git a/pkgs/by-name/wu/wush/package.nix b/pkgs/by-name/wu/wush/package.nix new file mode 100644 index 0000000000000..346d268f49327 --- /dev/null +++ b/pkgs/by-name/wu/wush/package.nix @@ -0,0 +1,36 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, +}: +let + version = "0.3.0"; +in +buildGoModule { + pname = "wush"; + inherit version; + + src = fetchFromGitHub { + owner = "coder"; + repo = "wush"; + rev = "v${version}"; + hash = "sha256-2mFe1p15HRyy86pw5LoBtiW9lKrw/N9V81/jkiT4jo4="; + }; + + vendorHash = "sha256-Po1DDKP9ekScRDGMjCXZr9HUUwFenQx3bzIZrNI+ctY="; + + ldflags = [ + "-s -w -X main.version=${version}" + ]; + + CGO_ENABLED = 0; + + meta = with lib; { + homepage = "https://github.com/coder/wush"; + description = "Transfer files between computers via WireGuard"; + changelog = "https://github.com/coder/wush/releases/tag/v${version}"; + license = licenses.cc0; + mainProgram = "wush"; + maintainers = with maintainers; [ abbe ]; + }; +} diff --git a/pkgs/by-name/wy/wyoming-satellite/package.nix b/pkgs/by-name/wy/wyoming-satellite/package.nix index f23a5864b452f..bfd0e49f6f711 100644 --- a/pkgs/by-name/wy/wyoming-satellite/package.nix +++ b/pkgs/by-name/wy/wyoming-satellite/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { zeroconf ]; - passthru.optional-dependencies = { + optional-dependencies = { silerovad = with python3Packages; [ pysilero-vad ]; diff --git a/pkgs/by-name/x1/x16/package.nix b/pkgs/by-name/x1/x16/package.nix index 5f53898b338cb..26a12e480e7fc 100644 --- a/pkgs/by-name/x1/x16/package.nix +++ b/pkgs/by-name/x1/x16/package.nix @@ -8,18 +8,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-emulator"; - version = "47"; + version = "48"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-emulator"; rev = "r${finalAttrs.version}"; - hash = "sha256-v7INa0Xpq7WlrSqc6VNBwLQPUoloqsGbv5rd/VTQtUg="; + hash = "sha256-E4TosRoORCWLotOIXROP9oqwqo1IRSa6X13GnmuxE9A="; }; postPatch = '' substituteInPlace Makefile \ - --replace '/bin/echo' 'echo' + --replace-fail '/bin/echo' 'echo' ''; dontConfigure = true; @@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; mainProgram = "x16emu"; inherit (SDL2.meta) platforms; - broken = stdenv.isAarch64; # ofborg fails to compile it + broken = stdenv.hostPlatform.isAarch64; # ofborg fails to compile it }; }) diff --git a/pkgs/by-name/x1/x16/rom.nix b/pkgs/by-name/x1/x16/rom.nix index e44884436f88e..ed85dd5108ace 100644 --- a/pkgs/by-name/x1/x16/rom.nix +++ b/pkgs/by-name/x1/x16/rom.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-rom"; - version = "47"; + version = "48"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-rom"; rev = "r${finalAttrs.version}"; - hash = "sha256-+NvuCW8CIj5cnrGh+VQOExhAeXMElqdl9DVJjjGhNPk="; + hash = "sha256-MXt839wpPdGVFgf1CAqfmWEP2Ws+5uUFOI14vAdUTvk="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs findsymbols scripts/ substituteInPlace Makefile \ - --replace '/bin/echo' 'echo' + --replace-fail '/bin/echo' 'echo' ''; dontConfigure = true; @@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (cc65.meta) platforms; - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/by-name/xa/xa/package.nix similarity index 100% rename from pkgs/development/compilers/xa/xa.nix rename to pkgs/by-name/xa/xa/package.nix diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix new file mode 100644 index 0000000000000..4ad071f36a1f0 --- /dev/null +++ b/pkgs/by-name/xa/xar/package.nix @@ -0,0 +1,178 @@ +{ + lib, + stdenv, + fetchFromGitHub, + applyPatches, + autoreconfHook, + nix-update-script, + + # Required dependencies. + openssl, + zlib, + libxml2, + + # Optional dependencies. + e2fsprogs, + bzip2, + xz, # lzma + + # Platform-specific dependencies. + acl, + musl-fts, + + # for tests + testers, + python3, + libxslt, # xsltproc + runCommand, + runCommandCC, + makeWrapper, + xar, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xar"; + version = "498"; + + src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "xar"; + rev = "xar-${finalAttrs.version}"; + hash = "sha256-RyWeR/ZnDBHIZhwzVxETdrTTPQA2VgsLZegRkxX1240="; + }; + + # Update patch set with + # git clone https://github.com/apple-oss-distributions/xar + # cd xar + # git switch -c nixpkgs + # git am ../pkgs/by-name/xa/xar/patches/* + # # … + # rm -r ../pkgs/by-name/xa/xar/patches + # git format-patch --zero-commit --output-directory ../pkgs/by-name/xa/xar/patches main + patches = lib.filesystem.listFilesRecursive ./patches; + + # We do not use or modify files outside of the xar subdirectory. + patchFlags = [ "-p2" ]; + sourceRoot = "source/xar"; + + outputs = [ + "out" + "lib" + "dev" + ]; + + strictDeps = true; + + nativeBuildInputs = [ autoreconfHook ]; + + # For some reason libxml2 package headers are in subdirectory and thus aren’t + # picked up by stdenv’s C compiler wrapper (see ccWrapper_addCVars). This + # doesn’t really belong here and either should be part of libxml2 package or + # libxml2 in Nixpkgs can just fix their header paths. + env.NIX_CFLAGS_COMPILE = "-isystem ${libxml2.dev}/include/libxml2"; + + buildInputs = + [ + # NB we use OpenSSL instead of CommonCrypto on Darwin. + openssl + zlib + libxml2 + bzip2 + xz + e2fsprogs + ] + ++ lib.optional stdenv.hostPlatform.isLinux acl ++ lib.optional stdenv.hostPlatform.isMusl musl-fts; + + passthru = + let + patchedSource = applyPatches { inherit (finalAttrs) src patches; }; + pythonForTests = python3.withPackages (p: [ p.xattr ]); + in + { + # Tests xar outside of the Nix sandbox (extended attributes are not supported + # in Nix sandbox, e.g. filtered with seccomp on Linux). + # + # Run with + # $ nix run --file . xar.impureTests.integrationTest + # Ensure that all tests are PASSED and none are FAILED or SKIPPED. + impureTests.integrationTest = + runCommand "xar-impure-tests-integration-test" + { + src = patchedSource; + xar = finalAttrs.finalPackage; + xsltproc = lib.getBin libxslt; + pythonInterpreter = pythonForTests.interpreter; + nativeBuildInputs = [ makeWrapper ]; + } + '' + makeWrapper "$pythonInterpreter" "$out/bin/$name" \ + --prefix PATH : "$xar/bin" \ + --suffix PATH : "$xsltproc/bin" \ + --add-flags -- \ + --add-flags "$src/xar/test/run-all.py" + ''; + + tests = lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) { + version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "1.8dev"; + }; + + integrationTest = + runCommand "xar-tests-integration-test" + { + src = patchedSource; + strictDeps = true; + pythonExecutable = pythonForTests.executable; + nativeBuildInputs = [ + finalAttrs.finalPackage + pythonForTests + libxslt + ]; + } + '' + "$pythonExecutable" "$src"/xar/test/run-all.py + touch "$out" + ''; + + smokeTest = + runCommandCC "xar-tests-smoke-test" + { + src = patchedSource; + strictDeps = true; + nativeBuildInputs = [ finalAttrs.finalPackage ]; + buildInputs = [ + finalAttrs.finalPackage + openssl + ]; + } + '' + cp "$src"/xar/test/{buffer.c,validate.c} . + "$CC" -lxar -o buffer buffer.c + "$CC" -lxar -lcrypto -o validate validate.c + ./buffer validate.c + xar -x -f test.xar + diff validate.c mydir/secondfile + ./validate test.xar + touch "$out" + ''; + }; + + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "xar-(.*)" + ]; + }; + }; + + meta = { + homepage = "https://github.com/apple-oss-distributions/xar"; + description = "An easily extensible archive format"; + license = lib.licenses.bsd3; + maintainers = + lib.teams.darwin.members + ++ lib.attrValues { inherit (lib.maintainers) copumpkin tie; }; + platforms = lib.platforms.unix; + mainProgram = "xar"; + }; +}) diff --git a/pkgs/by-name/xa/xar/patches/0001-Update-tests-for-Python-3-and-Nix-sandbox.patch b/pkgs/by-name/xa/xar/patches/0001-Update-tests-for-Python-3-and-Nix-sandbox.patch new file mode 100644 index 0000000000000..2b26cc1429df2 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0001-Update-tests-for-Python-3-and-Nix-sandbox.patch @@ -0,0 +1,961 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sat, 27 Jul 2024 12:53:54 +0300 +Subject: [PATCH 01/19] Update tests for Python 3 and Nix sandbox + +This change updates integration tests for Python 3 and fixes some +assumptions to work under Nix sandbox (in particular, extended +attributes are not allowed). + +Also updates xar/test/validate.c for modern OpenSSL versions. +--- + xar/test/attr.py | 54 +++++++++++++++++++------- + xar/test/buffer.c | 3 +- + xar/test/checksums.py | 75 +++++++++++++++++++----------------- + xar/test/compression.py | 27 ++++++++----- + xar/test/data.py | 19 +++++---- + xar/test/hardlink.py | 12 ++++-- + xar/test/heap.py | 27 +++++++------ + xar/test/integrity.py | 45 ++++++++++++---------- + xar/test/run-all.py | 25 ++++++++++++ + xar/test/util.py | 85 ++++++++++++++++++++++++++++++++++++----- + xar/test/validate.c | 32 +++++++++------- + 11 files changed, 282 insertions(+), 122 deletions(-) + create mode 100755 xar/test/run-all.py + +diff --git a/xar/test/attr.py b/xar/test/attr.py +index adc2c56..c28a4e6 100755 +--- a/xar/test/attr.py ++++ b/xar/test/attr.py +@@ -6,6 +6,7 @@ import os + import os.path + import shutil + import subprocess ++import sys + import xattr + + import util +@@ -26,20 +27,27 @@ import util + class MissingExtendedAttributeError(AssertionError): + pass + +-def _random_big_data(bytes=65536, path="/dev/random"): ++def _random_big_data(bytes=65536): + """ + Returns a random string with the number of bytes requested. Due to xar + implementation details, this should be greater than 4096 (32768 for + compressed heap testing). + + """ +- with open(path, "r") as f: +- return f.read(bytes) ++ return os.urandom(bytes) ++ ++def _to_bytes(s): ++ if isinstance(s, str): ++ return s.encode("utf-8") ++ return s + + def _test_xattr_on_file_with_contents(filename, file_contents, xattrs=[], xar_create_flags=[], xar_extract_flags=[]): ++ file_contents = _to_bytes(file_contents) ++ xattr_prefix = "user." if sys.platform != "darwin" else "" ++ xattrs = [(xattr_prefix + k, _to_bytes(v)) for k, v in xattrs] + try: + # Write file out +- with open(filename, "w") as f: ++ with open(filename, "wb") as f: + f.write(file_contents) + for (key, value) in xattrs: + xattr.setxattr(f, key, value) +@@ -51,14 +59,16 @@ def _test_xattr_on_file_with_contents(filename, file_contents, xattrs=[], xar_cr + with util.directory_created("extracted") as directory: + # Validate resulting xattrs + subprocess.check_call(["xar", "-x", "-C", directory, "-f", path] + xar_extract_flags) ++ extracted_filename = os.path.join(directory, filename) ++ expected_set = {key for key, _ in xattrs} ++ actual_set = set(xattr.listxattr(os.path.join(directory, filename))) ++ for key in expected_set - actual_set: ++ raise MissingExtendedAttributeError("extended attribute \"{n}\" missing after extraction".format(n=key)) + for (key, value) in xattrs: +- try: +- assert xattr.getxattr(os.path.join(directory, filename), key) == value, "extended attribute \"{n}\" has incorrect contents after extraction".format(n=key) +- except KeyError: +- raise MissingExtendedAttributeError("extended attribute \"{n}\" missing after extraction".format(n=key)) ++ assert xattr.getxattr(extracted_filename, key) == value, "extended attribute \"{n}\" has incorrect contents after extraction".format(n=key) + + # Validate file contents +- with open(os.path.join(directory, filename), "r") as f: ++ with open(os.path.join(directory, filename), "rb") as f: + if f.read() != file_contents: + raise MissingExtendedAttributeError("archived file \"{f}\" has has incorrect contents after extraction".format(f=filename)) + finally: +@@ -73,36 +83,47 @@ def _test_xattr_on_file_with_contents(filename, file_contents, xattrs=[], xar_cr + # tests are commented out awaiting a day when this might be different. + + # def empty_xattr_empty_file(filename): ++# util.skip_if_no_xattrs_support() + # _test_xattr_on_file_with_contents(filename, "", xattrs=[("foo", "")]) + + def small_xattr_empty_file(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, "", xattrs=[("foo", "1234")]) + + def large_xattr_empty_file(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, "", xattrs=[("foo", _random_big_data(5000))]) + + # def empty_xattr_small_file(filename): ++# util.skip_if_no_xattrs_support() + # _test_xattr_on_file_with_contents(filename, "small.file.contents", xattrs=[("foo", "")]) + + def small_xattr_small_file(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, "small.file.contents", xattrs=[("foo", "1234")]) + + def large_xattr_small_file(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, "small.file.contents", xattrs=[("foo", _random_big_data(4567))]) + + # def empty_xattr_large_file(filename): ++# util.skip_if_no_xattrs_support() + # _test_xattr_on_file_with_contents(filename, _random_big_data(10000000), xattrs=[("foo", "")]) + + def small_xattr_large_file(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, _random_big_data(5000000), xattrs=[("foo", "1234")]) + + def large_xattr_large_file(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, _random_big_data(9876543), xattrs=[("foo", _random_big_data(6543))]) + + def multiple_xattrs(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, "", xattrs=[("foo", "bar"), ("baz", "1234"), ("quux", "more")]) # ("empty", "") + + def distribution_create(filename): ++ util.skip_if_no_xattrs_support() + try: + _test_xattr_on_file_with_contents(filename, "dummy", xattrs=[("foo", "bar")], xar_create_flags=["--distribution"]) + except MissingExtendedAttributeError: +@@ -114,6 +135,7 @@ def distribution_create(filename): + # when it can. + + # def distribution_extract(filename): ++# util.skip_if_no_xattrs_support() + # try: + # _test_xattr_on_file_with_contents(filename, "dummy", xattrs=[("foo", "bar")], xar_extract_flags=["--distribution"]) + # except MissingExtendedAttributeError: +@@ -128,12 +150,18 @@ TEST_CASES = (small_xattr_empty_file, large_xattr_empty_file, + multiple_xattrs, distribution_create) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case(case.func_name) +- print("PASSED: {f}".format(f=case.func_name)) ++ case(func_name) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): +- import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ failed = True ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") ++ except util.TestCaseSkipError as e: ++ print("SKIPPED: {f}: {m}".format(f=func_name, m=e)) ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/buffer.c b/xar/test/buffer.c +index a353cef..e4c5639 100644 +--- a/xar/test/buffer.c ++++ b/xar/test/buffer.c +@@ -1,5 +1,6 @@ + #include <stdlib.h> + #include <stdio.h> ++#include <unistd.h> + #include <sys/stat.h> + #include <sys/fcntl.h> + #include <string.h> +@@ -50,7 +51,7 @@ int main(int argc, char *argv[]) + if( red < sb.st_size ) + fprintf(stderr, "Incomplete read\n"); + +- x = xar_open("/tmp/test.xar", WRITE); ++ x = xar_open("test.xar", WRITE); + if( x == NULL ) { + fprintf(stderr, "Error creating xarchive\n"); + exit(6); +diff --git a/xar/test/checksums.py b/xar/test/checksums.py +index 7080d7c..0f39e63 100755 +--- a/xar/test/checksums.py ++++ b/xar/test/checksums.py +@@ -2,6 +2,7 @@ + + from __future__ import print_function + ++import contextlib + import hashlib + import os + import os.path +@@ -9,6 +10,7 @@ import re + import shutil + import struct + import subprocess ++import sys + + import util + +@@ -17,15 +19,21 @@ import util + # Utility Functions + # + ++@contextlib.contextmanager ++def _test_archive_created(filename, directory, *args, **kwargs): ++ with util.test_directory_created(directory) as test_directory: ++ with util.archive_created(filename, test_directory, *args, **kwargs) as path: ++ yield path ++ + def _get_numeric_value_from_header(archive_name, key): + """ + Dumps the header of the specified xar archive and extracts the header + size from the output, in bytes. + + """ +- header = subprocess.check_output(["xar", "--dump-header", "-f", archive_name]) ++ header = subprocess.check_output(["xar", "--dump-header", "-f", archive_name], text=True) + for line in header.splitlines(): +- matchdata = re.match("^(.+):\s+(.+)$", line) # magic: 0x78617221 (OK) ++ matchdata = re.match(r"^(.+):\s+(.+)$", line) # magic: 0x78617221 (OK) + assert matchdata, "unexpected output from `xar --dump-header`:\n{h}".format(h=header) + if matchdata.groups()[0] == key: + return int(matchdata.groups()[1]) +@@ -38,17 +46,14 @@ def _get_toc_size(archive_name): + return _get_numeric_value_from_header(archive_name, "Compressed TOC length") + + def _clobber_bytes_at(clobber_range, path): +- with open(path, "r+") as f: ++ with open(path, "rb+") as f: + f.seek(clobber_range[0]) +- with open("/dev/random", "r") as r: +- random_bytes = r.read(len(clobber_range)) +- f.write(random_bytes) ++ f.write(os.urandom(len(clobber_range))) + + def _verify_extraction_failed(filename): + with util.directory_created("extracted") as directory: + try: +- with open("/dev/null", "w") as n: +- returncode = subprocess.call(["xar", "-x", "-C", directory, "-f", filename], stdout=n, stderr=n) ++ returncode = subprocess.call(["xar", "-x", "-C", directory, "-f", filename], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + assert returncode != 0, "xar reported success extracting an archive with a broken TOC" + finally: + if os.path.exists(directory): +@@ -63,7 +68,7 @@ def _verify_header_checksum(filename, algorithm): + header_size = _get_header_size(filename) + toc_length = _get_toc_size(filename) + +- with open(filename, "r") as f: ++ with open(filename, "rb") as f: + f.seek(header_size) + h = hashlib.new(algorithm, f.read(toc_length)) + computed_digest = h.digest() +@@ -76,23 +81,23 @@ def _verify_header_checksum(filename, algorithm): + # + + def default_toc_checksum_validity(filename): +- with util.archive_created(filename, "/bin") as path: ++ with _test_archive_created(filename, "testdir") as path: + _verify_header_checksum(path, "sha1") + + def sha1_toc_checksum_validity(filename): +- with util.archive_created(filename, "/bin", "--toc-cksum", "sha1") as path: ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "sha1") as path: + _verify_header_checksum(path, "sha1") + + def sha256_toc_checksum_validity(filename): +- with util.archive_created(filename, "/bin", "--toc-cksum", "sha256") as path: ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "sha256") as path: + _verify_header_checksum(path, "sha256") + + def sha512_toc_checksum_validity(filename): +- with util.archive_created(filename, "/bin", "--toc-cksum", "sha512") as path: ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "sha512") as path: + _verify_header_checksum(path, "sha512") + + def broken_toc_default_checksum(filename): +- with util.archive_created(filename, "/bin") as path: ++ with _test_archive_created(filename, "testdir") as path: + # Mess up the archive + toc_start = _get_header_size(path) + _clobber_bytes_at(range(toc_start + 4, toc_start + 4 + 100), path) # Why did the original test specify 4? No idea. +@@ -101,7 +106,7 @@ def broken_toc_default_checksum(filename): + _verify_extraction_failed(filename) + + def broken_toc_sha1_checksum(filename): +- with util.archive_created(filename, "/bin", "--toc-cksum", "sha1") as path: ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "sha1") as path: + # Mess up the archive + toc_start = _get_header_size(path) + _clobber_bytes_at(range(toc_start + 4, toc_start + 4 + 100), path) # Why did the original test specify 4? No idea. +@@ -110,7 +115,7 @@ def broken_toc_sha1_checksum(filename): + _verify_extraction_failed(filename) + + def broken_toc_sha256_checksum(filename): +- with util.archive_created(filename, "/bin", "--toc-cksum", "sha256") as path: ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "sha256") as path: + # Mess up the archive + toc_start = _get_header_size(path) + _clobber_bytes_at(range(toc_start + 4, toc_start + 4 + 100), path) # Why did the original test specify 4? No idea. +@@ -119,7 +124,7 @@ def broken_toc_sha256_checksum(filename): + _verify_extraction_failed(filename) + + def broken_toc_sha512_checksum(filename): +- with util.archive_created(filename, "/bin", "--toc-cksum", "sha512") as path: ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "sha512") as path: + # Mess up the archive + toc_start = _get_header_size(path) + _clobber_bytes_at(range(toc_start + 4, toc_start + 4 + 100), path) # Why did the original test specify 4? No idea. +@@ -128,7 +133,7 @@ def broken_toc_sha512_checksum(filename): + _verify_extraction_failed(filename) + + def broken_heap_default_checksum(filename): +- with util.archive_created(filename, "/bin") as path: ++ with _test_archive_created(filename, "testdir") as path: + # Mess up the archive + toc_start = _get_header_size(path) + toc_size = _get_toc_size(path) +@@ -139,11 +144,11 @@ def broken_heap_default_checksum(filename): + _verify_extraction_failed(filename) + + def default_checksum_algorithm(filename): +- with util.archive_created(filename, "/bin") as path: +- header = subprocess.check_output(["xar", "--dump-header", "-f", path]) ++ with _test_archive_created(filename, "testdir") as path: ++ header = subprocess.check_output(["xar", "--dump-header", "-f", path], text=True) + found = False + for line in header.splitlines(): +- matchdata = re.match("^Checksum algorithm:\s+(\d+)\s+\\((\w+)\\)$", line) ++ matchdata = re.match(r"^Checksum algorithm:\s+(\d+)\s+\((\w+)\)$", line) + if not matchdata: + continue + found = True +@@ -156,7 +161,7 @@ def default_checksum_algorithm(filename): + # + # def invalid_checksum_algorithm(filename): + # try: +-# with util.archive_created(filename, "/bin", "--toc-cksum", "invalid-algorithm") as path: ++# with _test_archive_created(filename, "testdir", "--toc-cksum", "invalid-algorithm") as path: + # raise AssertionError("xar succeeded when it should have failed") + # except subprocess.CalledProcessError: + # pass +@@ -164,17 +169,15 @@ def default_checksum_algorithm(filename): + # It does fail for md5 explicitly, however + def md5_toc_checksum_failure(filename): + try: +- with open("/dev/null", "a") as devnull: +- with util.archive_created(filename, "/bin", "--toc-cksum", "md5", stderr=devnull) as path: +- raise AssertionError("xar succeeded when it should have failed") ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "md5", stderr=subprocess.DEVNULL) as path: ++ raise AssertionError("xar succeeded when it should have failed") + except subprocess.CalledProcessError: + pass + + def md5_file_checksum_failure(filename): + try: +- with open("/dev/null", "a") as devnull: +- with util.archive_created(filename, "/bin", "--file-cksum", "md5", stderr=devnull) as path: +- raise AssertionError("xar succeeded when it should have failed") ++ with _test_archive_created(filename, "testdir", "--file-cksum", "md5", stderr=subprocess.DEVNULL) as path: ++ raise AssertionError("xar succeeded when it should have failed") + except subprocess.CalledProcessError: + pass + +@@ -185,8 +188,8 @@ def _verify_checksum_algorithm(filename, algorithm): + else: + algorithm = "sha1" + +- with util.archive_created(filename, "/bin", *additional_args) as path: +- toc = subprocess.check_output(["xar", "--dump-toc=-", "-f", path]) ++ with _test_archive_created(filename, "testdir", *additional_args) as path: ++ toc = subprocess.check_output(["xar", "--dump-toc=-", "-f", path], text=True) + found = False + for line in toc.splitlines(): + if '<unarchived-checksum style="{a}">'.format(a=algorithm) in line or '<archived-checksum style="{a}">'.format(a=algorithm) in line: +@@ -214,12 +217,16 @@ TEST_CASES = (default_toc_checksum_validity, sha1_toc_checksum_validity, sha256_ + md5_toc_checksum_failure, md5_file_checksum_failure,) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case("{f}.xar".format(f=case.func_name)) +- print("PASSED: {f}".format(f=case.func_name)) ++ case("{f}.xar".format(f=func_name)) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): +- import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ failed = True ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/compression.py b/xar/test/compression.py +index 2b3b2ec..7ed30ca 100755 +--- a/xar/test/compression.py ++++ b/xar/test/compression.py +@@ -2,10 +2,10 @@ + + from __future__ import print_function + +-import cStringIO + import os + import os.path + import subprocess ++import sys + import tempfile + + import util +@@ -16,10 +16,15 @@ import util + # + + def _check_compression(filename, *args, **kwargs): +- with util.archive_created(filename, "/bin", *args, **kwargs) as path: ++ with ( ++ util.directory_created("temp") as temp_directory, ++ util.chdir(temp_directory), ++ util.test_directory_created("testdir") as test_directory, ++ util.archive_created(filename, "testdir", *args, **kwargs) as path, ++ ): + with util.directory_created("extracted") as directory: + subprocess.check_call(["xar", "-x", "-f", path, "-C", directory]) +- util.assert_identical_directories("/bin", os.path.join(directory, "bin")) ++ util.assert_identical_directories(test_directory, os.path.join(directory, "testdir")) + + + # +@@ -61,14 +66,18 @@ TEST_CASES = (no_compression, default_compression, + gzip_compression_short, bzip2_compression_short, lzma_compression_short) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case("{f}.xar".format(f=case.func_name)) +- print("PASSED: {f}".format(f=case.func_name)) ++ case("{f}.xar".format(f=func_name)) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): +- import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ failed = True ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") +- except util.TestCaseSkipError, e: +- print("SKIPPED: {f}: {m}".format(f=case.func_name, m=e.message)) ++ except util.TestCaseSkipError as e: ++ print("SKIPPED: {f}: {m}".format(f=func_name, m=e)) ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/data.py b/xar/test/data.py +index a9793f0..f902b78 100755 +--- a/xar/test/data.py ++++ b/xar/test/data.py +@@ -6,6 +6,7 @@ import contextlib + import os + import os.path + import subprocess ++import sys + import util + + +@@ -28,7 +29,7 @@ def _process_toc(archive_path): + subprocess.check_call(["xar", "-f", archive_path, "--dump-toc=data_toc.xml"]) + try: + result = subprocess.check_output(["xsltproc", "-o", "-", os.path.realpath(os.path.join(__file__, "..", "data.xsl")), "data_toc.xml"]) +- assert result == "", "expected no data offset, but instead found:{o}".format(o=result) ++ assert result == b"", "expected no data offset, but instead found:{o}".format(o=result) + finally: + os.unlink("data_toc.xml") + +@@ -90,14 +91,18 @@ TEST_CASES = (zero_length_default_compression, zero_length_no_compression, + mixed_length_gzip_compression, mixed_length_bzip2_compression, mixed_length_lzma_compression) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case("{f}.xar".format(f=case.func_name)) +- print("PASSED: {f}".format(f=case.func_name)) ++ case("{f}.xar".format(f=func_name)) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): +- import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ failed = True ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") +- except util.TestCaseSkipError, e: +- print("SKIPPED: {f}: {m}".format(f=case.func_name, m=e.message)) ++ except util.TestCaseSkipError as e: ++ print("SKIPPED: {f}: {m}".format(f=func_name, m=e)) ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/hardlink.py b/xar/test/hardlink.py +index 5145216..da409d6 100755 +--- a/xar/test/hardlink.py ++++ b/xar/test/hardlink.py +@@ -5,6 +5,7 @@ from __future__ import print_function + import os + import os.path + import subprocess ++import sys + + import util + +@@ -58,12 +59,17 @@ def hard_link_identical_files(filename): + TEST_CASES = (hard_link_in_directory, hard_link_in_cwd, hard_link_identical_files) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case("{f}.xar".format(f=case.func_name)) +- print("PASSED: {f}".format(f=case.func_name)) ++ case("{f}.xar".format(f=func_name)) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): ++ failed = True + import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/heap.py b/xar/test/heap.py +index f431c77..727412a 100755 +--- a/xar/test/heap.py ++++ b/xar/test/heap.py +@@ -8,6 +8,7 @@ import os.path + import re + import shutil + import subprocess ++import sys + + import util + +@@ -19,8 +20,8 @@ import util + def _file_offsets_for_archive(path, xsl_path): + subprocess.check_call(["xar", "--dump-toc=heap_toc.xml", "-f", path]) + try: +- offsets = subprocess.check_output(["xsltproc", xsl_path, "heap_toc.xml"]) +- matches = [re.match("^(.+)\s([^\s]+)$", offset) for offset in offsets.splitlines()] ++ offsets = subprocess.check_output(["xsltproc", xsl_path, "heap_toc.xml"], text=True) ++ matches = [re.match(r"^(.+)\s([^\s]+)$", offset) for offset in offsets.splitlines()] + offsets = [(match.groups()[0], int(match.groups()[1])) for match in matches] + return offsets + finally: +@@ -33,9 +34,8 @@ def _file_offsets_for_archive(path, xsl_path): + XSL_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "heap1.xsl") + + def normal_heap(filename): +- with util.directory_created("scratch") as directory: +- shutil.copy("/bin/ls", os.path.join(directory, "ls")) +- shutil.copy(os.path.join(directory, "ls"), os.path.join(directory, "foo")) ++ with util.test_directory_created("scratch") as directory: ++ shutil.copy(os.path.join(directory, "script"), os.path.join(directory, "foo")) + with util.chdir(directory): + with util.archive_created(os.path.join("..", "heap.xar"), ".") as path: + # Verify file offsets are as we expect +@@ -50,9 +50,8 @@ def normal_heap(filename): + subprocess.check_call(["xar", "-x", "-f", path, "-C", extracted]) + + def coalesce_heap(filename): +- with util.directory_created("scratch") as directory: +- shutil.copy("/bin/ls", os.path.join(directory, "ls")) +- shutil.copy(os.path.join(directory, "ls"), os.path.join(directory, "foo")) ++ with util.test_directory_created("scratch") as directory: ++ shutil.copy(os.path.join(directory, "script"), os.path.join(directory, "foo")) + with util.chdir(directory): + with util.archive_created(os.path.join("..", "heap.xar"), ".", "--coalesce-heap") as path: + # Verify file offsets are as we expect +@@ -67,12 +66,16 @@ def coalesce_heap(filename): + TEST_CASES = (normal_heap, coalesce_heap) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case("{f}.xar".format(f=case.func_name)) +- print("PASSED: {f}".format(f=case.func_name)) ++ case("{f}.xar".format(f=func_name)) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): +- import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ failed = True ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/integrity.py b/xar/test/integrity.py +index c47ac6a..f4d2af7 100755 +--- a/xar/test/integrity.py ++++ b/xar/test/integrity.py +@@ -5,6 +5,7 @@ from __future__ import print_function + import os + import os.path + import subprocess ++import sys + + import util + +@@ -12,9 +13,9 @@ import util + # Utility Functions + # + +-def _test_truncation(filename, path_to_be_archived, bytes_to_chop, *args): +- with util.archive_created(filename, path_to_be_archived) as path: +- with open("/dev/null", "w") as bitbucket: ++def _test_truncation(filename, bytes_to_chop, *args): ++ with util.test_directory_created("testdir") as test_directory: ++ with util.archive_created(filename, test_directory) as path: + size = os.stat(path).st_size + while size > 0: + last_size = size +@@ -23,7 +24,7 @@ def _test_truncation(filename, path_to_be_archived, bytes_to_chop, *args): + f.truncate(size) + + with util.directory_created("scratch") as directory: +- returncode = subprocess.call(["xar", "-x", "-f", path, "-C", directory], stderr=bitbucket) ++ returncode = subprocess.call(["xar", "-x", "-f", path, "-C", directory], stderr=subprocess.DEVNULL) + assert returncode != 0, "xar claimed to succeed when extracting a truncated archive" + + # +@@ -31,42 +32,42 @@ def _test_truncation(filename, path_to_be_archived, bytes_to_chop, *args): + # + + def large_uncompressed(filename): +- _test_truncation(filename, "/usr/share/man/man1", 1024 * 1024, "--compression=none") ++ _test_truncation(filename, 1024 * 1024, "--compression=none") + + def large_default_compression(filename): +- _test_truncation(filename, "/usr/share/man/man1", 1024 * 1024) ++ _test_truncation(filename, 1024 * 1024) + + def large_gzip_compressed(filename): + util.skip_if_no_compression_support("gzip") +- _test_truncation(filename, "/usr/share/man/man1", 1024 * 1024, "--compression=gzip") ++ _test_truncation(filename, 1024 * 1024, "--compression=gzip") + + def large_bzip2_compressed(filename): + util.skip_if_no_compression_support("bzip2") +- _test_truncation(filename, "/usr/share/man/man1", 1024 * 1024, "--compression=bzip2") ++ _test_truncation(filename, 1024 * 1024, "--compression=bzip2") + + def large_lzma_compressed(filename): + util.skip_if_no_compression_support("lzma") +- _test_truncation(filename, "/usr/share/man/man1", 1024 * 1024, "--compression=lzma") ++ _test_truncation(filename, 1024 * 1024, "--compression=lzma") + + # "small" variants use a non-base-2 size to try to catch issues that occur on uneven boundaries + + def small_uncompressed(filename): +- _test_truncation(filename, "/bin", 43651, "--compression=none") ++ _test_truncation(filename, 43651, "--compression=none") + + def small_default_compression(filename): +- _test_truncation(filename, "/bin", 43651) ++ _test_truncation(filename, 43651) + + def small_gzip_compressed(filename): + util.skip_if_no_compression_support("gzip") +- _test_truncation(filename, "/bin", 43651, "--compression=gzip") ++ _test_truncation(filename, 43651, "--compression=gzip") + + def small_bzip2_compressed(filename): + util.skip_if_no_compression_support("bzip2") +- _test_truncation(filename, "/bin", 43651, "--compression=bzip2") ++ _test_truncation(filename, 43651, "--compression=bzip2") + + def small_lzma_compressed(filename): + util.skip_if_no_compression_support("lzma") +- _test_truncation(filename, "/bin", 43651, "--compression=lzma") ++ _test_truncation(filename, 43651, "--compression=lzma") + + + TEST_CASES = (large_uncompressed, large_default_compression, +@@ -75,14 +76,18 @@ TEST_CASES = (large_uncompressed, large_default_compression, + small_gzip_compressed, small_bzip2_compressed, small_lzma_compressed) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case("{f}.xar".format(f=case.func_name)) +- print("PASSED: {f}".format(f=case.func_name)) ++ case("{f}.xar".format(f=func_name)) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): +- import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ failed = True ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") +- except util.TestCaseSkipError, e: +- print("SKIPPED: {f}: {m}".format(f=case.func_name, m=e.message)) ++ except util.TestCaseSkipError as e: ++ print("SKIPPED: {f}: {m}".format(f=func_name, m=e)) ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/run-all.py b/xar/test/run-all.py +new file mode 100755 +index 0000000..05e3054 +--- /dev/null ++++ b/xar/test/run-all.py +@@ -0,0 +1,25 @@ ++#!/usr/bin/env python3 ++ ++import os.path ++import subprocess ++import sys ++ ++test_suites = [ ++ "attr.py", ++ "checksums.py", ++ "compression.py", ++ "data.py", ++ "hardlink.py", ++ "heap.py", ++ "integrity.py", ++] ++ ++test_path = os.path.dirname(__file__) ++ ++failed = False ++for suite in test_suites: ++ p = subprocess.run([sys.executable, "--", os.path.join(test_path, suite)]) ++ if p.returncode: ++ failed = True ++if failed: ++ sys.exit(1) +diff --git a/xar/test/util.py b/xar/test/util.py +index da79925..423dd3c 100644 +--- a/xar/test/util.py ++++ b/xar/test/util.py +@@ -1,6 +1,8 @@ + #!/usr/bin/env python + + import contextlib ++import errno ++import functools + import hashlib + import os + import os.path +@@ -13,16 +15,65 @@ import xattr + class TestCaseSkipError(Exception): + pass + ++@functools.cache ++def _check_xattrs_supported(): ++ """ ++ Returns True if the filesystem supports extended attributes. ++ """ ++ with directory_created("empty") as directory: ++ try: ++ xattr.setxattr(directory, "user.xattrcheck", b"supported") ++ return True ++ except OSError as e: ++ if e.errno != errno.ENOTSUP: ++ raise ++ return False ++ ++def skip_if_no_xattrs_support(): ++ """ ++ Raises TestCaseSkipError if the the filesystem does not support extended ++ attributes. ++ """ ++ if not _check_xattrs_supported(): ++ raise TestCaseSkipError("filesystem does not support extended attributes") ++ ++@functools.cache ++def _check_compression_supported(type): ++ """ ++ Returns True if xar has support for the given compression type compiled ++ in. This function performs a runtime check that tries to compress data ++ with the given compression type and looks for a known error string. It ++ ignores all other errors. ++ """ ++ supported = True ++ with directory_created("empty") as directory: ++ archive_path = f"{type}_compression_check.xar" ++ try: ++ return f"{type} support not compiled in." not in subprocess.run( ++ [ ++ "xar", ++ "-c", ++ "-f", ++ archive_path, ++ "--compression=" + type, ++ directory, ++ ], ++ stdout=subprocess.PIPE, ++ text=True, ++ ).stdout ++ except: ++ # Assume that this compression type is supported. ++ pass ++ finally: ++ if os.path.exists(archive_path): ++ os.unlink(archive_path) ++ return supported ++ + def skip_if_no_compression_support(type): + """ +- Raises TestCaseSkipError if the type is "lzma" and the test is running on +- darwin (OS X). In the future, we should add a hidden debugging flag to xar +- to determine valid compression types. This will skip incorrectly if a +- custom xar is used on OS X, or if a custom xar on another platform is +- built without bzip2 or lzma. +- ++ Raises TestCaseSkipError if the compression type is not compiled in. + """ +- if sys.platform == "darwin" and type == "lzma": ++ if not _check_compression_supported(type): + raise TestCaseSkipError("{t} support not compiled in".format(t=type)) + + @contextlib.contextmanager +@@ -43,6 +94,22 @@ def directory_created(directory_path): + if os.path.exists(directory_path): + shutil.rmtree(directory_path) + ++@contextlib.contextmanager ++def test_directory_created(directory_path): ++ """ ++ Like directory_created, but populates the directory with test files. ++ """ ++ with directory_created(directory_path) as directory: ++ with open(os.path.join(directory, "script"), "w+", opener=lambda path, flags: os.open(path, flags, 0o750)) as f: ++ f.write("#!/bin/sh\necho hello world") ++ with open(os.path.join(directory, "random_1kb"), "wb+") as f: ++ f.write(os.urandom(1000)) ++ with open(os.path.join(directory, "random_4kib"), "wb+") as f: ++ f.write(os.urandom(4096)) ++ with open(os.path.join(directory, "random_1mb"), "wb+") as f: ++ f.write(os.urandom(9999999)) ++ yield directory ++ + @contextlib.contextmanager + def archive_created(archive_path, content_path, *extra_args, **extra_kwargs): + """ +@@ -68,7 +135,7 @@ def archive_created(archive_path, content_path, *extra_args, **extra_kwargs): + HASH_CHUNK_SIZE = 32768 + + def _md5_path(path): +- with open(path, "r") as f: ++ with open(path, "rb") as f: + h = hashlib.md5() + while True: + last = f.read(HASH_CHUNK_SIZE) +@@ -122,7 +189,7 @@ def assert_identical_directories(path1, path2): + + # Sizes and the like + assert stat1.st_size == stat2.st_size, "size mismatch for \"{e1}\" ({s1}) and \"{e2}\" ({s2})".format(e1=entry1, s1=stat1.st_size, e2=entry2, s2=stat2.st_size) +- assert stat1.st_mtime == stat2.st_mtime, "mtime mismatch for \"{e1}\" and \"{e2}\"".format(e1=entry1, e2=entry2) ++ assert int(stat1.st_mtime) == int(stat2.st_mtime), "mtime mismatch for \"{e1}\" and \"{e2}\"".format(e1=entry1, e2=entry2) + assert _md5_path(entry1) == _md5_path(entry2), "md5 hash mismatch for \"{e1}\" and \"{e2}\"".format(e1=entry1, e2=entry2) + if os.path.isdir(entry1): + assert_identical_directories(entry1, entry2) +diff --git a/xar/test/validate.c b/xar/test/validate.c +index dfe69eb..a5fbe37 100644 +--- a/xar/test/validate.c ++++ b/xar/test/validate.c +@@ -16,37 +16,40 @@ + + off_t HeapOff = 0; + +-static char* xar_format_md5(const unsigned char* m) { ++static char* xar_format_sha1(const unsigned char* m) { + char* result = NULL; + asprintf(&result, + "%02x%02x%02x%02x" + "%02x%02x%02x%02x" + "%02x%02x%02x%02x" ++ "%02x%02x%02x%02x" + "%02x%02x%02x%02x", + m[0], m[1], m[2], m[3], + m[4], m[5], m[6], m[7], + m[8], m[9], m[10], m[11], +- m[12], m[13], m[14], m[15]); ++ m[12], m[13], m[14], m[15], ++ m[16], m[17], m[18], m[19]); + return result; + } + + void heap_check(int fd, const char *name, const char *prop, off_t offset, off_t length, const char *csum) { + char *buf; +- EVP_MD_CTX ctx; ++ EVP_MD_CTX *ctx; + const EVP_MD *md; +- unsigned char md5str[EVP_MAX_MD_SIZE]; ++ unsigned char sha1str[EVP_MAX_MD_SIZE]; + unsigned int len; + ssize_t r; +- char *formattedmd5; ++ char *formattedsha1; + + fprintf(stderr, "Heap checking %s %s at offset: %" PRIu64 "\n", name, prop, HeapOff+offset); + OpenSSL_add_all_digests(); +- md = EVP_get_digestbyname("md5"); ++ md = EVP_get_digestbyname("sha1"); + if( md == NULL ) { +- fprintf(stderr, "No md5 digest in openssl\n"); ++ fprintf(stderr, "No sha1 digest in openssl\n"); + exit(1); + } +- EVP_DigestInit(&ctx, md); ++ ctx = EVP_MD_CTX_create(); ++ EVP_DigestInit(ctx, md); + + buf = malloc(length); + if( !buf ) { +@@ -65,14 +68,15 @@ void heap_check(int fd, const char *name, const char *prop, off_t offset, off_t + fprintf(stderr, "Error reading from the heap\n"); + exit(1); + } +- EVP_DigestUpdate(&ctx, buf, length); +- EVP_DigestFinal(&ctx, md5str, &len); ++ EVP_DigestUpdate(ctx, buf, length); ++ EVP_DigestFinal(ctx, sha1str, &len); ++ EVP_MD_CTX_destroy(ctx); + +- formattedmd5 = xar_format_md5(md5str); +- if( strcmp(formattedmd5, csum) != 0 ) { +- fprintf(stderr, "%s %s checksum does not match\n", name, prop); ++ formattedsha1 = xar_format_sha1(sha1str); ++ if( strcmp(formattedsha1, csum) != 0 ) { ++ fprintf(stderr, "%s %s checksum does not match (got %s but expected %s)\n", name, prop, formattedsha1, csum); + } +- free(formattedmd5); ++ free(formattedsha1); + free(buf); + } + +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0002-Update-for-modern-liblzma5-versions.patch b/pkgs/by-name/xa/xar/patches/0002-Update-for-modern-liblzma5-versions.patch new file mode 100644 index 0000000000000..ef9ad00394103 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0002-Update-for-modern-liblzma5-versions.patch @@ -0,0 +1,153 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sat, 27 Jul 2024 16:34:17 +0300 +Subject: [PATCH 02/19] Update for modern liblzma5 versions +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This change updates liblzma usage for modern xz versions (≥ 5, that is, +released less than a decade ago). + +It also fixes missing realloc buffer calls that were supposed to be +there but were lost in xar-420 (and Apple does not ship xar with LZMA +support so nobody noticed). See also the offending commit: +https://github.com/apple-oss-distributions/xar/commit/2426082efec74e9ed545cc4f5812ad16322bdf2c +--- + xar/lib/lzmaxar.c | 65 ++++++++--------------------------------------- + 1 file changed, 10 insertions(+), 55 deletions(-) + +diff --git a/xar/lib/lzmaxar.c b/xar/lib/lzmaxar.c +index ba9c868..8dcb484 100644 +--- a/xar/lib/lzmaxar.c ++++ b/xar/lib/lzmaxar.c +@@ -54,27 +54,12 @@ + + #ifdef HAVE_LIBLZMA + +-#ifndef UINT32_C +-#define UINT32_C(v) (v ## U) /* from <stdint.h> normally */ +-#endif +-#ifndef LZMA_VERSION +-#define LZMA_VERSION UINT32_C(40420000) /* = 4.42.0alpha6 */ +-#endif +- + struct _lzma_context{ + uint8_t lzmacompressed; + lzma_stream lzma; +- lzma_options_stream options; +- lzma_allocator allocator; +-#if LZMA_VERSION < 40420010U +- lzma_memory_limitter *limit; +-#else +- lzma_memlimit *limit; +-#endif + }; + + #define preset_level 7 +-#define memory_limit 93*1024*1024 /* 1=1M, 5=24M, 6=39M, 7=93M, 8=185M, 9=369M */ + + #define LZMA_CONTEXT(x) ((struct _lzma_context *)(*x)) + #endif +@@ -116,9 +101,7 @@ int xar_lzma_fromheap_in(xar_t x, xar_file_t f, xar_prop_t p, void **in, size_t + if( !opt ) return 0; + if( strcmp(opt, "application/x-lzma") != 0 ) return 0; + +- lzma_init_decoder(); +- LZMA_CONTEXT(context)->lzma = LZMA_STREAM_INIT_VAR; +- r = lzma_stream_decoder(&LZMA_CONTEXT(context)->lzma, NULL, NULL); ++ r = lzma_stream_decoder(&LZMA_CONTEXT(context)->lzma, UINT64_MAX, LZMA_CONCATENATED); + if( (r != LZMA_OK) ) { + xar_err_new(x); + xar_err_set_file(x, f); +@@ -194,11 +177,6 @@ int xar_lzma_toheap_done(xar_t x, xar_file_t f, xar_prop_t p, void **context) { + + if( LZMA_CONTEXT(context)->lzmacompressed){ + lzma_end(&LZMA_CONTEXT(context)->lzma); +-#if LZMA_VERSION < 40420010U +- lzma_memory_limitter_end(LZMA_CONTEXT(context)->limit, 1); +-#else +- lzma_memlimit_end(LZMA_CONTEXT(context)->limit, 1); +-#endif + + tmpp = xar_prop_pset(f, p, "encoding", NULL); + if( tmpp ) +@@ -222,7 +200,7 @@ int32_t xar_lzma_toheap_in(xar_t x, xar_file_t f, xar_prop_t p, void **in, size_ + + /* on first run, we init the context and check the compression type */ + if( !LZMA_CONTEXT(context) ) { +- int level = preset_level; ++ uint32_t level = preset_level; + *context = calloc(1,sizeof(struct _lzma_context)); + + opt = xar_opt_get(x, XAR_OPT_COMPRESSION); +@@ -243,35 +221,7 @@ int32_t xar_lzma_toheap_in(xar_t x, xar_file_t f, xar_prop_t p, void **in, size_ + } + } + +- lzma_init_encoder(); +- LZMA_CONTEXT(context)->options.check = LZMA_CHECK_CRC64; +- LZMA_CONTEXT(context)->options.has_crc32 = 1; /* true */ +- LZMA_CONTEXT(context)->options.alignment = 0; +-#if defined (__ppc__) || defined (powerpc) || defined (__ppc64__) +- LZMA_CONTEXT(context)->options.filters[0].id = LZMA_FILTER_POWERPC; +-#elif defined (__i386__) || defined (__amd64__) || defined(__x86_64__) +- LZMA_CONTEXT(context)->options.filters[0].id = LZMA_FILTER_X86; +-#else +- LZMA_CONTEXT(context)->options.filters[0].id = LZMA_FILTER_COPY; +-#endif +- LZMA_CONTEXT(context)->options.filters[0].options = NULL; +- LZMA_CONTEXT(context)->options.filters[1].id = LZMA_FILTER_LZMA; +- LZMA_CONTEXT(context)->options.filters[1].options = (lzma_options_lzma *)(lzma_preset_lzma + level - 1); +- /* Terminate the filter options array. */ +- LZMA_CONTEXT(context)->options.filters[2].id = UINT64_MAX; +- LZMA_CONTEXT(context)->lzma = LZMA_STREAM_INIT_VAR; +-#if LZMA_VERSION < 40420010U +- LZMA_CONTEXT(context)->limit = lzma_memory_limitter_create(memory_limit); +- LZMA_CONTEXT(context)->allocator.alloc = (void*) lzma_memory_alloc; +- LZMA_CONTEXT(context)->allocator.free = (void*) lzma_memory_free; +-#else +- LZMA_CONTEXT(context)->limit = lzma_memlimit_create(memory_limit); +- LZMA_CONTEXT(context)->allocator.alloc = (void*) lzma_memlimit_alloc; +- LZMA_CONTEXT(context)->allocator.free = (void*) lzma_memlimit_free; +-#endif +- LZMA_CONTEXT(context)->allocator.opaque = LZMA_CONTEXT(context)->limit; +- LZMA_CONTEXT(context)->lzma.allocator = &LZMA_CONTEXT(context)->allocator; +- r = lzma_stream_encoder_single(&LZMA_CONTEXT(context)->lzma, &(LZMA_CONTEXT(context)->options)); ++ r = lzma_easy_encoder(&LZMA_CONTEXT(context)->lzma, level, LZMA_CHECK_CRC64); + if( (r != LZMA_OK) ) { + xar_err_new(x); + xar_err_set_file(x, f); +@@ -279,6 +229,7 @@ int32_t xar_lzma_toheap_in(xar_t x, xar_file_t f, xar_prop_t p, void **in, size_ + xar_err_callback(x, XAR_SEVERITY_FATAL, XAR_ERR_ARCHIVE_CREATION); + return -1; + } ++ + LZMA_CONTEXT(context)->lzmacompressed = 1; + if( *inlen == 0 ) + return 0; +@@ -303,7 +254,8 @@ int32_t xar_lzma_toheap_in(xar_t x, xar_file_t f, xar_prop_t p, void **in, size_ + outlen = newlen; + else + abort(); /* Someone has somehow malloced over 2^64 bits of ram. */ +- ++ ++ out = realloc(out, outlen); + if( out == NULL ) abort(); + + LZMA_CONTEXT(context)->lzma.next_out = ((unsigned char *)out) + offset; +@@ -318,7 +270,10 @@ int32_t xar_lzma_toheap_in(xar_t x, xar_file_t f, xar_prop_t p, void **in, size_ + if (newlen > outlen) + outlen = newlen; + else +- abort(); /* Someone has somehow malloced over 2^64 bits of ram. */ if( out == NULL ) abort(); ++ abort(); /* Someone has somehow malloced over 2^64 bits of ram. */ ++ ++ out = realloc(out, outlen); ++ if( out == NULL ) abort(); + + LZMA_CONTEXT(context)->lzma.next_out = ((unsigned char *)out) + offset; + LZMA_CONTEXT(context)->lzma.avail_out = outlen - offset; +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0003-Fix-undefined-EXT2_ECOMPR_FL-for-e2fsprogs.patch b/pkgs/by-name/xa/xar/patches/0003-Fix-undefined-EXT2_ECOMPR_FL-for-e2fsprogs.patch new file mode 100644 index 0000000000000..795c42ad59c40 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0003-Fix-undefined-EXT2_ECOMPR_FL-for-e2fsprogs.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sat, 27 Jul 2024 18:25:48 +0300 +Subject: [PATCH 03/19] Fix undefined EXT2_ECOMPR_FL for e2fsprogs + +See https://github.com/mackyle/xar/issues/10 +--- + xar/lib/ext2.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/xar/lib/ext2.c b/xar/lib/ext2.c +index 767891a..2380846 100644 +--- a/xar/lib/ext2.c ++++ b/xar/lib/ext2.c +@@ -139,8 +139,10 @@ int xar_ext2attr_archive(xar_t x, xar_file_t f, const char* file, const char *bu + if(! (flags & ~EXT2_NOCOMPR_FL) ) + x_addprop(f, "NoCompBlock"); + #endif ++#ifdef EXT2_ECOMPR_FL + if(! (flags & ~EXT2_ECOMPR_FL) ) + x_addprop(f, "CompError"); ++#endif + if(! (flags & ~EXT2_BTREE_FL) ) + x_addprop(f, "BTree"); + if(! (flags & ~EXT2_INDEX_FL) ) +@@ -225,8 +227,10 @@ int xar_ext2attr_extract(xar_t x, xar_file_t f, const char* file, char *buffer, + if( e2prop_get(f, "NoCompBlock", (char **)&tmp) == 0 ) + flags |= EXT2_NOCOMPR_FL ; + #endif ++#ifdef EXT2_ECOMPR_FL + if( e2prop_get(f, "CompError", (char **)&tmp) == 0 ) + flags |= EXT2_ECOMPR_FL ; ++#endif + if( e2prop_get(f, "BTree", (char **)&tmp) == 0 ) + flags |= EXT2_BTREE_FL ; + if( e2prop_get(f, "HashIndexed", (char **)&tmp) == 0 ) +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0004-Fix-compatibility-with-openssl-1.0.patch b/pkgs/by-name/xa/xar/patches/0004-Fix-compatibility-with-openssl-1.0.patch new file mode 100644 index 0000000000000..bd1fed261c782 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0004-Fix-compatibility-with-openssl-1.0.patch @@ -0,0 +1,60 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Fabian Groffen <grobian@gentoo.org> +Date: Tue, 1 Jan 2019 18:00:08 +0100 +Subject: [PATCH 04/19] Fix compatibility with openssl-1.0 + +Patch-Source: https://github.com/gentoo/gentoo/blob/dce914f2bbf52360f45c90d877857df3c4c2a353/app-arch/xar/files/xar-1.8-openssl-1.1.patch +-- +lib/hash.c: fix compilation with OpenSSL-1.1+ + +EVP_MD_CTX has become an anonymous struct now, so can't allocate size +for it anymore. +--- + xar/lib/hash.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/xar/lib/hash.c b/xar/lib/hash.c +index 66876ad..cb4f6cf 100644 +--- a/xar/lib/hash.c ++++ b/xar/lib/hash.c +@@ -97,7 +97,7 @@ struct __xar_hash_t { + #ifdef __APPLE__ + CCDigestRef digest; + #else +- EVP_MD_CTX digest; ++ EVP_MD_CTX *digest; + const EVP_MD *type; + #endif + unsigned int length; +@@ -118,7 +118,8 @@ xar_hash_t xar_hash_new(const char *digest_name, void *context) { + #else + OpenSSL_add_all_digests(); + HASH_CTX(hash)->type = EVP_get_digestbyname(digest_name); +- EVP_DigestInit(&HASH_CTX(hash)->digest, HASH_CTX(hash)->type); ++ HASH_CTX(hash)->digest = EVP_MD_CTX_create(); ++ EVP_DigestInit(HASH_CTX(hash)->digest, HASH_CTX(hash)->type); + #endif + + HASH_CTX(hash)->digest_name = strdup(digest_name); +@@ -138,7 +139,7 @@ void xar_hash_update(xar_hash_t hash, void *buffer, size_t nbyte) { + #ifdef __APPLE__ + CCDigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte); + #else +- EVP_DigestUpdate(&HASH_CTX(hash)->digest, buffer, nbyte); ++ EVP_DigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte); + #endif + } + +@@ -155,7 +156,8 @@ void *xar_hash_finish(xar_hash_t hash, size_t *nbyte) { + CCDigestFinal(HASH_CTX(hash)->digest, buffer); + CCDigestDestroy(HASH_CTX(hash)->digest); + #else +- EVP_DigestFinal(&HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length); ++ EVP_DigestFinal(HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length); ++ EVP_MD_CTX_destroy(HASH_CTX(hash)->digest); + #endif + + *nbyte = HASH_CTX(hash)->length; +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0005-Fix-configure.ac-for-Linux-headers.patch b/pkgs/by-name/xa/xar/patches/0005-Fix-configure.ac-for-Linux-headers.patch new file mode 100644 index 0000000000000..1b24fc6b2dfce --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0005-Fix-configure.ac-for-Linux-headers.patch @@ -0,0 +1,123 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> +Date: Sat, 2 Mar 2024 01:25:52 +0100 +Subject: [PATCH 05/19] Fix configure.ac for Linux headers + +Patch-Source: https://github.com/gentoo/gentoo/blob/dce914f2bbf52360f45c90d877857df3c4c2a353/app-arch/xar/files/xar-1.8.0.0.452-linux.patch +--- + xar/configure.ac | 19 +++++++++++++++++-- + xar/include/config.h.in | 3 +++ + xar/lib/util.c | 15 +++++++++++++++ + 3 files changed, 35 insertions(+), 2 deletions(-) + +diff --git a/xar/configure.ac b/xar/configure.ac +index 3a36f42..26d41a5 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -183,7 +183,7 @@ AC_SUBST([enable_autogen]) + + AC_TRY_COMPILE([#include <sys/types.h> + #include <sys/acl.h>], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])]) +-AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h) ++AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/vfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h) + AC_CHECK_FUNCS(lgetxattr) + AC_CHECK_FUNCS(lsetxattr) + AC_CHECK_FUNCS(getxattr) +@@ -199,7 +199,22 @@ AC_CHECK_FUNCS(strmode) + + AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[#include <sys/types.h> + #include <sys/param.h> +-#include <sys/mount.h>]) ++#include <sys/mount.h> ++#ifdef HAVE_SYS_VFS_H ++#include <sys/vfs.h> ++#endif]) ++AC_CHECK_MEMBERS([struct statfs.f_iosize],,,[#include <sys/types.h> ++#include <sys/param.h> ++#include <sys/mount.h> ++#ifdef HAVE_SYS_VFS_H ++#include <sys/vfs.h> ++#endif]) ++AC_CHECK_MEMBERS([struct statfs.f_bsize],,,[#include <sys/types.h> ++#include <sys/param.h> ++#include <sys/mount.h> ++#ifdef HAVE_SYS_VFS_H ++#include <sys/vfs.h> ++#endif]) + AC_CHECK_MEMBERS([struct statvfs.f_fstypename],,,[#include <sys/statvfs.h>]) + AC_CHECK_MEMBERS([struct stat.st_flags]) + +diff --git a/xar/include/config.h.in b/xar/include/config.h.in +index 2bb997b..16c72d3 100644 +--- a/xar/include/config.h.in ++++ b/xar/include/config.h.in +@@ -1,4 +1,5 @@ + #undef HAVE_SYS_STATFS_H ++#undef HAVE_SYS_VFS_H + #undef HAVE_SYS_XATTR_H + #undef HAVE_SYS_EXTATTR_H + #undef HAVE_SYS_PARAM_H +@@ -15,6 +16,8 @@ + #undef HAVE_STRUCT_STAT_ST_FLAGS + #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME + #undef HAVE_STRUCT_STATFS_F_FSTYPENAME ++#undef HAVE_STRUCT_STATFS_F_IOSIZE ++#undef HAVE_STRUCT_STATFS_F_BSIZE + #undef HAVE_SYS_ACL_H + #undef HAVE_LIBUTIL_H + #undef HAVE_LIBPTHREAD +diff --git a/xar/lib/util.c b/xar/lib/util.c +index 0ea661a..1db2daa 100644 +--- a/xar/lib/util.c ++++ b/xar/lib/util.c +@@ -35,11 +35,16 @@ + * Christopher Ryan <ryanc@apple.com> + */ + ++#include "config.h" ++ + #include <stdio.h> + #include <stdint.h> + #include <sys/types.h> + #include <sys/mount.h> + #include <sys/param.h> ++#ifdef HAVE_SYS_VFS_H ++# include <sys/vfs.h> ++#endif + #include <arpa/inet.h> + #include <string.h> + #include <unistd.h> +@@ -583,6 +588,14 @@ char *xar_get_mtime(xar_t x, xar_file_t f) { + return tmp; + } + ++#ifndef HAVE_STRUCT_STATFS_F_IOSIZE ++# ifdef HAVE_STRUCT_STATFS_F_BSIZE ++# define f_iosize f_bsize ++# else ++# error need a field to get optimal transfer block size ++# endif ++#endif ++ + size_t xar_optimal_io_size_at_path(const char *path) + { + // Start at 1MiB +@@ -599,6 +612,7 @@ size_t xar_optimal_io_size_at_path(const char *path) + fs_iosize = optimal_rsize; + } + ++#ifdef MNT_LOCAL + // If we're a remote filesystem, never let us go below the optimal size above of 1MiB + // NFS is horrible and lies that the optimal size is 512 bytes. + // Whereas SMB in my testing returns 7MiBs (far more practicle) +@@ -611,6 +625,7 @@ size_t xar_optimal_io_size_at_path(const char *path) + } + } + else ++#endif + { + optimal_rsize = fs_iosize; + } +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0006-Fix-more-non-Darwin-stuff.patch b/pkgs/by-name/xa/xar/patches/0006-Fix-more-non-Darwin-stuff.patch new file mode 100644 index 0000000000000..bd052fba25ef5 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0006-Fix-more-non-Darwin-stuff.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sat, 27 Jul 2024 18:38:10 +0300 +Subject: [PATCH 06/19] Fix more non-Darwin stuff + +--- + xar/include/xar.h.in | 1 + + xar/lib/linuxattr.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/xar/include/xar.h.in b/xar/include/xar.h.in +index 9c93798..3d24b4f 100644 +--- a/xar/include/xar.h.in ++++ b/xar/include/xar.h.in +@@ -52,6 +52,7 @@ extern "C" { + #import <os/availability.h> + #else + #define API_DEPRECATED(...) ++#define API_AVAILABLE(...) + #endif + + #pragma pack(4) +diff --git a/xar/lib/linuxattr.c b/xar/lib/linuxattr.c +index 0fec2bb..58ee6a8 100644 +--- a/xar/lib/linuxattr.c ++++ b/xar/lib/linuxattr.c +@@ -226,7 +226,7 @@ int32_t xar_linuxattr_extract(xar_t x, xar_file_t f, const char* file, char *buf + if( statfs(file, &sfs) != 0 ) { + char *tmp, *bname; + tmp = strdup(file); +- bname = safe_dirname(tmp); ++ bname = xar_safe_dirname(tmp); + statfs(bname, &sfs); + free(tmp); + free(bname); +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0007-replace-initialized-constant-with-define-statement.patch b/pkgs/by-name/xa/xar/patches/0007-replace-initialized-constant-with-define-statement.patch new file mode 100644 index 0000000000000..0a2bc9dd6cb2d --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0007-replace-initialized-constant-with-define-statement.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Fabian Groffen <grobian@gentoo.org> +Date: Sat, 16 Jul 2022 21:34:13 +0200 +Subject: [PATCH 07/19] replace initialized constant with #define statement + +GCC doesn't like this: + +filetree.c:744:9: error: variable-sized object may not be initialized + +Since there's nothing changing at runtime at all, just make the compiler +see it's always going to be 1. + +Patch-Source: https://github.com/gentoo/gentoo/blob/dce914f2bbf52360f45c90d877857df3c4c2a353/app-arch/xar/files/xar-1.8.0.0.487-variable-sized-object.patch +--- + xar/lib/filetree.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xar/lib/filetree.c b/xar/lib/filetree.c +index f31682a..9c30c03 100644 +--- a/xar/lib/filetree.c ++++ b/xar/lib/filetree.c +@@ -752,7 +752,7 @@ int xar_file_equals_file(xar_file_t f1, xar_file_t f2) + size_t fspath1_size = 0, fspath2_size = 0; + size_t ns1_size = 0, ns2_size = 0; + const struct __xar_file_t * child1 = NULL, * child2 = NULL; +- const uint keys_to_ignore_count = 1; ++#define keys_to_ignore_count 1 + char * keys_to_ignore[keys_to_ignore_count] = { "id" }; // ID is allowed ot mismatch + + // If the two pointers match, call it the same. +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0008-Fix-configure.ac-not-finding-AR-with-target-prefix.patch b/pkgs/by-name/xa/xar/patches/0008-Fix-configure.ac-not-finding-AR-with-target-prefix.patch new file mode 100644 index 0000000000000..4345a5b271e70 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0008-Fix-configure.ac-not-finding-AR-with-target-prefix.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sat, 27 Jul 2024 18:43:38 +0300 +Subject: [PATCH 08/19] Fix configure.ac not finding $AR with target prefix +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes AR and RANLIB with target prefix (if not set to absolute paths). +Looks like AC_PATH_PROG doesn’t perform PATH lookups when user overrides +the program via environment variable but sets the value to program name +instead of absolute path. + +Note that LD seems to be unused so we remove it. +--- + xar/configure.ac | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/xar/configure.ac b/xar/configure.ac +index 26d41a5..3d8e5de 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -86,9 +86,8 @@ fi + AC_PROG_CPP + + AC_PROG_INSTALL +-AC_PATH_PROG([LD], [ld], , [$PATH]) +-AC_PATH_PROG([AR], [ar], , [$PATH]) +-AC_PATH_PROG([RANLIB], [ranlib], , [$PATH]) ++AC_PROG_AR ++AC_PROG_RANLIB + AC_PATH_PROG([AUTOCONF], [autoconf], , [$PATH]) + + dnl Some libtool envy +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0009-Add-useless-descriptions-to-AC_DEFINE.patch b/pkgs/by-name/xa/xar/patches/0009-Add-useless-descriptions-to-AC_DEFINE.patch new file mode 100644 index 0000000000000..8dd0932d09b64 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0009-Add-useless-descriptions-to-AC_DEFINE.patch @@ -0,0 +1,113 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Andrew Childs <andrew.childs@bibo.com.ph> +Date: Sun, 15 Nov 2020 19:12:33 +0900 +Subject: [PATCH 09/19] Add useless descriptions to AC_DEFINE + +Removes autoheader warnings from autoreconfHook. +--- + xar/configure.ac | 46 +++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) + +diff --git a/xar/configure.ac b/xar/configure.ac +index 3d8e5de..0cc04dd 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -219,48 +219,48 @@ AC_CHECK_MEMBERS([struct stat.st_flags]) + + AC_CHECK_SIZEOF(uid_t) + if test $ac_cv_sizeof_uid_t = "4"; then +-AC_DEFINE(UID_STRING, RId32) +-AC_DEFINE(UID_CAST, (uint32_t)) ++AC_DEFINE([UID_STRING], RId32, [UID_STRING]) ++AC_DEFINE([UID_CAST], (uint32_t), [UID_CAST]) + elif test $ac_cv_sizeof_uid_t = "8"; then +-AC_DEFINE(UID_STRING, PRId64) +-AC_DEFINE(UID_CAST, (uint64_t)) ++AC_DEFINE([UID_STRING], PRId64, [UID_STRING]) ++AC_DEFINE([UID_CAST], (uint64_t), [UID_CAST]) + else + AC_ERROR(can not detect the size of your system's uid_t type) + fi + + AC_CHECK_SIZEOF(gid_t) + if test $ac_cv_sizeof_gid_t = "4"; then +-AC_DEFINE(GID_STRING, PRId32) +-AC_DEFINE(GID_CAST, (uint32_t)) ++AC_DEFINE([GID_STRING], PRId32, [GID_STRING]) ++AC_DEFINE([GID_CAST], (uint32_t), [GID_CAST]) + elif test $ac_cv_sizeof_gid_t = "8"; then +-AC_DEFINE(GID_STRING, PRId64) +-AC_DEFINE(GID_CAST, (uint64_t)) ++AC_DEFINE([GID_STRING], PRId64, [GID_STRING]) ++AC_DEFINE([GID_CAST], (uint64_t), [GID_CAST]) + else + AC_ERROR(can not detect the size of your system's gid_t type) + fi + + AC_CHECK_SIZEOF(ino_t) + if test $ac_cv_sizeof_ino_t = "4"; then +-AC_DEFINE(INO_STRING, PRId32) +-AC_DEFINE(INO_HEXSTRING, PRIx32) +-AC_DEFINE(INO_CAST, (uint32_t)) ++AC_DEFINE([INO_STRING], PRId32, [INO_STRING]) ++AC_DEFINE([INO_HEXSTRING], PRIx32, [INO_HEXSTRING]) ++AC_DEFINE([INO_CAST], (uint32_t), [INO_CAST]) + elif test $ac_cv_sizeof_ino_t = "8"; then +-AC_DEFINE(INO_STRING, PRId64) +-AC_DEFINE(INO_HEXSTRING, PRIx64) +-AC_DEFINE(INO_CAST, (uint64_t)) ++AC_DEFINE([INO_STRING], PRId64, [INO_STRING]) ++AC_DEFINE([INO_HEXSTRING], PRIx64, [INO_HEXSTRING]) ++AC_DEFINE([INO_CAST], (uint64_t), [INO_CAST]) + else + AC_ERROR(can not detect the size of your system's ino_t type) + fi + + AC_CHECK_SIZEOF(dev_t) + if test $ac_cv_sizeof_dev_t = "4"; then +-AC_DEFINE(DEV_STRING, PRId32) +-AC_DEFINE(DEV_HEXSTRING, PRIx32) +-AC_DEFINE(DEV_CAST, (uint32_t)) ++AC_DEFINE([DEV_STRING], PRId32, [DEV_STRING]) ++AC_DEFINE([DEV_HEXSTRING], PRIx32, [DEV_HEXSTRING]) ++AC_DEFINE([DEV_CAST], (uint32_t), [DEV_CAST]) + elif test $ac_cv_sizeof_dev_t = "8"; then +-AC_DEFINE(DEV_STRING, PRId64) +-AC_DEFINE(DEV_HEXSTRING, PRIx64) +-AC_DEFINE(DEV_CAST, (uint64_t)) ++AC_DEFINE([DEV_STRING], PRId64, [DEV_STRING]) ++AC_DEFINE([DEV_HEXSTRING], PRIx64, [DEV_HEXSTRING]) ++AC_DEFINE([DEV_CAST], (uint64_t), [DEV_CAST]) + else + AC_ERROR(can not detect the size of your system's dev_t type) + fi +@@ -270,7 +270,7 @@ AC_CHECK_LIB(acl, acl_get_file) + dnl Check for paths + AC_PREFIX_DEFAULT(/usr/local) + +-AC_CHECK_FUNC([asprintf], AC_DEFINE([HAVE_ASPRINTF])) ++AC_CHECK_FUNC([asprintf], AC_DEFINE([HAVE_ASPRINTF], [], [HAVE_ASPRINTF])) + + dnl + dnl Configure libxml2. +@@ -350,7 +350,7 @@ have_libbz2="1" + AC_CHECK_HEADERS([bzlib.h], , [have_libbz2="0"]) + AC_CHECK_LIB([bz2], [BZ2_bzCompress], , [have_libbz2="0"]) + if test "x${have_libbz2}" = "x1" ; then +- AC_DEFINE([HAVE_LIBBZ2]) ++ AC_DEFINE([HAVE_LIBBZ2], [], [HAVE_LIBBZ2]) + fi + + dnl +@@ -360,7 +360,7 @@ have_libpthread="1" + AC_CHECK_HEADERS([pthread.h], , [have_pthread="0"]) + AC_CHECK_LIB([pthread], [pthread_mutex_lock], , [have_pthread="0"]) + if test "x${have_pthread}" = "x1" ; then +- AC_DEFINE([HAVE_PTHREAD]) ++ AC_DEFINE([HAVE_PTHREAD], [], [HAVE_PTHREAD]) + fi + + dnl +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0010-Update-configure.ac-for-openssl-libxml2-liblzma-and-.patch b/pkgs/by-name/xa/xar/patches/0010-Update-configure.ac-for-openssl-libxml2-liblzma-and-.patch new file mode 100644 index 0000000000000..a1b5aef3ca6cc --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0010-Update-configure.ac-for-openssl-libxml2-liblzma-and-.patch @@ -0,0 +1,127 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sat, 27 Jul 2024 18:58:14 +0300 +Subject: [PATCH 10/19] Update configure.ac for openssl, libxml2, liblzma and + musl-fts + +Simplifies libxml2 detection, adds detection for liblzma (from xz), +openssl and fts (for musl libc). +--- + xar/configure.ac | 83 +++++++++++++++++------------------------------- + 1 file changed, 30 insertions(+), 53 deletions(-) + +diff --git a/xar/configure.ac b/xar/configure.ac +index 0cc04dd..e466ee0 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -272,63 +272,14 @@ AC_PREFIX_DEFAULT(/usr/local) + + AC_CHECK_FUNC([asprintf], AC_DEFINE([HAVE_ASPRINTF], [], [HAVE_ASPRINTF])) + ++AC_SEARCH_LIBS([fts_close], [fts]) ++ + dnl + dnl Configure libxml2. + dnl +-LIBXML2_VERSION_MIN=2.6.11 +- + have_libxml2="1" +- +-AC_ARG_WITH([xml2-config], [ --with-xml2-config libxml2 config program], +-if test "x${with_xml2_config}" = "xno" ; then +- XML2_CONFIG= +-else +- XML2_CONFIG="${with_xml2_config}" +-fi +-, +- XML2_CONFIG= +-) +-if test "x${XML2_CONFIG}" != "x" ; then +- if test ! -x "${XML2_CONFIG}" ; then +- AC_MSG_ERROR([Unusable or missing xml2-config: ${XML2_CONFIG}]) +- fi +-else +- AC_PATH_PROG([XML2_CONFIG], [xml2-config], , [${PATH}]) +- if test "x${XML2_CONFIG}" = "x" ; then +- AC_MSG_ERROR([Cannot configure without xml2-config]) +- fi +-fi +- +-dnl Make sure the version of libxml2 found is sufficient. +-AC_MSG_CHECKING([for libxml >= ${LIBXML2_VERSION_MIN}]) +-LIBXML2_FOUND=`2>&1 ${XML2_CONFIG} --version` +-LIBXML2_MAJOR=`echo ${LIBXML2_FOUND} | tr . " " | awk '{print $1}'` +-LIBXML2_MINOR=`echo ${LIBXML2_FOUND} | tr . " " | awk '{print $2}' | tr a-z " " |awk '{print $1}'` +-LIBXML2_BRANCH=`echo ${LIBXML2_FOUND} | tr . " " | awk '{print $3}' | tr a-z " " |awk '{print $1}'` +-if test "x${LIBXML2_BRANCH}" = "x" ; then +- LIBXML2_BRANCH=0 +-fi +-LIBXML2_MAJOR_MIN=`echo ${LIBXML2_VERSION_MIN} | tr . " " | awk '{print $1}'` +-LIBXML2_MINOR_MIN=`echo ${LIBXML2_VERSION_MIN} | tr . " " | awk '{print $2}'` +-LIBXML2_BRANCH_MIN=`echo ${LIBXML2_VERSION_MIN} | tr . " " | awk '{print $3}'` +-if test ${LIBXML2_MAJOR} -gt ${LIBXML2_MAJOR_MIN} \ +- -o ${LIBXML2_MAJOR} -eq ${LIBXML2_MAJOR_MIN} \ +- -a ${LIBXML2_MINOR} -gt ${LIBXML2_MINOR_MIN} \ +- -o ${LIBXML2_MAJOR} -eq ${LIBXML2_MAJOR_MIN} \ +- -a ${LIBXML2_MINOR} -eq ${LIBXML2_MINOR_MIN} \ +- -a ${LIBXML2_BRANCH} -ge $LIBXML2_BRANCH_MIN ; then +- AC_MSG_RESULT([${LIBXML2_MAJOR}.${LIBXML2_MINOR}.${LIBXML2_BRANCH}]) +- have_libxml2="1" +- CPPFLAGS="${CPPFLAGS} `${XML2_CONFIG} --cflags`" +- LIBS="${LIBS} `${XML2_CONFIG} --libs`" +-else +- AC_MSG_RESULT([no]) +- have_libxml2="0" +-fi +-if test "x${have_libxml2}" = "x1" ; then +- dnl Final sanity check, to make sure that xmlwriter is present. +- AC_CHECK_HEADER([libxml/xmlwriter.h], , [have_libxml2="0"]) +-fi ++AC_CHECK_HEADERS([libxml/xmlwriter.h], , [have_libxml2="0"]) ++AC_CHECK_LIB([xml2], [xmlInitParser], , [have_libxml2="0"]) + if test "x${have_libxml2}" = "x0" ; then + AC_MSG_ERROR([Cannot build without libxml2]) + fi +@@ -343,6 +294,22 @@ if test "x${have_libz}" = "x0" ; then + AC_MSG_ERROR([Cannot build without libz]) + fi + ++dnl ++dnl Configure openssl. ++dnl ++have_openssl="1" ++AC_CHECK_HEADERS([openssl/evp.h], , [have_openssl="0"]) ++AC_CHECK_LIB([crypto], [OPENSSL_config], , [have_openssl="0"]) ++if test "x${have_openssl}" = "x0" ; then ++ case "${host}" in ++ *-*-darwin*) ++ ;; ++ *) ++ AC_MSG_ERROR([Cannot build without OpenSSL for non-Darwin host]) ++ ;; ++ esac ++fi ++ + dnl + dnl Configure libbz2. + dnl +@@ -353,6 +320,16 @@ if test "x${have_libbz2}" = "x1" ; then + AC_DEFINE([HAVE_LIBBZ2], [], [HAVE_LIBBZ2]) + fi + ++dnl ++dnl Configure liblzma. ++dnl ++have_liblzma="1" ++AC_CHECK_HEADERS([lzma.h], , [have_liblzma="0"]) ++AC_CHECK_LIB([lzma], [lzma_stream_decoder], , [have_liblzma="0"]) ++if test "x${have_liblzma}" = "x1" ; then ++ AC_DEFINE([HAVE_LIBLZMA], [], [HAVE_LIBLZMA]) ++fi ++ + dnl + dnl Configure libpthread. + dnl +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0011-Fix-missing-includes-and-silence-string-format-warni.patch b/pkgs/by-name/xa/xar/patches/0011-Fix-missing-includes-and-silence-string-format-warni.patch new file mode 100644 index 0000000000000..3eac163156e49 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0011-Fix-missing-includes-and-silence-string-format-warni.patch @@ -0,0 +1,104 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sat, 27 Jul 2024 19:10:46 +0300 +Subject: [PATCH 11/19] Fix missing includes and silence string format warnings + +Based on patch from Gentoo; see +https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/xar/files/xar-1.8.0.0.498-impl-decls.patch?id=cc91eb0f86043ae92c10cce55b326244bed3f061 +--- + xar/lib/Makefile.inc.in | 1 + + xar/lib/darwinattr.c | 1 + + xar/lib/ea.c | 3 ++- + xar/lib/ext2.c | 1 + + xar/lib/util.c | 1 + + xar/src/xar_internal.h | 4 ---- + 6 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/xar/lib/Makefile.inc.in b/xar/lib/Makefile.inc.in +index c046b25..d5e9003 100644 +--- a/xar/lib/Makefile.inc.in ++++ b/xar/lib/Makefile.inc.in +@@ -127,6 +127,7 @@ lib_distclean : + + CPPFLAGS := -I@objroot@include $(CPPFLAGS) + CPPFLAGS := -I@srcroot@include $(CPPFLAGS) ++CPPFLAGS := -I@srcroot@lib $(CPPFLAGS) + + # + # Build rules. +diff --git a/xar/lib/darwinattr.c b/xar/lib/darwinattr.c +index 4938965..18302b0 100644 +--- a/xar/lib/darwinattr.c ++++ b/xar/lib/darwinattr.c +@@ -37,6 +37,7 @@ + + #include "config.h" + #include <stdio.h> ++#include <stdlib.h> + #include <unistd.h> + #include <string.h> + #include <libgen.h> +diff --git a/xar/lib/ea.c b/xar/lib/ea.c +index 1bb8e27..fa1d06a 100644 +--- a/xar/lib/ea.c ++++ b/xar/lib/ea.c +@@ -29,6 +29,7 @@ + #include "config.h" + #include <stdlib.h> + #include <stdio.h> ++#include <inttypes.h> /* for PRId64 */ + #include <string.h> + #include <assert.h> + #include <libgen.h> +@@ -67,7 +68,7 @@ xar_ea_t xar_ea_new(xar_file_t f, const char *name) + xar_prop_setvalue(XAR_EA(ret)->prop, NULL); + XAR_PROP(XAR_EA(ret)->prop)->attrs = xar_attr_new(); + XAR_ATTR(XAR_PROP(XAR_EA(ret)->prop)->attrs)->key = strdup("id"); +- asprintf((char **)&XAR_ATTR(XAR_PROP(XAR_EA(ret)->prop)->attrs)->value, "%lld", XAR_FILE(f)->nexteaid++); ++ asprintf((char **)&XAR_ATTR(XAR_PROP(XAR_EA(ret)->prop)->attrs)->value, "%"PRId64, XAR_FILE(f)->nexteaid++); + + xar_prop_pset(f, XAR_EA(ret)->prop, "name", name); + +diff --git a/xar/lib/ext2.c b/xar/lib/ext2.c +index 2380846..b4ca1b0 100644 +--- a/xar/lib/ext2.c ++++ b/xar/lib/ext2.c +@@ -41,6 +41,7 @@ + #include "asprintf.h" + #endif + #include <stdio.h> ++#include <stdlib.h> + #include <unistd.h> + #include "xar.h" + #include "arcmod.h" +diff --git a/xar/lib/util.c b/xar/lib/util.c +index 1db2daa..ac0b822 100644 +--- a/xar/lib/util.c ++++ b/xar/lib/util.c +@@ -38,6 +38,7 @@ + #include "config.h" + + #include <stdio.h> ++#include <stdlib.h> + #include <stdint.h> + #include <sys/types.h> + #include <sys/mount.h> +diff --git a/xar/src/xar_internal.h b/xar/src/xar_internal.h +index b78745c..2e6199e 100644 +--- a/xar/src/xar_internal.h ++++ b/xar/src/xar_internal.h +@@ -8,11 +8,7 @@ + #ifndef _XAR_INTERNAL_H_ + #define _XAR_INTERNAL_H_ + +-#ifdef XARSIG_BUILDING_WITH_XAR + #include "xar.h" +-#else +-#include <xar/xar.h> +-#endif // XARSIG_BUILDING_WITH_XAR + + // Undeprecate these for internal usage + xar_t xar_open(const char *file, int32_t flags) API_AVAILABLE(macos(10.4)); +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0012-Fix-char-signedness-for-ARM-and-PowerPC.patch b/pkgs/by-name/xa/xar/patches/0012-Fix-char-signedness-for-ARM-and-PowerPC.patch new file mode 100644 index 0000000000000..bc4fb7ff85041 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0012-Fix-char-signedness-for-ARM-and-PowerPC.patch @@ -0,0 +1,46 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sat, 27 Jul 2024 19:26:14 +0300 +Subject: [PATCH 12/19] Fix char signedness for ARM and PowerPC +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use signed char explicitly for ARM and PowerPC (defaults to unsigned). +Otherwise -1 integer literal is helpfully converted to char 255… + +Derives from https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/xar/files/xar-1.8-arm-ppc.patch?id=cc91eb0f86043ae92c10cce55b326244bed3f061 +--- + xar/lib/b64.c | 2 +- + xar/src/xar.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xar/lib/b64.c b/xar/lib/b64.c +index 6361acd..4ffc34c 100644 +--- a/xar/lib/b64.c ++++ b/xar/lib/b64.c +@@ -59,7 +59,7 @@ typedef enum _B64CommandCodes { + B64_IgnorableCharacter = -1 + } B64CommandCodes; + +-static char b64revtb[256] = { ++static signed char b64revtb[256] = { + -3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*0-15*/ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*16-31*/ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /*32-47*/ +diff --git a/xar/src/xar.c b/xar/src/xar.c +index 9977e8a..1bceb63 100644 +--- a/xar/src/xar.c ++++ b/xar/src/xar.c +@@ -910,7 +910,7 @@ static void print_version() { + int main(int argc, char *argv[]) { + int ret; + char *filename = NULL; +- char command = 0, c; ++ signed char command = 0, c; + char **args; + const char *tocfile = NULL; + int arglen, i, err; +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0013-Enable-extended-attributes-for-btrfs.patch b/pkgs/by-name/xa/xar/patches/0013-Enable-extended-attributes-for-btrfs.patch new file mode 100644 index 0000000000000..7722e5c748e57 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0013-Enable-extended-attributes-for-btrfs.patch @@ -0,0 +1,43 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sat, 27 Jul 2024 19:28:09 +0300 +Subject: [PATCH 13/19] Enable extended attributes for btrfs + +--- + xar/lib/linuxattr.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/xar/lib/linuxattr.c b/xar/lib/linuxattr.c +index 58ee6a8..496dd82 100644 +--- a/xar/lib/linuxattr.c ++++ b/xar/lib/linuxattr.c +@@ -80,6 +80,10 @@ + #define XFS_SUPER_MAGIC 0x58465342 + #endif + ++#ifndef BTRFS_SUPER_MAGIC ++#define BTRFS_SUPER_MAGIC 0x9123683E ++#endif ++ + #if defined(HAVE_SYS_XATTR_H) && defined(HAVE_LGETXATTR) && !defined(__APPLE__) + + struct _linuxattr_context{ +@@ -175,6 +179,7 @@ TRYAGAIN: + case JFS_SUPER_MAGIC: fsname = "jfs" ; break; + case REISERFS_SUPER_MAGIC:fsname = "reiser" ; break; + case XFS_SUPER_MAGIC: fsname = "xfs" ; break; ++ case BTRFS_SUPER_MAGIC: fsname = "btrfs" ; break; + default: retval=0; goto BAIL; + }; + +@@ -236,6 +241,7 @@ int32_t xar_linuxattr_extract(xar_t x, xar_file_t f, const char* file, char *buf + case JFS_SUPER_MAGIC: fsname = "jfs" ; break; + case REISERFS_SUPER_MAGIC:fsname = "reiser" ; break; + case XFS_SUPER_MAGIC: fsname = "xfs" ; break; ++ case BTRFS_SUPER_MAGIC:fsname = "btrfs" ; break; + }; + + for(p = xar_prop_pfirst(f); p; p = xar_prop_pnext(p)) { +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0014-Fix-segfault-when-copying-xattr-buffers.patch b/pkgs/by-name/xa/xar/patches/0014-Fix-segfault-when-copying-xattr-buffers.patch new file mode 100644 index 0000000000000..6a9f3998e512f --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0014-Fix-segfault-when-copying-xattr-buffers.patch @@ -0,0 +1,123 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sat, 27 Jul 2024 20:46:31 +0300 +Subject: [PATCH 14/19] Fix segfault when copying xattr buffers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +xar_linuxattr_read allocates an internal buffer and incrementally copies +the data to xar_attrcopy_to_heap’s inbuf. This change fixes the offset +handling by rewriting xar_linuxattr_read function from scratch (with an +arguably cleaner implementation). +--- + xar/lib/linuxattr.c | 68 +++++++++++++++++++++++++++------------------ + 1 file changed, 41 insertions(+), 27 deletions(-) + +diff --git a/xar/lib/linuxattr.c b/xar/lib/linuxattr.c +index 496dd82..30c85c2 100644 +--- a/xar/lib/linuxattr.c ++++ b/xar/lib/linuxattr.c +@@ -97,39 +97,50 @@ struct _linuxattr_context{ + + #define LINUXATTR_CONTEXT(x) ((struct _linuxattr_context *)(x)) + +-int32_t xar_linuxattr_read(xar_t x, xar_file_t f, void * buf, size_t len, void *context) { +- +- if( !LINUXATTR_CONTEXT(context)->buf ) { +- int r; +- LINUXATTR_CONTEXT(context)->bufsz = 1024; ++int32_t xar_linuxattr_read(xar_t x, xar_file_t f, void *inbuf, size_t len, void *context) { ++ void *buf; ++ int bufsz, off, ret; ++ int r; ++ ++ buf = LINUXATTR_CONTEXT(context)->buf; ++ bufsz = LINUXATTR_CONTEXT(context)->bufsz; ++ off = LINUXATTR_CONTEXT(context)->off; ++ ++ if (buf == NULL) { ++ bufsz = 1024; + AGAIN2: +- LINUXATTR_CONTEXT(context)->buf = malloc(LINUXATTR_CONTEXT(context)->bufsz); +- if(!LINUXATTR_CONTEXT(context)->buf) +- goto AGAIN2; +- memset(LINUXATTR_CONTEXT(context)->buf, 0, LINUXATTR_CONTEXT(context)->bufsz); +- r = lgetxattr(LINUXATTR_CONTEXT(context)->file, LINUXATTR_CONTEXT(context)->attrname, LINUXATTR_CONTEXT(context)->buf, LINUXATTR_CONTEXT(context)->bufsz); +- if( r < 0 ) { +- switch(errno) { +- case ERANGE: LINUXATTR_CONTEXT(context)->bufsz *= 2; free(LINUXATTR_CONTEXT(context)->buf); goto AGAIN2; +- case ENOTSUP: free(LINUXATTR_CONTEXT(context)->buf); return 0; +- default: break; ++ buf = malloc(bufsz); ++ if (!buf) { ++ return -1; ++ } ++ memset(buf, 0, bufsz); ++ r = lgetxattr(LINUXATTR_CONTEXT(context)->file, LINUXATTR_CONTEXT(context)->attrname, buf, bufsz); ++ if (r < 0) { ++ free(buf); ++ switch (errno) { ++ case ERANGE: ++ bufsz *= 2; ++ goto AGAIN2; ++ case ENOTSUP: ++ return 0; + }; + return -1; + } ++ LINUXATTR_CONTEXT(context)->buf = buf; + LINUXATTR_CONTEXT(context)->bufsz = r; ++ bufsz = r; + } + +- if( (LINUXATTR_CONTEXT(context)->bufsz-LINUXATTR_CONTEXT(context)->off) <= len ) { +- int32_t ret; +- ret = LINUXATTR_CONTEXT(context)->bufsz - LINUXATTR_CONTEXT(context)->off; +- memcpy(buf, ((char *)LINUXATTR_CONTEXT(context)->buf)+LINUXATTR_CONTEXT(context)->off, ret); +- LINUXATTR_CONTEXT(context)->off += ret; +- return(ret); +- } else { +- memcpy(buf, ((char *)LINUXATTR_CONTEXT(context)->buf)+LINUXATTR_CONTEXT(context)->off, len); +- LINUXATTR_CONTEXT(context)->buf = ((char *)LINUXATTR_CONTEXT(context)->buf) + len; +- return len; ++ ret = bufsz - off; ++ if (ret <= len) { ++ memcpy(inbuf, ((char *)buf) + off, ret); ++ LINUXATTR_CONTEXT(context)->off = bufsz; ++ return ret; + } ++ ++ memcpy(inbuf, ((char *)buf) + off, len); ++ LINUXATTR_CONTEXT(context)->off += len; ++ return len; + } + + int32_t xar_linuxattr_write(xar_t x, xar_file_t f, void *buf, size_t len, void *context) { +@@ -185,6 +196,7 @@ TRYAGAIN: + + for( i=buf; (i-buf) < ret; i += strlen(i)+1 ) { + xar_ea_t e; ++ int rc; + + context.bufsz = 0; + context.off = 0; +@@ -194,11 +206,13 @@ TRYAGAIN: + xar_ea_pset(f, e, "fstype", fsname); + context.attrname = i; + context.ea = e; +- if (XAR(x)->attrcopy_to_heap(x, f, xar_ea_root(e), xar_linuxattr_read,&context) < 0) { ++ rc = XAR(x)->attrcopy_to_heap(x, f, xar_ea_root(e), xar_linuxattr_read, &context); ++ if (context.buf != NULL) ++ free(context.buf); ++ if (rc < 0) { + retval = -1; + goto BAIL; + } +- free(context.buf); + context.attrname = NULL; + } + +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0015-Fix-segfault-in-xar_attrcopy_from_heap.patch b/pkgs/by-name/xa/xar/patches/0015-Fix-segfault-in-xar_attrcopy_from_heap.patch new file mode 100644 index 0000000000000..bfec41f10a731 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0015-Fix-segfault-in-xar_attrcopy_from_heap.patch @@ -0,0 +1,59 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sat, 27 Jul 2024 21:04:20 +0300 +Subject: [PATCH 15/19] Fix segfault in xar_attrcopy_from_heap + +Fixes a nasty segfault crash when extracting files with extended +attributes (and perhaps in other cases). + +xar_attrcopy_from_heap (in lib/io.c) must not assume that context is +convertible to DATA_CONTEXT. Without this change, it calls the callback +from the provided context as if it was DATA_CONTEXT, but the context can +actually be other types, e.g. LINUXATTR_CONTEXT. +--- + xar/lib/data.c | 9 ++++++++- + xar/lib/io.c | 3 --- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/xar/lib/data.c b/xar/lib/data.c +index dcb5783..cfb3d58 100644 +--- a/xar/lib/data.c ++++ b/xar/lib/data.c +@@ -245,6 +245,13 @@ int32_t xar_data_extract(xar_t x, xar_file_t f, const char *file, char *buffer, + return retval; + } + ++static int xar_data_verify_callback(xar_t x, xar_file_t f, void *inbuf, size_t bsize, void *context) { ++ DATA_CONTEXT(context)->total += bsize; ++ if (DATA_CONTEXT(context)->progress) ++ DATA_CONTEXT(context)->progress(x, f, DATA_CONTEXT(context)->total); ++ return 0; ++} ++ + int32_t xar_data_verify(xar_t x, xar_file_t f, xar_progress_callback p) + { + const char *opt; +@@ -269,5 +276,5 @@ int32_t xar_data_verify(xar_t x, xar_file_t f, xar_progress_callback p) + if (!tmpp) // It appears that xar can have truely empty files, aka, no data. We should just fail to verify these files. + return 0; // After all, the checksum of blank is meaningless. So, failing to do so will cause a crash. + +- return XAR(x)->attrcopy_from_heap(x, f, tmpp, NULL , (void *)(&context)); ++ return XAR(x)->attrcopy_from_heap(x, f, tmpp, xar_data_verify_callback, (void *)(&context)); + } +diff --git a/xar/lib/io.c b/xar/lib/io.c +index fb9a72e..64c69af 100644 +--- a/xar/lib/io.c ++++ b/xar/lib/io.c +@@ -529,9 +529,6 @@ int32_t xar_attrcopy_from_heap(xar_t x, xar_file_t f, xar_prop_t p, write_callba + + readsofar += bsize; + +- if (DATA_CONTEXT(context)->progress) +- DATA_CONTEXT(context)->progress(x, f, readsofar); +- + bsize = def_bsize; + } + +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0016-Do-not-set-property-for-empty-ACL.patch b/pkgs/by-name/xa/xar/patches/0016-Do-not-set-property-for-empty-ACL.patch new file mode 100644 index 0000000000000..d036d1e3eb822 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0016-Do-not-set-property-for-empty-ACL.patch @@ -0,0 +1,90 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sun, 28 Jul 2024 12:00:01 +0300 +Subject: [PATCH 16/19] Do not set property for empty ACL + +On Linux, acl_get_file helpfully converts file mode bits to ACL if no +extended attribute is set. See +https://git.savannah.nongnu.org/cgit/acl.git/tree/libacl/acl_get_file.c?id=d9bb1759d4dad2f28a6dcc8c1742ff75d16dd10d#n83 + +At the same time, Nix sandbox does not filter getxattr syscalls to +return ENOTSUP, but does filter setxattr. So we are in a intricate +situation where acl library thinks that EAs/ACLs are supported and +returns meaningful values for reads, so xar archives files with acl +property, but extraction fails because of the syscall filter. + +As a workaround, we add acl_extended_file check that actually returns +whether the file is associated with ACLs (internally represented as +extended attributes). +--- + xar/configure.ac | 5 ++--- + xar/include/config.h.in | 2 ++ + xar/lib/stat.c | 9 +++++++++ + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/xar/configure.ac b/xar/configure.ac +index e466ee0..c3d9ff7 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -180,9 +180,8 @@ fi + ) + AC_SUBST([enable_autogen]) + +-AC_TRY_COMPILE([#include <sys/types.h> +-#include <sys/acl.h>], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])]) +-AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/vfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h) ++AC_CHECK_HEADERS(sys/acl.h acl/libacl.h ext2fs/ext2_fs.h sys/statfs.h sys/vfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h) ++AC_CHECK_DECLS([acl_extended_file], [], [], [[#include <acl/libacl.h>]]) + AC_CHECK_FUNCS(lgetxattr) + AC_CHECK_FUNCS(lsetxattr) + AC_CHECK_FUNCS(getxattr) +diff --git a/xar/include/config.h.in b/xar/include/config.h.in +index 16c72d3..779f5aa 100644 +--- a/xar/include/config.h.in ++++ b/xar/include/config.h.in +@@ -3,6 +3,7 @@ + #undef HAVE_SYS_XATTR_H + #undef HAVE_SYS_EXTATTR_H + #undef HAVE_SYS_PARAM_H ++#undef HAVE_DECL_ACL_EXTENDED_FILE + #undef HAVE_LGETXATTR + #undef HAVE_LSETXATTR + #undef HAVE_GETXATTR +@@ -12,6 +13,7 @@ + #undef HAVE_CHFLAGS + #undef HAVE_STATVFS + #undef HAVE_STATFS ++#undef HAVE_ACL_LIBACL_H + #undef HAVE_EXT2FS_EXT2_FS_H + #undef HAVE_STRUCT_STAT_ST_FLAGS + #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME +diff --git a/xar/lib/stat.c b/xar/lib/stat.c +index b0cce7c..81771dc 100644 +--- a/xar/lib/stat.c ++++ b/xar/lib/stat.c +@@ -66,6 +66,9 @@ + #ifdef HAVE_SYS_ACL_H + #include <sys/acl.h> + #endif ++#ifdef HAVE_ACL_LIBACL_H ++#include <acl/libacl.h> ++#endif + #include "xar.h" + #include "arcmod.h" + #include "archive.h" +@@ -131,6 +134,12 @@ static int32_t aacls(xar_t x, xar_file_t f, const char *file) { + if( !xar_check_prop(x, "acl") ) + return 0; + ++#ifdef HAVE_DECL_ACL_EXTENDED_FILE ++ /* Do nothing if the file is not associated with ACL. */ ++ if( !acl_extended_file(file) ) ++ return 0; ++#endif ++ + a = acl_get_file(file, ACL_TYPE_DEFAULT); + if( a ) { + char *t; +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0017-Fix-time-format-for-musl.patch b/pkgs/by-name/xa/xar/patches/0017-Fix-time-format-for-musl.patch new file mode 100644 index 0000000000000..6123eef845f84 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0017-Fix-time-format-for-musl.patch @@ -0,0 +1,75 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Tue, 30 Jul 2024 16:06:57 +0300 +Subject: [PATCH 17/19] Fix time format for musl + +Directive %F is not supported in musl (until recent versions). +https://git.musl-libc.org/cgit/musl/commit/src/time/strptime.c?id=fced99e93daeefb0192fd16304f978d4401d1d77 + +Avoid using it for str[fp]time. +--- + xar/lib/stat.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/xar/lib/stat.c b/xar/lib/stat.c +index 81771dc..d71a613 100644 +--- a/xar/lib/stat.c ++++ b/xar/lib/stat.c +@@ -82,6 +82,8 @@ + #define LLONG_MAX LONG_LONG_MAX + #endif + ++static const char time_format[] = "%Y-%m-%dT%H:%M:%SZ"; ++ + static struct { + const char *name; + mode_t type; +@@ -513,24 +515,21 @@ int32_t xar_stat_archive(xar_t x, xar_file_t f, const char *file, const char *bu + if( xar_check_prop(x, "atime") ) { + gmtime_r(&XAR(x)->sbcache.st_atime, &t); + memset(time, 0, sizeof(time)); +- strftime(time, sizeof(time), "%FT%T", &t); +- strcat(time, "Z"); ++ strftime(time, sizeof(time), time_format, &t); + xar_prop_set(f, "atime", time); + } + + if( xar_check_prop(x, "mtime") ) { + gmtime_r(&XAR(x)->sbcache.st_mtime, &t); + memset(time, 0, sizeof(time)); +- strftime(time, sizeof(time), "%FT%T", &t); +- strcat(time, "Z"); ++ strftime(time, sizeof(time), time_format, &t); + xar_prop_set(f, "mtime", time); + } + + if( xar_check_prop(x, "ctime") ) { + gmtime_r(&XAR(x)->sbcache.st_ctime, &t); + memset(time, 0, sizeof(time)); +- strftime(time, sizeof(time), "%FT%T", &t); +- strcat(time, "Z"); ++ strftime(time, sizeof(time), time_format, &t); + xar_prop_set(f, "ctime", time); + } + +@@ -680,7 +679,7 @@ int32_t xar_set_perm(xar_t x, xar_file_t f, const char *file, char *buffer, size + xar_prop_get(f, "atime", ×tr); + if( timestr ) { + memset(&t, 0, sizeof(t)); +- strptime(timestr, "%FT%T", &t); ++ strptime(timestr, time_format, &t); + tv[ATIME].tv_sec = timegm(&t); + } else { + tv[ATIME].tv_sec = time(NULL); +@@ -689,7 +688,7 @@ int32_t xar_set_perm(xar_t x, xar_file_t f, const char *file, char *buffer, size + xar_prop_get(f, "mtime", ×tr); + if( timestr ) { + memset(&t, 0, sizeof(t)); +- strptime(timestr, "%FT%T", &t); ++ strptime(timestr, time_format, &t); + tv[MTIME].tv_sec = timegm(&t); + } else { + tv[MTIME].tv_sec = time(NULL); +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0018-Replace-memcpy-with-memmove-for-musl.patch b/pkgs/by-name/xa/xar/patches/0018-Replace-memcpy-with-memmove-for-musl.patch new file mode 100644 index 0000000000000..2b8c17100951e --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0018-Replace-memcpy-with-memmove-for-musl.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Tue, 30 Jul 2024 17:29:06 +0300 +Subject: [PATCH 18/19] Replace memcpy with memmove for musl + +--- + xar/lib/io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xar/lib/io.c b/xar/lib/io.c +index 64c69af..c962c4b 100644 +--- a/xar/lib/io.c ++++ b/xar/lib/io.c +@@ -650,7 +650,7 @@ static int32_t flush_stream(xar_stream *stream) { + state->pending_buf = NULL; + } else if( state->pending_buf_size > len ) { + state->pending_buf_size -= len; +- memcpy(state->pending_buf, state->pending_buf + len, state->pending_buf_size); ++ memmove(state->pending_buf, state->pending_buf + len, state->pending_buf_size); + } + } + +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0019-Prefer-OpenSSL-over-CommonCrypto-if-available.patch b/pkgs/by-name/xa/xar/patches/0019-Prefer-OpenSSL-over-CommonCrypto-if-available.patch new file mode 100644 index 0000000000000..622ae16dc5fe9 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0019-Prefer-OpenSSL-over-CommonCrypto-if-available.patch @@ -0,0 +1,150 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach <mr.trubach@icloud.com> +Date: Sat, 24 Aug 2024 10:44:09 +0300 +Subject: [PATCH 19/19] Prefer OpenSSL over CommonCrypto if available + +In Nixpkgs, we always have OpenSSL input available, so it makes sense to +prefer it over the CommonCrypto library. +See https://github.com/NixOS/nixpkgs/pull/329721#discussion_r1713492113 +--- + xar/configure.ac | 5 ++++- + xar/include/config.h.in | 1 + + xar/lib/archive.h | 6 ------ + xar/lib/hash.c | 20 +++++++++++--------- + 4 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/xar/configure.ac b/xar/configure.ac +index c3d9ff7..f7626bf 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -299,9 +299,12 @@ dnl + have_openssl="1" + AC_CHECK_HEADERS([openssl/evp.h], , [have_openssl="0"]) + AC_CHECK_LIB([crypto], [OPENSSL_config], , [have_openssl="0"]) +-if test "x${have_openssl}" = "x0" ; then ++if test "x${have_openssl}" = "x1" ; then ++ AC_DEFINE([HAVE_OPENSSL], [], [HAVE_OPENSSL]) ++else + case "${host}" in + *-*-darwin*) ++ # Darwin uses CommonCrypto if OpenSSL is not available. + ;; + *) + AC_MSG_ERROR([Cannot build without OpenSSL for non-Darwin host]) +diff --git a/xar/include/config.h.in b/xar/include/config.h.in +index 779f5aa..dd44002 100644 +--- a/xar/include/config.h.in ++++ b/xar/include/config.h.in +@@ -24,6 +24,7 @@ + #undef HAVE_LIBUTIL_H + #undef HAVE_LIBPTHREAD + #undef HAVE_ASPRINTF ++#undef HAVE_OPENSSL + #undef HAVE_LIBBZ2 + #undef HAVE_LIBLZMA + #undef HAVE_LCHOWN +diff --git a/xar/lib/archive.h b/xar/lib/archive.h +index f926245..8743120 100644 +--- a/xar/lib/archive.h ++++ b/xar/lib/archive.h +@@ -40,12 +40,6 @@ + #define _XAR_ARCHIVE_H_ + #include <zlib.h> + #include <libxml/hash.h> +-#ifdef __APPLE__ +-#include <CommonCrypto/CommonDigest.h> +-#include <CommonCrypto/CommonDigestSPI.h> +-#else +-#include <openssl/evp.h> +-#endif + #include <sys/types.h> + #include <sys/stat.h> + #include "xar.h" +diff --git a/xar/lib/hash.c b/xar/lib/hash.c +index cb4f6cf..b99eca9 100644 +--- a/xar/lib/hash.c ++++ b/xar/lib/hash.c +@@ -41,7 +41,10 @@ + #include <string.h> + #include <sys/types.h> + #include <zlib.h> +-#ifdef __APPLE__ ++ ++#include "config.h" ++ ++#if !defined(HAVE_OPENSSL) + #include <CommonCrypto/CommonDigest.h> + #include <CommonCrypto/CommonDigestSPI.h> + #else +@@ -50,7 +53,6 @@ + + #include "xar.h" + #include "hash.h" +-#include "config.h" + #ifndef HAVE_ASPRINTF + #include "asprintf.h" + #endif +@@ -58,7 +60,7 @@ + + #pragma mark Hash Wrapper Object + +-#ifdef __APPLE__ ++#if !defined(HAVE_OPENSSL) + + CCDigestRef digestRef_from_name(const char* name, unsigned int *outHashSize) { + CCDigestRef result = NULL; +@@ -88,13 +90,13 @@ CCDigestRef digestRef_from_name(const char* name, unsigned int *outHashSize) { + + return result; + } +-#endif // __APPLE__ ++#endif // !defined(HAVE_OPENSSL) + + + struct __xar_hash_t { + const char *digest_name; + void *context; +-#ifdef __APPLE__ ++#if !defined(HAVE_OPENSSL) + CCDigestRef digest; + #else + EVP_MD_CTX *digest; +@@ -113,7 +115,7 @@ xar_hash_t xar_hash_new(const char *digest_name, void *context) { + if( context ) + HASH_CTX(hash)->context = context; + +-#ifdef __APPLE__ ++#if !defined(HAVE_OPENSSL) + HASH_CTX(hash)->digest = digestRef_from_name(digest_name, &HASH_CTX(hash)->length); + #else + OpenSSL_add_all_digests(); +@@ -136,7 +138,7 @@ const char *xar_hash_get_digest_name(xar_hash_t hash) { + } + + void xar_hash_update(xar_hash_t hash, void *buffer, size_t nbyte) { +-#ifdef __APPLE__ ++#if !defined(HAVE_OPENSSL) + CCDigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte); + #else + EVP_DigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte); +@@ -144,7 +146,7 @@ void xar_hash_update(xar_hash_t hash, void *buffer, size_t nbyte) { + } + + void *xar_hash_finish(xar_hash_t hash, size_t *nbyte) { +-#ifdef __APPLE__ ++#if !defined(HAVE_OPENSSL) + void *buffer = calloc(1, CC_SHA512_DIGEST_LENGTH); // current biggest digest size This is what OpenSSL uses + #else + void *buffer = calloc(1, EVP_MAX_MD_SIZE); +@@ -152,7 +154,7 @@ void *xar_hash_finish(xar_hash_t hash, size_t *nbyte) { + if( ! buffer ) + return NULL; + +-#ifdef __APPLE__ ++#if !defined(HAVE_OPENSSL) + CCDigestFinal(HASH_CTX(hash)->digest, buffer); + CCDigestDestroy(HASH_CTX(hash)->digest); + #else +-- +2.44.1 + diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index f299e46b8d966..717facbc033c3 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/xdg-desktop-portal-cosmic"; description = "XDG Desktop Portal for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; mainProgram = "xdg-desktop-portal-cosmic"; platforms = platforms.linux; }; diff --git a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix index e02d1fbedf40d..e1baa87bcaa13 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "xdg-desktop-portal-shana"; - version = "0.3.11"; + version = "0.3.12"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "xdg-desktop-portal-shana"; rev = "v${version}"; - sha256 = "sha256-bUskzFDd4qjH4Isp6vAJHe5qzgCLudQbkh+JNNTSMu8="; + hash = "sha256-bBKoAegT3wk2UD2fqSLaix2MuKtVAcHA6vcB9VAzLJw="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { mesonBuildType = "release"; - cargoHash = "sha256-FzEdQePDnSCuMDqbz0ZUywDzNfbiOwottSrE+eWL9to="; + cargoHash = "sha256-vufD/eYulblUKQVHsyvjl2AlRoRAGp2oeYol9kTt3lQ="; meta = with lib; { description = "Filechooser portal backend for any desktop environment"; diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix index 5d141eb8049c3..98d95290ca1e1 100644 --- a/pkgs/by-name/xd/xdg-user-dirs/package.nix +++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7G8G10lc26N6cyA5+bXhV4vLKWV2/eDaQO2y9SIg3zw="; }; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeBuildInputs = [ makeWrapper libxslt docbook_xsl - ] ++ lib.optionals stdenv.isDarwin [ gettext ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; preFixup = '' # fallback values need to be last diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix index 35dc31e9e46c3..80fe7d8fc49fe 100644 --- a/pkgs/by-name/xe/xed-editor/package.nix +++ b/pkgs/by-name/xe/xed-editor/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-Lpdv8mX3GDzXH1FGGdmgK9b8P3EY7ETuEhGfSwc6IIE="; + hash = "sha256-Lpdv8mX3GDzXH1FGGdmgK9b8P3EY7ETuEhGfSwc6IIE="; }; patches = [ diff --git a/pkgs/by-name/xe/xen-guest-agent/package.nix b/pkgs/by-name/xe/xen-guest-agent/package.nix index 9375b0d476560..b0223a6311ed2 100644 --- a/pkgs/by-name/xe/xen-guest-agent/package.nix +++ b/pkgs/by-name/xe/xen-guest-agent/package.nix @@ -45,9 +45,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.com/xen-project/xen-guest-agent"; license = lib.licenses.agpl3Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - matdibu - sigmasquadron - ]; + maintainers = lib.teams.xen.members; + mainProgram = "xen-guest-agent"; }; } diff --git a/pkgs/by-name/xe/xevd/package.nix b/pkgs/by-name/xe/xevd/package.nix index d5ba1995bb147..fc5c80e31bbb5 100644 --- a/pkgs/by-name/xe/xevd/package.nix +++ b/pkgs/by-name/xe/xevd/package.nix @@ -99,6 +99,6 @@ stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "xevd" ]; maintainers = with lib.maintainers; [ jopejoe1 ]; platforms = lib.platforms.all; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/by-name/xe/xeve/package.nix b/pkgs/by-name/xe/xeve/package.nix index f8acbee0acc0c..2f9f2b029d219 100644 --- a/pkgs/by-name/xe/xeve/package.nix +++ b/pkgs/by-name/xe/xeve/package.nix @@ -102,6 +102,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "xeve_app"; maintainers = with lib.maintainers; [ jopejoe1 ]; platforms = lib.platforms.all; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/by-name/xf/xfs-undelete/package.nix b/pkgs/by-name/xf/xfs-undelete/package.nix index e702280b78d93..390a19d1f06c0 100644 --- a/pkgs/by-name/xf/xfs-undelete/package.nix +++ b/pkgs/by-name/xf/xfs-undelete/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { repo = "xfs_undelete"; owner = "ianka"; rev = "9e2f7abf0d3a466328e335d251c567ce4194e473"; - sha256 = "0n1718bmr2lfpwx57hajancda51fyrgyk9rbybbadvd8gypvzmhh"; + hash = "sha256-ENa/r3+o7abW8iun6V/2LhTVmFVSwVM6v46KXBcKJ1g="; }; buildInputs = [ tcl-8_6 tcllib coreutils ]; diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix new file mode 100644 index 0000000000000..f0e26e4fe0203 --- /dev/null +++ b/pkgs/by-name/xi/xine-lib/package.nix @@ -0,0 +1,104 @@ +{ + lib, + aalib, + alsa-lib, + autoreconfHook, + fetchhg, + ffmpeg, + flac, + libGL, + libGLU, + libX11, + libXext, + libXinerama, + libXv, + libcaca, + libcdio, + libmng, + libmpcdec, + libpulseaudio, + libtheora, + libv4l, + libvorbis, + libxcb, + ncurses, + perl, + pkg-config, + speex, + stdenv, + vcdimager, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xine-lib"; + version = "1.2.13-unstable-2024-06-29"; + + src = fetchhg { + url = "http://hg.code.sf.net/p/xine/xine-lib-1.2"; + rev = "53845e2f6b1f3b69328de5c030c0ab27eb8f043d"; + hash = "sha256-O5lIYmNC2TpoY4QbPMsDWxNOoxdw61967Q4QG9d/+Bg="; + }; + + outputs = [ + "out" + "dev" + "man" + ]; + + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + ]; + + buildInputs = [ + aalib + alsa-lib + ffmpeg + flac + libGL + libGLU + libX11 + libX11 + libXext + libXext + libXinerama + libXinerama + libXv + libXv + libcaca + libcdio + libmng + libmpcdec + libpulseaudio + libtheora + libv4l + libvorbis + libxcb + libxcb + ncurses + perl + speex + vcdimager + zlib + ]; + + env.NIX_LDFLAGS = "-lxcb-shm"; + + enableParallelBuilding = true; + + strictDeps = true; + + meta = { + homepage = "https://xine.sourceforge.net/"; + description = "High-performance, portable and reusable multimedia playback engine"; + license = with lib.licenses; [ + gpl2Plus + lgpl2Plus + ]; + # No useful mainProgram + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix new file mode 100644 index 0000000000000..ddbd29be94c13 --- /dev/null +++ b/pkgs/by-name/xi/xine-ui/package.nix @@ -0,0 +1,85 @@ +{ + lib, + autoreconfHook, + curl, + fetchhg, + libXext, + libXft, + libXi, + libXinerama, + libXtst, + libXv, + libXxf86vm, + libjpeg, + libpng, + lirc, + ncurses, + perl, + pkg-config, + readline, + shared-mime-info, + stdenv, + xine-lib, + xorgproto, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xine-ui"; + version = "0.99.14-unstable-2024-08-26"; + + src = fetchhg { + url = "http://hg.code.sf.net/p/xine/xine-ui"; + rev = "2beaad6bb92e6732585f68af2e346a24e5ad53a5"; + hash = "sha256-Y08JX9q4w6pSJRCa5mWN11BnA6mZJSO/yn3X8YyZ6E4="; + }; + + outputs = [ + "out" + "dev" + "lib" + "man" + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + shared-mime-info + perl + ]; + + buildInputs = [ + curl + libXext + libXft + libXi + libXinerama + libXtst + libXv + libXxf86vm + libjpeg + libpng + lirc + ncurses + readline + xine-lib + xorgproto + ]; + + configureFlags = [ "--with-readline=${readline.dev}" ]; + + env = { + LIRC_CFLAGS = "-I${lib.getInclude lirc}/include"; + LIRC_LIBS = "-L ${lib.getLib lirc}/lib -llirc_client"; + }; + + strictDeps = true; + + meta = { + homepage = "https://xine.sourceforge.net/"; + description = "Xlib-based frontend for Xine video player"; + license = lib.licenses.gpl2Plus; + mainProgram = "xine"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/misc/xiphos/0001-Add-dbus-glib-dependency-to-main.patch b/pkgs/by-name/xi/xiphos/0001-Add-dbus-glib-dependency-to-main.patch similarity index 100% rename from pkgs/applications/misc/xiphos/0001-Add-dbus-glib-dependency-to-main.patch rename to pkgs/by-name/xi/xiphos/0001-Add-dbus-glib-dependency-to-main.patch diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/by-name/xi/xiphos/package.nix similarity index 100% rename from pkgs/applications/misc/xiphos/default.nix rename to pkgs/by-name/xi/xiphos/package.nix diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix index 30b6926901240..fe5ab564e9f71 100644 --- a/pkgs/by-name/xi/xiu/package.nix +++ b/pkgs/by-name/xi/xiu/package.nix @@ -29,9 +29,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libopus - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index 4c0d5c1320ed6..ed0f3b0f30d3d 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2024.14"; + version = "2024.16"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-WqLPesH6KaOAj7gYycyrmzG2NIkKs3cjUm+K83rvha0="; + hash = "sha256-r9NtNuPmc8J1y3MxA4oSdRmPKDQeDQENdKbNVlcGwAI="; }; meta = { diff --git a/pkgs/by-name/xm/xml-tooling-c/package.nix b/pkgs/by-name/xm/xml-tooling-c/package.nix index 921175c3e8794..709bfee14bb4c 100644 --- a/pkgs/by-name/xm/xml-tooling-c/package.nix +++ b/pkgs/by-name/xm/xml-tooling-c/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pkg-config ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-std=c++14"; enableParallelBuilding = true; diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix index de0b48feaf049..b19a711ae7eb7 100644 --- a/pkgs/by-name/xm/xmoji/package.nix +++ b/pkgs/by-name/xm/xmoji/package.nix @@ -15,18 +15,13 @@ stdenv.mkDerivation (finalAttrs: { name = "xmoji"; - version = "0.5.1"; + version = "0.8"; src = fetchFromGitHub { owner = "Zirias"; repo = "xmoji"; - rev = - let - inherit (lib.versions) majorMinor patch; - inherit (finalAttrs) version; - in - "refs/tags/v${majorMinor version}-${patch version}"; - hash = "sha256-ZZ1jW97JUv003bAMZZfGWbAAPgeZlpBKREaedFi3R8M="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-uYynbzexj1MDHcU8tryJLCGmqTfYOmY0vXrHZ3MlZa0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/xm/xmonad-log/package.nix b/pkgs/by-name/xm/xmonad-log/package.nix index 385d5edf90cfd..f75a52ab2afaa 100644 --- a/pkgs/by-name/xm/xmonad-log/package.nix +++ b/pkgs/by-name/xm/xmonad-log/package.nix @@ -8,7 +8,7 @@ buildGoModule { owner = "xintron"; repo = "xmonad-log"; rev = "70c76d59c22cf5f412467cd42fa9ff34eeb2bd1b"; - sha256 = "sha256-hDYb3mSX2+FX/2uazCKPXmNj0avDlutwSMjST7wLBVY="; + hash = "sha256-hDYb3mSX2+FX/2uazCKPXmNj0avDlutwSMjST7wLBVY="; }; vendorHash = "sha256-58zK6t3rb+19ilaQaNgsMVFQBYKPIV40ww8klrGbpnw="; diff --git a/pkgs/by-name/xp/xplayer/package.nix b/pkgs/by-name/xp/xplayer/package.nix index 3ceea76aa4097..632d23555e689 100644 --- a/pkgs/by-name/xp/xplayer/package.nix +++ b/pkgs/by-name/xp/xplayer/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-o2vLNIELd1EYWG26t5gOpnamJrBJeg4P6fcLirkcmfM="; + hash = "sha256-o2vLNIELd1EYWG26t5gOpnamJrBJeg4P6fcLirkcmfM="; }; # configure wants to find gst-inspect-1.0 via pkgconfig but diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix index b03cec6e5effa..b75adabdfdc7b 100644 --- a/pkgs/by-name/xp/xplr/package.nix +++ b/pkgs/by-name/xp/xplr/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0c2QJUEQwKEzzDBDP5XdX7xe1rivazsoZtepB4Dxp/c="; + hash = "sha256-0c2QJUEQwKEzzDBDP5XdX7xe1rivazsoZtepB4Dxp/c="; }; cargoHash = "sha256-RZgdWhVBZozYxbbNslCBLhN6EnogpyVXvht6GbzLnPs="; # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin - env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) { + env = lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) { TARGET_STRIP = "${stdenv.cc.targetPrefix}strip"; }; diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix index 08ea7ad793ae1..bf1ad8410bd0c 100644 --- a/pkgs/by-name/xr/xreader/package.nix +++ b/pkgs/by-name/xr/xreader/package.nix @@ -20,7 +20,6 @@ , webkitgtk_4_1 , nodePackages , ninja -, gsettings-desktop-schemas , djvulibre , backends ? [ "pdf" "ps" /* "dvi" "t1lib" */ "djvu" "tiff" "pixbuf" "comics" "xps" "epub" ] }: @@ -33,7 +32,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-c3oZ+PAsu180mlriQlF86TCBAnehLBv9Nc0SCtSkUuQ="; + hash = "sha256-c3oZ+PAsu180mlriQlF86TCBAnehLBv9Nc0SCtSkUuQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xs/xsimd/package.nix b/pkgs/by-name/xs/xsimd/package.nix index 8f8c72bc3f6a1..622f11f400bc6 100644 --- a/pkgs/by-name/xs/xsimd/package.nix +++ b/pkgs/by-name/xs/xsimd/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/xtensor-stack/xsimd/commit/c8a87ed6e04b6782f48f94713adfb0cad6c11ddf.patch"; hash = "sha256-2/FvBGdqTPcayD7rdHPSzL+F8IYKAfMW0WBJ0cW9EZ0="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/xtensor-stack/xsimd/issues/1030 ./disable-test_error_gamma.patch ]; diff --git a/pkgs/by-name/xt/xtf/package.nix b/pkgs/by-name/xt/xtf/package.nix new file mode 100644 index 0000000000000..acf98626b1abd --- /dev/null +++ b/pkgs/by-name/xt/xtf/package.nix @@ -0,0 +1,78 @@ +{ + lib, + fetchgit, + unstableGitUpdater, + stdenv, + doxygen, + graphviz, + python3Packages, +}: + +stdenv.mkDerivation { + pname = "xtf"; + version = "0-unstable-2024-09-13"; + + outputs = [ + "out" # xtf-runner and test suite. + "doc" # Autogenerated HTML documentation website. + "dev" # Development headers. + ]; + + src = fetchgit { + url = "https://xenbits.xenproject.org/git-http/xtf.git"; + rev = "c9a5e404e70c21c7621db4b8cabdf68261db7e1c"; + hash = "sha256-FMFbAdgH5KCpocAzUXb7nM3wpn4xs/gk/0M8AUVxXv0="; + }; + + nativeBuildInputs = + (with python3Packages; [ + python + wrapPython + ]) + ++ [ + doxygen + graphviz + ]; + + buildFlags = [ "doxygen" ]; + + installFlags = [ + "xtfdir=$(out)/share/xtf" + ]; + + postInstall = + # Much like Xen, XTF installs its files to dist/nix/store/*/*, + # so we need to copy them to the right place. + '' + mkdir -p ''${!outputBin}/share + cp -prvd dist/nix/store/*/* ''${!outputBin} + '' + # The documentation and development headers aren't in the dist/ + # folder, so we copy those too. + + '' + mkdir -p ''${!outputDoc}/share/doc/xtf + cp -prvd docs/autogenerated/html ''${!outputDoc}/share/doc/xtf + + mkdir -p ''${!outputDev}/include + cp -prvd include ''${!outputDev} + '' + # Wrap xtf-runner, and link it to $out/bin. + # This is necessary because the real xtf-runner should + # be in the same directory as the tests/ directory. + + '' + wrapPythonProgramsIn "''${!outputBin}/share/xtf" "''${!outputBin} $pythonPath" + mkdir -p ''${!outputBin}/bin + ln -s ''${!outputBin}/share/xtf/xtf-runner ''${!outputBin}/bin/xtf-runner + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Xen Test Framework and Suite for creating microkernel-based tests"; + homepage = "https://xenbits.xenproject.org/docs/xtf/index.html"; + license = lib.licenses.bsd2; + maintainers = lib.teams.xen.members; + mainProgram = "xtf-runner"; + platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.x86_64; + }; +} diff --git a/pkgs/by-name/xv/xviewer/package.nix b/pkgs/by-name/xv/xviewer/package.nix index 365988ede2682..0e04633f3c6ae 100644 --- a/pkgs/by-name/xv/xviewer/package.nix +++ b/pkgs/by-name/xv/xviewer/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-J1IlgHKyNGJTn1sIU3q02eTgWqyeRm2leFIhtKPIdhg="; + hash = "sha256-J1IlgHKyNGJTn1sIU3q02eTgWqyeRm2leFIhtKPIdhg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xw/xwiimote/package.nix b/pkgs/by-name/xw/xwiimote/package.nix index a17299197d27a..0114dba714005 100644 --- a/pkgs/by-name/xw/xwiimote/package.nix +++ b/pkgs/by-name/xw/xwiimote/package.nix @@ -5,7 +5,6 @@ ncurses, pkg-config, fetchFromGitHub, - bluez, autoreconfHook, }: diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index c6554adf968e8..22f21c191000d 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -23,11 +23,11 @@ let SkyLight ; - stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.2"; + version = "7.1.3"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -40,12 +40,12 @@ stdenv'.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isx86_64 [ + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ xcodebuild xxd ]; - buildInputs = lib.optionals stdenv.isx86_64 [ + buildInputs = lib.optionals stdenv.hostPlatform.isx86_64 [ Carbon Cocoa ScriptingBridge @@ -53,7 +53,7 @@ stdenv'.mkDerivation (finalAttrs: { ]; dontConfigure = true; - dontBuild = stdenv.isAarch64; + dontBuild = stdenv.hostPlatform.isAarch64; enableParallelBuilding = true; installPhase = '' @@ -62,14 +62,14 @@ stdenv'.mkDerivation (finalAttrs: { mkdir -p $out/{bin,share/icons/hicolor/scalable/apps} cp ./bin/yabai $out/bin/yabai - ${lib.optionalString stdenv.isx86_64 "cp ./assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/yabai.svg"} + ${lib.optionalString stdenv.hostPlatform.isx86_64 "cp ./assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/yabai.svg"} installManPage ./doc/yabai.1 runHook postInstall ''; postPatch = - lib.optionalString stdenv.isx86_64 # bash + lib.optionalString stdenv.hostPlatform.isx86_64 # bash '' # aarch64 code is compiled on all targets, which causes our Apple SDK headers to error out. # Since multilib doesn't work on darwin i dont know of a better way of handling this. @@ -96,13 +96,13 @@ stdenv'.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-4ZJs7Xpou0Ek0CCCjbK47Nu/XPpuTpBDU8GJz5AsaUg="; + hash = "sha256-wp5B24DYX1RYHS/3+4WRRCzVE6FyCzatJDpzJWrEIpQ="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-H+7vH6AjP6HQ1ifXe8qlLSh0FQu8KJkwr+38C5akk/c="; + hash = "sha256-hCwI6ziUR4yuJOv4MQXh3ufbausaDrG8XfjR+jIOeC4="; }; }; @@ -146,6 +146,7 @@ stdenv'.mkDerivation (finalAttrs: { ]; sourceProvenance = with lib.sourceTypes; - lib.optionals stdenv.isx86_64 [ fromSource ] ++ lib.optionals stdenv.isAarch64 [ binaryNativeCode ]; + lib.optionals stdenv.hostPlatform.isx86_64 [ fromSource ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ binaryNativeCode ]; }; }) diff --git a/pkgs/development/interpreters/yabasic/default.nix b/pkgs/by-name/ya/yabasic/package.nix similarity index 100% rename from pkgs/development/interpreters/yabasic/default.nix rename to pkgs/by-name/ya/yabasic/package.nix diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/by-name/ya/yambar/package.nix similarity index 100% rename from pkgs/applications/misc/yambar/default.nix rename to pkgs/by-name/ya/yambar/package.nix diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 14c9bbb5326dc..edffc11d361b9 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.73"; + version = "0.1.76"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-FXw476RXIFnjnK8cz/Kxni4dZ58LJvevcxiotDO7+bQ="; + hash = "sha256-+3UKOHfiY5GUkvvciNNFXBiAX1QQV4BUIFN+EhbjSEs="; }; executable = "ys"; diff --git a/pkgs/by-name/ya/yandex-cloud/package.nix b/pkgs/by-name/ya/yandex-cloud/package.nix index d93adcae1ab55..e45cf8ab738aa 100644 --- a/pkgs/by-name/ya/yandex-cloud/package.nix +++ b/pkgs/by-name/ya/yandex-cloud/package.nix @@ -12,14 +12,13 @@ nix, # tests testers, - yandex-cloud, }: let pname = "yandex-cloud"; sources = lib.importJSON ./sources.json; inherit (sources) version binaries; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { inherit pname version; src = fetchurl binaries.${stdenv.hostPlatform.system}; @@ -68,7 +67,7 @@ stdenv.mkDerivation { (lib.makeBinPath [ nix ]) ]; } ./update.py; - tests.version = testers.testVersion { package = yandex-cloud; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = { @@ -96,4 +95,4 @@ stdenv.mkDerivation { ]; mainProgram = "yc"; }; -} +}) diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json index 8cc8c92fb364a..2f9bfea320d98 100644 --- a/pkgs/by-name/ya/yandex-cloud/sources.json +++ b/pkgs/by-name/ya/yandex-cloud/sources.json @@ -1,25 +1,25 @@ { - "version": "0.132.1", + "version": "0.133.0", "binaries": { "aarch64-darwin": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.132.1/darwin/arm64/yc", - "hash": "sha256-d8Fw17Ld4/ifJ6hHTX2kcc8ju/5eXcUcRjyey16lEoo=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/darwin/arm64/yc", + "hash": "sha256-qdpiMIQygggXRysEClQPCSTHyG4Iz3qsqcpkGUmPylQ=" }, "aarch64-linux": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.132.1/linux/arm64/yc", - "hash": "sha256-VvfJGsNKd5uBDDZ8bWab7ZLaIKj7lG/5Kwvc/60MTuA=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/linux/arm64/yc", + "hash": "sha256-GyAeEIF07DmNFLYsmhmc76pEK7uao5v3XswG/mY0HNA=" }, "i686-linux": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.132.1/linux/386/yc", - "hash": "sha256-99rqys2wqY4B3S5XT2r75WyiffO09QoFBaKbbvNRSr8=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/linux/386/yc", + "hash": "sha256-j3Ieq2C+/LHHX7W5xhi77xKLqlMWV6MeCEVmR46ZLDk=" }, "x86_64-darwin": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.132.1/darwin/amd64/yc", - "hash": "sha256-ATMGC4RAHXJV13u4xNZWJboplrec6SSvbQwjTz1cBgI=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/darwin/amd64/yc", + "hash": "sha256-0HnSg1cwLDwv8RuGPZ0wJcCD1vCYOCjJJfLxu5b7hag=" }, "x86_64-linux": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.132.1/linux/amd64/yc", - "hash": "sha256-gI4ACuKEH7n3BP+v8I/8B7nyYFZch6LGuywr0qIxlE8=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/linux/amd64/yc", + "hash": "sha256-kP0BJUTVtRcyE/S24hBQrKxu/A4Zxo+PzlhdVZbcNc8=" } } } diff --git a/pkgs/by-name/ya/yandex-music/info.json b/pkgs/by-name/ya/yandex-music/info.json index 809ec521526ae..0223a0ae3ad39 100644 --- a/pkgs/by-name/ya/yandex-music/info.json +++ b/pkgs/by-name/ya/yandex-music/info.json @@ -1,7 +1,7 @@ { "branch": "master", - "commit_hash": "4ac238a00ca0b36e9755e55e54a22d3107ba443c", + "commit_hash": "d446a98850abccfe28a78363c96468a2a8109cfc", "commit_message": "Update packages", - "date": "2024-08-27", - "tag": "v5.13.2" + "date": "2024-09-22", + "tag": "v5.18.2" } diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix index 581bea8904569..6ee96d54fdd6f 100644 --- a/pkgs/by-name/ya/yandex-music/package.nix +++ b/pkgs/by-name/ya/yandex-music/package.nix @@ -14,13 +14,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "yandex-music"; - version = "5.13.2"; + version = "5.18.2"; src = fetchFromGitHub { owner = "cucumber-sp"; repo = "yandex-music-linux"; rev = "v${version}"; - hash = "sha256-yQX2GEulAQ02BndpwAAwGdTYtUlNXCgsCUdmXxPwtKU="; + hash = "sha256-y+T2ckrnhrOiiPKBUlnvDb4FwrIfbaIXwVi16AoX/bQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yandex-music/ym_info.json b/pkgs/by-name/ya/yandex-music/ym_info.json index 4a1609ca71197..cba72691edb92 100644 --- a/pkgs/by-name/ya/yandex-music/ym_info.json +++ b/pkgs/by-name/ya/yandex-music/ym_info.json @@ -1,9 +1,9 @@ { "ym": { - "version": "5.13.2", - "exe_name": "Yandex_Music_x64_5.13.2.exe", - "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.13.2.exe", - "exe_sha256": "ac7a489a59e074358559f544a26143ca81a6bdfa41481242f3419b76eaffdb0b" + "version": "5.18.2", + "exe_name": "Yandex_Music_x64_5.18.2.exe", + "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.18.2.exe", + "exe_sha256": "a513eb6aa4bd05bae8503f5578a8e91d778794ffe4eb3a450040903570106941" }, "electron": { "version": "29.4.6", diff --git a/pkgs/by-name/ya/yanic/package.nix b/pkgs/by-name/ya/yanic/package.nix index 97f3686cb3d57..459963c193032 100644 --- a/pkgs/by-name/ya/yanic/package.nix +++ b/pkgs/by-name/ya/yanic/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "FreifunkBremen"; repo = "yanic"; rev = "v${version}"; - sha256 = "sha256-z2vr1QmRCo8y4hopWP14xSV7lsWKkCzK9OehlVLFdIg="; + hash = "sha256-z2vr1QmRCo8y4hopWP14xSV7lsWKkCzK9OehlVLFdIg="; }; vendorHash = "sha256-6UiiajKLzW5e7y0F6GMYDZP6xTyOiccLIKlwvOY7LRo="; diff --git a/pkgs/by-name/ya/yapesdl/package.nix b/pkgs/by-name/ya/yapesdl/package.nix index 44bb2a0dbaf8e..9b974c3eebe25 100644 --- a/pkgs/by-name/ya/yapesdl/package.nix +++ b/pkgs/by-name/ya/yapesdl/package.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "yapesdl"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index dad01808b4c64..3f2d74eabd8cc 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "yara-x"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; rev = "refs/tags/v${version}"; - hash = "sha256-nzTksznwyLncQO2c2+ZI0Bn9kNXl6GthFCrkz3ihS3w="; + hash = "sha256-xCybcDRswxRHiPf0ultIahxSPqn0YonmR4Kah38wJuw="; }; - cargoHash = "sha256-+0aroLCmi2HPILCxLBFzjtHPpe6f6AMkoPdH5CjoyEo="; + cargoHash = "sha256-6CDzOxvktJc6AnFOm6OJp3cD2bZ0XCY5HLIoEmP59es="; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/by-name/ya/yarg/package.nix b/pkgs/by-name/ya/yarg/package.nix new file mode 100644 index 0000000000000..47c179af860fb --- /dev/null +++ b/pkgs/by-name/ya/yarg/package.nix @@ -0,0 +1,126 @@ +{ + lib, + stdenv, + fetchzip, + autoPatchelfHook, + alsa-lib, + gtk3, + zlib, + dbus, + hidapi, + libGL, + libXcursor, + libXext, + libXi, + libXinerama, + libxkbcommon, + libXrandr, + libXScrnSaver, + libXxf86vm, + udev, + vulkan-loader, + wayland, # (not used by default, enable with SDL_VIDEODRIVER=wayland - doesn't support HiDPI) + makeDesktopItem, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "yarg"; + version = "0.12.6"; + + src = fetchzip { + url = "https://github.com/YARC-Official/YARG/releases/download/v${finalAttrs.version}/YARG_v${finalAttrs.version}-Linux-x86_64.zip"; + stripRoot = false; + hash = "sha256-Za+CnuSTfJZVdW0pWvGDnKcbhZsgtNPRWYj1qOA8+Zs="; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + # Load-time libraries (loaded from DT_NEEDED section in ELF binary) + alsa-lib + gtk3 + stdenv.cc.cc.lib + zlib + + # Run-time libraries (loaded with dlopen) + dbus + hidapi + libGL + libXcursor + libXext + libXi + libXinerama + libxkbcommon + libXrandr + libXScrnSaver + libXxf86vm + udev + vulkan-loader + wayland + ]; + + desktopItem = makeDesktopItem { + name = "yarg"; + desktopName = "YARG"; + comment = finalAttrs.meta.description; + icon = "yarg"; + exec = "yarg"; + categories = [ "Game" ]; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 YARG "$out/bin/yarg" + install -Dm644 UnityPlayer.so "$out/libexec/yarg/UnityPlayer.so" + + mkdir -p "$out/share/pixmaps" + cp -r YARG_Data "$out/share/yarg" + ln -s "$out/share/yarg" "$out/bin/yarg_Data" + ln -s "$out/share/yarg/Resources/UnityPlayer.png" "$out/share/pixmaps/yarg.png" + install -Dm644 "$desktopItem/share/applications/yarg.desktop" "$out/share/applications/yarg.desktop" + + runHook postInstall + ''; + + # Patch required run-time libraries as load-time libraries + # + # Libraries found with: + # > strings UnityPlayer.so | grep '\.so' + # and: + # > LD_DEBUG=libs yarg + postFixup = '' + patchelf \ + --add-needed libasound.so.2 \ + --add-needed libdbus-1.so.3 \ + --add-needed libGL.so.1 \ + --add-needed libhidapi-hidraw.so.0 \ + --add-needed libpthread.so.0 \ + --add-needed libudev.so.1 \ + --add-needed libvulkan.so.1 \ + --add-needed libwayland-client.so.0 \ + --add-needed libwayland-cursor.so.0 \ + --add-needed libwayland-egl.so.1 \ + --add-needed libX11.so.6 \ + --add-needed libXcursor.so.1 \ + --add-needed libXext.so.6 \ + --add-needed libXi.so.6 \ + --add-needed libXinerama.so.1 \ + --add-needed libxkbcommon.so.0 \ + --add-needed libXrandr.so.2 \ + --add-needed libXss.so.1 \ + --add-needed libXxf86vm.so.1 \ + "$out/libexec/yarg/UnityPlayer.so" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Free, open-source, plastic guitar game"; + homepage = "https://yarg.in"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ kira-bruneau ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 1fba6d9ddcc9e..561eea7fdb0d2 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -11,23 +11,23 @@ rustPlatform.buildRustPackage rec { pname = "yazi"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "sxyazi"; repo = "yazi"; rev = "v${version}"; - hash = "sha256-skJK0iAqQ4uyEx/SeF/97YHWKYBNHmdYpltx3h6JvNc="; + hash = "sha256-bTDf8muJN0G4+c6UagtWgNLlmGN15twEBjdmKEP0bCE="; }; - cargoHash = "sha256-w7eFeKmYFDmSpG/p4r2w6qw8uUm4q+VUbAI+TnKhp5s="; + cargoHash = "sha256-8UsdanF8y4uFoXdC7aAw7pVFRd9GACcfVvqkUtFmN5k="; env.YAZI_GEN_COMPLETIONS = true; env.VERGEN_GIT_SHA = "Nixpkgs"; - env.VERGEN_BUILD_DATE = "2024-08-28"; + env.VERGEN_BUILD_DATE = "2024-09-04"; nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; + buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; postInstall = '' installShellCompletion --cmd yazi \ diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index 325a8d95e6bcb..56a384df64f5a 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = with python.pkgs; with llvmPackages; [ abseil-cpp boost libllvm.all libclang.all ] ++ [ jedi jedi-language-server pybind11 ] - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; buildPhase = '' export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true" diff --git a/pkgs/by-name/ye/yelp-xsl/package.nix b/pkgs/by-name/ye/yelp-xsl/package.nix index e655624b33ba6..7f255d9c5671f 100644 --- a/pkgs/by-name/ye/yelp-xsl/package.nix +++ b/pkgs/by-name/ye/yelp-xsl/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/yelp-xsl-${version}.tar.xz"; - sha256 = "sha256-I4vhULFlMIDOE5lxMw/TbTomWV4NagQKLAML89IAW80="; + hash = "sha256-I4vhULFlMIDOE5lxMw/TbTomWV4NagQKLAML89IAW80="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ye/yelp/package.nix b/pkgs/by-name/ye/yelp/package.nix index 49bc8954e9b45..4e95d25991427 100644 --- a/pkgs/by-name/ye/yelp/package.nix +++ b/pkgs/by-name/ye/yelp/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/yelp-${version}.tar.xz"; - sha256 = "sha256-osX9B4epCJxyLMZr0Phc33CI2HDntsyFeZ+OW/+erEs="; + hash = "sha256-osX9B4epCJxyLMZr0Phc33CI2HDntsyFeZ+OW/+erEs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ye/yesplaymusic/package.nix b/pkgs/by-name/ye/yesplaymusic/package.nix index 9a20e9ecf3129..077ba87758794 100644 --- a/pkgs/by-name/ye/yesplaymusic/package.nix +++ b/pkgs/by-name/ye/yesplaymusic/package.nix @@ -74,7 +74,7 @@ let platforms = builtins.attrNames srcs; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname version src meta; diff --git a/pkgs/development/interpreters/yex-lang/default.nix b/pkgs/by-name/ye/yex-lang/package.nix similarity index 100% rename from pkgs/development/interpreters/yex-lang/default.nix rename to pkgs/by-name/ye/yex-lang/package.nix diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix index cd24d14636f95..73df89af52957 100644 --- a/pkgs/by-name/yg/yggdrasil/package.nix +++ b/pkgs/by-name/yg/yggdrasil/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "sha256-3sX1xNfblmIXI1hiXL9bhA4+CobUZ5xhpJFKugzwlGE="; + hash = "sha256-3sX1xNfblmIXI1hiXL9bhA4+CobUZ5xhpJFKugzwlGE="; }; vendorHash = "sha256-HBl30BnSERivIHb3dbfhDwwBvs3MUkltDf+R790vSGE="; diff --git a/pkgs/by-name/yg/yggstack/package.nix b/pkgs/by-name/yg/yggstack/package.nix index c7e5ed31ed463..f2dff7cf9e525 100644 --- a/pkgs/by-name/yg/yggstack/package.nix +++ b/pkgs/by-name/yg/yggstack/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "yggdrasil-network"; repo = "yggstack"; rev = "${version}"; - sha256 = "sha256-RQ7AvVv+VLfgzlb7orZbSB7TNz/hj2fo832ed4WUN80="; + hash = "sha256-RQ7AvVv+VLfgzlb7orZbSB7TNz/hj2fo832ed4WUN80="; }; vendorHash = "sha256-Hjb3KSh+2qYYKdgv4+dsSp0kAbzz8gu9qnQdA7wB5fA="; diff --git a/pkgs/applications/networking/cluster/yor/default.nix b/pkgs/by-name/yo/yor/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/yor/default.nix rename to pkgs/by-name/yo/yor/package.nix diff --git a/pkgs/by-name/yo/you-have-mail-cli/Cargo.lock b/pkgs/by-name/yo/you-have-mail-cli/Cargo.lock new file mode 100644 index 0000000000000..ad46be8e545f8 --- /dev/null +++ b/pkgs/by-name/yo/you-have-mail-cli/Cargo.lock @@ -0,0 +1,2611 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +dependencies = [ + "cfg-if", + "cipher 0.3.0", + "cpufeatures", + "opaque-debug", +] + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix 0.37.23", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-process" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +dependencies = [ + "async-io", + "async-lock", + "autocfg", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix 0.37.23", + "signal-hook", + "windows-sys", +] + +[[package]] +name = "async-recursion" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "async-trait" +version = "0.1.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + +[[package]] +name = "bindgen" +version = "0.64.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 1.0.109", + "which", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-modes" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" +dependencies = [ + "block-padding", + "cipher 0.3.0", +] + +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + +[[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "log", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher 0.4.4", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher 0.4.4", + "poly1305", + "zeroize", +] + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "time", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "cipher" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +dependencies = [ + "generic-array", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0827b011f6f8ab38590295339817b0d26f344aa4932c3ced71b45b0c54b4a9" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9441b403be87be858db6a23edb493e7f694761acdc3343d5a0fcaafd304cbc9e" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "config" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7" +dependencies = [ + "async-trait", + "json5", + "lazy_static", + "nom", + "pathdiff", + "ron", + "rust-ini", + "serde", + "serde_json", + "toml", + "yaml-rust", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "ctrlc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" +dependencies = [ + "nix", + "windows-sys", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "destructure_traitobject" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "enumflags2" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "go-srp" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f786f81872feaf96e5b01c94bd9224aa2be59db29c6945c4e07a94b6076c53" +dependencies = [ + "base64 0.21.2", + "bindgen", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.4", + "windows-sys", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json5" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" +dependencies = [ + "pest", + "pest_derive", + "serde", +] + +[[package]] +name = "keyring" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04ac4b8b0884cdf23c4619d139acf43839eac4f0739b92980c2a6d460d9c84f5" +dependencies = [ + "byteorder", + "lazy_static", + "linux-keyutils", + "secret-service", + "security-framework", + "winapi", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-keyutils" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f27bb67f6dd1d0bb5ab582868e4f65052e58da6401188a08f0da09cf512b84b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +dependencies = [ + "serde", +] + +[[package]] +name = "log-mdc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" + +[[package]] +name = "log4rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d36ca1786d9e79b8193a68d480a0907b612f109537115c6ff655a3a1967533fd" +dependencies = [ + "anyhow", + "arc-swap", + "chrono", + "derivative", + "fnv", + "humantime", + "libc", + "log", + "log-mdc", + "parking_lot", + "serde", + "serde-value", + "serde_json", + "serde_yaml", + "thiserror", + "thread-id", + "typemap-ors", + "winapi", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset", + "static_assertions", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pest" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d2d1d55045829d65aad9d389139882ad623b33b904e7c9f1b10c5b8927298e5" +dependencies = [ + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f94bca7e7a599d89dea5dfa309e217e7906c3c007fb9c3299c40b10d6a315d3" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d490fe7e8556575ff6911e45567ab95e71617f43781e5c05490dc8d75c965c" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "pest_meta" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2674c66ebb4b4d9036012091b537aae5878970d6999f81a265034d85b136b341" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys", +] + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proton-api-rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f706fbf66d0b09e073cc1eb7bab276b438cde39f3ab48e2e76704ecad427dc" +dependencies = [ + "anyhow", + "base64 0.21.2", + "bytes", + "go-srp", + "log", + "parking_lot", + "secrecy", + "serde", + "serde_json", + "serde_repr", + "thiserror", + "ureq", +] + +[[package]] +name = "quote" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "ron" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" +dependencies = [ + "base64 0.13.1", + "bitflags 1.3.2", + "serde", +] + +[[package]] +name = "rpassword" +version = "7.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys", +] + +[[package]] +name = "rustls" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.1", + "sct", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "secrecy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" +dependencies = [ + "zeroize", +] + +[[package]] +name = "secret-service" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da1a5ad4d28c03536f82f77d9f36603f5e37d8869ac98f0a750d5b5686d8d95" +dependencies = [ + "aes", + "block-modes", + "futures-util", + "generic-array", + "hkdf", + "num", + "once_cell", + "rand", + "serde", + "sha2", + "zbus", +] + +[[package]] +name = "security-framework" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.173" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91f70896d6720bc714a4a57d22fc91f1db634680e65c8efe13323f1fa38d53f" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.173" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6250dde8342e0232232be9ca3db7aa40aceb5a3e5dd9bddbc00d99a007cde49" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "serde_json" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "serde_yaml" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +dependencies = [ + "indexmap 1.9.3", + "ryu", + "serde", + "yaml-rust", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socks" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" +dependencies = [ + "byteorder", + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[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.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix 0.37.23", + "windows-sys", +] + +[[package]] +name = "thiserror" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "thread-id" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee93aa2b8331c0fec9091548843f2c90019571814057da3b783f9de09349d73" +dependencies = [ + "libc", + "redox_syscall 0.2.16", + "winapi", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" + +[[package]] +name = "toml_edit" +version = "0.19.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap 2.0.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typemap-ors" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867" +dependencies = [ + "unsafe-any-ors", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "unsafe-any-ors" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad" +dependencies = [ + "destructure_traitobject", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "ureq" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +dependencies = [ + "base64 0.21.2", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-webpki 0.100.1", + "socks", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.26", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki 0.100.1", +] + +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +dependencies = [ + "memchr", +] + +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix", + "winapi", +] + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "you-have-mail-cli" +version = "0.3.0" +dependencies = [ + "anyhow", + "clap", + "config", + "crossbeam-channel", + "ctrlc", + "dirs", + "keyring", + "log", + "log4rs", + "rpassword", + "serde", + "ureq", + "you-have-mail-common", +] + +[[package]] +name = "you-have-mail-common" +version = "0.8.1" +source = "git+https://github.com/LeanderBB/you-have-mail-common#d15341296b80b9069f38f66b98a83bfe90edca2a" +dependencies = [ + "anyhow", + "base64 0.21.2", + "chacha20poly1305", + "crossbeam-channel", + "log4rs", + "parking_lot", + "proton-api-rs", + "secrecy", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zeroize" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/by-name/yo/you-have-mail-cli/package.nix b/pkgs/by-name/yo/you-have-mail-cli/package.nix new file mode 100644 index 0000000000000..bab211d788dfc --- /dev/null +++ b/pkgs/by-name/yo/you-have-mail-cli/package.nix @@ -0,0 +1,61 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + go, + buildGoModule, +}: + +rustPlatform.buildRustPackage { + pname = "you-have-mail-cli"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "LeanderBB"; + repo = "you-have-mail-cli"; + rev = "b338153353495428e2dc0065843553b7821b9d3a"; + hash = "sha256-YgIztCmL+uJUUXu+BWXLf9f4L7UpuPf0onsfMRtlWkw="; + }; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + go + ]; + + goSrpVersion = "0.1.5"; + configurePhase = '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH="$TMPDIR/go" + export GOPROXY=off + cp -r --reflink=auto $goModules ../cargo-vendor-dir/go-srp-$goSrpVersion/go/vendor + ''; + + goModules = + (buildGoModule { + pname = "proton-api-rs"; + version = "0.14.0"; + src = fetchFromGitHub { + owner = "LeanderBB"; + repo = "proton-api-rs"; + rev = "4597810e8335118f3c780a04e6d099ae46a7a376"; + hash = "sha256-PN5+D8PY7ouhvoyhu0X0PsgF8tgptl80cF0w2u8nUqs="; + }; + modRoot = "./go-srp/go/"; + vendorHash = "sha256-QPj2jq8hWL4kZellM/VwqrO/Oku/JW1Cig1Iv5YSI1U="; + }).goModules; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "you-have-mail-common-0.8.1" = "sha256-jDOIMvHqWvPpnyZ5V+6VsyFUDXz84yFROkInXE5CIyE="; + }; + }; + + meta = { + description = "Small application to notify you when you receive an email in your email account"; + homepage = "https://github.com/LeanderBB/you-have-mail-cli"; + license = lib.licenses.agpl3Only; + mainProgram = "you-have-mail-cli"; + maintainers = with lib.maintainers; [ baksa ]; + }; +} diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix index 8e5d57ae7a362..b8b66f96f5072 100644 --- a/pkgs/by-name/yo/youki/package.nix +++ b/pkgs/by-name/yo/youki/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pkg-config, installShellFiles, + getconf, dbus, libseccomp, systemd, @@ -12,18 +13,19 @@ rustPlatform.buildRustPackage rec { pname = "youki"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-dkVnNtBfvjf47p1N5/syHqjlDVnbKRDqNJ98ym5B+mg="; + hash = "sha256-vXYoLjmPiK2f6Yg5YGTp76hmawnbfcnMOOppsWwKtAk="; }; nativeBuildInputs = [ pkg-config installShellFiles + getconf ]; buildInputs = [ @@ -48,7 +50,7 @@ rustPlatform.buildRustPackage rec { "youki" ]; - cargoHash = "sha256-Nv1LAkWYwWb0Izvd7UlKU4wx3vVkmO9Rcpt6AuTwObU="; + cargoHash = "sha256-s8L/L3be5fRahDiLKnHQcU52F+AJVr7Q3uL8mcloVv8="; meta = with lib; { description = "Container runtime written in Rust"; diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix index b2d5451a93131..c51bdf5ee787f 100644 --- a/pkgs/by-name/yo/yourkit-java/package.nix +++ b/pkgs/by-name/yo/yourkit-java/package.nix @@ -9,7 +9,7 @@ let vPath = v: lib.elemAt (lib.splitString "-" v) 0; - version = "2024.3-b157"; + version = "2024.3-b161"; arches = { aarch64-linux = "arm64"; @@ -20,8 +20,8 @@ let arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system"); hashes = { - arm64 = "sha256-0a9maZhgtXH21Ph0o3Rb+rCPhAmZRxjZCRyDmTvusLk="; - x64 = "sha256-nLaOOkPG2QEHkHd0S2AYLT2IpkMchGw9adyUDLCNQFg="; + arm64 = "sha256-Qm/+KQ4nZr1IIyo+i8Gp8K2PEU844tuigiopWEibaAE="; + x64 = "sha256-yxbPS5UrYq6FgPlqfWjO9tPI/rjA/400JnS3kKHgMV0="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/yo/youtrack_2022_3/package.nix b/pkgs/by-name/yo/youtrack_2022_3/package.nix index 388c536bf15d9..5e1ab1a754f59 100644 --- a/pkgs/by-name/yo/youtrack_2022_3/package.nix +++ b/pkgs/by-name/yo/youtrack_2022_3/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (finalAttrs: { jar = fetchurl { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.jar"; - sha256 = "sha256-NQKWmKEq5ljUXd64zY27Nj8TU+uLdA37chbFVdmwjNs="; + hash = "sha256-NQKWmKEq5ljUXd64zY27Nj8TU+uLdA37chbFVdmwjNs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/yp/ypbind-mt/package.nix b/pkgs/by-name/yp/ypbind-mt/package.nix new file mode 100644 index 0000000000000..68db0f4aa9b0b --- /dev/null +++ b/pkgs/by-name/yp/ypbind-mt/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchurl, + autoreconfHook, + libnsl, + libtirpc, + libxcrypt, + pkg-config, + rpcbind, + systemdLibs, +}: + +stdenv.mkDerivation rec { + pname = "ypbind-mt"; + version = "2.7.2"; + + src = fetchurl { + url = "https://github.com/thkukuk/ypbind-mt/releases/download/v${version}/ypbind-mt-${version}.tar.xz"; + hash = "sha256-Bk8vGFZzxUk9+D9kALeZ86NZ3lYRi2ujfEMnER8vzYs="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libnsl + libtirpc + libxcrypt + rpcbind + systemdLibs + ]; + + meta = { + description = "Multithreaded daemon maintaining the NIS binding informations."; + homepage = "https://github.com/thkukuk/ypbind-mt"; + changelog = "https://github.com/thkukuk/ypbind-mt/blob/master/NEWS"; + license = lib.licenses.gpl2Plus; + mainProgram = "ypbind"; + maintainers = with lib.maintainers; [ BarrOff ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/yt/yt-dlg/package.nix b/pkgs/by-name/yt/yt-dlg/package.nix index ee5f288b5ab11..a5ba63307be0d 100644 --- a/pkgs/by-name/yt/yt-dlg/package.nix +++ b/pkgs/by-name/yt/yt-dlg/package.nix @@ -1,27 +1,8 @@ { lib, - python3, + python3Packages, fetchFromGitHub, - fetchPypi }: -let - python3' = - (python3.override { - packageOverrides = final: prev: { - wxpython = prev.wxpython.overrideAttrs rec { - version = "4.2.0"; - src = fetchPypi { - pname = "wxPython"; - inherit version; - hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc="; - }; - }; - }; - }); - - python3Packages = python3'.pkgs; - -in python3Packages.buildPythonApplication rec { pname = "yt-dlg"; version = "1.8.5"; @@ -34,6 +15,7 @@ python3Packages.buildPythonApplication rec { }; pyproject = true; + pythonRelaxDeps = [ "wxpython" ]; build-system = with python3Packages; [ setuptools wheel diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index 83100ef1b9405..afedd646fdb83 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -1,14 +1,15 @@ -{ lib -, python3Packages -, fetchPypi -, ffmpeg-headless -, rtmpdump -, atomicparsley -, atomicparsleySupport ? true -, ffmpegSupport ? true -, rtmpSupport ? true -, withAlias ? false # Provides bin/youtube-dl for backcompat -, update-python-libraries +{ + lib, + python3Packages, + fetchPypi, + ffmpeg-headless, + rtmpdump, + atomicparsley, + atomicparsleySupport ? true, + ffmpegSupport ? true, + rtmpSupport ? true, + withAlias ? false, # Provides bin/youtube-dl for backcompat + update-python-libraries, }: python3Packages.buildPythonApplication rec { @@ -16,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.8.6"; + version = "2024.9.27"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-6FUfJryL9nuZwSNzzIftIHNDbDQ35TKQh40PS0ux9mM="; + hash = "sha256-hmBVQuF+LiOtIxRbY37DCBM3YqFaXe2sSuULeXMjcCY="; }; build-system = with python3Packages; [ @@ -36,23 +37,28 @@ python3Packages.buildPythonApplication rec { mutagen pycryptodomex requests - secretstorage # "optional", as in not in requirements.txt, needed for `--cookies-from-browser` + secretstorage # "optional", as in not in requirements.txt, needed for `--cookies-from-browser` urllib3 websockets ]; + pythonRelaxDeps = [ "websockets" ]; + # Ensure these utilities are available in $PATH: # - ffmpeg: post-processing & transcoding support # - rtmpdump: download files over RTMP # - atomicparsley: embedding thumbnails makeWrapperArgs = let - packagesToBinPath = [] + packagesToBinPath = + [ ] ++ lib.optional atomicparsleySupport atomicparsley ++ lib.optional ffmpegSupport ffmpeg-headless ++ lib.optional rtmpSupport rtmpdump; - in lib.optionals (packagesToBinPath != []) - [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; + in + lib.optionals (packagesToBinPath != [ ]) [ + ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' + ]; setupPyBuildFlags = [ "build_lazy_extractors" @@ -65,7 +71,10 @@ python3Packages.buildPythonApplication rec { ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" ''; - passthru.updateScript = [ update-python-libraries (toString ./.) ]; + passthru.updateScript = [ + update-python-libraries + (toString ./.) + ]; meta = with lib; { homepage = "https://github.com/yt-dlp/yt-dlp/"; @@ -80,7 +89,10 @@ python3Packages.buildPythonApplication rec { ''; changelog = "https://github.com/yt-dlp/yt-dlp/releases/tag/${version}"; license = licenses.unlicense; - maintainers = with maintainers; [ mkg20001 SuperSandro2000 ]; + maintainers = with maintainers; [ + mkg20001 + SuperSandro2000 + ]; mainProgram = "yt-dlp"; }; } diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix index 3c460082b27ed..0e520955e057c 100644 --- a/pkgs/by-name/yt/ytui-music/package.nix +++ b/pkgs/by-name/yt/ytui-music/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite mpv - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/yu/yubico-piv-tool/package.nix b/pkgs/by-name/yu/yubico-piv-tool/package.nix index 1375a66b65828..69665583f2e4d 100644 --- a/pkgs/by-name/yu/yubico-piv-tool/package.nix +++ b/pkgs/by-name/yu/yubico-piv-tool/package.nix @@ -13,12 +13,12 @@ stdenv, testers, zlib, - withApplePCSC ? stdenv.isDarwin, + withApplePCSC ? stdenv.hostPlatform.isDarwin, }: stdenv.mkDerivation (finalAttrs: { pname = "yubico-piv-tool"; - version = "2.6.0"; + version = "2.6.1"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Yubico"; repo = "yubico-piv-tool"; rev = "refs/tags/yubico-piv-tool-${finalAttrs.version}"; - hash = "sha256-53cgwXMzVKnouwHhbt6pODhjF2MH0sK5CPWpbZe71jE="; + hash = "sha256-RYT/kBlUfVkJG8RNELVQ5gyC+HDteD5xqaI479nsvKw="; }; postPatch = '' diff --git a/pkgs/by-name/yu/yudit/package.nix b/pkgs/by-name/yu/yudit/package.nix new file mode 100644 index 0000000000000..e7131c8c54d09 --- /dev/null +++ b/pkgs/by-name/yu/yudit/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchurl, + xorg, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "yudit"; + version = "3.1.0"; + + src = fetchurl { + url = "https://www.yudit.org/download/yudit-${finalAttrs.version}.tar.gz"; + hash = "sha256-oYgjTWEnNXaE9Sw9bGpLnY9avQ99tnJWa/RE73p85Vc="; + }; + + buildInputs = [ + xorg.libX11 + ]; + + meta = { + description = "Free Unicode plain-text editor for Unix-like systems"; + homepage = "https://www.yudit.org/"; + changelog = "https://www.yudit.org/download/CHANGELOG.TXT"; + mainProgram = "yudit"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ doronbehar ]; + # Might work on Darwin but currently fails, and upstream doesn't officially + # supports it. + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/yu/yutto/package.nix b/pkgs/by-name/yu/yutto/package.nix index eb5b983e8f96d..2ce2c6042f2c3 100644 --- a/pkgs/by-name/yu/yutto/package.nix +++ b/pkgs/by-name/yu/yutto/package.nix @@ -8,21 +8,22 @@ python3Packages.buildPythonApplication rec { pname = "yutto"; - version = "2.0.0-beta.40"; - format = "pyproject"; + version = "2.0.0-beta.43"; + pyproject = true; disabled = python3Packages.pythonOlder "3.9"; + pythonRelaxDeps = true; src = fetchFromGitHub { owner = "yutto-dev"; repo = "yutto"; - rev = "v${version}"; - hash = "sha256-gopCQ8tEhwtDFs/w+jafD3ZW/4MIrYxPcMh8SbOCwww="; + rev = "refs/tags/v${version}"; + hash = "sha256-ND3uE4vsFa7gPr1E2UfiebExsrj+ELN0+hqnxxOQu8Y="; }; - nativeBuildInputs = with python3Packages; [ poetry-core ]; + build-system = with python3Packages; [ hatchling ]; - propagatedBuildInputs = + dependencies = with python3Packages; [ httpx diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index b0dad91d4cb7f..4cb0f099e08f0 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { owner = "bol-van"; repo = "zapret"; rev = "9cf72b7c68f6a7c80dfddc6c1cf6d6db32718376"; - sha256 = "sha256-8cqKCNYLLkZXlwrybKUPG6fLd7gmf8zV9tjWoTxAwIY="; + hash = "sha256-8cqKCNYLLkZXlwrybKUPG6fLd7gmf8zV9tjWoTxAwIY="; }; buildInputs = [ libcap zlib libnetfilter_queue libnfnetlink ]; @@ -77,6 +77,6 @@ stdenv.mkDerivation { mainProgram = "zapret"; # probably gonna work on darwin, but untested - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/zc/zchunk/package.nix b/pkgs/by-name/zc/zchunk/package.nix index 0e7df32c08a93..e0450116f5b91 100644 --- a/pkgs/by-name/zc/zchunk/package.nix +++ b/pkgs/by-name/zc/zchunk/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl zstd - ] ++ lib.optionals stdenv.isDarwin [ argp-standalone ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone ]; outputs = [ "out" diff --git a/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch b/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch new file mode 100644 index 0000000000000..4d02d0931d40d --- /dev/null +++ b/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch @@ -0,0 +1,17 @@ +diff --git a/script/generate-licenses b/script/generate-licenses +index 43b2f5c458..c740a3afa2 100755 +--- a/script/generate-licenses ++++ b/script/generate-licenses +@@ -15,12 +15,6 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE + + echo -e "# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE + +-if ! cargo install --list | grep "cargo-about v$CARGO_ABOUT_VERSION" > /dev/null; then +- echo "Installing cargo-about@$CARGO_ABOUT_VERSION..." +- cargo install "cargo-about@$CARGO_ABOUT_VERSION" +-else +- echo "cargo-about@$CARGO_ABOUT_VERSION is already installed." +-fi + + echo "Generating cargo licenses" + cargo about generate --fail -c script/licenses/zed-licenses.toml script/licenses/template.hbs.md >> $OUTPUT_FILE diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index 35727b4b24cac..97ada31736f71 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -21,11 +21,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ - "gimli 0.29.0", + "gimli 0.31.0", ] [[package]] @@ -34,6 +34,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aes" version = "0.8.4" @@ -65,7 +71,6 @@ checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "const-random", - "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -83,7 +88,7 @@ dependencies = [ [[package]] name = "alacritty_terminal" version = "0.24.1-dev" -source = "git+https://github.com/alacritty/alacritty?rev=cacdb5bb3b72bad2c729227537979d95af75978f#cacdb5bb3b72bad2c729227537979d95af75978f" +source = "git+https://github.com/alacritty/alacritty?rev=91d034ff8b53867143c005acfaa14609147c9a2c#91d034ff8b53867143c005acfaa14609147c9a2c" dependencies = [ "base64 0.22.1", "bitflags 2.6.0", @@ -93,7 +98,7 @@ dependencies = [ "miow", "parking_lot", "piper", - "polling 3.7.2", + "polling 3.7.3", "regex-automata 0.4.7", "rustix-openpty", "serde", @@ -123,12 +128,13 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alsa" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" dependencies = [ "alsa-sys", "bitflags 2.6.0", + "cfg-if", "libc", ] @@ -148,6 +154,19 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9d4ee0d472d1cd2e28c97dfa124b3d8d992e10eb0a035f33f5d12e3a177ba3b" +[[package]] +name = "ammonia" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ab99eae5ee58501ab236beb6f20f6ca39be615267b014899c89b2f0bc18a459" +dependencies = [ + "html5ever", + "maplit", + "once_cell", + "tendril", + "url", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -230,7 +249,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "strum", + "strum 0.25.0", "thiserror", "tokio", "util", @@ -244,9 +263,9 @@ checksum = "34cd60c5e3152cef0a592f1b296f1cc93715d89d2551d85315828c3a09575ff4" [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "approx" @@ -271,7 +290,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -282,9 +301,12 @@ checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] [[package]] name = "as-raw-xcb-connection" @@ -353,6 +375,7 @@ dependencies = [ "anyhow", "assets", "assistant_slash_command", + "assistant_tool", "async-watch", "cargo_toml", "chrono", @@ -371,7 +394,7 @@ dependencies = [ "fuzzy", "globset", "gpui", - "handlebars", + "handlebars 4.5.0", "heed", "html_to_markdown 0.1.0", "http_client", @@ -379,7 +402,9 @@ dependencies = [ "indoc", "language", "language_model", + "languages", "log", + "lsp", "markdown", "menu", "multi_buffer", @@ -393,7 +418,9 @@ dependencies = [ "proto", "rand 0.8.5", "regex", + "release_channel", "rope", + "rpc", "schemars", "search", "semantic_index", @@ -404,12 +431,14 @@ dependencies = [ "similar", "smallvec", "smol", + "strum 0.25.0", "telemetry_events", "terminal", "terminal_view", "text", "theme", "toml 0.8.19", + "tree-sitter-md", "ui", "unindent", "util", @@ -429,6 +458,21 @@ dependencies = [ "language", "parking_lot", "serde", + "serde_json", + "workspace", +] + +[[package]] +name = "assistant_tool" +version = "0.1.0" +dependencies = [ + "anyhow", + "collections", + "derive_more", + "gpui", + "parking_lot", + "serde", + "serde_json", "workspace", ] @@ -522,7 +566,7 @@ checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -558,7 +602,7 @@ checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ "async-channel 2.3.1", "async-executor", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "blocking", "futures-lite 2.3.0", @@ -587,9 +631,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock 3.4.0", "cfg-if", @@ -597,11 +641,11 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.35", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -653,7 +697,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "blocking", "futures-lite 2.3.0", ] @@ -680,18 +724,18 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.48.0", ] [[package]] name = "async-process" -version = "2.2.3" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ "async-channel 2.3.1", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "async-signal", "async-task", @@ -699,9 +743,9 @@ dependencies = [ "cfg-if", "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.34", + "rustix 0.38.35", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -723,25 +767,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "async-signal" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix 0.38.35", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -791,14 +835,14 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "async-stripe" -version = "0.38.1" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ddaa6999d246ba2c6c84d830a1ba0cd16c9234d58701988b3869f0e5bd732d" +checksum = "58d670cf4d47a1b8ffef54286a5625382e360a34ee76902fd93ad8c7032a0c30" dependencies = [ "chrono", "futures-util", @@ -817,9 +861,9 @@ dependencies = [ [[package]] name = "async-tar" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c49359998a76e32ef6e870dbc079ebad8f1e53e8441c5dd39d27b44493fe331" +checksum = "a42f905d4f623faf634bbd1e001e84e0efc24694afa64be9ad239bf6ca49e1f8" dependencies = [ "async-std", "filetime", @@ -835,15 +879,29 @@ version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" +[[package]] +name = "async-tls" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfeefd0ca297cbbb3bd34fd6b228401c2a5177038257afd751bc29f0a2da4795" +dependencies = [ + "futures-core", + "futures-io", + "rustls 0.20.9", + "rustls-pemfile 1.0.4", + "webpki", + "webpki-roots 0.22.6", +] + [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -852,13 +910,13 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" dependencies = [ - "async-native-tls", "async-std", + "async-tls", "futures-io", "futures-util", "log", "pin-project-lite", - "tungstenite", + "tungstenite 0.20.1", ] [[package]] @@ -940,7 +998,6 @@ dependencies = [ "editor", "gpui", "http_client", - "isahc", "log", "markdown_preview", "menu", @@ -1005,10 +1062,10 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.7.1", - "fastrand 2.1.0", + "fastrand 2.1.1", "hex", "http 0.2.12", - "ring", + "ring 0.17.8", "time", "tokio", "tracing", @@ -1018,9 +1075,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" +checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -1030,20 +1087,21 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42c2d4218de4dcd890a109461e2f799a1a2ba3bcd2cde9af88360f5df9266c6" +checksum = "2424565416eef55906f9f8cece2072b6b6a76075e3ff81483ebe938a89a4c05f" dependencies = [ "aws-credential-types", "aws-sigv4", "aws-smithy-async", "aws-smithy-eventstream", "aws-smithy-http", + "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes 1.7.1", - "fastrand 2.1.0", + "fastrand 2.1.1", "http 0.2.12", "http-body 0.4.6", "once_cell", @@ -1055,9 +1113,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.43.0" +version = "1.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccda7e730ace3cb8bbd4071bc650c6d294364891f9564bd4e43adfc8dea3177" +checksum = "cca49303c05d2a740b8a4552fac63a4db6ead84f7e7eeed04761fd3014c26f25" dependencies = [ "ahash 0.8.11", "aws-credential-types", @@ -1074,7 +1132,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.7.1", - "fastrand 2.1.0", + "fastrand 2.1.1", "hex", "hmac", "http 0.2.12", @@ -1090,9 +1148,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.37.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1074e818fbe4f9169242d78448b15be8916a79daa38ea1231f2e2e10d993fcd2" +checksum = "e5879bec6e74b648ce12f6085e7245417bc5f6d672781028384d2e494be3eb6d" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1112,9 +1170,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.38.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29755c51e33fa3f678598f64324a169cf4b7d3c4865d2709d4308f53366a92a4" +checksum = "4ef4cd9362f638c22a3b959fd8df292e7e47fdf170270f86246b97109b5f2f7d" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1134,9 +1192,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.37.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e52dc3fd7dfa6c01a69cf3903e00aa467261639138a05b06cd92314d2c8fb07" +checksum = "0b1e2735d2ab28b35ecbb5496c9d41857f52a0d6a0075bbf6a8af306045ea6f6" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1176,7 +1234,7 @@ dependencies = [ "once_cell", "p256", "percent-encoding", - "ring", + "ring 0.17.8", "sha2", "subtle", "time", @@ -1229,9 +1287,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.60.9" +version = "0.60.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e" +checksum = "01dbcb6e2588fd64cfb6d7529661b06466419e4c54ed1c62d6510d2d0350a728" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -1269,16 +1327,16 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.6.2" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce87155eba55e11768b8c1afa607f3e864ae82f03caf63258b37455b0ad02537" +checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", "bytes 1.7.1", - "fastrand 2.1.0", + "fastrand 2.1.1", "h2", "http 0.2.12", "http-body 0.4.6", @@ -1289,7 +1347,7 @@ dependencies = [ "once_cell", "pin-project-lite", "pin-utils", - "rustls", + "rustls 0.21.12", "tokio", "tracing", ] @@ -1313,9 +1371,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.0" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe321a6b21f5d8eabd0ade9c55d3d0335f3c3157fc2b3e87f05f34b539e4df5" +checksum = "273dcdfd762fae3e1650b8024624e7cd50e484e37abdab73a7a706188ad34543" dependencies = [ "base64-simd", "bytes 1.7.1", @@ -1390,7 +1448,7 @@ dependencies = [ "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "tower", "tower-layer", "tower-service", @@ -1436,17 +1494,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", - "object 0.36.2", + "miniz_oxide 0.8.0", + "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -1491,13 +1549,16 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bigdecimal" -version = "0.3.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" +checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" dependencies = [ + "autocfg", + "libm", "num-bigint", "num-integer", "num-traits", + "serde", ] [[package]] @@ -1511,45 +1572,42 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.65.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "log", - "peeking_take_while", - "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.72", - "which 4.4.2", + "syn 2.0.76", ] [[package]] name = "bindgen" -version = "0.69.4" +version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", + "itertools 0.13.0", + "log", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -1605,9 +1663,9 @@ dependencies = [ [[package]] name = "bitstream-io" -version = "2.5.0" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "bitvec" @@ -1623,8 +1681,8 @@ dependencies = [ [[package]] name = "blade-graphics" -version = "0.4.0" -source = "git+https://github.com/kvark/blade?rev=ac25c77ed8d86c386a541c935ffe0a0f6024e701#ac25c77ed8d86c386a541c935ffe0a0f6024e701" +version = "0.5.0" +source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f3aa38e969#e142a3a5e678eb6a13e642ad8401b1f3aa38e969" dependencies = [ "ash", "ash-window", @@ -1632,7 +1690,7 @@ dependencies = [ "block", "bytemuck", "codespan-reporting", - "core-graphics-types", + "core-graphics-types 0.1.3", "glow", "gpu-alloc", "gpu-alloc-ash", @@ -1653,18 +1711,18 @@ dependencies = [ [[package]] name = "blade-macros" -version = "0.2.1" -source = "git+https://github.com/kvark/blade?rev=ac25c77ed8d86c386a541c935ffe0a0f6024e701#ac25c77ed8d86c386a541c935ffe0a0f6024e701" +version = "0.3.0" +source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f3aa38e969#e142a3a5e678eb6a13e642ad8401b1f3aa38e969" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "blade-util" version = "0.1.0" -source = "git+https://github.com/kvark/blade?rev=ac25c77ed8d86c386a541c935ffe0a0f6024e701#ac25c77ed8d86c386a541c935ffe0a0f6024e701" +source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f3aa38e969#e142a3a5e678eb6a13e642ad8401b1f3aa38e969" dependencies = [ "blade-graphics", "bytemuck", @@ -1672,6 +1730,19 @@ dependencies = [ "profiling", ] +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + [[package]] name = "block" version = "0.1.6" @@ -1729,7 +1800,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "syn_derive", ] @@ -1739,7 +1810,7 @@ version = "0.1.0" dependencies = [ "editor", "gpui", - "itertools 0.11.0", + "itertools 0.13.0", "outline", "theme", "ui", @@ -1799,22 +1870,22 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.16.3" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -1887,8 +1958,8 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.6.0", "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.35", "slab", "thiserror", ] @@ -1900,16 +1971,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop", - "rustix 0.38.34", + "rustix 0.38.35", "wayland-backend", "wayland-client", ] [[package]] name = "camino" -version = "1.1.7" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -1934,7 +2005,7 @@ checksum = "f83ae11f116bcbafc5327c6af250341db96b5930046732e1905f7dc65887e0e1" dependencies = [ "cap-primitives", "cap-std", - "rustix 0.38.34", + "rustix 0.38.35", "smallvec", ] @@ -1950,7 +2021,7 @@ dependencies = [ "io-lifetimes 2.0.3", "ipnet", "maybe-owned", - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.52.0", "winx", ] @@ -1974,7 +2045,7 @@ dependencies = [ "cap-primitives", "io-extras", "io-lifetimes 2.0.3", - "rustix 0.38.34", + "rustix 0.38.35", ] [[package]] @@ -1987,7 +2058,7 @@ dependencies = [ "cap-primitives", "iana-time-zone", "once_cell", - "rustix 0.38.34", + "rustix 0.38.35", "winx", ] @@ -2047,30 +2118,31 @@ dependencies = [ [[package]] name = "cbindgen" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" +checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" dependencies = [ "heck 0.4.1", - "indexmap 1.9.3", + "indexmap 2.4.0", "log", "proc-macro2", "quote", "serde", "serde_json", - "syn 1.0.109", + "syn 2.0.76", "tempfile", - "toml 0.5.11", + "toml 0.8.19", ] [[package]] name = "cc" -version = "1.1.7" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -2211,9 +2283,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -2221,14 +2293,24 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", "clap_lex", "strsim", + "terminal_size", +] + +[[package]] +name = "clap_complete" +version = "4.5.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" +dependencies = [ + "clap", ] [[package]] @@ -2240,7 +2322,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2255,7 +2337,8 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "core-foundation", + "collections", + "core-foundation 0.9.4", "core-services", "exec", "fork", @@ -2266,6 +2349,7 @@ dependencies = [ "plist", "release_channel", "serde", + "tempfile", "util", ] @@ -2322,14 +2406,12 @@ dependencies = [ "async-tungstenite", "chrono", "clock", - "cocoa", + "cocoa 0.26.0", "collections", "feature_flags", - "fs", "futures 0.3.30", "gpui", "http_client", - "lazy_static", "log", "once_cell", "parking_lot", @@ -2338,6 +2420,8 @@ dependencies = [ "rand 0.8.5", "release_channel", "rpc", + "rustls 0.20.9", + "rustls-native-certs 0.8.0", "schemars", "serde", "serde_json", @@ -2351,6 +2435,7 @@ dependencies = [ "thiserror", "time", "tiny_http", + "tokio-socks", "url", "util", "windows 0.58.0", @@ -2381,9 +2466,25 @@ checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" +dependencies = [ + "bitflags 2.6.0", + "block", + "cocoa-foundation 0.2.0", + "core-foundation 0.10.0", + "core-graphics 0.24.0", "foreign-types 0.5.0", "libc", "objc", @@ -2397,8 +2498,22 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", - "core-foundation", - "core-graphics-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", "libc", "objc", ] @@ -2455,6 +2570,7 @@ dependencies = [ "http_client", "hyper", "indoc", + "isahc_http_client", "jsonwebtoken", "language", "language_model", @@ -2492,7 +2608,7 @@ dependencies = [ "settings", "sha2", "sqlx", - "strum", + "strum 0.25.0", "subtle", "supermaven_api", "telemetry_events", @@ -2531,7 +2647,6 @@ dependencies = [ "gpui", "http_client", "language", - "lazy_static", "menu", "notifications", "parking_lot", @@ -2673,12 +2788,19 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + [[package]] name = "context_servers" version = "0.1.0" dependencies = [ "anyhow", "collections", + "command_palette_hooks", "futures 0.3.30", "gpui", "log", @@ -2742,7 +2864,7 @@ dependencies = [ "serde_json", "settings", "smol", - "strum", + "strum 0.25.0", "task", "theme", "ui", @@ -2760,6 +2882,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -2773,8 +2905,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", "foreign-types 0.5.0", "libc", ] @@ -2786,7 +2931,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", "libc", ] @@ -2796,7 +2952,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92567e81db522550ebaf742c5d875624ec7820c2c7ee5f8c60e4ce7c2ae3c0fd" dependencies = [ - "core-foundation", + "core-foundation 0.9.4", ] [[package]] @@ -2805,8 +2961,8 @@ version = "20.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" dependencies = [ - "core-foundation", - "core-graphics", + "core-foundation 0.9.4", + "core-graphics 0.23.2", "foreign-types 0.5.0", "libc", ] @@ -2878,45 +3034,56 @@ dependencies = [ [[package]] name = "cpp_demangle" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" +checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d" dependencies = [ "cfg-if", ] [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29daf137addc15da6bab6eae2c4a11e274b1d270bf2759508e62f6145e863ef6" +checksum = "b80c3a50b9c4c7e5b5f73c0ed746687774fc9e36ef652b110da8daebf0c6e0e6" dependencies = [ "cranelift-entity", ] +[[package]] +name = "cranelift-bitset" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38778758c2ca918b05acb2199134e0c561fb577c50574259b26190b6c2d95ded" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-codegen" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de619867d5de4c644b7fd9904d6e3295269c93d8a71013df796ab338681222d4" +checksum = "58258667ad10e468bfc13a8d620f50dfcd4bb35d668123e97defa2549b9ad397" dependencies = [ "bumpalo", "cranelift-bforest", + "cranelift-bitset", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.28.1", + "gimli 0.29.0", "hashbrown 0.14.5", "log", "regalloc2", @@ -2927,43 +3094,44 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f5cf277490037d8dae9513d35e0ee8134670ae4a964a5ed5b198d4249d7c10" +checksum = "043f0b702e529dcb07ff92bd7d40e7d5317b5493595172c5eb0983343751ee06" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3e22ecad1123343a3c09ac6ecc532bb5c184b6fcb7888df0ea953727f79924" +checksum = "7763578888ab53eca5ce7da141953f828e82c2bfadcffc106d10d1866094ffbb" [[package]] name = "cranelift-control" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ca3ec6d30bce84ccf59c81fead4d16381a3ef0ef75e8403bc1e7385980da09" +checksum = "32db15f08c05df570f11e8ab33cb1ec449a64b37c8a3498377b77650bef33d8b" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eabb8d36b0ca8906bec93c78ea516741cac2d7e6b266fa7b0ffddcc09004990" +checksum = "5289cdb399381a27e7bbfa1b42185916007c3d49aeef70b1d01cb4caa8010130" dependencies = [ + "cranelift-bitset", "serde", "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b42630229e49a8cfcae90bdc43c8c4c08f7a7aa4618b67f79265cd2f996dd2" +checksum = "31ba8ab24eb9470477e98ddfa3c799a649ac5a0d9a2042868c4c952133c234e8" dependencies = [ "cranelift-codegen", "log", @@ -2973,15 +3141,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918d1e36361805dfe0b6cdfd5a5ffdb5d03fa796170c5717d2727cbe623b93a0" +checksum = "2b72a3c5c166a70426dcb209bdd0bb71a787c1ea76023dc0974fbabca770e8f9" [[package]] name = "cranelift-native" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75aea85a0d7e1800b14ce9d3f53adf8ad4d1ee8a9e23b0269bdc50285e93b9b3" +checksum = "46a42424c956bbc31fc5c2706073df896156c5420ae8fa2a5d48dbc7b295d71b" dependencies = [ "cranelift-codegen", "libc", @@ -2990,9 +3158,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.108.1" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac491fd3473944781f0cf9528c90cc899d18ad438da21961a839a3a44d57dfb" +checksum = "49778df4289933d735b93c30a345513e030cf83101de0036e19b760f8aa09f68" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -3000,7 +3168,7 @@ dependencies = [ "itertools 0.12.1", "log", "smallvec", - "wasmparser 0.207.0", + "wasmparser 0.215.0", "wasmtime-types", ] @@ -3162,7 +3330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -3171,7 +3339,7 @@ version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.29.0", + "nix", "windows-sys 0.59.0", ] @@ -3263,7 +3431,6 @@ dependencies = [ "anyhow", "gpui", "indoc", - "lazy_static", "log", "paths", "release_channel", @@ -3274,6 +3441,17 @@ dependencies = [ "util", ] +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + [[package]] name = "deflate64" version = "0.1.9" @@ -3311,17 +3489,6 @@ dependencies = [ "serde", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_more" version = "0.99.18" @@ -3332,7 +3499,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -3467,6 +3634,20 @@ dependencies = [ "libloading", ] +[[package]] +name = "docs_preprocessor" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "mdbook", + "regex", + "serde", + "serde_json", + "settings", + "util", +] + [[package]] name = "dotenvy" version = "0.15.7" @@ -3490,9 +3671,9 @@ dependencies = [ [[package]] name = "dwrote" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c" dependencies = [ "lazy_static", "libc", @@ -3541,9 +3722,8 @@ dependencies = [ "gpui", "http_client", "indoc", - "itertools 0.11.0", + "itertools 0.13.0", "language", - "lazy_static", "linkify", "log", "lsp", @@ -3559,6 +3739,7 @@ dependencies = [ "serde", "serde_json", "settings", + "similar", "smallvec", "smol", "snippet", @@ -3578,6 +3759,18 @@ dependencies = [ "workspace", ] +[[package]] +name = "educe" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4bd92664bf78c4d3dba9b7cdafce6fa15b13ed3ed16175218196942e99168a8" +dependencies = [ + "enum-ordinalize", + "proc-macro2", + "quote", + "syn 2.0.76", +] + [[package]] name = "either" version = "1.13.0" @@ -3587,6 +3780,18 @@ dependencies = [ "serde", ] +[[package]] +name = "elasticlunr-rs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41e83863a500656dfa214fee6682de9c5b9f03de6860fec531235ed2ae9f6571" +dependencies = [ + "regex", + "serde", + "serde_derive", + "serde_json", +] + [[package]] name = "elliptic-curve" version = "0.12.3" @@ -3627,6 +3832,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "emojis" version = "0.6.3" @@ -3658,13 +3869,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[package]] -name = "enumflags2" -version = "0.7.10" +name = "enum-ordinalize" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" dependencies = [ - "enumflags2_derive", - "serde", + "enum-ordinalize-derive", +] + +[[package]] +name = "enum-ordinalize-derive" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", ] [[package]] @@ -3675,7 +3906,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -3780,13 +4011,41 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.10" +version = "0.22.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" dependencies = [ "num-traits", ] +[[package]] +name = "evals" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "client", + "clock", + "collections", + "env_logger", + "feature_flags", + "fs", + "git", + "gpui", + "http_client", + "isahc_http_client", + "language", + "languages", + "node_runtime", + "open_ai", + "project", + "semantic_index", + "serde", + "serde_json", + "settings", + "smol", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -3845,7 +4104,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -3870,6 +4129,7 @@ dependencies = [ "http_client", "indexed_docs", "isahc", + "isahc_http_client", "language", "log", "lsp", @@ -3891,8 +4151,8 @@ dependencies = [ "ui", "url", "util", - "wasm-encoder 0.201.0", - "wasmparser 0.201.0", + "wasm-encoder 0.215.0", + "wasmparser 0.215.0", "wasmtime", "wasmtime-wasi", "wit-component", @@ -3908,7 +4168,7 @@ dependencies = [ "env_logger", "extension", "fs", - "http_client", + "isahc_http_client", "language", "log", "rpc", @@ -3984,9 +4244,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fd-lock" @@ -3995,7 +4255,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" dependencies = [ "cfg-if", - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.52.0", ] @@ -4012,6 +4272,7 @@ dependencies = [ name = "feature_flags" version = "0.1.0" dependencies = [ + "futures 0.3.30", "gpui", ] @@ -4065,15 +4326,17 @@ dependencies = [ "ctor", "editor", "env_logger", + "file_icons", "futures 0.3.30", "fuzzy", "gpui", - "itertools 0.11.0", "language", "menu", "picker", "project", + "schemars", "serde", + "serde_derive", "serde_json", "settings", "text", @@ -4108,14 +4371,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -4126,12 +4389,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -4155,7 +4418,7 @@ dependencies = [ "futures-core", "futures-sink", "nanorand", - "spin", + "spin 0.9.8", ] [[package]] @@ -4171,8 +4434,8 @@ source = "git+https://github.com/zed-industries/font-kit?rev=40391b7#40391b7c004 dependencies = [ "bitflags 2.6.0", "byteorder", - "core-foundation", - "core-graphics", + "core-foundation 0.9.4", + "core-graphics 0.23.2", "core-text", "dirs 5.0.1", "dwrote", @@ -4247,7 +4510,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -4264,9 +4527,9 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "fork" -version = "0.1.23" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e74d3423998a57e9d906e49252fb79eb4a04d5cdfe188fb1b7ff9fc076a8ed" +checksum = "05dc8b302e04a1c27f4fe694439ef0f29779ca4edc205b7b58f00db04e29656d" dependencies = [ "libc", ] @@ -4299,14 +4562,13 @@ dependencies = [ "ashpd", "async-tar", "async-trait", - "cocoa", + "cocoa 0.26.0", "collections", "fsevent", "futures 0.3.30", "git", "git2", "gpui", - "lazy_static", "libc", "notify", "objc", @@ -4330,7 +4592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb" dependencies = [ "io-lifetimes 2.0.3", - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.52.0", ] @@ -4339,7 +4601,7 @@ name = "fsevent" version = "0.1.0" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "fsevent-sys 3.1.0", "parking_lot", "tempfile", @@ -4476,7 +4738,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -4491,7 +4753,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -4605,20 +4867,20 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" dependencies = [ "fallible-iterator", - "indexmap 2.3.0", + "indexmap 2.4.0", "stable_deref_trait", ] [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "git" @@ -4632,7 +4894,6 @@ dependencies = [ "git2", "gpui", "http_client", - "lazy_static", "log", "parking_lot", "pretty_assertions", @@ -4672,7 +4933,6 @@ dependencies = [ "git", "gpui", "http_client", - "isahc", "pretty_assertions", "regex", "serde", @@ -4689,9 +4949,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -4714,9 +4974,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +checksum = "f865cbd94bd355b89611211e49508da98a1fce0ad755c1e8448fb96711b24528" dependencies = [ "js-sys", "slotmap", @@ -4756,10 +5016,11 @@ dependencies = [ "anyhow", "futures 0.3.30", "http_client", + "isahc", "schemars", "serde", "serde_json", - "strum", + "strum 0.25.0", ] [[package]] @@ -4801,7 +5062,7 @@ dependencies = [ "ashpd", "async-task", "backtrace", - "bindgen 0.65.1", + "bindgen 0.70.1", "blade-graphics", "blade-macros", "blade-util", @@ -4810,11 +5071,11 @@ dependencies = [ "calloop", "calloop-wayland-source", "cbindgen", - "cocoa", + "cocoa 0.26.0", "collections", - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", - "core-graphics", + "core-graphics 0.23.2", "core-text", "cosmic-text", "ctor", @@ -4830,8 +5091,7 @@ dependencies = [ "gpui_macros", "http_client", "image", - "itertools 0.11.0", - "lazy_static", + "itertools 0.13.0", "linkme", "log", "media", @@ -4858,11 +5118,10 @@ dependencies = [ "slotmap", "smallvec", "smol", - "strum", + "strum 0.25.0", "sum_tree", "taffy", "thiserror", - "time", "unicode-segmentation", "usvg", "util", @@ -4919,7 +5178,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.3.0", + "indexmap 2.4.0", "slab", "tokio", "tokio-util", @@ -4950,6 +5209,20 @@ dependencies = [ "thiserror", ] +[[package]] +name = "handlebars" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b" +dependencies = [ + "log", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -4976,13 +5249,14 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", + "serde", ] [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ "hashbrown 0.14.5", ] @@ -5174,7 +5448,7 @@ dependencies = [ "markup5ever", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -5291,12 +5565,11 @@ dependencies = [ "anyhow", "derive_more", "futures 0.3.30", - "futures-lite 1.13.0", - "http 1.1.0", - "isahc", + "http 0.2.12", "log", "serde", "serde_json", + "smol", "url", ] @@ -5358,8 +5631,8 @@ dependencies = [ "http 0.2.12", "hyper", "log", - "rustls", - "rustls-native-certs", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", "tokio", "tokio-rustls", ] @@ -5418,9 +5691,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" dependencies = [ "crossbeam-deque", "globset", @@ -5471,8 +5744,10 @@ version = "0.1.0" dependencies = [ "anyhow", "db", + "file_icons", "gpui", "project", + "settings", "ui", "workspace", ] @@ -5511,7 +5786,7 @@ dependencies = [ "paths", "pretty_assertions", "serde", - "strum", + "strum 0.25.0", "util", ] @@ -5528,9 +5803,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -5557,7 +5832,7 @@ checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -5642,7 +5917,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -5692,7 +5967,7 @@ dependencies = [ "fnv", "lazy_static", "libc", - "mio 1.0.1", + "mio 1.0.2", "rand 0.8.5", "serde", "tempfile", @@ -5717,11 +5992,11 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -5769,6 +6044,17 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "isahc_http_client" +version = "0.1.0" +dependencies = [ + "anyhow", + "futures 0.3.30", + "http_client", + "isahc", + "util", +] + [[package]] name = "itertools" version = "0.10.5" @@ -5780,18 +6066,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -5857,9 +6143,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -5873,7 +6159,7 @@ dependencies = [ "base64 0.21.7", "js-sys", "pem", - "ring", + "ring 0.17.8", "serde", "serde_json", "simple_asn1", @@ -5881,9 +6167,9 @@ dependencies = [ [[package]] name = "khronos-egl" -version = "5.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1382b16c04aeb821453d6215a3c80ba78f24c6595c5aa85653378aabe0c83e3" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", "libloading", @@ -5946,13 +6232,12 @@ dependencies = [ "gpui", "http_client", "indoc", - "itertools 0.11.0", - "lazy_static", + "itertools 0.13.0", "log", "lsp", "parking_lot", "postage", - "pulldown-cmark", + "pulldown-cmark 0.12.1", "rand 0.8.5", "regex", "rpc", @@ -6003,6 +6288,7 @@ dependencies = [ "http_client", "image", "inline_completion_button", + "isahc", "language", "log", "menu", @@ -6017,7 +6303,7 @@ dependencies = [ "serde_json", "settings", "smol", - "strum", + "strum 0.25.0", "text", "theme", "tiktoken-rs", @@ -6081,7 +6367,6 @@ dependencies = [ "gpui", "http_client", "language", - "lazy_static", "log", "lsp", "node_runtime", @@ -6126,7 +6411,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin", + "spin 0.9.8", ] [[package]] @@ -6149,9 +6434,19 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "cc", + "pkg-config", +] [[package]] name = "libfuzzer-sys" @@ -6183,7 +6478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -6210,13 +6505,14 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall 0.5.3", ] [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", "pkg-config", @@ -6225,9 +6521,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -6261,7 +6557,7 @@ checksum = "cb26336e6dc7cc76e7927d2c9e7e3bb376d7af65a6f56a0b16c47d18a9b1abc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -6284,7 +6580,7 @@ dependencies = [ "async-broadcast", "async-trait", "collections", - "core-foundation", + "core-foundation 0.9.4", "futures 0.3.30", "gpui", "live_kit_server", @@ -6442,6 +6738,12 @@ dependencies = [ "libc", ] +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + [[package]] name = "markdown" version = "0.1.0" @@ -6456,7 +6758,7 @@ dependencies = [ "linkify", "log", "node_runtime", - "pulldown-cmark", + "pulldown-cmark 0.12.1", "settings", "theme", "ui", @@ -6476,7 +6778,8 @@ dependencies = [ "linkify", "log", "pretty_assertions", - "pulldown-cmark", + "pulldown-cmark 0.12.1", + "settings", "theme", "ui", "workspace", @@ -6548,13 +6851,49 @@ dependencies = [ "digest", ] +[[package]] +name = "mdbook" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45a38e19bd200220ef07c892b0157ad3d2365e5b5a267ca01ad12182491eea5" +dependencies = [ + "ammonia", + "anyhow", + "chrono", + "clap", + "clap_complete", + "elasticlunr-rs", + "env_logger", + "futures-util", + "handlebars 5.1.2", + "ignore", + "log", + "memchr", + "notify", + "notify-debouncer-mini", + "once_cell", + "opener", + "pathdiff", + "pulldown-cmark 0.10.3", + "regex", + "serde", + "serde_json", + "shlex", + "tempfile", + "tokio", + "toml 0.5.11", + "topological-sort", + "walkdir", + "warp", +] + [[package]] name = "media" version = "0.1.0" dependencies = [ "anyhow", - "bindgen 0.65.1", - "core-foundation", + "bindgen 0.70.1", + "core-foundation 0.9.4", "foreign-types 0.5.0", "metal", "objc", @@ -6572,7 +6911,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.35", ] [[package]] @@ -6609,7 +6948,7 @@ checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ "bitflags 2.6.0", "block", - "core-graphics-types", + "core-graphics-types 0.1.3", "foreign-types 0.5.0", "log", "objc", @@ -6631,6 +6970,16 @@ 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 = "minimal-lexical" version = "0.2.1" @@ -6647,6 +6996,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mint" version = "0.5.9" @@ -6667,9 +7025,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi 0.3.9", "libc", @@ -6697,9 +7055,8 @@ dependencies = [ "ctor", "env_logger", "futures 0.3.30", - "git", "gpui", - "itertools 0.11.0", + "itertools 0.13.0", "language", "log", "parking_lot", @@ -6731,7 +7088,7 @@ dependencies = [ "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", - "indexmap 2.3.0", + "indexmap 2.4.0", "log", "rustc-hash", "spirv", @@ -6810,18 +7167,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.1.1", - "libc", -] - [[package]] name = "nix" version = "0.29.0" @@ -6844,6 +7189,7 @@ dependencies = [ "async-std", "async-tar", "async-trait", + "async-watch", "async_zip", "futures 0.3.30", "http_client", @@ -6856,6 +7202,7 @@ dependencies = [ "tempfile", "util", "walkdir", + "which 6.0.3", "windows 0.58.0", ] @@ -6875,6 +7222,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" +[[package]] +name = "normpath" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "notifications" version = "0.1.0" @@ -6911,6 +7267,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "notify-debouncer-mini" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43" +dependencies = [ + "crossbeam-channel", + "log", + "notify", +] + [[package]] name = "ntapi" version = "0.4.1" @@ -6995,7 +7362,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7077,7 +7444,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7116,22 +7483,13 @@ dependencies = [ [[package]] name = "object" -version = "0.33.0" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "crc32fast", "hashbrown 0.14.5", - "indexmap 2.3.0", - "memchr", -] - -[[package]] -name = "object" -version = "0.36.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" -dependencies = [ + "indexmap 2.4.0", "memchr", ] @@ -7185,7 +7543,7 @@ checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24" dependencies = [ "aes", "async-fs 2.1.2", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", "async-net 2.0.0", "blocking", @@ -7238,7 +7596,19 @@ dependencies = [ "schemars", "serde", "serde_json", - "strum", + "strum 0.25.0", +] + +[[package]] +name = "opener" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681" +dependencies = [ + "bstr", + "dbus", + "normpath", + "windows-sys 0.59.0", ] [[package]] @@ -7264,7 +7634,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7350,7 +7720,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7388,15 +7758,19 @@ dependencies = [ "file_icons", "fuzzy", "gpui", - "itertools 0.11.0", + "itertools 0.13.0", "language", "log", "menu", + "pretty_assertions", "project", "schemars", + "search", "serde", "serde_json", "settings", + "smol", + "theme", "util", "workspace", "worktree", @@ -7455,7 +7829,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7561,12 +7935,6 @@ dependencies = [ "hmac", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" version = "3.0.4" @@ -7592,27 +7960,12 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "performance" -version = "0.1.0" -dependencies = [ - "anyhow", - "collections", - "gpui", - "log", - "schemars", - "serde", - "settings", - "util", - "workspace", -] - [[package]] name = "perplexity" version = "0.1.0" dependencies = [ "serde", - "zed_extension_api 0.1.0", + "zed_extension_api 0.2.0", ] [[package]] @@ -7646,7 +7999,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7667,7 +8020,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.3.0", + "indexmap 2.4.0", ] [[package]] @@ -7720,7 +8073,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7780,7 +8133,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7797,12 +8150,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] @@ -7850,7 +8203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64 0.22.1", - "indexmap 2.3.0", + "indexmap 2.4.0", "quick-xml 0.32.0", "serde", "time", @@ -7894,7 +8247,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] @@ -7915,17 +8268,17 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix 0.38.35", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7953,12 +8306,13 @@ dependencies = [ [[package]] name = "postcard" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" dependencies = [ "cobs", - "embedded-io", + "embedded-io 0.4.0", + "embedded-io 0.6.1", "serde", ] @@ -8014,21 +8368,21 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.20", ] [[package]] @@ -8080,7 +8434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -8103,7 +8457,7 @@ dependencies = [ "globset", "gpui", "http_client", - "itertools 0.11.0", + "itertools 0.13.0", "language", "log", "lsp", @@ -8136,7 +8490,8 @@ dependencies = [ "text", "unindent", "util", - "which 6.0.2", + "which 6.0.3", + "windows 0.58.0", "worktree", ] @@ -8150,9 +8505,9 @@ dependencies = [ "db", "editor", "file_icons", - "futures 0.3.30", "git", "gpui", + "indexmap 1.9.3", "language", "menu", "pretty_assertions", @@ -8266,7 +8621,6 @@ version = "0.1.0" dependencies = [ "anyhow", "collections", - "futures 0.3.30", "prost", "prost-build", "serde", @@ -8281,11 +8635,10 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "protols-tree-sitter-proto" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bac092da66e21a71eb832925de7b542f8ac34f75fd05cd2fc3e272863e3fd2b" +source = "git+https://github.com/zed-industries/tree-sitter-proto?rev=0848bd30a64be48772e15fbb9d5ba8c0cc5772ad#0848bd30a64be48772e15fbb9d5ba8c0cc5772ad" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] @@ -8325,9 +8678,27 @@ checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993" dependencies = [ "bitflags 2.6.0", "memchr", + "pulldown-cmark-escape", "unicase", ] +[[package]] +name = "pulldown-cmark" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "666f0f59e259aea2d72e6012290c09877a780935cc3c18b1ceded41f3890d59c" +dependencies = [ + "bitflags 2.6.0", + "memchr", + "unicase", +] + +[[package]] +name = "pulldown-cmark-escape" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348ff538bc9caeda7ee8cad2d1d48236a1f443c1fa3913c6a02fe0043b1dd3" + [[package]] name = "qoi" version = "0.4.1" @@ -8380,9 +8751,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -8507,9 +8878,9 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.9" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5797d09f9bd33604689e87e8380df4951d4912f01b63f71205e2abd4ae25e6b6" +checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" dependencies = [ "avif-serialize", "imgref", @@ -8531,8 +8902,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76e8caa82e31bb98fee12fa8f051c94a6aa36b07cddb03f0d4fc558988360ff1" dependencies = [ - "cocoa", - "core-graphics", + "cocoa 0.25.0", + "core-graphics 0.23.2", "objc", "raw-window-handle", ] @@ -8631,9 +9002,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.15", "libredox", @@ -8753,6 +9124,7 @@ dependencies = [ "http_client", "language", "log", + "lsp", "node_runtime", "project", "remote", @@ -8843,7 +9215,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -8886,9 +9258,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.47" +version = "0.8.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12bc8d2f72df26a5d3178022df33720fbede0d31d82c7291662eff89836994d" +checksum = "09cd5a1e95672f201913966f39baf355b53b5d92833431847295ae0346a5b939" dependencies = [ "bytemuck", ] @@ -8901,12 +9273,27 @@ dependencies = [ "gpui", "language", "linkify", - "pulldown-cmark", + "pulldown-cmark 0.12.1", "theme", "ui", "util", ] +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + [[package]] name = "ring" version = "0.17.8" @@ -8917,16 +9304,16 @@ dependencies = [ "cfg-if", "getrandom 0.2.15", "libc", - "spin", - "untrusted", + "spin 0.9.8", + "untrusted 0.9.0", "windows-sys 0.52.0", ] [[package]] name = "rkyv" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", @@ -8942,9 +9329,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ "proc-macro2", "quote", @@ -8974,12 +9361,13 @@ dependencies = [ [[package]] name = "rodio" -version = "0.17.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" +checksum = "6006a627c1a38d37f3d3a85c6575418cfe34a5392d60a686d0071e1c8d427acb" dependencies = [ "cpal", "hound", + "thiserror", ] [[package]] @@ -9030,7 +9418,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "strum", + "strum 0.25.0", "tracing", "util", "zstd", @@ -9058,9 +9446,9 @@ dependencies = [ [[package]] name = "runtimelib" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3d817764e3971867351e6103955b17d808f5330e9ef63aaaaab55bf8c664c1" +checksum = "a7d76d28b882a7b889ebb04e79bc2b160b3061821ea596ff0f4a838fc7a76db0" dependencies = [ "anyhow", "async-dispatcher", @@ -9073,7 +9461,7 @@ dependencies = [ "futures 0.3.30", "glob", "rand 0.8.5", - "ring", + "ring 0.17.8", "serde", "serde_json", "shellexpand 3.1.0", @@ -9102,7 +9490,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.72", + "syn 2.0.76", "walkdir", ] @@ -9119,9 +9507,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.35.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", "borsh", @@ -9147,9 +9535,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] @@ -9170,9 +9558,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ "bitflags 2.6.0", "errno 0.3.9", @@ -9191,7 +9579,19 @@ checksum = "a25c3aad9fc1424eb82c88087789a7d938e1829724f3e4043163baf0d13cfc12" dependencies = [ "errno 0.3.9", "libc", - "rustix 0.38.34", + "rustix 0.38.35", +] + +[[package]] +name = "rustls" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +dependencies = [ + "log", + "ring 0.16.20", + "sct", + "webpki", ] [[package]] @@ -9201,7 +9601,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring", + "ring 0.17.8", "rustls-webpki", "sct", ] @@ -9213,7 +9613,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.3", + "rustls-pki-types", "schannel", "security-framework", ] @@ -9227,14 +9640,30 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + [[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -9315,7 +9744,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.29.1", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -9348,8 +9777,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -9362,14 +9791,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "sea-orm" -version = "0.12.15" +version = "1.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8814e37dc25de54398ee62228323657520b7f29713b8e238649385dbe473ee0" +checksum = "1ef282b794f7d3426f61f530854705963b1941e7584ea84fb98528e504fac7c7" dependencies = [ "async-stream", "async-trait", @@ -9385,7 +9814,7 @@ dependencies = [ "serde", "serde_json", "sqlx", - "strum", + "strum 0.26.3", "thiserror", "time", "tracing", @@ -9395,27 +9824,27 @@ dependencies = [ [[package]] name = "sea-orm-macros" -version = "0.12.15" +version = "1.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e115c6b078e013aa963cc2d38c196c2c40b05f03d0ac872fe06b6e0d5265603" +checksum = "07aadcb2ee9fad78a3bf74f6430ba94865ab4d8ad237f978e99dafa97ee0df57" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", "sea-bae", - "syn 2.0.72", + "syn 2.0.76", "unicode-ident", ] [[package]] name = "sea-query" -version = "0.30.7" +version = "0.32.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4166a1e072292d46dc91f31617c2a1cdaf55a8be4b5c9f4bf2ba248e3ac4999b" +checksum = "6fba498acd58ce434669f273505cd07737065472eb541c3f813c7f4ce33993f5" dependencies = [ "bigdecimal", "chrono", - "derivative", + "educe", "inherent", "ordered-float 3.9.2", "rust_decimal", @@ -9426,9 +9855,9 @@ dependencies = [ [[package]] name = "sea-query-binder" -version = "0.5.0" +version = "0.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36bbb68df92e820e4d5aeb17b4acd5cc8b5d18b2c36a4dd6f4626aabfa7ab1b9" +checksum = "edc3296903e60ddc7c9f4601cd6ef31a4b1584bf22480587e00b9ef743071b57" dependencies = [ "bigdecimal", "chrono", @@ -9505,7 +9934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "libc", "security-framework-sys", @@ -9532,17 +9961,22 @@ name = "semantic_index" version = "0.1.0" dependencies = [ "anyhow", + "arrayvec", + "blake3", "client", "clock", "collections", "env_logger", + "feature_flags", "fs", "futures 0.3.30", "futures-batch", "gpui", "heed", "http_client", + "isahc_http_client", "language", + "language_model", "languages", "log", "open_ai", @@ -9582,22 +10016,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.207" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.207" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -9619,7 +10053,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -9633,11 +10067,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "itoa", "memchr", "ryu", @@ -9646,11 +10080,11 @@ dependencies = [ [[package]] name = "serde_json_lenient" -version = "0.1.8" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc61c66b53a4035fcce237ef38043f4b2f0ebf918fd0e69541a5166104065581" +checksum = "a5d0bae483150302560d7cb52e7932f39b69a6fbdd099e48d33ef060a8c9c078" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "itoa", "ryu", "serde", @@ -9696,7 +10130,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -9741,7 +10175,6 @@ dependencies = [ "futures 0.3.30", "gpui", "indoc", - "lazy_static", "log", "paths", "pretty_assertions", @@ -9973,7 +10406,7 @@ dependencies = [ name = "slash_commands_example" version = "0.1.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] @@ -10101,6 +10534,12 @@ dependencies = [ "smallvec", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spin" version = "0.9.8" @@ -10153,7 +10592,6 @@ dependencies = [ "collections", "futures 0.3.30", "indoc", - "lazy_static", "libsqlite3-sys", "parking_lot", "smol", @@ -10166,7 +10604,6 @@ dependencies = [ name = "sqlez_macros" version = "0.1.0" dependencies = [ - "lazy_static", "sqlez", "sqlformat", "syn 1.0.109", @@ -10184,9 +10621,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" +checksum = "27144619c6e5802f1380337a209d2ac1c431002dd74c6e60aebff3c506dc4f0c" dependencies = [ "sqlx-core", "sqlx-macros", @@ -10197,11 +10634,10 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" +checksum = "a999083c1af5b5d6c071d34a708a19ba3e02106ad82ef7bbd69f5e48266b613b" dependencies = [ - "ahash 0.8.11", "atoi", "bigdecimal", "byteorder", @@ -10209,25 +10645,25 @@ dependencies = [ "chrono", "crc", "crossbeam-queue", - "dotenvy", "either", - "event-listener 2.5.3", + "event-listener 5.3.1", "futures-channel", "futures-core", "futures-intrusive", "futures-io", "futures-util", + "hashbrown 0.14.5", "hashlink", "hex", - "indexmap 2.3.0", + "indexmap 2.4.0", "log", "memchr", "once_cell", "paste", "percent-encoding", "rust_decimal", - "rustls", - "rustls-pemfile", + "rustls 0.21.12", + "rustls-pemfile 1.0.4", "serde", "serde_json", "sha2", @@ -10240,31 +10676,31 @@ dependencies = [ "tracing", "url", "uuid", - "webpki-roots", + "webpki-roots 0.25.4", ] [[package]] name = "sqlx-macros" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" +checksum = "a23217eb7d86c584b8cbe0337b9eacf12ab76fe7673c513141ec42565698bb88" dependencies = [ "proc-macro2", "quote", "sqlx-core", "sqlx-macros-core", - "syn 1.0.109", + "syn 2.0.76", ] [[package]] name = "sqlx-macros-core" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" +checksum = "1a099220ae541c5db479c6424bdf1b200987934033c2584f79a0e1693601e776" dependencies = [ "dotenvy", "either", - "heck 0.4.1", + "heck 0.5.0", "hex", "once_cell", "proc-macro2", @@ -10276,7 +10712,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 1.0.109", + "syn 2.0.76", "tempfile", "tokio", "url", @@ -10284,12 +10720,12 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" +checksum = "5afe4c38a9b417b6a9a5eeffe7235d0a106716495536e7727d1c7f4b1ff3eba6" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bigdecimal", "bitflags 2.6.0", "byteorder", @@ -10331,12 +10767,12 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" +checksum = "b1dbb157e65f10dbe01f729339c06d239120221c9ad9fa0ba8408c4cc18ecf21" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bigdecimal", "bitflags 2.6.0", "byteorder", @@ -10362,7 +10798,6 @@ dependencies = [ "rust_decimal", "serde", "serde_json", - "sha1", "sha2", "smallvec", "sqlx-core", @@ -10376,9 +10811,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" +checksum = "9b2cdd83c008a622d94499c0006d8ee5f821f36c89b7d625c900e5dc30b5c5ee" dependencies = [ "atoi", "chrono", @@ -10392,6 +10827,7 @@ dependencies = [ "log", "percent-encoding", "serde", + "serde_urlencoded", "sqlx-core", "time", "tracing", @@ -10416,7 +10852,7 @@ name = "story" version = "0.1.0" dependencies = [ "gpui", - "itertools 0.10.5", + "itertools 0.13.0", "smallvec", ] @@ -10442,7 +10878,7 @@ dependencies = [ "settings", "simplelog", "story", - "strum", + "strum 0.25.0", "theme", "title_bar", "ui", @@ -10509,6 +10945,12 @@ dependencies = [ "strum_macros", ] +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" + [[package]] name = "strum_macros" version = "0.25.3" @@ -10519,7 +10961,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -10564,6 +11006,7 @@ dependencies = [ "text", "theme", "ui", + "unicode-segmentation", "util", "windows 0.58.0", ] @@ -10667,9 +11110,9 @@ checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" [[package]] name = "svgtypes" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fae3064df9b89391c9a76a0425a69d124aee9c5c28455204709e72c39868a43c" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" dependencies = [ "kurbo", "siphasher 1.0.1", @@ -10699,9 +11142,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -10717,7 +11160,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -10746,17 +11189,16 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.13" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", "rayon", - "windows 0.52.0", + "windows 0.54.0", ] [[package]] @@ -10766,7 +11208,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys", ] @@ -10804,7 +11246,7 @@ dependencies = [ "cap-std", "fd-lock", "io-lifetimes 2.0.3", - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.52.0", "winx", ] @@ -10920,9 +11362,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", + "fastrand 2.1.1", "once_cell", - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.59.0", ] @@ -10972,6 +11414,16 @@ dependencies = [ "windows 0.58.0", ] +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix 0.38.35", + "windows-sys 0.48.0", +] + [[package]] name = "terminal_view" version = "0.1.0" @@ -10984,7 +11436,7 @@ dependencies = [ "editor", "futures 0.3.30", "gpui", - "itertools 0.11.0", + "itertools 0.13.0", "language", "project", "rand 0.8.5", @@ -11001,6 +11453,7 @@ dependencies = [ "ui", "util", "workspace", + "zed_actions", ] [[package]] @@ -11014,7 +11467,6 @@ dependencies = [ "env_logger", "gpui", "http_client", - "lazy_static", "log", "parking_lot", "postage", @@ -11069,7 +11521,7 @@ dependencies = [ "serde_json", "serde_json_lenient", "simplelog", - "strum", + "strum 0.25.0", "theme", "vscode_theme", ] @@ -11110,7 +11562,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -11186,7 +11638,7 @@ dependencies = [ name = "time_format" version = "0.1.0" dependencies = [ - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "sys-locale", "time", @@ -11303,14 +11755,14 @@ dependencies = [ [[package]] name = "tokio" -version = "1.39.2" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes 1.7.1", "libc", - "mio 1.0.1", + "mio 1.0.2", "parking_lot", "pin-project-lite", "signal-hook-registry", @@ -11338,7 +11790,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -11357,10 +11809,22 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.12", "tokio", ] +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-io", + "futures-util", + "thiserror", +] + [[package]] name = "tokio-stream" version = "0.1.15" @@ -11381,7 +11845,19 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.20.1", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.21.0", ] [[package]] @@ -11446,37 +11922,32 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "serde", "serde_spanned", "toml_datetime", "winnow 0.5.40", ] -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.3.0", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.4.0", "serde", "serde_spanned", "toml_datetime", "winnow 0.6.18", ] +[[package]] +name = "topological-sort" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" + [[package]] name = "tower" version = "0.4.13" @@ -11532,15 +12003,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -11562,7 +12033,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -11629,117 +12100,119 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.22.6" -source = "git+https://github.com/tree-sitter/tree-sitter?rev=7f4a57817d58a2f134fe863674acad6bbf007228#7f4a57817d58a2f134fe863674acad6bbf007228" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20f4cd3642c47a85052a887d86704f4eac272969f61b686bdd3f772122aabaff" dependencies = [ "cc", "regex", + "regex-syntax 0.8.4", "tree-sitter-language", "wasmtime-c-api-impl", ] [[package]] name = "tree-sitter-bash" -version = "0.21.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5244703ad2e08a616d859a0557d7aa290adcd5e0990188a692e628ffe9dce40" +checksum = "3aa5e1c6bd02c0053f3f68edcf5d8866b38a8640584279e30fca88149ce14dda" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-c" -version = "0.21.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f956d5351d62652864a4ff3ae861747e7a1940dc96c9998ae400ac0d3ce30427" +checksum = "e795ad541f7ae6a80d22975296340a75a12a29afd3a7089f4368021613728e17" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-cpp" -version = "0.22.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d509a22a992790d38f2c291961ff8a1ff016c437c7ec6befc9220b8eec8918c" +checksum = "c0a588a816017469b69f2e3544742e34a5a59dddfb4b9457b657a6052e2ea39c" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-css" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f806f96136762b0121f5fdd7172a3dcd8f42d37a2f23ed7f11b35895e20eb4" +checksum = "8d0018d6b1692a806f9cddaa1e5616951fd58840c39a0b21401b55ab3df12292" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-elixir" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df94bf7f057768b1cab2ee1f14812ed4ae33f9e04d09254043eeaa797db4ef70" +checksum = "6174acad8a059851f6f768d7893f4b25eedc80eb6643283d545dd71bbb38222a" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-embedded-template" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33817ade928c73a32d4f904a602321e09de9fc24b71d106f3b4b3f8ab30dcc38" +checksum = "9644d7586ebe850c84037ee2f4804dda4a9348eef053be6b1e0d7712342a2495" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-go" -version = "0.21.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cb318be5ccf75f44e054acf6898a5c95d59b53443eed578e16be0cd7ec037f" +checksum = "caf57626e4c9b6d6efaf8a8d5ee1241c5f178ae7bfdf693713ae6a774f01424e" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-gomod" version = "1.0.2" -source = "git+https://github.com/camdencheek/tree-sitter-go-mod?rev=1f55029bacd0a6a11f6eb894c4312d429dcf735c#1f55029bacd0a6a11f6eb894c4312d429dcf735c" +source = "git+https://github.com/zed-industries/tree-sitter-go-mod?rev=a9aea5e358cde4d0f8ff20b7bc4fa311e359c7ca#a9aea5e358cde4d0f8ff20b7bc4fa311e359c7ca" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-gowork" version = "0.0.1" -source = "git+https://github.com/d1y/tree-sitter-go-work?rev=dcbabff454703c3a4bc98a23cf8778d4be46fd22#dcbabff454703c3a4bc98a23cf8778d4be46fd22" +source = "git+https://github.com/zed-industries/tree-sitter-go-work?rev=acb0617bf7f4fda02c6217676cc64acb89536dc7#acb0617bf7f4fda02c6217676cc64acb89536dc7" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-heex" version = "0.0.1" -source = "git+https://github.com/phoenixframework/tree-sitter-heex?rev=6dd0303acf7138dd2b9b432a229e16539581c701#6dd0303acf7138dd2b9b432a229e16539581c701" +source = "git+https://github.com/zed-industries/tree-sitter-heex?rev=1dd45142fbb05562e35b2040c6129c9bca346592#1dd45142fbb05562e35b2040c6129c9bca346592" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-html" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3492b08a786bf5cc79feb0ef2ff3b115d5174364e0ddfd7860e0b9b088b53" +checksum = "8766b5ad3721517f8259e6394aefda9c686aebf7a8c74ab8624f2c3b46902fd5" dependencies = [ "cc", "tree-sitter", @@ -11747,96 +12220,96 @@ dependencies = [ [[package]] name = "tree-sitter-jsdoc" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d07920101ff12a59574890318a37fa7e18d9c06d9aa4be334aa24adbb480f18" +checksum = "f8c4049eb0ad690e34e5f63640f75ce12a2ff8ba18344d0a13926805b139c0c8" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-json" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b737dcb73c35d74b7d64a5f3dde158113c86a012bf3cee2bfdf2150d23b05db" +checksum = "86a5d6b3ea17e06e7a34aabeadd68f5866c0d0f9359155d432095f8b751865e4" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-language" version = "0.1.0" -source = "git+https://github.com/tree-sitter/tree-sitter?rev=7f4a57817d58a2f134fe863674acad6bbf007228#7f4a57817d58a2f134fe863674acad6bbf007228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2545046bd1473dac6c626659cc2567c6c0ff302fc8b84a56c4243378276f7f57" [[package]] name = "tree-sitter-md" -version = "0.2.3" -source = "git+https://github.com/zed-industries/tree-sitter-markdown?rev=e3855e37f8f2c71aa7513c18a9c95fb7461b1b10#e3855e37f8f2c71aa7513c18a9c95fb7461b1b10" +version = "0.3.2" +source = "git+https://github.com/zed-industries/tree-sitter-markdown?rev=4cfa6aad6b75052a5077c80fd934757d9267d81b#4cfa6aad6b75052a5077c80fd934757d9267d81b" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-python" -version = "0.21.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4066c6cf678f962f8c2c4561f205945c84834cce73d981e71392624fdc390a9" +checksum = "65661b1a3e24139e2e54207e47d910ab07e28790d78efc7d5dc3a11ce2a110eb" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-regex" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ff1286fe9651b2797484839ffa37aa76c8618d4ccb6836d7e31765dfd60c0d5" +checksum = "0b9a7087b1cf769c96b7e74414947df067fb6135f04d176fd23be08b9396cc0e" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-ruby" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0031f687c0772f2dad7b77104c43428611099a1804c81244ada21560f41f0b1" +checksum = "6ec5ee842e27791e0adffa0b2a177614de51d2a26e5c7e84d014ed7f097e5ed0" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-rust" -version = "0.21.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277690f420bf90741dea984f3da038ace46c4fe6047cba57a66822226cde1c93" +checksum = "cffbbcb780348fbae8395742ae5b34c1fd794e4085d43aac9f259387f9a84dc8" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-typescript" -version = "0.21.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb35d98a688378e56c18c9c159824fd16f730ccbea19aacf4f206e5d5438ed9" +checksum = "aecf1585ae2a9dddc2b1d4c0e2140b2ec9876e2a25fd79de47fcf7dae0384685" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-yaml" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad27ec46ad343d8b514f64dd3fdffb478c592ece561b6c935d90ef55589c6b6" +source = "git+https://github.com/zed-industries/tree-sitter-yaml?rev=baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a#baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] @@ -11863,7 +12336,25 @@ dependencies = [ "http 0.2.12", "httparse", "log", - "native-tls", + "rand 0.8.5", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes 1.7.1", + "data-encoding", + "http 1.1.0", + "httparse", + "log", "rand 0.8.5", "sha1", "thiserror", @@ -11873,9 +12364,9 @@ dependencies = [ [[package]] name = "typeid" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" [[package]] name = "typenum" @@ -11906,14 +12397,15 @@ version = "0.1.0" dependencies = [ "chrono", "gpui", - "itertools 0.11.0", + "itertools 0.13.0", "menu", "serde", "settings", "smallvec", "story", - "strum", + "strum 0.25.0", "theme", + "ui_macros", "windows 0.58.0", ] @@ -11928,6 +12420,16 @@ dependencies = [ "ui", ] +[[package]] +name = "ui_macros" +version = "0.1.0" +dependencies = [ + "convert_case 0.6.0", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "unicase" version = "2.7.0" @@ -11978,9 +12480,9 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" [[package]] name = "unicode-script" @@ -12002,9 +12504,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "unicode_categories" @@ -12018,6 +12520,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +[[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" @@ -12210,9 +12718,8 @@ dependencies = [ "futures 0.3.30", "gpui", "indoc", - "itertools 0.11.0", + "itertools 0.13.0", "language", - "lazy_static", "log", "lsp", "multi_buffer", @@ -12317,6 +12824,34 @@ dependencies = [ "try-lock", ] +[[package]] +name = "warp" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" +dependencies = [ + "bytes 1.7.1", + "futures-channel", + "futures-util", + "headers", + "http 0.2.12", + "hyper", + "log", + "mime", + "mime_guess", + "percent-encoding", + "pin-project", + "scoped-tls", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-tungstenite 0.21.0", + "tokio-util", + "tower-service", + "tracing", +] + [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" @@ -12337,34 +12872,35 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -12374,9 +12910,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -12384,22 +12920,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-encoder" @@ -12412,9 +12948,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.207.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d996306fb3aeaee0d9157adbe2f670df0236caf19f6728b221e92d0f27b3fe17" +checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847" dependencies = [ "leb128", ] @@ -12426,7 +12962,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fd83062c17b9f4985d438603cde0a5e8c5c8198201a6937f778b607924c7da2" dependencies = [ "anyhow", - "indexmap 2.3.0", + "indexmap 2.4.0", "serde", "serde_derive", "serde_json", @@ -12442,66 +12978,68 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708" dependencies = [ "bitflags 2.6.0", - "indexmap 2.3.0", + "indexmap 2.4.0", "semver", ] [[package]] name = "wasmparser" -version = "0.207.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19bb9f8ab07616da582ef8adb24c54f1424c7ec876720b7da9db8ec0626c92c" +checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e" dependencies = [ "ahash 0.8.11", "bitflags 2.6.0", "hashbrown 0.14.5", - "indexmap 2.3.0", + "indexmap 2.4.0", "semver", + "serde", ] [[package]] name = "wasmprinter" -version = "0.207.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2d8a7b4dabb460208e6b4334d9db5766e84505038b2529e69c3d07ac619115" +checksum = "d8e9a325d85053408209b3d2ce5eaddd0dd6864d1cff7a007147ba073157defc" dependencies = [ "anyhow", - "wasmparser 0.207.0", + "termcolor", + "wasmparser 0.215.0", ] [[package]] name = "wasmtime" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92a1370c66a0022e6d92dcc277e2c84f5dece19569670b8ce7db8162560d8b6" +checksum = "9a5883d64dfc8423c56e3d8df27cffc44db25336aa468e8e0724fddf30a333d7" dependencies = [ "anyhow", "async-trait", + "bitflags 2.6.0", "bumpalo", "cc", "cfg-if", "encoding_rs", "hashbrown 0.14.5", - "indexmap 2.3.0", + "indexmap 2.4.0", "libc", "libm", "log", "mach2", "memfd", - "memoffset", - "object 0.33.0", + "object", "once_cell", "paste", "postcard", "psm", - "rustix 0.38.34", + "rustix 0.38.35", "semver", "serde", "serde_derive", "smallvec", "sptr", "target-lexicon", - "wasmparser 0.207.0", + "wasmparser 0.215.0", "wasmtime-asm-macros", "wasmtime-component-macro", "wasmtime-component-util", @@ -12517,18 +13055,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dee8679c974a7f258c03d60d3c747c426ed219945b6d08cbc77fd2eab15b2d1" +checksum = "1c4dc7e2a379c0dd6be5b55857d14c4b277f43a9c429a9e14403eb61776ae3be" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-c-api-impl" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76af8b62c8d2814b7d5975c5dc140122e4c086150db6c15d25a4b76f11c929dd" +checksum = "765e302e7d9125e614aaeec3ad6b6083605393004eca00214106a4ff6b47fc58" dependencies = [ "anyhow", "log", @@ -12540,9 +13078,9 @@ dependencies = [ [[package]] name = "wasmtime-c-api-macros" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d74b92f917c9ced9c6262a00e9cb982ebac183e6900b4d44e2480f936b9495eb" +checksum = "2d09d02eaa84aa2de5babee7b0296557ad6e4903bb10aa8d135e393e753a43d6" dependencies = [ "proc-macro2", "quote", @@ -12550,30 +13088,30 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cae30035f1cf97dcc6657c979cf39f99ce6be93583675eddf4aeaa5548509c" +checksum = "4b07773d1c3dab5f014ec61316ee317aa424033e17e70a63abdf7c3a47e58fcf" dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser 0.207.0", + "wit-parser 0.215.0", ] [[package]] name = "wasmtime-component-util" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ae611f08cea620c67330925be28a96115bf01f8f393a6cbdf4856a86087134" +checksum = "e38d735320f4e83478369ce649ad8fe87c6b893220902e798547a225fc0c5874" [[package]] name = "wasmtime-cranelift" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2909406a6007e28be964067167890bca4574bd48a9ff18f1fa9f4856d89ea40" +checksum = "e570d831d0785d93d7d8c722b1eb9a34e0d0c1534317666f65892818358a2da9" dependencies = [ "anyhow", "cfg-if", @@ -12583,36 +13121,38 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.28.1", + "gimli 0.29.0", "log", - "object 0.33.0", + "object", "target-lexicon", "thiserror", - "wasmparser 0.207.0", + "wasmparser 0.215.0", "wasmtime-environ", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40e227f9ed2f5421473723d6c0352b5986e6e6044fde5410a274a394d726108f" +checksum = "c5fe80dfbd81687431a7d4f25929fae1ae96894786d5c96b14ae41164ee97377" dependencies = [ "anyhow", "cpp_demangle", + "cranelift-bitset", "cranelift-entity", - "gimli 0.28.1", - "indexmap 2.3.0", + "gimli 0.29.0", + "indexmap 2.4.0", "log", - "object 0.33.0", + "object", "postcard", "rustc-demangle", + "semver", "serde", "serde_derive", "target-lexicon", - "wasm-encoder 0.207.0", - "wasmparser 0.207.0", + "wasm-encoder 0.215.0", + "wasmparser 0.215.0", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -12620,14 +13160,14 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42edb392586d07038c1638e854382db916b6ca7845a2e6a7f8dc49e08907acdd" +checksum = "0f39043d13c7b58db69dc9a0feb191a961e75a9ec2402aebf42de183c022bb8a" dependencies = [ "anyhow", "cc", "cfg-if", - "rustix 0.38.34", + "rustix 0.38.35", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", "windows-sys 0.52.0", @@ -12635,9 +13175,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe088f9b56bb353adaf837bf7e10f1c2e1676719dd5be4cac8e37f2ba1ee5bc" +checksum = "d15de8429db996f0d17a4163a35eccc3f874cbfb50f29c379951ea1bbb39452e" dependencies = [ "anyhow", "cfg-if", @@ -12647,39 +13187,40 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff75cafffe47b04b036385ce3710f209153525b0ed19d57b0cf44a22d446460" +checksum = "1f68d38fa6b30c5e1fc7d608263062997306f79e577ebd197ddcd6b0f55d87d1" [[package]] name = "wasmtime-types" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f2fa462bfea3220711c84e2b549f147e4df89eeb49b8a2a3d89148f6cc4a8b1" +checksum = "6634e7079d9c5cfc81af8610ed59b488cc5b7f9777a2f4c1667a2565c2e45249" dependencies = [ + "anyhow", "cranelift-entity", "serde", "serde_derive", "smallvec", - "wasmparser 0.207.0", + "wasmparser 0.215.0", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cedc5bfef3db2a85522ee38564b47ef3b7fc7c92e94cacbce99808e63cdd47" +checksum = "3850e3511d6c7f11a72d571890b0ed5f6204681f7f050b9de2690e7f13123fed" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "wasmtime-wasi" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbbe94245904d4c96c7c5f7b55bad896cc27908644efd9442063c0748b631fc" +checksum = "545ae8298ffce025604f7480f9c7d6948c985bef7ce9aee249ef79307813e83c" dependencies = [ "anyhow", "async-trait", @@ -12695,7 +13236,7 @@ dependencies = [ "io-extras", "io-lifetimes 2.0.3", "once_cell", - "rustix 0.38.34", + "rustix 0.38.35", "system-interface", "thiserror", "tokio", @@ -12708,16 +13249,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b27054fed6be4f3800aba5766f7ef435d4220ce290788f021a08d4fa573108" +checksum = "2a25199625effa4c13dd790d64bd56884b014c69829431bfe43991c740bd5bc1" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.28.1", - "object 0.33.0", + "gimli 0.29.0", + "object", "target-lexicon", - "wasmparser 0.207.0", + "wasmparser 0.215.0", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -12725,14 +13266,14 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936a52ce69c28de2aa3b5fb4f2dbbb2966df304f04cccb7aca4ba56d915fda0" +checksum = "3cb331ac7ed1d5ba49cddcdb6b11973752a857148858bb308777d2fc5584121f" dependencies = [ "anyhow", "heck 0.4.1", - "indexmap 2.3.0", - "wit-parser 0.207.0", + "indexmap 2.4.0", + "wit-parser 0.215.0", ] [[package]] @@ -12752,7 +13293,7 @@ checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.34", + "rustix 0.38.35", "scoped-tls", "smallvec", "wayland-sys", @@ -12765,7 +13306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" dependencies = [ "bitflags 2.6.0", - "rustix 0.38.34", + "rustix 0.38.35", "wayland-backend", "wayland-scanner", ] @@ -12776,7 +13317,7 @@ version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.35", "wayland-client", "xcursor", ] @@ -12831,23 +13372,39 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" +dependencies = [ + "ring 0.17.8", + "untrusted 0.9.0", +] + [[package]] name = "webpki-roots" -version = "0.24.0" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "rustls-webpki", + "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + [[package]] name = "weezl" version = "0.1.8" @@ -12877,6 +13434,7 @@ dependencies = [ "util", "vim", "workspace", + "zed_actions", ] [[package]] @@ -12888,18 +13446,18 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.34", + "rustix 0.38.35", ] [[package]] name = "which" -version = "6.0.2" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" +checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" dependencies = [ "either", "home", - "rustix 0.38.34", + "rustix 0.38.35", "winsafe", ] @@ -12915,9 +13473,9 @@ dependencies = [ [[package]] name = "wiggle" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89ea6f74ece6d1cfbd089783006b8eb69a0219ca83cad22068f0d9fa9df3f91" +checksum = "cc850ca3c02c5835934d23f28cec4c5a3fb66fe0b4ecd968bbb35609dda5ddc0" dependencies = [ "anyhow", "async-trait", @@ -12930,28 +13488,28 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36beda94813296ecaf0d91b7ada9da073fd41865ba339bdd3b7764e2e785b8e9" +checksum = "634b8804a67200bcb43ea8af5f7c53e862439a086b68b16fd333454bc74d5aab" dependencies = [ "anyhow", "heck 0.4.1", "proc-macro2", "quote", "shellexpand 2.1.2", - "syn 2.0.72", + "syn 2.0.76", "witx", ] [[package]] name = "wiggle-macro" -version = "21.0.1" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b47d2b4442ce93106dba5d1a9c59d5f85b5732878bb3d0598d3c93c0d01b16b" +checksum = "474b7cbdb942c74031e619d66c600bba7f73867c5800fc2c2306cf307649be2f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "wiggle-generate", ] @@ -12977,7 +13535,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -12988,17 +13546,17 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.19.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dc69899ccb2da7daa4df31426dcfd284b104d1a85e1dae35806df0c46187f87" +checksum = "073efe897d9ead7fc609874f94580afc831114af5149b6a90ee0a3a39b497fe0" dependencies = [ "anyhow", "cranelift-codegen", - "gimli 0.28.1", + "gimli 0.29.0", "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.207.0", + "wasmparser 0.215.0", "wasmtime-cranelift", "wasmtime-environ", ] @@ -13012,16 +13570,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.54.0" @@ -13082,7 +13630,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -13093,7 +13641,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -13446,7 +13994,7 @@ checksum = "d8a39a15d1ae2077688213611209849cad40e9e5cccf6e61951a425850677ff3" dependencies = [ "anyhow", "heck 0.4.1", - "indexmap 2.3.0", + "indexmap 2.4.0", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -13461,7 +14009,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -13474,7 +14022,7 @@ checksum = "421c0c848a0660a8c22e2fd217929a0191f14476b68962afd2af89fd22e39825" dependencies = [ "anyhow", "bitflags 2.6.0", - "indexmap 2.3.0", + "indexmap 2.4.0", "log", "serde", "serde_derive", @@ -13493,7 +14041,7 @@ checksum = "196d3ecfc4b759a8573bf86a9b3f8996b304b3732e4c7de81655f875f6efdca6" dependencies = [ "anyhow", "id-arena", - "indexmap 2.3.0", + "indexmap 2.4.0", "log", "semver", "serde", @@ -13505,20 +14053,20 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.207.0" +version = "0.215.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c83dab33a9618d86cfe3563cc864deffd08c17efc5db31a3b7cd1edeffe6e1" +checksum = "935a97eaffd57c3b413aa510f8f0b550a4a9fe7d59e79cd8b89a83dcb860321f" dependencies = [ "anyhow", "id-arena", - "indexmap 2.3.0", + "indexmap 2.4.0", "log", "semver", "serde", "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.207.0", + "wasmparser 0.215.0", ] [[package]] @@ -13551,16 +14099,17 @@ dependencies = [ "env_logger", "fs", "futures 0.3.30", + "git", "gpui", "http_client", - "itertools 0.11.0", + "itertools 0.13.0", "language", - "lazy_static", "log", "node_runtime", "parking_lot", "postage", "project", + "remote", "schemars", "serde", "serde_json", @@ -13604,6 +14153,7 @@ dependencies = [ "serde", "serde_json", "settings", + "smallvec", "smol", "sum_tree", "text", @@ -13638,7 +14188,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "rustix 0.38.34", + "rustix 0.38.35", "x11rb-protocol", ] @@ -13659,24 +14209,24 @@ dependencies = [ [[package]] name = "xcursor" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d491ee231a51ae64a5b762114c3ac2104b967aadba1de45c86ca42cf051513b7" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "xim" version = "0.4.0" -source = "git+https://github.com/npmania/xim-rs?rev=27132caffc5b9bc9c432ca4afad184ab6e7c16af#27132caffc5b9bc9c432ca4afad184ab6e7c16af" +source = "git+https://github.com/XDeme1/xim-rs?rev=d50d461764c2213655cd9cf65a0ea94c70d3c4fd#d50d461764c2213655cd9cf65a0ea94c70d3c4fd" dependencies = [ "ahash 0.8.11", "hashbrown 0.14.5", @@ -13689,7 +14239,7 @@ dependencies = [ [[package]] name = "xim-ctext" version = "0.3.0" -source = "git+https://github.com/npmania/xim-rs?rev=27132caffc5b9bc9c432ca4afad184ab6e7c16af#27132caffc5b9bc9c432ca4afad184ab6e7c16af" +source = "git+https://github.com/XDeme1/xim-rs?rev=d50d461764c2213655cd9cf65a0ea94c70d3c4fd#d50d461764c2213655cd9cf65a0ea94c70d3c4fd" dependencies = [ "encoding_rs", ] @@ -13697,7 +14247,7 @@ dependencies = [ [[package]] name = "xim-parser" version = "0.2.1" -source = "git+https://github.com/npmania/xim-rs?rev=27132caffc5b9bc9c432ca4afad184ab6e7c16af#27132caffc5b9bc9c432ca4afad184ab6e7c16af" +source = "git+https://github.com/XDeme1/xim-rs?rev=d50d461764c2213655cd9cf65a0ea94c70d3c4fd#d50d461764c2213655cd9cf65a0ea94c70d3c4fd" dependencies = [ "bitflags 2.6.0", ] @@ -13784,9 +14334,9 @@ dependencies = [ "async-broadcast", "async-executor", "async-fs 2.1.2", - "async-io 2.3.3", + "async-io 2.3.4", "async-lock 3.4.0", - "async-process 2.2.3", + "async-process 2.2.4", "async-recursion 1.1.1", "async-task", "async-trait", @@ -13797,7 +14347,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.29.0", + "nix", "ordered-stream", "rand 0.8.5", "serde", @@ -13822,7 +14372,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "zvariant_utils", ] @@ -13839,13 +14389,14 @@ dependencies = [ [[package]] name = "zed" -version = "0.150.4" +version = "0.155.2" dependencies = [ "activity_indicator", "anyhow", "ashpd", "assets", "assistant", + "async-watch", "audio", "auto_update", "backtrace", @@ -13859,6 +14410,7 @@ dependencies = [ "collab_ui", "collections", "command_palette", + "command_palette_hooks", "copilot", "db", "dev_server_projects", @@ -13867,6 +14419,7 @@ dependencies = [ "env_logger", "extension", "extensions_ui", + "feature_flags", "feedback", "file_finder", "file_icons", @@ -13882,6 +14435,7 @@ dependencies = [ "inline_completion_button", "install_cli", "isahc", + "isahc_http_client", "journal", "language", "language_model", @@ -13893,14 +14447,13 @@ dependencies = [ "markdown_preview", "menu", "mimalloc", - "nix 0.28.0", + "nix", "node_runtime", "notifications", "outline", "outline_panel", "parking_lot", "paths", - "performance", "profiling", "project", "project_panel", @@ -13917,10 +14470,12 @@ dependencies = [ "session", "settings", "settings_ui", + "shellexpand 2.1.2", "simplelog", "smol", "snippet_provider", "supermaven", + "sysinfo", "tab_switcher", "task", "tasks_ui", @@ -13928,6 +14483,7 @@ dependencies = [ "terminal_view", "theme", "theme_selector", + "time", "tree-sitter-md", "tree-sitter-rust", "ui", @@ -13937,6 +14493,7 @@ dependencies = [ "uuid", "vim", "welcome", + "windows 0.58.0", "winresource", "workspace", "zed_actions", @@ -13955,79 +14512,70 @@ name = "zed_astro" version = "0.1.0" dependencies = [ "serde", - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_clojure" version = "0.0.3" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_csharp" version = "0.0.2" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_dart" -version = "0.0.3" +version = "0.1.0" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_deno" version = "0.0.2" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_elixir" -version = "0.0.7" +version = "0.0.9" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_elm" version = "0.0.1" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_emmet" version = "0.0.3" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_erlang" -version = "0.0.1" -dependencies = [ - "zed_extension_api 0.0.6", -] - -[[package]] -name = "zed_extension_api" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca8bcaea3feb2d2ce9dbeb061ee48365312a351faa7014c417b0365fe9e459" +version = "0.1.0" dependencies = [ - "serde", - "serde_json", - "wit-bindgen", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_extension_api" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "594fd10dd0f2f853eb243e2425e7c95938cef49adb81d9602921d002c5e6d9d9" dependencies = [ "serde", "serde_json", @@ -14036,9 +14584,7 @@ dependencies = [ [[package]] name = "zed_extension_api" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "594fd10dd0f2f853eb243e2425e7c95938cef49adb81d9602921d002c5e6d9d9" +version = "0.2.0" dependencies = [ "serde", "serde_json", @@ -14050,77 +14596,77 @@ name = "zed_gleam" version = "0.2.0" dependencies = [ "html_to_markdown 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_glsl" version = "0.1.0" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_haskell" version = "0.1.1" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_html" version = "0.1.2" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_lua" -version = "0.0.3" +version = "0.1.0" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_ocaml" -version = "0.0.2" +version = "0.1.0" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_php" -version = "0.1.3" +version = "0.2.0" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_prisma" version = "0.0.3" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_purescript" version = "0.0.1" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_ruby" -version = "0.1.0" +version = "0.2.0" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_ruff" -version = "0.0.2" +version = "0.1.0" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] @@ -14128,42 +14674,42 @@ name = "zed_snippets" version = "0.0.5" dependencies = [ "serde_json", - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_svelte" -version = "0.0.3" +version = "0.2.0" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_terraform" -version = "0.0.4" +version = "0.1.0" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_test_extension" version = "0.1.0" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.2.0", ] [[package]] name = "zed_toml" version = "0.1.1" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_uiua" version = "0.0.1" dependencies = [ - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] @@ -14171,14 +14717,14 @@ name = "zed_vue" version = "0.1.0" dependencies = [ "serde", - "zed_extension_api 0.0.6", + "zed_extension_api 0.1.0", ] [[package]] name = "zed_zig" -version = "0.2.0" +version = "0.3.0" dependencies = [ - "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.1.0", ] [[package]] @@ -14205,7 +14751,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -14225,7 +14771,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -14331,7 +14877,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "zvariant_utils", ] @@ -14343,5 +14889,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 004074cb7ef23..7df7e9f55e83a 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, clang, + cmake, copyDesktopItems, curl, perl, @@ -26,54 +27,115 @@ makeFontsConf, vulkan-loader, envsubst, - nix-update-script, + gitUpdater, + cargo-about, + testers, + zed-editor, + buildFHSEnv, withGLES ? false, }: -assert withGLES -> stdenv.isLinux; +assert withGLES -> stdenv.hostPlatform.isLinux; +let + executableName = "zeditor"; + # Based on vscode.fhs + # Zed allows for users to download and use extensions + # which often include the usage of pre-built binaries. + # See #309662 + # + # buildFHSEnv allows for users to use the existing Zed + # extension tooling without significant pain. + fhs = + { + additionalPkgs ? pkgs: [ ], + }: + buildFHSEnv { + # also determines the name of the wrapped command + name = executableName; + + # additional libraries which are commonly needed for extensions + targetPkgs = + pkgs: + (with pkgs; [ + # ld-linux-x86-64-linux.so.2 and others + glibc + ]) + ++ additionalPkgs pkgs; + + # symlink shared assets, including icons and desktop entries + extraInstallCommands = '' + ln -s "${zed-editor}/share" "$out/" + ''; + + runScript = "${zed-editor}/bin/${executableName}"; + + passthru = { + inherit executableName; + inherit (zed-editor) pname version; + }; + + meta = zed-editor.meta // { + description = '' + Wrapped variant of ${zed-editor.pname} which launches in a FHS compatible environment. + Should allow for easy usage of extensions without nix-specific modifications. + ''; + }; + }; +in rustPlatform.buildRustPackage rec { - pname = "zed"; - version = "0.150.4"; + pname = "zed-editor"; + version = "0.155.2"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-dMhsKaqEWyjPjxaSYrz6zAvOzDbWrsPh6oKRu+D57cM="; + hash = "sha256-QiZZsy96WoWBFFKzVt6k4ZhxhvdBsy2iaF5TnYyb4v8="; fetchSubmodules = true; }; + patches = [ + # Zed uses cargo-install to install cargo-about during the script execution. + # We provide cargo-about ourselves and can skip this step. + ./0001-generate-licenses.patch + ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI="; + "alacritty_terminal-0.24.1-dev" = "sha256-b4oSDhsAAYjpYGfFgA1Q1642JoJQ9k5RTsPgFUpAFmc="; "async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE="; - "blade-graphics-0.4.0" = "sha256-sGXhXmgtd7Wx/Gf7HCWro4RsQOGS4pQt8+S3T+2wMfY="; + "blade-graphics-0.5.0" = "sha256-j/JI34ZPD7RAHNHu3krgDLnIq4QmmZaZaU1FwD7f2FM="; "cosmic-text-0.11.2" = "sha256-TLPDnqixuW+aPAhiBhSvuZIa69vgV3xLcw32OlkdCcM="; "font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo="; "lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js="; "nvim-rs-0.8.0-pre" = "sha256-VA8zIynflul1YKBlSxGCXCwa2Hz0pT3mH6OPsfS7Izo="; - "tree-sitter-0.22.6" = "sha256-P9pQcofDCIhOYWA1OC8TzB5UgWpD5GlDzX2DOS8SsH0="; - "tree-sitter-gomod-1.0.2" = "sha256-/sjC117YAFniFws4F/8+Q5Wrd4l4v4nBUaO9IdkixSE="; - "tree-sitter-gowork-0.0.1" = "sha256-803ujH5qwejQ2vQDDpma4JDC9a+vFX8ZQmr+77VyL2M="; - "tree-sitter-heex-0.0.1" = "sha256-VakMZtWQ/h7dNy5ehk2Bh14a5s878AUgwY3Ipq8tPec="; - "tree-sitter-md-0.2.3" = "sha256-Fa73P1h5GvKV3SxXr0KzHuNp4xa5wxUzI8ecXbGdrYE="; - "xim-0.4.0" = "sha256-vxu3tjkzGeoRUj7vyP0vDGI7fweX8Drgy9hwOUOEQIA="; + "protols-tree-sitter-proto-0.2.0" = "sha256-0pvHuwqtkHYLevQnaEFmfyDtILD7Wy0in2KSKFR2mKw="; + "tree-sitter-gomod-1.0.2" = "sha256-FCb8ndKSFiLY7/nTX7tWF8c4KcSvoBU1QB5R4rdOgT0="; + "tree-sitter-gowork-0.0.1" = "sha256-WRMgGjOlJ+bT/YnSBeSLRTLlltA5WwTvV0Ow/949+BE="; + "tree-sitter-heex-0.0.1" = "sha256-SnjhL0WVsHOKuUp3dkTETnCgC/Z7WN0XmpQdJPBeBhw="; + "tree-sitter-md-0.3.2" = "sha256-sFcQDabSay9qxzVNAQkHEZB1b9j171dDoYQqaL1iVhE="; + "tree-sitter-yaml-0.6.1" = "sha256-95u/bq74SiUHW8lVp3RpanmYS/lyVPW0Inn8gR7N3IQ="; + "xim-0.4.0" = "sha256-BXyaIBoqMNbzaSJqMadmofdjtlEVSoU6iogF66YP6a4="; "xkbcommon-0.7.0" = "sha256-2RjZWiAaz8apYTrZ82qqH4Gv20WyCtPT+ldOzm0GWMo="; }; }; nativeBuildInputs = [ clang + cmake copyDesktopItems curl perl pkg-config protobuf rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ]; + cargo-about + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ]; + + dontUseCmakeConfigure = true; buildInputs = [ @@ -86,13 +148,13 @@ rustPlatform.buildRustPackage rec { zlib zstd ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libxkbcommon wayland xorg.libxcb ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit @@ -121,19 +183,25 @@ rustPlatform.buildRustPackage rec { ZSTD_SYS_USE_PKG_CONFIG = true; FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ - "${src}/assets/fonts/zed-mono" - "${src}/assets/fonts/zed-sans" + "${src}/assets/fonts/plex-mono" + "${src}/assets/fonts/plex-sans" ]; }; # Setting this environment variable allows to disable auto-updates # https://zed.dev/docs/development/linux#notes-for-packaging-zed ZED_UPDATE_EXPLANATION = "zed has been installed using nix. Auto-updates have thus been disabled."; + # Used by `zed --version` + RELEASE_VERSION = version; }; RUSTFLAGS = if withGLES then "--cfg gles" else ""; gpu-lib = if withGLES then libglvnd else vulkan-loader; - postFixup = lib.optionalString stdenv.isLinux '' + preBuild = '' + bash script/generate-licenses + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --add-rpath ${gpu-lib}/lib $out/libexec/* patchelf --add-rpath ${wayland}/lib $out/libexec/* ''; @@ -155,7 +223,7 @@ rustPlatform.buildRustPackage rec { mkdir -p $out/bin $out/libexec cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/zed $out/libexec/zed-editor - cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zed + cp target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cli $out/bin/zeditor install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png @@ -164,7 +232,7 @@ rustPlatform.buildRustPackage rec { # and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name) ( export DO_STARTUP_NOTIFY="true" - export APP_CLI="zed" + export APP_CLI="zeditor" export APP_ICON="zed" export APP_NAME="Zed" export APP_ARGS="%U" @@ -175,11 +243,17 @@ rustPlatform.buildRustPackage rec { runHook postInstall ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "v(.*)" - ]; + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "pre"; + }; + tests.version = testers.testVersion { + inherit version; + package = zed-editor; + }; + fhs = fhs { }; + fhsWithPackages = f: fhs { additionalPkgs = f; }; }; meta = { @@ -191,9 +265,9 @@ rustPlatform.buildRustPackage rec { GaetanLepage niklaskorz ]; - mainProgram = "zed"; + mainProgram = "zeditor"; platforms = lib.platforms.all; # Currently broken on darwin: https://github.com/NixOS/nixpkgs/pull/303233#issuecomment-2048650618 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix index 4a6c1a59fed4a..aa23342eebc20 100644 --- a/pkgs/by-name/ze/zenity/package.nix +++ b/pkgs/by-name/ze/zenity/package.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "zenity"; description = "Tool to display dialogs from the commandline and shell scripts"; homepage = "https://gitlab.gnome.org/GNOME/zenity"; + changelog = "https://gitlab.gnome.org/GNOME/zenity/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix new file mode 100644 index 0000000000000..e6fbacccaf7be --- /dev/null +++ b/pkgs/by-name/ze/zenn-cli/package.nix @@ -0,0 +1,102 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + autoPatchelfHook, + makeWrapper, + nodejs, + pnpm_9, + testers, +}: +let + go-turbo-version = "1.7.4"; + go-turbo-srcs = { + x86_64-linux = fetchurl { + url = "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-${go-turbo-version}.tgz"; + hash = "sha256-bwi+jthoDe+SEvCPPNNNv9AR8n5IA1fc4I8cnfC095Y="; + }; + aarch64-linux = fetchurl { + url = "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-${go-turbo-version}.tgz"; + hash = "sha256-j3mUd3x16tYR3QQweIB07IbCKYuKPeEkKkUHhrpHzyc="; + }; + }; + go-turbo = stdenv.mkDerivation { + pname = "go-turbo"; + version = go-turbo-version; + src = go-turbo-srcs.${stdenv.hostPlatform.system}; + nativeBuildInputs = [ autoPatchelfHook ]; + dontBuild = true; + installPhase = '' + install -Dm755 bin/go-turbo -t $out/bin + ''; + }; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "zenn-cli"; + version = "0.1.157"; + + src = fetchFromGitHub { + owner = "zenn-dev"; + repo = "zenn-editor"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-1+5UaSYtY00F+1oJfovLIBPnmfRnKpIkQHpxb93rO2k="; + # turborepo requires .git directory + leaveDotGit = true; + }; + + nativeBuildInputs = [ + nodejs + pnpm_9.configHook + makeWrapper + ]; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-FfqBe1WQc6ditizjxYLmjb8mvCjQJMpvyUDdaW29sXY="; + }; + + preBuild = + '' + echo VITE_EMBED_SERVER_ORIGIN="https://embed.zenn.studio" > packages/zenn-cli/.env + '' + # replace go-turbo since the existing one can't be executed + + lib.optionalString stdenv.hostPlatform.isLinux '' + cp ${go-turbo}/bin/go-turbo node_modules/.pnpm/turbo-linux-*/node_modules/turbo-linux*/bin/go-turbo + ''; + + buildPhase = '' + runHook preBuild + + pnpm build --no-daemon + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib/node_modules/zenn-cli} + cp -r packages/zenn-cli/{dist,LICENSE,package.json,README.md} $out/lib/node_modules/zenn-cli + + makeWrapper "${lib.getExe nodejs}" "$out/bin/zenn" \ + --add-flags "$out/lib/node_modules/zenn-cli/dist/server/zenn.js" + + runHook postInstall + ''; + + passthru = { + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; + + meta = { + description = "Preview Zenn content locally"; + homepage = "https://github.com/zenn-dev/zenn-editor"; + changelog = "https://github.com/zenn-dev/zenn-editor/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "zenn"; + platforms = nodejs.meta.platforms; + }; +}) diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix index 8cadec450c941..728ec4ee3c376 100644 --- a/pkgs/by-name/ze/zerotierone/package.nix +++ b/pkgs/by-name/ze/zerotierone/package.nix @@ -23,7 +23,7 @@ let owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-YWcqALUB3ZEukL4er2FKcyNdEbuaf//QU5hRbKAfxDA="; + hash = "sha256-YWcqALUB3ZEukL4er2FKcyNdEbuaf//QU5hRbKAfxDA="; }; in stdenv.mkDerivation { @@ -77,7 +77,7 @@ in stdenv.mkDerivation { lzo openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.SystemConfiguration darwin.apple_sdk.frameworks.CoreServices @@ -88,7 +88,7 @@ in stdenv.mkDerivation { # Ensure Rust compiles for the right target env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTarget; - preBuild = if stdenv.isDarwin then '' + preBuild = if stdenv.hostPlatform.isDarwin then '' makeFlagsArray+=("ARCH_FLAGS=") # disable multi-arch build if ! grep -q MACOS_VERSION_MIN=10.13 make-mac.mk; then echo "You may need to update MACOSX_DEPLOYMENT_TARGET to match the value in make-mac.mk" diff --git a/pkgs/by-name/zi/zigpy-cli/package.nix b/pkgs/by-name/zi/zigpy-cli/package.nix index a1b86b3b88308..69b4eaed661a4 100644 --- a/pkgs/by-name/zi/zigpy-cli/package.nix +++ b/pkgs/by-name/zi/zigpy-cli/package.nix @@ -3,16 +3,16 @@ , python3 }: -python3.pkgs.buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "zigpy-cli"; - version = "1.0.4"; + version = "1.0.5"; pyproject = true; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-OxVSEBo+wFEBZnWpmQ4aUZWppCh0oavxlQvwDXiWiG8="; + hash = "sha256-69E6PkrCE5S498pO33uEz7g2dV41H0vNfFinUHDATTQ="; }; postPatch = '' @@ -21,11 +21,11 @@ python3.pkgs.buildPythonPackage rec { --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ bellows click coloredlogs @@ -33,7 +33,7 @@ python3.pkgs.buildPythonPackage rec { zigpy zigpy-deconz zigpy-xbee - # zigpy-zboss # not packaged + zigpy-zboss zigpy-zigate zigpy-znp ]; @@ -53,7 +53,7 @@ python3.pkgs.buildPythonPackage rec { description = "Command line interface for zigpy"; mainProgram = "zigpy"; homepage = "https://github.com/zigpy/zigpy-cli"; - changelog = "https://github.com/zigpy/zigpy/releases/tag/v${version}"; + changelog = "https://github.com/zigpy/zigpy-cli/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.linux; diff --git a/pkgs/by-name/zi/zile/package.nix b/pkgs/by-name/zi/zile/package.nix new file mode 100644 index 0000000000000..35714e8d3c0e0 --- /dev/null +++ b/pkgs/by-name/zi/zile/package.nix @@ -0,0 +1,84 @@ +{ lib +, stdenv +, fetchurl +, boehmgc +, glib +, help2man +, libgee +, ncurses +, perl +, pkg-config +, vala +}: + +stdenv.mkDerivation rec { + pname = "zile"; + version = "2.6.2"; + + src = fetchurl { + url = "mirror://gnu/zile/${pname}-${version}.tar.gz"; + hash = "sha256-d+t9r/PJi9yI2qGsBA3MynK4HcMvwxZuB53Xpj5Cx0E="; + }; + + buildInputs = [ + boehmgc + glib + libgee + ncurses + ]; + nativeBuildInputs = [ + perl + pkg-config + vala + ] + # `help2man' wants to run Zile, which won't work when the + # newly-produced binary can't be run at build-time. + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) help2man; + + # Tests can't be run because most of them rely on the ability to + # fiddle with the terminal. + doCheck = false; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + + # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro. + gl_cv_func_fstatat_zero_flag="yes"; + + meta = with lib; { + homepage = "https://www.gnu.org/software/zile/"; + changelog = "https://git.savannah.gnu.org/cgit/zile.git/plain/NEWS?h=v${version}"; + description = "Zile Implements Lua Editors"; + longDescription = '' + GNU Zile is a text editor development kit, so that you can (relatively) + quickly develop your own ideal text editor without reinventing the wheel + for many of the common algorithms and data-structures needed to do so. + + It comes with an example implementation of a lightweight Emacs clone, + called Zemacs. Every Emacs user should feel at home with Zemacs. Zemacs is + aimed at small footprint systems and quick editing sessions (it starts up + and shuts down instantly). + + More editors implemented over the Zile frameworks are forthcoming as the + data-structures and interfaces improve: Zz an emacs inspired editor using + Lua as an extension language; Zee a minimalist non-modal editor; Zi a + lightweight vi clone; and more... + + Zile is a collection of algorithms and data-structures that currently + support all basic Emacs-like editing features: it is 8-bit clean (though + Unicode support is not ready yet), and the number of editing buffers and + windows is only limited by available memoryand screen space + respectively. Registers, minibuffer completion and auto fill are + available. + + Zemacs implements a subset of Emacs with identical function and variable + names, continuing the spirit of the earlier Zile editor implemented in C. + GNU Zile, which is a lightweight Emacs clone. Zile is short for Zile Is + Lossy Emacs. Zile has been written to be as similar as possible to Emacs; + every Emacs user should feel at home. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pSub AndersonTorres ]; + platforms = platforms.unix; + mainProgram = "zile"; + }; +} diff --git a/pkgs/by-name/zi/zitadel/console.nix b/pkgs/by-name/zi/zitadel/console.nix index 5ffd0a2223eca..d73d34b8d7174 100644 --- a/pkgs/by-name/zi/zitadel/console.nix +++ b/pkgs/by-name/zi/zitadel/console.nix @@ -5,8 +5,6 @@ { mkYarnPackage , fetchYarnDeps -, lib - , grpc-gateway , protoc-gen-grpc-web , protoc-gen-js diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix new file mode 100644 index 0000000000000..4af89fc2f4682 --- /dev/null +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -0,0 +1,41 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +, nix-update-script +}: + +buildGoModule { + pname = "zoekt"; + version = "3.7.2-2-unstable-2024-10-01"; + + src = fetchFromGitHub { + owner = "sourcegraph"; + repo = "zoekt"; + rev = "650136078a98ef99acf4159310a2c12fd25075d7"; + hash = "sha256-MtN/x5o0iHZeDqIQCuio8y5pmZXq5qFIE6FySgIY2CY="; + }; + + vendorHash = "sha256-+ayixWCD2e+7Nh9WJmDAloSzp63v9hQYQd8UMuo8qxQ="; + + nativeCheckInputs = [ + git + ]; + + preCheck = '' + export HOME=`mktemp -d` + git config --global --replace-all protocol.file.allow always + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version" "branch" ]; + }; + + meta = { + description = "Fast trigram based code search"; + homepage = "https://github.com/sourcegraph/zoekt"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ AndersonTorres ]; + mainProgram = "zoekt"; + }; +} diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix index e6fc773a21272..5f658eed39604 100644 --- a/pkgs/by-name/zo/zola/package.nix +++ b/pkgs/by-name/zo/zola/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices SystemConfiguration ]); diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix new file mode 100644 index 0000000000000..14d853e30b7ce --- /dev/null +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -0,0 +1,211 @@ +{ stdenv +, lib +, fetchurl +, pipewire +, makeWrapper +, xar +, cpio + # Dynamic libraries +, alsa-lib +, atk +, at-spi2-atk +, at-spi2-core +, cairo +, cups +, dbus +, expat +, libdrm +, libGL +, fontconfig +, freetype +, gtk3 +, gdk-pixbuf +, glib +, mesa +, nspr +, nss +, pango +, wayland +, xorg +, libxkbcommon +, udev +, zlib +, libkrb5 + # Runtime +, coreutils +, pciutils +, procps +, util-linux +, pulseaudioSupport ? true +, libpulseaudio +, pulseaudio +}: + +let + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + # Zoom versions are released at different times for each platform + # and often with different versions. We write them on three lines + # like this (rather than using {}) so that the updater script can + # find where to edit them. + versions.aarch64-darwin = "6.2.3.40682"; + versions.x86_64-darwin = "6.2.3.40682"; + versions.x86_64-linux = "6.2.3.2056"; + + srcs = { + aarch64-darwin = fetchurl { + url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; + name = "zoomusInstallerFull.pkg"; + hash = "sha256-kpncl6ZVs/O2TXtBhZ/2049jJuUdYlIaxtLX3wIfpVE="; + }; + x86_64-darwin = fetchurl { + url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; + hash = "sha256-gB8pM3EYmA5jF2s/XobV5hk71q16x76nG6M20rWatzE="; + }; + x86_64-linux = fetchurl { + url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; + hash = "sha256-dEQdyYEGXMwABulPHK3fLgHo0ZMF5BT6RnqzD23Al38="; + }; + }; + + libs = lib.makeLibraryPath ([ + # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' + alsa-lib + atk + at-spi2-atk + at-spi2-core + cairo + cups + dbus + expat + libdrm + libGL + pipewire + fontconfig + freetype + gtk3 + gdk-pixbuf + glib + mesa + nspr + nss + pango + stdenv.cc.cc + wayland + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + libxkbcommon + xorg.libXrandr + xorg.libXrender + xorg.libxshmfence + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm + xorg.libXfixes + xorg.libXtst + udev + zlib + libkrb5 + ] ++ lib.optional (pulseaudioSupport) libpulseaudio); + + binPath = lib.makeBinPath ([ coreutils glib.dev pciutils procps util-linux ] ++ lib.optional pulseaudioSupport pulseaudio); +in +stdenv.mkDerivation rec { + pname = "zoom"; + version = versions.${system} or throwSystem; + + src = srcs.${system} or throwSystem; + + dontUnpack = stdenv.hostPlatform.isLinux; + unpackPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' + xar -xf $src + zcat < zoomus.pkg/Payload | cpio -i + ''; + + nativeBuildInputs = [ + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + xar + cpio + ]; + + installPhase = '' + runHook preInstall + ${rec { + aarch64-darwin = '' + mkdir -p $out/Applications + cp -R zoom.us.app $out/Applications/ + ''; + # darwin steps same on both architectures + x86_64-darwin = aarch64-darwin; + x86_64-linux = '' + mkdir $out + tar -C $out -xf $src + mv $out/usr/* $out/ + ''; + }.${system} or throwSystem} + runHook postInstall + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + makeWrapper $out/Applications/zoom.us.app/Contents/MacOS/zoom.us $out/bin/zoom + '' + lib.optionalString stdenv.hostPlatform.isLinux '' + # Desktop File + substituteInPlace $out/share/applications/Zoom.desktop \ + --replace-fail "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" + + for i in aomhost zopen zoom ZoomLauncher ZoomWebviewHost; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i + done + + # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom + # IPC breaks if the executable name does not end in 'zoom' + mv $out/opt/zoom/zoom $out/opt/zoom/.zoom + makeWrapper $out/opt/zoom/.zoom $out/opt/zoom/zoom \ + --prefix LD_LIBRARY_PATH ":" ${libs} + + rm $out/bin/zoom + # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect + # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm: + # Clear Qt paths to prevent tripping over "foreign" Qt resources. + # Clear Qt screen scaling settings to prevent over-scaling. + makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \ + --chdir "$out/opt/zoom" \ + --unset QML2_IMPORT_PATH \ + --unset QT_PLUGIN_PATH \ + --unset QT_SCREEN_SCALE_FACTORS \ + --prefix PATH : ${binPath} \ + --prefix LD_LIBRARY_PATH ":" ${libs} + + wrapProgram $out/opt/zoom/ZoomWebviewHost \ + --unset QML2_IMPORT_PATH \ + --unset QT_PLUGIN_PATH \ + --unset QT_SCREEN_SCALE_FACTORS \ + --prefix LD_LIBRARY_PATH ":" ${libs} + + # Backwards compatibility: we used to call it zoom-us + ln -s $out/bin/{zoom,zoom-us} + ''; + + # already done + dontPatchELF = true; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + homepage = "https://zoom.us/"; + changelog = "https://support.zoom.com/hc/en/article?id=zm_kb&sysparm_article=KB0061222"; + description = "zoom.us video conferencing application"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = builtins.attrNames srcs; + maintainers = with maintainers; [ danbst tadfisher ]; + mainProgram = "zoom"; + }; +} diff --git a/pkgs/by-name/zo/zoom-us/update.sh b/pkgs/by-name/zo/zoom-us/update.sh new file mode 100755 index 0000000000000..df27da6f3ba43 --- /dev/null +++ b/pkgs/by-name/zo/zoom-us/update.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl jq + +set -eu -o pipefail + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) +nixpkgs=$(realpath "$scriptDir"/../../../..) + +echo >&2 "=== Obtaining version data from https://zoom.us/rest/download ..." +linux_data=$(curl -Ls 'https://zoom.us/rest/download?os=linux' | jq .result.downloadVO) +mac_data=$(curl -Ls 'https://zoom.us/rest/download?os=mac' | jq .result.downloadVO) + +version_aarch64_darwin=$(jq -r .zoomArm64.version <<<"$mac_data") +version_x86_64_darwin=$(jq -r .zoom.version <<<"$mac_data") +version_x86_64_linux=$(jq -r .zoom.version <<<"$linux_data") + +echo >&2 "=== Downloading packages and computing hashes..." +# We precalculate the hashes before calling update-source-version +# because it attempts to calculate each architecture's package's hash +# by running `nix-build --system <architecture> -A zoom-us.src` which +# causes cross compiling headaches; using nix-prefetch-url with +# hard-coded URLs is simpler. Keep these URLs in sync with the ones +# in package.nix where `srcs` is defined. +hash_aarch64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_aarch64_darwin}/zoomusInstallerFull.pkg?archType=arm64")) +hash_x86_64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_darwin}/zoomusInstallerFull.pkg")) +hash_x86_64_linux=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_linux}/zoom_x86_64.pkg.tar.xz")) + +echo >&2 "=== Updating package.nix ..." +# update-source-version expects to be at the root of nixpkgs +(cd "$nixpkgs" && update-source-version zoom-us "$version_aarch64_darwin" $hash_aarch64_darwin --system=aarch64-darwin --version-key=versions.aarch64-darwin) +(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_darwin" $hash_x86_64_darwin --system=x86_64-darwin --version-key=versions.x86_64-darwin) +(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_linux" $hash_x86_64_linux --system=x86_64-linux --version-key=versions.x86_64-linux) + +echo >&2 "=== Done!" diff --git a/pkgs/by-name/zo/zoraxy/package.nix b/pkgs/by-name/zo/zoraxy/package.nix index 24a001aed60aa..46afd4e170b12 100644 --- a/pkgs/by-name/zo/zoraxy/package.nix +++ b/pkgs/by-name/zo/zoraxy/package.nix @@ -6,12 +6,12 @@ buildGoModule rec { pname = "zoraxy"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "tobychui"; repo = "zoraxy"; rev = "refs/tags/${version}"; - sha256 = "sha256-96puPBMrJ2o6jO41KOr2+NnCgq0TEejLoAKRiXsPbEE="; + hash = "sha256-ZjsBGtY6M5jIXylzg4k8U4krwqx5d5VuMiVHAeUIbXY="; }; sourceRoot = "${src.name}/src"; @@ -38,5 +38,6 @@ buildGoModule rec { license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.luftmensch-luftmensch ]; mainProgram = "zoraxy"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/zo/zotify/package.nix b/pkgs/by-name/zo/zotify/package.nix index d5250b780a42e..5e82bff796952 100644 --- a/pkgs/by-name/zo/zotify/package.nix +++ b/pkgs/by-name/zo/zotify/package.nix @@ -20,8 +20,6 @@ python3Packages.buildPythonApplication rec { build-system = [ python3Packages.setuptools ]; - nativeBuildInputs = [ python3Packages.pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "protobuf" ]; dependencies = with python3Packages; [ @@ -40,6 +38,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Fast and customizable music and podcast downloader"; homepage = "https://github.com/zotify-dev/zotify"; + changelog = "https://github.com/zotify-dev/zotify/blob/main/CHANGELOG.md"; license = lib.licenses.zlib; mainProgram = "zotify"; maintainers = with lib.maintainers; [ bwkam ]; diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index 83908cd7a01a7..1ade403a11870 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/fcorbelli/zpaqfranz"; + changelog = "https://github.com/fcorbelli/zpaqfranz/releases/tag/${finalAttrs.version}"; description = "Advanced multiversioned deduplicating archiver, with HW acceleration, encryption and paranoid-level tests"; mainProgram = "zpaqfranz"; license = with lib.licenses; [ mit ]; diff --git a/pkgs/by-name/zp/zpp/package.nix b/pkgs/by-name/zp/zpp/package.nix new file mode 100644 index 0000000000000..abf58bc12fca6 --- /dev/null +++ b/pkgs/by-name/zp/zpp/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.zpp diff --git a/pkgs/by-name/zs/zsh-wd/package.nix b/pkgs/by-name/zs/zsh-wd/package.nix index dec73b7227656..4a80ec499e89b 100644 --- a/pkgs/by-name/zs/zsh-wd/package.nix +++ b/pkgs/by-name/zs/zsh-wd/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "wd"; - version = "0.7.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "mfaerevaag"; repo = "wd"; rev = "v${version}"; - sha256 = "sha256-Zc49X/8T66xnDkfotf0p6AVyHHd4P3eNDMOsO1sUryY="; + hash = "sha256-8gL0+SZwVCQRokcYwSljDHtSusYY79/T9hqJGgAK1EU="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/zs/zsh-zhooks/package.nix b/pkgs/by-name/zs/zsh-zhooks/package.nix index f787f4eb43093..047cd75ef61e3 100644 --- a/pkgs/by-name/zs/zsh-zhooks/package.nix +++ b/pkgs/by-name/zs/zsh-zhooks/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation { owner = "agkozak"; repo = "zhooks"; rev = "e6616b4a2786b45a56a2f591b79439836e678d22"; - sha256 = "sha256-zahXMPeJ8kb/UZd85RBcMbomB7HjfEKzQKjF2NnumhQ="; + hash = "sha256-zahXMPeJ8kb/UZd85RBcMbomB7HjfEKzQKjF2NnumhQ="; }; dontBuild = true; diff --git a/pkgs/by-name/zs/zsync/package.nix b/pkgs/by-name/zs/zsync/package.nix index f0950cdc33c48..e925d1c8419b4 100644 --- a/pkgs/by-name/zs/zsync/package.nix +++ b/pkgs/by-name/zs/zsync/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://zsync.moria.org.uk/download/zsync-${version}.tar.bz2"; - sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; + hash = "sha256-C51TQzOHqk8EY0psY6XvqCAwcPIpivcqcF+b492mWvI="; }; env = lib.optionalAttrs stdenv.cc.isClang { diff --git a/pkgs/by-name/zu/zunit/package.nix b/pkgs/by-name/zu/zunit/package.nix index 72e117a71ac0a..501aad737c02f 100644 --- a/pkgs/by-name/zu/zunit/package.nix +++ b/pkgs/by-name/zu/zunit/package.nix @@ -87,6 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Powerful testing framework for ZSH projects"; homepage = "https://zunit.xyz/"; downloadPage = "https://github.com/zunit-zsh/zunit/releases"; + changelog = "https://github.com/zunit-zsh/zunit/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; mainProgram = "zunit"; inherit (zsh.meta) platforms; diff --git a/pkgs/by-name/zu/zutty/package.nix b/pkgs/by-name/zu/zutty/package.nix new file mode 100644 index 0000000000000..4c493483df577 --- /dev/null +++ b/pkgs/by-name/zu/zutty/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchgit, + pkg-config, + freetype, + wafHook, + python3, + libXmu, + glew, + ucs-fonts, + nixosTests, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "zutty"; + version = "0.16-unstable-2024-08-18"; + + src = fetchgit { + url = "https://git.hq.sig7.se/zutty.git"; + rev = "04b2ca3b3aaa070c41583247f8112c31b6003886"; # 20240818 + hash = "sha256-izUbn2B3RqIIOW9tuL7DFLqJdektCftxnpQssJMYxC8="; + }; + + postPatch = + let + fontpaths = [ + "/run/current-system/sw/share/X11/fonts" # available if fonts.fontDir.enable = true + "${ucs-fonts}/share/fonts" + ]; + in + '' + substituteInPlace src/options.h \ + --replace-fail /usr/share/fonts ${builtins.concatStringsSep ":" fontpaths} + ''; + + nativeBuildInputs = [ + pkg-config + wafHook + python3 + ]; + + buildInputs = [ + freetype + libXmu + glew + ]; + + passthru = { + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { + default = nixosTests.terminal-emulators.zutty; + }; + }; + + meta = { + homepage = "https://tomscii.sig7.se/zutty/"; + description = "X terminal emulator rendering through OpenGL ES Compute Shaders"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.rolfschr ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/zw/zwave-js-server/package.nix b/pkgs/by-name/zw/zwave-js-server/package.nix index 4a51af0abefbd..711ce58bb3eac 100644 --- a/pkgs/by-name/zw/zwave-js-server/package.nix +++ b/pkgs/by-name/zw/zwave-js-server/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "zwave-js-server"; - version = "1.36.0"; + version = "1.38.0"; src = fetchFromGitHub { owner = "zwave-js"; repo = pname; rev = version; - hash = "sha256-+GyQy7CVd3t98kUDTpPzmPs5WNU8Ct/e+kHPh08gb0Q="; + hash = "sha256-rAm/IPTnMUkwU/7Jzr0OEUDoKiUWxxEKZ21FxQW8sY8="; }; - npmDepsHash = "sha256-u9Y9yOLZZ+DnFYAAhF0SUa+qW+Mj+3duzAKKS6xCkp0="; + npmDepsHash = "sha256-7dlXppXCmryxq90QI0Lq3CE6BUHSogTHmHBMCbkZWT0="; # For some reason the zwave-js dependency is in devDependencies npmFlags = [ "--include=dev" ]; diff --git a/pkgs/by-name/zx/zxing-cpp/package.nix b/pkgs/by-name/zx/zxing-cpp/package.nix new file mode 100644 index 0000000000000..affac873f2cd3 --- /dev/null +++ b/pkgs/by-name/zx/zxing-cpp/package.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, python3 +, gitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zxing-cpp"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "zxing-cpp"; + repo = "zxing-cpp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-teFspdATn9M7Z1vSr/7PdJx/xAv+TVai8rIekxqpBZk="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + cmakeFlags = [ + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_BLACKBOX_TESTS=OFF" + ]; + + passthru = { + tests = { + inherit (python3.pkgs) zxing-cpp; + }; + updateScript = gitUpdater { + rev-prefix = "v"; + }; + }; + + meta = { + homepage = "https://github.com/zxing-cpp/zxing-cpp"; + changelog = "https://github.com/zxing-cpp/zxing-cpp/releases/tag/${finalAttrs.src.rev}"; + description = "C++ port of zxing (a Java barcode image processing library)"; + longDescription = '' + ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D barcode + image processing library implemented in C++. + + It was originally ported from the Java ZXing Library but has been + developed further and now includes many improvements in terms of quality + and performance. It can both read and write barcodes in a number of + formats. + ''; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ AndersonTorres lukegb ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/zx/zxpy/package.nix b/pkgs/by-name/zx/zxpy/package.nix index 1735a6523b0b0..650a220250cb7 100644 --- a/pkgs/by-name/zx/zxpy/package.nix +++ b/pkgs/by-name/zx/zxpy/package.nix @@ -46,6 +46,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Shell scripts made simple"; homepage = "https://github.com/tusharsadhwani/zxpy"; + changelog = "https://github.com/tusharsadhwani/zxpy/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; mainProgram = "zxpy"; diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix index dfa2fd658abdd..2b6675459d971 100644 --- a/pkgs/by-name/zx/zxtune/package.nix +++ b/pkgs/by-name/zx/zxtune/package.nix @@ -43,7 +43,7 @@ let ++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase); in stdenv.mkDerivation rec { pname = "zxtune"; - version = "5071"; + version = "5072"; outputs = [ "out" ]; @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { owner = "zxtune"; repo = "zxtune"; rev = "r${version}"; - hash = "sha256-qb06c0/Td6/6U033uYUkFq5JhCqlWCx6IhQ//PMeGUY="; + hash = "sha256-cbSz5fi2HYE7ScYFhopXcp9Ct4dMFughF2TKkY1K4uQ="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/zy/zydis/package.nix b/pkgs/by-name/zy/zydis/package.nix new file mode 100644 index 0000000000000..610989ce9f2e8 --- /dev/null +++ b/pkgs/by-name/zy/zydis/package.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, callPackage +, cmake +, python3 +}: + +let + zycore = callPackage ./zycore.nix { + inherit stdenv fetchFromGitHub cmake; + }; +in +stdenv.mkDerivation rec { + pname = "zydis"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "zyantific"; + repo = "zydis"; + rev = "v${version}"; + hash = "sha256-akusu0T7q5RX4KGtjRqqOFpW5i9Bd1L4RVZt8Rg3PJY="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ zycore ]; + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + doCheck = true; + nativeCheckInputs = [ python3 ]; + passthru = { inherit zycore; }; + + meta = with lib; { + homepage = "https://zydis.re/"; + changelog = "https://github.com/zyantific/zydis/releases/tag/v${version}"; + description = "Fast and lightweight x86/x86-64 disassembler library"; + license = licenses.mit; + maintainers = with maintainers; [ jbcrail AndersonTorres athre0z ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/zydis/zycore.nix b/pkgs/by-name/zy/zydis/zycore.nix similarity index 100% rename from pkgs/development/libraries/zydis/zycore.nix rename to pkgs/by-name/zy/zydis/zycore.nix diff --git a/pkgs/by-name/zz/zziplib/package.nix b/pkgs/by-name/zz/zziplib/package.nix new file mode 100644 index 0000000000000..154a8f2a9e37d --- /dev/null +++ b/pkgs/by-name/zz/zziplib/package.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, perl +, pkg-config +, python3 +, xmlto +, zip +, zlib +}: + +stdenv.mkDerivation rec { + pname = "zziplib"; + version = "0.13.74"; + + src = fetchFromGitHub { + owner = "gdraheim"; + repo = pname; + rev = "v${version}"; + hash = "sha256-MjqGHzb+dsAq2PrcBhU3sv4eMX3afkgFWUbhDp+5o/s="; + }; + + nativeBuildInputs = [ + cmake + perl + pkg-config + python3 + xmlto + zip + ]; + buildInputs = [ + zlib + ]; + + # test/zziptests.py requires network access + # (https://github.com/gdraheim/zziplib/issues/24) + cmakeFlags = [ + "-DZZIP_TESTCVE=OFF" + "-DBUILD_SHARED_LIBS=True" + "-DBUILD_STATIC_LIBS=False" + "-DBUILD_TESTS=OFF" + "-DMSVC_STATIC_RUNTIME=OFF" + "-DZZIPSDL=OFF" + "-DZZIPTEST=OFF" + "-DZZIPWRAP=OFF" + "-DBUILDTESTS=OFF" + ]; + + meta = with lib; { + homepage = "https://github.com/gdraheim/zziplib"; + changelog = "https://github.com/gdraheim/zziplib/blob/${version}/ChangeLog"; + description = "Library to extract data from files archived in a zip file"; + longDescription = '' + The zziplib library is intentionally lightweight, it offers the ability to + easily extract data from files archived in a single zip file. + Applications can bundle files into a single zip archive and access them. + The implementation is based only on the (free) subset of compression with + the zlib algorithm which is actually used by the zip/unzip tools. + ''; + license = with licenses; [ lgpl2Plus mpl11 ]; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/common-updater/nix-update.nix b/pkgs/common-updater/nix-update.nix deleted file mode 100644 index 342b1677c6de8..0000000000000 --- a/pkgs/common-updater/nix-update.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ lib, nix-update }: - -{ attrPath ? null -, extraArgs ? [ ] -}: - -[ "${lib.getExe nix-update}" ] ++ extraArgs ++ lib.optional (attrPath != null) attrPath diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 856f9ad58ca4b..bb65f91ee1c31 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -3,8 +3,8 @@ , fetchFromGitHub , cmake , extra-cmake-modules -, fetchpatch2 , pkg-config +, httplib , qtbase , qtimageformats , qtwebengine @@ -22,24 +22,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zeal"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; rev = "v${finalAttrs.version}"; - hash = "sha256-918hWy5be5mHINLbFJPiE29wlL1kRUD4MS3AjML/6fs="; + hash = "sha256-9tlo7+namWNWrWVQNqaOvtK4NQIdb0p8qvFrrbUamOo="; }; - patches = [ - # https://github.com/zealdocs/zeal/pull/1644 - (fetchpatch2 { - name = "fix-qtconcurrent-component.patch"; - url = "https://github.com/zealdocs/zeal/commit/c432a0ac22b59ed44bdcec8819c030d993177883.patch"; - hash = "sha256-DW7rBRMnXm7r+jps1/3RTXA1PpwEUCprW9qrHMRii84="; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules @@ -48,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + httplib libXdmcp libarchive libpthreadstubs diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix index c12e3f8e9fd37..e407d5de6d85f 100644 --- a/pkgs/data/fonts/gdouros/default.nix +++ b/pkgs/data/fonts/gdouros/default.nix @@ -17,7 +17,7 @@ let inherit pname version; src = fetchzip { - url = "https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}"; + url = "https://web.archive.org/web/20240212172059/https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}"; stripRoot = false; inherit hash; }; @@ -34,12 +34,12 @@ let meta = { inherit description; - # see https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf + # see https://web.archive.org/web/20240212172059/https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf # quite draconian: non-commercial, no modifications, # no redistribution, "a single instantiation and no # network installation" license = lib.licenses.unfree; - homepage = "https://dn-works.com/ufas/"; + homepage = "https://web.archive.org/web/20240212172059/https://dn-works.com/ufas/"; }; }; in diff --git a/pkgs/data/fonts/i-dot-ming/default.nix b/pkgs/data/fonts/i-dot-ming/default.nix index bd09d6efaeb7a..2941a0030c533 100644 --- a/pkgs/data/fonts/i-dot-ming/default.nix +++ b/pkgs/data/fonts/i-dot-ming/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "i.ming"; - version = "8.00"; + version = "8.10"; src = fetchurl { url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf"; - hash = "sha256-6345629OdKz6lTnD3Vjtp6DzsYy0ojaL0naXGrtdZvw="; + hash = "sha256-y6E7dbBQ1nG2EdAGMUcmLkIeFDWa1FMJSLBw9WER8PM="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 944c92c0506c2..b4b0eb5f17efc 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "30.3.3"; + version = "31.7.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index f7547715abc98..d0ccf32ce32c4 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,21 +55,21 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "31.4.0"; + version = "31.7.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-qcxsuDk7hcVFsHB/Uj013gTOp9IGfp5cF1BLVbmH9AA="; + hash = "sha256-yio+ZJ+hgybgEUfxXt/xk3ahM5lollKGJC0821vi9e0="; }; - npmDepsHash = "sha256-bhj5q3HEtSdB5LA6IhBCo4XJwc6a3CUrHaV+d1vcj+I="; + npmDepsHash = "sha256-gtBQdeX7hkactPSq609DMoc8rY2AHfg2nkpj26ZV88A="; nativeBuildInputs = [ remarshal ttfautohint-nox - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # libtool cctools ]; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 40487bceb6b9d..ad740d88b3f9e 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "0mma97rhjpfq20mq6dji50mxbdgaz72ccfqhrqim6hj5x5pkc2w2"; - IosevkaAile = "1frmm1q57xqsxqvz1vmz5fzammpgkgk2lspnkilb1adavla5a5j6"; - IosevkaCurly = "0zq07z1nx6b52mxh9kqr880p9aw10whjs0qgwzlyyij7jnk4mx2l"; - IosevkaCurlySlab = "0g6p9gpjqmdan81cv9rg2bppcdg7s8iiyn8whxqmxf0prbsyxcw6"; - IosevkaEtoile = "1sh3d69m0p8glr8szjd1cyxzsi66qsbmasjlmkwc1fhbw9w5kb5c"; - IosevkaSlab = "0sk90cq1zl4d0yjh0p78idjpi2hmr0hy4c4650xls9js0nzszjyj"; - IosevkaSS01 = "10f63fkyfcr0mngjql69zsfmy2wffbdzxkacw5jwlcnnpw6lwrz2"; - IosevkaSS02 = "0ydmp0mp5n6rh9s48pixrk41vdai3ys4q2wz60rpp8pl2sl7l58f"; - IosevkaSS03 = "0k2k54jh2w1pf2hhdx5m1bkk4pj9p541ddnvkw8jxdc30ab9pg0x"; - IosevkaSS04 = "12j2d7h1hp1m16m893rn79v56a13kvsz2vabp395fdhjswffpjly"; - IosevkaSS05 = "1cvl4hg058675h9amvvjw2qkjk7fs9zs3prdqvllpch77fkznbv3"; - IosevkaSS06 = "19cvfxrgqwyaan8xdyfrz1wsnr7cd43szcq0ijwsjxv0afvadp03"; - IosevkaSS07 = "1kd3s41nqiihl2wf0944mw7x1gq7xa5jfgis0z23snb9p25gyzli"; - IosevkaSS08 = "02yd5s4gvvl2xg68cznj00giqzngmdhmjz290q5d7kkzgzf8v6d4"; - IosevkaSS09 = "13hd8f38b0882paqr4pw2wx6raqr9m5d9ndphs8fvyadhsh70xaf"; - IosevkaSS10 = "1j0lbwvzqx0lmj3irf01aywqny94sidz8m06xl8vrljczhhz619w"; - IosevkaSS11 = "19kndxn9lynx3ambah3gn63d8fdqq5p7i5yxjlsn7g0d5vgvaa9h"; - IosevkaSS12 = "0jbsmsh6c2kzrn4kbkj4klc2pk1z54c1pf3c7y1vr8xyqkg43bjs"; - IosevkaSS13 = "0jgf400xl1hnd78vi3vdvxmax415rq475v1shfrf0ms3hm0kbrp0"; - IosevkaSS14 = "0acrv8frx88292iw55944mfp814iskafyknymiayxnpmmppn078g"; - IosevkaSS15 = "18jzzd5jsb9yvv5gcybnn8gcp03x7rhl2z40d16ln9cx150336sx"; - IosevkaSS16 = "0405qngdwkxxzyjxx9qy18p37jz1sc5f32ynaiiif0zg0c8bbsrb"; - IosevkaSS17 = "0f8is0b4rvy8n2fnydc9f2g958y9xnrww44fhb28vglgwil6pvya"; - IosevkaSS18 = "12hz34zfvdlw0dxni23j5knsxcrkvnpvankidkd0y500zisx4i46"; - SGr-Iosevka = "1izcklbrm8f993vhdqvyiy9c33d7aykvj4vv2sqwvwid2mv0rvdn"; - SGr-IosevkaCurly = "1r7cy3scf8gjp7hp3q80xf28d3px9vmsis8g0a8nr0vrg7wvc0p7"; - SGr-IosevkaCurlySlab = "0ja6i81fnz8kvzlfasvm5gx5c7l2hkvl1qfdan9knj6p5390rp25"; - SGr-IosevkaFixed = "1gcd6jms5z6pgclr8lgb0ip6z0y6vx9c79wvf0w7ixjcyafb1aq4"; - SGr-IosevkaFixedCurly = "1q415xikr2ihrxl3xvpfj7ix1kn1sva089abpjf0yp76rjfx5v9x"; - SGr-IosevkaFixedCurlySlab = "1cfii72ci508m7lrv701hsz5bzphjswdpcaccyhzkjqyjbajgvj4"; - SGr-IosevkaFixedSlab = "128rcxi2zjaxcbi7a6w739lvxcbaw6ph8q6a1gy20pgapna1l9xf"; - SGr-IosevkaFixedSS01 = "0pbv1x4mm7h43sz4r7rb0hkhsm6g7i4pkpi0lbnx2awiafzzlg3s"; - SGr-IosevkaFixedSS02 = "11d0si4bmgvz3pl43qbpszj9h9x4g53r29359y2mi5rmw5jym01l"; - SGr-IosevkaFixedSS03 = "1nmw3g30hm2rgy0lji0lbihi08iphy943pkrs5fl2c36yf9qxl0d"; - SGr-IosevkaFixedSS04 = "18jhd61d4vrmq9ck3wass07ph8frxnq8knl0cdpgqx6izk3fk0ss"; - SGr-IosevkaFixedSS05 = "0x9q7jvzsrs71frx662cb4872z9alc2y0r7cjaxpaifc420826z6"; - SGr-IosevkaFixedSS06 = "17f9c4cwi46c5jlrj6r6xw6gwjq2cmkjm4832cyjw9fqh4kpb0ih"; - SGr-IosevkaFixedSS07 = "1x3j7lp88zrxkmak3fnglin2sp450lmlyv92n56dz2a7gvw0nbs9"; - SGr-IosevkaFixedSS08 = "03m7wmwlajhjw3ifhmxl4cxkjjfyldw0bbybhk4cdsw9qni0cbhi"; - SGr-IosevkaFixedSS09 = "127466bq6m3k7is2jh45j9c3iik2ckgajhrkhgmhk3fr272ip00z"; - SGr-IosevkaFixedSS10 = "1qczqa9lv0hlqjhh5n3j32ampflriwyhp7cvk8vraxp8w01f20vv"; - SGr-IosevkaFixedSS11 = "0pm10asyl566l9s00hxb1r43yvhb24hqn3z5akirfxxp5klp9hf3"; - SGr-IosevkaFixedSS12 = "0lsy3097aid17hqxljkxj9lpswxvlmk5gv047dh7m6m8vxm3dzcy"; - SGr-IosevkaFixedSS13 = "1h5bv9c6yvbvfslx3wm5657f982f17pb2q8j2hl5c50114dbkdib"; - SGr-IosevkaFixedSS14 = "1lglsqhcy22hf4zbczpwc7pkmyaglknqpkv9bgckphpzaqgmavln"; - SGr-IosevkaFixedSS15 = "18hc5kfj4m57k8p90jc2fnr89ji6q34q6v3b1xkyb0lv9bagq2nl"; - SGr-IosevkaFixedSS16 = "0k4nrdqnh6jg40q5xvkrm1jx0iplwybhxy8bn3q7k461d3rn9smv"; - SGr-IosevkaFixedSS17 = "02higr5lxiyi6z8b916pkgch2dq0si7m7bf0vxb86daplgljbrna"; - SGr-IosevkaFixedSS18 = "0b4ljypil31n0861k43k0dxrmj9djgy8qffwy5vv856lcrdipy8h"; - SGr-IosevkaSlab = "18y0j05jjkdkavidrn2bpfd1319yzxp7m0zyhn08394d4m74m8w2"; - SGr-IosevkaSS01 = "0k9l74q9lijhxq1slxxkq7wb71nsrdv2bkqsbdxxb5gypqjh136y"; - SGr-IosevkaSS02 = "1gzjf6j6ljxnqi3xzcs1q1qzazyzw9d4az4l1nmsbkk5nfw3skbi"; - SGr-IosevkaSS03 = "1d8ihwf8m47lvlyyar4wd2xqjn4g5qmy1pp81dd2p999j47fzz84"; - SGr-IosevkaSS04 = "0dwhmlsv4x3z2xmnqwdciys0j22z25vcwqrb7wmy7c5sdhfkd4pn"; - SGr-IosevkaSS05 = "02nid5vi8q71lcaxwllyaa7j2qdb8hycw5k3b9fiw9bvliip7bwl"; - SGr-IosevkaSS06 = "1vx6nqv2m1f32xqgv6px2r0rr60rb8rns6f2y2dmnz1b55j4ap84"; - SGr-IosevkaSS07 = "0rgk9z2mrz990szq1m5664x1jq3056df9warjpj0nnr0d3a8406q"; - SGr-IosevkaSS08 = "1sv09fsd3xwwjdkiw93v7pvs3a1r7mbxqgyw73l4v8k5c8f16q14"; - SGr-IosevkaSS09 = "1hrk9pn407f57bx6zjc9mxzr7286vz2llyrkn808q1dlvisp3gc9"; - SGr-IosevkaSS10 = "1sk339gl5r004pd52daclk2zl5zybcfra2hdafvrmc81fkd2pz7b"; - SGr-IosevkaSS11 = "0rp7488skw396qdw8lyv69fgkz3b5i5nbjzkbrlfjasp2sgyg1i9"; - SGr-IosevkaSS12 = "04446s3bjdpvk25361n88xmcc3ylh9frabb11wgs79brm2i8qf57"; - SGr-IosevkaSS13 = "1xsdp07272bmp6fj68ky40hs53lhsm9y9c6fpk2cqvm25mv5w7fn"; - SGr-IosevkaSS14 = "1r3d7g4kqrj6zwpivzsjvhvv9q4gysb6a8s0m1fvaarsxhcrvkf1"; - SGr-IosevkaSS15 = "0cy8jg4g95zxbcq8y6bksmjbfz5dbp3c7qv16z533n2b5fn5h912"; - SGr-IosevkaSS16 = "05rs3hkv92h2s3p3v4v33jrfx5b6vk5v5d8kbwg989y8azzsj52m"; - SGr-IosevkaSS17 = "1i28qsazi4q51x1rk9p6h6zvk6pbbm9g5fs567a5wwlhagjha2cd"; - SGr-IosevkaSS18 = "0ghs5b6zg1jmibgypqwgnl8vpvzhj5c8di4izp5rgw8lzsi5n9yb"; - SGr-IosevkaTerm = "1vxs9sxc8q54cg4ydln1zqqwj8rs7x87xn3yz7nhgswk2zdyfxnr"; - SGr-IosevkaTermCurly = "1v4hwghycmlzi57m7qnp60v618x4wkqg3pbzpvm80v528lvrsrsh"; - SGr-IosevkaTermCurlySlab = "0z2z117saryawik1xnklzn8schgy4q10yqax1ypl1sj0lq80b6dm"; - SGr-IosevkaTermSlab = "04qbdia36haqisrm8z4waknpfvgrxb2cymjk6pwdqgk4jbfd6yh8"; - SGr-IosevkaTermSS01 = "1y3ggssvk39kv4igli2q7qy35spj5vddngsn4izh089a4irr7462"; - SGr-IosevkaTermSS02 = "06ddjjfj2h83ya4hw4yla6fzd3kpv3q6fnscx2aydxc4qjryqws7"; - SGr-IosevkaTermSS03 = "03jjlllq4x9h6pkg67vfivvc3p0swawah94yi10ar1hbgaljqhn4"; - SGr-IosevkaTermSS04 = "0n36y3pz660j0rv1zhyjrahcz87a65fw59s9x320aix502msaqn2"; - SGr-IosevkaTermSS05 = "0h71560ln3my53giyw75mq9cynjnnj6dkvdd4anbkvyw2j133497"; - SGr-IosevkaTermSS06 = "0fhmzjzxy8hjcdk3rjl9igykfmlgji7v5lyzm1p04fs4wa289bh6"; - SGr-IosevkaTermSS07 = "0girzhdwgwsjqqrhz0bky81rrqj62hxgkqy3sklr1w55snhq9yb4"; - SGr-IosevkaTermSS08 = "08rz3bjimxmn6xp4dqv9177bhyyqv10rdfxz697fkajq0wxvy4xc"; - SGr-IosevkaTermSS09 = "095bzk8ir4zxmrikr48fbfhsdhhnrcwg3xrkvqxhqancgqj4rzsz"; - SGr-IosevkaTermSS10 = "0kb3nhdy1pilhvdyfb3igaalf888qx55vhigvail05dnkp23iyaw"; - SGr-IosevkaTermSS11 = "1sxihqvswi66pbjnixfv1f4gv08x6n28qfzyj03lzw1d7sz3m1gp"; - SGr-IosevkaTermSS12 = "0w2sh563azjam2fcdbpxh466ddlc4h6vpc2xlawl78w5n63wsnys"; - SGr-IosevkaTermSS13 = "00h1kq3a2kbippqcy49jiagh6zl01qb40489njdg1vpd6s04x50c"; - SGr-IosevkaTermSS14 = "0k97x43appi5azlnghinwmyq13h5fqkj0p2rysnz28v5r6razikm"; - SGr-IosevkaTermSS15 = "1ziqhmp9af9b0djm9mhh2yy5f85rwwk82xhwsd84y9bl3mwil5cr"; - SGr-IosevkaTermSS16 = "00lyihlkv7h5pr2w74rb56kwzjqwh1kh7cp7dfzhwhwicy5bxc50"; - SGr-IosevkaTermSS17 = "03zgm0qsw5p8i1567ghslgb3cqwxznc9rbwnx9xiwv4972lbad6w"; - SGr-IosevkaTermSS18 = "1dmvvn1ny1bym8k32nvp2qzrzmy0qy4l6w1clfza4g6c23k6d4dd"; + Iosevka = "0xpzsmvcvcf6c57bllg1yxylrvlm31gjpn9ilr7qz8bl7jz3z9rm"; + IosevkaAile = "0ar4wmsjdqh9a52k4vn9krpz7ii3bddnprqjyvpi9f1ybpxj74q1"; + IosevkaCurly = "1q9wqrhyk3636gy2yrkdc9l8wqiza3n5d6slx9h7529x8c6r64gb"; + IosevkaCurlySlab = "03an8nyg1xkv9l1fndk7agwkbg3s1kvwj342h3zj1klwi9bjz28b"; + IosevkaEtoile = "0qi8v8vzqifyxzzwqdx5kyvx11f1x8vgrk9104cb75xmslfa1wrg"; + IosevkaSlab = "0kmz8qywds7jr3wiy02p2c3r2y1bs0ibj7w6wa0kkkm82kk5v4b1"; + IosevkaSS01 = "091i0x9l589iq4f4mnkw26417vck6vhwnf2d68slv7xsss4jqpyw"; + IosevkaSS02 = "0dlsnglcbqpnpycqxq2aqgn80q6lrj50vrmgr71n051ix5mx5czl"; + IosevkaSS03 = "1y1l0rhbn55dd2scaffvk2fa6gap8rh4wb2lvi5a93z278ajcc7q"; + IosevkaSS04 = "01wgjwk77nb7f55zkdb6k897cv5rkx2q3va4r9rhj3z6aragp59c"; + IosevkaSS05 = "1w9wbwwzqf9812kd4q0g3z93f4qy6jn418m79d8s9bh132nm9jl4"; + IosevkaSS06 = "0s1cl8i7nv7yxynspix5mkl0db1vrlik5yiqs47ih8a82rm6zgmj"; + IosevkaSS07 = "0rssrgkfzr2pnycnjx2ny88sgcw4haqh5mmbyjnqm412602v57l1"; + IosevkaSS08 = "11yhnwymkr8m4si9ph2knk44rk7r87sjab0g2w8lhiamlcrps49a"; + IosevkaSS09 = "1mfv68s88zxvjcg90ha7cdhwhhlqv77b4iz7z991gmd34dd2n22l"; + IosevkaSS10 = "14j5mn7ry45f6vyzrq6v1qcssdz7s99d2hmpn3hh4gyn18hzadix"; + IosevkaSS11 = "0q3ksgh8y9mldr85k6l9q3p86yr13mcdvbwrrr2jy17kqjfms6yz"; + IosevkaSS12 = "1lh1vfv4q1ghdnxnk45hdqpp3pp7wr6pcv2b8k2rpjpv0w8wkz7b"; + IosevkaSS13 = "1vpkv053skbib9jgp75002gsisc2fpakwilh97sxnfyz47vqf6vk"; + IosevkaSS14 = "1q73a2wkdzd51s2bpjysh6k5scsqj089vphj68i1r3xzig5zg73d"; + IosevkaSS15 = "08qj500y20l4jzjd8qbdsifavi7hw1l136d2iqal2m18hy7kbvf3"; + IosevkaSS16 = "1ifmk9j4az7g3rlxdswxc2cz1hbn2nxmrh3ysi9gsjzppfayi4wn"; + IosevkaSS17 = "02abk8imd7kz1m4mq7c1sv13pm6d98l53qrh0291f3z5gpq6mdmw"; + IosevkaSS18 = "0ia83ijbq9bishj6gwij7sszp75bqwz1h30bxkavlxk5gfb770q1"; + SGr-Iosevka = "1n6v930a42wbx6bb1cyh6wvy2m885w60hlan9kgps682f8108h57"; + SGr-IosevkaCurly = "19r0swn7wz0h5m2f4vf2sk1lrdvrnv4nlr0hikb3mh6fylglwffv"; + SGr-IosevkaCurlySlab = "1xygrs9x8j9lm2n400i8m0i5vgwiq75vq4hm3712hkx2dx1kjycf"; + SGr-IosevkaFixed = "0nl380k30l4gn327kp51vwzlqh9j39w6frhmrxbmdcblnz1sc5md"; + SGr-IosevkaFixedCurly = "05aagifx30xzb9rmylx8k4jvpr8wgzi2dmc2ili40yk06jw97py1"; + SGr-IosevkaFixedCurlySlab = "1blad2s6kzz64c5fri50fqwivy8qxzkfxjg73wqyjzhmwbf5am1d"; + SGr-IosevkaFixedSlab = "1f0zqrd193w0lpzbl24ldr7wbbag3v6ahkch5jzad2f931fi62vl"; + SGr-IosevkaFixedSS01 = "1nyvwab562a0c5f1gjqw4wwq3lkizz1zi0bpg3dbfk72kzwlx31n"; + SGr-IosevkaFixedSS02 = "1k2lkf5cxxbp2rimv97c6bqq2fqkz4iwhvqh2bp3jw4jsxrqragc"; + SGr-IosevkaFixedSS03 = "0c679d897k6jdwwsrmj57v6q08ns6brrn6pp53m1fs4v8vsy7gq8"; + SGr-IosevkaFixedSS04 = "1zcv64yivzflr106vi9a0nzxl93d68d2pp07dlfc7acd86ps90j1"; + SGr-IosevkaFixedSS05 = "1g45312ly0zr1hsgdv1nhj2slrign6lddnxxalnbpi065qcgxzdb"; + SGr-IosevkaFixedSS06 = "0ahpvw9z573xd437m0vdyh7bh68z7frisjrm4r02a2nd0bc8rfva"; + SGr-IosevkaFixedSS07 = "06a5gfzf2a8ci8qvxfr8m0pj4avg5fggfdfs51lwn5n1rjqv3jms"; + SGr-IosevkaFixedSS08 = "00x0rz0j6l5lnb1bnly3dswazgxpdx5gd3ggihxcwvkjfarbs12y"; + SGr-IosevkaFixedSS09 = "089qlqa9hrfq1dwdnj29kr3r60n95gsnqqcgx1y87nw8xxaj1l8c"; + SGr-IosevkaFixedSS10 = "1g1xic30x6sb5jkg9ws1ymk1530402m60v6bsl9l164hj5wbfsjh"; + SGr-IosevkaFixedSS11 = "0rpbr95k2xzg7gilljhrx2jhwxaqg6v7hfxj3mrjid5jjphrw43v"; + SGr-IosevkaFixedSS12 = "1iz5apwf4700r63gicqcbic77f0dp1fhnqaxigrmhsyxwff8b31m"; + SGr-IosevkaFixedSS13 = "1igwj2ikfamrdd6nbmdy72sdrk7k2v1j32yny9bl5wx13dw7575b"; + SGr-IosevkaFixedSS14 = "00032jy2vls5f0frpnpbiiw8i2v1qj84hy1wcksgy4j357vw4lpf"; + SGr-IosevkaFixedSS15 = "1kpgkvq022gb3j33kr9b97ays0wvc5wl23n9cvq9ij8j3wbs4z3k"; + SGr-IosevkaFixedSS16 = "0bnc7y6ma9mi5xwy7csn9h75ahv3g8ggkfhr02qn34qm2dbmif1n"; + SGr-IosevkaFixedSS17 = "1d62jfwrpvh735jlvk812ymmly2qhkpn38s0gh48m28whgwvrhcw"; + SGr-IosevkaFixedSS18 = "18954hkad2b8pbp9f33f7ml4rzgkxl2hnjdc69zhav76lxd6369x"; + SGr-IosevkaSlab = "0lvx0ghvy17b6jzpc88kj0p1symf4vqahlc6wa2w4jsb2csc9d2l"; + SGr-IosevkaSS01 = "1b54d5g50k8hl3hnhmng4amayh5wmbvvkzq48mld6zwlfr1fadkd"; + SGr-IosevkaSS02 = "0bg9y4fr812ax34kmdz727ib67dghpbsim7a57isc897x0igcbnj"; + SGr-IosevkaSS03 = "01rsg0f8nxzl7i0w0sfp0sdrd1ab7p4qdadan486jaarxbjd6kx7"; + SGr-IosevkaSS04 = "1l36xjs0pm83i1azx0s2y541x6b83b1dw9ghf5ajgll29sz0gnlx"; + SGr-IosevkaSS05 = "0fj2jd65yhbxs9f2sadzpdm05d5api9ffqjx8a9hdc291ykl3sw6"; + SGr-IosevkaSS06 = "105g5p9rvr8cfiqf4wbjsly8616jm49bx088ddgj4jyli1msjh8k"; + SGr-IosevkaSS07 = "0lci5wa9q8bk57d0c99r86nhxh17qw4s0mh8yismnb0hqcknhfly"; + SGr-IosevkaSS08 = "1v56yda5w45mi9hmbdswqa4dmscf728a2bj0lf3ai9zcprfnc8d3"; + SGr-IosevkaSS09 = "0bgn9q6r1a3799nawhgzws9rm7mzibiz4ya2x4qkmawzzi1rdgjs"; + SGr-IosevkaSS10 = "19nqp295cdq7k1zlh8nd42wa3m11ql7112v746vvwq5bpr79dn8c"; + SGr-IosevkaSS11 = "0jr9j8c51fh3dp8mqiimr4lhnvznpn2q3swz2zyc8jlmbyga02ad"; + SGr-IosevkaSS12 = "176mby5agqa7fll9wq16dws98nn7igfx72fni1f509hq5k7xygsp"; + SGr-IosevkaSS13 = "0a53868nnwgql2sf909ybpdibjii8w89bp0kc8xymx7v9i2m4iyf"; + SGr-IosevkaSS14 = "11m4v27sf6qif6069nm71dfnksp7bldkvlx9bbvyn0y6lg9n1pfl"; + SGr-IosevkaSS15 = "00wr61nlf091gkwh5kdx8wp75y0vi2dlra91m89b4w6592vwffk4"; + SGr-IosevkaSS16 = "0b1fqrcx65ajanc433gyscw15ra230z8gs5kh0ahhkwqwz1al0lq"; + SGr-IosevkaSS17 = "1xsvga76x8p87ws386gmz28nghw3ybr1rck722a5wzzlz5z51p3m"; + SGr-IosevkaSS18 = "0w97ayi3jsb3313bw9dr9xb1l5lx6d26rc5yw0y9c9ph180f9afy"; + SGr-IosevkaTerm = "0b5y4gg149271gmf255hr8lp1n2qxafp5k1gi7h7rpnnndaimj1g"; + SGr-IosevkaTermCurly = "1izpf2sb0zv2kfqm1zb1ambicydqbis202n36rxn3b3sfa41hnwy"; + SGr-IosevkaTermCurlySlab = "03dbzgp0g0767aym5rshbjvzbhff8gpg90zl9sqrrfgmwav9yqd6"; + SGr-IosevkaTermSlab = "1amaimpr84q36gf2ma31d5ss57g84d8rw4bzg7058kd801yc1y53"; + SGr-IosevkaTermSS01 = "1pj4bb7q9bjwnss2353ldw599f8sns28vc8h8n33sq9xqrna9fbd"; + SGr-IosevkaTermSS02 = "1rgwyhzzpllprs2rmkrsc8xknsc4gzi3h0cv96qnx9jvd9ixyq67"; + SGr-IosevkaTermSS03 = "1c682qaj6bzyrwq4yc9bxn8y6yza9hn0c3hpj5g62akwk50dvkg9"; + SGr-IosevkaTermSS04 = "02rgpbb2wn3aibkkpfi2sxy751bwmf7azkv44xdalhyb6hz7vfgv"; + SGr-IosevkaTermSS05 = "187kwn9g81rpq71w58hdi27ngl1zby550xx85a2dz00w7j1l1qy3"; + SGr-IosevkaTermSS06 = "13k91ha10yymh5wcnf45sh1d51rgnlrzdg9bdh4r86122mq2pvl9"; + SGr-IosevkaTermSS07 = "16mq7mbcrqvpmwl6zgbs8r4w5b1r0m01i6iiwv20x74ay9pkglmv"; + SGr-IosevkaTermSS08 = "0npiqvw4ai9mq9ix0hfrq86h3y828g284nw2q4dgqpcpvhm8kxq5"; + SGr-IosevkaTermSS09 = "105p6x8chm9lsapb6ccpvhbrhaackdscjqi5j04hadkf4kxp7cn4"; + SGr-IosevkaTermSS10 = "023bgny097p8n58npf7f3y7shxgyfgqh5yy67lc64gwi3bw8lwb6"; + SGr-IosevkaTermSS11 = "1lkkkcqpgcfs3j3vdr3nryaxhycgz67d58zd54mpkxj3hicag1i9"; + SGr-IosevkaTermSS12 = "18d53273x83sq7nm6mi810y74i57nlz46vxxybdjbfp3i74rl14q"; + SGr-IosevkaTermSS13 = "1vi5i12l7pp2ishk8wdn2rpbxhmmvjqla6zcn5grq9i3ki92hbaf"; + SGr-IosevkaTermSS14 = "0p5pzcmhg4wbmr8kp2ydhrprnw7ll9wvvsni05347s3vg7scd7al"; + SGr-IosevkaTermSS15 = "11grinpbmd0qpkqs31qg20bdd1y35570ja8ifx8pfh0j91x97q1f"; + SGr-IosevkaTermSS16 = "1mbqzfaxqi1l406wjjnz34nhlsgxj4jsayybdwv12nv7v8fbyalj"; + SGr-IosevkaTermSS17 = "138jbkicfrqgqg04am8fwvjr5zmjxx22ik1ss4iivgl0grr07ysf"; + SGr-IosevkaTermSS18 = "0glfd94lv7pl52apfxks0ic6w66347c4hxm57phylfmmvd163zd0"; } diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index a608a53e42137..1a447908192cd 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.056"; + version = "0.057"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-RaohSyTWHbhJXW6pRaLX20UAMA0uIJ4LWtq2MSQmnGU="; + hash = "sha256-SSTv/cyZ+7nK0VvQPqQ+T5JXDXOZgLmv++cjHLlObb8="; }; installPhase = '' diff --git a/pkgs/data/fonts/last-resort/default.nix b/pkgs/data/fonts/last-resort/default.nix index 10d820bf5f7f2..87fb95e96035f 100644 --- a/pkgs/data/fonts/last-resort/default.nix +++ b/pkgs/data/fonts/last-resort/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "last-resort"; - version = "15.100"; + version = "16.000"; src = fetchurl { url = "https://github.com/unicode-org/last-resort-font/releases/download/${version}/LastResortHE-Regular.ttf"; - hash = "sha256-dPk6j7Orh1bg6GyzwsB4P9oQvepvl51YF4abpyhOVso="; + hash = "sha256-YMSKv8BenyujNZnE3LpAEF0eznHTdh8LJvdaOLWxeJU="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/league-spartan/default.nix b/pkgs/data/fonts/league-spartan/default.nix index 10691f10c8e03..022346c5abca8 100644 --- a/pkgs/data/fonts/league-spartan/default.nix +++ b/pkgs/data/fonts/league-spartan/default.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { Taking a strong influence from ATF's classic Spartan family, we're starting our own family out with a single strong weight. We've put a few unique touches into a beautiful, historical typeface, and made sure to - include an extensive characterset – currently totaling over 300 glyphs. + include an extensive characterset – currently totaling over 300 glyphs. Over time, the open-source license will allow us expand League Spartan into a full family, with multiple weights and styles, and we're starting diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 4d942c7e2b97d..a9bdb0a2654fe 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenvNoCC, fetchurl }: +{ lib, stdenvNoCC, fetchurl, zstd }: stdenvNoCC.mkDerivation rec { pname = "libertinus"; - version = "7.040"; + version = "7.051"; src = fetchurl { - url = "https://github.com/alerque/libertinus/releases/download/v${version}/Libertinus-${version}.tar.xz"; - hash = "sha256-f+nwInItHBzGfcLCihELO7VbrjV1GWFg0kIsiTM7OFA="; + url = "https://github.com/alerque/libertinus/releases/download/v${version}/Libertinus-${version}.tar.zst"; + hash = "sha256-JQZ3ySnTd1owkTZDWUN5ryZKwu8oAQNaody+MLm+I6Y="; }; + nativeBuildInputs = [ zstd ]; + installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index a6e65ce689555..20f071050dfff 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "twemoji-color-font"; - version = "14.0.2"; + version = "15.0.3"; # We fetch the prebuilt font because building it takes 1.5 hours on hydra. # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871 src = fetchurl { url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-aCbiHqCNxd8myIeuTlYEaYfg9JCd+MAsc94FcUoDU8E="; + sha256 = "sha256-3mpcuQ3BaEyPmCMOrfWLA4XE9UkfbAgoIwF9nKHT7Ho="; }; dontBuild = true; diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index 1239b12388310..5be5a817b8570 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ bdftopcf libfaketime xorg.fonttosfnt xorg.mkfontscale - ] ++ lib.optionals stdenv.isLinux [ perl kbd ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ perl kbd ]; postPatch = "patchShebangs ."; @@ -24,7 +24,7 @@ stdenv.mkDerivation { # convert bdf font to otb faketime -f "1970-01-01 00:00:01" \ fonttosfnt -v -o u_vga16.otb u_vga16.bdf - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # convert font to compressed psf ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \ | psfaddtable - UniCyrX.sfm - \ @@ -40,7 +40,7 @@ stdenv.mkDerivation { install -m 644 -D *.bdf -t "$bdf/share/fonts" mkfontdir "$bdf/share/fonts" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # install psf (for linux virtual terminal) install -m 644 -D *.psf.gz -t "$out/share/consolefonts" ''; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 811b2b60b7cb5..9eab69f1d33e9 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "15.1.05"; + version = "16.0.01"; otf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf"; - hash = "sha256-e2K1CsuxhmidwwxEbOQ2e4fXlInpkHuDJV+fvg3PueE="; + hash = "sha256-6jmg5hTnSGSQI5xXWeGgzYb9SeM1xLCNL9E+MTFH8CI="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - hash = "sha256-zpc9Z4XXvma/tXRYOvAAQIpjyYS+1XPiaLZF4xYPTbw="; + hash = "sha256-51YEW6CJPuLoNpsnr8AkNr7ZApnbThZyznZuBHDNmCU="; }; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index fbd1d4b536803..0c2ac5e160399 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "unifont_upper"; - version = "15.1.05"; + version = "16.0.01"; src = fetchurl { url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf"; - hash = "sha256-A/Z/+IMNUH/3Ir3ewf/U2xqkkpZDUDKO+dlnRYt+7U0="; + hash = "sha256-5EUz6F3GlAMCOnA2xk0CplRUaLLACmewH/PiRtCRzsE="; }; dontUnpack = true; diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/data/icons/apple-cursor/default.nix index 5db50d0fbbe8a..e2f059ecb1fb2 100644 --- a/pkgs/data/icons/apple-cursor/default.nix +++ b/pkgs/data/icons/apple-cursor/default.nix @@ -8,19 +8,12 @@ let name = variant; url = "https://github.com/ful1e5/apple_cursor/releases/download/v${version}/${variant}.${suffix}"; hash = hash; - } // (lib.optionalAttrs (suffix == "zip") { stripRoot = false; })); + } // (lib.optionalAttrs (suffix == "zip") { stripRoot = false; }) // (lib.optionalAttrs (suffix == "tar.xz") { stripRoot = false; })); - version = "2.0.0"; srcs = [ - (_src "macOS-BigSur-White" "tar.gz" "sha256-3Ax2hMfkEL4cyJtGQpK3PqC/L5wtmgO0LsY4gkTQ2Bg=") - (_src "macOS-BigSur-White-Windows" "zip" "sha256-V6J2Ddgq46BkgxCWVReZrvE7CsOczzV7slOpilKFG9E=") - (_src "macOS-BigSur" "tar.gz" "sha256-VZWFf1AHum2xDJPMZrBmcyVrrmYGKwCdXOPATw7myOA=") - (_src "macOS-BigSur-Windows" "zip" "sha256-lp28ACsK8BXe6rSDELL4GdXb1QEdOVC8Y6eLofctkR4=") - (_src "macOS-Monterey-White" "tar.gz" "sha256-IfFYUbDW6mBe209iU1sBhFzolZd6YDVdJf+DPe9AQDM=") - (_src "macOS-Monterey-White-Windows" "zip" "sha256-gUuBFOi0nDBoX9TWPg4eQhCAhwYeEhfDEbYpc+XsQNE=") - (_src "macOS-Monterey" "tar.gz" "sha256-MHmaZs56Q1NbjkecvfcG1zAW85BCZDn5kXmxqVzPc7M=") - (_src "macOS-Monterey-Windows" "zip" "sha256-ajxEgq7besaRajLn0gTPpp4euOWVqbzc78u720PWlyE=") + (_src "macOS" "tar.xz" "sha256-nS4g+VwM+4q/S1ODb3ySi2SBk7Ha8vF8d9XpP5cEkok=") ]; + version = "2.0.1"; in stdenv.mkDerivation rec { pname = "apple_cursor"; inherit version; @@ -30,14 +23,18 @@ in stdenv.mkDerivation rec { installPhase = '' install -dm 0755 $out/share/icons - cp -r macOS* $out/share/icons/ + cp -r macOS/macOS* $out/share/icons/ ''; meta = with lib; { description = "Opensource macOS Cursors"; homepage = "https://github.com/ful1e5/apple_cursor"; - license = licenses.gpl3; + license = [ + licenses.gpl3Only + # Potentially a derivative work of copyrighted Apple designs + licenses.unfree + ]; platforms = platforms.linux; - maintainers = with maintainers; [ colemickens ]; + maintainers = with maintainers; [ colemickens dxwil ]; }; } diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix index 17debd4132a4c..4fbfeb0fcc398 100644 --- a/pkgs/data/icons/colloid-icon-theme/default.nix +++ b/pkgs/data/icons/colloid-icon-theme/default.nix @@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-02-28"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-bTN6x3t88yBL4WsPfOJIiNGWTywdIVi7E2VJKgMzEso="; + hash = "sha256-/eUlc+fnmQZ61qE/JWZDiR0mMPntLOec0nmevJa7lrc="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix index 44b92c465bbef..22289b73c466c 100644 --- a/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/pkgs/data/icons/gnome-icon-theme/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-icon-theme.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-icon-theme.x86_64-darwin }; } diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index fcf8436323288..88d2240408552 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme"; - version = "24.04.22"; + version = "24.09.18"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-hFUsj0nODUVbzKyN6ud3HsaoTZBLGW+jjwc6kFFH02c="; + sha256 = "sha256-NcsrITf/uiAeCGVxILP7/duzBYTXs1b9Yztsruq1MJg="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/data/icons/tela-icon-theme/default.nix index 8b51526e1e71b..be46f39bf0304 100644 --- a/pkgs/data/icons/tela-icon-theme/default.nix +++ b/pkgs/data/icons/tela-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "tela-icon-theme"; - version = "2024-04-19"; + version = "2024-09-04"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "tela-icon-theme"; rev = version; - hash = "sha256-Z1U0KJMnNNXL5fn3kPoZ2RZNi95T27/tnWVgR8kTj1o="; + hash = "sha256-ZzF4U/cTy/7oSDQs4+dezewgNzS5zroba8wpcfPciW4="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/icons/volantes-cursors/default.nix b/pkgs/data/icons/volantes-cursors/default.nix index 0e0871a00038b..d76a0eda4cf09 100644 --- a/pkgs/data/icons/volantes-cursors/default.nix +++ b/pkgs/data/icons/volantes-cursors/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ jordanisaacs ]; platforms = platforms.unix; - broken = stdenv.isDarwin && stdenv.isAarch64; # build timeout + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # build timeout }; } diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix index 588389f856ed2..09c54a72287a8 100644 --- a/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-05-28"; + version = "2024-09-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-60pz/ET3jorEui31Aq6I3LMTz0djwWUv7poEI0USzJw="; + hash = "sha256-/cW/ymT9MjB07Sw7ifpr6x8oaaeI4PSyaOdLci7AncY="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/data/misc/cacert/setup-hook.sh index 93b682fbbd12a..62361102648d8 100644 --- a/pkgs/data/misc/cacert/setup-hook.sh +++ b/pkgs/data/misc/cacert/setup-hook.sh @@ -1,7 +1,7 @@ -export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt +export NIX_SSL_CERT_FILE="${NIX_SSL_CERT_FILE:-@out@/etc/ssl/certs/ca-bundle.crt}" # compatibility # - openssl -export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt +export SSL_CERT_FILE=$NIX_SSL_CERT_FILE # - Haskell x509-system -export SYSTEM_CERTIFICATE_PATH=@out@/etc/ssl/certs/ca-bundle.crt +export SYSTEM_CERTIFICATE_PATH=$NIX_SSL_CERT_FILE diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index 28b2fab1309d3..885d952c3230c 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20240812"; + version = "20240912"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-wX5qBZIwdGFzOlk42SDs8T4QhDovEJ6twyghX/JRgjY="; + sha256 = "sha256-3Cxq5vA53g7+LUgvSneuq7UBjdKppvcVy3fh/cOwDI8="; }; dontUnpack = true; diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix index 3f024e0bcafc7..cda4a19d26c83 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/data/misc/dbip-country-lite/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2024-08"; + version = "2024-10"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-NdAXeo9anEGJUezxXEpABzNQyefONkh8wtFAnmAwXtw="; + hash = "sha256-MeAhfDY2jdX2WDsNGNjvH/JeCo9C1hx3PWyk8am9Ut0="; }; dontUnpack = true; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 91c406cad1b19..f0eb0492f3ade 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20240304"; + version = "20240920"; src = fetchFromGitHub { owner = "ddccontrol"; repo = pname; rev = version; - sha256 = "sha256-vXG9aa6Zdv5R7q62tpFaUIw4MVnT/jWwZ+jw1S9K7MM="; + sha256 = "sha256-u+buByJ7w1VHs4fGWNRy2EDFYheztbzpFga3tS6PnKk="; }; nativeBuildInputs = [ autoreconfHook intltool ]; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index c1ad4080dd81c..97532fab180f9 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "32e512a9cd79f962a8023e1c8c1a4db17d9b2fd8", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/32e512a9cd79f962a8023e1c8c1a4db17d9b2fd8.tar.gz", - "sha256": "1wiy2fsz8a1gx6mbzq8ns6wvns6kh2aigxczw0f9q7qbkd22kdil", - "msg": "Update from Hackage at 2024-07-31T18:11:52Z" + "commit": "5d97d9c05e76d8cecb68f1e9063afb39ca0fb26b", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/5d97d9c05e76d8cecb68f1e9063afb39ca0fb26b.tar.gz", + "sha256": "1ic4wn5immv06m1m2cq6mzrrgrxbidxmj39licxlkmnm9jlwzjwr", + "msg": "Update from Hackage at 2024-09-03T10:29:19Z" } diff --git a/pkgs/data/misc/mailcap/default.nix b/pkgs/data/misc/mailcap/default.nix index b3560ecc505c3..452e6f661abf5 100644 --- a/pkgs/data/misc/mailcap/default.nix +++ b/pkgs/data/misc/mailcap/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, nixosTests # updater , git @@ -44,6 +45,8 @@ stdenv.mkDerivation rec { exec nix-update --version "$VERSION" "$@" ''; + passthru.tests.nginx-mime = nixosTests.nginx-mime; + meta = with lib; { description = "Helper application and MIME type associations for file types"; homepage = "https://pagure.io/mailcap"; diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 816bb25b1be4d..4decc3c6dd99c 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mobile broadband service provider database"; homepage = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info"; + changelog = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.publicDomain; maintainers = [ ]; platforms = platforms.all; diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix index 95cab65aa61b2..3a46cc980bc33 100644 --- a/pkgs/data/misc/publicsuffix-list/default.nix +++ b/pkgs/data/misc/publicsuffix-list/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "0-unstable-2024-06-19"; + version = "0-unstable-2024-08-21"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "92c74a6cde6092a5e80531c0662e1055abeb975e"; - hash = "sha256-fkfjR2A2nf3/F16Pn0hCwXtAd26TbUVA5gIv+J4DOjc="; + rev = "30c3fc2db5ec0ecbc2efbb798b12459e9a22fffd"; + hash = "sha256-RmSlBl6lHFFvEEG2rsnwMpF9X8tv0VhPwhnke4UxUmA="; }; dontBuild = true; diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index 4bfe201beb484..53988a728de31 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ unzip zip perl aspell dos2unix ]; - buildInputs = lib.optional (!stdenv.isLinux) libiconv; + buildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv; env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 9e034d68241df..e5507075bcaed 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -5,7 +5,6 @@ , ninja , pkg-config , gettext -, itstool , libxml2 , glib , shared-mime-info diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index a38e6cf45b399..8170852020e23 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20240829063032"; + version = "20240920063125"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-gON0oAObjo3eFU50tPg318RNCrYevu5J68nl/gPlEkI="; + hash = "sha256-NNBC7Pd8mxPuC2LVmedZLtvsnw2LfbD+VEPwtTU5DQE="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index 6f32b2b727e2c..7b9164ef44249 100644 --- a/pkgs/data/themes/adapta/default.nix +++ b/pkgs/data/themes/adapta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome-shell }: stdenv.mkDerivation rec { pname = "adapta-gtk-theme"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inkscape libxml2 glib.dev - gnome.gnome-shell + gnome-shell ]; buildInputs = [ diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 7a7f151c382b9..90069dc48c356 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libxcb ] ++ lib.optionals (!useQt6) [ qt5.qtx11extras diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix index 1f41852bd365f..8b557b504fac0 100644 --- a/pkgs/data/themes/alacritty-theme/default.nix +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (self: { pname = "alacritty-theme"; - version = "0-unstable-2024-07-31"; + version = "0-unstable-2024-09-27"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "4091fddff8da892d5594e94116927c7445620867"; - hash = "sha256-1tt4GL3KNa3S4dEFiRZf4B1+CM6e7/gO3Q34847lYkI="; + rev = "90a8406beb095fdb1617135a98c38df1ef08859c"; + hash = "sha256-Uav3hn2HxwtpOWdGt8WDCqTR0erxXWF6Wxkcltru1Yw="; }; dontConfigure = true; diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index b3625858ec98f..0f282df8fea67 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -4,7 +4,7 @@ , meson , ninja , glib -, gnome +, gnome-shell , gnome-themes-extra , gtk-engine-murrine , inkscape @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity" # "-Dvariants=light,darker,dark,lighter" "-Dcinnamon_version=${cinnamon-common.version}" - "-Dgnome_shell_version=${gnome.gnome-shell.version}" + "-Dgnome_shell_version=${gnome-shell.version}" # You will need to patch gdm to make use of this. "-Dgnome_shell_gresource=true" ]; diff --git a/pkgs/data/themes/ayu-theme-gtk/default.nix b/pkgs/data/themes/ayu-theme-gtk/default.nix index 29421c58bff29..1f154f6de2f69 100644 --- a/pkgs/data/themes/ayu-theme-gtk/default.nix +++ b/pkgs/data/themes/ayu-theme-gtk/default.nix @@ -1,7 +1,7 @@ { stdenv , autoreconfHook , fetchFromGitHub -, gnome +, gnome-shell , gnome-themes-extra , gtk-engine-murrine , gtk3 @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-gnome-shell=${gnome.gnome-shell.version}" + "--with-gnome-shell=${gnome-shell.version}" "--disable-unity" ]; diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index 2b44edfb7f403..29d3e6a2cda21 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2024-08-14"; + version = "4.0.0-unstable-2024-09-24"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "be80a123f1c47a9fdb6181e60a641778e14be2f7"; - hash = "sha256-c+DOYv3Eg31Fdt8qDBNYFPS/zuGInxJu2AsZqDExjPk="; + rev = "f2d2ea560a83ebdef6734b70dd9683272b47894d"; + hash = "sha256-/xgvlcMC4AHITy15dVHhdTIeu1mcA6Luhdanpr1as4Q="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix index 3b3af2431dd38..53e45328a8e6a 100644 --- a/pkgs/data/themes/equilux-theme/default.nix +++ b/pkgs/data/themes/equilux-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome, gnome-themes-extra, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: +{ lib, stdenv, fetchFromGitHub, gnome-shell, gnome-themes-extra, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: stdenv.mkDerivation rec { pname = "equilux-theme"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchShebangs install.sh sed -i install.sh \ -e "s|if .*which gnome-shell.*;|if true;|" \ - -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome.gnome-shell.version}|" + -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome-shell.version}|" mkdir -p $out/share/themes ./install.sh --dest $out/share/themes rm $out/share/themes/*/COPYING diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix index f0cf85783245d..37176ee39a0ee 100644 --- a/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/pkgs/data/themes/flat-remix-gnome/default.nix @@ -7,25 +7,25 @@ let # make install will use dconf to find desktop background file uri. # consider adding an args to allow specify pictures manually. - # https://github.com/daniruiz/flat-remix-gnome/blob/20240526/Makefile#L38 + # https://github.com/daniruiz/flat-remix-gnome/blob/20240721/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20240526"; + version = "20240721"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-Z4ba+DB4a9cHT+r+UbsGKG46hcqbM8CZHiI36D60/aY="; + hash = "sha256-eWZ5gwu/ovtnXZEFlUfaHfpQ7O4oInMnu0PQZpK/c9U="; }; nativeBuildInputs = [ glib fake-dconf ]; makeFlags = [ "PREFIX=$(out)" ]; # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20240526/Makefile#L56 + # https://github.com/daniruiz/flat-remix-gnome/blob/20240721/Makefile#L56 preInstall = '' mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index a569a3758357a..4fb37d2cba869 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20220627"; + version = "20240730"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "sha256-z/ILu8UPbyEN/ejsxZ3CII3y3dI04ZNa1i6nyjKFis8="; + sha256 = "sha256-EWe84bLG14RkCNbHp0S5FbUQ5/Ye/KbCk3gPTsGg9oQ="; }; dontBuild = true; diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/data/themes/lounge/default.nix index ab945f5105383..f04e19bc2db3a 100644 --- a/pkgs/data/themes/lounge/default.nix +++ b/pkgs/data/themes/lounge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome-shell, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "lounge-gtk-theme"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; mesonFlags = [ - "-D gnome_version=${lib.versions.majorMinor gnome.gnome-shell.version}" + "-D gnome_version=${lib.versions.majorMinor gnome-shell.version}" ]; postFixup = '' diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index 7ccf0fd68b2fb..a5a574aa7927d 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -4,7 +4,7 @@ , meson , ninja , sassc -, gnome +, gnome-shell , gnome-themes-extra , gtk-engine-murrine , gdk-pixbuf @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; mesonFlags = [ - "-Dgnome_shell_version=${lib.versions.majorMinor gnome.gnome-shell.version}" + "-Dgnome_shell_version=${lib.versions.majorMinor gnome-shell.version}" ]; postInstall = '' diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index e093eed713251..637fc72acf0ad 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-05-30"; + version = "2024-09-02"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-Dpdt7acRodtR4EE4STIiYHidehZwFGoYS8Oh6DgpXOI="; + hash = "sha256-rgbqVU2tKLnp+ZQpLTthpo9vPFRkGuayJCADrI2R1ls="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/data/themes/qogir-kde/default.nix index 8e60dd909468a..224150c173962 100644 --- a/pkgs/data/themes/qogir-kde/default.nix +++ b/pkgs/data/themes/qogir-kde/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "qogir-kde"; - version = "0-unstable-2024-07-29"; + version = "0-unstable-2024-09-01"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "5a19a4b4006b7486af12a5f051ca5377104cab1b"; - hash = "sha256-DHV2iVEYxGY9+21TF9YLEH0OoDWVTvcCJytb7k+nS8M="; + rev = "dff5c1fbbaa0b824684c65063b635cf27bcb19ce"; + hash = "sha256-uK9lJVRdMszA0am1/E4mfIN50yNKONH85M7+e0ERtn4="; }; # Propagate sddm theme dependencies to user env otherwise sddm does diff --git a/pkgs/data/themes/sddm-astronaut/default.nix b/pkgs/data/themes/sddm-astronaut/default.nix index ef8071f1e858e..39064b3c7a8e8 100644 --- a/pkgs/data/themes/sddm-astronaut/default.nix +++ b/pkgs/data/themes/sddm-astronaut/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Modern looking qt6 sddm theme"; - homepage = "https://github.com/${src.owner}/${pname}"; + homepage = "https://github.com/${src.owner}/${src.repo}"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; diff --git a/pkgs/data/themes/whitesur-kde/default.nix b/pkgs/data/themes/whitesur-kde/default.nix index 71e5204854443..299e4c89a1314 100644 --- a/pkgs/data/themes/whitesur-kde/default.nix +++ b/pkgs/data/themes/whitesur-kde/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "whitesur-kde"; - version = "2022-05-01-unstable-2024-08-26"; + version = "2022-05-01-unstable-2024-09-26"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "whitesur-kde"; - rev = "ead6fd7308b3cae1b4634d00ddc685f9a88c59a9"; - hash = "sha256-1YDy+g8r6NIceV1ygJK+w24g4ehzsPFMSWoLkuiNosU="; + rev = "8cbb617049ad79ecff63eb62770d360b73fed656"; + hash = "sha256-uNRO/r8kJByS4BDq0jXth+y0rg3GtGsbXoNLOZHpuNU="; }; # Propagate sddm theme dependencies to user env otherwise sddm does diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index a3b1a15b66970..096a353224d4e 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -4,49 +4,43 @@ fetchFromGitHub, cmake, pkg-config, - qttools, - wrapQtAppsHook, dtkwidget, qt5integration, qt5platform-plugins, - qtbase, - qtsvg, dde-qt-dbus-factory, - kcodecs, - syntax-highlighting, libchardet, libuchardet, libiconv, - gitUpdater, + libsForQt5, }: stdenv.mkDerivation rec { pname = "deepin-editor"; - version = "6.0.16"; + version = "6.5.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-55hRXHP02MJWt+JUDCDKv4Boq0IwNW1itGw9rtCZrao="; + hash = "sha256-Z3fsnjo4Pcu1e8lKvWdWBhpoOFFy0dSrI2HehRYKJ0k="; }; nativeBuildInputs = [ cmake pkg-config - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ dtkwidget qt5integration qt5platform-plugins - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg dde-qt-dbus-factory - kcodecs - syntax-highlighting + libsForQt5.kcodecs + libsForQt5.syntax-highlighting libchardet libuchardet libiconv @@ -56,13 +50,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; - passthru.updateScript = gitUpdater { }; - - meta = with lib; { + meta = { description = "Desktop text editor that supports common text editing features"; homepage = "https://github.com/linuxdeepin/deepin-editor"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix index 31ce23124cd2f..fa5c20c8f5454 100644 --- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix @@ -8,15 +8,10 @@ qttools, wrapQtAppsHook, qt5platform-plugins, - qtbase, dtkwidget, dtkdeclarative, deepin-ocr-plugin-manager, - gio-qt, - udisks2-qt5, - image-editor, libraw, - libexif, freeimage, }: diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix index 41555483ccd0e..9013306af657f 100644 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -4,33 +4,28 @@ fetchFromGitHub, cmake, pkg-config, - qttools, - wrapQtAppsHook, - dtkwidget, - dtkdeclarative, - qt5integration, - qt5platform-plugins, - udisks2-qt5, - qtmpris, - qtmultimedia, - kcodecs, + dtk6widget, + dtk6declarative, + qt6integration, + qt6platform-plugins, + qt6mpris, ffmpeg, libvlc, + qt6Packages, taglib, SDL2, - qtbase, gst_all_1, }: stdenv.mkDerivation rec { pname = "deepin-music"; - version = "7.0.3"; + version = "7.0.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-MLfkSO8ru8MKiwgiQ0mPO3zGlnIeSHPc0Op5jjzJ6PE="; + hash = "sha256-tj0XICmp7sM2m6aSf/DgxS7JXO3Wy/83sZIPGV17gFo="; }; patches = [ "${src}/patches/fix-library-path.patch" ]; @@ -38,20 +33,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - qttools - wrapQtAppsHook + qt6Packages.qttools + qt6Packages.wrapQtAppsHook ]; buildInputs = [ - dtkwidget - dtkdeclarative - qt5integration - qt5platform-plugins - udisks2-qt5 - qtmpris - qtmultimedia - kcodecs + dtk6widget + dtk6declarative + qt6integration + qt6platform-plugins + qt6mpris + qt6Packages.qtbase + qt6Packages.qt5compat + qt6Packages.qtmultimedia ffmpeg libvlc taglib @@ -70,18 +65,19 @@ stdenv.mkDerivation rec { "-I${libvlc}/include/vlc" ]; - strictDeps = true; + # qtmultimedia can't not be found with strictDeps + strictDeps = false; preFixup = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; - meta = with lib; { + meta = { description = "Awesome music player with brilliant and tweakful UI Deepin-UI based"; mainProgram = "deepin-music"; homepage = "https://github.com/linuxdeepin/deepin-music"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix index 2bae6bf3e7789..f2ad2569b2487 100644 --- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -17,7 +17,6 @@ libspectre, openjpeg, djvulibre, - qtbase, gtest, }: diff --git a/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff b/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff deleted file mode 100644 index 7993cecd30add..0000000000000 --- a/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri -index 3e04f340..894b0ac7 100755 ---- a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri -+++ b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri -@@ -20,13 +20,8 @@ DEFINES += USE_SYSTEM_LIBJPEG \ - USE_SYSTEM_LIBOPENJPEG2 \ - USE_SYSTEM_FREETYPE - --INCLUDEPATH += /usr/include/openjpeg-2.3 \ -- /usr/include/openjpeg-2.4 \ -- /usr/include/freetype2 \ -- /usr/include/freetype2/freetype \ -- /usr/include/freetype2/freetype/config -- --LIBS += -lopenjp2 -llcms2 -lfreetype -+CONFIG += link_pkgconfig -+PKGCONFIG += libopenjp2 lcms2 freetype2 - - #QMAKE_CXXFLAGS += "-Wc++11-narrowing" #is_clang - #QMAKE_CXXFLAGS += "-Wno-inconsistent-missing-override" #is_clang Suppress no override warning for overridden functions. -diff --git a/3rdparty/deepin-pdfium/src/src.pro b/3rdparty/deepin-pdfium/src/src.pro -index 196b91d3..bda71ff4 100755 ---- a/3rdparty/deepin-pdfium/src/src.pro -+++ b/3rdparty/deepin-pdfium/src/src.pro -@@ -2,7 +2,9 @@ TARGET = $$PWD/../lib/deepin-pdfium - - TEMPLATE = lib - --CONFIG += c++14 -+CONFIG += c++14 link_pkgconfig -+ -+PKGCONFIG += chardet - - ###安全漏洞检测 - #QMAKE_CXX += -g -fsanitize=undefined,address -O2 -@@ -28,10 +30,6 @@ include($$PWD/3rdparty/pdfium/pdfium.pri) - - INCLUDEPATH += $$PWD/../include - --INCLUDEPATH += /usr/include/chardet -- --LIBS += -lchardet -- - public_headers += \ - $$PWD/../include/dpdfglobal.h \ - $$PWD/../include/dpdfdoc.h \ diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix index f37fb2dc6c259..a0af0f6806340 100644 --- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix @@ -14,7 +14,7 @@ qtsvg, qtx11extras, dde-qt-dbus-factory, - dde-dock, + dde-tray-loader, gsettings-qt, polkit-qt, procps, @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "deepin-system-monitor"; - version = "6.0.23"; + version = "6.5.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-LcXc8yI81YslVjof74TvOm6eWiN4UaHgUFU+HSCNZxQ="; + hash = "sha256-UOF0/RBceuRX6AtI1p5qqHhbRDAhA7i0+seOrkAFFgI="; }; postPatch = '' @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { qtsvg qtx11extras dde-qt-dbus-factory - dde-dock + dde-tray-loader gsettings-qt polkit-qt procps diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix index 2ff8cb984351a..2f15e0f1f195f 100644 --- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "deepin-icon-theme"; - version = "2024.07.19"; + version = "2024.07.31"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-eUL0V9pGYzvAdVZpnrWXDO/YeCBETCOGvcMqDTwTgoU="; + hash = "sha256-Vt2rYZthGelXVUp8/L57ZlDsVEjjZhCv+kSGeU6nC2s="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix new file mode 100644 index 0000000000000..a46ead0f6e7c8 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix @@ -0,0 +1,50 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + libsForQt5, + dtkcore, + coreutils, +}: + +stdenv.mkDerivation rec { + pname = "dde-api-proxy"; + version = "1.0.16"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dde-api-proxy"; + rev = version; + hash = "sha256-kWodNftOPLIiQNPHAIC9p3VHFAis8FAI7vLJTqahAtU="; + }; + + postPatch = '' + for file in $(grep -rl "/usr/bin/false"); do + substituteInPlace $file --replace-fail "/usr/bin/false" "${coreutils}/bin/false" + done + for file in $(grep -rl "/usr/lib/dde-api-proxy"); do + substituteInPlace $file --replace-fail "/usr/lib/dde-api-proxy" "$out/lib/dde-api-proxy" + done + ''; + + nativeBuildInputs = [ + cmake + pkg-config + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = [ + dtkcore + libsForQt5.qtbase + ]; + + meta = { + description = "Proxy service for dde"; + homepage = "https://github.com/linuxdeepin/dde-api-proxy"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix index 89315e2bd8a35..5a2648d690e80 100644 --- a/pkgs/desktops/deepin/core/dde-appearance/default.nix +++ b/pkgs/desktops/deepin/core/dde-appearance/default.nix @@ -5,7 +5,6 @@ cmake, pkg-config, wrapQtAppsHook, - qtbase, dtkgui, gsettings-qt, gtk3, diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix index 6eecb85c1b609..71069e96ea965 100644 --- a/pkgs/desktops/deepin/core/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "dde-calendar"; - version = "5.14.1"; + version = "5.14.4"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-08xkdiP0/haHY3jdHSoA1zXRxMi2t+qxLxbcRc7EO6Q="; + hash = "sha256-bZxNOBtLjop0eYxpMeoomaWYvPcMyDfQfgGPK9m+ARo="; }; patches = [ ./fix-wrapped-name-not-in-whitelist.diff ]; diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix index a3a3b52c23891..6600df5b79640 100644 --- a/pkgs/desktops/deepin/core/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/core/dde-control-center/default.nix @@ -4,35 +4,28 @@ fetchFromGitHub, cmake, pkg-config, - qttools, doxygen, - wrapQtAppsHook, - wrapGAppsHook3, wayland-scanner, + wayland, dtkwidget, qt5integration, qt5platform-plugins, + libsForQt5, deepin-pw-check, - qtbase, - qtx11extras, - qtmultimedia, - polkit-qt, libxcrypt, - librsvg, gtest, runtimeShell, - dbus, }: stdenv.mkDerivation rec { pname = "dde-control-center"; - version = "6.0.59"; + version = "6.0.65"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-OniY/B/9319AYYFFPnsUMNrnc0yVGG3rfCLPjgNFyag="; + hash = "sha256-9v2UtLjQQ3OX69UxMknLlrQhorahDI4Z4EEHItBs7G0="; }; postPatch = '' @@ -43,24 +36,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - qttools + libsForQt5.qttools doxygen - wrapQtAppsHook - wrapGAppsHook3 + libsForQt5.wrapQtAppsHook wayland-scanner ]; - dontWrapGApps = true; buildInputs = [ + wayland dtkwidget qt5platform-plugins + qt5integration deepin-pw-check - qtbase - qtx11extras - qtmultimedia - polkit-qt + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.polkit-qt libxcrypt - librsvg gtest ]; @@ -79,17 +70,7 @@ stdenv.mkDerivation rec { preConfigure = '' # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} - ''; - - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ librsvg ]}" - ]; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} ''; outputs = [ @@ -97,12 +78,12 @@ stdenv.mkDerivation rec { "dev" ]; - meta = with lib; { + meta = { description = "Control panel of Deepin Desktop Environment"; mainProgram = "dde-control-center"; homepage = "https://github.com/linuxdeepin/dde-control-center"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/pkgs/desktops/deepin/core/dde-dock/default.nix b/pkgs/desktops/deepin/core/dde-dock/default.nix deleted file mode 100644 index db3a4a052334c..0000000000000 --- a/pkgs/desktops/deepin/core/dde-dock/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - extra-cmake-modules, - qttools, - pkg-config, - wrapQtAppsHook, - wrapGAppsHook3, - qtbase, - dtkwidget, - qt5integration, - qt5platform-plugins, - dwayland, - qtx11extras, - gsettings-qt, - libdbusmenu, - xorg, -}: - -stdenv.mkDerivation rec { - pname = "dde-dock"; - version = "6.0.37"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-5VowwQ0NoV6jV6DwnoxPKnRi6n28Teh/UQZwRc3URWY="; - }; - - postPatch = '' - substituteInPlace plugins/pluginmanager/pluginmanager.cpp frame/controller/quicksettingcontroller.cpp \ - --replace "/usr/lib/dde-dock" "/run/current-system/sw/lib/dde-dock" - - substituteInPlace configs/com.deepin.dde.dock.json frame/util/common.h \ - --replace "/usr" "/run/current-system/sw" - - for file in $(grep -rl "/usr/lib/deepin-daemon"); do - substituteInPlace $file --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - done - ''; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - qttools - pkg-config - wrapQtAppsHook - wrapGAppsHook3 - ]; - dontWrapGApps = true; - - buildInputs = [ - qtbase - dtkwidget - qt5platform-plugins - dwayland - qtx11extras - gsettings-qt - libdbusmenu - xorg.libXcursor - xorg.libXtst - xorg.libXdmcp - xorg.libXres - ]; - - outputs = [ - "out" - "dev" - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ]; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - meta = with lib; { - description = "Deepin desktop-environment - dock module"; - mainProgram = "dde-dock"; - homepage = "https://github.com/linuxdeepin/dde-dock"; - platforms = platforms.linux; - license = licenses.lgpl3Plus; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix index 7e77c7f083ffe..5e4c8c4f78232 100644 --- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix @@ -2,13 +2,14 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, runtimeShell, dtkwidget, qt5integration, qt5platform-plugins, dde-qt-dbus-factory, docparser, - dde-dock, + dde-tray-loader, cmake, qttools, qtx11extras, @@ -44,13 +45,13 @@ stdenv.mkDerivation rec { pname = "dde-file-manager"; - version = "6.0.51"; + version = "6.0.57"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-MvrOhdejQPK693wFlqkERuwYM88ALtFNnbyu7H3TI4Q="; + hash = "sha256-laM6PgNdUNbsqbzKFGWk7DPuAWR+XHo0eXKG0CDuc9c="; }; nativeBuildInputs = [ @@ -62,10 +63,25 @@ stdenv.mkDerivation rec { ]; dontWrapGApps = true; - patches = [ ./patch_check_v23_interface.diff ]; + patches = [ + ./patch_check_v23_interface.diff + (fetchpatch { + name = "fix-permission-to-execute-dde-file-manager.patch"; + url = "https://github.com/linuxdeepin/dde-file-manager/commit/b78cc4bd08dd487f67c5a332a2a2f4d20b3798c7.patch"; + hash = "sha256-Tw3iu6sU0rrsM78WGMBpBgvA9YdRTM1ObjCxyM928F4="; + }) + ]; postPatch = '' - patchShebangs . + patchShebangs tests/*.sh \ + assets/scripts \ + src/*.sh \ + src/plugins/daemon/daemonplugin-accesscontrol/help.sh \ + src/apps/dde-file-manager/dde-property-dialog \ + src/apps/dde-desktop/data/applications/dfm-open.sh + + substituteInPlace assets/scripts/file-manager.sh \ + --replace-fail "/usr/libexec/dde-file-manager" "$out/libexec/dde-file-manager" substituteInPlace src/plugins/filemanager/dfmplugin-vault/utils/vaultdefine.h \ --replace-fail "/usr/bin/deepin-compressor" "deepin-compressor" @@ -99,7 +115,7 @@ stdenv.mkDerivation rec { dde-qt-dbus-factory glibmm docparser - dde-dock + dde-tray-loader qtx11extras qtmultimedia kcodecs diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix index 2d07a478fec35..92109c2d9772b 100644 --- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix +++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix @@ -8,7 +8,7 @@ wrapQtAppsHook, dtkwidget, dde-qt-dbus-factory, - dde-dock, + dde-tray-loader, deepin-pdfium, qt5integration, qt5platform-plugins, @@ -16,18 +16,19 @@ ffmpeg, ffmpegthumbnailer, pcre, - dbus, + lucenepp, + boost, }: stdenv.mkDerivation rec { pname = "dde-grand-search"; - version = "5.4.9"; + version = "5.5.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-WybwV1QIuV7O1SSgQU1ABsMf5QW9KJ95YyIa8Tz8pJ0="; + hash = "sha256-6s6M0cL8gjq1B5tuIRGPi8D69p4T8hPJv5QvBIvsO1w="; }; nativeBuildInputs = [ @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget - dde-dock + dde-tray-loader dde-qt-dbus-factory deepin-pdfium qt5integration @@ -48,13 +49,14 @@ stdenv.mkDerivation rec { ffmpeg ffmpegthumbnailer pcre + lucenepp + boost ]; patches = [ # This patch revert the commit e6735e7 # FIXME: why StartManager can't work, is dde-api-proxy still required? ./fix-dbus-path-for-daemon.diff - ./patch-check-v23-interface.diff ]; postPatch = '' @@ -69,10 +71,7 @@ stdenv.mkDerivation rec { substituteAllInPlace src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service ''; - cmakeFlags = [ - "-DVERSION=${version}" - "-DNIX_DEEPIN_VERSION=23" - ]; + cmakeFlags = [ "-DVERSION=${version}" ]; meta = { description = "System-wide desktop search for DDE"; diff --git a/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff b/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff deleted file mode 100644 index bcb9f2b6c0c2f..0000000000000 --- a/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 76dac13..f43600e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,7 @@ endif() - - #Indentify the version - find_package(DtkCMake REQUIRED) --if (${DEEPIN_OS_VERSION} MATCHES "23") -+if (${NIX_DEEPIN_VERSION} MATCHES "23") - add_definitions(-DCOMPILE_ON_V23) - set(COMPLIE_ON_V23 TRUE) - message("COMPILE ON v23") diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index bdbd5e1b136be..cb6b0acded832 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -2,11 +2,11 @@ lib, runCommand, glib, - gtk3, dde-grand-search, startdde, dde-session-shell, dde-file-manager, + dde-tray-loader, deepin-desktop-schemas, deepin-movie-reborn, deepin-system-monitor, @@ -21,6 +21,7 @@ let startdde dde-session-shell dde-file-manager + dde-tray-loader deepin-desktop-schemas deepin-movie-reborn deepin-system-monitor diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix index d1474b5bea975..1a7b2cb5107c1 100644 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "dde-launchpad"; - version = "0.7.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-nT89cUx7Bxf+d+fgqvXZ9U0i/qf1oP2alUB90UXpNcM="; + hash = "sha256-kczdSd9+ZmMZQ2fWg3SRW+CS/aWktYLz/H+Ky81TwVM="; }; nativeBuildInputs = [ @@ -45,12 +45,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; - meta = with lib; { + meta = { description = "'launcher' or 'start menu' component for DDE"; mainProgram = "dde-launchpad"; homepage = "https://github.com/linuxdeepin/dde-launchpad"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix index 518fd99548f06..9d5272df72663 100644 --- a/pkgs/desktops/deepin/core/dde-network-core/default.nix +++ b/pkgs/desktops/deepin/core/dde-network-core/default.nix @@ -3,46 +3,40 @@ lib, fetchFromGitHub, cmake, - qttools, pkg-config, - wrapQtAppsHook, - qtbase, - qtsvg, dtkwidget, - dde-dock, dde-control-center, dde-session-shell, - networkmanager-qt, + libsForQt5, glib, gtest, }: stdenv.mkDerivation rec { pname = "dde-network-core"; - version = "2.0.31"; + version = "2.0.34"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-vTcADZElqNZMzWKDCEFtH3oXNyW8i4wxAwnaBnyz6X8="; + hash = "sha256-bS/PkutP5BQtqZ6MzeImFyGKoztoTswXhXaEftEv0FI="; }; nativeBuildInputs = [ cmake - qttools + libsForQt5.qttools pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg dtkwidget - dde-dock dde-control-center dde-session-shell - networkmanager-qt + libsForQt5.networkmanager-qt glib gtest ]; @@ -51,11 +45,11 @@ stdenv.mkDerivation rec { strictDeps = true; - meta = with lib; { + meta = { description = "DDE network library framework"; homepage = "https://github.com/linuxdeepin/dde-network-core"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix index a2ce7f0090212..4a7e5cf9b0168 100644 --- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix @@ -10,7 +10,7 @@ dtkwidget, qt5integration, qt5platform-plugins, - dde-dock, + dde-tray-loader, gsettings-qt, qtx11extras, gtest, @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { qtbase dtkwidget qt5platform-plugins - dde-dock + dde-tray-loader gsettings-qt qtx11extras gtest diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix index 72696ba352143..a27406db98928 100644 --- a/pkgs/desktops/deepin/core/dde-shell/default.nix +++ b/pkgs/desktops/deepin/core/dde-shell/default.nix @@ -13,7 +13,7 @@ qt6Packages, qt6integration, qt6platform-plugins, - kdePackages, + dde-tray-loader, wayland, wayland-protocols, yaml-cpp, @@ -22,24 +22,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "dde-shell"; - version = "0.0.23-unstable-2024-06-11"; + version = "1.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-shell"; - rev = "d68cc64ad2cd6978af2f34deb3ef48f991d54fc3"; - hash = "sha256-hVrdfbtcL3EJitiDghNSuGr5MX/VVT1J3tuY6wjwYcw="; + rev = finalAttrs.version; + hash = "sha256-I3z6HL1h3qmLfOrwhyLhtSz3og4kHcAdlHJx4+SgPRo="; }; patches = [ - ./disable-plugins-use-qt5.diff ./fix-path-for-nixos.diff - ./only-use-qt6.diff # remove in next release ]; postPatch = '' - for file in $(grep -rl "/usr/lib/dde-dock/tmp"); do - substituteInPlace $file --replace-fail "/usr/lib/dde-dock/tmp" "/run/current-system/sw/lib/dde-dock/tmp" + for file in $(grep -rl "/usr/lib/dde-dock"); do + substituteInPlace $file --replace-fail "/usr/lib/dde-dock" "/run/current-system/sw/lib/dde-dock" done for file in $(grep -rl "/usr/lib/deepin-daemon"); do @@ -57,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + dde-tray-loader dtk6declarative dtk6widget dde-qt-dbus-factory @@ -64,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.qtwayland qt6Packages.qtsvg qt6platform-plugins - kdePackages.networkmanager-qt + qt6integration wayland wayland-protocols yaml-cpp @@ -77,8 +76,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" ]; qtWrapperArgs = [ - # qt6integration must be placed before qtsvg in QT_PLUGIN_PATH - "--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}" + "--prefix TRAY_LOADER_EXECUTE_PATH : ${dde-tray-loader}/libexec/trayplugin-loader" "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell" "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell" ]; diff --git a/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff b/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff deleted file mode 100644 index 0e1107abc7dc9..0000000000000 --- a/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/panels/dock/CMakeLists.txt b/panels/dock/CMakeLists.txt -index 1a20179..83c5ff2 100644 ---- a/panels/dock/CMakeLists.txt -+++ b/panels/dock/CMakeLists.txt -@@ -85,11 +85,11 @@ add_subdirectory(searchitem) - add_subdirectory(launcherItem) - add_subdirectory(showdesktop) - add_subdirectory(taskmanager) --add_subdirectory(tray) -+ add_subdirectory(tray) - add_subdirectory(multitaskview) - - # dock plugin load program --add_subdirectory(dockplugin) -+#add_subdirectory(dockplugin) - - # dock qml element(include Dock.xx defines and DockCompositor) - file( diff --git a/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff b/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff deleted file mode 100644 index cdfad415403e1..0000000000000 --- a/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/panels/dock/tray/CMakeLists.txt b/panels/dock/tray/CMakeLists.txt -index ed6da31..1a33d06 100644 ---- a/panels/dock/tray/CMakeLists.txt -+++ b/panels/dock/tray/CMakeLists.txt -@@ -10,7 +10,7 @@ endif() - - # project(dde-dock) - --find_package(DtkTools REQUIRED) -+find_package(Dtk6Tools REQUIRED) - - set(CMAKE_THREAD_LIBS_INIT "-lpthread") - set(CMAKE_HAVE_THREADS_LIBRARY 1) -diff --git a/panels/dock/tray/frame/CMakeLists.txt b/panels/dock/tray/frame/CMakeLists.txt -index b55aa48..0a397cb 100644 ---- a/panels/dock/tray/frame/CMakeLists.txt -+++ b/panels/dock/tray/frame/CMakeLists.txt -@@ -22,7 +22,7 @@ find_package(Qt6WaylandClient REQUIRED) - find_package(Dtk6Gui REQUIRED) - find_package(Dtk6Core REQUIRED) - find_package(Dtk6Widget REQUIRED) --find_package(DtkCMake REQUIRED) -+find_package(Dtk6CMake REQUIRED) - # find_package(dbusmenu-qt6 REQUIRED) - find_package(ECM REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix new file mode 100644 index 0000000000000..06d76e0398fd2 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix @@ -0,0 +1,69 @@ +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + cmake, + extra-cmake-modules, + pkg-config, + dtkwidget, + dde-qt-dbus-factory, + qt5integration, + qt5platform-plugins, + wayland, + wayland-scanner, + xorg, + libsForQt5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dde-tray-loader"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dde-tray-loader"; + rev = finalAttrs.version; + hash = "sha256-FEvoVgwzDYN23TJxu1kRSMSbS4hELYFFByxOsEO9JKE="; + }; + + patches = [ + (fetchpatch { + name = "remove-useless-function.patch"; + url = "https://github.com/linuxdeepin/dde-tray-loader/commit/cf85f68db52472a0291bbbc3c298d7a2b701e4bc.patch"; + hash = "sha256-ks7Rg5kLQvo03XKbfQaqu/heP2yoVEbNO6UhDv99JBY="; + }) + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + libsForQt5.wrapQtAppsHook + libsForQt5.qttools + wayland-scanner + ]; + + buildInputs = [ + dtkwidget + dde-qt-dbus-factory + qt5integration + qt5platform-plugins + libsForQt5.qtbase + libsForQt5.qtsvg + libsForQt5.qtwayland + libsForQt5.networkmanager-qt + libsForQt5.libdbusmenu + wayland + xorg.libXcursor + xorg.libXtst + ]; + + meta = { + description = "Tray plugins that integrated into task bar"; + homepage = "https://github.com/linuxdeepin/dde-tray-loader"; + license = with lib.licenses; [ gpl3Plus ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ rewine ]; + }; +}) diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4280b290a3e63..4b350abdd1a7d 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,6 +1,5 @@ { lib, - pkgs, config, libsForQt5, }: @@ -39,6 +38,7 @@ let dtk6log = callPackage ./library/dtk6log { }; qt6platform-plugins = callPackage ./library/qt6platform-plugins { }; qt6integration = callPackage ./library/qt6integration { }; + qt6mpris = callPackage ./library/qt6mpris { }; #### CORE deepin-kwin = callPackage ./core/deepin-kwin { }; @@ -48,7 +48,6 @@ let dde-control-center = callPackage ./core/dde-control-center { }; dde-calendar = callPackage ./core/dde-calendar { }; dde-clipboard = callPackage ./core/dde-clipboard { }; - dde-dock = callPackage ./core/dde-dock { }; dde-file-manager = callPackage ./core/dde-file-manager { }; dde-launchpad = callPackage ./core/dde-launchpad { }; dde-network-core = callPackage ./core/dde-network-core { }; @@ -62,6 +61,8 @@ let dde-widgets = callPackage ./core/dde-widgets { }; dde-shell = callPackage ./core/dde-shell { }; dde-grand-search = callPackage ./core/dde-grand-search { }; + dde-tray-loader = callPackage ./core/dde-tray-loader { }; + dde-api-proxy = callPackage ./core/dde-api-proxy { }; #### Dtk Application deepin-album = callPackage ./apps/deepin-album { }; @@ -109,6 +110,7 @@ let // lib.optionalAttrs config.allowAliases { dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27 dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23 + dde-dock = throw "The 'deepin.dde-dock' is no longer maintained. Please use 'deepin.dde-tray-loader' instead."; # added 2024-08-28 deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23 go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index 563057ddebf0b..bbc43448b0441 100644 --- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -24,9 +24,6 @@ tzdata, xkeyboard_config, runtimeShell, - xorg, - xdotool, - getconf, dbus, util-linux, dde-session-ui, diff --git a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix index 34c7b83f818fb..f5da5c8fee71a 100644 --- a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix +++ b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix @@ -6,7 +6,6 @@ cmake, qttools, wrapQtAppsHook, - libisoburn, ncnn, opencv, vulkan-headers, diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix index a283ac1098a9f..e909169a0854d 100644 --- a/pkgs/desktops/deepin/library/docparser/default.nix +++ b/pkgs/desktops/deepin/library/docparser/default.nix @@ -7,17 +7,21 @@ qttools, wrapQtAppsHook, poppler, + pugixml, + libzip, + libuuid, + tinyxml-2, }: stdenv.mkDerivation rec { pname = "docparser"; - version = "1.0.3"; + version = "1.0.11"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-iWRWSu8fALTTLLWdQGbpunN/1tpvKxuN/ZWJg34x0mU="; + hash = "sha256-shZXhs9ncgm6rECvCWrLi26RO1WAc1gRowoYmeKesfk="; }; nativeBuildInputs = [ @@ -27,15 +31,21 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ poppler ]; + buildInputs = [ + poppler + pugixml + libzip + libuuid + tinyxml-2 + ]; qmakeFlags = [ "VERSION=${version}" ]; - meta = with lib; { + meta = { description = "Document parser library ported from document2html"; homepage = "https://github.com/linuxdeepin/docparser"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix index 31bf59583c047..2e8b53dfa7f67 100644 --- a/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6core"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6core"; rev = finalAttrs.version; - hash = "sha256-zyhqkxxWB5U37eBxINNxcbnF5NpImg+E7H1VhfJDz60="; + hash = "sha256-3MwvTnjtVVcMjQa1f4UdagEtWhJj8aDgfUlmnGo/R7s="; }; patches = [ diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix index 83d3140db7e48..ed54eb321cab6 100644 --- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6declarative"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6declarative"; rev = finalAttrs.version; - hash = "sha256-/bQGb87UbnIRWwR6Of67VrRUkrNk6dmY7bjgwDXc30Y"; + hash = "sha256-BxWPLJeuQDbNg4UoyHD/VAMV2QFWDjWZiFx5JOEmLxg="; }; patches = [ diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix index 53ca9621bb266..e6dddb93587f8 100644 --- a/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6gui"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6gui"; rev = finalAttrs.version; - hash = "sha256-w8tyc06v/juTP0YSsyWai1ONl4Aa7dzREIc5wLnI/vw="; + hash = "sha256-nqwkBMcCQiW4iqYhceTaSNNxoR5tvCNfjKUVVHkzN3A="; }; patches = [ @@ -26,6 +26,11 @@ stdenv.mkDerivation (finalAttrs: { ./fix-pri-path.patch ]; + postPatch = '' + substituteInPlace src/util/dsvgrenderer.cpp \ + --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")' + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix index 7e47a4c92ca6a..b76a189b271fe 100644 --- a/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6widget"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6widget"; rev = finalAttrs.version; - hash = "sha256-6H3Dtdyq/adb3jz9lGaKmOguXqvhvZn1/G7+YajyF2k="; + hash = "sha256-VlFzecX76RMNSBpnMc9HwMPZ5z3zzzkcVcNlGKSShyA="; }; patches = [ diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index 1b8c912653660..449a9d4156a14 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { ./fix-pri-path.patch ]; + postPatch = '' + substituteInPlace src/util/dsvgrenderer.cpp \ + --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")' + ''; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix index 07b93c85f74cb..19f6d5f936693 100644 --- a/pkgs/desktops/deepin/library/qt6integration/default.nix +++ b/pkgs/desktops/deepin/library/qt6integration/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "qt6integration"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-7FGOnAAcwOonpMDDukj88s1b4WmLJNu7MZSW7f7P44g="; + hash = "sha256-RVhAuEthrTE1QkRIKmBK4VM86frgAqLMJL31F11H8R8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/library/qt6mpris/default.nix b/pkgs/desktops/deepin/library/qt6mpris/default.nix new file mode 100644 index 0000000000000..71a17256d6c14 --- /dev/null +++ b/pkgs/desktops/deepin/library/qt6mpris/default.nix @@ -0,0 +1,46 @@ +{ + stdenv, + lib, + fetchFromGitHub, + qt6Packages, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qt6mpris"; + version = "1.0.0.1-1deepin1"; + + src = fetchFromGitHub { + owner = "deepin-community"; + repo = "qt6mpris"; + rev = finalAttrs.version; + hash = "sha256-PCdA9q/txaL2Fbr2/4+Z7L4zxWeULl3bq8MVH3i1g3g="; + }; + + postPatch = '' + substituteInPlace src/src.pro \ + --replace-fail '$$[QT_INSTALL_LIBS]' "$out/lib" \ + --replace-fail '$$[QT_INSTALL_HEADERS]' "$out/include" \ + --replace-fail '$$[QMAKE_MKSPECS]' "$out/mkspecs" + substituteInPlace declarative/declarative.pro \ + --replace-fail '$$[QT_INSTALL_QML]' "$out/${qt6Packages.qtbase.qtQmlPrefix}" + ''; + + nativeBuildInputs = [ + qt6Packages.qmake + ]; + + dontWrapQtApps = true; + + buildInputs = [ + qt6Packages.qtbase + qt6Packages.qtdeclarative + ]; + + meta = { + description = "Qt and QML MPRIS interface and adaptor"; + homepage = "https://github.com/deepin-community/qt6mpris"; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +}) diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix index 09bd21a248359..93ac45236ba9e 100644 --- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, pkg-config, mtdev, @@ -13,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qt6platform-plugins"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-O2wylkNKqN0JxKffwFNSfv7S1hPIFrVKwSsppSGTp6I="; + hash = "sha256-aHqm+WKZLoUymiMFfrF3jgWrxgq51d6yTXWiOMsFgiQ="; }; postUnpack = '' diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix index 140b28fc7327b..b7c2071a3868c 100644 --- a/pkgs/desktops/deepin/library/util-dfm/default.nix +++ b/pkgs/desktops/deepin/library/util-dfm/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "util-dfm"; - version = "1.2.24"; + version = "1.3.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-7MuQVkb+xRMtcbB5PQBv6Au/i3ONA0c1whnZ9bMrA/8="; + hash = "sha256-ngDjjdwuYqvyhaUcMNV5PRmGKC3lmY/nJQGOQgRMIQE="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix index 7f4c433914c27..197928a864073 100644 --- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "deepin-desktop-base"; - version = "2024.01.03"; + version = "2024.07.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-45qR1LCnA8ZSrWykqNvvm7Dxbi5pQnAuFy6nZJrzyi0="; + hash = "sha256-JOC8nQ/YgUpY93FcniO2uypAfsL/SNU+KfTrthoZfQo="; }; makeFlags = [ "DESTDIR=${placeholder "out"}" ]; diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 009150c8a38f9..ce6f775378634 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -44,7 +44,6 @@ , openjpeg , openssl , poppler -, python3Packages , systemd , udev , util-linux diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 25faa26687ae4..198dae282dfae 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -16,7 +16,7 @@ , udisks2 , waylandSupport ? false, wayland-protocols, xwayland , bluetoothSupport ? true, bluez5 -, pulseSupport ? !stdenv.isDarwin, libpulseaudio +, pulseSupport ? !stdenv.hostPlatform.isDarwin, libpulseaudio , directoryListingUpdater }: diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 3f8d7c6340963..67af761d3a383 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -5,7 +5,7 @@ lib.makeScope pkgs.newScope (self: with self; { #### PLATFORM libIDL = callPackage ./platform/libIDL { - gettext = if stdenv.isDarwin then pkgs.gettext else null; + gettext = if stdenv.hostPlatform.isDarwin then pkgs.gettext else null; }; ORBit2 = callPackage ./platform/ORBit2 { }; diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 902178d167063..94c3d49a97e0f 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { name = "change-igemacintegration-to-gtkosxapplication.patch"; url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/e88357c5f210a8796104505c090fb6a04c213902.patch"; @@ -28,16 +28,16 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ pkg-config intltool ] ++ lib.optionals stdenv.isDarwin [ autoreconfHook ]; + nativeBuildInputs = [ pkg-config intltool ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ autoreconfHook ]; buildInputs = [ atk cairo glib gtk2 pango libxml2Python perl gettext - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gnome-common gtk-mac-integration-gtk2 ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' intltoolize --force ''; diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 33430f453ab58..ea6730f88e2ee 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ORBit2 libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin - ++ lib.optional (!stdenv.isDarwin) polkit; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) polkit; propagatedBuildInputs = [ glib dbus-glib ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureFlags = # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin - lib.optionals stdenv.isDarwin [ "--enable-static" ]; + lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-static" ]; postPatch = '' 2to3 --write --nobackup gsettings/gsettings-schema-convert diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix deleted file mode 100644 index 0ea81c6d103fd..0000000000000 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, stdenv -, meson -, fetchurl -, python3 -, pkg-config -, gtk4 -, glib -, gtksourceview5 -, gsettings-desktop-schemas -, wrapGAppsHook4 -, ninja -, gnome -, cairo -, enchant -, icu -, itstool -, libadwaita -, editorconfig-core-c -, libxml2 -, desktop-file-utils -}: - -stdenv.mkDerivation rec { - pname = "gnome-text-editor"; - version = "46.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-AFtIEEqQm+Zq4HRI0rxXBsfRE3gQV6JP9tpVvfMkxz0="; - }; - - nativeBuildInputs = [ - desktop-file-utils - itstool - libxml2 # for xmllint - meson - ninja - pkg-config - python3 - wrapGAppsHook4 - ]; - - buildInputs = [ - cairo - enchant - icu - glib - gsettings-desktop-schemas - gtk4 - gtksourceview5 - libadwaita - editorconfig-core-c - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-text-editor"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gnome-text-editor"; - description = "Text Editor for GNOME"; - mainProgram = "gnome-text-editor"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix deleted file mode 100644 index 6c63a486eef76..0000000000000 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, gnome -, adwaita-icon-theme -, meson -, ninja -, pkg-config -, gtk3 -, gettext -, glib -, udev -, itstool -, libxml2 -, wrapGAppsHook3 -, libnotify -, libcanberra-gtk3 -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, python3 -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-bluetooth"; - version = "3.34.5"; - - # TODO: split out "lib" - outputs = [ "out" "dev" "devdoc" "man" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bJSeUsi+zCBU2qzWBJAfZs5c9wml+pHEu3ysyTm1Pqk="; - }; - - patches = [ - # Fix build with meson 0.61. - # sendto/meson.build:24:5: ERROR: Function does not take positional arguments. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/commit/755fd758f866d3a3f7ca482942beee749f13a91e.patch"; - sha256 = "sha256-N0MJ0pYO411o2CTNZHWmEoG2m5TGUjR6YW6HSXHTR/A="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - gettext - itstool - pkg-config - libxml2 - wrapGAppsHook3 - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - python3 - ]; - - buildInputs = [ - glib - gtk3 - udev - libnotify - libcanberra-gtk3 - adwaita-icon-theme - gsettings-desktop-schemas - ]; - - mesonFlags = [ - "-Dicon_update=false" - "-Dgtk_doc=true" - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.gnome-bluetooth_1_0"; - freeze = true; - }; - }; - - meta = with lib; { - homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; - description = "Application that let you manage Bluetooth in the GNOME destkop"; - mainProgram = "bluetooth-sendto"; - maintainers = [ ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix deleted file mode 100644 index 9e4944221c150..0000000000000 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - gnome, - meson, - mesonEmulatorHook, - ninja, - pkg-config, - gtk4, - libadwaita, - gettext, - glib, - udev, - upower, - itstool, - libxml2, - wrapGAppsHook4, - libnotify, - gsound, - gobject-introspection, - gtk-doc, - docbook-xsl-nons, - docbook_xml_dtd_43, - python3, - gsettings-desktop-schemas, -}: - -stdenv.mkDerivation rec { - pname = "gnome-bluetooth"; - version = "46.1"; - - # TODO: split out "lib" - outputs = [ - "out" - "dev" - "devdoc" - "man" - ]; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major version}/gnome-bluetooth-${version}.tar.xz"; - hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw="; - }; - - nativeBuildInputs = [ - meson - ninja - gettext - itstool - pkg-config - libxml2 - wrapGAppsHook4 - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - python3 - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; - - buildInputs = [ - glib - gtk4 - libadwaita - udev - upower - libnotify - gsound - gsettings-desktop-schemas - ]; - - mesonFlags = [ "-Dgtk_doc=true" ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-bluetooth"; - attrPath = "gnome.gnome-bluetooth"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gnome-bluetooth"; - description = "Application that lets you manage Bluetooth in the GNOME desktop"; - mainProgram = "bluetooth-sendto"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix deleted file mode 100644 index 59f8b2b8e746b..0000000000000 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ /dev/null @@ -1,219 +0,0 @@ -{ fetchurl -, lib -, stdenv -, substituteAll -, accountsservice -, adwaita-icon-theme -, colord -, colord-gtk4 -, cups -, dbus -, docbook-xsl-nons -, fontconfig -, gdk-pixbuf -, gettext -, glib -, glib-networking -, gcr_4 -, glibc -, gnome-bluetooth -, gnome-color-manager -, gnome-desktop -, gnome-online-accounts -, gnome-settings-daemon -, gnome-tecla -, gnome -, gsettings-desktop-schemas -, gsound -, gst_all_1 -, gtk4 -, ibus -, json-glib -, libgtop -, libgudev -, libadwaita -, libkrb5 -, libjxl -, libpulseaudio -, libpwquality -, librsvg -, webp-pixbuf-loader -, libsecret -, libsoup_3 -, libwacom -, libXi -, libxml2 -, libxslt -, meson -, modemmanager -, mutter -, networkmanager -, networkmanagerapplet -, libnma-gtk4 -, ninja -, pkg-config -, polkit -, python3 -, samba -, setxkbmap -, shadow -, shared-mime-info -, sound-theme-freedesktop -, tracker -, tracker-miners -, tzdata -, udisks2 -, upower -, libepoxy -, gnome-user-share -, gnome-remote-desktop -, wrapGAppsHook4 -, xorgserver -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gnome-control-center"; - version = "46.4"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-Wb0wWDl3v6KOVCJ+7iEeqG9If81tORXtIfWTJCZxAeA="; - }; - - patches = [ - (substituteAll { - src = ./paths.patch; - gcm = gnome-color-manager; - inherit glibc tzdata shadow; - inherit cups networkmanagerapplet; - }) - ]; - - nativeBuildInputs = [ - docbook-xsl-nons - gettext - libxslt - meson - ninja - pkg-config - python3 - shared-mime-info - wrapGAppsHook4 - ]; - - buildInputs = [ - accountsservice - adwaita-icon-theme - colord - colord-gtk4 - cups - fontconfig - gdk-pixbuf - glib - glib-networking - gcr_4 - gnome-bluetooth - gnome-desktop - gnome-online-accounts - gnome-remote-desktop # optional, sharing panel - gnome-settings-daemon - gnome-tecla - gnome-user-share # optional, sharing panel - gsettings-desktop-schemas - gsound - gtk4 - ibus - json-glib - libepoxy - libgtop - libgudev - libadwaita - libkrb5 - libnma-gtk4 - libpulseaudio - libpwquality - librsvg - libsecret - libsoup_3 - libwacom - libXi - libxml2 - modemmanager - mutter # schemas for the keybindings - networkmanager - polkit - samba - tracker - tracker-miners # for search locations dialog - udisks2 - upower - ] ++ (with gst_all_1; [ - # For animations in Mouse panel. - gst-plugins-base - gst-plugins-good - ]); - - nativeCheckInputs = [ - dbus - python3.pkgs.pygobject3 # for test-networkmanager-service.py - python3.pkgs.python-dbusmock - setxkbmap - xorgserver # for Xvfb - ]; - - doCheck = true; - - preConfigure = '' - # For ITS rules - addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" - ''; - - preCheck = '' - # Basically same as https://github.com/NixOS/nixpkgs/pull/141299 - export ADW_DISABLE_PORTAL=1 - export XDG_DATA_DIRS=${glib.getSchemaDataDirPath gsettings-desktop-schemas} - ''; - - postInstall = '' - # Pull in WebP and JXL support for gnome-backgrounds. - # In postInstall to run before gappsWrapperArgsHook. - export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE { - extraLoaders = [ - libjxl - librsvg - webp-pixbuf-loader - ]; - }}" - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" - # Thumbnailers (for setting user profile pictures) - --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" - --prefix XDG_DATA_DIRS : "${librsvg}/share" - # WM keyboard shortcuts - --prefix XDG_DATA_DIRS : "${mutter}/share" - ) - for i in $out/share/applications/*; do - substituteInPlace $i --replace "Exec=gnome-control-center" "Exec=$out/bin/gnome-control-center" - done - ''; - - separateDebugInfo = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-control-center"; - attrPath = "gnome.gnome-control-center"; - }; - }; - - meta = with lib; { - description = "Utilities to configure the GNOME desktop"; - mainProgram = "gnome-control-center"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix deleted file mode 100644 index f7aa278fe8cc9..0000000000000 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ /dev/null @@ -1,136 +0,0 @@ -{ fetchurl -, lib -, stdenv -, substituteAll -, meson -, ninja -, pkg-config -, gnome -, adwaita-icon-theme -, glib -, gtk3 -, gsettings-desktop-schemas -, gnome-desktop -, dbus -, json-glib -, libICE -, xmlto -, docbook_xsl -, docbook_xml_dtd_412 -, python3 -, libxslt -, gettext -, makeWrapper -, systemd -, xorg -, libepoxy -, bash -, gnome-session-ctl -}: - -stdenv.mkDerivation rec { - pname = "gnome-session"; - # Also bump ./ctl.nix when bumping major version. - version = "46.0"; - - outputs = [ "out" "sessions" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-xuFiSvYJC8ThoZH+Imir+nqN4HgxynpX8hfmeb97mlQ="; - }; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - gsettings = "${glib.bin}/bin/gsettings"; - dbusLaunch = "${dbus.lib}/bin/dbus-launch"; - bash = "${bash}/bin/bash"; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - makeWrapper - xmlto - libxslt - docbook_xsl - docbook_xml_dtd_412 - python3 - dbus # for DTD - ]; - - buildInputs = [ - glib - gtk3 - libICE - gnome-desktop - json-glib - xorg.xtrans - adwaita-icon-theme - gnome.gnome-settings-daemon - gsettings-desktop-schemas - systemd - libepoxy - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - - # Use our provided `gnome-session-ctl` - original="@libexecdir@/gnome-session-ctl" - replacement="${gnome-session-ctl}/libexec/gnome-session-ctl" - - find data/ -type f -name "*.service.in" -exec sed -i \ - -e s,$original,$replacement,g \ - {} + - ''; - - # We move the GNOME sessions to another output since gnome-session is a dependency of - # GDM itself. If we do not hide them, it will show broken GNOME sessions when GDM is - # enabled without proper GNOME installation. - postInstall = '' - mkdir $sessions - moveToOutput share/wayland-sessions "$sessions" - moveToOutput share/xsessions "$sessions" - - # Our provided one is being used - rm -rf $out/libexec/gnome-session-ctl - ''; - - # `bin/gnome-session` will reset the environment when run in wayland, we - # therefor wrap `libexec/gnome-session-binary` instead which is the actual - # binary needing wrapping - preFixup = '' - wrapProgram "$out/libexec/gnome-session-binary" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share" \ - --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" - ''; - - separateDebugInfo = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-session"; - attrPath = "gnome.gnome-session"; - }; - providedSessions = [ - "gnome" - "gnome-xorg" - ]; - }; - - meta = with lib; { - description = "GNOME session manager"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-session"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix deleted file mode 100644 index 6e87a2ab6e3b5..0000000000000 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ stdenv -, lib -, fetchpatch -, substituteAll -, fetchurl -, meson -, ninja -, pkg-config -, gnome -, perl -, gettext -, gtk3 -, glib -, libnotify -, libgnomekbd -, lcms2 -, libpulseaudio -, alsa-lib -, libcanberra-gtk3 -, upower -, colord -, libgweather -, polkit -, gsettings-desktop-schemas -, geoclue2 -, systemd -, libgudev -, libwacom -, libxslt -, libxml2 -, modemmanager -, networkmanager -, gnome-desktop -, geocode-glib_2 -, docbook_xsl -, wrapGAppsHook3 -, python3 -, tzdata -, nss -, gcr_4 -, gnome-session-ctl -}: - -stdenv.mkDerivation rec { - pname = "gnome-settings-daemon"; - version = "43.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A="; - }; - - patches = [ - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/aae1e774dd9de22fe3520cf9eb2bfbf7216f5eb0.patch"; - sha256 = "O4m0rOW8Zrgu3Q0p0OA8b951VC0FjYbOUk9MLzB9icI="; - }) - - (substituteAll { - src = ./fix-paths.patch; - inherit tzdata; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - perl - gettext - libxml2 - libxslt - docbook_xsl - wrapGAppsHook3 - python3 - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - modemmanager - networkmanager - libnotify - libgnomekbd # for org.gnome.libgnomekbd.keyboard schema - gnome-desktop - lcms2 - libpulseaudio - alsa-lib - libcanberra-gtk3 - upower - colord - libgweather - nss - polkit - geocode-glib_2 - geoclue2 - systemd - libgudev - libwacom - gcr_4 - ]; - - mesonFlags = [ - "-Dudev_dir=${placeholder "out"}/lib/udev" - "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" - ]; - - # Default for release buildtype but passed manually because - # we're using plain - env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; - - postPatch = '' - for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do - chmod +x $f - patchShebangs $f - done - ''; - - meta = with lib; { - description = "GNOME Settings Daemon"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"; - license = licenses.gpl2Plus; - maintainers = teams.pantheon.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix deleted file mode 100644 index 4284a68ee3e70..0000000000000 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ stdenv -, lib -, substituteAll -, fetchurl -, meson -, ninja -, pkg-config -, gnome -, perl -, gettext -, gtk3 -, glib -, libnotify -, libgnomekbd -, libpulseaudio -, alsa-lib -, libcanberra-gtk3 -, upower -, colord -, libgweather -, polkit -, gsettings-desktop-schemas -, geoclue2 -, systemd -, libgudev -, libwacom -, libxslt -, libxml2 -, modemmanager -, networkmanager -, gnome-desktop -, geocode-glib_2 -, docbook_xsl -, wrapGAppsHook3 -, python3 -, tzdata -, gcr_4 -, gnome-session-ctl -}: - -stdenv.mkDerivation rec { - pname = "gnome-settings-daemon"; - version = "46.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c="; - }; - - patches = [ - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 - ./add-gnome-session-ctl-option.patch - - (substituteAll { - src = ./fix-paths.patch; - inherit tzdata; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - perl - gettext - libxml2 - libxslt - docbook_xsl - wrapGAppsHook3 - python3 - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - modemmanager - networkmanager - libnotify - libgnomekbd # for org.gnome.libgnomekbd.keyboard schema - gnome-desktop - libpulseaudio - alsa-lib - libcanberra-gtk3 - upower - colord - libgweather - polkit - geocode-glib_2 - geoclue2 - systemd - libgudev - libwacom - gcr_4 - ]; - - mesonFlags = [ - "-Dudev_dir=${placeholder "out"}/lib/udev" - "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" - ]; - - # Default for release buildtype but passed manually because - # we're using plain - env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; - - - postPatch = '' - for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do - chmod +x $f - patchShebangs $f - done - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; - }; - }; - - meta = with lib; { - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix deleted file mode 100644 index f84908eff0741..0000000000000 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ /dev/null @@ -1,239 +0,0 @@ -{ fetchurl -, fetchpatch -, substituteAll -, lib, stdenv -, meson -, ninja -, pkg-config -, gnome -, json-glib -, gettext -, libsecret -, python3 -, polkit -, networkmanager -, gi-docgen -, at-spi2-core -, unzip -, shared-mime-info -, libgweather -, libjxl -, librsvg -, webp-pixbuf-loader -, geoclue2 -, perl -, desktop-file-utils -, libpulseaudio -, libical -, gobject-introspection -, wrapGAppsHook4 -, libxslt -, gcr_4 -, accountsservice -, gdk-pixbuf -, gdm -, upower -, ibus -, libnma-gtk4 -, gnome-desktop -, gsettings-desktop-schemas -, gnome-keyring -, glib -, gjs -, mutter -, evolution-data-server-gtk4 -, gtk4 -, libadwaita -, sassc -, systemd -, pipewire -, gst_all_1 -, adwaita-icon-theme -, gnome-bluetooth -, gnome-clocks -, gnome-settings-daemon -, gnome-autoar -, gnome-tecla -, asciidoc -, bash-completion -, mesa -, libGL -, libXi -, libX11 -, libxml2 -}: - -let - pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]); -in -stdenv.mkDerivation (finalAttrs: { - pname = "gnome-shell"; - version = "46.4"; - - outputs = [ "out" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-GIRo/nLpCsSyNOnU0HB9YH/q85oT0lvTqj63XlWj4FI="; - }; - - patches = [ - # Hardcode paths to various dependencies so that they can be found at runtime. - (substituteAll { - src = ./fix-paths.patch; - glib_compile_schemas = "${glib.dev}/bin/glib-compile-schemas"; - gsettings = "${glib.bin}/bin/gsettings"; - tecla = "${lib.getBin gnome-tecla}/bin/tecla"; - unzip = "${lib.getBin unzip}/bin/unzip"; - }) - - # Use absolute path for libshew installation to make our patched gobject-introspection - # aware of the location to hardcode in the generated GIR file. - ./shew-gir-path.patch - - # Make D-Bus services wrappable. - ./wrap-services.patch - - # Fix greeter logo being too big. - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2591 - # Reverts https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1101 - ./greeter-logo-size.patch - - # Work around failing fingerprint auth - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/dcd112d9708954187e7490564c2229d82ba5326f/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; - hash = "sha256-mgXty5HhiwUO1UV3/eDgWtauQKM0cRFQ0U7uocST25s="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - gi-docgen - perl - wrapGAppsHook4 - sassc - desktop-file-utils - libxslt.bin - asciidoc - gobject-introspection - ]; - - buildInputs = [ - systemd - gsettings-desktop-schemas - gnome-keyring - glib - gcr_4 - accountsservice - libsecret - polkit - gdk-pixbuf - librsvg - networkmanager - gjs - mutter - libpulseaudio - evolution-data-server-gtk4 - libical - gtk4 - libadwaita - gdm - geoclue2 - adwaita-icon-theme - gnome-bluetooth - gnome-clocks # schemas needed - at-spi2-core - upower - ibus - gnome-desktop - gnome-settings-daemon - mesa - libGL # for egl, required by mutter-clutter - libXi # required by libmutter - libX11 - libxml2 - - # recording - pipewire - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - - # not declared at build time, but typelib is needed at runtime - libgweather - libnma-gtk4 - - # for gnome-extension tool - bash-completion - gnome-autoar - json-glib - - # for tools - pythonEnv - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - "-Dtests=false" - ]; - - postPatch = '' - patchShebangs src/data-to-c.pl - - # We can generate it ourselves. - rm -f man/gnome-shell.1 - rm data/theme/gnome-shell-{light,dark}.css - ''; - - postInstall = '' - # Pull in WebP and JXL support for gnome-backgrounds. - # In postInstall to run before gappsWrapperArgsHook. - export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE { - extraLoaders = [ - libjxl - librsvg - webp-pixbuf-loader - ]; - }}" - ''; - - preFixup = '' - gappsWrapperArgs+=( - # Until glib’s xdgmime is patched - # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format” - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - postFixup = '' - # The services need typelibs. - for svc in org.gnome.ScreenSaver org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do - wrapGApp $out/share/gnome-shell/$svc - done - - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - separateDebugInfo = true; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - updateScript = gnome.updateScript { - packageName = "gnome-shell"; - attrPath = "gnome.gnome-shell"; - }; - }; - - meta = with lib; { - description = "Core user interface for the GNOME 3 desktop"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-shell"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; - -}) diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix deleted file mode 100644 index 0cc5c596bb5c2..0000000000000 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, gettext -, meson -, ninja -, fetchurl -, pkg-config -, gtk4 -, glib -, gdk-pixbuf -, desktop-file-utils -, appstream-glib -, wrapGAppsHook4 -, python3 -, gnome -, libadwaita -, librsvg -, rustc -, cargo -}: - -stdenv.mkDerivation rec { - pname = "gnome-tour"; - version = "46.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-8yZSqp1+8GQ3YM5jkyCCz9NkHnczt2xCm3jQl4O3xGo="; - }; - - cargoVendorDir = "vendor"; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - appstream-glib - cargo - desktop-file-utils - gettext - glib # glib-compile-resources - meson - ninja - pkg-config - python3 - rustPlatform.cargoSetupHook - rustc - wrapGAppsHook4 - ]; - - buildInputs = [ - gdk-pixbuf - glib - gtk4 - libadwaita - librsvg - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gnome-tour"; - description = "GNOME Greeter & Tour"; - mainProgram = "gnome-tour"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/desktops/gnome/core/mutter/43/default.nix deleted file mode 100644 index cef4edf84c0ff..0000000000000 --- a/pkgs/desktops/gnome/core/mutter/43/default.nix +++ /dev/null @@ -1,196 +0,0 @@ -{ fetchurl -, runCommand -, lib -, fetchpatch -, stdenv -, pkg-config -, gnome -, gettext -, gobject-introspection -, cairo -, colord -, lcms2 -, pango -, json-glib -, libstartup_notification -, libcanberra -, ninja -, xvfb-run -, xkeyboard_config -, libxcvt -, libxkbfile -, libXdamage -, libxkbcommon -, libXtst -, libinput -, libdrm -, gsettings-desktop-schemas -, glib -, gtk3 -, gnome-desktop -, pipewire -, libgudev -, libwacom -, xwayland -, mesa -, meson -, gnome-settings-daemon -, xorgserver -, python3 -, wayland-scanner -, wrapGAppsHook3 -, gi-docgen -, sysprof -, libsysprof-capture -, desktop-file-utils -, libcap_ng -, egl-wayland -, graphene -, wayland -, wayland-protocols -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "mutter"; - version = "43.8"; - - outputs = [ "out" "dev" "man" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "TjTh8XWTS9hJqEvZX6Nb8G6EEuAt8loDbC8RNdUz8oE="; - }; - - patches = [ - # Fix build with separate sysprof. - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; - sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; - }) - - # Remove support for window shading. - # The corresponding key was removed in gsettings-desktop-schemas 45.alpha. - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2884 - # - # Fetch the patch from magpie as they share same code base and this feature - # is never supported on wayland (note that magpie 0.9.x won't support wayland). - # https://github.com/BuddiesOfBudgie/magpie/issues/9 - (fetchpatch { - url = "https://github.com/BuddiesOfBudgie/magpie/commit/4177c466375462ca8ed8fdb60913df4422f19144.patch"; - sha256 = "NVx40WDnlUL050D529KVohvNBdVrheXxmJ73U3+KSeQ="; - }) - ]; - - mesonFlags = [ - "-Degl_device=true" - "-Dinstalled_tests=false" # TODO: enable these - "-Dwayland_eglstream=true" - "-Dprofiler=true" - "-Dxwayland_path=${lib.getExe xwayland}" - # This should be auto detected, but it looks like it manages a false - # positive. - "-Dxwayland_initfd=disabled" - "-Ddocs=true" - ]; - - propagatedBuildInputs = [ - # required for pkg-config to detect mutter-clutter - json-glib - libXtst - libcap_ng - graphene - ]; - - nativeBuildInputs = [ - desktop-file-utils - gettext - libxcvt - mesa # needed for gbm - meson - ninja - xvfb-run - pkg-config - python3 - wayland-scanner - wrapGAppsHook3 - gi-docgen - xorgserver - gobject-introspection - ]; - - buildInputs = [ - cairo - egl-wayland - glib - gnome-desktop - gnome-settings-daemon - gsettings-desktop-schemas - gtk3 - libcanberra - libdrm - libgudev - libinput - libstartup_notification - libwacom - libxkbcommon - libxkbfile - libXdamage - colord - lcms2 - pango - pipewire - sysprof # for D-Bus interfaces - libsysprof-capture - xkeyboard_config - xwayland - wayland - wayland-protocols - ]; - - postPatch = '' - patchShebangs src/backends/native/gen-default-modes.py - - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3187 - substituteInPlace meson.build \ - --replace "dependency('sysprof-4')" "dependency('sysprof-6')" - ''; - - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - # TODO: Move this into a directory devhelp can find. - moveToOutput "share/mutter-11/doc" "$devdoc" - ''; - - # Install udev files into our own tree. - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; - - separateDebugInfo = true; - - passthru = { - libdir = "${finalAttrs.finalPackage}/lib/mutter-11"; - - tests = { - libdirExists = runCommand "mutter-libdir-exists" {} '' - if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then - echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one." - exit 1 - fi - touch $out - ''; - }; - }; - - meta = with lib; { - description = "Window manager for GNOME"; - mainProgram = "mutter"; - homepage = "https://gitlab.gnome.org/GNOME/mutter"; - license = licenses.gpl2Plus; - maintainers = teams.pantheon.members; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix deleted file mode 100644 index 78b21f4d215f2..0000000000000 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ /dev/null @@ -1,210 +0,0 @@ -{ fetchurl -, runCommand -, lib -, stdenv -, pkg-config -, gnome -, gettext -, gobject-introspection -, cairo -, colord -, lcms2 -, pango -, libstartup_notification -, libcanberra -, ninja -, xvfb-run -, libxcvt -, libICE -, libX11 -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXtst -, libxkbfile -, xkeyboard_config -, libxkbcommon -, libXrender -, libxcb -, libXrandr -, libXinerama -, libXau -, libinput -, libdrm -, libei -, libdisplay-info -, gsettings-desktop-schemas -, glib -, atk -, gtk4 -, fribidi -, harfbuzz -, gnome-desktop -, pipewire -, libgudev -, libwacom -, libSM -, xwayland -, mesa -, meson -, gnome-settings-daemon -, xorgserver -, python3 -, wayland-scanner -, wrapGAppsHook4 -, gi-docgen -, sysprof -, libsysprof-capture -, desktop-file-utils -, egl-wayland -, graphene -, wayland -, wayland-protocols -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "mutter"; - version = "46.4"; - - outputs = [ "out" "dev" "man" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-YRvZz5gq21ZZfOKzQiQnL9phm7O7kSpoTXXG8sN1AuQ="; - }; - - mesonFlags = [ - "-Degl_device=true" - "-Dinstalled_tests=false" # TODO: enable these - "-Dtests=false" - "-Dwayland_eglstream=true" - "-Dprofiler=true" - "-Dxwayland_path=${lib.getExe xwayland}" - # This should be auto detected, but it looks like it manages a false - # positive. - "-Dxwayland_initfd=disabled" - "-Ddocs=true" - ]; - - propagatedBuildInputs = [ - # required for pkg-config to detect mutter-mtk - graphene - ]; - - nativeBuildInputs = [ - desktop-file-utils - gettext - libxcvt - mesa # needed for gbm - meson - ninja - xvfb-run - pkg-config - python3 - wayland-scanner - wrapGAppsHook4 - gi-docgen - xorgserver - gobject-introspection - ]; - - buildInputs = [ - cairo - egl-wayland - glib - gnome-desktop - gnome-settings-daemon - gsettings-desktop-schemas - atk - fribidi - harfbuzz - libcanberra - libdrm - libei - libdisplay-info - libgudev - libinput - libstartup_notification - libwacom - libSM - colord - lcms2 - pango - pipewire - sysprof # for D-Bus interfaces - libsysprof-capture - xwayland - wayland - wayland-protocols - ] ++ [ - # X11 client - gtk4 - libICE - libX11 - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXtst - libxkbfile - xkeyboard_config - libxkbcommon - libXrender - libxcb - libXrandr - libXinerama - libXau - ]; - - postPatch = '' - patchShebangs src/backends/native/gen-default-modes.py - ''; - - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - # TODO: Move this into a directory devhelp can find. - moveToOutput "share/mutter-14/doc" "$devdoc" - ''; - - # Install udev files into our own tree. - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; - - separateDebugInfo = true; - - passthru = { - libdir = "${finalAttrs.finalPackage}/lib/mutter-14"; - - tests = { - libdirExists = runCommand "mutter-libdir-exists" {} '' - if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then - echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one." - exit 1 - fi - touch $out - ''; - }; - - updateScript = gnome.updateScript { - packageName = "mutter"; - attrPath = "gnome.mutter"; - }; - }; - - meta = with lib; { - description = "Window manager for GNOME"; - mainProgram = "mutter"; - homepage = "https://gitlab.gnome.org/GNOME/mutter"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index a81a5ea463507..edb942833123c 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -17,66 +17,10 @@ in #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; - - gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { }; - - gnome-control-center = callPackage ./core/gnome-control-center { }; - - gnome-session = callPackage ./core/gnome-session { }; - - gnome-session-ctl = callPackage ./core/gnome-session/ctl.nix { }; - - gnome-shell = callPackage ./core/gnome-shell { }; - - gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; - - # Using 43 to match Mutter used in Pantheon - gnome-settings-daemon43 = callPackage ./core/gnome-settings-daemon/43 { }; - gvfs = pkgs.gvfs.override { gnomeSupport = true; }; - mutter = callPackage ./core/mutter { }; - - # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided - mutter43 = callPackage ./core/mutter/43 { }; - - networkmanager-openvpn = pkgs.networkmanager-openvpn.override { - withGnome = true; - }; - - networkmanager-vpnc = pkgs.networkmanager-vpnc.override { - withGnome = true; - }; - - networkmanager-openconnect = pkgs.networkmanager-openconnect.override { - withGnome = true; - }; - - networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { - withGnome = true; - }; - - networkmanager-l2tp = pkgs.networkmanager-l2tp.override { - withGnome = true; - }; - - networkmanager-iodine = pkgs.networkmanager-iodine.override { - withGnome = true; - }; - nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { }; -#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - - gnome-applets = callPackage ./misc/gnome-applets { }; - - gnome-flashback = callPackage ./misc/gnome-flashback { }; - - gnome-panel = callPackage ./misc/gnome-panel { }; - - gnome-panel-with-modules = callPackage ./misc/gnome-panel/wrapper.nix { }; - }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22. @@ -107,8 +51,11 @@ in geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22. ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22. + gnome-applets = lib.warn "The ‘gnome.gnome-applets’ was moved to top-level. Please use ‘pkgs.gnome-applets’ directly." pkgs.gnome-applets; # Added on 2024-08-31. gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13. gnome-backgrounds = lib.warn "The ‘gnome.gnome-backgrounds’ was moved to top-level. Please use ‘pkgs.gnome-backgrounds’ directly." pkgs.gnome-backgrounds; # Added on 2024-08-11. + gnome-bluetooth = lib.warn "The ‘gnome.gnome-bluetooth’ was moved to top-level. Please use ‘pkgs.gnome-bluetooth’ directly." pkgs.gnome-bluetooth; # Added on 2024-08-28. + gnome-bluetooth_1_0 = lib.warn "The ‘gnome.gnome-bluetooth_1_0’ was moved to top-level. Please use ‘pkgs.gnome-bluetooth_1_0’ directly." pkgs.gnome-bluetooth_1_0; # Added on 2024-08-28. gnome-boxes = lib.warn "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly." pkgs.gnome-boxes; # Added on 2024-08-11. gnome-characters = lib.warn "The ‘gnome.gnome-characters’ was moved to top-level. Please use ‘pkgs.gnome-characters’ directly." pkgs.gnome-characters; # Added on 2024-08-11. gnome-chess = lib.warn "The ‘gnome.gnome-chess’ was moved to top-level. Please use ‘pkgs.gnome-chess’ directly." pkgs.gnome-chess; # Added on 2024-08-11. @@ -118,8 +65,10 @@ in gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22. gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22. gnome-contacts = lib.warn "The ‘gnome.gnome-contacts’ was moved to top-level. Please use ‘pkgs.gnome-contacts’ directly." pkgs.gnome-contacts; # Added on 2024-08-11. + gnome-control-center = lib.warn "The ‘gnome.gnome-control-center’ was moved to top-level. Please use ‘pkgs.gnome-control-center’ directly." pkgs.gnome-control-center; # Added on 2024-08-28. gnome-dictionary = lib.warn "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly." pkgs.gnome-dictionary; # Added on 2024-06-22. gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22. + gnome-flashback = lib.warn "The ‘gnome.gnome-flashback’ was moved to top-level. Please use ‘pkgs.gnome-flashback’ directly." pkgs.gnome-flashback; # Added on 2024-08-31. gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22. gnome-initial-setup = lib.warn "The ‘gnome.gnome-initial-setup’ was moved to top-level. Please use ‘pkgs.gnome-initial-setup’ directly." pkgs.gnome-initial-setup; # Added on 2024-08-11. gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22. @@ -133,10 +82,17 @@ in gnome-nibbles = lib.warn "The ‘gnome.gnome-nibbles’ was moved to top-level. Please use ‘pkgs.gnome-nibbles’ directly." pkgs.gnome-nibbles; # Added on 2024-08-11. gnome-notes = lib.warn "The ‘gnome.gnome-notes’ was moved to top-level. Please use ‘pkgs.gnome-notes’ directly." pkgs.gnome-notes; # Added on 2024-08-11. gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. + gnome-panel = lib.warn "The ‘gnome.gnome-panel’ was moved to top-level. Please use ‘pkgs.gnome-panel’ directly." pkgs.gnome-panel; # Added on 2024-08-31. + gnome-panel-with-modules = lib.warn "The ‘gnome.gnome-panel-with-modules’ was moved to top-level. Please use ‘pkgs.gnome-panel-with-modules’ directly." pkgs.gnome-panel-with-modules; # Added on 2024-08-31. gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11. gnome-remote-desktop = lib.warn "The ‘gnome.gnome-remote-desktop’ was moved to top-level. Please use ‘pkgs.gnome-remote-desktop’ directly." pkgs.gnome-remote-desktop; # Added on 2024-08-11. gnome-robots = lib.warn "The ‘gnome.gnome-robots’ was moved to top-level. Please use ‘pkgs.gnome-robots’ directly." pkgs.gnome-robots; # Added on 2024-08-11. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. + gnome-session = lib.warn "The ‘gnome.gnome-session’ was moved to top-level. Please use ‘pkgs.gnome-session’ directly." pkgs.gnome-session; # Added on 2024-08-28. + gnome-session-ctl = lib.warn "The ‘gnome.gnome-session-ctl’ was moved to top-level. Please use ‘pkgs.gnome-session-ctl’ directly." pkgs.gnome-session-ctl; # Added on 2024-08-28. + gnome-settings-daemon = lib.warn "The ‘gnome.gnome-settings-daemon’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon’ directly." pkgs.gnome-settings-daemon; # Added on 2024-08-28. + gnome-settings-daemon43 = lib.warn "The ‘gnome.gnome-settings-daemon43’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon43’ directly." pkgs.gnome-settings-daemon43; # Added on 2024-08-28. + gnome-shell = lib.warn "The ‘gnome.gnome-shell’ was moved to top-level. Please use ‘pkgs.gnome-shell’ directly." pkgs.gnome-shell; # Added on 2024-08-28. gnome-shell-extensions = lib.warn "The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly." pkgs.gnome-shell-extensions; # Added on 2024-08-11. gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11. gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11. @@ -156,7 +112,15 @@ in iagno = lib.warn "The ‘gnome.iagno’ was moved to top-level. Please use ‘pkgs.iagno’ directly." pkgs.iagno; # Added on 2024-08-11. lightsoff = lib.warn "The ‘gnome.lightsoff’ was moved to top-level. Please use ‘pkgs.lightsoff’ directly." pkgs.lightsoff; # Added on 2024-08-11. metacity = lib.warn "The ‘gnome.metacity’ was moved to top-level. Please use ‘pkgs.metacity’ directly." pkgs.metacity; # Added on 2024-08-11. + mutter = lib.warn "The ‘gnome.mutter’ was moved to top-level. Please use ‘pkgs.mutter’ directly." pkgs.mutter; # Added on 2024-08-28. + mutter43 = lib.warn "The ‘gnome.mutter43’ was moved to top-level. Please use ‘pkgs.mutter43’ directly." pkgs.mutter43; # Added on 2024-08-28. nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. + networkmanager-openvpn = lib.warn "The ‘gnome.networkmanager-openvpn’ was moved to top-level. Please use ‘pkgs.networkmanager-openvpn’ directly." pkgs.networkmanager-openvpn; # Added on 2024-08-31. + networkmanager-vpnc = lib.warn "The ‘gnome.networkmanager-vpnc’ was moved to top-level. Please use ‘pkgs.networkmanager-vpnc’ directly." pkgs.networkmanager-vpnc; # Added on 2024-08-31. + networkmanager-openconnect = lib.warn "The ‘gnome.networkmanager-openconnect’ was moved to top-level. Please use ‘pkgs.networkmanager-openconnect’ directly." pkgs.networkmanager-openconnect; # Added on 2024-08-31. + networkmanager-fortisslvpn = lib.warn "The ‘gnome.networkmanager-fortisslvpn’ was moved to top-level. Please use ‘pkgs.networkmanager-fortisslvpn’ directly." pkgs.networkmanager-fortisslvpn; # Added on 2024-08-31. + networkmanager-l2tp = lib.warn "The ‘gnome.networkmanager-l2tp’ was moved to top-level. Please use ‘pkgs.networkmanager-l2tp’ directly." pkgs.networkmanager-l2tp; # Added on 2024-08-31. + networkmanager-iodine = lib.warn "The ‘gnome.networkmanager-iodine’ was moved to top-level. Please use ‘pkgs.networkmanager-iodine’ directly." pkgs.networkmanager-iodine; # Added on 2024-08-31. nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13. polari = lib.warn "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly." pkgs.polari; # Added on 2024-08-11. pomodoro = lib.warn "The ‘gnome.pomodoro’ was moved to top-level. Please use ‘pkgs.gnome-pomodoro’ directly." pkgs.gnome-pomodoro; # Added on 2024-06-22. diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix index ea371ae6efd8f..8feb342638c9a 100644 --- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext, jq, intltool }: +{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome-shell, gettext, jq, intltool }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extension-EasyScreenCast"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "EasyScreenCast"; repo = "EasyScreenCast"; rev = finalAttrs.version; - hash = "sha256-rRRMFAdWseTxW6W194TE3yNlnpPX7gLViLPLQW6zuSI="; + hash = "sha256-5PJB+lm4NKeNpS2vg9xaVl5aUR0Rofmt6sEKXfuGG6c="; }; patches = [ (substituteAll { src = ./fix-gi-path.patch; - gnomeShell = gnome.gnome-shell; + gnomeShell = gnome-shell; }) ]; diff --git a/pkgs/desktops/gnome/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix index 1f749574c40c2..919dfb68de046 100644 --- a/pkgs/desktops/gnome/extensions/clock-override/default.nix +++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, gnome, gettext, glib }: +{ lib, stdenv, fetchzip, gnome-shell, gettext, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-clock-override"; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override"; - broken = versionOlder gnome.gnome-shell.version "3.18"; + broken = versionOlder gnome-shell.version "3.18"; }; } diff --git a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix index 3d4108eafdf70..0eeaea47befde 100644 --- a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix +++ b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix @@ -4,6 +4,7 @@ , ninja , python3 , gnome +, gnome-shell , wrapGAppsNoGuiHook , gobject-introspection }: @@ -30,7 +31,7 @@ buildPythonApplication rec { ]; buildInputs = [ - gnome.gnome-shell + gnome-shell ]; pythonPath = [ diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index ca5c939de2638..97270194bdb02 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -13,7 +13,7 @@ , glib-networking , gtk3 , openssh -, gnome +, gnome-shell , evolution-data-server-gtk4 , gjs , nixosTests @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgnome_shell_libdir=${gnome.gnome-shell}/lib" + "-Dgnome_shell_libdir=${gnome-shell}/lib" "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts" "-Dopenssl_path=${openssl}/bin/openssl" diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix index b5b2ae8ec7471..f93c96f30191f 100644 --- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome }: +{ lib, stdenv, fetchFromGitHub, gnome-shell }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-icon-hider"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Icon Hider is a GNOME Shell extension for managing status area items"; license = licenses.bsd3; - maintainers = with maintainers; [ jonafato ]; - platforms = gnome.gnome-shell.meta.platforms; + maintainers = with maintainers; [ ]; + platforms = gnome-shell.meta.platforms; homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider"; - broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix index 8f6a49fa86898..6e4530817f909 100644 --- a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Integrates maximized windows with the top panel"; homepage = "https://github.com/poehlerj/no-title-bar"; license = licenses.gpl2; - maintainers = with maintainers; [ jonafato svsdep ]; + maintainers = with maintainers; [ svsdep ]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix index 200ca9a63e5cc..3dc9fa61b7473 100644 --- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glib, gnome }: +{ lib, stdenv, fetchFromGitHub, glib, gnome-shell }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-pidgin-im-integration"; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = [ ]; - broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix index cf96cdfc6723e..f4e50f46bb257 100644 --- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME Shell TaskWarrior GUI"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jonafato ]; + maintainers = with maintainers; [ ]; homepage = "https://github.com/cinatic/taskwhisperer"; }; } diff --git a/pkgs/desktops/gnome/extensions/tilingnome/default.nix b/pkgs/desktops/gnome/extensions/tilingnome/default.nix index fbf89ffa19c90..3e6a2efb990fb 100644 --- a/pkgs/desktops/gnome/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, glib, gnome }: +{ stdenv, lib, fetchFromGitHub, glib, gnome-shell }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-tilingnome"; @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ benley ]; homepage = "https://github.com/rliang/gnome-shell-extension-tilingnome"; - platforms = gnome.gnome-shell.meta.platforms; + platforms = gnome-shell.meta.platforms; }; } diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix index c39d430c937a2..dbc7e96df3eea 100644 --- a/pkgs/desktops/gnome/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, gnome, fetchFromGitHub, xprop, glib }: +{ lib, stdenv, gnome-shell, fetchFromGitHub, xprop, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; - version = "79"; + version = "80"; src = fetchFromGitHub { owner = "hardpixel"; repo = "unite-shell"; rev = "v${version}"; - hash = "sha256-OyxNibjQn7VBEdAPUaGd0MEgzCzpaFqViMKhF52haUI="; + hash = "sha256-mK5EoGlfJ6JGQkKuYFg1wxwyL5p+woIlJfkj9UWozio="; }; passthru = { @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://github.com/hardpixel/unite-shell"; - broken = versionOlder gnome.gnome-shell.version "3.32"; + broken = versionOlder gnome-shell.version "3.32"; }; } diff --git a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix index 48d80545ecca5..e8d43bb158312 100644 --- a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome }: +{ lib, stdenv, fetchFromGitHub, gnome-shell }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-window-corner-preview"; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ ]; homepage = "https://github.com/medenagan/window-corner-preview"; - broken = lib.versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = lib.versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome/games/gnome-2048/default.nix b/pkgs/desktops/gnome/games/gnome-2048/default.nix deleted file mode 100644 index fc04ee0b8f1e7..0000000000000 --- a/pkgs/desktops/gnome/games/gnome-2048/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, wrapGAppsHook3 -, meson -, vala -, pkg-config -, ninja -, itstool -, clutter-gtk -, libgee -, libgnome-games-support -, gnome -, gtk3 -}: - -stdenv.mkDerivation rec { - pname = "gnome-twenty-forty-eight"; - version = "3.38.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor version}/gnome-2048-${version}.tar.xz"; - sha256 = "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"; - }; - - patches = [ - # Fix build with meson 0.61 - # https://gitlab.gnome.org/GNOME/gnome-2048/-/merge_requests/21 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-2048/-/commit/194e22699f7166a016cd39ba26dd719aeecfc868.patch"; - sha256 = "Qpn/OJJwblRm5Pi453aU2HwbrNjsf+ftmSnns/5qZ9E="; - }) - ]; - - nativeBuildInputs = [ - itstool - meson - ninja - pkg-config - vala - wrapGAppsHook3 - ]; - - buildInputs = [ - clutter-gtk - libgee - libgnome-games-support - gtk3 - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-2048"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gnome-2048"; - description = "Obtain the 2048 tile"; - mainProgram = "gnome-2048"; - maintainers = teams.gnome.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix b/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix index 22359e9a5827e..398e9144e2448 100644 --- a/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix +++ b/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix @@ -1,6 +1,5 @@ { runCommand, - pkg-config, gdk-pixbuf, lib, stdenv, diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix deleted file mode 100644 index 0270045dad7df..0000000000000 --- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib, stdenv -, fetchurl -, gettext -, itstool -, libxml2 -, pkg-config -, gnome-panel -, gtk3 -, glib -, libwnck -, libgtop -, libnotify -, upower -, wirelesstools -, linuxPackages -, adwaita-icon-theme -, libgweather -, gucharmap -, tracker -, polkit -, gnome -}: - -stdenv.mkDerivation rec { - pname = "gnome-applets"; - version = "3.52.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-bz07QoZW/21bHT7lzLfs49Kxi1S/BFes9DtxHlXi1iw="; - }; - - nativeBuildInputs = [ - gettext - itstool - pkg-config - libxml2 - ]; - - buildInputs = [ - gnome-panel - gtk3 - glib - libxml2 - libwnck - libgtop - libnotify - upower - adwaita-icon-theme - libgweather - gucharmap - tracker - polkit - wirelesstools - linuxPackages.cpupower - ]; - - enableParallelBuilding = true; - - doCheck = true; - - # Don't try to install modules to gnome panel's directory, as it's read only - PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Applets for use with the GNOME panel"; - mainProgram = "cpufreq-selector"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-applets"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix deleted file mode 100644 index 770d389d77d12..0000000000000 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ /dev/null @@ -1,198 +0,0 @@ -{ stdenv -, lib -, autoreconfHook -, fetchurl -, gettext -, glib -, gnome-bluetooth -, gnome-desktop -, gnome-panel -, gnome-session -, gnome -, gsettings-desktop-schemas -, gtk3 -, ibus -, libcanberra-gtk3 -, libpulseaudio -, libxkbfile -, libxml2 -, pkg-config -, polkit -, gdm -, systemd -, upower -, pam -, wrapGAppsHook3 -, writeTextFile -, xkeyboard_config -, xorg -, nixosTests -, runCommand -, buildEnv -}: -let - pname = "gnome-flashback"; - version = "3.52.1"; - - # From data/sessions/Makefile.am - requiredComponentsCommon = enableGnomePanel: - [ ] - ++ lib.optional enableGnomePanel "gnome-panel"; - requiredComponentsGsd = [ - "org.gnome.SettingsDaemon.A11ySettings" - "org.gnome.SettingsDaemon.Color" - "org.gnome.SettingsDaemon.Datetime" - "org.gnome.SettingsDaemon.Housekeeping" - "org.gnome.SettingsDaemon.Keyboard" - "org.gnome.SettingsDaemon.MediaKeys" - "org.gnome.SettingsDaemon.Power" - "org.gnome.SettingsDaemon.PrintNotifications" - "org.gnome.SettingsDaemon.Rfkill" - "org.gnome.SettingsDaemon.ScreensaverProxy" - "org.gnome.SettingsDaemon.Sharing" - "org.gnome.SettingsDaemon.Smartcard" - "org.gnome.SettingsDaemon.Sound" - "org.gnome.SettingsDaemon.UsbProtection" - "org.gnome.SettingsDaemon.Wacom" - "org.gnome.SettingsDaemon.XSettings" - ]; - requiredComponents = wmName: enableGnomePanel: "RequiredComponents=${lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd)};"; - - gnome-flashback = stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - hash = "sha256-ugRhPNrbYr2iBkN8BHKZ4WAlzeG9gJXglKp3dpx4YDo="; - }; - - # make .desktop Execs absolute - postPatch = '' - patch -p0 <<END_PATCH - +++ data/applications/gnome-flashback.desktop.in - @@ -4 +4 @@ - -Exec=gnome-flashback - +Exec=$out/bin/gnome-flashback - END_PATCH - ''; - - postInstall = '' - # Check that our expected RequiredComponents match the stock session files, but then don't install them. - # They can be installed using mkSessionForWm. - grep '${requiredComponents "metacity" true}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false) - - rm -r $out/share/gnome-session - rm -r $out/share/xsessions - rm $out/libexec/gnome-flashback-metacity - ''; - - nativeBuildInputs = [ - autoreconfHook - gettext - libxml2 - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = [ - glib - gnome-bluetooth - gnome-desktop - gsettings-desktop-schemas - gtk3 - ibus - libcanberra-gtk3 - libpulseaudio - libxkbfile - xorg.libXxf86vm - polkit - gdm - gnome-panel - systemd - upower - pam - xkeyboard_config - ]; - - doCheck = true; - - enableParallelBuilding = true; - - PKG_CONFIG_LIBGNOME_PANEL_LAYOUTSDIR = "${placeholder "out"}/share/gnome-panel/layouts"; - PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; - versionPolicy = "odd-unstable"; - }; - - mkWmApplication = { wmName, wmLabel, wmCommand }: - writeTextFile { - name = "gnome-flashback-${wmName}-wm"; - destination = "/share/applications/${wmName}.desktop"; - text = '' - [Desktop Entry] - Type=Application - Encoding=UTF-8 - Name=${wmLabel} - Exec=${wmCommand} - NoDisplay=true - X-GNOME-WMName=${wmLabel} - X-GNOME-Autostart-Phase=WindowManager - X-GNOME-Provides=windowmanager - X-GNOME-Autostart-Notify=false - ''; - }; - - mkGnomeSession = { wmName, wmLabel, enableGnomePanel }: - writeTextFile { - name = "gnome-flashback-${wmName}-gnome-session"; - destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session"; - text = '' - [GNOME Session] - Name=GNOME Flashback (${wmLabel}) - ${requiredComponents wmName enableGnomePanel} - ''; - }; - - mkSessionForWm = { wmName, wmLabel, wmCommand }: - writeTextFile - { - name = "gnome-flashback-${wmName}-xsession"; - destination = "/share/xsessions/gnome-flashback-${wmName}.desktop"; - text = '' - [Desktop Entry] - Name=GNOME Flashback (${wmLabel}) - Comment=This session logs you into GNOME Flashback with ${wmLabel} - Exec=${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName} - TryExec=${wmCommand} - Type=Application - DesktopNames=GNOME-Flashback;GNOME; - ''; - } // { - providedSessions = [ "gnome-flashback-${wmName}" ]; - }; - - mkSystemdTargetForWm = { wmName, wmLabel, wmCommand, enableGnomePanel }: - runCommand "gnome-flashback-${wmName}.target" { } '' - mkdir -p $out/lib/systemd/user - cp -r "${gnome-flashback}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \ - "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d" - ''; - - tests = { inherit (nixosTests) gnome-flashback; }; - }; - - meta = with lib; { - description = "GNOME 2.x-like session for GNOME 3"; - mainProgram = "gnome-flashback"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-flashback"; - license = licenses.gpl2; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; - }; -in -gnome-flashback diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix deleted file mode 100644 index 71bfd89d4599c..0000000000000 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoreconfHook -, dconf -, evolution-data-server -, gdm -, geocode-glib_2 -, gettext -, glib -, gnome-desktop -, gnome-menus -, gnome -, gtk3 -, itstool -, libgweather -, libwnck -, libxml2 -, pkg-config -, polkit -, systemd -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "gnome-panel"; - version = "3.52.0"; - - outputs = [ "out" "dev" "man" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-nim6iHPN5A1AwpNKRk+PQ7ousbUisZFEfKon3XhTxdQ="; - }; - - patches = [ - # Load modules from path in `NIX_GNOME_PANEL_MODULESDIR` environment variable - # instead of gnome-panel’s libdir so that the NixOS module can make gnome-panel - # load modules from other packages as well. - ./modulesdir-env-var.patch - ]; - - # make .desktop Exec absolute - postPatch = '' - patch -p0 <<END_PATCH - +++ gnome-panel/gnome-panel.desktop.in - @@ -7 +7 @@ - -Exec=gnome-panel - +Exec=$out/bin/gnome-panel - END_PATCH - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome-menus}/share" - --prefix XDG_CONFIG_DIRS : "${gnome-menus}/etc/xdg" - ) - ''; - - nativeBuildInputs = [ - autoreconfHook - gettext - itstool - libxml2 - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = [ - dconf - evolution-data-server - gdm - geocode-glib_2 - glib - gnome-desktop - gnome-menus - gtk3 - libgweather - libwnck - polkit - systemd - ]; - - configureFlags = [ - "--enable-eds" - ]; - - enableParallelBuilding = true; - - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Component of Gnome Flashback that provides panels and default applets for the desktop"; - mainProgram = "gnome-panel"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-panel"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix b/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix deleted file mode 100644 index 10b81eaad62cd..0000000000000 --- a/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv -, lib -, buildEnv -, gnome-panel -, gnome-flashback -, xorg -, glib -, wrapGAppsHook3 -, panelModulePackages ? [ ] -}: - -let - # We always want to find the built-in panel applets. - selectedPanelModulePackages = [ gnome-panel gnome-flashback ] ++ panelModulePackages; - - panelModulesEnv = buildEnv { - name = "gnome-panel-modules-env"; - paths = selectedPanelModulePackages; - pathsToLink = [ "/lib/gnome-panel/modules" ]; - }; -in -stdenv.mkDerivation { - pname = "${gnome-panel.pname}-with-modules"; - inherit (gnome-panel) version; - - nativeBuildInputs = [ - glib - wrapGAppsHook3 - ]; - - buildInputs = selectedPanelModulePackages ++ - lib.forEach selectedPanelModulePackages (x: x.buildInputs or [ ]); - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - preferLocalBuild = true; - allowSubstitutes = false; - - installPhase = '' - runHook preInstall - - mkdir -p $out - ${xorg.lndir}/bin/lndir -silent ${gnome-panel} $out - - rm -r $out/lib/gnome-panel/modules - ${xorg.lndir}/bin/lndir -silent ${panelModulesEnv} $out - - rm $out/share/applications/gnome-panel.desktop - - substitute ${gnome-panel}/share/applications/gnome-panel.desktop \ - $out/share/applications/gnome-panel.desktop --replace \ - "Exec=${gnome-panel}/bin/gnome-panel" "Exec=$out/bin/gnome-panel" - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - --set NIX_GNOME_PANEL_MODULESDIR "$out/lib/gnome-panel/modules" - ) - ''; - - meta = gnome-panel.meta // { outputsToInstall = [ "out" ]; }; -} diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix index ce83250fe678e..ccbbdec13ac0f 100644 --- a/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/pkgs/desktops/gnustep/libobjc2/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Objective-C runtime for use with GNUstep"; homepage = "https://gnustep.github.io/"; license = licenses.mit; diff --git a/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix index 2618553236f2b..165987ef18c9a 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix @@ -9,7 +9,6 @@ cmake, content-hub, gettext, - libreoffice, libreoffice-unwrapped, lomiri-ui-toolkit, pkg-config, diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix index 48de383fdfa24..14f90c4b3b092 100644 --- a/pkgs/desktops/lomiri/applications/lomiri/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix @@ -79,6 +79,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-J9ySZgWd7KR7aU1cCRu5iirq7bi3NdLR9SZs9Pd1I8w="; }) + # Remove when https://gitlab.com/ubports/development/core/lomiri/-/merge_requests/181 merged & in release + (fetchpatch { + name = "0101-lomiri-Fix-accountsservice-property-defaults.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri/-/commit/369c7aac242f1798ce46b1415ab6112ac5e9d095.patch"; + hash = "sha256-ieJCA1F/ljmgwEfGXWCTQNG1A/bmiJhNH9uzzULpUEc="; + }) + # Fix greeter & related settings # These patches are seemingly not submitted upstream yet (fetchpatch { diff --git a/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/pkgs/desktops/lomiri/data/lomiri-session/default.nix index 21da8a635dcdd..960fb2794c849 100644 --- a/pkgs/desktops/lomiri/data/lomiri-session/default.nix +++ b/pkgs/desktops/lomiri/data/lomiri-session/default.nix @@ -12,7 +12,6 @@ lomiri, makeWrapper, pkg-config, - runtimeShell, systemd, }: diff --git a/pkgs/desktops/lomiri/development/libusermetrics/2001-Remove-custom-check-target.patch b/pkgs/desktops/lomiri/development/libusermetrics/2001-Remove-custom-check-target.patch deleted file mode 100644 index dfa90b18ca098..0000000000000 --- a/pkgs/desktops/lomiri/development/libusermetrics/2001-Remove-custom-check-target.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 52ac1d6548b4a92d569c5d2f53b84c604c7fce8a Mon Sep 17 00:00:00 2001 -From: OPNA2608 <opna2608@protonmail.com> -Date: Thu, 1 Feb 2024 22:42:39 +0100 -Subject: [PATCH] Remove custom check target - -The automatic one provides better controls for us ---- - CMakeLists.txt | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index af643a7..75b3cc1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -105,18 +105,13 @@ add_subdirectory("data") - - - if(ENABLE_TESTS) --enable_testing() -+include(CTest) - - pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1 REQUIRED) - include_directories(${QTDBUSTEST_INCLUDE_DIRS}) - - add_subdirectory(tests) - --ADD_CUSTOM_TARGET( -- check -- ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure --) -- - find_package(CoverageReport) - enable_coverage_report( - TARGETS --- -2.42.0 - diff --git a/pkgs/desktops/lomiri/development/libusermetrics/2002-Launch-module-created-systemd-service.patch b/pkgs/desktops/lomiri/development/libusermetrics/2002-Launch-module-created-systemd-service.patch deleted file mode 100644 index 82961cd4ba798..0000000000000 --- a/pkgs/desktops/lomiri/development/libusermetrics/2002-Launch-module-created-systemd-service.patch +++ /dev/null @@ -1,21 +0,0 @@ -From cf8ba54d22f5ac839004c0d984fb402bde82b527 Mon Sep 17 00:00:00 2001 -From: OPNA2608 <opna2608@protonmail.com> -Date: Mon, 8 Apr 2024 15:22:55 +0200 -Subject: [PATCH] Launch module-created systemd service - ---- - data/com.lomiri.UserMetrics.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/com.lomiri.UserMetrics.service.in b/data/com.lomiri.UserMetrics.service.in -index c2e6ae1..212e24f 100644 ---- a/data/com.lomiri.UserMetrics.service.in -+++ b/data/com.lomiri.UserMetrics.service.in -@@ -3,3 +3,4 @@ Name=com.lomiri.UserMetrics - Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/libusermetrics/usermetricsservice - User=usermetrics - StandardOutput=syslog -+SystemdService=dbus-com.lomiri.UserMetrics.service --- -2.42.0 - diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index 2daece75cbd4a..b29581dfe5fa4 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -1,29 +1,42 @@ { lib , stdenv -, fetchurl -, pkg-config -, intltool +, fetchFromGitHub +, autoreconfHook , gtk3 +, intltool , libintl +, pkg-config +, gitUpdater }: stdenv.mkDerivation rec { pname = "lxtask"; - version = "0.1.10"; + version = "0.1.11"; - src = fetchurl { - url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; - sha256 = "0b2fxg8jjjpk219gh7qa18g45365598nd2bq7rrq0bdvqjdxy5i2"; + src = fetchFromGitHub { + owner = "lxde"; + repo = "lxtask"; + rev = version; + hash = "sha256-KPne7eWzOOSZjHlam3e6HifNk2Sx1vWnQYkXDFZGop0="; }; - nativeBuildInputs = [ pkg-config intltool ]; + nativeBuildInputs = [ + autoreconfHook + intltool + pkg-config + ]; - buildInputs = [ gtk3 libintl ]; + buildInputs = [ + gtk3 + libintl + ]; configureFlags = [ "--enable-gtk3" ]; + passthru.updateScript = gitUpdater { }; + meta = with lib; { - homepage = "https://wiki.lxde.org/en/LXTask"; + homepage = "http://lxde.sourceforge.net/"; description = "Lightweight and desktop independent task manager"; mainProgram = "lxtask"; longDescription = '' diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index be6d593b41778..2403975b481b7 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/lxqt/compton-conf"; description = "GUI configuration tool for compton X composite manager"; mainProgram = "compton-conf"; diff --git a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix index 9a49c10a1be9b..62504bb33b543 100644 --- a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix +++ b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Qt implementation of the DBusMenu protocol"; homepage = "https://github.com/lxqt/libdbusmenu-lxqt"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 6f809629eaaa5..daaad022edf5d 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Library used to query system info and statistics"; homepage = "https://github.com/lxqt/libsysstat"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 51b9cef886aea..30fe20ebeefe4 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/lxqt/qtermwidget"; description = "Terminal emulator widget for Qt, used by QTerminal"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index ebdd3eb07dda0..25b99584429f6 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -5,7 +5,7 @@ , pkg-config , gettext , glib -, alsaSupport ? stdenv.isLinux +, alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib , udev , pulseaudioSupport ? config.pulseaudio or true diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 9328147e642c8..31854538fb5ee 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Menu system for MATE"; homepage = "https://github.com/mate-desktop/mate-menus"; license = with licenses; [ gpl2Plus lgpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 6ac2b8abaa5dd..eeb65991b605d 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "mate-notification-daemon"; - version = "1.28.0"; + version = "1.28.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "pDEDSOrYZsvLm0xGP00mXMapahp4KpQRoIsjvWXbsuA="; + hash = "sha256-//71U76hW+z/XtQNZOGMI9O2ScRZnMHrHoL3BTOFOzQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 8d7a4afb69de2..7e3794083f347 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -19,27 +19,25 @@ , libgudev , libraw , sqlite -, python3 , libwebp , wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "photos"; rev = version; - sha256 = "sha256-EULNLtoZ8M68cp1DT11G6O2TONH/0DXWNX0k4AUqa/w="; + sha256 = "sha256-+aqBeGRisngbH/EALROTr0IZvyrWIlQvFFEgJNfv95Y="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook3 ]; @@ -66,11 +64,6 @@ stdenv.mkDerivation rec { gstreamer ]); - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 360e175e6b1b3..9084297c05b1a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-OXaCftfPPAIxDGOBKM4S7Bv//j0sWy/CsbqvugxSZ70="; + sha256 = "sha256-aOJnjHCyc1tSyF7AuW5nXUXcvzBnZ+pwU91Mk+veusg="; }; patches = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 88fcef2ddef43..0f90c2af545d5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -9,6 +9,7 @@ , vala , libadwaita , libgee +, gettext , granite7 , gtk4 , networkmanager @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gettext meson ninja pkg-config @@ -52,6 +54,8 @@ stdenv.mkDerivation rec { switchboard ]; + strictDeps = true; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index eafe43e45b396..7aa683b029eae 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-onlineaccounts"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-OlivtKz3kE81CZ6KJgvVvqf0BSVJbh6C0F7O+/+4xZU="; + sha256 = "sha256-E4UAhrs+YQ47VEHMFY8PbSFvBqhqrTf4aPezeqEjdLo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index 423102152da47..f6bd304bbfc0b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -9,6 +9,7 @@ , libadwaita , libcanberra , libgee +, glib , granite7 , gtk4 , pulseaudio @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + glib meson ninja pkg-config @@ -43,6 +45,8 @@ stdenv.mkDerivation rec { switchboard ]; + strictDeps = true; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 47f4d036fc5cb..cde3255eb46fc 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -38,10 +38,10 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = lib.teams.pantheon.members; - mutter = pkgs.gnome.mutter43; + mutter = pkgs.mutter43; # Using 43 to match Mutter used in Pantheon - gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon43; + gnome-settings-daemon = pkgs.gnome-settings-daemon43; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; @@ -95,9 +95,7 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-print-shim = callPackage ./desktop/elementary-print-shim { }; - elementary-session-settings = callPackage ./desktop/elementary-session-settings { - inherit (gnome) gnome-session; - }; + elementary-session-settings = callPackage ./desktop/elementary-session-settings { }; elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 9da4e8c2927aa..12746579c4991 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -13,7 +13,6 @@ , libgee , gettext , gtk3 -, gnome-menus , json-glib , elementary-dock , bamf diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index c9e8de572ed46..a413498447ba1 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -16,7 +16,6 @@ , libhandy , libxml2 , libsoup -, libgdata , elementary-calendar }: diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index dcb30a6a2d5b4..5b66bc1de6f38 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, substituteAll , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index d2780cdcfe653..744c546987b56 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "settings-daemon"; rev = version; - sha256 = "sha256-e70OVdvyKzzF+W7epzj23/Q1lsJiSJd7z1fj41sWfWU="; + sha256 = "sha256-w5dRQPRsM52wqusTLLPmKmVwoBFS+pHOokfDmCDxVWM="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index b1fa8a7068a1f..20c7904f9c0ab 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -28,7 +28,6 @@ , lib , config , fetchurl -, gconf , gsettings-desktop-schemas }: @@ -156,7 +155,7 @@ let plasma-mobile = callPackage ./plasma-mobile { }; plasma-nano = callPackage ./plasma-nano { }; plasma-nm = callPackage ./plasma-nm { }; - plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; + plasma-pa = callPackage ./plasma-pa.nix { }; plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix { }; plasma-sdk = callPackage ./plasma-sdk.nix { }; plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { }; diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index 0256461db94ca..40a05ed6fe14f 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -11,7 +11,6 @@ , plasma-framework , qtbase , qtdeclarative -, gconf , glib , libcanberra-gtk3 , libpulseaudio @@ -22,7 +21,6 @@ mkDerivation { pname = "plasma-pa"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - gconf glib libcanberra-gtk3 libpulseaudio diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index 93941346dcc75..0a6a622e777ce 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -2,9 +2,13 @@ , mkXfceDerivation , gtk3 , glib +, gnome , libexif +, libjxl +, librsvg , libxfce4ui , libxfce4util +, webp-pixbuf-loader , xfconf }: @@ -27,6 +31,18 @@ mkXfceDerivation { env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + postInstall = '' + # Pull in JXL and WebP support for ristretto. + # In postInstall to run before gappsWrapperArgsHook. + export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + libjxl + librsvg + webp-pixbuf-loader + ]; + }}" + ''; + meta = with lib; { description = "Fast and lightweight picture-viewer for the Xfce desktop environment"; mainProgram = "ristretto"; diff --git a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix index 8910985473bf8..b8a9f1f68277d 100644 --- a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix @@ -10,9 +10,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-dict"; - version = "0.8.6"; + version = "0.8.8"; - sha256 = "sha256-a7St9iH+jzwq/llrMJkuqwgQrDFEjqebs/N6Lxa3dkI="; + sha256 = "sha256-nVpEeOSSfXCIxuIj0qie+oi8FVRiVUmDMPZZwIZ9L/k="; buildInputs = [ glib diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix index f43a465ed98b0..fd0e375033c0c 100644 --- a/pkgs/desktops/xfce/core/tumbler/default.nix +++ b/pkgs/desktops/xfce/core/tumbler/default.nix @@ -6,8 +6,11 @@ , freetype , libgepub , libgsf +, libjxl +, librsvg , poppler , gst_all_1 +, webp-pixbuf-loader , libxfce4util }: @@ -32,6 +35,13 @@ mkXfceDerivation { poppler # technically the glib binding ]; + preFixup = '' + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ libjxl librsvg webp-pixbuf-loader ]}" + ) + ''; + # WrapGAppsHook won't touch this binary automatically, so we wrap manually. postFixup = '' wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}" diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 0de704176ec99..5d0efd28bfe94 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -125,8 +125,6 @@ makeScopeWithSplicing' { xfce4-docklike-plugin = callPackage ./panel-plugins/xfce4-docklike-plugin { }; - xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { }; - xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { }; xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { }; @@ -174,6 +172,8 @@ makeScopeWithSplicing' { thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04 + xfce4-embed-plugin = throw "xfce4-embed-plugin has been removed, as it was broken"; # Added 2024-07-15 + xfce4-hardware-monitor-plugin = throw "xfce.xfce4-hardware-monitor-plugin has been removed: abandoned by upstream and does not build"; # added 2023-01-15 xfce4-namebar-plugin = throw "xfce.xfce4-namebar-plugin has been removed: abandoned by upstream and does not build"; # added 2024-05-08 }); diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix deleted file mode 100644 index 6d8e1199b99be..0000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, intltool -, libxfce4util -, xfce4-panel -, libxfce4ui -, gtk2 -, gitUpdater -}: - -let - category = "panel-plugins"; -in stdenv.mkDerivation rec { - pname = "xfce4-embed-plugin"; - version = "1.6.0"; - - src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-x2ffY2DoGUsyvCSCPdAAl17boMr+Ulwj14VAKTWe4ig="; - }; - - nativeBuildInputs = [ - pkg-config - intltool - ]; - - buildInputs = [ - libxfce4util - libxfce4ui - xfce4-panel - gtk2 - ]; - - passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; - }; - - meta = with lib;{ - homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; - description = "Embed arbitrary app windows on Xfce panel"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - broken = true; # unmaintained plugin; no longer compatible with xfce 4.16 - maintainers = with maintainers; [ ] ++ teams.xfce.members; - }; -} diff --git a/pkgs/development/ada-modules/gnatcoll/bindings.nix b/pkgs/development/ada-modules/gnatcoll/bindings.nix index 0b7efb60deb9b..32d490c1e1bac 100644 --- a/pkgs/development/ada-modules/gnatcoll/bindings.nix +++ b/pkgs/development/ada-modules/gnatcoll/bindings.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/pkgs/development/ada-modules/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix index f1cf28f00af3b..3965789d742e2 100644 --- a/pkgs/development/ada-modules/gprbuild/default.nix +++ b/pkgs/development/ada-modules/gprbuild/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { "LIBRARY_TYPE=relocatable" ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Ensure that there is enough space for the `fixDarwinDylibNames` hook to # update the install names of the output dylibs. NIX_LDFLAGS = "-headerpad_max_install_names"; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 8b93f09dd92d5..23649ca76f261 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -43,7 +43,7 @@ let elvis-erlang = callPackage ./elvis-erlang { }; # BEAM-based languages. - elixir = elixir_1_16; + elixir = elixir_1_17; elixir_1_17 = lib'.callElixir ../interpreters/elixir/1.17.nix { inherit erlang; diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix index 2a6322cec899c..2d9475e72fbb2 100644 --- a/pkgs/development/beam-modules/elvis-erlang/default.nix +++ b/pkgs/development/beam-modules/elvis-erlang/default.nix @@ -8,10 +8,10 @@ in rebar3Relx rec { releaseType = "escript"; # The package name "elvis" is already taken pname = "elvis-erlang"; - version = "3.1.0"; + version = "3.2.6"; src = fetchFromGitHub { inherit owner repo; - sha256 = "u1KDoLLFQ+HdrLqUAbAFYOZhfpO0j/DfEQ7/ZD5RBDM="; + sha256 = "13QM6UbH+1PxzhY/ufi5PEP2pKqSl5+g6tMvKmOUMb0="; rev = version; }; beamDeps = builtins.attrValues (import ./rebar-deps.nix { diff --git a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix index c8d6edcac4a92..a71d0e5d77141 100644 --- a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix +++ b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix @@ -1,6 +1,6 @@ # Generated by rebar3_nix let fetchOnly = { src, ... }: src; -in { builder ? fetchOnly, fetchHex, fetchgit, overrides ? (x: y: { }), ... }: +in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }: let self = packages // (overrides self packages); packages = with self; { diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index a2ea7c8bd449e..e3a189adf2207 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -45,7 +45,7 @@ rebar3Relx { HOME=. rebar3 proper --constraint_tries 100 ''; # tests seem to be a bit flaky on darwin, skip them for now - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { homepage = "https://github.com/erlang-ls/erlang_ls"; diff --git a/pkgs/development/beam-modules/erlfmt/default.nix b/pkgs/development/beam-modules/erlfmt/default.nix index f7db8a7816a9a..11307e37cf5e9 100644 --- a/pkgs/development/beam-modules/erlfmt/default.nix +++ b/pkgs/development/beam-modules/erlfmt/default.nix @@ -2,12 +2,12 @@ rebar3Relx rec { pname = "erlfmt"; - version = "1.3.0"; + version = "1.5.0"; releaseType = "escript"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "erlfmt"; - sha256 = "sha256-fVjEVmCnoofnfcxwBk0HI4adO0M6QOshP3uZrecZ9vM="; + sha256 = "sha256-TtOHcXiXl13KSGarMBdvvDjv1YQJjDVFtDLC0LDz9Bc="; rev = "v${version}"; }; meta = with lib; { diff --git a/pkgs/development/compilers/asl/default.nix b/pkgs/development/compilers/asl/default.nix deleted file mode 100644 index 5a7ca869278af..0000000000000 --- a/pkgs/development/compilers/asl/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, fetchzip -, texliveMedium -, buildDocs ? false -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "asl"; - version = "142-bld232"; - - src = let inherit (finalAttrs) pname version; in fetchzip { - name = "${pname}-${version}"; - url = "http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-${version}.tar.bz2"; - hash = "sha256-Q50GzXBxFMhbt5s9OgHPNH4bdqz2hhEmTnMmKowVn2E="; - }; - - outputs = [ "out" "doc" "man" ]; - - nativeBuildInputs = lib.optionals buildDocs [ texliveMedium ]; - - postPatch = lib.optionalString (!buildDocs) '' - substituteInPlace Makefile --replace "all: binaries docs" "all: binaries" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - substituteInPlace sysdefs.h --replace "x86_64" "aarch64" - ''; - - dontConfigure = true; - - preBuild = '' - bindir="${placeholder "out"}/bin" \ - docdir="${placeholder "doc"}/share/doc/asl" \ - incdir="${placeholder "out"}/include/asl" \ - libdir="${placeholder "out"}/lib/asl" \ - mandir="${placeholder "man"}/share/man" \ - substituteAll ${./Makefile-nixos.def} Makefile.def - mkdir -p .objdir - ''; - - meta = with lib; { - homepage = "http://john.ccac.rwth-aachen.de:8000/as/index.html"; - description = "Portable macro cross assembler"; - longDescription = '' - AS is a portable macro cross assembler for a variety of microprocessors - and -controllers. Though it is mainly targeted at embedded processors and - single-board computers, you also find CPU families in the target list that - are used in workstations and PCs. - ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -}) -# TODO: cross-compilation support -# TODO: customize TeX input -# TODO: report upstream about `mkdir -p .objdir/` -# TODO: suggest upstream about building docs as an option diff --git a/pkgs/development/compilers/bfc/default.nix b/pkgs/development/compilers/bfc/default.nix index 83710df4c13b5..660f130225c85 100644 --- a/pkgs/development/compilers/bfc/default.nix +++ b/pkgs/development/compilers/bfc/default.nix @@ -38,6 +38,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://bfc.wilfred.me.uk"; license = licenses.gpl2Plus; maintainers = with maintainers; [ figsoda ]; - broken = stdenv.isAarch64 && stdenv.isLinux; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; }; } diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 9bf22ba6dcf26..b52d3fa6a31ce 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices libunistring ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = # For libuv on darwin - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export LIBTOOLIZE=libtoolize '' + # Help libgc's configure. @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in "$out"/bin/*; do if isELF "$f"; then patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ]; - broken = stdenv.isDarwin && stdenv.isAarch64; # segfault during build + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # segfault during build longDescription = '' Bigloo is a Scheme implementation devoted to one goal: enabling diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index d6c1442a8b8b5..7d78c1d659729 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # "binaryenjs" "binaryenjs_wasm" # not building this "lit" "gtest" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; meta = with lib; { homepage = "https://github.com/WebAssembly/binaryen"; diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix index 5c1aa1b2a2cd6..95903e2e76d11 100644 --- a/pkgs/development/compilers/blueprint/default.nix +++ b/pkgs/development/compilers/blueprint/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # requires xvfb-run - doCheck = !stdenv.isDarwin + doCheck = !stdenv.hostPlatform.isDarwin && false; # tests time out checkPhase = '' diff --git a/pkgs/development/compilers/c0/default.nix b/pkgs/development/compilers/c0/default.nix index 4c3f5ba201dea..8dbb1627db3a7 100644 --- a/pkgs/development/compilers/c0/default.nix +++ b/pkgs/development/compilers/c0/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --replace '`../get_version.sh`' '${version}' \ --replace '`date`' '1970-01-01T00:00:00Z' \ --replace '`hostname`' 'nixpkgs' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for f in cc0/compiler/bin/coin-o0-support cc0/compiler/bin/cc0-o0-support; do substituteInPlace $f --replace '$(brew --prefix gnu-getopt)' '${getopt}' done @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { getopt mlton pkg-config - ] ++ lib.optionals stdenv.isDarwin [ darwin.sigtool ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; buildInputs = [ boehmgc @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # line 1: ../../bin/wrappergen: cannot execute: required file not found # make[2]: *** [../../lib.mk:83: - broken = stdenv.isLinux; + broken = stdenv.hostPlatform.isLinux; }; } diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index 7b9b2086b39f2..68232367a351d 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -13,13 +13,13 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "c3c"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "c3lang"; repo = "c3c"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-PKeQOVByNvhUq7QBhnNsl3LfR48MWhRC2rhiD58fVHY="; + hash = "sha256-hFLiE1S9l2NhSIaqpYoBfn27IkhavcM0Ma31+XJtYj4="; }; postPatch = '' @@ -35,7 +35,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { curl libxml2 libffi - ] ++ lib.optionals llvmPackages.stdenv.isDarwin [ xar ]; + ] ++ lib.optionals llvmPackages.stdenv.hostPlatform.isDarwin [ xar ]; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/development/compilers/cairo/default.nix b/pkgs/development/compilers/cairo/default.nix index 51b6c641da94a..0749175f08375 100644 --- a/pkgs/development/compilers/cairo/default.nix +++ b/pkgs/development/compilers/cairo/default.nix @@ -2,20 +2,26 @@ , rustPlatform , fetchFromGitHub , rustfmt +, perl }: rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.5.4"; + version = "2.8.2"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-ctb5VingMczzHLyyEjKgFKNAZI3/fqzjFW/RQGDSsyQ="; + hash = "sha256-vBdIGkdQa/csqsu4DbgIYitVbDLDUAFmIUytZ7IcxNk="; }; - cargoHash = "sha256-T21GuGQaX/VD907MEGp68bQPXrRK0it4o1nLEdHwTsE="; + cargoHash = "sha256-w3kzEM34HYQ6KgILaDpmZbCgAh8Ql24DRe12woUAhVI="; + + # openssl crate requires perl during build process + nativeBuildInputs = [ + perl + ]; nativeCheckInputs = [ rustfmt @@ -24,6 +30,9 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # Requires a mythical rustfmt 2.0 or a nightly compiler "--skip=golden_test::sourcegen_ast" + + # Test broken + "--skip=test_lowering_consistency" ]; postInstall = '' diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/development/compilers/cakelisp/default.nix index c52c93c5e6c7e..48e3e9efa5fbb 100644 --- a/pkgs/development/compilers/cakelisp/default.nix +++ b/pkgs/development/compilers/cakelisp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"' substituteInPlace src/ModuleManager.cpp \ --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Build.sh --replace '--export-dynamic' '-export_dynamic' substituteInPlace runtime/HotReloading.cake --replace '--export-dynamic' '-export_dynamic' substituteInPlace Bootstrap.cake --replace '--export-dynamic' '-export_dynamic' @@ -50,6 +50,6 @@ stdenv.mkDerivation { platforms = platforms.darwin ++ platforms.linux; maintainers = [ maintainers.sbond75 ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 9fe1a8aa8e564..ae82b0ccfda24 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -40,12 +40,12 @@ in stdenv.mkDerivation rec { sha256 = cfg.sha256; }; - buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; CCL_RUNTIME = cfg.runtime; CCL_KERNEL = cfg.kernel; - postPatch = if stdenv.isDarwin then '' + postPatch = if stdenv.hostPlatform.isDarwin then '' substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ --replace "M4 = gm4" "M4 = m4" \ --replace "dtrace" "/usr/sbin/dtrace" \ @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { maintainers = lib.teams.lisp.members; platforms = attrNames options; # assembler failures during build, x86_64-darwin broken since 2020-10-14 - broken = (stdenv.isDarwin && stdenv.isx86_64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); license = licenses.asl20; }; } diff --git a/pkgs/development/compilers/chez-racket/shared.nix b/pkgs/development/compilers/chez-racket/shared.nix index b9368dd4ebea5..71bb710d20487 100644 --- a/pkgs/development/compilers/chez-racket/shared.nix +++ b/pkgs/development/compilers/chez-racket/shared.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation (args // { postPatch = '' export ZLIB="$(find ${zlib.out}/lib -type f | sort | head -n1)" - export LZ4="$(find ${lz4.out}/lib -type f | sort | head -n1)" + export LZ4="$(find ${lz4.lib}/lib -type f | sort | head -n1)" ''; - nativeBuildInputs = lib.optionals stdenv.isDarwin ([ cctools darwin.autoSignDarwinBinariesHook ]); + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin ([ cctools darwin.autoSignDarwinBinariesHook ]); buildInputs = [ libiconv libX11 lz4 ncurses zlib ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 9002db42abc28..de998e550b41e 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-03GZASte0ZhcQGnWqH/xjl4fWi3yfkApkfr0XcTyIyw="; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; buildInputs = [ ncurses libiconv libX11 libuuid ]; diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index b96a1d459d712..a36ef4569e305 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # There is not enough space in the load command to accomodate a full path to the store, # so use `@executable_path` to specify a relative path to chicken’s lib folder. sed -e '/POSTINSTALL_PROGRAM_FLAGS = /{s|$(LIBDIR)|@executable_path/../lib|}' \ @@ -30,12 +30,12 @@ stdenv.mkDerivation { setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; # -fno-strict-overflow is not a supported argument in clang on darwin - hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin ["strictoverflow"]; makeFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" - ] ++ (lib.optionals stdenv.isDarwin [ + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" "POSTINSTALL_PROGRAM=${stdenv.cc.targetPrefix}install_name_tool" @@ -49,7 +49,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 2f0b8316ae8b2..53b4cc9024d55 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=$(out)" "C_COMPILER=$(CC)" "CXX_COMPILER=$(CXX)" - ] ++ (lib.optionals stdenv.isDarwin [ + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "LINKER_OPTIONS=-headerpad_max_install_names" "POSTINSTALL_PROGRAM=install_name_tool" @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { bootstrap-chicken ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postCheck = '' ./csi -R chicken.pathname -R chicken.platform \ -p "(assert (equal? \"${toString finalAttrs.binaryVersion}\" (pathname-file (car (repository-path)))))" diff --git a/pkgs/development/compilers/chicken/5/deps.toml b/pkgs/development/compilers/chicken/5/deps.toml index dc162bbe13c4e..8571a0e6d14ec 100644 --- a/pkgs/development/compilers/chicken/5/deps.toml +++ b/pkgs/development/compilers/chicken/5/deps.toml @@ -6,6 +6,13 @@ sha256 = "1z35j4py67c3x2f87mzvczpbbcskd80d5m7a7080gfxzrmwrn2c9" synopsis = "Markdown to Gemini text" version = "1.33" +[9p] +dependencies = ["iset", "srfi-1", "srfi-13", "srfi-18", "srfi-69"] +license = "bsd" +sha256 = "10lzil2d81lrqhp6kim5dwfipap2pifxfkb72p1pf8qbgmgwc00x" +synopsis = "9p networked filesystem protocol implementation. Includes high-level client and server code library" +version = "0.9" + [F-operator] dependencies = ["miscmacros", "datatype", "box"] license = "bsd" @@ -289,9 +296,9 @@ version = "1.37" [bitwise-utils] dependencies = [] license = "public-domain" -sha256 = "1p433kx2q1zam5a2isgnxiywgkcb77bmbqlajpr7rvm5i739h8g7" +sha256 = "1s8vxp2v2b7dxg1hwy5lzaf4bg072xd5fpl487mg34yy7l7krfla" synopsis = "Bitwise utilities" -version = "1.3.1" +version = "1.4.1" [blas] dependencies = ["bind", "compile-file", "srfi-13"] @@ -611,16 +618,16 @@ version = "1.2" [coops-utils] dependencies = ["srfi-1", "srfi-13", "check-errors", "coops"] license = "bsd" -sha256 = "1ywxc7r1l5a930rfp0fv99dcfg2gbvg93rp4jih4rnlpwys6gpv4" +sha256 = "0jvikvzxy4mz8x9pg0m89pidjmfjxm2g66lz3j84ip4ip8s28nwf" synopsis = "coops utilities" -version = "2.2.3" +version = "2.2.4" [coops] dependencies = ["matchable", "miscmacros", "record-variants", "srfi-1"] license = "bsd" -sha256 = "183pp1g5m06ss94ba1rq2rs4hqj92v6qz7ik3kzvl3b2aq77jk3z" +sha256 = "1gzrjb4dj66c9nca6yychbamcslgip0qy2hzfk2v0a41251kl1q5" synopsis = "A featureful object system" -version = "1.3" +version = "1.4" [crc] dependencies = [] @@ -814,9 +821,9 @@ version = "1.0" [edward] dependencies = ["r7rs", "srfi-1", "srfi-14", "srfi-37", "matchable", "posix-regex"] license = "gplv3" -sha256 = "0gfvjgg6c6hl2xmh63067xkh0sd2vmczwisirgglcm2inz4hjll3" +sha256 = "02vqx4gbj26424hay5n7mma423s1nsmz77cy7qfh2baaap0iz8q2" synopsis = "An extensible implementation of the ed text editor as defined in POSIX.1-2008" -version = "1.0.1" +version = "1.1.0" [egg-tarballs] dependencies = ["simple-sha1", "srfi-1", "srfi-13"] @@ -1248,9 +1255,9 @@ version = "0.0.1" [henrietta-cache] dependencies = ["http-client", "matchable", "srfi-1"] license = "bsd" -sha256 = "0lkjrvldxps7ld4fv2c8p1vaw1nb4lbk85agq529j0ix7nzwfwxm" +sha256 = "1ac3d4bb28cwzbamcz4ak62w4xbh7j15q0445b6c4z06cbfz0bj3" synopsis = "Fetch and cache extensions from various sources for Henrietta to consume" -version = "1.6.1" +version = "1.7" [henrietta] dependencies = ["regex", "srfi-1"] @@ -1409,9 +1416,9 @@ version = "0.4" [ipfs] dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"] license = "unlicense" -sha256 = "1ghsqdnw73xz9pbl6d7j38qgs066wsy1y6q9l0ardbqkmkibwyr8" +sha256 = "1fipsadibalrakzgai8mhxhizsy5a9jdg82x7x4r84gzjr30s327" synopsis = "IPFS HTTP API for Scheme" -version = "0.0.15" +version = "0.0.17" [irc] dependencies = ["matchable", "regex", "srfi-1"] @@ -1514,9 +1521,9 @@ version = "0.3" [lay] dependencies = [] license = "bsd" -sha256 = "1z7n51p6yzn9bd4l7jxh3mrq45a6h8mi95s2v2d9xgn3m0dmbhqi" +sha256 = "0ak7bgs79xz5yiywv159s471zqmhawwfipfn9ccll8nw1anp8gdw" synopsis = "Lay eggs efficiently" -version = "0.2.2" +version = "0.2.3" [lazy-ffi] dependencies = ["bind", "srfi-1", "srfi-69"] @@ -1549,9 +1556,9 @@ version = "1.2" [levenshtein] dependencies = ["srfi-1", "srfi-13", "srfi-63", "srfi-69", "vector-lib", "utf8", "miscmacros", "record-variants", "check-errors"] license = "bsd" -sha256 = "1q09kml6igd010j630m52rg7vayfsab176k3vjcsjn7ccf3i7a31" +sha256 = "1vgxdnas0sw47f8c68ki8fi7j6m9q5x96qnddwslwijjdhg7gdrm" synopsis = "Levenshtein edit distance" -version = "2.4.1" +version = "2.4.3" [lexgen] dependencies = ["srfi-1", "utf8", "srfi-127"] @@ -1619,9 +1626,9 @@ version = "1.0.6" [locale] dependencies = ["srfi-1", "utf8", "check-errors"] license = "bsd" -sha256 = "1mqdr1bw5w6nnrg5dxzc4m5qnbrvvkk9v8nm3a6y0qmpscaim9z5" +sha256 = "1f6wkaf89b74wxlhdxd4clmgavirvw3ld2igwqwi3rh1w95ln7x4" synopsis = "Provides locale operations" -version = "0.9.2" +version = "0.9.4" [locals] dependencies = [] @@ -1722,11 +1729,11 @@ synopsis = "Hygienic MATCH replacement" version = "1.2" [math-utils] -dependencies = [] +dependencies = ["memoize", "miscmacros"] license = "public-domain" -sha256 = "1vc8xrah2yngfbwvah1948h156dp1lw75nrapjcmvybc2315fn93" +sha256 = "1sl46zqv9al83blyzrl39k22arxq57i7j0qayri3qq9xwpgdhrf2" synopsis = "Miscellaneous math utilities" -version = "1.1.0" +version = "1.5.0" [math] dependencies = ["srfi-1", "r6rs-bytevectors", "miscmacros", "srfi-133", "srfi-42"] @@ -1745,9 +1752,9 @@ version = "4.7.0" [matrico] dependencies = [] license = "zlib-acknowledgement" -sha256 = "0ng09xbk8229nhq4s8f8rxgrgigf81qr685mggvk2lm5p7kckpjq" +sha256 = "11q9599lqs3rb0af6sxj2lvbm06a39igpnpdp1drl8zswdw41kyk" synopsis = "A flonum matrix module for CHICKEN Scheme." -version = "0.5rel" +version = "0.6rel" [md5] dependencies = ["message-digest-primitive"] @@ -1983,9 +1990,9 @@ version = "2.0" [nrepl] dependencies = ["srfi-18"] license = "bsd" -sha256 = "0d4pl1j1wayqsdryc5v8la5v5p9nifwva86z48vlss3s388na208" +sha256 = "12iad99bpv18k7jn8shc7mga2h218g5hll3arhfcvmka4grndvzs" synopsis = "Simple networked REPL over TCP" -version = "5.0.8" +version = "5.1.0" [number-limits] dependencies = [] @@ -2165,9 +2172,9 @@ version = "2.1.1" [postgresql] dependencies = ["sql-null", "srfi-1", "srfi-13", "srfi-69"] license = "bsd" -sha256 = "06sqn5gz5n2zfdk5z2c20mz4r6w9mslxvlanvmq1wdzr5qnvkh9s" +sha256 = "0hhbq2bc0jzya430n67d26y86q9y11nci3shpjcwlycvq9k1vx8j" synopsis = "Bindings for PostgreSQL's C-api" -version = "4.1.4" +version = "4.1.5" [poule] dependencies = ["datatype", "mailbox", "matchable", "srfi-1", "srfi-18", "typed-records"] @@ -2211,6 +2218,13 @@ sha256 = "0sid5fcw9pvf8n1zq5i757pzdr4hgx5w55qgrabsxpq5pgxj6gbs" synopsis = "Procedure Decoration API" version = "3.0.0" +[prometheus] +dependencies = ["srfi-1"] +license = "bsd" +sha256 = "0a7vj4wymc3cx5l4z9dagqsg1sy88cbp67fhbnvghi5b1lqz6ypz" +synopsis = "The Prometheus Object System." +version = "1.0.0" + [protobj] dependencies = [] license = "lgpl-2.1" @@ -2228,9 +2242,9 @@ version = "1.2.3" [pseudo-meta-egg-info] dependencies = ["spiffy", "uri-common", "svn-client"] license = "public-domain" -sha256 = "0dmhxm851vbzfcf14sqqxqpmigxvi0195ih9zb25nbxnsdcmy684" +sha256 = "0fygg85s823y5sblqpbqg4flf7cyynar49p1a37rlig3d7biag5b" synopsis = "Provide automatically generated release-info and a pseudo-\"meta\"-file for eggs in svn" -version = "1.1" +version = "1.2" [pseudolists] dependencies = [] @@ -2529,9 +2543,9 @@ version = "1.8" [scm2wiki] dependencies = ["srfi-1", "srfi-13", "srfi-14", "args", "comparse"] license = "mit" -sha256 = "0f8zwxkskzlillnbyngzgaqqgxviimn52rscj6vxx9hgl2yw3mkk" +sha256 = "03mc88pri6c3h5r5z3xz771mdarc0a6iv4x691jlq6chs983x13v" synopsis = "An auto-documentation tool for CHICKEN Scheme." -version = "0.3.2" +version = "0.3.3" [scmfmt] dependencies = [] @@ -2760,9 +2774,9 @@ version = "1.1.4" [slib-charplot] dependencies = ["slib-arraymap", "srfi-63", "slib-compat"] license = "artistic" -sha256 = "1ijcvs9y2vxmxg5834s4mprkinxhky0xdl3yksysmg9h9p82il2z" +sha256 = "04hyggnbxdjk0vq0x59gi98ybvkq2y3c8llb8zh9bzz045yj7n90" synopsis = "The SLIB character plotting library" -version = "1.2.2" +version = "1.2.3" [slib-compat] dependencies = ["srfi-1"] @@ -2823,9 +2837,9 @@ version = "0.3.3" [sparse-vectors] dependencies = ["srfi-1", "record-variants"] license = "bsd" -sha256 = "0nmk6c9mhls38lyp0d8a9f3xh94jbl2dqbmqr9pab23pnx4hha1j" +sha256 = "1vvwkjkw3drlmy0pmihg2l5c3s8wbvp0d60934idgyb7vvbdy0rz" synopsis = "Arbitrarily large vectors" -version = "1.1.0" +version = "1.1.1" [spiffy-cgi-handlers] dependencies = ["spiffy", "intarweb", "uri-common", "socket", "records", "srfi-1", "srfi-18", "srfi-13", "miscmacros"] @@ -2872,9 +2886,9 @@ version = "1.0" [spiffy] dependencies = ["intarweb", "uri-common", "uri-generic", "sendfile", "srfi-1", "srfi-13", "srfi-14", "srfi-18"] license = "bsd" -sha256 = "1nfxygrscvldmayr5sm8vqqvzv2wk63yh7pksp7v5gkffd0yhnzs" +sha256 = "0pb03w2xjiwg2vn5v27mph53vkliq33acs0zhll9sj44hg6c4rvl" synopsis = "A small but powerful web server" -version = "6.3" +version = "6.4" [spock] dependencies = ["jsmin", "matchable", "make"] @@ -3164,11 +3178,11 @@ synopsis = "SRFI-18 thread library" version = "0.1.7" [srfi-180] -dependencies = ["r7rs", "srfi-60", "srfi-145", "srfi-121"] -license = "mit" -sha256 = "0agky55bn26967nqcaa3n2a3rsr79brybizcivh34qna15gahq39" -synopsis = "This library describes a JavaScript Object Notation (JSON) parser and printer. It supports JSON that may be bigger than memory." -version = "1.0.0" +dependencies = ["srfi-34", "srfi-35", "srfi-158"] +license = "bsd" +sha256 = "1sxyhd4kzhlg0p3a1fzrxkqn7amhd8vb89ql4ykssrknmc9svmvd" +synopsis = "A JSON parser and printer that supports JSON bigger than memory." +version = "1.5.2" [srfi-189] dependencies = ["srfi-1", "typed-records"] @@ -3180,9 +3194,9 @@ version = "1.0.3" [srfi-19] dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "06lr89dgaslq218434al3nd18zdnp6rm4c6gr96pcglhjarcyv1n" +sha256 = "10bnm3gsc3rdafw239pwr6f8c95ma4a11k3cjjjscr8gvxl1kywp" synopsis = "Time Data Types and Procedures" -version = "4.9.8" +version = "4.9.9" [srfi-193] dependencies = [] @@ -3226,6 +3240,13 @@ sha256 = "04fghjk0rfcz0fp71dvwvlxmxshrbmrs85g4l5cx8sp74y047qlv" synopsis = "SRFI 209: Enums and enum sets" version = "1.3.1" +[srfi-214] +dependencies = ["r7rs", "srfi-1", "srfi-145"] +license = "mit" +sha256 = "0mfh9v10r51y3jcqm3fk4d9cwjjpyw31vyi8s229cxkikfq4x5rp" +synopsis = "SRFI 241: Flexvectors" +version = "1.0.1" + [srfi-216] dependencies = ["srfi-18"] license = "mit" @@ -3691,9 +3712,9 @@ version = "1.0.4" [test-utils] dependencies = ["test"] license = "bsd" -sha256 = "0c4zj3i4g1iq38ifdgzhrl5lz0v97qzphsyg1d2a6ps6zr7jwgbf" +sha256 = "0nd309zshnwsackk7vzxj9496g58j2ch65h0lghsjpx2ns9l2s14" synopsis = "Test Utilities (for test egg)" -version = "1.0.5" +version = "1.1.0" [test] dependencies = [] diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 5748897e0c74a..0f9c89140a9a2 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -19,7 +19,7 @@ let addToPropagatedBuildInputsWithPkgConfig = pkg: old: (addPkgConfig old) // (addToPropagatedBuildInputs pkg old); broken = addMetaAttrs { broken = true; }; - brokenOnDarwin = addMetaAttrs { broken = stdenv.isDarwin; }; + brokenOnDarwin = addMetaAttrs { broken = stdenv.hostPlatform.isDarwin; }; addToCscOptions = opt: old: { CSC_OPTIONS = lib.concatStringsSep " " ([ old.CSC_OPTIONS or "" ] ++ lib.toList opt); }; @@ -27,8 +27,8 @@ in { allegro = old: ((addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd pkgs.libGLU ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ] - ++ lib.optionals stdenv.isLinux [ pkgs.xorg.libX11 ])) old) // { + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkgs.xorg.libX11 ])) old) // { # depends on 'chicken' egg, which doesn't exist, # so we specify all the deps here propagatedBuildInputs = [ @@ -43,6 +43,13 @@ in (addToBuildInputsWithPkgConfig pkgs.cairo old) // (addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 srfi-13 ]) old); cmark = addToBuildInputs pkgs.cmark; + comparse = old: { + # For some reason lazy-seq 2 gets interpreted as lazy-seq 0.0.0?? + postPatch = '' + substituteInPlace comparse.egg \ + --replace-fail 'lazy-seq "0.1.0"' 'lazy-seq "0.0.0"' + ''; + }; epoxy = old: (addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy old) // lib.optionalAttrs stdenv.cc.isClang { @@ -72,12 +79,12 @@ in gl-utils = addPkgConfig; glfw3 = addToBuildInputsWithPkgConfig pkgs.glfw3; glls = addPkgConfig; - iconv = addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libiconv); + iconv = addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv); icu = addToBuildInputsWithPkgConfig pkgs.icu; imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2; inotify = old: - (addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libinotify-kqueue) old) - // lib.optionalAttrs stdenv.isDarwin (addToCscOptions "-L -linotify" old); + (addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libinotify-kqueue) old) + // lib.optionalAttrs stdenv.hostPlatform.isDarwin (addToCscOptions "-L -linotify" old); leveldb = addToBuildInputs pkgs.leveldb; magic = addToBuildInputs pkgs.file; mdh = old: @@ -94,7 +101,7 @@ in nanomsg = addToBuildInputs pkgs.nanomsg; ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ]; opencl = addToBuildInputs ([ pkgs.opencl-headers pkgs.ocl-icd ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]); openssl = addToBuildInputs pkgs.openssl; plot = addToBuildInputs pkgs.plotutils; postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql; @@ -132,6 +139,7 @@ in addToNativeBuildInputs pkgs.taglib old ); uuid-lib = addToBuildInputs pkgs.libuuid; + webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; yaml = addToBuildInputs pkgs.libyaml; @@ -154,8 +162,8 @@ in }; opengl = old: (addToBuildInputsWithPkgConfig - (lib.optionals (!stdenv.isDarwin) [ pkgs.libGL pkgs.libGLU ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.apple_sdk.frameworks.OpenGL ]) + (lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkgs.libGL pkgs.libGLU ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.apple_sdk.frameworks.OpenGL ]) old) // { postPatch = '' @@ -164,7 +172,7 @@ in ''; }; posix-shm = old: { - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace build.scm \ --replace "-lrt" "" ''; @@ -209,14 +217,12 @@ in begin-syntax = broken; canvas-draw = broken; chicken-doc-admin = broken; - comparse = broken; coops-utils = broken; crypt = broken; hypergiant = broken; iup = broken; kiwi = broken; lmdb-ht = broken; - lsp-server = broken; mpi = broken; pyffi = broken; qt-light = broken; @@ -225,8 +231,6 @@ in svn-client = broken; system = broken; tokyocabinet = broken; - transducers = broken; - webview = broken; # mark broken darwin diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix index 29e1032260224..c68b5fe06547d 100644 --- a/pkgs/development/compilers/ciao/default.nix +++ b/pkgs/development/compilers/ciao/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ suhr ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/ciao.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/ciao.x86_64-darwin }; } diff --git a/pkgs/development/compilers/circt/circt-llvm.nix b/pkgs/development/compilers/circt/circt-llvm.nix index 0043702fd8470..8375ccc22f8ff 100644 --- a/pkgs/development/compilers/circt/circt-llvm.nix +++ b/pkgs/development/compilers/circt/circt-llvm.nix @@ -34,7 +34,7 @@ # Get rid of ${extra_libdir} (which ends up containing a path to circt-llvm.dev # in circt) so that we only have to remove the one fixed rpath. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace llvm/llvm/cmake/modules/AddLLVM.cmake \ --replace-fail 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' \ 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}")' @@ -69,7 +69,7 @@ # it hasn't been populated yet. # # Inspired by fixDarwinDylibNames. - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' local flags=(-delete_rpath @loader_path/../lib) for file in "$lib"/lib/*.dylib; do flags+=(-change @rpath/"$(basename "$file")" "$file") diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 0d70a64a21736..493a426135847 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.84.0"; + version = "1.86.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-9GOn0wnFQ9JidLf5qpz2xG0lf+cCqKMvZnAy4JDCFu4="; + hash = "sha256-xV7vu3zdWBXgnCCUN9ge1GZemo0prmpQrZ1np86i3jI="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index d5d56546b576c..4613357ded3b7 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux" "x86_64-darwin"]; # Upstream claims support, but breaks with: # error: use of undeclared identifier 'aligned_alloc' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/clasp-developers/clasp"; mainProgram = "clasp"; }; diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index a6b6833289b7c..5199d457f4df6 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { makeFlags = [ "build" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "arch=${stdenv.hostPlatform.darwinArch}" ]; diff --git a/pkgs/development/compilers/codon/default.nix b/pkgs/development/compilers/codon/default.nix index 520c6386490bf..88d3c01d713a0 100644 --- a/pkgs/development/compilers/codon/default.nix +++ b/pkgs/development/compilers/codon/default.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation { "-DLLVM_USE_LINKER=lld" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/codon/*.dylib $out/lib/ ''; diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix index b7bd676143c00..c1bf6347947cc 100644 --- a/pkgs/development/compilers/corretto/11.nix +++ b/pkgs/development/compilers/corretto/11.nix @@ -1,16 +1,23 @@ -{ fetchFromGitHub -, gradle_7 -, jdk11 -, lib -, stdenv -, rsync -, runCommand -, testers +{ + fetchFromGitHub, + gradle_7, + jdk11, + lib, + stdenv, + rsync, + runCommand, + testers, }: let corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; + inherit + lib + stdenv + rsync + runCommand + testers + ; jdk = jdk11; gradle = gradle_7; extraConfig = [ @@ -19,12 +26,12 @@ let # Corretto, too. "--disable-warnings-as-errors" ]; - version = "11.0.23.9.1"; + version = "11.0.24.8.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-11"; rev = version; - sha256 = "sha256-qSx0kgXTgvsvBaEqgy7Jrp/c1Imoi5/IOqEWoLenJYI="; + sha256 = "sha256-MD/ipEulQCEgfqqa0QQrD6x6GQwirQfb8OT2UBDLYEE="; }; }; in diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix index c557012e8cdb8..90ca350a355d8 100644 --- a/pkgs/development/compilers/corretto/17.nix +++ b/pkgs/development/compilers/corretto/17.nix @@ -1,34 +1,43 @@ -{ fetchFromGitHub -, fetchurl -, gradle_7 -, jdk17 -, lib -, stdenv -, rsync -, runCommand -, testers +{ + fetchFromGitHub, + fetchurl, + gradle_7, + jdk17, + lib, + stdenv, + rsync, + runCommand, + testers, }: let corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; + inherit + lib + stdenv + rsync + runCommand + testers + ; jdk = jdk17; gradle = gradle_7; - version = "17.0.11.9.1"; + version = "17.0.12.7.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-17"; rev = version; - sha256 = "sha256-LxZSFILFfyh8oBiYEnuBQ0Og2i713qdK2jIiCBnrlj0="; + sha256 = "sha256-aRn1hqaqNsBkp2jHHkwMKc8cNiBM+TYVm3tVMPJJ1YE="; }; }; in -corretto.overrideAttrs (final: prev: { - # HACK: Removes the FixNullPtrCast patch, as it fails to apply. Need to figure out what causes it to fail to apply. - patches = lib.remove - (fetchurl { +corretto.overrideAttrs ( + final: prev: { + # Corretto17 has incorporated this patch already so it fails to apply. + # We thus skip it here. + # See https://github.com/corretto/corretto-17/pull/158 + patches = lib.remove (fetchurl { url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c"; sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; - }) - (prev.patches or [ ]); -}) + }) (prev.patches or [ ]); + } +) diff --git a/pkgs/development/compilers/corretto/21.nix b/pkgs/development/compilers/corretto/21.nix index 9656ace73cef5..a5ab64d02c248 100644 --- a/pkgs/development/compilers/corretto/21.nix +++ b/pkgs/development/compilers/corretto/21.nix @@ -1,25 +1,32 @@ -{ corretto21 -, fetchFromGitHub -, gradle_7 -, jdk21 -, lib -, stdenv -, rsync -, runCommand -, testers +{ + corretto21, + fetchFromGitHub, + gradle_7, + jdk21, + lib, + stdenv, + rsync, + runCommand, + testers, }: let corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; + inherit + lib + stdenv + rsync + runCommand + testers + ; jdk = jdk21; gradle = gradle_7; - version = "21.0.3.9.1"; + version = "21.0.4.7.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-21"; rev = version; - sha256 = "sha256-V8UDyukDCQVTWUg4IpSKoY0qnnQ5fePbm3rxcw06Vr0="; + sha256 = "sha256-EQqktd2Uz9PhkCaqvbuzmONcSiRppQ40tpLB3mqu2wo="; }; }; in diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index 1059935ce20f9..0de05fb0f6c87 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -1,13 +1,14 @@ -{ jdk -, version -, src -, lib -, stdenv -, gradle -, extraConfig ? [ ] -, rsync -, runCommand -, testers +{ + jdk, + version, + src, + lib, + stdenv, + gradle, + extraConfig ? [ ], + rsync, + runCommand, + testers, }: # Each Corretto version is based on a corresponding OpenJDK version. So @@ -19,97 +20,111 @@ let pname = "corretto"; - # The version scheme is different between OpenJDK & Corretto. - # See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40 - # "major.minor.security.build.revision" in -jdk.overrideAttrs (finalAttrs: oldAttrs: { - inherit pname version src; - name = "${pname}-${version}"; +# The version scheme is different between OpenJDK & Corretto. +# See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40 +# "major.minor.security.build.revision" +jdk.overrideAttrs ( + finalAttrs: oldAttrs: { + inherit pname version src; + name = "${pname}-${version}"; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ jdk gradle rsync ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ + jdk + gradle + rsync + ]; - dontConfigure = true; + dontConfigure = true; - postPatch = let - extra_config = builtins.concatStringsSep " " extraConfig; - in '' - # The rpm/deb task definitions require a Gradle plugin which we don't - # have and so the build fails. We'll simply remove them here because - # they are not needed anyways. - rm -rf installers/linux/universal/{rpm,deb} + postPatch = + let + extra_config = builtins.concatStringsSep " " extraConfig; + in + '' + # The rpm/deb task definitions require a Gradle plugin which we don't + # have and so the build fails. We'll simply remove them here because + # they are not needed anyways. + rm -rf installers/linux/universal/{rpm,deb} - # `/usr/bin/rsync` is invoked to copy the source tree. We don't have that. - for file in $(find installers -name "build.gradle"); do - substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" - done + # `/usr/bin/rsync` is invoked to copy the source tree. We don't have that. + for file in $(find installers -name "build.gradle"); do + substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" + done - gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}") - ''; + gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}") + ''; - # since we dontConfigure, we must run this manually - preBuild = "gradleConfigureHook"; + # since we dontConfigure, we must run this manually + preBuild = "gradleConfigureHook"; - # The Linux installer is placed at linux/universal/tar whereas the MacOS - # one is at mac/tar. - gradleBuildTask = - if stdenv.isDarwin then - ":installers:mac:tar:build" - else ":installers:linux:universal:tar:packageBuildResults"; + # The Linux installer is placed at linux/universal/tar whereas the MacOS + # one is at mac/tar. + gradleBuildTask = + if stdenv.hostPlatform.isDarwin then + ":installers:mac:tar:build" + else + ":installers:linux:universal:tar:packageBuildResults"; - postBuild = '' - # Prepare for the installPhase so that it looks like if a normal - # OpenJDK had been built. - dir=build/jdkImageName/images - mkdir -p $dir - file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') - tar -xzf $file -C $dir - mv $dir/amazon-corretto-* $dir/jdk - '' + oldAttrs.postBuild or ""; + postBuild = + '' + # Prepare for the installPhase so that it looks like if a normal + # OpenJDK had been built. + dir=build/jdkImageName/images + mkdir -p $dir + file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') + tar -xzf $file -C $dir + mv $dir/amazon-corretto-* $dir/jdk + '' + + oldAttrs.postBuild or ""; - installPhase = oldAttrs.installPhase + '' - # The installPhase will place everything in $out/lib/openjdk and - # reference through symlinks. We don't rewrite the installPhase but at - # least move the folder to convey that this is not OpenJDK anymore. - mv $out/lib/openjdk $out/lib/corretto - ln -s $out/lib/corretto $out/lib/openjdk - ''; + installPhase = + oldAttrs.installPhase + + '' + # The installPhase will place everything in $out/lib/openjdk and + # reference through symlinks. We don't rewrite the installPhase but at + # least move the folder to convey that this is not OpenJDK anymore. + mv $out/lib/openjdk $out/lib/corretto + ln -s $out/lib/corretto $out/lib/openjdk + ''; - passthru = - let - pkg = finalAttrs.finalPackage; - in - oldAttrs.passthru // { - tests = { - version = testers.testVersion { - package = pkg; + passthru = + let + pkg = finalAttrs.finalPackage; + in + oldAttrs.passthru + // { + tests = { + version = testers.testVersion { package = pkg; }; + vendor = runCommand "${pname}-vendor" { nativeBuildInputs = [ pkg ]; } '' + output=$(${pkg.meta.mainProgram} -XshowSettings:properties -version 2>&1 | grep vendor) + grep -Fq "java.vendor = Amazon.com Inc." - <<< "$output" && touch $out + ''; + compiler = runCommand "${pname}-compiler" { nativeBuildInputs = [ pkg ]; } '' + cat << EOF > Main.java + class Main { + public static void main(String[] args) { + System.out.println("Hello, World!"); + } + } + EOF + ${pkg}/bin/javac Main.java + ${pkg}/bin/java Main | grep -q "Hello, World!" && touch $out + ''; }; - vendor = runCommand "${pname}-vendor" { nativeBuildInputs = [ pkg ]; } '' - output=$(${pkg.meta.mainProgram} -XshowSettings:properties -version 2>&1 | grep vendor) - grep -Fq "java.vendor = Amazon.com Inc." - <<< "$output" && touch $out - ''; - compiler = runCommand "${pname}-compiler" { nativeBuildInputs = [ pkg ]; } '' - cat << EOF > Main.java - class Main { - public static void main(String[] args) { - System.out.println("Hello, World!"); - } - } - EOF - ${pkg}/bin/javac Main.java - ${pkg}/bin/java Main | grep -q "Hello, World!" && touch $out - ''; }; - }; - - # Some of the OpenJDK derivation set their `pos` by hand. We need to - # overwrite this in order to point to Corretto, not OpenJDK. - pos = __curPos; - meta = with lib; oldAttrs.meta // { - homepage = "https://aws.amazon.com/corretto"; - license = licenses.gpl2Only; - description = "Amazon's distribution of OpenJDK"; - maintainers = with maintainers; [ rollf ]; - }; -}) + # Some of the OpenJDK derivation set their `pos` by hand. We need to + # overwrite this in order to point to Corretto, not OpenJDK. + pos = __curPos; + meta = + with lib; + oldAttrs.meta + // { + homepage = "https://aws.amazon.com/corretto"; + license = licenses.gpl2Only; + description = "Amazon's distribution of OpenJDK"; + maintainers = with maintainers; [ rollf ]; + }; + } +) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index c95298cbfe2a9..0907c1c4d68dc 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -144,7 +144,7 @@ let substituteInPlace spec/std/socket/udp_socket_spec.cr \ --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' - '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") '' # See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277 substituteInPlace spec/compiler/loader/unix_spec.cr \ --replace 'it "parses file paths"' 'pending "parses file paths"' @@ -175,7 +175,7 @@ let libxml2 openssl ] ++ extraBuildInputs - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index 0b21122b035e3..d6d538d5c844c 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out cp -R * $out/ echo $libPath - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { testCompile = runCommand "dart-test-compile" { nativeBuildInputs = [ finalAttrs.finalPackage ] - ++ lib.optionals stdenv.isDarwin [ cctools darwin.sigtool ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.sigtool ]; } '' HELLO_MESSAGE="Hello, world!" echo "void main() => print('$HELLO_MESSAGE');" > hello.dart @@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { with C-style syntax. It offers compilation to JavaScript, interfaces, mixins, abstract classes, reified generics, and optional typing. ''; + mainProgram = "dart"; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.bsd3; diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix index 89108420b5493..48c31cc28cdd5 100644 --- a/pkgs/development/compilers/dart/package-source-builders/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/default.nix @@ -9,4 +9,5 @@ sqlcipher_flutter_libs = callPackage ./sqlcipher_flutter_libs { }; sqlite3 = callPackage ./sqlite3 { }; system_tray = callPackage ./system-tray { }; + super_native_extensions = callPackage ./super_native_extensions { }; } diff --git a/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/Cargo-0.8.22.lock b/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/Cargo-0.8.22.lock new file mode 100644 index 0000000000000..14340ef0c6542 --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/Cargo-0.8.22.lock @@ -0,0 +1,1996 @@ +# 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 = "android_log-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" + +[[package]] +name = "android_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a" +dependencies = [ + "android_log-sys", + "env_logger", + "log", + "once_cell", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] +name = "atk" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba16453d10c712284061a05f6510f75abeb92b56ba88dfeb48c74775020cc22" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf0a7ca572fbd5762fd8f8cd65a581e06767bc1234913fe1f43e370cff6e90" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[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-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" +dependencies = [ + "block-sys", + "objc2", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + +[[package]] +name = "byte-slice-cast" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "cairo-rs" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "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 = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdk" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1df5ea52cccd7e3a0897338b5564968274b52f5fd12601e0afa44f454c74d3" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717" +dependencies = [ + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", + "once_cell", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2152de9d38bc67a17b3fe49dc0823af5bf874df59ea088c5f28f31cf103de703" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gio" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glib" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gtk" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c4222ab92b08d4d0bab90ddb6185b4e575ceeea8b8cdf00b938d7b6661d966" +dependencies = [ + "atk", + "bitflags 1.3.2", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d8eb6a4b93e5a7e6980f7348d08c1cd93d31fae07cf97f20678c5ec41de3d7e" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk3-macros" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3efb84d682c9a39c10bd9f24f5a4b9c15cc8c7edc45c19cb2ca2c4fc38b2d95e" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "icrate" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" +dependencies = [ + "block2 0.4.0", + "objc2", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "irondash_dart_ffi" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ed3ea8413fd024d89154472f7aea14e820eb600d0c4318bc001b14dd9b3ddc" +dependencies = [ + "once_cell", +] + +[[package]] +name = "irondash_engine_context" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00cff90901a70987a221ba78a2d7439e5add4d34c534be60a33ab6f65b0741ae" +dependencies = [ + "android_logger", + "core-foundation", + "icrate", + "jni", + "log", + "objc2", + "once_cell", +] + +[[package]] +name = "irondash_message_channel" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335cbcc1e4d341bf132b7b26823a03c9520fa0007a83d27f7cfbd535e616b91b" +dependencies = [ + "async-trait", + "core-foundation", + "icrate", + "irondash_dart_ffi", + "irondash_message_channel_derive", + "irondash_run_loop", + "log", + "objc2", + "once_cell", +] + +[[package]] +name = "irondash_message_channel_derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cc040dca601ea6a092d0c936dbe362863580c3537e4748ca6c17cbaf88cb0b7" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "irondash_run_loop" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b669550085d7f2ecad1811118b36f57224dd83fddbc97da17009f429d637239d" +dependencies = [ + "core-foundation", + "futures", + "icrate", + "irondash_engine_context", + "log", + "objc2", + "once_cell", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "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 = "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 = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "git+https://github.com/knopp/mime_guess.git?branch=super_native_extensions#8c9abd38a5845db2d8a91a02fee16b226c364874" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-contacts", + "objc2-foundation", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "dispatch", + "libc", + "objc2", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oslog" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d2043d1f61d77cb2f4b1f7b7b2295f40507f5f8e9d1c8bf10a1ca5f97a3969" +dependencies = [ + "cc", + "dashmap", + "log", +] + +[[package]] +name = "pango" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48" +dependencies = [ + "bitflags 1.3.2", + "gio", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[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 = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +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 = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "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_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[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 = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.202" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.202" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[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 = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "simple_logger" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48047e77b528151aaf841a10a9025f9459da80ba820e425ff7eb005708a76dc7" +dependencies = [ + "atty", + "colored", + "log", + "time", + "winapi", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "super_native_extensions" +version = "0.1.0" +dependencies = [ + "android_logger", + "anyhow", + "async-trait", + "block2 0.5.1", + "byte-slice-cast", + "core-foundation", + "core-graphics", + "gdk", + "gdk-sys", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "irondash_engine_context", + "irondash_message_channel", + "irondash_run_loop", + "jni", + "log", + "mime_guess", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", + "once_cell", + "oslog", + "rand", + "serde", + "serde_json", + "simple_logger", + "threadpool", + "url", + "velcro", + "windows", +] + +[[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.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[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.65", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.8.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.13", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.8", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-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 = "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 = "velcro" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c6a51883ba1034757307e06dc4856cd5439ecf6804ce6c90d13d49496196fc" +dependencies = [ + "velcro_macros", +] + +[[package]] +name = "velcro_core" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "742cf45d07989b7614877e083602a8973890c75a81f47216b238d2f326ec916c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "velcro_macros" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b23c806d7b49977e6e12ee6d120ac01dcab702b51c652fdf1a6709ab5b8868c" +dependencies = [ + "syn 1.0.109", + "velcro_core", +] + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.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 = "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-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-implement", + "windows-interface", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] +name = "windows-interface" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +dependencies = [ + "memchr", +] diff --git a/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix b/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix new file mode 100644 index 0000000000000..9316b7e8a8526 --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix @@ -0,0 +1,77 @@ +{ + lib, + rustPlatform, + pkg-config, + at-spi2-atk, + gdk-pixbuf, + cairo, + gtk3, + writeText, + stdenv, +}: + +{ version, src, ... }: + +let + rustDep = rustPlatform.buildRustPackage { + pname = "super_native_extensions-rs"; + inherit version src; + + sourceRoot = "${src.name}/rust"; + + cargoLock = + rec { + _0_8_22 = { + lockFile = ./Cargo-0.8.22.lock; + outputHashes = { + "mime_guess-2.0.4" = "sha256-KSw0YUTGqNEWY9pMvQplUGajJgoP2BRwVX6qZPpB2rI="; + }; + }; + _0_8_21 = _0_8_22; + _0_8_20 = _0_8_22; + _0_8_19 = _0_8_22; + _0_8_18 = _0_8_22; + _0_8_17 = _0_8_22; + } + .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw '' + Unsupported version of pub 'super_native_extensions': '${version}' + Please add ${src}/rust/Cargo.lock + to this path, and add corresponding entry here. If the lock + is the same with existing versions, add an alias here. + ''); + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + at-spi2-atk + gdk-pixbuf + cairo + gtk3 + ]; + + passthru.libraryPath = "lib/libsuper_native_extensions.so"; + }; + + fakeCargokitCmake = writeText "FakeCargokit.cmake" '' + function(apply_cargokit target manifest_dir lib_name any_symbol_name) + target_link_libraries("''${target}" PRIVATE ${rustDep}/${rustDep.passthru.libraryPath}) + set("''${target}_cargokit_lib" ${rustDep}/${rustDep.passthru.libraryPath} PARENT_SCOPE) + endfunction() + ''; + +in +stdenv.mkDerivation { + pname = "super_native_extensions"; + inherit version src; + inherit (src) passthru; + + installPhase = '' + runHook preInstall + + cp -r "$src" "$out" + chmod +rwx $out/cargokit/cmake/cargokit.cmake + cp ${fakeCargokitCmake} $out/cargokit/cmake/cargokit.cmake + + runHook postInstall + ''; +} diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index c169f32f221f0..7f2054e3e0c13 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.5.1"; in +let version = "3.5.3"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "18v73dr61033g0x27vb0fdjwyzc1d04fifmwwnv4157nfpb68ijc"; + sha256 = "1z6hl6pqsg2l7pfchzr5dk90b2dchidhwnnnc4q5dzz0xjikqrvx"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "1vjsnwlkvsb0xvap45fdd81vdsjkpl2yxr8xh39v77dxbpybi0qh"; + sha256 = "12rzl1nm1y0q5ff9p8gslki4cz37y3bdn8p2s3x2nc81bdda4gn7"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "0lwnvky3p37d81ib6qwxra7lxn19l5x30c7aycixd9yaslq1bc0v"; + sha256 = "1rp54g8di8j715n955wdr6i0pcrx2dn73qmvmrisyahi0qjrk0py"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "0zn2mw8awii0hrvyh146hb5604li0jgxxgavpi19zcdpnzdg6z7c"; + sha256 = "001mpb3fniamlmnqmhxdpbvp8crdvnf6sam13vvfmnr6na1fpxil"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "11x7yyif51hyn8yi2lqbkfm3lfalkvh54v5pi851mfdnf14hsjpw"; + sha256 = "0z9qjx2b2rmiqyqww0a5slj0pi1k8sn4fjihkn53im65rhhqra2y"; }; } diff --git a/pkgs/development/compilers/dictu/default.nix b/pkgs/development/compilers/dictu/default.nix index b58d868713746..fedf3deed62c4 100644 --- a/pkgs/development/compilers/dictu/default.nix +++ b/pkgs/development/compilers/dictu/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dictu.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dictu.x86_64-darwin }; } diff --git a/pkgs/development/compilers/dotnet/9/deps.nix b/pkgs/development/compilers/dotnet/9/deps.nix index e875578b47112..0f037dae7be9b 100644 --- a/pkgs/development/compilers/dotnet/9/deps.nix +++ b/pkgs/development/compilers/dotnet/9/deps.nix @@ -1,14 +1,10 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; sha256 = "35169a2067db5037669cbd0c11b759b50b692ccc14b79095a94b505c73c89638"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.dotnet.ilcompiler/9.0.0-preview.7.24376.15/runtime.linux-arm64.microsoft.dotnet.ilcompiler.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "88a997c651cee3e8e21c368214d105d431de9c4c0586ec76c4e3359212516c3d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0-preview.7.24376.15/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "97dc9f86b3d5aa38e373c3af5c285fe02839b7e58ad04f65f8b7dcbf052f61d6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0-preview.7.24376.15/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; }) - (fetchNuGet { hash = "sha256-3/wIVCbqYuAIODNUiA3MP1sCsjjk/6o8T9Ly3FGCm6k="; pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.dotnet.ilcompiler/9.0.0-preview.7.24376.15/runtime.linux-x64.microsoft.dotnet.ilcompiler.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; }) - (fetchNuGet { hash = "sha256-BcAIRDlYXwot6zLZnYq2cunSGfL7kV4E7dkrIQy0FAw="; pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0-preview.7.24376.15/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; }) - (fetchNuGet { hash = "sha256-fz/yPLIQq/YKNxrBBoioTsqd2tktKhHso7Lpji2Hp/k="; pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0-preview.7.24376.15/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; sha256 = "c225017aca3f2c4bd55faaf6dddc5b24a0b796d4ab8e8c9ba548d03e3de39e7e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.dotnet.ilcompiler/9.0.0-preview.7.24376.15/runtime.osx-arm64.microsoft.dotnet.ilcompiler.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "816e910d9d0576404e4a2935bdb41ea551abb78a8a55fc33c01de9eb89f8d109"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0-preview.7.24376.15/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "3acf49996decbf6b32c10ae39e181055ee071979ed0561d2569db84e58f360ff"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0-preview.7.24376.15/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; sha256 = "7942962d93494931a1ed2cf7e11a20fe407a186a94bd8cd30e18c5449f195264"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.dotnet.ilcompiler/9.0.0-preview.7.24376.15/runtime.osx-x64.microsoft.dotnet.ilcompiler.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "fb72e3b48e47a43498f5e11ecb7094831a6fe3552f74fffb4482af150f09e39e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0-preview.7.24376.15/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "b732ad55b1086e76458c79bfca10991d091abe0fc86367ba7606accf497d4afe"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0-preview.7.24376.15/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "a0c6f109957b1aef641201cc95da7637b3ed15d945c75edcd978e77a5054976e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0-rc.1.24431.7/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "96e02f1574f73caaa06f44bb0b7083e4dfcdc90f98d81e9dc94a7d1167b5b6ee"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0-rc.1.24431.7/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; }) + (fetchNuGet { hash = "sha256-Cnf16Gdf6i0o9RHafH3ADxAe9rYI1BF7X7shte+gNYo="; pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0-rc.1.24431.7/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; }) + (fetchNuGet { hash = "sha256-fAmxww6qryPdO4OztPXaG17wqdmMYV6I7jQgnKMbZSE="; pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0-rc.1.24431.7/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "13fcc80223606a4b26ba78a8b82e2f2c730fc1cdc74883de0bb7a866057efcd0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0-rc.1.24431.7/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "5506ee2b8732e36941e3265236540346ac67e0d4597c036f347835e58379ce6f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0-rc.1.24431.7/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "3b6cdb847784016e0d2269ee2a578b7f8de2df0eea4f31f379d74aa459d7a7cd"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0-rc.1.24431.7/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "131879f89cc784e3cbad29b8b8358da314c8ee95747dedc2683e389ba0d422a1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0-rc.1.24431.7/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; }) ] diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json index f19fad1ba4db0..89a33e292faeb 100644 --- a/pkgs/development/compilers/dotnet/9/release-info.json +++ b/pkgs/development/compilers/dotnet/9/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-DOBRHD6WnvLoCCm9PwtWqfL5CHR8xK3bU3zHsgmuDAM=", - "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.7.24380.1.centos.9-x64.tar.gz", - "artifactsHash": "sha256-G1gMBCUMO3BiluShVu4sjLc6nLE9V/taXwIIlSOqhJc=" + "tarballHash": "sha256-t4BQcN1rCG5XKfsJJqnpBHzyXtCrWbQaxpJ8gBpRrVk=", + "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-rc.1.24452.1.centos.9-x64.tar.gz", + "artifactsHash": "sha256-HRu23+7cJVAoTaFm0hnHk1lOC8HiBIvTs9TgWKVS8xw=" } diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json index 3dd633001da15..61f7c3e524a78 100644 --- a/pkgs/development/compilers/dotnet/9/release.json +++ b/pkgs/development/compilers/dotnet/9/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.0-preview.7", + "release": "9.0.0-rc.1", "channel": "9.0", - "tag": "v9.0.0-preview.7.24405.7", - "sdkVersion": "9.0.100-preview.7.24407.1", - "runtimeVersion": "9.0.0-preview.7.24405.7", - "aspNetCoreVersion": "9.0.0-preview.7.24406.2", + "tag": "v9.0.0-rc.1.24431.7", + "sdkVersion": "9.0.100-rc.1.24452.1", + "runtimeVersion": "9.0.0-rc.1.24431.7", + "aspNetCoreVersion": "9.0.0-rc.1.24452.1", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "aecea31eada5f5506de2112d72b3bd238a5317b4" + "sourceVersion": "f2e150252ab0fe4f796fac30ba5ffeb22c1c4156" } diff --git a/pkgs/development/compilers/dotnet/UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch b/pkgs/development/compilers/dotnet/UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch new file mode 100644 index 0000000000000..089b8b0fcaab8 --- /dev/null +++ b/pkgs/development/compilers/dotnet/UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch @@ -0,0 +1,30 @@ +From 93137ea040472f4042dd186427699ad249e7251b Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Sun, 22 Sep 2024 16:41:07 -0300 +Subject: [PATCH] UpdateNuGetConfigPackageSourcesMappings: don't add empty + mappings + +--- + .../UpdateNuGetConfigPackageSourcesMappings.cs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs b/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs +index 3b188c1801..9b7050ef46 100644 +--- a/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs ++++ b/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs +@@ -115,7 +115,11 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks + // Skip sources with zero package patterns + if (allSourcesPackages[packageSource]?.Count > 0) + { +- pkgSrcMappingClearElement.AddAfterSelf(GetPackageMappingsElementForSource(packageSource)); ++ var pkgSrc = GetPackageMappingsElementForSource(packageSource); ++ if (pkgSrc.Elements().Any()) ++ { ++ pkgSrcMappingClearElement.AddAfterSelf(pkgSrc); ++ } + } + } + +-- +2.46.0 + diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 0c9de3f05cab4..e9ae30070de77 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -1,33 +1,45 @@ -{ type -, version -, srcs -, packages ? null +{ + type, + version, + srcs, + commonPackages ? null, + hostPackages ? null, + targetPackages ? null, }: -assert builtins.elem type [ "aspnetcore" "runtime" "sdk" ]; -assert if type == "sdk" then packages != null else true; - -{ lib -, stdenv -, fetchurl -, writeText -, autoPatchelfHook -, makeWrapper -, libunwind -, icu -, libuuid -, zlib -, libkrb5 -, openssl -, curl -, lttng-ust_2_12 -, testers -, runCommand -, writeShellScript -, mkNugetDeps -, callPackage -, dotnetCorePackages -, xmlstarlet +assert builtins.elem type [ + "aspnetcore" + "runtime" + "sdk" +]; +assert + if type == "sdk" then + commonPackages != null && hostPackages != null && targetPackages != null + else + true; + +{ + lib, + stdenv, + fetchurl, + writeText, + autoPatchelfHook, + makeWrapper, + libunwind, + icu, + libuuid, + zlib, + libkrb5, + openssl, + curl, + lttng-ust_2_12, + testers, + runCommand, + writeShellScript, + mkNugetDeps, + callPackage, + systemToDotnetRid, + xmlstarlet, }: let @@ -45,40 +57,53 @@ let sdk = ".NET SDK ${version}"; }; - mkCommon = callPackage ./common.nix {}; + mkCommon = callPackage ./common.nix { }; - targetRid = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system; + hostRid = systemToDotnetRid stdenv.hostPlatform.system; + targetRid = systemToDotnetRid stdenv.targetPlatform.system; - sigtool = callPackage ./sigtool.nix {}; - signAppHost = callPackage ./sign-apphost.nix {}; + sigtool = callPackage ./sigtool.nix { }; + signAppHost = callPackage ./sign-apphost.nix { }; - hasILCompiler = - lib.versionAtLeast version (if targetRid == "osx-arm64" then "8" else "7"); + hasILCompiler = lib.versionAtLeast version (if hostRid == "osx-arm64" then "8" else "7"); - extraTargets = writeText "extra.targets" ('' - <Project> - '' + lib.optionalString hasILCompiler '' + extraTargets = writeText "extra.targets" ( + '' + <Project> + '' + + lib.optionalString hasILCompiler '' <ItemGroup> - <CustomLinkerArg Include="-Wl,-rpath,'${lib.makeLibraryPath [ icu zlib openssl ]}'" /> + <CustomLinkerArg Include="-Wl,-rpath,'${ + lib.makeLibraryPath [ + icu + zlib + openssl + ] + }'" /> </ItemGroup> - '' + lib.optionalString stdenv.isDarwin '' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' <Import Project="${signAppHost}" /> - '' + '' - </Project> - ''); + '' + + '' + </Project> + '' + ); in mkCommon type rec { inherit pname version; # Some of these dependencies are `dlopen()`ed. - nativeBuildInputs = [ - makeWrapper - ] ++ lib.optional stdenv.isLinux autoPatchelfHook - ++ lib.optionals (type == "sdk" && stdenv.isDarwin) [ - xmlstarlet - sigtool - ]; + nativeBuildInputs = + [ + makeWrapper + ] + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook + ++ lib.optionals (type == "sdk" && stdenv.hostPlatform.isDarwin) [ + xmlstarlet + sigtool + ]; buildInputs = [ stdenv.cc.cc @@ -87,24 +112,30 @@ mkCommon type rec { libkrb5 curl xmlstarlet - ] ++ lib.optional stdenv.isLinux lttng-ust_2_12; + ] ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12; src = fetchurl ( - srcs."${stdenv.hostPlatform.system}" or (throw - "Missing source (url and hash) for host system: ${stdenv.hostPlatform.system}") + srcs.${hostRid} or (throw "Missing source (url and hash) for host RID: ${hostRid}") ); sourceRoot = "."; - postPatch = if type == "sdk" then ('' - xmlstarlet ed \ - --inplace \ - -s //_:Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${extraTargets}" \ - sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets - '' + lib.optionalString stdenv.isDarwin '' - codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost} - '') else null; + postPatch = + if type == "sdk" then + ( + '' + xmlstarlet ed \ + --inplace \ + -s //_:Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${extraTargets}" \ + sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost} + '' + ) + else + null; dontPatchELF = true; noDumpEnvVars = true; @@ -132,49 +163,62 @@ mkCommon type rec { --add-needed libicuuc.so \ $out/shared/Microsoft.NETCore.App/*/libcoreclr.so \ $out/shared/Microsoft.NETCore.App/*/*System.Globalization.Native.so \ - $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + $out/packs/Microsoft.NETCore.App.Host.${hostRid}/*/runtimes/${hostRid}/native/*host patchelf \ --add-needed libgssapi_krb5.so \ $out/shared/Microsoft.NETCore.App/*/*System.Net.Security.Native.so \ - $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + $out/packs/Microsoft.NETCore.App.Host.${hostRid}/*/runtimes/${hostRid}/native/*host patchelf \ --add-needed libssl.so \ $out/shared/Microsoft.NETCore.App/*/*System.Security.Cryptography.Native.OpenSsl.so \ - $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + $out/packs/Microsoft.NETCore.App.Host.${hostRid}/*/runtimes/${hostRid}/native/*host ''; # fixes: Could not load ICU data. UErrorCode: 2 - propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' (allow file-read* (subpath "/usr/share/icu")) (allow file-read* (subpath "/private/var/db/mds/system")) (allow mach-lookup (global-name "com.apple.SecurityServer") (global-name "com.apple.system.opendirectoryd.membership")) ''; - passthru = { - inherit icu hasILCompiler; - } // lib.optionalAttrs (type == "sdk") { - packages = mkNugetDeps { - name = "${pname}-${version}-deps"; - nugetDeps = packages; + passthru = + { + inherit icu hasILCompiler; + } + // lib.optionalAttrs (type == "sdk") { + packages = commonPackages ++ hostPackages.${hostRid} ++ targetPackages.${targetRid}; + inherit targetPackages; + + updateScript = + let + majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); + in + writeShellScript "update-dotnet-${majorVersion}" '' + pushd pkgs/development/compilers/dotnet + exec ${./update.sh} "${majorVersion}" + ''; }; - updateScript = - let - majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); - in - writeShellScript "update-dotnet-${majorVersion}" '' - pushd pkgs/development/compilers/dotnet - exec ${./update.sh} "${majorVersion}" - ''; - }; - meta = with lib; { description = builtins.getAttr type descriptions; homepage = "https://dotnet.github.io/"; license = licenses.mit; - maintainers = with maintainers; [ kuznero mdarocha ]; + maintainers = with maintainers; [ + kuznero + mdarocha + ]; mainProgram = "dotnet"; - platforms = attrNames srcs; + platforms = lib.filter ( + platform: + let + e = builtins.tryEval (systemToDotnetRid platform); + in + e.success && srcs ? "${e.value}" + ) lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; }; } diff --git a/pkgs/development/compilers/dotnet/combine-deps.nix b/pkgs/development/compilers/dotnet/combine-deps.nix index af21c3aa248ed..188c26cf27fa7 100644 --- a/pkgs/development/compilers/dotnet/combine-deps.nix +++ b/pkgs/development/compilers/dotnet/combine-deps.nix @@ -2,7 +2,7 @@ list, baseRid, otherRids, - pkgs ? import ../../../.. {} + pkgs ? import ../../../.. { }, }: let inherit (pkgs) writeText; @@ -20,31 +20,36 @@ let fns = map (file: import file) list; - packages = unique - (concatMap (fn: fn { fetchNuGet = package: package; }) fns); + packages = unique (concatMap (fn: fn { fetchNuGet = package: package; }) fns); - changePackageRid = package: rid: - let replace = replaceStrings [".${baseRid}"] [".${rid}"]; - in rec { + changePackageRid = + package: rid: + let + replace = replaceStrings [ ".${baseRid}" ] [ ".${rid}" ]; + in + rec { pname = replace package.pname; inherit (package) version; url = replace package.url; sha256 = builtins.hashFile "sha256" (builtins.fetchurl url); }; - expandPackage = package: - [ package ] ++ - optionals (strings.match ".*\\.${baseRid}(\\..*|$)" package.pname != null) - (map (changePackageRid package) otherRids); + expandPackage = + package: + [ package ] + ++ optionals (strings.match ".*\\.${baseRid}(\\..*|$)" package.pname != null) ( + map (changePackageRid package) otherRids + ); - allPackages = - sortOn (package: [ package.pname package.version ]) - (concatMap expandPackage packages); + allPackages = sortOn (package: [ + package.pname + package.version + ]) (concatMap expandPackage packages); - fetchExpr = package: - " (fetchNuGet ${generators.toPretty { multiline = false; } package})"; + fetchExpr = package: " (fetchNuGet ${generators.toPretty { multiline = false; } package})"; -in writeText "deps.nix" '' +in +writeText "deps.nix" '' { fetchNuGet }: [ ${concatMapStringsSep "\n" fetchExpr allPackages} ] diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 303e5eaba847b..661f9c482a12a 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -1,37 +1,50 @@ dotnetPackages: -{ buildEnv, makeWrapper, lib, symlinkJoin }: +{ + buildEnv, + makeWrapper, + lib, + symlinkJoin, +}: # TODO: Rethink how we determine and/or get the CLI. # Possible options raised in #187118: # 1. A separate argument for the CLI (as suggested by IvarWithoutBones # 2. Use the highest version SDK for the CLI (as suggested by GGG) # 3. Something else? -let cli = builtins.head dotnetPackages; +let + cli = builtins.head dotnetPackages; in -assert lib.assertMsg ((builtins.length dotnetPackages) > 0) - ''You must include at least one package, e.g - `with dotnetCorePackages; combinePackages [ - sdk_6_0 aspnetcore_7_0 - ];`'' ; - buildEnv { - name = "dotnet-core-combined"; - paths = dotnetPackages; - pathsToLink = [ "/host" "/packs" "/sdk" "/sdk-manifests" "/shared" "/templates" ]; - ignoreCollisions = true; - postBuild = '' - cp -R ${cli}/{dotnet,share,nix-support} $out/ +assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' + You must include at least one package, e.g + `with dotnetCorePackages; combinePackages [ + sdk_6_0 aspnetcore_7_0 + ];`''; +buildEnv { + name = "dotnet-core-combined"; + paths = dotnetPackages; + pathsToLink = [ + "/host" + "/packs" + "/sdk" + "/sdk-manifests" + "/shared" + "/templates" + ]; + ignoreCollisions = true; + postBuild = '' + cp -R ${cli}/{dotnet,share,nix-support} $out/ - mkdir $out/bin - ln -s $out/dotnet $out/bin/dotnet - ''; - passthru = { - inherit (cli) icu; + mkdir $out/bin + ln -s $out/dotnet $out/bin/dotnet + ''; + passthru = { + inherit (cli) icu; - versions = lib.catAttrs "version" dotnetPackages; - packages = symlinkJoin { - name = "combined-packages"; - paths = lib.remove null (lib.catAttrs "packages" dotnetPackages); - }; - }; + versions = lib.catAttrs "version" dotnetPackages; + packages = lib.concatLists (lib.catAttrs "packages" dotnetPackages); + targetPackages = lib.zipAttrsWith (_: lib.concatLists) ( + lib.catAttrs "targetPackages" dotnetPackages + ); + }; - inherit (cli) meta; - } + inherit (cli) meta; +} diff --git a/pkgs/development/compilers/dotnet/common.nix b/pkgs/development/compilers/dotnet/common.nix index 8ed6de7e37366..426eb848d8690 100644 --- a/pkgs/development/compilers/dotnet/common.nix +++ b/pkgs/development/compilers/dotnet/common.nix @@ -1,203 +1,241 @@ # TODO: switch to stdenvNoCC -{ stdenv -, stdenvNoCC -, lib -, writeText -, testers -, runCommand -, runCommandWith -, expect -, curl -, installShellFiles -, callPackage -, zlib -, swiftPackages -, darwin -, icu -, lndir -, substituteAll -, nugetPackageHook -}: type: args: stdenv.mkDerivation (finalAttrs: args // { - doInstallCheck = true; +{ + stdenv, + stdenvNoCC, + lib, + writeText, + testers, + runCommand, + runCommandWith, + expect, + curl, + installShellFiles, + callPackage, + zlib, + swiftPackages, + darwin, + icu, + lndir, + substituteAll, + nugetPackageHook, + xmlstarlet, +}: +type: args: +stdenv.mkDerivation ( + finalAttrs: + args + // { + doInstallCheck = true; - # TODO: this should probably be postInstallCheck - # TODO: send output to /dev/null - installCheckPhase = args.installCheckPhase or "" + '' - $out/bin/dotnet --info - ''; + # TODO: this should probably be postInstallCheck + # TODO: send output to /dev/null + installCheckPhase = + args.installCheckPhase or "" + + '' + $out/bin/dotnet --info + ''; - setupHooks = args.setupHooks or [] ++ [ - ./dotnet-setup-hook.sh - ] ++ lib.optional (type == "sdk") (substituteAll { - src = ./dotnet-sdk-setup-hook.sh; - inherit lndir; - }); + setupHooks = + args.setupHooks or [ ] + ++ [ + ./dotnet-setup-hook.sh + ] + ++ lib.optional (type == "sdk") (substituteAll { + src = ./dotnet-sdk-setup-hook.sh; + inherit lndir xmlstarlet; + }); - propagatedBuildInputs = - (args.propagatedBuildInputs or []) - ++ [ nugetPackageHook ]; + propagatedBuildInputs = + (args.propagatedBuildInputs or [ ]) + ++ lib.optional (type == "sdk") nugetPackageHook; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ installShellFiles ]; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ installShellFiles ]; - postInstall = '' - # completions snippets taken from https://learn.microsoft.com/en-us/dotnet/core/tools/enable-tab-autocomplete - installShellCompletion --cmd dotnet \ - --bash ${./completions/dotnet.bash} \ - --zsh ${./completions/dotnet.zsh} \ - --fish ${./completions/dotnet.fish} - ''; + postInstall = '' + # completions snippets taken from https://learn.microsoft.com/en-us/dotnet/core/tools/enable-tab-autocomplete + installShellCompletion --cmd dotnet \ + --bash ${./completions/dotnet.bash} \ + --zsh ${./completions/dotnet.zsh} \ + --fish ${./completions/dotnet.fish} + ''; - passthru = { - tests = let - mkDotnetTest = - { - name, - stdenv ? stdenvNoCC, - template, - usePackageSource ? false, - build, - buildInputs ? [], - # TODO: use correct runtimes instead of sdk - runtime ? finalAttrs.finalPackage, - runInputs ? [], - run ? null, - runAllowNetworking ? false, - }: + passthru = { + tests = let - sdk = finalAttrs.finalPackage; - built = stdenv.mkDerivation { - name = "dotnet-test-${name}"; - buildInputs = - [ sdk ] - ++ buildInputs - ++ lib.optional (usePackageSource) sdk.packages; - # make sure ICU works in a sandbox - propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile; - unpackPhase = '' - mkdir test - cd test - dotnet new ${template} -o . - ''; - buildPhase = build; - dontPatchELF = true; - }; - in - if run == null - then built - else - runCommand "${built.name}-run" ({ - src = built; - nativeBuildInputs = [ built ] ++ runInputs; - passthru = { inherit built; }; - } // lib.optionalAttrs (stdenv.isDarwin && runAllowNetworking) { - sandboxProfile = '' - (allow network-inbound (local ip)) - (allow mach-lookup (global-name "com.apple.FSEvents")) - ''; - __darwinAllowLocalNetworking = true; - }) (lib.optionalString (runtime != null) '' - # TODO: use runtime here - export DOTNET_ROOT=${runtime} - '' + run); + mkDotnetTest = + { + name, + stdenv ? stdenvNoCC, + template, + usePackageSource ? false, + build, + buildInputs ? [ ], + # TODO: use correct runtimes instead of sdk + runtime ? finalAttrs.finalPackage, + runInputs ? [ ], + run ? null, + runAllowNetworking ? false, + }: + let + sdk = finalAttrs.finalPackage; + built = stdenv.mkDerivation { + name = "dotnet-test-${name}"; + buildInputs = [ sdk ] ++ buildInputs ++ lib.optional (usePackageSource) sdk.packages; + # make sure ICU works in a sandbox + propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile; + unpackPhase = '' + mkdir test + cd test + dotnet new ${template} -o . --no-restore + ''; + buildPhase = build; + dontPatchELF = true; + }; + in + if run == null then + built + else + runCommand "${built.name}-run" + ( + { + src = built; + nativeBuildInputs = [ built ] ++ runInputs; + passthru = { + inherit built; + }; + } + // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && runAllowNetworking) { + sandboxProfile = '' + (allow network-inbound (local ip)) + (allow mach-lookup (global-name "com.apple.FSEvents")) + ''; + __darwinAllowLocalNetworking = true; + } + ) + ( + lib.optionalString (runtime != null) '' + # TODO: use runtime here + export DOTNET_ROOT=${runtime} + '' + + run + ); - # Setting LANG to something other than 'C' forces the runtime to search - # for ICU, which will be required in most user environments. - checkConsoleOutput = command: '' - output="$(LANG=C.UTF-8 ${command})" - # yes, older SDKs omit the comma - [[ "$output" =~ Hello,?\ World! ]] && touch "$out" - ''; - in { - version = testers.testVersion ({ - package = finalAttrs.finalPackage; - } // lib.optionalAttrs (type != "sdk") { - command = "dotnet --info"; - }); - } - // lib.optionalAttrs (type == "sdk") ({ - console = mkDotnetTest { - name = "console"; - template = "console"; - build = checkConsoleOutput "dotnet run"; - }; + # Setting LANG to something other than 'C' forces the runtime to search + # for ICU, which will be required in most user environments. + checkConsoleOutput = command: '' + output="$(LANG=C.UTF-8 ${command})" + # yes, older SDKs omit the comma + [[ "$output" =~ Hello,?\ World! ]] && touch "$out" + ''; + in + { + version = testers.testVersion ( + { + package = finalAttrs.finalPackage; + } + // lib.optionalAttrs (type != "sdk") { + command = "dotnet --info"; + } + ); + } + // lib.optionalAttrs (type == "sdk") ( + { + console = mkDotnetTest { + name = "console"; + template = "console"; + build = checkConsoleOutput "dotnet run"; + }; - publish = mkDotnetTest { - name = "publish"; - template = "console"; - build = "dotnet publish -o $out/bin"; - run = checkConsoleOutput "$src/bin/test"; - }; + publish = mkDotnetTest { + name = "publish"; + template = "console"; + build = "dotnet publish -o $out/bin"; + run = checkConsoleOutput "$src/bin/test"; + }; - self-contained = mkDotnetTest { - name = "self-contained"; - template = "console"; - usePackageSource = true; - build = "dotnet publish --use-current-runtime --sc -o $out"; - runtime = null; - run = checkConsoleOutput "$src/test"; - }; + self-contained = mkDotnetTest { + name = "self-contained"; + template = "console"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime --sc -o $out"; + runtime = null; + run = checkConsoleOutput "$src/test"; + }; - single-file = mkDotnetTest { - name = "single-file"; - template = "console"; - usePackageSource = true; - build = "dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out/bin"; - runtime = null; - run = checkConsoleOutput "$src/bin/test"; - }; + single-file = mkDotnetTest { + name = "single-file"; + template = "console"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out/bin"; + runtime = null; + run = checkConsoleOutput "$src/bin/test"; + }; - web = mkDotnetTest { - name = "web"; - template = "web"; - build = "dotnet publish -o $out/bin"; - runInputs = [ expect curl ]; - run = '' - expect <<"EOF" - set status 1 - spawn $env(src)/bin/test - proc abort { } { exit 2 } - expect_before default abort - expect -re {Now listening on: ([^\r]+)\r} { - set url $expect_out(1,string) - } - expect "Application started. Press Ctrl+C to shut down." - set output [exec curl -sSf $url] - if {$output != "Hello World!"} { - send_error "Unexpected output: $output\n" - exit 1 - } - send \x03 - expect_before timeout abort - expect eof - catch wait result - exit [lindex $result 3] - EOF - touch $out - ''; - runAllowNetworking = true; - }; - } // lib.optionalAttrs finalAttrs.finalPackage.hasILCompiler { - aot = mkDotnetTest { - name = "aot"; - stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv; - template = "console"; - usePackageSource = true; - buildInputs = - [ zlib - ] ++ lib.optional stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ - swiftPackages.swift - Foundation - CryptoKit - GSS - ICU - ]); - build = '' - dotnet restore -p:PublishAot=true - dotnet publish -p:PublishAot=true -o $out/bin - ''; - runtime = null; - run = checkConsoleOutput "$src/bin/test"; - }; - }) // args.passthru.tests or {}; - } // args.passthru or {}; -}) + web = mkDotnetTest { + name = "web"; + template = "web"; + build = "dotnet publish -o $out/bin"; + runInputs = [ + expect + curl + ]; + run = '' + expect <<"EOF" + set status 1 + spawn $env(src)/bin/test + proc abort { } { exit 2 } + expect_before default abort + expect -re {Now listening on: ([^\r]+)\r} { + set url $expect_out(1,string) + } + expect "Application started. Press Ctrl+C to shut down." + set output [exec curl -sSf $url] + if {$output != "Hello World!"} { + send_error "Unexpected output: $output\n" + exit 1 + } + send \x03 + expect_before timeout abort + expect eof + catch wait result + exit [lindex $result 3] + EOF + touch $out + ''; + runAllowNetworking = true; + }; + } + // lib.optionalAttrs finalAttrs.finalPackage.hasILCompiler { + aot = mkDotnetTest { + name = "aot"; + stdenv = if stdenv.hostPlatform.isDarwin then swiftPackages.stdenv else stdenv; + template = "console"; + usePackageSource = true; + buildInputs = + [ + zlib + ] + ++ lib.optional stdenv.hostPlatform.isDarwin ( + with darwin; + with apple_sdk.frameworks; + [ + swiftPackages.swift + Foundation + CryptoKit + GSS + ICU + ] + ); + build = '' + dotnet restore -p:PublishAot=true + dotnet publish -p:PublishAot=true -o $out/bin + ''; + runtime = null; + run = checkConsoleOutput "$src/bin/test"; + }; + } + ) + // args.passthru.tests or { }; + } // args.passthru or { }; + } +) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 9a1acf4ad70d5..69cd17ec6244a 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -1,25 +1,30 @@ /* -How to combine packages for use in development: -dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; + How to combine packages for use in development: + dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; -Hashes and urls are retrieved from: -https://dotnet.microsoft.com/download/dotnet + Hashes and urls are retrieved from: + https://dotnet.microsoft.com/download/dotnet */ -{ lib -, config -, recurseIntoAttrs -, generateSplicesForMkScope -, makeScopeWithSplicing' +{ + lib, + config, + recurseIntoAttrs, + generateSplicesForMkScope, + makeScopeWithSplicing', }: makeScopeWithSplicing' { otherSplices = generateSplicesForMkScope "dotnetCorePackages"; - f = (self: + f = ( + self: let callPackage = self.callPackage; - buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; + fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; + + buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) { }; buildAttrs = { + inherit fetchNupkg; buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); @@ -40,25 +45,40 @@ makeScopeWithSplicing' { "i686-windows" = "win-x86"; }; - in { - inherit callPackage; + in + { + inherit callPackage fetchNupkg; # Convert a "stdenv.hostPlatform.system" to a dotnet RID - systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); + systemToDotnetRid = + system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); + + combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) { }; + + patchNupkgs = callPackage ./patch-nupkgs.nix { }; + nugetPackageHook = callPackage ./nuget-package-hook.nix { }; - combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; + buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { }; + buildDotnetGlobalTool = callPackage ../../../build-support/dotnet/build-dotnet-global-tool { }; - patchNupkgs = callPackage ./patch-nupkgs.nix {}; - nugetPackageHook = callPackage ./nuget-package-hook.nix {}; + mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { }; + mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; + addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { }; dotnet_8 = recurseIntoAttrs (callPackage ./8 { bootstrapSdk = dotnet_8_0.sdk_8_0_1xx; }); - dotnet_9 = recurseIntoAttrs (callPackage ./9 {}); - } // lib.optionalAttrs config.allowAliases { + dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); + } + // lib.optionalAttrs config.allowAliases { # EOL sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; - } // dotnet_6_0 // dotnet_7_0 // dotnet_8_0 // dotnet_9_0); + } + // dotnet_6_0 + // dotnet_7_0 + // dotnet_8_0 + // dotnet_9_0 + ); } diff --git a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh index cac55cb560175..1e7908b049f0e 100644 --- a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh +++ b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh @@ -5,7 +5,7 @@ export MSBUILDTERMINALLOGGER=false declare -Ag _nugetInputs addNugetInputs() { - if [[ -d "$1/share/nuget" ]]; then + if [[ -d $1/share/nuget ]]; then _nugetInputs[$1]=1 fi } @@ -16,32 +16,36 @@ _linkPackages() { local -r src="$1" local -r dest="$2" local dir + local x - for x in "$src"/*/*; do - dir=$dest/$(basename "$(dirname "$x")") - mkdir -p "$dir" - ln -s "$x" "$dir"/ - done + ( + shopt -s nullglob + for x in "$src"/*/*; do + dir=$dest/$(basename "$(dirname "$x")") + mkdir -p "$dir" + ln -s "$x" "$dir"/ + done + ) } -createNugetDirs() { - nugetTemp=$PWD/.nuget-temp - export NUGET_PACKAGES=$nugetTemp/packages - nugetSource=$nugetTemp/source - mkdir -p "$NUGET_PACKAGES" "$nugetSource" +configureNuget() { + runHook preConfigureNuGet - dotnet new nugetconfig - if [[ -z ${keepNugetConfig-} ]]; then - dotnet nuget disable source nuget - fi + local nugetTemp x - dotnet nuget add source "$nugetSource" -n _nix -} + nugetTemp="$(mktemp -dt nuget.XXXXXX)" + # trailing slash required here: + # Microsoft.Managed.Core.targets(236,5): error : SourceRoot paths are required to end with a slash or backslash: '/build/.nuget-temp/packages' + # also e.g. from avalonia: + # <EmbeddedResource Include="$(NuGetPackageRoot)sourcelink/1.1.0/tools/pdbstr.exe" /> + export NUGET_PACKAGES=$nugetTemp/packages/ + export NUGET_FALLBACK_PACKAGES=$nugetTemp/fallback/ + nugetSource=$nugetTemp/source + mkdir -p "${NUGET_PACKAGES%/}" "${NUGET_FALLBACK_PACKAGES%/}" "$nugetSource" -configureNuget() { for x in "${!_nugetInputs[@]}"; do if [[ -d $x/share/nuget/packages ]]; then - addToSearchPathWithCustomDelimiter ";" NUGET_FALLBACK_PACKAGES "$x/share/nuget/packages" + _linkPackages "$x/share/nuget/packages" "${NUGET_FALLBACK_PACKAGES%/}" fi if [[ -d $x/share/nuget/source ]]; then @@ -49,30 +53,150 @@ configureNuget() { fi done - if [[ -n "${linkNugetPackages-}" - || -f .config/dotnet-tools.json - || -f dotnet-tools.json - || -f paket.dependencies ]]; then - for x in "${!_nugetInputs[@]}"; do - if [[ -d $x/share/nuget/packages ]]; then - @lndir@/bin/lndir -silent "$x/share/nuget/packages" "$NUGET_PACKAGES" - fi - done + if [[ -f .config/dotnet-tools.json + || -f dotnet-tools.json ]]; then + : ${linkNugetPackages=1} fi - if [[ -f paket.dependencies ]]; then - sed -i "s:source .*:source $nugetSource:" paket.dependencies - sed -i "s:remote\:.*:remote\: $nugetSource:" paket.lock + if [[ -z ${keepNugetConfig-} && -f paket.dependencies ]]; then + sed -i "s:source .*:source $nugetSource:" paket.dependencies + sed -i "s:remote\:.*:remote\: $nugetSource:" paket.lock + + : ${linkNuGetPackagesAndSources=1} + fi + if [[ -n ${linkNuGetPackagesAndSources-} ]]; then for x in "${!_nugetInputs[@]}"; do if [[ -d $x/share/nuget/source ]]; then - @lndir@/bin/lndir -silent "$x/share/nuget/source" "$NUGET_PACKAGES" + @lndir@/bin/lndir -silent "$x/share/nuget/packages" "${NUGET_PACKAGES%/}" + @lndir@/bin/lndir -silent "$x/share/nuget/source" "${NUGET_PACKAGES%/}" fi done + elif [[ -n ${linkNugetPackages-} ]]; then + for x in "${!_nugetInputs[@]}"; do + if [[ -d $x/share/nuget/packages ]]; then + _linkPackages "$x/share/nuget/packages" "${NUGET_PACKAGES%/}" + fi + done fi + + # create a root nuget.config if one doesn't exist + local rootConfig + rootConfig=$(find . -maxdepth 1 -iname nuget.config -print -quit) + if [[ -z $rootConfig ]]; then + dotnet new nugetconfig + fi + + ( + shopt -s nullglob + + local -a xmlConfigArgs=() xmlRootConfigArgs=() + + local -ra xmlSourceConfigArgs=( + -s /configuration -t elem -n packageSources + -d '/configuration/packageSources[position() != 1]' + -s /configuration/packageSources -t elem -n __new + -i /configuration/packageSources/__new -t attr -n key -v _nix + -i /configuration/packageSources/__new -t attr -n value -v "$nugetSource" + -r /configuration/packageSources/__new -v add) + + if [[ -z ${keepNugetConfig-} ]]; then + xmlConfigArgs+=(-d '//configuration/*') + xmlRootConfigArgs+=("${xmlSourceConfigArgs[@]}") + else + if [[ -n ${mapNuGetDependencies-} ]]; then + xmlConfigArgs+=( + -s /configuration -t elem -n __tmp + # If there's no packageSourceMapping, we need to add * patterns for + # all the sources, else they won't be used. + -u \$prev -x ../packageSources/add + -d '/configuration/__tmp/add/@*[name() != "key"]' + -r /configuration/__tmp/add -v packageSource + -s /configuration/__tmp/packageSource -t elem -n package + -i \$prev -t attr -n pattern -v \* + -r /configuration/__tmp -v packageSourceMapping + -d '/configuration/packageSourceMapping[position() != 1]' + "${xmlSourceConfigArgs[@]}" + # add package source mappings from all existing patterns to _nix + # this ensures _nix is always considered + -s /configuration/packageSourceMapping -t elem -n packageSource + -u \$prev -x ../packageSource/package + -i \$prev -t attr -n key -v _nix) + + cd "$nugetSource" + local id + for id in *; do + id=${id,,} + xmlConfigArgs+=( + # unmap any fully-qualified patterns that exist, so they + # can't be used, using a horrific method for + # case-insensitivity in xpath1 + -d "/configuration/packageSourceMapping/packageSource/package[translate(@pattern, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz') = ${id@Q}]" + -s '/configuration/packageSourceMapping/packageSource[@key="_nix"]' -t elem -n package + -i \$prev -t attr -n pattern -v "$id") + done + cd - > /dev/null + else + xmlConfigArgs+=( + "${xmlSourceConfigArgs[@]}" + # add package source mappings from all existing patterns to _nix + # this ensures _nix is always considered + -s /configuration/packageSourceMapping -t elem -n packageSource + -u \$prev -x '../packageSource/package' + -i \$prev -t attr -n key -v _nix + # delete empty _nix mapping + -d '/configuration/packageSourceMapping/packageSource[@key="_nix" and not(*)]') + fi + fi + + # try to stop the global config from having any effect + if [[ -z ${keepNugetConfig-} || -z ${allowGlobalNuGetConfig-} ]]; then + local -ar configSections=( + config + bindingRedirects + packageRestore + solution + packageSources + auditSources + apikeys + disabledPackageSources + activePackageSource + fallbackPackageFolders + packageSourceMapping + packageManagement) + + for section in "${configSections[@]}"; do + xmlRootConfigArgs+=( + -s /configuration -t elem -n "$section" + # hacky way of ensuring we use existing sections when they exist + -d "/configuration/$section[position() != 1]" + # hacky way of adding to the start of a possibly empty element + -s "/configuration/$section" -t elem -n __unused + -i "/configuration/$section/*[1]" -t elem -n clear + -d "/configuration/$section/__unused" + # delete consecutive clears + # these actually cause nuget tools to fail in some cases + -d "/configuration/$section/clear[position() = 2 and name() = \"clear\"]") + done + fi + + find . \( -iname nuget.config \) -print0 | while IFS= read -rd "" config; do + local dir isRoot= + + dir=$(dirname "$config") + [[ $dir != . ]] || isRoot=1 + + @xmlstarlet@/bin/xmlstarlet \ + ed --inplace \ + "${xmlConfigArgs[@]}" \ + ${isRoot:+"${xmlRootConfigArgs[@]}"} \ + "$config" + done + ) + + runHook postConfigureNuGet } if [[ -z ${dontConfigureNuget-} ]]; then - prePhases+=(createNugetDirs) preConfigurePhases+=(configureNuget) fi diff --git a/pkgs/development/compilers/dotnet/dotnet.nix b/pkgs/development/compilers/dotnet/dotnet.nix index 7e629383ab372..7e94f3432f777 100644 --- a/pkgs/development/compilers/dotnet/dotnet.nix +++ b/pkgs/development/compilers/dotnet/dotnet.nix @@ -1,11 +1,14 @@ -{ callPackage -, lib -, releaseManifestFile -, releaseInfoFile -, allowPrerelease ? false -, depsFile -, bootstrapSdk -, pkgsBuildHost +{ + stdenvNoCC, + callPackage, + lib, + fetchurl, + releaseManifestFile, + releaseInfoFile, + allowPrerelease ? false, + depsFile, + bootstrapSdk, + pkgsBuildHost, }: let @@ -13,33 +16,31 @@ let pkgs = callPackage ./stage1.nix { inherit releaseManifestFile tarballHash depsFile; - bootstrapSdk = - { stdenvNoCC - , dotnetCorePackages - , fetchurl - }: bootstrapSdk.overrideAttrs (old: { - passthru = old.passthru or {} // { - artifacts = stdenvNoCC.mkDerivation rec { - name = lib.nameFromURL artifactsUrl ".tar.gz"; + bootstrapSdk = bootstrapSdk.overrideAttrs (old: { + passthru = old.passthru or { } // { + artifacts = stdenvNoCC.mkDerivation rec { + name = lib.nameFromURL artifactsUrl ".tar.gz"; - src = fetchurl { - url = artifactsUrl; - hash = artifactsHash; - }; + src = fetchurl { + url = artifactsUrl; + hash = artifactsHash; + }; - sourceRoot = "."; + sourceRoot = "."; - installPhase = '' - mkdir -p $out - cp -r * $out/ - ''; - }; + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; }; - }); + }; + }); }; -in pkgs // { - vmr = pkgs.vmr.overrideAttrs(old: { +in +pkgs +// { + vmr = pkgs.vmr.overrideAttrs (old: { passthru = old.passthru // { updateScript = pkgsBuildHost.callPackage ./update.nix { inherit releaseManifestFile releaseInfoFile allowPrerelease; diff --git a/pkgs/development/compilers/dotnet/nuget-package-hook.nix b/pkgs/development/compilers/dotnet/nuget-package-hook.nix index 4fe926b4684e7..1d00e1d781a1a 100644 --- a/pkgs/development/compilers/dotnet/nuget-package-hook.nix +++ b/pkgs/development/compilers/dotnet/nuget-package-hook.nix @@ -1,12 +1,14 @@ { makeSetupHook, + unzip, zip, + xmlstarlet, strip-nondeterminism, }: makeSetupHook { name = "nuget-package-hook"; substitutions = { - inherit zip; + inherit unzip zip xmlstarlet; stripNondeterminism = strip-nondeterminism; }; } ./nuget-package-hook.sh diff --git a/pkgs/development/compilers/dotnet/nuget-package-hook.sh b/pkgs/development/compilers/dotnet/nuget-package-hook.sh index 2bb79a0150cb7..145080350b6cb 100644 --- a/pkgs/development/compilers/dotnet/nuget-package-hook.sh +++ b/pkgs/development/compilers/dotnet/nuget-package-hook.sh @@ -1,29 +1,85 @@ # shellcheck shell=bash disable=SC2154 +unpackNupkg() { + local -r nupkg="$1" unpacked="$2" + local nuspec nuspec_l + + mkdir -p "$unpacked" + @unzip@/bin/unzip -nqd "$unpacked" "$nupkg" + cd "$unpacked" + chmod -R +rw . + nuspec=(*.nuspec) + nuspec_l="${nuspec,,}" + if [[ $nuspec != "$nuspec_l" ]]; then + mv "$nuspec" "$nuspec".tmp + mv "$nuspec".tmp "$nuspec_l" + fi + echo {} > .nupkg.metadata + cd - >/dev/null +} + +_unpackNugetPackagesInOutput() { + local -r unpacked="$prefix"/share/nuget/packages/.unpacked + local nuspec nuspec_l + ( + shopt -s nullglob globstar + for nupkg in "$prefix"/share/nuget/source/**/*.nupkg; do + unpackNupkg "$nupkg" "$unpacked" + @xmlstarlet@/bin/xmlstarlet \ + sel -t \ + -m /_:package/_:metadata \ + -v _:id -nl \ + -v _:version -nl \ + "$unpacked"/*.nuspec | ( + read id + read version + id=''${id,,} + version=''${version,,} + mkdir -p "$prefix"/share/nuget/packages/"$id" + mv "$unpacked" "$prefix"/share/nuget/packages/"$id"/"$version" + ) + done + rm -rf "$prefix"/share/nuget/source + ) +} + +unpackNugetPackages() { + local output + for output in $(getAllOutputNames); do + prefix="${!output}" _unpackNugetPackagesInOutput + done +} + +if [[ -z ${dontUnpackNugetPackages-} ]]; then + preFixupHooks+=(unpackNugetPackages) +fi + _createNugetSourceInOutput() { local package version id dir nupkg content local -a nuspec - shopt -s nullglob - - for package in "$prefix"/share/nuget/packages/*/*; do - version=$(basename "$package") - id=$(basename "$(dirname "$package")") - dir="$prefix/share/nuget/source/$id/$version" - nupkg=$dir/$id.$version.nupkg - nuspec=("$package"/*.nuspec) - - if [[ -n ${createInstallableNugetSource-} ]]; then - content=. - else - content=$(basename "${nuspec[0]}") - fi - - mkdir -p "$dir" - cp "${nuspec[0]}" "$dir/$id.nuspec" - (cd "$package" && @zip@/bin/zip -rq0 "$nupkg" "$content") - @stripNondeterminism@/bin/strip-nondeterminism --type zip "$nupkg" - touch "$nupkg".sha512 - done + ( + shopt -s nullglob + + for package in "$prefix"/share/nuget/packages/*/*; do + version=$(basename "$package") + id=$(basename "$(dirname "$package")") + dir="$prefix/share/nuget/source/$id/$version" + nupkg=$dir/$id.$version.nupkg + nuspec=("$package"/*.nuspec) + + if [[ -n ${createInstallableNugetSource-} ]]; then + content=. + else + content=$(basename "${nuspec[0]}") + fi + + mkdir -p "$dir" + cp "${nuspec[0]}" "$dir/$id.nuspec" + (cd "$package" && @zip@/bin/zip -rq0 "$nupkg" "$content") + @stripNondeterminism@/bin/strip-nondeterminism --type zip "$nupkg" + touch "$nupkg".sha512 + done + ) } createNugetSource() { diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index db9b5e68bdbf2..f9a5190d15885 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -1,17 +1,97 @@ -{ stdenv -, callPackage -, vmr -, xmlstarlet -, strip-nondeterminism -, zip +{ + stdenvNoCC, + lib, + callPackage, + vmr, + xmlstarlet, + strip-nondeterminism, + zip, + nugetPackageHook, + fallbackTargetPackages ? { }, }: let - mkCommon = callPackage ./common.nix {}; + mkCommon = callPackage ./common.nix { }; inherit (vmr) targetRid releaseManifest; -in { - inherit vmr; + # TODO: do this properly + hostRid = targetRid; + + mkPackage = + pname: version: + stdenvNoCC.mkDerivation { + inherit pname version; + + src = vmr; + dontUnpack = true; + + nativeBuildInputs = [ + xmlstarlet + nugetPackageHook + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + + pushd "$src"/Private.SourceBuilt.Artifacts.*.${targetRid} + pushd ${pname}.${version}.nupkg + + xmlstarlet \ + sel -t \ + -m /_:package/_:metadata \ + -v _:id -nl \ + -v _:version -nl \ + *.nuspec | ( + read id + read version + id=''${id,,} + version=''${version,,} + mkdir -p "$out"/share/nuget/packages/"$id" + cp -r . "$out"/share/nuget/packages/"$id"/"$version" + chmod +w "$out"/share/nuget/packages/"$id"/"$version" + echo {} > "$out"/share/nuget/packages/"$id"/"$version"/.nupkg.metadata + ) + + popd + popd + + runHook postInstall + ''; + }; + + packages = + [ + (mkPackage "Microsoft.AspNetCore.App.Ref" aspnetcore.version) + (mkPackage "Microsoft.NETCore.DotNetAppHost" runtime.version) + (mkPackage "Microsoft.NETCore.App.Ref" runtime.version) + (mkPackage "Microsoft.DotNet.ILCompiler" runtime.version) + (mkPackage "Microsoft.NET.ILLink.Tasks" runtime.version) + (mkPackage "Microsoft.NETCore.App.Crossgen2.${hostRid}" runtime.version) + (mkPackage "runtime.${hostRid}.Microsoft.DotNet.ILCompiler" runtime.version) + ] + ++ lib.optionals (lib.versionOlder runtime.version "9") [ + (mkPackage "Microsoft.NETCore.DotNetHost" runtime.version) + (mkPackage "Microsoft.NETCore.DotNetHostPolicy" runtime.version) + (mkPackage "Microsoft.NETCore.DotNetHostResolver" runtime.version) + ]; + + targetPackages = fallbackTargetPackages // { + ${targetRid} = + [ + (mkPackage "Microsoft.AspNetCore.App.Runtime.${targetRid}" aspnetcore.version) + (mkPackage "Microsoft.NETCore.App.Host.${targetRid}" runtime.version) + (mkPackage "Microsoft.NETCore.App.Runtime.${targetRid}" runtime.version) + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetAppHost" runtime.version) + ] + ++ lib.optionals (lib.versionOlder runtime.version "9") [ + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHost" runtime.version) + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostPolicy" runtime.version) + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostResolver" runtime.version) + ]; + }; + sdk = mkCommon "sdk" rec { pname = "dotnet-sdk"; version = releaseManifest.sdkVersion; @@ -25,7 +105,10 @@ in { zip ]; - outputs = [ "out" "packages" "artifacts" ]; + outputs = [ + "out" + "artifacts" + ]; installPhase = '' runHook preInstall @@ -35,40 +118,12 @@ in { mkdir "$out"/bin ln -s "$out"/dotnet "$out"/bin/dotnet - mkdir -p "$packages" "$artifacts" + mkdir -p "$artifacts" cp -r "$src"/Private.SourceBuilt.Artifacts.*.${targetRid}/* "$artifacts"/ chmod +w -R "$artifacts" local package - for package in "$artifacts"/*.nupkg; do - local copy - case "$(basename "$package")" in - *Microsoft.NET.* | \ - *Microsoft.ILLink.* | \ - *Microsoft.Tasks.* | \ - *Microsoft.NETCore.* | \ - *Microsoft.DotNet.* | \ - *Microsoft.AspNetCore.*) copy=1 ;; - *) copy= ;; - esac - if [[ -n $copy ]]; then - echo copying "$package" to packages - xmlstarlet \ - sel -t \ - -m /_:package/_:metadata \ - -v _:id -nl \ - -v _:version -nl \ - "$package"/*.nuspec \ - | tr A-Z a-z | ( - read id - read version - mkdir -p "$packages"/share/nuget/packages/"$id" - cp -r "$package" "$packages"/share/nuget/packages/"$id"/"$version" - ) - fi - done - for package in "$artifacts"/{,SourceBuildReferencePackages/}*.nupkg; do echo packing "$package" to artifacts (cd "$package" && zip -rq0 "$package.tmp" .) @@ -81,9 +136,9 @@ in { ''; passthru = { - inherit (vmr) icu targetRid; - # ilcompiler is currently broken: https://github.com/dotnet/source-build/issues/1215 - hasILCompiler = false; + inherit (vmr) icu targetRid hasILCompiler; + + inherit packages targetPackages; }; meta = vmr.meta // { @@ -143,4 +198,13 @@ in { mainProgram = "dotnet"; }; }; +in +{ + inherit + vmr + sdk + runtime + aspnetcore + ; + } diff --git a/pkgs/development/compilers/dotnet/patch-nupkgs.nix b/pkgs/development/compilers/dotnet/patch-nupkgs.nix index c34791b84ce00..6885d8df71f3b 100644 --- a/pkgs/development/compilers/dotnet/patch-nupkgs.nix +++ b/pkgs/development/compilers/dotnet/patch-nupkgs.nix @@ -1,82 +1,92 @@ -{ stdenv -, lib -, zlib -, curl -, icu -, libunwind -, libuuid -, openssl -, lttng-ust_2_12 -, writeShellScriptBin +{ + stdenv, + lib, + zlib, + curl, + icu, + libunwind, + libuuid, + openssl, + lttng-ust_2_12, + patchelf, + writeShellScriptBin, }: let - binaryRPath = lib.makeLibraryPath ([ - stdenv.cc.cc - zlib - curl - icu - libunwind - libuuid - openssl - ] ++ lib.optional stdenv.isLinux lttng-ust_2_12); + binaryRPath = lib.makeLibraryPath ( + [ + stdenv.cc.cc + zlib + curl + icu + libunwind + libuuid + openssl + ] + ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12 + ); -in writeShellScriptBin "patch-nupkgs" ('' - set -euo pipefail - shopt -s nullglob - isELF() { - local fn="$1" - local fd - local magic - exec {fd}< "$fn" - read -r -n 4 -u "$fd" magic - exec {fd}<&- - if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi - } - cd "$1" -'' + lib.optionalString stdenv.isLinux '' - for x in */* */*; do - # .nupkg.metadata is written last, so we know the packages is complete - [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ - && [[ ! -f "$x"/.nix-patched ]] || continue - echo "Patching package $x" - find "$x" -type f -print0 | while IFS= read -rd "" p; do - if [[ "$p" != *.nix-patched ]] \ - && isELF "$p" \ - && patchelf --print-interpreter "$p" &>/dev/null; then - tmp="$p".$$.nix-patched - # if this fails to copy then another process must have patched it - cp --reflink=auto "$p" "$tmp" || continue - echo "Patchelfing $p as $tmp" - patchelf \ - --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ - "$tmp" ||: - # This makes sure that if the binary requires some specific runtime dependencies, it can find it. - # This fixes dotnet-built binaries like crossgen2 - patchelf \ - --add-needed libicui18n.so \ - --add-needed libicuuc.so \ - --add-needed libz.so \ - --add-needed libssl.so \ - "$tmp" - patchelf \ - --add-rpath "${binaryRPath}" \ - "$tmp" ||: - mv "$tmp" "$p" - fi +in +writeShellScriptBin "patch-nupkgs" ( + '' + set -euo pipefail + shopt -s nullglob + isELF() { + local fn="$1" + local fd + local magic + exec {fd}< "$fn" + read -r -n 4 -u "$fd" magic + exec {fd}<&- + if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi + } + cd "$1" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + for x in */* */*; do + # .nupkg.metadata is written last, so we know the packages is complete + [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ + && [[ ! -f "$x"/.nix-patched ]] || continue + echo "Patching package $x" + find "$x" -type f -print0 | while IFS= read -rd "" p; do + if [[ "$p" != *.nix-patched ]] \ + && isELF "$p" \ + && ${patchelf}/bin/patchelf --print-interpreter "$p" &>/dev/null; then + tmp="$p".$$.nix-patched + # if this fails to copy then another process must have patched it + cp --reflink=auto "$p" "$tmp" || continue + echo "Patchelfing $p as $tmp" + ${patchelf}/bin/patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + "$tmp" ||: + # This makes sure that if the binary requires some specific runtime dependencies, it can find it. + # This fixes dotnet-built binaries like crossgen2 + ${patchelf}/bin/patchelf \ + --add-needed libicui18n.so \ + --add-needed libicuuc.so \ + --add-needed libz.so \ + --add-needed libssl.so \ + "$tmp" + ${patchelf}/bin/patchelf \ + --add-rpath "${binaryRPath}" \ + "$tmp" ||: + mv "$tmp" "$p" + fi + done + touch "$x"/.nix-patched done - touch "$x"/.nix-patched - done -'' + lib.optionalString stdenv.isDarwin '' - for x in microsoft.dotnet.ilcompiler/*; do - # .nupkg.metadata is written last, so we know the packages is complete - [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ - && [[ ! -f "$x"/.nix-patched-ilcompiler ]] || continue - echo "Patching package $x" - pushd "$x" - sed -i 's: -no_code_signature_warning::g' build/Microsoft.NETCore.Native.targets - sed -i 's:Include="-ld_classic"::g' build/Microsoft.NETCore.Native.Unix.targets - touch .nix-patched-ilcompiler - popd - done -'') + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + for x in microsoft.dotnet.ilcompiler/*; do + # .nupkg.metadata is written last, so we know the packages is complete + [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ + && [[ ! -f "$x"/.nix-patched-ilcompiler ]] || continue + echo "Patching package $x" + pushd "$x" + sed -i 's: -no_code_signature_warning::g' build/Microsoft.NETCore.Native.targets + sed -i 's:Include="-ld_classic"::g' build/Microsoft.NETCore.Native.Unix.targets + touch .nix-patched-ilcompiler + popd + done + '' +) diff --git a/pkgs/development/compilers/dotnet/sign-apphost.nix b/pkgs/development/compilers/dotnet/sign-apphost.nix index f804ab79d3321..021d9ef61a90d 100644 --- a/pkgs/development/compilers/dotnet/sign-apphost.nix +++ b/pkgs/development/compilers/dotnet/sign-apphost.nix @@ -1,10 +1,12 @@ -{ substituteAll -, callPackage +{ + substituteAll, + callPackage, }: let - sigtool = callPackage ./sigtool.nix {}; + sigtool = callPackage ./sigtool.nix { }; -in substituteAll { +in +substituteAll { src = ./sign-apphost.proj; codesign = "${sigtool}/bin/codesign"; } diff --git a/pkgs/development/compilers/dotnet/sigtool.nix b/pkgs/development/compilers/dotnet/sigtool.nix index fe5d1ebc6879c..04e0d5215098f 100644 --- a/pkgs/development/compilers/dotnet/sigtool.nix +++ b/pkgs/development/compilers/dotnet/sigtool.nix @@ -1,7 +1,8 @@ -{ cctools -, darwin -, fetchFromGitHub -, makeWrapper +{ + cctools, + darwin, + fetchFromGitHub, + makeWrapper, }: darwin.sigtool.overrideAttrs (old: { @@ -14,13 +15,15 @@ darwin.sigtool.overrideAttrs (old: { sha256 = "sha256-EVM5ZG3sAHrIXuWrnqA9/4pDkJOpWCeBUl5fh0mkK4k="; }; - nativeBuildInputs = old.nativeBuildInputs or [] ++ [ + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ makeWrapper ]; - postInstall = old.postInstall or "" + '' - wrapProgram $out/bin/codesign \ - --set-default CODESIGN_ALLOCATE \ - "${cctools}/bin/${cctools.targetPrefix}codesign_allocate" - ''; + postInstall = + old.postInstall or "" + + '' + wrapProgram $out/bin/codesign \ + --set-default CODESIGN_ALLOCATE \ + "${cctools}/bin/${cctools.targetPrefix}codesign_allocate" + ''; }) diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix index 0bfdc15f5fa7f..b10f0ac2cc321 100644 --- a/pkgs/development/compilers/dotnet/stage0.nix +++ b/pkgs/development/compilers/dotnet/stage0.nix @@ -1,130 +1,141 @@ -{ stdenv -, callPackage -, lib -, writeShellScript -, mkNugetDeps -, nix -, cacert -, nuget-to-nix -, dotnetCorePackages -, xmlstarlet -, patchNupkgs - -, releaseManifestFile -, tarballHash -, depsFile -, bootstrapSdk +{ + stdenv, + callPackage, + lib, + writeShellScript, + mkNugetDeps, + nix, + cacert, + nuget-to-nix, + dotnetCorePackages, + xmlstarlet, + patchNupkgs, + symlinkJoin, + + releaseManifestFile, + tarballHash, + depsFile, + bootstrapSdk, }: let mkPackages = callPackage ./packages.nix; mkVMR = callPackage ./vmr.nix; - dotnetSdk = callPackage bootstrapSdk {}; - - deps = mkNugetDeps { - name = "dotnet-vmr-deps"; - sourceFile = depsFile; - }; - - sdkPackages = dotnetSdk.packages.override { - installable = true; + sdkPackages = symlinkJoin { + name = "${bootstrapSdk.name}-packages"; + paths = map ( + p: + p.override { + installable = true; + } + ) bootstrapSdk.packages; }; - vmr = (mkVMR { - inherit releaseManifestFile tarballHash dotnetSdk; - }).overrideAttrs (old: rec { - prebuiltPackages = mkNugetDeps { - name = "dotnet-vmr-deps"; - sourceFile = depsFile; - installable = true; - }; - - nativeBuildInputs = - old.nativeBuildInputs or [] - ++ [ xmlstarlet patchNupkgs ]; - - postPatch = old.postPatch or "" + '' - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \ - src/*/Directory.Build.targets - ''; - - postConfigure = old.postConfigure or "" + '' - [[ ! -v prebuiltPackages ]] || \ - ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ - ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ - ''; - - buildFlags = - old.buildFlags - ++ lib.optionals (lib.versionAtLeast old.version "9") [ - # We need to set this as long as we have something in deps.nix. Currently - # that's the portable ilasm/ildasm which aren't in the centos sourcebuilt - # artifacts. - "-p:SkipErrorOnPrebuilts=true" - ]; - - passthru = old.passthru or {} // { fetch-deps = - let - inherit (vmr) targetRid updateScript; - otherRids = - lib.remove targetRid ( - map (system: dotnetCorePackages.systemToDotnetRid system) - vmr.meta.platforms); - - pkg = vmr.overrideAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ - nix - cacert - (nuget-to-nix.override { dotnet-sdk = dotnetSdk; }) - ]; - postPatch = old.postPatch or "" + '' + vmr = + (mkVMR { + inherit releaseManifestFile tarballHash bootstrapSdk; + }).overrideAttrs + (old: rec { + prebuiltPackages = mkNugetDeps { + name = "dotnet-vmr-deps"; + sourceFile = depsFile; + installable = true; + }; + + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ + xmlstarlet + patchNupkgs + ]; + + postPatch = + old.postPatch or "" + + '' xmlstarlet ed \ --inplace \ -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${./record-downloaded-packages.proj}" \ - repo-projects/Directory.Build.targets - # make nuget-client use the standard arcade package-cache dir, which - # is where we scan for dependencies - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n ItemGroup \ - -s \$prev -t elem -n EnvironmentVariables \ - -i \$prev -t attr -n Include -v 'NUGET_PACKAGES=$(ProjectDirectory)artifacts/sb/package-cache/' \ - repo-projects/nuget-client.proj + -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \ + src/*/Directory.Build.targets ''; - buildFlags = [ "--online" ] ++ old.buildFlags; - prebuiltPackages = null; - }); - - drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; - in - writeShellScript "fetch-dotnet-sdk-deps" '' - ${nix}/bin/nix-shell --pure --run 'source /dev/stdin' "${drv}" << 'EOF' - set -e - - tmp=$(mktemp -d) - trap 'rm -fr "$tmp"' EXIT - - HOME=$tmp/.home - cd "$tmp" - - phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} \ - configurePhase ''${preBuildPhases[*]:-} buildPhase checkPhase" \ - genericBuild - - depsFiles=(./src/*/deps.nix) - - cat $(nix-build ${toString ./combine-deps.nix} \ - --arg list "[ ''${depsFiles[*]} ]" \ - --argstr baseRid ${targetRid} \ - --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}' \ - ) > "${toString prebuiltPackages.sourceFile}" - EOF - ''; - }; - }); -in mkPackages { inherit vmr; } + + postConfigure = + old.postConfigure or "" + + '' + [[ ! -v prebuiltPackages ]] || \ + ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ''; + + buildFlags = + old.buildFlags + ++ lib.optionals (lib.versionAtLeast old.version "9") [ + # We need to set this as long as we have something in deps.nix. Currently + # that's the portable ilasm/ildasm which aren't in the centos sourcebuilt + # artifacts. + "-p:SkipErrorOnPrebuilts=true" + ]; + + passthru = old.passthru or { } // { + fetch-deps = + let + inherit (vmr) targetRid updateScript; + otherRids = lib.remove targetRid ( + map (system: dotnetCorePackages.systemToDotnetRid system) vmr.meta.platforms + ); + + pkg = vmr.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + nix + cacert + nuget-to-nix + ]; + postPatch = + old.postPatch or "" + + '' + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${./record-downloaded-packages.proj}" \ + repo-projects/Directory.Build.targets + # make nuget-client use the standard arcade package-cache dir, which + # is where we scan for dependencies + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n ItemGroup \ + -s \$prev -t elem -n EnvironmentVariables \ + -i \$prev -t attr -n Include -v 'NUGET_PACKAGES=$(ProjectDirectory)artifacts/sb/package-cache/' \ + repo-projects/nuget-client.proj + ''; + buildFlags = [ "--online" ] ++ old.buildFlags; + prebuiltPackages = null; + }); + + drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; + in + writeShellScript "fetch-dotnet-sdk-deps" '' + ${nix}/bin/nix-shell --pure --run 'source /dev/stdin' "${drv}" << 'EOF' + set -e + + tmp=$(mktemp -d) + trap 'rm -fr "$tmp"' EXIT + + HOME=$tmp/.home + cd "$tmp" + + phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} \ + configurePhase ''${preBuildPhases[*]:-} buildPhase checkPhase" \ + genericBuild + + depsFiles=(./src/*/deps.nix) + + cat $(nix-build ${toString ./combine-deps.nix} \ + --arg list "[ ''${depsFiles[*]} ]" \ + --argstr baseRid ${targetRid} \ + --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}' \ + ) > "${toString prebuiltPackages.sourceFile}" + EOF + ''; + }; + }); +in +mkPackages { inherit vmr; } diff --git a/pkgs/development/compilers/dotnet/stage1.nix b/pkgs/development/compilers/dotnet/stage1.nix index d6849c98e17d9..94fb0fa24c70d 100644 --- a/pkgs/development/compilers/dotnet/stage1.nix +++ b/pkgs/development/compilers/dotnet/stage1.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, callPackage +{ + stdenv, + lib, + callPackage, -, releaseManifestFile -, tarballHash -, depsFile -, bootstrapSdk + releaseManifestFile, + tarballHash, + depsFile, + bootstrapSdk, }@args: let @@ -14,13 +15,22 @@ let stage0 = callPackage ./stage0.nix args; - vmr = (mkVMR { - inherit releaseManifestFile tarballHash; - dotnetSdk = stage0.sdk; - }).overrideAttrs (old: { - passthru = old.passthru or {} // { - inherit (stage0.vmr) fetch-deps; - }; - }); + vmr = + (mkVMR { + inherit releaseManifestFile tarballHash; + bootstrapSdk = stage0.sdk; + }).overrideAttrs + (old: { + passthru = old.passthru or { } // { + inherit (stage0.vmr) fetch-deps; + }; + }); -in mkPackages { inherit vmr; } +in +mkPackages { + inherit vmr; + fallbackTargetPackages = bootstrapSdk.targetPackages; +} +// { + stage0 = lib.dontRecurseIntoAttrs stage0; +} diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index 58304188afa8d..cb482d7658cf4 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -1,18 +1,19 @@ -{ stdenvNoCC -, lib -, fetchurl -, writeScript -, nix -, runtimeShell -, curl -, cacert -, jq -, yq -, gnupg - -, releaseManifestFile -, releaseInfoFile -, allowPrerelease +{ + stdenvNoCC, + lib, + fetchurl, + writeScript, + nix, + runtimeShell, + curl, + cacert, + jq, + yq, + gnupg, + + releaseManifestFile, + releaseInfoFile, + allowPrerelease, }: let @@ -38,7 +39,8 @@ let drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; -in writeScript "update-dotnet-vmr.sh" '' +in +writeScript "update-dotnet-vmr.sh" '' #! ${nix}/bin/nix-shell #! nix-shell -i ${runtimeShell} --pure ${drv} set -euo pipefail diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 486ad2636a0e0..58c307c0a469f 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -6,6 +6,8 @@ set -Eeuo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" +rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}}) + release () { local content="$1" local version="$2" @@ -30,281 +32,171 @@ release_platform_attr () { platform_sources () { local release_files="$1" - local platforms=( - "x86_64-linux linux-x64" - "aarch64-linux linux-arm64" - "x86_64-darwin osx-x64" - "aarch64-darwin osx-arm64" - ) echo "srcs = {" - local kv - for kv in "${platforms[@]}"; do - local nix_platform=${kv%% *} - local ms_platform=${kv##* } + for rid in "${rids[@]}"; do local url hash - url=$(release_platform_attr "$release_files" "$ms_platform" url) - hash=$(release_platform_attr "$release_files" "$ms_platform" hash) + url=$(release_platform_attr "$release_files" "$rid" url) + hash=$(release_platform_attr "$release_files" "$rid" hash) [[ -z "$url" || -z "$hash" ]] && continue - echo " $nix_platform = { - url = \"$url\"; - sha512 = \"$hash\"; + + hash=$(nix-hash --to-sri --type sha512 "$hash") + + echo " $rid = { + url = \"$url\"; + hash = \"$hash\"; };" done echo " };" } -generate_package_list() { - local version="$1" - shift - local pkgs=( "$@" ) nuget_url pkg url hash +nuget_url="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" - nuget_url="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" +generate_package_list() { + local version="$1" indent="$2" + shift 2 + local pkgs=( "$@" ) pkg url hash for pkg in "${pkgs[@]}"; do - url="${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg" - hash="$(nix-prefetch-url "$url")" - if [[ -z "$hash" ]]; then + url=${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg + if ! hash=$(nix-prefetch-url "$url"); then echo "Failed to fetch hash for $url" >&2 exit 1 fi + hash=$(nix-hash --to-sri --type sha256 "$hash") - echo " (fetchNuGet { pname = \"${pkg}\"; version = \"${version}\"; sha256 = \"${hash}\"; })" + echo "$indent(fetchNupkg { pname = \"${pkg}\"; version = \"${version}\"; hash = \"${hash}\"; })" done } -version_older () { - local cur_version=$1 - local max_version=$2 - local result - - result=$(nix-instantiate -I ../../../../. \ - --eval -E "(import ../../../../. {}).lib.versionOlder \"$cur_version\" \"$max_version\"") - if [[ "$result" == "true" ]]; then - return 0 - else - return 1 - fi +versionAtLeast () { + local cur_version=$1 min_version=$2 + printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC } +# These packages are implicitly references by the build process, +# based on the specific project configurations (RIDs, used features, etc.) +# They are always referenced with the same version as the SDK used for building. +# Since we lock nuget dependencies, when these packages are included in the generated +# lock files (deps.nix), every update of SDK required those lock files to be +# updated to reflect the new versions of these packages - otherwise, the build +# would fail due to missing dependencies. +# +# Moving them to a separate list stored alongside the SDK package definitions, +# and implicitly including them along in buildDotnetModule allows us +# to make updating .NET SDK packages a lot easier - we now just update +# the versions of these packages in one place, and all packages that +# use buildDotnetModule continue building with the new .NET version without changes. +# +# Keep in mind that there is no canonical list of these implicitly +# referenced packages - this list was created based on looking into +# the deps.nix files of existing packages, and which dependencies required +# updating after a SDK version bump. +# +# Due to this, make sure to check if new SDK versions introduce any new packages. +# This should not happend in minor or bugfix updates, but probably happens +# with every new major .NET release. aspnetcore_packages () { local version=$1 - # These packages are implicitly references by the build process, - # based on the specific project configurations (RIDs, used features, etc.) - # They are always referenced with the same version as the SDK used for building. - # Since we lock nuget dependencies, when these packages are included in the generated - # lock files (deps.nix), every update of SDK required those lock files to be - # updated to reflect the new versions of these packages - otherwise, the build - # would fail due to missing dependencies. - # - # Moving them to a separate list stored alongside the SDK package definitions, - # and implicitly including them along in buildDotnetModule allows us - # to make updating .NET SDK packages a lot easier - we now just update - # the versions of these packages in one place, and all packages that - # use buildDotnetModule continue building with the new .NET version without changes. - # - # Keep in mind that there is no canonical list of these implicitly - # referenced packages - this list was created based on looking into - # the deps.nix files of existing packages, and which dependencies required - # updating after a SDK version bump. - # - # Due to this, make sure to check if new SDK versions introduce any new packages. - # This should not happend in minor or bugfix updates, but probably happens - # with every new major .NET release. local pkgs=( - "Microsoft.AspNetCore.App.Runtime.linux-arm" - "Microsoft.AspNetCore.App.Runtime.linux-arm64" - "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" - "Microsoft.AspNetCore.App.Runtime.linux-musl-x64" - "Microsoft.AspNetCore.App.Runtime.linux-x64" - "Microsoft.AspNetCore.App.Runtime.osx-x64" - "Microsoft.AspNetCore.App.Runtime.win-arm64" - "Microsoft.AspNetCore.App.Runtime.win-x64" - "Microsoft.AspNetCore.App.Runtime.win-x86" + Microsoft.AspNetCore.App.Ref + ) + + generate_package_list "$version" ' ' "${pkgs[@]}" +} + +aspnetcore_target_packages () { + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.AspNetCore.App.Runtime.$rid" + ) + + generate_package_list "$version" ' ' "${pkgs[@]}" +} + +netcore_packages () { + local version=$1 + local pkgs=( + Microsoft.NETCore.DotNetAppHost + Microsoft.NETCore.App.Ref ) - # These packages are currently broken on .NET 8 - if version_older "$version" "8"; then + if ! versionAtLeast "$version" 9; then pkgs+=( - "Microsoft.AspNetCore.App.Runtime.win-arm" + Microsoft.NETCore.DotNetHost + Microsoft.NETCore.DotNetHostPolicy + Microsoft.NETCore.DotNetHostResolver ) fi - # Packages that only apply to .NET 6 and up - if ! version_older "$version" "6"; then + if versionAtLeast "$version" 7; then pkgs+=( - "Microsoft.AspNetCore.App.Ref" - "Microsoft.AspNetCore.App.Runtime.linux-musl-arm" - "Microsoft.AspNetCore.App.Runtime.osx-arm64" + Microsoft.DotNet.ILCompiler ) fi + if versionAtLeast "$version" 8; then + pkgs+=( + Microsoft.NET.ILLink.Tasks + ) + fi - generate_package_list "$version" "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } -sdk_packages () { +netcore_host_packages () { local version=$1 - # These packages are implicitly references by the build process, - # based on the specific project configurations (RIDs, used features, etc.) - # They are always referenced with the same version as the SDK used for building. - # Since we lock nuget dependencies, when these packages are included in the generated - # lock files (deps.nix), every update of SDK required those lock files to be - # updated to reflect the new versions of these packages - otherwise, the build - # would fail due to missing dependencies. - # - # Moving them to a separate list stored alongside the SDK package definitions, - # and implicitly including them along in buildDotnetModule allows us - # to make updating .NET SDK packages a lot easier - we now just update - # the versions of these packages in one place, and all packages that - # use buildDotnetModule continue building with the new .NET version without changes. - # - # Keep in mind that there is no canonical list of these implicitly - # referenced packages - this list was created based on looking into - # the deps.nix files of existing packages, and which dependencies required - # updating after a SDK version bump. - # - # Due to this, make sure to check if new SDK versions introduce any new packages. - # This should not happend in minor or bugfix updates, but probably happens - # with every new major .NET release. + local rid=$2 local pkgs=( - "Microsoft.NETCore.App.Host.linux-arm" - "Microsoft.NETCore.App.Host.linux-arm64" - "Microsoft.NETCore.App.Host.linux-musl-arm64" - "Microsoft.NETCore.App.Host.linux-musl-x64" - "Microsoft.NETCore.App.Host.linux-x64" - "Microsoft.NETCore.App.Host.osx-x64" - "Microsoft.NETCore.App.Host.win-arm64" - "Microsoft.NETCore.App.Host.win-x64" - "Microsoft.NETCore.App.Host.win-x86" - "Microsoft.NETCore.App.Runtime.linux-arm" - "Microsoft.NETCore.App.Runtime.linux-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-x64" - "Microsoft.NETCore.App.Runtime.linux-x64" - "Microsoft.NETCore.App.Runtime.osx-x64" - "Microsoft.NETCore.App.Runtime.win-arm64" - "Microsoft.NETCore.App.Runtime.win-x64" - "Microsoft.NETCore.App.Runtime.win-x86" - "Microsoft.NETCore.DotNetAppHost" - "Microsoft.NETCore.DotNetHost" - "Microsoft.NETCore.DotNetHostPolicy" - "Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHost" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-arm.Microsoft.NETCore.DotNetHost" - "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-x64.Microsoft.NETCore.DotNetHost" - "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.osx-x64.Microsoft.NETCore.DotNetHost" - "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.win-arm64.Microsoft.NETCore.DotNetHost" - "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.win-x64.Microsoft.NETCore.DotNetHost" - "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-x86.Microsoft.NETCore.DotNetAppHost" - "runtime.win-x86.Microsoft.NETCore.DotNetHost" - "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Host.linux-musl-arm" - "Microsoft.NETCore.App.Host.osx-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-arm" - "Microsoft.NETCore.App.Runtime.osx-arm64" - "Microsoft.NETCore.App.Ref" - "Microsoft.NETCore.App.Runtime.Mono.linux-arm" - "Microsoft.NETCore.App.Runtime.Mono.linux-arm64" - "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" - "Microsoft.NETCore.App.Runtime.Mono.linux-x64" - "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" - "Microsoft.NETCore.App.Runtime.Mono.osx-x64" - "Microsoft.NETCore.App.Runtime.Mono.win-x64" - "Microsoft.NETCore.App.Runtime.Mono.win-x86" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" - "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Crossgen2.linux-musl-arm" - "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64" - "Microsoft.NETCore.App.Crossgen2.linux-musl-x64" - "Microsoft.NETCore.App.Crossgen2.linux-arm" - "Microsoft.NETCore.App.Crossgen2.linux-arm64" - "Microsoft.NETCore.App.Crossgen2.linux-x64" - "Microsoft.NETCore.App.Crossgen2.osx-x64" - "Microsoft.NETCore.App.Crossgen2.osx-arm64" + "Microsoft.NETCore.App.Crossgen2.$rid" ) - # These packages were removed on .NET 9 - if ! version_older "$version" "9"; then - local newpkgs=() - local pkg - for pkg in "${pkgs[@]}"; do - [[ "$pkg" = *Microsoft.NETCore.DotNetHost* ]] || newpkgs+=("$pkg") - done - pkgs=("${newpkgs[@]}") - fi + local min_ilcompiler= + case "$rid" in + linux-musl-arm) ;; + linux-arm) ;; + win-x86) ;; + osx-arm64) min_ilcompiler=8 ;; + *) min_ilcompiler=7 ;; + esac - # These packages were removed on .NET 8 - if version_older "$version" "8"; then + if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then pkgs+=( - "Microsoft.NETCore.App.Host.win-arm" - "Microsoft.NETCore.App.Runtime.win-arm" - "runtime.win-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.win-arm.Microsoft.NETCore.DotNetHost" - "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Composite" + "runtime.$rid.Microsoft.DotNet.ILCompiler" ) fi - # Packages that only apply to .NET 7 and up - if ! version_older "$version" "7"; then - pkgs+=( - "Microsoft.DotNet.ILCompiler" - "runtime.linux-arm64.Microsoft.DotNet.ILCompiler" - "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler" - "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler" - "runtime.linux-x64.Microsoft.DotNet.ILCompiler" - "runtime.osx-x64.Microsoft.DotNet.ILCompiler" - "runtime.win-arm64.Microsoft.DotNet.ILCompiler" - "runtime.win-x64.Microsoft.DotNet.ILCompiler" - ) - fi + generate_package_list "$version" ' ' "${pkgs[@]}" +} - # These packges were added on .NET 8 - if ! version_older "$version" "8"; then +netcore_target_packages () { + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.NETCore.App.Host.$rid" + "Microsoft.NETCore.App.Runtime.$rid" + "runtime.$rid.Microsoft.NETCore.DotNetAppHost" + ) + + if ! versionAtLeast "$version" 9; then pkgs+=( - "Microsoft.NET.ILLink.Tasks" - "runtime.osx-arm64.Microsoft.DotNet.ILCompiler" + "runtime.$rid.Microsoft.NETCore.DotNetHost" + "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy" + "runtime.$rid.Microsoft.NETCore.DotNetHostResolver" ) + case "$rid" in + linux-musl-arm*) ;; + win-arm64) ;; + *) pkgs+=( + "Microsoft.NETCore.App.Runtime.Mono.$rid" + ) ;; + esac fi - generate_package_list "$version" "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } main () { @@ -357,6 +249,7 @@ Examples: buildAspNetCore = { ... }: {}; \ buildNetSdk = { ... }: {}; \ buildNetRuntime = { ... }: {}; \ + fetchNupkg = { ... }: {}; \ }).release_${major_minor_underscore}" | jq -r) if [[ "$current_version" == "$major_minor_patch" ]]; then @@ -377,22 +270,37 @@ Examples: aspnetcore_sources="$(platform_sources "$aspnetcore_files")" runtime_sources="$(platform_sources "$runtime_files")" - local sdk_packages aspnetcore_packages - sdk_packages="$(sdk_packages "${runtime_version}")" - aspnetcore_packages="$(aspnetcore_packages "${aspnetcore_version}")" - result=$(mktemp) trap "rm -f $result" TERM INT EXIT - echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk }: + ( + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v$channel_version ($support_phase) let - packages = { fetchNuGet }: [ -$aspnetcore_packages -$sdk_packages - ]; + commonPackages = [" + aspnetcore_packages "${aspnetcore_version}" + netcore_packages "${runtime_version}" + echo " ]; + + hostPackages = {" + for rid in "${rids[@]}"; do + echo " $rid = [" + netcore_host_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; + + targetPackages = {" + for rid in "${rids[@]}"; do + echo " $rid = [" + aspnetcore_target_packages "${aspnetcore_version}" "$rid" + netcore_target_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; + in rec { release_$major_minor_underscore = \"$major_minor_patch\"; @@ -404,34 +312,35 @@ in rec { runtime_$major_minor_underscore = buildNetRuntime { version = \"${runtime_version}\"; $runtime_sources - };" > "${result}" - - local -A feature_bands - unset latest_sdk - - for sdk_version in "${sdk_versions[@]}"; do - local sdk_base_version=${sdk_version%-*} - local feature_band=${sdk_base_version:0:-2}xx - # sometimes one release has e.g. both 8.0.202 and 8.0.203 - [[ ! ${feature_bands[$feature_band]+true} ]] || continue - feature_bands[$feature_band]=$sdk_version - local sdk_files sdk_sources - sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" - sdk_sources="$(platform_sources "$sdk_files")" - local sdk_attrname=sdk_${feature_band//./_} - [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname - - echo " + };" + + local -A feature_bands + unset latest_sdk + + for sdk_version in "${sdk_versions[@]}"; do + local sdk_base_version=${sdk_version%-*} + local feature_band=${sdk_base_version:0:-2}xx + # sometimes one release has e.g. both 8.0.202 and 8.0.203 + [[ ! ${feature_bands[$feature_band]+true} ]] || continue + feature_bands[$feature_band]=$sdk_version + local sdk_files sdk_sources + sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" + sdk_sources="$(platform_sources "$sdk_files")" + local sdk_attrname=sdk_${feature_band//./_} + [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname + + echo " $sdk_attrname = buildNetSdk { version = \"${sdk_version}\"; $sdk_sources - inherit packages; - };" >> "${result}" - done + inherit commonPackages hostPackages targetPackages; + };" + done - echo " + echo " sdk_$major_minor_underscore = $latest_sdk; -}" >> "${result}" +}" + )> "${result}" cp "${result}" "./versions/${sem_version}.nix" echo "Generated ./versions/${sem_version}.nix" diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index e2a7924579946..401879088263f 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -1,138 +1,200 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v6.0 (maintenance) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.33"; sha256 = "0xpki5wnl629zcih2d70vr1cgrhwr10mf4r89dyfm4hmwfpjz0pl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.33"; sha256 = "0d26nch9v7aaxb6m8xjbwbbag88j8r7igbg512p242g7a03xp743"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; sha256 = "06mdbp3z8pvj6q15agzdgxiqdvk057k0ld0q6q2bcy5i39x9744m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; sha256 = "1gyxvfaigp8i7x7yf24xzk4z5p638zxfa0pmahcyly0afl8s0i2v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.33"; sha256 = "1q5aigywyx1jcm0ws2gql8y2ns6lrs9q6h85k3l8kamrbjls51jf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.33"; sha256 = "1m1qac3mpnhdz3xpjn3a659nis10v687aacjrgrlbmjffibh0wz7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.33"; sha256 = "0rks3lj4vwxlv1w6bk2v0z7lm5i22hzf46qcmc3qxndwmlp1frr3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.33"; sha256 = "101ibi2xfy9wnll7qbm257ifsmn4plqfa5649i331481m6hjscjj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.33"; sha256 = "14fgl7m0r9q3j0ab2v2g0jkby28d6c7386n0dx4zd1j516kcrzpg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.33"; sha256 = "00ky4jnrpq5zcpmrkjny74j2k466kw7sj4sbh361wql3q0ma9nm2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.33"; sha256 = "0fx2zh5266inw8c2a353gl6sfcssnc4l952sc83rpl48x0xy5hqr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; sha256 = "0iwxzkdlmhd4ks6ivrfp5hgwgxmr2cbx8jvz7vzj01v3zbv8m8hd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.33"; sha256 = "0r1knq9hzvx4qibrlvq8809r6pf3j3inq6aiw94dyrrkl1vfz3rr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.33"; sha256 = "03rxxv7vlaf7pbdcbyv2q93f5d0w7v9mhi2qy2nyiwscx1b1rrj5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.33"; sha256 = "1qazlv2aczbrzv5l4l0p94ix7q321i3j3jn6fcw0yxlgznjqw1dg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.33"; sha256 = "01kqcqjp2f5bx7nwx7ma90r7pjnc9vdb16k3fs1v3lvdb83mlwjn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.33"; sha256 = "04vrmd5blrqv2immaw4xlwcc8krlpnckdlxl5jg9mr7azq657z9d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.33"; sha256 = "15ki8y9607dw4ldixy041v3s6ld36j7r8gdhn31y6ffp0ij0s9p6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.33"; sha256 = "153hdch33nxbs4lwd799rvbac8kvbg1jbkkq440fmmy7001zdvmn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.33"; sha256 = "0v86zfpln81b7r5yxjf676xx372kmwn0fcciwnnx6xks3i9qdzy0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.33"; sha256 = "0rcg68qj84584v6vij6kqk2jrmgci26rc40cmf9ibc2h65cm3hjx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.33"; sha256 = "1605avj9l3f6vxghkwzvqhyx5n2ipyb9y7d0n32777pg0kjc29iv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.33"; sha256 = "0f92sp9120a4bqcws53migvpbv6iixfqb43jp38s3sgdv0dx3i1l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.33"; sha256 = "0xn1ckjg0zha3wib7pin29i0b3390xmanfrivm29x98mj644md51"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; sha256 = "0yn9cczgh2clmxl92jca176dkvqn33jc4jyl25s41z9y58gbc9nz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; sha256 = "18b8pf3dkbgav63yb2szdi96v6s1brn6yhbragzsw9iiwhvqxw8n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.33"; sha256 = "1c4j03a7dcxvb0lajllnkyi7jdjzvvfd739mnhpcy5dcfaz625yv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.33"; sha256 = "09hbn47rn8yn5646p12xzw60ijhshrwav5jsha2hn27d4i57ls5j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.33"; sha256 = "1x1b6hc4jg3l3fypdll6rqq29021v2p8y5piclyhsqwwhlzjb2cl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.33"; sha256 = "01pvlmwhdhp6ny3h5m0rm5mahkj33xgmrbcldvh1qsilwb4vqvsb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.33"; sha256 = "1yl8gy6abj4c7n2mkzs6v9mjzv2bhwdny7za6pclay4m1a4kijlf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "16ij3bf9kil06kh0ca1csqcg3x5ang46z9pd17y6f08im1l0xfj9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "122aw6hy2xws6wi00g3swcp7ria1qwzrz4ywakwbqjac0winshmn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "186r14nlx93g053yhxcq9lfai2j9w7nrjiff1y2q5bmnkfnbd38j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "12mxxvzi9rf53lj3vz2q8fpar915ghdhixpkm9q29kz8ly3hbv1c"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "0zjpj744gld18fni5gwr94yp5bmf7hk8k7mcpg5s34pyyzp3zd0q"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0yzs527173v46x77if2ark872sjx0a1spz08xsm9d3bpkx0ncyd1"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1hf30pxgpc1kcmfpcnd4v69xrav99npsv7apzj55fy9z83a2djgy"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "13vpx6vayxqk7g975bgvdslcfwaxvs3rj7ikn7ir3k0kivsp7dlq"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "1i60ry18padghnnwlyxcij0hc8361mh4mnsx4wy1y8ys45s5garc"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0k4h0j73sjd1w1zkcq1qdz2kdmrjnssr5w9g7xx2l1djkvw93lkv"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "09kzlvz9ddzj4x8p9qnjvb2xkzbhwn2phs4sxwa8305janbhypy7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "12sjcxxg0l2q3ks4s8lac2l5yb7xn691idww895jkxar7d47vjy4"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "119szgcdrbxqqmmz59phw83b7kv0vmfl2pafhnmx63wvyda1717x"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "15fmfgl0ga7fkz4bw74552ljs2l0iw6sm6xk0v90k6qdihy4z9ay"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1a0dvvsivcsr6r2ln8r0g7d08swh2pa5fnzcabif833x7rxlriqz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0kv445lsj1kkp2mgayp211i5q28j808v54z4fxifda3cynjpsyv1"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "090v3q7d7i1h4a8zafhhh4h4qgws7i4vr20px4x3sq2lcigqky28"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1s9ia1hh82pnzj0w6szjyg56vb9w9h1rlnqj1nb6nk6vj3a6ihiq"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1n5j69z3pvmas6a6p5c45qn6mzdmb8ns4yl2if1cc69n3fs6axmw"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1zbdbainvfx8m1228ql3zs2zs2dincl1fwgfivbwg0pb578l70ab"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "08aqnwzvxhvk9dlxra5f022hjgcsqgcs1kpdm09yy6yma3xd8v6y"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "04asl4lwf3wlrghccip463fri9sgarbgijky8052c1caj68bmscv"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0x38bnmilkkc2c3i62jkn3vj3visjx87drsj3m3k0x6psn6h3qmr"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1hkfp1p8z6ada8z5ilbn2j1pw6mqxw69r6719rcv8ggngpwwd21y"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "099s3fcqjl2sjp3fsn1xb3yq3qjv5nwsmy40ipr2wrf17lasjz2w"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1wbzabbc7br7my9f453n8jds29ry2mx3l3b03b4bc3zl1ri6spzn"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0jwyfcw085svfr1f3y5xbpap3mhszpax95l7rw6g77fp15qfdzf0"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0yk7j0d8hgkb9dkgkxrp19cjg09sl3vycpz9ff16md8jjakd2ywz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "06156xl3wia310qcfjahs5ni58j42pg8s0gjy7yzz7m7ixkig1kp"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1sydbax1kcg8nbcry6h4ik54gk2q5swbw5cay2w5xl985p6dwkjg"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "00pcsz4vd9mscrwbpwlqqnlacw2xihxgvlp6xw0ycjsdrkq4621z"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0l9j0fqpi22b791xs1vik98gr4zz004gxni85zmss64pqj7zabkb"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "1zpciqzf5g7sygj1iw3r575msfmr8bs56j68rx7jl90hzrdf14mr"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1qwbplriqj5b720lnl4h9848pixxagqqa7k73fa11x2r8yqn399b"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1nyffsb8lvj23x2xg38ngcbg8bh3apv9px1n9slf8jf9qlb6hnhc"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1ynzpwx6mmj3w5x37ivqjjk5is9hmgwwlb8p50rjhidhc99avlwj"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "00if84zqqkrl7gdak1hx8l93ixidj4sgxj5d6wjji93iiph4m9md"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0vd5xvmxvlqc6k1c86ib0fk582899vvkfnsnnfmw7f6s8271jcs3"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0lkv19rqhvykdvs3lnbv0lda66s6wz52ad244yirmmr6gx54a7jg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0g4aqyz0685mh4b2w3d96q0m7138w3j5w9ds9yli51gdlv0xpy13"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.33"; sha256 = "11qqd4vkjmypah5lg9y37ma374a7kwvrrqi14knc9rzi038xdzc3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.33"; sha256 = "0ghxb55azggk0cs8aasv57w7n1ag7wb981dfrqrag5cfi6gdwwlk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; sha256 = "0vglrj3yx5ykxy6lbpb6frsxcp3109rpl6zl859vy6vdmjskpdn2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.33"; sha256 = "1cnm270drlfq1f839r5frljfg8q4xqn0fqicf97bd2cwd1nyx8gl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.33"; sha256 = "0vrg6xbzhi8mbp6nas6admh6pja3akc9synlcpjh859mg9qr8886"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.33"; sha256 = "0vdabiysl8hjaza06yfmk2x45i2qhr092izx820qv8clfdggmb8k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.33"; sha256 = "0zlsdg3bn5i1s09p9lw7xfdcfrm0ii9a1zbfqhvqgvs4zwcvk17n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.33"; sha256 = "0jgmmy5y2ci29izn0w1dh73xvrmvmypbyxjiq1kxjq1si5j465mv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.33"; sha256 = "0l7bh7mfha16dbpmlvgfpkgblw0p00x52bcki96pkjldgqnf2fwr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.33"; sha256 = "03bk8c7shd8sfvlw8k58aq95yc094247722fs2s2456j1gsirqqj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.33"; sha256 = "0qzdhg82sxa1srjh5lpnjyyz6lww00j1b4sgm0581ya1cjz8b38c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.33"; sha256 = "1sn5q5q0qwnj5majqsfbzgirv0kgxs538ri9cbrp52sdz017c3a1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.33"; sha256 = "1ddmaapazmsvwmry58x117hjl2l3q7r52l8wk45h820q46v8m26v"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "13l2xvm9zlb2b8xmznjj341nrknhaqcz7hlg4ccs9rmw32p0zvdy"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1fiqsm2nwz45gxrakbkvfcsp3g8l0nl678df0k52ql4inn77f7p3"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1nrnwgpgqrjr1pipjld74h1nk2m1gfk83f6lid4hvznyvi4181ph"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0n8hm8dhl1k70iag7n6pkzi9nfc56xkz4y4xsn6hy792nw17haz2"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "02cjzf07kp8k2vb8hmf72rz6fx2y29biqvdhdva2jj2j1768a9gd"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0k0cc1swhcrf6ydw0qkx52ikc8mnjv9i0v963yp61n6dhsa5cv2z"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0ascpl1c8a710ggmxvkxw63rgp1gwkjdr03mmvwlwiwgxks5z4d0"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0ra2v9l3w9sid1hg21ss7lawp8mgdhv1g04napa4nrv84bcz7kkh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.33"; sha256 = "10hswinnzm4mvhaqj1kr352lx7a7m2c6dc96q7p5dizlsg2rsh54"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.33"; sha256 = "0h990mf442c2s9k3vfis7r1nhf36bm2xsmz8472vlhdgym3bvr9h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.33"; sha256 = "15s3ihn50jwh3wdswy2563fl8rjdn5lxwhfcsd8xsjp9j5ixpm27"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.33"; sha256 = "1vcq2m5bcrkvqdphjcx7lz780rgddi4h2sbwhw5ysxmns5nkpim4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.33"; sha256 = "1jh4xm42mzrd7xqp96qvvinhz7rs9qfal7243nfiznl4y9az4k85"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.33"; sha256 = "0zfqp5axbl5066655wsd4435194xfnfbs2k8hb1dp82a74fwz2p1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.33"; sha256 = "0kkqj31kxdsd8jzna25lh6f1kqlwpx5pfwgdn02qr7dzln8c25vw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.33"; sha256 = "04gc5p591kmn3divsqqn8s29x1l3klcysj4zskcidp1dkclx1dq2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.33"; sha256 = "1aik89f8pjg5vrz1lx6g0ccsbkcf38mw0591dbryqjwfdzp08g2f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.33"; sha256 = "171qj7ajbc3fhld7dbqm04xrqmqmhbfmh9vpsl6sqkgp58b8vg11"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "1pf31zyfxd68cs6pklhg5g8izp8r5jzkcxgq85px62ym6xp83r0w"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0in7gk5bi69gmm992cs4apj2kaxdjsdmfxcrl291822mi2ai3d2r"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "18m6qi5hjlscd8lkmc8a513zycfhm64mqyd7g032j02vrrz1d20y"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1jq2mc722g8xc7wggyxayfvhan9dplvk4rbp9pjkpiby25mlhj8g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.33"; sha256 = "1ighzhn8ngjnv53nn98b8n8krwh6k764r2kkxwfccajwhpn9sb23"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.33"; hash = "sha256-GcPiO+iI0JsHYlqURAmzWjOnDX2jDCUY4jYaIwr8ojs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-SboOaKgRAWf8Ce2mb8izqvTxGNYsKAbgNIDGmdwaMpo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.33"; hash = "sha256-BiGUcXo1FQTlZdR6ndhUQ8lrYG3KaGXNXRVF+Fc3L28="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-tkJtIwdMSbz4VNyTnz/HQcV8LuN6PAAiN5p34aHhSog="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-Eo22rJu2roKFD85Fme3hSYqoHE2YdehHAW+kTi0J2aA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-LOwFh6fozyRwqvP2CBt8JaSsrkNY/D0kHcXlFP/uvYo="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.33"; hash = "sha256-pMY7bdG2du0Lh3xpAUls7WWAzqenMwlvw3tmtkoVmO0="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.33"; hash = "sha256-BU3yVfKE2h+dHUQcqhxOOp8Pbdwbm3RxPy3/KkjtBMo="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.33"; hash = "sha256-4YrPHTlKoNvCgmgKvZx1naRQBiFN81KMMaDQ1VW52H0="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.33"; hash = "sha256-pECdxdP0x1buwSaxZpioR51ORRl5BokV3JXUb23kGoI="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.33"; hash = "sha256-MOW9RvWvQbrFIehX3UVdZjhoQz46uj1m0oIJQlwFKUE="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.33"; hash = "sha256-R9TbY5HpSt1R08xB3mmxTWZE3TBFeK4bH5BLUCyMQ5c="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.33"; hash = "sha256-ArfQKZst3BbZ1J9I7Rmdg4aehEYWY71jG7bOkMot7BE="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.33"; hash = "sha256-fBfBkKW/nYwFsO1xd0u/nOIZnIG0CGW/RE23PsOQeE4="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "6.0.33"; hash = "sha256-c+3lplcEkrMapHA+nQPt4v2IkeiAvif6u2Ux32V5Iy0="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "6.0.33"; hash = "sha256-qHleUXickhYB1CIWGWzsMB/BX61fuJXcVchkuKAOwLw="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "6.0.33"; hash = "sha256-wxAzeoLe47TV5GWXXVWRyC+AKqBuTJ79RqS0DwqJpGk="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.33"; hash = "sha256-9IIvr+MVkup8SygTV0HIHObHQt7gNAEj+0kYanmJ83Y="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.33"; hash = "sha256-ReYcVuhM8+it8FhEWNM+HLTiRsJi+8Xauscpus/uPQ8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.33"; hash = "sha256-NMTRG9jt6aHRuHKQhV2P0ex194t1FM0ZXkQBEdLVIjk="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-LKtXdCHaIx88J13bSmANZiAGgYyse8qtha+pi4LPwMQ="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-e9KR+J6yBSp6Py/xkrW2Mtc2xW84YDZ/4KFJPY4EkEw="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-x18Pl1WygIEU75poeIXlcP3ZxdrS4nRRJ/K3lv6mfyY="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-xMt9SDtZ9SlLQpy3GJKx/SxfqGCKIk30HFhQ8HpnUos="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.33"; hash = "sha256-E636XnOUoY2BQP1HkUCGWMRCupjVeQPUVxIiqn1cqm0="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.33"; hash = "sha256-g5zbB1DnCSKuCOWtF09GEqGn1uJLdlTN6kqdnSCzRjQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.33"; hash = "sha256-rwWOpf2Pdg84c8bKIUcMYuDTI0kXUELL/nl9psSmX+E="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.33"; hash = "sha256-obRKiJEVpZ5E3TE7q2oHaYwFYhI23rMiHwp+8ORkwXY="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-GLQ/7vf+kqHLu6yeiSY8rq5yPUmZvxKtQ6HRR8iRV34="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-oXlmQZ93jZaq7gj8q4MCXWpx0MxKuHhON2SPE44o+ns="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-/skm1EA/eVeK/Fedra9Naavck9mkWXZdZTOw+/oFw8E="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-mLZz9Y4TzJHjsTMemYfeXXHHqG77rXLSOxN3r7bpd48="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.33"; hash = "sha256-9oS5Gf9E74c3xG79oFKMoGbHmuuH03QT0CEWu8Zrmn4="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.33"; hash = "sha256-ToaiqVy5qonomAVBg5PO1GgrPKL4Cc1BZTJ0z/2LquA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.33"; hash = "sha256-5iYNZATXOePDsLA9lI80o1Gjxw4E+B4bJbwdYJJHcZY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.33"; hash = "sha256-2xdhvnKsFc8utDWN09zeXzZ5op+WUqkoWLuzdtQAkrA="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-3mzU+lDVG+8TqO3OoNnDmj0JhQCuqNxpS3PDvj+3WCE="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-m+m6kJGKBSYKQH7K+FZWT6eY3TDkRsbgy5QPxymhWhE="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-ueIBjdXXdDBHHVLndlCXOu4h97BTChMHE2xOGqtdaHQ="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-PojG+X32PbRZTuGYnAzvuBp+gxR20Vg+Uk2Zj264bsI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.33"; hash = "sha256-mTvhLH6NynlNipMtUToAF3C63rzubVrvaiYo6OqB61A="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; hash = "sha256-DaKK9vpjByD/Pn9L1BcTufbHHyzX5R2NnqTBStv8nUc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.33"; hash = "sha256-g/3W0QDx58TsJCHinDefR5EzVD3Dp0cLVNdXOTdpGIc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; hash = "sha256-wrY7taxtG79TQfQbenMCYVzWdXZm3UWN79OX7ofM9G0="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-vu0Prhi85qQZI4/C8xlW0M5sAxlS2l87WmLRn+rugo4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-4x53jrWRUCzKBK6hY6gFFL1xNXN7rqlyf4V8bkXVOLo="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-8AYUSNze/g1Ji9S4gaZ7oYppAySnUXnjDVlm/O7jNts="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-4it4ArciHQ+N1Z148mc3hTmb4p/X2PNUBGcGChuqEFk="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; hash = "sha256-lZCTehqxeLYENhg0CuYpYO6GY3/tP1UCNnJf9MddrRo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.33"; hash = "sha256-VnJaB1pt07GDdmOasNpOzMp7Mkiqns7t6as4cSVmeAY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; hash = "sha256-3ya2Hio+/UB0EdRLwuQYFu/ZzAmKSZFor5QJ+D5jyXo="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-/YQTVPObD9OrhU5dQV3dYM+zBuLwpvJrxbiv3Nj7OoU="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-XqVPPIwNmwnSBrObqg2PgAotqSiFHL7In+6oB+hz1ZU="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-H8dMez59DOTiUuxbV9QVkGsE2nkgI0tFNlmzHfXeDag="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-YXt9pfVsqOZid+STshFAEglcYgjievWquHMGqWkhZE8="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; hash = "sha256-W0SgEXUKeOoZVPUC5fpHw9zyyfydCOdPPxHdF5Xb3b8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.33"; hash = "sha256-Lf1TDP7q5JqeLLTTNpm9NE/EGKedcFVrFBtnukqreRM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; hash = "sha256-FvGON+QxJq7/U3lBb2xeQZttUmxfi+WH2eqt2Ya7aKE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-SPiJX2RUYD066ReIvEk8mj9MIIEQOvWRIjDE0w4eGyQ="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-OMJo1JDbTGuWDRJbmgNMPK1tyvPya8OB/PYKBGFQMek="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-vHZltBs2GcaCi4J6oi1atf1qLC6ElWuU0aruO34ystg="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-S4FD0SnrgsfXju5xFyizsQn9hf6DYiREqKi7baNabf0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.33"; hash = "sha256-uxZDZIk6YNlnwFF2v66vu+bdx4EtcGB/TCIy4Yuv9Uk="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.33"; hash = "sha256-OY/vdqAzZ99I4lEZbOOQw12TE0AIb5pXxKTvDxO2M2Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.33"; hash = "sha256-k3LenomOlacyzq4FlBY/TwV7+ClbK4U0A/O9r0pZHT4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.33"; hash = "sha256-9KHubWicibZOcixiByzuBKPnJM2u5DSQC9jR3MAR1bI="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-7SWFzAlSSCnUbrBtHFcSXnRnfhbHVYjWFhPdeYD7kgk="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-X2xWlIbN2GCuHyZtENOWtiI2oyh9YsCbNy4zyHVgDEw="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-oJFf9OyPR075rnWA3OTkL9yXh+F97l7fA+EoxAK9TCs="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-cM7z2SJoZ0vUVZaAFzZsr6LLFT1aB/FgaFEnPmjaQmU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.33"; hash = "sha256-EuMc9QvSFCK00E6Ic4ggCTBfElaoTMTpdho1qA9Dcw0="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.33"; hash = "sha256-53MAV3RO1kXzy5IpdZDZIOhoUzFqWHn7+A3aWwdTONQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.33"; hash = "sha256-tu72AwDH1+oAIXjOJcNbeyKm1s4pncYp0avbMSBrcJQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.33"; hash = "sha256-smh6SiTtCAuFglqWrXiGGsoIDP9dhGuIKdYjmw+xCyY="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-XHypFT3BZS7yjYD4qrktW+KB/Vg9WO3GlVpQiZkbOiU="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-9l9tYg70D7bIGmANOnoVPiehm0R2FOKSryevw9ZSf/E="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-wP3mcAnXnfMMz4eW1NX9GtZx1V29+OFCdlsXBDhznks="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-n3vRppIStWqCc+lf5vegOoEnWQo39/lmS2s+iBqQZ3o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.33"; hash = "sha256-DI2FvmRB+YAKqE+TFSQAnFPzvZf20gJl1kF1LdCD7WM="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.33"; hash = "sha256-I2cXLq282Y4Hqwwb4j4UIpZKzwdbzGV42LTzTSQdemY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.33"; hash = "sha256-wP+GUxx6dtOt5ZExByyvU5zRuznGye5LPisgS6/7Bm0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.33"; hash = "sha256-lIklP4WcYw09ZfEWj67YQYAkMM6G0na9G3Q8SRg0K/Q="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-d4YXZ4+nnv/98fIBjd4VRKISbdFQSccwCENFPmg3JRg="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-T07ezC0o0V648IoVvrguWMxHyowEGp/ZsuixGbpazes="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-PwhD8MxNS+YB7+bS/TqMXXCmqMWY8rt4ZrqmtsnX7AI="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-ay71j8SXGK3rLyja/ggA/5P8UJpxB91DOkuIeLEDMlE="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.33"; hash = "sha256-UjItoakBkTBGTMQU5TC9xFbt4imiLnwotTx510VcMYA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.33"; hash = "sha256-XcJRWTFQsBWTqwwQlo2I7NUsxcTTyLjNJqgQJDEyj2U="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.33"; hash = "sha256-S2+8yeI0ahzgbpStXF8fQ06oaqkZ1AKHt+bCBnml+wY="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-uZLgWv4QJCpPz8hIU/RCuTpdyyl58Bjk8/q84j6O7P4="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-K6VhsUdZ9BCUG2cehfFTvceLCEqQUEuBOKtIHDO9i+M="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-DFpoFsXJSeSoTjb0m/ZVAy70FnsWjddFH0JuipZ2zts="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-ktOtUmKwRSgzKBctyvmrMOlYppR4xzN64UPWajq/3/o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.33"; hash = "sha256-QQ12AvhNi3LzYilmNIrub4Kd4/vLaSxVLdJyDHDBxeo="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.33"; hash = "sha256-7/7MpglFhvZJb8AaNA4zDQm/pgRPbLEUkAOnDOqhz5E="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.33"; hash = "sha256-OybB5ATvnnPEsKAdn5a/UdjSPcT78wlf38YNmuRWBZg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.33"; hash = "sha256-jso4iQqVeEXZNeofbxuHS+wva9pG/1mFPYzIpYx/iPo="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; hash = "sha256-raZK4I1xpCglN63I/jSRLfY4EkUdhqnaOzRPjD9BLgI="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; hash = "sha256-QzMZjkDauMOrs1ZbN/dOCQlUpgMrGsTCNAzT3evupW0="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; hash = "sha256-Tx5FSn8m15qjJ0Q0JcrnRhujGgV7WTr0btNviHMKe1I="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; hash = "sha256-I/jbwabthRKpT7olXuTgaIRTATapDS4WgbUgA77Hijw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.33"; hash = "sha256-24iKtiEYCAQLmRxRUfLBgwoq4Qmho+Jz5VvXr65StbU="; }) + ]; + }; + in rec { release_6_0 = "6.0.33"; aspnetcore_6_0 = buildAspNetCore { version = "6.0.33"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/91f66f75-bd3e-48f1-acb9-99c0da753f96/42c47999ee4c4d108774536afe5da160/aspnetcore-runtime-6.0.33-linux-x64.tar.gz"; - sha512 = "12b34fe1d0a679ff63db4bf002a2988194d9e64d0e107d128c247821dd939a86eced0fe453c0638d3742dac3a32e533792c26299400fb4fd5566b75177e66875"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/4ac9397f-3f4a-4cd0-aba2-35e7f1b47396/9823f50c32028899f430bc3ae87251b1/aspnetcore-runtime-6.0.33-linux-arm.tar.gz"; + hash = "sha512-f6jM4xyaoMg9/RZ7ehFsi0o00hsRVO/HgbwqOMFNNQ54tbnub7jjgU5k3sbJLg8r9cXMmvkMc+o4zLZlQGBBdg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0c5a5f3a-881e-4ceb-a334-c5e3b210eef8/9834ffebacea659cd14d272fb01f81c4/aspnetcore-runtime-6.0.33-linux-arm64.tar.gz"; + hash = "sha512-emCnejBgcKO5TbGs+nOTi2iAzQeb2sPlyrF0pHr0Z7kgjp9B2OEuCAgx1SgVHNqltmC+papv5TfsFEVDwP/9lQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0c5a5f3a-881e-4ceb-a334-c5e3b210eef8/9834ffebacea659cd14d272fb01f81c4/aspnetcore-runtime-6.0.33-linux-arm64.tar.gz"; - sha512 = "7a60a77a306070a3b94db1acfa73938b6880cd079bdac3e5cab174a47af467b9208e9f41d8e12e080831d528151cdaa5b660bea5aa6fe537ec144543c0fffd95"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/91f66f75-bd3e-48f1-acb9-99c0da753f96/42c47999ee4c4d108774536afe5da160/aspnetcore-runtime-6.0.33-linux-x64.tar.gz"; + hash = "sha512-ErNP4dCmef9j20vwAqKYgZTZ5k0OEH0SjCR4Id2Tmobs7Q/kU8BjjTdC2sOjLlM3ksJimUAPtP1VZrdRd+ZodQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d4641b35-5b85-4250-9913-0f6a2c276888/bd8483d09a767f6c19f9274da2819624/aspnetcore-runtime-6.0.33-osx-x64.tar.gz"; - sha512 = "f8dcf3d6de7a34d7fb402fd1ddf55bd810cccb95831d12312bc7607c6c7de8a46200c66d7e753250103961ba2e97fa6a85206b49442e1aeab1e290ec69bb55c5"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/e9b663a7-2199-4111-b18e-5ec1f2f2f87e/1746ce0319914f58806f523c6f6ed24d/aspnetcore-runtime-6.0.33-linux-musl-arm.tar.gz"; + hash = "sha512-V0q861fybhX04s60g3Zh4ZLECJhoSIDgeLitTPyPUG4lpQ883HJ24XqVVuleK5LrxtQadKZWJEGA0nNBSFqc6w=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/74fa4afa-a6d6-4c32-8ef7-fe88148f10cd/c887bff014d198532ba942988cba124b/aspnetcore-runtime-6.0.33-osx-arm64.tar.gz"; - sha512 = "26a2f1d6cb3ef9df5b6abc16e025fc2e9aeda386b5da53428abae67d76ff007bc921aec60cff9675dbb7291db7b75c5a7bcaadb54e8c04de59308b02dde924cc"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a4b5cbf6-85d9-46a0-b698-aaf3cde78d34/e1d46fec4ac226e170ccbacbf111d911/aspnetcore-runtime-6.0.33-linux-musl-arm64.tar.gz"; + hash = "sha512-PaV7PeE02zjxcJRRjRZlM1ZJHPXWciKyw31yDsEAZE3suPs62NymRRNO+6e1e/Faol/oS5oScRqoDH3gxghhtA=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/94348e55-d279-4667-abf6-00a70cfa4773/67a06176a4ac8fbab11013cd728ed823/aspnetcore-runtime-6.0.33-linux-musl-x64.tar.gz"; + hash = "sha512-9aQ7C8HIMv1wzfpP4JhJYCdggxEzokEvX30llJbM0NxlmZunek6NSwanYUuFHUeX+S1cfFwcJvOWQrde3P8Twg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/74fa4afa-a6d6-4c32-8ef7-fe88148f10cd/c887bff014d198532ba942988cba124b/aspnetcore-runtime-6.0.33-osx-arm64.tar.gz"; + hash = "sha512-JqLx1ss++d9barwW4CX8Lprto4a12lNCirrmfXb/AHvJIa7GDP+Wddu3KR23t1xae8qttU6MBN5ZMIsC3ekkzA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d4641b35-5b85-4250-9913-0f6a2c276888/bd8483d09a767f6c19f9274da2819624/aspnetcore-runtime-6.0.33-osx-x64.tar.gz"; + hash = "sha512-+Nzz1t56NNf7QC/R3fVb2BDMy5WDHRIxK8dgfGx96KRiAMZtfnUyUBA5Yboul/pqhSBrSUQuGuqx4pDsabtVxQ=="; }; }; }; @@ -140,21 +202,37 @@ in rec { runtime_6_0 = buildNetRuntime { version = "6.0.33"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/250c78ac-a53f-4679-ad2a-cc31fa4c4001/204b39eb9634a8dd9f39cbcaf56030f2/dotnet-runtime-6.0.33-linux-x64.tar.gz"; - sha512 = "0892015544d8903999f8e0fadab6b4b91eb180e495fa5e36c1a755b1d42e134858b7bdbfd60d1880650d9c528d07e31b9ccfc73e650e5d890a955902a89139cf"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/19a5a6e5-87bf-44b2-b7ed-ac44e9a253b8/00fca686dc0139022528dbe5f6e0f0b3/dotnet-runtime-6.0.33-linux-arm.tar.gz"; + hash = "sha512-wzSbHJi/jQt50NPeXBJ5L73UrvHAS20MEV1aplHP0uhkJSEXCzEtsMtvrNBXlYs4fGDrauW4KOIlAwDvvW8xlQ=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/694cd8af-7e9f-4161-8c1d-1c9a7b1d074f/d3a8dc90d971ec4f135f6452c176dc93/dotnet-runtime-6.0.33-linux-arm64.tar.gz"; + hash = "sha512-xwDUrj42H6KjkKj88pSiJ3kxsOpgvUovDsK7mCu2xhi6AC5ZVcPuloByB7JW4QKJzxz6NyApt1iu+mvxJo1F+w=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/250c78ac-a53f-4679-ad2a-cc31fa4c4001/204b39eb9634a8dd9f39cbcaf56030f2/dotnet-runtime-6.0.33-linux-x64.tar.gz"; + hash = "sha512-CJIBVUTYkDmZ+OD62ra0uR6xgOSV+l42wadVsdQuE0hYt72/1g0YgGUNnFKNB+MbnM/HPmUOXYkKlVkCqJE5zw=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/694cd8af-7e9f-4161-8c1d-1c9a7b1d074f/d3a8dc90d971ec4f135f6452c176dc93/dotnet-runtime-6.0.33-linux-arm64.tar.gz"; - sha512 = "c700d4ae3e361fa2a390a8fcf294a2277931b0ea60bd4a2f0ec2bb982bb6c618ba002e5955c3ee96807207b256e10289cf1cfa372029b758aefa6bf1268d45fb"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/e311cc4b-e2a4-46ef-8f0f-5996ac64e6d2/0a423f3d95284288d08250ce9e34ba06/dotnet-runtime-6.0.33-linux-musl-arm.tar.gz"; + hash = "sha512-qVlKSJ+GNK8B58YKyrX37grFRLmM5z7mcTWb7Nb2sp9NnmTf4xZoIsBQYVdzHsRPptsCqL4bF6J5r2GmZ5z9OA=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/82217487-71ef-43cb-8678-d293b802b5a6/cfe49dd7b7e0e3040d4fdc9258c61dde/dotnet-runtime-6.0.33-osx-x64.tar.gz"; - sha512 = "a0ad81d4bb361d91edc7b42142828fb5ac5b75376e6ad0137f7f28bba5c0d0b68c67af708bc85c15ebb7aac5f98df20bd83a56144a1bf9ac5aeaf5caf84e4128"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6c147b46-cd90-4412-9df3-ca84fe040261/d026454e65fe16a83590bd75f139fbf4/dotnet-runtime-6.0.33-linux-musl-arm64.tar.gz"; + hash = "sha512-5XB5cLKoUrgLH9d6OIPlDeySXZHriQEsFm5KRekXBkwkBApuREsFR2cDPLm56DFLa1EX/62m0kirf5DI5A/lVQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/aad5df88-c193-4579-b847-633186659a2f/1688cb1838ae0f0b67d16f3ed808f566/dotnet-runtime-6.0.33-osx-arm64.tar.gz"; - sha512 = "95d0e646f688e6f46545625dfae46d8325c7aee4661d3f0e59044acced9c6192ff51524355696e8f868ebd112e9a036d01c951f7249d863c300d07c1a0913d1a"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/28d86acf-06f5-4bff-919b-28a26264591b/452ad01a142981b4ee4fd55b97117cf7/dotnet-runtime-6.0.33-linux-musl-x64.tar.gz"; + hash = "sha512-O/5Pnd4Cva812wcnHPVoc7UIwyKTGLvn1Hju2FVBftOUHZ2ajt4v0cxc5fe3PE5a5GZtLMR/4q4J1fhiXEbpgg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/aad5df88-c193-4579-b847-633186659a2f/1688cb1838ae0f0b67d16f3ed808f566/dotnet-runtime-6.0.33-osx-arm64.tar.gz"; + hash = "sha512-ldDmRvaI5vRlRWJd+uRtgyXHruRmHT8OWQRKzO2cYZL/UVJDVWluj4aOvREumgNtAclR9ySdhjwwDQfBoJE9Gg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/82217487-71ef-43cb-8678-d293b802b5a6/cfe49dd7b7e0e3040d4fdc9258c61dde/dotnet-runtime-6.0.33-osx-x64.tar.gz"; + hash = "sha512-oK2B1Ls2HZHtx7QhQoKPtaxbdTduatATf38ou6XA0LaMZ69wi8hcFeu3qsX5jfIL2DpWFEob+axa6vXK+E5BKA=="; }; }; }; @@ -162,47 +240,79 @@ in rec { sdk_6_0_4xx = buildNetSdk { version = "6.0.425"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f57cd7db-7781-4ee0-9285-010a6435ef4f/ebc5bb7e43d2a288a8efcc6401ce3f85/dotnet-sdk-6.0.425-linux-x64.tar.gz"; - sha512 = "a04b75af7c5850238a8d99a6f60b37753467db615831bb3833c14aec86faa2d6ee9b8643885798924a01e28acff44ac9ed39c89f7cbe53c5cb8753c802e85039"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/2ff9a08a-9a84-498d-83e2-82e3e3c3d03d/64b283f30bb7df0260c8a7596dfcdff4/dotnet-sdk-6.0.425-linux-arm.tar.gz"; + hash = "sha512-4Muzo4dP7HYCbVzhGs2uB6cg6wK1AMh4gqrrpI5uwpDWI3PlG1M2fsqqG9S9dw8soaquw6hJm90cEUiU2qpNrw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ec8e29f5-2fbe-47d8-b0c5-81f11434c00f/ba4bd30be448d649e5ddf1991bf76252/dotnet-sdk-6.0.425-linux-arm64.tar.gz"; + hash = "sha512-wV+VZk/QVw1bDLlMeva7pf6DBHAATw6VjknVN2RxTL+N3WILONSHtgon2/1GepVYVqqz35yVjN4XyUIHn9qlWg=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f57cd7db-7781-4ee0-9285-010a6435ef4f/ebc5bb7e43d2a288a8efcc6401ce3f85/dotnet-sdk-6.0.425-linux-x64.tar.gz"; + hash = "sha512-oEt1r3xYUCOKjZmm9gs3dTRn22FYMbs4M8FK7Ib6otbum4ZDiFeYkkoB4orP9ErJ7TnIn3y+U8XLh1PIAuhQOQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/04bfd229-7d52-40dc-a5eb-d31fe15fbf44/639e3b8aa8616ad25515bfe36faeb2c0/dotnet-sdk-6.0.425-linux-musl-arm.tar.gz"; + hash = "sha512-xZ6g72yA+AkHrqIj3Hqa1pQxseZyNN7k/uD5EJ7nzovVivaxAq0ReIn04syO98zu+absgLEFeMbqS4RBLyseBg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ec8e29f5-2fbe-47d8-b0c5-81f11434c00f/ba4bd30be448d649e5ddf1991bf76252/dotnet-sdk-6.0.425-linux-arm64.tar.gz"; - sha512 = "c15f95664fd0570d5b0cb94c7af6bba5fe830470004f0e958e49d53764714cbf8ddd620b38d487b60a27dbfd467a955856aab3df9c958cde17c942079fdaa55a"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b5f55496-6494-45bc-9ba3-7aefdefb4518/61f15988a48d429bec81f5c5307f01d9/dotnet-sdk-6.0.425-linux-musl-arm64.tar.gz"; + hash = "sha512-1Yqs5bAh/HMKDaIjPoXjrkcyVqfekzS4kyzC4NBQVDwesbFtzTR193fN9Z5ClxyF0n3vSX/lzwamtgRs6NI+xA=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ce410b9f-c7f6-4180-a373-bcb6528a0778/448c9df07432b5dc62d08868ccfef62a/dotnet-sdk-6.0.425-osx-x64.tar.gz"; - sha512 = "5757c661d82408680a6e45efbca260bb9da145bd83f8275280e9ba756a2827ce35c7ae77cb248e9ee6c6cf46730c6e50152b98c0a082c0de764f5e522dfb6ca2"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c94a92f9-153a-4620-844c-f964dcc7eb8e/ad7baee9c9ed782a5c9ad34509ff47a5/dotnet-sdk-6.0.425-linux-musl-x64.tar.gz"; + hash = "sha512-zZVyNYECuCFIdP81O76Casm6Dw0m1JST8xKoo7x8D6ui/IK9Xft0AonTJC3N94s0GZbThiNyPGkb5Gk3WnLfng=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/24192716-57e3-4e69-9950-7840e05053d1/79398f054d34fb3e424c029e6d41a551/dotnet-sdk-6.0.425-osx-arm64.tar.gz"; - sha512 = "7383b188c8500ab8625cd34f69f7ec5a4d9ff4ca715f95ee020f2bd082d5023697b021ca4b3b1e6a0782fae2ff89586e541e454fedacdf1c49b42f6e47d12011"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/24192716-57e3-4e69-9950-7840e05053d1/79398f054d34fb3e424c029e6d41a551/dotnet-sdk-6.0.425-osx-arm64.tar.gz"; + hash = "sha512-c4OxiMhQCrhiXNNPaffsWk2f9MpxX5XuAg8r0ILVAjaXsCHKSzseageC+uL/iVhuVB5FT+2s3xxJtC9uR9EgEQ=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ce410b9f-c7f6-4180-a373-bcb6528a0778/448c9df07432b5dc62d08868ccfef62a/dotnet-sdk-6.0.425-osx-x64.tar.gz"; + hash = "sha512-V1fGYdgkCGgKbkXvvKJgu52hRb2D+CdSgOm6dWooJ841x653yySOnubGz0ZzDG5QFSuYwKCCwN52T15SLftsog=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_6_0_1xx = buildNetSdk { version = "6.0.133"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3fd189c1-072f-4193-8f1c-663b68b9b06f/bf63007e0f0ba0b3d07f1af06c1dee6a/dotnet-sdk-6.0.133-linux-x64.tar.gz"; - sha512 = "7b4fe0095bc6d3ea43fc3b32f2fc2ccc8fec83b0c50ff74b9e9a019ed40721f46c60d7b3ac08841a5f89d0802d8c347b14a445032a00f3d9a8661558b9c74794"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/af2b3ac2-cf96-4087-809b-60192e8564d0/952e49c2581e6c73d6229c2ce14e994d/dotnet-sdk-6.0.133-linux-arm.tar.gz"; + hash = "sha512-6Ua3XNGqu1M5mqv6RBCC2cwPMk2zcdlgeSvPWrZkRaFjAvEfkea6NMaZpr7WRe5PF87FXZtxGXJvABEADixuNw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/759c84b7-4d67-4eb4-94c6-0214d150db31/aea9ac1878560278c50174ee213d88c6/dotnet-sdk-6.0.133-linux-arm64.tar.gz"; + hash = "sha512-aCDWLO1tl3Dr02Z6ZKdOIklHHuWSDkzkEB8h5VlQ+NROvk/78gvGYmD9XR7cXlNKbwtwUi/EGl5I51sLsA5uoQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3fd189c1-072f-4193-8f1c-663b68b9b06f/bf63007e0f0ba0b3d07f1af06c1dee6a/dotnet-sdk-6.0.133-linux-x64.tar.gz"; + hash = "sha512-e0/gCVvG0+pD/Dsy8vwszI/sg7DFD/dLnpoBntQHIfRsYNezrAiEGl+J0IAtjDR7FKRFAyoA89moZhVYucdHlA=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/b700d687-929e-4e81-be67-1f7f39cd01da/f9d75264cbf2786cae51edfd57c72208/dotnet-sdk-6.0.133-linux-musl-arm.tar.gz"; + hash = "sha512-xmabIp3sZGchla/XoY6qwwpROoanAAbqtXDtr4qWfoUpvtMQ9OkQdvxM7H8LULSya7Gp1hcJqvPqSH7dMuF2QA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f92a7e79-c792-48bb-8d07-4a6ee24b62d6/26bc7013753251407efd71eaf6ad8a3a/dotnet-sdk-6.0.133-linux-musl-arm64.tar.gz"; + hash = "sha512-Tkz5HhzprAV2OLKjI2N1KMiYZtqPiPbHD/yI1UtrcoF4GtF+Ys3wP19oRHrk7O5IsV+5fJCLyaVcOMdb8HXCTg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/759c84b7-4d67-4eb4-94c6-0214d150db31/aea9ac1878560278c50174ee213d88c6/dotnet-sdk-6.0.133-linux-arm64.tar.gz"; - sha512 = "6820d62ced6d9770ebd3667a64a74e2249471ee5920e4ce4101f21e55950f8d44ebe4ffbf20bc66260fd5d1edc5e534a6f0b70522fc41a5e48e75b0bb00e6ea1"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/31aa43a2-5537-4423-8994-564c25089f9e/872a4380086a5a174025e2835a2fe043/dotnet-sdk-6.0.133-linux-musl-x64.tar.gz"; + hash = "sha512-9Sur8vgIZ1NZN0aN925x7322UKWGEzMJoQtNigTKIFPN+OekJvb/NKPmc0N/c81RabGhw3a8CZNfyjSozyEjNw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c8f09b91-04fe-4d0a-8d01-0556c53f2a5d/cbfe49b3182a2c4ebc7aecd22b6ac881/dotnet-sdk-6.0.133-osx-x64.tar.gz"; - sha512 = "e142785256b731abd6f7bda79b1422ba6eb9135f61526d6f687be67146253403cbec85d3ee66f49e577e7f296b32f94fa705ccf048292b1c00f981d2ef4fd52e"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fee562a1-baa6-4e8f-a3dd-2c49eae8a891/564d31d1daea39179782c413f99c6160/dotnet-sdk-6.0.133-osx-arm64.tar.gz"; + hash = "sha512-wBkxUhZs775gp8vbSvfi3zZcnmegzg/1zBqgakbU/9bMzaO/AmpHEW8C5MUodf3XBKo4CBfbw+q2U9MPT1/+IA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fee562a1-baa6-4e8f-a3dd-2c49eae8a891/564d31d1daea39179782c413f99c6160/dotnet-sdk-6.0.133-osx-arm64.tar.gz"; - sha512 = "c0193152166cefbe60a7cbdb4af7e2df365c9e67a0ce0ff5cc1aa06a46d4ffd6cccda3bf026a47116f02e4c52875fdd704aa380817dbc3eab653d30f4f5ffe20"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c8f09b91-04fe-4d0a-8d01-0556c53f2a5d/cbfe49b3182a2c4ebc7aecd22b6ac881/dotnet-sdk-6.0.133-osx-x64.tar.gz"; + hash = "sha512-4UJ4Ula3MavW972nmxQium65E19hUm1vaHvmcUYlNAPL7IXT7mb0nld+fylrMvlPpwXM8EgpKxwA+YHS70/VLg=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_6_0 = sdk_6_0_4xx; diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index 159d9cc239853..21fa129c33638 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -1,146 +1,208 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v7.0 (eol) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.20"; sha256 = "0ab1l6r77a11sk450jhhi9flvsn8gp4fz2il2a0vk1lw5rw23047"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.20"; sha256 = "050wdpwp7hjk5c9xyx0vj1cmslcdl9acldhxs6al3nx83vssa1kv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; sha256 = "0wi679cxlfx8s5nl3iqgma9nmxzbi73wamxshgpaaj2dg3z5xrqz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; sha256 = "0bgi8rx7dam9727v936h5ap81fx4k9n708002raw9v69p8yva5v6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.20"; sha256 = "0h6f18k05w66797yyj7yqbf6jv5k3c5r089mkw43y4gbqz27vbmy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.20"; sha256 = "1xlqjar4j0g1a7wf8ixjpnn6i19zxr3c7pwr6jdn06yzbi20ri7q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.20"; sha256 = "0l2md2g657arlf703vf9y8x1k0zx50zf4wy4f96m6qgs9jx8s6py"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.20"; sha256 = "1r2nxc0nm2n5dc7laf65yqbjv23g9fzwcvv8vhrnvir6j3lgxfcl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.20"; sha256 = "1n0dz6k338wmadkgb7x0jywz2qxf3427wkjw8xn2zdz4m1fcj58c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.20"; sha256 = "05srdy7bvgasr0yx1mxkilbkls14k0dmp4mzc7jiqv7xspc4jwwn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.20"; sha256 = "00npza90sgnvls4k1k95mhgiw5fpxcrxf60fi17k871m6igdfh1q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; sha256 = "1q86xz3v8p24728bl7sw0flhzk042ygxa23k0qyhxdn0qwzzq6bw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.20"; sha256 = "1jjb4jsnm0f1q0s8199nympm9vifaa129l0bj4j1z94i1g85nw1w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.20"; sha256 = "0cn8j76jbbp6vpf00kr1wwr4z1ij0sgdymawff32qvj44wfmhpnl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.20"; sha256 = "0cbk7shnry75p95zyg14pszf396pgpyjwzhraqbds5mmncqisvgz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.20"; sha256 = "02fz22di6ax1819spb4v22nb89glp3h08kk88am6rx3vgb440sbm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.20"; sha256 = "0wvg2rfp4v8cnqkfjv4ifj9q0bd3vljqnbnf719nf1h0ilmcxcjx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.20"; sha256 = "1mq59gpd6p46zl2nl5ijjncghx6fms9nig9zqhxazjd15bqy0l33"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.20"; sha256 = "01xpgbphknkjqgsbcngvckg3a8q0y74g409v7hmxsh7rjcradnqd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.20"; sha256 = "155z494bpri732h1yba6ggmalgwxw68qjpyrbzfj9mi4whwy6p47"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.20"; sha256 = "021mg80b9x25jpdm2rc6m91wib15bb5arkxjjfa0cp509i5hnshi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.20"; sha256 = "0jpxs82ndrbs3r28951v0p31ngfkhcs0k7plgywyvd1lpkvdm2nh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.20"; sha256 = "0bcnw653m7w7if6z84rf4k3mr7hdmvnlv4icflk0kc5jd98bkvhc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.20"; sha256 = "03107bdy4i9sckpwnk9s497sfq1prl4mccbc3mak43vbnfyqrsad"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; sha256 = "1lhlaj2ra25jjr6f6rq5rw4wg981h9js7amld10ccyg2vfrswv9d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; sha256 = "1w5r2nv27h3csd5qd3sx2zmf5drrp3ygb519m4hvn5lazyfah5p6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.20"; sha256 = "0r002hclq07y275qwj5pq0nxmb6k8h8yglcynpvw8m0pz8d9mr9g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.20"; sha256 = "0msncsn0lz0dvc6clvc4blq8a1bv5qap7qx27fdibdx24i5lsjya"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.20"; sha256 = "13x37m9mdg8pvq1rzcrr4bp5yqaayz7173p39s623n8zjxrh60ww"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.20"; sha256 = "1cv1zmkiz114vk0b0spnnczagbcks5k1fb198lc88pi3c9dpfm0d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.20"; sha256 = "0wpf2p1476ns8xd5qvih5llswag133q4s6mj62yzbba890lg5y78"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "02iri99mhfq9awdymsqhg86pg6qfgfig2r2w96jm9lbx4gkg1rgm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0g24nr6v86nikikfvg2b3d8im9cp1hib3xiccklbhkpbym3y98dj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1dldykby8yfvq7r7kmlg5wi6spy1ngsxbs18ng34lcqjfxjjdnpb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "07ip7aflkg89gsbfm1w7sgidn4lvc3csrirzkbdv2jhm876bxz2y"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "13pvjwqlacls6hz719lwc6rz0ghs29gxywisldwnwwbm9i6wdnga"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "15qwwdf3c03gs916r3k49wwg411cmrf5xldydkxjjab8pavdlq0s"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1mjwlxy5gy7k2iil1jcrssqspn3hrpm2dqwghzx9dr61wvpl6sq6"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0dwpzaasn5044aqm2xix3czfgrwx0y0jwis6p0x8n8jdqyskpim2"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0ai75b700v76rmqlblxpkwsd97jidfd5kn3jl0y52yq0ylvc4zyf"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "1jkh7kjhaghslhlx6x7w03kdxi1xbrgxwdj9qav0ci7nvf5j00v6"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0k5skgnss5hknr4r15gxph54zhk65cnglp117gih8qxyzn0245m7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1kllpbyldix05ab1pb775ykxwh9lrcji9vqbyp964b8m68r9yf1h"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0a5gajmkchf2ad3zwmjaa6mw72snf6hrf3xz581mn8qnjjv68whj"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0xsyd8jvj39z99ga9x26g1fi4zi39pf3ym87fr9102bg5rllj8m6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "18jp8cykpj40r61ji5fpvfj7yw6cw041l6r4q30am9sj80sgq73m"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "086cn7jilskr7q2hfy810f4hshzhm9r6kvd2kjzvjwf93s0qfgya"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "11y8c16m63kb1masa0x7ympwjg93ffyp4yfycd0fcf0zhzyw00bx"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "175qh1czpm8vs0ifbg3iwgz2cn3v0rvd51g1k81k6j00z9gmhrsm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "098177bqda2viwzcabsxrpj1p45jqi5fnyfg9xnnw198gh0iskvj"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "180bkmdr4h14a8l2gs9khm835037pw8aqgjz4snx6wxhq7jbdypr"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0jdvi1pcb3fxqa01633asixs93rg1lfq98vnba018nbqdifqyvf1"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "09can99m6psr9v93awwkahyxq899sg1l6p8gpp4qscqwpil22r4c"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0idzsi16ny8bjhii6fwjwqn8wmy8x4q2y0zx4d1vmxfx51ym634f"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1k5yigh196dn961bbvbyy8jfvw8ghmk4da313a304b4m9rf6q5c6"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "1rnpmqmgdw2y9snjj3kp2irg1aggkq2lccd7v4q53ghnl55jdil8"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0xibpawi6nahdbrdcb71panhx4w5zlmbfxspwmljn2a77sy9caw7"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "07qrpww6nd67xjj3jin97jwiymyxgpm9mdg4raxs9ss0pc05l5xv"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0dskgn19yhsq28hvzqs422bq64y5gx5cx33m1m3zq8mfycvscnsv"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0k70cb1lh6j9qg4pjy6r58z0n5xip3l6i6vkgrdx2rqqvpmq2ky8"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "1qr458jrmsb9nijll88hp56msjmvnk20q73x7qypvqlydsn2ap3y"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1503pddh5klr3z9kpmbxnr4w472v1w8ggh37iqi79z3b0x72zzi6"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "09ddji35a92iq9f4rm5xmz1vi3bki75xskq3iypjbc52ar7wkfl1"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "03338hfl2sb8ca9v3a42b4fgr7qyv3r2khc0ydhif45r0xjx6zrx"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0lnm29n2z4r7kjwyfa5gbl8qc5nbbc5qkl9kg8vj2xb9mlk5zsmz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "15ah793265ikivb5iqblcl4x86g4bqgwmhdlhikgv6a18bq32sjz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1jnz72f7m292863wvpmm12gwdnqwbvm45br1958f0gkgp0zmhyjs"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "18k3qs54a4x342ypc0p54ch6xwx9wpfgb5f6iyw0i0f8jjxspbay"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0nyk8x3myh6b0jfka8mvxbhlzl38qiljky8acfkyvw4dzw0y63rb"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0541ykf9hhc56jin59lg5iw96apcg740wg1hrj0m8dagjll2c599"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "09dlmiqcscdrvjrg9w5mjlz59ly0la4as4hkadz6j4mqvv2k7j6y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.20"; sha256 = "11bcpf986m4wzrln9v4frh63arrg9r3vmv2lq7x338xnrwxadz8q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.20"; sha256 = "0i07x8kwsifhzkbx1j8argx31g9dxppqwaysn21cd623d16r2g1i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; sha256 = "0aq01ld9k4064bgki4q4g4fl08i82pnh5xgxaqk3k48nbsbrzvwc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.20"; sha256 = "18an54s6jldf330ckigig6s1xnadm7zygrlb35qrhawvygbqayal"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.20"; sha256 = "1fv6p9idx6g58y0khw7jl23lkwj01l8246mv045i9q6sp3fm9m2v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.20"; sha256 = "0qfv5w1s5pj3c46jx2g75parx12p40rywacvb7v0fbllj2nvm89r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.20"; sha256 = "10d13b4vl5nhk3iqcpbhdhqgwmymzx875w4yq3pwjkcc2vyhg3j5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.20"; sha256 = "1rbl46pfwh1hkbf5djy1khqyiv2fivkgxs0gcnpx0kpx4lncf73a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.20"; sha256 = "03760jw9bbhcg5gmx5z5xjyccl0sv1lzznk3hx2ynwrwg6dhbkyi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.20"; sha256 = "1gw4wlraqbr5m5w62wyfx7gsvyj92a8h7i04n9jgc6sfs4yfrsz4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.20"; sha256 = "0fcph5pd0myyzzl3ihnvp6wii4vl09ayri5ba12xgixb3qidskgp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.20"; sha256 = "1zxpbwc52xsylc6kwk0sqf24cgyv9b2cz9l3icpl1hnkqims9xy4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.20"; sha256 = "1jhw9f2mzx8a1bqdiq7ylk8nccwcqa57sd31ykd7lzq1wbhy2r45"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "11l84kx7v6y10kzlsr74kwvvz44wzj476m5mkm2xv2b8pv1z0i7z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "11xxvyals3q16bzjd7a4gg0nzidsm822aa92yd752jzcxchdn6z0"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0dg1m80mxvabdkqjgynnws6vlzj9469d5nrjnk5x2zqcsw9kjj08"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0rdq3z66azlwsak8n8j9jz8pj0lwsvz9f7n6k7x6mlz20wcw4qs6"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "02ymh38rj3pwak3g9qhviv64kqpclcp40paijg7m184y5bli68b3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0s9bca6p8j96as25r22vbcmyyhbavkczdk68ypd7qn4g1s44l34w"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1mi25ilkzw9375lybrmi78g24xzmcz7mnqgjf8y9qvivwsf7ysgn"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "15jfwa5fva8qz6g2gnbxnppd9cfs7r8fspc9xb7n9zgxl7w5n6gd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.20"; sha256 = "1xvhyafgxaraf97s364a3jk5dad4hsssqqvzx4i8qwg36fdijcq2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.20"; sha256 = "1r27bm12x9gwzv0cid1fdzx9hv9bdy6p6a65lypjzvgwfdgnyksv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.20"; sha256 = "039l3qdsz3ima2jgvp8nqby68cr9mvj8q2xd0lmx37drxvck7bx4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.20"; sha256 = "05zybhb8dc22f934gj3f55xvsfvqizq0nf4d29ns3z9d370jklp3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.20"; sha256 = "01rrnbwjpy138pra53ypixk3cr528fazjsl3vsrvf6jnymgxlb4y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.20"; sha256 = "0g09yyi0a00q9xa51p1k9hvdj20jmy1ss2r2l28zk9s7lwyih7kl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.20"; sha256 = "09kb949p1qc6rz6mf736id8qfsj6dq8azbrpzx19xzpnylqjch47"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.20"; sha256 = "0l76v2w34igvh6i2hgvhfwmkcch1574ylwl1159649pg7c95kj7c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.20"; sha256 = "1jj2mzcn1dd66fic37wnyrvd07fplrsdj4azrvi0qz3qyykc8wmj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.20"; sha256 = "0q8i69qc58kyxzxfz0cqjlbjcz1n3p130nz2q852rvvcxa4644zc"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "09xk16nb9wrsgjr531dhd7mvpqa7b50akmkqrlndyspma7cbvrzn"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0l82bqvqw5qqhkgrxfscc4dw197b5sh7ic63pymdhixvx0d3fi1h"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "18sarln3kbkqc1ab9jnadcqqxs8iicf7jqldxzbjzhdpmf96vwna"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1vh3ymhv33qysc4vj4gb3g1rgajy4jr4kxfjcsq2myn96aan84i1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.20"; sha256 = "12w9hlq70ynkrgqbr555lnqmbf67iz3kaci2vi07zsn3mmak3z6j"; }) - (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "0c966243j6m22hy3n922rl64vi6y1l7ljn69bwydm5clyh7zvn0a"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "11c31fzq4qfxcsz3p6vzdfnaqs29saf1dnmzq7l90p6ylwsblc7f"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "087q3p57snmvvzzqpxp3vwvi2q21kzlk8qh1w6axrcjdci31xmji"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1nc8m38jsqai934nn26f6dkl3c0r4sabssjiizcixdyypzlv3hcf"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "0iyn0rkf9vf7vbd58xs24209557dzq1dppjb5d35g39z2kh06k1c"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1b0ys3g3bg9kxxvs1h1kj79b9n9nl2g6hjhmb3c2cpp4slzlsd3d"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "14nq8b869k43chsn4ba3b3ww9w25fip39ik8rfxa1z8l5k4k6xb0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1gajqvzf18p0jppvcwky0shkmw4nzwz8hzx4kwblrs41d8xmw39a"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.20"; hash = "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-9eXw5iN90VSlSVxk8aJ7Dpt3DXoQ6+obVwk7WFOKOQo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.20"; hash = "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-sqHkR/XrTrjoZCz2sSIMl6UaURtLvO1mnNEatE22RDw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-69omZXcSM0rGsyjo1fWzwV9tIi+P1nnywdt55Nf0jbY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-Xvy+zEEVSrHbmj/HrNlgmxLb4tOHh+qWfgm9SZ06Nx4="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-Ctj9D/SUldo8X8lYSQ8N3sRNDM1CJDs8FKIaOYgwJjE="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.20"; hash = "sha256-49IpwRkt/aFtEo04C/CPeDu9eyluyEdGckKwhhZc/hc="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.20"; hash = "sha256-nizaX/VWGrez3oNq+ZVDomQ2Zo/Xj6LyRSP4K/myOQc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-7jC6NKfeXJDowb/aFpzSSWisrGt/mzu+Zt1hgr8Lg4U="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.20"; hash = "sha256-dB4YPadHp/mRoCILrYOvEgjZNkwz3FBUTxgABaL3CTw="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-LEwD4BQ/jVdGK0ve2wL+7ZSSgCBCd1Ta2sft5GYG1kc="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.20"; hash = "sha256-AjMZmzPjcYwi6X9jrLWGpKlWphyKmKFPciqr/pzycPc="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-W09vX3P87S+vp8Uoc41vK22Y+m8utMjA/vylLkJdR+Q="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-UdYeRmRNstyV4QFiNOmfQWARN9/j9ov/37tafcod+CA="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.20"; hash = "sha256-pK8z2e65ndErBa0LjOSuKTNk/MIW3f2kUDWOrxseNA0="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-jsGx6b/etx7Zj1FqvZQmGbBBZzPOCGvJSFFhLdGoiNk="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.20"; hash = "sha256-7MhZEjvvJmJSCYFy6skpATI2K3dwPyiigftFMrjY5lA="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.20"; hash = "sha256-h0AmMfX2/p5C/zevrxBuRmqHUYtmHFfNz4bhcBNJayY="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-bTRNP9XkXibYWBVKaJ6gNtm00pEzwKB37zO9Nd7QHqw="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "7.0.20"; hash = "sha256-dXex6q5gQcBJ5Xccf27GxrTAvTlJyTC5i9Ln0IWBjJA="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-YHUzySwU/aC6y2jGNG50RfDE+VhDLWI1ZIPMZNBC2JI="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "7.0.20"; hash = "sha256-5nZu1DgEqIy5HufEOE/4wyXuVyUWSozmpMh/+kqt95A="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-Kg1eO2qB6EwXn6R/iD7/lvA6oQZ+crbvleCi4P7GUr0="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "7.0.20"; hash = "sha256-T6M4ND0K6i9CI5g08rgaPpECR2968YsJ2+2N2FsKYz4="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.20"; hash = "sha256-h4AheC6chrmBEjSK78h9yOpNXYoQSlDI1CGoc7KhYSk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.20"; hash = "sha256-1F5YHSdEbiyGc1xV354GMoZPMuchTwDc3eauJc2RyDI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.20"; hash = "sha256-DO65UGqysAkmdSySTe2uDZ5cxyQuE/SNi4efOorhli0="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-zn/CNvUAe1E8oHLYWZprUZ7UNJ+300VxzeZsAM4qJyo="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-ZgMgi9v2RAa2wkk23l9ePcTe5gD8dNMppBo+BeU8cMo="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-pxYigP2+YwTjOyFc+iwrZsJPCrz9lZBJthMWre2bukw="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-MDifMjIVLWLS9QvvFCXLNEHepy/nrBuWKqDHRv26lM4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.20"; hash = "sha256-OaG6rZCULgf2WZsp7jMgV4Se1S3niS4NYUPeogMv22E="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.20"; hash = "sha256-ewal9R6o20GV0R02ylSijVFdWZAbdN8TK1PCc/ltHBQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.20"; hash = "sha256-/20dMbO1Ft0WVhl+Lv1916Thvr4kPP9LuuX4bKE+czE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.20"; hash = "sha256-TemMvbNrDzJVHWwxVgnNN2CnTyI6TcvvZDpF4ts6IAw="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-6tnGTUx1cW55ozpy318SGj7ws2GcpnA+NJoyRTGX+44="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-GmDatrpoKSn7bL7RXlyuLATyOE9kjmxC0m8ANlzjHJc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-BmtD7+bB5Jb6h4/jJurNcNirsdaZyUBjFPP4V3ynXNY="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-osY7tcdNIos6uEZHLoEHnefnPhs9dlGxIgQUq5X6lzc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.20"; hash = "sha256-RY4H/RaMTcnvwJ7wclD/1Vf+MGxwXYbjmNAWuskaoYE="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.20"; hash = "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.20"; hash = "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.20"; hash = "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-wW2PXWx4WRSAWnajhB0NL4+ke9RqDBOAwt2NxW6Iu0k="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-jGQhaLwcM43JvQ9dQ8PTKSHcPVSTczXSTllfU1OyiiU="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-jgxTfSjd9bpDI/0DLzDpyFeOLOaSOxMjlAt5a0LUv0U="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-hhVsXE6VLAKGGmGoRmaFD/HtJPJ+7bWCSbaZFOCLvsw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.20"; hash = "sha256-0c8Fm3k8c+tFh2Pa/2nYGlDGvOzll15feQyulbgE5gw="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; hash = "sha256-fBn8P8fAtg49BnMI1Z8XBMwPqQNcH7qQOERctMfvBuE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.20"; hash = "sha256-GP2mOs+2ozH6wVTsukdOL2c1DMyO7GRp/pxUg5K7bIU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; hash = "sha256-jO+fl14WkTkmVv31Au0VKCJAHXkEkzjfIgaQmRoNACs="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-/0Tww75oid1FnbVUc4j8nJC/N5/kZE3/BMGbffokiIY="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-4BvbIOvsS1FO8yIpJQSqusVvwXtEnSb/MgEPTZXfvYc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-CEg5E9cMf9HLtDLb0pIhSX66jebW+ifxbEvtXgGq4TU="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-RmPCGQfi02r6mcYel/7WnAJ50ZdJIoum0px+ZcwfuGU="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-H+de/nhNSKXug7pXxceJ6/dqk6oPx0Ft0ag72lk6JnI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-dWlAyHp79GyqQmhOBOC49CW0rBCbrKtTQKErE5sQ3wk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-LW2us9viecZAaLSqo2WCAaXHCc8FZ+NMlrIIlYVUFNI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-EnJktpQWI1sDKr8Pl6FxVovDq1FKVv5HU8JBNqtUryg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-piJJaS5vCRBSdgdVP9xNI34SXXhG9KReSj8NuSVqXnc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-dRz8NEBSp6rAwCQbGgjgzHB/pNvXlSiDyYDIOz1DV6I="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-yj+HgR7Jcbm/nKLtaXKq8EMNiQMBeQcFPnlqGuWxzCA="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; hash = "sha256-Zhe1PbrJ7MRVFgAgcGyapLuArirQjLSPOKmqdnpG8S0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.20"; hash = "sha256-XbLOKo0ABmdTOM4uiyXdoy2Ak3SRbOkmtgxtcl0Wb3M="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; hash = "sha256-5haonP+KFrshqSmU9fy4Obfi6hddj4ZL02zAI7YVufA="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-fQHA/YcfOOZAY955cr1zIz3Jb/WnA6VVDWsOU01gyIc="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-VWdYX/oASDMDmuGF0nYGe1gm/uNxvOUi0BvV+1mAuJw="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-ck8dAXwoBW5tT89560rEspAb5M1dL8U+j1uohtc5ASU="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-+fq25MGwc9OtJl8+rBC/Z4AyUIUz6ScoUiRAkludC6A="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.20"; hash = "sha256-ahzHLCX9TtCvZQ/o/uaOTuzoMZzBy1bcmjBA7q4hdOU="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.20"; hash = "sha256-PHBb0AuRpB8kkQvQJIJSLu5Ub/U2pYA0wMGBarUkS8o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.20"; hash = "sha256-MTyRTWhDmMaCsNorju/tLb0w+ssKydDX/NBFzSfqB0Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.20"; hash = "sha256-VHmF1/ObK5hxGYvm5/+pTdketHnxxcnAGK5RaTQpVqE="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-YyET6SqeoFDPk1FdQC6j7OJJzI4b4vTGVPwOmdGA1Qs="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-nAxKiA6PWHza9cjM9tncakHvK1tbiFyEViZJdI1iK2k="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-9ml/nOY7bpw8cvJhW89n9XciHjqx5uVpOSPxP2ksItY="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-7Rlb+KH9/WTP6old7VA+2rHU7rV92See+Rip7YriTpY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.20"; hash = "sha256-5OvsPNFOG/ZksgTEA5ESSfqt3+nOc2F4qSUvrDLlhL8="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.20"; hash = "sha256-+MQMRFzfG2CbNJnfw0buP4VorL2yR+T4UeEBSbKSmPY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.20"; hash = "sha256-DdumMpP5QN0rPDsB8sjxACM13mT7Wbb0w3LaCe96twc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.20"; hash = "sha256-yktNSySitxWbO6LjcxUuewWFMF2EbcoM2w18CqxmVlc="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-iMYmS6EWvlEw2acxRgWe76nwchR3DimtTl7w9iqu1+Y="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-hyuWvD5HCStp5Vd3tyr9hZMOrbrhLNbyalBZE7m6K3Y="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-uxdaALtA66S7yuS1mup93VcfuTzJRjmk7Mc0azi/GR8="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-W1umN/OuIvxHDXWMzkp/xRODlxBE478hElhDn4J9Uzc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.20"; hash = "sha256-903dIh6rx9dFUKvE7FUCdJMYubnbwjjo/95X0G6Blzk="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.20"; hash = "sha256-/hqNukz6YVNNcsRz4j4o/YMZOvLJ7QGOo1mdYp5oVVA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.20"; hash = "sha256-h1zjOeQk1iTdX9lfiZHhnT+q6ntGLR+gGCfmu0giv5Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.20"; hash = "sha256-nAMDc5cf2SGMTuOOE873SmFf7iI5s58D3he9VlM9o48="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-yE+B690YZ9FbfnObaOi4sRcLPirZeHnJw0kaSMNi4Ew="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-flwlrG6e4n09Pn0cDMS0u0pdTbkQIUpltGnpmiUqJOM="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-Jv4vTgdr/HQijmfA9xAPWxzCSbZ91TvTH5nOAlu7A5Q="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-gbrJT1aisCWvjwNP3cuJc424w6+91ExcwlEkVUaUrSU="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.20"; hash = "sha256-lLn+6JAmx20z3Ghvxr9Lb4gtF/bFOEUPa8WKagHrVuQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.20"; hash = "sha256-EWoLS0ygXAaUk7LPrMpaJazIQ6qGZVHblUX0tAB6NQg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.20"; hash = "sha256-DVR3W2IjXoQYRSksF2bRk62nPrP2arDA3CSEH2f9YbM="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-PX/TZQe5EBdh84DBKfLYHp/8HFmCqLGTYmhpQR1EYww="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-v+pfJq1pdSE3ejPRiQtbyxaGEV2vKOe5nCeTL2wS1VI="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-X2ox8EJBmf1mhLTByh9e5BnUCWV04VjWjjMWI0Y6UJU="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-WnpYP7hvPuBQSSGvQupeHNvGnwi13s2HQSKJepw438o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.20"; hash = "sha256-xPeka8TTwkAvi4Omz8RK2z9GhMMaTD4No153URhft/8="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.20"; hash = "sha256-DBXJXKjkty9sR1xOfgQZrmPxuZegn/VmU5WjMab5Ddg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.20"; hash = "sha256-0Ira9rw0tO25f/SeCTSD0z0bxgU7lIREHnrlZgXS/Uo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.20"; hash = "sha256-6PjyKEhIrfW9MLIaTfAY4SmuKS0wblxaR9qaQ8IV7nI="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-Xq2ru5TIgQi4j8aV9dzlqfNuICPlAna9IKMTRYrGY6I="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-Kw/jAf+N8O2nYwr5KWnEaNBP4eq7IjWdBMtAX0dH01s="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-KRUmKJVPNVSBzDA8Dsh57CqTeCyPpmKjNIVBmNz0gRQ="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-3sgzxd64Eml+UxMSrYiiwNNUPpW18PSy3LkxzXCstCU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.20"; hash = "sha256-hWTh4eIBf3ra9GE0fYrCjDNm0aT+4NjwCgr1X4VLHMo="; }) + ]; + }; + in rec { release_7_0 = "7.0.20"; aspnetcore_7_0 = buildAspNetCore { version = "7.0.20"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/09e67261-215a-4003-bcf8-f90d67dcd02b/b32cf12a5c10b1f74e21c8cb03880891/aspnetcore-runtime-7.0.20-linux-x64.tar.gz"; - sha512 = "62ed9743972043a72e48d5aa2f7fdf3483cf684a32b051315004d1c778e9712bf66e5e7a97a5a53993fa8e92daf5bacaf2cdb3eae44bb9a9e25532b9a80f4f70"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/7e8680cf-0baa-4957-99b7-81395b8ff60d/5a9c578ff9aaefc7ed77e63b6a90dc03/aspnetcore-runtime-7.0.20-linux-arm.tar.gz"; + hash = "sha512-6Cuw8dUtkf6mvtQZoYVhKC7Q6d425WTmQeKWyRf39l/HVVzMBG/tZ1rWe058UKcPD0joVZ/08qm7rSvGLc9qsw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ae3027ce-cadf-4510-a1aa-125958cf0432/c3d958ba80ec21e9d75ca5e8f43ec2d3/aspnetcore-runtime-7.0.20-linux-arm64.tar.gz"; + hash = "sha512-37HBvvTYJt79PZlVmaXAPhvxpkxl2YtnXWwF27c4DZgjOVPmjVP8Xr7GCtTvdUFwc/sfsyVqAXa7lk8OARYfbA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/09e67261-215a-4003-bcf8-f90d67dcd02b/b32cf12a5c10b1f74e21c8cb03880891/aspnetcore-runtime-7.0.20-linux-x64.tar.gz"; + hash = "sha512-Yu2XQ5cgQ6cuSNWqL3/fNIPPaEoysFExUATRx3jpcSv2bl56l6WlOZP6jpLa9brK8s2z6uRLuaniVTK5qA9PcA=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ae3027ce-cadf-4510-a1aa-125958cf0432/c3d958ba80ec21e9d75ca5e8f43ec2d3/aspnetcore-runtime-7.0.20-linux-arm64.tar.gz"; - sha512 = "dfb1c1bef4d826defd3d995599a5c03e1bf1a64c65d98b675d6c05dbb7380d98233953e68d53fc5ebec60ad4ef75417073fb1fb3256a0176bb964f0e01161f6c"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/40131679-906c-4afd-90f0-576fbed036b1/85a0c856077ad82c29350486ebdb912d/aspnetcore-runtime-7.0.20-linux-musl-arm.tar.gz"; + hash = "sha512-yoTg7/BS1Ft/qa/Ypo8dViZBVbUHiBEF0gaWmSIFe/MyiVo8OioXAmSORnEvAiV02Trhh8j9JhD4OSkJVoq/Vg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/65fff3f3-1b87-42aa-b1f9-04e7e318c1af/4bfbb002455b9a037e75791e99a18c19/aspnetcore-runtime-7.0.20-osx-x64.tar.gz"; - sha512 = "00677819450d14d9adc2b65f25b9a069bc2b43f72e4db651e77fe0e48320be8eb7c555277281de968e75d0fb19bef960d4dcb27161b8c57bce076ee18bb5ca98"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6ef9e16e-9a83-401e-8ef5-905ef374b768/725507d68a8bc4a4297e2c82bb1d06db/aspnetcore-runtime-7.0.20-linux-musl-arm64.tar.gz"; + hash = "sha512-ZUBuFxSjEX2qNCs/0NvNXDIUMVYR6su9hYCCf2mgepSAUwMgukBpKj1tv/gy2SmhQgB58dswyj/Wem/QNRSdBA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/2833b957-8fb7-45fa-bf85-4960260ae344/fa4678e8c3ceba67771b5195a2343049/aspnetcore-runtime-7.0.20-osx-arm64.tar.gz"; - sha512 = "7de161ea45faef7693d78ca44b585ab73fc183232d3f8d229fde3d05d696818d8d6402ac7ac86ce239a0a6cdae8fc2eafbb445e99443d0c7a4aab3781df35be6"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a3f5953c-68f8-48e1-91bb-0ca62199e6db/b3d7a2de0488fd63fa286c3fc371d68f/aspnetcore-runtime-7.0.20-linux-musl-x64.tar.gz"; + hash = "sha512-qA8xGTr3DVVujQJtOdeYY8g4mwZf4HeOe0Ng99H202UDulJzbEDnSnFsPDBQCxhYFu1g15sGrilXVLZzdKH6RQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2833b957-8fb7-45fa-bf85-4960260ae344/fa4678e8c3ceba67771b5195a2343049/aspnetcore-runtime-7.0.20-osx-arm64.tar.gz"; + hash = "sha512-feFh6kX673aT14ykS1hatz/BgyMtP40in949BdaWgY2NZAKseshs4jmgps2uj8Lq+7RF6ZRD0MekqrN4HfNb5g=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/65fff3f3-1b87-42aa-b1f9-04e7e318c1af/4bfbb002455b9a037e75791e99a18c19/aspnetcore-runtime-7.0.20-osx-x64.tar.gz"; + hash = "sha512-AGd4GUUNFNmtwrZfJbmgabwrQ/cuTbZR53/g5IMgvo63xVUncoHelo510PsZvvlg1NyycWG4xXvOB27hi7XKmA=="; }; }; }; @@ -148,21 +210,37 @@ in rec { runtime_7_0 = buildNetRuntime { version = "7.0.20"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/2c5981ff-0f0c-47ab-bff4-0ea4919b395b/cbfdfa7f35d133b0bdef87fa3830bfa0/dotnet-runtime-7.0.20-linux-x64.tar.gz"; - sha512 = "87855297338555a7b577d7e314e5dbf2c2350f8c867a489cd1e535634bad5c123a1871464d37fc9421837ff5d426c2eadecbe0f60bbf3fd32bc2461f47790a40"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/06e8869b-e332-411b-aea2-7e29daae6953/6b8f60cbb630acd5d94219faa15faf6f/dotnet-runtime-7.0.20-linux-arm.tar.gz"; + hash = "sha512-okqnr+R45ir052xA5j5eXoMkqwHZrZz/MYMkXN63CGH/wRjJq9qfLy/tQjc1yieqwVvsjMX8NS8FvVtyYmWEmg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/af6e12de-a63c-449f-b35b-b72ec6ee3da5/ae129eca3d734117d14cd5965dca93a3/dotnet-runtime-7.0.20-linux-arm64.tar.gz"; + hash = "sha512-wkUSXuJwglIRmhVEVW4aqeAKoYsjA95ph32hDGwX4/JQJLdJypO1O+du4Ojkp11AP3AZuLwuUO0SePZWyy9+Bg=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2c5981ff-0f0c-47ab-bff4-0ea4919b395b/cbfdfa7f35d133b0bdef87fa3830bfa0/dotnet-runtime-7.0.20-linux-x64.tar.gz"; + hash = "sha512-h4VSlzOFVae1d9fjFOXb8sI1D4yGekic0eU1Y0utXBI6GHFGTTf8lCGDf/XUJsLq3svg9gu/P9MrwkYfR3kKQA=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/7d1ca778-4415-451e-873a-dc4062d8d9a9/f38f41e5784c0832e24fe18a938ed5e5/dotnet-runtime-7.0.20-linux-musl-arm.tar.gz"; + hash = "sha512-JczDc9HEwOt0HgSMb9SDZjELNqxvBoxQ9rwBNCoABGQUToRX5+G2zPbZlUTUkUAi78uCTnVjZRe79hyUhSzddA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c30b2e10-7c18-447c-b66b-47bf12f88692/0d5fbdecc6b2cc86fd2f43ebfffd7aa2/dotnet-runtime-7.0.20-linux-musl-arm64.tar.gz"; + hash = "sha512-VSynNGf4BD01HCDXHflbqWOzLox1cG329dP85SXz798TFN8pbET77a1VdXguN2M5mKebLCP390IPgU7iSI8wog=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/af6e12de-a63c-449f-b35b-b72ec6ee3da5/ae129eca3d734117d14cd5965dca93a3/dotnet-runtime-7.0.20-linux-arm64.tar.gz"; - sha512 = "c245125ee2708252119a1544556e1aa9e00aa18b2303de69877da10c6c17e3f25024b749ca93b53be76ee0e8e4a75d403f7019b8bc2e50ed1278f656cb2f7e06"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3297a5d6-9f41-4098-9597-c1b966c19983/46559d0d813b36264fb414562caca171/dotnet-runtime-7.0.20-linux-musl-x64.tar.gz"; + hash = "sha512-MbnaCNYzzQAo6wjDbuLFw8sb5tPF4BDIWuKRSW/l6Bi1vln11Hr/hu2TnCYPdi5X/waTSk0JVDdpNbGtx5nxvw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/cbade9d9-be1e-46c0-9f90-13ba882965dc/31c86e8f4beaf0e5ad9ad35a408be7de/dotnet-runtime-7.0.20-osx-x64.tar.gz"; - sha512 = "acdcde92f2f2e43584ee59be447f778f4a152c308975c7bdc5c2372b5bbd3092eb9d2233aec3b82756ba1e352a0877ffc17e4c8cfb20a9de91ca6db54d79b591"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/50dbf5c1-942d-4fd8-b646-1f024326ec1c/5fb99e9dae294298a8131757b3ea829e/dotnet-runtime-7.0.20-osx-arm64.tar.gz"; + hash = "sha512-rxy2LinGlkjr4zTmUcJwPNXof6C7KMZwuss7PdFgiurjWuU0AsXrTti/NKvYMaCMy174Tl7HBhfZ+NmWn+e4+g=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/50dbf5c1-942d-4fd8-b646-1f024326ec1c/5fb99e9dae294298a8131757b3ea829e/dotnet-runtime-7.0.20-osx-arm64.tar.gz"; - sha512 = "af1cb62e29c69648ebe334e651c2703cd5e87fa0bb28c670bacb3b3dd1608aeae35ae53402c5eb4ed8bf34abd831a08ccb5ef84e5ec70617d9f8d9969fe7b8fa"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/cbade9d9-be1e-46c0-9f90-13ba882965dc/31c86e8f4beaf0e5ad9ad35a408be7de/dotnet-runtime-7.0.20-osx-x64.tar.gz"; + hash = "sha512-rNzekvLy5DWE7lm+RH93j0oVLDCJdce9xcI3K1u9MJLrnSIzrsO4J1a6HjUqCHf/wX5MjPsgqd6Rym21TXm1kQ=="; }; }; }; @@ -170,70 +248,118 @@ in rec { sdk_7_0_4xx = buildNetSdk { version = "7.0.410"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0ddc1522-2361-4394-97e9-52318bf51951/c5aef30601a86810f1f8ea89d42c26a0/dotnet-sdk-7.0.410-linux-x64.tar.gz"; - sha512 = "20b8e02979328e4c4a14493f7791ed419aabd0175233db80cd60e2c004b829b3e8301281ea86b27ba818372473accf5a6d553e5354c54917c8e84d25f5855caa"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/4b1d565b-7a3d-4e7e-87ad-7c662ec59020/4c6cb8a150efb42f7cea7e0b4c2f61cf/dotnet-sdk-7.0.410-linux-arm.tar.gz"; + hash = "sha512-lbY5oUddm3Y31BoUwMqzmTs6K0vmPb8lH/74QEYcUdnV7NeO8JyFf+KDmRVfekBEngjHozzgiFDE4Y76q6tFrA=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3e408891-74af-4ccb-9ce8-895f6806a97d/3a589bbf6e264059544cef47be672540/dotnet-sdk-7.0.410-linux-arm64.tar.gz"; - sha512 = "2db6a3b9a532d2f59a2b459e634206913a9585c821f3f578a421e3bae346a92dd9b85b76ebde343ca3057275f7ec4d0bca71cbb7f2badb6dcdb516244e84da46"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3e408891-74af-4ccb-9ce8-895f6806a97d/3a589bbf6e264059544cef47be672540/dotnet-sdk-7.0.410-linux-arm64.tar.gz"; + hash = "sha512-LbajuaUy0vWaK0WeY0IGkTqVhcgh8/V4pCHjuuNGqS3ZuFt26940PKMFcnX37E0LynHLt/K6223NtRYkToTaRg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fc8614cd-f333-4adb-815a-9bbd07e02b16/0ccf5e50cf8fa5c600716395e240aff1/dotnet-sdk-7.0.410-osx-x64.tar.gz"; - sha512 = "782e15c19ce20aa8333566f23c2d3cdb8e89c7626de6330ddf670c4426e30cc854e44ff3341578622aecf210fa66ddcb63a7d2ad629ed92cb5582ab670f953d2"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0ddc1522-2361-4394-97e9-52318bf51951/c5aef30601a86810f1f8ea89d42c26a0/dotnet-sdk-7.0.410-linux-x64.tar.gz"; + hash = "sha512-ILjgKXkyjkxKFEk/d5HtQZqr0BdSM9uAzWDiwAS4KbPoMBKB6oaye6gYNyRzrM9abVU+U1TFSRfI6E0l9YVcqg=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/bfba06ea-d182-4a12-8066-fd78413e6cc3/f7940d1e8d8ae641a3a3d65b6bfa1071/dotnet-sdk-7.0.410-osx-arm64.tar.gz"; - sha512 = "c0ef1914f2b298504433bca9cdab02dcf324421ece39657b66523f13b7a7166e726783673a602fb462f3db5c53f59a89381b918e7658d49a57763b43cf75cedc"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/fb542b02-38a4-4564-bc66-d7822758cf1c/d18f1e24ef1b3cdb4ef10bc641ce9a5b/dotnet-sdk-7.0.410-linux-musl-arm.tar.gz"; + hash = "sha512-x7Gc3yExJkVv5/IBcf+/XMQXcjBbR9jQbGRhKlCeiRMSZAXKjqW2T5P/TSz+op+hKGcdQO8jrWadi0coIjjfwQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7e1f9446-53ee-469e-8dde-cc307306ac61/bce850d1c118b4b6dcf9f808b22a8a54/dotnet-sdk-7.0.410-linux-musl-arm64.tar.gz"; + hash = "sha512-O+6089U2DMm8Fzm2kCj1grZqajhMlmj/EqD9ucKfktx1e3sXs9/MgeVQP5razNe56lSQ+OFinN2Y4bRZKbaS3Q=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6d16b077-939f-435d-8f2e-11813d76db6b/ba4829249b04d6c818bc175846e694b5/dotnet-sdk-7.0.410-linux-musl-x64.tar.gz"; + hash = "sha512-Y0W6gTmvQteoMwtaXhfHGz4GgGZWEAbGi/4r+1wavSiS8NkD+3rrwqU22Ee8End4DNZR+lMTMMFvowKgdstUFQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/bfba06ea-d182-4a12-8066-fd78413e6cc3/f7940d1e8d8ae641a3a3d65b6bfa1071/dotnet-sdk-7.0.410-osx-arm64.tar.gz"; + hash = "sha512-wO8ZFPKymFBEM7ypzasC3PMkQh7OOWV7ZlI/E7enFm5yZ4NnOmAvtGLz21xT9ZqJOBuRjnZY1JpXdjtDz3XO3A=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fc8614cd-f333-4adb-815a-9bbd07e02b16/0ccf5e50cf8fa5c600716395e240aff1/dotnet-sdk-7.0.410-osx-x64.tar.gz"; + hash = "sha512-eC4VwZziCqgzNWbyPC08246Jx2Jt5jMN32cMRCbjDMhU5E/zNBV4Yirs8hD6Zt3LY6fSrWKe2Sy1WCq2cPlT0g=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_7_0_3xx = buildNetSdk { version = "7.0.317"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3207f51e-26ad-4d43-9249-5e03e93e5895/af409554ce918557a05f8e8102f199ea/dotnet-sdk-7.0.317-linux-x64.tar.gz"; - sha512 = "906ecbfa31b10ae5e2a8ba713d113ccd83e3a9b9e4d3e322482692891542959e76c51db5dd3825fb4a2cf1e951737006a99be7290f309d6822567d3a533a7a9e"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8aacc3f6-bf06-4cb1-ba10-ea76c29bf550/7c657ce9fbaf35843a30a34a7ba0e3c9/dotnet-sdk-7.0.317-linux-arm.tar.gz"; + hash = "sha512-S1DHTRWHGrRc9/0Bb6BR8Dg/AJX5G07ycQUCgY4vn2kCO00A1YTvd9gYeujpWo0pI7PQPr4qP/cKkQntEvdI/w=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e08e38c2-46b5-45ba-b318-6b0949b3cc2b/1780549adba82e521439b7a0511229ef/dotnet-sdk-7.0.317-linux-arm64.tar.gz"; + hash = "sha512-Irrc2yy6Dxvtsfy9yZJppmoBojIZPgC0KCOAbO5dRhlLjdAIpT4XRVBypBD3e9NRZ281FnC+lsE1ctjjDPrRgA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3207f51e-26ad-4d43-9249-5e03e93e5895/af409554ce918557a05f8e8102f199ea/dotnet-sdk-7.0.317-linux-x64.tar.gz"; + hash = "sha512-kG7L+jGxCuXiqLpxPRE8zYPjqbnk0+MiSCaSiRVClZ52xR213Tgl+0os8elRc3AGqZvnKQ8wnWgiVn06Uzp6ng=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e08e38c2-46b5-45ba-b318-6b0949b3cc2b/1780549adba82e521439b7a0511229ef/dotnet-sdk-7.0.317-linux-arm64.tar.gz"; - sha512 = "22badcdb2cba0f1bedb1fcbdc99269a66a01a232193e00b42823806cee5d46194b8dd008a53e17455072a410f77bd351676f351670be96c13572d8e30cfad180"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/6e895738-571a-4d6f-8519-0d64ad4a95d2/75c8734c8f3dee31dca0591f7634b4f8/dotnet-sdk-7.0.317-linux-musl-arm.tar.gz"; + hash = "sha512-fKoRN8pHJHGrlZ3s634+KCigjbX7Dhxrlz8kcKHLbIv60zLMrDH2bhGYLkc6/4KAmzX6XANkF4J66DcTe+NPOQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c03db249-372d-404f-8767-dc7e4a104ade/49d2336dc14b70dc937d8f91716e4fba/dotnet-sdk-7.0.317-osx-x64.tar.gz"; - sha512 = "d3dbd0fe7cbc62388f150adba5d818abee3986863d757ce63088f4feabf801052c08a608acd5036f97191435fe99224acb12c7365be7f77def28553a231ac3c9"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2df5854b-e405-4191-a794-8c24ddb9b95b/b0c9ac55d4f324aa81bb5918e115347c/dotnet-sdk-7.0.317-linux-musl-arm64.tar.gz"; + hash = "sha512-7US11MyzefQoaSLiJtGC5eubwS9M7bYALwbleUt5XT6/GajlqOmQxFfff566mUe8HHIQr2qN/yxnItZMnmHwQA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/697b6485-989f-48d7-86ac-320529a85b35/5b5ed55e7e4e2c0a1ba2c3e0cceefe95/dotnet-sdk-7.0.317-osx-arm64.tar.gz"; - sha512 = "b5f367e1e20d728d7167c81e4146358e760f136b9ee0fc410d813c14366e38b09a069031aa8ca6d8df438435b6ab4e2e989be309e097169459365d4befaf9f5a"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9141d472-8ae1-46aa-8218-190017c16ed6/7877e0accaa6b6800570f7b46a831c97/dotnet-sdk-7.0.317-linux-musl-x64.tar.gz"; + hash = "sha512-Wn1fIXAQs1QfqdC9tD12lJaFW54RQ4TPZ4jtR3G4NUZqsYeMU3nIkUk7VLh8FHB3j1CTHFpsiZr2E0gZO7lj1A=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/697b6485-989f-48d7-86ac-320529a85b35/5b5ed55e7e4e2c0a1ba2c3e0cceefe95/dotnet-sdk-7.0.317-osx-arm64.tar.gz"; + hash = "sha512-tfNn4eINco1xZ8geQUY1jnYPE2ue4PxBDYE8FDZuOLCaBpAxqoym2N9DhDW2q04umJvjCeCXFpRZNl1L76+fWg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c03db249-372d-404f-8767-dc7e4a104ade/49d2336dc14b70dc937d8f91716e4fba/dotnet-sdk-7.0.317-osx-x64.tar.gz"; + hash = "sha512-09vQ/ny8YjiPFQrbpdgYq+45hoY9dXzmMIj0/qv4AQUsCKYIrNUDb5cZFDX+mSJKyxLHNlvn933vKFU6IxrDyQ=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_7_0_1xx = buildNetSdk { version = "7.0.120"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/8b678e05-b3c7-43ae-a31a-c007a901d939/934ec0853faa6404aa924c99e019f788/dotnet-sdk-7.0.120-linux-x64.tar.gz"; - sha512 = "cb9faba83ab276c935ef35b31f016ca4617f0d967c5b4bf1e993c2159992fb59d1dd25dce09928915b9ff586ead7acf92ec1dd96937c93317a99ca0c92b616c9"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/3ab51fcf-7641-4e33-aa59-53b394ae1e2e/79905a3a4708000a7a50da44a7256ad7/dotnet-sdk-7.0.120-linux-arm.tar.gz"; + hash = "sha512-epZI3jwx+NElfZiYL0rivTusMkQLz8uAQCdShZkJNK7ocZASoso/VkZUblZtKWP2O/idGbVordxNMkzpdOpLxw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/17a7bef9-4696-4b93-a3cb-f4bb9aaf2985/3e19b62d05b8e85b0a46d5dfd99196a5/dotnet-sdk-7.0.120-linux-arm64.tar.gz"; + hash = "sha512-9TD3lK/jw7m9h7jtUJoaE7HI/m8rxubM4+jNa1YyfA/yf8E4EiwtrWh3DMUBVzfgB+9XBlmcGJ7wzHUhy/C2VA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8b678e05-b3c7-43ae-a31a-c007a901d939/934ec0853faa6404aa924c99e019f788/dotnet-sdk-7.0.120-linux-x64.tar.gz"; + hash = "sha512-y5+rqDqydsk17zWzHwFspGF/DZZ8W0vx6ZPCFZmS+1nR3SXc4JkokVuf9Ybq16z5LsHdlpN8kzF6mcoMkrYWyQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/202eccdf-4461-42ed-a260-0061216380b1/076bff1764888073337b16ed57dbdbec/dotnet-sdk-7.0.120-linux-musl-arm.tar.gz"; + hash = "sha512-HNomb4ipUPRUT9/M8ezCaBa3XCn0hmv9mFiSkJQtmCp0zhfy9QfGKAsPM3t0OprQHlOjwQAcdHe91K3VO7BhXw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/69b2b43d-6e1b-46c8-96b1-6f2e8871dd26/0405b62c3762de24e55635674a37f038/dotnet-sdk-7.0.120-linux-musl-arm64.tar.gz"; + hash = "sha512-XTEkw9rx7RzvDIOOdTY3rx5SAws2Ywu/p9uhdqfsok/p5cTfnv8hcPqWz2PgBV30LwlQs7WQDesoJZDkthLz+w=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/17a7bef9-4696-4b93-a3cb-f4bb9aaf2985/3e19b62d05b8e85b0a46d5dfd99196a5/dotnet-sdk-7.0.120-linux-arm64.tar.gz"; - sha512 = "f530f794afe3c3b9bd87b8ed509a1a13b1c8fe6f2bc6e6cce3e8cd6b56327c0ff27fc138122c2dad68770cc5015737e007ef5706599c189ef0cc7521cbf0b654"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0aafc9ee-0ca2-484e-b1ce-5f40458d49ed/06cf3c6a1515f931527e8fd6986e3982/dotnet-sdk-7.0.120-linux-musl-x64.tar.gz"; + hash = "sha512-xQirUxDXQ/V+p4YR/+NUJo/og+fGc+6Ajaqm3eMLpFTV1w+BkcSetSrkqAwGLtZJC6HWt1L8xUGw63g19O7ofw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b1da5ec0-e336-4716-b9ff-77f8160e7878/5c40db0a17dc493eb0be8d047d0c6885/dotnet-sdk-7.0.120-osx-x64.tar.gz"; - sha512 = "94deb9988509fcbfffc357114d0f5645fc6b6f6156664040cd5643a191bef10ae2fba4168aa689ff7da1a1b6fa779eb4e53a77a7847beceb7f0ba451d2c20d57"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3d081107-64cb-46ef-ab37-41560d585efb/5aa6a70b37790bbea98d7b8c380eacaa/dotnet-sdk-7.0.120-osx-arm64.tar.gz"; + hash = "sha512-3AaAHY3jTfaY+T46qHLVcTHdPjOsT3zdvJYiORHg/zL9zqeDMtp74AEzYskM0k2y2GweJ1KXvm3RYpSPK9OMvA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3d081107-64cb-46ef-ab37-41560d585efb/5aa6a70b37790bbea98d7b8c380eacaa/dotnet-sdk-7.0.120-osx-arm64.tar.gz"; - sha512 = "dc06801d8de34df698f93e3aa872d57131dd3e33ac4f7cddbc96223911e0ff32fdcea78332da7be0013362c90cd24db2d86c1e275297be6dd162948f2bd38cbc"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b1da5ec0-e336-4716-b9ff-77f8160e7878/5c40db0a17dc493eb0be8d047d0c6885/dotnet-sdk-7.0.120-osx-x64.tar.gz"; + hash = "sha512-lN65mIUJ/L//w1cRTQ9WRfxrb2FWZkBAzVZDoZG+8Qri+6QWiqaJ/32hobb6d5605Tp3p4R77Ot/C6RR0sINVw=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_7_0 = sdk_7_0_4xx; diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index a982f4ab9f883..1d787aac0a847 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -1,140 +1,210 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v8.0 (active) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.8"; sha256 = "04gvqgl6b46dfxqs2m8miwn7z7j5accidm4vl22ddpj17r8yhx8z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.8"; sha256 = "1vi4ccb95bn6zf3pjrgi1nkcmca4s49s4xb5ni12yfbxf5jw5vv2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; sha256 = "1nvp2dhznb8h4pcfyllwcx2vzygjpcqrd32blilylk5g5nqd163s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; sha256 = "1mhlrvl7bs28bwfqwxydsmcjb4cm83ps2ahp02d86s6z30inlm6v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.8"; sha256 = "0dnn3zbzj1ijp5kn7zqws4chnwklmdbiglv2dy664b99xspfrlgz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.8"; sha256 = "1bclpw8sa5fs8nv33smlkb4zx2ipans7ir67i5cdp2y3qg3afrks"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.8"; sha256 = "0gnhrkbr0r4l6x0165g68m87mhavcpv8hqkipsjq2ww53bp7csli"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.8"; sha256 = "1jnr76a8r7sfjvl5p932mm4xn9pqnyv8rkbqddcbr9d396g18srn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.8"; sha256 = "0jkjns3rpl2rzs1x3blsirkxgsz64685my1nl1xzh838y1mk16yg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.8"; sha256 = "1fb7zhy8p247n8jfr69ca8f46b578ffvv0viqxwsa1ssl24a49g6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; sha256 = "0w57jbrf8w2ffs7m78saawniaabasxjkxvmv1lqm6hkb8b3y4rd7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.8"; sha256 = "0lppcnba7jhzr034inxb0pqbywapfin7s9n6lncv6sbwmwcdw7b4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.8"; sha256 = "1l04vb02ddvafbwax79qs5nfg49dg733mnawxjnzfhjszs9872vr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.8"; sha256 = "1s7yas0561jv3ihka8zmhxqhb2zc55lslj451dl16196i3zgla45"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.8"; sha256 = "1h5c5riyj465i8cdl6w4q10ymkfwd6f38nnqdbhs4hz9s3yqnw8c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.8"; sha256 = "025h7ys6n6b4vfp05gsr4vqph9nhi1rg028fpr3g7sxp9s4b694w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.8"; sha256 = "1avn1pwjan2pkiw1knh0gw5dj61ylyahi9nc8mh69z7q97yrpsid"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.8"; sha256 = "1yf1zjx64rjqxaqp31iih6vqfhp09r8hck6fr7xdbq24d1jqxdf7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.8"; sha256 = "1mazrqxr1hfpka0im7h0n8ab73rn2zdf2jbi9fn48panz3ncqgwl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.8"; sha256 = "06j8vp6w3mjqd2qrf6ndmmfc563qd5gsfqwza99vzvwvsyyclix6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.8"; sha256 = "1wia1vgf0ywz4mqz8zqiba8m3wzz4fb5zgk4glwyyf4m646s96ky"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.8"; sha256 = "00rh92hfqmpzb1s3imsc78n24gmbd1hyi8s09ra4z6fzkrz8vi2h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.8"; sha256 = "0mvr8swzpgmm6fp2gh0lr8kbdp90ng6j2m80gk5im8q46ggjwz2m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; sha256 = "0bgsva11n48n9cw2xjfr071x3aq0yqnis191hw8zrgk07gq7q77a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; sha256 = "1i0g0jv7vnp7rbagjppldypqx1c6bxsk4zx87w5km1n0aclfmyfy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.8"; sha256 = "01bsp8lj08jvv3bpnb0ngccmgmdfcvqx1038r5ls001ax4l1p4nb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.8"; sha256 = "1b2zg6gjjri57v43v4sindbikqlxxgrmp4f89gyz7467rd718qa9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.8"; sha256 = "1g7kwsdj9d9wy67acz3svkcp80aaf3npfsyhgnvslqgwfg53r5y4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.8"; sha256 = "1qgj8zhsb4r42zcaw8s66wgs294405d0vkvysvfxjhq0qf4d8k0b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.8"; sha256 = "1ghvz25730jskl3g7mijn80k2pnaddzadlpc5hrbhk1psrziv4cx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0jv18yz2cfrmky3v0mssddisnfraiynj2gp6djsj79i5an8lm86q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0z3aginrqsi7gbcj8rmga35jrw9qabcn6l0sxkysrs4b0qysfsv4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1fggfcilvg0icc2zym93wiy2ww3jvzyblrymyrvab5q5n49ni3n7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "1vhav8c6fl3kf24i85iq4hvkml1hbl0fn23zcw0il8za0wa96wjh"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "07lmlyd36d4qgjn238hdb0rxki9dc367b05a8xfp4p9nf765s68r"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "19cw3h709whiysagdmrbqbd19pwqc9893dy39dkl353zwhcr802l"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1my2f45ikw0kay03d1l6yrdcxc9iwyg8w6qyzyhpvbwybva3szqb"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "03zqkvfvgplrk2g0bd95agbly8lilqksp7v9jkfv8xi6fchyz7mk"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0lvr6w07wxxs68xc4ki83xgvqbzraapnik8f73k0105vg80n684m"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1pch0b5f4a936ma9l2pf1y8b89swppzc1034yr9c58f92agwm7a5"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0bj9cgambifzjk68fcidfc2qw1jw6pmy40b6kimid8kig3vi8vc9"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "06ag1kj6d606h3vmqz2aap9pq7ca5c2w7qa0135md98nivl8ra2z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "10z3lzn58wv0211fx14xy6nckkpvr7jssnq9gd7jisc40wg47m19"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0cchmg00iabygbqrzrzw4pj461jw15a66bn8niqbv4j2j7fdxc43"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0f2yal46hqa26s7wrilymhlydj74cj705wivajw204pvx9y29nrx"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0jzya3wa3v5d27yr7cw3rin61xkgyllx5bmnmb3nlx9m7yv7s9mm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1fp73xdqbzbllb4bc942dnrmk00cgrr496svis58w1w1jhas8fg3"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0mb6zr6ly59hlc8i4jqgwxrhrsvw92690s036d2zjq5yqiiszq15"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "185dfmvph0dp0syrya02yq8pmaqx8rpz6an91n14mvjrmp6g2xqi"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "1nncg3m5www0vhl7xr0d128a4sm6dngwf9y8shrgpi1c533yff50"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1z5ii7qq6kvhi62dbjg1miwll6z89xi3ndggrjymbq62q26vxk9f"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0aqm506ls3nqa1qx9vp8zr96mqsbf1q1ni1jcy0ql39khqcf77lc"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "017jfihz6l7pai2lakj5niwnnmn890xd2lgr9vvzn9lf6m1gsa28"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0g80h08qizf0bmfi19ky90x8sf00x15xbwx6nmm1gmd0wfkcmfrd"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1w914cpv0lpvmqi0zhrfxchida2adbllhr6617ix3f7w2g2z4vvc"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1zwhsmjclhjawsjz7fwnsdmv14dgrch31spba32bkyqsn0bmfhnh"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "06x7nldwx6cfx2k8j26nhvg4vlflaz3qk3aqjld08jzjhzh9zl5i"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0p3ylipzvd41idbb8d11120rakknr8f8ys15kv5fid765wck8xcc"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1vrqkddhi87hsa4agx1akfhvygxqlj3b1pq6g405k1pdxm7x0ngz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1r80l23i677carh93fpkc4qr1wnrkfx8wvdbqj70k29qarjp1zyq"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0yf7i13rrjdc9ibqff99cspgnz8qgyx85hv4jvgxz2d3jknv8ck5"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0jkfh00davbf4ix27ph1p3g85amvrqjix2rapw1375pkv6vnhg1g"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0r9s92nx7lz9alxc2kn67h0x8vl71wh7hv5dqx0fmhafgllw8dd2"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "13klkc3iy2lqxlknygfbqgqrpb6q4i3ihsvi9834aw17fiznrj60"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1hxxpl4wzn18gq5zpbr0vz87bs4czmvbibhsf1zznwb2yvlr0sh0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0wzl1naijk3gm879bd6s2975yhsksnq2gl7jg7j1bnwik27nwpl6"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1nvzykpd7d51bqh9lkskfffggd0hfm0hrxrnmp075ibd4v98cc9l"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1j15hhf2hii4fh2nnmr7wmjxcx3v58ckm8lf5nsnz71fjcy6r2j1"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1fchcm8hpianyj2n7lq4vajxak8ww9hxdh9bl6xpx2vij8rhhh87"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0lj58x7l8f5nj9pyy6d7my611rpw0b9m5x4cb8rhqrx6ywzpjmfb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.8"; sha256 = "1g0kyfs8dj9jirc6qym1y93hxkcff1c1z2cws1qsqsrxbnrrn5dj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.8"; sha256 = "1p5jgznx61rfanyzvvbkasp13yysjks9driwdm42cc7gw35h2lig"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; sha256 = "1wsaw71mq2d6a2n3hxrb1mablbr8rz7x35ibh41y11nyhldwvn3i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.8"; sha256 = "1z8qvz3k1r699gkk96zrdffbqbb2j949gmh89hafcj9phmrbnvz8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.8"; sha256 = "150rhzlbbg5fr1la67pbyksk6ca8ypqj5j1izc77c9c9xasfa7nz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.8"; sha256 = "0lxq6m1b91yc58xqwrw84r90vgviwg97nddilbzsp9bml2y4h8y0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.8"; sha256 = "16n7frb84h0ckkripfm5x698l7b4m9i2brwrsfr7n2ccxkilnfhw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.8"; sha256 = "1rd3fzdd4dwdiwqcrnaacy4kh01w1j3f37ig4bw1zpv2kyb2c6f7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.8"; sha256 = "07a0hi147lag3qm9k7757w7p00l870i9ayhx2slw2g3vsr5fy12g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.8"; sha256 = "0ysqwf6xbrv1c6q2chkr1hnkw407w1gk4ccpkivn697d1pc832hg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.8"; sha256 = "1y9w1xj6hjh0bdcq3ywi98v4mkcpk55x48ac2b157qjpqam906c4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.8"; sha256 = "13s6ymx8vnxiz4ynss7cx1hc5rlwip746y735x4hjqqwqnxlnbc1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.8"; sha256 = "0sh1r13xmphk3zb625h8814s455kx0x0h0p3liaxd0nfh8dy2gmz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1irszs3125nl5d00yyiganqbsdid1sqj289nirvsgzrkmzk0c44k"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0lh81hxx7ai6hn8mfy579rym8zxydphq4nahwy1db56q3n7kbkrk"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0a3x5vaqp0a3gm0dkwkai15jyi1qgbqapr7qg2nrv8q2w53vj007"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0z71d2s8nn8pidzdnsvq8gsnl8kkf2limnm5fxvrfxc6kq22b9qk"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0xk8va4vidial13wzc2i315k0w6yh6dgnch5bg53wwz2kkm5b7rv"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1qb75x60bpr9kwp8s938arplym8p1zj7hsxs2mwna9271c254yx3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0wjn5krkprgkz87iqzr10ncs3hfzvg2n9zb1xbcm3f0m5af893il"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "015mg8cyqa6c4q2zqrq68rbmzcnjpm2ay5cwrrg99r2q72k85yff"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.8"; sha256 = "1sh70bdi1fz8zg2lnln2adn2yzjqi3fq8wazjbb8xgz3jbiha8ln"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.8"; sha256 = "1z0h02av5737mlk3y94lyjqhyjc577kx7yzmacl89m32ky4r2wk3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.8"; sha256 = "10qq6jvzg75bzlc0wv8z6wi9zv9f53rxf7ya7175lxjszfzjmrkm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.8"; sha256 = "1kqcb196n8zgcwi4jznlzqx0mv1y2r2gk51wvvv3vhvmfjd6igsl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.8"; sha256 = "0bcdfhqsls04gg93av3rnxmjz9cynli36nmdc9wxgqnr8vma799i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.8"; sha256 = "0zzsb5xkifks23vryy4mpm1xyi69mix2xn657cmgp0nn26c9169h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.8"; sha256 = "0vhx3z0aqnvlmjliqmd3cps5m34w69srwjw1506k2gipd1bhzgcx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.8"; sha256 = "1jfwbyr43z6id96qpplxv8mvxgdwc6spiy327lbx1gdbpf6yvv1i"; }) - (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "197lnzrfxws1b8pz64kiqjayaidv4rnigdyigpnfjq67w7x80s1a"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "1ax2ygccd1wnlcrad0kzv1lkb3z67vpwbmmqfipzbzsdaj81sgqg"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "04jwnn2ppdl1h11511df5wljmqx6hdzaw01qi44q5j5yab5ss01c"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "18nk4niv4nmpvhd67jflra7qrlq83mh8h3216p14kdiwmwbbzakb"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "1px4k16qxasb4vb7w2jcwjfr39mybhrjb120044km2ianz5mqsvn"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "194y9hvf4rjshnjvxn8j971byxmd837ax3fwp5j2gj8lr5pmh43v"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "0gxprpxvd28ci5xshappd200f16vzgph7r4k921sx98ffpl45sz0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "1mbd0x4cwzn8284xbk66mr18s7fc37g75yp9r21agfz2vv6yjcn1"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.8"; sha256 = "0kcg2pz794qh3lis9n06c8zmpa2h4q5pp5lfysgm403xzisd9pmj"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "0nzhfz87nfr8619pj75hnnq0kcl8w82kv4xr4528sdwbl5953dj3"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.8"; hash = "sha256-5iWiiKBaB6V5x3GDvZ1DpyxDHFIsmewksoeIizz8Z7k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-2KBKkVUlpiO1bOY+Ia2PKjurY2taV7CHnzU7Jr5HYUs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.8"; hash = "sha256-3x7ltOqJJXYO+zHIIvH1SDEz9fTrHqNoyK68teiHGZQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-ZGunPQaL6Kz97BpQY9lSOPEsy1CvZiTZeidqnG18anw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-x45oE7EFl6V29tVnuvzfcnAufOQjVf8FYxG8TSNz77k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-UHKTFAfqIxoBZ38I6wBdMNA6NyQ4FhSJcHNQZxjaCu4="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-KmiA+uHHYOnsfdG3F20mu0XllcRxEvMvWkHz7vK39KQ="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.8"; hash = "sha256-st7UdPx9AFKf9o6WewsmUKhbP2IG2KQjHRCTdP4Vj00="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.8"; hash = "sha256-VL9omnR1wz323jyU+UQWPuwKOv7UfkkiZ+8ja1JYDM8="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.8"; hash = "sha256-MaWj6kbZ4td5Yq1aMyK1nqUva7d5bDXSewRoqjF0jS0="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-Dz8dkFRN//VvdLjWxe8+5o81adh/gqYyo5aHxtjzoqs="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.8"; hash = "sha256-MJmQmBHWgvsqO8XYLnqsyUTfQ72VeJ/3EHq6OHtZ+n8="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-dmtcy7cqijoJAUCEJTNcvqaRneRMCn7WJkurjk2YpN8="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.8"; hash = "sha256-liIF45Ljv47Wkl9xhN2IWH4vbFPCUkvF++i7ENsCB+o="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-Y3KRiZ9i1IQoU/X70+c5hUkPsfSUJD8mrWecspUAEPw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-LACty1K+yIIJiTgArn6DpuMqKS+uhVBCgIG2e4W1XBI="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.8"; hash = "sha256-deYqv/tadlpOOMof1/MoLu2fIjcfbQ4Y/auc97c0GIM="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-a6q/Fq88tknCNUEMiGAdCNOMj8rUyWMa3LdasqMl06I="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.8"; hash = "sha256-MeztjburvdAXPWL4eLVhvL2+K9qd3otNatH8QbJf3Mk="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-Q7ZRUqGLN41EIbmTPQXiiLIJsLWwHHlTMCg7e9B38Fs="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.8"; hash = "sha256-nb0PV2g3PjENKIFLnnUynIxa9GWjVRyprHRbrMAfHW4="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-exBYb8kUySdkudyNrs5ArXa/wkkS2b6lhVpm4jZMnqQ="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "8.0.8"; hash = "sha256-b6WidfvMYv6zHy1nd4kGc5oCg5tTDxPlg8CESjurv5E="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-4OtC6HUOpa6DSJPkA+/72wQHgGj3Kqh7iQyJtvvNtz8="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "8.0.8"; hash = "sha256-bHuEFTwVzaQOEV1w/Jtfe8ZHMOtwHWsSqiiqoun+SkQ="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-wTLpzd7iu6eCyOn6ct4ZzB2NQq7GzNUJEsh+zkgHbdU="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "8.0.8"; hash = "sha256-Q6mYxptkYaF0ThyJSX0uUVKK6R6x6Xkfi/40EqiDAQA="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.8"; hash = "sha256-H3XoUT5B3taEoJvUFhlTRZ5/LI8VVaFxd82QZejD+xE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.8"; hash = "sha256-eYuDkv5aQvet7FzZOsZ5LZHnbNE4na74cmq3JsDaBNA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.8"; hash = "sha256-UMSNfp7fmU9UTkCj6GFoqz4iLDpM1zh0WP9W7KBIMAM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-lSBjAXq7gADmOA7NaK9S+S+8Xx8oTsI6Mrp3fgA3eVM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-RZ3KnxLJocJS9mSAwP69XCe0kA/uCppUNSMp4soCkN0="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-iW0U93hxohZrnGYB4us1XAaOBXMtMofMlN/FVdVjSS4="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-X6iM6I4WpVbLCEDhwwUrih1801VKfFz3gAaYZuQMTxk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.8"; hash = "sha256-wCNIvKB1pav/orE1e9Ljcb8NUiaIZ447KsyHtEI1uFM="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.8"; hash = "sha256-Yu/CZXF9OS9CtGV1ohPRRLHKpg3xZXmH+8aukhZjJO4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.8"; hash = "sha256-hSj6/ogmBRNoC4VIqmkp7IsFcYf1IzVhHFsGU4BW/ug="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.8"; hash = "sha256-VXwu3zMEoxrLfABVIc2zIN22JsoUwCeuM7W++7lGeVc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-GRldzHE2XXJdR6qAdcxgLcXZM1gNoiGsfJg0M5qnlR4="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-VACUGeR/lEFnS8O3kVBimN8U2sIr1/aU9hHyBA4cnKU="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-C3891F6er32h/x4bjp7nMbHOWvaGhjaAVxPwGQtxwtc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-s57vIXMmdrTdlGmfqyemkSJP11MltQWemJnet92e+A8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.8"; hash = "sha256-HDpL4+yMCXuy05nnJWKqZB2KkumluhvznAxAglZ2x5o="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.8"; hash = "sha256-/9Hsru4pLWKMb2LTF1erdHILGdEc/2NnuTIG+dcf1jY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.8"; hash = "sha256-Leqb/Un4/GRgRcymCJWnPhjZCn8A2hl4nFdYJfkNdqs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.8"; hash = "sha256-y5IbKOkqAKBpyWiA0PFmrtVXGXsWLHvX2FsiICm6egU="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-Ls2+jcDC4FW9zO81O2JP6BtKeazhydWEiXBPg/GJsfw="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-jJ7jGIYzDYqBZzJEG3BwS+NqUv7o7tRxUNgOTQ0oFSs="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-SCj9QjWOJvv3TvlR0TpIyFZrebRFTkVFVPdQ82F08gQ="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-LbvKpuOg1Rdqtabz1UvoADiNOkh+phBdXcD9iBGAAD0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.8"; hash = "sha256-TwTvStZ7PMGpFh16lSI4iAJwDz/lnJkqHk/RQ0KEQB0="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; hash = "sha256-p2Xix0JrQlMxDbvuPmXXaikVLVdKo1OPdk5w5PKSp3A="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.8"; hash = "sha256-shWbs109a6xx0JyJH1hwjs0OR/KhemxYjjLJhrTzE7w="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; hash = "sha256-cdjNG4XehuADgSuW0c/PKC+6VA0rdzisUKYJXMPhSvM="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-kxAG5q8z/6d3jjYhIbEOLTa9sFUveg9AK9QWEYb+Osc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-M881jx3YlNWC51BZguFtvn9UfU6neFeRhSaq0zsMCFI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-BwC5R+ECo52tePjkq/B6OEQvS4hq8tlAfUOBi9UufSg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-E6clBJ6GdZd3d6XaGqlwcyJq9UN4a9t+ixdZi7Ro4Xw="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-epjQsC2vTOpppEuMljG78vm/RWecUu/YJRAt+2ETd9s="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-DHGL/dDpQ6LhathaNJxp3M3qQcCEG9oYisUQ6WMurMA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-6hx88DtgvvwRhyEFHS32AKvRwwHZyS44SxYRG4La+i0="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-KdRDHgeE6ShPewlbreXJ+87JrPGdhO5CEGBzVOyn44M="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-g7De3JFCkr1wtMguY1QJXAZD5CX855/xen6pCMCrkDE="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-PdskfOr7EiC4VDvyAo5k5MjmKayexsyPNkJhaAhVXjg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-tSZ9tj81dWrHqrau0in1b/ZgbMyDs5P9Ea3sofhQ/ks="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; hash = "sha256-21RqIxjfaIOaABcqoe9AlZElWdXNd44dX0jodejOFNY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.8"; hash = "sha256-nCSziE636/NGvg4J8HKI0CZ48SZZvwKu22QZa7Q/sAg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; hash = "sha256-3vnqKFPAhjoLP6h/MnVfhoWOr2/0XvnUyufafbYED8Q="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-4zmkFZSBB46KjlubRHJ+DIBZs22CJLbIonT9hVsf57o="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-JeCvY8S+YPlFMwNokIxIfOsMc+cPSxIRozAVT03+ZlU="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-EXfxzK1Z7kqCDckq829GHat6EfYCKJ+9BrcBeHd1raA="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-oDjnxygsxPsy1Mgnx59tpmqikAgN5H4o3IBzXup4zNo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.8"; hash = "sha256-xxkmlp9i3x/4Ii+e4YYMPAA4iWdK2cwwj4030tp3o+U="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.8"; hash = "sha256-ZB3eGK98abOZpcYmfWx0V3G/8AWr20gGyB/Ko5Zl91I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.8"; hash = "sha256-L1IBy+DvMCZIbTzmlvSU2vsRrlZz7f29VS4H0+1/stw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.8"; hash = "sha256-6G+7coU3SeYUTAjWl0iSYi28nGv5mzTnS8nkMMffGP0="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-O59V6pzicz7KWwUy+5qB3nAwSxhRsM9HoCq2uInaaHY="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-o3tSBAtHJGV5FbpreOQPF1VPb1ZoJI0unynfBUwvZ+E="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-NI6EnCoVuFHZ6mH9ZMXb38GhmQUhfxwP+vPlO/MsVnI="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-zvmCpjhY5JRezpwVr0S90rJfV0YGZ/wFJswo7Bl6tQQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.8"; hash = "sha256-D4qB2A3tJGN3nJcxMl/gBxA+LQx5QiawYWHn1Y3jWHs="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.8"; hash = "sha256-emanxsPDi9tYicfkeLRVN4r+yZq06jG2RdoVpRG/lK0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.8"; hash = "sha256-x7WOZWhE4NX6yc5MBlFO4EKHt4ExhnGx6lhmYrr8wfk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.8"; hash = "sha256-SWEUTsvHkPP9S8iRW/PrneIZV7NRkz3IPiVmKZ95X6w="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-bG/yxRP8uNHjCcZkSOlqSqgWIesuww8irvtSsC8jIfE="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-0EJXF7Aa+7nEUOvqMCDLr5Gwa9OWu/Ol5kpCymTVkP8="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-sdCf4IfySwQalViNicdX1NFN3obWCImm6I6Zzhu1pxs="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-jHU0GS/mtOjKniVojxzKdk6VgQghNLRWi4G0/W+kflw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.8"; hash = "sha256-hBmQqsJX4lPCEkwh0kuZl81KNkqR+4FZWwBKaGQPPPk="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.8"; hash = "sha256-kWp27hqFc4GlvnFiiPZlW8F6UEXmFRNAN5RkkNfM0D4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.8"; hash = "sha256-lD/M7PhWXUSsS3FJ4doXNo+zFLIAnhqBmtfBkDvOX9U="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.8"; hash = "sha256-xJc8ynP8Yaq3fdBrd+1wSgF02dx6fKaO8Ty1JJvm87w="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-/1nQT+3thlkAeQbfsIakuD+/oZsq9KeI0vCgCFubOO8="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-2P9wZVY4iQmOxKttjrqb2fKQMWHzupFgVuwcE4egAOU="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-ZTK07ZSjid/flmTDgrp/GH37rmYpOYdXTKzJnEeIx3k="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-Lzxot9nzljMCvyqLHiXOu6qC3rgB3iN6JG5t1QCAbko="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.8"; hash = "sha256-NmsUnkmjpbxYa3jNjLa3+CbbSa1ipFvolk6fjJQ52co="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.8"; hash = "sha256-pkfKvNeb779TUp9jp19peJjCXK3NGpexaFjWwc3dSBo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.8"; hash = "sha256-C0zUiMMAQ9nd1n7PDVoBhCShHzdGI67YFySTpeFH8uE="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-ojXEKX1OwepAx61seCAPh27UATzGTsE6VenT061IOmU="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-wMhsf3QncEUGSnFrGEck2Kyb8cPLPW8n7ZgKHwebdI4="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-AGqQ6fZicft/cBquuHb9jOh10N8gr/sLfijYzwm9vcM="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-hl5uj5iR2xXkefLQJ7DVU0NfThLatJUOqm9MGZUN9HM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.8"; hash = "sha256-gS1Lu8UcYwlJL+N4Q86NnObCYOjsaG09+bHbjXr1Ro8="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.8"; hash = "sha256-z5swa/BoIPh7oDb4WpAh5uvXZ46artGD/lnQm4e2cko="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.8"; hash = "sha256-fpqkDTGVOO85fWS+X5Yj//NRkVoRf/RxJZ974N4OKvI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.8"; hash = "sha256-nZEdf9Y3TLgyLOzSpn5ryl4xAbIy1vMGnVqCcYr4G74="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-NDGG0iZtxXLArTb3DEF1ELT3nHNTT5ogXqG00+70f9s="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-QYpsPJMunG+1LY6iOhkqe3TWZeUnV2sFdCRGKByEJcg="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-B0EIM5Jxi367oSvB1mHiHE3VpdoE02OF9FbFC1FlkLk="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-y1V5P/emZwwzWoz0UtMC/OYQjK+nGe9vkrY4RE9HRVI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.8"; hash = "sha256-vz7hG4LOgtZVpOMCCDrosxSiSUAIFmHWHxPe2kfIAWo="; }) + ]; + }; + in rec { release_8_0 = "8.0.8"; aspnetcore_8_0 = buildAspNetCore { version = "8.0.8"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/648de803-0b0c-46bc-9601-42a94dae0b41/241fd17cee8d473a78675e30681979bb/aspnetcore-runtime-8.0.8-linux-x64.tar.gz"; - sha512 = "d6c0cc2aac79fbacbf81b597f286763599f66278c17ddb448ce0b93d499bad8f88777d425854e68602945ab18af8a61f1ee59d431d5503006137f86113faa8b2"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/26f16795-9928-4ddd-96f4-666e6e256715/bf797e4f997c965aeb0183b467fcf71a/aspnetcore-runtime-8.0.8-linux-arm.tar.gz"; + hash = "sha512-0P7t2Ru0AoBp2M/xcmGR6fCZIOdWQF3g0rv29DEWJ3zJPr4kg/QFuqSXK1T/6JsJy+FypjnmA5eucTjfXvSMTg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f6fcf2c9-39ad-49c7-80b5-92306309e796/3cac9217f55528cb60c95702ba92d78b/aspnetcore-runtime-8.0.8-linux-arm64.tar.gz"; + hash = "sha512-w9ydcfygpI7algdMvO9MmiZcHE4Qy/84YU3XTXlEOunRzNEHFHZM0EEpH4HYPA7Rwwer+JJJq0tvWKXelS/P/Q=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/648de803-0b0c-46bc-9601-42a94dae0b41/241fd17cee8d473a78675e30681979bb/aspnetcore-runtime-8.0.8-linux-x64.tar.gz"; + hash = "sha512-1sDMKqx5+6y/gbWX8oZ2NZn2YnjBfdtEjOC5PUmbrY+Id31CWFTmhgKUWrGK+KYfHuWdQx1VAwBhN/hhE/qosg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f6fcf2c9-39ad-49c7-80b5-92306309e796/3cac9217f55528cb60c95702ba92d78b/aspnetcore-runtime-8.0.8-linux-arm64.tar.gz"; - sha512 = "c3dc9d71fca0a48eda96074cbcef4c9a265c1c4e10cbff38614dd74d79443ae9d1ccd10714764cd041291f81d83c0ed1c307abf89249ab4b6f58a5de952fcffd"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/9255e487-cdf2-4690-9840-74712503e37d/40be3d122db1d1ffa53a9843321c3979/aspnetcore-runtime-8.0.8-linux-musl-arm.tar.gz"; + hash = "sha512-XZ9gnnLc/MFra7Y9Sef9R8Pi13kT2d4UhkQX+ypTSy99tWUw2xZazGNjNkHHBtD6upXbmFsJhEZ32MtBA5oMZw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/465bdf6e-407d-4512-a222-32dafb225ad8/c22004de330d10a06141dee0f42b5d12/aspnetcore-runtime-8.0.8-osx-x64.tar.gz"; - sha512 = "d3ba8dcfaddcd6d50fd434911fe3eb8309666939a8a1ede800d7da2dd814efbd781d1449a42b71d1c71d9593465e9e97205025eb432808ef9a3ba0dcbdba0e3e"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/95f358cf-86b5-4789-8ee8-063067081c8b/e50e603b2453d7dc65eeb26dd4cfb398/aspnetcore-runtime-8.0.8-linux-musl-arm64.tar.gz"; + hash = "sha512-YCjCkwbUlp7kBMRZ3KMTDx6WFNGVTo7UQAFAs1rYoeZqCos64CFV32vQRs2TCQdCIEh6HCYlw58IG9xsjtYgBQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/a7080974-fac8-446c-ba20-313f6f323fbe/f907c126c9bcd394939a7cdf86b85f4b/aspnetcore-runtime-8.0.8-osx-arm64.tar.gz"; - sha512 = "a196c62b14e9136362073826a03e76e0a147027f03655529426e594f7e44eb8dd036daea80997876047171c1793c7edcfa5146bd55a01b591d9405fb1646eb00"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7d2ac05d-2bef-4069-9513-bb2ef7fab48d/4f3d2d3fec003a65513dc1f70c126ab7/aspnetcore-runtime-8.0.8-linux-musl-x64.tar.gz"; + hash = "sha512-gi8uFxbcLSqkb/CPTS2bueqMgjMnhdCrpfTzPl62C9zYTomc0qE8qTAyImcQtfDKXHFZvtoXAn+E76KFJ4tXmA=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a7080974-fac8-446c-ba20-313f6f323fbe/f907c126c9bcd394939a7cdf86b85f4b/aspnetcore-runtime-8.0.8-osx-arm64.tar.gz"; + hash = "sha512-oZbGKxTpE2NiBzgmoD524KFHAn8DZVUpQm5ZT35E643QNtrqgJl4dgRxccF5PH7c+lFGvVWgG1kdlAX7FkbrAA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/465bdf6e-407d-4512-a222-32dafb225ad8/c22004de330d10a06141dee0f42b5d12/aspnetcore-runtime-8.0.8-osx-x64.tar.gz"; + hash = "sha512-07qNz63c1tUP1DSRH+PrgwlmaTmooe3oANfaLdgU7714HRRJpCtx0ccdlZNGXp6XIFAl60MoCO+aO6DcvboOPg=="; }; }; }; @@ -142,21 +212,37 @@ in rec { runtime_8_0 = buildNetRuntime { version = "8.0.8"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/68c87f8a-862c-4870-a792-9c89b3c8aa2d/2319ebfb46d3a903341966586e8b0898/dotnet-runtime-8.0.8-linux-x64.tar.gz"; - sha512 = "8f5220098c562fa3490417748eb9f4f9ca1551f7155728b9ebb1924359c63c18dedef643bcd89ec67b59cb5b1b9de7283ee156ef381ffb16801b516dba9b1b0f"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/5e427de4-981a-481e-9fec-fa77b02a7edb/0d156acae55ca1329b6b9a8de70f398f/dotnet-runtime-8.0.8-linux-arm.tar.gz"; + hash = "sha512-yHr1qq8y4YzNwpZRecZaq65eDp6Oogn2w2QnDOLkr//ql5yiLhQ95GdONqKxLGa1dViK4hnxZjaspxIUQCQCiA=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ac04b123-0542-4e80-9216-93f51a6814b3/d110733c152d34ab4eedb435ccfdab4d/dotnet-runtime-8.0.8-linux-arm64.tar.gz"; + hash = "sha512-JG+35e21Hbk0Ica7dCD3o1hDC5iyJKcftw5xorzgvJH4U6qJEJ8hiLCrKFMqJFw9UrqsFjRj4BoCAZ3qN/058g=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/68c87f8a-862c-4870-a792-9c89b3c8aa2d/2319ebfb46d3a903341966586e8b0898/dotnet-runtime-8.0.8-linux-x64.tar.gz"; + hash = "sha512-j1IgCYxWL6NJBBd0jrn0+coVUfcVVyi567GSQ1nGPBje3vZDvNiexntZy1sbnecoPuFW7zgf+xaAG1FtupsbDw=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/2f4507aa-972d-429c-9129-cfe95c1279eb/60dd9afc3f4786a568b01119c2280c63/dotnet-runtime-8.0.8-linux-musl-arm.tar.gz"; + hash = "sha512-im+SDZPX1VJ9won0clIeKmca+05mOqrP2CwyZYwuo56rQ6XJfT09e6WEA+v79suW/HP/W3zMGpRH0Tv0HuuAyQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d78f160-0833-4db5-bd62-947f8bc2d571/25638f47211018a7bd8fd9d314763196/dotnet-runtime-8.0.8-linux-musl-arm64.tar.gz"; + hash = "sha512-JvNeHGB0p9maQOpI9sAtt49OLHQ8vHRGOglNoBThJuk3nQm05WgJrJgpsmtroKkBrcR638PF01qX6erVppMUiQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ac04b123-0542-4e80-9216-93f51a6814b3/d110733c152d34ab4eedb435ccfdab4d/dotnet-runtime-8.0.8-linux-arm64.tar.gz"; - sha512 = "246fb7e5edb51db93421c6bb7420f7a358430b98b224a71fb70e71a2bce0bc91f853aa89109f2188b0ab28532a245c3d52baac163463e01a02019dea37fd39f2"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d9c4e4e4-bb2d-4f1a-9ded-bff5e354bd5a/0c6dbc5f68bea36a65fdf80e6aa4d55f/dotnet-runtime-8.0.8-linux-musl-x64.tar.gz"; + hash = "sha512-yi/zIUVQZRMlP4Ds1ytcJNi9oo9EroPJiMOev6dec31VELy4S8J6FJ0uaZV2H4sSTXcBUirpu8rBf8MmZyF+tg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0159972b-a4d6-4683-b32a-9da824d5689e/ffb0784119abf49015be375b5a016413/dotnet-runtime-8.0.8-osx-x64.tar.gz"; - sha512 = "8029986c1f8bbf1b0e8d0929756156fe41d46d2df6ebe1ab1c66fbcea2add47c35b934573c6198797cf60d2b372cd463e70326c0a35b0926dab4d5c157a357f3"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e9ded115-7a30-4952-bb72-ff101583f20b/5a7628261b98d095d2c97ec3fe5267be/dotnet-runtime-8.0.8-osx-arm64.tar.gz"; + hash = "sha512-iLBt0FGBm9noziw0CyUW3A5Kd9Vl7/FF2OlXslUqZB4jWlzn6Ns2B0dYh7x2bxUw0B0Ofv2A0QzWUqKZlUOYtA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e9ded115-7a30-4952-bb72-ff101583f20b/5a7628261b98d095d2c97ec3fe5267be/dotnet-runtime-8.0.8-osx-arm64.tar.gz"; - sha512 = "88b06dd051819bd9e8ce2c340b2516dc0e4a77d565eff145d8e957b2552a641e235a5ce7e8db3607475887bc766f1530d01d0e7efd80d10cd652a299954398b4"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0159972b-a4d6-4683-b32a-9da824d5689e/ffb0784119abf49015be375b5a016413/dotnet-runtime-8.0.8-osx-x64.tar.gz"; + hash = "sha512-gCmYbB+LvxsOjQkpdWFW/kHUbS326+GrHGb7zqKt1Hw1uTRXPGGYeXz2DSs3LNRj5wMmwKNbCSbatNXBV6NX8w=="; }; }; }; @@ -164,70 +250,118 @@ in rec { sdk_8_0_4xx = buildNetSdk { version = "8.0.401"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/db901b0a-3144-4d07-b8ab-6e7a43e7a791/4d9d1b39b879ad969c6c0ceb6d052381/dotnet-sdk-8.0.401-linux-x64.tar.gz"; - sha512 = "4d2180e82c963318863476cf61c035bd3d82165e7b70751ba231225b5575df24d30c0789d5748c3a379e1e6896b57e59286218cacd440ffb0075c9355094fd8c"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/788ca4e7-c3ea-405d-9f82-2d362d4a08f6/d54b1aefd4048bcf4eebb24edfc6aeb9/dotnet-sdk-8.0.401-linux-arm.tar.gz"; + hash = "sha512-+5Co5S9d0p5ZU+RmLMnVfKqW3GqPb/bPrheUeqij9Ttf7xuzW4wFgV+hyvvccxefcpbOhGv1dp7hLJ2vW9J5QQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/14742499-fc32-461e-bdb8-67b147763eee/c14113944f734526153f1aaac38ddfca/dotnet-sdk-8.0.401-linux-arm64.tar.gz"; - sha512 = "e8738b21351d030a83be644571f3674c8dda9e6fbd360b221907a7108fab02becd18e1331907535a1294d8c4d0f608519674c27c77dc2c2803cc53cce3e10e0d"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/14742499-fc32-461e-bdb8-67b147763eee/c14113944f734526153f1aaac38ddfca/dotnet-sdk-8.0.401-linux-arm64.tar.gz"; + hash = "sha512-6HOLITUdAwqDvmRFcfNnTI3anm+9NgsiGQenEI+rAr7NGOEzGQdTWhKU2MTQ9ghRlnTCfHfcLCgDzFPM4+EODQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b266f183-c677-4f93-a729-abe0334401ea/ca0ce4f684c4cfea2d372223f9c67cbd/dotnet-sdk-8.0.401-osx-x64.tar.gz"; - sha512 = "063aeaf4e949b96d501b77873279f0286cde46f9212b59181c6db21630401fd6a352e3259848cee8e127e4ceac85a25e0bce36699a2fb6f6e2a91997c6f61eae"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/db901b0a-3144-4d07-b8ab-6e7a43e7a791/4d9d1b39b879ad969c6c0ceb6d052381/dotnet-sdk-8.0.401-linux-x64.tar.gz"; + hash = "sha512-TSGA6CyWMxiGNHbPYcA1vT2CFl57cHUbojEiW1V13yTTDAeJ1XSMOjeeHmiWtX5ZKGIYys1ED/sAdck1UJT9jA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/29ef2c29-154a-4c44-9450-071ae664767a/4ce00627f3eaee13874b54f033a9a27a/dotnet-sdk-8.0.401-osx-arm64.tar.gz"; - sha512 = "a3232c0693b41ee6b18dc3c8b26d82dd9116132bd7871dc9c0a0acc5e7995f352e760869fe91a08828417ea7b91fc27859aeea449b9efabc17c136a57737c93e"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/f9eed98d-5e19-4822-85d6-c59c62376bad/52ba188eabe759516711f14247c57f7a/dotnet-sdk-8.0.401-linux-musl-arm.tar.gz"; + hash = "sha512-xcVH6zAdyWXu8dm8xkIxZ44glZG4AZengknTXRZVpUafOc5t5lQ2N19uQtItFZw9xIe+F/bb52NAQAlfyYjbIQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8f3dec03-a016-4c06-a4b0-04efcffbe521/e0e94170cbed0aa9312be63e43a69932/dotnet-sdk-8.0.401-linux-musl-arm64.tar.gz"; + hash = "sha512-L6q5PdOKSThgMgg6D0o6WlZh1uz/SpjwaO16oHsgEjOAT6Dl76SRG27r7cmZTVnE1dhD3rdz5+JieyqpfmNKgg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3ce68ecc-a007-4d15-9196-79ced76a154a/6a45f69bb5c24576abeea048cea09987/dotnet-sdk-8.0.401-linux-musl-x64.tar.gz"; + hash = "sha512-5xG3SDImlGPif5iwScRC02hM3CExFRMyhaKxie9FZLZRJ3R83TqQDeU1gQGb349HQm8s/Jv8HAw6gxBvm7VOpQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/29ef2c29-154a-4c44-9450-071ae664767a/4ce00627f3eaee13874b54f033a9a27a/dotnet-sdk-8.0.401-osx-arm64.tar.gz"; + hash = "sha512-oyMsBpO0HuaxjcPIsm2C3ZEWEyvXhx3JwKCsxeeZXzUudghp/pGgiChBfqe5H8J4Wa7qRJue+rwXwTaldzfJPg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b266f183-c677-4f93-a729-abe0334401ea/ca0ce4f684c4cfea2d372223f9c67cbd/dotnet-sdk-8.0.401-osx-x64.tar.gz"; + hash = "sha512-Bjrq9OlJuW1QG3eHMnnwKGzeRvkhK1kYHG2yFjBAH9ajUuMlmEjO6OEn5M6shaJeC842aZovtvbiqRmXxvYerg=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_8_0_3xx = buildNetSdk { version = "8.0.304"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/52cedf32-8a92-4966-b184-18404ea1c5a4/cc399fff1b152b822776514ad247df50/dotnet-sdk-8.0.304-linux-x64.tar.gz"; - sha512 = "971c344379240ec4bfaaf1eca69c6667e594cdd0dfdcde6e8962cb7a41d669dff91c644e48eed3573d841b7b3e60ce02e0c27a7ce37b66cdec27bf3457087c4a"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c73041ed-e684-4dc9-981a-2db502409dd7/0e24c20b4b1d0a728e20982de0b8790f/dotnet-sdk-8.0.304-linux-arm.tar.gz"; + hash = "sha512-MbSFdO52Ow1BggwfSWs+BVNsa2n9bnZBJEsc1l3MOy7V77SD17/MPC/O0v5OlGWJpY4kTdxaExyyZUgiAYwNLg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/be9572a5-bcd5-46a0-b10d-0d00229ad57c/b80d3adb25c20fec467bd33f29f9a1be/dotnet-sdk-8.0.304-linux-arm64.tar.gz"; + hash = "sha512-bOk7ozCEi0BFtsY/lq0KkcR0Nhywogi9QSjUGP1toEaVVZrdY9+aCs8oOjLm54EyjTl5r5AOCyOCzwBsmYKAbQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/52cedf32-8a92-4966-b184-18404ea1c5a4/cc399fff1b152b822776514ad247df50/dotnet-sdk-8.0.304-linux-x64.tar.gz"; + hash = "sha512-lxw0Q3kkDsS/qvHsppxmZ+WUzdDf3N5uiWLLekHWad/5HGROSO7TVz2EG3s+YM4C4MJ6fON7Zs3sJ780Vwh8Sg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/be9572a5-bcd5-46a0-b10d-0d00229ad57c/b80d3adb25c20fec467bd33f29f9a1be/dotnet-sdk-8.0.304-linux-arm64.tar.gz"; - sha512 = "6ce93ba330848b4045b6c63f96ad0a91c474361cb0a208bd4128d418fd6da04695559add63df9a0acf283a32e6e781328d3979af900e0b2382cf006c9982806d"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/21dcf586-94e5-44f2-8407-bd409d73f59a/ec99c395aae24f38dd5cf91c8dc06fd3/dotnet-sdk-8.0.304-linux-musl-arm.tar.gz"; + hash = "sha512-0tEHHGdGZKj+lvYaYgTFb54sZZjSoR406skWX/MNHNMxGeEOeUmamjVOxGHjBj5Ad3KzYvNkDmQRTNzSpO8Pag=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8b5c27ce-6c82-4a06-8960-15ebd5434595/508572144872e190e7f00ba6583011d4/dotnet-sdk-8.0.304-osx-x64.tar.gz"; - sha512 = "50f0265436e8c3d756ba00ab7fcd606cb5d452d7bede4daf97e4c02cc97dbbafc00b76f37ec4f07bbed4bee643a433849ddbd363ad2d916aa5965ee74ba317d6"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8083f186-347d-43ff-ac05-575f63a1c692/dfbfb3ee9943b880472ccb8e5517a881/dotnet-sdk-8.0.304-linux-musl-arm64.tar.gz"; + hash = "sha512-8mbyyMQFN32ExPGRegxKdJMJfMhTlA7hKQ7vyHdzMZNagAAqnGx8AxmP82YbyKui6TNBXYp3iUn/kB2ov9qNGg=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ba638c9-0721-42c5-8bf8-9706c0f9c033/f8dbde51758bd9e734a9c932b60e12bc/dotnet-sdk-8.0.304-osx-arm64.tar.gz"; - sha512 = "6993a950bc5bff0efe762ba2562a88761e93c61024d93633209950cbb68aeb5ff189fcbfe9247a1cdebbe37e738136123c7d4eda1050708608bb1ff0408eff4d"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5cf9b56c-0da6-4229-9e30-44547aba8be6/20d2e5353050b04d3272aa5c4a1b689c/dotnet-sdk-8.0.304-linux-musl-x64.tar.gz"; + hash = "sha512-QdptR5cqfKZ268Bxhh+jxW8xH2PuCff+A8wJzvHkdx5O/nPF/GsCq4TwB8LnBE1+4WxliXH6hW1T8V9D5qYdmw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5ba638c9-0721-42c5-8bf8-9706c0f9c033/f8dbde51758bd9e734a9c932b60e12bc/dotnet-sdk-8.0.304-osx-arm64.tar.gz"; + hash = "sha512-aZOpULxb/w7+diuiViqIdh6TxhAk2TYzIJlQy7aK61/xify/6SR6HN67435zgTYSPH1O2hBQcIYIux/wQI7/TQ=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8b5c27ce-6c82-4a06-8960-15ebd5434595/508572144872e190e7f00ba6583011d4/dotnet-sdk-8.0.304-osx-x64.tar.gz"; + hash = "sha512-UPAmVDbow9dWugCrf81gbLXUUte+3k2vl+TALMl9u6/AC3bzfsTwe77UvuZDpDOEndvTY60tkWqlll7nS6MX1g=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_8_0_1xx = buildNetSdk { version = "8.0.108"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/95a365b4-ac3b-4300-ab6b-54cbc73220f4/4aabad928064af8761315ef34b08c24b/dotnet-sdk-8.0.108-linux-x64.tar.gz"; - sha512 = "5666ddf6fa9b65deaba4d7c5fcc2e2d56f631c4f5f6fb2a9f5919af0616ab2b420b12a828becc2e4b8628a76ac3dae824b55abde5c6d5ac59ee131d7eceae7c2"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/27228a4b-1ae9-4c1f-8a21-eecd21d6c7b8/c0500c9fac6db54f68c04956b828e8ea/dotnet-sdk-8.0.108-linux-arm.tar.gz"; + hash = "sha512-+vqFZLNLUktCCeEEfOfPEZCl1C57obE1JPXeYCsHXmMM3SKVZ/FOsvCubJaskQrp27T8TlKN+VjJ0xRxNB7tyg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/07df5bfc-98ae-4335-91c4-c95ec5f99a58/48a310e5d1bde3e77c53a51c99bdfc08/dotnet-sdk-8.0.108-linux-arm64.tar.gz"; + hash = "sha512-bMcj8rE50ZsuF9pZNmmNOIpbZGOLde94xAxAftPP096nRcKRbwPvyeZkefxV1gjrOokwVyfs2xyZmxg7WN4ljQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/95a365b4-ac3b-4300-ab6b-54cbc73220f4/4aabad928064af8761315ef34b08c24b/dotnet-sdk-8.0.108-linux-x64.tar.gz"; + hash = "sha512-Vmbd9vqbZd6rpNfF/MLi1W9jHE9fb7Kp9ZGa8GFqsrQgsSqCi+zC5LhiinasPa6CS1Wr3lxtWsWe4THX7Ornwg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/24ef2f24-ca8e-4c3d-8466-2311550147d4/acbf2877ab4b8a611a3b63a9b9853dfc/dotnet-sdk-8.0.108-linux-musl-arm.tar.gz"; + hash = "sha512-77MI2BrBAgli8U0D58qUGaKQGghGEg4HzZXGVAf+KYGiY2DC/+oUHYBYGqxtLDanN5x2wHsvs31O+4NpBfj/aA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/63bf0f75-e962-46b3-b7c3-12aa20129d46/071514943265037c423e6f5e40df7ace/dotnet-sdk-8.0.108-linux-musl-arm64.tar.gz"; + hash = "sha512-5wCbo3OwQ8y0aVVycayK5RirnJtbNk6YQdi5cwW2A28zJA5nLnxIN5hhaiM0KXSNUDj9/TNjUrggYK/WRXRwRQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/07df5bfc-98ae-4335-91c4-c95ec5f99a58/48a310e5d1bde3e77c53a51c99bdfc08/dotnet-sdk-8.0.108-linux-arm64.tar.gz"; - sha512 = "6cc723f2b139d19b2e17da5936698d388a5b64638b75ef78c40c407ed3cfd3dea745c2916f03efc9e66479fc55d608eb3a89305727ecdb1c999b183b58de258d"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/cab77c39-2e16-4f29-a9cb-e490d7fff442/ee37bc88e34e082a64d834ed5041bcee/dotnet-sdk-8.0.108-linux-musl-x64.tar.gz"; + hash = "sha512-dEcVUB3jlG8GzTFvNcq8DjY+CvZRBEyXZwjA1I1OsNCUidkszrKDx1Gy7tDik86qq93Lq/fCXiHWWOv/ncMEqg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ea78b09-65a7-4b08-ac65-bfae17afb322/7416ecc76a30ae4c77e71aade36e037f/dotnet-sdk-8.0.108-osx-x64.tar.gz"; - sha512 = "a80fee279abfeb558a5540ca2a969a11bb3dbeade8c39d8c47be8a2d622ef1c2bedb22c874598ad41dbff2b95d5a43197bd9f55fc933ab4ede5edcb6a76cf6cb"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/64a3d858-c2e3-48d1-8236-7c6702efc1f8/191bed6c7f89244eb998b0f186db57d7/dotnet-sdk-8.0.108-osx-arm64.tar.gz"; + hash = "sha512-g7ASdkdLS2K/CigvvhHSNTohkdkL7NQDs3PNbfyVJkRCqQcRetj2FXZbE5aSZ7iH0mqfJNvV+I2LVdqpRBLRPA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/64a3d858-c2e3-48d1-8236-7c6702efc1f8/191bed6c7f89244eb998b0f186db57d7/dotnet-sdk-8.0.108-osx-arm64.tar.gz"; - sha512 = "83b01276474b4b62bf0a282fbe11d2353a2191d90becd403b373cd6dfc95264442a907117ad8f615765b13969267b887d26a9f24dbd5f88d8b55daa94412d13c"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5ea78b09-65a7-4b08-ac65-bfae17afb322/7416ecc76a30ae4c77e71aade36e037f/dotnet-sdk-8.0.108-osx-x64.tar.gz"; + hash = "sha512-qA/uJ5q/61WKVUDKKpaaEbs9vq3ow52MR76KLWIu8cK+2yLIdFmK1B2/8rldWkMZe9n1X8kzq07eXty2p2z2yw=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_8_0 = sdk_8_0_4xx; diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index 3e398bb59ac6d..f615911b77a02 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -1,151 +1,245 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: -# v9.0 (preview) +# v9.0 (go-live) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-preview.7.24406.2"; sha256 = "1jr7mhmjxc1cdxi21isz5g545yzxfv0pjxr1zrjnsfa7vanv8dyy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.7.24406.2"; sha256 = "16adkc5yc1xd47q0bvg8zyhmyyqy8zli7gi8c1fmigxppyr214jr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.7.24406.2"; sha256 = "1xqlfafqljnqnqy8524yfw7h17xby0qlqjj5fgb6bpx325v2n8rs"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.7.24406.2"; sha256 = "0mw4l8hb8bhb0hnx6jvz7989602qldsr1hb1xcfhw1d8xismgbii"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-preview.7.24406.2"; sha256 = "17l0nkr6pgr5wi7md5kj0avvr3hgz8b67krccdmpi2x094ircl18"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-preview.7.24406.2"; sha256 = "111n5jhak4lf9c5rdak0nbb6zvxzjvrvhy26k49ar6jg4narp88l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-preview.7.24406.2"; sha256 = "1bm9xqrmr4qnrsvzdq5w0fi76dndb70b3n9ampkq2gic87kl1cci"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-preview.7.24406.2"; sha256 = "0gvnabw0i6vy3iir3bqwvg1vy93q5ifkpy3ax6vxlfqzf8pxrb9p"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-preview.7.24406.2"; sha256 = "1qhyj7nhj4mjj4hfhmfn7pgfz17h74wzaq5366qz5ibl45xrbi6k"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-preview.7.24406.2"; sha256 = "1vl88ywvl33mn9iz0x1mm8wiq7aviimpb2sjsb55dy53g4k86z4x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.7.24406.2"; sha256 = "0j183nvfqf4d5sd0cza9zj273j2x744yjzv785d0xchqxlps0n2l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.7.24406.2"; sha256 = "11iwchmhklaks9wf8df100p0hicwm2in88id4bb9g9syjyc7jg6v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "1aw9smdvpr0fx52zk7nr23mi2l5z7v7d6r7ycvldm7bdp44gn2w6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0hn3kpy5wswk7ndgwzjjvnf1w92ss6lcdgy79ackfx7mn7japyw5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0ri5pn0x6rh6g9g2m165c4wlj2hlnchjh9l5jp7q6ccnjaqkp55j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1kvwg5c4x849lw6dip9v9fxr3iwk6siwi80lla08jpkysshwjkwn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0kldzbdcg3lhb4adgriq6v875cpq4b43v8nj39lr7s98q9sb5lx4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1hpvw1nxpinsdihp0n12ap7m66qjbhq95cls7wbg44n6nyd1yaq8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0ax6xw2ikz95nszwwn1ra77inlyzkmdcxcbg95qc0i3clf18d33m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0apgg5lalz2r3bgvx6sg2pd20mgnyphpgfqw21g9wqq19fyx2kn5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-preview.7.24405.7"; sha256 = "0qnlq06cagbzza3di41pv9mxcl9rqhkclqrdwfy0zwz8k0a9jj7a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "025s5mss3jr7cnmsqqnv3spqv11a1240x34pwrbb50j250r7zyr3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1g7rsqybpaifq5vr00pak029bg6gwyi33mvxkxr2wgawfbkggf34"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "18may21khp4m55d2r4w1j2b4p5wg319c8d9z9x0d9c3qlvv4rjl6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0mnqqz1bwfv8a5c7agcmpr4rckdlllavsv91k387jh2lc5g503cv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1h3kkqv33mzmng14b3h1fqqh777xck65ifmdzarma1v6r8hqw57n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0kmdivwynf9m4al61kggv7iz6hph2sa2n9v0vyh5hrgls7k401lk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1zx29hrcfzv01mr37qkm5ax43g2zyd1lslb5smy8mgwyjf4nvhzs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1cm8ki8hkk7vmjsb7cwi61q30rjc0cjffcn95qzxppvb7rb3393y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-preview.7.24405.7"; sha256 = "02v2dxs355cskcjb80k4vmxdw0g4g5v316h9rp0jmblm8kjvdnhz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0mb9kvi2whvbd3b2ny1z4cy93z3i6cr0b833dkn2w480hgkcksbn"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0qlgx6byb3l534k5gw9jhpzcrnldcyix4gd46v3kz8a4g007bxw0"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0fs86sapdib43p8pza2pb1qzdinvk8vzzh2mxhwia90mlxq9nmm3"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0rcqhx7kaifcy0k3np3xar2pma8cs16d4626m4wnas0ndd6z4k6n"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1zn4cam3fkzv8wr52sdrsi1bbqp8z2m1y7vs10s20f9va0k2yl7k"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1lqs32l1bh74mbiyank4b2lzfvxrrm4ynj0hrlvl80hzrmq06ckm"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1ah2bfaqcvwdazh4hyaxdjmlkx33kcmc722cblgasc9ybff5x41p"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0i3kdgglwjq7spsynpvzc3bq9kxaa3b4jzm5zas09icqxvx7jvd5"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1ayavdmw3883vdpr0lhs0kcav9f7ijnyh5h3m5ky38964bh5km8v"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "03a3b21cx8yyb0d85q2f24sbzqahbyx7nyq08q834372ip8hyxw0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "06iphzybm88nf890xficcjqyg5cmdp4jaiad1rikfjqn2g83gdf3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0b4zp49xznypmv0ndh0vm2hnbkdnd0kh2i5gl3mjbmhjmmqbfwc3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "0cs2krwqxrv7rdiiqrkvlfk37x6g5j7z6pp6xm149yfs12gkxdrz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0mzdrim92ni6pgki7cslpz3w0f3048r2840bgpirdljbdz61hlyx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-preview.7.24405.7"; sha256 = "1bxzzdsdb0xh63yx2vdns9s6i44nw7z1snqmzhg229v8srcz31md"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "1021rjnh4k86s30m50czgnypxxhlsdzldd3rl82915fjkj62wsy2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0x4nm5cz6vqkyxs981y0c19crpbmlh3d70smch5mx3gipd3sy215"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0iaq2bw9mfga0c941vbkrd8lnlhzbvv62nifh2gc2nng19jwnmwl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0fs8kwvfnhhr28lmsxa9rvncxbqi9pl74m8n3lasw413gnad59ix"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "16gw1hrnnfq4i5n0axz1nwx87nns7nsd48albdbp0c6x81rf9h1v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1kf3hr2bcczx2g55zxa0p0lwfwgaj8hxi58f6alswn9520f46a6c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "162g502facbqh1kzfc6m1n2hbwvxjc247vzy2hq7i1b2ii7qqllg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "9.0.0-preview.7.24405.7"; sha256 = "1wzv5gs7ndiw890b6hc3xa1wmk2657q8dd8jkn10vpfvz1nwm3n1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1dfjyi7fbzw0apidc27liy48zqjrgs5m88dz1221wnsnnlb5smc6"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1pyhhj2ypi4308ylq4qpaad95c92lqrp8cif5xi7vzfvakhimmfq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "0shpgkbf94mq6nj3q8alrx7iciavm6w5sa3iyvkkm63zgls8ny32"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1dx8rwyhxq8hnqci835vvs8zbxainp08fq99ij77nzpbi6zqhpc8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0cnk150d4cwcwc1dfnhlyyb6rvjyhl7vrvvi6xby1g5fcvrwni30"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "1labhjgjr9zgm632c76a2a7x7p17jzs0xspcbl90mw65bacy125j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0ijcdszw57mfsacq57q7wmjnknfla5jhcj1xda9zskz7by5yrb1w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1511lkh212ra48mdkb0glmzs46ha4hyvw4w3amqsnldgv0cg826j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0riza61a8x3wmpvns95d8lvfqdwlvs6ha7hja4jakxkdpjdq71p6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "17kvzypc53k03i65vj0841qhw6zgagpfnags7gjph6pv5drgh6a7"; }) - (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "011lklbi7ymjybihsfv5d2ldmqk3jwawcgy9119pk4igd4vzvrmd"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "191iam6az00fd1y0r5fvxwj6wc7qm2hwhm2va5f9fkwlhsq2088j"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "174pd1ja3cxxgvbd1hrk2samwmgazx2cjsi6irj2nlrc2vlh2swj"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "0p2cml2avj3qlrwyyiky6ajlbhrb14870xvnj3n4avxp9xb773bp"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "0pf46ym3kgll1vkap8f4syc2d36yfj8sb9596gm0hycv8kd5xrqj"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "1anqzv6qg7i25izxgx081237rlqd8dfvk97cybcyjaazlygjn502"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "0l5xpyibs38yh5ra9q8jl4mzj5mybmfhid1f5p9yhzrsswcp3y8s"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "0pyych7c5j7fhd4f9gsfgkz9ncdsvaj8bp61c755lj1si34aa71l"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-preview.7.24405.7"; sha256 = "1l96la9apwnpgbgsbhgkd5v56aysr15x0v26fg0xcw79ms6vgpkc"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "1ihwyj3s5rah4q59kgdj21k4varjnc1khahlwf5x76k9smc56908"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-IcIfs7kmYWeUW0xI23FCgzzdTx/TstTzY/En7HZ3IYE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-YtwuWl1DpYuKY97P2iJmm7ov5q05by3eFL4inl+Kwhc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-aHywWxrhPfKRL5sZelbQiUZaMLRn+e4A3UXihjNBLoE="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-KaSR5WA+aTDOR41PuvwsXZt/zHsOJOKxBEfSGxFO07o="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-f9o3PGHsW2BNMN9noBsUFv0SRRUR2m+RHceJtjCzd60="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-1P7Y8+FoxfaL3vTLPx5/LPYw2ZVhxC5sTSKbjHCPAuc="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-yT+zcwYGL1f8oMC7S9sdLjbLpaR5/zdrRtpozZ+w/YY="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-U8rxugP2w8JS1I1cTMzN3XYjw9uVHZqPDDppdE9dtns="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-iRO1a77VwLcu4vWro3eHHcxh8nQlY/ik4+pT/2c3khA="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-XIODRgELUOKfn5L5g40Mxzcf/qH7pCJoRRvZPW1eY38="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-hqYfNrj8fhgSMkK+sEQTtZdidJeD2vvvDoMBtK8ZmYI="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JMpiQJY23noyNK0KjkkyGmYJJLyTNiHhlZPKA6vSQB4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-XjcQWqUEadp9u90HZU45gt/ANzn7Z7yuV24SrMKY7tM="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Dbt1T/Y9AsuITCNDu7+9to+9Q8aUAGmEsemONyucNkg="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-AlWrYGpqFSTj6UDEZ77kFq+KrN9SOO7fLu+R5hiICTM="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ewDINCVRtePHQRceMn0xhUFNjEr08AsaS9WBvz3lcLs="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-8CNaSv1PxoyQGSc7W64BlviEgBtggYzSjDh6vPl3YSI="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-DV1kc2BhDSHgmWE7lqUtM3u5YfXl/EKo3FU04LHzP5o="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-58cO2fdzdLYkWC6q7dn5dXKpMj4WzE95tlnPqW0X+W0="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-GugOroZ0SRoGoP3xE3jt91vTbHwXLPq8bHYckNC8SIA="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ceT9q9ZCwhGnp+BrxgjPcoyrAqKHc7VK47M4tM2pQmw="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-lvAHbw3hhS6OnCuUMLEa4NKJWZPHqcBM3IeXpeYtLHo="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ZV5ptFKjt4UX+ytjnWMRk0/Xc+hR8tuYb8ADqLlTFnU="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ULArvCiy+bOHtkD5E0q7u+Cfg7R+IJZ4A60ldV798vs="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-eC46DyuObx9VhFP4PyY/3JWqAck8bW4Bt2hZyuapLRY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-6WaE1hKyIBnsTe3YlVP/lHR9HOnMkYtqDZEZLzidFAc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-u7sukf/qUk+gUVxFj/r9rzkQTVUcg2SqNhOmhPOsEyg="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-pYPVNaL6x5zRCBxCsPso8Ae0k9aaDbvH0aHS+j5pdIs="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-hKCalXcwzlgMLwthSnTcHkDOW1g2XUo4Kj49uryZvt8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-qlxs6pqhMQHkvOkJY37f9VMlxwnjUffue656XJaRLWI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-h1FtdGrQp0HjK8fJajK1h5YV9fgBZCBQOH9M4pqMamE="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-EBCX8Uvy+Z40i+VjuUK+F5CAZYblQLKzAExfx/uQ+gE="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-KmyOl6C8u/PrCAMiY/KwELYvRafnM4SfcnEhKvU5BeU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Q41rpitFgIbgUpIh7iGzXTaCVDoUoDJ7HYddW2krHAE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-bsQyjyidOkZLtjR1JadsIkRp6gDlHjEsJEbNLgKGtdE="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-2YfhVuvSJe2sIkPFgocqAJubbb1PU7r93YoICq3ntAo="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-oPUyQZ9bGNbk6yPeIAQkNmDmDNcq3o2jFIsunotBBps="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-CBwqR3ii9Yg3O9lG/UAFaltVHmH5aFk2r8+IV1zeIS4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Uw965RIeMJJ3uV5xX6WWGVq8i+CHXpiOw1mOT6rPmFI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JBUxkn0eUboAElHl+o2LyC7f9eJz4jJ9/odxXa43FSM="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-ZsUpPpaD4cfjTnTPAw1VqKHYX51XFG1ck0Ae2dWUKt8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-RY5CrQ9K9VZeh8+1r8Rjg0gEFBBRqR5EGTFkBfx0+3Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-FG9CGm1wZlMzKGzr70+qg62NLmYot0uG9yilyoEBpmw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-QtCqH/Ah7EW2lNWHq9y4sAQI+8XOWMLBrqPIuDEV1ic="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-wdwHZFStEDDU0v8nah6hylLErKUxC9x3CvgL/9Qcfwo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-QnGhafheornOKm2H+UO9M+a57S7OzU7oomMp1Gs+qcQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-v8J9etz1hP2q02KbUjKxDUc8So2qlzajFCDbM9N9TiE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-HZS5qup9w2rWf1K5zIq7BEYTi8BC5co+Mz9Ey7iOcPc="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-hSj4rqdeeerbuFQT7DI38eIOI3XUUun7nfi4ypPyggU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-4sp79lNVzgWRV2l1WjURkZBTq13OTRPfoRsaWU1Kd+Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JT2SL5C1RXS80C7hB+YcCHW9Nynq4+1dCd4nckZVDsM="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-pnE0Z0AxP+2tiQT72EIjrsfRxN9q/rWQ/5J1SIF8rVg="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-DO5bDJGbzav8ji/1Wp5+VCU2xd/7P+tD8eMCBCeisq0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ORBkaFVuxvBBcqo0vklECC72Paoy13E33gt/ctHojq0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-oFvsMtKz+O9/B7asuc2DsH8KhRhAdS4D6qR64O8dE48="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-sXYAaSQvdrsknqu85ZzDfRFKQ3lKxPmK3CeYJwJ/u78="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-/GFhQQTpATa+eVsIKIS5hYQwEzueYT7IClqfTuO7OiY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-DJWq3FrbwU6QCJLuMWKFvQhwrszUHIHbZEi+cjnUkAI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-NtpJ9HN+LvXLb/qBn3Dz5XGTqhrlB8oUFCzge9zkxJ0="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-quzQ5GEyFmdsn7VXSsjSFHIcYnHwxb3OXP5Rcnar7mw="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-53HpBsY1A7xFKDSKW+yMjoTdK+calt2k8z1XQbIx39I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-zzq0pwTb9ayiuFijGfhXPyIk7YsGu1Q611CvHhPAGPM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-WUB7TDKuqe/+vZMdwtmb8yst0+6STi/H7gf1jmb0adw="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-mc6g5oRPUbsFFwn5KDeY0LbzLGlyiPZxAhtjGEsIh+I="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-lMVZtEPD48KKReYFsJ2rmJzCvlQNkGvajbfmd/ZYfFA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-mHRvOES1i3VCmHfyQOakMNyvvJYS0xGdF8YFNpTEDx8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-X29sAPaFb6yZptgoQK6QnRKbLRmmkrnvWw2zHC1MHE8="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-8LP07HWuRAyUGk5aSIpBHcAso16yM6UQ7YbPAen0Zgs="; }) + ]; + }; + in rec { - release_9_0 = "9.0.0-preview.7"; + release_9_0 = "9.0.0-rc.1"; aspnetcore_9_0 = buildAspNetCore { - version = "9.0.0-preview.7.24406.2"; + version = "9.0.0-rc.1.24452.1"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/bdb8a419-432c-4f1c-b5ad-ae6e27617b5c/65b26a64e3dda62c456a7a45df73dc1e/aspnetcore-runtime-9.0.0-preview.7.24406.2-linux-x64.tar.gz"; - sha512 = "44f86c407b501a700aaeae2ce95cf544d85c08b41cdd12cee22bfcfdd03c4f6a16e495d9f8315f5e56a66b7e6187a4fc39d899f967a65f73883e40172343275c"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c414fabc-f831-4c5d-af5e-8e85ebecc6a0/670acec9f83315bec2788393db85e708/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm.tar.gz"; + hash = "sha512-EgHd12xUpnbLKHRD7xszFtCHufNVfHl/ckzU/LhphutJmzEilZskl2RE4mIoXAWooPjz8oKJRjHlj6TeQrtUiQ=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c5075cd5-2552-4f77-96ce-31450f9ff8d5/e6ff2b52e2a27a60eb3585cbca01d60b/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm64.tar.gz"; + hash = "sha512-hGEKOPuamOt70muompxJmGguw//7Xq3lu6+6/WPKx9mlJ5YYu1slddJ/7sCY2l/m9xUMZyU/Pzd2JgFZA5bhIg=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/da25731f-e296-4e2a-8f2b-0213d26e1799/859039cd012f8cfba53991f8f5543609/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-x64.tar.gz"; + hash = "sha512-+P0oXWe7BE1jFZaGnWMB4QoqJDyByaBQlqZq/0+zQxUpgSx0gubPDgZejgZfxQsWtQ1/KklaswB3povUWzujdg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d4492ed-c733-4cfc-bf16-4f13191587f2/c843723067d5fc1d790ffa1810c683c1/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-arm.tar.gz"; + hash = "sha512-Kdvu4spDebM0V+KwVliBFPoxgTUGxTWaIxRfI6QdBj0F6qCX6hF2I6QPqxE1FrRRUL0XovBXKHViwz/pFovymQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/bc3735cb-fea1-4f97-8669-3ab0e389d055/084b94228b13a45478ac75f5158801b3/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-arm64.tar.gz"; + hash = "sha512-n08aOk85N3d5v092zguXYxAtnKYX/99h/3Wg2Bxcxj+1BCcI/xCxqD5VgFDZuVu68Vn6d+J8wD4K00NEHhZLXg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/28370706-3338-4dd5-9992-6cd1d86ba666/354c9434538f587c3198fe57fa0d2e00/aspnetcore-runtime-9.0.0-preview.7.24406.2-linux-arm64.tar.gz"; - sha512 = "706925fde5bb93b98e347540fe0983ce0819a2ca2520ed2d5bfc4515cb6852587a30f29852b512509b660daf8ee76ff3c8bb2d2fd78e47c6ae156e6f00cde918"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/10aac5f7-c037-4874-8c05-425e668b0a24/4706d38e511259862e93a61f15dda28f/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-x64.tar.gz"; + hash = "sha512-D5RfnHYZkY1hmmbPtsiwH9mTlDjOjvi+B5f66ky9c87eb9JcIlhV77eTvmcL/A9xmOnyMfoFEdfPMZ0vq7rJ0w=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d0813855-fdde-47df-8d71-119af034e409/40989f36db96de19bc682d62cbadd8e3/aspnetcore-runtime-9.0.0-preview.7.24406.2-osx-x64.tar.gz"; - sha512 = "0f309d6b849ccec8e13812de9ff70fac5cc78785b71f356fc63e5070296305766892a3dfd74bae9b4775ec4449335d03d046494a416304f56e5ba7746f3316ca"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0bae8dff-9440-4388-a03e-af44e20673a8/8ab257a4963967970cd59c31c213f38d/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-arm64.tar.gz"; + hash = "sha512-A/fgM1LRrS1U6d5MHN16lMIxG7NtTGKWZh+rKGzd6/P1cgT3OJLv1T9Dz7E7pzyvrpXQUixHvgMgPV+2mg7P6Q=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b2836c76-8c1d-4030-b7f6-0cd5ec1b640b/ea922caf251b0245b96ba2afd7ebb2b4/aspnetcore-runtime-9.0.0-preview.7.24406.2-osx-arm64.tar.gz"; - sha512 = "8200af559c76f5bf12f5e0495c285a837dbe29c7ac2d6c562540f7077aa68fa65dc05205b4b219e72f78d55c20a75a514f6ccf3f53d6ecf34fd2cea0817a7ede"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b0414fd7-20f9-4363-9dbf-072880e97b17/89584fa06e9ba1154a7e02402a28d82f/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-x64.tar.gz"; + hash = "sha512-/0puNbQfUgBSHqSyV7KT5NSPF4bMqpzYW1W6lq02A228FJ0v+CDx3/Xy2az2w4tsNUDnAMLC21/m2C1PhfRhrg=="; }; }; }; runtime_9_0 = buildNetRuntime { - version = "9.0.0-preview.7.24405.7"; + version = "9.0.0-rc.1.24431.7"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/41a47c9d-c08b-4abe-a2d1-920b51fe16b0/f6af3aa0615cc1625bfc77cd38e16d02/dotnet-runtime-9.0.0-preview.7.24405.7-linux-x64.tar.gz"; - sha512 = "9ede46bc2e6f87a9f592f888562a4cdda6ffa01ca9822f6d4ae586a7c478d3e4fe6c70758a4e9ecbba86445978c68f805d1d6d6f4d37fc653a2b7510309dd5dc"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/26c238f2-53a2-4fdc-981e-31272c80d107/67c11b008d57d501cd2e5ca642cbc8c1/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm.tar.gz"; + hash = "sha512-ioPeMA6PnsZ/cFAE9VIpVz3Yv7EG9sQjie+ylsI4buJ4Rvgbqv5rQmnpxyaQN+XsPxN2xyvBA+RkHJGBp+V2Rw=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/248e66b8-594d-4738-8b01-2aa045faf3fd/686e989ba0365848fb4f81f8d780812c/dotnet-runtime-9.0.0-preview.7.24405.7-linux-arm64.tar.gz"; - sha512 = "f7440b679315c6d35b12d839a1cf52c961784d56524f52e96a7834bbda7bf4e5bfd726081148cf71fb19b3107c7b1f39681a2fae7e87f1d9fa0634b70a47f4b2"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/54f6fb3b-da5b-4a2d-98f4-ae07c814a586/e5f2a5ba551ffe53ea1c2ae9b7681f0b/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm64.tar.gz"; + hash = "sha512-hUK7k4Hk7Kbw687d7GhSXMWeNPckRhPPM8shUfVwwzRcttCBxJKwEHDnYtNEDwLUVYI0Uy1Y/z3JGQV+Bre9rA=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/dc29a044-d48d-43cd-a56c-2b8cba456df2/888138574a36ee8c2fe1af2e33c1119d/dotnet-runtime-9.0.0-preview.7.24405.7-osx-x64.tar.gz"; - sha512 = "17352746d1b780272766c6ea20bdb0961f8004bafc529877644fa536bc0e7441eb48d65cd05c4eb9017249651361c773d89b1ec1c1720bd4fce0fe965614d48a"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/72048153-7c19-4e69-bcf3-22563060db07/cd181715a0f7cd3cec8c87b115181da9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-x64.tar.gz"; + hash = "sha512-n5qFuNn2Ni7SwtDt79BJmRgbLDhmR2RPvB2fJIJVOHMkOZ7bHEC8f6jEetwi4tcdtfJc55RSHVnkbEBZO19sxQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/a71e7742-36b6-4f68-a573-b3437fc53a77/571d8fff000e17abd5d820cafc600b63/dotnet-runtime-9.0.0-preview.7.24405.7-osx-arm64.tar.gz"; - sha512 = "ade75303e39c33af6d7ea10369bb87d5d446619d2ffa630db1e8342b1577efe6831d8f32316fb0e0536e56e0adb7978c4e1b75ddef9a2d1cda8657b8fc457356"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c948e710-a590-4492-870d-1e44ce476a55/86522880c5160af3c81bfa71378b79b9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-arm.tar.gz"; + hash = "sha512-ERibzBMUhpSROsX7BQt324EErGLdOblwzZau85n3p87mVqMUtE8BE/lnJufuCiad6jhjcCD+BiYaiwHKDfnktA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9ef6c8f0-49ac-4b37-9e7a-0f2cbbc74472/ceebdb8281a18bc80d17147ec3146cd0/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-arm64.tar.gz"; + hash = "sha512-3WKnNzaydaFbWv+jRloO89aWGaBsyqo5FrMx9Fs4WakCjnjrfNhcdm3v+5cDx7uWeI9AYdVJy98yW/gYlDEFIQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/30c11bec-b456-45de-bb45-5e892fd1a509/cd72910d2c8b0c908f717a3563c2445f/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-x64.tar.gz"; + hash = "sha512-vXcBXKRriSj3CmHmz+8jxeMIrUDAPd1CHCEBQbGjjNXE2O31Nl6LruIn21pqxx++pIHBqLPFum6lgzCv3X/iMQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8abf3e03-1ab3-40fd-a9cf-fa22005be2e8/cb0c3c5d130ef8ae76a982860fd3606a/dotnet-runtime-9.0.0-rc.1.24431.7-osx-arm64.tar.gz"; + hash = "sha512-qCX8qe3eU6tqvA7+DETW+yXFx3rrLTW2xBTULzZEU86wae2duIZcK7glI5ifzrfMy/hgR2mVkP91amucVMIddA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/13d7d905-549f-44e8-9062-a678a742c5fb/94c51ca9c08ef9b5cceabafc2337118f/dotnet-runtime-9.0.0-rc.1.24431.7-osx-x64.tar.gz"; + hash = "sha512-9i+GfqtjNzfEUP+wVDpybxui9GpCZctHl42I2tDGuAqNtcz29YOEL4XLYTuW0vfGgG1mmCb0uSuQbnHY0Q5T6A=="; }; }; }; sdk_9_0_1xx = buildNetSdk { - version = "9.0.100-preview.7.24407.12"; + version = "9.0.100-rc.1.24452.12"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/84a39cad-2147-4a3e-b8fd-ec6fca0f80dd/d86fc06f750e758770f5a2237e01f5c5/dotnet-sdk-9.0.100-preview.7.24407.12-linux-x64.tar.gz"; - sha512 = "3bc1bddb8bebbfa9e256487871c3984ebe2c9bc77b644dd25e4660f12c76042f500931135a080a97f265bc4c5504433150bde0a3ca19c3f7ad7127835076fc8e"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/87c96627-cf20-47d7-8cb4-d5e083084dd4/07d4b533e746b344a3dbf9f7279f450b/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm.tar.gz"; + hash = "sha512-8xpKLDCAqSHP3XGTPR9XwvV/9MQ/WgrW9SZAvHkeVPjAUm2OEgatIfhoI1elPPbUiKiwEQfnw0vq/iyMNCXdjA=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f7739964-9e84-4bb7-9435-509458a15f9c/a95ad7f9deb8ce2fd30173dfe86f55ba/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm64.tar.gz"; + hash = "sha512-9XQlNxKIAcGZoScmYXUGYFh4iibopgPL0mocFunvM6XUGOR5Cjzqci195IPu6LaODeS7Hf3yeXEzae07TRY6EQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz"; + hash = "sha512-6BMIF7d50BBKbu4z2Y2Xw/rRwzYBNDX0fA6eIjcBcrddo3reduSd7Hy+aWiEOQ0uaUHMaeK61Vk9bRxrQQgwUQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8cb683aa-4558-45ac-944a-73ac40b708d2/2795bd0253d5518490378edc7f7b562e/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-arm.tar.gz"; + hash = "sha512-hICQDhS9EDT1hsPhdAK+LwTKslDXm00d2jqoh+n6+mg604it9/JbXHsNxDM3XOHCcrPZQZY25tsPe/MA6EGgpQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8737d284-0c4b-49a0-984c-23fddc7abcd8/ada586539e4417b557d60d0214e8b2eb/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-arm64.tar.gz"; + hash = "sha512-ZWv6TnxKPuKAuZ6v+mILCbibOjufbTPJ14fB+JOLhK+1qkPYBUboGiv9UydwwoLFmuoWf1DQGlcCeiBh5ZXw6Q=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/9dce0bb1-16ab-4670-9af4-57b6bd1c0c21/ba6055b1ad714158742dd1b2373adaed/dotnet-sdk-9.0.100-preview.7.24407.12-linux-arm64.tar.gz"; - sha512 = "c8ae08858c9ccf16d7b4879b7201ea22bd59e97f1924d4ff2b25079168c906d88a2864e6796244b67db612a36170969fef212879aa3b2232418795c7e7e6d526"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/791e9a41-59da-4f92-9dfb-2cceaaea001b/710f7adf35dc2f32be49ac2834ad0afd/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-x64.tar.gz"; + hash = "sha512-sdgATPnD/7Uw+7PUJZF0ywdqMroAJo2qQ9v0Uv5tRsz5eaY9f1OucKL6ehAanfG9O4QFUqySqFIRm7c4WmX2Xw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4a7fc24d-481e-4202-8654-06cf5fba0ebd/a4084481acd9aa803ad1ebf3cd668646/dotnet-sdk-9.0.100-preview.7.24407.12-osx-x64.tar.gz"; - sha512 = "b410a65d69f991ea55c81e5f7ea58c98ceef309d63ddd21a7689848a4a4516cdb898f8e36702a554a51fc22420cfbffe7a662a785175bbc1ebe1c33fcf6ffbf8"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/930f4eb8-188f-47d5-8a26-28ca393b7d1b/c07a519e3d7e326c3f640ef72ea1193e/dotnet-sdk-9.0.100-rc.1.24452.12-osx-arm64.tar.gz"; + hash = "sha512-rzCzHNk36fyX4WS4NijCwezSEym3X3Qtn1IyqmhCfSW11wLMVlqoYNPHOMhyd5BWm/ZqPtdOXO9xmuWJ0wKEbw=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/49e6076a-438d-44de-a34d-6ad47af02423/f20bca6b909e3bd42679c14c8288fd0f/dotnet-sdk-9.0.100-preview.7.24407.12-osx-arm64.tar.gz"; - sha512 = "0af77ffeb27e44b2e695caabfa85254f94c77807be6d96fc6abdda1d71be266857320c5dc02d5df968da8963a52cd2aea4b4cad6dfc6540ad26b7b532bf83fd9"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e26e36f6-746f-462c-8599-5d0a1f00e786/f1b8264ac10442b40009aa8cea46b23b/dotnet-sdk-9.0.100-rc.1.24452.12-osx-x64.tar.gz"; + hash = "sha512-DR8HGO7vAGw+z77+6/nfB3LsIsdNtLtjW2RjuK7f05VydLkItR7AGc7WnT569K6SUvGOh7FKRBHhCJpMxB430A=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_9_0 = sdk_9_0_1xx; diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index afaa0a5dc242f..2c95d7d6ee6b3 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -1,46 +1,46 @@ -{ clangStdenv -, lib -, fetchurl -, dotnetCorePackages -, jq -, curl -, git -, cmake -, pkg-config -, llvm -, zlib -, icu -, lttng-ust_2_12 -, krb5 -, glibcLocales -, ensureNewerSourcesForZipFilesHook -, darwin -, xcbuild -, swiftPackages -, openssl -, getconf -, python3 -, xmlstarlet -, nodejs -, callPackage -, unzip -, yq - -, dotnetSdk -, releaseManifestFile -, tarballHash +{ + clangStdenv, + lib, + fetchurl, + dotnetCorePackages, + jq, + curl, + git, + cmake, + pkg-config, + llvm, + zlib, + icu, + lttng-ust_2_12, + krb5, + glibcLocales, + ensureNewerSourcesForZipFilesHook, + darwin, + xcbuild, + swiftPackages, + openssl, + getconf, + python3, + xmlstarlet, + nodejs, + callPackage, + unzip, + yq, + + bootstrapSdk, + releaseManifestFile, + tarballHash, }: let - stdenv = if clangStdenv.isDarwin - then swiftPackages.stdenv - else clangStdenv; + stdenv = if clangStdenv.hostPlatform.isDarwin then swiftPackages.stdenv else clangStdenv; inherit (stdenv) isLinux isDarwin buildPlatform - targetPlatform; + targetPlatform + ; inherit (swiftPackages) apple_sdk swift; releaseManifest = lib.importJSON releaseManifestFile; @@ -50,16 +50,17 @@ let targetRid = dotnetCorePackages.systemToDotnetRid targetPlatform.system; targetArch = lib.elemAt (lib.splitString "-" targetRid) 1; - sigtool = callPackage ./sigtool.nix {}; + sigtool = callPackage ./sigtool.nix { }; _icu = if isDarwin then darwin.ICU else icu; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "dotnet-vmr"; version = release; # TODO: fix this in the binary sdk packages - preHook = lib.optionalString stdenv.isDarwin '' + preHook = lib.optionalString stdenv.hostPlatform.isDarwin '' addToSearchPath DYLD_LIBRARY_PATH "${_icu}/lib" export DYLD_LIBRARY_PATH ''; @@ -69,53 +70,58 @@ in stdenv.mkDerivation rec { hash = tarballHash; }; - nativeBuildInputs = [ - ensureNewerSourcesForZipFilesHook - jq - curl.bin - git - cmake - pkg-config - python3 - xmlstarlet - unzip - yq - ] - ++ lib.optionals (lib.versionAtLeast version "9") [ - nodejs - ] - ++ lib.optionals isDarwin [ - getconf - ]; + nativeBuildInputs = + [ + ensureNewerSourcesForZipFilesHook + jq + curl.bin + git + cmake + pkg-config + python3 + xmlstarlet + unzip + yq + ] + ++ lib.optionals (lib.versionAtLeast version "9") [ + nodejs + ] + ++ lib.optionals isDarwin [ + getconf + ]; - buildInputs = [ - # this gets copied into the tree, but we still want the hooks to run - dotnetSdk - # the propagated build inputs in llvm.dev break swift compilation - llvm.out - zlib - _icu - openssl - ] - ++ lib.optionals isLinux [ - krb5 - lttng-ust_2_12 - ] - ++ lib.optionals isDarwin (with apple_sdk.frameworks; [ - xcbuild - swift - (krb5.overrideAttrs (old: { - # the propagated build inputs break swift compilation - buildInputs = old.buildInputs ++ old.propagatedBuildInputs; - propagatedBuildInputs = []; - })) - sigtool - Foundation - CoreFoundation - CryptoKit - System - ] - ++ lib.optional (lib.versionAtLeast version "9") GSS); + buildInputs = + [ + # this gets copied into the tree, but we still want the hooks to run + bootstrapSdk + # the propagated build inputs in llvm.dev break swift compilation + llvm.out + zlib + _icu + openssl + ] + ++ lib.optionals isLinux [ + krb5 + lttng-ust_2_12 + ] + ++ lib.optionals isDarwin ( + with apple_sdk.frameworks; + [ + xcbuild + swift + (krb5.overrideAttrs (old: { + # the propagated build inputs break swift compilation + buildInputs = old.buildInputs ++ old.propagatedBuildInputs; + propagatedBuildInputs = [ ]; + })) + sigtool + Foundation + CoreFoundation + CryptoKit + System + ] + ++ lib.optional (lib.versionAtLeast version "9") GSS + ); # This is required to fix the error: # > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid. @@ -132,224 +138,223 @@ in stdenv.mkDerivation rec { (global-name "com.apple.system.opendirectoryd.membership")) ''; - patches = lib.optionals (lib.versionOlder version "9") [ + patches = lib.optionals (lib.versionAtLeast version "9") [ + ./UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch + ] ++ lib.optionals (lib.versionOlder version "9") [ ./fix-aspnetcore-portable-build.patch ]; - postPatch = '' - # set the sdk version in global.json to match the bootstrap sdk - jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$(${dotnetSdk}/bin/dotnet --version)" > global.json~ - mv global.json{~,} - - patchShebangs $(find -name \*.sh -type f -executable) - - # I'm not sure why this is required, but these files seem to use the wrong - # property name. - # TODO: not needed in 9.0? - [[ ! -f src/xliff-tasks/eng/Versions.props ]] || \ - sed -i 's:\bVersionBase\b:VersionPrefix:g' \ - src/xliff-tasks/eng/Versions.props - - # at least in 9.0 preview 1, this package depends on a specific beta build - # of System.CommandLine - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \ - src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj - - # AD0001 crashes intermittently in source-build-reference-packages with - # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. - # possibly related to https://github.com/dotnet/runtime/issues/90356 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \ - src/source-build-reference-packages/src/referencePackages/Directory.Build.props - - # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848 - xmlstarlet ed \ - --inplace \ - -u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \ - src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props - - # this fixes compile errors with clang 15 (e.g. darwin) - substituteInPlace \ - src/runtime/src/native/libs/CMakeLists.txt \ - --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)' - - # strip native symbols in runtime - # see: https://github.com/dotnet/source-build/issues/2543 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n KeepNativeSymbols -v false \ - src/runtime/Directory.Build.props - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - # repro.csproj fails to restore due to missing freebsd packages - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \ - src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj - - # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \ - src/runtime/Directory.Build.props - - # patch packages installed from npm cache - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \ - src/aspnetcore/eng/DotNetBuild.props - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805 - substituteInPlace \ - src/aspnetcore/eng/Dependencies.props \ - --replace-fail \ - "'\$(DotNetBuildSourceOnly)' == 'true'" \ - "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'" - - # https://github.com/dotnet/source-build/issues/4325 - xmlstarlet ed \ - --inplace \ - -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \ - eng/init-source-only.proj - - # AOT is currently broken in binary SDKs, and the resulting executable is - # unable to find ICU - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NativeAotSupported -v false \ - src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.props - - # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings] - substituteInPlace \ - src/runtime/src/coreclr/ilasm/CMakeLists.txt \ - --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' "" - - # https://github.com/dotnet/source-build/issues/4444 - xmlstarlet ed \ - --inplace \ - -s '//Project/Target/MSBuild[@Targets="Restore"]' \ - -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \ - src/aspnetcore/eng/Tools.props - '' - + lib.optionalString isLinux ('' - substituteInPlace \ - src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.c \ - --replace-fail '"libssl.so"' '"${openssl.out}/lib/libssl.so"' - - substituteInPlace \ - src/runtime/src/native/libs/System.Net.Security.Native/pal_gssapi.c \ - --replace-fail '"libgssapi_krb5.so.2"' '"${lib.getLib krb5}/lib/libgssapi_krb5.so.2"' - - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-fail '"libicui18n.so"' '"${icu}/lib/libicui18n.so"' \ - --replace-fail '"libicuuc.so"' '"${icu}/lib/libicuuc.so"' - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-fail '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256' - '' - + lib.optionalString (lib.versionOlder version "9") '' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-warn 'libicuucName[64]' 'libicuucName[256]' \ - --replace-warn 'libicui18nName[64]' 'libicui18nName[256]' - '') - + lib.optionalString isDarwin ('' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/CMakeLists.txt \ - --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' - - substituteInPlace \ - src/runtime/src/installer/managed/Microsoft.NET.HostModel/HostModelUtils.cs \ - src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \ - --replace-fail '/usr/bin/codesign' '${sigtool}/bin/codesign' - - # fix: strip: error: unknown argument '-n' - substituteInPlace \ - src/runtime/eng/native/functions.cmake \ - --replace-fail ' -no_code_signature_warning' "" - - # [...]/installer.singlerid.targets(434,5): error MSB3073: The command "pkgbuild [...]" exited with code 127 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n SkipInstallerBuild -v true \ - src/runtime/Directory.Build.props - - # stop passing -sdk without a path - # stop using xcrun - # add -module-cache-path to fix swift errors, see sandboxProfile - # <unknown>:0: error: unable to open output file '/var/folders/[...]/C/clang/ModuleCache/[...]/SwiftShims-[...].pcm': 'Operation not permitted' - # <unknown>:0: error: could not build Objective-C module 'SwiftShims' - substituteInPlace \ - src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt \ - --replace-fail ' -sdk ''${CMAKE_OSX_SYSROOT}' "" \ - --replace-fail 'xcrun swiftc' 'swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"' - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - # fix: strip: error: unknown argument '-n' - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ - src/runtime/src/native/managed/native-library.targets \ - --replace-fail ' -no_code_signature_warning' "" - - # ld: library not found for -ld_classic - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ - src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \ - --replace-fail 'Include="-ld_classic"' "" - '' - + lib.optionalString (lib.versionOlder version "9") '' - # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: - # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll - # [...]/build.proj(123,5): error : sdk/8.0.102/System.CodeDom.dll - # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.Resources.Extensions.dll - # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.CodeDom.dll - substituteInPlace \ - build.proj \ - --replace-fail 'FailOnMissingPDBs="true"' 'FailOnMissingPDBs="false"' - - substituteInPlace \ - src/runtime/src/mono/CMakeLists.txt \ - --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' - ''); + postPatch = + '' + # set the sdk version in global.json to match the bootstrap sdk + jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$(${bootstrapSdk}/bin/dotnet --version)" > global.json~ + mv global.json{~,} + + patchShebangs $(find -name \*.sh -type f -executable) + + # I'm not sure why this is required, but these files seem to use the wrong + # property name. + # TODO: not needed in 9.0? + [[ ! -f src/xliff-tasks/eng/Versions.props ]] || \ + sed -i 's:\bVersionBase\b:VersionPrefix:g' \ + src/xliff-tasks/eng/Versions.props + + # at least in 9.0 preview 1, this package depends on a specific beta build + # of System.CommandLine + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \ + src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj + + # AD0001 crashes intermittently in source-build-reference-packages with + # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. + # possibly related to https://github.com/dotnet/runtime/issues/90356 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \ + src/source-build-reference-packages/src/referencePackages/Directory.Build.props + + # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848 + xmlstarlet ed \ + --inplace \ + -u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \ + src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props + + # this fixes compile errors with clang 15 (e.g. darwin) + substituteInPlace \ + src/runtime/src/native/libs/CMakeLists.txt \ + --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)' + + # strip native symbols in runtime + # see: https://github.com/dotnet/source-build/issues/2543 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n KeepNativeSymbols -v false \ + src/runtime/Directory.Build.props + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + # repro.csproj fails to restore due to missing freebsd packages + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \ + src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj + + # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \ + src/runtime/Directory.Build.props + + # patch packages installed from npm cache + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \ + src/aspnetcore/eng/DotNetBuild.props + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805 + substituteInPlace \ + src/aspnetcore/eng/Dependencies.props \ + --replace-fail \ + "'\$(DotNetBuildSourceOnly)' == 'true'" \ + "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'" + + # https://github.com/dotnet/source-build/issues/4325 + xmlstarlet ed \ + --inplace \ + -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \ + eng/init-source-only.proj + + # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings] + substituteInPlace \ + src/runtime/src/coreclr/ilasm/CMakeLists.txt \ + --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' "" + + # https://github.com/dotnet/source-build/issues/4444 + xmlstarlet ed \ + --inplace \ + -s '//Project/Target/MSBuild[@Targets="Restore"]' \ + -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \ + src/aspnetcore/eng/Tools.props + '' + + lib.optionalString isLinux ( + '' + substituteInPlace \ + src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.c \ + --replace-fail '"libssl.so"' '"${openssl.out}/lib/libssl.so"' + + substituteInPlace \ + src/runtime/src/native/libs/System.Net.Security.Native/pal_gssapi.c \ + --replace-fail '"libgssapi_krb5.so.2"' '"${lib.getLib krb5}/lib/libgssapi_krb5.so.2"' + + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-fail '"libicui18n.so"' '"${icu}/lib/libicui18n.so"' \ + --replace-fail '"libicuuc.so"' '"${icu}/lib/libicuuc.so"' + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-fail '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256' + '' + + lib.optionalString (lib.versionOlder version "9") '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-warn 'libicuucName[64]' 'libicuucName[256]' \ + --replace-warn 'libicui18nName[64]' 'libicui18nName[256]' + '' + ) + + lib.optionalString isDarwin ( + '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/CMakeLists.txt \ + --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' + + substituteInPlace \ + src/runtime/src/installer/managed/Microsoft.NET.HostModel/HostModelUtils.cs \ + src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \ + --replace-fail '/usr/bin/codesign' '${sigtool}/bin/codesign' + + # fix: strip: error: unknown argument '-n' + substituteInPlace \ + src/runtime/eng/native/functions.cmake \ + --replace-fail ' -no_code_signature_warning' "" + + # [...]/installer.singlerid.targets(434,5): error MSB3073: The command "pkgbuild [...]" exited with code 127 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n SkipInstallerBuild -v true \ + src/runtime/Directory.Build.props + + # stop passing -sdk without a path + # stop using xcrun + # add -module-cache-path to fix swift errors, see sandboxProfile + # <unknown>:0: error: unable to open output file '/var/folders/[...]/C/clang/ModuleCache/[...]/SwiftShims-[...].pcm': 'Operation not permitted' + # <unknown>:0: error: could not build Objective-C module 'SwiftShims' + substituteInPlace \ + src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt \ + --replace-fail ' -sdk ''${CMAKE_OSX_SYSROOT}' "" \ + --replace-fail 'xcrun swiftc' 'swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"' + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + # fix: strip: error: unknown argument '-n' + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ + src/runtime/src/native/managed/native-library.targets \ + --replace-fail ' -no_code_signature_warning' "" + + # ld: library not found for -ld_classic + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ + src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \ + --replace-fail 'Include="-ld_classic"' "" + '' + + lib.optionalString (lib.versionOlder version "9") '' + # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: + # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/System.CodeDom.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.Resources.Extensions.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.CodeDom.dll + substituteInPlace \ + build.proj \ + --replace-fail 'FailOnMissingPDBs="true"' 'FailOnMissingPDBs="false"' + + substituteInPlace \ + src/runtime/src/mono/CMakeLists.txt \ + --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' + '' + ); prepFlags = [ "--no-artifacts" "--no-prebuilts" - "--with-packages" dotnetSdk.artifacts + "--with-packages" + bootstrapSdk.artifacts ]; - configurePhase = let - prepScript = - if (lib.versionAtLeast version "9") - then "./prep-source-build.sh" - else "./prep.sh"; - in '' - runHook preConfigure + configurePhase = + let + prepScript = if (lib.versionAtLeast version "9") then "./prep-source-build.sh" else "./prep.sh"; + in + '' + runHook preConfigure - # The build process tries to overwrite some things in the sdk (e.g. - # SourceBuild.MSBuildSdkResolver.dll), so it needs to be mutable. - cp -Tr ${dotnetSdk} .dotnet - chmod -R +w .dotnet + # The build process tries to overwrite some things in the sdk (e.g. + # SourceBuild.MSBuildSdkResolver.dll), so it needs to be mutable. + cp -Tr ${bootstrapSdk} .dotnet + chmod -R +w .dotnet - ${prepScript} $prepFlags + ${prepScript} $prepFlags - runHook postConfigure - ''; + runHook postConfigure + ''; postConfigure = lib.optionalString (lib.versionAtLeast version "9") '' # see patch-npm-packages.proj @@ -361,21 +366,24 @@ in stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = lib.optionalString isLinux - "${glibcLocales}/lib/locale/locale-archive"; - - buildFlags = [ - "--with-packages" dotnetSdk.artifacts - "--clean-while-building" - "--release-manifest" releaseManifestFile - ] - ++ lib.optionals (lib.versionAtLeast version "9") [ - "--source-build" - ] - ++ [ - "--" - "-p:PortableBuild=true" - ] ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}"; + LOCALE_ARCHIVE = lib.optionalString isLinux "${glibcLocales}/lib/locale/locale-archive"; + + buildFlags = + [ + "--with-packages" + bootstrapSdk.artifacts + "--clean-while-building" + "--release-manifest" + releaseManifestFile + ] + ++ lib.optionals (lib.versionAtLeast version "9") [ + "--source-build" + ] + ++ [ + "--" + "-p:PortableBuild=true" + ] + ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}"; buildPhase = '' runHook preBuild @@ -397,35 +405,37 @@ in stdenv.mkDerivation rec { runHook postBuild ''; - installPhase = let - assets = if (lib.versionAtLeast version "9") then "assets" else targetArch; - in '' - runHook preInstall - - mkdir "$out" - - pushd "artifacts/${assets}/Release" - find . -name \*.tar.gz | while read archive; do - target=$out/$(basename "$archive" .tar.gz) - # dotnet 9 currently has two copies of the sdk tarball - [[ ! -e "$target" ]] || continue - mkdir "$target" - tar -C "$target" -xzf "$PWD/$archive" - done - popd - - local -r unpacked="$PWD/.unpacked" - for nupkg in $out/Private.SourceBuilt.Artifacts.*.${targetRid}/{,SourceBuildReferencePackages/}*.nupkg; do - rm -rf "$unpacked" - unzip -qd "$unpacked" "$nupkg" - chmod -R +rw "$unpacked" - rm "$nupkg" - mv "$unpacked" "$nupkg" - # TODO: should we fix executable flags here? see dotnetInstallHook - done - - runHook postInstall - ''; + installPhase = + let + assets = if (lib.versionAtLeast version "9") then "assets" else targetArch; + in + '' + runHook preInstall + + mkdir "$out" + + pushd "artifacts/${assets}/Release" + find . -name \*.tar.gz | while read archive; do + target=$out/$(basename "$archive" .tar.gz) + # dotnet 9 currently has two copies of the sdk tarball + [[ ! -e "$target" ]] || continue + mkdir "$target" + tar -C "$target" -xzf "$PWD/$archive" + done + popd + + local -r unpacked="$PWD/.unpacked" + for nupkg in $out/Private.SourceBuilt.Artifacts.*.${targetRid}/{,SourceBuildReferencePackages/}*.nupkg; do + rm -rf "$unpacked" + unzip -qd "$unpacked" "$nupkg" + chmod -R +rw "$unpacked" + rm "$nupkg" + mv "$unpacked" "$nupkg" + # TODO: should we fix executable flags here? see dotnetInstallHook + done + + runHook postInstall + ''; # dotnet cli is in the root, so we need to strip from there # TODO: should we install in $out/share/dotnet? @@ -442,6 +452,8 @@ in stdenv.mkDerivation rec { passthru = { inherit releaseManifest buildRid targetRid; icu = _icu; + # ilcompiler is currently broken: https://github.com/dotnet/source-build/issues/1215 + hasILCompiler = lib.versionAtLeast version "9"; }; meta = with lib; { diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 3bf938b759033..ed35bec87c064 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchzip -, fetchpatch , meson , ninja , flex @@ -16,59 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtc"; - version = "1.7.0"; + version = "1.7.1"; src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-FMh3VvlY3fUK8fbd0M+aCmlUrmG9YegiOOQ7MOByffc="; + hash = "sha256-Zl2bOGDJIe/bhMFNsy969JYCYqtXTOzgb+bbOlKqOco="; }; - # Big pile of backports. - # FIXME: remove all of these after next upstream release. - patches = let - fetchUpstreamPatch = { rev, hash }: fetchpatch { - name = "dtc-${rev}.patch"; - url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=${rev}"; - inherit hash; - }; - in [ - # meson: Fix cell overflow tests when running from meson - (fetchUpstreamPatch { - rev = "32174a66efa4ad19fc6a2a6422e4af2ae4f055cb"; - hash = "sha256-C7OzwY0zq+2CV3SB5unI7Ill2M3deF7FXeQE3B/Kx2s="; - }) - - # Use #ifdef NO_VALGRIND - (fetchUpstreamPatch { - rev = "41821821101ad8a9f83746b96b163e5bcbdbe804"; - hash = "sha256-7QEFDtap2DWbUGqtyT/RgJZJFldKB8oSubKiCtLZ0w4="; - }) - - # dtc: Fix linker options so it also works in Darwin - (fetchUpstreamPatch { - rev = "71a8b8ef0adf01af4c78c739e04533a35c1dc89c"; - hash = "sha256-uLXL0Sjcn+bnMuF+A6PjUW1Rq6uNg1dQl58zbeYpP/U="; - }) - - # meson: allow disabling tests - (fetchUpstreamPatch { - rev = "bdc5c8793a13abb8846d115b7923df87605d05bd"; - hash = "sha256-cO4f/jJX/pQL7kk4jpKUhsCVESW2ZuWaTr7z3BuvVkw="; - }) - - # meson: fix installation with meson-python - (fetchUpstreamPatch { - rev = "3fbfdd08afd2a7a25b27433f6f5678c0fe694721"; - hash = "sha256-skK8m1s4xkK6x9AqzxiEK+1uMEmS27dBI1CdEXNFTfU="; - }) - - # pylibfdt: fix get_mem_rsv for newer Python versions - (fetchUpstreamPatch { - rev = "822123856980f84562406cc7bd1d4d6c2b8bc184"; - hash = "sha256-IJpRgP3pP8Eewx2PNKxhXZdsnomz2AR6oOsun50qAms="; - }) - ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; nativeBuildInputs = [ @@ -88,12 +41,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs setup.py - - # meson.build: bump version to 1.7.0 - substituteInPlace libfdt/meson.build \ - --replace "version: '1.6.0'," "version: '${finalAttrs.version}'," - substituteInPlace meson.build \ - --replace "version: '1.6.0'," "version: '${finalAttrs.version}'," ''; # Required for installation of Python library and is innocuous otherwise. @@ -108,7 +55,12 @@ stdenv.mkDerivation (finalAttrs: { doCheck = # Checks are broken on aarch64 darwin # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 - !stdenv.isDarwin && + !stdenv.hostPlatform.isDarwin && + # Checks are broken when building statically on x86_64 linux with musl + # One of the test tries to build a shared library and this causes the linker: + # x86_64-unknown-linux-musl-ld: /nix/store/h9gcvnp90mpniyx2v0d0p3s06hkx1v2p-x86_64-unknown-linux-musl-gcc-13.3.0/lib/gcc/x86_64-unknown-linux-musl/13.3.0/crtbeginT.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object + # x86_64-unknown-linux-musl-ld: failed to set dynamic section sizes: bad value + !stdenv.hostPlatform.isStatic && # we must explicitly disable this here so that mesonFlags receives # `-Dtests=disabled`; without it meson will attempt to run diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index 75055130ada2d..121935df5f055 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { maintainers = lib.teams.lisp.members; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/compilers/elm/packages/README.md b/pkgs/development/compilers/elm/packages/README.md index 5b21736afc00b..6121e816ea88f 100644 --- a/pkgs/development/compilers/elm/packages/README.md +++ b/pkgs/development/compilers/elm/packages/README.md @@ -9,15 +9,15 @@ Please refer to [nix documentation](https://nixos.org/nixpkgs/manual/#how-to-cre and [cabal2nix readme](https://github.com/NixOS/cabal2nix#readme) for more information. Elm-format [update scripts](https://github.com/avh4/elm-format/tree/master/package/nix) is part of its repository. -Node dependencies are defined in [node-packages.json](node-packages.json). +Node dependencies are defined in [node-packages.json](node/node-packages.json). [Node2nix](https://github.com/svanderburg/node2nix) is used for generating nix expression -from this file. Use [generate-node-packages.sh](generate-node-packages.sh) for updates of nix expressions. +from this file. Use [generate-node-packages.sh](node/generate-node-packages.sh) for updates of nix expressions. ## Binwrap Patch Some node packages might use [binwrap](https://github.com/avh4/binwrap) typically for installing [elmi-to-json](https://github.com/stoeffel/elmi-to-json). Binwrap is not compatible with nix. -To overcome issues with those packages apply [patch-binwrap.nix](patch-binwrap.nix) which essentially does 2 things. +To overcome issues with those packages apply [patch-binwrap.nix](../lib/default.nix) which essentially does 2 things. 1. It replaces binwrap scripts with noop shell scripts 2. It uses nix for installing the binaries to expected location in `node_modules` diff --git a/pkgs/development/compilers/elm/packages/elm-json/default.nix b/pkgs/development/compilers/elm/packages/elm-json/default.nix index efb3fbfcc5cd5..bc456d2479c19 100644 --- a/pkgs/development/compilers/elm/packages/elm-json/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-json/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl openssl - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; cargoHash = "sha256-8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc="; diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix index a457a422cf855..5ff6d4117b108 100644 --- a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { }; buildInputs = - lib.optionals (!stdenv.isDarwin) [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/development/compilers/elm/packages/lamdera/default.nix b/pkgs/development/compilers/elm/packages/lamdera/default.nix index 79101092e7885..989d2a7732255 100644 --- a/pkgs/development/compilers/elm/packages/lamdera/default.nix +++ b/pkgs/development/compilers/elm/packages/lamdera/default.nix @@ -4,20 +4,20 @@ }: let - os = if stdenv.isDarwin then "macos" else "linux"; - arch = if stdenv.isAarch64 then "arm64" else "x86_64"; + os = if stdenv.hostPlatform.isDarwin then "macos" else "linux"; + arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"; hashes = { - "x86_64-linux" = "a51d5b9a011c54b0001ff3273cee027774686e233adadb20b1978d2cabfe32a6"; - "aarch64-linux" = "8904ce928f60e06df1f06b3af5ee5eb320c388922aa38b698d823df1d73e8e49"; - "x86_64-darwin" = "b4d1bb5ddc3503862750e5b241f74c22dc013792bc4f410dd914a5216e20ed2f"; - "aarch64-darwin" = "6d20e384dae90bb994c3f1e866c964124c7e8a51e9e08bad0e90a2b560bb5a18"; + "x86_64-linux" = "1v596zi4zmx88r4axrp7pmci3w9c6f1kz4izrbj65c7ch6wwa7f2"; + "aarch64-linux" = "0xf6lqm9xgph8q95h6smq6dzn5549nfsnayny5nyvm56nbmv5iw9"; + "x86_64-darwin" = "0kijrjfbr7hn469x67yya6ndfwj901m54gd96sq3yiay0jvmapga"; + "aarch64-darwin" = "1iigsd4ac0cbb1q2g02zxjxpcma6yyd7ms72ri8g2vq8i90zys9n"; }; in stdenv.mkDerivation rec { pname = "lamdera"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "https://static.lamdera.com/bin/lamdera-${version}-${os}-${arch}"; diff --git a/pkgs/development/compilers/elm/packages/node/default.nix b/pkgs/development/compilers/elm/packages/node/default.nix index bb58c212649b2..3d6f550f43310 100644 --- a/pkgs/development/compilers/elm/packages/node/default.nix +++ b/pkgs/development/compilers/elm/packages/node/default.nix @@ -6,6 +6,20 @@ let inherit pkgs nodejs; inherit (pkgs.stdenv.hostPlatform) system; }; + ESBUILD_BINARY_PATH = lib.getExe ( + pkgs.esbuild.override { + buildGoModule = args: pkgs.buildGoModule (args // rec { + version = "0.20.2"; + src = pkgs.fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + } + ); in with self; with elmLib; { inherit (nodePkgs) elm-live elm-upgrade elm-xref elm-analyse elm-git-install; @@ -22,6 +36,7 @@ with self; with elmLib; { }; in patched.override (old: { + inherit ESBUILD_BINARY_PATH; preRebuild = (old.preRebuild or "") + '' # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done # in case of just this package @@ -124,6 +139,7 @@ with self; with elmLib; { patched = patchNpmElm nodePkgs.elm-land; in patched.override (old: { + inherit ESBUILD_BINARY_PATH; meta = with lib; nodePkgs."elm-land".meta // { description = "Production-ready framework for building Elm applications"; homepage = "https://elm.land/"; diff --git a/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix b/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix index 4f057be3a3040..d3f48ae835053 100644 --- a/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix +++ b/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix @@ -1,9 +1,29 @@ { nodePkgs, pkgs, lib, makeWrapper }: -nodePkgs."elm-pages".overrideAttrs ( +let + ESBUILD_BINARY_PATH = lib.getExe ( + pkgs.esbuild.override { + buildGoModule = args: pkgs.buildGoModule (args // rec { + version = "0.21.5"; + src = pkgs.fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + } + ); +in nodePkgs."elm-pages".overrideAttrs ( old: { + inherit ESBUILD_BINARY_PATH; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ makeWrapper old.nodejs.pkgs.node-gyp-build ]; + preRebuild = '' + sed -i 's/"esbuild": "0\.19\.12"/"esbuild": "0.21.5"/' package.json + ''; + # can't use `patches = [ <patch_file> ]` with a nodePkgs derivation; # need to patch in one of the build phases instead. # see upstream issue https://github.com/dillonkearns/elm-pages/issues/305 for dealing with the read-only problem diff --git a/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh index 66cc71ca32bb2..8a326b6fc5ba6 100755 --- a/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh +++ b/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh @@ -10,3 +10,5 @@ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ -o node-packages.nix \ -c node-composition.nix \ --no-copy-node-env -e ../../../../node-packages/node-env.nix +# well, elm-pages requires two different version of esbuild so we twist it's wrist to only use one +sed -i 's/sources."esbuild-0.19.12"/sources."esbuild-0.21.5"/' node-packages.nix diff --git a/pkgs/development/compilers/elm/packages/node/node-packages.nix b/pkgs/development/compilers/elm/packages/node/node-packages.nix index 3c7d770bdf482..a542d0e7ec4b8 100644 --- a/pkgs/development/compilers/elm/packages/node/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@adobe/css-tools-4.3.2" = { + "@adobe/css-tools-4.3.3" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz"; - sha512 = "DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz"; + sha512 = "rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ=="; }; }; "@babel/cli-7.12.10" = { @@ -31,22 +31,22 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; - "@babel/code-frame-7.23.5" = { + "@babel/code-frame-7.24.7" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.23.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz"; - sha512 = "CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz"; + sha512 = "BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA=="; }; }; - "@babel/compat-data-7.23.5" = { + "@babel/compat-data-7.25.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.23.5"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz"; - sha512 = "uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz"; + sha512 = "+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ=="; }; }; "@babel/core-7.12.10" = { @@ -58,238 +58,211 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.23.6" = { + "@babel/generator-7.25.6" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.23.6"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz"; - sha512 = "qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz"; + sha512 = "VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw=="; }; }; - "@babel/helper-annotate-as-pure-7.22.5" = { + "@babel/helper-annotate-as-pure-7.24.7" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.22.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz"; - sha512 = "LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz"; + sha512 = "BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.24.7" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.22.15"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz"; - sha512 = "QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz"; + sha512 = "xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA=="; }; }; - "@babel/helper-compilation-targets-7.23.6" = { + "@babel/helper-compilation-targets-7.25.2" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.23.6"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz"; - sha512 = "9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz"; + sha512 = "U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw=="; }; }; - "@babel/helper-create-class-features-plugin-7.23.7" = { + "@babel/helper-create-class-features-plugin-7.25.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.23.7"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz"; - sha512 = "xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz"; + sha512 = "ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.22.15" = { + "@babel/helper-create-regexp-features-plugin-7.25.2" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.22.15"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz"; - sha512 = "29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz"; + sha512 = "+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g=="; }; }; - "@babel/helper-environment-visitor-7.22.20" = { + "@babel/helper-environment-visitor-7.24.7" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.22.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz"; - sha512 = "zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="; - }; - }; - "@babel/helper-function-name-7.23.0" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.23.0"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz"; - sha512 = "OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz"; + sha512 = "DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ=="; }; }; - "@babel/helper-hoist-variables-7.22.5" = { - name = "_at_babel_slash_helper-hoist-variables"; - packageName = "@babel/helper-hoist-variables"; - version = "7.22.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz"; - sha512 = "wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw=="; - }; - }; - "@babel/helper-member-expression-to-functions-7.23.0" = { + "@babel/helper-member-expression-to-functions-7.24.8" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.23.0"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz"; - sha512 = "6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz"; + sha512 = "LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA=="; }; }; - "@babel/helper-module-imports-7.22.15" = { + "@babel/helper-module-imports-7.24.7" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.22.15"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz"; - sha512 = "0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz"; + sha512 = "8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA=="; }; }; - "@babel/helper-module-transforms-7.23.3" = { + "@babel/helper-module-transforms-7.25.2" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.23.3"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz"; - sha512 = "7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz"; + sha512 = "BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ=="; }; }; - "@babel/helper-optimise-call-expression-7.22.5" = { + "@babel/helper-optimise-call-expression-7.24.7" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.22.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz"; - sha512 = "HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz"; + sha512 = "jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A=="; }; }; - "@babel/helper-plugin-utils-7.22.5" = { + "@babel/helper-plugin-utils-7.24.8" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.22.5"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz"; - sha512 = "uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz"; + sha512 = "FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg=="; }; }; - "@babel/helper-remap-async-to-generator-7.22.20" = { + "@babel/helper-remap-async-to-generator-7.25.0" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.22.20"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz"; - sha512 = "pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz"; + sha512 = "NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw=="; }; }; - "@babel/helper-replace-supers-7.22.20" = { + "@babel/helper-replace-supers-7.25.0" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.22.20"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz"; - sha512 = "qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz"; + sha512 = "q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg=="; }; }; - "@babel/helper-simple-access-7.22.5" = { + "@babel/helper-simple-access-7.24.7" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.22.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz"; - sha512 = "n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz"; + sha512 = "zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.22.5" = { + "@babel/helper-skip-transparent-expression-wrappers-7.24.7" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.22.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz"; - sha512 = "tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q=="; - }; - }; - "@babel/helper-split-export-declaration-7.22.6" = { - name = "_at_babel_slash_helper-split-export-declaration"; - packageName = "@babel/helper-split-export-declaration"; - version = "7.22.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz"; - sha512 = "AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz"; + sha512 = "IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ=="; }; }; - "@babel/helper-string-parser-7.23.4" = { + "@babel/helper-string-parser-7.24.8" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; - version = "7.23.4"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz"; - sha512 = "803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="; + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz"; + sha512 = "pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ=="; }; }; - "@babel/helper-validator-identifier-7.22.20" = { + "@babel/helper-validator-identifier-7.24.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.22.20"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"; - sha512 = "Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz"; + sha512 = "rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w=="; }; }; - "@babel/helper-validator-option-7.23.5" = { + "@babel/helper-validator-option-7.24.8" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.23.5"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz"; - sha512 = "85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz"; + sha512 = "xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q=="; }; }; - "@babel/helper-wrap-function-7.22.20" = { + "@babel/helper-wrap-function-7.25.0" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.22.20"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz"; - sha512 = "pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz"; + sha512 = "s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ=="; }; }; - "@babel/helpers-7.23.7" = { + "@babel/helpers-7.25.6" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.23.7"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.7.tgz"; - sha512 = "6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz"; + sha512 = "Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q=="; }; }; - "@babel/highlight-7.23.4" = { + "@babel/highlight-7.24.7" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.23.4"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz"; - sha512 = "acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz"; + sha512 = "EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw=="; }; }; - "@babel/parser-7.23.6" = { + "@babel/parser-7.25.6" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.23.6"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz"; - sha512 = "Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz"; + sha512 = "trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.20.7" = { @@ -517,229 +490,229 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.23.3" = { + "@babel/plugin-transform-arrow-functions-7.24.7" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz"; - sha512 = "NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz"; + sha512 = "Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.23.3" = { + "@babel/plugin-transform-async-to-generator-7.24.7" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz"; - sha512 = "A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz"; + sha512 = "SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.23.3" = { + "@babel/plugin-transform-block-scoped-functions-7.24.7" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz"; - sha512 = "vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz"; + sha512 = "yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.23.4" = { + "@babel/plugin-transform-block-scoping-7.25.0" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.23.4"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz"; - sha512 = "0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz"; + sha512 = "yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ=="; }; }; - "@babel/plugin-transform-classes-7.23.5" = { + "@babel/plugin-transform-classes-7.25.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.23.5"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz"; - sha512 = "jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz"; + sha512 = "oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg=="; }; }; - "@babel/plugin-transform-computed-properties-7.23.3" = { + "@babel/plugin-transform-computed-properties-7.24.7" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz"; - sha512 = "dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz"; + sha512 = "25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ=="; }; }; - "@babel/plugin-transform-destructuring-7.23.3" = { + "@babel/plugin-transform-destructuring-7.24.8" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.23.3"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz"; - sha512 = "n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz"; + sha512 = "36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ=="; }; }; - "@babel/plugin-transform-dotall-regex-7.23.3" = { + "@babel/plugin-transform-dotall-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz"; - sha512 = "vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz"; + sha512 = "ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.23.3" = { + "@babel/plugin-transform-duplicate-keys-7.24.7" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz"; - sha512 = "RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz"; + sha512 = "JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.23.3" = { + "@babel/plugin-transform-exponentiation-operator-7.24.7" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz"; - sha512 = "5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz"; + sha512 = "Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ=="; }; }; - "@babel/plugin-transform-for-of-7.23.6" = { + "@babel/plugin-transform-for-of-7.24.7" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.23.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz"; - sha512 = "aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz"; + sha512 = "wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g=="; }; }; - "@babel/plugin-transform-function-name-7.23.3" = { + "@babel/plugin-transform-function-name-7.25.1" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.23.3"; + version = "7.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz"; - sha512 = "I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz"; + sha512 = "TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA=="; }; }; - "@babel/plugin-transform-literals-7.23.3" = { + "@babel/plugin-transform-literals-7.25.2" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.23.3"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz"; - sha512 = "wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz"; + sha512 = "HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.23.3" = { + "@babel/plugin-transform-member-expression-literals-7.24.7" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz"; - sha512 = "sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz"; + sha512 = "T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw=="; }; }; - "@babel/plugin-transform-modules-amd-7.23.3" = { + "@babel/plugin-transform-modules-amd-7.24.7" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz"; - sha512 = "vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz"; + sha512 = "9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.23.3" = { + "@babel/plugin-transform-modules-commonjs-7.24.8" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.23.3"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz"; - sha512 = "aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz"; + sha512 = "WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.23.3" = { + "@babel/plugin-transform-modules-systemjs-7.25.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.23.3"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz"; - sha512 = "ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz"; + sha512 = "YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw=="; }; }; - "@babel/plugin-transform-modules-umd-7.23.3" = { + "@babel/plugin-transform-modules-umd-7.24.7" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz"; - sha512 = "zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz"; + sha512 = "3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.22.5" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.22.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz"; - sha512 = "YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz"; + sha512 = "/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g=="; }; }; - "@babel/plugin-transform-new-target-7.23.3" = { + "@babel/plugin-transform-new-target-7.24.7" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz"; - sha512 = "YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz"; + sha512 = "RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA=="; }; }; - "@babel/plugin-transform-object-super-7.23.3" = { + "@babel/plugin-transform-object-super-7.24.7" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz"; - sha512 = "BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz"; + sha512 = "A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg=="; }; }; - "@babel/plugin-transform-parameters-7.23.3" = { + "@babel/plugin-transform-parameters-7.24.7" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz"; - sha512 = "09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz"; + sha512 = "yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA=="; }; }; - "@babel/plugin-transform-property-literals-7.23.3" = { + "@babel/plugin-transform-property-literals-7.24.7" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz"; - sha512 = "jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz"; + sha512 = "EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA=="; }; }; - "@babel/plugin-transform-regenerator-7.23.3" = { + "@babel/plugin-transform-regenerator-7.24.7" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz"; - sha512 = "KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz"; + sha512 = "lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA=="; }; }; - "@babel/plugin-transform-reserved-words-7.23.3" = { + "@babel/plugin-transform-reserved-words-7.24.7" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz"; - sha512 = "QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz"; + sha512 = "0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ=="; }; }; "@babel/plugin-transform-runtime-7.12.10" = { @@ -751,67 +724,67 @@ let sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.23.3" = { + "@babel/plugin-transform-shorthand-properties-7.24.7" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz"; - sha512 = "ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz"; + sha512 = "KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA=="; }; }; - "@babel/plugin-transform-spread-7.23.3" = { + "@babel/plugin-transform-spread-7.24.7" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz"; - sha512 = "VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz"; + sha512 = "x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng=="; }; }; - "@babel/plugin-transform-sticky-regex-7.23.3" = { + "@babel/plugin-transform-sticky-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz"; - sha512 = "HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz"; + sha512 = "kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g=="; }; }; - "@babel/plugin-transform-template-literals-7.23.3" = { + "@babel/plugin-transform-template-literals-7.24.7" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz"; - sha512 = "Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz"; + sha512 = "AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.23.3" = { + "@babel/plugin-transform-typeof-symbol-7.24.8" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.23.3"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz"; - sha512 = "4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz"; + sha512 = "adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.23.3" = { + "@babel/plugin-transform-unicode-escapes-7.24.7" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz"; - sha512 = "OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz"; + sha512 = "U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw=="; }; }; - "@babel/plugin-transform-unicode-regex-7.23.3" = { + "@babel/plugin-transform-unicode-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz"; - sha512 = "wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz"; + sha512 = "hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg=="; }; }; "@babel/preset-env-7.12.10" = { @@ -850,427 +823,40 @@ let sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; - "@babel/template-7.22.15" = { + "@babel/template-7.25.0" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.22.15"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz"; - sha512 = "QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz"; + sha512 = "aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q=="; }; }; - "@babel/traverse-7.23.7" = { + "@babel/traverse-7.25.6" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.23.7"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz"; - sha512 = "tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz"; + sha512 = "9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ=="; }; }; - "@babel/types-7.23.6" = { + "@babel/types-7.25.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.23.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz"; - sha512 = "+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg=="; - }; - }; - "@esbuild/android-arm-0.17.19" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz"; - sha512 = "rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A=="; - }; - }; - "@esbuild/android-arm-0.18.20" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz"; - sha512 = "fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw=="; - }; - }; - "@esbuild/android-arm64-0.17.19" = { - name = "_at_esbuild_slash_android-arm64"; - packageName = "@esbuild/android-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz"; - sha512 = "KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA=="; - }; - }; - "@esbuild/android-arm64-0.18.20" = { - name = "_at_esbuild_slash_android-arm64"; - packageName = "@esbuild/android-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz"; - sha512 = "Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ=="; - }; - }; - "@esbuild/android-x64-0.17.19" = { - name = "_at_esbuild_slash_android-x64"; - packageName = "@esbuild/android-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz"; - sha512 = "uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww=="; - }; - }; - "@esbuild/android-x64-0.18.20" = { - name = "_at_esbuild_slash_android-x64"; - packageName = "@esbuild/android-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz"; - sha512 = "8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg=="; - }; - }; - "@esbuild/darwin-arm64-0.17.19" = { - name = "_at_esbuild_slash_darwin-arm64"; - packageName = "@esbuild/darwin-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz"; - sha512 = "80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg=="; - }; - }; - "@esbuild/darwin-arm64-0.18.20" = { - name = "_at_esbuild_slash_darwin-arm64"; - packageName = "@esbuild/darwin-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz"; - sha512 = "bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA=="; - }; - }; - "@esbuild/darwin-x64-0.17.19" = { - name = "_at_esbuild_slash_darwin-x64"; - packageName = "@esbuild/darwin-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz"; - sha512 = "IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw=="; - }; - }; - "@esbuild/darwin-x64-0.18.20" = { - name = "_at_esbuild_slash_darwin-x64"; - packageName = "@esbuild/darwin-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz"; - sha512 = "pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ=="; - }; - }; - "@esbuild/freebsd-arm64-0.17.19" = { - name = "_at_esbuild_slash_freebsd-arm64"; - packageName = "@esbuild/freebsd-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz"; - sha512 = "pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ=="; - }; - }; - "@esbuild/freebsd-arm64-0.18.20" = { - name = "_at_esbuild_slash_freebsd-arm64"; - packageName = "@esbuild/freebsd-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz"; - sha512 = "yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw=="; - }; - }; - "@esbuild/freebsd-x64-0.17.19" = { - name = "_at_esbuild_slash_freebsd-x64"; - packageName = "@esbuild/freebsd-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz"; - sha512 = "4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ=="; - }; - }; - "@esbuild/freebsd-x64-0.18.20" = { - name = "_at_esbuild_slash_freebsd-x64"; - packageName = "@esbuild/freebsd-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz"; - sha512 = "tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ=="; - }; - }; - "@esbuild/linux-arm-0.17.19" = { - name = "_at_esbuild_slash_linux-arm"; - packageName = "@esbuild/linux-arm"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz"; - sha512 = "cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA=="; - }; - }; - "@esbuild/linux-arm-0.18.20" = { - name = "_at_esbuild_slash_linux-arm"; - packageName = "@esbuild/linux-arm"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz"; - sha512 = "/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg=="; - }; - }; - "@esbuild/linux-arm64-0.17.19" = { - name = "_at_esbuild_slash_linux-arm64"; - packageName = "@esbuild/linux-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz"; - sha512 = "ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg=="; - }; - }; - "@esbuild/linux-arm64-0.18.20" = { - name = "_at_esbuild_slash_linux-arm64"; - packageName = "@esbuild/linux-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz"; - sha512 = "2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA=="; - }; - }; - "@esbuild/linux-ia32-0.17.19" = { - name = "_at_esbuild_slash_linux-ia32"; - packageName = "@esbuild/linux-ia32"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz"; - sha512 = "w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ=="; - }; - }; - "@esbuild/linux-ia32-0.18.20" = { - name = "_at_esbuild_slash_linux-ia32"; - packageName = "@esbuild/linux-ia32"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz"; - sha512 = "P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA=="; - }; - }; - "@esbuild/linux-loong64-0.17.19" = { - name = "_at_esbuild_slash_linux-loong64"; - packageName = "@esbuild/linux-loong64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz"; - sha512 = "2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ=="; - }; - }; - "@esbuild/linux-loong64-0.18.20" = { - name = "_at_esbuild_slash_linux-loong64"; - packageName = "@esbuild/linux-loong64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz"; - sha512 = "nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg=="; - }; - }; - "@esbuild/linux-mips64el-0.17.19" = { - name = "_at_esbuild_slash_linux-mips64el"; - packageName = "@esbuild/linux-mips64el"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz"; - sha512 = "LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A=="; - }; - }; - "@esbuild/linux-mips64el-0.18.20" = { - name = "_at_esbuild_slash_linux-mips64el"; - packageName = "@esbuild/linux-mips64el"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz"; - sha512 = "d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ=="; - }; - }; - "@esbuild/linux-ppc64-0.17.19" = { - name = "_at_esbuild_slash_linux-ppc64"; - packageName = "@esbuild/linux-ppc64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz"; - sha512 = "/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg=="; - }; - }; - "@esbuild/linux-ppc64-0.18.20" = { - name = "_at_esbuild_slash_linux-ppc64"; - packageName = "@esbuild/linux-ppc64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz"; - sha512 = "WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA=="; - }; - }; - "@esbuild/linux-riscv64-0.17.19" = { - name = "_at_esbuild_slash_linux-riscv64"; - packageName = "@esbuild/linux-riscv64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz"; - sha512 = "FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA=="; - }; - }; - "@esbuild/linux-riscv64-0.18.20" = { - name = "_at_esbuild_slash_linux-riscv64"; - packageName = "@esbuild/linux-riscv64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz"; - sha512 = "WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A=="; - }; - }; - "@esbuild/linux-s390x-0.17.19" = { - name = "_at_esbuild_slash_linux-s390x"; - packageName = "@esbuild/linux-s390x"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz"; - sha512 = "IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q=="; - }; - }; - "@esbuild/linux-s390x-0.18.20" = { - name = "_at_esbuild_slash_linux-s390x"; - packageName = "@esbuild/linux-s390x"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz"; - sha512 = "+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ=="; - }; - }; - "@esbuild/linux-x64-0.17.19" = { - name = "_at_esbuild_slash_linux-x64"; - packageName = "@esbuild/linux-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz"; - sha512 = "68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw=="; - }; - }; - "@esbuild/linux-x64-0.18.20" = { - name = "_at_esbuild_slash_linux-x64"; - packageName = "@esbuild/linux-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz"; - sha512 = "UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w=="; - }; - }; - "@esbuild/netbsd-x64-0.17.19" = { - name = "_at_esbuild_slash_netbsd-x64"; - packageName = "@esbuild/netbsd-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz"; - sha512 = "CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q=="; - }; - }; - "@esbuild/netbsd-x64-0.18.20" = { - name = "_at_esbuild_slash_netbsd-x64"; - packageName = "@esbuild/netbsd-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz"; - sha512 = "iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A=="; - }; - }; - "@esbuild/openbsd-x64-0.17.19" = { - name = "_at_esbuild_slash_openbsd-x64"; - packageName = "@esbuild/openbsd-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz"; - sha512 = "cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g=="; - }; - }; - "@esbuild/openbsd-x64-0.18.20" = { - name = "_at_esbuild_slash_openbsd-x64"; - packageName = "@esbuild/openbsd-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz"; - sha512 = "e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg=="; - }; - }; - "@esbuild/sunos-x64-0.17.19" = { - name = "_at_esbuild_slash_sunos-x64"; - packageName = "@esbuild/sunos-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz"; - sha512 = "vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg=="; - }; - }; - "@esbuild/sunos-x64-0.18.20" = { - name = "_at_esbuild_slash_sunos-x64"; - packageName = "@esbuild/sunos-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz"; - sha512 = "kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ=="; - }; - }; - "@esbuild/win32-arm64-0.17.19" = { - name = "_at_esbuild_slash_win32-arm64"; - packageName = "@esbuild/win32-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz"; - sha512 = "yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag=="; - }; - }; - "@esbuild/win32-arm64-0.18.20" = { - name = "_at_esbuild_slash_win32-arm64"; - packageName = "@esbuild/win32-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz"; - sha512 = "ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg=="; - }; - }; - "@esbuild/win32-ia32-0.17.19" = { - name = "_at_esbuild_slash_win32-ia32"; - packageName = "@esbuild/win32-ia32"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz"; - sha512 = "eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw=="; - }; - }; - "@esbuild/win32-ia32-0.18.20" = { - name = "_at_esbuild_slash_win32-ia32"; - packageName = "@esbuild/win32-ia32"; - version = "0.18.20"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz"; - sha512 = "Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz"; + sha512 = "/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw=="; }; }; - "@esbuild/win32-x64-0.17.19" = { - name = "_at_esbuild_slash_win32-x64"; - packageName = "@esbuild/win32-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz"; - sha512 = "lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA=="; - }; - }; - "@esbuild/win32-x64-0.18.20" = { - name = "_at_esbuild_slash_win32-x64"; - packageName = "@esbuild/win32-x64"; - version = "0.18.20"; + "@bufbuild/protobuf-2.1.0" = { + name = "_at_bufbuild_slash_protobuf"; + packageName = "@bufbuild/protobuf"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz"; - sha512 = "kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ=="; + url = "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.1.0.tgz"; + sha512 = "+2Mx67Y3skJ4NCD/qNSdBJNWtu6x6Qr53jeNg+QcwiL6mt0wK+3jwHH2x1p7xaYH6Ve2JKOVn0OxU35WsmqI9A=="; }; }; "@hapi/address-2.1.4" = { @@ -1327,58 +913,85 @@ let sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="; }; }; - "@jridgewell/gen-mapping-0.3.3" = { + "@jridgewell/gen-mapping-0.3.5" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; - version = "0.3.3"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz"; - sha512 = "HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ=="; + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz"; + sha512 = "IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg=="; }; }; - "@jridgewell/resolve-uri-3.1.1" = { + "@jridgewell/resolve-uri-3.1.2" = { name = "_at_jridgewell_slash_resolve-uri"; packageName = "@jridgewell/resolve-uri"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz"; - sha512 = "dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="; + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz"; + sha512 = "bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="; }; }; - "@jridgewell/set-array-1.1.2" = { + "@jridgewell/set-array-1.2.1" = { name = "_at_jridgewell_slash_set-array"; packageName = "@jridgewell/set-array"; - version = "1.1.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; - sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz"; + sha512 = "R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="; }; }; - "@jridgewell/source-map-0.3.5" = { + "@jridgewell/source-map-0.3.6" = { name = "_at_jridgewell_slash_source-map"; packageName = "@jridgewell/source-map"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz"; - sha512 = "UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ=="; + url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz"; + sha512 = "1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ=="; }; }; - "@jridgewell/sourcemap-codec-1.4.15" = { + "@jridgewell/sourcemap-codec-1.5.0" = { name = "_at_jridgewell_slash_sourcemap-codec"; packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.15"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"; - sha512 = "eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="; + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz"; + sha512 = "gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="; }; }; - "@jridgewell/trace-mapping-0.3.20" = { + "@jridgewell/trace-mapping-0.3.25" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.20"; + version = "0.3.25"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz"; + sha512 = "vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="; + }; + }; + "@jsonjoy.com/base64-1.1.2" = { + name = "_at_jsonjoy.com_slash_base64"; + packageName = "@jsonjoy.com/base64"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz"; + sha512 = "q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA=="; + }; + }; + "@jsonjoy.com/json-pack-1.1.0" = { + name = "_at_jsonjoy.com_slash_json-pack"; + packageName = "@jsonjoy.com/json-pack"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz"; + sha512 = "zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg=="; + }; + }; + "@jsonjoy.com/util-1.3.0" = { + name = "_at_jsonjoy.com_slash_util"; + packageName = "@jsonjoy.com/util"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz"; - sha512 = "R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q=="; + url = "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.3.0.tgz"; + sha512 = "Cebt4Vk7k1xHy87kHY7KSPLT77A7Ev7IfOblyLZhtYEhrdQ6fX4EoLq3xOQ3O/DRMEh2ok5nyC180E+ABS8Wmw=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -1399,6 +1012,69 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; + "@lydell/elm-0.19.1-14" = { + name = "_at_lydell_slash_elm"; + packageName = "@lydell/elm"; + version = "0.19.1-14"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm/-/elm-0.19.1-14.tgz"; + sha512 = "otpGlYiNRvL7F9k6MJOTcuyIgHr+XWy/1NtHpGUgQi8lHrnuyCjwKFPPiimKpr3bcZTwpD4nebHuYR0bmPIKuA=="; + }; + }; + "@lydell/elm_darwin_arm64-0.19.1-3" = { + name = "_at_lydell_slash_elm_darwin_arm64"; + packageName = "@lydell/elm_darwin_arm64"; + version = "0.19.1-3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_darwin_arm64/-/elm_darwin_arm64-0.19.1-3.tgz"; + sha512 = "RuKTz5ck+RBx4urj1EL/r0xWZZqBMPEXzNBQTEBCAMWLSi4Ck3TVz5pkhBaK+cRZXI+cCgytm/1bIttbp2fFIg=="; + }; + }; + "@lydell/elm_darwin_x64-0.19.1-2" = { + name = "_at_lydell_slash_elm_darwin_x64"; + packageName = "@lydell/elm_darwin_x64"; + version = "0.19.1-2"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_darwin_x64/-/elm_darwin_x64-0.19.1-2.tgz"; + sha512 = "MXfQwxdQfmuQ22iDCFlcXu5YTA0w6/ASzbxmWc+8DkgUkHTynjViGBVkQljAbYe4ZWgrYGWinZQQyhVnp/5oZw=="; + }; + }; + "@lydell/elm_linux_arm-0.19.1-0" = { + name = "_at_lydell_slash_elm_linux_arm"; + packageName = "@lydell/elm_linux_arm"; + version = "0.19.1-0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_arm/-/elm_linux_arm-0.19.1-0.tgz"; + sha512 = "crKrLzuT6jn4OOS7PWKZGYFw6vHwPu3iNP7lg8rFkOog/HxlkRwX4S695aILBG8SGTLhEdfP9tg28SQ7vR4Lpg=="; + }; + }; + "@lydell/elm_linux_arm64-0.19.1-4" = { + name = "_at_lydell_slash_elm_linux_arm64"; + packageName = "@lydell/elm_linux_arm64"; + version = "0.19.1-4"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_arm64/-/elm_linux_arm64-0.19.1-4.tgz"; + sha512 = "JuUkkVBtJjUajtTriQFFANHDmwA14NhqNqgIcq5LCJ6vUQv5/LVd6NUOkl/Rdq7Ju/VN/XwBD1/vm7MGIMOTqA=="; + }; + }; + "@lydell/elm_linux_x64-0.19.1-1" = { + name = "_at_lydell_slash_elm_linux_x64"; + packageName = "@lydell/elm_linux_x64"; + version = "0.19.1-1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_x64/-/elm_linux_x64-0.19.1-1.tgz"; + sha512 = "1Y8UAb+GfUqlSjUTX9CaaZhJqvhVcfNbYC0N9AEutlXf1CzFMvF4VsDeZdxzhNI4allPRWBD1IqtdlLhBTFacA=="; + }; + }; + "@lydell/elm_win32_x64-0.19.1-1" = { + name = "_at_lydell_slash_elm_win32_x64"; + packageName = "@lydell/elm_win32_x64"; + version = "0.19.1-1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_win32_x64/-/elm_win32_x64-0.19.1-1.tgz"; + sha512 = "3LMiJ+uUxDFLNnCd6HBmvVWSjSWjs/Z9dMXZWCMOcw3vrW9iOkRrsNGNxohRXun2YRd8wXOX8/DwVn8i2SJ3KA=="; + }; + }; "@mrmlnc/readdir-enhanced-2.2.1" = { name = "_at_mrmlnc_slash_readdir-enhanced"; packageName = "@mrmlnc/readdir-enhanced"; @@ -1444,13 +1120,22 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/fs-3.1.0" = { + "@npmcli/agent-2.2.2" = { + name = "_at_npmcli_slash_agent"; + packageName = "@npmcli/agent"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz"; + sha512 = "OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og=="; + }; + }; + "@npmcli/fs-3.1.1" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz"; - sha512 = "7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w=="; + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz"; + sha512 = "q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -1480,6 +1165,24 @@ let sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; }; + "@sindresorhus/merge-streams-1.0.0" = { + name = "_at_sindresorhus_slash_merge-streams"; + packageName = "@sindresorhus/merge-streams"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz"; + sha512 = "rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw=="; + }; + }; + "@sindresorhus/merge-streams-3.0.0" = { + name = "_at_sindresorhus_slash_merge-streams"; + packageName = "@sindresorhus/merge-streams"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-3.0.0.tgz"; + sha512 = "5Muw0TDzXvK/i0BmrL1tiTsb6Sh/DXe/e5d63GpmHWr59t7rUyQhhiIuw605q/yvJxyBf6gMWmsxCC2fqtcFvQ=="; + }; + }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -1498,15 +1201,6 @@ let sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; - "@tootallnate/once-2.0.0" = { - name = "_at_tootallnate_slash_once"; - packageName = "@tootallnate/once"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz"; - sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; - }; - }; "@types/cacheable-request-6.0.3" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -1534,6 +1228,15 @@ let sha512 = "orGL5LXERPYsLov6CWs3Fh6203+dXzJkR7OnddIr2514Hsecwc8xRpzCapshBbKFImCsvS/mk6+FWiN5LyZJAQ=="; }; }; + "@types/estree-1.0.6" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz"; + sha512 = "AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="; + }; + }; "@types/get-port-3.2.0" = { name = "_at_types_slash_get-port"; packageName = "@types/get-port"; @@ -1579,13 +1282,13 @@ let sha512 = "1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA=="; }; }; - "@types/http-proxy-1.17.14" = { + "@types/http-proxy-1.17.15" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.14"; + version = "1.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz"; - sha512 = "SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz"; + sha512 = "25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ=="; }; }; "@types/jest-27.5.2" = { @@ -1615,13 +1318,13 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/lodash-4.14.202" = { + "@types/lodash-4.17.9" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.202"; + version = "4.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz"; - sha512 = "OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.9.tgz"; + sha512 = "w9iWudx1XWOHW5lQRS9iKpK/XuRhnN+0T7HvdCCd802FYkT1AMTnxndJHGrNJwRoRHkslGr4S29tjm1cT7x/7w=="; }; }; "@types/minimatch-5.1.2" = { @@ -1642,13 +1345,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-20.10.6" = { + "@types/node-22.7.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.10.6"; + version = "22.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz"; - sha512 = "Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw=="; + url = "https://registry.npmjs.org/@types/node/-/node-22.7.3.tgz"; + sha512 = "qXKfhXXqGTyBskvWEzJZPUxSslAiLaB6JGP1ic/XTH9ctGgzdgYguuLP1C601aRTSDNlLb0jbKqXjZ48GNraSA=="; }; }; "@types/node-8.10.66" = { @@ -1723,22 +1426,22 @@ let sha512 = "gVC1InwyVrO326wbBZw+AO3u2vRXz/iRWq9jYhpG4W8LXyIgDv3ZmcLQ5Q4Gs+gFMyqx+viFoFT+l3p61QFCmQ=="; }; }; - "@types/uglify-js-3.17.4" = { + "@types/uglify-js-3.17.5" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.17.4"; + version = "3.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.4.tgz"; - sha512 = "Hm/T0kV3ywpJyMGNbsItdivRhYNCQQf1IIsYsXnoVPES4t+FMLyDe0/K+Ea7ahWtMtSNb22ZdY7MIyoD9rqARg=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.5.tgz"; + sha512 = "TU+fZFBTBcXj/GpDpDaBmgWk/gn96kMZ+uocaFUlV2f8a6WdMzzI44QBCmGcCiYR0Y6ZlNRiyUyKKt5nl/lbzQ=="; }; }; - "@types/webpack-4.41.38" = { + "@types/webpack-4.41.39" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.38"; + version = "4.41.39"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.38.tgz"; - sha512 = "oOW7E931XJU1mVfCnxCVgv8GLFL768pDO5u2Gzk82i8yTIgX6i7cntyZOkZYb/JtYM8252SN9bQp9tgkVDSsRw=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.39.tgz"; + sha512 = "otxUJvoi6FbBq/64gGH34eblpKLgdi+gf08GaAh8Bx6So0ZZic028Ev/SUxD22gbthMKCkeeiXEat1kHLDJfYg=="; }; }; "@types/webpack-sources-3.2.3" = { @@ -1930,15 +1633,6 @@ let sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; - }; - }; "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; @@ -1957,13 +1651,13 @@ let sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; }; }; - "acorn-8.11.3" = { + "acorn-8.12.1" = { name = "acorn"; packageName = "acorn"; - version = "8.11.3"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz"; - sha512 = "Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz"; + sha512 = "tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="; }; }; "address-1.0.3" = { @@ -1975,22 +1669,13 @@ let sha512 = "z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg=="; }; }; - "agent-base-6.0.2" = { + "agent-base-7.1.1" = { name = "agent-base"; packageName = "agent-base"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; - sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; - }; - }; - "agentkeepalive-4.5.0" = { - name = "agentkeepalive"; - packageName = "agentkeepalive"; - version = "4.5.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz"; - sha512 = "5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew=="; + url = "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz"; + sha512 = "H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA=="; }; }; "aggregate-error-3.1.0" = { @@ -2011,13 +1696,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.12.0" = { + "ajv-8.17.1" = { name = "ajv"; packageName = "ajv"; - version = "8.12.0"; + version = "8.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"; - sha512 = "sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz"; + sha512 = "B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="; }; }; "ajv-errors-1.0.1" = { @@ -2119,13 +1804,13 @@ let sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; - "ansi-regex-6.0.1" = { + "ansi-regex-6.1.0" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz"; - sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz"; + sha512 = "7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="; }; }; "ansi-styles-2.2.1" = { @@ -2245,13 +1930,13 @@ let sha512 = "sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="; }; }; - "array-buffer-byte-length-1.0.0" = { + "array-buffer-byte-length-1.0.1" = { name = "array-buffer-byte-length"; packageName = "array-buffer-byte-length"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"; - sha512 = "LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A=="; + url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz"; + sha512 = "ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg=="; }; }; "array-filter-0.0.1" = { @@ -2335,22 +2020,22 @@ let sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="; }; }; - "array.prototype.reduce-1.0.6" = { + "array.prototype.reduce-1.0.7" = { name = "array.prototype.reduce"; packageName = "array.prototype.reduce"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz"; - sha512 = "UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg=="; + url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz"; + sha512 = "mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q=="; }; }; - "arraybuffer.prototype.slice-1.0.2" = { + "arraybuffer.prototype.slice-1.0.3" = { name = "arraybuffer.prototype.slice"; packageName = "arraybuffer.prototype.slice"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz"; - sha512 = "yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw=="; + url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz"; + sha512 = "bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A=="; }; }; "asap-2.0.6" = { @@ -2371,13 +2056,13 @@ let sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; }; }; - "asn1.js-5.4.1" = { + "asn1.js-4.10.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "5.4.1"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"; - sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; + sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; }; }; "assert-1.5.1" = { @@ -2506,13 +2191,13 @@ let sha512 = "0/lBNwN+ZUnb5su18NZo5MBIjDaq6boQKZcxwy86Gip/CmXA2zZqUoFQLCNAGI5P25ZWSP2RWdhDJ8osfKEjoQ=="; }; }; - "available-typed-arrays-1.0.5" = { + "available-typed-arrays-1.0.7" = { name = "available-typed-arrays"; packageName = "available-typed-arrays"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; - sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; + url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz"; + sha512 = "wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ=="; }; }; "aws-sign2-0.7.0" = { @@ -2524,13 +2209,13 @@ let sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; }; }; - "aws4-1.12.0" = { + "aws4-1.13.2" = { name = "aws4"; packageName = "aws4"; - version = "1.12.0"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"; - sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz"; + sha512 = "lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="; }; }; "babel-extract-comments-1.0.0" = { @@ -2677,13 +2362,13 @@ let sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; - "binary-extensions-2.2.0" = { + "binary-extensions-2.3.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; - sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz"; + sha512 = "Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="; }; }; "bindings-1.5.0" = { @@ -2767,13 +2452,13 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; - "body-parser-1.20.1" = { + "body-parser-1.20.3" = { name = "body-parser"; packageName = "body-parser"; - version = "1.20.1"; + version = "1.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"; - sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz"; + sha512 = "7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g=="; }; }; "bonjour-3.5.0" = { @@ -2821,13 +2506,13 @@ let sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; }; - "braces-3.0.2" = { + "braces-3.0.3" = { name = "braces"; packageName = "braces"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + url = "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz"; + sha512 = "yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="; }; }; "brorand-1.1.0" = { @@ -2866,22 +2551,22 @@ let sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; - "browserify-rsa-4.1.0" = { + "browserify-rsa-4.1.1" = { name = "browserify-rsa"; packageName = "browserify-rsa"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; - sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.1.tgz"; + sha512 = "YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ=="; }; }; - "browserify-sign-4.2.2" = { + "browserify-sign-4.2.3" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz"; - sha512 = "1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg=="; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz"; + sha512 = "JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw=="; }; }; "browserify-zlib-0.2.0" = { @@ -2902,13 +2587,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.22.2" = { + "browserslist-4.24.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.22.2"; + version = "4.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz"; - sha512 = "0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz"; + sha512 = "Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A=="; }; }; "buffer-4.9.2" = { @@ -2929,6 +2614,15 @@ let sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; }; + "buffer-builder-0.2.0" = { + name = "buffer-builder"; + packageName = "buffer-builder"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz"; + sha512 = "7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg=="; + }; + }; "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; @@ -3037,13 +2731,13 @@ let sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; - "cacache-17.1.4" = { + "cacache-18.0.4" = { name = "cacache"; packageName = "cacache"; - version = "17.1.4"; + version = "18.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz"; - sha512 = "/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A=="; + url = "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz"; + sha512 = "B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ=="; }; }; "cache-base-1.0.1" = { @@ -3091,13 +2785,13 @@ let sha512 = "v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg=="; }; }; - "call-bind-1.0.5" = { + "call-bind-1.0.7" = { name = "call-bind"; packageName = "call-bind"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz"; - sha512 = "C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ=="; + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz"; + sha512 = "GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w=="; }; }; "call-me-maybe-1.0.2" = { @@ -3190,13 +2884,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001574" = { + "caniuse-lite-1.0.30001664" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001574"; + version = "1.0.30001664"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001574.tgz"; - sha512 = "BtYEK4r/iHt/txm81KBudCUcTy7t+s9emrIaHqjYurQ10x71zJ5VQ9x1dYPcz/b+pKSp4y/v1xSI67A+LzpNyg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz"; + sha512 = "AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -3343,6 +3037,24 @@ let sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; }; }; + "chokidar-3.6.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz"; + sha512 = "7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="; + }; + }; + "chokidar-4.0.1" = { + name = "chokidar"; + packageName = "chokidar"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz"; + sha512 = "n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA=="; + }; + }; "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; @@ -3361,13 +3073,13 @@ let sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; - "chrome-trace-event-1.0.3" = { + "chrome-trace-event-1.0.4" = { name = "chrome-trace-event"; packageName = "chrome-trace-event"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; - sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz"; + sha512 = "rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ=="; }; }; "cipher-base-1.0.4" = { @@ -3424,6 +3136,15 @@ let sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; }; + "cli-cursor-4.0.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz"; + sha512 = "VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="; + }; + }; "cli-spinners-2.9.2" = { name = "cli-spinners"; packageName = "cli-spinners"; @@ -3595,6 +3316,15 @@ let sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; }; }; + "colorjs.io-0.5.2" = { + name = "colorjs.io"; + packageName = "colorjs.io"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz"; + sha512 = "twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw=="; + }; + }; "colors-1.0.3" = { name = "colors"; packageName = "colors"; @@ -3631,13 +3361,13 @@ let sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; - "commander-10.0.1" = { + "commander-11.1.0" = { name = "commander"; packageName = "commander"; - version = "10.0.1"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz"; - sha512 = "y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug=="; + url = "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz"; + sha512 = "yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ=="; }; }; "commander-2.14.1" = { @@ -3874,13 +3604,13 @@ let sha512 = "+IJOX0OqlHCszo2mBUq+SrEbCj6w7Kpffqx60zYbPTFaO4+yYgRjHwcZNpWvaTylDHaV7PPmBHzSecZiMhtPgw=="; }; }; - "cookie-0.5.0" = { + "cookie-0.6.0" = { name = "cookie"; packageName = "cookie"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; - sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz"; + sha512 = "U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="; }; }; "cookie-signature-1.0.6" = { @@ -3946,13 +3676,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.35.0" = { + "core-js-compat-3.38.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.35.0"; + version = "3.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.0.tgz"; - sha512 = "5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz"; + sha512 = "JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw=="; }; }; "core-util-is-1.0.2" = { @@ -4279,13 +4009,13 @@ let sha512 = "0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA=="; }; }; - "d-1.0.1" = { + "d-1.0.2" = { name = "d"; packageName = "d"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; - sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; + url = "https://registry.npmjs.org/d/-/d-1.0.2.tgz"; + sha512 = "MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw=="; }; }; "dashdash-1.14.1" = { @@ -4297,6 +4027,33 @@ let sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; + "data-view-buffer-1.0.1" = { + name = "data-view-buffer"; + packageName = "data-view-buffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz"; + sha512 = "0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA=="; + }; + }; + "data-view-byte-length-1.0.1" = { + name = "data-view-byte-length"; + packageName = "data-view-byte-length"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz"; + sha512 = "4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ=="; + }; + }; + "data-view-byte-offset-1.0.0" = { + name = "data-view-byte-offset"; + packageName = "data-view-byte-offset"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz"; + sha512 = "t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA=="; + }; + }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -4315,13 +4072,13 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.3.4" = { + "debug-4.3.7" = { name = "debug"; packageName = "debug"; - version = "4.3.4"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz"; + sha512 = "Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="; }; }; "decamelize-1.2.0" = { @@ -4432,13 +4189,13 @@ let sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; }; - "define-data-property-1.1.1" = { + "define-data-property-1.1.4" = { name = "define-data-property"; packageName = "define-data-property"; - version = "1.1.1"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz"; - sha512 = "E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ=="; + url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz"; + sha512 = "rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A=="; }; }; "define-properties-1.2.1" = { @@ -4810,22 +4567,22 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.622" = { + "electron-to-chromium-1.5.29" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.622"; + version = "1.5.29"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.622.tgz"; - sha512 = "GZ47DEy0Gm2Z8RVG092CkFvX7SdotG57c4YZOe8W8qD4rOmk3plgeNmiLVRHP/Liqj1wRiY3uUUod9vb9hnxZA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz"; + sha512 = "PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw=="; }; }; - "elliptic-6.5.4" = { + "elliptic-6.5.7" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.4"; + version = "6.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"; - sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz"; + sha512 = "ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q=="; }; }; "elm-0.19.1" = { @@ -4927,15 +4684,6 @@ let sha512 = "5GV3WkJ8R/faOP1hwElQdNuCt8tKx2+1lsMrdeIYWSFz01Kp9gJl/R6zGtp4QUyrUtO8KnHsxjHrQNUf2CHkrg=="; }; }; - "elm-tooling-1.15.0" = { - name = "elm-tooling"; - packageName = "elm-tooling"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.15.0.tgz"; - sha512 = "quRE5LGJyrkPBoJ3MvFQ5RGgf80J0L0d3NkduStvXh4TmZuMXNC3Z/l2ZRoq2UTUaNWeYfO1Zx5wns1AvsTrnw=="; - }; - }; "elm-webpack-loader-6.0.1" = { name = "elm-webpack-loader"; packageName = "elm-webpack-loader"; @@ -5008,6 +4756,15 @@ let sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; + "encodeurl-2.0.0" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz"; + sha512 = "Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="; + }; + }; "encoding-0.1.13" = { name = "encoding"; packageName = "encoding"; @@ -5080,13 +4837,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.22.3" = { + "es-abstract-1.23.3" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.22.3"; + version = "1.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz"; - sha512 = "eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz"; + sha512 = "e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -5098,13 +4855,40 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; - "es-set-tostringtag-2.0.2" = { + "es-define-property-1.0.0" = { + name = "es-define-property"; + packageName = "es-define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz"; + sha512 = "jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ=="; + }; + }; + "es-errors-1.3.0" = { + name = "es-errors"; + packageName = "es-errors"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz"; + sha512 = "Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="; + }; + }; + "es-object-atoms-1.0.0" = { + name = "es-object-atoms"; + packageName = "es-object-atoms"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz"; + sha512 = "MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw=="; + }; + }; + "es-set-tostringtag-2.0.3" = { name = "es-set-tostringtag"; packageName = "es-set-tostringtag"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz"; - sha512 = "BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q=="; + url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz"; + sha512 = "3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ=="; }; }; "es-to-primitive-1.2.1" = { @@ -5116,13 +4900,13 @@ let sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; - "es5-ext-0.10.62" = { + "es5-ext-0.10.64" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.62"; + version = "0.10.64"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz"; - sha512 = "BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz"; + sha512 = "p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg=="; }; }; "es6-iterator-2.0.3" = { @@ -5143,40 +4927,49 @@ let sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; }; }; - "es6-symbol-3.1.3" = { + "es6-symbol-3.1.4" = { name = "es6-symbol"; packageName = "es6-symbol"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"; - sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz"; + sha512 = "U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg=="; }; }; - "esbuild-0.17.19" = { + "esbuild-0.19.12" = { name = "esbuild"; packageName = "esbuild"; - version = "0.17.19"; + version = "0.19.12"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz"; - sha512 = "XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz"; + sha512 = "aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg=="; }; }; - "esbuild-0.18.20" = { + "esbuild-0.20.2" = { name = "esbuild"; packageName = "esbuild"; - version = "0.18.20"; + version = "0.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz"; - sha512 = "ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz"; + sha512 = "WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g=="; }; }; - "escalade-3.1.1" = { + "esbuild-0.21.5" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.21.5"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz"; + sha512 = "mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw=="; + }; + }; + "escalade-3.2.0" = { name = "escalade"; packageName = "escalade"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz"; + sha512 = "WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="; }; }; "escape-html-1.0.3" = { @@ -5224,6 +5017,15 @@ let sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; }; }; + "esniff-2.0.1" = { + name = "esniff"; + packageName = "esniff"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz"; + sha512 = "kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg=="; + }; + }; "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; @@ -5278,6 +5080,15 @@ let sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; }; }; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha512 = "D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA=="; + }; + }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -5377,13 +5188,13 @@ let sha512 = "CDaOBMB9knI6vx9SpIxEMOJ6VBbC2U/tYNILs0qv1YOZc15K9U2EcF06v10F0JX6IYcWnKYZJwIDJspEHLvUaQ=="; }; }; - "express-4.18.2" = { + "express-4.21.0" = { name = "express"; packageName = "express"; - version = "4.18.2"; + version = "4.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.18.2.tgz"; - sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; + url = "https://registry.npmjs.org/express/-/express-4.21.0.tgz"; + sha512 = "VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng=="; }; }; "express-ws-2.0.0" = { @@ -5530,6 +5341,15 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; + "fast-uri-3.0.2" = { + name = "fast-uri"; + packageName = "fast-uri"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz"; + sha512 = "GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row=="; + }; + }; "fastest-levenshtein-1.0.16" = { name = "fastest-levenshtein"; packageName = "fastest-levenshtein"; @@ -5539,13 +5359,13 @@ let sha512 = "eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="; }; }; - "fastq-1.16.0" = { + "fastq-1.17.1" = { name = "fastq"; packageName = "fastq"; - version = "1.16.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz"; - sha512 = "ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz"; + sha512 = "sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w=="; }; }; "faye-websocket-0.10.0" = { @@ -5620,13 +5440,13 @@ let sha512 = "VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ=="; }; }; - "fill-range-7.0.1" = { + "fill-range-7.1.1" = { name = "fill-range"; packageName = "fill-range"; - version = "7.0.1"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz"; + sha512 = "YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg=="; }; }; "finalhandler-1.1.1" = { @@ -5647,13 +5467,13 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "finalhandler-1.2.0" = { + "finalhandler-1.3.1" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; - sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz"; + sha512 = "6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ=="; }; }; "find-0.2.7" = { @@ -5809,13 +5629,13 @@ let sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A=="; }; }; - "follow-redirects-1.15.4" = { + "follow-redirects-1.15.9" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.15.4"; + version = "1.15.9"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz"; - sha512 = "Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz"; + sha512 = "gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="; }; }; "for-each-0.3.3" = { @@ -5836,13 +5656,13 @@ let sha512 = "7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="; }; }; - "foreground-child-3.1.1" = { + "foreground-child-3.3.0" = { name = "foreground-child"; packageName = "foreground-child"; - version = "3.1.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz"; - sha512 = "TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg=="; + url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz"; + sha512 = "Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg=="; }; }; "forever-agent-0.6.1" = { @@ -6007,15 +5827,6 @@ let sha512 = "XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw=="; }; }; - "fs-monkey-1.0.5" = { - name = "fs-monkey"; - packageName = "fs-monkey"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz"; - sha512 = "8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew=="; - }; - }; "fs-readdir-recursive-1.1.0" = { name = "fs-readdir-recursive"; packageName = "fs-readdir-recursive"; @@ -6124,13 +5935,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.2.2" = { + "get-intrinsic-1.2.4" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz"; - sha512 = "0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz"; + sha512 = "5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -6187,13 +5998,13 @@ let sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; }; }; - "get-symbol-description-1.0.0" = { + "get-symbol-description-1.0.2" = { name = "get-symbol-description"; packageName = "get-symbol-description"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; + url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz"; + sha512 = "g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg=="; }; }; "get-value-2.0.6" = { @@ -6223,13 +6034,13 @@ let sha512 = "0pcXixfRCfLXdkwC/FJxiYEg5sYnbqYqtMmtXRzlKrStI9tLev7G/PDuFH2GmySJQ3ix5YUPRN/OJEuFD827EA=="; }; }; - "glob-10.3.10" = { + "glob-10.4.5" = { name = "glob"; packageName = "glob"; - version = "10.3.10"; + version = "10.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz"; - sha512 = "fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g=="; + url = "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz"; + sha512 = "7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="; }; }; "glob-7.1.4" = { @@ -6313,13 +6124,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globalthis-1.0.3" = { + "globalthis-1.0.4" = { name = "globalthis"; packageName = "globalthis"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"; - sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; + url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz"; + sha512 = "DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ=="; }; }; "globby-11.1.0" = { @@ -6331,13 +6142,22 @@ let sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; - "globby-13.1.4" = { + "globby-13.2.2" = { + name = "globby"; + packageName = "globby"; + version = "13.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz"; + sha512 = "Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w=="; + }; + }; + "globby-14.0.0" = { name = "globby"; packageName = "globby"; - version = "13.1.4"; + version = "14.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-13.1.4.tgz"; - sha512 = "iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g=="; + url = "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz"; + sha512 = "/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ=="; }; }; "globby-6.1.0" = { @@ -6412,13 +6232,13 @@ let sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; }; }; - "graphql-16.8.1" = { + "graphql-16.9.0" = { name = "graphql"; packageName = "graphql"; - version = "16.8.1"; + version = "16.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz"; - sha512 = "59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw=="; + url = "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz"; + sha512 = "GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw=="; }; }; "graphql-request-3.7.0" = { @@ -6520,22 +6340,22 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-property-descriptors-1.0.1" = { + "has-property-descriptors-1.0.2" = { name = "has-property-descriptors"; packageName = "has-property-descriptors"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz"; - sha512 = "VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg=="; + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz"; + sha512 = "55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="; }; }; - "has-proto-1.0.1" = { + "has-proto-1.0.3" = { name = "has-proto"; packageName = "has-proto"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"; - sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; + url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz"; + sha512 = "SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="; }; }; "has-symbol-support-x-1.4.2" = { @@ -6565,13 +6385,13 @@ let sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; }; }; - "has-tostringtag-1.0.0" = { + "has-tostringtag-1.0.2" = { name = "has-tostringtag"; packageName = "has-tostringtag"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; + url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz"; + sha512 = "NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw=="; }; }; "has-value-0.3.1" = { @@ -6610,6 +6430,15 @@ let sha512 = "ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ=="; }; }; + "hash-base-3.0.4" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; + sha512 = "EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow=="; + }; + }; "hash-base-3.1.0" = { name = "hash-base"; packageName = "hash-base"; @@ -6628,13 +6457,13 @@ let sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; - "hasown-2.0.0" = { + "hasown-2.0.2" = { name = "hasown"; packageName = "hasown"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz"; - sha512 = "vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA=="; + url = "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz"; + sha512 = "0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="; }; }; "he-1.2.0" = { @@ -6835,13 +6664,13 @@ let sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; }; }; - "http-proxy-agent-5.0.0" = { + "http-proxy-agent-7.0.2" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; - version = "5.0.0"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; - sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz"; + sha512 = "T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="; }; }; "http-proxy-middleware-0.19.1" = { @@ -6889,13 +6718,13 @@ let sha512 = "J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="; }; }; - "https-proxy-agent-5.0.1" = { + "https-proxy-agent-7.0.5" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "5.0.1"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; - sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz"; + sha512 = "1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw=="; }; }; "human-signals-2.1.0" = { @@ -6907,13 +6736,13 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; - "humanize-ms-1.2.1" = { - name = "humanize-ms"; - packageName = "humanize-ms"; - version = "1.2.1"; + "hyperdyperid-1.2.0" = { + name = "hyperdyperid"; + packageName = "hyperdyperid"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; - sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; + url = "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz"; + sha512 = "Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A=="; }; }; "i-0.3.7" = { @@ -6988,13 +6817,13 @@ let sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; }; - "ignore-5.3.0" = { + "ignore-5.3.2" = { name = "ignore"; packageName = "ignore"; - version = "5.3.0"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz"; - sha512 = "g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz"; + sha512 = "hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="; }; }; "image-size-0.5.5" = { @@ -7015,13 +6844,13 @@ let sha512 = "4Urocwu9+XLDJw4Tc6ZCg7APVjjLInCFvO4TwGsAYV5zT6YYSor14dsZR0+0tHlDIN92cFUOq+i7fC00G5vTxA=="; }; }; - "immutable-4.3.4" = { + "immutable-4.3.7" = { name = "immutable"; packageName = "immutable"; - version = "4.3.4"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz"; - sha512 = "fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA=="; + url = "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz"; + sha512 = "1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw=="; }; }; "import-fresh-2.0.0" = { @@ -7141,13 +6970,13 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "internal-slot-1.0.6" = { + "internal-slot-1.0.7" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz"; - sha512 = "Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz"; + sha512 = "NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g=="; }; }; "invert-kv-1.0.0" = { @@ -7159,22 +6988,22 @@ let sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ=="; }; }; - "ip-1.1.8" = { + "ip-1.1.9" = { name = "ip"; packageName = "ip"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz"; - sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; + url = "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz"; + sha512 = "cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ=="; }; }; - "ip-2.0.0" = { - name = "ip"; - packageName = "ip"; - version = "2.0.0"; + "ip-address-9.0.5" = { + name = "ip-address"; + packageName = "ip-address"; + version = "9.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"; - sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; + url = "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz"; + sha512 = "zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g=="; }; }; "ip-regex-2.1.0" = { @@ -7231,13 +7060,13 @@ let sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; - "is-array-buffer-3.0.2" = { + "is-array-buffer-3.0.4" = { name = "is-array-buffer"; packageName = "is-array-buffer"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"; - sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="; + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz"; + sha512 = "wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw=="; }; }; "is-arrayish-0.2.1" = { @@ -7321,13 +7150,13 @@ let sha512 = "H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA=="; }; }; - "is-core-module-2.13.1" = { + "is-core-module-2.15.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.13.1"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz"; - sha512 = "hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz"; + sha512 = "z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ=="; }; }; "is-data-descriptor-1.0.1" = { @@ -7339,6 +7168,15 @@ let sha512 = "bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw=="; }; }; + "is-data-view-1.0.1" = { + name = "is-data-view"; + packageName = "is-data-view"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz"; + sha512 = "AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w=="; + }; + }; "is-date-object-1.0.5" = { name = "is-date-object"; packageName = "is-date-object"; @@ -7474,13 +7312,13 @@ let sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; }; }; - "is-negative-zero-2.0.2" = { + "is-negative-zero-2.0.3" = { name = "is-negative-zero"; packageName = "is-negative-zero"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; - sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz"; + sha512 = "5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw=="; }; }; "is-number-3.0.0" = { @@ -7618,13 +7456,13 @@ let sha512 = "F/pJIk8QD6OX5DNhRB7hWamLsUilmkDGho48KbgZ6xg/lmAZXHxzXQ91jzB3yRSw5kdQGGGc4yz8HYhTYIMWPg=="; }; }; - "is-shared-array-buffer-1.0.2" = { + "is-shared-array-buffer-1.0.3" = { name = "is-shared-array-buffer"; packageName = "is-shared-array-buffer"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; - sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; + url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz"; + sha512 = "nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg=="; }; }; "is-stream-1.1.0" = { @@ -7663,13 +7501,13 @@ let sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; - "is-typed-array-1.1.12" = { + "is-typed-array-1.1.13" = { name = "is-typed-array"; packageName = "is-typed-array"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz"; - sha512 = "Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg=="; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz"; + sha512 = "uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw=="; }; }; "is-typedarray-1.0.0" = { @@ -7780,6 +7618,15 @@ let sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; + "isexe-3.1.1" = { + name = "isexe"; + packageName = "isexe"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz"; + sha512 = "LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ=="; + }; + }; "isobject-2.1.0" = { name = "isobject"; packageName = "isobject"; @@ -7816,13 +7663,13 @@ let sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; }; }; - "jackspeak-2.3.6" = { + "jackspeak-3.4.3" = { name = "jackspeak"; packageName = "jackspeak"; - version = "2.3.6"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz"; - sha512 = "N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ=="; + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz"; + sha512 = "OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw=="; }; }; "jest-diff-27.5.1" = { @@ -7879,6 +7726,15 @@ let sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; }; }; + "jsbn-1.1.0" = { + name = "jsbn"; + packageName = "jsbn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz"; + sha512 = "4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="; + }; + }; "jsesc-0.5.0" = { name = "jsesc"; packageName = "jsesc"; @@ -7969,13 +7825,13 @@ let sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; }; }; - "json-stable-stringify-1.1.0" = { + "json-stable-stringify-1.1.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz"; - sha512 = "zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA=="; + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz"; + sha512 = "SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -8176,6 +8032,15 @@ let sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; }; + "launch-editor-2.6.1" = { + name = "launch-editor"; + packageName = "launch-editor"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz"; + sha512 = "eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw=="; + }; + }; "lcid-1.0.0" = { name = "lcid"; packageName = "lcid"; @@ -8194,13 +8059,13 @@ let sha512 = "P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA=="; }; }; - "lightningcss-1.22.1" = { + "lightningcss-1.27.0" = { name = "lightningcss"; packageName = "lightningcss"; - version = "1.22.1"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.1.tgz"; - sha512 = "Fy45PhibiNXkm0cK5FJCbfO8Y6jUpD/YcHf/BtuI+jvYYqSXKF4muk61jjE8YxCR9y+hDYIWSzHTc+bwhDE6rQ=="; + url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.27.0.tgz"; + sha512 = "8f7aNmS1+etYSLHht0fQApPc2kNO8qGRutifN5rVIc6Xo6ABsEbqOr758UwI7ALVbTt4x1fllKt0PYgzD9S3yQ=="; }; }; "lines-and-columns-1.2.4" = { @@ -8365,13 +8230,13 @@ let sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; }; }; - "loglevel-1.8.1" = { + "loglevel-1.9.2" = { name = "loglevel"; packageName = "loglevel"; - version = "1.8.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz"; - sha512 = "tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.9.2.tgz"; + sha512 = "HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg=="; }; }; "lower-case-2.0.2" = { @@ -8401,13 +8266,13 @@ let sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; }; - "lru-cache-10.1.0" = { + "lru-cache-10.4.3" = { name = "lru-cache"; packageName = "lru-cache"; - version = "10.1.0"; + version = "10.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz"; - sha512 = "/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"; + sha512 = "JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="; }; }; "lru-cache-4.1.5" = { @@ -8428,24 +8293,6 @@ let sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; }; }; - "lru-cache-6.0.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - }; - "lru-cache-7.18.3" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "7.18.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz"; - sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; - }; - }; "make-dir-1.3.0" = { name = "make-dir"; packageName = "make-dir"; @@ -8473,13 +8320,13 @@ let sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; - "make-fetch-happen-11.1.1" = { + "make-fetch-happen-13.0.1" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "11.1.1"; + version = "13.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz"; - sha512 = "rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz"; + sha512 = "cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA=="; }; }; "map-cache-0.2.2" = { @@ -8545,13 +8392,13 @@ let sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; }; }; - "memfs-3.6.0" = { + "memfs-4.12.0" = { name = "memfs"; packageName = "memfs"; - version = "3.6.0"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.6.0.tgz"; - sha512 = "EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ=="; + url = "https://registry.npmjs.org/memfs/-/memfs-4.12.0.tgz"; + sha512 = "74wDsex5tQDSClVkeK1vtxqYCAgCoXxx+K4NSHzgU/muYVYByFqa+0RnrPO9NM6naWm1+G9JmZ0p6QHhXmeYfA=="; }; }; "memory-fs-0.4.1" = { @@ -8581,6 +8428,15 @@ let sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; }; }; + "merge-descriptors-1.0.3" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz"; + sha512 = "gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="; + }; + }; "merge-stream-2.0.0" = { name = "merge-stream"; packageName = "merge-stream"; @@ -8617,13 +8473,13 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "micromatch-4.0.5" = { + "micromatch-4.0.8" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.5"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; - sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz"; + sha512 = "PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="; }; }; "miller-rabin-4.0.1" = { @@ -8806,13 +8662,13 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; - "minimatch-9.0.3" = { + "minimatch-9.0.5" = { name = "minimatch"; packageName = "minimatch"; - version = "9.0.3"; + version = "9.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz"; - sha512 = "RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz"; + sha512 = "G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="; }; }; "minimist-1.2.0" = { @@ -8869,31 +8725,31 @@ let sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; }; }; - "minipass-7.0.4" = { + "minipass-7.1.2" = { name = "minipass"; packageName = "minipass"; - version = "7.0.4"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz"; - sha512 = "jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ=="; + url = "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz"; + sha512 = "qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="; }; }; - "minipass-collect-1.0.2" = { + "minipass-collect-2.0.1" = { name = "minipass-collect"; packageName = "minipass-collect"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; - sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz"; + sha512 = "D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw=="; }; }; - "minipass-fetch-3.0.4" = { + "minipass-fetch-3.0.5" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz"; - sha512 = "jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz"; + sha512 = "2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg=="; }; }; "minipass-flush-1.0.5" = { @@ -9040,15 +8896,6 @@ let sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; "ms-2.1.3" = { name = "ms"; packageName = "ms"; @@ -9112,13 +8959,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "nan-2.18.0" = { + "nan-2.20.0" = { name = "nan"; packageName = "nan"; - version = "2.18.0"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz"; - sha512 = "W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="; + url = "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz"; + sha512 = "bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="; }; }; "nanoid-3.3.7" = { @@ -9247,13 +9094,13 @@ let sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; }; }; - "node-gyp-build-4.7.1" = { + "node-gyp-build-4.8.2" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.7.1"; + version = "4.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.7.1.tgz"; - sha512 = "wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz"; + sha512 = "IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw=="; }; }; "node-libs-browser-2.2.1" = { @@ -9274,31 +9121,22 @@ let sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; }; }; - "node-releases-2.0.14" = { + "node-releases-2.0.18" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.14"; + version = "2.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz"; - sha512 = "y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz"; + sha512 = "d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="; }; }; - "node-watch-0.7.4" = { + "node-watch-0.5.5" = { name = "node-watch"; packageName = "node-watch"; - version = "0.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/node-watch/-/node-watch-0.7.4.tgz"; - sha512 = "RinNxoz4W1cep1b928fuFhvAQ5ag/+1UlMDV7rbyGthBIgsiEouS4kvRayvvboxii4m8eolKOIBo3OjDqbc+uQ=="; - }; - }; - "nopt-1.0.10" = { - name = "nopt"; - packageName = "nopt"; - version = "1.0.10"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; - sha512 = "NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg=="; + url = "https://registry.npmjs.org/node-watch/-/node-watch-0.5.5.tgz"; + sha512 = "z9xN2ibI6P0UylFadN7oMcIMsoTeCENC0rZyRM5MVK9AqzSPx+uGqKG6KMPeC/laOV4wOGZq/GH0PTstRNSqOA=="; }; }; "normalize-package-data-2.5.0" = { @@ -9454,22 +9292,22 @@ let sha512 = "79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ=="; }; }; - "object-inspect-1.13.1" = { + "object-inspect-1.13.2" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz"; - sha512 = "5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz"; + sha512 = "IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g=="; }; }; - "object-is-1.1.5" = { + "object-is-1.1.6" = { name = "object-is"; packageName = "object-is"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; - sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz"; + sha512 = "F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q=="; }; }; "object-keys-1.1.1" = { @@ -9499,22 +9337,22 @@ let sha512 = "byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ=="; }; }; - "object.entries-1.1.7" = { + "object.entries-1.1.8" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz"; - sha512 = "jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA=="; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz"; + sha512 = "cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ=="; }; }; - "object.getownpropertydescriptors-2.1.7" = { + "object.getownpropertydescriptors-2.1.8" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.7"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz"; - sha512 = "PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz"; + sha512 = "qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A=="; }; }; "object.pick-1.3.0" = { @@ -9526,13 +9364,13 @@ let sha512 = "tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="; }; }; - "object.values-1.1.7" = { + "object.values-1.2.0" = { name = "object.values"; packageName = "object.values"; - version = "1.1.7"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz"; - sha512 = "aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz"; + sha512 = "yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ=="; }; }; "obuf-1.1.2" = { @@ -9850,6 +9688,15 @@ let sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; }; + "package-json-from-dist-1.0.1" = { + name = "package-json-from-dist"; + packageName = "package-json-from-dist"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz"; + sha512 = "UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="; + }; + }; "pako-1.0.11" = { name = "pako"; packageName = "pako"; @@ -9886,13 +9733,13 @@ let sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; }; - "parse-asn1-5.1.6" = { + "parse-asn1-5.1.7" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.6"; + version = "5.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz"; - sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz"; + sha512 = "CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg=="; }; }; "parse-json-2.2.0" = { @@ -10066,13 +9913,22 @@ let sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; - "path-scurry-1.10.1" = { + "path-scurry-1.11.1" = { name = "path-scurry"; packageName = "path-scurry"; - version = "1.10.1"; + version = "1.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz"; + sha512 = "Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="; + }; + }; + "path-to-regexp-0.1.10" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz"; - sha512 = "MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ=="; + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz"; + sha512 = "7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="; }; }; "path-to-regexp-0.1.7" = { @@ -10111,6 +9967,15 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; + "path-type-5.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz"; + sha512 = "5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg=="; + }; + }; "pbkdf2-3.1.2" = { name = "pbkdf2"; packageName = "pbkdf2"; @@ -10147,13 +10012,13 @@ let sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; }; }; - "picocolors-1.0.0" = { + "picocolors-1.1.0" = { name = "picocolors"; packageName = "picocolors"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; - sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz"; + sha512 = "TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="; }; }; "picomatch-2.3.1" = { @@ -10291,6 +10156,15 @@ let sha512 = "xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="; }; }; + "possible-typed-array-names-1.0.0" = { + name = "possible-typed-array-names"; + packageName = "possible-typed-array-names"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz"; + sha512 = "d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q=="; + }; + }; "postcss-7.0.39" = { name = "postcss"; packageName = "postcss"; @@ -10300,13 +10174,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.33" = { + "postcss-8.4.47" = { name = "postcss"; packageName = "postcss"; - version = "8.4.33"; + version = "8.4.47"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz"; - sha512 = "Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz"; + sha512 = "56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ=="; }; }; "postcss-calc-7.0.5" = { @@ -10606,13 +10480,13 @@ let sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; - "postcss-selector-parser-6.0.15" = { + "postcss-selector-parser-6.1.2" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.15"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz"; - sha512 = "rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz"; + sha512 = "Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg=="; }; }; "postcss-svgo-4.0.3" = { @@ -10696,6 +10570,15 @@ let sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; }; }; + "proc-log-4.2.0" = { + name = "proc-log"; + packageName = "proc-log"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz"; + sha512 = "g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA=="; + }; + }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -10831,13 +10714,13 @@ let sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; }; }; - "pump-3.0.0" = { + "pump-3.0.2" = { name = "pump"; packageName = "pump"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + url = "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz"; + sha512 = "tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw=="; }; }; "pumpify-1.5.1" = { @@ -10876,22 +10759,13 @@ let sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; }; }; - "qs-6.11.0" = { - name = "qs"; - packageName = "qs"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"; - sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; - }; - }; - "qs-6.11.2" = { + "qs-6.13.0" = { name = "qs"; packageName = "qs"; - version = "6.11.2"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz"; - sha512 = "tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA=="; + url = "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz"; + sha512 = "+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg=="; }; }; "qs-6.5.1" = { @@ -11011,13 +10885,13 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; - "raw-body-2.5.1" = { + "raw-body-2.5.2" = { name = "raw-body"; packageName = "raw-body"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; - sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz"; + sha512 = "8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA=="; }; }; "rc-1.2.8" = { @@ -11155,6 +11029,15 @@ let sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; + "readdirp-4.0.1" = { + name = "readdirp"; + packageName = "readdirp"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz"; + sha512 = "GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw=="; + }; + }; "recursive-readdir-2.2.2" = { name = "recursive-readdir"; packageName = "recursive-readdir"; @@ -11164,13 +11047,13 @@ let sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; }; }; - "reflect-metadata-0.2.1" = { + "reflect-metadata-0.2.2" = { name = "reflect-metadata"; packageName = "reflect-metadata"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.1.tgz"; - sha512 = "i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw=="; + url = "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz"; + sha512 = "urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q=="; }; }; "regenerate-1.4.2" = { @@ -11182,13 +11065,13 @@ let sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; - "regenerate-unicode-properties-10.1.1" = { + "regenerate-unicode-properties-10.2.0" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "10.1.1"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz"; - sha512 = "X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz"; + sha512 = "DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA=="; }; }; "regenerator-runtime-0.11.1" = { @@ -11236,13 +11119,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp.prototype.flags-1.5.1" = { + "regexp.prototype.flags-1.5.2" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz"; - sha512 = "sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz"; + sha512 = "NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw=="; }; }; "regexpu-core-5.3.2" = { @@ -11515,6 +11398,15 @@ let sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; }; }; + "restore-cursor-4.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz"; + sha512 = "I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg=="; + }; + }; "ret-0.1.15" = { name = "ret"; packageName = "ret"; @@ -11587,13 +11479,13 @@ let sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; - "rimraf-5.0.5" = { + "rimraf-5.0.10" = { name = "rimraf"; packageName = "rimraf"; - version = "5.0.5"; + version = "5.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz"; - sha512 = "CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz"; + sha512 = "l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ=="; }; }; "ripemd160-2.0.2" = { @@ -11605,13 +11497,13 @@ let sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; }; }; - "rollup-3.29.4" = { + "rollup-4.22.5" = { name = "rollup"; packageName = "rollup"; - version = "3.29.4"; + version = "4.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz"; - sha512 = "oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-4.22.5.tgz"; + sha512 = "WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w=="; }; }; "run-async-2.4.1" = { @@ -11650,13 +11542,22 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "safe-array-concat-1.0.1" = { - name = "safe-array-concat"; + "rxjs-7.8.1" = { + name = "rxjs"; + packageName = "rxjs"; + version = "7.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz"; + sha512 = "AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg=="; + }; + }; + "safe-array-concat-1.1.2" = { + name = "safe-array-concat"; packageName = "safe-array-concat"; - version = "1.0.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz"; - sha512 = "6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q=="; + url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz"; + sha512 = "vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q=="; }; }; "safe-buffer-5.1.1" = { @@ -11695,13 +11596,13 @@ let sha512 = "aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg=="; }; }; - "safe-regex-test-1.0.0" = { + "safe-regex-test-1.0.3" = { name = "safe-regex-test"; packageName = "safe-regex-test"; - version = "1.0.0"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"; - sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; + url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz"; + sha512 = "CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw=="; }; }; "safename-1.0.2" = { @@ -11722,13 +11623,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.69.7" = { + "sass-1.79.3" = { name = "sass"; packageName = "sass"; - version = "1.69.7"; + version = "1.79.3"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.69.7.tgz"; - sha512 = "rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ=="; + url = "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz"; + sha512 = "m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA=="; + }; + }; + "sass-embedded-1.79.3" = { + name = "sass-embedded"; + packageName = "sass-embedded"; + version = "1.79.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.79.3.tgz"; + sha512 = "zUve2qCn6uSOMZnZazLzrDWq//OQWFle5G45vJjv3B/ADIA3TXVgqHqN3u7D2vGajOGREz0HN5nhliSoKmQqZA=="; }; }; "sax-1.2.4" = { @@ -11749,6 +11659,15 @@ let sha512 = "0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="; }; }; + "sax-1.4.1" = { + name = "sax"; + packageName = "sax"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz"; + sha512 = "+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="; + }; + }; "schema-utils-0.4.7" = { name = "schema-utils"; packageName = "schema-utils"; @@ -11830,13 +11749,13 @@ let sha512 = "BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="; }; }; - "semver-7.5.4" = { + "semver-7.6.3" = { name = "semver"; packageName = "semver"; - version = "7.5.4"; + version = "7.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"; - sha512 = "1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="; + url = "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz"; + sha512 = "oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="; }; }; "semver-regex-3.1.4" = { @@ -11875,13 +11794,13 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; - "send-0.18.0" = { + "send-0.19.0" = { name = "send"; packageName = "send"; - version = "0.18.0"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; - sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; + url = "https://registry.npmjs.org/send/-/send-0.19.0.tgz"; + sha512 = "dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw=="; }; }; "serialize-javascript-1.9.1" = { @@ -11929,13 +11848,13 @@ let sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; - "serve-static-1.15.0" = { + "serve-static-1.16.2" = { name = "serve-static"; packageName = "serve-static"; - version = "1.15.0"; + version = "1.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz"; + sha512 = "VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw=="; }; }; "set-blocking-2.0.0" = { @@ -11947,22 +11866,22 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; - "set-function-length-1.1.1" = { + "set-function-length-1.2.2" = { name = "set-function-length"; packageName = "set-function-length"; - version = "1.1.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz"; - sha512 = "VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ=="; + url = "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz"; + sha512 = "pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="; }; }; - "set-function-name-2.0.1" = { + "set-function-name-2.0.2" = { name = "set-function-name"; packageName = "set-function-name"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz"; - sha512 = "tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA=="; + url = "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz"; + sha512 = "7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ=="; }; }; "set-value-2.0.1" = { @@ -12073,13 +11992,22 @@ let sha512 = "V0iQEZ/uoem3NmD91rD8XiuozJnq9/ZJnbHVXHnWqP1ucAhS3yJ7sLIIzEi57wFFcK3oi3kFUC46uSyWr35mxg=="; }; }; - "side-channel-1.0.4" = { + "shell-quote-1.8.1" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz"; + sha512 = "6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA=="; + }; + }; + "side-channel-1.0.6" = { name = "side-channel"; packageName = "side-channel"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz"; + sha512 = "fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA=="; }; }; "signal-exit-3.0.7" = { @@ -12100,13 +12028,13 @@ let sha512 = "bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="; }; }; - "simple-git-3.22.0" = { + "simple-git-3.27.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.22.0"; + version = "3.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.22.0.tgz"; - sha512 = "6JujwSs0ac82jkGjMHiCnTifvf1crOiY/+tfs/Pqih6iow7VrpNKRRNdWm6RtaXpvvv/JGNYhlUtLhGFqHF+Yw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.27.0.tgz"; + sha512 = "ivHoFS9Yi9GY49ogc6/YAi3Fl9ROnF4VyubNylgCkA+RVqLaKWnDSzXOVzya8csELIaWaYNutsEuAhZrtOjozA=="; }; }; "simple-swizzle-0.2.2" = { @@ -12163,6 +12091,15 @@ let sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; }; }; + "slash-5.1.0" = { + name = "slash"; + packageName = "slash"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz"; + sha512 = "ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg=="; + }; + }; "slice-ansi-4.0.0" = { name = "slice-ansi"; packageName = "slice-ansi"; @@ -12235,22 +12172,22 @@ let sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; - "socks-2.7.1" = { + "socks-2.8.3" = { name = "socks"; packageName = "socks"; - version = "2.7.1"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"; - sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; + url = "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz"; + sha512 = "l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw=="; }; }; - "socks-proxy-agent-7.0.0" = { + "socks-proxy-agent-8.0.4" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "7.0.0"; + version = "8.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"; - sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz"; + sha512 = "GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw=="; }; }; "sort-keys-1.1.2" = { @@ -12298,13 +12235,13 @@ let sha512 = "l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="; }; }; - "source-map-js-1.0.2" = { + "source-map-js-1.2.1" = { name = "source-map-js"; packageName = "source-map-js"; - version = "1.0.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"; - sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz"; + sha512 = "UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="; }; }; "source-map-resolve-0.5.3" = { @@ -12343,13 +12280,13 @@ let sha512 = "kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA=="; }; }; - "spdx-exceptions-2.3.0" = { + "spdx-exceptions-2.5.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.3.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz"; + sha512 = "PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w=="; }; }; "spdx-expression-parse-3.0.1" = { @@ -12361,13 +12298,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.16" = { + "spdx-license-ids-3.0.20" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.16"; + version = "3.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz"; - sha512 = "eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz"; + sha512 = "jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw=="; }; }; "spdy-4.0.2" = { @@ -12415,6 +12352,15 @@ let sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; + "sprintf-js-1.1.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz"; + sha512 = "Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="; + }; + }; "sshpk-1.18.0" = { name = "sshpk"; packageName = "sshpk"; @@ -12424,13 +12370,13 @@ let sha512 = "2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ=="; }; }; - "ssri-10.0.5" = { + "ssri-10.0.6" = { name = "ssri"; packageName = "ssri"; - version = "10.0.5"; + version = "10.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz"; - sha512 = "bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A=="; + url = "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz"; + sha512 = "MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ=="; }; }; "ssri-5.3.0" = { @@ -12541,13 +12487,13 @@ let sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; }; }; - "stream-shift-1.0.1" = { + "stream-shift-1.0.3" = { name = "stream-shift"; packageName = "stream-shift"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; - sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz"; + sha512 = "76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ=="; }; }; "streamsearch-1.1.0" = { @@ -12631,31 +12577,31 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string.prototype.trim-1.2.8" = { + "string.prototype.trim-1.2.9" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz"; - sha512 = "lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz"; + sha512 = "klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw=="; }; }; - "string.prototype.trimend-1.0.7" = { + "string.prototype.trimend-1.0.8" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz"; - sha512 = "Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz"; + sha512 = "p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ=="; }; }; - "string.prototype.trimstart-1.0.7" = { + "string.prototype.trimstart-1.0.8" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz"; - sha512 = "NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz"; + sha512 = "UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg=="; }; }; "string_decoder-0.10.31" = { @@ -12829,13 +12775,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylus-0.62.0" = { + "stylus-0.63.0" = { name = "stylus"; packageName = "stylus"; - version = "0.62.0"; + version = "0.63.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.62.0.tgz"; - sha512 = "v3YCf31atbwJQIMtPNX8hcQ+okD4NQaTuKGUWfII8eaqn+3otrbttGL1zSMZAAtiPsBztQnujVBugg/cXFUpyg=="; + url = "https://registry.npmjs.org/stylus/-/stylus-0.63.0.tgz"; + sha512 = "OMlgrTCPzE/ibtRMoeLVhOY0RcNuNWh0rhAVqeKnk/QwcuUKQbnqhZ1kg2vzD8VU/6h3FoPTq4RJPHgLBvX6Bw=="; }; }; "sudo-prompt-8.2.5" = { @@ -12910,6 +12856,15 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; + "supports-color-8.1.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; + }; + }; "supports-hyperlinks-2.3.0" = { name = "supports-hyperlinks"; packageName = "supports-hyperlinks"; @@ -12937,13 +12892,13 @@ let sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; }; }; - "table-6.8.1" = { + "table-6.8.2" = { name = "table"; packageName = "table"; - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.8.1.tgz"; - sha512 = "Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA=="; + url = "https://registry.npmjs.org/table/-/table-6.8.2.tgz"; + sha512 = "w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA=="; }; }; "tapable-1.1.3" = { @@ -12964,13 +12919,13 @@ let sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; }; }; - "tar-6.2.0" = { + "tar-6.2.1" = { name = "tar"; packageName = "tar"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz"; - sha512 = "/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ=="; + url = "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz"; + sha512 = "DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A=="; }; }; "temp-0.9.0" = { @@ -13036,13 +12991,22 @@ let sha512 = "zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ=="; }; }; - "terser-webpack-plugin-1.4.5" = { + "terser-5.34.0" = { + name = "terser"; + packageName = "terser"; + version = "5.34.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-5.34.0.tgz"; + sha512 = "y5NUX+U9HhVsK/zihZwoq4r9dICLyV2jXGOriDAVOeKhq3LKVjgJbGO90FisozXLlJfvjHqgckGmJFBb9KYoWQ=="; + }; + }; + "terser-webpack-plugin-1.4.6" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"; - sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.6.tgz"; + sha512 = "2lBVf/VMVIddjSn3GqbT90GvIJ/eYXJkt8cTzU7NbjKqK8fwv18Ftr4PlbF46b/e88743iZFL5Dtr/rC4hjIeA=="; }; }; "text-table-0.2.0" = { @@ -13054,6 +13018,15 @@ let sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; }; + "thingies-1.21.0" = { + name = "thingies"; + packageName = "thingies"; + version = "1.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz"; + sha512 = "hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g=="; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -13108,6 +13081,15 @@ let sha512 = "qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="; }; }; + "tiny-decoders-7.0.1" = { + name = "tiny-decoders"; + packageName = "tiny-decoders"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-decoders/-/tiny-decoders-7.0.1.tgz"; + sha512 = "P1LaHTLASl/lCrdtwgAAVwxt4bEAPmxpf9HMQrlCkAseaT8oH8oxm8ndy4nx5rLTcL5U/Qxp1a+FDoQfS/ZgQQ=="; + }; + }; "tmp-0.0.31" = { name = "tmp"; packageName = "tmp"; @@ -13225,13 +13207,13 @@ let sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; }; }; - "touch-3.1.0" = { + "touch-3.1.1" = { name = "touch"; packageName = "touch"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; - sha512 = "WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA=="; + url = "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz"; + sha512 = "r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA=="; }; }; "tough-cookie-2.4.3" = { @@ -13279,6 +13261,15 @@ let sha512 = "up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg=="; }; }; + "tree-dump-1.0.2" = { + name = "tree-dump"; + packageName = "tree-dump"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.2.tgz"; + sha512 = "dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ=="; + }; + }; "ts-debounce-4.0.0" = { name = "ts-debounce"; packageName = "ts-debounce"; @@ -13306,13 +13297,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.6.2" = { + "tslib-2.7.0" = { name = "tslib"; packageName = "tslib"; - version = "2.6.2"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"; - sha512 = "AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz"; + sha512 = "gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="; }; }; "tsyringe-4.8.0" = { @@ -13351,22 +13342,13 @@ let sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; - "type-1.2.0" = { - name = "type"; - packageName = "type"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; - sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; - }; - }; - "type-2.7.2" = { + "type-2.7.3" = { name = "type"; packageName = "type"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.7.2.tgz"; - sha512 = "dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="; + url = "https://registry.npmjs.org/type/-/type-2.7.3.tgz"; + sha512 = "8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ=="; }; }; "type-fest-0.10.0" = { @@ -13396,40 +13378,40 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typed-array-buffer-1.0.0" = { + "typed-array-buffer-1.0.2" = { name = "typed-array-buffer"; packageName = "typed-array-buffer"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz"; - sha512 = "Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw=="; + url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz"; + sha512 = "gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ=="; }; }; - "typed-array-byte-length-1.0.0" = { + "typed-array-byte-length-1.0.1" = { name = "typed-array-byte-length"; packageName = "typed-array-byte-length"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz"; - sha512 = "Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA=="; + url = "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz"; + sha512 = "3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw=="; }; }; - "typed-array-byte-offset-1.0.0" = { + "typed-array-byte-offset-1.0.2" = { name = "typed-array-byte-offset"; packageName = "typed-array-byte-offset"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz"; - sha512 = "RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg=="; + url = "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz"; + sha512 = "Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA=="; }; }; - "typed-array-length-1.0.4" = { + "typed-array-length-1.0.6" = { name = "typed-array-length"; packageName = "typed-array-length"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz"; - sha512 = "KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng=="; + url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz"; + sha512 = "/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g=="; }; }; "typedarray-0.0.6" = { @@ -13522,22 +13504,22 @@ let sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; - "undici-types-5.26.5" = { + "undici-types-6.19.8" = { name = "undici-types"; packageName = "undici-types"; - version = "5.26.5"; + version = "6.19.8"; src = fetchurl { - url = "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"; - sha512 = "JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="; + url = "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz"; + sha512 = "ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="; }; }; - "unicode-canonical-property-names-ecmascript-2.0.0" = { + "unicode-canonical-property-names-ecmascript-2.0.1" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; - sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz"; + sha512 = "dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg=="; }; }; "unicode-match-property-ecmascript-2.0.0" = { @@ -13549,13 +13531,13 @@ let sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; }; }; - "unicode-match-property-value-ecmascript-2.1.0" = { + "unicode-match-property-value-ecmascript-2.2.0" = { name = "unicode-match-property-value-ecmascript"; packageName = "unicode-match-property-value-ecmascript"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz"; - sha512 = "qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="; + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz"; + sha512 = "4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg=="; }; }; "unicode-property-aliases-ecmascript-2.1.0" = { @@ -13567,6 +13549,15 @@ let sha512 = "6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="; }; }; + "unicorn-magic-0.1.0" = { + name = "unicorn-magic"; + packageName = "unicorn-magic"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz"; + sha512 = "lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ=="; + }; + }; "union-value-1.0.1" = { name = "union-value"; packageName = "union-value"; @@ -13675,13 +13666,13 @@ let sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ=="; }; }; - "unzip-stream-0.3.1" = { + "unzip-stream-0.3.4" = { name = "unzip-stream"; packageName = "unzip-stream"; - version = "0.3.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.1.tgz"; - sha512 = "RzaGXLNt+CW+T41h1zl6pGz3EaeVhYlK+rdAap+7DxW5kqsqePO8kRtWPaCiVqdhZc86EctSPVYNix30YOMzmw=="; + url = "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.4.tgz"; + sha512 = "PyofABPVv+d7fL7GOpusx7eRT9YETY2X04PhwbSipdj6bMxVCFJrr+nm0Mxqbf9hUiTin/UsnuFWBXlDZFy0Cw=="; }; }; "upath-1.2.0" = { @@ -13702,13 +13693,13 @@ let sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w=="; }; }; - "update-browserslist-db-1.0.13" = { + "update-browserslist-db-1.1.1" = { name = "update-browserslist-db"; packageName = "update-browserslist-db"; - version = "1.0.13"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz"; - sha512 = "xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg=="; + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz"; + sha512 = "R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A=="; }; }; "upgrade-1.1.0" = { @@ -13738,13 +13729,13 @@ let sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="; }; }; - "url-0.11.3" = { + "url-0.11.4" = { name = "url"; packageName = "url"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.11.3.tgz"; - sha512 = "6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw=="; + url = "https://registry.npmjs.org/url/-/url-0.11.4.tgz"; + sha512 = "oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg=="; }; }; "url-loader-4.1.1" = { @@ -13882,6 +13873,15 @@ let sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; + "varint-6.0.0" = { + name = "varint"; + packageName = "varint"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz"; + sha512 = "cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg=="; + }; + }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -13909,22 +13909,31 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; - "vite-4.3.9" = { + "vite-5.2.8" = { name = "vite"; packageName = "vite"; - version = "4.3.9"; + version = "5.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz"; - sha512 = "qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg=="; + url = "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz"; + sha512 = "OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA=="; }; }; - "vite-4.5.1" = { + "vite-5.4.8" = { name = "vite"; packageName = "vite"; - version = "4.5.1"; + version = "5.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz"; + sha512 = "FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ=="; + }; + }; + "vite-plugin-elm-watch-1.3.3" = { + name = "vite-plugin-elm-watch"; + packageName = "vite-plugin-elm-watch"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/vite/-/vite-4.5.1.tgz"; - sha512 = "AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA=="; + url = "https://registry.npmjs.org/vite-plugin-elm-watch/-/vite-plugin-elm-watch-1.3.3.tgz"; + sha512 = "rR78gmeYp08E4CvtpnZuumsmNXaG/XOJ/xtOVfEG3TOJqDChXy1DzE1pnPsERohbELkov7ZZPHRLGV1z2iyxKg=="; }; }; "vm-browserify-1.1.2" = { @@ -14179,13 +14188,13 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; - "which-3.0.1" = { + "which-4.0.0" = { name = "which"; packageName = "which"; - version = "3.0.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-3.0.1.tgz"; - sha512 = "XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg=="; + url = "https://registry.npmjs.org/which/-/which-4.0.0.tgz"; + sha512 = "GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg=="; }; }; "which-boxed-primitive-1.0.2" = { @@ -14215,13 +14224,13 @@ let sha512 = "iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="; }; }; - "which-typed-array-1.1.13" = { + "which-typed-array-1.1.15" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.13"; + version = "1.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz"; - sha512 = "P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz"; + sha512 = "oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA=="; }; }; "winston-2.1.1" = { @@ -14467,22 +14476,22 @@ let sha512 = "8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A=="; }; }; - "ws-5.2.3" = { + "ws-5.2.4" = { name = "ws"; packageName = "ws"; - version = "5.2.3"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz"; - sha512 = "jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA=="; + url = "https://registry.npmjs.org/ws/-/ws-5.2.4.tgz"; + sha512 = "fFCejsuC8f9kOSu9FYaOw8CdO68O3h5v0lg4p74o8JqWpwTf9tniOD+nOB78aWoVSS6WptVUmDrp/KPsMVBWFQ=="; }; }; - "ws-6.2.2" = { + "ws-6.2.3" = { name = "ws"; packageName = "ws"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz"; - sha512 = "zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="; + url = "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz"; + sha512 = "jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA=="; }; }; "ws-7.1.1" = { @@ -14494,13 +14503,13 @@ let sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; - "ws-7.5.9" = { + "ws-7.5.10" = { name = "ws"; packageName = "ws"; - version = "7.5.9"; + version = "7.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; - sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz"; + sha512 = "+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="; }; }; "xmlbuilder-13.0.2" = { @@ -14703,7 +14712,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" + sources."aws4-1.13.2" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -14795,7 +14804,7 @@ in sources."minimist-1.2.0" sources."ms-2.0.0" sources."negotiator-0.6.3" - sources."node-watch-0.7.4" + sources."node-watch-0.5.5" sources."oauth-sign-0.9.0" sources."on-finished-2.3.0" sources."opn-5.4.0" @@ -14808,7 +14817,7 @@ in sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.3.1" + sources."punycode-1.4.1" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -14838,11 +14847,7 @@ in sources."through2-2.0.1" sources."tmp-0.0.31" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.4.3" sources."traverse-chain-0.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -14850,7 +14855,11 @@ in sources."typedarray-0.0.7" sources."ultron-1.0.2" sources."unpipe-1.0.0" - sources."uri-js-4.4.1" + (sources."uri-js-4.4.1" // { + dependencies = [ + sources."punycode-2.3.1" + ]; + }) sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -14881,7 +14890,6 @@ in sha512 = "flFXaCikbA6NccBEvrFIgJj9up7rc9A8aOwe0o0Erruvk5f5idWu3/gIBfqTaos7Xc2Fz6fshYyoH5sfyt1r7g=="; }; dependencies = [ - sources."abbrev-1.1.1" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -14891,15 +14899,15 @@ in sources."astral-regex-2.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" + sources."aws4-1.13.2" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."binwrap-0.2.3" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."buffers-0.1.1" sources."camelcase-5.3.1" sources."caseless-0.12.0" @@ -14953,7 +14961,8 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fill-range-7.0.1" + sources."fast-uri-3.0.2" + sources."fill-range-7.1.1" sources."find-0.2.9" (sources."find-elm-dependencies-2.0.2" // { dependencies = [ @@ -15030,7 +15039,6 @@ in sources."path-key-2.0.1" ]; }) - sources."nopt-1.0.10" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -15079,25 +15087,25 @@ in sources."has-flag-4.0.0" ]; }) - (sources."table-6.8.1" // { + (sources."table-6.8.2" // { dependencies = [ - sources."ajv-8.12.0" + sources."ajv-8.17.1" sources."json-schema-traverse-1.0.0" ]; }) - sources."tar-6.2.0" + sources."tar-6.2.1" sources."temp-0.9.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."touch-3.1.0" + sources."touch-3.1.1" sources."tough-cookie-2.5.0" sources."traverse-0.3.9" sources."traverse-chain-0.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-0.1.2" - (sources."unzip-stream-0.3.1" // { + (sources."unzip-stream-0.3.4" // { dependencies = [ sources."mkdirp-0.5.6" ]; @@ -15150,10 +15158,10 @@ in sources."async-limiter-1.0.1" sources."balanced-match-1.0.2" sources."batch-0.6.1" - sources."binary-extensions-2.2.0" - sources."body-parser-1.20.1" + sources."binary-extensions-2.3.0" + sources."body-parser-1.20.3" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."bufferutil-4.0.8" sources."bytes-3.1.2" (sources."cacheable-request-6.1.0" // { @@ -15162,9 +15170,9 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chalk-3.0.0" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -15172,46 +15180,51 @@ in sources."concat-map-0.0.1" sources."content-disposition-0.5.4" sources."content-type-1.0.5" - sources."cookie-0.5.0" + sources."cookie-0.6.0" sources."cookie-signature-1.0.6" sources."cross-spawn-7.0.3" - sources."debug-2.6.9" + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."depd-2.0.0" sources."destroy-1.2.0" sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" sources."end-of-stream-1.4.4" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.18.2" + sources."express-4.21.0" (sources."express-ws-4.0.0" // { dependencies = [ - sources."ws-5.2.3" + sources."ws-5.2.4" ]; }) - sources."fill-range-7.0.1" - sources."finalhandler-1.2.0" + sources."fill-range-7.1.1" + sources."finalhandler-1.3.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."gopd-1.0.1" sources."got-9.6.0" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" - sources."has-proto-1.0.1" + sources."has-property-descriptors-1.0.2" + sources."has-proto-1.0.3" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.2" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" @@ -15231,7 +15244,7 @@ in sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.52.0" @@ -15239,12 +15252,12 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."ms-2.0.0" + sources."ms-2.1.3" sources."negotiator-0.6.3" - sources."node-gyp-build-4.7.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."on-finished-2.4.1" sources."once-1.4.0" sources."open-7.4.2" @@ -15253,14 +15266,14 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" sources."picomatch-2.3.1" sources."prepend-http-2.0.0" sources."proxy-addr-2.0.7" - sources."pump-3.0.0" - sources."qs-6.11.0" + sources."pump-3.0.2" + sources."qs-6.13.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."rc-1.2.8" sources."readdirp-3.6.0" sources."registry-auth-token-4.2.2" @@ -15270,9 +15283,9 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.3.1" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ - sources."ms-2.1.3" + sources."encodeurl-1.0.2" ]; }) (sources."serve-index-1.9.1" // { @@ -15284,12 +15297,12 @@ in sources."statuses-1.5.0" ]; }) - sources."serve-static-1.15.0" - sources."set-function-length-1.1.1" + sources."serve-static-1.16.2" + sources."set-function-length-1.2.2" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.6" sources."statuses-2.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" @@ -15305,7 +15318,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-7.5.10" ]; buildInputs = globalBuildInputs; meta = { @@ -15331,23 +15344,22 @@ in sources."@nodelib/fs.walk-1.2.8" sources."anymatch-3.1.3" sources."array-union-2.1.0" - sources."binary-extensions-2.2.0" - sources."braces-3.0.2" - sources."chokidar-3.5.3" + sources."binary-extensions-2.3.0" + sources."braces-3.0.3" + sources."chokidar-3.6.0" sources."cross-spawn-7.0.3" sources."dir-glob-3.0.1" sources."escape-string-regexp-4.0.0" sources."execa-5.1.1" sources."fast-diff-1.3.0" sources."fast-glob-3.3.2" - sources."fastq-1.16.0" - sources."fill-range-7.0.1" - sources."fsevents-2.3.3" + sources."fastq-1.17.1" + sources."fill-range-7.1.1" sources."get-stream-6.0.1" sources."glob-parent-5.1.2" sources."globby-11.1.0" sources."human-signals-2.1.0" - sources."ignore-5.3.0" + sources."ignore-5.3.2" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -15356,7 +15368,7 @@ in sources."isexe-2.0.0" sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.5" + sources."micromatch-4.0.8" sources."mimic-fn-2.1.0" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" @@ -15367,7 +15379,7 @@ in sources."pjson-1.0.9" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" - sources."reflect-metadata-0.2.1" + sources."reflect-metadata-0.2.2" sources."request-light-0.7.0" sources."reusify-1.0.4" sources."run-parallel-1.2.0" @@ -15402,61 +15414,46 @@ in elm-land = nodeEnv.buildNodePackage { name = "elm-land"; packageName = "elm-land"; - version = "0.19.5"; + version = "0.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-land/-/elm-land-0.19.5.tgz"; - sha512 = "OWcnWmd+BMzRlyLpjkKjmazUJeKlgvXsPJcrhdVYhfeSdAbDDcAok7CgvSoqReN6Y36DEUUeRE5AGJMj8HVUOA=="; + url = "https://registry.npmjs.org/elm-land/-/elm-land-0.20.1.tgz"; + sha512 = "AY8BxYNT7mblaIO9SS2YQPdskZdMsLL6fqjAA5bORdkGIRDkMeaw+rXgiVSHUM2+TK0k/ld0TdQEAd24Moi5nw=="; }; dependencies = [ - sources."@adobe/css-tools-4.3.2" - sources."@esbuild/android-arm-0.17.19" - sources."@esbuild/android-arm64-0.17.19" - sources."@esbuild/android-x64-0.17.19" - sources."@esbuild/darwin-arm64-0.17.19" - sources."@esbuild/darwin-x64-0.17.19" - sources."@esbuild/freebsd-arm64-0.17.19" - sources."@esbuild/freebsd-x64-0.17.19" - sources."@esbuild/linux-arm-0.17.19" - sources."@esbuild/linux-arm64-0.17.19" - sources."@esbuild/linux-ia32-0.17.19" - sources."@esbuild/linux-loong64-0.17.19" - sources."@esbuild/linux-mips64el-0.17.19" - sources."@esbuild/linux-ppc64-0.17.19" - sources."@esbuild/linux-riscv64-0.17.19" - sources."@esbuild/linux-s390x-0.17.19" - sources."@esbuild/linux-x64-0.17.19" - sources."@esbuild/netbsd-x64-0.17.19" - sources."@esbuild/openbsd-x64-0.17.19" - sources."@esbuild/sunos-x64-0.17.19" - sources."@esbuild/win32-arm64-0.17.19" - sources."@esbuild/win32-ia32-0.17.19" - sources."@esbuild/win32-x64-0.17.19" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.5" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.20" - sources."@types/node-20.10.6" - sources."acorn-8.11.3" + sources."@adobe/css-tools-4.3.3" + sources."@jridgewell/gen-mapping-0.3.5" + sources."@jridgewell/resolve-uri-3.1.2" + sources."@jridgewell/set-array-1.2.1" + sources."@jridgewell/source-map-0.3.6" + sources."@jridgewell/sourcemap-codec-1.5.0" + sources."@jridgewell/trace-mapping-0.3.25" + sources."@lydell/elm-0.19.1-14" + sources."@lydell/elm_darwin_arm64-0.19.1-3" + sources."@lydell/elm_darwin_x64-0.19.1-2" + sources."@lydell/elm_linux_arm-0.19.1-0" + sources."@lydell/elm_linux_arm64-0.19.1-4" + sources."@lydell/elm_linux_x64-0.19.1-1" + sources."@lydell/elm_win32_x64-0.19.1-1" + sources."@types/estree-1.0.6" + sources."@types/node-22.7.3" + sources."acorn-8.12.1" sources."anymatch-3.1.3" sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."buffer-from-1.1.2" sources."chokidar-3.5.3" sources."commander-2.20.3" sources."concat-map-0.0.1" sources."copy-anything-2.0.6" - sources."cross-spawn-6.0.5" - sources."debug-4.3.4" + sources."cross-spawn-7.0.3" + sources."debug-4.3.7" + sources."detect-libc-1.0.3" sources."elm-0.19.1-6" sources."errno-0.1.8" - sources."esbuild-0.17.19" - sources."fill-range-7.0.1" - sources."find-elm-dependencies-2.0.4" - sources."firstline-1.3.1" + sources."esbuild-0.20.2" + sources."fill-range-7.1.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" sources."glob-7.2.3" @@ -15464,7 +15461,7 @@ in sources."graceful-fs-4.2.11" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.3.4" + sources."immutable-4.3.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" @@ -15473,54 +15470,62 @@ in sources."is-number-7.0.0" sources."is-what-3.14.1" sources."isexe-2.0.0" + sources."launch-editor-2.6.1" sources."less-4.2.0" - sources."lodash-4.17.21" + sources."lightningcss-1.27.0" sources."make-dir-2.1.0" sources."mime-1.6.0" sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."nanoid-3.3.7" sources."needle-3.3.1" - sources."nice-try-1.0.5" - sources."node-elm-compiler-5.0.6" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."parse-node-version-1.0.1" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."picocolors-1.0.0" + sources."path-key-3.1.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.33" + sources."postcss-8.4.47" sources."prr-1.0.1" sources."readdirp-3.6.0" - sources."rimraf-2.6.3" - sources."rollup-3.29.4" + sources."rollup-4.22.5" sources."safer-buffer-2.1.2" - sources."sass-1.69.7" - sources."sax-1.3.0" + (sources."sass-1.79.3" // { + dependencies = [ + sources."chokidar-4.0.1" + sources."readdirp-4.0.1" + ]; + }) + sources."sax-1.4.1" sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."shell-quote-1.8.1" sources."source-map-0.6.1" - sources."source-map-js-1.0.2" + sources."source-map-js-1.2.1" sources."source-map-support-0.5.21" - (sources."stylus-0.62.0" // { + (sources."stylus-0.63.0" // { dependencies = [ + sources."sax-1.3.0" sources."source-map-0.7.4" ]; }) sources."sugarss-4.0.1" - sources."temp-0.9.4" sources."terser-5.15.1" + sources."tiny-decoders-7.0.1" sources."to-regex-range-5.0.1" - sources."tslib-2.6.2" + sources."tslib-2.7.0" sources."typescript-4.9.3" - sources."undici-types-5.26.5" - sources."vite-4.3.9" - sources."which-1.3.1" + sources."undici-types-6.19.8" + sources."vite-5.2.8" + (sources."vite-plugin-elm-watch-1.3.3" // { + dependencies = [ + sources."terser-5.26.0" + ]; + }) + sources."which-2.0.2" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -15546,8 +15551,8 @@ in sources."ansi-styles-2.2.1" sources."anymatch-3.1.3" sources."async-limiter-1.0.1" - sources."binary-extensions-2.2.0" - sources."braces-3.0.2" + sources."binary-extensions-2.3.0" + sources."braces-3.0.3" sources."chalk-1.1.3" sources."charenc-0.0.2" sources."chokidar-3.0.2" @@ -15573,9 +15578,9 @@ in sources."cross-spawn-6.0.5" ]; }) - sources."fill-range-7.0.1" + sources."fill-range-7.1.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.15.4" + sources."follow-redirects-1.15.9" sources."fresh-0.5.2" sources."fsevents-2.3.3" sources."get-stream-4.1.0" @@ -15612,7 +15617,7 @@ in sources."pem-1.14.2" sources."picomatch-2.3.1" sources."pseudomap-1.0.2" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."range-parser-1.2.1" sources."readdirp-3.6.0" sources."requires-port-1.0.0" @@ -15653,34 +15658,32 @@ in elm-spa = nodeEnv.buildNodePackage { name = "elm-spa"; packageName = "elm-spa"; - version = "6.0.4"; + version = "6.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/elm-spa/-/elm-spa-6.0.4.tgz"; - sha512 = "TiOBuxL1SrzqYyWkime3AZ1/xFqKa6B/Bi4SplFg7YmlwPL5d7R+u6w0dxc14cnvmP1RS2+QZAkczZtqayFK9A=="; + url = "https://registry.npmjs.org/elm-spa/-/elm-spa-6.0.6.tgz"; + sha512 = "FslLqKt2D5EjMJjtYU55P9xu/LGNnWL8pTzWAaOtTTFkNq2vVXFEknXRq1SCahicMEPRp+26r7NvawV+XuAxMA=="; }; dependencies = [ sources."anymatch-3.1.3" sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."chokidar-3.4.2" sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" - sources."d-1.0.1" + sources."d-1.0.2" sources."debug-2.6.9" - sources."es5-ext-0.10.62" + sources."es5-ext-0.10.64" sources."es6-iterator-2.0.3" - sources."es6-symbol-3.1.3" - (sources."ext-1.7.0" // { - dependencies = [ - sources."type-2.7.2" - ]; - }) - sources."fill-range-7.0.1" + sources."es6-symbol-3.1.4" + sources."esniff-2.0.1" + sources."event-emitter-0.3.5" + sources."ext-1.7.0" + sources."fill-range-7.1.1" sources."find-elm-dependencies-2.0.4" sources."firstline-1.3.1" sources."fs.realpath-1.0.0" @@ -15704,7 +15707,7 @@ in sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-elm-compiler-5.0.5" - sources."node-gyp-build-4.7.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -15724,7 +15727,7 @@ in sources."temp-0.9.4" sources."terser-5.3.8" sources."to-regex-range-5.0.1" - sources."type-1.2.0" + sources."type-2.7.3" sources."typedarray-to-buffer-3.1.5" sources."utf-8-validate-5.0.10" sources."websocket-1.0.32" @@ -15735,7 +15738,7 @@ in buildInputs = globalBuildInputs; meta = { description = "single page apps made easy"; - homepage = "https://github.com/ryannhg/elm-spa#readme"; + homepage = "https://github.com/ryan-haskell/elm-spa#readme"; license = "BSD-3-Clause"; }; production = true; @@ -15754,19 +15757,18 @@ in sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."brace-expansion-2.0.1" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."chalk-4.1.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-9.5.0" sources."cross-spawn-7.0.3" sources."elm-solve-deps-wasm-1.0.2" - sources."fill-range-7.0.1" + sources."fill-range-7.1.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."glob-8.1.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.11" @@ -15818,7 +15820,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.10.6" + sources."@types/node-22.7.3" sources."@types/responselike-1.0.3" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.4" @@ -15849,7 +15851,6 @@ in sources."jsonfile-4.0.0" sources."keyv-4.5.4" sources."lowercase-keys-2.0.0" - sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" sources."normalize-url-6.1.0" sources."npm-conf-1.1.3" @@ -15860,20 +15861,19 @@ in sources."p-timeout-3.2.0" sources."pify-3.0.0" sources."proto-list-1.2.4" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."responselike-2.0.1" sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.5.4" + sources."semver-7.6.3" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."universalify-0.1.2" sources."url-to-options-1.0.1" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."yallist-4.0.0" sources."yn-4.0.0" ]; buildInputs = globalBuildInputs; @@ -15889,36 +15889,18 @@ in elm-verify-examples = nodeEnv.buildNodePackage { name = "elm-verify-examples"; packageName = "elm-verify-examples"; - version = "5.3.0"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.3.0.tgz"; - sha512 = "6TG+4L/yEamiHpxVQUJPRgHoeEOmk5LhWuVRECMHTKPpvuM2BCYMGwCMUGJ0Wh64RW8oERIdnicsvUDlvDwiTg=="; + url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-6.0.3.tgz"; + sha512 = "VgZpUwYik+d7u9ZDLhbTEMN/MIE7qJ9OQRtreGmwE9ehr+JSJvnKcpZwGILIHjiNWjZqarx4d6vA2OtLZm48AA=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" - sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.3" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" sources."balanced-match-1.0.2" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-0.3.0" - sources."binary-extensions-2.2.0" - sources."binwrap-0.2.2" - sources."bluebird-3.7.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."buffers-0.1.1" - sources."caseless-0.12.0" - sources."chainsaw-0.1.0" + sources."brace-expansion-2.0.1" sources."chalk-4.1.2" - sources."chokidar-3.2.1" - sources."chownr-1.1.4" (sources."cliui-8.0.1" // { dependencies = [ sources."emoji-regex-8.0.0" @@ -15929,151 +15911,32 @@ in }) sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" - (sources."cross-spawn-7.0.0" // { - dependencies = [ - sources."which-1.3.1" - ]; - }) - sources."dashdash-1.14.1" - sources."delayed-stream-1.0.0" + sources."cross-spawn-7.0.3" sources."eastasianwidth-0.2.0" - sources."ecc-jsbn-0.1.2" - (sources."elm-test-0.19.1" // { - dependencies = [ - sources."ansi-styles-3.2.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."fs-extra-8.1.0" - sources."has-flag-3.0.0" - (sources."supports-color-7.1.0" // { - dependencies = [ - sources."has-flag-4.0.0" - ]; - }) - ]; - }) - sources."elmi-to-json-1.2.0" sources."emoji-regex-9.2.2" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fill-range-7.0.1" - (sources."find-elm-dependencies-2.0.2" // { - dependencies = [ - sources."firstline-1.2.0" - ]; - }) - sources."find-parent-dir-0.3.1" - sources."firstline-2.0.2" - sources."foreground-child-3.1.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - (sources."fs-extra-11.2.0" // { - dependencies = [ - sources."jsonfile-6.1.0" - sources."universalify-2.0.1" - ]; - }) - sources."fs-minipass-1.2.7" - sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."escalade-3.2.0" + sources."foreground-child-3.3.0" + sources."fs-extra-11.2.0" sources."get-caller-file-2.0.5" - sources."getpass-0.1.7" - sources."glob-7.1.4" - sources."glob-parent-5.1.2" + sources."glob-10.4.5" sources."graceful-fs-4.2.11" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."has-flag-4.0.0" - sources."http-signature-1.2.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-binary-path-2.1.0" - sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-typedarray-1.0.0" sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jackspeak-2.3.6" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" - sources."jsprim-1.4.2" - sources."lodash-4.17.15" - sources."lru-cache-10.1.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" + sources."jackspeak-3.4.3" + sources."jsonfile-6.1.0" + sources."lru-cache-10.4.3" + sources."minimatch-9.0.5" + sources."minipass-7.1.2" sources."mkdirp-3.0.1" - sources."murmur-hash-js-1.0.0" - sources."mustache-3.2.1" - sources."nice-try-1.0.5" - (sources."node-elm-compiler-5.0.4" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."which-1.3.1" - ]; - }) - sources."normalize-path-3.0.0" - sources."oauth-sign-0.9.0" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" + sources."package-json-from-dist-1.0.1" sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - sources."performance-now-2.1.0" - sources."picomatch-2.3.1" - sources."psl-1.9.0" - sources."punycode-2.3.1" - sources."qs-6.5.3" - sources."readdirp-3.1.3" - sources."request-2.88.2" - sources."request-promise-4.2.6" - (sources."request-promise-core-1.1.4" // { - dependencies = [ - sources."lodash-4.17.21" - ]; - }) + sources."path-scurry-1.11.1" sources."require-directory-2.1.1" - (sources."rimraf-5.0.5" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" - ]; - }) - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."rimraf-5.0.10" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" - sources."split-1.0.1" - sources."sshpk-1.18.0" - sources."stealthy-require-1.1.1" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -16083,37 +15946,13 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" sources."supports-color-7.2.0" - (sources."tar-4.4.19" // { - dependencies = [ - sources."mkdirp-0.5.6" - ]; - }) - (sources."temp-0.9.0" // { - dependencies = [ - sources."rimraf-2.6.3" - ]; - }) - sources."through-2.3.8" - sources."to-regex-range-5.0.1" - sources."tough-cookie-2.5.0" - sources."traverse-0.3.9" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."universalify-0.1.2" - (sources."unzip-stream-0.3.1" // { - dependencies = [ - sources."mkdirp-0.5.6" - ]; - }) - sources."uri-js-4.4.1" - sources."uuid-3.4.0" - sources."verror-1.10.0" - sources."which-2.0.1" + sources."universalify-2.0.1" + sources."which-2.0.2" (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-styles-6.2.1" @@ -16126,10 +15965,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."wrappy-1.0.2" - sources."xmlbuilder-13.0.2" sources."y18n-5.0.8" - sources."yallist-3.1.1" (sources."yargs-17.7.2" // { dependencies = [ sources."emoji-regex-8.0.0" @@ -16203,47 +16039,44 @@ in }; dependencies = [ sources."@babel/cli-7.12.10" - sources."@babel/code-frame-7.23.5" - sources."@babel/compat-data-7.23.5" + sources."@babel/code-frame-7.24.7" + sources."@babel/compat-data-7.25.4" sources."@babel/core-7.12.10" - sources."@babel/generator-7.23.6" - sources."@babel/helper-annotate-as-pure-7.22.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" - (sources."@babel/helper-compilation-targets-7.23.6" // { + sources."@babel/generator-7.25.6" + sources."@babel/helper-annotate-as-pure-7.24.7" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.24.7" + (sources."@babel/helper-compilation-targets-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-class-features-plugin-7.23.7" // { + (sources."@babel/helper-create-class-features-plugin-7.25.4" // { dependencies = [ sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-regexp-features-plugin-7.22.15" // { + (sources."@babel/helper-create-regexp-features-plugin-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.22.20" - sources."@babel/helper-function-name-7.23.0" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-member-expression-to-functions-7.23.0" - sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.3" - sources."@babel/helper-optimise-call-expression-7.22.5" - sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.20" - sources."@babel/helper-replace-supers-7.22.20" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.23.4" - sources."@babel/helper-validator-identifier-7.22.20" - sources."@babel/helper-validator-option-7.23.5" - sources."@babel/helper-wrap-function-7.22.20" - sources."@babel/helpers-7.23.7" - sources."@babel/highlight-7.23.4" - sources."@babel/parser-7.23.6" + sources."@babel/helper-environment-visitor-7.24.7" + sources."@babel/helper-member-expression-to-functions-7.24.8" + sources."@babel/helper-module-imports-7.24.7" + sources."@babel/helper-module-transforms-7.25.2" + sources."@babel/helper-optimise-call-expression-7.24.7" + sources."@babel/helper-plugin-utils-7.24.8" + sources."@babel/helper-remap-async-to-generator-7.25.0" + sources."@babel/helper-replace-supers-7.25.0" + sources."@babel/helper-simple-access-7.24.7" + sources."@babel/helper-skip-transparent-expression-wrappers-7.24.7" + sources."@babel/helper-string-parser-7.24.8" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/helper-validator-option-7.24.8" + sources."@babel/helper-wrap-function-7.25.0" + sources."@babel/helpers-7.25.6" + sources."@babel/highlight-7.24.7" + sources."@babel/parser-7.25.6" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-dynamic-import-7.18.6" @@ -16269,74 +16102,74 @@ in sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.23.3" - sources."@babel/plugin-transform-async-to-generator-7.23.3" - sources."@babel/plugin-transform-block-scoped-functions-7.23.3" - sources."@babel/plugin-transform-block-scoping-7.23.4" - sources."@babel/plugin-transform-classes-7.23.5" - sources."@babel/plugin-transform-computed-properties-7.23.3" - sources."@babel/plugin-transform-destructuring-7.23.3" - sources."@babel/plugin-transform-dotall-regex-7.23.3" - sources."@babel/plugin-transform-duplicate-keys-7.23.3" - sources."@babel/plugin-transform-exponentiation-operator-7.23.3" - sources."@babel/plugin-transform-for-of-7.23.6" - sources."@babel/plugin-transform-function-name-7.23.3" - sources."@babel/plugin-transform-literals-7.23.3" - sources."@babel/plugin-transform-member-expression-literals-7.23.3" - sources."@babel/plugin-transform-modules-amd-7.23.3" - sources."@babel/plugin-transform-modules-commonjs-7.23.3" - sources."@babel/plugin-transform-modules-systemjs-7.23.3" - sources."@babel/plugin-transform-modules-umd-7.23.3" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" - sources."@babel/plugin-transform-new-target-7.23.3" - sources."@babel/plugin-transform-object-super-7.23.3" - sources."@babel/plugin-transform-parameters-7.23.3" - sources."@babel/plugin-transform-property-literals-7.23.3" - sources."@babel/plugin-transform-regenerator-7.23.3" - sources."@babel/plugin-transform-reserved-words-7.23.3" + sources."@babel/plugin-transform-arrow-functions-7.24.7" + sources."@babel/plugin-transform-async-to-generator-7.24.7" + sources."@babel/plugin-transform-block-scoped-functions-7.24.7" + sources."@babel/plugin-transform-block-scoping-7.25.0" + sources."@babel/plugin-transform-classes-7.25.4" + sources."@babel/plugin-transform-computed-properties-7.24.7" + sources."@babel/plugin-transform-destructuring-7.24.8" + sources."@babel/plugin-transform-dotall-regex-7.24.7" + sources."@babel/plugin-transform-duplicate-keys-7.24.7" + sources."@babel/plugin-transform-exponentiation-operator-7.24.7" + sources."@babel/plugin-transform-for-of-7.24.7" + sources."@babel/plugin-transform-function-name-7.25.1" + sources."@babel/plugin-transform-literals-7.25.2" + sources."@babel/plugin-transform-member-expression-literals-7.24.7" + sources."@babel/plugin-transform-modules-amd-7.24.7" + sources."@babel/plugin-transform-modules-commonjs-7.24.8" + sources."@babel/plugin-transform-modules-systemjs-7.25.0" + sources."@babel/plugin-transform-modules-umd-7.24.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.24.7" + sources."@babel/plugin-transform-new-target-7.24.7" + sources."@babel/plugin-transform-object-super-7.24.7" + sources."@babel/plugin-transform-parameters-7.24.7" + sources."@babel/plugin-transform-property-literals-7.24.7" + sources."@babel/plugin-transform-regenerator-7.24.7" + sources."@babel/plugin-transform-reserved-words-7.24.7" sources."@babel/plugin-transform-runtime-7.12.10" - sources."@babel/plugin-transform-shorthand-properties-7.23.3" - sources."@babel/plugin-transform-spread-7.23.3" - sources."@babel/plugin-transform-sticky-regex-7.23.3" - sources."@babel/plugin-transform-template-literals-7.23.3" - sources."@babel/plugin-transform-typeof-symbol-7.23.3" - sources."@babel/plugin-transform-unicode-escapes-7.23.3" - sources."@babel/plugin-transform-unicode-regex-7.23.3" + sources."@babel/plugin-transform-shorthand-properties-7.24.7" + sources."@babel/plugin-transform-spread-7.24.7" + sources."@babel/plugin-transform-sticky-regex-7.24.7" + sources."@babel/plugin-transform-template-literals-7.24.7" + sources."@babel/plugin-transform-typeof-symbol-7.24.8" + sources."@babel/plugin-transform-unicode-escapes-7.24.7" + sources."@babel/plugin-transform-unicode-regex-7.24.7" sources."@babel/preset-env-7.12.10" sources."@babel/preset-modules-0.1.6" sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.7" - sources."@babel/types-7.23.6" + sources."@babel/template-7.25.0" + sources."@babel/traverse-7.25.6" + sources."@babel/types-7.25.6" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.20" + sources."@jridgewell/gen-mapping-0.3.5" + sources."@jridgewell/resolve-uri-3.1.2" + sources."@jridgewell/set-array-1.2.1" + sources."@jridgewell/sourcemap-codec-1.5.0" + sources."@jridgewell/trace-mapping-0.3.25" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" - sources."@types/http-proxy-1.17.14" + sources."@types/http-proxy-1.17.15" sources."@types/json-schema-7.0.15" sources."@types/minimatch-5.1.2" - sources."@types/node-20.10.6" + sources."@types/node-22.7.3" sources."@types/parse-json-4.0.2" sources."@types/q-1.5.8" sources."@types/source-list-map-0.1.6" sources."@types/tapable-1.0.12" - (sources."@types/uglify-js-3.17.4" // { + (sources."@types/uglify-js-3.17.5" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.38" // { + (sources."@types/webpack-4.41.39" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -16384,7 +16217,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-buffer-byte-length-1.0.0" + sources."array-buffer-byte-length-1.0.1" sources."array-filter-0.0.1" sources."array-flatten-2.1.2" sources."array-map-0.0.1" @@ -16392,11 +16225,11 @@ in sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" - sources."array.prototype.reduce-1.0.6" - sources."arraybuffer.prototype.slice-1.0.2" + sources."array.prototype.reduce-1.0.7" + sources."arraybuffer.prototype.slice-1.0.3" sources."asap-2.0.6" sources."asn1-0.2.6" - (sources."asn1.js-5.4.1" // { + (sources."asn1.js-4.10.1" // { dependencies = [ sources."bn.js-4.12.0" ]; @@ -16420,9 +16253,9 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."autoprefixer-10.1.0" - sources."available-typed-arrays-1.0.5" + sources."available-typed-arrays-1.0.7" sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" + sources."aws4-1.13.2" sources."babel-extract-comments-1.0.0" (sources."babel-loader-8.2.2" // { dependencies = [ @@ -16448,16 +16281,15 @@ in sources."batch-0.6.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.2.1" - (sources."body-parser-1.20.1" // { + (sources."body-parser-1.20.3" // { dependencies = [ - sources."bytes-3.1.2" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.11.0" + sources."qs-6.13.0" ]; }) (sources."bonjour-3.5.0" // { @@ -16467,29 +16299,33 @@ in }) sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."brorand-1.1.0" sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.2" // { + (sources."browserify-rsa-4.1.1" // { dependencies = [ - sources."readable-stream-3.6.2" + sources."safe-buffer-5.2.1" + ]; + }) + (sources."browserify-sign-4.2.3" // { + dependencies = [ + sources."hash-base-3.0.4" sources."safe-buffer-5.2.1" ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.22.2" + sources."browserslist-4.24.0" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" - sources."bytes-3.0.0" + sources."bytes-3.1.2" sources."cacache-12.0.4" sources."cache-base-1.0.1" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."call-me-maybe-1.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -16497,7 +16333,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001574" + sources."caniuse-lite-1.0.30001664" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -16506,13 +16342,13 @@ in ]; }) sources."chardet-0.7.0" - (sources."chokidar-3.5.3" // { + (sources."chokidar-3.6.0" // { dependencies = [ sources."glob-parent-5.1.2" ]; }) sources."chownr-1.1.4" - sources."chrome-trace-event-1.0.3" + sources."chrome-trace-event-1.0.4" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -16553,6 +16389,7 @@ in sources."compressible-2.0.18" (sources."compression-1.7.4" // { dependencies = [ + sources."bytes-3.0.0" sources."debug-2.6.9" sources."ms-2.0.0" ]; @@ -16569,7 +16406,7 @@ in }) sources."content-type-1.0.5" sources."convert-source-map-1.9.0" - sources."cookie-0.5.0" + sources."cookie-0.6.0" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" @@ -16585,7 +16422,7 @@ in ]; }) sources."core-js-2.6.12" - sources."core-js-compat-3.35.0" + sources."core-js-compat-3.38.1" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -16609,18 +16446,17 @@ in dependencies = [ sources."camelcase-6.3.0" sources."loader-utils-2.0.4" - sources."lru-cache-6.0.0" sources."picocolors-0.2.1" sources."postcss-7.0.39" - sources."semver-7.5.4" + sources."semver-7.6.3" sources."source-map-0.6.1" - sources."yallist-4.0.0" ]; }) sources."css-select-4.3.0" sources."css-select-base-adapter-0.1.1" (sources."css-tree-1.0.0-alpha.37" // { dependencies = [ + sources."mdn-data-2.0.4" sources."source-map-0.6.1" ]; }) @@ -16653,19 +16489,21 @@ in (sources."csso-4.2.0" // { dependencies = [ sources."css-tree-1.1.3" - sources."mdn-data-2.0.14" sources."source-map-0.6.1" ]; }) sources."cycle-1.0.3" sources."cyclist-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.3.4" + sources."data-view-buffer-1.0.1" + sources."data-view-byte-length-1.0.1" + sources."data-view-byte-offset-1.0.0" + sources."debug-4.3.7" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.2" sources."deep-equal-0.2.2" sources."default-gateway-4.2.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."define-property-2.0.2" (sources."del-4.1.1" // { @@ -16710,8 +16548,8 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.622" - (sources."elliptic-6.5.4" // { + sources."electron-to-chromium-1.5.29" + (sources."elliptic-6.5.7" // { dependencies = [ sources."bn.js-4.12.0" ]; @@ -16738,7 +16576,7 @@ in sources."elm-webpack-loader-6.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-4.5.0" // { dependencies = [ @@ -16748,11 +16586,14 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.22.3" + sources."es-abstract-1.23.3" sources."es-array-method-boxes-properly-1.0.0" - sources."es-set-tostringtag-2.0.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" + sources."es-object-atoms-1.0.0" + sources."es-set-tostringtag-2.0.3" sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" + sources."escalade-3.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" sources."eslint-scope-4.0.3" @@ -16788,12 +16629,12 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."express-4.18.2" // { + (sources."express-4.21.0" // { dependencies = [ sources."array-flatten-1.1.1" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."safe-buffer-5.2.1" ]; }) @@ -16850,8 +16691,8 @@ in }) sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" - sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { + sources."fill-range-7.1.1" + (sources."finalhandler-1.3.1" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -16867,7 +16708,7 @@ in sources."find-up-4.1.0" sources."firstline-1.3.1" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.15.4" + sources."follow-redirects-1.15.9" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -16881,16 +16722,16 @@ in sources."fs-readdir-recursive-1.1.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" + sources."fsevents-1.2.13" sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" - sources."get-symbol-description-1.0.0" + sources."get-symbol-description-1.0.2" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -16907,7 +16748,7 @@ in ]; }) sources."globals-11.12.0" - sources."globalthis-1.0.3" + sources."globalthis-1.0.4" (sources."globby-7.1.1" // { dependencies = [ sources."pify-3.0.0" @@ -16927,10 +16768,10 @@ in sources."has-1.0.4" sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" - sources."has-proto-1.0.1" + sources."has-property-descriptors-1.0.2" + sources."has-proto-1.0.3" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" + sources."has-tostringtag-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -16949,7 +16790,7 @@ in ]; }) sources."hash.js-1.1.7" - sources."hasown-2.0.0" + sources."hasown-2.0.2" sources."he-1.2.0" sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" @@ -17008,15 +16849,15 @@ in ]; }) sources."internal-ip-4.3.0" - sources."internal-slot-1.0.6" + sources."internal-slot-1.0.7" sources."invert-kv-1.0.0" - sources."ip-1.1.8" + sources."ip-1.1.9" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.1" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.2" + sources."is-array-buffer-3.0.4" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -17024,8 +16865,9 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.7" sources."is-color-stop-1.1.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.1" sources."is-data-descriptor-1.0.1" + sources."is-data-view-1.0.1" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.3" sources."is-directory-0.3.1" @@ -17033,7 +16875,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" - sources."is-negative-zero-2.0.2" + sources."is-negative-zero-2.0.3" sources."is-number-7.0.0" sources."is-number-object-1.0.7" sources."is-obj-2.0.0" @@ -17046,11 +16888,11 @@ in sources."is-regexp-1.0.0" sources."is-resolvable-1.1.0" sources."is-root-2.0.0" - sources."is-shared-array-buffer-1.0.2" + sources."is-shared-array-buffer-1.0.3" sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" + sources."is-typed-array-1.1.13" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-weakref-1.0.2" @@ -17068,7 +16910,7 @@ in sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" - (sources."json-stable-stringify-1.1.0" // { + (sources."json-stable-stringify-1.1.1" // { dependencies = [ sources."isarray-2.0.5" ]; @@ -17104,20 +16946,20 @@ in sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lodash.uniq-4.5.0" - sources."loglevel-1.8.1" + sources."loglevel-1.9.2" sources."lower-case-2.0.2" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.5" - sources."mdn-data-2.0.4" + sources."mdn-data-2.0.14" sources."media-typer-0.3.0" sources."memory-fs-0.4.1" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.5" + sources."micromatch-4.0.8" (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.12.0" @@ -17144,11 +16986,11 @@ in }) sources."mkdirp-0.5.3" sources."move-concurrently-1.0.1" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" sources."mute-stream-0.0.8" - sources."nan-2.18.0" + sources."nan-2.20.0" sources."nanoid-3.3.7" sources."nanomatch-1.2.13" sources."ncp-1.0.1" @@ -17171,7 +17013,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -17192,15 +17034,15 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.13.1" - sources."object-is-1.1.5" + sources."object-inspect-1.13.2" + sources."object-is-1.1.6" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.5" - sources."object.entries-1.1.7" - sources."object.getownpropertydescriptors-2.1.7" + sources."object.entries-1.1.8" + sources."object.getownpropertydescriptors-2.1.8" sources."object.pick-1.3.0" - sources."object.values-1.1.7" + sources."object.values-1.2.0" sources."obuf-1.1.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -17226,7 +17068,12 @@ in sources."callsites-3.1.0" ]; }) - sources."parse-asn1-5.1.6" + (sources."parse-asn1-5.1.7" // { + dependencies = [ + sources."hash-base-3.0.4" + sources."safe-buffer-5.2.1" + ]; + }) sources."parse-json-4.0.0" sources."parse-passwd-1.0.0" sources."parseurl-1.3.3" @@ -17239,7 +17086,7 @@ in sources."path-is-inside-1.0.2" sources."path-key-3.1.1" sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" (sources."path-type-3.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -17247,7 +17094,7 @@ in }) sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" - sources."picocolors-1.0.0" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pinkie-2.0.4" @@ -17273,7 +17120,8 @@ in ]; }) sources."posix-character-classes-0.1.1" - sources."postcss-8.4.33" + sources."possible-typed-array-names-1.0.0" + sources."postcss-8.4.47" (sources."postcss-calc-7.0.5" // { dependencies = [ sources."picocolors-0.2.1" @@ -17337,13 +17185,11 @@ in sources."cosmiconfig-7.1.0" sources."import-fresh-3.3.0" sources."loader-utils-2.0.4" - sources."lru-cache-6.0.0" sources."parse-json-5.2.0" sources."path-type-4.0.0" sources."resolve-from-4.0.0" sources."schema-utils-3.3.0" - sources."semver-7.5.4" - sources."yallist-4.0.0" + sources."semver-7.6.3" ]; }) (sources."postcss-merge-longhand-4.0.11" // { @@ -17518,7 +17364,7 @@ in ]; }) sources."postcss-safe-parser-5.0.2" - sources."postcss-selector-parser-6.0.15" + sources."postcss-selector-parser-6.1.2" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."picocolors-0.2.1" @@ -17552,7 +17398,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."pump-3.0.0" + sources."pump-3.0.2" (sources."pumpify-1.5.1" // { dependencies = [ sources."pump-2.0.1" @@ -17567,11 +17413,7 @@ in sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { - dependencies = [ - sources."bytes-3.1.2" - ]; - }) + sources."raw-body-2.5.2" (sources."react-dev-utils-6.1.1" // { dependencies = [ sources."@babel/code-frame-7.0.0" @@ -17625,11 +17467,11 @@ in ]; }) sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.1" + sources."regenerate-unicode-properties-10.2.0" sources."regenerator-runtime-0.13.11" sources."regenerator-transform-0.15.2" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.5.1" + sources."regexp.prototype.flags-1.5.2" sources."regexpu-core-5.3.2" (sources."regjsparser-0.9.1" // { dependencies = [ @@ -17670,28 +17512,28 @@ in sources."tslib-1.14.1" ]; }) - (sources."safe-array-concat-1.0.1" // { + (sources."safe-array-concat-1.1.2" // { dependencies = [ sources."isarray-2.0.5" ]; }) sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."safe-regex-test-1.0.0" + sources."safe-regex-test-1.0.3" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."schema-utils-2.7.1" sources."select-hose-2.0.0" sources."selfsigned-1.10.14" sources."semver-5.7.2" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."ms-2.1.3" + sources."encodeurl-1.0.2" ]; }) sources."serialize-javascript-4.0.0" @@ -17706,10 +17548,10 @@ in sources."statuses-1.5.0" ]; }) - sources."serve-static-1.15.0" + sources."serve-static-1.16.2" sources."set-blocking-2.0.0" - sources."set-function-length-1.1.1" - sources."set-function-name-2.0.1" + sources."set-function-length-1.2.2" + sources."set-function-name-2.0.2" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -17721,7 +17563,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.6" sources."signal-exit-3.0.7" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -17763,7 +17605,7 @@ in sources."sort-keys-1.1.2" sources."source-list-map-2.0.1" sources."source-map-0.5.7" - sources."source-map-js-1.0.2" + sources."source-map-js-1.2.1" sources."source-map-resolve-0.5.3" (sources."source-map-support-0.5.21" // { dependencies = [ @@ -17772,9 +17614,9 @@ in }) sources."source-map-url-0.4.1" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.20" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -17798,7 +17640,7 @@ in sources."stream-browserify-2.0.2" sources."stream-each-1.2.3" sources."stream-http-2.8.3" - sources."stream-shift-1.0.1" + sources."stream-shift-1.0.3" sources."strict-uri-encode-1.1.0" sources."string-replace-loader-2.3.0" (sources."string-width-4.2.3" // { @@ -17806,9 +17648,9 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."string.prototype.trim-1.2.8" - sources."string.prototype.trimend-1.0.7" - sources."string.prototype.trimstart-1.0.7" + sources."string.prototype.trim-1.2.9" + sources."string.prototype.trimend-1.0.8" + sources."string.prototype.trimstart-1.0.8" sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -17860,7 +17702,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.5" // { + (sources."terser-webpack-plugin-1.4.6" // { dependencies = [ sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" @@ -17890,15 +17732,15 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" - sources."tslib-2.6.2" + sources."tslib-2.7.0" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."typed-array-buffer-1.0.0" - sources."typed-array-byte-length-1.0.0" - sources."typed-array-byte-offset-1.0.0" - sources."typed-array-length-1.0.4" + sources."typed-array-buffer-1.0.2" + sources."typed-array-byte-length-1.0.1" + sources."typed-array-byte-offset-1.0.2" + sources."typed-array-length-1.0.6" sources."typedarray-0.0.6" (sources."uglify-es-3.3.10" // { dependencies = [ @@ -17930,10 +17772,10 @@ in ]; }) sources."unbox-primitive-1.0.2" - sources."undici-types-5.26.5" - sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."undici-types-6.19.8" + sources."unicode-canonical-property-names-ecmascript-2.0.1" sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.1.0" + sources."unicode-match-property-value-ecmascript-2.2.0" sources."unicode-property-aliases-ecmascript-2.1.0" sources."union-value-1.0.1" sources."uniq-1.0.1" @@ -17954,13 +17796,13 @@ in ]; }) sources."upath-1.2.0" - sources."update-browserslist-db-1.0.13" + sources."update-browserslist-db-1.1.1" sources."uri-js-4.4.1" sources."urix-0.1.0" - (sources."url-0.11.3" // { + (sources."url-0.11.4" // { dependencies = [ sources."punycode-1.4.1" - sources."qs-6.11.2" + sources."qs-6.13.0" ]; }) (sources."url-loader-4.1.1" // { @@ -18000,11 +17842,16 @@ in sources."chokidar-2.1.8" sources."extend-shallow-2.0.1" sources."fill-range-4.0.0" - sources."fsevents-1.2.13" sources."is-binary-path-1.0.1" + sources."is-extendable-1.0.1" sources."is-number-3.0.0" sources."kind-of-3.2.2" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."kind-of-6.0.3" + ]; + }) sources."normalize-path-2.1.1" sources."readdirp-2.2.1" sources."to-regex-range-2.1.1" @@ -18030,14 +17877,13 @@ in }) (sources."webpack-dev-server-3.11.0" // { dependencies = [ - sources."ansi-regex-2.1.1" + sources."ansi-regex-4.1.1" sources."anymatch-2.0.0" sources."binary-extensions-1.13.1" sources."braces-2.3.2" sources."chokidar-2.1.8" (sources."cliui-5.0.0" // { dependencies = [ - sources."ansi-regex-4.1.1" sources."strip-ansi-5.2.0" ]; }) @@ -18045,16 +17891,21 @@ in sources."extend-shallow-2.0.1" sources."fill-range-4.0.0" sources."find-up-3.0.0" - sources."fsevents-1.2.13" sources."get-caller-file-2.0.5" sources."http-proxy-middleware-0.19.1" sources."is-absolute-url-3.0.3" sources."is-binary-path-1.0.1" + sources."is-extendable-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-number-3.0.0" sources."kind-of-3.2.2" sources."locate-path-3.0.0" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."kind-of-6.0.3" + ]; + }) sources."normalize-path-2.1.1" sources."opn-5.5.0" sources."p-locate-3.0.0" @@ -18065,17 +17916,19 @@ in sources."semver-6.3.1" (sources."string-width-3.1.0" // { dependencies = [ - sources."ansi-regex-4.1.1" sources."strip-ansi-5.2.0" ]; }) - sources."strip-ansi-3.0.1" + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) sources."supports-color-6.1.0" sources."to-regex-range-2.1.1" sources."which-module-2.0.1" (sources."wrap-ansi-5.1.0" // { dependencies = [ - sources."ansi-regex-4.1.1" sources."strip-ansi-5.2.0" ]; }) @@ -18100,7 +17953,7 @@ in sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-module-1.0.0" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.15" (sources."winston-2.1.1" // { dependencies = [ sources."async-1.0.0" @@ -18138,7 +17991,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-6.2.2" + sources."ws-6.2.3" sources."xmlbuilder-15.1.1" sources."xtend-4.0.2" sources."y18n-4.0.3" @@ -18241,73 +18094,67 @@ in elm-pages = nodeEnv.buildNodePackage { name = "elm-pages"; packageName = "elm-pages"; - version = "3.0.9"; + version = "3.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/elm-pages/-/elm-pages-3.0.9.tgz"; - sha512 = "EFwDCYHm3rwCiwXwfSUKeDDcIYrQ61deChDk7ruXPN4y0PkIINIKbljLu3uOnKSYhzc5CGSc7avwiAlkxXnJsA=="; + url = "https://registry.npmjs.org/elm-pages/-/elm-pages-3.0.16.tgz"; + sha512 = "UG/tC57uFQ5bkhW+L+7ZFjSg0uPHEtUPsjotHl8CzXHqfOUR4pRIqQ6kyi7DOGxStmoTyTvjh7TFZGA54/mXgw=="; }; dependencies = [ - sources."@adobe/css-tools-4.3.2" - sources."@esbuild/android-arm-0.17.19" - sources."@esbuild/android-arm64-0.17.19" - sources."@esbuild/android-x64-0.17.19" - sources."@esbuild/darwin-arm64-0.17.19" - sources."@esbuild/darwin-x64-0.17.19" - sources."@esbuild/freebsd-arm64-0.17.19" - sources."@esbuild/freebsd-x64-0.17.19" - sources."@esbuild/linux-arm-0.17.19" - sources."@esbuild/linux-arm64-0.17.19" - sources."@esbuild/linux-ia32-0.17.19" - sources."@esbuild/linux-loong64-0.17.19" - sources."@esbuild/linux-mips64el-0.17.19" - sources."@esbuild/linux-ppc64-0.17.19" - sources."@esbuild/linux-riscv64-0.17.19" - sources."@esbuild/linux-s390x-0.17.19" - sources."@esbuild/linux-x64-0.17.19" - sources."@esbuild/netbsd-x64-0.17.19" - sources."@esbuild/openbsd-x64-0.17.19" - sources."@esbuild/sunos-x64-0.17.19" - sources."@esbuild/win32-arm64-0.17.19" - sources."@esbuild/win32-ia32-0.17.19" - sources."@esbuild/win32-x64-0.17.19" + sources."@adobe/css-tools-4.3.3" + sources."@bufbuild/protobuf-2.1.0" sources."@isaacs/cliui-8.0.2" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.5" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.20" + sources."@jridgewell/gen-mapping-0.3.5" + sources."@jridgewell/resolve-uri-3.1.2" + sources."@jridgewell/set-array-1.2.1" + sources."@jridgewell/source-map-0.3.6" + sources."@jridgewell/sourcemap-codec-1.5.0" + sources."@jridgewell/trace-mapping-0.3.25" + (sources."@jsonjoy.com/base64-1.1.2" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) + (sources."@jsonjoy.com/json-pack-1.1.0" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) + (sources."@jsonjoy.com/util-1.3.0" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/fs-3.1.0" // { + sources."@npmcli/agent-2.2.2" + (sources."@npmcli/fs-3.1.1" // { dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.3" ]; }) sources."@sindresorhus/is-0.14.0" + sources."@sindresorhus/merge-streams-3.0.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tootallnate/once-2.0.0" sources."@types/configstore-2.1.1" sources."@types/debug-0.0.30" + sources."@types/estree-1.0.6" sources."@types/get-port-3.2.0" sources."@types/glob-5.0.38" - sources."@types/lodash-4.14.202" + sources."@types/lodash-4.17.9" sources."@types/minimatch-5.1.2" sources."@types/mkdirp-0.5.2" sources."@types/node-8.10.66" sources."@types/rimraf-2.0.5" sources."@types/tmp-0.0.33" sources."accepts-1.3.8" - sources."acorn-8.11.3" - (sources."agent-base-6.0.2" // { + sources."acorn-8.12.1" + (sources."agent-base-7.1.1" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - sources."agentkeepalive-4.5.0" sources."aggregate-error-3.1.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -18319,24 +18166,24 @@ in sources."async-limiter-1.0.1" sources."balanced-match-1.0.2" sources."batch-0.6.1" - sources."binary-extensions-2.2.0" - (sources."body-parser-1.20.1" // { + sources."binary-extensions-2.3.0" + (sources."body-parser-1.20.3" // { dependencies = [ sources."on-finished-2.4.1" ]; }) sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" + sources."buffer-builder-0.2.0" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."bytes-3.1.2" - (sources."cacache-17.1.4" // { + (sources."cacache-18.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" + sources."glob-10.4.5" + sources."minimatch-9.0.5" ]; }) (sources."cacheable-request-6.1.0" // { @@ -18345,21 +18192,23 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chalk-3.0.0" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" + sources."cli-cursor-4.0.0" sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."colorjs.io-0.5.2" sources."command-exists-1.2.9" - sources."commander-10.0.1" + sources."commander-11.1.0" sources."concat-map-0.0.1" sources."connect-3.7.0" sources."content-disposition-0.5.4" sources."content-type-1.0.5" - sources."cookie-0.5.0" + sources."cookie-0.6.0" sources."cookie-signature-1.2.1" sources."copy-anything-2.0.6" (sources."cross-spawn-7.0.3" // { @@ -18371,7 +18220,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."depd-2.0.0" sources."destroy-1.2.0" sources."detect-libc-1.0.3" @@ -18381,7 +18230,6 @@ in sources."ms-2.1.3" ]; }) - sources."dir-glob-3.0.1" sources."duplexer3-0.1.5" sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" @@ -18398,85 +18246,94 @@ in sources."eol-0.9.1" sources."err-code-2.0.3" sources."errno-0.1.8" - sources."esbuild-0.17.19" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" + sources."esbuild-0.21.5" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" - (sources."express-4.18.2" // { + (sources."express-4.21.0" // { dependencies = [ sources."cookie-signature-1.0.6" - sources."finalhandler-1.2.0" + sources."encodeurl-2.0.0" + sources."finalhandler-1.3.1" sources."on-finished-2.4.1" sources."statuses-2.0.1" ]; }) (sources."express-ws-4.0.0" // { dependencies = [ - sources."ws-5.2.3" + sources."ws-5.2.4" ]; }) sources."extend-shallow-2.0.1" sources."fast-glob-3.3.2" - sources."fastq-1.16.0" - sources."fill-range-7.0.1" + sources."fastq-1.17.1" + sources."fill-range-7.1.1" sources."finalhandler-1.1.2" - sources."foreground-child-3.1.1" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-extra-11.2.0" - (sources."fs-minipass-3.0.3" // { + (sources."foreground-child-3.3.0" // { dependencies = [ - sources."minipass-7.0.4" + sources."signal-exit-4.1.0" ]; }) - sources."fs-monkey-1.0.5" + sources."forwarded-0.2.0" + sources."fresh-0.5.2" + sources."fs-extra-11.2.0" + sources."fs-minipass-3.0.3" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-port-3.2.0" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globby-13.1.4" + (sources."globby-14.0.0" // { + dependencies = [ + sources."@sindresorhus/merge-streams-1.0.0" + ]; + }) sources."gopd-1.0.1" sources."got-9.6.0" sources."graceful-fs-4.2.11" sources."gray-matter-4.0.3" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" - sources."has-proto-1.0.1" + sources."has-property-descriptors-1.0.2" + sources."has-proto-1.0.3" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.2" sources."http-cache-semantics-4.1.1" (sources."http-errors-2.0.0" // { dependencies = [ sources."statuses-2.0.1" ]; }) - (sources."http-proxy-agent-5.0.0" // { + (sources."http-proxy-agent-7.0.2" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - (sources."https-proxy-agent-5.0.1" // { + (sources."https-proxy-agent-7.0.5" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - sources."humanize-ms-1.2.1" + sources."hyperdyperid-1.2.0" sources."iconv-lite-0.4.24" - sources."ignore-5.3.0" + sources."ignore-5.3.2" sources."image-size-0.5.5" - sources."immutable-4.3.4" + sources."immutable-4.3.7" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."ip-2.0.0" + (sources."ip-address-9.0.5" // { + dependencies = [ + sources."sprintf-js-1.1.3" + ]; + }) sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" sources."is-docker-2.2.1" @@ -18490,8 +18347,9 @@ in sources."is-what-3.14.1" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."jackspeak-2.3.6" + sources."jackspeak-3.4.3" sources."js-yaml-3.14.1" + sources."jsbn-1.1.0" sources."jsesc-3.0.2" sources."json-buffer-3.0.0" sources."jsonfile-6.1.0" @@ -18501,42 +18359,39 @@ in sources."latest-version-5.1.0" (sources."less-4.2.0" // { dependencies = [ - sources."tslib-2.6.2" + sources."tslib-2.7.0" ]; }) - sources."lightningcss-1.22.1" + sources."lightningcss-1.27.0" sources."lodash-4.17.21" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.18.3" + sources."lru-cache-10.4.3" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.2" ]; }) - sources."make-fetch-happen-11.1.1" + sources."make-fetch-happen-13.0.1" sources."media-typer-0.3.0" - sources."memfs-3.6.0" - sources."merge-descriptors-1.0.1" + (sources."memfs-4.12.0" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) + sources."merge-descriptors-1.0.3" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.5" + sources."micromatch-4.0.8" sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."minipass-7.1.2" + sources."minipass-collect-2.0.1" + sources."minipass-fetch-3.0.5" (sources."minipass-flush-1.0.5" // { dependencies = [ sources."minipass-3.3.6" @@ -18566,60 +18421,75 @@ in ]; }) sources."negotiator-0.6.3" - sources."node-gyp-build-4.7.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."on-finished-2.3.0" sources."once-1.4.0" + sources."onetime-5.1.2" sources."open-7.4.2" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-map-4.0.0" sources."package-json-6.5.0" + sources."package-json-from-dist-1.0.1" sources."parse-node-version-1.0.1" sources."parseurl-1.3.3" sources."password-prompt-1.1.3" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.1.0" - ]; - }) - sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" - sources."picocolors-1.0.0" + sources."path-scurry-1.11.1" + sources."path-to-regexp-0.1.10" + sources."path-type-5.0.0" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.33" + sources."postcss-8.4.47" sources."prepend-http-2.0.0" + sources."proc-log-4.2.0" sources."promise-retry-2.0.1" sources."proxy-addr-2.0.7" sources."prr-1.0.1" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."rc-1.2.8" sources."readdirp-3.6.0" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."responselike-1.0.2" + sources."restore-cursor-4.0.0" sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-2.7.1" - sources."rollup-3.29.4" + sources."rollup-4.22.5" sources."run-parallel-1.2.0" + (sources."rxjs-7.8.1" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sass-1.69.7" - sources."sax-1.3.0" + (sources."sass-1.79.3" // { + dependencies = [ + sources."chokidar-4.0.1" + sources."readdirp-4.0.1" + ]; + }) + (sources."sass-embedded-1.79.3" // { + dependencies = [ + sources."supports-color-8.1.1" + ]; + }) + sources."sax-1.4.1" sources."section-matter-1.0.0" sources."semver-6.3.1" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ sources."ms-2.1.3" sources."on-finished-2.4.1" @@ -18634,31 +18504,31 @@ in sources."setprototypeof-1.1.0" ]; }) - sources."serve-static-1.15.0" - sources."set-function-length-1.1.1" + (sources."serve-static-1.16.2" // { + dependencies = [ + sources."encodeurl-2.0.0" + ]; + }) + sources."set-function-length-1.2.2" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" - sources."signal-exit-4.1.0" - sources."slash-4.0.0" + sources."side-channel-1.0.6" + sources."signal-exit-3.0.7" + sources."slash-5.1.0" sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - (sources."socks-proxy-agent-7.0.0" // { + sources."socks-2.8.3" + (sources."socks-proxy-agent-8.0.4" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."source-map-0.6.1" - sources."source-map-js-1.0.2" + sources."source-map-js-1.2.1" sources."source-map-support-0.5.21" sources."sprintf-js-1.0.3" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."ssri-10.0.6" sources."statuses-1.5.0" sources."streamsearch-1.1.0" sources."string-width-5.1.2" @@ -18670,45 +18540,58 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" - (sources."stylus-0.62.0" // { + (sources."stylus-0.63.0" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" + sources."sax-1.3.0" sources."source-map-0.7.4" ]; }) sources."sudo-prompt-8.2.5" sources."sugarss-4.0.1" sources."supports-color-7.2.0" - (sources."tar-6.2.0" // { + (sources."tar-6.2.1" // { dependencies = [ (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" ]; }) + sources."minipass-5.0.0" sources."mkdirp-1.0.4" ]; }) - (sources."terser-5.26.0" // { + (sources."terser-5.34.0" // { dependencies = [ sources."commander-2.20.3" ]; }) + (sources."thingies-1.21.0" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" + (sources."tree-dump-1.0.2" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) sources."tslib-1.14.1" sources."type-fest-0.21.3" sources."type-is-1.6.18" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" + sources."unicorn-magic-0.1.0" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" sources."universalify-2.0.1" @@ -18716,36 +18599,19 @@ in sources."url-parse-lax-3.0.0" sources."utf-8-validate-5.0.10" sources."utils-merge-1.0.1" + sources."varint-6.0.0" sources."vary-1.1.2" - (sources."vite-4.5.1" // { + (sources."vite-5.4.8" // { + dependencies = [ + sources."@types/node-22.7.3" + sources."esbuild-0.21.5" + ]; + }) + (sources."which-4.0.0" // { dependencies = [ - sources."@esbuild/android-arm-0.18.20" - sources."@esbuild/android-arm64-0.18.20" - sources."@esbuild/android-x64-0.18.20" - sources."@esbuild/darwin-arm64-0.18.20" - sources."@esbuild/darwin-x64-0.18.20" - sources."@esbuild/freebsd-arm64-0.18.20" - sources."@esbuild/freebsd-x64-0.18.20" - sources."@esbuild/linux-arm-0.18.20" - sources."@esbuild/linux-arm64-0.18.20" - sources."@esbuild/linux-ia32-0.18.20" - sources."@esbuild/linux-loong64-0.18.20" - sources."@esbuild/linux-mips64el-0.18.20" - sources."@esbuild/linux-ppc64-0.18.20" - sources."@esbuild/linux-riscv64-0.18.20" - sources."@esbuild/linux-s390x-0.18.20" - sources."@esbuild/linux-x64-0.18.20" - sources."@esbuild/netbsd-x64-0.18.20" - sources."@esbuild/openbsd-x64-0.18.20" - sources."@esbuild/sunos-x64-0.18.20" - sources."@esbuild/win32-arm64-0.18.20" - sources."@esbuild/win32-ia32-0.18.20" - sources."@esbuild/win32-x64-0.18.20" - sources."@types/node-20.10.6" - sources."esbuild-0.18.20" + sources."isexe-3.1.1" ]; }) - sources."which-3.0.1" (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-styles-6.2.1" @@ -18759,7 +18625,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-7.5.10" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -18775,10 +18641,10 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.10.3"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.10.3.tgz"; - sha512 = "9gBqLc5Xm3v9Ncpf8y2haEaBZZyMX25vmwQkrNqSIaNYQ2vdGOIx1eyqRtt1xwX5O8pZdqU8IWC/ENyTrOTKbw=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.12.0.tgz"; + sha512 = "so+G1hvCV85A63sQQzEhCNFNYyQVWDexXrz0TNEYg3/IIGHzN1bcRN+W4KJSvvFcmfEImzMSJ9AN20bvemU+4Q=="; }; dependencies = [ (sources."@isaacs/cliui-8.0.2" // { @@ -18788,29 +18654,32 @@ in sources."wrap-ansi-8.1.0" ]; }) + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.10.6" + sources."@types/node-22.7.3" sources."@types/responselike-1.0.3" sources."ansi-escapes-4.3.2" - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."at-least-node-1.0.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."buffer-5.7.1" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.4" sources."chalk-4.1.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.2" sources."clone-1.0.4" @@ -18819,7 +18688,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.4" + sources."debug-4.3.7" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -18827,36 +18696,35 @@ in }) sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" + sources."dir-glob-3.0.1" sources."eastasianwidth-0.2.0" - sources."elm-tooling-1.15.0" + sources."elm-solve-deps-wasm-1.0.2" sources."emoji-regex-9.2.2" sources."end-of-stream-1.4.4" + sources."fast-glob-3.3.2" sources."fastest-levenshtein-1.0.16" - sources."fill-range-7.0.1" + sources."fastq-1.17.1" + sources."fill-range-7.1.1" sources."find-up-4.1.0" sources."folder-hash-3.3.3" - (sources."foreground-child-3.1.1" // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - }) + sources."foreground-child-3.3.0" sources."fs-extra-9.1.0" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."get-stream-5.2.0" - (sources."glob-7.2.3" // { + (sources."glob-10.4.5" // { dependencies = [ - sources."minimatch-3.1.2" + sources."brace-expansion-2.0.1" + sources."minimatch-9.0.5" ]; }) sources."glob-parent-5.1.2" + sources."globby-13.2.2" sources."got-11.8.6" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."ieee754-1.2.1" - sources."inflight-1.0.6" + sources."ignore-5.3.2" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" @@ -18866,7 +18734,7 @@ in sources."is-number-7.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - sources."jackspeak-2.3.6" + sources."jackspeak-3.4.3" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" sources."keyv-4.5.4" @@ -18874,13 +18742,15 @@ in sources."locate-path-5.0.0" sources."log-symbols-4.1.0" sources."lowercase-keys-2.0.0" - sources."lru-cache-10.1.0" + sources."lru-cache-10.4.3" + sources."merge2-1.4.1" + sources."micromatch-4.0.8" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.8" sources."minimist-1.2.8" - sources."minipass-7.0.4" - sources."ms-2.1.2" + sources."minipass-7.1.2" + sources."ms-2.1.3" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" sources."once-1.4.0" @@ -18890,31 +18760,34 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" + sources."package-json-from-dist-1.0.1" sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-scurry-1.10.1" + sources."path-scurry-1.11.1" + sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."prompts-2.4.2" - sources."pump-3.0.0" + sources."pump-3.0.2" + sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."readable-stream-3.6.2" sources."readdirp-3.6.0" sources."resolve-alpn-1.2.1" sources."responselike-2.0.1" - sources."restore-cursor-3.1.0" - (sources."rimraf-5.0.5" // { + (sources."restore-cursor-3.1.0" // { dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" + sources."signal-exit-3.0.7" ]; }) + sources."reusify-1.0.4" + sources."rimraf-5.0.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" + sources."signal-exit-4.1.0" sources."sisteransi-1.0.5" + sources."slash-4.0.0" (sources."string-width-5.1.2" // { dependencies = [ sources."strip-ansi-7.1.0" @@ -18941,12 +18814,12 @@ in sources."terminal-link-2.1.1" sources."to-regex-range-5.0.1" sources."type-fest-0.21.3" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."universalify-2.0.1" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" sources."which-2.0.2" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."emoji-regex-8.0.0" sources."string-width-4.2.3" @@ -18981,14 +18854,12 @@ in dependencies = [ sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" - sources."debug-4.3.4" + sources."debug-4.3.7" sources."git-clone-able-0.1.2" - sources."lru-cache-6.0.0" - sources."ms-2.1.2" - sources."semver-7.5.4" - sources."simple-git-3.22.0" + sources."ms-2.1.3" + sources."semver-7.6.3" + sources."simple-git-3.27.0" sources."upath-2.0.1" - sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -19022,7 +18893,7 @@ in sources."form-data-3.0.1" sources."fs.realpath-1.0.0" sources."glob-7.2.3" - sources."graphql-16.8.1" + sources."graphql-16.9.0" sources."graphql-request-3.7.0" sources."iconv-lite-0.6.3" sources."inflight-1.0.6" diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index cf2e1b32e4595..fa414937b12b9 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.41"; + version = "0.6.45"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-CXaHiyPZy454HJfmXnNsUNo30v4PdhupgGz0a8y/q0Y="; + hash = "sha256-P6AIe3IadY64ydGShlRmgZ1pITiAA8G59Oe8P2ktDqM="; }; - cargoHash = "sha256-D3RixepsH6WR7W1REbFLuIzn1eoAacqw0Ripp9lgnpE="; + cargoHash = "sha256-5h/0MqaRmjFkeg50Y7WpEDl+VWpR0d4NnqIzoZHeKZ8="; nativeBuildInputs = [ makeWrapper @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { env = { BUILD_DATE = "1970/01/01 00:00:00"; - CASE_SENSITIVE = lib.boolToString (!stdenv.isDarwin); + CASE_SENSITIVE = lib.boolToString (!stdenv.hostPlatform.isDarwin); GIT_HASH_SHORT = src.rev; }; diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index f23e9540928ab..71e2146a70047 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -D fasm${lib.optionalString stdenvNoCC.isx86_64 ".x64"} $out/bin/fasm + install -D fasm${lib.optionalString stdenvNoCC.hostPlatform.isx86_64 ".x64"} $out/bin/fasm runHook postInstall ''; diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix index 61fbdd6fe9d80..2bf6b754e2973 100644 --- a/pkgs/development/compilers/flix/default.nix +++ b/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.50.0"; + version = "0.51.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-fAEt7JsljnEXubYgiF8uEOuoOXHjv9AHgQbPunaEMw4="; + sha256 = "sha256-JeOw9mdmFAG0mMe8G/yanKCLPbCUPJxUBluNFFqjfbA="; }; dontUnpack = true; diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix similarity index 100% rename from pkgs/build-support/flutter/default.nix rename to pkgs/development/compilers/flutter/build-support/build-flutter-application.nix diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index c3ef3ab9db4a0..0a9d0feccd818 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -1,4 +1,4 @@ -{ useNixpkgsEngine ? false, callPackage, fetchzip, fetchFromGitHub, dart, lib, stdenv }@args: +{ useNixpkgsEngine ? false, callPackage, fetchzip, fetchFromGitHub, dart, lib, stdenv }: let mkCustomFlutter = args: callPackage ./flutter.nix args; wrapFlutter = flutter: callPackage ./wrapper.nix { inherit flutter; }; @@ -19,7 +19,7 @@ let , pubspecLock , artifactHashes , channel - }@fargs: + }: let args = { inherit version engineVersion engineSwiftShaderRev engineSwiftShaderHash engineHashes enginePatches patches pubspecLock artifactHashes useNixpkgsEngine channel; @@ -56,7 +56,7 @@ let (mkCustomFlutter args).overrideAttrs (prev: next: { passthru = next.passthru // rec { inherit wrapFlutter mkCustomFlutter mkFlutter; - buildFlutterApplication = callPackage ../../../build-support/flutter { flutter = wrapFlutter (mkCustomFlutter args); }; + buildFlutterApplication = callPackage ./build-support/build-flutter-application.nix { flutter = wrapFlutter (mkCustomFlutter args); }; }; }); diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index 443db6af36806..d9b20898886c4 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { paths = expandDeps ( - lib.optionals (stdenv.isLinux) [ + lib.optionals (stdenv.hostPlatform.isLinux) [ gtk3 wayland libepoxy @@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.xorgproto zlib ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ clang llvm ] @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { "-I${finalAttrs.toolchain}/include" ] ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE"; - nativeCheckInputs = lib.optionals stdenv.isLinux [ + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.xorgserver openbox ]; @@ -175,8 +175,8 @@ stdenv.mkDerivation (finalAttrs: { ninja dart ] - ++ lib.optionals (stdenv.isLinux) [ patchelf ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ patchelf ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.system_cmds darwin.xcode tools.xcode-select @@ -214,7 +214,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p src/${dartPath}/tools/sdks ln -s ${dart} src/${dartPath}/tools/sdks/dart-sdk - ${lib.optionalString (stdenv.isLinux) '' + ${lib.optionalString (stdenv.hostPlatform.isLinux) '' for patchtool in ''${patchtools[@]}; do patchelf src/$patchtool --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) done @@ -269,7 +269,7 @@ stdenv.mkDerivation (finalAttrs: { export PYTHONPATH=$src/src/build '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export PATH=${darwin.xcode}/Contents/Developer/usr/bin/:$PATH '' + '' @@ -322,7 +322,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { # Very broken on Darwin - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "The Flutter engine"; homepage = "https://flutter.dev"; maintainers = with maintainers; [ RossComputerGuy ]; diff --git a/pkgs/development/compilers/flutter/flutter-tools.nix b/pkgs/development/compilers/flutter/flutter-tools.nix index 306765cd0a42a..1639d54a869e7 100644 --- a/pkgs/development/compilers/flutter/flutter-tools.nix +++ b/pkgs/development/compilers/flutter/flutter-tools.nix @@ -28,7 +28,7 @@ buildDartApplication.override { inherit dart; } rec { popd '' # Use arm64 instead of arm64e. - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace lib/src/ios/xcodeproj.dart \ --replace-fail arm64e arm64 ''; diff --git a/pkgs/development/compilers/flutter/sdk-symlink.nix b/pkgs/development/compilers/flutter/sdk-symlink.nix index 044a508805f58..98051efa56136 100644 --- a/pkgs/development/compilers/flutter/sdk-symlink.nix +++ b/pkgs/development/compilers/flutter/sdk-symlink.nix @@ -17,6 +17,28 @@ let if [ -d '${flutter.sdk}/.git' ]; then ln -s '${flutter.sdk}/.git' "$out" fi + + # For iOS/macOS builds, *.xcframework/'s from the pre-built + # artifacts are copied into each built app. However, the symlinkJoin + # means that the *.xcframework's contain symlinks into the nix store, + # which causes issues when actually running the apps. + # + # We'll fix this by only linking to an outer *.xcframework dir instead + # of trying to symlinkJoin the files inside the *.xcframework. + artifactsDir="$out/bin/cache/artifacts/engine" + shopt -s globstar + for file in "$artifactsDir"/**/*.xcframework/Info.plist; do + # Get the unwrapped path from the Info.plist inside each .xcframework + origFile="$(readlink -f "$file")" + origFrameworkDir="$(dirname "$origFile")" + + # Remove the symlinkJoin .xcframework dir and replace it with a symlink + # to the unwrapped .xcframework dir. + frameworkDir="$(dirname "$file")" + rm -r "$frameworkDir" + ln -s "$origFrameworkDir" "$frameworkDir" + done + shopt -u globstar ''; passthru = flutter.passthru // { diff --git a/pkgs/development/compilers/flutter/versions/3_23/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_23/patches/gradle-flutter-tools-wrapper.patch new file mode 100644 index 0000000000000..de6080efbba8d --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_23/patches/gradle-flutter-tools-wrapper.patch @@ -0,0 +1,44 @@ +This patch introduces an intermediate Gradle build step to alter the behavior +of flutter_tools' Gradle project, specifically moving the creation of `build` +and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`. + +Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle` +directories within the Nix Store. Resulting in read-only errors when trying to build a +Flutter Android app at runtime. + +This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project +when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")` + +`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory. + +The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it. +This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting +`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`. + +Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't. +To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`. +diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle +new file mode 100644 +index 0000000000..b2485c94b4 +--- /dev/null ++++ b/packages/flutter_tools/gradle/settings.gradle +@@ -0,0 +1,19 @@ ++rootProject.buildFileName = "/dev/null" ++ ++def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10) ++def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev") ++dir.mkdirs() ++def file = new File(dir, "settings.gradle") ++ ++file.text = """ ++rootProject.projectDir = new File("$settingsDir") ++apply from: new File("$settingsDir/settings.gradle.kts") ++ ++gradle.allprojects { project -> ++ project.beforeEvaluate { ++ project.layout.buildDirectory = new File("$dir/build") ++ } ++} ++""" ++ ++includeBuild(dir) diff --git a/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch new file mode 100644 index 0000000000000..825d40fc6176a --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch @@ -0,0 +1,69 @@ +From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001 +From: Philip Hayes <philiphayes9@gmail.com> +Date: Thu, 12 Sep 2024 13:23:00 -0700 +Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/ + `NixOS/nixpkgs` flutter + +This patch cleans up `xcode_backend.sh`. It now effectively just runs +`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`. + +The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from +argv[0], even though its presence is already guaranteed (the wrapped +`xcode_backend.dart` also relies on this env). + +When using nixpkgs flutter, the flutter SDK directory is composed of several +layers, joined together using symlinks (called a `symlinkJoin`). Without this +patch, the auto-discover traverses the symlinks into the wrong layer, and so it +uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some +important envs/flags (like `$FLUTTER_ROOT`). + +Using the "unwrapped" dart then manifests in this error when compiling, since +it doesn't see the ios build-support artifacts: + +``` +$ flutter run -d iphone +Running Xcode build... +Xcode build done. 6.4s +Failed to build iOS app +Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts". +``` +--- + packages/flutter_tools/bin/xcode_backend.sh | 25 ++++----------------- + 1 file changed, 4 insertions(+), 21 deletions(-) + +diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh +index 2889d7c8e4..48b9d06c6e 100755 +--- a/packages/flutter_tools/bin/xcode_backend.sh ++++ b/packages/flutter_tools/bin/xcode_backend.sh +@@ -6,24 +6,7 @@ + # exit on error, or usage of unset var + set -euo pipefail + +-# Needed because if it is set, cd may print the path it changed to. +-unset CDPATH +- +-function follow_links() ( +- cd -P "$(dirname -- "$1")" +- file="$PWD/$(basename -- "$1")" +- while [[ -h "$file" ]]; do +- cd -P "$(dirname -- "$file")" +- file="$(readlink -- "$file")" +- cd -P "$(dirname -- "$file")" +- file="$PWD/$(basename -- "$file")" +- done +- echo "$file" +-) +- +-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")" +-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" +-FLUTTER_ROOT="$BIN_DIR/../../.." +-DART="$FLUTTER_ROOT/bin/dart" +- +-"$DART" "$BIN_DIR/xcode_backend.dart" "$@" ++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT. ++dart="${FLUTTER_ROOT}/bin/dart" ++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart" ++exec "${dart}" "${xcode_backend_dart}" "$@" +-- +2.46.0 + diff --git a/pkgs/development/compilers/flutter/versions/3_24/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_24/patches/gradle-flutter-tools-wrapper.patch new file mode 100644 index 0000000000000..de6080efbba8d --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_24/patches/gradle-flutter-tools-wrapper.patch @@ -0,0 +1,44 @@ +This patch introduces an intermediate Gradle build step to alter the behavior +of flutter_tools' Gradle project, specifically moving the creation of `build` +and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`. + +Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle` +directories within the Nix Store. Resulting in read-only errors when trying to build a +Flutter Android app at runtime. + +This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project +when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")` + +`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory. + +The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it. +This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting +`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`. + +Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't. +To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`. +diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle +new file mode 100644 +index 0000000000..b2485c94b4 +--- /dev/null ++++ b/packages/flutter_tools/gradle/settings.gradle +@@ -0,0 +1,19 @@ ++rootProject.buildFileName = "/dev/null" ++ ++def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10) ++def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev") ++dir.mkdirs() ++def file = new File(dir, "settings.gradle") ++ ++file.text = """ ++rootProject.projectDir = new File("$settingsDir") ++apply from: new File("$settingsDir/settings.gradle.kts") ++ ++gradle.allprojects { project -> ++ project.beforeEvaluate { ++ project.layout.buildDirectory = new File("$dir/build") ++ } ++} ++""" ++ ++includeBuild(dir) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index c988eba2e5aeb..2c1b1ea125c86 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -18,7 +18,6 @@ , extraCFlags ? [ ] , extraLinkerFlags ? [ ] , makeWrapper -, runCommandLocal , writeShellScript , wrapGAppsHook3 , git @@ -39,7 +38,6 @@ , cmake , ninja , clang -, lndir , symlinkJoin }: @@ -56,7 +54,7 @@ let }; })); - cacheDir = symlinkJoin rec { + cacheDir = symlinkJoin { name = "flutter-cache-dir"; paths = builtins.attrValues flutterPlatformArtifacts; postBuild = '' diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index e4c8a2358fc8d..6f8acae7f9168 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar"; sha256 = "b39470f9b6b5b82f50fc8680a5da37d2834f2129c65c24c5628a80894d565451"; } - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then fetchurl { url = "mirror://sourceforge/project/freepascal/Mac%20OS%20X/${version}/fpc-${version}.intelarm64-macosx.dmg"; sha256 = "05d4510c8c887e3c68de20272abf62171aa5b2ef1eba6bce25e4c0bc41ba8b7d"; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 3c9eb60d57c70..70f3b60efb8da 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ startFPC gawk ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreFoundation ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # Patch paths for linux systems. Other platforms will need their own patches. patches = [ ./mark-paths.patch # mark paths for later substitution in postPatch - ] ++ lib.optional stdenv.isAarch64 (fetchpatch { + ] ++ lib.optional stdenv.hostPlatform.isAarch64 (fetchpatch { # backport upstream patch for aarch64 glibc 2.34 url = "https://gitlab.com/freepascal.org/fpc/source/-/commit/a20a7e3497bccf3415bf47ccc55f133eb9d6d6a0.patch"; hash = "sha256-xKTBwuOxOwX9KCazQbBNLhMXCqkuJgIFvlXewHY63GM="; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = lib.optionalString - stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); + stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ]; diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 3b3ad0ff55699..bcec02476fc6e 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -12,13 +12,13 @@ let - version = "2024.01.13"; + version = "2024.09.05"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - hash = "sha256-xjSWDP8mSjLcn+0hsRpEdzsBgBR+mKCZB8yLmHl+WqE="; + hash = "sha256-yaA6WpP2XIQhjK7kpXBdBFUgKZyvtThd6JmSchUCfbI="; }; fstar-dune = ocamlPackages.callPackage ./dune.nix { inherit version src; }; diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 05d92d434faf4..78c98fe50f215 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -78,9 +78,9 @@ gccStdenv.mkDerivation rec { ] ++ gambit-params.extraOptions # TODO: pick an appropriate architecture to optimize on on x86-64? # https://gcc.gnu.org/onlinedocs/gcc-4.8.4/gcc/i386-and-x86-64-Options.html#i386-and-x86-64-Options - # ++ lib.optional pkgs.stdenv.isx86_64 "--enable-march=core-avx2" + # ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "--enable-march=core-avx2" # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 - ++ lib.optional (!gccStdenv.isDarwin) "--enable-poll"; + ++ lib.optional (!gccStdenv.hostPlatform.isDarwin) "--enable-poll"; configurePhase = '' export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \ @@ -97,7 +97,7 @@ gccStdenv.mkDerivation rec { # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ - ${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable) + ${lib.optionalString (gccStdenv.hostPlatform.isDarwin && !gambit-params.stable) ''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \ --replace "/usr/local/opt/openssl" "${lib.getLib openssl}" diff --git a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix index a16348dad02c7..f3870205a66f0 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "13.2.rel1"; + version = "13.3.rel1"; platform = { aarch64-darwin = "darwin-arm64"; @@ -20,11 +20,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; + # hashes obtained from location ${url}.sha256asc sha256 = { - aarch64-darwin = "39c44f8af42695b7b871df42e346c09fee670ea8dfc11f17083e296ea2b0d279"; - aarch64-linux = "8fd8b4a0a8d44ab2e195ccfbeef42223dfb3ede29d80f14dcf2183c34b8d199a"; - x86_64-darwin = "075faa4f3e8eb45e59144858202351a28706f54a6ec17eedd88c9fb9412372cc"; - x86_64-linux = "6cd1bbc1d9ae57312bcd169ae283153a9572bd6a8e4eeae2fedfbc33b115fdbb"; + aarch64-darwin = "fb6921db95d345dc7e5e487dd43b745e3a5b4d5c0c7ca4f707347148760317b4"; + aarch64-linux = "c8824bffd057afce2259f7618254e840715f33523a3d4e4294f471208f976764"; + x86_64-darwin = "1ab00742d1ed0926e6f227df39d767f8efab46f5250505c29cb81f548222d794"; + x86_64-linux = "95c011cee430e64dd6087c75c800f04b9c49832cc1000127a92a97f9c8d83af4"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix index ba7d53b435838..5d5abb82c3ebf 100644 --- a/pkgs/development/compilers/gcc/all.nix +++ b/pkgs/development/compilers/gcc/all.nix @@ -1,14 +1,12 @@ { lib , stdenv , gccStdenv -, gcc7Stdenv +, gcc9Stdenv , callPackage -, isl_0_11, isl_0_14, isl_0_17, isl_0_20 +, isl_0_17, isl_0_20 , libcCross , threadsCross , noSysDirs -, texinfo5 -, cloog_0_18_0, cloog , lowPrio , wrapCC }@args: @@ -26,22 +24,12 @@ let profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then args.libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; - isl = if stdenv.isDarwin then null + isl = if stdenv.hostPlatform.isDarwin then null else if atLeast "9" then isl_0_20 - else if atLeast "7" then isl_0_17 - else if atLeast "6" then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14) - else if atLeast "4.9" then isl_0_11 - else /* "4.8" */ isl_0_14; - } // lib.optionalAttrs (majorMinorVersion == "4.8") { - texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump - } // lib.optionalAttrs (!(atLeast "6")) { - cloog = if stdenv.isDarwin - then null - else if atLeast "4.9" then cloog_0_18_0 - else /* 4.8 */ cloog; - } // lib.optionalAttrs (atLeast "6" && !(atLeast "9")) { + else /* atLeast "7" */ isl_0_17; + } // lib.optionalAttrs (!(atLeast "9")) { # gcc 10 is too strict to cross compile gcc <= 8 - stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc9Stdenv else stdenv; }))); in lib.nameValuePair attrName pkg; diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 9a254ef59c023..8e087623879d3 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -13,7 +13,6 @@ let version: stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64 - && lib.versionAtLeast version "6" && lib.versionOlder version "10"; in diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index f8e2ef6508b0d..104851930213e 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -6,7 +6,6 @@ , version , binutils, gmp, mpfr, libmpc, isl -, cloog ? null , enableLTO , enableMultilib @@ -18,7 +17,6 @@ , langCC , langD ? false , langFortran -, langJava ? false, javaAwtGtk ? false, javaAntlr ? null, javaEcj ? null , langAda ? false , langGo , langObjC @@ -29,7 +27,6 @@ }: assert !enablePlugin -> disableGdbPlugin; -assert langJava -> lib.versionOlder version "7"; # Note [Windows Exception Handling] # sjlj (short jump long jump) exception handling makes no sense on x86_64, @@ -165,7 +162,6 @@ let ++ lib.optional langCC "c++" ++ lib.optional langD "d" ++ lib.optional langFortran "fortran" - ++ lib.optional langJava "java" ++ lib.optional langAda "ada" ++ lib.optional langGo "go" ++ lib.optional langObjC "objc" @@ -197,11 +193,6 @@ let # Optional features ++ lib.optional (isl != null) "--with-isl=${isl}" - ++ lib.optionals (lib.versionOlder version "5" && cloog != null) [ - "--with-cloog=${cloog}" - "--disable-cloog-version-check" - "--enable-cloog-backend=isl" - ] # Ada options, gcc can't build the runtime library for a cross compiler ++ lib.optional langAda @@ -209,18 +200,6 @@ let then "--enable-libada" else "--disable-libada") - # Java options - ++ lib.optionals langJava [ - "--with-ecj-jar=${javaEcj}" - - # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See - # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>. - "--enable-java-home" - "--with-java-home=\${prefix}/lib/jvm/jre" - ] - ++ lib.optional javaAwtGtk "--enable-java-awt=gtk" - ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" - ++ import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; } ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags ++ lib.optional disableBootstrap' "--disable-bootstrap" diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix index d81a732b4189f..f76b5fe601a96 100644 --- a/pkgs/development/compilers/gcc/common/dependencies.nix +++ b/pkgs/development/compilers/gcc/common/dependencies.nix @@ -6,7 +6,6 @@ , texinfo , which , gettext -, pkg-config ? null , gnused , patchelf , gmp @@ -14,21 +13,12 @@ , libmpc , libucontext ? null , libxcrypt ? null -, cloog ? null , darwin ? null , isl ? null , zlib ? null , gnat-bootstrap ? null , flex ? null -, boehmgc ? null -, zip ? null -, unzip ? null -, gtk2 ? null -, libart_lgpl ? null , perl ? null -, xlibs ? null -, langJava ? false -, javaAwtGtk ? false , langAda ? false , langGo ? false , langRust ? false @@ -52,7 +42,6 @@ in gettext ] ++ optionals (perl != null) [ perl ] - ++ optionals javaAwtGtk [ pkg-config ] ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox && flex != null) [ flex ] ++ optionals langAda [ gnat-bootstrap ] ++ optionals langRust [ cargo ] @@ -83,15 +72,11 @@ in ++ [ targetPackages.stdenv.cc.bintools # For linking code at run-time ] - ++ optionals (lib.versionOlder version "5" && cloog != null) [ cloog ] ++ optionals (isl != null) [ isl ] ++ optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc zip unzip ] - ++ optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs) ++ optionals (langGo && stdenv.hostPlatform.isMusl) [ libucontext ] ++ optionals (lib.versionAtLeast version "14" && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.CoreServices ] ; - # threadsCross.package after gcc6 so i assume its okay for 4.8 and 4.9 too depsTargetTarget = optionals (!withoutTargetLibc && threadsCross != { } && threadsCross.package != null) [ threadsCross.package ]; } diff --git a/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix index a578705a66ec2..4e864f95a6114 100644 --- a/pkgs/development/compilers/gcc/common/meta.nix +++ b/pkgs/development/compilers/gcc/common/meta.nix @@ -23,6 +23,6 @@ in ''; platforms = platforms.unix; - maintainers = if versionOlder version "5" then [ maintainers.veprbl ] else teams.gcc.members; + maintainers = teams.gcc.members; } diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 75f59163bdac3..9e1764eae916e 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -4,7 +4,6 @@ , gnat-bootstrap ? null , langAda ? false , langFortran -, langJava ? false , langJit ? false , langGo , withoutTargetLibc @@ -13,18 +12,13 @@ , pkgsBuildTarget }: -assert langJava -> lib.versionOlder version "7"; -assert langAda -> gnat-bootstrap != null; let - needsLib - = (lib.versionOlder version "7" && (langJava || langGo)) - || (lib.versions.major version == "4" && lib.versions.minor version == "9" && targetPlatform.isDarwin); -in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' +assert langAda -> gnat-bootstrap != null; + +lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" -'' + lib.optionalString needsLib '' - export lib=$out; '' + lib.optionalString langAda '' export PATH=${gnat-bootstrap}/bin:$PATH '' diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 2b806301bd1ce..f7e2e06bb79a3 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -27,7 +27,6 @@ , threadsCross ? null # for MinGW , withoutTargetLibc ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages , pkgsBuildTarget , libxcrypt @@ -37,17 +36,6 @@ , majorMinorVersion , cctools , darwin - -# only for gcc<=6.x -, langJava ? false -, flex -, boehmgc ? null -, zip ? null, unzip ? null, pkg-config ? null -, gtk2 ? null, libart_lgpl ? null -, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null -, libXrender ? null, xorgproto ? null -, libXrandr ? null, libXi ? null -, x11Support ? langJava }: let @@ -80,9 +68,6 @@ let atLeast10 = versionAtLeast version "10"; atLeast9 = versionAtLeast version "9"; atLeast8 = versionAtLeast version "8"; - atLeast7 = versionAtLeast version "7"; - atLeast6 = versionAtLeast version "6"; - atLeast49 = versionAtLeast version "4.9"; is14 = majorVersion == "14"; is13 = majorVersion == "13"; is12 = majorVersion == "12"; @@ -91,9 +76,6 @@ let is9 = majorVersion == "9"; is8 = majorVersion == "8"; is7 = majorVersion == "7"; - is6 = majorVersion == "6"; - is49 = majorVersion == "4" && versions.minor version == "9"; - is48 = majorVersion == "4" && versions.minor version == "8"; disableBootstrap = atLeast11 && !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler); @@ -107,12 +89,7 @@ let stageNameAddon = optionalString withoutTargetLibc "-nolibc"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}${stageNameAddon}-"; - javaAwtGtk = langJava && x11Support; - xlibs = [ - libX11 libXt libSM libICE libXtst libXrender libXrandr libXi - xorgproto - ]; - callFile = callPackageWith ({ + callFile = callPackageWith { # lets inherit majorVersion @@ -131,7 +108,6 @@ let binutils buildPackages cargo - cloog withoutTargetLibc darwin disableBootstrap @@ -177,63 +153,18 @@ let texinfo threadsCross which - zip zlib ; - } // optionalAttrs (!atLeast7) { - inherit - boehmgc - flex - gnat-bootstrap - gtk2 - langAda - langJava - libICE - libSM - libX11 - libXi - libXrandr - libXrender - libXt - libXtst - libart_lgpl - pkg-config - unzip - x11Support - xorgproto - javaAwtGtk - xlibs - ; - javaEcj = fetchurl { - # The `$(top_srcdir)/ecj.jar' file is automatically picked up at - # `configure' time. - - # XXX: Eventually we might want to take it from upstream. - url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; - sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; - }; - - # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a - # binary distribution here to allow the whole chain to be bootstrapped. - javaAntlr = fetchurl { - url = "https://www.antlr.org/download/antlr-4.4-complete.jar"; - sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; - }; - }); + }; in -# We enable the isl cloog backend. -assert !atLeast6 -> (cloog != null -> isl != null); - -assert langJava -> !atLeast7 && zip != null && unzip != null && zlib != null && boehmgc != null && perl != null; # for `--enable-java-home' - # Make sure we get GNU sed. assert stdenv.buildPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; -assert (atLeast6 && !is7 && !is8) -> (langAda -> gnat-bootstrap != null); +assert (!is7 && !is8) -> (langAda -> gnat-bootstrap != null); # TODO: fixup D bootstapping, probably by using gdc11 (and maybe other changes). # error: GDC is required to build d @@ -246,40 +177,19 @@ assert threadsCross != {} -> stdenv.targetPlatform.isWindows; # If turned on, we can't provide reproducible builds anymore assert reproducibleBuild -> profiledCompiler == false; -# We need all these X libraries when building AWT with GTK. -assert !atLeast7 -> (x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []); - pipe ((callFile ./common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - src = if is6 && stdenv.targetPlatform.isVc4 then fetchFromGitHub { - owner = "itszor"; - repo = "gcc-vc4"; - rev = "e90ff43f9671c760cf0d1dd62f569a0fb9bf8918"; - sha256 = "0gxf66hwqk26h8f853sybphqa5ca0cva2kmrw5jsiv6139g0qnp8"; - } else if is6 && stdenv.targetPlatform.isRedox then fetchFromGitHub { - owner = "redox-os"; - repo = "gcc"; - rev = "f360ac095028d286fc6dde4d02daed48f59813fa"; # `redox` branch - sha256 = "1an96h8l58pppyh3qqv90g8hgcfd9hj7igvh2gigmkxbrx94khfl"; - } else fetchurl { - url = if atLeast7 - then "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz" - else if atLeast6 - then "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz" - else "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; + src = fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; ${if is10 || is11 || is13 then "hash" else "sha256"} = gccVersions.srcHashForVersion version; }; inherit patches; - outputs = - if atLeast7 - then [ "out" "man" "info" ] ++ optional (!langJit) "lib" - else if atLeast49 && (langJava || langGo || (if atLeast6 then langJit else targetPlatform.isDarwin)) then ["out" "man" "info"] - else [ "out" "lib" "man" "info" ]; + outputs = [ "out" "man" "info" ] ++ optional (!langJit) "lib"; setOutputFlags = false; @@ -288,7 +198,7 @@ pipe ((callFile ./common/builder.nix {}) ({ hardeningDisable = [ "format" "pie" "stackclashprotection" ] ++ optionals (is11 && langAda) [ "fortify3" ]; - postPatch = optionalString atLeast7 '' + postPatch = '' configureScripts=$(find . -name configure) for configureScript in $configureScripts; do patchShebangs $configureScript @@ -296,7 +206,7 @@ pipe ((callFile ./common/builder.nix {}) ({ '' # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. - + optionalString (atLeast6 && hostPlatform.isDarwin) '' + + optionalString hostPlatform.isDarwin '' substituteInPlace gcc/config/darwin-c.c${optionalString atLeast12 "c"} \ --replace 'if (stdinc)' 'if (0)' @@ -317,18 +227,18 @@ pipe ((callFile ./common/builder.nix {}) ({ '' echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do - grep -q ${optionalString (!atLeast6) "LIBC"}_DYNAMIC_LINKER "$header" || continue + grep -q _DYNAMIC_LINKER "$header" || continue echo " fixing $header..." sed -i "$header" \ -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done - '' + optionalString (atLeast6 && targetPlatform.libc == "musl") '' + '' + optionalString (targetPlatform.libc == "musl") '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) )) - + optionalString (atLeast7 && targetPlatform.isAvr) ('' + + optionalString targetPlatform.isAvr ('' makeFlagsArray+=( '-s' # workaround for hitting hydra log limit 'LIMITS_H_TEST=false' @@ -385,12 +295,8 @@ pipe ((callFile ./common/builder.nix {}) ({ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # - # Note: When building the Java AWT GTK peer, the build system doesn't honor - # `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add - # them to $CPATH and $LIBRARY_PATH in this case. - # - # Likewise, the LTO code doesn't find zlib. + # The LTO code doesn't find zlib, so we just add it to $CPATH and + # $LIBRARY_PATH in this case. # # Cross-compiling, we need gcc not to read ./specs in order to build the g++ # compiler (after the specs for the cross-gcc are created). Having @@ -398,18 +304,14 @@ pipe ((callFile ./common/builder.nix {}) ({ CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optional langJava boehmgc - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] )); LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ( optional (zlib != null) zlib - ++ optional langJava boehmgc - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] )); + NIX_LDFLAGS = optionalString hostPlatform.isSunOS "-lm"; + inherit (callFile ./common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET @@ -420,17 +322,13 @@ pipe ((callFile ./common/builder.nix {}) ({ + optionalString (stdenv.cc.isClang && targetPlatform != hostPlatform) " -Wno-register"; } // optionalAttrs (!is7 && !atLeast12 && stdenv.cc.isClang && targetPlatform != hostPlatform) { NIX_CFLAGS_COMPILE = "-Wno-register"; - } // optionalAttrs (!atLeast7) { - inherit langJava; - } // optionalAttrs atLeast6 { - NIX_LDFLAGS = optionalString hostPlatform.isSunOS "-lm"; }); passthru = { - inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD langJava version; + inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD version; isGNU = true; - hardeningUnsupportedFlags = optional is48 "stackprotector" - ++ optional ( + hardeningUnsupportedFlags = + optional ( (targetPlatform.isAarch64 && !atLeast9) || !atLeast8 ) "stackclashprotection" ++ optional (!atLeast11) "zerocallusedregs" @@ -461,8 +359,7 @@ pipe ((callFile ./common/builder.nix {}) ({ badPlatforms = # avr-gcc8 is maintained for the `qmk` package if (is8 && targetPlatform.isAvr) then [] - else if !(is48 || is49 || is6) then [ "aarch64-darwin" ] - else platforms.darwin; + else [ "aarch64-darwin" ]; } // optionalAttrs is10 { badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ]; }; @@ -475,11 +372,6 @@ pipe ((callFile ./common/builder.nix {}) ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv } // optionalAttrs enableMultilib { dontMoveLib64 = true; -} // optionalAttrs (((is49 && !stdenv.hostPlatform.isDarwin) || is6) && langJava) { - postFixup = '' - target="$(echo "$out/libexec/gcc"/*/*/ecj*)" - patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" - ''; } )) ([ diff --git a/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch b/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch deleted file mode 100644 index 08dbfec6b249e..0000000000000 --- a/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u a/libgcc/config.host b/libgcc/config.host ---- a/libgcc/config.host 2023-11-05 11:01:55.778638446 -0500 -+++ b/libgcc/config.host 2023-11-05 11:07:29.405103979 -0500 -@@ -227,7 +227,7 @@ - tmake_file="$tmake_file t-slibgcc-darwin" - # newer toolsets produce warnings when building for unsupported versions. - case ${host} in -- *-*-darwin1[89]* | *-*-darwin2* ) -+ *-*-darwin1[89]* | *-*-darwin2* | aarch64*-*-darwin*) - tmake_file="t-darwin-min-8 $tmake_file" - ;; - *-*-darwin9* | *-*-darwin1[0-7]*) -diff -ur a/libgcc/config/t-darwin-rpath b/libgcc/config/t-darwin-rpath ---- a/libgcc/config/t-darwin-rpath 2023-11-05 11:34:18.691150009 -0500 -+++ b/libgcc/config/t-darwin-rpath 2023-11-05 11:50:36.968920904 -0500 -@@ -2,4 +2,4 @@ - SHLIB_RPATH = @rpath - - # Which does not work for Darwin < 9 --HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=10.5 -+SHLIB_LOADER_PATH = -Wl,-rpath,@loader_path diff --git a/pkgs/development/compilers/gcc/patches/4.9/libsanitizer.patch b/pkgs/development/compilers/gcc/patches/4.9/libsanitizer.patch deleted file mode 100644 index f1a438a4e5f09..0000000000000 --- a/pkgs/development/compilers/gcc/patches/4.9/libsanitizer.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -index aec950454..5bda9b3a3 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -156,18 +156,13 @@ namespace __sanitizer { - #elif defined(__sparc__) - # if defined(__arch64__) - unsigned mode; -- unsigned short __pad1; --# else -- unsigned short __pad1; -- unsigned short mode; - unsigned short __pad2; - # endif - unsigned short __seq; - unsigned long long __unused1; - unsigned long long __unused2; - #else -- unsigned short mode; -- unsigned short __pad1; -+ unsigned int mode; - unsigned short __seq; - unsigned short __pad2; - #if defined(__x86_64__) && !defined(_LP64) diff --git a/pkgs/development/compilers/gcc/patches/4.9/parallel-strsignal.patch b/pkgs/development/compilers/gcc/patches/4.9/parallel-strsignal.patch deleted file mode 100644 index 4c98ca273a542..0000000000000 --- a/pkgs/development/compilers/gcc/patches/4.9/parallel-strsignal.patch +++ /dev/null @@ -1,61 +0,0 @@ -gcc/Makefile.in: fix parallel building failure - -The gcc-ar.o, gcc-nm.o, gcc-ranlib.o and errors.o included -config.h which was a generated file. But no explicity rule -to clarify the dependency. There was potential building -failure while parallel make. - -For gcc-ar.o, gcc-nm.o and gcc-ranlib.o, they were compiled from one C -source file gcc-ar.c, we add them to ALL_HOST_BACKEND_OBJS, so the -'$(ALL_HOST_OBJS) : | $(generated_files)' rule could work for these -objects. - -For errors.o, it is part of gengtype, and the gengtype generator program -is special: Two versions are built. One is for the build machine, and one -is for the host. We refered what gengtype-parse.o did (which also is part -of gengtype). - -[GCC #61899] -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61899 - -Upstream-Status: Send to gcc-patches@gcc.gnu.org mailing list - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - gcc/Makefile.in | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 6475cba..56e50bb 100644 ---- a/gcc/Makefile.in -+++ b/gcc/Makefile.in -@@ -1481,13 +1481,16 @@ OBJS-libcommon-target = $(common_out_object_file) prefix.o params.o \ - opts.o opts-common.o options.o vec.o hooks.o common/common-targhooks.o \ - hash-table.o file-find.o - -+# Objects compiled from one C source file gcc-ar.c -+OBJS-gcc-ar = gcc-ar.o gcc-nm.o gcc-ranlib.o -+ - # This lists all host objects for the front ends. - ALL_HOST_FRONTEND_OBJS = $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS)) - - ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \ - $(OBJS-libcommon-target) @TREEBROWSER@ main.o c-family/cppspec.o \ - $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) $(GCOV_OBJS) $(GCOV_DUMP_OBJS) \ -- lto-wrapper.o -+ lto-wrapper.o $(OBJS-gcc-ar) - - # This lists all host object files, whether they are included in this - # compilation or not. -@@ -2437,6 +2440,8 @@ gengtype-parse.o: $(CONFIG_H) - CFLAGS-build/gengtype-parse.o += -DGENERATOR_FILE - build/gengtype-parse.o: $(BCONFIG_H) - -+errors.o : $(CONFIG_H) -+ - gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \ - gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \ - $(XREGEX_H) --- -1.8.1.2 - diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 12aa57336f32b..c25771a93723e 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -32,9 +32,6 @@ let atLeast10 = lib.versionAtLeast version "10"; atLeast9 = lib.versionAtLeast version "9"; atLeast8 = lib.versionAtLeast version "8"; - atLeast7 = lib.versionAtLeast version "7"; - atLeast6 = lib.versionAtLeast version "6"; - atLeast49 = lib.versionAtLeast version "4.9"; is14 = majorVersion == "14"; is13 = majorVersion == "13"; is12 = majorVersion == "12"; @@ -43,9 +40,6 @@ let is9 = majorVersion == "9"; is8 = majorVersion == "8"; is7 = majorVersion == "7"; - is6 = majorVersion == "6"; - is49 = majorVersion == "4" && lib.versions.minor version == "9"; - is48 = majorVersion == "4" && lib.versions.minor version == "8"; inherit (lib) optionals optional; in @@ -60,7 +54,7 @@ in ## 1. Patches relevant to gcc>=12 on every platform #################################### [] -++ optional (atLeast6 && !atLeast12) ./fix-bug-80431.patch +++ optional (!atLeast12) ./fix-bug-80431.patch ++ optional (targetPlatform != hostPlatform) ./libstdc++-target.patch ++ optionals (noSysDirs) ( [(if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch)] ++ @@ -75,7 +69,7 @@ in ) ++ optional (atLeast12 && langAda) ./gnat-cflags-11.patch ++ optional langFortran (if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch) -++ optional atLeast7 ./ppc-musl.patch +++ [ ./ppc-musl.patch ] ++ optional (atLeast9 && langD) ./libphobos.patch @@ -126,16 +120,16 @@ in ## Darwin # Fixes detection of Darwin on x86_64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64. -++ optional (atLeast14 && stdenv.isDarwin && stdenv.isx86_64) ../patches/14/libgcc-darwin-detection.patch +++ optional (atLeast14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ../patches/14/libgcc-darwin-detection.patch # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin -++ optional (atLeast12 && stdenv.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch +++ optional (atLeast12 && stdenv.hostPlatform.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch # Remove CoreServices on Darwin, as it is only needed for macOS SDK 14+ -++ optional (atLeast14 && stdenv.isDarwin && langAda) ../patches/14/gcc-darwin-remove-coreservices.patch +++ optional (atLeast14 && stdenv.hostPlatform.isDarwin && langAda) ../patches/14/gcc-darwin-remove-coreservices.patch # Use absolute path in GNAT dylib install names on Darwin -++ optionals (stdenv.isDarwin && langAda) ({ +++ optionals (stdenv.hostPlatform.isDarwin && langAda) ({ "14" = [ ../patches/14/gnat-darwin-dylib-install-name-14.patch ]; "13" = [ ./gnat-darwin-dylib-install-name-13.patch ]; "12" = [ ./gnat-darwin-dylib-install-name.patch ]; @@ -143,7 +137,7 @@ in # We only apply this patch when building a native toolchain for aarch64-darwin, as it breaks building # a foreign one: https://github.com/iains/gcc-12-branch/issues/18 -++ optionals (stdenv.isDarwin && stdenv.isAarch64 && buildPlatform == hostPlatform && hostPlatform == targetPlatform) ({ +++ optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && buildPlatform == hostPlatform && hostPlatform == targetPlatform) ({ "14" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-14-branch. # 04696df09633baf97cdbbdd6e9929b9d472161d3 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-14.2.0 @@ -163,9 +157,9 @@ in }) ]; "11" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-11-branch. - # ff4bf32 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.4.0 - url = "https://github.com/iains/gcc-11-branch/compare/ff4bf326d03e750a8d4905ea49425fe7d15a04b8..gcc-11.4-darwin-r0.diff"; - hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4="; + # 5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.5.0 + url = "https://github.com/iains/gcc-11-branch/compare/5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6..gcc-11.5-darwin-r0.diff"; + hash = "sha256-7lH+GkgkrE6nOp9PMdIoqlQNWK31s6oW+lDt1LIkadE="; }) ]; "10" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-10-branch. @@ -176,18 +170,17 @@ in }.${majorVersion} or []) # Work around newer AvailabilityInternal.h when building older versions of GCC. -++ optionals (stdenv.isDarwin) ({ +++ optionals (stdenv.hostPlatform.isDarwin) ({ "9" = [ ../patches/9/AvailabilityInternal.h-fixincludes.patch ]; "8" = [ ../patches/8/AvailabilityInternal.h-fixincludes.patch ]; "7" = [ ../patches/7/AvailabilityInternal.h-fixincludes.patch ]; - "6" = [ ../patches/6/AvailabilityInternal.h-fixincludes.patch ]; }.${majorVersion} or []) ## Windows # Obtain latest patch with ../update-mcfgthread-patches.sh -++ optional (atLeast6 && !atLeast13 && !withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") +++ optional (!atLeast13 && !withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") (./. + "/${majorVersion}/Added-mcf-thread-model-support-from-mcfgthread.patch") @@ -208,9 +201,6 @@ in ## gcc 11.0 and older ############################################################################## -# libgcc’s `configure` script misdetects aarch64-darwin, resulting in an invalid deployment target. -++ optional (is11 && stdenv.isDarwin && stdenv.isAarch64) ./11/libgcc-aarch64-darwin-detection.patch - # openjdk build fails without this on -march=opteron; is upstream in gcc12 ++ optionals (is11) [ ./11/gcc-issue-103910.patch ] @@ -231,7 +221,7 @@ in ## gcc 9.0 and older ############################################################################## ++ optional (majorVersion == "9") ./9/fix-struct-redefinition-on-glibc-2.36.patch -++ optional (atLeast7 && !atLeast10 && targetPlatform.isNetBSD) ./libstdc++-netbsd-ctypes.patch +++ optional (!atLeast10 && targetPlatform.isNetBSD) ./libstdc++-netbsd-ctypes.patch # Make Darwin bootstrap respect whether the assembler supports `--gstabs`, # which is not supported by the clang integrated assembler used by default on Darwin. @@ -240,8 +230,7 @@ in ## gcc 8.0 and older ############################################################################## -# for 49 this is applied later -++ optional (atLeast49 && !is49 && !atLeast9) ./libsanitizer-no-cyclades-9.patch +++ optional (!atLeast9) ./libsanitizer-no-cyclades-9.patch ++ optional (is7 || is8) ./9/fix-struct-redefinition-on-glibc-2.36.patch # Make Darwin bootstrap respect whether the assembler supports `--gstabs`, @@ -270,98 +259,8 @@ in (./. + "/${majorVersion}/gcc8-asan-glibc-2.34.patch") (./. + "/${majorVersion}/0001-Fix-build-for-glibc-2.31.patch") ] -++ optional ((is6 || is7) && targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch { +++ optional (is7 && targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/gcc/gcc-6.1-musl-libssp.patch?id=5e4b96e23871ee28ef593b439f8c07ca7c7eb5bb"; sha256 = "1jf1ciz4gr49lwyh8knfhw6l5gvfkwzjy90m7qiwkcbsf4a3fqn2"; }) -++ optional ((is6 || is7 || is8) && !atLeast9 && targetPlatform.libc == "musl") ./libgomp-dont-force-initial-exec.patch - - - -## gcc 6.0 and older ############################################################################## - -++ optional (is6 && langGo) ./gogcc-workaround-glibc-2.36.patch -++ optional (is49 || is6) ./9/fix-struct-redefinition-on-glibc-2.36.patch -++ optional (is49 || (is6 && !stdenv.targetPlatform.isRedox)) ./use-source-date-epoch.patch -++ optional (is6 && !stdenv.targetPlatform.isRedox) ./6/0001-Fix-build-for-glibc-2.31.patch -++ optionals (is6 && langAda) [ - ./gnat-cflags.patch - ./6/gnat-glibc234.patch -] - -# The clang-based assembler used in darwin.binutils (LLVM >11) does not support piping input. -# Fortunately, it does not exhibit the problem GCC has with the cctools assembler. -# This patch can be dropped should darwin.binutils ever implement support. -++ optional (!atLeast7 && hostPlatform.isDarwin && lib.versionAtLeast (lib.getVersion stdenv.cc) "12") ./4.9/darwin-clang-as.patch - -# Building libstdc++ with flat namespaces results in trying to link CoreFoundation, which -# defaults to the impure, system location and causes the build to fail. -++ optional (is6 && hostPlatform.isDarwin) ./6/libstdc++-disable-flat_namespace.patch - -## gcc 4.9 and older ############################################################################## - -++ optional (!atLeast6) ./parallel-bconfig.patch -++ optionals (is49) [ - (./. + "/${lib.versions.major version}.${lib.versions.minor version}/parallel-strsignal.patch") - (./. + "/${lib.versions.major version}.${lib.versions.minor version}/libsanitizer.patch") - (fetchpatch { - name = "avoid-ustat-glibc-2.28.patch"; - url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96"; - sha256 = "0b32sb4psv5lq0ij9fwhi1b4pjbwdjnv24nqprsk14dsc6xmi1g0"; - }) - # has to be applied after "avoid-ustat-glibc-2.28.patch" - ./libsanitizer-no-cyclades-9.patch - # glibc-2.26 - ./struct-ucontext.patch - ./struct-sigaltstack-4.9.patch -] -# Retpoline patches pulled from the branch hjl/indirect/gcc-4_9-branch (by H.J. Lu, the author of GCC upstream retpoline commits) -++ optionals is49 - (builtins.map ({commit, sha256}: fetchpatch {url = "https://github.com/hjl-tools/gcc/commit/${commit}.patch"; inherit sha256;}) - [{ commit = "e623d21608e96ecd6b65f0d06312117d20488a38"; sha256 = "1ix8i4d2r3ygbv7npmsdj790rhxqrnfwcqzv48b090r9c3ij8ay3"; } - { commit = "2015a09e332309f12de1dadfe179afa6a29368b8"; sha256 = "0xcfs0cbb63llj2gbcdrvxim79ax4k4aswn0a3yjavxsj71s1n91"; } - { commit = "6b11591f4494f705e8746e7d58b7f423191f4e92"; sha256 = "0aydyhsm2ig0khgbp27am7vq7liyqrq6kfhfi2ki0ij0ab1hfbga"; } - { commit = "203c7d9c3e9cb0f88816b481ef8e7e87b3ecc373"; sha256 = "0wqn16y7wy5kg8ngfcni5qdwfphl01axczibbk49bxclwnzvldqa"; } - { commit = "f039c6f284b2c9ce97c8353d6034978795c4872e"; sha256 = "13fkgdb17lpyxfksz1zanxhgpsm0jrss9w61nbl7an4im22hz7ci"; } - { commit = "ed42606bdab1c5d9e5ad828cd6fe1a0557f193b7"; sha256 = "0gdnn8v3p03imj3qga2mzdhpgbmjcklkxdl97jvz5xia2ikzknxm"; } - { commit = "5278e062ef292fd2fbf987d25389785f4c5c0f99"; sha256 = "0j81x758wf8v7j4rx5wc1cy7yhkvhlhv3wmnarwakxiwsspq0vrs"; } - { commit = "76f1ffbbb6cd9f6ecde6c82cd16e20a27242e890"; sha256 = "1py56y6gp7fjf4f8bbsfwh5bs1gnmlqda1ycsmnwlzfm0cshdp0c"; } - { commit = "4ca48b2b688b135c0390f54ea9077ef10aedd52c"; sha256 = "15r019pzr3k0lpgyvdc92c8fayw8b5lrzncna4bqmamcsdz7vsaw"; } - { commit = "98c7bf9ddc80db965d69d61521b1c7a1cec32d9a"; sha256 = "1d7pfdv1q23nf0wadw7jbp6d6r7pnzjpbyxgbdfv7j1vr9l1bp60"; } - { commit = "3dc76b53ad896494ca62550a7a752fecbca3f7a2"; sha256 = "0jvdzfpvfdmklfcjwqblwq1i22iqis7ljpvm7adra5d7zf2xk7xz"; } - { commit = "1e961ed49b18e176c7457f53df2433421387c23b"; sha256 = "04dnqqs4qsvz4g8cq6db5id41kzys7hzhcaycwmc9rpqygs2ajwz"; } - { commit = "e137c72d099f9b3b47f4cc718aa11eab14df1a9c"; sha256 = "1ms0dmz74yf6kwgjfs4d2fhj8y6mcp2n184r3jk44wx2xc24vgb2"; }]) - -++ optional (is49 && !atLeast6) [ - # gcc-11 compatibility - (fetchpatch { - name = "gcc4-char-reload.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=d57c99458933a21fdf94f508191f145ad8d5ec58"; - includes = [ "gcc/reload.h" ]; - sha256 = "sha256-66AMP7/ajunGKAN5WJz/yPn42URZ2KN51yPrFdsxEuM="; - }) -] - - -## gcc 4.8 only ############################################################################## - -++ optional (!atLeast49 && hostPlatform.isDarwin) ./gfortran-darwin-NXConstStr.patch -++ optionals is48 [ - (fetchpatch { - name = "libc_name_p.diff"; # needed to build with gcc6 - url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=ec1cc0263f1"; - sha256 = "01jd7pdarh54ki498g6sz64ijl9a1l5f9v8q2696aaxalvh2vwzl"; - excludes = [ "gcc/cp/ChangeLog" ]; - }) - # glibc-2.26 - ./struct-ucontext-4.8.patch - ./sigsegv-not-declared.patch - ./res_state-not-declared.patch - # gcc-11 compatibility - (fetchpatch { - name = "gcc4-char-reload.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=d57c99458933a21fdf94f508191f145ad8d5ec58"; - includes = [ "gcc/reload.h" ]; - sha256 = "sha256-66AMP7/ajunGKAN5WJz/yPn42URZ2KN51yPrFdsxEuM="; - }) -] +++ optional ((is7 || is8) && !atLeast9 && targetPlatform.libc == "musl") ./libgomp-dont-force-initial-exec.patch diff --git a/pkgs/development/compilers/gcc/patches/gfortran-darwin-NXConstStr.patch b/pkgs/development/compilers/gcc/patches/gfortran-darwin-NXConstStr.patch deleted file mode 100644 index a7e158ca364b7..0000000000000 --- a/pkgs/development/compilers/gcc/patches/gfortran-darwin-NXConstStr.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 82f81877458ea372176eabb5de36329431dce99b Mon Sep 17 00:00:00 2001 -From: Iain Sandoe <iain@codesourcery.com> -Date: Sat, 21 Dec 2013 00:30:18 +0000 -Subject: [PATCH] don't try to mark local symbols as no-dead-strip - ---- - gcc/config/darwin.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c -index 40804b8..0080299 100644 ---- a/gcc/config/darwin.c -+++ b/gcc/config/darwin.c -@@ -1259,6 +1259,11 @@ darwin_encode_section_info (tree decl, rtx rtl, int first ATTRIBUTE_UNUSED) - void - darwin_mark_decl_preserved (const char *name) - { -+ /* Actually we shouldn't mark any local symbol this way, but for now -+ this only happens with ObjC meta-data. */ -+ if (darwin_label_is_anonymous_local_objc_name (name)) -+ return; -+ - fprintf (asm_out_file, "\t.no_dead_strip "); - assemble_name (asm_out_file, name); - fputc ('\n', asm_out_file); --- -2.2.1 diff --git a/pkgs/development/compilers/gcc/patches/res_state-not-declared.patch b/pkgs/development/compilers/gcc/patches/res_state-not-declared.patch deleted file mode 100644 index e970487786d03..0000000000000 --- a/pkgs/development/compilers/gcc/patches/res_state-not-declared.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc -index fe69430..49f5270 100644 ---- a/libsanitizer/tsan/tsan_platform_linux.cc -+++ b/libsanitizer/tsan/tsan_platform_linux.cc -@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) { - // closes within glibc. The code is a pure hack. - int ExtractResolvFDs(void *state, int *fds, int nfd) { - int cnt = 0; -- __res_state *statp = (__res_state*)state; -+ struct __res_state *statp = (struct __res_state*)state; - for (int i = 0; i < MAXNS && cnt < nfd; i++) { - if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) - fds[cnt++] = statp->_u._ext.nssocks[i]; diff --git a/pkgs/development/compilers/gcc/patches/sigsegv-not-declared.patch b/pkgs/development/compilers/gcc/patches/sigsegv-not-declared.patch deleted file mode 100644 index f9cfaec820268..0000000000000 --- a/pkgs/development/compilers/gcc/patches/sigsegv-not-declared.patch +++ /dev/null @@ -1,13 +0,0 @@ -error: 'SIGSEGV' was not declared in this scope -diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc -index 0692eb1..472f734 100644 ---- a/libsanitizer/asan/asan_linux.cc -+++ b/libsanitizer/asan/asan_linux.cc -@@ -26,6 +26,7 @@ - #include <sys/types.h> - #include <fcntl.h> - #include <pthread.h> -+#include <signal.h> - #include <stdio.h> - #include <unistd.h> - #include <unwind.h> diff --git a/pkgs/development/compilers/gcc/patches/struct-sigaltstack-4.9.patch b/pkgs/development/compilers/gcc/patches/struct-sigaltstack-4.9.patch deleted file mode 100644 index fc126b4813d6d..0000000000000 --- a/pkgs/development/compilers/gcc/patches/struct-sigaltstack-4.9.patch +++ /dev/null @@ -1,78 +0,0 @@ -hand-resolved trivial conflicts for 4.9 from the upstream patch -72edc2c02f8b4768ad660f46a1c7e2400c0a8e06 -diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc -index 69c9c10..8e53673 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_linux.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc -@@ -599,8 +599,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { - return internal_syscall(__NR_prctl, option, arg2, arg3, arg4, arg5); - } - --uptr internal_sigaltstack(const struct sigaltstack *ss, -- struct sigaltstack *oss) { -+uptr internal_sigaltstack(const void *ss, void *oss) { - return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss); - } - -diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h -index 6422df1..8e111d1 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_linux.h -+++ b/libsanitizer/sanitizer_common/sanitizer_linux.h -@@ -18,7 +18,6 @@ - #include "sanitizer_platform_limits_posix.h" - - struct link_map; // Opaque type returned by dlopen(). --struct sigaltstack; - - namespace __sanitizer { - // Dirent structure for getdents(). Note that this structure is different from -@@ -28,8 +27,7 @@ struct linux_dirent; - // Syscall wrappers. - uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); - uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5); --uptr internal_sigaltstack(const struct sigaltstack* ss, -- struct sigaltstack* oss); -+uptr internal_sigaltstack(const void* ss, void* oss); - uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act, - __sanitizer_kernel_sigaction_t *oldact); - uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set, -diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -index 891386dc..234e8c6 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -@@ -273,7 +273,7 @@ static int TracerThread(void* argument) { - - // Alternate stack for signal handling. - InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize); -- struct sigaltstack handler_stack; -+ stack_t handler_stack; - internal_memset(&handler_stack, 0, sizeof(handler_stack)); - handler_stack.ss_sp = handler_stack_memory.data(); - handler_stack.ss_size = kHandlerStackSize; -diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc -index 2ed5718..6f972ab 100644 ---- a/libsanitizer/tsan/tsan_platform_linux.cc -+++ b/libsanitizer/tsan/tsan_platform_linux.cc -@@ -287,7 +287,7 @@ void InitializePlatform() { - int ExtractResolvFDs(void *state, int *fds, int nfd) { - #if SANITIZER_LINUX && !SANITIZER_ANDROID - int cnt = 0; -- __res_state *statp = (__res_state*)state; -+ struct __res_state *statp = (struct __res_state*)state; - for (int i = 0; i < MAXNS && cnt < nfd; i++) { - if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) - fds[cnt++] = statp->_u._ext.nssocks[i]; - -error: 'SIGSEGV' was not declared in this scope -diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc -index 0692eb1..472f734 100644 ---- a/libsanitizer/asan/asan_linux.cc -+++ b/libsanitizer/asan/asan_linux.cc -@@ -26,6 +26,7 @@ - #include <sys/types.h> - #include <fcntl.h> - #include <pthread.h> -+#include <signal.h> - #include <stdio.h> - #include <unistd.h> - #include <unwind.h> diff --git a/pkgs/development/compilers/gcc/patches/struct-ucontext-4.8.patch b/pkgs/development/compilers/gcc/patches/struct-ucontext-4.8.patch deleted file mode 100644 index 630ef6586e45b..0000000000000 --- a/pkgs/development/compilers/gcc/patches/struct-ucontext-4.8.patch +++ /dev/null @@ -1,177 +0,0 @@ -From b685411208e0aaa79190d54faf945763514706b8 Mon Sep 17 00:00:00 2001 -From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Tue, 4 Jul 2017 10:23:57 +0000 -Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files. - -Current glibc no longer gives the ucontext_t type the tag struct -ucontext, to conform with POSIX namespace rules. This requires -various linux-unwind.h files in libgcc, that were previously using -struct ucontext, to be fixed to use ucontext_t instead. This is -similar to the removal of the struct siginfo tag from siginfo_t some -years ago. - -This patch changes those files to use ucontext_t instead. As the -standard name that should be unconditionally safe, so this is not -restricted to architectures supported by glibc, or conditioned on the -glibc version. - -Tested compilation together with current glibc with glibc's -build-many-glibcs.py. - - * config/aarch64/linux-unwind.h (aarch64_fallback_frame_state), - config/alpha/linux-unwind.h (alpha_fallback_frame_state), - config/bfin/linux-unwind.h (bfin_fallback_frame_state), - config/i386/linux-unwind.h (x86_64_fallback_frame_state, - x86_fallback_frame_state), config/m68k/linux-unwind.h (struct - uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext), - config/pa/linux-unwind.h (pa32_fallback_frame_state), - config/sh/linux-unwind.h (sh_fallback_frame_state), - config/tilepro/linux-unwind.h (tile_fallback_frame_state), - config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use - ucontext_t instead of struct ucontext. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - libgcc/ChangeLog (REMOVED) | 14 ++++++++++++++ - libgcc/config/aarch64/linux-unwind.h | 2 +- - libgcc/config/alpha/linux-unwind.h | 2 +- - libgcc/config/bfin/linux-unwind.h | 2 +- - libgcc/config/i386/linux-unwind.h | 4 ++-- - libgcc/config/m68k/linux-unwind.h | 2 +- - libgcc/config/nios2/linux-unwind.h | 2 +- - libgcc/config/pa/linux-unwind.h | 2 +- - libgcc/config/sh/linux-unwind.h | 2 +- - libgcc/config/tilepro/linux-unwind.h | 2 +- - libgcc/config/xtensa/linux-unwind.h | 2 +- - 11 files changed, 25 insertions(+), 11 deletions(-) - -diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h -index 4512efb..06de45a 100644 ---- a/libgcc/config/aarch64/linux-unwind.h -+++ b/libgcc/config/aarch64/linux-unwind.h -@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context, - struct rt_sigframe - { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - }; - - struct rt_sigframe *rt_; -diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h -index bdbba4a..e84812e 100644 ---- a/libgcc/config/alpha/linux-unwind.h -+++ b/libgcc/config/alpha/linux-unwind.h -@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - sc = &rt_->uc.uc_mcontext; - } -diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h -index 77b7c23..8bf5e82 100644 ---- a/libgcc/config/bfin/linux-unwind.h -+++ b/libgcc/config/bfin/linux-unwind.h -@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, - void *puc; - char retcode[8]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - - /* The void * cast is necessary to avoid an aliasing warning. -diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h -index 540a0a2..29efbe3 100644 ---- a/libgcc/config/i386/linux-unwind.h -+++ b/libgcc/config/i386/linux-unwind.h -@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, - if (*(unsigned char *)(pc+0) == 0x48 - && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) - { -- struct ucontext *uc_ = context->cfa; -+ ucontext_t *uc_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem - because it does not alias anything. */ -@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context, - siginfo_t *pinfo; - void *puc; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h -index 75b7cf7..f964e24 100644 ---- a/libgcc/config/m68k/linux-unwind.h -+++ b/libgcc/config/m68k/linux-unwind.h -@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - /* <sys/ucontext.h> is unfortunately broken right now. */ - struct uw_ucontext { - unsigned long uc_flags; -- struct ucontext *uc_link; -+ ucontext_t *uc_link; - stack_t uc_stack; - mcontext_t uc_mcontext; - unsigned long uc_filler[80]; -diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h -index 9a2657f..e47493d 100644 ---- a/libgcc/config/pa/linux-unwind.h -+++ b/libgcc/config/pa/linux-unwind.h -@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, - struct sigcontext *sc; - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *frame; - - /* rt_sigreturn trampoline: -diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h -index e389cac..0bf43ba 100644 ---- a/libgcc/config/sh/linux-unwind.h -+++ b/libgcc/config/sh/linux-unwind.h -@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h -index 796e976..75f8890 100644 ---- a/libgcc/config/tilepro/linux-unwind.h -+++ b/libgcc/config/tilepro/linux-unwind.h -@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context, - struct rt_sigframe { - unsigned char save_area[C_ABI_SAVE_AREA_SIZE]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_; - - /* Return if this is not a signal handler. */ -diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h -index 9872492..586a9d4 100644 ---- a/libgcc/config/xtensa/linux-unwind.h -+++ b/libgcc/config/xtensa/linux-unwind.h -@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, - - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_; - - /* movi a2, __NR_rt_sigreturn; syscall */ --- -2.9.3 - diff --git a/pkgs/development/compilers/gcc/patches/struct-ucontext.patch b/pkgs/development/compilers/gcc/patches/struct-ucontext.patch deleted file mode 100644 index c7fb6d1f71cf1..0000000000000 --- a/pkgs/development/compilers/gcc/patches/struct-ucontext.patch +++ /dev/null @@ -1,190 +0,0 @@ -From b685411208e0aaa79190d54faf945763514706b8 Mon Sep 17 00:00:00 2001 -From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Tue, 4 Jul 2017 10:23:57 +0000 -Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files. - -Current glibc no longer gives the ucontext_t type the tag struct -ucontext, to conform with POSIX namespace rules. This requires -various linux-unwind.h files in libgcc, that were previously using -struct ucontext, to be fixed to use ucontext_t instead. This is -similar to the removal of the struct siginfo tag from siginfo_t some -years ago. - -This patch changes those files to use ucontext_t instead. As the -standard name that should be unconditionally safe, so this is not -restricted to architectures supported by glibc, or conditioned on the -glibc version. - -Tested compilation together with current glibc with glibc's -build-many-glibcs.py. - - * config/aarch64/linux-unwind.h (aarch64_fallback_frame_state), - config/alpha/linux-unwind.h (alpha_fallback_frame_state), - config/bfin/linux-unwind.h (bfin_fallback_frame_state), - config/i386/linux-unwind.h (x86_64_fallback_frame_state, - x86_fallback_frame_state), config/m68k/linux-unwind.h (struct - uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext), - config/pa/linux-unwind.h (pa32_fallback_frame_state), - config/sh/linux-unwind.h (sh_fallback_frame_state), - config/tilepro/linux-unwind.h (tile_fallback_frame_state), - config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use - ucontext_t instead of struct ucontext. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - libgcc/ChangeLog (REMOVED) | 14 ++++++++++++++ - libgcc/config/aarch64/linux-unwind.h | 2 +- - libgcc/config/alpha/linux-unwind.h | 2 +- - libgcc/config/bfin/linux-unwind.h | 2 +- - libgcc/config/i386/linux-unwind.h | 4 ++-- - libgcc/config/m68k/linux-unwind.h | 2 +- - libgcc/config/nios2/linux-unwind.h | 2 +- - libgcc/config/pa/linux-unwind.h | 2 +- - libgcc/config/sh/linux-unwind.h | 2 +- - libgcc/config/tilepro/linux-unwind.h | 2 +- - libgcc/config/xtensa/linux-unwind.h | 2 +- - 11 files changed, 25 insertions(+), 11 deletions(-) - -diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h -index 4512efb..06de45a 100644 ---- a/libgcc/config/aarch64/linux-unwind.h -+++ b/libgcc/config/aarch64/linux-unwind.h -@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context, - struct rt_sigframe - { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - }; - - struct rt_sigframe *rt_; -diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h -index bdbba4a..e84812e 100644 ---- a/libgcc/config/alpha/linux-unwind.h -+++ b/libgcc/config/alpha/linux-unwind.h -@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - sc = &rt_->uc.uc_mcontext; - } -diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h -index 77b7c23..8bf5e82 100644 ---- a/libgcc/config/bfin/linux-unwind.h -+++ b/libgcc/config/bfin/linux-unwind.h -@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, - void *puc; - char retcode[8]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - - /* The void * cast is necessary to avoid an aliasing warning. -diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h -index 540a0a2..29efbe3 100644 ---- a/libgcc/config/i386/linux-unwind.h -+++ b/libgcc/config/i386/linux-unwind.h -@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, - if (*(unsigned char *)(pc+0) == 0x48 - && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) - { -- struct ucontext *uc_ = context->cfa; -+ ucontext_t *uc_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem - because it does not alias anything. */ -@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context, - siginfo_t *pinfo; - void *puc; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h -index 75b7cf7..f964e24 100644 ---- a/libgcc/config/m68k/linux-unwind.h -+++ b/libgcc/config/m68k/linux-unwind.h -@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - /* <sys/ucontext.h> is unfortunately broken right now. */ - struct uw_ucontext { - unsigned long uc_flags; -- struct ucontext *uc_link; -+ ucontext_t *uc_link; - stack_t uc_stack; - mcontext_t uc_mcontext; - unsigned long uc_filler[80]; -diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h -index 2304142..30f25ea 100644 ---- a/libgcc/config/nios2/linux-unwind.h -+++ b/libgcc/config/nios2/linux-unwind.h -@@ -38,7 +38,7 @@ struct nios2_mcontext { - - struct nios2_ucontext { - unsigned long uc_flags; -- struct ucontext *uc_link; -+ ucontext_t *uc_link; - stack_t uc_stack; - struct nios2_mcontext uc_mcontext; - sigset_t uc_sigmask; /* mask last for extensibility */ -diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h -index 9a2657f..e47493d 100644 ---- a/libgcc/config/pa/linux-unwind.h -+++ b/libgcc/config/pa/linux-unwind.h -@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, - struct sigcontext *sc; - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *frame; - - /* rt_sigreturn trampoline: -diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h -index e389cac..0bf43ba 100644 ---- a/libgcc/config/sh/linux-unwind.h -+++ b/libgcc/config/sh/linux-unwind.h -@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h -index 796e976..75f8890 100644 ---- a/libgcc/config/tilepro/linux-unwind.h -+++ b/libgcc/config/tilepro/linux-unwind.h -@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context, - struct rt_sigframe { - unsigned char save_area[C_ABI_SAVE_AREA_SIZE]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_; - - /* Return if this is not a signal handler. */ -diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h -index 9872492..586a9d4 100644 ---- a/libgcc/config/xtensa/linux-unwind.h -+++ b/libgcc/config/xtensa/linux-unwind.h -@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, - - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_; - - /* movi a2, __NR_rt_sigreturn; syscall */ --- -2.9.3 - diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix index eee117adf9782..7aa8b558f358e 100644 --- a/pkgs/development/compilers/gcc/versions.nix +++ b/pkgs/development/compilers/gcc/versions.nix @@ -9,8 +9,6 @@ let "8" = "8.5.0"; "7" = "7.5.0"; "6" = "6.5.0"; - "4.9"= "4.9.4"; - "4.8"= "4.8.5"; }; fromMajorMinor = majorMinorVersion: @@ -27,8 +25,6 @@ let "8.5.0" = "0l7d4m9jx124xsk6xardchgy2k5j5l2b15q322k31f0va4d8826k"; "7.5.0" = "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq"; "6.5.0" = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby"; - "4.9.4" = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"; - "4.8.5" = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2"; }."${version}"; in { diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index c71ea137eadca..5ed7339c31beb 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { ./install.sh (cd $out/bin ; ln -s ../gerbil/bin/* .) runHook postInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' libgerbil="$(realpath "$out/gerbil/lib/libgerbil.so")" install_name_tool -id "$libgerbil" "$libgerbil" ''; diff --git a/pkgs/development/compilers/gforth/boot-forth.nix b/pkgs/development/compilers/gforth/boot-forth.nix index 657847164bb07..9a4d676f51302 100644 --- a/pkgs/development/compilers/gforth/boot-forth.nix +++ b/pkgs/development/compilers/gforth/boot-forth.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ m4 ]; - configureFlags = lib.optionals stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--build=x86_64-apple-darwin" ]; meta = { description = "Forth implementation of the GNU project (outdated version used to bootstrap)"; diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index 56d89fd628f21..6b68f7b47c5c9 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-lispdir=${lispDir}" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "--build=x86_64-apple-darwin" ]; @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { description = "Forth implementation of the GNU project"; homepage = "https://github.com/forthy42/gforth"; license = lib.licenses.gpl3; - broken = stdenv.isDarwin && stdenv.isAarch64; # segfault when running ./gforthmi + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # segfault when running ./gforthmi platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/gforth/swig.nix b/pkgs/development/compilers/gforth/swig.nix index 8de29407cc46d..84cdaee6a36a6 100644 --- a/pkgs/development/compilers/gforth/swig.nix +++ b/pkgs/development/compilers/gforth/swig.nix @@ -1,8 +1,12 @@ -{ swig3, fetchFromGitHub }: +{ + swig, + pcre, + fetchFromGitHub, +}: -## for updating to swig4, see +## for updating to SWIG 4, see ## https://github.com/GeraldWodni/swig/pull/6 -swig3.overrideDerivation (old: { +(swig.overrideAttrs (old: { version = "3.0.9-forth"; src = fetchFromGitHub { owner = "GeraldWodni"; @@ -10,7 +14,6 @@ swig3.overrideDerivation (old: { rev = "a45b807e5f9d8ca1a43649c8265d2741a393862a"; sha256 = "sha256-6nOOPFGFNaQInEkul0ZAh+ks9n3wqCQ6/tbduvG/To0="; }; - configureFlags = old.configureFlags ++ [ - "--enable-forth" - ]; -}) + configureFlags = old.configureFlags ++ [ "--enable-forth" ]; +})).override + { pcre2 = pcre; } diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index a4602c9a645cb..20ad72462401d 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -199,7 +199,7 @@ stdenv.mkDerivation rec { # rcodesign is used to replace the signature instead of sigtool because it # supports setting the linker-signed flag, which will ensure future processing # of the binaries does not invalidate their signatures. - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ rcodesign ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ rcodesign ]; # Set LD_LIBRARY_PATH or equivalent so that the programs running as part # of the bindist installer can find the libraries they expect. @@ -245,14 +245,14 @@ stdenv.mkDerivation rec { ]) # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - + lib.optionalString stdenv.isDarwin ('' + + lib.optionalString stdenv.hostPlatform.isDarwin ('' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do isScript $exe && continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' # Resign the binary and set the linker-signed flag. Ignore failures when the file is an object file. # Object files don’t have signatures, so ignoring the failures is harmless. rcodesign sign --code-signature-flags linker-signed $exe || true @@ -274,7 +274,7 @@ stdenv.mkDerivation rec { '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + @@ -285,7 +285,7 @@ stdenv.mkDerivation rec { -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; '' + @@ -314,7 +314,7 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${lib.getDev gmp}/include" # Note `--with-gmp-libraries` does nothing for GHC bindists: # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -349,7 +349,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString stdenv.isLinux + postFixup = lib.optionalString stdenv.hostPlatform.isLinux (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -377,7 +377,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index a6694e2e99c9c..2f031e6fbf4a8 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, buildPackages, targetPackages # build-tools , bootPkgs @@ -32,14 +32,19 @@ , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform -, enableProfiledLibs ? true + # Exceeds Hydra output limit (at the time of writing ~3GB) when cross compiled to riscv64. + # A riscv64 cross-compiler fits into the limit comfortably. +, enableProfiledLibs ? !stdenv.hostPlatform.isRiscV64 , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt , # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows + enableTerminfo ? !(stdenv.targetPlatform.isWindows + # terminfo can't be built for cross + || (stdenv.buildPlatform != stdenv.hostPlatform) + || (stdenv.hostPlatform != stdenv.targetPlatform)) , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. @@ -55,25 +60,31 @@ , enableHaddockProgram ? # Disabled for cross; see note [HADDOCK_DOCS]. - (stdenv.targetPlatform == stdenv.hostPlatform) + (stdenv.buildPlatform == stdenv.hostPlatform && stdenv.targetPlatform == stdenv.hostPlatform) , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS + +, # Whether to build an unregisterised version of GHC. + # GHC will normally auto-detect whether it can do a registered build, but this + # option will force it to do an unregistered build when set to true. + # See https://gitlab.haskell.org/ghc/ghc/-/wikis/building/unregisterised + enableUnregisterised ? false }@args: assert !enableIntegerSimple -> gmp != null; # Cross cannot currently build the `haddock` program for silly reasons, # see note [HADDOCK_DOCS]. -assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; +assert (stdenv.buildPlatform != stdenv.hostPlatform || stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +# GHC does not support building when all 3 platforms are different. +assert stdenv.buildPlatform == stdenv.hostPlatform || stdenv.hostPlatform == stdenv.targetPlatform; let - libffi_name = if stdenv.isDarwin && stdenv.isAarch64 then "libffi" else "libffi_3_3"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - inherit (bootPkgs) ghc; - # TODO(@Ericson2314) Make unconditional targetPrefix = lib.optionalString (targetPlatform != hostPlatform) @@ -86,6 +97,8 @@ let endif BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} BUILD_SPHINX_PDF = NO + + WITH_TERMINFO = ${if enableTerminfo then "YES" else "NO"} '' + # Note [HADDOCK_DOCS]: # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` @@ -134,7 +147,9 @@ let pkgsBuildTarget.targetPackages.stdenv.cc ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + buildCC = buildPackages.stdenv.cc; targetCC = builtins.head toolsForTarget; + installCC = pkgsHostTarget.targetPackages.stdenv.cc; # toolPath calculates the absolute path to the name tool associated with a # given `stdenv.cc` derivation, i.e. it picks the correct derivation to take @@ -145,12 +160,13 @@ let tools = { "cc" = cc; "c++" = cc; - as = cc.bintools.bintools; + as = cc.bintools; - ar = cc.bintools.bintools; - ranlib = cc.bintools.bintools; - nm = cc.bintools.bintools; - readelf = cc.bintools.bintools; + ar = cc.bintools; + ranlib = cc.bintools; + nm = cc.bintools; + readelf = cc.bintools; + objdump = cc.bintools; ld = cc.bintools; "ld.gold" = cc.bintools; @@ -169,6 +185,9 @@ let if stdenv.targetPlatform.isDarwin then cc.bintools else cc.bintools.bintools; + + # clang is used as an assembler on darwin with the LLVM backend + clang = cc; }.${name}; in "${tools}/bin/${tools.targetPrefix}${name}"; @@ -185,14 +204,40 @@ let (lib.optionalString enableIntegerSimple "-integer-simple") ]; -in + libffi_name = + if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 + then "libffi" + else "libffi_3_3"; + + # These libraries are library dependencies of the standard libraries bundled + # by GHC (core libs) users will link their compiled artifacts again. Thus, + # they should be taken from targetPackages. + # + # We need to use pkgsHostTarget if we are cross compiling a native GHC compiler, + # though (when native compiling GHC, pkgsHostTarget == targetPackages): + # + # 1. targetPackages would be empty(-ish) in this situation since we can't + # execute cross compiled compilers in order to obtain the libraries + # that would be in targetPackages. + # 2. pkgsHostTarget is fine to use since hostPlatform == targetPlatform in this + # situation. + # 3. The core libs used by the final GHC (stage 2) for user artifacts are also + # used to build stage 2 GHC itself, i.e. the core libs are both host and + # target. + targetLibs = + let + basePackageSet = + if hostPlatform != targetPlatform + then targetPackages + else pkgsHostTarget; + in + { + inherit (basePackageSet) gmp ncurses; + # dynamic inherits are not possible in Nix + libffi = basePackageSet.${libffi_name}; + }; -# C compiler, bintools and LLVM are used at build time, but will also leak into -# the resulting GHC's settings file and used at runtime. This means that we are -# currently only able to build GHC if hostPlatform == buildPlatform. -assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; -assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; -assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; +in stdenv.mkDerivation (rec { version = "8.10.7"; @@ -253,7 +298,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8f7dd5710b80906ea7a3e15b7bb56a883a49fed8.patch"; hash = "sha256-C636Nq2U8YOG/av7XQmG3L1rU0bmC9/7m7Hty5pm5+s="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; @@ -277,6 +322,8 @@ stdenv.mkDerivation (rec { for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do export "''${env#TARGET_}=''${!env}" done + # Stage0 (build->build) which builds stage 1 + export GHC="${bootPkgs.ghc}/bin/ghc" # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. export CC="${toolPath "cc" targetCC}" @@ -289,6 +336,7 @@ stdenv.mkDerivation (rec { export RANLIB="${toolPath "ranlib" targetCC}" export READELF="${toolPath "readelf" targetCC}" export STRIP="${toolPath "strip" targetCC}" + export OBJDUMP="${toolPath "objdump" targetCC}" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${toolPath "otool" targetCC}" export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}" @@ -297,14 +345,28 @@ stdenv.mkDerivation (rec { export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + # The executable we specify via $CLANG is used as an assembler (exclusively, it seems, but this isn't + # clarified in any user facing documentation). As such, it'll be called on assembly produced by $CC + # which usually comes from the darwin stdenv. To prevent a situation where $CLANG doesn't understand + # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible. + # It is unclear (at the time of writing 2024-09-01) whether $CC should match the LLVM version we use + # for llc and opt which would require using a custom darwin stdenv for targetCC. + export CLANG="${ + if targetCC.isClang + then toolPath "clang" targetCC + else "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + }" '' + '' + # No need for absolute paths since these tools only need to work during the build + export CC_STAGE0="$CC_FOR_BUILD" + export LD_STAGE0="$LD_FOR_BUILD" + export AR_STAGE0="$AR_FOR_BUILD" echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 @@ -329,21 +391,26 @@ stdenv.mkDerivation (rec { done ''; + # Although it is usually correct to pass --host, we don't do that here because + # GHC's usage of build, host, and target is non-standard. + # See https://gitlab.haskell.org/ghc/ghc/-/wikis/building/cross-compiling # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" ] + ++ lib.optional (buildPlatform != hostPlatform || targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals enableTerminfo [ + "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include" + "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib" ] ++ lib.optionals (args.${libffi_name} != null) [ "--with-system-libffi" - "--with-ffi-includes=${targetPackages.${libffi_name}.dev}/include" - "--with-ffi-libraries=${targetPackages.${libffi_name}.out}/lib" + "--with-ffi-includes=${targetLibs.libffi.dev}/include" + "--with-ffi-libraries=${targetLibs.libffi.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + "--with-gmp-includes=${targetLibs.gmp.dev}/include" + "--with-gmp-libraries=${targetLibs.gmp.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" @@ -355,6 +422,8 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" + ] ++ lib.optionals enableUnregisterised [ + "--enable-unregisterised" ]; # Make sure we never relax`$PATH` and hooks support for compatibility. @@ -365,17 +434,35 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ perl autoreconfHook autoconf automake m4 python3 - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + bootPkgs.ghc-settings-edit + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx ]; + # Everything the stage0 compiler needs to build stage1: CC, bintools, extra libs. + # See also GHC, {CC,LD,AR}_STAGE0 in preConfigure. + depsBuildBuild = [ + # N.B. We do not declare bootPkgs.ghc in any of the stdenv.mkDerivation + # dependency lists to prevent the bintools setup hook from adding ghc's + # lib directory to the linker flags. Instead we tell configure about it + # via the GHC environment variable. + buildCC + # stage0 builds terminfo unconditionally, so we always need ncurses + ncurses + ]; # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + # Prevent stage0 ghc from leaking into the final result. This was an issue + # with GHC 9.6. + disallowedReferences = [ + bootPkgs.ghc + ]; + + buildInputs = [ bash ] ++ (libDeps hostPlatform); depsTargetTarget = map lib.getDev (libDeps targetPlatform); depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); @@ -402,6 +489,39 @@ stdenv.mkDerivation (rec { requiredSystemFeatures = [ "big-parallel" ]; postInstall = '' + settingsFile="$out/lib/${targetPrefix}${passthru.haskellCompilerName}/settings" + + # Make the installed GHC use the host->target tools. + ghc-settings-edit "$settingsFile" \ + "C compiler command" "${toolPath "cc" installCC}" \ + "Haskell CPP command" "${toolPath "cc" installCC}" \ + "C++ compiler command" "${toolPath "c++" installCC}" \ + "ld command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \ + "Merge objects command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \ + "ar command" "${toolPath "ar" installCC}" \ + "ranlib command" "${toolPath "ranlib" installCC}" + '' + + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + ghc-settings-edit "$settingsFile" \ + "otool command" "${toolPath "otool" installCC}" \ + "install_name_tool command" "${toolPath "install_name_tool" installCC}" + '' + + lib.optionalString useLLVM '' + ghc-settings-edit "$settingsFile" \ + "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \ + "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt" + '' + + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + ghc-settings-edit "$settingsFile" \ + "LLVM clang command" "${ + # See comment for CLANG in preConfigure + if installCC.isClang + then toolPath "clang" installCC + else "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang" + }" + '' + + '' + # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc ''; @@ -427,7 +547,8 @@ stdenv.mkDerivation (rec { guibou ] ++ lib.teams.haskell.members; timeout = 24 * 3600; - inherit (ghc.meta) license platforms; + platforms = lib.platforms.all; + inherit (bootPkgs.ghc.meta) license; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index d66f47b661a5d..eef0cba9f00bd 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -26,7 +26,7 @@ let libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; - glibcDynLinker = assert stdenv.isLinux; + glibcDynLinker = assert stdenv.hostPlatform.isLinux; if stdenv.hostPlatform.libc == "glibc" then # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { postUnpack = # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -110,15 +110,15 @@ stdenv.mkDerivation rec { '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -perm -0100 \ -exec patchelf \ - --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --replace-needed libncurses${lib.optionalString stdenv.hostPlatform.is64bit "w"}.so.5 libncurses.so \ ${ # This isn't required for x86_64-linux where we use ncurses6 lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5" } \ @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${lib.getDev gmp}/include" # Note `--with-gmp-libraries` does nothing for GHC bindists: # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; # No building is necessary, but calling make without flags ironically @@ -160,14 +160,14 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for p in $(find "$out" -type f -executable); do if isELF "$p"; then echo "Patchelfing $p" patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 920b63ce4eab0..e8c6d83ea82fe 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -222,7 +222,7 @@ stdenv.mkDerivation rec { ]) # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -247,7 +247,7 @@ stdenv.mkDerivation rec { # we need to modify the package db directly for hadrian bindists find . -name 'ghc-bignum*.conf' \ -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # we need to modify the package db directly for hadrian bindists # (all darwin bindists are hadrian-based for 9.2.2) find . -name 'base*.conf' \ @@ -266,7 +266,7 @@ stdenv.mkDerivation rec { -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; ''; @@ -281,7 +281,7 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${lib.getDev gmpUsed}/include" # Note `--with-gmp-libraries` does nothing for GHC bindists: # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -316,7 +316,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString (stdenv.isLinux && !(binDistUsed.isStatic or false)) + postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -344,7 +344,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index d67e9f47ac48f..6d8f195bb9d30 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -218,7 +218,7 @@ stdenv.mkDerivation rec { ]) # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -235,7 +235,7 @@ stdenv.mkDerivation rec { -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; '' # Similar for iconv and libffi on darwin - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' find . -name 'base*.conf' \ -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libiconv}/lib' -i {} \; @@ -252,7 +252,7 @@ stdenv.mkDerivation rec { -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; ''; @@ -267,7 +267,7 @@ stdenv.mkDerivation rec { configurePlatforms = [ ]; configureFlags = - lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -308,7 +308,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString (stdenv.isLinux && !(binDistUsed.isStatic or false)) + postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -336,7 +336,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isMachO $exe || continue diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index b6d4d7236fe6b..43a8310836ad3 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -12,6 +12,7 @@ , stdenv , pkgsBuildTarget , pkgsHostTarget +, buildPackages , targetPackages , fetchpatch @@ -58,15 +59,23 @@ , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform -, enableProfiledLibs ? true + # Exceeds Hydra output limit (at the time of writing ~3GB) when cross compiled to riscv64. + # A riscv64 cross-compiler fits into the limit comfortably. +, enableProfiledLibs ? !stdenv.hostPlatform.isRiscV64 , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic && !isGhcjs , # Whether to build terminfo. + # FIXME(@sternenseemann): This actually doesn't influence what hadrian does, + # just what buildInputs etc. looks like. It would be best if we could actually + # tell it what to do like it was possible with make. enableTerminfo ? !(stdenv.targetPlatform.isWindows - || stdenv.targetPlatform.isGhcjs) + || stdenv.targetPlatform.isGhcjs + # terminfo can't be built for cross + || (stdenv.buildPlatform != stdenv.hostPlatform) + || (stdenv.hostPlatform != stdenv.targetPlatform)) , # Libdw.c only supports x86_64, i686 and s390x as of 2022-08-04 enableDwarf ? (stdenv.targetPlatform.isx86 || @@ -117,9 +126,8 @@ -- no way to set this via the command line finalStage :: Stage finalStage = ${ - # Always build the stage 2 compiler if possible. Note we can currently - # assume hostPlatform == buildPlatform. - # TODO(@sternenseemann): improve this condition when we can cross-compile GHC + # Always build the stage 2 compiler if possible. + # TODO(@sternensemann): unify condition with make-built GHCs if stdenv.hostPlatform.canExecute stdenv.targetPlatform then "Stage2" # native compiler or “native” cross e.g. pkgsStatic else "Stage1" # cross compiler @@ -178,6 +186,15 @@ hash = "sha256-MpvTmFFsNiPDoOp9BhZyWeapeibQ77zgEV+xzZ1UAXs="; }) ] + ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.8") [ + # Fix unlit being installed under a different name than is used in the + # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 + (fetchpatch { + name = "ghc-9.6-fix-unlit-path.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8fde4ac84ec7b1ead238cb158bbef48555d12af9.patch"; + hash = "sha256-3+CyRBpebEZi8YpS22SsdGQHqi0drR7cCKPtKbR3zyE="; + }) + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. @@ -222,15 +239,25 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS + +, # Whether to build an unregisterised version of GHC. + # GHC will normally auto-detect whether it can do a registered build, but this + # option will force it to do an unregistered build when set to true. + # See https://gitlab.haskell.org/ghc/ghc/-/wikis/building/unregisterised + enableUnregisterised ? false }: assert !enableNativeBignum -> gmp != null; +# GHC does not support building when all 3 platforms are different. +assert stdenv.buildPlatform == stdenv.hostPlatform || stdenv.hostPlatform == stdenv.targetPlatform; + +# It is currently impossible to cross-compile GHC with Hadrian. +assert stdenv.buildPlatform == stdenv.hostPlatform; + let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - inherit (bootPkgs) ghc; - # TODO(@Ericson2314) Make unconditional targetPrefix = lib.optionalString (targetPlatform != hostPlatform) @@ -265,7 +292,12 @@ let else pkgsBuildTarget.targetPackages.stdenv.cc) ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + buildCC = buildPackages.stdenv.cc; targetCC = builtins.head toolsForTarget; + installCC = + if targetPlatform.isGhcjs + then pkgsHostTarget.emscripten + else pkgsHostTarget.targetPackages.stdenv.cc; # toolPath calculates the absolute path to the name tool associated with a # given `stdenv.cc` derivation, i.e. it picks the correct derivation to take @@ -276,12 +308,13 @@ let tools = { "cc" = cc; "c++" = cc; - as = cc.bintools.bintools; + as = cc.bintools; - ar = cc.bintools.bintools; - ranlib = cc.bintools.bintools; - nm = cc.bintools.bintools; - readelf = cc.bintools.bintools; + ar = cc.bintools; + ranlib = cc.bintools; + nm = cc.bintools; + readelf = cc.bintools; + objdump = cc.bintools; ld = cc.bintools; "ld.gold" = cc.bintools; @@ -300,6 +333,9 @@ let if stdenv.targetPlatform.isDarwin then cc.bintools else cc.bintools.bintools; + + # clang is used as an assembler on darwin with the LLVM backend + clang = cc; }.${name}; in "${tools}/bin/${tools.targetPrefix}${name}"; @@ -316,14 +352,34 @@ let (lib.optionalString enableNativeBignum "-native-bignum") ]; -in + # These libraries are library dependencies of the standard libraries bundled + # by GHC (core libs) users will link their compiled artifacts again. Thus, + # they should be taken from targetPackages. + # + # We need to use pkgsHostTarget if we are cross compiling a native GHC compiler, + # though (when native compiling GHC, pkgsHostTarget == targetPackages): + # + # 1. targetPackages would be empty(-ish) in this situation since we can't + # execute cross compiled compilers in order to obtain the libraries + # that would be in targetPackages. + # 2. pkgsHostTarget is fine to use since hostPlatform == targetPlatform in this + # situation. + # 3. The core libs used by the final GHC (stage 2) for user artifacts are also + # used to build stage 2 GHC itself, i.e. the core libs are both host and + # target. + targetLibs = { + inherit + (if hostPlatform != targetPlatform then targetPackages else pkgsHostTarget) + elfutils + gmp + libffi + ncurses; + }; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; -# C compiler, bintools and LLVM are used at build time, but will also leak into -# the resulting GHC's settings file and used at runtime. This means that we are -# currently only able to build GHC if hostPlatform == buildPlatform. -assert !targetPlatform.isGhcjs -> targetCC == pkgsHostTarget.targetPackages.stdenv.cc; -assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; -assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; +in stdenv.mkDerivation ({ pname = "${targetPrefix}ghc${variantSuffix}"; @@ -346,6 +402,13 @@ stdenv.mkDerivation ({ for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do export "''${env#TARGET_}=''${!env}" done + # No need for absolute paths since these tools only need to work during the build + export CC_STAGE0="$CC_FOR_BUILD" + export LD_STAGE0="$LD_FOR_BUILD" + export AR_STAGE0="$AR_FOR_BUILD" + + # Stage0 (build->build) which builds stage 1 + export GHC="${bootPkgs.ghc}/bin/ghc" # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. export CC="${toolPath "cc" targetCC}" @@ -358,6 +421,7 @@ stdenv.mkDerivation ({ export RANLIB="${toolPath "ranlib" targetCC}" export READELF="${toolPath "readelf" targetCC}" export STRIP="${toolPath "strip" targetCC}" + export OBJDUMP="${toolPath "objdump" targetCC}" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${toolPath "otool" targetCC}" export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}" @@ -366,13 +430,23 @@ stdenv.mkDerivation ({ export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + # The executable we specify via $CLANG is used as an assembler (exclusively, it seems, but this isn't + # clarified in any user facing documentation). As such, it'll be called on assembly produced by $CC + # which usually comes from the darwin stdenv. To prevent a situation where $CLANG doesn't understand + # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible. + # It is unclear (at the time of writing 2024-09-01) whether $CC should match the LLVM version we use + # for llc and opt which would require using a custom darwin stdenv for targetCC. + export CLANG="${ + if targetCC.isClang + then toolPath "clang" targetCC + else "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + }" '' + - lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 @@ -433,14 +507,16 @@ stdenv.mkDerivation ({ # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals enableTerminfo [ + "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include" + "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib" ] ++ lib.optionals (libffi != null && !targetPlatform.isGhcjs) [ "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + "--with-ffi-includes=${targetLibs.libffi.dev}/include" + "--with-ffi-libraries=${targetLibs.libffi.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + "--with-gmp-includes=${targetLibs.gmp.dev}/include" + "--with-gmp-libraries=${targetLibs.gmp.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" @@ -454,14 +530,16 @@ stdenv.mkDerivation ({ "--disable-large-address-space" ] ++ lib.optionals enableDwarf [ "--enable-dwarf-unwind" - "--with-libdw-includes=${lib.getDev targetPackages.elfutils}/include" - "--with-libdw-libraries=${lib.getLib targetPackages.elfutils}/lib" + "--with-libdw-includes=${lib.getDev targetLibs.elfutils}/include" + "--with-libdw-libraries=${lib.getLib targetLibs.elfutils}/lib" ] ++ lib.optionals targetPlatform.isDarwin [ # Darwin uses llvm-ar. GHC will try to use `-L` with `ar` when it is `llvm-ar` # but it doesn’t currently work because Cabal never uses `-L` on Darwin. See: # https://gitlab.haskell.org/ghc/ghc/-/issues/23188 # https://github.com/haskell/cabal/issues/8882 "fp_cv_prog_ar_supports_dash_l=no" + ] ++ lib.optionals enableUnregisterised [ + "--enable-unregisterised" ]; # Make sure we never relax`$PATH` and hooks support for compatibility. @@ -471,12 +549,14 @@ stdenv.mkDerivation ({ dontAddExtraLibs = true; nativeBuildInputs = [ - perl ghc hadrian bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + perl hadrian bootPkgs.alex bootPkgs.happy bootPkgs.hscolour # autoconf and friends are necessary for hadrian to create the bindist autoconf automake m4 # Python is used in a few scripts invoked by hadrian to generate e.g. rts headers. python3 - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Tool used to update GHC's settings file in postInstall + bootPkgs.ghc-settings-edit + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx @@ -484,8 +564,25 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = toolsForTarget; + # Everything the stage0 compiler needs to build stage1: CC, bintools, extra libs. + # See also GHC, {CC,LD,AR}_STAGE0 in preConfigure. + depsBuildBuild = [ + # N.B. We do not declare bootPkgs.ghc in any of the stdenv.mkDerivation + # dependency lists to prevent the bintools setup hook from adding ghc's + # lib directory to the linker flags. Instead we tell configure about it + # via the GHC environment variable. + buildCC + # stage0 builds terminfo unconditionally, so we always need ncurses + ncurses + ]; + + # Prevent stage0 ghc from leaking into the final result. This was an issue + # with GHC 9.6. + disallowedReferences = [ + bootPkgs.ghc + ]; - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + buildInputs = [ bash ] ++ (libDeps hostPlatform); depsTargetTarget = map lib.getDev (libDeps targetPlatform); depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); @@ -553,19 +650,49 @@ stdenv.mkDerivation ({ # leave bindist directory popd + settingsFile="$out/lib/${targetPrefix}${haskellCompilerName}/lib/settings" + + # Make the installed GHC use the host->target tools. + ghc-settings-edit "$settingsFile" \ + "C compiler command" "${toolPath "cc" installCC}" \ + "Haskell CPP command" "${toolPath "cc" installCC}" \ + "C++ compiler command" "${toolPath "c++" installCC}" \ + "ld command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \ + "Merge objects command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \ + "ar command" "${toolPath "ar" installCC}" \ + "ranlib command" "${toolPath "ranlib" installCC}" + '' + + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + ghc-settings-edit "$settingsFile" \ + "otool command" "${toolPath "otool" installCC}" \ + "install_name_tool command" "${toolPath "install_name_tool" installCC}" + '' + + lib.optionalString useLLVM '' + ghc-settings-edit "$settingsFile" \ + "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \ + "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt" + '' + + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + ghc-settings-edit "$settingsFile" \ + "LLVM clang command" "${ + # See comment for CLANG in preConfigure + if installCC.isClang + then toolPath "clang" installCC + else "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang" + }" + '' + + '' + # Install the bash completion file. install -Dm 644 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc ''; passthru = { - inherit bootPkgs targetPrefix; + inherit bootPkgs targetPrefix haskellCompilerName; inherit llvmPackages; inherit enableShared; - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - # Expose hadrian used for bootstrapping, for debugging purposes inherit hadrian; @@ -581,7 +708,8 @@ stdenv.mkDerivation ({ guibou ] ++ lib.teams.haskell.members; timeout = 24 * 3600; - inherit (ghc.meta) license platforms; + platforms = lib.platforms.all; + inherit (bootPkgs.ghc.meta) license; }; dontStrip = targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm; diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 2b23cd75a0ed7..7593a175c77cd 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -3,7 +3,7 @@ , url ? "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz" }: -{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, buildPackages, targetPackages # build-tools , bootPkgs @@ -35,14 +35,19 @@ , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform -, enableProfiledLibs ? true + # Exceeds Hydra output limit (at the time of writing ~3GB) when cross compiled to riscv64. + # A riscv64 cross-compiler fits into the limit comfortably. +, enableProfiledLibs ? !stdenv.hostPlatform.isRiscV64 , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic , # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows + enableTerminfo ? !(stdenv.targetPlatform.isWindows + # terminfo can't be built for cross + || (stdenv.buildPlatform != stdenv.hostPlatform) + || (stdenv.hostPlatform != stdenv.targetPlatform)) , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. @@ -58,24 +63,33 @@ , enableHaddockProgram ? # Disabled for cross; see note [HADDOCK_DOCS]. - (stdenv.targetPlatform == stdenv.hostPlatform) + (stdenv.buildPlatform == stdenv.hostPlatform && stdenv.targetPlatform == stdenv.hostPlatform) , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS + +, # Whether to build an unregisterised version of GHC. + # GHC will normally auto-detect whether it can do a registered build, but this + # option will force it to do an unregistered build when set to true. + # See https://gitlab.haskell.org/ghc/ghc/-/wikis/building/unregisterised + # Registerised RV64 compiler produces programs that segfault + # See https://gitlab.haskell.org/ghc/ghc/-/issues/23957 + enableUnregisterised ? stdenv.hostPlatform.isRiscV64 || stdenv.targetPlatform.isRiscV64 }: assert !enableNativeBignum -> gmp != null; # Cross cannot currently build the `haddock` program for silly reasons, # see note [HADDOCK_DOCS]. -assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; +assert (stdenv.buildPlatform != stdenv.hostPlatform || stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +# GHC does not support building when all 3 platforms are different. +assert stdenv.buildPlatform == stdenv.hostPlatform || stdenv.hostPlatform == stdenv.targetPlatform; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - inherit (bootPkgs) ghc; - # TODO(@Ericson2314) Make unconditional targetPrefix = lib.optionalString (targetPlatform != hostPlatform) @@ -88,6 +102,8 @@ let endif BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} BUILD_SPHINX_PDF = NO + + WITH_TERMINFO = ${if enableTerminfo then "YES" else "NO"} '' + # Note [HADDOCK_DOCS]: # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` @@ -134,7 +150,9 @@ let pkgsBuildTarget.targetPackages.stdenv.cc ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + buildCC = buildPackages.stdenv.cc; targetCC = builtins.head toolsForTarget; + installCC = pkgsHostTarget.targetPackages.stdenv.cc; # toolPath calculates the absolute path to the name tool associated with a # given `stdenv.cc` derivation, i.e. it picks the correct derivation to take @@ -145,12 +163,13 @@ let tools = { "cc" = cc; "c++" = cc; - as = cc.bintools.bintools; + as = cc.bintools; - ar = cc.bintools.bintools; - ranlib = cc.bintools.bintools; - nm = cc.bintools.bintools; - readelf = cc.bintools.bintools; + ar = cc.bintools; + ranlib = cc.bintools; + nm = cc.bintools; + readelf = cc.bintools; + objdump = cc.bintools; ld = cc.bintools; "ld.gold" = cc.bintools; @@ -169,6 +188,9 @@ let if stdenv.targetPlatform.isDarwin then cc.bintools else cc.bintools.bintools; + + # clang is used as an assembler on darwin with the LLVM backend + clang = cc; }.${name}; in "${tools}/bin/${tools.targetPrefix}${name}"; @@ -185,14 +207,30 @@ let (lib.optionalString enableNativeBignum "-native-bignum") ]; -in + # These libraries are library dependencies of the standard libraries bundled + # by GHC (core libs) users will link their compiled artifacts again. Thus, + # they should be taken from targetPackages. + # + # We need to use pkgsHostTarget if we are cross compiling a native GHC compiler, + # though (when native compiling GHC, pkgsHostTarget == targetPackages): + # + # 1. targetPackages would be empty(-ish) in this situation since we can't + # execute cross compiled compilers in order to obtain the libraries + # that would be in targetPackages. + # 2. pkgsHostTarget is fine to use since hostPlatform == targetPlatform in this + # situation. + # 3. The core libs used by the final GHC (stage 2) for user artifacts are also + # used to build stage 2 GHC itself, i.e. the core libs are both host and + # target. + targetLibs = { + inherit + (if hostPlatform != targetPlatform then targetPackages else pkgsHostTarget) + gmp + libffi + ncurses; + }; -# C compiler, bintools and LLVM are used at build time, but will also leak into -# the resulting GHC's settings file and used at runtime. This means that we are -# currently only able to build GHC if hostPlatform == buildPlatform. -assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; -assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; -assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; +in stdenv.mkDerivation (rec { pname = "${targetPrefix}ghc${variantSuffix}"; @@ -282,6 +320,8 @@ stdenv.mkDerivation (rec { for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do export "''${env#TARGET_}=''${!env}" done + # Stage0 (build->build) which builds stage 1 + export GHC="${bootPkgs.ghc}/bin/ghc" # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. export CC="${toolPath "cc" targetCC}" @@ -294,6 +334,7 @@ stdenv.mkDerivation (rec { export RANLIB="${toolPath "ranlib" targetCC}" export READELF="${toolPath "readelf" targetCC}" export STRIP="${toolPath "strip" targetCC}" + export OBJDUMP="${toolPath "objdump" targetCC}" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${toolPath "otool" targetCC}" export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}" @@ -302,20 +343,35 @@ stdenv.mkDerivation (rec { export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + # The executable we specify via $CLANG is used as an assembler (exclusively, it seems, but this isn't + # clarified in any user facing documentation). As such, it'll be called on assembly produced by $CC + # which usually comes from the darwin stdenv. To prevent a situation where $CLANG doesn't understand + # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible. + # It is unclear (at the time of writing 2024-09-01) whether $CC should match the LLVM version we use + # for llc and opt which would require using a custom darwin stdenv for targetCC. + export CLANG="${ + if targetCC.isClang + then toolPath "clang" targetCC + else "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + }" '' + '' + # No need for absolute paths since these tools only need to work during the build + export CC_STAGE0="$CC_FOR_BUILD" + export LD_STAGE0="$LD_FOR_BUILD" + export AR_STAGE0="$AR_FOR_BUILD" + echo -n "${buildMK}" > mk/build.mk '' + lib.optionalString (lib.versionOlder version "9.2" || lib.versionAtLeast version "9.4") '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast version "9.2") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "9.2") '' # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 export XATTR=${lib.getBin xattr}/bin/xattr @@ -346,21 +402,26 @@ stdenv.mkDerivation (rec { 'MinBootGhcVersion="8.10"' ''; + # Although it is usually correct to pass --host, we don't do that here because + # GHC's usage of build, host, and target is non-standard. + # See https://gitlab.haskell.org/ghc/ghc/-/wikis/building/cross-compiling # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" ] + ++ lib.optional (buildPlatform != hostPlatform || targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals enableTerminfo [ + "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include" + "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib" ] ++ lib.optionals (libffi != null) [ "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + "--with-ffi-includes=${targetLibs.libffi.dev}/include" + "--with-ffi-libraries=${targetLibs.libffi.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + "--with-gmp-includes=${targetLibs.gmp.dev}/include" + "--with-gmp-libraries=${targetLibs.gmp.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" @@ -372,6 +433,8 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" + ] ++ lib.optionals enableUnregisterised [ + "--enable-unregisterised" ]; # Make sure we never relax`$PATH` and hooks support for compatibility. @@ -382,21 +445,39 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ perl autoconf automake m4 python3 - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + bootPkgs.ghc-settings-edit + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx - ] ++ lib.optionals (stdenv.isDarwin && lib.versions.majorMinor version == "9.0") [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versions.majorMinor version == "9.0") [ # TODO(@sternenseemann): backport addition of XATTR env var like # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447 xattr ]; + # Everything the stage0 compiler needs to build stage1: CC, bintools, extra libs. + # See also GHC, {CC,LD,AR}_STAGE0 in preConfigure. + depsBuildBuild = [ + # N.B. We do not declare bootPkgs.ghc in any of the stdenv.mkDerivation + # dependency lists to prevent the bintools setup hook from adding ghc's + # lib directory to the linker flags. Instead we tell configure about it + # via the GHC environment variable. + buildCC + # stage0 builds terminfo unconditionally, so we always need ncurses + ncurses + ]; # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + # Prevent stage0 ghc from leaking into the final result. This was an issue + # with GHC 9.6. + disallowedReferences = [ + bootPkgs.ghc + ]; + + buildInputs = [ bash ] ++ (libDeps hostPlatform); depsTargetTarget = map lib.getDev (libDeps targetPlatform); depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); @@ -423,6 +504,39 @@ stdenv.mkDerivation (rec { requiredSystemFeatures = [ "big-parallel" ]; postInstall = '' + settingsFile="$out/lib/${targetPrefix}${passthru.haskellCompilerName}/settings" + + # Make the installed GHC use the host->target tools. + ghc-settings-edit "$settingsFile" \ + "C compiler command" "${toolPath "cc" installCC}" \ + "Haskell CPP command" "${toolPath "cc" installCC}" \ + "C++ compiler command" "${toolPath "c++" installCC}" \ + "ld command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \ + "Merge objects command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \ + "ar command" "${toolPath "ar" installCC}" \ + "ranlib command" "${toolPath "ranlib" installCC}" + '' + + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + ghc-settings-edit "$settingsFile" \ + "otool command" "${toolPath "otool" installCC}" \ + "install_name_tool command" "${toolPath "install_name_tool" installCC}" + '' + + lib.optionalString useLLVM '' + ghc-settings-edit "$settingsFile" \ + "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \ + "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt" + '' + + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + ghc-settings-edit "$settingsFile" \ + "LLVM clang command" "${ + # See comment for CLANG in preConfigure + if installCC.isClang + then toolPath "clang" installCC + else "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang" + }" + '' + + '' + # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc ''; @@ -448,7 +562,8 @@ stdenv.mkDerivation (rec { guibou ] ++ lib.teams.haskell.members; timeout = 24 * 3600; - inherit (ghc.meta) license platforms; + platforms = lib.platforms.all; + inherit (bootPkgs.ghc.meta) license; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index 9a648f8384060..aea58c62b6d10 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { xorg.lndir gmp pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc # https://github.com/ghcjs/ghcjs/issues/663 ]; dontConfigure = true; diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 538711b2bd68e..650e46ff51b1a 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,21 +12,21 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.4.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-z9xDMQXzVUeHne7KG4QsutQAiU01mgnV7ccdkjl+EkU="; + hash = "sha256-4/NDZGq62M0tdWerIkmoYS0WHC06AV8c9vlo/6FhsAo="; }; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-XKHcA4DSVsWZfUHT6BkRjK0Mzz90E+ohYrtwZKPMtTY="; + cargoHash = "sha256-B8tCVkubP04gAHKQC0idR5AjpVHG/kCXvPCfwKCuaSo="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix deleted file mode 100644 index 83f24fff864eb..0000000000000 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoconf269 -, automake -, libtool -, pkg-config -# libs -, cjson -, db -, gmp -, libxml2 -, ncurses -# docs -, help2man -, texinfo -, texliveBasic -# test -}: - -stdenv.mkDerivation rec { - pname = "gnu-cobol"; - version = "3.2"; - - src = fetchurl { - url = "mirror://sourceforge/gnucobol/${lib.versions.majorMinor version}/gnucobol-${version}.tar.xz"; - hash = "sha256-O7SK9GztR3n6z0H9wu5g5My4bqqZ0BCzZoUxXfOcLuI="; - }; - - nativeBuildInputs = [ - pkg-config - autoconf269 - automake - libtool - help2man - texinfo - texliveBasic - ]; - - buildInputs = [ - cjson - db - gmp - libxml2 - ncurses - ]; - - outputs = [ "bin" "dev" "lib" "out" ]; - # XXX: Without this, we get a cycle between bin and dev - propagatedBuildOutputs = []; - - # Skips a broken test - postPatch = '' - sed -i '/^AT_CHECK.*crud\.cob/i AT_SKIP_IF([true])' tests/testsuite.src/listings.at - # upstream reports the following tests as known failures - # test 843: - sed -i '14180i\AT_SKIP_IF([true])' tests/testsuite.src/run_misc.at - # test 875: - sed -i '2894s/^/AT_SKIP_IF([true])/' tests/testsuite.src/run_file.at - ''; - - preConfigure = '' - autoconf - aclocal - automake - '' + lib.optionalString stdenv.isDarwin '' - # when building with nix on darwin, configure will use GNU strip, - # which fails due to using --strip-unneeded, which is not supported - substituteInPlace configure --replace-fail '"GNU strip"' 'FAKE GNU strip' - ''; - - # error: call to undeclared function 'xmlCleanupParser' - # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - env.CFLAGS = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; - - enableParallelBuilding = true; - - installFlags = [ "install-pdf" "install-html" "localedir=$out/share/locale" ]; - - # Tests must run after install. - doCheck = false; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - # Run tests - TESTSUITEFLAGS="--jobs=$NIX_BUILD_CORES" make check - - # Sanity check - message="Hello, COBOL!" - # XXX: Don't for a second think you can just get rid of these spaces, they - # are load bearing. - tee hello.cbl <<EOF - IDENTIFICATION DIVISION. - PROGRAM-ID. HELLO. - - PROCEDURE DIVISION. - DISPLAY "$message". - STOP RUN. - EOF - $bin/bin/cobc -x -o hello-cobol "hello.cbl" - hello="$(./hello-cobol | tee >(cat >&2))" - [[ "$hello" == "$message" ]] || exit 1 - - runHook postInstallCheck - ''; - - meta = with lib; { - description = "Open-source COBOL compiler"; - homepage = "https://sourceforge.net/projects/gnucobol/"; - license = with licenses; [ gpl3Only lgpl3Only ]; - maintainers = with maintainers; [ ericsagnes lovesegfault techknowlogick ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix deleted file mode 100644 index 7c8f1fbd9cde8..0000000000000 --- a/pkgs/development/compilers/go/1.21.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ lib -, stdenv -, fetchurl -, tzdata -, substituteAll -, iana-etc -, Security -, Foundation -, xcbuild -, mailcap -, buildPackages -, pkgsBuildTarget -, threadsCross -, testers -, skopeo -, buildGo121Module -}: - -let - goBootstrap = buildPackages.callPackage ./bootstrap121.nix { }; - - skopeoTest = skopeo.override { buildGoModule = buildGo121Module; }; - - goarch = platform: { - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "i686" = "386"; - "mips" = "mips"; - "mips64el" = "mips64le"; - "mipsel" = "mipsle"; - "powerpc64" = "ppc64"; - "powerpc64le" = "ppc64le"; - "riscv64" = "riscv64"; - "s390x" = "s390x"; - "x86_64" = "amd64"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); - - # We need a target compiler which is still runnable at build time, - # to handle the cross-building case where build != host == target - targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; - - isCross = stdenv.buildPlatform != stdenv.targetPlatform; -in -stdenv.mkDerivation (finalAttrs: { - pname = "go"; - version = "1.21.13"; - - src = fetchurl { - url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-cfsxYGod5I0SnVkehxemPgxVZf+6CaJOqfiZoTIUw00="; - }; - - strictDeps = true; - buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; - - depsBuildTarget = lib.optional isCross targetCC; - - depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; - - postPatch = '' - patchShebangs . - ''; - - patches = [ - (substituteAll { - src = ./iana-etc-1.17.patch; - iana = iana-etc; - }) - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - (substituteAll { - src = ./mailcap-1.17.patch; - inherit mailcap; - }) - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - (substituteAll { - src = ./tzdata-1.19.patch; - inherit tzdata; - }) - ./remove-tools-1.11.patch - ./go_no_vendor_checks-1.21.patch - ]; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}c++" - else - null; - - GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - buildPhase = '' - runHook preBuild - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - ${lib.optionalString isCross '' - # Independent from host/target, CC should produce code for the building system. - # We only set it when cross-compiling. - export CC=${buildPackages.stdenv.cc}/bin/cc - ''} - ulimit -a - - pushd src - ./make.bash - popd - runHook postBuild - ''; - - preInstall = '' - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' - rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} - ''} - '' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) '' - rm -rf bin/*_* - ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' - rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH} - ''} - ''); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc go.env $GOROOT_FINAL - mkdir -p $out/bin - ln -s $GOROOT_FINAL/bin/* $out/bin - runHook postInstall - ''; - - disallowedReferences = [ goBootstrap ]; - - passthru = { - inherit goBootstrap skopeoTest; - tests = { - skopeo = testers.testVersion { package = skopeoTest; }; - version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "go version"; - version = "go${finalAttrs.version}"; - }; - }; - }; - - meta = with lib; { - changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}"; - description = "Go Programming language"; - homepage = "https://go.dev/"; - license = licenses.bsd3; - maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux ++ platforms.freebsd; - mainProgram = "go"; - }; -}) diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index 5cc070d34e0d0..afda23ba96d8e 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -47,16 +47,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.22.6"; + version = "1.22.7"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-nkjZnVGYgleZF9gYnBfpjDc84lq667mHcuKScIiZKlE="; + hash = "sha256-ZkMth9heDPrD7f/mN9WTD8Td9XkzE/4R5KDzMwI8h58="; }; strictDeps = true; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index b9644f8d0aaea..65c562389b9b9 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -47,16 +47,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.0"; + version = "1.23.1"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-Qreo6A2AXaoDAi7T/eQyHUw78smQoUQWXQHu7Nb2mcY="; + hash = "sha256-buROKYN50Ual5aprHFtdX10KM2XqvdcHQebiE0DsOw0="; }; strictDeps = true; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; diff --git a/pkgs/development/compilers/go/binary.nix b/pkgs/development/compilers/go/binary.nix index 777c82a597752..3c43cc4de1508 100644 --- a/pkgs/development/compilers/go/binary.nix +++ b/pkgs/development/compilers/go/binary.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, version, hashes }: +{ lib, stdenv, fetchurl, version, hashes }: let toGoKernel = platform: if platform.isDarwin then "darwin" @@ -18,7 +18,7 @@ let platform = toGoPlatform stdenv.hostPlatform; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "go-${version}-${platform}-bootstrap"; src = fetchurl { @@ -36,4 +36,14 @@ stdenv.mkDerivation rec { ln -s $out/share/go/bin/go $out/bin/go runHook postInstall ''; + + meta = { + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}"; + description = "The Go Programming language"; + homepage = "https://go.dev/"; + license = lib.licenses.bsd3; + maintainers = lib.teams.golang.members; + platforms = lib.platforms.darwin ++ lib.platforms.linux; + }; } diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch deleted file mode 100644 index 1adbf46398c5c..0000000000000 --- a/pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go -index ffc79bb93f..2d0311975d 100644 ---- a/src/cmd/go/internal/modload/vendor.go -+++ b/src/cmd/go/internal/modload/vendor.go -@@ -144,7 +144,7 @@ func checkVendorConsistency(index *modFileIndex, modFile *modfile.File) { - readVendorList(MainModules.mustGetSingleMainModule()) - - pre114 := false -- if gover.Compare(index.goVersion, "1.14") < 0 { -+ if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 6868ca9f8d8f7..3cd5c1bcfa4cb 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE="; }; - hardeningDisable = lib.optional stdenv.isi686 "pic"; + hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "pic"; patchPhase = '' sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" src/Pl2Wam/check_boot diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 83d60202a4fca..d360da5dfa6c3 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -18,12 +18,12 @@ , zlib # extra params , extraCLibs ? [ ] -, gtkSupport ? stdenv.isLinux +, gtkSupport ? stdenv.hostPlatform.isLinux , useMusl ? false , ... } @ args: -assert useMusl -> stdenv.isLinux; +assert useMusl -> stdenv.hostPlatform.isLinux; let extraArgs = builtins.removeAttrs args [ "lib" @@ -51,7 +51,7 @@ let "meta" ]; - cLibs = lib.optionals stdenv.isLinux ( + cLibs = lib.optionals stdenv.hostPlatform.isLinux ( [ glibc zlib.static ] ++ lib.optionals (!useMusl) [ glibc.static ] ++ lib.optionals useMusl [ musl ] @@ -86,7 +86,7 @@ let # # We therefor use --strip-components=1 vs 3 depending on the platform. tar xf "$src" -C "$out" --strip-components=${ - if stdenv.isLinux then "1" else "3" + if stdenv.hostPlatform.isLinux then "1" else "3" } # Sanity check @@ -104,12 +104,12 @@ let dontStrip = true; nativeBuildInputs = [ unzip makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; propagatedBuildInputs = [ setJavaClassPath zlib ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk_11_0.frameworks.Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk_11_0.frameworks.Foundation; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig stdenv.cc.cc.lib # libstdc++.so.6 @@ -124,6 +124,12 @@ let # jni.h expects jni_md.h to be in the header search path. ln -sf $out/include/linux/*_md.h $out/include/ + mkdir -p $out/share + # move files in $out like LICENSE.txt + find $out/ -maxdepth 1 -type f -exec mv {} $out/share \; + # symbolic link to $out/lib/svm/LICENSE_NATIVEIMAGE.txt + rm -f $out/LICENSE_NATIVEIMAGE.txt + # copy-paste openjdk's preFixup # Set JAVA_HOME automatically. mkdir -p $out/nix-support @@ -136,7 +142,7 @@ let ${toString (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} ''; - preFixup = lib.optionalString (stdenv.isLinux) '' + preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) '' for bin in $(find "$out/bin" -executable -type f); do wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" done @@ -147,7 +153,7 @@ let runHook preInstallCheck ${# broken in darwin - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' echo "Testing Jshell" echo '1 + 1' | $out/bin/jshell ''} @@ -172,14 +178,14 @@ let ./helloworld | fgrep 'Hello World' ${# -H:+StaticExecutableWithDynamicLibC is only available in Linux - lib.optionalString (stdenv.isLinux && !useMusl) '' + lib.optionalString (stdenv.hostPlatform.isLinux && !useMusl) '' echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC -march=compatibility $extraNativeImageArgs HelloWorld ./helloworld | fgrep 'Hello World' ''} ${# --static is only available in Linux - lib.optionalString (stdenv.isLinux && useMusl) '' + lib.optionalString (stdenv.hostPlatform.isLinux && useMusl) '' echo "Ahead-Of-Time compilation with --static and --libc=musl" $out/bin/native-image $extraNativeImageArgs -march=compatibility --libc=musl --static HelloWorld ./helloworld | fgrep 'Hello World' diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index 907441ff68c42..2c8220d89a0a8 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation ({ pname = product; nativeBuildInputs = [ makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook ++ extraNativeBuildInputs; buildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation ({ zlib libxcrypt-legacy # libcrypt.so.1 (default is .2 now) ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation ++ extraBuildInputs; unpackPhase = '' diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index bfc9c729689c4..c546d65ef02c2 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -5,7 +5,7 @@ lib.makeScope pkgs.newScope (self: { stdenv = - if pkgs.stdenv.isDarwin then + if pkgs.stdenv.hostPlatform.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix index 2c7e931a8a7b5..b0834d839e67c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "22.0.2"; + "version" = "23.0.0"; "hashes" = { "aarch64-linux" = { - sha256 = "1n8ln1xk60hjvr191pj1mpg793zmq531mkwx3la8d2x6by0lrji8"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_linux-aarch64_bin.tar.gz"; + sha256 = "084b0xwadq3ppk1wfn56z17hm02vlqq6vzhj7vmqcb8injym7bj2"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.0/graalvm-community-jdk-23.0.0_linux-aarch64_bin.tar.gz"; }; "x86_64-linux" = { - sha256 = "0krnfhcnvhm809prdbhalj86652zh5cgl14qvp8vq3sydbcivb7b"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_linux-x64_bin.tar.gz"; + sha256 = "180jhfkdbpkh5znwmncyxrfcyv0ail16l8vxz6371ws8ym5vc3j4"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.0/graalvm-community-jdk-23.0.0_linux-x64_bin.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1r0j7n4k5ganyrxs9pxjwdbm8k9a20g6giixdhm9nmpan6hxs4h5"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_macos-x64_bin.tar.gz"; + sha256 = "1ajdkm0f1gckyss9rp7i7gay8dh25azr37pd8f36hif8wlwbhf0k"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.0/graalvm-community-jdk-23.0.0_macos-x64_bin.tar.gz"; }; "aarch64-darwin" = { - sha256 = "07qhym71n4v2744j9h6qx72v79mgkk266isn4kc9rgrb7x8gsgc8"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_macos-aarch64_bin.tar.gz"; + sha256 = "16rapbc1az3c8dx83961yjra1j1rwg3i24dvgwixqd2is7v8g9fd"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.0/graalvm-community-jdk-23.0.0_macos-aarch64_bin.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix index 95e9c56fc23cc..da971347652e1 100644 --- a/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix @@ -17,7 +17,7 @@ graalvmCEPackages.buildGraalvmProduct { openssl ]; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/lib/mri/openssl.so \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so @@ -31,7 +31,7 @@ graalvmCEPackages.buildGraalvmProduct { export LC_ALL=C $out/bin/ruby -e 'puts(1 + 1)' ${# broken in darwin with sandbox enabled - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' echo '1 + 1' | $out/bin/irb ''} ''; diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 738ecc81a1561..d34ee3af91634 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it. # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether # ::aligned_alloc is available. For us, it isn't. - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace 'src/runtime/HalideBuffer.h' \ --replace '#ifdef __APPLE__ #include <AvailabilityVersions.h> @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { libjpeg eigen openblas - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ mesa libGL ]; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 78e5770cc68ed..4613b90113efe 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -65,7 +65,7 @@ let ] ++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ]) ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2 - ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security + ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.hostPlatform.isDarwin) Security ++ ocamlDependencies version; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix index 5b7c4a92a5ffc..bc3e0f551705a 100644 --- a/pkgs/development/compilers/idris2/build-idris.nix +++ b/pkgs/development/compilers/idris2/build-idris.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, idris2, makeWrapper +{ + stdenv, + lib, + idris2, + makeBinaryWrapper, }: # Usage: let # pkg = idris2Packages.buildIdris { @@ -11,49 +15,57 @@ # bin = pkg.executable; # } # -{ src -, ipkgName -, version ? "unversioned" -, idrisLibraries # Other libraries built with buildIdris -, ... }@attrs: +{ + src, + ipkgName, + version ? "unversioned", + idrisLibraries, # Other libraries built with buildIdris + ... +}@attrs: let # loop over idrisLibraries and normalize them by turning any that are # direct outputs of the buildIdris function into the `.library {}` # property. - idrisLibraryLibs = map (idrisLib: - if lib.isDerivation idrisLib - then idrisLib - else if builtins.isFunction idrisLib - then idrisLib {} - else if (builtins.isAttrs idrisLib && idrisLib ? "library") - then idrisLib.library {} - else throw "Found an Idris2 library dependency that was not the result of the buildIdris function" + idrisLibraryLibs = map ( + idrisLib: + if lib.isDerivation idrisLib then + idrisLib + else if builtins.isFunction idrisLib then + idrisLib { } + else if (builtins.isAttrs idrisLib && idrisLib ? "library") then + idrisLib.library { } + else + throw "Found an Idris2 library dependency that was not the result of the buildIdris function" ) idrisLibraries; - propagate = libs: lib.unique (lib.concatMap (nextLib: [nextLib] ++ nextLib.propagatedIdrisLibraries) libs); + propagate = + libs: lib.unique (lib.concatMap (nextLib: [ nextLib ] ++ nextLib.propagatedIdrisLibraries) libs); ipkgFileName = ipkgName + ".ipkg"; idrName = "idris2-${idris2.version}"; libSuffix = "lib/${idrName}"; propagatedIdrisLibraries = propagate idrisLibraryLibs; - libDirs = - (lib.makeSearchPath libSuffix propagatedIdrisLibraries) + - ":${idris2}/${idrName}"; + libDirs = (lib.makeSearchPath libSuffix propagatedIdrisLibraries) + ":${idris2}/${idrName}"; supportDir = "${idris2}/${idrName}/lib"; drvAttrs = builtins.removeAttrs attrs [ "ipkgName" "idrisLibraries" ]; - derivation = stdenv.mkDerivation (finalAttrs: - drvAttrs // { + derivation = stdenv.mkDerivation ( + finalAttrs: + drvAttrs + // { pname = ipkgName; inherit version; src = src; - nativeBuildInputs = [ idris2 makeWrapper ] ++ attrs.nativeBuildInputs or []; - buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or []; + nativeBuildInputs = [ + idris2 + makeBinaryWrapper + ] ++ attrs.nativeBuildInputs or [ ]; + buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or [ ]; - IDRIS2_PACKAGE_PATH = libDirs; + env.IDRIS2_PACKAGE_PATH = libDirs; buildPhase = '' runHook preBuild @@ -63,15 +75,16 @@ let passthru = { inherit propagatedIdrisLibraries; - }; + } // (attrs.passthru or { }); shellHook = '' - export IDRIS2_PACKAGE_PATH="${finalAttrs.IDRIS2_PACKAGE_PATH}" + export IDRIS2_PACKAGE_PATH="${finalAttrs.env.IDRIS2_PACKAGE_PATH}" ''; } ); -in { +in +{ executable = derivation.overrideAttrs { installPhase = '' runHook preInstall @@ -97,9 +110,14 @@ in { ''; }; - library = { withSource ? false }: - let installCmd = if withSource then "--install-with-src" else "--install"; - in derivation.overrideAttrs { + library = + { + withSource ? false, + }: + let + installCmd = if withSource then "--install-with-src" else "--install"; + in + derivation.overrideAttrs { installPhase = '' runHook preInstall mkdir -p $out/${libSuffix} diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 79a90cbee0f3d..8f628246c649e 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -1,21 +1,8 @@ -{ callPackage -, idris2Packages -}: - -let -in { +{ callPackage }: +{ idris2 = callPackage ./idris2.nix { }; + idris2Api = callPackage ./idris2-api.nix { }; idris2Lsp = callPackage ./idris2-lsp.nix { }; buildIdris = callPackage ./build-idris.nix { }; - - idris2Api = (idris2Packages.buildIdris { - inherit (idris2Packages.idris2) src version; - ipkgName = "idris2api"; - idrisLibraries = [ ]; - preBuild = '' - export IDRIS2_PREFIX=$out/lib - make src/IdrisPaths.idr - ''; - }).library; } diff --git a/pkgs/development/compilers/idris2/idris2-api.nix b/pkgs/development/compilers/idris2/idris2-api.nix new file mode 100644 index 0000000000000..bd408a64dee1a --- /dev/null +++ b/pkgs/development/compilers/idris2/idris2-api.nix @@ -0,0 +1,22 @@ +{ lib, idris2Packages }: +let + inherit (idris2Packages) idris2 buildIdris; + apiPkg = buildIdris { + inherit (idris2) src version; + ipkgName = "idris2api"; + idrisLibraries = [ ]; + preBuild = '' + export IDRIS2_PREFIX=$out/lib + make src/IdrisPaths.idr + ''; + + meta = { + description = "Idris2 Compiler API Library"; + homepage = "https://github.com/idris-lang/Idris2"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mattpolzin ]; + inherit (idris2.meta) platforms; + }; + }; +in +apiPkg.library { } diff --git a/pkgs/development/compilers/idris2/idris2-lsp.nix b/pkgs/development/compilers/idris2/idris2-lsp.nix index 59a718c045ce5..f5a3d93eab4ae 100644 --- a/pkgs/development/compilers/idris2/idris2-lsp.nix +++ b/pkgs/development/compilers/idris2/idris2-lsp.nix @@ -1,14 +1,21 @@ -{ lib, fetchFromGitHub, idris2Packages, makeWrapper }: +{ + lib, + fetchFromGitHub, + idris2Packages, + makeWrapper, +}: let - globalLibraries = let - idrName = "idris2-${idris2Packages.idris2.version}"; - libSuffix = "lib/${idrName}"; - in [ - "\\$HOME/.nix-profile/lib/${idrName}" - "/run/current-system/sw/lib/${idrName}" - "${idris2Packages.idris2}/${idrName}" - ]; + globalLibraries = + let + idrName = "idris2-${idris2Packages.idris2.version}"; + libSuffix = "lib/${idrName}"; + in + [ + "\\$HOME/.nix-profile/lib/${idrName}" + "/run/current-system/sw/lib/${idrName}" + "${idris2Packages.idris2}/${idrName}" + ]; globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries; inherit (idris2Packages) idris2Api; @@ -16,10 +23,10 @@ let ipkgName = "lsp-lib"; version = "2024-01-21"; src = fetchFromGitHub { - owner = "idris-community"; - repo = "LSP-lib"; - rev = "03851daae0c0274a02d94663d8f53143a94640da"; - hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM="; + owner = "idris-community"; + repo = "LSP-lib"; + rev = "03851daae0c0274a02d94663d8f53143a94640da"; + hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM="; }; idrisLibraries = [ ]; }; @@ -28,14 +35,17 @@ let ipkgName = "idris2-lsp"; version = "2024-01-21"; src = fetchFromGitHub { - owner = "idris-community"; - repo = "idris2-lsp"; - rev = "a77ef2d563418925aa274fa29f06880dde43f4ec"; - hash = "sha256-zjfVfkpiQS9AdmTfq0hYRSelJq5Caa9VGTuFLtSvl5o="; + owner = "idris-community"; + repo = "idris2-lsp"; + rev = "a77ef2d563418925aa274fa29f06880dde43f4ec"; + hash = "sha256-zjfVfkpiQS9AdmTfq0hYRSelJq5Caa9VGTuFLtSvl5o="; }; - idrisLibraries = [idris2Api lspLib]; + idrisLibraries = [ + idris2Api + lspLib + ]; - buildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/idris2-lsp \ --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" @@ -49,4 +59,5 @@ let maintainers = with maintainers; [ mattpolzin ]; }; }; -in lspPkg.executable +in +lspPkg.executable diff --git a/pkgs/development/compilers/idris2/idris2.nix b/pkgs/development/compilers/idris2/idris2.nix index 4d28b35bd4a98..6f39eea61868e 100644 --- a/pkgs/development/compilers/idris2/idris2.nix +++ b/pkgs/development/compilers/idris2/idris2.nix @@ -1,29 +1,30 @@ # Almost 1:1 copy of idris2's nix/package.nix. Some work done in their flake.nix # we do here instead. -{ stdenv -, lib -, chez -, chez-racket -, clang -, gmp -, fetchFromGitHub -, makeWrapper -, gambit -, nodejs -, zsh -, callPackage +{ + stdenv, + lib, + chez, + chez-racket, + clang, + gmp, + fetchFromGitHub, + makeWrapper, + gambit, + nodejs, + zsh, + callPackage, }: # NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs let platformChez = - if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0") - then - chez - else - chez-racket; -in stdenv.mkDerivation rec { + if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0") then + chez + else + chez-racket; +in +stdenv.mkDerivation rec { pname = "idris2"; version = "0.7.0"; @@ -35,56 +36,69 @@ in stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ makeWrapper clang platformChez ] - ++ lib.optionals stdenv.isDarwin [ zsh ]; - buildInputs = [ platformChez gmp ]; + nativeBuildInputs = [ + makeWrapper + clang + platformChez + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ]; + buildInputs = [ + platformChez + gmp + ]; prePatch = '' patchShebangs --build tests ''; - makeFlags = [ "PREFIX=$(out)" ] - ++ lib.optional stdenv.isDarwin "OS="; + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional stdenv.hostPlatform.isDarwin "OS="; # The name of the main executable of pkgs.chez is `scheme` - buildFlags = [ "bootstrap" "SCHEME=scheme" ]; + buildFlags = [ + "bootstrap" + "SCHEME=scheme" + ]; checkTarget = "test"; - nativeCheckInputs = [ gambit nodejs ]; # racket ]; + nativeCheckInputs = [ + gambit + nodejs + ]; # racket ]; checkFlags = [ "INTERACTIVE=" ]; # TODO: Move this into its own derivation, such that this can be changed # without having to recompile idris2 every time. - postInstall = let - name = "${pname}-${version}"; - globalLibraries = [ - "\\$HOME/.nix-profile/lib/${name}" - "/run/current-system/sw/lib/${name}" - "$out/${name}" - ]; - globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries; - in '' - # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH - rm $out/bin/idris2 - # The only thing we need from idris2_app is the actual binary - mv $out/bin/idris2_app/idris2.so $out/bin/idris2 - rm $out/bin/idris2_app/* - rmdir $out/bin/idris2_app - # idris2 needs to find scheme at runtime to compile - # idris2 installs packages with --install into the path given by - # IDRIS2_PREFIX. We set that to a default of ~/.idris2, to mirror the - # behaviour of the standard Makefile install. - # TODO: Make support libraries their own derivation such that - # overriding LD_LIBRARY_PATH is unnecessary - wrapProgram "$out/bin/idris2" \ - --set-default CHEZ "${platformChez}/bin/scheme" \ - --run 'export IDRIS2_PREFIX=''${IDRIS2_PREFIX-"$HOME/.idris2"}' \ - --suffix IDRIS2_LIBS ':' "$out/${name}/lib" \ - --suffix IDRIS2_DATA ':' "$out/${name}/support" \ - --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" \ - --suffix DYLD_LIBRARY_PATH ':' "$out/${name}/lib" \ - --suffix LD_LIBRARY_PATH ':' "$out/${name}/lib" - ''; + postInstall = + let + name = "${pname}-${version}"; + globalLibraries = [ + "\\$HOME/.nix-profile/lib/${name}" + "/run/current-system/sw/lib/${name}" + "$out/${name}" + ]; + globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries; + in + '' + # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH + rm $out/bin/idris2 + # The only thing we need from idris2_app is the actual binary + mv $out/bin/idris2_app/idris2.so $out/bin/idris2 + rm $out/bin/idris2_app/* + rmdir $out/bin/idris2_app + # idris2 needs to find scheme at runtime to compile + # idris2 installs packages with --install into the path given by + # IDRIS2_PREFIX. We set that to a default of ~/.idris2, to mirror the + # behaviour of the standard Makefile install. + # TODO: Make support libraries their own derivation such that + # overriding LD_LIBRARY_PATH is unnecessary + wrapProgram "$out/bin/idris2" \ + --set-default CHEZ "${platformChez}/bin/scheme" \ + --run 'export IDRIS2_PREFIX=''${IDRIS2_PREFIX-"$HOME/.idris2"}' \ + --suffix IDRIS2_LIBS ':' "$out/${name}/lib" \ + --suffix IDRIS2_DATA ':' "$out/${name}/support" \ + --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" \ + --suffix DYLD_LIBRARY_PATH ':' "$out/${name}/lib" \ + --suffix LD_LIBRARY_PATH ':' "$out/${name}/lib" + ''; # Run package tests passthru.tests = callPackage ./tests.nix { inherit pname; }; @@ -94,7 +108,11 @@ in stdenv.mkDerivation rec { mainProgram = "idris2"; homepage = "https://github.com/idris-lang/Idris2"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fabianhjr wchresta mattpolzin ]; + maintainers = with lib.maintainers; [ + fabianhjr + wchresta + mattpolzin + ]; inherit (chez.meta) platforms; }; } diff --git a/pkgs/development/compilers/idris2/tests.nix b/pkgs/development/compilers/idris2/tests.nix index 54bb6d29eeef0..b4193286d49ca 100644 --- a/pkgs/development/compilers/idris2/tests.nix +++ b/pkgs/development/compilers/idris2/tests.nix @@ -1,19 +1,36 @@ -{ stdenv, lib, pname, idris2, zsh }: +{ + stdenv, + runCommand, + lib, + pname, + idris2, + idris2Packages, + zsh, + tree, +}: let - testCompileAndRun = {testName, code, want, packages ? []}: let + testCompileAndRun = + { + testName, + code, + want, + packages ? [ ], + }: + let packageString = builtins.concatStringsSep " " (map (p: "--package " + p) packages); - in stdenv.mkDerivation { - name = "${pname}-${testName}"; - meta.timeout = 60; + in + runCommand "${pname}-${testName}" + { + meta.timeout = 60; - # with idris2 compiled binaries assume zsh is available on darwin, but that - # is not the case with pure nix environments. Thus, we need to include zsh - # when we build for darwin in tests. While this is impure, this is also what - # we find in real darwin hosts. - nativeBuildInputs = lib.optionals stdenv.isDarwin [ zsh ]; - - buildCommand = '' + # with idris2 compiled binaries assume zsh is available on darwin, but that + # is not the case with pure nix environments. Thus, we need to include zsh + # when we build for darwin in tests. While this is impure, this is also what + # we find in real darwin hosts. + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zsh ]; + } + '' set -eo pipefail cat > packageTest.idr <<HERE @@ -33,10 +50,43 @@ let touch $out ''; - }; -in { + + testBuildIdris = + { + testName, + buildIdrisArgs, + makeExecutable, + expectedTree, + }: + let + final = pkg: if makeExecutable then pkg.executable else pkg.library { }; + idrisPkg = final (idris2Packages.buildIdris buildIdrisArgs); + in + runCommand "${pname}-${testName}" + { + meta.timeout = 60; + + nativeBuildInputs = [ tree ]; + } + '' + GOT="$(tree ${idrisPkg} | tail -n +2)" + + if [ "$GOT" = '${expectedTree}' ]; then + echo "${testName} SUCCESS" + else + >&2 echo "Got: + $GOT" + >&2 echo 'want: + ${expectedTree}' + exit 1 + fi + + touch $out + ''; +in +{ # Simple hello world compiles, runs and outputs as expected - hello-world = testCompileAndRun { + helloWorld = testCompileAndRun { testName = "hello-world"; code = '' module Main @@ -48,7 +98,7 @@ in { }; # Data.Vect.Sort is available via --package contrib - use-contrib = testCompileAndRun { + useContrib = testCompileAndRun { testName = "use-contrib"; packages = [ "contrib" ]; code = '' @@ -65,4 +115,72 @@ in { ''; want = "[1, 3, 5]"; }; + + buildLibrary = testBuildIdris { + testName = "library-package"; + buildIdrisArgs = { + ipkgName = "pkg"; + idrisLibraries = [ idris2Packages.idris2Api ]; + src = runCommand "library-package-src" { } '' + mkdir $out + + cat > $out/Main.idr <<EOF + module Main + + import Compiler.ANF -- from Idris2Api + + hello : String + hello = "world" + EOF + + cat > $out/pkg.ipkg <<EOF + package pkg + modules = Main + depends = idris2 + EOF + ''; + }; + makeExecutable = false; + expectedTree = '' + `-- lib + `-- idris2-0.7.0 + `-- pkg-0 + |-- 2023090800 + | |-- Main.ttc + | `-- Main.ttm + `-- pkg.ipkg + + 5 directories, 3 files''; + }; + + buildExecutable = testBuildIdris { + testName = "executable-package"; + buildIdrisArgs = { + ipkgName = "pkg"; + idrisLibraries = [ ]; + src = runCommand "executable-package-src" { } '' + mkdir $out + + cat > $out/Main.idr <<EOF + module Main + + main : IO () + main = putStrLn "hi" + EOF + + cat > $out/pkg.ipkg <<EOF + package pkg + modules = Main + main = Main + executable = mypkg + EOF + ''; + }; + makeExecutable = true; + expectedTree = '' + `-- bin + `-- mypkg + + 2 directories, 1 file''; + }; } diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix index cb464e3484c2c..b4b97af524172 100644 --- a/pkgs/development/compilers/inform7/default.nix +++ b/pkgs/development/compilers/inform7/default.nix @@ -29,6 +29,6 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ mbbx6spp ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index b8c48c5c6a018..2aa173fdde24b 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb # the default test target is sse4, but that is not supported by all Hydra agents -, testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] +, testedTargets ? if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q="; }; - nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; + nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [ xcode ]; buildInputs = with llvmPackages; [ libllvm libclang openmp ncurses @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { "-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++" "-DISPC_INCLUDE_EXAMPLES=OFF" "-DISPC_INCLUDE_UTILS=OFF" - ("-DARM_ENABLED=" + (if stdenv.isAarch64 || stdenv.isAarch32 then "TRUE" else "FALSE")) - ("-DX86_ENABLED=" + (if stdenv.isx86_64 || stdenv.isx86_32 then "TRUE" else "FALSE")) - ] ++ lib.lists.optionals stdenv.isDarwin [ + ("-DARM_ENABLED=" + (if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then "TRUE" else "FALSE")) + ("-DX86_ENABLED=" + (if stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isx86_32 then "TRUE" else "FALSE")) + ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [ "-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" ]; diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index 26b4309eb919b..a19dd7cfb603b 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { mpfr ppl ] ++ (with ocamlPackages; [ - angstrom apron yojson ]); propagatedBuildInputs = with ocamlPackages; [ + angstrom batteries menhirLib zarith diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix index 76d4079baafbf..a868a441ba4c9 100644 --- a/pkgs/development/compilers/jetbrains-jdk/17.nix +++ b/pkgs/development/compilers/jetbrains-jdk/17.nix @@ -147,7 +147,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { inherit (openjdk17.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; passthru = oldAttrs.passthru // { diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 0f003a3ea4fdd..77ac8e904d472 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -38,26 +38,26 @@ let in jdk.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef"; - javaVersion = "21.0.3"; - build = "509.11"; + javaVersion = "21.0.4"; + build = "598.4"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime # git checkout jbr-release-${javaVersion}b${build} # git log --simplify-by-decoration --decorate=short --pretty=short | grep "jbr-" --color=never | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d "," - openjdkTag = "jbr-21.0.2+13"; + openjdkTag = "jbr-21.0.4+8"; version = "${javaVersion}-b${build}"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-zTstmrH4KteR40BVDRfxOrl8aUQ26acE+ywscBd8sw8="; + hash = "sha256-YF5Z1A4qmD9Z4TE6f2i8wv9ZD+NqHGY5Q0oIVQiC3Bg="; }; BOOT_JDK = jdk.home; # run `git log -1 --pretty=%ct` in jdk repo for new value on update - SOURCE_DATE_EPOCH = 1723453663; + SOURCE_DATE_EPOCH = 1726275531; patches = [ ]; @@ -147,7 +147,7 @@ jdk.overrideAttrs (oldAttrs: rec { inherit (jdk.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; passthru = oldAttrs.passthru // { diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 537133524a2cf..9cda4fc516237 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -45,7 +45,7 @@ , thrift }: -assert !stdenv.isDarwin; +assert !stdenv.hostPlatform.isDarwin; # I can't test darwin let diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index 8e723cdb82114..4dc7557d13798 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SYSTEM_GTEST=ON" "-DBUILD_STATIC_LIBS=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix index 09a8c2bce3bf5..fd78e61138505 100644 --- a/pkgs/development/compilers/julia/generic-bin.nix +++ b/pkgs/development/compilers/julia/generic-bin.nix @@ -24,14 +24,14 @@ let "REPL" # Test flaky "ccall" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test flaky on ofborg "FileWatching" # Test requires pbcopy "InteractiveUtils" # Test requires network access "Sockets" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # Test Failed at $out/share/julia/stdlib/v1.8/LinearAlgebra/test/blas.jl:702 "LinearAlgebra/blas" # Test Failed at $out/share/julia/test/misc.jl:724 @@ -71,7 +71,7 @@ stdenv.mkDerivation { '@test_skip ca_roots_path() != bundled_ca_roots()' ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook # https://github.com/JuliaLang/julia/blob/v1.9.0/NEWS.md#external-dependencies stdenv.cc.cc diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix index e3360137ca741..53a5067e783a5 100644 --- a/pkgs/development/compilers/julia/generic.nix +++ b/pkgs/development/compilers/julia/generic.nix @@ -53,10 +53,10 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "USE_BINARYBUILDER=0" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # https://github.com/JuliaCI/julia-buildkite/blob/main/utilities/build_envs.sh "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1);x86-64-v4,-rdrnd,base(1)" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;carmel,clone_all;apple-m1,base(3);neoverse-512tvb,base(3)" ]; diff --git a/pkgs/development/compilers/kind2/default.nix b/pkgs/development/compilers/kind2/default.nix index 617f868803635..a5a8585d020ee 100644 --- a/pkgs/development/compilers/kind2/default.nix +++ b/pkgs/development/compilers/kind2/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-KzoEh/kMKsHx9K3t1/uQZ7fdsZEM+v8UOft8JjEB1Zw="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 74819dd9446fa..b472eb921cfa6 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -113,7 +113,7 @@ ocamlPackages.buildDunePackage rec { seqes stdint tezt - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -131,7 +131,6 @@ ocamlPackages.buildDunePackage rec { mainProgram = "ligo"; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; - broken = stdenv.isLinux && stdenv.isAarch64; maintainers = with maintainers; [ ulrikstrid ]; }; } diff --git a/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch index b8c1c110cf22d..30fdf2c56d5b2 100644 --- a/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch @@ -46,7 +46,7 @@ index 3aca22c0b..3115353e3 100644 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib}) list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib}) install(FILES lib/libscanbuild/${lib} -- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild +- DESTINATION lib/libscanbuild + DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild" COMPONENT scan-build-py) endforeach() @@ -55,7 +55,7 @@ index 3aca22c0b..3115353e3 100644 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource}) list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource}) install(FILES lib/libscanbuild/resources/${resource} -- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources +- DESTINATION lib/libscanbuild/resources + DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources" COMPONENT scan-build-py) endforeach() @@ -64,7 +64,7 @@ index 3aca22c0b..3115353e3 100644 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib}) list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib}) install(FILES lib/libear/${lib} -- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear +- DESTINATION lib/libear + DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" COMPONENT scan-build-py) endforeach() diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix index ee89de4ac751d..9d6385ae74b34 100644 --- a/pkgs/development/compilers/llvm/common/bolt/default.nix +++ b/pkgs/development/compilers/llvm/common/bolt/default.nix @@ -12,6 +12,7 @@ python3, buildLlvmTools, patches ? [ ], + devExtraCmakeFlags ? [ ], }: stdenv.mkDerivation (finalAttrs: { @@ -43,9 +44,11 @@ stdenv.mkDerivation (finalAttrs: { libxml2 ]; - cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.llvm}/bin/llvm-tblgen") - ]; + cmakeFlags = + lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.llvm}/bin/llvm-tblgen") + ] + ++ devExtraCmakeFlags; postUnpack = '' chmod -R u+w -- $sourceRoot/.. diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 5a6d775804b64..2b5aca1093485 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -17,6 +17,7 @@ , fixDarwinDylibNames , enableManpages ? false , clang-tools-extra_src ? null +, devExtraCmakeFlags ? [] }: let @@ -69,7 +70,10 @@ let # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" - ]) ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "-DCLANG_DEFAULT_CXX_STDLIB=ON"; + ]) ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [ + "-DCLANG_DEFAULT_CXX_STDLIB=ON" + ] ++ lib.optional (lib.versionAtLeast release_version "20") "-DLLVM_DIR=${libllvm.dev}/lib/cmake/llvm" + ++ devExtraCmakeFlags; postPatch = '' # Make sure clang passes the correct location of libLTO to ld64 @@ -129,8 +133,10 @@ let mkdir -p $dev/bin '' + (if lib.versionOlder release_version "15" then '' cp bin/clang-tblgen $dev/bin - '' else '' + '' else if lib.versionOlder release_version "20" then '' cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin + '' else '' + cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen} $dev/bin ''); passthru = { diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix index 6ee05b80c4465..f87af997361c3 100644 --- a/pkgs/development/compilers/llvm/common/common-let.nix +++ b/pkgs/development/compilers/llvm/common/common-let.nix @@ -22,7 +22,8 @@ rec { lib.platforms.wasi ++ lib.platforms.x86 ++ lib.optionals (lib.versionAtLeast release_version "7") lib.platforms.riscv ++ - lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k; + lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k ++ + lib.optionals (lib.versionAtLeast release_version "16") lib.platforms.loongarch64; }; releaseInfo = diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 8417563cc95fe..a6d727739d271 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -14,6 +14,7 @@ , libllvm , libcxx , linuxHeaders +, freebsd , libxcrypt # Some platforms have switched to using compiler-rt, but still want a @@ -27,6 +28,7 @@ # `libcompiler_rt` library, at least under certain configurations. Some # platforms stil expect this, however, so we symlink one into place. , forceLinkCompilerRt ? stdenv.hostPlatform.isOpenBSD +, devExtraCmakeFlags ? [] }: let @@ -39,6 +41,7 @@ let haveLibcxx = stdenv.cc.libcxx != null; isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic && lib.versionAtLeast release_version "16"; inherit (stdenv.hostPlatform) isMusl isAarch64; + noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic; baseName = "compiler-rt"; pname = baseName + lib.optionalString (haveLibc) "-libc"; @@ -65,9 +68,10 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ cmake ] ++ (lib.optional (lib.versionAtLeast release_version "15") ninja) ++ [ python3 libllvm.dev ] - ++ lib.optional stdenv.isDarwin xcbuild.xcrun; + ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild.xcrun; buildInputs = - lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders; + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include; env.NIX_CFLAGS_COMPILE = toString ([ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" @@ -94,7 +98,7 @@ stdenv.mkDerivation ({ "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" ] ++ lib.optionals (useLLVM && haveLibc) [ "-DCOMPILER_RT_BUILD_SANITIZERS=ON" - ] ++ lib.optionals (!haveLibc || bareMetal || isMusl || isDarwinStatic) [ + ] ++ lib.optionals (noSanitizers) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" ] ++ lib.optionals ((useLLVM && !haveLibcxx) || !haveLibc || bareMetal || isMusl || isDarwinStatic) [ "-DCOMPILER_RT_BUILD_XRAY=OFF" @@ -129,9 +133,11 @@ stdenv.mkDerivation ({ # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin: # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153 "-DCOMPILER_RT_ENABLE_IOS=OFF" - ]) ++ lib.optionals (lib.versionAtLeast version "19" && stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + ]) ++ lib.optionals (lib.versionAtLeast version "19" && stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ "-DSANITIZER_MIN_OSX_VERSION=10.10" - ]; + ] ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [ + "-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF" + ] ++ devExtraCmakeFlags; outputs = [ "out" "dev" ]; @@ -140,10 +146,10 @@ stdenv.mkDerivation ({ # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + lib.optionalString (!haveLibc) ((lib.optionalString (lib.versionAtLeast release_version "18") '' @@ -152,12 +158,11 @@ stdenv.mkDerivation ({ '') + '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" - '' + (if stdenv.hostPlatform.isFreeBSD then - # As per above, but in FreeBSD assert is a macro and simply allowing it to be implicitly declared causes Issues!!!!! + '' + (lib.optionalString (!stdenv.hostPlatform.isFreeBSD) + # On FreeBSD, assert/static_assert are macros and allowing them to be implicitly declared causes link errors. + # see description above for why we're nuking assert.h normally but that doesn't work here. + # instead, we add the freebsd.include dependency explicitly '' - substituteInPlace lib/builtins/clear_cache.c lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.c \ - --replace "#include <assert.h>" "#define assert(e) ((e)?(void)0:__assert(__FUNCTION__,__FILE__,__LINE__,#e))" - '' else '' substituteInPlace lib/builtins/clear_cache.c \ --replace "#include <assert.h>" "" substituteInPlace lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.c \ diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 86873c1dbe1de..d5f7f0a8405a4 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -10,6 +10,7 @@ substituteAll, fetchFromGitHub, fetchpatch, + fetchpatch2, overrideCC, wrapCCWith, wrapBintoolsWith, @@ -26,6 +27,9 @@ officialRelease ? null, monorepoSrc ? null, version ? null, + # Allows passthrough to packages via newScope. This makes it possible to + # do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get + # an llvmPackages whose packages are overridden in an internally consistent way. ... }@args: @@ -601,9 +605,35 @@ let (_: _: { name = "resource-dir.patch"; }) ) { }; in - lib.optional (lib.versionOlder metadata.release_version "16") + lib.optionals (lib.versionOlder metadata.release_version "15") [ + # Fixes for SWIG 4 + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63.patch?full_index=1"; + stripLen = 1; + hash = "sha256-Znw+C0uEw7lGETQLKPBZV/Ymo2UigZS+Hv/j1mUo7p0="; + }) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/f0a25fe0b746f56295d5c02116ba28d2f965c175.patch?full_index=1"; + stripLen = 1; + hash = "sha256-QzVeZzmc99xIMiO7n//b+RNAvmxghISKQD93U2zOgFI="; + }) + ] + ++ lib.optionals (lib.versionOlder metadata.release_version "16") [ + # Fixes for SWIG 4 + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/ba35c27ec9aa9807f5b4be2a0c33ca9b045accc7.patch?full_index=1"; + stripLen = 1; + hash = "sha256-LXl+WbpmWZww5xMDrle3BM2Tw56v8k9LO1f1Z1/wDTs="; + }) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/9ec115978ea2bdfc60800cd3c21264341cdc8b0a.patch?full_index=1"; + stripLen = 1; + hash = "sha256-u0zSejEjfrH3ZoMFm1j+NVv2t5AP9cE5yhsrdTS1dG4="; + }) + # FIXME: do we need this after 15? (metadata.getVersionFile "lldb/procfs.patch") + ] ++ lib.optional (lib.versionOlder metadata.release_version "17") resourceDirPatch ++ lib.optional (lib.versionOlder metadata.release_version "14") ( metadata.getVersionFile "lldb/gnu-install-dirs.patch" @@ -1023,7 +1053,7 @@ let lib.optional ( lib.versions.major metadata.release_version == "17" - && stdenv.isDarwin + && stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" ) # https://github.com/llvm/llvm-project/issues/64226 @@ -1038,7 +1068,7 @@ let lib.optional ( lib.versionAtLeast metadata.release_version "18" - && stdenv.isDarwin + && stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" ) # https://github.com/llvm/llvm-project/issues/64226 diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix index f646edf03019d..17c687f883940 100644 --- a/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -16,6 +16,7 @@ , cxxabi ? if stdenv.hostPlatform.isFreeBSD then freebsd.libcxxrt else null , libunwind , enableShared ? !stdenv.hostPlatform.isStatic +, devExtraCmakeFlags ? [] }: # external cxxabi is not supported on Darwin as the build will not link libcxx @@ -103,7 +104,8 @@ let "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ cxxCMakeFlags - ++ lib.optionals (cxxabi == null) cxxabiCMakeFlags; + ++ lib.optionals (cxxabi == null) cxxabiCMakeFlags + ++ devExtraCmakeFlags; in @@ -119,7 +121,7 @@ stdenv.mkDerivation (rec { ''; nativeBuildInputs = [ cmake ninja python3 ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ lib.optional (cxxabi != null) lndir; buildInputs = [ cxxabi ] diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix index 515914e6acb64..77854ddfcc5de 100644 --- a/pkgs/development/compilers/llvm/common/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix @@ -12,6 +12,7 @@ , python3 , libcxx , enableShared ? !stdenv.hostPlatform.isStatic +, devExtraCmakeFlags ? [] }: let pname = "libunwind"; @@ -68,7 +69,8 @@ stdenv.mkDerivation (rec { ]; cmakeFlags = lib.optional (lib.versionAtLeast release_version "15") "-DLLVM_ENABLE_RUNTIMES=libunwind" - ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF" + ++ devExtraCmakeFlags; meta = llvm_meta // { # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix index 99bb150a817dc..d5c0f7cb3a095 100644 --- a/pkgs/development/compilers/llvm/common/lld/default.nix +++ b/pkgs/development/compilers/llvm/common/lld/default.nix @@ -13,6 +13,7 @@ , libxml2 , libllvm , version +, devExtraCmakeFlags ? [] }: let pname = "lld"; @@ -32,7 +33,7 @@ let '(''${LLVM_MAIN_SRC_DIR}/' '(' mkdir -p libunwind/include tar -xf "${libunwind.src}" --wildcards -C libunwind/include --strip-components=2 "libunwind-*/include/" - '' + lib.optionalString (lib.versions.major release_version == "13" && stdenv.isDarwin) '' + '' + lib.optionalString (lib.versions.major release_version == "13" && stdenv.hostPlatform.isDarwin) '' substituteInPlace MachO/CMakeLists.txt --replace \ '(''${LLVM_MAIN_SRC_DIR}/' '(../' ''; @@ -55,7 +56,7 @@ stdenv.mkDerivation (rec { "-DLLD_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/lld" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ]; + ] ++ devExtraCmakeFlags; # Musl's default stack size is too small for lld to be able to link Firefox. LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; diff --git a/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix b/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix index c06aeb187105f..97b80ade42e1a 100644 --- a/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix +++ b/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "llef"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "foundryzero"; repo = "llef"; rev = "v${finalAttrs.version}"; - hash = "sha256-tta99ncWJdnnSkVdnOwx36utEcefMy7fb5NDN2aZ5F0="; + hash = "sha256-cpBQuRWpov4q3lEtZPA7ZWqQ8Aa/KKQbhtVStSfNa+Q="; }; dontBuild = true; diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index 02cd334d0a704..4f679f4dcff11 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -5,8 +5,7 @@ , cmake , zlib , ncurses -, swig3 -, swig4 +, swig , which , libedit , libxml2 @@ -24,6 +23,7 @@ , monorepoSrc ? null , patches ? [ ] , enableManpages ? false +, devExtraCmakeFlags ? [ ] , ... }: @@ -42,7 +42,6 @@ let name = if lib.versionAtLeast release_version "18" then "lldb-dap" else "lldb-vscode"; version = if lib.versionAtLeast release_version "18" then "0.2.0" else "0.1.0"; }; - swig = if lib.versionAtLeast release_version "18" then swig4 else swig3; in stdenv.mkDerivation (rec { @@ -55,7 +54,7 @@ stdenv.mkDerivation (rec { # LLDB expects to find the path to `bin` relative to `lib` on Darwin. It can’t be patched with the location of # the `lib` output because that would create a cycle between it and the `out` output. - outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "lib" ]; + outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "lib" ]; sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${src.name}/${pname}"; @@ -88,7 +87,7 @@ stdenv.mkDerivation (rec { # libclang into the rpath of the lldb executables. By putting it into # buildInputs cc-wrapper will set up rpath correctly for us. (lib.getLib libclang) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation @@ -124,9 +123,9 @@ stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=OFF" "-DClang_DIR=${lib.getDev libclang}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ] ++ lib.optionals (lib.versionAtLeast release_version "17") [ "-DCLANG_RESOURCE_DIR=../../../../${libclang.lib}" @@ -144,7 +143,7 @@ stdenv.mkDerivation (rec { ]) ++ lib.optionals doCheck [ "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; + ] ++ devExtraCmakeFlags; doCheck = false; doInstallCheck = lib.versionOlder release_version "15"; @@ -186,10 +185,7 @@ stdenv.mkDerivation (rec { larger LLVM Project, such as the Clang expression parser and LLVM disassembler. ''; - # llvm <10 never built on aarch64-darwin since first introduction in nixpkgs - broken = - (lib.versionOlder release_version "11" && stdenv.isDarwin && stdenv.isAarch64) - || (((lib.versions.major release_version) == "13") && stdenv.isDarwin); + broken = lib.versionOlder release_version "14"; mainProgram = "lldb"; }; } // lib.optionalAttrs enableManpages { diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index a995c83405e98..281a21ca15242 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -28,18 +28,19 @@ , sysctl , buildLlvmTools , debugVersion ? false -, doCheck ? !stdenv.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.isLinux else true) - && (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) +, doCheck ? !stdenv.hostPlatform.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.hostPlatform.isLinux else true) + && (!stdenv.hostPlatform.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) && !(stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) && (stdenv.hostPlatform == stdenv.buildPlatform) , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? stdenv.isLinux /* PFM only supports Linux */ +, enablePFM ? stdenv.hostPlatform.isLinux /* PFM only supports Linux */ # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 # broken for the armv7l builder && !stdenv.hostPlatform.isAarch , enablePolly ? lib.versionAtLeast release_version "14" , enableTerminfo ? true +, devExtraCmakeFlags ? [] }: let @@ -125,7 +126,7 @@ stdenv.mkDerivation (rec { propagatedBuildInputs = (lib.optional (lib.versionAtLeast release_version "14" || stdenv.buildPlatform == stdenv.hostPlatform) ncurses) ++ [ zlib ]; - postPatch = optionalString stdenv.isDarwin ('' + postPatch = optionalString stdenv.hostPlatform.isDarwin ('' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" @@ -166,7 +167,7 @@ stdenv.mkDerivation (rec { --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" ''))) + # dup of above patch with different conditions - optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") '' + optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") '' substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" @@ -266,7 +267,7 @@ stdenv.mkDerivation (rec { # It seems to reference /usr/local/lib/libfile.a, which is clearly a problem. # 2. This test fails for the same reason it fails on MacOS, but the fix is # not trivial to apply. - optionalString stdenv.isFreeBSD '' + optionalString stdenv.hostPlatform.isFreeBSD '' rm test/tools/llvm-libtool-darwin/L-and-l.test rm test/ExecutionEngine/Interpreter/intrinsics.ll '' + '' @@ -318,7 +319,7 @@ stdenv.mkDerivation (rec { ''; # E.g. Mesa uses the build-id as a cache key (see #93946): - LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + LDFLAGS = optionalString (enableSharedLibraries && !stdenv.hostPlatform.isDarwin) "-Wl,--build-id=sha1"; cmakeBuildType = if debugVersion then "Debug" else "Release"; @@ -366,7 +367,7 @@ stdenv.mkDerivation (rec { "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ @@ -399,7 +400,7 @@ stdenv.mkDerivation (rec { nativeInstallFlags ]) ) - ]; + ] ++ devExtraCmakeFlags; postInstall = '' mkdir -p $python/share @@ -415,10 +416,10 @@ stdenv.mkDerivation (rec { substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' '') - + optionalString (stdenv.isDarwin && enableSharedLibraries && lib.versionOlder release_version "18") '' + + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries && lib.versionOlder release_version "18") '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries) '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then '' @@ -494,7 +495,7 @@ stdenv.mkDerivation (rec { mv polly-* $sourceRoot/tools/polly ''; } // lib.optionalAttrs (lib.versionAtLeast release_version "13") { - nativeCheckInputs = [ which ] ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast release_version "15") sysctl; + nativeCheckInputs = [ which ] ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "15") sysctl; } // lib.optionalAttrs (lib.versionOlder release_version "15") { # hacky fix: created binaries need to be run before installation preBuild = '' diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index 891e66b1d57c5..e4dd12d69e588 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -9,7 +9,8 @@ , libxml2 , libllvm , version -, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) +, doCheck ? (!stdenv.hostPlatform.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) +, devExtraCmakeFlags ? [] }: stdenv.mkDerivation rec { @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" "-DMLIR_TABLEGEN_EXE=${buildLlvmTools.mlir}/bin/mlir-tblgen" - ]; + ] ++ devExtraCmakeFlags; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 0de91473dd8c4..57c6de07c7843 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -15,6 +15,7 @@ , perl , pkg-config , version +, devExtraCmakeFlags ? [] }: let pname = "openmp"; @@ -60,7 +61,7 @@ stdenv.mkDerivation (rec { "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" "-DOPT_TOOL=${llvm}/bin/opt" "-DLINK_TOOL=${llvm}/bin/llvm-link" - ]; + ] ++ devExtraCmakeFlags; meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 7b1fc3efebfbc..4439b58ca4e5d 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -14,7 +14,12 @@ bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc, bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools, llvmVersions ? { }, -}: + # Allows passthrough to packages via newScope in ./common/default.nix. + # This makes it possible to do + # `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get + # an llvmPackages whose packages are overridden in an internally consistent way. + ... +}@packageSetArgs: let versions = { "13.0.1".officialRelease.sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; @@ -23,11 +28,11 @@ let "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; - "19.1.0-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs="; + "19.1.1".officialRelease.sha256 = "sha256-xTo44+vH1Bz49fEl4bIpU3eIgQtFuBTGbgU7mzeY33s="; "20.0.0-git".gitRelease = { - rev = "2579b411a13799534c8b8a22246134b88ba7785d"; - rev-version = "20.0.0-unstable-2024-08-25"; - sha256 = "sha256-/Gymj9bEoaAAH5kWPRflD+lBWyPjWBpYGnQsP5vAlsk="; + rev = "64f2bff12b8ac40c79004ffacf46a5294600d219"; + rev-version = "20.0.0-unstable-2024-09-29"; + sha256 = "sha256-BUlnks9rFjvKRIy7lWhOJQKKNVTewBiCFDbgyRBvuEw="; }; } // llvmVersions; @@ -53,25 +58,29 @@ let in lib.nameValuePair attrName ( recurseIntoAttrs ( - callPackage ./common { - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools; - targetLlvmLibraries = - targetPackages."llvmPackages_${attrName}".libraries or llvmPackages."${attrName}".libraries; - targetLlvm = targetPackages."llvmPackages_${attrName}".llvm or llvmPackages."${attrName}".llvm; - stdenv = - if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then - gcc12Stdenv - else - stdenv; # does not build with gcc13 - inherit bootBintoolsNoLibc bootBintools; - inherit - officialRelease - gitRelease - monorepoSrc - version - ; - } + callPackage ./common ( + { + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools; + targetLlvmLibraries = + targetPackages."llvmPackages_${attrName}".libraries or llvmPackages."${attrName}".libraries; + targetLlvm = targetPackages."llvmPackages_${attrName}".llvm or llvmPackages."${attrName}".llvm; + inherit + officialRelease + gitRelease + monorepoSrc + version + ; + } + // packageSetArgs # Allow overrides. + // { + stdenv = + if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then + gcc12Stdenv + else + stdenv; # does not build with gcc13 + } + ) ) ); diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index 645e7019aa73b..2ebe573cf513c 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = if stdenv.isDarwin + buildInputs = if stdenv.hostPlatform.isDarwin then [ CoreFoundation Cocoa @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://strlen.com/lobster/"; description = "Lobster programming language"; mainProgram = "lobster"; diff --git a/pkgs/development/compilers/minimacy/default.nix b/pkgs/development/compilers/minimacy/default.nix index ae4da0d5b0279..6f4d14b279015 100644 --- a/pkgs/development/compilers/minimacy/default.nix +++ b/pkgs/development/compilers/minimacy/default.nix @@ -22,18 +22,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.isLinux [ alsa-lib libX11 libXext ]; + buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libX11 libXext ]; enableParallelBuilding = true; env.NIX_CFLAGS_COMPILE = "-Wno-unused-result"; preBuild = '' - pushd ${if stdenv.isDarwin then "macos/cmdline" else "unix"} + pushd ${if stdenv.hostPlatform.isDarwin then "macos/cmdline" else "unix"} ''; # TODO: build graphic version for darwin - buildFlags = (if stdenv.isDarwin then [ "nox" ] else [ "all" ]) ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; + buildFlags = (if stdenv.hostPlatform.isDarwin then [ "nox" ] else [ "all" ]) ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; postBuild = '' popd @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - bin/${if stdenv.isDarwin then "minimacyMac" else "minimacy"} system/demo/demo.fun.mandelbrot.mcy + bin/${if stdenv.hostPlatform.isDarwin then "minimacyMac" else "minimacy"} system/demo/demo.fun.mandelbrot.mcy runHook postCheck ''; diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 1abbac512aa7f..c9fc962e30b42 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -15,9 +15,9 @@ let version = "12.1"; - bootstrapFromC = ! ((stdenv.isLinux && stdenv.isAarch64) || stdenv.isx86_64); + bootstrapFromC = ! ((stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isx86_64); - arch = if stdenv.isLinux && stdenv.isAarch64 then + arch = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 then "-aarch64le" else "-x86-64"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { # leads to more efficient code than when building the tarball that contains # generated C code instead of those binaries. src = - if stdenv.isLinux && stdenv.isAarch64 + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-aarch64le.tar.gz"; sha256 = "12ra9bc93x8g07impbd8jr6djjzwpb9qvh9zhxvvrba3332zx3vh"; diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 0b95f3e9b2a63..ae2d11feb7659 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "ANSI Common Lisp Implementation"; homepage = "https://common-lisp.net/project/mkcl/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix index c4dfa85b70c15..633f126a3561c 100644 --- a/pkgs/development/compilers/mlkit/default.nix +++ b/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.7.11"; + version = "4.7.12"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-awjinXegc8jLd6OAB8QLDoXnotZhKbyfMWckp2U3MjA="; + sha256 = "sha256-9a2CbIOHdN+kTtm2Z001qOEO/nXuSLrzq0ovgHU1hTQ="; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix index 98b4aeda55169..90285bf089820 100644 --- a/pkgs/development/compilers/mlton/20130715.nix +++ b/pkgs/development/compilers/mlton/20130715.nix @@ -3,7 +3,7 @@ let version = "20130715"; - usr_prefix = if stdenv.isDarwin then "usr/local" else "usr"; + usr_prefix = if stdenv.hostPlatform.isDarwin then "usr/local" else "usr"; dynamic_linker = stdenv.cc.bintools.dynamicLinker; in @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { sourceRoot = "${pname}-${version}"; buildInputs = [ gmp ]; - nativeBuildInputs = lib.optional stdenv.isLinux patchelf; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf; makeFlags = [ "all-no-docs" ]; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton '' + lib.optionalString stdenv.cc.isClang '' sed -i "s_ patch -s -p0 <gdtoa.hide-public-fns.patch_ patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile ''; @@ -79,13 +79,13 @@ stdenv.mkDerivation rec { # So the builder runs the binary compiler with gmp. export LD_LIBRARY_PATH=${gmp.out}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Patch ELF interpreter. patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile for e in mllex mlyacc ; do patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Patch libgmp linking install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix index 4846b58bf26be..2384122d70b65 100644 --- a/pkgs/development/compilers/mlton/20180207-binary.nix +++ b/pkgs/development/compilers/mlton/20180207-binary.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { throw "Architecture not supported"; buildInputs = [ gmp ]; - nativeBuildInputs = lib.optional stdenv.isLinux patchelf; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf; buildPhase = '' make update \ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${dynamic-linker} $out/bin/$e patchelf --set-rpath ${gmp}/lib $out/bin/$e done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change \ /opt/local/lib/libgmp.10.dylib \ ${gmp}/lib/libgmp.10.dylib \ diff --git a/pkgs/development/compilers/mlton/20210117-binary.nix b/pkgs/development/compilers/mlton/20210117-binary.nix index d4e55d47b94cf..40e9482ba1fbd 100644 --- a/pkgs/development/compilers/mlton/20210117-binary.nix +++ b/pkgs/development/compilers/mlton/20210117-binary.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { throw "Architecture not supported"; buildInputs = [ gmp ]; - nativeBuildInputs = lib.optional stdenv.isLinux patchelf; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf; buildPhase = '' make update \ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${dynamic-linker} $out/bin/$e patchelf --set-rpath ${gmp}/lib $out/bin/$e done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change \ /opt/local/lib/libgmp.10.dylib \ ${gmp}/lib/libgmp.10.dylib \ diff --git a/pkgs/development/compilers/mono/4.nix b/pkgs/development/compilers/mono/4.nix index 0b283d4f17785..8664cb3f7283a 100644 --- a/pkgs/development/compilers/mono/4.nix +++ b/pkgs/development/compilers/mono/4.nix @@ -5,5 +5,5 @@ callPackage ./generic.nix ({ version = "4.8.1.0"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645 - extraPatches = lib.optionals stdenv.isLinux [ ./mono4-glibc.patch ]; + extraPatches = lib.optionals stdenv.hostPlatform.isLinux [ ./mono4-glibc.patch ]; }) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 42c519e5021cc..44fb053290303 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ncurses zlib bash - ] ++ lib.optionals stdenv.isDarwin [ Foundation libobjc ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation libobjc ]; configureFlags = [ "--x-includes=${libX11.dev}/include" @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { # Per nixpkgs#151720 the build failures for aarch64-darwin are fixed since 6.12.0.129 - broken = stdenv.isDarwin && stdenv.isAarch64 && lib.versionOlder version "6.12.0.129"; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && lib.versionOlder version "6.12.0.129"; homepage = "https://mono-project.com/"; description = "Cross platform, open source .NET development framework"; platforms = with platforms; darwin ++ linux; diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index c69a4021677ed..a9b21845f46a8 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ perl groff libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind; + buildInputs = [ perl groff libxml2 python2 libffi ] ++ lib.optional stdenv.hostPlatform.isLinux valgrind; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index 8b66cbce688b6..b82253d2b4935 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { homepage = "https://mozart.github.io"; platforms = platforms.all; # Trace/BPT trap: 5 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/compilers/myrddin/default.nix b/pkgs/development/compilers/myrddin/default.nix index b682b1e0ac542..e9369ef043e8e 100644 --- a/pkgs/development/compilers/myrddin/default.nix +++ b/pkgs/development/compilers/myrddin/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; # darwin: never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/myrddin.x86_64-darwin - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index a0c8886740167..7219d2b38097f 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { buildInputs = [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil libmysqlclient mbedtls_2 openssl libpthreadstubs ] - ++ lib.optional stdenv.isLinux gtk2 - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security + ++ lib.optional stdenv.hostPlatform.isLinux gtk2 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.darwin.apple_sdk.frameworks.Carbon]; cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; env = lib.optionalAttrs stdenv.cc.isClang { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # Called from tools/test.neko line 2 # Uncaught exception - Segmentation fault - doInstallCheck = !stdenv.isDarwin; + doInstallCheck = !stdenv.hostPlatform.isDarwin; dontPatchELF = true; dontStrip = true; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 4655cb03ad7b2..68d9eedacc8da 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -85,7 +85,7 @@ in { }; buildInputs = [ boehmgc openssl pcre readline sqlite ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; patches = [ ./NIM_CONFIG_DIR.patch @@ -124,9 +124,9 @@ in { "--os:${nimHost.os}" "-d:release" "-d:useGnuReadline" - ] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace"; + ] ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) "-d:nativeStacktrace"; - preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' substituteInPlace makefile \ --replace "aarch64" "arm64" ''; @@ -192,7 +192,7 @@ in { # Needed for any nim package that uses the standard library's # 'std/sysrand' module. - depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; + depsTargetTargetPropagated = lib.optional stdenv.hostPlatform.isDarwin Security; inherit patches; @@ -252,7 +252,7 @@ in { runHook postBuild ''; - wrapperArgs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ + wrapperArgs = lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [ "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${ placeholder "out" }/bin" diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index e4a4ed0f9580e..c9b94abd2964e 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, fetchpatch, ncurses, libX11 }: let - useX11 = !stdenv.isAarch32 && !stdenv.isMips; - useNativeCompilers = !stdenv.isMips; + useX11 = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isMips; + useNativeCompilers = !stdenv.hostPlatform.isMips; inherit (lib) optional optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index 5279fc7481b6e..b3bf5038702f7 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { branch = baseOcamlBranch; platforms = with platforms; linux ++ darwin; - broken = stdenv.isAarch64 || stdenv.isMips; + broken = stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isMips; longDescription = '' A simple extension of OCaml with the primitive type of code values, and diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index af07074eba1b6..b40efbd327412 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -3,7 +3,7 @@ let versionNoPatch = "${toString major_version}.${toString minor_version}"; version = "${versionNoPatch}.${toString patch_version}"; - safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips || stdenv.hostPlatform.isStatic); + safeX11 = stdenv: !(stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isMips || stdenv.hostPlatform.isStatic); in { lib, stdenv, fetchurl, ncurses, buildEnv, libunwind, fetchpatch @@ -30,7 +30,7 @@ let in let - useNativeCompilers = !stdenv.isMips; + useNativeCompilers = !stdenv.hostPlatform.isMips; inherit (lib) optional optionals optionalString strings concatStrings; pname = concatStrings [ "ocaml" (optionalString aflSupport "+afl") @@ -84,7 +84,7 @@ stdenv.mkDerivation (args // { # `aarch64-apple-darwin-clang` while using assembler. However, such binary # does not exist. So, disable these configure flags on `aarch64-darwin`. # See #144785 for details. - configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.isDarwin && stdenv.isAarch64)) [ "host" "target" ]; + configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [ "host" "target" ]; # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie" ++ lib.optional (lib.versionAtLeast version "5.0" && stdenv.cc.isClang) "strictoverflow" @@ -114,7 +114,7 @@ stdenv.mkDerivation (args // { preConfigure = optionalString (lib.versionOlder version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - '' + optionalString (stdenv.isDarwin) '' + '' + optionalString (stdenv.hostPlatform.isDarwin) '' # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176 # This is required for aarch64-darwin, everything else works as is. AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c" @@ -157,7 +157,7 @@ stdenv.mkDerivation (args // { ''; platforms = with platforms; linux ++ darwin; - broken = stdenv.isAarch64 && lib.versionOlder version (if stdenv.isDarwin then "4.10" else "4.02"); + broken = stdenv.hostPlatform.isAarch64 && lib.versionOlder version (if stdenv.hostPlatform.isDarwin then "4.10" else "4.02"); }; }) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 089e8411210c2..a5110cb24d276 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -84,7 +84,7 @@ let # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859 "--with-extra-cxxflags=-xc++" ] - ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional stdenv.hostPlatform.isx86_64 "--with-jvm-features=zgc" ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix index 9c403fb2755dc..7a650fa4a30fd 100644 --- a/pkgs/development/compilers/openjdk/21.nix +++ b/pkgs/development/compilers/openjdk/21.nix @@ -98,7 +98,7 @@ let # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859 "--with-extra-cxxflags=-xc++" ] - ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional stdenv.hostPlatform.isx86_64 "--with-jvm-features=zgc" ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; diff --git a/pkgs/development/compilers/openjdk/22.nix b/pkgs/development/compilers/openjdk/22.nix index 18ab52f089d33..b022e492e3f93 100644 --- a/pkgs/development/compilers/openjdk/22.nix +++ b/pkgs/development/compilers/openjdk/22.nix @@ -42,6 +42,7 @@ , gtk3 , glib , writeShellScript +, versionCheckHook }: let @@ -254,6 +255,13 @@ stdenv.mkDerivation (finalAttrs: { pos = __curPos; meta = import ./meta.nix lib featureVersion; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/java"; + + doInstallCheck = true; + passthru = { updateScript = let diff --git a/pkgs/development/compilers/openjdk/openjfx/11/default.nix b/pkgs/development/compilers/openjdk/openjfx/11/default.nix index 79df8c0da3649..dcce1a2de6fc4 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkgs, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_6-headless, python3, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_7-headless, python3, ruby , openjdk11-bootstrap , withMedia ? true , withWebKit ? false @@ -27,9 +27,10 @@ in stdenv.mkDerivation { patches = [ ../backport-ffmpeg-6-support-jfx11.patch + ../backport-ffmpeg-7-support-jfx11.patch ]; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6-headless ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-headless ]; nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/17/default.nix b/pkgs/development/compilers/openjdk/openjfx/17/default.nix index 1b19ee30eca69..4dc57ec98a093 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_6-headless, python3, ruby +, ffmpeg_7-headless, python3, ruby , withMedia ? true , withWebKit ? false }: @@ -27,9 +27,10 @@ in stdenv.mkDerivation { patches = [ ../backport-ffmpeg-6-support-jfx11.patch + ../backport-ffmpeg-7-support-jfx11.patch ]; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6-headless ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-headless ]; nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -47,6 +48,9 @@ in stdenv.mkDerivation { -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + substituteInPlace modules/javafx.web/src/main/native/Source/JavaScriptCore/offlineasm/parser.rb \ + --replace-fail "File.exists?" "File.exist?" + ln -s $config gradle.properties ''; diff --git a/pkgs/development/compilers/openjdk/openjfx/21/default.nix b/pkgs/development/compilers/openjdk/openjfx/21/default.nix index 85fe036fe767e..5eed503cad117 100644 --- a/pkgs/development/compilers/openjdk/openjfx/21/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/21/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, pkgs, fetchFromGitHub, writeText , openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_6, python3, ruby +, libXxf86vm, glib, alsa-lib, ffmpeg_7, python3, ruby , withMedia ? true , withWebKit ? false }: @@ -25,7 +25,11 @@ in stdenv.mkDerivation { hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6 ]; + patches = [ + ../backport-ffmpeg-7-support-jfx21.patch + ]; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ]; nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/22/default.nix b/pkgs/development/compilers/openjdk/openjfx/22/default.nix index 4359a880ec04a..a64cecb8c9b50 100644 --- a/pkgs/development/compilers/openjdk/openjfx/22/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/22/default.nix @@ -2,6 +2,7 @@ , lib , pkgs , fetchFromGitHub +, fetchpatch2 , writeText , openjdk21_headless , gradle @@ -15,7 +16,7 @@ , libXxf86vm , glib , alsa-lib -, ffmpeg_6 +, ffmpeg_7 , python3 , ruby , withMedia ? true @@ -25,7 +26,7 @@ let pname = "openjfx-modular-sdk"; major = "22"; - update = ".0.1"; + update = ".0.2"; build = "-ga"; repover = "${major}${update}${build}"; jdk = openjdk21_headless; @@ -38,10 +39,19 @@ in stdenv.mkDerivation { owner = "openjdk"; repo = "jfx22u"; rev = repover; - hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q="; + hash = "sha256-7Q9nZ2p3KfQPt1A2ULwk64OU/5/ghEkcsf9ECD6Ln2g="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6 ]; + patches = [ + # 8338701: Provide media support for libavcodec version 61 + # <https://github.com/openjdk/jfx/pull/1552> + (fetchpatch2 { + url = "https://github.com/openjdk/jfx/commit/6115b396bacf62f39dcaa93c7c0adcd60b428b8c.patch?full_index=1"; + hash = "sha256-6EES4qsumFgXePZSDEetJC1Li65zquz3UjwRbq/6YJM="; + }) + ]; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ]; nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/22/deps.json b/pkgs/development/compilers/openjdk/openjfx/22/deps.json index 9ce577967ae24..a5b5a76852bf7 100644 --- a/pkgs/development/compilers/openjdk/openjfx/22/deps.json +++ b/pkgs/development/compilers/openjdk/openjfx/22/deps.json @@ -7,8 +7,8 @@ } }, "https://github.com": { - "unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": { - "zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA=" + "unicode-org/icu/releases/download/release-74-2/icu4c-74_2-data-bin-l": { + "zip": "sha256-Ks2xuYIigECWPRg7LdnTISUsYT4PTbIT1LvBBBfN5Wk=" } }, "https://repo.maven.apache.org/maven2": { diff --git a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch new file mode 100644 index 0000000000000..edd49ddf4a992 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch @@ -0,0 +1,155 @@ +Backported from <https://github.com/openjdk/jfx/pull/1552>. + +Original author: Alexander Matveev <alexander.matveev@oracle.com> + +diff --git a/build.gradle b/build.gradle +index d1ae3b401f..848a385f36 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -3343,6 +3343,7 @@ + media name: "ffmpeg-4.0.2", ext: "tar.gz" + media name: "ffmpeg-5.1.2", ext: "tar.gz" + media name: "ffmpeg-6.0", ext: "tar.gz" ++ media name: "ffmpeg-7.0.2", ext: "tar.gz" + } + implementation project(":base") + implementation project(":graphics") +@@ -3689,8 +3690,8 @@ + doLast { + project.ext.libav = [:] + project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg" +- project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ] +- project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ] ++ project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2" ] ++ project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61" ] + + libav.versions.each { version -> + def libavDir = "${libav.basedir}/ffmpeg-${version}" +@@ -3770,7 +3771,7 @@ + project.ext.libav.libavffmpeg.versions = [ "56" ] + project.ext.libav.ffmpeg = [:] + project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg" +- project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ] ++ project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61" ] + + project.ext.libav.versions.each { version -> + def libavDir = "${project.ext.libav.basedir}-${version}" +diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java +index b05bb68341..2add519ed4 100644 +--- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java ++++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -126,6 +126,7 @@ + dependencies.add("avplugin-ffmpeg-58"); + dependencies.add("avplugin-ffmpeg-59"); + dependencies.add("avplugin-ffmpeg-60"); ++ dependencies.add("avplugin-ffmpeg-61"); + } + if (HostUtils.isMacOSX()) { + dependencies.add("fxplugins"); +diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c +index ee64e4bafd..0204db4250 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c ++++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c +@@ -146,7 +146,7 @@ + // For ffmpeg (libavcodec-ffmpeg.so) + static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 }; + // For libav or ffmpeg (libavcodec.so) +-static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 }; ++static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61 }; + + /* + * Callback passed to dl_iterate_phdr(): finds the path of +diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h +index bb93df5f96..a09b954714 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h ++++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -50,5 +50,14 @@ + // Do not call avcodec_register_all() and av_register_all() + // Not required since 58 and removed in 59 + #define NO_REGISTER_ALL (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,0,0)) ++ ++// Do not use reordered_opaque to pass PTS. Use AVPacket.pts/AVFrame.pts instead. ++// reordered_opaque is removed since 61. ++#define NO_REORDERED_OPAQUE (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0)) ++ ++// Use AVCodecContext.frame_num instead of AVCodecContext.frame_number. They same ++// except frame_num is 64-bit and frame_number is 32-bit. Since 61. ++#define USE_FRAME_NUM (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0)) ++ + #endif /* AVDEFINES_H */ + +diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c +index fe1f96b9cb..9179ef8b68 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c ++++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c +@@ -397,10 +397,17 @@ + if (av_new_packet(&decoder->packet, info.size) == 0) + { + memcpy(decoder->packet.data, info.data, info.size); ++#if NO_REORDERED_OPAQUE ++ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) ++ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf); ++ else ++ decoder->packet.pts = AV_NOPTS_VALUE; ++#else // NO_REORDERED_OPAQUE + if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) + base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf); + else + base->context->reordered_opaque = AV_NOPTS_VALUE; ++#endif // NO_REORDERED_OPAQUE + #if USE_SEND_RECEIVE + num_dec = avcodec_send_packet(base->context, &decoder->packet); + if (num_dec == 0) +@@ -432,10 +439,17 @@ + av_init_packet(&decoder->packet); + decoder->packet.data = info.data; + decoder->packet.size = info.size; ++#if NO_REORDERED_OPAQUE ++ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) ++ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf); ++ else ++ decoder->packet.pts = AV_NOPTS_VALUE; ++#else // NO_REORDERED_OPAQUE + if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) + base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf); + else + base->context->reordered_opaque = AV_NOPTS_VALUE; ++#endif // NO_REORDERED_OPAQUE + + #if USE_SEND_RECEIVE + num_dec = avcodec_send_packet(base->context, &decoder->packet); +@@ -480,10 +494,20 @@ + } + else + { ++#if USE_FRAME_NUM ++ GST_BUFFER_OFFSET(outbuf) = base->context->frame_num; ++#else // USE_FRAME_NUM + GST_BUFFER_OFFSET(outbuf) = base->context->frame_number; ++#endif // USE_FRAME_NUM ++#if NO_REORDERED_OPAQUE ++ if (base->frame->pts != AV_NOPTS_VALUE) ++ { ++ GST_BUFFER_TIMESTAMP(outbuf) = base->frame->pts; ++#else // NO_REORDERED_OPAQUE + if (base->frame->reordered_opaque != AV_NOPTS_VALUE) + { + GST_BUFFER_TIMESTAMP(outbuf) = base->frame->reordered_opaque; ++#endif // NO_REORDERED_OPAQUE + GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf); // Duration for video usually same + } + diff --git a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch new file mode 100644 index 0000000000000..3e746b0cab8ff --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch @@ -0,0 +1,213 @@ +Backported from <https://github.com/openjdk/jfx/pull/1552>. + +Original author: Alexander Matveev <alexander.matveev@oracle.com> + +diff --git a/build.gradle b/build.gradle +index f9dbc53076..77856226a6 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -2946,6 +2946,7 @@ + media name: "ffmpeg-4.0.2", ext: "tar.gz" + media name: "ffmpeg-5.1.2", ext: "tar.gz" + media name: "ffmpeg-6.0", ext: "tar.gz" ++ media name: "ffmpeg-7.0.2", ext: "tar.gz" + } + implementation project(":base") + implementation project(":graphics") +@@ -3292,8 +3293,8 @@ + doLast { + project.ext.libav = [:] + project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg" +- project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ] +- project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ] ++ project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2" ] ++ project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61" ] + + libav.versions.each { version -> + def libavDir = "${libav.basedir}/ffmpeg-${version}" +@@ -3373,7 +3374,7 @@ + project.ext.libav.libavffmpeg.versions = [ "56" ] + project.ext.libav.ffmpeg = [:] + project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg" +- project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ] ++ project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61" ] + + project.ext.libav.versions.each { version -> + def libavDir = "${project.ext.libav.basedir}-${version}" +diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml +index 887b9d100c..a10610b0f5 100644 +--- a/gradle/verification-metadata.xml ++++ b/gradle/verification-metadata.xml +@@ -28,6 +28,11 @@ + <sha256 value="f4ccf961403752c93961927715f524576d1f4dd02cd76d8c76aed3bbe6686656" origin="Generated by Gradle"/> + </artifact> + </component> ++ <component group="" name="ffmpeg-7.0.2" version=""> ++ <artifact name="ffmpeg-7.0.2-.tar.gz"> ++ <sha256 value="1233b3a93dd7517cc3c56b72a67f64041c044848d981e3deff4bebffa25f1054" origin="Generated by Gradle"/> ++ </artifact> ++ </component> + <component group="" name="icu4c-73_1-data-bin-l" version=""> + <artifact name="icu4c-73_1-data-bin-l-.zip"> + <sha256 value="4038298ee02a0c38917185ef8ff4ebde9c8b552c777fd03e4df6c6b4b1825e20" origin="Generated by Gradle"/> +diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java +index 097004bd17..0c2ae1ddbc 100644 +--- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java ++++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -127,6 +127,7 @@ + dependencies.add("avplugin-ffmpeg-58"); + dependencies.add("avplugin-ffmpeg-59"); + dependencies.add("avplugin-ffmpeg-60"); ++ dependencies.add("avplugin-ffmpeg-61"); + } + if (PlatformUtil.isMac()) { + dependencies.add("fxplugins"); +diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c +index 22c8be9300..38bae197fe 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c ++++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c +@@ -146,7 +146,7 @@ + // For ffmpeg (libavcodec-ffmpeg.so) + static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 }; + // For libav or ffmpeg (libavcodec.so) +-static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 }; ++static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61 }; + + /* + * Callback passed to dl_iterate_phdr(): finds the path of +diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h +index 60fa7b631c..f49ad56e1e 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h ++++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -53,5 +53,13 @@ + // Not required since 58 and removed in 59 + #define NO_REGISTER_ALL (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,0,0)) + ++// Do not use reordered_opaque to pass PTS. Use AVPacket.pts/AVFrame.pts instead. ++// reordered_opaque is removed since 61. ++#define NO_REORDERED_OPAQUE (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0)) ++ ++// Use AVCodecContext.frame_num instead of AVCodecContext.frame_number. They same ++// except frame_num is 64-bit and frame_number is 32-bit. Since 61. ++#define USE_FRAME_NUM (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0)) ++ + #endif /* AVDEFINES_H */ + +diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c +index c9fa787e63..8a5cd78f2d 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c ++++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c +@@ -554,7 +554,11 @@ + if (ret < 0) + return FALSE; + ++#if NO_REORDERED_OPAQUE ++ decoder->dest_frame->pts = base->frame->pts; ++#else // NO_REORDERED_OPAQUE + decoder->dest_frame->reordered_opaque = base->frame->reordered_opaque; ++#endif // NO_REORDERED_OPAQUE + + return TRUE; + } +@@ -679,7 +683,7 @@ + GstMapInfo info2; + gboolean unmap_buf = FALSE; + gboolean set_frame_values = TRUE; +- int64_t reordered_opaque = AV_NOPTS_VALUE; ++ int64_t pts = AV_NOPTS_VALUE; + unsigned int out_buf_size = 0; + gboolean copy_error = FALSE; + uint8_t* data0 = NULL; +@@ -711,10 +715,17 @@ + if (av_new_packet(&decoder->packet, info.size) == 0) + { + memcpy(decoder->packet.data, info.data, info.size); ++#if NO_REORDERED_OPAQUE ++ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) ++ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf); ++ else ++ decoder->packet.pts = AV_NOPTS_VALUE; ++#else // NO_REORDERED_OPAQUE + if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) + base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf); + else + base->context->reordered_opaque = AV_NOPTS_VALUE; ++#endif // NO_REORDERED_OPAQUE + #if USE_SEND_RECEIVE + num_dec = avcodec_send_packet(base->context, &decoder->packet); + if (num_dec == 0) +@@ -746,10 +757,17 @@ + av_init_packet(&decoder->packet); + decoder->packet.data = info.data; + decoder->packet.size = info.size; ++#if NO_REORDERED_OPAQUE ++ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) ++ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf); ++ else ++ decoder->packet.pts = AV_NOPTS_VALUE; ++#else // NO_REORDERED_OPAQUE + if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) + base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf); + else + base->context->reordered_opaque = AV_NOPTS_VALUE; ++#endif // NO_REORDERED_OPAQUE + + #if USE_SEND_RECEIVE + num_dec = avcodec_send_packet(base->context, &decoder->packet); +@@ -796,7 +814,11 @@ + goto _exit; + } + +- reordered_opaque = decoder->dest_frame->reordered_opaque; ++#if NO_REORDERED_OPAQUE ++ pts = decoder->dest_frame->pts; ++#else // NO_REORDERED_OPAQUE ++ pts = decoder->dest_frame->reordered_opaque; ++#endif // NO_REORDERED_OPAQUE + data0 = decoder->dest_frame->data[0]; + data1 = decoder->dest_frame->data[1]; + data2 = decoder->dest_frame->data[2]; +@@ -806,7 +828,11 @@ + + if (set_frame_values) + { +- reordered_opaque = base->frame->reordered_opaque; ++#if NO_REORDERED_OPAQUE ++ pts = base->frame->pts; ++#else // NO_REORDERED_OPAQUE ++ pts = base->frame->reordered_opaque; ++#endif // NO_REORDERED_OPAQUE + data0 = base->frame->data[0]; + data1 = base->frame->data[1]; + data2 = base->frame->data[2]; +@@ -825,10 +851,14 @@ + } + else + { ++#if USE_FRAME_NUM ++ GST_BUFFER_OFFSET(outbuf) = base->context->frame_num; ++#else // USE_FRAME_NUM + GST_BUFFER_OFFSET(outbuf) = base->context->frame_number; +- if (reordered_opaque != AV_NOPTS_VALUE) ++#endif // USE_FRAME_NUM ++ if (pts != AV_NOPTS_VALUE) + { +- GST_BUFFER_TIMESTAMP(outbuf) = reordered_opaque; ++ GST_BUFFER_TIMESTAMP(outbuf) = pts; + GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf); // Duration for video usually same + } + diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 18b99d5ba69a9..dd71582bdfbd0 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-M+0jh/Sbgl+hucOwBy4F8lkUG4lUdK0IWuURQ9MEDMA="; }; - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' # This benchmark times out on Hydra.nixos.org sed -i '/memcpy_speed/d' testsuite/meson.build ''; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { ; # https://gitlab.freedesktop.org/gstreamer/orc/-/issues/41 - doCheck = !(stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12"); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12"); passthru.tests = { inherit (gst_all_1) gst-plugins-good gst-plugins-bad gst-plugins-ugly; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index b7ad7537c7e12..f485998d1cfaa 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "openshadinglanguage"; - version = "1.13.10.0"; + version = "1.13.11.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenShadingLanguage"; rev = "v${version}"; - hash = "sha256-tjfg9cGbfL0D+KcxtWgQF6gY9sCjxEjyGNxFZyPhJ/U="; + hash = "sha256-E/LUTtT0ZU0SBuwtJPA0FznvOuc2a3aJn2/n3ru5l0s="; }; cmakeFlags = [ @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { python3.pkgs.pybind11 util-linux # needed just for hexdump zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libxml2 ]; diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 768d125cfff47..8241d8580e54b 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper , haskellPackages, haskell -, which, swiProlog, rlwrap, tk +, which, swi-prolog, rlwrap, tk , curl, git, unzip, gnutar, coreutils, sqlite }: let @@ -26,7 +26,7 @@ let in stdenv.mkDerivation { inherit pname version src; - buildInputs = [ swiProlog ]; + buildInputs = [ swi-prolog ]; nativeBuildInputs = [ which makeWrapper ]; makeFlags = [ diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index bcd52380701ac..ee841882833c5 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { pname = "polyml"; inherit version; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; @@ -20,7 +20,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; src = fetchurl { url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index f48377e0e0ac2..471e8b2fd9f10 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "polyml"; version = "5.7.1"; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libffi gmp ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; configureFlags = [ "--enable-shared" @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { platforms = with platforms; (linux ++ darwin); maintainers = with maintainers; [ maggesi ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index c82a88bb2793e..067bdd018f275 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; }; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; buildInputs = [ libffi gmp ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; configureFlags = [ "--enable-shared" diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index b10739ca3363d..ca23261a9865f 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (rec { }; nativeBuildInputs = [ cmake makeWrapper which python3 ] - ++ lib.optionals (stdenv.isDarwin) [ cctools ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools ]; buildInputs = [ libxml2 z3 ]; # Sandbox disallows network access, so disabling problematic networking tests @@ -53,7 +53,7 @@ stdenv.mkDerivation (rec { hash = "sha256-/FWBSxZESwj/QvdNK5BI2EfonT64DP1eGBZR4O8uJww="; }; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (substituteAll { src = ./fix-darwin-build.patch; libSystem = darwin.Libsystem; @@ -85,15 +85,15 @@ stdenv.mkDerivation (rec { makeFlags = [ "PONYC_VERSION=${version}" "prefix=${placeholder "out"}" - ] ++ lib.optionals stdenv.isDarwin ([ "bits=64" ] ++ lib.optional (!lto) "lto=no"); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin ([ "bits=64" ] ++ lib.optional (!lto) "lto=no"); env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; # make: *** [Makefile:222: test-full-programs-release] Killed: 9 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; installPhase = "make config=release prefix=$out " - + lib.optionalString stdenv.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no ")) + + lib.optionalString stdenv.hostPlatform.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no ")) + '' install wrapProgram $out/bin/ponyc \ --prefix PATH ":" "${stdenv.cc}/bin" \ diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index f0664df84dfe8..99947491cde03 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "0.6.2"; - src = if stdenv.isDarwin + src = if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/macos.tar.gz"; sha256 = "17dh3bc5b6ahfyx0pi6n9qnrhsyi83qdynnca6k1kamxwjimpcq1"; @@ -34,12 +34,12 @@ stdenv.mkDerivation rec { install -D -m555 -T psc-package $PSC_PACKAGE chmod u+w $PSC_PACKAGE - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool \ -change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib \ -change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \ $PSC_PACKAGE - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PSC_PACKAGE '' + '' chmod u-w $PSC_PACKAGE diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 61a8c3a5c5bd8..8f88fed052eef 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -7,7 +7,7 @@ let dynamic-linker = stdenv.cc.bintools.dynamicLinker; patchelf = libPath : - lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' chmod u+w $PURS patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PURS chmod u-w $PURS diff --git a/pkgs/development/compilers/rust/1_80.nix b/pkgs/development/compilers/rust/1_80.nix index f1a5bb8d61eaf..fe301144afffc 100644 --- a/pkgs/development/compilers/rust/1_80.nix +++ b/pkgs/development/compilers/rust/1_80.nix @@ -88,7 +88,7 @@ import ./default.nix allowedRequisites = null; cc = llvmPackages.clangNoLibcxx; hostPlatform = stdenv.hostPlatform // { - useLLVM = !stdenv.isDarwin; + useLLVM = !stdenv.hostPlatform.isDarwin; }; }; inherit libunwind; @@ -119,6 +119,7 @@ import ./default.nix aarch64-apple-darwin = "e70a9362975b94df7dbc6e2ed5ceab4254dd32f72ba497ff4a70440ace3f729f"; powerpc64le-unknown-linux-gnu = "9865eeebb5bb20006367d3148d9116576499ec958d847e22b645f008a1bc4170"; riscv64gc-unknown-linux-gnu = "c8d38e600ef4dea8b375df2d08153393816ffd3dcab18e4d081ddc19e28b5a40"; + s390x-unknown-linux-gnu = "1e9f1b27ce47d831108e1d1bb6ef7ab86f95bedfea843318292f821142fe1f6c"; x86_64-unknown-freebsd = "3c8005f488b8dda0fc6d47928868200852106cac2b568934ae9a2e5c89d3a50d"; }; diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 10e944515df76..6d31f1af55afc 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -33,11 +33,11 @@ rec { license = [ licenses.mit licenses.asl20 ]; }; - nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; + nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook; buildInputs = [ bash ] - ++ lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) gcc.cc.lib - ++ lib.optional (!stdenv.isDarwin) zlib - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib + ++ lib.optional (!stdenv.hostPlatform.isDarwin) zlib + ++ lib.optional stdenv.hostPlatform.isDarwin Security; postPatch = '' patchShebangs . @@ -80,10 +80,10 @@ rec { }; nativeBuildInputs = [ makeWrapper ] - ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook; buildInputs = [ bash ] - ++ lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) gcc.cc.lib - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib + ++ lib.optional stdenv.hostPlatform.isDarwin Security; postPatch = '' patchShebangs . diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 9a12537f3e321..6ece7c304fc57 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage.override { zlib ]; buildInputs = [ file curl python3 openssl zlib ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; # cargo uses git-rs which is made for a version of libgit2 from recent master that # is not compatible with the current version in nixpkgs. diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 640ea7908e252..6a233ffe18520 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { dontUpdateAutotoolsGnuConfigScripts = true; buildInputs = [ rustc.llvm ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; # fixes: error: the option `Z` is only accepted on the nightly compiler RUSTC_BOOTSTRAP = 1; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { # # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/clippy-driver" install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/cargo-clippy" ''; diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index 54c15406df670..e2ff6a815227b 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -19,6 +19,7 @@ PLATFORMS=( aarch64-apple-darwin powerpc64le-unknown-linux-gnu riscv64gc-unknown-linux-gnu + s390x-unknown-linux-gnu x86_64-unknown-freebsd ) BASEURL=https://static.rust-lang.org/dist diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 509f255fda782..c8eb3f438e998 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -68,13 +68,13 @@ in stdenv.mkDerivation (finalAttrs: { # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' # This doesn't apply to cross-building for FreeBSD because the host # uses libstdc++, but the target (used for building std) uses libc++ - optional (stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && !useLLVM) + optional (stdenv.hostPlatform.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && !useLLVM) "--push-state --as-needed -lstdc++ --pop-state" - ++ optional (stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && useLLVM) + ++ optional (stdenv.hostPlatform.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && useLLVM) "--push-state --as-needed -L${llvmPackages.libcxx}/lib -lc++ -lc++abi -lLLVM-${lib.versions.major llvmPackages.llvm.version} --pop-state" - ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++ -lc++abi" - ++ optional stdenv.isFreeBSD "-rpath ${llvmPackages.libunwind}/lib" - ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost.lib}/lib"); + ++ optional (stdenv.hostPlatform.isDarwin && !withBundledLLVM) "-lc++ -lc++abi" + ++ optional stdenv.hostPlatform.isFreeBSD "-rpath ${llvmPackages.libunwind}/lib" + ++ optional stdenv.hostPlatform.isDarwin "-rpath ${llvmSharedForHost.lib}/lib"); # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; @@ -156,7 +156,7 @@ in stdenv.mkDerivation (finalAttrs: { # Since fastCross only builds std, it doesn't make sense (and # doesn't work) to build a linker. "--disable-llvm-bitcode-linker" - ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox && !(stdenv.targetPlatform.useLLVM or false)) [ + ] ++ optionals (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) [ "--enable-profiler" # build libprofiler_builtins ] ++ optionals stdenv.buildPlatform.isMusl [ "${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}" @@ -166,7 +166,7 @@ in stdenv.mkDerivation (finalAttrs: { "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" ] ++ optionals stdenv.targetPlatform.rust.isNoStdTarget [ "--disable-docs" - ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # https://github.com/rust-lang/rust/issues/92173 "--set rust.jemalloc" ] ++ optionals useLLVM [ @@ -224,7 +224,7 @@ in stdenv.mkDerivation (finalAttrs: { # Useful debugging parameter # export VERBOSE=1 - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' # See https://github.com/jemalloc/jemalloc/issues/1997 # Using a value of 48 should work on both emulated and native x86_64-darwin. export JEMALLOC_SYS_WITH_LG_VADDR=48 @@ -236,7 +236,7 @@ in stdenv.mkDerivation (finalAttrs: { [source.vendored-sources] directory = "vendor" EOF - '' + lib.optionalString (stdenv.isFreeBSD) '' + '' + lib.optionalString (stdenv.hostPlatform.isFreeBSD) '' # lzma-sys bundles an old version of xz that doesn't build # on modern FreeBSD, use the system one instead substituteInPlace src/bootstrap/src/core/build_steps/tool.rs \ @@ -257,7 +257,7 @@ in stdenv.mkDerivation (finalAttrs: { ++ optionals fastCross [ lndir makeWrapper ]; buildInputs = [ openssl ] - ++ optionals stdenv.isDarwin [ libiconv Security zlib ] + ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Security zlib ] ++ optional (!withBundledLLVM) llvmShared.lib ++ optional (useLLVM && !withBundledLLVM) [ llvmPackages.libunwind diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index ab58a172a6b20..42c71513151a6 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rustc.llvm - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; # rustfmt uses the rustc_driver and std private libraries, and Rust's build process forces them to have # an install name of `@rpath/...` [0] [1] instead of the standard on macOS, which is an absolute path @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { # # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/rustfmt" install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/git-rustfmt" ''; diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix index 0b4cc240694cb..3877d752f7953 100644 --- a/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -6,12 +6,12 @@ , boehmgc , openssl , zlib -, odbcSupport ? !stdenv.isDarwin +, odbcSupport ? !stdenv.hostPlatform.isDarwin , libiodbc }: -let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" - else if (stdenv.isLinux or stdenv.isBSD) then "LD_LIBRARY_PATH" +let platformLdLibraryPath = if stdenv.hostPlatform.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" + else if (stdenv.hostPlatform.isLinux or stdenv.hostPlatform.isBSD) then "LD_LIBRARY_PATH" else throw "unsupported platform"; in stdenv.mkDerivation rec { @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { buildInputs = [ libffi boehmgc openssl zlib ] ++ lib.optional odbcSupport libiodbc; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=int-conversion" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # error: '__builtin_ia32_aeskeygenassist128' needs target feature aes "-maes" ]); diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index d796b24e1d7e3..6f9b75c1183c4 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --add-flags "--core $out/share/sbcl/sbcl.core" ''; - postFixup = lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 86c0ddd52fab8..b50928ce05f39 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,11 +10,17 @@ let versionMap = { + # Necessary for Nyxt "2.4.6" = { sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE="; }; - "2.4.7" = { - sha256 = "sha256-aFRNJQNjWs0BXVNMzJsq6faJltQptakGP9Iv8JJQEdI="; + # By unofficial and very loose convention we keep the latest version of + # SBCL, and the previous one in case someone quickly needs to roll back. + "2.4.8" = { + sha256 = "sha256-/G7NzFOOgKFKmY1TDMw4SkF5D09Pxs1//oyxJqZ3aUw="; + }; + "2.4.9" = { + sha256 = "sha256-mXDk68XWlD3GTXyh9S2bXNn8lM75TSMyE9eOx182BeI="; }; }; # Collection of pre-built SBCL binaries for platforms that need them for @@ -164,7 +170,7 @@ stdenv.mkDerivation (self: { lib.optional self.threadSupport "sb-thread" ++ lib.optional self.linkableRuntime "sb-linkable-runtime" ++ lib.optional self.coreCompression "sb-core-compression" ++ - lib.optional stdenv.isAarch32 "arm" ++ + lib.optional stdenv.hostPlatform.isAarch32 "arm" ++ lib.optional self.markRegionGC "mark-region-gc"; disableFeatures = diff --git a/pkgs/development/compilers/scala/bare.nix b/pkgs/development/compilers/scala/bare.nix index bbbb573f2f5ac..684537e160c79 100644 --- a/pkgs/development/compilers/scala/bare.nix +++ b/pkgs/development/compilers/scala/bare.nix @@ -1,15 +1,25 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: +{ + lib, + stdenv, + fetchurl, + makeWrapper, + jre, + ncurses, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.3.3"; pname = "scala-bare"; src = fetchurl { - url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; + url = "https://github.com/scala/scala3/releases/download/${finalAttrs.version}/scala3-${finalAttrs.version}.tar.gz"; hash = "sha256-61lAETEvqkEqr5pbDltFkh+Qvp+EnCDilXN9X67NFNE="; }; - propagatedBuildInputs = [ jre ncurses.dev ] ; + propagatedBuildInputs = [ + jre + ncurses.dev + ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -20,23 +30,24 @@ stdenv.mkDerivation rec { # Use preFixup instead of fixupPhase # because we want the default fixupPhase as well preFixup = '' - bin_files=$(find $out/bin -type f ! -name common) - for f in $bin_files ; do - wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin' - done + bin_files=$(find $out/bin -type f ! -name "*common*" ! -name "scala-cli.jar") + for f in $bin_files ; do + wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin' + done ''; meta = with lib; { - description = "Research platform for new language concepts and compiler technologies for Scala"; - longDescription = '' - Dotty is a platform to try out new language concepts and compiler technologies for Scala. - The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals), - and try to boil down Scala’s types into a smaller set of more fundamental constructs. - The theory behind these constructs is researched in DOT, a calculus for dependent object types. - ''; - homepage = "http://dotty.epfl.ch/"; - license = licenses.bsd3; + description = "The Scala 3 compiler, also known as Dotty"; + homepage = "https://scala-lang.org/"; + license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ karolchmist virusdave kashw2 ]; + maintainers = with maintainers; [ + karolchmist + virusdave + kashw2 + natsukagami + hamzaremmal + dottybot + ]; }; -} +}) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 2ad68ffec3b36..8d27707dff7fb 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,8 +1,19 @@ -{ stdenv, fetchurl, makeWrapper, jre, callPackage }: +{ + stdenv, + fetchurl, + makeWrapper, + jre, + callPackage, +}: let bare = callPackage ./bare.nix { - inherit stdenv fetchurl makeWrapper jre; + inherit + stdenv + fetchurl + makeWrapper + jre + ; }; in @@ -21,4 +32,7 @@ stdenv.mkDerivation { ''; inherit (bare) meta; -} // { inherit bare; } +} +// { + inherit bare; +} diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/development/compilers/scryer-prolog/default.nix index 245d48d1a5954..58a853e66d886 100644 --- a/pkgs/development/compilers/scryer-prolog/default.nix +++ b/pkgs/development/compilers/scryer-prolog/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 968a3014fa405..97c50cde91e78 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake python3 ] - ++ lib.optionals stdenv.isDarwin [ cctools ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; postInstall = '' moveToOutput "lib/*.a" $static diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index 26efb81e16869..000c59d67a384 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -3,7 +3,7 @@ let version = "110.95"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; - arch = if stdenv.is64bit + arch = if stdenv.hostPlatform.is64bit then "64" else "32"; @@ -12,7 +12,7 @@ let boot64 = { url = "${baseurl}/boot.amd64-unix.tgz"; sha256 = "1zn96a83kb6bn6228yfjsvb58m2qxw9k4j3qz0p9c8za479w4ch6"; }; - bootBinary = if stdenv.is64bit + bootBinary = if stdenv.hostPlatform.is64bit then boot64 else boot32; @@ -51,7 +51,7 @@ in stdenv.mkDerivation { sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl patch --verbose config/_heap2exec ${./heap2exec.diff} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Locate standard headers like <unistd.h> substituteInPlace base/runtime/config/gen-posix-names.sh \ --replace "\$SDK_PATH/usr" "${Libsystem}" @@ -89,6 +89,6 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ thoughtpolice ]; mainProgram = "sml"; # never built on x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 2147d59ffd933..73476c939ce80 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -8,7 +8,7 @@ , python3 , z3Support ? true , z3_4_11 ? null -, cvc4Support ? gccStdenv.isLinux +, cvc4Support ? gccStdenv.hostPlatform.isLinux , cvc4 ? null , cln ? null , gmp ? null @@ -52,7 +52,7 @@ let maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; }; - solc = if gccStdenv.isLinux then gccStdenv.mkDerivation rec { + solc = if gccStdenv.hostPlatform.isLinux then gccStdenv.mkDerivation rec { inherit pname version meta; # upstream suggests avoid using archive generated by github diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index b851ac2c1403d..f279ce475a4e4 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ./includes.patch ]; - hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ]; nativeBuildInputs = [ bison cmake flex mcpp doxygen graphviz makeWrapper perl ]; buildInputs = [ bash-completion ncurses zlib sqlite libffi python3 ]; diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 20adaf5f559b3..89e4452e7d4b9 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { postInstall = '' install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool $out/bin/llvm-spirv \ -change @rpath/libLLVMSPIRVLib.dylib $out/lib/libLLVMSPIRVLib.dylib ''; diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 628e69eb5bc9a..1e2851149ef67 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -54,7 +54,7 @@ # url = "https://raw.githubusercontent.com/samer--/prolog/master/typedef/release/typedef-0.1.9.tgz"; # sha256 = "056nqjn01g18fb1b2qivv9s7hb4azk24nx2d4kvkbmm1k91f44p3"; # }; -# swiProlog = pkgs.swiProlog.override { extraPacks = map (dep-path: "'file://${dep-path}'") [ +# swi-prolog = pkgs.swi-prolog.override { extraPacks = map (dep-path: "'file://${dep-path}'") [ # julian delay list_util typedef # ]; }; , extraPacks ? [] @@ -63,7 +63,7 @@ let # minorVersion is even for stable, odd for unstable - version = "9.2.6"; + version = "9.2.7"; # This package provides several with* options, which replaces the old extraLibraries option. # This error should help users that still use this option find their way to these flags. @@ -72,9 +72,9 @@ let "option 'extraLibraries' removed - use 'with*' options (e.g., 'withJava'), or overrideAttrs to inject extra build dependencies"; packInstall = swiplPath: pack: - ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false)])." -t "halt." + ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false), git(false)])." -t "halt." ''; - withGui' = withGui && !stdenv.isDarwin; + withGui' = withGui && !stdenv.hostPlatform.isDarwin; optionalDependencies = [] ++ (lib.optional withDb db) ++ (lib.optional withJava jdk) @@ -85,7 +85,7 @@ let ++ (lib.optionals withGui' [ libXt libXext libXpm libXft libXinerama libjpeg libSM freetype fontconfig ]) - ++ (lib.optional stdenv.isDarwin Security) + ++ (lib.optional stdenv.hostPlatform.isDarwin Security) ++ extraLibraries'; in stdenv.mkDerivation { @@ -99,7 +99,7 @@ stdenv.mkDerivation { owner = "SWI-Prolog"; repo = "swipl"; rev = "V${version}"; - hash = "sha256-FgEn+Ht45++GFpfcdaJ5In5x+NyIOopSlSAs+t7sPDE="; + hash = "sha256-O9ogltcbBST111FA85jEVW6jGOLJSt/5PeBABtMu2Ws="; fetchSubmodules = true; }; @@ -126,8 +126,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DSWIPL_INSTALL_IN_LIB=ON" ] ++ lib.optionals (!withNativeCompiler) [ # without these options, the build will embed full compiler paths - "-DSWIPL_CC=${if stdenv.isDarwin then "clang" else "gcc"}" - "-DSWIPL_CXX=${if stdenv.isDarwin then "clang++" else "g++"}" + "-DSWIPL_CC=${if stdenv.hostPlatform.isDarwin then "clang" else "gcc"}" + "-DSWIPL_CXX=${if stdenv.hostPlatform.isDarwin then "clang++" else "g++"}" ]; preInstall = '' diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 31cbd298603a4..c74ee850f4a50 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -13,6 +13,7 @@ , python3Packages , git , fetchpatch +, fetchpatch2 , makeWrapper , gnumake , file @@ -49,7 +50,7 @@ let sources = callPackage ../sources.nix { }; # Tools invoked by swift at run-time. - runtimeDeps = lib.optionals stdenv.isDarwin [ + runtimeDeps = lib.optionals stdenv.hostPlatform.isDarwin [ # libtool is used for static linking. This is part of cctools, but adding # that as a build input puts an unwrapped linker in PATH, and breaks # builds. This small derivation exposes just libtool. @@ -77,7 +78,7 @@ let else targetPlatform.parsed.kernel.name; # Apple Silicon uses a different CPU name in the target triple. - swiftArch = if stdenv.isDarwin && stdenv.isAarch64 then "arm64" + swiftArch = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "arm64" else targetPlatform.parsed.cpu.name; # On Darwin, a `.swiftmodule` is a subdirectory in `lib/swift/<OS>`, @@ -108,7 +109,7 @@ let "toolchain-tools" "toolchain-dev-tools" "license" - (if stdenv.isDarwin then "sourcekit-xpc-service" else "sourcekit-inproc") + (if stdenv.hostPlatform.isDarwin then "sourcekit-xpc-service" else "sourcekit-inproc") "swift-remote-mirror" "swift-remote-mirror-headers" ]; @@ -204,7 +205,7 @@ in stdenv.mkDerivation { makeClangWrapper makeSwiftcWrapper ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild sigtool # codesign DarwinTools # sw_vers @@ -217,10 +218,10 @@ in stdenv.mkDerivation { swig libxml2 ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libuuid ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Foundation Combine @@ -261,7 +262,7 @@ in stdenv.mkDerivation { ${copySource "swift-experimental-string-processing"} ${copySource "swift-syntax"} ${lib.optionalString - (!stdenv.isDarwin) + (!stdenv.hostPlatform.isDarwin) (copySource "swift-corelibs-libdispatch")} chmod -R u+w . @@ -271,7 +272,7 @@ in stdenv.mkDerivation { # Just patch all the things for now, we can focus this later. # TODO: eliminate use of env. find -type f -print0 | xargs -0 sed -i \ - ${lib.optionalString stdenv.isDarwin + ${lib.optionalString stdenv.hostPlatform.isDarwin "-e 's|/usr/libexec/PlistBuddy|${xcbuild}/bin/PlistBuddy|g'"} \ -e 's|/usr/bin/env|${coreutils}/bin/env|g' \ -e 's|/usr/bin/make|${gnumake}/bin/make|g' \ @@ -302,6 +303,32 @@ in stdenv.mkDerivation { patch -p1 -d llvm-project/llvm -i ${./patches/llvm-module-cache.patch} + for lldbPatch in ${lib.escapeShellArgs [ + # Fixes for SWIG 4 + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63.patch?full_index=1"; + stripLen = 1; + hash = "sha256-Znw+C0uEw7lGETQLKPBZV/Ymo2UigZS+Hv/j1mUo7p0="; + }) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/f0a25fe0b746f56295d5c02116ba28d2f965c175.patch?full_index=1"; + stripLen = 1; + hash = "sha256-QzVeZzmc99xIMiO7n//b+RNAvmxghISKQD93U2zOgFI="; + }) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/ba35c27ec9aa9807f5b4be2a0c33ca9b045accc7.patch?full_index=1"; + stripLen = 1; + hash = "sha256-LXl+WbpmWZww5xMDrle3BM2Tw56v8k9LO1f1Z1/wDTs="; + }) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/9ec115978ea2bdfc60800cd3c21264341cdc8b0a.patch?full_index=1"; + stripLen = 1; + hash = "sha256-u0zSejEjfrH3ZoMFm1j+NVv2t5AP9cE5yhsrdTS1dG4="; + }) + ]}; do + patch -p1 -d llvm-project/lldb -i $lldbPatch + done + patch -p1 -d llvm-project/clang -i ${./patches/clang-toolchain-dir.patch} patch -p1 -d llvm-project/clang -i ${./patches/clang-wrap.patch} patch -p1 -d llvm-project/clang -i ${../../llvm/12/clang/purity.patch} @@ -318,7 +345,7 @@ in stdenv.mkDerivation { hash = "sha256-nkRPWx8gNvYr7mlvEUiOAb1rTrf+skCZjAydJVUHrcI="; }} - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \ --replace 'SysRoot + "/lib' '"${glibc}/lib" "' \ --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' \ @@ -357,7 +384,7 @@ in stdenv.mkDerivation { patchShebangs . - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # NOTE: This interferes with ABI stability on Darwin, which uses the system # libraries in the hardcoded path /usr/lib/swift. fixCmakeFiles . @@ -365,7 +392,7 @@ in stdenv.mkDerivation { ''; # > clang-15-unwrapped: error: unsupported option '-fzero-call-used-regs=used-gpr' for target 'arm64-apple-macosx10.9.0' - hardeningDisable = lib.optional stdenv.isDarwin "zerocallusedregs"; + hardeningDisable = lib.optional stdenv.hostPlatform.isAarch64 "zerocallusedregs"; configurePhase = '' export SWIFT_SOURCE_ROOT="$PWD" @@ -424,7 +451,7 @@ in stdenv.mkDerivation { " buildProject llvm llvm-project/llvm - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Add appleSwiftCore to the search paths. We can't simply add it to # buildInputs, because it is potentially an older stdlib than the one we're # building. We have to remove it again after the main Swift build, or later @@ -450,7 +477,7 @@ in stdenv.mkDerivation { # Fixed in: https://github.com/apple/swift/commit/84083afef1de5931904d5c815d53856cdb3fb232 cmakeFlags=" -GNinja - -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.isDarwin "-WITH-HOSTLIBS"} + -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.hostPlatform.isDarwin "-WITH-HOSTLIBS"} -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=ON -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=ON -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=ON @@ -463,11 +490,11 @@ in stdenv.mkDerivation { -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax -DSWIFT_PATH_TO_STRING_PROCESSING_SOURCE=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents} - -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.isDarwin then "ON" else "OFF"} + -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.hostPlatform.isDarwin then "ON" else "OFF"} " buildProject swift - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Restore search paths to remove appleSwiftCore. export NIX_SWIFTFLAGS_COMPILE="$OLD_NIX_SWIFTFLAGS_COMPILE" export NIX_LDFLAGS="$OLD_NIX_LDFLAGS" @@ -499,18 +526,18 @@ in stdenv.mkDerivation { -DLLDB_ENABLE_LUA=OFF -DLLDB_INCLUDE_TESTS=OFF -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' -DLLDB_USE_SYSTEM_DEBUGSERVER=ON ''} -DLibEdit_INCLUDE_DIRS=${libedit.dev}/include -DLibEdit_LIBRARIES=${libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary} - -DCURSES_INCLUDE_DIRS=${if stdenv.isDarwin then "/var/empty" else ncurses.dev}/include + -DCURSES_INCLUDE_DIRS=${if stdenv.hostPlatform.isDarwin then "/var/empty" else ncurses.dev}/include -DCURSES_LIBRARIES=${ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary} -DPANEL_LIBRARIES=${ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary} "; buildProject lldb llvm-project/lldb - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' # Need to do a standalone build of concurrency for Darwin back deployment. # Based on: utils/swift_build_support/swift_build_support/products/backdeployconcurrency.py cmakeFlags=" @@ -614,7 +641,7 @@ in stdenv.mkDerivation { cd $SWIFT_BUILD_ROOT/swift ninjaInstallPhase - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' cd $SWIFT_BUILD_ROOT/swift-concurrency-backdeploy installTargets=install-back-deployment ninjaInstallPhase @@ -642,20 +669,20 @@ in stdenv.mkDerivation { mkdir $lib/lib/swift/clang cp -P ${clang}/resource-root/* $lib/lib/swift/clang/ - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' # Install required library for ObjC interop. # TODO: Is there no source code for this available? cp -r ${CLTools_Executables}/usr/lib/arc $out/lib/arc ''} ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # This is cheesy, but helps the patchelf hook remove /build from RPATH. cd $SWIFT_BUILD_ROOT/.. mv build buildx ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' # These libraries need to use the system install name. The official SDK # does the same (as opposed to using rpath). Presumably, they are part of # the stable ABI. Not using the system libraries at run-time is known to diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index e55465e952d54..76db695b08c30 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -25,7 +25,7 @@ let # # The following selects the correct Clang version, matching the version # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`. - clang = if pkgs.stdenv.isDarwin + clang = if pkgs.stdenv.hostPlatform.isDarwin then swiftLlvmPackages.clang.override rec { libc = apple_sdk.Libsystem; @@ -68,11 +68,11 @@ let useSwiftDriver = false; }; - Dispatch = if stdenv.isDarwin + Dispatch = if stdenv.hostPlatform.isDarwin then null # part of libsystem else callPackage ./libdispatch { swift = swiftNoSwiftDriver; }; - Foundation = if stdenv.isDarwin + Foundation = if stdenv.hostPlatform.isDarwin then apple_sdk.frameworks.Foundation else callPackage ./foundation { swift = swiftNoSwiftDriver; }; diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix index f0c08a41e43e3..2d1cd6dd04405 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -21,7 +21,7 @@ let # are part of libsystem. Adding its headers to the search path causes strange # mixing and errors. # TODO: Find a better way to prevent this conflict. - ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + ncursesInput = if stdenv.hostPlatform.isDarwin then ncurses.out else ncurses; in stdenv.mkDerivation { pname = "sourcekit-lsp"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { XCTest sqlite ncursesInput - ] ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication ]; configurePhase = generated.configure + '' swiftpmMakeMutable indexstore-db diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix index 2645f07aa4ec8..13595882241bc 100644 --- a/pkgs/development/compilers/swift/swift-docc/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ swift swiftpm ]; buildInputs = [ Foundation XCTest ] - ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication ]; configurePhase = generated.configure; diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix index ca2b88046c86e..03c7898fe1121 100644 --- a/pkgs/development/compilers/swift/swift-driver/default.nix +++ b/pkgs/development/compilers/swift/swift-driver/default.nix @@ -19,7 +19,7 @@ let # are part of libsystem. Adding its headers to the search path causes strange # mixing and errors. # TODO: Find a better way to prevent this conflict. - ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + ncursesInput = if stdenv.hostPlatform.isDarwin then ncurses.out else ncurses; in stdenv.mkDerivation { pname = "swift-driver"; diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index 712bc01777a5e..b8d8d2fe7bba3 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -81,7 +81,7 @@ let # Tools invoked by swiftpm at run-time. runtimeDeps = [ git ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun # These tools are part of cctools, but adding that as a build input puts # an unwrapped linker in PATH, and breaks builds. This small derivation @@ -99,13 +99,13 @@ let mkBootstrapDerivation = attrs: stdenv.mkDerivation (attrs // { nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ cmake ninja swift ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; buildInputs = (attrs.buildInputs or [ ]) ++ [ Foundation ]; postPatch = (attrs.postPatch or "") - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # On Darwin only, Swift uses arm64 as cpu arch. if [ -e cmake/modules/SwiftSupport.cmake ]; then substituteInPlace cmake/modules/SwiftSupport.cmake \ @@ -121,7 +121,7 @@ let ''; postInstall = (attrs.postInstall or "") - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # The install name of libraries is incorrectly set to lib/ (via our # CMake setup hook) instead of lib/swift/. This'd be easily fixed by # fixDarwinDylibNames, but some builds create libraries that reference @@ -149,7 +149,7 @@ let # are part of libsystem. Adding its headers to the search path causes strange # mixing and errors. # TODO: Find a better way to prevent this conflict. - ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + ncursesInput = if stdenv.hostPlatform.isDarwin then ncurses.out else ncurses; # Derivations for bootstrapping dependencies using CMake. # This is based on the `swiftpm/Utilities/bootstrap` script. @@ -168,7 +168,7 @@ let src = generated.sources.swift-system; postInstall = cmakeGlue.SwiftSystem - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The cmake rules apparently only use the Darwin install convention. # Fix up the installation so the module can be found on non-Darwin. mkdir -p $out/${swiftStaticModuleSubdir} @@ -188,7 +188,7 @@ let ''; postInstall = cmakeGlue.SwiftCollections - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The cmake rules apparently only use the Darwin install convention. # Fix up the installation so the module can be found on non-Darwin. mkdir -p $out/${swiftStaticModuleSubdir} @@ -245,7 +245,7 @@ let ]; postInstall = cmakeGlue.ArgumentParser - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' # Fix rpath so ArgumentParserToolInfo can be found. patchelf --add-rpath "$out/lib/swift/${swiftOs}" \ $out/lib/swift/${swiftOs}/libArgumentParser.so @@ -266,7 +266,7 @@ let name = "llbuild"; src = generated.sources.swift-llbuild; - nativeBuildInputs = lib.optional stdenv.isDarwin xcbuild; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin xcbuild; buildInputs = [ ncursesInput sqlite ]; patches = [ @@ -389,7 +389,7 @@ in stdenv.mkDerivation (commonAttrs // { sqlite XCTest ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication ]; diff --git a/pkgs/development/compilers/swift/xctest/default.nix b/pkgs/development/compilers/swift/xctest/default.nix index d50d11706cbd3..f6f4cdacaed11 100644 --- a/pkgs/development/compilers/swift/xctest/default.nix +++ b/pkgs/development/compilers/swift/xctest/default.nix @@ -19,10 +19,10 @@ in stdenv.mkDerivation { outputs = [ "out" ]; nativeBuildInputs = [ cmake ninja swift ] - ++ lib.optional stdenv.isDarwin DarwinTools; # sw_vers + ++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools; # sw_vers buildInputs = [ Foundation ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # On Darwin only, Swift uses arm64 as cpu arch. substituteInPlace cmake/modules/SwiftSupport.cmake \ --replace '"aarch64" PARENT_SCOPE' '"arm64" PARENT_SCOPE' @@ -34,9 +34,9 @@ in stdenv.mkDerivation { export MACOSX_DEPLOYMENT_TARGET=10.12 ''; - cmakeFlags = lib.optional stdenv.isDarwin "-DUSE_FOUNDATION_FRAMEWORK=ON"; + cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DUSE_FOUNDATION_FRAMEWORK=ON"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin normally uses the Xcode version of XCTest. Installing # swift-corelibs-xctest is probably not officially supported, but we have # no alternative. Fix up the installation here. diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index f9e53e197c977..adeca0b733269 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -16,6 +16,7 @@ "aarch64": ("aarch64",), "arm": ("armv6l", "armv7l"), "ppc64le": ("powerpc64le",), + "riscv64": ("riscv64",), } def generate_sources(assets, feature_version, out): diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index 9da96aee8d5aa..29cdf778f5412 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -66,7 +66,7 @@ let xorg.libXrender xorg.libXtst zlib - ] ++ lib.optional stdenv.isAarch32 libffi; + ] ++ lib.optional stdenv.hostPlatform.isAarch32 libffi; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index fe24b9f5199c1..23d7305ea7744 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -302,6 +302,12 @@ "sha256": "aa7fb6bb342319d227a838af5c363bfa1b4a670c209372f9e6585bd79da6220c", "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz", "version": "17.0.11" + }, + "riscv64": { + "build": "7", + "sha256": "d024c100eba4709970716ddcac757ba5e3122a8ff9c6f539ff8bac5b47f51f3a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk18": { @@ -414,6 +420,12 @@ "sha256": "fffa52c22d797b715a962e6c8d11ec7d79b90dd819b5bc51d62137ea4b22a340", "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz", "version": "21.0.3" + }, + "riscv64": { + "build": "7", + "sha256": "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, "openjdk22": { @@ -436,6 +448,12 @@ "sha256": "e59c6bf801cc023a1ea78eceb5e6756277f1564cd0a421ea984efe6cb96cfcf8", "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_linux_hotspot_22.0.1_8.tar.gz", "version": "22.0.1" + }, + "riscv64": { + "build": "9", + "sha256": "830a0d006c2dae95c0855aa70e193dba637831b491ccd67333322dea31bcf389", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.2_9.tar.gz", + "version": "22.0.2" } }, "openjdk8": { @@ -540,6 +558,12 @@ "sha256": "bcb1b7b8ad68c93093f09b591b7cb17161d39891f7d29d33a586f5a328603707", "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz", "version": "17.0.11" + }, + "riscv64": { + "build": "7", + "sha256": "2d1ed42918305a1a0754a6e1e9294c7d4d7fda4bff6dba7bc5682037d860dbc9", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk18": { @@ -652,6 +676,12 @@ "sha256": "f1af100c4afca2035f446967323230150cfe5872b5a664d98c86963e5c066e0d", "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz", "version": "21.0.3" + }, + "riscv64": { + "build": "7", + "sha256": "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, "openjdk22": { @@ -674,6 +704,12 @@ "sha256": "154dbc7975cf765c59bdaa1e693d6c8b009635c9a182d6d6d9f0cfbec5317b4c", "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_linux_hotspot_22.0.1_8.tar.gz", "version": "22.0.1" + }, + "riscv64": { + "build": "9", + "sha256": "81aacc0ae75e65846e6207edf41b8c5927673eba5588eebc5ba8076ca9a6041c", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.2_9.tar.gz", + "version": "22.0.2" } }, "openjdk8": { diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 1d50d6e23ddbe..4193ab53164c5 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -45,8 +45,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ llvmMerged ncurses libffi libxml2 ] ++ lib.optionals enableCUDA [ cuda ] - ++ lib.optional (!stdenv.isDarwin) libpfm - ++ lib.optionals stdenv.isDarwin [ libobjc Cocoa Foundation ]; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Cocoa Foundation ]; cmakeFlags = let resourceDir = "${llvmMerged}/lib/clang/" + ( @@ -100,6 +100,6 @@ in stdenv.mkDerivation rec { # never built on aarch64-darwin since first introduction in nixpkgs # Linux Aarch64 broken above LLVM11 # https://github.com/terralang/terra/issues/597 - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index b36eb44229d18..65eea0a48e465 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { builtins.match "^[0-9]\\.+[0-9]+\\.[0-9]+" version != null; in '' ${ - if stdenv.isDarwin && ! versionIsClean finalAttrs.version + if stdenv.hostPlatform.isDarwin && ! versionIsClean finalAttrs.version then "echo 'not overwriting VERSION since it would upset ld'" else "echo ${finalAttrs.version} > VERSION" } @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "test"; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10142.html - preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' rm tests/tests2/{108,114}* ''; @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ joachifm AndersonTorres ]; platforms = lib.platforms.unix; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) # TODO: more multiple outputs diff --git a/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch b/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch index 4bfefe1aeaa29..db4feeb9af662 100644 --- a/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch +++ b/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch @@ -13,7 +13,7 @@ diff --git a/GNUmakefile b/GNUmakefile # First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name. findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1)) CLANG ?= $(call findLLVMTool,clang) -@@ -816,9 +811,8 @@ endif +@@ -848,9 +843,8 @@ endif wasmtest: $(GO) test ./tests/wasm @@ -24,15 +24,7 @@ diff --git a/GNUmakefile b/GNUmakefile @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS @mkdir -p build/release/tinygo/lib/macos-minimal-sdk @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common -@@ -832,15 +826,11 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN - @mkdir -p build/release/tinygo/lib/wasi-libc/libc-bottom-half/headers - @mkdir -p build/release/tinygo/lib/wasi-libc/libc-top-half/musl/arch - @mkdir -p build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src -- @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0 -- @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus -- @mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4 - @echo copying source files - @cp -p build/tinygo$(EXE) build/release/tinygo/bin +@@ -871,7 +865,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN ifneq ($(USE_SYSTEM_BINARYEN),1) @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin endif @@ -40,24 +32,16 @@ diff --git a/GNUmakefile b/GNUmakefile @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk -@@ -891,16 +881,9 @@ endif - @cp -rp lib/wasi-libc/libc-top-half/musl/src/string build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src +@@ -927,8 +920,7 @@ endif @cp -rp lib/wasi-libc/libc-top-half/musl/include build/release/tinygo/lib/wasi-libc/libc-top-half/musl @cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot + @cp -rp lib/wasi-cli/wit build/release/tinygo/lib/wasi-cli/wit - @cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins - @cp -rp llvm-project/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt-builtins + @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins @cp -rp src build/release/tinygo/src @cp -rp targets build/release/tinygo/targets -- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/compiler-rt compiler-rt -- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0plus -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus/compiler-rt compiler-rt -- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m4 -o build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4/compiler-rt compiler-rt -- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/picolibc picolibc -- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0plus -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus/picolibc picolibc -- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m4 -o build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4/picolibc picolibc - release: - tar -czf build/release.tar.gz -C build/release tinygo -- 2.37.2 diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 38f75608b3c73..386322780cca3 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -28,17 +28,24 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - hash = "sha256-zoXruGoWitx6kietF3HKTYCtUrXp5SOrf2FEGgVPzkQ="; + hash = "sha256-YqjMk7EF/fyOhsMLcG56FGHfOZSdaFhUbiiHk+SXajY="; fetchSubmodules = true; + # The public hydra server on `hydra.nixos.org` is configured with + # `max_output_size` of 3GB. The purpose of this `postFetch` step + # is to stay below that limit and save 4.1GiB and 428MiB in output + # size respectively. These folders are not referenced in tinygo. + postFetch = '' + rm -r $out/lib/cmsis-svd/data/{SiliconLabs,Freescale} + ''; }; - vendorHash = "sha256-rJ8AfJkIpxDkk+9Tf7ORnn7ueJB1kjJUBiLMDV5tias="; + vendorHash = "sha256-cTqrvh0w3KQg3P1lCfAez0kqAMBJHQbqS3sx8uqGvEs="; patches = [ ./0001-GNUmakefile.patch @@ -47,7 +54,7 @@ buildGoModule rec { nativeCheckInputs = [ binaryen ]; nativeBuildInputs = [ makeWrapper lld ]; buildInputs = [ llvm clang.cc ] - ++ lib.optionals stdenv.isDarwin [ xar ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xar ]; doCheck = (stdenv.buildPlatform.canExecute stdenv.hostPlatform); inherit tinygoTests; @@ -105,7 +112,7 @@ buildGoModule rec { # GDB upstream does not support ARM darwin runtimeDeps = [ go clang.cc lld avrdude openocd binaryen ] - ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ gdb ]; + ++ lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [ gdb ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix index 9cf8cb530cdae..513f8a99180fe 100644 --- a/pkgs/development/compilers/typescript/default.nix +++ b/pkgs/development/compilers/typescript/default.nix @@ -2,20 +2,20 @@ buildNpmPackage rec { pname = "typescript"; - version = "5.5.4"; + version = "5.6.2"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-U4lFR2SJQYqJYptVf3/QMD7ufa3r7Zm704gcwFKM/7s="; + hash = "sha256-aomoO/1E7zdhRNTCKqbA7ktor03zjg5HZXPxhH8iris="; }; patches = [ ./disable-dprint-dstBundler.patch ]; - npmDepsHash = "sha256-JYNFAOTN0WvYkr20J6tFM1KSIDTm1LlFw7w1bLkdg6k="; + npmDepsHash = "sha256-I44XhQzUsbf6Q4r2o40l9qBU8FMRZuYhb7dLVvFDyJc="; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/development/compilers/uasm/default.nix index 21d9a2bf5d48e..59332fa41f031 100644 --- a/pkgs/development/compilers/uasm/default.nix +++ b/pkgs/development/compilers/uasm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makefile = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "ClangOSX64.mak" else "gccLinux64.mak"; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index f6d544aef96a4..5a8e57d2131b0 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.25"; + version = "0.5.26"; - src = if stdenv.isDarwin then + src = if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-Tc9XYWCap3N9KX5k6M83L1efwz2cG3bmv5tyY4zuFPQ="; + hash = "sha256-RF2Q5sCxT9F3IGM/8UP6bEe9sOjtpMVYHREuAPOzh8g="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-I1UIkwxw/ePv8dWFT4o/FSaYuBGbvoVURk5sHX7gtL4="; + hash = "sha256-t0rc1f4PfjHRu/tzoW8sJ/6R0KBbYQPiWHqsIaqc+SY="; }; # The tarball is just the prebuilt binary, in the archive root. @@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { dontConfigure = true; nativeBuildInputs = [ makeWrapper ] - ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; - buildInputs = lib.optionals (!stdenv.isDarwin) [ gmp ncurses6 zlib ]; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ gmp ncurses6 zlib ]; installPhase = '' mkdir -p $out/{bin,lib} diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 2621f4bc8050f..f96cce8c53f1b 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-openssl=${openssl.dev}" ]; preConfigure = '' - export PGHEADER="${postgresql}/include/libpq-fe.h"; export MSHEADER="${libmysqlclient}/include/mysql/mysql.h"; export SQHEADER="${sqlite.dev}/include/sqlite3.h"; export ICU_INCLUDES="-I${icu.dev}/include"; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 1b880b61a05a1..96b995d64b6c3 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -50,7 +50,7 @@ let nativeBuildInputs = [ pkg-config flex bison libxslt gobject-introspection - ] ++ lib.optional (stdenv.isDarwin) expat + ] ++ lib.optional (stdenv.hostPlatform.isDarwin) expat ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ vala ] ++ extraNativeBuildInputs; diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index a0acfd263474f..267f473274a57 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -19,7 +19,7 @@ let }; # patch the ptrace reference for darwin - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace v.c \ --replace "#include <sys/ptrace.h>" "${ptraceSubstitution}" '' + '' @@ -56,9 +56,9 @@ stdenv.mkDerivation { buildInputs = [ binaryen - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 xorg.libXau xorg.libXdmcp diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 56899b6acba4f..89973eb524ee3 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -7,7 +7,6 @@ , importlib-metadata , packaging , pycryptodome -, pytest-runner , pythonOlder , recommonmark , setuptools-scm @@ -41,7 +40,8 @@ buildPythonPackage rec { postPatch = '' # pythonRelaxDeps doesn't work substituteInPlace setup.py \ - --replace "setuptools_scm>=7.1.0,<8.0.0" "setuptools_scm>=7.1.0" + --replace-fail "setuptools_scm>=7.1.0,<8.0.0" "setuptools_scm>=7.1.0" \ + --replace-fail '"pytest-runner",' "" ''; nativeBuildInputs = [ @@ -49,7 +49,6 @@ buildPythonPackage rec { # ever since https://github.com/vyperlang/vyper/pull/2816 git - pytest-runner setuptools-scm ]; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index db7d9b05b7fbb..d58f2e9d728db 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { # the linux 32 bit build fails. - broken = (stdenv.isLinux && stdenv.isAarch64) || !stdenv.is64bit; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || !stdenv.hostPlatform.is64bit; homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; description = "ISO-compatible high-performance Prolog compiler"; license = lib.licenses.artistic2; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index a312114e6abd2..43e941824fa73 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -75,13 +75,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.44"; + version = "0.45"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "refs/tags/yosys-${finalAttrs.version}"; - hash = "sha256-aMVWmryMbVlEm1RNj1ENpLHOpuKRQTJMFZCn+WuaR04="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-NF4NQ7mCfARuMsMTJVBbJk39puJ8+D41woYEPgthfUI="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index cd95406c84d8f..ea5582375abd6 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -1,13 +1,112 @@ -{ fetchFromGitHub, lib, stdenv, makeWrapper, unzip, libxml2, gmp, m4, uthash, which, pkg-config }: +{ + fetchFromGitHub, + lib, + stdenv, + unzip, + libxml2, + gmp, + m4, + uthash, + which, + pkg-config, + perl, + perlPackages, + fetchurl, +}: -stdenv.mkDerivation rec { +let + # Perl packages used by this project. + # TODO: put these into global perl-packages.nix once this is submitted. + ObjectTinyRW = perlPackages.buildPerlPackage { + pname = "Object-Tiny-RW"; + version = "1.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SC/SCHWIGON/object-tiny-rw/Object-Tiny-RW-1.07.tar.gz"; + hash = "sha256-NbQIy9d4ZcMnRJJApPBSej+W6e/aJ8rkb5E7rD7GVgs="; + }; + meta = { + description = "A date object with as little code as possible (and rw accessors)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + IteratorSimple = perlPackages.buildPerlPackage { + pname = "Iterator-Simple"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz"; + hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q="; + }; + meta = { + description = "Simple iterator and utilities"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; + + IteratorSimpleLookahead = perlPackages.buildPerlPackage { + pname = "Iterator-Simple-Lookahead"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PS/PSCUST/Iterator-Simple-Lookahead-0.09.tar.gz"; + hash = "sha256-FmPE1xdU8LAXS21+H4DJaQ87qDi4Q4UkLawsUAqseZw="; + }; + propagatedBuildInputs = [ IteratorSimple ] ++ (with perlPackages; [ + ClassAccessor + ]); + meta = { + description = "Simple iterator with lookahead and unget"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; + + AsmPreproc = perlPackages.buildPerlPackage { + pname = "Asm-Preproc"; + version = "1.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PS/PSCUST/Asm-Preproc-1.03.tar.gz"; + hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M="; + }; + propagatedBuildInputs = [ + IteratorSimple + IteratorSimpleLookahead + ] ++ (with perlPackages; [ + TextTemplate + DataDump + FileSlurp + ]); + meta = { + description = "Preprocessor to be called from an assembler"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; + + CPUZ80Assembler = perlPackages.buildPerlPackage { + pname = "CPU-Z80-Assembler"; + version = "2.25"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PS/PSCUST/CPU-Z80-Assembler-2.25.tar.gz"; + hash = "sha256-cJ8Fl2KZw9/bnBDUzFuwwdw9x23OUvcftk78kw7abdU="; + }; + buildInputs = [ AsmPreproc ] ++ (with perlPackages; [ + CaptureTiny + RegexpTrie + PathTiny + ClassAccessor + ]); + meta = { + description = "Functions to assemble a set of Z80 assembly instructions"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; +in +stdenv.mkDerivation (finalAttrs: { pname = "z88dk"; version = "2.3"; src = fetchFromGitHub { owner = "z88dk"; repo = "z88dk"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-CHTORgK6FYIO6n+cvTUX4huY2Ek5FuHrs40QN5NZX44="; fetchSubmodules = true; }; @@ -16,38 +115,79 @@ stdenv.mkDerivation rec { # we dont rely on build.sh : export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite export ZCCCFG=$PWD/lib/config/ + # we don't want to build zsdcc since it required network (svn) # we test in checkPhase substituteInPlace Makefile \ --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\ --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT =' + + # rc2014.lib not created, making corresponding tests fail. Comment out. + substituteInPlace test/suites/make.config \ + --replace 'zcc +rc2014' '#zcc +rc2014' \ + --replace '@$(MACHINE) -pc 0x9000' '#@$(MACHINE) -pc 0x9000' + + # The following tests don't pass. + rm src/z80asm/t/issue_0341.t + rm src/z80asm/t/z80asm_lib.t ''; + # Parallel building is not working yet with the upstream Makefiles. + # Explicitly switch this off for now. + enableParallelBuilding = false; + + doCheck = true; checkPhase = '' - make testsuite + # Need to build libs first, Makefile deps not fully defined + make libs $makeFlags + make testsuite $makeFlags + make -k test $makeFlags ''; - #failed on Issue_1105_function_pointer_calls - doCheck = stdenv.hostPlatform.system != "aarch64-linux"; - - #_FORTIFY_SOURCE requires compiling with optimization (-O) - env.NIX_CFLAGS_COMPILE = "-O"; - short_rev = builtins.substring 0 7 src.rev; + short_rev = builtins.substring 0 7 finalAttrs.src.rev; makeFlags = [ - "git_rev=${short_rev}" - "version=${version}" - "DESTDIR=$(out)" + "git_rev=${finalAttrs.short_rev}" + "version=${finalAttrs.version}" + "PREFIX=$(out)" "git_count=0" ]; - nativeBuildInputs = [ which makeWrapper unzip pkg-config ]; - buildInputs = [ libxml2 m4 uthash gmp ]; + nativeBuildInputs = [ + which + unzip + m4 + perl + pkg-config + + # Local perl packages + AsmPreproc + CPUZ80Assembler + ObjectTinyRW + ] ++ (with perlPackages; [ + CaptureTiny + DataHexDump + ModernPerl + PathTiny + RegexpCommon + TestHexDifferences + TextDiff + RegexpTrie + ]); + + buildInputs = [ + libxml2 + uthash + gmp + ]; preInstall = '' mkdir -p $out/{bin,share} ''; - installTargets = [ "libs" "install" ]; + installTargets = [ + "libs" + "install" + ]; meta = with lib; { homepage = "https://www.z88dk.org"; @@ -56,4 +196,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.siraben ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/compilers/zig/0.10/setup-hook.sh b/pkgs/development/compilers/zig/0.10/setup-hook.sh index 689ebec8a3077..0053c5997da6b 100644 --- a/pkgs/development/compilers/zig/0.10/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.10/setup-hook.sh @@ -1,5 +1,6 @@ -# shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck shell=bash +# shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -10,10 +11,9 @@ function zigSetGlobalCacheDir { function zigBuildPhase { runHook preBuild - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" @@ -24,10 +24,9 @@ function zigBuildPhase { function zigCheckPhase { runHook preCheck - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigCheckFlags "${zigCheckFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigCheckFlags zigCheckFlagsArray echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" @@ -38,11 +37,10 @@ function zigCheckPhase { function zigInstallPhase { runHook preInstall - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - $zigInstallFlags "${zigInstallFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray if [ -z "${dontAddPrefix-}" ]; then # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` @@ -55,6 +53,7 @@ function zigInstallPhase { runHook postInstall } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then diff --git a/pkgs/development/compilers/zig/0.11/setup-hook.sh b/pkgs/development/compilers/zig/0.11/setup-hook.sh index 689ebec8a3077..0053c5997da6b 100644 --- a/pkgs/development/compilers/zig/0.11/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.11/setup-hook.sh @@ -1,5 +1,6 @@ -# shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck shell=bash +# shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -10,10 +11,9 @@ function zigSetGlobalCacheDir { function zigBuildPhase { runHook preBuild - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" @@ -24,10 +24,9 @@ function zigBuildPhase { function zigCheckPhase { runHook preCheck - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigCheckFlags "${zigCheckFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigCheckFlags zigCheckFlagsArray echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" @@ -38,11 +37,10 @@ function zigCheckPhase { function zigInstallPhase { runHook preInstall - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - $zigInstallFlags "${zigInstallFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray if [ -z "${dontAddPrefix-}" ]; then # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` @@ -55,6 +53,7 @@ function zigInstallPhase { runHook postInstall } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then diff --git a/pkgs/development/compilers/zig/0.12/default.nix b/pkgs/development/compilers/zig/0.12/default.nix index 1a730d4c0ce78..f359140df234b 100644 --- a/pkgs/development/compilers/zig/0.12/default.nix +++ b/pkgs/development/compilers/zig/0.12/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the # OS version. This causes the build to fail during stage 3 with # OSVersionDetectionFail when the sandbox is enabled. - __impureHostDeps = lib.optionals stdenv.isDarwin [ + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/CoreServices/.SystemVersionPlatform.plist" "/System/Library/CoreServices/SystemVersion.plist" ]; diff --git a/pkgs/development/compilers/zig/0.12/setup-hook.sh b/pkgs/development/compilers/zig/0.12/setup-hook.sh index 689ebec8a3077..0053c5997da6b 100644 --- a/pkgs/development/compilers/zig/0.12/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.12/setup-hook.sh @@ -1,5 +1,6 @@ -# shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck shell=bash +# shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -10,10 +11,9 @@ function zigSetGlobalCacheDir { function zigBuildPhase { runHook preBuild - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" @@ -24,10 +24,9 @@ function zigBuildPhase { function zigCheckPhase { runHook preCheck - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigCheckFlags "${zigCheckFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigCheckFlags zigCheckFlagsArray echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" @@ -38,11 +37,10 @@ function zigCheckPhase { function zigInstallPhase { runHook preInstall - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - $zigInstallFlags "${zigInstallFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray if [ -z "${dontAddPrefix-}" ]; then # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` @@ -55,6 +53,7 @@ function zigInstallPhase { runHook postInstall } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then diff --git a/pkgs/development/compilers/zig/0.13/default.nix b/pkgs/development/compilers/zig/0.13/default.nix index 43093c822f027..8ec68f20260f3 100644 --- a/pkgs/development/compilers/zig/0.13/default.nix +++ b/pkgs/development/compilers/zig/0.13/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the # OS version. This causes the build to fail during stage 3 with # OSVersionDetectionFail when the sandbox is enabled. - __impureHostDeps = lib.optionals stdenv.isDarwin [ + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/CoreServices/.SystemVersionPlatform.plist" "/System/Library/CoreServices/SystemVersion.plist" ]; diff --git a/pkgs/development/compilers/zig/0.13/setup-hook.sh b/pkgs/development/compilers/zig/0.13/setup-hook.sh index 689ebec8a3077..0053c5997da6b 100644 --- a/pkgs/development/compilers/zig/0.13/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.13/setup-hook.sh @@ -1,5 +1,6 @@ -# shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck shell=bash +# shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -10,10 +11,9 @@ function zigSetGlobalCacheDir { function zigBuildPhase { runHook preBuild - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" @@ -24,10 +24,9 @@ function zigBuildPhase { function zigCheckPhase { runHook preCheck - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigCheckFlags "${zigCheckFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigCheckFlags zigCheckFlagsArray echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" @@ -38,11 +37,10 @@ function zigCheckPhase { function zigInstallPhase { runHook preInstall - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - $zigInstallFlags "${zigInstallFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray if [ -z "${dontAddPrefix-}" ]; then # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` @@ -55,6 +53,7 @@ function zigInstallPhase { runHook postInstall } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then diff --git a/pkgs/development/compilers/zig/0.9/setup-hook.sh b/pkgs/development/compilers/zig/0.9/setup-hook.sh index 689ebec8a3077..0053c5997da6b 100644 --- a/pkgs/development/compilers/zig/0.9/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.9/setup-hook.sh @@ -1,5 +1,6 @@ -# shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck shell=bash +# shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -10,10 +11,9 @@ function zigSetGlobalCacheDir { function zigBuildPhase { runHook preBuild - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" @@ -24,10 +24,9 @@ function zigBuildPhase { function zigCheckPhase { runHook preCheck - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigCheckFlags "${zigCheckFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigCheckFlags zigCheckFlagsArray echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" @@ -38,11 +37,10 @@ function zigCheckPhase { function zigInstallPhase { runHook preInstall - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - $zigInstallFlags "${zigInstallFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray if [ -z "${dontAddPrefix-}" ]; then # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` @@ -55,6 +53,7 @@ function zigInstallPhase { runHook postInstall } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index cde1a61e35833..27c193c0567df 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the # OS version. This causes the build to fail during stage 3 with # OSVersionDetectionFail when the sandbox is enabled. - __impureHostDeps = lib.optionals stdenv.isDarwin [ + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/CoreServices/.SystemVersionPlatform.plist" "/System/Library/CoreServices/SystemVersion.plist" ]; diff --git a/pkgs/development/compilers/zig/setup-hook.sh b/pkgs/development/compilers/zig/setup-hook.sh index 689ebec8a3077..0053c5997da6b 100644 --- a/pkgs/development/compilers/zig/setup-hook.sh +++ b/pkgs/development/compilers/zig/setup-hook.sh @@ -1,5 +1,6 @@ -# shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck shell=bash +# shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -10,10 +11,9 @@ function zigSetGlobalCacheDir { function zigBuildPhase { runHook preBuild - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" @@ -24,10 +24,9 @@ function zigBuildPhase { function zigCheckPhase { runHook preCheck - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigCheckFlags "${zigCheckFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigCheckFlags zigCheckFlagsArray echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" @@ -38,11 +37,10 @@ function zigCheckPhase { function zigInstallPhase { runHook preInstall - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - $zigInstallFlags "${zigInstallFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray if [ -z "${dontAddPrefix-}" ]; then # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` @@ -55,6 +53,7 @@ function zigInstallPhase { runHook postInstall } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix index c9056236ea6ad..f1d0f43325f4e 100644 --- a/pkgs/development/compilers/zulu/common.nix +++ b/pkgs/development/compilers/zulu/common.nix @@ -16,7 +16,7 @@ # runtime dependencies , cups # runtime dependencies for GTK+ Look and Feel -, gtkSupport ? stdenv.isLinux +, gtkSupport ? stdenv.hostPlatform.isLinux , cairo , glib , gtk2 @@ -48,7 +48,7 @@ let gtk3 ] ++ lib.optionals (gtkSupport && lib.versionOlder dist.jdkVersion "17") [ gtk2 - ] ++ lib.optionals (stdenv.isLinux && enableJavaFX) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && enableJavaFX) [ ffmpeg.lib ]; @@ -75,12 +75,12 @@ let nativeBuildInputs = [ unzip - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook makeWrapper ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype @@ -92,9 +92,9 @@ let xorg.libXtst xorg.libXxf86vm zlib - ] ++ lib.optionals (stdenv.isLinux && enableJavaFX) runtimeDependencies; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && enableJavaFX) runtimeDependencies; - autoPatchelfIgnoreMissingDeps = if (stdenv.isLinux && enableJavaFX) then [ + autoPatchelfIgnoreMissingDeps = if (stdenv.hostPlatform.isLinux && enableJavaFX) then [ "libavcodec*.so.*" "libavformat*.so.*" ] else null; @@ -126,7 +126,7 @@ let cat <<EOF >> $out/nix-support/setup-hook if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # We cannot use -exec since wrapProgram is a function but not a command. # # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it @@ -138,14 +138,14 @@ let done '' # FIXME: move all of the above to installPhase. - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' find "$out" -name libfontmanager.so -exec \ patchelf --add-needed libfontconfig.so {} \; ''; # fixupPhase is moving the man to share/man which breaks it because it's a # relative symlink. - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man ''; diff --git a/pkgs/development/coq-modules/ElmExtraction/default.nix b/pkgs/development/coq-modules/ElmExtraction/default.nix new file mode 100644 index 0000000000000..0a7a22c812a2a --- /dev/null +++ b/pkgs/development/coq-modules/ElmExtraction/default.nix @@ -0,0 +1,52 @@ +{ + lib, + mkCoqDerivation, + which, + coq, + metacoq, + version ? null, +}: + +with lib; +mkCoqDerivation { + pname = "ElmExtraction"; + repo = "coq-elm-extraction"; + owner = "AU-COBRA"; + domain = "github.com"; + + inherit version; + defaultVersion = + with versions; + switch + [ + coq.coq-version + metacoq.version + ] + [ + { + cases = [ + (range "8.17" "8.20") + (range "1.3.1" "1.3.2") + ]; + out = "0.1.0"; + } + ] + null; + + release."0.1.0".sha256 = "EWjubBHsxAl2HuRAfJI3B9qzP2mj89eh0CUc8y7/7Ds="; + + releaseRev = v: "v${v}"; + + propagatedBuildInputs = [ + coq.ocamlPackages.findlib + metacoq + ]; + + postPatch = ''patchShebangs ./tests/process-extraction-examples.sh''; + + meta = { + description = "A framework for extracting Coq programs to Elm"; + maintainers = with maintainers; [ _4ever2 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index 6bc8ad9bb1804..8652520b4a404 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation { owner = "HoTT"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.19"; out = coq.coq-version; } + { case = range "8.14" "8.20"; out = coq.coq-version; } ] null; releaseRev = v: "V${v}"; release."8.14".sha256 = "sha256-7kXk2pmYsTNodHA+Qts3BoMsewvzmCbYvxw9Sgwyvq0="; @@ -15,6 +15,7 @@ mkCoqDerivation { release."8.17".sha256 = "sha256-GjTUpzL9UzJm4C2ilCaYEufLG3hcj7rJPc5Op+OMal8="; release."8.18".sha256 = "sha256-URoUoQOsG0432wg9i6pTRomWQZ+ewutq2+V29TBrVzc="; release."8.19".sha256 = "sha256-igG3mhR6uPXV+SCtPH9PBw/eAtTFFry6HPT5ypWj3tQ="; + release."8.20".sha256 = "sha256-XHAvomi0of11j4x5gpTgD5Mw53eF1FpnCyBvdbV3g6I="; # versions of HoTT for Coq 8.17 and onwards will use dune # opam-name = if lib.versions.isLe "8.17" coq.coq-version then "coq-hott" else null; diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index dc768e2db460c..693b1b260c1e0 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -5,13 +5,15 @@ mkCoqDerivation rec { owner = "DeepSpec"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.13" "8.20"; out = "5.1.2"; } + { case = range "8.13" "8.20"; out = "5.2.0"; } { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; + release."5.2.0".sha256 = "sha256-rKLz7ekZf/9xcQefBRsAdULmk81olzQ1W28y61vCDsY="; release."5.1.2".sha256 = "sha256-uKJIjNXGWl0YS0WH52Rnr9Jz98Eo2k0X0qWB9hUYJMk="; release."5.1.1".sha256 = "sha256-VlmPNwaGkdWrH7Z6DGXRosGtjuuQ+FBiGcadN2Hg5pY="; release."5.1.0".sha256 = "sha256-ny7Mi1KgWADiFznkNJiRgD7Djc5SUclNgKOmWRxK+eo="; release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; + release."3.2.0".sha256 = "sha256-10ckCAqSQ0I3CZKlSllI1obOgWVxDagTd7eyhrl1xpE="; releaseRev = v: "${v}"; propagatedBuildInputs = [ coq-ext-lib paco ]; meta = { diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 451353a341423..d9a0182c26592 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -6,7 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev" owner = "QuickChick"; inherit version; defaultVersion = lib.switch [ coq.coq-version ssreflect.version ] [ - { cases = [ (lib.versions.range "8.15" "8.19") lib.pred.true ]; out = "2.0.2"; } + { cases = [ (lib.versions.range "8.15" "8.20") lib.pred.true ]; out = "2.0.4"; } { cases = [ (lib.versions.range "8.13" "8.17") lib.pred.true ]; out = "1.6.5"; } { cases = [ "8.13" lib.pred.true ]; out = "1.5.0"; } { cases = [ "8.12" lib.pred.true ]; out = "1.4.0"; } @@ -18,6 +18,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev" { cases = [ "8.6" lib.pred.true ]; out = "20171102"; } { cases = [ "8.5" lib.pred.true ]; out = "20170512"; } ] null; + release."2.0.4".sha256 = "sha256-WD8B+n8gyGctHMO+M8201Ca3Uw8zCWYsOatSNGCf0/s="; release."2.0.2".sha256 = "sha256-xxKkwDRjB8nUiXNhein1Ppn0DP5FZ13J90xUPAnQBbs="; release."2.0.1".sha256 = "sha256-gJc+9Or6tbqE00920Il4pnEvokRoiADX6CxP/Q0QZaY="; release."1.6.5".sha256 = "sha256-rcFyRDH8UbB9KVk10P5qjtPkWs04p78VNHkCq4mXr3U="; diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index 6f1f89ee62438..7be4725255129 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -3,15 +3,17 @@ mkCoqDerivation { pname = "autosubst"; - release."1.7".rev = "v1.7"; + releaseRev = v: "v${v}"; + release."1.7".sha256 = "sha256-qoyteQ5W2Noxf12uACOVeHhPLvgmTzrvEo6Ts+FKTGI="; - release."1.8".rev = "v1.8"; release."1.8".sha256 = "sha256-n0lD8D+tjqkDDjFiE4CggxczOPS5TkEnxpB3zEwWZ2I="; + release."1.9".sha256 = "sha256-XiLZjMc+1iwRGOstfLm/WQRF6FTdX6oJr5urn3wmLlA="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.13"; out = "1.7"; } + { case = range "8.14" "8.20"; out = "1.9"; } { case = range "8.14" "8.18"; out = "1.8"; } + { case = range "8.10" "8.13"; out = "1.7"; } ] null; propagatedBuildInputs = [ mathcomp-ssreflect ]; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 28a08f0039f70..a8edc6931a3de 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -29,7 +29,7 @@ compcert = mkCoqDerivation { releaseRev = v: "v${v}"; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.19"; out = "3.14"; } + { case = range "8.14" "8.20"; out = "3.14"; } { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } { case = range "8.8" "8.11"; out = "3.8"; } @@ -201,13 +201,18 @@ patched_compcert = compcert.overrideAttrs (o: }) ]; } - { cases = [ (isEq "8.19") (isEq "3.14") ]; + { cases = [ (range "8.19" "8.20") (isEq "3.14") ]; out = [ # Support for Coq 8.19.2 (fetchpatch { url = "https://github.com/AbsInt/CompCert/commit/8fcfb7d2a6e9ba44003ccab0dfcc894982779af1.patch"; hash = "sha256-m/kcnDBBPWFriipuGvKZUqLQU8/W1uqw8j4qfCwnTZk="; }) + # Support for Coq 8.20.0 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/20a5b48758bf8ac18e4c420df67017b371efc237.patch"; + hash = "sha256-TJ87CvLiAv1absGnPsTXsD/HQwKgS82loUTcosulyso="; + }) ]; } ] []; diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix index 3224e1c337aaa..ee33c1a148b5a 100644 --- a/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/pkgs/development/coq-modules/coq-lsp/default.nix @@ -9,15 +9,17 @@ release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo="; release."0.1.9+8.17".sha256 = "sha256-BCsVRKSE9txeKgDfTsu7hQ6MebC+dX2AAqDF9iL7bYE="; - release."0.1.9+8.18".sha256 = "sha256-elAXvkyqw/R/EziGn+QdPn42t5rqTVVW08BXGP3HimY="; - release."0.1.9+8.19".sha256 = "sha256-0bk0o25aYkrRf5zaWZnNJqqoBZ6u8nSV9QDIWCeFEco="; + release."0.2.0+8.18".sha256 = "sha256-OByBB1CLmj2N0AEieBXLVvP6OLGqi0HXra2jE9k3hXU="; + release."0.2.0+8.19".sha256 = "sha256-G/UurWHxR2VzjClZCDHYcz7wAQAaYZt+DsADSXMybdk="; + release."0.2.0+8.20".sha256 = "sha256-+KRiYK+YCHC4R6/yDenRI8SqZiZ29X24xlDzegbPfrw="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "0.1.8+8.16"; } { case = isEq "8.17"; out = "0.1.9+8.17"; } - { case = isEq "8.18"; out = "0.1.9+8.18"; } - { case = isEq "8.19"; out = "0.1.9+8.19"; } + { case = isEq "8.18"; out = "0.2.0+8.18"; } + { case = isEq "8.19"; out = "0.2.0+8.19"; } + { case = isEq "8.20"; out = "0.2.0+8.20"; } ] null; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix index fcc0e2a81dd49..bf76a81e5d719 100644 --- a/pkgs/development/coq-modules/coqide/default.nix +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -43,14 +43,16 @@ mkCoqDerivation rec { runHook postInstall ''; - desktopItems = makeDesktopItem { - name = "coqide"; - exec = "coqide"; - icon = "coq"; - desktopName = "CoqIDE"; - comment = "Graphical interface for the Coq proof assistant"; - categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; - }; + desktopItems = [ + (makeDesktopItem { + name = "coqide"; + exec = "coqide"; + icon = "coq"; + desktopName = "CoqIDE"; + comment = "Graphical interface for the Coq proof assistant"; + categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; + }) + ]; meta = with lib; { homepage = "https://coq.inria.fr"; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 0fbf19d24a456..10b27aa5ca633 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation { owner = "gappa"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = if lib.versions.range "8.8" "8.19" coq.coq-version then "1.5.5" else null; + defaultVersion = if lib.versions.range "8.8" "8.20" coq.coq-version then "1.5.5" else null; release."1.5.5".sha256 = "sha256-qxi2Kg3N3o6+ncq7aPNEg98dBmQC5WCa86zROPJSDdo="; release."1.5.4".sha256 = "sha256-9PlkXqCu4rbFD7qnMF1GSpPCVmwJ3r593RfAvkJbbdA="; release."1.5.3".sha256 = "sha256-SuMopX5sm4jh2uBuE7zr6vhWhHYZYnab+epjqYJqg+s="; diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index aee4d65b7cfa6..944ce621a08d6 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -29,8 +29,6 @@ let hb = mkCoqDerivation { mlPlugin = true; - extraInstallFlags = [ "VFILES=structures.v" ]; - meta = with lib; { description = "High level commands to declare a hierarchy based on packed classes"; maintainers = with maintainers; [ cohencyril siraben ]; @@ -41,6 +39,8 @@ hb.overrideAttrs (o: lib.optionalAttrs (lib.versions.isGe "1.2.0" o.version || o.version == "dev") { buildPhase = "make build"; } // - lib.optionalAttrs (lib.versions.isGe "1.1.0" o.version || o.version == "dev") - { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; } + (if lib.versions.isGe "1.1.0" o.version || o.version == "dev" then + { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; } + else + { installFlags = [ "VFILES=structures.v" ] ++ o.installFlags; }) ) diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index 63832a58caba5..fd7e4fa31859d 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -5,6 +5,7 @@ owner = "fbesson"; domain = "gitlab.inria.fr"; + release."8.20.0".sha256 = "sha256-LYKGbI3O6yw6CiTJNUGL11PT4q4o+gJK1kQgKQL0/Hk="; release."8.19.0".sha256 = "sha256-xKWCF4dYvvlJUVGCZcR2RLCG55vlGzu2GN30MeRvVD4="; release."8.18.0".sha256 = "sha256-4mDDnKTeYrf27uRMkydQxO7j2tfgTFXOREW474d40eo="; release."8.17.0".sha256 = "sha256-fgdnKchNT1Hyrq14gU8KWYnlSfg3qlsSw5A4+RoA26w="; @@ -14,6 +15,7 @@ release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = isEq "8.20"; out = "8.20.0"; } { case = isEq "8.19"; out = "8.19.0"; } { case = isEq "8.18"; out = "8.18.0"; } { case = isEq "8.17"; out = "8.17.0"; } diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index ef1a2131af2c6..c79261aa174fb 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -16,6 +16,7 @@ let { case = "8.17"; out = "1.3.1-8.17"; } { case = "8.18"; out = "1.3.1-8.18"; } { case = "8.19"; out = "1.3.2-8.19"; } + { case = "8.20"; out = "1.3.2-8.20"; } ] null; release = { "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs="; @@ -33,6 +34,7 @@ let "1.3.1-8.18".sha256 = "sha256-L6Ym4Auwqaxv5tRmJLSVC812dxCqdUU5aN8+t5HVYzY="; "1.3.1-8.19".sha256 = "sha256-fZED/Uel1jt5XF83dR6HfyhSkfBdLkET8C/ArDgsm64="; "1.3.2-8.19".sha256 = "sha256-e5Pm1AhaQrO6JoZylSXYWmeXY033QflQuCBZhxGH8MA="; + "1.3.2-8.20".sha256 = "sha256-4J7Ly4Fc2E/I6YqvzTLntVVls5t94OUOjVMKJyyJdw8="; }; releaseRev = v: "v${v}"; diff --git a/pkgs/development/coq-modules/mtac2/default.nix b/pkgs/development/coq-modules/mtac2/default.nix new file mode 100644 index 0000000000000..8c2a96b4d7815 --- /dev/null +++ b/pkgs/development/coq-modules/mtac2/default.nix @@ -0,0 +1,22 @@ +{ lib, mkCoqDerivation, coq, unicoq, version ? null }: + +mkCoqDerivation { + pname = "Mtac2"; + owner = "Mtac2"; + inherit version; + defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.19" "8.19"; out = "1.4-coq${coq.coq-version}"; } + ] null; + release."1.4-coq8.19".sha256 = "sha256-G9eK0eLyECdT20/yf8yyz7M8Xq2WnHHaHpxVGP0yTtU="; + releaseRev = v: "v${v}"; + mlPlugin = true; + propagatedBuildInputs = [ unicoq ]; + meta = with lib; { + description = "Typed tactic language for Coq"; + license = licenses.mit; + }; + preBuild = '' + coq_makefile -f _CoqProject -o Makefile + patchShebangs tests/sf-5/configure.sh + ''; +} diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index d8077640d6e10..126fcbf1ae7a0 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -2,6 +2,7 @@ let release = { + "8.20.0+0.20.0".sha256 = "sha256-Mll3m7CVfh52yA5zACDzMZk8lwhOONMMliqQ2l/ObKI="; "8.19.0+0.19.3".sha256 = "sha256-QWRXBTcjtAGskZBeLIuX7WDE95KfH6SxV8MJSMx8B2Q="; "8.18.0+0.18.3".sha256 = "sha256-3JGZCyn62LYJVpfXiwnSMxvdA2vQNTL7li2ZBPcjF0M="; "8.17.0+0.17.3".sha256 = "sha256-XolzpJd8zs4LLyJO4eWvCiAJ0HJSGBJTGVSBClQRGnw="; @@ -17,10 +18,12 @@ in (mkCoqDerivation { pname = "serapi"; + owner = "ejgallego"; repo = "coq-serapi"; inherit version release; defaultVersion = lib.switch coq.version [ + { case = lib.versions.isEq "8.20"; out = "8.20.0+0.20.0"; } { case = lib.versions.isEq "8.19"; out = "8.19.0+0.19.3"; } { case = lib.versions.isEq "8.18"; out = "8.18.0+0.18.3"; } { case = lib.versions.isEq "8.17"; out = "8.17.0+0.17.3"; } diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index a5418ce08dc31..e3fa7036a8668 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -6,9 +6,11 @@ repo = "coq-simple-io"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.17" "8.20"; out = "1.10.0"; } { case = range "8.11" "8.19"; out = "1.8.0"; } { case = range "8.7" "8.13"; out = "1.3.0"; } ] null; + release."1.10.0".sha256 = "sha256-67cBhLvRMWLWBL7NXK1zZTQC4PtSKu9qtesU4SqKkOw="; release."1.8.0".sha256 = "sha256-3ADNeXrBIpYRlfUW+LkLHUWV1w1HFrVc/TZISMuwvRY="; release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci"; release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; @@ -20,9 +22,7 @@ doCheck = true; checkTarget = "test"; - useDuneifVersion = v: - (lib.versionAtLeast v "1.8.0" || v == "dev") - && (lib.versionAtLeast coq.version "8.20" || coq.version == "dev"); + useDuneifVersion = v: (lib.versionAtLeast v "1.10.0" || v == "dev"); passthru.tests.HelloWorld = callPackage ./test.nix {}; diff --git a/pkgs/development/coq-modules/ssprove/default.nix b/pkgs/development/coq-modules/ssprove/default.nix index 714872170c3b9..5b762ec36e8cb 100644 --- a/pkgs/development/coq-modules/ssprove/default.nix +++ b/pkgs/development/coq-modules/ssprove/default.nix @@ -12,7 +12,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp-ssreflect.version] [ - { cases = [(range "8.18" "8.19") (range "2.1.0" "2.2.0")]; out = "0.2.0"; } + { cases = [(range "8.18" "8.19") (range "2.1.0" "2.2.0")]; out = "0.2.1"; } # This is the original dependency: # { cases = ["8.17" "1.18.0"]; out = "0.1.0"; } # But it is not loadable. The math-comp nixpkgs configuration @@ -25,6 +25,7 @@ releaseRev = v: "v${v}"; + release."0.2.1".sha256 = "sha256-X00q5QFxdcGWeNqOV/PLTOqQyyfqFEinbGUTO7q8bC4="; release."0.2.0".sha256 = "sha256-GDkWH0LUsW165vAUoYC5of9ndr0MbfBtmrPhsJVXi3o="; release."0.1.0".sha256 = "sha256-Yj+k+mBsudi3d6bRVlZLyM4UqQnzAX5tHvxtKoIuNTE="; diff --git a/pkgs/development/coq-modules/unicoq/default.nix b/pkgs/development/coq-modules/unicoq/default.nix new file mode 100644 index 0000000000000..c3167e4a9d7d4 --- /dev/null +++ b/pkgs/development/coq-modules/unicoq/default.nix @@ -0,0 +1,20 @@ +{ lib, mkCoqDerivation, coq, version ? null }: + +mkCoqDerivation { + pname = "unicoq"; + owner = "unicoq"; + inherit version; + defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.19" "8.19"; out = "1.6-${coq.coq-version}"; } + ] null; + release."1.6-8.19".sha256 = "sha256-fDk60B8AzJwiemxHGgWjNu6PTu6NcJoI9uK7Ww2AT14="; + releaseRev = v: "v${v}"; + mlPlugin = true; + meta = with lib; { + description = "An enhanced unification algorithm for Coq"; + license = licenses.mit; + }; + preBuild = '' + coq_makefile -f _CoqProject -o Makefile + ''; +} diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index b9cdb622d9ca4..35bccb08c0156 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -3,7 +3,7 @@ let ocamlPackages = coq.ocamlPackages; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.18" "8.20"; out = "2.1.4"; } + { case = range "8.18" "8.20"; out = "2.1.7"; } { case = range "8.18" "8.19"; out = "2.1.2"; } { case = isEq "8.18"; out = "2.0.3+coq8.18"; } ] null; @@ -15,6 +15,8 @@ let ocamlPackages = coq.ocamlPackages; release."2.1.2".sha256 = "sha256-GloY68fLmIv3oiEGNWwmgKv1CMAReBuXzMTUsKOs328="; release."2.1.4".rev = "v2.1.4"; release."2.1.4".sha256 = "sha256-Vwve1sCg5OsGmhDLlOyGCwP6A8g618IzD79vLPw/JtQ="; + release."2.1.7".rev = "v2.1.7"; + release."2.1.7".sha256 = "sha256-HsLv2ziPIUK6Q5/xz8ZvaGWggUCK1AKv47U5M7SCcKU="; inherit location; }); fetched = fetch (if version != null then version else defaultVersion); in diff --git a/pkgs/development/cuda-modules/modules/README.md b/pkgs/development/cuda-modules/modules/README.md index 7db8435c9dc8c..ab56463eea595 100644 --- a/pkgs/development/cuda-modules/modules/README.md +++ b/pkgs/development/cuda-modules/modules/README.md @@ -25,11 +25,11 @@ aliases the generic module for manifests. Alternatively, additional fields or values may need to be configured to account for the particulars of a package. For example, while the release expressions for -[CUDNN](./cudnn/releases.nix) and [TensorRT](./tensorrt/releases.nix) are very +[CUDNN](../cudnn/releases.nix) and [TensorRT](../tensorrt/releases.nix) are very close, they differ slightly in the fields they have. The [module for -CUDNN](./modules/cudnn/default.nix) is able to use the generic module for +CUDNN](./cudnn/default.nix) is able to use the generic module for release expressions, while the [module for -TensorRT](./modules/tensorrt/default.nix) must add additional fields to the +TensorRT](./tensorrt/default.nix) must add additional fields to the generic module. ### `manifests` diff --git a/pkgs/development/cuda-modules/tensorrt/fixup.nix b/pkgs/development/cuda-modules/tensorrt/fixup.nix index 42359aedac118..aab6d8f320796 100644 --- a/pkgs/development/cuda-modules/tensorrt/fixup.nix +++ b/pkgs/development/cuda-modules/tensorrt/fixup.nix @@ -65,7 +65,7 @@ finalAttrs: prevAttrs: { # We need to look inside the extracted output to get the files we need. sourceRoot = "TensorRT-${finalAttrs.version}"; - buildInputs = prevAttrs.buildInputs ++ [ finalAttrs.passthru.cudnn.lib ]; + buildInputs = prevAttrs.buildInputs ++ [ (finalAttrs.passthru.cudnn.lib or null) ]; preInstall = (prevAttrs.preInstall or "") @@ -99,9 +99,8 @@ finalAttrs: prevAttrs: { cudnn = let desiredName = mkVersionedPackageName "cudnn" package.cudnnVersion; - desiredIsAvailable = final ? desiredName; in - if package.cudnnVersion == null || !desiredIsAvailable then final.cudnn else final.${desiredName}; + if package.cudnnVersion == null || (final ? desiredName) then final.cudnn else final.${desiredName}; }; meta = prevAttrs.meta // { diff --git a/pkgs/development/cuda-modules/tensorrt/releases.nix b/pkgs/development/cuda-modules/tensorrt/releases.nix index a0c29e345a27c..976f8fab115b8 100644 --- a/pkgs/development/cuda-modules/tensorrt/releases.nix +++ b/pkgs/development/cuda-modules/tensorrt/releases.nix @@ -125,6 +125,22 @@ filename = "TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-12.0.tar.gz"; hash = "sha256-D4FXpfxTKZQ7M4uJNZE3M1CvqQyoEjnNrddYDNHrolQ="; } + { + version = "10.3.0.26"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + cudnnVersion = "8.9"; + filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-11.8.tar.gz"; + hash = "sha256-1O9TwlUP0eLqTozMs53EefmjriiaHjxb4A4GIuN9jvc="; + } + { + version = "10.3.0.26"; + minCudaVersion = "12.0"; + maxCudaVersion = "12.5"; + cudnnVersion = "8.9"; + filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-12.5.tar.gz"; + hash = "sha256-rf8c1avl2HATgGFyNR5Y/QJOW/D8YdSe9LhM047ZkIE="; + } ]; }; } diff --git a/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix b/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix new file mode 100644 index 0000000000000..442bfb8a2dd0e --- /dev/null +++ b/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix @@ -0,0 +1,81 @@ +{ + cudaPackages, + lib, + writeGpuTestPython, + # Configuration flags + openCVFirst, + useOpenCVDefaultCuda, + useTorchDefaultCuda, +}: +let + inherit (lib.strings) optionalString; + + openCVBlock = '' + + import cv2 + print("OpenCV version:", cv2.__version__) + + # Ensure OpenCV can access the GPU. + assert cv2.cuda.getCudaEnabledDeviceCount() > 0, "No CUDA devices found for OpenCV" + print("OpenCV CUDA device:", cv2.cuda.printCudaDeviceInfo(cv2.cuda.getDevice())) + + # Ensure OpenCV can access the GPU. + print(cv2.getBuildInformation()) + + a = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1) + b = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1) + c = int(cv2.cuda.sum(cv2.cuda.add(a, b))[0]) # OpenCV returns a Scalar float object. + + assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} OpenCV, got {c}" + + ''; + + torchBlock = '' + + import torch + print("Torch version:", torch.__version__) + + # Set up the GPU. + torch.cuda.init() + # Ensure the GPU is available. + assert torch.cuda.is_available(), "CUDA is not available to Torch" + print("Torch CUDA device:", torch.cuda.get_device_properties(torch.cuda.current_device())) + + a = torch.ones(256, 256, dtype=torch.int32).cuda() + b = torch.ones(256, 256, dtype=torch.int32).cuda() + c = (a + b).sum().item() + assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} for Torch, got {c}" + + ''; + + content = if openCVFirst then openCVBlock + torchBlock else torchBlock + openCVBlock; + + torchName = "torch" + optionalString useTorchDefaultCuda "-with-default-cuda"; + openCVName = "opencv4" + optionalString useOpenCVDefaultCuda "-with-default-cuda"; +in +# TODO: Ensure the expected CUDA libraries are loaded. +# TODO: Ensure GPU access works as expected. +writeGpuTestPython { + name = if openCVFirst then "${openCVName}-then-${torchName}" else "${torchName}-then-${openCVName}"; + libraries = + # NOTE: These are purposefully in this order. + pythonPackages: + let + effectiveOpenCV = pythonPackages.opencv4.override (prevAttrs: { + cudaPackages = if useOpenCVDefaultCuda then prevAttrs.cudaPackages else cudaPackages; + }); + effectiveTorch = pythonPackages.torchWithCuda.override (prevAttrs: { + cudaPackages = if useTorchDefaultCuda then prevAttrs.cudaPackages else cudaPackages; + }); + in + if openCVFirst then + [ + effectiveOpenCV + effectiveTorch + ] + else + [ + effectiveTorch + effectiveOpenCV + ]; +} content diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/development/embedded/arduino/arduino-language-server/default.nix index 6c0a2885b433d..d1be96454eecd 100644 --- a/pkgs/development/embedded/arduino/arduino-language-server/default.nix +++ b/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { "-w" "-X github.com/arduino/arduino-language-server/version.versionString=${version}" "-X github.com/arduino/arduino-language-server/version.commit=unknown" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" ]; diff --git a/pkgs/development/embedded/blisp/default.nix b/pkgs/development/embedded/blisp/default.nix index ba1f42a90b0d4..b6add8db9b8a9 100644 --- a/pkgs/development/embedded/blisp/default.nix +++ b/pkgs/development/embedded/blisp/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ argtable libserialport - ] ++ lib.optional stdenv.isDarwin IOKit; + ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; cmakeFlags = [ "-DBLISP_BUILD_CLI=ON" "-DBLISP_USE_SYSTEM_LIBRARIES=ON" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=implicit-function-declaration"; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix index 3f55ccdd2e8b2..f50b91ddbb091 100644 --- a/pkgs/development/embedded/bossa/default.nix +++ b/pkgs/development/embedded/bossa/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { wxGTK32 libX11 readline - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/development/embedded/easypdkprog/default.nix b/pkgs/development/embedded/easypdkprog/default.nix index 28f06db9f35d5..4e9b8f1722bc9 100644 --- a/pkgs/development/embedded/easypdkprog/default.nix +++ b/pkgs/development/embedded/easypdkprog/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 -t $out/bin easypdkprog - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 -t $out/etc/udev/rules.d Linux_udevrules/70-stm32vcp.rules ''; diff --git a/pkgs/development/embedded/edl/default.nix b/pkgs/development/embedded/edl/default.nix index 570fda02d8e5f..77ac437624922 100644 --- a/pkgs/development/embedded/edl/default.nix +++ b/pkgs/development/embedded/edl/default.nix @@ -57,6 +57,6 @@ python3Packages.buildPythonPackage { xddxdd ]; # Case-sensitive files in 'Loader' submodule - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index b3091df1e3f65..239ffbbeb96b8 100644 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -13,8 +13,8 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optional stdenv.isLinux udev - ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optional stdenv.hostPlatform.isLinux udev + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation DiskArbitration Foundation diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index ef1ba75c45b1f..6d43f107563a9 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] - ++ lib.optional stdenv.isDarwin AppKit; + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; postInstall = '' mkdir -p $out/etc/udev/rules.d diff --git a/pkgs/development/embedded/fpga/fujprog/default.nix b/pkgs/development/embedded/fpga/fujprog/default.nix index 69c23f2a71cd0..bdac1033053af 100644 --- a/pkgs/development/embedded/fpga/fujprog/default.nix +++ b/pkgs/development/embedded/fpga/fujprog/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 libusb-compat-0_1 - ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; meta = with lib; { description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards"; diff --git a/pkgs/development/embedded/fpga/trellis/default.nix b/pkgs/development/embedded/fpga/trellis/default.nix index b652f57fa81a1..5726465311e54 100644 --- a/pkgs/development/embedded/fpga/trellis/default.nix +++ b/pkgs/development/embedded/fpga/trellis/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { cd libtrellis ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/bin/* ; do install_name_tool -change "$out/lib/libtrellis.dylib" "$out/lib/trellis/libtrellis.dylib" "$f" done diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix index 366d1ed832c21..86dfd687ed2f9 100644 --- a/pkgs/development/embedded/openocd/default.nix +++ b/pkgs/development/embedded/openocd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ lib.optionals notWindows [ hidapi jimtcl libftdi1 libjaylink ] ++ # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/ - lib.optional stdenv.isLinux libgpiod_1; + lib.optional stdenv.hostPlatform.isLinux libgpiod_1; configureFlags = [ "--disable-werror" @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" (lib.enableFeature notWindows "buspirate") (lib.enableFeature (notWindows && enableFtdi) "ftdi") - (lib.enableFeature stdenv.isLinux "linuxgpiod") - (lib.enableFeature stdenv.isLinux "sysfsgpio") + (lib.enableFeature stdenv.hostPlatform.isLinux "linuxgpiod") + (lib.enableFeature stdenv.hostPlatform.isLinux "sysfsgpio") (lib.enableFeature isWindows "internal-jimtcl") (lib.enableFeature isWindows "internal-libjaylink") ] ++ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "-Wno-error=strict-prototypes" # fixes build failure with hidapi 0.10.0 ]); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p "$out/etc/udev/rules.d" rules="$out/share/openocd/contrib/60-openocd.rules" if [ ! -f "$rules" ]; then diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 6890a2b1b35eb..eb20e0f6a3e75 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -79,7 +79,7 @@ with python3Packages; buildPythonApplication rec { uvicorn wsproto zeroconf - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ chardet ]; diff --git a/pkgs/development/emilua-plugins/beast/default.nix b/pkgs/development/emilua-plugins/beast/default.nix new file mode 100644 index 0000000000000..245170cae710a --- /dev/null +++ b/pkgs/development/emilua-plugins/beast/default.nix @@ -0,0 +1,37 @@ +{ + stdenv, + emilua, + meson, + gperf, + ninja, + asciidoctor, + pkg-config, + fetchFromGitLab, + gitUpdater, +}: + +stdenv.mkDerivation (self: { + pname = "emilua_beast"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "beast"; + rev = "v${self.version}"; + hash = "sha256-HvfEigHJTZelPvHFk22PWxkTFEajHJXfiCndxXHVgq8="; + }; + + buildInputs = [ + emilua + asciidoctor + gperf + ]; + + nativeBuildInputs = [ + meson + pkg-config + ninja + ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; +}) diff --git a/pkgs/development/emilua-plugins/bech32/default.nix b/pkgs/development/emilua-plugins/bech32/default.nix new file mode 100644 index 0000000000000..338913764b669 --- /dev/null +++ b/pkgs/development/emilua-plugins/bech32/default.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitLab, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + emilua, + liburing, + openssl, + fmt, + cmake, + range-v3, +}: + +stdenv.mkDerivation rec { + pname = "emilua-bech32"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "bech32"; + rev = "v${version}"; + hash = "sha256-f4KFL2RV+fAVJrgaAQWKuLwlN440j9vBbiyk5fHrwiE="; + }; + + buildInputs = [ + emilua + liburing + fmt + range-v3 + luajit_openresty + openssl + boost + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + meson + ninja + cmake + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Bech32 codec for Emilua"; + homepage = "https://emilua.org/"; + license = licenses.mit; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/emilua-plugins/botan/default.nix b/pkgs/development/emilua-plugins/botan/default.nix new file mode 100644 index 0000000000000..895e400281980 --- /dev/null +++ b/pkgs/development/emilua-plugins/botan/default.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitLab, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + emilua, + liburing, + openssl, + fmt, + botan3, +}: + +stdenv.mkDerivation rec { + pname = "emilua-botan"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "botan"; + rev = "v${version}"; + hash = "sha256-5/vcm6vNucBhl1Aki+OFNjAU7Hvc7OLAAH4CYchlBIY="; + }; + + buildInputs = [ + emilua + liburing + fmt + botan3 + luajit_openresty + openssl + boost + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + meson + ninja + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Securely clears secrets from memory in Emilua"; + homepage = "https://emilua.org/"; + license = licenses.mit; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/emilua-plugins/qt5/basic_test.lua b/pkgs/development/emilua-plugins/qt5/basic_test.lua new file mode 100644 index 0000000000000..5e37771a1ca57 --- /dev/null +++ b/pkgs/development/emilua-plugins/qt5/basic_test.lua @@ -0,0 +1,12 @@ +local qt = require 'qt5' +local qml = qt.load_qml(byte_span.append([[ + import QtQml 2.0 + QtObject { + function foobar(a: int, b: int): int { + return a + b + } + } +]])) +assert(qml.object('foobar(int,int)', 1, 2), 3) + +print("done 👍") diff --git a/pkgs/development/emilua-plugins/qt5/default.nix b/pkgs/development/emilua-plugins/qt5/default.nix new file mode 100644 index 0000000000000..95b8919f723cf --- /dev/null +++ b/pkgs/development/emilua-plugins/qt5/default.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitLab, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + libsForQt5, + emilua, + liburing, + fmt, + runCommand, + xvfb-run, + qt5, # this +}: + +stdenv.mkDerivation rec { + pname = "emilua-qt5"; + version = "1.0.1"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "qt5"; + rev = "v${version}"; + hash = "sha256-FkBfzGzUX7dvHjWRBjVwppU4jZBbY02gP+fIta8mjIw="; + }; + + buildInputs = [ + luajit_openresty + boost + libsForQt5.qtdeclarative + emilua + liburing + fmt + libsForQt5.qtbase + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + meson + ninja + libsForQt5.wrapQtAppsHook + libsForQt5.qttools + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.basic = + runCommand "test-basic-qt5" + { + buildInputs = [ + emilua + qt5 + libsForQt5.wrapQtAppsHook + xvfb-run + ]; + dontWrapQtApps = true; + } + '' + makeWrapper ${lib.getExe emilua} payload \ + ''${qtWrapperArgs[@]} \ + --add-flags ${./basic_test.lua} + xvfb-run ./payload + touch $out + ''; + }; + + meta = with lib; { + description = "Qt5 bindings for Emilua"; + homepage = "https://emilua.org/"; + license = licenses.boost; + maintainers = with maintainers; [ + manipuladordedados + lucasew + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/emilua-plugins/qt6/basic_test.lua b/pkgs/development/emilua-plugins/qt6/basic_test.lua new file mode 100644 index 0000000000000..1c3ca102520ca --- /dev/null +++ b/pkgs/development/emilua-plugins/qt6/basic_test.lua @@ -0,0 +1,12 @@ +local qt = require 'qt6' +local qml = qt.load_qml(byte_span.append([[ + import QtQml 2.0 + QtObject { + function foobar(a: int, b: int): int { + return a + b + } + } +]])) +assert(qml.object('foobar(int,int)', 1, 2), 3) + +print("done 👍") diff --git a/pkgs/development/emilua-plugins/qt6/default.nix b/pkgs/development/emilua-plugins/qt6/default.nix new file mode 100644 index 0000000000000..e8245200ecccd --- /dev/null +++ b/pkgs/development/emilua-plugins/qt6/default.nix @@ -0,0 +1,91 @@ +{ + lib, + stdenv, + fetchFromGitLab, + asciidoctor, + ninja, + gperf, + gawk, + pkg-config, + boost, + luajit_openresty, + fmt, + meson, + emilua, + qt6Packages, + openssl, + liburing, + gitUpdater, + runCommand, + xvfb-run, + qt6, # this +}: + +stdenv.mkDerivation rec { + pname = "emilua-qt6"; + version = "1.0.3"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "qt6"; + rev = "v${version}"; + hash = "sha256-azMnM17HQMzC0ExgWurQzbR3fX9EwBRSu4kVTm3U2Ic="; + }; + + buildInputs = with qt6Packages; [ + qtbase + qtdeclarative + boost + luajit_openresty + emilua + fmt + openssl + liburing + ]; + + nativeBuildInputs = with qt6Packages; [ + qttools + wrapQtAppsHook + gperf + gawk + asciidoctor + pkg-config + meson + ninja + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.basic = + runCommand "test-basic-qt6" + { + buildInputs = [ + emilua + qt6 + qt6Packages.wrapQtAppsHook + qt6Packages.qtbase + qt6Packages.qtdeclarative + xvfb-run + ]; + dontWrapQtApps = true; + } + '' + makeWrapper ${lib.getExe emilua} payload \ + ''${qtWrapperArgs[@]} \ + --add-flags ${./basic_test.lua} + xvfb-run ./payload + touch $out + ''; + }; + + meta = with lib; { + description = "Qt6 bindings for Emilua"; + homepage = "https://emilua.org/"; + license = licenses.boost; + maintainers = with maintainers; [ + manipuladordedados + lucasew + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/emilua-plugins/secp256k1/default.nix b/pkgs/development/emilua-plugins/secp256k1/default.nix new file mode 100644 index 0000000000000..6b83ed573dc1f --- /dev/null +++ b/pkgs/development/emilua-plugins/secp256k1/default.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitLab, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + emilua, + liburing, + openssl, + fmt, + secp256k1, +}: + +stdenv.mkDerivation rec { + pname = "emilua-secp256k1"; + version = "0.5.0"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "secp256k1"; + rev = "v${version}"; + hash = "sha256-xbyDKxuU03U0k4YSD7Sahw2Z4ZSpQHwrpWcSN0F5CCw="; + }; + + buildInputs = [ + emilua + liburing + fmt + secp256k1 + luajit_openresty + openssl + boost + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + meson + ninja + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Emilua bindings to libsecp256k1"; + homepage = "https://emilua.org/"; + license = licenses.mit; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/emilua-plugins/tdlib/default.nix b/pkgs/development/emilua-plugins/tdlib/default.nix new file mode 100644 index 0000000000000..96c33efee1974 --- /dev/null +++ b/pkgs/development/emilua-plugins/tdlib/default.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitLab, + fetchFromGitHub, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + emilua, + liburing, + openssl, + cmake, + fmt, + zlib, +}: + +let + td-wrap = fetchFromGitHub { + owner = "tdlib"; + repo = "td"; + rev = "4041ecb535802ba1c55fcd11adf5d3ada41c2be7"; + hash = "sha256-/TaPYy+FUOVhyocDZ13zwR07xbzp6g8c6xvAGVFLQvk="; + }; + + trial-circular-wrap = fetchFromGitHub { + owner = "breese"; + repo = "trial.protocol"; + rev = "79149f604a49b8dfec57857ca28aaf508069b669"; + hash = "sha256-Xd8bX3z9PZWU17N9R95HXdj6qo9at5FBL/+PTVaJgkw="; + }; +in +stdenv.mkDerivation rec { + pname = "emilua-tdlib"; + version = "1.0.3"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "tdlib"; + rev = "v${version}"; + hash = "sha256-14jg71m1za+WW0PP9cg1XniCupl9/RXqeEP1SE+62Ng="; + fetchSubmodules = true; + }; + + buildInputs = [ + emilua + liburing + fmt + luajit_openresty + openssl + boost + td-wrap + trial-circular-wrap + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + cmake + zlib + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-warn 'pkg_get_variable(EMILUA_PLUGINSDIR emilua pluginsdir)' 'set(EMILUA_PLUGINSDIR "${"$"}{CMAKE_INSTALL_PREFIX}/${emilua.sitePackages}")' + ''; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Telegram Database Library bindings for Emilua"; + homepage = "https://emilua.org/"; + license = licenses.mit; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/emilua-plugins/this-thread/default.nix b/pkgs/development/emilua-plugins/this-thread/default.nix new file mode 100644 index 0000000000000..1430359d133cb --- /dev/null +++ b/pkgs/development/emilua-plugins/this-thread/default.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitLab, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + emilua, + liburing, + openssl, + fmt, +}: + +stdenv.mkDerivation rec { + pname = "emilua-this-thread"; + version = "1.0.0"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "this-thread"; + rev = "v${version}"; + hash = "sha256-JmAe69heZ406LE2aaSxQXJYu/iv1cS90KHecQJYoiKQ="; + }; + + buildInputs = [ + emilua + liburing + fmt + luajit_openresty + openssl + boost + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + meson + ninja + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Access C++'s this_thread from Lua"; + homepage = "https://emilua.org/"; + license = licenses.mit; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix index 66a6e82fff8b6..a86fce043d97a 100644 --- a/pkgs/development/gnuradio-modules/ais/default.nix +++ b/pkgs/development/gnuradio-modules/ais/default.nix @@ -60,7 +60,7 @@ mkDerivation rec { platforms = platforms.unix; # rpcserver_aggregator.h:111:54: error: no template named 'unary_function' # in namespace 'std'; did you mean '__unary_function'? - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ mog ]; }; } diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix index dbf7513cacc19..663ffafd7f3bb 100644 --- a/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -71,7 +71,7 @@ in mkDerivation { ] ++ lib.optionals (gnuradio.hasFeature "python-support") [ python.pkgs.numpy python.pkgs.pybind11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix deleted file mode 100644 index ff31b009da316..0000000000000 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitea -, guile -, libgcrypt -, autoreconfHook -, pkg-config -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "guile-gcrypt"; - version = "0.4.0"; - - src = fetchFromGitea { - domain = "notabug.org"; - owner = "cwebber"; - repo = "guile-gcrypt"; - rev = "v${version}"; - hash = "sha256-vbm31EsOJiMeTs2tu5KPXckxPcAQbi3/PGJ5EHCC5VQ="; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook guile libgcrypt pkg-config texinfo - ]; - buildInputs = [ - guile - ]; - propagatedBuildInputs = [ - libgcrypt - ]; - makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - doCheck = true; - - # In procedure bytevector-u8-ref: Argument 2 out of range - dontStrip = stdenv.isDarwin; - - meta = with lib; { - description = "Bindings to Libgcrypt for GNU Guile"; - homepage = "https://notabug.org/cwebber/guile-gcrypt"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ethancedwards8 ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix deleted file mode 100644 index b91d13a637455..0000000000000 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, guile -, libgit2 -, scheme-bytestructures -, autoreconfHook -, pkg-config -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "guile-git"; - version = "0.8.0"; - - src = fetchFromGitLab { - owner = "guile-git"; - repo = pname; - rev = "v${version}"; - hash = "sha256-EZ2uGyk1K2YCl/U7EzTKri6CEe8CGDRy4pNRVjp7ZZY="; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook guile pkg-config texinfo - ]; - buildInputs = [ - guile - ]; - propagatedBuildInputs = [ - libgit2 scheme-bytestructures - ]; - doCheck = !stdenv.isDarwin; - makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - - enableParallelBuilding = true; - - # Skipping proxy tests since it requires network access. - postConfigure = '' - sed -i -e '94i (test-skip 1)' ./tests/proxy.scm - ''; - - meta = with lib; { - description = "Bindings to Libgit2 for GNU Guile"; - homepage = "https://gitlab.com/guile-git/guile-git"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ethancedwards8 ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix deleted file mode 100644 index 1e5ddbd491436..0000000000000 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoreconfHook -, guile -, pkg-config -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "guile-lib"; - version = "0.2.8.1"; - - src = fetchurl { - url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-E3TC2Dnmoz0ZDNHavZx/h3U/g4T1W4ZvPhQhVcIrSbE="; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - guile - pkg-config - ]; - buildInputs = [ - guile - texinfo - ]; - - postPatch = '' - substituteInPlace configure.ac \ - --replace 'SITEDIR="$datadir/guile-lib"' 'SITEDIR=$datadir/guile/site/$GUILE_EFFECTIVE_VERSION' \ - --replace 'SITECCACHEDIR="$libdir/guile-lib/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' 'SITECCACHEDIR="$libdir/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' - ''; - - makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - - doCheck = !stdenv.isDarwin; - - preCheck = '' - # Make `libgcc_s.so' visible for `pthread_cancel'. - export LD_LIBRARY_PATH=\ - "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - - meta = with lib; { - homepage = "https://www.nongnu.org/guile-lib/"; - description = "Collection of useful Guile Scheme modules"; - longDescription = '' - guile-lib is intended as an accumulation place for pure-scheme Guile - modules, allowing for people to cooperate integrating their generic Guile - modules into a coherent library. Think "a down-scaled, limited-scope CPAN - for Guile". - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp foo-dogsquared ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/development/guile-modules/guile-ssh/default.nix deleted file mode 100644 index a1928c78ce752..0000000000000 --- a/pkgs/development/guile-modules/guile-ssh/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, guile -, libssh -, autoreconfHook -, pkg-config -, texinfo -, which -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "guile-ssh"; - version = "0.16.3"; - - src = fetchFromGitHub { - owner = "artyom-poptsov"; - repo = "guile-ssh"; - rev = "v${finalAttrs.version}"; - hash = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/artyom-poptsov/guile-ssh/pull/31/commits/38636c978f257d5228cd065837becabf5da16854.patch"; - hash = "sha256-J+TDgdjihKoEjhbeH+BzqrHhjpVlGdscRj3L/GAFgKg="; - }) - ]; - - strictDeps = true; - - nativeBuildInputs = [ - autoreconfHook - guile - pkg-config - texinfo - which - ]; - - buildInputs = [ - guile - ]; - - propagatedBuildInputs = [ - libssh - ]; - - enableParallelBuilding = true; - - # FAIL: server-client.scm - doCheck = !stdenv.isDarwin; - - postInstall = '' - mv $out/bin/*.scm $out/share/guile-ssh - rmdir $out/bin - ''; - - meta = with lib; { - description = "Bindings to Libssh for GNU Guile"; - homepage = "https://github.com/artyom-poptsov/guile-ssh"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ethancedwards8 foo-dogsquared ]; - platforms = guile.meta.platforms; - }; -}) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1419ab9f5ed66..01f448cc732c7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -12,8 +12,8 @@ { pkgs, haskellLib }: let - inherit (pkgs) fetchpatch fetchpatch2 lib; - inherit (lib) throwIfNot versionOlder versions; + inherit (pkgs) fetchpatch lib; + inherit (lib) throwIfNot versionOlder; in with haskellLib; @@ -27,14 +27,14 @@ self: super: { Cabal-syntax = self.Cabal-syntax_3_10_3_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible - process = self.process_1_6_20_0; + process = self.process_1_6_22_0; })); Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({ Cabal-syntax = self.Cabal-syntax_3_12_1_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible - process = self.process_1_6_20_0; + process = self.process_1_6_22_0; })); # hackage-security == 0.6.2.6 has a wider support range in theory, but it only @@ -52,7 +52,7 @@ self: super: { cabalInstallOverlay = cself: csuper: { hackage-security = self.hackage-security_0_6_2_6; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.10") { + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.10.2") { Cabal = cself.Cabal_3_12_1_0; Cabal-syntax = cself.Cabal-syntax_3_12_1_0; }; @@ -185,6 +185,13 @@ self: super: { http-api-data = doJailbreak super.http-api-data; tasty-discover = doJailbreak super.tasty-discover; + # Out of date test data: https://github.com/ocharles/weeder/issues/176 + weeder = appendPatch (pkgs.fetchpatch { + name = "weeder-2.9.0-test-fix-expected.patch"; + url = "https://github.com/ocharles/weeder/commit/56028d0c80fe89d4f2ae25275aedb72714fec7da.patch"; + sha256 = "10zkvclyir3zf21v41zdsvg68vrkq89n64kv9k54742am2i4aygf"; + }) super.weeder; + # Allow aeson == 2.1.* # https://github.com/hdgarrood/aeson-better-errors/issues/23 aeson-better-errors = lib.pipe super.aeson-better-errors [ @@ -199,15 +206,10 @@ self: super: { ]) ]; - # https://github.com/mpickering/eventlog2html/pull/187 - eventlog2html = lib.pipe super.eventlog2html [ - doJailbreak - (appendPatch (fetchpatch { - name = "blaze-html-compat.patch"; - url = "https://github.com/mpickering/eventlog2html/commit/666aee9ee44c571173a73036b36ad4154c188481.patch"; - sha256 = "sha256-9PLygLEpJ6pAZ31gSWiEMqWxmvElT6Unc/pgr6ULIaw="; - })) - ]; + # Version 2.1.1 is deprecated, but part of Stackage LTS at the moment. + # https://github.com/commercialhaskell/stackage/issues/7500 + # https://github.com/yesodweb/shakespeare/issues/280 + shakespeare = doDistribute self.shakespeare_2_1_0_1; # 2023-08-09: Jailbreak because of vector < 0.13 # 2023-11-09: don't check because of https://github.com/tweag/monad-bayes/pull/326 @@ -392,7 +394,7 @@ self: super: { numerals-base = dontCheck (doJailbreak super.numerals-base); # This test keeps being aborted because it runs too quietly for too long - Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; + Lazy-Pbkdf2 = if pkgs.stdenv.hostPlatform.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; # check requires mysql server mysql-simple = dontCheck super.mysql-simple; @@ -409,7 +411,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1y25ac341d77dkb94qny3h5id2xlpqh9hrjr0s6pp66xghbcvzn4"; + sha256 = "0j037sis64gnrll7ajg48cvzzvxqsrhj7vnhiwcqv8wbmbfv0avn"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -598,6 +600,10 @@ self: super: { # Too strict bounds on algebraic-graphs # https://github.com/haskell-nix/hnix-store/issues/180 hnix-store-core_0_6_1_0 = doJailbreak super.hnix-store-core_0_6_1_0; + + # 2024-09-27: dependent-sum-template pinned to 0.1.1.1, however 0.2.0.1+ required + hnix-store-core_0_8_0_0 = super.hnix-store-core_0_8_0_0.override { dependent-sum-template = self.dependent-sum-template_0_2_0_1; }; + # 2023-12-11: Needs older core hnix-store-remote = super.hnix-store-remote.override { hnix-store-core = self.hnix-store-core_0_6_1_0; }; @@ -906,12 +912,12 @@ self: super: { Cabal-ide-backend = dontCheck super.Cabal-ide-backend; # This package can't be built on non-Windows systems. - Win32 = overrideCabal (drv: { broken = !pkgs.stdenv.isCygwin; }) super.Win32; + Win32 = overrideCabal (drv: { broken = !pkgs.stdenv.hostPlatform.isCygwin; }) super.Win32; inline-c-win32 = dontDistribute super.inline-c-win32; Southpaw = dontDistribute super.Southpaw; # https://ghc.haskell.org/trac/ghc/ticket/9825 - vimus = overrideCabal (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; }) super.vimus; + vimus = overrideCabal (drv: { broken = pkgs.stdenv.hostPlatform.isLinux && pkgs.stdenv.hostPlatform.isi686; }) super.vimus; # https://github.com/kazu-yamamoto/logger/issues/42 logger = dontCheck super.logger; @@ -948,22 +954,6 @@ self: super: { ''; }) super.ghc-mod; - # Apply compatibility patches until a new release arrives - # https://github.com/phadej/spdx/issues/33 - spdx = appendPatches [ - (fetchpatch { - name = "spdx-ghc-9.4.patch"; - url = "https://github.com/phadej/spdx/pull/30/commits/545dc69f433225c837375fba4cbbdb7f9cc7b09b.patch"; - sha256 = "0p2h8dxkjy2v0dx7h6v62clmx5n5j3c4zh4myh926fijympi1glz"; - }) - (fetchpatch { - name = "spdx-ghc-9.6.patch"; - url = "https://github.com/phadej/spdx/pull/32/commits/b51f665e9960614274ff6a9ac658802c1a785687.patch"; - sha256 = "01vf1h0djr84yxsjfhym715ncx0w5q4l02k3dkbmg40pnc62ql4h"; - excludes = [ ".github/**" ]; - }) - ] super.spdx; - # 2022-03-19: Testsuite is failing: https://github.com/puffnfresh/haskell-jwt/issues/2 jwt = dontCheck super.jwt; @@ -1478,6 +1468,11 @@ self: super: { ''; }) super.hledger-flow; + # xmonad-contrib >= 0.18.1 for latest XMonad + xmonad-contrib_0_18_1 = super.xmonad-contrib_0_18_1.override { + xmonad = self.xmonad_0_18_0; + }; + # Chart-tests needs and compiles some modules from Chart itself Chart-tests = overrideCabal (old: { # https://github.com/timbod7/haskell-chart/issues/233 @@ -1980,6 +1975,9 @@ self: super: { "--haddock-option=--optghc=-fno-safe-haskell" ] super.alg; + # Missing test files in 1.8.1.0, fixed in 1.8.1.1 + sequence-formats = dontCheck super.sequence-formats; + # Windows.normalise changed in filepath >= 1.4.100.4 which fails the equivalency # test suite. This is of no great consequence for us, though. # Patch solving this has been submitted to upstream by me (@sternenseemann). @@ -2062,6 +2060,11 @@ self: super: { tls = self.tls_2_0_6; }); + # Requests version 2 of tls, can be removed once it's the default + diohsc = super.diohsc.overrideScope (self: super: { + tls = self.tls_2_0_6; + }); + # Need https://github.com/obsidiansystems/cli-extras/pull/12 and more cli-extras = doJailbreak super.cli-extras; @@ -2362,6 +2365,12 @@ self: super: { language-docker = self.language-docker_11_0_0; }; + # Too strict lower bounds on (test) deps + # https://github.com/phadej/puresat/issues/6 + puresat = doJailbreak super.puresat; + # https://github.com/phadej/spdx/issues/62 + spdx = doJailbreak super.spdx; + # test suite requires stack to run, https://github.com/dino-/photoname/issues/24 photoname = dontCheck super.photoname; @@ -2453,9 +2462,7 @@ self: super: { # See: https://gitlab.haskell.org/ghc/ghc/-/issues/17188 # # Overwrite the build cores - raaz = overrideCabal (drv: { - enableParallelBuilding = false; - }) super.raaz; + raaz = disableParallelBuilding super.raaz; # https://github.com/andreymulik/sdp/issues/3 sdp = disableLibraryProfiling super.sdp; @@ -2560,8 +2567,9 @@ self: super: { relative = "dependent-sum-template"; }) super.dependent-sum-template; - # Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24 - system-fileio = doJailbreak super.system-fileio; + # doJailbreak: too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24 + # dontCheck: tests don't typecheck after ghc 8.4 (possibly introduced by api change of unix library) + system-fileio = doJailbreak (dontCheck super.system-fileio); # Bounds too strict on base and ghc-prim: https://github.com/tibbe/ekg-core/pull/43 (merged); waiting on hackage release ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core; @@ -2661,7 +2669,7 @@ self: super: { purescript = lib.pipe (super.purescript.overrideScope purescriptOverlay) - ([ + [ # https://github.com/purescript/purescript/pull/4547 (appendPatches [ (pkgs.fetchpatch { @@ -2680,7 +2688,7 @@ self: super: { doJailbreak # Generate shell completions (self.generateOptparseApplicativeCompletions [ "purs" ]) - ]); + ]; purenix = lib.pipe @@ -2913,7 +2921,6 @@ self: super: { # Workaround for Cabal failing to find nonexistent SDL2 library?! # https://github.com/NixOS/nixpkgs/issues/260863 sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx; - sdl2-ttf = overrideCabal { __onlyPropagateKnownPkgConfigModules = true; } super.sdl2-ttf; # Needs git for compile-time insertion of commit hash into --version string. kmonad = overrideCabal (drv: { @@ -3078,7 +3085,7 @@ self: super: { # 2024-08-09: The stackage versions of safe-coloured-text* are old and broken safe-coloured-text = unmarkBroken self.safe-coloured-text_0_3_0_2; safe-coloured-text-gen = unmarkBroken self.safe-coloured-text-gen_0_0_0_3; - safe-coloured-text-layout = unmarkBroken self.safe-coloured-text-layout_0_2_0_0; + safe-coloured-text-layout = unmarkBroken self.safe-coloured-text-layout_0_2_0_1; safe-coloured-text-layout-gen = unmarkBroken self.safe-coloured-text-layout-gen_0_0_0_1; safe-coloured-text-terminfo = unmarkBroken self.safe-coloured-text-terminfo_0_3_0_0; }))); diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 5933627583a6f..6e7f7ef47b879 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -83,9 +83,6 @@ self: super: ({ with-utf8 = addExtraLibrary pkgs.libiconv super.with-utf8; with-utf8_1_1_0_0 = addExtraLibrary pkgs.libiconv super.with-utf8_1_1_0_0; - # the system-fileio tests use canonicalizePath, which fails in the sandbox - system-fileio = dontCheck super.system-fileio; - git-annex = overrideCabal (drv: { # We can't use testFlags since git-annex side steps the Cabal test mechanism preCheck = drv.preCheck or "" + '' @@ -359,7 +356,7 @@ self: super: ({ ''; }) super.di-core; -} // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin +} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { # aarch64-darwin # Workarounds for justStaticExecutables on aarch64-darwin. Since dead code # elimination barely works on aarch64-darwin, any package that has a @@ -429,7 +426,7 @@ self: super: ({ rivet-adaptor-postgresql = dontCheck super.rivet-adaptor-postgresql; tmp-proc-postgres = dontCheck super.tmp-proc-postgres; -} // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin +} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isx86_64 { # x86_64-darwin # tests appear to be failing to link or something: # https://hydra.nixos.org/build/174540882/nixlog/9 diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 4a194192ee4b4..4272012f27a32 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -69,7 +69,6 @@ self: super: { hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 http-api-data = doJailbreak super.http-api-data; persistent-sqlite = dontCheck super.persistent-sqlite; - system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" unicode-transforms = dontCheck super.unicode-transforms; wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14 diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 98a8cb4d49b80..972cbc4c7e03b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -1,9 +1,10 @@ { pkgs, haskellLib }: +with haskellLib; + let inherit (pkgs) lib; - disableParallelBuilding = haskellLib.overrideCabal (drv: { enableParallelBuilding = false; }); in self: super: { @@ -46,13 +47,90 @@ self: super: { system-cxx-std-lib = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else haskellLib.doDistribute self.terminfo_0_4_1_6; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else doDistribute self.terminfo_0_4_1_6; text = null; time = null; transformers = null; unix = null; xhtml = null; - # https://gitlab.haskell.org/ghc/ghc/-/issues/23392 - gi-gtk = disableParallelBuilding super.gi-gtk; + # + # Version upgrades + # + + # Upgrade to accommodate new core library versions, where the authors have + # already made the relevant changes. + aeson = doDistribute self.aeson_2_2_3_0; + apply-refact = doDistribute self.apply-refact_0_14_0_0; + attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; + auto-update = super.auto-update_0_2_1; + extensions = doDistribute self.extensions_0_1_0_2; + fourmolu = doDistribute self.fourmolu_0_16_2_0; + hashable = doDistribute self.hashable_1_4_7_0; + integer-conversion = doDistribute self.integer-conversion_0_1_1; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20240511; + ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; + http2 = super.http2_5_3_4; + lens = doDistribute self.lens_5_3_2; + lukko = doDistribute self.lukko_0_1_2; + network-control = super.network-control_0_1_3; + network-run = super.network-run_0_4_0; + ormolu = doDistribute self.ormolu_0_7_7_0; + primitive = doDistribute (dontCheck self.primitive_0_9_0_0); # tests introduce a recursive dependency via hspec + quickcheck-instances = doDistribute self.quickcheck-instances_0_3_31; + rebase = doDistribute self.rebase_1_21_1; + rerebase = doDistribute self.rerebase_1_21_1; + scientific = doDistribute self.scientific_0_3_8_0; + semirings = doDistribute self.semirings_0_7; + time-manager = super.time-manager_0_1_0; + th-abstraction = doDistribute self.th-abstraction_0_7_0_0; + uuid-types = doDistribute self.uuid-types_1_0_6; + + # A given major version of ghc-exactprint only supports one version of GHC. + ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0; + ghc-exactprint_1_9_0_0 = addBuildDepends [ + self.Diff + self.extra + self.ghc-paths + self.silently + self.syb + self.HUnit + ] super.ghc-exactprint_1_9_0_0; + + # + # Jailbreaks + # + base64 = doJailbreak super.base64; # base <4.20 + commutative-semigroups = doJailbreak super.commutative-semigroups; # base <4.20 + dejafu = doJailbreak super.dejafu; # containers <0.7 + floskell = doJailbreak super.floskell; # base <4.20 + lucid = doJailbreak super.lucid; # base <4.20 + tar = doJailbreak super.tar; # base <4.20 + tasty-coverage = doJailbreak super.tasty-coverage; # base <4.20, filepath <1.5 + tree-diff = doJailbreak super.tree-diff; # base <4.20 + time-compat = doJailbreak super.time-compat; # base <4.20 + + bitvec = doJailbreak super.bitvec; # primitive <0.9 + + apply-refact_0_14_0_0 = doJailbreak super.apply-refact_0_14_0_0; # ghc-exactprint <1.9 + retrie = doJailbreak super.retrie; # base <4.20, ghc<9.9, ghc-exactprint<1.9 + + hashable_1_4_7_0 = doJailbreak super.hashable_1_4_7_0; # relax bounds for QuickCheck, tasty, and tasty-quickcheck + hashable_1_5_0_0 = doJailbreak super.hashable_1_5_0_0; # relax bounds for QuickCheck, tasty, and tasty-quickcheck + + # + # Test suite issues + # + call-stack = dontCheck super.call-stack; # expects the package to be named "main", but we generate a name + lifted-base = dontCheck super.lifted-base; # doesn't compile with transformers ==0.6.* + lukko_0_1_2 = dontCheck super.lukko_0_1_2; # doesn't compile with tasty ==1.4.* + resolv = dontCheck super.resolv; # doesn't compile with filepath ==1.5.* + primitive-unlifted = dontCheck super.primitive-unlifted; # doesn't compile with primitive ==0.9.* + bsb-http-chunked = pkgs.haskell.lib.dontCheck super.bsb-http-chunked; # https://github.com/sjakobi/bsb-http-chunked/issues/45 + hinotify = pkgs.haskell.lib.dontCheck super.hinotify; # https://github.com/kolmodin/hinotify/issues/38 + warp = pkgs.haskell.lib.dontCheck super.warp_3_4_1; # test suite assumes it can freely call curl + + haskell-language-server = disableCabalFlag "retrie" (disableCabalFlag "hlint" (disableCabalFlag "stylishhaskel" (super.haskell-language-server.override {stylish-haskell = null;retrie = null;apply-refact=null;hlint = null;}))); + + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix index 98a8cb4d49b80..adc1896306202 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -3,7 +3,6 @@ let inherit (pkgs) lib; - disableParallelBuilding = haskellLib.overrideCabal (drv: { enableParallelBuilding = false; }); in self: super: { @@ -53,6 +52,4 @@ self: super: { unix = null; xhtml = null; - # https://gitlab.haskell.org/ghc/ghc/-/issues/23392 - gi-gtk = disableParallelBuilding super.gi-gtk; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index fcd97a908af5f..b6485a111b20e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -15,8 +15,6 @@ let builtins.throw "Check if '${msg}' was resolved in ${pkg.pname} ${pkg.version} and update or remove this"; jailbreakForCurrentVersion = p: v: checkAgainAfter p v "bad bounds" (doJailbreak p); - # Workaround for a ghc-9.6 issue: https://gitlab.haskell.org/ghc/ghc/-/issues/23392 - disableParallelBuilding = overrideCabal (drv: { enableParallelBuilding = false; }); in self: super: { @@ -109,9 +107,6 @@ self: super: { package-version # doctest <0.21, tasty-hedgehog <1.4 ; - # Avoid triggering an issue in ghc-9.6.2 - gi-gtk = disableParallelBuilding super.gi-gtk; - # Pending text-2.0 support https://github.com/gtk2hs/gtk2hs/issues/327 gtk = doJailbreak super.gtk; @@ -156,6 +151,17 @@ self: super: { })]; }) super.ConfigFile; + # Compatibility with core libs of GHC 9.6 + # Jailbreak to lift bound on time + kqueue = doJailbreak (appendPatches [ + (pkgs.fetchpatch { + name = "kqueue-ghc-9.6.patch"; + url = "https://github.com/hesselink/kqueue/pull/10/commits/a2735e807d761410e776482ec04515d9cf76a7f5.patch"; + sha256 = "18rilz4nrwcmlvll3acjx2lp7s129pviggb8fy3hdb0z34ls5j84"; + excludes = [ ".gitignore" ]; + }) + ] super.kqueue); + # This runs into the following GHC bug currently affecting 9.6.* and 9.8.* as # well as 9.10.1: https://gitlab.haskell.org/ghc/ghc/-/issues/24432 inherit (lib.mapAttrs (_: overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 9094f1f8e9eaf..7e89ea668e028 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -5,7 +5,6 @@ with haskellLib; let inherit (pkgs.stdenv.hostPlatform) isDarwin; - disableParallelBuilding = haskellLib.overrideCabal (drv: { enableParallelBuilding = false; }); in self: super: { @@ -146,7 +145,4 @@ self: super: { sha256 = "sha256-umjwgdSKebJdRrXjwHhsi8HBqotx1vFibY9ttLkyT/0="; }) super.reflex; - # https://gitlab.haskell.org/ghc/ghc/-/issues/23392 - gi-gtk = disableParallelBuilding super.gi-gtk; - } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix index 77ce56a9124c0..448f04228bec2 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix @@ -2,12 +2,6 @@ with haskellLib; -let - disableParallelBuilding = overrideCabal (drv: { - enableParallelBuilding = false; - }); -in - # cabal2nix doesn't properly add dependencies conditional on arch(javascript) (self: super: { @@ -27,6 +21,8 @@ in jsaddle = addBuildDepend self.ghcjs-base super.jsaddle; jsaddle-dom = addBuildDepend self.ghcjs-base super.jsaddle-dom; + entropy = addBuildDepend self.ghcjs-dom super.entropy; + reflex-dom = super.reflex-dom.override (drv: { jsaddle-webkit2gtk = null; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d921f4dd1c83d..ba659b51711ef 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -158,6 +158,7 @@ broken-packages: - amqp-conduit # failure in job https://hydra.nixos.org/build/233228080 at 2023-09-02 - amqp-worker # failure in job https://hydra.nixos.org/build/236675859 at 2023-10-04 - analyze # failure in job https://hydra.nixos.org/build/233251441 at 2023-09-02 + - anansi # failure in job https://hydra.nixos.org/build/273451545 at 2024-10-01 - anansi-pandoc # failure in job https://hydra.nixos.org/build/233252389 at 2023-09-02 - android-activity # failure in job https://hydra.nixos.org/build/233203400 at 2023-09-02 - android # failure in job https://hydra.nixos.org/build/233222148 at 2023-09-02 @@ -509,6 +510,7 @@ broken-packages: - blosum # failure in job https://hydra.nixos.org/build/233198029 at 2023-09-02 - blubber-server # failure in job https://hydra.nixos.org/build/233199530 at 2023-09-02 - bludigon # failure in job https://hydra.nixos.org/build/233248190 at 2023-09-02 + - bluefin-algae # failure in job https://hydra.nixos.org/build/270092011 at 2024-08-31 - Blueprint # failure in job https://hydra.nixos.org/build/233252987 at 2023-09-02 - bluetileutils # failure in job https://hydra.nixos.org/build/233197334 at 2023-09-02 - blunk-hask-tests # failure in job https://hydra.nixos.org/build/233240288 at 2023-09-02 @@ -529,6 +531,7 @@ broken-packages: - botpp # failure in job https://hydra.nixos.org/build/233201674 at 2023-09-02 - bottom # failure in job https://hydra.nixos.org/build/233225154 at 2023-09-02 - bounded-array # failure in job https://hydra.nixos.org/build/233200854 at 2023-09-02 + - bound-extras # failure in job https://hydra.nixos.org/build/270090014 at 2024-08-31 - bound-simple # failure in job https://hydra.nixos.org/build/233201896 at 2023-09-02 - bowntz # failure in job https://hydra.nixos.org/build/234439552 at 2023-09-13 - box-csv # failure in job https://hydra.nixos.org/build/233253321 at 2023-09-02 @@ -609,6 +612,7 @@ broken-packages: - cabal2ebuild # failure in job https://hydra.nixos.org/build/233221248 at 2023-09-02 - cabal2ghci # failure in job https://hydra.nixos.org/build/233233018 at 2023-09-02 - cabal2json # failure in job https://hydra.nixos.org/build/233196099 at 2023-09-02 + - cabal-add # failure in job https://hydra.nixos.org/build/273461296 at 2024-10-01 - cabal-audit # failure in job https://hydra.nixos.org/build/233193414 at 2023-09-02 - cabal-auto-expose # failure in job https://hydra.nixos.org/build/233195440 at 2023-09-02 - cabal-build-programs # failure in job https://hydra.nixos.org/build/257091363 at 2024-04-27 @@ -797,8 +801,13 @@ broken-packages: - clanki # failure in job https://hydra.nixos.org/build/233196970 at 2023-09-02 - clarifai # failure in job https://hydra.nixos.org/build/233229480 at 2023-09-02 - CLASE # failure in job https://hydra.nixos.org/build/233234459 at 2023-09-02 - - clash-prelude # failure in job https://hydra.nixos.org/build/233252128 at 2023-09-02 + - clashilator # failure in job https://hydra.nixos.org/build/273442437 at 2024-10-01 + - clash-multisignal # failure in job https://hydra.nixos.org/build/273463331 at 2024-10-01 + - clash-prelude-quickcheck # failure in job https://hydra.nixos.org/build/273453747 at 2024-10-01 - Clash-Royale-Hack-Cheats # failure in job https://hydra.nixos.org/build/233216034 at 2023-09-02 + - clash-systemverilog # failure in job https://hydra.nixos.org/build/273453889 at 2024-10-01 + - clash-verilog # failure in job https://hydra.nixos.org/build/273466517 at 2024-10-01 + - clash-vhdl # failure in job https://hydra.nixos.org/build/273460098 at 2024-10-01 - ClasshSS # failure in job https://hydra.nixos.org/build/255688076 at 2024-04-16 - ClassLaws # failure in job https://hydra.nixos.org/build/233243019 at 2023-09-02 - classy-effects-base # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237233636 at 2023-10-21 @@ -1281,6 +1290,7 @@ broken-packages: - dhall-to-cabal # failure in job https://hydra.nixos.org/build/233193270 at 2023-09-02 - dhcp-lease-parser # failure in job https://hydra.nixos.org/build/233229124 at 2023-09-02 - dhrun # failure in job https://hydra.nixos.org/build/233227529 at 2023-09-02 + - dhscanner-bitcode # failure in job https://hydra.nixos.org/build/270090641 at 2024-08-31 - dia-base # failure in job https://hydra.nixos.org/build/233230896 at 2023-09-02 - diagnose # failure in job https://hydra.nixos.org/build/233231767 at 2023-09-02 - diagrams-boolean # failure in job https://hydra.nixos.org/build/233202036 at 2023-09-02 @@ -1316,7 +1326,6 @@ broken-packages: - dijkstra-simple # failure in job https://hydra.nixos.org/build/233218373 at 2023-09-02 - DimensionalHash # failure in job https://hydra.nixos.org/build/233230945 at 2023-09-02 - dino # failure in job https://hydra.nixos.org/build/252725815 at 2024-03-16 - - diohsc # failure in job https://hydra.nixos.org/build/259625302 at 2024-05-15 - diophantine # failure in job https://hydra.nixos.org/build/233229215 at 2023-09-02 - diplomacy # failure in job https://hydra.nixos.org/build/233207895 at 2023-09-02 - direct-binary-files # failure in job https://hydra.nixos.org/build/233246387 at 2023-09-02 @@ -1326,6 +1335,7 @@ broken-packages: - directory-ospath-streaming # failure in job https://hydra.nixos.org/build/233240003 at 2023-09-02 - direct-plugins # failure in job https://hydra.nixos.org/build/233211547 at 2023-09-02 - direm # failure in job https://hydra.nixos.org/build/233211496 at 2023-09-02 + - dirstream # failure in job https://hydra.nixos.org/build/273442606 at 2024-10-01 - disco # failure in job https://hydra.nixos.org/build/233212298 at 2023-09-02 - discordian-calendar # failure in job https://hydra.nixos.org/build/233218124 at 2023-09-02 - discord-types # failure in job https://hydra.nixos.org/build/233251778 at 2023-09-02 @@ -2515,6 +2525,7 @@ broken-packages: - helm # failure in job https://hydra.nixos.org/build/233251620 at 2023-09-02 - help-esb # failure in job https://hydra.nixos.org/build/233202622 at 2023-09-02 - hemkay # failure in job https://hydra.nixos.org/build/233227889 at 2023-09-02 + - heptapod # failure in job https://hydra.nixos.org/build/270087935 at 2024-08-31 - HERA # failure in job https://hydra.nixos.org/build/233204724 at 2023-09-02 - herbalizer # failure in job https://hydra.nixos.org/build/233214866 at 2023-09-02 - HerbiePlugin # failure in job https://hydra.nixos.org/build/233193018 at 2023-09-02 @@ -2771,6 +2782,7 @@ broken-packages: - hpygments # failure in job https://hydra.nixos.org/build/233258827 at 2023-09-02 - hpylos # failure in job https://hydra.nixos.org/build/234451400 at 2023-09-13 - hpyrg # failure in job https://hydra.nixos.org/build/233225042 at 2023-09-02 + - hqcsim # failure in job https://hydra.nixos.org/build/270086589 at 2024-08-31 - hquantlib-time # failure in job https://hydra.nixos.org/build/233192009 at 2023-09-02 - hquery # failure in job https://hydra.nixos.org/build/233203709 at 2023-09-02 - h-raylib # failure in job https://hydra.nixos.org/build/236686375 at 2023-10-04 @@ -2786,6 +2798,7 @@ broken-packages: - hs2ps # failure in job https://hydra.nixos.org/build/233258362 at 2023-09-02 - hsakamai # failure in job https://hydra.nixos.org/build/252722933 at 2024-03-16 - hsaml2 # failure in job https://hydra.nixos.org/build/233252618 at 2023-09-02 + - hs-asapo # failure in job https://hydra.nixos.org/build/273456994 at 2024-10-01 - hsautogui # failure in job https://hydra.nixos.org/build/253687662 at 2024-03-31 - hsay # failure in job https://hydra.nixos.org/build/233218925 at 2023-09-02 - hsbc # failure in job https://hydra.nixos.org/build/233206310 at 2023-09-02 @@ -2925,6 +2938,7 @@ broken-packages: - HTicTacToe # failure in job https://hydra.nixos.org/build/233235397 at 2023-09-02 - htiled # failure in job https://hydra.nixos.org/build/233219305 at 2023-09-02 - htlset # failure in job https://hydra.nixos.org/build/233203886 at 2023-09-02 + - html-email-validate # failure in job https://hydra.nixos.org/build/270088744 at 2024-08-31 - html-rules # failure in job https://hydra.nixos.org/build/233200615 at 2023-09-02 - html-tokenizer # failure in job https://hydra.nixos.org/build/233243581 at 2023-09-02 - htmx # failure in job https://hydra.nixos.org/build/269658709 at 2024-08-19 @@ -4254,6 +4268,7 @@ broken-packages: - OpenCLRaw # failure in job https://hydra.nixos.org/build/233247133 at 2023-09-02 - OpenCLWrappers # failure in job https://hydra.nixos.org/build/233222391 at 2023-09-02 - opencog-atomspace # failure in job https://hydra.nixos.org/build/233237785 at 2023-09-02 + - opencv-extra # broken eval by missing system dependency - opencv # failure in job https://hydra.nixos.org/build/252717564 at 2024-03-16 - opencv-raw # failure in job https://hydra.nixos.org/build/233211286 at 2023-09-02 - opendatatable # failure in job https://hydra.nixos.org/build/233254960 at 2023-09-02 @@ -4682,6 +4697,8 @@ broken-packages: - postgresql-config # failure in job https://hydra.nixos.org/build/233197788 at 2023-09-02 - postgresql-cube # failure in job https://hydra.nixos.org/build/233195283 at 2023-09-02 - PostgreSQL # failure in job https://hydra.nixos.org/build/233258066 at 2023-09-02 + - postgresql-libpq-configure # doesn't declare system deps, but only needed for postgresql-libpq >= 0.11 + - postgresql-libpq-pkgconfig # doesn't declare system deps, but only needed for postgresql-libpq >= 0.11 - postgresql-lo-stream # failure in job https://hydra.nixos.org/build/233194012 at 2023-09-02 - postgresql-ltree # failure in job https://hydra.nixos.org/build/233199998 at 2023-09-02 - postgresql-named # failure in job https://hydra.nixos.org/build/233241920 at 2023-09-02 @@ -4800,6 +4817,7 @@ broken-packages: - proof-assistant-bot # failure in job https://hydra.nixos.org/build/234974688 at 2023-09-13 - proof-combinators # failure in job https://hydra.nixos.org/build/233210521 at 2023-09-02 - PropaFP # failure in job https://hydra.nixos.org/build/233206496 at 2023-09-02 + - propeller # failure in job https://hydra.nixos.org/build/273449652 at 2024-10-01 - Proper # failure in job https://hydra.nixos.org/build/233194417 at 2023-09-02 - properties # failure in job https://hydra.nixos.org/build/233240862 at 2023-09-02 - property-list # failure in job https://hydra.nixos.org/build/233254907 at 2023-09-02 @@ -5259,7 +5277,6 @@ broken-packages: - sde-solver # failure in job https://hydra.nixos.org/build/233251017 at 2023-09-02 - sdl2-cairo-image # failure in job https://hydra.nixos.org/build/233210135 at 2023-09-02 - sdl2-compositor # failure in job https://hydra.nixos.org/build/233198910 at 2023-09-02 - - sdl2 # failure in job https://hydra.nixos.org/build/269670352 at 2024-08-19 - sdl2-fps # failure in job https://hydra.nixos.org/build/233195346 at 2023-09-02 - sdl2-image # failure in job https://hydra.nixos.org/build/233216837 at 2023-09-02 - sdl2-mixer # failure in job https://hydra.nixos.org/build/233228951 at 2023-09-02 @@ -5492,6 +5509,7 @@ broken-packages: - sint # failure in job https://hydra.nixos.org/build/233238431 at 2023-09-02 - siphash # failure in job https://hydra.nixos.org/build/233199344 at 2023-09-02 - sitepipe # failure in job https://hydra.nixos.org/build/233201989 at 2023-09-02 + - si-timers # failure in job https://hydra.nixos.org/build/273467737 at 2024-10-01 - sixfiguregroup # failure in job https://hydra.nixos.org/build/233252141 at 2023-09-02 - sixty-five-oh-two # failure in job https://hydra.nixos.org/build/252714578 at 2024-03-16 - sized-grid # failure in job https://hydra.nixos.org/build/233239056 at 2023-09-02 @@ -5501,6 +5519,7 @@ broken-packages: - sjsp # failure in job https://hydra.nixos.org/build/233225141 at 2023-09-02 - SJW # failure in job https://hydra.nixos.org/build/233209689 at 2023-09-02 - skeletal-set # failure in job https://hydra.nixos.org/build/233254711 at 2023-09-02 + - skeletest # failure in job https://hydra.nixos.org/build/270083279 at 2024-08-31 - skell # failure in job https://hydra.nixos.org/build/233245484 at 2023-09-02 - skemmtun # failure in job https://hydra.nixos.org/build/233223893 at 2023-09-02 - skews # timeout @@ -5774,7 +5793,9 @@ broken-packages: - strict-ghc-plugin # failure in job https://hydra.nixos.org/build/233246830 at 2023-09-02 - strict-impl-params # failure in job https://hydra.nixos.org/build/252732248 at 2024-03-16 - strictly # failure in job https://hydra.nixos.org/build/233197142 at 2023-09-02 + - strict-mvar # failure in job https://hydra.nixos.org/build/273459853 at 2024-10-01 - strict-optics # failure in job https://hydra.nixos.org/build/267983907 at 2024-07-31 + - strict-stm # failure in job https://hydra.nixos.org/build/273449297 at 2024-10-01 - strict-tuple-lens # failure in job https://hydra.nixos.org/build/233194548 at 2023-09-02 - strict-writer # failure in job https://hydra.nixos.org/build/252725649 at 2024-03-16 - string-class # failure in job https://hydra.nixos.org/build/233230041 at 2023-09-02 @@ -5879,7 +5900,6 @@ broken-packages: - system-command # failure in job https://hydra.nixos.org/build/233239356 at 2023-09-02 - systemd-ntfy # failure in job https://hydra.nixos.org/build/236686880 at 2023-10-04 - system-extra # failure in job https://hydra.nixos.org/build/233203137 at 2023-09-02 - - system-fileio # failure in job https://hydra.nixos.org/build/252731084 at 2024-03-16 - system-inotify # failure in job https://hydra.nixos.org/build/233206871 at 2023-09-02 - system-lifted # failure in job https://hydra.nixos.org/build/233236013 at 2023-09-02 - system-linux-proc # failure in job https://hydra.nixos.org/build/233209447 at 2023-09-02 @@ -6086,6 +6106,7 @@ broken-packages: - tiger # failure in job https://hydra.nixos.org/build/233249333 at 2023-09-02 - TigerHash # failure in job https://hydra.nixos.org/build/233208162 at 2023-09-02 - tightrope # failure in job https://hydra.nixos.org/build/233215237 at 2023-09-02 + - tiktoken # failure in job https://hydra.nixos.org/build/273448419 at 2024-10-01 - tikzsd # failure in job https://hydra.nixos.org/build/233224431 at 2023-09-02 - timecalc # failure in job https://hydra.nixos.org/build/233207970 at 2023-09-02 - time-extras # failure in job https://hydra.nixos.org/build/233204030 at 2023-09-02 @@ -6131,6 +6152,7 @@ broken-packages: - tokenify # failure in job https://hydra.nixos.org/build/233249392 at 2023-09-02 - tokenizer # failure in job https://hydra.nixos.org/build/233259112 at 2023-09-02 - tokenizer-streaming # failure in job https://hydra.nixos.org/build/233232725 at 2023-09-02 + - token-limiter-concurrent # failure in job https://hydra.nixos.org/build/270092009 at 2024-08-31 - token-limiter # failure in job https://hydra.nixos.org/build/233255093 at 2023-09-02 - token-search # failure in job https://hydra.nixos.org/build/233212111 at 2023-09-02 - tokyocabinet-haskell # failure in job https://hydra.nixos.org/build/233193492 at 2023-09-02 @@ -6251,6 +6273,8 @@ broken-packages: - typed-fsm # failure in job https://hydra.nixos.org/build/269663128 at 2024-08-19 - typed-process-effectful # failure in job https://hydra.nixos.org/build/236684332 at 2023-10-04 - typedquery # failure in job https://hydra.nixos.org/build/233215307 at 2023-09-02 + - typed-session # failure in job https://hydra.nixos.org/build/270089993 at 2024-08-31 + - typed-session-state-algorithm # failure in job https://hydra.nixos.org/build/273462641 at 2024-10-01 - typed-spreadsheet # failure in job https://hydra.nixos.org/build/233248967 at 2023-09-02 - typed-time # failure in job https://hydra.nixos.org/build/233246930 at 2023-09-02 - typed-wire # failure in job https://hydra.nixos.org/build/233237626 at 2023-09-02 @@ -6307,6 +6331,7 @@ broken-packages: - unboxed # failure in job https://hydra.nixos.org/build/233219555 at 2023-09-02 - unboxed-references # failure in job https://hydra.nixos.org/build/233192713 at 2023-09-02 - unbreak # failure in job https://hydra.nixos.org/build/233242560 at 2023-09-02 + - uncertain # failure in job https://hydra.nixos.org/build/273461304 at 2024-10-01 - unescaping-print # failure in job https://hydra.nixos.org/build/252736030 at 2024-03-16 - unfix-binders # failure in job https://hydra.nixos.org/build/233259262 at 2023-09-02 - unfoldable # failure in job https://hydra.nixos.org/build/252721990 at 2024-03-16 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index a51a50abe0bd9..15bb0c4217820 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -34,6 +34,8 @@ default-package-overrides: - chs-cabal < 0.1.1.2 # Incompatible with Cabal < 3.12 # 2024-08-17: Stackage doesn't contain hnix-store-core >= 0.8 yet, so we need to restrict hnix-store-remote - hnix-store-remote < 0.7 + # 2024-09-12: match xmonad 0.17.* from Stackage LTS + - xmonad-contrib < 0.18.1 extra-packages: @@ -64,6 +66,7 @@ extra-packages: - ghc-exactprint == 1.5.* # 2023-03-30: needed for GHC == 9.2 - ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4 - ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8 + - ghc-exactprint == 1.9.* # 2024-08-27: needed for GHC == 9.10 - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0 - ghc-lib == 9.8.* # 2024-05-19: preserve for GHC 9.8 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0 @@ -76,6 +79,7 @@ extra-packages: - haddock-api == 2.23.* # required on GHC < 8.10.x - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy == 1.19.12 # for ghcjs + - hashable == 1.4.7.0 # allows GHC 9.10 - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - ansi-wl-pprint >= 0.6 && < 0.7 # 2024-03-23: required for ghcjs - hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 12634d4e314cd..4384b2254f463 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 22.31 +# Stackage LTS 22.33 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -419,7 +419,7 @@ default-package-overrides: - autodocodec-yaml ==0.2.0.3 - autoexporter ==2.0.0.12 - auto-update ==0.1.6 - - avro ==0.6.2.0 + - avro ==0.6.2.1 - aws ==0.24.1 - aws-cloudfront-signed-cookies ==0.2.0.12 - aws-sns-verify ==0.0.0.3 @@ -603,7 +603,7 @@ default-package-overrides: - case-insensitive ==1.2.1.0 - cases ==0.1.4.3 - casing ==0.1.4.1 - - cassava ==0.5.3.1 + - cassava ==0.5.3.2 - cassava-conduit ==0.6.6 - cassava-megaparsec ==2.0.4 - cast ==0.1.0.2 @@ -1084,11 +1084,11 @@ default-package-overrides: - fields-json ==0.4.0.0 - file-embed ==0.0.16.0 - file-embed-lzma ==0.0.1 - - file-io ==0.1.2 + - file-io ==0.1.4 - filelock ==0.1.1.7 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - - filepath-bytestring ==1.4.2.1.13 + - filepath-bytestring ==1.4.100.3.2 - file-path-th ==0.1.0.0 - filepattern ==0.1.3 - fileplow ==0.1.0.0 @@ -1334,7 +1334,7 @@ default-package-overrides: - handwriting ==0.1.0.3 - happstack-jmacro ==7.0.12.6 - happstack-server ==7.8.0.2 - - happstack-server-tls ==7.2.1.5 + - happstack-server-tls ==7.2.1.6 - happy ==1.20.1.1 - happy-meta ==0.2.1.0 - HasBigDecimal ==0.2.0.0 @@ -1373,7 +1373,7 @@ default-package-overrides: - hasty-hamiltonian ==1.3.4 - HaTeX ==3.22.4.2 - HaXml ==1.25.13 - - haxr ==3000.11.5 + - haxr ==3000.11.5.1 - HCodecs ==0.5.2 - hdaemonize ==0.5.7 - HDBC ==2.4.0.4 @@ -1418,7 +1418,7 @@ default-package-overrides: - hledger-iadd ==1.3.20 - hledger-interest ==1.6.6 - hledger-lib ==1.32.3 - - hledger-stockquotes ==0.1.2.1 + - hledger-stockquotes ==0.1.3.1 - hledger-web ==1.32.3 - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 @@ -1969,7 +1969,7 @@ default-package-overrides: - mongoDB ==2.7.1.4 - monoidal-containers ==0.6.5.0 - monoidal-functors ==0.2.3.0 - - monoid-extras ==0.6.2 + - monoid-extras ==0.6.3 - monoid-subclasses ==1.2.5.1 - monoid-transformer ==0.0.4 - monomer ==1.6.0.1 @@ -2083,7 +2083,7 @@ default-package-overrides: - numeric-prelude ==0.4.4 - numeric-quest ==0.2.0.2 - numhask ==0.11.1.0 - - numhask-array ==0.11.0.1 + - numhask-array ==0.11.1.0 - numhask-space ==0.11.1.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.3 @@ -2229,6 +2229,7 @@ default-package-overrides: - persistent-template ==2.12.0.0 - persistent-test ==2.13.1.3 - persistent-typed-db ==0.1.0.7 + - pfile ==0.1.0.1 - pg-harness-client ==0.6.0 - pg-transact ==0.3.2.0 - phantom-state ==0.2.1.4 @@ -2253,6 +2254,7 @@ default-package-overrides: - pipes-safe ==2.3.5 - pipes-text ==1.0.1 - pipes-wai ==3.2.0 + - pipes-zlib ==0.4.4.2 - pkgtreediff ==0.6.0 - place-cursor-at ==1.0.1 - placeholders ==0.1 @@ -2498,7 +2500,7 @@ default-package-overrides: - rosezipper ==0.2 - rot13 ==0.2.0.1 - row-types ==1.0.1.2 - - rpmbuild-order ==0.4.11 + - rpmbuild-order ==0.4.12 - rpm-nvr ==0.1.2 - rp-tree ==0.7.1 - rrb-vector ==0.2.1.0 @@ -2572,7 +2574,7 @@ default-package-overrides: - seqalign ==0.2.0.4 - seqid ==0.6.3 - seqid-streams ==0.7.2 - - sequence-formats ==1.8.0.1 + - sequence-formats ==1.8.1.0 - sequenceTools ==1.5.3.1 - serialise ==0.2.6.1 - servant ==0.20.1 @@ -2628,7 +2630,7 @@ default-package-overrides: - shake-language-c ==0.12.0 - shake-plus ==0.3.4.0 - shake-plus-extended ==0.4.1.0 - - shakespeare ==2.1.0.1 + - shakespeare ==2.1.1 - shakespeare-text ==1.1.0 - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 @@ -2886,7 +2888,7 @@ default-package-overrides: - teardown ==0.5.0.1 - tempgres-client ==1.0.0 - template ==0.2.0.10 - - template-haskell-compat-v0208 ==0.1.9.3 + - template-haskell-compat-v0208 ==0.1.9.4 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 @@ -3147,7 +3149,7 @@ default-package-overrides: - vector-buffer ==0.4.1 - vector-builder ==0.3.8.5 - vector-bytes-instances ==0.1.1 - - vector-extras ==0.2.8.1 + - vector-extras ==0.2.8.2 - vector-hashtables ==0.1.2.0 - vector-instances ==3.4.2 - vector-mmap ==0.0.3 @@ -3245,7 +3247,7 @@ default-package-overrides: - writer-cps-transformers ==0.5.6.1 - ws ==0.0.6 - wss-client ==0.3.0.0 - - wuss ==2.0.1.9 + - wuss ==2.0.2.0 - X11 ==1.10.3 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 @@ -3280,7 +3282,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.9 + - Yampa ==0.14.10 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index b5c5719ff0d2e..721cb18a84756 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -22,7 +22,6 @@ dont-distribute-packages: - Advise-me - AlgoRhythm - AlignmentAlgorithms - - Allure - AndroidViewHierarchyImporter - Annotations - ApplePush @@ -247,7 +246,6 @@ dont-distribute-packages: - KiCS-prophecy - LDAPv3 - LPPaver - - LambdaHack - LambdaINet - LambdaPrettyQuote - LambdaShell @@ -485,7 +483,6 @@ dont-distribute-packages: - ampersand - amqp-streamly - analyze-client - - anansi - anansi-hscolour - anatomy - animate-example @@ -574,6 +571,7 @@ dont-distribute-packages: - aviation-weight-balance - awesomium - awesomium-glut + - aws-arn - aws-configuration-tools - aws-dynamodb-conduit - aws-dynamodb-streams @@ -675,7 +673,6 @@ dont-distribute-packages: - bitmaps - bittorrent - bla - - blacktip - blakesum-demo - blastxml - blatex @@ -783,6 +780,7 @@ dont-distribute-packages: - category - category-extras - cattrap + - cauldron - cctools-workqueue - cef3-simple - ceilometer-common @@ -825,7 +823,6 @@ dont-distribute-packages: - chu2 - chuchu - chunks - - circuit-notation - citation-resolve - citeproc-hs-pandoc-filter - clac @@ -833,17 +830,7 @@ dont-distribute-packages: - claferIG - claferwiki - clash - - clash-ghc - - clash-lib - clash-lib-hedgehog - - clash-multisignal - - clash-prelude-hedgehog - - clash-prelude-quickcheck - - clash-shake - - clash-systemverilog - - clash-verilog - - clash-vhdl - - clashilator - classify-frog - classy-effects - classy-effects-th @@ -1145,7 +1132,6 @@ dont-distribute-packages: - direct-rocksdb - directory-contents - dirfiles - - dirstream - discogs-haskell - discord-gateway - discord-hs @@ -1418,6 +1404,9 @@ dont-distribute-packages: - fpnla-examples - frame-markdown - freckle-app + - freckle-http + - freckle-memcached + - freckle-otel - free-functors - free-game - free-theorems-seq-webui @@ -1438,6 +1427,8 @@ dont-distribute-packages: - frpnow-gtk - frpnow-gtk3 - frpnow-vty + - fs-api + - fs-sim - ftdi - ftp-client-conduit - ftree @@ -2213,6 +2204,8 @@ dont-distribute-packages: - hsyslog-tcp - html-kure - html2hamlet + - htmx-lucid + - htmx-servant - htoml-parse - htsn-import - http-client-auth @@ -2276,7 +2269,6 @@ dont-distribute-packages: - hyperpublic - i - iException - - ice40-prim - ide-backend - ide-backend-server - ideas-math @@ -2333,6 +2325,7 @@ dont-distribute-packages: - introduction-test - intset - invertible-hlist + - io-classes-mtl - ion - ipatch - ipc @@ -2569,7 +2562,6 @@ dont-distribute-packages: - linnet-conduit - linux-ptrace - lio-eci11 - - lion - liquid-base - liquid-bytestring - liquid-containers @@ -2585,6 +2577,7 @@ dont-distribute-packages: - list-t-html-parser - list-tuple - list-witnesses + - list1 - listenbrainz-client - liszt - lit @@ -2764,7 +2757,6 @@ dont-distribute-packages: - monetdb-mapi - mongrel2-handler - monky - - monomer - monomer-flatpak-example - monte-carlo - moo @@ -2913,7 +2905,7 @@ dont-distribute-packages: - nonlinear-optimization-backprop - not-gloss - not-gloss-examples - - nothunks_0_2_1_1 + - nothunks_0_3_0_0 - notmuch-web - now-haskell - nri-env-parser @@ -2963,7 +2955,6 @@ dont-distribute-packages: - opc-xml-da-client - open-adt-tutorial - open-typerep - - opencv-extra - openpgp-Crypto - openpgp-crypto-api - openssh-github-keys @@ -3154,6 +3145,7 @@ dont-distribute-packages: - poseidon - poseidon-postgis - postgresql-common-persistent + - postgresql-libpq_0_11_0_0 - postgresql-pure - postgresql-simple-ltree - postgresql-simple-queue @@ -3302,6 +3294,7 @@ dont-distribute-packages: - rc - rdf4h-vocab-activitystreams - rdioh + - rds-data - react-flux-servant - reactive - reactive-banana-sdl @@ -3399,8 +3392,6 @@ dont-distribute-packages: - restricted-workers - rethinkdb-model - rethinkdb-wereHamster - - retroclash-lib - - retroclash-sim - rewrite - rewriting - rezoom @@ -3463,6 +3454,7 @@ dont-distribute-packages: - rv - s-expression - safe-coloured-text-layout-gen + - safe-coloured-text-layout-gen_0_0_0_1 - safe-coupling - safe-failure - safe-failure-cme @@ -3521,11 +3513,7 @@ dont-distribute-packages: - scrabble-bot - scrapbook - scroll - - sdl-try-drivers - - sdl2-cairo - - sdl2-gfx - sdl2-sprite - - sdl2-ttf - sdp-binary - sdp-deepseq - sdp-hashable @@ -3555,11 +3543,11 @@ dont-distribute-packages: - seqloc-datafiles - sequor - serdoc-binary - - serial-test-generators - serpentine - serv - serv-wai - servant-aeson-generics-typescript + - servant-auth-client_0_4_2_0 - servant-auth-hmac - servant-auth-token - servant-auth-token-acid @@ -3820,8 +3808,10 @@ dont-distribute-packages: - syb-with-class-instances-text - sydtest-amqp - sydtest-webdriver-screenshot + - sydtest-webdriver-screenshot_0_1_0_0 - sydtest-webdriver-yesod - sydtest-yesod + - sydtest_0_17_0_0 - sylvia - symantic-atom - symantic-http-demo @@ -4004,6 +3994,7 @@ dont-distribute-packages: - type-sub-th - typed-admin - typed-encoding-encoding + - typed-gui - typed-streams - typedflow - typelevel @@ -4185,6 +4176,9 @@ dont-distribute-packages: - wheb-strapped - whitespace - wholepixels + - wikimusic-api + - wikimusic-api-spec + - wikimusic-ssr - wikipedia4epub - wild-bind-indicator - wild-bind-task-x11 @@ -4290,7 +4284,6 @@ dont-distribute-packages: - yesod-raml-bin - yesod-raml-docs - yesod-raml-mock - - yesod-routes-flow - yesod-routes-typescript - yesod-session-redis - yesod-worker diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 5d668f49ba722..6400e5246aea9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -129,6 +129,9 @@ self: super: builtins.intersectAttrs super { # Link the proper version. zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; + # cabal2nix incorrectly resolves this to pkgs.zip (could be improved over there). + streamly-zip = super.streamly-zip.override { zip = pkgs.libzip; }; + threadscope = enableSeparateBinOutput super.threadscope; # Use the default version of mysql to build this package (which is actually mariadb). @@ -297,7 +300,7 @@ self: super: builtins.intersectAttrs super { [ (disableHardening ["fortify"]) (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools) ] ++ - ( if pkgs.stdenv.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] ) + ( if pkgs.stdenv.hostPlatform.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] ) ); gtksourceview2 = addPkgconfigDepend pkgs.gtk2 super.gtksourceview2; gtk-traymanager = addPkgconfigDepend pkgs.gtk3 super.gtk-traymanager; @@ -582,7 +585,7 @@ self: super: builtins.intersectAttrs super { # # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate, # so disable this on Darwin only - ${if pkgs.stdenv.isDarwin then null else "GLUT"} = overrideCabal (drv: { + ${if pkgs.stdenv.hostPlatform.isDarwin then null else "GLUT"} = overrideCabal (drv: { pkg-configDepends = drv.pkg-configDepends or [] ++ [ pkgs.freeglut ]; @@ -820,9 +823,9 @@ self: super: builtins.intersectAttrs super { # https://git-annex.branchable.com/git-annex-shell/ passthru.shellPath = "/bin/git-annex-shell"; }) (super.git-annex.override { - dbus = if pkgs.stdenv.isLinux then self.dbus else null; - fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; - hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; + dbus = if pkgs.stdenv.hostPlatform.isLinux then self.dbus else null; + fdo-notify = if pkgs.stdenv.hostPlatform.isLinux then self.fdo-notify else null; + hinotify = if pkgs.stdenv.hostPlatform.isLinux then self.hinotify else self.fsnotify; }); # The test suite has undeclared dependencies on git. @@ -1364,10 +1367,12 @@ self: super: builtins.intersectAttrs super { }) super) gi-javascriptcore gi-webkit2webextension - gi-gtk_4_0_8 + gi-gtk_4_0_9 gi-gdk_4_0_8 gi-gsk gi-adwaita + sdl2-ttf + sdl2 ; webkit2gtk3-javascriptcore = lib.pipe super.webkit2gtk3-javascriptcore [ diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 23dc5054a854f..92c2451a5df1c 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -53,7 +53,7 @@ in # TODO enable shared libs for cross-compiling , enableSharedExecutables ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) -, enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin +, enableDeadCodeElimination ? (!stdenv.hostPlatform.isDarwin) # TODO: use -dead_strip for darwin # Disabling this for ghcjs prevents this crash: https://gitlab.haskell.org/ghc/ghc/-/issues/23235 , enableStaticLibraries ? !(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isWasm || stdenv.hostPlatform.isGhcjs) , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows @@ -242,8 +242,8 @@ let "--with-gcc=$CC" # Clang won't work without that extra information. ] ++ [ "--package-db=$packageConfDir" - (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/${ghcLibdir}/${pname}-${version}") - (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") + (optionalString (enableSharedExecutables && stdenv.hostPlatform.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/${ghcLibdir}/${pname}-${version}") + (optionalString (enableSharedExecutables && stdenv.hostPlatform.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding (makeGhcOptions [ "-j$NIX_BUILD_CORES" "+RTS" "-A64M" "-RTS" ])) (optionalString useCpphs ("--with-cpphs=${cpphs}/bin/cpphs " + (makeGhcOptions [ "-cpp" "-pgmP${cpphs}/bin/cpphs" "-optP--cpp" ]))) (enableFeature enableLibraryProfiling "library-profiling") @@ -501,7 +501,7 @@ stdenv.mkDerivation ({ # the `$out/lib/links` directory to read-only when the build is done after the # dist directory has already been exported, which triggers an unnecessary # rebuild of modules included in the exported dist directory. - + (optionalString (stdenv.isDarwin && (enableSharedLibraries || enableSharedExecutables) && !enableSeparateIntermediatesOutput) '' + + (optionalString (stdenv.hostPlatform.isDarwin && (enableSharedLibraries || enableSharedExecutables) && !enableSeparateIntermediatesOutput) '' # Work around a limit in the macOS Sierra linker on the number of paths # referenced by any one dynamic library: # diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 067237427b2d5..5502eb1703785 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -814,16 +814,14 @@ self: { , containers, data-hash, deepseq, directory, dlist, edit-distance , emacs, equivalence, exceptions, filepath, ghc-compact, gitrev , happy, hashable, haskeline, monad-control, mtl, murmur-hash - , parallel, peano, pretty, process, regex-tdfa, split, stm - , STMonadTrans, strict, text, time, time-compat, transformers + , parallel, peano, pqueue, pretty, process, regex-tdfa, split, stm + , STMonadTrans, strict, text, time, transformers , unordered-containers, uri-encode, vector, vector-hashtables, zlib }: mkDerivation { pname = "Agda"; - version = "2.6.4.3"; - sha256 = "18h3vwj182sp6pkh4274x0b3qg3cn3v0571jicabqhvxqmpckvbl"; - revision = "1"; - editedCabalFile = "0z1zbj4gba5xqgrb3lz3fpmsv6mv8zyrhvl4338k8xc22m5ns1m8"; + version = "2.7.0"; + sha256 = "005rsk46b7rl516n58cfzg5aqzqwb1gkz7wpz2lqg0qlrlw0jyh0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -833,8 +831,8 @@ self: { bytestring case-insensitive containers data-hash deepseq directory dlist edit-distance equivalence exceptions filepath ghc-compact gitrev hashable haskeline monad-control mtl murmur-hash parallel - peano pretty process regex-tdfa split stm STMonadTrans strict text - time time-compat transformers unordered-containers uri-encode + peano pqueue pretty process regex-tdfa split stm STMonadTrans + strict text time transformers unordered-containers uri-encode vector vector-hashtables zlib ]; libraryToolDepends = [ alex happy ]; @@ -994,7 +992,6 @@ self: { description = "Near-future Sci-Fi roguelike and tactical squad combat game"; license = lib.licenses.agpl3Plus; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "Allure"; }) {}; @@ -2127,7 +2124,7 @@ self: { license = lib.licenses.mit; }) {}; - "Blammo_2_0_0_0" = callPackage + "Blammo_2_1_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist , envparse, exceptions, fast-logger, hspec, lens, markdown-unlit , monad-logger-aeson, mtl, text, time, unliftio, unliftio-core @@ -2135,8 +2132,8 @@ self: { }: mkDerivation { pname = "Blammo"; - version = "2.0.0.0"; - sha256 = "1f51pyvxq5is5j942b0iqbadnkdjxb8gyzcqvb0wic9ba594hwkn"; + version = "2.1.1.0"; + sha256 = "0n0vybpqvdi20jgdmzpbcb87a96s7npa1gbmvqplc0sqlnrx2cx6"; libraryHaskellDepends = [ aeson base bytestring containers dlist envparse exceptions fast-logger lens monad-logger-aeson mtl text time unliftio @@ -2159,8 +2156,8 @@ self: { }: mkDerivation { pname = "Blammo-wai"; - version = "0.0.0.1"; - sha256 = "1w63xyjsrhn2hsi0gw2xca8464r4mk3sj3bwkidsa28m73xz93xb"; + version = "0.0.0.2"; + sha256 = "1yblxnjfmcjnlr76b1vs9wdjq9rnm3mgjhi3f472a69v1pbg9ngi"; libraryHaskellDepends = [ aeson base Blammo bytestring case-insensitive clock http-types monad-logger-aeson text unliftio-core wai @@ -3368,6 +3365,25 @@ self: { license = lib.licenses.mit; }) {}; + "ChasingBottoms_1_3_1_15" = callPackage + ({ mkDerivation, array, base, containers, mtl, QuickCheck, random + , syb + }: + mkDerivation { + pname = "ChasingBottoms"; + version = "1.3.1.15"; + sha256 = "0if8h6xq10y1xa90cwmx2jkxjn9628rzs8y6fsjmpjdcvcyr5wnj"; + libraryHaskellDepends = [ + base containers mtl QuickCheck random syb + ]; + testHaskellDepends = [ + array base containers mtl QuickCheck random syb + ]; + description = "For testing partial and infinite values"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "CheatSheet" = callPackage ({ mkDerivation, base, containers, directory }: mkDerivation { @@ -11510,6 +11526,21 @@ self: { license = lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_7_8" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.7.8"; + sha256 = "0y46ygdyi195d2ns74gbyabwrvnh5w10xqxdd6jrw43f70jsa5xw"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -13196,7 +13227,6 @@ self: { description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "LambdaHack"; }) {}; @@ -14349,17 +14379,17 @@ self: { "MicroHs" = callPackage ({ mkDerivation, base, deepseq, directory, ghc-prim, haskeline - , process, time + , process, text, time }: mkDerivation { pname = "MicroHs"; - version = "0.9.14.0"; - sha256 = "0b5bivfis0xc81nnld82jgwcpk6mkpcn09w00l53fab2a88jkxq0"; + version = "0.9.17.0"; + sha256 = "00dvbpdpbx1dh44rixsw16gb748bdxiizdivnl3i4v9826hfx8x0"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base deepseq directory ghc-prim haskeline process time + base deepseq directory ghc-prim haskeline process text time ]; description = "A compiler for Haskell"; license = lib.licenses.asl20; @@ -23343,8 +23373,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.9"; - sha256 = "0khlr63l3xrhylapr5ql62b3kzfak97vlz1cjd15pzfain7pvbds"; + version = "0.14.10"; + sha256 = "1la2v70pzjmvw4j0v5sacb6vxclby86jx68jq6czzxyrl8ydijzc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26106,6 +26136,8 @@ self: { pname = "aeson"; version = "2.2.3.0"; sha256 = "1akbrh8iz47f0ai30yabg1n4vcf1fx0a9gzj45fx0si553s5r8ns"; + revision = "2"; + editedCabalFile = "0rl8llwk5cjxdryar3yy5pa6gc4vj7f5m0jwxjjim0ksgpba47q1"; libraryHaskellDepends = [ base bytestring character-ps containers data-fix deepseq dlist exceptions generically ghc-prim hashable indexed-traversable @@ -36499,6 +36531,7 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "anansi"; + broken = true; }) {}; "anansi-hscolour" = callPackage @@ -37206,6 +37239,19 @@ self: { mainProgram = "ironforge-yesod"; }) {}; + "antelude" = callPackage + ({ mkDerivation, array, base, bytestring, containers, HUnit, text + }: + mkDerivation { + pname = "antelude"; + version = "0.1.0"; + sha256 = "1wzv4i5bcpkn0vij5z7abn1y323bnpbfjjlc6qfjcjh9857jm632"; + libraryHaskellDepends = [ array base bytestring containers text ]; + testHaskellDepends = [ base HUnit ]; + description = "Yet another alternative Prelude for Haskell"; + license = lib.licenses.mit; + }) {}; + "antfarm" = callPackage ({ mkDerivation, base, containers, HUnit, minimorph, mtl, parsec , test-framework, test-framework-hunit, text, transformers @@ -38135,24 +38181,25 @@ self: { }) {}; "api-tools" = callPackage - ({ mkDerivation, aeson, aeson-pretty, alex, array, attoparsec, base - , base16-bytestring, base64-bytestring, bytestring - , case-insensitive, cborg, containers, criterion, deepseq, happy - , lens, QuickCheck, regex-base, regex-tdfa, safe, safecopy - , scientific, serialise, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, unordered-containers, vector + ({ mkDerivation, aeson, aeson-pretty, alex, array, attoparsec + , attoparsec-aeson, base, base16-bytestring, base64-bytestring + , bytestring, case-insensitive, cborg, containers, criterion + , deepseq, happy, lens, QuickCheck, regex-base, regex-tdfa, safe + , safecopy, scientific, serialise, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, time + , unordered-containers, vector }: mkDerivation { pname = "api-tools"; - version = "0.10.1.0"; - sha256 = "1lmgjixga0jsli98xs6yi09pcgn9d44h9hd2gy17d30mzlyfrpx4"; + version = "0.10.1.1"; + sha256 = "19sfnzbyjl19rm0hyz5w9lpw4dsp4dns74jwn2d7ga6rzp2jp59z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty array attoparsec base base16-bytestring - base64-bytestring bytestring case-insensitive cborg containers - deepseq lens QuickCheck regex-base regex-tdfa safe safecopy - scientific serialise template-haskell text time + aeson aeson-pretty array attoparsec attoparsec-aeson base + base16-bytestring base64-bytestring bytestring case-insensitive + cborg containers deepseq lens QuickCheck regex-base regex-tdfa safe + safecopy scientific serialise template-haskell text time unordered-containers vector ]; libraryToolDepends = [ alex happy ]; @@ -38703,16 +38750,16 @@ self: { "apple" = callPackage ({ mkDerivation, alex, array, base, bytestring, c2hs , composition-prelude, containers, cpphs, criterion, deepseq - , directory, dom-lt, erf, extra, filepath, happy, haskeline - , hypergeometric, libffi, microlens, microlens-mtl, mtl + , directory, dom-lt, erf, extra, fast-arithmetic, filepath, happy + , haskeline, hypergeometric, libffi, microlens, microlens-mtl, mtl , optparse-applicative, prettyprinter, process, QuickCheck, split - , statistics, tasty, tasty-hunit, temporary, text, transformers - , unix + , statistics, tasty, tasty-hunit, tasty-quickcheck, temporary, text + , transformers, unix }: mkDerivation { pname = "apple"; - version = "0.1.0.0"; - sha256 = "02xrw3q1i4aswbvvzl8rv9v2vwhyk86i3yklwqwpc9jh7bxh8262"; + version = "0.2.0.0"; + sha256 = "0si1yqwplmxggfd4gifakk9hy2fwycgb4m6vhmzwpx08gjwdls08"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -38728,8 +38775,9 @@ self: { split text transformers ]; testHaskellDepends = [ - base bytestring directory filepath hypergeometric process tasty - tasty-hunit temporary text + base bytestring directory fast-arithmetic filepath hypergeometric + process QuickCheck tasty tasty-hunit tasty-quickcheck temporary + text ]; testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ @@ -41604,8 +41652,8 @@ self: { pname = "async"; version = "2.2.5"; sha256 = "1xqnixmcxbird7rxl124bn5swpyyxxx2jxpdsbx2l8drp8z4f60q"; - revision = "1"; - editedCabalFile = "1y1cd3dkllrwbqj9ca8rr4vv2v751vrvia0kkq4qv5ajbxh9wpcx"; + revision = "2"; + editedCabalFile = "0ddz3q3b478ahz8q0b3ni2b3ikw1sjc2p89j1p530670m3xnm7ng"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -42763,6 +42811,8 @@ self: { pname = "attoparsec-iso8601"; version = "1.1.1.0"; sha256 = "0yn9l9drza1wcj59a9dzm4vnihwmsxk6zd3fqg6kgww1an8x3k9l"; + revision = "1"; + editedCabalFile = "0chjsgkkdvnj6zps4gj80dwdfxmic1dal0cs5jfmrw8jalkqflzl"; libraryHaskellDepends = [ attoparsec base integer-conversion text time time-compat ]; @@ -43308,18 +43358,18 @@ self: { license = lib.licenses.mit; }) {}; - "autodocodec_0_4_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , hashable, mtl, scientific, text, time, unordered-containers - , validity, validity-scientific, vector + "autodocodec_0_4_2_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist + , doctest, hashable, mtl, scientific, text, time + , unordered-containers, validity, validity-scientific, vector }: mkDerivation { pname = "autodocodec"; - version = "0.4.0.0"; - sha256 = "0rlv4w51is5fis2vi58wgyldsr5wv5qyiv3js5nx8zp594sh9xrm"; + version = "0.4.2.2"; + sha256 = "1m6mhss3iw49xsc0yr663hy9prkwwwsbzg82mi27z4iq4v0hdmm6"; libraryHaskellDepends = [ - aeson base bytestring containers hashable mtl scientific text time - unordered-containers validity validity-scientific vector + aeson base bytestring containers dlist hashable mtl scientific text + time unordered-containers validity validity-scientific vector ]; testHaskellDepends = [ base doctest ]; description = "Self-documenting encoder and decoder"; @@ -43333,8 +43383,8 @@ self: { }: mkDerivation { pname = "autodocodec-nix"; - version = "0.0.1.0"; - sha256 = "1v38vdf0p110swj5gq2j8mz08gwy33myf602kn2wqz142mjsl2q6"; + version = "0.0.1.4"; + sha256 = "1awfc6gvmqs5gz0vb6gihs3f8csrqhk1b8yni21np72y2j29pzfw"; libraryHaskellDepends = [ aeson autodocodec base containers scientific text unordered-containers vector @@ -43472,15 +43522,15 @@ self: { license = lib.licenses.mit; }) {}; - "autodocodec-yaml_0_3_0_2" = callPackage + "autodocodec-yaml_0_4_0_0" = callPackage ({ mkDerivation, autodocodec, autodocodec-schema, base, bytestring , containers, path, path-io, safe-coloured-text, scientific, text , vector, yaml }: mkDerivation { pname = "autodocodec-yaml"; - version = "0.3.0.2"; - sha256 = "1jy7wzbndjvkdkfjxbcbz7r1x3c7dpnqjzyvm1n92fbj74f4n9rz"; + version = "0.4.0.0"; + sha256 = "1al2k668czis10klcicrxns89nks7b6b003wrpgaa0alx2imjsy1"; libraryHaskellDepends = [ autodocodec autodocodec-schema base bytestring containers path path-io safe-coloured-text scientific text vector yaml @@ -43950,8 +44000,8 @@ self: { "avro" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, bytestring, containers, data-binary-ieee754, deepseq - , directory, doctest, doctest-discover, extra, fail, gauge + , binary, bytestring, containers, criterion, data-binary-ieee754 + , deepseq, directory, doctest, doctest-discover, extra, fail , generic-lens, HasBigDecimal, hashable, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, mtl , QuickCheck, random, raw-strings-qq, scientific, semigroups @@ -43960,8 +44010,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.6.2.0"; - sha256 = "078616j4lz6kdakdckbyipgan0ldnvfs3314flavcgmwi1fnv89a"; + version = "0.6.2.1"; + sha256 = "0ng8kyc4xi8nirkl387gyi0daw8sxki701q169llcx51abf7jaqf"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail HasBigDecimal hashable @@ -43979,8 +44029,9 @@ self: { ]; testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ - aeson base binary bytestring containers deepseq gauge hashable mtl - random raw-strings-qq text transformers unordered-containers vector + aeson base binary bytestring containers criterion deepseq hashable + mtl random raw-strings-qq text transformers unordered-containers + vector ]; description = "Avro serialization support for Haskell"; license = lib.licenses.bsd3; @@ -44178,24 +44229,24 @@ self: { }) {}; "aws-arn" = callPackage - ({ mkDerivation, base, deriving-compat, hashable, profunctors - , tagged, tasty, tasty-discover, tasty-hunit, text + ({ mkDerivation, base, deriving-compat, hashable, microlens-pro + , profunctors, tagged, tasty, tasty-discover, tasty-hunit, text }: mkDerivation { pname = "aws-arn"; - version = "0.3.1.0"; - sha256 = "09jd8lf6w76adkcq5kycj1nwhr7qpn5ivm6dap3zlkngp0z9sdqb"; - revision = "1"; - editedCabalFile = "029q777z4pd0vnj9c4v1ivzjb7azj6aq8gb55bwidw21lq55p98r"; + version = "0.3.2.0"; + sha256 = "14384l3k5c1qj830lq8jv22gx9ciklsvcap247p02wq2qwrp1rfy"; libraryHaskellDepends = [ - base deriving-compat hashable profunctors tagged text + base deriving-compat hashable microlens-pro profunctors tagged text ]; testHaskellDepends = [ - base deriving-compat profunctors tagged tasty tasty-hunit text + base deriving-compat microlens-pro profunctors tagged tasty + tasty-hunit text ]; testToolDepends = [ tasty-discover ]; description = "Types and optics for manipulating Amazon Resource Names (ARNs)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "aws-cloudfront-signed-cookies" = callPackage @@ -45360,6 +45411,21 @@ self: { mainProgram = "babylon"; }) {}; + "babynf" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, tasty, tasty-hunit + }: + mkDerivation { + pname = "babynf"; + version = "0.1.0.2"; + sha256 = "0p84scb30ddgyxbvq4pshimsqzk0qc0x02f7bq4vjd1s6zba7r0i"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ + attoparsec base bytestring tasty tasty-hunit + ]; + description = "Library for generating parsers from ABNF"; + license = lib.licenses.mit; + }) {}; + "backblaze-b2-hs" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, containers, cryptonite, formatting @@ -47687,8 +47753,8 @@ self: { pname = "beam-postgres"; version = "0.5.3.1"; sha256 = "19gagw9r2wfy398calkcnilsgl89sjpy8vj9bdswg390mw15m41n"; - revision = "1"; - editedCabalFile = "17ssja9yy1yzjyngrvyr72gr8hrvkw4q8w8cb20kdfrz0m83c17w"; + revision = "2"; + editedCabalFile = "11f3jxljrfa4rva21r561w7vxafv63wmmsa9cq8bydcp3gzlgr4p"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base @@ -47780,15 +47846,15 @@ self: { }) {}; "bearriver" = callPackage - ({ mkDerivation, base, deepseq, dunai, MonadRandom, mtl + ({ mkDerivation, base, deepseq, dunai, mtl, random , simple-affine-space, transformers }: mkDerivation { pname = "bearriver"; - version = "0.14.9"; - sha256 = "10xcl4nms1bcfni9z7mqirf6ifii99y6yb16r2pwrfs20vnhwx7w"; + version = "0.14.10"; + sha256 = "0fyjrwb3f7sqs1bbiga98h6bylgvmqfpqg59p07lhv4hrrgmx8ff"; libraryHaskellDepends = [ - base deepseq dunai MonadRandom mtl simple-affine-space transformers + base deepseq dunai mtl random simple-affine-space transformers ]; description = "FRP Yampa replacement implemented with Monadic Stream Functions"; license = lib.licenses.bsd3; @@ -48880,6 +48946,8 @@ self: { pname = "bin"; version = "0.1.4"; sha256 = "0amz5naq6p2jpm4rb9ycjg7j75qylp3d689cl55f71rs2idrazpp"; + revision = "1"; + editedCabalFile = "1bxybxc32zzwrpmvbl0a0scz7zpi6dhm4pgv2zrbnmf40s858mjm"; libraryHaskellDepends = [ base boring dec deepseq fin hashable QuickCheck some ]; @@ -49156,6 +49224,8 @@ self: { pname = "binary-instances"; version = "1.0.5"; sha256 = "01ycp0dn96n4zavrw1rr5ly0isr3kq16jihwcdg6c022v9w73wkf"; + revision = "1"; + editedCabalFile = "1wxcp6cy7lp3bbn45jlihqdl43ix84szs55n7vwd5vjxvs695hjl"; libraryHaskellDepends = [ aeson base binary binary-orphans case-insensitive hashable primitive scientific tagged text time-compat unordered-containers @@ -51454,8 +51524,8 @@ self: { }: mkDerivation { pname = "bitfield"; - version = "0.0.0.0"; - sha256 = "1b9jqbcyzp1ajcgjiipjgn1h514kl6zav4ai474x6xalhvwfcpx9"; + version = "0.0.0.1"; + sha256 = "17x4i0i4ndmzhx0xbh78m57iwqbgl0md74hvqxnmxllnjg93bxm1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base genvalidity genvalidity-sydtest QuickCheck sydtest validity @@ -52028,7 +52098,6 @@ self: { ]; description = "Decentralized, k-ordered unique ID generator"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "blagda" = callPackage @@ -52523,8 +52592,8 @@ self: { pname = "blaze-svg"; version = "0.3.7"; sha256 = "0pqnx1zrvm2pliya76f4m8d6aycncfp08c2n1fiyzvl1fgk62z2c"; - revision = "1"; - editedCabalFile = "0szq7fnck2fchhck7984zar92da2lc63gjy4p7zx0975jxx0xrg9"; + revision = "2"; + editedCabalFile = "0d8wylydvflhd1yyd91a8ss8khxr5j83f7j7h6qn36zagnyci1f5"; libraryHaskellDepends = [ base blaze-markup mtl ]; description = "SVG combinator library"; license = lib.licenses.bsd3; @@ -52751,8 +52820,8 @@ self: { }: mkDerivation { pname = "blockfrost-api"; - version = "0.10.0.0"; - sha256 = "1l7sj5b4f8byvmz9090wl6rq6fdhx2y8xiqnwcxmn3z487858w6w"; + version = "0.11.0.0"; + sha256 = "1lqbpjzvz5rc3bkfgk09mgz6p99cxy19yx2azyshb37xxiaj8www"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deriving-aeson lens safe-money servant servant-docs servant-multipart-api @@ -52915,6 +52984,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "bloodhound_0_22_0_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers + , errors, exceptions, generic-random, hashable, hspec, http-client + , http-types, microlens, microlens-aeson, mtl, network-uri + , pretty-simple, QuickCheck, quickcheck-properties, scientific + , semigroups, semver, temporary, text, time, transformers + , unix-compat, unordered-containers, vector + }: + mkDerivation { + pname = "bloodhound"; + version = "0.22.0.0"; + sha256 = "0w96zrv2rrhwiahf2x619l2ivqrj5jnih5ck216wrnzj6axlh9j4"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring containers exceptions hashable + http-client http-types mtl network-uri scientific semigroups semver + text time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring containers errors exceptions + generic-random hashable hspec http-client http-types microlens + microlens-aeson mtl network-uri pretty-simple QuickCheck + quickcheck-properties scientific semigroups semver temporary text + time transformers unix-compat unordered-containers vector + ]; + description = "Elasticsearch client library for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bloodhound-amazonka-auth" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core , amazonka-elasticsearch, base, bloodhound, exceptions, http-client @@ -53140,8 +53238,10 @@ self: { ({ mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; - version = "0.0.6.0"; - sha256 = "17w2830azxwals84hza77rpglz4bq6q3109h7wxnbvc9vcjy39ya"; + version = "0.0.7.0"; + sha256 = "1nr6kcckhz3k7nfzavjf24c655ccin0fnyxl238asic01h1d1bny"; + revision = "1"; + editedCabalFile = "1z6y9m8ikhy1h9hjvb3dccpqb567svzavl42i9s74aiybz3gs2gv"; libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; @@ -53162,20 +53262,21 @@ self: { ]; description = "Algebraic effects and named handlers in Bluefin"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bluefin-internal" = callPackage - ({ mkDerivation, base, monad-control, transformers + ({ mkDerivation, async, base, monad-control, transformers , transformers-base, unliftio-core }: mkDerivation { pname = "bluefin-internal"; - version = "0.0.6.0"; - sha256 = "0z7c7aalgs02asqp2nz9f0hcdxgwyxd3qnklq5h73f2lkyy4qi3p"; - revision = "1"; - editedCabalFile = "0miyxxmdsyaq740na4z7a3qqjgcy8yvmx6sn9fjydlgsban37kdr"; + version = "0.0.7.0"; + sha256 = "1p6fz1nd4976ibb23ni8fdrp9i47m29gfq9v77rlp6biqappjakv"; libraryHaskellDepends = [ - base monad-control transformers transformers-base unliftio-core + async base monad-control transformers transformers-base + unliftio-core ]; testHaskellDepends = [ base ]; description = "The Bluefin effect system, internals"; @@ -54365,10 +54466,8 @@ self: { }: mkDerivation { pname = "bound-extras"; - version = "0.0.2"; - sha256 = "1mrsr75yd55p3rgqqjlhs0f498qgbmj12ldadj4frmkhjqf3vf9y"; - revision = "3"; - editedCabalFile = "0b5zywbbps0j7m3cndgwvg8d8kgcyvi4rnmnv2shavlhwnjlbawa"; + version = "0.0.3"; + sha256 = "1apzrjalgdsjcx0c3251hfwgqw5ard3vxqm6zfg3f9wlfy58vp6q"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; @@ -54378,6 +54477,8 @@ self: { ]; description = "ScopeH and ScopeT extras for bound"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bound-gen" = callPackage @@ -54732,33 +54833,35 @@ self: { "brassica" = callPackage ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring, conduit - , conduit-extra, containers, criterion, deepseq, file-embed - , megaparsec, mtl, optparse-applicative, parser-combinators, split - , tasty, tasty-golden, text, transformers, utf8-string, vector + , conduit-extra, containers, criterion, deepseq, fast-myers-diff + , file-embed, megaparsec, mtl, optparse-applicative, parallel + , parser-combinators, split, tasty, tasty-golden, text + , transformers, utf8-string, vector }: mkDerivation { pname = "brassica"; - version = "0.2.0"; - sha256 = "11myl3ir4vla6d6cvhfrjxvsfxvasj109ljxa0kjiyrqjhrv0s1z"; + version = "0.3.0"; + sha256 = "10ydb5w79y1jqa34mzrdl7s8ns29w1vxplv55ik51mkayclfgx3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers deepseq megaparsec mtl parser-combinators split - transformers vector + base containers deepseq fast-myers-diff megaparsec mtl + parser-combinators split transformers vector ]; executableHaskellDepends = [ aeson attoparsec-aeson base bytestring conduit conduit-extra - deepseq optparse-applicative text + deepseq optparse-applicative parallel text ]; testHaskellDepends = [ base bytestring conduit tasty tasty-golden text transformers utf8-string ]; - benchmarkHaskellDepends = [ base criterion file-embed text ]; + benchmarkHaskellDepends = [ + base criterion file-embed parallel text + ]; description = "Featureful sound change applier"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "brassica"; broken = true; }) {}; @@ -55006,8 +55109,8 @@ self: { }: mkDerivation { pname = "brick-panes"; - version = "1.0.1.0"; - sha256 = "0ngw5mwnv92w6hyyz6jcjsz2cs4ix4dyd6z41ggjy0lzjxd40gsq"; + version = "1.0.2.0"; + sha256 = "1rdkwvsmm0dyzinvvc4z933vdz7hj9kz7zvbmnmmlpffbal1avjf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vty ]; @@ -56159,22 +56262,22 @@ self: { "build-env" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , directory, filepath, optparse-applicative, process, temporary - , text, time, transformers + , directory, filepath, optparse-applicative, process + , semaphore-compat, temporary, text, time, transformers }: mkDerivation { pname = "build-env"; - version = "1.1.0.0"; - sha256 = "07gw9wzyx92as7didf32b6q8nmjifsxg4z27gqb61dnq7hrrjhf4"; + version = "1.2.0.0"; + sha256 = "1qc03fvhj6as656g5krzvvrmqkkbxybyw4q1jgh8aw3n4mr76lbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base bytestring containers directory filepath process - temporary text time transformers + semaphore-compat temporary text time transformers ]; executableHaskellDepends = [ base bytestring containers directory filepath optparse-applicative - text + semaphore-compat text ]; description = "Compute, fetch and install Cabal build plans into a local environment"; license = lib.licenses.bsd3; @@ -57409,6 +57512,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "bytestring-lexing_0_5_0_14" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "bytestring-lexing"; + version = "0.5.0.14"; + sha256 = "10r12gsms3bmakxfsqg24l7v87lq4hxgz3g8c3mz8wdcd5bds4l0"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring tasty tasty-quickcheck tasty-smallcheck + ]; + description = "Efficiently parse and produce common integral and fractional numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-mmap" = callPackage ({ mkDerivation, base, bytestring, unix }: mkDerivation { @@ -57639,6 +57759,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "bytestring-trie_0_2_7_5" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "bytestring-trie"; + version = "0.2.7.5"; + sha256 = "02z15mqn7rlpa6w41mwibhm3v33p03dp3mdv1b3q4s1jkn63lw2d"; + libraryHaskellDepends = [ base binary bytestring deepseq ]; + testHaskellDepends = [ + base binary bytestring deepseq QuickCheck smallcheck tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion deepseq QuickCheck + ]; + description = "An efficient finite map from bytestrings to values"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-typenats" = callPackage ({ mkDerivation, base, binary, blake2, bytestring, cereal , criterion, cryptohash, deepseq, entropy, QuickCheck @@ -58195,6 +58337,34 @@ self: { broken = true; }) {youProbablyWantCapitalCabal = null;}; + "cabal-add" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-install-parsers + , Cabal-syntax, containers, Diff, directory, filepath, mtl + , optparse-applicative, process, string-qq, tasty, temporary + }: + mkDerivation { + pname = "cabal-add"; + version = "0.1"; + sha256 = "1szbi0z8yf98641rwnj856gcfsvvflxwrfxraxy6rl60m7i0mab1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal Cabal-syntax containers mtl + ]; + executableHaskellDepends = [ + base bytestring Cabal cabal-install-parsers directory filepath + optparse-applicative process + ]; + testHaskellDepends = [ + base Diff directory process string-qq tasty temporary + ]; + description = "Extend Cabal build-depends from the command line"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-add"; + broken = true; + }) {}; + "cabal-appimage" = callPackage ({ mkDerivation, base, Cabal, filepath }: mkDerivation { @@ -58206,6 +58376,18 @@ self: { license = lib.licenses.agpl3Only; }) {}; + "cabal-appimage_0_4_0_5" = callPackage + ({ mkDerivation, base, Cabal, filepath }: + mkDerivation { + pname = "cabal-appimage"; + version = "0.4.0.5"; + sha256 = "0ir952hdpyf62xc799fq22qmj7n09cbc0v3jldlr40iv0200isr2"; + libraryHaskellDepends = [ base Cabal filepath ]; + description = "Cabal support for creating AppImage applications"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "cabal-audit" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, HTTP , optparse-applicative @@ -58630,19 +58812,19 @@ self: { "cabal-flatpak" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cabal-plan - , containers, cryptohash-sha256, http-client, http-client-tls - , http-types, optparse-applicative, pathtype, shell-utility, tar - , text, utility-ht, yaml, zlib + , containers, cryptohash-sha256, directory, http-client + , http-client-tls, http-types, optparse-applicative, pathtype + , shell-utility, tar, text, utility-ht, yaml, zlib }: mkDerivation { pname = "cabal-flatpak"; - version = "0.1.1"; - sha256 = "0p54np4q1xfqja0vxpin61pr6imligscxwpqk0fjz38idqa2ys56"; + version = "0.1.2"; + sha256 = "05ig175b2glxppn5wr05pnncqkp8yhhy1m7ymmc1jk5pmiy3zvzi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson aeson-pretty base bytestring cabal-plan containers - cryptohash-sha256 http-client http-client-tls http-types + cryptohash-sha256 directory http-client http-client-tls http-types optparse-applicative pathtype shell-utility tar text utility-ht yaml zlib ]; @@ -59265,23 +59447,22 @@ self: { mainProgram = "cabal-rpm"; }) {}; - "cabal-rpm_2_2_0" = callPackage + "cabal-rpm_2_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cached-json-file , directory, extra, filepath, http-client, http-client-tls - , http-conduit, http-query, optparse-applicative, process - , simple-cabal, simple-cmd, simple-cmd-args, text, time, unix + , http-query, simple-cabal, simple-cmd, simple-cmd-args, text, time + , unix }: mkDerivation { pname = "cabal-rpm"; - version = "2.2.0"; - sha256 = "1lrcqgbl3l6if9sa5qylm87yssl5gsinnidzx19q6z2nm5wbnyh7"; + version = "2.2.1"; + sha256 = "0dsbnnvzss0flknf1c2fq85y9a4d26nbrlnrh2xcyfwh2mz20c9d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring Cabal cached-json-file directory extra - filepath http-client http-client-tls http-conduit http-query - optparse-applicative process simple-cabal simple-cmd - simple-cmd-args text time unix + filepath http-client http-client-tls http-query simple-cabal + simple-cmd simple-cmd-args text time unix ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = lib.licenses.gpl3Only; @@ -61003,6 +61184,8 @@ self: { pname = "cantor-pairing"; version = "0.2.0.2"; sha256 = "1h95xbc1lhwd40qk64qw2cmr7prwygli1q2wy5hscny7jyah95c2"; + revision = "1"; + editedCabalFile = "10dsxgdpxa5hxz5zrij8h2whwsz0l1fvkkwdmidqpv09is55wmz5"; libraryHaskellDepends = [ base containers integer-gmp integer-logarithms integer-roots ]; @@ -62100,8 +62283,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.5.3.1"; - sha256 = "14kz47i6f9c747h2mf8cf6r22gib4a2ggh57fviz0z9sr6y760av"; + version = "0.5.3.2"; + sha256 = "1jd9s10z2y3hizrpy3iaw2vvqmk342zxhwkky57ba39cbli5vlis"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -62588,6 +62771,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "cauldron" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , multicurryable, sop-core, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "cauldron"; + version = "0.4.0.0"; + sha256 = "1apyjq74xscjzc03wibv9zm0kzqggm8rw0jg52xb8lj5bh5wxgmj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs base bytestring containers multicurryable sop-core + text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers tasty tasty-hunit text transformers + ]; + description = "Toy dependency injection framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "cauldron-example-wiring"; + }) {}; + "cautious" = callPackage ({ mkDerivation, aeson, base, transformers, validity }: mkDerivation { @@ -65804,7 +66011,6 @@ self: { testHaskellDepends = [ base clash-prelude ]; description = "A source plugin for manipulating circuits in clash with a arrow notation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "circular" = callPackage @@ -66324,7 +66530,6 @@ self: { executableHaskellDepends = [ base ]; description = "Clash: a functional hardware description language - GHC frontend"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "clash-lib" = callPackage @@ -66376,7 +66581,6 @@ self: { ]; description = "Clash: a functional hardware description language - As a library"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; mainProgram = "v16-upgrade-primitives"; }) {}; @@ -66414,6 +66618,7 @@ self: { ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clash-prelude" = callPackage @@ -66455,8 +66660,6 @@ self: { ]; description = "Clash: a functional hardware description language - Prelude library"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "clash-prelude-hedgehog" = callPackage @@ -66473,7 +66676,6 @@ self: { ]; description = "Hedgehog Generators for clash-prelude"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "clash-prelude-quickcheck" = callPackage @@ -66487,6 +66689,7 @@ self: { description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clash-shake" = callPackage @@ -66506,7 +66709,6 @@ self: { ]; description = "Shake rules for building Clash programs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "clash-systemverilog" = callPackage @@ -66525,6 +66727,7 @@ self: { description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clash-verilog" = callPackage @@ -66543,6 +66746,7 @@ self: { description = "CAES Language for Synchronous Hardware - Verilog backend"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clash-vhdl" = callPackage @@ -66561,6 +66765,7 @@ self: { description = "CAES Language for Synchronous Hardware - VHDL backend"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clashilator" = callPackage @@ -66586,6 +66791,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "clashilator"; + broken = true; }) {}; "classify" = callPackage @@ -72968,6 +73174,33 @@ self: { license = lib.licenses.mit; }) {}; + "conduit_1_3_6" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, gauge, hspec, mono-traversable, mtl + , mwc-random, primitive, QuickCheck, resourcet, safe, silently + , split, text, transformers, unix, unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "conduit"; + version = "1.3.6"; + sha256 = "13aivqg5js60yvcbpbl7fgrxa5z2wswrmjjlm1bhrcj2qx49mrik"; + libraryHaskellDepends = [ + base bytestring directory exceptions filepath mono-traversable mtl + primitive resourcet text transformers unix unliftio-core vector + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath hspec + mono-traversable mtl QuickCheck resourcet safe silently split text + transformers unliftio vector + ]; + benchmarkHaskellDepends = [ + base containers deepseq gauge hspec mwc-random transformers vector + ]; + description = "Streaming data processing library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "conduit-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base , bytestring, conduit, conduit-extra, containers, doctest, hspec @@ -74829,21 +75062,22 @@ self: { "consumers" = callPackage ({ mkDerivation, base, containers, exceptions, hpqtypes , hpqtypes-extras, HUnit, lifted-base, lifted-threads, log-base - , monad-control, monad-loops, monad-time, mtl, stm, text, text-show - , time, transformers, transformers-base + , monad-control, monad-time, mtl, safe-exceptions, stm, text + , text-show, time, transformers, transformers-base }: mkDerivation { pname = "consumers"; - version = "2.3.1.0"; - sha256 = "084i9lgrdn0f7pwk9b7rap66rg5z5f24az41jw7a9g9ddfq39fai"; + version = "2.3.2.0"; + sha256 = "1kj7ng8cpwvbc8x3bzcnkk19g3hrcy3v2c5kpxqn52x607c9flmf"; libraryHaskellDepends = [ base containers exceptions hpqtypes lifted-base lifted-threads - log-base monad-control monad-time mtl stm time transformers-base + log-base monad-control monad-time mtl safe-exceptions stm text time + transformers-base ]; testHaskellDepends = [ base exceptions hpqtypes hpqtypes-extras HUnit log-base - monad-control monad-loops monad-time mtl stm text text-show time - transformers transformers-base + monad-control monad-time mtl stm text text-show time transformers + transformers-base ]; description = "Concurrent PostgreSQL data consumers"; license = lib.licenses.bsd3; @@ -77993,8 +78227,8 @@ self: { }: mkDerivation { pname = "crdt-event-fold"; - version = "1.8.1.0"; - sha256 = "1lalg8gi8rcpgzangqbf9j51fpgdsq3k5j6wqbd45nbyyym5zmjj"; + version = "1.8.1.1"; + sha256 = "07nqvmlpbcy88k7lmwl5n0mq2n0lxq48nigyqgzibadwg3i20r8q"; libraryHaskellDepends = [ aeson base binary containers data-default-class data-dword exceptions monad-logger mtl transformers @@ -78551,20 +78785,22 @@ self: { }) {}; "crucible" = callPackage - ({ mkDerivation, base, bimap, bv-sized, containers, exceptions, fgl - , hashable, hspec, json, lens, mtl, panic, parameterized-utils - , prettyprinter, QuickCheck, tasty, tasty-hspec, tasty-hunit - , tasty-quickcheck, template-haskell, text, th-abstraction, time - , transformers, unordered-containers, vector, what4 + ({ mkDerivation, async, base, bimap, bv-sized, containers + , exceptions, fgl, hashable, hspec, json, lens, mtl, panic + , parameterized-utils, prettyprinter, QuickCheck, tasty + , tasty-hspec, tasty-hunit, tasty-quickcheck, template-haskell + , text, th-abstraction, time, transformers, unordered-containers + , vector, what4 }: mkDerivation { pname = "crucible"; - version = "0.7"; - sha256 = "0wz71bx59bysylb8w05d59awh6l9bbw3na6xk4j9dprjx5caccjk"; + version = "0.7.1"; + sha256 = "1c9a8km88ngxghn35f6wnaddm534ixmz1iciyn0whl0xmp27f4zv"; libraryHaskellDepends = [ - base bimap bv-sized containers exceptions fgl hashable json lens - mtl panic parameterized-utils prettyprinter template-haskell text - th-abstraction time transformers unordered-containers vector what4 + async base bimap bv-sized containers exceptions fgl hashable json + lens mtl panic parameterized-utils prettyprinter template-haskell + text th-abstraction time transformers unordered-containers vector + what4 ]; testHaskellDepends = [ base containers hspec mtl panic parameterized-utils QuickCheck @@ -78585,8 +78821,8 @@ self: { }: mkDerivation { pname = "crucible-llvm"; - version = "0.6"; - sha256 = "0mjyldz65qssx31fryv74wmkfz68j735cvcp6qd2z02p73fbbdi7"; + version = "0.7"; + sha256 = "0v4d3c971w6acka4s1lg9iai55ghk054hkkka5jbinyhhymmaf0k"; libraryHaskellDepends = [ attoparsec base bv-sized bytestring containers crucible crucible-symio extra itanium-abi lens llvm-pretty mtl @@ -78610,8 +78846,8 @@ self: { }: mkDerivation { pname = "crucible-symio"; - version = "0.1"; - sha256 = "0b6c1sk7lg8qf3v1z4shzqwqcbwqbf4sir28iz52063pakvgr4q8"; + version = "0.1.1"; + sha256 = "0c96c0iqdx2ahc9sjslck1bfnjkha1kii1p3izhw9b9d34h339d7"; libraryHaskellDepends = [ aeson base bv-sized bytestring containers crucible directory filemanip filepath IntervalMap lens mtl parameterized-utils text @@ -78672,8 +78908,8 @@ self: { }: mkDerivation { pname = "crux"; - version = "0.7"; - sha256 = "0bbkg6l5322a50wgfdswq9m75vinm5xfv7lwl4sfy6604ckjy85i"; + version = "0.7.1"; + sha256 = "0l5nl9rv3kl07pwvj7dpw6njr6bh127ckallnlgkvp7c8l4cxgdy"; libraryHaskellDepends = [ aeson ansi-terminal async attoparsec base bv-sized bytestring config-schema config-value containers contravariant crucible @@ -78698,8 +78934,8 @@ self: { }: mkDerivation { pname = "crux-llvm"; - version = "0.8"; - sha256 = "116vgh9h2dmx1cahs2kl7rm46v9wn88x6i1pjp5m1z6mw9694xh4"; + version = "0.9"; + sha256 = "0nrqaqs9l3kyj954swlln12b75xszcwrgwscc5n0r0pmi6sszrqj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -79437,8 +79673,8 @@ self: { ({ mkDerivation, alex, ansi-terminal, arithmoi, array, async, base , base-compat, blaze-html, bv-sized, bytestring, containers , criterion, criterion-measurement, cryptohash-sha1, deepseq - , directory, exceptions, extra, filepath, ghc-bignum, ghc-prim - , gitrev, GraphSCC, happy, haskeline, heredoc, hgmp, language-c99 + , directory, exceptions, extra, file-embed, filepath, ghc-bignum + , ghc-prim, gitrev, GraphSCC, happy, haskeline, hgmp, language-c99 , language-c99-simple, libBF, libffi, MemoTrie, monad-control , monadLib, mtl, optparse-applicative, panic, parameterized-utils , pretty, pretty-show, prettyprinter, process, sbv, simple-smt, stm @@ -79447,15 +79683,15 @@ self: { }: mkDerivation { pname = "cryptol"; - version = "3.1.0"; - sha256 = "00qb0pmhmjcfkg6a7x948azp35rriajh4bfa1r8yb78in0ahyngj"; + version = "3.2.0"; + sha256 = "0nx25dfsnz1sd33kzicz9wqw4nsjv5s86s9w83mnh93xpmjqj1zd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ arithmoi array async base base-compat bv-sized bytestring containers criterion-measurement cryptohash-sha1 deepseq directory - exceptions filepath ghc-bignum ghc-prim gitrev GraphSCC heredoc + exceptions file-embed filepath ghc-bignum ghc-prim gitrev GraphSCC hgmp language-c99 language-c99-simple libBF libffi MemoTrie monad-control monadLib mtl panic parameterized-utils pretty pretty-show prettyprinter process sbv simple-smt stm strict text @@ -80588,8 +80824,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, curl, text }: mkDerivation { pname = "curl-aeson"; - version = "0.1.0.1"; - sha256 = "1hiz2rwbycl2nx5k1157nnl661rk1gkj7m4vc4qac1saqvf9jxdz"; + version = "0.1.0.2"; + sha256 = "0dsgc8sfydk1a73i3n66l7ffdprhd9w7q8ls1m5cj9fvwqpzb0rg"; libraryHaskellDepends = [ aeson base bytestring curl text ]; description = "Communicate with web services using JSON"; license = lib.licenses.bsd3; @@ -80854,8 +81090,8 @@ self: { }: mkDerivation { pname = "curryer-rpc"; - version = "0.3.6"; - sha256 = "0likxfgjv287c7xf5xq6hrzfqmh0vn6lv93s3chbp75gfxs8pwls"; + version = "0.3.7"; + sha256 = "1g8afbpayw6hcbgrfzqpipp3r0657mcimlmpizdxdk5xbl2j2r03"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82816,14 +83052,16 @@ self: { "data-effects" = callPackage ({ mkDerivation, base, data-default, data-effects-core - , data-effects-th, tasty, tasty-discover, tasty-hunit, these + , data-effects-th, lens, tasty, tasty-discover, tasty-hunit, text + , these, time }: mkDerivation { pname = "data-effects"; - version = "0.1.0.0"; - sha256 = "0rq882lpi3j6g1pj3p60lqb2ad1is9zppng6vxh1vagjfk0jpj87"; + version = "0.1.1.0"; + sha256 = "0ypwb4618hjsvsdrwb1xbdq427g1bfc5dm9xibjbm2yrami16qr2"; libraryHaskellDepends = [ - base data-default data-effects-core data-effects-th these + base data-default data-effects-core data-effects-th lens text these + time ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -82857,8 +83095,8 @@ self: { }: mkDerivation { pname = "data-effects-th"; - version = "0.1.0.0"; - sha256 = "1vq976iyn0k95p884pvwgq154jfjidbs7dyrql4hhldncz2v2j85"; + version = "0.1.1.0"; + sha256 = "0xs8n5f6v3dani9j2rpl75d8bx02295aimy0fh714qqwg1cmiml6"; libraryHaskellDepends = [ base containers data-default data-effects-core either extra formatting infinite-list lens mtl template-haskell text @@ -82877,8 +83115,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "data-elevator"; - version = "0.1.0.1"; - sha256 = "0j2adsqn3r23jjwl5p0kyf2z1wd2kibfqivdcchngsmf3yfr34sz"; + version = "0.1.0.2"; + sha256 = "109vff7i8jrz3n6748hj8vf1x4a8r91d2p1cwmcgs0rad536zl0m"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Coerce between unlifted boxed and lifted types"; @@ -86543,6 +86781,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "delivery-status-notification" = callPackage + ({ mkDerivation, attoparsec, base, text }: + mkDerivation { + pname = "delivery-status-notification"; + version = "0.2.0.0"; + sha256 = "0vmvgwq9g3kqdmfqs4gg7h1a926jqg7g8n065qvq0b4c4pmn7dy1"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ attoparsec base ]; + description = "Parse bounce messages per RFC3464, RFC3463"; + license = lib.licenses.bsd3; + }) {}; + "delta" = callPackage ({ mkDerivation, base, containers, directory, filepath, hspec , optparse-applicative, process, sodium, time @@ -88689,14 +88939,32 @@ self: { ({ mkDerivation, aeson, base, containers, QuickCheck, random }: mkDerivation { pname = "dhscanner-ast"; - version = "0.1.0.0"; - sha256 = "14qdx79rgz61ajiags6w8v5zzv95n0hng6y3amwz2dyki65sckah"; + version = "0.1.0.3"; + sha256 = "1xksb6ilmdihq9rx6fcabwphlvwdsjss34aw1iqgc8gsiw60lm8c"; libraryHaskellDepends = [ aeson base containers ]; testHaskellDepends = [ base QuickCheck random ]; description = "abstract syntax tree for multiple programming languages"; license = lib.licenses.gpl3Only; }) {}; + "dhscanner-bitcode" = callPackage + ({ mkDerivation, aeson, base, containers, dhscanner-ast, QuickCheck + , random + }: + mkDerivation { + pname = "dhscanner-bitcode"; + version = "0.1.0.2"; + sha256 = "1ixm87h6ycbzf7b6jzwivcnvw96xlm8gmcw032hk54z8c9szrx3d"; + libraryHaskellDepends = [ aeson base containers dhscanner-ast ]; + testHaskellDepends = [ + base containers dhscanner-ast QuickCheck random + ]; + description = "Intermediate language for static code analysis"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "di" = callPackage ({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle , di-monad, exceptions @@ -88959,8 +89227,8 @@ self: { pname = "diagrams-cairo"; version = "1.4.2.1"; sha256 = "0fqma8m4xrqha079aqqynk23y252x47xfzvb0gss4bvgdmwa0lzc"; - revision = "2"; - editedCabalFile = "0fyy1iqfwzk1b4vvqnfh31gd8g8qjry7cc9g2nhg505rbafflcn5"; + revision = "3"; + editedCabalFile = "1qdx7k5z6bw70y6rmjs5pkwdypsmrl0gmp7qdjmsbkjv2sah7hq4"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -89200,8 +89468,8 @@ self: { pname = "diagrams-lib"; version = "1.4.6.2"; sha256 = "0qz5yrrg4k4f72fg20b1rq5mk7n7q531qmj0irpg9lmrr596bdh9"; - revision = "2"; - editedCabalFile = "1mdz1s014pn3v7b301d409zv5npw1gkdqkq2hzn8klnawcnmng57"; + revision = "3"; + editedCabalFile = "0sffvdkbxm1lsl2b7sd6psrrnc4lcc1c5ipvc2hhpmzzmfyc49fc"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -89298,8 +89566,8 @@ self: { pname = "diagrams-postscript"; version = "1.5.1.1"; sha256 = "1kwb100k3qif9gc8kgvglya5by61522128cxsjrxk5a8dzpgwal4"; - revision = "3"; - editedCabalFile = "1yd084lqh2fs2m42a0744b7xlpsxk59ivjnaq99jkf1d6xq8kpak"; + revision = "4"; + editedCabalFile = "1wm9y3dj5bg6k2jm1ycy8sdg54pzgy2lrhdv9wm2n8jhhk3884qy"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib hashable lens monoid-extras mtl semigroups split @@ -89335,8 +89603,8 @@ self: { pname = "diagrams-rasterific"; version = "1.4.2.3"; sha256 = "0n46scybjs8mnhrnh5z3nkrah6f8v1rv4cca8k8mqzsf8ss30q5l"; - revision = "2"; - editedCabalFile = "1v8djd4qndmkl8lc966pkh9gbgb8rkwqg2395xad6i03gqxvl55d"; + revision = "3"; + editedCabalFile = "0yz8vkxp8vi3di8wli6m8090vs56mngv3wr9riam896n1z0xqzg7"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels @@ -89421,6 +89689,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-svg_1_4_3_2" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, colour + , containers, diagrams-core, diagrams-lib, filepath, hashable + , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative + , semigroups, split, svg-builder, text + }: + mkDerivation { + pname = "diagrams-svg"; + version = "1.4.3.2"; + sha256 = "06syqgwprbzrmjylbw9rn7f4vz6fzbw0g0052mnzs92w5ddhkivg"; + libraryHaskellDepends = [ + base base64-bytestring bytestring colour containers diagrams-core + diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl + optparse-applicative semigroups split svg-builder text + ]; + description = "SVG backend for diagrams drawing EDSL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-tikz" = callPackage ({ mkDerivation, base, diagrams-core, diagrams-lib, dlist, mtl }: mkDerivation { @@ -90269,6 +90557,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "dimensional_1_6" = callPackage + ({ mkDerivation, base, criterion, deepseq, exact-pi, hspec + , hspec-discover, ieee754, numtype-dk, QuickCheck, vector + }: + mkDerivation { + pname = "dimensional"; + version = "1.6"; + sha256 = "05ikvdpl9j94alyf3r9fwfwn354z4gifbhp1fasspmd9s0bhi7wl"; + libraryHaskellDepends = [ + base deepseq exact-pi ieee754 numtype-dk vector + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Statically checked physical dimensions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "dimensional-codata" = callPackage ({ mkDerivation, base, dimensional, numtype-dk }: mkDerivation { @@ -90419,9 +90726,7 @@ self: { ]; description = "Gemini client"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "diohsc"; - broken = true; }) {}; "diophantine" = callPackage @@ -90857,6 +91162,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriella439 ]; + broken = true; }) {}; "dirtree" = callPackage @@ -91860,8 +92166,8 @@ self: { }: mkDerivation { pname = "distributed-process-simplelocalnet"; - version = "0.3.0"; - sha256 = "1y9jxn1f56k5845dynac5hapfgsq66wibw2ypdzsp2lqh4ggs2jz"; + version = "0.3.1"; + sha256 = "06p7cynv7z4h62srzq99fi5v23v66g93k77wb6xiv0va83nqa0xr"; libraryHaskellDepends = [ base binary bytestring containers data-accessor distributed-process exceptions network network-multicast network-transport @@ -91968,16 +92274,16 @@ self: { ({ mkDerivation, ansi-terminal, base, binary, bytestring , distributed-process, distributed-static, exceptions, HUnit , network, network-transport, network-transport-inmemory, random - , rematch, setenv, stm, test-framework, test-framework-hunit + , rematch, stm, test-framework, test-framework-hunit }: mkDerivation { pname = "distributed-process-tests"; - version = "0.4.12"; - sha256 = "1jr7xgmwsy89hyih81w54bid8664rgqd8mxvwcd6xa6b41n90r7f"; + version = "0.5.0"; + sha256 = "01rpq0hgmvx7703xdx8x0ycfkbj7bpp3yqfxgzm8xy20d98cf9z7"; libraryHaskellDepends = [ ansi-terminal base binary bytestring distributed-process distributed-static exceptions HUnit network network-transport - random rematch setenv stm test-framework test-framework-hunit + random rematch stm test-framework test-framework-hunit ]; testHaskellDepends = [ base network network-transport network-transport-inmemory @@ -92578,20 +92884,17 @@ self: { }) {}; "dns-patterns" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, criterion, HUnit + ({ mkDerivation, attoparsec, base, bytestring, HUnit , parser-combinators, text }: mkDerivation { pname = "dns-patterns"; - version = "0.2.3"; - sha256 = "0vs3qn4pdpk13imxp8pz106ra504jwx629h62vv9z5nnjwq81d6y"; + version = "0.3.1"; + sha256 = "1b39ycdw9ws8sd6nxdcrk6snrl8yifda1a5n89fdpfvsaybhly83"; libraryHaskellDepends = [ attoparsec base bytestring parser-combinators text ]; testHaskellDepends = [ attoparsec base bytestring HUnit text ]; - benchmarkHaskellDepends = [ - attoparsec base bytestring criterion text - ]; description = "DNS name parsing and pattern matching utilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -93247,7 +93550,7 @@ self: { mainProgram = "doctest"; }) {}; - "doctest_0_22_8" = callPackage + "doctest_0_22_9" = callPackage ({ mkDerivation, base, code-page, containers, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core , hspec-discover, HUnit, mockery, process, QuickCheck, silently @@ -93255,8 +93558,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.22.8"; - sha256 = "1wa64p2myk2rcpyz7pn1d7mj28bl0n9nnjnzkm5q267rmsa5vhf6"; + version = "0.22.9"; + sha256 = "182952jr58hz83ckmbc33nwx9ndad808d8cn9z0ay7ds6p11i46s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95566,8 +95869,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.13.0"; - sha256 = "1zbdl440xgb9s6nkqxg7fa2pc7m75w0bbndlfks4jqr1jq9f4hfh"; + version = "0.13.1"; + sha256 = "1hamj3yv6v0rdr06889iidhzpz6jbskq3bc5gbf45gzvq7bvcds7"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -95598,8 +95901,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.13.0"; - sha256 = "14ckh9bshfjcinj637cmbfq6jx85ga0z98v3sqm66jw84zdqr4sy"; + version = "0.13.1"; + sha256 = "0hm5c9n890cxnw0pp62vqlw7yqmrzy2xb0inhbzcjm49i5gacfdq"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -95613,6 +95916,8 @@ self: { pname = "dupIO"; version = "0.1.0"; sha256 = "1j2xi1hskmgkknmg01fbkfa3ry2a1f7mzkvjhkqlsz27v3f3q4lm"; + revision = "1"; + editedCabalFile = "0hpph3a26q0jj0bhvxkngj02m5s3amibjgbazd7aq91phrhykz6z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim ]; @@ -98137,6 +98442,8 @@ self: { pname = "ekg"; version = "0.4.1.0"; sha256 = "03dgsgf67clk4wqrk69jqfh0ap406k0hgz257j0f5kixpws42ahp"; + revision = "1"; + editedCabalFile = "0frwz3jyxj0laaanzq39p74lzgq6cjxzhky51fkwa63qmlv5qfda"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core @@ -98280,6 +98587,8 @@ self: { pname = "ekg-json"; version = "0.1.1.0"; sha256 = "0wwzv2hfznd19385imajcarj0c42c3zczg3hlh39afy5k71hgvpp"; + revision = "1"; + editedCabalFile = "0zwmllpmczf9h6y8fagzinxin321z0fyxiyxlyw191i8zp57m579"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -98313,10 +98622,8 @@ self: { }: mkDerivation { pname = "ekg-prometheus-adapter"; - version = "0.1.0.4"; - sha256 = "1i9bqbn8zj7hbkc7iypmjji4sh8s2h9jix2ngp77mkmii6wblfx2"; - revision = "1"; - editedCabalFile = "1aq3x5j33bb0rwlip0p3y6ppk8m1x8k3hnrwnb7pca98gyz8fm6r"; + version = "0.1.0.5"; + sha256 = "0k4dkf42jh4d19dj5x7crby5agb3rl62cd7zmd4zsnb3vih44v8y"; libraryHaskellDepends = [ base containers ekg-core microlens-th prometheus text transformers unordered-containers @@ -99098,8 +99405,8 @@ self: { }: mkDerivation { pname = "elminator"; - version = "0.2.4.2"; - sha256 = "1icmj116hlmgjbss1fnbzav327dl5ga8l092791rc5bf6m0m644z"; + version = "0.2.4.4"; + sha256 = "03sgjinzkdwmflcirzri3qyp180g35rib34kljd5yb0vskb3sa0g"; libraryHaskellDepends = [ aeson base containers mtl template-haskell text ]; @@ -100591,12 +100898,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "envparse_0_5_2" = callPackage + "envparse_0_6_0" = callPackage ({ mkDerivation, base, containers, hspec, text }: mkDerivation { pname = "envparse"; - version = "0.5.2"; - sha256 = "1kc41wdl75qld93ch4cymji1sz72gpzs4yv7zak8cx4ha8wykns0"; + version = "0.6.0"; + sha256 = "1a46ljsrdha0pccfyxpii1lbwzbbj1960n5hcr47gdy1w3vcwjwk"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec text ]; description = "Parse environment variables"; @@ -101083,8 +101390,8 @@ self: { }: mkDerivation { pname = "erebos"; - version = "0.1.5"; - sha256 = "0w4qxr527m6qda3b6s79iyg38ynz4kwjcddp1k5524pgzs3v62j9"; + version = "0.1.6"; + sha256 = "153akrq6541k5m0gwhdw6bgk83b9pj3gdmzi0gafgypp0lhrg1f2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101113,8 +101420,8 @@ self: { }: mkDerivation { pname = "erebos-tester"; - version = "0.2.2"; - sha256 = "156597h0sriwjm5rivlmvizn76i5c984bs87v39zj0yyr2qzk0f7"; + version = "0.2.4"; + sha256 = "1nfhkwva75qwrhmrhccvy52ga0fxig7ddqhgnl0cpcsll3hfkmdn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -101620,8 +101927,8 @@ self: { }: mkDerivation { pname = "escaped"; - version = "1.0.0.0"; - sha256 = "1fpnaj0ycjhb73skv5dxrycwyyvy0rripvcag88hsjyh1ybxx91v"; + version = "1.1.0.0"; + sha256 = "0xbpnvr4l7041m9zysn3gi589pp0snwmvpngvfb83jl3qh1j75ak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102539,6 +102846,8 @@ self: { pname = "evdev"; version = "2.3.1.1"; sha256 = "1jq7ayi4rv8v02wyxva9776iqymv0ac1h7jbfxf96gmk5ifwyinf"; + revision = "1"; + editedCabalFile = "05v90azm7rfmzbcbm2rmbl20977nk1m41m0l8sryf64zk6sxpw3n"; libraryHaskellDepends = [ base bytestring containers extra filepath-bytestring monad-loops mtl rawfilepath time unix @@ -102556,17 +102865,15 @@ self: { "evdev-streamly" = callPackage ({ mkDerivation, base, bytestring, containers, evdev, extra - , filepath-bytestring, rawfilepath, streamly, streamly-fsnotify - , unix + , filepath-bytestring, mtl, rawfilepath, streamly + , streamly-fsnotify, unix }: mkDerivation { pname = "evdev-streamly"; - version = "0.0.2.0"; - sha256 = "0vrkg3d1171lsr71k3vrcf9vbl18mdnvpi02sxvzjp2zbv3gs7v6"; - revision = "1"; - editedCabalFile = "11w831ml0dn9v3gchv8465w43ml8cgcfwgxmpwnjy6v8p34q14qm"; + version = "0.0.2.1"; + sha256 = "00q5i41al5p1f70a44v922qxlafq54pfmbgvh7v0h43rkqjzkj4r"; libraryHaskellDepends = [ - base bytestring containers evdev extra filepath-bytestring + base bytestring containers evdev extra filepath-bytestring mtl rawfilepath streamly streamly-fsnotify unix ]; description = "Bridge for working with evdev and streamly"; @@ -102904,10 +103211,8 @@ self: { }: mkDerivation { pname = "eventlog2html"; - version = "0.11.0"; - sha256 = "0yj50j9jijw8is19d2afpgc3dv45ji911rlhbjvcz7x441valqx8"; - revision = "1"; - editedCabalFile = "11zza33mqh34l9rsryzjpr04whx284wjvjbybaz1m83sc8c8blhx"; + version = "0.11.1"; + sha256 = "1rfyw285g48c7dck8kjykx9n4brw7ngm275n64g1wwwkm4ybn43n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105844,8 +106149,8 @@ self: { }: mkDerivation { pname = "fast-builder"; - version = "0.1.3.0"; - sha256 = "0j2dfh6y689sk5ahh232zl8glbmwp34xnqkmaq9n9jwbddw4fg5z"; + version = "0.1.4.0"; + sha256 = "0v8nzzlnk5zvyfd4k8xakxdrgi0m23mk8k2bglm1447fgg6s02ma"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring process QuickCheck stm ]; benchmarkHaskellDepends = [ @@ -106545,26 +106850,26 @@ self: { "fbrnch" = callPackage ({ mkDerivation, aeson, async, base, bodhi, bugzilla-redhat - , bytestring, config-ini, copr-api, directory, email-validate - , extra, fedora-dists, filepath, http-conduit, http-directory - , http-query, koji, network-uri, pagure, pretty-terminal, process - , rpm-nvr, rpmbuild-order, simple-cmd, simple-cmd-args - , simple-prompt, text, time, typed-process, unix, utf8-string - , xdg-basedir + , bytestring, config-ini, copr-api, directory, either + , email-validate, extra, fedora-releases, filepath, http-conduit + , http-directory, http-query, koji, network-uri, pagure + , pretty-terminal, process, rpm-nvr, rpmbuild-order, say + , select-rpms, simple-cmd, simple-cmd-args, simple-prompt, text + , time, typed-process, unix, utf8-string, xdg-basedir }: mkDerivation { pname = "fbrnch"; - version = "1.4"; - sha256 = "0zcwqihcmvpd3vbbzrn9qy41hd4yapdv7b405gqpz10fbil5w5mq"; + version = "1.5"; + sha256 = "1jj2nnjqpqj1fxx7vliq1ayzwdp6xaphbdln8w2fifwbp8k3znjj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async base bodhi bugzilla-redhat bytestring config-ini - copr-api directory email-validate extra fedora-dists filepath - http-conduit http-directory http-query koji network-uri pagure - pretty-terminal process rpm-nvr rpmbuild-order simple-cmd - simple-cmd-args simple-prompt text time typed-process unix - utf8-string xdg-basedir + copr-api directory either email-validate extra fedora-releases + filepath http-conduit http-directory http-query koji network-uri + pagure pretty-terminal process rpm-nvr rpmbuild-order say + select-rpms simple-cmd simple-cmd-args simple-prompt text time + typed-process unix utf8-string xdg-basedir ]; description = "Fedora packager tool to build package branches"; license = lib.licenses.gpl2Only; @@ -107055,6 +107360,19 @@ self: { broken = true; }) {}; + "fedora-releases" = callPackage + ({ mkDerivation, aeson, base, bodhi, cached-json-file, extra }: + mkDerivation { + pname = "fedora-releases"; + version = "0.1.0"; + sha256 = "0f93dnjbf1nznblj5y2a4w4y5fz7f6rvami57f8zslz4a90iw8pl"; + libraryHaskellDepends = [ + aeson base bodhi cached-json-file extra + ]; + description = "Library for Fedora release versions"; + license = lib.licenses.gpl3Only; + }) {}; + "fedora-repoquery" = callPackage ({ mkDerivation, base, bodhi, cached-json-file, case-insensitive , curl, directory, extra, filepath, Glob, regex-compat, safe @@ -108003,16 +108321,16 @@ self: { }) {}; "fields-and-cases" = callPackage - ({ mkDerivation, base, lima, process, regex-compat, relude + ({ mkDerivation, base, process, regex-compat, relude , string-conversions, tasty, tasty-hunit }: mkDerivation { pname = "fields-and-cases"; - version = "0.1.0.0"; - sha256 = "1d43xg9qss83h1sghy0ki8rfwcq05c00fqks45m2gfvsfx36qxmf"; + version = "0.2.0.0"; + sha256 = "0bw3xdja63zvi1w1i3r5d9jsdpx9dyi1pniv6y4s8w7ryblcg2dw"; libraryHaskellDepends = [ base relude string-conversions ]; testHaskellDepends = [ - base lima process regex-compat relude string-conversions tasty + base process regex-compat relude string-conversions tasty tasty-hunit ]; description = "Codegen Haskell types to other languages"; @@ -108174,8 +108492,8 @@ self: { }: mkDerivation { pname = "file-io"; - version = "0.1.2"; - sha256 = "0yimw53z6j8jb38jhkyjfzziccxvlpd74x6kkn83zkqy120y6rds"; + version = "0.1.4"; + sha256 = "0lkgx2v92zv9r9ndkzlia8k4my242p250i99qbcf6msw04x13ng3"; libraryHaskellDepends = [ base bytestring deepseq filepath unix ]; testHaskellDepends = [ base bytestring filepath tasty tasty-hunit temporary @@ -108398,8 +108716,8 @@ self: { }: mkDerivation { pname = "filepath-bytestring"; - version = "1.4.2.1.13"; - sha256 = "0dvsn98xb5hjczs21r8868n79jygaava1pp5l1mdr823hqlz1bcw"; + version = "1.4.100.3.2"; + sha256 = "1zfhzpbh798n57k3hncingpk2ls1y2b1ap6iznn69sn3v59q2mbq"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring filepath QuickCheck ]; benchmarkHaskellDepends = [ base criterion filepath ]; @@ -108691,6 +109009,8 @@ self: { pname = "fin"; version = "0.3.1"; sha256 = "1y98g48dr046d1v300aj10dq5mrn79yj769gcld01834xi0ng010"; + revision = "1"; + editedCabalFile = "1q6hq4m95b89ig3c21p36ng904vj84r5ga3brj589ifs068lpvv4"; libraryHaskellDepends = [ base boring dec deepseq hashable QuickCheck some universe-base ]; @@ -108893,8 +109213,8 @@ self: { }: mkDerivation { pname = "finitary"; - version = "2.1.3.0"; - sha256 = "14b7qjqya36yk19qivcf4lir0pd89mvrh52pd54niq5sx0c8nxj9"; + version = "2.2.0.0"; + sha256 = "035pbixg74z7xbjw33y50xxgkhml5l3y93izmlilgd8dil8biwl3"; libraryHaskellDepends = [ base bitvec finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise primitive template-haskell @@ -109069,14 +109389,14 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; - "finite-typelits_0_2_0_1" = callPackage + "finite-typelits_0_2_1_0" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, tagged , template-haskell }: mkDerivation { pname = "finite-typelits"; - version = "0.2.0.1"; - sha256 = "1zq3dy1w2h46ybc0ifqdn5f1hnbvsw32vk9ash19lffmqj569di0"; + version = "0.2.1.0"; + sha256 = "0i786r2l3k9fxkpyy6rsi8my6kkar7y8yxk7h9gncm0z6kmvrnvk"; libraryHaskellDepends = [ base deepseq tagged template-haskell ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "A type inhabited by finitely many values, indexed by type-level naturals"; @@ -111397,6 +111717,8 @@ self: { pname = "foldl"; version = "1.4.16"; sha256 = "18bbhz0bjxb30ni9m9nm4aj8klakkd2fbjaymg8j3f0kdki3isj9"; + revision = "1"; + editedCabalFile = "1p628vf9s2ypblfsc5i1vb9xchy6big5nggcqns9xznncvpp23zc"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -111409,6 +111731,29 @@ self: { maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; + "foldl_1_4_17" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers + , contravariant, criterion, doctest, hashable, primitive + , profunctors, random, semigroupoids, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "foldl"; + version = "1.4.17"; + sha256 = "1bk02j6niyw39279cf1im62lzd3gz8dc9qa7kgplz3fyb4chswgm"; + libraryHaskellDepends = [ + base bytestring comonad containers contravariant hashable primitive + profunctors random semigroupoids text transformers + unordered-containers vector + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion profunctors ]; + description = "Composable, streaming, and efficient left folds"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.Gabriella439 ]; + }) {}; + "foldl-exceptions" = callPackage ({ mkDerivation, base, foldl, hedgehog, safe-exceptions }: mkDerivation { @@ -111698,24 +112043,27 @@ self: { }) {}; "fontconfig-pure" = callPackage - ({ mkDerivation, base, containers, css-syntax, fontconfig - , freetype2, hashable, hspec, linear, QuickCheck, scientific - , stylist-traits, text + ({ mkDerivation, base, bytestring, containers, css-syntax + , fontconfig, freetype2, hashable, hspec, linear, msgpack + , QuickCheck, scientific, stylist-traits, text, vector }: mkDerivation { pname = "fontconfig-pure"; - version = "0.4.0.0"; - sha256 = "05nlnr5v1gfi0wrksdpzszpvj1vj5ff2wv2nzm7g43dr9j33xyf6"; + version = "0.5.0.0"; + sha256 = "0r4mqizi9bffaf5azny6lwl9ifmqaw8l6r7c4vsc7f4qlpp7w9yi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers css-syntax freetype2 hashable linear scientific - stylist-traits text + base bytestring containers css-syntax freetype2 hashable linear + msgpack QuickCheck scientific stylist-traits text vector ]; libraryPkgconfigDepends = [ fontconfig ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - description = "Pure-functional language bindings to FontConfig"; + testHaskellDepends = [ + base containers css-syntax hspec msgpack QuickCheck stylist-traits + text + ]; + description = "Resolves font descriptions to font libraries, including ones installed on your freedesktop (Linux or BSD system)"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "fontconfig-pure"; @@ -113020,53 +113368,47 @@ self: { ({ mkDerivation, aeson, annotated-exception, async, autodocodec , autodocodec-openapi3, base, bcp47, Blammo, Blammo-wai, bugsnag , bytestring, case-insensitive, cassava, conduit, conduit-extra - , containers, cookie, datadog, directory, doctest, dotenv, ekg-core - , errors, exceptions, extra, faktory, filepath, freckle-env, Glob - , hashable, hs-opentelemetry-api - , hs-opentelemetry-instrumentation-persistent + , containers, cookie, datadog, doctest, ekg-core, exceptions, extra + , faktory, freckle-env, freckle-http, freckle-otel, Glob, hashable + , hs-opentelemetry-api, hs-opentelemetry-instrumentation-persistent , hs-opentelemetry-instrumentation-wai, hs-opentelemetry-sdk, hspec - , hspec-core, hspec-expectations-json, hspec-expectations-lifted - , hspec-junit-formatter, http-client, http-conduit - , http-link-header, http-types, immortal, lens, lens-aeson - , memcache, monad-control, monad-logger, monad-logger-aeson - , monad-validate, MonadRandom, mtl, network-uri + , hspec-core, hspec-expectations-lifted, hspec-junit-formatter + , http-client, http-types, immortal, lens, monad-control + , monad-logger-aeson, monad-validate, MonadRandom, mtl , nonempty-containers, openapi3, path-pieces, persistent - , persistent-postgresql, postgresql-simple, primitive, pureMD5 - , QuickCheck, resource-pool, resourcet, retry, safe, scientist - , semigroupoids, serialise, template-haskell, text, time - , transformers, transformers-base, typed-process, unliftio - , unordered-containers, vector, wai, wai-extra, yaml, yesod-core - , yesod-test, zlib + , persistent-postgresql, postgresql-simple, primitive, QuickCheck + , resource-pool, resourcet, safe, scientist, semigroupoids + , template-haskell, text, time, transformers, transformers-base + , typed-process, unliftio, unordered-containers, vector, wai + , wai-extra, yaml, yesod-core, yesod-test }: mkDerivation { pname = "freckle-app"; - version = "1.19.0.0"; - sha256 = "19kpkirbaaxs8pis8137fy0xw8b7v38hs8x37piz7cjcmmycwkxk"; + version = "1.20.0.1"; + sha256 = "1lzs43japwnkn4gaxamnsjchimc2v2w8fkjb90j1jjvw1dnnaj8h"; libraryHaskellDepends = [ aeson annotated-exception autodocodec autodocodec-openapi3 base bcp47 Blammo Blammo-wai bugsnag bytestring case-insensitive cassava - conduit conduit-extra containers cookie datadog directory doctest - dotenv ekg-core errors exceptions extra faktory filepath - freckle-env Glob hashable hs-opentelemetry-api + conduit conduit-extra containers cookie datadog doctest ekg-core + exceptions extra faktory freckle-env freckle-http freckle-otel Glob + hashable hs-opentelemetry-api hs-opentelemetry-instrumentation-persistent hs-opentelemetry-instrumentation-wai hs-opentelemetry-sdk hspec hspec-core hspec-expectations-lifted hspec-junit-formatter - http-client http-conduit http-link-header http-types immortal lens - memcache monad-control monad-logger monad-logger-aeson - monad-validate MonadRandom mtl network-uri nonempty-containers - openapi3 path-pieces persistent persistent-postgresql - postgresql-simple primitive pureMD5 QuickCheck resource-pool - resourcet retry safe scientist semigroupoids serialise + http-client http-types immortal lens monad-control + monad-logger-aeson monad-validate MonadRandom mtl + nonempty-containers openapi3 path-pieces persistent + persistent-postgresql postgresql-simple primitive QuickCheck + resource-pool resourcet safe scientist semigroupoids template-haskell text time transformers transformers-base typed-process unliftio unordered-containers vector wai wai-extra yaml yesod-core yesod-test ]; testHaskellDepends = [ - aeson async base Blammo bugsnag bytestring cassava conduit errors - freckle-env hs-opentelemetry-api hspec hspec-expectations-json - hspec-expectations-lifted http-types lens lens-aeson memcache - monad-validate mtl nonempty-containers postgresql-simple QuickCheck - text time unordered-containers vector wai wai-extra zlib + aeson async base Blammo bugsnag bytestring cassava conduit + hs-opentelemetry-api hspec http-types monad-validate + nonempty-containers postgresql-simple QuickCheck vector wai + wai-extra ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -113074,33 +113416,83 @@ self: { }) {}; "freckle-env" = callPackage - ({ mkDerivation, base, doctest, envparse, errors, relude, text - , time + ({ mkDerivation, base, doctest, dotenv, envparse, errors, filepath + , text, time, unliftio }: mkDerivation { pname = "freckle-env"; - version = "0.0.0.0"; - sha256 = "1qhbp7l966kvdaw0bxfzhpckvbqwf251yr0x9s3ppdjn7b7cvkiy"; - libraryHaskellDepends = [ base envparse errors relude text time ]; + version = "0.0.1.1"; + sha256 = "1vvmczv4z4gpp5h3k1ws6ghv6am7xdgx5l3v11bnwyp21fzmzp3n"; + libraryHaskellDepends = [ + base dotenv envparse errors filepath text time unliftio + ]; testHaskellDepends = [ base doctest ]; description = "Some extension to the envparse library"; license = lib.licenses.mit; }) {}; + "freckle-exception" = callPackage + ({ mkDerivation, aeson, annotated-exception, base, exceptions + , monad-logger-aeson, unliftio + }: + mkDerivation { + pname = "freckle-exception"; + version = "0.0.0.0"; + sha256 = "1yxgrg0vqr9qhldww6fz1j9y5cj2rc3kbd40w59cq540plmcmylp"; + libraryHaskellDepends = [ + aeson annotated-exception base exceptions monad-logger-aeson + unliftio + ]; + description = "Some extensions to the annotated-exception library"; + license = lib.licenses.mit; + }) {}; + + "freckle-http" = callPackage + ({ mkDerivation, aeson, annotated-exception, base, Blammo + , bytestring, case-insensitive, conduit, directory, errors, extra + , filepath, freckle-memcached, Glob, hs-opentelemetry-api, hspec + , hspec-expectations-json, hspec-expectations-lifted, http-client + , http-conduit, http-link-header, http-types, lens, lens-aeson + , memcache, monad-logger, monad-validate, mtl, network-uri, retry + , safe, semigroupoids, serialise, text, time, transformers + , unliftio, unordered-containers, zlib + }: + mkDerivation { + pname = "freckle-http"; + version = "0.0.0.0"; + sha256 = "16sli2gcaczrzfmdms6xm9g73yy4vbm7spmigd23nil8g9bab4l2"; + libraryHaskellDepends = [ + aeson annotated-exception base Blammo bytestring case-insensitive + conduit directory errors extra filepath freckle-memcached Glob + hs-opentelemetry-api hspec http-client http-conduit + http-link-header http-types lens lens-aeson memcache monad-logger + monad-validate mtl network-uri retry safe semigroupoids serialise + text time transformers unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations-json + hspec-expectations-lifted http-types lens mtl time + unordered-containers zlib + ]; + description = "..."; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "freckle-kafka" = callPackage ({ mkDerivation, aeson, annotated-exception, base, Blammo - , containers, freckle-env, hs-opentelemetry-sdk, hw-kafka-client - , lens, relude, resource-pool, text, time, unliftio + , bytestring, containers, freckle-env, hs-opentelemetry-sdk + , hw-kafka-client, lens, mtl, resource-pool, text, time, unliftio , unordered-containers, yesod-core }: mkDerivation { pname = "freckle-kafka"; - version = "0.0.0.0"; - sha256 = "0p8nyh0v038j315y0ia6bi7q4c14anfik3ad9bpck62ximabqa72"; + version = "0.0.0.1"; + sha256 = "1ifm5axxng5bknz4v7zv8pjv0fv91hnv2l8jh22s4llj0wax1l28"; libraryHaskellDepends = [ - aeson annotated-exception base Blammo containers freckle-env - hs-opentelemetry-sdk hw-kafka-client lens relude resource-pool text - time unliftio unordered-containers yesod-core + aeson annotated-exception base Blammo bytestring containers + freckle-env hs-opentelemetry-sdk hw-kafka-client lens mtl + resource-pool text time unliftio unordered-containers yesod-core ]; description = "Some extensions to the hw-kafka-client library"; license = lib.licenses.mit; @@ -113108,6 +113500,76 @@ self: { broken = true; }) {}; + "freckle-memcached" = callPackage + ({ mkDerivation, aeson, annotated-exception, base, Blammo + , bytestring, errors, exceptions, freckle-env, freckle-otel + , hashable, hs-opentelemetry-sdk, hspec, hspec-core + , hspec-expectations-lifted, lens, lens-aeson, memcache, mtl + , network-uri, pureMD5, safe, serialise, text, unliftio + , unordered-containers + }: + mkDerivation { + pname = "freckle-memcached"; + version = "0.0.0.2"; + sha256 = "1qqjribjzmpfqqygvl4frxy447sjqs5fin22y9aq075yfvgjq75a"; + libraryHaskellDepends = [ + aeson annotated-exception base Blammo bytestring errors + freckle-otel hashable hs-opentelemetry-sdk lens memcache mtl + network-uri pureMD5 serialise text unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson base Blammo errors exceptions freckle-env + hs-opentelemetry-sdk hspec hspec-core hspec-expectations-lifted + lens lens-aeson memcache mtl safe text unliftio + ]; + description = ".."; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "freckle-otel" = callPackage + ({ mkDerivation, aeson, base, Blammo, bytestring, case-insensitive + , errors, exceptions, faktory, freckle-env, hs-opentelemetry-api + , hs-opentelemetry-sdk, hspec, hspec-core + , hspec-expectations-lifted, http-client, http-conduit, http-types + , lens, mtl, text, unliftio, unordered-containers + }: + mkDerivation { + pname = "freckle-otel"; + version = "0.0.0.2"; + sha256 = "0x70wcqbpzy8x5xd88kvf2k5pg9655w1xqp94ryq2yprkq6vhils"; + libraryHaskellDepends = [ + aeson base Blammo bytestring case-insensitive errors exceptions + faktory hs-opentelemetry-api hs-opentelemetry-sdk http-client + http-conduit http-types lens text unliftio unordered-containers + ]; + testHaskellDepends = [ + base Blammo exceptions freckle-env hs-opentelemetry-api + hs-opentelemetry-sdk hspec hspec-core hspec-expectations-lifted + http-types lens mtl text unliftio + ]; + description = "..."; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "freckle-prelude" = callPackage + ({ mkDerivation, base, containers, freckle-exception, hashable, mtl + , primitive, safe, semigroupoids, text, time, unordered-containers + , vector + }: + mkDerivation { + pname = "freckle-prelude"; + version = "0.0.1.1"; + sha256 = "0mvfh2yw63njx3jmqjzpxzk370gyslfwhss40cysji5j6f9514yf"; + libraryHaskellDepends = [ + base containers freckle-exception hashable mtl primitive safe + semigroupoids text time unordered-containers vector + ]; + description = "Standard prelude for Freckle applications"; + license = lib.licenses.mit; + }) {}; + "freddy" = callPackage ({ mkDerivation, amqp, async, base, broadcast-chan, bytestring , data-default, hspec, random, text, uuid @@ -113166,8 +113628,8 @@ self: { }: mkDerivation { pname = "free-algebras"; - version = "0.1.1.0"; - sha256 = "16y0jvvsz1wr1w0hibnh94r438576ciq5snwjha8ca5b4c9ym980"; + version = "0.1.2.0"; + sha256 = "1q8l0ysn18v1qgi91b4nj26pv9iq1pwilzg19ql36aji193cirxy"; libraryHaskellDepends = [ base containers data-fix dlist free groups kan-extensions mtl transformers @@ -113215,6 +113677,8 @@ self: { pname = "free-category"; version = "0.0.4.5"; sha256 = "0ag52rmxrlhf5afk6nhrcpqwknvqrk9rhfn977zn1i0ad5b6ghag"; + revision = "1"; + editedCabalFile = "12fcz3ja47z0ri3f8nyj7pwizlbgir66z37z01x7l48d0lbg6jgj"; libraryHaskellDepends = [ base free-algebras ]; testHaskellDepends = [ base free-algebras QuickCheck tasty tasty-quickcheck @@ -113258,8 +113722,8 @@ self: { }: mkDerivation { pname = "free-foil"; - version = "0.0.3"; - sha256 = "0gafhqwdzz8zqyfiw50w5zkyg5989hzqlcdq2lgqcqpzvhjg9x1r"; + version = "0.1.0"; + sha256 = "0a0mpacwpyj46p79l3imwazp7a3hlm1bwjh5v1x7sk93kyb8d9fg"; libraryHaskellDepends = [ array base bifunctors containers deepseq template-haskell text ]; @@ -114292,6 +114756,28 @@ self: { mainProgram = "frquotes"; }) {}; + "fs-api" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, digest + , directory, filepath, io-classes, primitive, safe-wild-cards + , tasty, tasty-quickcheck, temporary, text, unix, unix-bytestring + }: + mkDerivation { + pname = "fs-api"; + version = "0.3.0.0"; + sha256 = "1l8rs0r6vbjb06qb5cd2qc9b8lb4cd0n159907q5s5zvm9nfgmd1"; + libraryHaskellDepends = [ + base bytestring containers deepseq digest directory filepath + io-classes primitive safe-wild-cards text unix unix-bytestring + ]; + testHaskellDepends = [ + base bytestring filepath primitive tasty tasty-quickcheck temporary + text + ]; + description = "Abstract interface for the file system"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "fs-events" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -114305,6 +114791,31 @@ self: { broken = true; }) {}; + "fs-sim" = callPackage + ({ mkDerivation, base, base16-bytestring, bifunctors, bytestring + , containers, fs-api, generics-sop, io-classes, mtl, pretty-show + , primitive, QuickCheck, quickcheck-state-machine, random + , safe-wild-cards, strict-stm, tasty, tasty-hunit, tasty-quickcheck + , temporary, text + }: + mkDerivation { + pname = "fs-sim"; + version = "0.3.0.0"; + sha256 = "0wphs3i5f400i313qgii0z76mk3xqvzr5swnmhyc67kcl50l807q"; + libraryHaskellDepends = [ + base base16-bytestring bytestring containers fs-api io-classes mtl + primitive QuickCheck safe-wild-cards strict-stm text + ]; + testHaskellDepends = [ + base bifunctors bytestring containers fs-api generics-sop + pretty-show primitive QuickCheck quickcheck-state-machine random + strict-stm tasty tasty-hunit tasty-quickcheck temporary text + ]; + description = "Simulated file systems"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "fsh-csv" = callPackage ({ mkDerivation, base, hint }: mkDerivation { @@ -115378,6 +115889,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "fused-effects_1_1_2_3" = callPackage + ({ mkDerivation, base, containers, hedgehog, hedgehog-fn + , inspection-testing, markdown-unlit, tasty-bench, transformers + , unliftio-core + }: + mkDerivation { + pname = "fused-effects"; + version = "1.1.2.3"; + sha256 = "0z0gwkb3rw9jpa3zxz5w3fc0x54xww0p5wzp4f0xdargjy1jhmk0"; + libraryHaskellDepends = [ base transformers unliftio-core ]; + testHaskellDepends = [ + base containers hedgehog hedgehog-fn inspection-testing + transformers + ]; + testToolDepends = [ markdown-unlit ]; + benchmarkHaskellDepends = [ base tasty-bench transformers ]; + description = "A fast, flexible, fused effect system"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fused-effects-exceptions" = callPackage ({ mkDerivation, base, fused-effects, markdown-unlit, tasty , tasty-hunit, transformers @@ -115586,8 +116118,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.19"; - sha256 = "1zqqfadxzl9ggs1jarnka9rzdd4f71ikqjhbhfcxkdq0bzj50244"; + version = "0.25.21"; + sha256 = "1qhidm4vlpqh99mk6nn0kx95wbfhkkjy0dfcfvblkp03ckg0qbhm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117243,15 +117775,15 @@ self: { }) {}; "gemmula" = callPackage - ({ mkDerivation, base, HUnit, raw-strings-qq, text }: + ({ mkDerivation, base, HUnit, text }: mkDerivation { pname = "gemmula"; - version = "1.1.1"; - sha256 = "1vrpqigr40injcm07jpga31x0kdaqbxbi35lk6q8p7idaqs6qj8g"; + version = "1.2.0"; + sha256 = "04w3v3sky6rhznqz3izibl24cbrvqywgdd5i8bacg2bdafxbx2qy"; libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ base HUnit raw-strings-qq text ]; - description = "A tiny gemtext parser"; - license = lib.licenses.agpl3Only; + testHaskellDepends = [ base HUnit text ]; + description = "a tiny gemtext parser"; + license = lib.licenses.lgpl3Plus; }) {}; "gemmula-altera" = callPackage @@ -117686,8 +118218,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "generic-enumeration"; - version = "0.1.0.2"; - sha256 = "1j9pdg0ib2ysx4wv357gwvg5j9djm038rj16wpyfc90lsl9m8gdg"; + version = "0.1.0.3"; + sha256 = "02ywn0byg4g42hl28mqc07jifj48jxzmnjm4plfdz4pnxs40kwzg"; libraryHaskellDepends = [ base ]; description = "Generically derived enumerations"; license = lib.licenses.mit; @@ -117860,8 +118392,8 @@ self: { pname = "generic-monoid"; version = "0.1.0.1"; sha256 = "1pradfv1i2z73f3vxx78ahmfsdszcgi44kn29aww2hdgf2np5l6g"; - revision = "3"; - editedCabalFile = "0pyf3yr4haja32nkm3vb28dhdh47cf6h5vqkqih2l6zmbdc2f0lq"; + revision = "4"; + editedCabalFile = "0vdqgq19xr8b8v7i189qcj21m79ncgdscnm8qdp3ynnva74l19j7"; libraryHaskellDepends = [ base ]; description = "Derive monoid instances for product types"; license = lib.licenses.bsd3; @@ -118692,6 +119224,17 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-dlist" = callPackage + ({ mkDerivation, base, dlist, genvalidity, validity-dlist }: + mkDerivation { + pname = "genvalidity-dlist"; + version = "0.1.0.1"; + sha256 = "1n7a4hfg71y1zlspf86dmsgj9hzjcwf0ikkrlhr96g622phvsjw6"; + libraryHaskellDepends = [ base dlist genvalidity validity-dlist ]; + description = "GenValidity support for dlist"; + license = lib.licenses.mit; + }) {}; + "genvalidity-hspec" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-property, hspec , hspec-core, QuickCheck, transformers, validity @@ -119802,6 +120345,8 @@ self: { pname = "ghc-boot"; version = "9.10.1"; sha256 = "02sqxmc2f8lb95hrabj088618sd9by9ypvsrs2f2753dg1xqlbzg"; + revision = "1"; + editedCabalFile = "07pn68dhxfmkh7j49vfswjd480j0f60r87azbwqyglv8cl19bz4h"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath @@ -119969,8 +120514,8 @@ self: { ({ mkDerivation, base, deepseq, ghc-heap, ghc-prim }: mkDerivation { pname = "ghc-datasize"; - version = "0.2.6"; - sha256 = "0nprk7mzr6n63ihjdqrs2kd16hzl72n04zi3hpsjlszy8gzizqg5"; + version = "0.2.7"; + sha256 = "0xndiq2049nrfwrgzdz1m0rkskiqcsblkfxwijxf0lzy4avj4bh1"; libraryHaskellDepends = [ base deepseq ghc-heap ghc-prim ]; description = "Determine the size of data structures in GHC's memory"; license = lib.licenses.bsd3; @@ -120358,6 +120903,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-exactprint_1_9_0_0" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "ghc-exactprint"; + version = "1.9.0.0"; + sha256 = "195y3yy7bjrx3b21nqrhxrnbxidaydb9g28i37wqx5glv8y65v51"; + isLibrary = true; + isExecutable = true; + description = "ExactPrint for GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-exactprint_1_10_0_0" = callPackage ({ mkDerivation }: mkDerivation { @@ -121379,6 +121937,8 @@ self: { pname = "ghc-tags"; version = "1.6"; sha256 = "0iiqapx4v4jz4d7ni4dcvpfl948ydx2a7kxvjsk2irdcknzymblw"; + revision = "1"; + editedCabalFile = "1piwibafkgq2z6h36jpiszs8bzg6xqz954g6b2dr93gfya0qh5jv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121402,6 +121962,8 @@ self: { pname = "ghc-tags"; version = "1.7"; sha256 = "17189yi1zffgcdwx0nb6n4pbv3jhfajhfnag84fnqwy4kbvl5ma4"; + revision = "1"; + editedCabalFile = "0vcqlsrs9zgf3jjl2zc0ibjrgx1sbwvh4vwadmmqm2kkgrkhg7ic"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121425,6 +121987,8 @@ self: { pname = "ghc-tags"; version = "1.8"; sha256 = "0gljssyq1ahgl65vnqqa5s1vglzdisx8wp5p2hwh09diwa2ms9mw"; + revision = "1"; + editedCabalFile = "0b0myml4c6dnjyq519ngwfd3n0ym30z4cqn1934g2z7i1lj59d4l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121448,6 +122012,8 @@ self: { pname = "ghc-tags"; version = "1.9"; sha256 = "0s0gipypdz9d7ny8bz38msqlr88y5b3fcd3xzdcsm5mlbra4m904"; + revision = "1"; + editedCabalFile = "0id8whk4dabyrr7kcbgzn3770ypyqin24fqpc0yn5d5x5jm0ynhz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121466,8 +122032,8 @@ self: { }: mkDerivation { pname = "ghc-tags-core"; - version = "0.6.1.0"; - sha256 = "0x2l1n8fsg7z0x3bvqa806l4ldzxjsapfv9cf3fnvandh9d2dc4p"; + version = "0.6.1.1"; + sha256 = "1p1ykmbq16lg30s2cnwds16aiq4wxiv9s59sa933fk9mv2841gb1"; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq filepath ghc text ]; @@ -121498,8 +122064,8 @@ self: { }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.6.1.0"; - sha256 = "1c3vr9754szadl4bj98hmjz5jmqahggakm7x3838cccqbdrpxyh0"; + version = "0.6.1.1"; + sha256 = "1w1m942hzw63igdjvhb15n5w0yzkm2hp5lyv1dl815dvzj0bn8kq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124398,8 +124964,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20240731"; - sha256 = "03kj5vg98ixjkwnxi6bdwpmyc888hk2w0ah0n59gi9wjlspbgdmi"; + version = "10.20240831"; + sha256 = "1ly9iirr0669i5aq3k1lf60sg5z3p08kn4jnvnjcx0l114b67q3j"; configureFlags = [ "-fassistant" "-f-benchmark" "-fcrypton" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fpairing" "-fproduction" "-ftorrentparser" @@ -126035,8 +126601,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.40.1"; - sha256 = "1214r64pyikz4j4na65ki6glvplm3vpx0glizh2divn1cm8q0zch"; + version = "2.41"; + sha256 = "1sigh9154jxsisszj4sm3zbjja0mgqk9hrv7a4rr2c976pqri9yb"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -131931,30 +132497,29 @@ self: { "grisette" = callPackage ({ mkDerivation, array, async, base, bytestring, containers - , deepseq, doctest, generic-deriving, Glob, hashable, hashtables - , HUnit, intern, loch-th, mtl, parallel, prettyprinter, QuickCheck + , deepseq, doctest, generic-deriving, hashable, hashtables, HUnit + , intern, libBF, loch-th, mtl, parallel, prettyprinter, QuickCheck , sbv, stm, template-haskell, test-framework, test-framework-hunit , test-framework-quickcheck2, text, th-abstraction, th-compat - , transformers, unordered-containers + , th-lift-instances, transformers, unordered-containers }: mkDerivation { pname = "grisette"; - version = "0.7.0.0"; - sha256 = "143a0ghpa3y0dhy7b81f95jiixfhr0pw0fmgvijs6pfsaijw91p0"; - revision = "1"; - editedCabalFile = "0lpxksrphlkfr5njszkfhks19nc7b9pzy84znkyl5g73w35pk91x"; + version = "0.8.0.0"; + sha256 = "0q4s9bflngg7bisj1mds8fr1c5wr58di2rll81j9xwppa45n1qb9"; libraryHaskellDepends = [ array async base bytestring containers deepseq generic-deriving - hashable hashtables intern loch-th mtl parallel prettyprinter + hashable hashtables intern libBF loch-th mtl parallel prettyprinter QuickCheck sbv stm template-haskell text th-abstraction th-compat - transformers unordered-containers + th-lift-instances transformers unordered-containers ]; testHaskellDepends = [ array async base bytestring containers deepseq doctest - generic-deriving Glob hashable hashtables HUnit intern loch-th mtl + generic-deriving hashable hashtables HUnit intern libBF loch-th mtl parallel prettyprinter QuickCheck sbv stm template-haskell test-framework test-framework-hunit test-framework-quickcheck2 text - th-abstraction th-compat transformers unordered-containers + th-abstraction th-compat th-lift-instances transformers + unordered-containers ]; description = "Symbolic evaluation as a library"; license = lib.licenses.bsd3; @@ -133636,8 +134201,8 @@ self: { }: mkDerivation { pname = "h3spec"; - version = "0.1.10"; - sha256 = "0cqqhskk4rip3j903ynml1dcbm2v8si15c2kfwy2l42rj2fj0s1g"; + version = "0.1.11"; + sha256 = "0h519wf2a9swgi695ynydvfcrmmbr70kin49qk04a4nx9b4lcln1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135983,6 +136548,8 @@ self: { pname = "hakyll"; version = "4.16.2.2"; sha256 = "0hnqf4xxgf1qgk262qvq0b0mx51jfv67y2kn6ca8jsp43dxy9941"; + revision = "1"; + editedCabalFile = "10ifx60yb8fi9y8xmqb446nzgqs5r0jh0cbrwkm2iy8valb8z63x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -137978,7 +138545,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "happstack-server_7_9_0" = callPackage + "happstack-server_7_9_2_1" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network @@ -137989,10 +138556,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.9.0"; - sha256 = "1chia8km9pd6ys1vgy6ybsqj48zmvhb2iqs60lmizdyhc5yxk0c6"; - revision = "1"; - editedCabalFile = "13fmnkl9rrvdskrzhjbdfm9478mwz2pdmhyds33b32v8jaml08qc"; + version = "7.9.2.1"; + sha256 = "177qzsny5gn409j5l8ixyrs22dg8rnvrcjipv313rzkr449bl6sx"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -138015,8 +138580,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.2.1.5"; - sha256 = "0mm5pw6nkg53s3k7ljx3r1l36wf41k2xfkn7cc2g6mhh6l5srzyd"; + version = "7.2.1.6"; + sha256 = "05gdqkgrvkv6qbcdfwyblnv4bs03gr1nl467kr6g4x4cwj77fmf3"; libraryHaskellDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -138999,6 +139564,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "hashable_1_4_7_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, filepath + , ghc-bignum, ghc-prim, HUnit, os-string, primitive, QuickCheck + , random, tasty, tasty-hunit, tasty-quickcheck, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.4.7.0"; + sha256 = "1np8y26pbwhfg136shp8w52yc7a7q35j9icf2h6q623s0b4y9biv"; + libraryHaskellDepends = [ + base bytestring containers deepseq filepath ghc-bignum ghc-prim + os-string text + ]; + testHaskellDepends = [ + base bytestring filepath ghc-prim HUnit os-string primitive + QuickCheck random tasty tasty-hunit tasty-quickcheck text unix + ]; + description = "A class for types that can be converted to a hash value"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashable_1_5_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, filepath , ghc-bignum, ghc-prim, HUnit, os-string, primitive, QuickCheck @@ -139170,17 +139757,17 @@ self: { }) {}; "hashes" = callPackage - ({ mkDerivation, base, bytestring, criterion, openssl, QuickCheck - , sha-validation, sydtest, vector + ({ mkDerivation, base, bytestring, criterion, hspec, openssl + , QuickCheck, sha-validation, vector }: mkDerivation { pname = "hashes"; - version = "0.3.0"; - sha256 = "007hn43jnz0pgv49if9g4z3r13q8kkla9w15ggbdrc2hksdbzf3v"; + version = "0.3.0.1"; + sha256 = "0frrqa16p855qgs2lphdl9ka803j3xra7jw31s51r6xdh2ilb9jd"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ - base bytestring QuickCheck sha-validation sydtest vector + base bytestring hspec QuickCheck sha-validation vector ]; testSystemDepends = [ openssl ]; benchmarkHaskellDepends = [ base bytestring criterion ]; @@ -140222,8 +140809,8 @@ self: { }: mkDerivation { pname = "haskell-ffprobe"; - version = "0.1.0.0"; - sha256 = "12cah6yyzbkd8k44h4dlhbw0jza557mcnw994hig2p8xd89vk4bz"; + version = "0.1.0.1"; + sha256 = "00b7pacn8bn7xhhznpbnnxzqjzf615winq6pnhs08yhawyvb0af3"; libraryHaskellDepends = [ aeson base bytestring process scientific text ]; @@ -143630,18 +144217,18 @@ self: { }) {}; "haskus-utils-data" = callPackage - ({ mkDerivation, base, containers, doctest, ghc-prim - , haskus-utils-types, mtl, recursion-schemes, transformers + ({ mkDerivation, base, containers, ghc-prim, haskus-utils-types + , mtl, recursion-schemes, transformers }: mkDerivation { pname = "haskus-utils-data"; - version = "1.4"; - sha256 = "18k8kbfy60l60pzc3c3kwny87avwp6sn766cg4b0z47hx8d70i5k"; + version = "1.5"; + sha256 = "0hwvmg1zhi2i3hwpjg9siq06hllgrk41zs19fxw9xz3i652b2b9j"; libraryHaskellDepends = [ base containers ghc-prim haskus-utils-types mtl recursion-schemes transformers ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ base ]; description = "Haskus data utility modules"; license = lib.licenses.bsd3; }) {}; @@ -143802,19 +144389,20 @@ self: { }) {}; "hasmtlib" = callPackage - ({ mkDerivation, attoparsec, base, bitvec, bytestring, containers - , data-default, dependent-map, finite-typelits, lens, mtl - , smtlib-backends, smtlib-backends-process, some, text, utf8-string - , vector-sized + ({ mkDerivation, array, attoparsec, base, bitvec, bytestring + , containers, data-default, dependent-map, finite-typelits, lens + , mtl, smtlib-backends, smtlib-backends-process, some, text + , unordered-containers, utf8-string, vector-sized }: mkDerivation { pname = "hasmtlib"; - version = "2.1.0"; - sha256 = "071aslizvy9bx3k8aixraz57s2qwg2fg751mghbk057y62az56wv"; + version = "2.6.1"; + sha256 = "004dic90jsf65z6y8zv0ik3bb9ln1zw5b42kgdm5a4cg97q02fy2"; libraryHaskellDepends = [ - attoparsec base bitvec bytestring containers data-default + array attoparsec base bitvec bytestring containers data-default dependent-map finite-typelits lens mtl smtlib-backends - smtlib-backends-process some text utf8-string vector-sized + smtlib-backends-process some text unordered-containers utf8-string + vector-sized ]; description = "A monad for interfacing with external SMT solvers"; license = lib.licenses.gpl3Only; @@ -143897,7 +144485,7 @@ self: { license = lib.licenses.mit; }) {}; - "hasql_1_8" = callPackage + "hasql_1_8_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , criterion, dlist, hashable, hashtables, hspec, hspec-discover @@ -143908,8 +144496,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.8"; - sha256 = "0jaapi6p45iy1z62pi81h1w52icvk1lbd7nsx16wnl6h9bx10mr4"; + version = "1.8.0.2"; + sha256 = "0dgvbvvkn7d5khz5p97ndbw6j72zram986yn6m519ng3c30d51q9"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables iproute mtl @@ -145303,28 +145891,6 @@ self: { }) {}; "haxr" = callPackage - ({ mkDerivation, array, base, base-compat, base64-bytestring - , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams - , http-types, io-streams, mtl, mtl-compat, network, network-uri - , old-locale, old-time, template-haskell, text, time, utf8-string - }: - mkDerivation { - pname = "haxr"; - version = "3000.11.5"; - sha256 = "1n2q7r0a6c24xbvdnl7ql5cc25sbbalmdc75rmlpazhkazq8jy99"; - revision = "4"; - editedCabalFile = "14cmszqfr4c8zp9zzz1729m3a4fhiglp3h04zqza4capf2cw5mr5"; - libraryHaskellDepends = [ - array base base-compat base64-bytestring blaze-builder bytestring - HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat - network network-uri old-locale old-time template-haskell text time - utf8-string - ]; - description = "XML-RPC client and server library"; - license = lib.licenses.bsd3; - }) {}; - - "haxr_3000_11_5_1" = callPackage ({ mkDerivation, array, base, base-compat, base64-bytestring , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams , http-types, io-streams, mtl, mtl-compat, network, network-uri @@ -145342,7 +145908,6 @@ self: { ]; description = "XML-RPC client and server library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "haxr-th" = callPackage @@ -146272,19 +146837,19 @@ self: { }) {}; "hdf5" = callPackage - ({ mkDerivation, base, bindings-DSL, bytestring, exceptions - , hdf5-serial, hspec, libffi, lifted-base, monad-control, primitive - , QuickCheck, tagged, temporary, transformers, vector + ({ mkDerivation, base, bindings-DSL, bytestring, exceptions, hdf5 + , hspec, libffi, lifted-base, monad-control, primitive, QuickCheck + , tagged, temporary, transformers, vector }: mkDerivation { pname = "hdf5"; - version = "1.8.11"; - sha256 = "1vczdmm389zg002ay1x4ia4xx6k41zz0qj5979di03mjlrzq9nws"; + version = "1.8.12"; + sha256 = "07hcb2hld6wh5d8av77rzj1pr3gj5xpnk4364ks7xr38hx6lmiz3"; libraryHaskellDepends = [ base bindings-DSL bytestring libffi lifted-base monad-control primitive tagged transformers vector ]; - libraryPkgconfigDepends = [ hdf5-serial ]; + libraryPkgconfigDepends = [ hdf5 ]; testHaskellDepends = [ base bytestring exceptions hspec QuickCheck temporary vector ]; @@ -146292,7 +146857,7 @@ self: { license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; broken = true; - }) {hdf5-serial = null;}; + }) {inherit (pkgs) hdf5;}; "hdf5-lite" = callPackage ({ mkDerivation, base, c2hs, containers, exceptions, ghc-prim, hdf5 @@ -147190,8 +147755,8 @@ self: { pname = "hedgehog-fn"; version = "1.0"; sha256 = "05drd7jsz54kgwxr5z9vifmql6xif7ma7878qddw2nss5s6wa2qp"; - revision = "3"; - editedCabalFile = "1nz3ndndvb0xpnlrkx02l02a62jmrx01jcgxd36k843aacjklyax"; + revision = "4"; + editedCabalFile = "1hsykw437b402bkbys1ajr6w1g0s3a1hsbp0k0207hrclrbf1s95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147558,8 +148123,8 @@ self: { }: mkDerivation { pname = "heftia"; - version = "0.2.0.0"; - sha256 = "1kqpg346sbavphq00spl9pmj1f7d9n467zc8qil82q71nsmhqni3"; + version = "0.3.0.0"; + sha256 = "1brmn77ihnx2a7w64ikw9n8ym4gkaw7zkz5ycrc5dfzsl9ai220s"; libraryHaskellDepends = [ base constraints data-effects extensible free kan-extensions membership mtl singletons-base singletons-th transformers @@ -147574,25 +148139,27 @@ self: { "heftia-effects" = callPackage ({ mkDerivation, base, containers, data-effects, extensible, extra - , free, ghc-typelits-knownnat, heftia, loglevel, mtl, tasty - , tasty-discover, tasty-hunit, text, time, transformers, unliftio + , free, ghc-typelits-knownnat, heftia, hspec, mtl, tasty + , tasty-discover, tasty-hspec, text, time, transformers + , unbounded-delays, unliftio }: mkDerivation { pname = "heftia-effects"; - version = "0.2.0.0"; - sha256 = "0jk9gmrh1y9dzxsva4azbd74bgxfqswh4awsxgmpqigg1g36m6sh"; + version = "0.3.0.0"; + sha256 = "00lgnsnyn0rwhgnzfdq6kq5wxcs3w6d6awcj65kikhp9ysnv0j5n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-effects extensible free ghc-typelits-knownnat - heftia mtl transformers unliftio + base containers data-effects extensible extra free + ghc-typelits-knownnat heftia mtl time transformers unbounded-delays + unliftio ]; executableHaskellDepends = [ - base data-effects extra ghc-typelits-knownnat heftia loglevel text - time + base data-effects extra ghc-typelits-knownnat heftia text time ]; testHaskellDepends = [ - base data-effects ghc-typelits-knownnat heftia tasty tasty-hunit + base data-effects ghc-typelits-knownnat heftia hspec tasty + tasty-hspec unliftio ]; testToolDepends = [ tasty-discover ]; description = "higher-order effects done right"; @@ -148220,6 +148787,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "heptapod" = callPackage + ({ mkDerivation, base, bytestring, entropy, tasty, tasty-bench + , tasty-hunit, time, uuid, uuid-types + }: + mkDerivation { + pname = "heptapod"; + version = "1.0.0.0"; + sha256 = "0a25m30q0blsmylj2k8qjnp4nkx06fyxdn73p3cbp15y5l128i2h"; + libraryHaskellDepends = [ + base bytestring entropy time uuid-types + ]; + testHaskellDepends = [ base tasty tasty-hunit time uuid-types ]; + benchmarkHaskellDepends = [ base tasty-bench uuid ]; + description = "Generate UUIDv7 values"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "her-lexer" = callPackage ({ mkDerivation, base, mtl, split }: mkDerivation { @@ -149181,6 +149767,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "hexml_0_3_5" = callPackage + ({ mkDerivation, base, bytestring, extra }: + mkDerivation { + pname = "hexml"; + version = "0.3.5"; + sha256 = "15mjy6cxihh4bwdi0mh2vawqimpylzvl0jnpxwgalg96dsnj30a1"; + libraryHaskellDepends = [ base bytestring extra ]; + testHaskellDepends = [ base bytestring ]; + description = "XML subset DOM parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hexml-lens" = callPackage ({ mkDerivation, base, bytestring, contravariant, foundation, hexml , hspec, lens, profunctors, text, wreq @@ -150819,6 +151418,8 @@ self: { pname = "higgledy"; version = "0.4.2.1"; sha256 = "0gwlksxqfngd3ikc5nlbh7jq42l8siriqmgbravkvk1f78p1rcy3"; + revision = "1"; + editedCabalFile = "1qfknh9696gywnwrp45xrqzw1dqv1pr3gsla9fw9rr4i28pbd4br"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ barbies base generic-lens generic-lens-core named QuickCheck @@ -152982,10 +153583,8 @@ self: { }: mkDerivation { pname = "hledger-stockquotes"; - version = "0.1.2.1"; - sha256 = "09h021dcpya8492kgyqkd2irxa10kwc9dgzk5xn7r121hl55jp50"; - revision = "1"; - editedCabalFile = "1b10qfxps3iz69l05gagshphifhxw5nvsx79yfyc4iq1rb8hnxc7"; + version = "0.1.3.1"; + sha256 = "111zpplj059iyxwy8rnjq7jrspm5sjqcx9jx0lrrz7yrj608id0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152993,7 +153592,7 @@ self: { split text time unordered-containers ]; executableHaskellDepends = [ - aeson base bytestring cmdargs directory raw-strings-qq + aeson base bytestring cmdargs containers directory raw-strings-qq safe-exceptions text time xdg-basedir yaml ]; testHaskellDepends = [ @@ -153223,7 +153822,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) fam;}; + }) {fam = null;}; "hlibgit2" = callPackage ({ mkDerivation, base, bindings-DSL, git, openssl, process, zlib }: @@ -153473,8 +154072,8 @@ self: { pname = "hlrdb"; version = "0.4.0.0"; sha256 = "0cj2ff40n3v171xhvdips3als1f2x91ksxcqm7i570mwkdgbh1jr"; - revision = "1"; - editedCabalFile = "0ymp486cfw71vv2ydn9dgaixmq5dgcpy5x1jzibrld5cd14fs3gg"; + revision = "2"; + editedCabalFile = "0yfd3l9hiplva8dp4l21pfqycswbwgvy9588gmm3h71dnr6md1sg"; libraryHaskellDepends = [ base base64 bytestring cryptonite hashable hedis hlrdb-core memory random store time unordered-containers zstd @@ -153492,8 +154091,8 @@ self: { pname = "hlrdb-core"; version = "0.2.0.0"; sha256 = "0hkjll4v4kxc133b19kk9k4dkrbag6qdw24gwrhikrxlk666jsbl"; - revision = "3"; - editedCabalFile = "169a7j9n3sgya96xkklcrbqv08prh41r024dgzr6q0a1wn5j7f04"; + revision = "5"; + editedCabalFile = "1wd5fx9q9h8ypc1rzpgpdcdvrvmd7v9rricy0k856jl1r7blsm93"; libraryHaskellDepends = [ base bytestring hashable hedis lens mtl profunctors random time unordered-containers @@ -158642,6 +159241,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gsl;}; + "hqcsim" = callPackage + ({ mkDerivation, base, hmatrix, random }: + mkDerivation { + pname = "hqcsim"; + version = "0.1.0.0"; + sha256 = "0qb9xi2z9k8a33536zrqsycs52q0x78f9jf36mdzcrgj4972sygh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hmatrix random ]; + executableHaskellDepends = [ base hmatrix random ]; + description = "A library for simulating quantum circuits"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hqcsim-exe"; + broken = true; + }) {}; + "hquantlib" = callPackage ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl , hmatrix-special, hquantlib-time, HUnit, mersenne-random-pure64 @@ -158943,6 +159559,30 @@ self: { license = lib.licenses.bsd3; }) {GeoIP = null;}; + "hs-asapo" = callPackage + ({ mkDerivation, base, bytestring, cabal-doctest, clock, doctest + , libasapo-consumer, libasapo-producer, optparse-applicative, text + , time, timerep + }: + mkDerivation { + pname = "hs-asapo"; + version = "0.9.0"; + sha256 = "0629yz0zpq6zyqxxczmpv246nz4mv2vz1nv46w72cqz4b5mbanmf"; + setupHaskellDepends = [ base cabal-doctest ]; + libraryHaskellDepends = [ + base bytestring clock text time timerep + ]; + libraryPkgconfigDepends = [ libasapo-consumer libasapo-producer ]; + testHaskellDepends = [ + base bytestring clock doctest text time timerep + ]; + benchmarkHaskellDepends = [ base optparse-applicative text time ]; + description = "Haskell bindings for ASAP:O"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {libasapo-consumer = null; libasapo-producer = null;}; + "hs-aws-lambda" = callPackage ({ mkDerivation, aeson, base, base64, bytestring, case-insensitive , containers, deepseq, http-client, http-types, safe-exceptions @@ -159273,6 +159913,22 @@ self: { broken = true; }) {}; + "hs-highlight" = callPackage + ({ mkDerivation, base, bytestring, hspec }: + mkDerivation { + pname = "hs-highlight"; + version = "1.0.3"; + sha256 = "0m6x96v5h2xdw618y5ljp0cpy52np8lvd126sp7mqfqr318vx51x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "A tool to highlight terminal strings"; + license = lib.licenses.mit; + mainProgram = "test-exe"; + }) {}; + "hs-inspector" = callPackage ({ mkDerivation, base, haskell-src, hspec }: mkDerivation { @@ -162557,6 +163213,8 @@ self: { pname = "hslua-module-zip"; version = "1.1.3"; sha256 = "1fws5jwf1zwqilgm05y28ywgxavygnjpdlj43nhfg8cmng1p0kyq"; + revision = "1"; + editedCabalFile = "1ml14hycwh4wg8351b8dq94qyppkzhw8jk0b0dgahqvy7p5w86y3"; libraryHaskellDepends = [ base bytestring filepath hslua-core hslua-list hslua-marshalling hslua-packaging hslua-typing text time zip-archive @@ -163466,14 +164124,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "hspec-hedgehog_0_2_0_0" = callPackage + "hspec-hedgehog_0_3_0_0" = callPackage ({ mkDerivation, base, hedgehog, hspec, hspec-core, hspec-discover , HUnit, QuickCheck, splitmix }: mkDerivation { pname = "hspec-hedgehog"; - version = "0.2.0.0"; - sha256 = "1xf0sl6sliri7cc6wp5h9l90a732fkycmr71af2jv6yr8nv5rpak"; + version = "0.3.0.0"; + sha256 = "1px71jwxvqdh837fvlmx4smcvci9bbkygb7n10vasfpyb2k0yhzy"; libraryHaskellDepends = [ base hedgehog hspec hspec-core QuickCheck splitmix ]; @@ -165285,6 +165943,8 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Validating an email address against HTML standard"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "html-entities" = callPackage @@ -165524,19 +166184,44 @@ self: { }) {}; "htmx" = callPackage - ({ mkDerivation, base, lucid, servant, text }: + ({ mkDerivation, base, http-api-data, text }: mkDerivation { pname = "htmx"; - version = "0.0.0.1"; - sha256 = "0l799xcynf03g6kw6p3pp9j3ild2cr870jwccjswkgy1hsbcxjkk"; - libraryHaskellDepends = [ base lucid servant text ]; - testHaskellDepends = [ base lucid servant text ]; + version = "0.1.0.1"; + sha256 = "06wnjhjgimggfhl2510lxwabqr5hdzb7yqlbmv9mi01c50q6idam"; + libraryHaskellDepends = [ base http-api-data text ]; description = "Use htmx with various haskell libraries"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "htmx-lucid" = callPackage + ({ mkDerivation, base, htmx, lucid2, text }: + mkDerivation { + pname = "htmx-lucid"; + version = "0.2.0.0"; + sha256 = "1ilr1xarmavzfcy53asazk64gkww7wsjsmz0jyrbr4qj076dqj36"; + libraryHaskellDepends = [ base htmx lucid2 text ]; + description = "Use htmx with lucid"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "htmx-servant" = callPackage + ({ mkDerivation, base, htmx, htmx-lucid, lucid2, servant, text }: + mkDerivation { + pname = "htmx-servant"; + version = "0.2.0.1"; + sha256 = "0vwj3d34ada0iskjr4k7a75x6hf750b71acjphnwddpqf233mfla"; + libraryHaskellDepends = [ + base htmx htmx-lucid lucid2 servant text + ]; + description = "Use htmx with servant"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "htn" = callPackage ({ mkDerivation, base, containers, hspec }: mkDerivation { @@ -165807,6 +166492,8 @@ self: { pname = "http-api-data"; version = "0.6.1"; sha256 = "1kz3qjjazl61q7iad6q67zdsm2gynsjdfcn34rzmybjhq27wylas"; + revision = "1"; + editedCabalFile = "0gw1hahhc5pyagvmvbpwqbm7sqpyfccy59p249jrmz667hsz92g3"; libraryHaskellDepends = [ base bytestring containers cookie hashable http-types tagged text text-iso8601 time-compat transformers unordered-containers @@ -165874,8 +166561,8 @@ self: { }: mkDerivation { pname = "http-barf"; - version = "0.1.0.0"; - sha256 = "0x5aczgzg1ck0yb7mjphl8p45y3kdg83zrzr5l2pvmpb5i6y7v6r"; + version = "0.1.1.0"; + sha256 = "1x1jmyqyrh4jmagml1vnjaf2hr5qvs1fjnvabslvvz33hx601398"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls mtl vector ]; @@ -166226,6 +166913,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "http-conduit_2_3_9" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , blaze-builder, bytestring, case-insensitive, conduit + , conduit-extra, cookie, crypton-connection, data-default-class + , hspec, http-client, http-client-tls, http-types, HUnit, mtl + , network, resourcet, streaming-commons, temporary, text, time, tls + , transformers, unliftio, unliftio-core, utf8-string, wai + , wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "http-conduit"; + version = "2.3.9"; + sha256 = "0mg9l71lcilgc5mfc6syw71hqk17jc7f880s63zrwvfxnhc2cvi9"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-aeson base bytestring conduit + conduit-extra http-client http-client-tls http-types mtl resourcet + transformers unliftio-core + ]; + testHaskellDepends = [ + aeson attoparsec-aeson base blaze-builder bytestring + case-insensitive conduit conduit-extra cookie crypton-connection + data-default-class hspec http-client http-types HUnit network + resourcet streaming-commons temporary text time tls transformers + unliftio utf8-string wai wai-conduit warp warp-tls + ]; + doCheck = false; + description = "HTTP client package with conduit interface and HTTPS support"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, conduit, containers, cookie, data-default @@ -166461,8 +167179,8 @@ self: { }: mkDerivation { pname = "http-interchange"; - version = "0.3.2.1"; - sha256 = "1jji8wjdivpwd4zmhljn39d2rwvrlyxz7gmnacm8qkjmfhkhppkq"; + version = "0.3.2.2"; + sha256 = "0smmf2c86s01vp8vdyjl2hcqmq3q95r8ngdvs2d8drr7llf0dizv"; libraryHaskellDepends = [ base bytebuild byteslice bytesmith contiguous primitive text ]; @@ -166872,8 +167590,8 @@ self: { }: mkDerivation { pname = "http-semantics"; - version = "0.2.0"; - sha256 = "0n37zspfc6n5rswn10rxg21azkc40a60sl3c2f0zvzkqvsvfp0q3"; + version = "0.2.1"; + sha256 = "1nzxqrlxmkld86msmdp1zaqvsw3jbbj63n7r0bpgmyq7nnxqxiks"; libraryHaskellDepends = [ array base bytestring case-insensitive http-types network network-byte-order time-manager utf8-string @@ -167103,24 +167821,24 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_5_3_1" = callPackage + "http2_5_3_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers - , crypton, directory, filepath, gauge, Glob, hspec, hspec-discover - , http-semantics, http-types, network, network-byte-order - , network-control, network-run, random, stm, text, time-manager - , typed-process, unix-time, unliftio, unordered-containers - , utf8-string, vector + , criterion, crypton, directory, filepath, Glob, hspec + , hspec-discover, http-semantics, http-types, iproute, network + , network-byte-order, network-control, network-run, random, stm + , text, time-manager, typed-process, unix-time, unliftio + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "http2"; - version = "5.3.1"; - sha256 = "0kc6akdinvgr4vigrh8zhaly8qy3r52sqazlqm6zgxm79ypb7djj"; + version = "5.3.4"; + sha256 = "006l2asgkcgdiyknl363n3wfdmaxbqnnf9kls4ljqxvc677l2jj3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array async base bytestring case-insensitive containers - http-semantics http-types network network-byte-order + http-semantics http-types iproute network network-byte-order network-control stm time-manager unix-time unliftio utf8-string ]; testHaskellDepends = [ @@ -167131,8 +167849,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers gauge - network-byte-order stm + array base bytestring case-insensitive containers criterion + network-byte-order stm unliftio ]; description = "HTTP/2 library"; license = lib.licenses.bsd3; @@ -167260,8 +167978,8 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.4.1"; - sha256 = "0sfzvbif14bszfbyal79q1lhha2hknmp0ala2r7sw1kdg824c6dr"; + version = "0.4.2"; + sha256 = "0fqdad7lrw7m942xl3k0yipm2qr48j3qd14a9a6m87dv2rypsqg4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167276,7 +167994,7 @@ self: { }) {}; "http3" = callPackage - ({ mkDerivation, array, attoparsec, base, base16-bytestring + ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , bytestring, case-insensitive, conduit, conduit-extra, containers , crypton, hspec, hspec-discover, http-semantics, http-types, http2 , iproute, network, network-byte-order, quic, QuickCheck, sockaddr @@ -167284,14 +168002,14 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.0.16"; - sha256 = "1b8zi7qklvz11793qi1whlnbx2c87c714p7faz9j2j6lc1i2dvwd"; + version = "0.0.18"; + sha256 = "1wmh13irvsfkbzmg1xh5p68xqhvs21hr9dk3dk845xdn269vxidq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring case-insensitive containers http-semantics - http-types http2 network network-byte-order quic sockaddr stm - time-manager unliftio + array async base bytestring case-insensitive containers + http-semantics http-types http2 network network-byte-order quic + sockaddr stm time-manager unliftio ]; testHaskellDepends = [ attoparsec base base16-bytestring bytestring conduit conduit-extra @@ -167310,6 +168028,8 @@ self: { pname = "httpd-shed"; version = "0.4.1.2"; sha256 = "0ls6aim2glhmn8ncskvgkjbh3cyq3a6r7a5623ciir57nwd5g85k"; + revision = "1"; + editedCabalFile = "0f6ffi5gb77ma78fwvnq8ahzz8cj671dq0klbxd0sbnkmibvs3xb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network network-bsd network-uri ]; @@ -168693,8 +169413,8 @@ self: { pname = "hw-ip"; version = "2.4.2.1"; sha256 = "1cwj6402314lblh7cm77j1bkpnjqpsk7rn8z94awqp4pfp4x8dk0"; - revision = "2"; - editedCabalFile = "0jkn9474ldwm3dy24lscjv16rx8hb2yr2r10lfgrw3i2y72c7gax"; + revision = "3"; + editedCabalFile = "1bg84h0iq648byy42ra06fpgdb7kzlaaq28q3rjwcx5pzjah4bb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168929,8 +169649,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "6.0.0"; - sha256 = "1dbii37kgh4gsa30a7wqsl5vdwir7v2y3kksk9ab4djfir154anv"; + version = "6.0.1"; + sha256 = "1910yzn569x9iicd8c8ykkq3p5vz3py6d4j0pvwqy1h07xp528sk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169128,8 +169848,8 @@ self: { }: mkDerivation { pname = "hw-polysemy"; - version = "0.2.14.0"; - sha256 = "0scmhk2wwgf4dpwwjw3idhhjqma58i0smcc2s2amgbw294bjnxw4"; + version = "0.2.14.2"; + sha256 = "08cllz3vm444yzvds9b5057l235gs5ardy9x9fbkagdryids6afp"; libraryHaskellDepends = [ aeson aeson-pretty async base binary bytestring contravariant Diff directory exceptions filepath generic-lens ghc-prim http-conduit @@ -169348,10 +170068,8 @@ self: { }: mkDerivation { pname = "hw-streams"; - version = "0.0.1.0"; - sha256 = "0hzpx1j06h98y0zcmysklzn3s3mvpbb1nkwg4zkbdxvzzqs5hnm5"; - revision = "5"; - editedCabalFile = "0a34xli9sdvqzc571k72hl3a2jhbhxs24y03k6pdzzz3akznhbn0"; + version = "0.0.1.1"; + sha256 = "1v6zinwzmss62n39h8l41i3h0spd6qam27h8nkap856jlrv9n9gr"; libraryHaskellDepends = [ base bytestring ghc-prim hw-bits hw-prim mmap primitive transformers vector @@ -170159,20 +170877,20 @@ self: { "hydra" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , directory, filepath, hspec, hspec-discover, HsYAML, HUnit - , QuickCheck, scientific, split, text, unordered-containers, vector + , QuickCheck, scientific, split, text, vector }: mkDerivation { pname = "hydra"; - version = "0.1.1"; - sha256 = "1ljr6id1z4ym6ipmjhz1msmnqfbsj1z5klhx27dhxwmbfv5ndhyn"; + version = "0.5.1"; + sha256 = "0jg4dailiw0h8img3syhkxdzdlh3z11lya5azaqf0ki5kwh349n8"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring containers directory filepath - HsYAML scientific split text unordered-containers vector + HsYAML scientific split text vector ]; testHaskellDepends = [ aeson aeson-pretty base bytestring containers directory filepath hspec hspec-discover HsYAML HUnit QuickCheck scientific split text - unordered-containers vector + vector ]; testToolDepends = [ hspec-discover ]; description = "Type-aware transformations for data and programs"; @@ -171203,7 +171921,6 @@ self: { ]; description = "Lattice iCE40 Primitive IP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "icepeak" = callPackage @@ -176326,18 +177043,21 @@ self: { }) {}; "io-classes" = callPackage - ({ mkDerivation, array, async, base, bytestring, mtl, primitive - , stm, time + ({ mkDerivation, array, async, base, bytestring, deepseq, nothunks + , primitive, QuickCheck, stm, tasty, tasty-quickcheck, time }: mkDerivation { pname = "io-classes"; - version = "1.5.0.0"; - sha256 = "1iwzmi6z3v9sx7n3x8yg1xa262i898f6vddxhx9lhgby0hw3r4i9"; - revision = "1"; - editedCabalFile = "0mqx8dq16y6ig3gxn7cdr6h3d6via1j5q8n7a3s8sln0apkak440"; + version = "1.7.0.0"; + sha256 = "1lnp09xmkl63zfy3ly5lmy1fsidngzksh35ws753s9287wc9fxbh"; + revision = "2"; + editedCabalFile = "1lkffla90j6fp64kbw220dsqxy0cqwa0987ssp24skkkgk5j0132"; libraryHaskellDepends = [ - array async base bytestring mtl primitive stm time + array async base bytestring deepseq nothunks primitive QuickCheck + stm time ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + doHaddock = false; description = "Type classes for concurrency with STM, ST and timing"; license = lib.licenses.asl20; }) {}; @@ -176353,6 +177073,7 @@ self: { libraryHaskellDepends = [ array base io-classes mtl si-timers ]; description = "Experimental MTL instances for io-classes"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "io-machine" = callPackage @@ -176425,20 +177146,21 @@ self: { "io-sim" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq , exceptions, io-classes, nothunks, parallel, primitive, psqueues - , QuickCheck, quiet, si-timers, strict-stm, tasty, tasty-hunit - , tasty-quickcheck, time + , QuickCheck, quiet, tasty, tasty-hunit, tasty-quickcheck, time }: mkDerivation { pname = "io-sim"; - version = "1.5.0.0"; - sha256 = "0074ngiwrs7fnrllnzh7dz5k1f5dv65d7b9bjmx6kzfn38pmmn0v"; + version = "1.6.0.0"; + sha256 = "0ripyhcmvvlqhb2v2gnbvbmb6bi7pqlcnly7cs7a5rxb9iww4qla"; + revision = "3"; + editedCabalFile = "16if6l47s01q7lbx8b1ymi4gj6bzd53jajm89gwnrg8033mbx6cy"; libraryHaskellDepends = [ base containers deepseq exceptions io-classes nothunks parallel - primitive psqueues QuickCheck quiet si-timers strict-stm time + primitive psqueues QuickCheck quiet time ]; testHaskellDepends = [ - array base containers io-classes QuickCheck si-timers strict-stm - tasty tasty-hunit tasty-quickcheck time + array base containers io-classes QuickCheck tasty tasty-hunit + tasty-quickcheck time ]; benchmarkHaskellDepends = [ base criterion io-classes ]; description = "A pure simulator for monadic concurrency with STM"; @@ -176730,6 +177452,23 @@ self: { mainProgram = "ip6addr"; }) {}; + "ip6addr_2_0_0" = callPackage + ({ mkDerivation, base, IPv6Addr, optparse-applicative, text }: + mkDerivation { + pname = "ip6addr"; + version = "2.0.0"; + sha256 = "1drhjv6xmwfnx2yvxxs03ds415gxdgylzkmb5wy9g7b12q91kxf5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base IPv6Addr optparse-applicative text + ]; + description = "Commandline tool to deal with IPv6 address text representations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ip6addr"; + }) {}; + "ipa" = callPackage ({ mkDerivation, attoparsec, base, hspec, template-haskell, text , unicode-transforms @@ -177100,8 +177839,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.12"; - sha256 = "09w4i2f7zsl82w6ly6f9khwk9ki3k2yv9izhhxsjjwpffam2lxs2"; + version = "2.13"; + sha256 = "0z95cl8pg6zhzmz642bzgxc0525645whvxbmz6h1i8g1mll3i6kx"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -177280,27 +178019,24 @@ self: { }) {}; "iri" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, contravariant - , hashable, ip, profunctors, ptr, punycode, QuickCheck - , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, text-builder, th-lift + ({ mkDerivation, attoparsec, base, bytestring, cereal + , contravariant, hashable, ip, mtl, profunctors, ptr, rerebase + , tasty, tasty-hunit, template-haskell, text, text-builder, th-lift , th-lift-instances, unordered-containers, vector, vector-builder - , vector-instances + , vector-instances, wide-word }: mkDerivation { pname = "iri"; - version = "0.4"; - sha256 = "0v790f2fl4hcb6069ak5cscd156ry3065cshjh9c30239allw7m5"; + version = "0.5.1"; + sha256 = "0r1isflm644d823vwimrcmh4s8ash84gi4hgav1gxgiryw9j013n"; libraryHaskellDepends = [ - attoparsec base bytestring contravariant hashable ip profunctors - ptr punycode semigroups template-haskell text text-builder th-lift + attoparsec base bytestring cereal contravariant hashable ip mtl + profunctors ptr template-haskell text text-builder th-lift th-lift-instances unordered-containers vector vector-builder - vector-instances - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck + vector-instances wide-word ]; + testHaskellDepends = [ rerebase tasty tasty-hunit ]; + doHaddock = false; description = "RFC-based resource identifier library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -181102,8 +181838,8 @@ self: { }: mkDerivation { pname = "json-spec"; - version = "0.5.0.0"; - sha256 = "1jdr9l8jvy4r11z6qxpicyafs48z792qkl24r20hddggq0kiac8z"; + version = "0.5.0.1"; + sha256 = "19kbipnr0v5pg95bvjc2j8wznyri9i0mb2ldx5zp9a1x5kmifwm7"; libraryHaskellDepends = [ aeson base containers scientific text time vector ]; @@ -181123,8 +181859,8 @@ self: { }: mkDerivation { pname = "json-spec-elm"; - version = "0.4.0.2"; - sha256 = "1l49x5bzqra0s2xpf8azbq07kkj9zkqj0qya83bgyg1wrsnv0ivl"; + version = "0.4.0.3"; + sha256 = "13gwqcgi08wc0zjx5vd5sx83rqp2nlh6wiyzh8idagv4f3xnm174"; libraryHaskellDepends = [ base bound containers elm-syntax json-spec mtl text ]; @@ -181142,8 +181878,8 @@ self: { }: mkDerivation { pname = "json-spec-elm-servant"; - version = "0.4.1.0"; - sha256 = "1l4gx5s8knf1f2s22qn4p8gnr8hbgys1b1pbcsmg0dvsac785871"; + version = "0.4.1.1"; + sha256 = "0g81dzs512rmgzk6h817d04sdacbdhd19j2qkmihlj6xzjd3gmbf"; libraryHaskellDepends = [ base bound containers directory elm-syntax filepath http-types json-spec json-spec-elm mtl prettyprinter process servant text @@ -181165,8 +181901,8 @@ self: { }: mkDerivation { pname = "json-spec-openapi"; - version = "0.3.1.0"; - sha256 = "0zypr3lxyqaywml7bkkvp00x4a6l4r8wggsplafvcvlanyz7b23i"; + version = "0.3.1.1"; + sha256 = "1dq93wscynxzkknwwad7alvi6n7908j7nzzgz7q5753wbxwqj5yp"; libraryHaskellDepends = [ aeson base insert-ordered-containers json-spec lens openapi3 text ]; @@ -182811,6 +183547,43 @@ self: { license = lib.licenses.bsd3; }) {}; + "katip_0_8_8_2" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , bytestring, containers, criterion, deepseq, directory, either + , filepath, hostname, microlens, microlens-th, monad-control, mtl + , old-locale, quickcheck-instances, regex-tdfa, resourcet + , safe-exceptions, scientific, semigroups, stm, string-conv, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , text, time, time-locale-compat, transformers, transformers-base + , transformers-compat, unix, unliftio-core, unordered-containers + , vector + }: + mkDerivation { + pname = "katip"; + version = "0.8.8.2"; + sha256 = "12g0i1ndzzkgf0qgkxx525d742mkfnsdwb9rhi6z8jn5hc38sps4"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring containers either hostname + microlens microlens-th monad-control mtl old-locale resourcet + safe-exceptions scientific semigroups stm string-conv + template-haskell text time transformers transformers-base + transformers-compat unix unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory microlens + quickcheck-instances regex-tdfa safe-exceptions stm tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + time time-locale-compat unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson async base blaze-builder criterion deepseq directory filepath + safe-exceptions text time transformers unix + ]; + description = "A structured logging framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "katip-datadog" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring , conduit, conduit-extra, connection, containers, katip, network @@ -184945,8 +185718,8 @@ self: { }: mkDerivation { pname = "knit"; - version = "0.3.0.0"; - sha256 = "0wp16yrlibfl32b4akcwali074wxar96mvaykgh0xsf4pq1czx3q"; + version = "0.4.0.0"; + sha256 = "0g0wajlhsbg6lamlf42z6k0h29zf7y0l6wjnc8ik47sx3l8r6agy"; libraryHaskellDepends = [ base bytestring containers deepseq hashtables vector ]; @@ -188905,6 +189678,8 @@ self: { pname = "lattices"; version = "2.2.1"; sha256 = "0rknzbzwcbg87hjiz4jwqb81w14pywkipxjrrlrp0m5i8ciky1i7"; + revision = "1"; + editedCabalFile = "1cjbshr1y2fa06sj60bk38x2h2fqirjr6y1y5xbnlj2ikszviq3b"; libraryHaskellDepends = [ base containers deepseq hashable integer-logarithms QuickCheck tagged transformers universe-base universe-reverse-instances @@ -189486,6 +190261,22 @@ self: { license = lib.licenses.mit; }) {}; + "lazyppl" = callPackage + ({ mkDerivation, base, containers, hmatrix, log-domain + , math-functions, monad-extras, mtl, random, transformers + }: + mkDerivation { + pname = "lazyppl"; + version = "1.0"; + sha256 = "1agm2d6yxsn9m46lljcnys85nwr29nhghffwhr6y9xgpdrf6gvzw"; + libraryHaskellDepends = [ + base containers hmatrix log-domain math-functions monad-extras mtl + random transformers + ]; + description = "Lazy Probabilistic Programming Library"; + license = lib.licenses.mit; + }) {}; + "lazyset" = callPackage ({ mkDerivation, base, containers, data-ordlist, HUnit, time , timeit @@ -192167,12 +192958,16 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, split }: mkDerivation { pname = "libroman"; - version = "3.1.1"; - sha256 = "11yg74v290s4dy5bn94hb0lwncbbxqljgjldaxr80iy9c52z9hzi"; + version = "3.2.0"; + sha256 = "0y1n3c5a2qmazaifi760lsiy17vbmnhrm8v1ixs54y1ww75gpgw6"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base split ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Use Roman Numerals as a Numeric Datatype (sort of)"; license = lib.licenses.bsd3; + mainProgram = "roman"; }) {}; "libsecp256k1" = callPackage @@ -192326,10 +193121,8 @@ self: { }: mkDerivation { pname = "libsystemd-journal"; - version = "1.4.5.1"; - sha256 = "1d2pm38nq8bk55lva1y1p5789qdkcmmc1z376lnjs4f0jgb6pnhn"; - revision = "1"; - editedCabalFile = "0daj8yrxp9zph3jgyxp10gj0pi0yba58jv7iy67j6zi23hbzm6ar"; + version = "1.4.6.0"; + sha256 = "0wxf56i9mv6fm40rwzawbf829z73r4x7jchgardl770dg5zmy9yb"; libraryHaskellDepends = [ base bytestring hashable hsyslog pipes pipes-safe semigroups text transformers uniplate unix-bytestring unordered-containers uuid @@ -192861,8 +193654,8 @@ self: { }: mkDerivation { pname = "lifx-lan"; - version = "0.8.2"; - sha256 = "17n684whz5b80zg1jr7l5dp5qz2fa6g3hgqn5b8mjhqlrgqsmfwn"; + version = "0.8.3"; + sha256 = "0077wdyrfz20lrd55lzv3bd1ab9cckppkm1gyzp1g23b8xwdayz5"; libraryHaskellDepends = [ ansi-terminal base binary bytestring colour composition containers extra monad-loops mtl network random safe text time transformers @@ -194307,15 +195100,14 @@ self: { }: mkDerivation { pname = "lion"; - version = "0.4.0.0"; - sha256 = "0vh5krw9z7b7a6bvhc63l5m1rg3g0wyci055qarhsfw27dgbkfx8"; + version = "0.4.0.1"; + sha256 = "05c4pipqxism8scf8c5jmzwyh7gim3c1qwjpfgxv6fygb6lp2d2r"; libraryHaskellDepends = [ base clash-prelude generic-monoid ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise ice40-prim lens mtl ]; description = "RISC-V Core"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lipsum-gen" = callPackage @@ -194417,13 +195209,13 @@ self: { , optparse-applicative, parallel, parser-combinators, pretty , process, rest-rewrite, smtlib-backends, smtlib-backends-process , stm, store, syb, tagged, tasty, tasty-ant-xml, tasty-hunit - , tasty-quickcheck, tasty-rerun, text, transformers, typed-process + , tasty-quickcheck, tasty-rerun, text, transformers , unordered-containers, vector, z3 }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.9.6.3"; - sha256 = "0vir7l5wpbpcgvydncxsn6yk6xi2v8ax4r75zb4cn0sl4cyswp4m"; + version = "0.9.6.3.1"; + sha256 = "1lad9s2slvbz0msdk43554h73zhw8cxcbj7fnj2nbj0rni8q0i0i"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -194433,14 +195225,14 @@ self: { fgl filepath hashable intern lens-family megaparsec mtl parallel parser-combinators pretty process rest-rewrite smtlib-backends smtlib-backends-process stm store syb text transformers - typed-process unordered-containers vector + unordered-containers vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base containers directory filepath hashable mtl optparse-applicative process stm tagged tasty tasty-ant-xml tasty-hunit tasty-quickcheck tasty-rerun text transformers - typed-process unordered-containers + unordered-containers ]; testSystemDepends = [ git nettools z3 ]; doCheck = false; @@ -194509,10 +195301,8 @@ self: { }: mkDerivation { pname = "liquid-prelude"; - version = "0.9.2.8.1"; - sha256 = "1yan7blwns2r39qgrrzn2q7z9j6m72jllnl523w61frr7yzlxkck"; - revision = "1"; - editedCabalFile = "08zwppn1jpf1cpz1f3pq18wxdl20spmkkfj604kn8x0bz4d0386d"; + version = "0.9.2.8.2"; + sha256 = "0ldap73vg5qxw9fh2mmfinhg78wpqf8nnpd4kd7abpxlpmni8d3r"; setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; libraryHaskellDepends = [ base bytestring containers ghc-prim liquidhaskell @@ -194539,15 +195329,16 @@ self: { "liquidhaskell" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, ghc-bignum - , ghc-prim, liquidhaskell-boot, z3 + , ghc-internal, ghc-prim, liquidhaskell-boot, z3 }: mkDerivation { pname = "liquidhaskell"; - version = "0.9.8.1"; - sha256 = "0dak8ixjylm4lznzddn4zcjdb8nm9ha5l6p29l6bhk54gfzccsn8"; + version = "0.9.10.1"; + sha256 = "1r3syj0c2v8x3xd2bqywf8f596r9mnf85mr2r9xvfxxd6dlmyz85"; setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; libraryHaskellDepends = [ - base bytestring containers ghc-bignum ghc-prim liquidhaskell-boot + base bytestring containers ghc-bignum ghc-internal ghc-prim + liquidhaskell-boot ]; testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; @@ -194559,16 +195350,16 @@ self: { ({ mkDerivation, aeson, base, binary, bytestring, Cabal, cereal , cmdargs, containers, data-default, data-fix, deepseq, Diff , directory, exceptions, extra, filepath, fingertree, free, ghc - , ghc-boot, ghc-paths, ghc-prim, githash, gitrev, hashable - , hscolour, liquid-fixpoint, megaparsec, mtl, optparse-applicative - , pretty, recursion-schemes, split, syb, tasty, tasty-ant-xml - , tasty-hunit, template-haskell, temporary, text, th-compat, time - , transformers, unordered-containers, vector + , ghc-boot, ghc-internal, ghc-paths, ghc-prim, githash, gitrev + , hashable, hscolour, liquid-fixpoint, megaparsec, mtl + , optparse-applicative, pretty, recursion-schemes, split, syb + , tasty, tasty-ant-xml, tasty-hunit, template-haskell, temporary + , text, th-compat, time, transformers, unordered-containers, vector }: mkDerivation { pname = "liquidhaskell-boot"; - version = "0.9.8.1"; - sha256 = "00cm1myw2l051nspx04vn332jxn2wary2mn5yhv0pqsvi28j2vnw"; + version = "0.9.10.1"; + sha256 = "11dl8lsw0wqacfjhvs03ymrsv2gxfkgjv5mbp30vmd0c3gb34fgl"; libraryHaskellDepends = [ aeson base binary bytestring Cabal cereal cmdargs containers data-default data-fix deepseq Diff directory exceptions extra @@ -194579,8 +195370,9 @@ self: { unordered-containers vector ]; testHaskellDepends = [ - base directory filepath ghc ghc-paths liquid-fixpoint megaparsec - syb tasty tasty-ant-xml tasty-hunit time + base directory filepath ghc ghc-internal ghc-paths ghc-prim + liquid-fixpoint megaparsec syb tasty tasty-ant-xml tasty-hunit + template-haskell time unordered-containers ]; description = "Liquid Types for Haskell"; license = lib.licenses.bsd3; @@ -194941,6 +195733,8 @@ self: { pname = "list-tuple"; version = "0.1.4.1"; sha256 = "1xikv5wq6xqq8wcxw9vjp5s5ci9qqyw2kxbxp03madzaawdqq0g6"; + revision = "1"; + editedCabalFile = "0bhaqprrhmdlbpy1ga73zia7a831mcwgdmvvk2bn5mzzgcscp57d"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base OneTuple Only single-tuple ]; testHaskellDepends = [ @@ -195006,6 +195800,18 @@ self: { broken = true; }) {}; + "list1" = callPackage + ({ mkDerivation, base, smash }: + mkDerivation { + pname = "list1"; + version = "0.0.2"; + sha256 = "0lxx1m2vrf14fb8r4qzfp6y8iqxai3cdpg2dzh9az383qxhy0zmh"; + libraryHaskellDepends = [ base smash ]; + description = "Helpers for working with NonEmpty lists"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "listenbrainz-client" = callPackage ({ mkDerivation, aeson, base, free, freer-effects, http-client , kan-extensions, mtl, servant, servant-client, text, time @@ -195749,8 +196555,8 @@ self: { }: mkDerivation { pname = "llvm-pretty"; - version = "0.12.0.0"; - sha256 = "1xdlic9rl63617qqwxlf2sn0j67wsnarhllf1k5anzgprd64vylj"; + version = "0.12.1.0"; + sha256 = "113avpn33gyh65yd0bbfwni044ih5vcbnv8l43siy8a4asp0xfwi"; libraryHaskellDepends = [ base containers microlens microlens-th monadLib parsec pretty syb template-haskell th-abstraction @@ -195776,8 +196582,8 @@ self: { }: mkDerivation { pname = "llvm-pretty-bc-parser"; - version = "0.4.1.0"; - sha256 = "1nc8znxzzg2qgn3x52a310rn8lg647k495927k6zfs2x07chy5gh"; + version = "0.4.2.0"; + sha256 = "1y0wvczlrmx990c9i697vy30bpl7109k9psxpldd3857cadmkmdi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198048,22 +198854,22 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, bytestring, co-log-core , containers, data-default, dependent-map, Diff, directory, extra , filepath, generic-lens, Glob, hspec, lens, lsp, lsp-types, mtl - , process, QuickCheck, row-types, stm, text, text-rope, unix-compat - , unliftio, unordered-containers + , process, QuickCheck, stm, text, text-rope, transformers + , unix-compat, unliftio, unordered-containers }: mkDerivation { pname = "lsp-client"; - version = "0.3.0.0"; - sha256 = "0d5d0rzscq9gc4jnl02584908g50mrqgxs3b6nly6wfpjaprklsd"; + version = "0.4.0.0"; + sha256 = "15f6inp47vw0k0hqgzxyy9ybq2kpv5ggvb3qj9m570miri6z4mr2"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring co-log-core containers data-default dependent-map Diff directory extra filepath - generic-lens Glob lens lsp lsp-types mtl row-types stm text - text-rope unix-compat unliftio unordered-containers + generic-lens Glob lens lsp lsp-types mtl stm text text-rope + transformers unix-compat unliftio unordered-containers ]; testHaskellDepends = [ aeson base bytestring extra hspec lens lsp-types process QuickCheck - row-types unliftio + unliftio ]; description = "Haskell library for Language Server Protocol clients"; license = lib.licenses.asl20; @@ -198389,6 +199195,21 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) lua5_4;}; + "lua_2_3_3" = callPackage + ({ mkDerivation, base, lua5_4, tasty, tasty-hunit }: + mkDerivation { + pname = "lua"; + version = "2.3.3"; + sha256 = "0xvhfq8ms5wbchrscxaqf4a9panfnzgz5xdlg86790nydab2kals"; + configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ lua5_4 ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Lua, an embeddable scripting language"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) lua5_4;}; + "lua-arbitrary" = callPackage ({ mkDerivation, base, lua, QuickCheck }: mkDerivation { @@ -200047,22 +200868,19 @@ self: { "mail-pool" = callPackage ({ mkDerivation, aeson, base, HaskellNet, HaskellNet-SSL, microlens - , mime-mail, network, optparse-applicative, resource-pool, time + , mime-mail, network, optparse-applicative, resource-pool }: mkDerivation { pname = "mail-pool"; - version = "2.2.3"; - sha256 = "1pqizx02p2iiqkl4kg3izkg477bh69jrk75insbfw30k3ay3g330"; + version = "2.3.1"; + sha256 = "0krawz58vjzkxj5y0ss3m575913xj90vpb5hmdnyspxlzp0fcpp4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base HaskellNet HaskellNet-SSL microlens mime-mail network - optparse-applicative resource-pool time - ]; - executableHaskellDepends = [ - aeson base HaskellNet HaskellNet-SSL microlens mime-mail network - optparse-applicative resource-pool time + optparse-applicative resource-pool ]; + executableHaskellDepends = [ base mime-mail optparse-applicative ]; description = "Preconfigured email connection pool on top of smtp"; license = lib.licenses.mit; mainProgram = "exe"; @@ -202535,8 +203353,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "90000.0.0"; - sha256 = "0vc63h1xcg578c88wra66lb1x4spqqbcg5kfgjqqy3klqs2qz0sp"; + version = "90000.0.1"; + sha256 = "09zgjg6ymclxjbmlcrvwhd9nfjiqnx13ln52gvgk6wxkksdxb614"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -203645,6 +204463,8 @@ self: { pname = "melf"; version = "1.3.1"; sha256 = "0ivfzsw36qy0m93h353r3963vmhirzg3a5mirqn1hfbsk24xf1dx"; + revision = "2"; + editedCabalFile = "0q822xj2z2xbdi8wk0dyny9k3lbpx6c3dmxrlimdnz43218x58rn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -207786,14 +208606,14 @@ self: { }) {}; "mockcat" = callPackage - ({ mkDerivation, base, hspec, template-haskell, text }: + ({ mkDerivation, base, hspec, mtl, template-haskell, text }: mkDerivation { pname = "mockcat"; - version = "0.2.1.0"; - sha256 = "1i0l3znnimnps022zk8z97bfsravr4w8l4rghh5app8ww01yjvhl"; - libraryHaskellDepends = [ base template-haskell text ]; - testHaskellDepends = [ base hspec template-haskell text ]; - description = "Simple mock function library for test in Haskell"; + version = "0.3.1.0"; + sha256 = "1akg2r96qxqpis3m0xrnaxi26c0nvwr91f3yczai0pzhrp6887g4"; + libraryHaskellDepends = [ base mtl template-haskell text ]; + testHaskellDepends = [ base hspec mtl template-haskell text ]; + description = "Mock library for test in Haskell"; license = lib.licenses.mit; }) {}; @@ -209851,11 +210671,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "monadLib"; - version = "3.10.1"; - sha256 = "0n5fmmsc0qww0nz3k2j4j68qdpq3px46abl9igvv06iz2xi8b778"; + version = "3.10.3"; + sha256 = "048xk3zr7237c0mzr6lfca3qsgh60icnp8vw3vg2pj12z8id62ka"; libraryHaskellDepends = [ base ]; description = "A collection of monad transformers"; - license = lib.licenses.bsd3; + license = lib.licenses.isc; }) {}; "monadLib-compose" = callPackage @@ -210484,10 +211304,8 @@ self: { }: mkDerivation { pname = "monoid-extras"; - version = "0.6.2"; - sha256 = "1qaxp0cf2cvzvfpk7x9mjz1zmlpjfzxij8v2n45w89s7bq9ckvlw"; - revision = "3"; - editedCabalFile = "16ff0ffc8my9jkylcsyskb6bpb1hpjsg2shv2vnrb54r7gqfqy8v"; + version = "0.6.3"; + sha256 = "1j908w0xmh6kdh0ilka3lhasf4vwnaic8srycdmwmyi94i5kh93i"; libraryHaskellDepends = [ base groups semigroupoids ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -210747,7 +211565,6 @@ self: { description = "A GUI library for writing native Haskell applications"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "dev-test-app"; }) {inherit (pkgs) glew;}; @@ -210906,6 +211723,8 @@ self: { pname = "months"; version = "0.2.1"; sha256 = "18ysiyj5vqp96nvrkaa1k58ci6l08x03lkiq6cmi5vyg4gw734ig"; + revision = "1"; + editedCabalFile = "1lmikm7y31wlk634fr2l6ba74mn5a1h5y3p1phx7xjxvahjf3li7"; libraryHaskellDepends = [ aeson attoparsec base deepseq hashable intervals QuickCheck text time-compat @@ -218232,15 +219051,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "network_3_2_1_0" = callPackage + "network_3_2_2_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec - , hspec-discover, HUnit, QuickCheck, temporary + , hspec-discover, HUnit, QuickCheck, stm, temporary }: mkDerivation { pname = "network"; - version = "3.2.1.0"; - sha256 = "00fjgg9zj5nhw1ra8kqaaa3cxzkf0lxnzcfdqvagxx7fdvbwdw4h"; - libraryHaskellDepends = [ base bytestring deepseq directory ]; + version = "3.2.2.0"; + sha256 = "033zcj1ibrw49h4rbkhbznyz0na25zyaihh2m35wqlkgji3lkc7g"; + libraryHaskellDepends = [ base bytestring deepseq directory stm ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary ]; @@ -220008,8 +220827,8 @@ self: { }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.5.6.0"; - sha256 = "18ad3kkkl3aapsc95r7n7vwhjqzyyw0plbjv7vkc5hm0366picvl"; + version = "0.6.0.0"; + sha256 = "0j2z8k5grxz570gbf931v7b06v1yd94gr3l6wv960xdlwl1145qw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -220091,8 +220910,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "1.2.8.1"; - sha256 = "0x56jxbswzs371z8a93h5zbda4h6y9l2jnlp15h5vg9lsn2fhrnw"; + version = "1.2.9.1"; + sha256 = "0mafzhc6lnari85ng2iw025nhyvwsqkaamxf6jlkkm45k9zsa59y"; libraryHaskellDepends = [ aeson array async base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client @@ -221848,15 +222667,15 @@ self: { license = lib.licenses.asl20; }) {}; - "nothunks_0_2_1_1" = callPackage + "nothunks_0_3_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, ghc-heap, ghc-prim , hedgehog, random, stm, tasty, tasty-hedgehog, text, time, vector , wherefrom-compat }: mkDerivation { pname = "nothunks"; - version = "0.2.1.1"; - sha256 = "1nhwa7w62rgfjim3hyq6ryvfh24f7g20ghhkykyj7sjxmwyri9yc"; + version = "0.3.0.0"; + sha256 = "0fnwad49mv0q46wrnapkqh4hm4rm43gw0papppqrg0z96r658yc4"; libraryHaskellDepends = [ base bytestring containers ghc-heap stm text time vector wherefrom-compat @@ -222986,20 +223805,6 @@ self: { }) {}; "numhask-array" = callPackage - ({ mkDerivation, adjunctions, base, distributive, numhask, vector - }: - mkDerivation { - pname = "numhask-array"; - version = "0.11.0.1"; - sha256 = "1z9n5ls08b3329kh4hidcm0p6kx3672svkqaci6nlq2zxj6szgda"; - libraryHaskellDepends = [ - adjunctions base distributive numhask vector - ]; - description = "Multi-dimensional arrays"; - license = lib.licenses.bsd3; - }) {}; - - "numhask-array_0_11_1_0" = callPackage ({ mkDerivation, adjunctions, base, distributive, numhask, vector }: mkDerivation { @@ -223011,7 +223816,6 @@ self: { ]; description = "Multi-dimensional arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "numhask-free" = callPackage @@ -224668,8 +225472,8 @@ self: { }: mkDerivation { pname = "om-doh"; - version = "0.1.0.2"; - sha256 = "036vqn7p7ha9dibsmsn0f0hiwr8570zdrnij98377ysn21xl5gzz"; + version = "0.1.0.3"; + sha256 = "0zk87kycigpzycrr898xgn5lzazmfcqcghf7qacj0cgzqsw62xww"; libraryHaskellDepends = [ base base64 bytestring http-api-data resolv servant servant-server text @@ -224699,13 +225503,32 @@ self: { broken = true; }) {}; + "om-elm_2_0_0_7" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , http-types, safe, safe-exceptions, template-haskell, text, unix + , wai + }: + mkDerivation { + pname = "om-elm"; + version = "2.0.0.7"; + sha256 = "0xf775929s76galzqfaq2zx0ks1wkcfqzqi3a1z3zg6w4fswiw67"; + libraryHaskellDepends = [ + base bytestring Cabal containers directory http-types safe + safe-exceptions template-haskell text unix wai + ]; + description = "Haskell utilities for building embedded Elm programs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "om-fail" = callPackage ({ mkDerivation, base, monad-logger, safe-exceptions, transformers }: mkDerivation { pname = "om-fail"; - version = "0.1.0.4"; - sha256 = "0nf4hdx8a2invk0wjq3ryk8l5psl8jjkixskadmk8zd8r06mf3ky"; + version = "0.1.0.5"; + sha256 = "0a3h016vy2czq0bdkagljz9dpy1133ym07a61sk5drq76jcq5byn"; libraryHaskellDepends = [ base monad-logger safe-exceptions transformers ]; @@ -224721,8 +225544,8 @@ self: { }: mkDerivation { pname = "om-fork"; - version = "0.7.1.10"; - sha256 = "1p9sf45mcswz7z6a1m3axyk7kn0yb7dblxv90r7m8b1lbk67mgws"; + version = "0.7.1.11"; + sha256 = "03gln694nn2v16ccljgqr9a795skw5js9j76mamc803qgnrdsdj1"; libraryHaskellDepends = [ aeson base exceptions ki-unlifted monad-logger om-show text unliftio @@ -224743,8 +225566,8 @@ self: { }: mkDerivation { pname = "om-http"; - version = "0.3.1.0"; - sha256 = "1whs8v3m4ldxlw7as3jnw9snk3jx0biqkid2rr63c0kkxazlxjpp"; + version = "0.3.1.1"; + sha256 = "1nxc0bckjm0nm46rvnhs4vglrcrzwim114x912a4mdgwwi82fkax"; libraryHaskellDepends = [ async base bytestring directory filepath http-types mime-types monad-logger network om-show safe-exceptions servant @@ -224802,8 +225625,8 @@ self: { }: mkDerivation { pname = "om-legion"; - version = "6.9.0.6"; - sha256 = "05kh6raq4fbqcbj2add7q6s7r3m12cgskbsh1kp39zlibkgvl81d"; + version = "6.9.0.7"; + sha256 = "0cpmk7qi50d1az4sdq0qdishs7pp58pxv85mq3x8qmmrmiz4qs8l"; libraryHaskellDepends = [ aeson async base binary bytestring clock containers crdt-event-fold data-default-class http-api-data monad-logger mtl network om-fork @@ -224821,8 +225644,8 @@ self: { }: mkDerivation { pname = "om-logging"; - version = "1.1.0.8"; - sha256 = "1v6qdp0k6jccsbmcx127bj0y3aw0rwjwgzbw8022ny5x2yhw7wgf"; + version = "1.1.0.9"; + sha256 = "0k8yw4v1xxh2vm5507wxxfl3dvxfaz8nip3apri22aqyxjg05w45"; libraryHaskellDepends = [ aeson base bytestring fast-logger monad-logger om-show split text time @@ -224837,10 +225660,10 @@ self: { ({ mkDerivation, base, containers, ghc, safe }: mkDerivation { pname = "om-plugin-imports"; - version = "0.2.0.0.9.6"; - sha256 = "1whwipj1dqka4dhjigcmq4c74gv0r6y5y5px8m3fp08v62dbvbf2"; + version = "0.4.0.0.9.10"; + sha256 = "07ghwn2jpy580mzf70x0rawmxsqsbyy1adp204vydxapp04xbv0k"; libraryHaskellDepends = [ base containers ghc safe ]; - description = "Plugin-based import warnings"; + description = "Plugin-based explicit import generation"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -224850,8 +225673,8 @@ self: { ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "om-show"; - version = "0.1.2.9"; - sha256 = "154x7l81chfj91bwrh9v1a8bcazkn99a8hzxkaadszb65wwi6jr8"; + version = "0.1.2.10"; + sha256 = "1ngwdci1pqf2wmhqfn54372wv7w7v8p5hr56k37kb0aslkdci8qa"; libraryHaskellDepends = [ aeson base text ]; description = "Utilities for showing string-like things"; license = lib.licenses.mit; @@ -224865,8 +225688,8 @@ self: { }: mkDerivation { pname = "om-socket"; - version = "1.0.0.1"; - sha256 = "1jgg1wfvxl36xgmhaaa7ri0grdhakzfrq1ivzh6788mxfdb4dkj7"; + version = "1.0.0.3"; + sha256 = "0slvcxz4s81w8wagqyrlawlss4sgwcxqnpjaayvxgf8d0rq5add6"; libraryHaskellDepends = [ aeson base binary bytestring containers exceptions megaparsec monad-logger network om-fork om-show stm streaming streaming-binary @@ -224886,8 +225709,8 @@ self: { ({ mkDerivation, aeson, base, binary, clock, time, transformers }: mkDerivation { pname = "om-time"; - version = "0.3.0.4"; - sha256 = "14afibgh8r0zakgx4inlmnmllyz0x51fm70q7rd73x1q03w9icd1"; + version = "0.3.1.0"; + sha256 = "1ri7hp3jb0nnc5j02n5wh0ninsng58w79hx9rmmq9z972m4vbqfn"; libraryHaskellDepends = [ aeson base binary clock time transformers ]; @@ -225878,8 +226701,8 @@ self: { }: mkDerivation { pname = "opencascade-hs"; - version = "0.3.0.1"; - sha256 = "13yvcsibh600mhsvj30hflwb2f2pyvh8yhm69j693vxwxirvgpi2"; + version = "0.4.0.0"; + sha256 = "1dhasjjhcg54qihcihid69z70l75dn7xsbsd765lsgzc35m1qbrl"; libraryHaskellDepends = [ base resourcet ]; librarySystemDepends = [ TKBO TKBRep TKDEGLTF TKDEOBJ TKDESTEP TKDESTL TKernel TKFillet @@ -225998,6 +226821,7 @@ self: { description = "Haskell binding to OpenCV-3.x extra modules"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "opencv-raw" = callPackage @@ -227085,8 +227909,8 @@ self: { }: mkDerivation { pname = "opt-env-conf"; - version = "0.4.0.5"; - sha256 = "08pkrdxy9fsbqdp6qz4y3q5my04h2rfrhhyd64rqbbdfvz2biygz"; + version = "0.5.0.1"; + sha256 = "1x0zb436yrcvihr6g7g7gz2w0nhlbv3nqgf0rmaa3clp72a272rk"; libraryHaskellDepends = [ aeson autodocodec autodocodec-nix autodocodec-schema autodocodec-yaml base containers hashable mtl path path-io @@ -227186,8 +228010,8 @@ self: { pname = "optics-extra"; version = "0.4.2.1"; sha256 = "0hfa5yb7l3l310lfxkii13fjzb69g619agadc5a86i734nisf8vy"; - revision = "3"; - editedCabalFile = "1dh1w543nkhy09rndmcx5qmm5j9a76p4hcyqqafq8yz5fm60hmzs"; + revision = "4"; + editedCabalFile = "0ravf8rwqdaqkbpc8vh566snh52mmpxwqxvp8bzk85a4cyi509sd"; libraryHaskellDepends = [ array base bytestring containers hashable indexed-profunctors indexed-traversable-instances mtl optics-core text transformers @@ -229037,22 +229861,19 @@ self: { "package-version" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, env-guard - , hedgehog, prettyprinter, safe-exceptions, tagged, tasty - , tasty-hedgehog, tasty-hunit, template-haskell, text + , hedgehog, tasty, tasty-hedgehog, tasty-hunit, template-haskell + , text }: mkDerivation { pname = "package-version"; - version = "0.3"; - sha256 = "01d0345qs5c02gmh3ccsl0xbmiqwcbdpzlqgx2pwj6iv9vvjrf5l"; - revision = "4"; - editedCabalFile = "08pjfpib8g8ci9d9p3461bg37k64f0360cx35v4i8lqj8ny69xvh"; + version = "0.4"; + sha256 = "00ack16vq6c1pqrnm5pl8m0p5dx0rgrzk2ylsl22l9fj70v730a6"; libraryHaskellDepends = [ - base bytestring deepseq prettyprinter safe-exceptions - template-haskell text + base bytestring deepseq template-haskell text ]; testHaskellDepends = [ - base doctest env-guard hedgehog safe-exceptions tagged tasty - tasty-hedgehog tasty-hunit text + base doctest env-guard hedgehog tasty tasty-hedgehog tasty-hunit + text ]; description = "A package for retrieving a package's version number"; license = lib.licenses.bsd3; @@ -229987,8 +230808,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.17.1"; sha256 = "0md7i54rnvgn0yll7mwhi124nak0pfmpga34vnd996r6fgmnq5fb"; - revision = "1"; - editedCabalFile = "0vfhhzqihc911l8j94pn8mljl9l1zfgzrihm3967g0y43agp6h2s"; + revision = "2"; + editedCabalFile = "00x3nqlrp872wq2alaahkiv34ifj36bs2ql0n4vn2h19wlg1f578"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -231715,8 +232536,8 @@ self: { pname = "parameterized-utils"; version = "2.1.8.0"; sha256 = "026lrdnw5rjvny380rmrzpwhmcfgp551whbk0mnx2y2q6ij0sjfm"; - revision = "1"; - editedCabalFile = "0c253mwkk7a58frhavl9nzwlmps4kzvi5a5hsdv6mbsaqq5vq7vw"; + revision = "2"; + editedCabalFile = "1kk13926s885fxss2hz6h438k526s8agnhg8v199qam862f16yhh"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable hashtables indexed-traversable lens mtl profunctors @@ -233282,6 +234103,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "path_0_9_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions + , filepath, genvalidity, genvalidity-hspec, hashable, hspec + , QuickCheck, template-haskell, text, validity-bytestring + }: + mkDerivation { + pname = "path"; + version = "0.9.6"; + sha256 = "1zwrwyvlj9n1qplvxixd6rjc0y0yzjdhfvh4lwp2g42qaabhal2q"; + libraryHaskellDepends = [ + aeson base deepseq exceptions filepath hashable template-haskell + text + ]; + testHaskellDepends = [ + aeson base bytestring exceptions filepath genvalidity + genvalidity-hspec hspec QuickCheck template-haskell + validity-bytestring + ]; + doHaddock = false; + description = "Support for well-typed paths"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-binary-instance" = callPackage ({ mkDerivation, base, binary, path }: mkDerivation { @@ -235434,6 +236279,45 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; + "persistent_2_14_6_3" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , base64-bytestring, blaze-html, bytestring, conduit, containers + , criterion, deepseq, fast-logger, file-embed, hspec, http-api-data + , lift-type, monad-logger, mtl, path-pieces, QuickCheck + , quickcheck-instances, resource-pool, resourcet, scientific + , shakespeare, silently, template-haskell, text, th-lift-instances + , time, transformers, unliftio, unliftio-core, unordered-containers + , vault, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.14.6.3"; + sha256 = "1nqmd1ml1s4cm9hwfz9cz5qj4i9zm8ip69gmgysfgbs0h64f7w2d"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-aeson base base64-bytestring blaze-html + bytestring conduit containers deepseq fast-logger http-api-data + lift-type monad-logger mtl path-pieces resource-pool resourcet + scientific silently template-haskell text th-lift-instances time + transformers unliftio unliftio-core unordered-containers vault + vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers deepseq fast-logger hspec http-api-data + monad-logger mtl path-pieces QuickCheck quickcheck-instances + resource-pool resourcet scientific shakespeare silently + template-haskell text th-lift-instances time transformers unliftio + unliftio-core unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq file-embed template-haskell text + ]; + description = "Type-safe, multi-backend data serialization"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -235948,6 +236832,8 @@ self: { pname = "persistent-postgresql"; version = "2.13.6.2"; sha256 = "1z6cy54qnxpml86b6dr67kin6ww0dfn9vg3bzb3iw5s9srf7zwn2"; + revision = "1"; + editedCabalFile = "1a58a602nnwrb3s72q12piw18r458w3ha9nfjmpz5na566ndqmgl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236800,8 +237686,8 @@ self: { ({ mkDerivation, base, bytestring, containers, QuickCheck, text }: mkDerivation { pname = "phaser"; - version = "1.0.1.0"; - sha256 = "0c4b5mx2nz8r0bpk29knzgs1hq5f69wsscplk7dcfsqwkngid930"; + version = "1.0.2.0"; + sha256 = "1zykmcbhi8plrdp9n1idz3n0181ml9q5k1zj508f6a2pvyl4jcxa"; libraryHaskellDepends = [ base bytestring containers text ]; testHaskellDepends = [ base bytestring containers QuickCheck text @@ -237726,23 +238612,23 @@ self: { "photoname" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, directory - , filepath, heredoc, hsexif, hslogger, mtl, newtype-generics - , optparse-applicative, parsec, process, regex-posix, tasty - , tasty-hunit, tasty-quickcheck, time, unix + , filepath, heredoc, hsexif, hslogger, mtl, optparse-applicative + , parsec, process, regex-posix, tasty, tasty-hunit + , tasty-quickcheck, time, unix }: mkDerivation { pname = "photoname"; - version = "5.1"; - sha256 = "0ihw0pjiqwfny8nqbdglg13dch622m2agp2y328n7fqar79xx6dv"; + version = "5.2"; + sha256 = "0sf7hj6xa7bj074jamhm8jribbdjywdgg2z7wxjzmb2aliji5syi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory filepath hsexif hslogger mtl - newtype-generics parsec process time unix + base containers directory filepath hsexif hslogger mtl parsec + process time unix ]; executableHaskellDepends = [ ansi-wl-pprint base directory filepath heredoc hslogger - newtype-generics optparse-applicative unix + optparse-applicative unix ]; testHaskellDepends = [ base directory filepath process regex-posix tasty tasty-hunit @@ -239527,8 +240413,8 @@ self: { pname = "pipes-safe"; version = "2.3.5"; sha256 = "13npagy597g6zfr2f3vj4a98h2ssg2ps7lmdzrgdsvm8m28x3cph"; - revision = "2"; - editedCabalFile = "04yyjgqr81b10635bw0f2i5kfh0qzp7l3v9k9qbzskvlsl3kdyjy"; + revision = "3"; + editedCabalFile = "1wic8km3c17g2xrmxd4qj5qmppb76k7srxrgj8jg1vs6g2l7v6cs"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base @@ -240661,8 +241547,8 @@ self: { }: mkDerivation { pname = "plots"; - version = "0.1.1.4"; - sha256 = "1b68dd1xk6kqfgyypddk4zcllm8lnfxz2a2fhvb4d09ar3ix7s40"; + version = "0.1.1.5"; + sha256 = "0dgjg1idfhmnzdy7c2my1ri98psbm8jq67ssnb2iss4ay9fs13fw"; libraryHaskellDepends = [ adjunctions base base-orphans colour containers data-default diagrams-core diagrams-lib directory distributive filepath @@ -241827,6 +242713,8 @@ self: { pname = "polysemy-blockfrost"; version = "0.1.4.0"; sha256 = "0l4qna29fv8z2mh9aywp30mmlpw73hn40gwkzhpv8hjdlppvlri1"; + revision = "1"; + editedCabalFile = "1jljm9ajc8nkqgbm0by2mnascflypw47l6zr22msifxrmlvvyik7"; libraryHaskellDepends = [ base blockfrost-api blockfrost-client polysemy polysemy-plugin text ]; @@ -242974,6 +243862,8 @@ self: { pname = "popkey"; version = "0.1.0.2"; sha256 = "0ibk4qwcizsqvyvb8lgad5c0szgw7571bi2c54b5r3rrm7vzpx05"; + revision = "1"; + editedCabalFile = "0iwzwckvlvaxqk92f700zgxqwf1s2i5siabi0dlr89gzb2ljil2j"; libraryHaskellDepends = [ base bitvec bytestring containers hw-bits hw-prim hw-rankselect hw-rankselect-base store text vector @@ -244032,24 +244922,36 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; - "postgresql-libpq_0_10_1_0" = callPackage - ({ mkDerivation, base, bytestring, Cabal, postgresql, tasty - , tasty-hunit, unix + "postgresql-libpq_0_11_0_0" = callPackage + ({ mkDerivation, base, bytestring, postgresql-libpq-configure + , tasty, tasty-hunit, unix }: mkDerivation { pname = "postgresql-libpq"; - version = "0.10.1.0"; - sha256 = "1w49zp3izxi3s4mq71i93i4s08kwcv1j0j6m5cfpxcp5s4h12pwq"; - revision = "1"; - editedCabalFile = "1d7hvi969ksdzg4fzyy448k354h4jl3k2i3fv8nb6c4y1bzysiba"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring unix ]; - librarySystemDepends = [ postgresql ]; + version = "0.11.0.0"; + sha256 = "18yj7vb51r72ybzi7849w83b79gydnh7az1wkc037fz6iwhb2jh3"; + libraryHaskellDepends = [ + base bytestring postgresql-libpq-configure unix + ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; description = "low-level binding to libpq"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) postgresql;}; + }) {}; + + "postgresql-libpq-configure" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "postgresql-libpq-configure"; + version = "0.11"; + sha256 = "1n5jjnnflh2ldqvcs44al572240s2435bh5m761hrpbmai5y6kwd"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + description = "low-level binding to libpq: configure based provider"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; "postgresql-libpq-notify" = callPackage ({ mkDerivation, async, base, hspec, postgres-options @@ -244068,6 +244970,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "postgresql-libpq-pkgconfig" = callPackage + ({ mkDerivation, base, libpq }: + mkDerivation { + pname = "postgresql-libpq-pkgconfig"; + version = "0.11"; + sha256 = "19n0kqpx0qbhfcpw61n6wg8ll421bsyqmfgsyh6zs7laykhhmigr"; + libraryHaskellDepends = [ base ]; + libraryPkgconfigDepends = [ libpq ]; + doHaddock = false; + description = "low-level binding to libpq: pkg-config based provider"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {libpq = null;}; + "postgresql-lo-stream" = callPackage ({ mkDerivation, base, bytestring, io-streams, lifted-base , monad-loops, mtl, postgresql-simple @@ -244345,8 +245262,8 @@ self: { pname = "postgresql-simple"; version = "0.7.0.0"; sha256 = "0gm1wk2zq35h46v0l1qc0z63jv3gxgqd059j1mcmww80a6sipf4c"; - revision = "1"; - editedCabalFile = "0yhggx06wbg57psqa8sswf85qfzy8ndssv13vwmxj0gc1ca1zv4l"; + revision = "3"; + editedCabalFile = "1vbdiniz18m1kk4wxdnc43ry7gq00vxxvklmnrn8v3vc5r55inka"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive containers hashable Only postgresql-libpq scientific template-haskell text @@ -245499,8 +246416,8 @@ self: { ({ mkDerivation, adjunctions, base, deepseq, lens, mtl }: mkDerivation { pname = "predicate-transformers"; - version = "0.13.0.0"; - sha256 = "1ki2qqbraddncvg7ya9l5l6f362cxvrp0ygn6hvdl3xcljzq0hqr"; + version = "0.15.0.0"; + sha256 = "0kjmdbm0a7c2vik0hansvkri7c9zp5cfazgk00r65syflsgfk91s"; libraryHaskellDepends = [ adjunctions base deepseq lens mtl ]; description = "A library for writing predicates and transformations over predicates in Haskell"; license = lib.licenses.bsd3; @@ -247553,14 +248470,12 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_20_0" = callPackage + "process_1_6_22_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.6.20.0"; - sha256 = "16prkmaj4dz394pg40w5xgbxlh5kbhhliwawdcqs57q0qchs5zff"; - revision = "1"; - editedCabalFile = "00yabbj6vjlxnslp516a824gwkx9hxx9a9j8izxib17i6gg974ra"; + version = "1.6.22.0"; + sha256 = "1yv8pk2g8d5wrw3306ar76fzgd6iyra9ci0syjl0b4pmwxff41ps"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; description = "Process libraries"; license = lib.licenses.bsd3; @@ -248349,8 +249264,8 @@ self: { }: mkDerivation { pname = "project-m36"; - version = "1.0.2"; - sha256 = "0sbp2g5cpw46v3xjj5c3jpznc1sfhdn4ycvfp8ci03m88mp8bjsm"; + version = "1.1.0"; + sha256 = "1nqdfvzq4pm8dgds0r7k5fv4sw10nfygnz0w9dvb118s14sap1fi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248606,6 +249521,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "prometheus_2_3_0" = callPackage + ({ mkDerivation, atomic-primops, base, bytestring, containers + , http-client, http-client-tls, http-types, network-uri, text + , transformers, wai, warp + }: + mkDerivation { + pname = "prometheus"; + version = "2.3.0"; + sha256 = "0mawlfpx34nv44a46z1s68xdrnxmrwsbi3rq9hhfbq9jpj161rk5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base bytestring containers http-client + http-client-tls http-types network-uri text transformers wai warp + ]; + description = "Prometheus Haskell Client"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "prometheus-client" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, clock , containers, criterion, data-sketches, deepseq, doctest @@ -248854,12 +249789,14 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "propeller"; - version = "0.3.0.0"; - sha256 = "0nx76898abx6p71z8bn0sdxi7728zk6dfxgdcz2lp002mbjiawqb"; + version = "0.4.0.0"; + sha256 = "07mj8qj4m43ap7y6mh622qh0n0z9pq2i5rxpqrk89fwjcl26gsrm"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers ]; description = "A Propagator Library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "propellor" = callPackage @@ -248960,6 +249897,8 @@ self: { pname = "proquint"; version = "0.1.0.0"; sha256 = "04hhvrrclyav0nhk6zqp9s58vxad8ndi6yw851qprd6h7wr57wg5"; + revision = "1"; + editedCabalFile = "1p3s3jpck7w9h5qxqp9w59mmf6yr9bgx339l1m01f6yjq720a6l6"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Proquints: Identifiers that are Readable, Spellable, and Pronounceable"; @@ -249827,6 +250766,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.11.0"; sha256 = "04hkg7nlyrziq3pm44sqr6b5zjb5x3d70xqzblp3h7f1sc6839rr"; + revision = "1"; + editedCabalFile = "1myzfrrjj9j0xd9la3iv9jzlgir6l5wxmh279rykjw2whkys20ry"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -249942,6 +250883,8 @@ self: { pname = "psqueues"; version = "0.2.8.0"; sha256 = "0qp48qxqfz3bzl10l1wq3fi2j88bcx71a8g5x3qdaia884wf4vdk"; + revision = "1"; + editedCabalFile = "0yp0i8fkm0gczdgki0qmvcnj5wvrfxjcs7cpmm4ifi9z857l9dy6"; libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; testHaskellDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged tasty @@ -250723,6 +251666,29 @@ self: { mainProgram = "purenix"; }) {}; + "puresat" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath, minisat + , parsec, primitive, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "puresat"; + version = "0.1"; + sha256 = "14jkk4wkmwh0pqai9zzsq214pc3g9fr3bv2lvq72k50cg49dc72a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers parsec primitive + ]; + testHaskellDepends = [ + base filepath minisat primitive QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + doHaddock = false; + description = "Pure Haskell SAT-solver"; + license = lib.licenses.bsd3; + }) {}; + "purescheme-wai-routing-core" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , http-media, http-types, interpolate, text, wai, warp @@ -252565,8 +253531,10 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.2.0"; - sha256 = "1mjy4kv05zk7c7ygkfj95i8c8bzh1n11y4q5bnick2bwhn1wd94k"; + version = "0.2.2"; + sha256 = "0bx6bccnfrqm7593mwi1c52pmb2dimxp3pllc6m818bgwrkii61w"; + revision = "2"; + editedCabalFile = "1mkqx0kadpd99d4izkqg7wm86ffvxr0xvz3p424563dx4k1c2apk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -252867,8 +253835,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.31"; sha256 = "0bsfh6fwc8h3jzkqrqk56rm6iphrmlrp80pa2z1gs79mz4d7w64v"; - revision = "1"; - editedCabalFile = "1l92l30ghks35wr4im54h44ipw8ddwh3jsinl5snmy2jgv3jaz89"; + revision = "2"; + editedCabalFile = "1zigggr5i4ikmc34p97x5md1nvpgkwvnvky7saxxsi5w3s3g3zqz"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple primitive QuickCheck @@ -252902,10 +253870,8 @@ self: { }: mkDerivation { pname = "quickcheck-lockstep"; - version = "0.5.0"; - sha256 = "0ap8qgv33a6rwvvplmmf2hh68hk257l0maznkvlmi7cds6z90bk4"; - revision = "1"; - editedCabalFile = "19iqirk5k92l8k04clppvv84i0z9kfvbffk0jwvljs4jn35qx5mq"; + version = "0.5.1"; + sha256 = "0dsklypvflwgaj6fdh52sw2bzznz1kmmcdbs39nsjji7bkbn7gqp"; libraryHaskellDepends = [ base constraints containers mtl QuickCheck quickcheck-dynamic ]; @@ -254255,23 +255221,25 @@ self: { }) {}; "rails-session" = callPackage - ({ mkDerivation, base, base-compat, base16-bytestring - , base64-bytestring, bytestring, containers, cryptonite, filepath - , hspec, http-types, pbkdf, ruby-marshal, semigroups, string-conv - , tasty, tasty-hspec, transformers, vector + ({ mkDerivation, aeson, aeson-qq, base, base-compat + , base16-bytestring, base64-bytestring, bytestring, containers + , crypton, filepath, hspec, http-types, memory, pbkdf, ruby-marshal + , semigroups, string-conv, tasty, tasty-hspec, text, transformers + , vector }: mkDerivation { pname = "rails-session"; - version = "0.1.3.0"; - sha256 = "0fybpyg5si9rizifxdghilffvqmszm8h7w5v8b7xdmsw1i5gv56m"; + version = "0.1.4.0"; + sha256 = "1gmy0xf7fsjaadmawzssaas7ngwgil9sgnw7s0xhqx1kxz2860sz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - base base-compat base16-bytestring base64-bytestring bytestring - containers cryptonite http-types pbkdf ruby-marshal string-conv - vector + aeson base base-compat base16-bytestring base64-bytestring + bytestring containers crypton http-types memory pbkdf ruby-marshal + string-conv text vector ]; testHaskellDepends = [ - base bytestring filepath hspec ruby-marshal semigroups tasty - tasty-hspec transformers vector + aeson aeson-qq base bytestring filepath hspec ruby-marshal + semigroups tasty tasty-hspec text transformers vector ]; description = "Decrypt Ruby on Rails sessions in Haskell"; license = lib.licenses.bsd3; @@ -254444,6 +255412,8 @@ self: { pname = "ral"; version = "0.2.2"; sha256 = "1c301l9mcq86wkgb4x8vhjrzb0nmv75dsixg5bgmwqp8rbh0xis6"; + revision = "1"; + editedCabalFile = "1j3fqas4xxjs59x8flgm7y7hd21cxs3ahx2zgx5294f844bgkjxb"; libraryHaskellDepends = [ adjunctions base bin boring deepseq distributive fin hashable indexed-traversable QuickCheck semigroupoids @@ -255032,6 +256002,8 @@ self: { pname = "range-set-list"; version = "0.1.4"; sha256 = "1w5kvqi66wg13m6ibzkjkn1gf725msr6ks4nfm5chhk30ad4lvj1"; + revision = "1"; + editedCabalFile = "0819grvps1rb88s1a93mh1mwhxqk67rpijjk13lpfib9948scnfy"; libraryHaskellDepends = [ base containers deepseq hashable ]; testHaskellDepends = [ base containers deepseq hashable tasty tasty-quickcheck @@ -255689,8 +256661,8 @@ self: { pname = "raven-haskell"; version = "0.1.4.1"; sha256 = "0977rwafdwljz3444asvjsikpwc89diahmmzl9f5xc8dzfqcnzay"; - revision = "1"; - editedCabalFile = "1107g5f6sr7sjxnh2d3g727ncfqni6dsvda5hr99fh86vhm2g1wi"; + revision = "2"; + editedCabalFile = "0d6mw3il9qd9ja0828sh1w3x8aib88m37s8ymmdwjp41bkwcrny0"; libraryHaskellDepends = [ aeson base bytestring http-conduit mtl network random resourcet text time unordered-containers uuid-types @@ -255706,8 +256678,8 @@ self: { }: mkDerivation { pname = "raven-haskell-scotty"; - version = "0.1.0.3"; - sha256 = "0vllfasn4rky8r8fg3mpln8pdkxbcvrvx8wamn0xswfwf1rvcf6k"; + version = "0.1.1.0"; + sha256 = "05zk3z5y9vi143mb9asxrd0nzbndhinv6mp4f6lfpcdn9ir9bgaq"; libraryHaskellDepends = [ base bytestring case-insensitive mtl raven-haskell scotty text wai ]; @@ -256058,6 +257030,49 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "rds-data" = callPackage + ({ mkDerivation, aeson, aeson-pretty, amazonka, amazonka-core + , amazonka-rds, amazonka-rds-data, amazonka-secretsmanager, base + , base64-bytestring, bytestring, contravariant, generic-lens + , hedgehog, hedgehog-extras, http-client, hw-polysemy, microlens + , mtl, optparse-applicative, polysemy-log, polysemy-plugin + , polysemy-time, resourcet, stm, tasty, tasty-discover + , tasty-hedgehog, testcontainers, text, time, transformers, ulid + , uuid + }: + mkDerivation { + pname = "rds-data"; + version = "0.0.0.2"; + sha256 = "1gfqxffl7fncmwriyrc328imkv98vwls4jdva5klgaw3gwrq1l2x"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-rds amazonka-rds-data + amazonka-secretsmanager base base64-bytestring bytestring + contravariant generic-lens hw-polysemy microlens mtl polysemy-log + polysemy-plugin text time transformers ulid uuid + ]; + executableHaskellDepends = [ + aeson amazonka amazonka-rds-data base bytestring generic-lens + hedgehog http-client hw-polysemy microlens optparse-applicative + polysemy-log polysemy-plugin polysemy-time resourcet stm + testcontainers text time ulid uuid + ]; + testHaskellDepends = [ + aeson aeson-pretty amazonka amazonka-core amazonka-rds + amazonka-rds-data amazonka-secretsmanager base base64-bytestring + bytestring generic-lens hedgehog hedgehog-extras hw-polysemy + microlens polysemy-log polysemy-plugin tasty tasty-discover + tasty-hedgehog testcontainers text time ulid uuid + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Codecs for use with AWS rds-data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "rds-data"; + }) {}; + "rds-data-codecs" = callPackage ({ mkDerivation, aeson, aeson-pretty, amazonka, amazonka-core , amazonka-rds-data, base, bytestring, contravariant, doctest @@ -256299,8 +257314,8 @@ self: { pname = "reactive-banana"; version = "1.3.2.0"; sha256 = "0mrsw3hkl0sgwcbay4m1lzs4bilss80g9p6njbbhapbfjyzsr36k"; - revision = "3"; - editedCabalFile = "0gwky9jadzy025w1d4r3k1kf8g1i4y0v15j8di14402gzpin9n4j"; + revision = "4"; + editedCabalFile = "1nijajqvp7i5jq99y9c3z969ljgagkarpn5ikbd3bir2msz54pyn"; libraryHaskellDepends = [ base containers deepseq hashable pqueue semigroups stm these transformers unordered-containers vault @@ -258945,17 +259960,17 @@ self: { "reflex-sdl2" = callPackage ({ mkDerivation, async, base, containers, dependent-sum - , exception-transformers, mtl, primitive, ref-tf, reflex, sdl2, stm + , exception-transformers, mtl, ref-tf, reflex, sdl2, stm }: mkDerivation { pname = "reflex-sdl2"; - version = "0.3.0.0"; - sha256 = "1mjynfdxnjdd308jp2gcpl8x00pmzshm81ramls7hzmkkvfm2xdb"; + version = "0.3.0.3"; + sha256 = "10lc0arzn2sxb69sah13fkn4zd2hsj2gwnblr4djzwzap409xiyh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base containers dependent-sum exception-transformers mtl - primitive ref-tf reflex sdl2 stm + ref-tf reflex sdl2 stm ]; executableHaskellDepends = [ base mtl reflex ]; description = "SDL2 and reflex FRP"; @@ -262489,6 +263504,32 @@ self: { pname = "rest-rewrite"; version = "0.4.3"; sha256 = "0rvqagskkibwadqdkfqqjp0vrdxfn1hnb6g27ps7h160knygaa1d"; + revision = "1"; + editedCabalFile = "0m0m3brlxx945lrr34wpmn5jgzdpw9ck0qxj23s8av4rlh1a9hx1"; + libraryHaskellDepends = [ + base containers hashable monad-loops mtl parsec process QuickCheck + text time unordered-containers + ]; + testHaskellDepends = [ + base containers hashable mtl QuickCheck text time + unordered-containers + ]; + testSystemDepends = [ graphviz z3 ]; + doHaddock = false; + description = "Rewriting library with online termination checking"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.tbidne ]; + }) {inherit (pkgs) graphviz; inherit (pkgs) z3;}; + + "rest-rewrite_0_4_4" = callPackage + ({ mkDerivation, base, containers, graphviz, hashable, monad-loops + , mtl, parsec, process, QuickCheck, text, time + , unordered-containers, z3 + }: + mkDerivation { + pname = "rest-rewrite"; + version = "0.4.4"; + sha256 = "03jn5wclljkfdj1nvzbs5jvgsh343g1qr864pivgmxbc5ngrdk91"; libraryHaskellDepends = [ base containers hashable monad-loops mtl parsec process QuickCheck text time unordered-containers @@ -262501,6 +263542,7 @@ self: { doHaddock = false; description = "Rewriting library with online termination checking"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.tbidne ]; }) {inherit (pkgs) graphviz; inherit (pkgs) z3;}; @@ -262882,7 +263924,6 @@ self: { ]; description = "Code shared across the code samples in the book \"Retrocomputing with Clash\""; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "retroclash-sim" = callPackage @@ -262904,7 +263945,6 @@ self: { ]; description = "High-level simulators from the book \"Retrocomputing with Clash\""; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "retry" = callPackage @@ -263665,8 +264705,10 @@ self: { pname = "ribbit"; version = "1.1.0.1"; sha256 = "076m5w4w08z8migb0v8vb6lybs06x1bfvxqfi9g633lz464hyi9v"; + revision = "1"; + editedCabalFile = "00mymcg55bli8a70wvfdssmmrp221p9igv1963m3lzxz9nfi7186"; libraryHaskellDepends = [ base Only postgresql-simple text time ]; - description = "Type-level Relational DB combinators"; + description = "[Unmaintained] Type-level Relational DB combinators"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -263868,8 +264910,8 @@ self: { }: mkDerivation { pname = "ridley"; - version = "0.3.4.1"; - sha256 = "03y25hcmh38psf5gs28aa21ibkcg16d3kk2xmv073v50b14dxysr"; + version = "0.4.0.0"; + sha256 = "0g6bxxmlnlcbic8v91wah5xw0a1b4fy81y328j49dyi3xcf88nka"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -265891,8 +266933,8 @@ self: { }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.11"; - sha256 = "0yvv524cy8iblxgkf125s8b6xjhg7a0l36xrfb51hl6y71b5cdx5"; + version = "0.4.12"; + sha256 = "16l3pxzqndjhnycpnn9jnxisp9mjdbyvglfpra1is07ssr0ckqn0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266356,8 +267398,8 @@ self: { pname = "ruby-marshal"; version = "0.2.1"; sha256 = "18kdagf0lyghpaffzgw42ql1wrqkh13rfqjpj23i09i67pqrv3lk"; - revision = "1"; - editedCabalFile = "0f3jdq5ca12mbgawziakl0bw14gy1ycmvyp4ljffsghcg5fghxg9"; + revision = "2"; + editedCabalFile = "0sm6gk2v7f3hsr5y22g35bl2fdia5827bfk8pnrv3sf61fjh6mrd"; libraryHaskellDepends = [ base bytestring cereal containers fail mtl string-conv vector ]; @@ -266763,6 +267805,43 @@ self: { broken = true; }) {}; + "rzk_0_7_5" = callPackage + ({ mkDerivation, aeson, alex, array, base, bifunctors, BNFC + , bytestring, Cabal, co-log-core, data-default-class, directory + , doctest, filepath, Glob, happy, hspec, hspec-discover, lens, lsp + , lsp-types, mtl, optparse-generic, process, QuickCheck, stm + , template-haskell, text, with-utf8, yaml + }: + mkDerivation { + pname = "rzk"; + version = "0.7.5"; + sha256 = "0x9485rs2hc51jfaczcmx89jn2nnppfnrk717xc559rzb64s2sgk"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal process ]; + libraryHaskellDepends = [ + aeson array base bifunctors bytestring co-log-core + data-default-class directory filepath Glob lens lsp lsp-types mtl + stm template-haskell text yaml + ]; + libraryToolDepends = [ alex BNFC happy ]; + executableHaskellDepends = [ + array base bifunctors bytestring directory Glob mtl + optparse-generic template-haskell text with-utf8 yaml + ]; + executableToolDepends = [ alex BNFC happy ]; + testHaskellDepends = [ + array base bifunctors bytestring directory doctest Glob hspec + hspec-discover mtl QuickCheck template-haskell text yaml + ]; + testToolDepends = [ alex BNFC happy hspec-discover ]; + description = "An experimental proof assistant for synthetic ∞-categories"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "rzk"; + broken = true; + }) {}; + "s-cargot" = callPackage ({ mkDerivation, base, containers, HUnit, parsec, QuickCheck, text }: @@ -266782,8 +267861,8 @@ self: { ({ mkDerivation, base, HUnit, parsec, s-cargot, text }: mkDerivation { pname = "s-cargot-letbind"; - version = "0.2.4.0"; - sha256 = "1q6rn25c95y9pa96v3p715hkqdagcf92ih9myqimp107c4ma8gn1"; + version = "0.2.5.0"; + sha256 = "1wivljmfpq0llk7pydyc2awkx03jdcln4r0gl5zmmr2diwvjzadc"; libraryHaskellDepends = [ base s-cargot text ]; testHaskellDepends = [ base HUnit parsec s-cargot text ]; description = "Enables let-binding and let-expansion for s-cargot defined S-expressions"; @@ -266978,19 +268057,13 @@ self: { broken = true; }) {}; - "safe-coloured-text-layout_0_2_0_0" = callPackage - ({ mkDerivation, base, bytestring, safe-coloured-text, sydtest - , sydtest-discover, text, validity - }: + "safe-coloured-text-layout_0_2_0_1" = callPackage + ({ mkDerivation, base, safe-coloured-text, text, validity }: mkDerivation { pname = "safe-coloured-text-layout"; - version = "0.2.0.0"; - sha256 = "0hhmhbm7zw45nxqy24k8za30k4z0wr2hclgh3kzn72sdb0cq5jir"; + version = "0.2.0.1"; + sha256 = "0pqpsjjsjrnl4dg7nzjspb13iwajph2phyy1056kljnr0yfvysc6"; libraryHaskellDepends = [ base safe-coloured-text text validity ]; - testHaskellDepends = [ - base bytestring safe-coloured-text sydtest text - ]; - testToolDepends = [ sydtest-discover ]; description = "Safely layout output coloured text"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -267018,6 +268091,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "safe-coloured-text-layout-gen_0_0_0_1" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-sydtest + , safe-coloured-text, safe-coloured-text-gen + , safe-coloured-text-layout, sydtest, sydtest-discover, text + }: + mkDerivation { + pname = "safe-coloured-text-layout-gen"; + version = "0.0.0.1"; + sha256 = "1yk5xdx9qwfq32407857kfcf7jdxhpz1k70j27741jnfjws8jwb0"; + libraryHaskellDepends = [ + base genvalidity safe-coloured-text-gen safe-coloured-text-layout + ]; + testHaskellDepends = [ + base genvalidity-sydtest safe-coloured-text + safe-coloured-text-layout sydtest text + ]; + testToolDepends = [ sydtest-discover ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "safe-coloured-text-terminfo" = callPackage ({ mkDerivation, base, safe-coloured-text, terminfo }: mkDerivation { @@ -268767,7 +269861,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_6_0_1" = callPackage + "sbp_6_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -268776,8 +269870,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.0.1"; - sha256 = "12q23hdj8xddq9kq73nqf50qwdazqlv6xrb0dyxs5xg3kvlpccwq"; + version = "6.1.0"; + sha256 = "1ihnsxil3f1fccm6zf3daiw12qblmxmrpfs6spqnh2jfyxgmrmkx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268880,7 +269974,7 @@ self: { broken = true; }) {inherit (pkgs) z3;}; - "sbv_10_11" = callPackage + "sbv_10_12" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, filepath, libBF, mtl, pretty, process , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden @@ -268889,8 +269983,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "10.11"; - sha256 = "0q1xjhkbg6pv5hsnyl64ycfqbkq8kk8glmhh28rh2llj7r4lzmh0"; + version = "10.12"; + sha256 = "1siavgsc0a25rl4x22jcff2d9h1bqif4vm1nymz6niglbqnnrsv8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -270268,10 +271362,12 @@ self: { pname = "scotty-resource"; version = "0.2.0.2"; sha256 = "1lhaajsx34hlci76wjvab7a1sjd42silxsvf94ncf0pc0rmjqg1n"; + revision = "1"; + editedCabalFile = "11nwgmfc25bifdfwjs6jpjdrm080hdxqmn4vl5w61zza4972ykmp"; libraryHaskellDepends = [ base containers http-types scotty text transformers wai ]; - description = "A Better way of modeling web resources"; + description = "[Deprecated] A Better way of modeling web resources"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; @@ -270774,7 +271870,6 @@ self: { executableHaskellDepends = [ base pretty-simple sdl2 text ]; description = "small testing tool for sdl2 and accelerated drivers"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "sdl-try-drivers"; }) {}; @@ -270799,8 +271894,6 @@ self: { testHaskellDepends = [ base deepseq linear vector weigh ]; description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) SDL2;}; "sdl2-cairo" = callPackage @@ -270812,7 +271905,6 @@ self: { libraryHaskellDepends = [ base cairo linear sdl2 ]; description = "Render with Cairo on SDL textures"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "sdl2-cairo-image" = callPackage @@ -270892,7 +271984,6 @@ self: { executablePkgconfigDepends = [ SDL2 SDL2_gfx ]; description = "Haskell bindings to SDL2_gfx"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "sdl2-gfx-example"; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;}; @@ -270987,7 +272078,6 @@ self: { description = "Bindings to SDL2_ttf"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -271446,15 +272536,15 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) secp256k1;}; - "secp256k1-haskell_1_2_0" = callPackage + "secp256k1-haskell_1_4_0" = callPackage ({ mkDerivation, base, base16, bytestring, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, monad-par, mtl , QuickCheck, secp256k1, string-conversions, unliftio-core }: mkDerivation { pname = "secp256k1-haskell"; - version = "1.2.0"; - sha256 = "1lr2sq8r3sx41f99pvga9ck0vw0sy7034zra80gxq1hnifjnd5q3"; + version = "1.4.0"; + sha256 = "1nba3f1952p229wbjmbpx80h212mmf1njvyxikiw9c4vpkfksx8b"; libraryHaskellDepends = [ base base16 bytestring deepseq entropy hashable QuickCheck string-conversions unliftio-core @@ -271755,6 +272845,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "select-rpms" = callPackage + ({ mkDerivation, base, directory, extra, filepath, Glob, rpm-nvr + , safe, simple-cmd, simple-cmd-args, simple-prompt + }: + mkDerivation { + pname = "select-rpms"; + version = "0.1.0"; + sha256 = "056an1cn0zx3ibbfx0qpv8aw19vnc8igkhz5phjmvypxzls75qd6"; + libraryHaskellDepends = [ + base directory extra filepath Glob rpm-nvr safe simple-cmd + simple-cmd-args simple-prompt + ]; + description = "Select a subset of RPM packages"; + license = lib.licenses.mit; + }) {}; + "selections" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -271994,6 +273100,8 @@ self: { pname = "semialign"; version = "1.3.1"; sha256 = "1xwx1icyggjbjflgn75bsqw34dmpsd15qqmz13ljxv7zak17ps36"; + revision = "1"; + editedCabalFile = "047n3dfaci8igd7dawxj0ni5452w26ay36lr259qrb5zqfwzvfhf"; libraryHaskellDepends = [ base containers hashable indexed-traversable indexed-traversable-instances semigroupoids tagged these @@ -272734,17 +273842,17 @@ self: { "sequence-formats" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec - , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers - , vector + , pipes-bytestring, pipes-safe, pipes-zlib, tasty, tasty-hunit + , transformers, vector }: mkDerivation { pname = "sequence-formats"; - version = "1.8.0.1"; - sha256 = "093w13dy7p2i77pc94b32n8j47q8c05kih597a9h107plzy97zxk"; + version = "1.8.1.0"; + sha256 = "105kxxczmdq6k2mnfsr5k6ixnlcllkhk9w70c5jcf96wz4gm6ydz"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe - transformers vector + pipes-zlib transformers vector ]; testHaskellDepends = [ base bytestring containers foldl hspec pipes pipes-safe tasty @@ -272754,6 +273862,30 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "sequence-formats_1_8_1_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, errors + , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec + , pipes-bytestring, pipes-safe, pipes-zlib, tasty, tasty-hunit + , transformers, vector + }: + mkDerivation { + pname = "sequence-formats"; + version = "1.8.1.1"; + sha256 = "09k7iqi1cjynxvdqihg6p98isx9i7z3xiw5h9gll5d2hyz040vya"; + libraryHaskellDepends = [ + attoparsec base bytestring containers errors exceptions foldl + lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe + pipes-zlib transformers vector + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec pipes pipes-safe tasty + tasty-hunit transformers vector + ]; + description = "A package with basic parsing utilities for several Bioinformatic data formats"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "sequenceTools" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, foldl, hspec , lens-family, optparse-applicative, pipes, pipes-group @@ -272945,7 +274077,6 @@ self: { ]; description = "Test your 'Aeson' 'Serialize' and 'Binary' instances for stability over time"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "serialise" = callPackage @@ -273133,8 +274264,8 @@ self: { pname = "servant"; version = "0.20.1"; sha256 = "1s8vapj8qb8l5snjzxd63d9rvxwa1vw6g77cg8nynrzzppwp7xwl"; - revision = "4"; - editedCabalFile = "0yd1v3vk7lay3f9jnkybqc57am4qkgnxaz5s8rnc243agmrd4shs"; + revision = "5"; + editedCabalFile = "1lp44k8vsjwscjc5palvr930pznrm40adqksm3jcmhjsq63xmmji"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive constraints deepseq http-api-data http-media @@ -273150,6 +274281,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant_0_20_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring + , case-insensitive, constraints, containers, deepseq, hspec + , hspec-discover, http-api-data, http-media, http-types, mmorph + , mtl, network-uri, QuickCheck, quickcheck-instances + , singleton-bool, sop-core, text, transformers, vault + }: + mkDerivation { + pname = "servant"; + version = "0.20.2"; + sha256 = "0rakyjrmn05sb2gxk4bkxlb23zfwm1pjkdg9mh7b4hjgsdwy4fba"; + libraryHaskellDepends = [ + aeson attoparsec base bifunctors bytestring case-insensitive + constraints containers deepseq http-api-data http-media http-types + mmorph mtl network-uri QuickCheck singleton-bool sop-core text + transformers vault + ]; + testHaskellDepends = [ + aeson base bytestring hspec http-media mtl QuickCheck + quickcheck-instances text + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-JuicyPixels" = callPackage ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant , servant-server, wai, warp @@ -273265,6 +274423,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-auth_0_4_2_0" = callPackage + ({ mkDerivation, aeson, base, containers, jose, lens, servant, text + , unordered-containers + }: + mkDerivation { + pname = "servant-auth"; + version = "0.4.2.0"; + sha256 = "0h71v9n3vd1ca9kav2b6w53wnk950hxlgp3hcnhyk7yd9aph4nwx"; + libraryHaskellDepends = [ + aeson base containers jose lens servant text unordered-containers + ]; + description = "Authentication combinators for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-auth-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , hspec-discover, http-client, http-types, jose, QuickCheck @@ -273291,6 +274465,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-auth-client_0_4_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-discover, http-client, http-types, jose, QuickCheck + , servant, servant-auth, servant-auth-server, servant-client + , servant-client-core, servant-server, time, transformers, wai + , warp + }: + mkDerivation { + pname = "servant-auth-client"; + version = "0.4.2.0"; + sha256 = "1pvqiygnwnkj6y4mi03qnpjlp305cjmpzp7nrqmc2p6qwnl2l4q9"; + libraryHaskellDepends = [ + base bytestring containers servant servant-auth servant-client-core + ]; + testHaskellDepends = [ + aeson base bytestring hspec http-client http-types jose QuickCheck + servant servant-auth servant-auth-server servant-client + servant-server time transformers wai warp + ]; + testToolDepends = [ hspec-discover ]; + description = "servant-client/servant-auth compatibility"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-auth-cookie" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , cereal, cereal-time, cookie, criterion, cryptonite, data-default @@ -273347,6 +274546,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-auth-docs_0_2_11_0" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-docs, template-haskell, text + }: + mkDerivation { + pname = "servant-auth-docs"; + version = "0.2.11.0"; + sha256 = "127w2ggii2vqs60cnd5ir4azyrxnm7mhfydi156liykk2v8jkkaj"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base lens servant servant-auth servant-docs + ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "servant-docs/servant-auth compatibility"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-auth-hmac" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, case-insensitive, cereal @@ -273416,6 +274638,36 @@ self: { broken = true; }) {}; + "servant-auth-server_0_4_9_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder + , bytestring, case-insensitive, cookie, data-default-class, entropy + , hspec, hspec-discover, http-client, http-types, jose, lens + , lens-aeson, markdown-unlit, memory, monad-time, mtl, QuickCheck + , servant, servant-auth, servant-server, tagged, text, time + , transformers, unordered-containers, wai, warp, wreq + }: + mkDerivation { + pname = "servant-auth-server"; + version = "0.4.9.0"; + sha256 = "0fhk2z9n9ax4g7iisdgcd87wgj9wvazhl86kjh364gsj1g8a5y99"; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + case-insensitive cookie data-default-class entropy http-types jose + lens memory monad-time mtl servant servant-auth servant-server + tagged text time unordered-containers wai + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive hspec http-client http-types + jose lens lens-aeson mtl QuickCheck servant servant-auth + servant-server text time transformers wai warp wreq + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "servant-server/servant-auth compatibility"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "servant-auth-swagger" = callPackage ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck , servant, servant-auth, servant-swagger, swagger2, text @@ -273438,6 +274690,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-auth-swagger_0_2_11_0" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck + , servant, servant-auth, servant-swagger, swagger2, text + }: + mkDerivation { + pname = "servant-auth-swagger"; + version = "0.2.11.0"; + sha256 = "1h5ckkai4qxz9c2a62l2lv0ss8az5j1lwyzs4g652zffrgx9qk28"; + libraryHaskellDepends = [ + base lens servant servant-auth servant-swagger swagger2 text + ]; + testHaskellDepends = [ + base hspec lens QuickCheck servant servant-auth servant-swagger + swagger2 text + ]; + testToolDepends = [ hspec-discover ]; + description = "servant-swagger/servant-auth compatibility"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-auth-token" = callPackage ({ mkDerivation, aeson-injector, base, byteable, bytestring , containers, http-api-data, mtl, pwstore-fast, servant @@ -273769,6 +275042,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-client_0_20_2" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , deepseq, entropy, exceptions, hspec, hspec-discover + , http-api-data, http-client, http-media, http-types, HUnit + , kan-extensions, markdown-unlit, monad-control, mtl, network + , QuickCheck, semigroupoids, servant, servant-client-core + , servant-server, sop-core, stm, text, time, transformers + , transformers-base, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.20.2"; + sha256 = "026bp0qk2bx672834yjxmqrfacyzzdssm89bd0niz1xzxzmw5r7g"; + libraryHaskellDepends = [ + base base-compat bytestring containers deepseq exceptions + http-client http-media http-types kan-extensions monad-control mtl + semigroupoids servant servant-client-core stm time transformers + transformers-base + ]; + testHaskellDepends = [ + aeson base base-compat bytestring entropy hspec http-api-data + http-client http-types HUnit markdown-unlit mtl network QuickCheck + servant servant-client-core servant-server sop-core stm text + transformers wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-client-core" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, constraints, containers, deepseq, exceptions, free @@ -273794,6 +275098,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-client-core_0_20_2" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, constraints, containers, deepseq, exceptions, free + , hspec, hspec-discover, http-media, http-types, network-uri + , QuickCheck, safe, servant, sop-core, template-haskell, text + }: + mkDerivation { + pname = "servant-client-core"; + version = "0.20.2"; + sha256 = "10nv810ns8v1d9a2fkg9bgi7h9gm4yap1y6mg2r15d569i27rrvc"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring constraints + containers deepseq exceptions free http-media http-types + network-uri safe servant sop-core template-haskell text + ]; + testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Core functionality and class for client function generation for servant APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-client-js" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , containers, exceptions, http-media, http-types, jsaddle @@ -273885,6 +275211,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-conduit_0_16_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, conduit + , http-client, http-media, mtl, resourcet, servant, servant-client + , servant-server, unliftio-core, wai, warp + }: + mkDerivation { + pname = "servant-conduit"; + version = "0.16.1"; + sha256 = "0qxddrkqbglb1ifrcjg8bx86in0na3pmsvgb5q5486bzzsximl48"; + libraryHaskellDepends = [ + base bytestring conduit mtl resourcet servant unliftio-core + ]; + testHaskellDepends = [ + base base-compat bytestring conduit http-client http-media + resourcet servant servant-client servant-server wai warp + ]; + description = "Servant Stream support for conduit"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-csharp" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , heredocs, http-types, lens, mtl, servant, servant-foreign @@ -273998,6 +275345,36 @@ self: { mainProgram = "greet-docs"; }) {}; + "servant-docs_0_13_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , case-insensitive, hashable, http-media, http-types, lens, servant + , string-conversions, tasty, tasty-golden, tasty-hunit, text + , transformers, universe-base, unordered-containers + }: + mkDerivation { + pname = "servant-docs"; + version = "0.13.1"; + sha256 = "1gdv5yrdqfsb4am8rn9fj7gl4f1nswlcbqnp6kc33j5z0mv35z4y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring case-insensitive + hashable http-media http-types lens servant string-conversions text + universe-base unordered-containers + ]; + executableHaskellDepends = [ + aeson base lens servant string-conversions text + ]; + testHaskellDepends = [ + aeson base base-compat lens servant string-conversions tasty + tasty-golden tasty-hunit transformers + ]; + description = "generate API docs for your servant webservice"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "greet-docs"; + }) {}; + "servant-docs-simple" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec , hspec-core, prettyprinter, raw-strings-qq, servant, text @@ -274235,6 +275612,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-foreign_0_16_1" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , http-types, lens, servant, text + }: + mkDerivation { + pname = "servant-foreign"; + version = "0.16.1"; + sha256 = "15a5cfiihmav7yq6nfp5f365649q054nk02hpf3lsaw8alpbivpp"; + libraryHaskellDepends = [ + base base-compat http-types lens servant text + ]; + testHaskellDepends = [ base hspec servant ]; + testToolDepends = [ hspec-discover ]; + description = "Helpers for generating clients for servant APIs in any programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-gdp" = callPackage ({ mkDerivation, aeson, base, gdp, servant-server, text }: mkDerivation { @@ -274438,6 +275833,40 @@ self: { broken = true; }) {}; + "servant-http-streams_0_20_2" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring + , case-insensitive, containers, deepseq, entropy, exceptions, hspec + , hspec-discover, http-api-data, http-common, http-media + , http-streams, http-types, HUnit, io-streams, kan-extensions + , markdown-unlit, monad-control, mtl, network, QuickCheck + , semigroupoids, servant, servant-client-core, servant-server, stm + , text, time, transformers, transformers-base, transformers-compat + , wai, warp + }: + mkDerivation { + pname = "servant-http-streams"; + version = "0.20.2"; + sha256 = "029i6rqmj6q5fn32vimr92rwgfb0c5l5cm19ncrw48nh78pgp0zm"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive containers deepseq + exceptions http-common http-media http-streams http-types + io-streams kan-extensions monad-control mtl semigroupoids servant + servant-client-core text time transformers transformers-base + transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring deepseq entropy hspec + http-api-data http-streams http-types HUnit kan-extensions + markdown-unlit mtl network QuickCheck servant servant-client-core + servant-server stm text transformers transformers-compat wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "servant-http2-client" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring , case-insensitive, containers, data-default-class, exceptions @@ -274604,6 +276033,26 @@ self: { broken = true; }) {}; + "servant-lint" = callPackage + ({ mkDerivation, base, bytestring, containers, safe-coloured-text + , servant, servant-server, sydtest, text + }: + mkDerivation { + pname = "servant-lint"; + version = "0.1.0.0"; + sha256 = "1y9fc8kp8mclxm0njpdn121k7qa4f4vnwkcxr658pd26g34daqqk"; + libraryHaskellDepends = [ + base bytestring containers safe-coloured-text servant + servant-server text + ]; + testHaskellDepends = [ + base bytestring containers safe-coloured-text servant + servant-server sydtest text + ]; + description = "Lint Servant Routes"; + license = lib.licenses.bsd3; + }) {}; + "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant, servant-server , text, wai, warp @@ -274640,6 +276089,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-machines_0_16_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, http-client + , http-media, machines, mtl, servant, servant-client + , servant-server, wai, warp + }: + mkDerivation { + pname = "servant-machines"; + version = "0.16.1"; + sha256 = "0qhy99bx9lv35jpz5k19391z2ph91a7yp8z3ffcsc6lj4gd5nnak"; + libraryHaskellDepends = [ base bytestring machines mtl servant ]; + testHaskellDepends = [ + base base-compat bytestring http-client http-media machines servant + servant-client servant-server wai warp + ]; + description = "Servant Stream support for machines"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-match" = callPackage ({ mkDerivation, base, bytestring, hspec, http-types, network-uri , servant, text, utf8-string @@ -274987,6 +276455,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-pipes_0_16_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, http-client + , http-media, monad-control, mtl, pipes, pipes-bytestring + , pipes-safe, servant, servant-client, servant-server, wai, warp + }: + mkDerivation { + pname = "servant-pipes"; + version = "0.16.1"; + sha256 = "0n5l2dwnp0p8gjnz05rqiwxbn0qvngkrlc76ywvampvp1m4kbmhl"; + libraryHaskellDepends = [ + base bytestring monad-control mtl pipes pipes-safe servant + ]; + testHaskellDepends = [ + base base-compat bytestring http-client http-media pipes + pipes-bytestring pipes-safe servant servant-client servant-server + wai warp + ]; + description = "Servant Stream support for pipes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-polysemy" = callPackage ({ mkDerivation, base, deepseq, http-client, http-client-tls, lens , mtl, polysemy, polysemy-plugin, polysemy-zoo, servant @@ -275233,8 +276723,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.1.0.0"; - sha256 = "0bb6h0x1hcms10qmwxka7b6y8b1pigwa639sw0n1dn2jipzwxbla"; + version = "0.1.1.0"; + sha256 = "0hzfwqxbcgf9mxzlhw53pv99jxlpib56xjsnh8yw15j2pgb908qs"; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -275531,8 +277021,8 @@ self: { pname = "servant-server"; version = "0.20"; sha256 = "1gp8pslk2sspi5vzrl1nimndpif7jhgzlffi2mzf1ap1bdwgxchk"; - revision = "5"; - editedCabalFile = "1k9rfv4pql4x7qb6gs4yzrfmyp2snfw8640mqaknbg9mc8ic28bc"; + revision = "6"; + editedCabalFile = "1n70k1n65lyqx4lhbmg1gw5mfl584smlyaxzrllmp9flh50z64nf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -275557,6 +277047,42 @@ self: { mainProgram = "greet"; }) {}; + "servant-server_0_20_2" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, constraints, containers, directory, exceptions + , filepath, hspec, hspec-discover, hspec-wai, http-api-data + , http-media, http-types, monad-control, mtl, network, resourcet + , safe, servant, should-not-typecheck, sop-core, tagged, temporary + , text, transformers, transformers-base, wai, wai-app-static + , wai-extra, warp, word8 + }: + mkDerivation { + pname = "servant-server"; + version = "0.20.2"; + sha256 = "0fqgnzzgbj4w441h3v841lav7gxazakz04s354r24pq4rh6m1kqy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring bytestring constraints containers exceptions + filepath http-api-data http-media http-types monad-control mtl + network resourcet servant sop-core tagged text transformers + transformers-base wai wai-app-static word8 + ]; + executableHaskellDepends = [ + aeson base base-compat text wai warp + ]; + testHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring directory hspec + hspec-wai http-types mtl resourcet safe servant + should-not-typecheck temporary text wai wai-extra + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs and serving them"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "greet"; + }) {}; + "servant-server-namedargs" = callPackage ({ mkDerivation, base, bytestring, http-api-data, http-types, named , servant, servant-namedargs, servant-server, string-conversions @@ -275861,6 +277387,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-swagger_1_2_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , Cabal, cabal-doctest, directory, doctest, filepath, hspec + , hspec-discover, http-media, insert-ordered-containers, lens + , lens-aeson, QuickCheck, servant, singleton-bool, swagger2 + , template-haskell, text, time, unordered-containers, utf8-string + , vector + }: + mkDerivation { + pname = "servant-swagger"; + version = "1.2.1"; + sha256 = "18cvybmmp8cp8scpb7hncgn8jra8v82mby1bibysn6xbjy5pqlxq"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring hspec http-media + insert-ordered-containers lens QuickCheck servant singleton-bool + swagger2 text unordered-containers + ]; + testHaskellDepends = [ + aeson base base-compat directory doctest filepath hspec lens + lens-aeson QuickCheck servant swagger2 template-haskell text time + utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API."; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-swagger-tags" = callPackage ({ mkDerivation, base, insert-ordered-containers, lens, servant , servant-mock, servant-server, servant-swagger, swagger2, text @@ -276489,8 +278044,8 @@ self: { }: mkDerivation { pname = "serversession-backend-persistent"; - version = "2.0.1"; - sha256 = "1x08a5xhg2f48hjj651gchn17k7fg1n4a64vmyzy2ps2xrgqr2sy"; + version = "2.0.2"; + sha256 = "19jsswwc38514fqg2asshsvx1x3zx930887k63my4dmidyvvqmwd"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cereal path-pieces persistent serversession tagged text time transformers @@ -277916,7 +279471,7 @@ self: { license = lib.licenses.mit; }) {}; - "shakespeare" = callPackage + "shakespeare_2_1_0_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, file-embed, ghc-prim, hspec , HUnit, parsec, process, scientific, template-haskell, text @@ -277939,6 +279494,33 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.psibi ]; + }) {}; + + "shakespeare" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, file-embed, ghc-prim, hspec + , HUnit, parsec, process, scientific, template-haskell, text + , th-lift, time, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.1.1"; + sha256 = "1j6jniy8d8dgc61h4n2kw668y8f30cqnsfwmgad1s4fqj1bplh0r"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions file-embed ghc-prim parsec process scientific + template-haskell text th-lift time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = lib.licenses.mit; maintainers = [ lib.maintainers.psibi ]; }) {}; @@ -278607,6 +280189,8 @@ self: { pname = "shh"; version = "0.7.3.0"; sha256 = "18rb6jhkazl64mixnw0s4v824m4vvmnpap3lvv917xsjj605xx1a"; + revision = "6"; + editedCabalFile = "1wqmdm902lf06l400drvzqjcnb89vx817q1z91klvky8bnxp1ksg"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -278633,8 +280217,8 @@ self: { pname = "shh-extras"; version = "0.1.0.2"; sha256 = "0yax761d0xgc8nqg8h7y69fb1mwf88w73sznh3kffhlaladavskx"; - revision = "1"; - editedCabalFile = "1rk56bpsdiyylay8kmgky2i4bvxs6xjc3xdc1yssb2qv74gcl8wq"; + revision = "2"; + editedCabalFile = "176mjl67pjdzz92281qipj250gc3dixdfpb3x8v14w0f28r4ja55"; libraryHaskellDepends = [ base hostname shh time ]; testHaskellDepends = [ base tasty ]; description = "Utility functions for using shh"; @@ -279198,6 +280782,8 @@ self: { testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "timers using SI units (seconds)"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sibe" = callPackage @@ -281099,8 +282685,8 @@ self: { pname = "single-tuple"; version = "0.1.3.0"; sha256 = "1axr5bv92pc9261mpcjq8wn0871i4n18hn9qpk8gpqj6zvh9gjcc"; - revision = "1"; - editedCabalFile = "0lcg7rjy51rja8f4575cssrhyb86f03w13aw440mqs85mnzx75km"; + revision = "2"; + editedCabalFile = "0in3mgf3mdc8zh8zj9sqipfjnb4007r0zzbswkn9ydwz0hi0q09n"; libraryHaskellDepends = [ base ghc-prim OneTuple Only ]; testHaskellDepends = [ base ghc-prim hspec OneTuple Only ]; testToolDepends = [ hspec-discover ]; @@ -281837,6 +283423,35 @@ self: { broken = true; }) {}; + "skeletest" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base + , containers, Diff, directory, filepath, ghc, hedgehog, megaparsec + , ordered-containers, parser-combinators, pretty, process + , recover-rtti, template-haskell, text, transformers, unliftio + }: + mkDerivation { + pname = "skeletest"; + version = "0.1.0"; + sha256 = "1bl02qvmxwa2nswi11lhgp6gnyg3jych6qscmwfyw2d9pawpq4d1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal base containers Diff directory + filepath ghc hedgehog megaparsec ordered-containers + parser-combinators pretty recover-rtti template-haskell text + transformers unliftio + ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ + aeson base containers directory filepath process text unliftio + ]; + description = "Batteries-included, opinionated test framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "skeletest-preprocessor"; + broken = true; + }) {}; + "skeleton" = callPackage ({ mkDerivation, argparser, attoparsec, base, bytestring, filepath , hex, posix-escape, process, time @@ -282559,6 +284174,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "slick_1_3_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, extra + , mustache, pandoc, shake, text, unordered-containers + }: + mkDerivation { + pname = "slick"; + version = "1.3.1.0"; + sha256 = "1jg6vhy60g2l58asifsz4642zfdmih2nw9f964prglhhkxdgisc2"; + libraryHaskellDepends = [ + aeson base bytestring directory extra mustache pandoc shake text + unordered-containers + ]; + description = "A quick & easy static site builder built with shake and pandoc"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "slidemews" = callPackage ({ mkDerivation, aeson, base, bytestring, MonadCatchIO-transformers , mtl, pandoc, snap-core, snap-server, utf8-string @@ -283445,6 +285077,8 @@ self: { pname = "smtlib-backends"; version = "0.4"; sha256 = "16n2ig71wjqp1ziplwrq3639fqn582ymx5g9ls7f814ddjgc70xg"; + revision = "1"; + editedCabalFile = "0iwszfbf4r02jvl362n8i597ymwhcsdwyhakfa67lwk48j7j5bm7"; libraryHaskellDepends = [ base bytestring ]; description = "Low-level functions for SMT-LIB-based interaction with SMT solvers"; license = lib.licenses.mit; @@ -283458,8 +285092,8 @@ self: { pname = "smtlib-backends-process"; version = "0.3"; sha256 = "0jc7fmf3x53w8v0a8cj8v8r2f4gpn1jhndl80hyqzsblvrw5hcfg"; - revision = "3"; - editedCabalFile = "1kc9643lrpz8yxcnda54kb2cakxcmbdaxszkhadjmz7in7xv1xi6"; + revision = "4"; + editedCabalFile = "0plbkwkam6r16ls74j2iwinqslcxqhq0smib24jfnklpqmahlwxv"; libraryHaskellDepends = [ base bytestring process smtlib-backends ]; @@ -283479,8 +285113,8 @@ self: { pname = "smtlib-backends-tests"; version = "0.3"; sha256 = "0lj4bpl4nkw6w2hfjzz16zmrbaj5g3myvbmzlsc5rdsz0xwisfb8"; - revision = "2"; - editedCabalFile = "1c7xag17kfvzlz7w8sd9f8nwj3znmfbwlp0049byr9nlmv1nq7lr"; + revision = "3"; + editedCabalFile = "1bh34im8411jx9rqqr0yqa0ncwrcifbk2x0bi57yp8kcxhhdnfwp"; libraryHaskellDepends = [ base smtlib-backends tasty tasty-hunit ]; description = "Testing SMT-LIB backends"; license = lib.licenses.mit; @@ -283494,8 +285128,8 @@ self: { pname = "smtlib-backends-z3"; version = "0.3.1"; sha256 = "1mgjlfhqcbqc84a87g6bp0i9pnmpz87b7w43x200mwx1k877zddy"; - revision = "1"; - editedCabalFile = "18rj2yj3w4cqdirycxavfhwhaalg8v4qjacs25iy3c1qmm3jwrvb"; + revision = "2"; + editedCabalFile = "10sxc9pswjsf2d2b6qcz97kyps5b4jzvgm4ljwfvb6c79m22wfz1"; libraryHaskellDepends = [ base bytestring smtlib-backends ]; librarySystemDepends = [ gomp z3 ]; testHaskellDepends = [ @@ -286575,10 +288209,10 @@ self: { }) {}; "spade" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring - , constraints, containers, cryptonite, Decimal, directory - , exceptions, file-embed, filepath, hedgehog, hex-text, hspec - , hspec-discover, hspec-hedgehog, memory, monad-loops, mtl + ({ mkDerivation, aeson, ansi-terminal, base, bounded-queue + , bytestring, constraints, containers, cryptonite, Decimal, deepseq + , directory, exceptions, file-embed, filepath, hedgehog, hex-text + , hspec, hspec-discover, hspec-hedgehog, memory, monad-loops, mtl , neat-interpolation, ordered-containers, process, random , regex-tdfa, scientific, sdl2, sdl2-gfx, sdl2-mixer, sdl2-ttf, stm , strip-ansi-escape, template-haskell, terminal, text, time, unix @@ -286587,36 +288221,39 @@ self: { }: mkDerivation { pname = "spade"; - version = "0.1.0.9"; - sha256 = "0m11a7nszp3i6wg73274pj5hd7m6sw45n2h6rdrfbxc4xm08vs64"; + version = "0.1.0.10"; + sha256 = "1fxrn1nf2yh6r9m93sc5wxk60cd9vccl994w4pva90fp78a3p69n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring constraints containers - cryptonite Decimal directory exceptions file-embed filepath - hedgehog hex-text hspec hspec-discover hspec-hedgehog memory - monad-loops mtl neat-interpolation ordered-containers process - random regex-tdfa scientific sdl2 sdl2-gfx sdl2-mixer sdl2-ttf stm - strip-ansi-escape template-haskell terminal text time unix unliftio - unliftio-core unordered-containers vector WAVE with-utf8 + aeson ansi-terminal base bounded-queue bytestring constraints + containers cryptonite Decimal deepseq directory exceptions + file-embed filepath hedgehog hex-text hspec hspec-discover + hspec-hedgehog memory monad-loops mtl neat-interpolation + ordered-containers process random regex-tdfa scientific sdl2 + sdl2-gfx sdl2-mixer sdl2-ttf stm strip-ansi-escape template-haskell + terminal text time unix unliftio unliftio-core unordered-containers + vector WAVE with-utf8 ]; executableHaskellDepends = [ - aeson ansi-terminal base bytestring constraints containers - cryptonite Decimal directory exceptions file-embed filepath - hedgehog hex-text hspec hspec-discover hspec-hedgehog memory - monad-loops mtl neat-interpolation ordered-containers process - random regex-tdfa scientific sdl2 sdl2-gfx sdl2-mixer sdl2-ttf stm - strip-ansi-escape template-haskell terminal text time unix unliftio - unliftio-core unordered-containers vector WAVE with-utf8 + aeson ansi-terminal base bounded-queue bytestring constraints + containers cryptonite Decimal deepseq directory exceptions + file-embed filepath hedgehog hex-text hspec hspec-discover + hspec-hedgehog memory monad-loops mtl neat-interpolation + ordered-containers process random regex-tdfa scientific sdl2 + sdl2-gfx sdl2-mixer sdl2-ttf stm strip-ansi-escape template-haskell + terminal text time unix unliftio unliftio-core unordered-containers + vector WAVE with-utf8 ]; testHaskellDepends = [ - aeson ansi-terminal base bytestring constraints containers - cryptonite Decimal directory exceptions file-embed filepath - hedgehog hex-text hspec hspec-discover hspec-hedgehog memory - monad-loops mtl neat-interpolation ordered-containers process - random regex-tdfa scientific sdl2 sdl2-gfx sdl2-mixer sdl2-ttf stm - strip-ansi-escape template-haskell terminal text time unix unliftio - unliftio-core unordered-containers vector WAVE with-utf8 + aeson ansi-terminal base bounded-queue bytestring constraints + containers cryptonite Decimal deepseq directory exceptions + file-embed filepath hedgehog hex-text hspec hspec-discover + hspec-hedgehog memory monad-loops mtl neat-interpolation + ordered-containers process random regex-tdfa scientific sdl2 + sdl2-gfx sdl2-mixer sdl2-ttf stm strip-ansi-escape template-haskell + terminal text time unix unliftio unliftio-core unordered-containers + vector WAVE with-utf8 ]; testToolDepends = [ hspec-discover ]; description = "A simple programming and debugging environment"; @@ -287012,19 +288649,19 @@ self: { }) {}; "spdx" = callPackage - ({ mkDerivation, base, base-compat, Cabal, containers, QuickCheck - , tasty, tasty-quickcheck, transformers + ({ mkDerivation, base, Cabal-syntax, containers, puresat + , QuickCheck, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "spdx"; - version = "1.0.0.3"; - sha256 = "1xrar0mzr7y02gw1hfabd6jyz31p3qz0jxp2mcs5kbhv0a3rc91m"; - libraryHaskellDepends = [ base Cabal containers transformers ]; - testHaskellDepends = [ - base base-compat Cabal tasty tasty-quickcheck + version = "1.1"; + sha256 = "14x1kk4baq4a3am4hp5ax2smc0h5dizlc22w2jkc63f3013dxvp3"; + libraryHaskellDepends = [ + base Cabal-syntax containers puresat transformers ]; + testHaskellDepends = [ base Cabal-syntax tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ - base base-compat Cabal QuickCheck tasty-quickcheck + base Cabal-syntax QuickCheck tasty-quickcheck ]; description = "SPDX license expression language, Extras"; license = lib.licenses.bsd3; @@ -293218,6 +294855,31 @@ self: { broken = true; }) {}; + "streamly-zip" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, containers + , cryptohash, directory, filepath, QuickCheck, streamly + , streamly-core, tar, tasty, tasty-hunit, tasty-quickcheck + , temporary, zip, zlib + }: + mkDerivation { + pname = "streamly-zip"; + version = "0.0.1"; + sha256 = "0wys2yfrwb06sw64960z17zqmcqxdij6cw51mbqw6ak12ax6k0xz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers streamly streamly-core + ]; + librarySystemDepends = [ zip ]; + testHaskellDepends = [ + base base16-bytestring bytestring containers cryptohash directory + filepath QuickCheck streamly streamly-core tar tasty tasty-hunit + tasty-quickcheck temporary zlib + ]; + testSystemDepends = [ zip ]; + description = "Stream data from zip archives using the streamly library"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) zip;}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -293349,6 +295011,8 @@ self: { pname = "strict"; version = "0.5.1"; sha256 = "12rgzrxb1dz5qb1sqmwdyiyhxbpa5rrzlyr293ki4qx8qa094wbp"; + revision = "1"; + editedCabalFile = "1wh1p76sahrzqd58kdlvk85c38cr7w3ib33cb95bp33lqyvp7hsq"; libraryHaskellDepends = [ assoc base binary bytestring deepseq ghc-prim hashable text these transformers @@ -293426,10 +295090,8 @@ self: { }: mkDerivation { pname = "strict-containers"; - version = "0.2"; - sha256 = "128aw17c2m3rh2v23c2vdgk7f7rk11plwkzq2carrm1x5nvhrki7"; - revision = "2"; - editedCabalFile = "1gkb90gsx8ls5c86jjxs1c01r09lkv9jxzx6g0c0rc1n45n6w5ph"; + version = "0.2.1"; + sha256 = "0y9pprfcrqlqv0px2p97wsk3zddbzc7qcgl7cvjl4m7k64sya0ia"; libraryHaskellDepends = [ array base binary containers deepseq hashable indexed-traversable primitive strict template-haskell unordered-containers vector @@ -293590,6 +295252,19 @@ self: { license = lib.licenses.mit; }) {}; + "strict-mutable-base" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "strict-mutable-base"; + version = "1.0.0.0"; + sha256 = "06d46902d79ryg7yy2zc973mgjdr3rc2i486xs6f8lhnrlwq9v3n"; + revision = "1"; + editedCabalFile = "1nqhm00lr9ashsjd38dwax2mn228kqjqshqx39plsjnf25kri5xq"; + libraryHaskellDepends = [ base deepseq ]; + description = "Strict variants of mutable data types from base"; + license = lib.licenses.bsd3; + }) {}; + "strict-mvar" = callPackage ({ mkDerivation, base, io-classes, io-sim, nothunks, QuickCheck , tasty, tasty-quickcheck @@ -293604,6 +295279,8 @@ self: { ]; description = "Strict MVars for IO and IOSim"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "strict-optics" = callPackage @@ -293628,6 +295305,8 @@ self: { libraryHaskellDepends = [ array base io-classes stm ]; description = "Strict STM interface polymorphic over stm implementation"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "strict-tuple" = callPackage @@ -293636,6 +295315,8 @@ self: { pname = "strict-tuple"; version = "0.1.5.4"; sha256 = "1znx5lmi7lgn4jzkr73lsc2xac0ypl65bx0pa1hxrc4c74ilysbk"; + revision = "1"; + editedCabalFile = "05s4z3crwb0akjfgcgrqrmzd690wn5s765srhmwdg6b1is8zm1zn"; libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; @@ -295342,6 +297023,23 @@ self: { license = lib.licenses.mit; }) {}; + "suffix" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, primitive + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "suffix"; + version = "0.1.0.0"; + sha256 = "1kjlmbljwp14mc5l177apkv5iwcls2y7jng0din6z3gfbja90j4z"; + libraryHaskellDepends = [ base bytestring deepseq primitive ]; + testHaskellDepends = [ + base bytestring containers primitive tasty tasty-hunit + tasty-quickcheck + ]; + description = "Suffix arrays and friends"; + license = lib.licenses.bsd3; + }) {}; + "suffix-array" = callPackage ({ mkDerivation, array, base, containers, criterion, random, tasty , tasty-hunit, tasty-quickcheck @@ -296238,8 +297936,8 @@ self: { pname = "svg-builder"; version = "0.1.1"; sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g"; - revision = "9"; - editedCabalFile = "0ca6bgv5xrk6pz12j35jv1gbp06z6kk7fs7nc1bwjjxy6c6x4vm5"; + revision = "10"; + editedCabalFile = "1a57i9fgmjaz2m68i21dp6hi1qwfmza0d1rcygvq61sxrr9gvfpr"; libraryHaskellDepends = [ base blaze-builder bytestring hashable text unordered-containers ]; @@ -296268,8 +297966,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "3.9"; - sha256 = "1iyj0g9plzvih50j9sx41dpksj4avllr9csf8sp577zrq334r1l1"; + version = "3.10"; + sha256 = "15sgf8k8akvgv8xb884l9g5iydfybgp1l6aqndi749qpl8qy5a46"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -296953,6 +298651,29 @@ self: { license = "unknown"; }) {}; + "sydtest_0_17_0_0" = callPackage + ({ mkDerivation, async, autodocodec, base, bytestring, containers + , dlist, fast-myers-diff, filepath, MonadRandom, mtl, opt-env-conf + , path, path-io, pretty-show, QuickCheck, quickcheck-io, random + , random-shuffle, safe, safe-coloured-text + , safe-coloured-text-terminfo, stm, svg-builder, text, vector + }: + mkDerivation { + pname = "sydtest"; + version = "0.17.0.0"; + sha256 = "1l8ji5qny7wq6n10ys1mxclqbzk54g3fsdi99pjb9sigd99s550n"; + libraryHaskellDepends = [ + async autodocodec base bytestring containers dlist fast-myers-diff + filepath MonadRandom mtl opt-env-conf path path-io pretty-show + QuickCheck quickcheck-io random random-shuffle safe + safe-coloured-text safe-coloured-text-terminfo stm svg-builder text + vector + ]; + description = "A modern testing framework for Haskell with good defaults and advanced testing features"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq , directory, path, path-io, sydtest, sydtest-discover, text @@ -296971,6 +298692,25 @@ self: { license = "unknown"; }) {}; + "sydtest-aeson_0_2_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , directory, path, path-io, sydtest, sydtest-discover, text + }: + mkDerivation { + pname = "sydtest-aeson"; + version = "0.2.0.0"; + sha256 = "14acwqaxb3dizpqa6xz7wpnb2qssyfzqh4g3g7dxdbk04sypz34h"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring deepseq path path-io sydtest + text + ]; + testHaskellDepends = [ aeson base directory sydtest text ]; + testToolDepends = [ sydtest-discover ]; + description = "An aeson companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-amqp" = callPackage ({ mkDerivation, aeson, amqp, async, base, bytestring, network , path, path-io, port-utils, process, stm, sydtest @@ -297105,6 +298845,25 @@ self: { broken = true; }) {}; + "sydtest-mongo_0_1_0_0" = callPackage + ({ mkDerivation, base, binary, bson, bytestring, mongoDB, network + , path, path-io, port-utils, process, sydtest, sydtest-process + , text, yaml + }: + mkDerivation { + pname = "sydtest-mongo"; + version = "0.1.0.0"; + sha256 = "1wqhqyg513mh8vxc2ddsxd04iywlz3gwgx35zawgldi215zdfnqi"; + libraryHaskellDepends = [ + base binary bson bytestring mongoDB network path path-io port-utils + process sydtest sydtest-process text yaml + ]; + description = "An mongoDB companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "sydtest-persistent" = callPackage ({ mkDerivation, base, bytestring, mtl, persistent, sydtest, text , unliftio @@ -297120,6 +298879,22 @@ self: { license = "unknown"; }) {}; + "sydtest-persistent_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, mtl, persistent, sydtest, text + , unliftio + }: + mkDerivation { + pname = "sydtest-persistent"; + version = "0.1.0.0"; + sha256 = "1hvx5101vwdwd5p7d7x7cg44byflnm9gwr6pfnzfvlw75fpdfb3i"; + libraryHaskellDepends = [ + base bytestring mtl persistent sydtest text unliftio + ]; + description = "A persistent companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-persistent-postgresql" = callPackage ({ mkDerivation, base, monad-logger, mtl, persistent , persistent-postgresql, sydtest, sydtest-discover @@ -297298,6 +299073,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-webdriver-screenshot_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, http-types, JuicyPixels, mtl + , network-uri, path, path-io, sydtest, sydtest-discover + , sydtest-wai, sydtest-webdriver, vector, wai, webdriver + }: + mkDerivation { + pname = "sydtest-webdriver-screenshot"; + version = "0.1.0.0"; + sha256 = "1jcgnawxf6ag8zg8wc5hq47yv55ps45v2xw01d9xpd1lq1mc6xkw"; + libraryHaskellDepends = [ + base bytestring JuicyPixels mtl path path-io sydtest + sydtest-webdriver vector webdriver + ]; + testHaskellDepends = [ + base http-types network-uri sydtest sydtest-wai sydtest-webdriver + wai + ]; + testToolDepends = [ sydtest-discover ]; + description = "A webdriver screenshot companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-webdriver-yesod" = callPackage ({ mkDerivation, base, bytestring, http-client, http-types, mtl , network-uri, path, path-io, sydtest, sydtest-discover @@ -298623,8 +300421,6 @@ self: { ]; description = "Consistent filesystem interaction across GHC versions (deprecated)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "system-filepath" = callPackage @@ -298714,8 +300510,8 @@ self: { pname = "system-linux-proc"; version = "0.1.1.1"; sha256 = "12nvsvmchhsqs5f3x2075v8v68inb1xz8dbv1q5x48big1bf4vv5"; - revision = "2"; - editedCabalFile = "0bf4zrx2x3h6wln257k7fjwszvkxg9phjscfkhrl403wiz1kjxqz"; + revision = "3"; + editedCabalFile = "0mkjwv2yw130rpmxby32hqrj26q268wiyfv6f71q09wp1axl6qfc"; libraryHaskellDepends = [ attoparsec base bytestring containers directory errors text ]; @@ -301143,8 +302939,8 @@ self: { pname = "tasty-hedgehog"; version = "1.4.0.2"; sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"; - revision = "4"; - editedCabalFile = "1qibqxwh3f0c2n7fcj2dni12mhixfwbywli6qrqii6wi7n325gd9"; + revision = "5"; + editedCabalFile = "19csv89pdva2d5fa0f9kwiq9cdcr51gsnaay62icjpkjw9anapch"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -302540,8 +304336,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.14.1"; - sha256 = "0v025wkhjnxjqzisj3x1gfv1qk9c17j2czdf0iv5fsxdkz2vc949"; + version = "0.14.2"; + sha256 = "10jwvx6m8zqzicfy3iyc9igxlnzyd8h320280q9s53420gzfpdf4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -302797,17 +304593,6 @@ self: { }) {}; "template-haskell-compat-v0208" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "template-haskell-compat-v0208"; - version = "0.1.9.3"; - sha256 = "0qidpj5w8m3qd8xn3vd8z1mym34m6aw1ds16p0yf2anwdn4knilj"; - libraryHaskellDepends = [ base template-haskell ]; - description = "Backward-compatibility layer for Template Haskell newer than 2.8"; - license = lib.licenses.mit; - }) {}; - - "template-haskell-compat-v0208_0_1_9_4" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; @@ -302816,7 +304601,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "Backward-compatibility layer for Template Haskell newer than 2.8"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "template-haskell-optics" = callPackage @@ -302967,8 +304751,8 @@ self: { }: mkDerivation { pname = "templatise"; - version = "0.1.5.0"; - sha256 = "092vbmng2jpcb2vc9bqg2gm132zrvi3b9qh7lfw6d1as9qf8f43v"; + version = "0.1.6.0"; + sha256 = "07dp87h0hn77ccg8acnfpki1yvxx4h1h6nqdjfxwc0kwji1svzia"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -303544,19 +305328,17 @@ self: { }) {}; "tensort" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, random, random-shuffle - , time - }: + ({ mkDerivation, base, mtl, QuickCheck, random, random-shuffle }: mkDerivation { pname = "tensort"; - version = "0.2.0.3"; - sha256 = "0qkm7iy00z13drs1f3fd3zl6cc45c7s2k8pn6ya7pmpji424dwiw"; + version = "1.0.1.2"; + sha256 = "1hg647gjx24g38vnnkg61i9i42dinf27j3rr80wqm6wrkl7jzxvd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl random random-shuffle ]; - executableHaskellDepends = [ base time ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ base mtl QuickCheck ]; - description = "Tunable sorting for responsive robustness and beyond!"; + description = "Tunable sorting for responsive robustness and beyond"; license = lib.licenses.mit; mainProgram = "tensort"; }) {}; @@ -303743,6 +305525,8 @@ self: { pname = "terminal-size"; version = "0.3.4"; sha256 = "0jbznrlf95lc6ajhh26h1qgcmbr3bj753i8jlkrsrnkcjbb71w5h"; + revision = "1"; + editedCabalFile = "0w2pjmravr1fnvmrcnj13dxrf43miqypmh0fhrz1g1pb1qrg3mr1"; libraryHaskellDepends = [ base ]; description = "Get terminal window height and width"; license = lib.licenses.bsd3; @@ -305291,6 +307075,8 @@ self: { pname = "text-iso8601"; version = "0.1.1"; sha256 = "00l2m3xj39mrz7lbmbnir4k9jbn3jm3xa2q6zkh0zr7arsvx5slx"; + revision = "1"; + editedCabalFile = "0gfpfvsnd06rpnqwb24cqzs9v80f4zn15in9aslvjyc45rnhzx8a"; libraryHaskellDepends = [ base integer-conversion text time time-compat ]; @@ -307059,6 +308845,8 @@ self: { pname = "these"; version = "1.2.1"; sha256 = "1pp44amwvpl0m762zahg632prlxx0ca2r10n3a0bznjy6qrxkmhp"; + revision = "1"; + editedCabalFile = "12qb2g87kwprcxa8kksh2v8sm9m723h4c407dd868y5k64smfky0"; libraryHaskellDepends = [ assoc base binary deepseq hashable ]; description = "An either-or-both data type"; license = lib.licenses.bsd3; @@ -308060,6 +309848,34 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "tiktoken" = callPackage + ({ mkDerivation, base, base64, bytestring, containers, deepseq + , filepath, megaparsec, pcre-light, quickcheck-instances + , raw-strings-qq, tasty, tasty-bench, tasty-quickcheck + , tasty-silver, text, unordered-containers + }: + mkDerivation { + pname = "tiktoken"; + version = "1.0.3"; + sha256 = "0hy3y9rdgjirk8ji7458qnc7h9d2b6yipfri25qkay96kq91kmj6"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base base64 bytestring containers deepseq filepath megaparsec + pcre-light raw-strings-qq text unordered-containers + ]; + testHaskellDepends = [ + base bytestring quickcheck-instances tasty tasty-quickcheck + tasty-silver text + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq filepath tasty-bench + ]; + description = "Haskell implementation of tiktoken"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "tikzsd" = callPackage ({ mkDerivation, array, base, containers, lens, mtl, parsec , transformers @@ -308694,19 +310510,17 @@ self: { "timeline" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, hedgehog - , indexed-traversable, semigroupoids, tasty, tasty-discover - , tasty-golden, tasty-hedgehog, tasty-hunit, template-haskell, text - , th-compat, time, transformers + , indexed-traversable, tasty, tasty-discover, tasty-golden + , tasty-hedgehog, tasty-hunit, template-haskell, text, th-compat + , time, transformers }: mkDerivation { pname = "timeline"; - version = "0.1.0.0"; - sha256 = "0ya56j51vgg380yylpakfgr5srv20ybiyy7yhfyxz21sdgz7f168"; - revision = "6"; - editedCabalFile = "0wn1mvgqh4b9yrgbcmz6yks51bsidj40irb6j1w3am20k7mdb6rq"; + version = "0.1.1.0"; + sha256 = "15npn5wfhdg2mcvr92n7c9k7jj1jcifm6rcpmyi64mcfsb2g1ry6"; libraryHaskellDepends = [ - base containers hedgehog indexed-traversable semigroupoids - template-haskell text th-compat time + base containers hedgehog indexed-traversable template-haskell text + th-compat time ]; testHaskellDepends = [ base bytestring containers hashable hedgehog indexed-traversable @@ -310458,6 +312272,8 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A thread-safe concurrent token-bucket rate limiter that guarantees fairness"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "token-search" = callPackage @@ -312716,6 +314532,8 @@ self: { pname = "tree-diff"; version = "0.3.1"; sha256 = "0ixv5122yz6p6a0vfjn5hgp81bs6dx6x3q731cwjyx03dr9lzicb"; + revision = "1"; + editedCabalFile = "1ga0xnyv24fgjiifypq95l7nhlm86swqscakfm98kxqi91gbzr5y"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base bytestring containers deepseq hashable parsec parsers pretty primitive QuickCheck @@ -316258,8 +318076,8 @@ self: { }: mkDerivation { pname = "typed-fsm"; - version = "0.3.0.0"; - sha256 = "0994ajxfl1q834zazp3307dr4b1k16jm7k117gw5i3l74bkskqqm"; + version = "0.3.0.1"; + sha256 = "0zm3hi25sp79b588dkrgc4r7k9s9lxi3wqjk4d042h4m5nvxaw1y"; libraryHaskellDepends = [ base dependent-map dependent-sum mtl singletons-base ]; @@ -316269,6 +318087,23 @@ self: { broken = true; }) {}; + "typed-gui" = callPackage + ({ mkDerivation, base, mtl, singletons-base, stm, threepenny-gui + , typed-fsm + }: + mkDerivation { + pname = "typed-gui"; + version = "0.1.0.0"; + sha256 = "1xsparfq3gwzsir8mfawlz7900i9y8dk7qhwhy53ca236q4n0m6d"; + libraryHaskellDepends = [ + base mtl singletons-base stm threepenny-gui typed-fsm + ]; + testHaskellDepends = [ base ]; + description = "GUI framework based on typed-fsm"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "typed-process" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , hspec-discover, process, stm, temporary, transformers @@ -316290,6 +318125,28 @@ self: { license = lib.licenses.mit; }) {}; + "typed-process_0_2_12_0" = callPackage + ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec + , hspec-discover, process, stm, temporary, transformers + , unliftio-core + }: + mkDerivation { + pname = "typed-process"; + version = "0.2.12.0"; + sha256 = "1q8v2vn1p2sygjym4aamfv53hyabq081aryf807p5pjix0x3vvjc"; + libraryHaskellDepends = [ + async base bytestring process stm transformers unliftio-core + ]; + testHaskellDepends = [ + async base base64-bytestring bytestring hspec process stm temporary + transformers unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Run external processes, with strong typing of streams"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "typed-process-effectful" = callPackage ({ mkDerivation, base, bytestring, effectful, effectful-core, tasty , tasty-hunit, typed-process @@ -316310,6 +318167,48 @@ self: { broken = true; }) {}; + "typed-session" = callPackage + ({ mkDerivation, base, containers, fused-effects + , fused-effects-random, io-classes, io-sim, random + , template-haskell, typed-session-state-algorithm + }: + mkDerivation { + pname = "typed-session"; + version = "0.2.0.1"; + sha256 = "1xi0ys8hhqa2jkdwm0a6r92lwcl4lqcnvi61yqci9vc41rpcazhj"; + libraryHaskellDepends = [ + base containers io-classes template-haskell + typed-session-state-algorithm + ]; + testHaskellDepends = [ + base containers fused-effects fused-effects-random io-classes + io-sim random template-haskell + ]; + description = "typed session framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "typed-session-state-algorithm" = callPackage + ({ mkDerivation, base, containers, fused-effects, megaparsec + , parser-combinators, prettyprinter, raw-strings-qq + }: + mkDerivation { + pname = "typed-session-state-algorithm"; + version = "0.4.2.1"; + sha256 = "0gzzqg0jcnlbm0v4zmbjl379qzwmb93hg1ph8ibp55zxr98chk4z"; + libraryHaskellDepends = [ + base containers fused-effects megaparsec parser-combinators + prettyprinter + ]; + testHaskellDepends = [ base raw-strings-qq ]; + description = "Automatically generate status for typed-session"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "typed-spreadsheet" = callPackage ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk , diagrams-lib, foldl, gtk, microlens, stm, text, transformers @@ -317936,14 +319835,16 @@ self: { }: mkDerivation { pname = "uncertain"; - version = "0.3.1.0"; - sha256 = "1wkgk6504qyirr2bq3m4pqgwdvrpnrig1bnzcls0r7krsig8arvg"; + version = "0.4.0.0"; + sha256 = "1v7q6ajyqx3m06w2iy6dxkbfk6f3878zmii892k4m5a0hzi82x0c"; libraryHaskellDepends = [ ad base base-compat containers free mwc-random primitive transformers ]; description = "Manipulating numbers with inherent experimental/measurement uncertainty"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unconstrained" = callPackage @@ -318525,10 +320426,8 @@ self: { ({ mkDerivation, base, containers, logict, mtl }: mkDerivation { pname = "unification-fd"; - version = "0.11.2"; - sha256 = "1lyx3g10llkr7vl7c2j15ddlqrkz2r684d1laza7nvq97amrqnqv"; - revision = "1"; - editedCabalFile = "07xmrqmk99lnp3jyk0dqgnpprm3ghnyjdqva0y13ddh3nw8iiqdj"; + version = "0.11.2.2"; + sha256 = "0jgy507dy1j566j46gndd8b2543n847myibg2i22yw8chdpl15kc"; libraryHaskellDepends = [ base containers logict mtl ]; description = "Simple generic unification algorithms"; license = lib.licenses.bsd3; @@ -319710,6 +321609,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "unix-bytestring_0_4_0_2" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "unix-bytestring"; + version = "0.4.0.2"; + sha256 = "0pmkd5cvq3knsyl5izxpxs44axrf943xv4pwa1x20wmsg30fqmd2"; + libraryHaskellDepends = [ base bytestring ]; + description = "Unix/Posix-specific functions for ByteStrings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unix-compat" = callPackage ({ mkDerivation, base, directory, extra, hspec, HUnit , monad-parallel, temporary, unix @@ -320100,15 +322011,14 @@ self: { }) {}; "unliftio-servant-server" = callPackage - ({ mkDerivation, base, mtl, servant, servant-server, unliftio }: + ({ mkDerivation, base, mtl, servant, servant-server, unliftio-core + }: mkDerivation { pname = "unliftio-servant-server"; - version = "0.1.0.0"; - sha256 = "1lpvkzpi9yl4h42nvvwacd7mg1ky45n64dzrjs12lbv2c0m8i3pp"; - revision = "1"; - editedCabalFile = "0ddhn9x6m0r0pd63hrxgzfj535i9ikmwjkjiysghhhzfvd1p82k3"; + version = "0.1.0.1"; + sha256 = "16ddmcacd1laa5y1k8x1xddhbbfw03xad6yc2hsca4kih1lsiw61"; libraryHaskellDepends = [ - base mtl servant servant-server unliftio + base mtl servant servant-server unliftio-core ]; description = "Use MonadUnliftIO on servant APIs"; license = lib.licenses.bsd3; @@ -321786,8 +323696,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.7.0"; - sha256 = "1jy44jnqfd2h1aq2bqi6yq8yn34i1kl2jvl12fjbv4h29skvmvpg"; + version = "0.0.9.0"; + sha256 = "1n86awygbq0gf9bl35hhsx0wxwnyk63ydxkz6i93dbbp22lfnmgc"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; @@ -322269,12 +324179,12 @@ self: { }) {}; "uulib" = callPackage - ({ mkDerivation, base, ghc-prim }: + ({ mkDerivation, base }: mkDerivation { pname = "uulib"; - version = "0.9.24"; - sha256 = "10j40q1b1fkx0fv56cn0kkilbqhyh6xxya536xlbx365lnc1rk0i"; - libraryHaskellDepends = [ base ghc-prim ]; + version = "0.9.25"; + sha256 = "03ykq4ij56kkzmr1yfxs3z5zx4yqzscilfxpskyppjk6cj6nh2qq"; + libraryHaskellDepends = [ base ]; description = "Haskell Utrecht Tools Library"; license = lib.licenses.bsd3; }) {}; @@ -322813,6 +324723,17 @@ self: { license = lib.licenses.mit; }) {}; + "validity-dlist" = callPackage + ({ mkDerivation, base, dlist, validity }: + mkDerivation { + pname = "validity-dlist"; + version = "0.1.0.1"; + sha256 = "091vriixm5s1xdpdi78vb27b8x77llnk1s7akivrhpg6zsxcs31w"; + libraryHaskellDepends = [ base dlist validity ]; + description = "Validity instances for containers"; + license = lib.licenses.mit; + }) {}; + "validity-network-uri" = callPackage ({ mkDerivation, base, network-uri, validity }: mkDerivation { @@ -323136,6 +325057,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "variant" = callPackage + ({ mkDerivation, base, criterion, deepseq, exceptions, mtl + , QuickCheck, recursion-schemes, tasty, tasty-quickcheck + , template-haskell, transformers, unliftio-core + }: + mkDerivation { + pname = "variant"; + version = "1.0"; + sha256 = "13k50y8ap5gnbag5v1j2abddz98fzlay3kjzg93gs7fyz2dil7j2"; + libraryHaskellDepends = [ + base deepseq exceptions mtl recursion-schemes template-haskell + transformers unliftio-core + ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; + description = "Variant and EADT"; + license = lib.licenses.bsd3; + }) {}; + "variation" = callPackage ({ mkDerivation, base, cereal, containers, deepseq, semigroupoids }: @@ -323202,8 +325142,8 @@ self: { pname = "vault"; version = "0.3.1.5"; sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; - revision = "7"; - editedCabalFile = "0jbbjmh3h9pkj1mfafysny20ynfl58ifchizn13dkqvclpkr770h"; + revision = "8"; + editedCabalFile = "0nabd5r1j6aq5ys3lsjh4i2ii9rza7923b5mg3vfbkj72w3dvgqv"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -323516,6 +325456,8 @@ self: { pname = "vec"; version = "0.5.1"; sha256 = "0rswq31fjsqzzq88b920hz0j8v0rdjhb04v4fr10cdqbnxaqglb0"; + revision = "1"; + editedCabalFile = "0znfs73x9amng298hzi98cy15fbgx5hdkcfslwmdqsyarr9v0ffx"; libraryHaskellDepends = [ adjunctions base boring deepseq distributive fin hashable indexed-traversable QuickCheck semigroupoids transformers @@ -323829,22 +325771,6 @@ self: { }) {}; "vector-extras" = callPackage - ({ mkDerivation, base, containers, deferred-folds, foldl, hashable - , unordered-containers, vector - }: - mkDerivation { - pname = "vector-extras"; - version = "0.2.8.1"; - sha256 = "0bnjh4c001v6ia6ac40i508jdzfdlccp8v0fhy7ayv4scrvpwip2"; - libraryHaskellDepends = [ - base containers deferred-folds foldl hashable unordered-containers - vector - ]; - description = "Utilities for the \"vector\" library"; - license = lib.licenses.mit; - }) {}; - - "vector-extras_0_2_8_2" = callPackage ({ mkDerivation, base, containers, deferred-folds, foldl, hashable , unordered-containers, vector }: @@ -323858,7 +325784,6 @@ self: { ]; description = "Utilities for the \"vector\" library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "vector-fft" = callPackage @@ -324117,6 +326042,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-space_0_19" = callPackage + ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: + mkDerivation { + pname = "vector-space"; + version = "0.19"; + sha256 = "09gbkwq0z47ahc5brq72i7xr7rwqvl3sy04j1h4my5ij282d25w9"; + revision = "1"; + editedCabalFile = "1bjnjz2r25jkjc5wr3fxfynnrqj6ilwcnms06k0qqm5lg71y0zv2"; + libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; + description = "Vector & affine spaces, linear maps, and derivatives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-space-map" = callPackage ({ mkDerivation, base, containers, doctest, vector-space }: mkDerivation { @@ -328682,8 +330621,8 @@ self: { }: mkDerivation { pname = "waterfall-cad"; - version = "0.3.0.1"; - sha256 = "1d5k2n1lx1lxg8zm9qr3rmk3wml6mq1p9b5bqmqfhair88llrasj"; + version = "0.4.0.0"; + sha256 = "062q7ip6ifk8si1nk0brmbd7qh6b05xar7dds9wrjbbhz1fyjcs5"; libraryHaskellDepends = [ base filepath lattices lens linear opencascade-hs primitive resourcet @@ -328699,8 +330638,8 @@ self: { }: mkDerivation { pname = "waterfall-cad-examples"; - version = "0.3.0.1"; - sha256 = "0nk4y5rzyfsmllvbf2c5qxnbglw0jqkbpl8b3lgshhirab3rchcz"; + version = "0.4.0.0"; + sha256 = "046k22r5q32y21r7fpg07301x12xmc8nwj9m4xgw100sxy66vvdg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -330596,29 +332535,29 @@ self: { "weeder" = callPackage ({ mkDerivation, aeson, algebraic-graphs, async, base, bytestring - , containers, directory, filepath, generic-lens, ghc, hspec, lens - , mtl, optparse-applicative, parallel, process, regex-tdfa, text - , toml-reader, transformers + , containers, directory, filepath, generic-lens, ghc, Glob + , hspec-discover, hspec-expectations, lens, mtl + , optparse-applicative, parallel, process, regex-tdfa, tasty + , tasty-golden, tasty-hunit-compat, text, toml-reader, transformers }: mkDerivation { pname = "weeder"; - version = "2.8.0"; - sha256 = "086vni1i0sqy2xva63xdx1ppvwygyn1dav2bykggd6j1jrwi0m5p"; + version = "2.9.0"; + sha256 = "0fgxsyijn5flxzhjy3096qjlv0avlwchwyb46pizwh2s6i1nwil3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebraic-graphs async base bytestring containers directory - filepath generic-lens ghc lens mtl optparse-applicative parallel - regex-tdfa text toml-reader transformers - ]; - executableHaskellDepends = [ - base bytestring containers directory filepath ghc - optparse-applicative transformers + filepath generic-lens ghc Glob lens mtl optparse-applicative + parallel regex-tdfa text toml-reader transformers ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - aeson algebraic-graphs base containers directory filepath ghc hspec - process text toml-reader + aeson algebraic-graphs base bytestring containers directory + filepath ghc hspec-expectations process tasty tasty-golden + tasty-hunit-compat text toml-reader ]; + testToolDepends = [ hspec-discover ]; description = "Detect dead code"; license = lib.licenses.bsd3; mainProgram = "weeder"; @@ -331150,8 +333089,8 @@ self: { pname = "wide-word"; version = "0.1.6.0"; sha256 = "15wp0mdjbaacvzwkjlmdr7w6bm239g5v3ylkczwr3cfj30da0snz"; - revision = "2"; - editedCabalFile = "0d21qdyx80yac09j31sy1xndwx5by257hy2cyx8www795dl5inh4"; + revision = "3"; + editedCabalFile = "01vy3civ7vzninmn6xdadfd9xfwn6hv002prpm9fb5i68qgbp8dr"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -331226,6 +333165,112 @@ self: { broken = true; }) {}; + "wikimusic-api" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , containers, contravariant-extras, directory, filepath + , free-alacarte, hasql, hasql-implicits, hasql-migration + , hasql-optparse-applicative, hasql-pool, hasql-transaction, hedis + , HTTP, keuringsdienst, keys, mime-mail, mtl, neat-interpolation + , openapi3, optics, optparse-applicative, password, password-types + , postgresql-libpq, relude, servant, servant-openapi3 + , servant-rate-limit, servant-server, smtp-mail, tasty, tasty-hunit + , text, time, tomland, uuid, vector, wai, wai-cors, wai-extra + , wai-rate-limit, wai-rate-limit-redis, warp, wikimusic-api-spec + , wikimusic-model-hs + }: + mkDerivation { + pname = "wikimusic-api"; + version = "1.1.0.1"; + sha256 = "11axz65b4zswca53q0scywl6qnbm6qpfy6dhzgi7n8s0d0518js5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base base64-bytestring bytestring containers + contravariant-extras directory filepath free-alacarte hasql + hasql-implicits hasql-migration hasql-optparse-applicative + hasql-pool hasql-transaction hedis HTTP keuringsdienst keys + mime-mail mtl neat-interpolation openapi3 optics + optparse-applicative password password-types postgresql-libpq + relude servant servant-openapi3 servant-rate-limit servant-server + smtp-mail text time tomland uuid vector wai wai-cors wai-extra + wai-rate-limit wai-rate-limit-redis warp wikimusic-api-spec + wikimusic-model-hs + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "wikimusic-api-exe"; + }) {}; + + "wikimusic-api-spec" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, keys + , mtl, openapi3, relude, servant, servant-openapi3 + , servant-rate-limit, servant-server, text, time, uuid, vector + , wikimusic-model-hs + }: + mkDerivation { + pname = "wikimusic-api-spec"; + version = "1.2.0.0"; + sha256 = "11jfj3z3b47hc3dfm7zfxxdgspzm0yisc0ihrplnjb9rrc0vva9b"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath keys mtl openapi3 relude + servant servant-openapi3 servant-rate-limit servant-server text + time uuid vector wikimusic-model-hs + ]; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + + "wikimusic-model-hs" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , directory, filepath, keuringsdienst, keys, mtl + , neat-interpolation, openapi3, optics, password, password-types + , relude, text, time, tomland, uuid + }: + mkDerivation { + pname = "wikimusic-model-hs"; + version = "1.2.0.0"; + sha256 = "1a1k7997yr8cz4p2x5z92ngxd7fxaxx8cqh0mldlv2cngiab9l08"; + libraryHaskellDepends = [ + aeson async base bytestring containers directory filepath + keuringsdienst keys mtl neat-interpolation openapi3 optics password + password-types relude text time tomland uuid + ]; + license = lib.licenses.gpl3Only; + }) {}; + + "wikimusic-ssr" = callPackage + ({ mkDerivation, aeson, async, base, base16-bytestring + , base64-bytestring, blaze-html, bytestring, containers, directory + , filepath, free-alacarte, HTTP, http-client, http-client-tls + , keuringsdienst, keys, mtl, neat-interpolation, optics + , optparse-applicative, relude, servant, servant-auth-server + , servant-blaze, servant-client, servant-multipart, servant-server + , text, time, tomland, uuid, wai, wai-cors, wai-extra, warp + , wikimusic-api-spec, wikimusic-model-hs + }: + mkDerivation { + pname = "wikimusic-ssr"; + version = "0.6.0.1"; + sha256 = "0jd319qmr4x74zwa13hzkxhqicmjidhgny02nymqyscg6an3cv94"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base base16-bytestring base64-bytestring blaze-html + bytestring containers directory filepath free-alacarte HTTP + http-client http-client-tls keuringsdienst keys mtl + neat-interpolation optics optparse-applicative relude servant + servant-auth-server servant-blaze servant-client servant-multipart + servant-server text time tomland uuid wai wai-cors wai-extra warp + wikimusic-api-spec wikimusic-model-hs + ]; + executableHaskellDepends = [ base relude ]; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "wikimusic-ssr-exe"; + }) {}; + "wikipedia4epub" = callPackage ({ mkDerivation, base, bytestring, directory, epub, filepath , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url @@ -331398,8 +333443,8 @@ self: { }: mkDerivation { pname = "window-utils"; - version = "0.2.1.0"; - sha256 = "1db4dnvg5s790yql75spqy446317a16f92hni8sbzdh541aahw73"; + version = "0.2.2.0"; + sha256 = "08s9rjpc2idrb5mgrnbwj2d0m8aj33g4v9djyvrkqnq5jb8mbzrz"; libraryHaskellDepends = [ base bytestring JuicyPixels text vector X11 ]; @@ -331740,6 +333785,8 @@ self: { pname = "witherable"; version = "0.5"; sha256 = "1lccj7s6b2x3w1zq15fffwxwj9yqq0z0ra9k06y3rcb5wk0lqhs8"; + revision = "1"; + editedCabalFile = "1pl1m14hhz03rx5j4i4zdi9v0ph65s5rs6qpqdprjdyaxf4bbfl5"; libraryHaskellDepends = [ base base-orphans containers hashable indexed-traversable indexed-traversable-instances transformers unordered-containers @@ -332002,8 +334049,8 @@ self: { pname = "wl-pprint-text"; version = "1.2.0.2"; sha256 = "0axivwh7bxmljxpfnccs66knxzrqck07byxmp2j737xbb26pf5cj"; - revision = "2"; - editedCabalFile = "1zp64js72l8kkqn47hkl6rcangz14njfrhgdhq0w5x4nhvfi77md"; + revision = "3"; + editedCabalFile = "1gc1vjzdhax9ybkjynsxkq4ah9ds14cy81wm1c4p9fnw2h356jhw"; libraryHaskellDepends = [ base base-compat text ]; description = "A Wadler/Leijen Pretty Printer for Text values"; license = lib.licenses.bsd3; @@ -333579,22 +335626,6 @@ self: { }) {}; "wuss" = callPackage - ({ mkDerivation, base, bytestring, crypton-connection, data-default - , exceptions, network, websockets - }: - mkDerivation { - pname = "wuss"; - version = "2.0.1.9"; - sha256 = "0v3jqyh21iq8d3vkij4gkzdq7ks8ykxi9lz2v4caskwvnj5bdvs9"; - libraryHaskellDepends = [ - base bytestring crypton-connection data-default exceptions network - websockets - ]; - description = "Secure WebSocket (WSS) clients"; - license = lib.licenses.mit; - }) {}; - - "wuss_2_0_2_0" = callPackage ({ mkDerivation, base, bytestring, crypton-connection, data-default , exceptions, network, websockets }: @@ -333608,7 +335639,6 @@ self: { ]; description = "Secure WebSocket (WSS) clients"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wx" = callPackage @@ -333827,6 +335857,21 @@ self: { broken = true; }) {}; + "x-sum-type-boilerplate" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, template-haskell }: + mkDerivation { + pname = "x-sum-type-boilerplate"; + version = "0.1.4"; + sha256 = "1wcbv3jyfdqgff493wc00cxi1iq4myfygwzscpv8s5wyc9pfn30s"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ + base hspec hspec-discover template-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "(Forked) Library for reducing the boilerplate involved with sum types"; + license = lib.licenses.mit; + }) {}; + "x11-xim" = callPackage ({ mkDerivation, base, utf8-string, X11 }: mkDerivation { @@ -335761,6 +337806,32 @@ self: { ]; }) {}; + "xmonad-contrib_0_18_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , filepath, hspec, mtl, process, QuickCheck, random, time + , transformers, unix, utf8-string, X11, X11-xft, xmonad + }: + mkDerivation { + pname = "xmonad-contrib"; + version = "0.18.1"; + sha256 = "0ck4hq9yhdzggrs3q4ji6nbg6zwhmhc0ckf9vr9d716d98h9swq5"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory filepath mtl process + random time transformers unix utf8-string X11 X11-xft xmonad + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory hspec mtl process + QuickCheck random time unix utf8-string X11 xmonad + ]; + description = "Community-maintained extensions for xmonad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ + lib.maintainers.dschrempf lib.maintainers.ivanbrennan + lib.maintainers.peti lib.maintainers.slotThe + ]; + }) {}; + "xmonad-contrib-bluetilebranch" = callPackage ({ mkDerivation, base, containers, directory, extensible-exceptions , mtl, old-locale, old-time, process, random, unix, utf8-string @@ -335851,8 +337922,8 @@ self: { }: mkDerivation { pname = "xmonad-extras"; - version = "0.17.1"; - sha256 = "08kq9w38jk4nwb2dmqbmybiz50zy81md9sbjmwrkw5wjcdxgsgch"; + version = "0.17.2"; + sha256 = "0rcvmd6m17n8pqi9ky29hd431iniq3vck08wjvyxxgfvq3m842i8"; configureFlags = [ "-f-with_hlist" "-fwith_parsec" "-fwith_split" ]; @@ -336000,10 +338071,10 @@ self: { }: mkDerivation { pname = "xnobar"; - version = "0.0.0.0"; - sha256 = "0dai29w9m2hjq2wjymk82bh9xi9hqxrvgc2jiy0wra6dw3x68jhk"; - revision = "1"; - editedCabalFile = "1la624kbaq9lhjbh7hk1vwkbs983cz86sxksszavvp2gsmwdlai1"; + version = "0.0.0.1"; + sha256 = "15j9drn1igv5s1z7p5v71vy2i2a2f4gsaz5z6my1vkm097rbz51z"; + revision = "3"; + editedCabalFile = "122chc3px07ij5kk69bsbzrppkxxqd29cxma9zp48pjjakibwp3n"; libraryHaskellDepends = [ async base containers dbus directory extra flow mtl process transformers xmobar @@ -337338,8 +339409,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.9"; - sha256 = "19d53gl477ik0zb8fxq5irvjddgg7n2hjrg4j0x36pvsq3sy2zz9"; + version = "0.14.10"; + sha256 = "0as6k36cq8w1p8nqjlnlc8ji45slynxg4aj3p6ping177lw5232h"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -339775,7 +341846,6 @@ self: { ]; description = "Generate Flow routes for Yesod"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-routes-typescript" = callPackage @@ -340953,8 +343023,9 @@ self: { }: mkDerivation { pname = "yosys-rtl"; - version = "0.1.0.0"; - sha256 = "0mi46c6v353zp8qyabpqpxyry0zimz338kkv8cp9aihk14w6cg01"; + version = "0.1.0.1"; + sha256 = "10kwg8j61ijvy6pdw9im4wcin3fn8xry0nl2cgqm50k22aziqj80"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base prettyprinter text ]; testHaskellDepends = [ base extra filepath prettyprinter process tasty tasty-golden diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index 09de1d228d942..3661c74d499a2 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -184,6 +184,13 @@ rec { markBrokenVersion = version: drv: assert drv.version == version; markBroken drv; markUnbroken = overrideCabal (drv: { broken = false; }); + /* disableParallelBuilding drops the -j<n> option from the GHC + command line for the given package. This can be useful in rare + situations where parallel building of a package causes GHC to + fail for some reason. + */ + disableParallelBuilding = overrideCabal (drv: { enableParallelBuilding = false; }); + enableLibraryProfiling = overrideCabal (drv: { enableLibraryProfiling = true; }); disableLibraryProfiling = overrideCabal (drv: { enableLibraryProfiling = false; }); diff --git a/pkgs/development/haskell-modules/lib/default.nix b/pkgs/development/haskell-modules/lib/default.nix index 2bcd8f25d1146..976e62afc630d 100644 --- a/pkgs/development/haskell-modules/lib/default.nix +++ b/pkgs/development/haskell-modules/lib/default.nix @@ -176,6 +176,8 @@ rec { markBrokenVersion = compose.markBrokenVersion; markUnbroken = compose.markUnbroken; + disableParallelBuilding = compose.disableParallelBuilding; + enableLibraryProfiling = compose.enableLibraryProfiling; disableLibraryProfiling = compose.disableLibraryProfiling; diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index bb995435fc600..c5cfbcec0313b 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -17,6 +17,8 @@ self: super: { # from the latest master instead of the current version on Hackage. cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { }; + ghc-settings-edit = self.callPackage ../tools/haskell/ghc-settings-edit { }; + # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; diff --git a/pkgs/development/interpreters/babashka/clojure-tools.nix b/pkgs/development/interpreters/babashka/clojure-tools.nix index fec8a7fd5a5aa..858c3eb11c211 100644 --- a/pkgs/development/interpreters/babashka/clojure-tools.nix +++ b/pkgs/development/interpreters/babashka/clojure-tools.nix @@ -6,10 +6,10 @@ }: clojure.overrideAttrs (previousAttrs: { pname = "babashka-clojure-tools"; - version = "1.11.3.1463"; + version = "1.12.0.1479"; src = fetchurl { url = previousAttrs.src.url; - hash = "sha256-26QZ3j54XztpW2WJ1xg0Gc+OwrsvmfK4iv0GsLV8FIc="; + hash = "sha256-KlFcRXVd8e3zeP36+zgCUcdzbeLbFffb5V7XKV8NKWw="; }; }) diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index fc54f3e0311d9..f4b51b37c480f 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -9,11 +9,11 @@ let babashka-unwrapped = buildGraalvmNativeImage rec { pname = "babashka-unwrapped"; - version = "1.3.191"; + version = "1.4.192"; src = fetchurl { url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar"; - sha256 = "sha256-xF0u2VO0xdNvRElhUb7atpvy2Y5T9/V1b92ffaOMga8="; + sha256 = "sha256-uVRk1/lfOXMSp3qOdeMoAFpwJaEBxF1MYtFOv364H7Y="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 17d22a14cae56..1cdf6369914d6 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -69,7 +69,7 @@ resholve.mkDerivation rec { external = [ "greadlink" "shlock" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "pkill" # procps doesn't supply this on darwin ]; }; @@ -119,7 +119,7 @@ resholve.mkDerivation rec { "cannot:libexec/bats-core/bats-exec-file" "cannot:libexec/bats-core/bats-exec-suite" "cannot:libexec/bats-core/bats-gather-tests" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # checked invocations for exec "cannot:${procps}/bin/pkill" ]; @@ -196,7 +196,7 @@ resholve.mkDerivation rec { parallel # skips some tests if it can't detect flock # skips some tests if it can't detect procps - ] ++ lib.optionals stdenv.isDarwin [ lsof ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lsof ]; inherit doInstallCheck; installCheckPhase = '' # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows @@ -225,7 +225,7 @@ resholve.mkDerivation rec { # aren't massive builds) inherit bash-preexec locate-dominating-file packcc; resholve = resholve.tests.cli; - } // lib.optionalAttrs (!stdenv.isDarwin) { + } // lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { # TODO: kikit's kicad dependency is marked broken on darwin atm # may be able to fold this up if that resolves. inherit kikit; diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/development/interpreters/bats/libraries.nix index 9f3f63609fd64..b780bce13fd0a 100644 --- a/pkgs/development/interpreters/bats/libraries.nix +++ b/pkgs/development/interpreters/bats/libraries.nix @@ -21,7 +21,7 @@ platforms = lib.platforms.all; homepage = "https://github.com/bats-core/bats-assert"; license = lib.licenses.cc0; - maintainers = [ ]; + maintainers = with lib.maintainers; [ brokenpip3 ]; }; }); @@ -47,18 +47,18 @@ platforms = lib.platforms.all; homepage = "https://github.com/bats-core/bats-file"; license = lib.licenses.cc0; - maintainers = [ ]; + maintainers = with lib.maintainers; [ brokenpip3 ]; }; }); bats-detik = stdenv.mkDerivation (finalAttrs: { pname = "bats-detik"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-detik"; rev = "v${finalAttrs.version}"; - hash = "sha256-cbWNZ9a/Q9reJLQxUyTdqfLykOJcJKnoKB123ao8/xM="; + hash = "sha256-f8PN+VsUdUXrR9JiQgVuYDy2QgOtaxE8tkkxOUF0uC4="; }; dontBuild = true; installPhase = '' @@ -98,7 +98,7 @@ platforms = lib.platforms.all; homepage = "https://github.com/bats-core/bats-support"; license = lib.licenses.cc0; - maintainers = [ ]; + maintainers = with lib.maintainers; [ brokenpip3 ]; }; }); } diff --git a/pkgs/development/interpreters/bic/default.nix b/pkgs/development/interpreters/bic/default.nix index 669cb4f723ac6..1571e93e071f6 100644 --- a/pkgs/development/interpreters/bic/default.nix +++ b/pkgs/development/interpreters/bic/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ hexagonal-sun ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/interpreters/bwbasic/default.nix b/pkgs/development/interpreters/bwbasic/default.nix index a995708889910..7265a5165d9e9 100644 --- a/pkgs/development/interpreters/bwbasic/default.nix +++ b/pkgs/development/interpreters/bwbasic/default.nix @@ -1,15 +1,24 @@ -{ lib, stdenv, dos2unix, fetchurl, unzip }: - -stdenv.mkDerivation rec { +{ + lib, + gccStdenv, + dos2unix, + fetchurl, + unzip, +}: + +gccStdenv.mkDerivation (finalAttrs: { pname = "bwbasic"; version = "3.20"; src = fetchurl { - url = "mirror://sourceforge/project/bwbasic/bwbasic/version%203.20/bwbasic-3.20.zip"; - sha256 = "1w9r4cl7z1lh52c1jpjragbspi1qn0zb7jhcsldav4gdnzxfw67f"; + url = "mirror://sourceforge/project/bwbasic/bwbasic/version%20${finalAttrs.version}/bwbasic-${finalAttrs.version}.zip"; + hash = "sha256-7hju+rftka0a1QzKsz6wOMSr11NZXhmYKJCGfygjOfE="; }; - nativeBuildInputs = [ dos2unix unzip ]; + nativeBuildInputs = [ + dos2unix + unzip + ]; unpackPhase = '' unzip $src @@ -27,12 +36,12 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; - meta = with lib; { + meta = { description = "Bywater BASIC Interpreter"; mainProgram = "bwbasic"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ irenes ]; - platforms = platforms.all; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ irenes ]; + platforms = lib.platforms.all; homepage = "https://sourceforge.net/projects/bwbasic/"; }; -} +}) diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index b220ed834029e..9cdd21a6b955d 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { fixupPhase = '' wrapProgram "$out/bin/chibi-scheme" \ --prefix CHIBI_MODULE_PATH : "$out/share/chibi:$out/lib/chibi" \ - ${lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib"} + ${lib.optionalString stdenv.hostPlatform.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib"} for f in chibi-doc chibi-ffi snow-chibi; do substituteInPlace "$out/bin/$f" \ diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index f1cbd213b871e..86e43de5945af 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -26,7 +26,7 @@ # Build with libc++ (LLVM) rather than stdlibc++ (GCC). # This is experimental and not all features work. -, useLLVMLibcxx ? clangStdenv.isDarwin +, useLLVMLibcxx ? clangStdenv.hostPlatform.isDarwin }: let @@ -97,7 +97,7 @@ let CPPFLAGS = if useLLVMLibcxx then [ "-stdlib=libc++" ] else []; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p $out/share/Jupyter cp -r /build/clang/tools/cling/tools/Jupyter/kernel $out/share/Jupyter ''; diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index f6218ef8f3b21..c0f0e2c5c2f84 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -33,7 +33,7 @@ "pcre" "rawsock" ] - ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ "bindings/glibc" "zlib" ] ++ lib.optional x11Support "clx/new-clx" }: @@ -41,7 +41,7 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); let - ffcallAvailable = stdenv.isLinux && (libffcall != null); + ffcallAvailable = stdenv.hostPlatform.isLinux && (libffcall != null); # Some modules need autoreconf called in their directory. shouldReconfModule = name: name != "asdf"; in @@ -85,7 +85,7 @@ stdenv.mkDerivation { find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i ''; - preConfigure = lib.optionalString stdenv.isDarwin ('' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ('' ( cd src autoreconf -f -i -I m4 -I glm4 @@ -121,7 +121,7 @@ stdenv.mkDerivation { (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' + lib.concatMapStrings (x: " " + x) withModules); - env.NIX_CFLAGS_COMPILE = "-O0 -falign-functions=${if stdenv.is64bit then "8" else "4"}"; + env.NIX_CFLAGS_COMPILE = "-O0 -falign-functions=${if stdenv.hostPlatform.is64bit then "8" else "4"}"; meta = { description = "ANSI Common Lisp Implementation"; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index f491005f5d7c4..4643bb83f9bfa 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.11.4.1474"; + version = "1.12.0.1479"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-sNFDXvrHMrFgLrBHmbv3DKOXuNu6u1OqcmlqZNX/EAg="; + hash = "sha256-KlFcRXVd8e3zeP36+zgCUcdzbeLbFffb5V7XKV8NKWw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/cyber/default.nix b/pkgs/development/interpreters/cyber/default.nix index 2ef863de5dfae..19d266da0e415 100644 --- a/pkgs/development/interpreters/cyber/default.nix +++ b/pkgs/development/interpreters/cyber/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ figsoda ]; inherit (zig_0_11.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/development/interpreters/cyclone/default.nix index 643ee3a63216b..75a4b763ae7d8 100644 --- a/pkgs/development/interpreters/cyclone/default.nix +++ b/pkgs/development/interpreters/cyclone/default.nix @@ -15,7 +15,7 @@ let enableParallelBuilding = true; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ cctools ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ libck ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; nativeBuildInputs = [ bootstrap ] - ++ lib.optionals stdenv.isDarwin [ cctools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ libck ]; diff --git a/pkgs/development/interpreters/dzaima-apl/default.nix b/pkgs/development/interpreters/dzaima-apl/default.nix index 75e49ed602df2..a607fb0fefe4e 100644 --- a/pkgs/development/interpreters/dzaima-apl/default.nix +++ b/pkgs/development/interpreters/dzaima-apl/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; inherit (jdk.meta) platforms; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dapl-native.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dapl-native.x86_64-darwin }; } # TODO: Processing app diff --git a/pkgs/development/interpreters/elixir/1.17.nix b/pkgs/development/interpreters/elixir/1.17.nix index ac1ddc8134b51..41d72d2ff9074 100644 --- a/pkgs/development/interpreters/elixir/1.17.nix +++ b/pkgs/development/interpreters/elixir/1.17.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation { - version = "1.17.2"; - sha256 = "sha256-8rb2f4CvJzio3QgoxvCv1iz8HooXze0tWUJ4Sc13dxg="; - # https://hexdocs.pm/elixir/1.17.2/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp + version = "1.17.3"; + sha256 = "sha256-7Qo6y0KAQ9lwD4oH+7wQ4W5i6INHIBDN9IQAAsYzNJw="; + # https://hexdocs.pm/elixir/1.17.3/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "25"; escriptPath = "lib/elixir/scripts/generate_app.escript"; } diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index 4ef35441d3449..22affc8b9adde 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -22,6 +22,7 @@ cmake, asciidoctor, makeWrapper, + gitUpdater }: let @@ -29,24 +30,41 @@ let owner = "breese"; repo = "trial.protocol"; rev = "79149f604a49b8dfec57857ca28aaf508069b669"; - name = "trial-protocol"; - hash = "sha256-Xd8bX3z9PZWU17N9R95HXdj6qo9at5FBL/+PTVaJgkw="; + sparseCheckout = [ + "include" + ]; + hash = "sha256-QpQ70KDcJyR67PtOowAF6w48GitMJ700B8HiEwDA5sU="; + postFetch = '' + rm $out/*.* + mkdir -p $out/lib/pkgconfig + cat > $out/lib/pkgconfig/trial-protocol.pc << EOF + Name: trial.protocol + Version: 0-unstable-2023-02-10 + Description: C++ header-only library with parsers and generators for network wire protocols + Requires: + Libs: + Cflags: + EOF + ''; }; + + boost = boost182; in -stdenv.mkDerivation rec { + +stdenv.mkDerivation (self: { pname = "emilua"; - version = "0.7.3"; + version = "0.10.1"; src = fetchFromGitLab { owner = "emilua"; repo = "emilua"; - rev = "v${version}"; - hash = "sha256-j8ohhqHjSBgc4Xk9PcQNrbADmsz4VH2zCv+UNqiCv4I="; + rev = "v${self.version}"; + hash = "sha256-D6XKXik9nWQ6t6EF6dLbRGB60iFbPUM8/H8iFAz1QlE="; }; - buildInputs = [ + propagatedBuildInputs = [ luajit_openresty - boost182 + boost fmt ncurses serd @@ -55,6 +73,7 @@ stdenv.mkDerivation rec { liburing openssl cereal + trial-protocol-wrap ]; nativeBuildInputs = [ @@ -80,12 +99,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - pushd subprojects - cp -r ${trial-protocol-wrap} trial-protocol - chmod +w trial-protocol - cp "packagefiles/trial.protocol/meson.build" "trial-protocol/" - popd - patchShebangs src/emilua_gperf.awk --interpreter '${lib.getExe gawk} -f' ''; @@ -97,12 +110,25 @@ stdenv.mkDerivation rec { "--no-suite" "libpsx" ]; + postInstall = '' + mkdir -p $out/nix-support + cp ${./setup-hook.sh} $out/nix-support/setup-hook + substituteInPlace $out/nix-support/setup-hook \ + --replace @sitePackages@ "${self.passthru.sitePackages}" + ''; + + passthru = { + updateScript = gitUpdater {rev-prefix = "v";}; + inherit boost; + sitePackages = "lib/emilua-${(lib.concatStringsSep "." (lib.take 2 (lib.splitVersion self.version)))}"; + }; + meta = with lib; { description = "Lua execution engine"; mainProgram = "emilua"; homepage = "https://emilua.org/"; license = licenses.boost; - maintainers = with maintainers; [ manipuladordedados ]; + maintainers = with maintainers; [ manipuladordedados lucasew ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/interpreters/emilua/setup-hook.sh b/pkgs/development/interpreters/emilua/setup-hook.sh new file mode 100644 index 0000000000000..034b52796468e --- /dev/null +++ b/pkgs/development/interpreters/emilua/setup-hook.sh @@ -0,0 +1,17 @@ +addEmiluaPath() { + addToSearchPathWithCustomDelimiter : EMILUA_PATH $1/@sitePackages@ +} + +toEmiluaPath() { + local paths="$1" + local result= + for i in $paths; do + p="$i/@sitePackages@" + result="${result}${result:+:}$p" + done + echo $result +} + +if [ -z "${dontAddEmiluaPath:-}" ]; then + addEnvHooks "$hostOffset" addEmiluaPath +fi diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index a6c12ce197a66..bf392920d5551 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "27.0"; - sha256 = "sha256-YZWBLcpkm8B4sjoQO7I9ywXcmxXL+Dvq/JYsLsr7TO0="; + version = "27.0.1"; + sha256 = "sha256-Lp6J9eq6RXDi0RRjeVO/CIa4h/m7/fwOp/y0u0sTdFQ="; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index ff8aadf90980f..38af8a6e0926a 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -19,11 +19,11 @@ , libGLU ? null , wxGTK ? null , xorg ? null -, exdoc ? null +, ex_doc ? null , parallelBuild ? false , systemd , wxSupport ? true -, exdocSupport ? false +, ex_docSupport ? false , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd # systemd support in epmd # updateScript deps , writeScript @@ -64,7 +64,7 @@ , installPhase ? "" , preInstall ? "" , postInstall ? "" -, installTargets ? [ "install" "install-docs" ] +, installTargets ? if ((lib.versionOlder version "27.0") || ex_docSupport) then [ "install" "install-docs" ] else [ "install" ] , checkPhase ? "" , preCheck ? "" , postCheck ? "" @@ -74,17 +74,17 @@ , meta ? { } }: -assert wxSupport -> (if stdenv.isDarwin +assert wxSupport -> (if stdenv.hostPlatform.isDarwin then wxGTK != null else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk11 != null; -assert exdocSupport -> exdoc != null; +assert ex_docSupport -> ex_doc != null; let inherit (lib) optional optionals optionalAttrs optionalString; - wxPackages2 = if stdenv.isDarwin then [ wxGTK ] else wxPackages; + wxPackages2 = if stdenv.hostPlatform.isDarwin then [ wxGTK ] else wxPackages; in stdenv.mkDerivation ({ @@ -105,7 +105,7 @@ stdenv.mkDerivation ({ ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages ++ optional systemdSupport systemd - ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]); + ++ optionals stdenv.hostPlatform.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]); debugInfo = enableDebugInfo; @@ -122,15 +122,15 @@ stdenv.mkDerivation ({ ''; # For OTP 27+ we need ex_doc to build the documentation - # When exdocSupport is enabled, grab the raw ex_doc executable from the exdoc + # When ex_docSupport is enabled, grab the raw ex_doc executable from the ex_doc # derivation. Next, patch the first line to use the escript that will be # built during the build phase of this derivation. Finally, building the # documentation requires the erlang-logo.png asset. preConfigure = '' ./otp_build autoconf - '' + optionalString exdocSupport '' + '' + optionalString ex_docSupport '' mkdir -p $out/bin - cp ${exdoc}/bin/.ex_doc-wrapped $out/bin/ex_doc + cp ${ex_doc}/bin/.ex_doc-wrapped $out/bin/ex_doc sed -i "1 s:^.*$:#!$out/bin/escript:" $out/bin/ex_doc export EX_DOC=$out/bin/ex_doc @@ -148,9 +148,9 @@ stdenv.mkDerivation ({ ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional wxSupport "--enable-wx" ++ optional systemdSupport "--enable-systemd" - ++ optional stdenv.isDarwin "--enable-darwin-64bit" + ++ optional stdenv.hostPlatform.isDarwin "--enable-darwin-64bit" # make[3]: *** [yecc.beam] Segmentation fault: 11 - ++ optional (stdenv.isDarwin && stdenv.isx86_64) "--disable-jit" + ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--disable-jit" ++ configureFlags; # install-docs will generate and install manpages and html docs diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 6d64e76b816c1..a95e45fc65367 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; nativeBuildInputs = [ pkg-config makeWrapper cmake ]; - buildInputs = lib.optionals stdenv.isDarwin + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices Security ]; checkFlags = [ diff --git a/pkgs/development/interpreters/femtolisp/default.nix b/pkgs/development/interpreters/femtolisp/default.nix index 7bf0ea7c75404..3e35f7edc6570 100644 --- a/pkgs/development/interpreters/femtolisp/default.nix +++ b/pkgs/development/interpreters/femtolisp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { homepage = "https://git.sr.ht/~ft/femtolisp"; license = with lib.licenses; [ mit bsd3 ]; maintainers = with lib.maintainers; [ moody ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; platforms = lib.platforms.unix; mainProgram = "flisp"; }; diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 62903de6bb8b0..3fb736ff7e389 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { zlib mbedtls cacert - ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; autoreconfPhase = '' ./DIST gen diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 85e86de1d6b29..ee4d8482cd41a 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-Wno-error=use-after-free" ]) ++ lib.optional stdenv.cc.isClang "-Wno-error=null-dereference"); - patchPhase = lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" ''; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Free interpreter for the APL programming language"; homepage = "https://www.gnu.org/software/apl/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix index 41f15afbee305..d9acb974df88d 100644 --- a/pkgs/development/interpreters/gnudatalanguage/default.nix +++ b/pkgs/development/interpreters/gnudatalanguage/default.nix @@ -24,16 +24,16 @@ , libgeotiff , libjpeg # eccodes is broken on darwin -, enableGRIB ? stdenv.isLinux +, enableGRIB ? stdenv.hostPlatform.isLinux , eccodes -, enableGLPK ? stdenv.isLinux +, enableGLPK ? stdenv.hostPlatform.isLinux , glpk # We enable it in hdf4 and use libtirpc as a dependency here from the passthru # of hdf4 -, enableLibtirpc ? stdenv.isLinux +, enableLibtirpc ? stdenv.hostPlatform.isLinux , libtirpc , python3 -, enableMPI ? (stdenv.isLinux || stdenv.isDarwin) +, enableMPI ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) # Choose MPICH over OpenMPI because it currently builds on AArch and Darwin , mpi # Unfree optional dependency for hdf4 and hdf5 @@ -57,11 +57,11 @@ , plplot-forced ? null # wxWidgets is preferred over X11 for this project but we only have it on Linux # and Darwin. -, enableWX ? (stdenv.isLinux || stdenv.isDarwin) +, enableWX ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) , wxGTK32 , Cocoa # X11: OFF by default for platform consistency. Use X where WX is not available -, enableXWin ? (!stdenv.isLinux && !stdenv.isDarwin) +, enableXWin ? (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) }: let @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableGRIB eccodes ++ lib.optional enableGLPK glpk ++ lib.optional enableWX wxGTK32 - ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa + ++ lib.optional (enableWX && stdenv.hostPlatform.isDarwin) Cocoa ++ lib.optional enableMPI mpi ++ lib.optional enableLibtirpc hdf4-custom.libtirpc ++ lib.optional enableSzip szip; @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { # Tests are failing on Hydra: # ./src/common/dpycmn.cpp(137): assert ""IsOk()"" failed in GetClientArea(): invalid wxDisplay object - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; # Opt-out unstable tests # https://github.com/gnudatalanguage/gdl/issues/482 diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 8ed9bfe117366..ba597c6e71356 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, unzip, which, makeWrapper, jdk }: +{ + lib, + stdenv, + fetchurl, + unzip, + which, + makeWrapper, + installShellFiles, + jdk, + copyDesktopItems, + makeDesktopItem, +}: # at runtime, need jdk @@ -11,12 +22,44 @@ stdenv.mkDerivation rec { sha256 = "sha256-2Ro93+NThx1MJlbT0KBcgovD/zbp1J29vsE9zZjwWHc="; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ + makeWrapper + unzip + installShellFiles + copyDesktopItems + ]; + + desktopItems = [ + (makeDesktopItem { + name = "groovy"; + desktopName = "Groovy Console"; + exec = "groovyConsole"; + icon = "groovy"; + comment = meta.description; + terminal = false; + startupNotify = false; + categories = [ "Development" ]; + }) + ]; installPhase = '' + runHook preInstall + + rm bin/*.bat + mkdir -p $out mkdir -p $out/share/doc/groovy - rm bin/*.bat + + #Install icons + mkdir -p $out/share/icons + mv bin/groovy.ico $out/share/icons/ + + #Install Completion + for p in grape groovy{,doc,c,sh,Console}; do + installShellCompletion --cmd $p --bash bin/''${p}_completion + done + rm bin/*_completion + mv {bin,conf,grooid,lib} $out mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy @@ -24,9 +67,11 @@ stdenv.mkDerivation rec { for p in grape java2groovy groovy{,doc,c,sh,Console}; do wrapProgram $out/bin/$p \ - --set JAVA_HOME "${jdk}" \ - --prefix PATH ":" "${jdk}/bin" + --set JAVA_HOME "${jdk}" \ + --prefix PATH ":" "${jdk}/bin" done + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 57ff880256900..510834df4046b 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -79,7 +79,7 @@ builder rec { sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; })] ++ (lib.optional (coverageAnalysis != null) ./gcov-file-name.patch) - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./filter-mkostemp-darwin.patch (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; @@ -92,11 +92,11 @@ builder rec { # don't have "libgcc_s.so.1" on darwin LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s"; + (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix" - ] ++ lib.optionals stdenv.isSunOS [ + ] ++ lib.optionals stdenv.hostPlatform.isSunOS [ # Make sure the right <gmp.h> is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> @@ -159,7 +159,7 @@ builder rec { // -(lib.optionalAttrs (!stdenv.isLinux) { +(lib.optionalAttrs (!stdenv.hostPlatform.isLinux) { # Work around <https://bugs.gnu.org/14201>. SHELL = stdenv.shell; CONFIG_SHELL = stdenv.shell; diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 9dd102012068e..6c75540dae0c3 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -73,7 +73,7 @@ builder rec { # Read the header of the patch to more info ./eai_system.patch ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch - ++ lib.optional stdenv.isDarwin + ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207"; @@ -88,7 +88,7 @@ builder rec { configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" - ] ++ lib.optionals stdenv.isSunOS [ + ] ++ lib.optionals stdenv.hostPlatform.isSunOS [ # Make sure the right <gmp.h> is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index f7797a7c8ad2b..1eeda97b0f8bc 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -49,7 +49,7 @@ builder rec { libtool libunistring readline - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcrypt ]; propagatedBuildInputs = [ @@ -62,7 +62,7 @@ builder rec { # flags, see below. libtool libunistring - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcrypt ]; @@ -75,7 +75,7 @@ builder rec { patches = [ ./eai_system.patch ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch - ++ lib.optional stdenv.isDarwin + ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207"; @@ -90,7 +90,7 @@ builder rec { configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" - ] ++ lib.optionals stdenv.isSunOS [ + ] ++ lib.optionals stdenv.hostPlatform.isSunOS [ # Make sure the right <gmp.h> is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> @@ -105,7 +105,7 @@ builder rec { ] # At least on x86_64-darwin '-flto' autodetection is not correct: # https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028 - ++ lib.optional (stdenv.isDarwin) "--disable-lto"; + ++ lib.optional (stdenv.hostPlatform.isDarwin) "--disable-lto"; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" @@ -129,7 +129,7 @@ builder rec { doInstallCheck = doCheck; # In procedure bytevector-u8-ref: Argument 2 out of range - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; setupHook = ./setup-hook-3.0.sh; diff --git a/pkgs/development/interpreters/hashlink/default.nix b/pkgs/development/interpreters/hashlink/default.nix index f017e1a43c86a..6ecb4913dbc88 100644 --- a/pkgs/development/interpreters/hashlink/default.nix +++ b/pkgs/development/interpreters/hashlink/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { cp -r other/haxelib/* "${haxelibPath}" ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libhl.dylib $out/lib/libhl.dylib $out/bin/hl ''; diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix index d8ee5726ef330..ab48ef91b362e 100644 --- a/pkgs/development/interpreters/hugs/default.nix +++ b/pkgs/development/interpreters/hugs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "hugs"; homepage = "https://www.haskell.org/hugs"; description = "Haskell interpreter"; diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index e5c486ed8de20..2ea8a20d4f6c3 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { let target = if withGraphics then "X-Configure" else "Configure"; platform = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "macintosh" - else if stdenv.isBSD then "bsd" - else if stdenv.isCygwin then "cygwin" - else if stdenv.isSunOS then "solaris" + if stdenv.hostPlatform.isLinux then "linux" + else if stdenv.hostPlatform.isDarwin then "macintosh" + else if stdenv.hostPlatform.isBSD then "bsd" + else if stdenv.hostPlatform.isCygwin then "cygwin" + else if stdenv.hostPlatform.isSunOS then "solaris" else throw "unsupported system"; in "make ${target} name=${platform}"; diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix deleted file mode 100644 index 97a8064cc60dd..0000000000000 --- a/pkgs/development/interpreters/j/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, which -, gmp -, avx2Support ? stdenv.hostPlatform.avx2Support -}: - -stdenv.mkDerivation rec { - pname = "j"; - version = "9.5.1"; - - src = fetchFromGitHub { - owner = "jsoftware"; - repo = "jsource"; - rev = "${version}"; - hash = "sha256-QRQhE8138+zaGQOdq9xUOrifkVIprzbJWbmMK+WhEOU="; - }; - - nativeBuildInputs = [ which ]; - buildInputs = [ gmp ]; - - patches = [ - ./fix-install-path.patch - ]; - - enableParallelBuilding = true; - - dontConfigure = true; - - # Emulate jplatform64.sh configuration variables - jplatform = - if stdenv.isDarwin then "darwin" - else if stdenv.hostPlatform.isAarch then "raspberry" - else if stdenv.isLinux then "linux" - else "unsupported"; - - j64x = - if stdenv.is32bit then "j32" - else if stdenv.isx86_64 then - if stdenv.isLinux && avx2Support then "j64avx2" else "j64" - else if stdenv.isAarch64 then - if stdenv.isDarwin then "j64arm" else "j64" - else "unsupported"; - - env.NIX_LDFLAGS = "-lgmp"; - - buildPhase = '' - runHook preBuild - MAKEFLAGS+=" ''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" \ - jplatform=${jplatform} j64x=${j64x} make2/build_all.sh - cp -v bin/${jplatform}/${j64x}/* jlibrary/bin/ - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/j - cp -r jlibrary/{addons,system} $out/share/j/ - cp -r jlibrary/bin $out/ - runHook postInstall - ''; - - doInstallCheck = false; # The "gregex" test fails due to not finding PCRE2 - - installCheckPhase = '' - runHook preInstallCheck - HOME="$TMPDIR" $out/bin/jconsole -lib $out/bin/libj* script/testga.ijs - runHook postInstallCheck - ''; - - meta = with lib; { - homepage = "https://jsoftware.com/"; - description = "J programming language, an ASCII-based APL successor"; - longDescription = '' - J is a high-level, general-purpose programming language that is - particularly suited to the mathematical, statistical, and logical analysis - of data. It is a powerful tool for developing algorithms and exploring - problems that are not already well understood. - ''; - license = licenses.gpl3Only; - maintainers = with maintainers; [ raskin synthetica AndersonTorres ]; - broken = stdenv.isDarwin; - platforms = platforms.all; - mainProgram = "jconsole"; - }; -} diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 34388c8c033b1..b171005ca2816 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -9,19 +9,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "janet"; - version = "1.35.2"; + version = "1.36.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = "janet"; rev = "v${finalAttrs.version}"; - hash = "sha256-iqexxlBFM4ffxDsOdKMRJs/ufhKV0jvzqgZ3tH9S/k0="; + hash = "sha256-lAasSRQwqkc86jobSejLFGAiaCu+EM+2sc92Kc2KxMs="; }; postPatch = '' substituteInPlace janet.1 \ --replace /usr/local/ $out/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # error: Socket is not connected substituteInPlace meson.build \ --replace "'test/suite-ev.janet'," "" diff --git a/pkgs/development/interpreters/kerf/default.nix b/pkgs/development/interpreters/kerf/default.nix index d019743bfb4d0..e11a683082eda 100644 --- a/pkgs/development/interpreters/kerf/default.nix +++ b/pkgs/development/interpreters/kerf/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; buildInputs = [ libedit zlib ncurses ] - ++ lib.optionals stdenv.isDarwin ([ + ++ lib.optionals stdenv.hostPlatform.isDarwin ([ Accelerate - ] ++ lib.optionals stdenv.isx86_64 /* && isDarwin */ [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 /* && isDarwin */ [ CoreGraphics CoreVideo ]); @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "implicit-function-declaration" "gnu-variable-sized-type-not-at-end" "unused-result" - ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-fcommon" ]); patchPhase = '' substituteInPlace ./Makefile \ @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { # aarch64-linux seems hopeless, with over 2,000 warnings # generated? - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 7f1e5ccb7313c..30ce00d44e61a 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -86,7 +86,7 @@ rec { makeWrapper = makeBinaryWrapper; inherit passthruFun; - patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch; + patches = lib.optional stdenv.hostPlatform.isDarwin ./5.4.darwin.patch; }; lua5_4_compat = lua5_4.override({ @@ -102,7 +102,7 @@ rec { inherit passthruFun; patches = - lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ]; + lib.optionals stdenv.hostPlatform.isDarwin [ ./5.2.darwin.patch ]; }; lua5_3_compat = lua5_3.override({ @@ -119,7 +119,7 @@ rec { inherit passthruFun; patches = [ ./CVE-2022-28805.patch - ] ++ lib.optional stdenv.isDarwin ./5.2.darwin.patch; + ] ++ lib.optional stdenv.hostPlatform.isDarwin ./5.2.darwin.patch; }; lua5_2_compat = lua5_2.override({ @@ -134,7 +134,7 @@ rec { hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; makeWrapper = makeBinaryWrapper; inherit passthruFun; - patches = (lib.optional stdenv.isDarwin ./5.1.darwin.patch) + patches = (lib.optional stdenv.hostPlatform.isDarwin ./5.1.darwin.patch) ++ [ ./CVE-2014-5461.patch ]; }; diff --git a/pkgs/development/interpreters/lua-5/hooks/default.nix b/pkgs/development/interpreters/lua-5/hooks/default.nix index 02716568acfd5..5f935626fec45 100644 --- a/pkgs/development/interpreters/lua-5/hooks/default.nix +++ b/pkgs/development/interpreters/lua-5/hooks/default.nix @@ -2,7 +2,6 @@ { lua , lib , makeSetupHook -, findutils , runCommand }: diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 497307d57b3f3..0f7b65df95ef8 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation (finalAttrs: luaversion = lib.versions.majorMinor finalAttrs.version; - plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" - else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" - else if stdenv.isDarwin then "macosx" + plat = if (stdenv.hostPlatform.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" + else if (stdenv.hostPlatform.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" + else if stdenv.hostPlatform.isDarwin then "macosx" else if stdenv.hostPlatform.isMinGW then "mingw" - else if stdenv.isFreeBSD then "freebsd" - else if stdenv.isSunOS then "solaris" + else if stdenv.hostPlatform.isFreeBSD then "freebsd" + else if stdenv.hostPlatform.isSunOS then "solaris" else if stdenv.hostPlatform.isBSD then "bsd" else if stdenv.hostPlatform.isUnix then "posix" else "generic"; @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: # abort if patching didn't work grep $out src/luaconf.h - '' + lib.optionalString (!stdenv.isDarwin && !staticOnly) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin && !staticOnly) '' # Add a target for a shared library to the Makefile. sed -e '1s/^/LUA_SO = liblua.so/' \ -e 's/ALL_T *= */&$(LUA_SO) /' \ @@ -96,10 +96,10 @@ stdenv.mkDerivation (finalAttrs: makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat compatFlags} $(${ if lib.versionAtLeast luaversion "5.2" then "SYSCFLAGS" else "MYCFLAGS"})' ) - makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"}) + makeFlagsArray+=(${lib.optionalString stdenv.hostPlatform.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"}) installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ - TO_LIB="${if stdenv.isDarwin then "liblua.${finalAttrs.version}.dylib" + TO_LIB="${if stdenv.hostPlatform.isDarwin then "liblua.${finalAttrs.version}.dylib" else ("liblua.a" + lib.optionalString (!staticOnly) " liblua.so liblua.so.${luaversion} liblua.so.${finalAttrs.version}" )}" ) runHook postConfigure diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index f5e25b6261bc2..22574dd2b389c 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -58,7 +58,7 @@ let # TODO support also other build architectures. The ideal way would be to use # stdenv_32bit but that doesn't work due to host platform mismatch: # https://github.com/NixOS/nixpkgs/issues/212494 - buildStdenv = if buildPackages.stdenv.isx86_64 && stdenv.is32bit + buildStdenv = if buildPackages.stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.is32bit then buildPackages.pkgsi686Linux.buildPackages.stdenv else buildPackages.stdenv; diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix index 4ad07f6a1e337..6ccee2b8de767 100644 --- a/pkgs/development/interpreters/lunatic/default.nix +++ b/pkgs/development/interpreters/lunatic/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/interpreters/lune/default.nix b/pkgs/development/interpreters/lune/default.nix index 3d84ac9ba5217..d010361a931ce 100644 --- a/pkgs/development/interpreters/lune/default.nix +++ b/pkgs/development/interpreters/lune/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cmake # required for libz-ng-sys ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; @@ -64,6 +64,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mpl20; maintainers = with maintainers; [ lammermann ]; # note: Undefined symbols for architecture x86_64 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index f8d4e98c90b2b..667c797cd0934 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ]; hardeningDisable = [ "stackprotector" ] ++ - lib.optionals stdenv.isi686 [ "pic" "fortify" ]; + lib.optionals stdenv.hostPlatform.isi686 [ "pic" "fortify" ]; # Fix for glibc-2.34, see # https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-lang/maude/maude-3.1-r1.ebuild?id=f021cc6cfa1e35eb9c59955830f1fd89bfcb26b4 diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 98ef61f821959..df34036a9423a 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { __darwinAllowLocalNetworking = true; # needed for select_poll_eintr test skippedTests = " -e select_poll_fd" - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -e ffi_callback -e float_parse -e float_parse_doubleproc" - + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) " -e float_parse" + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) " -e ffi_callback -e float_parse -e float_parse_doubleproc" + + lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) " -e float_parse" ; checkPhase = '' diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 225146b33fe78..9bffafe4bd73d 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix index 2022141daf37e..bde0104e6c1ba 100644 --- a/pkgs/development/interpreters/nelua/default.nix +++ b/pkgs/development/interpreters/nelua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nelua"; - version = "0-unstable-2024-08-04"; + version = "0-unstable-2024-09-22"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "38c2d9ca14c992ddcd73f4067af8c6f37c550979"; - hash = "sha256-mpKGD9YP+D+1ySq+8lyRjXwptWL+uBG/p37bHDBoTJ8="; + rev = "ff7a42c275239933f6e615b2ad2e6a8d507afe7b"; + hash = "sha256-SQg7Z9Ag+UwIhrjgobAEiVEGu/GgFZKw3lquu4/4rHI="; }; postPatch = '' diff --git a/pkgs/development/interpreters/nextflow/default.nix b/pkgs/development/interpreters/nextflow/default.nix index ed07f175b6535..fca7a48544532 100644 --- a/pkgs/development/interpreters/nextflow/default.nix +++ b/pkgs/development/interpreters/nextflow/default.nix @@ -1,54 +1,99 @@ -{ lib -, stdenv -, fetchurl -, makeWrapper -, openjdk17 -, wget -, which -, gnused -, gawk -, coreutils -, buildFHSEnv +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + openjdk, + gradle, + wget, + which, + gnused, + gawk, + coreutils, + bash, + testers, + nixosTests, }: - -let - nextflow = -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nextflow"; - version = "22.10.6"; + # 24.08.0-edge is compatible with Java 21. The current (as of 2024-09-19) + # nextflow release (24.04.4) does not yet support java21, but java19. The + # latter is not in nixpkgs(-unstable) anymore. + version = "24.08.0-edge"; - src = fetchurl { - url = "https://github.com/nextflow-io/nextflow/releases/download/v${version}/nextflow-${version}-all"; - hash = "sha256-zeYsKxWRnzr0W6CD+yjoAXwCN/AbN5P4HhH1oftnrjY="; + src = fetchFromGitHub { + owner = "nextflow-io"; + repo = "nextflow"; + rev = "6e866ae81ff3bf8a9729e9dbaa9dd89afcb81a4b"; + hash = "sha256-SA27cuP3iO5kD6u0uTeEaydyqbyJzOkVtPrb++m3Tv0="; }; nativeBuildInputs = [ makeWrapper - openjdk17 - wget - which - gnused - gawk - coreutils + gradle ]; - dontUnpack = true; + postPatch = '' + # Nextflow invokes the constant "/bin/bash" (not as a shebang) at + # several locations so we fix that globally. However, when running inside + # a container, we actually *want* "/bin/bash". Thus the global fix needs + # to be reverted for this specific use case. + substituteInPlace modules/nextflow/src/main/groovy/nextflow/executor/BashWrapperBuilder.groovy \ + --replace-fail "['/bin/bash'," "['${bash}/bin/bash'," \ + --replace-fail "if( containerBuilder ) {" "if( containerBuilder ) { + launcher = launcher.replaceFirst(\"/nix/store/.*/bin/bash\", \"/bin/bash\")" + ''; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + __darwinAllowLocalNetworking = true; + + # During the build, some additional dependencies are downloaded ("detached + # configuration"). We thus need to run a full build on instead of the default + # one. + # See https://github.com/NixOS/nixpkgs/pull/339197#discussion_r1747749061 + gradleUpdateTask = "pack"; + # The installer attempts to copy a final JAR to $HOME/.nextflow/... + gradleFlags = ["-Duser.home=\$TMPDIR"]; + preBuild = '' + # See Makefile (`make pack`) + export BUILD_PACK=1 + ''; + gradleBuildTask = "pack"; installPhase = '' runHook preInstall mkdir -p $out/bin - install -Dm755 $src $out/bin/nextflow + install -Dm755 build/releases/nextflow-${finalAttrs.version}-dist $out/bin/nextflow runHook postInstall ''; postFixup = '' wrapProgram $out/bin/nextflow \ - --prefix PATH : ${lib.makeBinPath nativeBuildInputs} \ - --set JAVA_HOME ${openjdk17.home} + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gawk + gnused + wget + which + ] + } \ + --set JAVA_HOME ${openjdk.home} ''; + passthru.tests.default = nixosTests.nextflow; + # versionCheckHook doesn't work as of 2024-09-23. + # See https://github.com/NixOS/nixpkgs/pull/339197#issuecomment-2363495060 + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "env HOME=$TMPDIR nextflow -version"; + }; + meta = with lib; { description = "DSL for data-driven computational pipelines"; longDescription = '' @@ -61,17 +106,11 @@ stdenv.mkDerivation rec { homepage = "https://www.nextflow.io/"; changelog = "https://github.com/nextflow-io/nextflow/releases"; license = licenses.asl20; - maintainers = with maintainers; [ Etjean edmundmiller ]; + maintainers = with maintainers; [ + Etjean + edmundmiller + ]; mainProgram = "nextflow"; platforms = platforms.unix; }; -}; -in -if stdenv.isLinux then - buildFHSEnv - { - name = "nextflow"; - targetPkgs = pkgs: [ nextflow ]; - runScript = "nextflow"; - } -else nextflow +}) diff --git a/pkgs/development/interpreters/nextflow/deps.json b/pkgs/development/interpreters/nextflow/deps.json new file mode 100644 index 0000000000000..19a8de2470e66 --- /dev/null +++ b/pkgs/development/interpreters/nextflow/deps.json @@ -0,0 +1,2026 @@ +{ + "!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/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/github/johnrengelman#shadow/8.1.1": { + "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=", + "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=", + "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { + "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA=" + }, + "com/google/code/gson#gson-parent/2.9.1": { + "pom": "sha256-fKCEXnNoVhjePka9NDTQOko3PVIPq5OmgDGK1sjLKnk=" + }, + "com/google/code/gson#gson/2.9.1": { + "jar": "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=", + "pom": "sha256-5ZZjI9cUJXCzekvpeeIbwtroSBB+TcQW2PRNmqPwKQM=" + }, + "com/gradle/plugin-publish#com.gradle.plugin-publish.gradle.plugin/1.2.1": { + "pom": "sha256-60lBRA8TGZbmT6SCDc264js95UhBi6ke9MY0pqcfVMs=" + }, + "com/gradle/publish#plugin-publish-plugin/1.2.1": { + "jar": "sha256-KY8MLpeVMhcaBaQWAyY3M7ZfiRE9ToCczQ4mmQFJ3hg=", + "module": "sha256-w98uuag1ZdO2MVDYa0344o9mG1XOzdRJJ+RpMxA2yxk=", + "pom": "sha256-E6X+iu2+Rs/b6hLp/NcJemKygqpqtMkIZWuWzpoqX6M=" + }, + "commons-beanutils#commons-beanutils/1.8.0": { + "jar": "sha256-E1Q5ObhuO7gzkBnWrMCOywTksJWoK6+YTlBbOvtUdCo=", + "pom": "sha256-RcBZb/rd9e7HOaIIBH3OId+bsawhwa/owNoMsOj/yO4=" + }, + "commons-codec#commons-codec/1.6": { + "jar": "sha256-VLNOlBuOFBS9PkDXNu/TSBdy3CbbMpb2qkXOyfYgPYY=", + "pom": "sha256-oG410//zprgT2UiU6/PkmPlUDIZMWzmueDkH46bHKIk=" + }, + "commons-collections#commons-collections/3.2.1": { + "jar": "sha256-hzY6TJTqq+79i5MMsFn2a2TJ99Yyhi8j3jAS2nZgBHs=", + "pom": "sha256-H5Ymy6pYTtXYYCGGbk42fib+Xvwkg4JlK+aL7rQ+dBY=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-lang#commons-lang/2.4": { + "jar": "sha256-LHO5QMkSULyYNGkmJw8TpqELtuKdLJMWpw0TTjgshz4=", + "pom": "sha256-kDBieNOe1aUNr6Rore5NJytjXVTE9yleKT5Cu9uK1mY=" + }, + "commons-logging#commons-logging/1.1.1": { + "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=", + "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug=" + }, + "io/codearte/gradle/nexus#gradle-nexus-staging-plugin/0.21.2": { + "jar": "sha256-IoBojVIvesDzggf1zqHeX4qQB+pwdkQCOkli7dcrdoM=", + "pom": "sha256-EbptdouvS6ax6Y+X+rPMJOEFJILBjDhxj2XRFjqfvd8=" + }, + "io/codearte/nexus-staging#io.codearte.nexus-staging.gradle.plugin/0.21.2": { + "pom": "sha256-U6ZiLniyF6D3uVuYuAb03ExyYhrb/vAeMqjQOU34CMk=" + }, + "io/fabric8#kubernetes-client-bom/5.12.2": { + "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" + }, + "io/netty#netty-bom/4.1.86.Final": { + "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { + "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" + }, + "jakarta/platform#jakartaee-api-parent/9.0.0": { + "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" + }, + "net/sf/ezmorph#ezmorph/1.0.6": { + "jar": "sha256-K+BqI4D4ZWQmtcYQ22lLvXUxTK8+kZGv/NeUJyE5jtc=", + "pom": "sha256-+UPkVMTG00n/AKH9bH6vORUB0g3jdw0fjSLL4RrAgN0=" + }, + "net/sf/json-lib#json-lib/2.3": { + "pom": "sha256-4RmEasU+ymvP8FzE/VFRYXZjiVx+fKgr2M6R+fno6oM=" + }, + "net/sf/json-lib#json-lib/2.3/jdk15": { + "jar": "sha256-HljMSaAvKuIgScc95p0DpqpE8ZdTPEIQajAuA8lcQMo=" + }, + "net/sourceforge/nekohtml#nekohtml/1.9.16": { + "jar": "sha256-nYFgvdRdXznN3uO0DhQ/Pu8SlRA//hmxIHfuW/RsmA8=", + "pom": "sha256-0wDz8mGFya7uiIbu16CUHPffuf1JTP67coWvzKoQvIk=" + }, + "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/3": { + "pom": "sha256-OTxQr7S3qm61flN3pVoaBhCxn3W1Ls4BMI2wShGHog4=" + }, + "org/apache#apache/4": { + "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/ant#ant-launcher/1.10.13": { + "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=", + "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o=" + }, + "org/apache/ant#ant-parent/1.10.13": { + "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk=" + }, + "org/apache/ant#ant/1.10.13": { + "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=", + "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o=" + }, + "org/apache/commons#commons-parent/11": { + "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo=" + }, + "org/apache/commons#commons-parent/22": { + "pom": "sha256-+4xeVeMKet20/yEIWKDo0klO1nV7vhkBLamdUVhsPLs=" + }, + "org/apache/commons#commons-parent/5": { + "pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/9": { + "pom": "sha256-UzG30+Cu1ZcoyA8RGOTb94Vl1BCegdFmAsnK29sjoSg=" + }, + "org/apache/httpcomponents#httpclient/4.2.1": { + "jar": "sha256-iIXYJLyCcE+oX2WKozCCD3l7LF95ygrOFbAKFLgRazI=", + "pom": "sha256-ukEy6mrvjTaI36vPhEkxsbDSuRuPe/4j/GIyJZRAtRo=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.2.1": { + "pom": "sha256-isgOv0pRag0bYCiTM8vtDqMreP+woAkVIgrWZq4RHcQ=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.2.1": { + "pom": "sha256-aEfHnY0ZIIx/eCWELDGhrdkGw6z61my1tcgw5iGWgXk=" + }, + "org/apache/httpcomponents#httpcore/4.2.1": { + "jar": "sha256-gIaCbdI0nYPkkz/eOYllzf6HHrknjNthrFvIFB15fYQ=", + "pom": "sha256-U6IZ7//SN64tgJPSqcfY264QoxFoo1L08LE6IEJeKzg=" + }, + "org/apache/httpcomponents#project/6": { + "pom": "sha256-tdkiWtuGg8HXxVFFRDgq3QBFR8k2lKu1vVK4c0aIb0I=" + }, + "org/apache/logging#logging-parent/7": { + "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + }, + "org/apache/logging/log4j#log4j-api/2.20.0": { + "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", + "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" + }, + "org/apache/logging/log4j#log4j-bom/2.20.0": { + "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + }, + "org/apache/logging/log4j#log4j-core/2.20.0": { + "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", + "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" + }, + "org/apache/logging/log4j#log4j/2.20.0": { + "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" + }, + "org/apache/maven#maven-model/3.6.3": { + "jar": "sha256-F87x9Y4UbvDX2elrO5LZih1v19KzKIulOOj/Hg2RYM8=", + "pom": "sha256-fHIOjLA9KFxxzW4zTZyeWWBivdMQ7grRX1xHmpkxVPA=" + }, + "org/apache/maven#maven-parent/33": { + "pom": "sha256-OFbj/NFpUC1fEv4kUmBOv2x8Al8VZWv6VY6pntKdc+o=" + }, + "org/apache/maven#maven/3.6.3": { + "pom": "sha256-0thiRepmFJvBTS3XK7uWH5ZN1li4CaBXMlLAZTHu7BY=" + }, + "org/codehaus/groovy#groovy-bom/3.0.14": { + "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" + }, + "org/codehaus/groovy/modules/http-builder#http-builder/0.7.1": { + "jar": "sha256-F655HdDwm1S3xUlqw+DQKOlxMMZQOTLLB3+dPuOVpEg=", + "pom": "sha256-MPA6uhfjkl0XGsRPB26L0lTuw0IhgW0EESO3K+l6Lkk=" + }, + "org/codehaus/plexus#plexus-utils/3.5.1": { + "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", + "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI=" + }, + "org/codehaus/plexus#plexus/10": { + "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { + "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" + }, + "org/gradle/toolchains#foojay-resolver/0.7.0": { + "jar": "sha256-k2crR0Cg/b+7W68INT24rpqbsl9rEKk8B4EmxxfbOsA=", + "module": "sha256-7WdGoJ8yv63bkLApECrmIybiSBKaaLdGYqSkM9VTFLg=", + "pom": "sha256-iCa8+5Iq8MIR5BPTmwgWWRPAgwZkE+BzDNgrLgsKie4=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.7.0": { + "pom": "sha256-yKRD4vrvh28zijkSM8IKka1bg/acHGuiDTmns5EGJAo=" + }, + "org/jdom#jdom2/2.0.6.1": { + "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", + "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-commons/9.4": { + "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=", + "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk=" + }, + "org/ow2/asm#asm-tree/9.4": { + "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", + "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" + }, + "org/ow2/asm#asm/9.4": { + "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", + "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.24": { + "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", + "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" + }, + "org/vafer#jdependency/2.8.0": { + "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=", + "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0=" + }, + "xerces#xercesImpl/2.9.1": { + "jar": "sha256-auVAp8hcgUrGS+pIAWs6b0XJXUdl9Uf8wAU9w2yU7Vw=", + "pom": "sha256-JGkAdY2p2Jst2FdWn8OceDGDBIFmgdyoK4S54m9Azkc=" + }, + "xml-apis#xml-apis/1.3.04": { + "jar": "sha256-1ASqiB65xfek+1RuhOoRUGzUF6crWXLojv8X9D+fimQ=", + "pom": "sha256-NaH9SdRLQcYW1IypkJejLvorZOGzc5+6xvvzbjw7V7E=" + }, + "xml-resolver#xml-resolver/1.2": { + "jar": "sha256-R9zeiYYBkxTveK5ygKlJc6IdLtlQdaQKAAtC2pVkKeE=", + "pom": "sha256-WB1eF4Pd17XaE2W3eNwS95ZxpDCddCIcT72TWYiYeps=" + } + }, + "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.4.14": { + "jar": "sha256-joMvcmPKYGrjbauy2LJML0PYLPY06B2tnRZA+m7jxZY=", + "pom": "sha256-r4qrpgYnomL9NllNmgMvUAGnB/BOhL3Jx7IxfR/hPL0=" + }, + "ch/qos/logback#logback-core/1.4.14": { + "jar": "sha256-+MLwX0JTCxhSc5UHwXkvAIAWeFDtjzlkRMaRPWYXopM=", + "pom": "sha256-XFBVktFPZqp/F3xpuTPkcE/R1pS2L5ST6peCbvVQAj0=" + }, + "ch/qos/logback#logback-parent/1.4.14": { + "pom": "sha256-5bddPe8EJ1dkUEoXp8GqHj7jcKWxpUiIS74Vfr3eXv0=" + }, + "ch/randelshofer#fastdoubleparser/0.8.0": { + "jar": "sha256-EP4oj9eiza9RdTMrc1Kfmr+P1U3P/zF9aWfAw1/7Ezs=", + "pom": "sha256-VWPl3UuwVHWfD4OFFgbZnSQm11wnNygUAnAF6S0cKqo=" + }, + "com/amazonaws#aws-java-sdk-batch/1.12.766": { + "jar": "sha256-F78YVNCV4Ijg2nQdL0cdl+wTetdLENGIZte7Mj40YKw=", + "pom": "sha256-xS6pzV5gFPcfVmn6SMpPiFzCsX2o2tO+lyOru/Bs/SU=" + }, + "com/amazonaws#aws-java-sdk-codecommit/1.12.766": { + "jar": "sha256-F2twu555Ujshdq73XYEAQbl5ZmORLrnpnyDmoFI7KEk=", + "pom": "sha256-4HU/47TiBcCd842OB1VomCi7Ra862ZraEahnSwxwbb0=" + }, + "com/amazonaws#aws-java-sdk-core/1.12.129": { + "jar": "sha256-gChkMWl8d7H1N5mLBP0kNcDPAJCjyXb+DCvD7cmV2wI=", + "pom": "sha256-PMW9SDO/u87EXdoeiD6BhM/4UmPujTt2aufU5igQc1w=" + }, + "com/amazonaws#aws-java-sdk-core/1.12.766": { + "jar": "sha256-rSOLnwug2Mvyx+xJdnB1LIksEU8fM1upKljjS9AmTMk=", + "pom": "sha256-j7FYgg8C9wI668Z2IRWV78acYCGx3FaEHCsvZCSKn/Y=" + }, + "com/amazonaws#aws-java-sdk-ec2/1.12.766": { + "jar": "sha256-ZBFv+empx4YHb3TkG4c2geIRMssLcTf9xhi086G17xM=", + "pom": "sha256-qrFIeGp9TUgi//cube8dCFKiTWO1Gde7Rlo7uB8p7b8=" + }, + "com/amazonaws#aws-java-sdk-ecs/1.12.766": { + "jar": "sha256-lja6aIkIyjbNA1o7dKwHOn1Ilc6j+SSWxzauHb2oruU=", + "pom": "sha256-9uRpdIPzwDd3aACWm0wKLVebhJXr2TMKJkCUCgXSt6I=" + }, + "com/amazonaws#aws-java-sdk-iam/1.12.766": { + "jar": "sha256-bJJpzEqIf6uEvYEsWmwDspO/PXY7b/fTEmYYtjRo94s=", + "pom": "sha256-uQcrkVP9kypjBLUBlPMVrPqNSvzMP5TvFpNPHa4ona8=" + }, + "com/amazonaws#aws-java-sdk-kms/1.12.129": { + "jar": "sha256-z+r7YwhGLaTr4m6IdKdLlzIaRBsmWoQq0WH3m3qA65o=", + "pom": "sha256-bb0LNTZq2L13T+ry0ep977p6ncLi9+I4a4Qs1EZKwX4=" + }, + "com/amazonaws#aws-java-sdk-kms/1.12.766": { + "jar": "sha256-igmYlAcAWnrjwwQKNZqLkjiT1ptRz/t2VrqFMSe70pY=", + "pom": "sha256-4SKxHYfOtJUtv6XMLNbU7QYNtYyT2Z9h99VYH5k+1eo=" + }, + "com/amazonaws#aws-java-sdk-logs/1.12.766": { + "jar": "sha256-uyXQqG9KZmDRHef1W7ulCHI9LsVNt1uMyobGo0EM0ek=", + "pom": "sha256-N6sw/Dg78zKMN4Ay6DW9bpUuJ82b8aRh+SV/zwL+DEs=" + }, + "com/amazonaws#aws-java-sdk-pom/1.12.129": { + "pom": "sha256-3d6dGQS42rlRwbSD3kIQGSHSj8oXLh46JH7IIi6SI/k=" + }, + "com/amazonaws#aws-java-sdk-pom/1.12.766": { + "pom": "sha256-wvk+tgX8XHJhG3dcuRf5cx2XaV/DX/r58MIFsnXKNa0=" + }, + "com/amazonaws#aws-java-sdk-s3/1.12.129": { + "jar": "sha256-RhIFflCWTBkn1vgsC+oBnoQz0ioCDAh0/qLQ/PAEy/E=", + "pom": "sha256-LMBKvouM0YvJ957HDYRUf3nZKV2MURyrcvYnRQWLum0=" + }, + "com/amazonaws#aws-java-sdk-s3/1.12.766": { + "jar": "sha256-PkL46g8NEEwwR10/MURrTCzK5VoHKu2p7eJfHqOw3xE=", + "pom": "sha256-aK/gwadp+KEYcF+NNqMEd16iGDoO80693AtOqjevy7A=" + }, + "com/amazonaws#aws-java-sdk-ses/1.12.766": { + "jar": "sha256-PSrkiYZ3habMCBpJzbYrUT3Xbjtpto7gxBDeGaGsZck=", + "pom": "sha256-1iHw8iFdRZYS4GIqtcY5KbBTLV8PPMQv97QJYxCBOEc=" + }, + "com/amazonaws#aws-java-sdk-sts/1.12.766": { + "jar": "sha256-oO7KbW8o5cft/r0oFobYcVUIQNQEnZVXGw6rEQlykPI=", + "pom": "sha256-sQSM4ZY/xmz4oSX/GMGgibjp0fPs5pPkRBVeJ4xeRPk=" + }, + "com/amazonaws#jmespath-java/1.12.129": { + "jar": "sha256-3g9Jjsdmj49Vs7W0BLCl66n3rVAx1u+IUlhXcaUfwI8=", + "pom": "sha256-Xnm4EyIb4wuEQ/lzIJDC4lhIGbSeVqhFXalgRMVTuOU=" + }, + "com/amazonaws#jmespath-java/1.12.766": { + "jar": "sha256-0A2gbcxfOCaHkbggSjs+1kz9j7UN7rvJPO2WKliIbMs=", + "pom": "sha256-ubu2Z/dwerV2rPSkqr0LbRjyfz9z0OJ2k31t5GCfHxE=" + }, + "com/azure#azure-client-sdk-parent/1.7.0": { + "pom": "sha256-wefnVlRCMD/1TD6GNXTreh9pIR2EX6Q1/thCgxNL0Uo=" + }, + "com/azure#azure-compute-batch/1.0.0-beta.2": { + "jar": "sha256-CQZNwcpPaclferr2YMEZokFibqaxF7rXMJYWF/8XH1g=", + "pom": "sha256-r6eMiunlnpEsamWFkshKzcydbGJnnE4apvr6XlKSFXE=" + }, + "com/azure#azure-core-http-netty/1.15.1": { + "jar": "sha256-4HACg1NkxnqSZ/0BnuEBncnqhlSRtrHU+bjIgJ/Buuc=", + "pom": "sha256-TgEbfCTrrciGEuyWa/DymFEE0OZKKlMnDl68OXKg4P4=" + }, + "com/azure#azure-core/1.49.1": { + "jar": "sha256-QgHYKyJ4IdENQG01PuHZdmTman9pJH1FTkyLcNp1OsY=", + "pom": "sha256-vEBXQbRgrabKwjC9DEPOH6L+jRjiUgAJHn/m+BkZiC4=" + }, + "com/azure#azure-identity/1.11.3": { + "jar": "sha256-NAhaWYJi6IqmJY13jTuEy+iTTrL4nrQILW9GFLSHdys=", + "pom": "sha256-uIRH+CM3ObxvOpCmW/K0iT0vu4glN2Ih9SR08F0uero=" + }, + "com/azure#azure-json/1.1.0": { + "jar": "sha256-EUr5sUWcnJMZCyqC9CfA6T+7soiW/FfyWFqbghJ1ylY=", + "pom": "sha256-r0x8HbDY0wxNUMlc04fLhD0aFl8Rw5a+vQlks5MjhAA=" + }, + "com/azure#azure-sdk-parent/1.6.0": { + "pom": "sha256-mDP57zl7whd1s4m+gWtWpomRiCIKJa0qQ4mwk2UDnJY=" + }, + "com/azure#azure-storage-blob/12.26.1": { + "jar": "sha256-k0W8riyacns7zitxX6pITKoPMZWqy8lXej3QVawc3h4=", + "pom": "sha256-Wr8eREEdeJoxt30wn8Ydssrv2DDuwBqQoAfwwgj9lhM=" + }, + "com/azure#azure-storage-common/12.25.1": { + "jar": "sha256-6XvwhWFyZEStcVkXeSkylcjV2L2dXPJxj2zpSRMRfkI=", + "pom": "sha256-7RARpdl8nsjhK+GUQ9wfvupMs0GQS4ujWjsLfDnvplY=" + }, + "com/azure#azure-storage-internal-avro/12.11.1": { + "jar": "sha256-9mhikjq89fZS08LKBp67zvuyRMp054v3NLlriTMIdjE=", + "pom": "sha256-yk7+M3vfdHVChlu3P1canMBEdZC4gug8I173nOPTOmQ=" + }, + "com/azure#azure-xml/1.0.0": { + "jar": "sha256-Q4uQ62+O+njgbv2hMuzXWStvtFHMcRC98gKqF9FqPac=", + "pom": "sha256-gbHQs1PRMgnSgAFqyiw90RjFZB9I6QtBZ4rC3dmL5DQ=" + }, + "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/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml#oss-parent/41": { + "pom": "sha256-r2UPpN1AC8V2kyC87wjtk4E/NJyr6CE9RprK+72UXYo=" + }, + "com/fasterxml#oss-parent/43": { + "pom": "sha256-5VhcwcNwebLjgXqJl5RXNvFYgxhE1Z0OTTpFsnYR+SY=" + }, + "com/fasterxml#oss-parent/45": { + "pom": "sha256-8AXsCuN62UoNBg2Lo7eeZllRD7tepeRkw1jZHDPDwXs=" + }, + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-base/2.12.3": { + "pom": "sha256-akozb3kyLR9Q5XDa48U1QaOAc57Ypq1Ww+YJsyGSu1c=" + }, + "com/fasterxml/jackson#jackson-base/2.12.6": { + "pom": "sha256-cZmfWXUi5fUOtBR07iy+K5mRZRki7ooJDgC4dC3oyaY=" + }, + "com/fasterxml/jackson#jackson-base/2.12.7": { + "pom": "sha256-F55U/ibI1N/pJf7jHUqH0cwl+LfgCUik5laxIp4rdq4=" + }, + "com/fasterxml/jackson#jackson-base/2.13.3": { + "pom": "sha256-ctZykYdsY+GJa8fY/3mQM9OkuQKQIBEEiK+clzFe2Tk=" + }, + "com/fasterxml/jackson#jackson-base/2.13.5": { + "pom": "sha256-8uQSGN1QuSzkmDxdLAQgndYc0eAPwSXjYAqp6vRQHeo=" + }, + "com/fasterxml/jackson#jackson-base/2.15.0": { + "pom": "sha256-UkKWvt4yGFrBEBLwfZJG44wZJTwrUT8c8oeZEho053A=" + }, + "com/fasterxml/jackson#jackson-base/2.17.1": { + "pom": "sha256-4K78YdOPzd2VX/7sAbt1EE8bv/+jpuy1jb50r7cV4yI=" + }, + "com/fasterxml/jackson#jackson-bom/2.12.3": { + "pom": "sha256-UFExBQ2LXUqBTyfzK8Q5GHsauGPWWH1JbrpMuozA4Co=" + }, + "com/fasterxml/jackson#jackson-bom/2.12.6": { + "pom": "sha256-E2EHjtiug+qn6GDRZDiSSf83Qszf7yXKMySN/WLlU0I=" + }, + "com/fasterxml/jackson#jackson-bom/2.12.7": { + "pom": "sha256-GVVDL22K8ygG2C2CGP7f5L47s+I9WadNgUSf/HS/e9E=" + }, + "com/fasterxml/jackson#jackson-bom/2.13.3": { + "pom": "sha256-32dbg7bKunYC+0fXXUu1E8KvTAphVdfjl8DsDzQRLHU=" + }, + "com/fasterxml/jackson#jackson-bom/2.13.5": { + "pom": "sha256-Cia280q5P5z6gBeYiMa/Ql8cF9zZwR22VhOTkw/bdGo=" + }, + "com/fasterxml/jackson#jackson-bom/2.15.0": { + "pom": "sha256-4AwuhiKc2Wh5RpGukO7hWwjE1PV0jJs0u0ItcTRG3ZU=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.1": { + "pom": "sha256-n0RhIo4SkQPu16MC3BABqy5Mgt086pFcKn27jMYe/SU=" + }, + "com/fasterxml/jackson#jackson-parent/2.12": { + "pom": "sha256-YqocFnmt4J8XPb8bbDLTXFXnWAAjj9XkjxOqQzfAh1s=" + }, + "com/fasterxml/jackson#jackson-parent/2.13": { + "pom": "sha256-K7qJl4Fyrx7/y00UPQmSGj8wgspNzxIrHe2Yv1WyrVc=" + }, + "com/fasterxml/jackson#jackson-parent/2.15": { + "pom": "sha256-bN+XvGbzifY+NoUNL1UtEhZoj45aWHJ9P2qY7fhnXN4=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.12.3": { + "jar": "sha256-BdoKJbtEoheICimaGh4KMB0ZS1ZWqaB3drd6iPMm5+k=", + "module": "sha256-adbNxIKRVdrTyRUAq8rO/+97F+HiuxdeOmkBqMpQicc=", + "pom": "sha256-i4EAksOztjfQTbb53LnEQNymAfwoLSWGzTdR6PkYjuI=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.12.7": { + "jar": "sha256-PKzvcUqJ89aLafoRJjr6VaaqL97x//k97SLKoWtUaHw=", + "module": "sha256-udQUijW0OBPvz4AbJj7+jpyvHXWfbT6c/xIXrUs0uRQ=", + "pom": "sha256-u7b3aEXxQjrbJwnPw2M4OlKR/Blf407OEoYn/j9Z/dA=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.13.5": { + "jar": "sha256-gK6o7XIy21BAztSz+YLynalbs9gCND2/b9gszZjCHE8=", + "module": "sha256-V1RHbNv+Hc5wH/QUQ7FHQSL+5TEHgMnRbEoK/vlzvZQ=", + "pom": "sha256-RtVrd+RUf6R9Iq5EvJXgww76KFW56qsZ9TSfv+TAZMo=" + }, + "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.17.1": { + "jar": "sha256-/MrYLhMXLA5DhNtxV3IZybhjHAgg9LGNqqVwFvtmHHY=", + "module": "sha256-VNTVHaATppa+CeH0gDH39At3cYB4qpNuZMAjpP2blZM=", + "pom": "sha256-c1XzdEX12vUPUMdfLrzXG6LE+86ktiVBSAWexjVkTnc=" + }, + "com/fasterxml/jackson/core#jackson-core/2.12.3": { + "jar": "sha256-uu80+84EHVTzrz/0/JF+2LQ+0qb6MOCmq/2aKyw/ceA=", + "module": "sha256-pPykmRpxVhYcCjR3J0Y15QweIcwIo4WtTAimr2wrM4Q=", + "pom": "sha256-9DB/oy7KXJLxvk6lNWvLWxlxGNrzUyUBQpL7YmHeNs4=" + }, + "com/fasterxml/jackson/core#jackson-core/2.12.6": { + "module": "sha256-shNzadZQAawxsaxCO2KZrJ+EqTpNaAU9XABZfNezyTU=", + "pom": "sha256-PYtkMW44Q53m4PFBMebX1Y106STwPTE7PNgpKpZqoBA=" + }, + "com/fasterxml/jackson/core#jackson-core/2.12.7": { + "jar": "sha256-OYemozUEbiJuVrgdaWaPtakbFV6n/ZawhRrbt9SsHKY=", + "module": "sha256-B0jdOm9PbdgkSwkZ8RQPWw9oQm8LCkq2n7z1au+XnKw=", + "pom": "sha256-hmQUWI/gqPtzQbqph/b+4FZxuYWeKMMstjvFKfQqY6k=" + }, + "com/fasterxml/jackson/core#jackson-core/2.13.3": { + "jar": "sha256-qxGajqPMaUcuvA6HC4Sb+75TatV9YT3DhFPM1ZLKaj0=", + "module": "sha256-7KKsTR1nron0PmOQ/Ly/FjP9jDoaSWjZMhTr5YJfYeM=", + "pom": "sha256-PTyORDm/LbQ3YKYSB9/JV62ZpZt1LMhHaZC0neAM3vw=" + }, + "com/fasterxml/jackson/core#jackson-core/2.13.5": { + "jar": "sha256-SPNqAlMR0EZK2N2kUSogx54nmpVQ9j8xedcx2USCR0s=", + "module": "sha256-YmbmBIr3l7vrRuWx8bmjgyONWSjUD/ExgZkEUgGsMtk=", + "pom": "sha256-rZGrYCXrSK4yYigMQu/rtXtw0lwAqwppxaPHyjqAeO4=" + }, + "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.17.1": { + "jar": "sha256-3bJsih8ahFNeghPEizWyUzcENOMoezzxV3eFb8TljOY=", + "module": "sha256-iowJZP38Js7bso2CXfRiGBf7jNIrnnpZ2cdKOl8b3R0=", + "pom": "sha256-2UiDEgmgTAE5G5Oq7nrTShyelIY/nnaFwvW2FJoqs50=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.12.3": { + "jar": "sha256-lNlzBiwv2j3/LJqF6vzlcgSCHM6QhamTd2k9vJ+42iM=", + "module": "sha256-XUGfgFCnfmlIcaUGX118rIqG3mNIIvlZGMU+usrVn20=", + "pom": "sha256-2v+kjFvS56C/fjUrsBzGbbrp8zEfQr+i2TJM+3VYt24=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.12.7.1": { + "module": "sha256-00wrIwGY2LLTmirRRxDWySJxwHhIxDKkDh1HFZSiKaY=", + "pom": "sha256-BXeRSYclRKUn7oo4VYqRcJeVMvSAb0/jz4k6EHaKj7I=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.12.7.2": { + "jar": "sha256-17Kqko+i4nWUYJzS6MMjBAtzgS6IRK+fgqYwvEdI0UE=", + "module": "sha256-X4qn4nRIcMkFvc3zuELR2Eigbf8WVpfDTZkgU6wW/KA=", + "pom": "sha256-rp52wD2JPdYCziKQsyxiGq2N7fuohLXUN2gN0dTYw5Y=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.13.5": { + "jar": "sha256-X+2ySyNWSRgV0YJn9l2poh3WdBM0Wtd5XyIa+iXHiYQ=", + "module": "sha256-HQzgnWo05MaImApbbjp/xKrhFFid9Eqa7Jf2ERrYXfI=", + "pom": "sha256-rhoE1XeQ6usGKh+iIGOraM7JCgMLc94tiasFIfJGVr4=" + }, + "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.17.1": { + "jar": "sha256-tsovfVsaskXOxUlewzl3PS2QVUxIWSWQZz+xj0QAqUg=", + "module": "sha256-C6vGRqBi8NnTWEQCpQJxiE7cPhekGULB4x4OENcdvuY=", + "pom": "sha256-YKCKmGrDE60+MmiKTjJ6YSg6ioAa1vphV5+MS+bcj2w=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-cbor/2.12.3": { + "jar": "sha256-MUjUrO0/SLAovcMvtjs4RRpqdxaRjHYof5wOUi/AXc0=", + "module": "sha256-ALNtzmtZv62AjCeEo4fSsaaCV+94mBdYdCGxvpeSgFw=", + "pom": "sha256-Ub5jSLkUMCP1YMbygzzYJmNhfnw8k1J1JPOmkhyLafE=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-cbor/2.12.6": { + "module": "sha256-SpqXn3cK9t1UvLPABXJAFXERtfp+L7J99tfYBWBW0Go=", + "pom": "sha256-ha9YnMuV1fQ1t/O5iVv07lyi6ZXfsyq/R2encs0cmrI=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-cbor/2.12.7": { + "jar": "sha256-FNFmKcc6wVMJ2ylhU5SKxQgrJzW4H4XNv/vXGKOLucw=", + "module": "sha256-O6o3lB9Cm7QTtyIFRtqD+1kNoYQCLuH6b2INukBSogo=", + "pom": "sha256-CtKwpN8bXVY3UrcncYNb/YAOV3tiQ9xPKtEEuZgpR0Y=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.13.5": { + "jar": "sha256-V2ap1UOpsuFjcR3lC6ewgxJe4k7ZIJR9L+G1+hdgj00=", + "module": "sha256-jc9kVq6Dx0S8m11j3+oxOtJEKHyoXhtQ99q+/WKhrbU=", + "pom": "sha256-wTNipB0iiQycW+DOahGguBFP8uqd9UXtfCmgnUyytBA=" + }, + "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.17.1": { + "jar": "sha256-g/OEWVk7wQyusfomU2FoE7F0O2vtZxY8iujlpNMqVFY=", + "module": "sha256-ZqzfpBLUKx6hSKK2aMxot11oT53nmfQ2ucsDNKCVgUw=", + "pom": "sha256-rao4VC33yRqfUlmdv2CLM3GHn5V0f6Ytn8+E6p4Qz5o=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.12.3": { + "pom": "sha256-7upA7Zns28Zx4VP8Q7O+lRi6A6TwFCHNKiZir5fyhFE=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.12.6": { + "pom": "sha256-uAAxuMuWG3O1yzWnxyD19gRMLsUn/fw0HnE8/KGZfAg=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.12.7": { + "pom": "sha256-JJvc26/70Soi2Om1Ms/J46zJtyYDJbHDw+WY5n02gCA=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.0": { + "pom": "sha256-gSCm1xgjiInHQlDqUjfpdFKrv7YDRzluM4+ReZVKxyY=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.1": { + "pom": "sha256-BIg/YsynqSsV2XvXb8zePjCCwY7LBJSUOyILrioLhys=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.13.5": { + "jar": "sha256-7xXO3d3FjfvWhra3/QhT7TKP8Ixii9SjlXNL7CDKhXs=", + "module": "sha256-xO6k314TZO0p8BDUoDffcWWydfDAIdkfb1q9isD5IKc=", + "pom": "sha256-niBiIkjdUnZ/9vd4Z5BdfmVSNEPm4ALmuAvDmoVHE54=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.13.5": { + "pom": "sha256-hg2LWRRPDSDOqtPIBztQbEKkrkjrpPu7El6fc+dj4fs=" + }, + "com/fasterxml/woodstox#woodstox-core/6.4.0": { + "jar": "sha256-1uufL0AEmnqAi68R/7oHN2SOYv9S/eknHYCOXVeicnk=", + "pom": "sha256-YoFIIdsM2+xEwe1ZF+b2ZFLRzI3YmVYYeCdf19UiDnk=" + }, + "com/github/javaparser#javaparser-core/3.25.8": { + "jar": "sha256-OsLEKiNMHuQ6VbwikRk03dU3u6eJMSZdBy7TTCKwbZY=", + "pom": "sha256-ZRsNqsBbjKdFWa1Clt3OTV2Bs7PVZUdGRHkQshn98VM=" + }, + "com/github/javaparser#javaparser-core/3.26.1": { + "jar": "sha256-Z4Gv6Ce1H24dK0sBcXd/5vFNxWveFdfLti2IF2xLeV8=", + "pom": "sha256-zX+Uc0Bz/Ds1IOwRFsqS/jooHsfMGHUAJcTu7iu+OLA=" + }, + "com/github/javaparser#javaparser-parent/3.25.8": { + "pom": "sha256-GCe9gajuRIAfZInUHzUEuzXA70ZdsYysmVZ+A40eYes=" + }, + "com/github/javaparser#javaparser-parent/3.26.1": { + "pom": "sha256-9cwLLUUycDokUwpeSvfFS07/ohpqbLO773F6M6pioVo=" + }, + "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/android#annotations/4.1.1.4": { + "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=", + "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng=" + }, + "com/google/api#api-common/2.19.0": { + "jar": "sha256-41xEttmwW84SRrvCqd8f60z7lqvWhDWro9E6YrJt0+0=", + "pom": "sha256-ODqOaljR+o6A47FvGFnikApXJe/L7udSrz+f+gyRPPQ=" + }, + "com/google/api#gapic-generator-java-pom-parent/2.28.0": { + "pom": "sha256-h5ZzCFWQ3Jkr3b55K1H/Uh+IpdcFM9/0kmwRZhfndB8=" + }, + "com/google/api#gax-bom/2.16.0": { + "pom": "sha256-ZB7oExWRLww+CFR+uoidNclsxQMNTB4NY8+E3roTAvU=" + }, + "com/google/api#gax-bom/2.18.2": { + "pom": "sha256-r2AyOcudIAnDrhXGF7T+44zl2TOi4ms4pCnJWwaoxis=" + }, + "com/google/api#gax-grpc/2.36.0": { + "jar": "sha256-MIk+PHzR5yWvlUHKgeTXdcUOjJM1uKEwT+m7TKBtaow=", + "pom": "sha256-GpgNJUUdYpXn1bfMAyYUCZpqoKBW5ZMzqtzXYD035dc=" + }, + "com/google/api#gax-httpjson/2.36.0": { + "jar": "sha256-WDOX3+1kiM+XzqirclKHoYDdZxNif76BGUrRK4I37a4=", + "pom": "sha256-sAOCCcAYvB1IJG74nd48MxpLNZOic6sF08UgWr1wiNg=" + }, + "com/google/api#gax-parent/2.36.0": { + "pom": "sha256-aatj69gK0uP+pA0zjLZLG6xIV20HOnkaPtPCThtNqf4=" + }, + "com/google/api#gax/2.36.0": { + "jar": "sha256-Qggv2wWbZWcY3L/NUK+YB+OAyM/cp7G2WQcP76S2hp0=", + "pom": "sha256-TsCcg3Vh0UD7RUAqDOk63ewydTT45CvCvDZ/UgiCRT4=" + }, + "com/google/api-client#google-api-client-bom/1.34.0": { + "pom": "sha256-gNGNvJ+qZmPEow0Du5brxNOpOcEVzLK8YZBP5oRtnTc=" + }, + "com/google/api-client#google-api-client-bom/1.35.1": { + "pom": "sha256-DKmnRNffswL62MCX/JA86xochDPsj/s/rbv5jHBku8o=" + }, + "com/google/api-client#google-api-client-parent/1.31.5": { + "pom": "sha256-P4Vy+wW2Z6eIaP/ezo3FBwPyxNeq2/vcPWRPL52SuhE=" + }, + "com/google/api-client#google-api-client-parent/1.35.1": { + "pom": "sha256-vet2hSU6vrByAiil5wI/EWgB2Q6pe+rmuO1luHT1FOc=" + }, + "com/google/api-client#google-api-client/1.31.5": { + "pom": "sha256-ohJXbClVH+/hccZNKTUuziHSuo3wwjelqtcMJ6lvDPo=" + }, + "com/google/api-client#google-api-client/1.35.1": { + "jar": "sha256-JHFK3QwCSHMKDnBUSLvJGlxo28Dcn3+gyXNmvHsnXiM=", + "pom": "sha256-tAXEfdfjXC9whUD/0v3jV3MuKqwsRgAQmDSK+WJRHtQ=" + }, + "com/google/api/grpc#grpc-google-common-protos/2.27.0": { + "jar": "sha256-q55IuMXaJg2lk5/V1H+UZ/t7vBqu1kmbaHsouFhkxW4=", + "pom": "sha256-O49slfJdD84wux4Mq0Ze2BlMwZW9nEWT59rPbsSsF5E=" + }, + "com/google/api/grpc#grpc-google-iam-v1/1.22.0": { + "jar": "sha256-FxAzS2VdIlWLJOY8lSt4n6mq67YXOIoIIflwdYChxq0=", + "pom": "sha256-ROalgBy39MxifjUuiyy+QTODJujqllkQXfSdy9turMA=" + }, + "com/google/api/grpc#proto-google-cloud-batch-v1/0.29.0": { + "jar": "sha256-ebNU1wYqlTrCePDSRUauntgR2HtZttGo+DgjuajByGs=", + "pom": "sha256-2I6/vji0IjPLcYJ3BEjWhLfJ411haCtNQQ/MDdyky0M=" + }, + "com/google/api/grpc#proto-google-cloud-batch-v1alpha/0.29.0": { + "jar": "sha256-8QxjZ0oGT82z3pfo7eUdxNWQqQHtW5kOUhD7T/gtXV4=", + "pom": "sha256-t4rrn68elvTjIEgYo0XqQjXwYS2D2opc0BMB/RcdQl4=" + }, + "com/google/api/grpc#proto-google-cloud-logging-v2/0.97.0": { + "jar": "sha256-txPG6Eq4tlt+r4NaF9C5g2MpRORrSpUBhRlYOKmFYAI=", + "pom": "sha256-tBGry/UY49mkQnDTncyoSmJVaeuCAjWkxO3v3WZJkDo=" + }, + "com/google/api/grpc#proto-google-common-protos/2.27.0": { + "jar": "sha256-S4y6+sn8nJDky5QN6GdspsgppoCCae4NLIWflDWSleg=", + "pom": "sha256-xknM8ar9+wc7ie5U7OIFdhWz4t+hyC7Ew/F5WcLIHIY=" + }, + "com/google/api/grpc#proto-google-iam-v1/1.22.0": { + "jar": "sha256-cG9Ypt/CBXJt0X//4cWBpEASUwEBUsCcn/+kll2/9gs=", + "pom": "sha256-5rSJv1KgMtmn6IhTmjvRoQjveCb7inViRnCG00IQrp0=" + }, + "com/google/apis#google-api-services-lifesciences/v2beta-rev20210527-1.31.5": { + "jar": "sha256-07JM/uqlousFv0zdzoVBHykptAgJZPtAY0tZQT+2inM=", + "pom": "sha256-zmT15UQnpPTDP1VC0g6LtTvDJ94r59HAjNQXMNgYPaE=" + }, + "com/google/apis#google-api-services-storage/v1-rev20220705-1.32.1": { + "jar": "sha256-UURs8Dc/Ga/BsHud118lTfypF6SDPfs7rGGyytVMNAA=", + "pom": "sha256-hRinzzDnHywiidPr1imxKWgA0GO80h1d6On506BO2vA=" + }, + "com/google/auth#google-auth-library-bom/1.20.0": { + "pom": "sha256-Un6FdQkASvKKQrOJk4h5DVyc0GnYo9h/RDrosMidUMo=" + }, + "com/google/auth#google-auth-library-bom/1.6.0": { + "pom": "sha256-3/SPlJaUr5S1iR6ZwtJQFrvPmNnMLp9a5k2FRNt8Agw=" + }, + "com/google/auth#google-auth-library-bom/1.7.0": { + "pom": "sha256-mGXnVfY6Furi9ZifhaC4CPtJ0mrY14l3y5MJ5+01C2M=" + }, + "com/google/auth#google-auth-library-credentials/0.18.0": { + "pom": "sha256-1uOsTj5a239g0iiwxBPH0ROJOL2uLJ8Ny+63qwWFRtw=" + }, + "com/google/auth#google-auth-library-credentials/1.20.0": { + "jar": "sha256-swVNh1eAf4r4AVtTX7KI7WdFZESSIhHw+Sn0wE5psLc=", + "pom": "sha256-IxVpUaNPq0mdBfG11MxaH1jfQIQsipGSQTl067L6rjI=" + }, + "com/google/auth#google-auth-library-oauth2-http/0.18.0": { + "pom": "sha256-aA5St0/ipZqbzIrKBgVJwnARHyjgQ/5NcmOf2ZEJsSk=" + }, + "com/google/auth#google-auth-library-oauth2-http/1.20.0": { + "jar": "sha256-qz7nTuzLEvykD0REr01F354pDyw/R1HoVWl97fUvenM=", + "pom": "sha256-BTiQjFiJ8NQDkiQDc36KQRO/8Gqry92uF756QaZQpAo=" + }, + "com/google/auth#google-auth-library-parent/0.18.0": { + "pom": "sha256-k27cyiHscyCtyJ4MWLxP6hIvapxUo9Ks8zBOuxY0c6M=" + }, + "com/google/auth#google-auth-library-parent/1.20.0": { + "pom": "sha256-UAY9yTe0V6AVHd2d6VWN6LmSmMkJ4b7PIJpj7vynDac=" + }, + "com/google/auto/value#auto-value-annotations/1.10.4": { + "jar": "sha256-4cRea+ra75eXyw2a/VpFYhrQYc2GMgEvhVgoU6OIeCU=", + "pom": "sha256-c6W4UV+F+IxAiff/SkPNF5Wkgf2rk/qQULE8+hqNJfc=" + }, + "com/google/auto/value#auto-value-annotations/1.6.6": { + "pom": "sha256-fFq7v2pJx8Qme+A2RAowcdCqNwrxQIJ1yB42FEyP/AM=" + }, + "com/google/auto/value#auto-value-parent/1.10.4": { + "pom": "sha256-vsOhnk3ci2QGZyMzzFBbngy2s1WLskIxSGm7bh1ojTA=" + }, + "com/google/auto/value#auto-value-parent/1.6.6": { + "pom": "sha256-6CnzniFqfhjpocYftjqO2KanIpvEqgwEKhClMCSQlD4=" + }, + "com/google/cloud#first-party-dependencies/2.13.0": { + "pom": "sha256-nB52x1eaPypjdPz0vlEpbyGzt1BwMwmv+294tE2gxeE=" + }, + "com/google/cloud#google-cloud-batch/0.29.0": { + "jar": "sha256-9WOhEhZgH7kdddK8OxAI23xrgzyjbZV8Cdjkk3XV9dg=", + "pom": "sha256-6gM7H2dln6VW51GDlItsGSgm/iTDCUIAqNJpHigiSLk=" + }, + "com/google/cloud#google-cloud-core-bom/2.8.0": { + "pom": "sha256-0pSClODskgLMKPg0EJI4NfjkO9aQbiaId2ucfDFS1aE=" + }, + "com/google/cloud#google-cloud-core-grpc/2.6.0": { + "jar": "sha256-k9ks7mEwpSgzFCra+TCjCf7xmEvydORL3qDHl3/i6Cw=", + "pom": "sha256-CccR+kIkEDDI6QYj2s4/qFGxV0H6COyw0MuXKH+ABRs=" + }, + "com/google/cloud#google-cloud-core-http/2.8.0": { + "jar": "sha256-4ILfXafvo2Dgw4nqPx1+Kdu1B3ydEnnBhK0FrOcTT7o=", + "pom": "sha256-hho0yWWEsocdqxd9jB6FAME0fSbJ2OGYsLxcFCe6LDM=" + }, + "com/google/cloud#google-cloud-core-parent/2.6.0": { + "pom": "sha256-WgWI1WVv8sgFtjAVGbQXq6DiCwO1vZYpK78xtBa2sCM=" + }, + "com/google/cloud#google-cloud-core-parent/2.8.0": { + "pom": "sha256-rM3e/8uuRwQE7Kw/7HVF3UombVsCi96gXXILpIPB4Gs=" + }, + "com/google/cloud#google-cloud-core/2.6.0": { + "pom": "sha256-+4ThumRLM54AH97ml+TQX0Ag06LAMK2ZsH3q0o+bwHA=" + }, + "com/google/cloud#google-cloud-core/2.8.0": { + "jar": "sha256-OYayK0nZFiEC5/Lk8pnfEIv28o6hzgY+NfM6tghjzbQ=", + "pom": "sha256-NPQso7VDVBY1xcDnR5gr7TTRsJgb7zkk4gxDDs7vkJU=" + }, + "com/google/cloud#google-cloud-logging/3.8.0": { + "jar": "sha256-eauSWxuKzTl9uGQPHoE8CNRTj8lTKTREQWVY7yO+sts=", + "pom": "sha256-Lsw/jIzS1dDVTep2PkIMQ/FmiwumEEiu4US+kNQSObM=" + }, + "com/google/cloud#google-cloud-nio-parent/0.124.8": { + "pom": "sha256-rC/p26d3pZK1UhbnTOouDUgiTlEsRMFHnhdyyZdtHzo=" + }, + "com/google/cloud#google-cloud-nio/0.124.8": { + "jar": "sha256-uxtshcFif5fUSGHZR8NRIfA8Y9SQ9PwMLOG68K9QDHY=", + "pom": "sha256-9SHkEQR3vfTyLiUn4rycAWEWFdtnmNpt69ojbn0JQ18=" + }, + "com/google/cloud#google-cloud-shared-config/1.3.2": { + "pom": "sha256-d062OMvm8NbWQNau3dE8WcZROHIhSre6gEgzrxxY0I8=" + }, + "com/google/cloud#google-cloud-shared-config/1.5.0": { + "pom": "sha256-M7okd43AbDxH3XPYFS/B2nv8ClXHgXw3j566X/y7OTI=" + }, + "com/google/cloud#google-cloud-shared-config/1.5.1": { + "pom": "sha256-ZGKcKLfQLRBlutTKZ3UiP6rFpuVXbSuAZeWyvZ7daI8=" + }, + "com/google/cloud#google-cloud-shared-config/1.6.0": { + "pom": "sha256-P+482RNWJC5ggjxaVVReUrjmV5YPQuxgGhQfURtZPcM=" + }, + "com/google/cloud#google-cloud-shared-dependencies/2.13.0": { + "pom": "sha256-YiBBDWubno4HyicrTLm1t146tl+Ra/SezQxduC6sLIE=" + }, + "com/google/cloud#google-cloud-storage/2.9.3": { + "jar": "sha256-1EtTaLH1mvO2AtLXDD4gmQW0dovErTEGdlLzPxk2hAM=", + "pom": "sha256-o9UYW6GHjGzZM2g6JEZ6PSSz8W9CkemjEtMX1HZdeL4=" + }, + "com/google/cloud#third-party-dependencies/2.13.0": { + "pom": "sha256-uPtfVA8hAIRcsngkgMy7FR+h4D8BO0fY0yEDzyftLuI=" + }, + "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/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/errorprone#error_prone_annotations/2.22.0": { + "jar": "sha256-gqAnuGVB9Y0fnuAgzfa+voKsx6Jn08U6LqXNYzWTK70=", + "pom": "sha256-tyXFIVFBaOnCDTcZp2qgG1DlpygoWfTqhMJRz5+EIIA=" + }, + "com/google/errorprone#error_prone_annotations/2.23.0": { + "jar": "sha256-7G858Gi2/5rDI8aOKLkpn4wKgMpRLcyx1KcPQKw+wFQ=", + "pom": "sha256-1auxfyMbY78Ak1j6ZAKBt0SBDLlYflmUl3g0lZwH29g=" + }, + "com/google/errorprone#error_prone_parent/2.22.0": { + "pom": "sha256-XSUivqg99aWBzNayJ2Nco04NOXt2ct50ispBVwgFc8c=" + }, + "com/google/errorprone#error_prone_parent/2.23.0": { + "pom": "sha256-9UcKSzEE/jCfvpSoDRbDxU0g90j0xd5PaKQoaI8wy9Q=" + }, + "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-bom/31.1-jre": { + "pom": "sha256-oRnYiA5WquiLFvM8gFLk1uZJoi4Xjzkd7zsvsfShKeY=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/28.1-android": { + "pom": "sha256-+K/LQ/0kw7YibkCL25zsVpFzcVpMLIAXPMrt2E4VGJE=" + }, + "com/google/guava#guava-parent/32.1.2-jre": { + "pom": "sha256-iOnLAHM1q1/bMUpuPJh3NOwjCMmgY/90fHRpGJ0Kkr8=" + }, + "com/google/guava#guava-parent/33.0.0-jre": { + "pom": "sha256-BAzIjGgLQT1wup/INxs2CTAhsQmWqjWYYh3nZ9QYIpo=" + }, + "com/google/guava#guava/28.1-android": { + "pom": "sha256-AZa+urqiZWDxCO6xBNYph62L6mB9mxPto/Aoa3ZdbqY=" + }, + "com/google/guava#guava/32.1.2-jre": { + "jar": "sha256-vGXep8/Z5NrPhBnYrw50FlWFfSeIW7NdlD1xh/w6j84=", + "module": "sha256-5Azwhc7QWrGPnJTnx7wZfhzbaVvJOa/DRKskwUFNbH4=", + "pom": "sha256-PyCFltceCDmyU6SQr0mjbvf9tFG+kKQqsd+els/TFmA=" + }, + "com/google/guava#guava/33.0.0-jre": { + "jar": "sha256-9NhcPk1BFpQzfLhzq+oJskK2ZLsBMyC+YQUyfEWZFTc=", + "module": "sha256-WaLb0FXRuqdi548aW6Orlz7dE/wn3MGHEQXi95f2gtM=", + "pom": "sha256-/XCxTEQZhsIubSLO0ldnh3Vr5JGLFFqKvSI+OoC24y0=" + }, + "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.42.0": { + "jar": "sha256-H8SWQja2fPPFZR16wd/2aPc7eBDH8dwIYqDlvAFgh4U=", + "pom": "sha256-3v1ITpfzPeHmMvSDRDYnQHbUKyvSbb6D5Ep4X+3pO9c=" + }, + "com/google/http-client#google-http-client-appengine/1.42.0": { + "jar": "sha256-dlkcCMLrAkQy3Kv4HTP0QPv1yLC25aE3Z8cDTQtcios=", + "pom": "sha256-ZP7RbImFSRGvQWiYTyHtpU1LBskNMkLWxtBJtfBYee4=" + }, + "com/google/http-client#google-http-client-bom/1.32.1": { + "pom": "sha256-1XrIp95S0zwXNLvcveJrOkjVHmLCyTJsTVTLmxR+H0M=" + }, + "com/google/http-client#google-http-client-bom/1.39.2": { + "pom": "sha256-l/nYCnyC3uSbVE5IiJAzbgz2oZ3EU/EcG9aFm8qVags=" + }, + "com/google/http-client#google-http-client-bom/1.41.7": { + "pom": "sha256-oWdHl+UGkrxuzMF7MYQ/QNSWfYVGqwDUr+LAGOHm/hY=" + }, + "com/google/http-client#google-http-client-bom/1.42.0": { + "pom": "sha256-mP9hZSXmP9BhMiFZAVOOI/9nrtuJNM0l3FkkjwzAU4w=" + }, + "com/google/http-client#google-http-client-bom/1.43.3": { + "pom": "sha256-K9C6F9zatcBDtHXQR3XKphHUINxWEIsY402T0nmwJrk=" + }, + "com/google/http-client#google-http-client-gson/1.43.3": { + "jar": "sha256-4xpO3LnIOVSiWH4U+i8/j0qtVhUjgbMyGjvQvK4D+iY=", + "pom": "sha256-KyAU+fZJiplSKUvW9zyLUfd5ZqXs7RICm/09tnarcPk=" + }, + "com/google/http-client#google-http-client-jackson2/1.32.1": { + "pom": "sha256-f+FwIDjrVANkfdf3UrmMU+RF+laF5l7CzNc+0dQpf7s=" + }, + "com/google/http-client#google-http-client-jackson2/1.42.0": { + "jar": "sha256-MG0sVsR1ATU05k7TutAyAToHggrqHyP+3oaFUr2xgHE=", + "pom": "sha256-kEXZ+CMJtcalvNgoLv70vkZzWlzPv/LDkEbjnc9txaI=" + }, + "com/google/http-client#google-http-client-parent/1.32.1": { + "pom": "sha256-bkiHJ8hJaA5YUwJ9GfWbt1wi3iNLvawX2BVd8MdrQDE=" + }, + "com/google/http-client#google-http-client-parent/1.42.0": { + "pom": "sha256-MHiW91y5Uj6NSrEEz9C2KnJPZrnH5+7rHCq5mmTcnrE=" + }, + "com/google/http-client#google-http-client-parent/1.43.3": { + "pom": "sha256-G0vu3GfcwIIWSwAe7KbFEpgHs4GYav1Gcv5tnRaMZRs=" + }, + "com/google/http-client#google-http-client/1.32.1": { + "pom": "sha256-/jwHLLG0NCqLzFipZXM9gEN+g1HY6CnFnb7xl/dUaWM=" + }, + "com/google/http-client#google-http-client/1.43.3": { + "jar": "sha256-YKynQoxaH/NlW3BUGpj/PXDd7UisEyTa4a858bYZFK8=", + "pom": "sha256-VPdTPbvnaReXxiMmHufiYVmoLyTMIFCRdWsiafK1Les=" + }, + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "com/google/oauth-client#google-oauth-client-bom/1.31.5": { + "pom": "sha256-i6oAEB5PZY0BZHd1mET6uGERMg+HP8BOVPKGQSb7ir8=" + }, + "com/google/oauth-client#google-oauth-client-bom/1.34.1": { + "pom": "sha256-6WOBq0Zz9W3gDWxbRwwnsjFuZ4wr/8IK6ozfMqcuIT4=" + }, + "com/google/oauth-client#google-oauth-client-parent/1.34.1": { + "pom": "sha256-N4sHWGVenWD93gjaiF0Vg4BAvL34ivrXrtEK8Ve0QD8=" + }, + "com/google/oauth-client#google-oauth-client/1.34.1": { + "jar": "sha256-GT7fl676KLk8WJK9xZi6w0+kw5ZYgDAITykLFEDouYo=", + "pom": "sha256-yF9HUepssOHsTxEwM89Odhw6vabX9BDJ1qQmpUWrgps=" + }, + "com/google/protobuf#protobuf-bom/3.19.4": { + "pom": "sha256-boApzAR0/BegHP6eIRZ6CjPLlYB96JNEfTZ9nkKYxNs=" + }, + "com/google/protobuf#protobuf-bom/3.21.1": { + "pom": "sha256-30nEvQKDTGO3FFDtP6srw7o91wSopML0Iele5GN/vhs=" + }, + "com/google/protobuf#protobuf-bom/3.24.4": { + "pom": "sha256-BOz9UsUN8Hp1VR+bCeDvMGMO5CN9CRyg7KceW/t4zOU=" + }, + "com/google/protobuf#protobuf-java-util/3.24.4": { + "jar": "sha256-EzySniz+OZChBdGOrMxJEistL7SStCDvAtXZ+Tfq67g=", + "pom": "sha256-nwzsJ21NnVpD1uKcwrAk5GgEyThqlvpSfu/Xv3SI5/A=" + }, + "com/google/protobuf#protobuf-java/3.24.4": { + "jar": "sha256-5WVVIr4apcwfLwkqoDawRFFX8pSSju3xMyrJOMe2loY=", + "pom": "sha256-OUEiHKZXgZ3evZX+i3QPRwr3q/MEYLE+ocmrefEPq5E=" + }, + "com/google/protobuf#protobuf-parent/3.24.4": { + "pom": "sha256-+37AUFh2/bnseVEKztLR6wTDuM/GkLWJBJdXypgcrbM=" + }, + "com/google/re2j#re2j/1.7": { + "jar": "sha256-T2V69Rq4uwkJvMPrQIYtJhJa+MvPkqqrpZX+13+Ue8A=", + "pom": "sha256-i7C3rpQfVyzEnH0DFdpHf89wHFkZPJalqP4tWcCVepo=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/microsoft/azure#msal4j-persistence-extension/1.2.0": { + "jar": "sha256-aNg3QZ702HCO07jIgdb8Isnt+BZ/TnAYtiG8od/XUyo=", + "pom": "sha256-gvbJWI44ai2Iq3QatIydFTlAVvgAkDyLdS3KLhmXkSU=" + }, + "com/microsoft/azure#msal4j/1.14.0": { + "jar": "sha256-cFz2SozIymo1knx885sYRMMJc1Zz295kkQbdYpX6vJo=", + "pom": "sha256-a3yVLlVmJtvTU1QveVElq0JRhgu7fi0i/MGx7c+EJA4=" + }, + "com/nimbusds#content-type/2.2": { + "jar": "sha256-cw8YFhlhReiCdQk8FH8ubaPD5UEges01A6GwYSm5vqk=", + "pom": "sha256-iznCFjD7tvBIqAflfjy/c17zDaPxHnAZ5muqa5fa8Gs=" + }, + "com/nimbusds#lang-tag/1.7": { + "jar": "sha256-6MHFlOJCW9vqLYYN5Vxptp/F1ZRURSRJoPCRPCpbijE=", + "pom": "sha256-gksNfeeCer/GpH5u+UsP+qE4/vOK8IxWon9dOhUiEZ4=" + }, + "com/nimbusds#nimbus-jose-jwt/9.30.2": { + "jar": "sha256-HF89lM09d9YXb4VPHHjrZYz7g++APw2lT7R59WFJce8=", + "pom": "sha256-wI/3srHtdUZS3KQqwWyaPGqG8bj2gKY92nDx636/2fQ=" + }, + "com/nimbusds#oauth2-oidc-sdk/10.7.1": { + "jar": "sha256-8DsrqKUBzIfhuQcQbbsuU7wrfP+DUtC6gmi2NvhVXdo=", + "pom": "sha256-uUig3Af6U7rd3OrxtihjiWzIpihNLBAh/AJ8/3mmMI8=" + }, + "com/squareup/moshi#moshi-adapters/1.14.0": { + "jar": "sha256-EjBlt/85bpGrB2BdO1Y5bNefn8353GG+bGCh3THxOJE=", + "module": "sha256-/Rerzmxk6sa84O0Pewz73c70vgoCVDTMzXEkGp1rrKk=", + "pom": "sha256-nPIpkpEiYaOKN42V6aQjzgpwGQ4zXeNDG+4zMckgU3M=" + }, + "com/squareup/moshi#moshi/1.14.0": { + "jar": "sha256-NDmywhrErNJQNAMIVKa9B9igN/Lgn5jLE3CJCMhOmxU=", + "module": "sha256-EDSH3k437tkI0WFzGltAIxtmJlszFED1EXdiNzO2mKk=", + "pom": "sha256-ne0k5l4oIEH/pbMYK/5kqEtzUcS5s3gLzDwpALRNaiA=" + }, + "com/squareup/okio#okio/2.10.0": { + "jar": "sha256-on8JHTSqRS43In4s+oWAnykBKo7yUBqbWhJal45Py8E=", + "module": "sha256-EcvqvDp2XJqAMkL6ICShGFPrCGXaU2xLBa/c27I0Y3A=", + "pom": "sha256-S5YGC20aK5bpDkKtcVitvjRpMWuA/qCBfGwzmT7hzHI=" + }, + "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": { + "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "commons-codec#commons-codec/1.16.0": { + "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", + "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + }, + "commons-codec#commons-codec/1.16.1": { + "jar": "sha256-7Ie/tV8iy9GyHiGQ7toosrMS7SpDHuSfvcwBgS0EpeQ=", + "pom": "sha256-uCbd2S+dfMZDcaAvoIMMFU1nyYNw6lSi0ZbnLrWQrSg=" + }, + "commons-codec#commons-codec/1.17.0": { + "jar": "sha256-9wDegKwnDQNE/ep0aCAdi5yAXlxkgzHDYZ8u4GfM/Fk=", + "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw=" + }, + "commons-codec#commons-codec/1.17.1": { + "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", + "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-io#commons-io/2.15.1": { + "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=", + "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" + }, + "commons-lang#commons-lang/2.6": { + "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", + "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" + }, + "commons-logging#commons-logging/1.1.3": { + "pom": "sha256-MlCsOsa9YO0GMfXNAzUDKymT1j5AWmrgVV0np+SGWEk=" + }, + "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.58.0": { + "jar": "sha256-0QiRK2RmwWoVvLYuNBikXtPJuqjTSo5Yc4SvhMUtCUg=", + "pom": "sha256-KgRI+cA86RY02uja1fnJc6JmJXMDGjmhTKwZCTyqghI=" + }, + "io/grpc#grpc-api/1.58.0": { + "jar": "sha256-1ojSX09TOXnfL80IgeHjDCko5bZU/wm/FECSMoKw2UU=", + "pom": "sha256-YqRSk7jq7MGOHIVsza8Ep/dzTFWVOyVaRV3hlFyuaHA=" + }, + "io/grpc#grpc-auth/1.58.0": { + "jar": "sha256-XfsDgny2Hd3m3eF5kYjmYHF2TSYVlDKfGcm2jocPxjo=", + "pom": "sha256-6WP6fWudGBhBtjx9KfeMivTX+2ylAwYpb68+mq0yTWI=" + }, + "io/grpc#grpc-bom/1.45.1": { + "pom": "sha256-fIkCauO5HRCtbPBVAu7W58lIW7SusiqpLi1MKJe9HEI=" + }, + "io/grpc#grpc-bom/1.47.0": { + "pom": "sha256-R0Qp79u61ToB1rcWq4loAn3N5wV6+3Yzp8q/oFHc02k=" + }, + "io/grpc#grpc-bom/1.58.0": { + "pom": "sha256-n17rMjZvLueDNdmVVfbeQbDBAMAPI5p4bO5quTS9tg8=" + }, + "io/grpc#grpc-context/1.58.0": { + "jar": "sha256-OnYm0TCElYvN6rWUEuTshz8HyDFf8lENNjhW+sf63FE=", + "pom": "sha256-isDIMAqJciEYV0LvXcQ5PZv7ZD3tr63B3vCt9NebHiE=" + }, + "io/grpc#grpc-core/1.58.0": { + "jar": "sha256-k8iICCTuEkuRwx8PEFL4Y3JxnW7ObkvhxZG31txjn18=", + "pom": "sha256-Sck1NqvqLYdBnF3zrWYWsW8tJe8jCOTrQCmkpmr+aSk=" + }, + "io/grpc#grpc-googleapis/1.58.0": { + "jar": "sha256-12ysnK/8WRrUyMUmN32IEFe1OOvTjNFfS+bfqVhc64g=", + "pom": "sha256-g12F75i8szY6ipIq8nC6kk+on0f2hY1e6mzt1b+wFJs=" + }, + "io/grpc#grpc-grpclb/1.58.0": { + "jar": "sha256-orxFVUUcWMH7DTrUnpuXlju3Maq3pxDvqn1bySwirlM=", + "pom": "sha256-Qj+2HRr9CpaVJ3mA1i0/3AAl1PbgmCeJbdxuuPqSAJo=" + }, + "io/grpc#grpc-inprocess/1.58.0": { + "jar": "sha256-V0hkuEshLyEaRfZ8PKPd+t5lVlT6dqF6tqbyc7iABCU=", + "pom": "sha256-z6mcK/VSori/C4uZMMm2IspIL3gTuAxijKaSNt0qaQE=" + }, + "io/grpc#grpc-netty-shaded/1.58.0": { + "jar": "sha256-EvyEebikPvYpVcRSpP2mPEfCDW14/ZkPmzpqfAn8CXc=", + "pom": "sha256-evbM2J0elTac/88M2r+AFeEkNNZmbQi+myso/3jeovA=" + }, + "io/grpc#grpc-protobuf-lite/1.58.0": { + "jar": "sha256-9dKj9gFiDbA29y1RveShn5Oax2GAWOV0P7NZnneJkuc=", + "pom": "sha256-OpP0sfjgizXM30vFEKk9P6jwvk64VeefNP2d1jJcSnI=" + }, + "io/grpc#grpc-protobuf/1.58.0": { + "jar": "sha256-d/FndJktWALP7vep0As6P5qC0yTOHKt/hMbxoN9aOcM=", + "pom": "sha256-A4i2LJCVZuG1J/J+bToO5+v8aCw3nAlmnK8nO6xu+S4=" + }, + "io/grpc#grpc-services/1.58.0": { + "jar": "sha256-XYxV+ib5F1wOrInCr6n1DdM9j2CIUf7ZQ+QdR6YnsjE=", + "pom": "sha256-F773fOlrisZLKUUs116Ns32+2rFqe4ZbpIH/YMo8azU=" + }, + "io/grpc#grpc-stub/1.58.0": { + "jar": "sha256-Gve7xWvnsRMcEyK6GDEm3QUDBvkRKBk/S5vV6nGsjIg=", + "pom": "sha256-mVBfRvn0NFDion1VCARh0gJnCJ12OUhTcI54tdbDAGk=" + }, + "io/grpc#grpc-util/1.58.0": { + "jar": "sha256-nomZ2YUj+5dcejFr1SRnFXbBxjixsf01c0C7kL4Utds=", + "pom": "sha256-vAboS0gQjpEfdI0crO2Xti3g2YRPkdbfEpEjgtCUlyE=" + }, + "io/grpc#grpc-xds/1.58.0": { + "jar": "sha256-5Z4rTetvrOydNgg9D1+fvvOISdSOCw6sa8Idb/6C2J4=", + "pom": "sha256-iXMqZzQn9O9up+fE0tvgZNnx5MiL8NWvIqaV14qUhbo=" + }, + "io/netty#netty-buffer/4.1.110.Final": { + "jar": "sha256-RtdOeRJarMBVwx8YFS/cXUpWmqjWAJEgPQuqgzlzrDw=", + "pom": "sha256-cQrBnMAc2A32vpo/qtPCIrShoy9LVRN74HtgmdXaNWI=" + }, + "io/netty#netty-buffer/4.1.111.Final": { + "jar": "sha256-fZS2Cfs2r9iDBMc5IkEdCPOD95RaqIK1mhUhm17L+3Y=", + "pom": "sha256-avx+dR4KkNLLEWj2pIVNgL87qIgQSvqzAyM80xaE9LQ=" + }, + "io/netty#netty-codec-dns/4.1.109.Final": { + "jar": "sha256-pnqEwKRglIFeIESsExTY2BCJ0hnsjoxzL5oSukzUUb0=", + "pom": "sha256-pKx7ZGqBAZfmiBT3MAuFGoqinCV0RyHMpeQ1gMn1qmE=" + }, + "io/netty#netty-codec-http/4.1.110.Final": { + "jar": "sha256-3A1q9QVGMKcP8O81TyCqem5Gc4yfxWNu09T+d+OL1I0=", + "pom": "sha256-Ua6ZCvFKMh2209aIS5F7fUNj62Dd3A8Uk7GAIaFC560=" + }, + "io/netty#netty-codec-http/4.1.111.Final": { + "jar": "sha256-v1DCEsrsh2u2+6hbdPGEgtoteCTdB2bxgpyp+TqgGlI=", + "pom": "sha256-gDcuPm5huos6vmI5ZMmGN2VotrvscFrbKdKpWc17n4w=" + }, + "io/netty#netty-codec-http2/4.1.110.Final": { + "jar": "sha256-tUbHVEWkh7t7zVqUd5yuzOM1gs974xuLOfwOZbHuJvw=", + "pom": "sha256-KdL2wmw8yp/oOTZxcH/o75w+MQIKLf4GuCxCZJnCWDc=" + }, + "io/netty#netty-codec-http2/4.1.111.Final": { + "jar": "sha256-qeubBicEH0iR3pKqiWSZrjNM32B9ug3N+v01FqfQ7Mo=", + "pom": "sha256-x/AyWqTHXJ6uHjiDBtx9EEJsaipsj3Evh29YpLwVft4=" + }, + "io/netty#netty-codec-socks/4.1.110.Final": { + "jar": "sha256-l2BSo8m7KAvG2Z86KeZARnfPlYw94FsgUJPTjABriAw=", + "pom": "sha256-/+V7MWGR3U+WvuZsVwnBPL207KsIXAEMjbDGqoCav2w=" + }, + "io/netty#netty-codec/4.1.110.Final": { + "jar": "sha256-nszOmo2Ce7jOhPnDGD/sWL0clqUQEM9xEpd0YDSvNwE=", + "pom": "sha256-qAa7U2uzI2Zbr/fNEiPysnKi1HF6tPmxI2EIbarl3z4=" + }, + "io/netty#netty-codec/4.1.111.Final": { + "jar": "sha256-pjrHE/YOwLjiu4GCZl0hZmLR9HSHLsXDaNJfFfVE9Lw=", + "pom": "sha256-bHMiRpMuE1Z6M8Liuf1KpR1zKvuqdxN8UmCoR+PQo38=" + }, + "io/netty#netty-common/4.1.110.Final": { + "jar": "sha256-mFHsZlSLng1BFkzpiUPN1LvjBfaN29JOrlLkUBoNexo=", + "pom": "sha256-fUF/UzUwTa4eoIoGWGA4yD/orYTB01uqFe0RkhzveSA=" + }, + "io/netty#netty-common/4.1.111.Final": { + "jar": "sha256-muEumon1nOJPsjOFH92T48Lfrrn6AsYGJ81n+nVhhx0=", + "pom": "sha256-uceDN2Fr+NVNVRW6tsuh3y20b9sBtBJDTMf7r+eDRcU=" + }, + "io/netty#netty-handler-proxy/4.1.110.Final": { + "jar": "sha256-rVSrT+nEfvPnI9cSURJttT6NtUOHGtuer8lERlOe/1I=", + "pom": "sha256-xhPLTn4G9C76MduNiyoznti/QfAMRtONCQmkwGxlbc8=" + }, + "io/netty#netty-handler/4.1.110.Final": { + "jar": "sha256-1aCNfeNkkS5ChZaN5NTM4/AdpLsEjVxpN+Xyrx+OFIo=", + "pom": "sha256-TUPBPRT1Y1oviw1QlNejHFCe4PUsck66DvMM/+PqFVU=" + }, + "io/netty#netty-handler/4.1.111.Final": { + "jar": "sha256-GgNGcsomyL5iRcjoZBspeF7SwBhhe7Ldfge+Offqcfw=", + "pom": "sha256-9XXURvpc1Ua+T84LvzTBRAQXYbidp3lx4wv4PUKQXRs=" + }, + "io/netty#netty-parent/4.1.109.Final": { + "pom": "sha256-yzNkxyqg7R/zy6mLRI4ozQ7xFh7adk0QBpO2h5Y652Q=" + }, + "io/netty#netty-parent/4.1.110.Final": { + "pom": "sha256-aFra83Nmb8FUJ8gQ+K/zpP4ZSpfH7XS2nQfFSPDULxw=" + }, + "io/netty#netty-parent/4.1.111.Final": { + "pom": "sha256-lrBVrnr38eMts9cmGRjZAPuhXh5YnM1oL5z9V0QkmlE=" + }, + "io/netty#netty-resolver-dns-classes-macos/4.1.109.Final": { + "jar": "sha256-yisxxot4hCiOgGV3xtoR01i2vYivGGq9koyASPsXs2k=", + "pom": "sha256-yWBaR/ZGSRURVFmy+GuYlnksjyec6o8saQKYQeKjv6g=" + }, + "io/netty#netty-resolver-dns-native-macos/4.1.109.Final": { + "pom": "sha256-T6RpDUwC4/uf7QyGcu3qIxNWLeelrBetdMLymdrOsis=" + }, + "io/netty#netty-resolver-dns-native-macos/4.1.109.Final/osx-x86_64": { + "jar": "sha256-ozFCDSrfVodMW5DLrKjXs5cGzSR7fioUjfNlYUTrJpM=" + }, + "io/netty#netty-resolver-dns/4.1.109.Final": { + "jar": "sha256-fjVKhfgUd0SuudPh5krOGPZDKiXAn4veVzg5WahCyWc=", + "pom": "sha256-I6CzSuEZbi+FsWMW9Qy4qPPCMdpH7ocRpmKzg5Nvb0E=" + }, + "io/netty#netty-resolver/4.1.110.Final": { + "jar": "sha256-oum0rnyqkvxb10fhHR3sINgbGPwAlZVUMCJErFxWznA=", + "pom": "sha256-ZV80GS6MdhizxaeeSI5NqjXe9BsNFtRfo2Ujw7TJ9kE=" + }, + "io/netty#netty-resolver/4.1.111.Final": { + "jar": "sha256-eOc1dG0fmMqJeTF2NZyXrVu2OT7GPNKWLzDbQ74JDhs=", + "pom": "sha256-11JAU0WdQlycu7+T8Hk1BMTQFIx1+0naqz4U1OTTjvA=" + }, + "io/netty#netty-tcnative-boringssl-static/2.0.65.Final": { + "jar": "sha256-u4NJvaO6BDwJ9ccyxbLUfxisTa/OJIy4UM+9BZnlugE=", + "pom": "sha256-uonxFajDC9vLbbo2hJoEfagDtJbz6FbkNl1T3xQDky0=" + }, + "io/netty#netty-tcnative-classes/2.0.65.Final": { + "jar": "sha256-hO8CQa2htO2SeF4QwW7b6wYzSJWaOw73QHErrdCfoSg=", + "pom": "sha256-Vckic4c3c+lUvHjpJnvPGIr5Mz9Idi2GKMm9mawVy2Q=" + }, + "io/netty#netty-tcnative-parent/2.0.65.Final": { + "pom": "sha256-KqThVEhalgFdM81wRayS86Znkbt3uQVAMLoupdmufeY=" + }, + "io/netty#netty-transport-classes-epoll/4.1.110.Final": { + "jar": "sha256-jlnOxn3jufiv5OzOwR7YzkQjlI7q9MpRK/aTJAUu1RA=", + "pom": "sha256-4tQXVD7zF/+pGTigAf5e481xyTwBT70zcDdNAPHnAZU=" + }, + "io/netty#netty-transport-classes-epoll/4.1.111.Final": { + "jar": "sha256-0jDRaA0VF8fXsuJe9qmofCLrvPJkoNqOgHc08Vt8fK4=", + "pom": "sha256-S2Dz1R7m1+WtWC5bAbSLfemiOu1SHjiHmoWGJVlk5E8=" + }, + "io/netty#netty-transport-classes-kqueue/4.1.110.Final": { + "jar": "sha256-uOt/4coCxgS4mE3HvDGFdgQ915V1hGqkvyLgPblTywI=", + "pom": "sha256-AMiktbOP9sYE441c3VqEEu9XI3EBZKRpHtHlXsgPuE0=" + }, + "io/netty#netty-transport-native-epoll/4.1.110.Final": { + "pom": "sha256-4AycaYcLeTT0hsptCXc3YR/acQjnj36i8HiMeCfRHR8=" + }, + "io/netty#netty-transport-native-epoll/4.1.110.Final/linux-x86_64": { + "jar": "sha256-3NYMazB2rzB6uHcgGhNuHxBmyb6Amq7YJzkaI5CfkTU=" + }, + "io/netty#netty-transport-native-kqueue/4.1.110.Final": { + "pom": "sha256-cVl3ZunJCOUKwXKhlO5bt3Kiziau3howy5n6UcC0qYc=" + }, + "io/netty#netty-transport-native-kqueue/4.1.110.Final/osx-x86_64": { + "jar": "sha256-pRcvVXMO47dnAAy5vwih7Gco/PwX6KSgV/6YNzcJkNA=" + }, + "io/netty#netty-transport-native-unix-common/4.1.110.Final": { + "jar": "sha256-UXF7t0cRQZUDkMZxOkSf2xBU0H5gc37n3acIN5bN7kg=", + "pom": "sha256-6hjOBMmpesDFH045exhSKf2VmX6QsRM5rc98UZRtU9g=" + }, + "io/netty#netty-transport-native-unix-common/4.1.111.Final": { + "jar": "sha256-7EvUV07h7HdqGxQTn7aZgt339QOagDCCB0qB9mBOytI=", + "pom": "sha256-LqcKGGSrOPzsK9woxp7pdW261YpGJsZkVU08hg1UCYE=" + }, + "io/netty#netty-transport/4.1.110.Final": { + "jar": "sha256-pC3Wg5DKFLT/LUBiiglsdkhbStt8GWAtUokyGgZp5wQ=", + "pom": "sha256-MPXaDnZG8YQNYy+IYVyLnYIFSZ1oVZucRUezsEoGg80=" + }, + "io/netty#netty-transport/4.1.111.Final": { + "jar": "sha256-SaPMC200I0DwmA8EcCbbdBYcGeoqB3U6FLTSLuBlOqU=", + "pom": "sha256-hmK9XX9i03JUj0CtiWuH6lXCsdF5Ap75hYN9zkOlImk=" + }, + "io/opencensus#opencensus-api/0.31.1": { + "jar": "sha256-8UdNR/S2sAFVitJ7lS417aXMcUZ4iHf8UpOMbroks4I=", + "pom": "sha256-VW9CfhIJDvs2pgh/dBCr/kXeEBByktlvpj5BdRdOy3Y=" + }, + "io/opencensus#opencensus-contrib-http-util/0.31.1": { + "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=", + "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s=" + }, + "io/opencensus#opencensus-proto/0.2.0": { + "jar": "sha256-DBktRR6d106Ychsn0C8OK2vKRLUVY7Xavy4hH3o+vxM=", + "pom": "sha256-twh5B5IPyKgVNGhrLxorMxEnr5fwFau9s3hqUfP6HlI=" + }, + "io/perfmark#perfmark-api/0.26.0": { + "jar": "sha256-t9I+k6NFN84zJwgmmg0UBHiKW14ZSegvVTX85Rs+qVs=", + "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=", + "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto=" + }, + "io/projectreactor#reactor-core/3.4.38": { + "jar": "sha256-qSVfYNkuj8WMPIcyDMQ5k24IIn22W9iOuX6ESvhT5gg=", + "module": "sha256-s881PZK60hi9mRC0xb0neVd0L+e+U5GrgAJtm6nRYBU=", + "pom": "sha256-DqFXvFKNTUZhK6Vzyha639GvJYaS01eQdQLSreA+1Nc=" + }, + "io/projectreactor/netty#reactor-netty-core/1.0.45": { + "jar": "sha256-s4/bwGGLwZM1m7MoB7wXtpH+1CJZ3SeqArGN288rCEQ=", + "pom": "sha256-TDBu7MeIo/sfmzB3vFmyfaRIz0C2T/iB9NovCk9G6Ww=" + }, + "io/projectreactor/netty#reactor-netty-http/1.0.45": { + "jar": "sha256-9lfr/PgRUAj6jFXnUgDaiGpF8ixIjYLdqvAT/8y2UgU=", + "pom": "sha256-fXLOos9Oo8CAUjPMcfezfVmOCPdu5lnCB6sEH3ZtXAc=" + }, + "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=" + }, + "joda-time#joda-time/2.12.7": { + "jar": "sha256-OFKCsAWBjPrM2+i9JCmBHn5kF4LyuIkyprj/UdZo9hY=", + "pom": "sha256-hf3b+kfCmf2OzhyT//1H2cLTyQNaM7XbAXswTGd+hCg=" + }, + "joda-time#joda-time/2.8.1": { + "jar": "sha256-tGcLlfdZV8l0KExfOtqWYEC+JXj2Q8XGCD0mIWIGH6I=", + "pom": "sha256-GLpc/f+WCR4AGYlTYURgedkSNe5WbLHUl2OcGs5inXg=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "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-platform/5.6.0": { + "pom": "sha256-G+s1y0GE5skGp+Murr2FLdPaCiY5YumRNKuUWDI5Tig=" + }, + "net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "net/minidev#accessors-smart/2.4.9": { + "jar": "sha256-rM3Vx6xMSbFViQquof/KKpzNWCa1Yt2VqZ/BiHAD4DE=", + "pom": "sha256-/sBelw8jmtqEcfTqPwYRwDb7zHxD886qnl575vMhe7E=" + }, + "net/minidev#json-smart/2.4.10": { + "jar": "sha256-cMq16UiGMNxjGx/G5/pVDZXN3Rm6FNs5zsp8q/vU5a4=", + "pom": "sha256-qVnWK1dC8NmRu3zF15fvmHgT6U3pORcAzw2N9v0hOSs=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "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/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "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/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/ant#ant-antlr/1.10.14": { + "jar": "sha256-1zfetbCZL2kb/+lAdmlad1I+HjtdUktGX5DZPi2O16I=", + "pom": "sha256-W9EwNnEP7b03cFBS+57G7RNI3lchm6ulyVNXWERrgQM=" + }, + "org/apache/ant#ant-junit/1.10.14": { + "jar": "sha256-o7U109VJ8YUKiRenwr/fNk//t51ScmfbMKEpR1yi+vg=", + "pom": "sha256-ZFiOW9XE89jIh5NFpsNQoxzIp5qovBJjGNytBL4/Pno=" + }, + "org/apache/ant#ant-launcher/1.10.14": { + "jar": "sha256-8JCXJaeiTjk4iPP7tVg0er9QbOL368WB/yYzG5TZUaU=", + "pom": "sha256-nJ2qQSPp63BzVnk2UsOIo1UQqqWm0UW0T4VdCN1LK7w=" + }, + "org/apache/ant#ant-parent/1.10.14": { + "pom": "sha256-CBYQamBniMJw767yFWLPy9j0uvfafBG85RSetWYbMx8=" + }, + "org/apache/ant#ant/1.10.14": { + "jar": "sha256-TLvZJD3kwQQtYdmhXbTEPJD/k7FteLOUgdoclWyOlnE=", + "pom": "sha256-L6QmnmscRXI6iojmnZhKdm27IEzQ/pgUlMzfP+469lw=" + }, + "org/apache/commons#commons-compress/1.26.1": { + "jar": "sha256-J7tdQPN8O7cgW0oFQCR98FdxXp9su9l9Ymq4tQMYuwQ=", + "pom": "sha256-X0SKAh2IyW84QN/mGRKNYuXPticSzW5m3KincElFsG4=" + }, + "org/apache/commons#commons-lang3/3.12.0": { + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "org/apache/commons#commons-lang3/3.14.0": { + "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=", + "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" + }, + "org/apache/commons#commons-parent/17": { + "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + }, + "org/apache/commons#commons-parent/28": { + "pom": "sha256-FHM6aOixILad5gzZbSIhRtzzLwPBxsxqdQsSabr+hsc=" + }, + "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/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "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/groovy#groovy-ant/4.0.22": { + "jar": "sha256-O1qAR9OpcR+sIhCDZPuM3xX6O23s/Ru6Fa4Y1IjihsU=", + "module": "sha256-L71eCyR+7FLhAogO4p+nS6b5imF2B4xm27jHiPAQyfU=", + "pom": "sha256-ae94A40xqz+7umZ/Tlc6yrOKhxSDYPAfA95TRJRGarE=" + }, + "org/apache/groovy#groovy-astbuilder/4.0.22": { + "jar": "sha256-XOLXHmOmYESDERx8Z6eImGnLUI/wv++mY32ULmtWWGw=", + "module": "sha256-DgSx19T1SHJxjgl1v28HCRBxNfjwoRLzok5oujVTLAM=", + "pom": "sha256-4pe/0Gv1qKatL/V49cUuYH3jyZaA9FtMU2oQkbAm+uE=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/groovy#groovy-console/4.0.22": { + "jar": "sha256-NbjJmqNHz9eHeigsqFBl+tyWIs/dJezjYRGuHOWG3/k=", + "module": "sha256-hth/+n825//cjTGt5nXarPP3GpEEMz07Px4gPGN8U6Q=", + "pom": "sha256-fX68X2L4u/Fand9PVCIaUMEdT0VOx2uky847NFkWSzo=" + }, + "org/apache/groovy#groovy-datetime/4.0.22": { + "jar": "sha256-tE9+5dmw1oQxC3nESjVpMH4YrjWdBE1sF+9f1D/KK8g=", + "module": "sha256-s6OAY7hhtVBTVg1rlJLdff/0B/0LkJT10YmgV6UnJgQ=", + "pom": "sha256-Yq7rWVbIbovf26l9BZ/dR//ExnPp25JO3u77tjNEOBY=" + }, + "org/apache/groovy#groovy-dateutil/4.0.22": { + "jar": "sha256-p5HDt8gOdUTjWhHAJlyj9y8PaAqysuFUa2xeP+ahexg=", + "module": "sha256-35srMbE0B9wFLtllXmu2uUzPO9t7jzfaGXHRu2LHw0s=", + "pom": "sha256-BTW1Zs/Eav7KtOnXgdIps22Gh0ZUssD/7llVJUZiFkA=" + }, + "org/apache/groovy#groovy-docgenerator/4.0.22": { + "jar": "sha256-sHU0ihy22HZYJumzlv09rxQg6hEUrrLn1RlzjJgik7k=", + "module": "sha256-olhJZ2qL+FGIDMDRm4cmqViXH6d7m6naGxbsbSLXVFc=", + "pom": "sha256-q06iRmwnr3tP61TAQujBorugC3z9rpLHh9c06EdbckU=" + }, + "org/apache/groovy#groovy-groovydoc/4.0.22": { + "jar": "sha256-pfz5r+u5ep3tut3P186Q3f+F0IuiS2P5thauK59Pmb8=", + "module": "sha256-czTLKp9ILUoXAsmR3ipvY+2BjwkuQBDlDDamLNugEyA=", + "pom": "sha256-yHMhp8DNMgYfujQB/zLpHISOn0wcyEXH6/UjAr5XngM=" + }, + "org/apache/groovy#groovy-json/4.0.22": { + "jar": "sha256-q6kyVNkpOIEoK9Y5t7Pbi9y1v2zKTKwN96C9GTdD9lI=", + "module": "sha256-zNCqhZfYpL50KU9/8umAgffndwkK1i2BkVr5pgMT/MY=", + "pom": "sha256-b5SbBK4/HGwPKdR7xCiNDkRAZpGUYuPtlyzwuUtWjAo=" + }, + "org/apache/groovy#groovy-nio/4.0.22": { + "jar": "sha256-wGvLEry6gtM9bEl2MhDGnrjhWysjr48seaLckLe/TSU=", + "module": "sha256-AaEkGSIUH9pPzoWnBdF6WK8mFZjBFEHDM6PrMqrgwS8=", + "pom": "sha256-JnQ0TFl8348bePSnaAa71TwGc1ZUUB1zvZYbswFJMVQ=" + }, + "org/apache/groovy#groovy-sql/4.0.22": { + "jar": "sha256-HBsfsFbuHvu3QyN8aMo1Z9qvg6i62kWYNtm6ezukVqs=", + "module": "sha256-6GHVtR+HvuG2+mtWZc64EIbMCZQf/w9VOCFhY5eXLLs=", + "pom": "sha256-RhXCg//EtB5XPXwAgJ/S7Ja45JGeFzIe6uQGbP1/CwY=" + }, + "org/apache/groovy#groovy-swing/4.0.22": { + "jar": "sha256-RMwmmirUQoUMuQrCuOu1YEEqfeAEic9LzabUPW4D72o=", + "module": "sha256-dh8BpcQprVZXgq/HdJgCd0ReI6jaRjZoDDSzUHXDzzw=", + "pom": "sha256-H1JhJeQvpHGzb1B2bQMdnqaI0HaWcOnUVtN6eY2EI+g=" + }, + "org/apache/groovy#groovy-templates/4.0.22": { + "jar": "sha256-dA4rUYsVAJVuh6ix/TJuCywhrcZ3qj/sVWXQF7aQzTU=", + "module": "sha256-NfWvWkE2jYp8bMLPL7Vtg3ZbLJGETfi4uRyJ2ne2IEU=", + "pom": "sha256-h9Ls2H3VPKYPGT7SOM6gfCaThtzAw/xUkhdrXVlbUIE=" + }, + "org/apache/groovy#groovy-test/4.0.22": { + "jar": "sha256-+vfSOY3ELHvakh7jZSK1UTJlglzW1za0KPJzHnl0q0o=", + "module": "sha256-nAjbyztGaX9Dsi99c2Hmr0ZhZV7ywrnqVIG6MhIjtxQ=", + "pom": "sha256-M43f8+RSWL736IxDALYpH3Dq7A9mKP1uCxzRYY+5vkw=" + }, + "org/apache/groovy#groovy-xml/4.0.22": { + "jar": "sha256-qMbIRe0i/qrtjw/Xl5i4q+o+CQr9Wpraq5bb2hUhacs=", + "module": "sha256-CCKmJjoD/xQevfvoytpZ1cbES1k4cHdk2Vm29dEYtx8=", + "pom": "sha256-OP4UoARgVl/aznkr8Z31VCEuQGvnnWZvqP6KZ6SnYfk=" + }, + "org/apache/groovy#groovy-yaml/4.0.22": { + "jar": "sha256-y/Y1CEcIYQxClw8aA1QM7Qm2OH+sdQn2pxb+O81GmzU=", + "module": "sha256-X+tDbJ4KoO2LYzMXYBFmcH9gPW+j3cgj5Rh/fYHiu1A=", + "pom": "sha256-X0xaX+IEQ18yiHup+G37IbIDdxxXEilqb7f7LuVzHZY=" + }, + "org/apache/groovy#groovy/4.0.22": { + "jar": "sha256-+di9TWWFLBgZTjU8d/PSwj4AE4VpUcVDC6VpctL2eh4=", + "module": "sha256-Jor7Vc8AXY4Pd1qtSNNFdjykD+PkMP+5CG85iztJBTQ=", + "pom": "sha256-Vuw4/yqflfFX6tIc7fMwWsMB+3kmQBSyzvPoX7JrNK0=" + }, + "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.13": { + "pom": "sha256-xVTnAI5FF8fvVOAFzIt09Mh6VKDqLG9Xvl0Fad9Rk2s=" + }, + "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.13": { + "jar": "sha256-4G6J1AlDJF/Po57FN82/zjdirs3o+cWXeA0rAMK0NCQ=", + "pom": "sha256-j4Etn6e3Kj1Kp/glJ4kypd80S0Km2DmJBYeUMaG/mpc=" + }, + "org/apache/httpcomponents#httpcore/4.4.16": { + "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", + "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" + }, + "org/apache/ivy#ivy/2.5.2": { + "jar": "sha256-mEKNVF6mPNmgqvJVyvQsuMtk/kMNu15wmu1TbU2u7QQ=", + "pom": "sha256-SrIWH63j2EHp2H8iVfdgfLiHCcbISPf7JdBmkd2VbkQ=" + }, + "org/bouncycastle#bcpkix-jdk15on/1.67": { + "jar": "sha256-77ynVIgM45IspHpDwfC3LEVzFFCg7xk7nbM79Ls4zl8=", + "pom": "sha256-qbswvZh9wwWwXuU+nyfm6QL8EM48bplhjP8DYteWsE0=" + }, + "org/bouncycastle#bcpkix-jdk15on/1.70": { + "jar": "sha256-5bnLgh31f3CwWTNY6JwOjXJmUV2p0IivbGRvY9QzwHw=", + "pom": "sha256-bqVQK37r7HAYJxu4qCy4Gb9MHytlQ1ScXP2E1qE5lr8=" + }, + "org/bouncycastle#bcprov-ext-jdk15on/1.70": { + "jar": "sha256-XYGfO4hZfsaAyUFRoLoKOv/wwMHJmbWwZaZ8mYo+Phs=", + "pom": "sha256-349vD7+aZoBvsV+M/E40S1fEdgoiYpAIbKuLkb4X4m8=" + }, + "org/bouncycastle#bcprov-jdk15on/1.67": { + "jar": "sha256-+gBBo2+fIK88a42/brSalp4snMApBJ1hrMUmujJHs+8=", + "pom": "sha256-pHOndHbdYxYw67OjezSBL5TmpyRcOXZaFNcjG5DgZFs=" + }, + "org/bouncycastle#bcprov-jdk15on/1.70": { + "jar": "sha256-jzwg4+LVZdJvM+jUhXo30Nf4rDm2KnAmSW/Ksb2sMNQ=", + "pom": "sha256-bfS1t22QYgF2ZK0MooXlcVSugDYHy4nJcLOcwOAWq7A=" + }, + "org/bouncycastle#bcutil-jdk15on/1.70": { + "jar": "sha256-UtxVUbAldmZSbFCVQkVn/tfcewDSsbp71SKYQRESsdA=", + "pom": "sha256-nrrnHCXgyfLNdWADwB8a0Pw5jKBvvNoNF15xysWECq0=" + }, + "org/checkerframework#checker-qual/3.39.0": { + "jar": "sha256-PpAHA5btiI7jlBZbIIOmejTDfhEaw6/XuZaop4KcQd0=", + "module": "sha256-56P+D0lZ4m6ZCH6KwOzHhK4AtmcGGdBWA/ZATim8fRc=", + "pom": "sha256-SIsYMPs9WeqTtYulPhrZGLuTWnzL00uDXbT6QCZmXjI=" + }, + "org/checkerframework#checker-qual/3.41.0": { + "jar": "sha256-L58kW/aOQlnWEIlPJAbcH2Nj3GOTAr1WboJy5PRUEXI=", + "module": "sha256-s4ZywX9FUnayEO00Av+S3OZmdwsajGEMfMNK1UxTLSA=", + "pom": "sha256-XHOwdwVAhCzwagHSZLu4muXiSGadydqA6GHoIz3UZ1s=" + }, + "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.23": { + "jar": "sha256-n/5Sa/Q6Y0jp2LM7nNb1gKf17tDPBVkTAH7aJj3pdNA=", + "pom": "sha256-VhDbBrczZBrLx6DEioDEAGnbYnutBD+MfI16+09qPSc=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.23": { + "pom": "sha256-a38FSrhqh/jiWZ81gIsJiZIuhrbKsTmIAhzRJkCktAQ=" + }, + "org/codehaus/mojo#mojo-parent/74": { + "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM=" + }, + "org/codehaus/woodstox#stax2-api/4.2.1": { + "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", + "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" + }, + "org/conscrypt#conscrypt-openjdk-uber/2.5.2": { + "jar": "sha256-6vU32Y4DPQ8EUc0bjMdOAte1XsiC2mPIgGDYBrqJw0g=", + "pom": "sha256-tf1UhzL5MlRdd3iQ65lSIr/oZiMjUb6QgTfjnDxnLYs=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.10.0.202406032230-r": { + "pom": "sha256-8tNTmgp5Iv15RwgsGQHSCQ2uB0mGsi2r2XO0OYzR6i4=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.10.0.202406032230-r": { + "jar": "sha256-Q/kvOttoGl8wBrl56NNBwSqM/YAp8ofEK88KgDd1Za4=", + "pom": "sha256-BVlUQr62ogYQi2c6qcZpLIPkHfGDF33GcROxzD9Sgd0=" + }, + "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-stdlib-common/1.4.20": { + "pom": "sha256-fFcG67pX1ETCyQJCiTE6SThr6gmWwDKUwrVwmnUP9Ck=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.7.0": { + "jar": "sha256-Wcb/ZP6aZgSvzgPoqqdfg1hsYDCscfsLNO583v7TYY8=", + "pom": "sha256-JhqZ5S596dKySKuJmKUEbOZB/h4oI39p3xUOxL6aMBo=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.7.0": { + "jar": "sha256-B+kb6bLKIGctK9t+GBt2bnNFOi2hNJK13a7o+keuojk=", + "pom": "sha256-riOkxqK9/AzVp7uuh9mYoR4DVr5J/voKmvbD/22ioCs=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.7.0": { + "jar": "sha256-zwWOEdsd/JlEaAyMYblaxomqqoo+swvO0CgQDwOPAws=", + "pom": "sha256-l+G1Or5F8Ti1h5U/UEPjmcOA9VWmIz1VeV567gPQpzE=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.4.20": { + "pom": "sha256-OYXvH5KCjVgqQ87JztsmJnQuD+FQXTE268KYzJi8I0o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.7.0": { + "jar": "sha256-qojpYlV3lX8ySaRstuFm7gmzaeYA96EdFI0WsKbYfwU=", + "pom": "sha256-CsWfu0zZGIqggUYASiUpXDdSCe+rkxJad/UDfpVldk4=" + }, + "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.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/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": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-analysis/9.7": { + "jar": "sha256-e8a8vCE3mUigyMRn+w+GQgbluBj2vAtUaHL1yflBVW8=", + "pom": "sha256-nDMIDry2Ma5Pd+ti7We/xAy4cujP0Fishj5EXB3Zc98=" + }, + "org/ow2/asm#asm-tree/9.7": { + "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=", + "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw=" + }, + "org/ow2/asm#asm-util/9.7": { + "jar": "sha256-N6ZBTTZkGXPxrxBJN8ldbZIbLdtNYSxmxanysT/BQhE=", + "pom": "sha256-XQFNjIcNSHGCW9LdtVZ7Ie9trI7Ei7uNu0ZbCzor9FI=" + }, + "org/ow2/asm#asm/9.3": { + "jar": "sha256-EmM2m1ninJQ5GN4R1tYVLi7GCFzmPlcQUW+MZ9No5Lw=", + "pom": "sha256-jqwH4p+K6oOoFW17Kfo2j26/O+z7IJyaGsNqvZBhI+A=" + }, + "org/ow2/asm#asm/9.7": { + "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=", + "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA=" + }, + "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.7": { + "jar": "sha256-QYBnV+HSba5dbbLKfUpRdu7S1ucJzYZWTUoR2rBgF0I=", + "pom": "sha256-QzT/rbuOhgtdjjm7HHDDHO8BEGQ1EGZkQQsK9+vi8uc=" + }, + "org/slf4j#jul-to-slf4j/2.0.7": { + "jar": "sha256-6rplSDuzjJPmjVV6GeVziWIyLeGUZUXb9A5eMvYpMAg=", + "pom": "sha256-bceobwo6J1dfgBavGvR/hhHToDhvmhoaK1EMDWDBTNA=" + }, + "org/slf4j#log4j-over-slf4j/2.0.7": { + "jar": "sha256-/FdxTuix5Ks5uUiMFX8IQ95xumcIJSy+BsmUrZ1y0e4=", + "pom": "sha256-ZtCdHNU3gbrEkQ94x0zKL9M6z6KqXK24qP1bxEAM6mI=" + }, + "org/slf4j#slf4j-api/2.0.7": { + "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=", + "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE=" + }, + "org/slf4j#slf4j-parent/2.0.7": { + "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec=" + }, + "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.6.8": { + "jar": "sha256-5LHrPZDDilTH8zhP2pV+C1vwtBtAZypErosDy2yHzgY=", + "pom": "sha256-ztMznYANG7wB7mct+A5NqHUgrgKXuarI+MS33aI+SwI=" + }, + "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=" + }, + "software/amazon/awssdk#annotations/2.26.26": { + "jar": "sha256-aUAhId1u6bXYLVWn/R3HUvzahdd9WnRMDp6/0wm2FSs=", + "pom": "sha256-IvMaqFQAXCp7vRRVLIoVVwG0tnMIzP3FQTLeXHgdcgw=" + }, + "software/amazon/awssdk#apache-client/2.26.26": { + "jar": "sha256-nznXLKoWQTaATuW4IyLFrB/i1wOuCrNvgcMFGq+Zn0o=", + "pom": "sha256-aMQ1YXRPnMIYQkDwuAOI8GDtEICH7GGTms9eXlw1+W8=" + }, + "software/amazon/awssdk#auth/2.26.26": { + "jar": "sha256-rkmVeQTycJvMwIFxP8lJEpDq72n9mQo+IKuuCIV93S0=", + "pom": "sha256-DVvm6KQ4ysNOafB2iQzFKAEo+3jcSZeieCOGYhX6oDo=" + }, + "software/amazon/awssdk#aws-core/2.26.26": { + "jar": "sha256-A0+oms7HtbQOjaXVuRissdqjm54xbVfV9uU56fqyr68=", + "pom": "sha256-TsMPuyNwzQgblM8sv8Xae64Pn2Qyvmcb1UWI/uSp6+g=" + }, + "software/amazon/awssdk#aws-json-protocol/2.26.26": { + "jar": "sha256-xlfKtDtRnf2zcqhZQS8gbs+0mD4yr8Mz3Xju9wfYcNs=", + "pom": "sha256-c8xGFgRSrk9LFXjQa8drKpnowsYrOtWt0pxUv7Y99wI=" + }, + "software/amazon/awssdk#aws-sdk-java-pom/2.26.26": { + "pom": "sha256-lixU0LOpTDywFJRwHr6x9su3fK+zDLKAFRy7pj4/0nQ=" + }, + "software/amazon/awssdk#bom-internal/2.26.26": { + "pom": "sha256-coi03Ywm/076O6TCx7ysOVWmZjEs6fHIytuSsQmbDGo=" + }, + "software/amazon/awssdk#checksums-spi/2.26.26": { + "jar": "sha256-aJYOIepQDm3zVfzfYfTN22aNLA94S++rnASHrKTRvjg=", + "pom": "sha256-tYAqjgEhp81DP7ERSXVmBHkJbqf0NbQma5e6jwLFacU=" + }, + "software/amazon/awssdk#checksums/2.26.26": { + "jar": "sha256-9ZrOEkJJRC7lSR4pvaQzPkCtRnaIp2759mjY4CoxNqQ=", + "pom": "sha256-rc1ErSAB439wqC/X0rx7ypN/8IskPWRkIV/+vmql7uU=" + }, + "software/amazon/awssdk#core/2.26.26": { + "pom": "sha256-K5+nldQU0Q+Hamh3C2DRdrBA4rdz3IzLBjPE9zDeM1w=" + }, + "software/amazon/awssdk#endpoints-spi/2.26.26": { + "jar": "sha256-kGvBRZF0TSj6Ne4thJxBCVpBB2EEdWMAemDpbkodhuo=", + "pom": "sha256-bvg/+OvJbbxp0+TX72v1U6pJrI2yZM3AdZ2S23dVlH0=" + }, + "software/amazon/awssdk#http-auth-aws-eventstream/2.26.26": { + "jar": "sha256-YpmuIwZQhO9z5Ub3reRbvfTg8+QMe5S42OrGgp3tp6g=", + "pom": "sha256-4Np6b+83VkyjsXp6Oo2ugmGV3SwuG2cWmwuVpa0AQlQ=" + }, + "software/amazon/awssdk#http-auth-aws/2.26.26": { + "jar": "sha256-dZz9f5mzEr6lmd+OJVzxWOlV/GDg59Hgs48pZQjpfh8=", + "pom": "sha256-Ctmn3ZG3h3E2k+FTvuUO/24B3JTOc0n4JI0Ul4fNrSQ=" + }, + "software/amazon/awssdk#http-auth-spi/2.26.26": { + "jar": "sha256-3WW9KrsL6aqeJGYZz0/XfjHlmTcSpm/4mydpsGxYoOc=", + "pom": "sha256-DAKFhZzgbxwl0aFiUXZIQvT9K7kXbLRD2QfM2xvDwes=" + }, + "software/amazon/awssdk#http-auth/2.26.26": { + "jar": "sha256-rIzrcDLQintVc2y2f0H4qyVoYCJkoMDChJPPdH6VzH8=", + "pom": "sha256-LBuR3WNojggJp8UleJx8SRKX35xGucTbY24sCXPKm3A=" + }, + "software/amazon/awssdk#http-client-spi/2.26.26": { + "jar": "sha256-RL26bCp5eBhrNpftYIB9n6m2jAnE1dBNAyGdgu6vNj0=", + "pom": "sha256-ujMvgWsw2Hw+ocevP5Zu413YRAnlM+b32cAY5vVsuns=" + }, + "software/amazon/awssdk#http-clients/2.26.26": { + "pom": "sha256-mXs8qIVYTm0HNJRYVxN+ltcdYXsgasjvUm6LM7boXCo=" + }, + "software/amazon/awssdk#identity-spi/2.26.26": { + "jar": "sha256-CJGE2jC757V3a6H65X5TorVVzce+Tcd55UFLvuPOUu8=", + "pom": "sha256-GK1UqC+Q5WGKJ6YKTcm1Vo+lHut2riwXdPmEOm8w1CU=" + }, + "software/amazon/awssdk#json-utils/2.26.26": { + "jar": "sha256-8txWzIzoKqIaU5qPDyNx0+XzEuQJAUoHIDQlgDy09Nc=", + "pom": "sha256-fEMwRPC06iQzEEYfgMxP0uzB+5f2jXA6qim2y5zTeCI=" + }, + "software/amazon/awssdk#metrics-spi/2.26.26": { + "jar": "sha256-tlVae3mgb3SJeHkRVWm/nooBzZfWs7KxvVa/yoIfF10=", + "pom": "sha256-h36orVjr2+CvJEG2TIJ0tCmtr6lgXfKcqXO0NNtg6k8=" + }, + "software/amazon/awssdk#netty-nio-client/2.26.26": { + "jar": "sha256-EpKX9C0+0xmIPb8Xk2WVc7fP2HLr1gjBtN5YCX+MAb4=", + "pom": "sha256-QlXAVSwZB26ozmBLrmGr2oqZ7z6RXlncHHc2RAQwbJI=" + }, + "software/amazon/awssdk#profiles/2.26.26": { + "jar": "sha256-R6SXYs4vkuuQfTMZcEA8LmFOTSHl3ir+1wthTsSRu8c=", + "pom": "sha256-YpOKDV6FJ5YxpD9CJGwv/IE3WVWNuQqvh2Q16vVjOnI=" + }, + "software/amazon/awssdk#protocol-core/2.26.26": { + "jar": "sha256-E7I1lBn/+0pwg6RnZCY15VRA+ZqxB4bVd8LXsUhY0F4=", + "pom": "sha256-hC5LiggNaBlTtyaXT0dp8XPzD+Jvu17FijtCx1j6k7o=" + }, + "software/amazon/awssdk#protocols/2.26.26": { + "pom": "sha256-HFmySfp7T2YH9X4WrQCGN7qOkeo0wmio3yyhf6FW85M=" + }, + "software/amazon/awssdk#regions/2.26.26": { + "jar": "sha256-f92SCgVh8caZIYK4h3IZpx1SzJdeZTcobgsxvhFO5VM=", + "pom": "sha256-zrhmZK7lUMI6EktCfRlc1UxFw/5k0vJjyT8p6QMJ2m4=" + }, + "software/amazon/awssdk#retries-spi/2.26.26": { + "jar": "sha256-nt0ORlM7MGz3zXBzXb+y1GARg8TLzCeG5ii+Tqv3PJk=", + "pom": "sha256-od61yIhPnnlNVHoQUZGVMHV9IbeqZavOT0J8V4AyQtY=" + }, + "software/amazon/awssdk#retries/2.26.26": { + "jar": "sha256-1BR62e+CDBJlBU0w291/deQSF8qXGrXe86JIdKyWQUk=", + "pom": "sha256-ynF08Ykay4BO+ulxOA8VTeocU3UTzgbB3j+MwcvuBho=" + }, + "software/amazon/awssdk#sdk-core/2.26.26": { + "jar": "sha256-FOkMdT7cv/dxtUWPDRKyxwVXeJT8vBwPbJKiCQVg3P4=", + "pom": "sha256-sWuvZSiIsMQ01+XaiTIQiDR+AYfXaRx08ttDAsllU7c=" + }, + "software/amazon/awssdk#services/2.26.26": { + "pom": "sha256-+QGkOvR1z2Rx57NCCJ1OAp7yX6+NmVkExdkb5XxxXwk=" + }, + "software/amazon/awssdk#sso/2.26.26": { + "jar": "sha256-z/eJpT+DJIrUCrgETxT30+dHbZ55Cy1cQPKKAA5MK3A=", + "pom": "sha256-AGZB90pSiaUq9HOOK17aedvvf0ArYyZFGDQLRT/t6cs=" + }, + "software/amazon/awssdk#ssooidc/2.26.26": { + "jar": "sha256-2cJarRdNv9WjxdsvIdO6g91XjFD6ddk97Xlv7cDUAMQ=", + "pom": "sha256-X9oyf/3E5Dm9sW3ISOFViyHqSxiBUa7hUY8SwGPw6u0=" + }, + "software/amazon/awssdk#third-party-jackson-core/2.26.26": { + "jar": "sha256-hIIh41sn4Lu15Kh+bG8tDGqs60aTKEMF2jigJTfvzHY=", + "pom": "sha256-f9Y88xZ2Eta7OZ/CdgeURegvEkRrrRD94c5aBzvCjis=" + }, + "software/amazon/awssdk#third-party/2.26.26": { + "pom": "sha256-RdgCMKrfXWkjyNh20ouKjovZ5H4hdKJ4SKgOSMtN+E0=" + }, + "software/amazon/awssdk#utils/2.26.26": { + "jar": "sha256-Y2z08uIYzqoovxoTUZHJcQQ5mv9U7Sl6MGjGnPffASs=", + "pom": "sha256-NnbH7ytCITB3Zgt4EU+twT/r1CWCQPvz6C4HNIfiUt0=" + }, + "software/amazon/eventstream#eventstream/1.0.1": { + "jar": "sha256-DDfY5pYRfwLDAhkbgRCw0Osg+kEvzjTDomnsc8Fs6CI=", + "pom": "sha256-+UYMt5Sgp69oJ377V2lWno5mUVJQJ2w35ip+i9SyV8w=" + }, + "software/amazon/ion#ion-java/1.0.2": { + "jar": "sha256-DRJ7IFofzgq8KjdXoEF0hlG8ZsFc9MBZusWDOyfUcaU=", + "pom": "sha256-IKZDxG3mvDDMgfo7njuxaXr6NxaMwYN0VJe3BJabu5I=" + } + }, + "https://s3-eu-west-1.amazonaws.com/maven.seqera.io/releases": { + "io/seqera#wave-api/0.11.1": { + "jar": "sha256-nK04/nLgc9JnhcG0aErn0p+Ryvyzda7XgjZdcasxv/c=", + "module": "sha256-sg+2H0LtPSLg5RgufvApayx6NWLMjv2SKUm8UdNGWsM=", + "pom": "sha256-LjtN7MZPXCoqoG6E2VFOiksp+0ycX6Zh/p0rMtqmBEQ=" + }, + "io/seqera#wave-utils/0.12.1": { + "jar": "sha256-9X38gNB1Pdv8DZvmstNxHQj/I+kIuI9Bpa3x/2rvoO0=", + "module": "sha256-Ukgc/tr5Tu5LwCKmOOHy7cD8KpXkVr6ILyyIRK6gwIQ=", + "pom": "sha256-Fr4n54p6eWDDLO/FJ3O+0fpT7Td0xmhR735eH462g8E=" + }, + "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=" + } + } +} diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 8bf1c43d12398..72895919383db 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -136,9 +136,9 @@ in stdenv.mkDerivation (finalAttrs: { libsForQt5.qscintilla ] ++ lib.optionals (enableJava) [ jdk - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU libX11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Accelerate darwin.apple_sdk.frameworks.Cocoa @@ -153,12 +153,12 @@ in stdenv.mkDerivation (finalAttrs: { libsForQt5.qttools ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; enableParallelBuilding = true; # Fix linker error on Darwin (see https://trac.macports.org/ticket/61865) - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lobjc"; # See https://savannah.gnu.org/bugs/?50339 F77_INTEGER_8_FLAG = lib.optionalString use64BitIdx "-fdefault-integer-8"; @@ -168,9 +168,9 @@ in stdenv.mkDerivation (finalAttrs: { "--with-lapack=lapack" (if use64BitIdx then "--enable-64" else "--disable-64") ] - ++ lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-link-all-dependencies" ] ++ lib.optionals enableReadline [ "--enable-readline" ] - ++ lib.optionals stdenv.isDarwin [ "--with-x=no" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-x=no" ] ++ lib.optionals enableQt [ "--with-qt=5" ] ; diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 2afdcded3db4b..23336cb8f4783 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (rec { # the libxcrypt port has been installed. # # Without libxcrypt, Perl will still find FreeBSD's crypt functions. - propagatedBuildInputs = lib.optional (enableCrypt && !stdenv.isFreeBSD) libxcrypt; + propagatedBuildInputs = lib.optional (enableCrypt && !stdenv.hostPlatform.isFreeBSD) libxcrypt; disallowedReferences = [ stdenv.cc ]; @@ -70,8 +70,8 @@ stdenv.mkDerivation (rec { ++ lib.optional (lib.versionOlder version "5.38.0") ./no-sys-dirs-5.31.patch ++ lib.optional (lib.versionAtLeast version "5.38.0") ./no-sys-dirs-5.38.0.patch - ++ lib.optional stdenv.isSunOS ./ld-shared.patch - ++ lib.optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] + ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] ++ lib.optional crossCompiling ./cross.patch; # This is not done for native builds because pwd may need to come from @@ -107,7 +107,7 @@ stdenv.mkDerivation (rec { "-Dloclibpth=${libcLib}/lib" ] ++ lib.optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] - ++ lib.optional stdenv.isSunOS "-Dcc=gcc" + ++ lib.optional stdenv.hostPlatform.isSunOS "-Dcc=gcc" ++ lib.optional enableThreading "-Dusethreads" ++ lib.optional (!enableCrypt) "-A clear:d_crypt_r" ++ lib.optional stdenv.hostPlatform.isStatic "--all-static" @@ -116,7 +116,7 @@ stdenv.mkDerivation (rec { "-Dman1dir=${placeholder "out"}/share/man/man1" "-Dman3dir=${placeholder "out"}/share/man/man3" ] - ++ lib.optionals (stdenv.isFreeBSD && crossCompiling && enableCrypt) [ + ++ lib.optionals (stdenv.hostPlatform.isFreeBSD && crossCompiling && enableCrypt) [ # https://github.com/Perl/perl5/issues/22295 # configure cannot figure out that we have crypt automatically, but we really do "-Dd_crypt" @@ -157,7 +157,7 @@ stdenv.mkDerivation (rec { GZIP_OS_CODE = AUTO_DETECT USE_ZLIB_NG = False EOF - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" '' + lib.optionalString (!enableThreading) '' # We need to do this because the bootstrap doesn't have a static libpthread diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 204bf316e8425..9482ca500eb9c 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix ((removeAttrs _args [ "fetchpatch" ]) // { - version = "8.1.29"; - hash = "sha256-h6YDEyY/L1M/GA5xknLKXkfNmITU7DyTcgGY6v+uCCc="; + version = "8.1.30"; + hash = "sha256-yxYl5axJuRA3R34+d2e7BiQ0OXGuuZL0eRthivVx0j4="; extraPatches = [ # Fix build with libxml2 2.12+. # Patch from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 7b533cb13ea98..50f70617fe1cd 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.22"; - hash = "sha256-Wq5ZZMYFMxhfm+koz315oTOTzFVgzt8fS5d5RMx2pYU="; + version = "8.2.24"; + hash = "sha256-TMduxkTu6X0XySv+jQ6EcU/t8pmlOLffrcBjndDcQy8="; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index bb314d4e854d6..cc7d87038a7dc 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.3.11"; - hash = "sha256-ZkDiRVCAqJrcQdTle7BPjCv7fuxif+GZr5c7/zTX8O4="; + version = "8.3.12"; + hash = "sha256-gHYzSWzNs3CokFRY24K9ZzZumKbVlyiRS3l7h+nK7L8="; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 458804e2e51dd..13e10103f54f9 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -58,7 +58,7 @@ let , zendSignalsSupport ? true , zendMaxExecutionTimersSupport ? false , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd - , valgrindSupport ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind + , valgrindSupport ? !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind , ztsSupport ? apxs2Support }@args: @@ -213,7 +213,7 @@ let enableParallelBuilding = true; nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] - ++ lib.optional stdenv.isDarwin xcbuild; + ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; buildInputs = # PCRE extension @@ -285,7 +285,7 @@ let if [ -f "scripts/dev/genfiles" ]; then ./scripts/dev/genfiles fi - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace-fail "-lstdc++" "-lc++" ''; diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index d27efe1f2b828..eaf08de7b9948 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=implicit-function-declaration" ]); @@ -23,7 +23,7 @@ stdenv.mkDerivation { # Tests are currently broken on i686 see # https://hydra.nixos.org/build/24003763/nixlog/1 - doCheck = !stdenv.isi686 && !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isAarch64; checkTarget = "test"; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index af9bbc47475b9..abb66b38e3cc3 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -137,14 +137,14 @@ let revert = true; hash = "sha256-Lp5fGlcfJJ6p6vKmcLckJiAA2AZz4prjFE0aMEJxotw="; }) - ] ++ lib.optionals (x11Support && stdenv.isDarwin) [ + ] ++ lib.optionals (x11Support && stdenv.hostPlatform.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Fix darwin build https://bugs.python.org/issue34027 ../3.7/darwin-libutil.patch - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since # ldconfig doesn't work on NixOS), and don't use @@ -188,7 +188,7 @@ let for i in Lib/plat-*/regen; do substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/ done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' substituteInPlace Lib/multiprocessing/__init__.py \ --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")' @@ -205,7 +205,7 @@ let "--enable-unicode=ucs${toString ucsEncoding}" ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ "ac_cv_func_bind_textdomain_codeset=yes" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-toolbox-glue" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "PYTHON_FOR_BUILD=${lib.getBin buildPackages.python}/bin/python" @@ -240,7 +240,7 @@ let lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl zlib libffi expat db gdbm ncurses sqlite readline ] ++ lib.optionals x11Support [ tcl tk libX11 ] - ++ lib.optional (stdenv.isDarwin && configd != null) configd; + ++ lib.optional (stdenv.hostPlatform.isDarwin && configd != null) configd; nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) @@ -264,7 +264,7 @@ in with passthru; stdenv.mkDerivation ({ inherit src patches buildInputs nativeBuildInputs preConfigure configureFlags; - LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2" diff --git a/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch index c259aed72b990..e65883ab895a4 100644 --- a/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch @@ -11,61 +11,6 @@ diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 0c2510e..7fb98af 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -100,53 +100,7 @@ elif os.name == "posix": - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -+ return None - - - if sys.platform == "sunos5": @@ -268,34 +222,7 @@ elif os.name == "posix": else: diff --git a/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch index ca6a76d0ffd98..bafcaee7c980e 100644 --- a/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch @@ -11,61 +11,6 @@ diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 0c2510e161..7fb98af308 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -100,53 +100,7 @@ def _is_elf(filename): - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -+ return None - - - if sys.platform == "sunos5": @@ -268,34 +222,7 @@ def find_library(name, is64 = False): else: diff --git a/pkgs/development/interpreters/python/cpython/3.12/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.12/no-ldconfig.patch index ca6a76d0ffd98..bafcaee7c980e 100644 --- a/pkgs/development/interpreters/python/cpython/3.12/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.12/no-ldconfig.patch @@ -11,61 +11,6 @@ diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 0c2510e161..7fb98af308 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -100,53 +100,7 @@ def _is_elf(filename): - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -+ return None - - - if sys.platform == "sunos5": @@ -268,34 +222,7 @@ def find_library(name, is64 = False): else: diff --git a/pkgs/development/interpreters/python/cpython/3.13/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.13/no-ldconfig.patch index ca6a76d0ffd98..bafcaee7c980e 100644 --- a/pkgs/development/interpreters/python/cpython/3.13/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.13/no-ldconfig.patch @@ -11,61 +11,6 @@ diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 0c2510e161..7fb98af308 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -100,53 +100,7 @@ def _is_elf(filename): - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -+ return None - - - if sys.platform == "sunos5": @@ -268,34 +222,7 @@ def find_library(name, is64 = False): else: diff --git a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch index 41d3ab52345b2..1a5eccb9eca83 100644 --- a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch @@ -11,61 +11,6 @@ diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 0c2510e161..7fb98af308 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -100,53 +100,7 @@ elif os.name == "posix": - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -+ return None - - - if sys.platform == "sunos5": @@ -268,34 +222,7 @@ elif os.name == "posix": else: diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 56e0be3ea59cb..6d4bd47ba294b 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -70,7 +70,7 @@ , enableNoSemanticInterposition ? true # enabling LTO on 32bit arch causes downstream packages to fail when linking -, enableLTO ? stdenv.isDarwin || (stdenv.is64bit && stdenv.isLinux) +, enableLTO ? stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.is64bit && stdenv.hostPlatform.isLinux) # enable asserts to ensure the build remains reproducible , reproducibleBuild ? false @@ -95,7 +95,7 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; -assert lib.assertMsg (enableFramework -> stdenv.isDarwin) +assert lib.assertMsg (enableFramework -> stdenv.hostPlatform.isDarwin) "Framework builds are only supported on Darwin."; assert lib.assertMsg (reproducibleBuild -> stripBytecode) @@ -152,7 +152,7 @@ let nativeBuildInputs = [ nukeReferences - ] ++ optionals (!stdenv.isDarwin) [ + ] ++ optionals (!stdenv.hostPlatform.isDarwin) [ autoconf-archive # needed for AX_CHECK_COMPILE_FLAG autoreconfHook pkg-config @@ -181,7 +181,7 @@ let ] ++ optionals stdenv.hostPlatform.isMinGW [ windows.dlfcn windows.mingw_w64_pthreads - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ configd ] ++ optionals tzdataSupport [ tzdata @@ -293,9 +293,9 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { bash # only required for patchShebangs ] ++ buildInputs; - prePatch = optionalString stdenv.isDarwin '' + prePatch = optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace-fail '`/usr/bin/arch`' '"i386"' - '' + optionalString (pythonOlder "3.9" && stdenv.isDarwin && x11Support) '' + '' + optionalString (pythonOlder "3.9" && stdenv.hostPlatform.isDarwin && x11Support) '' # Broken on >= 3.9; replaced with ./3.9/darwin-tcl-tk.patch substituteInPlace setup.py --replace-fail /Library/Frameworks /no-such-path ''; @@ -307,7 +307,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). noldconfigPatch - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.isFreeBSD) [ + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ # Cross compilation only supports a limited number of "known good" # configurations. If you're reading this and it's been a long time # since this diff, consider submitting this patch upstream! @@ -327,7 +327,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ./3.7/darwin-libutil.patch ] ++ optionals (pythonAtLeast "3.11") [ ./3.11/darwin-libutil.patch - ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [ + ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [ # Stop checking for TCL/TK in global macOS locations ./3.9/darwin-tcl-tk.patch ] ++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [ @@ -384,7 +384,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { env = { CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); - LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"}"; + LIBS = "${optionalString (!stdenv.hostPlatform.isDarwin) "-lcrypt"}"; NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ({ "glibc" = "-lgcc_s"; "musl" = "-lgcc_eh"; @@ -414,7 +414,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { (enableFeature enableGIL "gil") ] ++ optionals enableOptimizations [ "--enable-optimizations" - ] ++ optionals (stdenv.isDarwin && configd == null) [ + ] ++ optionals (stdenv.hostPlatform.isDarwin && configd == null) [ # Make conditional on Darwin for now to avoid causing Linux rebuilds. "py_cv_module__scproxy=n/a" ] ++ optionals (sqlite != null) [ @@ -467,16 +467,16 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { for path in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace-warn $path /no-such-path done - '' + optionalString stdenv.isDarwin '' + '' + optionalString stdenv.hostPlatform.isDarwin '' # Override the auto-detection in setup.py, which assumes a universal build - export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"} + export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"} # Ensure that modern platform features are enabled on Darwin in spite of having no version suffix. sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure '' + optionalString (pythonAtLeast "3.11") '' # Also override the auto-detection in `configure`. substituteInPlace configure \ - --replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${if stdenv.isAarch64 then "uint128" else "x64"}' - '' + optionalString (stdenv.isDarwin && x11Support && pythonAtLeast "3.11") '' + --replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"}' + '' + optionalString (stdenv.hostPlatform.isDarwin && x11Support && pythonAtLeast "3.11") '' export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}" export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include" '' + optionalString stdenv.hostPlatform.isMusl '' @@ -686,5 +686,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "python3" ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd; mainProgram = executable; + maintainers = lib.teams.python.members; }; }) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a35418857d52f..f8e886c803d62 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -47,10 +47,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "19"; + patch = "20"; suffix = ""; }; - hash = "sha256-1Iks0WGPZFjLhRIIwDDfFIJ3lgnQ85OZkb04GE+MZ54="; + hash = "sha256-aygSee/YUpTS1pk+FzmDpXRkwBM5Vvu7VTbslka+rww="; inherit (darwin) configd; inherit passthruFun; }; @@ -60,10 +60,10 @@ in { sourceVersion = { major = "3"; minor = "10"; - patch = "14"; + patch = "15"; suffix = ""; }; - hash = "sha256-nFBIH6qMKDIym6D8iGjQpgamgPxPYOxI0mzo4HZ1H9o="; + hash = "sha256-qrCVCBdzUXJgGHmHLZN8HkkopXxAmuAjaew9kdzOvnk="; inherit (darwin) configd; inherit passthruFun; }; @@ -93,9 +93,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "rc1"; + suffix = "rc3"; }; - hash = "sha256-Z4uIR3XuwCJNUVn6kAh5AgusoqNs6UL9lf6/oa20pr0="; + hash = "sha256-yLx5AYWvHLd7dcAcvBqmQt/c+Xo3DS0QCQvHuqcNpX4="; inherit (darwin) configd; inherit passthruFun; }; @@ -139,7 +139,7 @@ in { hash = "sha256-3WHYjaJ0ws4s7HdmfUo9+aZSvMUOJvkJkdTdCvZrzPQ="; pythonVersion = "2.7"; - db = db.override { dbmSupport = !stdenv.isDarwin; }; + db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; }; python = __splicedPackages.pythonInterpreters.pypy27_prebuilt; inherit passthruFun; inherit (darwin) libunwind; @@ -156,7 +156,7 @@ in { hash = "sha256-56IEbH5sJfw4aru1Ey6Sp8wkkeOTVpmpRstdy7NCwqo="; pythonVersion = "3.9"; - db = db.override { dbmSupport = !stdenv.isDarwin; }; + db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; }; python = __splicedPackages.pypy27; inherit passthruFun; inherit (darwin) libunwind; diff --git a/pkgs/development/interpreters/python/editable.nix b/pkgs/development/interpreters/python/editable.nix new file mode 100644 index 0000000000000..df63bbd14fe32 --- /dev/null +++ b/pkgs/development/interpreters/python/editable.nix @@ -0,0 +1,99 @@ +{ + buildPythonPackage, + lib, + hatchling, + tomli-w, +}: +{ + pname, + version, + + # Editable root as string. + # Environment variables will be expanded at runtime using os.path.expandvars. + root, + + # Arguments passed on verbatim to buildPythonPackage + derivationArgs ? { }, + + # Python dependencies + dependencies ? [ ], + optional-dependencies ? { }, + + # PEP-518 build-system https://peps.python.org/pep-518 + build-system ? [ ], + + # PEP-621 entry points https://peps.python.org/pep-0621/#entry-points + scripts ? { }, + gui-scripts ? { }, + entry-points ? { }, + + passthru ? { }, + meta ? { }, +}: + +# Create a PEP-660 (https://peps.python.org/pep-0660/) editable package pointing to an impure location outside the Nix store. +# The primary use case of this function is to enable local development workflows where the local package is installed into a virtualenv-like environment using withPackages. + +assert lib.isString root; +let + # In editable mode build-system's are considered to be runtime dependencies. + dependencies' = dependencies ++ build-system; + + pyproject = { + # PEP-621 project table + project = { + name = pname; + inherit + version + scripts + gui-scripts + entry-points + ; + dependencies = map lib.getName dependencies'; + optional-dependencies = lib.mapAttrs (_: lib.getName) optional-dependencies; + }; + + # Allow empty package + tool.hatch.build.targets.wheel.bypass-selection = true; + + # Include our editable pointer file in build + tool.hatch.build.targets.wheel.force-include."_${pname}.pth" = "_${pname}.pth"; + + # Build editable package using hatchling + build-system = { + requires = [ "hatchling" ]; + build-backend = "hatchling.build"; + }; + }; + +in +buildPythonPackage ( + { + inherit + pname + version + optional-dependencies + passthru + meta + ; + dependencies = dependencies'; + + pyproject = true; + + unpackPhase = '' + python -c "import json, tomli_w; print(tomli_w.dumps(json.load(open('$pyprojectContentsPath'))))" > pyproject.toml + echo 'import os.path, sys; sys.path.insert(0, os.path.expandvars("${root}"))' > _${pname}.pth + ''; + + build-system = [ hatchling ]; + } + // derivationArgs + // { + # Note: Using formats.toml generates another intermediary derivation that needs to be built. + # We inline the same functionality for better UX. + nativeBuildInputs = (derivationArgs.nativeBuildInputs or [ ]) ++ [ tomli-w ]; + pyprojectContents = builtins.toJSON pyproject; + passAsFile = [ "pyprojectContents" ]; + preferLocalBuild = true; + } +) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index d75fea0eaef14..086ebfb3ed045 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -307,7 +307,7 @@ let inherit strictDeps; - LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + LANG = "${if python.stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8"; # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 0380c29e9e755..3dcbce42cf0a6 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -63,7 +63,7 @@ in with passthru; stdenv.mkDerivation rec { zlib ] ++ lib.optionals (lib.any (l: l == optimizationLevel) [ "0" "1" "2" "3"]) [ boehmgc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libunwind Security ]; @@ -132,9 +132,9 @@ in with passthru; stdenv.mkDerivation rec { runHook postInstall ''; - preFixup = lib.optionalString (stdenv.isDarwin) '' + preFixup = lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable} - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' mkdir -p $out/${executable}-c/pypy/bin mv $out/bin/${executable} $out/${executable}-c/pypy/bin/${executable} ln -s $out/${executable}-c/pypy/bin/${executable} $out/bin/${executable} diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 4b47c642eca4c..95e392bc37b71 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -71,15 +71,15 @@ in with passthru; stdenv.mkDerivation { sqlite zlib stdenv.cc.cc.libgcc or null - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ tcl-8_5 tk-8_5 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tcl-8_6 tk-8_6 ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall @@ -88,7 +88,7 @@ in with passthru; stdenv.mkDerivation { echo "Moving files to $out" mv -t $out bin include lib mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' rm $out/bin/*.debug ''} @@ -101,12 +101,12 @@ in with passthru; stdenv.mkDerivation { runHook postInstall ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' find $out/{lib,lib_pypy*} -name "*.so" \ -exec patchelf \ --replace-needed libtinfow.so.6 libncursesw.so.6 \ --replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool \ -change \ @rpath/lib${libPrefix}-c.dylib \ @@ -119,12 +119,12 @@ in with passthru; stdenv.mkDerivation { $out/bin/${libPrefix} install_name_tool \ -change \ - /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ + /opt/homebrew${lib.optionalString stdenv.hostPlatform.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ ${tcl-8_6}/lib/libtcl8.6.dylib \ $out/lib/${libPrefix}/_tkinter/*.so install_name_tool \ -change \ - /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ + /opt/homebrew${lib.optionalString stdenv.hostPlatform.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ ${tk-8_6}/lib/libtk8.6.dylib \ $out/lib/${libPrefix}/_tkinter/*.so ''; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 37a06f9f61ed5..0d7e2d131abc0 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -71,15 +71,15 @@ in with passthru; stdenv.mkDerivation { sqlite zlib stdenv.cc.cc.libgcc or null - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ tcl-8_5 tk-8_5 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tcl-8_6 tk-8_6 ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall @@ -88,7 +88,7 @@ in with passthru; stdenv.mkDerivation { echo "Moving files to $out" mv -t $out bin include lib-python lib_pypy site-packages mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' mv lib/libffi.so.6* $out/lib/ rm $out/bin/*.debug ''} @@ -102,12 +102,12 @@ in with passthru; stdenv.mkDerivation { runHook postInstall ''; - preFixup = lib.optionalString (stdenv.isLinux) '' + preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) '' find $out/{lib,lib_pypy*} -name "*.so" \ -exec patchelf \ --replace-needed libtinfow.so.6 libncursesw.so.6 \ --replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \; - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool \ -change \ @rpath/lib${executable}-c.dylib \ @@ -115,12 +115,12 @@ in with passthru; stdenv.mkDerivation { $out/bin/${executable} install_name_tool \ -change \ - /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ + /opt/homebrew${lib.optionalString stdenv.hostPlatform.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ ${tcl-8_6}/lib/libtcl8.6.dylib \ $out/lib_pypy/_tkinter/*.so install_name_tool \ -change \ - /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ + /opt/homebrew${lib.optionalString stdenv.hostPlatform.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ ${tk-8_6}/lib/libtk8.6.dylib \ $out/lib_pypy/_tkinter/*.so ''; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index edd0937098b6a..9fad8e56d5d4b 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -61,6 +61,8 @@ let removePythonPrefix = lib.removePrefix namePrefix; + mkPythonEditablePackage = callPackage ./editable.nix { }; + mkPythonMetaPackage = callPackage ./meta-package.nix { }; # Convert derivation to a Python module. @@ -99,7 +101,7 @@ in { inherit buildPythonPackage buildPythonApplication; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; - inherit mkPythonMetaPackage; + inherit mkPythonMetaPackage mkPythonEditablePackage; python = toPythonModule python; diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index 0fb6a5d57f220..427c942410705 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -204,7 +204,7 @@ let inherit strictDeps; - LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + LANG = "${if python.stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8"; # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; diff --git a/pkgs/development/interpreters/python/rustpython/default.nix b/pkgs/development/interpreters/python/rustpython/default.nix index febb7f5cfa248..98d3ed7c0efb4 100644 --- a/pkgs/development/interpreters/python/rustpython/default.nix +++ b/pkgs/development/interpreters/python/rustpython/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { # freeze the stdlib into the rustpython binary cargoBuildFlags = [ "--features=freeze-stdlib" ]; - buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration ]; nativeCheckInputs = [ python3 ]; @@ -41,6 +41,6 @@ rustPlatform.buildRustPackage rec { # "_utimensat", referenced from: # rustpython_vm::function::builtin::IntoPyNativeFn::into_func::... in # rustpython-10386d81555652a7.rustpython_vm-f0b5bedfcf056d0b.rustpython_vm.7926b68e665728ca-cgu.08.rcgu.o.rcgu.o - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 2cd29ca990321..6574b6295744c 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -38,7 +38,7 @@ let is_nixenv = "False"; is_virtualenv = "False"; }; - } // lib.optionalAttrs (!python.isPyPy && !stdenv.isDarwin) { + } // lib.optionalAttrs (!python.isPyPy && !stdenv.hostPlatform.isDarwin) { # Use virtualenv from a Nix env. # Fails on darwin with # virtualenv: error: argument dest: the destination . is not write-able at /nix/store @@ -106,7 +106,7 @@ let # Integration tests involving the package set. # All PyPy package builds are broken at the moment integrationTests = lib.optionalAttrs (!python.isPyPy) ( - lib.optionalAttrs (python.isPy3k && !stdenv.isDarwin) { # darwin has no split-debug + lib.optionalAttrs (python.isPy3k && !stdenv.hostPlatform.isDarwin) { # darwin has no split-debug cpython-gdb = callPackage ./tests/test_cpython_gdb { interpreter = python; }; @@ -122,6 +122,43 @@ let } ); + # Test editable package support + editableTests = let + testPython = python.override { + self = testPython; + packageOverrides = pyfinal: pyprev: { + # An editable package with a script that loads our mutable location + my-editable = pyfinal.mkPythonEditablePackage { + pname = "my-editable"; + version = "0.1.0"; + root = "$NIX_BUILD_TOP/src"; # Use environment variable expansion at runtime + # Inject a script + scripts = { + my-script = "my_editable.main:main"; + }; + }; + }; + }; + + + in { + editable-script = runCommand "editable-test" { + nativeBuildInputs = [ (testPython.withPackages (ps: [ ps.my-editable ])) ]; + } '' + mkdir -p src/my_editable + + cat > src/my_editable/main.py << EOF + def main(): + print("hello mutable") + EOF + + test "$(my-script)" == "hello mutable" + test "$(python -c 'import sys; print(sys.path[1])')" == "$NIX_BUILD_TOP/src" + + touch $out + ''; + }; + # Tests to ensure overriding works as expected. overrideTests = let extension = self: super: { @@ -185,11 +222,11 @@ let } ) {}; pythonWithRequests = requests.pythonModule.withPackages (ps: [ requests ]); - in lib.optionalAttrs (python.isPy3k && stdenv.isLinux) + in lib.optionalAttrs (python.isPy3k && stdenv.hostPlatform.isLinux) { condaExamplePackage = runCommand "import-requests" {} '' ${pythonWithRequests.interpreter} -c "import requests" > $out ''; }; -in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests // overrideTests // condaTests) +in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests // overrideTests // condaTests // editableTests) diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 57153383fc189..dd6dcb2c70ad7 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -162,7 +162,18 @@ def _fetch_github(url): def _hash_to_sri(algorithm, value): """Convert a hash to its SRI representation""" return ( - subprocess.check_output(["nix", "hash", "to-sri", "--type", algorithm, value]) + subprocess.check_output( + [ + "nix", + "--extra-experimental-features", + "nix-command", + "hash", + "to-sri", + "--type", + algorithm, + value, + ] + ) .decode() .strip() ) @@ -250,6 +261,8 @@ def get_prefix(string): homepage = subprocess.check_output( [ "nix", + "--extra-experimental-features", + "nix-command", "eval", "-f", f"{NIXPKGS_ROOT}/default.nix", diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix deleted file mode 100644 index 447f486a0914a..0000000000000 --- a/pkgs/development/interpreters/quickjs/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchurl -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "quickjs"; - version = "2024-01-13"; - - src = fetchurl { - url = "https://bellard.org/quickjs/quickjs-${version}.tar.xz"; - hash = "sha256-PEv4+JW/pUvrSGyNEhgRJ3Hs/FrDvhA2hR70FWghLgM="; - }; - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace "CONFIG_LTO=y" "" - ''; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - enableParallelBuilding = true; - - nativeBuildInputs = [ - texinfo - ]; - - postBuild = '' - (cd doc - makeinfo *texi) - ''; - - postInstall = '' - (cd doc - install -Dt $out/share/doc *texi *info) - ''; - - doInstallCheck = true; - installCheckPhase = '' - PATH="$out/bin:$PATH" - - # Programs exit with code 1 when testing help, so grep for a string - set +o pipefail - qjs --help 2>&1 | grep "QuickJS version" - qjscalc --help 2>&1 | grep "QuickJS version" - set -o pipefail - - temp=$(mktemp).js - echo "console.log('Output from compiled program');" > "$temp" - set -o verbose - out=$(mktemp) && qjsc -o "$out" "$temp" && "$out" | grep -q "Output from compiled program" - out=$(mktemp) && qjsc -flto -o "$out" "$temp" && "$out" | grep -q "Output from compiled program" - ''; - - meta = with lib; { - description = "Small and embeddable Javascript engine"; - homepage = "https://bellard.org/quickjs/"; - maintainers = with maintainers; [ stesie AndersonTorres ]; - platforms = platforms.unix; - license = licenses.mit; - mainProgram = "qjs"; - }; -} diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 6f06b31b56a62..4a16416374ff1 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -56,7 +56,7 @@ let readline sqlite ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU ] @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; NIX_LDFLAGS = lib.concatStringsSep " " [ - (lib.optionalString (stdenv.cc.isGNU && !stdenv.isDarwin) "-lgcc_s") + (lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isDarwin) "-lgcc_s") ]; nativeBuildInputs = [ @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { gtk3 ncurses ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreFoundation ]; @@ -141,15 +141,15 @@ stdenv.mkDerivation rec { cd src/build '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath}) gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive") '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath}) ''; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' # Cannot set DYLD_LIBRARY_PATH as an attr of this drv, becasue dynamic # linker environment variables like this are purged. # See: https://apple.stackexchange.com/a/212954/167199 @@ -163,14 +163,14 @@ stdenv.mkDerivation rec { export DYLD_FALLBACK_LIBRARY_PATH="${libPath}" ''; - shared = if stdenv.isDarwin then "dylib" else "shared"; + shared = if stdenv.hostPlatform.isDarwin then "dylib" else "shared"; configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-strip" "--enable-xonx" ]; @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Programmable programming language"; diff --git a/pkgs/development/interpreters/racket/racket_7_9.nix b/pkgs/development/interpreters/racket/racket_7_9.nix index 91f7654fcad29..c82d232e11a4d 100644 --- a/pkgs/development/interpreters/racket/racket_7_9.nix +++ b/pkgs/development/interpreters/racket/racket_7_9.nix @@ -76,8 +76,8 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; NIX_LDFLAGS = lib.concatStringsSep " " [ - (lib.optionalString (stdenv.cc.isGNU && !stdenv.isDarwin) "-lgcc_s") - (lib.optionalString stdenv.isDarwin "-framework CoreFoundation") + (lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isDarwin) "-lgcc_s") + (lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation") ]; nativeBuildInputs = [ @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreFoundation ]; @@ -110,14 +110,14 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) ''; - shared = if stdenv.isDarwin then "dylib" else "shared"; + shared = if stdenv.hostPlatform.isDarwin then "dylib" else "shared"; configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.isDarwin [ "--enable-xonx" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-xonx" ]; configureScript = "../configure"; @@ -145,6 +145,6 @@ stdenv.mkDerivation rec { "x86_64-linux" "aarch64-linux" ]; - broken = stdenv.isDarwin; # No support yet for setting FFI lookup path + broken = stdenv.hostPlatform.isDarwin; # No support yet for setting FFI lookup path }; } diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 9381e8a15860f..0a1ee9065a0a8 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -4,6 +4,7 @@ stdenv.mkDerivation rec { pname = "rakudo"; version = "2024.06"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "rakudo"; repo = "rakudo"; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index a42c4a49705a0..5537f13041d7d 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { pname = "moarvm"; version = "2024.06"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "moarvm"; repo = "moarvm"; @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Configure.pl \ --replace '`/usr/bin/arch`' '"${stdenv.hostPlatform.darwinArch}"' \ --replace '/usr/bin/arch' "$(type -P true)" \ @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { --replace '`sw_vers -productVersion`' '"11.0"' ''; - buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; + buildInputs = [ perl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ApplicationServices ]; doCheck = false; # MoarVM does not come with its own test suite configureScript = "${perl}/bin/perl ./Configure.pl"; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 9ceaba4446adb..499e7cda3e280 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -4,6 +4,7 @@ stdenv.mkDerivation rec { pname = "nqp"; version = "2024.06"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "raku"; repo = "nqp"; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 73ff0b885185e..542164aeebf4f 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.22.1"; + version = "0.22.2"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-zvFmh4Q1Q6gizxdCCoOX2hgQ7/f8ozczY7IwWqMKGSo="; + hash = "sha256-uMVfBptiCungO+XJMlwV2Fhs2jgVNDOqUFqgJPV5RhM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 596c778c0ff5b..369d242192ac7 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -78,7 +78,7 @@ let nativeBuildInputs = [ autoreconfHook bison removeReferencesTo ] ++ (op docSupport groff) - ++ (ops (dtraceSupport && stdenv.isLinux) [ systemtap libsystemtap ]) + ++ (ops (dtraceSupport && stdenv.hostPlatform.isLinux) [ systemtap libsystemtap ]) ++ ops yjitSupport [ rustPlatform.cargoSetupHook cargo rustc ] ++ op useBaseRuby baseRuby; buildInputs = [ autoconf ] @@ -92,8 +92,8 @@ let # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're # running on darwin - ++ op (!cursesSupport && stdenv.isDarwin) readline - ++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ]; + ++ op (!cursesSupport && stdenv.hostPlatform.isDarwin) readline + ++ ops stdenv.hostPlatform.isDarwin [ libiconv libobjc libunwind Foundation ]; propagatedBuildInputs = op jemallocSupport jemalloc; enableParallelBuilding = true; @@ -156,7 +156,7 @@ let # overrides that by enabling `-O2` which is the minimum optimization # needed for `_FORTIFY_SOURCE`. ] ++ lib.optional stdenv.cc.isGNU "CFLAGS=-O3" ++ [ - ] ++ ops stdenv.isDarwin [ + ] ++ ops stdenv.hostPlatform.isDarwin [ # on darwin, we have /usr/include/tk.h -- so the configure script detects # that tk is installed "--with-out-ext=tk" diff --git a/pkgs/development/interpreters/rune/default.nix b/pkgs/development/interpreters/rune/default.nix index f4dc8ef1f7452..41d61aa9cc8b0 100644 --- a/pkgs/development/interpreters/rune/default.nix +++ b/pkgs/development/interpreters/rune/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-yMqxd7PlpEEVS0jJwProaVjKUsU5TuebGTMrWiMFsM8="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/interpreters/snobol4/default.nix b/pkgs/development/interpreters/snobol4/default.nix index 2d276e6a03629..c0edda03dc64c 100644 --- a/pkgs/development/interpreters/snobol4/default.nix +++ b/pkgs/development/interpreters/snobol4/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # enable all features (undocumented, based on manual review of configure script) buildInputs = [ bzip2 libffi openssl readline sqlite tcl xz zlib ] # ndbm compat library - ++ lib.optional stdenv.isLinux gdbm; + ++ lib.optional stdenv.hostPlatform.isLinux gdbm; configureFlags = lib.optional (tcl != null) "--with-tcl=${tcl}/lib/tclConfig.sh"; # INSTALL says "parallel make will fail" diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index cc1d3923fef98..5feca82f6cf13 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: rec { ] ++ lib.optionals (lib.versionOlder version "91") [ autoconf213 yasm # to buid icu? seems weird - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: rec { nspr readline zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc libiconv ]; @@ -213,7 +213,7 @@ stdenv.mkDerivation (finalAttrs: rec { homepage = "https://spidermonkey.dev/"; license = licenses.mpl20; # TODO: MPL/GPL/LGPL tri-license for 78. maintainers = with maintainers; [ abbradar lostnet catap ]; - broken = stdenv.isDarwin && versionAtLeast version "115"; # Requires SDK 13.3 (see #242666). + broken = stdenv.hostPlatform.isDarwin && versionAtLeast version "115"; # Requires SDK 13.3 (see #242666). platforms = platforms.unix; }; }) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 7eb0de6f689f0..344d007031640 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] - ++ lib.optional (!stdenv.isDarwin) alsa-lib + ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib ++ lib.optional useSCEL emacs; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 63eafd9c3e81c..5df6fb28a3040 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -36,7 +36,7 @@ let # Don't install tzdata because NixOS already has a more up-to-date copy. "--with-tzdata=no" "tcl_cv_strtod_unbroken=ok" - ] ++ lib.optional stdenv.is64bit "--enable-64bit"; + ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/tclreadline/default.nix b/pkgs/development/interpreters/tclreadline/default.nix index de671bab57391..de5f3174506b6 100644 --- a/pkgs/development/interpreters/tclreadline/default.nix +++ b/pkgs/development/interpreters/tclreadline/default.nix @@ -41,7 +41,7 @@ tcl.mkTclDerivation rec { # The provided makefile leaves a wrong reference to /build/ in RPATH, # so we fix it after checking that everything is also present in $out - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' needed_libraries=$(ls .libs | grep '\.\(so\|la\)$') for lib in $needed_libraries; do if ! ls $out/lib | grep "$lib"; then diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index f0a45495d70dc..4435b9c02925b 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Very high level, goal-directed, object-oriented, general purpose applications language"; maintainers = [ ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/wamr/default.nix b/pkgs/development/interpreters/wamr/default.nix index e5b9b904a0611..36a484b2ddceb 100644 --- a/pkgs/development/interpreters/wamr/default.nix +++ b/pkgs/development/interpreters/wamr/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}" ]; sourceRoot = let - platform = if stdenv.isLinux then + platform = if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then "darwin" else throw "unsupported platform"; in "${finalAttrs.src.name}/product-mini/platforms/${platform}"; diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 2256851c3d2f8..64ff6306d2eea 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -8,8 +8,8 @@ , CoreFoundation , SystemConfiguration , Security -, withLLVM ? !stdenv.isDarwin -, withSinglepass ? !(stdenv.isDarwin && stdenv.isx86_64) +, withLLVM ? !stdenv.hostPlatform.isDarwin +, withSinglepass ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) }: rustPlatform.buildRustPackage rec { @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { llvmPackages.llvm libffi libxml2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation SystemConfiguration Security diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 8bcb83677b38b..dc4bfced92cb4 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,24 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "24.0.0"; + version = "25.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-pR6yjJf0szjB73+vqXT4d8P9WD+SIOkEOe4Wl6EgIqQ="; + hash = "sha256-3SircJsg/SFyPfIYLHiwXqkQAHXocnUyPYsMRnGaxsA="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-bZtBEmzmu63wNlGhYvN0gYKkLPxzBHZ1iO16BMPD3tE="; + cargoHash = "sha256-CvHrZYZVAY2ff3fSBDMeucOru6NkRRQPILBAC/YjfTA="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # rustfmt is brought into scope to fix the following # warning: cranelift-codegen@0.108.0: @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { install -d -m0755 $dev/include/wasmtime install -m0644 $src/crates/c-api/include/*.h $dev/include install -m0644 $src/crates/c-api/include/wasmtime/*.h $dev/include/wasmtime - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id \ $dev/lib/libwasmtime.dylib \ $dev/lib/libwasmtime.dylib diff --git a/pkgs/development/julia-modules/default.nix b/pkgs/development/julia-modules/default.nix index 9c5c8b8eda5d8..737cb9345a4bf 100644 --- a/pkgs/development/julia-modules/default.nix +++ b/pkgs/development/julia-modules/default.nix @@ -45,7 +45,7 @@ let # Start by wrapping Julia so it has access to Python and any other extra libs. # Also, prevent various packages (CondaPkg.jl, PythonCall.jl) from trying to do network calls. - juliaWrapped = runCommand "julia-${julia.version}-wrapped" { buildInputs = [makeWrapper]; inherit makeWrapperArgs; } '' + juliaWrapped = runCommand "julia-${julia.version}-wrapped" { nativeBuildInputs = [makeWrapper]; inherit makeWrapperArgs; } '' mkdir -p $out/bin makeWrapper ${julia}/bin/julia $out/bin/julia \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLibs}" \ @@ -163,7 +163,7 @@ let in runCommand "julia-${julia.version}-env" { - buildInputs = [makeWrapper]; + nativeBuildInputs = [makeWrapper]; inherit julia; inherit juliaWrapped; diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix index 5dfd6570c0808..e4d86733ab392 100644 --- a/pkgs/development/libraries/LAStools/default.nix +++ b/pkgs/development/libraries/LAStools/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "LAStools"; @@ -19,6 +24,8 @@ stdenv.mkDerivation rec { "format" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing"; + nativeBuildInputs = [ cmake ]; @@ -27,7 +34,7 @@ stdenv.mkDerivation rec { description = "Software for rapid LiDAR processing"; homepage = "http://lastools.org/"; license = licenses.unfree; - maintainers = with maintainers; [ stephenwithph ]; + maintainers = with maintainers; teams.geospatial.members ++ [ stephenwithph ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix deleted file mode 100644 index 8038407090b43..0000000000000 --- a/pkgs/development/libraries/SDL/default.nix +++ /dev/null @@ -1,136 +0,0 @@ -{ lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv -, libGLSupported ? lib.meta.availableOn stdenv.hostPlatform libGL -, openglSupport ? libGLSupported, libGL, libGLU -, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib -, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid -, libXext, libICE, libXrandr -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio, libpulseaudio -, OpenGL, GLUT, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa -}: - -# NOTE: When editing this expression see if the same change applies to -# SDL2 expression too - -let - extraPropagatedBuildInputs = [ ] - ++ lib.optionals x11Support [ libXext libICE libXrandr ] - ++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ] - ++ lib.optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional stdenv.isDarwin Cocoa; - rpath = lib.makeLibraryPath extraPropagatedBuildInputs; -in - -stdenv.mkDerivation rec { - pname = "SDL"; - version = "1.2.15"; - - src = fetchurl { - url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; - }; - - outputs = [ "out" "dev" ]; - outputBin = "dev"; # sdl-config - - nativeBuildInputs = [ pkg-config ] - ++ lib.optional stdenv.isLinux libcap; - - propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs; - - buildInputs = [ ] - ++ lib.optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile - ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; - - configureFlags = [ - "--disable-oss" - "--disable-video-x11-xme" - "--enable-rpath" - # Building without this fails on Darwin with - # - # ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32' - # SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) - # - # Please try revert the change that introduced this comment when updating SDL. - ] ++ lib.optional stdenv.isDarwin "--disable-x11-shared" - ++ lib.optional (!x11Support) "--without-x" - ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"; - - patches = [ - ./find-headers.patch - - # Fix window resizing issues, e.g. for xmonad - # Ticket: http://bugzilla.libsdl.org/show_bug.cgi?id=1430 - (fetchpatch { - name = "fix_window_resizing.diff"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=fix_window_resizing.diff;att=2;bug=665779"; - sha256 = "1z35azc73vvi19pzi6byck31132a8w1vzrghp1x3hy4a4f9z4gc6"; - }) - # Fix drops of keyboard events for SDL_EnableUNICODE - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/0332e2bb18dc68d6892c3b653b2547afe323854b.patch"; - sha256 = "0g458iv6pp9sikdch6ms8svz60lf5ks2q5wgid8s9rydhk98lpp5"; - }) - # Ignore insane joystick axis events - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/ab99cc82b0a898ad528d46fa128b649a220a94f4.patch"; - sha256 = "1b3473sawfdbkkxaqf1hg0vn37yk8hf655jhnjwdk296z4gclazh"; - }) - # https://bugzilla.libsdl.org/show_bug.cgi?id=1769 - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/5d79977ec7a6b58afa6e4817035aaaba186f7e9f.patch"; - sha256 = "1k7y57b1zy5afib1g7w3in36n8cswbcrzdbrjpn5cb105rnb9vmp"; - }) - # Workaround X11 bug to allow changing gamma - # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222 - (fetchpatch { - name = "SDL_SetGamma.patch"; - url = "https://src.fedoraproject.org/rpms/SDL/raw/7a07323e5cec08bea6f390526f86a1ce5341596d/f/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch"; - sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv"; - }) - # Fix a build failure on OS X Mavericks - # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085 - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/19039324be71738d8990e91b9ba341b2ea068445.patch"; - sha256 = "0ckwling2ad27c9vxgp97ndjd098d6zbrydza8b9l77k8airj98c"; - }) - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/7933032ad4d57c24f2230db29f67eb7d21bb5654.patch"; - sha256 = "1by16firaxyr0hjvn35whsgcmq6bl0nwhnpjf75grjzsw9qvwyia"; - }) - (fetchpatch { - name = "CVE-2022-34568.patch"; - url = "https://github.com/libsdl-org/SDL-1.2/commit/d7e00208738a0bc6af302723fe64908ac35b777b.patch"; - sha256 = "sha256-fuxXsqZW94/C8CKu9LakppCU4zHupj66O2MngQ4BO9o="; - }) - ]; - - postInstall = '' - moveToOutput share/aclocal "$dev" - ''; - - # See the same place in the expression for SDL2 - postFixup = '' - for lib in $out/lib/*.so* ; do - if [[ -L "$lib" ]]; then - patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib" - fi - done - ''; - - setupHook = ./setup-hook.sh; - - passthru = { inherit openglSupport; }; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Cross-platform multimedia library"; - mainProgram = "sdl-config"; - homepage = "http://www.libsdl.org/"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 3b423e79ed130..9e319154717bf 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -8,7 +8,7 @@ libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms, openglSupport ? libGLSupported, libGL, - alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib, x11Support ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isAndroid, libX11, @@ -21,7 +21,7 @@ libXext, libXxf86vm, libXrandr, - waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + waylandSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, wayland, wayland-protocols, wayland-scanner, @@ -29,17 +29,18 @@ libdrm, mesa, libxkbcommon, - dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + dbusSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, dbus, - udevSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + udevSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, udev, ibusSupport ? false, ibus, - libdecorSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + libdecorSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, libdecor, - pipewireSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, pipewire, # NOTE: must be built with SDL2 without pipewire support - pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + pulseaudioSupport ? + config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio, AudioUnit, Cocoa, @@ -112,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { dlopenPropagatedBuildInputs = [ ] # Propagated for #include <GLES/gl.h> in SDL_opengles.h. - ++ lib.optional (openglSupport && !stdenv.isDarwin) libGL + ++ lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL # Propagated for #include <X11/Xlib.h> and <X11/Xatom.h> in SDL_syswm.h. ++ lib.optionals x11Support [ libX11 ]; @@ -153,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: { ++ finalAttrs.dlopenBuildInputs ++ lib.optional ibusSupport ibus ++ lib.optionals waylandSupport [ wayland-protocols ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit Cocoa CoreAudio @@ -169,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!x11Support) "--without-x" ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" ++ lib.optional stdenv.hostPlatform.isWindows "--disable-video-opengles" - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-sdltest"; # We remove libtool .la files when static libs are requested, # because they make the builds of downstream libs like `SDL_tff` diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix deleted file mode 100644 index 4a5d54df0e3dc..0000000000000 --- a/pkgs/development/libraries/SDL_compat/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, SDL2 -, libiconv -, Cocoa -, autoSignDarwinBinariesHook -, mesa -, libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms -, openglSupport ? libGLSupported -, libGLU -}: - -let - inherit (lib) optionals makeLibraryPath; - -in -stdenv.mkDerivation rec { - pname = "SDL_compat"; - version = "1.2.68"; - - src = fetchFromGitHub { - owner = "libsdl-org"; - repo = "sdl12-compat"; - rev = "release-" + version; - hash = "sha256-f2dl3L7/qoYNl4sjik1npcW/W09zsEumiV9jHuKnUmM="; - }; - - nativeBuildInputs = [ cmake pkg-config ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; - - propagatedBuildInputs = [ SDL2 ] - ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ] - ++ optionals openglSupport [ libGLU ]; - - enableParallelBuilding = true; - - setupHook = ../SDL/setup-hook.sh; - - postFixup = '' - for lib in $out/lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* ; do - if [[ -L "$lib" ]]; then - ${if stdenv.hostPlatform.isDarwin then '' - install_name_tool ${lib.strings.concatMapStrings (x: " -add_rpath ${makeLibraryPath [x]} ") propagatedBuildInputs} "$lib" - '' else '' - patchelf --set-rpath "$(patchelf --print-rpath $lib):${makeLibraryPath propagatedBuildInputs}" "$lib" - ''} - fi - done - ''; - - meta = with lib; { - description = "Cross-platform multimedia library - build SDL 1.2 applications against 2.0"; - mainProgram = "sdl-config"; - homepage = "https://www.libsdl.org/"; - license = licenses.zlib; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 903364ea27f61..3ba1620fe8f38 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { setOutputFlags = false; # Doesn't support all the flags patches = [ ./clang.patch ] # Fix implicit `int` on `main` error with newer versions of clang - ++ lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin.patch ]; # The fuloong2f is not supported by aalib still preConfigure = '' diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/development/libraries/abseil-cpp/202103.nix index 04af3153719a3..0dfd60d17507a 100644 --- a/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/pkgs/development/libraries/abseil-cpp/202103.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { url = "https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1.patch"; sha256 = "sha256-ayY/aV/xWOdEyFSDqV7B5WDGvZ0ASr/aeBeYwP5RZVc="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages # that require a different SDK other than the default one. ./cmake-core-foundation.patch diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/development/libraries/abseil-cpp/202111.nix deleted file mode 100644 index 303f0c60d6390..0000000000000 --- a/pkgs/development/libraries/abseil-cpp/202111.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, static ? stdenv.hostPlatform.isStatic -, cxxStandard ? null -}: - -stdenv.mkDerivation rec { - pname = "abseil-cpp"; - version = "20211102.0"; - - src = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - rev = version; - sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk="; - }; - - patches = lib.optionals stdenv.isDarwin [ - # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages - # that require a different SDK other than the default one. - ./cmake-core-foundation.patch - ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - ] ++ lib.optionals (cxxStandard != null) [ - "-DCMAKE_CXX_STANDARD=${cxxStandard}" - ]; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Open-source collection of C++ code designed to augment the C++ standard library"; - homepage = "https://abseil.io/"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = [ maintainers.andersk ]; - }; -} diff --git a/pkgs/development/libraries/abseil-cpp/202301.nix b/pkgs/development/libraries/abseil-cpp/202301.nix index 62d98d77a38f3..5024372802461 100644 --- a/pkgs/development/libraries/abseil-cpp/202301.nix +++ b/pkgs/development/libraries/abseil-cpp/202301.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7C/QIXYRyUyNVVE0tqmv8b5g/uWc58iBI5jzdtddQ+U="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages # that require a different SDK other than the default one. ./cmake-core-foundation.patch diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 60de8957d088f..eeb6c07bf11d0 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optional stdenv.hostPlatform.isStatic "--disable-dynamic"; preConfigure = - lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure"; + lib.optionalString stdenv.hostPlatform.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure"; # Autogenerated headers miss interdependencies in Makefile, fail parallel build: # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51329 @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { doCheck = false; postInstall = let suffix = lib.versions.majorMinor version; - in lib.optionalString stdenv.isDarwin '' + in lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libadns.so.${suffix} $out/lib/libadns.so.${suffix} ''; # darwin executables fail, but I don't want to fail the 100-500 packages depending on this lib - doInstallCheck = !stdenv.isDarwin; + doInstallCheck = !stdenv.hostPlatform.isDarwin; installCheckPhase = '' set -eo pipefail diff --git a/pkgs/development/libraries/aemu/default.nix b/pkgs/development/libraries/aemu/default.nix index 0a2f6fa8b8b20..c39c68cbce1e4 100644 --- a/pkgs/development/libraries/aemu/default.nix +++ b/pkgs/development/libraries/aemu/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index e82c3c8dfe77a..eff94a276cd84 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib curl expat openssl python3 ] ++ lib.optionals (with stdenv; isLinux || isDarwin) [ fuse ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = { homepage = "http://afflib.sourceforge.net/"; diff --git a/pkgs/development/libraries/agda/1lab/default.nix b/pkgs/development/libraries/agda/1lab/default.nix index 3e8f3f0de318a..b9cea79b582a7 100644 --- a/pkgs/development/libraries/agda/1lab/default.nix +++ b/pkgs/development/libraries/agda/1lab/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "1lab"; - version = "unstable-2024-03-07"; + version = "unstable-2024-08-05"; src = fetchFromGitHub { - owner = "plt-amy"; + owner = "the1lab"; repo = pname; - rev = "d698f21793c4815082c94d174b9eafae912abb1a"; - hash = "sha256-v8avF9zNNz32kLuAacPdEVeUI9rjn6JCiWPzkXfzBS0="; + rev = "7cc9bf7bbe90be5491e0d64da90a36afa29a540b"; + hash = "sha256-hOyf6ZzejDAFDRj6liFZsBc9bKdxV5bzTPP4kGXIhW0="; }; postPatch = '' diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index fcc100e7a7bb4..661ffd71f839c 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub }: mkDerivation rec { - version = "unstable-2023-10-04"; + version = "unstable-2024-08-22"; pname = "agda-prelude"; src = fetchFromGitHub { owner = "UlfNorell"; repo = "agda-prelude"; - rev = "ff3b13253612caf0784a06e2d7d0f30be16c32e4"; - hash = "sha256-A05uDv3fJqKncea9AL6eQa0XAskLZwAIUl1OAOVeP8I="; + rev = "4230566d3ae229b6a00258587651ac7bfd38d088"; + hash = "sha256-ab+KojzRbkUTAFNH5OA78s0F5SUuXTbliai6badveg4="; }; preConfigure = '' diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index cbf3100347ef7..02f0eb327077e 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "2.1"; + version = "2.1.1"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - hash = "sha256-tv/Fj8ZJgSvieNLlXBjyIR7MSmDp0e2QbN1d/0xBpFg="; + hash = "sha256-4HfwNAkIhk1yC/oSxZ30xilzUM5/22nzbUSqTjcW5Ng="; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index bfa7449b04c65..020c2dce95d89 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype SDL - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - (lib.strings.enableFeature stdenv.isLinux "platform") + (lib.strings.enableFeature stdenv.hostPlatform.isLinux "platform") "--enable-examples=no" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--x-includes=${lib.getDev libX11}/include" "--x-libraries=${lib.getLib libX11}/lib" ]; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 94dd96dae0e72..ee337673ee070 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { physfs texinfo zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpthreadstubs libpulseaudio diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix index 1a6900d298c6e..19f3b28262238 100644 --- a/pkgs/development/libraries/aml/default.nix +++ b/pkgs/development/libraries/aml/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix deleted file mode 100644 index 5543c12ac9ede..0000000000000 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "apache-activemq"; - version = "6.1.2"; - - src = fetchurl { - sha256 = "sha256-EJZWrGvXICxp+eDzrX5BPnl/ZuUMO7utKgaS2c4IBQ0="; - url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; - }; - - installPhase = '' - mkdir -p $out - mv * $out/ - for j in `find $out/lib -name "*.jar"`; do - cp="''${cp:+"$cp:"}$j"; - done - echo "CLASSPATH=$cp" > $out/lib/classpath.env - ''; - - meta = { - homepage = "https://activemq.apache.org/"; - description = "Messaging and Integration Patterns server written in Java"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - }; - -} diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 9490ff1fb6a3e..ea7c9cf8c1680 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl , bdbSupport ? true, db -, ldapSupport ? !stdenv.isCygwin, openldap +, ldapSupport ? !stdenv.hostPlatform.isCygwin, openldap , libiconv, libxcrypt , cyrus_sasl, autoreconfHook }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ./fix-libxcrypt-build.patch # Fix incorrect Berkeley DB detection with newer versions of clang due to implicit `int` on main errors. ./clang-bdb.patch - ] ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; + ] ++ lib.optional stdenv.hostPlatform.isFreeBSD ./include-static-dependencies.patch; NIX_CFLAGS_LINK = [ "-lcrypt" ]; @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper autoreconfHook ]; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] - ++ lib.optional (!stdenv.isCygwin) "--with-crypto" + ++ lib.optional (!stdenv.hostPlatform.isCygwin) "--with-crypto" ++ lib.optional sslSupport "--with-openssl=${openssl.dev}" ++ lib.optional bdbSupport "--with-berkeley-db=${db.dev}" ++ lib.optional ldapSupport "--with-ldap=ldap" - ++ lib.optionals stdenv.isCygwin + ++ lib.optionals stdenv.hostPlatform.isCygwin [ "--without-pgsql" "--without-sqlite2" "--without-sqlite3" "--without-freetds" "--without-berkeley-db" "--without-crypto" ] ; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ++ lib.optional sslSupport openssl ++ lib.optional bdbSupport db ++ lib.optional ldapSupport openldap - ++ lib.optional stdenv.isFreeBSD cyrus_sasl; + ++ lib.optional stdenv.hostPlatform.isFreeBSD cyrus_sasl; postInstall = '' for f in $out/lib/*.la $out/lib/apr-util-1/*.la $dev/bin/apu-1-config; do diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 8e9b8fb88d666..7d127f9367c0f 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "apr"; - version = "1.7.4"; + version = "1.7.5"; src = fetchurl { url = "mirror://apache/apr/${pname}-${version}.tar.bz2"; - sha256 = "sha256-/GSN6YPzoqbJ543qHxgGOb0vrWwG1VbUNnpwH+XDVXc="; + hash = "sha256-zQ9dUrmrFwTHIWDF7j7V09TKLfSn+KtWTjyzUrZyMvI="; }; patches = [ diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index e279a6d6e3695..deeed9ebc9cda 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook3 != null; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.8.31"; + version = "0.8.33"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev = version; - sha256 = "sha256-CsXnwrZqBCS7JVAB/7JlAAvks5HnYxgrdc4Bmg68QdE="; + sha256 = "sha256-D6zcTCaFJxJ2VhhsgEFu5+3Xx1MJov4ryrtA0VkjZlY="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix index 524e00dc5a764..2924c5cf585cc 100644 --- a/pkgs/development/libraries/arguments/default.nix +++ b/pkgs/development/libraries/arguments/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ ]; #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" ]; diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix index 743850c5fdc3b..4079f62782356 100644 --- a/pkgs/development/libraries/aribb25/default.nix +++ b/pkgs/development/libraries/aribb25/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config - ] ++ lib.optional stdenv.isDarwin xcbuild; - buildInputs = if stdenv.isDarwin then [ PCSC ] else [ pcsclite ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; + buildInputs = if stdenv.hostPlatform.isDarwin then [ PCSC ] else [ pcsclite ]; patches = let url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; buildFlags = - lib.optional stdenv.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; + lib.optional stdenv.hostPlatform.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; meta = with lib; { description = "Sample implementation of the ARIB STD-B25 standard"; diff --git a/pkgs/development/libraries/arpa2common/default.nix b/pkgs/development/libraries/arpa2common/default.nix index fc7a897f0d143..77f9694e69a96 100644 --- a/pkgs/development/libraries/arpa2common/default.nix +++ b/pkgs/development/libraries/arpa2common/default.nix @@ -1,29 +1,39 @@ -{ lib -, stdenv -, fetchFromGitLab -, cmake +{ + lib, + stdenv, + fetchFromGitLab, + fetchpatch, + cmake, -, arpa2cm -, doxygen -, e2fsprogs -, graphviz -, lmdb -, openssl -, pkg-config -, ragel + arpa2cm, + doxygen, + e2fsprogs, + graphviz, + libsodium, + lmdb, + openssl, + pkg-config, + ragel, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "arpa2common"; - version = "2.2.18"; + version = "2.6.2"; src = fetchFromGitLab { owner = "arpa2"; - repo = pname; - rev = "v${version}"; - hash = "sha256-UpAVyDXCe07ZwjD307t6G9f/Nny4QYXxGxft1KsiYYg="; + repo = "arpa2common"; + rev = "v${finalAttrs.version}"; + hash = "sha256-eWfWaO6URCK2FWQ+NYAoeCONkovgsVDPSRQVCGFnW3s="; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/arpa2/arpa2common/-/commit/13ea82df60b87a5367db00a8c6f3502e8ecb7298.patch"; + hash = "sha256-V9Dhr6PeArqXnuXmFuDjcirlGl7xovq7VQZsrbbMFSk="; + }) + ]; + nativeBuildInputs = [ cmake arpa2cm @@ -34,17 +44,15 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ e2fsprogs + libsodium lmdb openssl ragel ]; - # the project uses single argument `printf` throughout the program - hardeningDisable = [ "format" ]; - meta = { - description = - "ARPA2 ID and ACL libraries and other core data structures for ARPA2"; + changelog = "https://gitlab.com/arpa2/arpa2common/-/blob/v${finalAttrs.version}/CHANGES"; + description = "ARPA2 ID and ACL libraries and other core data structures for ARPA2"; longDescription = '' The ARPA2 Common Library package offers elementary services that can benefit many software packages. They are designed to be easy to @@ -53,8 +61,13 @@ stdenv.mkDerivation rec { liberate users. ''; homepage = "https://gitlab.com/arpa2/arpa2common"; - license = with lib.licenses; [ bsd2 cc-by-sa-40 cc0 isc ]; + license = with lib.licenses; [ + bsd2 + cc-by-sa-40 + cc0 + isc + ]; maintainers = with lib.maintainers; [ fufexan ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index 473dd638712c0..eb928f99e88a7 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -29,7 +29,7 @@ , cpuSupport ? true , cudaSupport ? config.cudaSupport # OpenCL needs mesa which is broken on Darwin -, openclSupport ? !stdenv.isDarwin +, openclSupport ? !stdenv.hostPlatform.isDarwin # This argument lets one run CUDA & OpenCL tests on non-NixOS systems by # telling Nix where to find the drivers. If you know the version of the # Nvidia driver that is installed on your system, you can do: @@ -49,6 +49,7 @@ # { libsOnly = true; }; # } , nvidiaComputeDrivers ? null +, fetchpatch }: # ArrayFire compiles with 64-bit BLAS, but some tests segfault or throw @@ -130,7 +131,15 @@ stdenv.mkDerivation rec { # ArrayFire have a repo with assets for the examples. Since we don't build # the examples anyway, remove the dependency on assets. - patches = [ ./no-assets.patch ./no-download.patch ]; + patches = [ + ./no-assets.patch + ./no-download.patch + # Fix for newer opencl-clhpp. Remove with the next release. + (fetchpatch { + url = "https://github.com/arrayfire/arrayfire/pull/3562.patch"; + hash = "sha256-AdWlpcRTn9waNAaVpZfK6sJ/xBQLiBC4nBeEYiGNN50"; + }) + ]; postPatch = '' mkdir -p ./extern/af_glad-src diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index cb9f1eb30246e..44dd9e056874d 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = "http://asio.sourceforge.net/"; description = "Cross-platform C++ library for network and low-level I/O programming"; license = licenses.boost; - broken = stdenv.isDarwin && lib.versionOlder version "1.16.1"; + broken = stdenv.hostPlatform.isDarwin && lib.versionOlder version "1.16.1"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 53051eb2a3100..45eef22e69fbb 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "assimp"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" "lib" "dev" ]; src = fetchFromGitHub { owner = "assimp"; repo = "assimp"; rev = "v${version}"; - hash = "sha256-4KpqH3rSNSTAXMFPWAvGTZA4jzKIChHFdtW97sK2EyY="; + hash = "sha256-sOYhYHBz3Tg+pi1OIJ1mGmsjEc6dPO6nFH0aolfpLRA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/audio/cubeb/default.nix b/pkgs/development/libraries/audio/cubeb/default.nix index dd7033b1910ec..478e8478382a1 100644 --- a/pkgs/development/libraries/audio/cubeb/default.nix +++ b/pkgs/development/libraries/audio/cubeb/default.nix @@ -9,10 +9,10 @@ , AudioUnit , CoreAudio , CoreServices -, lazyLoad ? !stdenv.isDarwin +, lazyLoad ? !stdenv.hostPlatform.isDarwin }: -assert lib.assertMsg (stdenv.isDarwin -> !lazyLoad) "cubeb: lazyLoad is inert on Darwin"; +assert lib.assertMsg (stdenv.hostPlatform.isDarwin -> !lazyLoad) "cubeb: lazyLoad is inert on Darwin"; let backendLibs = [ @@ -39,7 +39,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ speexdsp ] ++ ( - if stdenv.isDarwin then [ AudioUnit CoreAudio CoreServices ] + if stdenv.hostPlatform.isDarwin then [ AudioUnit CoreAudio CoreServices ] else backendLibs ); diff --git a/pkgs/development/libraries/audio/game-music-emu/default.nix b/pkgs/development/libraries/audio/game-music-emu/default.nix index 94b8d1cbc3750..050f475454386 100644 --- a/pkgs/development/libraries/audio/game-music-emu/default.nix +++ b/pkgs/development/libraries/audio/game-music-emu/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # it doesn't. disallowedReferences = [ stdenv.cc.cc ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)" ''; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index a8648a1a1c7bb..2f44827af95fa 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -2,31 +2,50 @@ # Upstream changes files in-place, to update: # 1. Check latest version at http://www.un4seen.com/ -# 2. Update `version`s and `sha256` sums. +# 2. Update `version`s and `hash` sums. # See also http://www.un4seen.com/forum/?topic=18614.0 +# Internet Archive used due to upstream URLs being unstable + let allBass = { bass = { h = "bass.h"; - version = "2.4.15"; + version = "2.4.17"; so = { - i686_linux = "libbass.so"; - x86_64-linux = "x64/libbass.so"; + i686_linux = "libs/x86/libbass.so"; + x86_64-linux = "libs/x86_64/libbass.so"; + armv7l-linux = "libs/armhf/libbass.so"; + aarch64-linux = "libs/aarch64/libbass.so"; }; - urlpath = "bass24-linux.zip"; - sha256 = "1lmysxfhy727zskavml3ibg5w876ir88923bm17c21s59w5lh7l8"; + url = "https://web.archive.org/web/20240501180538/http://www.un4seen.com/files/bass24-linux.zip"; + hash = "sha256-/JAlvtZtnzuzZjWy3n1WT8Q5ZVLO0BJJAJT7/dELS3o="; }; bass_fx = { h = "C/bass_fx.h"; version = "2.4.12.1"; so = { - i686_linux = "libbass_fx.so"; - x86_64-linux = "x64/libbass_fx.so"; + i686_linux = "libs/x86/libbass_fx.so"; + x86_64-linux = "libs/x86_64/libbass_fx.so"; + armv7l-linux = "libs/armhf/libbass_fx.so"; + aarch64-linux = "libs/aarch64/libbass_fx.so"; + }; + url = "https://web.archive.org/web/20240926184106/https://www.un4seen.com/files/z/0/bass_fx24-linux.zip"; + hash = "sha256-Hul2ELwnaDV8TDRMDXoFisle31GATDkf3PdkR2K9QTs="; + }; + + bassmix = { + h = "bassmix.h"; + version = "2.4.12"; + so = { + i686_linux = "libs/x86/libbassmix.so"; + x86_64-linux = "libs/x86_64/libbassmix.so"; + armv7l-linux = "libs/armhf/libbassmix.so"; + aarch64-linux = "libs/aarch64/libbassmix.so"; }; - urlpath = "z/0/bass_fx24-linux.zip"; - sha256 = "1q0g74z7iyhxqps5b3gnnbic8v2jji1r0mkvais57lsx8y21sbin"; + url = "https://web.archive.org/web/20240930183631/https://www.un4seen.com/files/bassmix24-linux.zip"; + hash = "sha256-oxxBhsjeLvUodg2SOMDH4wUy5na3nxLTqYkB+iXbOgA="; }; }; @@ -35,9 +54,9 @@ let inherit (bass) version; src = fetchurl { - url = "https://www.un4seen.com/files/${bass.urlpath}"; - inherit (bass) sha256; + inherit (bass) hash url; }; + unpackCmd = '' mkdir out ${unzip}/bin/unzip $curSrc -d out @@ -60,8 +79,7 @@ let homepage = "https://www.un4seen.com/"; license = licenses.unfreeRedistributable; platforms = builtins.attrNames bass.so; - # until upstream has stable URLs, this package is prone to always being broken - broken = true; + maintainers = with maintainers; [ jacekpoz ]; }; }; diff --git a/pkgs/development/libraries/audio/libkeyfinder/default.nix b/pkgs/development/libraries/audio/libkeyfinder/default.nix index 0742297cb69fd..d6f16f65df5d8 100644 --- a/pkgs/development/libraries/audio/libkeyfinder/default.nix +++ b/pkgs/development/libraries/audio/libkeyfinder/default.nix @@ -1,30 +1,21 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, fftw, catch2 }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, fftw, catch2_3 }: stdenv.mkDerivation rec { pname = "libkeyfinder"; - version = "2.2.6"; + version = "2.2.8"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "libkeyfinder"; - rev = "v${version}"; - sha256 = "sha256-7w/Wc9ncLinbnM2q3yv5DBtFoJFAM2e9xAUTsqvE9mg="; + rev = version; + hash = "sha256-Et8u5j/ke9u2bwHFriPCCBiXkPel37gwx+kwuViAr4o="; }; - # in main post 2.2.6, see https://github.com/mixxxdj/libkeyfinder/issues/21 - patches = [ - (fetchpatch { - name = "fix-pkg-config"; - url = "https://github.com/mixxxdj/libkeyfinder/commit/4e1a5022d4c91e3ecfe9be5c3ac7cc488093bd2e.patch"; - sha256 = "08llmgp6r11bq5s820j3fs9bgriaibkhq8r3v2av064w66mwp48x"; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ fftw ]; - nativeCheckInputs = [ catch2 ]; + nativeCheckInputs = [ catch2_3 ]; doCheck = true; diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index a08b93a9b0e55..500533ce8203b 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -10,7 +10,7 @@ , portaudio , libsndfile , flac -, usePulseAudio ? config.pulseaudio or stdenv.isLinux +, usePulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio }: diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 8391c93cc594a..7ee51d55bccf1 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { ninja ]; - buildInputs = [ ]; - mesonFlags = [ # install validators to $dev "--bindir=${placeholder "dev"}/bin" @@ -41,7 +39,7 @@ stdenv.mkDerivation rec { "-Dtests=disabled" # Avoid heavyweight python dependencies. "-Ddocs=disabled" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Dlv2dir=${placeholder "out"}/lib/lv2" ]; diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix index 4654e29a835fd..6c579774e4bfc 100644 --- a/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -9,7 +9,7 @@ openfecSupport ? true, openfec, speexdsp, - libunwindSupport ? true, + libunwindSupport ? lib.meta.availableOn stdenv.hostPlatform libunwind, libunwind, pulseaudioSupport ? true, libpulseaudio, @@ -51,10 +51,10 @@ stdenv.mkDerivation rec { ++ lib.optional soxSupport sox ++ lib.optional libsndfileSupport libsndfile; - sconsFlags = + sconsFlags = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "--build=${stdenv.buildPlatform.config}" - "--host=${stdenv.hostPlatform.config}" - "--prefix=${placeholder "out"}" ] ++ + "--host=${stdenv.hostPlatform.config}" ] ++ + [ "--prefix=${placeholder "out"}" ] ++ lib.optional (!opensslSupport) "--disable-openssl" ++ lib.optional (!soxSupport) "--disable-sox" ++ lib.optional (!libunwindSupport) "--disable-libunwind" ++ diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 350adc8a45832..099c3ca427930 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -18,7 +18,7 @@ gtk3, withQt5 ? true, qt5, - withX11 ? !stdenv.isDarwin, + withX11 ? !stdenv.hostPlatform.isDarwin, }: let diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index f9974e2ca2538..3a65f2535b7c5 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { version = "0.3.6"; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices AudioUnit ]; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index ac3db3650e76f..3e9be1f5fc71d 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,6 +1,7 @@ { fetchurl , fetchpatch , lib +, config , stdenv , pkg-config , libdaemon @@ -21,6 +22,9 @@ , withPython ? false }: +# Added 2024-09-03. Drop this assertion after 24.11 is released. +assert lib.assertMsg (config.avahi or {} == {}) "config.avahi has been removed; please use an overlay or services.avahi.package to configure the avahi package."; + stdenv.mkDerivation rec { pname = "avahi${lib.optionalString withLibdnssdCompat "-compat"}"; version = "0.8"; @@ -137,7 +141,7 @@ stdenv.mkDerivation rec { expat libiconv libevent - ] ++ lib.optionals stdenv.isFreeBSD [ + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ libpcap ] ++ lib.optionals gtk3Support [ gtk3 @@ -167,7 +171,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=no" ] ++ lib.optionals withLibdnssdCompat [ "--enable-compat-libdns_sd" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # autoipd won't build on darwin "--disable-autoipd" ]; @@ -179,7 +183,7 @@ stdenv.mkDerivation rec { "sysconfdir=${placeholder "out"}/etc" ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '20 i\ #define __APPLE_USE_RFC_2292' \ avahi-core/socket.c diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index a62d0449b3855..53f1d4430cc97 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c"; - version = "1.11.3"; + version = "1.12.0"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "sha256-chfKrPt9XzRhF2ZHOmbC4nm8e/rxuimMfwSzsvulc2U="; + sha256 = "sha256-dDM9QxB5w113DO9plstN4EBY0Z6BvQuaNjvP04V1A38="; }; postPatch = '' diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 84724375fea22..70aa863a7ce21 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.7.25"; + version = "0.7.26"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - hash = "sha256-pj2LnvF1/h8AQNc810U7oYWKun13+qPBNCbGPj3wKlo="; + hash = "sha256-02dy2xgMGWkLf+HyBztbkCcazfZNAMwpJPU2gGBPokY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-common/setup-hook.sh b/pkgs/development/libraries/aws-c-common/setup-hook.sh index e670f7cf85299..174933621f000 100644 --- a/pkgs/development/libraries/aws-c-common/setup-hook.sh +++ b/pkgs/development/libraries/aws-c-common/setup-hook.sh @@ -1,5 +1,5 @@ addAwsCCommonModuleDir() { - cmakeFlags="-DCMAKE_MODULE_PATH=@out@/lib/cmake ${cmakeFlags:-}" + prependToVar cmakeFlags "-DCMAKE_MODULE_PATH=@out@/lib/cmake" } postHooks+=(addAwsCCommonModuleDir) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 631c5a90faf52..6e549526a14ce 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp # TestRandomURLMultiThreaded fails rm tests/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp - '' + lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.hostPlatform.isi686 '' # EPSILON is exceeded rm tests/aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp ''; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl openssl zlib - ] ++ lib.optionals (stdenv.isDarwin && + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) [ CoreAudio AudioToolbox ]; diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix deleted file mode 100644 index af3476ce1a69c..0000000000000 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, pkg-config, cmake -, gtk3 -}: - -stdenv.mkDerivation rec { - pname = "ayatana-ido"; - version = "0.10.3"; - - src = fetchFromGitHub { - owner = "AyatanaIndicators"; - repo = pname; - rev = version; - sha256 = "sha256-WEPW9BstDv2k/5dTEDQza3eOQ9bd6CEVvmd817sEPAs="; - }; - - nativeBuildInputs = [ pkg-config cmake ]; - - buildInputs = [ gtk3 ]; - - meta = with lib; { - description = "Ayatana Display Indicator Objects"; - homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; - changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; - license = [ licenses.lgpl3Plus licenses.lgpl21Plus ]; - maintainers = [ maintainers.nickhu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/azmq/default.nix b/pkgs/development/libraries/azmq/default.nix index 7317c51aabde3..83bbd9f98f9ed 100644 --- a/pkgs/development/libraries/azmq/default.nix +++ b/pkgs/development/libraries/azmq/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ]; # Broken for some reason on this platform. - doCheck = !(stdenv.isAarch64 && stdenv.isLinux); + doCheck = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); meta = with lib; { homepage = "https://github.com/zeromq/azmq"; diff --git a/pkgs/development/libraries/bencodetools/default.nix b/pkgs/development/libraries/bencodetools/default.nix index 0a9694367340d..7a826efa7ef7d 100644 --- a/pkgs/development/libraries/bencodetools/default.nix +++ b/pkgs/development/libraries/bencodetools/default.nix @@ -1,10 +1,11 @@ -{ stdenv -, lib -, fetchFromGitLab -, python3 +{ + stdenv, + lib, + fetchFromGitLab, + python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bencodetools"; version = "unstable-2022-05-11"; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - python3 + (python3.withPackages (ps: with ps; [ distutils ])) ]; # installCheck instead of check due to -install_name'd library on Darwin diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index d48669845485f..4351e0ac729cb 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { cmakeFlags = optional enablePadding "-DARRAY_LENGTH_PADDING=ON" ++ optional enableSerialization "-DENABLE_SERIALISATION=ON" - ++ optional stdenv.is64bit "-DBZ_FULLY64BIT=ON"; + ++ optional stdenv.hostPlatform.is64bit "-DBZ_FULLY64BIT=ON"; # FIXME ++ optional doCheck "-DBUILD_TESTING=ON"; # skip broken library name detection - ax_boost_user_serialization_lib = lib.optionalString stdenv.isDarwin "boost_serialization"; + ax_boost_user_serialization_lib = lib.optionalString stdenv.hostPlatform.isDarwin "boost_serialization"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/development/libraries/blst/default.nix index 2bf2e2c614e7c..50d080b9bf910 100644 --- a/pkgs/development/libraries/blst/default.nix +++ b/pkgs/development/libraries/blst/default.nix @@ -59,9 +59,9 @@ stdenv.mkDerivation ( finalAttrs: { # ensure we have the right install id set. Otherwise the library # wouldn't be found during install. The alternative would be to work - # lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libblst.dylib"; + # lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libblst.dylib"; # into the setup.sh - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libblst.dylib $out/lib/libblst.dylib ''; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 4362bdcb6daba..9c6fb3e672032 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -52,7 +52,7 @@ let # To avoid library name collisions layout = if taggedLayout then "tagged" else "system"; - needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.isDarwin && enableShared); + needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.hostPlatform.isDarwin && enableShared); b2Args = lib.concatStringsSep " " ([ "--includedir=$dev/include" @@ -107,7 +107,7 @@ stdenv.mkDerivation { patchFlags = []; patches = patches - ++ lib.optional stdenv.isDarwin ./darwin-no-system-python.patch + ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-no-system-python.patch ++ [ ./cmake-paths-173.patch ] ++ lib.optional (version == "1.77.0") (fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; @@ -177,7 +177,7 @@ stdenv.mkDerivation { # On darwin we need to add the `$out/lib` to the libraries' rpath explicitly, # otherwise the dynamic linker is unable to resolve the reference to @rpath # when the boost libraries want to load each other at runtime. - + lib.optionalString (stdenv.isDarwin && enableShared) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && enableShared) '' cat << EOF >> user-config.jam using clang-darwin : : ${stdenv.cc.targetPrefix}c++ : <linkflags>"-rpath $out/lib/" @@ -214,7 +214,7 @@ stdenv.mkDerivation { ''; env = { - NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names"; + NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; # copyPkgconfigItems will substitute these in the pkg-config file includedir = "${placeholder "dev"}/include"; libdir = "${placeholder "out"}/lib"; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 9bb0967bd5c6e..01c3884c428fd 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -41,7 +41,7 @@ buildGoModule { ''; # CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux. - cmakeFlags = [ "-GNinja" ] ++ lib.optionals (stdenv.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; + cmakeFlags = [ "-GNinja" ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; installPhase = '' mkdir -p $bin/bin $dev $out/lib diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix deleted file mode 100644 index c14fdb4cef1f7..0000000000000 --- a/pkgs/development/libraries/botan/2.0.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - baseVersion = "2.19"; - revision = "5"; - hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ="; -}) diff --git a/pkgs/development/libraries/botan/3.0.nix b/pkgs/development/libraries/botan/3.0.nix deleted file mode 100644 index 0cffb67104c68..0000000000000 --- a/pkgs/development/libraries/botan/3.0.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, stdenv, lib, ... } @ args: - -callPackage ./generic.nix (args // { - baseVersion = "3.5"; - revision = "0"; - hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8="; - # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again - extraPatches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ]; -}) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix new file mode 100644 index 0000000000000..976144b1b5ca8 --- /dev/null +++ b/pkgs/development/libraries/botan/default.nix @@ -0,0 +1,130 @@ +{ + lib, + stdenv, + fetchurl, + python3, + docutils, + bzip2, + zlib, + darwin, + static ? stdenv.hostPlatform.isStatic, # generates static libraries *only* +}: + +let + common = + { + version, + hash, + patches ? [ ], + }: + stdenv.mkDerivation (finalAttrs: { + pname = "botan"; + inherit version; + + __structuredAttrs = true; + enableParallelBuilding = true; + strictDeps = true; + + outputs = [ + "bin" + "out" + "dev" + "doc" + "man" + ]; + + src = fetchurl { + url = "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.tar.xz"; + inherit hash; + }; + + inherit patches; + + nativeBuildInputs = [ + python3 + docutils + ]; + + buildInputs = + [ + bzip2 + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreServices + Security + ] + ); + + buildTargets = + [ "cli" ] + ++ lib.optionals finalAttrs.doCheck [ "tests" ] + ++ lib.optionals static [ "static" ] + ++ lib.optionals (!static) [ "shared" ]; + + botanConfigureFlags = + [ + "--prefix=${placeholder "out"}" + "--bindir=${placeholder "bin"}/bin" + "--docdir=${placeholder "doc"}/share/doc" + "--mandir=${placeholder "man"}/share/man" + "--no-install-python-module" + "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}" + "--with-bzip2" + "--with-zlib" + "--with-rst2man" + ] + ++ lib.optionals stdenv.cc.isClang [ + "--cc=clang" + ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + "--cpu=aarch64" + ]; + + configurePhase = '' + runHook preConfigure + python configure.py ''${botanConfigureFlags[@]} + runHook postConfigure + ''; + + preInstall = '' + if [ -d src/scripts ]; then + patchShebangs src/scripts + fi + ''; + + postInstall = '' + cd "$out"/lib/pkgconfig + ln -s botan-*.pc botan.pc || true + ''; + + doCheck = true; + + meta = with lib; { + description = "Cryptographic algorithms library"; + homepage = "https://botan.randombit.net"; + mainProgram = "botan"; + maintainers = with maintainers; [ + raskin + thillux + ]; + platforms = platforms.unix; + license = licenses.bsd2; + }; + }); +in +{ + botan3 = common { + version = "3.5.0"; + hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8="; + # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ]; + }; + + botan2 = common { + version = "2.19.5"; + hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ="; + }; +} diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix deleted file mode 100644 index a2acb81832834..0000000000000 --- a/pkgs/development/libraries/botan/generic.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, boost -# Passed by version specific builders -, baseVersion, revision, hash -, sourceExtension ? "tar.xz" -, extraConfigureFlags ? "" -, extraPatches ? [ ] -, badPlatforms ? [ ] -, postPatch ? null -, knownVulnerabilities ? [ ] -, CoreServices ? null -, Security ? null -, ... -}: - -stdenv.mkDerivation rec { - pname = "botan"; - version = "${baseVersion}.${revision}"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - name = "Botan-${version}.${sourceExtension}"; - urls = [ - "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.${sourceExtension}" - "http://botan.randombit.net/releases/Botan-${version}.${sourceExtension}" - ]; - inherit hash; - }; - patches = extraPatches; - inherit postPatch; - - nativeBuildInputs = [ python3 ]; - buildInputs = [ bzip2 zlib gmp boost ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; - - configurePhase = '' - runHook preConfigure - python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} ${lib.optionalString stdenv.hostPlatform.isAarch64 " --cpu=aarch64"} - runHook postConfigure - ''; - - enableParallelBuilding = true; - - preInstall = '' - if [ -d src/scripts ]; then - patchShebangs src/scripts - fi - ''; - - postInstall = '' - cd "$out"/lib/pkgconfig - ln -s botan-*.pc botan.pc || true - ''; - - doCheck = true; - - meta = with lib; { - description = "Cryptographic algorithms library"; - mainProgram = "botan"; - maintainers = with maintainers; [ raskin thillux ]; - platforms = platforms.unix; - license = licenses.bsd2; - inherit badPlatforms; - inherit knownVulnerabilities; - }; - passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/"; -} diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index a445a0c533155..acc2d96caf4a7 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { libXrandr xorgproto libXi - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa Kernel OpenGL ]; diff --git a/pkgs/development/libraries/brunsli/default.nix b/pkgs/development/libraries/brunsli/default.nix index 03c9b02f7f9ff..e9d379a74d31d 100644 --- a/pkgs/development/libraries/brunsli/default.nix +++ b/pkgs/development/libraries/brunsli/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { postPatch = '' rm -r third_party - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' rm -r build ''; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 5ba9186dcac9f..4a161423c7d3f 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL libglut ] - ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL libglut ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenGL ]; postPatch = '' substituteInPlace examples/ThirdPartyLibs/Gwen/CMakeLists.txt \ --replace "-DGLEW_STATIC" "-DGLEW_STATIC -Wno-narrowing" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" "-DINSTALL_EXTRA_LIBS=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_FOUND=true" "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index c5f6f3a436d24..bcc963f5b466c 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL libglut ] - ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL libglut ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; @@ -32,7 +32,7 @@ stdenv.mkDerivation { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" "-DINSTALL_EXTRA_LIBS=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_FOUND=true" "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" @@ -53,6 +53,6 @@ stdenv.mkDerivation { platforms = platforms.unix; # /tmp/nix-build-bullet-2019-03-27.drv-0/source/src/Bullet3Common/b3Vector3.h:297:7: error: argument value 10880 is outside the valid range [0, 255] [-Wargument-outside-range] # y = b3_splat_ps(y, 0x80); - broken = (stdenv.isDarwin && stdenv.isx86_64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); }; } diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 854032d56157c..9180457a3165f 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { "-DCAF_ENABLE_EXAMPLES:BOOL=OFF" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkTarget = "test"; meta = with lib; { diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 28809ade8ae4a..4368965d4f18c 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, gtk-doc, meson, ninja, pkg-config, python3 , docbook_xsl, fontconfig, freetype, libpng, pixman, zlib -, x11Support? !stdenv.isDarwin || true, libXext, libXrender +, x11Support? !stdenv.hostPlatform.isDarwin || true, libXext, libXrender , gobjectSupport ? true, glib , xcbSupport ? x11Support, libxcb , darwin @@ -34,7 +34,7 @@ in { buildInputs = [ docbook_xsl - ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText ApplicationServices @@ -87,7 +87,7 @@ in { # `-I' flags to be propagated. sed -i "$out/lib/pkgconfig/cairo.pc" \ -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' - '' + lib.optionalString stdenv.isDarwin glib.flattenInclude; + '' + lib.optionalString stdenv.hostPlatform.isDarwin glib.flattenInclude; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/development/libraries/cairomm/1.16.nix b/pkgs/development/libraries/cairomm/1.16.nix index 83428f0fef9be..cd561d0091876 100644 --- a/pkgs/development/libraries/cairomm/1.16.nix +++ b/pkgs/development/libraries/cairomm/1.16.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost # for tests fontconfig - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; # Tests fail on Darwin, possibly because of sandboxing. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "C++ bindings for the Cairo vector graphics library"; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 957cfa26ac732..382770e144f56 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost # for tests fontconfig - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "-Dbuild-tests=true" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "C++ bindings for the Cairo vector graphics library"; diff --git a/pkgs/development/libraries/capstone/4.nix b/pkgs/development/libraries/capstone/4.nix index dd31e9feaf621..836bb47568c34 100644 --- a/pkgs/development/libraries/capstone/4.nix +++ b/pkgs/development/libraries/capstone/4.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index b78b007bc5978..1aed26cec87d1 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/development/libraries/catboost/default.nix b/pkgs/development/libraries/catboost/default.nix index 3824cf046b95a..ca0d22ff002cd 100644 --- a/pkgs/development/libraries/catboost/default.nix +++ b/pkgs/development/libraries/catboost/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cudart @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. # see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools CUDAHOSTCXX = lib.optionalString cudaSupport "${llvmPackages_12.stdenv.cc}/bin/cc"; - NIX_CFLAGS_LINK = lib.optionalString stdenv.isLinux "-fuse-ld=lld"; + NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isLinux "-fuse-ld=lld"; NIX_LDFLAGS = "-lc -lm"; }; diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix index 5985ec519ae47..c7d2296d9629d 100644 --- a/pkgs/development/libraries/catch2/3.nix +++ b/pkgs/development/libraries/catch2/3.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCATCH_DEVELOPMENT_BUILD=ON" "-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}" - ] ++ lib.optionals (stdenv.isDarwin && doCheck) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && doCheck) [ # test has a faulty path normalization technique that won't work in # our darwin build environment https://github.com/catchorg/Catch2/issues/1691 "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests" ]; - env = lib.optionalAttrs stdenv.isx86_32 { + env = lib.optionalAttrs stdenv.hostPlatform.isx86_32 { # Tests fail on x86_32 if compiled with x87 floats: https://github.com/catchorg/Catch2/issues/2796 NIX_CFLAGS_COMPILE = "-msse2 -mfpmath=sse"; } // lib.optionalAttrs (stdenv.hostPlatform.isRiscV || stdenv.hostPlatform.isAarch32) { diff --git a/pkgs/development/libraries/cctag/default.nix b/pkgs/development/libraries/cctag/default.nix index 238821b6af914..8b37633acfcb9 100644 --- a/pkgs/development/libraries/cctag/default.nix +++ b/pkgs/development/libraries/cctag/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; # Tests are broken on Darwin (linking issue) - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Detection of CCTag markers made up of concentric circles"; diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index c0f8a58a18d98..4ad0bf6b8034c 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - buildInputs = lib.optional stdenv.isDarwin Foundation; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Foundation; installTargets = [ "install_hdrs" ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib" ++ lib.optional stdenv.hostPlatform.isStatic "install_lib"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so ''; diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index 3de126d111ef2..3c63b23d1ce28 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] # we don't want to appear to be a catalyst build; # we are a TARGET_OS_MAC - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_MACCATALYST=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_MACCATALYST=0"; meta = with lib; { description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data"; diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index af52aabca79b0..e92ddafc4322f 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { freetype boost expat - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Foundation libiconv diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 14b4e549264b0..10030f5653c2e 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; - buildInputs = lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; meta = with lib; { description = "Unit testing framework for C"; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 934a4b04a96b3..e264693ceab86 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ ffmpeg_7 ] ++ lib.optionals stdenv.isDarwin + buildInputs = [ ffmpeg_7 ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]); cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index bbe342d98198b..0442c7d21209d 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dfinite=isfinite"; meta = { homepage = "http://www.cs.wisc.edu/condor/classad/"; diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/development/libraries/clfft/default.nix index 824449b0fafcc..5843c1b1fcca2 100644 --- a/pkgs/development/libraries/clfft/default.nix +++ b/pkgs/development/libraries/clfft/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ fftw fftwFloat boost ] - ++ lib.optionals stdenv.isLinux [ opencl-clhpp ocl-icd ] - ++ lib.optionals stdenv.isDarwin [ OpenCL ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ opencl-clhpp ocl-icd ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenCL ]; # https://github.com/clMathLibraries/clFFT/issues/237 CXXFLAGS = "-std=c++98"; diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix deleted file mode 100644 index 3a6f926b3f32f..0000000000000 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ fetchurl, lib, stdenv, ppl, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "cloog-ppl"; - version = "0.15.11"; - - src = fetchurl { - url = "mirror://gcc/infrastructure/${pname}-${version}.tar.gz"; - sha256 = "0psdm0bn5gx60glfh955x5b3b23zqrd92idmjr0b00dlnb839mkw"; - }; - - propagatedBuildInputs = [ ppl ]; - - nativeBuildInputs = [ autoreconfHook ]; - - patches = [ ./fix-ppl-version.patch ]; - - configureFlags = [ "--with-ppl=${ppl}" ]; - - preAutoreconf = '' - touch NEWS ChangeLog AUTHORS - ''; - - doCheck = true; - - meta = { - description = "CLooG-PPL, the Chunky Loop Generator"; - mainProgram = "cloog"; - - longDescription = '' - CLooG is a free software library to generate code for scanning - Z-polyhedra. That is, it finds a code (e.g., in C, FORTRAN...) that - reaches each integral point of one or more parameterized polyhedra. - CLooG has been originally written to solve the code generation problem - for optimizing compilers based on the polytope model. Nevertheless it - is used now in various area e.g., to build control automata for - high-level synthesis or to find the best polynomial approximation of a - function. CLooG may help in any situation where scanning polyhedra - matters. While the user has full control on generated code quality, - CLooG is designed to avoid control overhead and to produce a very - effective code. - ''; - - # CLooG-PPL is actually a port of GLooG from PolyLib to PPL. - homepage = "http://www.cloog.org/"; - - license = lib.licenses.gpl2Plus; - - maintainers = [ ]; - - /* Leads to an ICE on Cygwin: - - make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src' - /bin/sh ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c -o Box.lo Box.cc - libtool: compile: g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c Box.cc -DDLL_EXPORT -DPIC -o .libs/Box.o - In file included from checked.defs.hh:595, - from Checked_Number.defs.hh:27, - from Coefficient.types.hh:15, - from Coefficient.defs.hh:26, - from Box.defs.hh:28, - from Box.cc:24: - checked.inlines.hh: In function `Parma_Polyhedra_Library::Result Parma_Polyhedra_Library::Checked::input_generic(Type&, std::istream&, Parma_Polyhedra_Library::Rounding_Dir)': - checked.inlines.hh:607: internal compiler error: in invert_truthvalue, at fold-const.c:2719 - Please submit a full bug report, - with preprocessed source if appropriate. - See <URL:http://cygwin.com/problems.html> for instructions. - make[3]: *** [Box.lo] Error 1 - - */ - platforms = lib.platforms.unix; # Once had cygwin problems - }; -} diff --git a/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch b/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch deleted file mode 100644 index 8440d839411bc..0000000000000 --- a/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -rupN src/configure.in cloog-ppl-0.15.11/configure.in ---- src/configure.in 2014-04-13 13:33:43.349392305 +0200 -+++ cloog-ppl-0.15.11/configure.in 2014-04-13 13:34:12.695379888 +0200 -@@ -337,11 +337,7 @@ if test "x$with_ppl" != "x" -a "x$with_p - [AC_MSG_ERROR(Can't find PPL headers.)]) - - AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL]) -- AC_TRY_COMPILE([#include "ppl_c.h"],[ -- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 -- choke me -- #endif -- ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) -+ AC_MSG_RESULT([yes]) - - LIBS="$LIBS -lppl_c -lppl -lgmpxx" - AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix deleted file mode 100644 index a1ba3aaf93f3a..0000000000000 --- a/pkgs/development/libraries/cloog/0.18.0.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ fetchurl, lib, stdenv, gmp, isl }: - -stdenv.mkDerivation rec { - pname = "cloog"; - version = "0.18.0"; - - src = fetchurl { - url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./cloog-${version}.tar.gz"; - sha256 = "1c4aa8dde7886be9cbe0f9069c334843b21028f61d344a2d685f88cb1dcf2228"; - }; - - buildInputs = [ gmp ]; - - propagatedBuildInputs = [ isl ]; - - configureFlags = [ "--with-isl=system" ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = { - description = "Library that generates loops for scanning polyhedra"; - mainProgram = "cloog"; - - longDescription = '' - CLooG is a free software library to generate code for scanning - Z-polyhedra. That is, it finds a code (e.g., in C, FORTRAN...) that - reaches each integral point of one or more parameterized polyhedra. - CLooG has been originally written to solve the code generation problem - for optimizing compilers based on the polytope model. Nevertheless it - is used now in various area e.g., to build control automata for - high-level synthesis or to find the best polynomial approximation of a - function. CLooG may help in any situation where scanning polyhedra - matters. While the user has full control on generated code quality, - CLooG is designed to avoid control overhead and to produce a very - effective code. - ''; - - homepage = "http://www.cloog.org/"; - - license = lib.licenses.gpl2Plus; - - /* Leads to an ICE on Cygwin: - - make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src' - /bin/sh ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c -o Box.lo Box.cc - libtool: compile: g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c Box.cc -DDLL_EXPORT -DPIC -o .libs/Box.o - In file included from checked.defs.hh:595, - from Checked_Number.defs.hh:27, - from Coefficient.types.hh:15, - from Coefficient.defs.hh:26, - from Box.defs.hh:28, - from Box.cc:24: - checked.inlines.hh: In function `Parma_Polyhedra_Library::Result Parma_Polyhedra_Library::Checked::input_generic(Type&, std::istream&, Parma_Polyhedra_Library::Rounding_Dir)': - checked.inlines.hh:607: internal compiler error: in invert_truthvalue, at fold-const.c:2719 - Please submit a full bug report, - with preprocessed source if appropriate. - See <URL:http://cygwin.com/problems.html> for instructions. - make[3]: *** [Box.lo] Error 1 - - */ - platforms = lib.platforms.unix; # Once had cygwin problems - }; -} diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix deleted file mode 100644 index 3ae266c61cddf..0000000000000 --- a/pkgs/development/libraries/cloog/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ fetchurl, lib, stdenv, gmp, isl }: - -stdenv.mkDerivation rec { - pname = "cloog"; - version = "0.18.4"; - - src = fetchurl { - url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${pname}-${version}.tar.gz"; - sha256 = "03km1aqaiy3sbqc2f046ms9x0mlmacxlvs5rxsvjj8nf20vxynij"; - }; - - buildInputs = [ gmp ]; - - propagatedBuildInputs = [ isl ]; - - configureFlags = [ "--with-isl=system" ]; - - enableParallelBuilding = true; - # Breaks the test cases as it reuses 'cloog_temp' file name for different tests. - enableParallelChecking = false; - - doCheck = true; - - meta = { - description = "Library that generates loops for scanning polyhedra"; - mainProgram = "cloog"; - - longDescription = '' - CLooG is a free software library to generate code for scanning - Z-polyhedra. That is, it finds a code (e.g., in C, FORTRAN...) that - reaches each integral point of one or more parameterized polyhedra. - CLooG has been originally written to solve the code generation problem - for optimizing compilers based on the polytope model. Nevertheless it - is used now in various area e.g., to build control automata for - high-level synthesis or to find the best polynomial approximation of a - function. CLooG may help in any situation where scanning polyhedra - matters. While the user has full control on generated code quality, - CLooG is designed to avoid control overhead and to produce a very - effective code. - ''; - - homepage = "http://www.cloog.org/"; - - license = lib.licenses.gpl2Plus; - - /* Leads to an ICE on Cygwin: - - make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src' - /bin/sh ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c -o Box.lo Box.cc - libtool: compile: g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c Box.cc -DDLL_EXPORT -DPIC -o .libs/Box.o - In file included from checked.defs.hh:595, - from Checked_Number.defs.hh:27, - from Coefficient.types.hh:15, - from Coefficient.defs.hh:26, - from Box.defs.hh:28, - from Box.cc:24: - checked.inlines.hh: In function `Parma_Polyhedra_Library::Result Parma_Polyhedra_Library::Checked::input_generic(Type&, std::istream&, Parma_Polyhedra_Library::Rounding_Dir)': - checked.inlines.hh:607: internal compiler error: in invert_truthvalue, at fold-const.c:2719 - Please submit a full bug report, - with preprocessed source if appropriate. - See <URL:http://cygwin.com/problems.html> for instructions. - make[3]: *** [Box.lo] Error 1 - - */ - platforms = lib.platforms.unix; # Once had cygwin problems - }; -} diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index d6049d2845137..6fc4ac289677a 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # required for darwin and linux-musl ./pthread-include.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./fix-darwin.patch # see https://bugs.gentoo.org/869170 @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; # see https://github.com/macports/macports-ports/commit/236d43f2450c6be52dc42fd3a2bbabbaa5136201 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/shared/CMakeLists.txt --replace 'fstati64;_fstati64;fstat64;fstat;_fstat' 'fstat;_fstat' substituteInPlace src/shared/CMakeLists.txt --replace 'stati64;_stati64;stat64;stat;_stat' 'stat;_stat' ''; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index d6720eb181f4c..bb7ddf08957f2 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { atk json-glib gobject-introspection - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libGL libGLU @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-introspection" # needed by muffin AFAIK - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--without-x" "--enable-x11-backend=no" "--enable-quartz-backend=yes" diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index a118ecf1adda2..83407c64384db 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = let - lib_path = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + lib_path = if stdenv.hostPlatform.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' export ${lib_path}=$(readlink -f ./src) ''; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index 20782c8499cb9..81224c0fdaa36 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals withBlas [ blas - ] ++ lib.optionals (withBlas && stdenv.isDarwin) [ + ] ++ lib.optionals (withBlas && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.Accelerate darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.CoreVideo diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix index 87c692b42cea1..2e3fc7a3a1982 100644 --- a/pkgs/development/libraries/cmrt/default.nix +++ b/pkgs/development/libraries/cmrt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm libva ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://01.org/linuxmedia"; description = "Intel C for Media Runtime"; longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family"; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index b233113e951fd..db34dc1669b18 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-introspection" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "--enable-kms-egl-platform" "--enable-wayland-egl-platform" "--enable-wayland-egl-server" @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # Force linking against libGL. # Otherwise, it tries to load it from the runtime library path. "LIBS=-lGL" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-glx" "--without-x" ] ++ lib.optionals gstreamerSupport [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { glib gdk-pixbuf gobject-introspection - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland mesa libGL @@ -82,10 +82,10 @@ stdenv.mkDerivation rec { ]; buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ] - ++ lib.optionals stdenv.isDarwin [ OpenGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ]; env = { - COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ + COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.hostPlatform.isDarwin && pangoSupport) [ "-I${pango.dev}/include/pango-1.0" "-I${cairo.dev}/include/cairo" "-I${harfbuzz.dev}/include/harfbuzz" diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index f4ea863383e48..a0d1ae07d636f 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coin"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "coin3d"; repo = "coin"; rev = "v${finalAttrs.version}"; - hash = "sha256-tBegPZQme5McC0HGvjjdIBQQl59Ud4aJk2hONWMzEdc="; + hash = "sha256-dUFmcUOdNc3ZFtr+Hnh3Q3OY/JA/WxmiRJiU2RFSSus="; }; nativeBuildInputs = [ cmake ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { boost libGL libGLU - ] ++ lib.optional stdenv.isLinux libX11; + ] ++ lib.optional stdenv.hostPlatform.isLinux libX11; cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ]; diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 355a404bb3aa7..1d838b0ba2a29 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,18 +8,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.26.0"; + version = "5.26.1"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-PU3Cn+T/ngbK2/3cBkvI1pCHKnYTWP4JepMMAmWNK1k="; + sha256 = "sha256-ft8gusZ6We3nEAOwccGrUidxpO5tdWR5VNDQ/r5l2P8="; }; nativeBuildInputs = [ cmake ]; nativeCheckInputs = [ cppunit ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4 ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ) ''; # tests fail on Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://github.com/Martchus/cpp-utilities"; diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index 2ccb2988305e1..bc69141bb9889 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hash = "sha256-cAw5YMplCx6vAhfWmskZuBHyB1o4dGd7hMceOG3V51Y="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Fixes build failure on Darwin due to missing byte order functions. # https://github.com/cracklib/cracklib/pull/96 (fetchpatch2 { diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index 3b27601bcbfdc..07da71e326706 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gflags ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-march=armv8-a+crc"; cmakeFlags = [ "-DCRC32C_INSTALL=1" diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/development/libraries/crocoddyl/default.nix deleted file mode 100644 index 046a6a014d1ad..0000000000000 --- a/pkgs/development/libraries/crocoddyl/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, example-robot-data -, pinocchio -, pythonSupport ? false -, python3Packages -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "crocoddyl"; - version = "2.1.0"; - - src = fetchFromGitHub { - owner = "loco-3d"; - repo = "crocoddyl"; - rev = "v${finalAttrs.version}"; - hash = "sha256-SVV9sleDXLm2QJmNgL25XLHC3y5bfKab4GSlE8jbT8w="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ] ++ lib.optionals pythonSupport [ - python3Packages.python - ]; - - propagatedBuildInputs = lib.optionals (!pythonSupport) [ - example-robot-data - pinocchio - ] ++ lib.optionals pythonSupport [ - python3Packages.example-robot-data - python3Packages.pinocchio - ]; - - cmakeFlags = lib.optionals (!pythonSupport) [ - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_PYTHON_INTERFACE=OFF" - ]; - - prePatch = '' - substituteInPlace \ - examples/CMakeLists.txt \ - examples/log/check_logfiles.sh \ - --replace /bin/bash ${stdenv.shell} - ''; - - doCheck = true; - pythonImportsCheck = [ - "crocoddyl" - ]; - checkInputs = lib.optionals pythonSupport [ - python3Packages.scipy - ]; - - meta = with lib; { - description = "Crocoddyl optimal control library"; - homepage = "https://github.com/loco-3d/crocoddyl"; - license = licenses.bsd3; - maintainers = with maintainers; [ nim65s wegank ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix index c4c015d924813..cd8f95957c4eb 100644 --- a/pkgs/development/libraries/crossguid/default.nix +++ b/pkgs/development/libraries/crossguid/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.isLinux libuuid; + buildInputs = lib.optional stdenv.hostPlatform.isLinux libuuid; passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index c640d5f700e26..b126cff5b24ad 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-ApmGto9RzT8t49bsZVwk8aQnIau9sQyFvt9qnWKUGAE="; + hash = "sha256-E/ulk+Oo1zEP+sCKMZuMVSoO0MDjQ2opTflSwLmCJMw="; fetchSubmodules = true; }; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "-DWITH_RUY=${cmakeBool withRuy}" "-DWITH_MKL=${cmakeBool withMkl}" ] - ++ lib.optional stdenv.isDarwin "-DWITH_ACCELERATE=ON"; + ++ lib.optional stdenv.hostPlatform.isDarwin "-DWITH_ACCELERATE=ON"; buildInputs = lib.optionals withMkl [ mkl @@ -67,10 +67,10 @@ stdenv.mkDerivation rec { oneDNN ] ++ lib.optionals withOpenblas [ openblas - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp darwin.apple_sdk.frameworks.Accelerate - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.CoreVideo ]; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 0b151bfc719ae..60a0d8569a138 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl db gettext libkrb5 libxcrypt ] ++ lib.optional enableLdap openldap - ++ lib.optional stdenv.isLinux pam; + ++ lib.optional stdenv.hostPlatform.isLinux pam; configureFlags = [ "--with-openssl=${openssl.dev}" @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "CFLAGS=-DTIME_WITH_SYS_TIME" ]; - installFlags = lib.optionals stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; + installFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; passthru.tests = { inherit (nixosTests) parsedmarc postfix; diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index d715c1ffc8b19..936aed633a449 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (rec { (if compat185 then "--enable-compat185" else "--disable-compat185") ] ++ lib.optional dbmSupport "--enable-dbm" - ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; preConfigure = '' cd build_unix diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index cb5fe9e4fbd3e..017c83c5b11d8 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -13,7 +13,7 @@ , xmlto , autoreconfHook , autoconf-archive -, x11Support ? (stdenv.isLinux || stdenv.isDarwin) +, x11Support ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) , xorg }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-uh8h0r2dM52i1KqHgMCd8y/qh5mLc9ok9Jq53x42pQ8="; }; - patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; + patches = lib.optional stdenv.hostPlatform.isSunOS ./implement-getgrouplist.patch; postPatch = '' substituteInPlace bus/Makefile.am \ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { libICE libSM ]) ++ lib.optional enableSystemd systemdMinimal - ++ lib.optionals stdenv.isLinux [ audit libapparmor ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ audit libapparmor ]; # ToDo: optional selinux? __darwinAllowLocalNetworking = true; @@ -84,10 +84,10 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" ] ++ lib.optional (!x11Support) "--without-x" - ++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-apparmor" "--enable-libaudit" ] ++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemdMinimal}/bin/systemctl" ]; - NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed"; + NIX_CFLAGS_LINK = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-Wl,--as-needed"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix index ac2664a1c9f99..34340a406a508 100644 --- a/pkgs/development/libraries/dclxvi/default.nix +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { patchPhase = '' substituteInPlace Makefile \ --replace "gcc" "cc" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace "-soname=libdclxvipairing.so" "-install_name,libdclxvipairing.so" ''; diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 0dddcb5d64825..1aad769c6db22 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { dbus # for dbus-daemon ]; - doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin; postPatch = '' chmod +x meson_post_install.py tests/test-dconf.py diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix index f0c60e9506d5c..05837c823c564 100644 --- a/pkgs/development/libraries/discord-rpc/default.nix +++ b/pkgs/development/libraries/discord-rpc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ rapidjson - ] ++ lib.optional stdenv.isDarwin AppKit; + ] ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; cmakeFlags = [ "-DBUILD_SHARED_LIBS=true" diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index 389ce72a68467..eda770f7e090c 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; meta = with lib; { description = "Configuration parser library"; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index cdca8c574fffa..857bb48c11543 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ stdenv, lib, fetchFromGitHub, cmake, enableStatic ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "double-conversion"; @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = lib.optional (! enableStatic) "-DBUILD_SHARED_LIBS=ON"; # Case sensitivity issue - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' rm BUILD ''; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 63f387db9046b..701e75ff5f2bb 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,21 +9,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.9.4"; + version = "1.9.7"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - hash = "sha256-P6blu3EIBzmK1zikFPiV+tvFLfiQhK+cRdClQOhcBSU="; + hash = "sha256-YmN02OvCllxADAIicWKaTevrbAsP/ZbnhBd/hjqqz7A="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_TESTING=${if finalAttrs.finalPackage.doInstallCheck then "ON" else "OFF"}" - "-DBUILD_EXAMPLES=OFF" + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doInstallCheck) + (lib.cmakeBool "BUILD_EXAMPLES" false) ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/drogon/fix_find_package.patch b/pkgs/development/libraries/drogon/fix_find_package.patch index b76dbfe488305..49754b9fa2201 100644 --- a/pkgs/development/libraries/drogon/fix_find_package.patch +++ b/pkgs/development/libraries/drogon/fix_find_package.patch @@ -1,13 +1,13 @@ -diff --git a/test.sh b/test.sh -index f017b9a..027031e 100755 ---- a/test.sh -+++ b/test.sh -@@ -135,7 +135,7 @@ if [ $os = "windows" ]; then - conan install $src_dir -s compiler="Visual Studio" -s compiler.version=16 -sbuild_type=Debug -g cmake_paths - cmake_gen="$cmake_gen -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake -DCMAKE_INSTALL_PREFIX=$src_dir/install" - fi --cmake .. $cmake_gen -+cmake .. $cmake_gen -DDrogon_DIR=$out/lib/cmake/Drogon -DTrantor_DIR=$out/lib/cmake/Trantor +diff --git i/test.sh w/test.sh +index 4796ff11..a6627fec 100755 +--- i/test.sh ++++ w/test.sh +@@ -148,7 +148,7 @@ function do_drogon_ctl_test() + -DCMAKE_POLICY_DEFAULT_CMP0091=NEW \ + -DCMAKE_CXX_STANDARD=17" + fi +- cmake .. $cmake_gen ++ cmake .. $cmake_gen -DDrogon_DIR=$out/lib/cmake/Drogon -DTrantor_DIR=$out/lib/cmake/Trantor - if [ $? -ne 0 ]; then - echo "Failed to run CMake for example project" + if [ $? -ne 0 ]; then + echo "Failed to run CMake for example project" diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 4b797031696a9..3f2b1ba026abc 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -1,6 +1,23 @@ -{ lib, stdenv, fetchurl -, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook -, alsa-lib, fluidsynth, libpulseaudio, qtbase, qtsvg, sonivox, qt5compat ? null +{ + lib, + stdenv, + fetchurl, + cmake, + docbook_xml_dtd_45, + docbook_xsl, + doxygen, + graphviz-nox, + pkg-config, + qttools, + wrapQtAppsHook, + alsa-lib, + fluidsynth, + libpulseaudio, + qtbase, + qtsvg, + qtwayland, + sonivox, + qt5compat ? null, }: let @@ -8,29 +25,45 @@ let in stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-p0N8EeCtVEPCGzPwiRxPdI1XT5XQ5pcKYEDJXbYYTrM="; + hash = "sha256-U5Cm9pTDxC8NzyQfjaC/eBBDUWELV4jq4ov4QGefM9g="; }; - patches = [ - ./drumstick-plugins.patch - ]; + patches = [ ./drumstick-plugins.patch ]; postPatch = '' substituteInPlace library/rt/backendmanager.cpp --subst-var out ''; - outputs = [ "out" "dev" "man" ]; + outputs = [ + "out" + "dev" + "man" + ]; nativeBuildInputs = [ - cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen graphviz-nox pkg-config qttools wrapQtAppsHook + cmake + docbook_xml_dtd_45 + docbook_xml_dtd_45 + docbook_xsl + doxygen + graphviz-nox + pkg-config + qttools + wrapQtAppsHook ]; buildInputs = [ - alsa-lib fluidsynth libpulseaudio qtbase qtsvg sonivox + alsa-lib + fluidsynth + libpulseaudio + qtbase + qtsvg + qtwayland + sonivox ] ++ lib.optionals isQt6 [ qt5compat ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index c222b117fff94..6ca7bd5163832 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -45,11 +45,6 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_UNITTESTS=ON" ]; - postInstall = '' - mkdir -p $lib - mv $out/lib $lib - ''; - doInstallCheck = true; installCheckPhase = @@ -98,12 +93,16 @@ stdenv.mkDerivation (finalAttrs: { # wants http connection "test/sql/copy/csv/recursive_query_csv.test" "test/sql/copy/csv/test_mixed_lines.test" - ] ++ lib.optionals stdenv.isAarch64 [ + "test/parquet/parquet_long_string_stats.test" + "test/sql/attach/attach_remote.test" + "test/sql/copy/csv/test_sniff_httpfs.test" + "test/sql/httpfs/internal_issue_2490.test" + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test/sql/aggregate/aggregates/test_kurtosis.test" "test/sql/aggregate/aggregates/test_skewness.test" "test/sql/function/list/aggregates/skewness.test" ]); - LD_LIBRARY_PATH = lib.optionalString stdenv.isDarwin "DY" + "LD_LIBRARY_PATH"; + LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; in '' runHook preInstallCheck diff --git a/pkgs/development/libraries/duckdb/versions.json b/pkgs/development/libraries/duckdb/versions.json index 8ae8b4bc57d2c..47cad94b53f3b 100644 --- a/pkgs/development/libraries/duckdb/versions.json +++ b/pkgs/development/libraries/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "1.0.0", - "rev": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", - "hash": "sha256-bzFxWv8+Ac8vZLd2OWJyu4T0/0dc7wykdOORMpx92Ic=" + "version": "1.1.1", + "rev": "af39bd0dcf66876e09ac2a7c3baa28fe1b301151", + "hash": "sha256-YPS3DqIYmFKXGkiQiU7/QKNNn7+YyavrA4uDenKuX2g=" } diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 0923d2b450bcd..a3b891253bf41 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [gtest]; cmakeFlags = [ "-Dtest=ON" ]; env.NIX_CFLAGS_COMPILE = "-std=c++14" + - lib.optionalString stdenv.isLinux " -pthread"; + lib.optionalString stdenv.hostPlatform.isLinux " -pthread"; postInstall = '' mkdir -p $out/include cp ../src/easylogging++.cc $out/include diff --git a/pkgs/development/libraries/edencommon/default.nix b/pkgs/development/libraries/edencommon/default.nix index 97406f81c47ae..ce26bc6f71259 100644 --- a/pkgs/development/libraries/edencommon/default.nix +++ b/pkgs/development/libraries/edencommon/default.nix @@ -20,9 +20,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-1z4QicS98juv4bUEbHBkCjVJHEhnoJyLYp4zMHmDbMg="; }; + patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # Test discovery timeout is bizarrely flaky on `x86_64-darwin` + ./increase-test-discovery-timeout.patch + ]; + nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/pkgs/development/libraries/edencommon/increase-test-discovery-timeout.patch b/pkgs/development/libraries/edencommon/increase-test-discovery-timeout.patch new file mode 100644 index 0000000000000..a79efe36d2e40 --- /dev/null +++ b/pkgs/development/libraries/edencommon/increase-test-discovery-timeout.patch @@ -0,0 +1,20 @@ +diff --git a/eden/common/os/test/CMakeLists.txt b/eden/common/os/test/CMakeLists.txt +index a9f71443f8..be1423c455 100644 +--- a/eden/common/os/test/CMakeLists.txt ++++ b/eden/common/os/test/CMakeLists.txt +@@ -18,4 +18,4 @@ + ${LIBGMOCK_LIBRARIES} + ) + +-gtest_discover_tests(os_test) ++gtest_discover_tests(os_test DISCOVERY_TIMEOUT 25) +diff --git a/eden/common/utils/test/CMakeLists.txt b/eden/common/utils/test/CMakeLists.txt +index 0cac73e569..ff08ecccb8 100644 +--- a/eden/common/utils/test/CMakeLists.txt ++++ b/eden/common/utils/test/CMakeLists.txt +@@ -34,4 +34,4 @@ + ${LIBGMOCK_LIBRARIES} + ) + +-gtest_discover_tests(utils_test) ++gtest_discover_tests(utils_test DISCOVERY_TIMEOUT 25) diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index b53be3ae7cf56..f45ea3dc7d3d0 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ispc pkg-config cmake ]; buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ] - ++ lib.optionals stdenv.isDarwin [ glib ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ glib ]; meta = with lib; { description = "High performance ray tracing kernels from Intel"; diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 69cab2ca5b61c..dbd7cefacb678 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -14,12 +14,12 @@ , withAspell ? true , withHunspell ? true , withNuspell ? true -, withAppleSpell ? stdenv.isDarwin +, withAppleSpell ? stdenv.hostPlatform.isDarwin , Cocoa }: -assert withAppleSpell -> stdenv.isDarwin; +assert withAppleSpell -> stdenv.hostPlatform.isDarwin; stdenv.mkDerivation rec { pname = "enchant"; diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix deleted file mode 100644 index d4211be982ef9..0000000000000 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, pythonSupport ? false -, python3Packages -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "example-robot-data"; - version = "4.1.0"; - - src = fetchFromGitHub { - owner = "Gepetto"; - repo = "example-robot-data"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-Heq+c8SSYNO8ksTv5FphRBRStlTakm9T66jlPXon5tI="; - }; - - strictDeps = true; - - patches = [ - # Temporary patch for pinocchio v3.0.0 compatibility. - # Should be removed on next example-robot-data release - (fetchpatch { - name = "pin3.patch"; - url = "https://github.com/Gepetto/example-robot-data/pull/217/commits/a605ceec857005cde153ec5895e227205eb7a5c3.patch"; - hash = "sha256-cvAWFytrU2XVggo/nCg8cuLcaZBTACXg6LxjL/6YMPs="; - }) - ]; - - nativeBuildInputs = [ - cmake - ] ++ lib.optionals pythonSupport [ - python3Packages.python - ]; - - buildInputs = lib.optionals pythonSupport [ - python3Packages.pinocchio - ]; - - cmakeFlags = lib.optionals (!pythonSupport) [ - "-DBUILD_PYTHON_INTERFACE=OFF" - ]; - - doCheck = true; - # The package expect to find an `example-robot-data/robots` folder somewhere - # either in install prefix or in the sources - # where it can find the meshes for unit tests - preCheck = "ln -s source ../../${finalAttrs.pname}"; - pythonImportsCheck = [ - "example_robot_data" - ]; - - meta = with lib; { - description = "Set of robot URDFs for benchmarking and developed examples"; - homepage = "https://github.com/Gepetto/example-robot-data"; - license = licenses.bsd3; - maintainers = with maintainers; [ nim65s wegank ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 96d8d1db7a9ac..ccdd0048e2aaa 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ expat zlib boost ] - ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; - doCheck = stdenv.isLinux && stdenv.is64bit; + doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit; dontDisableStatic = doCheck; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 1591b80215010..56edbdab5d535 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { removeReferencesTo ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { # Fix tests on arm # https://github.com/Exiv2/exiv2/issues/933 rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib export LC_ALL=C diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index bb97ca8728e0b..50ae45f38e9a1 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - configureFlags = lib.optional stdenv.isFreeBSD "--with-pic"; + configureFlags = lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; outputMan = "dev"; # tiny page for a dev tool diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 17bf254338481..1cd4a0a748f62 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "24.08"; + version = "24.09"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-DbfUuLKsArznZ4iNUiQfn1hU61bVf4HvEUx9dCrXfYg="; + sha256 = "sha256-qojDXGFSn865dbHwhyGiHyyGKHIMI82ai4NyXgjAxD0="; }; nativeBuildInputs = [cmake]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/FNA-XNA/FAudio"; changelog = "https://github.com/FNA-XNA/FAudio/releases/tag/${version}"; license = licenses.zlib; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.marius851000 ]; }; } diff --git a/pkgs/development/libraries/fb303/default.nix b/pkgs/development/libraries/fb303/default.nix index 059e666027a01..659497d690f6c 100644 --- a/pkgs/development/libraries/fb303/default.nix +++ b/pkgs/development/libraries/fb303/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DPYTHON_EXTENSIONS=OFF" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/pkgs/development/libraries/fbthrift/default.nix b/pkgs/development/libraries/fbthrift/default.nix index 5ac08f2c6cc3a..04bce085c088d 100644 --- a/pkgs/development/libraries/fbthrift/default.nix +++ b/pkgs/development/libraries/fbthrift/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.isDarwin then "OFF" else "ON"}" - ] ++ lib.optionals stdenv.isDarwin [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isDarwin then "OFF" else "ON"}" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 87070ac1fb72c..ec8c9962125e8 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitea, pkg-config, meson, ninja, scdoc -, freetype, fontconfig, pixman, tllist, check +{ stdenv, lib, fetchFromGitea, fetchpatch, pkg-config, meson, ninja, scdoc +, freetype, fontconfig, nanosvg, pixman, tllist, check # Text shaping methods to enable, empty list disables all text shaping. # See `availableShapingTypes` or upstream meson_options.txt for available types. , withShapingTypes ? [ "grapheme" "run" ] @@ -27,15 +27,26 @@ stdenv.mkDerivation rec { hash = "sha256-Wgm2QdW4rg573soF/8HhDmlyN4S2cA0VWOejow464gU="; }; + patches = [ + (fetchpatch { + name = "system-nanosvg.patch"; + url = "https://codeberg.org/dnkl/fcft/commit/5cee776e1d7f1bdb0df383c3dd798831a6fe4fa0.patch"; + excludes = [ "CHANGELOG.md" ]; + hash = "sha256-yRBtKCKT/Oih66/OQqt4GPg3GfHmhiLM8mlLEWYYRC0="; + }) + ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; - buildInputs = [ freetype fontconfig pixman tllist ] + buildInputs = [ freetype fontconfig nanosvg pixman tllist ] ++ lib.optionals (withShapingTypes != []) [ harfbuzz ] ++ lib.optionals (builtins.elem "run" withShapingTypes) [ utf8proc ]; nativeCheckInputs = [ check ]; mesonBuildType = "release"; - mesonFlags = builtins.map (t: + mesonFlags = [ + (lib.mesonEnable "system-nanosvg" true) + ] ++ builtins.map (t: lib.mesonEnable "${t}-shaping" (lib.elem t withShapingTypes) ) availableShapingTypes; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 65c29f9319ceb..1d8c87ba45d1a 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--with-blas-libs=-lcblas" "--with-lapack-libs=-llapacke" "--without-archnative" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 4e8226c1904a4..dc471944654a1 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -33,14 +33,14 @@ , fetchpatch2 # Feature flags -, withAlsa ? withHeadlessDeps && stdenv.isLinux # Alsa in/output supporT +, withAlsa ? withHeadlessDeps && stdenv.hostPlatform.isLinux # Alsa in/output supporT , withAmf ? lib.meta.availableOn stdenv.hostPlatform amf # AMD Media Framework video encoding , withAom ? withHeadlessDeps # AV1 reference encoder -, withAppKit ? withHeadlessDeps && stdenv.isDarwin # Apple AppKit framework +, withAppKit ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AppKit framework , withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering -, withAudioToolbox ? withHeadlessDeps && stdenv.isDarwin # Apple AudioToolbox -, withAvFoundation ? withHeadlessDeps && stdenv.isDarwin # Apple AVFoundation framework +, withAudioToolbox ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AudioToolbox +, withAvFoundation ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AVFoundation framework , withAvisynth ? withFullDeps # AviSynth script files reading , withBluray ? withFullDeps # BluRay reading , withBs2b ? withFullDeps # bs2b DSP library @@ -49,12 +49,12 @@ , withCelt ? withHeadlessDeps # CELT decoder , withChromaprint ? withFullDeps # Audio fingerprinting , withCodec2 ? withFullDeps # codec2 en/decoding -, withCoreImage ? withHeadlessDeps && stdenv.isDarwin # Apple CoreImage framework +, withCoreImage ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple CoreImage framework , withCuda ? withFullDeps && withNvcodec , withCudaLLVM ? withFullDeps , withCuvid ? withHeadlessDeps && withNvcodec , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) -, withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) +, withDc1394 ? withFullDeps && !stdenv.hostPlatform.isDarwin # IIDC-1394 grabbing (ieee 1394) , withDrm ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # libdrm support , withDvdnav ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing , withDvdread ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing @@ -71,14 +71,14 @@ , withHarfbuzz ? withHeadlessDeps && lib.versionAtLeast version "6.1" # Needed for drawtext filter , withIconv ? withHeadlessDeps , withIlbc ? withFullDeps # iLBC de/encoding -, withJack ? withFullDeps && !stdenv.isDarwin # Jack audio +, withJack ? withFullDeps && !stdenv.hostPlatform.isDarwin # Jack audio , withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding , withLadspa ? withFullDeps # LADSPA audio filtering , withLcms2 ? withFullDeps # ICC profile support via lcms2 , withLzma ? withHeadlessDeps # xz-utils , withMetal ? false # Unfree and requires manual downloading of files , withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx -, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support +, withModplug ? withFullDeps && !stdenv.hostPlatform.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer , withNvdec ? withHeadlessDeps && withNvcodec @@ -88,21 +88,21 @@ , withOpencl ? withFullDeps , withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder , withOpencoreAmrwb ? withFullDeps && withVersion3 # AMR-WB decoder -, withOpengl ? withFullDeps && !stdenv.isDarwin # OpenGL rendering +, withOpengl ? withFullDeps && !stdenv.hostPlatform.isDarwin # OpenGL rendering , withOpenh264 ? withFullDeps # H.264/AVC encoder , withOpenjpeg ? withHeadlessDeps # JPEG 2000 de/encoder , withOpenmpt ? withFullDeps # Tracked music files decoder , withOpus ? withHeadlessDeps # Opus de/encoder -, withPlacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library -, withPulse ? withSmallDeps && stdenv.isLinux # Pulseaudio input support +, withPlacebo ? withFullDeps && !stdenv.hostPlatform.isDarwin # libplacebo video processing library +, withPulse ? withSmallDeps && stdenv.hostPlatform.isLinux # Pulseaudio input support , withQrencode ? withFullDeps && lib.versionAtLeast version "7" # QR encode generation , withQuirc ? withFullDeps && lib.versionAtLeast version "7" # QR decoding , withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety) , withRtmp ? withFullDeps # RTMP[E] support , withRubberband ? withFullDeps && withGPL # Rubberband filter -, withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol +, withSamba ? withFullDeps && !stdenv.hostPlatform.isDarwin && withGPLv3 # Samba protocol , withSdl2 ? withSmallDeps -, withShaderc ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" +, withShaderc ? withFullDeps && !stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "5.0" , withShine ? withFullDeps # Fixed-point MP3 encoding , withSnappy ? withFullDeps # Snappy compression, needed for hap encoding , withSoxr ? withHeadlessDeps # Resampling via soxr @@ -110,22 +110,22 @@ , withSrt ? withHeadlessDeps # Secure Reliable Transport (SRT) protocol , withSsh ? withHeadlessDeps # SFTP protocol , withSvg ? withFullDeps # SVG protocol -, withSvtav1 ? withHeadlessDeps && !stdenv.isAarch64 && !stdenv.hostPlatform.isMinGW # AV1 encoder/decoder (focused on speed and correctness) +, withSvtav1 ? withHeadlessDeps && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isMinGW # AV1 encoder/decoder (focused on speed and correctness) , withTensorflow ? false # Tensorflow dnn backend support (Increases closure size by ~390 MiB) , withTheora ? withHeadlessDeps # Theora encoder , withTwolame ? withFullDeps # MP2 encoding -, withV4l2 ? withHeadlessDeps && stdenv.isLinux # Video 4 Linux support +, withV4l2 ? withHeadlessDeps && stdenv.hostPlatform.isLinux # Video 4 Linux support , withV4l2M2m ? withV4l2 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW # Vdpau hardware acceleration -, withVideoToolbox ? withHeadlessDeps && stdenv.isDarwin # Apple VideoToolbox +, withVideoToolbox ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple VideoToolbox , withVidStab ? withFullDeps && withGPL # Video stabilization -, withVmaf ? withFullDeps && !stdenv.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) +, withVmaf ? withFullDeps && !stdenv.hostPlatform.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) , withVoAmrwbenc ? withFullDeps && withVersion3 # AMR-WB encoder , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists , withVpl ? false # Hardware acceleration via intel libvpl , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding -, withVulkan ? withSmallDeps && !stdenv.isDarwin +, withVulkan ? withSmallDeps && !stdenv.hostPlatform.isDarwin , withWebp ? withHeadlessDeps # WebP encoder , withX264 ? withHeadlessDeps && withGPL # H.264/AVC encoder , withX265 ? withHeadlessDeps && withGPL # H.265/HEVC encoder @@ -827,7 +827,7 @@ stdenv.mkDerivation (finalAttrs: { # Fails with SIGABRT otherwise FIXME: Why? checkPhase = let - ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + ldLibraryPathEnv = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; libsToLink = [ ] ++ optional buildAvcodec "libavcodec" ++ optional buildAvdevice "libavdevice" @@ -856,7 +856,7 @@ stdenv.mkDerivation (finalAttrs: { # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addDriverRunpath. - postFixup = optionalString (stdenv.isLinux && withLib) '' + postFixup = optionalString (stdenv.hostPlatform.isLinux && withLib) '' addDriverRunpath ${placeholder "lib"}/lib/libavcodec.so addDriverRunpath ${placeholder "lib"}/lib/libavutil.so '' diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 10e9b70d42ede..ff1a8615ab798 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -39,6 +39,11 @@ stdenv.mkDerivation rec { --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ ''; + postInstall = '' + substituteInPlace $out/share/thumbnailers/ffmpegthumbnailer.thumbnailer \ + --replace-fail '=ffmpegthumbnailer' "=$out/bin/ffmpegthumbnailer" + ''; + meta = with lib; { description = "Lightweight video thumbnailer"; longDescription = "FFmpegthumbnailer is a lightweight video diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 7c06a346e4bb8..b6107f3ef91af 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (precision != "double") "--enable-${precision}" # https://www.fftw.org/fftw3_doc/SIMD-alignment-and-fftw_005fmalloc.html # FFTW will try to detect at runtime whether the CPU supports these extensions - ++ lib.optional (stdenv.isx86_64 && (precision == "single" || precision == "double")) + ++ lib.optional (stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double")) "--enable-sse2 --enable-avx --enable-avx2 --enable-avx512 --enable-avx128-fma" ++ lib.optional enableMpi "--enable-mpi" # doc generation causes Fortran wrapper generation which hard-codes gcc diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index cc7a249cf76fb..4c38c54316b72 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Wno-dev" (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index edbebdb1b8dad..777bef9246623 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Ddocs=true" "-Dtelepathy_backend=${lib.boolToString telepathySupport}" - "-Dtests=${lib.boolToString (finalAttrs.finalPackage.doCheck && stdenv.isLinux)}" + "-Dtests=${lib.boolToString (finalAttrs.finalPackage.doCheck && stdenv.hostPlatform.isLinux)}" ]; # backends/eds/lib/libfolks-eds.so.26.0.0.p/edsf-persona-store.c:10697:4: diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 532fc4847715e..8a601382f8ead 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation rec { libunwind fmt_8 zstd - ] ++ lib.optional stdenv.isLinux jemalloc; + ] ++ lib.optional stdenv.hostPlatform.isLinux jemalloc; # jemalloc headers are required in include/folly/portability/Malloc.h - propagatedBuildInputs = lib.optional stdenv.isLinux jemalloc; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux jemalloc; env.NIX_CFLAGS_COMPILE = toString [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ]; cmakeFlags = [ @@ -66,13 +66,13 @@ stdenv.mkDerivation rec { # temporary hack until folly builds work on aarch64, # see https://github.com/facebook/folly/issues/1880 - "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.isx86_64 then "x86_64" else "dummy"}" + "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.hostPlatform.isx86_64 then "x86_64" else "dummy"}" # ensure correct dirs in $dev/lib/pkgconfig/libfolly.pc # see https://github.com/NixOS/nixpkgs/issues/144170 "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" - ] ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 569c2716f0e53..4f7f3c0fe1e99 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ expat - ] ++ lib.optional stdenv.isDarwin CoreFoundation; + ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreFoundation; propagatedBuildInputs = [ freetype @@ -69,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' cd "$out/etc/fonts" xsltproc --stringparam fontDirectories "${dejavu_fonts.minimal}" \ + --stringparam includes /etc/fonts/conf.d \ --path $out/share/xml/fontconfig \ ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \ > fonts.conf.tmp diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index ff0d95ba4451e..669b66267f879 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -9,13 +9,13 @@ let fontconfig_ = fontconfig; in # nix user profile "~/.nix-profile/lib/X11/fonts" "~/.nix-profile/share/fonts" ] - ++ lib.optional stdenv.isDarwin "~/Library/Fonts" + ++ lib.optional stdenv.hostPlatform.isDarwin "~/Library/Fonts" ++ [ # FHS paths for non-NixOS platforms "/usr/share/fonts" "/usr/local/share/fonts" ] # darwin paths - ++ lib.optionals stdenv.isDarwin [ "/Library/Fonts" "/System/Library/Fonts" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "/Library/Fonts" "/System/Library/Fonts" ] # nix default profile ++ [ "/nix/var/nix/profiles/default/lib/X11/fonts" "/nix/var/nix/profiles/default/share/fonts" ] diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 4ceb6261231e5..e10d01d2c8421 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXext libXft libGLU libGL libXfixes xinput - ] ++ lib.optional stdenv.isDarwin CoreServices; + ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; doCheck = true; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; branch = "1.6"; description = "C++ based class library for building Graphical User Interfaces"; longDescription = '' diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index dbae2b20b61c9..2f98b1c8e7a27 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ openal - ] ++ lib.optional stdenv.isDarwin + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.OpenAL ; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index c3a0fdb797f62..590167fc70361 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; buildInputs = [ libICE libXext libXi libXrandr libXxf86vm libGLU ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_INCLUDE_DIR=${libGLX.dev}/include" "-DOPENGL_gl_LIBRARY:FILEPATH=${libGLX}/lib/libGL.dylib" "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib" diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 20ced14ace6ef..dd63935b23fd6 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -30,22 +30,22 @@ stdenv.mkDerivation (finalAttrs: { --replace "pkg-config" "$PKG_CONFIG" substituteInPlace Makefile.gnu \ --replace "pkg-config" "$PKG_CONFIG" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # Upstream Makefile hardcodes i386 and x86_64 architectures only substituteInPlace Makefile.osx --replace "x86_64" "arm64" ''; nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ]; - postBuild = lib.optionalString (!stdenv.isDarwin) '' + postBuild = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' make -f Makefile.fip ''; @@ -56,13 +56,13 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $INCDIR $INSTALLDIR '' # Workaround for Makefiles.osx not using ?= - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' makeFlagsArray+=( "INCDIR=$INCDIR" "INSTALLDIR=$INSTALLDIR" ) ''; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' make -f Makefile.fip install - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/libfreeimage.3.dylib $out/lib/libfreeimage.dylib ''; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index b537bea33777c..f58785c1e1bd8 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { pname = "freenect"; - version = "0.7.0"; + version = "0.7.5"; src = fetchFromGitHub { owner = "OpenKinect"; repo = "libfreenect"; rev = "v${version}"; - sha256 = "sha256-Lb5mrl9jiI1Z9UOAlP+bBPNoKNxm5VSrFZRvifEfhoU="; + sha256 = "sha256-PpJGFWrlQ5sK7TJxQNoPujw1MxWRjphvblwOqnF+mSg="; }; buildInputs = [ libusb1 libglut libGLU libGL libXi libXmu ] - ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ GLUT Cocoa ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 8ff0005d0ff07..34e156256afd2 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config which ] ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. - ++ lib.optional (!stdenv.isLinux) gnumake; + ++ lib.optional (!stdenv.hostPlatform.isLinux) gnumake; patches = [ ./enable-table-validation.patch @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; # The asm for armel is written with the 'asm' keyword. - CFLAGS = lib.optionalString stdenv.isAarch32 "-std=gnu99" + CFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-std=gnu99" + lib.optionalString stdenv.hostPlatform.is32bit " -D_FILE_OFFSET_BITS=64"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/freexl/default.nix b/pkgs/development/libraries/freexl/default.nix index 74d4a646b074b..ffcf81e92f58c 100644 --- a/pkgs/development/libraries/freexl/default.nix +++ b/pkgs/development/libraries/freexl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { expat minizip zlib - ] ++ lib.optional stdenv.isDarwin libiconv; + ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index f5d6bcc7df344..691b826e3af55 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ meson ninja pkg-config ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix deleted file mode 100644 index d1fb07167e133..0000000000000 --- a/pkgs/development/libraries/ftgl/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, doxygen -, libglut -, freetype -, libGL -, libGLU -, pkg-config -, darwin -}: - -let - inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; -in -stdenv.mkDerivation rec { - pname = "ftgl"; - version = "2.4.0"; - - src = fetchFromGitHub { - owner = "frankheckenbach"; - repo = "ftgl"; - rev = "v${version}"; - hash = "sha256-6TDNGoMeBLnucmHRgEDIVWcjlJb7N0sTluqBwRMMWn4="; - }; - - # GL_DYLIB is hardcoded to an impure path - # /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib - # and breaks build on recent macOS versions - postPatch = '' - substituteInPlace m4/gl.m4 \ - --replace ' -dylib_file $GL_DYLIB: $GL_DYLIB' "" - ''; - - nativeBuildInputs = [ - autoreconfHook - doxygen - pkg-config - ]; - buildInputs = [ - freetype - ] ++ (if stdenv.isDarwin then [ - OpenGL - GLUT - ] else [ - libGL - libGLU - libglut - ]); - - configureFlags = [ - "--with-ft-prefix=${lib.getDev freetype}" - ]; - - enableParallelBuilding = true; - - postInstall = '' - install -Dm644 src/FTSize.h -t ${placeholder "out"}/include/FTGL - install -Dm644 src/FTFace.h -t ${placeholder "out"}/include/FTGL - ''; - - meta = with lib; { - homepage = "https://github.com/frankheckenbach/ftgl"; - description = "Font rendering library for OpenGL applications"; - longDescription = '' - FTGL is a free cross-platform Open Source C++ library that uses Freetype2 - to simplify rendering fonts in OpenGL applications. FTGL supports bitmaps, - pixmaps, texture maps, outlines, polygon mesh, and extruded polygon - rendering modes. - ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 7ff0c207060c0..6f6560ea9f3f1 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { # Detection script is broken "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ "-DDO_SSE_AUTODETECT=OFF" "-DDISABLE_SSE3=${ if stdenv.hostPlatform.sse3Support then "OFF" else "ON"}" "-DDISABLE_SSE4_1=${if stdenv.hostPlatform.sse4_1Support then "OFF" else "ON"}" @@ -43,6 +43,6 @@ mkDerivation rec { maintainers = with maintainers; [ lopsided98 ]; platforms = platforms.all; # fatal error: 'qglviewer.h' file not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 8b54cfb7b8797..add2445f4462c 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftw fftwFloat ] ++ lib.optional enablePython pythonPackages.python - ++ lib.optional stdenv.isDarwin llvmPackages.openmp + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp ; propagatedBuildInputs = lib.optionals enablePython [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; preCheck = '' - ${if stdenv.isDarwin then "export DYLD_LIBRARY_PATH=$(pwd)/src/" else "export LD_LIBRARY_PATH=$(pwd)/src/"} + ${if stdenv.hostPlatform.isDarwin then "export DYLD_LIBRARY_PATH=$(pwd)/src/" else "export LD_LIBRARY_PATH=$(pwd)/src/"} ${lib.optionalString enablePython "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh"} ''; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = lib.optionalString (stdenv.isDarwin && enablePython) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin && enablePython) '' install_name_tool -change libgalario.dylib $out/lib/libgalario.dylib $out/lib/python*/site-packages/galario/double/libcommon.so install_name_tool -change libgalario_single.dylib $out/lib/libgalario_single.dylib $out/lib/python*/site-packages/galario/single/libcommon.so ''; diff --git a/pkgs/development/libraries/gamin/abstract-socket-namespace.patch b/pkgs/development/libraries/gamin/abstract-socket-namespace.patch deleted file mode 100644 index ff1610559721e..0000000000000 --- a/pkgs/development/libraries/gamin/abstract-socket-namespace.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 737452159d521aef2041a2767f3ebf9f68f4b6a9 Mon Sep 17 00:00:00 2001 -From: Christian Kampka <christian@kampka.net> -Date: Tue, 1 Sep 2020 13:54:35 +0200 -Subject: [PATCH] Pin abstract namespace sockets to host_os - -Running programs with AC_RUN_IFELSE fails when cross-compiling. -Since abstract namespace sockets are linux feature, we can easily -assume it is available for linux and not for darwin. ---- - configure.in | 47 ++++++----------------------------------------- - 1 file changed, 6 insertions(+), 41 deletions(-) - -diff --git a/configure.in b/configure.in -index eb129db..0ed82ba 100644 ---- a/configure.in -+++ b/configure.in -@@ -387,47 +387,12 @@ fi - - #### Abstract sockets - --AC_MSG_CHECKING(abstract socket namespace) --AC_LANG_PUSH(C) --AC_RUN_IFELSE([AC_LANG_PROGRAM( --[[ --#include <sys/types.h> --#include <stdlib.h> --#include <string.h> --#include <stdio.h> --#include <sys/socket.h> --#include <sys/un.h> --#include <errno.h> --]], --[[ -- int listen_fd; -- struct sockaddr_un addr; -- -- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); -- -- if (listen_fd < 0) -- { -- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); -- exit (1); -- } -- -- memset (&addr, '\0', sizeof (addr)); -- addr.sun_family = AF_UNIX; -- strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); -- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ -- -- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) -- { -- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", -- strerror (errno)); -- exit (1); -- } -- else -- exit (0); --]])], -- [have_abstract_sockets=yes], -- [have_abstract_sockets=no]) --AC_LANG_POP(C) -+AC_MSG_CHECKING([whether target os has abstract socket namespace]) -+if test x$target_os = xlinux-gnu ; then -+ have_abstract_sockets=yes -+else -+ have_abstract_sockets=no -+fi - AC_MSG_RESULT($have_abstract_sockets) - - if test x$enable_abstract_sockets = xyes; then --- -2.25.4 - diff --git a/pkgs/development/libraries/gamin/deadlock.patch b/pkgs/development/libraries/gamin/deadlock.patch deleted file mode 100644 index e2abc8ce2d97d..0000000000000 --- a/pkgs/development/libraries/gamin/deadlock.patch +++ /dev/null @@ -1,68 +0,0 @@ -Fix for a deadlock: -https://bugzilla.gnome.org/show_bug.cgi?id=667230 - -From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001 -From: Anssi Hannula <anssi@mageia.org> -Date: Wed, 4 Jan 2012 00:23:55 +0200 -Subject: [PATCH] fix possible server deadlock in ih_sub_cancel - -ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked. -However, ih_sub_cancel() locks it again, and locking GMutex recursively -causes undefined behaviour. - -Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach() -is its only user. Also make the function static so that it won't -accidentally get used by other files without locking (inotify-helper.h -is an internal server header). - -This should fix the intermittent deadlocks I've been experiencing -causing KDE applications to no longer start, and probably also -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361 ---- - server/inotify-helper.c | 7 ++----- - server/inotify-helper.h | 1 - - 2 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/server/inotify-helper.c b/server/inotify-helper.c -index d77203e..0789fa4 100644 ---- a/server/inotify-helper.c -+++ b/server/inotify-helper.c -@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub) - - /** - * Cancels a subscription which was being monitored. -+ * inotify_lock must be held when calling. - */ --gboolean -+static gboolean - ih_sub_cancel (ih_sub_t * sub) - { -- G_LOCK(inotify_lock); -- -- - if (!sub->cancelled) - { - IH_W("cancelling %s\n", sub->pathname); -@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub) - sub_list = g_list_remove (sub_list, sub); - } - -- G_UNLOCK(inotify_lock); - return TRUE; - } - -diff --git a/server/inotify-helper.h b/server/inotify-helper.h -index 5d3b6d0..d36b5fd 100644 ---- a/server/inotify-helper.h -+++ b/server/inotify-helper.h -@@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb, - found_callback_t fcb); - gboolean ih_running (void); - gboolean ih_sub_add (ih_sub_t *sub); --gboolean ih_sub_cancel (ih_sub_t *sub); - - /* Return FALSE from 'f' if the subscription should be cancelled */ - void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata)); --- -1.7.7.2 - diff --git a/pkgs/development/libraries/gamin/debian-patches.nix b/pkgs/development/libraries/gamin/debian-patches.nix deleted file mode 100644 index a8f334fb3c394..0000000000000 --- a/pkgs/development/libraries/gamin/debian-patches.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Generated by debian-patches.sh from debian-patches.txt -let - prefix = "https://sources.debian.org/data/main/g/gamin/0.1.10-4.1/debian/patches"; -in -[ - { - url = "${prefix}/17_deprecated_const_return.patch"; - sha256 = "0bssrqcmyivlpk2g0q71d1yavd4wv1lw34l8qipm0ndljjd6rbrk"; - } -] diff --git a/pkgs/development/libraries/gamin/debian-patches.txt b/pkgs/development/libraries/gamin/debian-patches.txt deleted file mode 100644 index 46d2420b21ede..0000000000000 --- a/pkgs/development/libraries/gamin/debian-patches.txt +++ /dev/null @@ -1,2 +0,0 @@ -gamin/0.1.10-4.1 -17_deprecated_const_return.patch diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix deleted file mode 100644 index e2d32fd645278..0000000000000 --- a/pkgs/development/libraries/gamin/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "gamin"; - version = "0.1.10"; - - src = fetchurl { - url = "https://www.gnome.org/~veillard/gamin/sources/gamin-${version}.tar.gz"; - sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - - buildInputs = [ glib ]; - - # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from - # <sys/socket.h> with Glibc 2.9. - configureFlags = [ - "--disable-debug" - "--without-python" # python3 not supported - "CPPFLAGS=-D_GNU_SOURCE" - ]; - - preBuild = lib.optionalString stdenv.isDarwin '' - sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile - ''; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - patches = [ ./deadlock.patch ] - ++ map fetchurl (import ./debian-patches.nix) - ++ lib.optional stdenv.cc.isClang ./returnval.patch - ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - name = "fix-pthread-mutex.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; - sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; - }) ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./abstract-socket-namespace.patch; - - - meta = with lib; { - homepage = "https://people.gnome.org/~veillard/gamin/"; - description = "File and directory monitoring system"; - maintainers = with maintainers; [ lovek323 ]; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} - diff --git a/pkgs/development/libraries/gamin/returnval.patch b/pkgs/development/libraries/gamin/returnval.patch deleted file mode 100644 index 3944b14be64ca..0000000000000 --- a/pkgs/development/libraries/gamin/returnval.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN gamin-0.1.10-orig/server/gam_eq.c gamin-0.1.10/server/gam_eq.c ---- gamin-0.1.10-orig/server/gam_eq.c 2015-04-05 19:25:54.000000000 -0400 -+++ gamin-0.1.10/server/gam_eq.c 2015-04-05 19:26:00.000000000 -0400 -@@ -124,7 +124,7 @@ gam_eq_flush (gam_eq_t *eq, GamConnDataP - { - gboolean done_work = FALSE; - if (!eq) -- return; -+ return done_work; - - #ifdef GAM_EQ_VERBOSE - GAM_DEBUG(DEBUG_INFO, "gam_eq: Flushing event queue for %s\n", gam_connection_get_pidname (conn)); diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix index e183a24c81280..2c5740692f4b8 100644 --- a/pkgs/development/libraries/garmintools/default.nix +++ b/pkgs/development/libraries/garmintools/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index c89d3413aa2c0..be39b0d7cbdd3 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; # Tests fail on 32-bit due to not enough precision - doCheck = stdenv.is64bit; + doCheck = stdenv.hostPlatform.is64bit; passthru.tests = { inherit prometheus-cpp; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "Microbenchmark support library"; homepage = "https://github.com/google/benchmark"; license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix index 48a034aebcebc..455c84e5dc187 100644 --- a/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -114,6 +114,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 0a74d6122ee2e..6b1a471d4aac3 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "--enable-gd-formats" ] # -pthread gets passed to clang, causing warnings - ++ lib.optional stdenv.isDarwin "--enable-werror=no"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-werror=no"; nativeBuildInputs = [ autoconf automake pkg-config ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index cf2ff67acf414..6bddc8c6b5e5c 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -2,9 +2,10 @@ , stdenv , callPackage , fetchFromGitHub +, fetchpatch , useMinimalFeatures ? false -, useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) +, useTiledb ? (!useMinimalFeatures) && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) , useLibHEIF ? (!useMinimalFeatures) , useLibJXL ? (!useMinimalFeatures) , useMysql ? (!useMinimalFeatures) @@ -88,6 +89,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-BXnpNfi9tUd6nnwYdstuOfGsFVif8kkmkW97X1UAgt8="; }; + patches = [ + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/91e4f55f8f374a75f8f2ecd05670edcfa4c0af84.patch"; + sha256 = "sha256-C2lkZLsORso7WVxgX79r5swkoVu/APPwQp2C/rmmCAo="; + }) + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/40c3212fe4ba93e5176df4cd8ae5e29e06bb6027.patch"; + sha256 = "sha256-D55iT6E/YdpSyfN7KUDTh1gdmIDLHXW4VC5d6D9B7ls="; + }) + ]; + nativeBuildInputs = [ bison cmake @@ -107,9 +119,9 @@ stdenv.mkDerivation (finalAttrs: { "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${lib.optionalString (libmysqlclient.pname != "mysql") "mysql/"}libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ lib.optionals finalAttrs.doInstallCheck [ "-DBUILD_TESTING=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ] ++ lib.optionals (!useTiledb) [ "-DGDAL_USE_TILEDB=OFF" @@ -145,8 +157,8 @@ stdenv.mkDerivation (finalAttrs: { netCdfDeps = lib.optionals useNetCDF [ netcdf ]; armadilloDeps = lib.optionals useArmadillo [ armadillo ]; - darwinDeps = lib.optionals stdenv.isDarwin [ libiconv ]; - nonDarwinDeps = lib.optionals (!stdenv.isDarwin) ([ + darwinDeps = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) ([ # tests for formats enabled by these packages fail on macos openexr xercesc @@ -256,10 +268,13 @@ stdenv.mkDerivation (finalAttrs: { # failing with PROJ 9.3.1 # https://github.com/OSGeo/gdal/issues/8908 "test_osr_esri_28" - ] ++ lib.optionals (!stdenv.isx86_64) [ + # flakey tests, to remove on next release + "test_vsiaz_write_blockblob_chunk_size_1" + "test_vsiaz_fake_write" + ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ # likely precision-related expecting x87 behaviour "test_jp2openjpeg_22" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky on macos "test_rda_download_queue" ] ++ lib.optionals (lib.versionOlder proj.version "8") [ diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index cacfb778c7bcc..50ad7bdd9fd62 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -10,7 +10,7 @@ , libiconv , enablePython ? false , python ? null -, swig4 +, swig , expat , libuuid , openjpeg @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optional stdenv.isDarwin DarwinTools; + ] ++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools; buildInputs = [ expat @@ -60,11 +60,11 @@ stdenv.mkDerivation rec { zlib ] ++ lib.optionals enableVTK [ vtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Cocoa libiconv - ] ++ lib.optionals enablePython [ swig4 python ]; + ] ++ lib.optionals enablePython [ swig python ]; disabledTests = [ # require networking: @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { "TestSCUValidation" # errors because 3 classes not wrapped: "TestWrapPython" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ "TestRescaler2" ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 59760504f98e3..b7ba122453629 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { # for man pages docutils - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ] ++ lib.optionals withIntrospection [ gi-docgen @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # meson erroneously installs loaders with .dylib extension on Darwin. # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. for f in $out/${finalAttrs.passthru.moduleDir}/*.dylib; do @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # The fixDarwinDylibNames hook doesn't patch binaries. - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/bin/* $dev/bin/*; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f done @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index addc4a9dbe448..95cdef4734671 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { gexiv2 openexr suitesparse - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenCL ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { ''; # tests fail to connect to the com.apple.fonts daemon in sandboxed mode - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Graph-based image processing framework"; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 8a895c36e8657..9bd0633e3d1b5 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.8.5"; + version = "2.8.9"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J1fP3CtTLkUMZxzsbu3ZMbg4ag1NFvaI5AibFT7eZso="; + sha256 = "sha256-xW3I1OfL+AfbeKf/kwBdsZRoCsPPZ7oLMppeIepn/P0="; }; passthru = { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ openssl ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; meta = with lib; { description = "General Stream I/O"; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 3c6a40eeb5cb4..84fa20f8efadb 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { avahi ] ++ lib.optionals withDemoAgent [ libnotify gdk-pixbuf - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ modemmanager ]; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { "-Dmozilla-api-key=5c28d1f4-9511-47ff-b11a-2bef80fc177c" "-Ddbus-srv-user=geoclue" "-Ddbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-D3g-source=false" "-Dcdma-source=false" "-Dmodem-gps-source=false" @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin && withDemoAgent; + broken = stdenv.hostPlatform.isDarwin && withDemoAgent; description = "Geolocation framework and some data providers"; homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"; maintainers = with maintainers; [ raskin mimame ]; diff --git a/pkgs/development/libraries/geogram/default.nix b/pkgs/development/libraries/geogram/default.nix index 619b5dfcdf574..444975de853c6 100644 --- a/pkgs/development/libraries/geogram/default.nix +++ b/pkgs/development/libraries/geogram/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ./replace-bundled-zlib.patch ]; - postPatch = lib.optionalString stdenv.isAarch64 '' + postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace cmake/platforms/*/config.cmake \ --replace "-m64" "" ''; @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { # Broken on aarch64-linux as of version 1.8.3 # See https://github.com/BrunoLevy/geogram/issues/74 - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; maintainers = with maintainers; [ tmarkus ]; diff --git a/pkgs/development/libraries/geos/3.11.nix b/pkgs/development/libraries/geos/3.11.nix index fb3eccf997a1d..32e1f39965d75 100644 --- a/pkgs/development/libraries/geos/3.11.nix +++ b/pkgs/development/libraries/geos/3.11.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; # https://github.com/libgeos/geos/issues/930 - cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope" ]; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 849fe64634a55..2e63196b04207 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -9,17 +9,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.12.2"; + version = "3.13.0"; src = fetchurl { url = "https://download.osgeo.org/geos/geos-${finalAttrs.version}.tar.bz2"; - hash = "sha256-NMd3C/AJDuiEiK+Ydn0I53nxJPozQ34Kq+yKvUYJ/sY="; + hash = "sha256-R+yD/zNNZyueRCZpXxXabmNoJEIUlx+r84b/jvbfOeQ="; }; nativeBuildInputs = [ cmake ]; # https://github.com/libgeos/geos/issues/930 - cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope" ]; diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 69d7f17dafe7d..b85dc689d96cf 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -62,7 +62,7 @@ in rec { nativeBuildInputs = [ cmake doxygen yq ]; buildInputs = [ getdns libyaml openssl systemd ] - ++ lib.optionals stdenv.isDarwin [ darwin.Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; postInstall = '' rm -r $out/share/doc diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index abb692aebc1e9..0518a40c29301 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - LDFLAGS = lib.optionalString stdenv.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec"; + LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec"; configureFlags = [ "--disable-csharp" @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [ bash ] - ++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isCygwin) [ # HACK, see #10874 (and 14664) libiconv ]; @@ -102,6 +102,6 @@ stdenv.mkDerivation rec { }; } -// lib.optionalAttrs stdenv.isDarwin { +// lib.optionalAttrs stdenv.hostPlatform.isDarwin { makeFlags = [ "CFLAGS=-D_FORTIFY_SOURCE=0" ]; } diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index c560a3fc10e93..7a0e61cbf2b05 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = let - libSuffix = if stdenv.isDarwin then "2.dylib" else "so.2"; + libSuffix = if stdenv.hostPlatform.isDarwin then "2.dylib" else "so.2"; in '' # Our gobject-introspection patches make the shared library paths absolute # in the GIR files. When running unit tests, the library is not yet installed, diff --git a/pkgs/development/libraries/gfxstream/default.nix b/pkgs/development/libraries/gfxstream/default.nix index e3164c95a4c64..6dd5a11e841fe 100644 --- a/pkgs/development/libraries/gfxstream/default.nix +++ b/pkgs/development/libraries/gfxstream/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ]; # Ensure that meson can find an Objective-C compiler on Darwin. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace meson.build \ --replace-fail "project('gfxstream_backend', 'cpp', 'c'" "project('gfxstream_backend', 'cpp', 'c', 'objc'" ''; @@ -30,7 +30,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ meson ninja pkg-config python3 ]; buildInputs = [ aemu libglvnd vulkan-headers vulkan-loader xorg.libX11 ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.IOKit @@ -39,7 +39,7 @@ stdenv.mkDerivation { darwin.apple_sdk.frameworks.QuartzCore ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = toString [ "-framework Cocoa" "-framework IOKit" @@ -51,7 +51,7 @@ stdenv.mkDerivation { }; # dlopens libvulkan. - preConfigure = lib.optionalString (!stdenv.isDarwin) '' + preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mesonFlagsArray=(-Dcpp_link_args="-Wl,--push-state -Wl,--no-as-needed -lvulkan -Wl,--pop-state") ''; diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index cc5ef6f643695..c6dd7c81833f6 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ./mingw-install-exes.patch ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 44fe143968360..a77cc10e2e36f 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-archnative" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 604435cee5105..99fb182bc88d2 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -83,11 +83,11 @@ in stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ] ++ lib.optionals (!stdenv.isLinux || stdenv.hostPlatform.isMusl) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isMusl) [ "-Dprofiler=disabled" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postPatch = '' patchShebangs build/choose-tests-locale.sh @@ -130,7 +130,7 @@ in stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; passthru = { tests = { diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index f1d67c8c88552..eec23cef70bce 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libpng - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU libglut - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.OpenGL ]; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 5d8f155a5c61a..a675eebaa3428 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = if stdenv.isDarwin then [ AGL ] else [ libXmu libXi libXext ]; - propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h + buildInputs = if stdenv.hostPlatform.isDarwin then [ AGL ] else [ libXmu libXi libXext ]; + propagatedBuildInputs = if stdenv.hostPlatform.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 5b774f58717ce..8d68ad0867644 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -8,7 +8,7 @@ , libXi , libXext , OpenGL -, enableEGL ? (!stdenv.isDarwin) +, enableEGL ? (!stdenv.hostPlatform.isDarwin) , testers , mesa }: @@ -40,8 +40,8 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ libXmu libXi libXext ]; - propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libXmu libXi libXext ]; + propagatedBuildInputs = if stdenv.hostPlatform.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h cmakeDir = "cmake"; cmakeFlags = [ diff --git a/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix b/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix deleted file mode 100644 index 03baa891b3b4d..0000000000000 --- a/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch2, cmake, extra-cmake-modules -, libGL, wayland, wayland-protocols, libxkbcommon, libdecor -}: - -stdenv.mkDerivation { - version = "unstable-2023-06-01"; - pname = "glfw-wayland-minecraft"; - - src = fetchFromGitHub { - owner = "glfw"; - repo = "GLFW"; - rev = "3eaf1255b29fdf5c2895856c7be7d7185ef2b241"; - sha256 = "sha256-UnwuE/3q6I4dS5syagpnqrDEVDK9XSVdyOg7KNkdUUA="; - }; - - patches = [ - (fetchpatch2 { - url = "https://raw.githubusercontent.com/Admicos/minecraft-wayland/15f88a515c63a9716cfdf4090fab8e16543f4ebd/0003-Don-t-crash-on-calls-to-focus-or-icon.patch"; - hash = "sha256-NZbKh16h+tWXXnz13QcFBFaeGXMNxZKGQb9xJEahFnE="; - }) - (fetchpatch2 { - url = "https://raw.githubusercontent.com/Admicos/minecraft-wayland/15f88a515c63a9716cfdf4090fab8e16543f4ebd/0005-Add-warning-about-being-an-unofficial-patch.patch"; - hash = "sha256-QMUNlnlCeFz5gIVdbM+YXPsrmiOl9cMwuVRSOvlw+T0="; - }) - ]; - - propagatedBuildInputs = [ libGL ]; - - nativeBuildInputs = [ cmake extra-cmake-modules ]; - - buildInputs = [ wayland wayland-protocols libxkbcommon ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DGLFW_BUILD_WAYLAND=ON" - "-DGLFW_BUILD_X11=OFF" - "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" - ]; - - postPatch = '' - substituteInPlace src/wl_init.c \ - --replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" - - substituteInPlace src/wl_init.c \ - --replace "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0" - - substituteInPlace src/wl_init.c \ - --replace "libwayland-client.so.0" "${lib.getLib wayland}/lib/libwayland-client.so.0" - - substituteInPlace src/wl_init.c \ - --replace "libwayland-cursor.so.0" "${lib.getLib wayland}/lib/libwayland-cursor.so.0" - - substituteInPlace src/wl_init.c \ - --replace "libwayland-egl.so.1" "${lib.getLib wayland}/lib/libwayland-egl.so.1" - ''; - - meta = with lib; { - description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time - with patches to support Minecraft on Wayland"; - homepage = "https://www.glfw.org/"; - license = licenses.zlib; - maintainers = with maintainers; [ Scrumplex ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix deleted file mode 100644 index 2ec1f42d2840f..0000000000000 --- a/pkgs/development/libraries/glfw/3.x.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake -, libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext -, Carbon, Cocoa, Kernel, fixDarwinDylibNames -, extra-cmake-modules, wayland -, wayland-scanner, wayland-protocols, libxkbcommon, libdecor -}: - -stdenv.mkDerivation rec { - version = "3.4"; - pname = "glfw"; - - src = fetchFromGitHub { - owner = "glfw"; - repo = "GLFW"; - rev = version; - sha256 = "sha256-FcnQPDeNHgov1Z07gjFze0VMz2diOrpbKZCsI96ngz0="; - }; - - # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) - patches = ./x11.patch; - - propagatedBuildInputs = [ libGL ]; - - nativeBuildInputs = [ cmake extra-cmake-modules ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames - ++ lib.optionals stdenv.isLinux [ wayland-scanner ]; - - buildInputs = - lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ] - ++ lib.optionals stdenv.isLinux [ - wayland - wayland-protocols - libxkbcommon - libX11 - libXrandr - libXinerama - libXcursor - libXi - libXext - ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optionals (!stdenv.isDarwin && !stdenv.hostPlatform.isWindows) [ - "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" - "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" - ]; - - postPatch = lib.optionalString stdenv.isLinux '' - substituteInPlace src/wl_init.c \ - --replace-fail "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" \ - --replace-fail "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0" \ - --replace-fail "libwayland-client.so.0" "${lib.getLib wayland}/lib/libwayland-client.so.0" \ - --replace-fail "libwayland-cursor.so.0" "${lib.getLib wayland}/lib/libwayland-cursor.so.0" \ - --replace-fail "libwayland-egl.so.1" "${lib.getLib wayland}/lib/libwayland-egl.so.1" - ''; - - # glfw may dlopen libwayland-client.so: - postFixup = lib.optionalString stdenv.isLinux '' - patchelf ''${!outputLib}/lib/libglfw.so --add-rpath ${lib.getLib wayland}/lib - ''; - - meta = with lib; { - description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; - homepage = "https://www.glfw.org/"; - license = licenses.zlib; - maintainers = with maintainers; [ marcweber twey ]; - platforms = platforms.unix ++ platforms.windows; - }; -} diff --git a/pkgs/development/libraries/glfw/wayland.patch b/pkgs/development/libraries/glfw/wayland.patch deleted file mode 100644 index c0c338f845b39..0000000000000 --- a/pkgs/development/libraries/glfw/wayland.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 46fb81c69e8acdb70907409f98dd01e387408414 Mon Sep 17 00:00:00 2001 -From: Stone Tickle <lattis@mochiro.moe> -Date: Fri, 5 Jun 2020 12:51:25 +0900 -Subject: [PATCH] set O_NONBLOCK on repeat timerfd - ---- - src/wl_init.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/wl_init.c b/src/wl_init.c -index 49e7cc52..43569bef 100644 ---- a/src/wl_init.c -+++ b/src/wl_init.c -@@ -1166,7 +1166,7 @@ int _glfwPlatformInit(void) - - _glfw.wl.timerfd = -1; - if (_glfw.wl.seatVersion >= 4) -- _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC); -+ _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK); - - if (_glfw.wl.pointer && _glfw.wl.shm) - { --- -2.31.1 - diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 22df229d47cc3..f44b6385b8f1f 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -30,7 +30,7 @@ stdenv.hostPlatform.isLittleEndian == stdenv.buildPlatform.isLittleEndian }: -assert stdenv.isLinux -> util-linuxMinimal != null; +assert stdenv.hostPlatform.isLinux -> util-linuxMinimal != null; let # Some packages don't get "Cflags" from pkg-config correctly @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-JOApxd/JtE5Fc2l63zMHipgnxIk4VVAEs7kJb6TqA08="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin-compilation.patch # FIXME: remove when https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4088 is merged and is in the tagged release (fetchpatch { @@ -142,10 +142,10 @@ stdenv.mkDerivation (finalAttrs: { bash gnum4 # install glib-gettextize and m4 macros for other apps to use ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux util-linuxMinimal # for libmount - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Carbon Cocoa CoreFoundation CoreServices Foundation ]); @@ -185,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dtests=${lib.boolToString (!stdenv.hostPlatform.isStatic)}" ] ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [ "-Dlibelf=disabled" - ] ++ lib.optionals stdenv.isFreeBSD [ + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ "-Db_lundef=false" "-Dxattr=false" ]; @@ -291,7 +291,7 @@ stdenv.mkDerivation (finalAttrs: { rm $out/lib/libglib-${librarySuffix} ''; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; passthru = rec { gioModuleDir = "lib/gio/modules"; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index be55dd89b7c61..6ab9d2bed5603 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -205,7 +205,7 @@ stdenv.mkDerivation ({ env = { linuxHeaders = lib.optionalString withLinuxHeaders linuxHeaders; - inherit (stdenv) is64bit; + inherit (stdenv.hostPlatform) is64bit; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to # prevent a retained dependency on the bootstrap tools in the stdenv-linux # bootstrap. diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index acace1c6a5bfe..7662e5f7f1906 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { glib # for glib-compile-schemas ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index f9f8a4568a579..668f60ec10ec3 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { glib # for glib-compile-schemas ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa ]); propagatedBuildInputs = [ glib libsigcxx ]; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 53377022ad690..ac425092128c6 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { # Clang optimizes an expected allocation away. # See https://github.com/google/glog/issues/937 "DeathNoAllocNewHook.logging" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" ]; in @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { checkPhase = let - excludedTests = lib.optionals stdenv.isDarwin [ + excludedTests = lib.optionals stdenv.hostPlatform.isDarwin [ "mock-log" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "logging" # works around segfaults on aarch64-darwin for now ]; excludedTestsRegex = lib.optionalString (excludedTests != [ ]) "(${lib.concatStringsSep "|" excludedTests})"; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 0d1997cf1afc9..f21dd724c95eb 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { substituteInPlace tests/testsuite.c \ --replace /bin/rm rm '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # This specific test fails on darwin for some unknown reason substituteInPlace tests/test-filters.c \ --replace-fail 'test_charset_conversion (datadir, "japanese", "utf-8", "iso-2022-jp");' "" diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index e809ed926edae..9d014c2667537 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -24,13 +24,13 @@ let self = stdenv.mkDerivation rec { # addition, `configfsf.guess' would return `i386-apple-darwin10.2.0' on # `x86_64-darwin', leading to a 32-bit ABI build, which is undesirable. preConfigure = - if !stdenv.isDarwin + if !stdenv.hostPlatform.isDarwin then "ln -sf configfsf.guess config.guess" else ''echo "Darwin host is `./config.guess`."''; configureFlags = [ (lib.enableFeature cxx "cxx") - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "ac_cv_build=x86_64-apple-darwin13.4.0" "ac_cv_host=x86_64-apple-darwin13.4.0" ]; @@ -72,7 +72,7 @@ let self = stdenv.mkDerivation rec { platforms = lib.platforms.all; badPlatforms = [ "x86_64-darwin" ]; # never built on aarch64-darwin, aarch64-linux since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; }; in self diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index e4fb89d054dae..43e3ca9759eb0 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -24,7 +24,7 @@ let self = stdenv.mkDerivation rec { patches = [ ./5.1.3-CVE-2021-43618.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./need-size-t.patch ]; @@ -36,13 +36,13 @@ let self = stdenv.mkDerivation rec { # See <https://hydra.nixos.org/build/2760931>, for instance. # # no darwin because gmp uses ASM that clang doesn't like - (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + (lib.enableFeature (!stdenv.hostPlatform.isSunOS && stdenv.hostPlatform.isx86) "fat") # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. "--build=${stdenv.buildPlatform.config}" - ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" - ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" + ] ++ optional (cxx && stdenv.hostPlatform.isDarwin) "CPPFLAGS=-fexceptions" + ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.is64bit) "ABI=64" ; doCheck = true; @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation rec { platforms = platforms.all; badPlatforms = [ "x86_64-darwin" ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }; in self diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 3187b529aa178..e1a8ff0ecdc11 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -38,13 +38,13 @@ let self = stdenv.mkDerivation rec { # See <https://hydra.nixos.org/build/2760931>, for instance. # # no darwin because gmp uses ASM that clang doesn't like - (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + (lib.enableFeature (!stdenv.hostPlatform.isSunOS && stdenv.hostPlatform.isx86) "fat") # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. "--build=${stdenv.buildPlatform.config}" - ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" - ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" + ] ++ optional (cxx && stdenv.hostPlatform.isDarwin) "CPPFLAGS=-fexceptions" + ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.is64bit) "ABI=64" # to build a .dll on windows, we need --disable-static + --enable-shared # see https://gmplib.org/manual/Notes-for-Particular-Systems.html ++ optional (!withStatic && stdenv.hostPlatform.isWindows) "--disable-static --enable-shared" diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix deleted file mode 100644 index 6f2906a8234e5..0000000000000 --- a/pkgs/development/libraries/gmtk/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{lib, stdenv, substituteAll, fetchFromGitHub, libtool, pkg-config, intltool, glib, gtk3 -, libpulseaudio, mplayer, gnome_mplayer }: - -stdenv.mkDerivation rec { - pname = "gmtk"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "kdekorte"; - repo = "gmtk"; - rev = "v${version}"; - sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i"; - }; - - nativeBuildInputs = [ libtool pkg-config intltool ]; - buildInputs = [ glib gtk3 libpulseaudio ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - mplayer = "${mplayer}/bin/mplayer"; - }) - ]; - - meta = with lib; { - description = "Common functions for gnome-mplayer and gecko-mediaplayer"; - homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; - license = licenses.gpl2; - maintainers = gnome_mplayer.meta.maintainers; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gmtk/fix-paths.patch b/pkgs/development/libraries/gmtk/fix-paths.patch deleted file mode 100644 index 64738300aba42..0000000000000 --- a/pkgs/development/libraries/gmtk/fix-paths.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/gmtk_media_player.c -+++ b/src/gmtk_media_player.c -@@ -2449,7 +2449,7 @@ - player->minimum_mplayer = detect_mplayer_features(player); - - if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) { -- argv[argn++] = g_strdup_printf("mplayer"); -+ argv[argn++] = g_strdup_printf("@mplayer@"); - } else { - argv[argn++] = g_strdup_printf("%s", player->mplayer_binary); - } -@@ -4135,7 +4135,7 @@ - return ret; - - if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", player->mplayer_binary); - } diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index db95029c804e6..381da5b8f9fdf 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-QsdzdF2EuhS8HPHExvRgYUiAOlzTN5QcY5ZHlfPFnUI="; }; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals stdenv.hostPlatform.isLinux [ (substituteAll { src = ./bubblewrap-paths.patch; bubblewrap_bin = "${bubblewrap}/bin/bwrap"; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { gtk3 gtk4 glib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap wayland libseccomp @@ -78,12 +78,12 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" "-Ddesktop_docs=false" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Dsystemd=disabled" "-Dudev=disabled" ]; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index dc797dd02d16c..8a1773612f2d8 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -8,7 +8,7 @@ , ninja , libxslt , gtk4 -, enableBackend ? stdenv.isLinux +, enableBackend ? stdenv.hostPlatform.isLinux , json-glib , libadwaita , librest_1_0 diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 33b35446d7257..3e9395668c853 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -52,7 +52,7 @@ let # XXX: Gnulib's `test-select' fails on FreeBSD: # https://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin + doCheck = !stdenv.hostPlatform.isFreeBSD && !stdenv.hostPlatform.isDarwin && stdenv.buildPlatform == stdenv.hostPlatform; inherit (stdenv.hostPlatform) isDarwin; @@ -92,6 +92,7 @@ stdenv.mkDerivation rec { # - fastopen: no idea; it broke between 3.6.2 and 3.6.3 (3437fdde6 in particular) # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11) # - psk-file: no idea; it broke between 3.6.3 and 3.6.4 + # - ktls: requires tls module loaded into kernel # Change p11-kit test to use pkg-config to find p11-kit postPatch = '' sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh @@ -99,6 +100,8 @@ stdenv.mkDerivation rec { sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh + '' + lib.optionalString stdenv.hostPlatform.isLinux '' + sed '2iexit 77' -i tests/{ktls,ktls_keyupdate}.sh ''; preConfigure = "patchShebangs ."; @@ -112,6 +115,8 @@ stdenv.mkDerivation rec { "--with-unbound-root-key-file=${dns-root-data}/root.key" (lib.withFeature withP11-kit "p11-kit") (lib.enableFeature cxxBindings "cxx") + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + "--enable-ktls" ] ++ lib.optionals (stdenv.hostPlatform.isMinGW) [ "--disable-doc" ]; @@ -122,7 +127,7 @@ stdenv.mkDerivation rec { buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (withP11-kit) p11-kit - ++ lib.optional (tpmSupport && stdenv.isLinux) trousers; + ++ lib.optional (tpmSupport && stdenv.hostPlatform.isLinux) trousers; nativeBuildInputs = [ perl pkg-config texinfo ] ++ [ autoconf automake ] ++ lib.optionals doCheck [ which nettools util-linux ]; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index d58bdd2e7800d..a76764a49a914 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { (python3.withPackages pythonModules) ]; - nativeCheckInputs = lib.optionals stdenv.isDarwin [ + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools # for otool ]; @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dgi_cross_use_prebuilt_gi=true" ]; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; # During configurePhase, two python scripts are generated and need this. See # https://github.com/NixOS/nixpkgs/pull/98316#issuecomment-695785692 diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 96b1f3ae13ce9..0df28ac88dfde 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; # Success is more likely on x86_64 - doCheck = stdenv.isx86_64; + doCheck = stdenv.hostPlatform.isx86_64; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 4d8ef6821240e..2bc678e8b4afe 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ]; # https://hydra.nixos.org/build/222679737/nixlog/3/tail - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-error=maybe-uninitialized"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=maybe-uninitialized"; doInstallCheck = true; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { "$PWD/google/cloud/storage/benchmarks" "$PWD/google/cloud/testing_util" ]; - ldLibraryPathName = "${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH"; + ldLibraryPathName = "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH"; in lib.optionalString doInstallCheck ( lib.optionalString (!staticOnly) '' @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { # Disable any integration tests, which need to contact the internet. # Also disable the `storage_benchmark_*` tests. # With Protobuf < 23.x they require -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=ON. - # With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF + # With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF ctest --label-exclude integration-test --exclude-regex storage_benchmarks_ runHook postInstallCheck diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index e76c033c705d7..62e7ecbb0e955 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -31,18 +31,18 @@ stdenv.mkDerivation rec { # tcmalloc uses libunwind in a way that works correctly only on non-ARM dynamically linked linux buildInputs = [ perl ] - ++ lib.optional (stdenv.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic )) libunwind; + ++ lib.optional (stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic )) libunwind; # Disable general dynamic TLS on AArch to support dlopen()'ing the library: # https://bugzilla.redhat.com/show_bug.cgi?id=1483558 configureFlags = lib.optional stdenv.hostPlatform.isAarch "--disable-general-dynamic-tls"; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.am --replace stdc++ c++ ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_XOPEN_SOURCE"; # some packages want to link to the static tcmalloc_minimal diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index d6c2a10edb8c6..45df332bc0caf 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -15,7 +15,7 @@ buildPackages, qtbase ? null, pythonSupport ? false, - swig4 ? null, + swig ? null, # only for passthru.tests libsForQt5, qt6Packages, @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { python3.pkgs.setuptools python3.pkgs.wheel ncurses - swig4 + swig which ]; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { # which has a path length limit. Nix on darwin is using a build directory # that already has quite a long path and the resulting socket path doesn't # fit in the limit. https://github.com/NixOS/nix/pull/1085 - ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-gpg-test" ]; env.NIX_CFLAGS_COMPILE = toString ( # qgpgme uses Q_ASSERT which retains build inputs at runtime unless diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 7b64aa2bc586b..803f31efa47a0 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -11,7 +11,7 @@ , mutest , nixosTests , glib -, withDocumentation ? !stdenv.hostPlatform.isStatic +, withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform || stdenv.hostPlatform.emulatorAvailable buildPackages , gtk-doc , docbook_xsl , docbook_xml_dtd_43 @@ -65,10 +65,10 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_43 docbook_xsl gtk-doc + ] ++ lib.optionals (withDocumentation && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ] ++ lib.optionals withIntrospection [ gobject-introspection - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook ]; buildInputs = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "introspection" withIntrospection) "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" - ] ++ lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # the box test is failing with SIGBUS on armv7l-linux # https://github.com/ebassi/graphene/issues/215 "-Darm_neon=false" @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { in lib.optionalString withIntrospection '' if [ -x '${introspectionPy}' ] ; then wrapProgram '${introspectionPy}' \ - --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0" + --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ glib.out (placeholder "out") ]}" fi ''; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 2110755a17197..35ae5284af5ae 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) grpc; propagatedBuildInputs = [ c-ares re2 zlib abseil-cpp ]; buildInputs = [ openssl protobuf ] - ++ lib.optionals stdenv.isLinux [ libnsl ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libnsl ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Workaround for https://github.com/llvm/llvm-project/issues/48757 "-Wno-elaborated-enum-base" ]); diff --git a/pkgs/development/libraries/gsl-lite/default.nix b/pkgs/development/libraries/gsl-lite/default.nix index fcab020952644..03fc5587f80a9 100644 --- a/pkgs/development/libraries/gsl-lite/default.nix +++ b/pkgs/development/libraries/gsl-lite/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; # Building tests is broken on Darwin. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = '' diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 2211f2d0d99ff..aeb95476b2b65 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' + preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.hostPlatform.isDarwin) then '' MACOSX_DEPLOYMENT_TARGET=10.16 '' else null; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-mno-fma"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux"; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index ae2c489fe832d..5905fdff7e487 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -4,7 +4,7 @@ }: let - inherit (stdenv) isDarwin; + inherit (stdenv.hostPlatform) isDarwin; inherit (lib) optional optionalString; in diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 42d22c2bd5fe1..1271c52a4a8cb 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, withShishi ? !stdenv.isDarwin +, withShishi ? !stdenv.hostPlatform.isDarwin , shishi }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional withShishi shishi; # ./stdint.h:89:5: error: expected value in expression - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export GNULIBHEADERS_OVERRIDE_WINT_T=0 ''; diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix index 468c2a84ca280..d52c90b41b916 100644 --- a/pkgs/development/libraries/gssdp/1.6.nix +++ b/pkgs/development/libraries/gssdp/1.6.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 939fb0e7b4266..c42b6f958092e 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; # Bail out! GLib-GIO-FATAL-CRITICAL: g_inet_address_to_string: assertion 'G_IS_INET_ADDRESS (address)' failed - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postFixup = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' # Move developer documentation to devdoc output. diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index bf27c6f25d7be..3ab9c896b8bf8 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -104,7 +104,7 @@ , Foundation , MediaToolbox , enableGplPlugins ? true -, bluezSupport ? stdenv.isLinux +, bluezSupport ? stdenv.hostPlatform.isLinux # Causes every application using GstDeviceMonitor to send mDNS queries every 2 seconds , microdnsSupport ? false # Checks meson.is_cross_build(), so even canExecute isn't enough. @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { gobject-introspection ] ++ lib.optionals enableDocumentation [ hotdoc - ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [ + ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.hostPlatform.isLinux) [ wayland-scanner ]; @@ -214,11 +214,11 @@ stdenv.mkDerivation rec { libmicrodns ] ++ lib.optionals openh264Support [ openh264 - ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [ + ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.hostPlatform.isLinux) [ libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs wayland wayland-protocols - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin mjpegtools @@ -245,9 +245,9 @@ stdenv.mkDerivation rec { libGLU ] ++ lib.optionals guiSupport [ gtk3 - ] ++ lib.optionals (stdenv.isLinux && guiSupport) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && guiSupport) [ directfb - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # For unknown reasons the order is important, e.g. if # VideoToolbox is last, we get: # fatal error: 'VideoToolbox/VideoToolbox.h' file not found @@ -306,14 +306,14 @@ stdenv.mkDerivation rec { (lib.mesonEnable "openh264" openh264Support) (lib.mesonEnable "doc" enableDocumentation) ] - ++ lib.optionals (!stdenv.isLinux) [ + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only "-Dnvcodec=disabled" # Linux-only - ] ++ lib.optionals (!stdenv.isLinux || !gst-plugins-base.waylandEnabled) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !gst-plugins-base.waylandEnabled) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` - ] ++ lib.optionals (!stdenv.isLinux || !guiSupport) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !guiSupport) [ "-Ddirectfb=disabled" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Daja=disabled" "-Dchromaprint=disabled" "-Dflite=disabled" @@ -327,7 +327,7 @@ stdenv.mkDerivation rec { "-Duvch264=disabled" # requires gudev "-Dv4l2codecs=disabled" # requires gudev "-Dladspa=disabled" # requires lrdf - ] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64 || !gst-plugins-base.waylandEnabled) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !stdenv.hostPlatform.isx86_64 || !gst-plugins-base.waylandEnabled) [ "-Dqsv=disabled" # Linux (and Windows) x86 only, makes va required ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ "-Dgl=disabled" diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 3d55425190f6b..9932c37a72f25 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -20,23 +20,23 @@ , tremor # provides 'virbisidec' , libGL , gobject-introspection -, enableX11 ? stdenv.isLinux +, enableX11 ? stdenv.hostPlatform.isLinux , libXext , libXi , libXv , libdrm -, enableWayland ? stdenv.isLinux +, enableWayland ? stdenv.hostPlatform.isLinux , wayland-scanner , wayland , wayland-protocols -, enableAlsa ? stdenv.isLinux +, enableAlsa ? stdenv.hostPlatform.isLinux , alsa-lib # TODO: fix once x86_64-darwin sdk updated -, enableCocoa ? (stdenv.isDarwin && stdenv.isAarch64) +, enableCocoa ? (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) , Cocoa , OpenGL , enableGl ? (enableX11 || enableWayland || enableCocoa) -, enableCdparanoia ? (!stdenv.isDarwin) +, enableCdparanoia ? (!stdenv.hostPlatform.isDarwin) , cdparanoia , glib , testers @@ -91,11 +91,11 @@ stdenv.mkDerivation (finalAttrs: { libjpeg tremor pango - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libdrm libGL libvisual - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ] ++ lib.optionals enableAlsa [ alsa-lib @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ gstreamer - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libdrm ]; @@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!enableGl) "-Dgl=disabled" ++ lib.optional (!enableAlsa) "-Dalsa=disabled" ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled" - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Ddrm=disabled" "-Dlibvisual=disabled" ]; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 40d40d742463f..7eba093ab94bc 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -10,15 +10,20 @@ , glib , makeWrapper , libcap -, libunwind , elfutils # for libdw , bash-completion , lib , Cocoa , CoreServices -, gobject-introspection , rustc , testers +, gobject-introspection +, buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, libunwind +, withLibunwind ? + lib.meta.availableOn stdenv.hostPlatform libunwind && + lib.elem "libunwind" libunwind.meta.pkgConfigModules or [] # Checks meson.is_cross_build(), so even canExecute isn't enough. , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc }: @@ -58,22 +63,24 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper glib bash-completion - gobject-introspection rustc - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap # for setcap binary + ] ++ lib.optionals withIntrospection [ + gobject-introspection ] ++ lib.optionals enableDocumentation [ hotdoc ]; buildInputs = [ bash-completion - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap - libunwind ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals withLibunwind [ + libunwind + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreServices ]; @@ -85,11 +92,10 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "doc" enableDocumentation) - ] ++ lib.optionals stdenv.isDarwin [ - # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. - "-Dlibunwind=disabled" - "-Dlibdw=disabled" + (lib.mesonEnable "libunwind" withLibunwind) + (lib.mesonEnable "libdw" withLibunwind) ]; postPatch = '' diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 40c9cbc769c08..ec474972ef529 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -39,9 +39,9 @@ , qt6Support ? false, qt6 , raspiCameraSupport ? false, libraspberrypi , enableJack ? true, libjack2 -, enableX11 ? stdenv.isLinux, xorg +, enableX11 ? stdenv.hostPlatform.isLinux, xorg , ncurses -, enableWayland ? stdenv.isLinux +, enableWayland ? stdenv.hostPlatform.isLinux , wayland , wayland-protocols , libgudev @@ -54,7 +54,7 @@ # MMAL is not supported on aarch64, see: # https://github.com/raspberrypi/userland/issues/688 -assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); +assert raspiCameraSupport -> (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; @@ -147,9 +147,9 @@ stdenv.mkDerivation rec { qtbase qtdeclarative qtwayland - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libdrm libGL libv4l @@ -177,7 +177,7 @@ stdenv.mkDerivation rec { "-Dximagesrc=disabled" # Linux-only ] ++ lib.optionals (!enableJack) [ "-Djack=disabled" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Ddv1394=disabled" # Linux only "-Doss4=disabled" # Linux only "-Doss=disabled" # Linux only diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index 3e8eec7b8a60e..187d1a0486979 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -57,15 +57,15 @@ let mp4 = [ ]; # net - aws = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + aws = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; hlssink3 = [ ]; ndi = [ ]; onvif = [ pango ]; raptorq = [ ]; - reqwest = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + reqwest = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; rtp = [ ]; - webrtc = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - webrtchttp = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + webrtc = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; + webrtchttp = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; # text textahead = [ ]; @@ -110,9 +110,9 @@ let [ "csound" # tests have weird failure on x86, does not currently work on arm or darwin "livesync" # tests have suspicious intermittent failure, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/357 - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "raptorq" # pointer alignment failure in tests on aarch64 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "reqwest" # tests hang on darwin "threadshare" # tests cannot bind to localhost on darwin "webp" # not supported on darwin (upstream crate issue) @@ -200,13 +200,13 @@ stdenv.mkDerivation (finalAttrs: { cargo cargo-c' nasm - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ] ++ lib.optionals enableDocumentation [ hotdoc ]; - env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; buildInputs = [ gstreamer diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 6f8ac715af505..f6a0ee93d89e0 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libmad libmpeg2 x264 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit CoreFoundation DiskArbitration diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index db154403ffb33..d7d788787a50f 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { xorg.libICE nasm libvpx - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU ]; diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index 3657f62f929c4..c94a3ae15d158 100644 --- a/pkgs/development/libraries/gthree/default.nix +++ b/pkgs/development/libraries/gthree/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" + "-Dgtk_doc=${if stdenv.hostPlatform.isDarwin then "false" else "true"}" # Data for examples is useless when the example programs are not installed. "-Dexamples=false" ]; @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gthree.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gthree.x86_64-darwin }; } diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index b3edf0ba48537..69af8b31872e5 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { }; }; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" ]); diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 417b8523df26d..c977de1942789 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk-layer-shell"; - version = "0.8.2"; + version = "0.9.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # for demo @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-8wpfoZcgusJdEbKGZ02UtOOcSogMTNP9Lm+ujo/eKdA="; + hash = "sha256-9hQE1NY5QCuj+5R5aSjJ0DaMUQuO7HPpZooj+1+96RY="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index ed0900ee1a927..cb4b6955dea4b 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -25,9 +25,9 @@ , testers , AppKit , Cocoa -, gdktarget ? if stdenv.isDarwin then "quartz" else "x11" -, cupsSupport ? config.gtk2.cups or stdenv.isLinux -, xineramaSupport ? stdenv.isLinux +, gdktarget ? if stdenv.hostPlatform.isDarwin then "quartz" else "x11" +, cupsSupport ? config.gtk2.cups or stdenv.hostPlatform.isLinux +, xineramaSupport ? stdenv.hostPlatform.isLinux }: let @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7.patch"; hash = "sha256-mstOPk9NNpUwScrdEbvGhmAv8jlds3SBdj53T0q33vM="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch ./patches/2.0-darwin-x11.patch # Fixes an incompatible function pointer conversion and implicit int errors with clang 16. @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf glib pango - ] ++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) [ libXcomposite libXcursor libXi @@ -91,14 +91,14 @@ stdenv.mkDerivation (finalAttrs: { libXrender ] ++ lib.optional xineramaSupport libXinerama ++ lib.optional cupsSupport cups - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libXdamage AppKit Cocoa ]; preConfigure = - lib.optionalString (stdenv.isDarwin + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") "MACOSX_DEPLOYMENT_TARGET=10.16"; @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { "--sysconfdir=/etc" "--with-gdktarget=${gdktarget}" "--with-xinput=yes" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-glibtest" "--disable-introspection" "--disable-visibility" diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index ed0612bf2ecb9..7f3717c8a5254 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -33,15 +33,15 @@ , gnome , gsettings-desktop-schemas , sassc -, trackerSupport ? stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) +, trackerSupport ? stdenv.hostPlatform.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) , tracker -, x11Support ? stdenv.isLinux -, waylandSupport ? stdenv.isLinux +, x11Support ? stdenv.hostPlatform.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , libGL , wayland , wayland-protocols -, xineramaSupport ? stdenv.isLinux -, cupsSupport ? stdenv.isLinux +, xineramaSupport ? stdenv.hostPlatform.isLinux +, cupsSupport ? stdenv.hostPlatform.isLinux , cups , AppKit , Cocoa @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./patches/3.0-immodules.cache.patch ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon (libepoxy.override { inherit x11Support; }) isocodes - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] ++ lib.optionals trackerSupport [ tracker @@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { libXrandr libXrender pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # explicitly propagated, always needed Cocoa QuartzCore @@ -166,13 +166,13 @@ stdenv.mkDerivation (finalAttrs: { "-Dtracker3=${lib.boolToString trackerSupport}" "-Dbroadway_backend=${lib.boolToString broadwaySupport}" "-Dx11_backend=${lib.boolToString x11Support}" - "-Dquartz_backend=${lib.boolToString (stdenv.isDarwin && !x11Support)}" + "-Dquartz_backend=${lib.boolToString (stdenv.hostPlatform.isDarwin && !x11Support)}" "-Dintrospection=${lib.boolToString withIntrospection}" ]; doCheck = false; # needs X11 - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; # These are the defines that'd you'd get with --enable-debug=minimum (default). # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options @@ -202,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs ''${files[@]} ''; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The updater is needed for nixos env and it's tiny. moveToOutput bin/gtk-update-icon-cache "$out" # Launcher @@ -219,14 +219,14 @@ stdenv.mkDerivation (finalAttrs: { ''; # Wrap demos - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' demos=(gtk3-demo gtk3-demo-application gtk3-icon-browser gtk3-widget-factory) for program in ''${demos[@]}; do wrapProgram $dev/bin/$program \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${finalAttrs.pname}-${finalAttrs.version}" done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # a comment created a cycle between outputs sed '/^# ModulesPath =/d' -i "$out"/lib/gtk-*/*/immodules.cache ''; diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 3a144b2de3ac1..8b3ef020bd280 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -32,13 +32,13 @@ , gsettings-desktop-schemas , gst_all_1 , sassc -, trackerSupport ? stdenv.isLinux +, trackerSupport ? stdenv.hostPlatform.isLinux , tracker -, x11Support ? stdenv.isLinux -, waylandSupport ? stdenv.isLinux +, x11Support ? stdenv.hostPlatform.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , libGL # experimental and can cause crashes in inspector -, vulkanSupport ? stdenv.isLinux +, vulkanSupport ? stdenv.hostPlatform.isLinux , shaderc , vulkan-loader , vulkan-headers @@ -46,8 +46,8 @@ , wayland , wayland-protocols , wayland-scanner -, xineramaSupport ? stdenv.isLinux -, cupsSupport ? stdenv.isLinux +, xineramaSupport ? stdenv.hostPlatform.isLinux +, cupsSupport ? stdenv.hostPlatform.isLinux , compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages , cups , AppKit @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { libXi libXrandr libXrender - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] ++ lib.optionals trackerSupport [ tracker @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXinerama ] ++ lib.optionals cupsSupport [ cups - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo @@ -175,13 +175,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "vulkan" vulkanSupport) (lib.mesonEnable "print-cups" cupsSupport) (lib.mesonBool "x11-backend" x11Support) - ] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [ "-Dmedia-gstreamer=disabled" # requires gstreamer-gl ]; doCheck = false; # needs X11 - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; # These are the defines that'd you'd get with --enable-debug=minimum (default). # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options @@ -218,7 +218,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' PATH="$OLD_PATH" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The updater is needed for nixos env and it's tiny. moveToOutput bin/gtk4-update-icon-cache "$out" # Launcher @@ -234,7 +234,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # Wrap demos - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' demos=(gtk4-demo gtk4-demo-application gtk4-icon-browser gtk4-widget-factory) for program in ''${demos[@]}; do diff --git a/pkgs/development/libraries/gtk4-layer-shell/default.nix b/pkgs/development/libraries/gtk4-layer-shell/default.nix index 067bbad8dd247..14df22925dc0f 100644 --- a/pkgs/development/libraries/gtk4-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk4-layer-shell/default.nix @@ -7,6 +7,7 @@ , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +, wayland-protocols , wayland-scanner , wayland , gtk4 @@ -16,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk4-layer-shell"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; @@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk4-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-decjPkFkYy7kIjyozsB7BEmw33wzq1EQyIBrxO36984="; + hash = "sha256-oGtU1H1waA8ZAjaLMdb+x0KIIwgjhdn38ra/eFVWfFI="; }; strictDeps = true; @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_43 vala wayland-scanner + wayland-protocols ]; buildInputs = [ diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 36ff98d9f1654..64ec9e9ac2c9f 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pangomm_2_48 ]; - nativeCheckInputs = lib.optionals (!stdenv.isDarwin)[ + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin)[ xvfb-run ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ${lib.optionalString (!stdenv.isDarwin) "xvfb-run -s '-screen 0 800x600x24'"} \ + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "xvfb-run -s '-screen 0 800x600x24'"} \ meson test --print-errorlogs runHook postCheck diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index fb5c72e8b34da..41999f5538268 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' NO_AT_BRIDGE=1 \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index f1a12eb0de120..a57881ff55328 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # The 10.12 SDK used by x86_64-darwin requires defining `_POSIX_C_SOURCE` to use `strnlen`. - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-D_POSIX_C_SOURCE=200809L"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "-D_POSIX_C_SOURCE=200809L"; nativeBuildInputs = [ meson @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { "-Ddocumentation=true" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' runHook preCheck diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 08b2925b0ea3b..5fa0df314274a 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ]; # Bail out! ERROR:../tests/test-bugs.c:168:test_on_timeout: code should not be reached - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 7c5cdca3f6198..4b4da283dd897 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -8,7 +8,7 @@ , gettext , dbus , glib -, udevSupport ? stdenv.isLinux +, udevSupport ? stdenv.hostPlatform.isLinux , libgudev , udisks2 , libgcrypt diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index a6d2c884f8a72..c3e5e278b5905 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.10.0"; + version = "22.11.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; rev = "refs/tags/v${version}"; - hash = "sha256-o86bNwoGUw6VLESkaamWXPOfrdbFipJZmQCL6W5+nfk="; + hash = "sha256-VYFAy6VVASNOBLs39qukePYr5pV0IR1qjztv+veNCVc="; }; postPatch = '' diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 12297a5da669f..15208becc301a 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs src/*.py test - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # ApplicationServices.framework headers have cast-align warnings. substituteInPlace src/hb.hh \ --replace '#pragma GCC diagnostic error "-Wcast-align"' "" @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = lib.optionalString withIcu '' rm "$out"/lib/libharfbuzz.* "$dev/lib/pkgconfig/harfbuzz.pc" ln -s {'${harfbuzz.dev}',"$dev"}/lib/pkgconfig/harfbuzz.pc - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.dylib ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.0.dylib ''} diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 05b915efb8f97..6e537e8b74fbd 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ libusb1 udev ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libusb1 udev ]; enableParallelBuilding = true; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa IOKit ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa IOKit ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -37,9 +37,9 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ prusnak ]; # You can choose between GPLv3, BSD or HIDAPI license (even more liberal) license = with licenses; [ bsd3 /* or */ gpl3Only ] ; - pkgConfigModules = lib.optionals stdenv.isDarwin [ + pkgConfigModules = lib.optionals stdenv.hostPlatform.isDarwin [ "hidapi" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "hidapi-hidraw" "hidapi-libusb" ]; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index d8e320a44c190..c85790408bddd 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libxml2 ] ++ (with perlPackages; [ perl IOStringy ]) - ++ lib.optionals stdenv.isDarwin [ libintl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/hnswlib/default.nix b/pkgs/development/libraries/hnswlib/default.nix index 4c5e462377604..59cd69f9629e4 100644 --- a/pkgs/development/libraries/hnswlib/default.nix +++ b/pkgs/development/libraries/hnswlib/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Header-only C++/python library for fast approximate nearest neighbors"; homepage = "https://github.com/nmslib/hnswlib"; - changelog = "https://github.com/nmslib/hnswlib/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/nmslib/hnswlib/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ natsukium ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix deleted file mode 100644 index 0359abec9b08d..0000000000000 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, doxygen -, boost -, eigen -, assimp -, octomap -, qhull -, pythonSupport ? false -, python3Packages -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hpp-fcl"; - version = "2.4.5"; - - src = fetchFromGitHub { - owner = "humanoid-path-planner"; - repo = "hpp-fcl"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-0OORdtT7vMpvK3BPJvtvuLcz0+bfu1+nVvzs3y+LyQw="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - doxygen - ] ++ lib.optionals pythonSupport [ - python3Packages.numpy - ]; - - propagatedBuildInputs = [ - assimp - qhull - octomap - ] ++ lib.optionals (!pythonSupport) [ - boost - eigen - ] ++ lib.optionals pythonSupport [ - python3Packages.boost - python3Packages.eigenpy - ]; - - cmakeFlags = [ - "-DHPP_FCL_HAS_QHULL=ON" - "-DINSTALL_DOCUMENTATION=ON" - ] ++ lib.optionals (!pythonSupport) [ - "-DBUILD_PYTHON_INTERFACE=OFF" - ]; - - doCheck = true; - pythonImportsCheck = lib.optionals (!pythonSupport) [ - "hppfcl" - ]; - - outputs = [ "dev" "out" "doc" ]; - postFixup = '' - moveToOutput share/ament_index "$dev" - moveToOutput share/${finalAttrs.pname} "$dev" - ''; - - - meta = with lib; { - description = "Extension of the Flexible Collision Library"; - homepage = "https://github.com/humanoid-path-planner/hpp-fcl"; - license = licenses.bsd3; - maintainers = with maintainers; [ nim65s ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 6ba2b8fc1ace7..69cf2ab210dd4 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = [ ./enable-static-shared.patch - ] ++ lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # https://github.com/nodejs/http-parser/pull/510 (fetchpatch { url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch"; diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index ffa72657782a8..eb733b4df17be 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.16.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-BR6Iy3RkSuOZHAs7edd7JFBHxFlN+R/ZC1Xt8p6xe2A="; + hash = "sha256-yvaPIbRqJGkiob3Nrv3H1ieFAC5b+h1tTncJWTy4dmk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index f2316ab657a1b..d820dc3dcee5d 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,19 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl -, x11Support ? false -, libX11 -, cairo -, config -, enableCuda ? config.cudaSupport -, cudaPackages +{ + lib, + stdenv, + fetchurl, + pkg-config, + expat, + ncurses, + pciutils, + numactl, + x11Support ? false, + libX11, + cairo, + config, + enableCuda ? config.cudaSupport, + cudaPackages, }: stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.11.1"; + version = "2.11.2"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "sha256-BM37/60iXOFfZhhPD0FBMn2r8ojRCouE0T9Rest4cMY="; + hash = "sha256-9/iP7K4GcQDxoakVtlit0PT3FWEllIKRCmm66iL+hAk="; }; configureFlags = [ @@ -22,20 +30,26 @@ stdenv.mkDerivation rec { ]; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. - nativeBuildInputs = [ pkg-config ] - ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; - buildInputs = [ expat ncurses ] - ++ lib.optionals x11Support [ cairo libX11 ] - ++ lib.optionals stdenv.isLinux [ numactl ] + buildInputs = + [ + expat + ncurses + ] + ++ lib.optionals x11Support [ + cairo + libX11 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ] ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart ]; # Since `libpci' appears in `hwloc.pc', it must be propagated. - propagatedBuildInputs = lib.optional stdenv.isLinux pciutils; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux pciutils; enableParallelBuilding = true; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' if [ -d "${numactl}/lib64" ]; then numalibdir="${numactl}/lib64" else @@ -45,35 +59,44 @@ stdenv.mkDerivation rec { sed -i "$lib/lib/libhwloc.la" \ -e "s|-lnuma|-L$numalibdir -lnuma|g" - ''; + ''; # Checks disabled because they're impure (hardware dependent) and # fail on some build machines. doCheck = false; - outputs = [ "out" "lib" "dev" "doc" "man" ]; + outputs = [ + "out" + "lib" + "dev" + "doc" + "man" + ]; - meta = with lib; { + meta = { description = "Portable abstraction of hierarchical architectures for high-performance computing"; longDescription = '' - hwloc provides a portable abstraction (across OS, - versions, architectures, ...) of the hierarchical topology of - modern architectures, including NUMA memory nodes, sockets, - shared caches, cores and simultaneous multithreading. It also - gathers various attributes such as cache and memory - information. It primarily aims at helping high-performance - computing applications with gathering information about the - hardware so as to exploit it accordingly and efficiently. + hwloc provides a portable abstraction (across OS, + versions, architectures, ...) of the hierarchical topology of + modern architectures, including NUMA memory nodes, sockets, + shared caches, cores and simultaneous multithreading. It also + gathers various attributes such as cache and memory + information. It primarily aims at helping high-performance + computing applications with gathering information about the + hardware so as to exploit it accordingly and efficiently. - hwloc may display the topology in multiple convenient - formats. It also offers a powerful programming interface to - gather information about the hardware, bind processes, and much - more. + hwloc may display the topology in multiple convenient + formats. It also offers a powerful programming interface to + gather information about the hardware, bind processes, and much + more. ''; # https://www.open-mpi.org/projects/hwloc/license.php - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://www.open-mpi.org/projects/hwloc/"; - maintainers = with maintainers; [ fpletz markuskowa ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ + fpletz + markuskowa + ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix index 0b9765dac4cf1..cdb578ba08d55 100644 --- a/pkgs/development/libraries/hyperscan/default.nix +++ b/pkgs/development/libraries/hyperscan/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DBUILD_AVX512=ON" ] - ++ lib.optional (!stdenv.isDarwin) "-DFAT_RUNTIME=ON" + ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-DFAT_RUNTIME=ON" ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON" ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix index 575f184c163fb..52b083995ec76 100644 --- a/pkgs/development/libraries/icu/make-icu.nix +++ b/pkgs/development/libraries/icu/make-icu.nix @@ -31,7 +31,7 @@ let # $(includedir) is different from $(prefix)/include due to multiple outputs sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in - '' + lib.optionalString stdenv.isAarch32 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch32 '' # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; @@ -39,7 +39,7 @@ let dontDisableStatic = withStatic; configureFlags = [ "--disable-debug" ] - ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath" + ++ lib.optional (stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isDarwin) "--enable-rpath" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}" ++ lib.optional withStatic "--enable-static"; @@ -74,7 +74,7 @@ let postInstall = lib.optionalString withStatic '' mkdir -p $static/lib mv -v lib/*.a $static/lib - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc '' + (let replacements = [ diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 63ca16e19d7a0..0501fe4ac2d33 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' substituteInPlace $dev/lib/cmake/igraph/igraph-targets.cmake \ --replace-fail "_IMPORT_PREFIX \"$out\"" "_IMPORT_PREFIX \"$dev\"" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libigraph.dylib ''; diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 219d961f9f96a..dc075e43563d8 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # fails 1 out of 1 tests with # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" # at least on i686. spooky! - doCheck = stdenv.isx86_64; + doCheck = stdenv.hostPlatform.isx86_64; preConfigure = '' # Need to cd after patches for openexr patches to apply. diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 4e92375197d37..315a731710670 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -14,6 +14,9 @@ vulkan-headers, vulkan-loader, + # NOTE: Not coming from vcpkg + IMGUI_LINK_GLVND ? !stdenv.hostPlatform.isWindows && (IMGUI_BUILD_OPENGL2_BINDING || IMGUI_BUILD_OPENGL3_BINDING), + # The intent is to mirror vcpkg's flags[^1], # but we only actually support Linux and glfw3 until someone contributes the rest # [^1]: https://github.com/microsoft/vcpkg/blob/095ee06e7f60dceef7d713e3f8b1c2eb10d650d7/ports/imgui/CMakeLists.txt#L33-L108 @@ -23,15 +26,15 @@ IMGUI_BUILD_DX10_BINDING ? false, IMGUI_BUILD_DX11_BINDING ? false, IMGUI_BUILD_DX12_BINDING ? false, - IMGUI_BUILD_GLFW_BINDING ? !stdenv.isDarwin, + IMGUI_BUILD_GLFW_BINDING ? !stdenv.hostPlatform.isDarwin, IMGUI_BUILD_GLUT_BINDING ? false, - IMGUI_BUILD_METAL_BINDING ? stdenv.isDarwin, + IMGUI_BUILD_METAL_BINDING ? stdenv.hostPlatform.isDarwin, IMGUI_BUILD_OPENGL2_BINDING ? false, IMGUI_BUILD_OPENGL3_BINDING ? IMGUI_BUILD_SDL2_BINDING || IMGUI_BUILD_GLFW_BINDING || IMGUI_BUILD_GLUT_BINDING, - IMGUI_BUILD_OSX_BINDING ? stdenv.isDarwin, + IMGUI_BUILD_OSX_BINDING ? stdenv.hostPlatform.isDarwin, IMGUI_BUILD_SDL2_BINDING ? - !IMGUI_BUILD_GLFW_BINDING && !stdenv.isDarwin, + !IMGUI_BUILD_GLFW_BINDING && !stdenv.hostPlatform.isDarwin, IMGUI_BUILD_SDL2_RENDERER_BINDING ? IMGUI_BUILD_SDL2_BINDING, IMGUI_BUILD_VULKAN_BINDING ? false, IMGUI_BUILD_WIN32_BINDING ? false, @@ -84,7 +87,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = - lib.optionals (IMGUI_BUILD_OPENGL2_BINDING || IMGUI_BUILD_OPENGL3_BINDING) [ libGL ] + lib.optionals IMGUI_LINK_GLVND [ libGL ] ++ lib.optionals IMGUI_BUILD_GLFW_BINDING [ glfw ] ++ lib.optionals IMGUI_BUILD_SDL2_BINDING [ SDL2 ] ++ lib.optionals IMGUI_BUILD_VULKAN_BINDING [ diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 6f7a14a61611b..cea3f45f9ff69 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { # Do not build amd64 assembly code on Darwin, because it fails to compile # with unknow directive errors - configureFlags = optional stdenv.isDarwin "--enable-amd64=no" + configureFlags = optional stdenv.hostPlatform.isDarwin "--enable-amd64=no" ++ optional (!svgSupport) "--without-svg" ++ optional (!heifSupport) "--without-heif" ++ optional (!x11Support) "--without-x"; diff --git a/pkgs/development/libraries/imtui/default.nix b/pkgs/development/libraries/imtui/default.nix index a4f477543b89e..ac1791126bfde 100644 --- a/pkgs/development/libraries/imtui/default.nix +++ b/pkgs/development/libraries/imtui/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional withEmscripten emscripten ++ lib.optional withCurl curl ++ lib.optional withNcurses ncurses - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; postPatch = '' cp -r ${imgui.src}/* third-party/imgui/imgui diff --git a/pkgs/development/libraries/inchi/default.nix b/pkgs/development/libraries/inchi/default.nix index f74cfdec9305e..1c8cca6af715f 100644 --- a/pkgs/development/libraries/inchi/default.nix +++ b/pkgs/development/libraries/inchi/default.nix @@ -24,14 +24,14 @@ in sha256 = "1zbygqn0443p0gxwr4kx3m1bkqaj8x9hrpch3s41py7jq08f6x28"; }; - nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; outputs = [ "out" "doc" ]; enableParallelBuilding = true; preConfigure = '' cd ./INCHI_API/libinchi/gcc - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace makefile \ --replace ",--version-script=libinchi.map" "" \ --replace "LINUX_Z_RELRO = ,-z,relro" "" \ @@ -56,7 +56,7 @@ in runHook postInstall ''; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' fixDarwinDylibNames $(find "$out" -name "*.so.*") ''; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index f685a571de0cb..a54872d6c2a5e 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.4.1"; + version = "22.5.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-z8FPSqWlSubtt+gurntWnkeKsdO2B+KZXTv2Y+TL7t4="; + hash = "sha256-YHloVW5TtNI583GOEhx7S27jzHEVTSdbJSDOzv7KZiI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 5b5cfac9e06b1..4803f6ecf360d 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -8,7 +8,7 @@ , libpciaccess , intel-gmmlib , libdrm -, enableX11 ? stdenv.isLinux +, enableX11 ? stdenv.hostPlatform.isLinux , libX11 # for passhtru.tests , pkgsi686Linux diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index fa5d2b3b0c99f..6711622a2eb8b 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -ie '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace source/Irrlicht/Makefile \ --replace "-DIRRLICHT_EXPORTS=1" "-DIRRLICHT_EXPORTS=1 -DPNG_ARM_NEON_OPT=0" ''; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm - ] ++ lib.optional stdenv.isAarch64 zlib; + ] ++ lib.optional stdenv.hostPlatform.isAarch64 zlib; meta = { homepage = "https://irrlicht.sourceforge.io/"; diff --git a/pkgs/development/libraries/isa-l/default.nix b/pkgs/development/libraries/isa-l/default.nix index 9a112fb1c4d93..6ae04b0b267d8 100644 --- a/pkgs/development/libraries/isa-l/default.nix +++ b/pkgs/development/libraries/isa-l/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/intel/isa-l"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; - broken = stdenv.isDarwin && stdenv.isAarch64; # does not build on M1 mac (asm/hwcap.h file not found) maybe needs gcc not clang? + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # does not build on M1 mac (asm/hwcap.h file not found) maybe needs gcc not clang? }; } diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix deleted file mode 100644 index a11d9eca6a6e6..0000000000000 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ /dev/null @@ -1,8 +0,0 @@ -import ./generic.nix { - version = "0.11.1"; - urls = [ - "https://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2" - ]; - sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"; - patches = [ ./fix-gcc-build.diff ]; -} diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix deleted file mode 100644 index 1a368d2523e0c..0000000000000 --- a/pkgs/development/libraries/isl/0.14.1.nix +++ /dev/null @@ -1,8 +0,0 @@ -import ./generic.nix rec { - version = "0.14.1"; - urls = [ - "mirror://sourceforge/libisl/isl-${version}.tar.xz" - "https://libisl.sourceforge.io/isl-${version}.tar.xz" - ]; - sha256 = "0xa6xagah5rywkywn19rzvbvhfvkmylhcxr6z9z7bz29cpiwk0l8"; -} diff --git a/pkgs/development/libraries/isl/fix-gcc-build.diff b/pkgs/development/libraries/isl/fix-gcc-build.diff deleted file mode 100644 index 6fbd1f9d478be..0000000000000 --- a/pkgs/development/libraries/isl/fix-gcc-build.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru isl-0.11.1/include/isl/int.h isl-0.11.1.new/include/isl/int.h ---- isl-0.11.1/include/isl/int.h 2012-11-29 09:47:32.000000000 +0100 -+++ isl-0.11.1.new/include/isl/int.h 2013-10-27 15:35:31.348553812 +0100 -@@ -14,7 +14,7 @@ - #include <string.h> - #include <gmp.h> - #if defined(__cplusplus) --#include <iostream> -+#include <ostream> - #endif - - #if defined(__cplusplus) diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index b7ff7292dc23f..d4ece7d311ec6 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -10,7 +10,10 @@ fetchFromGitHub, fetchpatch, cmake, + castxml, + swig, expat, + eigen, fftw, gdcm, hdf5-cpp, @@ -20,13 +23,21 @@ libpng, libX11, libuuid, + patchelf, + python ? null, + numpy ? null, xz, vtk, + which, zlib, Cocoa, + enablePython ? false, }: let + # Python wrapper contains its own VTK support incompatible with MODULE_ITKVtkGlue + withVtk = !enablePython; + itkGenericLabelInterpolatorSrc = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITKGenericLabelInterpolator"; @@ -47,6 +58,19 @@ let rev = "bb896868fc6480835495d0da4356d5db009592a6"; hash = "sha256-MfaIA0xxA/pzUBSwnAevr17iR23Bo5iQO2cSyknS3o4="; }; + + # remove after next swig update: + swigUnstable = swig.overrideAttrs ({ + version = "4.2.1-unstable-2024-08-19"; + + src = fetchFromGitHub { + owner = "swig"; + repo = "swig"; + rev = "5ac5d90f970759fbe705fae551d0743a7c63c67e"; + hash = "sha256-32EFLHpP4l04nqrc8dt4Qsr8deTBqLt8lUlhnNnaIGU="; + }; + + }); in stdenv.mkDerivation { @@ -77,39 +101,55 @@ stdenv.mkDerivation { ln -sr ${itkSimpleITKFiltersSrc} Modules/External/ITKSimpleITKFilters ''; - cmakeFlags = [ - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_SHARED_LIBS=ON" - "-DITK_FORBID_DOWNLOADS=ON" - "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc. - # note ITK_USE_SYSTEM_EIGEN, part of ITK_USE_SYSTEM_LIBRARIES, - # causes "...-itk-5.2.1/include/ITK-5.2/itkSymmetricEigenAnalysis.h:23:31: fatal error: Eigen/Eigenvalues: No such file or directory" - # when compiling c3d, but maybe an ITK 5.2/eigen version issue: - "-DITK_USE_SYSTEM_EIGEN=OFF" - "-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489 - "-DITK_USE_SYSTEM_GDCM=ON" - "-DITK_USE_SYSTEM_MINC=ON" - "-DLIBMINC_DIR=${libminc}/lib/cmake" - "-DModule_ITKMINC=ON" - "-DModule_ITKIOMINC=ON" - "-DModule_ITKIOTransformMINC=ON" - "-DModule_SimpleITKFilters=ON" - "-DModule_ITKVtkGlue=ON" - "-DModule_ITKReview=ON" - "-DModule_MGHIO=ON" - "-DModule_AdaptiveDenoising=ON" - "-DModule_GenericLabelInterpolator=ON" - ]; + cmakeFlags = + [ + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_SHARED_LIBS=ON" + "-DITK_FORBID_DOWNLOADS=ON" + "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc. + "-DITK_USE_SYSTEM_EIGEN=ON" + "-DITK_USE_SYSTEM_EIGEN=OFF" + "-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489 + "-DITK_USE_SYSTEM_GDCM=ON" + "-DITK_USE_SYSTEM_MINC=ON" + "-DLIBMINC_DIR=${libminc}/lib/cmake" + "-DModule_ITKMINC=ON" + "-DModule_ITKIOMINC=ON" + "-DModule_ITKIOTransformMINC=ON" + "-DModule_SimpleITKFilters=ON" + "-DModule_ITKReview=ON" + "-DModule_MGHIO=ON" + "-DModule_AdaptiveDenoising=ON" + "-DModule_GenericLabelInterpolator=ON" + ] + ++ lib.optionals enablePython [ + "-DITK_WRAP_PYTHON=ON" + "-DITK_USE_SYSTEM_CASTXML=ON" + "-DITK_USE_SYSTEM_SWIG=ON" + "-DPY_SITE_PACKAGES_PATH=${placeholder "out"}/${python.sitePackages}" + ] + ++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ]; - nativeBuildInputs = [ - cmake - xz - ]; - buildInputs = [ - libX11 - libuuid - vtk - ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + nativeBuildInputs = + [ + cmake + xz + ] + ++ lib.optionals enablePython [ + castxml + swigUnstable + which + ]; + + buildInputs = + [ + eigen + libX11 + libuuid + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] + ++ lib.optionals enablePython [ python ] + ++ lib.optionals withVtk [ vtk ]; # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9 # (specifically libGL and libX11 on Linux), # it's now seemingly necessary for packages that configure ITK to @@ -130,12 +170,30 @@ stdenv.mkDerivation { libpng libtiff zlib - ] ++ vtk.propagatedBuildInputs; + ] ++ lib.optionals withVtk vtk.propagatedBuildInputs ++ lib.optionals enablePython [ numpy ]; + + postInstall = lib.optionalString enablePython '' + substitute \ + ${./itk.egg-info} \ + $out/${python.sitePackages}/itk-${version}.egg-info \ + --subst-var-by ITK_VER "${version}" + ''; + + # remove forbidden reference to /build which occur when building the Python wrapping + # (also remove a copy of itkTestDriver with incorrect permissions/RPATH): + preFixup = lib.optionals enablePython '' + rm $out/${python.sitePackages}/itk/itkTestDriver + find $out/${python.sitePackages}/itk -type f -name '*.so*' -exec \ + patchelf {} --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" \; + ''; meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = "https://www.itk.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; + # aarch64-linux Python wrapping fails with "error: unknown type name '_Float128'" and similar; + # compilation runs slowly and times out on Darwin + platforms = with lib.platforms; if enablePython then [ "x86_64-linux" ] else unix; }; } diff --git a/pkgs/development/libraries/itk/itk.egg-info b/pkgs/development/libraries/itk/itk.egg-info new file mode 100644 index 0000000000000..2c523ec278488 --- /dev/null +++ b/pkgs/development/libraries/itk/itk.egg-info @@ -0,0 +1,5 @@ +Metadata-Version: 2.1 +Name: itk +Version: @ITK_VER@ +Summary: Insight Segmentation and Registration Toolkit +Platform: UNKNOWN diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix index 1fc0e6fd0886c..d735937b934d1 100644 --- a/pkgs/development/libraries/jabcode/default.nix +++ b/pkgs/development/libraries/jabcode/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = [ maintainers.xaverdh ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jabcode.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jabcode.x86_64-darwin }; } diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/development/libraries/java/jffi/default.nix index dddcfd1fa3031..fe5a0c5535465 100644 --- a/pkgs/development/libraries/java/jffi/default.nix +++ b/pkgs/development/libraries/java/jffi/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Java Foreign Function Interface"; homepage = "https://github.com/jnr/jffi"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 8678cde4370ae..00c284c8bc9ea 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "jbigkit"; @@ -9,6 +9,19 @@ stdenv.mkDerivation rec { sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; }; + patches = [ + # Archlinux patch: this helps users to reduce denial-of-service risks, as in CVE-2017-9937 + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0013-new-jbig.c-limit-s-maxmem-maximum-decoded-image-size.patch"; + hash = "sha256-Yq5qCTF7KZTrm4oeWbpctb+QLt3shJUGEReZvd0ey9k="; + }) + # Archlinux patch: fix heap overflow + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0015-jbg_newlen-check-for-end-of-file-within-MARKER_NEWLE.patch"; + hash = "sha256-F3qA/btR9D9NfzrNY76X4Z6vG6NrisI36SjCDjS+F5s="; + }) + ]; + makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 7541e6b0c1a31..9d3bfd1d9a64a 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -41,19 +41,19 @@ stdenv.mkDerivation rec { # jemalloc is unable to correctly detect transparent hugepage support on # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ lib.optionals (stdenv.isAarch32 && lib.versionOlder version "5") [ + ++ lib.optionals (stdenv.hostPlatform.isAarch32 && lib.versionOlder version "5") [ "--disable-thp" "je_cv_thp=no" ] # AArch64 has configurable page size up to 64k. The default configuration # for jemalloc only supports 4k page sizes. - ++ lib.optional stdenv.isAarch64 "--with-lg-page=16" + ++ lib.optional stdenv.hostPlatform.isAarch64 "--with-lg-page=16" # See https://github.com/jemalloc/jemalloc/issues/1997 # Using a value of 48 should work on both emulated and native x86_64-darwin. - ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--with-lg-vaddr=48" + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--with-lg-vaddr=48" ; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=array-bounds"; # Tries to link test binaries binaries dynamically and fails doCheck = !stdenv.hostPlatform.isStatic; diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index fb6dbcea64782..3e5656ba7874a 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jitterentropy"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "jitterentropy-library"; rev = "v${version}"; - hash = "sha256-USc9e/GyajJe58/Z201AO3Y+t3IPOOdJAaifEwvgm2Q="; + hash = "sha256-CPvgc/W5Z2OfbP9Lp2tQevUQZr+xlh6q5r5Fp2WUHhg="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 0ad7cfbbb7e11..4e9a2a465214b 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, mkDerivation, propagate, extra-cmake-modules, kcoreaddons, qttools, - enablePolkit ? stdenv.isLinux, polkit-qt + enablePolkit ? stdenv.hostPlatform.isLinux, polkit-qt }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 4b52cd95b7101..d40c5a0a95e2f 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -22,7 +22,7 @@ mkDerivation { outputs = [ "out" "dev" ]; patches = [ ./kdoctools-no-find-docbook-xml.patch ] # kf.doctools.core: Error: Could not find kdoctools catalogs - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { name = "kdoctools-relocate-datapath.patch"; url = "https://github.com/msys2/MINGW-packages/raw/0900785a1f4e4146ab9561fb92a1c70fa70fcfc4/mingw-w64-kdoctools-qt5/0001-kdoctools-relocate-datapath.patch"; diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 1bd1f115c6cb6..32d01b2614885 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -18,7 +18,7 @@ mkDerivation { pname = "kfilemetadata"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ attr ] ++ [ ebook_tools diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index 1f2620c5664dd..fb18cfb287e7d 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -21,7 +21,7 @@ mkDerivation { CXXFLAGS = [ ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"'' ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"'' - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ ''-DNIXPKGS_KF5_PLASMA=\"${getLib plasma-framework}/lib/libKF5Plasma.so.5\"'' ]; setupHook = writeScript "setup-hook.sh" '' diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 522c27bf56ebc..89f341f9977af 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -15,14 +15,14 @@ mkDerivation { karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras kcrash libkrb5 - ] ++ lib.lists.optionals stdenv.isLinux [ + ] ++ lib.lists.optionals stdenv.hostPlatform.isLinux [ acl attr # both are needed for ACL support util-linux # provides libmount ]; propagatedBuildInputs = [ kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice kxmlgui qtbase qttools solid - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ kded ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index 5284d673d89e1..d9d5a6f703809 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -11,7 +11,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index ccc9f76b237ac..23abe70fed05e 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -15,7 +15,7 @@ mkDerivation ({ editorconfig-core-c ]; propagatedBuildInputs = [ kparts ]; -} // lib.optionalAttrs stdenv.isDarwin { +} // lib.optionalAttrs stdenv.hostPlatform.isDarwin { postPatch = '' substituteInPlace src/part/CMakeLists.txt \ --replace "kpart.desktop" "${kparts}/share/kservicetypes5/kpart.desktop" diff --git a/pkgs/development/libraries/kde-frameworks/solid/default.nix b/pkgs/development/libraries/kde-frameworks/solid/default.nix index 27160c3bda0d9..e26f8bfa9a62a 100644 --- a/pkgs/development/libraries/kde-frameworks/solid/default.nix +++ b/pkgs/development/libraries/kde-frameworks/solid/default.nix @@ -8,8 +8,8 @@ mkDerivation { pname = "solid"; patches = [ ./fix-search-path.patch ]; nativeBuildInputs = [ bison extra-cmake-modules flex ] - ++ lib.optionals stdenv.isLinux [ media-player-info ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ media-player-info ]; buildInputs = [ qtdeclarative qttools ]; propagatedBuildInputs = [ qtbase ]; - propagatedUserEnvPkgs = lib.optionals stdenv.isLinux [ media-player-info ]; + propagatedUserEnvPkgs = lib.optionals stdenv.hostPlatform.isLinux [ media-player-info ]; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 60b3ad00aedac..ab9a107cd47e1 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -32,10 +32,10 @@ , nixosTests , withCJSON ? true -, withCapNG ? stdenv.isLinux +, withCapNG ? stdenv.hostPlatform.isLinux # libmicrohttpd should theoretically work for darwin as well, but something is broken. # It affects tests check-bx509d and check-httpkadmind. -, withMicroHTTPD ? stdenv.isLinux +, withMicroHTTPD ? stdenv.hostPlatform.isLinux , withOpenLDAP ? true , withOpenLDAPAsHDBModule ? false , withOpenSSL ? true @@ -71,7 +71,7 @@ stdenv.mkDerivation { ++ (with perlPackages; [ JSON ]); buildInputs = [ db libedit pam ] - ++ lib.optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ CoreFoundation Security SystemConfiguration ] ++ lib.optionals (withCJSON) [ cjson ] ++ lib.optionals (withCapNG) [ libcap_ng ] ++ lib.optionals (withMicroHTTPD) [ libmicrohttpd ] @@ -132,7 +132,7 @@ stdenv.mkDerivation { # (test_cc) heimdal uses librokens implementation of `secure_getenv` on darwin, # which expects either USER or LOGNAME to be set. - preCheck = lib.optionalString (stdenv.isDarwin) '' + preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin) '' export USER=nix-builder ''; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index f48a2136ad117..a384d49fed035 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time. # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737 ++ lib.optionals staticOnly [ "--enable-static" "--disable-shared" ] - ++ lib.optional stdenv.isFreeBSD ''WARN_CFLAGS='' + ++ lib.optional stdenv.hostPlatform.isFreeBSD ''WARN_CFLAGS='' ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "krb5_cv_attr_constructor_destructor=yes,yes" "ac_cv_func_regcomp=yes" @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ byacc perl pkg-config ] # Provides the mig command used by the build scripts - ++ lib.optional stdenv.isDarwin bootstrap_cmds; + ++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds; buildInputs = [ openssl ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ] @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withLibedit [ libedit ] ++ lib.optionals withVerto [ libverto ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk; [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk; [ libs.xpc frameworks.Kerberos ]); diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index 330657f41fd00..56dbe1fa9179f 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opencl-icd-loader"; - version = "2023.12.14"; + version = "2024.05.08"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; rev = "v${version}"; - hash = "sha256-/4ixQAwJpygdg+qtR1ccBlz8hmtYYxRgUV5dlJabsg8="; + hash = "sha256-wFwc1ku3FNEH2k8TJij2sT7JspWorR/XbxXwPZaQcGA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 5c5ab34bc24cb..ebe783ae8beb7 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-TIXXNmaNgpIL/b25KsPWa32xEI8JWBp2ndkWCgLe80k="; }; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace kccommon.h \ --replace tr1/unordered_map unordered_map \ --replace tr1/unordered_set unordered_set \ diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 80a3f725f9704..65fc10c92a70b 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "LDAP-like embedded database"; homepage = "https://ldb.samba.org/"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/lemon-graph/default.nix b/pkgs/development/libraries/lemon-graph/default.nix index ae071a7271333..4e96e9f4c93a0 100644 --- a/pkgs/development/libraries/lemon-graph/default.nix +++ b/pkgs/development/libraries/lemon-graph/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; # error: no viable conversion from ... - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; patches = [ # error: ISO C++17 does not allow 'register' storage class specifier diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 766a1161e2c62..8972485bb2824 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { buildInputs = [ glib zlib libpng ]; - cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" "-DCMAKE_BUILD_TYPE=RELEASE" ]; + cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; meta = with lib; { platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 12cd3f074fcbc..41af5b44a9675 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ which gnuplot ]; # Fails on pngio_reg for unknown reason - doCheck = false; # !stdenv.isDarwin; + doCheck = false; # !stdenv.hostPlatform.isDarwin; meta = { description = "Image processing and analysis library"; diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index 4bf0a9d3f94a0..8b87f0af9f9b1 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.17.28"; + version = "1.17.42"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-rgQ7B3RZemlcurEQ8bwvlvJAypzHTOBqpowasziZCiQ="; + hash = "sha256-IjYRzjC7CUPDdVBVoWSZtUQaY7QtSfS/Nej/2BdVziY="; }; nativeBuildInputs = [ cmake addDriverRunpath ]; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index f5e7e2a638d23..9d2dfe468029c 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ snappy ]; - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames ++ [ cmake ]; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ [ cmake ]; doCheck = true; diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/development/libraries/lib2geom/default.nix index e0db2b76f19e0..eedb433e61be2 100644 --- a/pkgs/development/libraries/lib2geom/default.nix +++ b/pkgs/development/libraries/lib2geom/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 checkPhase = let disabledTests = - lib.optionals stdenv.isAarch64 [ + lib.optionals stdenv.hostPlatform.isAarch64 [ # Broken on all platforms, test just accidentally passes on some. # https://gitlab.com/inkscape/lib2geom/-/issues/63 "elliptical-arc-test" diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix index 2436fbc002872..df88534bc6e74 100644 --- a/pkgs/development/libraries/lib3mf/default.nix +++ b/pkgs/development/libraries/lib3mf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ libzip gtest openssl - ] ++ (if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]); + ] ++ (if stdenv.hostPlatform.isDarwin then [ libossp_uuid ] else [ libuuid ]); postPatch = '' # This lets us build the tests properly on aarch64-darwin. diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 4b00de8115735..f9bd013065852 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -45,15 +45,15 @@ stdenv.mkDerivation rec { "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib ''; - meta = { + meta = with lib; { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; homepage = "https://liblas.org"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.michelk ]; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; teams.geospatial.members ++ [ lib.maintainers.michelk ]; }; } diff --git a/pkgs/development/libraries/libad9361/default.nix b/pkgs/development/libraries/libad9361/default.nix index f370870f71ef6..96f1e877d52ba 100644 --- a/pkgs/development/libraries/libad9361/default.nix +++ b/pkgs/development/libraries/libad9361/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiio ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix iio include path on darwin to match linux for i in test/*.c; do substituteInPlace $i \ diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 924b8884df803..bd51a9a1245e7 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ appstream fribidi - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Foundation ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ adwaita-icon-theme - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ xvfb-run ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { # # not ok /Adwaita/ButtonContent/style_class_button - Gdk-FATAL-CRITICAL: # gdk_macos_monitor_get_workarea: assertion 'GDK_IS_MACOS_MONITOR (self)' failed - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; separateDebugInfo = true; checkPhase = '' @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { # Tests need a cache directory "HOME=$TMPDIR" ) - env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.isDarwin) "xvfb-run"} \ + env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "xvfb-run"} \ meson test --print-errorlogs runHook postCheck diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index 0582019d72f53..8fa18093aa353 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Tests for libagar"; mainProgram = "agartest"; homepage = "http://libagar.org/index.html"; diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index f61c0bfafc7bd..622dabd82394f 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; - configureFlags = lib.optional stdenv.is64bit "--enable-64bit" + configureFlags = lib.optional stdenv.hostPlatform.is64bit "--enable-64bit" # libantlr3c wrongly emits the abi flags -m64 and -m32 which imply x86 archs # https://github.com/antlr/antlr3/issues/205 ++ lib.optional (!stdenv.hostPlatform.isx86) "--disable-abiflags"; diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index b920fe9c3b4e7..6c6743b2b55e8 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ lib.optional usePulseAudio libpulseaudio ++ - lib.optionals stdenv.isLinux [ alsa-lib libcap ] ++ - lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libcap ] ++ + lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio CoreServices AudioUnit ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 8f4afbf5a3e04..01f361d054766 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "-DCONFIG_TUNE_VMAF=1" ] ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [ "-DCMAKE_ASM_COMPILER=${stdenv.cc.targetPrefix}as" - ] ++ lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # armv7l-hf-multiplatform does not support NEON # see lib/systems/platform.nix "-DENABLE_NEON=0" diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix index 540fc10998e5d..8068ae3edd9d9 100644 --- a/pkgs/development/libraries/libaosd/default.nix +++ b/pkgs/development/libraries/libaosd/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { composited rendering via XComposite, as well as support for rendering Cairo and Pango layouts. ''; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/atheme-legacy/libaosd"; license = licenses.mit; maintainers = with maintainers; [ unode ]; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix deleted file mode 100644 index 09a96e829e330..0000000000000 --- a/pkgs/development/libraries/libarchive/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, acl -, attr -, autoreconfHook -, bzip2 -, e2fsprogs -, glibcLocalesUtf8 -, lzo -, openssl -, pkg-config -, sharutils -, xz -, zlib -, zstd -# Optional but increases closure only negligibly. Also, while libxml2 builds -# fine on windows, libarchive has trouble linking windows things it depends on -# for some reason. -, xarSupport ? stdenv.hostPlatform.isUnix, libxml2 - -# for passthru.tests -, cmake -, nix -, samba - -# for passthru.lore -, binlore -}: - -assert xarSupport -> libxml2 != null; -stdenv.mkDerivation (finalAttrs: { - pname = "libarchive"; - version = "3.7.4"; - - src = fetchFromGitHub { - owner = "libarchive"; - repo = "libarchive"; - rev = "v${finalAttrs.version}"; - hash = "sha256-czNKXHoEn1x4deNErnqp/NZfCglF1CxNoLtZ8tcl394="; - }; - - outputs = [ "out" "lib" "dev" ]; - - postPatch = let - skipTestPaths = [ - # test won't work in nix sandbox - "libarchive/test/test_write_disk_perms.c" - # the filesystem does not necessarily have sparse capabilities - "libarchive/test/test_sparse_basic.c" - # the filesystem does not necessarily have hardlink capabilities - "libarchive/test/test_write_disk_hardlink.c" - # access-time-related tests flakey on some systems - "cpio/test/test_option_a.c" - "cpio/test/test_option_t.c" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ - # only on some aarch64-linux systems? - "cpio/test/test_basic.c" - "cpio/test/test_format_newc.c" - ]; - removeTest = testPath: '' - substituteInPlace Makefile.am --replace-fail "${testPath}" "" - rm "${testPath}" - ''; - in '' - substituteInPlace Makefile.am --replace-fail '/bin/pwd' "$(type -P pwd)" - - ${lib.concatStringsSep "\n" (map removeTest skipTestPaths)} - ''; - - nativeBuildInputs = [ - autoreconfHook - glibcLocalesUtf8 # test_I test requires an UTF-8 locale - pkg-config - ]; - - buildInputs = [ - bzip2 - lzo - openssl - xz - zlib - zstd - ] ++ lib.optional stdenv.hostPlatform.isUnix sharutils - ++ lib.optionals stdenv.isLinux [ acl attr e2fsprogs ] - ++ lib.optional xarSupport libxml2; - - # Without this, pkg-config-based dependencies are unhappy - propagatedBuildInputs = lib.optionals stdenv.isLinux [ attr acl ]; - - configureFlags = lib.optional (!xarSupport) "--without-xml2"; - - preBuild = lib.optionalString stdenv.isCygwin '' - echo "#include <windows.h>" >> config.h - ''; - - # https://github.com/libarchive/libarchive/issues/1475 - doCheck = !stdenv.hostPlatform.isMusl; - - preCheck = '' - # Need an UTF-8 locale for test_I test. - export LANG=en_US.UTF-8 - ''; - - preFixup = '' - sed -i $lib/lib/libarchive.la \ - -e 's|-lcrypto|-L${lib.getLib openssl}/lib -lcrypto|' \ - -e 's|-llzo2|-L${lzo}/lib -llzo2|' - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://libarchive.org"; - description = "Multi-format archive and compression library"; - longDescription = '' - The libarchive project develops a portable, efficient C library that can - read and write streaming archives in a variety of formats. It also - includes implementations of the common tar, cpio, and zcat command-line - tools that use the libarchive library. - ''; - changelog = "https://github.com/libarchive/libarchive/releases/tag/v${finalAttrs.version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ jcumming AndersonTorres ]; - platforms = platforms.all; - }; - - passthru.tests = { - inherit cmake nix samba; - }; - - # bsdtar is detected as "cannot" because its exec is internal to - # calls it makes into libarchive itself. If binlore gains support - # for detecting another layer down into libraries, this can be cut. - passthru.binlore.out = binlore.synthesize finalAttrs.finalPackage '' - execer can bin/bsdtar - ''; -}) diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index 6e2ef83c5eace..ccd8166ca4f0d 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i"; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 3c3fa3ee7066d..db5603ac4aea1 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype fribidi harfbuzz ] ++ lib.optional fontconfigSupport fontconfig - ++ lib.optional stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index 09e056373d27e..77c998f4216b7 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg"; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace libasyncns/asyncns.c \ --replace '<arpa/nameser.h>' '<arpa/nameser_compat.h>' ''; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index bf83a9e8456ac..a9fc75558e9bd 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isCygwin [ autoconf automake libtool ]; - preConfigure = lib.optionalString stdenv.isCygwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isCygwin '' sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am ./autogen.sh ''; diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix deleted file mode 100644 index 0cadea9f99022..0000000000000 --- a/pkgs/development/libraries/libayatana-indicator/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub, lib -, pkg-config, cmake -, gtk3 -, ayatana-ido -}: - -stdenv.mkDerivation rec { - pname = "libayatana-indicator"; - version = "0.9.4"; - - src = fetchFromGitHub { - owner = "AyatanaIndicators"; - repo = "libayatana-indicator"; - rev = version; - sha256 = "sha256-OsguZ+jl274uPSCTFHq/ZwUE3yHR7MlUPHCpfmn1F7A="; - }; - - nativeBuildInputs = [ pkg-config cmake ]; - - buildInputs = [ gtk3 ]; - - propagatedBuildInputs = [ ayatana-ido ]; - - meta = with lib; { - description = "Ayatana Indicators Shared Library"; - homepage = "https://github.com/AyatanaIndicators/libayatana-indicator"; - changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${version}/ChangeLog"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.nickhu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix index 1be572671e029..60c7ede0993fb 100644 --- a/pkgs/development/libraries/libbacktrace/default.nix +++ b/pkgs/development/libraries/libbacktrace/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { (lib.enableFeature enableShared "shared") ]; - doCheck = stdenv.isLinux && !stdenv.hostPlatform.isMusl; + doCheck = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl; passthru = { updateScript = unstableGitUpdater { }; diff --git a/pkgs/development/libraries/libbde/default.nix b/pkgs/development/libraries/libbde/default.nix deleted file mode 100644 index 4bef9748701c2..0000000000000 --- a/pkgs/development/libraries/libbde/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fuse -, ncurses -, python3 -}: - -stdenv.mkDerivation rec { - pname = "libbde"; - version = "20221031"; - - src = fetchurl { - url = "https://github.com/libyal/libbde/releases/download/${version}/${pname}-alpha-${version}.tar.gz"; - sha256 = "sha256-uMbwofboePCFWlxEOdRbZK7uZuj0MZC/qusWuu0Bm7g="; - }; - - buildInputs = [ fuse ncurses python3 ]; - - configureFlags = [ "--enable-python" ]; - - meta = with lib; { - description = "Library to access the BitLocker Drive Encryption (BDE) format"; - homepage = "https://github.com/libyal/libbde/"; - license = licenses.lgpl3; - maintainers = with maintainers; [ eliasp ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 5c2255a50a626..d52ca4fca2842 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt libgpg-error gettext ]; - nativeBuildInputs = [ ]; - meta = with lib; { homepage = "http://www.videolan.org/developers/libbdplus.html"; description = "Library to access BD+ protected Blu-Ray disks"; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 94d1257d0e7d0..77e72d22db6c7 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config git doxygen help2man ]; # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 buildInputs = [ tecla libusb1 ] - ++ lib.optionals stdenv.isLinux [ udev ] - ++ lib.optionals stdenv.isDarwin [ ncurses ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ncurses ]; # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_DOCUMENTATION=ON" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DINSTALL_UDEV_RULES=ON" "-DBLADERF_GROUP=bladerf" diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 672908281b0ed..c31c05920e31d 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig ] ++ lib.optional withMetadata libxml2 ++ lib.optional withFonts freetype - ++ lib.optional stdenv.isDarwin DiskArbitration; + ++ lib.optional stdenv.hostPlatform.isDarwin DiskArbitration; propagatedBuildInputs = lib.optional withAACS libaacs; diff --git a/pkgs/development/libraries/libbpkg/default.nix b/pkgs/development/libraries/libbpkg/default.nix index 6315b5df0f058..969654b675a2b 100644 --- a/pkgs/development/libraries/libbpkg/default.nix +++ b/pkgs/development/libraries/libbpkg/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "libbpkg"; - version = "0.16.0"; + version = "0.17.0"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${version}.tar.gz"; - hash = "sha256-h3Stt1n1057ASf3n16plr5cNGIKOjHiiuOfqrcCJ5tA="; + hash = "sha256-4P4+uJGWB3iblYPuErJNr8c7/pS2UhN6LXr7MY2rWDY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libbtbb/default.nix b/pkgs/development/libraries/libbtbb/default.nix index e0e70005e25f5..9ea153fab6f65 100644 --- a/pkgs/development/libraries/libbtbb/default.nix +++ b/pkgs/development/libraries/libbtbb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1byv8174xam7siakr1p0523x97wkh0fmwmq341sd3g70qr2g767d"; }; - nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; # https://github.com/greatscottgadgets/libbtbb/issues/63 postPatch = '' diff --git a/pkgs/development/libraries/libbutl/default.nix b/pkgs/development/libraries/libbutl/default.nix index aee951a51d6c0..aaf78cec08dc6 100644 --- a/pkgs/development/libraries/libbutl/default.nix +++ b/pkgs/development/libraries/libbutl/default.nix @@ -9,18 +9,18 @@ stdenv.mkDerivation rec { pname = "libbutl"; - version = "0.16.0"; + version = "0.17.0"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${version}.tar.gz"; - hash = "sha256-MGL6P/lG2sJdJXZiTcDvdy4jmU+2jYHsvaX4eEO9J2g="; + hash = "sha256-sFqaEf6s2rF1YcZjw5J6oY5ol5PbO9vy6NseKjrvTvs="; }; nativeBuildInputs = [ build2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # but especially important when bootstrapping disallowedReferences = [ build2 ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace libbutl/uuid-linux.cxx \ --replace '"libuuid.so' '"${lib.getLib libuuid}/lib/libuuid.so' ''; diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix deleted file mode 100644 index f0af39cc88108..0000000000000 --- a/pkgs/development/libraries/libbytesize/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, docbook_xml_dtd_43 -, docbook_xsl -, gettext -, gmp -, gtk-doc -, libxslt -, mpfr -, pcre2 -, pkg-config -, python3 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libbytesize"; - version = "2.10"; - - src = fetchFromGitHub { - owner = "storaged-project"; - repo = "libbytesize"; - rev = finalAttrs.version; - hash = "sha256-IPBoYcnSQ1/ws3mzPUXxgbetZkXRWrGhtakXaVVFb6U="; - }; - - outputs = [ "out" "dev" "devdoc" "man" ]; - - nativeBuildInputs = [ - autoreconfHook - docbook_xml_dtd_43 - docbook_xsl - gettext - gtk-doc - libxslt - pkg-config - python3 - ]; - - buildInputs = [ - gmp - mpfr - pcre2 - ]; - - strictDeps = true; - - meta = { - homepage = "https://github.com/storaged-project/libbytesize"; - description = "Tiny library providing a C 'class' for working with arbitrary big sizes in bytes"; - mainProgram = "bscalc"; - license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix deleted file mode 100644 index 6b99439fe017e..0000000000000 --- a/pkgs/development/libraries/libcaca/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, imlib2 -, xorg -, ncurses -, pkg-config -, zlib -, x11Support ? !stdenv.isDarwin -}: - -stdenv.mkDerivation rec { - pname = "libcaca"; - version = "0.99.beta20"; - - src = fetchFromGitHub { - owner = "cacalabs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-N0Lfi0d4kjxirEbIjdeearYWvStkKMyV6lgeyNKXcVw="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - ncurses - zlib - (imlib2.override { inherit x11Support; }) - ] ++ lib.optionals x11Support [ - xorg.libX11 - xorg.libXext - ]; - - outputs = [ "bin" "dev" "out" "man" ]; - - configureFlags = [ - (if x11Support then "--enable-x11" else "--disable-x11") - ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; - - postInstall = '' - mkdir -p $dev/bin - mv $bin/bin/caca-config $dev/bin/caca-config - ''; - - meta = with lib; { - homepage = "http://caca.zoy.org/wiki/libcaca"; - description = "Graphics library that outputs text instead of pixels"; - longDescription = '' - libcaca is a graphics library that outputs text instead of pixels, so that - it can work on older video cards or text terminals. It is not unlike the - famous ​AAlib library, with the following improvements: - - - Unicode support - - 2048 available colours (some devices can only handle 16) - - dithering of colour images - - advanced text canvas operations (blitting, rotations) - - Libcaca works in a text terminal (and should thus work on all Unix systems - including Mac OS X) using the S-Lang or ncurses libraries. It also works - natively on DOS and Windows. - - Libcaca was written by Sam Hocevar and Jean-Yves Lamoureux. - ''; - license = licenses.wtfpl; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index 5f987943d8df7..1dd07a9d6ec2a 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-+79N6Mt9tb3/XstnL/Db5pOfufNEuQDVG6YpUymjMuc="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/--version-script/d' Makefile.in sed -i 's/^vflag = .*$/vflag = ""/' meson.build ''; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 0a9aabf731232..7f164c18b49c3 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -2,7 +2,7 @@ , gtk2-x11, gtk3-x11 , gtkSupport ? null , libpulseaudio, gst_all_1, libvorbis, libcap, systemd , Carbon, CoreServices, AppKit -, withAlsa ? stdenv.isLinux, alsa-lib }: +, withAlsa ? stdenv.hostPlatform.isLinux, alsa-lib }: stdenv.mkDerivation rec { pname = "libcanberra"; @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional (gtkSupport == "gtk2") gtk2-x11 ++ lib.optional (gtkSupport == "gtk3") gtk3-x11 - ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices AppKit ] - ++ lib.optionals stdenv.isLinux [ libcap systemd ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreServices AppKit ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap systemd ] ++ lib.optional withAlsa alsa-lib; configureFlags = [ "--disable-oss" ] - ++ lib.optional stdenv.isLinux "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"; + ++ lib.optional stdenv.hostPlatform.isLinux "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"; patches = [ (fetchpatch { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { url = "http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310"; sha256 = "0rc7zwn39yxzxp37qh329g7375r5ywcqcaak8ryd0dgvg8m5hcx9"; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { url = "https://github.com/macports/macports-ports/raw/5a7965dfea7727d1ceedee46c7b0ccee9cb23468/audio/libcanberra/files/patch-configure.diff"; sha256 = "sha256-pEJy1krciUEg5BFIS8FJ4BubjfS/nt9aqi6BLnS1+4M="; diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index b6fd599e0dfdc..93b3cb91ffc93 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -1,26 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkg-config, - libiconv, IOKit, DiskArbitration}: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libcdio, + pkg-config, + libiconv, + IOKit, + DiskArbitration, +}: stdenv.mkDerivation rec { pname = "libcdio-paranoia"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "rocky"; repo = "libcdio-paranoia"; rev = "release-10.2+${version}"; - hash = "sha256-kNGhhslp5noAVeho0kBVfyvb4kQpDY56nyL3a4aFgjE="; + hash = "sha256-n05PSVgh6z7BFPq4CjJa5DqCO7Huj8Bsg0x3HQPsbeI="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libcdio ] ++ - lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = + [ libcdio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + IOKit + DiskArbitration + ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin DiskArbitration; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin DiskArbitration; - configureFlags = lib.optionals stdenv.isDarwin [ - "--disable-ld-version-script" - ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-ld-version-script" ]; meta = with lib; { description = "CD paranoia on top of libcdio"; diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 820ac97a434f3..9f0d8689f30e4 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config help2man ]; buildInputs = [ libcddb libiconv ncurses ] - ++ lib.optionals stdenv.isDarwin [ Carbon IOKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon IOKit ]; enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Library for OS-independent CD-ROM and CD image access"; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 885413982dad8..cf7d7c4e5e2ee 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h + enableParallelBuilding = true; + meta = { description = "Library providing ability to interpret and import Corel Draw drawings into various applications"; homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libcdr"; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 78746cf012541..4116f2a0172ad 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUX_API=1" ]; diff --git a/pkgs/development/libraries/libcifpp/default.nix b/pkgs/development/libraries/libcifpp/default.nix index a5dbf01492a54..564c7690b3783 100644 --- a/pkgs/development/libraries/libcifpp/default.nix +++ b/pkgs/development/libraries/libcifpp/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Manipulate mmCIF and PDB files"; homepage = "https://github.com/PDB-REDO/libcifpp"; - changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = licenses.bsd2; maintainers = with maintainers; [ natsukium ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index c33fdcf00f33c..93aec103bca08 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; configureFlags = [ "-config" "release" ] # Build mixes up dylibs/frameworks if one is not explicitly specified. - ++ lib.optionals stdenv.isDarwin [ "-config" "qt_framework" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-config" "qt_framework" ]; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index 80b418e3065d3..8b24f4250b5cb 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/IIzUMms4aS63psyxwL+Ynj78c38R3WwbD2HIpdHF88="; + sha256 = "sha256-Ol/vWaXcbDcy+d8V//fK4SYUpnYmwuYJxkO3/+kqgdM="; }; postPatch = lib.optionalString stdenv.cc.isClang '' diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 4f813d74a8971..f3decde56c770 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # Running tests in parallel does not work enableParallelChecking = false; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "C client library for Couchbase"; diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix deleted file mode 100644 index f514d3c00a688..0000000000000 --- a/pkgs/development/libraries/libcutl/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, gccStdenv, fetchurl, xercesc }: - -let - stdenv = gccStdenv; -in -stdenv.mkDerivation rec { - pname = "libcutl"; - version = "1.10.0"; - - meta = with lib; { - description = "C++ utility library from Code Synthesis"; - longDescription = '' - libcutl is a C++ utility library. - It contains a collection of generic and independent components such as - meta-programming tests, smart pointers, containers, compiler building blocks, etc. - ''; - homepage = "https://codesynthesis.com/projects/libcutl/"; - changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/plain/NEWS?h=${version}"; - platforms = platforms.all; - maintainers = [ ]; - license = licenses.mit; - }; - - majmin = builtins.head ( builtins.match "([[:digit:]]\\.[[:digit:]]+).*" "${version}" ); - src = fetchurl { - url = "https://codesynthesis.com/download/${pname}/${majmin}/${pname}-${version}.tar.bz2"; - sha256 = "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j"; - }; - - buildInputs = [ xercesc ]; - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; -} diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix index b1ad3d40eb31c..908609675f62c 100644 --- a/pkgs/development/libraries/libcxxrt/default.nix +++ b/pkgs/development/libraries/libcxxrt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "libcxxrt"; - version = "4.0.10-unstable-2024-08-06"; + version = "4.0.10-unstable-2024-09-24"; src = fetchFromGitHub { owner = "libcxxrt"; repo = "libcxxrt"; - rev = "7a3ef57f64be0f2f2a156af011adfbe76c7dce74"; - sha256 = "H4FodZ3fAgkWWE+ZByAOx7Nn0+ujxEobOkeHdE/lI94="; + rev = "40e4fa2049930412a2c43cdf0c39b6b5aa735341"; + sha256 = "2rEbRTr8RLl8EKrDq210baCPDt9OppdL7zloNjGOZME="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcyaml/default.nix b/pkgs/development/libraries/libcyaml/default.nix deleted file mode 100644 index 99ad390896f68..0000000000000 --- a/pkgs/development/libraries/libcyaml/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, fetchFromGitHub -, libyaml -}: - -stdenv.mkDerivation rec { - pname = "libcyaml"; - version = "1.4.1"; - - src = fetchFromGitHub { - owner = "tlsa"; - repo = "libcyaml"; - rev = "v${version}"; - sha256 = "sha256-iS1T8R0SW+qu0TlP5FVlDzUfQitiZMUkbJUigbxeW0Y="; - }; - - buildInputs = [ libyaml ]; - - makeFlags = [ "VARIANT=release" "PREFIX=$(out)" ]; - - meta = with lib; { - homepage = "https://github.com/tlsa/libcyaml"; - description = "C library for reading and writing YAML"; - changelog = "https://github.com/tlsa/libcyaml/raw/v${version}/CHANGES.md"; - license = licenses.isc; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index d5e5f1db552a0..bc831d354e772 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, ninja -, pkg-config -, libnice -, openssl -, plog -, srtp -, usrsctp +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + ninja, + pkg-config, + libnice, + openssl, + plog, + srtp, + usrsctp, }: stdenv.mkDerivation rec { @@ -22,14 +23,19 @@ stdenv.mkDerivation rec { hash = "sha256-3fax57oaJvOgbTDPCiiUdtsfAGhICfPkuMihawq06SA="; }; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; strictDeps = true; + nativeBuildInputs = [ cmake ninja pkg-config ]; + buildInputs = [ libnice openssl @@ -47,7 +53,7 @@ stdenv.mkDerivation rec { postFixup = '' # Fix include path that will be incorrect due to the "dev" output substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets.cmake" \ - --replace "\''${_IMPORT_PREFIX}/include" "$dev/include" + --replace-fail "\''${_IMPORT_PREFIX}/include" "$dev/include" ''; meta = with lib; { @@ -55,6 +61,6 @@ stdenv.mkDerivation rec { homepage = "https://libdatachannel.org/"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ erdnaxe ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index c947079038722..08b286c825cf6 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 dbus glib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { "-Denable_gtk_doc=true" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index bbd9e3898d912..6537e3ae2a3e8 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -42,8 +42,6 @@ stdenv.mkDerivation rec { "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite" ] ++ lib.optionals (postgresql != null) [ "--with-pgsql" - "--with-pgsql_incdir=${postgresql}/include" - "--with-pgsql_libdir=${postgresql.lib}/lib" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 0163eb9015d25..fc33817a857ea 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libusb1 ] - ++ lib.optional stdenv.isLinux libraw1394 - ++ lib.optional stdenv.isDarwin CoreServices; + ++ lib.optional stdenv.hostPlatform.isLinux libraw1394 + ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; meta = with lib; { description = "Capture and control API for IIDC compliant cameras"; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index bfefe90487c4c..53944f5a5e949 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr ] ++ lib.optionals withXorg [ libX11 libGL ] - ++ lib.optionals stdenv.isDarwin [ OpenGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ]; configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index d957d2d05d0d2..85dbf3a72b9db 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "bin" ]; + # Cherry-pick of + # https://github.com/open-eid/libdigidocpp/commit/2b5db855ba3ceb9bae1f11589ea1aea22bb7595a + # Fixes https://github.com/NixOS/nixpkgs/issues/334397 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'TSA_URL "http://dd-at.ria.ee/tsa"' 'TSA_URL "https://eid-dd.ria.ee/ts"' + ''; + # libdigidocpp.so's `PKCS11Signer::PKCS11Signer()` dlopen()s "opensc-pkcs11.so" # itself, so add OpenSC to its DT_RUNPATH after the fixupPhase shrinked it. # https://github.com/open-eid/cmake/pull/35 might be an alternative. diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 926973bb5739d..2c4e7de008b6b 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-3V6PHJrq1ELiO3SanMkzY3LmLoitcHmitiiVsDkMsoI="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework IOKit"; meta = with lib; { description = "C library for creating MusicBrainz DiscIDs from audio CDs"; diff --git a/pkgs/development/libraries/libdmapsharing/default.nix b/pkgs/development/libraries/libdmapsharing/default.nix index ba1b3c05f1a60..47b02a65e0833 100644 --- a/pkgs/development/libraries/libdmapsharing/default.nix +++ b/pkgs/development/libraries/libdmapsharing/default.nix @@ -1,59 +1,74 @@ -{ stdenv -, lib -, fetchFromGitLab -, autoconf -, automake -, libtool -, which -, pkg-config -, python3 -, vala -, avahi -, gdk-pixbuf -, gst_all_1 -, glib -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, gobject-introspection -, libsoup_3 +{ + stdenv, + lib, + fetchFromGitLab, + autoconf, + automake, + libtool, + pkg-config, + vala, + avahi, + gdk-pixbuf, + gst_all_1, + glib, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_43, + gobject-introspection, + libsoup_3, + withGtkDoc ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: stdenv.mkDerivation rec { pname = "libdmapsharing"; version = "3.9.13"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = + [ + "out" + "dev" + ] + ++ lib.optionals withGtkDoc [ + "devdoc" + ]; + outputBin = "dev"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "${lib.toUpper pname}_${lib.replaceStrings ["."] ["_"] version}"; + rev = "${lib.toUpper pname}_${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "oR9lpOFxgGfrtzncFT6dbmhKQfcuH/NvhOR/USHAHQc="; }; - nativeBuildInputs = [ - autoconf - automake - libtool - which - pkg-config - python3 - gobject-introspection - vala - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - ]; + strictDeps = true; - buildInputs = [ - avahi - gdk-pixbuf - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ]; + nativeBuildInputs = + [ + autoconf + automake + libtool + gtk-doc # gtkdocize + pkg-config + gobject-introspection + vala + ] + ++ lib.optionals withGtkDoc [ + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = + [ + avahi + gdk-pixbuf + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ] + ++ lib.optionals withGtkDoc [ + gtk-doc + ]; propagatedBuildInputs = [ glib @@ -61,10 +76,15 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--enable-gtk-doc" - "--disable-tests" # Tests require mDNS server. + (lib.enableFeature false "tests") # Tests require mDNS server + (lib.enableFeature withGtkDoc "gtk-doc") ]; + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail pkg-config "$PKG_CONFIG" + ''; + preConfigure = '' NOCONFIGURE=1 ./autogen.sh ''; diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix index 49c2ab1bdfa72..da69eedb28877 100644 --- a/pkgs/development/libraries/libdv/default.nix +++ b/pkgs/development/libraries/libdv/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Disable priority scheduling on Darwin because it doesn’t support sched_setscheduler. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace encodedv/dvconnect.c \ --replace '#ifdef _SC_PRIORITY_SCHEDULING' '#if 0' ''; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index 6c832250fc1c8..2e1cc41c5a73d 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libdvdcss"; version = "1.4.3"; - buildInputs = lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin IOKit; src = fetchurl { url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index 969b5d9636f2f..741d848c47a85 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in "$out"/bin/*; do if isELF "$f"; then patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index f771ad140b551..5ff8055cedee4 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -10,7 +10,7 @@ , libX11 , Carbon , OpenGL -, x11Support ? !stdenv.isDarwin +, x11Support ? !stdenv.hostPlatform.isDarwin , testers }: @@ -30,15 +30,15 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs src/*.py '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" '' # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace test/meson.build \ --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" '' - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace test/meson.build \ --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" ''; @@ -47,23 +47,23 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ]; - buildInputs = lib.optionals (x11Support && !stdenv.isDarwin) [ + buildInputs = lib.optionals (x11Support && !stdenv.hostPlatform.isDarwin) [ libGL ] ++ lib.optionals x11Support [ libX11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon OpenGL ]; mesonFlags = [ - "-Degl=${if (x11Support && !stdenv.isDarwin) then "yes" else "no"}" + "-Degl=${if (x11Support && !stdenv.hostPlatform.isDarwin) then "yes" else "no"}" "-Dglx=${if x11Support then "yes" else "no"}" "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" "-Dx11=${lib.boolToString x11Support}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.hostPlatform.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; doCheck = true; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 983395f33b4b6..ab443dfac80db 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -2,6 +2,8 @@ , updateAutotoolsGnuConfigScriptsHook , sslSupport ? true, openssl , fetchpatch + +, static ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { @@ -21,7 +23,10 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = lib.optional (!sslSupport) "--disable-openssl"; + configureFlags = lib.flatten [ + (lib.optional (!sslSupport) "--disable-openssl") + (lib.optionals static ["--disable-shared" "--with-pic"]) + ]; preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 @@ -41,7 +46,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = lib.optional sslSupport openssl - ++ lib.optional stdenv.isCygwin findutils; + ++ lib.optional stdenv.hostPlatform.isCygwin findutils; doCheck = false; # needs the net diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index 6c149b0186ee2..3bfd958bfd60e 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib openssl libuuid ] - ++ lib.optionals stdenv.isDarwin [ bzip2 ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ bzip2 ]; # cannot run test program while cross compiling configureFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index d947534cb2eca..e154eebc48c18 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch2, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis , exiv2, libgsf, pkg-config -, rpmSupport ? stdenv.isLinux, rpm +, rpmSupport ? stdenv.hostPlatform.isLinux, rpm , gstreamerSupport ? true, gst_all_1 # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { # Checks need to be run after "make install", otherwise plug-ins are not in # the search path, etc. doCheck = false; - doInstallCheck = !stdenv.isDarwin; + doInstallCheck = !stdenv.hostPlatform.isDarwin; installCheckPhase = "make check"; meta = with lib; { diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/development/libraries/libfabric/default.nix index 658e380d210b6..6fabadf5f1291 100644 --- a/pkgs/development/libraries/libfabric/default.nix +++ b/pkgs/development/libraries/libfabric/default.nix @@ -3,9 +3,9 @@ , fetchFromGitHub , pkg-config , autoreconfHook -, enablePsm2 ? (stdenv.isx86_64 && stdenv.isLinux) +, enablePsm2 ? (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux) , libpsm2 -, enableOpx ? (stdenv.isx86_64 && stdenv.isLinux) +, enableOpx ? (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux) , libuuid , numactl }: diff --git a/pkgs/development/libraries/libff/default.nix b/pkgs/development/libraries/libff/default.nix index af2191fb4136c..5277337500794 100644 --- a/pkgs/development/libraries/libff/default.nix +++ b/pkgs/development/libraries/libff/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ "-DWITH_PROCPS=Off" ] - ++ lib.optionals stdenv.isAarch64 [ "-DCURVE=ALT_BN128" "-DUSE_ASM=OFF" ]; + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-DCURVE=ALT_BN128" "-DUSE_ASM=OFF" ]; postPatch = lib.optionalString (!enableStatic) '' substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED" diff --git a/pkgs/development/libraries/libffi/3.3.nix b/pkgs/development/libraries/libffi/3.3.nix index 50bec9edd0503..d8dd3fa47d5c8 100644 --- a/pkgs/development/libraries/libffi/3.3.nix +++ b/pkgs/development/libraries/libffi/3.3.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ armeenm ]; platforms = platforms.all; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index 04bfadeef979e..1a68b5eb6eb12 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libcbor zlib ] - ++ lib.optionals stdenv.isDarwin [ hidapi ] - ++ lib.optionals stdenv.isLinux [ udev ] - ++ lib.optionals (stdenv.isLinux && withPcsclite) [ pcsclite ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hidapi ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && withPcsclite) [ pcsclite ]; propagatedBuildInputs = [ openssl ]; @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" "-DCMAKE_INSTALL_LIBDIR=lib" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DUSE_HIDAPI=1" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DNFC_LINUX=1" - ] ++ lib.optionals (stdenv.isLinux && withPcsclite) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withPcsclite) [ "-DUSE_PCSC=1" ]; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 4076e5325c930..bbbcb81797aff 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext gnutls nettle libxcrypt ] - ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ApplicationServices ]; - preBuild = lib.optionalString (stdenv.isDarwin) '' + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin) '' export MACOSX_DEPLOYMENT_TARGET=11.0 ''; diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index c7915ae676ef2..490f695fc101b 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ]; buildInputs = [ eigen zlib libpng boost guile python qtbase ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; preConfigure = '' substituteInPlace studio/src/guile/interpreter.cpp \ @@ -57,7 +57,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DGUILE_CCACHE_DIR=${placeholder "out"}/${guile.siteCcacheDir}" - ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ # warning: 'aligned_alloc' is only available on macOS 10.15 or newer "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15" ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=enum-constexpr-conversion"; }; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # No rules to install the mac app, so do it manually. mkdir -p $out/Applications cp -r studio/Studio.app $out/Applications/Studio.app diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 3d451de582a5e..3eb1dceffdef4 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-5qA6ytbqE+/05XQGxP9/4vEs9gFcuI3k7eJJYucW7fM="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optionals stdenv.isDarwin [ getconf ]; + nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]; meta = with lib; { homepage = "https://github.com/sionescu/libfixposix"; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 64928de4d4fe7..ff08294bdb295 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://blog.lxde.org/category/pcmanfm/"; license = licenses.lgpl21Plus; description = "Glib-based library for file management"; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 6f79ec1b9465c..82785a4d0fb8b 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Darwin gets misdetected as Windows without this - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__unix"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D__unix"; patches = [ (fetchpatch { diff --git a/pkgs/development/libraries/libfreeaptx/default.nix b/pkgs/development/libraries/libfreeaptx/default.nix index cfc120244521b..7a59cde8433e7 100644 --- a/pkgs/development/libraries/libfreeaptx/default.nix +++ b/pkgs/development/libraries/libfreeaptx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace '-soname' '-install_name' \ --replace 'lib$(NAME).so' 'lib$(NAME).dylib' @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxdec install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxenc install_name_tool -id $out/lib/libfreeaptx.dylib $out/lib/libfreeaptx.dylib diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index b05ea5bbe2d5c..90e6f29c9d6ed 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libnfc openssl ] ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + buildInputs = [ libnfc openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; meta = with lib; { description = "Libfreefare project aims to provide a convenient API for MIFARE card manipulations"; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 27b23f9d54bce..18dab4e340da2 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; }; - buildInputs = [ libusb-compat-0_1 ] ++ lib.optionals stdenv.isDarwin [ libobjc Security IOKit ]; + buildInputs = [ libusb-compat-0_1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Security IOKit ]; propagatedBuildInputs = [ libusb-compat-0_1 ]; - configureFlags = lib.optional (!stdenv.isDarwin) "--with-async-mode"; + configureFlags = lib.optional (!stdenv.hostPlatform.isDarwin) "--with-async-mode"; # allow async mode. from ubuntu. see: # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in "$out"/bin/*; do if isELF "$f"; then patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" diff --git a/pkgs/development/libraries/libgcrypt/1.8.nix b/pkgs/development/libraries/libgcrypt/1.8.nix index 2f0f3b4fd019e..720c376d02636 100644 --- a/pkgs/development/libraries/libgcrypt/1.8.nix +++ b/pkgs/development/libraries/libgcrypt/1.8.nix @@ -10,7 +10,7 @@ , rsyslog }: -assert enableCapabilities -> stdenv.isLinux; +assert enableCapabilities -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index ffe9f42326f8f..ad360dab55ca2 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -11,7 +11,7 @@ , rsyslog }: -assert enableCapabilities -> stdenv.isLinux; +assert enableCapabilities -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libgpg-error ] - ++ lib.optional stdenv.isDarwin gettext + ++ lib.optional stdenv.hostPlatform.isDarwin gettext ++ lib.optional enableCapabilities libcap; strictDeps = true; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # TODO: figure out why this is even necessary and why the missing dylib only crashes # random instead of every test - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $lib/lib cp src/.libs/libgcrypt.20.dylib $lib/lib ''; diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index 1f551ec9b4b1f..72f4741fd2e76 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -85,6 +85,8 @@ stdenv.mkDerivation rec { postgresql ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + postPatch = '' patchShebangs \ providers/raw_spec.py \ diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 1ef0a397c8e77..b6a64c4b7a3fb 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -79,9 +79,11 @@ stdenv.mkDerivation rec { # as mentioned in https://github.com/GNOME/libgda/blob/95eeca4b0470f347c645a27f714c62aa6e59f820/libgda/sqlite/README#L31, # which references the paper https://web.archive.org/web/20100610151539/http://lattice.umiacs.umd.edu/files/functions_tr.pdf # See also https://github.com/Homebrew/homebrew-core/blob/104f9ecd02854a82372b64d63d41356555378a52/Formula/libgda.rb - "--enable-system-sqlite=${if stdenv.isDarwin then "no" else "yes"}" + "--enable-system-sqlite=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + enableParallelBuilding = true; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 4d315b042ee99..63efe5430537f 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation (finalAttrs: { [ glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif ] - ++ lib.optional stdenv.isDarwin Carbon; + ++ lib.optional stdenv.hostPlatform.isDarwin Carbon; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so ''; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 0ae1886ebb62d..4cbaf916897c3 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; env = { + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; }; diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index e110ceb67aa8a..af0ae5f73a7d0 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -49,9 +49,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib libssh2 openssl pcre llhttp ] ++ lib.optional withGssapi krb5 - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; - propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; + propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv; doCheck = true; checkPhase = '' diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index d3e85c012cf11..c3667d664707e 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config python3 addDriverRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/GLX/Makefile.am \ --replace "-Wl,-Bsymbolic " "" substituteInPlace src/EGL/Makefile.am \ diff --git a/pkgs/development/libraries/libgourou/default.nix b/pkgs/development/libraries/libgourou/default.nix index bfd483e5d31c8..ba64735f873dd 100644 --- a/pkgs/development/libraries/libgourou/default.nix +++ b/pkgs/development/libraries/libgourou/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl3Plus; maintainers = with maintainers; [ autumnal ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 9920a54e04139..2dee6c721bc1a 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation (rec { # ./config.status[1401]: shift: (null): bad number # (See <https://hydra.nixos.org/build/2931046/nixlog/1/raw>.) # Thus, re-run it with Bash. - lib.optionalString stdenv.isSunOS '' + lib.optionalString stdenv.hostPlatform.isSunOS '' ${stdenv.shell} config.status '' # ./configure errorneous decides to use weak symbols on pkgsStatic, diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index ce0c6e14edc28..c6de97101be8e 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { glib libxml2 libsoup - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 42b9272115437..b07051358be09 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dzoneinfo_dir=${tzdata}/share/zoneinfo" (lib.mesonBool "introspection" withIntrospection) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Dc_args=-D_DARWIN_C_SOURCE" ]; diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index d25335c891572..c20a8382b5d08 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "-Dintrospection=enabled" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' NO_AT_BRIDGE=1 \ diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index a43ee0986be81..829de78a6aeb3 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/pkgs/development/libraries/libhv/default.nix b/pkgs/development/libraries/libhv/default.nix index c64c8e6e291f8..93524afabe491 100644 --- a/pkgs/development/libraries/libhv/default.nix +++ b/pkgs/development/libraries/libhv/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ curl openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ curl openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; cmakeFlags = [ "-DENABLE_UDS=ON" diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 9d5db75bb1214..f6a0555f34123 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/67204 # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 # gtk-doc docbook_xsl docbook_xml_dtd_43 # for docs - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; nativeInstallCheckInputs = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { # Musl does not support TZDIR. doInstallCheck = !stdenv.hostPlatform.isMusl; enableParallelChecking = false; - preInstallCheck = if stdenv.isDarwin then '' + preInstallCheck = if stdenv.hostPlatform.isDarwin then '' for testexe in $(find ./src/test -maxdepth 1 -type f -executable); do for lib in $(cd lib && ls *.3.dylib); do install_name_tool -change $lib $out/lib/$lib $testexe diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index b59887381f49e..9bb60501a065a 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { configureFlags = [ (lib.enableFeature enableStatic "static") (lib.enableFeature enableShared "shared") - ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; passthru = { inherit setupHooks; }; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 916d6d0ad6871..bafb2fff272fb 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index bfe9c2a24264f..90c7198757c70 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # The above patch causes the documentation to be regenerated, so the # documentation tools are required. - nativeBuildInputs = lib.optionals stdenv.isDarwin [ help2man texinfo ]; - buildInputs = [ libunistring ] ++ lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ help2man texinfo ]; + buildInputs = [ libunistring ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; depsBuildBuild = [ buildPackages.stdenv.cc ]; meta = { diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/development/libraries/libieee1284/default.nix index 4b5bef5c32a6d..c49e425231372 100644 --- a/pkgs/development/libraries/libieee1284/default.nix +++ b/pkgs/development/libraries/libieee1284/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchurl , autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }: @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix build on Musl. - (fetchpatch { - url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libieee1284/patches/musl.patch"; - sha256 = "03xivd6z7m51i5brlmzs60pjrlqyr4561qlnh182wa7rrm01x5y6"; + (fetchurl { + name = "musl.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/libieee1284/files/libieee1284-0.2.11-don-t-blindly-assume-outb_p-to-be-available.patch"; + hash = "sha256-sNu0OPBMa9GIwSu754noateF4FZC14f+8YRgYUl13KQ="; }) ]; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 8adc015120400..023dfce86bf57 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { libxml2 libusb1 ] ++ lib.optional avahiSupport avahi - ++ lib.optional stdenv.isLinux libaio - ++ lib.optionals stdenv.isDarwin [ CFNetwork CoreServices ]; + ++ lib.optional stdenv.hostPlatform.isLinux libaio + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CFNetwork CoreServices ]; cmakeFlags = [ "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d" diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 0e81f32bebf8f..88b9391d4bdbb 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { libtasn1 libusbmuxd libimobiledevice-glue - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration CoreFoundation ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 1628cb679d22c..0021f08aa5e23 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.26.1"; + version = "1.26.2"; outputs = [ "bin" "out" "dev" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - hash = "sha256-3iWKqg9HSicocDAyp1Lk87nBbj+Slg1/e1VKEOIQkyQ="; + hash = "sha256-Ly832W2U38JuXiqvt6e7u3APynrmwi4Ns98bBdTBnP8="; }; patches = [ diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 6d6d7d46576d3..c059d619ccae2 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals useGTK [ gtk2 ] - ++ lib.optional stdenv.isDarwin Carbon; + ++ lib.optional stdenv.hostPlatform.isDarwin Carbon; preBuild = '' diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix index 61ec0ce67d88e..060f6a803566a 100644 --- a/pkgs/development/libraries/libipt/default.nix +++ b/pkgs/development/libraries/libipt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.isFreeBSD freebsd.libstdthreads; + buildInputs = lib.optional stdenv.hostPlatform.isFreeBSD freebsd.libstdthreads; meta = with lib; { description = "Intel Processor Trace decoder library"; diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index f6f918c1d5227..741c8d8a74a5a 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv libintl ]; diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix index 1008037c60cc7..2a0d722c3d0fd 100644 --- a/pkgs/development/libraries/libiscsi/default.nix +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - env = lib.optionalAttrs (stdenv.is32bit || stdenv.isDarwin) { + env = lib.optionalAttrs (stdenv.hostPlatform.is32bit || stdenv.hostPlatform.isDarwin) { # iscsi-discard.c:223:57: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] NIX_CFLAGS_COMPILE = "-Wno-error=format"; }; diff --git a/pkgs/development/libraries/libjaylink/default.nix b/pkgs/development/libraries/libjaylink/default.nix deleted file mode 100644 index f313241d6d865..0000000000000 --- a/pkgs/development/libraries/libjaylink/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchFromGitLab, lib, stdenv -, autoreconfHook, pkg-config -, libusb1 -}: - -stdenv.mkDerivation rec { - pname = "libjaylink"; - version = "0.3.1"; - - src = fetchFromGitLab { - domain = "gitlab.zapb.de"; - owner = "libjaylink"; - repo = "libjaylink"; - rev = version; - sha256 = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libusb1 ]; - - postPatch = '' - patchShebangs autogen.sh - ''; - - postInstall = '' - install -Dm644 contrib/99-libjaylink.rules $out/lib/udev/rules.d/libjaylink.rules - ''; - - meta = with lib; { - homepage = "https://gitlab.zapb.de/libjaylink/libjaylink"; - description = "libjaylink is a shared library written in C to access SEGGER J-Link and compatible devices"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ felixsinger ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index b08232605ce79..222d8320026d3 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "libkrun"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-QzyNPThwbjPKANeZ4GAT9b4f8LTcjXnCiK+vzRkhM4c="; + hash = "sha256-fVL49g71eyfYyeXI4B1qRNM90fBKjHeq0I4poz1pdME="; }; outputs = [ "out" "dev" ]; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) pname version src; - hash = "sha256-33s62iOWYh1a8ETY/fbPRxvnj8dR4/UfG8mjFyWwz5k="; + inherit (finalAttrs) src; + hash = "sha256-MW4/iB2NsCj0s9Q/h/PoCIIaDfZ/iqw+FGrsJmVR0lw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index ecfa284d944e2..f0341685b5e45 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -14,18 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "libkrunfw"; - version = "4.3.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "containers"; repo = "libkrunfw"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-bfcnr7L8Hb0A+ZnZnphEsP7M8NrlIwnsNJ0nW1HnrWE="; + hash = "sha256-rxMklV/pu/muz/7m1clEs+BItXid/jMt6j/R/yHBKHI="; }; kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.44.tar.xz"; - hash = "sha256-kyGClpNJFWNv5roI4SWUhCTMJw/YlIUCwKuRCHqfzNg="; + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.52.tar.xz"; + hash = "sha256-FZGrNIOZ1KpTEhFYUlBWppyM8P4OkJNbAJXppY43tLg="; }; postPatch = '' @@ -63,6 +63,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/containers/libkrunfw"; license = with licenses; [ lgpl2Only lgpl21Only ]; maintainers = with maintainers; [ nickcao RossComputerGuy ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" ] ++ lib.optionals (!sevVariant) [ "aarch64-linux" ]; }; }) diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/development/libraries/libks/default.nix index 4122d4f576171..cc6311f024ace 100644 --- a/pkgs/development/libraries/libks/default.nix +++ b/pkgs/development/libraries/libks/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isLinux libuuid - ++ lib.optional stdenv.isDarwin libossp_uuid; + ++ lib.optional stdenv.hostPlatform.isLinux libuuid + ++ lib.optional stdenv.hostPlatform.isDarwin libossp_uuid; passthru = { tests.freeswitch = freeswitch; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Foundational support for signalwire C products"; homepage = "https://github.com/signalwire/libks"; maintainers = with lib.maintainers; [ misuzu ]; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 7dcc3b0d0cc06..060839326b157 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config which cmake ]; buildInputs = [ fftwSinglePrec libsamplerate qtbase ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-std=c++11"; diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index 449792a07e826..31da8305be7ae 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { buildFlags = [ "lib" "predict" "train" ]; installPhase = '' - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' install -D liblinear.so.${soVersion} $out/lib/liblinear.${soVersion}.dylib ln -s $out/lib/liblinear.${soVersion}.dylib $out/lib/liblinear.dylib '' else '' diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 693e1874bdf06..f0d0cc09e9c14 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "liblouis"; - version = "3.30.0"; + version = "3.31.0"; outputs = [ "out" "dev" "info" "doc" ] # configure: WARNING: cannot generate manual pages while cross compiling @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "liblouis"; repo = "liblouis"; rev = "v${finalAttrs.version}"; - hash = "sha256-VeDthGET1PcKXzXkztJCcN6yXgf51bcIyawuyUurwBs="; + hash = "sha256-0OnIvRwoL7GsuQPXJixA0DRf/tf8CNqwe9lHSahQbwk="; }; strictDeps = true; diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 6b8c2ebeaa948..f2f6497b676b9 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ Carbon AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Carbon AppKit ]; propagatedBuildInputs = [ glib ]; meta = with lib; { diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix index 24c454d4ee7e8..887c751ad46be 100644 --- a/pkgs/development/libraries/liblxi/default.nix +++ b/pkgs/development/libraries/liblxi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libtirpc avahi ] ++ [ diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index cd30b61f1c1fd..594ba202a6e1c 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "libmanette"; - version = "0.2.7"; + version = "0.2.9"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-zd1cAqExBywZxs3m8sss1X6ufay1DRTDN+/ZgLqlGlE="; + hash = "sha256-KTZr5UUvYKdMZfxk/+LXTt3U5uaCTCzvpWekO9kraI8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix deleted file mode 100644 index 7eb02d3ddd576..0000000000000 --- a/pkgs/development/libraries/libmatroska/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libebml }: - -stdenv.mkDerivation rec { - pname = "libmatroska"; - version = "1.7.1"; - - src = fetchFromGitHub { - owner = "Matroska-Org"; - repo = "libmatroska"; - rev = "release-${version}"; - sha256 = "sha256-hfu3Q1lIyMlWFWUM2Pu70Hie0rlQmua7Kq8kSIWnfHE="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ libebml ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=YES" - "-DCMAKE_INSTALL_PREFIX=" - ]; - - meta = with lib; { - description = "Library to parse Matroska files"; - homepage = "https://matroska.org/"; - license = licenses.lgpl21; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 6a4b0adfefb4f..3ed85fad550d8 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; }; - buildInputs = lib.optional stdenv.isDarwin cctools; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin cctools; configureFlags = lib.optionals disablePosixThreads [ "--disable-posix-threads" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 07fe854c777c3..053cd91be2d98 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { # 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.isLinux ./libmemcached-fix-linking-with-libpthread.patch - ++ lib.optional stdenv.isDarwin (fetchpatch { + 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"; }) diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index 128975246a8ae..6ac53d3d5d3d6 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/profanity-im/libmesode/"; license = with licenses; [ gpl3Only mit]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ devhell ]; }; } diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index f3122d8ab2105..6e3f7eee3c578 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -13,14 +13,14 @@ in stdenv.mkDerivation rec { }; buildInputs = [ texinfo ] - ++ optional stdenv.isLinux alsa-lib - ++ optional stdenv.isDarwin CoreAudio; + ++ optional stdenv.hostPlatform.isLinux alsa-lib + ++ optional stdenv.hostPlatform.isDarwin CoreAudio; propagatedBuildInputs = - optional stdenv.isLinux libpulseaudio; + optional stdenv.hostPlatform.isLinux libpulseaudio; outputs = [ "out" "dev" "man" ]; - NIX_LDFLAGS = optionalString stdenv.isLinux "-lasound"; + NIX_LDFLAGS = optionalString stdenv.hostPlatform.isLinux "-lasound"; postInstall = '' moveToOutput bin/libmikmod-config "$dev" diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index a06f3d4deca1c..10a0986936797 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { patches = [ ./install.patch ./sharedlib.patch ./darwin.patch ]; - nativeBuildInputs = [ m4 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ m4 ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' fixDarwinDylibNames $out/lib/libmilter.*.1 ''; diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index 189d2b12e5190..b270b8eb56689 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { "-DLIBMINC_USE_SYSTEM_NIFTI=ON" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # -j1: see https://github.com/BIC-MNI/libminc/issues/110 checkPhase = '' ctest -j1 --output-on-failure diff --git a/pkgs/development/libraries/libmongocrypt/default.nix b/pkgs/development/libraries/libmongocrypt/default.nix index f45d41fed6283..0c887527307fb 100644 --- a/pkgs/development/libraries/libmongocrypt/default.nix +++ b/pkgs/development/libraries/libmongocrypt/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ mongoc openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index baada92d43405..13fce963738fb 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Otherwise clang fails with 'duplicate symbol ___sputc' - buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89"; + buildFlags = lib.optional stdenv.hostPlatform.isDarwin "CFLAGS=-std=gnu89"; meta = { homepage = "http://libmpeg2.sourceforge.net/"; diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index ea61234333b81..320873c9792ce 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { configurePlatforms = [ "build" "host" ]; - makeFlags = lib.optionals (stdenv.isLinux && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + makeFlags = lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "MTP_HOTPLUG=${buildPackages.libmtp}/bin/mtp-hotplug" ]; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index fb4207060033f..21e648e5a9983 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.4.0"; + version = "9.0.0"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - hash = "sha256-VAs9O00g7Pn5AL9Vu6hwcY5QZy9U+izbEkrfOFeWzos="; + hash = "sha256-7XEbT3sf/fyadgSOGVr/KH4tFd3evgvKhRsJ4UFCKzA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index 49e89b97344bb..13128e81231ef 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "CC:=$(CC)" ]; - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; postFixup = '' chmod +x $out/lib/* diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index 88bc909ea0e6f..8fb983333c1cb 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "sysconfdir=/etc" ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBNFC_DRIVER_PN532_I2C=OFF" "-DLIBNFC_DRIVER_PN532_SPI=OFF" ]; diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index eb6a057dcae35..0270050cd0012 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -7,15 +7,17 @@ , withNgshared ? true , libXaw , libXext +, llvmPackages +, readline }: stdenv.mkDerivation rec { pname = "${lib.optionalString withNgshared "lib"}ngspice"; - version = "42"; + version = "43"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - hash = "sha256-c3/jhGqyMzolDfrfHtbr4YYK8dil/154A8dyzEJW5Qo="; + hash = "sha256-FN1qbwhTHyBRwTrmN5CkVwi9Q/PneIamqEiYwpexNpk="; }; nativeBuildInputs = [ @@ -25,9 +27,12 @@ stdenv.mkDerivation rec { buildInputs = [ fftw + readline ] ++ lib.optionals (!withNgshared) [ libXaw libXext + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + llvmPackages.openmp ]; configureFlags = lib.optionals withNgshared [ diff --git a/pkgs/development/libraries/libodb-sqlite/default.nix b/pkgs/development/libraries/libodb-sqlite/default.nix index 9ac1153deee2a..547ff807d441a 100644 --- a/pkgs/development/libraries/libodb-sqlite/default.nix +++ b/pkgs/development/libraries/libodb-sqlite/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { pname = "libodb-sqlite"; - version = "2.5.0-b.25"; + version = "2.5.0-b.27"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz"; - hash = "sha256-Ko40WZErbL77B4eoJ5FFko/gTFYhADGlBzxPLuy8Wqc="; + hash = "sha256-jpxtY/VMkh88IzqGYgedu5TZGVIbPpy/FZNvUaOMf+w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libodb/default.nix b/pkgs/development/libraries/libodb/default.nix index c016fc657d6f9..b83e4d5c68162 100644 --- a/pkgs/development/libraries/libodb/default.nix +++ b/pkgs/development/libraries/libodb/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "libodb"; - version = "2.5.0-b.25"; + version = "2.5.0-b.27"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/beta/odb/libodb-${version}.tar.gz"; - hash = "sha256-G634kVRbgwfBmIh8QqUclr/xvY3o0ouVmp/jxJrHzcs="; + hash = "sha256-04Et/wHYsWvJPLlcL0J2iOPV2SBFC6J32EleGw38K2Q="; }; nativeBuildInputs = [ build2 ]; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index b7dddd16672c4..ec5f6d8924d71 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ]; - buildInputs = [ opensp libxml2 curl ] ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ opensp libxml2 curl ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; meta = { description = "Opensource implementation of the Open Financial eXchange specification"; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 4b112b70e7ad3..2abbaa66f3478 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix" # errors - configureFlags = lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--build=x86_64"; + configureFlags = lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--build=x86_64"; # fixes a cast in inline asm: easier than patching - buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions"; + buildFlags = lib.optional stdenv.hostPlatform.isDarwin "CFLAGS=-fheinous-gnu-extensions"; meta = with lib; { description = "Library of simple functions that are optimized for various CPUs"; diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix index 236b3026068ff..2d8cec21b1898 100644 --- a/pkgs/development/libraries/libopenshot-audio/default.nix +++ b/pkgs/development/libraries/libopenshot-audio/default.nix @@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ (if stdenv.isDarwin then [ + ] ++ (if stdenv.hostPlatform.isDarwin then [ Accelerate AGL Cocoa diff --git a/pkgs/development/libraries/libopenshot/default.nix b/pkgs/development/libraries/libopenshot/default.nix index 0d83fa659e53d..231b0cd109aa3 100644 --- a/pkgs/development/libraries/libopenshot/default.nix +++ b/pkgs/development/libraries/libopenshot/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9X2UIRDD+1kNLbV8AnnPabdO2M0OfTDxQ7xyZtsE10k="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Darwin requires both Magick++ and MagickCore for a successful linkage ./0001-link-magickcore.diff ]; @@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtmultimedia zeromq - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index a283df1bbaea6..267829d2aee42 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "ac_cv_va_copy=yes" - ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; patches = [ ./shtool.patch ]; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 7256e49226057..bfc2e3af7b8e5 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -30,18 +30,18 @@ stdenv.mkDerivation rec { hash = "sha256-7RmgOD+tcuOtQ1/SOdfNgNZJFrhyaVUBWdIORxYOvl8="; }; - buildInputs = lib.optionals stdenv.isLinux [ libnl ] + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libnl ] ++ lib.optionals withRemote [ libxcrypt ]; nativeBuildInputs = [ flex bison ] - ++ lib.optionals stdenv.isLinux [ pkg-config ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] ++ lib.optionals withBluez [ bluez.dev ]; # We need to force the autodetection because detection doesn't # work in pure build environments. configureFlags = [ - "--with-pcap=${if stdenv.isLinux then "linux" else "bpf"}" - ] ++ lib.optionals stdenv.isDarwin [ + "--with-pcap=${if stdenv.hostPlatform.isLinux then "linux" else "bpf"}" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-universal" ] ++ lib.optionals withRemote [ "--enable-remote" diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index 298873033e0ea..616b5de5deb6e 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "8.13.43"; + version = "8.13.45"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; rev = "v${finalAttrs.version}"; - hash = "sha256-EJjtPqSk2p+J4f6tiaGEnik5LrrqGpGa0XfcnLLp9vg="; + hash = "sha256-oR6AvhB99LBNCtbGsCMghDGriTEzqVSEKfzdQyj+g6E="; }; patches = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { boost icu protobuf - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix index 3aeb79b46af87..885c9044332c2 100644 --- a/pkgs/development/libraries/libpipeline/default.nix +++ b/pkgs/development/libraries/libpipeline/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-uLRRlJiQIqeewTF/ZKKnWxVRsqVb6gb2dwTLKi5GkLA="; }; - patches = lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./fix-on-osx.patch ]; # necessary to build on FreeBSD native pending inclusion of # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0 diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 0ffa7b2828f35..159037bec832c 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { (lib.mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead (lib.mesonEnable "vk-proc-addr" vulkanSupport) (lib.mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml") - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind` ]; diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index c6113cd448221..994cf0fef05ce 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-V0YTW7+YbyW6Fh9b1IntIxCXabPUJj7QoDvYYyc/Y6k="; + sha256 = "sha256-HUog7Tlm4jiqYXk22dziumCA/68c35+OwnTNYu9mV5E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 11e3fb31604f7..57b75a949b7d6 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-alygZSOSotfJ2yrltAIQhDwLvAgcvUEIJasAzFnxSmw="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" - + lib.optionalString stdenv.isFreeBSD '' + + lib.optionalString stdenv.hostPlatform.isFreeBSD '' sed -i 1i'int feenableexcept(int __mask);' contrib/libtests/pngvalid.c ''; diff --git a/pkgs/development/libraries/libpqxx/6.nix b/pkgs/development/libraries/libpqxx/6.nix deleted file mode 100644 index 612a6c2044821..0000000000000 --- a/pkgs/development/libraries/libpqxx/6.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, doxygen, xmlto, python3, gnused }: - -stdenv.mkDerivation rec { - pname = "libpqxx"; - version = "6.4.8"; - - src = fetchFromGitHub { - owner = "jtv"; - repo = pname; - rev = version; - hash = "sha256-ybnW9ip1QVadmbYLP+gvo49k9ExHfnsOhSnI6NjsAQk="; - }; - - nativeBuildInputs = [ gnused python3 ]; - buildInputs = [ postgresql doxygen xmlto ]; - - preConfigure = '' - patchShebangs . - ''; - - configureFlags = [ "--enable-shared" ]; - - meta = { - description = "C++ library to access PostgreSQL databases"; - homepage = "https://pqxx.org/development/libpqxx/"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index f1b2fbbab4fbe..1659a55cb4ef9 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0="; }; - # bin/psl-make-dafsa brings a large runtime closure through python3 - outputs = lib.optional (!stdenv.hostPlatform.isStatic) "bin" ++ [ "out" "dev" ]; + outputs = [ "out" "dev" ] + # bin/psl-make-dafsa brings a large runtime closure through python3 + ++ lib.optional (!stdenv.hostPlatform.isStatic) "bin"; nativeBuildInputs = [ autoreconfHook @@ -77,7 +78,7 @@ stdenv.mkDerivation rec { the domain in a user interface or sorting domain lists by site. ''; homepage = "https://rockdaboot.github.io/libpsl/"; - changelog = "https://raw.githubusercontent.com/rockdaboot/${pname}/${pname}-${version}/NEWS"; + changelog = "https://raw.githubusercontent.com/rockdaboot/libpsl/libpsl-${version}/NEWS"; license = licenses.mit; maintainers = [ maintainers.c0bw3b ]; mainProgram = "psl"; diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix index 2dabe89bc50b5..f083ef0414570 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "libpulsar"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "apache"; repo = "pulsar-client-cpp"; rev = "v${version}"; - hash = "sha256-BSDkF0MAc54N59t7ozMLof0of4sURL3qiksLZhb+6I8="; + hash = "sha256-P1LhUH7V3EtWBXwPHQdN11mCjuyUyVdrtZsUItvC8xU="; }; nativeBuildInputs = [ cmake pkg-config ] diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index fd10ccc5375c1..ec2234bb9a284 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase libGLU ] - ++ lib.optional stdenv.isDarwin AGL; + ++ lib.optional stdenv.hostPlatform.isDarwin AGL; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/libraqm/default.nix b/pkgs/development/libraries/libraqm/default.nix index 98769f2e374a0..9899c70b8089e 100644 --- a/pkgs/development/libraries/libraqm/default.nix +++ b/pkgs/development/libraries/libraqm/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libraqm"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "HOST-Oman"; repo = "libraqm"; rev = "v${version}"; - sha256 = "sha256-H9W+7Mob3o5ctxfp5UhIxatSdXqqvkpyEibJx9TO7a8="; + sha256 = "sha256-KhGE66GS5rIieVXJUFA3jSsXEpbdnzN0VIAF/zOelU4="; }; buildInputs = [ freetype harfbuzz fribidi ]; diff --git a/pkgs/development/libraries/librasterlite2/default.nix b/pkgs/development/libraries/librasterlite2/default.nix index de9fa02d44db1..0286d944691f0 100644 --- a/pkgs/development/libraries/librasterlite2/default.nix +++ b/pkgs/development/libraries/librasterlite2/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libspatialite libtiff libwebp - libxml2 + (libxml2.override { enableHttp = true; }) lz4 minizip openjpeg diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index fa419830f3c7c..ebdf2ec4d8a63 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration ]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 0e0bfc51cb421..5dc620fd5c01d 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -23,7 +23,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.55.1"; + version = "2.56.1"; outputs = [ "out" "dev" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MNHvfWk58WRtu6Xysfvn+lx8J1+HlNw5AmmgaTAzuok="; + sha256 = "sha256-1ICSJqr5WRePLIHsD3T2L0Nxdn1LWaHqHDJrfTIRl88="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index 6eb06a1ebe675..aff1fc1a1d686 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp ${printVersion} build-aux/git-version-gen ''; - preConfigure = lib.optionalString (stdenv.isDarwin && enablePython) '' + preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && enablePython) '' # prevent configure picking up stack_size from distutils.sysconfig export PYTHON_EXTRA_LDFLAGS=" " ''; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optional (!enablePython) "--disable-python"; # FAIL: alive.test - doCheck = !stdenv.isLinux; + doCheck = !stdenv.hostPlatform.isLinux; # the "xmlsuite" test requires the libxml2 c library as well as the python module nativeCheckInputs = lib.optionals enablePython [ libxml2 libxml2.dev ]; diff --git a/pkgs/development/libraries/libremidi/default.nix b/pkgs/development/libraries/libremidi/default.nix index 48014bea07416..6717b97203b7a 100644 --- a/pkgs/development/libraries/libremidi/default.nix +++ b/pkgs/development/libraries/libremidi/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio CoreFoundation CoreMIDI diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix deleted file mode 100644 index 84f610ce24746..0000000000000 --- a/pkgs/development/libraries/librep/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoreconfHook -, gdbm -, gmp -, libffi -, pkg-config -, readline -, texinfo -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "librep"; - version = "0.92.7"; - - src = fetchurl { - url = "https://download.tuxfamily.org/librep/librep_${finalAttrs.version}.tar.xz"; - hash = "sha256-SKGWeax8BTCollfeGP/knFdZpf9w/IRJKLDl0AOVrK4="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - texinfo - ]; - - buildInputs = [ - gdbm - gmp - libffi - readline - ]; - - strictDeps = true; - - # ensure libsystem/ctype functions don't get duplicated when using clang - configureFlags = lib.optionals stdenv.isDarwin [ "CFLAGS=-std=gnu89" ]; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://sawfish.tuxfamily.org/"; - description = "Fast, lightweight, and versatile Lisp environment"; - longDescription = '' - librep is a Lisp system for UNIX, comprising an interpreter, a byte-code - compiler, and a virtual machine. It can serve as an application extension - language but is also suitable for standalone scripts. - ''; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.AndersonTorres ]; - platforms = lib.platforms.unix; - }; -}) -# TODO: investigate fetchFromGithub diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 9629c0e961a90..f6cf4a6e62c87 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -8,7 +8,7 @@ }: let - ldLibPathEnvName = if stdenv.isDarwin + ldLibPathEnvName = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; diff --git a/pkgs/development/libraries/librsb/default.nix b/pkgs/development/libraries/librsb/default.nix index d9dc209a7139e..4a995cbbe89db 100644 --- a/pkgs/development/libraries/librsb/default.nix +++ b/pkgs/development/libraries/librsb/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ KarlJoad ]; platforms = platforms.all; # ./rsb_common.h:56:10: fatal error: 'omp.h' file not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index e8426b97cec50..932d0f19a7d2b 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { pango libintl vala # for share/vala/Makefile.vapigen - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation libobjc @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature withIntrospection "vala") "--enable-always-build-tests" - ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-Bsymbolic" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"; doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { # librsvg only links Foundation, but it also requiers libobjc. The Framework.tbd in the 11.0 SDK # reexports libobjc, but the one in the 10.12 SDK does not, so link it manually. - env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { NIX_LDFLAGS = "-lobjc"; }; diff --git a/pkgs/development/libraries/librtprocess/default.nix b/pkgs/development/libraries/librtprocess/default.nix index dabb5e62e45de..a8366f8a92df1 100644 --- a/pkgs/development/libraries/librtprocess/default.nix +++ b/pkgs/development/libraries/librtprocess/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; meta = with lib; { description = "Highly optimized library for processing RAW images"; diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 45cd9d091dd0a..ec4da5a34784e 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -14,13 +14,13 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ] - ++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; + ++ optionals stdenv.hostPlatform.isDarwin [ ApplicationServices CoreServices ]; configureFlags = [ "--disable-fftw" ]; outputs = [ "dev" "out" ]; - postConfigure = optionalString stdenv.isDarwin '' + postConfigure = optionalString stdenv.hostPlatform.isDarwin '' # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle NIX_CFLAGS_COMPILE+=" -I${Carbon}/Library/Frameworks/Carbon.framework/Headers" diff --git a/pkgs/development/libraries/libsbsms/common.nix b/pkgs/development/libraries/libsbsms/common.nix index f206f68de42a4..7215c23667b8b 100644 --- a/pkgs/development/libraries/libsbsms/common.nix +++ b/pkgs/development/libraries/libsbsms/common.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Fix buidling on platforms other than x86 (substituteAll { src = ./configure.patch; - msse = lib.optionalString stdenv.isx86_64 "-msse"; + msse = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse"; }) ]; diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index 6adc2124a3ab2..4f8f0deba9021 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-QWWqC10bENemG5FYEog87tT7IxDaBJUDqu6j/sO3sYE="; }; - buildFlags = lib.optional stdenv.isDarwin "LDFLAGS= LDFLAGS_EXTRA= CFLAGS_EXTRA="; + buildFlags = lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS= LDFLAGS_EXTRA= CFLAGS_EXTRA="; installFlags = [ "PREFIX=$(out)" ]; - installTargets = lib.optional stdenv.isDarwin "install-osx"; + installTargets = lib.optional stdenv.hostPlatform.isDarwin "install-osx"; doCheck = true; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index d0b1515d0bad9..8ae0754a0abd7 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { (lib.mesonBool "gtk_doc" withIntrospection) ]; - doCheck = stdenv.isLinux && withIntrospection; + doCheck = stdenv.hostPlatform.isLinux && withIntrospection; separateDebugInfo = true; postPatch = '' diff --git a/pkgs/development/libraries/libsegfault/default.nix b/pkgs/development/libraries/libsegfault/default.nix index 58896c3e2bc27..e9f014381c5ba 100644 --- a/pkgs/development/libraries/libsegfault/default.nix +++ b/pkgs/development/libraries/libsegfault/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "vKtY6ZEkyK2K+BzJCSo30f9MpERpPlUnarFIlvJ1Giw="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin) "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED=1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin) "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED=1"; nativeBuildInputs = [ meson diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix index 38f7d1c5d9340..9c61d6a4079e4 100644 --- a/pkgs/development/libraries/libserdes/default.nix +++ b/pkgs/development/libraries/libserdes/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libserdes"; - version = "7.7.0"; + version = "7.7.1"; src = fetchFromGitHub { owner = "confluentinc"; diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index 79f46ffca1f83..0b3314d9b0e14 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional stdenv.isLinux udev - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isLinux udev + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; meta = with lib; { description = "Cross-platform shared library for serial port access"; diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index 17783999b53c2..f449c5e1c1b74 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { "-Ddemos=true" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index 8256f0525bbc6..88b1991c5473a 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, libtool, gettext, pkg-config, vala, gnome-common, gobject-introspection, - libgee, json-glib, skk-dicts, libxkbcommon }: + libgee, json-glib, skkDictionaries, libxkbcommon }: stdenv.mkDerivation rec { pname = "libskk"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5"; }; - buildInputs = [ skk-dicts libxkbcommon ]; + buildInputs = [ libxkbcommon ]; nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkg-config ]; propagatedBuildInputs = [ libgee json-glib ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { preInstall = '' dictDir=$out/share/skk mkdir -p $dictDir - ln -s ${skk-dicts}/share/SKK-JISYO.L $dictDir/ + ln -s ${skkDictionaries.l}/share/skk/SKK-JISYO.L $dictDir/ ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index a1ffdae6bb339..ad3ab58b0e13f 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; buildInputs = [ flac lame libmpg123 libogg libopus libvorbis ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon AudioToolbox ]; enableParallelBuilding = true; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle - preConfigure = lib.optionalString stdenv.isDarwin + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers" ''; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 044450c1825de..a9de633d46d7e 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ]; - separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; + separateDebugInfo = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "musl"; enableParallelBuilding = true; hardeningDisable = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "stackprotector"; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index a0f5cd610e34e..df40a06339882 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -10,7 +10,7 @@ , zchunk , zstd , expat -, withRpm ? !stdenv.isDarwin +, withRpm ? !stdenv.hostPlatform.isDarwin , rpm , db , withConda ? true diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index b7de8bf04e888..c4b5016282723 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libjack2 ] - ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ] - ++ lib.optional stdenv.isDarwin AudioUnit; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib ] + ++ lib.optional stdenv.hostPlatform.isDarwin AudioUnit; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DBUILD_TESTS=OFF" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-strict-prototypes"; meta = with lib; { description = "Cross platform audio input and output"; diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 4d5f30cf0b6e8..b0588373dee3c 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { glib.out brotli libnghttp2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libsysprof-capture ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { (lib.mesonEnable "docs" withIntrospection) (lib.mesonEnable "introspection" withIntrospection) - (lib.mesonEnable "sysprof" stdenv.isLinux) + (lib.mesonEnable "sysprof" stdenv.hostPlatform.isLinux) (lib.mesonEnable "vapi" withIntrospection) ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index e92c59bc2f2c0..a88cd93553269 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libpsl glib.out brotli - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libsysprof-capture ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Dsysprof=disabled" ]; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix deleted file mode 100644 index 0f9d958ab8c95..0000000000000 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation (finalAttrs: { - pname = "libspatialindex"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "libspatialindex"; - repo = "libspatialindex"; - rev = finalAttrs.version; - hash = "sha256-hZyAXz1ddRStjZeqDf4lYkV/g0JLqLy7+GrSUh75k20="; - }; - - postPatch = '' - patchShebangs test/ - ''; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) - - # The cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR - # correctly (setting it to an absolute path causes include files to go to - # $out/$out/include, because the absolute path is interpreted with root - # at $out). - # See: https://github.com/NixOS/nixpkgs/issues/144170 - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - doCheck = true; - - meta = with lib; { - description = "Extensible spatial index library in C++"; - homepage = "https://libspatialindex.org"; - license = licenses.mit; - maintainers = teams.geospatial.members; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 98d184ae703c1..8eeec2dbfe0c1 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { proj sqlite zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; enableParallelBuilding = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/mod_spatialite.{so,dylib} ''; diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index f583900e35d95..c14117305f04b 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libspiro"; - version = "20221101"; + version = "20240903"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256-/9UCrdq69RO22593qiA8pZ4qfY9UVGqlGYB9zatsOgw="; + sha256 = "sha256-psEF1SWkire6ngEUcMU0xnGYaT8ktqDCBlBckToGUMg="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/development/libraries/libspnav/default.nix b/pkgs/development/libraries/libspnav/default.nix index d67b12a726b47..6a60bdb7f0905 100644 --- a/pkgs/development/libraries/libspnav/default.nix +++ b/pkgs/development/libraries/libspnav/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "098h1jhlj87axpza5zgy58prp0zn94wyrbch6x0s7q4mzh7dc8ba"; }; - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libX11 ]; patches = [ diff --git a/pkgs/development/libraries/libspng/default.nix b/pkgs/development/libraries/libspng/default.nix index 5377c75b18424..98e4aa0641ce9 100644 --- a/pkgs/development/libraries/libspng/default.nix +++ b/pkgs/development/libraries/libspng/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-BiRuPQEKVJYYgfUsglIuxrBoJBFiQ0ygQmAFrVvCz4Q="; }; - doCheck = true; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; mesonBuildType = "release"; @@ -32,13 +32,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + strictDeps = true; + nativeCheckInputs = [ cmake - libpng ]; buildInputs = [ zlib + libpng ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index abda8137f5c8f..9b45ffb58ce7b 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-VoiqSmhVR9cXSoo3PqnY7pJ+dm48wwK97jRSPCxdbBE="; }; - buildInputs = lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin IOKit; meta = with lib; { homepage = "https://www.i-scream.org/libstatgrab/"; diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index 9d58109fa8e32..1fd5141c9084f 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; installPhase = let libSuff = stdenv.hostPlatform.extensions.sharedLibrary; soVersion = "3"; - libName = if stdenv.isDarwin then "libsvm.${soVersion}${libSuff}" else "libsvm${libSuff}.${soVersion}"; + libName = if stdenv.hostPlatform.isDarwin then "libsvm.${soVersion}${libSuff}" else "libsvm${libSuff}.${soVersion}"; in '' runHook preInstall diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index 83bb0708110b7..6a9f3d4a50a78 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; meta = with lib; { description = "C library for manipulating POSIX tar files"; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 3c630bac630de..069d8706e74df 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ texinfo perl ]; doCheck = true; - preCheck = if stdenv.isDarwin then + preCheck = if stdenv.hostPlatform.isDarwin then "export DYLD_LIBRARY_PATH=`pwd`/lib/.libs" else null; diff --git a/pkgs/development/libraries/libticalcs2/default.nix b/pkgs/development/libraries/libticalcs2/default.nix index 2488a5bbb0b4a..551bfed8fc8b2 100644 --- a/pkgs/development/libraries/libticalcs2/default.nix +++ b/pkgs/development/libraries/libticalcs2/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { libticables2 xz bzip2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ acl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc ]; diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index cd198dac309d1..149f5e65fc418 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libkate pango cairo ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; meta = { homepage = "https://code.google.com/archive/p/libtiger/"; diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 2a32900040d8b..568d1a22c6a80 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin # upgrades to a newer SDK. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_IPHONE=0"; patches = [ (fetchpatch { diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 2501bc827faed..56225f96de8c4 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { makefile = "makefile.shared"; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-DTARGET_OS_IPHONE=0"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index e48748308bb2c..1a3a89a2d71d1 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { done ''; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-Wno-error=gnu-folding-constant" ]); diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 1b54ea948dd0c..12f210593107e 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - doCheck = !stdenv.isi686; # tests fail on i686 + doCheck = !stdenv.hostPlatform.isi686; # tests fail on i686 meta = with lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index a798977b1f413..77197986343f6 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }: let - backend = if stdenv.isDarwin then "darwin" else "unix"; + backend = if stdenv.hostPlatform.isDarwin then "darwin" else "unix"; in stdenv.mkDerivation rec { @@ -15,20 +15,20 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - propagatedBuildInputs = lib.optional stdenv.isLinux gtk3 - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux gtk3 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt ''; installPhase = '' mkdir -p $out/{include,lib} mkdir -p $out/lib/pkgconfig - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mv ./out/libui.so.0 $out/lib/ ln -s $out/lib/libui.so.0 $out/lib/libui.so - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mv ./out/libui.A.dylib $out/lib/ ln -s $out/lib/libui.A.dylib $out/lib/libui.dylib '' + '' @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { --subst-var-by out $out \ --subst-var-by version "${version}" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libui.A.dylib $out/lib/libui.A.dylib ''; diff --git a/pkgs/development/libraries/libuiohook/default.nix b/pkgs/development/libraries/libuiohook/default.nix index 4fe42dad6c898..7d58b78149584 100644 --- a/pkgs/development/libraries/libuiohook/default.nix +++ b/pkgs/development/libraries/libuiohook/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = - if stdenv.isDarwin then [ AppKit ApplicationServices Carbon ] + if stdenv.hostPlatform.isDarwin then [ AppKit ApplicationServices Carbon ] else [ libX11 libxkbcommon diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index d73bed773dffc..c53196afe4201 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hash = "sha256-Mo76BOqZbdOJFrEkeozxdqwpuFyvkhdONNMZmN5BdNI="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "-flto" "" \ --replace "AppleClang" "Clang" diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index f0d153c700800..ff438f749fd8a 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20240524"; + version = "20240910"; src = fetchFromGitHub { owner = "fontforge"; - repo = pname; + repo = "libuninameslist"; rev = version; - sha256 = "sha256-LANwM0fhCsscXAdI/qGOmUWDzAhe3g9w3J68g4szDZQ="; + hash = "sha256-Pi30c3To57AzY59i39JVG2IUkGnq7CEAQkqJ1f5AZhw="; }; nativeBuildInputs = [ @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/fontforge/libuninameslist/"; + changelog = "https://github.com/fontforge/libuninameslist/blob/${version}/ChangeLog"; description = "Library of Unicode names and annotation data"; license = licenses.bsd3; maintainers = with maintainers; [ erictapen ]; diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 13ffffe6aa741..abf5f0df25589 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { ]; strictDeps = true; - propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; - buildInputs = lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 1f7074866d589..6f491a5c527f0 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,13 +1,16 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, autoreconfHook, xz, buildPackages }: +{ stdenv, lib, fetchpatch, fetchFromGitHub, autoreconfHook, buildPackages +, xz +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libunwind"; version = "1.8.1"; src = fetchFromGitHub { owner = "libunwind"; repo = "libunwind"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rCFBHs6rCSnp5FEwbUR5veNNTqSQpFblAv8ebSPX0qE="; }; @@ -50,12 +53,18 @@ stdenv.mkDerivation rec { doCheck = false; # fails + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + meta = with lib; { homepage = "https://www.nongnu.org/libunwind"; description = "Portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; + pkgConfigModules = [ "libunwind" "libunwind-coredump" "libunwind-generic" "libunwind-ptrace" "libunwind-setjmp" ]; # https://github.com/libunwind/libunwind#libunwind platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd" "x86_64-linux" "x86_64-solaris" ]; license = licenses.mit; }; -} +}) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index bd8561e0e8a3f..f03ae09b2895e 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , doxygen , pkg-config -, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, enableUdev ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic , udev , libobjc , IOKit @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withDocs [ doxygen ]; propagatedBuildInputs = lib.optional enableUdev udev ++ - lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; dontDisableStatic = withStatic; diff --git a/pkgs/development/libraries/libusbsio/default.nix b/pkgs/development/libraries/libusbsio/default.nix index 090683898a16d..21c7e3f1396ec 100644 --- a/pkgs/development/libraries/libusbsio/default.nix +++ b/pkgs/development/libraries/libusbsio/default.nix @@ -28,17 +28,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ libusb1 - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit - ]) ++ lib.optionals stdenv.isLinux [ + ]) ++ lib.optionals stdenv.hostPlatform.isLinux [ systemdMinimal # libudev ]; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index a4254921e179d..8d1d36344d7e1 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { "tcp_bind6_error_addrinuse" "tcp_bind_error_addrinuse_listen" # https://github.com/libuv/libuv/pull/4075#issuecomment-1935572237 "thread_priority" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Sometimes: timeout (no output), failed uv_listen. Someone # should report these failures to libuv team. There tests should # be much more robust. @@ -71,10 +71,10 @@ stdenv.mkDerivation (finalAttrs: { "fs_event_watch_dir_recursive" "fs_event_watch_file" "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path" "process_priority" "udp_create_early_bad_bind" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # fail on macos < 10.15 (starting in libuv 1.47.0) "fs_write_alotof_bufs_with_offset" "fs_write_multiple_bufs" "fs_read_bufs" - ] ++ lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # I observe this test failing with some regularity on ARMv7: # https://github.com/libuv/libuv/issues/1871 "shutdown_close_pipe" diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix index 1a9c7309e5424..15e4d0a9e8017 100644 --- a/pkgs/development/libraries/libva/1.nix +++ b/pkgs/development/libraries/libva/1.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # TODO: share libs between minimal and !minimal - perhaps just symlink them # Add FHS paths for non-NixOS applications. - configureFlags = lib.optionals stdenv.isLinux [ "--with-drivers-path=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] + configureFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--with-drivers-path=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 8a41c60b169f6..f88404682b44c 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libX11 libXext libXfixes wayland libffi libGL ]; - mesonFlags = lib.optionals stdenv.isLinux [ + mesonFlags = lib.optionals stdenv.hostPlatform.isLinux [ # Add FHS and Debian paths for non-NixOS applications "-Ddriverdir=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/i386-linux-gnu/dri" ]; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 8c1c3b7c5e9cd..75c61995071e2 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xorg.libX11 ]; - mesonFlags = lib.optionals stdenv.isLinux [ "-Dmoduledir=${mesa.driverLink}/lib/vdpau" ]; + mesonFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-Dmoduledir=${mesa.driverLink}/lib/vdpau" ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lX11"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lX11"; meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/VDPAU/"; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index b01a9a788bad7..c750d2a255513 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = [ libvirt libxml2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap_ng ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 56b0b0a390898..f6e5807f69581 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -72,14 +72,14 @@ , enableIscsi ? false , openiscsi , libiscsi -, enableXen ? stdenv.isLinux && stdenv.isx86_64 +, enableXen ? stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 , xen -, enableZfs ? stdenv.isLinux +, enableZfs ? stdenv.hostPlatform.isLinux , zfs }: let - inherit (stdenv) isDarwin isLinux isx86_64; + inherit (stdenv.hostPlatform) isDarwin isLinux isx86_64; binPath = lib.makeBinPath ([ dnsmasq ] ++ lib.optionals isLinux [ diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index e6a425660cc8d..4b66ef5b4e1d1 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { doCheck = true; + enableParallelBuilding = true; + meta = with lib; { description = "Library providing ability to interpret and import visio diagrams into various applications"; homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libvisio"; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix deleted file mode 100644 index b350592147bca..0000000000000 --- a/pkgs/development/libraries/libvmi/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, - fetchFromGitHub, - autoreconfHook, - bison, - flex, - glib, - pkg-config, - json_c, - xen, - libvirt, - xenSupport ? true }: - -stdenv.mkDerivation rec { - pname = "libvmi"; - version = "0.12.0"; - libVersion = "0.0.12"; - - src = fetchFromGitHub { - owner = "libvmi"; - repo = "libvmi"; - rev = "v${version}"; - sha256 = "0wbi2nasb1gbci6cq23g6kq7i10rwi1y7r44rl03icr5prqjpdyv"; - }; - - buildInputs = [ glib libvirt json_c ] ++ (lib.optional xenSupport xen); - nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; - - configureFlags = lib.optional (!xenSupport) "--disable-xen"; - - # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here - postFixup = lib.optionalString xenSupport '' - libvmi="$out/lib/libvmi.so.${libVersion}" - oldrpath=$(patchelf --print-rpath "$libvmi") - patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen ]}" "$libvmi" - ''; - - meta = with lib; { - homepage = "https://libvmi.com/"; - description = "C library for virtual machine introspection"; - longDescription = '' - LibVMI is a C library with Python bindings that makes it easy to monitor the low-level - details of a running virtual machine by viewing its memory, trapping on hardware events, - and accessing the vCPU registers. - ''; - license = with licenses; [ gpl3 lgpl3 ]; - platforms = platforms.linux; - maintainers = [ ]; - broken = true; - }; -} diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index a6c78c3262fcd..e6b5bf4acb5b6 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libpng ] ++ lib.optionals withSystemd [ systemd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon ]; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index ef0929a841d81..4f6c91d65c716 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -43,7 +43,7 @@ }: let - inherit (stdenv) is64bit isMips isDarwin isCygwin; + inherit (stdenv.hostPlatform) is64bit isMips isDarwin isCygwin; inherit (lib) enableFeature optional optionals; # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) @@ -66,8 +66,8 @@ let kernel = # Build system doesn't understand BSD, so pretend to be Linux. - /**/ if stdenv.isBSD then "linux" - else if stdenv.isDarwin then "darwin${darwinVersion}" + /**/ if stdenv.hostPlatform.isBSD then "linux" + else if stdenv.hostPlatform.isDarwin then "darwin${darwinVersion}" else stdenv.hostPlatform.parsed.kernel.name; isGeneric = @@ -76,7 +76,7 @@ let || stdenv.hostPlatform.isRiscV; target = - /**/ if (stdenv.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) then + /**/ if (stdenv.hostPlatform.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) then (if isGeneric then "generic-gnu" else "${cpu}-${kernel}-gcc") else null; in diff --git a/pkgs/development/libraries/libwnck/2.nix b/pkgs/development/libraries/libwnck/2.nix index bc5a89dc120dc..890b1a7651a8b 100644 --- a/pkgs/development/libraries/libwnck/2.nix +++ b/pkgs/development/libraries/libwnck/2.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ johnazoidberg ]; # ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found # #include <gdk/gdkx.h> - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index 1abefa8f43749..69b4ec4a32cad 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html makeFlags = [ "DESTDIR=$(out)" - ] ++ lib.optional (!stdenv.isi686) "BACKEND=x86emu"; + ] ++ lib.optional (!stdenv.hostPlatform.isi686) "BACKEND=x86emu"; preBuild = '' sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@' diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index c4df61bd22bbe..4ace07d2cf0e4 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "/usr" "/" ''; - buildFlags = [ "shared" ]; + buildFlags = [ "shared" "CC=${stdenv.cc.targetPrefix}cc" ]; enableParallelBuilding = true; installFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 6994398eaa90d..9a0ebd6d59da1 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -14,7 +14,7 @@ # To enable the "interactive-wayland" subcommand of xkbcli. This is the # wayland equivalent of `xev` on X11. , xorg -, withWaylandTools ? stdenv.isLinux +, withWaylandTools ? stdenv.hostPlatform.isLinux , wayland , wayland-protocols , wayland-scanner diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 3fa295279f0cd..b6a217d9fbf8e 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./honor-XKB_CONFIG_ROOT.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { url = "https://gitlab.freedesktop.org/archived-projects/libxklavier/-/commit/1387c21a788ec1ea203c8392ea1460fc29d83f70.patch"; sha256 = "sha256-fyWu7sVfDv/ozjhLSLCVsv+iNFawWgJqHUsQHHSkQn4="; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 82176e4fab892..66f16b11a74e2 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation (finalAttrs: { gettext ] ++ lib.optionals (pythonSupport && python?isPy3 && python.isPy3) [ ncurses - ] ++ lib.optionals (stdenv.isDarwin && pythonSupport && python?isPy2 && python.isPy2) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport && python?isPy2 && python.isPy2) [ libintl ]; propagatedBuildInputs = [ findXMLCatalogs - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ lib.optionals icuSupport [ icu @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && stdenv.hostPlatform.libc != "musl"; - preCheck = lib.optional stdenv.isDarwin '' + preCheck = lib.optional stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="$PWD/.libs:$DYLD_LIBRARY_PATH" ''; diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index 1fac0d86d4c72..205e9425a74e5 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, fetchFromGitHub -, libndtypes +{ + lib, + stdenv, + fetchFromGitHub, + libndtypes, }: stdenv.mkDerivation { pname = "libxnd"; - version = "unstable-2019-08-01"; + version = "0.2.0-unstable-2023-11-17"; src = fetchFromGitHub { owner = "xnd-project"; - repo = "xnd"; - rev = "6f305cd40d90b4f3fc2fe51ae144b433d186a6cc"; - sha256 = "1n31d64qwlc7m3qkzbafhp0dgrvgvkdx89ykj63kll7r1n3yk59y"; + repo = "libxnd"; + rev = "e1a06d9f6175f4f4e1da369b7e907ad6b2952c00"; + hash = "sha256-RWt2Nx0tfMghQES2SM+0jbAU7IunuuTORhBe2tvqVTY="; }; buildInputs = [ libndtypes ]; @@ -20,12 +21,12 @@ stdenv.mkDerivation { # Override linker with cc (symlink to either gcc or clang) # Library expects to use cc for linking configureFlags = [ - # Override linker with cc (symlink to either gcc or clang) - # Library expects to use cc for linking - "LD=${stdenv.cc.targetPrefix}cc" - # needed for tests - "--with-includes=${libndtypes}/include" - "--with-libs=${libndtypes}/lib" + # Override linker with cc (symlink to either gcc or clang) + # Library expects to use cc for linking + "LD=${stdenv.cc.targetPrefix}cc" + # needed for tests + "--with-includes=${libndtypes}/include" + "--with-libs=${libndtypes}/lib" ]; # other packages which depend on libxnd seem to expect overflow.h, but diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index f86c6068e2dab..34092649067c0 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxml2.dev libxcrypt - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ] ++ lib.optionals pythonSupport [ libxml2.py diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix index eeb9dcf71b4a5..3276354240f4a 100644 --- a/pkgs/development/libraries/libxsmm/default.nix +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; mainProgram = "libxsmm_gemm_generator"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libyuv/default.nix b/pkgs/development/libraries/libyuv/default.nix index 68d3b5ff27892..1062d527fa2a1 100644 --- a/pkgs/development/libraries/libyuv/default.nix +++ b/pkgs/development/libraries/libyuv/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; # NEON does not work on aarch64, we disable it - cmakeFlags = lib.optionals stdenv.isAarch64 ["-DCMAKE_CXX_FLAGS=-DLIBYUV_DISABLE_NEON"]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isAarch64 ["-DCMAKE_CXX_FLAGS=-DLIBYUV_DISABLE_NEON"]; buildInputs = [ libjpeg ]; diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index b90a2691e4cec..bb40e05b9e6fb 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "3.2.3"; + version = "3.4.0"; pname = "libzdb"; src = fetchurl { url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; - sha256 = "sha256-oZV4Jvq3clSE/Ft0eApqfQ2Lf14uVNJuEGs5ngqGvrA="; + sha256 = "sha256-q9Z1cZvL3eQwqk7hOXW5gNVdKry1zCKAgqMDIKa7nw8="; }; buildInputs = [ sqlite ]; diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix index bf3a640bd8217..83a225576e065 100644 --- a/pkgs/development/libraries/libzim/default.nix +++ b/pkgs/development/libraries/libzim/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "9.2.2"; + version = "9.2.3"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; rev = "refs/tags/${version}"; - hash = "sha256-V81TzoYUFiI+07ooDQtG7ahxQFEh/6Y8IgoceHMSgOk="; + hash = "sha256-z22+cDlFQtLMLFh5+7Nt9LsGFyBPi3HeZhYb0LK86Oc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 1f7e8fdf2c49b..1e9a95bc4ed54 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { scikit-build-core ]; - env.CXXFLAGS = toString (lib.optional stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]); + env.CXXFLAGS = toString (lib.optional stdenv.hostPlatform.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]); postBuild = '' pushd ../api/python diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/development/libraries/lightgbm/default.nix index 86c85e66ace25..934b0cab5a3e6 100644 --- a/pkgs/development/libraries/lightgbm/default.nix +++ b/pkgs/development/libraries/lightgbm/default.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ lgbm ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "microsoft"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-i4mtJwSwnbGMXVfQ8a9jZZPUBBibXyQPgMVJ3uXxeGQ="; + hash = "sha256-nST6+/c3Y4/hqwgEUhx03gWtjxhlmUu1XKDCy2pSsvU="; }; nativeBuildInputs = [ cmake ] - ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ] ++ lib.optionals openclSupport [ opencl-headers ocl-icd boost ] ++ lib.optionals mpiSupport [ openmpi ] ++ lib.optionals hdfsSupport [ hadoop ] @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib mkdir -p $out/bin cp -r ../include $out - install -Dm755 ../lib_lightgbm.so $out/lib/lib_lightgbm.so + install -Dm755 ../lib_lightgbm${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/lib_lightgbm${stdenv.hostPlatform.extensions.sharedLibrary} '' + lib.optionalString (!rLibrary && !pythonLibrary) '' install -Dm755 ../lightgbm $out/bin/lightgbm '' + lib.optionalString javaWrapper '' diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 4d0158dbcbe3c..f9258f9913614 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -8,7 +8,6 @@ , lapack , fflas-ffpack , gmpxx -, withSage ? false # sage support }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lblas" "--without-archnative" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" @@ -56,8 +55,6 @@ stdenv.mkDerivation rec { "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" - ] ++ lib.optionals withSage [ - "--enable-sage" ]; # https://github.com/linbox-team/linbox/issues/304 diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index 42017e5e17182..13891d08f1133 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , validatePkgConfig +, fixDarwinDylibNames }: stdenv.mkDerivation { @@ -15,7 +16,8 @@ stdenv.mkDerivation { hash = "sha256-GsrYg16gpjHkkmpCU3yGzqNS/buZl+JoWALLvwzmT4A="; }; - nativeBuildInputs = [ validatePkgConfig ]; + nativeBuildInputs = [ validatePkgConfig ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; buildPhase = '' runHook preBuild diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 6667aa4882e0f..0700b645e30ab 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-3UKAwhYaYZ42+d+wiW/AB6x5TSOel8d++d3HeZqAg/8="; }; - configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; nativeBuildInputs = [ autoreconfHook ] - ++ lib.optionals stdenv.isDarwin [ cctools autoSignDarwinBinariesHook fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools autoSignDarwinBinariesHook fixDarwinDylibNames ]; meta = { homepage = "https://liquidsdr.org/"; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 7c907e9ef70f4..69100b9dffd62 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ] - ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so" + ++ lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so" ++ lib.optionals stdenv.hostPlatform.isWindows [ "SOEXT=.dll" "BINEXT=.exe" ]; doCheck = true; diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index 21dd9db2797c4..e949cd57e62ee 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ + buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/development/libraries/magic-enum/default.nix b/pkgs/development/libraries/magic-enum/default.nix index 7f65505793c74..93bcb8a624d86 100644 --- a/pkgs/development/libraries/magic-enum/default.nix +++ b/pkgs/development/libraries/magic-enum/default.nix @@ -4,7 +4,6 @@ , cmake , nix-update-script , testers -, magic-enum }: stdenv.mkDerivation rec{ pname = "magic-enum"; @@ -29,7 +28,6 @@ stdenv.mkDerivation rec{ passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = magic-enum; }; }; meta = { diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index ed7406cc52b72..1381a48315df4 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ libetpan cyrus_sasl libctemplate libuchardet html-tidy libxml2 openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glib icu libuuid - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { --replace buffio.h tidybuffio.h substituteInPlace src/core/basetypes/MCString.cpp \ --replace "xmlErrorPtr" "const xmlError *" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace src/core/basetypes/MCICUTypes.h \ --replace "__CHAR16_TYPE__ UChar" "char16_t UChar" ''; - cmakeFlags = lib.optionals (!stdenv.isDarwin) [ + cmakeFlags = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { cp src/libMailCore.* $out/lib ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' ( cd unittest diff --git a/pkgs/development/libraries/mapnik/catch2-src.patch b/pkgs/development/libraries/mapnik/catch2-src.patch deleted file mode 100644 index 04c6f7add217c..0000000000000 --- a/pkgs/development/libraries/mapnik/catch2-src.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 0705ddce1..771291b88 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -7,8 +7,7 @@ include(FetchContent) - - FetchContent_Declare( - Catch2 -- GIT_REPOSITORY https://github.com/catchorg/Catch2.git -- GIT_TAG v2.13.7) -+ SOURCE_DIR @catch2_src@) - FetchContent_MakeAvailable(Catch2) - - if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.19.0") diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index cd13cc850a15d..94a5280181ec9 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,43 +1,46 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildPackages -, cmake -, pkg-config -, substituteAll -, boost -, cairo -, freetype -, gdal -, harfbuzz -, icu -, libjpeg -, libpng -, libtiff -, libwebp -, libxml2 -, proj -, python3 -, sqlite -, zlib -, catch2 -, postgresql -, protozero -, sparsehash +{ + lib, + stdenv, + fetchFromGitHub, + gitUpdater, + buildPackages, + cmake, + pkg-config, + boost, + cairo, + freetype, + gdal, + harfbuzz, + icu, + libjpeg, + libpng, + libtiff, + libwebp, + libxml2, + proj, + python3, + sqlite, + zlib, + catch2, + postgresql, + protozero, + sparsehash, }: stdenv.mkDerivation rec { pname = "mapnik"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; rev = "v${version}"; - hash = "sha256-CNFNGMJU3kzkRrOGsf8/uv5ebHPEQ0tkA+5OubRVEjs="; + hash = "sha256-U5QQ7I7ZBNlMm74Vpvv8lvJ4EefM3+jHURFAP03Lmvw="; fetchSubmodules = true; }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + postPatch = '' substituteInPlace configure \ --replace '$PYTHON scons/scons.py' ${buildPackages.scons}/bin/scons @@ -56,18 +59,16 @@ stdenv.mkDerivation rec { # Upstream HarfBuzz wants to drop CMake support anyway. # See discussion: https://github.com/mapnik/mapnik/issues/4265 ./cmake-harfbuzz.patch - # prevent CMake from trying to get libraries on the Internet - (substituteAll { - src = ./catch2-src.patch; - catch2_src = catch2.src; - }) # Account for full paths when generating libmapnik.pc ./export-pkg-config-full-paths.patch # Use 'sparsehash' package. ./use-sparsehash-package.patch ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = [ boost @@ -99,7 +100,9 @@ stdenv.mkDerivation rec { # Use 'protozero' package. (lib.cmakeBool "USE_EXTERNAL_MAPBOX_PROTOZERO" true) # macOS builds fail when using memory mapped file cache. - (lib.cmakeBool "USE_MEMORY_MAPPED_FILE" (!stdenv.isDarwin)) + (lib.cmakeBool "USE_MEMORY_MAPPED_FILE" (!stdenv.hostPlatform.isDarwin)) + # don't try to download sources for catch2, use our own + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CATCH2" "${catch2.src}") ]; doCheck = true; @@ -122,7 +125,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source toolkit for developing mapping applications"; homepage = "https://mapnik.org"; - maintainers = with maintainers; [ hrdinka hummeltech ]; + maintainers = + with maintainers; + teams.geospatial.members + ++ [ + hrdinka + hummeltech + ]; license = licenses.lgpl21Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch b/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch index ec80423689d3b..8da5dcd5b474e 100644 --- a/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch +++ b/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch @@ -1,13 +1,24 @@ diff --git a/cmake/MapnikExportPkgConfig.cmake b/cmake/MapnikExportPkgConfig.cmake -index e459f80ef..ec18a71a2 100644 +index f12ed57f1..548e1e6e9 100644 --- a/cmake/MapnikExportPkgConfig.cmake +++ b/cmake/MapnikExportPkgConfig.cmake -@@ -65,8 +65,8 @@ prefix=@CMAKE_INSTALL_PREFIX@ +@@ -3,7 +3,7 @@ function(create_pkg_config_file _target _lib_name _description) + prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} includedir=${prefix}/include - libdir=${exec_prefix}/lib +-libdir=${exec_prefix}/@MAPNIK_LIB_DIR@ ++libdir=${exec_prefix}@MAPNIK_LIB_DIR@ + + Name: @_lib_name@ + Description: @_description@ +@@ -64,9 +64,9 @@ function(create_pkg_config_file_mapnik _lib_name _description) + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} + includedir=${prefix}/include +-libdir=${exec_prefix}/@MAPNIK_LIB_DIR@ -fonts_dir=${prefix}/@FONTS_INSTALL_DIR@ -plugins_dir=${prefix}/@PLUGINS_INSTALL_DIR@ ++libdir=${exec_prefix}@MAPNIK_LIB_DIR@ +fonts_dir=@FONTS_INSTALL_DIR@ +plugins_dir=@PLUGINS_INSTALL_DIR@ diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix index 63e9861421ab2..c0b068499cd33 100644 --- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix +++ b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nodejs ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildPhase = '' runHook preBuild diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix index 42fb6edae78f2..1d02915527133 100644 --- a/pkgs/development/libraries/mbedtls/2.nix +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "2.28.8"; - hash = "sha256-A1DYZrvJ8SRujroVwqPfcTOSgLnT5xRat/RVdq2fL/o="; + version = "2.28.9"; + hash = "sha256-/Bm05CvS9t7WSh4qoMconCaD7frlmA/H9YDyJOuGuFE="; } diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index d672e218f577f..f8f53522db134 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,18 +1,6 @@ -{ callPackage -, fetchpatch -}: +{ callPackage }: callPackage ./generic.nix { - version = "3.6.0"; - hash = "sha256-tCwAKoTvY8VCjcTPNwS3DeitflhpKHLr6ygHZDbR6wQ="; - - patches = [ - # https://github.com/Mbed-TLS/mbedtls/pull/9000 - # Remove at next version update - (fetchpatch { - name = "fix-darwin-memcpy-error.patch"; - url = "https://github.com/Mbed-TLS/mbedtls/commit/b32d7ae0fee2f906be59780b42a0cd4468a39bd1.patch"; - hash = "sha256-BTkJs9NEkCl+/Q8EwB/LW9uwF95jQOKWmoCK4B/7/sU="; - }) - ]; + version = "3.6.1"; + hash = "sha256-SVWz2uOvGIplnBr4g6nwfxKMWVpzdZjusseAhw6GOJ8="; } diff --git a/pkgs/development/libraries/mdk-sdk/default.nix b/pkgs/development/libraries/mdk-sdk/default.nix index c172fbf3139e0..3381282f675bf 100644 --- a/pkgs/development/libraries/mdk-sdk/default.nix +++ b/pkgs/development/libraries/mdk-sdk/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mdk-sdk"; - version = "0.29.0"; + version = "0.29.1"; src = fetchurl { url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz"; - hash = "sha256-umseIESdiiefQReycc2W8gsurxlpFHfAgV0YdXl1hZE="; + hash = "sha256-7dkvm5kP3gcQwXOE9DrjoOTzKRiwk/PVeRr7poLdCU0="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 8c07b2aad31a1..296317788d217 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/*/*.c --replace-warn \ "#if H5_VERS_MINOR > 12" \ "#if H5_VERS_MINOR > 14" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Some medfile test files #define _a, which # breaks system header files that use _a as a function parameter substituteInPlace tests/c/*.c \ diff --git a/pkgs/development/libraries/memorymapping/default.nix b/pkgs/development/libraries/memorymapping/default.nix index 91af205f0320b..1b3c17bc4f8c6 100644 --- a/pkgs/development/libraries/memorymapping/default.nix +++ b/pkgs/development/libraries/memorymapping/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { # Uses BSD-style funopen() to implement glibc-style fmemopen(). # Add more BSDs if you need to. platforms = platforms.darwin; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 138e7f247c13e..bbcc0bb99a0e7 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; - mesonFlags = lib.optionals stdenv.isDarwin [ + mesonFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-Dgl_provider=gl" # glvnd is default ]; diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index d73174195f3a8..c78a3c31e0c2a 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "24.2.1"; + version = "24.2.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-1aOK5M4Xe1FnmouOIoyafrvnxyoGpNK8wLVDC8yO4p0="; + hash = "sha256-1aRnG5BnFDuBOnGIb7X3yDk4PkhpBbMpp+IjfpmgtkM="; }; meta = { @@ -27,13 +27,9 @@ rec { complete hardware acceleration for modern GPUs. ''; homepage = "https://www.mesa3d.org/"; - changelog = "https://www.mesa3d.org/relnotes/${version}.html"; + changelog = "https://docs.mesa3d.org/relnotes/${version}.html"; license = with lib.licenses; [ mit ]; # X11 variant, in most files - platforms = [ - "i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" - "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" - "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin" "riscv64-linux" - ]; - maintainers = with lib.maintainers; [ primeos vcunat ]; # Help is welcome :) + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ k900 primeos vcunat ]; # Help is welcome :) }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 39ed2e004bc25..f5d44ff4623a6 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -6,6 +6,7 @@ , expat , fetchCrate , fetchFromGitLab +, fetchpatch , file , flex , glslang @@ -40,7 +41,7 @@ , xorg , zstd , enablePatentEncumberedCodecs ? true -, enableValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light +, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light , galliumDrivers ? [ "d3d12" # WSL emulated GPU (aka Dozen) @@ -54,13 +55,13 @@ "svga" # VMWare virtualized GPU "virgl" # QEMU virtualized GPU (aka VirGL) "zink" # generic OpenGL over Vulkan, experimental - ] ++ lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) [ "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) "lima" # ARM Mali 4xx "panfrost" # ARM Mali Midgard and up (T/G series) "vc4" # Broadcom VC4 (Raspberry Pi 0-3) - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "tegra" # Nvidia Tegra SoCs "v3d" # Broadcom VC5 (Raspberry Pi 4) ] ++ lib.optionals stdenv.hostPlatform.isx86 [ @@ -77,7 +78,7 @@ # QEMU virtualized GPU (aka VirGL) # Requires ATOMIC_INT_LOCK_FREE == 2. "virtio" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) "imagination-experimental" # PowerVR Rogue (currently N/A) @@ -202,7 +203,7 @@ in stdenv.mkDerivation { # Enable Intel RT stuff when available (lib.mesonBool "install-intel-clc" true) - (lib.mesonEnable "intel-rt" stdenv.isx86_64) + (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64) (lib.mesonOption "clang-libdir" "${llvmPackages.clang-unwrapped.lib}/lib") # Clover, old OpenCL frontend @@ -215,7 +216,7 @@ in stdenv.mkDerivation { # meson auto_features enables this, but we do not want it (lib.mesonEnable "android-libbacktrace" false) (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) - (lib.mesonEnable "valgrind" enableValgrind) + (lib.mesonEnable "valgrind" withValgrind) ] ++ lib.optionals enablePatentEncumberedCodecs [ (lib.mesonOption "video-codecs" "all") ] ++ lib.optionals needNativeCLC [ @@ -255,7 +256,7 @@ in stdenv.mkDerivation { xcbutilkeysyms xorgproto zstd - ] ++ lib.optionals enableValgrind [ + ] ++ lib.optionals withValgrind [ valgrind-light ]; @@ -288,11 +289,12 @@ in stdenv.mkDerivation { rustPlatform.bindgenHook wayland-scanner ] ++ lib.optionals needNativeCLC [ - buildPackages.mesa.driversdev + # `or null` to not break eval with `attribute missing` on darwin to linux cross + (buildPackages.mesa.driversdev or null) ]; disallowedRequisites = lib.optionals needNativeCLC [ - buildPackages.mesa.driversdev + (buildPackages.mesa.driversdev or null) ]; propagatedBuildInputs = [ libdrm ]; diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index 29fd2b662e694..e8259541c27a6 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isStatic; preCheck = let - ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + ldLibraryPathEnv = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' export ${ldLibraryPathEnv}="$(pwd)/build:''${${ldLibraryPathEnv}}" ''; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { postInstall = let rel = lib.versions.majorMinor version; - suffix = if stdenv.isLinux then "${soext}.${rel}" else ".${rel}${soext}"; + suffix = if stdenv.hostPlatform.isLinux then "${soext}.${rel}" else ".${rel}${soext}"; in '' # first, move headers and cmake files, that's easy mkdir -p $dev/lib diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 668b2fdf10c93..33b6e1b8cae8d 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { url = "https://github.com/tat/mimetic/commit/bf84940f9021950c80846e6b1a5f8b0b55991b00.patch"; sha256 = "sha256-1JW9zPg67BgNsdIjK/jp9j7QMg50eRMz5FsDsbbzBlI="; }) - ] ++ lib.optional stdenv.isAarch64 ./narrowing.patch; + ] ++ lib.optional stdenv.hostPlatform.isAarch64 ./narrowing.patch; meta = with lib; { description = "MIME handling library"; diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index ebb0f28897384..3438cb9290b68 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; # remove the -arch flags which are set by default in the build - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--with-archflags=\"-mmacosx-version-min=10.14\"" ]; diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index fde280137e749..b15997cb436b3 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { "-DMZ_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DMZ_LIB_SUFFIX='-ng'" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # missing header file "-DMZ_LIBCOMP=OFF" ]; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 26066ac044fb5..c3fa57204987e 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -23,7 +23,7 @@ , darwin , cudaSupport ? config.cudaSupport , cudaPackages ? { } -, enableJackrack ? stdenv.isLinux +, enableJackrack ? stdenv.hostPlatform.isLinux , glib , ladspa-sdk , ladspaPlugins @@ -31,7 +31,7 @@ , python3 , swig , qt ? null -, enableSDL1 ? stdenv.isLinux +, enableSDL1 ? stdenv.hostPlatform.isLinux , SDL , enableSDL2 ? true , SDL2 @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.24.0"; + version = "7.28.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - hash = "sha256-rs02V6+9jMF0S78rCCXcDn3gzghqnOtWEHMo/491JxA="; + hash = "sha256-rXxjHXXIFFggd2v9ZlNBs0XUDmvJxLvR2JfGkTxDYEA="; # 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 @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { rubberband sox vid-stab - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Accelerate ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 8dc200ccd97f5..fc967445d01cd 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.27.5"; + version = "1.28.0"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-ZupUchw2XzMVB4ImxMRSitIpmjTX5zvLtsG2xhoyH9c="; + hash = "sha256-cfet+A2i33iHbVRouPS4Ul8TmHolrcIMTRba6Olqfeg="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { icu cyrus_sasl snappy - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/pkgs/development/libraries/mongocxx/default.nix b/pkgs/development/libraries/mongocxx/default.nix index 5659043e2f626..415e7ca96e3ab 100644 --- a/pkgs/development/libraries/mongocxx/default.nix +++ b/pkgs/development/libraries/mongocxx/default.nix @@ -10,7 +10,7 @@ , darwin }: -let stdenv = if pkgs.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in +let stdenv = if pkgs.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in stdenv.mkDerivation (finalAttrs: { pname = "mongocxx"; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { mongoc openssl cyrus_sasl - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; cmakeFlags = [ "-DCMAKE_CXX_STANDARD=20" diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index d2cd26f38bf66..55a4ec26025a4 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { SDL2 fftw gtest - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.OpenGL darwin.libobjc ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libepoxy ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-framework OpenGL"; }; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index a4716a47bb1bc..4af559b50758c 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -44,12 +44,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran python3 ]; buildInputs = [ perl openssh hwloc ] - ++ lib.optional (!stdenv.isDarwin) ch4backend + ++ lib.optional (!stdenv.hostPlatform.isDarwin) ch4backend ++ lib.optional pmixSupport pmix - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation; # test_double_serializer.test fails on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preFixup = '' # Ensure the default compilers are the ones mpich was built with diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 26f22fd9968f2..9857317ea1889 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--enable-cxx" ] - ++ lib.optionals stdenv.isLinux [ "--enable-fat" ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-fat" ]; meta = { description = "Highly optimised library for bignum arithmetic forked from GMP"; diff --git a/pkgs/development/libraries/mvfst/default.nix b/pkgs/development/libraries/mvfst/default.nix index 0a784fff339ac..7c9d2e8da445b 100644 --- a/pkgs/development/libraries/mvfst/default.nix +++ b/pkgs/development/libraries/mvfst/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index c785e640ccb0a..d52eadbba6cd7 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -45,12 +45,12 @@ stdenv.mkDerivation rec { ois ] ++ lib.optionals withOgre [ ogre - ] ++ lib.optionals (!withOgre && stdenv.isLinux) [ + ] ++ lib.optionals (!withOgre && stdenv.hostPlatform.isLinux) [ libGL libGLU - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/development/libraries/nanosvg/default.nix b/pkgs/development/libraries/nanosvg/default.nix index 2033069d77e28..29861777889bc 100644 --- a/pkgs/development/libraries/nanosvg/default.nix +++ b/pkgs/development/libraries/nanosvg/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, unstableGitUpdater }: stdenv.mkDerivation { pname = "nanosvg"; - version = "unstable-2022-12-04"; + version = "0-unstable-2023-12-30"; src = fetchFromGitHub { owner = "memononen"; repo = "nanosvg"; - rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1"; - hash = "sha256-VOiN6583DtzGYPRkl19VG2QvSzl4T9HaynBuNcvZf94="; + rev = "93ce879dc4c04a3ef1758428ec80083c38610b1f"; + hash = "sha256-ZtenaXJqMZr2+BxYENG1zUoQ+Qoxlxy0m/1YfJBKAFk="; }; nativeBuildInputs = [ cmake ]; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Simple stupid SVG parser"; homepage = "https://github.com/memononen/nanosvg"; @@ -20,4 +22,3 @@ stdenv.mkDerivation { platforms = platforms.all; }; } - diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/development/libraries/ncnn/default.nix index ae82d0490be4b..f431133c25057 100644 --- a/pkgs/development/libraries/ncnn/default.nix +++ b/pkgs/development/libraries/ncnn/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "-DNCNN_PYTHON=0" # Should be an attribute ] # Requires setting `Vulkan_LIBRARY` on Darwin. Otherwise the build fails due to missing symbols. - ++ lib.optionals stdenv.isDarwin [ "-DVulkan_LIBRARY=-lvulkan" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DVulkan_LIBRARY=-lvulkan" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ vulkan-headers vulkan-loader glslang opencv protobuf ]; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 885d6cd17ba11..3affdfbf5743d 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.2.7"; + version = "5.2.8"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-RtjLCs+1HI2tJsSzMwoKq09teILvxFapZCxeZAZ4iCM="; + hash = "sha256-FTaXgBmDlQv75roeJo4dJyJCpzOj9ilJo2hdxDnyjno="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "/bin/mv" "${coreutils}/bin/mv" ''; - makeFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${libtool}/bin/libtool" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "LIBTOOL=${libtool}/bin/libtool" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 95b427a7bad39..2a4e89d7f3df7 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ]); # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: - CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; + CFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; strictDeps = true; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { ncurses ]; - buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; + buildInputs = lib.optional (mouseSupport && stdenv.hostPlatform.isLinux) gpm; preConfigure = '' export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig" @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR" ) '' - + lib.optionalString stdenv.isSunOS '' + + lib.optionalString stdenv.hostPlatform.isSunOS '' sed -i -e '/-D__EXTENSIONS__/ s/-D_XOPEN_SOURCE=\$cf_XOPEN_SOURCE//' \ -e '/CPPFLAGS="$CPPFLAGS/s/ -D_XOPEN_SOURCE_EXTENDED//' \ configure @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; postFixup = let - abiVersion-extension = if stdenv.isDarwin then "${abiVersion}.$dylibtype" else "$dylibtype.${abiVersion}"; in + abiVersion-extension = if stdenv.hostPlatform.isDarwin then "${abiVersion}.$dylibtype" else "$dylibtype.${abiVersion}"; in '' # Determine what suffixes our libraries have suffix="$(awk -F': ' 'f{print $3; f=0} /default library suffix/{f=1}' config.log)" diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index b691f2b10afa4..78a4f808b4c3e 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -3,10 +3,10 @@ let versionJSON = lib.importJSON ./version.json; ndiPlatform = - if stdenv.isAarch64 then "aarch64-rpi4-linux-gnueabi" - else if stdenv.isAarch32 then "arm-rpi2-linux-gnueabihf" - else if stdenv.isx86_64 then "x86_64-linux-gnu" - else if stdenv.isi686 then "i686-linux-gnu" + if stdenv.hostPlatform.isAarch64 then "aarch64-rpi4-linux-gnueabi" + else if stdenv.hostPlatform.isAarch32 then "arm-rpi2-linux-gnueabihf" + else if stdenv.hostPlatform.isx86_64 then "x86_64-linux-gnu" + else if stdenv.hostPlatform.isi686 then "i686-linux-gnu" else throw "unsupported platform for NDI SDK"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix deleted file mode 100644 index b968a0ee48be9..0000000000000 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, doxygen -, pkg-config -, python3 -, python3Packages -, wafHook -, boost179 -, openssl -, sqlite -}: - -stdenv.mkDerivation rec { - pname = "ndn-cxx"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "named-data"; - repo = "ndn-cxx"; - rev = "${pname}-${version}"; - sha256 = "sha256-u9+QxqdCET1f5B54HF+Jk/YuQvhcYWsPNIVHi5l0XTM="; - }; - - nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; - - buildInputs = [ boost179 openssl sqlite ]; - - wafConfigureFlags = [ - "--with-openssl=${openssl.dev}" - "--boost-includes=${boost179.dev}/include" - "--boost-libs=${boost179.out}/lib" - "--with-tests" - ]; - - doCheck = false; # some tests fail in upstream, some fail because of the sandbox environment - checkPhase = '' - runHook preCheck - LD_PRELOAD=build/libndn-cxx.so build/unit-tests - runHook postCheck - ''; - - meta = with lib; { - homepage = "https://named-data.net/"; - description = "Named Data Networking (NDN) or Content Centric Networking (CCN) abstraction"; - longDescription = '' - ndn-cxx is a C++ library, implementing Named Data Networking (NDN) - primitives that can be used to implement various NDN applications. - NDN operates by addressing and delivering Content Objects directly - by Name instead of merely addressing network end-points. In addition, - the NDN security model explicitly secures individual Content Objects - rather than securing the connection or “pipe”. Named and secured - content resides in distributed caches automatically populated on - demand or selectively pre-populated. When requested by name, NDN - delivers named content to the user from the nearest cache, thereby - traversing fewer network hops, eliminating redundant requests, - and consuming less resources overall. - ''; - license = licenses.lgpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ sjmackenzie bertof ]; - }; -} diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 3185ff4158ee9..6bff584ddaefd 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-SHLhL4Alct7dSwL4cAZYFLLVFB99va9wju2rgmtRpYo="; }; - patches = optionals stdenv.isDarwin [ ./darwin-fix-configure.patch ]; + patches = optionals stdenv.hostPlatform.isDarwin [ ./darwin-fix-configure.patch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl bash] diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 08f812a272a27..606e8a86b0c34 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = lib.licenses.free; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 0edc956eee60f..d9a80768bb614 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; buildInputs = [ netcdf hdf5 curl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation CoreServices SystemConfiguration ]; - env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-F${CoreServices}/Library/Frameworks" "-F${SystemConfiguration}/Library/Frameworks" ]); diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 44afdf45513f6..b1cf1f5f6bfe9 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation { # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> # for details. - ++ lib.optional stdenv.isSunOS "--with-include-path=${gmp.dev}/include"; + ++ lib.optional stdenv.hostPlatform.isSunOS "--with-include-path=${gmp.dev}/include"; - doCheck = (stdenv.hostPlatform.system != "i686-cygwin" && !stdenv.isDarwin); + doCheck = (stdenv.hostPlatform.system != "i686-cygwin" && !stdenv.hostPlatform.isDarwin); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 15a834709806b..d8adcf63b19db 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { unset CPP ''; - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-nls" ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libnewt.so.${version} $out/lib/libnewt.so.${version} install_name_tool -change libnewt.so.${version} $out/lib/libnewt.so.${version} $out/bin/whiptail ''; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index fbe3e2a92f150..19265cbe16083 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { (lib.enableFeature enableHttp3 "http3") ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ "-faligned-allocation" ]); diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 2a264dbe6c460..a325385601778 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 8e17a3394dc32..aa5ebc6fbb8b7 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libev nghttp3 quictls - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ] ++ lib.optional withJemalloc jemalloc; diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index 1cf06ecb837f9..31f69e82198fe 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = [ cunit ] - ++ lib.optional stdenv.isDarwin ncurses; + ++ lib.optional stdenv.hostPlatform.isDarwin ncurses; passthru.tests = knot-dns.passthru.tests; # the only consumer so far diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index 2fae17a232364..4995d98adca76 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-TgieCX7yUdTAEblzXY/gCN0r6F9TVDh4RdNDjQdXZ1o="; }; - nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildInputs = [ octave ]; configureFlags = [ diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix deleted file mode 100644 index 67c640ddb2659..0000000000000 --- a/pkgs/development/libraries/notcurses/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libdeflate -, libunistring -, ncurses -, pandoc -, pkg-config -, zlib -, multimediaSupport ? true, ffmpeg -, qrcodegenSupport ? true, qrcodegen -}: - -stdenv.mkDerivation rec { - pname = "notcurses"; - version = "3.0.9"; - - src = fetchFromGitHub { - owner = "dankamongmen"; - repo = "notcurses"; - rev = "v${version}"; - sha256 = "sha256-8SJeqLcV4xp968YgGsJccsgpB5wwaJDaoWsaYxf8upM="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - pandoc - pkg-config - ]; - - buildInputs = [ - libdeflate - libunistring - ncurses - zlib - ] - ++ lib.optional qrcodegenSupport qrcodegen - ++ lib.optional multimediaSupport ffmpeg; - - cmakeFlags = - lib.optional (qrcodegenSupport) "-DUSE_QRCODEGEN=ON" - ++ lib.optional (!multimediaSupport) "-DUSE_MULTIMEDIA=none"; - - # https://github.com/dankamongmen/notcurses/issues/2661 - postPatch = '' - substituteInPlace tools/notcurses-core.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - substituteInPlace tools/notcurses-ffi.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - substituteInPlace tools/notcurses++.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - substituteInPlace tools/notcurses.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - meta = with lib; { - homepage = "https://github.com/dankamongmen/notcurses"; - description = "Blingful TUIs and character graphics"; - longDescription = '' - Notcurses is a library facilitating complex TUIs on modern terminal - emulators, supporting vivid colors, multimedia, and Unicode to the maximum - degree possible. Things can be done with Notcurses that simply can't be - done with NCURSES. - - It is not a source-compatible X/Open Curses implementation, nor a - replacement for NCURSES on existing systems. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ AndersonTorres ]; - inherit (ncurses.meta) platforms; - }; -} diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 586c4ddb94fc1..efea4a4cc81f2 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { preConfigure = '' cd nspr - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace '@executable_path/' "$out/lib/" substituteInPlace configure.in --replace '@executable_path/' "$out/lib/" ''; @@ -34,14 +34,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-optimize" "--disable-debug" - ] ++ lib.optional stdenv.is64bit "--enable-64bit"; + ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; postInstall = '' find $out -name "*.a" -delete moveToOutput share "$dev" # just aclocal ''; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 7ef488cca4c1e..9e54ddda866f7 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { --enable-libpkix \ -j $NIX_BUILD_CORES \ ${lib.optionalString enableFIPS "--enable-fips"} \ - ${lib.optionalString stdenv.isDarwin "--clang"} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "--clang"} \ ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} runHook postBuild @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { (lib.optionalString enableFIPS ('' for libname in freebl3 nssdbm3 softokn3 do libfile="$out/lib/lib$libname${stdenv.hostPlatform.extensions.sharedLibrary}"'' + - (if stdenv.isDarwin + (if stdenv.hostPlatform.isDarwin then '' DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '' else '' diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 22eca6fec1098..143bb32a5677b 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.103"; - hash = "sha256-e57HN50lHT4+nkdZPyixpWFyTD0c+xZBk23BhmIumV8="; + version = "3.105"; + hash = "sha256-Nfd7u0sdGqUCznnUxEJQFs+QuRSb+b7rZrcvKryimOQ="; } diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 9bec1886abb64..378ebf54c1f7f 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;"; license = licenses.bsd3; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix index e04d2ae435374..e1726a874fcd1 100644 --- a/pkgs/development/libraries/ntbtls/default.nix +++ b/pkgs/development/libraries/ntbtls/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; buildInputs = [ libgcrypt libgpg-error libksba zlib ] - ++ lib.optional stdenv.isDarwin gettext; + ++ lib.optional stdenv.hostPlatform.isDarwin gettext; postInstall = '' moveToOutput "bin/ntbtls-config" $dev diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix index 5ae6380849c8f..e7100e66f384c 100644 --- a/pkgs/development/libraries/ntirpc/default.nix +++ b/pkgs/development/libraries/ntirpc/default.nix @@ -4,15 +4,16 @@ stdenv.mkDerivation rec { pname = "ntirpc"; - version = "5.8"; + version = "6.0.1"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "ntirpc"; rev = "v${version}"; - sha256 = "sha256-t9InlnlwVts9mlrH8sHaaTYSrjJKlkFlGs1YCmZzjdE="; + sha256 = "sha256-Txtc0Oyt/WfZiMe26uMzx3HFq/YaeU6cYfjPQwh0uQg="; }; + outputs = [ "out" "dev" ]; postPatch = '' substituteInPlace ntirpc/netconfig.h --replace "/etc/netconfig" "$out/etc/netconfig" sed '1i#include <assert.h>' -i src/work_pool.c diff --git a/pkgs/development/libraries/numcpp/default.nix b/pkgs/development/libraries/numcpp/default.nix index b8dea0f3662b8..34dd82c15076b 100644 --- a/pkgs/development/libraries/numcpp/default.nix +++ b/pkgs/development/libraries/numcpp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_MULTIPLE_TEST=ON" ]; - doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isStatic; + doCheck = !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isStatic; postInstall = '' substituteInPlace $out/share/NumCpp/cmake/NumCppConfig.cmake \ diff --git a/pkgs/development/libraries/oatpp/default.nix b/pkgs/development/libraries/oatpp/default.nix index 54e821b178489..10b44bdac5721 100644 --- a/pkgs/development/libraries/oatpp/default.nix +++ b/pkgs/development/libraries/oatpp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; # Tests fail on darwin. See https://github.com/NixOS/nixpkgs/pull/105419#issuecomment-735826894 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://oatpp.io/"; diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index 8b426654147f4..2906c34283428 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-uode3RZFcJWHle6qcPFIU7/DTMmHH4rd6NpH4SvVRnk="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.GLUT ]; diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 92b943dbdf2f7..831c8a4e2afd5 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation { sha256 = "sha256-Ez9B89I008YMu1s/8J0V4bydkooth+O5846Fmwl4FsA="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ oracle-instantclient ] - ++ lib.optionals stdenv.isLinux [ libaio ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libaio ]; dontPatchELF = true; makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; postFixup = '' - ${lib.optionalString (stdenv.isLinux) '' + ${lib.optionalString (stdenv.hostPlatform.isLinux) '' patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary})" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} ''} - ${lib.optionalString (stdenv.isDarwin) '' + ${lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} ''} ''; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index a77529a427048..0643fabdd8c66 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -74,7 +74,7 @@ let ois pugixml zziplib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libglut libGL libGLU @@ -88,7 +88,7 @@ let libXt libXxf86vm xorgproto - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ lib.optionals withNvidiaCg [ nvidia_cg_toolkit @@ -97,7 +97,7 @@ let cmakeFlags = [ (lib.cmakeBool "OGRE_BUILD_DEPENDENCIES" false) (lib.cmakeBool "OGRE_BUILD_SAMPLES" withSamples) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeBool "OGRE_BUILD_LIBS_AS_FRAMEWORKS" false) ]; @@ -112,11 +112,11 @@ let in { ogre_14 = common { - version = "14.2.6"; - hash = "sha256-kxvrRigSe6sPa3lAH+6zKTY4YEU9javlKHK8Zf6jxZE="; - # https://github.com/OGRECave/ogre/blob/v14.2.5/Components/Overlay/CMakeLists.txt - imguiVersion = "1.90.4"; - imguiHash = "sha256-7+Ay7H97tIO6CUsEyaQv4i9q2FCw98eQUq/KYZyfTAw="; + version = "14.3.0"; + hash = "sha256-SQ0Ij04W/KgonHDLFEPFDhXb/TDkT8I6W8J7hz3gtrg="; + # https://github.com/OGRECave/ogre/blob/v14.3.0/Components/Overlay/CMakeLists.txt + imguiVersion = "1.91.2"; + imguiHash = "sha256-B7XXQNuEPcT1ID5nMYbAV+aNCG9gIrC9J7BLnYB8yjI="; }; ogre_13 = common { diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index 0a384b03bb2ab..435509dee2160 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libX11 ] - ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa IOKit Kernel ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/pkgs/development/libraries/okapi/default.nix b/pkgs/development/libraries/okapi/default.nix index b7a75ad6d1b98..06f980e718c85 100644 --- a/pkgs/development/libraries/okapi/default.nix +++ b/pkgs/development/libraries/okapi/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoVendorDir = "vendor"; doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' cp -r include $out diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index f0a6c47d4ca72..c83b84fe71e1d 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { It is not known if the issues can be exploited over the network in practical conditions. Upstream does not believe such an attack is feasible, but has stated that the library should not be used going - forward, and there are no plans to move to a another cryptography + forward, and there are no plans to move to another cryptography implementation or otherwise further maintain the library at all. You should make an informed decision about whether to override this diff --git a/pkgs/development/libraries/omorfi/default.nix b/pkgs/development/libraries/omorfi/default.nix index 6002ea4646738..9360b0fdd104b 100644 --- a/pkgs/development/libraries/omorfi/default.nix +++ b/pkgs/development/libraries/omorfi/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3; maintainers = with maintainers; [ lurkki ]; # Darwin build fails due to hfst not being found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index a5eeb4a193084..b8081353ed1c3 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -9,13 +9,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.5"; + version = "3.5.3"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-IOS5w84/Dnwjqgk5Lf6o6P1l9q5KBUUll250B1mh/Gc="; + hash = "sha256-/ERkk6bgGEKoJEVdnBxMFEzB8pii71t3zQZNtyg+TdQ="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index bb344664e6593..9ac43cc4b1d3d 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -149,7 +149,7 @@ effectiveStdenv.mkDerivation rec { numpy pybind11 packaging - ]) ++ lib.optionals effectiveStdenv.isDarwin [ + ]) ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ Foundation libiconv ] ++ lib.optionals cudaSupport (with cudaPackages; [ diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 496b7ac60fe00..15a33af177cee 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, removeReferencesTo -, alsaSupport ? !stdenv.isDarwin, alsa-lib -, dbusSupport ? !stdenv.isDarwin, dbus -, pipewireSupport ? !stdenv.isDarwin, pipewire -, pulseSupport ? !stdenv.isDarwin, libpulseaudio +, alsaSupport ? !stdenv.hostPlatform.isDarwin, alsa-lib +, dbusSupport ? !stdenv.hostPlatform.isDarwin, dbus +, pipewireSupport ? !stdenv.hostPlatform.isDarwin, pipewire +, pulseSupport ? !stdenv.hostPlatform.isDarwin, libpulseaudio , CoreServices, AudioUnit, AudioToolbox }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ lib.optional dbusSupport dbus ++ lib.optional pipewireSupport pipewire ++ lib.optional pulseSupport libpulseaudio - ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices AudioUnit AudioToolbox ]; cmakeFlags = [ # Automatically links dependencies without having to rely on dlopen, thus diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix index f30fcac869f17..32d7bf0743843 100644 --- a/pkgs/development/libraries/openbsm/default.nix +++ b/pkgs/development/libraries/openbsm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; }; - patches = lib.optionals stdenv.isDarwin [ ./bsm-add-audit_token_to_pid.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./bsm-add-audit_token_to_pid.patch ]; preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix index a09cacaf39286..e9f3e0794d33f 100644 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libXext libXmu libXi - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; meta = with lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 341c3f3ecf57e..a4d2f115cc672 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -73,7 +73,7 @@ let # fix not be able to find clang from PATH substituteInPlace cl_headers/CMakeLists.txt \ --replace " NO_DEFAULT_PATH" "" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Uses linker flags that are not supported on Darwin. sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt substituteInPlace CMakeLists.txt \ @@ -107,6 +107,6 @@ stdenv.mkDerivation { maintainers = [ ]; platforms = platforms.all; # error: invalid value 'CL3.0' in '-cl-std=CL3.0' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix index 8410aa4aa0638..58709dcd8699b 100644 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/pkgs/development/libraries/opencl-clhpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opencl-clhpp"; - version = "2.0.15"; + version = "2024.05.08"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-CLHPP"; rev = "v${version}"; - sha256 = "sha256-A12GdevbMaO2QkGAk3VsXzwcDkF+6dEapse2xfdqzPM="; + sha256 = "sha256-bIm4tGqwWX0IPKH3BwLgkf0T7YFrkN6vemYvdPrqUpw="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 6ecb76c0eed7f..67f18a4a2718a 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); propagatedBuildInputs = [ libxml2 pcre ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Drop blanket -Werror as it tends to fail on newer toolchain for # minor warnings. In this case it was gcc-13 build failure. substituteInPlace DAEValidator/CMakeLists.txt --replace-fail ' -Werror"' '"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \ --replace math.h cmath ''; diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index 63098028fc64e..7d1839163efc2 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # TODO: Investigate whether git can be dropped: It's only used to apply patches nativeBuildInputs = [ cmake pkg-config git ]; - buildInputs = [ lcms2 tinyxml ] ++ lib.optional stdenv.isDarwin boost; + buildInputs = [ lcms2 tinyxml ] ++ lib.optional stdenv.hostPlatform.isDarwin boost; postPatch = '' substituteInPlace src/core/CMakeLists.txt --replace "-Werror" "" @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { "-DUSE_EXTERNAL_TINYXML=ON" # External yaml-cpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517 "-DUSE_EXTERNAL_YAML=OFF" - ] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "-DOCIO_USE_BOOST_PTR=ON" ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF" - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; postInstall = '' moveToOutput bin "$bin" diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 3e9302e025f2b..76d2b06150ad5 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ./line-numbers.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # these tests don't like being run headless on darwin. no builtin # way of skipping tests so this is what we're reduced to. substituteInPlace tests/cpu/Config_tests.cpp \ @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; # precision issues on non-x86 - doCheck = stdenv.isx86_64; + doCheck = stdenv.hostPlatform.isx86_64; # Tends to fail otherwise. enableParallelChecking = false; diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 6ac83dfa7d927..5aea0da273808 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ glew ] - ++ lib.optionals stdenv.isLinux [ libGLU libGL libglut libXmu libXext libX11 ] - ++ lib.optional stdenv.isDarwin GLUT; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL libglut libXmu libXext libX11 ] + ++ lib.optional stdenv.hostPlatform.isDarwin GLUT; doCheck = false; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' install -D copying.txt "$out/share/doc/opencsg/copying.txt" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/*.app $out/Applications rmdir $out/bin || true @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample install_name_tool -change \ $(otool -L $app | awk '/opencsg.+dylib/ { print $1 }') \ diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index e4b6110e1c153..c8cc99b3f543f 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/OpenSC/openct/"; license = licenses.lgpl21; description = "Drivers for several smart card readers"; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index cca9e8ae1c74f..3d5c0ac87067c 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -26,7 +26,7 @@ , libtiff , enableWebP ? true , libwebp -, enableEXR ? !stdenv.isDarwin +, enableEXR ? !stdenv.hostPlatform.isDarwin , openexr , ilmbase , enableJPEG2000 ? true @@ -35,7 +35,7 @@ , eigen , enableBlas ? true , blas -, enableVA ? !stdenv.isDarwin +, enableVA ? !stdenv.hostPlatform.isDarwin , libva , enableContrib ? true @@ -97,6 +97,12 @@ }@inputs: let + inherit (lib.attrsets) mapAttrsToList optionalAttrs; + inherit (lib.lists) last optionals; + inherit (lib.meta) getExe; + inherit (lib.strings) cmakeBool cmakeFeature cmakeOptionType concatStrings concatStringsSep optionalString; + inherit (lib.trivial) flip; + version = "4.9.0"; # It's necessary to consistently use backendStdenv when building with CUDA @@ -228,26 +234,23 @@ let }; # See opencv/cmake/OpenCVDownload.cmake - installExtraFiles = extra: '' - mkdir -p "${extra.dst}" - '' + lib.concatStrings (lib.flip lib.mapAttrsToList extra.files (name: md5: '' - ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}" + installExtraFiles = {dst, files, src, ...}: '' + mkdir -p "${dst}" + '' + concatStrings (flip mapAttrsToList files (name: md5: '' + ln -s "${src}/${name}" "${dst}/${md5}-${name}" '')); - installExtraFile = extra: '' - mkdir -p "${extra.dst}" - ln -s "${extra.src}" "${extra.dst}/${extra.md5}-${extra.name}" + installExtraFile = {dst, md5, name, src, ...}: '' + mkdir -p "${dst}" + ln -s "${src}" "${dst}/${md5}-${name}" ''; - opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; - - printEnabled = enabled: if enabled then "ON" else "OFF"; withOpenblas = (enableBlas && blas.provider.pname == "openblas"); #multithreaded openblas conflicts with opencv multithreading, which manifest itself in hung tests #https://github.com/OpenMathLib/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded openblas_ = blas.provider.override { singleThreaded = true; }; - inherit (cudaPackages) cudaFlags cudaVersion; - inherit (cudaFlags) cudaCapabilities; + inherit (cudaPackages) cudaFlags; + inherit (cudaFlags) cmakeCudaArchitecturesString cudaCapabilities; in @@ -258,20 +261,21 @@ effectiveStdenv.mkDerivation { outputs = [ "out" "cxxdev" - ] ++ lib.optionals (runAccuracyTests || runPerformanceTests) [ + ] ++ optionals (runAccuracyTests || runPerformanceTests) [ "package_tests" ]; cudaPropagateToOutput = "cxxdev"; - postUnpack = lib.optionalString buildContrib '' + postUnpack = optionalString buildContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" ''; # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch - ] ++ lib.optionals enableContrib [ - ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; + ] ++ optionals enableCuda [ + ./cuda_opt_flow.patch + ]; # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) @@ -281,8 +285,8 @@ effectiveStdenv.mkDerivation { preConfigure = installExtraFile ade + - lib.optionalString enableIpp (installExtraFiles ippicv) + ( - lib.optionalString buildContrib '' + optionalString enableIpp (installExtraFiles ippicv) + ( + optionalString buildContrib '' cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib") ${installExtraFiles vgg} @@ -304,35 +308,35 @@ effectiveStdenv.mkDerivation { pcre2 protobuf_21 zlib - ] ++ lib.optionals enablePython [ + ] ++ optionals enablePython [ pythonPackages.python - ] ++ lib.optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [ + ] ++ optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [ hdf5 - ] ++ lib.optionals enableGtk2 [ + ] ++ optionals enableGtk2 [ gtk2 - ] ++ lib.optionals enableGtk3 [ + ] ++ optionals enableGtk3 [ gtk3 - ] ++ lib.optionals enableVtk [ + ] ++ optionals enableVtk [ vtk - ] ++ lib.optionals enableJPEG [ + ] ++ optionals enableJPEG [ libjpeg - ] ++ lib.optionals enablePNG [ + ] ++ optionals enablePNG [ libpng - ] ++ lib.optionals enableTIFF [ + ] ++ optionals enableTIFF [ libtiff - ] ++ lib.optionals enableWebP [ + ] ++ optionals enableWebP [ libwebp - ] ++ lib.optionals enableEXR [ + ] ++ optionals enableEXR [ openexr ilmbase - ] ++ lib.optionals enableJPEG2000 [ + ] ++ optionals enableJPEG2000 [ openjpeg - ] ++ lib.optionals enableFfmpeg [ + ] ++ optionals enableFfmpeg [ ffmpeg - ] ++ lib.optionals (enableFfmpeg && effectiveStdenv.isDarwin) [ + ] ++ optionals (enableFfmpeg && effectiveStdenv.hostPlatform.isDarwin) [ bzip2 VideoDecodeAcceleration - ] ++ lib.optionals (enableGStreamer && effectiveStdenv.isLinux) [ + ] ++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [ elfutils gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -340,27 +344,27 @@ effectiveStdenv.mkDerivation { libunwind orc zstd - ] ++ lib.optionals enableOvis [ + ] ++ optionals enableOvis [ ogre - ] ++ lib.optionals enableGPhoto2 [ + ] ++ optionals enableGPhoto2 [ libgphoto2 - ] ++ lib.optionals enableDC1394 [ + ] ++ optionals enableDC1394 [ libdc1394 - ] ++ lib.optionals enableEigen [ + ] ++ optionals enableEigen [ eigen - ] ++ lib.optionals enableVA [ + ] ++ optionals enableVA [ libva - ] ++ lib.optionals enableBlas [ + ] ++ optionals enableBlas [ blas.provider - ] ++ lib.optionals enableTesseract [ + ] ++ optionals enableTesseract [ # There is seemingly no compile-time flag for Tesseract. It's # simply enabled automatically if contrib is built, and it detects # tesseract & leptonica. tesseract leptonica - ] ++ lib.optionals enableTbb [ + ] ++ optionals enableTbb [ tbb - ] ++ lib.optionals effectiveStdenv.isDarwin [ + ] ++ optionals effectiveStdenv.hostPlatform.isDarwin [ bzip2 AVFoundation Cocoa @@ -368,76 +372,78 @@ effectiveStdenv.mkDerivation { CoreMedia MediaToolbox Accelerate - ] ++ lib.optionals enableDocs [ + ] ++ optionals enableDocs [ doxygen graphviz-nox - ] ++ lib.optionals enableCuda [ + ] ++ optionals enableCuda [ cudaPackages.cuda_cudart cudaPackages.cuda_cccl # <thrust/*> cudaPackages.libnpp # npp.h nvidia-optical-flow-sdk - ] ++ lib.optionals enableCublas [ + ] ++ optionals enableCublas [ # May start using the default $out instead once # https://github.com/NixOS/nixpkgs/issues/271792 # has been addressed cudaPackages.libcublas # cublas_v2.h - ] ++ lib.optionals enableCudnn [ + ] ++ optionals enableCudnn [ cudaPackages.cudnn # cudnn.h - ] ++ lib.optionals enableCufft [ + ] ++ optionals enableCufft [ cudaPackages.libcufft # cufft.h ]; - propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ]; + propagatedBuildInputs = optionals enablePython [ pythonPackages.numpy ]; - nativeBuildInputs = [ cmake pkg-config unzip ] - ++ lib.optionals enablePython [ + nativeBuildInputs = [ + cmake + pkg-config + unzip + ] ++ optionals enablePython [ pythonPackages.pip pythonPackages.wheel pythonPackages.setuptools - ] ++ lib.optionals enableCuda [ + ] ++ optionals enableCuda [ cudaPackages.cuda_nvcc ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. - OpenBLAS_HOME = lib.optionalString withOpenblas openblas_.dev; - OpenBLAS = lib.optionalString withOpenblas openblas_; + OpenBLAS_HOME = optionalString withOpenblas openblas_.dev; + OpenBLAS = optionalString withOpenblas openblas_; cmakeFlags = [ - "-DOPENCV_GENERATE_PKGCONFIG=ON" - "-DWITH_OPENMP=ON" - "-DBUILD_PROTOBUF=OFF" - "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf_21}" - "-DPROTOBUF_UPDATE_FILES=ON" - "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" - "-DBUILD_TESTS=${printEnabled runAccuracyTests}" - "-DBUILD_PERF_TESTS=${printEnabled runPerformanceTests}" - "-DCMAKE_SKIP_BUILD_RPATH=ON" - "-DBUILD_DOCS=${printEnabled enableDocs}" + (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true) + (cmakeBool "WITH_OPENMP" true) + (cmakeBool "BUILD_PROTOBUF" false) + (cmakeOptionType "path" "Protobuf_PROTOC_EXECUTABLE" (getExe buildPackages.protobuf_21)) + (cmakeBool "PROTOBUF_UPDATE_FILES" true) + (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree) + (cmakeBool "BUILD_TESTS" runAccuracyTests) + (cmakeBool "BUILD_PERF_TESTS" runPerformanceTests) + (cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + (cmakeBool "BUILD_DOCS" enableDocs) # "OpenCV disables pkg-config to avoid using of host libraries. Consider using PKG_CONFIG_LIBDIR to specify target SYSROOT" # but we have proper separation of build and host libs :), fixes cross - "-DOPENCV_ENABLE_PKG_CONFIG=ON" - (opencvFlag "IPP" enableIpp) - (opencvFlag "TIFF" enableTIFF) - (opencvFlag "WEBP" enableWebP) - (opencvFlag "JPEG" enableJPEG) - (opencvFlag "PNG" enablePNG) - (opencvFlag "OPENEXR" enableEXR) - (opencvFlag "OPENJPEG" enableJPEG2000) - "-DWITH_JASPER=OFF" # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled - (opencvFlag "TBB" enableTbb) + (cmakeBool "OPENCV_ENABLE_PKG_CONFIG" true) + (cmakeBool "WITH_IPP" enableIpp) + (cmakeBool "WITH_TIFF" enableTIFF) + (cmakeBool "WITH_WEBP" enableWebP) + (cmakeBool "WITH_JPEG" enableJPEG) + (cmakeBool "WITH_PNG" enablePNG) + (cmakeBool "WITH_OPENEXR" enableEXR) + (cmakeBool "WITH_OPENJPEG" enableJPEG2000) + (cmakeBool "WITH_JASPER" false) # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled + (cmakeBool "WITH_TBB" enableTbb) # CUDA options - (opencvFlag "CUDA" enableCuda) - (opencvFlag "CUDA_FAST_MATH" enableCuda) - (opencvFlag "CUBLAS" enableCublas) - (opencvFlag "CUDNN" enableCudnn) - (opencvFlag "CUFFT" enableCufft) + (cmakeBool "WITH_CUDA" enableCuda) + (cmakeBool "WITH_CUBLAS" enableCublas) + (cmakeBool "WITH_CUDNN" enableCudnn) + (cmakeBool "WITH_CUFFT" enableCufft) # LTO options - (opencvFlag "ENABLE_LTO" enableLto) - (opencvFlag "ENABLE_THIN_LTO" ( + (cmakeBool "ENABLE_LTO" enableLto) + (cmakeBool "ENABLE_THIN_LTO" ( enableLto && ( # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv, effectiveStdenv.cc.isClang || @@ -445,51 +451,53 @@ effectiveStdenv.mkDerivation { (enableCuda && effectiveStdenv.cc.isClang) ) )) - ] ++ lib.optionals enableCuda [ - "-DCUDA_FAST_MATH=ON" - "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + ] ++ optionals enableCuda [ + (cmakeBool "CUDA_FAST_MATH" true) + (cmakeFeature "CUDA_NVCC_FLAGS" "--expt-relaxed-constexpr") # OpenCV respects at least three variables: # -DCUDA_GENERATION takes a single arch name, e.g. Volta # -DCUDA_ARCH_BIN takes a semi-colon separated list of real arches, e.g. "8.0;8.6" # -DCUDA_ARCH_PTX takes the virtual arch, e.g. "8.6" - "-DCUDA_ARCH_BIN=${lib.concatStringsSep ";" cudaCapabilities}" - "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}" + (cmakeFeature "CUDA_ARCH_BIN" cmakeCudaArchitecturesString) + (cmakeFeature "CUDA_ARCH_PTX" (last cudaCapabilities)) - "-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" - ] ++ lib.optionals effectiveStdenv.isDarwin [ - "-DWITH_OPENCL=OFF" - "-DWITH_LAPACK=OFF" + (cmakeOptionType "path" "NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH" nvidia-optical-flow-sdk.outPath) + ] ++ optionals effectiveStdenv.hostPlatform.isDarwin [ + (cmakeBool "WITH_OPENCL" false) + (cmakeBool "WITH_LAPACK" false) # Disable unnecessary vendoring that's enabled by default only for Darwin. # Note that the opencvFlag feature flags listed above still take # precedence, so we can safely list everything here. - "-DBUILD_ZLIB=OFF" - "-DBUILD_TIFF=OFF" - "-DBUILD_OPENJPEG=OFF" - "-DBUILD_JASPER=OFF" - "-DBUILD_JPEG=OFF" - "-DBUILD_PNG=OFF" - "-DBUILD_WEBP=OFF" - ] ++ lib.optionals (!effectiveStdenv.isDarwin) [ - "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" - ] ++ lib.optionals enablePython [ - "-DOPENCV_SKIP_PYTHON_LOADER=ON" - ] ++ lib.optionals (enabledModules != [ ]) [ - "-DBUILD_LIST=${lib.concatStringsSep "," enabledModules}" + (cmakeBool "BUILD_ZLIB" false) + (cmakeBool "BUILD_TIFF" false) + (cmakeBool "BUILD_OPENJPEG" false) + (cmakeBool "BUILD_JASPER" false) + (cmakeBool "BUILD_JPEG" false) + (cmakeBool "BUILD_PNG" false) + (cmakeBool "BUILD_WEBP" false) + ] ++ optionals (!effectiveStdenv.hostPlatform.isDarwin) [ + (cmakeOptionType "path" "OPENCL_LIBRARY" "${ocl-icd}/lib/libOpenCL.so") + ] ++ optionals enablePython [ + (cmakeBool "OPENCV_SKIP_PYTHON_LOADER" true) + ] ++ optionals (enabledModules != [ ]) [ + (cmakeFeature "BUILD_LIST" (concatStringsSep "," enabledModules)) ]; - postBuild = lib.optionalString enableDocs '' + postBuild = optionalString enableDocs '' make doxygen ''; preInstall = - lib.optionalString (runAccuracyTests || runPerformanceTests) '' - mkdir $package_tests - cp -R $src/samples $package_tests/ - '' - + lib.optionalString runAccuracyTests "mv ./bin/*test* $package_tests/ \n" - + lib.optionalString runPerformanceTests "mv ./bin/*perf* $package_tests/"; + optionalString (runAccuracyTests || runPerformanceTests) '' + mkdir $package_tests + cp -R $src/samples $package_tests/ + '' + optionalString runAccuracyTests '' + mv ./bin/*test* $package_tests/ + '' + optionalString runPerformanceTests '' + mv ./bin/*perf* $package_tests/ + ''; # By default $out/lib/pkgconfig/opencv4.pc looks something like this: # @@ -510,12 +518,23 @@ effectiveStdenv.mkDerivation { '' # fix deps not progagating from opencv4.cxxdev if cuda is disabled # see https://github.com/NixOS/nixpkgs/issues/276691 - + lib.optionalString (!enableCuda) '' + + optionalString (!enableCuda) '' mkdir -p "$cxxdev/nix-support" echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs" '' + # remove the requirement that the exact same version of CUDA is used in packages + # consuming OpenCV's CMakes files + + optionalString enableCuda '' + substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \ + --replace-fail \ + 'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \ + 'find_host_package(CUDA REQUIRED)' \ + --replace-fail \ + 'message(FATAL_ERROR "OpenCV static library was compiled with CUDA' \ + 'message("OpenCV static library was compiled with CUDA' + '' # install python distribution information, so other packages can `import opencv` - + lib.optionalString enablePython '' + + optionalString enablePython '' pushd $NIX_BUILD_TOP/$sourceRoot/modules/python/package python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . @@ -536,18 +555,18 @@ effectiveStdenv.mkDerivation { tests = { inherit (gst_all_1) gst-plugins-bad; } - // lib.optionalAttrs (!effectiveStdenv.isDarwin) { inherit qimgv; } - // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } - // lib.optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") { + // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) { inherit qimgv; } + // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } + // optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") { opencv4-tests = callPackage ./tests.nix { inherit enableGStreamer enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests testDataSrc; inherit opencv4; }; } - // lib.optionalAttrs (enableCuda) { + // optionalAttrs (enableCuda) { no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; }; }; - } // lib.optionalAttrs enablePython { pythonPath = [ ]; }; + } // optionalAttrs enablePython { pythonPath = [ ]; }; meta = { description = "Open Computer Vision Library with more than 500 algorithms"; diff --git a/pkgs/development/libraries/opencv/tests.nix b/pkgs/development/libraries/opencv/tests.nix index d1966b1a4aa82..dec10c1b13ab8 100644 --- a/pkgs/development/libraries/opencv/tests.nix +++ b/pkgs/development/libraries/opencv/tests.nix @@ -26,7 +26,7 @@ let "video" #"videoio" # - a lot of GStreamer warnings and failed tests #"dnn" #- some caffe tests failed, probably because github workflow also downloads additional models - ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ] + ] ++ lib.optionals (!stdenv.hostPlatform.isAarch64 && enableGStreamer) [ "gapi" ] ++ lib.optionals (enableGtk2 || enableGtk3) [ "highgui" ]; perfTestNames = [ "calib3d" @@ -38,8 +38,8 @@ let "photo" "stitching" "video" - ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ]; - testRunner = lib.optionalString (!stdenv.isDarwin) "${lib.getExe xvfb-run} -a "; + ] ++ lib.optionals (!stdenv.hostPlatform.isAarch64 && enableGStreamer) [ "gapi" ]; + testRunner = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${lib.getExe xvfb-run} -a "; testsPreparation = '' touch $out # several tests want a write access, so we have to copy files diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 04ffde29daa02..ba66ba5be18a9 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' export CPPFLAGS="-I${getDev libmysqlclient}/include/mysql" - export LDFLAGS="-L${libmysqlclient}/lib/mysql -L${postgresql}/lib" + export LDFLAGS="-L${libmysqlclient}/lib/mysql" configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Extremely lightweight but extensible database access library written in C"; mainProgram = "odbx-sql"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 3bd5c76e56920..e7408ba37e672 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "3.1.11"; + version = "3.2.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "v${version}"; - hash = "sha256-lJaQGkhpKfSSNVbP+NqommagtoWyi8CdauVxEhiI9Bc="; + hash = "sha256-s172Sj1EvV7Lmnmd+xyKmYF2cDEa8Bot10ovggEsOFg="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { restinio http-parser openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 00b5d624153a3..8425d5a815bf9 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { "--with-milter=${libmilter}" "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" - ] ++ lib.optional stdenv.isDarwin "--with-unbound=${unbound}"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-unbound=${unbound}"; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; - buildInputs = [ libbsd openssl libmilter perl ] ++ lib.optional stdenv.isDarwin unbound; + buildInputs = [ libbsd openssl libmilter perl ] ++ lib.optional stdenv.hostPlatform.isDarwin unbound; postInstall = '' wrapProgram $out/sbin/opendkim-genkey \ diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index 9e6d6eaa65da9..56562f771698f 100644 --- a/pkgs/development/libraries/openexr/3.nix +++ b/pkgs/development/libraries/openexr/3.nix @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { # Without 'sse' enforcement tests fail on i686 as due to excessive precision as: # error reading back channel B pixel 21,-76 got -nan expected -nan - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-msse2 -mfpmath=sse"; # https://github.com/AcademySoftwareFoundation/openexr/issues/1400 - doCheck = !stdenv.isAarch32; + doCheck = !stdenv.hostPlatform.isAarch32; passthru.tests = { musl = pkgsCross.musl64.openexr_3; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index b45557b95c1b2..a79759be24f22 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { # https://github.com/AcademySoftwareFoundation/openexr/issues/1400 # https://github.com/AcademySoftwareFoundation/openexr/issues/1281 - doCheck = !stdenv.isAarch32 && !stdenv.isi686; + doCheck = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isi686; meta = with lib; { description = "High dynamic-range (HDR) image file format"; diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/development/libraries/openfec/default.nix index 964f5d86f6724..8cee39c3a3ab8 100644 --- a/pkgs/development/libraries/openfec/default.nix +++ b/pkgs/development/libraries/openfec/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { find $dev/include -type f -a ! -iname '*.h' -delete install -D -m755 -t $out/lib ../bin/Release/libopenfec${so} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libopenfec${so} $out/lib/libopenfec${so} '' + '' ln -s libopenfec${so} $out/lib/libopenfec${so}.1 diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix deleted file mode 100644 index cf49842291296..0000000000000 --- a/pkgs/development/libraries/openfst/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "openfst"; - version = "1.8.2"; - - src = fetchurl { - url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; - sha256 = "sha256-3ph782JHIcXVujIa+VdRiY5PS7Qcijbi1k8GJ2Vti0I="; - }; - - configureFlags = [ - "--enable-compact-fsts" - "--enable-compress" - "--enable-const-fsts" - "--enable-far" - "--enable-linear-fsts" - "--enable-lookahead-fsts" - "--enable-mpdt" - "--enable-ngram-fsts" - "--enable-pdt" - ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - description = "Library for working with finite-state transducers"; - longDescription = '' - Library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs). - FSTs have key applications in speech recognition and synthesis, machine translation, optical character recognition, - pattern matching, string processing, machine learning, information extraction and retrieval among others - ''; - homepage = "https://www.openfst.org/twiki/bin/view/FST/WebHome"; - license = licenses.asl20; - maintainers = [ maintainers.dfordivam ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/development/libraries/opengrm-ngram/default.nix deleted file mode 100644 index b84e4159f3e73..0000000000000 --- a/pkgs/development/libraries/opengrm-ngram/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, autoreconfHook, fetchurl, openfst }: - -stdenv.mkDerivation rec { - pname = "opengrm-ngram"; - version = "1.3.14"; - - src = fetchurl { - url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz"; - sha256 = "sha256-ivMPDy6CPM17hWCToLOVzUgcWZiEt2pjYeizeBLYnYc="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ openfst ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Library to make and modify n-gram language models encoded as weighted finite-state transducers"; - homepage = "https://www.openfst.org/twiki/bin/view/GRM/NGramLibrary"; - license = licenses.asl20; - maintainers = with maintainers; [ mic92 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index ad68505ad609f..cfd38708cd9aa 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -14,7 +14,7 @@ }: let - stdenv' = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "openimagedenoise"; @@ -39,11 +39,11 @@ stdenv'.mkDerivation (finalAttrs: { python3 ispc ] ++ lib.optional cudaSupport cudaPackages.cuda_nvcc - ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; buildInputs = [ tbb ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ Accelerate diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 0bbb6eea2f9d5..51c1f255c3265 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.5.14.0"; + version = "2.5.15.0"; src = fetchFromGitHub { - owner = "OpenImageIO"; - repo = "oiio"; + owner = "AcademySoftwareFoundation"; + repo = "OpenImageIO"; rev = "v${version}"; - hash = "sha256-EIJVqY97C1GaQBYQcSN3ETS63MOPFq/4HjmFJqKbt9U="; + hash = "sha256-jtX6IDR/yFn10hf+FxM0s4St9XYxhQ1UlMAsNzOxuio="; }; # Workaround broken zlib version detecion in CMake < 3.37. diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 25b43b3600e95..4af80702b556d 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ++ lib.optionals jpipServerSupport [ curl fcgi ] ++ lib.optional (jpipLibSupport) jdk; - doCheck = (!stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 + doCheck = (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 nativeCheckInputs = [ jpylyzer ]; checkPhase = '' substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \ diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index e25f0a8c172d8..8ca98b386aa2c 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { libsodium libtool openssl - ] ++ lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libxcrypt # causes linking issues on *-darwin systemdMinimal ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-yielding_select=yes" "ac_cv_func_memcmp_working=yes" - ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; env.NIX_CFLAGS_COMPILE = toString [ "-DLDAPI_SOCK=\"/run/openldap/ldapi\"" ]; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index ea98064820c2a..a1fb9454561b7 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -29,7 +29,7 @@ # Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default enablePrefix ? false, # Enable libfabric support (necessary for Omnipath networks) on x86_64 linux - fabricSupport ? stdenv.isLinux && stdenv.isx86_64, + fabricSupport ? stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64, # Enable Fortran support fortranSupport ? true, # AVX/SSE options. See passthru.defaultAvxOptions for the available options. @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "man" "dev" ]; @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { libevent hwloc ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libnl numactl pmix @@ -95,9 +95,9 @@ stdenv.mkDerivation (finalAttrs: { prrte ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] - ++ lib.optionals (stdenv.isLinux || stdenv.isFreeBSD) [ rdma-core ] + ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isFreeBSD) [ rdma-core ] # needed for internal pmix - ++ lib.optionals (!stdenv.isLinux) [ python3 ] + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ python3 ] ++ lib.optionals fabricSupport [ libpsm2 libfabric @@ -115,11 +115,11 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ (lib.enableFeature cudaSupport "mca-dso") (lib.enableFeature fortranSupport "mpi-fortran") - (lib.withFeatureAs stdenv.isLinux "libnl" (lib.getDev libnl)) + (lib.withFeatureAs stdenv.hostPlatform.isLinux "libnl" (lib.getDev libnl)) "--with-pmix=${lib.getDev pmix}" "--with-pmix-libdir=${lib.getLib pmix}/lib" # Puts a "default OMPI_PRTERUN" value to mpirun / mpiexec executables - (lib.withFeatureAs stdenv.isLinux "prrte" (lib.getBin prrte)) + (lib.withFeatureAs stdenv.hostPlatform.isLinux "prrte" (lib.getBin prrte)) (lib.withFeature enableSGE "sge") (lib.enableFeature enablePrefix "mpirun-prefix-by-default") # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build @@ -175,7 +175,9 @@ stdenv.mkDerivation (finalAttrs: { // lib.optionalAttrs fortranSupport { "fort" = [ "gfortran" - "${targetPackages.gfortran}/bin/${targetPackages.gfortran.targetPrefix}gfortran" + "${targetPackages.gfortran or gfortran}/bin/${ + targetPackages.gfortran.targetPrefix or gfortran.targetPrefix + }gfortran" ]; }; # The -wrapper-data.txt files that are not symlinks, need to be iterated as @@ -217,7 +219,7 @@ stdenv.mkDerivation (finalAttrs: { # we currently don't perform these substitutions on other platforms, # until a Darwin user will care enough about this cross platform # related substitution. - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace "''${!outputDev}/share/openmpi/${part1}${part2}-wrapper-data.txt" \ --replace-fail \ compiler=${lib.elemAt wrapperDataSubstitutions.${part2} 0} \ @@ -238,11 +240,11 @@ stdenv.mkDerivation (finalAttrs: { postFixup = lib.optionalString (lib.elem "man" finalAttrs.outputs) '' - remove-references-to -t "''${!outputMan}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.sharedLibrary}) + remove-references-to -t "''${!outputMan}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library}) '' + lib.optionalString (lib.elem "dev" finalAttrs.outputs) '' remove-references-to -t "''${!outputDev}" $out/bin/mpirun - remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.sharedLibrary}) + remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library}) # The path to the wrapper is hard coded in libopen-pal.so, which we just cleared. wrapProgram "''${!outputDev}/bin/opal_wrapper" \ diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 5e7de98efc461..910a8bc827379 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices SystemConfiguration ]); @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-std=c++14"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 3566e458598c5..1b0f4b229d36f 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake doxygen ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXinerama libXrandr libGLU libGL ] ++ [ glib libxml2 pcre zlib @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { ++ lib.optional sdlSupport SDL2 ++ lib.optional restSupport asio ++ lib.optionals withExamples [ fltk ] - ++ lib.optionals (!stdenv.isDarwin) [ ] - ++ lib.optionals stdenv.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ] ++ lib.optional (restSupport || colladaSupport) boost ; diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index e390cfd932fdd..33b01b764709b 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; knownVulnerabilities = [ "CVE-2023-29552: UDP Reflection Attack with ampliciation factor of up to 2200" ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5ddb26798af51..40edcdee6bc3e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -4,7 +4,8 @@ , withZlib ? false, zlib , enableSSL2 ? false , enableSSL3 ? false -, enableKTLS ? stdenv.isLinux +, enableMD2 ? false +, enableKTLS ? stdenv.hostPlatform.isLinux , static ? stdenv.hostPlatform.isStatic # path to openssl.cnf file. will be placed in $etc/etc/ssl/openssl.cnf to replace the default , conf ? null @@ -87,6 +88,7 @@ let x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; powerpc64-linux = "./Configure linux-ppc64"; + riscv32-linux = "./Configure ${if lib.versionAtLeast version "3.2" then "linux32-riscv32" else "linux-latomic"}"; riscv64-linux = "./Configure linux64-riscv64"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform @@ -102,6 +104,7 @@ let (toString stdenv.hostPlatform.parsed.cpu.bits)}" else if stdenv.hostPlatform.isLinux then if stdenv.hostPlatform.isx86_64 then "./Configure linux-x86_64" + else if stdenv.hostPlatform.isMicroBlaze then "./Configure linux-latomic" else if stdenv.hostPlatform.isMips32 then "./Configure linux-mips32" else if stdenv.hostPlatform.isMips64n32 then "./Configure linux-mips64" else if stdenv.hostPlatform.isMips64n64 then "./Configure linux64-mips64" @@ -128,7 +131,8 @@ let ] ++ lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" - ] ++ lib.optional enableSSL2 "enable-ssl2" + ] ++ lib.optional enableMD2 "enable-md2" + ++ lib.optional enableSSL2 "enable-ssl2" ++ lib.optional enableSSL3 "enable-ssl3" # We select KTLS here instead of the configure-time detection (which we patch out). # KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it. diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index b5c2847fb9ba8..4cee5df5dc3d7 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi ] - ++ lib.optionals (openclSupport && !stdenv.isDarwin) [ ocl-icd ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals (openclSupport && !stdenv.hostPlatform.isDarwin) [ ocl-icd ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ OpenCL Cocoa CoreVideo @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { [ "-DNO_TUTORIALS=1" "-DNO_REGRESSION=1" "-DNO_EXAMPLES=1" - (lib.cmakeBool "NO_METAL" (!stdenv.isDarwin)) + (lib.cmakeBool "NO_METAL" (!stdenv.hostPlatform.isDarwin)) (lib.cmakeBool "NO_OPENCL" (!openclSupport)) (lib.cmakeBool "NO_CUDA" (!cudaSupport)) - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DGLEW_INCLUDE_DIR=${glew.dev}/include" "-DGLEW_LIBRARY=${glew.dev}/lib" ] ++ lib.optionals cudaSupport [ diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 2b1fca97f06e2..72d2d7dce0c84 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" "-DOPENVDB_BUILD_NANOVDB=ON"]; # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer - env = lib.optionalAttrs (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" && lib.versionAtLeast tbb.version "2021.8.0") { + env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" && lib.versionAtLeast tbb.version "2021.8.0") { NIX_CFLAGS_COMPILE = "-faligned-allocation"; }; diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index a1f30277151b2..98129c5944d15 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { (cmakeBool "ENABLE_SAMPLES" false) # features - (cmakeBool "ENABLE_INTEL_CPU" stdenv.isx86_64) + (cmakeBool "ENABLE_INTEL_CPU" stdenv.hostPlatform.isx86_64) (cmakeBool "ENABLE_JS" false) (cmakeBool "ENABLE_LTO" true) (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false) @@ -177,7 +177,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.openvinotoolkit.org/"; license = with licenses; [ asl20 ]; platforms = platforms.all; - broken = stdenv.isDarwin; # Cannot find macos sdk + broken = stdenv.hostPlatform.isDarwin; # Cannot find macos sdk maintainers = with maintainers; [ tfmoraes ]; }; } diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 4df98d28fd096..a12abd5db557a 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - cmakeFlags="$cmakeFlags -DPACKAGE_ARCHITECTURE=$(uname -m)"; + appendToVar cmakeFlags "-DPACKAGE_ARCHITECTURE=$(uname -m)" ''; configureFlags = [ "--disable-more-warnings" ]; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 710d985ee346e..febbf5114e58e 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.1.38"; + version = "1.1.40"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-nM/c6fvjprQ5GQO4F13cOigi4xATgRTq+ebEwyv58gg="; + sha256 = "sha256-dKSQqiZtnxKj9arpxm9vwz8WzKBXh6y6vzZ9uHP7vX0="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 87381141d98f0..4d6a605bf0849 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -99,12 +99,12 @@ stdenv.mkDerivation { inherit pname version srcs; buildInputs = [ stdenv.cc.cc.lib ] - ++ optional stdenv.isLinux libaio + ++ optional stdenv.hostPlatform.isLinux libaio ++ optional odbcSupport unixODBC; nativeBuildInputs = [ makeWrapper unzip ] - ++ optional stdenv.isLinux autoPatchelfHook - ++ optional stdenv.isDarwin fixDarwinDylibNames; + ++ optional stdenv.hostPlatform.isLinux autoPatchelfHook + ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; outputs = [ "out" "dev" "lib" ]; @@ -125,7 +125,7 @@ stdenv.mkDerivation { ln -sfn $out/bin/sqlplus $out/bin/sqlplus64 ''; - postFixup = optionalString stdenv.isDarwin '' + postFixup = optionalString stdenv.hostPlatform.isDarwin '' for exe in "$out/bin/"* ; do if [ ! -L "$exe" ]; then install_name_tool -add_rpath "$lib/lib" "$exe" diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index 43822d76aa197..d149c48cc563b 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -34,7 +34,7 @@ let p2 = buildGoModule rec { # # but this package is no longer maintained. # - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }; p1 = buildGoModule rec { @@ -66,7 +66,7 @@ p1 = buildGoModule rec { # # but this package is no longer maintained. # - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }; in diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index b7d3d92db0bbf..e39f059e31d26 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -22,17 +22,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen nlopt boost tbb ] ++ lib.optional (!stdenv.isDarwin) ipopt; + buildInputs = [ eigen nlopt boost tbb ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) ipopt; cmakeFlags = [ "-DPAGMO_BUILD_TESTS=${if runTests then "ON" else "OFF"}" "-DPAGMO_WITH_EIGEN3=yes" "-DPAGMO_WITH_NLOPT=yes" "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt${stdenv.hostPlatform.extensions.sharedLibrary}" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DPAGMO_WITH_IPOPT=yes" "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # FIXME: fails ipopt test with Invalid_Option on darwin, so disable. "-DPAGMO_WITH_IPOPT=no" "-DLLVM_USE_LINKER=gold" diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index d91552e3799a5..4b442a0ff900b 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -16,7 +16,7 @@ , ninja , glib , python3 -, x11Support? !stdenv.isDarwin, libXft +, x11Support? !stdenv.hostPlatform.isDarwin, libXft , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , buildPackages, gobject-introspection , testers @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fribidi libthai - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon CoreGraphics diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 600c7b0eb0585..1dd52ab7ff36f 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libtiff eigen ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; # The tests use cmake's findPackage to find the installed version of # pangolin, which isn't what we want (or available). diff --git a/pkgs/development/libraries/pangomm/2.42.nix b/pkgs/development/libraries/pangomm/2.42.nix index 267e46c48c3d4..ebbaee6685630 100644 --- a/pkgs/development/libraries/pangomm/2.42.nix +++ b/pkgs/development/libraries/pangomm/2.42.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "C++ interface to the Pango text rendering library"; homepage = "https://www.pango.org/"; license = with licenses; [ lgpl2 lgpl21 ]; diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix index fa4148e06aa02..3b513b889937e 100644 --- a/pkgs/development/libraries/pangomm/2.48.nix +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meson ninja python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 02a76869cf1ed..65dede46ee9eb 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 05c8abfafb2a6..2c117bdabb900 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -39,10 +39,10 @@ stdenv.mkDerivation rec { swig xorg.libXi xorg.libXmu - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.GLUT - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libglut libGLU libGL diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix index 7a7b8475d7c46..0391b72ada89a 100644 --- a/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/pkgs/development/libraries/pc-ble-driver/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DNRF_BLE_DRIVER_VERSION=${version}" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "-DARCH=arm64" ]; @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 347e8b5cdf2c1..1152283b1f2c3 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -10,7 +10,7 @@ , pkg-config , portaudio , which -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux }: stdenv.mkDerivation (finalAttrs: { @@ -35,12 +35,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ portaudio ] - ++ lib.optional stdenv.isLinux alsa-lib + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio; # touch ChangeLog to avoid below error on darwin: # Makefile.am: error: required file './ChangeLog.md' not found - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' touch ChangeLog '' + '' ./autogen.sh diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index ced4e04c0b876..3ad9df8b64bdb 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.linus ]; - broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11 + broken = stdenv.hostPlatform.isi686; # https://github.com/imneme/pcg-c/issues/11 }; } diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 36e54f873cc7c..41639d300ecdc 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { qtbase libXt ] - ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa AGL ]; propagatedBuildInputs = [ boost @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { vtk ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ lib.optionals cudaSupport [ "-DWITH_CUDA=true" ]; diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index c85459c244c91..2ab81728d5ea5 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -28,19 +28,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdal"; - version = "2.7.2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = finalAttrs.version; - sha256 = "sha256-ukBZLr/iyYQ68sv9JWrR4YP0ahHfGhytgcWKPzrF3Ps="; + hash = "sha256-VHcUyYADmNzxZ+Ix56TNuaP9wG+vRlEl71cNM0uMaHg="; }; - patches = [ - ./pdal.pc.in.patch - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/development/libraries/pdal/pdal.pc.in.patch b/pkgs/development/libraries/pdal/pdal.pc.in.patch deleted file mode 100644 index 1d981c0f6a975..0000000000000 --- a/pkgs/development/libraries/pdal/pdal.pc.in.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/apps/pdal.pc.in b/apps/pdal.pc.in -index 6885221cacc8..a07ee82cea68 100644 ---- a/apps/pdal.pc.in -+++ b/apps/pdal.pc.in -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=@CMAKE_INSTALL_PREFIX@/bin --libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ - includedir=@CMAKE_INSTALL_PREFIX@/include - - Name: PDAL diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 27f7c019ac779..e00be9c841f9d 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -16,7 +16,7 @@ let nativeBuildInputs = [ cmake doxygen ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; doInstallCheck = true; diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index c2dbb1235b487..b083f278af9d1 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; # For some reason zlib was only needed after bump to gfortran8 - buildInputs = [ hoppet lhapdf root5 zlib ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ hoppet lhapdf root5 zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; patches = [ ./bad_code.patch @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/Makefile.in \ --replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib" - '' + (lib.optionalString stdenv.isDarwin '' + '' + (lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/Makefile.in \ --replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib" ''); diff --git a/pkgs/development/libraries/physics/cernlib/0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch b/pkgs/development/libraries/physics/cernlib/0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch deleted file mode 100644 index bc8c77f913c62..0000000000000 --- a/pkgs/development/libraries/physics/cernlib/0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch +++ /dev/null @@ -1,94 +0,0 @@ -From a69607c511b6da94cde477283b129cbc9cfdd5a3 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Tue, 11 Aug 2020 12:32:06 +0200 -Subject: [PATCH] Use `strerror` rather than `sys_errlist` to fix compilation - w/glibc-2.32 - -To quote the release-notes[1]: - - All programs should use - strerror or strerror_r instead. - -[1] https://sourceware.org/pipermail/libc-announce/2020/000029.html ---- - 2006/src/packlib/cspack/sysreq/serror.c | 10 +--------- - 2006/src/packlib/cspack/sysreq/socket.c | 2 +- - 2006/src/packlib/kernlib/kernbit/z268/systems.c | 4 ++-- - 2006/src/pawlib/paw/piafs/piafc.c | 5 +---- - 4 files changed, 5 insertions(+), 16 deletions(-) - -diff --git a/2006/src/packlib/cspack/sysreq/serror.c b/2006/src/packlib/cspack/sysreq/serror.c -index 3667c42a..c560e499 100644 ---- a/2006/src/packlib/cspack/sysreq/serror.c -+++ b/2006/src/packlib/cspack/sysreq/serror.c -@@ -176,15 +176,7 @@ int n; - } - else { - #if !defined(vms) -- if ((n>0) && (n<sys_nerr)) { -- return(sys_errlist[n]); -- } -- else { -- (void) sprintf(buf,"%s: %d\n", -- sys_serrlist[SEMAXERR+1-SEBASEOFF], -- n); -- return(buf); -- } -+ return strerror(n); - #else /* vms */ - /* - * There are (were) some bugs is DEC C compilers (/OPT), just check -diff --git a/2006/src/packlib/cspack/sysreq/socket.c b/2006/src/packlib/cspack/sysreq/socket.c -index ceb5bd63..34c2a7bc 100644 ---- a/2006/src/packlib/cspack/sysreq/socket.c -+++ b/2006/src/packlib/cspack/sysreq/socket.c -@@ -412,7 +412,7 @@ char * - s_errmsg() /* return last error message */ - { - #if !defined(vms) -- return(sys_errlist[errno]); -+ return(strerror(errno)); - #else /* vms */ - #if defined(MULTINET) && (MULTINET == 1) - return(vms_errno_string()); -diff --git a/2006/src/packlib/kernlib/kernbit/z268/systems.c b/2006/src/packlib/kernlib/kernbit/z268/systems.c -index 98459459..d1ad63ed 100644 ---- a/2006/src/packlib/kernlib/kernbit/z268/systems.c -+++ b/2006/src/packlib/kernlib/kernbit/z268/systems.c -@@ -134,7 +134,7 @@ int *ovflw; - #endif /* hpux */ - - if ( (ps=(FILE *)popen(command,"r"))==NULL ) { -- fprintf(stderr,"systems(): popen(): %s\n",sys_errlist[errno] ); -+ fprintf(stderr,"systems(): popen(): %s\n",strerror(errno) ); - *rc= -errno; - *chars=0 ; - *l=0 ; -@@ -144,7 +144,7 @@ int *ovflw; - rcode = fread(buf, 1, buflen , ps ); - if ( rcode < 0 ) { - fprintf(stderr,"systems(): pipe fread(): %s\n", -- sys_errlist[errno] ); -+ strerror(errno) ); - buf[0]='\n'; - *rc= -errno; - *chars=0 ; -diff --git a/2006/src/pawlib/paw/piafs/piafc.c b/2006/src/pawlib/paw/piafs/piafc.c -index b163f80c..4d8d5528 100644 ---- a/2006/src/pawlib/paw/piafs/piafc.c -+++ b/2006/src/pawlib/paw/piafs/piafc.c -@@ -1795,10 +1795,7 @@ static void fatalperror(char *msg) - extern char *sys_errlist[]; - #endif - -- if ((unsigned) errno < sys_nerr) -- sprintf(buf, "%s: %s", msg, sys_errlist[errno]); -- else -- sprintf(buf, "%s: Error %d", msg, errno); -+ sprintf(buf, "%s: %s", msg, strerror(errno)); - - fatal(buf); - } --- -2.25.4 - diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index b589524113d2c..0673aeefffb1d 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -1,102 +1,73 @@ -{ lib, stdenv, fetchurl, gfortran, imake, makedepend, motif, xorg, libxcrypt }: +{ + lib, + stdenv, + fetchpatch, + fetchurl, + cmake, + freetype, + gfortran, + openssl, + libnsl, + motif, + xorg, + libxcrypt, +}: stdenv.mkDerivation rec { - version = "2006"; + version = "2024.06.12.0"; pname = "cernlib"; + year = lib.versions.major version; src = fetchurl { urls = [ - "https://ftp.riken.jp/cernlib/download/${version}_source/tar/${version}_src.tar.gz" - "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz" + "https://ftp.riken.jp/cernlib/download/${year}_source/tar/cernlib-cernlib-${version}-free.tar.gz" + "https://cernlib.web.cern.ch/download/${year}_source/tar/cernlib-cernlib-${version}-free.tar.gz" ]; - sha256 = "0awla1rl96z82br7slcmg8ks1d2a7slk6dj79ywb871j2ksi3fky"; + hash = "sha256-SEFgQjPBkmRoaMD/7yXiXO9DZNrRhqZ01kptSDQur84="; }; - buildInputs = with xorg; [ gfortran motif libX11 libXft libXt libxcrypt ]; - nativeBuildInputs = [ imake makedepend ]; - sourceRoot = "."; - - patches = [ ./patch.patch ./0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch ]; + patches = [ + (fetchpatch { + url = "https://github.com/user-attachments/files/16832928/geant321-fix-weak-alias-on-darwin.patch"; + hash = "sha256-YzaUh4rJBszGdp5s/HDQMI5qQhCGrTt9P6XCgZOFn1I="; + }) + ]; postPatch = '' - echo 'InstallBinSubdirs(packlib scripts)' >> 2006/src/Imakefile - substituteInPlace 2006/src/config/site.def \ - --replace "# define MakeCmd gmake" "# define MakeCmd make" - substituteInPlace 2006/src/config/lnxLib.rules \ - --replace "# lib" "// lib" - - substituteInPlace 2006/src/config/linux.cf \ - --replace "# ifdef Hasgfortran" "# if 1" \ - --replace "# define CcCmd gcc4" "# define CcCmd gcc" - substituteInPlace 2006/src/scripts/cernlib \ - --replace "-lnsl" "" - - # binutils 2.37 fix - substituteInPlace 2006/src/config/Imake.tmpl --replace "clq" "cq" + substituteInPlace CMakeLists.txt \ + --replace-fail "find_program ( SED NAMES gsed" "find_program ( SED NAMES sed" ''; + # gfortran warning's on iframework messes with CMake's check_fortran_compiler_flag + # see also https://github.com/NixOS/nixpkgs/issues/27218 preConfigure = '' - export CERN=`pwd` - export CERN_LEVEL=${version} - export CERN_ROOT=$CERN/$CERN_LEVEL - export CVSCOSRC=`pwd`/$CERN_LEVEL/src - export PATH=$PATH:$CERN_ROOT/bin + export NIX_CFLAGS_COMPILE="$(echo $NIX_CFLAGS_COMPILE | sed 's|-iframework [^ ]*||g')" ''; - FFLAGS = lib.optionals (lib.versionAtLeast gfortran.version "10.0.0") [ - # Fix https://github.com/vmc-project/geant3/issues/17 - "-fallow-invalid-boz" - - # Fix for gfortran 10 - "-fallow-argument-mismatch" - ]; - - NIX_CFLAGS = [ "-Wno-return-type" ]; - - # Workaround build failure on -fno-common toolchains: - # ld: libpacklib.a(kedit.o):kuip/klink1.h:11: multiple definition of `klnkaddr'; - # libzftplib.a(zftpcdf.o):zftp/zftpcdf.c:155: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - makeFlags = [ - "FORTRANOPTIONS=$(FFLAGS)" - "CCOPTIONS=$(NIX_CFLAGS)" - ]; - - configurePhase = '' - runHook preConfigure - - cd $CERN_ROOT - mkdir -p build - cd $CERN_ROOT/build - $CVSCOSRC/config/imake_boot - - runHook postConfigure - ''; - - preBuild = '' - make -j $NIX_BUILD_CORES $makeFlags bin/kuipc - make -j $NIX_BUILD_CORES $makeFlags scripts/Makefile - pushd scripts - make -j $NIX_BUILD_CORES $makeFlags bin/cernlib - popd - ''; - - installTargets = [ "install.bin" "install.lib" "install.include" ]; - installFlags = [ - "CERN_BINDIR=${placeholder "out"}/bin" - "CERN_INCLUDEDIR=${placeholder "out"}/include" - "CERN_LIBDIR=${placeholder "out"}/lib" - "CERN_SHLIBDIR=${placeholder "out"}/libexec" - ]; + nativeBuildInputs = [ cmake ]; + buildInputs = with xorg; [ + freetype + gfortran + openssl + libX11 + libXaw + libXft + libXt + libxcrypt + motif + ] ++ lib.optional stdenv.hostPlatform.isLinux libnsl; setupHook = ./setup-hook.sh; meta = { homepage = "http://cernlib.web.cern.ch"; description = "Legacy collection of libraries and modules for data analysis in high energy physics"; - broken = stdenv.isDarwin; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + "x86_64-darwin" + ]; maintainers = with lib.maintainers; [ veprbl ]; license = lib.licenses.gpl2; }; diff --git a/pkgs/development/libraries/physics/cernlib/patch.patch b/pkgs/development/libraries/physics/cernlib/patch.patch deleted file mode 100644 index 2d75b6bf0f88c..0000000000000 --- a/pkgs/development/libraries/physics/cernlib/patch.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff --git a/2006/src/config/Imake.tmpl b/2006/src/config/Imake.tmpl -index 054fb04..a3b3828 100644 ---- a/2006/src/config/Imake.tmpl -+++ b/2006/src/config/Imake.tmpl -@@ -455,7 +455,7 @@ XCOMM the platform-specific parameters - edit site.def to change - #define NoRConst NO /* YES if const for structs of funcs is bad */ - #endif - #ifndef InstPgmFlags --#define InstPgmFlags -s -+#define InstPgmFlags - #endif - #ifndef InstBinFlags - #define InstBinFlags -m 0755 -diff --git a/2006/src/config/biglib.rules b/2006/src/config/biglib.rules -index c90e58a..9173bdc 100644 ---- a/2006/src/config/biglib.rules -+++ b/2006/src/config/biglib.rules -@@ -368,7 +368,7 @@ define build-object-list @@\ - @ (set -e;\ @@\ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ - subdirs=Quote(dirs);\ @@\ -- list=`/bin/pwd`/$@;\ @@\ -+ list=`pwd`/$@;\ @@\ - for dir in $$subdirs; do \ @@\ - (set -e;cd $$dir;SedCmd -e "\=^[^/]=s=^.=$$dir/&=" $@ >> $$list);\@@\ - done) || (rm $@; exit 1) @@\ -diff --git a/2006/src/config/imake_boot b/2006/src/config/imake_boot -index b52d0d3..69cf1b3 100755 ---- a/2006/src/config/imake_boot -+++ b/2006/src/config/imake_boot -@@ -10,8 +10,8 @@ if [ "$CVSCOSRC" = "" ] ; then - fi - if [ -f Imakefile ] ; then - imake -DUseInstalled -I$CVSCOSRC/config \ -- -DTOPDIR=`/bin/pwd` -DCURDIR= -fImakefile -+ -DTOPDIR=`pwd` -DCURDIR= -fImakefile - else - imake -DUseInstalled -I$CVSCOSRC/config \ -- -DTOPDIR=`/bin/pwd` -DCURDIR= -f$CVSCOSRC/Imakefile -+ -DTOPDIR=`pwd` -DCURDIR= -f$CVSCOSRC/Imakefile - fi -diff --git a/2006/src/config/linux-lp64.cf b/2006/src/config/linux-lp64.cf -index e071b2f..3cc5c3b 100644 ---- a/2006/src/config/linux-lp64.cf -+++ b/2006/src/config/linux-lp64.cf -@@ -173,7 +173,7 @@ - #define FortranCmd g77 - #define XargsCmd xargs - #define FortranSaveFlags /* */ /* Everything static !? */ --#define DefaultFCOptions -fno-automatic -fno-second-underscore -fugly-complex -+#define DefaultFCOptions -fno-automatic -fno-second-underscore - #define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC -DCERNLIB_QMLXIA64 - - # endif -diff --git a/2006/src/config/linux.cf b/2006/src/config/linux.cf -index cc0bee5..a8dd954 100644 ---- a/2006/src/config/linux.cf -+++ b/2006/src/config/linux.cf -@@ -258,7 +258,7 @@ endif @@\ - #define FortranCmd g77 - #define XargsCmd xargs - #define FortranSaveFlags /* */ /* Everything static !? */ --#define DefaultFCOptions -fno-automatic -fno-second-underscore -fugly-complex -+#define DefaultFCOptions -fno-automatic -fno-second-underscore - #define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC - - # endif -diff --git a/2006/src/packlib/kuip/code_kuip/kkern.c b/2006/src/packlib/kuip/code_kuip/kkern.c -index 3a5579f..5f3c352 100644 ---- a/2006/src/packlib/kuip/code_kuip/kkern.c -+++ b/2006/src/packlib/kuip/code_kuip/kkern.c -@@ -543,24 +543,6 @@ char *str0dup( const char *str ) - - - /* -- * like strdup() but string is n characters long and not terminated -- */ --char *strndup( const char *str, -- size_t len ) --{ -- size_t bytes = len + 1; -- char *p; -- -- if( bytes < ALLOC_MIN_BYTES ) -- bytes = ALLOC_MIN_BYTES; -- -- p = strncpy( malloc( bytes ), str, len ); -- p[len] = '\0'; -- return p; --} -- -- --/* - * strdup() of character representation of integer n - */ - char *stridup( int n ) -diff --git a/2006/src/packlib/kuip/code_kuip/kmenu.c b/2006/src/packlib/kuip/code_kuip/kmenu.c -index f135b07..23007a8 100644 ---- a/2006/src/packlib/kuip/code_kuip/kmenu.c -+++ b/2006/src/packlib/kuip/code_kuip/kmenu.c -@@ -1404,7 +1404,7 @@ void interactive_find( char *expr, int keym ) - printf ("See also:\n "); - for (i = 0; i < nval; i++) { - if (i == ncmd) continue; -- printf (flis_name[i]); -+ printf ("%s", flis_name[i]); - if (i < nval-1) - printf (", "); - else -diff --git a/2006/src/packlib/kuip/kuip/kstring.h b/2006/src/packlib/kuip/kuip/kstring.h -index 7811f15..12a1344 100644 ---- a/2006/src/packlib/kuip/kuip/kstring.h -+++ b/2006/src/packlib/kuip/kuip/kstring.h -@@ -21,7 +21,6 @@ extern "C" { - */ - - #ifndef WIN32 --extern void* memmove( void* dst, const void* src, size_t n ); - #endif - - /* GF. make conform to kkern.c#if !defined(__convexc__)*/ -@@ -46,7 +45,6 @@ extern char* str4dup( const char* str1, const char* str2, const char* str3, - const char* str4 ); - extern char* str5dup( const char* str1, const char* str2, const char* str3, - const char* str4, const char* str5 ); --extern char* strndup( const char* buf, size_t n ); - extern char* stridup( int i ); - - extern char* mstrcat( char* ptr, const char* str ); -diff --git a/2006/src/pawlib/paw/cpaw/bugrep.c b/2006/src/pawlib/paw/cpaw/bugrep.c -index d503a45..d26e30f 100644 ---- a/2006/src/pawlib/paw/cpaw/bugrep.c -+++ b/2006/src/pawlib/paw/cpaw/bugrep.c -@@ -432,51 +432,7 @@ br_add_config( char * tmp_file ) - - static int - br_mail_file( char *addr, char *subj, char *file ) --#if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_MACOSX)) --{ -- FILE *mfp, *fp; -- char line[1024], my_addr[L_cuserid]; -- time_t clock; -- struct tm *ts; -- -- fp = fopen( file, "r" ); -- if ( fp == NULL ) { -- printf( "BUGREPORT: cannot (re)open temporary file\n" ); -- return MAIL_ERROR; -- } -- -- cuserid( my_addr ); -- -- sprintf( line, "/usr/lib/sendmail -t" ); -- mfp = popen( line, "w" ); -- -- if ( mfp == NULL ) { -- printf( "BUGREPORT: cannot run sendmail\n" ); -- return MAIL_ERROR; -- } -- -- -- clock = time( (time_t *) 0 ); -- ts = localtime( &clock ); -- strftime( line, sizeof( line ), -- "%a, %d %h %y %H:%M:%S", ts ); -- fprintf ( mfp, "To: %s\n", addr ); -- fprintf ( mfp, "Bcc: %s\n", my_addr ); -- fprintf ( mfp, "Date: %s\n", line ); -- fprintf ( mfp, "Subject: %s\n", subj ); -- fprintf ( mfp, "\n" ); -- -- while( fgets( line, sizeof( line ), fp ) != NULL ) { -- fputs( line, mfp ); -- } -- fclose( fp ); -- -- pclose( mfp ); -- -- return MAIL_OK; --} --#endif --#if defined(CERNLIB_MACOSX) -+#if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_WINNT)) - { - FILE *mfp, *fp; - char line[1024], *my_addr; diff --git a/pkgs/development/libraries/physics/cernlib/setup-hook.sh b/pkgs/development/libraries/physics/cernlib/setup-hook.sh index d837593277606..d48b98cfa6241 100644 --- a/pkgs/development/libraries/physics/cernlib/setup-hook.sh +++ b/pkgs/development/libraries/physics/cernlib/setup-hook.sh @@ -1,3 +1,3 @@ export CERN_LEVEL=@version@ export CERN=@out@ -export CERN_ROOT=$CERN/$CERN_LEVEL +export CERN_ROOT=$CERN diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 7349c708e3d91..31e76793ec018 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -4,7 +4,7 @@ , enableQt ? enableQT , enableXM ? false , libGLX -, enableOpenGLX11 ? !libGLX.meta.broken +, enableOpenGLX11 ? !stdenv.isDarwin , enablePython ? false , enableRaytracerX11 ? false @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_SYSTEM_EXPAT=ON" "-DGEANT4_USE_SYSTEM_ZLIB=ON" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" - ] ++ lib.optionals (enableOpenGLX11 && stdenv.isDarwin) [ + ] ++ lib.optionals (enableOpenGLX11 && stdenv.hostPlatform.isDarwin) [ "-DXQuartzGL_INCLUDE_DIR=${libGLX.dev}/include" "-DXQuartzGL_gl_LIBRARY=${libGLX}/lib/libGL.dylib" ] ++ lib.optionals (enableMultiThreading && enablePython) [ @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Toolkit for the simulation of the passage of particles through matter"; longDescription = '' Geant4 is a toolkit for the simulation of the passage of particles through matter. diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index 53ee798c17b6d..c622d7562001c 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ++ lib.optional withPython python; # error: invalid version number in 'MACOSX_DEPLOYMENT_TARGET=11.0' - preConfigure = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index ef7ce7ce586de..c18ff9bef84dc 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; - broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... + broken = stdenv.hostPlatform.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... }; } diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 8111f61684305..26ca234c520c7 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # The Apple SDK only exports locale_t from xlocale.h whereas glibc # had decided that xlocale.h should be a part of locale.h - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.cc.isGNU) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.cc.isGNU) '' substituteInPlace src/GridPDF.cc --replace '#include <locale>' '#include <xlocale.h>' ''; diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 4e2d878db00cd..6085906758b07 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { env.CXXFLAGS="-std=c++11"; # error: no member named 'finite' in the global namespace; did you mean simply 'finite'? - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dfinite=isfinite"; meta = { homepage = "http://www.desy.de/~znagy/Site/NLOJet++.html"; diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 0eb45943e0aa9..55ba50f2ae318 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ rsync ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ boost fastjet hepmc zlib lhapdf ]; configureFlags = [ diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index 0e702510823b9..259e47426b766 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pico-sdk"; - version = "1.5.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "raspberrypi"; @@ -22,9 +22,9 @@ stdenv.mkDerivation (finalAttrs: { rev = finalAttrs.version; fetchSubmodules = withSubmodules; hash = if (withSubmodules) then - "sha256-GY5jjJzaENL3ftuU5KpEZAmEZgyFRtLwGVg3W1e/4Ho=" + "sha256-fVSpBVmjeP5pwkSPhhSCfBaEr/FEtA82mQOe/cHFh0A=" else - "sha256-JNcxd86XNNiPkvipVFR3X255boMmq+YcuJXUP4JwInU="; + "sha256-d6mEjuG8S5jvJS4g8e90gFII3sEqUVlT2fgd9M9LUkA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix deleted file mode 100644 index 750dc36e8a1a0..0000000000000 --- a/pkgs/development/libraries/pinocchio/default.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, casadi -, cmake -, boost -, eigen -, example-robot-data -, casadiSupport ? true -, collisionSupport ? true -, console-bridge -, jrl-cmakemodules -, hpp-fcl -, urdfdom -, pythonSupport ? false -, python3Packages -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pinocchio"; - version = "3.1.0"; - - src = fetchFromGitHub { - owner = "stack-of-tasks"; - repo = "pinocchio"; - rev = "v${finalAttrs.version}"; - hash = "sha256-WgMqb+NHnaxW9/qSZ0UGI4zGxGjh12a5DwtdX9byBiw="; - }; - - # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 - prePatch = lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' - substituteInPlace unittest/algorithm/utils/CMakeLists.txt \ - --replace-fail "add_pinocchio_unit_test(force)" "" - ''; - - patches = [ - # fix urdf & collision support on aarch64-darwin - (fetchpatch { - name = "static-pointer_cast.patch"; - url = "https://github.com/stack-of-tasks/pinocchio/pull/2339/commits/ead869e8f3cce757851b9a011c4a2f55fb66582b.patch"; - hash = "sha256-CkrWQJP/pPNs6B3a1FclfM7JWwkmsPzRumS46KQHv0s="; - }) - ]; - - postPatch = '' - # example-robot-data models are used in checks. - # Upstream provide them as git submodule, but we can use our own version instead. - rmdir models/example-robot-data - ln -s ${example-robot-data.src} models/example-robot-data - - # allow package:// uri use in examples - export ROS_PACKAGE_PATH=${example-robot-data}/share - ''; - - # CMAKE_BUILD_TYPE defaults to Release in this package, - # which enable -O3, which break some tests - # ref. https://github.com/stack-of-tasks/pinocchio/issues/2304#issuecomment-2231018300 - postConfigure = '' - substituteInPlace CMakeCache.txt --replace-fail '-O3' '-O2' - ''; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ] ++ lib.optionals pythonSupport [ - python3Packages.python - ]; - - propagatedBuildInputs = [ - console-bridge - jrl-cmakemodules - urdfdom - ] ++ lib.optionals (!pythonSupport) [ - boost - eigen - ] ++ lib.optionals (!pythonSupport && collisionSupport) [ - hpp-fcl - ] ++ lib.optionals pythonSupport [ - python3Packages.boost - python3Packages.eigenpy - ] ++ lib.optionals (pythonSupport && collisionSupport) [ - python3Packages.hpp-fcl - ] ++ lib.optionals (!pythonSupport && casadiSupport) [ - casadi - ] ++ lib.optionals (pythonSupport && casadiSupport) [ - python3Packages.casadi - ]; - - checkInputs = lib.optionals (pythonSupport && casadiSupport) [ python3Packages.matplotlib ]; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) - (lib.cmakeBool "BUILD_WITH_LIBPYTHON" pythonSupport) - (lib.cmakeBool "BUILD_WITH_CASADI_SUPPORT" casadiSupport) - (lib.cmakeBool "BUILD_WITH_COLLISION_SUPPORT" collisionSupport) - ]; - - doCheck = true; - - pythonImportsCheck = lib.optionals (!pythonSupport) [ - "pinocchio" - ]; - - meta = { - description = "Fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"; - homepage = "https://github.com/stack-of-tasks/pinocchio"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ nim65s wegank ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 607565b8fe698..ae4656a2f6667 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.5.5"; + version = "0.5.6"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-evqQCKf4oE/PwkAOMPPPw8LPiNIWQ2gkOJzsFC8UN+k="; + hash = "sha256-UAx7laULICb9ClZsIFcKi687M0yEgV4sCyhKqxs4nHE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 71c0b7d470377..dbf742ab81f25 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { "-Diwmmxt=disabled" ] # Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved - ++ lib.optional (stdenv.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled"; + ++ lib.optional (stdenv.hostPlatform.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled"; preConfigure = '' # https://gitlab.freedesktop.org/pixman/pixman/-/issues/62 @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = glib.flattenInclude; diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix index 6e4e47f094ed2..d49b8da211d8f 100644 --- a/pkgs/development/libraries/plplot/default.nix +++ b/pkgs/development/libraries/plplot/default.nix @@ -1,16 +1,21 @@ -{ lib -, stdenv -, fetchurl -, cmake -, enableWX ? false -, wxGTK32 -, Cocoa -, enableXWin ? false -, xorg +{ + lib, + stdenv, + fetchurl, + cmake, + pkg-config, + enableWX ? false, + wxGTK32, + Cocoa, + enableXWin ? false, + xorg, + enablePNG ? false, + cairo, + pango, }: stdenv.mkDerivation rec { - pname = "plplot"; + pname = "plplot"; version = "5.15.0"; src = fetchurl { @@ -18,18 +23,26 @@ stdenv.mkDerivation rec { sha256 = "0ywccb6bs1389zjfmc9zwdvdsvlpm7vg957whh6b5a96yvcf8bdr"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = lib.optional enableWX wxGTK32 - ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa - ++ lib.optional enableXWin xorg.libX11; + buildInputs = + lib.optional enableWX wxGTK32 + ++ lib.optional (enableWX && stdenv.hostPlatform.isDarwin) Cocoa + ++ lib.optional enableXWin xorg.libX11 + ++ lib.optionals enablePNG [ + cairo + pango + ]; passthru = { inherit (xorg) libX11; inherit enableWX enableXWin - ; + ; }; cmakeFlags = [ @@ -41,9 +54,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform scientific graphics plotting library"; mainProgram = "pltek"; - homepage = "https://plplot.org"; + homepage = "https://plplot.org"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.lgpl2; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index 69e86acfef23a..486164904b2bb 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - outputs = [ "out" ] ++ lib.optionals stdenv.isLinux [ "dev" ]; + outputs = [ "out" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "dev" ]; postPatch = '' patchShebangs ./autogen.pl @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { # From some reason the Darwin build doesn't include this file, so we # currently disable this substitution for any non-Linux platform, until a # Darwin user will care enough about this cross platform fix. - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' # Pin the compiler to the current version in a cross compiler friendly way. # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427). substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \ diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index dfd74e495e76d..e3aa6af942e2d 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libpng ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace error.hpp --replace "#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" "#if (__clang__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" '' + '' sed "s|\(PNGPP := .\)|PREFIX := ''${out}\n\\1|" -i Makefile diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/development/libraries/podofo/0.10.x.nix index 0916c2f9e9a09..fdc42bc0f5653 100644 --- a/pkgs/development/libraries/podofo/0.10.x.nix +++ b/pkgs/development/libraries/podofo/0.10.x.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "podofo"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "podofo"; repo = "podofo"; rev = finalAttrs.version; - hash = "sha256-B+YNTo2rZAL4PqDo+lFOQiWM9bl/TIn8xrJyefrIAYE="; + hash = "sha256-ZY+kyimLzAeEgvDaflXM7MbyzsGgivOnG1aBD9/ozbk="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index b663c865d233f..0fb66ccc7c3d5 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { glib pcre polkit - ] ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux libsepol util-linux ]; meta = with lib; { description = "Qt wrapper around PolKit"; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index dd3c6aaea354d..17b325f52d8f7 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -29,7 +29,7 @@ # Not yet investigated; it may be due to the "Make netgroup support optional" # patch not updating the tests correctly yet, or doing something wrong, # or being unrelated to that. -, doCheck ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl) +, doCheck ? (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl) }: let @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { pam dbus duktape - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # On Linux, fall back to elogind when systemd support is off. (if useSystemd then systemdMinimal else elogind) ]; @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { "-Dtests=${lib.boolToString doCheck}" "-Dgtk_doc=${lib.boolToString withIntrospection}" "-Dman=true" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}" ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 2893b5e1b0441..368c5a06a463f 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: rec { dontWrapQtApps = true; # Workaround #54606 - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index e97629b0dfd05..282203a98af7b 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - patches = lib.optionals stdenv.isCygwin [ + patches = lib.optionals stdenv.hostPlatform.isCygwin [ ./1.16-cygwin.patch ./1.16-vpath.patch ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index a109aad97b9d4..6d338b0f67e08 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ pkg-config which ]; - buildInputs = [ libjack2 ] ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib ]; + buildInputs = [ libjack2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ alsa-lib ]; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays -Wno-error=implicit-const-int-float-conversion"; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; # Disable parallel build as it fails as: # make: *** No rule to make target '../../../lib/libportaudio.la', @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { # not sure why, but all the headers seem to be installed by the make install installPhase = '' make install - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # fixup .pc file to find alsa library sed -i "s|-lasound|-L${alsa-lib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' cp include/pa_mac_core.h $out/include/pa_mac_core.h ''; diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index 8e743f6a54b3c..eac2a369fd0b0 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ unzip cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreAudio CoreFoundation CoreMIDI CoreServices ]; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 863ffed429328..37e5f78c60278 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ gmpxx ]; configureFlags = [ "--disable-watchdog" ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ "CPPFLAGS=-fexceptions" "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips" ]; diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index 372a2940e0ae3..56dd58781bdf3 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.isDarwin [ "-D_GNU_SOURCE" ] + lib.optionals stdenv.hostPlatform.isDarwin [ "-D_GNU_SOURCE" ] # libxml2-2.12 changed const qualifiers ++ [ "-fpermissive" ] ); diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 8fedba3ef08c5..615d2590c0236 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { preCheck = let - libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libPathEnvVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' export HOME=$TMPDIR diff --git a/pkgs/development/libraries/protobuf/27.nix b/pkgs/development/libraries/protobuf/27.nix index 9945587daeccb..8e93e443b18e6 100644 --- a/pkgs/development/libraries/protobuf/27.nix +++ b/pkgs/development/libraries/protobuf/27.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix ({ - version = "27.4"; - hash = "sha256-PejX1RlEw8ASU7vWMdpQ8WaPJrxURK01GXBx+pvwV4I="; + version = "27.5"; + hash = "sha256-wUXvdlz19VYpFGU9o0pap/PrwE2AkopLZJVUqfEpJVI="; } // args) diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 9dc7f70c2fe20..cfcaa55515264 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -25,7 +25,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { chmod -R a+w gmock chmod -R a+w googletest ln -s ../googletest gmock/gtest - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 71f8e90b774a2..0b52ea7de22ea 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { inherit hash; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { # https://hydra.nixos.org/build/235677717/nixlog/4/tail # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms # https://github.com/protocolbuffers/protobuf/issues/8460 - doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit; + doCheck = !(stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit; passthru = { tests = { diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix index 02a8fcde91efc..13a2b17a3e01d 100644 --- a/pkgs/development/libraries/pslib/default.nix +++ b/pkgs/development/libraries/pslib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib libpng libjpeg giflib libtiff ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; }; diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix index 0431bb284dab4..18e6bc3b0f7de 100644 --- a/pkgs/development/libraries/psqlodbc/default.nix +++ b/pkgs/development/libraries/psqlodbc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "16.00.0000"; src = fetchurl { - url = "https://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-${version}.tar.gz"; + url = "https://ftp.postgresql.org/pub/odbc/versions.old/src/${pname}-${version}.tar.gz"; hash = "sha256-r9iS+J0uzujT87IxTxvVvy0CIBhyxuNDHlwxCW7KTIs="; }; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index bbbc5017c410e..3d4c056b71dd5 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; }; - preConfigure = lib.optionalString stdenv.isAarch32 '' + preConfigure = lib.optionalString stdenv.hostPlatform.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' configureFlagsArray+=("ac_cv_check_sjlj=ssjlj") diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 10db26a039849..4f417c5e15e30 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -44,11 +44,14 @@ stdenv.mkDerivation (finalAttrs: { cp -r ./extensions $out/include/PythonQt ''; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id \ $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib - install_name_tool -id \ + install_name_tool -change \ + libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.3.dylib \ + $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.3.dylib \ + -id \ $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib ''; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index a7f1bc2711554..998575bb166c1 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; meta = with lib; { homepage = "http://www.qhull.org/"; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 0984912463e1c..6ba9418a6e205 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { buildInputs = [ qtbase qtmultimedia - ] ++ lib.optional stdenv.isDarwin utmp; + ] ++ lib.optional stdenv.hostPlatform.isDarwin utmp; patches = [ # Changes required to make it compatible with lomiri-terminal-app diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index 237751c6f8f2d..8a52fce9c74a2 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libiconv libpng ] - ++ lib.optionals stdenv.isDarwin [ libobjc ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc ]; nativeCheckInputs = [ SDL2 ]; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index 282b926b2e772..a3ccff5c10938 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # https://github.com/mpimd-csc/qrupdate-ng/issues/4 - patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ ./disable-zch1dn-test.patch ]; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 69adf65643d02..0d8df9b316b8b 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -10,7 +10,7 @@ }: let - stdenv' = if stdenv.isDarwin then + stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv @@ -28,10 +28,10 @@ in stdenv'.mkDerivation rec { buildInputs = [ qtbase ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; nativeBuildInputs = [ unzip qmake ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser @@ -71,6 +71,6 @@ in stdenv'.mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; # ld: library not found for -lcups - broken = stdenv.isDarwin && lib.versionAtLeast qtbase.version "6"; + broken = stdenv.hostPlatform.isDarwin && lib.versionAtLeast qtbase.version "6"; }; } diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index af2f431dfb402..2f57b1c62de48 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -28,7 +28,7 @@ let qtCompatVersion = srcs.qtbase.version; patches = { - qtbase = lib.optionals stdenv.isDarwin [ + qtbase = lib.optionals stdenv.hostPlatform.isDarwin [ ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch # Patch framework detection to support X.framework/X.tbd, @@ -63,7 +63,7 @@ let hash = "sha256-UEvIXzn387f9BAeBdhheStD/4M7en+rmqX8C6gstl6k="; }) ]; - qtmultimedia = lib.optionals stdenv.isDarwin [ + qtmultimedia = lib.optionals stdenv.hostPlatform.isDarwin [ # build patch for qtmultimedia with xcode 15 (fetchpatch { url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3f509180/qt5/qt5-qtmultimedia-xcode15.patch"; @@ -184,7 +184,7 @@ let # See: https://bugreports.qt.io/browse/QTBUG-124375 # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09 ./qtwebengine-ninja-1.12.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch ./qtwebengine-darwin-checks.patch @@ -218,7 +218,7 @@ let ./qtwebkit.patch ./qtwebkit-icu68.patch ./qtwebkit-cstdint.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-qos-classes.patch ]; @@ -248,7 +248,7 @@ let inherit (srcs.qtbase) src version; patches = patches.qtbase; inherit bison cups harfbuzz libGL; - withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; + withGtk3 = !stdenv.hostPlatform.isDarwin; inherit dconf gtk3; inherit developerBuild decryptSslTraffic; inherit (darwin.apple_sdk_11_0.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; @@ -311,7 +311,7 @@ let # clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary. stdenv = let stdenv' = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv; - in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; + in if stdenv'.hostPlatform.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; inherit (srcs.qtwebengine) version; python = python3; inherit (darwin) xnu; @@ -343,8 +343,8 @@ let qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview qtx11extras qtxmlpatterns qtlottie qtdatavis3d - ] ++ lib.optional (!stdenv.isDarwin) qtwayland - ++ lib.optional (stdenv.isDarwin) qtmacextras); + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) qtwayland + ++ lib.optional (stdenv.hostPlatform.isDarwin) qtmacextras); qmake = callPackage ({ qtbase }: makeSetupHook { name = "qmake-hook"; @@ -360,7 +360,7 @@ let wrapQtAppsHook = callPackage ({ makeBinaryWrapper, qtbase, qtwayland }: makeSetupHook { name = "wrap-qt5-apps-hook"; propagatedBuildInputs = [ qtbase.dev makeBinaryWrapper ] - ++ lib.optional stdenv.isLinux qtwayland.dev; + ++ lib.optional stdenv.hostPlatform.isLinux qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh) { }; }; diff --git a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh index 56607df6b4b95..f52de4e51df2e 100644 --- a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh @@ -1,40 +1,36 @@ . @fix_qmake_libtool@ -qmakeFlags=( ${qmakeFlags-} ) - qmakePrePhase() { - qmakeFlags_orig=( "${qmakeFlags[@]}" ) - # These flags must be added _before_ the flags specified in the derivation. - qmakeFlags=( \ - "PREFIX=$out" \ - "NIX_OUTPUT_OUT=$out" \ - "NIX_OUTPUT_DEV=${!outputDev}" \ - "NIX_OUTPUT_BIN=${!outputBin}" \ - "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \ - "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ - "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" \ - ) + prependToVar qmakeFlags \ + "PREFIX=$out" \ + "NIX_OUTPUT_OUT=$out" \ + "NIX_OUTPUT_DEV=${!outputDev}" \ + "NIX_OUTPUT_BIN=${!outputBin}" \ + "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \ + "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ + "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" if [ -n "@debug@" ]; then - qmakeFlags+=( "CONFIG+=debug" ) + prependToVar qmakeFlags "CONFIG+=debug" else - qmakeFlags+=( "CONFIG+=release" ) + prependToVar qmakeFlags "CONFIG+=release" fi # do the stripping ourselves (needed for separateDebugInfo) - qmakeFlags+=( "CONFIG+=nostrip" ) - - qmakeFlags+=( "${qmakeFlags_orig[@]}" ) + prependToVar qmakeFlags "CONFIG+=nostrip" } prePhases+=" qmakePrePhase" qmakeConfigurePhase() { runHook preConfigure + local flagsArray=() + concatTo flagsArray qmakeFlags + echo "QMAKEPATH=$QMAKEPATH" - echo qmake "${qmakeFlags[@]}" - qmake "${qmakeFlags[@]}" + echo qmake "${flagsArray[@]}" + qmake "${flagsArray[@]}" if ! [[ -v enableParallelBuilding ]]; then enableParallelBuilding=1 diff --git a/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh index c320a79744711..099c0879ed397 100644 --- a/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh @@ -1 +1 @@ -qmakeFlags+=( "QMAKE_LRELEASE=@dev@/bin/lrelease" ) +appendToVar qmakeFlags "QMAKE_LRELEASE=@dev@/bin/lrelease" diff --git a/pkgs/development/libraries/qt-5/modules/qt3d.nix b/pkgs/development/libraries/qt-5/modules/qt3d.nix index f394ff6627e0c..c54f4b7d7b48e 100644 --- a/pkgs/development/libraries/qt-5/modules/qt3d.nix +++ b/pkgs/development/libraries/qt-5/modules/qt3d.nix @@ -5,5 +5,5 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dstat64=stat"; } diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 7f3079d5add5b..7aef466b79371 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -18,7 +18,7 @@ , withQttranslation ? true, qttranslations ? null # options -, libGLSupported ? !stdenv.isDarwin +, libGLSupported ? !stdenv.hostPlatform.isDarwin , libGL # qmake detection for libmysqlclient does not seem to work when cross compiling , mysqlSupport ? stdenv.hostPlatform == stdenv.buildPlatform @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: ({ libjpeg libpng pcre2 ] ++ ( - if stdenv.isDarwin then [ + if stdenv.hostPlatform.isDarwin then [ # TODO: move to buildInputs, this should not be propagated. AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: ({ ); buildInputs = [ python3 at-spi2-core ] - ++ lib.optionals (!stdenv.isDarwin) + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) ( [ libinput ] ++ lib.optional withGtk3 gtk3 @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: ({ ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ] - ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { # `qtbase` expects to find `cc` (with no prefix) in the @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: ({ # libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked # against it will crash during build unless they can access `/usr/share/icu/icudtXXl.dat`. - propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' (allow file-read* (subpath "/usr/share/icu")) ''; @@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: ({ patchShebangs ./bin '' + ( - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' sed -i \ -e 's|/usr/bin/xcode-select|xcode-select|' \ -e 's|/usr/bin/xcrun|xcrun|' \ @@ -217,7 +217,7 @@ stdenv.mkDerivation (finalAttrs: ({ ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"'' ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' - ++ lib.optional stdenv.isLinux "-DUSE_X11" + ++ lib.optional stdenv.hostPlatform.isLinux "-DUSE_X11" ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ # ignore "is only available on macOS 10.12.2 or newer" in obj-c code "-Wno-error=unguarded-availability" @@ -318,7 +318,7 @@ stdenv.mkDerivation (finalAttrs: ({ ''-${lib.optionalString (!buildTests) "no"}make tests'' ] ++ ( - if stdenv.isDarwin then [ + if stdenv.hostPlatform.isDarwin then [ "-no-fontconfig" "-qt-freetype" "-qt-libpng" diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix index 81efb4bee04b5..d61619613eba8 100644 --- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix @@ -2,11 +2,11 @@ qtModule { pname = "qtconnectivity"; - buildInputs = lib.optional stdenv.isLinux bluez; + buildInputs = lib.optional stdenv.hostPlatform.isLinux bluez; propagatedBuildInputs = [ qtbase qtdeclarative - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOBluetooth ]; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix b/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix index d79320ea139fe..e89a735d77b8f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix @@ -5,5 +5,5 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dstat64=stat"; } diff --git a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix index 3985726731710..c83e41be2af8a 100644 --- a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix +++ b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -3,8 +3,7 @@ qtModule { pname = "qtgamepad"; propagatedBuildInputs = [ qtbase qtdeclarative ] - ++ lib.optional stdenv.isDarwin GameController; - buildInputs = [ ]; + ++ lib.optional stdenv.hostPlatform.isDarwin GameController; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index 338911a5afd5f..35627af0c6859 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -4,7 +4,7 @@ qtModule { pname = "qtlocation"; propagatedBuildInputs = [ qtbase qtmultimedia ]; outputs = [ "bin" "out" "dev" ]; - qmakeFlags = lib.optionals stdenv.isDarwin [ + qmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # boost uses std::auto_ptr which has been disabled in clang with libcxx # This flag re-enables this feature # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index d5dc16c528233..0346ca23c5e2c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -17,8 +17,8 @@ qtModule { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base ] # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio - ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib wayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib wayland ]; outputs = [ "bin" "dev" "out" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; - NIX_LDFLAGS = lib.optionalString (stdenv.isDarwin) "-lobjc"; + NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.isDarwin) "-lobjc"; } diff --git a/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/pkgs/development/libraries/qt-5/modules/qtserialport.nix index 7907f91b986b2..3d5c00a3575e7 100644 --- a/pkgs/development/libraries/qt-5/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-5/modules/qtserialport.nix @@ -3,5 +3,5 @@ qtModule { pname = "qtserialport"; propagatedBuildInputs = [ qtbase ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; } diff --git a/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/pkgs/development/libraries/qt-5/modules/qtspeech.nix index 17bc16dab4fc0..d60a12f3854d0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-5/modules/qtspeech.nix @@ -3,7 +3,7 @@ qtModule { pname = "qtspeech"; propagatedBuildInputs = [ ]; - buildInputs = lib.optionals stdenv.isLinux [ speechd-minimal ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ speechd-minimal ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix index 37e4348ed2c23..b728620362f98 100644 --- a/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -32,11 +32,11 @@ qtModule { "bin/qthelpconverter" "bin/lprodump" "bin/qdistancefieldgenerator" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "bin/macdeployqt" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && qtdeclarative != null) ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && qtdeclarative != null) ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; setupHook = ../hooks/qttools-setup-hook.sh; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 1a63c9508c055..75149cfb5a8ba 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -29,7 +29,7 @@ , lib, stdenv , version ? null , qtCompatVersion -, pipewireSupport ? stdenv.isLinux +, pipewireSupport ? stdenv.hostPlatform.isLinux , pipewire , postPatch ? "" , nspr @@ -65,7 +65,7 @@ qtModule ({ pkgsBuildBuild.pkg-config (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtquickcontrols) pkg-config-wrapped-without-prefix - ] ++ lib.optional stdenv.isDarwin xcbuild; + ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -135,7 +135,7 @@ qtModule ({ # Prevent Chromium build script from making the path to `clang` relative to # the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR` # from `src/core/config/mac_osx.pri`. - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace ./src/3rdparty/chromium/build/toolchain/mac/BUILD.gn \ --replace 'prefix = rebase_path("$clang_base_path/bin/", root_build_dir)' 'prefix = "$clang_base_path/bin/"' '' @@ -148,13 +148,13 @@ qtModule ({ src/core/web_engine_library_info.cpp '' # Patch library paths in Chromium sources - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ src/3rdparty/chromium/device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc - '' + lib.optionalString stdenv.isDarwin ('' + '' + lib.optionalString stdenv.hostPlatform.isDarwin ('' substituteInPlace src/buildtools/config/mac_osx.pri \ --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' @@ -233,7 +233,7 @@ qtModule ({ libevent ffmpeg_7 - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp # Audio formats @@ -257,7 +257,7 @@ qtModule ({ # FIXME These dependencies shouldn't be needed but can't find a way # around it. Chromium pulls this in while bootstrapping GN. - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc cctools @@ -287,7 +287,7 @@ qtModule ({ libunwind ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cups libpm sandbox @@ -313,7 +313,7 @@ qtModule ({ postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' mkdir -p $out/libexec - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' cat > $out/libexec/qt.conf <<EOF [Paths] Prefix = .. diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index bd05954ddb35d..3382bca0f9822 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -23,13 +23,13 @@ in qtModule { pname = "qtwebkit"; propagatedBuildInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ] - ++ lib.optional stdenv.isDarwin qtmultimedia; + ++ lib.optional stdenv.hostPlatform.isDarwin qtmultimedia; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ] - ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ICU OpenGL ]; nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python3 ruby cmake ]; cmakeFlags = [ "-DPORT=Qt" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DQt5Multimedia_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5Multimedia" "-DQt5MultimediaWidgets_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5MultimediaWidgets" "-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF" @@ -42,13 +42,13 @@ qtModule { # with gcc8, -Wclass-memaccess became part of -Wall and this too exceeds the logging limit ++ lib.optional stdenv.cc.isGNU "-Wno-class-memaccess" # with clang this warning blows the log over Hydra's limit - ++ lib.optional stdenv.isDarwin "-Wno-inconsistent-missing-override" - ++ lib.optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${lib.getLib systemd}/lib/libudev"''); + ++ lib.optional stdenv.hostPlatform.isDarwin "-Wno-inconsistent-missing-override" + ++ lib.optional (!stdenv.hostPlatform.isDarwin) ''-DNIXPKGS_LIBUDEV="${lib.getLib systemd}/lib/libudev"''); doCheck = false; # fails 13 out of 13 tests (ctest) # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/libexec/* ''; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix index fd8755390973d..9b1a290ece017 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebview.nix @@ -3,10 +3,10 @@ qtModule { pname = "qtwebview"; propagatedBuildInputs = [ qtdeclarative qtwebengine ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation WebKit ]; outputs = [ "out" "dev" "bin" ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework WebKit"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework WebKit"; } diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 83f9268624cc2..8625dadf5233c 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -28,7 +28,7 @@ let inherit (self) qtModule; inherit srcs python3; stdenv = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; } else stdenv; }); @@ -106,7 +106,7 @@ let qtwebengine qtwebsockets qtwebview - ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ])) + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwayland libglvnd ])) { }; qt3d = callPackage ./modules/qt3d.nix { }; @@ -163,7 +163,7 @@ let qtModule = callPackage ({ qtModule }: qtModule.override { stdenv = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; } else stdenv; }) diff --git a/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh index 130e8290a3feb..84b2fb153d9f8 100644 --- a/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh @@ -1,33 +1,29 @@ . @fix_qmake_libtool@ -qmakeFlags=(${qmakeFlags-}) - qmakePrePhase() { - qmakeFlags_orig=("${qmakeFlags[@]}") - # These flags must be added _before_ the flags specified in the derivation. # TODO: these flags also need a patch which isn't applied # can we either remove these flags or update the qt5 patch? # "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \ - qmakeFlags=( - "PREFIX=$out" - "NIX_OUTPUT_OUT=$out" - "NIX_OUTPUT_DEV=${!outputDev}" - "NIX_OUTPUT_BIN=${!outputBin}" - "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" - "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" - ) - - qmakeFlags+=("${qmakeFlags_orig[@]}") + prependToVar qmakeFlags \ + "PREFIX=$out" \ + "NIX_OUTPUT_OUT=$out" \ + "NIX_OUTPUT_DEV=${!outputDev}" \ + "NIX_OUTPUT_BIN=${!outputBin}" \ + "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ + "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" } prePhases+=" qmakePrePhase" qmakeConfigurePhase() { runHook preConfigure + local flagsArray=() + concatTo flagsArray qmakeFlags + echo "QMAKEPATH=$QMAKEPATH" - echo qmake "${qmakeFlags[@]}" - qmake "${qmakeFlags[@]}" + echo qmake "${flagsArray[@]}" + qmake "${flagsArray[@]}" if ! [[ -v enableParallelBuilding ]]; then enableParallelBuilding=1 diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index e738aba60560f..68ef06921ac91 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -250,7 +250,7 @@ stdenv.mkDerivation rec { moveToOutput "mkspecs/modules" "$dev" fixQtModulePaths "$dev/mkspecs/modules" fixQtBuiltinPaths "$out" '*.pr?' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # FIXME: not sure why this isn't added automatically? patchelf --add-rpath "${libmysqlclient}/lib/mariadb" $out/${qtPluginPrefix}/sqldrivers/libqsqlmysql.so diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 8da3b7b628427..08c061e10d7a7 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -326,6 +326,6 @@ qtModule { # 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz timeout = 24 * 3600; # Not compatible with macOS 11 without massive patching - broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "12"; + broken = stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "12"; }; } diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 9007129cecf51..b6744692bbe88 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] - ++ lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ] # for finding libsecret ; - buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] ++ [ qtbase qttools ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 94dc1646513c6..5005ab8243d4c 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Fix plugin dir substituteInPlace pbfplugin.pro \ --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix darwin build substituteInPlace pbfplugin.pro \ --replace '$$PROTOBUF/include' '${protobuf}/include' \ diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 07c332ba1d948..c04d0d72e7cd3 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.14.2"; + version = "6.14.3"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ugnnebts9+fUlxwjT9qpxV558PcJiHHhY5BzburR+EI="; + hash = "sha256-WgZZEs3Fse+0+FLVO1GTkxqxzZPfJuxS7Ij/G0ACZSY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quantlib/default.nix b/pkgs/development/libraries/quantlib/default.nix index a84221b1b176a..f38d560a8e68c 100644 --- a/pkgs/development/libraries/quantlib/default.nix +++ b/pkgs/development/libraries/quantlib/default.nix @@ -5,17 +5,17 @@ , boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "quantlib"; - version = "1.34"; + version = "1.35"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "lballabio"; repo = "QuantLib"; - rev = "v${version}"; - sha256 = "sha256-qrMaIBiDg7bFtWTDAQgAMtekb/7VrI7Ix+G59mU4WHI="; + rev = "v${finalAttrs.version}"; + hash = "sha256-L0cdfrVZTwyRcDnYhbmRbH53+mBt6AnrKm+in++du2M="; }; nativeBuildInputs = [ cmake ]; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.kupac ]; }; -} +}) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 11350128b4aa2..a3a633af6c94f 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (final: { passthru.tests = { quarto-check = runCommand "quarto-check" { - nativeBuildInputs = lib.optionals stdenv.isDarwin [ sysctl ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ sysctl ]; } '' export HOME="$(mktemp -d)" ${quarto}/bin/quarto check diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index c3f1f7a7834af..b2fcad6cab877 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib qtbase ]; propagatedBuildInputs = [ qt5compat ]; nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/quickfix/default.nix b/pkgs/development/libraries/quickfix/default.nix index 0c327d0d5e59a..bd4612c8eec16 100644 --- a/pkgs/development/libraries/quickfix/default.nix +++ b/pkgs/development/libraries/quickfix/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { homepage = "http://www.quickfixengine.org"; license = licenses.free; # similar to BSD 4-clause maintainers = with maintainers; [ bhipple ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index 49dfc94993e42..1e3cb69d1f82f 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableSSL3 "enable-ssl3" # We select KTLS here instead of the configure-time detection (which we patch out). # KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it. - ++ lib.optional (stdenv.isLinux && lib.versionAtLeast finalAttrs.version "3.0.0") "enable-ktls" + ++ lib.optional (stdenv.hostPlatform.isLinux && lib.versionAtLeast finalAttrs.version "3.0.0") "enable-ktls" ++ lib.optional stdenv.hostPlatform.isAarch64 "no-afalgeng" # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index 9a2a53587e48d..814e8f0252c1b 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "qwt"; - version = "6.2.0"; + version = "6.3.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; - sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA="; + sha256 = "sha256-3LCFiWwoquxVGMvAjA7itOYK2nrJKdgmOfYYmFGmEpo="; }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; - nativeBuildInputs = [ qmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ qmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; postPatch = '' sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 3ef599887eb4d..a7e5fe6eb2633 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { # Building the tests currently fails on AArch64 due to internal compiler # errors (with GCC 9.2): cmakeFlags = [ "-DRANGES_ENABLE_WERROR=OFF" ] - ++ lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF"; + ++ lib.optional stdenv.hostPlatform.isAarch64 "-DRANGE_V3_TESTS=OFF"; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; checkTarget = "test"; meta = with lib; { diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index 9aa2394585020..8e72b7748d650 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_CXX_FLAGS_RELEASE" "-Wno-error") ]; - doCheck = !(stdenv.hostPlatform.isStatic || stdenv.isDarwin); + doCheck = !(stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isDarwin); nativeCheckInputs = [ valgrind diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 944896d1cf57e..5c1b7d1dab0a4 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -36,18 +36,17 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - autoPatchelfHook cmake - ]; + ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = [ glfw ] - ++ lib.optionals stdenv.isLinux [ mesa libXi libXcursor libXrandr libXinerama ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ mesa libXi libXcursor libXrandr libXinerama ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio; - propagatedBuildInputs = lib.optionals stdenv.isLinux [ libGLU libX11 ] - ++ lib.optionals stdenv.isDarwin [ OpenGL ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ]; # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ @@ -71,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # fix libasound.so/libpulse.so not being found - appendRunpaths = [ + appendRunpaths = lib.optionals stdenv.hostPlatform.isLinux [ (lib.makeLibraryPath (lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio)) ]; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 3b9580840f4d8..a748f3a86c575 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "2.4.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-RLjshOnMmCdlv73M8siIvBZ5kVG3v2XttkLVPU+BHY4="; + sha256 = "sha256-2AURPvhpgdIm034KEMm7Tmf8Zx/XER76aT6SiINs6wg="; }; nativeBuildInputs = [ pkg-config python3 which ]; diff --git a/pkgs/development/libraries/relibc/Cargo.lock b/pkgs/development/libraries/relibc/Cargo.lock deleted file mode 100644 index b020fc4764b81..0000000000000 --- a/pkgs/development/libraries/relibc/Cargo.lock +++ /dev/null @@ -1,600 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "autocfg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "cbindgen" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "cbitset" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "cc" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "clap" -version = "2.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "core_io" -version = "0.1.20181107" -dependencies = [ - "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "crt0" -version = "0.1.0" - -[[package]] -name = "crti" -version = "0.1.0" - -[[package]] -name = "crtn" -version = "0.1.0" - -[[package]] -name = "getrandom" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)", - "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "goblin" -version = "0.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "hermit-abi" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "itoa" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "lazy_static" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ld_so" -version = "0.1.0" - -[[package]] -name = "libc" -version = "0.2.72" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "log" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "memchr" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "memoffset" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num-traits" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "posix-regex" -version = "0.1.0" - -[[package]] -name = "ppv-lite86" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "proc-macro2" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "quote" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ralloc" -version = "1.0.0" -dependencies = [ - "ralloc_shim 0.1.1", - "unborrow 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ralloc_shim" -version = "0.1.1" -dependencies = [ - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "sc 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ppv-lite86 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "redox_syscall" -version = "0.2.0" -source = "git+https://gitlab.redox-os.org/redox-os/syscall?rev=4115e0f43547449ce56f7d7749732813e9505955#4115e0f43547449ce56f7d7749732813e9505955" -dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "relibc" -version = "0.1.0" -dependencies = [ - "cbindgen 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", - "cbitset 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)", - "core_io 0.1.20181107", - "goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "memoffset 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", - "posix-regex 0.1.0", - "ralloc 1.0.0", - "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.2.0 (git+https://gitlab.redox-os.org/redox-os/syscall?rev=4115e0f43547449ce56f7d7749732813e9505955)", - "sc 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rustc_version" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "sc" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "scroll" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "scroll_derive" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "semver" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "serde" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "serde_derive" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "serde_json" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ryu 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "spin" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "syn" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "tempfile" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "toml" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "unborrow" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicode-xid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -"checksum cbindgen 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2db2df1ebc842c41fd2c4ae5b5a577faf63bd5151b953db752fc686812bee318" -"checksum cbitset 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3a9afa72f63942dd7e7f01c67b863ce9df35c523ae10e3dddd3eec8f1e07eac" -"checksum cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)" = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" -"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -"checksum clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" -"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -"checksum goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6a4013e9182f2345c6b7829b9ef6e670bce0dfca12c6f974457ed2160c2c7fe9" -"checksum hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" -"checksum itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" -"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" -"checksum libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)" = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701" -"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" -"checksum memoffset 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" -"checksum num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" -"checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" -"checksum ppv-lite86 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" -"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" -"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -"checksum rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -"checksum redox_syscall 0.2.0 (git+https://gitlab.redox-os.org/redox-os/syscall?rev=4115e0f43547449ce56f7d7749732813e9505955)" = "<none>" -"checksum remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -"checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084" -"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -"checksum ryu 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -"checksum sc 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "176365c8253e381ad147774b6d9730a1b3fe2d7db498af521ed7d968674a55b3" -"checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383" -"checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb" -"checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" -"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" -"checksum serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" -"checksum serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)" = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" -"checksum spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ceac490aa12c567115b40b7b7fceca03a6c9d53d5defea066123debc83c5dc1f" -"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -"checksum syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" -"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -"checksum unborrow 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e92e959f029e4f8ee25d70d15ab58d2b46f98a17bc238b9265ff0c26f6f3d67f" -"checksum unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" -"checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" -"checksum vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -"checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix deleted file mode 100644 index 437da86e8c21e..0000000000000 --- a/pkgs/development/libraries/relibc/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib, stdenvNoCC, buildPackages }: - -let - rpath = lib.makeLibraryPath [ - buildPackages.stdenv.cc.libc - "$out" - ]; - bootstrapCrossRust = stdenvNoCC.mkDerivation { - name = "binary-redox-rust"; - - src = buildPackages.fetchzip { - name = "redox-rust-toolchain.tar.gz"; - url = "https://www.dropbox.com/s/qt7as0j7cwnin8z/redox-rust-toolchain.tar.gz?dl=1"; - sha256 = "1g17qp2q6b88p04yclkw6amm374pqlakrmw9kd86vw8z4g70jkxm"; - }; - - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - installPhase = '' - mkdir $out/ - cp -r * $out/ - - find $out/ -executable -type f -exec patchelf \ - --set-interpreter "${buildPackages.stdenv.cc.libc}/lib/ld-linux-x86-64.so.2" \ - --set-rpath "${rpath}" \ - "{}" \; - find $out/ -name "*.so" -type f -exec patchelf \ - --set-rpath "${rpath}" \ - "{}" \; - ''; - - meta.platforms = with lib; platforms.redox ++ platforms.linux; - }; - - redoxRustPlatform = buildPackages.makeRustPlatform { - rustc = bootstrapCrossRust; - cargo = bootstrapCrossRust; - }; - -in -redoxRustPlatform.buildRustPackage rec { - pname = "relibc"; - version = "latest"; - - LD_LIBRARY_PATH = "${buildPackages.zlib}/lib"; - - src = buildPackages.fetchgit { - url = "https://gitlab.redox-os.org/redox-os/relibc/"; - rev = "5af8e3ca35ad401014a867ac1a0cc3b08dee682b"; - sha256 = "1j4wsga9psl453031izkl3clkvm31d1wg4y8f3yqqvhml2aliws5"; - fetchSubmodules = true; - }; - - RUSTC_BOOTSTRAP = 1; - - dontInstall = true; - dontFixup = true; - doCheck = false; - - postBuild = '' - mkdir -p $out - DESTDIR=$out make install - ''; - - TARGET = stdenvNoCC.hostPlatform.rust.rustcTargetSpec; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "redox_syscall-0.2.0" = "sha256-nwbJBrhuc01fPbBgd5ShboNu0Nauqp2UjkA+sm9oCeE="; - }; - }; - - # error: Usage of `RUSTC_WORKSPACE_WRAPPER` requires `-Z unstable-options` - auditable = false; - - meta = with lib; { - homepage = "https://gitlab.redox-os.org/redox-os/relibc"; - description = "C Library in Rust for Redox and Linux"; - license = licenses.mit; - maintainers = [ maintainers.aaronjanse ]; - platforms = platforms.redox ++ [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/development/libraries/retro-gtk/default.nix index 69eb4b0cd12d5..0749853082440 100644 --- a/pkgs/development/libraries/retro-gtk/default.nix +++ b/pkgs/development/libraries/retro-gtk/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.DamienCassou ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/retro-gtk.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/retro-gtk.x86_64-darwin }; } diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix index 541c805bba5bb..2243e482a5694 100644 --- a/pkgs/development/libraries/rlottie/default.nix +++ b/pkgs/development/libraries/rlottie/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { (lib.cmakeFeature "LIB_INSTALL_DIR" "${placeholder "out"}/lib") ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-U__ARM_NEON__"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-U__ARM_NEON__"; meta = with lib; { homepage = "https://github.com/Samsung/rlottie"; diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index d41459e25eadb..13107bfcb13be 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Ubsan seems to be broken on aarch64-darwin, it produces linker errors similar to https://github.com/NixOS/nixpkgs/issues/140751 ./disable-ubsan.patch ]; @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { pcre xorg.libX11 xorg.libXrandr - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ webkitgtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ WebKit MetalKit CoreAudioKit diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index fddb72fa7be8b..fb4cc16cd7eb4 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -11,7 +11,7 @@ , windows , enableJemalloc ? false , jemalloc -, enableLiburing ? stdenv.isLinux +, enableLiburing ? stdenv.hostPlatform.isLinux , liburing , enableShared ? !stdenv.hostPlatform.isStatic , sse42Support ? stdenv.hostPlatform.sse4_2Support @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "9.5.2"; + version = "9.6.1"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${finalAttrs.version}"; - hash = "sha256-+0gUtWhvCBISm0/67ylynNfihxbIg5wFh1gOOQp4sCI="; + hash = "sha256-Df5X3sL4dRP9TwwfoB3645nlru6eQhFD1LKPCXHrofU="; }; patches = lib.optional (lib.versionAtLeast finalAttrs.version "6.29.3" && enableLiburing) ./fix-findliburing.patch; @@ -87,9 +87,9 @@ stdenv.mkDerivation (finalAttrs: { preInstall = '' mkdir -p $tools/bin cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major finalAttrs.version}.dylib" $out/lib/librocksdb.dylib {} - '' + lib.optionalString (stdenv.isLinux && enableShared) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && enableShared) '' ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib {} ''; diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/development/libraries/rttr/default.nix index 10a16dd3f6b45..de4d81918cd08 100644 --- a/pkgs/development/libraries/rttr/default.nix +++ b/pkgs/development/libraries/rttr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "C++ Reflection Library"; homepage = "https://www.rttr.org"; license = licenses.mit; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index 861de40a5b551..d5acb98c22a4f 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config meson ninja jdk_headless ]; - buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH lv2 ] ++ lib.optionals stdenv.isDarwin + buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH lv2 ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo]); makeFlags = [ "AR:=$(AR)" ]; diff --git a/pkgs/development/libraries/rustls-ffi/default.nix b/pkgs/development/libraries/rustls-ffi/default.nix deleted file mode 100644 index d5d736dd2225a..0000000000000 --- a/pkgs/development/libraries/rustls-ffi/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - Security, - apacheHttpd, -}: - -rustPlatform.buildRustPackage rec { - pname = "rustls-ffi"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "rustls"; - repo = pname; - rev = "v${version}"; - hash = "sha256-IDIWN5g1aaE6SDdXSm4WYK6n+BpuypPYQITuDj1WJEc="; - }; - - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Security ]; - - cargoLock.lockFile = ./Cargo.lock; - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - - installPhase = '' - runHook preInstall - - make install DESTDIR=${placeholder "out"} - - runHook postInstall - ''; - - passthru.tests = { - apacheHttpd = apacheHttpd.override { modTlsSupport = true; }; - # Currently broken notably because of https://github.com/curl/curl/issues/13248 - # curl = curl.override { opensslSupport = false; rustlsSupport = true; }; - }; - - meta = with lib; { - description = "C-to-rustls bindings"; - homepage = "https://github.com/rustls/rustls-ffi/"; - license = with lib.licenses; [ - mit - asl20 - isc - ]; - maintainers = [ maintainers.lesuisse ]; - }; -} diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index b4e8831b31775..698ac7986204f 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ orc ]; - doCheck = (!stdenv.isDarwin); + doCheck = (!stdenv.hostPlatform.isDarwin); patchFlags = [ "-p0" ]; patches = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 74bb75878f9a2..5d7137abac2c3 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "indilib"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${finalAttrs.version}"; - hash = "sha256-qdPQMC8HCMdcbHyO8B0OFiefO+jM1ytA2dYNymE0Xuc="; + hash = "sha256-CV8nSz53wFeS/h7hGj9adN8qmyhsqOkTYj/0nuvhlSM="; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { # Socket address collisions between tests enableParallelChecking = false; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in $out/lib/udev/rules.d/*.rules do substituteInPlace $f --replace "/bin/sh" "${bash}/bin/sh" \ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 6d19253bcce3b..50ec95ee2f8f5 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -24,6 +24,7 @@ libexif, libftdi1, libgphoto2, + libgpiod_1, libpng, libraw, ninja, @@ -44,7 +45,7 @@ let owner = "indilib"; repo = "indi-3rdparty"; rev = "v${indilib.version}"; - hash = "sha256-0M+k3A2Lw9EU9V5bX9dGztmdcJzc71XQZv8srmY5NmY="; + hash = "sha256-RhtdhMvseQUUFcKDuR1N5qc/86IxmQ/7owpjT+qweqc="; }; buildIndi3rdParty = @@ -217,7 +218,7 @@ let pname = "libfishcamp"; postPatch = '' - substituteInPlace CMakeLists.txt --replace "/lib/firmware" "lib/firmware" + substituteInPlace CMakeLists.txt --replace-fail "/lib/firmware" "lib/firmware" ''; buildInputs = [ @@ -327,7 +328,7 @@ let postPatch = '' substituteInPlace CMakeLists.txt \ - --replace "set (PK_DATADIR /usr/share/pktriggercord)" "set (PK_DATADIR $out/share/pkgtriggercord)" + --replace-fail "set (PK_DATADIR /usr/share/pktriggercord)" "set (PK_DATADIR $out/share/pkgtriggercord)" ''; buildInputs = [ indilib ]; @@ -342,7 +343,7 @@ let pname = "libplayerone"; postPatch = '' substituteInPlace 99-player_one_astronomy.rules \ - --replace "/bin/echo" "${coreutils}/bin/echo" \ + --replace-fail "/bin/echo" "${coreutils}/bin/echo" \ --replace "/bin/sh" "${bash}/bin/sh" ''; @@ -362,14 +363,13 @@ let pname = "libqhy"; postPatch = '' - sed -ie 's/LIBQHY_SOVERSION "24"/LIBQHY_SOVERSION "20"/' CMakeLists.txt - substituteInPlace CMakeLists.txt \ + substituteInPlace --replace-fail CMakeLists.txt \ --replace "/lib/firmware" "lib/firmware" substituteInPlace 85-qhyccd.rules \ - --replace "/sbin/fxload" "${fxload}/sbin/fxload" \ - --replace "/lib/firmware" "$out/lib/firmware" \ - --replace "/bin/sleep" "${coreutils}/bin/sleep" + --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \ + --replace-fail "/lib/firmware" "$out/lib/firmware" \ + --replace-fail "/bin/sleep" "${coreutils}/bin/sleep" sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i 85-qhyccd.rules ''; @@ -418,10 +418,10 @@ let pname = "libsbig"; postPatch = '' - substituteInPlace CMakeLists.txt --replace "/lib/firmware" "lib/firmware" + substituteInPlace CMakeLists.txt --replace-fail "/lib/firmware" "lib/firmware" substituteInPlace 51-sbig-debian.rules \ - --replace "/sbin/fxload" "${fxload}/sbin/fxload" \ - --replace "/lib/firmware" "$out/lib/firmware" + --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \ + --replace-fail "/lib/firmware" "$out/lib/firmware" sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i 51-sbig-debian.rules ''; @@ -516,7 +516,7 @@ in libnova ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace "/lib/udev/rules.d" "lib/udev/rules.d" + substituteInPlace CMakeLists.txt --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" ''; }; @@ -637,11 +637,11 @@ in postPatch = '' substituteInPlace CMakeLists.txt \ - --replace "/lib/udev/rules.d" "lib/udev/rules.d" \ - --replace "/lib/firmware" "lib/firmware" + --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" \ + --replace-fail "/lib/firmware" "lib/firmware" substituteInPlace 99-meadedsi.rules \ - --replace "/sbin/fxload" "${fxload}/sbin/fxload" \ - --replace "/lib/firmware" "$out/lib/firmware" + --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \ + --replace-fail "/lib/firmware" "$out/lib/firmware" sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i 99-meadedsi.rules ''; @@ -725,6 +725,16 @@ in propagatedBuildInputs = [ libgphoto2 ]; }; + indi-gpio = buildIndi3rdParty { + pname = "indi-gpio"; + buildInputs = [ + indilib + libgpiod_1 + libnova + zlib + ]; + }; + indi-gpsd = buildIndi3rdParty { pname = "indi-gpsd"; buildInputs = [ @@ -862,7 +872,7 @@ in ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace "/lib/udev/rules.d" "lib/udev/rules.d" + substituteInPlace CMakeLists.txt --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" ''; }; @@ -918,7 +928,7 @@ in ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace "/lib/udev/rules.d" "lib/udev/rules.d" + substituteInPlace CMakeLists.txt --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" ''; meta.platforms = libqsi.meta.platforms; @@ -1015,7 +1025,7 @@ in libusb1 ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace "/lib/udev/rules.d" "lib/udev/rules.d" + substituteInPlace CMakeLists.txt --replace-fail "/lib/udev/rules.d" "lib/udev/rules.d" ''; }; diff --git a/pkgs/development/libraries/science/biology/bpp-core/default.nix b/pkgs/development/libraries/science/biology/bpp-core/default.nix index 0d0e3c1149203..673cebe59e8ed 100644 --- a/pkgs/development/libraries/science/biology/bpp-core/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # of form /nix/store/.../nix/store/.../include, # probably due to relative vs absolute path issue - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://github.com/BioPP/bpp-core"; diff --git a/pkgs/development/libraries/science/biology/bpp-phyl/default.nix b/pkgs/development/libraries/science/biology/bpp-phyl/default.nix index 0b18dbfcf19ad..6242516174796 100644 --- a/pkgs/development/libraries/science/biology/bpp-phyl/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-phyl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = bpp-core.meta // { homepage = "https://github.com/BioPP/bpp-phyl"; diff --git a/pkgs/development/libraries/science/biology/bpp-popgen/default.nix b/pkgs/development/libraries/science/biology/bpp-popgen/default.nix index 2cb89b4bbd383..f7662766fb2c4 100644 --- a/pkgs/development/libraries/science/biology/bpp-popgen/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-popgen/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # of form /nix/store/.../nix/store/.../include, # probably due to relative vs absolute path issue - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = bpp-core.meta // { homepage = "https://github.com/BioPP/bpp-popgen"; diff --git a/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/pkgs/development/libraries/science/biology/bpp-seq/default.nix index 2f6fbf9e362c7..0699c5316835a 100644 --- a/pkgs/development/libraries/science/biology/bpp-seq/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-seq/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # of form /nix/store/.../nix/store/.../include, # probably due to relative vs absolute path issue - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = bpp-core.meta // { homepage = "https://github.com/BioPP/bpp-seq"; diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 44e76244c9874..46b297722feb1 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; - doCheck = !stdenv.isDarwin; # usual dynamic linker issues + doCheck = !stdenv.hostPlatform.isDarwin; # usual dynamic linker issues meta = with lib; { homepage = "https://elastix.lumc.nl"; diff --git a/pkgs/development/libraries/science/biology/gifticlib/default.nix b/pkgs/development/libraries/science/biology/gifticlib/default.nix index 306324129cbdf..b305df08860b6 100644 --- a/pkgs/development/libraries/science/biology/gifticlib/default.nix +++ b/pkgs/development/libraries/science/biology/gifticlib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat nifticlib zlib ]; # without the test data, this is only a few basic tests - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck ctest -LE 'NEEDS_DATA' diff --git a/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix b/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix index 58c1fdaf04e24..3021cf8f437df 100644 --- a/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix +++ b/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "mctc-lib"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "grimme-lab"; repo = pname; rev = "v${version}"; - hash = "sha256-AXjg/ZsitdDf9fNoGVmVal1iZ4/sxjJb7A9W4yye/rg="; + hash = "sha256-dJYKnGlcc4N40h1RnP6MJyBj70/8kb1q4OyKTmlvS70="; }; nativeBuildInputs = [ gfortran meson ninja pkg-config python3 ]; diff --git a/pkgs/development/libraries/science/chemistry/plumed/default.nix b/pkgs/development/libraries/science/chemistry/plumed/default.nix index b70d2146b2da1..643ee2bc228c0 100644 --- a/pkgs/development/libraries/science/chemistry/plumed/default.nix +++ b/pkgs/development/libraries/science/chemistry/plumed/default.nix @@ -8,13 +8,13 @@ assert !blas.isILP64; stdenv.mkDerivation rec { pname = "plumed"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "plumed"; repo = "plumed2"; rev = "v${version}"; - hash = "sha256-68/ajM87ApEXUs4xPIq7Vfmzl7Ms4ck6jnjlIv7woMs="; + hash = "sha256-jNvdbfh1krNMrOFqkEHMy60mjsG/Wp6MQg0gHEjDA5U="; }; postPatch = '' diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix index 08f303581c99d..ebc853c369b54 100644 --- a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix +++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix @@ -15,13 +15,13 @@ assert !blas.isILP64; stdenv.mkDerivation rec { pname = "simple-dftd3"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "dftd3"; repo = pname; rev = "v${version}"; - hash = "sha256-XeLf5v/GraDGcTsVIEBnS4AL8tMeO11YTuPHlNt5Ap8="; + hash = "sha256-gN8uBc/Fk5U7wlBX1tkAWdxN9UW1Dv11GvaIBkEyBJw="; }; nativeBuildInputs = [ gfortran meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 744d565eddcd7..06503bbc7ddd6 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { export OMP_NUM_THREADS=2 ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib ''; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 4431ab63c7b7f..fcb78767678ea 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/libblas64${canonicalExtension} $out/lib/libblas${canonicalExtension} ''; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' for fn in $(find $out/lib -name "*.so*"); do if [ -L "$fn" ]; then continue; fi install_name_tool -id "$fn" "$fn" diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/development/libraries/science/math/bonmin/default.nix index a389c602b1b69..1cf64101face3 100644 --- a/pkgs/development/libraries/science/math/bonmin/default.nix +++ b/pkgs/development/libraries/science/math/bonmin/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { zlib ]; - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--with-asl-lib=-lipoptamplinterface -lamplsolver" ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; # ignore one failing test - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace test/Makefile.in --replace-fail \ "./unitTest\''$(EXEEXT)" \ "" diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 910c40a4e0c03..17dddf9018199 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -46,15 +46,15 @@ stdenv.mkDerivation rec { buildInputs = [ blas boost - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ocl-icd opencl-headers - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ OpenCL ]; diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 11096a1939587..a8e697132e903 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -141,12 +141,14 @@ stdenv.mkDerivation { }; }; - meta = with lib; { + meta = { description = "Library for efficient similarity search and clustering of dense vectors by Facebook Research"; mainProgram = "demo_ivfpq_indexing"; homepage = "https://github.com/facebookresearch/faiss"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ SomeoneSerge ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ SomeoneSerge ]; + # error: use of undeclared identifier 'SWIGTYPE_p_long' + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index a1a1ed8a69bc0..bcfe423630aa7 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = [ ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin }; } diff --git a/pkgs/development/libraries/science/math/libamplsolver/default.nix b/pkgs/development/libraries/science/math/libamplsolver/default.nix index f74808462ae1d..5eaa3cf54915e 100644 --- a/pkgs/development/libraries/science/math/libamplsolver/default.nix +++ b/pkgs/development/libraries/science/math/libamplsolver/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { install -D -m 0644 *${stdenv.hostPlatform.extensions.sharedLibrary}* -t $out/lib install -D -m 0644 *.a -t $out/lib popd - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libamplsolver.dylib $out/lib/libamplsolver.dylib '' + '' runHook postInstall diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 595ba2aa57136..def5379d27c8f 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gfortran cmake ]; # Configure stage fails on aarch64-darwin otherwise, due to either clang 11 or gfortran 10. - hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "stackprotector" ]; cmakeFlags = [ "-DCMAKE_Fortran_FLAGS=-fPIC" @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { # # Upstream issue to track: # * https://github.com/Reference-LAPACK/lapack/issues/440 - ctestArgs = lib.optionalString stdenv.isDarwin "-E '^(CBLAS-(x[sdcz]cblat[23]))$'"; + ctestArgs = lib.optionalString stdenv.hostPlatform.isDarwin "-E '^(CBLAS-(x[sdcz]cblat[23]))$'"; checkPhase = '' runHook preCheck diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index 26a1932bd192c..d429c4c1f703c 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; homepage = "http://www.chokkan.org/software/liblbfgs/"; license = lib.licenses.mit; diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index 92050cd172834..f8e0dcff2bc1d 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -23,7 +23,7 @@ let device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; - libcxx-for-libtorch = if stdenv.isDarwin then libcxx else stdenv.cc.cc.lib; + libcxx-for-libtorch = if stdenv.hostPlatform.isDarwin then libcxx else stdenv.cc.cc.lib; in stdenv.mkDerivation { inherit version; pname = "libtorch"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { src = fetchzip srcs."${stdenv.hostPlatform.system}-${device}" or unavailable; nativeBuildInputs = - if stdenv.isDarwin then [ fixDarwinDylibNames ] + if stdenv.hostPlatform.isDarwin then [ fixDarwinDylibNames ] else [ patchelf ] ++ lib.optionals cudaSupport [ addDriverRunpath ]; dontBuild = true; @@ -60,7 +60,7 @@ in stdenv.mkDerivation { postFixup = let rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ]; - in lib.optionalString stdenv.isLinux '' + in lib.optionalString stdenv.hostPlatform.isLinux '' find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." patchelf --set-rpath "${rpath}:$out/lib" "$lib" @@ -68,7 +68,7 @@ in stdenv.mkDerivation { addDriverRunpath "$lib" ''} done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/lib/*.dylib; do otool -L $f done diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix index ac513297f1590..0cda439404bbb 100644 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # does not compile correctly with -O2 on LLVM clang; see # https://bitbucket.org/malb/m4rie/issues/23/trying-to-compile-on-apple-m1 - makeFlags = [] ++ lib.optionals stdenv.isDarwin [ "CFLAGS=-O0" ]; + makeFlags = [] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "CFLAGS=-O0" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index 08dac598f7d91..b1b2b80be0fc6 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -31,7 +31,7 @@ let - inherit (lib) lists strings trivial; + inherit (lib) getLib lists strings trivial; inherit (magmaRelease) version hash supportedGpuTargets; # Per https://icl.utk.edu/magma/downloads, support for CUDA 12 wasn't added until 2.7.1. @@ -133,6 +133,7 @@ stdenv.mkDerivation { lapack blas python3 + (getLib gfortran.cc) # libgfortran.so ] ++ lists.optionals cudaSupport (with effectiveCudaPackages; [ cuda_cudart # cuda_runtime.h libcublas # cublas_v2.h diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 607b6c89e40d1..dc8b674f5c265 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -20,7 +20,7 @@ let version = "${mklVersion}.${rel}"; mklVersion = "2023.1.0"; - rel = if stdenvNoCC.isDarwin then "43558" else "46342"; + rel = if stdenvNoCC.hostPlatform.isDarwin then "43558" else "46342"; # Intel openmp uses its own versioning. openmpVersion = "2023.1.0"; @@ -66,17 +66,17 @@ in stdenvNoCC.mkDerivation ({ pname = "mkl"; inherit version; - dontUnpack = stdenvNoCC.isLinux; + dontUnpack = stdenvNoCC.hostPlatform.isLinux; - sourceRoot = if stdenvNoCC.isDarwin then "." else null; + sourceRoot = if stdenvNoCC.hostPlatform.isDarwin then "." else null; - nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin + nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.hostPlatform.isDarwin then [ _7zz cctools ] else [ rpmextract ]); - buildPhase = if stdenvNoCC.isDarwin then '' + buildPhase = if stdenvNoCC.hostPlatform.isDarwin then '' for f in bootstrapper.app/Contents/Resources/packages/*/cupPayload.cup; do tar -xf $f done @@ -110,9 +110,9 @@ in stdenvNoCC.mkDerivation ({ # Dynamic libraries mkdir -p $out/lib - cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*${shlibExt}* $out/lib - cp -a opt/intel/oneapi/compiler/${mklVersion}/${if stdenvNoCC.isDarwin then "mac" else "linux"}/compiler/lib/${lib.optionalString stdenvNoCC.isLinux "intel64_lin"}/*${shlibExt}* $out/lib - cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64/gcc4.8"}/*${shlibExt}* $out/lib + cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64"}/*${shlibExt}* $out/lib + cp -a opt/intel/oneapi/compiler/${mklVersion}/${if stdenvNoCC.hostPlatform.isDarwin then "mac" else "linux"}/compiler/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64_lin"}/*${shlibExt}* $out/lib + cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64/gcc4.8"}/*${shlibExt}* $out/lib # Headers cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/ @@ -121,10 +121,10 @@ in stdenvNoCC.mkDerivation ({ cp -r opt/intel/oneapi/mkl/${mklVersion}/lib/cmake $out/lib '' + (if enableStatic then '' - install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*.a + install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64"}/*.a install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*.pc '' else '' - cp opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*${shlibExt}* $out/lib + cp opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.hostPlatform.isLinux "intel64"}/*${shlibExt}* $out/lib install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*dynamic*.pc '') + '' # Setup symlinks for blas / lapack @@ -142,7 +142,7 @@ in stdenvNoCC.mkDerivation ({ # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the # larger updated load commands do not fit. Use install_name_tool # explicitly and ignore the error. - postFixup = lib.optionalString stdenvNoCC.isDarwin '' + postFixup = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' for f in $out/lib/*.dylib; do install_name_tool -id $out/lib/$(basename $f) $f || true done @@ -176,7 +176,7 @@ in stdenvNoCC.mkDerivation ({ platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ bhipple ]; }; -} // lib.optionalAttrs stdenvNoCC.isDarwin { +} // lib.optionalAttrs stdenvNoCC.hostPlatform.isDarwin { src = fetchurl { url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/087a9190-9d96-4b8c-bd2f-79159572ed89/m_onemkl_p_${mklVersion}.${rel}_offline.dmg"; hash = "sha256-bUaaJPSaLr60fw0DzDCjPvY/UucHlLbCSLyQxyiAi04="; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 825eeabdfe1e7..54b4f7cabd92a 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -114,6 +114,13 @@ let DYNAMIC_ARCH = setDynamicArch false; USE_OPENMP = true; }; + + s390x-linux = { + BINARY = 64; + TARGET = setTarget "ZARCH_GENERIC"; + DYNAMIC_ARCH = setDynamicArch true; + USE_OPENMP = true; + }; }; in @@ -208,7 +215,7 @@ stdenv.mkDerivation rec { # This seems to be a bug in the openblas Makefile: # on x86_64 it expects NO_BINARY_MODE= # but on aarch64 it expects NO_BINARY_MODE=0 - NO_BINARY_MODE = if stdenv.isx86_64 + NO_BINARY_MODE = if stdenv.hostPlatform.isx86_64 then toString (stdenv.hostPlatform != stdenv.buildPlatform) else stdenv.hostPlatform != stdenv.buildPlatform; # This disables automatic build job count detection (which honours neither enableParallelBuilding nor NIX_BUILD_CORES) diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index cb4670204d112..a0f599f5d7068 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -14,7 +14,7 @@ , python , re2 , stdenv -, swig4 +, swig , unzip , zlib }: @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { "-DUSE_GLPK=ON" "-DUSE_SCIP=OFF" "-DPython3_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" - ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; strictDeps = true; @@ -75,9 +75,9 @@ stdenv.mkDerivation rec { ensureNewerSourcesForZipFilesHook pkg-config python.pythonOnBuildForHost - swig4 + swig unzip - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ] ++ (with python.pythonOnBuildForHost.pkgs; [ pip diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix index bb5d212061f2d..39b5660494d2e 100644 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { # disallow Darwin checks due to prototype incompatibility of qsort_r # to be fixed in a future version of the source code - doCheck = !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = !stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform; meta = { branch = "prev3-develop"; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index b36f486478193..f7b4ba6738d1b 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "stackprotector" ]; # xslu and xsllt tests seem to time out on x86_64-darwin. # this line is left so those who force installation on x86_64-darwin can still build - doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); + doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin); preConfigure = '' cmakeFlagsArray+=( @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ costrouc markuskowa gdinh ]; # xslu and xsllt tests fail on x86 darwin - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 2d0b416d975c1..c0b6561e0031e 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -31,7 +31,11 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) ''; - cmakeFlags = [ (lib.cmakeBool "GRAPHBLAS_USE_JIT" (!(stdenv.isLinux && stdenv.isAarch64))) ]; + cmakeFlags = [ + (lib.cmakeBool "GRAPHBLAS_USE_JIT" ( + !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) + )) + ]; meta = with lib; { description = "Graph algorithms in the language of linear algebra"; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index f47b5c0ce818f..ef859cfc1ca2a 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \ -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/' '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/' '' @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "LAPACK=-llapack" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -DNTIMER"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin " -DNTIMER"; postInstall = '' # Build and install shared library @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { for i in "$out"/lib/lib*.a; do ar -x $i done - ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${lib.optionalString enableCuda "-lcublas"} + ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.hostPlatform.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${lib.optionalString enableCuda "-lcublas"} ) for i in umfpack cholmod amd camd colamd spqr; do ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT} diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 43623e8604b9b..28909f53fecbb 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { "CUDA_PATH=${cudaPackages.cuda_nvcc}" "CUDART_LIB=${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so" "CUBLAS_LIB=${lib.getLib cudaPackages.libcublas}/lib/libcublas.so" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368 "BLAS=-lblas" @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ] ; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Ensure that there is enough space for the `fixDarwinDylibNames` hook to # update the install names of the output dylibs. NIX_LDFLAGS = "-headerpad_max_install_names"; diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index 91daf30686f8f..ea2ed2e83ddd7 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -59,10 +59,17 @@ stdenv.mkDerivation rec { # Example from the README as a sanity check. doInstallCheck = true; - installCheckPhase = '' - export HOME=$TMPDIR - "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705' - ''; + installCheckPhase = + '' + export HOME=$TMPDIR + "$out/bin/sympow" -curve "[1,2,3,4,5]" -moddeg | grep 'Modular Degree is 464' + echo "[1,-1,0,-79,289]" | "$out/bin/sympow" -analrank | grep ^"Analytic Rank is 4" + "$out/bin/sympow" -curve "[1,-1,0,-79,289]" -analrank | grep ^"Analytic Rank is 4" + "$out/bin/sympow" -curve "[0,1,1,-2,0]" -analrank | grep ^"Analytic Rank is 2" + '' + + lib.optionalString (!stdenv.hostPlatform.isAarch64) '' + "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705' + ''; meta = { description = "Compute special values of symmetric power elliptic curve L-functions"; @@ -73,6 +80,6 @@ stdenv.mkDerivation rec { free = true; }; maintainers = lib.teams.sage.members; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index 9f9405dec3180..218b05b911e49 100644 --- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -7,7 +7,7 @@ let buildPlatform = stdenv.buildPlatform; hostPlatform = stdenv.hostPlatform; - pythonEnv = buildPackages.python3.withPackages (ps: [ ps.numpy ]); + pythonEnv = buildPackages.python3.withPackages (ps: with ps; [ distutils numpy ]); bazelDepsSha256ByBuildAndHost = { x86_64-linux = { x86_64-linux = "sha256-61qmnAB80syYhURWYJOiOnoGOtNa1pPkxfznrFScPAo="; diff --git a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix index bea271b0cef15..ada84ef50767c 100644 --- a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix +++ b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix @@ -157,5 +157,7 @@ in license = licenses.bsd3; maintainers = with maintainers; [connorbaker]; platforms = platforms.linux; + # g++: error: unrecognized command-line option '-mf16c' + broken = stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index 2e2e2a871f7a6..efcfa99be0e06 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -137,6 +137,6 @@ stdenv.mkDerivation rec { platforms = with platforms; unix; maintainers = with maintainers; [ teto rgrunbla ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index 7f6325faef254..6e12e19d596a1 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.7.9"; + version = "0.7.10"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-L7VlsxgjWPCceDuJ9OR6Et6wzaBn1hb0AOFbc7PuZWw="; + hash = "sha256-1Pro2BXflitUGVbzvjwdSFqwWM/EeuDC3eHEj+7qwm8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 1a2f407f9bc22..07138596d05de 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ apr openssl aprutil zlib libiconv ] - ++ lib.optional (!stdenv.isCygwin) libkrb5; + ++ lib.optional (!stdenv.hostPlatform.isCygwin) libkrb5; patches = [ ./scons.patch @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { sconsFlags+=" CC=$CC" sconsFlags+=" OPENSSL=${openssl}" sconsFlags+=" ZLIB=${zlib}" - '' + lib.optionalString (!stdenv.isCygwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isCygwin) '' sconsFlags+=" GSSAPI=${libkrb5.dev}" ''; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index c3ecd3a9866fe..2b28228c5f57e 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ freetype libjpeg openal flac libvorbis glew ] - ++ lib.optional stdenv.isLinux udev - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] - ++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; + ++ lib.optional stdenv.hostPlatform.isLinux udev + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Foundation AppKit OpenAL ]; cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index da63b22f9e7ee..f38db198bd307 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices SystemConfiguration ]); diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 7f4b73c793789..d2a4206e7dc1a 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { doFakeLibgcc = true; }); - patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./macosx.patch ]; postPatch = '' # disable broken 'nametabletest' test, fails on gcc-13: # https://github.com/silnrsi/graphite/pull/74 diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 5f2c020c30f6b..5adc27e7c106d 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-MKaYThfAbQiUHBFPAWJatKdLJdmJfsR3o8gp81RE3SI="; + sha256 = "sha256-UfGt5lKmpqc21Hln4t/4KJfg+3V/hqX3UYgpCvlhkrM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index fbdfd20441d98..c17064729f961 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, swig4 +, swig , lua , elastix , itk @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - swig4 + swig ]; buildInputs = [ elastix diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix deleted file mode 100644 index 162bc8395d998..0000000000000 --- a/pkgs/development/libraries/slang/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib, stdenv, fetchurl -, libiconv -, libpng -, ncurses -, pcre -, readline -, zlib -, writeScript -}: - -stdenv.mkDerivation rec { - pname = "slang"; - version = "2.3.3"; - - src = fetchurl { - url = "https://www.jedsoft.org/releases/slang/${pname}-${version}.tar.bz2"; - sha256 = "sha256-+RRQVK4TGXPGEgjqgkhtXdEOPFza0jt8SgYXdDyPWhg="; - }; - - outputs = [ "out" "dev" "man" "doc" ]; - - # Fix some wrong hardcoded paths - preConfigure = '' - sed -ie "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure - sed -ie "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" src/sltermin.c - sed -ie "s|/bin/ln|ln|" src/Makefile.in - sed -ie "s|-ltermcap|-lncurses|" ./configure - ''; - - configureFlags = [ - "--with-pcre=${pcre.dev}" - "--with-png=${libpng.dev}" - "--with-readline=${readline.dev}" - "--with-z=${zlib.dev}" - ]; - - buildInputs = [ - libpng - pcre - readline - zlib - ] ++ lib.optionals (stdenv.isDarwin) [ libiconv ]; - - propagatedBuildInputs = [ ncurses ]; - - buildFlags = lib.optional stdenv.hostPlatform.isStatic "static"; - installTargets = lib.optional stdenv.hostPlatform.isStatic "install-static"; - - preBuild = '' - makeFlagsArray+=(AR_CR="${stdenv.cc.targetPrefix}ar cr") - ''; - - enableParallelBuilding = true; - - postInstall = '' - find "$out"/lib/ -name '*.so' -exec chmod +x "{}" \; - sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc - ''; - - passthru = { - updateScript = writeScript "update-slang" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl pcre common-updater-scripts - - set -eu -o pipefail - - # Expect the text in format of 'Version 2.3.3</td>' - new_version="$(curl -s https://www.jedsoft.org/slang/ | - pcregrep -o1 'Version ([0-9.]+)</td>')" - update-source-version ${pname} "$new_version" - ''; - }; - - meta = with lib; { - description = "Small, embeddable multi-platform programming library"; - longDescription = '' - S-Lang is an interpreted language that was designed from the start to be - easily embedded into a program to provide it with a powerful extension - language. Examples of programs that use S-Lang as an extension language - include the jed text editor and the slrn newsreader. Although S-Lang does - not exist as a separate application, it is distributed with a quite - capable program called slsh ("slang-shell") that embeds the interpreter - and allows one to execute S-Lang scripts, or simply experiment with S-Lang - at an interactive prompt. Many of the the examples in this document are - presented in the context of one of the above applications. - - S-Lang is also a programmer's library that permits a programmer to develop - sophisticated platform-independent software. In addition to providing the - S-Lang interpreter, the library provides facilities for screen management, - keymaps, low-level terminal I/O, etc. However, this document is concerned - only with the extension language and does not address these other features - of the S-Lang library. For information about the other components of the - library, the reader is referred to the S-Lang Library C Programmer's - Guide. - ''; - homepage = "http://www.jedsoft.org/slang/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - mainProgram = "slsh"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 099a3d838bbbc..d310e3653e7f1 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; - buildInputs = [ SDL ] ++ lib.optionals (!stdenv.isDarwin) [ gtk2 libGLU libGL ]; + buildInputs = [ SDL ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk2 libGLU libGL ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 24dd9c9dc400f..bcece08e6195f 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ]; buildInputs = [ SDL2 ] - ++ lib.optional stdenv.isDarwin darwin.libobjc; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.libobjc; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index 007a4fbaf7bf4..3ba387436e764 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { sqlite postgresql boost - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Kerberos ]; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index b9f34eeb9748d..7b33ed04871f2 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY="; }; - buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; + buildInputs = [ glib openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin SystemConfiguration; nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { diff --git a/pkgs/development/libraries/sokol/default.nix b/pkgs/development/libraries/sokol/default.nix index b84f42490e338..bfb034cfce6c8 100644 --- a/pkgs/development/libraries/sokol/default.nix +++ b/pkgs/development/libraries/sokol/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "sokol"; - version = "unstable-2023-08-04"; + version = "0-unstable-2024-09-20"; src = fetchFromGitHub { owner = "floooh"; repo = "sokol"; - rev = "47d92ff86298fc96b3b84d93d0ee8c8533d3a2d2"; - sha256 = "sha256-TsM5wK9a2ectrAY8VnrMPaxCNV3e1yW92SBBCHgs+0k="; + rev = "38e4c9a516f8808d706343a5c525acfe7007fe67"; + sha256 = "sha256-g4JMCbG9is7uBFv6cTBTCmRYfKWMruagtYQjYZnOFn4="; }; dontBuild = true; diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index 4ab71b36a0123..6b82b5f4f04fc 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { postInstall = '' installManPage sonic.1 - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libsonic.so.0.3.0 $out/lib/libsonic.so.0.3.0 ''; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index abd87c03b1a82..b611792755062 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "spdk"; - version = "24.05"; + version = "24.09"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - hash = "sha256-kjZWaarvNSYXseJ/uH7Ak7DbWEgrLnAwXcL8byJ9fjU="; + hash = "sha256-27mbIycenOk51PLQrAfU1cZcjiWddNtxoyC6Q9wxqFg="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 8bee16fef7539..1dbaa016cbbfe 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices AudioUnit Cocoa diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 0f5e09cf83e54..e3452beab870d 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals withFftw3 [ fftw ]; configureFlags = lib.optionals withFftw3 [ "--with-fft=gpl-fftw3" ] - ++ lib.optional stdenv.isAarch64 "--disable-neon"; + ++ lib.optional stdenv.hostPlatform.isAarch64 "--disable-neon"; meta = with lib; { homepage = "https://www.speex.org/"; diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index 1d3f8b489f211..75634072b8ec7 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gfortran gtest ]; - buildInputs = lib.optionals stdenv.isDarwin [ openmp ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ openmp ]; cmakeFlags = [ "-DSPGLIB_WITH_Fortran=On" ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index fd7428213fc9c..048ba14f5f937 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -37,7 +37,7 @@ , wayland-scanner , zlib , wrapGAppsHook3 -, withPolkit ? stdenv.isLinux +, withPolkit ? stdenv.hostPlatform.isLinux }: # If this package is built with polkit support (withPolkit=true), @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { wrapGAppsHook3 ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ mesonEmulatorHook - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]; @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withPolkit [ polkit acl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap_ng libdrm wayland-protocols @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { "-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids" ] ++ lib.optionals (!withPolkit) [ "-Dpolkit=disabled" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Dlibcap-ng=disabled" "-Degl=disabled" ] ++ lib.optionals stdenv.hostPlatform.isMusl [ diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index d7855cd5cea5a..4ac1b1cdee11c 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -67,9 +67,9 @@ stdenv.mkDerivation rec { python3.pkgs.pyparsing spice-protocol zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gdk-pixbuf ]; diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 31efd76209a38..8326a71041daa 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-CAmDDqeMVKNdV/91VQYAKyCc+e+H99PRYZzt5WjswBI="; + hash = "sha256-c9ruBCnf9PNJz030bfRhHwyqju6T8YCRx+efKCEYgSo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index c5dc183dd1432..dff4e09fa7a72 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - hash = "sha256-ds+0ckQiHikNMr4Xf/wCWwQySpadGgnccENd6u6gIzQ="; + hash = "sha256-VcD3NwVrC75kLOJiIgrnzVpkBPhjxTmEFyKg/87wHGc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index dd4e15ea566f8..ed1499abe6977 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; outputs = [ "bin" "dev" "out" ]; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 2b843c0b22e0b..1c8ab1f3465a5 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -13,7 +13,7 @@ let }; nativeBuildInputs = [ unzip ]; - buildInputs = [ tcl ] ++ lib.optional stdenv.isDarwin Foundation; + buildInputs = [ tcl ] ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; makeFlags = [ makeTarget ]; diff --git a/pkgs/development/libraries/stargate-libcds/default.nix b/pkgs/development/libraries/stargate-libcds/default.nix index b74f19e1959a7..c37365652e725 100644 --- a/pkgs/development/libraries/stargate-libcds/default.nix +++ b/pkgs/development/libraries/stargate-libcds/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; # Fix 'error: unrecognized command line option' in platforms other than x86 - PLAT_FLAGS = lib.optionalString stdenv.isx86_64 "-mfpmath=sse -mssse3"; + PLAT_FLAGS = lib.optionalString stdenv.hostPlatform.isx86_64 "-mfpmath=sse -mssse3"; patches = [ # Remove unnecessary tests (valgrind, coverage) diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index b79020e3ba712..91a41ac352989 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { preBuild = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i s/-soname/-install_name/ Makefile '' # upstream builds shared library unconditionally. Also, it has no diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 5d58212d70c62..31d9098242c2a 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, parallelSupport ? (!stdenv.isDarwin) +, parallelSupport ? (!stdenv.hostPlatform.isDarwin) }: let diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 3d6a3653d2672..624d239fa35c1 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -7,7 +7,14 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://swiftshader.googlesource.com/SwiftShader"; rev = "4e40d502c440cc59b25fa3a5fee0eadbab7442aa"; - sha256 = "085bdqn80s7zw5h2pz6xff3j34hmkxb9wxzgjmzdr9c24zwp2k1c"; + hash = "sha256-YtbTaOkFhVMKdu3jiRHQsPmoEu3KDzIQXLZ5HFBSmWI="; + # Remove 1GB of test files to get under Hydra output limit + postFetch = '' + rm -r $out/third_party/llvm-project/llvm/test + rm -r $out/third_party/json/test + rm -r $out/third_party/cppdap/third_party/json/test + rm -r $out/third_party/llvm-project/clang/test + ''; }; nativeBuildInputs = [ cmake python3 jq ]; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index 25043bbb0265d..cbdb542dbfd96 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DWITH_SYMENGINE_THREAD_SAFE=yes" "-DWITH_MPC=yes" "-DBUILD_FOR_DISTRIBUTION=yes" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # error: unrecognized instruction mnemonic, did you mean: bit, cnt, hint, ins, not? "-DBUILD_TESTS=OFF" ] ++ lib.optionals withShared [ diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 16112f32b1e2f..e09ed7ee32dc7 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXaw ]; buildFlags = [ "without_doc" ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # ?? chmod +x $out/lib/*.so.* ''; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 0446d2cac6e7d..9520f9a8404e5 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; sha256 = "sha256-CSA8ECMRFJ9d9cw2dAn5bHJXQmZtGcJNtbqZTVqBpvU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Carbon ] ++ lib.optionals withJpegSupport [ libjpeg diff --git a/pkgs/development/libraries/taco/default.nix b/pkgs/development/libraries/taco/default.nix index 693b5f25f9904..a2f2f933214c1 100644 --- a/pkgs/development/libraries/taco/default.nix +++ b/pkgs/development/libraries/taco/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.isDarwin llvmPackages.openmp; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = lib.optional enablePython pyEnv; diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix index 0a2637d90648e..3eaa0e238518c 100644 --- a/pkgs/development/libraries/tagparser/default.nix +++ b/pkgs/development/libraries/tagparser/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "12.2.0"; + version = "12.3.1"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-Plq6iimXStrveSw+SfzuXUuLlQ06ugO21e97fXivqYk="; + hash = "sha256-ihrtUd9R8Tdkuv0kdIZNzBDrhwmsC3LNDsmoCroSMPM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 793fc1ccf5cb5..eb1525fb9acbe 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { wafHook docbook-xsl-nons docbook_xml_dtd_42 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/development/libraries/tbb/2020_3.nix b/pkgs/development/libraries/tbb/2020_3.nix index dcd21b27ff334..c7e1e9127630b 100644 --- a/pkgs/development/libraries/tbb/2020_3.nix +++ b/pkgs/development/libraries/tbb/2020_3.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = (lib.optionals stdenv.isDarwin [ + nativeBuildInputs = (lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]); diff --git a/pkgs/development/libraries/tbb/2021_5.nix b/pkgs/development/libraries/tbb/2021_5.nix index 3bfa9278106d9..90e7aa2a9f2f3 100644 --- a/pkgs/development/libraries/tbb/2021_5.nix +++ b/pkgs/development/libraries/tbb/2021_5.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ # Workaround for gcc-12 ICE when using -O3 # https://gcc.gnu.org/PR108854 - lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; + lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ]; # Fix undefined reference errors with version script under LLVM. NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 73ea56b306869..3ff04d6bf1abf 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ # Workaround for gcc-12 ICE when using -O3 # https://gcc.gnu.org/PR108854 - lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; + lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ]; # Fix undefined reference errors with version script under LLVM. NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; diff --git a/pkgs/development/libraries/tbox/default.nix b/pkgs/development/libraries/tbox/default.nix index b2406d19e7017..9d1afcec84e12 100644 --- a/pkgs/development/libraries/tbox/default.nix +++ b/pkgs/development/libraries/tbox/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tbox"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "tboox"; repo = pname; rev = "v${version}"; - hash = "sha256-VM6LOTVwM47caXYiH+6c7t174i0W5MY1dg2Y5yutlcc="; + hash = "sha256-cwpZ7F8WzT/46HrckHe0Aug2mxirCkNA68aCxg/FcsE="; }; configureFlags = [ diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index d78f4abafab00..c84ded6267e14 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; - postFixup = if stdenv.isDarwin + postFixup = if stdenv.hostPlatform.isDarwin then ''install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib'' else null; diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index d02bd3b81011c..f9a87aa73b511 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { function(generate_pkgconfig' \ --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' sed -i "/vptr/d" test/CMakeLists.txt ''; diff --git a/pkgs/development/libraries/test-drive/default.nix b/pkgs/development/libraries/test-drive/default.nix index 639582c3b8ae5..41fc83844287e 100644 --- a/pkgs/development/libraries/test-drive/default.nix +++ b/pkgs/development/libraries/test-drive/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "test-drive"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "fortran-lang"; repo = pname; rev = "v${version}"; - hash = "sha256-ObAnHFP1Hp0knf/jtGHynVF0CCqK47eqetePx4NLmlM="; + hash = "sha256-xRx8ErIN9xjxZt/nEsdIQkIGFRltuELdlI8lXA+M030="; }; nativeBuildInputs = [ @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { mesonEmulatorHook ]; + mesonAutoFeatures = "auto"; + meta = with lib; { description = "Procedural Fortran testing framework"; homepage = "https://github.com/fortran-lang/test-drive"; diff --git a/pkgs/development/libraries/tezos-rust-libs/default.nix b/pkgs/development/libraries/tezos-rust-libs/default.nix index 85470f606f28e..85ac4b0266c5b 100644 --- a/pkgs/development/libraries/tezos-rust-libs/default.nix +++ b/pkgs/development/libraries/tezos-rust-libs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ llvmPackages_12.llvm cargo ]; propagatedBuildDeps = [ llvmPackages_12.libllvm ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildPhase = '' runHook preBuild diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 7995a3fe1699f..589f03c68858e 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { disabledTests = [ "PythonTestSSLSocket" "PythonThriftTNonblockingServer" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Tests that hang up in the Darwin sandbox "SecurityTest" "SecurityFromBufferTest" @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E "($(echo "$disabledTests" | tr " " "|"))" + ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E "($(echo "$disabledTests" | tr " " "|"))" runHook postCheck ''; diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 28b14d3a8a5be..9b834c3a7e586 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { installTargets = [ "install-tiledb" "doc" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath ${tbb}/lib $out/lib/libtiledb.dylib ''; diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index ded5013cca99a..456fd7fe2dd90 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { hardeningDisable = [ "format" ]; env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; + lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.9"; nativeBuildInputs = [ unzip ]; buildPhase = '' @@ -78,7 +78,7 @@ in stdenv.mkDerivation { cp -v tinyxml.pc $out/lib/pkgconfig/ cp -v docs/* $out/share/doc/tinyxml/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib ''; diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix index afd575915f852..ad0013060ff63 100644 --- a/pkgs/development/libraries/tk/8.5.nix +++ b/pkgs/development/libraries/tk/8.5.nix @@ -14,7 +14,7 @@ callPackage ./generic.nix (args // { sha256 = "1yhgcalldrjlc5q614rlzg1crgd3b52dhrk1pncdaxvl2vgg2yj0"; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Define MODULE_SCOPE before including tkPort.h # https://core.tcl-lang.org/tk/info/dba9f5ce3b (fetchpatch { diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 4978f8b96f58a..8094ed169fa38 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,5 +1,5 @@ { stdenv, lib, src, pkg-config, tcl, libXft, patches ? [] -, enableAqua ? stdenv.isDarwin, darwin +, enableAqua ? stdenv.hostPlatform.isDarwin, darwin , ... }: tcl.mkTclDerivation { @@ -22,7 +22,7 @@ tcl.mkTclDerivation { substituteInPlace $file --replace "exec wish" "exec $out/bin/wish" done '' - + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' substituteInPlace unix/configure* \ --replace " -framework UniformTypeIdentifiers" "" ''; @@ -32,17 +32,16 @@ tcl.mkTclDerivation { cp ../{unix,generic}/*.h $out/include ln -s $out/lib/libtk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary} '' - + lib.optionalString (stdenv.isDarwin) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin) '' cp ../macosx/*.h $out/include ''; configureFlags = [ "--enable-threads" - ] ++ lib.optional stdenv.is64bit "--enable-64bit" + ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit" ++ lib.optional enableAqua "--enable-aqua"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; propagatedBuildInputs = [ libXft diff --git a/pkgs/development/libraries/tkimg/default.nix b/pkgs/development/libraries/tkimg/default.nix index 8b66e195d5a5e..f058585d3ad95 100644 --- a/pkgs/development/libraries/tkimg/default.nix +++ b/pkgs/development/libraries/tkimg/default.nix @@ -16,7 +16,7 @@ tcl.mkTclDerivation rec { "--with-tkinclude=${tk.dev}/include" ]; - buildInputs = [ xorg.libX11 tcllib ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = [ xorg.libX11 tcllib ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa ]); diff --git a/pkgs/development/libraries/toml-f/default.nix b/pkgs/development/libraries/toml-f/default.nix index 3f95d5682f9e0..30632e1160db8 100644 --- a/pkgs/development/libraries/toml-f/default.nix +++ b/pkgs/development/libraries/toml-f/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # tftest-build fails on aarch64-linux - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = with lib; { description = "TOML parser implementation for data serialization and deserialization in Fortran"; diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 6d3a29c28ba79..34b37d1c74a1f 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -10,7 +10,7 @@ let # needs to be conditional based on isLinux because procps for other systems # might not support the withSystemd option. procpsWithoutSystemd = procps.override { withSystemd = false; }; - procps_pkg = if stdenv.isLinux then procpsWithoutSystemd else procps; + procps_pkg = if stdenv.hostPlatform.isLinux then procpsWithoutSystemd else procps; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index da5274e0b7dfe..d75bbdd542fe6 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { avahi libstemmer dbus - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]; @@ -103,15 +103,15 @@ stdenv.mkDerivation (finalAttrs: { [ "--cross-file=${crossFile}" ] - ) ++ lib.optionals (!stdenv.isLinux) [ + ) ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Dsystemd_user_services=false" ]; doCheck = # https://gitlab.gnome.org/GNOME/tracker/-/issues/402 - !stdenv.isDarwin + !stdenv.hostPlatform.isDarwin # https://gitlab.gnome.org/GNOME/tracker/-/issues/398 - && !stdenv.is32bit; + && !stdenv.hostPlatform.is32bit; postPatch = '' chmod +x \ @@ -125,8 +125,8 @@ stdenv.mkDerivation (finalAttrs: { preCheck = let - linuxDot0 = lib.optionalString stdenv.isLinux ".0"; - darwinDot0 = lib.optionalString stdenv.isDarwin ".0"; + linuxDot0 = lib.optionalString stdenv.hostPlatform.isLinux ".0"; + darwinDot0 = lib.optionalString stdenv.hostPlatform.isDarwin ".0"; extension = stdenv.hostPlatform.extensions.sharedLibrary; in '' diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix index 662ec1c7b0350..dede0e55657af 100644 --- a/pkgs/development/libraries/ubus/default.nix +++ b/pkgs/development/libraries/ubus/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ libubox libjson ]; nativeBuildInputs = [ cmake ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-Wno-error=gnu-folding-constant" ]); diff --git a/pkgs/development/libraries/uclient/default.nix b/pkgs/development/libraries/uclient/default.nix index 7206b6ad98fcd..f758c00810edb 100644 --- a/pkgs/development/libraries/uclient/default.nix +++ b/pkgs/development/libraries/uclient/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ mkg20001 ]; mainProgram = "uclient-fetch"; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix index f9c5a80582b79..5dad256063b40 100644 --- a/pkgs/development/libraries/udns/default.nix +++ b/pkgs/development/libraries/udns/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # udns uses a very custom build and hardcodes a .so name in a few places. # Instead of fighting with it to apply the standard dylib script, change # the right place in the Makefile itself. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.in \ --replace --soname, -install_name,$out/lib/ ''; diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index b6a91a7367a47..93fc0531ccd99 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -1,38 +1,39 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, IOKit -, cctools +{ + lib, + stdenv, + cctools, + cmake, + fetchFromGitHub, + IOKit, + pkg-config, }: stdenv.mkDerivation rec { pname = "unicorn"; - version = "2.0.1.post1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "unicorn-engine"; - repo = pname; - rev = version; - hash = "sha256-Jz5C35rwnDz0CXcfcvWjkwScGNQO1uijF7JrtZhM7mI="; + repo = "unicorn"; + rev = "refs/tags/${version}"; + hash = "sha256-ZlQ2WVTToT0OMxK6brsHnchxDwAR5n1wdtZtkTTgWV4="; }; - nativeBuildInputs = [ - cmake - pkg-config - ] ++ lib.optionals stdenv.isDarwin [ - cctools - ]; + nativeBuildInputs = + [ + cmake + pkg-config + ] + ++ lib.optionals stdenv.isDarwin [ + cctools + ]; - buildInputs = lib.optionals stdenv.isDarwin [ - IOKit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; - cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Some x86 tests are interrupted by signal 10 "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;test_x86" ]; @@ -44,6 +45,9 @@ stdenv.mkDerivation rec { homepage = "https://www.unicorn-engine.org"; license = licenses.gpl2Only; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice luc65r ]; + maintainers = with maintainers; [ + thoughtpolice + luc65r + ]; }; } diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index fe181d37f6bf6..bd27a36d663a6 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -39,7 +39,7 @@ nativeBuildInputs = [ cmake ]; buildInputs = [ unixODBC openssl libiconv zlib ] - ++ lib.optionals stdenv.isDarwin [ libkrb5 ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libkrb5 ]; cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" @@ -50,9 +50,9 @@ "-DWITH_IODBC=OFF" ]; - buildFlags = if stdenv.isDarwin then [ "maodbc" ] else null; + buildFlags = if stdenv.hostPlatform.isDarwin then [ "maodbc" ] else null; - installTargets = if stdenv.isDarwin then [ "install/fast" ] else null; + installTargets = if stdenv.hostPlatform.isDarwin then [ "install/fast" ] else null; # see the top of the file for an explanation passthru = { @@ -170,7 +170,7 @@ }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "ODBC Driver ${versionMajor} for SQL Server"; homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; @@ -187,7 +187,7 @@ versionMajor = "18"; versionMinor = "1"; versionAdditional = "1.1"; - versionSuffix = lib.optionalString stdenv.isLinux "-1"; + versionSuffix = lib.optionalString stdenv.hostPlatform.isLinux "-1"; src = fetchurl { url = { @@ -205,7 +205,7 @@ }; nativeBuildInputs = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then [ # Fix up the names encoded into the dylib, and make them absolute. @@ -217,12 +217,12 @@ patchelf ]; - unpackPhase = lib.optionalString stdenv.isLinux '' + unpackPhase = lib.optionalString stdenv.hostPlatform.isLinux '' dpkg -x $src ./ ''; installPhase = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out @@ -236,14 +236,14 @@ ''; # Replace the hard-coded paths in the dylib with nixpkgs equivalents. - fixupPhase = lib.optionalString stdenv.isDarwin '' + fixupPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' ${stdenv.cc.bintools.targetPrefix}install_name_tool \ -change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib \ -change /opt/homebrew/lib/libodbcinst.2.dylib ${unixODBC}/lib/libodbcinst.2.dylib \ $out/${finalAttrs.passthru.driver} ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl libkrb5 libuuid stdenv.cc.cc ]} \ $out/${finalAttrs.passthru.driver} ''; @@ -251,7 +251,7 @@ # see the top of the file for an explanation passthru = { fancyName = "ODBC Driver ${finalAttrs.versionMajor} for SQL Server"; - driver = "lib/libmsodbcsql${if stdenv.isDarwin then ".${finalAttrs.versionMajor}.dylib" else "-${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.so.${finalAttrs.versionAdditional}"}"; + driver = "lib/libmsodbcsql${if stdenv.hostPlatform.isDarwin then ".${finalAttrs.versionMajor}.dylib" else "-${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.so.${finalAttrs.versionAdditional}"}"; }; meta = with lib; { @@ -300,7 +300,7 @@ }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Amazon Redshift ODBC driver"; homepage = "https://docs.aws.amazon.com/redshift/latest/mgmt/configure-odbc-connection.html"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 3ea2d075602a0..b6b2d4e6298f8 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -101,11 +101,11 @@ stdenv.mkDerivation rec { ''; postPatch = '' - ${lib.optionalString stdenv.isAarch64 '' + ${lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace build/config/compiler/compiler.gni \ --replace 'strip_absolute_paths_from_debug_symbols = true' \ 'strip_absolute_paths_from_debug_symbols = false' @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ 'false' ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace build/config/compiler/BUILD.gn \ --replace "-Wl,-fatal_warnings" "" ''} @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"'' - ++ lib.optional stdenv.isDarwin ''use_lld=false''; + ++ lib.optional stdenv.hostPlatform.isDarwin ''use_lld=false''; env.NIX_CFLAGS_COMPILE = toString ([ "-O2" @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild llvmPackages.llvm python3.pkgs.setuptools diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix deleted file mode 100644 index 8ddc1d88fe443..0000000000000 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, - vapoursynth, nasm, fftwFloat -}: - -stdenv.mkDerivation rec { - pname = "vapoursynth-mvtools"; - version = "23"; - - src = fetchFromGitHub { - owner = "dubhater"; - repo = "vapoursynth-mvtools"; - rev = "v${version}"; - sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ - nasm vapoursynth fftwFloat - ]; - - configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ]; - - meta = with lib; { - description = "Set of filters for motion estimation and compensation"; - homepage = "https://github.com/dubhater/vapoursynth-mvtools"; - license = licenses.gpl2; - maintainers = with maintainers; [ rnhmjoj ]; - }; -} diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 50eaddda890ec..fa0e6feb7df76 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 5c3140a177c34..02f959cf74edc 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 popt libiconv ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]); propagatedBuildInputs = [ libcdio ]; diff --git a/pkgs/development/libraries/vectorscan/default.nix b/pkgs/development/libraries/vectorscan/default.nix index 835db0f3566b7..8525a66e4092b 100644 --- a/pkgs/development/libraries/vectorscan/default.nix +++ b/pkgs/development/libraries/vectorscan/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pkg-config ragel python3 - ] ++ lib.optional stdenv.isLinux util-linux; + ] ++ lib.optional stdenv.hostPlatform.isLinux util-linux; buildInputs = [ boost184 @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { (if lib.elem stdenv.hostPlatform.system [ "x86_64-linux" "i686-linux" ] then [ "-DBUILD_AVX2=ON" "-DBUILD_AVX512=ON" "-DBUILD_AVX512VBMI=ON" "-DFAT_RUNTIME=ON" ] else - (if (stdenv.isLinux && stdenv.isAarch64) then + (if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then [ "-DBUILD_SVE=ON" "-DBUILD_SVE2=ON" "-DBUILD_SVE2_BITPERM=ON" "-DFAT_RUNTIME=ON" ] else [ "-DFAT_RUNTIME=OFF" ] diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 7db1d0d49195f..34bd608de8e26 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub -, boost -, cmake -, fftw -, fftwSinglePrec -, hdf5 -, ilmbase -, libjpeg -, libpng -, libtiff -, openexr -, python3 +{ + lib, + stdenv, + fetchFromGitHub, + boost, + cmake, + fftw, + fftwSinglePrec, + hdf5, + ilmbase, + libjpeg, + libpng, + libtiff, + openexr, + python3, }: let @@ -44,11 +45,15 @@ stdenv.mkDerivation rec { python ]; - preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/${python.sitePackages}\""; - - cmakeFlags = [ "-DWITH_OPENEXR=1" ] - ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") - [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; + cmakeFlags = + [ + "-DWITH_OPENEXR=1" + "-DVIGRANUMPY_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}" + ] + ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ + "-DCMAKE_CXX_FLAGS=-fPIC" + "-DCMAKE_C_FLAGS=-fPIC" + ]; meta = with lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index f0e844360cca7..e23285511afad 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/${version}/virglrenderer-${version}.tar.bz2"; - hash = "sha256-U8uPrdCPUmDuV4M/wkiFZUgUOLx6jjTz4RTRLMnZ25o="; + hash = "sha256-XGgKst7ENLKCUv0jU/HiEtTYe+7b9sHnSufj0PZVsb0="; }; separateDebugInfo = true; diff --git a/pkgs/development/libraries/virtualpg/default.nix b/pkgs/development/libraries/virtualpg/default.nix index d9778decd129e..e15961437002d 100644 --- a/pkgs/development/libraries/virtualpg/default.nix +++ b/pkgs/development/libraries/virtualpg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ postgresql sqlite ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Kerberos ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Kerberos ]; meta = with lib; { description = "Loadable dynamic extension to both SQLite and SpatiaLite"; diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 11df1a495f02f..d2840ba33a63b 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ boost lapack ] - ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkTarget = "test"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Vector and matrix math library implemented using C++ templates"; longDescription = ''vmmlib is a vector and matrix math library implemented diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index e233269fafd16..3272a4bbd1470 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { unzip ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.GLUT darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.OpenGL - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL ]; diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index 6981de6aa0742..029e4c617f46c 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost sqlite ]; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.in \ --replace '-Wl,--as-needed' "" \ --replace '-Wl,-soname -Wl,libvsqlitepp.so.3' \ diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 87cf27f70fd47..479758ed6deef 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "gtk4" (gtkVersion == "4")) ] ++ lib.optionals (!systemdSupport) [ "-D_systemd=false" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # -Bsymbolic-functions is not supported on darwin "-D_b_symbolic_functions=false" ]; diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index d131fe173ab80..3f7f05678f15e 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation { buildInputs = [ libpng libtiff ] ++ optionals enableQt [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ] - ++ optionals stdenv.isLinux [ + ++ optionals stdenv.hostPlatform.isLinux [ libGLU xorgproto libXt - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ xpc AGL Cocoa @@ -52,8 +52,8 @@ in stdenv.mkDerivation { ] ++ optionals enablePython [ python ]; - propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ] - ++ optionals stdenv.isLinux [ libX11 libGL ]; + propagatedBuildInputs = optionals stdenv.hostPlatform.isDarwin [ libobjc ] + ++ optionals stdenv.hostPlatform.isLinux [ libX11 libGL ]; # see https://github.com/NixOS/nixpkgs/pull/178367#issuecomment-1238827254 patches = map fetchpatch patchesToFetch; @@ -64,7 +64,7 @@ in stdenv.mkDerivation { -i ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp \ -i IO/Image/vtkSEPReader.h '' - + optionalString stdenv.isDarwin '' + + optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c @@ -83,7 +83,7 @@ in stdenv.mkDerivation { "-DVTK_MODULE_USE_EXTERNAL_vtkpng=ON" "-DVTK_MODULE_USE_EXTERNAL_vtktiff=1" "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" (lib.cmakeBool "VTK_OPENGL_HAS_EGL" enableEgl) ] ++ [ @@ -94,7 +94,7 @@ in stdenv.mkDerivation { ] ++ optionals enableQt [ "-DVTK_GROUP_ENABLE_Qt:STRING=YES" ] - ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] + ++ optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optionals enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}" diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index cd9dbec032087..3a0d14eb9b0e6 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,15 +1,18 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.283.0"; + version = "1.3.290.0"; nativeBuildInputs = [ cmake ]; + # TODO: investigate why <algorithm> isn't found + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DVULKAN_HEADERS_ENABLE_MODULE=OFF" ]; + src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-DpbTYlEJPtyf/m9QEI8fdAm1Hw8MpFd+iCd7WB2gp/M="; + hash = "sha256-goxA3Wg3u5hNCz54tWMJnFaS0JGVjphy14Ng/sAK/EM="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 97e5131078256..3c002d197ff5c 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,27 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, libX11, libxcb , libXrandr, wayland, moltenvk, vulkan-headers, addDriverRunpath , testers }: stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-pe4WYbfB20yRI5Pg+RxgmQcmdXsSoRxbBkQ3DdAL8r4="; + hash = "sha256-z26xvp7bKaOQAXF+/Sk24Syuw3N9QXc6sk2vlQwceJ8="; }; - patches = [ ./fix-pkgconfig.patch ]; + patches = [ ./fix-pkgconfig.patch ] + ++ lib.optionals stdenv.hostPlatform.is32bit [ + # Backport patch to support 64-bit inodes on 32-bit systems + # FIXME: remove in next update + (fetchpatch { + url = "https://github.com/KhronosGroup/Vulkan-Loader/commit/ecd88b5c6b1e4c072c55c8652d76513d74c5ad4e.patch"; + hash = "sha256-Ea+v+RfmVl8fRbkr2ETM3/7R4vp+jw7hvTq2hnw4V/0="; + }) + ]; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ vulkan-headers ] - ++ lib.optionals stdenv.isLinux [ libX11 libxcb libXrandr wayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libxcb libXrandr wayland ]; cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] - ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" - ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share" + ++ lib.optional stdenv.hostPlatform.isDarwin "-DSYSCONFDIR=${moltenvk}/share" + ++ lib.optional stdenv.hostPlatform.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/development/libraries/vulkan-utility-libraries/default.nix index 769cdb95908dd..060f609c85669 100644 --- a/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-oQC//4RHJjSncQtHPVsYnpLYtXfxSSJdbUBf8clevDI="; + hash = "sha256-dzX2xePUkjL4G+IMwPCUgFs1iKsqwZScQQBDt5toUzc="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index b7173ed93701b..9ee55b47d4574 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # test failure on aarch64-linux; unknown reason: - cmakeFlags = lib.optionals stdenv.isAarch64 [ "-DCMAKE_CTEST_ARGUMENTS='-E vgl_test_frustum_3d'" ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "-DCMAKE_CTEST_ARGUMENTS='-E vgl_test_frustum_3d'" ]; doCheck = true; diff --git a/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix index e90d05318eac4..d07145641a703 100644 --- a/pkgs/development/libraries/wangle/default.nix +++ b/pkgs/development/libraries/wangle/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Wno-dev" (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/facebook/wangle/issues/206 "SSLContextManagerTest.TestSessionContextCertRemoval" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky "BroadcastPoolTest.ThreadLocalPool" "Bootstrap.UDPClientServerTest" diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 8398dce70790b..72ba54250b511 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -5,7 +5,7 @@ , pkg-config , ninja , wayland-scanner -, withTests ? stdenv.isLinux +, withTests ? stdenv.hostPlatform.isLinux , libffi , epoll-shim , withDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayland"; - version = "1.23.0"; + version = "1.23.1"; src = fetchurl { url = with finalAttrs; "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; - hash = "sha256-BbPhV00+Z2JrWXT4YvNrW0J8fO65Zcs2pObC00LkWrI="; + hash = "sha256-hk+yqDmeLQ7DnVbp2bdTwJN3W+rcYCLOgfRBkpqB5e0="; }; patches = [ diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index a341fed9e6be9..1be88f3a6d023 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -2,9 +2,10 @@ , pkg-config , meson, ninja, wayland-scanner , python3, wayland +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wayland-protocols"; version = "1.36"; @@ -13,11 +14,11 @@ stdenv.mkDerivation rec { stdenv.hostPlatform.linker == "bfd" && lib.meta.availableOn stdenv.hostPlatform wayland; src = fetchurl { - url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; + url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; hash = "sha256-cf1N4F55+aHKVZ+sMMH4Nl+hA0ZCL5/nlfdNd7nvfpI="; }; - postPatch = lib.optionalString doCheck '' + postPatch = lib.optionalString finalAttrs.doCheck '' patchShebangs tests/ ''; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ python3 ]; checkInputs = [ wayland ]; - mesonFlags = [ "-Dtests=${lib.boolToString doCheck}" ]; + mesonFlags = [ "-Dtests=${lib.boolToString finalAttrs.doCheck}" ]; meta = { description = "Wayland protocol extensions"; @@ -41,7 +42,11 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; # Expat version platforms = lib.platforms.all; maintainers = with lib.maintainers; [ primeos ]; + pkgConfigModules = [ "wayland-protocols" ]; }; - passthru.version = version; -} + passthru.version = finalAttrs.version; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; +}) diff --git a/pkgs/development/libraries/waylib/default.nix b/pkgs/development/libraries/waylib/default.nix index 1cc5332cf777c..15ece6b3b01b7 100644 --- a/pkgs/development/libraries/waylib/default.nix +++ b/pkgs/development/libraries/waylib/default.nix @@ -42,6 +42,11 @@ stdenv.mkDerivation (finalAttrs: { "${nixos-artwork.wallpapers.simple-blue}/share/backgrounds/nixos/nix-wallpaper-simple-blue.png" ''; + depsBuildBuild = [ + # To find wayland-scanner + pkg-config + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index ecf306966c1f8..ee4af8214a379 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -29,11 +29,14 @@ , libepoxy , libjxl , at-spi2-core +, cairo , libxml2 , libsoup , libsecret , libxslt , harfbuzz +, hyphen +, libsysprof-capture , libpthreadstubs , nettle , libtasn1 @@ -50,6 +53,8 @@ , libmanette , geoclue2 , flite +, fontconfig +, freetype , openssl , sqlite , gst-plugins-base @@ -73,21 +78,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.44.3"; + version = "2.46.0"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; # https://github.com/NixOS/nixpkgs/issues/153528 # Can't be linked within a 4GB address space. - separateDebugInfo = stdenv.isLinux && !stdenv.is32bit; + separateDebugInfo = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.is32bit; src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-3ILQQuysqYGkhSNXwG5SNXQzGc8QqUzTatQbl4g6C1Q="; + hash = "sha256-1NQzBA8ZAVFWDFC96ECFAIn4e61P76nr20quhWo99Do="; }; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals stdenv.hostPlatform.isLinux [ (substituteAll { src = ./fix-bubblewrap-paths.patch; inherit (builtins) storeDir; @@ -118,12 +123,13 @@ stdenv.mkDerivation (finalAttrs: { gi-docgen glib # for gdbus-codegen unifdef - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]; buildInputs = [ at-spi2-core + cairo # required even when using skia enchant2 libavif libepoxy @@ -132,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-bad gst-plugins-base harfbuzz + hyphen libGL libGLU mesa # for libEGL headers @@ -141,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: { libintl lcms2 libpthreadstubs + libsysprof-capture libtasn1 libwebp libxkbcommon @@ -151,10 +159,14 @@ stdenv.mkDerivation (finalAttrs: { p11-kit sqlite woff2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isBigEndian [ + # https://bugs.webkit.org/show_bug.cgi?id=274032 + fontconfig + freetype + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libedit readline - ] ++ lib.optional (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") ( + ] ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") ( # this can likely be removed as: # "libproc.h is included in the 10.12 SDK Libsystem and should be identical to this one." # but the package is marked broken on darwin so unable to test @@ -166,7 +178,7 @@ stdenv.mkDerivation (finalAttrs: { runCommand "webkitgtk_headers" { } '' install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' - ) ++ lib.optionals stdenv.isLinux [ + ) ++ lib.optionals stdenv.hostPlatform.isLinux [ libseccomp libmanette wayland @@ -196,16 +208,15 @@ stdenv.mkDerivation (finalAttrs: { [ "-DENABLE_INTROSPECTION=ON" "-DPORT=GTK" - "-DUSE_LIBHYPHEN=OFF" "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Have to be explicitly specified when cross. # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353 "-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}" "-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" "-DENABLE_MINIBROWSER=OFF" @@ -244,6 +255,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = platforms.linux ++ platforms.darwin; maintainers = teams.gnome.members; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index 3ac5e2bd4adc9..a3efc646d3195 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./enable-powerpc.patch ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b25ea77b44b46..1a34ade3cee05 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { abseil-cpp ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Foundation ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Foundation ]); - env = lib.optionalAttrs stdenv.isx86_32 { + env = lib.optionalAttrs stdenv.hostPlatform.isx86_32 { # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 NIX_CFLAGS_COMPILE = "-msse2"; }; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 236865bae163b..7f6213c7df187 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -24,6 +24,7 @@ , libdisplay-info , lcms2 , nixosTests +, testers , enableXWayland ? true , xwayland ? null @@ -94,7 +95,12 @@ let ''; # Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots): - passthru.tests.tinywl = nixosTests.tinywl; + passthru.tests = { + tinywl = nixosTests.tinywl; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; meta = { description = "Modular Wayland compositor library"; @@ -107,6 +113,11 @@ let license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ primeos synthetica rewine ]; + pkgConfigModules = [ + (if lib.versionOlder finalAttrs.version "0.18" + then "wlroots" + else "wlroots-${lib.versions.majorMinor finalAttrs.version}") + ]; }; }); @@ -126,8 +137,8 @@ rec { }; wlroots_0_18 = generic { - version = "0.18.0"; - hash = "sha256-LiRnvu7qCbfSg+ONWVCtWwdzxxFZHfbgmy7zApCIW40="; + version = "0.18.1"; + hash = "sha256-BlI3EUoGEHdO6IBh99o/Aadct2dd7Xjc4PG0Sv+flqI="; extraNativeBuildInputs = [ hwdata ]; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index c55ad0010d534..aeef5a8c47057 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -54,14 +54,14 @@ stdenv.mkDerivation (finalAttrs: { # Enable AVX/AVX2/AES-NI instructions, gated by runtime detection via CPUID. "--enable-intelasm" "--enable-aesni" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ # No runtime detection under ARM and no platform function checks like for X86. # However, all ARM macOS systems have the supported extensions autodetected in the configure script. "--enable-armasm=inline" ] ++ extraConfigureFlags; # Breaks tls13 tests on aarch64-darwin. - hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "zerocallusedregs" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "zerocallusedregs" ]; # LTO should help with the C implementations. env.NIX_CFLAGS_COMPILE = lib.optionalString enableLto "-flto"; @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { "out" ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index d14a77a67004e..5182cc2ff9553 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { libexif pango wxGTK - ] ++ lib.optional stdenv.isDarwin Cocoa; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index e986ab87fface..7ad997e6d6da9 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ sqlite wxGTK ] - ++ lib.optionals (stdenv.isDarwin) [ Cocoa setfile rez derez ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ Cocoa setfile rez derez ]; meta = with lib; { homepage = "https://utelle.github.io/wxsqlite3/"; diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 0775dca688b4b..2d980c69cbe63 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -15,23 +15,23 @@ stdenv.mkDerivation rec { sed -i '/WX_CLEAR_ARRAY/s/$/;/' src/{createtable,sqlite3table}.cpp ''; - buildInputs = [ wxGTK wxsqlite3 sqlite ] ++ lib.optional stdenv.isDarwin Cocoa; + buildInputs = [ wxGTK wxsqlite3 sqlite ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; makeFlags = [ "LDFLAGS=-L${wxsqlite3}/lib" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "SETFILE=${setfile}/bin/SetFile" ]; preBuild = '' sed -ie 's|all: $(LIBPREFIX)wxsqlite$(LIBEXT)|all: |g' Makefile sed -ie 's|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT)|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) |g' Makefile - sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.isDarwin then "osx_cocoau_wxsqlite3-3.2.0" else "gtk3u_wxsqlite3-3.2"} |g' Makefile + sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.hostPlatform.isDarwin then "osx_cocoau_wxsqlite3-3.2.0" else "gtk3u_wxsqlite3-3.2"} |g' Makefile ''; installPhase = '' - install -D ${lib.optionalString stdenv.isDarwin "wxsqliteplus.app/Contents/MacOS/"}wxsqliteplus $out/bin/wxsqliteplus - '' + lib.optionalString stdenv.isDarwin '' + install -D ${lib.optionalString stdenv.hostPlatform.isDarwin "wxsqliteplus.app/Contents/MacOS/"}wxsqliteplus $out/bin/wxsqliteplus + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv wxsqliteplus.app $out/Applications/ ''; diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index be0c45c701dc8..21333afe5e8ee 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -18,8 +18,8 @@ , withCurl ? false , withPrivateFonts ? false , withEGL ? true -, withMesa ? !stdenv.isDarwin -, withWebKit ? stdenv.isDarwin +, withMesa ? !stdenv.hostPlatform.isDarwin +, withWebKit ? stdenv.hostPlatform.isDarwin , webkitgtk , setfile , AGL @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst_all_1.gst-plugins-base gst_all_1.gstreamer - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk3 libSM libXinerama @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional withCurl curl ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk - ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk + ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit + ++ lib.optionals stdenv.hostPlatform.isDarwin [ setfile Carbon Cocoa @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { WebKit ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL; configureFlags = [ "--disable-precomp-headers" @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ++ lib.optional withCurl "--enable-webrequest" ++ lib.optional withPrivateFonts "--enable-privatefonts" ++ lib.optional withMesa "--with-opengl" - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-osx_cocoa" "--with-libiconv" ] ++ lib.optionals withWebKit [ @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { "--enable-webviewwebkit" ]; - SEARCH_LIB = lib.optionalString (!stdenv.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib "; + SEARCH_LIB = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib "; preConfigure = '' substituteInPlace configure --replace \ @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' substituteInPlace configure --replace \ /usr /no-such-path - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace \ 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index a77dedb0c6eed..055000cfa68c7 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -20,7 +20,7 @@ , compat28 ? false , compat30 ? true , unicode ? true -, withMesa ? !stdenv.isDarwin +, withMesa ? !stdenv.hostPlatform.isDarwin , withWebKit ? true , webkitgtk , setfile @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { libjpeg_turbo zlib pcre2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 libSM libXinerama @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { xorgproto ] ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && stdenv.isLinux) webkitgtk - ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk + ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit + ++ lib.optionals stdenv.hostPlatform.isDarwin [ expat setfile Carbon @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { WebKit ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL; configureFlags = [ "--disable-precomp-headers" @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { (if compat30 then "--enable-compat30" else "--disable-compat30") ] ++ lib.optional unicode "--enable-unicode" ++ lib.optional withMesa "--with-opengl" - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-osx_cocoa" "--with-libiconv" ] ++ lib.optionals withWebKit [ @@ -114,12 +114,12 @@ stdenv.mkDerivation rec { "--enable-webviewwebkit" ]; - SEARCH_LIB = lib.optionalString (!stdenv.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib"; + SEARCH_LIB = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib"; preConfigure = '' cp -r ${catch}/* 3rdparty/catch/ cp -r ${nanosvg}/* 3rdparty/nanosvg/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ --replace 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' substituteInPlace configure \ diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 2be8ea48b8e2e..de4a3d8d78435 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ./disable-arm-neon-default.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace '$(if $(STRIP), $(STRIP) -x $@)' '$(if $(STRIP), $(STRIP) -S $@)' ''; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; configureFlags = lib.optional enableShared "--enable-shared" - ++ lib.optional (!stdenv.isi686) "--enable-pic" + ++ lib.optional (!stdenv.hostPlatform.isi686) "--enable-pic" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; makeFlags = [ diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 9f3f97b1bc57f..a436a59aead79 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -10,14 +10,14 @@ , numactl # Multi bit-depth support (8bit+10bit+12bit): -, multibitdepthSupport ? (stdenv.is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) +, multibitdepthSupport ? (stdenv.hostPlatform.is64bit && !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux)) # Other options: , cliSupport ? true # Build standalone CLI application , custatsSupport ? false # Internal profiling of encoder work , debugSupport ? false # Run-time sanity checks (debugging) , ppaSupport ? false # PPA profiling instrumentation -, unittestsSupport ? stdenv.isx86_64 # Unit tests - only testing x64 assembly +, unittestsSupport ? stdenv.hostPlatform.isx86_64 # Unit tests - only testing x64 assembly , vtuneSupport ? false # Vtune profiling instrumentation , werrorSupport ? false # Warnings as errors }: @@ -79,6 +79,9 @@ stdenv.mkDerivation rec { "-DEXPORT_C_API=OFF" ] ++ lib.optionals stdenv.hostPlatform.isPower [ "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le + ] ++ lib.optionals isCross [ + (mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM") + (mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64") ]; preConfigure = lib.optionalString multibitdepthSupport '' @@ -99,11 +102,6 @@ stdenv.mkDerivation rec { ${mkFlag cliSupport "ENABLE_CLI"} ${mkFlag unittestsSupport "ENABLE_TESTS"} ) - '' + lib.optionalString isCross '' - cmakeFlagsArray+=( - ${mkFlag (stdenv.hostPlatform.isAarch32) "CROSS_COMPILE_ARM"} - ${mkFlag (stdenv.hostPlatform.isAarch64) "CROSS_COMPILE_ARM64"} - ) ''; # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted diff --git a/pkgs/development/libraries/x265/fix-clang-asm.patch b/pkgs/development/libraries/x265/fix-clang-asm.patch deleted file mode 100644 index 6aa5fe2f0a0e1..0000000000000 --- a/pkgs/development/libraries/x265/fix-clang-asm.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a407271b4..593628e0f 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -310,7 +310,7 @@ if(GCC) - endif() - check_cxx_compiler_flag(-mstackrealign CC_HAS_STACK_REALIGN) - if (CC_HAS_STACK_REALIGN) -- add_definitions(-mstackrealign) -+ add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-mstackrealign>) - endif() - # Disable exceptions. Reduce executable size, increase compability. - check_cxx_compiler_flag(-fno-exceptions CC_HAS_FNO_EXCEPTIONS_FLAG) -@@ -545,7 +545,7 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY) - list(APPEND ASM_OBJS ${ASM}.${SUFFIX}) - add_custom_command( - OUTPUT ${ASM}.${SUFFIX} -- COMMAND ${CMAKE_CXX_COMPILER} -+ COMMAND ${CMAKE_ASM_COMPILER} - ARGS ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX} - DEPENDS ${ASM_SRC}) - endforeach() -diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt -index 12b643ad5..876f3543d 100644 ---- a/common/CMakeLists.txt -+++ b/common/CMakeLists.txt -@@ -16,6 +16,7 @@ endif(EXTRA_LIB) - if(ENABLE_ASSEMBLY) - set_source_files_properties(threading.cpp primitives.cpp pixel.cpp PROPERTIES COMPILE_FLAGS -DENABLE_ASSEMBLY=1) - list(APPEND VFLAGS "-DENABLE_ASSEMBLY=1") -+ enable_language(ASM) - endif(ENABLE_ASSEMBLY) - - if(ENABLE_ASSEMBLY AND X86) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 0862fcfe25f6b..c8a28166a7a45 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -34,13 +34,13 @@ let env = { AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git - } // lib.optionalAttrs stdenv.is32bit { + } // lib.optionalAttrs stdenv.hostPlatform.is32bit { NIX_CFLAGS_COMPILE = "-fpermissive"; }; # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.h \ --replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10" ''; diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index 2d0960e3ff52a..14c4b0a7e5886 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs tools/patcheck patchShebangs tools/regression-test.pl patchShebangs tools/xavs-format - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.guess --replace 'uname -p' 'uname -m' substituteInPlace configure \ --replace '-O4' '-O3' \ diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index e1a51284927a3..db06dc7562486 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -6,12 +6,11 @@ , pkg-config , xdg-desktop-portal , gtk3 -, gnome +, gnome-settings-daemon , gnome-desktop , glib , wrapGAppsHook3 , gsettings-desktop-schemas -, buildPortalsInGnome ? true }: stdenv.mkDerivation (finalAttrs: { @@ -36,17 +35,9 @@ stdenv.mkDerivation (finalAttrs: { glib gtk3 xdg-desktop-portal - ] ++ lib.optionals buildPortalsInGnome [ gsettings-desktop-schemas # settings exposed by settings portal gnome-desktop - gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings) - ]; - - mesonFlags = lib.optionals (!buildPortalsInGnome) [ - "-Dwallpaper=disabled" - "-Dsettings=disabled" - "-Dappchooser=disabled" - "-Dlockdown=disabled" + gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings) ]; meta = with lib; { diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index b5c653d5eac70..f1dea3ab641cd 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -65,6 +65,12 @@ stdenv.mkDerivation (finalAttrs: { ./trash-test.patch ]; + # until/unless bubblewrap ships a pkg-config file, meson has no way to find it when cross-compiling. + postPatch = '' + substituteInPlace meson.build \ + --replace-fail "find_program('bwrap'" "find_program('${lib.getExe bubblewrap}'" + ''; + nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xml_dtd_43 @@ -117,8 +123,12 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "systemd" enableSystemd) ] ++ lib.optionals (!enableGeoLocation) [ "-Dgeoclue=disabled" + ] ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ + "-Dpytest=disabled" ]; + strictDeps = true; + doCheck = true; preCheck = '' diff --git a/pkgs/development/libraries/xed/default.nix b/pkgs/development/libraries/xed/default.nix index 1fb634a80b90e..2918ae7f3fe82 100644 --- a/pkgs/development/libraries/xed/default.nix +++ b/pkgs/development/libraries/xed/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-LF4iJ1/Z3OifCiir/kU3ufZqtiRLeaJeAwuBqP2BCF4="; }; - nativeBuildInputs = [ mbuild ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.bintools ]; + nativeBuildInputs = [ mbuild ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.bintools ]; buildPhase = '' patchShebangs mfile.py @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { dontInstall = true; # already installed during buildPhase meta = with lib; { - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; description = "Intel X86 Encoder Decoder (Intel XED)"; homepage = "https://intelxed.github.io/"; license = licenses.asl20; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 2b96bede313d0..c294551eef50a 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -67,7 +67,7 @@ effectiveStdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] - ++ lib.optionals effectiveStdenv.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ llvmPackages.openmp ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ] ++ lib.optionals rLibrary [ R ]; diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index d76b2031aa3f3..d36804c6bce81 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { xercesc openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation CoreServices SystemConfiguration diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index af73a81fcb20d..04dea6f59fcea 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xmlrpc-c"; - version = "1.51.07"; + version = "1.59.03"; src = fetchurl { url = "mirror://sourceforge/xmlrpc-c/${pname}-${version}.tgz"; - sha256 = "sha256-hNIK4z+SdYL4IdYcC5GUrvvx15JFkKE/qdpa4WmK3tk="; + hash = "sha256-vbcdtCqwvlFZFVWIXRFoKwRMEDTUoylkAb+SHsCyM/4="; }; buildInputs = [ curl libxml2 ]; @@ -20,7 +20,10 @@ stdenv.mkDerivation rec { (cd tools/xmlrpc && make && make install) ''; - hardeningDisable = [ "format" ]; + enableParallelBuilding = true; + + # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; meta = with lib; { description = "Lightweight RPC library based on XML and HTTP"; diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index 5ec3d44dfb625..9a3c150b3d254 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { preConfigure = '' # Configure script is not in the root of the source directory cd build/generic - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Undocumented darwin hack substituteInPlace configure --replace "-no-cpp-precomp" "" ''; @@ -20,18 +20,18 @@ stdenv.mkDerivation rec { configureFlags = [ ] # Undocumented darwin hack (assembly is probably disabled due to an # issue with nasm, however yasm is now used) - ++ lib.optional stdenv.isDarwin "--enable-macosx_module --disable-assembly"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-macosx_module --disable-assembly"; nativeBuildInputs = [ ] - ++ lib.optional (!stdenv.isDarwin) yasm; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) yasm; buildInputs = [ ] # Undocumented darwin hack - ++ lib.optionals stdenv.isDarwin [ autoconf automake libtool ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ autoconf automake libtool ]; # Don't remove static libraries (e.g. 'libs/*.a') on darwin. They're needed to # compile ffmpeg (and perhaps other things). - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' rm $out/lib/*.a ''; diff --git a/pkgs/development/libraries/yaml-cpp/default.nix b/pkgs/development/libraries/yaml-cpp/default.nix index 3ee2dcf770411..f87849b58c722 100644 --- a/pkgs/development/libraries/yaml-cpp/default.nix +++ b/pkgs/development/libraries/yaml-cpp/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , gitUpdater , cmake +, static ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DYAML_CPP_BUILD_TOOLS=false" - "-DYAML_BUILD_SHARED_LIBS=${lib.boolToString (!stdenv.hostPlatform.isStatic)}" + (lib.cmakeBool "YAML_BUILD_SHARED_LIBS" (!static)) "-DINSTALL_GTEST=false" ]; diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index 3af451ec84e06..e60008994b031 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ]; buildInputs = [ pam yubikey-personalization libyubikey libykclient ] - ++ lib.optionals stdenv.isDarwin [ CoreServices SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices SystemConfiguration ]; meta = with lib; { description = "Yubico PAM module"; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 9c8db3159396f..5c6a0ba9bbe12 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -78,6 +78,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix deleted file mode 100644 index cd5d105511920..0000000000000 --- a/pkgs/development/libraries/zxing-cpp/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, python3 -, gitUpdater -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "zxing-cpp"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "zxing-cpp"; - repo = "zxing-cpp"; - rev = "v${finalAttrs.version}"; - hash = "sha256-teFspdATn9M7Z1vSr/7PdJx/xAv+TVai8rIekxqpBZk="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - cmakeFlags = [ - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_BLACKBOX_TESTS=OFF" - ]; - - passthru = { - tests = { - inherit (python3.pkgs) zxing-cpp; - }; - updateScript = gitUpdater { - rev-prefix = "v"; - }; - }; - - meta = { - homepage = "https://github.com/zxing-cpp/zxing-cpp"; - description = "C++ port of zxing (a Java barcode image processing library)"; - longDescription = '' - ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D barcode - image processing library implemented in C++. - - It was originally ported from the Java ZXing Library but has been - developed further and now includes many improvements in terms of quality - and performance. It can both read and write barcodes in a number of - formats. - ''; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ AndersonTorres lukegb ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/zydis/default.nix b/pkgs/development/libraries/zydis/default.nix deleted file mode 100644 index 16379f63c9b2e..0000000000000 --- a/pkgs/development/libraries/zydis/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, callPackage -, cmake -, python3 -}: - -let - zycore = callPackage ./zycore.nix { - inherit stdenv fetchFromGitHub cmake; - }; -in -stdenv.mkDerivation rec { - pname = "zydis"; - version = "4.1.0"; - - src = fetchFromGitHub { - owner = "zyantific"; - repo = "zydis"; - rev = "v${version}"; - hash = "sha256-akusu0T7q5RX4KGtjRqqOFpW5i9Bd1L4RVZt8Rg3PJY="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ zycore ]; - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - doCheck = true; - nativeCheckInputs = [ python3 ]; - passthru = { inherit zycore; }; - - meta = with lib; { - homepage = "https://zydis.re/"; - description = "Fast and lightweight x86/x86-64 disassembler library"; - license = licenses.mit; - maintainers = with maintainers; [ jbcrail AndersonTorres athre0z ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix deleted file mode 100644 index cae01170f290b..0000000000000 --- a/pkgs/development/libraries/zziplib/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, perl -, pkg-config -, python3 -, xmlto -, zip -, zlib -}: - -stdenv.mkDerivation rec { - pname = "zziplib"; - version = "0.13.74"; - - src = fetchFromGitHub { - owner = "gdraheim"; - repo = pname; - rev = "v${version}"; - hash = "sha256-MjqGHzb+dsAq2PrcBhU3sv4eMX3afkgFWUbhDp+5o/s="; - }; - - nativeBuildInputs = [ - cmake - perl - pkg-config - python3 - xmlto - zip - ]; - buildInputs = [ - zlib - ]; - - # test/zziptests.py requires network access - # (https://github.com/gdraheim/zziplib/issues/24) - cmakeFlags = [ - "-DZZIP_TESTCVE=OFF" - "-DBUILD_SHARED_LIBS=True" - "-DBUILD_STATIC_LIBS=False" - "-DBUILD_TESTS=OFF" - "-DMSVC_STATIC_RUNTIME=OFF" - "-DZZIPSDL=OFF" - "-DZZIPTEST=OFF" - "-DZZIPWRAP=OFF" - "-DBUILDTESTS=OFF" - ]; - - meta = with lib; { - homepage = "https://github.com/gdraheim/zziplib"; - description = "Library to extract data from files archived in a zip file"; - longDescription = '' - The zziplib library is intentionally lightweight, it offers the ability to - easily extract data from files archived in a single zip file. - Applications can bundle files into a single zip archive and access them. - The implementation is based only on the (free) subset of compression with - the zlib algorithm which is actually used by the zip/unzip tools. - ''; - license = with licenses; [ lgpl2Plus mpl11 ]; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index cf7eeb44ca3b5..7bada7cbd6535 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -104,7 +104,6 @@ let nativeBuildInputs = [ pkgs.allegro5 ]; nativeLibs = [ pkgs.allegro5 ]; lispLibs = super.cl-liballegro-nuklear.lispLibs ++ [ self.cl-liballegro ]; - patches = [ ./patches/cl-liballegro-nuklear-missing-dll.patch ]; }; lessp = build-asdf-system { diff --git a/pkgs/development/lisp-modules/patches/cl-liballegro-nuklear-missing-dll.patch b/pkgs/development/lisp-modules/patches/cl-liballegro-nuklear-missing-dll.patch deleted file mode 100644 index b5bde523eba92..0000000000000 --- a/pkgs/development/lisp-modules/patches/cl-liballegro-nuklear-missing-dll.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix system not loading due to: - -Unhandled CFFI:LOAD-FOREIGN-LIBRARY-ERROR - Unable to load foreign library (LIBALLEGRO-NUKLEAR). - Error opening shared object "/build/source/src/liballegro_nuklear.so": - /build/source/src/liballegro_nuklear.so: undefined symbol: al_draw_ellipse. ---- a/cl-liballegro-nuklear.asd -+++ b/cl-liballegro-nuklear.asd -@@ -12,7 +12,7 @@ - :description "CFFI wrapper for the Nuklear IM GUI library with liballegro backend, to be used with cl-liballegro." - :author "Andrew Kravchuk <awkravchuk@gmail.com>" - :license "MIT" -- :depends-on (:cffi :cffi-libffi :trivial-features) -+ :depends-on (:cl-liballegro :cffi :cffi-libffi :trivial-features) - :pathname "src" - :serial t - :components ((:makefile "Makefile") diff --git a/pkgs/development/lisp-modules/patches/nyxt-remove-build-operation.patch b/pkgs/development/lisp-modules/patches/nyxt-remove-build-operation.patch deleted file mode 100644 index e050ce10b4876..0000000000000 --- a/pkgs/development/lisp-modules/patches/nyxt-remove-build-operation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/nyxt.asd b/nyxt.asd -index ea2630ce..fdf837e4 100644 ---- a/nyxt.asd -+++ b/nyxt.asd -@@ -480,7 +480,6 @@ The renderer is configured from NYXT_RENDERER or `*nyxt-renderer*'.")) - :defsystem-depends-on ("nasdf") - :class :nasdf-system - :depends-on (nyxt/gi-gtk) -- :build-operation "program-op" - :build-pathname "nyxt" - :entry-point "nyxt:entry-point") - diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 595e08dd6a942..af6334671230e 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -86,7 +86,7 @@ let cffi-libffi = super.cffi-libffi.overrideLispAttrs (o: { nativeBuildInputs = [ pkgs.libffi ]; nativeLibs = [ pkgs.libffi ]; - patches = lib.optionals stdenv.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ]; }); cl-rabbit = super.cl-rabbit.overrideLispAttrs (o: { nativeBuildInputs = [ pkgs.rabbitmq-c ]; @@ -250,9 +250,6 @@ let libusb-ffi = super.libusb-ffi.overrideLispAttrs (o: { nativeLibs = [ pkgs.libusb-compat-0_1 ]; }); - cl-fam = super.cl-fam.overrideLispAttrs (o: { - nativeLibs = [ pkgs.fam ]; - }); jpeg-turbo = super.jpeg-turbo.overrideLispAttrs (o: { nativeLibs = [ pkgs.libjpeg_turbo ]; }); diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 918df81e4ecf2..f30b321fed922 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -273,14 +273,14 @@ buildLuarocksPackage { compat53 = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "compat53"; - version = "0.13-1"; + version = "0.14.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/compat53-0.13-1.rockspec"; - sha256 = "10gmhd526a5q0dl4dvjq7a5c7f3i7hcdla8hpygl79dhgbm649i3"; + url = "mirror://luarocks/compat53-0.14.3-1.rockspec"; + sha256 = "0c50x5nprcfafjnb4gzy23xszmr97mspy1g9m6pyj81c2648288n"; }).outPath; src = fetchzip { - url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.13.zip"; - sha256 = "06kpx5qyk1zki2r2g6z3alwhvmays50670z7mbl55h7s0kff2cpz"; + url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.14.3.zip"; + sha256 = "00qgfl5n2rfp1gikky03dmc30jy4piz0js8d7zznaclxsq2nyp2x"; }; disabled = luaOlder "5.1" || luaAtLeast "5.5"; @@ -387,23 +387,23 @@ buildLuarocksPackage { }; }) {}; -digestif = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lpeg, luaOlder }: +digestif = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lpeg, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "digestif"; - version = "0.5.1-1"; + version = "0.6-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/digestif-0.5.1-1.rockspec"; - sha256 = "03hhzpq1szdw43slq38wbndwh8knv71q9pgwd7hvvkp9wykzjhwr"; + url = "mirror://luarocks/digestif-0.6-1.rockspec"; + sha256 = "0hp7r97b6ivywaxb02cbnm23gjz71mak5ag6m3hi7f3mjqxxxh8k"; }).outPath; src = fetchFromGitHub { owner = "astoff"; repo = "digestif"; - rev = "v0.5.1"; - hash = "sha256-8QTc4IKD1tjRlyrSZy7cyUzRkvm6IHwlOXchPf2BaMk="; + rev = "v0.6"; + hash = "sha256-sGwKt9suRVNrbRJlhNMHzc5r4sK/fvUc7smxmxmrn8Y="; }; disabled = luaOlder "5.3"; - propagatedBuildInputs = [ lpeg ]; + propagatedBuildInputs = [ lpeg luafilesystem ]; meta = { homepage = "https://github.com/astoff/digestif/"; @@ -437,16 +437,16 @@ buildLuarocksPackage { fennel = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "fennel"; - version = "1.5.0-1"; + version = "1.5.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fennel-1.5.0-1.rockspec"; - sha256 = "0h3a8pinazcp3r3pwkm5inh0aynq9iizljhpk6sj8zhhp0s0bi4g"; + url = "mirror://luarocks/fennel-1.5.1-1.rockspec"; + sha256 = "02wq1rlgv2zl1x30vqpdf5nmblxv7kkwx9lwplj4rj1fp9s3m8mh"; }).outPath; src = fetchFromGitHub { owner = "bakpakin"; repo = "Fennel"; - rev = "1.5.0"; - hash = "sha256-4jF22lpfapxQvwH/vQh/ePiEfOc8pP2b7roOzPXZRTQ="; + rev = "1.5.1"; + hash = "sha256-ciXElwX/F8YCFA6C0F3+8lnUPQlKYpcdpagAjoXZpyY="; }; disabled = luaOlder "5.1"; @@ -555,14 +555,14 @@ buildLuarocksPackage { fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.1415-1"; + version = "0.0.1466-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.1415-1.rockspec"; - sha256 = "039hy10ml25z2kvm5xiayvswx42rj4di119vgl2ncrfvlr5lnxdf"; + url = "mirror://luarocks/fzf-lua-0.0.1466-1.rockspec"; + sha256 = "0xhnfwc5z4z39ylh5qr3m7jbqaqbrbsai1yzdsy9avp5d0q425m7"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/e9413dc2b6e8ab7f62385c972df1dceba483492d.zip"; - sha256 = "09bh0rjx9g96vz0zfnpi4ych64qawrj1rgrpznkjn1cph8qayj35"; + url = "https://github.com/ibhagwan/fzf-lua/archive/780899604e0ce490d0d8e402a2fcdbad1cd7c9b8.zip"; + sha256 = "0ida1ykh1v23xbk4ing88x3id5k4gxl0r8yf420n5mv6acfgj00x"; }; disabled = luaOlder "5.1"; @@ -606,8 +606,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "562dc47189ad3c8696dbf460d38603a74d544849"; - hash = "sha256-NNoqXn24Fzkopx1/Xwcv41EpqHwpcMPrQWLfXcPtha4="; + rev = "863903631e676b33e8be2acb17512fdc1b80b4fb"; + hash = "sha256-o2Y57z7IuIa9wvLlzyslcs3/+iaZzuqM1NImlKAPt5Y="; }; disabled = lua.luaversion != "5.1"; @@ -622,14 +622,14 @@ buildLuarocksPackage { haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "4.0.0-1"; + version = "4.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-4.0.0-1.rockspec"; - sha256 = "1iz7bgy7a0zclsg31rmf6hcrjxnikhqwzh5blirif3m9bdi9mv6v"; + url = "mirror://luarocks/haskell-tools.nvim-4.1.0-1.rockspec"; + sha256 = "12p38gnld2j7x8n4hzi8js104pnlz3plk6s0aziy93z6lspm1i94"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/4.0.0.zip"; - sha256 = "0k6kw42n4c2hc7mqjv8ahwcwqia7wdgmszy1np96sc9dd0bkiqx9"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v4.1.0.zip"; + sha256 = "13aj1sxjkjsdmifjq0jgqaiv5rhglb3kv4r3ja1hrpv434889glr"; }; disabled = luaOlder "5.1"; @@ -1086,6 +1086,29 @@ buildLuarocksPackage { }; }) {}; +lsp-progress-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: +buildLuarocksPackage { + pname = "lsp-progress.nvim"; + version = "1.0.13-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lsp-progress.nvim-1.0.13-1.rockspec"; + sha256 = "13h0kyrri0bvhkzvyngamsacx62n2dhb2j2gs495z4ghyh1p345i"; + }).outPath; + src = fetchzip { + url = "https://github.com/linrongbin16/lsp-progress.nvim/archive/d5f4d28efe75ce636bfbe271eb45f39689765aab.zip"; + sha256 = "0h63z55gwv36rahhha8vkbxb9n4f8psa265khz719i97j17x39rr"; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://linrongbin16.github.io/lsp-progress.nvim/"; + description = "A performant lsp progress status for Neovim."; + maintainers = with lib.maintainers; [ gepbird ]; + license.fullName = "MIT"; + }; +}) {}; + lua-cjson = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-cjson"; @@ -1325,16 +1348,16 @@ buildLuarocksPackage { lua-resty-openidc = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lua-resty-http, lua-resty-jwt, lua-resty-session, luaOlder }: buildLuarocksPackage { pname = "lua-resty-openidc"; - version = "1.7.6-3"; + version = "1.8.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openidc-1.7.6-3.rockspec"; - sha256 = "08nq24kxw51xiyyp5jailyqjfsgz4m4fzy4hb7g3fv76vcsf8msp"; + url = "mirror://luarocks/lua-resty-openidc-1.8.0-1.rockspec"; + sha256 = "0jgajhn45nybhi7z15bg957kznzqcjzxc8nrzmgyignkwp4yi1qk"; }).outPath; src = fetchFromGitHub { owner = "zmartzone"; repo = "lua-resty-openidc"; - rev = "v1.7.6"; - hash = "sha256-1yBmYuFlF/RdOz9csteaqsEEUxVWdwE6IMgS5M9PsJU="; + rev = "v1.8.0"; + hash = "sha256-LSkNWebMF1L1a66QszugAxcHsW5o9uxQZHWituFFgJs="; }; disabled = luaOlder "5.1"; @@ -2065,14 +2088,14 @@ buildLuarocksPackage { luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luarocks-build-treesitter-parser"; - version = "4.1.0-1"; + version = "5.0.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-build-treesitter-parser-4.1.0-1.rockspec"; - sha256 = "sha256-PIvmRtzb9YEkuwXfLfY3w+DrOZZRjGSAvPsnK3dDeWQ="; + url = "mirror://luarocks/luarocks-build-treesitter-parser-5.0.2-1.rockspec"; + sha256 = "037rap1aar6xx25xgnlknkkszarkbflpdfp1jaasq5py397gc61a"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v4.1.0.zip"; - sha256 = "sha256-KNU/opkfKTZnCYfMOXVuGvb9J+iqfworQ0t2YcHAaKA="; + url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v5.0.2.zip"; + sha256 = "03f17sljq1f7nqrdjn94p9p2j67bs5si2nl0xlv1njj326rby324"; }; disabled = luaOlder "5.1"; @@ -2089,14 +2112,14 @@ buildLuarocksPackage { luarocks-build-treesitter-parser-cpp = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luarocks-build-treesitter-parser-cpp"; - version = "2.0.3-1"; + version = "2.0.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-build-treesitter-parser-cpp-2.0.3-1.rockspec"; - sha256 = "1pn8kn1kf9ak4b7hba1nd358dh146sr993gf8r10s3ywcnihmnw0"; + url = "mirror://luarocks/luarocks-build-treesitter-parser-cpp-2.0.4-1.rockspec"; + sha256 = "0hrqy1s9c1naad43bri4icf5y139h5wk52yv4f0dxbvsfqbf8isb"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp/archive/v2.0.3.zip"; - sha256 = "1dcjy1vy76vszm9r1ck42w8a1xw0ls0vs9xg5wzh3wnk2d1y54m3"; + url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp/archive/v2.0.4.zip"; + sha256 = "0r7mvc1f7wgmb4xgknmr38cv35chwdyxmj1fxw4xsdjrvb1qyvi6"; }; disabled = luaOlder "5.1"; @@ -2236,16 +2259,16 @@ buildLuarocksPackage { luasystem = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luasystem"; - version = "0.4.2-1"; + version = "0.4.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasystem-0.4.2-1.rockspec"; - sha256 = "15z4n7pbggg1wy397k9mx0jls31snvw0dgr9yklwi4sayfcva3ip"; + url = "mirror://luarocks/luasystem-0.4.4-1.rockspec"; + sha256 = "0gk489qwxfvc5qwmj9fgwi60qnjnqasc665bg8iiggapdwcl5ny4"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luasystem"; - rev = "v0.4.2"; - hash = "sha256-xYfHK/OtOFtGHAZTPDp/BTywAcCqJIx8+zt3/HPon0w="; + rev = "v0.4.4"; + hash = "sha256-Lxp3o94QxtsgBMilKBG21mFneh0ux7wRKDyPwMTDDUA="; }; disabled = luaOlder "5.1"; @@ -2384,8 +2407,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "6a254139d077ad53be7e4f3602c8da0c84447fd9"; - hash = "sha256-gutr36WJRktDxmRjNo0v5tn030nMsAe8vRWx/vKFa2o="; + rev = "45a79ec4acb5af783a6a29673a999ce37f00497e"; + hash = "sha256-meUCXjJ9kHOOpRd4TR2dc7Ai97zOQX35hYFEDZseiSk="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2469,14 +2492,14 @@ buildLuarocksPackage { lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lz.n"; - version = "2.5.2-1"; + version = "2.8.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lz.n-2.5.2-1.rockspec"; - sha256 = "1sr6yhkq5bwp8bkqx206cr8ignz5z82a6j1dw4qgwdlvzs5kr0vs"; + url = "mirror://luarocks/lz.n-2.8.0-1.rockspec"; + sha256 = "0mkplfgsnlsc1xjcxxx349bi0h28rgri46hb514xicaqi48jvd8q"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/lz.n/archive/v2.5.2.zip"; - sha256 = "0pkw6wrrkzv6vl9jxx7qlr8yjghnkr1s7jy66dsw5yzfb8gz8kpd"; + url = "https://github.com/nvim-neorocks/lz.n/archive/v2.8.0.zip"; + sha256 = "18p7zwns44b29pkm3iwh0wsdx1227ja1vww6g13m7gcsvn0h2pgw"; }; disabled = luaOlder "5.1"; @@ -2489,6 +2512,29 @@ buildLuarocksPackage { }; }) {}; +lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: +buildLuarocksPackage { + pname = "lze"; + version = "0.1.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lze-0.1.1-1.rockspec"; + sha256 = "0rih9kgx846qhp1fmsqlnp8y08kv4hp8gl9dwykz4zr0zljy94j3"; + }).outPath; + src = fetchzip { + url = "https://github.com/BirdeeHub/lze/archive/v0.1.1.zip"; + sha256 = "1s6n61jabsv94s37xd5g0y7fxhficc4rwsklgsmzajravpgy60a8"; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/BirdeeHub/lze"; + description = "A lazy-loading library for neovim, inspired by, but different from, nvim-neorocks/lz.n"; + maintainers = with lib.maintainers; [ birdee ]; + license.fullName = "GPL-2+"; + }; +}) {}; + lzn-auto-require = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, lz-n }: buildLuarocksPackage { pname = "lzn-auto-require"; @@ -2672,17 +2718,41 @@ buildLuarocksPackage { }; }) {}; +neorg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua-utils-nvim, luaOlder, nui-nvim, nvim-nio, pathlib-nvim, plenary-nvim }: +buildLuarocksPackage { + pname = "neorg"; + version = "9.1.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/neorg-9.1.1-1.rockspec"; + sha256 = "0zafy1hkrvh41vlx1g4rqlcvc4x9pi8dcji30qi0b8lj45pldyr3"; + }).outPath; + src = fetchzip { + url = "https://github.com/nvim-neorg/neorg/archive/v9.1.1.zip"; + sha256 = "18lk22lfzwwn4hy2s035g3kslqmvrr28lm5w9k3dazqwj5nlka3z"; + }; + + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ lua-utils-nvim nui-nvim nvim-nio pathlib-nvim plenary-nvim ]; + + meta = { + homepage = "https://github.com/nvim-neorg/neorg"; + description = "Modernity meets insane extensibility. The future of organizing your life in Neovim."; + maintainers = with lib.maintainers; [ GaetanLepage ]; + license.fullName = "GPL-3.0"; + }; +}) {}; + neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, plenary-nvim }: buildLuarocksPackage { pname = "neotest"; - version = "5.4.0-1"; + version = "5.6.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/neotest-5.4.0-1.rockspec"; - sha256 = "0bk5z3p2v6m2nwxh82xk0xsqb23xa9i13vfgnd9h9qy3r42jqmmj"; + url = "mirror://luarocks/neotest-5.6.0-1.rockspec"; + sha256 = "06ggk7swsbwy12rqmzkg173wh7sj6jiy6vp7nbb9f7ikgf9iqs6j"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/neotest/archive/32ff2ac21135a372a42b38ae131e531e64833bd3.zip"; - sha256 = "144wzzadhrg48fkihffk6jf9c0ij8dg9gng6mcxq5z8mdcvz0124"; + url = "https://github.com/nvim-neotest/neotest/archive/48f8b5fce704594eb0ff94338e080defca14f0dc.zip"; + sha256 = "0cr3qbds7g5ybndaaiafh758v6igzjz65l81mqragk9kcajkwkip"; }; disabled = luaOlder "5.1"; @@ -2790,14 +2860,14 @@ buildLuarocksPackage { pathlib-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio }: buildLuarocksPackage { pname = "pathlib.nvim"; - version = "2.2.2-1"; + version = "2.2.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/pathlib.nvim-2.2.2-1.rockspec"; - sha256 = "04dklc0ibl6dbfckmkpj2s1gvjfmr0k2hyagw37rxypifncrffkr"; + url = "mirror://luarocks/pathlib.nvim-2.2.3-1.rockspec"; + sha256 = "0qwsjcsl6760d8d5k1lxlykh78g6v7xcr9caq3yh75yn76mwrl4i"; }).outPath; src = fetchzip { - url = "https://github.com/pysan3/pathlib.nvim/archive/v2.2.2.zip"; - sha256 = "10jhbdffaw1rh1qppzllmy96dbsn741bk46mph5kxpjq4ldx27hz"; + url = "https://github.com/pysan3/pathlib.nvim/archive/v2.2.3.zip"; + sha256 = "1z3nwy83r3zbll9wc2wyvg60z0dqc5hm2xdfvqh3hwm5s9w8j432"; }; disabled = luaOlder "5.1"; @@ -2843,8 +2913,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"; - hash = "sha256-5Jf2mWFVDofXBcXLbMa417mqlEPWLA+cQIZH/vNEV1g="; + rev = "2d9b06177a975543726ce5c73fca176cedbffe9d"; + hash = "sha256-bmmPekAvuBvLQmrnnX0n+FRBqfVxBsObhxIEkDGAla4="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2903,21 +2973,21 @@ buildLuarocksPackage { }; }) {}; -rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua-curl, luaOlder, mimetypes, nvim-nio, xml2lua }: +rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, luaOlder, mimetypes, nvim-nio, xml2lua }: buildLuarocksPackage { pname = "rest.nvim"; - version = "2.0.1-1"; + version = "3.8.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rest.nvim-2.0.1-1.rockspec"; - sha256 = "1ra76wnhi4nh56amyd8zqmg0mpsnhp3m41m3iyiq4hp1fah6nbqb"; + url = "mirror://luarocks/rest.nvim-3.8.2-1.rockspec"; + sha256 = "0im28m714isfqdjgdmc2rpknpi45d5m3qil2lnz633zc6g32ddr0"; }).outPath; src = fetchzip { - url = "https://github.com/rest-nvim/rest.nvim/archive/v2.0.1.zip"; - sha256 = "09rs04d5h061zns1kdfycryx4ll8ix15q3ybpmqsdyp2gn8l77df"; + url = "https://github.com/rest-nvim/rest.nvim/archive/v3.8.2.zip"; + sha256 = "0y9ikzillz14dn16lp3vjhgck89v6kj6fdd2hdz6i6g98hvijxbn"; }; disabled = luaOlder "5.1"; - propagatedBuildInputs = [ lua-curl mimetypes nvim-nio xml2lua ]; + propagatedBuildInputs = [ fidget-nvim mimetypes nvim-nio xml2lua ]; meta = { homepage = "https://github.com/rest-nvim/rest.nvim"; @@ -2930,14 +3000,14 @@ buildLuarocksPackage { rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, rocks-nvim }: buildLuarocksPackage { pname = "rocks-config.nvim"; - version = "2.2.0-1"; + version = "3.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-config.nvim-2.2.0-1.rockspec"; - sha256 = "129zvspn6ln9yzsxfcgai8vyz7jysxvdf08yy19zdqj0q7swh1iq"; + url = "mirror://luarocks/rocks-config.nvim-3.0.0-1.rockspec"; + sha256 = "08jg5v1jnmg0ig395d6lmsdpa2vw8m9w3barvar0s77a7lkxgywg"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v2.2.0.zip"; - sha256 = "0vchi7274j4yhs0mv1j2na8k1240xj42kz6787s0vf05xcnywbh6"; + url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v3.0.0.zip"; + sha256 = "16836pxg0bq6f8qj6kn73v75kbwlr533pmv9dal4h53qldqjn9hh"; }; disabled = luaOlder "5.1"; @@ -2954,14 +3024,14 @@ buildLuarocksPackage { rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim, rtp-nvim }: buildLuarocksPackage { pname = "rocks-dev.nvim"; - version = "1.3.0-1"; + version = "1.7.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-dev.nvim-1.3.0-1.rockspec"; - sha256 = "0s8k4kvd7j72ja6qwwxdsqjffkja8pdp95vml5wy9mqwxgvcb5c6"; + url = "mirror://luarocks/rocks-dev.nvim-1.7.0-1.rockspec"; + sha256 = "0jc8nxxbr7m3vw4lcyxi8wm4w0nz1ml54sbs96z4kj0p6mm9fds6"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.3.0.zip"; - sha256 = "1fhd4mjbwizszxq3wrcdsczljgssgswqi4ibi8kdmnd9biyvbx65"; + url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.7.0.zip"; + sha256 = "13n9dkv5217qd8dhj54d1rfqp6mx5jir319fmsln47jv83x7micz"; }; disabled = luaOlder "5.1"; @@ -2978,14 +3048,14 @@ buildLuarocksPackage { rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }: buildLuarocksPackage { pname = "rocks-git.nvim"; - version = "2.0.1-1"; + version = "2.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-git.nvim-2.0.1-1.rockspec"; - sha256 = "0r341vg7x49lnmx77smab5hpjpzwih7jmchfh24xhnv6319d70yx"; + url = "mirror://luarocks/rocks-git.nvim-2.3.1-1.rockspec"; + sha256 = "06psladknqjqqg7gb17550iy40bfk6m5pcwr2156xk136dil4bpz"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.0.1.zip"; - sha256 = "121x32915sr8il95jjpza2awvh4jknhgb99c091sb4vmdkg3pj24"; + url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.3.1.zip"; + sha256 = "1y8zs4dcr8npqjicbi8xjgnfb5fhqv0j6mwzpfl2bzm979s6hz4b"; }; disabled = luaOlder "5.1"; @@ -3002,14 +3072,14 @@ buildLuarocksPackage { rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }: buildLuarocksPackage { pname = "rocks.nvim"; - version = "2.36.1-1"; + version = "2.40.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.36.1-1.rockspec"; - sha256 = "165kij3rk0inh9g3d3jpczhji9bjc7biz5r30xgw9q5xnafy4q38"; + url = "mirror://luarocks/rocks.nvim-2.40.2-1.rockspec"; + sha256 = "1vblf19kqddn0fs94ra6a58h19qid6591svh7n5kjvk8l3lnk4kv"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.36.1.zip"; - sha256 = "0zsrvngwwj9qxsxfbfgfin73aacs763sygixgiibq8rrl6gannxs"; + url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.40.2.zip"; + sha256 = "12b6gfbnv0aw10rk36c8hqf3mjbm9izjf1dpf3r9i4fwimvbp4dd"; }; disabled = luaOlder "5.1"; @@ -3017,7 +3087,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/nvim-neorocks/rocks.nvim"; - description = "Neovim plugin management inspired by Cargo, powered by luarocks"; + description = "🌒 Neovim plugin management inspired by Cargo, powered by luarocks"; maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "GPL-3.0"; }; @@ -3026,14 +3096,14 @@ buildLuarocksPackage { rtp-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rtp.nvim"; - version = "1.1.0-1"; + version = "1.2.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rtp.nvim-1.1.0-1.rockspec"; - sha256 = "1wmg2rqw8jph4ymmc33j8r47p2ni7fdd3dmiiwp19symslcw71js"; + url = "mirror://luarocks/rtp.nvim-1.2.0-1.rockspec"; + sha256 = "0is9ssi3pwvshm88lnp4hkig4f0ckgl2f3a1axwci89y8lla50iv"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rtp.nvim/archive/v1.1.0.zip"; - sha256 = "0n3ydd1n0mbc0m81rdbs73gpdr3m6qj735sjqdf36qv52gjcisj8"; + url = "https://github.com/nvim-neorocks/rtp.nvim/archive/v1.2.0.zip"; + sha256 = "1b6hx50nr2s2mnhsx9zy54pjdq7f78mi394v2b2c9v687s45nqln"; }; disabled = luaOlder "5.1"; @@ -3049,14 +3119,14 @@ buildLuarocksPackage { rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "5.2.0-1"; + version = "5.10.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-5.2.0-1.rockspec"; - sha256 = "15pz9m5livp0n2bhal8wmg8hbhvyb6195ayzjcm3xsivplc4drns"; + url = "mirror://luarocks/rustaceanvim-5.10.1-1.rockspec"; + sha256 = "1zgjksgsmgsgv47mahyy1im0g5r9mr3i2pwgifhcayhpijg1wbq9"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/5.2.0.zip"; - sha256 = "1mswi4fy0ggikl3cpwhx1lar5pb8zcfp9az8zb9cn00cmzf749s4"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.10.1.zip"; + sha256 = "02mcvfnrdkfi4y2x7gd5mmc19708yqdgmxgbgb5hbyjq5g85w1kx"; }; disabled = luaOlder "5.1"; @@ -3268,8 +3338,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "3b1600d0fd5172ad9fae00987362ca0ef3d8895d"; - hash = "sha256-F5TGzfPSDQY+AOzaDXStswHjkGQvnLeTWW5/xdBalpo="; + rev = "cb3f98d935842836cc115e8c9e4b38c1380fbb6b"; + hash = "sha256-b94coi21QBmm8dCfulIbiw0lI9SAqodaBqMgb3j8qBU="; }; disabled = lua.luaversion != "5.1"; @@ -3285,16 +3355,16 @@ buildLuarocksPackage { tiktoken_core = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "tiktoken_core"; - version = "0.2.1-1"; + version = "0.2.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tiktoken_core-0.2.1-1.rockspec"; - sha256 = "0mdmrpg82vmk0cqiqdayyk4vvl299z0xqrg58q18dfs5nc27wkla"; + url = "mirror://luarocks/tiktoken_core-0.2.2-1.rockspec"; + sha256 = "1bx1kj47d6di1iflhccm5p7z2ry5c83f59pqi5jsf1r2h000p4n5"; }).outPath; src = fetchFromGitHub { owner = "gptlang"; repo = "lua-tiktoken"; - rev = "0.2.1"; - hash = "sha256-drSAVGHrdDdaWUEAfCE/2ZCI2nuffpbupO+TVWv/l4Y="; + rev = "v0.2.2"; + hash = "sha256-H83kk9dsH/cWBEx2AXQQ82l8sNfhzO864jwDd7vwAQc="; }; disabled = luaOlder "5.1"; @@ -3360,14 +3430,14 @@ buildLuarocksPackage { tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser-cpp }: buildLuarocksPackage { pname = "tree-sitter-norg"; - version = "0.2.5-1"; + version = "0.2.6-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tree-sitter-norg-0.2.5-1.rockspec"; - sha256 = "1w3hns9n92ygc7x3wxq3pd2kjs2nfp1arxq9zda75h2alwapjink"; + url = "mirror://luarocks/tree-sitter-norg-0.2.6-1.rockspec"; + sha256 = "1s0wj59v4zjgimws742ybzy7nhnnkz8nas4y5k96c2z5z54ynxmq"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorg/tree-sitter-norg/archive/1aab69c95bd9d5e7c0e172ecbe5d29bcf5834612.zip"; - sha256 = "12s4lvs2iw3v9hwfcql0phi8gxgpwfj3i6443f0mss5zn7f6w50g"; + url = "https://github.com/nvim-neorg/tree-sitter-norg/archive/v0.2.6.zip"; + sha256 = "077rds0rq10wjywpj4hmmq9dd6qp6sfwbdjyh587laldrfl7jy6g"; }; nativeBuildInputs = [ luarocks-build-treesitter-parser-cpp ]; @@ -3406,16 +3476,16 @@ buildLuarocksPackage { vusted = callPackage({ buildLuarocksPackage, busted, fetchFromGitHub, fetchurl, luasystem }: buildLuarocksPackage { pname = "vusted"; - version = "2.3.4-1"; + version = "2.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/vusted-2.3.4-1.rockspec"; - sha256 = "1yzdr0xgsjfr4a80a2zrj58ls0gmms407q4h1dx75sszppzvm1wc"; + url = "mirror://luarocks/vusted-2.5.0-1.rockspec"; + sha256 = "05jv8kl0hy3pyrknafmynifrqyrcc5q9qkd4ly1vmxgmmbm30nqz"; }).outPath; src = fetchFromGitHub { owner = "notomo"; repo = "vusted"; - rev = "v2.3.4"; - hash = "sha256-Zh54mHNrbFH5qygzsXVv+Vc7oUP+RIQXBvK+UvaGvxY="; + rev = "v2.5.0"; + hash = "sha256-1/fZ8OAw9NZoY1YDN6OhOJRqwRDWps5JJDIsvWg1Nr4="; }; propagatedBuildInputs = [ busted luasystem ]; diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index 0bd421ede7ce2..66624c6f09556 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -24,7 +24,7 @@ buildLuarocksPackage { luarocksConfig.variables.LUA_LIBDIR = "${lua}/lib"; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; postInstall = '' find $out -name nfd_zenity.so -execdir mv {} nfd.so \; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 358560cfc7714..51b8a30584d4f 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -323,7 +323,13 @@ in }); lua-resty-jwt = prev.lua-resty-jwt.overrideAttrs(oa: { - meta = oa.meta // { broken = true; }; + src = fetchFromGitHub { + owner = "cdbattags"; + repo = "lua-resty-jwt"; + rev = "v0.2.3"; + hash = "sha256-5lnr0ka6ijfujiRjqwCPb6jzItXx45FIN8CvhR/KiB8="; + fetchSubmodules = true; + }; }); lua-zlib = prev.lua-zlib.overrideAttrs (oa: { @@ -455,7 +461,7 @@ in ]; }); - luasystem = prev.luasystem.overrideAttrs (oa: lib.optionalAttrs stdenv.isLinux { + luasystem = prev.luasystem.overrideAttrs (oa: lib.optionalAttrs stdenv.hostPlatform.isLinux { buildInputs = [ glibc.out ]; }); @@ -470,13 +476,6 @@ in # meta.broken = true; # }); - lua-resty-openidc = prev.lua-resty-openidc.overrideAttrs (_: { - postConfigure = '' - substituteInPlace ''${rockspecFilename} \ - --replace '"lua-resty-session >= 2.8, <= 3.10",' '"lua-resty-session >= 2.8",' - ''; - }); - lua-yajl = prev.lua-yajl.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ yajl @@ -504,7 +503,7 @@ in # ld: symbol(s) not found for architecture arm64 # clang-16: error: linker command failed with exit code 1 (use -v to see invocation) - meta.broken = stdenv.isDarwin; + meta.broken = stdenv.hostPlatform.isDarwin; }); lush-nvim = prev.lush-nvim.overrideAttrs (drv: { @@ -544,9 +543,19 @@ in ''; }); + lze = prev.lze.overrideAttrs(oa: { + doCheck = lua.luaversion == "5.1"; + nativeCheckInputs = [ final.nlua final.busted ]; + checkPhase = '' + runHook preCheck + export HOME=$(mktemp -d) + busted --lua=nlua + runHook postCheck + ''; + }); + neotest = prev.neotest.overrideAttrs(oa: { - # A few tests fail for strange reasons on darwin - doCheck = !stdenv.isDarwin; + doCheck = stdenv.isLinux; nativeCheckInputs = oa.nativeCheckInputs ++ [ final.nlua final.busted neovim-unwrapped ]; @@ -560,7 +569,7 @@ in export LUA_PATH="./lua/?.lua;./lua/?/init.lua;$LUA_PATH" nvim --headless -i NONE \ --cmd "set rtp+=${vimPlugins.plenary-nvim}" \ - -c "PlenaryBustedDirectory tests/ {}" + -c "PlenaryBustedDirectory tests/ {sequential = true}" runHook postCheck ''; @@ -574,7 +583,15 @@ in export HOME=$(mktemp -d) busted --lua=nlua runHook postCheck - ''; + ''; + }); + + neorg = prev.neorg.overrideAttrs (oa: { + postConfigure = '' + substituteInPlace ''${rockspecFilename} \ + --replace-fail "'nvim-nio ~> 1.7'," "'nvim-nio >= 1.7'," \ + --replace-fail "'plenary.nvim == 0.1.4'," "'plenary.nvim'," + ''; }); plenary-nvim = prev.plenary-nvim.overrideAttrs (oa: { @@ -626,7 +643,7 @@ in buildInputs = [ libuv final.lua ]; nativeBuildInputs = [ pkg-config cmake ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; }; luv = prev.luv.overrideAttrs (oa: { @@ -767,8 +784,7 @@ in }); sqlite = prev.sqlite.overrideAttrs (drv: { - - doCheck = true; + doCheck = stdenv.hostPlatform.isLinux; nativeCheckInputs = [ final.plenary-nvim neovim-unwrapped ]; # the plugin loads the library from either the LIBSQLITE env @@ -784,7 +800,7 @@ in nvim --headless -i NONE \ -u test/minimal_init.vim --cmd "set rtp+=${vimPlugins.plenary-nvim}" \ - -c "PlenaryBustedDirectory test/auto/ { minimal_init = './test/minimal_init.vim' }" + -c "PlenaryBustedDirectory test/auto/ { sequential = true, minimal_init = './test/minimal_init.vim' }" ''; }); @@ -806,7 +822,7 @@ in tiktoken_core = prev.tiktoken_core.overrideAttrs (oa: { cargoDeps = rustPlatform.fetchCargoTarball { src = oa.src; - hash = "sha256-YApsOGfAw34zp069lyGR6FGjxty1bE23+Tic07f8zI4="; + hash = "sha256-pKqG8aiV8BvvDO6RE6J3HEA/S4E4QunbO4WBpV5jUYk="; }; nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; }); @@ -818,7 +834,7 @@ in hash = "sha256-PLihirhJshcUQI3L1eTcnQiZvocDl29eQHhdBwJQRU8="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin (if lua.pkgs.isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua"); nativeBuildInputs = oa.nativeBuildInputs ++ [ diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 0d856a44878bf..10bc020a34a43 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C runtime library for AVR microcontrollers"; homepage = "https://github.com/avrdudes/avr-libc"; + changelog = "https://github.com/avrdudes/avr-libc/blob/avr-libc-${finalAttrs.tag_version}-release/NEWS"; license = licenses.bsd3; platforms = [ "avr-none" ]; maintainers = with maintainers; [ mguentner emilytrau ]; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 3540c29e78ad3..74da4320deb50 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.287"; + version = "0.6.293"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5P0cZ7zbzEqWLQTi1kMGcC0R0BQa2gJrLzEcw17GATA="; + sha256 = "sha256-XRzwLPUNUSf88GqwdI8/WuodFVdoHuY8k6GYBgUco20="; }; - vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; + vendorHash = "sha256-oVs7CFnijmyaQAEoYuKf56n+i2q9YMjq4HatbpWympw="; CGO_ENABLED = 0; subPackages = [ "." ]; @@ -33,6 +33,7 @@ buildGoModule rec { description = "Connect your laptop to cloud computers"; mainProgram = "brev"; homepage = "https://github.com/brevdev/brev-cli"; + changelog = "https://github.com/brevdev/brev-cli/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; }; diff --git a/pkgs/development/misc/datafusion/default.nix b/pkgs/development/misc/datafusion/default.nix index 78b8023c5f6d7..4e324ac765493 100644 --- a/pkgs/development/misc/datafusion/default.nix +++ b/pkgs/development/misc/datafusion/default.nix @@ -1,35 +1,43 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, }: rustPlatform.buildRustPackage rec { pname = "datafusion-cli"; - version = "33.0.0"; + version = "42.0.0"; src = fetchFromGitHub { name = "datafusion-cli-source"; owner = "apache"; repo = "arrow-datafusion"; rev = version; - sha256 = "sha256-ywyzvk50Fr9TSaCrqd14lSi1PJ9ggA1YQ/X0aFGFk1M="; + sha256 = "sha256-d8DR9I+6ddl5h8WSYBM3UyLUhZe+ICsTfraQkBouMYY="; }; sourceRoot = "${src.name}/datafusion-cli"; - cargoHash = "sha256-0a/O9nNi3JLufQxG+5EgCXtV0y03X7R6UY+f/tVGB90="; + cargoHash = "sha256-/ofwZI+v0zoszq5zAQRCyqeVrF/ozS8mHHpPdaklhaE="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; checkFlags = [ - # fails even outside the Nix sandbox - "--skip=object_storage::tests::s3_region_validation" - # broken - "--skip=exec::tests::create_object_store_table_gcs" + # Some tests not found fake path + "--skip=catalog::tests::query_gs_location_test" + "--skip=catalog::tests::query_http_location_test" + "--skip=catalog::tests::query_s3_location_test" + "--skip=exec::tests::copy_to_external_object_store_test" + "--skip=exec::tests::copy_to_object_store_table_s3" + "--skip=exec::tests::create_object_store_table_cos" + "--skip=exec::tests::create_object_store_table_http" + "--skip=exec::tests::create_object_store_table_oss" + "--skip=exec::tests::create_object_store_table_s3" + "--skip=tests::test_parquet_metadata_works_with_strings" ]; meta = with lib; { diff --git a/pkgs/development/misc/haskell/changelog-d/default.nix b/pkgs/development/misc/haskell/changelog-d/default.nix index 8f44ed950067e..90903e0aae20c 100644 --- a/pkgs/development/misc/haskell/changelog-d/default.nix +++ b/pkgs/development/misc/haskell/changelog-d/default.nix @@ -5,13 +5,13 @@ }: mkDerivation rec { pname = "changelog-d"; - version = "1.0"; + version = "1.0.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "fgaz"; repo = "changelog-d"; rev = "v${version}"; - hash = "sha256-cXczIJb5z+Obq13F90oWcgSN1JAVqRWWw4jp2HT5G5Y="; + hash = "sha256-4TbZD4pXP/5q+t3rTcdCsY5APWIcxhCMM+WsNO/6ke4="; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix index 0899a948019ef..cbb5411314f01 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/development/misc/juce/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { curl # libcurl.so stdenv.cc.cc.lib # libstdc++.so libgcc_s.so pcre # libpcre2.pc - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so libglvnd # libGL.so webkitgtk # webkit2gtk-4.0 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.MetalKit darwin.apple_sdk.frameworks.WebKit @@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "juceaide"; longDescription = "JUCE is an open-source cross-platform C++ application framework for desktop and mobile applications, including VST, VST3, AU, AUv3, RTAS and AAX audio plug-ins"; homepage = "https://github.com/juce-framework/JUCE"; + changelog = "https://github.com/juce-framework/JUCE/blob/${finalAttrs.version}/CHANGE_LIST.md"; license = with licenses; [ isc gpl3Plus ]; maintainers = with maintainers; [ kashw2 ]; platforms = platforms.all; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 113bf9e76da59..1d2324ddf1779 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -15,6 +15,7 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://github.com/cgag/loc"; + changelog = "https://github.com/cgag/loc/blob/v${version}/CHANGELOG.md"; description = "Count lines of code quickly"; mainProgram = "loc"; license = lib.licenses.mit; diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index 18462c456ce20..c24ca3b0c2622 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -10,7 +10,7 @@ , enableMspds ? false }: -assert stdenv.isDarwin -> hidapi != null && pkg-config != null; +assert stdenv.hostPlatform.isDarwin -> hidapi != null && pkg-config != null; assert enableReadline -> readline != null; assert enableMspds -> mspds != null; @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = lib.optional stdenv.isDarwin pkg-config - ++ lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin pkg-config + ++ lib.optional (enableMspds && stdenv.hostPlatform.isLinux) autoPatchelfHook; buildInputs = [ libusb-compat-0_1 ] - ++ lib.optional stdenv.isDarwin hidapi + ++ lib.optional stdenv.hostPlatform.isDarwin hidapi ++ lib.optional enableReadline readline; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # TODO: remove once a new 0.26+ release is made substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary} @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+ runtimeDependencies = lib.optional enableMspds mspds; - postFixup = lib.optionalString (enableMspds && stdenv.isDarwin) '' + postFixup = lib.optionalString (enableMspds && stdenv.hostPlatform.isDarwin) '' # autoPatchelfHook only works on linux so... for dep in $runtimeDependencies; do install_name_tool -add_rpath $dep/lib $out/bin/$pname @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; makeFlags = [ "UNAME_S=$(unameS)" ] ++ lib.optional (!enableReadline) "WITHOUT_READLINE=1"; - unameS = lib.optionalString stdenv.isDarwin "Darwin"; + unameS = lib.optionalString stdenv.hostPlatform.isDarwin "Darwin"; meta = with lib; { description = "Free programmer, debugger, and gdb proxy for MSP430 MCUs"; diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/development/misc/msp430/mspds/binary.nix index 3558599c2de04..4dc3ec869bda7 100644 --- a/pkgs/development/misc/msp430/mspds/binary.nix +++ b/pkgs/development/misc/msp430/mspds/binary.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, unzip, autoPatchelfHook }: let - archPostfix = lib.optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64"; + archPostfix = lib.optionalString (stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isDarwin) "_64"; in stdenv.mkDerivation rec { pname = "msp-debug-stack-bin"; version = "3.15.1.1"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { else "libmsp430${archPostfix}${stdenv.hostPlatform.extensions.sharedLibrary}"; nativeBuildInputs = [ unzip ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = [ stdenv.cc.cc ]; installPhase = '' diff --git a/pkgs/development/misc/msp430/mspds/default.nix b/pkgs/development/misc/msp430/mspds/default.nix index 75dd08805f3f7..17ee5cd76c50a 100644 --- a/pkgs/development/misc/msp430/mspds/default.nix +++ b/pkgs/development/misc/msp430/mspds/default.nix @@ -6,10 +6,10 @@ , libusb1 ? null }: -assert stdenv.isLinux -> libusb1 != null; +assert stdenv.hostPlatform.isLinux -> libusb1 != null; let - hidapiDriver = lib.optionalString stdenv.isLinux "-libusb"; + hidapiDriver = lib.optionalString stdenv.hostPlatform.isLinux "-libusb"; in stdenv.mkDerivation { pname = "msp-debug-stack"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation { preBuild = '' rm ThirdParty/src/pugixml.cpp rm ThirdParty/include/pugi{config,xml}.hpp - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' makeFlagsArray+=(OUTNAME="-install_name ") ''; @@ -43,7 +43,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; buildInputs = [ boost hidapi pugixml ] - ++ lib.optional stdenv.isLinux libusb1; + ++ lib.optional stdenv.hostPlatform.isLinux libusb1; meta = with lib; { description = "TI MSP430 FET debug driver"; diff --git a/pkgs/development/misc/or1k/newlib.nix b/pkgs/development/misc/or1k/newlib.nix index 39ddf063eacb5..7c0f0af4a21a6 100644 --- a/pkgs/development/misc/or1k/newlib.nix +++ b/pkgs/development/misc/or1k/newlib.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, crossLibcStdenv, buildPackages }: +{ stdenv, fetchFromGitHub, stdenvNoLibc, buildPackages }: -crossLibcStdenv.mkDerivation { +stdenvNoLibc.mkDerivation { name = "newlib"; src = fetchFromGitHub { owner = "openrisc"; diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 9b2d0ad78100d..9fb98de3a248e 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -66,6 +66,7 @@ in python27.pkgs.buildPythonApplication { meta = with lib; { description = "Resolve external shell-script dependencies"; homepage = "https://github.com/abathur/resholve"; + changelog = "https://github.com/abathur/resholve/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ abathur ]; platforms = platforms.all; diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index ab61884963aa3..654f8a4577f5b 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -234,7 +234,7 @@ rec { ncurses procps ps - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nixos-install-tools nixos-rebuild ]; @@ -258,7 +258,7 @@ rec { tset fake args ps fake args top fake args - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' nixos-generate-config fake args nixos-rebuild fake args ''); @@ -279,7 +279,7 @@ rec { inherit shunit2; inherit xdg-utils; inherit yadm; -} // lib.optionalAttrs stdenv.isLinux { +} // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit arch-install-scripts; inherit dgoss; inherit rancid; @@ -287,6 +287,6 @@ rec { inherit wgnord; inherit wsl-vpnkit; inherit zxfer; -} // lib.optionalAttrs (stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64)) { +} // lib.optionalAttrs (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64)) { inherit s0ix-selftest-tool; } diff --git a/pkgs/development/misc/rpiboot/default.nix b/pkgs/development/misc/rpiboot/default.nix index 69ea80db109fb..53b8c0326b1b9 100644 --- a/pkgs/development/misc/rpiboot/default.nix +++ b/pkgs/development/misc/rpiboot/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/raspberrypi/usbboot"; + changelog = "https://github.com/raspberrypi/usbboot/blob/${version}/debian/changelog"; description = "Utility to boot a Raspberry Pi CM/CM3/CM4/Zero over USB"; mainProgram = "rpiboot"; license = licenses.asl20; diff --git a/pkgs/development/misc/vc4/newlib.nix b/pkgs/development/misc/vc4/newlib.nix index e1a8b2eeaa6a7..48efd317d4c26 100644 --- a/pkgs/development/misc/vc4/newlib.nix +++ b/pkgs/development/misc/vc4/newlib.nix @@ -1,6 +1,6 @@ -{ stdenv, texinfo, flex, bison, fetchFromGitHub, crossLibcStdenv, buildPackages }: +{ stdenv, texinfo, flex, bison, fetchFromGitHub, stdenvNoLibc, buildPackages }: -crossLibcStdenv.mkDerivation { +stdenvNoLibc.mkDerivation { name = "newlib"; src = fetchFromGitHub { owner = "itszor"; diff --git a/pkgs/development/mobile/androidenv/cmake.nix b/pkgs/development/mobile/androidenv/cmake.nix index 7df24ad4cc223..833c96a2691c7 100644 --- a/pkgs/development/mobile/androidenv/cmake.nix +++ b/pkgs/development/mobile/androidenv/cmake.nix @@ -2,7 +2,7 @@ deployAndroidPackage { inherit package os; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = lib.optionals (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' autoPatchelf $packageBaseDir/bin diff --git a/pkgs/development/mobile/androidenv/cmdline-tools.nix b/pkgs/development/mobile/androidenv/cmdline-tools.nix index 0279b948a7ab0..3c05fa8634c25 100644 --- a/pkgs/development/mobile/androidenv/cmdline-tools.nix +++ b/pkgs/development/mobile/androidenv/cmdline-tools.nix @@ -4,7 +4,7 @@ deployAndroidPackage { name = "androidsdk"; inherit package os; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 72dc64a7e0c22..a880c8fc9190f 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -27,8 +27,8 @@ let # Determine the Android os identifier from Nix's system identifier - os = if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "macosx" + os = if stdenv.hostPlatform.isLinux then "linux" + else if stdenv.hostPlatform.isDarwin then "macosx" else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}"; # Uses mkrepo.rb to create a repo spec. diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index 30a2e8171acc1..b9c11cb46e978 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -10,7 +10,7 @@ in deployAndroidPackage rec { inherit package os; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; autoPatchelfIgnoreMissingDeps = [ "*" ]; buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx stdenv.cc.cc.lib ]; @@ -71,7 +71,7 @@ deployAndroidPackage rec { ''; patchInstructions = patchOsAgnostic - + lib.optionalString stdenv.isLinux patchElfBnaries; + + lib.optionalString stdenv.hostPlatform.isLinux patchElfBnaries; noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script } diff --git a/pkgs/development/mobile/androidenv/patcher.nix b/pkgs/development/mobile/androidenv/patcher.nix index c0252839cf23f..f525033d236a7 100644 --- a/pkgs/development/mobile/androidenv/patcher.nix +++ b/pkgs/development/mobile/androidenv/patcher.nix @@ -2,7 +2,7 @@ deployAndroidPackage { inherit package os; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; patchInstructions = lib.optionalString (os == "linux") '' autoPatchelf $packageBaseDir/bin ''; diff --git a/pkgs/development/mobile/gomobile/default.nix b/pkgs/development/mobile/gomobile/default.nix index c234c81d3894f..61e3bb75617cc 100644 --- a/pkgs/development/mobile/gomobile/default.nix +++ b/pkgs/development/mobile/gomobile/default.nix @@ -26,7 +26,7 @@ buildGoModule { doCheck = false; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ xcodeWrapper ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodeWrapper ]; # Prevent a non-deterministic temporary directory from polluting the resulting object files postPatch = '' diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix deleted file mode 100644 index 2b7e22255e191..0000000000000 --- a/pkgs/development/mobile/maestro/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, makeWrapper, jre_headless }: - -stdenv.mkDerivation rec { - pname = "maestro"; - version = "1.36.0"; - - src = fetchurl { - url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "18zffmqz32dfb66yy48z3dl258rlfc8m2r4021hbrbixvk7k3qb7"; - }; - - dontUnpack = true; - nativeBuildInputs = [ unzip makeWrapper ]; - - installPhase = '' - mkdir $out - unzip $src -d $out - mv $out/maestro/* $out - rm -rf $out/maestro - ''; - - postFixup = '' - wrapProgram $out/bin/maestro --prefix PATH : "${lib.makeBinPath [ jre_headless ]}" - ''; - - meta = with lib; { - description = "Mobile UI Automation tool"; - homepage = "https://maestro.mobile.dev/"; - license = licenses.asl20; - platforms = lib.platforms.all; - changelog = "https://github.com/mobile-dev-inc/maestro/blob/main/CHANGELOG.md"; - maintainers = with maintainers; [ SubhrajyotiSen ]; - }; -} diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 42b70c64abe9b..ef36dced9a314 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation ({ buildPhase = '' ${preBuild} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error. alloy=$(dirname $(type -p alloy))/.. cp -rv $alloy/* alloy @@ -76,7 +76,7 @@ stdenv.mkDerivation ({ export GRADLE_USER_HOME=$TMPDIR/gradle ${if release then '' - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' # Signing the app does not work with OpenJDK on macOS, use host SDK instead export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" ''} diff --git a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix index f1ac578f26ef4..13c8e6e818279 100644 --- a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix @@ -1,19 +1,41 @@ -{ stdenv, lib }: -{ version ? "11.1" -, allowHigher ? false -, xcodeBaseDir ? "/Applications/Xcode.app" }: +{ lib, + stdenv, + writeShellScriptBin }: +{ versions ? [ ] , xcodeBaseDir ? "/Applications/Xcode.app" }: -assert stdenv.isDarwin; +assert stdenv.hostPlatform.isDarwin; +let + xcodebuildPath = "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"; + xcodebuildWrapper = writeShellScriptBin "xcodebuild" '' + currentVer="$(${xcodebuildPath} -version | awk 'NR==1{print $2}')" + wrapperVers=(${lib.concatStringsSep " " versions}) + + for ver in "''${wrapperVers[@]}"; do + if [[ "$currentVer" == "$ver" ]]; then + # here exec replaces the shell without creating a new process + # https://www.gnu.org/software/bash/manual/bash.html#index-exec + exec "${xcodebuildPath}" "$@" + fi + done + + echo "The installed Xcode version ($currentVer) does not match any of the allowed versions: ${lib.concatStringsSep ", " versions}" + echo "Please update your local Xcode installation to match one of the allowed versions" + exit 1 + ''; +in stdenv.mkDerivation { - pname = "xcode-wrapper${lib.optionalString allowHigher "-plus"}"; - inherit version; + name = "xcode-wrapper-impure"; # Fails in sandbox. Use `--option sandbox relaxed` or `--option sandbox false`. __noChroot = true; buildCommand = '' mkdir -p $out/bin cd $out/bin - ln -s /usr/bin/xcode-select + ${if versions == [ ] then '' + ln -s "${xcodebuildPath}" + '' else '' + ln -s "${xcodebuildWrapper}/bin/xcode-select" + ''} ln -s /usr/bin/security ln -s /usr/bin/codesign ln -s /usr/bin/xcrun @@ -22,23 +44,9 @@ stdenv.mkDerivation { ln -s /usr/bin/lipo ln -s /usr/bin/file ln -s /usr/bin/rev - ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild" ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator" cd .. ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" - - # Check if we have the xcodebuild version that we want - currVer=$($out/bin/xcodebuild -version | head -n1) - ${if allowHigher then '' - if [ -z "$(printf '%s\n' "${version}" "$currVer" | sort -V | head -n1)""" != "${version}" ] - '' else '' - if [ -z "$(echo $currVer | grep -x 'Xcode ${version}')" ] - ''} - then - echo "We require xcodebuild version${if allowHigher then " or higher" else ""}: ${version}" - echo "Instead what was found: $currVer" - exit 1 - fi ''; } diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix index efd8d538c0906..8693282e4ee16 100644 --- a/pkgs/development/mobile/xpwn/default.nix +++ b/pkgs/development/mobile/xpwn/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libpng bzip2 libusb-compat-0_1 openssl ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; description = "Custom NOR firmware loader/IPSW generator for the iPhone"; license = licenses.gpl3Plus; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index c501fb6e4dc86..792156d5bde0c 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -63,14 +63,17 @@ mapAliases { inherit (pkgs) bash-language-server; # added 2024-06-07 bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 + inherit (pkgs) bower2nix; # added 2024-08-23 inherit (pkgs) btc-rpc-explorer; # added 2023-08-17 inherit (pkgs) carbon-now-cli; # added 2023-08-17 inherit (pkgs) carto; # added 2023-08-17 castnow = pkgs.castnow; # added 2023-07-30 inherit (pkgs) clean-css-cli; # added 2023-08-18 inherit (pkgs) clubhouse-cli; # added 2023-08-18 + inherit (pkgs) coc-clangd; # added 2024-06-29 inherit (pkgs) coc-diagnostic; # added 2024-06-29 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) coc-pyright; # added 2024-07-14 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 @@ -112,6 +115,7 @@ mapAliases { immich = pkgs.immich-cli; # added 2023-08-19 indium = throw "indium was removed because it was broken"; # added 2023-08-19 inliner = throw "inliner was removed because it was abandoned upstream"; # added 2024-08-23 + inherit (pkgs) intelephense; # added 2024-08-31 ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19 inherit (pkgs) jake; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 @@ -138,6 +142,7 @@ mapAliases { inherit (pkgs) pm2; # added 2024-01-22 inherit (pkgs) pnpm; # added 2024-06-26 prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14 + inherit (pkgs) prisma; # added 2024-08-31 inherit (pkgs) pxder; # added 2023-09-26 inherit (pkgs) quicktype; # added 2023-09-09 react-native-cli = throw "react-native-cli was removed because it was deprecated"; # added 2023-09-25 diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index 2e54104d7dce4..4bd736ddc723c 100644 --- a/pkgs/development/node-packages/composition.nix +++ b/pkgs/development/node-packages/composition.nix @@ -8,7 +8,7 @@ let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index bc1e36628ac8a..eb94495aeba31 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -499,8 +499,8 @@ let stdenv.mkDerivation ({ name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux + ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -591,8 +591,8 @@ let name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux + ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -662,7 +662,7 @@ let stdenv.mkDerivation ({ name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 9a9786a651e49..3364d6f72f396 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -21,13 +21,11 @@ , "aws-cdk" , "awesome-lint" , "bower" -, "bower2nix" , "browserify" , "browser-sync" , "cdk8s-cli" , "cdktf-cli" , "clipboard-cli" -, "coc-clangd" , "coc-cmake" , "coc-css" , "coc-docker" @@ -49,7 +47,6 @@ , "coc-metals" , "coc-pairs" , "coc-prettier" -, "coc-pyright" , "coc-python" , "coc-r-lsp" , "coc-rls" @@ -116,7 +113,6 @@ , "ijavascript" , "imapnotify" , "insect" -, "intelephense" , "joplin" , "js-beautify" , "js-yaml" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 51342b571c188..8bf89bc8b2135 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@0no-co/graphql.web-1.0.7" = { + "@0no-co/graphql.web-1.0.8" = { name = "_at_0no-co_slash_graphql.web"; packageName = "@0no-co/graphql.web"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@0no-co/graphql.web/-/graphql.web-1.0.7.tgz"; - sha512 = "E3Qku4mTzdrlwVWGPxklDnME5ANrEGetvYw4i2GCRlppWXXE4QD66j7pwb8HelZwS6LnqEChhrSOGCXpbiu6MQ=="; + url = "https://registry.npmjs.org/@0no-co/graphql.web/-/graphql.web-1.0.8.tgz"; + sha512 = "8BG6woLtDMvXB9Ajb/uE+Zr/U7y4qJ3upXi0JQHZmsKUJa7HjF/gFvmL2f3/mSmfZoQGRr9VoY97LCX2uaFMzA=="; }; }; "@adobe/css-tools-4.3.3" = { @@ -49,31 +49,31 @@ let sha512 = "30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw=="; }; }; - "@angular-devkit/architect-0.1801.2" = { + "@angular-devkit/architect-0.1802.5" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1801.2"; + version = "0.1802.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1801.2.tgz"; - sha512 = "y2rV8wRwTnmCH/dUo632wHi6r41Gs9XucyGm/ybzB/5tN3x6dS+O3c3zajRpdqTUr8YcD6os6sT+Ay6zS31tOw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.5.tgz"; + sha512 = "c7sVoW85Yqj7IYvNKxtNSGS5I7gWpORorg/xxLZX3OkHWXDrwYbb5LN/2p5/Aytxyb0aXl4o5fFOu6CUwcaLUw=="; }; }; - "@angular-devkit/core-18.1.2" = { + "@angular-devkit/core-18.2.5" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "18.1.2"; + version = "18.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-18.1.2.tgz"; - sha512 = "WYkdKT/Ime5seBX7S7S4aWQbgCG5U3otCvAg/XiMn6scexTo3EZe2jrJl8nxGGFHNWrePoD86LvJOxhnCkEKEA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.5.tgz"; + sha512 = "r9TumPlJ8PvA2+yz4sp+bUHgtznaVKzhvXTN5qL1k4YP8LJ7iZWMR2FOP+HjukHZOTsenzmV9pszbogabqwoZQ=="; }; }; - "@angular-devkit/schematics-18.1.2" = { + "@angular-devkit/schematics-18.2.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "18.1.2"; + version = "18.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.1.2.tgz"; - sha512 = "v8aCJ1tPPzXsdiCoZxkc6YzLGhzJgC/6QauT03/Z6wWo8uI6DKibQQwQBawRE5FN5lKDpuGlNDv40EDtVYkQSA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.5.tgz"; + sha512 = "NUmz2UQ1Xl4cf4j1AgkwIfsCjBzAPgfeC3IBrD29hSOBE1Y3j6auqjBkvw50v6mbSPxESND995Xy13HpK1Xflw=="; }; }; "@apidevtools/json-schema-ref-parser-9.0.6" = { @@ -193,13 +193,13 @@ let sha512 = "qrXI4+S8W7IF6e1nlDYX2KfdzxGHyAOj5kGvWk+TqBuAnA0rWQ513hJzdviiGpbB5VPnJkEhOVsDets8acKd6w=="; }; }; - "@astrojs/compiler-2.9.2" = { + "@astrojs/compiler-2.10.3" = { name = "_at_astrojs_slash_compiler"; packageName = "@astrojs/compiler"; - version = "2.9.2"; + version = "2.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.9.2.tgz"; - sha512 = "Vpu0Ffsj8SoV+N0DFHlxxOMKHwSC9059Xy/OlG1t6uFYSoJXxkBC2WyF6igO7x10V+8uJrhOxaXr3nA90kJXow=="; + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.10.3.tgz"; + sha512 = "bL/O7YBxsFt55YHU021oL+xz+B/9HvGNId3F9xURN16aeqDK9juHGktdkCSXz+U4nqFACq6ZFvWomOzhV+zfPw=="; }; }; "@asyncapi/specs-4.3.1" = { @@ -382,13 +382,13 @@ let sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw=="; }; }; - "@aws-sdk/client-s3-3.617.0" = { + "@aws-sdk/client-s3-3.654.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.617.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.617.0.tgz"; - sha512 = "0f954CU42BhPFVRQCCBc1jAvV9N4XW9I3D4h7tJ8tzxft7fS62MSJkgxRIXNKgWKLeGR7DUbz+XGZ1R5e7pyjA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.654.0.tgz"; + sha512 = "EsyeZJhkZD2VMdZpNt4NhlQ3QUAF24gMC+5w2wpGg6Yw+Bv7VLdg1t3PkTQovriJX1KTJAYHcGAuy92OFmWIng=="; }; }; "@aws-sdk/client-sso-3.296.0" = { @@ -400,13 +400,13 @@ let sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA=="; }; }; - "@aws-sdk/client-sso-3.616.0" = { + "@aws-sdk/client-sso-3.654.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.616.0.tgz"; - sha512 = "hwW0u1f8U4dSloAe61/eupUiGd5Q13B72BuzGxvRk0cIpYX/2m0KBG8DDl7jW1b2QQ+CflTLpG2XUf2+vRJxGA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.654.0.tgz"; + sha512 = "4kBxs2IzCDtj6a6lRXa/lXK5wWpMGzwKtb+HMXf/rJYVM6x7wYRzc1hYrOd3DYkFQ/sR3dUFj+0mTP0os3aAbA=="; }; }; "@aws-sdk/client-sso-oidc-3.296.0" = { @@ -418,13 +418,13 @@ let sha512 = "GRycCVdlFICvWwv9z6Mc/2BvSBOvchWO7UTklvbKXeDn6D05C+02PfxeoocMTc4r8/eFoEQWs67h5u/lPpyHDw=="; }; }; - "@aws-sdk/client-sso-oidc-3.616.0" = { + "@aws-sdk/client-sso-oidc-3.654.0" = { name = "_at_aws-sdk_slash_client-sso-oidc"; packageName = "@aws-sdk/client-sso-oidc"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.616.0.tgz"; - sha512 = "YY1hpYS/G1uRGjQf88dL8VLHkP/IjGxKeXdhy+JnzMdCkAWl3V9j0fEALw40NZe0x79gr6R2KUOUH/IKYQfUmg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.654.0.tgz"; + sha512 = "gbHrKsEnaAtmkNCVQzLyiqMzpDaThV/bWl/ODEklI+t6stW3Pe3oDMstEHLfJ6JU5g8sYnx4VLuxlnJMtUkvPw=="; }; }; "@aws-sdk/client-sts-3.296.0" = { @@ -436,13 +436,13 @@ let sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA=="; }; }; - "@aws-sdk/client-sts-3.616.0" = { + "@aws-sdk/client-sts-3.654.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.616.0.tgz"; - sha512 = "FP7i7hS5FpReqnysQP1ukQF1OUWy8lkomaOnbu15H415YUrfCp947SIx6+BItjmx+esKxPkEjh/fbCVzw2D6hQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.654.0.tgz"; + sha512 = "tyHa8jsBy+/NQZFHm6Q2Q09Vi9p3EH4yPy6PU8yPewpi2klreObtrUd0anJa6nzjS9SSuqnlZWsRic3cQ4QwCg=="; }; }; "@aws-sdk/config-resolver-3.296.0" = { @@ -454,13 +454,13 @@ let sha512 = "Ecdp7fmIitHo49NRCyIEHb9xlI43J7qkvhcwaKGGqN5jvoh0YhR2vNr195wWG8Ip/9PwsD4QV4g/XT5EY7XkMA=="; }; }; - "@aws-sdk/core-3.616.0" = { + "@aws-sdk/core-3.654.0" = { name = "_at_aws-sdk_slash_core"; packageName = "@aws-sdk/core"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.616.0.tgz"; - sha512 = "O/urkh2kECs/IqZIVZxyeyHZ7OR2ZWhLNK7btsVQBQvJKrEspLrk/Fp20Qfg5JDerQfBN83ZbyRXLJOOucdZpw=="; + url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.654.0.tgz"; + sha512 = "4Rwx7BVaNaFqmXBDmnOkMbyuIFFbpZ+ru4lr660p45zY1QoNNSalechfoRffcokLFOZO+VWEJkdcorPUUU993w=="; }; }; "@aws-sdk/credential-provider-env-3.296.0" = { @@ -472,22 +472,22 @@ let sha512 = "eDWSU3p04gytkkVXnYn05YzrP5SEaj/DQiafd4y+iBl8IFfF3zM6982rs6qFhvpwrHeSbLqHNfKR1HDWVwfG5g=="; }; }; - "@aws-sdk/credential-provider-env-3.609.0" = { + "@aws-sdk/credential-provider-env-3.654.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.609.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.609.0.tgz"; - sha512 = "v69ZCWcec2iuV9vLVJMa6fAb5xwkzN4jYIT8yjo2c4Ia/j976Q+TPf35Pnz5My48Xr94EFcaBazrWedF+kwfuQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.654.0.tgz"; + sha512 = "kogsx3Ql81JouHS7DkheCDU9MYAvK0AokxjcshDveGmf7BbgbWCA8Fnb9wjQyNDaOXNvkZu8Z8rgkX91z324/w=="; }; }; - "@aws-sdk/credential-provider-http-3.616.0" = { + "@aws-sdk/credential-provider-http-3.654.0" = { name = "_at_aws-sdk_slash_credential-provider-http"; packageName = "@aws-sdk/credential-provider-http"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.616.0.tgz"; - sha512 = "1rgCkr7XvEMBl7qWCo5BKu3yAxJs71dRaZ55Xnjte/0ZHH6Oc93ZrHzyYy6UH6t0nZrH+FAuw7Yko2YtDDwDeg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.654.0.tgz"; + sha512 = "tgmAH4MBi/aDR882lfw48+tDV95ZH3GWc1Eoe6DpNLiM3GN2VfU/cZwuHmi6aq+vAbdIlswBHJ/+va0fOvlyjw=="; }; }; "@aws-sdk/credential-provider-imds-3.296.0" = { @@ -508,13 +508,13 @@ let sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ=="; }; }; - "@aws-sdk/credential-provider-ini-3.616.0" = { + "@aws-sdk/credential-provider-ini-3.654.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.616.0.tgz"; - sha512 = "5gQdMr9cca3xV7FF2SxpxWGH2t6+t4o+XBGiwsHm8muEjf4nUmw7Ij863x25Tjt2viPYV0UStczSb5Sihp7bkA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.654.0.tgz"; + sha512 = "DKSdaNu2hwdmuvnm9KnA0NLqMWxxmxSOLWjSUSoFIm++wGXUjPrRMFYKvMktaXnPuyf5my8gF/yGbwzPZ8wlTg=="; }; }; "@aws-sdk/credential-provider-node-3.296.0" = { @@ -526,13 +526,13 @@ let sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA=="; }; }; - "@aws-sdk/credential-provider-node-3.616.0" = { + "@aws-sdk/credential-provider-node-3.654.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.616.0.tgz"; - sha512 = "Se+u6DAxjDPjKE3vX1X2uxjkWgGq69BTo0uTB0vDUiWwBVgh16s9BsBhSAlKEH1CCbbJHvOg4YdTrzjwzqyClg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.654.0.tgz"; + sha512 = "wPV7CNYaXDEc+SS+3R0v8SZwkHRUE1z2k2j1d49tH5QBDT4tb/k2V/biXWkwSk3hbR+IMWXmuhJDv/5lybhIvg=="; }; }; "@aws-sdk/credential-provider-process-3.296.0" = { @@ -544,13 +544,13 @@ let sha512 = "AY7sTX2dGi8ripuCpcJLYHOZB2wJ6NnseyK/kK5TfJn/pgboKwuGtz0hkJCVprNWomKa6IpHksm7vLQ4O2E+UA=="; }; }; - "@aws-sdk/credential-provider-process-3.614.0" = { + "@aws-sdk/credential-provider-process-3.654.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.614.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.614.0.tgz"; - sha512 = "Q0SI0sTRwi8iNODLs5+bbv8vgz8Qy2QdxbCHnPk/6Cx6LMf7i3dqmWquFbspqFRd8QiqxStrblwxrUYZi09tkA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.654.0.tgz"; + sha512 = "PmQoo8sZ9Q2Ow8OMzK++Z9lI7MsRUG7sNq3E72DVA215dhtTICTDQwGlXH2AAmIp7n+G9LLRds+4wo2ehG4mkg=="; }; }; "@aws-sdk/credential-provider-sso-3.296.0" = { @@ -562,13 +562,13 @@ let sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA=="; }; }; - "@aws-sdk/credential-provider-sso-3.616.0" = { + "@aws-sdk/credential-provider-sso-3.654.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.616.0.tgz"; - sha512 = "3rsWs9GBi8Z8Gps5ROwqguxtw+J6OIg1vawZMLRNMqqZoBvbOToe9wEnpid8ylU+27+oG8uibJNlNuRyXApUjw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.654.0.tgz"; + sha512 = "7GFme6fWEdA/XYKzZPOAdj/jS6fMBy1NdSIZsDXikS0v9jU+ZzHrAaWt13YLzHyjgxB9Sg9id9ncdY1IiubQXQ=="; }; }; "@aws-sdk/credential-provider-web-identity-3.296.0" = { @@ -580,13 +580,13 @@ let sha512 = "Rl6Ohoekxe+pccA55XXQDW5wApbg3rGWr6FkmPRcg7Ld6Vfe+HL8OtfsFf83/0eoFerevbif+00BdknXWT05LA=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.609.0" = { + "@aws-sdk/credential-provider-web-identity-3.654.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.609.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.609.0.tgz"; - sha512 = "U+PG8NhlYYF45zbr1km3ROtBMYqyyj/oK8NRp++UHHeuavgrP+4wJ4wQnlEaKvJBjevfo3+dlIBcaeQ7NYejWg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.654.0.tgz"; + sha512 = "6a2g9gMtZToqSu+CusjNK5zvbLJahQ9di7buO3iXgbizXpLXU1rnawCpWxwslMpT5fLgMSKDnKDrr6wdEk7jSw=="; }; }; "@aws-sdk/eventstream-codec-3.296.0" = { @@ -688,13 +688,13 @@ let sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag=="; }; }; - "@aws-sdk/lib-storage-3.617.0" = { + "@aws-sdk/lib-storage-3.654.0" = { name = "_at_aws-sdk_slash_lib-storage"; packageName = "@aws-sdk/lib-storage"; - version = "3.617.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.617.0.tgz"; - sha512 = "bR+3E66Dp3CyuSGywxMSwrYQCfwuFu7gRJxOpk1i2AKV1Wh7g0y1eANXHVKnk+UbVRz4S53UCD8LEiKp2KYShA=="; + url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.654.0.tgz"; + sha512 = "x3o11PnghWkIaC19/TYuyc0/o6jA6Oh4sa5ZPvszaaJ+NRCrN/XXrX1XlJv720X+99WN7tdz4oEcmtgQ0RaJIQ=="; }; }; "@aws-sdk/md5-js-3.296.0" = { @@ -715,13 +715,13 @@ let sha512 = "Xhzucs5psscjXJW7V6vMrjJWGmej8Xtw8XIKd91RLmbxdmecMy85/mQC3bIqxgTGhC/e3pKqWSp8z/YjV6iPZg=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.616.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.654.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.616.0.tgz"; - sha512 = "KZv78s8UE7+s3qZCfG3pE9U9XV5WTP478aNWis5gDXmsb5LF7QWzEeR8kve5dnjNlK6qVQ33v+mUZa6lR5PwMw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.654.0.tgz"; + sha512 = "/lWkyeLESiK+rAB4+NCw1cVPle9RN7RW/v7B4b8ORiCn1FwZLUPmEiZSYzyh4in5oa3Mri+W/g+KafZDH6LCbA=="; }; }; "@aws-sdk/middleware-content-length-3.296.0" = { @@ -751,13 +751,13 @@ let sha512 = "aVCv9CdAVWt9AlZKQZRweIywkAszRrZUCo8K5bBUJNdD4061DoDqLK/6jmqXmObas0j1wQr/eNzjYbv99MZBCg=="; }; }; - "@aws-sdk/middleware-expect-continue-3.616.0" = { + "@aws-sdk/middleware-expect-continue-3.654.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.616.0.tgz"; - sha512 = "IM1pfJPm7pDUXa55js9bnGjS8o3ldzDwf95mL9ZAYdEsm10q6i0ZxZbbro2gTq25Ap5ykdeeS34lOSzIqPiW1A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.654.0.tgz"; + sha512 = "S7fSlo8vdjkQTy9DmdF54ZsPwc+aA4z5Y9JVqAlGL9QiZe/fPtRE3GZ8BBbMICjBfMEa12tWjzhDz9su2c6PIA=="; }; }; "@aws-sdk/middleware-flexible-checksums-3.296.0" = { @@ -769,13 +769,13 @@ let sha512 = "F5wVMhLIgA86PKsK/Az7LGIiNVDdZjoSn0+boe6fYW/AIAmgJhPf//500Md0GsKsLOCcPcxiQC43a0hVT2zbew=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.616.0" = { + "@aws-sdk/middleware-flexible-checksums-3.654.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.616.0.tgz"; - sha512 = "Mrco/dURoTXVqwcnYRcyrFaPTIg36ifg2PK0kUYfSVTGEOClZOQXlVG5zYCZoo3yEMgy/gLT907FjUQxwoifIw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.654.0.tgz"; + sha512 = "ZSRC+Lf9WxyoDLuTkd7JrFRrBLPLXcTOZzX6tDsnHc6tgdneBNwV3/ZOYUwQ8bdwLLnzSaQUU+X5B2BkEFKIhQ=="; }; }; "@aws-sdk/middleware-host-header-3.296.0" = { @@ -787,13 +787,13 @@ let sha512 = "V47dFtfkX5lXWv9GDp71gZVCRws4fEdQ9QF9BQ/2UMSNrYjQLg6mFe7NibH+IJoNOid2FIwWIl94Eos636VGYQ=="; }; }; - "@aws-sdk/middleware-host-header-3.616.0" = { + "@aws-sdk/middleware-host-header-3.654.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.616.0.tgz"; - sha512 = "mhNfHuGhCDZwYCABebaOvTgOM44UCZZRq2cBpgPZLVKP0ydAv5aFHXv01goexxXHqgHoEGx0uXWxlw0s2EpFDg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.654.0.tgz"; + sha512 = "rxGgVHWKp8U2ubMv+t+vlIk7QYUaRCHaVpmUlJv0Wv6Q0KeO9a42T9FxHphjOTlCGQOLcjCreL9CF8Qhtb4mdQ=="; }; }; "@aws-sdk/middleware-location-constraint-3.296.0" = { @@ -805,13 +805,13 @@ let sha512 = "KHkWaIrZOtJmV1/WO9KOf7kSK41ngfqts3YIun956NYglKTDKyrBIOPCgmXTT/03odnYsKVT/UfbEIh/v4RxGA=="; }; }; - "@aws-sdk/middleware-location-constraint-3.609.0" = { + "@aws-sdk/middleware-location-constraint-3.654.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.609.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.609.0.tgz"; - sha512 = "xzsdoTkszGVqGVPjUmgoP7TORiByLueMHieI1fhQL888WPdqctwAx3ES6d/bA9Q/i8jnc6hs+Fjhy8UvBTkE9A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.654.0.tgz"; + sha512 = "Duvv5c4DEQ7P6c0YlcvEUW3xCJi6X2uktafNGjILhVDMQwShSF/aFqNv/ikWU/luQcmWHZ9DtDjTR9UKLh6eTA=="; }; }; "@aws-sdk/middleware-logger-3.296.0" = { @@ -823,13 +823,13 @@ let sha512 = "LzfEEFyBR9LXdWwLdtBrmi1vLdzgdJNntEgzqktVF8LwaCyY+9xIE6TGu/2V+9fJHAwECxjOC1eQbNQdAZ0Tmw=="; }; }; - "@aws-sdk/middleware-logger-3.609.0" = { + "@aws-sdk/middleware-logger-3.654.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.609.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.609.0.tgz"; - sha512 = "S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.654.0.tgz"; + sha512 = "OQYb+nWlmASyXfRb989pwkJ9EVUMP1CrKn2eyTk3usl20JZmKo2Vjis6I0tLUkMSxMhnBJJlQKyWkRpD/u1FVg=="; }; }; "@aws-sdk/middleware-recursion-detection-3.296.0" = { @@ -841,13 +841,13 @@ let sha512 = "UG7TLDPz9ImQG0uVklHTxE9Us7rTImwN+6el6qZCpoTBuGeXgOkfb0/p8izJyFgY/hMUR4cZqs7IdCDUkxQF3w=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.616.0" = { + "@aws-sdk/middleware-recursion-detection-3.654.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.616.0.tgz"; - sha512 = "LQKAcrZRrR9EGez4fdCIVjdn0Ot2HMN12ChnoMGEU6oIxnQ2aSC7iASFFCV39IYfeMh7iSCPj7Wopqw8rAouzg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.654.0.tgz"; + sha512 = "gKSomgltKVmsT8sC6W7CrADZ4GHwX9epk3GcH6QhebVO3LA9LRbkL3TwOPUXakxxOLLUTYdOZLIOtFf7iH00lg=="; }; }; "@aws-sdk/middleware-retry-3.296.0" = { @@ -868,13 +868,13 @@ let sha512 = "zH4uZKEqumo01wn+dTwrYnvOui9GjDiuBHdECnSjnA0Mkxo/tfMPYzYD7mE8kUlBz7HfQcXeXlyaApj9fPkxvg=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.617.0" = { + "@aws-sdk/middleware-sdk-s3-3.654.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.617.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.617.0.tgz"; - sha512 = "zVOS6sNGcLGhq7i+5POmVqmSPNmrQYDFsynpnWMSLsNaej+xvkdSOnytLrUvag3Du4kAxfO5NNIC0GuNj9lcCg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.654.0.tgz"; + sha512 = "6prq+GK6hLMAbxEb83tBMb1YiTWWK196fJhFO/7gE5TUPL1v756RhQZzKV/njbwB1fIBjRBTuhYLh5Bn98HhdA=="; }; }; "@aws-sdk/middleware-sdk-sts-3.296.0" = { @@ -904,15 +904,6 @@ let sha512 = "wyiG+WPDvugGTIPpKchGOdvvpcMZEN2IfP6iK//QAqGXsC6rDm5+SNZ3+elvduZjPUdVA06W0CcFYBAkVz8D7Q=="; }; }; - "@aws-sdk/middleware-signing-3.616.0" = { - name = "_at_aws-sdk_slash_middleware-signing"; - packageName = "@aws-sdk/middleware-signing"; - version = "3.616.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.616.0.tgz"; - sha512 = "wwzZFlXyURwo40oz1NmufreQa5DqwnCF8hR8tIP5+oKCyhbkmlmv8xG4Wn51bzY2WEbQhvFebgZSFTEvelCoCg=="; - }; - }; "@aws-sdk/middleware-ssec-3.296.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; @@ -922,13 +913,13 @@ let sha512 = "vcSyXxEXAC9rWzUd7rq2/JxPdt87DKiA+wfiBrpGvFV+bacocIV0TFcpJncgZqMOoP8b6Osd+mW4BjlkwBamtA=="; }; }; - "@aws-sdk/middleware-ssec-3.609.0" = { + "@aws-sdk/middleware-ssec-3.654.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.609.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.609.0.tgz"; - sha512 = "GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.654.0.tgz"; + sha512 = "k7hkQDJh4hcRJC7YojQ11kc37SY4foryen26Eafj5qYjeG2OGMW0oZTJDl1TVFJ7AcCjqIuMIo0Ho2US/2JspQ=="; }; }; "@aws-sdk/middleware-stack-3.296.0" = { @@ -949,13 +940,13 @@ let sha512 = "L7jacxSt6gxX1gD3tQtfwHqBDk5rT2wWD3rxBa6rs7f81b9ObgY/sPT2IgRT7JNCVzvKLYFxJaTklDj65mY1SQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.616.0" = { + "@aws-sdk/middleware-user-agent-3.654.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.616.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.616.0.tgz"; - sha512 = "iMcAb4E+Z3vuEcrDsG6T2OBNiqWAquwahP9qepHqfmnmJqHr1mSHtXDYTGBNid31+621sUQmneUQ+fagpGAe4w=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.654.0.tgz"; + sha512 = "liCcqPAyRsr53cy2tYu4qeH4MMN0eh9g6k56XzI5xd4SghXH5YWh4qOYAlQ8T66ZV4nPMtD8GLtLXGzsH8moFg=="; }; }; "@aws-sdk/node-config-provider-3.296.0" = { @@ -1012,22 +1003,22 @@ let sha512 = "nLNZKVQfK42euv7101cE5qfg17YCtGcfccx3B5XSAzvyTROR46kwYqbEvYSsWisbZoRhbQc905gB/5E0U5HDIw=="; }; }; - "@aws-sdk/region-config-resolver-3.614.0" = { + "@aws-sdk/region-config-resolver-3.654.0" = { name = "_at_aws-sdk_slash_region-config-resolver"; packageName = "@aws-sdk/region-config-resolver"; - version = "3.614.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.614.0.tgz"; - sha512 = "vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g=="; + url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.654.0.tgz"; + sha512 = "ydGOrXJxj3x0sJhsXyTmvJVLAE0xxuTWFJihTl67RtaO7VRNtd82I3P3bwoMMaDn5WpmV5mPo8fEUDRlBm3fPg=="; }; }; - "@aws-sdk/s3-presigned-post-3.617.0" = { + "@aws-sdk/s3-presigned-post-3.654.0" = { name = "_at_aws-sdk_slash_s3-presigned-post"; packageName = "@aws-sdk/s3-presigned-post"; - version = "3.617.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.617.0.tgz"; - sha512 = "5PCjZ3vux7FvlJYtVbXQZCO6J4yGPaZlWxgt1XdX43wcXe2GNWhxHB9OvCmKOJR2N379Ihw/ABq8UWze6LIzxA=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.654.0.tgz"; + sha512 = "MKpoLK4FV5/8Oydm3FQiSCbP6HoI75k2Z8z8MVK9bTiObedAMXTkdZDzq2qtqngEM4Lb1GgyJkActihJcv3AYw=="; }; }; "@aws-sdk/s3-request-presigner-3.296.0" = { @@ -1039,13 +1030,13 @@ let sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw=="; }; }; - "@aws-sdk/s3-request-presigner-3.617.0" = { + "@aws-sdk/s3-request-presigner-3.654.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.617.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.617.0.tgz"; - sha512 = "zszOwBmu3Ei5rRgddcQ3sbKFCtzLtUNDcmeybh4OhxENfgzHZHOeTOt8C+C16DD5YDQqeP4JYPRUp0LPuybkvg=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.654.0.tgz"; + sha512 = "se1DllTTkaB85RSB60U/VUq5rCzwhqYZudxrf1zlWD0YjZpwKqifWgBomd3AyPZtQRQOcQooBcmZCVfGfdAuJQ=="; }; }; "@aws-sdk/service-error-classification-3.296.0" = { @@ -1075,13 +1066,13 @@ let sha512 = "NQyJ/FClty4VmF1WoV4rOkbN0Unn0zevzy8iJrYhqxE3Sc7lySM4Btnsd4Iqelm2dR6l+jNRApGgD8NvoGjGig=="; }; }; - "@aws-sdk/signature-v4-crt-3.617.0" = { + "@aws-sdk/signature-v4-crt-3.654.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.617.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.617.0.tgz"; - sha512 = "mTZ438M8VYQhupltwKXOJCBA/WFdd9PCYjRwmbFv3b1QpOMWr5VQYldbz6lwKqOcv0N93PJkNFZnHBC//DTw5A=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.654.0.tgz"; + sha512 = "Qo8E+9Hli9PpkZMsPdI/O6NxpZVEXsZjI/d7PApXYG2c0xDS9IzFe1JhEASkDeEPyp1MEb4A87kBjiE6lKj5hg=="; }; }; "@aws-sdk/signature-v4-multi-region-3.296.0" = { @@ -1093,13 +1084,13 @@ let sha512 = "BNMXS0YJEgflPhO2KxXG4f0iTMOGdyxslDMNGmMWGGQm6bbwtqZ7Y9ZyMQYKfzk3GUPpfGQcaaSNiGfURPOCOg=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.617.0" = { + "@aws-sdk/signature-v4-multi-region-3.654.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.617.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.617.0.tgz"; - sha512 = "kGbLs9q0/ziuzA1huf0BBh05ChxDeZ8ZWc/kedb80ocq6izOLaGgeqqUR8oB0ianwjel4AQq/iv1fsOIt3wmAA=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.654.0.tgz"; + sha512 = "f8kyvbzgD3lSK1kFc3jsDCYjdutcqGO3tOzYO/QIK7BTl5lxc4rm6IKTcF2UYJsn8jiNqih7tVK8aVIGi8IF/w=="; }; }; "@aws-sdk/smithy-client-3.296.0" = { @@ -1120,13 +1111,13 @@ let sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ=="; }; }; - "@aws-sdk/token-providers-3.614.0" = { + "@aws-sdk/token-providers-3.654.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.614.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.614.0.tgz"; - sha512 = "okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.654.0.tgz"; + sha512 = "D8GeJYmvbfWkQDtTB4owmIobSMexZel0fOoetwvgCQ/7L8VPph3Q2bn1TRRIXvH7wdt6DcDxA3tKMHPBkT3GlA=="; }; }; "@aws-sdk/types-3.296.0" = { @@ -1138,13 +1129,13 @@ let sha512 = "s0wIac64rrMEo2ioUxP9IarGiiCGmelCspNcoNTPSjGl25QqjhyfQqTeGgS58qJ4fHoQb07qra39930xp1IzJg=="; }; }; - "@aws-sdk/types-3.609.0" = { + "@aws-sdk/types-3.654.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.609.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz"; - sha512 = "+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.654.0.tgz"; + sha512 = "VWvbED3SV+10QJIcmU/PKjsKilsTV16d1I7/on4bvD/jo1qGeMXqLDBSen3ks/tuvXZF/mFc7ZW/W2DiLVtO7A=="; }; }; "@aws-sdk/url-parser-3.296.0" = { @@ -1255,13 +1246,13 @@ let sha512 = "YraGGLJepXM6HCTaqEGTFf8RFRBdJ0C6uG5k0kVhiXmYxBkeupn8J07CVp9jfWqcPYWElAnMGVEZKU1OjRo4HQ=="; }; }; - "@aws-sdk/util-endpoints-3.614.0" = { + "@aws-sdk/util-endpoints-3.654.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.614.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.614.0.tgz"; - sha512 = "wK2cdrXHH4oz4IomV/yrGkftU9A+ITB6nFL+rxxyO78is2ifHJpFdV4aqk4LSkXYPi6CXWNru/Dqc7yiKXgJPw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.654.0.tgz"; + sha512 = "i902fcBknHs0Irgdpi62+QMvzxE+bczvILXigYrlHL4+PiEnlMVpni5L5W1qCkNZXf8AaMrSBuR1NZAGp6UOUw=="; }; }; "@aws-sdk/util-format-url-3.296.0" = { @@ -1273,13 +1264,13 @@ let sha512 = "CcYECzkUAnHL5q3uyPicafn2OY0GiklIYfuOUHPZ/4FMxIesd1BnCDDRjTlFxLWjuNuiihIdwB7Qb1pDzxc3Iw=="; }; }; - "@aws-sdk/util-format-url-3.609.0" = { + "@aws-sdk/util-format-url-3.654.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.609.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.609.0.tgz"; - sha512 = "fuk29BI/oLQlJ7pfm6iJ4gkEpHdavffAALZwXh9eaY1vQ0ip0aKfRTiNudPoJjyyahnz5yJ1HkmlcDitlzsOrQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.654.0.tgz"; + sha512 = "2yAlJ/l1uTJhS52iu4+/EvdIyQhDBL+nATY8rEjFI0H+BHGVrJIH2CL4DByhvi2yvYwsqQX0HYah6pF/yoXukA=="; }; }; "@aws-sdk/util-hex-encoding-3.295.0" = { @@ -1354,13 +1345,13 @@ let sha512 = "MGGG+09VkF0N+8KEht8NNE6Q7bqmddgqLkUbvzSky0y18UPEZyq9LTC4JZtzDDOzf/swgbq2IQ/5wtB81iouog=="; }; }; - "@aws-sdk/util-user-agent-browser-3.609.0" = { + "@aws-sdk/util-user-agent-browser-3.654.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.609.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.609.0.tgz"; - sha512 = "fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.654.0.tgz"; + sha512 = "ykYAJqvnxLt7wfrqya28wuH3/7NdrwzfiFd7NqEVQf7dXVxL5RPEpD7DxjcyQo3DsHvvdUvGZVaQhozycn1pzA=="; }; }; "@aws-sdk/util-user-agent-node-3.296.0" = { @@ -1372,13 +1363,13 @@ let sha512 = "AMWac8aIBnaa9nxAEpZ752j29a/UQTViRfR5gnCX38ECBKGfOQMpgYnee5HdlMr4GHJj0WkOzQxBtInW4pV58g=="; }; }; - "@aws-sdk/util-user-agent-node-3.614.0" = { + "@aws-sdk/util-user-agent-node-3.654.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.614.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.614.0.tgz"; - sha512 = "15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.654.0.tgz"; + sha512 = "a0ojjdBN6pqv6gB4H/QPPSfhs7mFtlVwnmKCM/QrTaFzN0U810PJ1BST3lBx5sa23I5jWHGaoFY+5q65C3clLQ=="; }; }; "@aws-sdk/util-utf8-3.295.0" = { @@ -1417,13 +1408,13 @@ let sha512 = "7VX3Due7Ip73yfYErFDHZvhgBohC4IyMTfW49DI4C/LFKFCcAoB888MdevUkB87GoiNaRLeT3ZMZ86IWlSEaow=="; }; }; - "@aws-sdk/xml-builder-3.609.0" = { + "@aws-sdk/xml-builder-3.654.0" = { name = "_at_aws-sdk_slash_xml-builder"; packageName = "@aws-sdk/xml-builder"; - version = "3.609.0"; + version = "3.654.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.609.0.tgz"; - sha512 = "l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA=="; + url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.654.0.tgz"; + sha512 = "qA2diK3d/ztC8HUb7NwPKbJRV01NpzTzxFn+L5G3HzJBNeKbjLcprQ/9uG9gp2UEx2Go782FI1ddrMNa0qBICA=="; }; }; "@azure/abort-controller-1.1.0" = { @@ -1444,13 +1435,13 @@ let sha512 = "nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA=="; }; }; - "@azure/core-auth-1.7.2" = { + "@azure/core-auth-1.8.0" = { name = "_at_azure_slash_core-auth"; packageName = "@azure/core-auth"; - version = "1.7.2"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.7.2.tgz"; - sha512 = "Igm/S3fDYmnMq1uKS38Ae1/m37B3zigdlZw+kocwEhh5GjyKjPrXKO2J6rzpC1wAxrNil/jX9BJRqBshyjnF3g=="; + url = "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.8.0.tgz"; + sha512 = "YvFMowkXzLbXNM11yZtVLhUCmuG0ex7JKOH366ipjmHBhL3vpDcPAeWF+jf0X+jVXwFqo3UhsWUq4kH0ZPdu/g=="; }; }; "@azure/core-client-1.9.2" = { @@ -1489,22 +1480,13 @@ let sha512 = "YKWi9YuCU04B55h25cnOYZHxXYtEvQEbKST5vqRga7hWY9ydd3FZHdeQF8pyh+acWZvppw13M/LMGx0LABUVMA=="; }; }; - "@azure/core-rest-pipeline-1.10.1" = { + "@azure/core-rest-pipeline-1.17.0" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.10.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz"; - sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA=="; - }; - }; - "@azure/core-rest-pipeline-1.16.2" = { - name = "_at_azure_slash_core-rest-pipeline"; - packageName = "@azure/core-rest-pipeline"; - version = "1.16.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.16.2.tgz"; - sha512 = "Hnhm/PG9/SQ07JJyLDv3l9Qr8V3xgAe1hFoBYzt6LaalMxfL/ZqFaZf/bz5VN3pMcleCPwl8ivlS2Fjxq/iC8Q=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.17.0.tgz"; + sha512 = "62Vv8nC+uPId3j86XJ0WI+sBf0jlqTqPUFCBNrGtlaUeQUIXWV/D8GE5A1d+Qx8H7OQojn2WguC8kChD6v0shA=="; }; }; "@azure/core-tracing-1.0.0-preview.13" = { @@ -1525,22 +1507,13 @@ let sha512 = "dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA=="; }; }; - "@azure/core-util-1.2.0" = { - name = "_at_azure_slash_core-util"; - packageName = "@azure/core-util"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.2.0.tgz"; - sha512 = "ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng=="; - }; - }; - "@azure/core-util-1.9.1" = { + "@azure/core-util-1.10.0" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.9.1.tgz"; - sha512 = "OLsq0etbHO1MA7j6FouXFghuHrAFGk+5C1imcpQ2e+0oZhYF07WLA+NW2Vqs70R7d+zOAWiWM3tbE1sXcDN66g=="; + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.10.0.tgz"; + sha512 = "dqLWQsh9Nro1YQU+405POVtXnwrIVqPyfUzc4zXCbThTg7+vNNaiMkwbX9AMXKyoFYFClxmB3s25ZFr3+jZkww=="; }; }; "@azure/identity-4.2.1" = { @@ -1552,58 +1525,49 @@ let sha512 = "U8hsyC9YPcEIzoaObJlRDvp7KiF0MGS7xcWbyJSVvXRkC/HXo1f0oYeBYmEvVgRfacw7GHf6D6yAoh9JHz6A5Q=="; }; }; - "@azure/identity-4.4.0" = { + "@azure/identity-4.4.1" = { name = "_at_azure_slash_identity"; packageName = "@azure/identity"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/identity/-/identity-4.4.0.tgz"; - sha512 = "oG6oFNMxUuoivYg/ElyZWVSZfw42JQyHbrp+lR7VJ1BYWsGzt34NwyDw3miPp1QI7Qm5+4KAd76wGsbHQmkpkg=="; + url = "https://registry.npmjs.org/@azure/identity/-/identity-4.4.1.tgz"; + sha512 = "DwnG4cKFEM7S3T+9u05NstXU/HN0dk45kPOinUyNKsn5VWwpXd9sbPKEg6kgJzGbm1lMuhx9o31PVbCtM5sfBA=="; }; }; - "@azure/logger-1.1.3" = { + "@azure/logger-1.1.4" = { name = "_at_azure_slash_logger"; packageName = "@azure/logger"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/logger/-/logger-1.1.3.tgz"; - sha512 = "J8/cIKNQB1Fc9fuYqBVnrppiUtW+5WWJPCj/tAokC5LdSTwkWWttN+jsRgw9BLYD7JDBx7PceiqOBxJJ1tQz3Q=="; + url = "https://registry.npmjs.org/@azure/logger/-/logger-1.1.4.tgz"; + sha512 = "4IXXzcCdLdlXuCG+8UKEwLA1T1NHqUfanhXYHiQTn+6sfWCZXduqbtXDGceg3Ce5QxTGo7EqmbV6Bi+aqKuClQ=="; }; }; - "@azure/msal-browser-3.20.0" = { + "@azure/msal-browser-3.24.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "3.20.0"; + version = "3.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.20.0.tgz"; - sha512 = "ErsxbfCGIwdqD8jipqdxpfAGiUEQS7MWUe39Rjhl0ZVPsb1JEe9bZCe2+0g23HDH6DGyCAtnTNN9scPtievrMQ=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.24.0.tgz"; + sha512 = "JGNV9hTYAa7lsum9IMIibn2kKczAojNihGo1hi7pG0kNrcKej530Fl6jxwM05A44/6I079CSn6WxYxbVhKUmWg=="; }; }; - "@azure/msal-common-14.14.0" = { + "@azure/msal-common-14.15.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "14.14.0"; + version = "14.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.0.tgz"; - sha512 = "OxcOk9H1/1fktHh6//VCORgSNJc2dCQObTm6JNmL824Z6iZSO6eFo/Bttxe0hETn9B+cr7gDouTQtsRq3YPuSQ=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz"; + sha512 = "ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ=="; }; }; - "@azure/msal-node-2.12.0" = { + "@azure/msal-node-2.14.0" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "2.12.0"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.12.0.tgz"; - sha512 = "jmk5Im5KujRA2AcyCb0awA3buV8niSrwXZs+NBJWIvxOz76RvNlusGIqi43A0h45BPUy93Qb+CPdpJn82NFTIg=="; - }; - }; - "@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" = { - name = "_at_azure_slash_opentelemetry-instrumentation-azure-sdk"; - packageName = "@azure/opentelemetry-instrumentation-azure-sdk"; - version = "1.0.0-beta.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/opentelemetry-instrumentation-azure-sdk/-/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5.tgz"; - sha512 = "fsUarKQDvjhmBO4nIfaZkfNSApm1hZBzcvpNbSrXdcUBxu7lRvKsV5DnwszX7cnhLyVOW9yl1uigtRQ1yDANjA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.14.0.tgz"; + sha512 = "rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg=="; }; }; "@azure/storage-blob-12.17.0" = { @@ -1615,13 +1579,13 @@ let sha512 = "sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ=="; }; }; - "@babel/cli-7.24.8" = { + "@babel/cli-7.25.6" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.24.8"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.8.tgz"; - sha512 = "isdp+G6DpRyKc+3Gqxy2rjzgF7Zj9K0mzLNnxz+E/fgeag8qT3vVulX4gY9dGO1q0y+0lUv6V3a+uhUzMzrwXg=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.25.6.tgz"; + sha512 = "Z+Doemr4VtvSD2SNHTrkiFZ1LX+JI6tyRXAAOb4N9khIuPyoEPmTPJarPm8ljJV1D6bnMQjyHMWTT9NeKbQuXA=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1660,22 +1624,22 @@ let sha512 = "BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA=="; }; }; - "@babel/compat-data-7.24.9" = { + "@babel/compat-data-7.25.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.24.9"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz"; - sha512 = "e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz"; + sha512 = "+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ=="; }; }; - "@babel/core-7.24.9" = { + "@babel/core-7.25.2" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.24.9"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz"; - sha512 = "5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz"; + sha512 = "BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA=="; }; }; "@babel/generator-7.18.2" = { @@ -1687,22 +1651,22 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/generator-7.24.10" = { + "@babel/generator-7.24.7" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.24.10"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz"; - sha512 = "o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz"; + sha512 = "oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA=="; }; }; - "@babel/generator-7.24.7" = { + "@babel/generator-7.25.6" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.24.7"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz"; - sha512 = "oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz"; + sha512 = "VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw=="; }; }; "@babel/helper-annotate-as-pure-7.24.7" = { @@ -1723,31 +1687,31 @@ let sha512 = "xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA=="; }; }; - "@babel/helper-compilation-targets-7.24.8" = { + "@babel/helper-compilation-targets-7.25.2" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.24.8"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz"; - sha512 = "oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz"; + sha512 = "U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw=="; }; }; - "@babel/helper-create-class-features-plugin-7.24.8" = { + "@babel/helper-create-class-features-plugin-7.25.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.24.8"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.8.tgz"; - sha512 = "4f6Oqnmyp2PP3olgUMmOwC3akxSm5aBYraQ6YDdKy7NcAMkDECHWG0DEnV6M2UAkERgIBhYt8S27rURPg7SxWA=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz"; + sha512 = "ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.24.7" = { + "@babel/helper-create-regexp-features-plugin-7.25.2" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.24.7"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz"; - sha512 = "03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz"; + sha512 = "+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g=="; }; }; "@babel/helper-define-polyfill-provider-0.6.2" = { @@ -1768,24 +1732,6 @@ let sha512 = "DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ=="; }; }; - "@babel/helper-function-name-7.24.7" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.24.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz"; - sha512 = "FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA=="; - }; - }; - "@babel/helper-hoist-variables-7.24.7" = { - name = "_at_babel_slash_helper-hoist-variables"; - packageName = "@babel/helper-hoist-variables"; - version = "7.24.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz"; - sha512 = "MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ=="; - }; - }; "@babel/helper-member-expression-to-functions-7.24.8" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; @@ -1804,13 +1750,13 @@ let sha512 = "8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA=="; }; }; - "@babel/helper-module-transforms-7.24.9" = { + "@babel/helper-module-transforms-7.25.2" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.24.9"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz"; - sha512 = "oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz"; + sha512 = "BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ=="; }; }; "@babel/helper-optimise-call-expression-7.24.7" = { @@ -1831,22 +1777,22 @@ let sha512 = "FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg=="; }; }; - "@babel/helper-remap-async-to-generator-7.24.7" = { + "@babel/helper-remap-async-to-generator-7.25.0" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.24.7"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz"; - sha512 = "9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz"; + sha512 = "NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw=="; }; }; - "@babel/helper-replace-supers-7.24.7" = { + "@babel/helper-replace-supers-7.25.0" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.24.7"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz"; - sha512 = "qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz"; + sha512 = "q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg=="; }; }; "@babel/helper-simple-access-7.24.7" = { @@ -1867,15 +1813,6 @@ let sha512 = "IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ=="; }; }; - "@babel/helper-split-export-declaration-7.24.7" = { - name = "_at_babel_slash_helper-split-export-declaration"; - packageName = "@babel/helper-split-export-declaration"; - version = "7.24.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz"; - sha512 = "oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA=="; - }; - }; "@babel/helper-string-parser-7.24.8" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; @@ -1903,22 +1840,22 @@ let sha512 = "xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q=="; }; }; - "@babel/helper-wrap-function-7.24.7" = { + "@babel/helper-wrap-function-7.25.0" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.24.7"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz"; - sha512 = "N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz"; + sha512 = "s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ=="; }; }; - "@babel/helpers-7.24.8" = { + "@babel/helpers-7.25.6" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.24.8"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz"; - sha512 = "gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz"; + sha512 = "Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q=="; }; }; "@babel/highlight-7.24.7" = { @@ -1930,13 +1867,13 @@ let sha512 = "EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw=="; }; }; - "@babel/node-7.24.8" = { + "@babel/node-7.25.0" = { name = "_at_babel_slash_node"; packageName = "@babel/node"; - version = "7.24.8"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/node/-/node-7.24.8.tgz"; - sha512 = "4JgQZJOVDrMCe2OwP7g4nBEvv0kbTkWYVvkEhFdq8JdEhsy9J5E5ChibbIchTrntKB62lx2I7fVTdM+Se7KVFg=="; + url = "https://registry.npmjs.org/@babel/node/-/node-7.25.0.tgz"; + sha512 = "fgdlIcf1vLeZ6gUHcl799Wbk6no5tnkGi6t1gpAb1a97ZB+KCRp8Sgb7acGTjnFhOzqzcsbJ4+wzewqb6JM0tA=="; }; }; "@babel/parser-7.18.4" = { @@ -1948,31 +1885,40 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.24.8" = { + "@babel/parser-7.25.6" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.24.8"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz"; - sha512 = "WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz"; + sha512 = "trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q=="; }; }; - "@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7" = { + "@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3" = { name = "_at_babel_slash_plugin-bugfix-firefox-class-in-computed-class-key"; packageName = "@babel/plugin-bugfix-firefox-class-in-computed-class-key"; - version = "7.24.7"; + version = "7.25.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz"; - sha512 = "TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz"; + sha512 = "wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA=="; }; }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7" = { + "@babel/plugin-bugfix-safari-class-field-initializer-scope-7.25.0" = { + name = "_at_babel_slash_plugin-bugfix-safari-class-field-initializer-scope"; + packageName = "@babel/plugin-bugfix-safari-class-field-initializer-scope"; + version = "7.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz"; + sha512 = "Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA=="; + }; + }; + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0" = { name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.24.7"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz"; - sha512 = "unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz"; + sha512 = "lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7" = { @@ -1984,13 +1930,13 @@ let sha512 = "+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ=="; }; }; - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7" = { + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0" = { name = "_at_babel_slash_plugin-bugfix-v8-static-class-fields-redefine-readonly"; packageName = "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly"; - version = "7.24.7"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz"; - sha512 = "utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz"; + sha512 = "tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.20.7" = { @@ -2146,22 +2092,22 @@ let sha512 = "9G8GYT/dxn/D1IIKOUBmGX0mnmj46mGH9NnZyJLwtCpgh5f7D2VbuKodb+2s9m1Yavh1s7ASQN8lf0eqrb1LTw=="; }; }; - "@babel/plugin-syntax-import-assertions-7.24.7" = { + "@babel/plugin-syntax-import-assertions-7.25.6" = { name = "_at_babel_slash_plugin-syntax-import-assertions"; packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.24.7"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz"; - sha512 = "Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz"; + sha512 = "aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ=="; }; }; - "@babel/plugin-syntax-import-attributes-7.24.7" = { + "@babel/plugin-syntax-import-attributes-7.25.6" = { name = "_at_babel_slash_plugin-syntax-import-attributes"; packageName = "@babel/plugin-syntax-import-attributes"; - version = "7.24.7"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz"; - sha512 = "hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz"; + sha512 = "sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ=="; }; }; "@babel/plugin-syntax-import-meta-7.10.4" = { @@ -2263,13 +2209,13 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-syntax-typescript-7.24.7" = { + "@babel/plugin-syntax-typescript-7.25.4" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.24.7"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz"; - sha512 = "c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz"; + sha512 = "uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg=="; }; }; "@babel/plugin-syntax-unicode-sets-regex-7.18.6" = { @@ -2290,13 +2236,13 @@ let sha512 = "Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ=="; }; }; - "@babel/plugin-transform-async-generator-functions-7.24.7" = { + "@babel/plugin-transform-async-generator-functions-7.25.4" = { name = "_at_babel_slash_plugin-transform-async-generator-functions"; packageName = "@babel/plugin-transform-async-generator-functions"; - version = "7.24.7"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.7.tgz"; - sha512 = "o+iF77e3u7ZS4AoAuJvapz9Fm001PuD2V3Lp6OSE4FYQke+cSewYtnek+THqGRWyQloRCyvWL1OkyfNEl9vr/g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz"; + sha512 = "jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg=="; }; }; "@babel/plugin-transform-async-to-generator-7.24.7" = { @@ -2317,22 +2263,22 @@ let sha512 = "yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.24.7" = { + "@babel/plugin-transform-block-scoping-7.25.0" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.24.7"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz"; - sha512 = "Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz"; + sha512 = "yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ=="; }; }; - "@babel/plugin-transform-class-properties-7.24.7" = { + "@babel/plugin-transform-class-properties-7.25.4" = { name = "_at_babel_slash_plugin-transform-class-properties"; packageName = "@babel/plugin-transform-class-properties"; - version = "7.24.7"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz"; - sha512 = "vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz"; + sha512 = "nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g=="; }; }; "@babel/plugin-transform-class-static-block-7.24.7" = { @@ -2344,13 +2290,13 @@ let sha512 = "HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ=="; }; }; - "@babel/plugin-transform-classes-7.24.8" = { + "@babel/plugin-transform-classes-7.25.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.24.8"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.8.tgz"; - sha512 = "VXy91c47uujj758ud9wx+OMgheXm4qJfyhj1P18YvlrQkNOSrwsteHk+EFS3OMGfhMhpZa0A+81eE7G4QC+3CA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz"; + sha512 = "oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg=="; }; }; "@babel/plugin-transform-computed-properties-7.24.7" = { @@ -2389,6 +2335,15 @@ let sha512 = "JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw=="; }; }; + "@babel/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0" = { + name = "_at_babel_slash_plugin-transform-duplicate-named-capturing-groups-regex"; + packageName = "@babel/plugin-transform-duplicate-named-capturing-groups-regex"; + version = "7.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz"; + sha512 = "YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g=="; + }; + }; "@babel/plugin-transform-dynamic-import-7.24.7" = { name = "_at_babel_slash_plugin-transform-dynamic-import"; packageName = "@babel/plugin-transform-dynamic-import"; @@ -2416,13 +2371,13 @@ let sha512 = "v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.24.7" = { + "@babel/plugin-transform-flow-strip-types-7.25.2" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.24.7"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.7.tgz"; - sha512 = "cjRKJ7FobOH2eakx7Ja+KpJRj8+y+/SiB3ooYm/n2UJfxu0oEaOoxOinitkJcPqv9KxS0kxTGPUaR7L2XcXDXA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.25.2.tgz"; + sha512 = "InBZ0O8tew5V0K6cHcQ+wgxlrjOw1W4wDXLkOTjLRD8GYhTSkxTVBtdy3MMtvYBrbAWa1Qm3hNoTc1620Yj+Mg=="; }; }; "@babel/plugin-transform-for-of-7.24.7" = { @@ -2434,13 +2389,13 @@ let sha512 = "wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g=="; }; }; - "@babel/plugin-transform-function-name-7.24.7" = { + "@babel/plugin-transform-function-name-7.25.1" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.24.7"; + version = "7.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz"; - sha512 = "U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz"; + sha512 = "TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA=="; }; }; "@babel/plugin-transform-json-strings-7.24.7" = { @@ -2452,13 +2407,13 @@ let sha512 = "2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw=="; }; }; - "@babel/plugin-transform-literals-7.24.7" = { + "@babel/plugin-transform-literals-7.25.2" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.24.7"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz"; - sha512 = "vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz"; + sha512 = "HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw=="; }; }; "@babel/plugin-transform-logical-assignment-operators-7.24.7" = { @@ -2497,13 +2452,13 @@ let sha512 = "WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.24.7" = { + "@babel/plugin-transform-modules-systemjs-7.25.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.24.7"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz"; - sha512 = "GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz"; + sha512 = "YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw=="; }; }; "@babel/plugin-transform-modules-umd-7.24.7" = { @@ -2596,13 +2551,13 @@ let sha512 = "yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA=="; }; }; - "@babel/plugin-transform-private-methods-7.24.7" = { + "@babel/plugin-transform-private-methods-7.25.4" = { name = "_at_babel_slash_plugin-transform-private-methods"; packageName = "@babel/plugin-transform-private-methods"; - version = "7.24.7"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz"; - sha512 = "COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz"; + sha512 = "ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw=="; }; }; "@babel/plugin-transform-private-property-in-object-7.24.7" = { @@ -2632,13 +2587,13 @@ let sha512 = "H/Snz9PFxKsS1JLI4dJLtnJgCJRoo0AUm3chP6NYr+9En1JMKloheEiLIhlp5MDVznWo+H3AAC1Mc8lmUEpsgg=="; }; }; - "@babel/plugin-transform-react-jsx-7.24.7" = { + "@babel/plugin-transform-react-jsx-7.25.2" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.24.7"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.7.tgz"; - sha512 = "+Dj06GDZEFRYvclU6k4bme55GKBEWUmByM/eoKuqg4zTNQHiApWRhQph5fxQB2wAEFvRzL1tOEj1RJ19wJrhoA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.2.tgz"; + sha512 = "KQsqEAVBpU82NM/B/N9j9WOdphom1SZH3R+2V7INrQUH+V9EBFwZsEJl8eBIVeQE62FxJCc70jzEZwqU7RcVqA=="; }; }; "@babel/plugin-transform-react-jsx-self-7.24.7" = { @@ -2677,13 +2632,13 @@ let sha512 = "0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ=="; }; }; - "@babel/plugin-transform-runtime-7.24.7" = { + "@babel/plugin-transform-runtime-7.25.4" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.24.7"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz"; - sha512 = "YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.4.tgz"; + sha512 = "8hsyG+KUYGY0coX6KUCDancA0Vw225KJ2HJO0yCNr1vq5r+lJTleDaJf0K7iOhjw4SWhu03TMBzYTJ9krmzULQ=="; }; }; "@babel/plugin-transform-shorthand-properties-7.24.7" = { @@ -2731,13 +2686,13 @@ let sha512 = "adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw=="; }; }; - "@babel/plugin-transform-typescript-7.24.8" = { + "@babel/plugin-transform-typescript-7.25.2" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.24.8"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.8.tgz"; - sha512 = "CgFgtN61BbdOGCP4fLaAMOPkzWUh6yQZNMr5YSt8uz2cZSSiQONCQFWqsE4NeVfOIhqDOlS9CR3WD91FzMeB2Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.2.tgz"; + sha512 = "lBwRvjSmqiMYe/pS0+1gggjJleUJi7NzjvQ1Fkqtt69hBa/0t1YuW/MLQMAPixfwaQOHUXsd6jeU3Z+vdGv3+A=="; }; }; "@babel/plugin-transform-unicode-escapes-7.24.7" = { @@ -2767,13 +2722,13 @@ let sha512 = "hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg=="; }; }; - "@babel/plugin-transform-unicode-sets-regex-7.24.7" = { + "@babel/plugin-transform-unicode-sets-regex-7.25.4" = { name = "_at_babel_slash_plugin-transform-unicode-sets-regex"; packageName = "@babel/plugin-transform-unicode-sets-regex"; - version = "7.24.7"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz"; - sha512 = "2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz"; + sha512 = "qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA=="; }; }; "@babel/polyfill-7.12.1" = { @@ -2785,13 +2740,13 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.24.8" = { + "@babel/preset-env-7.25.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.24.8"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.8.tgz"; - sha512 = "vObvMZB6hNWuDxhSaEPTKCwcqkAIuDtE+bQGn4XMXne1DSLzFVY8Vmj1bm+mUQXYNN8NmaQEO+r8MMbzPr1jBQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz"; + sha512 = "W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw=="; }; }; "@babel/preset-modules-0.1.6-no-external-plugins" = { @@ -2830,13 +2785,13 @@ let sha512 = "x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="; }; }; - "@babel/runtime-7.24.8" = { + "@babel/runtime-7.25.6" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.24.8"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.8.tgz"; - sha512 = "5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz"; + sha512 = "VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ=="; }; }; "@babel/runtime-7.9.0" = { @@ -2857,13 +2812,22 @@ let sha512 = "jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig=="; }; }; - "@babel/traverse-7.24.8" = { + "@babel/template-7.25.0" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz"; + sha512 = "aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q=="; + }; + }; + "@babel/traverse-7.25.6" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.24.8"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz"; - sha512 = "t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz"; + sha512 = "9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ=="; }; }; "@babel/types-7.19.0" = { @@ -2884,31 +2848,13 @@ let sha512 = "XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q=="; }; }; - "@babel/types-7.24.9" = { + "@babel/types-7.25.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.24.9"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.24.9.tgz"; - sha512 = "xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ=="; - }; - }; - "@bmewburn/js-beautify-1.15.2" = { - name = "_at_bmewburn_slash_js-beautify"; - packageName = "@bmewburn/js-beautify"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.15.2.tgz"; - sha512 = "TGLBQLYEow0ncfCap5ZSTeU7z/LlUemNvwirys5la3A44P+NZVIvuJSFCbo8+Sjsau/nthTLuwe76oiSthvm7Q=="; - }; - }; - "@bmewburn/vscode-html-languageserver-1.11.0" = { - name = "_at_bmewburn_slash_vscode-html-languageserver"; - packageName = "@bmewburn/vscode-html-languageserver"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.11.0.tgz"; - sha512 = "9uyCkXlu5eHyQB4Knux5mHJzuAglJXoix7B8i8xxurM+03lhSJz3QJ9LeBTP2YSSCnE/vTu4vCXDGDzANA4R7g=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz"; + sha512 = "/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw=="; }; }; "@braintree/sanitize-url-6.0.4" = { @@ -3019,139 +2965,139 @@ let sha512 = "Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA=="; }; }; - "@commitlint/config-validator-19.0.3" = { + "@commitlint/config-validator-19.5.0" = { name = "_at_commitlint_slash_config-validator"; packageName = "@commitlint/config-validator"; - version = "19.0.3"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-19.0.3.tgz"; - sha512 = "2D3r4PKjoo59zBc2auodrSCaUnCSALCx54yveOFwwP/i2kfEAQrygwOleFWswLqK0UL/F9r07MFi5ev2ohyM4Q=="; + url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-19.5.0.tgz"; + sha512 = "CHtj92H5rdhKt17RmgALhfQt95VayrUo2tSqY9g2w+laAXyk7K/Ef6uPm9tn5qSIwSmrLjKaXK9eiNuxmQrDBw=="; }; }; - "@commitlint/ensure-19.0.3" = { + "@commitlint/ensure-19.5.0" = { name = "_at_commitlint_slash_ensure"; packageName = "@commitlint/ensure"; - version = "19.0.3"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-19.0.3.tgz"; - sha512 = "SZEpa/VvBLoT+EFZVb91YWbmaZ/9rPH3ESrINOl0HD2kMYsjvl0tF7nMHh0EpTcv4+gTtZBAe1y/SS6/OhfZzQ=="; + url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-19.5.0.tgz"; + sha512 = "Kv0pYZeMrdg48bHFEU5KKcccRfKmISSm9MvgIgkpI6m+ohFTB55qZlBW6eYqh/XDfRuIO0x4zSmvBjmOwWTwkg=="; }; }; - "@commitlint/execute-rule-19.0.0" = { + "@commitlint/execute-rule-19.5.0" = { name = "_at_commitlint_slash_execute-rule"; packageName = "@commitlint/execute-rule"; - version = "19.0.0"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-19.0.0.tgz"; - sha512 = "mtsdpY1qyWgAO/iOK0L6gSGeR7GFcdW7tIjcNFxcWkfLDF5qVbPHKuGATFqRMsxcO8OUKNj0+3WOHB7EHm4Jdw=="; + url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-19.5.0.tgz"; + sha512 = "aqyGgytXhl2ejlk+/rfgtwpPexYyri4t8/n4ku6rRJoRhGZpLFMqrZ+YaubeGysCP6oz4mMA34YSTaSOKEeNrg=="; }; }; - "@commitlint/format-19.3.0" = { + "@commitlint/format-19.5.0" = { name = "_at_commitlint_slash_format"; packageName = "@commitlint/format"; - version = "19.3.0"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/format/-/format-19.3.0.tgz"; - sha512 = "luguk5/aF68HiF4H23ACAfk8qS8AHxl4LLN5oxPc24H+2+JRPsNr1OS3Gaea0CrH7PKhArBMKBz5RX9sA5NtTg=="; + url = "https://registry.npmjs.org/@commitlint/format/-/format-19.5.0.tgz"; + sha512 = "yNy088miE52stCI3dhG/vvxFo9e4jFkU1Mj3xECfzp/bIS/JUay4491huAlVcffOoMK1cd296q0W92NlER6r3A=="; }; }; - "@commitlint/is-ignored-19.2.2" = { + "@commitlint/is-ignored-19.5.0" = { name = "_at_commitlint_slash_is-ignored"; packageName = "@commitlint/is-ignored"; - version = "19.2.2"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-19.2.2.tgz"; - sha512 = "eNX54oXMVxncORywF4ZPFtJoBm3Tvp111tg1xf4zWXGfhBPKpfKG6R+G3G4v5CPlRROXpAOpQ3HMhA9n1Tck1g=="; + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-19.5.0.tgz"; + sha512 = "0XQ7Llsf9iL/ANtwyZ6G0NGp5Y3EQ8eDQSxv/SRcfJ0awlBY4tHFAvwWbw66FVUaWICH7iE5en+FD9TQsokZ5w=="; }; }; - "@commitlint/lint-19.2.2" = { + "@commitlint/lint-19.5.0" = { name = "_at_commitlint_slash_lint"; packageName = "@commitlint/lint"; - version = "19.2.2"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-19.2.2.tgz"; - sha512 = "xrzMmz4JqwGyKQKTpFzlN0dx0TAiT7Ran1fqEBgEmEj+PU98crOFtysJgY+QdeSagx6EDRigQIXJVnfrI0ratA=="; + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-19.5.0.tgz"; + sha512 = "cAAQwJcRtiBxQWO0eprrAbOurtJz8U6MgYqLz+p9kLElirzSCc0vGMcyCaA1O7AqBuxo11l1XsY3FhOFowLAAg=="; }; }; - "@commitlint/load-19.2.0" = { + "@commitlint/load-19.5.0" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "19.2.0"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-19.2.0.tgz"; - sha512 = "XvxxLJTKqZojCxaBQ7u92qQLFMMZc4+p9qrIq/9kJDy8DOrEa7P1yx7Tjdc2u2JxIalqT4KOGraVgCE7eCYJyQ=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-19.5.0.tgz"; + sha512 = "INOUhkL/qaKqwcTUvCE8iIUf5XHsEPCLY9looJ/ipzi7jtGhgmtH7OOFiNvwYgH7mA8osUWOUDV8t4E2HAi4xA=="; }; }; - "@commitlint/message-19.0.0" = { + "@commitlint/message-19.5.0" = { name = "_at_commitlint_slash_message"; packageName = "@commitlint/message"; - version = "19.0.0"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/message/-/message-19.0.0.tgz"; - sha512 = "c9czf6lU+9oF9gVVa2lmKaOARJvt4soRsVmbR7Njwp9FpbBgste5i7l/2l5o8MmbwGh4yE1snfnsy2qyA2r/Fw=="; + url = "https://registry.npmjs.org/@commitlint/message/-/message-19.5.0.tgz"; + sha512 = "R7AM4YnbxN1Joj1tMfCyBryOC5aNJBdxadTZkuqtWi3Xj0kMdutq16XQwuoGbIzL2Pk62TALV1fZDCv36+JhTQ=="; }; }; - "@commitlint/parse-19.0.3" = { + "@commitlint/parse-19.5.0" = { name = "_at_commitlint_slash_parse"; packageName = "@commitlint/parse"; - version = "19.0.3"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/parse/-/parse-19.0.3.tgz"; - sha512 = "Il+tNyOb8VDxN3P6XoBBwWJtKKGzHlitEuXA5BP6ir/3loWlsSqDr5aecl6hZcC/spjq4pHqNh0qPlfeWu38QA=="; + url = "https://registry.npmjs.org/@commitlint/parse/-/parse-19.5.0.tgz"; + sha512 = "cZ/IxfAlfWYhAQV0TwcbdR1Oc0/r0Ik1GEessDJ3Lbuma/MRO8FRQX76eurcXtmhJC//rj52ZSZuXUg0oIX0Fw=="; }; }; - "@commitlint/read-19.2.1" = { + "@commitlint/read-19.5.0" = { name = "_at_commitlint_slash_read"; packageName = "@commitlint/read"; - version = "19.2.1"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/read/-/read-19.2.1.tgz"; - sha512 = "qETc4+PL0EUv7Q36lJbPG+NJiBOGg7SSC7B5BsPWOmei+Dyif80ErfWQ0qXoW9oCh7GTpTNRoaVhiI8RbhuaNw=="; + url = "https://registry.npmjs.org/@commitlint/read/-/read-19.5.0.tgz"; + sha512 = "TjS3HLPsLsxFPQj6jou8/CZFAmOP2y+6V4PGYt3ihbQKTY1Jnv0QG28WRKl/d1ha6zLODPZqsxLEov52dhR9BQ=="; }; }; - "@commitlint/resolve-extends-19.1.0" = { + "@commitlint/resolve-extends-19.5.0" = { name = "_at_commitlint_slash_resolve-extends"; packageName = "@commitlint/resolve-extends"; - version = "19.1.0"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-19.1.0.tgz"; - sha512 = "z2riI+8G3CET5CPgXJPlzftH+RiWYLMYv4C9tSLdLXdr6pBNimSKukYP9MS27ejmscqCTVA4almdLh0ODD2KYg=="; + url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-19.5.0.tgz"; + sha512 = "CU/GscZhCUsJwcKTJS9Ndh3AKGZTNFIOoQB2n8CmFnizE0VnEuJoum+COW+C1lNABEeqk6ssfc1Kkalm4bDklA=="; }; }; - "@commitlint/rules-19.0.3" = { + "@commitlint/rules-19.5.0" = { name = "_at_commitlint_slash_rules"; packageName = "@commitlint/rules"; - version = "19.0.3"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/rules/-/rules-19.0.3.tgz"; - sha512 = "TspKb9VB6svklxNCKKwxhELn7qhtY1rFF8ls58DcFd0F97XoG07xugPjjbVnLqmMkRjZDbDIwBKt9bddOfLaPw=="; + url = "https://registry.npmjs.org/@commitlint/rules/-/rules-19.5.0.tgz"; + sha512 = "hDW5TPyf/h1/EufSHEKSp6Hs+YVsDMHazfJ2azIk9tHPXS6UqSz1dIRs1gpqS3eMXgtkT7JH6TW4IShdqOwhAw=="; }; }; - "@commitlint/to-lines-19.0.0" = { + "@commitlint/to-lines-19.5.0" = { name = "_at_commitlint_slash_to-lines"; packageName = "@commitlint/to-lines"; - version = "19.0.0"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-19.0.0.tgz"; - sha512 = "vkxWo+VQU5wFhiP9Ub9Sre0FYe019JxFikrALVoD5UGa8/t3yOJEpEhxC5xKiENKKhUkTpEItMTRAjHw2SCpZw=="; + url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-19.5.0.tgz"; + sha512 = "R772oj3NHPkodOSRZ9bBVNq224DOxQtNef5Pl8l2M8ZnkkzQfeSTr4uxawV2Sd3ui05dUVzvLNnzenDBO1KBeQ=="; }; }; - "@commitlint/top-level-19.0.0" = { + "@commitlint/top-level-19.5.0" = { name = "_at_commitlint_slash_top-level"; packageName = "@commitlint/top-level"; - version = "19.0.0"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-19.0.0.tgz"; - sha512 = "KKjShd6u1aMGNkCkaX4aG1jOGdn7f8ZI8TR1VEuNqUOjWTOdcDSsmglinglJ18JTjuBX5I1PtjrhQCRcixRVFQ=="; + url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-19.5.0.tgz"; + sha512 = "IP1YLmGAk0yWrImPRRc578I3dDUI5A2UBJx9FbSOjxe9sTlzFiwVJ+zeMLgAtHMtGZsC8LUnzmW1qRemkFU4ng=="; }; }; - "@commitlint/types-19.0.3" = { + "@commitlint/types-19.5.0" = { name = "_at_commitlint_slash_types"; packageName = "@commitlint/types"; - version = "19.0.3"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/types/-/types-19.0.3.tgz"; - sha512 = "tpyc+7i6bPG9mvaBbtKUeghfyZSDgWquIDfMgqYtTbmZ9Y9VzEm2je9EYcQ0aoz5o7NvGS+rcDec93yO08MHYA=="; + url = "https://registry.npmjs.org/@commitlint/types/-/types-19.5.0.tgz"; + sha512 = "DSHae2obMSMkAtTBSOulg5X7/z+rGLxcXQIkg3OmWvY6wifojge5uVMydfhUvs7yQj+V7jNmRZ2Xzl8GJyqRgg=="; }; }; "@conventional-changelog/git-client-1.0.1" = { @@ -3172,58 +3118,58 @@ let sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-8.12.1" = { + "@cspell/cspell-bundled-dicts-8.14.4" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.12.1.tgz"; - sha512 = "55wCxlKwRsYCt8uWB65C0xiJ4bP43UE3b/GK01ekyz2fZ11mudMWGMrX/pdKwGIOXFfFqDz3DCRxFs+fHS58oA=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.14.4.tgz"; + sha512 = "JHZOpCJzN6fPBapBOvoeMxZbr0ZA11ZAkwcqM4w0lKoacbi6TwK8GIYf66hHvwLmMeav75TNXWE6aPTvBLMMqA=="; }; }; - "@cspell/cspell-json-reporter-8.12.1" = { + "@cspell/cspell-json-reporter-8.14.4" = { name = "_at_cspell_slash_cspell-json-reporter"; packageName = "@cspell/cspell-json-reporter"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.12.1.tgz"; - sha512 = "nO/3GTk3rBpLRBzkmcKFxbtEDd3FKXfQ5uTCpJ27XYVHYjlU+d4McOYYMClMhpFianVol2JCyberpGAj6bVgLg=="; + url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.14.4.tgz"; + sha512 = "gJ6tQbGCNLyHS2iIimMg77as5MMAFv3sxU7W6tjLlZp8htiNZS7fS976g24WbT/hscsTT9Dd0sNHkpo8K3nvVw=="; }; }; - "@cspell/cspell-pipe-8.12.1" = { + "@cspell/cspell-pipe-8.14.4" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.12.1.tgz"; - sha512 = "lh0zIm43r/Fj3sQWXc68msKnXNrfPOo8VvzL1hOP0v/j2eH61fvELH08/K+nQJ8cCutNZ4zhk9+KMDU4KmsMtw=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.14.4.tgz"; + sha512 = "CLLdouqfrQ4rqdQdPu0Oo+HHCU/oLYoEsK1nNPb28cZTFxnn0cuSPKB6AMPBJmMwdfJ6fMD0BCKNbEe1UNLHcw=="; }; }; - "@cspell/cspell-resolver-8.12.1" = { + "@cspell/cspell-resolver-8.14.4" = { name = "_at_cspell_slash_cspell-resolver"; packageName = "@cspell/cspell-resolver"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.12.1.tgz"; - sha512 = "3HE04m7DS/6xYpWPN2QBGCHr26pvxHa78xYk+PjiPD2Q49ceqTNdFcZOYd+Wba8HbRXSukchSLhrTujmPEzqpw=="; + url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.14.4.tgz"; + sha512 = "s3uZyymJ04yn8+zlTp7Pt1WRSlAel6XVo+iZRxls3LSvIP819KK64DoyjCD2Uon0Vg9P/K7aAPt8GcxDcnJtgA=="; }; }; - "@cspell/cspell-service-bus-8.12.1" = { + "@cspell/cspell-service-bus-8.14.4" = { name = "_at_cspell_slash_cspell-service-bus"; packageName = "@cspell/cspell-service-bus"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.12.1.tgz"; - sha512 = "UQPddS38dQ/FG00y2wginCzdS6yxryiGrWXSD/P59idCrYYDCYnI9pPsx4u10tmRkW1zJ+O7gGCsXw7xa5DAJQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.14.4.tgz"; + sha512 = "i3UG+ep63akNsDXZrtGgICNF3MLBHtvKe/VOIH6+L+NYaAaVHqqQvOY9MdUwt1HXh8ElzfwfoRp36wc5aAvt6g=="; }; }; - "@cspell/cspell-types-8.12.1" = { + "@cspell/cspell-types-8.14.4" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.12.1.tgz"; - sha512 = "17POyyRgl7m7mMuv1qk2xX6E5bdT0F3247vloBCdUMyaVtmtN4uEiQ/jqU5vtW02vxlKjKS0HcTvKz4EVfSlzQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.14.4.tgz"; + sha512 = "VXwikqdHgjOVperVVCn2DOe8W3rPIswwZtMHfRYnagpzZo/TOntIjkXPJSfTtl/cFyx5DnCBsDH8ytKGlMeHkw=="; }; }; "@cspell/dict-ada-4.0.2" = { @@ -3244,13 +3190,13 @@ let sha512 = "K21CfB4ZpKYwwDQiPfic2zJA/uxkbsd4IQGejEvDAhE3z8wBs6g6BwwqdVO767M9NgZqc021yAVpr79N5pWe3w=="; }; }; - "@cspell/dict-aws-4.0.3" = { + "@cspell/dict-aws-4.0.4" = { name = "_at_cspell_slash_dict-aws"; packageName = "@cspell/dict-aws"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.3.tgz"; - sha512 = "0C0RQ4EM29fH0tIYv+EgDQEum0QI6OrmjENC9u98pB8UcnYxGG/SqinuPxo+TgcEuInj0Q73MsBpJ1l5xUnrsw=="; + url = "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.4.tgz"; + sha512 = "6AWI/Kkf+RcX/J81VX8+GKLeTgHWEr/OMhGk3dHQzWK66RaqDJCGDqi7494ghZKcBB7dGa3U5jcKw2FZHL/u3w=="; }; }; "@cspell/dict-bash-1.0.18" = { @@ -3262,13 +3208,13 @@ let sha512 = "kJIqQ+FD2TCSgaaP5XLEDgy222+pVWTc+VhveNO++gnTWU3BCVjkD5LjfW7g/CmGONnz+nwXDueWspProaSdJw=="; }; }; - "@cspell/dict-bash-4.1.3" = { + "@cspell/dict-bash-4.1.4" = { name = "_at_cspell_slash_dict-bash"; packageName = "@cspell/dict-bash"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-4.1.3.tgz"; - sha512 = "tOdI3QVJDbQSwPjUkOiQFhYcu2eedmX/PtEpVWg0aFps/r6AyjUQINtTgpqMYnYuq8O1QUIQqnpx21aovcgZCw=="; + url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-4.1.4.tgz"; + sha512 = "W/AHoQcJYn3Vn/tUiXX2+6D/bhfzdDshwcbQWv9TdiNlXP9P6UJjDKWbxyA5ogJCsR2D0X9Kx11oV8E58siGKQ=="; }; }; "@cspell/dict-companies-1.0.40" = { @@ -3280,13 +3226,13 @@ let sha512 = "Aw07qiTroqSST2P5joSrC4uOA05zTXzI2wMb+me3q4Davv1D9sCkzXY0TGoC2vzhNv5ooemRi9KATGaBSdU1sw=="; }; }; - "@cspell/dict-companies-3.1.3" = { + "@cspell/dict-companies-3.1.4" = { name = "_at_cspell_slash_dict-companies"; packageName = "@cspell/dict-companies"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.1.3.tgz"; - sha512 = "qaAmfKtQLA7Sbe9zfFVpcwyG92cx6+EiWIpPURv11Ng2QMv2PKhYcterUJBooAvgqD0/qq+AsLN8MREloY5Mdw=="; + url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.1.4.tgz"; + sha512 = "y9e0amzEK36EiiKx3VAA+SHQJPpf2Qv5cCt5eTUSggpTkiFkCh6gRKQ97rVlrKh5GJrqinDwYIJtTsxuh2vy2Q=="; }; }; "@cspell/dict-cpp-1.1.40" = { @@ -3298,13 +3244,13 @@ let sha512 = "sscfB3woNDNj60/yGXAdwNtIRWZ89y35xnIaJVDMk5TPMMpaDvuk0a34iOPIq0g4V+Y8e3RyAg71SH6ADwSjGw=="; }; }; - "@cspell/dict-cpp-5.1.12" = { + "@cspell/dict-cpp-5.1.16" = { name = "_at_cspell_slash_dict-cpp"; packageName = "@cspell/dict-cpp"; - version = "5.1.12"; + version = "5.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.1.12.tgz"; - sha512 = "6lXLOFIa+k/qBcu0bjaE/Kc6v3sh9VhsDOXD1Dalm3zgd0QIMjp5XBmkpSdCAK3pWCPV0Se7ysVLDfCea1BuXg=="; + url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.1.16.tgz"; + sha512 = "32fU5RkuOM55IRcxjByiSoKbjr+C4danDfYjHaQNRWdvjzJzci3fLDGA2wTXiclkgDODxGiV8LCTUwCz+3TNWA=="; }; }; "@cspell/dict-cryptocurrencies-1.0.10" = { @@ -3352,22 +3298,22 @@ let sha512 = "HU8RbFRoGanFH85mT01Ot/Ay48ixr/gG25VPLtdq56QTrmPsw79gxYm/5Qay16eQbpoPIxaj5CAWNam+DX4GbA=="; }; }; - "@cspell/dict-css-4.0.12" = { + "@cspell/dict-css-4.0.13" = { name = "_at_cspell_slash_dict-css"; packageName = "@cspell/dict-css"; - version = "4.0.12"; + version = "4.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.12.tgz"; - sha512 = "vGBgPM92MkHQF5/2jsWcnaahOZ+C6OE/fPvd5ScBP72oFY9tn5GLuomcyO0z8vWCr2e0nUSX1OGimPtcQAlvSw=="; + url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.13.tgz"; + sha512 = "WfOQkqlAJTo8eIQeztaH0N0P+iF5hsJVKFuhy4jmARPISy8Efcv8QXk2/IVbmjJH0/ZV7dKRdnY5JFVXuVz37g=="; }; }; - "@cspell/dict-dart-2.0.3" = { + "@cspell/dict-dart-2.2.1" = { name = "_at_cspell_slash_dict-dart"; packageName = "@cspell/dict-dart"; - version = "2.0.3"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.0.3.tgz"; - sha512 = "cLkwo1KT5CJY5N5RJVHks2genFkNCl/WLfj+0fFjqNR+tk3tBI1LY7ldr9piCtSFSm4x9pO1x6IV3kRUY1lLiw=="; + url = "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.2.1.tgz"; + sha512 = "yriKm7QkoPx3JPSSOcw6iX9gOb2N50bOo/wqWviqPYbhpMRh9Xiv6dkUy3+ot+21GuShZazO8X6U5+Vw67XEwg=="; }; }; "@cspell/dict-data-science-2.0.1" = { @@ -3415,13 +3361,13 @@ let sha512 = "9H9vXrgJB4KF8xsyTToXO53cXD33iyfrpT4mhCds+YLUw3P3x3E9myszgJzshnrxYBvQZ+QMII57Qr6SjZVk4Q=="; }; }; - "@cspell/dict-dotnet-5.0.2" = { + "@cspell/dict-dotnet-5.0.5" = { name = "_at_cspell_slash_dict-dotnet"; packageName = "@cspell/dict-dotnet"; - version = "5.0.2"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-5.0.2.tgz"; - sha512 = "UD/pO2A2zia/YZJ8Kck/F6YyDSpCMq0YvItpd4YbtDVzPREfTZ48FjZsbYi4Jhzwfvc6o8R56JusAE58P+4sNQ=="; + url = "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-5.0.5.tgz"; + sha512 = "gjg0L97ee146wX47dnA698cHm85e7EOpf9mVrJD8DmEaqoo/k1oPy2g7c7LgKxK9XnqwoXxhLNnngPrwXOoEtQ=="; }; }; "@cspell/dict-elixir-1.0.26" = { @@ -3442,13 +3388,13 @@ let sha512 = "g+uKLWvOp9IEZvrIvBPTr/oaO6619uH/wyqypqvwpmnmpjcfi8+/hqZH8YNKt15oviK8k4CkINIqNhyndG9d9Q=="; }; }; - "@cspell/dict-en-common-misspellings-2.0.3" = { + "@cspell/dict-en-common-misspellings-2.0.4" = { name = "_at_cspell_slash_dict-en-common-misspellings"; packageName = "@cspell/dict-en-common-misspellings"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.0.3.tgz"; - sha512 = "8nF1z9nUiSgMyikL66HTbDO7jCGtB24TxKBasXIBwkBKMDZgA2M883iXdeByy6m1JJUcCGFkSftVYp2W0bUgjw=="; + url = "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.0.4.tgz"; + sha512 = "lvOiRjV/FG4pAGZL3PN2GCVHSTCE92cwhfLGGkOsQtxSmef6WCHfHwp9auafkBlX0yFQSKDfq6/TlpQbjbJBtQ=="; }; }; "@cspell/dict-en-gb-1.1.33" = { @@ -3496,6 +3442,15 @@ let sha512 = "IBi8eIVdykoGgIv5wQhOURi5lmCNJq0we6DvqKoPQJHthXbgsuO1qrHSiUVydMiQl/XvcnUWTMeAlVUlUClnVg=="; }; }; + "@cspell/dict-flutter-1.0.0" = { + name = "_at_cspell_slash_dict-flutter"; + packageName = "@cspell/dict-flutter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-flutter/-/dict-flutter-1.0.0.tgz"; + sha512 = "W7k1VIc4KeV8BjEBxpA3cqpzbDWjfb7oXkEb0LecBCBp5Z7kcfnjT1YVotTx/U9PGyAOBhDaEdgZACVGNQhayw=="; + }; + }; "@cspell/dict-fonts-1.0.14" = { name = "_at_cspell_slash_dict-fonts"; packageName = "@cspell/dict-fonts"; @@ -3568,13 +3523,13 @@ let sha512 = "qq3Cjnx2U1jpeWAGJL1GL0ylEhUMqyaR36Xij6Y6Aq4bViCRp+HRRqk0x5/IHHbOrti45h3yy7ii1itRFo+Xkg=="; }; }; - "@cspell/dict-golang-6.0.9" = { + "@cspell/dict-golang-6.0.12" = { name = "_at_cspell_slash_dict-golang"; packageName = "@cspell/dict-golang"; - version = "6.0.9"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.9.tgz"; - sha512 = "etDt2WQauyEQDA+qPS5QtkYTb2I9l5IfQftAllVoB1aOrT6bxxpHvMEpJ0Hsn/vezxrCqa/BmtUbRxllIxIuSg=="; + url = "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.12.tgz"; + sha512 = "LEPeoqd+4O+vceHF73S7D7+LYfrAjOvp4Dqzh4MT30ruzlQ77yHRSuYOJtrFN1GK5ntAt/ILSVOKg9sgsz1Llg=="; }; }; "@cspell/dict-google-1.0.1" = { @@ -3775,13 +3730,13 @@ let sha512 = "RwkuZGcYBxL3Yux3cSG/IOWGlQ1e9HLCpHeyMtTVGYKAIkFAVUnGrz20l16/Q7zUG7IEktBz5O42kAozrEnqMQ=="; }; }; - "@cspell/dict-npm-5.0.18" = { + "@cspell/dict-npm-5.1.5" = { name = "_at_cspell_slash_dict-npm"; packageName = "@cspell/dict-npm"; - version = "5.0.18"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.18.tgz"; - sha512 = "weMTyxWpzz19q4wv9n183BtFvdD5fCjtze+bFKpl+4rO/YlPhHL2cXLAeexJz/VDSBecwX4ybTZYoknd1h2J4w=="; + url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.1.5.tgz"; + sha512 = "oAOGWuJYU3DlO+cAsStKMWN8YEkBue25cRC9EwdiL5Z84nchU20UIoYrLfIQejMlZca+1GyrNeyxRAgn4KiivA=="; }; }; "@cspell/dict-php-1.0.25" = { @@ -3793,13 +3748,13 @@ let sha512 = "RoBIP5MRdByyPaXcznZMfOY1JdCMYPPLua5E9gkq0TJO7bX5mC9hyAKfYBSWVQunZydd82HZixjb5MPkDFU1uw=="; }; }; - "@cspell/dict-php-4.0.8" = { + "@cspell/dict-php-4.0.10" = { name = "_at_cspell_slash_dict-php"; packageName = "@cspell/dict-php"; - version = "4.0.8"; + version = "4.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.0.8.tgz"; - sha512 = "TBw3won4MCBQ2wdu7kvgOCR3dY2Tb+LJHgDUpuquy3WnzGiSDJ4AVelrZdE1xu7mjFJUr4q48aB21YT5uQqPZA=="; + url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.0.10.tgz"; + sha512 = "NfTZdp6kcZDF1PvgQ6cY0zE4FUO5rSwNmBH/iwCBuaLfJAFQ97rgjxo+D2bic4CFwNjyHutnHPtjJBRANO5XQw=="; }; }; "@cspell/dict-powershell-1.0.19" = { @@ -3811,22 +3766,22 @@ let sha512 = "zF/raM/lkhXeHf4I43OtK0gP9rBeEJFArscTVwLWOCIvNk21MJcNoTYoaGw+c056+Q+hJL0psGLO7QN+mxYH1A=="; }; }; - "@cspell/dict-powershell-5.0.5" = { + "@cspell/dict-powershell-5.0.8" = { name = "_at_cspell_slash_dict-powershell"; packageName = "@cspell/dict-powershell"; - version = "5.0.5"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.5.tgz"; - sha512 = "3JVyvMoDJesAATYGOxcUWPbQPUvpZmkinV3m8HL1w1RrjeMVXXuK7U1jhopSneBtLhkU+9HKFwgh9l9xL9mY2Q=="; + url = "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.8.tgz"; + sha512 = "Eg64BccQp5oEJ+V/O2G27KaLWmuOL2AWMOs2470adUihOleRfW8j9XwAEGCS+JKSnDb2mksWA72Z6kDqH138IQ=="; }; }; - "@cspell/dict-public-licenses-2.0.7" = { + "@cspell/dict-public-licenses-2.0.8" = { name = "_at_cspell_slash_dict-public-licenses"; packageName = "@cspell/dict-public-licenses"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.7.tgz"; - sha512 = "KlBXuGcN3LE7tQi/GEqKiDewWGGuopiAD0zRK1QilOx5Co8XAvs044gk4MNIQftc8r0nHeUI+irJKLGcR36DIQ=="; + url = "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.8.tgz"; + sha512 = "Sup+tFS7cDV0fgpoKtUqEZ6+fA/H+XUgBiqQ/Fbs6vUE3WCjJHOIVsP+udHuyMH7iBfJ4UFYOYeORcY4EaKdMg=="; }; }; "@cspell/dict-python-1.0.38" = { @@ -3838,13 +3793,13 @@ let sha512 = "KuyOQaby9NID/pn7EkXilpUxjVIvvyLzhr7BPsDS6FcvUE8Yhss6bJowEDHSv6pa+W2387phoqbDf2rTicquAA=="; }; }; - "@cspell/dict-python-4.2.3" = { + "@cspell/dict-python-4.2.6" = { name = "_at_cspell_slash_dict-python"; packageName = "@cspell/dict-python"; - version = "4.2.3"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.3.tgz"; - sha512 = "C1CPX9wwEGgcHv/p7KfjuIOp1G6KNyx5gWYweAd6/KPv+ZpeM1v572zFUTmpO8WDuAfKFf00nqYL8/GmCENWBw=="; + url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.6.tgz"; + sha512 = "Hkz399qDGEbfXi9GYa2hDl7GahglI86JmS2F1KP8sfjLXofUgtnknyC5NWc86nzHcP38pZiPqPbTigyDYw5y8A=="; }; }; "@cspell/dict-r-2.0.1" = { @@ -3865,13 +3820,13 @@ let sha512 = "I76hJA///lc1pgmDTGUFHN/O8KLIZIU/8TgIYIGI6Ix/YzSEvWNdQYbANn6JbCynS0X+7IbZ2Ft+QqvmGtIWuA=="; }; }; - "@cspell/dict-ruby-5.0.2" = { + "@cspell/dict-ruby-5.0.3" = { name = "_at_cspell_slash_dict-ruby"; packageName = "@cspell/dict-ruby"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.0.2.tgz"; - sha512 = "cIh8KTjpldzFzKGgrqUX4bFyav5lC52hXDKo4LbRuMVncs3zg4hcSf4HtURY+f2AfEZzN6ZKzXafQpThq3dl2g=="; + url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.0.3.tgz"; + sha512 = "V1xzv9hN6u8r6SM4CkYdsxs4ov8gjXXo0Twfx5kWhLXbEVxTXDMt7ohLTqpy2XlF5mutixZdbHMeFiAww8v+Ug=="; }; }; "@cspell/dict-rust-1.0.23" = { @@ -3919,22 +3874,22 @@ let sha512 = "pfF3Ys2gRffu5ElqkH7FQMDMi/iZMyOzpGMb3FSH0PJ2AnRQ5rRNWght1h2L36YxvXl0mWVaFrrfwiOyRIc8ZQ=="; }; }; - "@cspell/dict-software-terms-4.0.3" = { + "@cspell/dict-software-terms-4.1.4" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "4.0.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-4.0.3.tgz"; - sha512 = "65QAVMc3YlcI7PcqWRY5ox53tTWC8aktUZdJYCVs4VDBPUCTSDnTSmSreeg4F5Z468clv9KF/S0PkxbLjgW72A=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-4.1.4.tgz"; + sha512 = "AHS25sYEzWze/aFglp9ODKSu+phjkuGx+OLwIcmOnvyn8axtSq5GCn9UqS4XG1/Qn0UG2Lgb4i5PJbZ0QNPNXQ=="; }; }; - "@cspell/dict-sql-2.1.3" = { + "@cspell/dict-sql-2.1.5" = { name = "_at_cspell_slash_dict-sql"; packageName = "@cspell/dict-sql"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.1.3.tgz"; - sha512 = "SEyTNKJrjqD6PAzZ9WpdSu6P7wgdNtGV2RV8Kpuw1x6bV+YsSptuClYG+JSdRExBTE6LwIe1bTklejUp3ZP8TQ=="; + url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.1.5.tgz"; + sha512 = "FmxanytHXss7GAWAXmgaxl3icTCW7YxlimyOSPNfm+njqeUDjw3kEv4mFNDDObBJv8Ec5AWCbUDkWIpkE3IpKg=="; }; }; "@cspell/dict-svelte-1.0.2" = { @@ -3955,13 +3910,13 @@ let sha512 = "gxrCMUOndOk7xZFmXNtkCEeroZRnS2VbeaIPiymGRHj5H+qfTAzAKxtv7jJbVA3YYvEzWcVE2oKDP4wcbhIERw=="; }; }; - "@cspell/dict-terraform-1.0.0" = { + "@cspell/dict-terraform-1.0.1" = { name = "_at_cspell_slash_dict-terraform"; packageName = "@cspell/dict-terraform"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-terraform/-/dict-terraform-1.0.0.tgz"; - sha512 = "Ak+vy4HP/bOgzf06BAMC30+ZvL9mzv21xLM2XtfnBLTDJGdxlk/nK0U6QT8VfFLqJ0ZZSpyOxGsUebWDCTr/zQ=="; + url = "https://registry.npmjs.org/@cspell/dict-terraform/-/dict-terraform-1.0.1.tgz"; + sha512 = "29lmUUnZgPh+ieZ5hunick8hzNIpNRtiJh9vAusNskPCrig3RTW6u7F+GG1a8uyslbzSw+Irjf40PTOan1OJJA=="; }; }; "@cspell/dict-typescript-1.0.20" = { @@ -3991,31 +3946,40 @@ let sha512 = "niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A=="; }; }; - "@cspell/dynamic-import-8.12.1" = { + "@cspell/dynamic-import-8.14.4" = { name = "_at_cspell_slash_dynamic-import"; packageName = "@cspell/dynamic-import"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.12.1.tgz"; - sha512 = "18faXHALiMsXtG3v67qeyDhNRZVtkhX5Je2qw8iZQB/i61y0Mfm22iiZeXsKImrXbwP0acyhRkRA1sp1NaQmOw=="; + url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.14.4.tgz"; + sha512 = "GjKsBJvPXp4dYRqsMn7n1zpnKbnpfJnlKLOVeoFBh8fi4n06G50xYr+G25CWX1WT3WFaALAavvVICEUPrVsuqg=="; }; }; - "@cspell/strong-weak-map-8.12.1" = { + "@cspell/filetypes-8.14.4" = { + name = "_at_cspell_slash_filetypes"; + packageName = "@cspell/filetypes"; + version = "8.14.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-8.14.4.tgz"; + sha512 = "qd68dD7xTA4Mnf/wjIKYz2SkiTBshIM+yszOUtLa06YJm0aocoNQ25FHXyYEQYm9NQXCYnRWWA02sFMGs8Sv/w=="; + }; + }; + "@cspell/strong-weak-map-8.14.4" = { name = "_at_cspell_slash_strong-weak-map"; packageName = "@cspell/strong-weak-map"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.12.1.tgz"; - sha512 = "0O5qGHRXoKl0+hXGdelox2awrCMr8LXObUcWwYbSih7HIm4DwhxMO4qjDFye1NdjW0P88yhpQ23J2ceSto9C5Q=="; + url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.14.4.tgz"; + sha512 = "Uyfck64TfVU24wAP3BLGQ5EsAfzIZiLfN90NhttpEM7GlOBmbGrEJd4hNOwfpYsE/TT80eGWQVPRTLr5SDbXFA=="; }; }; - "@cspell/url-8.12.1" = { + "@cspell/url-8.14.4" = { name = "_at_cspell_slash_url"; packageName = "@cspell/url"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/url/-/url-8.12.1.tgz"; - sha512 = "mUYaDniHVLw0YXn2egT2e21MYubMAf+1LDeC0kkbg4VWNxSlC1Ksyv6pqhos495esaa8OCjizdIdnGSF6al9Rw=="; + url = "https://registry.npmjs.org/@cspell/url/-/url-8.14.4.tgz"; + sha512 = "htHhNF8WrM/NfaLSWuTYw0NqVgFRVHYSyHlRT3i/Yv5xvErld8Gw7C6ldm+0TLjoGlUe6X1VV72JSir7+yLp/Q=="; }; }; "@cspotcode/source-map-support-0.8.1" = { @@ -4261,13 +4225,13 @@ let sha512 = "F4jbnDn4yIZjmky1FZ6rgBKTM05AZQQfHkyJW2hdS4pDKJjdKAqWytoZKDi1/S6Cr6tN+DD0TFGD3V0i6HPHYQ=="; }; }; - "@electron/asar-3.2.10" = { + "@electron/asar-3.2.13" = { name = "_at_electron_slash_asar"; packageName = "@electron/asar"; - version = "3.2.10"; + version = "3.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/asar/-/asar-3.2.10.tgz"; - sha512 = "mvBSwIBUeiRscrCeJE1LwctAriBj65eUDm0Pc11iE5gRwzkmsdbS7FnZ1XUWjpSeQWL1L5g12Fc/SchPM9DUOw=="; + url = "https://registry.npmjs.org/@electron/asar/-/asar-3.2.13.tgz"; + sha512 = "pY5z2qQSwbFzJsBdgfJIzXf5ElHTVMutC2dxh0FD60njknMu3n1NnTABOcQwbb5/v5soqE79m9UjaJryBf3epg=="; }; }; "@electron/get-3.1.0" = { @@ -4279,13 +4243,13 @@ let sha512 = "F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ=="; }; }; - "@electron/notarize-2.3.2" = { + "@electron/notarize-2.5.0" = { name = "_at_electron_slash_notarize"; packageName = "@electron/notarize"; - version = "2.3.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/notarize/-/notarize-2.3.2.tgz"; - sha512 = "zfayxCe19euNwRycCty1C7lF7snk9YwfRpB5M8GLr1a4ICH63znxaPNAubrMvj0yDvVozqfgsdYpXVUnpWBDpg=="; + url = "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz"; + sha512 = "jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A=="; }; }; "@electron/osx-sign-1.3.1" = { @@ -4297,13 +4261,13 @@ let sha512 = "BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw=="; }; }; - "@electron/packager-18.3.3" = { + "@electron/packager-18.3.5" = { name = "_at_electron_slash_packager"; packageName = "@electron/packager"; - version = "18.3.3"; + version = "18.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/packager/-/packager-18.3.3.tgz"; - sha512 = "hGXzwbUdxv49XvlYwlVPC6W6j6WaXUAzKkYyyTeiwdhxvHFMfQSEJxVHsQpqMFzZZ7wrr7iqiokOFZ/qkgEzUQ=="; + url = "https://registry.npmjs.org/@electron/packager/-/packager-18.3.5.tgz"; + sha512 = "ClgTxXTt3MesWAcjIxIkgxELjTcllw1FRoVsihP7uT48kpDMqI71p4XvnMWbq8PvU57TcrKICAaLkxRhbc+/wQ=="; }; }; "@electron/rebuild-3.6.0" = { @@ -4333,33 +4297,6 @@ let sha512 = "OqVSdAe+/88fIjvTDWiy+5Ho1nXsiBhE5RTsIQ6M/zcxcDAEP2TlQCkOyusItnmzXRN+XTFaK9gKhiZ6KGyXQw=="; }; }; - "@emmetio/abbreviation-2.3.3" = { - name = "_at_emmetio_slash_abbreviation"; - packageName = "@emmetio/abbreviation"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz"; - sha512 = "mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA=="; - }; - }; - "@emmetio/css-abbreviation-2.1.8" = { - name = "_at_emmetio_slash_css-abbreviation"; - packageName = "@emmetio/css-abbreviation"; - version = "2.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz"; - sha512 = "s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw=="; - }; - }; - "@emmetio/css-parser-0.4.0" = { - name = "_at_emmetio_slash_css-parser"; - packageName = "@emmetio/css-parser"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@emmetio/css-parser/-/css-parser-0.4.0.tgz"; - sha512 = "z7wkxRSZgrQHXVzObGkXG+Vmj3uRlpM11oCZ9pbaz0nFejvCDmAiNDpY75+wgXOcffKpj4rzGtwGaZxfJKsJxw=="; - }; - }; "@emmetio/extract-abbreviation-0.1.6" = { name = "_at_emmetio_slash_extract-abbreviation"; packageName = "@emmetio/extract-abbreviation"; @@ -4369,42 +4306,6 @@ let sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; }; }; - "@emmetio/html-matcher-1.3.0" = { - name = "_at_emmetio_slash_html-matcher"; - packageName = "@emmetio/html-matcher"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@emmetio/html-matcher/-/html-matcher-1.3.0.tgz"; - sha512 = "NTbsvppE5eVyBMuyGfVu2CRrLvo7J4YHb6t9sBFLyY03WYhXET37qA4zOYUjBWFCRHO7pS1B9khERtY0f5JXPQ=="; - }; - }; - "@emmetio/scanner-1.0.4" = { - name = "_at_emmetio_slash_scanner"; - packageName = "@emmetio/scanner"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.4.tgz"; - sha512 = "IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA=="; - }; - }; - "@emmetio/stream-reader-2.2.0" = { - name = "_at_emmetio_slash_stream-reader"; - packageName = "@emmetio/stream-reader"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz"; - sha512 = "fXVXEyFA5Yv3M3n8sUGT7+fvecGrZP4k6FnWWMSZVQf69kAq0LLpaBQLGcPR30m3zMmKYhECP4k/ZkzvhEW5kw=="; - }; - }; - "@emmetio/stream-reader-utils-0.1.0" = { - name = "_at_emmetio_slash_stream-reader-utils"; - packageName = "@emmetio/stream-reader-utils"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@emmetio/stream-reader-utils/-/stream-reader-utils-0.1.0.tgz"; - sha512 = "ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A=="; - }; - }; "@emnapi/core-1.2.0" = { name = "_at_emnapi_slash_core"; packageName = "@emnapi/core"; @@ -4639,22 +4540,13 @@ let sha512 = "1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA=="; }; }; - "@eslint-community/regexpp-4.11.0" = { + "@eslint-community/regexpp-4.11.1" = { name = "_at_eslint-community_slash_regexpp"; packageName = "@eslint-community/regexpp"; - version = "4.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz"; - sha512 = "G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A=="; - }; - }; - "@eslint/config-array-0.17.1" = { - name = "_at_eslint_slash_config-array"; - packageName = "@eslint/config-array"; - version = "0.17.1"; + version = "4.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz"; - sha512 = "BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA=="; + url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz"; + sha512 = "m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q=="; }; }; "@eslint/eslintrc-0.4.3" = { @@ -4675,40 +4567,13 @@ let sha512 = "269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ=="; }; }; - "@eslint/eslintrc-3.1.0" = { - name = "_at_eslint_slash_eslintrc"; - packageName = "@eslint/eslintrc"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz"; - sha512 = "4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ=="; - }; - }; - "@eslint/js-8.57.0" = { - name = "_at_eslint_slash_js"; - packageName = "@eslint/js"; - version = "8.57.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz"; - sha512 = "Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g=="; - }; - }; - "@eslint/js-9.7.0" = { + "@eslint/js-8.57.1" = { name = "_at_eslint_slash_js"; packageName = "@eslint/js"; - version = "9.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-9.7.0.tgz"; - sha512 = "ChuWDQenef8OSFnvuxv0TCVxEwmu3+hPNKvM9B34qpM0rDRbjL8t5QkQeHHeAfsKQjuH9wS82WeCi1J/owatng=="; - }; - }; - "@eslint/object-schema-2.1.4" = { - name = "_at_eslint_slash_object-schema"; - packageName = "@eslint/object-schema"; - version = "2.1.4"; + version = "8.57.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz"; - sha512 = "BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ=="; + url = "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz"; + sha512 = "d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q=="; }; }; "@ethereumjs/rlp-4.0.1" = { @@ -4756,13 +4621,13 @@ let sha512 = "V8gMy1C63oAYlvkSjhfGYOET7sOmRIUAYv/wVcKJZiVAMZ5MQ2geeXCpLGC4+vuOQe2Hs3+qAgl4y0/b8OUO+A=="; }; }; - "@expo/apple-utils-1.7.1" = { + "@expo/apple-utils-1.8.0" = { name = "_at_expo_slash_apple-utils"; packageName = "@expo/apple-utils"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-1.7.1.tgz"; - sha512 = "oKHKRMfpPsVIlMSwHsartqrFhxKR1PnwGzaM3i+d4/g9XE9A+bKMu5YIUT4IXX561E0YYoaeaRHuxiIzcmEmRw=="; + url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-1.8.0.tgz"; + sha512 = "JKGfPCCGko7GtLcvCj9VeyrSJGimgWsBJnR4G10kGY9sUQo3ykEgVrUBUaG2HJrCLzbeDUExmsbuZRWqJha77g=="; }; }; "@expo/bunyan-4.0.0" = { @@ -4774,6 +4639,15 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; + "@expo/bunyan-4.0.1" = { + name = "_at_expo_slash_bunyan"; + packageName = "@expo/bunyan"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/bunyan/-/bunyan-4.0.1.tgz"; + sha512 = "+Lla7nYSiHZirgK+U/uYzsLv/X+HaJienbD5AKX1UQZHYfWaP+9uuQluRB4GrEVWF0GZ7vEVp/jzaOT9k/SQlg=="; + }; + }; "@expo/cli-0.7.3" = { name = "_at_expo_slash_cli"; packageName = "@expo/cli"; @@ -4891,31 +4765,40 @@ let sha512 = "2A6/8uZADSKAtzyR6YqhCBUFxb5DFmjxmFn0EHMqnPnsh13ZSiKEjrZPrRkM6Li2EHLYqHK2rmweJ7O/7q9pPQ=="; }; }; - "@expo/devcert-1.1.2" = { + "@expo/devcert-1.1.4" = { name = "_at_expo_slash_devcert"; packageName = "@expo/devcert"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/devcert/-/devcert-1.1.2.tgz"; - sha512 = "FyWghLu7rUaZEZSTLt/XNRukm0c9GFfwP0iFaswoDWpV6alvVg+zRAfCLdIVQEz1SVcQ3zo1hMZFDrnKGvkCuQ=="; + url = "https://registry.npmjs.org/@expo/devcert/-/devcert-1.1.4.tgz"; + sha512 = "fqBODr8c72+gBSX5Ty3SIzaY4bXainlpab78+vEYEKL3fXmsOswMLf0+KE36mUEAa36BYabX7K3EiXOXX5OPMw=="; }; }; - "@expo/eas-build-job-1.0.119" = { + "@expo/eas-build-job-1.0.133" = { name = "_at_expo_slash_eas-build-job"; packageName = "@expo/eas-build-job"; - version = "1.0.119"; + version = "1.0.133"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.119.tgz"; - sha512 = "uWgriDXF/cKSKl62lqD0OnoCTtX8+s00te2KQ54S/tz3/LYfiE4JBRsLazQq9hIfz8JPEXwmfKN713BDeV/TOg=="; + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.133.tgz"; + sha512 = "dlY3tl1A0GDIGs4WOOuvK08jvR6cfXCmCKTCqZ9ioePscZ3jbeGmadLa1nTvMSe9k8vFdfrHgkKmfs78hI7sbw=="; }; }; - "@expo/eas-json-10.0.3" = { + "@expo/eas-json-12.0.0" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "10.0.3"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-10.0.3.tgz"; - sha512 = "eMgV1YuGP9bmGzB8+8tiJMcIiH2aEfwFwpqd1CqPs1gs5YPAQT/VmnkRIuC4DjWLuqhFr/fX9rO+yvOpr2MsIw=="; + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-12.0.0.tgz"; + sha512 = "ztI9aQ826/ej2i6Yg6SXnDNFI9CwGzvHD6+fnGl/uNAhcBQRwcQXYyFRRWiixItC5zSsRyTvZKTANTMwaNPaCw=="; + }; + }; + "@expo/env-0.3.0" = { + name = "_at_expo_slash_env"; + packageName = "@expo/env"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/env/-/env-0.3.0.tgz"; + sha512 = "OtB9XVHWaXidLbHvrVDeeXa09yvTl3+IQN884sO6PhIi2/StXfgSH/9zC7IvzrDB8kW3EBJ1PPLuCUJ2hxAT7Q=="; }; }; "@expo/fingerprint-0.6.1" = { @@ -5206,13 +5089,13 @@ let sha512 = "QdWi16+CHB9JYP7gma19OVVg0BFkvU8zNj9GjWorYI8Iv8FUxjOCcYRuAmX4s/h91e4e7BPsskc8cSrZYho9Ew=="; }; }; - "@expo/steps-1.0.119" = { + "@expo/steps-1.0.134" = { name = "_at_expo_slash_steps"; packageName = "@expo/steps"; - version = "1.0.119"; + version = "1.0.134"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/steps/-/steps-1.0.119.tgz"; - sha512 = "raPlBDsMkRO5pOlGDa9PnjgCIJdiDTgU92GtTML0UZ+hPiy5H7Vbx2JxqtqMiZcl21mxQ7V60toqdbo7DF5iJQ=="; + url = "https://registry.npmjs.org/@expo/steps/-/steps-1.0.134.tgz"; + sha512 = "9WZUhq1Jggipy+cTcN/pi92I911jaOS4VoEWjuKbhp5G5HU/oHBSfR3ZapEopA9N9xzBv9I/GYzRbPiMHPXaxw=="; }; }; "@expo/timeago.js-1.0.0" = { @@ -5296,31 +5179,31 @@ let sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; - "@gitbeaker/core-40.1.2" = { + "@gitbeaker/core-40.2.1" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "40.1.2"; + version = "40.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-40.1.2.tgz"; - sha512 = "KjP40EIdPWDX2w+GZUjgc5f9L/a0VsA6A2dkiKdH27m5BUpVrH3eHC3M0h1SsIA5edO3BiebqWFO2ipkGJCBZA=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-40.2.1.tgz"; + sha512 = "4RPpip70/NPo/3fx5TDrF88AwQxqK4OxzsheZnadhFM5O7YBp0lfkIH2c6zeMEwIRn2M5PleNK5mAe3qr00RQg=="; }; }; - "@gitbeaker/requester-utils-40.1.2" = { + "@gitbeaker/requester-utils-40.2.1" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "40.1.2"; + version = "40.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-40.1.2.tgz"; - sha512 = "s3c2TzJpBk3VGujEo/57+TAntg36kEhdob28i2kAEDztFWlNp0sfDT/jlDwUywKF6AbmYIJYe3FikLNyAiv+iA=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-40.2.1.tgz"; + sha512 = "GMawAsDEDioDxT4g5hFvzx7bwQq89s8vrf/jffRi35mcWgbtT1yr1m2QzURALsmsNC+H3ktRUCm7f9XtieNDwg=="; }; }; - "@gitbeaker/rest-40.1.2" = { + "@gitbeaker/rest-40.2.1" = { name = "_at_gitbeaker_slash_rest"; packageName = "@gitbeaker/rest"; - version = "40.1.2"; + version = "40.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-40.1.2.tgz"; - sha512 = "q9FYEC0SQcEbj1Hu+EOVFGRBjxbUFciK/iVD3BhBx+ZUGIPfHYS32EWL4uqVSBLq/zSUEd2gWjLy7LRVq/Pz3A=="; + url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-40.2.1.tgz"; + sha512 = "XVaNKa9ahqppSvyNsSayC6TILe4FvBla8zxytCpxZMjrLYLxMt7ny/QCltp9tP8ElDSITALsrKo/wLjab36YEQ=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -5368,13 +5251,13 @@ let sha512 = "gVnnlWs0Ua+5FkuHHEriFUOI3OIbHv6DS1utxf28n6NkfGMJldC4j0xlJRY0LS6dWK34IGYgD4HelKYz2l8KiA=="; }; }; - "@graphql-tools/delegate-10.0.16" = { + "@graphql-tools/delegate-10.0.21" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "10.0.16"; + version = "10.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-10.0.16.tgz"; - sha512 = "no4jIdHsTrHzR6Vv1YlwbxFeBnHBwPhBpemvLVnQ7CHhAviwIUWkCOHs4Uyzc5GYuHFyKJOZEXqhOz+da3hR3A=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-10.0.21.tgz"; + sha512 = "UytyYVvDfLQbCYG1aQo8Vc67c1WhEjzW9ytYKEEqMJSdlwfMCujHmCz7EyH5DNjTAKapDHuQcN5VivKGap/Beg=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -5386,13 +5269,13 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/executor-1.3.0" = { + "@graphql-tools/executor-1.3.1" = { name = "_at_graphql-tools_slash_executor"; packageName = "@graphql-tools/executor"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor/-/executor-1.3.0.tgz"; - sha512 = "e+rmEf/2EO4hDnbkO8mTS2FI+jGUNmYkSDKw5TgPVlO8VOKS+TXmJBK6E9v4Gc/39yVkZsffYfW/R8obJrA0mg=="; + url = "https://registry.npmjs.org/@graphql-tools/executor/-/executor-1.3.1.tgz"; + sha512 = "tgJDdGf9SCAm64ofEMZdv925u6/J+eTmv36TGNLxgP2DpCJsZ6gnJ4A+0D28EazDXqJIvMiPd+3d+o3cCRCAnQ=="; }; }; "@graphql-tools/executor-graphql-ws-1.2.0" = { @@ -5404,13 +5287,13 @@ let sha512 = "tSYC1QdrabWexLrYV0UI3uRGbde9WCY/bRhq6Jc+VXMZcfq6ea6pP5NEAVTfwbhUQ4xZvJABVVbKXtKb9uTg1w=="; }; }; - "@graphql-tools/executor-http-1.1.5" = { + "@graphql-tools/executor-http-1.1.6" = { name = "_at_graphql-tools_slash_executor-http"; packageName = "@graphql-tools/executor-http"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.1.5.tgz"; - sha512 = "ZAsVGUwafPc1GapLA1yoJuRx7ihpVdAv7JDHmlI2eHRQsJnMVQwcxHnjfUb/id9YAEBrP86/s4pgEoRyad3Zng=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.1.6.tgz"; + sha512 = "wGKjJzbi6em8cWI3sry6T7kAgoxMXYNM+KlbsWczPvIsHvv1cqXlrP1lwC6f7Ja1FfWdU1ZIEgOv93ext7IDyQ=="; }; }; "@graphql-tools/executor-legacy-ws-1.1.0" = { @@ -5530,22 +5413,22 @@ let sha512 = "BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg=="; }; }; - "@graphql-tools/merge-9.0.4" = { + "@graphql-tools/merge-9.0.7" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "9.0.4"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-9.0.4.tgz"; - sha512 = "MivbDLUQ+4Q8G/Hp/9V72hbn810IJDEZQ57F01sHnlrrijyadibfVhaQfW/pNH+9T/l8ySZpaR/DpL5i+ruZ+g=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-9.0.7.tgz"; + sha512 = "lbTrIuXIbUSmSumHkPRY1QX0Z8JEtmRhnIrkH7vkfeEmf0kNn/nCWvJwqokm5U7L+a+DA1wlRM4slIlbfXjJBA=="; }; }; - "@graphql-tools/schema-10.0.4" = { + "@graphql-tools/schema-10.0.6" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "10.0.4"; + version = "10.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-10.0.4.tgz"; - sha512 = "HuIwqbKxPaJujox25Ra4qwz0uQzlpsaBOzO6CVfzB/MemZdd+Gib8AIvfhQArK0YIN40aDran/yi+E5Xf0mQww=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-10.0.6.tgz"; + sha512 = "EIJgPRGzpvDFEjVp+RF1zNNYIC36BYuIeZ514jFoJnI6IdxyVyIRDLx/ykgMdaa1pKQerpfdqDnsF4JnZoDHSQ=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -5584,13 +5467,13 @@ let sha512 = "1dKp2K8UuFn7DFo1qX5c1cyazQv2h2ICwA9esHblEqCYrgf69Nk8N7SODmsfWg94OEaI74IqMoM12t7eIGwFzQ=="; }; }; - "@graphql-tools/utils-10.3.2" = { + "@graphql-tools/utils-10.5.4" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "10.3.2"; + version = "10.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.3.2.tgz"; - sha512 = "iaqOHS4f90KNADBHqVsRBjKpM6iSvsUg1q5GhWMK03loYLaDzftrEwcsl0OkSSnRhJvAsT7q4q3r3YzRoV0v1g=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.5.4.tgz"; + sha512 = "XHnyCWSlg1ccsD8s0y6ugo5GZ5TpkTiFVNPSYms5G0s6Z/xTuSmiLBfeqgkfaCwLmLaQnRCmNDL2JRnqc2R5bQ=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -5701,13 +5584,13 @@ let sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="; }; }; - "@hpcc-js/wasm-2.18.0" = { + "@hpcc-js/wasm-2.22.1" = { name = "_at_hpcc-js_slash_wasm"; packageName = "@hpcc-js/wasm"; - version = "2.18.0"; + version = "2.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.18.0.tgz"; - sha512 = "M9XVIvAXGH4Xcyb5UoiohWcn6fil89pcos/gClNdBZG2v+W48xSf2bjcA8BW131X/AFHUerVY28n1P1Jw81/9A=="; + url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.22.1.tgz"; + sha512 = "sqK8B5eMOC7T3eKBjYnstQw8UtSeKlcAu7iVraaSTmN8ZaaMSAYYFVYB1eOycm7qItF+WUlmjGCoZ8lCv6SEOg=="; }; }; "@httptoolkit/websocket-stream-6.0.1" = { @@ -5719,13 +5602,13 @@ let sha512 = "A0NOZI+Glp3Xgcz6Na7i7o09+/+xm2m0UCU8gdtM2nIv6/cjLmhMZMqehSpTlgbx9omtLmV8LVqOskPEyWnmZQ=="; }; }; - "@humanwhocodes/config-array-0.11.14" = { + "@humanwhocodes/config-array-0.13.0" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.11.14"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz"; - sha512 = "3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz"; + sha512 = "DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw=="; }; }; "@humanwhocodes/config-array-0.5.0" = { @@ -5764,15 +5647,6 @@ let sha512 = "93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA=="; }; }; - "@humanwhocodes/retry-0.3.0" = { - name = "_at_humanwhocodes_slash_retry"; - packageName = "@humanwhocodes/retry"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz"; - sha512 = "d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew=="; - }; - }; "@hutson/parse-repository-url-3.0.2" = { name = "_at_hutson_slash_parse-repository-url"; packageName = "@hutson/parse-repository-url"; @@ -5800,13 +5674,13 @@ let sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; - "@ibm-cloud/openapi-ruleset-1.18.2" = { + "@ibm-cloud/openapi-ruleset-1.22.0" = { name = "_at_ibm-cloud_slash_openapi-ruleset"; packageName = "@ibm-cloud/openapi-ruleset"; - version = "1.18.2"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-1.18.2.tgz"; - sha512 = "Nbdp0Bsadpx2zvwbFadukmtN5QvL8kC/a6V/OxTk9yEDQytfVOssnboZ76IA+OC+IpAehxwjj1EpEirBWIdQKw=="; + url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-1.22.0.tgz"; + sha512 = "LNSHES6dim74AYVmW5Myf4UQdS/PxdXXQPpaKcGahyY4iSXFwS7xR1944nkpt06ovbkwbuXuysi0v4EGrMGZcg=="; }; }; "@ibm-cloud/openapi-ruleset-utilities-1.3.2" = { @@ -5827,13 +5701,13 @@ let sha512 = "CifrkgQjDkUkWexmgYYNyB5603HhTHI91vLFeQXh6qrTKiCMVASol01Rs1cv6LP/A2WccZSRlJKZhbaBIs/9ZA=="; }; }; - "@inquirer/checkbox-2.4.2" = { + "@inquirer/checkbox-2.5.0" = { name = "_at_inquirer_slash_checkbox"; packageName = "@inquirer/checkbox"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.4.2.tgz"; - sha512 = "iZRNbTlSB9xXt/+jdMFViBdxw1ILWu3365rzfM5OLwAyOScbDFFGSH7LEUwoq1uOIo48ymOEwYSqP5y8hQMlmA=="; + url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.5.0.tgz"; + sha512 = "sMgdETOfi2dUHT8r7TT1BTKOwNvdDGFDXYWtQ2J69SvlYNntk9I/gJe7r5yvMwwsuKnYbuRs3pNhx4tgNck5aA=="; }; }; "@inquirer/confirm-2.0.17" = { @@ -5845,13 +5719,13 @@ let sha512 = "EqzhGryzmGpy2aJf6LxJVhndxYmFs+m8cxXzf8nejb1DE3sabf6mUgBcp4J0jAUEiAcYzqmkqRr7LPFh/WdnXA=="; }; }; - "@inquirer/confirm-3.1.17" = { + "@inquirer/confirm-3.2.0" = { name = "_at_inquirer_slash_confirm"; packageName = "@inquirer/confirm"; - version = "3.1.17"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.17.tgz"; - sha512 = "qCpt/AABzPynz8tr69VDvhcjwmzAryipWXtW8Vi6m651da4H/d0Bdn55LkxXD7Rp2gfgxvxzTdb66AhIA8gzBA=="; + url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.2.0.tgz"; + sha512 = "oOIwPs0Dvq5220Z8lGL/6LHRTEr9TgLHmiI99Rj1PJ1p1czTys+olrgBqZk4E2qC0YTzeHprxSQmoHioVdJ7Lw=="; }; }; "@inquirer/core-2.3.1" = { @@ -5872,13 +5746,13 @@ let sha512 = "fKi63Khkisgda3ohnskNf5uZJj+zXOaBvOllHsOkdsXRA/ubQLJQrZchFFi57NKbZzkTunXiBMdvWOv71alonw=="; }; }; - "@inquirer/core-9.0.5" = { + "@inquirer/core-9.2.1" = { name = "_at_inquirer_slash_core"; packageName = "@inquirer/core"; - version = "9.0.5"; + version = "9.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/core/-/core-9.0.5.tgz"; - sha512 = "QWG41I7vn62O9stYKg/juKXt1PEbr/4ZZCPb4KgXDQGwgA9M5NBTQ7FnOvT1ridbxkm/wTxLCNraUs7y47pIRQ=="; + url = "https://registry.npmjs.org/@inquirer/core/-/core-9.2.1.tgz"; + sha512 = "F2VBt7W/mwqEU4bL0RnHNZmC/OxzNx9cOYxHqnXX3MP6ruYvZUZAW9imgN9+h/uBT/oP8Gh888J2OZSbjSeWcg=="; }; }; "@inquirer/editor-1.2.15" = { @@ -5890,13 +5764,13 @@ let sha512 = "gQ77Ls09x5vKLVNMH9q/7xvYPT6sIs5f7URksw+a2iJZ0j48tVS6crLqm2ugG33tgXHIwiEqkytY60Zyh5GkJQ=="; }; }; - "@inquirer/editor-2.1.17" = { + "@inquirer/editor-2.2.0" = { name = "_at_inquirer_slash_editor"; packageName = "@inquirer/editor"; - version = "2.1.17"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/editor/-/editor-2.1.17.tgz"; - sha512 = "hwx3VpFQzOY2hFWnY+XPsUGCIUVQ5kYxH6+CExv/RbMiAoN3zXtzj8DyrWBOHami0vBrrnPS8CTq3uQWc7N2BA=="; + url = "https://registry.npmjs.org/@inquirer/editor/-/editor-2.2.0.tgz"; + sha512 = "9KHOpJ+dIL5SZli8lJ6xdaYLPPzB8xB9GZItg39MBybzhxA16vxmszmQFrRwbOA918WA2rvu8xhDEg/p6LXKbw=="; }; }; "@inquirer/expand-1.1.16" = { @@ -5908,22 +5782,22 @@ let sha512 = "TGLU9egcuo+s7PxphKUCnJnpCIVY32/EwPCLLuu+gTvYiD8hZgx8Z2niNQD36sa6xcfpdLY6xXDBiL/+g1r2XQ=="; }; }; - "@inquirer/expand-2.1.17" = { + "@inquirer/expand-2.3.0" = { name = "_at_inquirer_slash_expand"; packageName = "@inquirer/expand"; - version = "2.1.17"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/expand/-/expand-2.1.17.tgz"; - sha512 = "s4V/dC+GeE5s97xoTtZSmC440uNKePKqZgzqEf0XM63ciilnXAtKGvoAWOePFdlK+oGTz0d8bhbPKwpKGvRYfg=="; + url = "https://registry.npmjs.org/@inquirer/expand/-/expand-2.3.0.tgz"; + sha512 = "qnJsUcOGCSG1e5DTOErmv2BPQqrtT6uzqn1vI/aYGiPKq+FgslGZmtdnXbhuI7IlT7OByDoEEqdnhUnVR2hhLw=="; }; }; - "@inquirer/figures-1.0.5" = { + "@inquirer/figures-1.0.6" = { name = "_at_inquirer_slash_figures"; packageName = "@inquirer/figures"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.5.tgz"; - sha512 = "79hP/VWdZ2UVc9bFGJnoQ/lQMpL74mGgzSYX1xUqCVk7/v73vJCMw1VuyWN1jGkZ9B3z7THAbySqGbCNefcjfA=="; + url = "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.6.tgz"; + sha512 = "yfZzps3Cso2UbM7WlxKwZQh2Hs6plrbjs1QnzQDZhK2DgyCo6D8AaHps9olkNcUFlcYERMqU3uJSp1gmy3s/qQ=="; }; }; "@inquirer/input-1.2.16" = { @@ -5935,13 +5809,22 @@ let sha512 = "Ou0LaSWvj1ni+egnyQ+NBtfM1885UwhRCMtsRt2bBO47DoC1dwtCa+ZUNgrxlnCHHF0IXsbQHYtIIjFGAavI4g=="; }; }; - "@inquirer/input-2.2.4" = { + "@inquirer/input-2.3.0" = { name = "_at_inquirer_slash_input"; packageName = "@inquirer/input"; - version = "2.2.4"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/input/-/input-2.3.0.tgz"; + sha512 = "XfnpCStx2xgh1LIRqPXrTNEEByqQWoxsWYzNRSEUxJ5c6EQlhMogJ3vHKu8aXuTacebtaZzMAHwEL0kAflKOBw=="; + }; + }; + "@inquirer/number-1.1.0" = { + name = "_at_inquirer_slash_number"; + packageName = "@inquirer/number"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/input/-/input-2.2.4.tgz"; - sha512 = "wvYnDITPQn+ltktj/O9kQjPxOvpmwcpxLWh8brAyD+jlEbihxtrx9cZdZcxqaCVQj3caw4eZa2Uq5xELo4yXkA=="; + url = "https://registry.npmjs.org/@inquirer/number/-/number-1.1.0.tgz"; + sha512 = "ilUnia/GZUtfSZy3YEErXLJ2Sljo/mf9fiKc08n18DdwdmDbOzRcTv65H1jjDvlsAuvdFXf4Sa/aL7iw/NanVA=="; }; }; "@inquirer/password-1.1.16" = { @@ -5953,13 +5836,13 @@ let sha512 = "aZYZVHLUXZ2gbBot+i+zOJrks1WaiI95lvZCn1sKfcw6MtSSlYC8uDX8sTzQvAsQ8epHoP84UNvAIT0KVGOGqw=="; }; }; - "@inquirer/password-2.1.17" = { + "@inquirer/password-2.2.0" = { name = "_at_inquirer_slash_password"; packageName = "@inquirer/password"; - version = "2.1.17"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/password/-/password-2.1.17.tgz"; - sha512 = "/u6DM/fDHXoBWyA+9aRhghkeo5smE7wO9k4E2UoJbgiRCkt3JjBEuBqLOJNrz8E16M0ez4UM1vd5cXrmICHW+A=="; + url = "https://registry.npmjs.org/@inquirer/password/-/password-2.2.0.tgz"; + sha512 = "5otqIpgsPYIshqhgtEwSspBQE40etouR8VIxzpJkv9i0dVHIpyhiivbkH9/dGiMLdyamT54YRdGJLfl8TFnLHg=="; }; }; "@inquirer/prompts-2.3.1" = { @@ -5980,13 +5863,13 @@ let sha512 = "k52mOMRvTUejrqyF1h8Z07chC+sbaoaUYzzr1KrJXyj7yaX7Nrh0a9vktv8TuocRwIJOQMaj5oZEmkspEcJFYQ=="; }; }; - "@inquirer/prompts-5.0.7" = { + "@inquirer/prompts-5.3.8" = { name = "_at_inquirer_slash_prompts"; packageName = "@inquirer/prompts"; - version = "5.0.7"; + version = "5.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.0.7.tgz"; - sha512 = "GFcigCxJTKCH3aECzMIu4FhgLJWnFvMXzpI4CCSoELWFtkOOU2P+goYA61+OKpGrB8fPE7q6n8zAXBSlZRrHjQ=="; + url = "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.3.8.tgz"; + sha512 = "b2BudQY/Si4Y2a0PdZZL6BeJtl8llgeZa7U2j47aaJSCeAl1e4UI7y8a9bSkO3o/ZbZrgT5muy/34JbsjfIWxA=="; }; }; "@inquirer/rawlist-1.2.16" = { @@ -5998,13 +5881,22 @@ let sha512 = "pZ6TRg2qMwZAOZAV6TvghCtkr53dGnK29GMNQ3vMZXSNguvGqtOVc4j/h1T8kqGJFagjyfBZhUPGwNS55O5qPQ=="; }; }; - "@inquirer/rawlist-2.1.17" = { + "@inquirer/rawlist-2.3.0" = { name = "_at_inquirer_slash_rawlist"; packageName = "@inquirer/rawlist"; - version = "2.1.17"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.3.0.tgz"; + sha512 = "zzfNuINhFF7OLAtGHfhwOW2TlYJyli7lOUoJUXw/uyklcwalV6WRXBXtFIicN8rTRK1XTiPWB4UY+YuW8dsnLQ=="; + }; + }; + "@inquirer/search-1.1.0" = { + name = "_at_inquirer_slash_search"; + packageName = "@inquirer/search"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.1.17.tgz"; - sha512 = "RFrw34xU5aVlMA3ZJCaeKGxYjhu3j4i46O2GMmaRRGeLObCRM1yOKQOsRclSTzjd4A7+M5QleR2iuW/68J9Kwg=="; + url = "https://registry.npmjs.org/@inquirer/search/-/search-1.1.0.tgz"; + sha512 = "h+/5LSj51dx7hp5xOn4QFnUaKeARwUCLs6mIhtkJ0JYPBLmEYjdHSYh7I6GrLg9LwpJ3xeX0FZgAG1q0QdCpVQ=="; }; }; "@inquirer/select-1.3.3" = { @@ -6016,22 +5908,31 @@ let sha512 = "RzlRISXWqIKEf83FDC9ZtJ3JvuK1l7aGpretf41BCWYrvla2wU8W8MTRNMiPrPJ+1SIqrRC1nZdZ60hD9hRXLg=="; }; }; - "@inquirer/select-2.4.2" = { + "@inquirer/select-2.5.0" = { name = "_at_inquirer_slash_select"; packageName = "@inquirer/select"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/select/-/select-2.4.2.tgz"; - sha512 = "r78JlgShqRxyAtBDeBHSDtfrOhSQwm2ecWGGaxe7kD9JwgL3UN563G1ncVRYdsWD7/tigflcskfipVeoDLhLJg=="; + url = "https://registry.npmjs.org/@inquirer/select/-/select-2.5.0.tgz"; + sha512 = "YmDobTItPP3WcEI86GvPo+T2sRHkxxOq/kXmsBjHS5BVXUgvgZ5AfJjkvQvZr03T81NnI3KrrRuMzeuYUQRFOA=="; }; }; - "@inquirer/type-1.5.1" = { + "@inquirer/type-1.5.5" = { name = "_at_inquirer_slash_type"; packageName = "@inquirer/type"; - version = "1.5.1"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz"; + sha512 = "MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA=="; + }; + }; + "@inquirer/type-2.0.0" = { + name = "_at_inquirer_slash_type"; + packageName = "@inquirer/type"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/type/-/type-1.5.1.tgz"; - sha512 = "m3YgGQlKNS0BM+8AFiJkCsTqHEFCWn6s/Rqye3mYwvqY6LdfUv12eSwbsgNzrYyrLXiy7IrrjDLPysaSBwEfhw=="; + url = "https://registry.npmjs.org/@inquirer/type/-/type-2.0.0.tgz"; + sha512 = "XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag=="; }; }; "@ioredis/commands-1.2.0" = { @@ -6556,13 +6457,13 @@ let sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg=="; }; }; - "@jsii/check-node-1.101.0" = { + "@jsii/check-node-1.103.1" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.101.0"; + version = "1.103.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.101.0.tgz"; - sha512 = "io8u1GAF9XGp2crx0C/WGiJeUnHGw5X0du4fisbrNJHmVVFwcJbBMjbfXKWq+JSzl8fo/JV3F1LqtjsnawKA2A=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.103.1.tgz"; + sha512 = "Vi6ONm5WXEim98a2DJ6WMlrP/w5AGzXrrQBpGcfVV7cu86DPx1L0OAZnqzGAJE8ly0VfcSXkmxJ9LFcn3jylBQ=="; }; }; "@jsii/check-node-1.98.0" = { @@ -6574,13 +6475,13 @@ let sha512 = "hI53TMW/fylHyY3CrJvqWvfSPJvBL82GSAB1m2CKNC0yHb0pZHCdBZnLrrr4rgTCQx8kIJjcUc0rQ/Ba3w+GaA=="; }; }; - "@jsii/spec-1.101.0" = { + "@jsii/spec-1.103.1" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.101.0"; + version = "1.103.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.101.0.tgz"; - sha512 = "855OnjKm4RTzRA78GGTNBG/GLe6X/vHJYD58zg7Rw8rWS7sU6iB65TM/7P7R3cufVew8umjjPjvW7ygS6ZqITQ=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.103.1.tgz"; + sha512 = "14OGYM3DjEBjUOUaih+bwPgkhFnR8L9TSNSM0oE0L0hjWscTapvClqOgMDJ1ID52qkROCAgKl1d71Vmm4v0Buw=="; }; }; "@jsonjoy.com/base64-1.1.2" = { @@ -6592,22 +6493,22 @@ let sha512 = "q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA=="; }; }; - "@jsonjoy.com/json-pack-1.0.4" = { + "@jsonjoy.com/json-pack-1.1.0" = { name = "_at_jsonjoy.com_slash_json-pack"; packageName = "@jsonjoy.com/json-pack"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.0.4.tgz"; - sha512 = "aOcSN4MeAtFROysrbqG137b7gaDDSmVrl5mpo6sT/w+kcXpWnzhMjmY/Fh/sDx26NBxyIE7MB1seqLeCAzy9Sg=="; + url = "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz"; + sha512 = "zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg=="; }; }; - "@jsonjoy.com/util-1.2.0" = { + "@jsonjoy.com/util-1.3.0" = { name = "_at_jsonjoy.com_slash_util"; packageName = "@jsonjoy.com/util"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.2.0.tgz"; - sha512 = "4B8B+3vFsY4eo33DMKyJPlQ3sBMpPFUZK2dr3O3rXrOGKKbYG44J0XSFkDo1VOQiri5HFEhIeVvItjR2xcazmg=="; + url = "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.3.0.tgz"; + sha512 = "Cebt4Vk7k1xHy87kHY7KSPLT77A7Ev7IfOblyLZhtYEhrdQ6fX4EoLq3xOQ3O/DRMEh2ok5nyC180E+ABS8Wmw=="; }; }; "@kamilkisiela/fast-url-parser-1.1.4" = { @@ -6646,13 +6547,13 @@ let sha512 = "Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw=="; }; }; - "@lerna/create-8.1.7" = { + "@lerna/create-8.1.8" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "8.1.7"; + version = "8.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-8.1.7.tgz"; - sha512 = "ch81CgU5pBNOiUCQx44F/ZtN4DxxJjUQtuytYRBFWJSHAJ+XPJtiC/yQ9zjr1I1yaUlmNYYblkopoOyziOdJ1w=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-8.1.8.tgz"; + sha512 = "wi72R01tgjBjzG2kjRyTHl4yCTKDfDMIXRyKz9E/FBa9SkFvUOAE4bdyY9MhEsRZmSWL7+CYE8Flv/HScRpBbA=="; }; }; "@lezer/common-1.2.1" = { @@ -6664,22 +6565,22 @@ let sha512 = "yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ=="; }; }; - "@lezer/lr-1.4.1" = { + "@lezer/lr-1.4.2" = { name = "_at_lezer_slash_lr"; packageName = "@lezer/lr"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.1.tgz"; - sha512 = "CHsKq8DMKBf9b3yXPDIU4DbH+ZJd/sJdYOW2llbW/HudP5u0VS6Bfq1hLYfgU7uAYGFIyGGQIsSOXGPEErZiJw=="; + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz"; + sha512 = "pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA=="; }; }; - "@listr2/prompt-adapter-inquirer-2.0.13" = { + "@listr2/prompt-adapter-inquirer-2.0.15" = { name = "_at_listr2_slash_prompt-adapter-inquirer"; packageName = "@listr2/prompt-adapter-inquirer"; - version = "2.0.13"; + version = "2.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.13.tgz"; - sha512 = "nAl6teTt7EWSjttNavAnv3uFR3w3vPP3OTYmHyPNHzKhAj2NoBDHmbS3MGpvvO8KXXPASnHjEGrrKrdKTMKPnQ=="; + url = "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.15.tgz"; + sha512 = "MZrGem/Ujjd4cPTLYDfCZK2iKKeiO/8OX13S6jqxldLs0Prf2aGqVlJ77nMBqMv7fzqgXEgjrNHLXcKR8l9lOg=="; }; }; "@lmdb/lmdb-darwin-arm64-2.5.3" = { @@ -6808,15 +6709,6 @@ let sha512 = "Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ=="; }; }; - "@microsoft/applicationinsights-web-snippet-1.2.1" = { - name = "_at_microsoft_slash_applicationinsights-web-snippet"; - packageName = "@microsoft/applicationinsights-web-snippet"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.2.1.tgz"; - sha512 = "+Cy9zFqdQgdAbMK1dpm7B+3DUnrByai0Tq6XG9v737HJpW6G1EiNNbTuFeXdPWyGaq6FIx9jxm/SUcxA6/Rxxg=="; - }; - }; "@microsoft/fetch-event-source-2.0.1" = { name = "_at_microsoft_slash_fetch-event-source"; packageName = "@microsoft/fetch-event-source"; @@ -6826,13 +6718,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/rush-lib-5.130.2" = { + "@microsoft/rush-lib-5.134.0" = { name = "_at_microsoft_slash_rush-lib"; packageName = "@microsoft/rush-lib"; - version = "5.130.2"; + version = "5.134.0"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.130.2.tgz"; - sha512 = "8QgiqTh9osfqbweaZFikkaQx4Malve8sIGZhEfoPsHJw4bYPjjU7wA2NhQoeQu+0scdVOOL02kPvL7srWkGqFA=="; + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.134.0.tgz"; + sha512 = "xx5+ASrwA1tJHxbkC+9wDVo4k3cVprf9aRyFew7TVyZpHV9OHkWkMoEJcuJOTk57WhxWJkl79gGZMO31GfiVfw=="; }; }; "@mischnic/json-sourcemap-0.1.1" = { @@ -6844,49 +6736,40 @@ let sha512 = "iA7+tyVqfrATAIsIRWQG+a7ZLLD0VaOCKV2Wd/v4mqIU3J9c4jx9p7S0nw1XH3gJCKNBOOwACOPYYSUu9pgT+w=="; }; }; - "@mixmark-io/domino-2.2.0" = { - name = "_at_mixmark-io_slash_domino"; - packageName = "@mixmark-io/domino"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@mixmark-io/domino/-/domino-2.2.0.tgz"; - sha512 = "Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw=="; - }; - }; - "@module-federation/runtime-0.1.6" = { + "@module-federation/runtime-0.5.1" = { name = "_at_module-federation_slash_runtime"; packageName = "@module-federation/runtime"; - version = "0.1.6"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@module-federation/runtime/-/runtime-0.1.6.tgz"; - sha512 = "nj6a+yJ+QxmcE89qmrTl4lphBIoAds0PFPVGnqLRWflwAP88jrCcrrTqRhARegkFDL+wE9AE04+h6jzlbIfMKg=="; + url = "https://registry.npmjs.org/@module-federation/runtime/-/runtime-0.5.1.tgz"; + sha512 = "xgiMUWwGLWDrvZc9JibuEbXIbhXg6z2oUkemogSvQ4LKvrl/n0kbqP1Blk669mXzyWbqtSp6PpvNdwaE1aN5xQ=="; }; }; - "@module-federation/runtime-tools-0.1.6" = { + "@module-federation/runtime-tools-0.5.1" = { name = "_at_module-federation_slash_runtime-tools"; packageName = "@module-federation/runtime-tools"; - version = "0.1.6"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@module-federation/runtime-tools/-/runtime-tools-0.1.6.tgz"; - sha512 = "7ILVnzMIa0Dlc0Blck5tVZG1tnk1MmLnuZpLOMpbdW+zl+N6wdMjjHMjEZFCUAJh2E5XJ3BREwfX8Ets0nIkLg=="; + url = "https://registry.npmjs.org/@module-federation/runtime-tools/-/runtime-tools-0.5.1.tgz"; + sha512 = "nfBedkoZ3/SWyO0hnmaxuz0R0iGPSikHZOAZ0N/dVSQaIzlffUo35B5nlC2wgWIc0JdMZfkwkjZRrnuuDIJbzg=="; }; }; - "@module-federation/sdk-0.1.6" = { + "@module-federation/sdk-0.5.1" = { name = "_at_module-federation_slash_sdk"; packageName = "@module-federation/sdk"; - version = "0.1.6"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@module-federation/sdk/-/sdk-0.1.6.tgz"; - sha512 = "qifXpyYLM7abUeEOIfv0oTkguZgRZuwh89YOAYIZJlkP6QbRG7DJMQvtM8X2yHXm9PTk0IYNnOJH0vNQCo6auQ=="; + url = "https://registry.npmjs.org/@module-federation/sdk/-/sdk-0.5.1.tgz"; + sha512 = "exvchtjNURJJkpqjQ3/opdbfeT2wPKvrbnGnyRkrwW5o3FH1LaST1tkiNviT6OXTexGaVc2DahbdniQHVtQ7pA=="; }; }; - "@module-federation/webpack-bundler-runtime-0.1.6" = { + "@module-federation/webpack-bundler-runtime-0.5.1" = { name = "_at_module-federation_slash_webpack-bundler-runtime"; packageName = "@module-federation/webpack-bundler-runtime"; - version = "0.1.6"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@module-federation/webpack-bundler-runtime/-/webpack-bundler-runtime-0.1.6.tgz"; - sha512 = "K5WhKZ4RVNaMEtfHsd/9CNCgGKB0ipbm/tgweNNeC11mEuBTNxJ09Y630vg3WPkKv9vfMCuXg2p2Dk+Q/KWTSA=="; + url = "https://registry.npmjs.org/@module-federation/webpack-bundler-runtime/-/webpack-bundler-runtime-0.5.1.tgz"; + sha512 = "mMhRFH0k2VjwHt3Jol9JkUsmI/4XlrAoBG3E0o7HoyoPYv1UFOWyqAflfANcUPgbYpvqmyLzDcO+3IT36LXnrA=="; }; }; "@msgpack/msgpack-2.8.0" = { @@ -6925,58 +6808,58 @@ let sha512 = "V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg=="; }; }; - "@node-red/editor-api-4.0.2" = { + "@node-red/editor-api-4.0.3" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-4.0.2.tgz"; - sha512 = "ZG0n1fpwAP5qhwa1vXdhHGhtVm6flmQKp1N++RPxqmF8uZlkI5wI0FzDrF3V/En7+gUD+o5ylcca4kq+I8GIdA=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-4.0.3.tgz"; + sha512 = "neNj/CtCv9gfwWvSY2r/8U259hWrq2yX9t+Pe4lxfCdiBHm0/CUBs8xLHqqz3dBucQNK0ahRxCfBwWhI9AyKhA=="; }; }; - "@node-red/editor-client-4.0.2" = { + "@node-red/editor-client-4.0.3" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-4.0.2.tgz"; - sha512 = "B8UsqaxnTeIshgUFhMKj7hk/ddyxSXFTcRnuSw0uC39+ki3UUQ3pWJT8FLOr0NVypCFD4jq8qDzMundD0FVLFw=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-4.0.3.tgz"; + sha512 = "mnfLU6iOUNdzrrHt6XYnVfZPixWrKDOmMfbz+USJR2JgAC25DLuezIIlTgA6FAbNaG3dXAsCN0mCQUw/7nV9cQ=="; }; }; - "@node-red/nodes-4.0.2" = { + "@node-red/nodes-4.0.3" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-4.0.2.tgz"; - sha512 = "dK+S6WJ2S8RQ/WMH1kSzYKvubM0+5zyRq7oEvrAyjk3xqQCwkf7Mfb48zdtHh6zW73/qv1pquY0iikIyZOkU6Q=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-4.0.3.tgz"; + sha512 = "bds0KpzTT2QXmTuchekyOLf6H0O44lDfBIcfIZu6CLIPVD6yW+8joXQKBcbfpdPzprDlygIIcBTni1tTgQASwA=="; }; }; - "@node-red/registry-4.0.2" = { + "@node-red/registry-4.0.3" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-4.0.2.tgz"; - sha512 = "1R9DBH4EhWOH5UJffNZ8Wdemch1onc7ZwRPoylnCD0aFpRWT2q1nEqHJDthtBF2l9x9CZejB31/LBAmU1KCkTQ=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-4.0.3.tgz"; + sha512 = "2+v5MyP4C4cokRGNuBiDZMBd6k8cu3SHMPEt6Cby/CaTk9MlPzEdReAHq5wlzno/0nBTu9fN1ITbRD9Rd+M59w=="; }; }; - "@node-red/runtime-4.0.2" = { + "@node-red/runtime-4.0.3" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-4.0.2.tgz"; - sha512 = "wW1l8ZIeaLvSB8rKj/g7RsGBLq8Q6ladbCm3Zv4tTbuLmx61t04FZo2DNYTrVlMIR3O5R+vmc5UbzJco7WpVxA=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-4.0.3.tgz"; + sha512 = "ftPOkDh9jPLFrxiF3kycKrU61lSjSws1Qv44gEoihvcqwujMIFhuSA14XOXn9St+nPSuaglI8Ud7XShdFtt22g=="; }; }; - "@node-red/util-4.0.2" = { + "@node-red/util-4.0.3" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-4.0.2.tgz"; - sha512 = "pnAyC3N0JeORyvQQBpW4WQjBJU8iFNC5eG6W6LLfzhW3FvXndOUr85rx4fFtpWXZs8wMtWG4dBw7J4F4QLNJAQ=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-4.0.3.tgz"; + sha512 = "jR+/+luAAxblGDagrKsoh81xfpteofU6LnQxuVTyY2ecJ/JidmtYorlL+UeF479E2+uyZEi/w1fafsTJ09Jokw=="; }; }; "@node-rs/bcrypt-1.10.4" = { @@ -7150,13 +7033,13 @@ let sha512 = "OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og=="; }; }; - "@npmcli/arborist-7.5.3" = { + "@npmcli/arborist-7.5.4" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "7.5.3"; + version = "7.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-7.5.3.tgz"; - sha512 = "7gbMdDNSYUzi0j2mpb6FoXRg3BxXWplMQZH1MZlvNjSdWFObaUz2Ssvo0Nlh2xmWks1OPo+gpsE6qxpT/5M7lQ=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-7.5.4.tgz"; + sha512 = "nWtIc6QwwoUORCRNzKx4ypHqCk3drI+5aeYdMTQQiRCcn4lOOgfQh7WyZobGYTxXPSq1VwV53lkpN/BRlRk08g=="; }; }; "@npmcli/config-6.4.1" = { @@ -7285,6 +7168,15 @@ let sha512 = "qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ=="; }; }; + "@npmcli/package-json-5.2.1" = { + name = "_at_npmcli_slash_package-json"; + packageName = "@npmcli/package-json"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.1.tgz"; + sha512 = "f7zYC6kQautXHvNbLEWgD/uGu1+xCn9izgqBfgItWSx22U0ZDekxN08A1vM8cTxj/cRVe0Q94Ode+tdoYmIOOQ=="; + }; + }; "@npmcli/promise-spawn-7.0.2" = { name = "_at_npmcli_slash_promise-spawn"; packageName = "@npmcli/promise-spawn"; @@ -7321,31 +7213,31 @@ let sha512 = "y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg=="; }; }; - "@nrwl/devkit-19.5.3" = { + "@nrwl/devkit-19.7.4" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "19.5.3"; + version = "19.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.5.3.tgz"; - sha512 = "kd6eIQjWuFHdO14wVu0rzGtoPbO3EdYM/3gATOupxBzlqD+7dmkvv1Olbri9v598mDApXQNo8q81L2masTAhvg=="; + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.7.4.tgz"; + sha512 = "gajVVlfQmCwY8Uu3SFwqwtdu9QcmaBGYW826vXPzOvQNvOsGHwu+bB3ozJq4sfsjxpuGjbdjBdQOuZYBgqbnTw=="; }; }; - "@nrwl/tao-19.5.3" = { + "@nrwl/tao-19.7.4" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "19.5.3"; + version = "19.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-19.5.3.tgz"; - sha512 = "SHtPlQi7zofDdbFjqcrTb/A0Mo9tT8S88H8nJa1+GzhKpGUB9rykHtq0qoYdiRBnQfmfR5LoKfe/jft61Ktvdg=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-19.7.4.tgz"; + sha512 = "vyfVcdtG3/I+/nKraEyPuaw70gxMIvKxQAD/n1k+T9J/dDpADoeOGZaygRCVRgIU1PPc7/TaRh8dBQAkZhDJxg=="; }; }; - "@nx/devkit-19.5.3" = { + "@nx/devkit-19.7.4" = { name = "_at_nx_slash_devkit"; packageName = "@nx/devkit"; - version = "19.5.3"; + version = "19.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/devkit/-/devkit-19.5.3.tgz"; - sha512 = "OUi8OJkoT+y3LwXACO6ugF9l6QppUyHrBIZYOTffBa1ZrnkpJrw03smy+GhAt+BDoeNGEuOPHGvOSV4AmRxnmg=="; + url = "https://registry.npmjs.org/@nx/devkit/-/devkit-19.7.4.tgz"; + sha512 = "n+iFVq6Jp1dyV3JAJp2xY2yo4fzC6ImO32qHJZ+2Aqbh3Ks+yYsfuGpdj6f0/2HfkFylPygJnxphWSu1UDXMug=="; }; }; "@oclif/color-1.0.13" = { @@ -7411,6 +7303,15 @@ let sha512 = "dL6atBH0zCZl1A1IXCKJgLPrM/wR7K+Wi401E/IvqsK8m2iCHW+0TEOGrans/cuN3oTW+uxIyJFHJ8Im0k4qBw=="; }; }; + "@oclif/core-4.0.22" = { + name = "_at_oclif_slash_core"; + packageName = "@oclif/core"; + version = "4.0.22"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/core/-/core-4.0.22.tgz"; + sha512 = "aXM2O4g7f+kPNzhhOfqGOVRVYDxTVrH7Y720MuH0Twq5WHMxI4XwntnyBaRscoCPG6FWhItZLtiZxsvaUdupGg=="; + }; + }; "@oclif/errors-1.3.5" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -7537,15 +7438,6 @@ let sha512 = "yx6KAqlt3TAHBduS2fMQtJDL2ufIHnDRArrJEOoTTuizxqmjLT+psGYOHpmMl3gvQpFJ11Hs76guUUktzAF9Bg=="; }; }; - "@octokit/auth-token-2.5.0" = { - name = "_at_octokit_slash_auth-token"; - packageName = "@octokit/auth-token"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz"; - sha512 = "r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g=="; - }; - }; "@octokit/auth-token-3.0.4" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; @@ -7555,15 +7447,6 @@ let sha512 = "TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ=="; }; }; - "@octokit/core-3.6.0" = { - name = "_at_octokit_slash_core"; - packageName = "@octokit/core"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz"; - sha512 = "7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q=="; - }; - }; "@octokit/core-4.2.4" = { name = "_at_octokit_slash_core"; packageName = "@octokit/core"; @@ -7573,15 +7456,6 @@ let sha512 = "rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ=="; }; }; - "@octokit/endpoint-6.0.12" = { - name = "_at_octokit_slash_endpoint"; - packageName = "@octokit/endpoint"; - version = "6.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz"; - sha512 = "lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA=="; - }; - }; "@octokit/endpoint-7.0.6" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; @@ -7591,15 +7465,6 @@ let sha512 = "5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg=="; }; }; - "@octokit/graphql-4.8.0" = { - name = "_at_octokit_slash_graphql"; - packageName = "@octokit/graphql"; - version = "4.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz"; - sha512 = "0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg=="; - }; - }; "@octokit/graphql-5.0.6" = { name = "_at_octokit_slash_graphql"; packageName = "@octokit/graphql"; @@ -7609,15 +7474,6 @@ let sha512 = "Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw=="; }; }; - "@octokit/openapi-types-12.11.0" = { - name = "_at_octokit_slash_openapi-types"; - packageName = "@octokit/openapi-types"; - version = "12.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz"; - sha512 = "VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="; - }; - }; "@octokit/openapi-types-18.1.1" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; @@ -7636,15 +7492,6 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.21.3" = { - name = "_at_octokit_slash_plugin-paginate-rest"; - packageName = "@octokit/plugin-paginate-rest"; - version = "2.21.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz"; - sha512 = "aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw=="; - }; - }; "@octokit/plugin-paginate-rest-6.1.2" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; @@ -7663,15 +7510,6 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.16.2" = { - name = "_at_octokit_slash_plugin-rest-endpoint-methods"; - packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.16.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz"; - sha512 = "8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw=="; - }; - }; "@octokit/plugin-rest-endpoint-methods-7.2.3" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; @@ -7681,15 +7519,6 @@ let sha512 = "I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA=="; }; }; - "@octokit/request-5.6.3" = { - name = "_at_octokit_slash_request"; - packageName = "@octokit/request"; - version = "5.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz"; - sha512 = "bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A=="; - }; - }; "@octokit/request-6.2.8" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; @@ -7699,15 +7528,6 @@ let sha512 = "ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw=="; }; }; - "@octokit/request-error-2.1.0" = { - name = "_at_octokit_slash_request-error"; - packageName = "@octokit/request-error"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz"; - sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; - }; - }; "@octokit/request-error-3.0.3" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; @@ -7717,15 +7537,6 @@ let sha512 = "crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ=="; }; }; - "@octokit/rest-18.12.0" = { - name = "_at_octokit_slash_rest"; - packageName = "@octokit/rest"; - version = "18.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz"; - sha512 = "gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q=="; - }; - }; "@octokit/rest-19.0.11" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; @@ -7753,15 +7564,6 @@ let sha512 = "Vm8IddVmhCgU1fxC1eyinpwqzXPEYu0NrYzD3YZjlGjyftdLBTeqNblRC0jmJmgxbJIsQlyogVeGnrNaaMVzIg=="; }; }; - "@octokit/types-6.41.0" = { - name = "_at_octokit_slash_types"; - packageName = "@octokit/types"; - version = "6.41.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz"; - sha512 = "eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg=="; - }; - }; "@octokit/types-9.3.2" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; @@ -7807,130 +7609,85 @@ let sha512 = "3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="; }; }; - "@opentelemetry/core-1.25.1" = { - name = "_at_opentelemetry_slash_core"; - packageName = "@opentelemetry/core"; - version = "1.25.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.25.1.tgz"; - sha512 = "GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ=="; - }; - }; - "@opentelemetry/instrumentation-0.41.2" = { - name = "_at_opentelemetry_slash_instrumentation"; - packageName = "@opentelemetry/instrumentation"; - version = "0.41.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.41.2.tgz"; - sha512 = "rxU72E0pKNH6ae2w5+xgVYZLzc5mlxAbGzF4shxMVK8YC2QQsfN38B2GPbj0jvrKWWNUElfclQ+YTykkNg/grw=="; - }; - }; - "@opentelemetry/resources-1.25.1" = { - name = "_at_opentelemetry_slash_resources"; - packageName = "@opentelemetry/resources"; - version = "1.25.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.25.1.tgz"; - sha512 = "pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ=="; - }; - }; - "@opentelemetry/sdk-trace-base-1.25.1" = { - name = "_at_opentelemetry_slash_sdk-trace-base"; - packageName = "@opentelemetry/sdk-trace-base"; - version = "1.25.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.25.1.tgz"; - sha512 = "C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw=="; - }; - }; - "@opentelemetry/semantic-conventions-1.25.1" = { - name = "_at_opentelemetry_slash_semantic-conventions"; - packageName = "@opentelemetry/semantic-conventions"; - version = "1.25.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.25.1.tgz"; - sha512 = "ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ=="; - }; - }; - "@orval/angular-6.31.0" = { + "@orval/angular-7.1.1" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; - version = "6.31.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/angular/-/angular-6.31.0.tgz"; - sha512 = "cVV/vh6biGUe5FMR0kaOL+pYkD5lM/oHpyHVU19d2eY/hxKCG58/CagUNVDxbowcSalzGpt7NbZOqpauc2cNOA=="; + url = "https://registry.npmjs.org/@orval/angular/-/angular-7.1.1.tgz"; + sha512 = "oMn38oQsmo3hgfghin5d9La/KwkiyMLxJ+b1MpILjmvnlJiLWL0SrHtfUlqLs+8wwMGWmzbuS875l2KIfNmyjQ=="; }; }; - "@orval/axios-6.31.0" = { + "@orval/axios-7.1.1" = { name = "_at_orval_slash_axios"; packageName = "@orval/axios"; - version = "6.31.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/axios/-/axios-6.31.0.tgz"; - sha512 = "OqWFJ6bDKftsSW3VI7Ouqcb3W4hDhkk8XzDkb/iisn3Dn1rkSE/wafdlHCm+62VQps4esYXaP1+7/HSk/2+Y8A=="; + url = "https://registry.npmjs.org/@orval/axios/-/axios-7.1.1.tgz"; + sha512 = "Mr66Ns+O6q2J7YfxotdhB4dhAetmnkfIPjqBdOZFko0vyY8jqXLv/qmerQ0xkUGN2HmGD88VWzDoV1KKygrcog=="; }; }; - "@orval/core-6.31.0" = { + "@orval/core-7.1.1" = { name = "_at_orval_slash_core"; packageName = "@orval/core"; - version = "6.31.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/core/-/core-6.31.0.tgz"; - sha512 = "ubOPpxzLgOCGbAQsq/dzfe/MIgB4LYWRyuwgnkV2GkL8Zq7cIWfmZU09GTJZQ6cO35OclFfbbyNve0cRMfSBeA=="; + url = "https://registry.npmjs.org/@orval/core/-/core-7.1.1.tgz"; + sha512 = "EYhQg1DohH5Z6klR4VNVXGgBCKUCt26lxkK5hLadLIRlCmi5g2WrLGM++GDrmoMa8zcpHlF52xLpaMqUsICmhw=="; }; }; - "@orval/fetch-6.31.0" = { + "@orval/fetch-7.1.1" = { name = "_at_orval_slash_fetch"; packageName = "@orval/fetch"; - version = "6.31.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/fetch/-/fetch-6.31.0.tgz"; - sha512 = "K4pD0TqRX3n1QgsfdzcCLxZPj4WFr4xd51VS5PhtK7wewy+EwaTp5AZeeMT+o8dL4HQcwLsKaXA1HH1YiAuOrA=="; + url = "https://registry.npmjs.org/@orval/fetch/-/fetch-7.1.1.tgz"; + sha512 = "z/MvrqYwpgyuVcWr3pVU2Vb6yuaAGV46taghH/ogQECHxMktjtpKhwtyCRwjGE2S+ggfdUEjFLjDpspKQKeYCg=="; }; }; - "@orval/hono-6.31.0" = { + "@orval/hono-7.1.1" = { name = "_at_orval_slash_hono"; packageName = "@orval/hono"; - version = "6.31.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/hono/-/hono-6.31.0.tgz"; - sha512 = "mM5WISLugu1quNkNUqYwp+StV/Z5/STm33VdPTWkoZyPJtV4NmEUZKPsowk0EN7sBF2kW+aYcp8lsNMXxXfHaw=="; + url = "https://registry.npmjs.org/@orval/hono/-/hono-7.1.1.tgz"; + sha512 = "STQ3GjM8spK/mIOQBkh8r3aJ2dOdFvAmT6sCNmlVQbllaPuGZfFV7p5Q52yaxupRFIeyoHyTcsq5Taa4Fr+wkQ=="; }; }; - "@orval/mock-6.31.0" = { + "@orval/mock-7.1.1" = { name = "_at_orval_slash_mock"; packageName = "@orval/mock"; - version = "6.31.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/mock/-/mock-6.31.0.tgz"; - sha512 = "UBag0IyL0eDVdXWgIMS/YxDF57Q3XC4VRDqcuZ1lB77rfBZ4UiVqTJleczQoIqMGkdtJJlBABgWzRRts1K4img=="; + url = "https://registry.npmjs.org/@orval/mock/-/mock-7.1.1.tgz"; + sha512 = "+tSlafXPsvk5DDKJAcK+eKksq5T0fu4kV0fOXl6rM2NfIksFrSHMMV5zBQvxkneTGAMc8p5HejO9uksRhGrOFA=="; }; }; - "@orval/query-6.31.0" = { + "@orval/query-7.1.1" = { name = "_at_orval_slash_query"; packageName = "@orval/query"; - version = "6.31.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/query/-/query-6.31.0.tgz"; - sha512 = "aVyvSU5IbpRQnVbhChNlLX2XDnmoT1cDJ59NEFS3byhiJf1EG5XlzVve98je/BHAsVROrUC8+o6XoIjCtYbW5Q=="; + url = "https://registry.npmjs.org/@orval/query/-/query-7.1.1.tgz"; + sha512 = "4cF92aJ5KGcZJVTx+Zs/5XSZGDd9VFMcV2qpJ+Nh0L6Ug60IG4X8ypvKW55+nIMcohmy6taYAwQO9Z1JyS6GwQ=="; }; }; - "@orval/swr-6.31.0" = { + "@orval/swr-7.1.1" = { name = "_at_orval_slash_swr"; packageName = "@orval/swr"; - version = "6.31.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/swr/-/swr-6.31.0.tgz"; - sha512 = "J9W/kym9jc94GizbTozpuY76yaZRN98rf3ahj+2+eW8+NRW1dVFui32Gew1qj9rcCSA54BwRMONgEn3Xqx6W6A=="; + url = "https://registry.npmjs.org/@orval/swr/-/swr-7.1.1.tgz"; + sha512 = "VomCLPBfFL4Ty2tObiNtM/1JLvmHhcfbqFSHTrgm5sLJ5J3JsJFGFrdLKVm+1VmhuqDp9j9dqsRZD+6GOEN2Og=="; }; }; - "@orval/zod-6.31.0" = { + "@orval/zod-7.1.1" = { name = "_at_orval_slash_zod"; packageName = "@orval/zod"; - version = "6.31.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/zod/-/zod-6.31.0.tgz"; - sha512 = "v6wqGZf4s3tpWrnmMHlEBfhTLeebu5W3HmhP8vQ5BPkm8AB2asiZqzK3Ne9Y19Rvyx6X4FGnhnalKYkz+XxJ8Q=="; + url = "https://registry.npmjs.org/@orval/zod/-/zod-7.1.1.tgz"; + sha512 = "zoscwjWrTXFPIRstxyw+ScAwt+dAHlF7gzcuZWUCnjMYT5ESvmmIECSH1BJVQW09qRU1Yif5omp6X4qe/ijTlg=="; }; }; "@parcel/bundler-default-2.12.0" = { @@ -8518,13 +8275,13 @@ let sha512 = "zv5We5Jmb+ZWXlU6A+AufyjY4oZckkxsZ8J4dvyWL0W8IQvGO1JB4FGeryyttzQv3RM3OxcN/BpTGPiDG6keBw=="; }; }; - "@peculiar/asn1-schema-2.3.8" = { + "@peculiar/asn1-schema-2.3.13" = { name = "_at_peculiar_slash_asn1-schema"; packageName = "@peculiar/asn1-schema"; - version = "2.3.8"; + version = "2.3.13"; src = fetchurl { - url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.8.tgz"; - sha512 = "ULB1XqHKx1WBU/tTFIA+uARuRoBVZ4pNdOA878RDrRbBfBGcSzi5HBkdScC6ZbHn8z7L8gmKCgPC1LHRrP46tA=="; + url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.13.tgz"; + sha512 = "3Xq3a01WkHRZL8X04Zsfg//mGaA21xlL4tlVn4v2xGT0JStiztATRkMwa5b+f/HXmY2smsiLXYK46Gwgzvfg3g=="; }; }; "@peculiar/json-schema-1.1.12" = { @@ -8545,15 +8302,6 @@ let sha512 = "BRs5XUAwiyCDQMsVA9IDvDa7UBR9gAvPHgugOeGng3YN6vJ9JYonyDc0lNczErgtCWtucjR5N7VtaonboD/ezg=="; }; }; - "@pkgr/core-0.1.1" = { - name = "_at_pkgr_slash_core"; - packageName = "@pkgr/core"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz"; - sha512 = "cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA=="; - }; - }; "@pnpm/config.env-replace-1.1.0" = { name = "_at_pnpm_slash_config.env-replace"; packageName = "@pnpm/config.env-replace"; @@ -8617,13 +8365,13 @@ let sha512 = "YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA=="; }; }; - "@pnpm/npm-conf-2.2.2" = { + "@pnpm/npm-conf-2.3.1" = { name = "_at_pnpm_slash_npm-conf"; packageName = "@pnpm/npm-conf"; - version = "2.2.2"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.2.tgz"; - sha512 = "UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA=="; + url = "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz"; + sha512 = "c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw=="; }; }; "@pnpm/package-bins-4.1.0" = { @@ -8698,121 +8446,31 @@ let sha512 = "OLkDZSqkA1mkoPNPvLFXyI6fb0enCuFji6Zfditi/CLAo9kmIhQFmEUDu4krSB8i908EljG8YwL5Xjxzm5wsWA=="; }; }; - "@polka/url-1.0.0-next.25" = { + "@polka/url-1.0.0-next.28" = { name = "_at_polka_slash_url"; packageName = "@polka/url"; - version = "1.0.0-next.25"; + version = "1.0.0-next.28"; src = fetchurl { - url = "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz"; - sha512 = "j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ=="; + url = "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz"; + sha512 = "8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw=="; }; }; - "@prisma/prisma-schema-wasm-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053" = { + "@prisma/prisma-schema-wasm-5.19.1-2.69d742ee20b815d88e17e54db4a2a7a3b30324e3" = { name = "_at_prisma_slash_prisma-schema-wasm"; packageName = "@prisma/prisma-schema-wasm"; - version = "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"; + version = "5.19.1-2.69d742ee20b815d88e17e54db4a2a7a3b30324e3"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-schema-wasm/-/prisma-schema-wasm-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053.tgz"; - sha512 = "mlmuu0/IPSjMlMKsqdaVVAbGTJwp5sDMFd3ZFQxl4/K8FvH7tb2uy/lTHF0KyAJbveTiV+1yW9MBWspltXZZtg=="; + url = "https://registry.npmjs.org/@prisma/prisma-schema-wasm/-/prisma-schema-wasm-5.19.1-2.69d742ee20b815d88e17e54db4a2a7a3b30324e3.tgz"; + sha512 = "W7XFVqdxpX7T/BJ7BvS0SiLgPjZtl7ZWEvcvKjeBo78r+cPMf22KqFVpJwVdqOl7Dc3a36RjGL6X6Ntq5xR9cA=="; }; }; - "@prisma/schema-files-loader-5.17.0" = { + "@prisma/schema-files-loader-5.19.1" = { name = "_at_prisma_slash_schema-files-loader"; packageName = "@prisma/schema-files-loader"; - version = "5.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@prisma/schema-files-loader/-/schema-files-loader-5.17.0.tgz"; - sha512 = "rmbJZEvY9nOlLduVQww4fGmYM3aU7BYAw/st0K9QNq9dQoLONgQP7t8dhcOVZbBLyNNQu2k2gJdVXSHSY96b4A=="; - }; - }; - "@protobufjs/aspromise-1.1.2" = { - name = "_at_protobufjs_slash_aspromise"; - packageName = "@protobufjs/aspromise"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz"; - sha512 = "j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="; - }; - }; - "@protobufjs/base64-1.1.2" = { - name = "_at_protobufjs_slash_base64"; - packageName = "@protobufjs/base64"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz"; - sha512 = "AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="; - }; - }; - "@protobufjs/codegen-2.0.4" = { - name = "_at_protobufjs_slash_codegen"; - packageName = "@protobufjs/codegen"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz"; - sha512 = "YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="; - }; - }; - "@protobufjs/eventemitter-1.1.0" = { - name = "_at_protobufjs_slash_eventemitter"; - packageName = "@protobufjs/eventemitter"; - version = "1.1.0"; + version = "5.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz"; - sha512 = "j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="; - }; - }; - "@protobufjs/fetch-1.1.0" = { - name = "_at_protobufjs_slash_fetch"; - packageName = "@protobufjs/fetch"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz"; - sha512 = "lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ=="; - }; - }; - "@protobufjs/float-1.0.2" = { - name = "_at_protobufjs_slash_float"; - packageName = "@protobufjs/float"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz"; - sha512 = "Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="; - }; - }; - "@protobufjs/inquire-1.1.0" = { - name = "_at_protobufjs_slash_inquire"; - packageName = "@protobufjs/inquire"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz"; - sha512 = "kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="; - }; - }; - "@protobufjs/path-1.1.2" = { - name = "_at_protobufjs_slash_path"; - packageName = "@protobufjs/path"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz"; - sha512 = "6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="; - }; - }; - "@protobufjs/pool-1.1.0" = { - name = "_at_protobufjs_slash_pool"; - packageName = "@protobufjs/pool"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz"; - sha512 = "0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="; - }; - }; - "@protobufjs/utf8-1.1.0" = { - name = "_at_protobufjs_slash_utf8"; - packageName = "@protobufjs/utf8"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz"; - sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; + url = "https://registry.npmjs.org/@prisma/schema-files-loader/-/schema-files-loader-5.19.1.tgz"; + sha512 = "YYB6Mm7E2YFZAp8GsTCWdqAoehRhiDWQ+M4EwxXwCNfQnciGywGpjDOghJo0ErbGET1v/u0Xszn727cZvdlbPQ=="; }; }; "@puppeteer/browsers-2.3.0" = { @@ -8869,130 +8527,148 @@ let sha512 = "iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="; }; }; - "@rspack/binding-0.7.5" = { + "@rspack/binding-1.0.5" = { name = "_at_rspack_slash_binding"; packageName = "@rspack/binding"; - version = "0.7.5"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding/-/binding-0.7.5.tgz"; - sha512 = "XcdOvaCz1mWWwr5vmEY9zncdInrjINEh60EWkYdqtCA67v7X7rB1fe6n4BeAI1+YLS2Eacj+lytlr+n7I+DYVg=="; + url = "https://registry.npmjs.org/@rspack/binding/-/binding-1.0.5.tgz"; + sha512 = "SnVrzRWeKSosJ0/1e5taAeqJ1ISst6NAE1N8YK4ZdUEVWmE26tC2V/yTvZHSsqatc/0Cf+A18IZJx0q6H/DlRw=="; }; }; - "@rspack/core-0.7.5" = { + "@rspack/core-1.0.5" = { name = "_at_rspack_slash_core"; packageName = "@rspack/core"; - version = "0.7.5"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/core/-/core-0.7.5.tgz"; - sha512 = "zVTe4WCyc3qsLPattosiDYZFeOzaJ32/BYukPP2I1VJtCVFa+PxGVRPVZhSoN6fXw5oy48yHg9W9v1T8CaEFhw=="; + url = "https://registry.npmjs.org/@rspack/core/-/core-1.0.5.tgz"; + sha512 = "UlydS2VupZ6yBx3jCqCHpeEUQNWCrBkTQhPIezK0eCAk13i745byjqXX4tcfN6jR5Kjh/1CIb8r07k9DgGON1w=="; }; }; - "@rushstack/heft-config-file-0.15.2" = { + "@rspack/lite-tapable-1.0.0" = { + name = "_at_rspack_slash_lite-tapable"; + packageName = "@rspack/lite-tapable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rspack/lite-tapable/-/lite-tapable-1.0.0.tgz"; + sha512 = "7MZf4lburSUZoEenwazwUDKHhqyfnLCGnQ/tKcUtztfmVzfjZfRn/EaiT0AKkYGnL2U8AGsw89oUeVyvaOLVCw=="; + }; + }; + "@rushstack/heft-config-file-0.15.7" = { name = "_at_rushstack_slash_heft-config-file"; packageName = "@rushstack/heft-config-file"; - version = "0.15.2"; + version = "0.15.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.15.7.tgz"; + sha512 = "d8rwr9ctVmnVBPyl0o1WFh6NKsAJEX9eJip3mRGKOUd6Lq5FLHaTELwVNbqmZ76oQITABueD5MS02QE5Yq2fhw=="; + }; + }; + "@rushstack/lookup-by-path-0.2.2" = { + name = "_at_rushstack_slash_lookup-by-path"; + packageName = "@rushstack/lookup-by-path"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.15.2.tgz"; - sha512 = "1xHQLuWeXglFoVPxOpSb7EbjCduihFd9FXoW/awlFBfIfSMq85PAoErdCOfZBe7pUeGZ5ymwyiF7Am6hR4AAwA=="; + url = "https://registry.npmjs.org/@rushstack/lookup-by-path/-/lookup-by-path-0.2.2.tgz"; + sha512 = "yUz281pQjxXjKWapQc0KeXYjHnLFjnBmC2V+Gvc3itmJmK7MxFlhDwOUiORzKcmy+ICpwCi3DEnmA5/FinHIYA=="; }; }; - "@rushstack/node-core-library-5.5.0" = { + "@rushstack/node-core-library-5.9.0" = { name = "_at_rushstack_slash_node-core-library"; packageName = "@rushstack/node-core-library"; - version = "5.5.0"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.5.0.tgz"; - sha512 = "Cl3MYQ74Je5Y/EngMxcA3SpHjGZ/022nKbAO1aycGfQ+7eKyNCBu0oywj5B1f367GCzuHBgy+3BlVLKysHkXZw=="; + url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.9.0.tgz"; + sha512 = "MMsshEWkTbXqxqFxD4gcIUWQOCeBChlGczdZbHfqmNZQFLHB3yWxDFSMHFUdu2/OB9NUk7Awn5qRL+rws4HQNg=="; }; }; - "@rushstack/package-deps-hash-4.1.61" = { + "@rushstack/package-deps-hash-4.1.68" = { name = "_at_rushstack_slash_package-deps-hash"; packageName = "@rushstack/package-deps-hash"; - version = "4.1.61"; + version = "4.1.68"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.1.61.tgz"; - sha512 = "Qhl4AxZ1TYQ/rAxaU6yD16aKVOAyFAQKd/2zolcLPSwgk/01Iqu6K3Rhwlj9acO9PMOMTDKlQVDoy4FPzQQgww=="; + url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.1.68.tgz"; + sha512 = "qjZ+AK6quGEwNfpclMiToTbBKcQL0M1B3fbLxnyNhtnRdEwI2hWpClxKf7ZS7ykigSHkKsCyoMu0vLlOfIQutQ=="; }; }; - "@rushstack/package-extractor-0.7.20" = { + "@rushstack/package-extractor-0.8.1" = { name = "_at_rushstack_slash_package-extractor"; packageName = "@rushstack/package-extractor"; - version = "0.7.20"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.7.20.tgz"; - sha512 = "wZwn/bRWfin5xr1+EdVmrXtLI8W939HV3wvdJT9NbJrYh5G20bdXtsykDp10+S0QKrH33Rwb0zTu/JIa5JGLmw=="; + url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.8.1.tgz"; + sha512 = "Hk7/peA0/Q0LkvB92zyRP8ofqz+A59gOfMLy0SuLnVlt4yZ00AHMwJDkavF0NKccwF1EM/7WpKwQmt9vN98K1w=="; }; }; - "@rushstack/rig-package-0.5.2" = { + "@rushstack/rig-package-0.5.3" = { name = "_at_rushstack_slash_rig-package"; packageName = "@rushstack/rig-package"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.5.2.tgz"; - sha512 = "mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA=="; + url = "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.5.3.tgz"; + sha512 = "olzSSjYrvCNxUFZowevC3uz8gvKr3WTpHQ7BkpjtRpA3wK+T0ybep/SRUMfr195gBzJm5gaXw0ZMgjIyHqJUow=="; }; }; - "@rushstack/rush-amazon-s3-build-cache-plugin-5.130.2" = { + "@rushstack/rush-amazon-s3-build-cache-plugin-5.134.0" = { name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; - version = "5.130.2"; + version = "5.134.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.130.2.tgz"; - sha512 = "1KMBKBQIXHcvX0vOcVGHWwJXBQkSA+IOXeWawoU0GO42XMLif4dFGEIFWZP+L+wFSvVSPu1Hs12ZH6dWYPVXGg=="; + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.134.0.tgz"; + sha512 = "heTaRJijFznvpayjCnVLmeyyVZ0QA3049ckODpQqRXBcOE/jfr1f0C01Ng/d8sNcruIjzixCc1M+FeMbNW3Zag=="; }; }; - "@rushstack/rush-azure-storage-build-cache-plugin-5.130.2" = { + "@rushstack/rush-azure-storage-build-cache-plugin-5.134.0" = { name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; - version = "5.130.2"; + version = "5.134.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.130.2.tgz"; - sha512 = "naS9nrYOGs1KmIgoKpaT1jQEv7hRSS8AMkpeN/rkbY1/OnKCr0+z4aEgRuPEBiOObyFQaT/uxrsrpsgqSVQh3A=="; + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.134.0.tgz"; + sha512 = "QXHr1DZjzuhxnB7Xl8vEYOgC4P4VlVliXXG0z+JgiI8/jKwaNTSBleBXpHvs4MTLAMR5BE+A/W12L0ZJm7uQSA=="; }; }; - "@rushstack/rush-http-build-cache-plugin-5.130.2" = { + "@rushstack/rush-http-build-cache-plugin-5.134.0" = { name = "_at_rushstack_slash_rush-http-build-cache-plugin"; packageName = "@rushstack/rush-http-build-cache-plugin"; - version = "5.130.2"; + version = "5.134.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.130.2.tgz"; - sha512 = "VaKNAKJ2jnBiDutQiakj90TKW2PyBu4HOtlB4ran7WHKXGQHxriepMh+UTQt2dGhESw8eJ294ZR7YTOwtuT2kg=="; + url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.134.0.tgz"; + sha512 = "NSKYh8+rnVcXjag77rw2BNng7HZscmEIkhMDeMPkGI+l0pM9xzIU6XUn8N8BG9il9mt95liIgIiLcmAEYZCUhw=="; }; }; - "@rushstack/rush-sdk-5.130.2" = { + "@rushstack/rush-sdk-5.134.0" = { name = "_at_rushstack_slash_rush-sdk"; packageName = "@rushstack/rush-sdk"; - version = "5.130.2"; + version = "5.134.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.130.2.tgz"; - sha512 = "f9ZC/NnT7AVTkd5gxVcS4Hi3qZcA/8RbXCt7F08y7HJ4mlmojVdZTfsuHhwiDhX3dLd4b1AflU8A7joZE9tYhQ=="; + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.134.0.tgz"; + sha512 = "oy4DeMM+fK107VW3W1FNw/xC3JyKmAn/Wea1C4J91Bn9DW2674Ik5e0iC7NWxPn0jC1s4c9WyHPNaqOaW0ojzQ=="; }; }; - "@rushstack/stream-collator-4.1.60" = { + "@rushstack/stream-collator-4.1.67" = { name = "_at_rushstack_slash_stream-collator"; packageName = "@rushstack/stream-collator"; - version = "4.1.60"; + version = "4.1.67"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.1.60.tgz"; - sha512 = "qebgAhqkzmV0h0HgImOCLSVUhJq2nA/qTLXae9auWWy5XHRFS41pwQdeajyht04aYGtrxEQELSHRq7PqMtQfaA=="; + url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.1.67.tgz"; + sha512 = "gb8lP0pQ8qA5/54MpetF16oVlK7ruTH1N/Hk72Brx3S0sXpJbc6SrZz6Ifi6OjHr2/ZS8HmG9PGq9btUkq0uxw=="; }; }; - "@rushstack/terminal-0.13.2" = { + "@rushstack/terminal-0.14.2" = { name = "_at_rushstack_slash_terminal"; packageName = "@rushstack/terminal"; - version = "0.13.2"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.13.2.tgz"; - sha512 = "t8i0PsGvBHmFBY8pryO3badqFlxQsm2rw3KYrzjcmVkG/WGklKg1qVkr9beAS1Oe8XWDRgj6SkoHkpNjs7aaNw=="; + url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.14.2.tgz"; + sha512 = "2fC1wqu1VCExKC0/L+0noVcFQEXEnoBOtCIex1TOjBzEDWcw8KzJjjj7aTP6mLxepG0XIyn9OufeFb6SFsa+sg=="; }; }; - "@rushstack/ts-command-line-4.22.2" = { + "@rushstack/ts-command-line-4.22.8" = { name = "_at_rushstack_slash_ts-command-line"; packageName = "@rushstack/ts-command-line"; - version = "4.22.2"; + version = "4.22.8"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.22.2.tgz"; - sha512 = "xkvrGd6D9dPlI3I401Thc640WNsEPB1sGEmy12a2VJaPQPwhE6Ik0gEVPZJ/2G1w213eaCAdxUY1xpiTulsmpA=="; + url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.22.8.tgz"; + sha512 = "XbFjOoV7qZHJnSuFUHv0pKaFA4ixyCuki+xMjsMfDwfvQjs5MYG0IK5COal3tRnG7KCDe2l/G+9LrzYE/RJhgg=="; }; }; "@samverschueren/stream-to-observable-0.3.1" = { @@ -9004,22 +8680,22 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-18.1.2" = { + "@schematics/angular-18.2.5" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "18.1.2"; + version = "18.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-18.1.2.tgz"; - sha512 = "lTY9twQ30vEm3hjArUKQjKiYlbDUOHqbyY7MlynY5+T8XtYreMo20KHofxv5t5xZfPwj1z6/ppcMU2xZ4WbGUA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.5.tgz"; + sha512 = "tBXhk9OGT4U6VsBNbuCNl2ITDOF3NYdGrEieIHU+lHSkpJNGZUIGxCgXCETXkmXDq1pe4wFZSKelWjeqYDfX0g=="; }; }; - "@scure/base-1.1.7" = { + "@scure/base-1.1.9" = { name = "_at_scure_slash_base"; packageName = "@scure/base"; - version = "1.1.7"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@scure/base/-/base-1.1.7.tgz"; - sha512 = "PPNYBslrLNNUQ/Yad37MHYsNQtK67EhWb6WtSvNLLPo7SdVZgkUjD6Dg+5On7zNwmskf8OX7I7Nx5oN+MIWE0g=="; + url = "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz"; + sha512 = "8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg=="; }; }; "@scure/bip32-1.4.0" = { @@ -9067,15 +8743,6 @@ let sha512 = "ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw=="; }; }; - "@selderee/plugin-htmlparser2-0.11.0" = { - name = "_at_selderee_slash_plugin-htmlparser2"; - packageName = "@selderee/plugin-htmlparser2"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.11.0.tgz"; - sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="; - }; - }; "@sentry-internal/tracing-7.116.0" = { name = "_at_sentry-internal_slash_tracing"; packageName = "@sentry-internal/tracing"; @@ -9319,13 +8986,13 @@ let sha512 = "tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ=="; }; }; - "@smithy/abort-controller-3.1.1" = { + "@smithy/abort-controller-3.1.4" = { name = "_at_smithy_slash_abort-controller"; packageName = "@smithy/abort-controller"; - version = "3.1.1"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.1.tgz"; - sha512 = "MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ=="; + url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.4.tgz"; + sha512 = "VupaALAQlXViW3/enTf/f5l5JZYSAxoJL7f0nanhNNKnww6DGCg1oYIuNP78KDugnkwthBO6iEcym16HhWV8RQ=="; }; }; "@smithy/chunked-blob-reader-3.0.0" = { @@ -9346,121 +9013,121 @@ let sha512 = "VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg=="; }; }; - "@smithy/config-resolver-3.0.5" = { + "@smithy/config-resolver-3.0.8" = { name = "_at_smithy_slash_config-resolver"; packageName = "@smithy/config-resolver"; - version = "3.0.5"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.5.tgz"; - sha512 = "SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA=="; + url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.8.tgz"; + sha512 = "Tv1obAC18XOd2OnDAjSWmmthzx6Pdeh63FbLin8MlPiuJ2ATpKkq0NcNOJFr0dO+JmZXnwu8FQxKJ3TKJ3Hulw=="; }; }; - "@smithy/core-2.3.0" = { + "@smithy/core-2.4.3" = { name = "_at_smithy_slash_core"; packageName = "@smithy/core"; - version = "2.3.0"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/core/-/core-2.3.0.tgz"; - sha512 = "tvSwf+PF5uurExeJsl+sSNn4bPsYShL86fJ/wcj63cioJ0IF131BxC5QxX8qkIISk7Pr7g2+UJH9ib4cCafvqw=="; + url = "https://registry.npmjs.org/@smithy/core/-/core-2.4.3.tgz"; + sha512 = "4LTusLqFMRVQUfC3RNuTg6IzYTeJNpydRdTKq7J5wdEyIRQSu3rGIa3s80mgG2hhe6WOZl9IqTSo1pgbn6EHhA=="; }; }; - "@smithy/credential-provider-imds-3.2.0" = { + "@smithy/credential-provider-imds-3.2.3" = { name = "_at_smithy_slash_credential-provider-imds"; packageName = "@smithy/credential-provider-imds"; - version = "3.2.0"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.0.tgz"; - sha512 = "0SCIzgd8LYZ9EJxUjLXBmEKSZR/P/w6l7Rz/pab9culE/RWuqelAKGJvn5qUOl8BgX8Yj5HWM50A5hiB/RzsgA=="; + url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.3.tgz"; + sha512 = "VoxMzSzdvkkjMJNE38yQgx4CfnmT+Z+5EUXkg4x7yag93eQkVQgZvN3XBSHC/ylfBbLbAtdu7flTCChX9I+mVg=="; }; }; - "@smithy/eventstream-codec-3.1.2" = { + "@smithy/eventstream-codec-3.1.5" = { name = "_at_smithy_slash_eventstream-codec"; packageName = "@smithy/eventstream-codec"; - version = "3.1.2"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.2.tgz"; - sha512 = "0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw=="; + url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.5.tgz"; + sha512 = "6pu+PT2r+5ZnWEV3vLV1DzyrpJ0TmehQlniIDCSpZg6+Ji2SfOI38EqUyQ+O8lotVElCrfVc9chKtSMe9cmCZQ=="; }; }; - "@smithy/eventstream-serde-browser-3.0.5" = { + "@smithy/eventstream-serde-browser-3.0.9" = { name = "_at_smithy_slash_eventstream-serde-browser"; packageName = "@smithy/eventstream-serde-browser"; - version = "3.0.5"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.5.tgz"; - sha512 = "dEyiUYL/ekDfk+2Ra4GxV+xNnFoCmk1nuIXg+fMChFTrM2uI/1r9AdiTYzPqgb72yIv/NtAj6C3dG//1wwgakQ=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.9.tgz"; + sha512 = "PiQLo6OQmZAotJweIcObL1H44gkvuJACKMNqpBBe5Rf2Ax1DOcGi/28+feZI7yTe1ERHlQQaGnm8sSkyDUgsMg=="; }; }; - "@smithy/eventstream-serde-config-resolver-3.0.3" = { + "@smithy/eventstream-serde-config-resolver-3.0.6" = { name = "_at_smithy_slash_eventstream-serde-config-resolver"; packageName = "@smithy/eventstream-serde-config-resolver"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.3.tgz"; - sha512 = "NVTYjOuYpGfrN/VbRQgn31x73KDLfCXCsFdad8DiIc3IcdxL+dYA9zEQPyOP7Fy2QL8CPy2WE4WCUD+ZsLNfaQ=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.6.tgz"; + sha512 = "iew15It+c7WfnVowWkt2a7cdPp533LFJnpjDQgfZQcxv2QiOcyEcea31mnrk5PVbgo0nNH3VbYGq7myw2q/F6A=="; }; }; - "@smithy/eventstream-serde-node-3.0.4" = { + "@smithy/eventstream-serde-node-3.0.8" = { name = "_at_smithy_slash_eventstream-serde-node"; packageName = "@smithy/eventstream-serde-node"; - version = "3.0.4"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.4.tgz"; - sha512 = "mjlG0OzGAYuUpdUpflfb9zyLrBGgmQmrobNT8b42ZTsGv/J03+t24uhhtVEKG/b2jFtPIHF74Bq+VUtbzEKOKg=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.8.tgz"; + sha512 = "6m+wI+fT0na+6oao6UqALVA38fsScCpoG5UO/A8ZSyGLnPM2i4MS1cFUhpuALgvLMxfYoTCh7qSeJa0aG4IWpQ=="; }; }; - "@smithy/eventstream-serde-universal-3.0.4" = { + "@smithy/eventstream-serde-universal-3.0.8" = { name = "_at_smithy_slash_eventstream-serde-universal"; packageName = "@smithy/eventstream-serde-universal"; - version = "3.0.4"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.4.tgz"; - sha512 = "Od9dv8zh3PgOD7Vj4T3HSuox16n0VG8jJIM2gvKASL6aCtcS8CfHZDWe1Ik3ZXW6xBouU+45Q5wgoliWDZiJ0A=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.8.tgz"; + sha512 = "09tqzIQ6e+7jLqGvRji1yJoDbL/zob0OFhq75edgStWErGLf16+yI5hRc/o9/YAybOhUZs/swpW2SPn892G5Gg=="; }; }; - "@smithy/fetch-http-handler-3.2.3" = { + "@smithy/fetch-http-handler-3.2.7" = { name = "_at_smithy_slash_fetch-http-handler"; packageName = "@smithy/fetch-http-handler"; - version = "3.2.3"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.3.tgz"; - sha512 = "m4dzQeafWi5KKCCnDwGGHYk9lqcLs9LvlXZRB0J38DMectsEbxdiO/Rx1NaYYMIkath7AnjpR+r0clL+7dwclQ=="; + url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.7.tgz"; + sha512 = "Ra6IPI1spYLO+t62/3jQbodjOwAbto9wlpJdHZwkycm0Kit+GVpzHW/NMmSgY4rK1bjJ4qLAmCnaBzePO5Nkkg=="; }; }; - "@smithy/hash-blob-browser-3.1.2" = { + "@smithy/hash-blob-browser-3.1.5" = { name = "_at_smithy_slash_hash-blob-browser"; packageName = "@smithy/hash-blob-browser"; - version = "3.1.2"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.2.tgz"; - sha512 = "hAbfqN2UbISltakCC2TP0kx4LqXBttEv2MqSPE98gVuDFMf05lU+TpC41QtqGP3Ff5A3GwZMPfKnEy0VmEUpmg=="; + url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.5.tgz"; + sha512 = "Vi3eoNCmao4iKglS80ktYnBOIqZhjbDDwa1IIbF/VaJ8PsHnZTQ5wSicicPrU7nTI4JPFn92/txzWkh4GlK18Q=="; }; }; - "@smithy/hash-node-3.0.3" = { + "@smithy/hash-node-3.0.6" = { name = "_at_smithy_slash_hash-node"; packageName = "@smithy/hash-node"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.3.tgz"; - sha512 = "2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw=="; + url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.6.tgz"; + sha512 = "c/FHEdKK/7DU2z6ZE91L36ahyXWayR3B+FzELjnYq7wH5YqIseM24V+pWCS9kFn1Ln8OFGTf+pyYPiHZuX0s/Q=="; }; }; - "@smithy/hash-stream-node-3.1.2" = { + "@smithy/hash-stream-node-3.1.5" = { name = "_at_smithy_slash_hash-stream-node"; packageName = "@smithy/hash-stream-node"; - version = "3.1.2"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.1.2.tgz"; - sha512 = "PBgDMeEdDzi6JxKwbfBtwQG9eT9cVwsf0dZzLXoJF4sHKHs5HEo/3lJWpn6jibfJwT34I1EBXpBnZE8AxAft6g=="; + url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.1.5.tgz"; + sha512 = "61CyFCzqN3VBfcnGX7mof/rkzLb8oHjm4Lr6ZwBIRpBssBb8d09ChrZAqinP2rUrA915BRNkq9NpJz18N7+3hQ=="; }; }; - "@smithy/invalid-dependency-3.0.3" = { + "@smithy/invalid-dependency-3.0.6" = { name = "_at_smithy_slash_invalid-dependency"; packageName = "@smithy/invalid-dependency"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz"; - sha512 = "ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw=="; + url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.6.tgz"; + sha512 = "czM7Ioq3s8pIXht7oD+vmgy4Wfb4XavU/k/irO8NdXFFOx7YAlsCCcKOh/lJD1mJSYQqiR7NmpZ9JviryD/7AQ=="; }; }; "@smithy/is-array-buffer-2.2.0" = { @@ -9481,166 +9148,166 @@ let sha512 = "+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ=="; }; }; - "@smithy/md5-js-3.0.3" = { + "@smithy/md5-js-3.0.6" = { name = "_at_smithy_slash_md5-js"; packageName = "@smithy/md5-js"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.3.tgz"; - sha512 = "O/SAkGVwpWmelpj/8yDtsaVe6sINHLB1q8YE/+ZQbDxIw3SRLbTZuRaI10K12sVoENdnHqzPp5i3/H+BcZ3m3Q=="; + url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.6.tgz"; + sha512 = "Ze690T8O3M5SVbb70WormwrKzVf9QQRtIuxtJDgpUQDkmt+PtdYDetBbyCbF9ryupxLw6tgzWKgwffAShhVIXQ=="; }; }; - "@smithy/middleware-content-length-3.0.5" = { + "@smithy/middleware-content-length-3.0.8" = { name = "_at_smithy_slash_middleware-content-length"; packageName = "@smithy/middleware-content-length"; - version = "3.0.5"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.5.tgz"; - sha512 = "ILEzC2eyxx6ncej3zZSwMpB5RJ0zuqH7eMptxC4KN3f+v9bqT8ohssKbhNR78k/2tWW+KS5Spw+tbPF4Ejyqvw=="; + url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.8.tgz"; + sha512 = "VuyszlSO49WKh3H9/kIO2kf07VUwGV80QRiaDxUfP8P8UKlokz381ETJvwLhwuypBYhLymCYyNhB3fLAGBX2og=="; }; }; - "@smithy/middleware-endpoint-3.1.0" = { + "@smithy/middleware-endpoint-3.1.3" = { name = "_at_smithy_slash_middleware-endpoint"; packageName = "@smithy/middleware-endpoint"; - version = "3.1.0"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.0.tgz"; - sha512 = "5y5aiKCEwg9TDPB4yFE7H6tYvGFf1OJHNczeY10/EFF8Ir8jZbNntQJxMWNfeQjC1mxPsaQ6mR9cvQbf+0YeMw=="; + url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.3.tgz"; + sha512 = "KeM/OrK8MVFUsoJsmCN0MZMVPjKKLudn13xpgwIMpGTYpA8QZB2Xq5tJ+RE6iu3A6NhOI4VajDTwBsm8pwwrhg=="; }; }; - "@smithy/middleware-retry-3.0.12" = { + "@smithy/middleware-retry-3.0.18" = { name = "_at_smithy_slash_middleware-retry"; packageName = "@smithy/middleware-retry"; - version = "3.0.12"; + version = "3.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.12.tgz"; - sha512 = "CncrlzNiBzuZZYLJ49H4dC6FEz62hnv0Y0nJyl/oZ73FX/9CDHWkIRD4ZOf5ntB6QyYWx0G3mXAOHOcM5omlLg=="; + url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.18.tgz"; + sha512 = "YU1o/vYob6vlqZdd97MN8cSXRToknLXhFBL3r+c9CZcnxkO/rgNZ++CfgX2vsmnEKvlqdi26+SRtSzlVp5z6Mg=="; }; }; - "@smithy/middleware-serde-3.0.3" = { + "@smithy/middleware-serde-3.0.6" = { name = "_at_smithy_slash_middleware-serde"; packageName = "@smithy/middleware-serde"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz"; - sha512 = "puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA=="; + url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.6.tgz"; + sha512 = "KKTUSl1MzOM0MAjGbudeaVNtIDo+PpekTBkCNwvfZlKndodrnvRo+00USatiyLOc0ujjO9UydMRu3O9dYML7ag=="; }; }; - "@smithy/middleware-stack-3.0.3" = { + "@smithy/middleware-stack-3.0.6" = { name = "_at_smithy_slash_middleware-stack"; packageName = "@smithy/middleware-stack"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz"; - sha512 = "r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA=="; + url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.6.tgz"; + sha512 = "2c0eSYhTQ8xQqHMcRxLMpadFbTXg6Zla5l0mwNftFCZMQmuhI7EbAJMx6R5eqfuV3YbJ3QGyS3d5uSmrHV8Khg=="; }; }; - "@smithy/node-config-provider-3.1.4" = { + "@smithy/node-config-provider-3.1.7" = { name = "_at_smithy_slash_node-config-provider"; packageName = "@smithy/node-config-provider"; - version = "3.1.4"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.4.tgz"; - sha512 = "YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ=="; + url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.7.tgz"; + sha512 = "g3mfnC3Oo8pOI0dYuPXLtdW1WGVb3bR2tkV21GNkm0ZvQjLTtamXAwCWt/FCb0HGvKt3gHHmF1XerG0ICfalOg=="; }; }; - "@smithy/node-http-handler-3.1.4" = { + "@smithy/node-http-handler-3.2.2" = { name = "_at_smithy_slash_node-http-handler"; packageName = "@smithy/node-http-handler"; - version = "3.1.4"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.1.4.tgz"; - sha512 = "+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg=="; + url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.2.tgz"; + sha512 = "42Cy4/oT2O+00aiG1iQ7Kd7rE6q8j7vI0gFfnMlUiATvyo8vefJkhb7O10qZY0jAqo5WZdUzfl9IV6wQ3iMBCg=="; }; }; - "@smithy/property-provider-3.1.3" = { + "@smithy/property-provider-3.1.6" = { name = "_at_smithy_slash_property-provider"; packageName = "@smithy/property-provider"; - version = "3.1.3"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.3.tgz"; - sha512 = "zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g=="; + url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.6.tgz"; + sha512 = "NK3y/T7Q/Bw+Z8vsVs9MYIQ5v7gOX7clyrXcwhhIBQhbPgRl6JDrZbusO9qWDhcEus75Tg+VCxtIRfo3H76fpw=="; }; }; - "@smithy/protocol-http-4.1.0" = { + "@smithy/protocol-http-4.1.3" = { name = "_at_smithy_slash_protocol-http"; packageName = "@smithy/protocol-http"; - version = "4.1.0"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.0.tgz"; - sha512 = "dPVoHYQ2wcHooGXg3LQisa1hH0e4y0pAddPMeeUPipI1tEOqL6A4N0/G7abeq+K8wrwSgjk4C0wnD1XZpJm5aA=="; + url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.3.tgz"; + sha512 = "GcbMmOYpH9iRqtC05RbRnc/0FssxSTHlmaNhYBTgSgNCYpdR3Kt88u5GAZTBmouzv+Zlj/VRv92J9ruuDeJuEw=="; }; }; - "@smithy/querystring-builder-3.0.3" = { + "@smithy/querystring-builder-3.0.6" = { name = "_at_smithy_slash_querystring-builder"; packageName = "@smithy/querystring-builder"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz"; - sha512 = "vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw=="; + url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.6.tgz"; + sha512 = "sQe08RunoObe+Usujn9+R2zrLuQERi3CWvRO3BvnoWSYUaIrLKuAIeY7cMeDax6xGyfIP3x/yFWbEKSXvOnvVg=="; }; }; - "@smithy/querystring-parser-3.0.3" = { + "@smithy/querystring-parser-3.0.6" = { name = "_at_smithy_slash_querystring-parser"; packageName = "@smithy/querystring-parser"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz"; - sha512 = "zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ=="; + url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.6.tgz"; + sha512 = "UJKw4LlEkytzz2Wq+uIdHf6qOtFfee/o7ruH0jF5I6UAuU+19r9QV7nU3P/uI0l6+oElRHmG/5cBBcGJrD7Ozg=="; }; }; - "@smithy/service-error-classification-3.0.3" = { + "@smithy/service-error-classification-3.0.6" = { name = "_at_smithy_slash_service-error-classification"; packageName = "@smithy/service-error-classification"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz"; - sha512 = "Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ=="; + url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.6.tgz"; + sha512 = "53SpchU3+DUZrN7J6sBx9tBiCVGzsib2e4sc512Q7K9fpC5zkJKs6Z9s+qbMxSYrkEkle6hnMtrts7XNkMJJMg=="; }; }; - "@smithy/shared-ini-file-loader-3.1.4" = { + "@smithy/shared-ini-file-loader-3.1.7" = { name = "_at_smithy_slash_shared-ini-file-loader"; packageName = "@smithy/shared-ini-file-loader"; - version = "3.1.4"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.4.tgz"; - sha512 = "qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ=="; + url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.7.tgz"; + sha512 = "IA4K2qTJYXkF5OfVN4vsY1hfnUZjaslEE8Fsr/gGFza4TAC2A9NfnZuSY2srQIbt9bwtjHiAayrRVgKse4Q7fA=="; }; }; - "@smithy/signature-v4-4.1.0" = { + "@smithy/signature-v4-4.1.3" = { name = "_at_smithy_slash_signature-v4"; packageName = "@smithy/signature-v4"; - version = "4.1.0"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.1.0.tgz"; - sha512 = "aRryp2XNZeRcOtuJoxjydO6QTaVhxx/vjaR+gx7ZjaFgrgPRyZ3HCTbfwqYj6ZWEBHkCSUfcaymKPURaByukag=="; + url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.1.3.tgz"; + sha512 = "YD2KYSCEEeFHcWZ1E3mLdAaHl8T/TANh6XwmocQ6nPcTdBfh4N5fusgnblnWDlnlU1/cUqEq3PiGi22GmT2Lkg=="; }; }; - "@smithy/smithy-client-3.1.10" = { + "@smithy/smithy-client-3.3.2" = { name = "_at_smithy_slash_smithy-client"; packageName = "@smithy/smithy-client"; - version = "3.1.10"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.10.tgz"; - sha512 = "OLHJo0DAmhX69YUF3WbNfzzxGIncGdxao+v27o24msdhin2AWTxJMaBQ3iPGfIrWMjy+8YGMXUJ7PrkJlpznTw=="; + url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.3.2.tgz"; + sha512 = "RKDfhF2MTwXl7jan5d7QfS9eCC6XJbO3H+EZAvLQN8A5in4ib2Ml4zoeLo57w9QrqFekBPcsoC2hW3Ekw4vQ9Q=="; }; }; - "@smithy/types-3.3.0" = { + "@smithy/types-3.4.2" = { name = "_at_smithy_slash_types"; packageName = "@smithy/types"; - version = "3.3.0"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/types/-/types-3.3.0.tgz"; - sha512 = "IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA=="; + url = "https://registry.npmjs.org/@smithy/types/-/types-3.4.2.tgz"; + sha512 = "tHiFcfcVedVBHpmHUEUHOCCih8iZbIAYn9NvPsNzaPm/237I3imdDdZoOC8c87H5HBAVEa06tTgb+OcSWV9g5w=="; }; }; - "@smithy/url-parser-3.0.3" = { + "@smithy/url-parser-3.0.6" = { name = "_at_smithy_slash_url-parser"; packageName = "@smithy/url-parser"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.3.tgz"; - sha512 = "pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A=="; + url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.6.tgz"; + sha512 = "47Op/NU8Opt49KyGpHtVdnmmJMsp2hEwBdyjuFB9M2V5QVOwA7pBhhxKN5z6ztKGrMw76gd8MlbPuzzvaAncuQ=="; }; }; "@smithy/util-base64-3.0.0" = { @@ -9697,31 +9364,31 @@ let sha512 = "pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ=="; }; }; - "@smithy/util-defaults-mode-browser-3.0.12" = { + "@smithy/util-defaults-mode-browser-3.0.18" = { name = "_at_smithy_slash_util-defaults-mode-browser"; packageName = "@smithy/util-defaults-mode-browser"; - version = "3.0.12"; + version = "3.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.12.tgz"; - sha512 = "5b81UUPKjD61DMg7JBYzkSM1Vny/RfRRhnZYzuWjm25OyrEXsar3RgbbXYR+otdx+wrPR3QmuFtbDZmEgGpwVg=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.18.tgz"; + sha512 = "/eveCzU6Z6Yw8dlYQLA4rcK30XY0E4L3lD3QFHm59mzDaWYelrXE1rlynuT3J6qxv+5yNy3a1JuzhG5hk5hcmw=="; }; }; - "@smithy/util-defaults-mode-node-3.0.12" = { + "@smithy/util-defaults-mode-node-3.0.18" = { name = "_at_smithy_slash_util-defaults-mode-node"; packageName = "@smithy/util-defaults-mode-node"; - version = "3.0.12"; + version = "3.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.12.tgz"; - sha512 = "g2NdtGDN67PepBs0t/mkrlQ2nVkhKUDJZCNmEJIarzYq2sK4mKO9t61Nzlv+gHEEC3ESfRaMCC/Ol3ZfCZYg7Q=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.18.tgz"; + sha512 = "9cfzRjArtOFPlTYRREJk00suUxVXTgbrzVncOyMRTUeMKnecG/YentLF3cORa+R6mUOMSrMSnT18jos1PKqK6Q=="; }; }; - "@smithy/util-endpoints-2.0.5" = { + "@smithy/util-endpoints-2.1.2" = { name = "_at_smithy_slash_util-endpoints"; packageName = "@smithy/util-endpoints"; - version = "2.0.5"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.0.5.tgz"; - sha512 = "ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg=="; + url = "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.2.tgz"; + sha512 = "FEISzffb4H8DLzGq1g4MuDpcv6CIG15fXoQzDH9SjpRJv6h7J++1STFWWinilG0tQh9H1v2UKWG19Jjr2B16zQ=="; }; }; "@smithy/util-hex-encoding-3.0.0" = { @@ -9733,31 +9400,31 @@ let sha512 = "eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ=="; }; }; - "@smithy/util-middleware-3.0.3" = { + "@smithy/util-middleware-3.0.6" = { name = "_at_smithy_slash_util-middleware"; packageName = "@smithy/util-middleware"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.3.tgz"; - sha512 = "l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw=="; + url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.6.tgz"; + sha512 = "BxbX4aBhI1O9p87/xM+zWy0GzT3CEVcXFPBRDoHAM+pV0eSW156pR+PSYEz0DQHDMYDsYAflC2bQNz2uaDBUZQ=="; }; }; - "@smithy/util-retry-3.0.3" = { + "@smithy/util-retry-3.0.6" = { name = "_at_smithy_slash_util-retry"; packageName = "@smithy/util-retry"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.3.tgz"; - sha512 = "AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w=="; + url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.6.tgz"; + sha512 = "BRZiuF7IwDntAbevqMco67an0Sr9oLQJqqRCsSPZZHYRnehS0LHDAkJk/pSmI7Z8c/1Vet294H7fY2fWUgB+Rg=="; }; }; - "@smithy/util-stream-3.1.2" = { + "@smithy/util-stream-3.1.6" = { name = "_at_smithy_slash_util-stream"; packageName = "@smithy/util-stream"; - version = "3.1.2"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.2.tgz"; - sha512 = "08zDzB7BqvybHfZKnav5lL1UniFDK6o6nZ3OWp60PKsi/na2LpU6OX8MCtDNVaPBpKpc8EH26fvFhNT6wvMlbw=="; + url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.6.tgz"; + sha512 = "lQEUfTx1ht5CRdvIjdAN/gUL6vQt2wSARGGLaBHNe+iJSkRHlWzY+DOn0mFTmTgyU3jcI5n9DkT5gTzYuSOo6A=="; }; }; "@smithy/util-uri-escape-3.0.0" = { @@ -9787,13 +9454,13 @@ let sha512 = "rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="; }; }; - "@smithy/util-waiter-3.1.2" = { + "@smithy/util-waiter-3.1.5" = { name = "_at_smithy_slash_util-waiter"; packageName = "@smithy/util-waiter"; - version = "3.1.2"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.1.2.tgz"; - sha512 = "4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw=="; + url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.1.5.tgz"; + sha512 = "jYOSvM3H6sZe3CHjzD2VQNCjWBJs+4DbtwBMvUp9y5EnnwNa7NQxTeYeQw0CKCAdGGZ3QvVkyJmvbvs5M/B10A=="; }; }; "@socket.io/component-emitter-3.1.2" = { @@ -9814,13 +9481,13 @@ let sha512 = "0p9uXkuB22qGdNfy3VeEhxkU5uwvp/KrBTAbrLBURv6ilxIVwanKwjMc41lQfIVgPGcOkmLbTolfFrSsueu7zA=="; }; }; - "@stoplight/json-3.21.4" = { + "@stoplight/json-3.21.7" = { name = "_at_stoplight_slash_json"; packageName = "@stoplight/json"; - version = "3.21.4"; + version = "3.21.7"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/json/-/json-3.21.4.tgz"; - sha512 = "dNfiOuyl3/62Bs7o21v6EUvvhUFsPTK5kJMlST1SMnEyjyyMB/b0uoc7w3Df+TSGB2j2+vep4gdsKG3eUpc7Lg=="; + url = "https://registry.npmjs.org/@stoplight/json/-/json-3.21.7.tgz"; + sha512 = "xcJXgKFqv/uCEgtGlPxy3tPA+4I+ZI4vAuMJ885+ThkTHFVkC+0Fm58lA9NlsyjnkpxFh4YiQWpH+KefHdbA0A=="; }; }; "@stoplight/json-ref-readers-1.2.2" = { @@ -9859,31 +9526,31 @@ let sha512 = "lyIc6JUlUA8Ve5ELywPC8I2Sdnh1zc1zmbYgVarhXIp9YeAB0ReeqmGEOWNtlHkbP2DAA1AL65Wfn2ncjK/jtQ=="; }; }; - "@stoplight/spectral-core-1.18.3" = { + "@stoplight/spectral-core-1.19.1" = { name = "_at_stoplight_slash_spectral-core"; packageName = "@stoplight/spectral-core"; - version = "1.18.3"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.18.3.tgz"; - sha512 = "YY8x7X2SWJIhGTLPol+eFiQpWPz0D0mJdkK2i4A0QJG68KkNhypP6+JBC7/Kz3XWjqr0L/RqAd+N5cQLPOKZGQ=="; + url = "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.19.1.tgz"; + sha512 = "YiWhXdjyjn4vCl3102ywzwCEJzncxapFcj4dxcj1YP/bZ62DFeGJ8cEaMP164vSw2kI3rX7EMMzI/c8XOUnTfQ=="; }; }; - "@stoplight/spectral-formats-1.6.0" = { + "@stoplight/spectral-formats-1.7.0" = { name = "_at_stoplight_slash_spectral-formats"; packageName = "@stoplight/spectral-formats"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.6.0.tgz"; - sha512 = "X27qhUfNluiduH0u/QwJqhOd8Wk5YKdxVmKM03Aijlx0AH1H5mYt3l9r7t2L4iyJrsBaFPnMGt7UYJDGxszbNA=="; + url = "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.7.0.tgz"; + sha512 = "vJ1vIkA2s96fdJp0d3AJBGuPAW3sj8yMamyzR+dquEFO6ZAoYBo/BVsKKQskYzZi/nwljlRqUmGVmcf2PncIaA=="; }; }; - "@stoplight/spectral-functions-1.8.0" = { + "@stoplight/spectral-functions-1.9.0" = { name = "_at_stoplight_slash_spectral-functions"; packageName = "@stoplight/spectral-functions"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-functions/-/spectral-functions-1.8.0.tgz"; - sha512 = "ZrAkYA/ZGbuQ6EyG1gisF4yQ5nWP/+glcqVoGmS6kH6ekaynz2Yp6FL0oIamWj3rWedFUN7ppwTRUdo+9f/uCw=="; + url = "https://registry.npmjs.org/@stoplight/spectral-functions/-/spectral-functions-1.9.0.tgz"; + sha512 = "T+xl93ji8bpus4wUsTq8Qr2DSu2X9PO727rbxW61tTCG0s17CbsXOLYI+Ezjg5P6aaQlgXszGX8khtc57xk8Yw=="; }; }; "@stoplight/spectral-parsers-1.0.4" = { @@ -9904,13 +9571,13 @@ let sha512 = "5baQIYL0NJTSVy8v6RxOR4U51xOUYM8wJri1YvlAT6bPN8m0EIxMwfVYi0xUZEMVeHcWx869nIkoqyWmOutF2A=="; }; }; - "@stoplight/spectral-rulesets-1.19.1" = { + "@stoplight/spectral-rulesets-1.20.2" = { name = "_at_stoplight_slash_spectral-rulesets"; packageName = "@stoplight/spectral-rulesets"; - version = "1.19.1"; + version = "1.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.19.1.tgz"; - sha512 = "rfGK87Y1JJCEeLC8MVdLkjUkRH+Y6VnSF388D+UWihfU9xuq2eNB9phWpTFkG+AG4HLRyGx963BmO6PyM9dBag=="; + url = "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.20.2.tgz"; + sha512 = "7Y8orZuNyGyeHr9n50rMfysgUJ+/zzIEHMptt66jiy82GUWl+0nr865DkMuXdC5GryfDYhtjoRTUCVsXu80Nkg=="; }; }; "@stoplight/spectral-runtime-1.1.2" = { @@ -10030,13 +9697,13 @@ let sha512 = "JxIvIo/Hrpv0JCHSyRpetAdQ6lB27oFYhv0PKCNf1g2gUXOjpeR1exrXccRxLMuAV5WAmGFBwRnNOJqN38+qtg=="; }; }; - "@swc/core-1.7.1" = { + "@swc/core-1.7.26" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.7.1"; + version = "1.7.26"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.7.1.tgz"; - sha512 = "M4gxJcvzZCH+QQJGVJDF3kT46C05IUPTFcA1wA65WAdg87MDzpr1mwtB/FmPsdcRFRbJIxET6uCsWgubn+KnJQ=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.7.26.tgz"; + sha512 = "f5uYFf+TmMQyYIoxkn/evWhNGuUzC730dFwAKGwBVHHVoPyak1/GvJUm6i1SKl+2Hrj9oN0i3WSoWWZ4pgI8lw=="; }; }; "@swc/counter-0.1.3" = { @@ -10048,13 +9715,13 @@ let sha512 = "e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ=="; }; }; - "@swc/helpers-0.5.12" = { + "@swc/helpers-0.5.13" = { name = "_at_swc_slash_helpers"; packageName = "@swc/helpers"; - version = "0.5.12"; + version = "0.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.12.tgz"; - sha512 = "KMZNXiGibsW9kvZAO1Pam2JPTDBm+KSHMMHWdsyI/1DbIZjT2A6Gy3hblVXUMEDvUAKq+e0vL0X0o54owWji7g=="; + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.13.tgz"; + sha512 = "UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w=="; }; }; "@swc/types-0.1.12" = { @@ -10066,13 +9733,13 @@ let sha512 = "wBJA+SdtkbFhHjTMYH+dEH1y4VpfGdAc2Kw/LK09i9bXd/K6j6PkDcFCEzb6iVfZMkPRrl/q0e3toqTAJdkIVA=="; }; }; - "@swc/wasm-1.7.1" = { + "@swc/wasm-1.7.26" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.7.1"; + version = "1.7.26"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.7.1.tgz"; - sha512 = "K+o9bzvz6VhPr3E4je1Paz7p8zwNM6QBSlvwhGMFgxGXSb0X3yz0dihU/DUzqHwBmc1QLmN1yE6o7jqMtCJgmg=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.7.26.tgz"; + sha512 = "X64mU3iXe6FaPgZ40HxUfBDmjwc9hILMiuM1VohzQAXMZLdff9dgeZqJ7EzAxtuqUqgqQ9sqHj8hS8vEceSGXA=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -10129,15 +9796,6 @@ let sha512 = "/FcGQVvXAslhiC9aMG5gxKXJctg8N7XLZrP+wYrFTFccWEPZd/Xon5y7jUXpKOVSOFEA1MOKZKbPuK4ET5/T8Q=="; }; }; - "@thaunknown/idb-chunk-store-1.0.4" = { - name = "_at_thaunknown_slash_idb-chunk-store"; - packageName = "@thaunknown/idb-chunk-store"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@thaunknown/idb-chunk-store/-/idb-chunk-store-1.0.4.tgz"; - sha512 = "4/XDQZHKHyJCGeqnVjHyqeAXClZJ9l90rRvoTslUiuvwTGAUpIb3poL0LfGJEdSuWV+zzGdDjIm/3L4x6crwbg=="; - }; - }; "@thaunknown/simple-peer-10.0.10" = { name = "_at_thaunknown_slash_simple-peer"; packageName = "@thaunknown/simple-peer"; @@ -10165,31 +9823,31 @@ let sha512 = "Q53KyCXweV1CS62EfqtPDqfpksn5keQ59PGqzzkK+g8Vif1jB4inoBCcs/BUSdsqddhE3G+2Fn+4RX3S6RqT0A=="; }; }; - "@tinyhttp/accepts-2.2.2" = { + "@tinyhttp/accepts-2.2.3" = { name = "_at_tinyhttp_slash_accepts"; packageName = "@tinyhttp/accepts"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/accepts/-/accepts-2.2.2.tgz"; - sha512 = "DmngnwOaPgNUGgTpX1UdlNrXaGG6k5rHFzslcYlvSQIg7s0PI6bF86U0fYq3q+yhJhKbnwzFez0wU1lAP+bKvA=="; + url = "https://registry.npmjs.org/@tinyhttp/accepts/-/accepts-2.2.3.tgz"; + sha512 = "9pQN6pJAJOU3McmdJWTcyq7LLFW8Lj5q+DadyKcvp+sxMkEpktKX5sbfJgJuOvjk6+1xWl7pe0YL1US1vaO/1w=="; }; }; - "@tinyhttp/app-2.3.0" = { + "@tinyhttp/app-2.4.0" = { name = "_at_tinyhttp_slash_app"; packageName = "@tinyhttp/app"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/app/-/app-2.3.0.tgz"; - sha512 = "2jGV5Er72wywjM8HBjYszECOiIzgNcRrO/kq1gHQqOQvrLa1KzIpUD1CCvPALUXiko7ZK2zKq5WyL+yRPC50uw=="; + url = "https://registry.npmjs.org/@tinyhttp/app/-/app-2.4.0.tgz"; + sha512 = "vOPiCemQRJq5twnl06dde6XnWiNbVMdVRFJWW/yC/9G0qgvV2TvzNNTxrdlz6YmyB7vIC7Fg3qS6m6gx8RbBNQ=="; }; }; - "@tinyhttp/content-disposition-2.2.1" = { + "@tinyhttp/content-disposition-2.2.2" = { name = "_at_tinyhttp_slash_content-disposition"; packageName = "@tinyhttp/content-disposition"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/content-disposition/-/content-disposition-2.2.1.tgz"; - sha512 = "PQ5IWdOn7arScqTV+usIDJvwbanoAXtaopzgxjMS9y7TFwLSIelCblihRBEVIPIkIpsdhSJFH3RF+Daosyj+Aw=="; + url = "https://registry.npmjs.org/@tinyhttp/content-disposition/-/content-disposition-2.2.2.tgz"; + sha512 = "crXw1txzrS36huQOyQGYFvhTeLeG0Si1xu+/l6kXUVYpE0TjFjEZRqTbuadQLfKGZ0jaI+jJoRyqaWwxOSHW2g=="; }; }; "@tinyhttp/content-type-0.1.4" = { @@ -10264,49 +9922,49 @@ let sha512 = "WM/PPL9xNvrs7/8Om5nhKbke5FHrP3EfjOOR+wBnjgESfibqn0K7wdUTnzSLp1lBmemr88os1XvzwymSgaibyA=="; }; }; - "@tinyhttp/req-2.2.3" = { + "@tinyhttp/req-2.2.4" = { name = "_at_tinyhttp_slash_req"; packageName = "@tinyhttp/req"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/req/-/req-2.2.3.tgz"; - sha512 = "HtIa4Gaa8QFTlmsvoif/B7yMK5H0WBUegH2kKW6scNwOpFXyxEk+VsctrIVgORrP5lybXAIRXlRhGuBBAMlVhw=="; + url = "https://registry.npmjs.org/@tinyhttp/req/-/req-2.2.4.tgz"; + sha512 = "lQAZIAo0NOeghxFOZS57tQzxpHSPPLs9T68Krq2BncEBImKwqaDKUt7M9Y5Kb+rvC/GwIL3LeErhkg7f5iG4IQ=="; }; }; - "@tinyhttp/res-2.2.3" = { + "@tinyhttp/res-2.2.4" = { name = "_at_tinyhttp_slash_res"; packageName = "@tinyhttp/res"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/res/-/res-2.2.3.tgz"; - sha512 = "PGl88OOdmMcOuKZaTbhGKAWPoJJf3+EfKIad8ydzjdenVjrTZZjIYJtmwYiUBeEice+YkOCO67qCIekVO5mHlw=="; + url = "https://registry.npmjs.org/@tinyhttp/res/-/res-2.2.4.tgz"; + sha512 = "ETBRShnO19oJyIg2XQHQoofXPWeTXPAuwnIVYkU8WaftvXd/Vz4y5+WFQDHUzKlmdGOw5fAFnrEU7pIVMeFeVA=="; }; }; - "@tinyhttp/router-2.2.2" = { + "@tinyhttp/router-2.2.3" = { name = "_at_tinyhttp_slash_router"; packageName = "@tinyhttp/router"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/router/-/router-2.2.2.tgz"; - sha512 = "i+1ouhPyTqcuJuOsKqmo7i+YD++0RF2lQLhBpcTnsaegD2gTEa3xW2Pcz7spYQGo7K8PQYtOrL7m9b14+BEXqg=="; + url = "https://registry.npmjs.org/@tinyhttp/router/-/router-2.2.3.tgz"; + sha512 = "O0MQqWV3Vpg/uXsMYg19XsIgOhwjyhTYWh51Qng7bxqXixxx2PEvZWnFjP7c84K7kU/nUX41KpkEBTLnznk9/Q=="; }; }; - "@tinyhttp/send-2.2.2" = { + "@tinyhttp/send-2.2.3" = { name = "_at_tinyhttp_slash_send"; packageName = "@tinyhttp/send"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/send/-/send-2.2.2.tgz"; - sha512 = "TZkGy9EdGk+vwYWQnjArQftaXAUIgp/fFlgaxlpamsCZKy7o+CNJ75xty4H3SaY3ZPgN47wv8rnJ50rDRQdFFQ=="; + url = "https://registry.npmjs.org/@tinyhttp/send/-/send-2.2.3.tgz"; + sha512 = "o4cVHHGQ8WjVBS8UT0EE/2WnjoybrfXikHwsRoNlG1pfrC/Sd01u1N4Te8cOd/9aNGLr4mGxWb5qTm2RRtEi7g=="; }; }; - "@tinyhttp/type-is-2.2.3" = { + "@tinyhttp/type-is-2.2.4" = { name = "_at_tinyhttp_slash_type-is"; packageName = "@tinyhttp/type-is"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/type-is/-/type-is-2.2.3.tgz"; - sha512 = "RsZ4+or5xI+wrTlrd+/cLZELoJDMd1HSp+1P23VOZSu1xPAsO1XLf1FgluO8GbEW9Ll/l2yC7mO6diKzjc06HA=="; + url = "https://registry.npmjs.org/@tinyhttp/type-is/-/type-is-2.2.4.tgz"; + sha512 = "7F328NheridwjIfefBB2j1PEcKKABpADgv7aCJaE8x8EON77ZFrAkI3Rir7pGjopV7V9MBmW88xUQigBEX2rmQ=="; }; }; "@tinyhttp/url-2.1.1" = { @@ -10516,13 +10174,13 @@ let sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw=="; }; }; - "@types/bn.js-5.1.5" = { + "@types/bn.js-5.1.6" = { name = "_at_types_slash_bn.js"; packageName = "@types/bn.js"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.5.tgz"; - sha512 = "V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A=="; + url = "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.6.tgz"; + sha512 = "Xh8vSwUeMKeYYrj3cX4lGQgFSF/N03r+tv4AiLl1SucqV+uTQpxRcnM8AkXKHwYP9ZPXOYXRr2KPXpVlIvqh9w=="; }; }; "@types/body-parser-1.19.5" = { @@ -10705,31 +10363,13 @@ let sha512 = "qJ7LIFp06h1QE1aVxbVd+zJP2wdaugYXYfd6JxsyRMrYHaxb6itXPogW2tz+ylUJ1n1b+JF1PHyYCfYHm0dvUg=="; }; }; - "@types/eslint-8.56.11" = { + "@types/eslint-8.56.12" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.56.11"; + version = "8.56.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.11.tgz"; - sha512 = "sVBpJMf7UPo/wGecYOpk2aQya2VUGeHhe38WG7/mN5FufNSubf5VT9Uh9Uyp8/eLJpu1/tuhJ/qTo4mhSB4V4Q=="; - }; - }; - "@types/eslint-9.6.0" = { - name = "_at_types_slash_eslint"; - packageName = "@types/eslint"; - version = "9.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.0.tgz"; - sha512 = "gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg=="; - }; - }; - "@types/eslint-scope-3.7.7" = { - name = "_at_types_slash_eslint-scope"; - packageName = "@types/eslint-scope"; - version = "3.7.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz"; - sha512 = "MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.12.tgz"; + sha512 = "03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g=="; }; }; "@types/estree-1.0.5" = { @@ -10741,6 +10381,15 @@ let sha512 = "/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="; }; }; + "@types/estree-1.0.6" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz"; + sha512 = "AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="; + }; + }; "@types/estree-jsx-1.0.5" = { name = "_at_types_slash_estree-jsx"; packageName = "@types/estree-jsx"; @@ -10840,13 +10489,13 @@ let sha512 = "D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="; }; }; - "@types/http-proxy-1.17.14" = { + "@types/http-proxy-1.17.15" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.14"; + version = "1.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz"; - sha512 = "SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz"; + sha512 = "25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ=="; }; }; "@types/inquirer-6.5.0" = { @@ -11092,13 +10741,13 @@ let sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; }; }; - "@types/node-16.18.104" = { + "@types/node-16.18.108" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.104"; + version = "16.18.108"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.104.tgz"; - sha512 = "OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.108.tgz"; + sha512 = "fj42LD82fSv6yN9C6Q4dzS+hujHj+pTv0IpRR3kI20fnYeS0ytBpjFO9OjmDowSPPt4lNKN46JLaKbCyP+BW2A=="; }; }; "@types/node-16.18.11" = { @@ -11128,22 +10777,31 @@ let sha512 = "eXF4pfBNV5DAMKGbI02NnDtWrQ40hAN558/2vvS4gMpMIxaf6JmD7YjnZbq0Q9TDSSkKBamime8ewRoomHdt4g=="; }; }; - "@types/node-18.19.42" = { + "@types/node-18.19.50" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "18.19.50"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-18.19.50.tgz"; + sha512 = "xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg=="; + }; + }; + "@types/node-20.16.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.19.42"; + version = "20.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz"; - sha512 = "d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz"; + sha512 = "VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA=="; }; }; - "@types/node-20.14.12" = { + "@types/node-22.5.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.14.12"; + version = "22.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.14.12.tgz"; - sha512 = "r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz"; + sha512 = "Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA=="; }; }; "@types/node-6.14.13" = { @@ -11200,31 +10858,22 @@ let sha512 = "dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="; }; }; - "@types/prop-types-15.7.12" = { + "@types/prop-types-15.7.13" = { name = "_at_types_slash_prop-types"; packageName = "@types/prop-types"; - version = "15.7.12"; + version = "15.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz"; - sha512 = "5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q=="; + url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz"; + sha512 = "hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA=="; }; }; - "@types/pug-2.0.10" = { - name = "_at_types_slash_pug"; - packageName = "@types/pug"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/pug/-/pug-2.0.10.tgz"; - sha512 = "Sk/uYFOBAB7mb74XcpizmH0KOR2Pv3D2Hmrh1Dmy5BmK3MpdSa5kqZcg6EKBdklU0bFXX9gCfzvpnyUehrPIuA=="; - }; - }; - "@types/qs-6.9.15" = { + "@types/qs-6.9.16" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.15"; + version = "6.9.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz"; - sha512 = "uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz"; + sha512 = "7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A=="; }; }; "@types/range-parser-1.2.7" = { @@ -11236,13 +10885,13 @@ let sha512 = "hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="; }; }; - "@types/react-18.3.3" = { + "@types/react-18.3.8" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.3.3"; + version = "18.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz"; - sha512 = "hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.3.8.tgz"; + sha512 = "syBUrW3/XpnW4WJ41Pft+I+aPoDVbrBVQGEnbD7NijDGlVC+8gV/XKRY+7vMDlfPpbwYt0l1vd/Sj8bJGMbs9Q=="; }; }; "@types/readable-stream-4.0.15" = { @@ -11335,15 +10984,6 @@ let sha512 = "W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw=="; }; }; - "@types/shimmer-1.2.0" = { - name = "_at_types_slash_shimmer"; - packageName = "@types/shimmer"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.2.0.tgz"; - sha512 = "UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg=="; - }; - }; "@types/sizzle-2.3.8" = { name = "_at_types_slash_sizzle"; packageName = "@types/sizzle"; @@ -11407,22 +11047,22 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; - "@types/unist-2.0.10" = { + "@types/unist-2.0.11" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz"; - sha512 = "IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA=="; + url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz"; + sha512 = "CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA=="; }; }; - "@types/unist-3.0.2" = { + "@types/unist-3.0.3" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz"; - sha512 = "dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="; + url = "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz"; + sha512 = "ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q=="; }; }; "@types/urijs-1.19.25" = { @@ -11461,13 +11101,13 @@ let sha512 = "ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g=="; }; }; - "@types/ws-8.5.11" = { + "@types/ws-8.5.12" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.5.11"; + version = "8.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.11.tgz"; - sha512 = "4+q7P5h3SpJxaBft0Dzpbr6lmMaqh0Jr2tbhJZ/luAwvD7ohSCniYkwz/pLxuT2h0EOa6QADgJj1Ko+TzRfZ+w=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz"; + sha512 = "3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ=="; }; }; "@types/yargs-15.0.19" = { @@ -11632,13 +11272,13 @@ let sha512 = "1O/biKiVhhn0EtvDF4UOvz325K4RrLupfL8rHcmqD2TBLv4qVDWQuzx4JGa1FfqjjRb+C9TNZ6w19f32Mq85Ug=="; }; }; - "@vercel/build-utils-8.3.5" = { + "@vercel/build-utils-8.4.2" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "8.3.5"; + version = "8.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-8.3.5.tgz"; - sha512 = "lJNcA1XKMbQg6npC8grQBEVg11w8BSBr8bXUSZokYmvtNXheL/5cKGAD01Uba9x1P/ae9lJ9zDorpoSq4AWSfw=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-8.4.2.tgz"; + sha512 = "Bern3FVvUgMu8YGuP+cYSTDaUA5Kn6HsMU75osWK6npS5Sw4K9zaY+cxONDMrzo/08Kvz5vgSRnwmq+P1MYq2g=="; }; }; "@vercel/error-utils-2.0.2" = { @@ -11668,40 +11308,40 @@ let sha512 = "iTEA0vY6RBPuEzkwUTVzSHDATo1aF6bdLLspI68mQ/BTbi5UQEGjpjyzdKOVcSYApDtFU6M6vypZ1t4vIEnHvw=="; }; }; - "@vercel/gatsby-plugin-vercel-builder-2.0.39" = { + "@vercel/gatsby-plugin-vercel-builder-2.0.46" = { name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; packageName = "@vercel/gatsby-plugin-vercel-builder"; - version = "2.0.39"; + version = "2.0.46"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.39.tgz"; - sha512 = "rvShSeoiUvw1JoQ5r9EJBwELmA6lZDH2agG9KCBgKowd8YQZIm7r3DddvWPJ8s2x7P4kv0eCbr5e89Z2wsiygw=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.46.tgz"; + sha512 = "MRfye1gSF9PJrUA/V+AQgDGta+7X7bcUq3s3N3lbB6QOLQOs/Ndd03BZ226N0fYV0nL0HLHhNCf+SIQT34hNkg=="; }; }; - "@vercel/go-3.1.1" = { + "@vercel/go-3.1.3" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-3.1.1.tgz"; - sha512 = "mrzomNYltxkjvtUmaYry5YEyvwTz6c/QQHE5Gr/pPGRIniUiP6T6OFOJ49RBN7e6pRXaNzHPVuidiuBhvHh5+Q=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-3.1.3.tgz"; + sha512 = "gz4iP02cjRRjbMigk6BA/IG1NpRbjmNQ9EO2fFSi5i14lCuPEdvemgxWM7101rxS4gFNWcIMbArTb3L+YQSHzA=="; }; }; - "@vercel/hydrogen-1.0.4" = { + "@vercel/hydrogen-1.0.6" = { name = "_at_vercel_slash_hydrogen"; packageName = "@vercel/hydrogen"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-1.0.4.tgz"; - sha512 = "Sc0lpmI/J6O3o2cL75k8klL7ir2gi6kYI92O5+MrR3hh4fwz/atUIL9UWsTGuFjKTm69VAoJrmn3VKf0/0SGLw=="; + url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-1.0.6.tgz"; + sha512 = "CVwoFK3TRmRCS7ncxdaDzMbH5WyqhWplsN54dmJS3TQZ7JLPUtkCK4mmBplyuJvYw3ijW97QOG+5e2U2Ei6ajw=="; }; }; - "@vercel/next-4.3.6" = { + "@vercel/next-4.3.10" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "4.3.6"; + version = "4.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-4.3.6.tgz"; - sha512 = "qUHp79xX07qYtz7DGSogyWgEMrf+eu/IGV/92YnVA1xzDBogIFc8XFvMlN8QwDrsWWsR+I2eMSiGD+P8znlsaA=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-4.3.10.tgz"; + sha512 = "Nvf5vD5G7xp8p/a3FlqBE/rMIlgWolTAiW3bMISWjPsVfSjMfeEx7HkAmdi/88+CmJHmluLQn9351h0jK38u8Q=="; }; }; "@vercel/nft-0.27.3" = { @@ -11713,40 +11353,40 @@ let sha512 = "oySTdDSzUAFDXpsSLk9Q943o+/Yu/+TCFxnehpFQEf/3khi2stMpTHPVNwFdvZq/Z4Ky93lE+MGHpXCRpMkSCA=="; }; }; - "@vercel/node-3.2.7" = { + "@vercel/node-3.2.14" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "3.2.7"; + version = "3.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-3.2.7.tgz"; - sha512 = "/eWXgkkjBm1Es6oRmltw5m0SLT8tnOdlSKYpQhPfpJlWVzLb8h3cWhTS+cSsnn3gZ0c6w4XSjiZBbGKQJevxoQ=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-3.2.14.tgz"; + sha512 = "aZFJgqem1YI3E7gvuVG/Jy4k8j19BjEQkexmnFv0nEieKuzHgTC8AzcgZQu8laEDVkpnOe+zlpmXZZBxTsvLuA=="; }; }; - "@vercel/python-4.3.0" = { + "@vercel/python-4.3.1" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-4.3.0.tgz"; - sha512 = "tj6ffEh+ligmQoo/ONOg7DNX0VGKJt9FyswyOIIp6lZufs5oGzHAfan4+5QzF/2INxvXobN0aMYgcbFHJ81ZKg=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-4.3.1.tgz"; + sha512 = "pWRApBwUsAQJS8oZ7eKMiaBGbYJO71qw2CZqDFvkTj34FNBZtNIUcWSmqGfJJY5m2pU/9wt8z1CnKIyT9dstog=="; }; }; - "@vercel/redwood-2.1.3" = { + "@vercel/redwood-2.1.5" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.1.3.tgz"; - sha512 = "lpsdQSHS2hvSX29/rJNm4q38dVXKstS4MVg875KE6zyXpACwviXuet0Cadyv0E60w7f2B6Ra+nJMpwKz6oJ5xg=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.1.5.tgz"; + sha512 = "DeM/yZUabMRMTyPLXtpCOreq3Z6ZZ6+qciY192i28froDO/5ELYhdGCW32iYG/o4Z7rZ8wDUOlRNEINSzi57JQ=="; }; }; - "@vercel/remix-builder-2.2.1" = { + "@vercel/remix-builder-2.2.9" = { name = "_at_vercel_slash_remix-builder"; packageName = "@vercel/remix-builder"; - version = "2.2.1"; + version = "2.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.2.1.tgz"; - sha512 = "3mM8XNWEo5HmPv/FT2pseGk6MIHcRcLgNHwVQxWe+CSgEXt4QcNQYtwF6v9pb4HDTt09Y1rRkSED5HXvMO38/A=="; + url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.2.9.tgz"; + sha512 = "H40CNhP2iYJYCDeBzN6I9QZg7mETP7jPu6gyRulqWcL1fds+gThegoowIPJKN+HT0mw8ZG99vmyltsRnR4PIZw=="; }; }; "@vercel/routing-utils-3.1.0" = { @@ -11767,13 +11407,13 @@ let sha512 = "UZYwlSEEfVnfzTmgkD+kxex9/gkZGt7unOWNyWFN7V/ZnZSsGBUgv6hXLnwejdRi3EztgRQEBd1kUKlXdIeC0Q=="; }; }; - "@vercel/static-build-2.5.17" = { + "@vercel/static-build-2.5.24" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "2.5.17"; + version = "2.5.24"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.5.17.tgz"; - sha512 = "i7fp4wCUgNvZIv06qlQFtFhZJ5WZcwOyg7KmWWhLBsyx/U+LBzUKP80lWAedqB6xmZ7zvNnruGUArzJvI+DnjA=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.5.24.tgz"; + sha512 = "7lRpsXql3b8MwHVQd/4BqzsrM1lrvTusOjx6K8QcbWuDWxmOt8egsgXZ4a2wbW1xfWRrxwyK9n4rjAeLHW4PtQ=="; }; }; "@vercel/static-config-3.0.0" = { @@ -11785,87 +11425,6 @@ let sha512 = "2qtvcBJ1bGY0dYGYh3iM7yGKkk971FujLEDXzuW5wcZsPr1GSEjO/w2iSr3qve6nDDtBImsGoDEnus5FI4+fIw=="; }; }; - "@volar/kit-2.4.0-alpha.18" = { - name = "_at_volar_slash_kit"; - packageName = "@volar/kit"; - version = "2.4.0-alpha.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/kit/-/kit-2.4.0-alpha.18.tgz"; - sha512 = "dZMSNhesh23lhd61ax2l04IgIcYofAjm8M+5BKAmX47ROweyc8RrrslszCFUJynlmXx6JS1PoHqvo8+E0aAYQQ=="; - }; - }; - "@volar/language-core-2.4.0-alpha.18" = { - name = "_at_volar_slash_language-core"; - packageName = "@volar/language-core"; - version = "2.4.0-alpha.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.18.tgz"; - sha512 = "JAYeJvYQQROmVRtSBIczaPjP3DX4QW1fOqW1Ebs0d3Y3EwSNRglz03dSv0Dm61dzd0Yx3WgTW3hndDnTQqgmyg=="; - }; - }; - "@volar/language-server-2.4.0-alpha.18" = { - name = "_at_volar_slash_language-server"; - packageName = "@volar/language-server"; - version = "2.4.0-alpha.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.0-alpha.18.tgz"; - sha512 = "dciHEE/R5kzI0bY71QfkoCVQ3cQI6g9MHfA4oIP6UhnJy0CdleUalWSygOXoD3Nq7Yk6wn2BRrb1PP5MsadY/Q=="; - }; - }; - "@volar/language-service-2.4.0-alpha.18" = { - name = "_at_volar_slash_language-service"; - packageName = "@volar/language-service"; - version = "2.4.0-alpha.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.0-alpha.18.tgz"; - sha512 = "EuetrtbEtudi9buinWAG5U3Jam5dY27zXd/7GYnx542kBwanWOBM8i4DAQd0z7M11fOxXgybxPA933uaSyaOog=="; - }; - }; - "@volar/snapshot-document-2.4.0-alpha.18" = { - name = "_at_volar_slash_snapshot-document"; - packageName = "@volar/snapshot-document"; - version = "2.4.0-alpha.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.4.0-alpha.18.tgz"; - sha512 = "JAeclEly/wnILhR4Pu9MpgBLInZJH49O1zoy8fU+pk5I+zpv7JIEby5z2UFAS60+sIDnxBdAGd7rZ5VibE70vg=="; - }; - }; - "@volar/source-map-2.4.0-alpha.18" = { - name = "_at_volar_slash_source-map"; - packageName = "@volar/source-map"; - version = "2.4.0-alpha.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.18.tgz"; - sha512 = "MTeCV9MUwwsH0sNFiZwKtFrrVZUK6p8ioZs3xFzHc2cvDXHWlYN3bChdQtwKX+FY2HG6H3CfAu1pKijolzIQ8g=="; - }; - }; - "@volar/typescript-2.4.0-alpha.18" = { - name = "_at_volar_slash_typescript"; - packageName = "@volar/typescript"; - version = "2.4.0-alpha.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.0-alpha.18.tgz"; - sha512 = "sXh5Y8sqGUkgxpMWUGvRXggxYHAVxg0Pa1C42lQZuPDrW6vHJPR0VCK8Sr7WJsAW530HuNQT/ZIskmXtxjybMQ=="; - }; - }; - "@vscode/emmet-helper-2.9.3" = { - name = "_at_vscode_slash_emmet-helper"; - packageName = "@vscode/emmet-helper"; - version = "2.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.9.3.tgz"; - sha512 = "rB39LHWWPQYYlYfpv9qCoZOVioPCftKXXqrsyqN1mTWZM6dTnONT63Db+03vgrBbHzJN45IrgS/AGxw9iiqfEw=="; - }; - }; - "@vscode/l10n-0.0.18" = { - name = "_at_vscode_slash_l10n"; - packageName = "@vscode/l10n"; - version = "0.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz"; - sha512 = "KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ=="; - }; - }; "@vscode/test-electron-2.4.1" = { name = "_at_vscode_slash_test-electron"; packageName = "@vscode/test-electron"; @@ -11875,13 +11434,13 @@ let sha512 = "Gc6EdaLANdktQ1t+zozoBVRynfIsMKMc94Svu1QreOBC8y76x4tvaK32TljrLi1LI2+PK58sDVbL7ALdqf3VRQ=="; }; }; - "@vscode/vsce-2.31.1" = { + "@vscode/vsce-2.32.0" = { name = "_at_vscode_slash_vsce"; packageName = "@vscode/vsce"; - version = "2.31.1"; + version = "2.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.31.1.tgz"; - sha512 = "LwEQFKXV21C4/brvGPH/9+7ZOUM5cbK7oJ4fVmy0YG75NIy1HV8eMSoBZrl+u23NxpAhor62Cu1aI+JFtCtjSg=="; + url = "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.32.0.tgz"; + sha512 = "3EFJfsgrSftIqt3EtdRcAygy/OJ3hstyI1cDmIgkU9CFZW5C+3djr6mfosndCUqcVYuyjmxOK1xmFp/Bq7+NIg=="; }; }; "@vscode/vsce-sign-2.0.4" = { @@ -11974,49 +11533,85 @@ let sha512 = "pAiRN6qSAhDM5SVOIxgx+2xnoVUePHbRNC7OD2aOR3WltTKxxF25OfpK8h8UQ7A0BuRkSgREbB59DBlFk4iAeg=="; }; }; - "@vue/compiler-core-3.4.34" = { + "@vue/compiler-core-3.5.6" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.4.34"; + version = "3.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.34.tgz"; - sha512 = "Z0izUf32+wAnQewjHu+pQf1yw00EGOmevl1kE+ljjjMe7oEfpQ+BI3/JNK7yMB4IrUsqLDmPecUrpj3mCP+yJQ=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.6.tgz"; + sha512 = "r+gNu6K4lrvaQLQGmf+1gc41p3FO2OUJyWmNqaIITaJU6YFiV5PtQSFZt8jfztYyARwqhoCayjprC7KMvT3nRA=="; }; }; - "@vue/compiler-dom-3.4.34" = { + "@vue/compiler-dom-3.5.6" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.4.34"; + version = "3.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.34.tgz"; - sha512 = "3PUOTS1h5cskdOJMExCu2TInXuM0j60DRPpSCJDqOCupCfUZCJoyQmKtRmA8EgDNZ5kcEE7vketamRZfrEuVDw=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.6.tgz"; + sha512 = "xRXqxDrIqK8v8sSScpistyYH0qYqxakpsIvqMD2e5sV/PXQ1mTwtXp4k42yHK06KXxKSmitop9e45Ui/3BrTEw=="; }; }; - "@vue/compiler-sfc-3.4.34" = { + "@vue/compiler-sfc-3.5.6" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.4.34"; + version = "3.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.34.tgz"; - sha512 = "x6lm0UrM03jjDXTPZgD9Ad8bIVD1ifWNit2EaWQIZB5CULr46+FbLQ5RpK7AXtDHGjx9rmvC7QRCTjsiGkAwRw=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.6.tgz"; + sha512 = "pjWJ8Kj9TDHlbF5LywjVso+BIxCY5wVOLhkEXRhuCHDxPFIeX1zaFefKs8RYoHvkSMqRWt93a0f2gNJVJixHwg=="; }; }; - "@vue/compiler-ssr-3.4.34" = { + "@vue/compiler-ssr-3.5.6" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.4.34"; + version = "3.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.34.tgz"; - sha512 = "8TDBcLaTrFm5rnF+Qm4BlliaopJgqJ28Nsrc80qazynm5aJO+Emu7y0RWw34L8dNnTRdcVBpWzJxhGYzsoVu4g=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.6.tgz"; + sha512 = "VpWbaZrEOCqnmqjE83xdwegtr5qO/2OPUC6veWgvNqTJ3bYysz6vY3VqMuOijubuUYPRpG3OOKIh9TD0Stxb9A=="; }; }; - "@vue/shared-3.4.34" = { + "@vue/reactivity-3.5.6" = { + name = "_at_vue_slash_reactivity"; + packageName = "@vue/reactivity"; + version = "3.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.6.tgz"; + sha512 = "shZ+KtBoHna5GyUxWfoFVBCVd7k56m6lGhk5e+J9AKjheHF6yob5eukssHRI+rzvHBiU1sWs/1ZhNbLExc5oYQ=="; + }; + }; + "@vue/runtime-core-3.5.6" = { + name = "_at_vue_slash_runtime-core"; + packageName = "@vue/runtime-core"; + version = "3.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.6.tgz"; + sha512 = "FpFULR6+c2lI+m1fIGONLDqPQO34jxV8g6A4wBOgne8eSRHP6PQL27+kWFIx5wNhhjkO7B4rgtsHAmWv7qKvbg=="; + }; + }; + "@vue/runtime-dom-3.5.6" = { + name = "_at_vue_slash_runtime-dom"; + packageName = "@vue/runtime-dom"; + version = "3.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.6.tgz"; + sha512 = "SDPseWre45G38ENH2zXRAHL1dw/rr5qp91lS4lt/nHvMr0MhsbCbihGAWLXNB/6VfFOJe2O+RBRkXU+CJF7/sw=="; + }; + }; + "@vue/server-renderer-3.5.6" = { + name = "_at_vue_slash_server-renderer"; + packageName = "@vue/server-renderer"; + version = "3.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.6.tgz"; + sha512 = "zivnxQnOnwEXVaT9CstJ64rZFXMS5ZkKxCjDQKiMSvUhXRzFLWZVbaBiNF4HGDqGNNsTgmjcCSmU6TB/0OOxLA=="; + }; + }; + "@vue/shared-3.5.6" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.4.34"; + version = "3.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.4.34.tgz"; - sha512 = "x5LmiRLpRsd9KTjAB8MPKf0CDPMcuItjP0gbNqFCIgL1I8iYp4zglhj9w9FPCdIbHG2M91RVeIbArFfFTz9I3A=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.5.6.tgz"; + sha512 = "eidH0HInnL39z6wAt6SFIwBrvGOpDWsDxlw3rCgo1B+CQ1781WzQUSU3YjxgdkcJo9Q8S6LmXTkvI+cLHGkQfA=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -12478,31 +12073,22 @@ let sha512 = "GWZQKroPES4z91Ijx6zsOsb7+USOxjy66s8AoTWg0HiBBdfnbtf9aeh3Uav0MgYn4BL8Q7tVSUpd0gGpngKGEQ=="; }; }; - "@whatwg-node/events-0.1.1" = { - name = "_at_whatwg-node_slash_events"; - packageName = "@whatwg-node/events"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz"; - sha512 = "AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w=="; - }; - }; - "@whatwg-node/fetch-0.9.18" = { + "@whatwg-node/fetch-0.9.21" = { name = "_at_whatwg-node_slash_fetch"; packageName = "@whatwg-node/fetch"; - version = "0.9.18"; + version = "0.9.21"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.18.tgz"; - sha512 = "hqoz6StCW+AjV/3N+vg0s1ah82ptdVUb9nH2ttj3UbySOXUvytWw2yqy8c1cKzyRk6mDD00G47qS3fZI9/gMjg=="; + url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.21.tgz"; + sha512 = "Wt0jPb+04JjobK0pAAN7mEHxVHcGA9HoP3OyCsZtyAecNQeADXCZ1MihFwVwjsgaRYuGVmNlsCmLxlG6mor8Gw=="; }; }; - "@whatwg-node/node-fetch-0.5.14" = { + "@whatwg-node/node-fetch-0.5.26" = { name = "_at_whatwg-node_slash_node-fetch"; packageName = "@whatwg-node/node-fetch"; - version = "0.5.14"; + version = "0.5.26"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.14.tgz"; - sha512 = "J/IQ0Hrb56sMPb3G42Wzrm9fu8+bHnb8lk7DkJ0XX7JCkSxvPEn1MmkLy7zntdbXs1gohYW42mDck0LzcjrMig=="; + url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.26.tgz"; + sha512 = "4jXDeZ4IH4bylZ6wu14VEx0aDXXhrN4TC279v9rPmn08g4EYekcYf8wdcOOnS9STjDkb6x77/6xBUTqxGgjr8g=="; }; }; "@xmldom/xmldom-0.7.13" = { @@ -12523,6 +12109,15 @@ let sha512 = "2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="; }; }; + "@xmldom/xmldom-0.9.2" = { + name = "_at_xmldom_slash_xmldom"; + packageName = "@xmldom/xmldom"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.2.tgz"; + sha512 = "afP3lpLtalPxgNGU4bxlsru4wSDsZwdSFKnHs6PR0q3KIEWWcAlBqAdx4aWlVtP1gV1FBWlJ3d0MgaRRdj/ucA=="; + }; + }; "@xmpp/base64-0.13.1" = { name = "_at_xmpp_slash_base64"; packageName = "@xmpp/base64"; @@ -13036,15 +12631,6 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.11.3" = { - name = "acorn"; - packageName = "acorn"; - version = "8.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz"; - sha512 = "Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg=="; - }; - }; "acorn-8.12.1" = { name = "acorn"; packageName = "acorn"; @@ -13072,15 +12658,6 @@ let sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; }; }; - "acorn-import-assertions-1.9.0" = { - name = "acorn-import-assertions"; - packageName = "acorn-import-assertions"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz"; - sha512 = "cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA=="; - }; - }; "acorn-import-attributes-1.9.5" = { name = "acorn-import-attributes"; packageName = "acorn-import-attributes"; @@ -13153,22 +12730,13 @@ let sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; }; }; - "acorn-walk-8.3.2" = { - name = "acorn-walk"; - packageName = "acorn-walk"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz"; - sha512 = "cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A=="; - }; - }; - "acorn-walk-8.3.3" = { + "acorn-walk-8.3.4" = { name = "acorn-walk"; packageName = "acorn-walk"; - version = "8.3.3"; + version = "8.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz"; - sha512 = "MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw=="; + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz"; + sha512 = "ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g=="; }; }; "add-stream-1.0.0" = { @@ -13351,24 +12919,6 @@ let sha512 = "PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA=="; }; }; - "ajv-8.14.0" = { - name = "ajv"; - packageName = "ajv"; - version = "8.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz"; - sha512 = "oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA=="; - }; - }; - "ajv-8.16.0" = { - name = "ajv"; - packageName = "ajv"; - version = "8.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz"; - sha512 = "F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw=="; - }; - }; "ajv-8.17.1" = { name = "ajv"; packageName = "ajv"; @@ -13450,15 +13000,6 @@ let sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; }; }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha512 = "GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg=="; - }; - }; "amdefine-1.0.1" = { name = "amdefine"; packageName = "amdefine"; @@ -13630,13 +13171,13 @@ let sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; - "ansi-regex-6.0.1" = { + "ansi-regex-6.1.0" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz"; - sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz"; + sha512 = "7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="; }; }; "ansi-styles-1.0.0" = { @@ -13720,6 +13261,15 @@ let sha512 = "Ydgbey4zqUmmNN2i2OVeVHXig3PxHRbok2X6B2Sogmb92JzZUFfTL806dT7os6tBL1peXItfeFt76CP3zsoXUg=="; }; }; + "ansis-3.3.2" = { + name = "ansis"; + packageName = "ansis"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansis/-/ansis-3.3.2.tgz"; + sha512 = "cFthbBlt+Oi0i9Pv/j6YdVWJh54CtjGACaMPCIrEV4Ha7HWsIjXDwseYV79TIL0B4+KfSwD5S70PeQDkPUd1rA=="; + }; + }; "any-base-1.1.0" = { name = "any-base"; packageName = "any-base"; @@ -13828,24 +13378,6 @@ let sha512 = "zy9cHePtMP0YhwG+CfHm0bgwdnga2X3gZexpdCwEj//dpb+TKajtiC8REEUJUSq6Ab4f9cgNy2l8ObXzCXFkEw=="; }; }; - "applicationinsights-2.7.3" = { - name = "applicationinsights"; - packageName = "applicationinsights"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-2.7.3.tgz"; - sha512 = "JY8+kTEkjbA+kAVNWDtpfW2lqsrDALfDXuxOs74KLPu2y13fy/9WB52V4LfYVTVcW1/jYOXjTxNS2gPZIDh1iw=="; - }; - }; - "applicationinsights-native-metrics-0.0.11" = { - name = "applicationinsights-native-metrics"; - packageName = "applicationinsights-native-metrics"; - version = "0.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights-native-metrics/-/applicationinsights-native-metrics-0.0.11.tgz"; - sha512 = "NxzsyeFj5iwhSEzkHluIoNYb1DcMtlttQZjJCJ8QQroZ5H9nCDS77Y9BpfphR5tqMcfNNjuQuiRcdPhQk75QRw=="; - }; - }; "aproba-1.2.0" = { name = "aproba"; packageName = "aproba"; @@ -13990,13 +13522,13 @@ let sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; }; - "aria-query-5.3.0" = { + "aria-query-5.3.1" = { name = "aria-query"; packageName = "aria-query"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz"; - sha512 = "b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A=="; + url = "https://registry.npmjs.org/aria-query/-/aria-query-5.3.1.tgz"; + sha512 = "Z/ZeOgVl7bcSYZ/u/rh0fOpvEpq//LZmdbkXyc7syVzjPAhfOa9ebsdTSjEBDU4vs5nC98Kfduj1uFo0qyET3g=="; }; }; "arr-diff-2.0.0" = { @@ -14368,15 +13900,6 @@ let sha512 = "zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A=="; }; }; - "assert-never-1.3.0" = { - name = "assert-never"; - packageName = "assert-never"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-never/-/assert-never-1.3.0.tgz"; - sha512 = "9Z3vxQ+berkL/JJo0dK+EY3Lp0s3NtSnP3VCLsh5HDcZPrh0M+KQRK5sWhUeyPPH+/RCxZqOxLMR+YC6vlviEQ=="; - }; - }; "assert-plus-0.1.2" = { name = "assert-plus"; packageName = "assert-plus"; @@ -14458,22 +13981,13 @@ let sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; }; - "astring-1.8.6" = { + "astring-1.9.0" = { name = "astring"; packageName = "astring"; - version = "1.8.6"; - src = fetchurl { - url = "https://registry.npmjs.org/astring/-/astring-1.8.6.tgz"; - sha512 = "ISvCdHdlTDlH5IpxQJIex7BWBywFWgjJSVdwst+/iQCoEYnyOaQ95+X1JGshuBjGp6nxKUy1jMgE3zPqN7fQdg=="; - }; - }; - "astrojs-compiler-sync-1.0.0" = { - name = "astrojs-compiler-sync"; - packageName = "astrojs-compiler-sync"; - version = "1.0.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/astrojs-compiler-sync/-/astrojs-compiler-sync-1.0.0.tgz"; - sha512 = "IM6FxpMoBxkGGdKppkFHNQIC9Wge7jspG2MIJff8DOhG41USNJLxJfxRm7wnkTKWlYK5Y1YFFNYr2vUUKkI8sw=="; + url = "https://registry.npmjs.org/astring/-/astring-1.9.0.tgz"; + sha512 = "LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg=="; }; }; "async-0.1.22" = { @@ -14539,13 +14053,13 @@ let sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; }; - "async-3.2.5" = { + "async-3.2.6" = { name = "async"; packageName = "async"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.5.tgz"; - sha512 = "baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="; + url = "https://registry.npmjs.org/async/-/async-3.2.6.tgz"; + sha512 = "htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="; }; }; "async-done-2.0.0" = { @@ -14584,15 +14098,6 @@ let sha512 = "pd20BwL7Yt1zwDFy+8MX8F1+WCT8aQeKj0kQnTrH9WaeRETlRamVhD0JtRPmrV4GfOJ2F9CvdQkZeZhnh2TuHw=="; }; }; - "async-hook-jl-1.7.6" = { - name = "async-hook-jl"; - packageName = "async-hook-jl"; - version = "1.7.6"; - src = fetchurl { - url = "https://registry.npmjs.org/async-hook-jl/-/async-hook-jl-1.7.6.tgz"; - sha512 = "gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg=="; - }; - }; "async-limiter-1.0.1" = { name = "async-limiter"; packageName = "async-limiter"; @@ -14629,15 +14134,6 @@ let sha512 = "cWMaNwUJnf37C/S5TfCkk/15MwbPRwVYALA2jtjkbHjCmAPiDXyNJy2q3p1KAZzDLHAWyarUWSujUoHR4pEgrA=="; }; }; - "async-listener-0.6.10" = { - name = "async-listener"; - packageName = "async-listener"; - version = "0.6.10"; - src = fetchurl { - url = "https://registry.npmjs.org/async-listener/-/async-listener-0.6.10.tgz"; - sha512 = "gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw=="; - }; - }; "async-mutex-0.4.1" = { name = "async-mutex"; packageName = "async-mutex"; @@ -14764,13 +14260,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.21.3" = { + "aws-crt-1.22.0" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.21.3"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.21.3.tgz"; - sha512 = "oaiP5zoPkXwbM9T3nwSgq6CBZWx0501iefLPg12FODniIgqGMyzbMXHYC+fxbCoP5SOQVmCwtAfbNuIG5bFENg=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.22.0.tgz"; + sha512 = "gLyn73oBmJt/bpLHaQLbl8GNYNbKs+AcdIok8jeMFa9CwL3mcaLCrFzZu4KYacbcHRONJeGa2qYXwDT3EyQ1jw=="; }; }; "aws-sdk-2.1340.0" = { @@ -14800,13 +14296,13 @@ let sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; }; }; - "aws4-1.13.0" = { + "aws4-1.13.2" = { name = "aws4"; packageName = "aws4"; - version = "1.13.0"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.13.0.tgz"; - sha512 = "3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz"; + sha512 = "lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="; }; }; "axios-0.19.2" = { @@ -14845,22 +14341,13 @@ let sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g=="; }; }; - "axios-0.27.2" = { + "axios-1.7.7" = { name = "axios"; packageName = "axios"; - version = "0.27.2"; + version = "1.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; - sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; - }; - }; - "axios-1.7.2" = { - name = "axios"; - packageName = "axios"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz"; - sha512 = "2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw=="; + url = "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz"; + sha512 = "S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q=="; }; }; "axobject-query-4.1.0" = { @@ -14899,13 +14386,13 @@ let sha512 = "XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g=="; }; }; - "babel-loader-8.3.0" = { + "babel-loader-8.4.1" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.3.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz"; - sha512 = "H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.4.1.tgz"; + sha512 = "nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA=="; }; }; "babel-plugin-jsx-pragmatic-1.0.2" = { @@ -14944,13 +14431,13 @@ let sha512 = "sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q=="; }; }; - "babel-plugin-polyfill-corejs3-0.10.4" = { + "babel-plugin-polyfill-corejs3-0.10.6" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.10.4"; + version = "0.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz"; - sha512 = "25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz"; + sha512 = "b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA=="; }; }; "babel-plugin-polyfill-regenerator-0.6.2" = { @@ -14989,15 +14476,6 @@ let sha512 = "BjyvjwjJG0MaaDBLP/esbXRrAItM76po9L9zfnLxeqgFsHCIPmD+6ir45coDLGAXwR8m9It3G1yqYM9JPyemsQ=="; }; }; - "babel-walk-3.0.0-canary-5" = { - name = "babel-walk"; - packageName = "babel-walk"; - version = "3.0.0-canary-5"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz"; - sha512 = "GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw=="; - }; - }; "babybird-0.0.1" = { name = "babybird"; packageName = "babybird"; @@ -15034,15 +14512,6 @@ let sha512 = "wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA=="; }; }; - "backport-8.5.0" = { - name = "backport"; - packageName = "backport"; - version = "8.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/backport/-/backport-8.5.0.tgz"; - sha512 = "gX8v+l+BTue2lmmqD/yQiR6JUUY+5OWNZTI1qyusViqC9R2iv4YFPqT23IcJfpYqlYb3DOiwunfVjKLickdQ6g=="; - }; - }; "bail-1.0.5" = { name = "bail"; packageName = "bail"; @@ -15493,13 +14962,13 @@ let sha512 = "kUTatQb/mBd8uhvdLrUkouGDBUQiJaIOvPlptUwOWp6MFqih4d1MiVf0m3ATxfZSzu+LjW/awFeABltYa62uIA=="; }; }; - "bittorrent-dht-11.0.6" = { + "bittorrent-dht-11.0.8" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "11.0.6"; + version = "11.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-11.0.6.tgz"; - sha512 = "iDScIyLDKuuXOSIlPIxnvzH3llqatVkugjn3CSPPpjcHO+4dyahHiiPRpzR39k4l9qW79YAbI/AzSjNWoLchHQ=="; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-11.0.8.tgz"; + sha512 = "hWNmv297wWLpTAkdhG15MJLDXkPXaG//9jRoT62WHja565fjlZojO3WZ7vlzbGRp7o58jnd1fx78dZlpq5d3zA=="; }; }; "bittorrent-dht-6.4.2" = { @@ -15529,22 +14998,22 @@ let sha512 = "VyLcUjVMEOdSpHaCG/7odvCdLbAB1y3l9A2V6WIje24uV7FkJPrQrH/RrlFmKxP89pFVDEnE+YlHaFujlFIZsg=="; }; }; - "bittorrent-protocol-4.1.13" = { + "bittorrent-protocol-4.1.15" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "4.1.13"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-4.1.13.tgz"; - sha512 = "tUF8HBy/CwexDgEiFmmgWx7RCXC02gc72ZEoFxdRnqraZBUVFN611hYLfB/zArlhFeaUErfJZOa8CWtrDeXQsA=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-4.1.15.tgz"; + sha512 = "41W08svaxGrNtxwMl7DbOcYnp44wcNs1B4szSfdLNjCRQH7yWdGdSOTNOvEi+FtsRVyNWabadM6IZLbhj5SS2w=="; }; }; - "bittorrent-tracker-11.1.1" = { + "bittorrent-tracker-11.1.2" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "11.1.1"; + version = "11.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-11.1.1.tgz"; - sha512 = "j5IMK80wWB44S/3TE+HwIRLYBmY00KvIoI/s7e37mVe5raBNPVTxXgXlOcvECMJvjhk1igta31d+JHTbM8c51A=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-11.1.2.tgz"; + sha512 = "mzINNIJ3FjNBcqQPKPQoxpNzzqEVfbBohwdVxblaOKGQVxagMzipCWwbxiAt+J35WC3xs1wFeCDUXpzQ3TBA+A=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -15583,13 +15052,13 @@ let sha512 = "tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ=="; }; }; - "bl-6.0.14" = { + "bl-6.0.15" = { name = "bl"; packageName = "bl"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-6.0.14.tgz"; - sha512 = "TJfbvGdL7KFGxTsEbsED7avqpFdY56q9IW0/aiytyheJzxST/+Io6cx/4Qx0K2/u0BPRDs65mjaQzYvMZeNocQ=="; + url = "https://registry.npmjs.org/bl/-/bl-6.0.15.tgz"; + sha512 = "RGhjD1XCPS7ZdAH6cEJVaR3gLV4KJP2hvkQ49AH5kwScjiyd0jBM8RsP4oHKzcx+kNCON9752zPeRnuv0HHwzw=="; }; }; "blob-0.0.2" = { @@ -15754,6 +15223,15 @@ let sha512 = "ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA=="; }; }; + "body-parser-1.20.3" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz"; + sha512 = "7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g=="; + }; + }; "bonjour-3.5.0" = { name = "bonjour"; packageName = "bonjour"; @@ -15862,6 +15340,15 @@ let sha512 = "2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog=="; }; }; + "boxen-8.0.1" = { + name = "boxen"; + packageName = "boxen"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-8.0.1.tgz"; + sha512 = "F3PH5k5juxom4xktynS7MoFY+NUWH5LC4CnH11YB8NPew+HLpmBLCybSAEyb2F+4pRXhuhWqFesoQd6DAyc2hw=="; + }; + }; "bplist-creator-0.0.6" = { name = "bplist-creator"; packageName = "bplist-creator"; @@ -16114,13 +15601,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.23.2" = { + "browserslist-4.23.3" = { name = "browserslist"; packageName = "browserslist"; - version = "4.23.2"; + version = "4.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz"; - sha512 = "qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz"; + sha512 = "btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA=="; }; }; "brq-0.1.10" = { @@ -16267,15 +15754,6 @@ let sha512 = "VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="; }; }; - "buffer-crc32-1.0.0" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz"; - sha512 = "Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w=="; - }; - }; "buffer-equal-0.0.1" = { name = "buffer-equal"; packageName = "buffer-equal"; @@ -16762,15 +16240,6 @@ let sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; }; }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha512 = "wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g=="; - }; - }; "camelcase-2.1.1" = { name = "camelcase"; packageName = "camelcase"; @@ -16825,6 +16294,15 @@ let sha512 = "xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw=="; }; }; + "camelcase-8.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-8.0.0.tgz"; + sha512 = "8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA=="; + }; + }; "camelcase-css-2.0.1" = { name = "camelcase-css"; packageName = "camelcase-css"; @@ -16888,13 +16366,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001643" = { + "caniuse-lite-1.0.30001662" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001643"; + version = "1.0.30001662"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz"; - sha512 = "ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001662.tgz"; + sha512 = "sgMUVwLmGseH8ZIrm1d51UbrhqMCH3jvS7gF/M6byuHOnKyLOBL7W8yz5V02OHwgLGA36o/AFhWzzh4uc5aqTA=="; }; }; "canvas-2.11.2" = { @@ -16978,22 +16456,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.68.87" = { + "cdk8s-2.69.4" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.68.87"; + version = "2.69.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.68.87.tgz"; - sha512 = "bJ+sT8q8uS+Y8qFqgZFpGZwcCQB6cx4A76iaKk+Xsh/HherhZ4x40NyATjR4BerljueC2JR0Tq9ZSahyWaZxQQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.69.4.tgz"; + sha512 = "UjFS1tFulZurUv2Wy9P9pkV/DWlN+mgj91UGWXWHZadQTBMntNcPmS8k38LcDjGGbXylVA/+uFeoMFWrT1Kzmg=="; }; }; - "cdk8s-plus-25-2.22.79" = { - name = "cdk8s-plus-25"; - packageName = "cdk8s-plus-25"; - version = "2.22.79"; + "cdk8s-plus-28-2.5.6" = { + name = "cdk8s-plus-28"; + packageName = "cdk8s-plus-28"; + version = "2.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.79.tgz"; - sha512 = "QSxCBAbLvDJvC3lqt7lO2x8Il84kCsrwIdfAVFxUiwh4wHQxi18ENI9JI16tEhS/2gxv1YyeUNBM1ucH6q9oJA=="; + url = "https://registry.npmjs.org/cdk8s-plus-28/-/cdk8s-plus-28-2.5.6.tgz"; + sha512 = "ghANDg6Qmsr3vQlEig7ZDWD03ZPXkjae7ks0HaRy2clIW553mCSTjcZirvuJGaIHDN2OV2S1dLXjdIYuMq3qOA=="; }; }; "cdktf-0.20.8" = { @@ -17005,15 +16483,6 @@ let sha512 = "O4O5h0b1E6scc/tqq9EUIQGDbPmdrCQpdkPdbDtUHHzhZGtmFpIMc5MgP1SgB+EzAutnG2oUDefjCqWMnhDe9A=="; }; }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha512 = "Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ=="; - }; - }; "centra-2.7.0" = { name = "centra"; packageName = "centra"; @@ -17248,22 +16717,22 @@ let sha512 = "pakQLw14btS8T4+Q3dgFbe7x447hjsQeEhMJ2kHg8YrOLSmKS0xGl9REnz/eic7dsxS0S9kMRbZcsqrlMAS0dQ=="; }; }; - "cheerio-0.19.0" = { + "cheerio-0.22.0" = { name = "cheerio"; packageName = "cheerio"; - version = "0.19.0"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz"; - sha512 = "Fwcm3zkR37STnPC8FepSHeSYJM5Rd596TZOcfDUdojR4Q735aK1Xn+M+ISagNneuCwMjK28w4kX+ETILGNT/UQ=="; + url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz"; + sha512 = "8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA=="; }; }; - "cheerio-0.22.0" = { + "cheerio-1.0.0" = { name = "cheerio"; packageName = "cheerio"; - version = "0.22.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz"; - sha512 = "8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA=="; + url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz"; + sha512 = "quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww=="; }; }; "cheerio-1.0.0-rc.10" = { @@ -17347,6 +16816,15 @@ let sha512 = "7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="; }; }; + "chokidar-4.0.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-4.0.0.tgz"; + sha512 = "mxIojEAQcuEvT/lyXq+jf/3cO/KoA6z4CeNDGGevTybECPOMFCnQy3OPahluUkbqgPNGw5Bi78UC7Po6Lhy+NA=="; + }; + }; "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; @@ -17374,13 +16852,13 @@ let sha512 = "+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g=="; }; }; - "chroma-js-2.4.2" = { + "chroma-js-2.6.0" = { name = "chroma-js"; packageName = "chroma-js"; - version = "2.4.2"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.4.2.tgz"; - sha512 = "U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A=="; + url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.6.0.tgz"; + sha512 = "BLHvCB9s8Z1EV4ethr6xnkl/P2YRFOGqfgvuMG/MyCbZPrTA+NeiByY6XvgF0zP4/2deU2CXnWyMa3zu1LqQ3A=="; }; }; "chrome-dgram-3.0.6" = { @@ -17419,13 +16897,13 @@ let sha512 = "rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ=="; }; }; - "chromium-bidi-0.6.2" = { + "chromium-bidi-0.6.3" = { name = "chromium-bidi"; packageName = "chromium-bidi"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.2.tgz"; - sha512 = "4WVBa6ijmUTVr9cZD4eicQD8Mdy/HCX3bzEIYYpmk0glqYLoWH+LqQEvV9RpDRzoQSbY1KJHloYXbDMXMbDPhg=="; + url = "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.3.tgz"; + sha512 = "qXlsCmpCZJAnoTYI83Iu6EdYQpMYdVkCfq08KDh2pmlVqK5t5IA9mGs4/LwCwp4fqisSOMXZxP3HIh8w8aRn0A=="; }; }; "chunk-store-iterator-1.0.3" = { @@ -17491,24 +16969,6 @@ let sha512 = "0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="; }; }; - "cjs-module-lexer-1.3.1" = { - name = "cjs-module-lexer"; - packageName = "cjs-module-lexer"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz"; - sha512 = "a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q=="; - }; - }; - "clap-1.2.3" = { - name = "clap"; - packageName = "clap"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz"; - sha512 = "4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA=="; - }; - }; "clarinet-0.11.0" = { name = "clarinet"; packageName = "clarinet"; @@ -17671,6 +17131,15 @@ let sha512 = "VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="; }; }; + "cli-cursor-5.0.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz"; + sha512 = "aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw=="; + }; + }; "cli-progress-3.12.0" = { name = "cli-progress"; packageName = "cli-progress"; @@ -17851,15 +17320,6 @@ let sha512 = "6rj9pgdukjT994Md13JCUAgTk91abAKrygL9sAvmHY4F6AKMOV8ccGaxhUUfcBuyg3sundWnn3JE0Mc9W6ZYqw=="; }; }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha512 = "GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA=="; - }; - }; "cliui-3.2.0" = { name = "cliui"; packageName = "cliui"; @@ -17995,15 +17455,6 @@ let sha512 = "au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag=="; }; }; - "cls-hooked-4.2.2" = { - name = "cls-hooked"; - packageName = "cls-hooked"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cls-hooked/-/cls-hooked-4.2.2.tgz"; - sha512 = "J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw=="; - }; - }; "cluster-key-slot-1.1.2" = { name = "cluster-key-slot"; packageName = "cluster-key-slot"; @@ -18067,15 +17518,6 @@ let sha512 = "QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="; }; }; - "coa-1.0.4" = { - name = "coa"; - packageName = "coa"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz"; - sha512 = "KAGck/eNAmCL0dcT3BiuYwLbExK6lduR8DxM3C1TyDzaXhZHyZ8ooX5I5+na2e3dPFuibfxrGdorr0/Lr7RYCQ=="; - }; - }; "coc.nvim-0.0.79" = { name = "coc.nvim"; packageName = "coc.nvim"; @@ -18139,13 +17581,13 @@ let sha512 = "7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw=="; }; }; - "codemaker-1.101.0" = { + "codemaker-1.103.1" = { name = "codemaker"; packageName = "codemaker"; - version = "1.101.0"; + version = "1.103.1"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.101.0.tgz"; - sha512 = "bAg+N4PA8mniJrCpTYFdaFmJA+3fE1Vjgf4o1EnPc07nw6qRcJsr/D9ZZoutEsvw7UM8OmZp4qZxVzpCqRhhQQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.103.1.tgz"; + sha512 = "y3Ru0bZV6qiuPAt8c/Hik1dCI0dVb6lj/6gAIWckvNYVu5FS51avr3FU/mRtuPrY3b1bW/EA0pszGB/P54Bl5A=="; }; }; "codemaker-1.98.0" = { @@ -18157,15 +17599,6 @@ let sha512 = "UAeICTmY7lJXf4OPnDTwKWg/DU87u67nyxuTjMON+vO8yo8C+EcPWnmmOmWtZm3wWLPsPuxyYIQxIIi/4OZ9TA=="; }; }; - "coffeescript-2.7.0" = { - name = "coffeescript"; - packageName = "coffeescript"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.0.tgz"; - sha512 = "hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A=="; - }; - }; "collapse-white-space-2.1.0" = { name = "collapse-white-space"; packageName = "collapse-white-space"; @@ -18292,15 +17725,6 @@ let sha512 = "pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw=="; }; }; - "colors-1.1.2" = { - name = "colors"; - packageName = "colors"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; - sha512 = "ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w=="; - }; - }; "colors-1.4.0" = { name = "colors"; packageName = "colors"; @@ -18544,22 +17968,13 @@ let sha512 = "gGSHSON1HdpFDb3WpU6C1tdksZV0lpfzoihXK+CD0l4xQ2TvHbVuiZy8Dg414ZqbeRxt2sU8d9kC0srpM2+RzQ=="; }; }; - "comment-json-4.2.4" = { + "comment-json-4.2.5" = { name = "comment-json"; packageName = "comment-json"; - version = "4.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/comment-json/-/comment-json-4.2.4.tgz"; - sha512 = "E5AjpSW+O+N5T2GsOQMHLLsJvrYw6G/AFt9GvU6NguEAfzKShh7hRiLtVo6S9KbRpFMGqE5ojo0/hE+sdteWvQ=="; - }; - }; - "commist-1.1.0" = { - name = "commist"; - packageName = "commist"; - version = "1.1.0"; + version = "4.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/commist/-/commist-1.1.0.tgz"; - sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; + url = "https://registry.npmjs.org/comment-json/-/comment-json-4.2.5.tgz"; + sha512 = "bKw/r35jR3HGt5PEPm1ljsQQGyCrR8sFGNiN5L+ykDHdpO8Smxkrkla9Yi6NkQyUrb8V54PGhfMs6NrIwtxtdw=="; }; }; "commist-3.2.0" = { @@ -18607,13 +18022,13 @@ let sha512 = "j1yoUo4gxPND1JWV9xj5ELih0yMv1iCWDG6eEQIPLSWLxzCXiFoyS7kvB+WwU+tZMf4snwJMMtaubV0laFpiBA=="; }; }; - "commonmark-0.31.0" = { + "commonmark-0.31.2" = { name = "commonmark"; packageName = "commonmark"; - version = "0.31.0"; + version = "0.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/commonmark/-/commonmark-0.31.0.tgz"; - sha512 = "nuDsQ34gjmgAqjyIz6mbRWBW/XPE9wsBempAMBk2V/AA88ekztjTM46oi07J6c6Y/2Y8TdYCZi9L0pIBt/oMZw=="; + url = "https://registry.npmjs.org/commonmark/-/commonmark-0.31.2.tgz"; + sha512 = "2fRLTyb9r/2835k5cwcAwOj0DEc44FARnMp5veGsJ+mEAZdi52sNopLu07ZyElQUz058H43whzlERDIaaSw4rg=="; }; }; "compact2string-1.4.1" = { @@ -18814,15 +18229,6 @@ let sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; }; - "configstore-1.4.0" = { - name = "configstore"; - packageName = "configstore"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz"; - sha512 = "Zcx2SVdZC06IuRHd2MhkVYFNJBkZBj166LGdsJXRcqNC8Gs5Bwh8mosStNeCBBmtIm4wNii2uarD50qztjKOjw=="; - }; - }; "configstore-2.1.0" = { name = "configstore"; packageName = "configstore"; @@ -18859,6 +18265,15 @@ let sha512 = "cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA=="; }; }; + "configstore-7.0.0" = { + name = "configstore"; + packageName = "configstore"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-7.0.0.tgz"; + sha512 = "yk7/5PN5im4qwz0WFZW3PXnzHgPu9mX29Y8uZ3aefe2lBPC1FYttWZRcaW9fKkT0pBCJyuQ2HfbmPVaODi9jcQ=="; + }; + }; "connect-1.9.2" = { name = "connect"; packageName = "connect"; @@ -18967,15 +18382,6 @@ let sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; }; }; - "constantinople-4.0.1" = { - name = "constantinople"; - packageName = "constantinople"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz"; - sha512 = "vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw=="; - }; - }; "constants-browserify-1.0.0" = { name = "constants-browserify"; packageName = "constants-browserify"; @@ -19067,15 +18473,6 @@ let sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; }; - "continuation-local-storage-3.2.1" = { - name = "continuation-local-storage"; - packageName = "continuation-local-storage"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz"; - sha512 = "jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA=="; - }; - }; "conventional-changelog-6.0.0" = { name = "conventional-changelog"; packageName = "conventional-changelog"; @@ -19463,22 +18860,22 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.37.1" = { + "core-js-3.38.1" = { name = "core-js"; packageName = "core-js"; - version = "3.37.1"; + version = "3.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz"; - sha512 = "Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz"; + sha512 = "OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw=="; }; }; - "core-js-compat-3.37.1" = { + "core-js-compat-3.38.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.37.1"; + version = "3.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz"; - sha512 = "9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz"; + sha512 = "JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw=="; }; }; "core-util-is-1.0.2" = { @@ -19787,13 +19184,13 @@ let sha512 = "uOBkDhUAGAbx/FEzNKkOfx3w57H8xReBBXoZvUnOKTI0FW0Xvrj3GrYv2iZXUqlffC1LMGfQzhmBM/ke+6eTDA=="; }; }; - "cross-inspect-1.0.0" = { + "cross-inspect-1.0.1" = { name = "cross-inspect"; packageName = "cross-inspect"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cross-inspect/-/cross-inspect-1.0.0.tgz"; - sha512 = "4PFfn4b5ZN6FMNGSZlyb7wUhuN8wvj8t/VQHZdM4JsDcruGJ8L2kf9zao98QIrBPFCpdk27qst/AGTl7pL3ypQ=="; + url = "https://registry.npmjs.org/cross-inspect/-/cross-inspect-1.0.1.tgz"; + sha512 = "Pcw1JTvZLSJH83iiGWt6fRcT+BjZlCDRVwYLbUcHzv/CRpB7r0MlSrGbIyQvVSNyGnbt7G4AXuyCiDR3POvZ1A=="; }; }; "cross-spawn-5.1.0" = { @@ -19877,13 +19274,13 @@ let sha512 = "x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA=="; }; }; - "cspell-config-lib-8.12.1" = { + "cspell-config-lib-8.14.4" = { name = "cspell-config-lib"; packageName = "cspell-config-lib"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-8.12.1.tgz"; - sha512 = "xEoKdb8hyturyiUXFdRgQotYegYe3OZS+Yc7JHnB75Ykt+Co2gtnu2M/Yb0yoqaHCXflVO6MITrKNaxricgqVw=="; + url = "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-8.14.4.tgz"; + sha512 = "cnUeJfniTiebqCaQmIUnbSrPrTH7xzKRQjJDHAEV0WYnOG2MhRXI13OzytdFdhkVBdStmgTzTCJKE7x+kmU2NA=="; }; }; "cspell-dict-vimlang-1.0.1" = { @@ -19895,22 +19292,22 @@ let sha512 = "pP2W2BvLrRKggS1fUk8qQw2FG8PhyV969dlwF3M0jAg/HH83n76H+KGdzGsmEut6VJFlJYQkd1ZZskjaeVWnrA=="; }; }; - "cspell-dictionary-8.12.1" = { + "cspell-dictionary-8.14.4" = { name = "cspell-dictionary"; packageName = "cspell-dictionary"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.12.1.tgz"; - sha512 = "jYHEA48on6pBQYVUEzXV63wy5Ulx/QNUZcoiG3C0OmYIKjACTaEg02AMDOr+Eaj34E5v4pGEShzot4Qtt/aiNQ=="; + url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.14.4.tgz"; + sha512 = "pZvQHxpAW5fZAnt3ZKKy3s7M+3CX2t8tCS3uJrpEHIynlCawpG0fPF78rVE5o+g0dON36Lguc/BUuSN4IWKLmQ=="; }; }; - "cspell-gitignore-8.12.1" = { + "cspell-gitignore-8.14.4" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.12.1.tgz"; - sha512 = "XlO87rdrab3VKU8e7+RGEfqEtYqo7ObgfZeYEAdJlwUXvqYxBzA11jDZAovDz/5jv0YfRMx6ch5t6+1zfSeBbQ=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.14.4.tgz"; + sha512 = "RwfQEW5hD7CpYwS7m3b0ONG0nTLKP6bL2tvMdl7qtaYkL7ztGdsBTtLD1pmwqUsCbiN5RuaOxhYOYeRcpFRIkQ=="; }; }; "cspell-glob-0.1.25" = { @@ -19922,22 +19319,22 @@ let sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg=="; }; }; - "cspell-glob-8.12.1" = { + "cspell-glob-8.14.4" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.12.1.tgz"; - sha512 = "ZplEPLlNwj7luEKu/VudIaV+cGTQHExihGvAUxlIVMFURiAFMT5eH0UsQoCEpSevIEueO+slLUDy7rxwTwAGdQ=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.14.4.tgz"; + sha512 = "C/xTS5nujMRMuguibq92qMVP767mtxrur7DcVolCvpzcivm1RB5NtIN0OctQxTyMbnmKeQv1t4epRKQ9A8vWRg=="; }; }; - "cspell-grammar-8.12.1" = { + "cspell-grammar-8.14.4" = { name = "cspell-grammar"; packageName = "cspell-grammar"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.12.1.tgz"; - sha512 = "IAES553M5nuB/wtiWYayDX2/5OmDu2VmEcnV6SXNze8oop0oodSqr3h46rLy+m1EOOD8nenMa295N/dRPqTB/g=="; + url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.14.4.tgz"; + sha512 = "yaSKAAJDiamsw3FChbw4HXb2RvTQrDsLelh1+T4MavarOIcAxXrqAJ8ysqm++g+S/ooJz2YO8YWIyzJKxcMf8g=="; }; }; "cspell-io-4.1.7" = { @@ -19949,13 +19346,13 @@ let sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ=="; }; }; - "cspell-io-8.12.1" = { + "cspell-io-8.14.4" = { name = "cspell-io"; packageName = "cspell-io"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-8.12.1.tgz"; - sha512 = "uPjYQP/OKmA8B1XbJunUTBingtrb6IKkp7enyljsZEbtPRKSudP16QPacgyZLLb5rCVQXyexebGfQ182jmq7dg=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-8.14.4.tgz"; + sha512 = "o6OTWRyx/Az+PFhr1B0wMAwqG070hFC9g73Fkxd8+rHX0rfRS69QZH7LgSmZytqbZIMxCTDGdsLl33MFGWCbZQ=="; }; }; "cspell-lib-4.3.12" = { @@ -19967,13 +19364,13 @@ let sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g=="; }; }; - "cspell-lib-8.12.1" = { + "cspell-lib-8.14.4" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.12.1.tgz"; - sha512 = "z2aZXnrip76zbH0j0ibTGux3mA71TMHtoEAd+n66so7Tx3QydUDAI0u7tzfbP3JyqL9ZWPlclQAfbutMUuzMBQ=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.14.4.tgz"; + sha512 = "qdkUkKtm+nmgpA4jQbmQTuepDfjHBDWvs3zDuEwVIVFq/h8gnXrRr75gJ3RYdTy+vOOqHPoLLqgxyqkUUrUGXA=="; }; }; "cspell-trie-lib-4.2.8" = { @@ -19985,13 +19382,13 @@ let sha512 = "Nt3c0gxOYXIc3/yhALDukpje1BgR6guvlUKWQO2zb0r7qRWpwUw2j2YM4dWbHQeH/3Hx5ei4Braa6cMaiJ5YBw=="; }; }; - "cspell-trie-lib-8.12.1" = { + "cspell-trie-lib-8.14.4" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.12.1.tgz"; - sha512 = "a9QmGGUhparM9v184YsB+D0lSdzVgWDlLFEBjVLQJyvp43HErZjvcTPUojUypNQUEjxvksX0/C4pO5Wq8YUD8w=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.14.4.tgz"; + sha512 = "zu8EJ33CH+FA5lwTRGqS//Q6phO0qtgEmODMR1KPlD7WlrfTFMb3bWFsLo/tiv5hjpsn7CM6dYDAAgBOSkoyhQ=="; }; }; "cspell-util-bundle-4.1.11" = { @@ -20003,15 +19400,6 @@ let sha512 = "or3OGKydZs1NwweMIgnA48k8H3F5zK4e5lonjUhpEzLYQZ2nB23decdoqZ8ogFC8pFTA40tZKDsMJ0b+65gX4Q=="; }; }; - "css-3.0.0" = { - name = "css"; - packageName = "css"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css/-/css-3.0.0.tgz"; - sha512 = "DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ=="; - }; - }; "css-declaration-sorter-6.4.1" = { name = "css-declaration-sorter"; packageName = "css-declaration-sorter"; @@ -20048,15 +19436,6 @@ let sha512 = "1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q=="; }; }; - "css-select-1.0.0" = { - name = "css-select"; - packageName = "css-select"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz"; - sha512 = "/xPlD7betkfd7ChGkLGGWx5HWyiHDOSn7aACLzdH0nwucPvB0EAm8hMBm7Xn7vGfAeRRN7KZ8wumGm8NoNcMRw=="; - }; - }; "css-select-1.2.0" = { name = "css-select"; packageName = "css-select"; @@ -20111,15 +19490,6 @@ let sha512 = "6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw=="; }; }; - "css-what-1.0.0" = { - name = "css-what"; - packageName = "css-what"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"; - sha512 = "60SUMPBreXrLXgvpM8kYpO0AOyMRhdRlXFX5BMQbZq1SIJCyNE56nqFQhmvREQdUJpedbGRYZ5wOyq3/F6q5Zw=="; - }; - }; "css-what-2.1.3" = { name = "css-what"; packageName = "css-what"; @@ -20165,13 +19535,13 @@ let sha512 = "j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw=="; }; }; - "cssnano-7.0.4" = { + "cssnano-7.0.6" = { name = "cssnano"; packageName = "cssnano"; - version = "7.0.4"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-7.0.4.tgz"; - sha512 = "rQgpZra72iFjiheNreXn77q1haS2GEy69zCMbu4cpXCFPMQF+D4Ik5V7ktMzUF/sA7xCIgcqHwGPnCD+0a1vHg=="; + url = "https://registry.npmjs.org/cssnano/-/cssnano-7.0.6.tgz"; + sha512 = "54woqx8SCbp8HwvNZYn68ZFAepuouZW4lTwiMVnBErM3VkO7/Sd4oTOt3Zz3bPx3kxQ36aISppyXj2Md4lg8bw=="; }; }; "cssnano-preset-default-5.2.14" = { @@ -20183,13 +19553,13 @@ let sha512 = "t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A=="; }; }; - "cssnano-preset-default-7.0.4" = { + "cssnano-preset-default-7.0.6" = { name = "cssnano-preset-default"; packageName = "cssnano-preset-default"; - version = "7.0.4"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.4.tgz"; - sha512 = "jQ6zY9GAomQX7/YNLibMEsRZguqMUGuupXcEk2zZ+p3GUxwCAsobqPYE62VrJ9qZ0l9ltrv2rgjwZPBIFIjYtw=="; + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.6.tgz"; + sha512 = "ZzrgYupYxEvdGGuqL+JKOY70s7+saoNlHSCK/OGn1vB2pQK8KSET8jvenzItcY+kA7NoWvfbb/YhlzuzNKjOhQ=="; }; }; "cssnano-utils-3.1.0" = { @@ -20210,15 +19580,6 @@ let sha512 = "Uij0Xdxc24L6SirFr25MlwC2rCFX6scyUmuKpzI+JQ7cyqDEwD42fJ0xfB3yLfOnRDU5LKGgjQ9FA6LYh76GWQ=="; }; }; - "csso-2.0.0" = { - name = "csso"; - packageName = "csso"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-2.0.0.tgz"; - sha512 = "tckZA0LhyEnToPoQDmncCA+TUS3aoIVl/MsSaoipR52Sfa+H83fJvIHRVOHMFn9zW6kIV1L0D7tUDFFjvN28lg=="; - }; - }; "csso-4.2.0" = { name = "csso"; packageName = "csso"; @@ -20417,13 +19778,13 @@ let sha512 = "w8a8nQk9YSCkMmH2wDbFqpH1XMz7l409mSvWnnG6Iu6D0Ydhvq61XASE7QIaA46FxfG2Ag524ZuGgAy2cXPfsw=="; }; }; - "cytoscape-3.30.1" = { + "cytoscape-3.30.2" = { name = "cytoscape"; packageName = "cytoscape"; - version = "3.30.1"; + version = "3.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/cytoscape/-/cytoscape-3.30.1.tgz"; - sha512 = "TRJc3HbBPkHd50u9YfJh2FxD1lDLZ+JXnJoyBn5LkncoeuT7fapO/Hq/Ed8TdFclaKshzInge2i30bg7VKeoPQ=="; + url = "https://registry.npmjs.org/cytoscape/-/cytoscape-3.30.2.tgz"; + sha512 = "oICxQsjW8uSaRmn4UK/jkczKOqTrVqt5/1WL0POiJUT2EKNc9STM4hYFHv917yu55aTBMFNRzymlJhVAiWPCxw=="; }; }; "cytoscape-cose-bilkent-4.1.0" = { @@ -20606,13 +19967,13 @@ let sha512 = "p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg=="; }; }; - "d3-graphviz-5.4.0" = { + "d3-graphviz-5.6.0" = { name = "d3-graphviz"; packageName = "d3-graphviz"; - version = "5.4.0"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.4.0.tgz"; - sha512 = "e/kvvdfIfARiB4bF9/vDgY6WwvLxGCny2tS6ozUaOwgbL/CfaBWT7EwvCH5PiDQuvdx+xscnxjCsoUjw2CR86A=="; + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.6.0.tgz"; + sha512 = "46OOyRv5Ioo9kZBc919FVIYPD/ObtdSZxOK1hv+qwmD7TunpPvvmsI1dSdxhVgH4GragJxFZ31+TQC5aOuXzzw=="; }; }; "d3-hierarchy-3.1.2" = { @@ -20957,15 +20318,6 @@ let sha512 = "hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="; }; }; - "date-fns-2.30.0" = { - name = "date-fns"; - packageName = "date-fns"; - version = "2.30.0"; - src = fetchurl { - url = "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz"; - sha512 = "fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw=="; - }; - }; "date-format-4.0.14" = { name = "date-format"; packageName = "date-format"; @@ -21011,13 +20363,13 @@ let sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; }; - "dayjs-1.11.12" = { + "dayjs-1.11.13" = { name = "dayjs"; packageName = "dayjs"; - version = "1.11.12"; + version = "1.11.13"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.12.tgz"; - sha512 = "Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz"; + sha512 = "oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="; }; }; "deasync-0.1.20" = { @@ -21056,6 +20408,15 @@ let sha512 = "Sr4SdOZ4vw6eQDvPYNxHogvrxmCIld/VenC5JbNrFwMiwd7lY/Z18ZFfo+EWNG4DD9nFlAujWAo/wGuOPHmy5A=="; }; }; + "debounce-promise-3.1.2" = { + name = "debounce-promise"; + packageName = "debounce-promise"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debounce-promise/-/debounce-promise-3.1.2.tgz"; + sha512 = "rZHcgBkbYavBeD9ej6sP56XfG53d51CD4dnaw989YX/nZ/ZJfgRx/9ePKmTNiUiyQvh4mtrMoS3OAWW+yoYtpg=="; + }; + }; "debug-0.6.0" = { name = "debug"; packageName = "debug"; @@ -21128,13 +20489,13 @@ let sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; - "debug-4.3.5" = { + "debug-4.3.7" = { name = "debug"; packageName = "debug"; - version = "4.3.5"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz"; - sha512 = "pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz"; + sha512 = "Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="; }; }; "debuglog-1.0.1" = { @@ -21308,15 +20669,6 @@ let sha512 = "1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw=="; }; }; - "dedent-0.7.0" = { - name = "dedent"; - packageName = "dedent"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"; - sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="; - }; - }; "dedent-1.5.3" = { name = "dedent"; packageName = "dedent"; @@ -21848,24 +21200,6 @@ let sha512 = "rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig=="; }; }; - "diagnostic-channel-1.1.1" = { - name = "diagnostic-channel"; - packageName = "diagnostic-channel"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-1.1.1.tgz"; - sha512 = "r2HV5qFkUICyoaKlBEpLKHjxMXATUf/l+h8UZPGBHGLy4DDiY2sOLcIctax4eRnTw5wH2jTMExLntGPJ8eOJxw=="; - }; - }; - "diagnostic-channel-publishers-1.0.7" = { - name = "diagnostic-channel-publishers"; - packageName = "diagnostic-channel-publishers"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.7.tgz"; - sha512 = "SEECbY5AiVt6DfLkhkaHNeshg1CogdLLANA8xlG/TKvS+XUgvIKl7VspJGYiEdL5OUyzMVnr7o0AwB7f+/Mjtg=="; - }; - }; "dicer-0.3.0" = { name = "dicer"; packageName = "dicer"; @@ -22127,15 +21461,6 @@ let sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; }; - "doctypes-1.1.0" = { - name = "doctypes"; - packageName = "doctypes"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz"; - sha512 = "LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ=="; - }; - }; "doipjs-0.15.7" = { name = "doipjs"; packageName = "doipjs"; @@ -22550,13 +21875,13 @@ let sha512 = "vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg=="; }; }; - "dset-3.1.3" = { + "dset-3.1.4" = { name = "dset"; packageName = "dset"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/dset/-/dset-3.1.3.tgz"; - sha512 = "20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ=="; + url = "https://registry.npmjs.org/dset/-/dset-3.1.4.tgz"; + sha512 = "2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA=="; }; }; "dtrace-provider-0.6.0" = { @@ -22622,15 +21947,6 @@ let sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; - "duplexify-4.1.3" = { - name = "duplexify"; - packageName = "duplexify"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz"; - sha512 = "M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA=="; - }; - }; "each-props-3.0.0" = { name = "each-props"; packageName = "each-props"; @@ -22739,13 +22055,13 @@ let sha512 = "UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA=="; }; }; - "electron-to-chromium-1.5.1" = { + "electron-to-chromium-1.5.26" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.5.1"; + version = "1.5.26"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.1.tgz"; - sha512 = "FKbOCOQ5QRB3VlIbl1LZQefWIYwszlBloaXcY2rbfpu9ioJnNh3TK03YtIDKDo3WKBi8u+YV4+Fn2CkEozgf4w=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.26.tgz"; + sha512 = "Z+OMe9M/V6Ep9n/52+b7lkvYEps26z4Yz3vjWL1V61W0q+VLF1pOHhMY17sa4roz4AWmULSI8E6SAojZA5L0YQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -22775,13 +22091,13 @@ let sha512 = "f/ZeWvW/BCXbhGEf1Ujp29EASo/lk1FDnETgNKwJrsVvGZhUWCZyg3xLJjAsxfOmt8KjswHmI5EwCQcPMpOYhQ=="; }; }; - "elliptic-6.5.6" = { + "elliptic-6.5.7" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.6"; + version = "6.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.6.tgz"; - sha512 = "mpzdtpeCLuS3BmE3pO3Cpp5bbjlOPY2Q0PgoF+Od1XZrHLYI28Xe3ossCmYCQt11FQKEYd9+PF8jymTvtWJSHQ=="; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz"; + sha512 = "ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q=="; }; }; "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { @@ -22794,15 +22110,6 @@ let sha256 = "017c2be5bb31d76e87a1910024d0e420e05aa7c1f4f0b0c792e15d0746ae77a6"; }; }; - "emitter-listener-1.1.2" = { - name = "emitter-listener"; - packageName = "emitter-listener"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.1.2.tgz"; - sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ=="; - }; - }; "emittery-0.10.0" = { name = "emittery"; packageName = "emittery"; @@ -22812,22 +22119,13 @@ let sha512 = "AGvFfs+d0JKCJQ4o01ASQLGPmSCxgfU9RFXvzPvZdjKK8oscynksuJhWrSTSw7j7Ep/sZct5b5ZhYCi8S/t0HQ=="; }; }; - "emmet-2.4.7" = { - name = "emmet"; - packageName = "emmet"; - version = "2.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/emmet/-/emmet-2.4.7.tgz"; - sha512 = "O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA=="; - }; - }; - "emoji-regex-10.3.0" = { + "emoji-regex-10.4.0" = { name = "emoji-regex"; packageName = "emoji-regex"; - version = "10.3.0"; + version = "10.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz"; - sha512 = "QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw=="; + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz"; + sha512 = "EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw=="; }; }; "emoji-regex-7.0.3" = { @@ -22911,6 +22209,15 @@ let sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; + "encodeurl-2.0.0" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz"; + sha512 = "Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="; + }; + }; "encoding-0.1.13" = { name = "encoding"; packageName = "encoding"; @@ -22920,6 +22227,15 @@ let sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; }; }; + "encoding-sniffer-0.2.0" = { + name = "encoding-sniffer"; + packageName = "encoding-sniffer"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz"; + sha512 = "ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg=="; + }; + }; "end-of-stream-0.1.5" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -23235,6 +22551,15 @@ let sha512 = "cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q=="; }; }; + "envinfo-7.14.0" = { + name = "envinfo"; + packageName = "envinfo"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz"; + sha512 = "CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg=="; + }; + }; "environment-1.1.0" = { name = "environment"; packageName = "environment"; @@ -23433,15 +22758,6 @@ let sha512 = "mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A=="; }; }; - "es6-promise-2.3.0" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz"; - sha512 = "oyOjMhyKMLEjOOtvkwg0G4pAzLQ9WdbbeX7WdqKzvYXu+UFgD0Zo/Brq5Q49zNmnGPPzV5rmYvrr0jz1zWx8Iw=="; - }; - }; "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; @@ -23523,13 +22839,13 @@ let sha512 = "l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w=="; }; }; - "esbuild-0.21.5" = { + "esbuild-0.23.1" = { name = "esbuild"; packageName = "esbuild"; - version = "0.21.5"; + version = "0.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz"; - sha512 = "mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz"; + sha512 = "VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg=="; }; }; "esbuild-android-64-0.14.47" = { @@ -23721,13 +23037,13 @@ let sha512 = "flJEhtHCj5qEJi9zY3Taq2YHHJ2WgowI6Krmrr32lbeEBwBxGOJoZ7s9fxzHTq5sMkz8d95o25Y7hhV1lzM4Gg=="; }; }; - "escalade-3.1.2" = { + "escalade-3.2.0" = { name = "escalade"; packageName = "escalade"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz"; - sha512 = "ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz"; + sha512 = "WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="; }; }; "escape-goat-2.1.1" = { @@ -23856,22 +23172,13 @@ let sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; - "eslint-8.57.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.57.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz"; - sha512 = "dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ=="; - }; - }; - "eslint-9.7.0" = { + "eslint-8.57.1" = { name = "eslint"; packageName = "eslint"; - version = "9.7.0"; + version = "8.57.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-9.7.0.tgz"; - sha512 = "FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz"; + sha512 = "ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA=="; }; }; "eslint-config-prettier-8.10.0" = { @@ -23901,13 +23208,13 @@ let sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw=="; }; }; - "eslint-plugin-vue-9.27.0" = { + "eslint-plugin-vue-9.28.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "9.27.0"; + version = "9.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.27.0.tgz"; - sha512 = "5Dw3yxEyuBSXTzT5/Ge1X5kIkRTQ3nvBn/VwPwInNiZBSJOO/timWMUaflONnFBzU6NhB68lxnCda7ULV5N7LA=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.28.0.tgz"; + sha512 = "ShrihdjIhOTxs+MfWun6oJWuk+g/LAhN+CiuOl/jjkG3l0F2AuK5NMTaWqyvBgkFtpYmyks6P4603mLmhNJW8g=="; }; }; "eslint-rule-docs-1.1.235" = { @@ -23937,15 +23244,6 @@ let sha512 = "dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg=="; }; }; - "eslint-scope-8.0.2" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz"; - sha512 = "6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA=="; - }; - }; "eslint-utils-2.1.0" = { name = "eslint-utils"; packageName = "eslint-utils"; @@ -23982,15 +23280,6 @@ let sha512 = "wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="; }; }; - "eslint-visitor-keys-4.0.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz"; - sha512 = "OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw=="; - }; - }; "esm-env-1.0.0" = { name = "esm-env"; packageName = "esm-env"; @@ -24009,15 +23298,6 @@ let sha512 = "kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg=="; }; }; - "espree-10.1.0" = { - name = "espree"; - packageName = "espree"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz"; - sha512 = "M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA=="; - }; - }; "espree-3.5.4" = { name = "espree"; packageName = "espree"; @@ -24162,13 +23442,13 @@ let sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; }; - "eta-3.4.0" = { + "eta-3.5.0" = { name = "eta"; packageName = "eta"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eta/-/eta-3.4.0.tgz"; - sha512 = "tCsc7WXTjrTx4ZjYLplcqrI3o4mYJ+Z6YspeuGL8tbt/hHoMchwBwtKfwM09svEY86iRapY93vUqQttcNuIO5Q=="; + url = "https://registry.npmjs.org/eta/-/eta-3.5.0.tgz"; + sha512 = "e3x3FBvGzeCIHhF+zhK8FZA2vC5uFn6b4HJjegUbIWrDb4mJ7JjTGMJY9VGIbRVpmSwHopNiaJibhjIr+HfLug=="; }; }; "etag-1.8.1" = { @@ -24180,13 +23460,13 @@ let sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; }; }; - "ethereum-bloom-filters-1.1.0" = { + "ethereum-bloom-filters-1.2.0" = { name = "ethereum-bloom-filters"; packageName = "ethereum-bloom-filters"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.1.0.tgz"; - sha512 = "J1gDRkLpuGNvWYzWslBQR9cDV4nd4kfvVTE/Wy4Kkm4yb3EYRSlyi0eB/inTsSTTVyA0+HyzHgbr95Fn/Z1fSw=="; + url = "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.2.0.tgz"; + sha512 = "28hyiE7HVsWubqhpVLVmZXFd4ITeHi+BUu05o9isf0GUpMtzBUi+8/gFrGaGYzvGAJQmJ3JKj77Mk9G98T84rA=="; }; }; "ethereum-cryptography-2.2.1" = { @@ -24423,13 +23703,13 @@ let sha512 = "VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg=="; }; }; - "execa-9.3.0" = { + "execa-9.4.0" = { name = "execa"; packageName = "execa"; - version = "9.3.0"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-9.3.0.tgz"; - sha512 = "l6JFbqnHEadBoVAVpN5dl2yCyfX28WoBAGaoQcNmLLSedOxTxcn2Qa83s8I/PA5i56vWru2OHOtrwF7Om2vqlg=="; + url = "https://registry.npmjs.org/execa/-/execa-9.4.0.tgz"; + sha512 = "yKHlle2YGxZE842MERVIplWwNH5VYmqqcPFgtnlU//K8gxuFFXu0pwd/CrfXTumFpeEiufsP7+opT/bPJa1yVw=="; }; }; "execall-2.0.0" = { @@ -24612,13 +23892,13 @@ let sha512 = "S8qfaXCv//7tQWV9M+JKx3CF7ypYhDdSUbkUQdaVO/r8D76/aRTArY/aRw1yEfaAOzyK8C8diDToV1itl51DfQ=="; }; }; - "expo-modules-autolinking-1.11.1" = { + "expo-modules-autolinking-1.11.2" = { name = "expo-modules-autolinking"; packageName = "expo-modules-autolinking"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.11.1.tgz"; - sha512 = "2dy3lTz76adOl7QUvbreMCrXyzUiF8lygI7iFJLjgIQIVH+43KnFWE5zBumpPbkiaq0f0uaFpN9U0RGQbnKiMw=="; + url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.11.2.tgz"; + sha512 = "fdcaNO8ucHA3yLNY52ZUENBcAG7KEx8QyMmnVNavO1JVBGRMZG8JyVcbrhYQDtVtpxkbai5YzwvLutINvbDZDQ=="; }; }; "expo-modules-autolinking-1.2.0" = { @@ -24702,6 +23982,15 @@ let sha512 = "5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q=="; }; }; + "express-4.21.0" = { + name = "express"; + packageName = "express"; + version = "4.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.21.0.tgz"; + sha512 = "VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng=="; + }; + }; "express-handlebars-3.1.0" = { name = "express-handlebars"; packageName = "express-handlebars"; @@ -25134,13 +24423,13 @@ let sha512 = "CDYeykkle1LiA/uqQyNwYpFbyF6Axec6YapmpUP+/RHWIoR1zKjocdvNaTsxCxZzQ6v9MLXaSYm9Qq0thv0DHg=="; }; }; - "fast-xml-parser-4.2.5" = { + "fast-xml-parser-4.4.1" = { name = "fast-xml-parser"; packageName = "fast-xml-parser"; - version = "4.2.5"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz"; - sha512 = "B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g=="; + url = "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz"; + sha512 = "xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw=="; }; }; "fastest-levenshtein-1.0.16" = { @@ -25242,6 +24531,15 @@ let sha512 = "cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g=="; }; }; + "fdir-6.3.0" = { + name = "fdir"; + packageName = "fdir"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fdir/-/fdir-6.3.0.tgz"; + sha512 = "QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ=="; + }; + }; "fecha-4.2.3" = { name = "fecha"; packageName = "fecha"; @@ -25359,22 +24657,13 @@ let sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; }; - "file-entry-cache-8.0.0" = { + "file-entry-cache-9.1.0" = { name = "file-entry-cache"; packageName = "file-entry-cache"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz"; - sha512 = "XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ=="; - }; - }; - "file-entry-cache-9.0.0" = { - name = "file-entry-cache"; - packageName = "file-entry-cache"; - version = "9.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.0.0.tgz"; - sha512 = "6MgEugi8p2tiUhqO7GnPsmbCCzj0YRCwwaTbpGRyKZesjRSzkqkAE9fPp7V2yMs5hwfgbQLgdvSSkGNg1s5Uvw=="; + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.1.0.tgz"; + sha512 = "/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg=="; }; }; "file-or-stdin-1.0.2" = { @@ -25620,6 +24909,15 @@ let sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; }; }; + "finalhandler-1.3.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz"; + sha512 = "6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ=="; + }; + }; "find-babel-config-1.2.2" = { name = "find-babel-config"; packageName = "find-babel-config"; @@ -25836,15 +25134,6 @@ let sha512 = "CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw=="; }; }; - "flat-cache-4.0.1" = { - name = "flat-cache"; - packageName = "flat-cache"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz"; - sha512 = "f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw=="; - }; - }; "flat-cache-5.0.0" = { name = "flat-cache"; packageName = "flat-cache"; @@ -25926,6 +25215,15 @@ let sha512 = "wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="; }; }; + "follow-redirects-1.15.9" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.15.9"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz"; + sha512 = "gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="; + }; + }; "follow-redirects-1.5.10" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -26016,13 +25314,13 @@ let sha512 = "J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw=="; }; }; - "foreground-child-3.2.1" = { + "foreground-child-3.3.0" = { name = "foreground-child"; packageName = "foreground-child"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz"; - sha512 = "PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA=="; + url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz"; + sha512 = "Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg=="; }; }; "forever-agent-0.6.1" = { @@ -26151,13 +25449,13 @@ let sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; - "fp-ts-2.16.8" = { + "fp-ts-2.16.9" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.16.8"; + version = "2.16.9"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.16.8.tgz"; - sha512 = "nmDtNqmMZkOxu0M5hkrS9YA15/KPkYkILb6Axg9XBAoUoYEtzg+LFmVWqZrl9FNttsW0qIUpx9RCA9INbv+Bxw=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.16.9.tgz"; + sha512 = "+I2+FnVB+tVaxcYyQkHUq7ZdKScaBlX53A41mxQtpIccsfyv8PzdzP7fzp2AY832T4aoK6UZ5WRX/ebGd8uZuQ=="; }; }; "fragment-cache-0.2.1" = { @@ -26439,13 +25737,13 @@ let sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; }; - "fsa-chunk-store-1.1.5" = { + "fsa-chunk-store-1.3.0" = { name = "fsa-chunk-store"; packageName = "fsa-chunk-store"; - version = "1.1.5"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fsa-chunk-store/-/fsa-chunk-store-1.1.5.tgz"; - sha512 = "+3G6d/syYrw4tGJCivHWjtTKNeP7rOXfX1wgnwzsu81CVHKVOah74XxGdlRHRrMTN5dU15lWbnhgtRsBop3V5A=="; + url = "https://registry.npmjs.org/fsa-chunk-store/-/fsa-chunk-store-1.3.0.tgz"; + sha512 = "0WCfuxqqSB6Tz/g7Ar/nwAxMoigXaIXuvfrnLIEFYIA9uc6w9eNaHuBGzU1X3lyM4cpLKCOTUmKAA/gCiTvzMQ=="; }; }; "fsevents-1.2.13" = { @@ -26466,15 +25764,6 @@ let sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; - "fsevents-2.3.2" = { - name = "fsevents"; - packageName = "fsevents"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; - sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; - }; - }; "fstream-1.0.12" = { name = "fstream"; packageName = "fstream"; @@ -26952,13 +26241,13 @@ let sha512 = "g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg=="; }; }; - "get-tsconfig-4.7.6" = { + "get-tsconfig-4.8.1" = { name = "get-tsconfig"; packageName = "get-tsconfig"; - version = "4.7.6"; + version = "4.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.6.tgz"; - sha512 = "ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA=="; + url = "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.1.tgz"; + sha512 = "k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg=="; }; }; "get-uri-6.0.3" = { @@ -27457,15 +26746,6 @@ let sha512 = "AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ=="; }; }; - "globals-14.0.0" = { - name = "globals"; - packageName = "globals"; - version = "14.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz"; - sha512 = "oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ=="; - }; - }; "globals-9.18.0" = { name = "globals"; packageName = "globals"; @@ -27682,15 +26962,6 @@ let sha512 = "XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA=="; }; }; - "got-3.3.1" = { - name = "got"; - packageName = "got"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz"; - sha512 = "7chPlc0pWHjvq7B6dEEXz4GphoDupOvBSSl6AwRsAJX7GPTZ+bturaZiIigX4Dp6KrAP67nvzuKkNc0SLA0DKg=="; - }; - }; "got-5.7.1" = { name = "got"; packageName = "got"; @@ -27862,6 +27133,15 @@ let sha512 = "GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw=="; }; }; + "graphql-17.0.0-alpha.7" = { + name = "graphql"; + packageName = "graphql"; + version = "17.0.0-alpha.7"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql/-/graphql-17.0.0-alpha.7.tgz"; + sha512 = "kdteHez9s0lfNAGntSwnDBpxSl09sBWEFxFRPS/Z8K1nCD4FZ2wVGwXuj5dvrTKcqOA+O8ujAJ3CiY/jXhs14g=="; + }; + }; "graphql-config-3.0.3" = { name = "graphql-config"; packageName = "graphql-config"; @@ -27880,22 +27160,22 @@ let sha512 = "BNGZaoxIBkv9yy6Y7omvsaBUHOzfFcII3UN++tpH8MGOKFPFkCPZuwx09ggANMt8FgyWP1Od8SWPmrUEZca4NQ=="; }; }; - "graphql-language-service-5.2.1" = { + "graphql-language-service-5.3.0" = { name = "graphql-language-service"; packageName = "graphql-language-service"; - version = "5.2.1"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.2.1.tgz"; - sha512 = "8ewD6otGO43vg2TiEGjoLz3CweTwfaf4ZnqfNREqZXS2JSJGXtsRBOMMknCxMfFVh4x14ql3jyDrXcyAAtbmkQ=="; + url = "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.3.0.tgz"; + sha512 = "gCQIIy7lM9CB1KPLEb+DNZLczA9zuTLEOJE2hEQZTFYInogdmMDRa6RAkvM4LL0LcgcS+3uPs6KtHlcjCqRbUg=="; }; }; - "graphql-language-service-server-2.13.1" = { + "graphql-language-service-server-2.14.0" = { name = "graphql-language-service-server"; packageName = "graphql-language-service-server"; - version = "2.13.1"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.13.1.tgz"; - sha512 = "Bmkf+qW61XSV49P55U0K8ceG2++ctjhrefe62G5Iwm72RtvMlB41FUpv5KA/P79nxLNPPH1Fa+07whfxLylbHw=="; + url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.14.0.tgz"; + sha512 = "8t/uCNBsZZHv5Lq/OMmSNmrPegEgbK46hDFhGfd4Os5yldC7ilKCNjbchIk/stu5luHumhhWbcdR63YGZodY9Q=="; }; }; "graphql-subscriptions-1.2.1" = { @@ -28510,15 +27790,6 @@ let sha512 = "g+HZqgfbpXdCkme/Cd/mZkV0aV3BZZZSugecH03kl38m/Kmdx8jKjBikpDj2cr+Iynv4KpYEviojNdTJActJAg=="; }; }; - "help-me-3.0.0" = { - name = "help-me"; - packageName = "help-me"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-3.0.0.tgz"; - sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ=="; - }; - }; "help-me-5.0.0" = { name = "help-me"; packageName = "help-me"; @@ -28744,15 +28015,6 @@ let sha512 = "ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ=="; }; }; - "html-to-text-9.0.5" = { - name = "html-to-text"; - packageName = "html-to-text"; - version = "9.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.5.tgz"; - sha512 = "qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg=="; - }; - }; "html-webpack-plugin-5.6.0" = { name = "html-webpack-plugin"; packageName = "html-webpack-plugin"; @@ -28834,6 +28096,15 @@ let sha512 = "GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA=="; }; }; + "htmlparser2-9.1.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz"; + sha512 = "5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ=="; + }; + }; "http-auth-3.1.3" = { name = "http-auth"; packageName = "http-auth"; @@ -29023,15 +28294,6 @@ let sha512 = "CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="; }; }; - "http-signature-1.3.6" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz"; - sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw=="; - }; - }; "http-signature-1.4.0" = { name = "http-signature"; packageName = "http-signature"; @@ -29167,13 +28429,13 @@ let sha512 = "AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ=="; }; }; - "human-signals-7.0.0" = { + "human-signals-8.0.0" = { name = "human-signals"; packageName = "human-signals"; - version = "7.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/human-signals/-/human-signals-7.0.0.tgz"; - sha512 = "74kytxOUSvNbjrT9KisAbaTZ/eJwD/LrbM/kh5j0IhPuJzwuA19dWvniFGwBzN9rVjg+O/e+F310PjObDXS+9Q=="; + url = "https://registry.npmjs.org/human-signals/-/human-signals-8.0.0.tgz"; + sha512 = "/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA=="; }; }; "humanize-ms-1.2.1" = { @@ -29185,15 +28447,6 @@ let sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; }; }; - "hybrid-chunk-store-1.2.6" = { - name = "hybrid-chunk-store"; - packageName = "hybrid-chunk-store"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/hybrid-chunk-store/-/hybrid-chunk-store-1.2.6.tgz"; - sha512 = "D8DkY6FT+exjw4b6uQ8z5QfUokcIb0YYPHaa/zpBdFIoS1CS7mjM4wnd2mGoo2XUeM5Y10C23AXOQRExoifPbA=="; - }; - }; "hyperdyperid-1.2.0" = { name = "hyperdyperid"; packageName = "hyperdyperid"; @@ -29266,15 +28519,6 @@ let sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; }; }; - "idb-7.1.1" = { - name = "idb"; - packageName = "idb"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz"; - sha512 = "gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ=="; - }; - }; "ieee754-1.1.13" = { name = "ieee754"; packageName = "ieee754"; @@ -29329,13 +28573,13 @@ let sha512 = "g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg=="; }; }; - "ignore-5.3.1" = { + "ignore-5.3.2" = { name = "ignore"; packageName = "ignore"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz"; - sha512 = "5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz"; + sha512 = "hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="; }; }; "ignore-walk-3.0.4" = { @@ -29500,15 +28744,6 @@ let sha512 = "P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ=="; }; }; - "import-in-the-middle-1.4.2" = { - name = "import-in-the-middle"; - packageName = "import-in-the-middle"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.4.2.tgz"; - sha512 = "9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw=="; - }; - }; "import-lazy-2.1.0" = { name = "import-lazy"; packageName = "import-lazy"; @@ -29653,15 +28888,6 @@ let sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; }; - "infinity-agent-2.0.3" = { - name = "infinity-agent"; - packageName = "infinity-agent"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz"; - sha512 = "CnfUJe5o2S9aAQWXGMhDZI4UL39MAJV3guOTfHHIdos4tuVHkl1j/J+1XLQn+CLIvqcpgQR/p+xXYXzcrhCe5w=="; - }; - }; "inflection-3.0.0" = { name = "inflection"; packageName = "inflection"; @@ -30499,13 +29725,13 @@ let sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; }; }; - "is-core-module-2.15.0" = { + "is-core-module-2.15.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.15.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz"; - sha512 = "Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz"; + sha512 = "z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ=="; }; }; "is-core-module-2.9.0" = { @@ -30850,6 +30076,15 @@ let sha512 = "d9PXLEY0v1iJ64xLiQMJ51J128EYHAaOR4yZqQi8aHGfw6KgifM3/Viw1oZZ1GCVmb3gBuyhLyHj0HgR2DhSXQ=="; }; }; + "is-in-ci-1.0.0" = { + name = "is-in-ci"; + packageName = "is-in-ci"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-in-ci/-/is-in-ci-1.0.0.tgz"; + sha512 = "eUuAjybVTHMYWm/U+vBO1sY/JOCgoPCXRxzdju0K+K0BiGW0SChEL1MLC0PoCIR1OlPo5YAp8HuQoUlsWEICwg=="; + }; + }; "is-inside-container-1.0.0" = { name = "is-inside-container"; packageName = "is-inside-container"; @@ -31534,13 +30769,13 @@ let sha512 = "43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ=="; }; }; - "is-unicode-supported-2.0.0" = { + "is-unicode-supported-2.1.0" = { name = "is-unicode-supported"; packageName = "is-unicode-supported"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.0.0.tgz"; - sha512 = "FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q=="; + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz"; + sha512 = "mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ=="; }; }; "is-url-1.2.4" = { @@ -31822,13 +31057,13 @@ let sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="; }; }; - "issue-regex-4.1.0" = { + "issue-regex-4.2.0" = { name = "issue-regex"; packageName = "issue-regex"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/issue-regex/-/issue-regex-4.1.0.tgz"; - sha512 = "X3HBmm7+Th+l4/kMtqwcHHgELD0Lfl0Ina6S3+grr+mKmTxsrM84NAO1UuRPIxIbGLIl3TCEu45S1kdu21HYbQ=="; + url = "https://registry.npmjs.org/issue-regex/-/issue-regex-4.2.0.tgz"; + sha512 = "uXRJWQzWjBWzbgE2VWTA/iT4VXhcH0a7BruAUch0tv4h3tf/Jsw+pXxptmErg4Rb3RwCXUbH9NUd83afNoj/WQ=="; }; }; "isuri-2.0.3" = { @@ -32074,13 +31309,13 @@ let sha512 = "m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="; }; }; - "jquery.terminal-2.42.2" = { + "jquery.terminal-2.43.1" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.42.2"; + version = "2.43.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.42.2.tgz"; - sha512 = "TC3jRvCly1ZohSsy3m2UQjyOEYyZSl7YZQDUeF07nrQX1HAes+AznykYdhEPRHh2viYVp9GW0c1W+pm2eibLAw=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.43.1.tgz"; + sha512 = "TcezgCLdtAn0dTzPXK6kdnzJV4k9vcdTVxt7l0teFV+7LGWRCFIhs49U3WeNKU0aereFtlR5N5qrSWBGqPlw0A=="; }; }; "js-base64-2.6.3" = { @@ -32128,15 +31363,6 @@ let sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; }; }; - "js-stringify-1.0.2" = { - name = "js-stringify"; - packageName = "js-stringify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz"; - sha512 = "rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g=="; - }; - }; "js-tokens-3.0.2" = { name = "js-tokens"; packageName = "js-tokens"; @@ -32182,15 +31408,6 @@ let sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; - "js-yaml-3.6.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha512 = "BLv3oxhfET+w5fjPwq3PsAsxzi9i3qzU//HMpWVz0A6KplF86HdR9x2TGnv9DXhSUrO7LO8czUiTd3yb3mLSvg=="; - }; - }; "js-yaml-4.1.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -32227,15 +31444,6 @@ let sha512 = "4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="; }; }; - "jschardet-1.6.0" = { - name = "jschardet"; - packageName = "jschardet"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz"; - sha512 = "xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ=="; - }; - }; "jsdom-14.1.0" = { name = "jsdom"; packageName = "jsdom"; @@ -32299,22 +31507,22 @@ let sha512 = "/6Mw+iSS8c/s1n2qH3TO1Bqd1YUY/aR0TZ2qTfOKN2UmmU4fwhZzSxrGRerPFQbhUm8v+8RS7kWEhSOv+eGQ9Q=="; }; }; - "jsii-5.4.26" = { + "jsii-5.5.4" = { name = "jsii"; packageName = "jsii"; - version = "5.4.26"; + version = "5.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.4.26.tgz"; - sha512 = "vb1k7wsVfgYysXagV6ASStC7I+uEFRttSxpVSlz3HTNaoQYgQwiShkpqhRLlzYw9Pl5jERs+457QTVSj7Ze+zg=="; + url = "https://registry.npmjs.org/jsii/-/jsii-5.5.4.tgz"; + sha512 = "ftEKVacc0kLrxCJyCeVJ+C5JYpUY5GBpy4ckt1LgblYQWa1CDu+5qUn2MvD5k8AwnDp36Dm6iQKislhSTOxBkA=="; }; }; - "jsii-pacmak-1.101.0" = { + "jsii-pacmak-1.103.1" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.101.0"; + version = "1.103.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.101.0.tgz"; - sha512 = "07a04KtOj+Kmx+5XQVD1JG6QOh6JNqFWh4bbzMDKiFx7JoHhQnLq07b/OlUpCuP7J7Q9WaXXYM59EUQpXO07wg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.103.1.tgz"; + sha512 = "2zzm/OYsdbxcaYuq4n0o2lQAPQ5Fo+T+sQJPGFeMXD0kgDZTNqXv21FdsKBKuQ/DutxTATOaZ7gTXEDK1n7/RQ=="; }; }; "jsii-pacmak-1.98.0" = { @@ -32326,13 +31534,13 @@ let sha512 = "p2H8IbiI3RNIUg+oRcJ9Xu1I7CgJUxCMpUl5IPzWAjz1qzhIKOzlkaAMGJfJZJQtib5kWI2OmZ6xBZScWg16+Q=="; }; }; - "jsii-reflect-1.101.0" = { + "jsii-reflect-1.103.1" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.101.0"; + version = "1.103.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.101.0.tgz"; - sha512 = "ZCFb+laktj/ekNadUYksf+jLZq4fjoQeNe344GwslJOaemGjgAeqy0atV2H8nvTYU8ubszFApUPpdoRvtxgdPw=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.103.1.tgz"; + sha512 = "kFm09KL9dlxyxesf7mtm12+4vVaRin5YI4Eca2OOa0X28HNVpr62/n21T3BuAAhFaI0nkiUoJuBWtdOz475BSQ=="; }; }; "jsii-rosetta-5.4.14" = { @@ -32344,22 +31552,22 @@ let sha512 = "SIaqWpzk33Tqr+x4M4umt9Z9CSxcr6i48pN6aTe7nzT3ELmBABsWzHHpnoCDUlLzx5OG+PKMfVdxoh7z3TX0lQ=="; }; }; - "jsii-rosetta-5.4.25" = { + "jsii-rosetta-5.5.5" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "5.4.25"; + version = "5.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.4.25.tgz"; - sha512 = "tXVABsWJMknMNhUpGkbOWaqHYv45vRSxO2ZLY+s+Eiti1R/G2XeGWJd/a9MJDauLaOVODpzN6z1GQ+WYZjZlIw=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.5.5.tgz"; + sha512 = "eXkY5eJck2XPd+xk6f4uRQ1S1d5/on2GO1H1Rr6WkJW7E51FXltpsmPaXzrAtvNd6doBNd6/X1CM4otEt/nnBA=="; }; }; - "jsii-srcmak-0.1.1193" = { + "jsii-srcmak-0.1.1236" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.1193"; + version = "0.1.1236"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1193.tgz"; - sha512 = "q3pEUmudzgl75ZXqHXWB6m7CMil9rAcY1Ln7hsWHgpf4DPeS7YEvUa+jOQ5YY4T3ljN8Q0G08jJIPutQ1osqaA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1236.tgz"; + sha512 = "tnVMEbT1m8KdUgky56KZXT7vdLJjLmAclzSo2H59MCNUcp6eHfBxFQFyHJpXsS0B77vc8tHTMUlo4qoISuts3A=="; }; }; "json-buffer-3.0.0" = { @@ -32578,13 +31786,13 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "json2jsii-0.4.4" = { + "json2jsii-0.5.0" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.4.4"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.4.4.tgz"; - sha512 = "jTbmFuxivo20zb/JOKc2U5/qSFWsobJmglvmWVdQoWdR2Ip9KtY9t679QLs7TV/oYSY3VnJU83IWL1QH0eI/4w=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.5.0.tgz"; + sha512 = "KU1W63OO4hKK5mhYxRmoVY8qbw3igOLlPsq8o6nFZBHdD0ZQEghVbV604wB/pY0ofZPp1Hy92jkFjo6xsMUNEA=="; }; }; "json3-3.2.6" = { @@ -32821,15 +32029,6 @@ let sha512 = "gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ=="; }; }; - "jstransformer-1.0.0" = { - name = "jstransformer"; - packageName = "jstransformer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"; - sha512 = "C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A=="; - }; - }; "jszip-3.10.1" = { name = "jszip"; packageName = "jszip"; @@ -33208,13 +32407,13 @@ let sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; }; - "ky-1.4.0" = { + "ky-1.7.2" = { name = "ky"; packageName = "ky"; - version = "1.4.0"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/ky/-/ky-1.4.0.tgz"; - sha512 = "tPhhoGUiEiU/WXR4rt8klIoLdnTtyu+9jVKHd/wauEjYud32jyn63mzKWQweaQrHWxBQtYoVtdcEnYX1LosnFQ=="; + url = "https://registry.npmjs.org/ky/-/ky-1.7.2.tgz"; + sha512 = "OzIvbHKKDpi60TnF9t7UUVAF1B4mcqc02z5PIvrm08Wyb+yOcz63GRvEuVxNT18a9E1SrNouhB4W2NNLeD7Ykg=="; }; }; "labeled-stream-splicer-2.0.2" = { @@ -33244,15 +32443,6 @@ let sha512 = "j+y6WhTLN4Itnf9j5ZQos1BGPCS8DAwmgMroR3OzfxAsBxam0hMw7J8M3KqZl0pLQJ1jNnwIexg5DYpC/ctwEQ=="; }; }; - "latest-version-1.0.1" = { - name = "latest-version"; - packageName = "latest-version"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz"; - sha512 = "HERbxp4SBlmI380+eM0B0u4nxjfTaPeydIMzl9+9UQ4nSu3xMWKlX9WoT34e4wy7VWe67c53Nv9qPVjS8fHKgg=="; - }; - }; "latest-version-2.0.0" = { name = "latest-version"; packageName = "latest-version"; @@ -33289,13 +32479,13 @@ let sha512 = "7W0vV3rqv5tokqkBAFV1LbR7HPOWzXQDpDgEuib/aJ1jsZZx6x3c2mBI+TJhJzOhkGeaLbCKEHXEXLfirtG2JA=="; }; }; - "launch-editor-2.8.0" = { + "launch-editor-2.9.1" = { name = "launch-editor"; packageName = "launch-editor"; - version = "2.8.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.0.tgz"; - sha512 = "vJranOAJrI/llyWGRQqiDM+adrw+k83fvmmx3+nV47g3+36xM15jE+zyZ6Ffel02+xSvuM0b2GDRosXZkbb6wA=="; + url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.9.1.tgz"; + sha512 = "Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w=="; }; }; "layout-base-1.0.2" = { @@ -33316,15 +32506,6 @@ let sha512 = "Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA=="; }; }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha512 = "RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ=="; - }; - }; "lazy-req-1.1.0" = { name = "lazy-req"; packageName = "lazy-req"; @@ -33406,15 +32587,6 @@ let sha512 = "kf0tHHLrpwKaBAQOhYHXgdeh2PkFuCCxWgLb1MRn67ZQVo787D2pij3mmHVZx193GIdM8xcfi8HF6AIYYnj0fQ=="; }; }; - "leac-0.6.0" = { - name = "leac"; - packageName = "leac"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz"; - sha512 = "y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg=="; - }; - }; "lead-4.0.0" = { name = "lead"; packageName = "lead"; @@ -33424,15 +32596,6 @@ let sha512 = "DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg=="; }; }; - "less-4.2.0" = { - name = "less"; - packageName = "less"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-4.2.0.tgz"; - sha512 = "P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA=="; - }; - }; "level-concat-iterator-3.1.0" = { name = "level-concat-iterator"; packageName = "level-concat-iterator"; @@ -33469,15 +32632,6 @@ let sha512 = "t7bFwFtsQeD8cl8NIoQ2iwxA0CL/9IFw7/9gAjOonH0PWTTiRfY7Hq+Ejbsxh86tXobDQ6IOiddjNYIfOBs06w=="; }; }; - "leven-2.1.0" = { - name = "leven"; - packageName = "leven"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; - sha512 = "nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA=="; - }; - }; "leven-3.1.0" = { name = "leven"; packageName = "leven"; @@ -33559,13 +32713,13 @@ let sha512 = "yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw=="; }; }; - "lightningcss-1.25.1" = { + "lightningcss-1.27.0" = { name = "lightningcss"; packageName = "lightningcss"; - version = "1.25.1"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.25.1.tgz"; - sha512 = "V0RMVZzK1+rCHpymRv4URK2lNhIRyO8g7U7zOFwVAhJuat74HtkjIQpQRKNCwFEYkRGpafOpmXXLoaoBcyVtBg=="; + url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.27.0.tgz"; + sha512 = "8f7aNmS1+etYSLHht0fQApPc2kNO8qGRutifN5rVIc6Xo6ABsEbqOr758UwI7ALVbTt4x1fllKt0PYgzD9S3yQ=="; }; }; "lilconfig-2.1.0" = { @@ -33631,6 +32785,15 @@ let sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; }; + "lines-and-columns-2.0.3" = { + name = "lines-and-columns"; + packageName = "lines-and-columns"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz"; + sha512 = "cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w=="; + }; + }; "lines-and-columns-2.0.4" = { name = "lines-and-columns"; packageName = "lines-and-columns"; @@ -33757,13 +32920,13 @@ let sha512 = "rJysbR9GKIalhTbVL2tYbF2hVyDnrf7pFUZBwjPaMIdadYHmeT+EVi/Bu3qd7ETQPahTotg2WRCatXwRBW554g=="; }; }; - "listr2-8.2.3" = { + "listr2-8.2.4" = { name = "listr2"; packageName = "listr2"; - version = "8.2.3"; + version = "8.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/listr2/-/listr2-8.2.3.tgz"; - sha512 = "Lllokma2mtoniUOS94CcOErHWAug5iu7HOmDrvWgpw8jyQH2fomgB+7lZS4HWZxytUuQwkGOwe49FvwVaA85Xw=="; + url = "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz"; + sha512 = "opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g=="; }; }; "lmdb-2.5.3" = { @@ -34045,24 +33208,6 @@ let sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; - "lodash._arrayeach-3.0.0" = { - name = "lodash._arrayeach"; - packageName = "lodash._arrayeach"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz"; - sha512 = "Mn7HidOVcl3mkQtbPsuKR0Fj0N6Q6DQB77CtYncZcJc0bx5qv2q4Gl6a0LC1AN+GSxpnBDNnK3CKEm9XNA4zqQ=="; - }; - }; - "lodash._baseassign-3.2.0" = { - name = "lodash._baseassign"; - packageName = "lodash._baseassign"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; - sha512 = "t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ=="; - }; - }; "lodash._basecopy-3.0.1" = { name = "lodash._basecopy"; packageName = "lodash._basecopy"; @@ -34072,15 +33217,6 @@ let sha512 = "rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ=="; }; }; - "lodash._baseeach-3.0.4" = { - name = "lodash._baseeach"; - packageName = "lodash._baseeach"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseeach/-/lodash._baseeach-3.0.4.tgz"; - sha512 = "IqUZ9MQo2UT1XPGuBntInqTOlc+oV+bCo0kMp+yuKGsfvRSNgUW0YjWVZUrG/gs+8z/Eyuc0jkJjOBESt9BXxg=="; - }; - }; "lodash._baseiteratee-4.7.0" = { name = "lodash._baseiteratee"; packageName = "lodash._baseiteratee"; @@ -34126,24 +33262,6 @@ let sha512 = "H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg=="; }; }; - "lodash._bindcallback-3.0.1" = { - name = "lodash._bindcallback"; - packageName = "lodash._bindcallback"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"; - sha512 = "2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ=="; - }; - }; - "lodash._createassigner-3.1.1" = { - name = "lodash._createassigner"; - packageName = "lodash._createassigner"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz"; - sha512 = "LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw=="; - }; - }; "lodash._createset-4.0.3" = { name = "lodash._createset"; packageName = "lodash._createset"; @@ -34216,15 +33334,6 @@ let sha512 = "SXL66C731p0xPDC5LZg4wI5H+dJo/EO4KTqOMwLYCH3+FmmfAKJEZCm6ohGpI+T1xwsDsJCfL4OnhorllvlTPQ=="; }; }; - "lodash.assign-3.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz"; - sha512 = "/VVxzgGBmbphasTg51FrztxQJ/VgAUpol6zmJuSVSGcNg4g7FA4z7rQV8Ovr9V3vFBNWZhvKWHfpAytjTVUfFA=="; - }; - }; "lodash.assign-4.2.0" = { name = "lodash.assign"; packageName = "lodash.assign"; @@ -34297,15 +33406,6 @@ let sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; }; }; - "lodash.defaults-3.1.2" = { - name = "lodash.defaults"; - packageName = "lodash.defaults"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz"; - sha512 = "X7135IXFQt5JDFnYxOVAzVz+kFvwDn3N8DJYf+nrz/mMWEuSu7+OL6rWqsk3+VR1T4TejFCSu5isBJOLSID2bg=="; - }; - }; "lodash.defaults-4.2.0" = { name = "lodash.defaults"; packageName = "lodash.defaults"; @@ -34360,15 +33460,6 @@ let sha512 = "C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="; }; }; - "lodash.foreach-3.0.3" = { - name = "lodash.foreach"; - packageName = "lodash.foreach"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-3.0.3.tgz"; - sha512 = "PA7Lp7pe2HMJBoB1vELegEIF3waUFnM0fWDKJVYolwZ4zHh6WTmnq0xmzfQksD66gx2quhDNyBdyaE2T8/DP3Q=="; - }; - }; "lodash.foreach-4.5.0" = { name = "lodash.foreach"; packageName = "lodash.foreach"; @@ -34945,13 +34036,13 @@ let sha512 = "5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw=="; }; }; - "log-update-6.0.0" = { + "log-update-6.1.0" = { name = "log-update"; packageName = "log-update"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-6.0.0.tgz"; - sha512 = "niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw=="; + url = "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz"; + sha512 = "9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w=="; }; }; "log4js-6.9.1" = { @@ -34981,13 +34072,13 @@ let sha512 = "B1Rjay3Ye/JcythUjMt+KLiLIwOjnMJN1M5BRbDgNMsJhmn7yApbx6n1rw7cT3Fi/NA77HDM+y3y1nXvKQVB9Q=="; }; }; - "loglevel-1.9.1" = { + "loglevel-1.9.2" = { name = "loglevel"; packageName = "loglevel"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.9.1.tgz"; - sha512 = "hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.9.2.tgz"; + sha512 = "HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg=="; }; }; "loglevel-plugin-prefix-0.8.4" = { @@ -34999,15 +34090,6 @@ let sha512 = "WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g=="; }; }; - "long-5.2.3" = { - name = "long"; - packageName = "long"; - version = "5.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-5.2.3.tgz"; - sha512 = "lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="; - }; - }; "long-timeout-0.1.1" = { name = "long-timeout"; packageName = "long-timeout"; @@ -35017,15 +34099,6 @@ let sha512 = "BFRuQUqc7x2NWxfJBCyUrN8iYUYznzL9JROmRz1gZ6KlOIgmoD+njPVbb+VNn2nGMKggMsK79iUNErillsrx7w=="; }; }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha512 = "k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg=="; - }; - }; "longest-streak-2.0.4" = { name = "longest-streak"; packageName = "longest-streak"; @@ -35161,15 +34234,6 @@ let sha512 = "5OUtoiVIGU4VXBOshidmtOsvBIvcQR6FD/RzWSvaeHyxCGB+PCUCu+52lqMfdc0h/2CLvHhZS4TwUmMQrrMbBQ=="; }; }; - "lru-cache-10.2.2" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "10.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz"; - sha512 = "9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ=="; - }; - }; "lru-cache-10.4.3" = { name = "lru-cache"; packageName = "lru-cache"; @@ -35179,13 +34243,13 @@ let sha512 = "JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="; }; }; - "lru-cache-11.0.0" = { + "lru-cache-11.0.1" = { name = "lru-cache"; packageName = "lru-cache"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz"; - sha512 = "Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz"; + sha512 = "CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ=="; }; }; "lru-cache-2.2.0" = { @@ -35242,13 +34306,13 @@ let sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; }; }; - "lt_donthave-2.0.1" = { + "lt_donthave-2.0.3" = { name = "lt_donthave"; packageName = "lt_donthave"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/lt_donthave/-/lt_donthave-2.0.1.tgz"; - sha512 = "GhiKG7CGTXzOQq56tIx40Ae26EbrgBq1owuuPqgCTaJDQYO1qW5G+YGaurOLx7s+Aaeta8MputrVFDr0kuiogg=="; + url = "https://registry.npmjs.org/lt_donthave/-/lt_donthave-2.0.3.tgz"; + sha512 = "wC1ATeT+y6CRZ7RFm6LFFuQvAa1rWVeW6KZa7VqTYuqA5yS+69ddSrtKMjPqQ2Vh+kX2jY5wwxaEjgXAuLlXeA=="; }; }; "ltx-3.0.0" = { @@ -35270,22 +34334,22 @@ let sha256 = "f813d671f8f8088d70d29f7a7770bdd5ed41ed97240ae9346d7ced0c094ee049"; }; }; - "luxon-3.4.4" = { + "luxon-3.5.0" = { name = "luxon"; packageName = "luxon"; - version = "3.4.4"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz"; - sha512 = "zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA=="; + url = "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz"; + sha512 = "rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ=="; }; }; - "magic-string-0.30.10" = { + "magic-string-0.30.11" = { name = "magic-string"; packageName = "magic-string"; - version = "0.30.10"; + version = "0.30.11"; src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz"; - sha512 = "iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ=="; + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz"; + sha512 = "+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A=="; }; }; "magicli-0.0.5" = { @@ -35945,13 +35009,13 @@ let sha512 = "xIPmR5ReJDu/DHH1OoIT1HkuybIfRGYRywC+gJtI7qHjCJp/M9jrmBEJW22O8lskDWm562BX2W8TiAwRTb0rKA=="; }; }; - "mdast-util-mdx-expression-2.0.0" = { + "mdast-util-mdx-expression-2.0.1" = { name = "mdast-util-mdx-expression"; packageName = "mdast-util-mdx-expression"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-2.0.0.tgz"; - sha512 = "fGCu8eWdKUKNu5mohVGkhBXCXGnOTLuFqOvGMvdikr+J1w7lDJgxThOKpwRWzzbyXAU2hhSwsmssOY4yTokluw=="; + url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-2.0.1.tgz"; + sha512 = "J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ=="; }; }; "mdast-util-mdx-jsx-2.1.4" = { @@ -35963,13 +35027,13 @@ let sha512 = "DtMn9CmVhVzZx3f+optVDF8yFgQVt7FghCRNdlIaS3X5Bnym3hZwPbg/XW86vdpKjlc1PVj26SpnLGeJBXD3JA=="; }; }; - "mdast-util-mdx-jsx-3.1.2" = { + "mdast-util-mdx-jsx-3.1.3" = { name = "mdast-util-mdx-jsx"; packageName = "mdast-util-mdx-jsx"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-3.1.2.tgz"; - sha512 = "eKMQDeywY2wlHc97k5eD8VC+9ASMjN8ItEZQNGwJ6E0XWKiW/Z0V5/H8pvoXUf+y+Mj0VIgeRRbujBmFn4FTyA=="; + url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-3.1.3.tgz"; + sha512 = "bfOjvNt+1AcbPLTFMFWY149nJz0OjmewJs3LQQ5pIyVGxP4CdOqNVJL6kTaM5c68p8q82Xv3nCyFfUnuEcH3UQ=="; }; }; "mdast-util-mdxjs-esm-1.3.1" = { @@ -36197,13 +35261,13 @@ let sha512 = "EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ=="; }; }; - "memfs-4.9.4" = { + "memfs-4.12.0" = { name = "memfs"; packageName = "memfs"; - version = "4.9.4"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-4.9.4.tgz"; - sha512 = "Xlj8b2rU11nM6+KU6wC7cuWcHQhVINWCUgdPS4Ar9nPxLaOya3RghqK7ALyDW2QtGebYAYs6uEdEVnwPVT942A=="; + url = "https://registry.npmjs.org/memfs/-/memfs-4.12.0.tgz"; + sha512 = "74wDsex5tQDSClVkeK1vtxqYCAgCoXxx+K4NSHzgU/muYVYByFqa+0RnrPO9NM6naWm1+G9JmZ0p6QHhXmeYfA=="; }; }; "memory-cache-0.2.0" = { @@ -36323,6 +35387,15 @@ let sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; }; }; + "merge-descriptors-1.0.3" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz"; + sha512 = "gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="; + }; + }; "merge-options-3.0.4" = { name = "merge-options"; packageName = "merge-options"; @@ -36980,13 +36053,13 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "micromatch-4.0.7" = { + "micromatch-4.0.8" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz"; - sha512 = "LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q=="; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz"; + sha512 = "PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="; }; }; "middleware-handler-0.2.0" = { @@ -37061,22 +36134,13 @@ let sha512 = "jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="; }; }; - "mime-4.0.0-beta.1" = { + "mime-4.0.4" = { name = "mime"; packageName = "mime"; - version = "4.0.0-beta.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-4.0.0-beta.1.tgz"; - sha512 = "8/p99P1RV17prytee/A6D+8shNqdDzyvGJ/CVfiuXwh4cTsv3P3qGyaYSx2hdqnqbKKqYUfTC5zAjCtcd1BShw=="; - }; - }; - "mime-4.0.1" = { - name = "mime"; - packageName = "mime"; - version = "4.0.1"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-4.0.1.tgz"; - sha512 = "5lZ5tyrIfliMXzFtkYyekWbtRXObT9OWa8IwQ5uxTBDHucNNwniRqo0yInflj+iYi5CBa6qxadGzGarDfuEOxA=="; + url = "https://registry.npmjs.org/mime/-/mime-4.0.4.tgz"; + sha512 = "v8yqInVjhXyqP6+Kw4fV3ZzeMRqEW6FotRsKXjRS5VMTNIuXsdRoAvklpoRgSqXm6o9VNH4/C0mgedko9DdLsQ=="; }; }; "mime-db-1.33.0" = { @@ -37286,13 +36350,13 @@ let sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; }; }; - "mini-css-extract-plugin-2.9.0" = { + "mini-css-extract-plugin-2.9.1" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz"; - sha512 = "Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA=="; + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.1.tgz"; + sha512 = "+Vyi+GCCOHnrJ2VPS+6aPoXN2k2jgUzDRhTFLjjTBn23qyXJXkjUWQgTL+mXpF5/A8ixLdCc6kWsoeOjKGejKQ=="; }; }; "mini-svg-data-uri-1.4.4" = { @@ -37754,15 +36818,6 @@ let sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA=="; }; }; - "module-details-from-path-1.0.3" = { - name = "module-details-from-path"; - packageName = "module-details-from-path"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz"; - sha512 = "ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A=="; - }; - }; "module-error-1.0.2" = { name = "module-error"; packageName = "module-error"; @@ -37844,13 +36899,13 @@ let sha512 = "4aE3U7CCBWgrQlQDMq8da4woBWDGHioJFiOZ8Ie6Yq2uwYQ9V2kGhTz4x3u6Wc+OU17nw0yc3rJ/lQ4jIiPe3A=="; }; }; - "mqtt-4.3.8" = { + "mqtt-5.10.1" = { name = "mqtt"; packageName = "mqtt"; - version = "4.3.8"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.8.tgz"; - sha512 = "2xT75uYa0kiPEF/PE0VPdavmEkoBzMT/UL9moid0rAvlCtV48qBwxD62m7Ld/4j8tSkIO1E/iqRl/S72SEOhOw=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-5.10.1.tgz"; + sha512 = "hXCOki8sANoQ7w+2OzJzg6qMBxTtrH9RlnVNV8panLZgnl+Gh0J/t4k6r8Az8+C7y3KAcyXtn0mmLixyUom8Sw=="; }; }; "mqtt-5.7.0" = { @@ -37862,15 +36917,6 @@ let sha512 = "/o0CBYSjZzddmQDV2iglCafsA0xWKpqnS62tGbOLOliubBxszpXO1DAQPyfI7ZcPDG0b9ni7QITn+5FW1E2UTg=="; }; }; - "mqtt-packet-6.10.0" = { - name = "mqtt-packet"; - packageName = "mqtt-packet"; - version = "6.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.10.0.tgz"; - sha512 = "ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA=="; - }; - }; "mqtt-packet-9.0.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; @@ -37961,15 +37007,6 @@ let sha512 = "I8qXuuALqJe5laEBYoFykChhSXLikZmUhccjGsPuSJ/7uPip2TJ7lwdIQwWSAi0jGZDXv4WOP8Qg65QZRuXxXw=="; }; }; - "muggle-string-0.4.1" = { - name = "muggle-string"; - packageName = "muggle-string"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz"; - sha512 = "VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ=="; - }; - }; "multer-1.4.5-lts.1" = { name = "multer"; packageName = "multer"; @@ -38340,15 +37377,6 @@ let sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; - "nested-error-stacks-1.0.2" = { - name = "nested-error-stacks"; - packageName = "nested-error-stacks"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz"; - sha512 = "o32anp9JA7oezPOFSfG2BBXSdHepOm5FpJvwxHWDtfJ3Bg3xdi68S6ijPlEOfUg6quxZWyvJM+8fHk1yMDKspA=="; - }; - }; "nested-error-stacks-2.0.1" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; @@ -38511,13 +37539,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.65.0" = { + "node-abi-3.68.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.65.0"; + version = "3.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.65.0.tgz"; - sha512 = "ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.68.0.tgz"; + sha512 = "7vbj10trelExNjFSBm5kTvZXXa7pZyKWx9RCKIyqe6I9Ev3IzGpQoqBP3a+cOdxY+pWj6VkP28n/2wWysBHD/A=="; }; }; "node-abort-controller-3.1.1" = { @@ -38799,13 +37827,13 @@ let sha512 = "OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ=="; }; }; - "node-gyp-build-4.8.1" = { + "node-gyp-build-4.8.2" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz"; - sha512 = "OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz"; + sha512 = "IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw=="; }; }; "node-gyp-build-optional-packages-5.0.3" = { @@ -38898,13 +37926,13 @@ let sha512 = "SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA=="; }; }; - "node-red-admin-4.0.0" = { + "node-red-admin-4.0.1" = { name = "node-red-admin"; packageName = "node-red-admin"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-4.0.0.tgz"; - sha512 = "OP2IE/5r+TCeZBj5x+8MfslEjsxqGc1Er5rI5IMG3D/A3++3r0EkW+tlc0pKnX8lmKs1batgAtMIQbh4XkMY3w=="; + url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-4.0.1.tgz"; + sha512 = "NLZgAM8JgFa/2/7Z4+nSSQrtkuBbfS9m+kxegadhHfuta5rErOx6zrrNhF+yAglMTPlVmdoqgso7VSt3nTRBGQ=="; }; }; "node-releases-2.0.18" = { @@ -39348,15 +38376,6 @@ let sha512 = "shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA=="; }; }; - "npm-pick-manifest-9.0.1" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "9.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.1.tgz"; - sha512 = "Udm1f0l2nXb3wxDpKjfohwgdFUSV50UVwzEIpDXVsbDMXVIEF81a/i0UhuQbhrPMMmdiq3+YMFLFIRVLs3hxQw=="; - }; - }; "npm-pick-manifest-9.1.0" = { name = "npm-pick-manifest"; packageName = "npm-pick-manifest"; @@ -39420,6 +38439,15 @@ let sha512 = "ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ=="; }; }; + "npm-run-path-6.0.0" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz"; + sha512 = "9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA=="; + }; + }; "npmconf-2.1.3" = { name = "npmconf"; packageName = "npmconf"; @@ -39555,13 +38583,13 @@ let sha512 = "qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w=="; }; }; - "nx-19.5.3" = { + "nx-19.7.4" = { name = "nx"; packageName = "nx"; - version = "19.5.3"; + version = "19.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-19.5.3.tgz"; - sha512 = "ZUrnRwPdRWXeo8IuLj16Oo9IfiDjd8C6xKWC4F6wcTNZ9ZS7ZErrfqaQr04zdO89ASF9brbkqm0UkMyDPc6kPQ=="; + url = "https://registry.npmjs.org/nx/-/nx-19.7.4.tgz"; + sha512 = "xvOUQp+jZHtXr7MYF8RdtY2fAz7vzPK58l3o73Wo4LpfFFULIPVF+f33TT1jyAQCez/tsDc9fBOSycr86df+5w=="; }; }; "oas-kit-common-1.0.8" = { @@ -39960,13 +38988,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.101.0" = { + "oo-ascii-tree-1.103.1" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.101.0"; + version = "1.103.1"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.101.0.tgz"; - sha512 = "hNE9Nfvo4HLa9/dAiaiXUm64KHUvgBa7jPftsb8gZdTv1G1wSMMnd9j7SMcRzaMbDEqi+0cfgeBSIcsKy+k0vA=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.103.1.tgz"; + sha512 = "X0nmbb8xUUi637JXzCxY/K4AtO/I0fB5b7iiGaHJHu8IXBWV8TnQ4xqa0Igb/NoAg3OP2uXNhSeiTsErETOA/g=="; }; }; "open-0.0.2" = { @@ -40212,13 +39240,13 @@ let sha512 = "0TUxTiFJWv+JnjWm4o9yvuskpEJLXTcng8MJuKd+SzAzp2o+OP3HWqNhB4OdJRt1Vsd9/mR0oyaEYlOnL7XIRw=="; }; }; - "ora-8.0.1" = { + "ora-8.1.0" = { name = "ora"; packageName = "ora"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-8.0.1.tgz"; - sha512 = "ANIvzobt1rls2BDny5fWZ3ZVKyD6nscLvfFRpQgfWsythlcsVUC9kL0zq6j2Z5z9wwp1kd7wpsD/T9qNPVLCaQ=="; + url = "https://registry.npmjs.org/ora/-/ora-8.1.0.tgz"; + sha512 = "GQEkNkH/GHOhPFXcqZs3IDahXEQcQxsSjEkK4KvEEST4t7eNzoMjxTzef+EZ+JluDEV+Raoi3WQ2CflnRdSVnQ=="; }; }; "ordered-binary-1.5.1" = { @@ -40302,13 +39330,13 @@ let sha512 = "RMtGSVNM4NWSF9uVWCUqaYiA7ID8Vqm/rSk2W37eYVrDLOI/3do2IRY7rQYkvJqb6sS6LAnALODBkD50tIM1kw=="; }; }; - "oxc-resolver-1.10.2" = { + "oxc-resolver-1.11.0" = { name = "oxc-resolver"; packageName = "oxc-resolver"; - version = "1.10.2"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-1.10.2.tgz"; - sha512 = "NIbwVqoU8Bhl7PVtItHCg+VFFokIDwBgIgFUwFG2Y8ePhxftFh5xG+KLar5PLWXlCP4WunPIuXD3jr3v6/MfRw=="; + url = "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-1.11.0.tgz"; + sha512 = "N3qMse2AM7uST8PaiUMXZkcACyGAMN073tomyvzHTICSzaOqKHvVS0IZ3vj/OqoE140QP4CyOiWmgC1Hw5Urmg=="; }; }; "p-any-2.1.0" = { @@ -40734,15 +39762,6 @@ let sha512 = "5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg=="; }; }; - "package-json-1.2.0" = { - name = "package-json"; - packageName = "package-json"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz"; - sha512 = "knDtirWWqKVJrLY3gEBLflVvueTMpyjbAwX/9j/EKi2DsjNemp5voS8cyKyGh57SNaMJNhNRZbIaWdneOcLU1g=="; - }; - }; "package-json-10.0.1" = { name = "package-json"; packageName = "package-json"; @@ -41238,6 +40257,15 @@ let sha512 = "B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g=="; }; }; + "parse5-parser-stream-7.1.2" = { + name = "parse5-parser-stream"; + packageName = "parse5-parser-stream"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz"; + sha512 = "JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow=="; + }; + }; "parsejson-0.0.1" = { name = "parsejson"; packageName = "parsejson"; @@ -41247,15 +40275,6 @@ let sha512 = "W9CRvTfYQY/kbRc5Q6YTWarb/QDxdEGbd6RCP8CLUQDJV89RVHoS2A0dZYNtAcq31fulGNN4ZhAhiQQazwlKJg=="; }; }; - "parseley-0.12.1" = { - name = "parseley"; - packageName = "parseley"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parseley/-/parseley-0.12.1.tgz"; - sha512 = "e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw=="; - }; - }; "parseqs-0.0.2" = { name = "parseqs"; packageName = "parseqs"; @@ -41598,6 +40617,15 @@ let sha512 = "ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg=="; }; }; + "path-to-regexp-0.1.10" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz"; + sha512 = "7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="; + }; + }; "path-to-regexp-0.1.7" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -41607,13 +40635,13 @@ let sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; }; }; - "path-to-regexp-1.8.0" = { + "path-to-regexp-1.9.0" = { name = "path-to-regexp"; packageName = "path-to-regexp"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz"; - sha512 = "n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA=="; + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz"; + sha512 = "xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g=="; }; }; "path-to-regexp-2.2.1" = { @@ -41724,15 +40752,6 @@ let sha512 = "nh39Mo1eGWmZS7y+mK/dQIqg7S1lp38DpRxkyoHf0ZcUs/HDc+yyTjuOtTvSMZHmfSLuSQaX945u05Y2Q6UWZg=="; }; }; - "peberminta-0.9.0" = { - name = "peberminta"; - packageName = "peberminta"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/peberminta/-/peberminta-0.9.0.tgz"; - sha512 = "XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ=="; - }; - }; "peek-readable-4.1.0" = { name = "peek-readable"; packageName = "peek-readable"; @@ -41823,13 +40842,13 @@ let sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; }; }; - "picocolors-1.0.1" = { + "picocolors-1.1.0" = { name = "picocolors"; packageName = "picocolors"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz"; - sha512 = "anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="; + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz"; + sha512 = "TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="; }; }; "picomatch-2.3.1" = { @@ -42219,22 +41238,22 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.40" = { + "postcss-8.4.47" = { name = "postcss"; packageName = "postcss"; - version = "8.4.40"; + version = "8.4.47"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz"; - sha512 = "YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz"; + sha512 = "56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ=="; }; }; - "postcss-calc-10.0.0" = { + "postcss-calc-10.0.2" = { name = "postcss-calc"; packageName = "postcss-calc"; - version = "10.0.0"; + version = "10.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-10.0.0.tgz"; - sha512 = "OmjhudoNTP0QleZCwl1i6NeBwN+5MZbY5ersLZz69mjJiDVv/p57RjRuKDkHeDWr4T+S97wQfsqRTNoDHB2e3g=="; + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-10.0.2.tgz"; + sha512 = "DT/Wwm6fCKgpYVI7ZEWuPJ4az8hiEHtCUeYjZXqU7Ou4QqYh1Df2yCQ7Ca6N7xqKPFkxN3fhf+u9KSoOCJNAjg=="; }; }; "postcss-calc-8.2.4" = { @@ -42255,13 +41274,13 @@ let sha512 = "UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ=="; }; }; - "postcss-colormin-7.0.1" = { + "postcss-colormin-7.0.2" = { name = "postcss-colormin"; packageName = "postcss-colormin"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-7.0.1.tgz"; - sha512 = "uszdT0dULt3FQs47G5UHCduYK+FnkLYlpu1HpWu061eGsKZ7setoG7kA+WC9NQLsOJf69D5TxGHgnAdRgylnFQ=="; + url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-7.0.2.tgz"; + sha512 = "YntRXNngcvEvDbEjTdRWGU606eZvB5prmHG4BF0yLmVpamXbpsRJzevyy6MZVyuecgzI2AWAlvFi8DAeCqwpvA=="; }; }; "postcss-convert-values-5.1.3" = { @@ -42273,13 +41292,13 @@ let sha512 = "82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA=="; }; }; - "postcss-convert-values-7.0.2" = { + "postcss-convert-values-7.0.4" = { name = "postcss-convert-values"; packageName = "postcss-convert-values"; - version = "7.0.2"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.2.tgz"; - sha512 = "MuZIF6HJ4izko07Q0TgW6pClalI4al6wHRNPkFzqQdwAwG7hPn0lA58VZdxyb2Vl5AYjJ1piO+jgF9EnTjQwQQ=="; + url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.4.tgz"; + sha512 = "e2LSXPqEHVW6aoGbjV9RsSSNDO3A0rZLCBxN24zvxF25WknMPpX8Dm9UxxThyEbaytzggRuZxaGXqaOhxQ514Q=="; }; }; "postcss-discard-comments-5.1.2" = { @@ -42291,13 +41310,13 @@ let sha512 = "+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ=="; }; }; - "postcss-discard-comments-7.0.1" = { + "postcss-discard-comments-7.0.3" = { name = "postcss-discard-comments"; packageName = "postcss-discard-comments"; - version = "7.0.1"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-7.0.1.tgz"; - sha512 = "GVrQxUOhmle1W6jX2SvNLt4kmN+JYhV7mzI6BMnkAWR9DtVvg8e67rrV0NfdWhn7x1zxvzdWkMBPdBDCls+uwQ=="; + url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-7.0.3.tgz"; + sha512 = "q6fjd4WU4afNhWOA2WltHgCbkRhZPgQe7cXF74fuVB/ge4QbM9HEaOIzGSiMvM+g/cOsNAUGdf2JDzqA2F8iLA=="; }; }; "postcss-discard-duplicates-5.1.0" = { @@ -42309,13 +41328,13 @@ let sha512 = "zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="; }; }; - "postcss-discard-duplicates-7.0.0" = { + "postcss-discard-duplicates-7.0.1" = { name = "postcss-discard-duplicates"; packageName = "postcss-discard-duplicates"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-7.0.0.tgz"; - sha512 = "bAnSuBop5LpAIUmmOSsuvtKAAKREB6BBIYStWUTGq8oG5q9fClDMMuY8i4UPI/cEcDx2TN+7PMnXYIId20UVDw=="; + url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-7.0.1.tgz"; + sha512 = "oZA+v8Jkpu1ct/xbbrntHRsfLGuzoP+cpt0nJe5ED2FQF8n8bJtn7Bo28jSmBYwqgqnqkuSXJfSUEE7if4nClQ=="; }; }; "postcss-discard-empty-5.1.1" = { @@ -42426,13 +41445,13 @@ let sha512 = "YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ=="; }; }; - "postcss-merge-longhand-7.0.2" = { + "postcss-merge-longhand-7.0.4" = { name = "postcss-merge-longhand"; packageName = "postcss-merge-longhand"; - version = "7.0.2"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.2.tgz"; - sha512 = "06vrW6ZWi9qeP7KMS9fsa9QW56+tIMW55KYqF7X3Ccn+NI2pIgPV6gFfvXTMQ05H90Y5DvnCDPZ2IuHa30PMUg=="; + url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.4.tgz"; + sha512 = "zer1KoZA54Q8RVHKOY5vMke0cCdNxMP3KBfDerjH/BYHh4nCIh+1Yy0t1pAEQF18ac/4z3OFclO+ZVH8azjR4A=="; }; }; "postcss-merge-rules-5.1.4" = { @@ -42444,13 +41463,13 @@ let sha512 = "0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g=="; }; }; - "postcss-merge-rules-7.0.2" = { + "postcss-merge-rules-7.0.4" = { name = "postcss-merge-rules"; packageName = "postcss-merge-rules"; - version = "7.0.2"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.2.tgz"; - sha512 = "VAR47UNvRsdrTHLe7TV1CeEtF9SJYR5ukIB9U4GZyZOptgtsS20xSxy+k5wMrI3udST6O1XuIn7cjQkg7sDAAw=="; + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.4.tgz"; + sha512 = "ZsaamiMVu7uBYsIdGtKJ64PkcQt6Pcpep/uO90EpLS3dxJi6OXamIobTYcImyXGoW0Wpugh7DSD3XzxZS9JCPg=="; }; }; "postcss-minify-font-values-5.1.0" = { @@ -42498,13 +41517,13 @@ let sha512 = "+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw=="; }; }; - "postcss-minify-params-7.0.1" = { + "postcss-minify-params-7.0.2" = { name = "postcss-minify-params"; packageName = "postcss-minify-params"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-7.0.1.tgz"; - sha512 = "e+Xt8xErSRPgSRFxHeBCSxMiO8B8xng7lh8E0A5ep1VfwYhY8FXhu4Q3APMjgx9YDDbSp53IBGENrzygbUvgUQ=="; + url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-7.0.2.tgz"; + sha512 = "nyqVLu4MFl9df32zTsdcLqCFfE/z2+f8GE1KHPxWOAmegSo6lpV2GNy5XQvrzwbLmiU7d+fYay4cwto1oNdAaQ=="; }; }; "postcss-minify-selectors-5.2.1" = { @@ -42516,13 +41535,13 @@ let sha512 = "nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg=="; }; }; - "postcss-minify-selectors-7.0.2" = { + "postcss-minify-selectors-7.0.4" = { name = "postcss-minify-selectors"; packageName = "postcss-minify-selectors"; - version = "7.0.2"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.2.tgz"; - sha512 = "dCzm04wqW1uqLmDZ41XYNBJfjgps3ZugDpogAmJXoCb5oCiTzIX4oPXXKxDpTvWOnKxQKR4EbV4ZawJBLcdXXA=="; + url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.4.tgz"; + sha512 = "JG55VADcNb4xFCf75hXkzc1rNeURhlo7ugf6JjiiKRfMsKlDzN9CXHZDyiG6x/zGchpjQS+UAgb1d4nqXqOpmA=="; }; }; "postcss-modules-extract-imports-3.1.0" = { @@ -42687,13 +41706,13 @@ let sha512 = "qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA=="; }; }; - "postcss-normalize-unicode-7.0.1" = { + "postcss-normalize-unicode-7.0.2" = { name = "postcss-normalize-unicode"; packageName = "postcss-normalize-unicode"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.1.tgz"; - sha512 = "PTPGdY9xAkTw+8ZZ71DUePb7M/Vtgkbbq+EoI33EuyQEzbKemEQMhe5QSr0VP5UfZlreANDPxSfcdSprENcbsg=="; + url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.2.tgz"; + sha512 = "ztisabK5C/+ZWBdYC+Y9JCkp3M9qBv/XFvDtSw0d/XwfT3UaKeW/YTm/MD/QrPNxuecia46vkfEhewjwcYFjkg=="; }; }; "postcss-normalize-url-5.1.0" = { @@ -42759,13 +41778,13 @@ let sha512 = "dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg=="; }; }; - "postcss-reduce-initial-7.0.1" = { + "postcss-reduce-initial-7.0.2" = { name = "postcss-reduce-initial"; packageName = "postcss-reduce-initial"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-7.0.1.tgz"; - sha512 = "0JDUSV4bGB5FGM5g8MkS+rvqKukJZ7OTHw/lcKn7xPNqeaqJyQbUO8/dJpvyTpaVwPsd3Uc33+CfNzdVowp2WA=="; + url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-7.0.2.tgz"; + sha512 = "pOnu9zqQww7dEKf62Nuju6JgsW2V0KRNBHxeKohU+JkHd/GAH5uvoObqFLqkeB2n20mr6yrlWDvo5UBU5GnkfA=="; }; }; "postcss-reduce-transforms-5.1.0" = { @@ -42795,13 +41814,13 @@ let sha512 = "/eoEylGWyy6/DOiMP5lmFRdmDKThqgn7D6hP2dXKJI/0rJSO1ADFNngZfDzxL0YAxFvws+Rtpuji1YIHj4mySA=="; }; }; - "postcss-resolve-nested-selector-0.1.4" = { + "postcss-resolve-nested-selector-0.1.6" = { name = "postcss-resolve-nested-selector"; packageName = "postcss-resolve-nested-selector"; - version = "0.1.4"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.4.tgz"; - sha512 = "R6vHqZWgVnTAPq0C+xjyHfEZqfIYboCBVSy24MjxEDm+tIh1BU4O6o7DP7AA7kHzf136d+Qc5duI4tlpHjixDw=="; + url = "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz"; + sha512 = "0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw=="; }; }; "postcss-safe-parser-4.0.2" = { @@ -42849,13 +41868,13 @@ let sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; }; }; - "postcss-selector-parser-6.1.1" = { + "postcss-selector-parser-6.1.2" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.1.1"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz"; - sha512 = "b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz"; + sha512 = "Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg=="; }; }; "postcss-svgo-5.1.0" = { @@ -42894,13 +41913,13 @@ let sha512 = "5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="; }; }; - "postcss-unique-selectors-7.0.1" = { + "postcss-unique-selectors-7.0.3" = { name = "postcss-unique-selectors"; packageName = "postcss-unique-selectors"; - version = "7.0.1"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-7.0.1.tgz"; - sha512 = "MH7QE/eKUftTB5ta40xcHLl7hkZjgDFydpfTK+QWXeHxghVt3VoPqYL5/G+zYZPPIs+8GuqFXSTgxBSoB1RZtQ=="; + url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-7.0.3.tgz"; + sha512 = "J+58u5Ic5T1QjP/LDV9g3Cx4CNOgB5vz+kM6+OxHHhFACdcDeKhBXjQmB7fnIZM12YSTvsL0Opwco83DmacW2g=="; }; }; "postcss-value-parser-4.2.0" = { @@ -43083,15 +42102,6 @@ let sha512 = "dLbWOa4xBn+qeWeIF60qRoB6Pk2jX5P3DIVgOQyMyvBpu931Q+8dXz8X0snJiFkQdohDDLnZQECjzsAj75hgZQ=="; }; }; - "prettier-plugin-astro-0.14.1" = { - name = "prettier-plugin-astro"; - packageName = "prettier-plugin-astro"; - version = "0.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.14.1.tgz"; - sha512 = "RiBETaaP9veVstE4vUwSIcdATj6dKmXljouXc/DDNwBSPTp8FRkLGDSGFClKsAFeeg+13SB0Z1JZvbD76bigJw=="; - }; - }; "pretty-bytes-5.6.0" = { name = "pretty-bytes"; packageName = "pretty-bytes"; @@ -43344,13 +42354,13 @@ let sha512 = "vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw=="; }; }; - "promise-call-limit-3.0.1" = { + "promise-call-limit-3.0.2" = { name = "promise-call-limit"; packageName = "promise-call-limit"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-3.0.1.tgz"; - sha512 = "utl+0x8gIDasV5X+PI5qWEPqH6fJS0pFtQ/4gZ95xfEFb/89dmh+/b895TbFDBLiafBvxD/PGTKfvxl4kH/pQg=="; + url = "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-3.0.2.tgz"; + sha512 = "mRPQO2T1QQVw11E7+UdCJu7S61eJVWknzml9sC1heAdj1jxl0fWMBypIt9ZOcLFf8FkG995ZD7RnVk7HH72fZw=="; }; }; "promise-inflight-1.0.1" = { @@ -43479,15 +42489,6 @@ let sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; }; }; - "protobufjs-7.3.2" = { - name = "protobufjs"; - packageName = "protobufjs"; - version = "7.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz"; - sha512 = "RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg=="; - }; - }; "protocols-2.0.1" = { name = "protocols"; packageName = "protocols"; @@ -43587,33 +42588,6 @@ let sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; }; }; - "pug-3.0.3" = { - name = "pug"; - packageName = "pug"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pug/-/pug-3.0.3.tgz"; - sha512 = "uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g=="; - }; - }; - "pug-attrs-3.0.0" = { - name = "pug-attrs"; - packageName = "pug-attrs"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz"; - sha512 = "azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA=="; - }; - }; - "pug-code-gen-3.0.3" = { - name = "pug-code-gen"; - packageName = "pug-code-gen"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.3.tgz"; - sha512 = "cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw=="; - }; - }; "pug-error-2.1.0" = { name = "pug-error"; packageName = "pug-error"; @@ -43623,15 +42597,6 @@ let sha512 = "lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg=="; }; }; - "pug-filters-4.0.0" = { - name = "pug-filters"; - packageName = "pug-filters"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz"; - sha512 = "yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A=="; - }; - }; "pug-lexer-5.0.1" = { name = "pug-lexer"; packageName = "pug-lexer"; @@ -43641,60 +42606,6 @@ let sha512 = "0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w=="; }; }; - "pug-linker-4.0.0" = { - name = "pug-linker"; - packageName = "pug-linker"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz"; - sha512 = "gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw=="; - }; - }; - "pug-load-3.0.0" = { - name = "pug-load"; - packageName = "pug-load"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz"; - sha512 = "OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ=="; - }; - }; - "pug-parser-6.0.0" = { - name = "pug-parser"; - packageName = "pug-parser"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz"; - sha512 = "ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw=="; - }; - }; - "pug-runtime-3.0.1" = { - name = "pug-runtime"; - packageName = "pug-runtime"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz"; - sha512 = "L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg=="; - }; - }; - "pug-strip-comments-2.0.0" = { - name = "pug-strip-comments"; - packageName = "pug-strip-comments"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz"; - sha512 = "zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ=="; - }; - }; - "pug-walk-2.0.0" = { - name = "pug-walk"; - packageName = "pug-walk"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz"; - sha512 = "yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ=="; - }; - }; "pump-1.0.3" = { name = "pump"; packageName = "pump"; @@ -43713,13 +42624,13 @@ let sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; }; }; - "pump-3.0.0" = { + "pump-3.0.2" = { name = "pump"; packageName = "pump"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + url = "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz"; + sha512 = "tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw=="; }; }; "pump-chain-1.0.0" = { @@ -43785,22 +42696,22 @@ let sha512 = "FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug=="; }; }; - "puppeteer-22.14.0" = { + "puppeteer-22.15.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "22.14.0"; + version = "22.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-22.14.0.tgz"; - sha512 = "MGTR6/pM8zmWbTdazb6FKnwIihzsSEXBPH49mFFU96DNZpQOevCAZMnjBZGlZRGRzRK6aADCavR6SQtrbv5dQw=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-22.15.0.tgz"; + sha512 = "XjCY1SiSEi1T7iSYuxS82ft85kwDJUS7wj1Z0eGVXKdtr5g4xnVcbjwxhq5xBnpK/E7x1VZZoJDxpjAOasHT4Q=="; }; }; - "puppeteer-core-22.14.0" = { + "puppeteer-core-22.15.0" = { name = "puppeteer-core"; packageName = "puppeteer-core"; - version = "22.14.0"; + version = "22.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.14.0.tgz"; - sha512 = "rl4tOY5LcA3e374GAlsGGHc05HL3eGNf5rZ+uxkl6id9zVZKcwcp1Z+Nd6byb6WPiPeecT/dwz8f/iUm+AZQSw=="; + url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.15.0.tgz"; + sha512 = "cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA=="; }; }; "purgecss-6.0.0" = { @@ -43830,15 +42741,6 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.373" = { - name = "pyright"; - packageName = "pyright"; - version = "1.1.373"; - src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.373.tgz"; - sha512 = "ZJSjqnHbeZowUnuAiojZqCLeY1XVzRIc2GvMFFNy/z6YSyJXwChPDQL5Jl2bavTvXNO0ITRmMBVvoKCRN7cc3g=="; - }; - }; "q-1.5.1" = { name = "q"; packageName = "q"; @@ -43884,15 +42786,6 @@ let sha512 = "nR5uYqNsm8CgBhfCpsYKz6iDhvKjf0xdFT4KanNlLP40COGwZEsjbLoDyL9VrTXyiICUGUbsiN3gBpLGZhSZWQ=="; }; }; - "qs-6.10.4" = { - name = "qs"; - packageName = "qs"; - version = "6.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz"; - sha512 = "OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g=="; - }; - }; "qs-6.11.0" = { name = "qs"; packageName = "qs"; @@ -43902,13 +42795,13 @@ let sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; }; }; - "qs-6.12.3" = { + "qs-6.13.0" = { name = "qs"; packageName = "qs"; - version = "6.12.3"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.12.3.tgz"; - sha512 = "AWJm14H1vVaO/iNZ4/hO+HyaTehuy9nRqVdkTqlJt0HWvBiBIEXFmb4C0DGeYo3Xes9rrEW+TxHsaigCbN5ICQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz"; + sha512 = "+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg=="; }; }; "qs-6.5.2" = { @@ -44820,6 +43713,15 @@ let sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; + "readdirp-4.0.1" = { + name = "readdirp"; + packageName = "readdirp"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz"; + sha512 = "GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw=="; + }; + }; "readline-1.3.0" = { name = "readline"; packageName = "readline"; @@ -44982,13 +43884,13 @@ let sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; - "regenerate-unicode-properties-10.1.1" = { + "regenerate-unicode-properties-10.2.0" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "10.1.1"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz"; - sha512 = "X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz"; + sha512 = "DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA=="; }; }; "regenerator-runtime-0.13.11" = { @@ -45792,15 +44694,6 @@ let sha512 = "PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="; }; }; - "repeating-1.1.3" = { - name = "repeating"; - packageName = "repeating"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; - sha512 = "Nh30JLeMHdoI+AsQ5eblhZ7YlTsM9wiJQe/AHIunlK3KWzvXhXb36IJ7K1IOeRjIOtzMjdUHjwXUFxKJoPTSOg=="; - }; - }; "repeating-2.0.1" = { name = "repeating"; packageName = "repeating"; @@ -45864,22 +44757,22 @@ let sha512 = "OWtna9w7yRI/gcfu3VaURgIwE1FHgbz5+fHGQ9GJTHcJ4+uvHnDjXd+N7mVDOv5+1fp1CRPzUSY2wcM345Z2Fw=="; }; }; - "request-3.0.1" = { + "request-3.0.5" = { name = "request"; packageName = "request"; - version = "3.0.1"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz"; - sha512 = "TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ=="; + url = "https://registry.npmjs.org/@cypress/request/-/request-3.0.5.tgz"; + sha512 = "v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA=="; }; }; - "request-compose-2.1.6" = { + "request-compose-2.1.7" = { name = "request-compose"; packageName = "request-compose"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/request-compose/-/request-compose-2.1.6.tgz"; - sha512 = "S07L+2VbJB32WddD/o/PnYGKym63zLVbymygVWXvt8L79VAngcjAxhHaGuFOICLxEV90EasEPzqPKKHPspXP8w=="; + url = "https://registry.npmjs.org/request-compose/-/request-compose-2.1.7.tgz"; + sha512 = "27amNkWTK4Qq25XEwdmrhb4VLMiQzRSKuDfsy1o1griykcyXk5MxMHmJG+OKTRdO9PgsO7Kkn7GrEkq0UAIIMQ=="; }; }; "request-light-0.4.0" = { @@ -45891,15 +44784,6 @@ let sha512 = "fimzjIVw506FBZLspTAXHdpvgvQebyjpNyLRd0e6drPPRq7gcrROeGWRyF81wLqFg5ijPgnOQbmfck5wdTqpSA=="; }; }; - "request-light-0.7.0" = { - name = "request-light"; - packageName = "request-light"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz"; - sha512 = "lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q=="; - }; - }; "request-oauth-1.0.1" = { name = "request-oauth"; packageName = "request-oauth"; @@ -45963,15 +44847,6 @@ let sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; }; - "require-in-the-middle-7.3.0" = { - name = "require-in-the-middle"; - packageName = "require-in-the-middle"; - version = "7.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.3.0.tgz"; - sha512 = "nQFEv9gRw6SJAwWD2LrL0NmQvAcO7FBwJbwmr2ttPAacfy0xuiOjE5zt+zM4xDyuyvUaxBi/9gb2SoCyNEVJcw=="; - }; - }; "require-main-filename-1.0.1" = { name = "require-main-filename"; packageName = "require-main-filename"; @@ -46278,6 +45153,15 @@ let sha512 = "I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg=="; }; }; + "restore-cursor-5.1.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz"; + sha512 = "oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA=="; + }; + }; "ret-0.1.15" = { name = "ret"; packageName = "ret"; @@ -46395,15 +45279,6 @@ let sha512 = "q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA=="; }; }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha512 = "yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg=="; - }; - }; "rimraf-2.2.8" = { name = "rimraf"; packageName = "rimraf"; @@ -46458,13 +45333,13 @@ let sha512 = "Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og=="; }; }; - "rimraf-5.0.9" = { + "rimraf-5.0.10" = { name = "rimraf"; packageName = "rimraf"; - version = "5.0.9"; + version = "5.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.9.tgz"; - sha512 = "3i7b8OcswU6CpU8Ej89quJD4O98id7TtVM5U4Mybh84zQXdrFmDLouWBEEaD/QfO3gDDfH+AGFCGsR7kngzQnA=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz"; + sha512 = "l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ=="; }; }; "ripemd160-2.0.2" = { @@ -46674,15 +45549,6 @@ let sha512 = "AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg=="; }; }; - "s.color-0.0.15" = { - name = "s.color"; - packageName = "s.color"; - version = "0.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/s.color/-/s.color-0.0.15.tgz"; - sha512 = "AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA=="; - }; - }; "s3-stream-upload-2.0.2" = { name = "s3-stream-upload"; packageName = "s3-stream-upload"; @@ -46800,13 +45666,13 @@ let sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; }; }; - "safe-stable-stringify-2.4.3" = { + "safe-stable-stringify-2.5.0" = { name = "safe-stable-stringify"; packageName = "safe-stable-stringify"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz"; - sha512 = "e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g=="; + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz"; + sha512 = "b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA=="; }; }; "safer-buffer-2.1.2" = { @@ -46863,24 +45729,6 @@ let sha512 = "pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg=="; }; }; - "sass-1.77.8" = { - name = "sass"; - packageName = "sass"; - version = "1.77.8"; - src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz"; - sha512 = "4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ=="; - }; - }; - "sass-formatter-0.7.9" = { - name = "sass-formatter"; - packageName = "sass-formatter"; - version = "0.7.9"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.7.9.tgz"; - sha512 = "CWZ8XiSim+fJVG0cFLStwDvft1VI7uvXdCNJYXhDvowiv+DsbD1nXLiQ4zrE5UBvj5DWZJ93cwN0NX5PMsr1Pw=="; - }; - }; "sax-1.1.4" = { name = "sax"; packageName = "sax"; @@ -46899,15 +45747,6 @@ let sha512 = "8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="; }; }; - "sax-1.2.4" = { - name = "sax"; - packageName = "sax"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; - }; - }; "sax-1.4.1" = { name = "sax"; packageName = "sax"; @@ -47016,15 +45855,6 @@ let sha512 = "e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ=="; }; }; - "selderee-0.11.0" = { - name = "selderee"; - packageName = "selderee"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/selderee/-/selderee-0.11.0.tgz"; - sha512 = "5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA=="; - }; - }; "select-hose-2.0.0" = { name = "select-hose"; packageName = "select-hose"; @@ -47250,6 +46080,15 @@ let sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; }; }; + "send-0.19.0" = { + name = "send"; + packageName = "send"; + version = "0.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.19.0.tgz"; + sha512 = "dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw=="; + }; + }; "serialize-error-11.0.3" = { name = "serialize-error"; packageName = "serialize-error"; @@ -47340,6 +46179,15 @@ let sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; }; }; + "serve-static-1.16.2" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz"; + sha512 = "VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw=="; + }; + }; "server-destroy-1.0.1" = { name = "server-destroy"; packageName = "server-destroy"; @@ -47574,15 +46422,6 @@ let sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="; }; }; - "shimmer-1.2.1" = { - name = "shimmer"; - packageName = "shimmer"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz"; - sha512 = "sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="; - }; - }; "should-13.2.3" = { name = "should"; packageName = "should"; @@ -48312,15 +47151,6 @@ let sha512 = "R5ocFmKZQFfSTstfOtHjJuAwbpGyf9qjQa1egyhvXSbM7emjrtLXtGdZsDJDABC85YBfVvrOiGWKSYXPKdvP1g=="; }; }; - "sorcery-0.11.1" = { - name = "sorcery"; - packageName = "sorcery"; - version = "0.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sorcery/-/sorcery-0.11.1.tgz"; - sha512 = "o7npfeJE6wi6J9l0/5LKshFzZ2rMatRiCDwYeDQaOzqdzRJwALhX7mk/A/ecg6wjMu7wdZbmXfD2S/vpOg0bdQ=="; - }; - }; "sort-json-2.0.1" = { name = "sort-json"; packageName = "sort-json"; @@ -48366,13 +47196,13 @@ let sha512 = "GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw=="; }; }; - "sort-on-6.0.0" = { + "sort-on-6.1.0" = { name = "sort-on"; packageName = "sort-on"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sort-on/-/sort-on-6.0.0.tgz"; - sha512 = "d51VlJWoFQjp+cIZRyNusCyJdP5pLAw+H+sC4C2q6RhPBv+RAb/QXXck5q3Kdm7h/ot/kD2AlpGPDee8v+0qiA=="; + url = "https://registry.npmjs.org/sort-on/-/sort-on-6.1.0.tgz"; + sha512 = "WTECP0nYNWO1n2g5bpsV0yZN9cBmZsF8ThHFbOqVN0HBFRoaQZLLEMvMmJlKHNPYQeVngeI5+jJzIfFqOIo1OA=="; }; }; "sorted-array-functions-1.3.0" = { @@ -48438,13 +47268,13 @@ let sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; }; }; - "source-map-js-1.2.0" = { + "source-map-js-1.2.1" = { name = "source-map-js"; packageName = "source-map-js"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz"; - sha512 = "itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg=="; + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz"; + sha512 = "UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="; }; }; "source-map-loader-3.0.2" = { @@ -48465,15 +47295,6 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "source-map-resolve-0.6.0" = { - name = "source-map-resolve"; - packageName = "source-map-resolve"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz"; - sha512 = "KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w=="; - }; - }; "source-map-support-0.4.18" = { name = "source-map-support"; packageName = "source-map-support"; @@ -48537,15 +47358,6 @@ let sha512 = "r7iW1bDw8R/cFifrD3JnQJX0K1jqT0kprL48BiBpLZLJPmAm34zsVBsK5lc7HirZYZqMW65dOXZgbAGt/I6frg=="; }; }; - "spawn-command-0.0.2" = { - name = "spawn-command"; - packageName = "spawn-command"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2.tgz"; - sha512 = "zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ=="; - }; - }; "spawn-to-readstream-0.1.3" = { name = "spawn-to-readstream"; packageName = "spawn-to-readstream"; @@ -48582,13 +47394,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.18" = { + "spdx-license-ids-3.0.20" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.18"; + version = "3.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz"; - sha512 = "xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz"; + sha512 = "jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw=="; }; }; "spdx-license-list-6.9.0" = { @@ -48906,15 +47718,6 @@ let sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; }; }; - "stack-chain-1.3.7" = { - name = "stack-chain"; - packageName = "stack-chain"; - version = "1.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz"; - sha512 = "D8cWtWVdIe/jBA7v5p5Hwl5yOSOrmZPWDPe2KxQ5UAGD+nxbxU0lKXA4h85Ta6+qgdKVL3vUxsbIZjc1kBG7ug=="; - }; - }; "stack-trace-0.0.10" = { name = "stack-trace"; packageName = "stack-trace"; @@ -49284,13 +48087,13 @@ let sha512 = "mzRXEeafEA0skX5XLiDht/zdIqEVs4kgayUTFHDoMjiaZ2kC7DoFsQDJVXRILI2Qme/kWXxLpuU6P0B+xcXpFA=="; }; }; - "streamx-2.18.0" = { + "streamx-2.20.1" = { name = "streamx"; packageName = "streamx"; - version = "2.18.0"; + version = "2.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz"; - sha512 = "LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.20.1.tgz"; + sha512 = "uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA=="; }; }; "strict-uri-encode-2.0.0" = { @@ -49338,15 +48141,6 @@ let sha512 = "G8cBS7wxxHhwQrKU0Y8SjZJRtCzZ61bMmMCO1bWm6N6y2obT0koGK8uWYloMOaVPPr8zk7Ic995uEd4Jw504AQ=="; }; }; - "string-length-1.0.1" = { - name = "string-length"; - packageName = "string-length"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz"; - sha512 = "MNCACnufWUf3pQ57O5WTBMkKhzYIaKEcUioO0XHrTMafrbBaNk4IyDOLHBv5xbXO0jLLdsYWeFjpjG2hVHRDtw=="; - }; - }; "string-length-3.1.0" = { name = "string-length"; packageName = "string-length"; @@ -49455,15 +48249,6 @@ let sha512 = "1BH+X+1hSthZFW+X+JaUkjkkUPwIlLEMJBLANN3hOob3RhEk5snLWNECDnYbgn/m5c5JV7Ersu1Yubaf+05cIA=="; }; }; - "string.prototype.repeat-1.0.0" = { - name = "string.prototype.repeat"; - packageName = "string.prototype.repeat"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz"; - sha512 = "0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w=="; - }; - }; "string.prototype.trim-1.2.9" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; @@ -49842,13 +48627,13 @@ let sha512 = "sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw=="; }; }; - "stylehacks-7.0.2" = { + "stylehacks-7.0.4" = { name = "stylehacks"; packageName = "stylehacks"; - version = "7.0.2"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.2.tgz"; - sha512 = "HdkWZS9b4gbgYTdMg4gJLmm7biAUug1qTqXjS+u8X+/pUd+9Px1E+520GnOW3rST9MNsVOVpsJG+mPHNosxjOQ=="; + url = "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.4.tgz"; + sha512 = "i4zfNrGMt9SB4xRK9L83rlsFCgdGANfeDAYacO1pkqcE7cRHPdWHwnKZVz7WY17Veq/FvyYsRAU++Ga+qDFIww=="; }; }; "stylelint-13.13.1" = { @@ -49860,22 +48645,13 @@ let sha512 = "Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ=="; }; }; - "stylis-4.3.2" = { + "stylis-4.3.4" = { name = "stylis"; packageName = "stylis"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz"; - sha512 = "bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg=="; - }; - }; - "stylus-0.55.0" = { - name = "stylus"; - packageName = "stylus"; - version = "0.55.0"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.55.0.tgz"; - sha512 = "MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw=="; + url = "https://registry.npmjs.org/stylis/-/stylis-4.3.4.tgz"; + sha512 = "osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now=="; }; }; "subarg-1.0.0" = { @@ -49941,15 +48717,6 @@ let sha512 = "Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw=="; }; }; - "suf-log-2.5.3" = { - name = "suf-log"; - packageName = "suf-log"; - version = "2.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/suf-log/-/suf-log-2.5.3.tgz"; - sha512 = "KvC8OPjzdNOe+xQ4XWJV2whQA0aM1kGVczMQ8+dStAO6KfEB140JEVQ9dE76ONZ0/Ylf67ni4tILPJB41U0eow=="; - }; - }; "sugarss-2.0.0" = { name = "sugarss"; packageName = "sugarss"; @@ -49959,15 +48726,6 @@ let sha512 = "WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ=="; }; }; - "sugarss-4.0.1" = { - name = "sugarss"; - packageName = "sugarss"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sugarss/-/sugarss-4.0.1.tgz"; - sha512 = "WCjS5NfuVJjkQzK10s8WOBY+hhDxxNt/N6ZaGwxFZ+wN3/lKKFSaaKUNecULcTTvE4urLcKaZFQD8vO0mOZujw=="; - }; - }; "sumchecker-3.0.1" = { name = "sumchecker"; packageName = "sumchecker"; @@ -50067,40 +48825,31 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "svelte-4.2.18" = { + "svelte-4.2.19" = { name = "svelte"; packageName = "svelte"; - version = "4.2.18"; + version = "4.2.19"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-4.2.18.tgz"; - sha512 = "d0FdzYIiAePqRJEb90WlJDkjUEx42xhivxN8muUBmfZnP+tzUgz12DJ2hRJi8sIHCME7jeK1PTMgKPSfTd8JrA=="; + url = "https://registry.npmjs.org/svelte/-/svelte-4.2.19.tgz"; + sha512 = "IY1rnGr6izd10B0A8LqsBfmlT5OILVuZ7XsI0vdGPEvuonFV7NYEUK4dAkm9Zg2q0Um92kYjTpS1CAP3Nh/KWw=="; }; }; - "svelte-5.0.0-next.198" = { + "svelte-5.0.0-next.257" = { name = "svelte"; packageName = "svelte"; - version = "5.0.0-next.198"; - src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-5.0.0-next.198.tgz"; - sha512 = "1eyQplJR7Rg5dTuHZoDamLJfqyk4k6cB3h6TMybWKrS/MIL4++iNV+q+NP6EUBngZ2iRBup7gRt0jYUbPI0UMw=="; - }; - }; - "svelte-preprocess-5.1.4" = { - name = "svelte-preprocess"; - packageName = "svelte-preprocess"; - version = "5.1.4"; + version = "5.0.0-next.257"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.1.4.tgz"; - sha512 = "IvnbQ6D6Ao3Gg6ftiM5tdbR6aAETwjhHV+UKGf5bHGYR69RQvF1ho0JKPcbUON4vy4R7zom13jPjgdOWCQ5hDA=="; + url = "https://registry.npmjs.org/svelte/-/svelte-5.0.0-next.257.tgz"; + sha512 = "fiTimH9UbJ0aNUcsOyaRgq4MZdmgN6lv3sQ2sOMv9V6haK0emsmYCm8Pw10+ej6FhXGALxuWvNdoi7VKMaeIIA=="; }; }; - "svelte2tsx-0.7.13" = { + "svelte2tsx-0.7.19" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.7.13"; + version = "0.7.19"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.13.tgz"; - sha512 = "aObZ93/kGAiLXA/I/kP+x9FriZM+GboB/ReOIGmLNbVGEd2xC+aTCppm3mk1cc9I/z60VQf7b2QDxC3jOXu3yw=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.19.tgz"; + sha512 = "PME/9mILn9wOihtk2dxu9tmf2+B9X6oWuqYPJRKSjqU4wq3Pc6+fOuYV7T3H+QF5afmA1oDobfXC6dzmK9NAVw=="; }; }; "sver-1.8.4" = { @@ -50130,15 +48879,6 @@ let sha512 = "Tq05Q0HTXDJZM+9ub9HCPPDbui2VavugF+/H9b1Ur9ykXbPsSUPFeXFZdDlutvDsVWZO8JjHKRdT3grpNSwwSg=="; }; }; - "svgo-0.6.6" = { - name = "svgo"; - packageName = "svgo"; - version = "0.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-0.6.6.tgz"; - sha512 = "C5A1r5SjFesNoKsmc+kWBxmB04iBGH2D/nFy8HJaME9+SyZKcmqcN8QG+GwxIc7D2+JWhaaW7uaM9+XwfplTEQ=="; - }; - }; "svgo-2.8.0" = { name = "svgo"; packageName = "svgo"; @@ -50220,15 +48960,6 @@ let sha512 = "dJp4qg+x4JwSEW1HibAuMi0IIrBI3wuQr2GimmqB7OXR50wmwzfdusG+p39R9w3R6aFtZ2mzvxvWKQ3Bd/vx3g=="; }; }; - "synckit-0.9.1" = { - name = "synckit"; - packageName = "synckit"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz"; - sha512 = "7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A=="; - }; - }; "syntax-error-1.4.0" = { name = "syntax-error"; packageName = "syntax-error"; @@ -50283,13 +49014,22 @@ let sha512 = "zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw=="; }; }; - "tailwindcss-3.4.6" = { + "tailwindcss-3.4.12" = { + name = "tailwindcss"; + packageName = "tailwindcss"; + version = "3.4.12"; + src = fetchurl { + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.12.tgz"; + sha512 = "Htf/gHj2+soPb9UayUNci/Ja3d8pTmu9ONTfh4QY8r3MATTZOzmv6UYWF7ZwikEIC8okpfqmGqrmDehua8mF8w=="; + }; + }; + "tailwindcss-4.0.0-alpha.24" = { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.4.6"; + version = "4.0.0-alpha.24"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.6.tgz"; - sha512 = "1uRHzPB+Vzu57ocybfZ4jh5Q3SdlH7XW23J5sQoM9LhE9eIOlzxer/3XPSsycvih3rboRsvt0QCmzSrqyOYUIA=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.0.0-alpha.24.tgz"; + sha512 = "SOowAXp/sGer9VCOPO1HlnwbCmDz9nD/aXkdNzt4zkMRRlSAPdE1w6TD3I+RgR1qD0QDw5J9nkBA47mrFMjYPQ=="; }; }; "tapable-0.2.9" = { @@ -50598,13 +49338,13 @@ let sha512 = "flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg=="; }; }; - "terser-5.31.3" = { + "terser-5.33.0" = { name = "terser"; packageName = "terser"; - version = "5.31.3"; + version = "5.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.31.3.tgz"; - sha512 = "pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.33.0.tgz"; + sha512 = "JuPVaB7s1gdFKPKTelwUyRq5Sid2A3Gko2S0PncwdBq7kN9Ti9HPWDQ06MPsEDGsZeVESjKEnyGy68quBk1w6g=="; }; }; "terser-webpack-plugin-5.3.10" = { @@ -50616,13 +49356,13 @@ let sha512 = "BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w=="; }; }; - "text-decoder-1.1.1" = { + "text-decoder-1.2.0" = { name = "text-decoder"; packageName = "text-decoder"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz"; - sha512 = "8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA=="; + url = "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.0.tgz"; + sha512 = "n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg=="; }; }; "text-decoding-1.0.0" = { @@ -50697,15 +49437,6 @@ let sha512 = "bNiQyqxiZcDWkUrj1G91mpIGGtMm+xUSvTJ5ciP9zux14kGbEp7PhDBZ6HtHZiJ8F7vfWSuwwORFW1y0yQfseA=="; }; }; - "then-fs-2.0.0" = { - name = "then-fs"; - packageName = "then-fs"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz"; - sha512 = "5ffcBcU+vFUCYDNi/o507IqjqrTkuGsLVZ1Fp50hwgZRY7ufVFa9jFfTy5uZ2QnSKacKigWKeaXkOqLa4DsjLw=="; - }; - }; "thenby-1.3.4" = { name = "thenby"; packageName = "thenby"; @@ -50868,15 +49599,6 @@ let sha512 = "gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw=="; }; }; - "timed-out-2.0.0" = { - name = "timed-out"; - packageName = "timed-out"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz"; - sha512 = "pqqJOi1rF5zNs/ps4vmbE4SFCrM4iR7LW+GHAsHqO/EumqbIWceioevYLM5xZRgQSH6gFgL9J/uB7EcJhQ9niQ=="; - }; - }; "timed-out-3.1.3" = { name = "timed-out"; packageName = "timed-out"; @@ -50940,6 +49662,15 @@ let sha512 = "XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="; }; }; + "tinyexec-0.3.0" = { + name = "tinyexec"; + packageName = "tinyexec"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.0.tgz"; + sha512 = "tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg=="; + }; + }; "tkwidgets-0.5.27" = { name = "tkwidgets"; packageName = "tkwidgets"; @@ -50976,6 +49707,24 @@ let sha512 = "Q0TU9zh5hDs2CpRFNM7SOW3K7OSgUgJC/cMrq9t44ei4tu+G3KV8BZyIJuYVvryJHH96mKgc9WXdhgKVvGD7jg=="; }; }; + "tldts-6.1.47" = { + name = "tldts"; + packageName = "tldts"; + version = "6.1.47"; + src = fetchurl { + url = "https://registry.npmjs.org/tldts/-/tldts-6.1.47.tgz"; + sha512 = "R/K2tZ5MiY+mVrnSkNJkwqYT2vUv1lcT6wJvd2emGaMJ7PHUGRY4e3tUsdFCXgqxi2QgbHjL3yJgXCo40v9Hxw=="; + }; + }; + "tldts-core-6.1.47" = { + name = "tldts-core"; + packageName = "tldts-core"; + version = "6.1.47"; + src = fetchurl { + url = "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.47.tgz"; + sha512 = "6SWyFMnlst1fEt7GQVAAu16EGgFK0cLouH/2Mk6Ftlwhv3Ol40L0dlpGMcnnNiiOMyD2EV/aF3S+U2nKvvLvrA=="; + }; + }; "tmp-0.0.33" = { name = "tmp"; packageName = "tmp"; @@ -51129,15 +49878,6 @@ let sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; }; }; - "token-stream-1.0.0" = { - name = "token-stream"; - packageName = "token-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz"; - sha512 = "VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg=="; - }; - }; "token-types-2.1.1" = { name = "token-types"; packageName = "token-types"; @@ -51165,13 +49905,13 @@ let sha512 = "605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw=="; }; }; - "torrent-discovery-11.0.7" = { + "torrent-discovery-11.0.11" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "11.0.7"; + version = "11.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-11.0.7.tgz"; - sha512 = "JRG3Ko3YPrNbd3agqijOwqdyV0+m+8X7kkWDYu4zCMZxnyK87Mc6Bd1glXxOevY10GwBf2wQ+DToBOXYbvcA0Q=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-11.0.11.tgz"; + sha512 = "nstol6BXznH2ScAEYVGmR5scqw+IwyfOWXCxDiP3r4fKsZDbY2TGcyN/i6FilZGX4YQ5fQDmKLZ/3AoRSXRGUA=="; }; }; "torrent-discovery-5.4.0" = { @@ -51246,6 +49986,15 @@ let sha512 = "Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag=="; }; }; + "tough-cookie-5.0.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.0.0.tgz"; + sha512 = "FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q=="; + }; + }; "tr46-0.0.3" = { name = "tr46"; packageName = "tr46"; @@ -51300,13 +50049,13 @@ let sha512 = "iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ=="; }; }; - "traverse-0.6.9" = { + "traverse-0.6.10" = { name = "traverse"; packageName = "traverse"; - version = "0.6.9"; + version = "0.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/traverse/-/traverse-0.6.9.tgz"; - sha512 = "7bBrcF+/LQzSgFmT0X5YclVqQxtv7TDJ1f8Wj7ibBu/U6BMLeOpUxuZjV7rMc44UtKxlnMFigdhFAIszSX1DMg=="; + url = "https://registry.npmjs.org/traverse/-/traverse-0.6.10.tgz"; + sha512 = "hN4uFRxbK+PX56DxYiGHsTn2dME3TVr9vbNqlQGcGcPhJAn+tdP126iA+TArMpI4YSgnTkMWyoLl5bf81Hi5TA=="; }; }; "tree-dump-1.0.2" = { @@ -51606,6 +50355,15 @@ let sha512 = "xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="; }; }; + "tslib-2.7.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz"; + sha512 = "gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="; + }; + }; "tslint-5.20.1" = { name = "tslint"; packageName = "tslint"; @@ -51642,13 +50400,13 @@ let sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; - "tsx-4.16.2" = { + "tsx-4.19.1" = { name = "tsx"; packageName = "tsx"; - version = "4.16.2"; + version = "4.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/tsx/-/tsx-4.16.2.tgz"; - sha512 = "C1uWweJDgdtX2x600HjaFaucXTilT7tgUZHbOE4+ypskZ1OP8CRCSDkCxG6Vya9EwaFIVagWwpaVAn5wzypaqQ=="; + url = "https://registry.npmjs.org/tsx/-/tsx-4.19.1.tgz"; + sha512 = "0flMz1lh74BR4wOvBjuh9olbnwqCPc35OOlfyzHba0Dc+QNUeWX/Gq2YTbnwcWPO3BMd8fkzRVrHcsR+a7z7rA=="; }; }; "tty-browserify-0.0.1" = { @@ -51732,31 +50490,13 @@ let sha512 = "Z3/iJ6IWh8VBiACWQJaA5ulPQE5E1QwvBHj00uGzdQxdRnd8fh1DPqNOJqzQDu6DkOstORrtXzf/9adB+vMtEA=="; }; }; - "turndown-7.2.0" = { - name = "turndown"; - packageName = "turndown"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/turndown/-/turndown-7.2.0.tgz"; - sha512 = "eCZGBN4nNNqM9Owkv9HAtWRYfLA4h909E/WGAWWBpmB275ehNhZyk87/Tpvjbp0jjNl9XwCsbe6bm6CqFsgD+A=="; - }; - }; - "turndown-plugin-gfm-1.0.2" = { - name = "turndown-plugin-gfm"; - packageName = "turndown-plugin-gfm"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.2.tgz"; - sha512 = "vwz9tfvF7XN/jE0dGoBei3FXWuvll78ohzCZQuOb+ZjWrs3a0XhQVomJEb2Qh4VHTPNRO4GPZh0V7VRbiWwkRg=="; - }; - }; - "tus-js-client-4.1.0" = { + "tus-js-client-4.2.3" = { name = "tus-js-client"; packageName = "tus-js-client"; - version = "4.1.0"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-4.1.0.tgz"; - sha512 = "e/nC/kJahvNYBcnwcqzuhFIvVELMMpbVXIoOOKdUn74SdQCvJd2JjqV2jZLv2EFOVbV4qLiO0lV7BxBXF21b6Q=="; + url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-4.2.3.tgz"; + sha512 = "UkQUCeDWKh5AwArcasIJWcL5EP66XPypKQtsdPu82wNnTea8eAUHdpDx3DcfZgDERAiCII895zMYkXri4M1wzw=="; }; }; "tweetnacl-0.14.5" = { @@ -51912,13 +50652,13 @@ let sha512 = "tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g=="; }; }; - "type-fest-4.23.0" = { + "type-fest-4.26.1" = { name = "type-fest"; packageName = "type-fest"; - version = "4.23.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-4.23.0.tgz"; - sha512 = "ZiBujro2ohr5+Z/hZWHESLz3g08BBdrdLMieYFULJO+tWc437sn8kQsWLJoZErY8alNhxre9K4p3GURAG11n+w=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz"; + sha512 = "yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg=="; }; }; "type-is-1.6.18" = { @@ -52002,15 +50742,6 @@ let sha512 = "8WbVAQAUlENo1q3c3zZYuy5k9VzBQvp8AX9WOtbvyWlLM1v5JaSRmjubLjzHF4JFtptjH/5c/i95yaElvcjC0A=="; }; }; - "typesafe-path-0.2.2" = { - name = "typesafe-path"; - packageName = "typesafe-path"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/typesafe-path/-/typesafe-path-0.2.2.tgz"; - sha512 = "OJabfkAg1WLZSqJAJ0Z6Sdt3utnbzr/jh+NAHoyWHJe8CMSy79Gm085094M9nvTPy22KzTVn5Zq5mbapCI/hPA=="; - }; - }; "typescript-3.9.10" = { name = "typescript"; packageName = "typescript"; @@ -52047,22 +50778,22 @@ let sha512 = "Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q=="; }; }; - "typescript-5.6.0-dev.20240725" = { + "typescript-5.6.2" = { name = "typescript"; packageName = "typescript"; - version = "5.6.0-dev.20240725"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.6.0-dev.20240725.tgz"; - sha512 = "kgUK4mJogTfm3+NjdYSb7LIerXpAG8lyYSdPHdfGPaJyBRhMJARPENf0TeUxhEOrGRuxHTrIPKdrSOQX5xTsuw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz"; + sha512 = "NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw=="; }; }; - "typescript-auto-import-cache-0.3.3" = { - name = "typescript-auto-import-cache"; - packageName = "typescript-auto-import-cache"; - version = "0.3.3"; + "typescript-5.7.0-dev.20240920" = { + name = "typescript"; + packageName = "typescript"; + version = "5.7.0-dev.20240920"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.3.tgz"; - sha512 = "ojEC7+Ci1ij9eE6hp8Jl9VUNnsEKzztktP5gtYNRMrTmfXVwA1PITYYAkpxCvvupdSYa/Re51B6KMcv1CTZEUA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.7.0-dev.20240920.tgz"; + sha512 = "KYknuG23W0kaacmyzU9fiwJ/D+ddDwveCZZAUHwW3okW7SonODu3rlZ5VTtlcdURq44Y27xIygcMG6oB8IU6cg=="; }; }; "typescript-tslint-plugin-0.5.4" = { @@ -52110,13 +50841,13 @@ let sha512 = "RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ=="; }; }; - "ua-parser-js-1.0.38" = { + "ua-parser-js-1.0.39" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "1.0.38"; + version = "1.0.39"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.38.tgz"; - sha512 = "Aq5ppTOfvrCMgAPneW1HfWj66Xi7XL+/mIy996R1/CLS/rcyJQm6QZdsKrUeivDFQ+Oc9Wyuwor8Ze8peEoUoQ=="; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.39.tgz"; + sha512 = "k24RCVWlEcjkdOxYmVJgeD/0a1TiSpqLg+ZalVGV9lsnr4yqu0w7tX/x2xX6G4zpkgQnRf89lxuZ1wsbjXM8lw=="; }; }; "uc.micro-1.0.6" = { @@ -52137,15 +50868,6 @@ let sha512 = "ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="; }; }; - "uglify-js-2.8.29" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.8.29"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; - sha512 = "qLq/4y2pjcU3vhlhseXGGJ7VbFO4pBANu0kwl8VCa9KEI0V8VfZIx2Fy3w01iSTA/pGwKZSmu/+I4etLNDdt5w=="; - }; - }; "uglify-js-3.17.4" = { name = "uglify-js"; packageName = "uglify-js"; @@ -52155,22 +50877,13 @@ let sha512 = "T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g=="; }; }; - "uglify-js-3.19.0" = { + "uglify-js-3.19.3" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.0.tgz"; - sha512 = "wNKHUY2hYYkf6oSFfhwwiHo4WCHzHmzcXsqXYTN9ja3iApYIFbb2U6ics9hBcYLHcYGQoAlwnZlTrf3oF+BL/Q=="; - }; - }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; + version = "3.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha512 = "vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz"; + sha512 = "v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ=="; }; }; "uglifycss-0.0.29" = { @@ -52380,6 +51093,15 @@ let sha512 = "72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g=="; }; }; + "undici-6.19.8" = { + name = "undici"; + packageName = "undici"; + version = "6.19.8"; + src = fetchurl { + url = "https://registry.npmjs.org/undici/-/undici-6.19.8.tgz"; + sha512 = "U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g=="; + }; + }; "undici-types-5.26.5" = { name = "undici-types"; packageName = "undici-types"; @@ -52389,6 +51111,15 @@ let sha512 = "JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="; }; }; + "undici-types-6.19.8" = { + name = "undici-types"; + packageName = "undici-types"; + version = "6.19.8"; + src = fetchurl { + url = "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz"; + sha512 = "ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="; + }; + }; "unherit-3.0.1" = { name = "unherit"; packageName = "unherit"; @@ -52398,13 +51129,13 @@ let sha512 = "akOOQ/Yln8a2sgcLj4U0Jmx0R5jpIg2IUyRrWOzmEbjBtGzBdHtSeFKgoEcoH4KYIG/Pb8GQ/BwtYm0GCq1Sqg=="; }; }; - "unicode-canonical-property-names-ecmascript-2.0.0" = { + "unicode-canonical-property-names-ecmascript-2.0.1" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; - sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz"; + sha512 = "dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg=="; }; }; "unicode-emoji-json-0.6.0" = { @@ -52425,13 +51156,13 @@ let sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; }; }; - "unicode-match-property-value-ecmascript-2.1.0" = { + "unicode-match-property-value-ecmascript-2.2.0" = { name = "unicode-match-property-value-ecmascript"; packageName = "unicode-match-property-value-ecmascript"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz"; - sha512 = "qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="; + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz"; + sha512 = "4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg=="; }; }; "unicode-property-aliases-ecmascript-2.1.0" = { @@ -52461,6 +51192,15 @@ let sha512 = "q83y+/QtXrbKX1jYY+bdQROAbZj6EeSP+Plv0cYZBMPfirSaEvnnhMwRk2WH4n5XkNCQHygAiwTVNpvw3I1dCg=="; }; }; + "unicorn-magic-0.3.0" = { + name = "unicorn-magic"; + packageName = "unicorn-magic"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz"; + sha512 = "+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA=="; + }; + }; "unified-10.1.2" = { name = "unified"; packageName = "unified"; @@ -52857,15 +51597,6 @@ let sha512 = "TkBb0HABNmxzAcfLf4qsIbFbaPDvMO6wa3b3j4VcEzFVaw1LBKwnW4/sRJ/atSLSzoIg41JWEdnE7N6DIhGDGQ=="; }; }; - "unist-util-remove-position-5.0.0" = { - name = "unist-util-remove-position"; - packageName = "unist-util-remove-position"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-5.0.0.tgz"; - sha512 = "Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q=="; - }; - }; "unist-util-stringify-position-2.0.3" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; @@ -53217,15 +51948,6 @@ let sha512 = "5YHsflzHP4t1G+8WGPlvKbJEbAJGCgw+Em+dGR1KmBUbr1J36SJBqlHLjR7oob7sco5hWHGQVcr9B2poIVDDTQ=="; }; }; - "update-notifier-0.5.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.5.0.tgz"; - sha512 = "zOGOlUKDAgDlLHLv7Oiszz3pSj8fKlSJ3i0u49sEakjXUEVJ6DMjo/Mh/B6mg2eOALvRTJkd0kbChcipQoYCng=="; - }; - }; "update-notifier-1.0.3" = { name = "update-notifier"; packageName = "update-notifier"; @@ -53253,13 +51975,13 @@ let sha512 = "EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og=="; }; }; - "update-notifier-7.1.0" = { + "update-notifier-7.3.1" = { name = "update-notifier"; packageName = "update-notifier"; - version = "7.1.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-7.1.0.tgz"; - sha512 = "8SV3rIqVY6EFC1WxH6L0j55s0MO79MFBS1pivmInRJg3pCEDgWHBj1Q6XByTtCLOZIFA0f6zoG9ZWf2Ks9lvTA=="; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-7.3.1.tgz"; + sha512 = "+dwUY4L35XFYEzE+OAL3sarJdUioVovq+8f7lcIJ7wnmnYQV5UD1Y/lcwaMSyaQ6Bj3JMj1XSTjZbNLHn/19yA=="; }; }; "upnp-device-client-1.0.2" = { @@ -53325,13 +52047,13 @@ let sha512 = "hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ=="; }; }; - "url-0.11.3" = { + "url-0.11.4" = { name = "url"; packageName = "url"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.11.3.tgz"; - sha512 = "6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw=="; + url = "https://registry.npmjs.org/url/-/url-0.11.4.tgz"; + sha512 = "oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg=="; }; }; "url-join-4.0.0" = { @@ -53415,15 +52137,6 @@ let sha512 = "RtuPeMy7c1UrHwproMZN9gN6kiZ0SvJwRaEzwZY0j9MypEkFqyBaKv176jvlPtg58Zh36bOkS0NFABXMHvvGCA=="; }; }; - "usb-1.9.2" = { - name = "usb"; - packageName = "usb"; - version = "1.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/usb/-/usb-1.9.2.tgz"; - sha512 = "dryNz030LWBPAf6gj8vyq0Iev3vPbCLHCT8dBw3gQRXRzVNsIdeuU+VjPp3ksmSPkeMAl1k+kQ14Ij0QHyeiAg=="; - }; - }; "use-3.1.1" = { name = "use"; packageName = "use"; @@ -54225,13 +52938,13 @@ let sha512 = "r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g=="; }; }; - "vfile-6.0.2" = { + "vfile-6.0.3" = { name = "vfile"; packageName = "vfile"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-6.0.2.tgz"; - sha512 = "zND7NlS8rJYb/sPqkb13ZvbbUoExdbi4w3SfRrMq6R3FvnLQmmfpajJNITuuYm6AZ5uao9vy4BAos3EXBPf2rg=="; + url = "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz"; + sha512 = "KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q=="; }; }; "vfile-find-up-6.1.0" = { @@ -54432,78 +53145,6 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "void-elements-3.1.0" = { - name = "void-elements"; - packageName = "void-elements"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz"; - sha512 = "Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="; - }; - }; - "volar-service-css-0.0.59" = { - name = "volar-service-css"; - packageName = "volar-service-css"; - version = "0.0.59"; - src = fetchurl { - url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.59.tgz"; - sha512 = "gLNjJnECbalPvQB7qeJjhkDN8sR5M3ItbVYjnyio61aHaWptIiXm/HfDahcQ2ApwmvWidkMWWegjGq5L0BENDA=="; - }; - }; - "volar-service-emmet-0.0.59" = { - name = "volar-service-emmet"; - packageName = "volar-service-emmet"; - version = "0.0.59"; - src = fetchurl { - url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.59.tgz"; - sha512 = "6EynHcuMwMBETpK29TbZvIMmvzdVG+Tkokk9VWfZeI+SwDptk2tgdhEqiXXvIkqYNgbuu73Itp66lpH76cAU+Q=="; - }; - }; - "volar-service-html-0.0.59" = { - name = "volar-service-html"; - packageName = "volar-service-html"; - version = "0.0.59"; - src = fetchurl { - url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.59.tgz"; - sha512 = "hEXOsYpILDlITZxnqRLV9OepVWD63GZBsyjMxszwdzlxvGZjzbGcBBinJGGJRwFIV8djdJwnt91bkdg1V5tj6Q=="; - }; - }; - "volar-service-prettier-0.0.59" = { - name = "volar-service-prettier"; - packageName = "volar-service-prettier"; - version = "0.0.59"; - src = fetchurl { - url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.59.tgz"; - sha512 = "FmBR4lsgFRGR3V0LnxZZal0WqdOJjuLL6mQSj4p57M15APtQwuocG/FiF+ONGFnwRXMOIBDBTCARdth+TKgL3A=="; - }; - }; - "volar-service-typescript-0.0.59" = { - name = "volar-service-typescript"; - packageName = "volar-service-typescript"; - version = "0.0.59"; - src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.59.tgz"; - sha512 = "VCOpfiu+lUo5lapWLB5L5vmQGtwzmNWn5MueV915eku7blpphmE+Z7hCNcL1NApn7AetXWhiblv8ZhmUx/dGIA=="; - }; - }; - "volar-service-typescript-twoslash-queries-0.0.59" = { - name = "volar-service-typescript-twoslash-queries"; - packageName = "volar-service-typescript-twoslash-queries"; - version = "0.0.59"; - src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.59.tgz"; - sha512 = "skm8e6yhCIkqLwJB6S9MqT5lO9LNFuMD3dYxKpmOZs1CKbXmCZZTmLfEaD5VkJae1xdleEDZFFTHl2O5HLjOGQ=="; - }; - }; - "vscode-css-languageservice-6.3.0" = { - name = "vscode-css-languageservice"; - packageName = "vscode-css-languageservice"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.0.tgz"; - sha512 = "nU92imtkgzpCL0xikrIb8WvedV553F2BENzgz23wFuok/HLN5BeQmroMy26pUwFxV2eV8oNRmYCUv8iO7kSMhw=="; - }; - }; "vscode-emmet-helper-1.2.17" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; @@ -54513,15 +53154,6 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; - "vscode-html-languageservice-5.3.0" = { - name = "vscode-html-languageservice"; - packageName = "vscode-html-languageservice"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.0.tgz"; - sha512 = "C4Z3KsP5Ih+fjHpiBc5jxmvCl+4iEwvXegIrzu2F5pktbWvQaBT3YkVPk8N+QlSSMk8oCG6PKtZ/Sq2YHb5e8g=="; - }; - }; "vscode-json-languageservice-4.2.1" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; @@ -54738,6 +53370,15 @@ let sha512 = "X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA=="; }; }; + "vscode-languageserver-textdocument-1.0.12" = { + name = "vscode-languageserver-textdocument"; + packageName = "vscode-languageserver-textdocument"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz"; + sha512 = "cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA=="; + }; + }; "vscode-languageserver-types-3.14.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -54855,6 +53496,15 @@ let sha512 = "AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="; }; }; + "vue-3.5.6" = { + name = "vue"; + packageName = "vue"; + version = "3.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vue/-/vue-3.5.6.tgz"; + sha512 = "zv+20E2VIYbcJOzJPUWp03NOGFhMmpCKOfSxVTmCYyYFFko48H9tmuQFzYj7tu4qX1AeXlp9DmhIP89/sSxxhw=="; + }; + }; "vue-eslint-parser-7.11.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; @@ -54927,13 +53577,13 @@ let sha512 = "9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA=="; }; }; - "watchpack-2.4.1" = { + "watchpack-2.4.2" = { name = "watchpack"; packageName = "watchpack"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz"; - sha512 = "8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg=="; + url = "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz"; + sha512 = "TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw=="; }; }; "wavedrom-3.5.0" = { @@ -55116,13 +53766,13 @@ let sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="; }; }; - "webpack-5.93.0" = { + "webpack-5.94.0" = { name = "webpack"; packageName = "webpack"; - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz"; - sha512 = "Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz"; + sha512 = "KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg=="; }; }; "webpack-cli-5.1.4" = { @@ -55143,13 +53793,13 @@ let sha512 = "BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q=="; }; }; - "webpack-dev-middleware-7.3.0" = { + "webpack-dev-middleware-7.4.2" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; - version = "7.3.0"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.3.0.tgz"; - sha512 = "xD2qnNew+F6KwOGZR7kWdbIou/ud7cVqLEXeK1q0nHcNsX/u7ul/fSdlOTX4ntSL5FNFy7ZJJXbf0piF591JYw=="; + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.2.tgz"; + sha512 = "xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA=="; }; }; "webpack-dev-server-4.15.2" = { @@ -55224,13 +53874,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-2.4.12" = { + "webtorrent-2.5.1" = { name = "webtorrent"; packageName = "webtorrent"; - version = "2.4.12"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-2.4.12.tgz"; - sha512 = "Lp/2WDQH0nUhIkpp03F7PnAorQSVCFIDGY4ZNeNPGtA1CgoeX4eie1BfK6QAlH/OtHbilPhpxlVrBkZsA6HqPA=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-2.5.1.tgz"; + sha512 = "2cRka7Azd4jbLVQ0GZJF1jAOZbBrTQGdWAqkL+5y/jfh/ETC63r9Je6gmVDZRPdLpNEgqN2sdryRaFbWgGCqPw=="; }; }; "whatwg-encoding-1.0.5" = { @@ -55314,15 +53964,6 @@ let sha512 = "uVieSTccFIr/SFQdFWN/fFaQYmV37OKtuaGphMAzi4DmmUlrvRBJW5WSLkHyjNQY/ePJMz3LoiX9R3yy1Su6Hw=="; }; }; - "whet.extend-0.9.9" = { - name = "whet.extend"; - packageName = "whet.extend"; - version = "0.9.9"; - src = fetchurl { - url = "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz"; - sha512 = "mmIPAft2vTgEILgPeZFqE/wWh24SEsR/k+N9fJ3Jxrz44iDFy9aemCxdksfURSHYFCLmvs/d/7Iso5XjPpNfrA=="; - }; - }; "which-1.3.1" = { name = "which"; packageName = "which"; @@ -55494,15 +54135,6 @@ let sha512 = "CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ=="; }; }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha512 = "1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg=="; - }; - }; "window-size-0.2.0" = { name = "window-size"; packageName = "window-size"; @@ -55566,22 +54198,22 @@ let sha512 = "BLxJH3KCgJ2paj2xKYTQLpxdKr9URPDDDLJnRVcbud7izT+m8Xzt5Rod6mnNgEcfT0fRvhEy2Cj3cEnnQpa6qA=="; }; }; - "winston-3.11.0" = { + "winston-3.14.1" = { name = "winston"; packageName = "winston"; - version = "3.11.0"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.11.0.tgz"; - sha512 = "L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g=="; + url = "https://registry.npmjs.org/winston/-/winston-3.14.1.tgz"; + sha512 = "CJi4Il/msz8HkdDfXOMu+r5Au/oyEjFiOZzbX2d23hRLY0narGjqfE5lFlrT5hfYJhPtM8b85/GNFsxIML/RVA=="; }; }; - "winston-3.13.1" = { + "winston-3.14.2" = { name = "winston"; packageName = "winston"; - version = "3.13.1"; + version = "3.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz"; - sha512 = "SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw=="; + url = "https://registry.npmjs.org/winston/-/winston-3.14.2.tgz"; + sha512 = "CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg=="; }; }; "winston-transport-4.7.1" = { @@ -55593,15 +54225,6 @@ let sha512 = "wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA=="; }; }; - "with-7.0.2" = { - name = "with"; - packageName = "with"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/with/-/with-7.0.2.tgz"; - sha512 = "RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w=="; - }; - }; "with-open-file-0.1.7" = { name = "with-open-file"; packageName = "with-open-file"; @@ -55638,15 +54261,6 @@ let sha512 = "BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="; }; }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha512 = "xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q=="; - }; - }; "wordwrap-0.0.3" = { name = "wordwrap"; packageName = "wordwrap"; @@ -56404,22 +55018,13 @@ let sha512 = "pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg=="; }; }; - "yaml-2.4.5" = { + "yaml-2.5.1" = { name = "yaml"; packageName = "yaml"; - version = "2.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz"; - sha512 = "aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg=="; - }; - }; - "yaml-2.5.0" = { - name = "yaml"; - packageName = "yaml"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz"; - sha512 = "2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw=="; + url = "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz"; + sha512 = "bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q=="; }; }; "yargs-13.3.2" = { @@ -56485,15 +55090,6 @@ let sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="; }; }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha512 = "QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A=="; - }; - }; "yargs-4.8.1" = { name = "yargs"; packageName = "yargs"; @@ -56824,48 +55420,50 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "18.1.2"; + version = "18.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-18.1.2.tgz"; - sha512 = "5H0scWgJcDE3NSM6/j/xSwNfAQBVOhVjXuj+nZOaEkJC0Bxh6AoEdWpQdzmZ6qSlx4LMlJYI6P/sH0kiBlFfgA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-18.2.5.tgz"; + sha512 = "97uNs0HsOdnMaTlNJKFjIBUXw0wz43uYvSSKmIpBt7eq1LaPLju1G/qpDIHx2YwhMClPrXXrW2H/xdvqZiIw+w=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1801.2" - sources."@angular-devkit/core-18.1.2" - sources."@angular-devkit/schematics-18.1.2" - (sources."@inquirer/checkbox-2.4.2" // { + sources."@angular-devkit/architect-0.1802.5" + sources."@angular-devkit/core-18.2.5" + sources."@angular-devkit/schematics-18.2.5" + (sources."@inquirer/checkbox-2.5.0" // { dependencies = [ sources."ansi-escapes-4.3.2" ]; }) - sources."@inquirer/confirm-3.1.17" - (sources."@inquirer/core-9.0.5" // { + sources."@inquirer/confirm-3.2.0" + (sources."@inquirer/core-9.2.1" // { dependencies = [ + sources."@inquirer/type-2.0.0" sources."ansi-escapes-4.3.2" - sources."signal-exit-4.1.0" sources."wrap-ansi-6.2.0" ]; }) - sources."@inquirer/editor-2.1.17" - sources."@inquirer/expand-2.1.17" - sources."@inquirer/figures-1.0.5" - sources."@inquirer/input-2.2.4" - (sources."@inquirer/password-2.1.17" // { + sources."@inquirer/editor-2.2.0" + sources."@inquirer/expand-2.3.0" + sources."@inquirer/figures-1.0.6" + sources."@inquirer/input-2.3.0" + sources."@inquirer/number-1.1.0" + (sources."@inquirer/password-2.2.0" // { dependencies = [ sources."ansi-escapes-4.3.2" ]; }) - sources."@inquirer/prompts-5.0.7" - sources."@inquirer/rawlist-2.1.17" - (sources."@inquirer/select-2.4.2" // { + sources."@inquirer/prompts-5.3.8" + sources."@inquirer/rawlist-2.3.0" + sources."@inquirer/search-1.1.0" + (sources."@inquirer/select-2.5.0" // { dependencies = [ sources."ansi-escapes-4.3.2" ]; }) - sources."@inquirer/type-1.5.1" + sources."@inquirer/type-1.5.5" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" sources."emoji-regex-9.2.2" sources."string-width-5.1.2" @@ -56874,7 +55472,7 @@ in ]; }) sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@listr2/prompt-adapter-inquirer-2.0.13" + sources."@listr2/prompt-adapter-inquirer-2.0.15" sources."@npmcli/agent-2.2.2" sources."@npmcli/fs-3.1.1" (sources."@npmcli/git-5.0.8" // { @@ -56885,7 +55483,7 @@ in }) sources."@npmcli/installed-package-contents-2.1.0" sources."@npmcli/node-gyp-3.0.0" - sources."@npmcli/package-json-5.2.0" + sources."@npmcli/package-json-5.2.1" (sources."@npmcli/promise-spawn-7.0.2" // { dependencies = [ sources."isexe-3.1.1" @@ -56899,7 +55497,7 @@ in sources."which-4.0.0" ]; }) - sources."@schematics/angular-18.1.2" + sources."@schematics/angular-18.2.5" sources."@sigstore/bundle-2.3.2" sources."@sigstore/core-1.1.0" sources."@sigstore/protobuf-specs-0.3.2" @@ -56909,15 +55507,15 @@ in sources."@tufjs/canonical-json-2.0.0" sources."@tufjs/models-2.0.1" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/wrap-ansi-3.0.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-2.0.0" sources."agent-base-7.1.1" sources."aggregate-error-3.1.0" - sources."ajv-8.16.0" + sources."ajv-8.17.1" sources."ajv-formats-3.0.1" - sources."ansi-escapes-6.2.1" + sources."ansi-escapes-7.0.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" (sources."anymatch-3.1.3" // { @@ -56938,12 +55536,12 @@ in sources."chokidar-3.6.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" - sources."cli-cursor-4.0.0" + sources."cli-cursor-5.0.0" sources."cli-spinners-2.9.2" (sources."cli-truncate-4.0.0" // { dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-10.3.0" + sources."ansi-regex-6.1.0" + sources."emoji-regex-10.4.0" sources."string-width-7.2.0" sources."strip-ansi-7.1.0" ]; @@ -56955,23 +55553,21 @@ in sources."color-name-1.1.4" sources."colorette-2.0.20" sources."cross-spawn-7.0.3" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."defaults-1.0.4" sources."eastasianwidth-0.2.0" sources."emoji-regex-8.0.0" sources."env-paths-2.2.1" + sources."environment-1.1.0" sources."err-code-2.0.3" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."eventemitter3-5.0.1" sources."exponential-backoff-3.1.1" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" + sources."fast-uri-3.0.1" sources."fill-range-7.1.1" - (sources."foreground-child-3.2.1" // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - }) + sources."foreground-child-3.3.0" sources."fs-minipass-3.0.3" sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" @@ -56994,7 +55590,7 @@ in sources."ini-4.1.3" sources."ip-address-9.0.5" sources."is-binary-path-2.1.0" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -57009,22 +55605,22 @@ in sources."json-schema-traverse-1.0.0" sources."jsonc-parser-3.3.1" sources."jsonparse-1.3.1" - (sources."listr2-8.2.3" // { + (sources."listr2-8.2.4" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" - sources."emoji-regex-10.3.0" + sources."emoji-regex-10.4.0" sources."string-width-7.2.0" sources."strip-ansi-7.1.0" sources."wrap-ansi-9.0.0" ]; }) sources."log-symbols-4.1.0" - (sources."log-update-6.0.0" // { + (sources."log-update-6.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" - sources."emoji-regex-10.3.0" + sources."emoji-regex-10.4.0" sources."is-fullwidth-code-point-5.0.0" sources."slice-ansi-7.1.0" sources."string-width-7.2.0" @@ -57033,9 +55629,10 @@ in ]; }) sources."lru-cache-10.4.3" - sources."magic-string-0.30.10" + sources."magic-string-0.30.11" sources."make-fetch-happen-13.0.1" sources."mimic-fn-2.1.0" + sources."mimic-function-5.0.1" sources."minimatch-9.0.5" sources."minipass-7.1.2" sources."minipass-collect-2.0.1" @@ -57061,7 +55658,7 @@ in ]; }) sources."mkdirp-1.0.4" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-1.0.0" sources."negotiator-0.6.3" (sources."node-gyp-10.2.0" // { @@ -57076,15 +55673,17 @@ in sources."npm-bundled-3.0.1" sources."npm-install-checks-6.3.0" sources."npm-normalize-package-bin-3.0.1" - sources."npm-package-arg-11.0.2" + sources."npm-package-arg-11.0.3" sources."npm-packlist-8.0.2" - sources."npm-pick-manifest-9.0.1" + sources."npm-pick-manifest-9.1.0" sources."npm-registry-fetch-17.1.0" - sources."onetime-5.1.2" + sources."onetime-7.0.0" (sources."ora-5.4.1" // { dependencies = [ sources."cli-cursor-3.1.0" + sources."onetime-5.1.2" sources."restore-cursor-3.1.0" + sources."signal-exit-3.0.7" ]; }) sources."os-tmpdir-1.0.2" @@ -57098,7 +55697,6 @@ in sources."proc-log-4.2.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."punycode-2.3.1" sources."readable-stream-3.6.2" (sources."readdirp-3.6.0" // { dependencies = [ @@ -57108,16 +55706,16 @@ in sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."resolve-1.22.8" - sources."restore-cursor-4.0.0" + sources."restore-cursor-5.1.0" sources."retry-0.12.0" sources."rfdc-1.4.1" sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" + sources."signal-exit-4.1.0" sources."sigstore-2.3.1" (sources."slice-ansi-5.0.0" // { dependencies = [ @@ -57132,7 +55730,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."sprintf-js-1.1.3" sources."ssri-10.0.6" sources."string-width-4.2.3" @@ -57155,13 +55753,12 @@ in }) sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."tuf-js-2.2.1" sources."type-fest-0.21.3" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" - sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-5.0.1" @@ -57188,15 +55785,15 @@ in "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.22.0.tgz"; - sha512 = "qP2zFsmypfWpKnmQcjoqMfYrPRHbqcXnhaUrg3VGqPGFXyN9sKz2+/TvNKByWDqAfuVStE8Fy2ppuVdoWQDjkw=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.23.0.tgz"; + sha512 = "R5/GkA3PfGewAXLzz6lN5XagunF6PKeDtWt8dbZQXvHfebLS0qEczV+Azg/d+tKgSh6kRBpxvu8oSjARdPtw0A=="; }; buildInputs = globalBuildInputs; meta = { description = "Use the right package manager"; - homepage = "https://github.com/antfu/ni#readme"; + homepage = "https://github.com/antfu-collective/ni#readme"; license = "MIT"; }; production = true; @@ -57206,42 +55803,38 @@ in "@babel/cli" = nodeEnv.buildNodePackage { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.24.8"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.8.tgz"; - sha512 = "isdp+G6DpRyKc+3Gqxy2rjzgF7Zj9K0mzLNnxz+E/fgeag8qT3vVulX4gY9dGO1q0y+0lUv6V3a+uhUzMzrwXg=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.25.6.tgz"; + sha512 = "Z+Doemr4VtvSD2SNHTrkiFZ1LX+JI6tyRXAAOb4N9khIuPyoEPmTPJarPm8ljJV1D6bnMQjyHMWTT9NeKbQuXA=="; }; dependencies = [ sources."@ampproject/remapping-2.3.0" sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.9" - (sources."@babel/core-7.24.9" // { + sources."@babel/compat-data-7.25.4" + (sources."@babel/core-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.10" - (sources."@babel/helper-compilation-targets-7.24.8" // { + sources."@babel/generator-7.25.6" + (sources."@babel/helper-compilation-targets-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.24.7" - sources."@babel/helper-function-name-7.24.7" - sources."@babel/helper-hoist-variables-7.24.7" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.9" + sources."@babel/helper-module-transforms-7.25.2" sources."@babel/helper-simple-access-7.24.7" - sources."@babel/helper-split-export-declaration-7.24.7" sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" sources."@babel/helper-validator-option-7.24.8" - sources."@babel/helpers-7.24.8" + sources."@babel/helpers-7.25.6" sources."@babel/highlight-7.24.7" - sources."@babel/parser-7.24.8" - sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.8" - sources."@babel/types-7.24.9" + sources."@babel/parser-7.25.6" + sources."@babel/template-7.25.0" + sources."@babel/traverse-7.25.6" + sources."@babel/types-7.25.6" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" @@ -57250,17 +55843,17 @@ in sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.23.2" - sources."caniuse-lite-1.0.30001643" + sources."browserslist-4.23.3" + sources."caniuse-lite-1.0.30001662" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."commander-6.2.1" sources."concat-map-0.0.1" sources."convert-source-map-2.0.0" - sources."debug-4.3.5" - sources."electron-to-chromium-1.5.1" - sources."escalade-3.1.2" + sources."debug-4.3.7" + sources."electron-to-chromium-1.5.26" + sources."escalade-3.2.0" sources."escape-string-regexp-1.0.5" sources."fs-readdir-recursive-1.1.0" sources."fs.realpath-1.0.0" @@ -57276,11 +55869,11 @@ in sources."lru-cache-5.1.1" sources."make-dir-2.1.0" sources."minimatch-3.1.2" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."node-releases-2.0.18" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."pify-4.0.1" sources."semver-5.7.2" sources."slash-2.0.0" @@ -57303,10 +55896,10 @@ in "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "19.3.0"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-19.3.0.tgz"; - sha512 = "LgYWOwuDR7BSTQ9OLZ12m7F/qhNY+NpAyPBgo4YNMkACE7lGuUnuQq1yi9hz1KA4+3VqpOYl8H1rY/LYK43v7g=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-19.5.0.tgz"; + sha512 = "gaGqSliGwB86MDmAAKAtV9SV1SHdmN8pnGq4EJU4+hLisQ7IFfx4jvU4s+pk6tl0+9bv6yT+CaZkufOinkSJIQ=="; }; dependencies = [ sources."@babel/code-frame-7.24.7" @@ -57316,23 +55909,23 @@ in sources."chalk-2.4.2" ]; }) - sources."@commitlint/config-validator-19.0.3" - sources."@commitlint/ensure-19.0.3" - sources."@commitlint/execute-rule-19.0.0" - sources."@commitlint/format-19.3.0" - sources."@commitlint/is-ignored-19.2.2" - sources."@commitlint/lint-19.2.2" - sources."@commitlint/load-19.2.0" - sources."@commitlint/message-19.0.0" - sources."@commitlint/parse-19.0.3" - sources."@commitlint/read-19.2.1" - sources."@commitlint/resolve-extends-19.1.0" - sources."@commitlint/rules-19.0.3" - sources."@commitlint/to-lines-19.0.0" - sources."@commitlint/top-level-19.0.0" - sources."@commitlint/types-19.0.3" + sources."@commitlint/config-validator-19.5.0" + sources."@commitlint/ensure-19.5.0" + sources."@commitlint/execute-rule-19.5.0" + sources."@commitlint/format-19.5.0" + sources."@commitlint/is-ignored-19.5.0" + sources."@commitlint/lint-19.5.0" + sources."@commitlint/load-19.5.0" + sources."@commitlint/message-19.5.0" + sources."@commitlint/parse-19.5.0" + sources."@commitlint/read-19.5.0" + sources."@commitlint/resolve-extends-19.5.0" + sources."@commitlint/rules-19.5.0" + sources."@commitlint/to-lines-19.5.0" + sources."@commitlint/top-level-19.5.0" + sources."@commitlint/types-19.5.0" sources."@types/conventional-commits-parser-5.0.0" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."JSONStream-1.3.5" sources."ajv-8.17.1" sources."ansi-regex-5.0.1" @@ -57349,24 +55942,20 @@ in sources."conventional-commits-parser-5.0.0" sources."cosmiconfig-9.0.0" sources."cosmiconfig-typescript-loader-5.0.0" - sources."cross-spawn-7.0.3" sources."dargs-8.1.0" sources."dot-prop-5.3.0" sources."emoji-regex-8.0.0" sources."env-paths-2.2.1" sources."error-ex-1.3.2" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-string-regexp-1.0.5" - sources."execa-8.0.1" sources."fast-deep-equal-3.1.3" sources."fast-uri-3.0.1" sources."find-up-7.0.0" sources."get-caller-file-2.0.5" - sources."get-stream-8.0.1" sources."git-raw-commits-4.0.0" sources."global-directory-4.0.1" sources."has-flag-3.0.0" - sources."human-signals-5.0.0" (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" @@ -57377,9 +55966,7 @@ in sources."is-arrayish-0.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" - sources."is-stream-3.0.0" sources."is-text-path-2.0.0" - sources."isexe-2.0.0" sources."jiti-1.21.6" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -57398,40 +55985,27 @@ in sources."lodash.uniq-4.5.0" sources."lodash.upperfirst-4.3.1" sources."meow-12.1.1" - sources."merge-stream-2.0.0" - sources."mimic-fn-4.0.0" sources."minimist-1.2.8" - (sources."npm-run-path-5.3.0" // { - dependencies = [ - sources."path-key-4.0.0" - ]; - }) - sources."onetime-6.0.0" sources."p-limit-4.0.0" sources."p-locate-6.0.0" sources."parent-module-1.0.1" sources."parse-json-5.2.0" sources."path-exists-5.0.0" - sources."path-key-3.1.1" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."resolve-from-5.0.0" sources."semver-7.6.3" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" sources."split2-4.2.0" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" - sources."strip-final-newline-3.0.0" sources."supports-color-5.5.0" sources."text-extensions-2.4.0" sources."through-2.3.8" - sources."typescript-5.5.4" - sources."undici-types-5.26.5" + sources."tinyexec-0.3.0" + sources."typescript-5.6.2" + sources."undici-types-6.19.8" sources."unicorn-magic-0.1.0" - sources."which-2.0.2" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -57457,22 +56031,22 @@ in "@commitlint/config-conventional" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_config-conventional"; packageName = "@commitlint/config-conventional"; - version = "19.2.2"; + version = "19.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-19.2.2.tgz"; - sha512 = "mLXjsxUVLYEGgzbxbxicGPggDuyWNkf25Ht23owXIH+zV2pv1eJuzLK3t1gDY5Gp6pxdE60jZnWUY5cvgL3ufw=="; + url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-19.5.0.tgz"; + sha512 = "OBhdtJyHNPryZKg0fFpZNOBM1ZDbntMvqMuSmpfyP86XSfwzGw4CaoYRG4RutUPg0BTK07VMRIkNJT6wi2zthg=="; }; dependencies = [ - sources."@commitlint/types-19.0.3" + sources."@commitlint/types-19.5.0" sources."@types/conventional-commits-parser-5.0.0" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."array-ify-1.0.0" sources."chalk-5.3.0" sources."compare-func-2.0.0" sources."conventional-changelog-conventionalcommits-7.0.2" sources."dot-prop-5.3.0" sources."is-obj-2.0.0" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" ]; buildInputs = globalBuildInputs; meta = { @@ -57487,105 +56061,101 @@ in "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; - version = "5.130.2"; + version = "5.134.0"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.130.2.tgz"; - sha512 = "BmTod8PGP61MtJAEl4nsxGrS27dqkCU55NM5V7vh0Vqpl8OkrJXT7Ucvzbm/kbDG3J5d2Clc9pEmbRNiMPjwuw=="; + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.134.0.tgz"; + sha512 = "EgmvlWo9ttBnb6Y8KmHF7lmUsETNlFJz5botRWTNG679KV2s/PxLv4DcBlHjuHhu/2C7cc/Vh8/RxyQQEqpwrQ=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { dependencies = [ - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) - (sources."@azure/core-auth-1.7.2" // { + (sources."@azure/core-auth-1.8.0" // { dependencies = [ sources."@azure/abort-controller-2.1.2" - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) (sources."@azure/core-client-1.9.2" // { dependencies = [ sources."@azure/abort-controller-2.1.2" - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) (sources."@azure/core-http-3.0.4" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."form-data-4.0.0" - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) (sources."@azure/core-lro-2.7.2" // { dependencies = [ sources."@azure/abort-controller-2.1.2" - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) (sources."@azure/core-paging-1.6.2" // { dependencies = [ - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) - (sources."@azure/core-rest-pipeline-1.16.2" // { + (sources."@azure/core-rest-pipeline-1.17.0" // { dependencies = [ sources."@azure/abort-controller-2.1.2" sources."agent-base-7.1.1" sources."https-proxy-agent-7.0.5" - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) (sources."@azure/core-tracing-1.1.2" // { dependencies = [ - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) - (sources."@azure/core-util-1.9.1" // { + (sources."@azure/core-util-1.10.0" // { dependencies = [ sources."@azure/abort-controller-2.1.2" - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) (sources."@azure/identity-4.2.1" // { dependencies = [ - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) - (sources."@azure/logger-1.1.3" // { + (sources."@azure/logger-1.1.4" // { dependencies = [ - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) - sources."@azure/msal-browser-3.20.0" - sources."@azure/msal-common-14.14.0" - sources."@azure/msal-node-2.12.0" + sources."@azure/msal-browser-3.24.0" + sources."@azure/msal-common-14.15.0" + sources."@azure/msal-node-2.14.0" (sources."@azure/storage-blob-12.17.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) sources."@babel/code-frame-7.24.7" - sources."@babel/generator-7.24.10" - sources."@babel/helper-environment-visitor-7.24.7" - sources."@babel/helper-function-name-7.24.7" - sources."@babel/helper-hoist-variables-7.24.7" - sources."@babel/helper-split-export-declaration-7.24.7" + sources."@babel/generator-7.25.6" sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" sources."@babel/highlight-7.24.7" - sources."@babel/parser-7.24.8" - sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.8" - sources."@babel/types-7.24.9" + sources."@babel/parser-7.25.6" + sources."@babel/template-7.25.0" + sources."@babel/traverse-7.25.6" + sources."@babel/types-7.25.6" sources."@devexpress/error-stack-parser-2.0.6" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" - sources."@microsoft/rush-lib-5.130.2" + sources."@microsoft/rush-lib-5.134.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -57621,36 +56191,37 @@ in sources."@pnpm/types-6.4.0" ]; }) - sources."@rushstack/heft-config-file-0.15.2" - (sources."@rushstack/node-core-library-5.5.0" // { + sources."@rushstack/heft-config-file-0.15.7" + sources."@rushstack/lookup-by-path-0.2.2" + (sources."@rushstack/node-core-library-5.9.0" // { dependencies = [ sources."import-lazy-4.0.0" ]; }) - sources."@rushstack/package-deps-hash-4.1.61" - (sources."@rushstack/package-extractor-0.7.20" // { + sources."@rushstack/package-deps-hash-4.1.68" + (sources."@rushstack/package-extractor-0.8.1" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.0.8" ]; }) - (sources."@rushstack/rig-package-0.5.2" // { + (sources."@rushstack/rig-package-0.5.3" // { dependencies = [ sources."strip-json-comments-3.1.1" ]; }) - sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.130.2" - sources."@rushstack/rush-azure-storage-build-cache-plugin-5.130.2" - sources."@rushstack/rush-http-build-cache-plugin-5.130.2" - sources."@rushstack/rush-sdk-5.130.2" - sources."@rushstack/stream-collator-4.1.60" - (sources."@rushstack/terminal-0.13.2" // { + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.134.0" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.134.0" + sources."@rushstack/rush-http-build-cache-plugin-5.134.0" + sources."@rushstack/rush-sdk-5.134.0" + sources."@rushstack/stream-collator-4.1.67" + (sources."@rushstack/terminal-0.14.2" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" ]; }) - (sources."@rushstack/ts-command-line-4.22.2" // { + (sources."@rushstack/ts-command-line-4.22.8" // { dependencies = [ sources."argparse-1.0.10" ]; @@ -57661,16 +56232,16 @@ in sources."@types/lodash-4.17.7" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.5" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/node-fetch-2.6.2" sources."@types/normalize-package-data-2.4.4" sources."@types/parse-json-4.0.2" sources."@types/tunnel-0.0.3" - sources."@vue/compiler-core-3.4.34" - sources."@vue/compiler-dom-3.4.34" - sources."@vue/compiler-sfc-3.4.34" - sources."@vue/compiler-ssr-3.4.34" - sources."@vue/shared-3.4.34" + sources."@vue/compiler-core-3.5.6" + sources."@vue/compiler-dom-3.5.6" + sources."@vue/compiler-sfc-3.5.6" + sources."@vue/compiler-ssr-3.5.6" + sources."@vue/shared-3.5.6" sources."@yarnpkg/lockfile-1.0.2" sources."@zkochan/cmd-shim-5.4.1" sources."agent-base-6.0.2" @@ -57756,7 +56327,7 @@ in ]; }) sources."crypto-random-string-2.0.0" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."debuglog-1.0.1" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.1" // { @@ -57773,7 +56344,7 @@ in (sources."depcheck-1.4.7" // { dependencies = [ sources."argparse-1.0.10" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."js-yaml-3.14.1" sources."minimatch-7.4.6" ]; @@ -57802,7 +56373,7 @@ in sources."end-of-stream-1.4.4" sources."entities-4.5.0" sources."error-ex-1.3.2" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -57849,7 +56420,7 @@ in sources."globals-11.12.0" (sources."globby-11.1.0" // { dependencies = [ - sources."ignore-5.3.1" + sources."ignore-5.3.2" ]; }) (sources."got-9.6.0" // { @@ -57905,7 +56476,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-docker-2.2.1" sources."is-es2016-keyword-1.0.0" sources."is-extglob-2.1.1" @@ -57988,7 +56559,7 @@ in }) sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."magic-string-0.30.10" + sources."magic-string-0.30.11" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.1" @@ -58004,7 +56575,7 @@ in }) sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-3.1.0" @@ -58025,7 +56596,7 @@ in sources."minipass-3.3.6" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multimatch-5.0.0" sources."mute-stream-0.0.8" sources."mz-2.7.0" @@ -58097,7 +56668,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pinkie-2.0.4" @@ -58116,7 +56687,7 @@ in sources."yaml-2.4.1" ]; }) - sources."postcss-8.4.40" + sources."postcss-8.4.47" (sources."preferred-pm-3.1.4" // { dependencies = [ sources."find-up-5.0.0" @@ -58128,7 +56699,7 @@ in sources."prepend-http-2.0.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" sources."pupa-2.1.1" sources."queue-microtask-1.2.3" @@ -58204,11 +56775,11 @@ in sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."sort-keys-4.2.0" - sources."source-map-js-1.2.0" + sources."source-map-js-1.2.1" sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."sprintf-js-1.0.3" sources."ssri-8.0.1" sources."stackframe-1.3.4" @@ -58246,7 +56817,7 @@ in sources."tunnel-0.0.6" sources."type-fest-0.6.0" sources."typedarray-to-buffer-3.1.5" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."unique-string-2.0.0" sources."universalify-0.1.2" (sources."update-notifier-5.1.0" // { @@ -58309,10 +56880,10 @@ in "@shopify/cli" = nodeEnv.buildNodePackage { name = "_at_shopify_slash_cli"; packageName = "@shopify/cli"; - version = "3.64.1"; + version = "3.67.1"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.64.1.tgz"; - sha512 = "7S5SfhlQnk5Rng8t0oh22TEldCSlFm18yWgP+st7blUrk94wsNDiykv3oAYlm8fG6xZzEp80HQZjX7yBYgcQvw=="; + url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.67.1.tgz"; + sha512 = "yThhhrfV4M9cAx8Ng5DPoxEemtPtiIur1jiVJBp8cuooJMTHvjANZ3eOcs9xeKGb5BMzoseZ1jR5Gh8MYGCjQQ=="; }; dependencies = [ sources."@ast-grep/napi-0.11.0" @@ -58366,32 +56937,32 @@ in }; dependencies = [ sources."@alloc/quick-lru-5.2.0" - (sources."@cspotcode/source-map-support-0.8.1" // { + sources."@cspotcode/source-map-support-0.8.1" + sources."@isaacs/cliui-8.0.2" + (sources."@jridgewell/gen-mapping-0.3.5" // { dependencies = [ - sources."@jridgewell/trace-mapping-0.3.9" + sources."@jridgewell/trace-mapping-0.3.25" ]; }) - sources."@isaacs/cliui-8.0.2" - sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.25" + sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.7.1" + sources."@swc/core-1.7.26" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.12" + sources."@swc/helpers-0.5.13" sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.1" + sources."@swc/wasm-1.7.26" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."acorn-8.12.1" - sources."acorn-walk-8.3.3" + sources."acorn-walk-8.3.4" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" sources."any-promise-1.3.0" @@ -58425,13 +56996,13 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.2.1" + sources."foreground-child-3.3.0" sources."function-bind-1.1.2" sources."glob-10.4.5" sources."glob-parent-6.0.2" sources."hasown-2.0.2" sources."is-binary-path-2.1.0" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -58444,7 +57015,7 @@ in sources."lru-cache-10.4.3" sources."make-error-1.3.6" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."minimatch-9.0.5" sources."minipass-7.1.2" sources."mz-2.7.0" @@ -58456,11 +57027,11 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-scurry-1.11.1" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.40" + sources."postcss-8.4.47" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { @@ -58469,7 +57040,7 @@ in ]; }) sources."postcss-nested-6.2.0" - sources."postcss-selector-parser-6.1.1" + sources."postcss-selector-parser-6.1.2" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" @@ -58480,7 +57051,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" - sources."source-map-js-1.2.0" + sources."source-map-js-1.2.1" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -58490,13 +57061,13 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" sources."sucrase-3.35.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.4.6" + sources."tailwindcss-3.4.12" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -58506,9 +57077,9 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.3" - sources."typescript-5.5.4" - sources."undici-types-5.26.5" + sources."tslib-2.7.0" + sources."typescript-5.6.2" + sources."undici-types-6.19.8" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."which-2.0.2" @@ -58521,7 +57092,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.5.0" + sources."yaml-2.5.1" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -58537,39 +57108,61 @@ in "@tailwindcss/forms" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_forms"; packageName = "@tailwindcss/forms"; - version = "0.5.7"; + version = "0.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.7.tgz"; - sha512 = "QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw=="; + url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.9.tgz"; + sha512 = "tM4XVr2+UVTxXJzey9Twx48c1gcxFStqn1pQz0tRsX8o3DvxhN5oY5pvyAbUx7VTaZxpej4Zzvc6h+1RJBzpIg=="; + }; + dependencies = [ + sources."mini-svg-data-uri-1.4.4" + sources."tailwindcss-4.0.0-alpha.24" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A plugin that provides a basic reset for form styles that makes form elements easy to override with utilities."; + homepage = "https://github.com/tailwindlabs/tailwindcss-forms#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + "@tailwindcss/line-clamp" = nodeEnv.buildNodePackage { + name = "_at_tailwindcss_slash_line-clamp"; + packageName = "@tailwindcss/line-clamp"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.4.4.tgz"; + sha512 = "5U6SY5z8N42VtrCrKlsTAA35gy2VSyYtHWCsg1H87NU1SXnEfekTVlrga9fzUDrrHcGi2Lb5KenUWb4lRQT5/g=="; }; dependencies = [ sources."@alloc/quick-lru-5.2.0" - (sources."@cspotcode/source-map-support-0.8.1" // { + sources."@cspotcode/source-map-support-0.8.1" + sources."@isaacs/cliui-8.0.2" + (sources."@jridgewell/gen-mapping-0.3.5" // { dependencies = [ - sources."@jridgewell/trace-mapping-0.3.9" + sources."@jridgewell/trace-mapping-0.3.25" ]; }) - sources."@isaacs/cliui-8.0.2" - sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.25" + sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.7.1" + sources."@swc/core-1.7.26" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.12" + sources."@swc/helpers-0.5.13" sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.1" + sources."@swc/wasm-1.7.26" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."acorn-8.12.1" - sources."acorn-walk-8.3.3" + sources."acorn-walk-8.3.4" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" sources."any-promise-1.3.0" @@ -58603,13 +57196,13 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.2.1" + sources."foreground-child-3.3.0" sources."function-bind-1.1.2" sources."glob-10.4.5" sources."glob-parent-6.0.2" sources."hasown-2.0.2" sources."is-binary-path-2.1.0" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -58622,186 +57215,7 @@ in sources."lru-cache-10.4.3" sources."make-error-1.3.6" sources."merge2-1.4.1" - sources."micromatch-4.0.7" - sources."mini-svg-data-uri-1.4.4" - sources."minimatch-9.0.5" - sources."minipass-7.1.2" - sources."mz-2.7.0" - sources."nanoid-3.3.7" - sources."normalize-path-3.0.0" - sources."object-assign-4.1.1" - sources."object-hash-3.0.0" - sources."package-json-from-dist-1.0.0" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-scurry-1.11.1" - sources."picocolors-1.0.1" - sources."picomatch-2.3.1" - sources."pify-2.3.0" - sources."pirates-4.0.6" - sources."postcss-8.4.40" - sources."postcss-import-15.1.0" - sources."postcss-js-4.0.1" - (sources."postcss-load-config-4.0.2" // { - dependencies = [ - sources."lilconfig-3.1.2" - ]; - }) - sources."postcss-nested-6.2.0" - sources."postcss-selector-parser-6.1.1" - sources."postcss-value-parser-4.2.0" - sources."queue-microtask-1.2.3" - sources."read-cache-1.0.0" - sources."readdirp-3.6.0" - sources."resolve-1.22.8" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."source-map-js-1.2.0" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) - sources."strip-ansi-cjs-6.0.1" - sources."sucrase-3.35.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.4.6" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."to-regex-range-5.0.1" - sources."ts-interface-checker-0.1.13" - (sources."ts-node-10.9.2" // { - dependencies = [ - sources."arg-4.1.3" - ]; - }) - sources."tslib-2.6.3" - sources."typescript-5.5.4" - sources."undici-types-5.26.5" - sources."util-deprecate-1.0.2" - sources."v8-compile-cache-lib-3.0.1" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."yaml-2.5.0" - sources."yn-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A plugin that provides a basic reset for form styles that makes form elements easy to override with utilities."; - homepage = "https://github.com/tailwindlabs/tailwindcss-forms#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - "@tailwindcss/line-clamp" = nodeEnv.buildNodePackage { - name = "_at_tailwindcss_slash_line-clamp"; - packageName = "@tailwindcss/line-clamp"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.4.4.tgz"; - sha512 = "5U6SY5z8N42VtrCrKlsTAA35gy2VSyYtHWCsg1H87NU1SXnEfekTVlrga9fzUDrrHcGi2Lb5KenUWb4lRQT5/g=="; - }; - dependencies = [ - sources."@alloc/quick-lru-5.2.0" - (sources."@cspotcode/source-map-support-0.8.1" // { - dependencies = [ - sources."@jridgewell/trace-mapping-0.3.9" - ]; - }) - sources."@isaacs/cliui-8.0.2" - sources."@jridgewell/gen-mapping-0.3.5" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.25" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.7.1" - sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.12" - sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.1" - sources."@tsconfig/node10-1.0.11" - sources."@tsconfig/node12-1.0.11" - sources."@tsconfig/node14-1.0.3" - sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.14.12" - sources."acorn-8.12.1" - sources."acorn-walk-8.3.3" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."any-promise-1.3.0" - sources."anymatch-3.1.3" - sources."arg-5.0.2" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.3.0" - sources."brace-expansion-2.0.1" - sources."braces-3.0.3" - sources."camelcase-css-2.0.1" - (sources."chokidar-3.6.0" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-4.1.1" - sources."create-require-1.1.1" - sources."cross-spawn-7.0.3" - sources."cssesc-3.0.0" - sources."didyoumean-1.2.2" - sources."diff-4.0.2" - sources."dlv-1.1.3" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - (sources."fast-glob-3.3.2" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - sources."fastq-1.17.1" - sources."fill-range-7.1.1" - sources."foreground-child-3.2.1" - sources."function-bind-1.1.2" - sources."glob-10.4.5" - sources."glob-parent-6.0.2" - sources."hasown-2.0.2" - sources."is-binary-path-2.1.0" - sources."is-core-module-2.15.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."isexe-2.0.0" - sources."jackspeak-3.4.3" - sources."jiti-1.21.6" - sources."lilconfig-2.1.0" - sources."lines-and-columns-1.2.4" - sources."lru-cache-10.4.3" - sources."make-error-1.3.6" - sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."minimatch-9.0.5" sources."minipass-7.1.2" sources."mz-2.7.0" @@ -58813,11 +57227,11 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-scurry-1.11.1" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.40" + sources."postcss-8.4.47" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { @@ -58826,7 +57240,7 @@ in ]; }) sources."postcss-nested-6.2.0" - sources."postcss-selector-parser-6.1.1" + sources."postcss-selector-parser-6.1.2" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" @@ -58837,7 +57251,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" - sources."source-map-js-1.2.0" + sources."source-map-js-1.2.1" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -58847,13 +57261,13 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" sources."sucrase-3.35.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.4.6" + sources."tailwindcss-3.4.12" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -58863,9 +57277,9 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.3" - sources."typescript-5.5.4" - sources."undici-types-5.26.5" + sources."tslib-2.7.0" + sources."typescript-5.6.2" + sources."undici-types-6.19.8" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."which-2.0.2" @@ -58878,7 +57292,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.5.0" + sources."yaml-2.5.1" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -58894,181 +57308,19 @@ in "@tailwindcss/typography" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_typography"; packageName = "@tailwindcss/typography"; - version = "0.5.13"; + version = "0.5.15"; src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.13.tgz"; - sha512 = "ADGcJ8dX21dVVHIwTRgzrcunY6YY9uSlAHHGVKvkA+vLc5qLwEszvKts40lx7z0qc4clpjclwLeK5rVCV2P/uw=="; + url = "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.15.tgz"; + sha512 = "AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA=="; }; dependencies = [ - sources."@alloc/quick-lru-5.2.0" - (sources."@cspotcode/source-map-support-0.8.1" // { - dependencies = [ - sources."@jridgewell/trace-mapping-0.3.9" - ]; - }) - sources."@isaacs/cliui-8.0.2" - sources."@jridgewell/gen-mapping-0.3.5" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.25" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.7.1" - sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.12" - sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.1" - sources."@tsconfig/node10-1.0.11" - sources."@tsconfig/node12-1.0.11" - sources."@tsconfig/node14-1.0.3" - sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.14.12" - sources."acorn-8.12.1" - sources."acorn-walk-8.3.3" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."any-promise-1.3.0" - sources."anymatch-3.1.3" - sources."arg-5.0.2" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.3.0" - sources."brace-expansion-2.0.1" - sources."braces-3.0.3" - sources."camelcase-css-2.0.1" - (sources."chokidar-3.6.0" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-4.1.1" - sources."create-require-1.1.1" - sources."cross-spawn-7.0.3" sources."cssesc-3.0.0" - sources."didyoumean-1.2.2" - sources."diff-4.0.2" - sources."dlv-1.1.3" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - (sources."fast-glob-3.3.2" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - sources."fastq-1.17.1" - sources."fill-range-7.1.1" - sources."foreground-child-3.2.1" - sources."function-bind-1.1.2" - sources."glob-10.4.5" - sources."glob-parent-6.0.2" - sources."hasown-2.0.2" - sources."is-binary-path-2.1.0" - sources."is-core-module-2.15.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."isexe-2.0.0" - sources."jackspeak-3.4.3" - sources."jiti-1.21.6" - sources."lilconfig-2.1.0" - sources."lines-and-columns-1.2.4" sources."lodash.castarray-4.4.0" sources."lodash.isplainobject-4.0.6" sources."lodash.merge-4.6.2" - sources."lru-cache-10.4.3" - sources."make-error-1.3.6" - sources."merge2-1.4.1" - sources."micromatch-4.0.7" - sources."minimatch-9.0.5" - sources."minipass-7.1.2" - sources."mz-2.7.0" - sources."nanoid-3.3.7" - sources."normalize-path-3.0.0" - sources."object-assign-4.1.1" - sources."object-hash-3.0.0" - sources."package-json-from-dist-1.0.0" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-scurry-1.11.1" - sources."picocolors-1.0.1" - sources."picomatch-2.3.1" - sources."pify-2.3.0" - sources."pirates-4.0.6" - sources."postcss-8.4.40" - sources."postcss-import-15.1.0" - sources."postcss-js-4.0.1" - (sources."postcss-load-config-4.0.2" // { - dependencies = [ - sources."lilconfig-3.1.2" - ]; - }) - (sources."postcss-nested-6.2.0" // { - dependencies = [ - sources."postcss-selector-parser-6.1.1" - ]; - }) sources."postcss-selector-parser-6.0.10" - sources."postcss-value-parser-4.2.0" - sources."queue-microtask-1.2.3" - sources."read-cache-1.0.0" - sources."readdirp-3.6.0" - sources."resolve-1.22.8" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."source-map-js-1.2.0" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) - sources."strip-ansi-cjs-6.0.1" - sources."sucrase-3.35.0" - sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tailwindcss-3.4.6" // { - dependencies = [ - sources."postcss-selector-parser-6.1.1" - ]; - }) - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."to-regex-range-5.0.1" - sources."ts-interface-checker-0.1.13" - (sources."ts-node-10.9.2" // { - dependencies = [ - sources."arg-4.1.3" - ]; - }) - sources."tslib-2.6.3" - sources."typescript-5.5.4" - sources."undici-types-5.26.5" + sources."tailwindcss-4.0.0-alpha.24" sources."util-deprecate-1.0.2" - sources."v8-compile-cache-lib-3.0.1" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."yaml-2.5.0" - sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -59083,10 +57335,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "5.0.4"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-5.0.4.tgz"; - sha512 = "JmlTk2EaOMZViEbHXNDTv8fvkIjuS63R0Bf0aqXo5j5BVjQGA2htESvcx73lqtBRqIuGGxPynQ3/cOLr/hdUnA=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-5.1.1.tgz"; + sha512 = "U37u5IHYnnVgNNv3XtSLo/fg40DRIZ9947VYE4RKIWnXx3SsiDLIgydVhViXafHkcl8LZfw9l/sfeNDOqE9NUA=="; }; dependencies = [ sources."@aws-crypto/crc32-5.2.0" @@ -59108,100 +57360,100 @@ in sources."@smithy/util-utf8-2.3.0" ]; }) - sources."@aws-sdk/client-s3-3.617.0" - sources."@aws-sdk/client-sso-3.616.0" - sources."@aws-sdk/client-sso-oidc-3.616.0" - sources."@aws-sdk/client-sts-3.616.0" - sources."@aws-sdk/core-3.616.0" - sources."@aws-sdk/credential-provider-env-3.609.0" - sources."@aws-sdk/credential-provider-http-3.616.0" - sources."@aws-sdk/credential-provider-ini-3.616.0" - sources."@aws-sdk/credential-provider-node-3.616.0" - sources."@aws-sdk/credential-provider-process-3.614.0" - sources."@aws-sdk/credential-provider-sso-3.616.0" - sources."@aws-sdk/credential-provider-web-identity-3.609.0" - (sources."@aws-sdk/lib-storage-3.617.0" // { + sources."@aws-sdk/client-s3-3.654.0" + sources."@aws-sdk/client-sso-3.654.0" + sources."@aws-sdk/client-sso-oidc-3.654.0" + sources."@aws-sdk/client-sts-3.654.0" + sources."@aws-sdk/core-3.654.0" + sources."@aws-sdk/credential-provider-env-3.654.0" + sources."@aws-sdk/credential-provider-http-3.654.0" + sources."@aws-sdk/credential-provider-ini-3.654.0" + sources."@aws-sdk/credential-provider-node-3.654.0" + sources."@aws-sdk/credential-provider-process-3.654.0" + sources."@aws-sdk/credential-provider-sso-3.654.0" + sources."@aws-sdk/credential-provider-web-identity-3.654.0" + (sources."@aws-sdk/lib-storage-3.654.0" // { dependencies = [ sources."buffer-5.6.0" ]; }) - sources."@aws-sdk/middleware-bucket-endpoint-3.616.0" - sources."@aws-sdk/middleware-expect-continue-3.616.0" - (sources."@aws-sdk/middleware-flexible-checksums-3.616.0" // { + sources."@aws-sdk/middleware-bucket-endpoint-3.654.0" + sources."@aws-sdk/middleware-expect-continue-3.654.0" + (sources."@aws-sdk/middleware-flexible-checksums-3.654.0" // { dependencies = [ sources."@smithy/is-array-buffer-3.0.0" ]; }) - sources."@aws-sdk/middleware-host-header-3.616.0" - sources."@aws-sdk/middleware-location-constraint-3.609.0" - sources."@aws-sdk/middleware-logger-3.609.0" - sources."@aws-sdk/middleware-recursion-detection-3.616.0" - sources."@aws-sdk/middleware-sdk-s3-3.617.0" - sources."@aws-sdk/middleware-signing-3.616.0" - sources."@aws-sdk/middleware-ssec-3.609.0" - sources."@aws-sdk/middleware-user-agent-3.616.0" - sources."@aws-sdk/region-config-resolver-3.614.0" - sources."@aws-sdk/s3-presigned-post-3.617.0" - sources."@aws-sdk/s3-request-presigner-3.617.0" - sources."@aws-sdk/signature-v4-multi-region-3.617.0" - sources."@aws-sdk/token-providers-3.614.0" - sources."@aws-sdk/types-3.609.0" + sources."@aws-sdk/middleware-host-header-3.654.0" + sources."@aws-sdk/middleware-location-constraint-3.654.0" + sources."@aws-sdk/middleware-logger-3.654.0" + sources."@aws-sdk/middleware-recursion-detection-3.654.0" + sources."@aws-sdk/middleware-sdk-s3-3.654.0" + sources."@aws-sdk/middleware-ssec-3.654.0" + sources."@aws-sdk/middleware-user-agent-3.654.0" + sources."@aws-sdk/region-config-resolver-3.654.0" + sources."@aws-sdk/s3-presigned-post-3.654.0" + sources."@aws-sdk/s3-request-presigner-3.654.0" + sources."@aws-sdk/signature-v4-multi-region-3.654.0" + sources."@aws-sdk/token-providers-3.654.0" + sources."@aws-sdk/types-3.654.0" sources."@aws-sdk/util-arn-parser-3.568.0" - sources."@aws-sdk/util-endpoints-3.614.0" - sources."@aws-sdk/util-format-url-3.609.0" + sources."@aws-sdk/util-endpoints-3.654.0" + sources."@aws-sdk/util-format-url-3.654.0" sources."@aws-sdk/util-locate-window-3.568.0" - sources."@aws-sdk/util-user-agent-browser-3.609.0" - sources."@aws-sdk/util-user-agent-node-3.614.0" + sources."@aws-sdk/util-user-agent-browser-3.654.0" + sources."@aws-sdk/util-user-agent-node-3.654.0" sources."@aws-sdk/util-utf8-browser-3.259.0" - sources."@aws-sdk/xml-builder-3.609.0" + sources."@aws-sdk/xml-builder-3.654.0" + sources."@babel/runtime-7.25.6" sources."@httptoolkit/websocket-stream-6.0.1" sources."@ioredis/commands-1.2.0" sources."@opentelemetry/api-1.9.0" sources."@sindresorhus/is-5.6.0" - sources."@smithy/abort-controller-3.1.1" + sources."@smithy/abort-controller-3.1.4" sources."@smithy/chunked-blob-reader-3.0.0" sources."@smithy/chunked-blob-reader-native-3.0.0" - sources."@smithy/config-resolver-3.0.5" - sources."@smithy/core-2.3.0" - sources."@smithy/credential-provider-imds-3.2.0" - sources."@smithy/eventstream-codec-3.1.2" - sources."@smithy/eventstream-serde-browser-3.0.5" - sources."@smithy/eventstream-serde-config-resolver-3.0.3" - sources."@smithy/eventstream-serde-node-3.0.4" - sources."@smithy/eventstream-serde-universal-3.0.4" - sources."@smithy/fetch-http-handler-3.2.3" - sources."@smithy/hash-blob-browser-3.1.2" - (sources."@smithy/hash-node-3.0.3" // { + sources."@smithy/config-resolver-3.0.8" + sources."@smithy/core-2.4.3" + sources."@smithy/credential-provider-imds-3.2.3" + sources."@smithy/eventstream-codec-3.1.5" + sources."@smithy/eventstream-serde-browser-3.0.9" + sources."@smithy/eventstream-serde-config-resolver-3.0.6" + sources."@smithy/eventstream-serde-node-3.0.8" + sources."@smithy/eventstream-serde-universal-3.0.8" + sources."@smithy/fetch-http-handler-3.2.7" + sources."@smithy/hash-blob-browser-3.1.5" + (sources."@smithy/hash-node-3.0.6" // { dependencies = [ sources."@smithy/is-array-buffer-3.0.0" sources."@smithy/util-buffer-from-3.0.0" ]; }) - sources."@smithy/hash-stream-node-3.1.2" - sources."@smithy/invalid-dependency-3.0.3" + sources."@smithy/hash-stream-node-3.1.5" + sources."@smithy/invalid-dependency-3.0.6" sources."@smithy/is-array-buffer-2.2.0" - sources."@smithy/md5-js-3.0.3" - sources."@smithy/middleware-content-length-3.0.5" - sources."@smithy/middleware-endpoint-3.1.0" - sources."@smithy/middleware-retry-3.0.12" - sources."@smithy/middleware-serde-3.0.3" - sources."@smithy/middleware-stack-3.0.3" - sources."@smithy/node-config-provider-3.1.4" - sources."@smithy/node-http-handler-3.1.4" - sources."@smithy/property-provider-3.1.3" - sources."@smithy/protocol-http-4.1.0" - sources."@smithy/querystring-builder-3.0.3" - sources."@smithy/querystring-parser-3.0.3" - sources."@smithy/service-error-classification-3.0.3" - sources."@smithy/shared-ini-file-loader-3.1.4" - (sources."@smithy/signature-v4-4.1.0" // { + sources."@smithy/md5-js-3.0.6" + sources."@smithy/middleware-content-length-3.0.8" + sources."@smithy/middleware-endpoint-3.1.3" + sources."@smithy/middleware-retry-3.0.18" + sources."@smithy/middleware-serde-3.0.6" + sources."@smithy/middleware-stack-3.0.6" + sources."@smithy/node-config-provider-3.1.7" + sources."@smithy/node-http-handler-3.2.2" + sources."@smithy/property-provider-3.1.6" + sources."@smithy/protocol-http-4.1.3" + sources."@smithy/querystring-builder-3.0.6" + sources."@smithy/querystring-parser-3.0.6" + sources."@smithy/service-error-classification-3.0.6" + sources."@smithy/shared-ini-file-loader-3.1.7" + (sources."@smithy/signature-v4-4.1.3" // { dependencies = [ sources."@smithy/is-array-buffer-3.0.0" ]; }) - sources."@smithy/smithy-client-3.1.10" - sources."@smithy/types-3.3.0" - sources."@smithy/url-parser-3.0.3" + sources."@smithy/smithy-client-3.3.2" + sources."@smithy/types-3.4.2" + sources."@smithy/url-parser-3.0.6" (sources."@smithy/util-base64-3.0.0" // { dependencies = [ sources."@smithy/is-array-buffer-3.0.0" @@ -59212,13 +57464,13 @@ in sources."@smithy/util-body-length-node-3.0.0" sources."@smithy/util-buffer-from-2.2.0" sources."@smithy/util-config-provider-3.0.0" - sources."@smithy/util-defaults-mode-browser-3.0.12" - sources."@smithy/util-defaults-mode-node-3.0.12" - sources."@smithy/util-endpoints-2.0.5" + sources."@smithy/util-defaults-mode-browser-3.0.18" + sources."@smithy/util-defaults-mode-node-3.0.18" + sources."@smithy/util-endpoints-2.1.2" sources."@smithy/util-hex-encoding-3.0.0" - sources."@smithy/util-middleware-3.0.3" - sources."@smithy/util-retry-3.0.3" - (sources."@smithy/util-stream-3.1.2" // { + sources."@smithy/util-middleware-3.0.6" + sources."@smithy/util-retry-3.0.6" + (sources."@smithy/util-stream-3.1.6" // { dependencies = [ sources."@smithy/is-array-buffer-3.0.0" sources."@smithy/util-buffer-from-3.0.0" @@ -59231,7 +57483,7 @@ in sources."@smithy/util-buffer-from-3.0.0" ]; }) - sources."@smithy/util-waiter-3.1.2" + sources."@smithy/util-waiter-3.1.5" sources."@szmarczak/http-timer-5.0.1" sources."@types/body-parser-1.19.5" sources."@types/connect-3.4.38" @@ -59240,18 +57492,23 @@ in sources."@types/http-cache-semantics-4.0.4" sources."@types/http-errors-2.0.4" sources."@types/mime-1.3.5" - sources."@types/node-20.14.12" - sources."@types/qs-6.9.15" + sources."@types/node-22.5.5" + sources."@types/qs-6.9.16" sources."@types/range-parser-1.2.7" + (sources."@types/readable-stream-4.0.15" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."@types/send-0.17.4" sources."@types/serve-static-1.15.7" - sources."@types/ws-8.5.11" + sources."@types/ws-8.5.12" + sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."array-flatten-1.1.1" sources."asynckit-0.4.0" - sources."aws-crt-1.21.3" - sources."axios-1.7.2" - sources."balanced-match-1.0.2" + sources."aws-crt-1.22.0" + sources."axios-1.7.7" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { dependencies = [ @@ -59259,20 +57516,19 @@ in ]; }) sources."bintrees-1.0.2" - (sources."bl-4.1.0" // { + (sources."bl-6.0.15" // { dependencies = [ - sources."buffer-5.7.1" - sources."readable-stream-3.6.2" + sources."readable-stream-4.5.2" + sources."string_decoder-1.3.0" ]; }) - (sources."body-parser-1.20.2" // { + (sources."body-parser-1.20.3" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) sources."bowser-2.11.0" - sources."brace-expansion-1.1.11" sources."buffer-6.0.3" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.2" @@ -59284,9 +57540,8 @@ in sources."cluster-key-slot-1.1.2" sources."combine-errors-3.0.3" sources."combined-stream-1.0.8" - sources."commist-1.1.0" + sources."commist-3.2.0" sources."common-tags-1.8.2" - sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ sources."readable-stream-3.6.2" @@ -59303,11 +57558,7 @@ in sources."cron-parser-4.9.0" sources."crypto-js-4.2.0" sources."custom-error-instance-2.1.1" - (sources."debug-4.3.5" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) + sources."debug-4.3.7" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -59330,12 +57581,15 @@ in sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" sources."etag-1.8.1" + sources."event-target-shim-5.0.1" sources."events-3.3.0" (sources."express-4.19.2" // { dependencies = [ + sources."body-parser-1.20.2" sources."cookie-0.6.0" sources."debug-2.6.9" sources."ms-2.0.0" + sources."qs-6.11.0" ]; }) (sources."express-interceptor-1.2.0" // { @@ -59353,48 +57607,39 @@ in sources."ms-2.0.0" ]; }) - sources."fast-xml-parser-4.2.5" + sources."fast-safe-stringify-2.1.1" + sources."fast-unique-numbers-8.0.13" + sources."fast-xml-parser-4.4.1" (sources."finalhandler-1.2.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) - sources."follow-redirects-1.15.6" + sources."follow-redirects-1.15.9" sources."form-data-4.0.0" sources."form-data-encoder-2.1.4" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."get-intrinsic-1.2.4" sources."get-stream-6.0.1" - sources."glob-7.2.3" sources."gopd-1.0.1" sources."got-13.0.0" sources."graceful-fs-4.2.11" - (sources."grant-5.4.22" // { - dependencies = [ - sources."qs-6.12.3" - ]; - }) + sources."grant-5.4.22" sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.3" sources."has-symbols-1.0.3" sources."hasown-2.0.2" sources."helmet-7.1.0" - (sources."help-me-3.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) + sources."help-me-5.0.0" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http2-wrapper-2.2.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ioredis-5.4.1" sources."ipaddr.js-2.2.0" @@ -59408,7 +57653,6 @@ in sources."jwa-1.4.1" sources."jws-3.2.2" sources."keyv-4.5.4" - sources."leven-2.1.0" sources."lodash-4.17.21" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" @@ -59429,8 +57673,8 @@ in sources."lodash.uniqby-4.5.0" sources."long-timeout-0.1.1" sources."lowercase-keys-3.0.0" - sources."lru-cache-6.0.0" - sources."luxon-3.4.4" + sources."lru-cache-10.4.3" + sources."luxon-3.5.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -59438,7 +57682,6 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-response-4.0.0" - sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."moment-2.30.1" sources."moment-timezone-0.5.45" @@ -59449,17 +57692,16 @@ in sources."on-finished-2.3.0" ]; }) - (sources."mqtt-4.3.8" // { + (sources."mqtt-5.10.1" // { dependencies = [ - sources."duplexify-4.1.3" - sources."readable-stream-3.6.2" - sources."ws-7.5.10" + sources."readable-stream-4.5.2" + sources."string_decoder-1.3.0" ]; }) - sources."mqtt-packet-6.10.0" + sources."mqtt-packet-9.0.0" sources."ms-2.1.3" sources."negotiator-0.6.3" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."node-schedule-2.1.1" sources."normalize-url-8.0.1" sources."number-allocator-1.0.14" @@ -59471,7 +57713,6 @@ in sources."once-1.4.0" sources."p-cancelable-3.0.0" sources."parseurl-1.3.3" - sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -59483,8 +57724,7 @@ in ]; }) sources."proxy-from-env-1.1.0" - sources."pump-3.0.0" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."querystringify-2.2.0" sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" @@ -59498,8 +57738,9 @@ in }) sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" + sources."regenerator-runtime-0.14.1" sources."reinterval-1.1.0" - sources."request-compose-2.1.6" + sources."request-compose-2.1.7" (sources."request-oauth-1.0.1" // { dependencies = [ sources."uuid-8.3.2" @@ -59530,11 +57771,7 @@ in sources."side-channel-1.0.6" sources."signal-exit-3.0.7" sources."sorted-array-functions-1.3.0" - (sources."split2-3.2.2" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) + sources."split2-4.2.0" sources."standard-as-callback-2.1.0" sources."statuses-2.0.1" (sources."stream-browserify-3.0.0" // { @@ -59552,26 +57789,28 @@ in sources."supports-color-8.1.1" sources."tdigest-0.1.2" sources."toidentifier-1.0.1" - sources."tslib-2.6.3" - sources."tus-js-client-4.1.0" + sources."tslib-2.7.0" + sources."tus-js-client-4.2.3" sources."type-fest-2.19.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uid-safe-2.1.5" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."unpipe-1.0.0" sources."url-parse-1.5.10" sources."url-value-parser-2.2.0" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.4" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-9.0.1" sources."validator-13.12.0" sources."vary-1.1.2" + sources."worker-timers-7.1.8" + sources."worker-timers-broker-6.1.8" + sources."worker-timers-worker-7.0.71" sources."wrappy-1.0.2" sources."ws-8.17.1" sources."xtend-4.0.2" - sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -59708,13 +57947,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.24.7" - sources."@babel/generator-7.24.10" + sources."@babel/generator-7.25.6" sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" sources."@babel/highlight-7.24.7" - sources."@babel/parser-7.24.8" - sources."@babel/template-7.24.7" - sources."@babel/types-7.24.9" + sources."@babel/parser-7.25.6" + sources."@babel/template-7.25.0" + sources."@babel/types-7.25.6" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" @@ -59740,7 +57979,7 @@ in sources."has-flag-3.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" ]; @@ -59811,13 +58050,13 @@ in sources."graceful-fs-4.2.10" ]; }) - sources."@pnpm/npm-conf-2.2.2" + sources."@pnpm/npm-conf-2.3.1" sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/acorn-4.0.6" sources."@types/concat-stream-2.0.3" sources."@types/debug-4.1.12" - sources."@types/estree-1.0.5" + sources."@types/estree-1.0.6" sources."@types/estree-jsx-1.0.5" sources."@types/hast-2.3.10" sources."@types/http-cache-semantics-4.0.4" @@ -59826,10 +58065,10 @@ in sources."@types/minimist-1.2.5" sources."@types/ms-0.7.34" sources."@types/nlcst-1.0.4" - sources."@types/node-18.19.42" + sources."@types/node-18.19.50" sources."@types/normalize-package-data-2.4.4" sources."@types/supports-color-8.1.3" - sources."@types/unist-2.0.10" + sources."@types/unist-2.0.11" sources."abbrev-2.0.0" sources."acorn-8.12.1" sources."acorn-jsx-5.3.2" @@ -59894,7 +58133,7 @@ in ]; }) sources."cuss-2.2.0" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."decamelize-6.0.0" (sources."decamelize-keys-1.1.1" // { dependencies = [ @@ -59926,7 +58165,7 @@ in sources."extend-3.0.2" sources."fault-2.0.1" sources."find-up-6.3.0" - sources."foreground-child-3.2.1" + sources."foreground-child-3.3.0" sources."form-data-encoder-2.1.4" sources."format-0.2.2" sources."from-0.1.7" @@ -59958,14 +58197,14 @@ in sources."hast-util-to-string-2.0.0" sources."hast-util-whitespace-2.0.1" sources."hastscript-7.2.0" - sources."hosted-git-info-5.2.1" + sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.1" (sources."http2-wrapper-2.2.1" // { dependencies = [ sources."quick-lru-5.1.1" ]; }) - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."import-lazy-4.0.0" sources."import-meta-resolve-2.2.2" sources."imurmurhash-0.1.4" @@ -59982,7 +58221,7 @@ in sources."ci-info-3.9.0" ]; }) - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-decimal-2.0.1" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-3.0.0" @@ -60010,7 +58249,7 @@ in sources."locate-path-7.2.0" sources."longest-streak-3.1.0" sources."lowercase-keys-3.0.0" - sources."lru-cache-7.18.3" + sources."lru-cache-6.0.0" sources."map-obj-4.3.0" sources."map-stream-0.1.0" sources."markdown-table-3.0.3" @@ -60080,13 +58319,18 @@ in sources."minimist-options-4.1.0" sources."minipass-7.1.2" sources."mri-1.2.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."nlcst-is-literal-2.1.1" sources."nlcst-normalize-3.1.1" sources."nlcst-search-3.1.1" sources."nlcst-to-string-3.1.1" sources."nopt-7.2.1" - sources."normalize-package-data-4.0.1" + (sources."normalize-package-data-4.0.1" // { + dependencies = [ + sources."hosted-git-info-5.2.1" + sources."lru-cache-7.18.3" + ]; + }) sources."normalize-url-8.0.1" sources."npm-normalize-package-bin-3.0.1" sources."object-keys-0.4.0" @@ -60118,7 +58362,7 @@ in ]; }) sources."pause-stream-0.0.11" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."pluralize-8.0.0" sources."proc-log-3.0.0" sources."process-nextick-args-1.0.7" @@ -60141,8 +58385,6 @@ in }) (sources."read-pkg-7.1.0" // { dependencies = [ - sources."hosted-git-info-4.1.0" - sources."lru-cache-6.0.0" sources."normalize-package-data-3.0.3" sources."type-fest-2.19.0" ]; @@ -60186,7 +58428,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -60206,7 +58448,7 @@ in sources."stringify-entities-4.0.4" (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" @@ -60310,7 +58552,7 @@ in sources."xdg-basedir-5.1.0" sources."xtend-2.1.2" sources."yallist-4.0.0" - sources."yaml-2.5.0" + sources."yaml-2.5.1" sources."yargs-parser-21.1.1" sources."yocto-queue-1.1.1" sources."zwitch-2.0.4" @@ -60378,14 +58620,11 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.150.0"; + version = "2.159.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.150.0.tgz"; - sha512 = "leo4J70QrJp+SYm/87VuoOVfALsW11F7JpkAGu5TLL/qd2k/CbovZ8k9/3Ov+jCVsvAgdn9DeHL01Sn6hSl6Zg=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.159.1.tgz"; + sha512 = "bkJOxic/NpJYQCF3MQhfyJVlFtIzMJeVGZp9jZa7TczxJp79Q/TNKzVJYv6GFabNS1wglGPfWkFB/rIJlRhJkg=="; }; - dependencies = [ - sources."fsevents-2.3.2" - ]; buildInputs = globalBuildInputs; meta = { description = "CDK Toolkit, the command line tool for CDK apps"; @@ -60420,8 +58659,8 @@ in sources."@sindresorhus/merge-streams-4.0.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/debug-4.1.12" - sources."@types/eslint-8.56.11" - sources."@types/estree-1.0.5" + sources."@types/eslint-8.56.12" + sources."@types/estree-1.0.6" sources."@types/estree-jsx-1.0.5" sources."@types/hast-3.0.4" sources."@types/http-cache-semantics-4.0.4" @@ -60429,13 +58668,13 @@ in sources."@types/mdast-4.0.4" sources."@types/ms-0.7.34" sources."@types/normalize-package-data-2.4.4" - sources."@types/unist-3.0.2" + sources."@types/unist-3.0.3" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-3.2.1" sources."append-type-1.0.2" sources."array-to-sentence-1.1.0" @@ -60458,7 +58697,7 @@ in sources."character-entities-html4-2.1.0" sources."character-entities-legacy-3.0.0" sources."character-reference-invalid-2.0.1" - sources."cli-cursor-4.0.0" + sources."cli-cursor-5.0.0" sources."cli-spinners-2.9.2" sources."co-3.1.0" sources."collapse-white-space-2.1.0" @@ -60471,7 +58710,7 @@ in sources."type-fest-1.4.0" ]; }) - sources."debug-4.3.5" + sources."debug-4.3.7" sources."decode-named-character-reference-1.0.2" (sources."decompress-response-6.0.0" // { dependencies = [ @@ -60481,7 +58720,7 @@ in sources."defer-to-connect-2.0.1" sources."dequal-2.0.3" sources."devlop-1.1.0" - sources."emoji-regex-10.3.0" + sources."emoji-regex-10.4.0" sources."escape-string-regexp-1.0.5" (sources."eslint-formatter-pretty-5.0.0" // { dependencies = [ @@ -60500,7 +58739,7 @@ in ]; }) sources."eslint-rule-docs-1.1.235" - sources."execa-9.3.0" + sources."execa-9.4.0" sources."extend-3.0.2" sources."fast-glob-3.3.2" sources."fastq-1.17.1" @@ -60518,6 +58757,7 @@ in (sources."globby-14.0.2" // { dependencies = [ sources."@sindresorhus/merge-streams-2.3.0" + sources."unicorn-magic-0.1.0" ]; }) (sources."got-13.0.0" // { @@ -60530,8 +58770,8 @@ in sources."hosted-git-info-7.0.2" sources."http-cache-semantics-4.1.1" sources."http2-wrapper-2.2.1" - sources."human-signals-7.0.0" - sources."ignore-5.3.1" + sources."human-signals-8.0.0" + sources."ignore-5.3.2" sources."index-to-position-0.1.2" sources."indexed-filter-1.0.3" sources."inflight-1.0.6" @@ -60551,7 +58791,7 @@ in sources."is-number-7.0.0" sources."is-plain-obj-4.1.0" sources."is-stream-4.0.1" - sources."is-unicode-supported-2.0.0" + sources."is-unicode-supported-2.1.0" sources."is-url-1.2.4" sources."is-url-superb-6.1.0" sources."isexe-2.0.0" @@ -60573,8 +58813,8 @@ in sources."mdast-util-from-markdown-2.0.1" sources."mdast-util-heading-style-3.0.0" sources."mdast-util-mdx-3.0.0" - sources."mdast-util-mdx-expression-2.0.0" - sources."mdast-util-mdx-jsx-3.1.2" + sources."mdast-util-mdx-expression-2.0.1" + sources."mdast-util-mdx-jsx-3.1.3" sources."mdast-util-mdxjs-esm-2.0.1" sources."mdast-util-phrasing-4.1.0" sources."mdast-util-to-markdown-2.1.0" @@ -60602,26 +58842,26 @@ in sources."micromark-util-subtokenize-2.0.1" sources."micromark-util-symbol-2.0.0" sources."micromark-util-types-2.0.0" - sources."micromatch-4.0.7" - sources."mimic-fn-2.1.0" + sources."micromatch-4.0.8" + sources."mimic-function-5.0.1" sources."mimic-response-4.0.0" sources."minimatch-3.1.2" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."normalize-package-data-6.0.2" sources."normalize-url-8.0.1" - (sources."npm-run-path-5.3.0" // { + (sources."npm-run-path-6.0.0" // { dependencies = [ sources."path-key-4.0.0" ]; }) sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-5.1.2" - sources."ora-8.0.1" + sources."onetime-7.0.0" + sources."ora-8.1.0" sources."p-cancelable-3.0.0" (sources."parse-entities-4.0.1" // { dependencies = [ - sources."@types/unist-2.0.10" + sources."@types/unist-2.0.11" ]; }) sources."parse-github-url-1.0.3" @@ -60630,7 +58870,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-type-5.0.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."plur-4.0.0" sources."pluralize-8.0.0" @@ -60638,7 +58878,11 @@ in sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."quotation-2.0.3" - sources."read-pkg-9.0.1" + (sources."read-pkg-9.0.1" // { + dependencies = [ + sources."unicorn-magic-0.1.0" + ]; + }) sources."remark-15.0.1" sources."remark-lint-10.0.0" sources."remark-lint-blockquote-indentation-4.0.0" @@ -60649,7 +58893,7 @@ in sources."remark-lint-definition-spacing-4.0.0" (sources."remark-lint-double-link-0.2.0" // { dependencies = [ - sources."@types/unist-2.0.10" + sources."@types/unist-2.0.11" sources."normalize-url-5.3.1" sources."unified-10.1.2" sources."unified-lint-rule-2.1.2" @@ -60679,7 +58923,7 @@ in (sources."remark-lint-no-auto-link-without-protocol-3.1.2" // { dependencies = [ sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" + sources."@types/unist-2.0.11" sources."mdast-util-to-string-3.2.0" sources."unified-10.1.2" sources."unified-lint-rule-2.1.2" @@ -60715,7 +58959,7 @@ in (sources."remark-lint-no-inline-padding-4.1.2" // { dependencies = [ sources."@types/mdast-3.0.15" - sources."@types/unist-2.0.10" + sources."@types/unist-2.0.11" sources."mdast-util-to-string-3.2.0" sources."unified-10.1.2" sources."unified-lint-rule-2.1.2" @@ -60753,11 +58997,7 @@ in sources."remark-stringify-11.0.0" sources."resolve-alpn-1.2.1" sources."responselike-3.0.0" - (sources."restore-cursor-4.0.0" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) + sources."restore-cursor-5.1.0" sources."reusify-1.0.4" sources."rimraf-2.7.1" sources."rmfr-2.0.0" @@ -60772,7 +59012,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."stdin-discarder-0.2.2" sources."string-width-7.2.0" sources."stringify-entities-4.0.4" @@ -60795,8 +59035,8 @@ in sources."to-regex-range-5.0.1" sources."to-vfile-8.0.0" sources."trough-2.2.0" - sources."type-fest-4.23.0" - sources."unicorn-magic-0.1.0" + sources."type-fest-4.26.1" + sources."unicorn-magic-0.3.0" sources."unified-11.0.5" sources."unified-lint-rule-3.0.0" sources."unified-message-control-5.0.0" @@ -60806,7 +59046,7 @@ in sources."unist-util-find-all-before-5.0.0" (sources."unist-util-find-all-between-2.1.0" // { dependencies = [ - sources."@types/unist-2.0.10" + sources."@types/unist-2.0.11" sources."unist-util-find-1.0.4" sources."unist-util-is-4.1.0" sources."unist-util-visit-2.0.3" @@ -60817,7 +59057,6 @@ in sources."unist-util-is-6.0.0" sources."unist-util-map-1.0.5" sources."unist-util-position-5.0.0" - sources."unist-util-remove-position-5.0.0" sources."unist-util-stringify-position-4.0.0" (sources."unist-util-to-list-of-char-0.1.3" // { dependencies = [ @@ -60834,7 +59073,7 @@ in ]; }) sources."validate-npm-package-license-3.0.4" - sources."vfile-6.0.2" + sources."vfile-6.0.3" sources."vfile-location-5.0.3" sources."vfile-message-4.0.2" sources."vfile-reporter-pretty-7.0.0" @@ -60874,140 +59113,6 @@ in bypassCache = true; reconstructLock = true; }; - bower2nix = nodeEnv.buildNodePackage { - name = "bower2nix"; - packageName = "bower2nix"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.2.0.tgz"; - sha512 = "oNHyIWiU5OpUoDCSSRCZQ6JkXyBgtyi+odbv+XSmO6/KCn3B4SRT3/d+QKNj5UQ8KRsrBAI0Ry7CG2OtqrFE1A=="; - }; - dependencies = [ - sources."argparse-1.0.4" - sources."array-find-index-1.0.2" - sources."balanced-match-1.0.2" - sources."bower-1.8.14" - sources."bower-endpoint-parser-0.2.1" - sources."bower-json-0.6.0" - sources."bower-logger-0.2.1" - sources."brace-expansion-1.1.11" - sources."camelcase-2.1.1" - sources."camelcase-keys-2.1.0" - sources."concat-map-0.0.1" - sources."currently-unhandled-0.4.1" - sources."debug-2.6.9" - sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" - sources."ends-with-0.2.0" - sources."error-ex-1.3.2" - sources."ext-list-2.2.2" - sources."ext-name-3.0.0" - sources."find-up-1.1.2" - (sources."fs-extra-0.26.7" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."get-stdin-4.0.1" - sources."glob-6.0.4" - sources."graceful-fs-3.0.12" - sources."hasown-2.0.2" - sources."hosted-git-info-2.8.9" - sources."indent-string-2.1.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."intersect-1.0.1" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.15.0" - sources."is-finite-1.1.0" - sources."is-plain-obj-1.1.0" - sources."is-utf8-0.2.1" - (sources."jsonfile-2.4.0" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - (sources."klaw-1.3.1" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - sources."lodash-4.2.1" - sources."loud-rejection-1.6.0" - sources."map-obj-1.0.1" - sources."meow-3.7.0" - sources."mime-db-1.53.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.0.0" - sources."natives-1.1.6" - sources."normalize-package-data-2.5.0" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."os-tmpdir-1.0.2" - sources."parse-json-2.2.0" - sources."path-exists-2.1.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."promised-temp-0.1.0" - sources."q-1.5.1" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."redent-1.0.0" - sources."repeating-2.0.1" - sources."resolve-1.22.8" - (sources."rimraf-2.7.1" // { - dependencies = [ - sources."glob-7.2.3" - ]; - }) - sources."semver-5.7.2" - sources."signal-exit-3.0.7" - sources."sort-keys-1.1.2" - sources."sort-keys-length-1.0.1" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" - sources."sprintf-js-1.0.3" - sources."strip-bom-2.0.0" - sources."strip-indent-1.0.1" - sources."supports-preserve-symlinks-flag-1.0.0" - (sources."temp-0.8.3" // { - dependencies = [ - sources."rimraf-2.2.8" - ]; - }) - sources."trim-newlines-1.0.0" - sources."validate-npm-package-license-3.0.4" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Generate nix expressions to fetch bower dependencies"; - homepage = "https://github.com/rvl/bower2nix"; - license = "GPL-3.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; @@ -61086,7 +59191,7 @@ in }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - (sources."elliptic-6.5.6" // { + (sources."elliptic-6.5.7" // { dependencies = [ sources."bn.js-4.12.0" ]; @@ -61126,7 +59231,7 @@ in sources."is-arguments-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.7" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-generator-function-1.0.10" sources."is-typed-array-1.1.13" sources."isarray-1.0.0" @@ -61171,7 +59276,7 @@ in ]; }) sources."punycode-1.4.1" - sources."qs-6.12.3" + sources."qs-6.13.0" sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" @@ -61215,7 +59320,7 @@ in sources."typedarray-0.0.6" sources."umd-3.0.3" sources."undeclared-identifiers-1.1.3" - sources."url-0.11.3" + sources."url-0.11.4" sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" @@ -61245,7 +59350,7 @@ in sources."@socket.io/component-emitter-3.1.2" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.17" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -61279,7 +59384,7 @@ in sources."connect-history-api-fallback-1.6.0" sources."cookie-0.4.2" sources."cors-2.8.5" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."depd-2.0.0" sources."destroy-1.0.4" sources."dev-ip-1.0.1" @@ -61291,7 +59396,7 @@ in sources."engine.io-6.5.5" sources."engine.io-client-6.5.4" sources."engine.io-parser-5.2.3" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" @@ -61302,7 +59407,7 @@ in sources."ms-2.0.0" ]; }) - sources."follow-redirects-1.15.6" + sources."follow-redirects-1.15.9" sources."fresh-0.5.2" sources."fs-extra-3.0.1" sources."get-caller-file-2.0.5" @@ -61329,15 +59434,15 @@ in sources."limiter-1.1.5" sources."lodash-4.17.21" sources."lodash.isfinite-3.3.2" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mime-1.4.1" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."mitt-1.2.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."negotiator-0.6.3" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" @@ -61394,8 +59499,8 @@ in sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."ua-parser-js-1.0.38" - sources."undici-types-5.26.5" + sources."ua-parser-js-1.0.39" + sources."undici-types-6.19.8" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utf-8-validate-6.0.4" @@ -61421,154 +59526,67 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.198.175"; + version = "2.198.223"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.198.175.tgz"; - sha512 = "4p2thnOpOFZgBQ2OmiFT6llXRy09d4aHGkTPYx4OQzzFLGKEJ5wDMVJrZPvuOu1czvYrxk3jsULluouRbAgXqQ=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.198.223.tgz"; + sha512 = "NYoBcme9tE0khTXKt2e7KxEnuqxXeQA8ELSmM+6587dzUYqYp5m2u6qC7KGwSR6GlVgEmXecwhQcHveDQTe9HA=="; }; dependencies = [ - sources."@colors/colors-1.6.0" - sources."@dabh/diagnostics-2.0.3" - sources."@jsii/check-node-1.101.0" - sources."@jsii/spec-1.101.0" + sources."@jsii/check-node-1.103.1" + sources."@jsii/spec-1.103.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.6.0" - sources."@octokit/endpoint-6.0.12" - sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-12.11.0" - sources."@octokit/plugin-paginate-rest-2.21.3" - sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.16.2" - sources."@octokit/request-5.6.3" - sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.12.0" - sources."@octokit/types-6.41.0" - sources."@types/node-16.18.104" - sources."@types/triple-beam-1.3.5" - sources."@xmldom/xmldom-0.8.10" - sources."aggregate-error-3.1.0" + sources."@types/node-16.18.108" + sources."@xmldom/xmldom-0.9.2" sources."ajv-8.17.1" - sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."array-buffer-byte-length-1.0.1" - sources."array-union-2.1.0" - sources."arraybuffer.prototype.slice-1.0.3" sources."astral-regex-2.0.0" - sources."async-3.2.5" - sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."available-typed-arrays-1.0.7" - sources."axios-0.27.2" - (sources."backport-8.5.0" // { - dependencies = [ - sources."yargs-17.7.2" - ]; - }) sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."before-after-hook-2.2.3" - sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.3" - sources."buffer-5.7.1" - sources."call-bind-1.0.7" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.68.87" - sources."cdk8s-plus-25-2.22.79" + sources."cdk8s-2.69.4" + sources."cdk8s-plus-28-2.5.6" sources."chalk-4.1.2" - sources."chardet-0.7.0" - sources."clean-stack-2.2.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.2" - sources."cli-width-3.0.0" - (sources."cliui-8.0.1" // { - dependencies = [ - sources."wrap-ansi-7.0.0" - ]; - }) - sources."clone-1.0.4" - (sources."codemaker-1.101.0" // { + sources."cliui-7.0.4" + sources."clone-2.1.2" + (sources."codemaker-1.103.1" // { dependencies = [ sources."fs-extra-10.1.0" ]; }) - (sources."color-3.2.1" // { - dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-string-1.9.1" sources."colors-1.4.0" - sources."colorspace-1.1.4" - sources."combined-stream-1.0.8" - sources."commonmark-0.31.0" + sources."commonmark-0.31.2" sources."concat-map-0.0.1" sources."constructs-10.3.0" - sources."data-view-buffer-1.0.1" - sources."data-view-byte-length-1.0.1" - sources."data-view-byte-offset-1.0.0" sources."date-format-4.0.14" - (sources."debug-4.3.5" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) + sources."debug-4.3.7" sources."decamelize-5.0.1" - sources."dedent-0.7.0" - sources."defaults-1.0.4" - sources."define-data-property-1.1.4" - sources."define-properties-1.2.1" - sources."del-6.1.1" - sources."delayed-stream-1.0.0" - sources."deprecation-2.3.1" sources."detect-indent-5.0.0" sources."detect-newline-2.1.0" - sources."dir-glob-3.0.1" sources."dot-case-3.0.4" - sources."dotenv-16.4.5" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.6.0-dev.20240725" + sources."typescript-5.7.0-dev.20240920" ]; }) sources."emoji-regex-8.0.0" - sources."enabled-2.0.0" - sources."encoding-0.1.13" sources."entities-3.0.1" - sources."es-abstract-1.23.3" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."es-object-atoms-1.0.0" - sources."es-set-tostringtag-2.0.3" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.2" - sources."escape-string-regexp-1.0.5" - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) + sources."escalade-3.2.0" + sources."escape-string-regexp-4.0.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" sources."fast-uri-3.0.1" sources."fastq-1.17.1" - sources."fecha-4.2.3" - sources."figures-3.2.0" sources."fill-range-7.1.1" - sources."find-up-5.0.0" + sources."find-up-4.1.0" sources."flatted-3.3.1" - sources."fn.name-1.1.0" - sources."follow-redirects-1.15.6" - sources."for-each-0.3.3" - sources."form-data-4.0.0" (sources."fs-extra-8.1.0" // { dependencies = [ sources."jsonfile-4.0.0" @@ -61577,168 +59595,88 @@ in }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" - sources."function.prototype.name-1.1.6" - sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.4" - sources."get-symbol-description-1.0.2" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globalthis-1.0.4" - sources."globby-11.1.0" - sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."graphql-16.9.0" - sources."graphql-tag-2.12.6" - sources."has-bigints-1.0.2" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.2" sources."hasown-2.0.2" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."ignore-5.3.1" - sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-8.2.6" - sources."internal-slot-1.0.7" sources."interpret-1.4.0" - sources."is-array-buffer-3.0.4" - sources."is-arrayish-0.3.2" - sources."is-bigint-1.0.4" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.7" - sources."is-core-module-2.15.0" - sources."is-data-view-1.0.1" - sources."is-date-object-1.0.5" + sources."is-core-module-2.15.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" - sources."is-interactive-1.0.0" - sources."is-negative-zero-2.0.3" sources."is-number-7.0.0" - sources."is-number-object-1.0.7" - sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.3" - sources."is-plain-object-5.0.0" - sources."is-regex-1.1.4" - sources."is-shared-array-buffer-1.0.3" - sources."is-stream-2.0.1" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.13" - sources."is-unicode-supported-0.1.0" - sources."is-weakref-1.0.2" - sources."isarray-2.0.5" - (sources."jsii-5.4.26" // { + (sources."jsii-5.5.4" // { dependencies = [ + sources."cliui-8.0.1" sources."yargs-17.7.2" + sources."yargs-parser-21.1.1" ]; }) - (sources."jsii-pacmak-1.101.0" // { + (sources."jsii-pacmak-1.103.1" // { dependencies = [ - sources."cliui-7.0.4" - sources."clone-2.1.2" - sources."escape-string-regexp-4.0.0" sources."fs-extra-10.1.0" - sources."wrap-ansi-7.0.0" sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.101.0" // { + (sources."jsii-reflect-1.103.1" // { dependencies = [ - sources."cliui-7.0.4" sources."fs-extra-10.1.0" - sources."wrap-ansi-7.0.0" sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-5.4.25" // { + (sources."jsii-rosetta-5.5.5" // { dependencies = [ + sources."cliui-8.0.1" sources."yargs-17.7.2" + sources."yargs-parser-21.1.1" ]; }) - (sources."jsii-srcmak-0.1.1193" // { + (sources."jsii-srcmak-0.1.1236" // { dependencies = [ + sources."cliui-8.0.1" sources."fs-extra-9.1.0" sources."yargs-17.7.2" + sources."yargs-parser-21.1.1" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.4.4" + sources."json2jsii-0.5.0" sources."jsonfile-6.1.0" - sources."kuler-2.0.0" - sources."locate-path-6.0.0" - sources."lodash-4.17.21" + sources."locate-path-5.0.0" sources."lodash.truncate-4.4.2" - sources."log-symbols-4.1.0" sources."log4js-6.9.1" - sources."logform-2.6.1" sources."lower-case-2.0.2" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) sources."mdurl-1.0.1" sources."merge2-1.4.1" - sources."micromatch-4.0.7" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" + sources."micromatch-4.0.8" sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."ms-2.1.3" - sources."mute-stream-0.0.8" sources."ncp-2.0.0" sources."no-case-3.0.4" - sources."node-fetch-2.7.0" - sources."object-inspect-1.13.2" - sources."object-keys-1.1.1" - sources."object.assign-4.1.5" sources."once-1.4.0" - sources."one-time-1.0.0" - sources."onetime-5.1.2" - sources."oo-ascii-tree-1.101.0" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."p-map-4.0.0" + sources."oo-ascii-tree-1.103.1" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."path-type-4.0.0" sources."picomatch-2.3.1" - sources."possible-typed-array-names-1.0.0" sources."queue-microtask-1.2.3" - sources."readable-stream-3.6.2" sources."rechoir-0.6.2" - sources."regexp.prototype.flags-1.5.2" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" sources."resolve-1.22.8" - sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."rfdc-1.4.1" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.8.1" - sources."safe-array-concat-1.1.2" - sources."safe-buffer-5.2.1" - sources."safe-json-stringify-1.2.0" - sources."safe-regex-test-1.0.3" - sources."safe-stable-stringify-2.4.3" - sources."safer-buffer-2.1.2" sources."semver-7.6.3" (sources."semver-intersect-1.5.0" // { dependencies = [ @@ -61746,82 +59684,42 @@ in ]; }) sources."set-blocking-2.0.0" - sources."set-function-length-1.2.2" - sources."set-function-name-2.0.2" sources."shelljs-0.8.5" - sources."side-channel-1.0.6" - sources."signal-exit-3.0.7" - sources."simple-swizzle-0.2.2" - sources."slash-3.0.0" sources."slice-ansi-4.0.0" sources."snake-case-3.0.4" sources."sort-json-2.0.1" sources."spdx-license-list-6.9.0" sources."sscaff-1.2.274" - sources."stack-trace-0.0.10" sources."stream-chain-2.2.5" sources."stream-json-1.8.0" sources."streamroller-3.1.5" sources."string-width-4.2.3" - sources."string.prototype.repeat-1.0.0" - sources."string.prototype.trim-1.2.9" - sources."string.prototype.trimend-1.0.8" - sources."string.prototype.trimstart-1.0.8" - sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" - sources."strip-json-comments-3.1.1" sources."supports-color-7.2.0" - sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."table-6.8.2" - sources."terminal-link-2.1.1" - sources."text-hex-1.0.0" - sources."through-2.3.8" - sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."triple-beam-1.4.1" - sources."tslib-2.6.3" - sources."type-fest-0.21.3" - sources."typed-array-buffer-1.0.2" - sources."typed-array-byte-length-1.0.1" - sources."typed-array-byte-offset-1.0.2" - sources."typed-array-length-1.0.6" - sources."typescript-5.4.5" - sources."unbox-primitive-1.0.2" - sources."universal-user-agent-6.0.1" + sources."tslib-2.7.0" + sources."typescript-5.5.4" sources."universalify-2.0.1" - sources."util-deprecate-1.0.2" - sources."utility-types-3.11.0" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.1" - sources."which-typed-array-1.1.15" - sources."winston-3.13.1" - sources."winston-transport-4.7.1" sources."workerpool-6.5.1" - sources."wrap-ansi-6.2.0" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" - sources."yaml-2.4.5" + sources."yaml-2.5.1" (sources."yargs-15.4.1" // { dependencies = [ sources."camelcase-5.3.1" sources."cliui-6.0.0" sources."decamelize-1.2.0" - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."wrap-ansi-6.2.0" sources."y18n-4.0.3" sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-21.1.1" - sources."yocto-queue-0.1.0" + sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; meta = { @@ -61863,7 +59761,11 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.24.8" + (sources."@babel/parser-7.25.6" // { + dependencies = [ + sources."@babel/types-7.25.6" + ]; + }) sources."@babel/template-7.24.7" sources."@babel/types-7.24.7" (sources."@cdktf/cli-core-0.20.8" // { @@ -61937,10 +59839,11 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.12" + sources."@types/node-20.16.5" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" + sources."undici-types-6.19.8" sources."wrap-ansi-6.2.0" ]; }) @@ -61948,18 +59851,20 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.12" + sources."@types/node-20.16.5" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" + sources."undici-types-6.19.8" sources."wrap-ansi-6.2.0" ]; }) (sources."@inquirer/core-2.3.1" // { dependencies = [ - sources."@types/node-20.14.12" + sources."@types/node-20.16.5" sources."ansi-escapes-4.3.2" sources."type-fest-0.21.3" + sources."undici-types-6.19.8" sources."wrap-ansi-6.2.0" ]; }) @@ -61967,10 +59872,11 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.12" + sources."@types/node-20.16.5" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" + sources."undici-types-6.19.8" sources."wrap-ansi-6.2.0" ]; }) @@ -61978,10 +59884,11 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.12" + sources."@types/node-20.16.5" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" + sources."undici-types-6.19.8" sources."wrap-ansi-6.2.0" ]; }) @@ -61989,10 +59896,11 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.12" + sources."@types/node-20.16.5" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" + sources."undici-types-6.19.8" sources."wrap-ansi-6.2.0" ]; }) @@ -62000,10 +59908,11 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.12" + sources."@types/node-20.16.5" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" + sources."undici-types-6.19.8" sources."wrap-ansi-6.2.0" ]; }) @@ -62012,10 +59921,11 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.12" + sources."@types/node-20.16.5" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" + sources."undici-types-6.19.8" sources."wrap-ansi-6.2.0" ]; }) @@ -62023,17 +59933,18 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.12" + sources."@types/node-20.16.5" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" + sources."undici-types-6.19.8" sources."wrap-ansi-6.2.0" ]; }) - sources."@inquirer/type-1.5.1" + sources."@inquirer/type-1.5.5" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" sources."emoji-regex-9.2.2" sources."string-width-5.1.2" @@ -62047,7 +59958,7 @@ in sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@jsii/check-node-1.98.0" - sources."@jsii/spec-1.101.0" + sources."@jsii/spec-1.103.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -62059,8 +59970,8 @@ in sources."@sentry/utils-7.116.0" sources."@types/mute-stream-0.0.1" sources."@types/node-18.19.34" - sources."@types/prop-types-15.7.12" - sources."@types/react-18.3.3" + sources."@types/prop-types-15.7.13" + sources."@types/react-18.3.8" sources."@types/wrap-ansi-3.0.0" sources."@types/yauzl-2.10.3" sources."@types/yoga-layout-1.9.2" @@ -62082,9 +59993,8 @@ in }) sources."arr-rotate-1.0.0" sources."array-buffer-byte-length-1.0.1" - sources."arraybuffer.prototype.slice-1.0.3" sources."astral-regex-2.0.0" - sources."async-3.2.5" + sources."async-3.2.6" sources."auto-bind-5.0.1" sources."available-typed-arrays-1.0.7" sources."balanced-match-1.0.2" @@ -62110,9 +60020,9 @@ in sources."cli-spinners-2.9.2" (sources."cli-truncate-4.0.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" - sources."emoji-regex-10.3.0" + sources."emoji-regex-10.4.0" sources."is-fullwidth-code-point-4.0.0" sources."slice-ansi-5.0.0" sources."string-width-7.2.0" @@ -62143,11 +60053,8 @@ in sources."cross-fetch-3.1.8" sources."cross-spawn-7.0.3" sources."csstype-3.1.3" - sources."data-view-buffer-1.0.1" - sources."data-view-byte-length-1.0.1" - sources."data-view-byte-offset-1.0.0" sources."date-format-4.0.14" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."decamelize-5.0.1" sources."decompress-response-6.0.0" sources."deep-equal-2.2.3" @@ -62161,7 +60068,7 @@ in sources."detect-port-1.6.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.6.0-dev.20240725" + sources."typescript-5.7.0-dev.20240920" ]; }) sources."eastasianwidth-0.2.0" @@ -62170,14 +60077,10 @@ in sources."end-of-stream-1.4.4" sources."entities-2.0.3" sources."environment-1.1.0" - sources."es-abstract-1.23.3" sources."es-define-property-1.0.0" sources."es-errors-1.3.0" sources."es-get-iterator-1.1.3" - sources."es-object-atoms-1.0.0" - sources."es-set-tostringtag-2.0.3" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-string-regexp-2.0.0" sources."events-3.3.0" sources."execa-5.1.1" @@ -62207,7 +60110,7 @@ in sources."flatted-3.3.1" sources."follow-redirects-1.15.6" sources."for-each-0.3.3" - (sources."foreground-child-3.2.1" // { + (sources."foreground-child-3.3.0" // { dependencies = [ sources."signal-exit-4.1.0" ]; @@ -62216,13 +60119,11 @@ in sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" - sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" sources."get-east-asian-width-1.2.0" sources."get-intrinsic-1.2.4" sources."get-stream-6.0.1" - sources."get-symbol-description-1.0.2" sources."github-from-package-0.0.0" (sources."glob-7.2.3" // { dependencies = [ @@ -62230,7 +60131,6 @@ in ]; }) sources."glob-parent-5.1.2" - sources."globalthis-1.0.4" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."graphology-0.25.4" @@ -62253,10 +60153,10 @@ in sources."ini-1.3.8" (sources."ink-5.0.1" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" sources."chalk-5.3.0" - sources."emoji-regex-10.3.0" + sources."emoji-regex-10.4.0" sources."string-width-7.2.0" sources."strip-ansi-7.1.0" sources."wrap-ansi-9.0.0" @@ -62307,8 +60207,7 @@ in sources."ci-info-2.0.0" ]; }) - sources."is-core-module-2.15.0" - sources."is-data-view-1.0.1" + sources."is-core-module-2.15.1" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -62316,7 +60215,6 @@ in sources."is-glob-4.0.3" sources."is-in-ci-0.1.0" sources."is-map-2.0.3" - sources."is-negative-zero-2.0.3" sources."is-number-7.0.0" sources."is-number-object-1.0.7" sources."is-regex-1.1.4" @@ -62325,10 +60223,8 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.13" sources."is-valid-domain-0.1.6" sources."is-weakmap-2.0.2" - sources."is-weakref-1.0.2" sources."is-weakset-2.0.3" sources."is-wsl-2.2.0" sources."isarray-2.0.5" @@ -62348,9 +60244,9 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.101.0" // { + (sources."jsii-reflect-1.103.1" // { dependencies = [ - sources."@jsii/check-node-1.101.0" + sources."@jsii/check-node-1.103.1" sources."cliui-7.0.4" sources."fs-extra-10.1.0" sources."jsonfile-6.1.0" @@ -62361,9 +60257,8 @@ in }) (sources."jsii-rosetta-5.4.14" // { dependencies = [ - sources."commonmark-0.31.0" + sources."commonmark-0.31.2" sources."entities-3.0.1" - sources."string.prototype.repeat-1.0.0" ]; }) sources."json-schema-traverse-1.0.0" @@ -62391,7 +60286,7 @@ in sources."mdurl-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mimic-fn-2.1.0" sources."mimic-response-3.1.0" (sources."minimatch-5.1.6" // { @@ -62402,13 +60297,13 @@ in sources."minimist-1.2.8" sources."minipass-7.1.2" sources."mkdirp-classic-0.5.3" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-1.0.0" sources."nan-2.20.0" sources."napi-build-utils-1.0.2" - sources."node-abi-3.65.0" + sources."node-abi-3.68.0" sources."node-fetch-2.7.0" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -62420,7 +60315,7 @@ in sources."obliterator-2.0.4" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.101.0" + sources."oo-ascii-tree-1.103.1" sources."open-7.4.2" sources."os-tmpdir-1.0.2" sources."p-limit-2.3.0" @@ -62434,7 +60329,7 @@ in sources."path-parse-1.0.7" sources."path-scurry-1.11.1" sources."pend-1.2.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pidtree-0.6.0" sources."pidusage-3.0.2" @@ -62443,7 +60338,7 @@ in sources."prebuild-install-7.1.2" sources."prettier-2.8.8" sources."process-nextick-args-2.0.1" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."rc-1.2.8" @@ -62469,9 +60364,7 @@ in sources."rfdc-1.4.1" sources."run-async-3.0.0" sources."run-parallel-1.2.0" - sources."safe-array-concat-1.1.2" sources."safe-buffer-5.2.1" - sources."safe-regex-test-1.0.3" sources."safer-buffer-2.1.2" sources."sax-1.4.1" sources."scheduler-0.23.2" @@ -62509,9 +60402,6 @@ in sources."string-width-4.2.3" sources."string-width-cjs-4.2.3" sources."string.prototype.repeat-0.2.0" - sources."string.prototype.trim-1.2.9" - sources."string.prototype.trimend-1.0.8" - sources."string.prototype.trimstart-1.0.8" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -62530,13 +60420,8 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" - sources."type-fest-4.23.0" - sources."typed-array-buffer-1.0.2" - sources."typed-array-byte-length-1.0.1" - sources."typed-array-byte-offset-1.0.2" - sources."typed-array-length-1.0.6" + sources."type-fest-4.26.1" sources."typescript-5.4.5" - sources."unbox-primitive-1.0.2" sources."undici-types-5.26.5" sources."universalify-0.1.2" sources."utf-8-validate-6.0.4" @@ -62550,8 +60435,8 @@ in sources."which-typed-array-1.1.15" (sources."widest-line-5.0.0" // { dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-10.3.0" + sources."ansi-regex-6.1.0" + sources."emoji-regex-10.4.0" sources."string-width-7.2.0" sources."strip-ansi-7.1.0" ]; @@ -62635,24 +60520,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-clangd = nodeEnv.buildNodePackage { - name = "coc-clangd"; - packageName = "coc-clangd"; - version = "0.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.31.0.tgz"; - sha512 = "4t6rVLxFrHp5L8/fSGMG1A4UEnAa41JwwczOBTnETOVQI9vYVL+PkXHCnYtx0e+yJZyCizpj/9IsbSPSDVmzag=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "clangd extension for coc.nvim"; - homepage = "https://github.com/clangd/coc-clangd#readme"; - license = "Apache-2.0 WITH LLVM-exception"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-cmake = nodeEnv.buildNodePackage { name = "coc-cmake"; packageName = "coc-cmake"; @@ -62705,7 +60572,7 @@ in ]; }) sources."dockerfile-utils-0.10.0" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."vscode-jsonrpc-8.1.0" sources."vscode-languageserver-8.1.0" (sources."vscode-languageserver-protocol-3.17.3" // { @@ -62713,7 +60580,7 @@ in sources."vscode-languageserver-types-3.17.3" ]; }) - sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-textdocument-1.0.12" sources."vscode-languageserver-types-3.17.5" ]; buildInputs = globalBuildInputs; @@ -62825,7 +60692,7 @@ in sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" @@ -62894,8 +60761,8 @@ in }; dependencies = [ sources."isexe-2.0.0" - sources."tslib-2.6.3" - sources."vscode-languageserver-textdocument-1.0.11" + sources."tslib-2.7.0" + sources."vscode-languageserver-textdocument-1.0.12" sources."vscode-uri-3.0.8" sources."which-3.0.1" ]; @@ -63073,10 +60940,10 @@ in coc-markdownlint = nodeEnv.buildNodePackage { name = "coc-markdownlint"; packageName = "coc-markdownlint"; - version = "1.34.0"; + version = "1.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.34.0.tgz"; - sha512 = "sid/nMX+47FKaZMioylvbrAFu7SRoTBgjX2+SA1Ndi4FQSxIKkGeyv4s32wInAZL+0DcQWhKO34Z8ewIUeYZMw=="; + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.35.0.tgz"; + sha512 = "9TbQ4quwERF/R/5hu4k7UnfOFvgRx/ZkdUOSweK5sfxUVaoY41DJblDOMPNpFWEyEqRuItksSfmGIv1F+7oqcg=="; }; buildInputs = globalBuildInputs; meta = { @@ -63135,7 +61002,7 @@ in sources."data-view-byte-offset-1.0.0" sources."date-format-4.0.14" sources."debounce-1.2.1" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."deep-extend-0.6.0" sources."define-data-property-1.1.4" sources."define-properties-1.2.1" @@ -63152,9 +61019,9 @@ in sources."fast-diff-1.3.0" sources."fb-watchman-2.0.2" sources."flatted-3.3.1" - sources."follow-redirects-1.15.6" + sources."follow-redirects-1.15.9" sources."for-each-0.3.3" - sources."fp-ts-2.16.8" + sources."fp-ts-2.16.9" sources."fs-extra-8.1.0" (sources."fs-minipass-2.1.0" // { dependencies = [ @@ -63233,7 +61100,7 @@ in ]; }) sources."mkdirp-1.0.4" - sources."ms-2.1.2" + sources."ms-2.1.3" (sources."mv-2.1.1" // { dependencies = [ sources."glob-6.0.4" @@ -63257,7 +61124,7 @@ in sources."process-nextick-args-2.0.1" sources."promise.prototype.finally-3.1.8" sources."promisify-child-process-4.1.1" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."rc-1.2.8" (sources."readable-stream-2.3.8" // { dependencies = [ @@ -63296,7 +61163,7 @@ in sources."tar-6.2.1" sources."tr46-0.0.3" sources."traverse-0.3.9" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."typed-array-buffer-1.0.2" sources."typed-array-byte-length-1.0.1" sources."typed-array-byte-offset-1.0.2" @@ -63312,7 +61179,7 @@ in sources."vscode-languageserver-types-3.15.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-textdocument-1.0.12" sources."vscode-languageserver-types-3.17.5" sources."vscode-uri-2.1.2" sources."webidl-conversions-3.0.1" @@ -63371,27 +61238,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-pyright = nodeEnv.buildNodePackage { - name = "coc-pyright"; - packageName = "coc-pyright"; - version = "1.1.371"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.371.tgz"; - sha512 = "8vgKSjuMVpylSoHIwdzP9edeHwmjUFY+ZyBkcLQMdyjdZtEc3+6OblXS0Dm5nXosjLY/ATc+w+38ITIssqm76g=="; - }; - dependencies = [ - sources."pyright-1.1.373" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Pyright extension for coc.nvim, static type checker for Python"; - homepage = "https://github.com/fannheyward/coc-pyright#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-python = nodeEnv.buildNodePackage { name = "coc-python"; packageName = "coc-python"; @@ -63421,7 +61267,7 @@ in dependencies = [ sources."vscode-jsonrpc-8.2.0" sources."vscode-languageserver-protocol-3.17.5" - sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-textdocument-1.0.12" sources."vscode-languageserver-types-3.17.5" ]; buildInputs = globalBuildInputs; @@ -63454,10 +61300,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.77.2"; + version = "0.77.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.77.2.tgz"; - sha512 = "Qq08/2Fx31bgfQhxKomQN42mfGM9gDCd4CKDMmlCJBMZKD439LaLWlYXGevmkp0qcIU2AWFD415j7041OpkFhQ=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.77.5.tgz"; + sha512 = "8I+5ak2/nqPyrcSZFUfHFNsPmPEOLsY38oKNQR2s7uMD8N88mc3/bept7cLo4RQYqrjQmmjF9dI9pVDC8gpDIw=="; }; buildInputs = globalBuildInputs; meta = { @@ -63500,7 +61346,7 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."minimatch-9.0.2" sources."node-fetch-2.7.0" sources."picomatch-2.3.1" @@ -63511,7 +61357,7 @@ in sources."semver-7.6.3" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."turndown-7.1.3" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" @@ -63646,7 +61492,7 @@ in }) (sources."cspell-lib-4.3.12" // { dependencies = [ - sources."comment-json-4.2.4" + sources."comment-json-4.2.5" sources."esprima-4.0.1" sources."fs-extra-9.1.0" sources."gensequence-3.1.1" @@ -63682,7 +61528,7 @@ in sources."json-parser-1.1.5" sources."jsonfile-6.1.0" sources."make-dir-3.1.0" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."minimatch-3.1.2" sources."node-watch-0.6.4" sources."picomatch-2.3.1" @@ -63731,40 +61577,36 @@ in dependencies = [ sources."@ampproject/remapping-2.3.0" sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.9" - (sources."@babel/core-7.24.9" // { + sources."@babel/compat-data-7.25.4" + (sources."@babel/core-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.10" - (sources."@babel/helper-compilation-targets-7.24.8" // { + sources."@babel/generator-7.25.6" + (sources."@babel/helper-compilation-targets-7.25.2" // { dependencies = [ sources."lru-cache-5.1.1" sources."semver-6.3.1" sources."yallist-3.1.1" ]; }) - sources."@babel/helper-environment-visitor-7.24.7" - sources."@babel/helper-function-name-7.24.7" - sources."@babel/helper-hoist-variables-7.24.7" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.9" + sources."@babel/helper-module-transforms-7.25.2" sources."@babel/helper-simple-access-7.24.7" - sources."@babel/helper-split-export-declaration-7.24.7" sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" sources."@babel/helper-validator-option-7.24.8" - sources."@babel/helpers-7.24.8" + sources."@babel/helpers-7.25.6" (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.24.8" - sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.8" - sources."@babel/types-7.24.9" + sources."@babel/parser-7.25.6" + sources."@babel/template-7.25.0" + sources."@babel/traverse-7.25.6" + sources."@babel/types-7.25.6" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" @@ -63779,7 +61621,7 @@ in sources."@types/minimist-1.2.5" sources."@types/normalize-package-data-2.4.4" sources."@types/parse-json-4.0.2" - sources."@types/unist-2.0.10" + sources."@types/unist-2.0.11" sources."ajv-8.17.1" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -63799,11 +61641,11 @@ in ]; }) sources."braces-3.0.3" - sources."browserslist-4.23.2" + sources."browserslist-4.23.3" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001643" + sources."caniuse-lite-1.0.30001662" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -63823,7 +61665,7 @@ in sources."convert-source-map-2.0.0" sources."cosmiconfig-7.1.0" sources."cssesc-3.0.0" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.1" // { dependencies = [ @@ -63840,11 +61682,11 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.5.1" + sources."electron-to-chromium-1.5.26" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-string-regexp-1.0.5" sources."execall-2.0.0" sources."extend-3.0.2" @@ -63874,10 +61716,10 @@ in sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."hasown-2.0.2" - sources."hosted-git-info-4.1.0" + sources."hosted-git-info-2.8.9" sources."html-tags-3.3.1" sources."htmlparser2-3.10.1" - sources."ignore-5.3.1" + sources."ignore-5.3.2" (sources."import-fresh-3.3.0" // { dependencies = [ sources."resolve-from-4.0.0" @@ -63893,7 +61735,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -63929,14 +61771,19 @@ in sources."meow-9.0.0" sources."merge2-1.4.1" sources."micromark-2.11.4" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."min-indent-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."minimist-options-4.1.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."node-releases-2.0.18" - sources."normalize-package-data-3.0.3" + (sources."normalize-package-data-3.0.3" // { + dependencies = [ + sources."hosted-git-info-4.1.0" + sources."semver-7.6.3" + ]; + }) sources."normalize-range-0.1.2" sources."normalize-selector-0.2.0" sources."num2fraction-1.2.2" @@ -63952,7 +61799,7 @@ in sources."path-is-inside-1.0.2" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" (sources."postcss-7.0.39" // { dependencies = [ @@ -63962,20 +61809,18 @@ in sources."postcss-html-0.36.0" sources."postcss-less-3.1.4" sources."postcss-media-query-parser-0.2.3" - sources."postcss-resolve-nested-selector-0.1.4" + sources."postcss-resolve-nested-selector-0.1.6" sources."postcss-safe-parser-4.0.2" sources."postcss-sass-0.4.4" sources."postcss-scss-2.1.1" - sources."postcss-selector-parser-6.1.1" + sources."postcss-selector-parser-6.1.2" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ - sources."hosted-git-info-2.8.9" sources."normalize-package-data-2.5.0" - sources."semver-5.7.2" sources."type-fest-0.6.0" ]; }) @@ -63997,7 +61842,7 @@ in sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" - sources."semver-7.6.3" + sources."semver-5.7.2" sources."signal-exit-3.0.7" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -64011,7 +61856,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."specificity-0.4.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -64051,7 +61896,7 @@ in sources."vscode-languageserver-types-3.16.0-next.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-textdocument-1.0.12" sources."vscode-languageserver-types-3.17.5" sources."vscode-uri-2.1.2" sources."which-1.3.1" @@ -64080,7 +61925,7 @@ in sha512 = "elUmSurb51E17VV/1W/qsAoD5qq6pFsnRK549WFMcG+AThli6nTj2Y6Ta0FA6+zh7QSjbraOlza8gk7C2w3Nfg=="; }; dependencies = [ - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; buildInputs = globalBuildInputs; meta = { @@ -64208,7 +62053,7 @@ in sources."hasown-2.0.2" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."minimatch-3.1.2" @@ -64217,7 +62062,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."resolve-1.22.8" sources."semver-5.7.2" sources."sprintf-js-1.0.3" @@ -64281,7 +62126,7 @@ in sha512 = "XUhAHtYOBHgLobVODFNONdJkCmFbsjS/8nMH95IQYRE0ECzwljupPOrGKBQa7OiGyWqQ5CAJfZJcbhzCHWdr+Q=="; }; dependencies = [ - sources."typescript-5.5.4" + sources."typescript-5.6.2" ]; buildInputs = globalBuildInputs; meta = { @@ -64356,7 +62201,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."deep-is-0.1.4" sources."define-data-property-1.1.4" sources."diff-4.0.2" @@ -64419,7 +62264,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-expression-4.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -64439,7 +62284,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."mkdirp-0.5.6" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."natural-compare-1.4.0" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -64448,7 +62293,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-parse-1.0.7" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."prelude-ls-1.2.1" sources."prettier-2.8.8" sources."progress-2.0.3" @@ -64726,7 +62571,7 @@ in sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."ramda-0.27.2" (sources."readable-stream-2.3.8" // { dependencies = [ @@ -64838,7 +62683,7 @@ in sources."neo-async-2.6.2" sources."normalize-package-data-6.0.2" sources."parse-json-8.1.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."read-package-up-11.0.0" sources."read-pkg-9.0.1" sources."semver-7.6.3" @@ -64846,12 +62691,12 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."supports-color-5.5.0" sources."temp-dir-3.0.0" sources."tempfile-5.0.0" - sources."type-fest-4.23.0" - sources."uglify-js-3.19.0" + sources."type-fest-4.26.1" + sources."uglify-js-3.19.3" sources."unicorn-magic-0.1.0" sources."validate-npm-package-license-3.0.4" sources."wordwrap-1.0.0" @@ -64892,7 +62737,7 @@ in sources."glob-parent-5.1.2" sources."globby-13.2.2" sources."graceful-fs-4.2.11" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."indent-string-5.0.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -64900,7 +62745,7 @@ in sources."junk-4.0.1" sources."meow-12.1.1" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."nested-error-stacks-2.1.1" sources."p-event-5.0.1" (sources."p-filter-3.0.0" // { @@ -64947,7 +62792,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.5" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -65042,7 +62887,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.12.3" + sources."qs-6.13.0" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.8" @@ -65075,7 +62920,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."type-2.7.3" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."util-deprecate-1.0.2" (sources."variable-diff-1.1.0" // { dependencies = [ @@ -65099,10 +62944,10 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "3.9.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.9.0.tgz"; - sha512 = "Fm0fg2/CZje18+yjNVw5DFKT7uv2qKfv6+YVUxsUcwSLF+WghozghCZN1ATzYIyp/Z73AnEgmJX0V04hvUtYrA=="; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-4.0.0.tgz"; + sha512 = "YRDkUIC0goqudxbBoSScj7rID1yVPKeRXAQGxasC3cLOk6Z1f7zZ1ZUrVLaLaQYjLwmLxCbkxzZpNGr9wnnY/Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -65117,42 +62962,43 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "8.12.1"; + version = "8.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-8.12.1.tgz"; - sha512 = "mdnUUPydxxdj/uyF84U/DvPiY/l58Z2IpNwTx3H9Uve9dfT0vRv/7jiFNAvK4hAfZQaMaE7DPC00ckywTI/XgA=="; + url = "https://registry.npmjs.org/cspell/-/cspell-8.14.4.tgz"; + sha512 = "R5Awb3i/RKaVVcZzFt8dkN3M6VnifIEDYBcbzbmYjZ/Eq+ASF+QTmI0E9WPhMEcFM1nd7YOyXnETo560yRdoKw=="; }; dependencies = [ - sources."@cspell/cspell-bundled-dicts-8.12.1" - sources."@cspell/cspell-json-reporter-8.12.1" - sources."@cspell/cspell-pipe-8.12.1" - sources."@cspell/cspell-resolver-8.12.1" - sources."@cspell/cspell-service-bus-8.12.1" - sources."@cspell/cspell-types-8.12.1" + sources."@cspell/cspell-bundled-dicts-8.14.4" + sources."@cspell/cspell-json-reporter-8.14.4" + sources."@cspell/cspell-pipe-8.14.4" + sources."@cspell/cspell-resolver-8.14.4" + sources."@cspell/cspell-service-bus-8.14.4" + sources."@cspell/cspell-types-8.14.4" sources."@cspell/dict-ada-4.0.2" - sources."@cspell/dict-aws-4.0.3" - sources."@cspell/dict-bash-4.1.3" - sources."@cspell/dict-companies-3.1.3" - sources."@cspell/dict-cpp-5.1.12" + sources."@cspell/dict-aws-4.0.4" + sources."@cspell/dict-bash-4.1.4" + sources."@cspell/dict-companies-3.1.4" + sources."@cspell/dict-cpp-5.1.16" sources."@cspell/dict-cryptocurrencies-5.0.0" sources."@cspell/dict-csharp-4.0.2" - sources."@cspell/dict-css-4.0.12" - sources."@cspell/dict-dart-2.0.3" + sources."@cspell/dict-css-4.0.13" + sources."@cspell/dict-dart-2.2.1" sources."@cspell/dict-data-science-2.0.1" sources."@cspell/dict-django-4.1.0" sources."@cspell/dict-docker-1.1.7" - sources."@cspell/dict-dotnet-5.0.2" + sources."@cspell/dict-dotnet-5.0.5" sources."@cspell/dict-elixir-4.0.3" - sources."@cspell/dict-en-common-misspellings-2.0.3" + sources."@cspell/dict-en-common-misspellings-2.0.4" sources."@cspell/dict-en-gb-1.1.33" sources."@cspell/dict-en_us-4.3.23" sources."@cspell/dict-filetypes-3.0.4" + sources."@cspell/dict-flutter-1.0.0" sources."@cspell/dict-fonts-4.0.0" sources."@cspell/dict-fsharp-1.0.1" sources."@cspell/dict-fullstack-3.2.0" sources."@cspell/dict-gaming-terms-1.0.5" sources."@cspell/dict-git-3.0.0" - sources."@cspell/dict-golang-6.0.9" + sources."@cspell/dict-golang-6.0.12" sources."@cspell/dict-google-1.0.1" sources."@cspell/dict-haskell-4.0.1" sources."@cspell/dict-html-4.0.5" @@ -65166,29 +63012,30 @@ in sources."@cspell/dict-makefile-1.0.0" sources."@cspell/dict-monkeyc-1.0.6" sources."@cspell/dict-node-5.0.1" - sources."@cspell/dict-npm-5.0.18" - sources."@cspell/dict-php-4.0.8" - sources."@cspell/dict-powershell-5.0.5" - sources."@cspell/dict-public-licenses-2.0.7" - sources."@cspell/dict-python-4.2.3" + sources."@cspell/dict-npm-5.1.5" + sources."@cspell/dict-php-4.0.10" + sources."@cspell/dict-powershell-5.0.8" + sources."@cspell/dict-public-licenses-2.0.8" + sources."@cspell/dict-python-4.2.6" sources."@cspell/dict-r-2.0.1" - sources."@cspell/dict-ruby-5.0.2" + sources."@cspell/dict-ruby-5.0.3" sources."@cspell/dict-rust-4.0.5" sources."@cspell/dict-scala-5.0.3" - sources."@cspell/dict-software-terms-4.0.3" - sources."@cspell/dict-sql-2.1.3" + sources."@cspell/dict-software-terms-4.1.4" + sources."@cspell/dict-sql-2.1.5" sources."@cspell/dict-svelte-1.0.2" sources."@cspell/dict-swift-2.0.1" - sources."@cspell/dict-terraform-1.0.0" + sources."@cspell/dict-terraform-1.0.1" sources."@cspell/dict-typescript-3.1.6" sources."@cspell/dict-vue-3.0.0" - sources."@cspell/dynamic-import-8.12.1" - sources."@cspell/strong-weak-map-8.12.1" - sources."@cspell/url-8.12.1" + sources."@cspell/dynamic-import-8.14.4" + sources."@cspell/filetypes-8.14.4" + sources."@cspell/strong-weak-map-8.14.4" + sources."@cspell/url-8.14.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."array-timsort-1.0.3" sources."braces-3.0.3" sources."callsites-3.1.0" @@ -65196,23 +63043,23 @@ in sources."chalk-template-1.1.0" sources."clear-module-4.1.2" sources."commander-12.1.0" - sources."comment-json-4.2.4" + sources."comment-json-4.2.5" sources."core-util-is-1.0.3" - sources."cspell-config-lib-8.12.1" - sources."cspell-dictionary-8.12.1" - sources."cspell-gitignore-8.12.1" - sources."cspell-glob-8.12.1" - sources."cspell-grammar-8.12.1" - sources."cspell-io-8.12.1" - sources."cspell-lib-8.12.1" - sources."cspell-trie-lib-8.12.1" + sources."cspell-config-lib-8.14.4" + sources."cspell-dictionary-8.14.4" + sources."cspell-gitignore-8.14.4" + sources."cspell-glob-8.14.4" + sources."cspell-grammar-8.14.4" + sources."cspell-io-8.14.4" + sources."cspell-lib-8.14.4" + sources."cspell-trie-lib-8.14.4" sources."env-paths-3.0.0" sources."esprima-4.0.1" sources."fast-equals-5.0.1" sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.17.1" - sources."file-entry-cache-9.0.0" + sources."file-entry-cache-9.1.0" sources."fill-range-7.1.1" sources."find-up-simple-1.0.0" sources."flat-cache-5.0.0" @@ -65236,7 +63083,7 @@ in sources."json-buffer-3.0.1" sources."keyv-4.5.4" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."parent-module-2.0.0" sources."picomatch-2.3.1" sources."queue-microtask-1.2.3" @@ -65247,15 +63094,15 @@ in sources."semver-7.6.3" sources."strip-ansi-7.1.0" sources."to-regex-range-5.0.1" - sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-textdocument-1.0.12" sources."vscode-uri-3.0.8" sources."xdg-basedir-5.1.0" - sources."yaml-2.5.0" + sources."yaml-2.5.1" ]; buildInputs = globalBuildInputs; meta = { description = "A Spelling Checker for Code!"; - homepage = "https://streetsidesoftware.github.io/cspell/"; + homepage = "https://cspell.org/"; license = "MIT"; }; production = true; @@ -65330,7 +63177,7 @@ in sources."diff-5.1.0" sources."diff2html-3.4.48" sources."emoji-regex-8.0.0" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."execa-8.0.1" sources."fetch-blob-3.2.0" sources."formdata-polyfill-4.0.10" @@ -65424,19 +63271,19 @@ in ]; }) sources."@oclif/screen-3.0.8" - sources."@swc/core-1.7.1" + sources."@swc/core-1.7.26" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.12" + sources."@swc/helpers-0.5.13" sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.1" + sources."@swc/wasm-1.7.26" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/cli-progress-3.11.6" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."acorn-8.12.1" - sources."acorn-walk-8.3.3" + sources."acorn-walk-8.3.4" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -65445,10 +63292,10 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."astral-regex-2.0.0" - sources."async-3.2.5" + sources."async-3.2.6" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."axios-1.7.2" + sources."axios-1.7.7" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bl-4.1.0" @@ -65477,7 +63324,7 @@ in sources."content-type-1.0.5" sources."create-require-1.1.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."defaults-1.0.4" sources."delayed-stream-1.0.0" sources."diff-4.0.2" @@ -65506,7 +63353,7 @@ in }) sources."filesize-6.4.0" sources."fill-range-7.1.1" - sources."follow-redirects-1.15.6" + sources."follow-redirects-1.15.9" sources."form-data-4.0.0" sources."fs-constants-1.0.0" sources."fs-extra-9.1.0" @@ -65519,7 +63366,7 @@ in sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."indent-string-4.0.0" sources."inherits-2.0.4" (sources."inquirer-8.2.6" // { @@ -65552,7 +63399,7 @@ in sources."log-symbols-4.1.0" sources."make-error-1.3.6" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" @@ -65562,7 +63409,7 @@ in ]; }) sources."mkdirp-classic-0.5.3" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-0.0.8" sources."natural-orderby-2.0.3" sources."object-treeify-1.1.33" @@ -65576,7 +63423,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."proxy-from-env-1.1.0" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."queue-microtask-1.2.3" sources."readable-stream-3.6.2" sources."redeyed-2.1.1" @@ -65609,11 +63456,11 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."ts-node-10.9.2" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.21.3" - sources."typescript-5.5.4" - sources."undici-types-5.26.5" + sources."typescript-5.6.2" + sources."undici-types-6.19.8" sources."universalify-2.0.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" @@ -65638,10 +63485,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.111.0"; + version = "6.113.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.111.0.tgz"; - sha512 = "nvcobmgSuPm+TwoilMVL5tjJW4ikI55uHFQS+dbHUc35HrMunPdgSeICCK+McNW+YL9bKe/1DSJxCpqzxwyVYA=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.113.0.tgz"; + sha512 = "BhUXtsfrOClWSoPFnRYtqAkY3v8qrxGzHiaJkdORHmB/qEd5JzIGuKvDqjRqkZj/TuCSpxRZ9HECkNxIyZVQFg=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -65656,7 +63503,7 @@ in sources."available-typed-arrays-1.0.7" sources."aws-sdk-2.1472.0" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" @@ -65684,7 +63531,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."for-each-0.3.3" sources."forever-agent-0.6.1" - sources."form-data-2.3.3" + sources."form-data-4.0.0" sources."function-bind-1.1.2" sources."get-intrinsic-1.2.4" sources."getpass-0.1.7" @@ -65696,7 +63543,7 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.2" sources."hasown-2.0.2" - sources."http-signature-1.3.6" + sources."http-signature-1.4.0" sources."http-status-1.7.4" sources."ieee754-1.1.13" sources."inherits-2.0.4" @@ -65745,7 +63592,7 @@ in sources."process-nextick-args-2.0.1" sources."psl-1.9.0" sources."punycode-1.3.2" - sources."qs-6.10.4" + sources."qs-6.13.0" sources."querystring-0.2.0" sources."querystringify-2.2.0" (sources."readable-stream-2.3.8" // { @@ -65753,13 +63600,14 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."request-3.0.1" // { + (sources."request-3.0.5" // { dependencies = [ sources."uuid-8.3.2" ]; }) (sources."requestretry-7.1.0" // { dependencies = [ + sources."form-data-2.3.3" sources."http-signature-1.2.0" sources."jsprim-1.4.2" sources."punycode-2.3.1" @@ -65845,7 +63693,7 @@ in sources."@electron-forge/template-webpack-7.4.0" sources."@electron-forge/template-webpack-typescript-7.4.0" sources."@electron-forge/tracer-7.4.0" - (sources."@electron/asar-3.2.10" // { + (sources."@electron/asar-3.2.13" // { dependencies = [ sources."commander-5.1.0" ]; @@ -65858,13 +63706,13 @@ in sources."universalify-0.1.2" ]; }) - (sources."@electron/notarize-2.3.2" // { + (sources."@electron/notarize-2.5.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."@electron/osx-sign-1.3.1" - (sources."@electron/packager-18.3.3" // { + (sources."@electron/packager-18.3.5" // { dependencies = [ sources."fs-extra-11.2.0" ]; @@ -65893,9 +63741,11 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-2.0.0" sources."@types/cacheable-request-6.0.3" + sources."@types/glob-7.2.0" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.14.12" + sources."@types/minimatch-5.1.2" + sources."@types/node-22.5.5" sources."@types/responselike-1.0.3" sources."@types/yauzl-2.10.3" sources."@xmldom/xmldom-0.8.10" @@ -65936,7 +63786,7 @@ in sources."cli-spinners-2.9.2" (sources."cli-truncate-3.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."emoji-regex-9.2.2" sources."string-width-5.1.2" sources."strip-ansi-7.1.0" @@ -65955,9 +63805,9 @@ in sources."console-control-strings-1.1.0" sources."cross-dirname-0.1.0" sources."cross-spawn-7.0.3" - (sources."debug-4.3.5" // { + (sources."debug-4.3.7" // { dependencies = [ - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) (sources."decompress-response-6.0.0" // { @@ -65977,7 +63827,7 @@ in sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-string-regexp-1.0.5" sources."eventemitter3-5.0.1" (sources."execa-1.0.0" // { @@ -66053,7 +63903,7 @@ in sources."interpret-3.1.1" sources."ip-address-9.0.5" sources."is-arrayish-0.2.1" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -66072,7 +63922,7 @@ in sources."keyv-4.5.4" (sources."listr2-7.0.2" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" sources."emoji-regex-9.2.2" sources."string-width-5.1.2" @@ -66087,7 +63937,7 @@ in sources."log-symbols-4.1.0" (sources."log-update-5.0.1" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" sources."cli-cursor-4.0.0" sources."emoji-regex-9.2.2" @@ -66103,7 +63953,7 @@ in sources."map-age-cleaner-0.1.3" sources."mem-4.3.0" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" @@ -66119,7 +63969,7 @@ in sources."ms-2.0.0" sources."negotiator-0.6.3" sources."nice-try-1.0.5" - sources."node-abi-3.65.0" + sources."node-abi-3.68.0" sources."node-api-version-0.2.0" sources."node-fetch-2.7.0" sources."node-gyp-9.4.1" @@ -66182,7 +64032,7 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."read-binary-file-arch-1.0.6" @@ -66228,7 +64078,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."sprintf-js-1.1.3" sources."ssri-9.0.1" sources."string-width-4.2.3" @@ -66250,7 +64100,7 @@ in sources."tr46-0.0.3" sources."trim-repeated-1.0.0" sources."type-fest-1.4.0" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."unique-filename-2.0.1" sources."unique-slug-3.0.0" sources."universalify-2.0.1" @@ -66295,13 +64145,13 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "10.2.1"; + version = "12.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-10.2.1.tgz"; - sha512 = "ayiCnxv58RYFPgYtgDhzcTIsJuN4CWFIl0IR1zMLlau/tNQxR6AnXTyF+XNUYEIHMaLwc1TDsZ5DlZu9e/2sXg=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-12.4.1.tgz"; + sha512 = "BcQGQ82KnQLHk2F2gKhCkb1GTiwnJ5EThnzd/1MpFL8dbPns2vFElxWHj+byKPUjMMurhWa3YCYyEtiI1EGPrg=="; }; dependencies = [ - sources."@0no-co/graphql.web-1.0.7" + sources."@0no-co/graphql.web-1.0.8" sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.24.7" (sources."@babel/highlight-7.24.7" // { @@ -66319,8 +64169,8 @@ in sources."@jridgewell/trace-mapping-0.3.9" ]; }) - sources."@expo/apple-utils-1.7.1" - (sources."@expo/bunyan-4.0.0" // { + sources."@expo/apple-utils-1.8.0" + (sources."@expo/bunyan-4.0.1" // { dependencies = [ sources."uuid-8.3.2" ]; @@ -66328,6 +64178,9 @@ in sources."@expo/code-signing-certificates-0.0.5" (sources."@expo/config-8.5.4" // { dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-7.1.6" + sources."minimatch-3.1.2" sources."semver-7.5.3" ]; }) @@ -66335,20 +64188,23 @@ in dependencies = [ sources."@expo/json-file-8.3.3" sources."@expo/plist-0.1.3" + sources."brace-expansion-1.1.11" sources."find-up-5.0.0" + sources."glob-7.1.6" sources."locate-path-6.0.0" + sources."minimatch-3.1.2" sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) sources."@expo/config-types-50.0.0" - (sources."@expo/eas-build-job-1.0.119" // { + (sources."@expo/eas-build-job-1.0.133" // { dependencies = [ sources."joi-17.13.3" sources."semver-7.6.3" ]; }) - (sources."@expo/eas-json-10.0.3" // { + (sources."@expo/eas-json-12.0.0" // { dependencies = [ (sources."@babel/code-frame-7.23.5" // { dependencies = [ @@ -66364,6 +64220,11 @@ in sources."tslib-2.4.1" ]; }) + (sources."@expo/env-0.3.0" // { + dependencies = [ + sources."dotenv-16.4.5" + ]; + }) (sources."@expo/fingerprint-0.6.1" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -66408,13 +64269,17 @@ in (sources."@expo/plugin-help-5.1.23" // { dependencies = [ sources."@oclif/core-2.16.0" + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" sources."supports-color-8.1.1" ]; }) (sources."@expo/plugin-warn-if-update-available-2.5.1" // { dependencies = [ sources."@oclif/core-2.16.0" + sources."emoji-regex-8.0.0" sources."fs-extra-10.1.0" + sources."string-width-4.2.3" sources."supports-color-8.1.1" ]; }) @@ -66432,7 +64297,7 @@ in }) sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.7.0" - (sources."@expo/steps-1.0.119" // { + (sources."@expo/steps-1.0.134" // { dependencies = [ sources."@expo/spawn-async-1.7.2" sources."joi-17.13.3" @@ -66441,6 +64306,14 @@ in sources."@expo/timeago.js-1.0.0" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" + (sources."@isaacs/cliui-8.0.2" // { + dependencies = [ + sources."ansi-regex-6.1.0" + sources."ansi-styles-6.2.1" + sources."strip-ansi-7.1.0" + sources."wrap-ansi-8.1.0" + ]; + }) sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" @@ -66451,7 +64324,9 @@ in sources."@nodelib/fs.walk-1.2.8" (sources."@oclif/core-1.26.2" // { dependencies = [ + sources."emoji-regex-8.0.0" sources."fs-extra-9.1.0" + sources."string-width-4.2.3" sources."supports-color-8.1.1" ]; }) @@ -66459,6 +64334,8 @@ in (sources."@oclif/plugin-autocomplete-2.3.10" // { dependencies = [ sources."@oclif/core-2.16.0" + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" sources."supports-color-8.1.1" ]; }) @@ -66469,23 +64346,23 @@ in sources."@sideway/address-4.1.5" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" - sources."@swc/core-1.7.1" + sources."@swc/core-1.7.26" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.12" + sources."@swc/helpers-0.5.13" sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.1" + sources."@swc/wasm-1.7.26" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/bunyan-1.8.11" sources."@types/cli-progress-3.11.6" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@urql/core-4.0.11" sources."@urql/exchange-retry-1.2.0" sources."@xmldom/xmldom-0.7.13" sources."acorn-8.12.1" - sources."acorn-walk-8.3.3" + sources."acorn-walk-8.3.4" sources."agent-base-6.0.2" sources."ajv-8.11.0" sources."ajv-formats-2.1.1" @@ -66499,9 +64376,10 @@ in sources."array-union-2.1.0" sources."asn1-0.2.6" sources."astral-regex-2.0.0" - sources."async-3.2.5" + sources."async-3.2.6" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" + sources."b4a-1.6.6" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."better-opn-3.0.2" @@ -66523,7 +64401,12 @@ in ]; }) sources."cli-cursor-3.1.0" - sources."cli-progress-3.12.0" + (sources."cli-progress-3.12.0" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + ]; + }) sources."cli-spinners-2.9.2" sources."clone-1.0.4" sources."color-convert-2.0.1" @@ -66538,7 +64421,7 @@ in sources."crypt-0.0.2" sources."crypto-random-string-1.0.0" sources."dateformat-4.6.3" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."defaults-1.0.4" sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" @@ -66547,10 +64430,16 @@ in sources."dir-glob-3.0.1" sources."domino-2.1.6" sources."dotenv-16.3.1" + (sources."dotenv-expand-11.0.6" // { + dependencies = [ + sources."dotenv-16.4.5" + ]; + }) sources."dtrace-provider-0.8.8" + sources."eastasianwidth-0.2.0" sources."ecdsa-sig-formatter-1.0.11" sources."ejs-3.1.10" - sources."emoji-regex-8.0.0" + sources."emoji-regex-9.2.2" sources."encoding-0.1.13" sources."env-paths-2.2.0" sources."env-string-1.0.1" @@ -66560,7 +64449,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."exec-async-2.2.0" - (sources."expo-modules-autolinking-1.11.1" // { + (sources."expo-modules-autolinking-1.11.2" // { dependencies = [ sources."commander-7.2.0" sources."find-up-5.0.0" @@ -66571,6 +64460,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" + sources."fast-fifo-1.3.2" sources."fast-glob-3.3.2" sources."fastq-1.17.1" sources."fetch-retry-4.1.1" @@ -66579,6 +64469,11 @@ in sources."fill-range-7.1.1" sources."find-up-4.1.0" sources."find-yarn-workspace-root-2.0.0" + (sources."foreground-child-3.3.0" // { + dependencies = [ + sources."signal-exit-4.1.0" + ]; + }) sources."form-data-4.0.0" sources."fs-extra-11.2.0" (sources."fs-minipass-2.1.0" // { @@ -66589,10 +64484,10 @@ in sources."fs.realpath-1.0.0" sources."get-package-type-0.1.0" sources."getenv-1.0.0" - (sources."glob-7.1.6" // { + (sources."glob-10.4.5" // { dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" + sources."minimatch-9.0.5" + sources."minipass-7.1.2" ]; }) sources."glob-parent-5.1.2" @@ -66626,6 +64521,7 @@ in sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" + sources."jackspeak-3.4.3" (sources."jake-10.9.2" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -66659,7 +64555,7 @@ in sources."make-error-1.3.6" sources."md5-2.3.0" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mime-3.0.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" @@ -66667,18 +64563,22 @@ in sources."minimatch-5.1.2" sources."minimist-1.2.8" sources."minipass-5.0.0" - (sources."minizlib-2.1.2" // { + (sources."minizlib-3.0.1" // { dependencies = [ - sources."minipass-3.3.6" + sources."minipass-7.1.2" ]; }) sources."mkdirp-1.0.4" sources."moment-2.30.1" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-0.0.8" (sources."mv-2.1.1" // { dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-6.0.4" + sources."minimatch-3.1.2" sources."mkdirp-0.5.6" + sources."rimraf-2.4.5" ]; }) sources."mz-2.7.0" @@ -66709,6 +64609,7 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" + sources."package-json-from-dist-1.0.0" sources."parse-json-4.0.0" (sources."parse-png-2.1.0" // { dependencies = [ @@ -66719,8 +64620,13 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" + (sources."path-scurry-1.11.1" // { + dependencies = [ + sources."lru-cache-10.4.3" + ]; + }) sources."path-type-4.0.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pirates-4.0.6" sources."pkg-dir-4.2.0" @@ -66737,6 +64643,7 @@ in sources."punycode-2.3.1" sources."qrcode-terminal-0.12.0" sources."queue-microtask-1.2.3" + sources."queue-tick-1.0.1" sources."redeyed-2.1.1" sources."remove-trailing-slash-0.1.1" sources."require-from-string-2.0.2" @@ -66744,13 +64651,7 @@ in sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."reusify-1.0.4" - (sources."rimraf-2.4.5" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-6.0.4" - sources."minimatch-3.1.2" - ]; - }) + sources."rimraf-5.0.10" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" @@ -66769,14 +64670,41 @@ in sources."sprintf-js-1.0.3" sources."stream-buffers-2.2.0" sources."streamsearch-1.1.0" - sources."string-width-4.2.3" + sources."streamx-2.20.1" + (sources."string-width-5.1.2" // { + dependencies = [ + sources."ansi-regex-6.1.0" + sources."strip-ansi-7.1.0" + ]; + }) + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + ]; + }) sources."strip-ansi-6.0.1" + sources."strip-ansi-cjs-6.0.1" sources."structured-headers-0.4.1" - sources."sucrase-3.34.0" + (sources."sucrase-3.34.0" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-7.1.6" + sources."minimatch-3.1.2" + ]; + }) sources."sudo-prompt-9.1.1" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" - sources."tar-6.2.1" + (sources."tar-6.2.1" // { + dependencies = [ + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + ]; + }) + sources."tar-stream-3.1.7" sources."temp-dir-1.0.0" (sources."tempy-0.3.0" // { dependencies = [ @@ -66784,6 +64712,7 @@ in ]; }) sources."terminal-link-2.1.1" + sources."text-decoder-1.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."this-file-2.0.3" @@ -66800,8 +64729,8 @@ in sources."tunnel-agent-0.6.0" sources."turndown-7.1.2" sources."type-fest-0.21.3" - sources."typescript-5.5.4" - sources."undici-types-5.26.5" + sources."typescript-5.6.2" + sources."undici-types-6.19.8" sources."unique-string-1.0.0" sources."universalify-2.0.1" sources."untildify-4.0.0" @@ -66813,10 +64742,26 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" - sources."widest-line-3.1.0" + (sources."widest-line-3.1.0" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + ]; + }) sources."wonka-6.3.4" sources."wordwrap-1.0.0" - sources."wrap-ansi-7.0.0" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + ]; + }) + (sources."wrap-ansi-cjs-7.0.0" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" (sources."xcode-3.0.1" // { @@ -66831,7 +64776,7 @@ in }) sources."xmlbuilder-14.0.0" sources."yallist-4.0.0" - sources."yaml-2.5.0" + sources."yaml-2.5.1" sources."yn-3.1.1" sources."yocto-queue-0.1.0" sources."zod-3.23.8" @@ -66874,12 +64819,12 @@ in }; dependencies = [ sources."@alcalzone/ansi-tokenize-0.1.3" - sources."@types/prop-types-15.7.12" - sources."@types/react-18.3.3" + sources."@types/prop-types-15.7.13" + sources."@types/react-18.3.8" sources."ajv-8.17.1" sources."ajv-formats-2.1.1" sources."ansi-escapes-7.0.0" - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" sources."atomically-2.0.3" sources."auto-bind-5.0.1" @@ -66900,7 +64845,7 @@ in sources."csstype-3.1.3" sources."debounce-fn-5.1.2" sources."dot-prop-8.0.2" - sources."emoji-regex-10.3.0" + sources."emoji-regex-10.4.0" sources."emojilib-3.0.12" sources."env-paths-3.0.0" sources."environment-1.1.0" @@ -66915,12 +64860,12 @@ in (sources."ink-5.0.1" // { dependencies = [ sources."signal-exit-3.0.7" - sources."type-fest-4.23.0" + sources."type-fest-4.26.1" ]; }) (sources."ink-text-input-6.0.0" // { dependencies = [ - sources."type-fest-4.23.0" + sources."type-fest-4.26.1" ]; }) sources."is-docker-3.0.0" @@ -66941,7 +64886,7 @@ in sources."meow-13.2.0" sources."merge-stream-2.0.0" sources."mimic-fn-4.0.0" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" (sources."npm-run-path-5.3.0" // { dependencies = [ sources."path-key-4.0.0" @@ -67041,125 +64986,13 @@ in bypassCache = true; reconstructLock = true; }; - eslint = nodeEnv.buildNodePackage { - name = "eslint"; - packageName = "eslint"; - version = "9.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-9.7.0.tgz"; - sha512 = "FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw=="; - }; - dependencies = [ - (sources."@eslint-community/eslint-utils-4.4.0" // { - dependencies = [ - sources."eslint-visitor-keys-3.4.3" - ]; - }) - sources."@eslint-community/regexpp-4.11.0" - sources."@eslint/config-array-0.17.1" - sources."@eslint/eslintrc-3.1.0" - sources."@eslint/js-9.7.0" - sources."@eslint/object-schema-2.1.4" - sources."@humanwhocodes/module-importer-1.0.1" - sources."@humanwhocodes/retry-0.3.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."acorn-8.12.1" - sources."acorn-jsx-5.3.2" - sources."ajv-6.12.6" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."callsites-3.1.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."cross-spawn-7.0.3" - sources."debug-4.3.5" - sources."deep-is-0.1.4" - sources."escape-string-regexp-4.0.0" - sources."eslint-9.7.0" - sources."eslint-scope-8.0.2" - sources."eslint-visitor-keys-4.0.0" - sources."espree-10.1.0" - sources."esquery-1.6.0" - sources."esrecurse-4.3.0" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fastq-1.17.1" - sources."file-entry-cache-8.0.0" - sources."find-up-5.0.0" - sources."flat-cache-4.0.1" - sources."flatted-3.3.1" - sources."glob-parent-6.0.2" - sources."globals-14.0.0" - sources."has-flag-4.0.0" - sources."ignore-5.3.1" - sources."import-fresh-3.3.0" - sources."imurmurhash-0.1.4" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-path-inside-3.0.3" - sources."isexe-2.0.0" - sources."js-yaml-4.1.0" - sources."json-buffer-3.0.1" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."keyv-4.5.4" - sources."levn-0.4.1" - sources."locate-path-6.0.0" - sources."lodash.merge-4.6.2" - sources."minimatch-3.1.2" - sources."ms-2.1.2" - sources."natural-compare-1.4.0" - sources."optionator-0.9.4" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."parent-module-1.0.1" - sources."path-exists-4.0.0" - sources."path-key-3.1.1" - sources."prelude-ls-1.2.1" - sources."punycode-2.3.1" - sources."queue-microtask-1.2.3" - sources."resolve-from-4.0.0" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."strip-ansi-6.0.1" - sources."strip-json-comments-3.1.1" - sources."supports-color-7.2.0" - sources."text-table-0.2.0" - sources."type-check-0.4.0" - sources."uri-js-4.4.1" - sources."which-2.0.2" - sources."word-wrap-1.2.5" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "An AST-based pattern checker for JavaScript."; - homepage = "https://eslint.org"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; esy = nodeEnv.buildNodePackage { name = "esy"; packageName = "esy"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/esy/-/esy-0.7.2.tgz"; - sha512 = "l8JktgiCkMk8MB9HaSISzSaSSKX19pHtLsRTymZGHHrzk47GrOQLXmez6OJNSgUh07rfasybABAT6yasppC5Zg=="; + url = "https://registry.npmjs.org/esy/-/esy-0.7.3.tgz"; + sha512 = "G0krJrkHyf2ds08eW9bxs3O/Th9tqtZgAfZHO/HYeRY39ynZHHC8yMzUNVNqKzal871ZpObJnS+r9GcR0VtaVQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -67181,67 +65014,67 @@ in dependencies = [ sources."@ampproject/remapping-2.3.0" sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.9" - (sources."@babel/core-7.24.9" // { + sources."@babel/compat-data-7.25.4" + (sources."@babel/core-7.25.2" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.10" + sources."@babel/generator-7.25.6" sources."@babel/helper-annotate-as-pure-7.24.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.24.7" - (sources."@babel/helper-compilation-targets-7.24.8" // { + (sources."@babel/helper-compilation-targets-7.25.2" // { dependencies = [ + sources."lru-cache-5.1.1" sources."semver-6.3.1" + sources."yallist-3.1.1" ]; }) - (sources."@babel/helper-create-class-features-plugin-7.24.8" // { + (sources."@babel/helper-create-class-features-plugin-7.25.4" // { dependencies = [ sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-regexp-features-plugin-7.24.7" // { + (sources."@babel/helper-create-regexp-features-plugin-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) (sources."@babel/helper-define-polyfill-provider-0.6.2" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" sources."resolve-1.22.8" ]; }) sources."@babel/helper-environment-visitor-7.24.7" - sources."@babel/helper-function-name-7.24.7" - sources."@babel/helper-hoist-variables-7.24.7" sources."@babel/helper-member-expression-to-functions-7.24.8" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.9" + sources."@babel/helper-module-transforms-7.25.2" sources."@babel/helper-optimise-call-expression-7.24.7" sources."@babel/helper-plugin-utils-7.24.8" - sources."@babel/helper-remap-async-to-generator-7.24.7" - sources."@babel/helper-replace-supers-7.24.7" + sources."@babel/helper-remap-async-to-generator-7.25.0" + sources."@babel/helper-replace-supers-7.25.0" sources."@babel/helper-simple-access-7.24.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.24.7" - sources."@babel/helper-split-export-declaration-7.24.7" sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" sources."@babel/helper-validator-option-7.24.8" - sources."@babel/helper-wrap-function-7.24.7" - sources."@babel/helpers-7.24.8" + sources."@babel/helper-wrap-function-7.25.0" + sources."@babel/helpers-7.25.6" (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.24.8" - sources."@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7" + sources."@babel/parser-7.25.6" + sources."@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3" + sources."@babel/plugin-bugfix-safari-class-field-initializer-scope-7.25.0" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7" - sources."@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7" + sources."@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-decorators-7.24.7" @@ -67259,8 +65092,8 @@ in sources."@babel/plugin-syntax-export-default-from-7.24.7" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-flow-7.24.7" - sources."@babel/plugin-syntax-import-assertions-7.24.7" - sources."@babel/plugin-syntax-import-attributes-7.24.7" + sources."@babel/plugin-syntax-import-assertions-7.25.6" + sources."@babel/plugin-syntax-import-attributes-7.25.6" sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-jsx-7.24.7" @@ -67272,33 +65105,34 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.24.7" + sources."@babel/plugin-syntax-typescript-7.25.4" sources."@babel/plugin-syntax-unicode-sets-regex-7.18.6" sources."@babel/plugin-transform-arrow-functions-7.24.7" - sources."@babel/plugin-transform-async-generator-functions-7.24.7" + sources."@babel/plugin-transform-async-generator-functions-7.25.4" sources."@babel/plugin-transform-async-to-generator-7.24.7" sources."@babel/plugin-transform-block-scoped-functions-7.24.7" - sources."@babel/plugin-transform-block-scoping-7.24.7" - sources."@babel/plugin-transform-class-properties-7.24.7" + sources."@babel/plugin-transform-block-scoping-7.25.0" + sources."@babel/plugin-transform-class-properties-7.25.4" sources."@babel/plugin-transform-class-static-block-7.24.7" - sources."@babel/plugin-transform-classes-7.24.8" + sources."@babel/plugin-transform-classes-7.25.4" sources."@babel/plugin-transform-computed-properties-7.24.7" sources."@babel/plugin-transform-destructuring-7.24.8" sources."@babel/plugin-transform-dotall-regex-7.24.7" sources."@babel/plugin-transform-duplicate-keys-7.24.7" + sources."@babel/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0" sources."@babel/plugin-transform-dynamic-import-7.24.7" sources."@babel/plugin-transform-exponentiation-operator-7.24.7" sources."@babel/plugin-transform-export-namespace-from-7.24.7" - sources."@babel/plugin-transform-flow-strip-types-7.24.7" + sources."@babel/plugin-transform-flow-strip-types-7.25.2" sources."@babel/plugin-transform-for-of-7.24.7" - sources."@babel/plugin-transform-function-name-7.24.7" + sources."@babel/plugin-transform-function-name-7.25.1" sources."@babel/plugin-transform-json-strings-7.24.7" - sources."@babel/plugin-transform-literals-7.24.7" + sources."@babel/plugin-transform-literals-7.25.2" sources."@babel/plugin-transform-logical-assignment-operators-7.24.7" sources."@babel/plugin-transform-member-expression-literals-7.24.7" sources."@babel/plugin-transform-modules-amd-7.24.7" sources."@babel/plugin-transform-modules-commonjs-7.24.8" - sources."@babel/plugin-transform-modules-systemjs-7.24.7" + sources."@babel/plugin-transform-modules-systemjs-7.25.0" sources."@babel/plugin-transform-modules-umd-7.24.7" sources."@babel/plugin-transform-named-capturing-groups-regex-7.24.7" sources."@babel/plugin-transform-new-target-7.24.7" @@ -67309,16 +65143,16 @@ in sources."@babel/plugin-transform-optional-catch-binding-7.24.7" sources."@babel/plugin-transform-optional-chaining-7.24.8" sources."@babel/plugin-transform-parameters-7.24.7" - sources."@babel/plugin-transform-private-methods-7.24.7" + sources."@babel/plugin-transform-private-methods-7.25.4" sources."@babel/plugin-transform-private-property-in-object-7.24.7" sources."@babel/plugin-transform-property-literals-7.24.7" sources."@babel/plugin-transform-react-display-name-7.24.7" - sources."@babel/plugin-transform-react-jsx-7.24.7" + sources."@babel/plugin-transform-react-jsx-7.25.2" sources."@babel/plugin-transform-react-jsx-self-7.24.7" sources."@babel/plugin-transform-react-jsx-source-7.24.7" sources."@babel/plugin-transform-regenerator-7.24.7" sources."@babel/plugin-transform-reserved-words-7.24.7" - (sources."@babel/plugin-transform-runtime-7.24.7" // { + (sources."@babel/plugin-transform-runtime-7.25.4" // { dependencies = [ sources."semver-6.3.1" ]; @@ -67328,12 +65162,12 @@ in sources."@babel/plugin-transform-sticky-regex-7.24.7" sources."@babel/plugin-transform-template-literals-7.24.7" sources."@babel/plugin-transform-typeof-symbol-7.24.8" - sources."@babel/plugin-transform-typescript-7.24.8" + sources."@babel/plugin-transform-typescript-7.25.2" sources."@babel/plugin-transform-unicode-escapes-7.24.7" sources."@babel/plugin-transform-unicode-property-regex-7.24.7" sources."@babel/plugin-transform-unicode-regex-7.24.7" - sources."@babel/plugin-transform-unicode-sets-regex-7.24.7" - (sources."@babel/preset-env-7.24.8" // { + sources."@babel/plugin-transform-unicode-sets-regex-7.25.4" + (sources."@babel/preset-env-7.25.4" // { dependencies = [ sources."semver-6.3.1" ]; @@ -67345,20 +65179,20 @@ in sources."regenerator-runtime-0.13.11" ]; }) - sources."@babel/template-7.24.7" - (sources."@babel/traverse-7.24.8" // { + sources."@babel/template-7.25.0" + (sources."@babel/traverse-7.25.6" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - sources."@babel/types-7.24.9" + sources."@babel/types-7.25.6" sources."@expo/apple-utils-1.0.0" sources."@expo/bunyan-4.0.0" (sources."@expo/cli-0.7.3" // { dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/runtime-7.24.8" + sources."@babel/runtime-7.25.6" (sources."@expo/config-8.0.5" // { dependencies = [ sources."semver-7.3.2" @@ -67406,7 +65240,7 @@ in ]; }) sources."ansi-regex-5.0.1" - (sources."body-parser-1.20.2" // { + (sources."body-parser-1.20.3" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -67414,11 +65248,7 @@ in }) sources."bplist-parser-0.3.2" sources."bytes-3.1.2" - (sources."debug-4.3.5" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) + sources."debug-4.3.7" sources."depd-2.0.0" sources."destroy-1.2.0" sources."form-data-3.0.1" @@ -67434,7 +65264,7 @@ in ]; }) sources."on-finished-2.4.1" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."raw-body-2.5.2" sources."semver-6.3.1" (sources."send-0.18.0" // { @@ -67473,9 +65303,9 @@ in sources."@expo/json-file-8.2.36" sources."@expo/plist-0.0.18" sources."@xmldom/xmldom-0.7.13" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."json5-1.0.2" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."semver-7.6.3" sources."slash-3.0.0" sources."xmlbuilder-14.0.0" @@ -67492,16 +65322,16 @@ in ]; }) sources."@expo/metro-config-0.6.0" - sources."body-parser-1.20.2" + sources."body-parser-1.20.3" sources."bytes-3.1.2" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."depd-2.0.0" sources."destroy-1.2.0" sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."on-finished-2.4.1" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."raw-body-2.5.2" sources."setprototypeof-1.2.0" sources."slash-3.0.0" @@ -67509,12 +65339,15 @@ in sources."temp-dir-2.0.0" ]; }) - (sources."@expo/devcert-1.1.2" // { + (sources."@expo/devcert-1.1.4" // { dependencies = [ + sources."brace-expansion-2.0.1" sources."debug-3.2.7" + sources."glob-10.4.5" + sources."minimatch-9.0.5" + sources."minipass-7.1.2" sources."mkdirp-0.5.6" sources."ms-2.1.3" - sources."rimraf-2.7.1" ]; }) (sources."@expo/image-utils-0.3.23" // { @@ -67533,8 +65366,8 @@ in sources."@babel/code-frame-7.10.4" sources."@expo/config-8.0.5" sources."@expo/config-plugins-6.0.2" - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" sources."semver-7.6.3" sources."slash-3.0.0" ]; @@ -67565,7 +65398,7 @@ in sources."@expo/image-utils-0.3.21" sources."@expo/json-file-8.2.36" sources."commander-7.2.0" - sources."debug-4.3.5" + sources."debug-4.3.7" (sources."expo-modules-autolinking-0.8.1" // { dependencies = [ sources."fs-extra-9.1.0" @@ -67574,7 +65407,7 @@ in sources."json5-1.0.2" sources."jsonfile-6.1.0" sources."mime-2.6.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."tempy-0.3.0" sources."universalify-2.0.1" ]; @@ -67604,7 +65437,7 @@ in sources."@hapi/topo-5.1.0" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" sources."strip-ansi-7.1.0" sources."wrap-ansi-8.1.0" @@ -67618,10 +65451,10 @@ in sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@leichtgewicht/ip-codec-2.0.5" - sources."@module-federation/runtime-0.1.6" - sources."@module-federation/runtime-tools-0.1.6" - sources."@module-federation/sdk-0.1.6" - sources."@module-federation/webpack-bundler-runtime-0.1.6" + sources."@module-federation/runtime-0.5.1" + sources."@module-federation/runtime-tools-0.5.1" + sources."@module-federation/sdk-0.5.1" + sources."@module-federation/webpack-bundler-runtime-0.5.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -67636,14 +65469,15 @@ in ]; }) sources."@react-native/normalize-color-2.1.0" - sources."@rspack/binding-0.7.5" - sources."@rspack/core-0.7.5" + sources."@rspack/binding-1.0.5" + sources."@rspack/core-1.0.5" + sources."@rspack/lite-tapable-1.0.0" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.5" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-4.6.0" - sources."@swc/helpers-0.5.12" + sources."@swc/helpers-0.5.13" sources."@szmarczak/http-timer-4.0.6" sources."@trysound/sax-0.2.0" sources."@types/body-parser-1.19.5" @@ -67651,16 +65485,14 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/connect-3.4.38" sources."@types/connect-history-api-fallback-1.5.4" - sources."@types/eslint-9.6.0" - sources."@types/eslint-scope-3.7.7" - sources."@types/estree-1.0.5" + sources."@types/estree-1.0.6" sources."@types/express-4.17.21" sources."@types/express-serve-static-core-4.19.5" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-6.1.0" sources."@types/http-cache-semantics-4.0.4" sources."@types/http-errors-2.0.4" - sources."@types/http-proxy-1.17.14" + sources."@types/http-proxy-1.17.15" sources."@types/istanbul-lib-coverage-2.0.6" sources."@types/istanbul-lib-report-3.0.3" sources."@types/istanbul-reports-3.0.4" @@ -67668,9 +65500,9 @@ in sources."@types/keyv-3.1.4" sources."@types/mime-1.3.5" sources."@types/minimatch-5.1.2" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/node-forge-1.3.11" - sources."@types/qs-6.9.15" + sources."@types/qs-6.9.16" sources."@types/range-parser-1.2.7" sources."@types/responselike-1.0.3" sources."@types/retry-0.12.5" @@ -67678,7 +65510,7 @@ in sources."@types/serve-index-1.9.4" sources."@types/serve-static-1.15.7" sources."@types/sockjs-0.3.36" - sources."@types/ws-8.5.11" + sources."@types/ws-8.5.12" sources."@types/yargs-15.0.19" sources."@types/yargs-parser-21.0.3" sources."@urql/core-2.3.6" @@ -67707,8 +65539,8 @@ in sources."acorn-import-attributes-1.9.5" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."aggregate-error-3.1.0" @@ -67751,7 +65583,7 @@ in sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.7" sources."axios-0.21.1" - (sources."babel-loader-8.3.0" // { + (sources."babel-loader-8.4.1" // { dependencies = [ sources."schema-utils-2.7.1" ]; @@ -67766,7 +65598,7 @@ in sources."semver-6.3.1" ]; }) - sources."babel-plugin-polyfill-corejs3-0.10.4" + sources."babel-plugin-polyfill-corejs3-0.10.6" sources."babel-plugin-polyfill-regenerator-0.6.2" sources."babel-plugin-react-native-web-0.18.12" sources."babel-preset-expo-9.3.2" @@ -67792,7 +65624,7 @@ in sources."bplist-parser-0.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.3" - sources."browserslist-4.23.2" + sources."browserslist-4.23.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" @@ -67814,7 +65646,7 @@ in sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001643" + sources."caniuse-lite-1.0.30001662" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -67878,7 +65710,7 @@ in sources."schema-utils-4.2.0" ]; }) - sources."core-js-compat-3.37.1" + sources."core-js-compat-3.38.1" sources."core-util-is-1.0.3" sources."cross-fetch-3.1.8" (sources."cross-spawn-6.0.5" // { @@ -67958,7 +65790,7 @@ in sources."duplexer3-0.1.5" sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.5.1" + sources."electron-to-chromium-1.5.26" sources."emoji-regex-9.2.2" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -67979,7 +65811,7 @@ in sources."es-object-atoms-1.0.0" sources."es-set-tostringtag-2.0.3" sources."es-to-primitive-1.2.1" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."eslint-scope-5.1.1" @@ -68003,11 +65835,11 @@ in (sources."expo-48.0.21" // { dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/runtime-7.24.8" + sources."@babel/runtime-7.25.6" sources."@expo/config-8.0.5" sources."@expo/config-plugins-6.0.2" - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" sources."semver-7.6.3" sources."slash-3.0.0" sources."uuid-3.4.0" @@ -68019,10 +65851,10 @@ in sources."@babel/code-frame-7.10.4" sources."@expo/config-8.0.5" sources."@expo/config-plugins-6.0.2" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."expo-constants-14.3.0" sources."expo-file-system-15.3.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."semver-7.6.3" sources."slash-3.0.0" sources."uuid-3.4.0" @@ -68033,8 +65865,8 @@ in sources."@babel/code-frame-7.10.4" sources."@expo/config-8.0.5" sources."@expo/config-plugins-6.0.2" - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" sources."semver-7.6.3" sources."slash-3.0.0" sources."uuid-3.4.0" @@ -68089,10 +65921,10 @@ in ]; }) sources."find-yarn-workspace-root-2.0.0" - sources."follow-redirects-1.15.6" + sources."follow-redirects-1.15.9" sources."fontfaceobserver-2.3.0" sources."for-each-0.3.3" - (sources."foreground-child-3.2.1" // { + (sources."foreground-child-3.3.0" // { dependencies = [ sources."cross-spawn-7.0.3" sources."path-key-3.1.1" @@ -68177,14 +66009,14 @@ in sources."http2-wrapper-1.0.3" (sources."https-proxy-agent-5.0.1" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."human-signals-2.1.0" sources."iconv-lite-0.4.23" sources."icss-utils-5.1.0" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" @@ -68202,7 +66034,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.7" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-data-view-1.0.1" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" @@ -68286,7 +66118,7 @@ in sources."keyv-4.5.4" sources."kleur-3.0.3" sources."latest-version-5.1.0" - sources."launch-editor-2.8.0" + sources."launch-editor-2.9.1" sources."leven-3.1.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" @@ -68306,11 +66138,7 @@ in sources."loose-envify-1.4.0" sources."lower-case-2.0.2" sources."lowercase-keys-2.0.0" - (sources."lru-cache-5.1.1" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) + sources."lru-cache-10.4.3" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.1" @@ -68328,13 +66156,13 @@ in sources."merge2-1.4.1" sources."methods-1.1.2" sources."metro-react-native-babel-preset-0.73.9" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mime-1.4.1" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - (sources."mini-css-extract-plugin-2.9.0" // { + (sources."mini-css-extract-plugin-2.9.1" // { dependencies = [ sources."ajv-8.17.1" sources."ajv-keywords-5.1.0" @@ -68374,7 +66202,7 @@ in sources."no-case-3.0.4" sources."node-fetch-2.7.0" sources."node-forge-0.10.0" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."node-html-parser-5.4.2" sources."node-releases-2.0.18" sources."normalize-path-3.0.0" @@ -68462,13 +66290,12 @@ in sources."path-parse-1.0.7" (sources."path-scurry-1.11.1" // { dependencies = [ - sources."lru-cache-10.4.3" sources."minipass-7.1.2" ]; }) sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pinkie-2.0.4" @@ -68490,7 +66317,7 @@ in sources."plist-3.1.0" sources."pngjs-3.4.0" sources."possible-typed-array-names-1.0.0" - sources."postcss-8.4.40" + sources."postcss-8.4.47" sources."postcss-calc-8.2.4" sources."postcss-colormin-5.3.1" sources."postcss-convert-values-5.1.3" @@ -68520,7 +66347,7 @@ in sources."postcss-ordered-values-5.1.3" sources."postcss-reduce-initial-5.1.2" sources."postcss-reduce-transforms-5.1.0" - sources."postcss-selector-parser-6.1.1" + sources."postcss-selector-parser-6.1.2" sources."postcss-svgo-5.1.0" sources."postcss-unique-selectors-5.1.1" sources."postcss-value-parser-4.2.0" @@ -68542,7 +66369,7 @@ in sources."promise-inflight-1.0.1" sources."prompts-2.4.2" sources."proxy-addr-2.0.7" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" sources."qrcode-terminal-0.11.0" sources."qs-6.5.2" @@ -68560,7 +66387,7 @@ in sources."readable-stream-2.3.8" sources."readdirp-3.6.0" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.1" + sources."regenerate-unicode-properties-10.2.0" sources."regenerator-runtime-0.14.1" sources."regenerator-transform-0.15.2" sources."regexp.prototype.flags-1.5.2" @@ -68640,7 +66467,7 @@ in sources."sockjs-0.3.24" sources."source-list-map-2.0.1" sources."source-map-0.6.1" - sources."source-map-js-1.2.0" + sources."source-map-js-1.2.1" (sources."source-map-loader-3.0.2" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -68653,14 +66480,14 @@ in }) (sources."spdy-4.0.2" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" sources."readable-stream-3.6.2" ]; }) @@ -68673,7 +66500,7 @@ in sources."stream-parser-0.3.1" (sources."string-width-5.1.2" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."strip-ansi-7.1.0" ]; }) @@ -68749,7 +66576,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.31.3" // { + (sources."terser-5.33.0" // { dependencies = [ sources."commander-2.20.3" sources."source-map-support-0.5.21" @@ -68767,10 +66594,10 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tr46-0.0.3" - sources."traverse-0.6.9" + sources."traverse-0.6.10" sources."tree-kill-1.2.2" sources."ts-interface-checker-0.1.13" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."turndown-7.0.0" sources."type-fest-0.3.1" sources."type-is-1.6.18" @@ -68780,12 +66607,12 @@ in sources."typed-array-length-1.0.6" sources."typedarray-0.0.6" sources."typedarray.prototype.slice-1.0.3" - sources."ua-parser-js-1.0.38" + sources."ua-parser-js-1.0.39" sources."unbox-primitive-1.0.2" - sources."undici-types-5.26.5" - sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."undici-types-6.19.8" + sources."unicode-canonical-property-names-ecmascript-2.0.1" sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.1.0" + sources."unicode-match-property-value-ecmascript-2.2.0" sources."unicode-property-aliases-ecmascript-2.1.0" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -68816,11 +66643,11 @@ in sources."valid-url-1.0.9" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" - sources."watchpack-2.4.1" + sources."watchpack-2.4.2" sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" - sources."webpack-5.93.0" + sources."webpack-5.94.0" (sources."webpack-dev-middleware-5.3.4" // { dependencies = [ sources."ajv-8.17.1" @@ -68834,7 +66661,7 @@ in sources."@types/retry-0.12.0" sources."ajv-8.17.1" sources."ajv-keywords-5.1.0" - sources."body-parser-1.20.2" + sources."body-parser-1.20.3" sources."bytes-3.1.2" sources."content-disposition-0.5.4" sources."cookie-0.6.0" @@ -68842,15 +66669,17 @@ in sources."default-gateway-6.0.3" sources."depd-2.0.0" sources."destroy-1.2.0" + sources."encodeurl-2.0.0" sources."execa-5.1.1" - sources."express-4.19.2" - sources."finalhandler-1.2.0" + sources."express-4.21.0" + sources."finalhandler-1.3.1" sources."get-stream-6.0.1" sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" sources."ipaddr.js-2.2.0" sources."is-stream-2.0.1" sources."json-schema-traverse-1.0.0" + sources."merge-descriptors-1.0.3" sources."mime-1.6.0" sources."mimic-fn-2.1.0" sources."ms-2.1.3" @@ -68859,14 +66688,19 @@ in sources."onetime-5.1.2" sources."p-retry-4.6.2" sources."path-key-3.1.1" - sources."qs-6.11.0" + sources."path-to-regexp-0.1.10" + sources."qs-6.13.0" sources."raw-body-2.5.2" sources."retry-0.13.1" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."schema-utils-4.2.0" - sources."send-0.18.0" - sources."serve-static-1.15.0" + (sources."send-0.19.0" // { + dependencies = [ + sources."encodeurl-1.0.2" + ]; + }) + sources."serve-static-1.16.2" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -68966,13 +66800,13 @@ in }) sources."@puppeteer/browsers-2.3.0" sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."@types/node-20.14.12" - sources."@types/prop-types-15.7.12" - sources."@types/react-18.3.3" + sources."@types/node-22.5.5" + sources."@types/prop-types-15.7.13" + sources."@types/react-18.3.8" sources."@types/yauzl-2.10.3" sources."agent-base-7.1.1" sources."ansi-escapes-7.0.0" - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" sources."argparse-2.0.1" sources."ast-types-0.13.4" @@ -68985,7 +66819,7 @@ in sources."bufferutil-4.0.8" sources."callsites-3.1.0" sources."chalk-5.3.0" - sources."chromium-bidi-0.6.2" + sources."chromium-bidi-0.6.3" sources."cli-boxes-3.0.0" sources."cli-cursor-4.0.0" sources."cli-spinners-2.9.2" @@ -69014,15 +66848,15 @@ in sources."cosmiconfig-9.0.0" sources."csstype-3.1.3" sources."data-uri-to-buffer-6.0.2" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."degenerator-5.0.1" sources."devtools-protocol-0.0.1312386" - sources."emoji-regex-10.3.0" + sources."emoji-regex-10.4.0" sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" sources."environment-1.1.0" sources."error-ex-1.3.2" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-string-regexp-2.0.0" sources."escodegen-2.1.0" sources."esprima-4.0.1" @@ -69061,9 +66895,9 @@ in sources."meow-13.2.0" sources."mimic-fn-2.1.0" sources."mitt-3.0.1" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."netmask-2.0.2" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."once-1.4.0" sources."onetime-5.1.2" sources."pac-proxy-agent-7.0.2" @@ -69072,13 +66906,13 @@ in sources."parse-json-5.2.0" sources."patch-console-2.0.0" sources."pend-1.2.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."progress-2.0.3" sources."proxy-agent-6.4.0" sources."proxy-from-env-1.1.0" - sources."pump-3.0.0" - sources."puppeteer-22.14.0" - sources."puppeteer-core-22.14.0" + sources."pump-3.0.2" + sources."puppeteer-22.15.0" + sources."puppeteer-core-22.15.0" sources."queue-tick-1.0.1" sources."react-18.3.1" (sources."react-devtools-core-4.28.5" // { @@ -69106,19 +66940,19 @@ in sources."source-map-0.6.1" sources."sprintf-js-1.1.3" sources."stack-utils-2.0.6" - sources."streamx-2.18.0" + sources."streamx-2.20.1" sources."string-width-7.2.0" sources."strip-ansi-7.1.0" sources."supports-color-5.5.0" sources."tar-fs-3.0.6" sources."tar-stream-3.1.7" - sources."text-decoder-1.1.1" + sources."text-decoder-1.2.0" sources."through-2.3.8" - sources."tslib-2.6.3" - sources."type-fest-4.23.0" - sources."typescript-5.5.4" + sources."tslib-2.7.0" + sources."type-fest-4.26.1" + sources."typescript-5.6.2" sources."unbzip2-stream-1.4.3" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."unicorn-magic-0.2.0" sources."universalify-2.0.1" sources."urlpattern-polyfill-10.0.0" @@ -69155,10 +66989,10 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "1.3.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-1.3.1.tgz"; - sha512 = "ILJSsLuUers5JpuYvtW6cNUF/AJ9Tay73wnsfA5dPjktt/hs0KCafK1pZ3ZC2ICiXe7SorcS9Pqlni5njqHkcg=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-2.0.2.tgz"; + sha512 = "gxnsoRoMyFmlXc2zwaKwxHF7vDDAxbm2l93fUS3hrt5yWrsYtAiW8I09MJ+MnTCkt420XdJEL7D+uohwm1D5hg=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -69172,7 +67006,7 @@ in sources."@inquirer/prompts-3.3.2" sources."@inquirer/rawlist-1.2.16" sources."@inquirer/select-1.3.3" - sources."@inquirer/type-1.5.1" + sources."@inquirer/type-1.5.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.9" @@ -69180,7 +67014,7 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@oclif/color-1.0.13" - (sources."@oclif/core-2.16.0" // { + (sources."@oclif/core-4.0.22" // { dependencies = [ sources."wrap-ansi-7.0.0" ]; @@ -69194,35 +67028,45 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/plugin-help-5.2.20" - sources."@oclif/plugin-plugins-2.4.7" + (sources."@oclif/plugin-help-5.2.20" // { + dependencies = [ + sources."@oclif/core-2.16.0" + sources."wrap-ansi-7.0.0" + ]; + }) + (sources."@oclif/plugin-plugins-2.4.7" // { + dependencies = [ + sources."@oclif/core-2.16.0" + sources."wrap-ansi-7.0.0" + ]; + }) sources."@oclif/screen-1.0.4" - sources."@swc/core-1.7.1" + sources."@swc/core-1.7.26" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.12" + sources."@swc/helpers-0.5.13" sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.1" + sources."@swc/wasm-1.7.26" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/cli-progress-3.11.6" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.12" + sources."@types/node-20.16.5" sources."@types/wrap-ansi-3.0.0" sources."acorn-8.12.1" - sources."acorn-walk-8.3.3" + sources."acorn-walk-8.3.4" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" + sources."ansis-3.3.2" sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-union-2.1.0" sources."astral-regex-2.0.0" - sources."async-3.2.5" - sources."asynckit-0.4.0" + sources."async-3.2.6" sources."at-least-node-1.0.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -69286,7 +67130,6 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.0.3" - sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."content-type-1.0.5" sources."create-require-1.1.1" @@ -69294,10 +67137,9 @@ in sources."cross-spawn-7.0.3" sources."csv-parse-5.5.6" sources."csv-stream-0.2.0" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."deep-is-0.1.4" sources."defaults-1.0.4" - sources."delayed-stream-1.0.0" sources."diff-4.0.2" sources."dir-glob-3.0.1" sources."dotenv-8.6.0" @@ -69329,7 +67171,6 @@ in }) sources."fill-range-7.1.1" sources."fn-annotate-1.2.0" - sources."form-data-4.0.0" sources."fs-extra-9.1.0" sources."get-package-type-0.1.0" sources."glob-parent-5.1.2" @@ -69340,7 +67181,7 @@ in sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -69363,11 +67204,17 @@ in sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."jake-10.9.2" + (sources."jake-10.9.2" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."jsonfile-6.1.0" sources."levn-0.3.0" + sources."lilconfig-3.1.2" (sources."load-json-file-5.3.0" // { dependencies = [ sources."type-fest-0.3.1" @@ -69377,17 +67224,11 @@ in sources."log-symbols-4.1.0" sources."make-error-1.3.6" sources."merge2-1.4.1" - sources."micromatch-4.0.7" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" + sources."micromatch-4.0.8" sources."mimic-fn-2.1.0" - (sources."minimatch-3.1.2" // { - dependencies = [ - sources."brace-expansion-1.1.11" - ]; - }) + sources."minimatch-9.0.5" sources."moment-2.30.1" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-1.0.0" sources."natural-orderby-2.0.3" sources."node-abort-controller-3.1.1" @@ -69449,12 +67290,12 @@ in sources."tr46-0.0.3" sources."treeify-1.1.0" sources."ts-node-10.9.2" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-fest-0.21.3" - sources."typescript-5.5.4" - sources."undici-types-5.26.5" + sources."typescript-5.6.2" + sources."undici-types-6.19.8" sources."universalify-2.0.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" @@ -69488,10 +67329,10 @@ in sha512 = "+eT/06NHwPXfzUSe4vDjjam9gZtalhwDYOq0xX6va88BLZd8APbo17Ajkz4hdnr2Gpls5+xFUqMeiklAQtBHYQ=="; }; dependencies = [ - sources."@inquirer/figures-1.0.5" + sources."@inquirer/figures-1.0.6" sources."aggregate-error-5.0.0" sources."ansi-escapes-4.3.2" - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" sources."base64-js-1.5.1" sources."bl-4.1.0" @@ -69508,7 +67349,7 @@ in sources."color-name-1.1.4" sources."cross-spawn-7.0.3" sources."defaults-1.0.4" - sources."emoji-regex-10.3.0" + sources."emoji-regex-10.4.0" sources."esc-exit-3.0.1" sources."escape-string-regexp-5.0.0" sources."execa-8.0.1" @@ -69575,7 +67416,7 @@ in }) sources."os-tmpdir-1.0.2" sources."path-key-3.1.1" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."pid-port-1.0.0" sources."process-exists-5.0.0" sources."ps-list-8.1.1" @@ -69609,7 +67450,7 @@ in ]; }) sources."tmp-0.0.33" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."type-fest-0.21.3" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" @@ -69649,12 +67490,12 @@ in sources."@ethereumjs/util-8.1.0" sources."@noble/curves-1.4.2" sources."@noble/hashes-1.4.0" - sources."@scure/base-1.1.7" + sources."@scure/base-1.1.9" sources."@scure/bip32-1.4.0" sources."@scure/bip39-1.3.0" sources."@types/atob-2.1.4" sources."@types/inquirer-6.5.0" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/through-0.0.33" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -69668,7 +67509,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."bcrypt-pbkdf-1.0.2" sources."binary-search-tree-0.2.5" sources."bluebird-3.7.2" @@ -69699,7 +67540,7 @@ in }) sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."ethereum-bloom-filters-1.1.0" + sources."ethereum-bloom-filters-1.2.0" sources."ethereum-cryptography-2.2.1" (sources."ethjs-unit-0.1.6" // { dependencies = [ @@ -69802,7 +67643,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.21.3" sources."underscore-1.4.4" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."universalify-2.0.1" sources."untildify-4.0.0" sources."uri-js-4.4.1" @@ -69864,12 +67705,7 @@ in sources."binary-extensions-1.13.1" sources."bindings-1.5.0" sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."braces-2.3.2" (sources."broadway-0.3.6" // { dependencies = [ sources."async-0.2.10" @@ -69936,28 +67772,23 @@ in (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" sources."is-descriptor-0.1.7" + ]; + }) + (sources."extend-shallow-2.0.1" // { + dependencies = [ sources."is-extendable-0.1.1" ]; }) - sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" ]; }) sources."eyes-0.1.8" sources."fecha-4.2.3" sources."file-uri-to-path-1.0.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."fill-range-4.0.0" sources."flatiron-0.4.3" sources."fn.name-1.1.0" sources."for-each-0.3.3" @@ -70013,11 +67844,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-map-2.0.3" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-3.0.0" sources."is-number-object-1.0.7" sources."is-obj-1.0.1" sources."is-plain-object-2.0.4" @@ -70033,7 +67860,7 @@ in sources."isarray-2.0.5" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."kind-of-6.0.3" + sources."kind-of-3.2.2" sources."kuler-2.0.0" sources."lazy-1.0.11" sources."logform-2.6.1" @@ -70041,7 +67868,12 @@ in sources."map-cache-0.2.2" sources."map-stream-0.1.0" sources."map-visit-1.0.0" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."kind-of-6.0.3" + ]; + }) sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."mixin-deep-1.3.2" @@ -70049,7 +67881,12 @@ in sources."ms-2.1.3" sources."mute-stream-0.0.8" sources."nan-2.20.0" - sources."nanomatch-1.2.13" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."kind-of-6.0.3" + ]; + }) (sources."nconf-0.6.9" // { dependencies = [ sources."async-0.2.9" @@ -70067,7 +67904,6 @@ in dependencies = [ sources."define-property-0.2.5" sources."is-descriptor-0.1.7" - sources."kind-of-3.2.2" ]; }) sources."object-inspect-1.13.2" @@ -70114,7 +67950,11 @@ in sources."string_decoder-1.1.1" ]; }) - sources."regex-not-1.0.2" + (sources."regex-not-1.0.2" // { + dependencies = [ + sources."extend-shallow-3.0.2" + ]; + }) sources."regexp.prototype.flags-1.5.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" @@ -70125,12 +67965,11 @@ in sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - sources."safe-stable-stringify-2.4.3" + sources."safe-stable-stringify-2.5.0" sources."set-function-length-1.2.2" sources."set-function-name-2.0.2" (sources."set-value-2.0.1" // { dependencies = [ - sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" ]; }) @@ -70141,9 +67980,7 @@ in (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" sources."is-descriptor-0.1.7" - sources."is-extendable-0.1.1" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -70151,16 +67988,16 @@ in sources."define-property-1.0.0" ]; }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."split-0.3.3" - sources."split-string-3.1.0" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + ]; + }) sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { dependencies = [ @@ -70174,12 +68011,12 @@ in sources."strip-json-comments-3.1.1" sources."text-hex-1.0.0" sources."through-2.3.8" - (sources."to-object-path-0.3.0" // { + sources."to-object-path-0.3.0" + (sources."to-regex-3.0.2" // { dependencies = [ - sources."kind-of-3.2.2" + sources."extend-shallow-3.0.2" ]; }) - sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."triple-beam-1.4.1" (sources."union-value-1.0.1" // { @@ -70211,9 +68048,9 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.2" sources."which-typed-array-1.1.15" - (sources."winston-3.13.1" // { + (sources."winston-3.14.2" // { dependencies = [ - sources."async-3.2.5" + sources."async-3.2.6" ]; }) sources."winston-transport-4.7.1" @@ -70265,9 +68102,9 @@ in sources."utf-8-validate-6.0.3" ]; }) - sources."@types/bn.js-5.1.5" + sources."@types/bn.js-5.1.6" sources."@types/lru-cache-5.1.1" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -70289,9 +68126,9 @@ in sources."level-transcoder-1.0.1" sources."lodash-4.17.21" sources."module-error-1.0.2" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."queue-microtask-1.2.3" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."utf-8-validate-5.0.7" sources."ws-8.13.0" ]; @@ -70316,55 +68153,51 @@ in dependencies = [ sources."@ampproject/remapping-2.3.0" sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.9" - (sources."@babel/core-7.24.9" // { + sources."@babel/compat-data-7.25.4" + (sources."@babel/core-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.10" + sources."@babel/generator-7.25.6" sources."@babel/helper-annotate-as-pure-7.24.7" - (sources."@babel/helper-compilation-targets-7.24.8" // { + (sources."@babel/helper-compilation-targets-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-class-features-plugin-7.24.8" // { + (sources."@babel/helper-create-class-features-plugin-7.25.4" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.24.7" - sources."@babel/helper-function-name-7.24.7" - sources."@babel/helper-hoist-variables-7.24.7" sources."@babel/helper-member-expression-to-functions-7.24.8" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.9" + sources."@babel/helper-module-transforms-7.25.2" sources."@babel/helper-optimise-call-expression-7.24.7" sources."@babel/helper-plugin-utils-7.24.8" - sources."@babel/helper-replace-supers-7.24.7" + sources."@babel/helper-replace-supers-7.25.0" sources."@babel/helper-simple-access-7.24.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.24.7" - sources."@babel/helper-split-export-declaration-7.24.7" sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" sources."@babel/helper-validator-option-7.24.8" - sources."@babel/helpers-7.24.8" + sources."@babel/helpers-7.25.6" (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.24.8" + sources."@babel/parser-7.25.6" sources."@babel/plugin-syntax-jsx-7.24.7" - sources."@babel/plugin-syntax-typescript-7.24.7" + sources."@babel/plugin-syntax-typescript-7.25.4" sources."@babel/plugin-transform-modules-commonjs-7.24.8" - sources."@babel/plugin-transform-typescript-7.24.8" + sources."@babel/plugin-transform-typescript-7.25.2" sources."@babel/preset-typescript-7.24.7" - sources."@babel/runtime-7.24.8" - sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.8" - sources."@babel/types-7.24.9" + sources."@babel/runtime-7.25.6" + sources."@babel/template-7.25.0" + sources."@babel/traverse-7.25.6" + sources."@babel/types-7.25.6" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.3.5" @@ -70390,7 +68223,7 @@ in sources."@types/common-tags-1.8.4" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/node-fetch-2.6.11" sources."@types/responselike-1.0.3" sources."@types/yoga-layout-1.9.2" @@ -70406,7 +68239,7 @@ in sources."better-opn-2.1.1" sources."boolbase-1.0.0" sources."boxen-5.1.2" - sources."browserslist-4.23.2" + sources."browserslist-4.23.3" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.4" // { dependencies = [ @@ -70414,7 +68247,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001643" + sources."caniuse-lite-1.0.30001662" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -70457,7 +68290,7 @@ in sources."crypto-random-string-2.0.0" sources."css-select-4.3.0" sources."css-what-6.1.0" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."decamelize-1.2.0" (sources."decompress-response-6.0.0" // { dependencies = [ @@ -70472,13 +68305,13 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.5.1" + sources."electron-to-chromium-1.5.26" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."entities-2.2.0" - sources."envinfo-7.13.0" - sources."escalade-3.1.2" + sources."envinfo-7.14.0" + sources."escalade-3.2.0" sources."escape-string-regexp-1.0.5" (sources."execa-5.1.1" // { dependencies = [ @@ -70574,7 +68407,7 @@ in sources."mime-types-2.1.35" sources."mimic-fn-4.0.0" sources."mimic-response-1.0.1" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."msgpackr-1.11.0" sources."mute-stream-0.0.8" sources."node-addon-api-4.3.0" @@ -70604,13 +68437,13 @@ in sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."peek-readable-4.1.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."pretty-error-2.1.2" sources."progress-2.0.3" sources."prompts-2.4.2" sources."proper-lockfile-4.1.2" sources."protocols-2.0.1" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."quick-lru-5.1.1" sources."read-1.0.7" sources."readable-stream-3.6.2" @@ -70666,7 +68499,7 @@ in sources."tslib-1.14.1" sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."unique-string-2.0.0" sources."universalify-2.0.1" sources."update-browserslist-db-1.1.0" @@ -70718,15 +68551,15 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "40.1.2"; + version = "40.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-40.1.2.tgz"; - sha512 = "jCpOPJaPTDLkQ85KraJOQHHmcBZkIY7p1vsrfhBOQK8hzt8JGR9SmcbsnK13tMWdCnu54XtSsLXiQXslNL77yA=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-40.2.1.tgz"; + sha512 = "clOBPD4caals0A9Qmusm9R+66W52GTrf8f5tYu2Q2UZIzGqKSdbQktO1h5EzUByYYZFioCzXtr+iLzaHtuaGLg=="; }; dependencies = [ - sources."@gitbeaker/core-40.1.2" - sources."@gitbeaker/requester-utils-40.1.2" - sources."@gitbeaker/rest-40.1.2" + sources."@gitbeaker/core-40.2.1" + sources."@gitbeaker/requester-utils-40.2.1" + sources."@gitbeaker/rest-40.2.1" sources."ansi-styles-4.3.0" sources."call-bind-1.0.7" sources."chalk-4.1.2" @@ -70745,7 +68578,7 @@ in sources."hasown-2.0.2" sources."object-inspect-1.13.2" sources."picomatch-browser-2.2.6" - sources."qs-6.12.3" + sources."qs-6.13.0" sources."rate-limiter-flexible-4.0.1" sources."set-function-length-1.2.2" sources."side-channel-1.0.6" @@ -70847,6 +68680,7 @@ in (sources."@graphql-tools/import-6.7.18" // { dependencies = [ sources."@graphql-tools/utils-9.2.1" + sources."resolve-from-5.0.0" ]; }) (sources."@graphql-tools/json-file-loader-6.2.6" // { @@ -70912,7 +68746,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/parse-json-4.0.2" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -70934,7 +68768,7 @@ in sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.7" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."backo2-1.0.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -70996,7 +68830,7 @@ in sources."cross-spawn-6.0.5" sources."dashdash-1.14.1" sources."dataloader-2.0.0" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."decompress-response-3.3.0" sources."deep-equal-2.2.3" sources."deep-extend-0.6.0" @@ -71016,7 +68850,7 @@ in sources."es-errors-1.3.0" sources."es-get-iterator-1.1.3" sources."es6-promise-3.3.1" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."event-target-shim-5.0.1" @@ -71087,13 +68921,13 @@ in sources."http2-client-1.3.5" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" - sources."ignore-5.3.1" - (sources."import-fresh-3.3.0" // { + sources."ignore-5.3.2" + sources."import-fresh-3.3.0" + (sources."import-from-3.0.0" // { dependencies = [ - sources."resolve-from-4.0.0" + sources."resolve-from-5.0.0" ]; }) - sources."import-from-3.0.0" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -71172,7 +69006,7 @@ in sources."mem-5.1.1" sources."merge2-1.4.1" sources."meros-1.1.4" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" @@ -71182,14 +69016,14 @@ in sources."minipass-3.3.6" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-0.0.8" sources."nice-try-1.0.5" sources."no-case-3.0.4" sources."node-emoji-1.10.0" sources."node-fetch-2.7.0" sources."node-fetch-h2-2.3.0" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."node-readfiles-0.2.0" sources."normalize-path-2.1.1" sources."normalize-url-4.5.1" @@ -71244,13 +69078,13 @@ in sources."path-key-2.0.1" sources."path-type-4.0.0" sources."performance-now-2.1.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pluralize-8.0.0" sources."possible-typed-array-names-1.0.0" sources."prepend-http-2.0.0" sources."psl-1.9.0" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" sources."qs-6.5.3" sources."queue-microtask-1.2.3" @@ -71266,7 +69100,7 @@ in ]; }) sources."require-directory-2.1.1" - sources."resolve-from-5.0.0" + sources."resolve-from-4.0.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" @@ -71321,11 +69155,11 @@ in sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."tr46-0.0.3" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."universalify-1.0.0" sources."unixify-1.0.0" sources."uri-js-4.4.1" @@ -71365,61 +69199,130 @@ in graphql-language-service-cli = nodeEnv.buildNodePackage { name = "graphql-language-service-cli"; packageName = "graphql-language-service-cli"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.4.1.tgz"; - sha512 = "bWnSJ6ibIAS8h2rR7DV+12FxoVPeJbcR9Du/WHGXMIj0eDwartZPX9NaXmlX6wInSdjjQm6BWdQt1dsim8Eu+w=="; + url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.5.0.tgz"; + sha512 = "H8QakLrpub/lrUrvxeiubOMTNWuM1Z9ntwk2YlRS3II6Rz3LnwzO4ZYsKVTplrEQkG8HqYkbOOo1CbXyGRdQWA=="; }; dependencies = [ sources."@ampproject/remapping-2.3.0" sources."@ardatan/sync-fetch-0.0.1" - sources."@astrojs/compiler-2.9.2" + sources."@astrojs/compiler-2.10.3" sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.9" - sources."@babel/core-7.24.9" - sources."@babel/generator-7.24.10" - (sources."@babel/helper-compilation-targets-7.24.8" // { + sources."@babel/compat-data-7.25.4" + sources."@babel/core-7.25.2" + sources."@babel/generator-7.25.6" + (sources."@babel/helper-compilation-targets-7.25.2" // { dependencies = [ sources."lru-cache-5.1.1" ]; }) - sources."@babel/helper-environment-visitor-7.24.7" - sources."@babel/helper-function-name-7.24.7" - sources."@babel/helper-hoist-variables-7.24.7" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.9" + sources."@babel/helper-module-transforms-7.25.2" sources."@babel/helper-plugin-utils-7.24.8" sources."@babel/helper-simple-access-7.24.7" - sources."@babel/helper-split-export-declaration-7.24.7" sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" sources."@babel/helper-validator-option-7.24.8" - sources."@babel/helpers-7.24.8" + sources."@babel/helpers-7.25.6" sources."@babel/highlight-7.24.7" - sources."@babel/parser-7.24.8" - sources."@babel/plugin-syntax-import-assertions-7.24.7" + sources."@babel/parser-7.25.6" + sources."@babel/plugin-syntax-import-assertions-7.25.6" sources."@babel/polyfill-7.12.1" - sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.8" - sources."@babel/types-7.24.9" - sources."@graphql-tools/batch-execute-9.0.4" - sources."@graphql-tools/code-file-loader-8.0.3" - sources."@graphql-tools/delegate-10.0.16" - sources."@graphql-tools/executor-1.3.0" - sources."@graphql-tools/executor-graphql-ws-1.2.0" - sources."@graphql-tools/executor-http-1.1.5" - sources."@graphql-tools/executor-legacy-ws-1.1.0" - sources."@graphql-tools/graphql-file-loader-8.0.1" - sources."@graphql-tools/graphql-tag-pluck-8.1.0" - sources."@graphql-tools/import-7.0.1" - sources."@graphql-tools/json-file-loader-8.0.1" - sources."@graphql-tools/load-8.0.2" - sources."@graphql-tools/merge-9.0.4" - sources."@graphql-tools/schema-10.0.4" - sources."@graphql-tools/url-loader-8.0.2" - sources."@graphql-tools/utils-10.3.2" - sources."@graphql-tools/wrap-10.0.5" - sources."@graphql-typed-document-node/core-3.2.0" + sources."@babel/template-7.25.0" + sources."@babel/traverse-7.25.6" + sources."@babel/types-7.25.6" + (sources."@graphql-tools/batch-execute-9.0.4" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/code-file-loader-8.0.3" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/delegate-10.0.21" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/executor-1.3.1" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/executor-graphql-ws-1.2.0" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/executor-http-1.1.6" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/executor-legacy-ws-1.1.0" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/graphql-file-loader-8.0.1" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/graphql-tag-pluck-8.1.0" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/import-7.0.1" // { + dependencies = [ + sources."graphql-16.9.0" + sources."resolve-from-5.0.0" + ]; + }) + (sources."@graphql-tools/json-file-loader-8.0.1" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/load-8.0.2" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/merge-9.0.7" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/schema-10.0.6" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/url-loader-8.0.2" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/utils-10.5.4" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-tools/wrap-10.0.5" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) + (sources."@graphql-typed-document-node/core-3.2.0" // { + dependencies = [ + sources."graphql-16.9.0" + ]; + }) sources."@iarna/toml-2.2.5" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" @@ -71430,47 +69333,46 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@pkgr/core-0.1.1" sources."@repeaterjs/repeater-3.0.6" - sources."@types/estree-1.0.5" - sources."@types/node-20.14.12" - sources."@types/ws-8.5.11" + sources."@types/estree-1.0.6" + sources."@types/node-22.5.5" + sources."@types/ws-8.5.12" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.3" - (sources."@vue/compiler-core-3.4.34" // { + (sources."@vue/compiler-core-3.5.6" // { dependencies = [ - sources."estree-walker-2.0.2" - sources."source-map-js-1.2.0" + sources."source-map-js-1.2.1" ]; }) - sources."@vue/compiler-dom-3.4.34" - (sources."@vue/compiler-sfc-3.4.34" // { + sources."@vue/compiler-dom-3.5.6" + (sources."@vue/compiler-sfc-3.5.6" // { dependencies = [ - sources."estree-walker-2.0.2" - sources."source-map-js-1.2.0" + sources."source-map-js-1.2.1" ]; }) - sources."@vue/compiler-ssr-3.4.34" - sources."@vue/shared-3.4.34" - sources."@whatwg-node/events-0.1.1" - sources."@whatwg-node/fetch-0.9.18" - sources."@whatwg-node/node-fetch-0.5.14" + sources."@vue/compiler-ssr-3.5.6" + sources."@vue/reactivity-3.5.6" + sources."@vue/runtime-core-3.5.6" + sources."@vue/runtime-dom-3.5.6" + sources."@vue/server-renderer-3.5.6" + sources."@vue/shared-3.5.6" + sources."@whatwg-node/fetch-0.9.21" + sources."@whatwg-node/node-fetch-0.5.26" sources."acorn-8.12.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."argparse-2.0.1" - sources."aria-query-5.3.0" + sources."aria-query-5.3.1" sources."array-union-2.1.0" - sources."astrojs-compiler-sync-1.0.0" sources."axobject-query-4.1.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.3" - sources."browserslist-4.23.2" + sources."browserslist-4.23.3" sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001643" + sources."caniuse-lite-1.0.30001662" (sources."chalk-2.4.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -71479,7 +69381,11 @@ in ]; }) sources."cliui-7.0.4" - sources."code-red-1.0.4" + (sources."code-red-1.0.4" // { + dependencies = [ + sources."estree-walker-3.0.3" + ]; + }) sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" @@ -71487,23 +69393,24 @@ in sources."core-js-2.6.12" sources."cosmiconfig-8.3.6" sources."cosmiconfig-toml-loader-1.0.0" - sources."cross-inspect-1.0.0" + sources."cross-inspect-1.0.1" sources."css-tree-2.3.1" + sources."csstype-3.1.3" sources."dataloader-2.2.2" - sources."debug-4.3.5" + sources."debounce-promise-3.1.2" + sources."debug-4.3.7" sources."dedent-js-1.0.1" - sources."dequal-2.0.3" sources."dir-glob-3.0.1" sources."dotenv-10.0.0" - sources."dset-3.1.3" - sources."electron-to-chromium-1.5.1" + sources."dset-3.1.4" + sources."electron-to-chromium-1.5.26" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."entities-4.5.0" sources."error-ex-1.3.2" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-string-regexp-1.0.5" - sources."estree-walker-3.0.3" + sources."estree-walker-2.0.2" sources."extract-files-11.0.0" sources."fast-decode-uri-component-1.0.1" sources."fast-glob-3.3.2" @@ -71517,23 +69424,24 @@ in sources."glob-parent-5.1.2" sources."globals-11.12.0" sources."globby-11.1.0" - sources."graphql-16.9.0" + sources."graphql-17.0.0-alpha.7" (sources."graphql-config-5.0.3" // { dependencies = [ + sources."graphql-16.9.0" sources."minimatch-4.2.3" ]; }) - sources."graphql-language-service-5.2.1" - sources."graphql-language-service-server-2.13.1" - sources."graphql-ws-5.16.0" - sources."has-flag-3.0.0" - sources."iconv-lite-0.6.3" - sources."ignore-5.3.1" - (sources."import-fresh-3.3.0" // { + sources."graphql-language-service-5.3.0" + sources."graphql-language-service-server-2.14.0" + (sources."graphql-ws-5.16.0" // { dependencies = [ - sources."resolve-from-4.0.0" + sources."graphql-16.9.0" ]; }) + sources."has-flag-3.0.0" + sources."iconv-lite-0.6.3" + sources."ignore-5.3.2" + sources."import-fresh-3.3.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" @@ -71553,19 +69461,19 @@ in sources."locate-character-3.0.0" sources."lower-case-2.0.2" sources."lru-cache-10.4.3" - sources."magic-string-0.30.10" + sources."magic-string-0.30.11" sources."mdn-data-2.0.30" sources."merge2-1.4.1" sources."meros-1.3.0" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."minimatch-3.1.2" sources."mkdirp-1.0.4" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."nanoid-3.3.7" sources."no-case-3.0.4" sources."node-abort-controller-3.1.1" sources."node-fetch-2.7.0" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."node-releases-2.0.18" sources."normalize-path-2.1.1" sources."nullthrows-1.1.1" @@ -71576,19 +69484,23 @@ in sources."pascal-case-3.1.2" sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" - sources."periscopic-3.1.0" - sources."picocolors-1.0.1" + (sources."periscopic-3.1.0" // { + dependencies = [ + sources."estree-walker-3.0.3" + ]; + }) + sources."picocolors-1.1.0" sources."picomatch-2.3.1" - (sources."postcss-8.4.40" // { + (sources."postcss-8.4.47" // { dependencies = [ - sources."source-map-js-1.2.0" + sources."source-map-js-1.2.1" ]; }) sources."queue-microtask-1.2.3" sources."regenerator-runtime-0.13.11" sources."remove-trailing-separator-1.1.0" sources."require-directory-2.1.1" - sources."resolve-from-5.0.0" + sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" @@ -71600,15 +69512,18 @@ in sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" - sources."svelte-4.2.18" - sources."svelte2tsx-0.7.13" - sources."synckit-0.9.1" + (sources."svelte-4.2.19" // { + dependencies = [ + sources."estree-walker-3.0.3" + ]; + }) + sources."svelte2tsx-0.7.19" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" - sources."tslib-2.6.3" - sources."typescript-5.5.4" - sources."undici-types-5.26.5" + sources."tslib-2.7.0" + sources."typescript-5.6.2" + sources."undici-types-6.19.8" sources."unixify-1.0.0" sources."update-browserslist-db-1.1.0" sources."urlpattern-polyfill-10.0.0" @@ -71624,6 +69539,7 @@ in }) sources."vscode-languageserver-types-3.17.5" sources."vscode-uri-3.0.8" + sources."vue-3.5.6" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wrap-ansi-7.0.0" @@ -71676,7 +69592,7 @@ in sources."ini-1.3.8" sources."interpret-1.1.0" sources."is-absolute-1.0.0" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" @@ -71690,7 +69606,7 @@ in sources."liftup-3.0.1" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."nopt-5.0.0" sources."object.defaults-1.1.0" sources."object.map-1.0.1" @@ -71749,30 +69665,26 @@ in dependencies = [ sources."accepts-1.3.8" sources."array-flatten-1.1.1" - sources."body-parser-1.20.2" + sources."body-parser-1.20.3" sources."bytes-3.1.2" sources."call-bind-1.0.7" sources."content-disposition-0.5.4" sources."content-type-1.0.5" sources."cookie-0.6.0" sources."cookie-signature-1.0.6" - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) + sources."debug-2.6.9" sources."define-data-property-1.1.4" sources."depd-2.0.0" sources."destroy-1.2.0" sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" sources."es-define-property-1.0.0" sources."es-errors-1.3.0" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.19.2" + sources."express-4.21.0" sources."express-ws-2.0.0" - sources."finalhandler-1.2.0" + sources."finalhandler-1.3.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."function-bind-1.1.2" @@ -71787,27 +69699,32 @@ in sources."inherits-2.0.4" sources."ipaddr.js-1.9.1" sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimist-1.2.8" - sources."ms-2.1.3" + sources."ms-2.0.0" sources."negotiator-0.6.3" sources."object-inspect-1.13.2" sources."on-finished-2.4.1" sources."options-0.0.6" sources."parseurl-1.3.3" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" sources."proxy-addr-2.0.7" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."range-parser-1.2.1" sources."raw-body-2.5.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."send-0.18.0" - sources."serve-static-1.15.0" + (sources."send-0.19.0" // { + dependencies = [ + sources."encodeurl-1.0.2" + sources."ms-2.1.3" + ]; + }) + sources."serve-static-1.16.2" sources."set-function-length-1.2.2" sources."setprototypeof-1.2.0" sources."side-channel-1.0.6" @@ -71872,7 +69789,7 @@ in sources."each-props-3.0.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."expand-tilde-2.0.2" sources."extend-3.0.2" sources."fast-fifo-1.3.2" @@ -71907,7 +69824,7 @@ in sources."interpret-3.1.1" sources."is-absolute-1.0.0" sources."is-binary-path-2.1.0" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -71924,7 +69841,7 @@ in sources."lead-4.0.0" sources."liftoff-5.0.0" sources."map-cache-0.2.2" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mute-stdout-2.0.0" sources."normalize-path-3.0.0" sources."now-and-later-3.0.0" @@ -71956,7 +69873,7 @@ in sources."sparkles-2.1.0" sources."stream-composer-1.0.2" sources."stream-exhaust-1.0.2" - sources."streamx-2.18.0" + sources."streamx-2.20.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -71964,7 +69881,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."sver-1.8.4" sources."teex-1.0.1" - sources."text-decoder-1.1.1" + sources."text-decoder-1.2.0" sources."to-regex-range-5.0.1" sources."to-through-3.0.0" sources."unc-path-regex-0.1.2" @@ -72017,7 +69934,7 @@ in sources."detect-file-1.0.0" sources."each-props-3.0.0" sources."emoji-regex-8.0.0" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."expand-tilde-2.0.2" sources."extend-3.0.2" sources."fill-range-7.1.1" @@ -72038,7 +69955,7 @@ in sources."ini-1.3.8" sources."interpret-3.1.1" sources."is-absolute-1.0.0" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -72051,7 +69968,7 @@ in sources."isobject-3.0.1" sources."liftoff-5.0.0" sources."map-cache-0.2.2" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mute-stdout-2.0.0" sources."object.defaults-1.1.0" sources."object.pick-1.3.0" @@ -72151,7 +70068,7 @@ in sources."jp-kernel-2.0.0" sources."nan-2.17.0" sources."nel-1.3.0" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."uuid-3.4.0" sources."zeromq-5.3.1" ]; @@ -72265,7 +70182,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.7.1" - sources."jquery.terminal-2.42.2" + sources."jquery.terminal-2.43.1" sources."js-yaml-4.1.0" sources."keyboardevent-key-polyfill-1.1.0" sources."lcov-parse-1.0.0" @@ -72282,7 +70199,7 @@ in sources."p-finally-1.0.0" sources."path-key-2.0.1" sources."prismjs-1.29.0" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."safer-buffer-2.1.2" sources."semver-5.7.2" sources."shebang-command-1.2.0" @@ -72305,338 +70222,6 @@ in bypassCache = true; reconstructLock = true; }; - intelephense = nodeEnv.buildNodePackage { - name = "intelephense"; - packageName = "intelephense"; - version = "1.11.5"; - src = fetchurl { - url = "https://registry.npmjs.org/intelephense/-/intelephense-1.11.5.tgz"; - sha512 = "3gi/wFkKMENtRrP5Vo/A+/rN/ywyqxtPwRVUMJJFbm2NOlk4eyq4XirbuOH7U9e4P/iBhdCvZrk+AF/HmsnnXw=="; - }; - dependencies = [ - sources."@azure/abort-controller-2.1.2" - sources."@azure/core-auth-1.7.2" - (sources."@azure/core-rest-pipeline-1.10.1" // { - dependencies = [ - sources."@azure/abort-controller-1.1.0" - ]; - }) - sources."@azure/core-tracing-1.1.2" - (sources."@azure/core-util-1.2.0" // { - dependencies = [ - sources."@azure/abort-controller-1.1.0" - ]; - }) - sources."@azure/logger-1.1.3" - sources."@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" - sources."@bmewburn/js-beautify-1.15.2" - sources."@bmewburn/vscode-html-languageserver-1.11.0" - sources."@isaacs/cliui-8.0.2" - (sources."@mapbox/node-pre-gyp-1.0.11" // { - dependencies = [ - sources."abbrev-1.1.1" - sources."nopt-5.0.0" - ]; - }) - sources."@microsoft/applicationinsights-web-snippet-1.2.1" - sources."@mixmark-io/domino-2.2.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@one-ini/wasm-0.1.1" - sources."@opentelemetry/api-1.9.0" - sources."@opentelemetry/core-1.25.1" - sources."@opentelemetry/instrumentation-0.41.2" - sources."@opentelemetry/resources-1.25.1" - sources."@opentelemetry/sdk-trace-base-1.25.1" - sources."@opentelemetry/semantic-conventions-1.25.1" - sources."@protobufjs/aspromise-1.1.2" - sources."@protobufjs/base64-1.1.2" - sources."@protobufjs/codegen-2.0.4" - sources."@protobufjs/eventemitter-1.1.0" - sources."@protobufjs/fetch-1.1.0" - sources."@protobufjs/float-1.0.2" - sources."@protobufjs/inquire-1.1.0" - sources."@protobufjs/path-1.1.2" - sources."@protobufjs/pool-1.1.0" - sources."@protobufjs/utf8-1.1.0" - sources."@selderee/plugin-htmlparser2-0.11.0" - sources."@tootallnate/once-2.0.0" - sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."@types/node-20.14.12" - sources."@types/shimmer-1.2.0" - sources."@vscode/l10n-0.0.18" - sources."abbrev-2.0.0" - sources."acorn-8.12.1" - sources."acorn-import-assertions-1.9.0" - sources."agent-base-6.0.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."applicationinsights-2.7.3" - sources."applicationinsights-native-metrics-0.0.11" - sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" - sources."ast-types-0.13.4" - sources."async-hook-jl-1.7.6" - (sources."async-listener-0.6.10" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - sources."asynckit-0.4.0" - sources."balanced-match-1.0.2" - sources."basic-ftp-5.0.5" - sources."brace-expansion-2.0.1" - sources."braces-3.0.3" - sources."chownr-2.0.0" - sources."cjs-module-lexer-1.3.1" - (sources."cls-hooked-4.2.2" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."commander-10.0.1" - sources."concat-map-0.0.1" - sources."config-chain-1.1.13" - sources."console-control-strings-1.1.0" - sources."continuation-local-storage-3.2.1" - sources."cross-spawn-7.0.3" - sources."data-uri-to-buffer-6.0.2" - sources."debug-4.3.5" - sources."deepmerge-4.3.1" - sources."degenerator-5.0.1" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."detect-libc-2.0.3" - sources."diagnostic-channel-1.1.1" - sources."diagnostic-channel-publishers-1.0.7" - sources."dom-serializer-2.0.0" - sources."domelementtype-2.3.0" - sources."domhandler-5.0.3" - sources."domutils-3.1.0" - sources."eastasianwidth-0.2.0" - sources."editorconfig-1.0.4" - sources."emitter-listener-1.1.2" - sources."emoji-regex-9.2.2" - sources."encoding-0.1.13" - sources."entities-4.5.0" - sources."escodegen-2.1.0" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-glob-3.3.2" - sources."fastq-1.17.1" - sources."fill-range-7.1.1" - sources."foreground-child-3.2.1" - sources."form-data-4.0.0" - sources."fs-extra-11.2.0" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - (sources."gauge-3.0.2" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."signal-exit-3.0.7" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."get-uri-6.0.3" - (sources."glob-10.4.5" // { - dependencies = [ - sources."minimatch-9.0.5" - ]; - }) - sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.11" - sources."has-unicode-2.0.1" - sources."hasown-2.0.2" - sources."html-to-text-9.0.5" - sources."htmlparser2-8.0.2" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" - sources."import-in-the-middle-1.4.2" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."ip-address-9.0.5" - sources."is-core-module-2.15.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."isexe-2.0.0" - sources."jackspeak-3.4.3" - sources."js-cookie-3.0.5" - sources."jsbn-1.1.0" - sources."jsonfile-6.1.0" - sources."leac-0.6.0" - sources."long-5.2.3" - sources."lru-cache-10.2.2" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."merge2-1.4.1" - sources."micromatch-4.0.7" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimatch-9.0.1" - sources."minipass-7.1.2" - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."module-details-from-path-1.0.3" - sources."ms-2.1.2" - sources."nan-2.20.0" - sources."netmask-2.0.2" - sources."node-fetch-2.7.0" - sources."nopt-7.2.1" - sources."npmlog-5.0.1" - sources."object-assign-4.1.1" - sources."once-1.4.0" - (sources."pac-proxy-agent-7.0.2" // { - dependencies = [ - sources."agent-base-7.1.1" - sources."http-proxy-agent-7.0.2" - sources."https-proxy-agent-7.0.5" - ]; - }) - sources."pac-resolver-7.0.1" - sources."package-json-from-dist-1.0.0" - sources."parseley-0.12.1" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-scurry-1.11.1" - sources."peberminta-0.9.0" - sources."picomatch-2.3.1" - sources."proto-list-1.2.4" - sources."protobufjs-7.3.2" - (sources."proxy-agent-6.4.0" // { - dependencies = [ - sources."agent-base-7.1.1" - sources."http-proxy-agent-7.0.2" - sources."https-proxy-agent-7.0.5" - sources."lru-cache-7.18.3" - ]; - }) - sources."proxy-from-env-1.1.0" - sources."queue-microtask-1.2.3" - sources."readable-stream-3.6.2" - sources."require-in-the-middle-7.3.0" - sources."resolve-1.22.8" - sources."reusify-1.0.4" - (sources."rimraf-3.0.2" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - ]; - }) - sources."run-parallel-1.2.0" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."selderee-0.11.0" - sources."semver-7.6.3" - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."shimmer-1.2.1" - sources."signal-exit-4.1.0" - sources."smart-buffer-4.2.0" - sources."socks-2.8.3" - (sources."socks-proxy-agent-8.0.4" // { - dependencies = [ - sources."agent-base-7.1.1" - ]; - }) - sources."source-map-0.6.1" - sources."sprintf-js-1.1.3" - sources."stack-chain-1.3.7" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) - sources."string_decoder-1.3.0" - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) - sources."strip-ansi-cjs-6.0.1" - sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tar-6.2.1" // { - dependencies = [ - sources."minipass-5.0.0" - ]; - }) - sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."tslib-2.6.3" - sources."turndown-7.2.0" - sources."turndown-plugin-gfm-1.0.2" - sources."typescript-5.5.4" - sources."undici-types-5.26.5" - sources."universalify-2.0.1" - sources."util-deprecate-1.0.2" - sources."uuid-8.3.2" - sources."vscode-css-languageservice-6.3.0" - sources."vscode-html-languageservice-5.3.0" - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-9.0.1" - sources."vscode-languageserver-protocol-3.17.5" - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.5" - sources."vscode-uri-3.0.8" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-2.0.2" - (sources."wide-align-1.1.5" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."wrappy-1.0.2" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A PHP language server"; - homepage = "https://intelephense.com/"; - license = "SEE LICENSE IN LICENSE.txt"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; @@ -72703,6 +70288,11 @@ in ]; }) sources."@aws-sdk/config-resolver-3.296.0" + (sources."@aws-sdk/core-3.654.0" // { + dependencies = [ + sources."fast-xml-parser-4.4.1" + ]; + }) sources."@aws-sdk/credential-provider-env-3.296.0" sources."@aws-sdk/credential-provider-imds-3.296.0" sources."@aws-sdk/credential-provider-ini-3.296.0" @@ -72753,13 +70343,13 @@ in sources."@aws-sdk/service-error-classification-3.296.0" sources."@aws-sdk/shared-ini-file-loader-3.296.0" sources."@aws-sdk/signature-v4-3.296.0" - (sources."@aws-sdk/signature-v4-crt-3.617.0" // { + (sources."@aws-sdk/signature-v4-crt-3.654.0" // { dependencies = [ - sources."@aws-sdk/middleware-sdk-s3-3.617.0" - sources."@aws-sdk/signature-v4-multi-region-3.617.0" - sources."@aws-sdk/types-3.609.0" + sources."@aws-sdk/middleware-sdk-s3-3.654.0" + sources."@aws-sdk/signature-v4-multi-region-3.654.0" + sources."@aws-sdk/types-3.654.0" sources."@aws-sdk/util-arn-parser-3.568.0" - sources."@aws-sdk/util-user-agent-node-3.614.0" + sources."@aws-sdk/util-user-agent-node-3.654.0" ]; }) sources."@aws-sdk/signature-v4-multi-region-3.296.0" @@ -72791,14 +70381,14 @@ in sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@aws-sdk/util-waiter-3.296.0" sources."@aws-sdk/xml-builder-3.295.0" - sources."@babel/runtime-7.24.8" + sources."@babel/runtime-7.25.6" sources."@braintree/sanitize-url-6.0.4" sources."@cronvel/get-pixels-3.4.1" sources."@gar/promisify-1.1.3" sources."@httptoolkit/websocket-stream-6.0.1" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."emoji-regex-9.2.2" sources."string-width-5.1.2" sources."strip-ansi-7.1.0" @@ -72827,29 +70417,34 @@ in }) sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@smithy/abort-controller-3.1.1" - sources."@smithy/fetch-http-handler-3.2.3" + sources."@smithy/abort-controller-3.1.4" + sources."@smithy/core-2.4.3" + sources."@smithy/fetch-http-handler-3.2.7" sources."@smithy/is-array-buffer-3.0.0" - sources."@smithy/middleware-endpoint-3.1.0" - sources."@smithy/middleware-serde-3.0.3" - sources."@smithy/middleware-stack-3.0.3" - sources."@smithy/node-config-provider-3.1.4" - sources."@smithy/node-http-handler-3.1.4" - sources."@smithy/property-provider-3.1.3" - sources."@smithy/protocol-http-4.1.0" - sources."@smithy/querystring-builder-3.0.3" - sources."@smithy/querystring-parser-3.0.3" - sources."@smithy/shared-ini-file-loader-3.1.4" - sources."@smithy/signature-v4-4.1.0" - sources."@smithy/smithy-client-3.1.10" - sources."@smithy/types-3.3.0" - sources."@smithy/url-parser-3.0.3" + sources."@smithy/middleware-endpoint-3.1.3" + sources."@smithy/middleware-retry-3.0.18" + sources."@smithy/middleware-serde-3.0.6" + sources."@smithy/middleware-stack-3.0.6" + sources."@smithy/node-config-provider-3.1.7" + sources."@smithy/node-http-handler-3.2.2" + sources."@smithy/property-provider-3.1.6" + sources."@smithy/protocol-http-4.1.3" + sources."@smithy/querystring-builder-3.0.6" + sources."@smithy/querystring-parser-3.0.6" + sources."@smithy/service-error-classification-3.0.6" + sources."@smithy/shared-ini-file-loader-3.1.7" + sources."@smithy/signature-v4-4.1.3" + sources."@smithy/smithy-client-3.3.2" + sources."@smithy/types-3.4.2" + sources."@smithy/url-parser-3.0.6" sources."@smithy/util-base64-3.0.0" + sources."@smithy/util-body-length-browser-3.0.0" sources."@smithy/util-buffer-from-3.0.0" sources."@smithy/util-config-provider-3.0.0" sources."@smithy/util-hex-encoding-3.0.0" - sources."@smithy/util-middleware-3.0.3" - sources."@smithy/util-stream-3.1.2" + sources."@smithy/util-middleware-3.0.6" + sources."@smithy/util-retry-3.0.6" + sources."@smithy/util-stream-3.1.6" sources."@smithy/util-uri-escape-3.0.0" sources."@smithy/util-utf8-3.0.0" sources."@tootallnate/once-1.1.2" @@ -72860,10 +70455,16 @@ in sources."@types/mdast-3.0.15" sources."@types/ms-0.7.34" sources."@types/nanoid-3.0.0" - sources."@types/node-20.14.12" - sources."@types/unist-2.0.10" - sources."@types/ws-8.5.11" + sources."@types/node-22.5.5" + (sources."@types/readable-stream-4.0.15" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."@types/unist-2.0.11" + sources."@types/ws-8.5.12" sources."abbrev-1.1.1" + sources."abort-controller-3.0.0" sources."agent-base-7.1.1" sources."agentkeepalive-4.5.0" sources."aggregate-error-3.1.0" @@ -72890,10 +70491,11 @@ in sources."async-mutex-0.4.1" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.7" - sources."aws-crt-1.21.3" + sources."aws-crt-1.22.0" (sources."aws-sdk-2.1340.0" // { dependencies = [ sources."buffer-4.9.2" + sources."events-1.1.1" sources."ieee754-1.1.13" sources."sax-1.2.1" sources."uuid-8.0.0" @@ -72902,18 +70504,18 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" - sources."axios-1.7.2" + sources."aws4-1.13.2" + sources."axios-1.7.7" sources."balanced-match-1.0.2" sources."base-64-1.0.0" sources."base64-js-1.5.1" sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.3.0" - (sources."bl-4.1.0" // { + (sources."bl-6.0.15" // { dependencies = [ - sources."buffer-5.7.1" - sources."readable-stream-3.6.2" + sources."readable-stream-4.5.2" + sources."string_decoder-1.3.0" ]; }) sources."bowser-2.11.0" @@ -72925,6 +70527,7 @@ in sources."builtin-modules-3.3.0" (sources."cacache-15.3.0" // { dependencies = [ + sources."lru-cache-6.0.0" sources."minipass-3.3.6" ]; }) @@ -72944,7 +70547,7 @@ in sources."charenc-0.0.2" sources."chokidar-3.6.0" sources."chownr-2.0.0" - sources."chroma-js-2.4.2" + sources."chroma-js-2.6.0" sources."clean-css-4.2.4" sources."clean-stack-2.2.0" (sources."cliss-0.0.2" // { @@ -72961,7 +70564,7 @@ in sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" sources."commander-2.20.3" - sources."commist-1.1.0" + sources."commist-3.2.0" sources."compare-version-0.1.2" sources."compare-versions-6.1.0" sources."concat-map-0.0.1" @@ -72978,7 +70581,7 @@ in sources."crypto-js-4.2.0" sources."cssstyle-3.0.0" sources."cwise-compiler-1.1.3" - sources."cytoscape-3.30.1" + sources."cytoscape-3.30.2" sources."cytoscape-cose-bilkent-4.1.0" sources."d3-7.9.0" sources."d3-array-3.2.4" @@ -73027,8 +70630,8 @@ in sources."dashdash-1.14.1" sources."data-urls-5.0.0" sources."datauri-4.1.0" - sources."dayjs-1.11.12" - sources."debug-4.3.5" + sources."dayjs-1.11.13" + sources."debug-4.3.7" sources."decimal.js-10.4.3" sources."decode-named-character-reference-1.0.2" sources."decode-uri-component-0.2.2" @@ -73078,13 +70681,15 @@ in sources."es-define-property-1.0.0" sources."es-errors-1.3.0" sources."escape-string-regexp-1.0.5" - sources."events-1.1.1" + sources."event-target-shim-5.0.1" + sources."events-3.3.0" sources."execa-5.1.1" sources."expand-template-2.0.3" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" + sources."fast-unique-numbers-8.0.13" sources."fast-xml-parser-3.21.1" sources."fault-1.0.4" sources."file-type-10.11.0" @@ -73096,7 +70701,7 @@ in sources."for-each-0.3.3" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" - (sources."foreground-child-3.2.1" // { + (sources."foreground-child-3.3.0" // { dependencies = [ sources."signal-exit-4.1.0" ]; @@ -73145,11 +70750,7 @@ in sources."has-unicode-2.0.1" sources."hasown-2.0.2" sources."he-1.2.0" - (sources."help-me-3.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) + sources."help-me-5.0.0" sources."highlight.js-11.9.0" sources."hpagent-1.2.0" sources."html-encoding-sniffer-4.0.0" @@ -73260,7 +70861,6 @@ in sources."kleur-4.1.5" sources."layout-base-1.0.2" sources."lazyness-1.2.0" - sources."leven-2.1.0" sources."linkify-it-4.0.1" sources."locate-path-2.0.0" sources."lodash-4.17.21" @@ -73273,7 +70873,7 @@ in sources."highlight.js-9.12.0" ]; }) - sources."lru-cache-6.0.0" + sources."lru-cache-10.4.3" sources."magicli-0.0.8" (sources."make-dir-3.1.0" // { dependencies = [ @@ -73285,6 +70885,7 @@ in sources."agent-base-6.0.2" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.1" + sources."lru-cache-6.0.0" sources."minipass-3.3.6" ]; }) @@ -73374,17 +70975,15 @@ in sources."mkdirp-1.0.4" sources."mkdirp-classic-0.5.3" sources."moment-2.30.1" - (sources."mqtt-4.3.8" // { + (sources."mqtt-5.10.1" // { dependencies = [ - sources."duplexify-4.1.3" - sources."readable-stream-3.6.2" - sources."utf-8-validate-5.0.10" - sources."ws-7.5.10" + sources."readable-stream-4.5.2" + sources."string_decoder-1.3.0" ]; }) - sources."mqtt-packet-6.10.0" + sources."mqtt-packet-9.0.0" sources."mri-1.2.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multiparty-4.2.3" sources."mustache-4.2.0" sources."nan-2.20.0" @@ -73395,7 +70994,7 @@ in sources."negotiator-0.6.3" sources."nextgen-events-1.5.3" sources."no-case-2.3.2" - sources."node-abi-3.65.0" + sources."node-abi-3.68.0" sources."node-addon-api-4.3.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.11.0" @@ -73414,7 +71013,7 @@ in sources."readable-stream-3.6.2" ]; }) - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" (sources."node-notifier-10.0.1" // { dependencies = [ sources."uuid-8.3.2" @@ -73454,11 +71053,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - (sources."path-scurry-1.11.1" // { - dependencies = [ - sources."lru-cache-10.4.3" - ]; - }) + sources."path-scurry-1.11.1" sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."pify-3.0.0" @@ -73480,7 +71075,7 @@ in sources."proper-lockfile-4.1.2" sources."proxy-from-env-1.1.0" sources."psl-1.9.0" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" sources."qs-6.5.3" sources."query-string-7.1.3" @@ -73559,11 +71154,7 @@ in sources."source-map-0.6.1" sources."split-on-first-1.1.0" sources."split-skip-0.0.2" - (sources."split2-3.2.2" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) + sources."split2-4.2.0" sources."sprintf-js-1.1.3" sources."sqlite3-5.1.6" sources."sshpk-1.18.0" @@ -73607,7 +71198,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."strnum-1.0.5" - sources."stylis-4.3.2" + sources."stylis-4.3.4" sources."supports-color-7.2.0" sources."symbol-tree-3.2.4" sources."table-layout-0.4.5" @@ -73619,12 +71210,15 @@ in }) (sources."tar-stream-2.2.0" // { dependencies = [ + sources."bl-4.1.0" + sources."buffer-5.7.1" sources."readable-stream-3.6.2" ]; }) (sources."tcp-port-used-1.0.2" // { dependencies = [ sources."debug-4.3.1" + sources."ms-2.1.2" ]; }) sources."terminal-kit-3.0.2" @@ -73650,16 +71244,16 @@ in sources."tr46-5.0.0" sources."tree-kit-0.8.7" sources."ts-dedent-2.2.0" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."typical-2.6.1" sources."uc.micro-1.0.6" - sources."uglify-js-3.19.0" + sources."uglify-js-3.19.3" sources."uglifycss-0.0.29" sources."uid-safe-2.1.5" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."uniq-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -73696,9 +71290,12 @@ in sources."wide-align-1.1.5" sources."word-wrap-1.2.5" sources."wordwrapjs-3.0.0" + sources."worker-timers-7.1.8" + sources."worker-timers-broker-6.1.8" + sources."worker-timers-worker-7.0.71" (sources."wrap-ansi-8.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."emoji-regex-9.2.2" sources."string-width-5.1.2" sources."strip-ansi-7.1.0" @@ -73755,7 +71352,7 @@ in sources."eastasianwidth-0.2.0" sources."editorconfig-1.0.4" sources."emoji-regex-9.2.2" - sources."foreground-child-3.2.1" + sources."foreground-child-3.3.0" (sources."glob-10.4.5" // { dependencies = [ sources."minimatch-9.0.5" @@ -73787,7 +71384,7 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" @@ -73842,7 +71439,10 @@ in sha512 = "Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw=="; }; dependencies = [ - sources."@babel/parser-7.24.8" + sources."@babel/helper-string-parser-7.24.8" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/parser-7.25.6" + sources."@babel/types-7.25.6" sources."@jsdoc/salty-0.2.8" sources."@types/linkify-it-5.0.0" sources."@types/markdown-it-14.1.2" @@ -73865,6 +71465,7 @@ in sources."punycode.js-2.3.1" sources."requizzle-0.2.4" sources."strip-json-comments-3.1.1" + sources."to-fast-properties-2.0.0" sources."uc.micro-2.1.0" sources."underscore-1.13.7" sources."xmlcreate-2.0.4" @@ -73994,7 +71595,7 @@ in sources."commander-4.1.1" sources."component-emitter-1.3.1" sources."cookiejar-2.1.4" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."define-data-property-1.1.4" sources."delayed-stream-1.0.0" sources."dezalgo-1.0.4" @@ -74020,13 +71621,13 @@ in sources."mime-2.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.13.2" sources."once-1.4.0" sources."path-loader-1.0.12" sources."punycode-2.3.1" - sources."qs-6.12.3" + sources."qs-6.13.0" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."semver-7.6.3" @@ -74053,20 +71654,16 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "1.0.0-beta.1"; + version = "1.0.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-1.0.0-beta.1.tgz"; - sha512 = "xOKYyxkVai66OTFZq5ulAaXYkqiKMbzVED9tRZ+CMg6v6iaSdIVYas5tIjSMw/mYwDL/nJFTCca308gaL0coyA=="; + url = "https://registry.npmjs.org/json-server/-/json-server-1.0.0-beta.2.tgz"; + sha512 = "ZzBM2jkIeBTYIEW5c8DHWJacRqC+ah2u623SV75JYeZv9eJQ0Rv2rSkc2w3f02xykIDlyQ9aitAUIZnNgYB5BQ=="; }; dependencies = [ - sources."@polka/url-1.0.0-next.25" - (sources."@tinyhttp/accepts-2.2.2" // { - dependencies = [ - sources."mime-4.0.1" - ]; - }) - sources."@tinyhttp/app-2.3.0" - sources."@tinyhttp/content-disposition-2.2.1" + sources."@polka/url-1.0.0-next.28" + sources."@tinyhttp/accepts-2.2.3" + sources."@tinyhttp/app-2.4.0" + sources."@tinyhttp/content-disposition-2.2.2" sources."@tinyhttp/content-type-0.1.4" sources."@tinyhttp/cookie-2.1.1" sources."@tinyhttp/cookie-signature-2.1.1" @@ -74075,15 +71672,11 @@ in sources."@tinyhttp/etag-2.1.2" sources."@tinyhttp/forwarded-2.1.1" sources."@tinyhttp/proxy-addr-2.2.0" - sources."@tinyhttp/req-2.2.3" - sources."@tinyhttp/res-2.2.3" - sources."@tinyhttp/router-2.2.2" - sources."@tinyhttp/send-2.2.2" - (sources."@tinyhttp/type-is-2.2.3" // { - dependencies = [ - sources."mime-4.0.1" - ]; - }) + sources."@tinyhttp/req-2.2.4" + sources."@tinyhttp/res-2.2.4" + sources."@tinyhttp/router-2.2.3" + sources."@tinyhttp/send-2.2.3" + sources."@tinyhttp/type-is-2.2.4" sources."@tinyhttp/url-2.1.1" sources."@tinyhttp/vary-0.1.3" sources."anymatch-3.1.3" @@ -74093,7 +71686,7 @@ in sources."chokidar-3.6.0" sources."dot-prop-9.0.0" sources."es-escape-html-0.1.1" - sources."eta-3.4.0" + sources."eta-3.5.0" sources."fill-range-7.1.1" sources."glob-parent-5.1.2" sources."header-range-parser-1.1.3" @@ -74106,7 +71699,7 @@ in sources."json5-2.2.3" sources."lowdb-7.0.1" sources."milliparsec-2.3.0" - sources."mime-4.0.0-beta.1" + sources."mime-4.0.4" sources."mrmime-2.0.0" sources."negotiator-0.6.3" sources."normalize-path-3.0.0" @@ -74114,16 +71707,11 @@ in sources."readdirp-3.6.0" sources."regexparam-2.0.2" sources."sirv-2.0.4" - (sources."sort-on-6.0.0" // { - dependencies = [ - sources."dot-prop-8.0.2" - sources."type-fest-3.13.1" - ]; - }) + sources."sort-on-6.1.0" sources."steno-4.0.2" sources."to-regex-range-5.0.1" sources."totalist-3.0.1" - sources."type-fest-4.23.0" + sources."type-fest-4.26.1" ]; buildInputs = globalBuildInputs; meta = { @@ -74188,7 +71776,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" @@ -74199,8 +71787,16 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."body-parser-1.20.2" - sources."boxen-0.6.0" + (sources."body-parser-1.20.3" // { + dependencies = [ + sources."on-finished-2.4.1" + ]; + }) + (sources."boxen-0.6.0" // { + dependencies = [ + sources."camelcase-2.1.1" + ]; + }) sources."braces-1.8.5" sources."bytes-3.1.2" (sources."cache-base-1.0.1" // { @@ -74209,7 +71805,7 @@ in ]; }) sources."call-bind-1.0.7" - sources."camelcase-2.1.1" + sources."camelcase-3.0.0" sources."capture-stack-trace-1.0.2" sources."caseless-0.12.0" sources."chalk-1.1.3" @@ -74249,7 +71845,7 @@ in sources."cookie-0.6.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.3" + sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."create-error-class-3.0.2" sources."dashdash-1.14.1" @@ -74270,7 +71866,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" sources."error-ex-1.3.2" sources."errorhandler-1.5.1" sources."es-define-property-1.0.0" @@ -74280,8 +71876,9 @@ in sources."etag-1.8.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - (sources."express-4.19.2" // { + (sources."express-4.21.0" // { dependencies = [ + sources."on-finished-2.4.1" sources."safe-buffer-5.2.1" ]; }) @@ -74299,7 +71896,11 @@ in sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."filled-array-1.1.0" - sources."finalhandler-1.2.0" + (sources."finalhandler-1.3.1" // { + dependencies = [ + sources."on-finished-2.4.1" + ]; + }) sources."find-up-1.1.2" sources."for-in-1.0.2" sources."for-own-0.1.5" @@ -74354,7 +71955,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-data-descriptor-1.0.1" sources."is-descriptor-1.0.3" sources."is-dotfile-1.0.3" @@ -74405,7 +72006,7 @@ in sources."map-visit-1.0.0" sources."math-random-1.0.4" sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."method-override-2.3.10" sources."methods-1.1.2" sources."micromatch-2.3.11" @@ -74419,11 +72020,7 @@ in ]; }) sources."mkdirp-0.5.6" - (sources."morgan-1.10.0" // { - dependencies = [ - sources."on-finished-2.3.0" - ]; - }) + sources."morgan-1.10.0" sources."ms-2.0.0" sources."nan-2.20.0" (sources."nanomatch-1.2.13" // { @@ -74459,7 +72056,7 @@ in sources."isobject-3.0.1" ]; }) - sources."on-finished-2.4.1" + sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."os-homedir-1.0.2" sources."os-locale-1.4.0" @@ -74473,7 +72070,7 @@ in sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" sources."path-type-1.1.0" sources."performance-now-2.1.0" sources."pify-2.3.0" @@ -74487,7 +72084,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."punycode-2.3.1" - sources."qs-6.11.0" + sources."qs-6.13.0" (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" @@ -74561,12 +72158,14 @@ in sources."safer-buffer-2.1.2" sources."semver-5.7.2" sources."semver-diff-2.1.0" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ + sources."encodeurl-1.0.2" sources."ms-2.1.3" + sources."on-finished-2.4.1" ]; }) - sources."serve-static-1.15.0" + sources."serve-static-1.16.2" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."set-function-length-1.2.2" @@ -74598,7 +72197,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."split-string-3.1.0" sources."sshpk-1.18.0" (sources."static-extend-0.1.2" // { @@ -74654,11 +72253,7 @@ in sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" sources."vary-1.1.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) + sources."verror-1.10.0" sources."which-module-1.0.0" sources."widest-line-1.0.0" sources."window-size-0.2.0" @@ -74667,11 +72262,7 @@ in sources."xdg-basedir-2.0.0" sources."y18n-3.2.2" sources."yargs-4.8.1" - (sources."yargs-parser-2.4.1" // { - dependencies = [ - sources."camelcase-3.0.0" - ]; - }) + sources."yargs-parser-2.4.1" ]; buildInputs = globalBuildInputs; meta = { @@ -74761,7 +72352,7 @@ in sources."cross-spawn-7.0.3" sources."d-1.0.2" sources."debounce-fn-3.0.1" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."define-data-property-1.1.4" sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" @@ -74791,7 +72382,7 @@ in }) sources."fill-range-7.1.1" sources."find-up-3.0.0" - sources."follow-redirects-1.15.6" + sources."follow-redirects-1.15.9" sources."fs-extra-8.1.0" sources."function-bind-1.1.2" sources."get-intrinsic-1.2.4" @@ -74806,7 +72397,7 @@ in sources."hasown-2.0.2" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inquirer-7.3.3" @@ -74832,10 +72423,10 @@ in ]; }) sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mimic-fn-2.1.0" sources."moment-2.30.1" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-0.0.8" sources."natural-orderby-2.0.3" sources."next-tick-1.1.0" @@ -74854,7 +72445,7 @@ in sources."picomatch-2.3.1" sources."pkg-up-3.1.0" sources."punycode-2.3.1" - sources."qs-6.12.3" + sources."qs-6.13.0" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" sources."restore-cursor-3.1.0" @@ -74882,7 +72473,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."type-2.7.3" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" @@ -74935,52 +72526,48 @@ in }; dependencies = [ sources."@ampproject/remapping-2.3.0" - (sources."@babel/cli-7.24.8" // { + (sources."@babel/cli-7.25.6" // { dependencies = [ sources."make-dir-2.1.0" sources."semver-5.7.2" ]; }) sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.9" - (sources."@babel/core-7.24.9" // { + sources."@babel/compat-data-7.25.4" + (sources."@babel/core-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.10" + sources."@babel/generator-7.25.6" sources."@babel/helper-annotate-as-pure-7.24.7" - (sources."@babel/helper-compilation-targets-7.24.8" // { + (sources."@babel/helper-compilation-targets-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.24.7" - sources."@babel/helper-function-name-7.24.7" - sources."@babel/helper-hoist-variables-7.24.7" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.9" + sources."@babel/helper-module-transforms-7.25.2" sources."@babel/helper-plugin-utils-7.24.8" sources."@babel/helper-simple-access-7.24.7" - sources."@babel/helper-split-export-declaration-7.24.7" sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" sources."@babel/helper-validator-option-7.24.8" - sources."@babel/helpers-7.24.8" + sources."@babel/helpers-7.25.6" sources."@babel/highlight-7.24.7" - sources."@babel/node-7.24.8" - sources."@babel/parser-7.24.8" + sources."@babel/node-7.25.0" + sources."@babel/parser-7.25.6" sources."@babel/plugin-syntax-jsx-7.24.7" - sources."@babel/plugin-transform-react-jsx-7.24.7" + sources."@babel/plugin-transform-react-jsx-7.25.2" (sources."@babel/register-7.24.6" // { dependencies = [ sources."make-dir-2.1.0" sources."semver-5.7.2" ]; }) - sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.8" - sources."@babel/types-7.24.9" + sources."@babel/template-7.25.0" + sources."@babel/traverse-7.25.6" + sources."@babel/types-7.25.6" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" @@ -74992,7 +72579,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@openpgp/hkp-client-0.0.2" sources."@openpgp/wkd-client-0.0.3" - sources."@peculiar/asn1-schema-2.3.8" + sources."@peculiar/asn1-schema-2.3.13" sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.5.0" sources."@tootallnate/once-1.1.2" @@ -75061,7 +72648,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."bn.js-4.12.0" - (sources."body-parser-1.20.2" // { + (sources."body-parser-1.20.3" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -75071,13 +72658,13 @@ in sources."braces-3.0.3" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.23.2" + sources."browserslist-4.23.3" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."bytes-3.1.2" sources."call-bind-1.0.7" - sources."caniuse-lite-1.0.30001643" + sources."caniuse-lite-1.0.30001662" sources."canvas-2.11.2" sources."chalk-2.4.2" sources."chardet-1.6.1" @@ -75098,7 +72685,7 @@ in sources."convert-source-map-2.0.0" sources."cookie-0.6.0" sources."cookie-signature-1.0.6" - sources."core-js-3.37.1" + sources."core-js-3.38.1" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -75113,7 +72700,7 @@ in sources."data-view-buffer-1.0.1" sources."data-view-byte-length-1.0.1" sources."data-view-byte-offset-1.0.0" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."decimal.js-10.4.3" sources."decode-uri-component-0.2.2" sources."decompress-response-4.2.1" @@ -75134,9 +72721,9 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.5.1" + sources."electron-to-chromium-1.5.26" sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" (sources."encoding-0.1.13" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -75151,7 +72738,7 @@ in sources."es-object-atoms-1.0.0" sources."es-set-tostringtag-2.0.3" sources."es-to-primitive-1.2.1" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."escodegen-2.1.0" @@ -75161,7 +72748,7 @@ in sources."etag-1.8.1" sources."events-3.3.0" sources."expand-template-2.0.3" - (sources."express-4.19.2" // { + (sources."express-4.21.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -75172,7 +72759,7 @@ in sources."fastq-1.17.1" sources."fill-range-7.1.1" sources."filter-obj-1.1.0" - (sources."finalhandler-1.2.0" // { + (sources."finalhandler-1.3.1" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -75185,7 +72772,7 @@ in ]; }) sources."find-up-3.0.0" - sources."follow-redirects-1.15.6" + sources."follow-redirects-1.15.9" sources."for-each-0.3.3" sources."form-data-3.0.1" sources."forwarded-0.2.0" @@ -75249,7 +72836,7 @@ in sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -75315,11 +72902,11 @@ in }) sources."md5.js-1.3.5" sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."merge-options-3.0.4" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" @@ -75335,12 +72922,12 @@ in }) sources."mkdirp-1.0.4" sources."mkdirp-classic-0.5.3" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multistream-4.1.0" sources."nan-2.20.0" sources."napi-build-utils-1.0.2" sources."negotiator-0.6.3" - sources."node-abi-3.65.0" + sources."node-abi-3.68.0" (sources."node-environment-flags-1.0.6" // { dependencies = [ sources."semver-5.7.2" @@ -75353,7 +72940,7 @@ in sources."whatwg-url-5.0.0" ]; }) - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."node-notifier-10.0.1" sources."node-releases-2.0.18" sources."nopt-5.0.0" @@ -75377,9 +72964,9 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" sources."path-type-4.0.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pirates-4.0.6" @@ -75419,11 +73006,11 @@ in sources."progress-2.0.3" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" sources."pvtsutils-1.3.5" sources."pvutils-1.1.3" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."query-string-6.14.1" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" @@ -75438,7 +73025,7 @@ in sources."requires-port-1.0.0" (sources."resolve-1.22.8" // { dependencies = [ - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" ]; }) sources."reusify-1.0.4" @@ -75455,17 +73042,17 @@ in sources."saslmechanisms-0.1.1" sources."saxes-5.0.1" sources."semver-7.6.3" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."ms-2.1.3" + sources."encodeurl-1.0.2" ]; }) - sources."serve-static-1.15.0" + sources."serve-static-1.16.2" sources."set-blocking-2.0.0" sources."set-function-length-1.2.2" sources."set-function-name-2.0.2" @@ -75513,7 +73100,7 @@ in sources."toidentifier-1.0.1" sources."tough-cookie-4.1.4" sources."tr46-2.1.0" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."tunnel-agent-0.6.0" sources."type-is-1.6.18" sources."typed-array-buffer-1.0.2" @@ -75589,7 +73176,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-8.0.0" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."fast-glob-3.3.2" sources."fastq-1.17.1" sources."fill-range-7.1.1" @@ -75600,7 +73187,7 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."picomatch-2.3.1" sources."queue-microtask-1.2.3" sources."require-directory-2.1.1" @@ -75627,10 +73214,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "8.1.7"; + version = "8.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-8.1.7.tgz"; - sha512 = "v2kkBn8Vqtroo30Pr5/JQ9MygRhnCsoI1jSOf3DxWmcTbkpC5U7c6rGr+7NPK6QrxKbC0/Cj4kuIBMb/7f79sQ=="; + url = "https://registry.npmjs.org/lerna/-/lerna-8.1.8.tgz"; + sha512 = "Rmo5ShMx73xM2CUcRixjmpZIXB7ZFlWEul1YvJyx/rH4onAwDHtUGD7Rx4NZYL8QSRiQHroglM2Oyq+WqA4BYg=="; }; dependencies = [ sources."@babel/code-frame-7.24.7" @@ -75645,7 +73232,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.24.8" + sources."@babel/runtime-7.25.6" sources."@emnapi/core-1.2.0" sources."@emnapi/runtime-1.2.0" sources."@emnapi/wasi-threads-1.0.1" @@ -75660,13 +73247,13 @@ in }) sources."@isaacs/string-locale-compare-1.1.0" sources."@jest/schemas-29.6.3" - sources."@lerna/create-8.1.7" + sources."@lerna/create-8.1.8" sources."@napi-rs/wasm-runtime-0.2.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/agent-2.2.2" - (sources."@npmcli/arborist-7.5.3" // { + (sources."@npmcli/arborist-7.5.4" // { dependencies = [ sources."json-parse-even-better-errors-3.0.2" sources."minimatch-9.0.5" @@ -75712,9 +73299,9 @@ in sources."which-4.0.0" ]; }) - sources."@nrwl/devkit-19.5.3" - sources."@nrwl/tao-19.5.3" - (sources."@nx/devkit-19.5.3" // { + sources."@nrwl/devkit-19.7.4" + sources."@nrwl/tao-19.7.4" + (sources."@nx/devkit-19.7.4" // { dependencies = [ sources."minimatch-9.0.3" ]; @@ -75755,9 +73342,9 @@ in sources."@swc-node/core-1.13.3" sources."@swc-node/register-1.10.9" sources."@swc-node/sourcemap-support-0.5.1" - sources."@swc/core-1.7.1" + sources."@swc/core-1.7.26" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.12" + sources."@swc/helpers-0.5.13" sources."@swc/types-0.1.12" sources."@tufjs/canonical-json-2.0.0" (sources."@tufjs/models-2.0.1" // { @@ -75788,7 +73375,7 @@ in sources."aggregate-error-3.1.0" sources."ansi-colors-4.1.3" sources."ansi-escapes-4.3.2" - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" sources."argparse-1.0.10" @@ -75796,9 +73383,9 @@ in sources."array-ify-1.0.0" sources."array-union-2.1.0" sources."arrify-2.0.1" - sources."async-3.2.5" + sources."async-3.2.6" sources."asynckit-0.4.0" - sources."axios-1.7.2" + sources."axios-1.7.7" (sources."babel-plugin-macros-3.1.0" // { dependencies = [ sources."cosmiconfig-7.1.0" @@ -75865,7 +73452,7 @@ in sources."cssesc-3.0.0" sources."dargs-7.0.0" sources."dateformat-3.0.3" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.1" // { dependencies = [ @@ -75898,7 +73485,7 @@ in sources."envinfo-7.13.0" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."eventemitter3-4.0.7" @@ -75924,8 +73511,8 @@ in sources."fill-range-7.1.1" sources."find-up-4.1.0" sources."flat-5.0.2" - sources."follow-redirects-1.15.6" - (sources."foreground-child-3.2.1" // { + sources."follow-redirects-1.15.9" + (sources."foreground-child-3.3.0" // { dependencies = [ sources."signal-exit-4.1.0" ]; @@ -75988,7 +73575,7 @@ in sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.3.1" + sources."ignore-5.3.2" (sources."ignore-walk-6.0.5" // { dependencies = [ sources."minimatch-9.0.5" @@ -76019,7 +73606,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-3.0.1" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -76071,7 +73658,7 @@ in sources."ci-info-4.0.0" ]; }) - sources."lines-and-columns-2.0.4" + sources."lines-and-columns-2.0.3" (sources."load-json-file-6.2.0" // { dependencies = [ sources."strip-bom-4.0.0" @@ -76092,12 +73679,16 @@ in sources."map-obj-4.3.0" (sources."meow-8.1.2" // { dependencies = [ - sources."hosted-git-info-4.1.0" + sources."hosted-git-info-2.8.9" sources."lru-cache-6.0.0" - sources."normalize-package-data-3.0.3" + (sources."normalize-package-data-3.0.3" // { + dependencies = [ + sources."hosted-git-info-4.1.0" + sources."semver-7.6.3" + ]; + }) (sources."read-pkg-5.2.0" // { dependencies = [ - sources."hosted-git-info-2.8.9" sources."normalize-package-data-2.5.0" sources."type-fest-0.6.0" ]; @@ -76114,7 +73705,7 @@ in }) sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" @@ -76163,7 +73754,7 @@ in }) sources."mkdirp-1.0.4" sources."modify-values-1.0.1" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multimatch-5.0.0" sources."mute-stream-0.0.8" sources."negotiator-0.6.3" @@ -76190,7 +73781,7 @@ in ]; }) sources."npm-run-path-4.0.1" - (sources."nx-19.5.3" // { + (sources."nx-19.7.4" // { dependencies = [ sources."minimatch-9.0.3" ]; @@ -76200,7 +73791,7 @@ in sources."open-8.4.2" sources."ora-5.3.0" sources."os-tmpdir-1.0.2" - sources."oxc-resolver-1.10.2" + sources."oxc-resolver-1.11.0" sources."p-finally-1.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -76237,12 +73828,12 @@ in sources."path-parse-1.0.7" sources."path-scurry-1.11.1" sources."path-type-4.0.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-5.0.0" sources."pirates-4.0.6" sources."pkg-dir-4.2.0" - sources."postcss-selector-parser-6.1.1" + sources."postcss-selector-parser-6.1.2" (sources."pretty-format-29.7.0" // { dependencies = [ sources."ansi-styles-5.2.0" @@ -76252,7 +73843,7 @@ in sources."process-nextick-args-2.0.1" sources."proggy-2.0.0" sources."promise-all-reject-late-1.0.1" - sources."promise-call-limit-3.0.1" + sources."promise-call-limit-3.0.2" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."promzard-1.0.2" @@ -76332,7 +73923,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."split-1.0.1" sources."split2-3.2.2" sources."sprintf-js-1.0.3" @@ -76386,12 +73977,12 @@ in sources."treeverse-3.0.0" sources."trim-newlines-3.0.1" sources."tsconfig-paths-4.2.0" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."tuf-js-2.2.1" sources."type-fest-0.21.3" sources."typedarray-0.0.6" - sources."typescript-5.5.4" - sources."uglify-js-3.19.0" + sources."typescript-5.6.2" + sources."uglify-js-3.19.3" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" sources."universal-user-agent-6.0.1" @@ -76471,7 +74062,7 @@ in sources."sax-1.4.1" sources."semver-5.7.2" sources."source-map-0.6.1" - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; buildInputs = globalBuildInputs; meta = { @@ -76539,12 +74130,7 @@ in sources."bcryptjs-2.4.3" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."braces-2.3.2" sources."cache-base-1.0.1" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -76560,7 +74146,11 @@ in sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.3" sources."cors-2.8.5" - sources."debug-2.6.9" + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."decode-uri-component-0.2.2" sources."define-property-2.0.2" sources."depd-2.0.0" @@ -76574,28 +74164,28 @@ in (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" sources."is-descriptor-0.1.7" + ]; + }) + (sources."extend-shallow-2.0.1" // { + dependencies = [ sources."is-extendable-0.1.1" ]; }) - sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" ]; }) sources."faye-websocket-0.11.4" sources."file-uri-to-path-1.0.0" - (sources."fill-range-4.0.0" // { + sources."fill-range-4.0.0" + (sources."finalhandler-1.1.2" // { dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" + sources."on-finished-2.3.0" + sources."statuses-1.5.0" ]; }) - sources."finalhandler-1.1.2" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" @@ -76617,11 +74207,7 @@ in }) sources."hasown-2.0.2" sources."http-auth-3.1.3" - (sources."http-errors-2.0.0" // { - dependencies = [ - sources."statuses-2.0.1" - ]; - }) + sources."http-errors-2.0.0" sources."http-parser-js-0.5.8" sources."inherits-2.0.4" sources."is-accessor-descriptor-1.0.1" @@ -76632,29 +74218,39 @@ in sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-3.0.0" sources."is-plain-object-2.0.4" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isobject-3.0.1" - sources."kind-of-6.0.3" + sources."kind-of-3.2.2" sources."map-cache-0.2.2" sources."map-stream-0.1.0" sources."map-visit-1.0.0" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."kind-of-6.0.3" + ]; + }) sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mixin-deep-1.3.2" - sources."morgan-1.10.0" - sources."ms-2.0.0" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."on-finished-2.3.0" + ]; + }) + sources."ms-2.1.3" sources."nan-2.20.0" - sources."nanomatch-1.2.13" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."kind-of-6.0.3" + ]; + }) sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" @@ -76662,12 +74258,11 @@ in dependencies = [ sources."define-property-0.2.5" sources."is-descriptor-0.1.7" - sources."kind-of-3.2.2" ]; }) sources."object-visit-1.0.1" sources."object.pick-1.3.0" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."opn-6.0.0" sources."parseurl-1.3.3" @@ -76681,7 +74276,11 @@ in sources."range-parser-1.2.1" sources."readable-stream-2.3.8" sources."readdirp-2.2.1" - sources."regex-not-1.0.2" + (sources."regex-not-1.0.2" // { + dependencies = [ + sources."extend-shallow-3.0.2" + ]; + }) sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" @@ -76689,24 +74288,18 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - (sources."send-0.18.0" // { - dependencies = [ - sources."ms-2.1.3" - sources."on-finished-2.4.1" - sources."statuses-2.0.1" - ]; - }) + sources."send-0.19.0" (sources."serve-index-1.9.1" // { dependencies = [ sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" ]; }) (sources."set-value-2.0.1" // { dependencies = [ - sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" ]; }) @@ -76714,9 +74307,7 @@ in (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" sources."is-descriptor-0.1.7" - sources."is-extendable-0.1.1" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -76724,32 +74315,32 @@ in sources."define-property-1.0.0" ]; }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."split-0.3.3" - sources."split-string-3.1.0" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + ]; + }) (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" sources."is-descriptor-0.1.7" ]; }) - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."stream-combiner-0.0.4" sources."string_decoder-1.1.1" sources."through-2.3.8" - (sources."to-object-path-0.3.0" // { + sources."to-object-path-0.3.0" + (sources."to-regex-3.0.2" // { dependencies = [ - sources."kind-of-3.2.2" + sources."extend-shallow-3.0.2" ]; }) - sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."toidentifier-1.0.1" (sources."union-value-1.0.1" // { @@ -76816,7 +74407,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."backo2-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -76830,7 +74421,7 @@ in sources."binary-extensions-1.13.1" sources."bindings-1.5.0" sources."blob-0.0.5" - sources."body-parser-1.20.2" + sources."body-parser-1.20.3" sources."braces-1.8.5" sources."bufferutil-4.0.8" sources."bytes-3.1.2" @@ -76878,7 +74469,7 @@ in sources."destroy-1.2.0" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" (sources."engine.io-3.6.2" // { dependencies = [ sources."cookie-0.4.2" @@ -76899,7 +74490,7 @@ in sources."etag-1.8.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - (sources."express-4.19.2" // { + (sources."express-4.21.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; @@ -76917,7 +74508,7 @@ in sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" - sources."finalhandler-1.2.0" + sources."finalhandler-1.3.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" @@ -77010,7 +74601,7 @@ in sources."math-random-1.0.4" sources."mdurl-1.0.1" sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" @@ -77032,7 +74623,7 @@ in ]; }) sources."negotiator-0.6.3" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-2.1.1" sources."oauth-sign-0.9.0" (sources."object-copy-0.1.0" // { @@ -77061,7 +74652,7 @@ in sources."parseurl-1.3.3" sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" sources."performance-now-2.1.0" sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" @@ -77069,7 +74660,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."punycode-2.3.1" - sources."qs-6.11.0" + sources."qs-6.13.0" (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" @@ -77131,12 +74722,13 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ + sources."encodeurl-1.0.2" sources."ms-2.1.3" ]; }) - sources."serve-static-1.15.0" + sources."serve-static-1.16.2" sources."set-function-length-1.2.2" (sources."set-value-2.0.1" // { dependencies = [ @@ -77266,8 +74858,8 @@ in sources."color-name-1.1.4" sources."debug-4.3.2" sources."emoji-regex-8.0.0" - sources."escalade-3.1.2" - sources."follow-redirects-1.15.6" + sources."escalade-3.2.0" + sources."follow-redirects-1.15.9" sources."get-caller-file-2.0.5" sources."is-fullwidth-code-point-3.0.0" sources."ms-2.1.2" @@ -77320,12 +74912,12 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.8" sources."@types/get-stdin-5.0.1" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" sources."luaparse-git+https://github.com/oxyc/luaparse#ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" ]; buildInputs = globalBuildInputs; meta = { @@ -77400,7 +74992,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."babel-code-frame-6.26.0" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" @@ -77528,7 +75120,7 @@ in ]; }) sources."interpret-1.4.0" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-fullwidth-code-point-2.0.0" sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" @@ -77602,7 +75194,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-1.1.8" sources."psl-1.9.0" - sources."punycode-2.3.1" + sources."punycode-1.4.1" sources."qs-6.5.3" sources."readable-stream-2.3.8" sources."readline-1.3.0" @@ -77648,11 +75240,7 @@ in sources."through-2.3.8" sources."through2-2.0.5" sources."time-stamp-1.1.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.4.3" sources."tumblr-0.4.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -77660,7 +75248,11 @@ in sources."type-2.7.3" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."uri-js-4.4.1" + (sources."uri-js-4.4.1" // { + dependencies = [ + sources."punycode-2.3.1" + ]; + }) sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -77745,10 +75337,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "10.7.0"; + version = "10.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-10.7.0.tgz"; - sha512 = "v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA=="; + url = "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz"; + sha512 = "uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A=="; }; dependencies = [ sources."ansi-colors-4.1.3" @@ -77771,15 +75363,11 @@ in sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - (sources."debug-4.3.5" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) + sources."debug-4.3.7" sources."decamelize-4.0.0" sources."diff-5.2.0" sources."emoji-regex-8.0.0" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-string-regexp-4.0.0" sources."fill-range-7.1.1" sources."find-up-5.0.0" @@ -77856,7 +75444,7 @@ in sources."commander-2.20.3" sources."component-emitter-1.3.1" sources."cookiejar-2.1.4" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."define-data-property-1.1.4" sources."delayed-stream-1.0.0" sources."dezalgo-1.0.4" @@ -77887,13 +75475,13 @@ in sources."mime-2.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.13.2" sources."once-1.4.0" sources."path-loader-1.0.12" sources."punycode-2.3.1" - sources."qs-6.12.3" + sources."qs-6.13.0" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."semver-7.6.3" @@ -77919,17 +75507,17 @@ in neovim = nodeEnv.buildNodePackage { name = "neovim"; packageName = "neovim"; - version = "5.1.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/neovim/-/neovim-5.1.0.tgz"; - sha512 = "9eTxqknziWkN8CBOx1SKdK+0Dfp1NHKHKyJaeOYu+x6qjaV9z3hB211wKhLaFGtyYmGZxVaIe1aLtvuTHmuZTA=="; + url = "https://registry.npmjs.org/neovim/-/neovim-5.2.1.tgz"; + sha512 = "9mpiafAakIQ+yQRwmJr8bVyHhGwL7y44aByjo5RHpc8xjWHJ00FzSWFd/aNsBl209X/KrfuPPmKEnkKEQ6/iQA=="; }; dependencies = [ sources."@colors/colors-1.6.0" sources."@dabh/diagnostics-2.0.3" sources."@msgpack/msgpack-2.8.0" sources."@types/triple-beam-1.3.5" - sources."async-3.2.5" + sources."async-3.2.6" sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -77947,14 +75535,14 @@ in sources."one-time-1.0.0" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-2.4.3" + sources."safe-stable-stringify-2.5.0" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."string_decoder-1.3.0" sources."text-hex-1.0.0" sources."triple-beam-1.4.1" sources."util-deprecate-1.0.2" - sources."winston-3.11.0" + sources."winston-3.14.1" sources."winston-transport-4.7.1" ]; buildInputs = globalBuildInputs; @@ -77992,10 +75580,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz"; - sha512 = "OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz"; + sha512 = "IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw=="; }; buildInputs = globalBuildInputs; meta = { @@ -78010,39 +75598,39 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-4.0.2.tgz"; - sha512 = "19AC1zouBYxaobzkpPb5PdqQptgO1fI9NRcrasFAYoG6wB8S53khFeuy1qiNaggo2JFu6TSJk2zLR+y4wksU1w=="; + url = "https://registry.npmjs.org/node-red/-/node-red-4.0.3.tgz"; + sha512 = "6ZYh54FKqkEANoFgUBNgHm4LaUg5m3eW/01Dslf3cf3aeaRPa9mpS63sRiFC75JuJCxN29LH1/As91/1lSOxYA=="; }; dependencies = [ - sources."@babel/runtime-7.24.8" + sources."@babel/runtime-7.25.6" sources."@emnapi/core-1.2.0" sources."@emnapi/runtime-1.2.0" sources."@emnapi/wasi-threads-1.0.1" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."strip-ansi-7.1.0" ]; }) sources."@isaacs/fs-minipass-4.0.1" sources."@napi-rs/wasm-runtime-0.2.4" - (sources."@node-red/editor-api-4.0.2" // { + (sources."@node-red/editor-api-4.0.3" // { dependencies = [ sources."mime-3.0.0" ]; }) - sources."@node-red/editor-client-4.0.2" - (sources."@node-red/nodes-4.0.2" // { + sources."@node-red/editor-client-4.0.3" + (sources."@node-red/nodes-4.0.3" // { dependencies = [ sources."iconv-lite-0.6.3" sources."media-typer-1.1.0" ]; }) - sources."@node-red/registry-4.0.2" - sources."@node-red/runtime-4.0.2" - sources."@node-red/util-4.0.2" + sources."@node-red/registry-4.0.3" + sources."@node-red/runtime-4.0.3" + sources."@node-red/util-4.0.3" sources."@node-rs/bcrypt-1.10.4" sources."@node-rs/bcrypt-android-arm-eabi-1.10.4" sources."@node-rs/bcrypt-android-arm64-1.10.4" @@ -78062,25 +75650,25 @@ in sources."@szmarczak/http-timer-5.0.1" sources."@tybys/wasm-util-0.9.0" sources."@types/http-cache-semantics-4.0.4" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" (sources."@types/readable-stream-4.0.15" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."@types/ws-8.5.11" + sources."@types/ws-8.5.12" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.11.3" - sources."acorn-walk-8.3.2" + sources."acorn-8.12.1" + sources."acorn-walk-8.3.4" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - sources."ajv-8.14.0" + sources."ajv-8.17.1" sources."ansi-colors-4.1.3" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" @@ -78089,7 +75677,7 @@ in sources."array-flatten-1.1.1" sources."async-mutex-0.5.0" sources."asynckit-0.4.0" - sources."axios-1.7.2" + sources."axios-1.7.7" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -78098,8 +75686,8 @@ in ]; }) sources."bcryptjs-2.4.3" - sources."bl-6.0.14" - sources."body-parser-1.20.2" + sources."bl-6.0.15" + sources."body-parser-1.20.3" sources."boolbase-1.0.0" sources."brace-expansion-2.0.1" sources."buffer-6.0.3" @@ -78140,11 +75728,7 @@ in sources."cross-spawn-7.0.3" sources."css-select-4.3.0" sources."css-what-6.1.0" - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) + sources."debug-2.6.9" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -78163,7 +75747,7 @@ in sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" sources."emoji-regex-9.2.2" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" sources."enquirer-2.4.1" sources."entities-2.2.0" sources."es-define-property-1.0.0" @@ -78172,7 +75756,7 @@ in sources."etag-1.8.1" sources."event-target-shim-5.0.1" sources."events-3.3.0" - sources."express-4.19.2" + sources."express-4.21.0" (sources."express-session-1.18.0" // { dependencies = [ sources."cookie-signature-1.0.7" @@ -78180,9 +75764,10 @@ in }) sources."fast-deep-equal-3.1.3" sources."fast-unique-numbers-8.0.13" - sources."finalhandler-1.2.0" - sources."follow-redirects-1.15.6" - sources."foreground-child-3.2.1" + sources."fast-uri-3.0.1" + sources."finalhandler-1.3.1" + sources."follow-redirects-1.15.9" + sources."foreground-child-3.3.0" sources."form-data-4.0.0" sources."form-data-encoder-2.1.4" sources."forwarded-0.2.0" @@ -78208,8 +75793,8 @@ in sources."http2-wrapper-2.2.1" (sources."https-proxy-agent-5.0.1" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."i18next-21.10.0" @@ -78236,13 +75821,13 @@ in sources."media-typer-0.3.0" (sources."memorystore-1.6.7" // { dependencies = [ - sources."debug-4.3.5" + sources."debug-4.3.7" sources."lru-cache-4.1.5" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."yallist-2.1.2" ]; }) - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.52.0" @@ -78257,19 +75842,19 @@ in sources."moment-timezone-0.5.45" (sources."mqtt-5.7.0" // { dependencies = [ - sources."debug-4.3.5" + sources."debug-4.3.7" sources."lru-cache-10.4.3" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."ws-8.18.0" ]; }) (sources."mqtt-packet-9.0.0" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - sources."ms-2.1.3" + sources."ms-2.0.0" (sources."multer-1.4.5-lts.1" // { dependencies = [ sources."concat-stream-1.6.2" @@ -78281,16 +75866,16 @@ in sources."mustache-4.2.0" sources."mute-stream-1.0.0" sources."negotiator-0.6.3" - sources."node-gyp-build-4.8.1" - sources."node-red-admin-4.0.0" + sources."node-gyp-build-4.8.2" + sources."node-red-admin-4.0.1" sources."node-watch-0.7.4" sources."nopt-5.0.0" sources."normalize-url-8.0.1" sources."nth-check-2.1.1" (sources."number-allocator-1.0.14" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."oauth2orize-1.12.0" @@ -78313,17 +75898,14 @@ in sources."lru-cache-10.4.3" ]; }) - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" sources."pause-0.0.1" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" - sources."psl-1.9.0" - sources."punycode-2.3.1" - sources."qs-6.11.0" - sources."querystringify-2.2.0" + sources."qs-6.13.0" sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.1" @@ -78333,17 +75915,21 @@ in sources."regenerator-runtime-0.14.1" sources."reinterval-1.1.0" sources."require-from-string-2.0.2" - sources."requires-port-1.0.0" sources."resolve-alpn-1.2.1" sources."responselike-3.0.0" sources."rfdc-1.4.1" - sources."rimraf-5.0.9" + sources."rimraf-5.0.10" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.4.1" sources."semver-7.5.4" - sources."send-0.18.0" - sources."serve-static-1.15.0" + (sources."send-0.19.0" // { + dependencies = [ + sources."encodeurl-1.0.2" + sources."ms-2.1.3" + ]; + }) + sources."serve-static-1.16.2" sources."set-function-length-1.2.2" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" @@ -78355,7 +75941,7 @@ in sources."streamsearch-1.1.0" (sources."string-width-5.1.2" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."strip-ansi-7.1.0" ]; }) @@ -78373,23 +75959,19 @@ in sources."yallist-5.0.0" ]; }) + sources."tldts-6.1.47" + sources."tldts-core-6.1.47" sources."toidentifier-1.0.1" - (sources."tough-cookie-4.1.4" // { - dependencies = [ - sources."universalify-0.2.0" - ]; - }) - sources."tslib-2.6.3" + sources."tough-cookie-5.0.0" + sources."tslib-2.7.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uglify-js-3.17.4" sources."uid-safe-2.1.5" sources."uid2-0.0.4" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."universalify-2.0.1" sources."unpipe-1.0.0" - sources."uri-js-4.4.1" - sources."url-parse-1.5.10" sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -78401,7 +75983,7 @@ in sources."worker-timers-worker-7.0.71" (sources."wrap-ansi-8.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."strip-ansi-7.1.0" ]; }) @@ -78446,7 +76028,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" @@ -78496,7 +76078,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -78580,7 +76162,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."sshpk-1.18.0" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -78649,7 +76231,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."@inquirer/figures-1.0.5" + sources."@inquirer/figures-1.0.6" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -78659,7 +76241,7 @@ in sources."graceful-fs-4.2.10" ]; }) - sources."@pnpm/npm-conf-2.2.2" + sources."@pnpm/npm-conf-2.3.1" sources."@samverschueren/stream-to-observable-0.3.1" sources."@types/normalize-package-data-2.4.4" sources."aggregate-error-4.0.1" @@ -78669,18 +76251,19 @@ in sources."ansi-styles-3.2.1" sources."any-observable-0.3.0" sources."argparse-2.0.1" + sources."atomically-2.0.3" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bl-4.1.0" - (sources."boxen-7.1.1" // { + (sources."boxen-8.0.1" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" + sources."emoji-regex-10.4.0" + sources."string-width-7.2.0" sources."strip-ansi-7.1.0" - sources."type-fest-2.19.0" - sources."wrap-ansi-8.1.0" + sources."type-fest-4.26.1" + sources."wrap-ansi-9.0.0" ]; }) sources."brace-expansion-1.1.11" @@ -78688,7 +76271,7 @@ in sources."buffer-5.7.1" sources."bundle-name-4.1.0" sources."callsites-3.1.0" - sources."camelcase-7.0.1" + sources."camelcase-8.0.0" sources."chalk-5.3.0" sources."chalk-template-1.1.0" sources."chardet-0.7.0" @@ -78715,14 +76298,9 @@ in sources."ini-1.3.8" ]; }) - sources."configstore-6.0.0" + sources."configstore-7.0.0" sources."cosmiconfig-8.3.6" sources."cross-spawn-7.0.3" - (sources."crypto-random-string-4.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) sources."date-fns-1.30.1" sources."deep-extend-0.6.0" sources."default-browser-5.2.1" @@ -78731,8 +76309,11 @@ in sources."define-lazy-prop-3.0.0" sources."del-7.1.0" sources."dir-glob-3.0.1" - sources."dot-prop-6.0.1" - sources."eastasianwidth-0.2.0" + (sources."dot-prop-9.0.0" // { + dependencies = [ + sources."type-fest-4.26.1" + ]; + }) sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" @@ -78760,6 +76341,7 @@ in }) sources."find-up-simple-1.0.0" sources."fs.realpath-1.0.0" + sources."get-east-asian-width-1.2.0" sources."get-stream-8.0.1" sources."github-url-from-git-1.5.0" sources."glob-7.2.3" @@ -78777,7 +76359,7 @@ in sources."human-signals-5.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-5.3.1" + sources."ignore-5.3.2" (sources."ignore-walk-6.0.5" // { dependencies = [ sources."brace-expansion-2.0.1" @@ -78785,13 +76367,11 @@ in ]; }) sources."import-fresh-3.3.0" - sources."import-lazy-4.0.0" (sources."import-local-3.2.0" // { dependencies = [ sources."pkg-dir-4.2.0" ]; }) - sources."imurmurhash-0.1.4" sources."indent-string-5.0.0" sources."index-to-position-0.1.2" sources."inflight-1.0.6" @@ -78830,13 +76410,12 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" - sources."is-in-ci-0.1.0" + sources."is-in-ci-1.0.0" sources."is-inside-container-1.0.0" sources."is-installed-globally-1.0.0" sources."is-interactive-2.0.0" sources."is-npm-6.0.0" sources."is-number-7.0.0" - sources."is-obj-2.0.0" (sources."is-observable-1.1.0" // { dependencies = [ sources."symbol-observable-1.2.0" @@ -78847,16 +76426,15 @@ in sources."is-promise-2.2.2" sources."is-scoped-3.0.0" sources."is-stream-3.0.0" - sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-url-superb-6.1.0" sources."is-wsl-3.1.0" sources."isexe-2.0.0" - sources."issue-regex-4.1.0" + sources."issue-regex-4.2.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-parse-even-better-errors-2.3.1" - sources."ky-1.4.0" + sources."ky-1.7.2" sources."latest-version-9.0.0" sources."lines-and-columns-1.2.4" (sources."listr-0.14.3" // { @@ -78935,7 +76513,7 @@ in sources."meow-13.2.0" sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mimic-fn-4.0.0" sources."mimic-function-5.0.1" sources."minimatch-3.1.2" @@ -78993,7 +76571,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-type-4.0.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pkg-dir-8.0.0" sources."proto-list-1.2.4" @@ -79006,13 +76584,13 @@ in }) (sources."read-package-up-11.0.0" // { dependencies = [ - sources."type-fest-4.23.0" + sources."type-fest-4.26.1" ]; }) (sources."read-pkg-9.0.1" // { dependencies = [ sources."parse-json-8.1.0" - sources."type-fest-4.23.0" + sources."type-fest-4.26.1" ]; }) sources."readable-stream-3.6.2" @@ -79038,14 +76616,13 @@ in sources."run-parallel-1.2.0" (sources."rxjs-7.8.1" // { dependencies = [ - sources."tslib-2.6.3" + sources."tslib-2.7.0" ]; }) sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."scoped-regex-3.0.0" sources."semver-7.6.3" - sources."semver-diff-4.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" @@ -79054,12 +76631,13 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."strip-final-newline-3.0.0" sources."strip-json-comments-2.0.1" + sources."stubborn-fs-1.2.5" sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.3.0" // { dependencies = [ @@ -79079,21 +76657,20 @@ in sources."to-regex-range-5.0.1" sources."tslib-1.14.1" sources."type-fest-0.21.3" - sources."typedarray-to-buffer-3.1.5" - sources."typescript-5.5.4" + sources."typescript-5.6.2" sources."unicorn-magic-0.1.0" - sources."unique-string-3.0.0" - sources."update-notifier-7.1.0" + sources."update-notifier-7.3.1" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-5.0.1" sources."wcwidth-1.0.1" + sources."when-exit-2.1.3" sources."which-2.0.2" - (sources."widest-line-4.0.1" // { + (sources."widest-line-5.0.0" // { dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" + sources."ansi-regex-6.1.0" + sources."emoji-regex-10.4.0" + sources."string-width-7.2.0" sources."strip-ansi-7.1.0" ]; }) @@ -79105,11 +76682,6 @@ in ]; }) sources."wrappy-1.0.2" - (sources."write-file-atomic-3.0.3" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) sources."xdg-basedir-5.1.0" sources."yoctocolors-cjs-2.1.2" ]; @@ -79126,10 +76698,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "10.8.2"; + version = "10.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-10.8.2.tgz"; - sha512 = "x/AIjFIKRllrhcb48dqUNAAZl0ig9+qMuN91RpZo3Cb2+zuibfh+KISl6+kVVyktDz230JKc208UkQwwMqyB+w=="; + url = "https://registry.npmjs.org/npm/-/npm-10.8.3.tgz"; + sha512 = "0IQlyAYvVtQ7uOhDFYZCGK8kkut2nh8cpAdA9E6FvRSJaTgtZRZgNjlC5ZCct//L73ygrpY93CxXpRJDtNqPVg=="; }; buildInputs = globalBuildInputs; meta = { @@ -79198,10 +76770,10 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.31.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.31.0.tgz"; - sha512 = "515KTDQ4VRJCT+4DsMrK/QROWRq4PXrjgxAoEx3jmP7j+aQBGbx8WhidIF6aX1UgbTxw47Lq7QVp9mbnD0lnWA=="; + url = "https://registry.npmjs.org/orval/-/orval-7.1.1.tgz"; + sha512 = "UN+ZcJvCPWTfq+TiLzyGJfsRDe6lYCLDlvQF5LAazvYIhqBATyPRulcS/CZaOAbiAw710nd5L+aXsrPigPUwHw=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" @@ -79210,7 +76782,7 @@ in sources."@apidevtools/swagger-parser-10.1.0" sources."@asyncapi/specs-4.3.1" sources."@exodus/schemasafe-1.3.0" - sources."@ibm-cloud/openapi-ruleset-1.18.2" + sources."@ibm-cloud/openapi-ruleset-1.22.0" sources."@ibm-cloud/openapi-ruleset-utilities-1.3.2" sources."@jsdevtools/ono-7.1.3" sources."@jsep-plugin/regex-1.0.3" @@ -79218,17 +76790,17 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@orval/angular-6.31.0" - sources."@orval/axios-6.31.0" - sources."@orval/core-6.31.0" - sources."@orval/fetch-6.31.0" - sources."@orval/hono-6.31.0" - sources."@orval/mock-6.31.0" - sources."@orval/query-6.31.0" - sources."@orval/swr-6.31.0" - sources."@orval/zod-6.31.0" + sources."@orval/angular-7.1.1" + sources."@orval/axios-7.1.1" + sources."@orval/core-7.1.1" + sources."@orval/fetch-7.1.1" + sources."@orval/hono-7.1.1" + sources."@orval/mock-7.1.1" + sources."@orval/query-7.1.1" + sources."@orval/swr-7.1.1" + sources."@orval/zod-7.1.1" sources."@stoplight/better-ajv-errors-1.0.3" - sources."@stoplight/json-3.21.4" + sources."@stoplight/json-3.21.7" (sources."@stoplight/json-ref-readers-1.2.2" // { dependencies = [ sources."tslib-1.14.1" @@ -79237,22 +76809,21 @@ in sources."@stoplight/json-ref-resolver-3.1.6" sources."@stoplight/ordered-object-literal-1.0.5" sources."@stoplight/path-1.3.2" - (sources."@stoplight/spectral-core-1.18.3" // { + (sources."@stoplight/spectral-core-1.19.1" // { dependencies = [ sources."@stoplight/types-13.6.0" - sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" ]; }) - sources."@stoplight/spectral-formats-1.6.0" - sources."@stoplight/spectral-functions-1.8.0" + sources."@stoplight/spectral-formats-1.7.0" + sources."@stoplight/spectral-functions-1.9.0" (sources."@stoplight/spectral-parsers-1.0.4" // { dependencies = [ sources."@stoplight/types-14.1.1" ]; }) sources."@stoplight/spectral-ref-resolver-1.0.4" - sources."@stoplight/spectral-rulesets-1.19.1" + sources."@stoplight/spectral-rulesets-1.20.2" (sources."@stoplight/spectral-runtime-1.1.2" // { dependencies = [ sources."@stoplight/types-12.5.0" @@ -79267,7 +76838,7 @@ in sources."@stoplight/yaml-ast-parser-0.0.50" sources."@types/es-aggregate-error-1.0.6" sources."@types/json-schema-7.0.15" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/urijs-1.19.25" sources."abort-controller-3.0.0" sources."acorn-8.12.1" @@ -79283,11 +76854,11 @@ in sources."array-buffer-byte-length-1.0.1" sources."array-union-2.1.0" sources."arraybuffer.prototype.slice-1.0.3" - sources."astring-1.8.6" + sources."astring-1.9.0" sources."available-typed-arrays-1.0.7" sources."balanced-match-1.0.2" sources."binary-extensions-2.3.0" - sources."brace-expansion-2.0.1" + sources."brace-expansion-1.1.11" sources."braces-3.0.3" sources."cac-6.7.14" sources."call-bind-1.0.7" @@ -79303,7 +76874,7 @@ in sources."data-view-buffer-1.0.1" sources."data-view-byte-length-1.0.1" sources."data-view-byte-offset-1.0.0" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."dependency-graph-0.11.0" @@ -79320,7 +76891,7 @@ in sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" sources."esbuild-0.19.12" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."esprima-4.0.1" sources."esutils-2.0.3" sources."event-target-shim-5.0.1" @@ -79357,7 +76928,7 @@ in sources."http2-client-1.3.5" sources."human-signals-2.1.0" sources."iconv-lite-0.6.3" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."immer-9.0.21" sources."internal-slot-1.0.7" sources."is-array-buffer-3.0.4" @@ -79400,14 +76971,18 @@ in sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.uniqwith-4.5.0" - sources."loglevel-1.9.1" + sources."loglevel-1.9.2" sources."loglevel-plugin-prefix-0.8.4" sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mimic-fn-2.1.0" - sources."minimatch-6.2.0" - sources."ms-2.1.2" + (sources."minimatch-6.2.0" // { + dependencies = [ + sources."brace-expansion-2.0.1" + ]; + }) + sources."ms-2.1.3" (sources."nimma-0.2.2" // { dependencies = [ sources."jsonpath-plus-6.0.1" @@ -79430,7 +77005,7 @@ in sources."openapi-types-12.1.3" (sources."openapi3-ts-4.2.2" // { dependencies = [ - sources."yaml-2.5.0" + sources."yaml-2.5.1" ]; }) sources."p-limit-3.1.0" @@ -79480,14 +77055,14 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tsconfck-2.1.2" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."typed-array-buffer-1.0.2" sources."typed-array-byte-length-1.0.1" sources."typed-array-byte-offset-1.0.2" sources."typed-array-length-1.0.6" - sources."typescript-5.5.4" + sources."typescript-5.6.2" sources."unbox-primitive-1.0.2" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."universalify-2.0.1" sources."urijs-1.19.11" sources."utility-types-3.11.0" @@ -79507,7 +77082,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A swagger client generator for typescript"; - homepage = "https://github.com/anymaniax/orval#readme"; + homepage = "https://github.com/orval-labs/orval#readme"; license = "MIT"; }; production = true; @@ -79543,7 +77118,7 @@ in sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@lezer/common-1.2.1" - sources."@lezer/lr-1.4.1" + sources."@lezer/lr-1.4.2" sources."@lmdb/lmdb-darwin-arm64-2.8.5" sources."@lmdb/lmdb-darwin-x64-2.8.5" sources."@lmdb/lmdb-linux-arm-2.8.5" @@ -79637,9 +77212,9 @@ in sources."@parcel/watcher-win32-ia32-2.4.1" sources."@parcel/watcher-win32-x64-2.4.1" sources."@parcel/workers-2.12.0" - sources."@swc/core-1.7.1" + sources."@swc/core-1.7.26" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.12" + sources."@swc/helpers-0.5.13" sources."@swc/types-0.1.12" sources."@trysound/sax-0.2.0" sources."abab-2.0.6" @@ -79661,7 +77236,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."balanced-match-1.0.2" sources."base-x-3.0.10" sources."bcrypt-pbkdf-1.0.2" @@ -79669,11 +77244,11 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.3" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.23.2" + sources."browserslist-4.23.3" sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001643" + sources."caniuse-lite-1.0.30001662" sources."caseless-0.12.0" sources."chalk-4.1.2" sources."chrome-trace-event-1.0.4" @@ -79692,8 +77267,8 @@ in sources."css-tree-1.1.3" sources."css-what-6.1.0" sources."cssesc-3.0.0" - sources."cssnano-7.0.4" - sources."cssnano-preset-default-7.0.4" + sources."cssnano-7.0.6" + sources."cssnano-preset-default-7.0.6" sources."cssnano-utils-5.0.0" sources."csso-4.2.0" sources."cssom-0.3.8" @@ -79716,12 +77291,12 @@ in sources."dotenv-expand-5.1.0" sources."eastasianwidth-0.2.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.5.1" + sources."electron-to-chromium-1.5.26" sources."emoji-regex-9.2.2" sources."entities-3.0.1" sources."env-paths-2.2.1" sources."error-ex-1.3.2" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-string-regexp-1.0.5" sources."escodegen-1.14.3" sources."esprima-4.0.1" @@ -79733,7 +77308,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fill-range-7.1.1" - sources."foreground-child-3.2.1" + sources."foreground-child-3.3.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs.realpath-1.0.0" @@ -79802,7 +77377,7 @@ in sources."json5-2.2.3" sources."jsprim-1.4.2" sources."levn-0.3.0" - (sources."lightningcss-1.25.1" // { + (sources."lightningcss-1.27.0" // { dependencies = [ sources."detect-libc-1.0.3" ]; @@ -79816,7 +77391,7 @@ in sources."lodash.uniq-4.5.0" sources."lru-cache-10.4.3" sources."mdn-data-2.0.14" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-9.0.5" @@ -79841,36 +77416,36 @@ in sources."path-key-3.1.1" sources."path-scurry-1.11.1" sources."performance-now-2.1.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pn-1.1.0" - sources."postcss-8.4.40" - sources."postcss-calc-10.0.0" - sources."postcss-colormin-7.0.1" - sources."postcss-convert-values-7.0.2" - sources."postcss-discard-comments-7.0.1" - sources."postcss-discard-duplicates-7.0.0" + sources."postcss-8.4.47" + sources."postcss-calc-10.0.2" + sources."postcss-colormin-7.0.2" + sources."postcss-convert-values-7.0.4" + sources."postcss-discard-comments-7.0.3" + sources."postcss-discard-duplicates-7.0.1" sources."postcss-discard-empty-7.0.0" sources."postcss-discard-overridden-7.0.0" - sources."postcss-merge-longhand-7.0.2" - sources."postcss-merge-rules-7.0.2" + sources."postcss-merge-longhand-7.0.4" + sources."postcss-merge-rules-7.0.4" sources."postcss-minify-font-values-7.0.0" sources."postcss-minify-gradients-7.0.0" - sources."postcss-minify-params-7.0.1" - sources."postcss-minify-selectors-7.0.2" + sources."postcss-minify-params-7.0.2" + sources."postcss-minify-selectors-7.0.4" sources."postcss-normalize-charset-7.0.0" sources."postcss-normalize-display-values-7.0.0" sources."postcss-normalize-positions-7.0.0" sources."postcss-normalize-repeat-style-7.0.0" sources."postcss-normalize-string-7.0.0" sources."postcss-normalize-timing-functions-7.0.0" - sources."postcss-normalize-unicode-7.0.1" + sources."postcss-normalize-unicode-7.0.2" sources."postcss-normalize-url-7.0.0" sources."postcss-normalize-whitespace-7.0.0" sources."postcss-ordered-values-7.0.1" - sources."postcss-reduce-initial-7.0.1" + sources."postcss-reduce-initial-7.0.2" sources."postcss-reduce-transforms-7.0.0" - sources."postcss-selector-parser-6.1.1" + sources."postcss-selector-parser-6.1.2" (sources."postcss-svgo-7.0.1" // { dependencies = [ sources."css-select-5.1.0" @@ -79892,7 +77467,7 @@ in sources."svgo-3.3.2" ]; }) - sources."postcss-unique-selectors-7.0.1" + sources."postcss-unique-selectors-7.0.3" sources."postcss-value-parser-4.2.0" sources."posthtml-0.16.6" sources."posthtml-parser-0.11.0" @@ -79922,7 +77497,7 @@ in sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" sources."source-map-0.6.1" - sources."source-map-js-1.2.0" + sources."source-map-js-1.2.1" sources."source-map-support-0.5.21" sources."srcset-4.0.0" sources."sshpk-1.18.0" @@ -79937,16 +77512,16 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" - sources."stylehacks-7.0.2" + sources."stylehacks-7.0.4" sources."supports-color-7.2.0" sources."svgo-2.8.0" sources."symbol-tree-3.2.4" sources."term-size-2.2.1" - (sources."terser-5.31.3" // { + (sources."terser-5.33.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -79955,12 +77530,12 @@ in sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."tr46-1.0.1" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."type-fest-0.20.2" - sources."typescript-5.5.4" + sources."typescript-5.6.2" (sources."uncss-0.17.3" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -80040,7 +77615,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."babybird-0.0.1" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" @@ -80048,7 +77623,7 @@ in sources."bintrees-1.0.2" sources."bl-1.2.3" sources."bluebird-3.7.2" - (sources."body-parser-1.20.2" // { + (sources."body-parser-1.20.3" // { dependencies = [ sources."bytes-3.1.2" sources."content-type-1.0.5" @@ -80097,7 +77672,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-7.0.3" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" sources."entities-1.1.2" sources."errno-0.1.8" sources."es-define-property-1.0.0" @@ -80105,7 +77680,7 @@ in sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" - (sources."express-4.19.2" // { + (sources."express-4.21.0" // { dependencies = [ sources."content-type-1.0.5" sources."safe-buffer-5.2.1" @@ -80117,7 +77692,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."file-uri-to-path-1.0.0" - sources."finalhandler-1.2.0" + sources."finalhandler-1.3.1" sources."find-up-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -80172,7 +77747,7 @@ in sources."lodash.clonedeep-4.5.0" sources."media-typer-0.3.0" sources."mediawiki-title-0.6.5" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.52.0" @@ -80188,7 +77763,7 @@ in sources."ncp-2.0.0" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.2" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."oauth-sign-0.9.0" sources."object-inspect-1.13.2" sources."object-keys-1.1.1" @@ -80202,7 +77777,7 @@ in sources."parseurl-1.3.3" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" sources."performance-now-2.1.0" sources."pn-1.1.0" sources."prfun-2.1.5" @@ -80213,7 +77788,7 @@ in sources."prr-1.0.1" sources."psl-1.9.0" sources."punycode-2.3.1" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."range-parser-1.2.1" (sources."raw-body-2.5.2" // { dependencies = [ @@ -80237,8 +77812,9 @@ in sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" sources."semver-6.3.1" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ + sources."encodeurl-1.0.2" sources."ms-2.1.3" ]; }) @@ -80248,7 +77824,7 @@ in sources."safe-buffer-5.1.1" ]; }) - sources."serve-static-1.15.0" + sources."serve-static-1.16.2" (sources."service-runner-2.9.0" // { dependencies = [ sources."semver-7.6.3" @@ -80274,7 +77850,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.19.0" + sources."uglify-js-3.19.3" sources."unix-dgram-2.0.6" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -80363,7 +77939,7 @@ in sources."jsonfile-6.1.0" sources."jsonify-0.0.1" sources."klaw-sync-6.0.0" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."object-keys-1.1.1" @@ -80385,7 +77961,7 @@ in sources."universalify-2.0.1" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."yaml-2.5.0" + sources."yaml-2.5.1" ]; buildInputs = globalBuildInputs; meta = { @@ -80540,7 +78116,7 @@ in sources."ipaddr.js-2.2.0" sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-date-object-1.0.5" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -80667,7 +78243,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -80746,7 +78322,7 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."backo2-1.0.2" sources."balanced-match-1.0.2" sources."base64-arraybuffer-0.1.4" @@ -80767,7 +78343,7 @@ in sources."blob-0.0.5" sources."bn.js-4.12.0" sources."bncode-0.5.3" - sources."body-parser-1.20.2" + sources."body-parser-1.20.3" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" @@ -80827,7 +78403,7 @@ in sources."destroy-1.2.0" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" sources."end-of-stream-1.4.4" (sources."engine.io-3.6.2" // { dependencies = [ @@ -80847,7 +78423,7 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."events-3.3.0" - (sources."express-4.19.2" // { + (sources."express-4.21.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; @@ -80857,7 +78433,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fifo-0.1.4" - sources."finalhandler-1.2.0" + sources."finalhandler-1.3.1" sources."flatten-0.0.1" (sources."fluent-ffmpeg-2.1.3" // { dependencies = [ @@ -80936,7 +78512,7 @@ in sources."lru-2.0.1" sources."magnet-uri-2.0.1" sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.52.0" @@ -80961,7 +78537,7 @@ in ]; }) sources."negotiator-0.6.3" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."object-inspect-1.13.2" @@ -80979,7 +78555,7 @@ in sources."parseuri-0.0.6" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" (sources."peer-wire-protocol-0.7.1" // { dependencies = [ sources."bncode-0.2.3" @@ -80993,9 +78569,9 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."queue-microtask-1.2.3" sources."queue-tick-1.0.1" sources."random-access-file-2.2.1" @@ -81019,12 +78595,13 @@ in sources."rusha-0.8.14" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ + sources."encodeurl-1.0.2" sources."ms-2.1.3" ]; }) - sources."serve-static-1.15.0" + sources."serve-static-1.16.2" sources."set-function-length-1.2.2" sources."setprototypeof-1.2.0" sources."side-channel-1.0.6" @@ -81158,15 +78735,15 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.4.40"; + version = "8.4.47"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz"; - sha512 = "YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz"; + sha512 = "56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ=="; }; dependencies = [ sources."nanoid-3.3.7" - sources."picocolors-1.0.1" - sources."source-map-js-1.2.0" + sources."picocolors-1.1.0" + sources."source-map-js-1.2.1" ]; buildInputs = globalBuildInputs; meta = { @@ -81202,19 +78779,19 @@ in sources."color-name-1.1.4" sources."dependency-graph-0.11.0" sources."emoji-regex-8.0.0" - sources."esbuild-0.21.5" - sources."escalade-3.1.2" + sources."esbuild-0.23.1" + sources."escalade-3.2.0" sources."fast-glob-3.3.2" sources."fastq-1.17.1" sources."fill-range-7.1.1" sources."fs-extra-11.2.0" sources."get-caller-file-2.0.5" sources."get-stdin-9.0.0" - sources."get-tsconfig-4.7.6" + sources."get-tsconfig-4.8.1" sources."glob-parent-5.1.2" sources."globby-14.0.2" sources."graceful-fs-4.2.11" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -81224,14 +78801,14 @@ in sources."jsonfile-6.1.0" sources."lilconfig-3.1.2" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."path-type-5.0.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-8.4.40" + sources."postcss-8.4.47" sources."postcss-load-config-5.1.0" sources."postcss-reporter-7.1.0" sources."pretty-hrtime-1.0.3" @@ -81243,17 +78820,17 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."slash-5.1.0" - sources."source-map-js-1.2.0" + sources."source-map-js-1.2.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."thenby-1.3.4" sources."to-regex-range-5.0.1" - sources."tsx-4.16.2" + sources."tsx-4.19.1" sources."unicorn-magic-0.1.0" sources."universalify-2.0.1" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yaml-2.5.0" + sources."yaml-2.5.1" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" ]; @@ -81294,9 +78871,9 @@ in sources."minimist-1.2.8" sources."mkdirp-classic-0.5.3" sources."napi-build-utils-1.0.2" - sources."node-abi-3.65.0" + sources."node-abi-3.68.0" sources."once-1.4.0" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."rc-1.2.8" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" @@ -81365,14 +78942,14 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "5.17.0"; + version = "5.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.17.0.tgz"; - sha512 = "4XXTBGpwJBUFqvY2WxL/4W1q/OOstxCJER4TYftNgMGjKjnsFkQNme567QTlPwWp7VGw2jcNmyTFOcP4HdohIg=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.19.1.tgz"; + sha512 = "LqxfEJanka72luhVerryZpxj8JLlISccY/t+MG4/5zS57Xr+XdEtkoMhZNyj/LR1huSnMzW9eYXkUiHgh53GQg=="; }; dependencies = [ - sources."@prisma/prisma-schema-wasm-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053" - sources."@prisma/schema-files-loader-5.17.0" + sources."@prisma/prisma-schema-wasm-5.19.1-2.69d742ee20b815d88e17e54db4a2a7a3b30324e3" + sources."@prisma/schema-files-loader-5.19.1" sources."@types/js-levenshtein-1.1.3" sources."fs-extra-11.1.1" sources."graceful-fs-4.2.11" @@ -81421,7 +78998,7 @@ in }) sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" - sources."foreground-child-3.2.1" + sources."foreground-child-3.3.0" sources."fs.realpath-1.0.0" sources."gaze-1.1.3" (sources."glob-10.4.5" // { @@ -81462,7 +79039,7 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" @@ -81583,7 +79160,7 @@ in }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - (sources."elliptic-6.5.6" // { + (sources."elliptic-6.5.7" // { dependencies = [ sources."bn.js-4.12.0" ]; @@ -81635,7 +79212,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -81700,7 +79277,7 @@ in ]; }) sources."punycode-1.4.1" - sources."qs-6.12.3" + sources."qs-6.13.0" sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" @@ -81713,7 +79290,7 @@ in ]; }) sources."resolve-1.22.8" - sources."rimraf-2.7.1" + sources."rimraf-2.6.3" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."sander-0.5.1" @@ -81739,11 +79316,7 @@ in sources."subarg-1.0.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."syntax-error-1.4.0" - (sources."temp-0.9.4" // { - dependencies = [ - sources."rimraf-2.6.3" - ]; - }) + sources."temp-0.9.4" sources."through-2.3.8" sources."through2-2.0.5" sources."timers-browserify-1.4.2" @@ -81752,7 +79325,7 @@ in sources."typedarray-0.0.6" sources."umd-3.0.3" sources."undeclared-identifiers-1.1.3" - sources."url-0.11.3" + sources."url-0.11.4" (sources."util-0.10.4" // { dependencies = [ sources."inherits-2.0.3" @@ -81794,7 +79367,7 @@ in sources."vscode-jsonrpc-8.1.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-textdocument-1.0.12" sources."vscode-languageserver-types-3.17.3" sources."vscode-uri-2.1.2" sources."which-2.0.2" @@ -81872,8 +79445,8 @@ in sha512 = "QxvCtwgDBTeBC9V+niO9WPrnNKVEIa0osvdKhw2JkhOjFY0PK/vcFL5jrj7di6GurLIzdweXJgTWnQz2VljdQQ=="; }; dependencies = [ - sources."@types/prop-types-15.7.12" - sources."@types/react-18.3.3" + sources."@types/prop-types-15.7.13" + sources."@types/react-18.3.8" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -81912,7 +79485,7 @@ in sources."ink-2.7.1" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."js-tokens-4.0.0" @@ -81976,7 +79549,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -82044,12 +79617,12 @@ in sources."cross-spawn-7.0.3" sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" - sources."foreground-child-3.2.1" + sources."foreground-child-3.3.0" sources."glob-11.0.0" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" sources."jackspeak-4.0.1" - sources."lru-cache-11.0.0" + sources."lru-cache-11.0.1" sources."minimatch-10.0.1" sources."minipass-7.1.2" sources."package-json-from-dist-1.0.0" @@ -82067,7 +79640,7 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" @@ -82095,10 +79668,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "4.19.0"; + version = "4.22.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-4.19.0.tgz"; - sha512 = "5r7EYSQIowHsK4eTZ0Y81qpZuJz+MUuYeqmmYmRMl1nwhdmbiYqt5jwzf6u7wyOzJgYqtCRMtVRKOtHANBz7rA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-4.22.2.tgz"; + sha512 = "JWWpTrZmqQGQWt16xvNn6KVIUz16VtZwl984TKw0dfqqRpFwtLJYYk1/4BTgplndMQKWUk/yB4uOShYmMzA2Vg=="; }; dependencies = [ sources."@types/estree-1.0.5" @@ -82120,7 +79693,7 @@ in src = ../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps; dependencies = [ sources."@azure/abort-controller-1.1.0" - (sources."@azure/core-auth-1.7.2" // { + (sources."@azure/core-auth-1.8.0" // { dependencies = [ sources."@azure/abort-controller-2.1.2" ]; @@ -82130,33 +79703,33 @@ in sources."@azure/abort-controller-2.1.2" ]; }) - (sources."@azure/core-rest-pipeline-1.16.2" // { + (sources."@azure/core-rest-pipeline-1.17.0" // { dependencies = [ sources."@azure/abort-controller-2.1.2" ]; }) sources."@azure/core-tracing-1.1.2" - (sources."@azure/core-util-1.9.1" // { + (sources."@azure/core-util-1.10.0" // { dependencies = [ sources."@azure/abort-controller-2.1.2" ]; }) - sources."@azure/identity-4.4.0" - sources."@azure/logger-1.1.3" - sources."@azure/msal-browser-3.20.0" - sources."@azure/msal-common-14.14.0" - sources."@azure/msal-node-2.12.0" + sources."@azure/identity-4.4.1" + sources."@azure/logger-1.1.4" + sources."@azure/msal-browser-3.24.0" + sources."@azure/msal-common-14.15.0" + sources."@azure/msal-node-2.14.0" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.11.0" + sources."@eslint-community/regexpp-4.11.1" (sources."@eslint/eslintrc-2.1.4" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" ]; }) - sources."@eslint/js-8.57.0" - sources."@hpcc-js/wasm-2.18.0" - (sources."@humanwhocodes/config-array-0.11.14" // { + sources."@eslint/js-8.57.1" + sources."@hpcc-js/wasm-2.22.1" + (sources."@humanwhocodes/config-array-0.13.0" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" @@ -82164,16 +79737,6 @@ in }) sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-2.0.3" - (sources."@isaacs/cliui-8.0.2" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - sources."wrap-ansi-8.1.0" - ]; - }) sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -82196,7 +79759,7 @@ in sources."@typescript-eslint/visitor-keys-6.21.0" sources."@ungap/structured-clone-1.2.0" sources."@vscode/test-electron-2.4.1" - (sources."@vscode/vsce-2.31.1" // { + (sources."@vscode/vsce-2.32.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."brace-expansion-1.1.11" @@ -82244,7 +79807,7 @@ in sources."call-bind-1.0.7" sources."callsites-3.1.0" sources."chalk-5.3.0" - sources."cheerio-1.0.0-rc.12" + sources."cheerio-1.0.0" sources."cheerio-select-2.1.0" sources."ci-info-2.0.0" sources."cli-cursor-4.0.0" @@ -82276,7 +79839,7 @@ in sources."d3-force-3.0.0" sources."d3-format-3.1.0" sources."d3-geo-3.1.1" - sources."d3-graphviz-5.4.0" + sources."d3-graphviz-5.6.0" sources."d3-hierarchy-3.1.2" sources."d3-interpolate-3.0.1" sources."d3-path-3.1.0" @@ -82292,7 +79855,7 @@ in sources."d3-timer-3.0.1" sources."d3-transition-3.0.1" sources."d3-zoom-3.0.0" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."deep-is-0.1.4" sources."define-data-property-1.1.4" sources."define-lazy-prop-2.0.0" @@ -82307,12 +79870,13 @@ in sources."eastasianwidth-0.2.0" sources."ecdsa-sig-formatter-1.0.11" sources."emoji-regex-8.0.0" + sources."encoding-sniffer-0.2.0" sources."entities-4.5.0" sources."es-define-property-1.0.0" sources."es-errors-1.3.0" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.57.0" // { + (sources."eslint-8.57.1" // { dependencies = [ sources."brace-expansion-1.1.11" sources."chalk-4.1.2" @@ -82343,20 +79907,16 @@ in sources."find-up-5.0.0" sources."flat-cache-3.2.0" sources."flatted-3.3.1" - sources."follow-redirects-1.15.6" - (sources."foreground-child-3.2.1" // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - }) + sources."follow-redirects-1.15.9" sources."form-data-4.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.2.4" - (sources."glob-11.0.0" // { + (sources."glob-7.2.3" // { dependencies = [ - sources."minimatch-10.0.1" + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" ]; }) sources."glob-parent-5.1.2" @@ -82369,17 +79929,13 @@ in sources."has-proto-1.0.3" sources."has-symbols-1.0.3" sources."hasown-2.0.2" - (sources."hosted-git-info-4.1.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."htmlparser2-8.0.2" + sources."hosted-git-info-4.1.0" + sources."htmlparser2-9.1.0" sources."http-proxy-agent-7.0.2" sources."https-proxy-agent-7.0.5" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."immediate-3.0.6" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" @@ -82398,7 +79954,6 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."jackspeak-4.0.1" sources."js-yaml-4.1.0" sources."json-buffer-3.0.1" sources."json-schema-traverse-0.4.1" @@ -82428,7 +79983,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.once-4.1.1" sources."log-symbols-5.1.0" - sources."lru-cache-11.0.0" + sources."lru-cache-6.0.0" (sources."markdown-it-12.3.2" // { dependencies = [ sources."entities-2.1.0" @@ -82436,14 +79991,13 @@ in }) sources."mdurl-1.0.1" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimatch-5.1.6" - sources."minipass-7.1.2" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."mute-stream-0.0.8" sources."natural-compare-1.4.0" sources."nth-check-2.1.1" @@ -82454,8 +80008,8 @@ in sources."optionator-0.9.4" (sources."ora-7.0.1" // { dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-10.3.0" + sources."ansi-regex-6.1.0" + sources."emoji-regex-10.4.0" sources."string-width-6.1.0" sources."strip-ansi-7.1.0" ]; @@ -82467,7 +80021,6 @@ in }) sources."p-limit-3.1.0" sources."p-locate-5.0.0" - sources."package-json-from-dist-1.0.0" sources."pako-1.0.11" sources."parent-module-1.0.1" (sources."parse-semver-1.1.1" // { @@ -82477,10 +80030,10 @@ in }) sources."parse5-7.1.2" sources."parse5-htmlparser2-tree-adapter-7.0.0" + sources."parse5-parser-stream-7.1.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-scurry-2.0.0" sources."path-type-4.0.0" sources."pend-1.2.0" sources."picomatch-2.3.1" @@ -82488,7 +80041,7 @@ in sources."prettier-3.3.3" sources."process-nextick-args-2.0.1" sources."punycode-2.3.1" - sources."qs-6.12.3" + sources."qs-6.13.0" sources."queue-microtask-1.2.3" sources."read-1.0.7" sources."readable-stream-2.3.8" @@ -82496,13 +80049,7 @@ in sources."resolve-from-4.0.0" sources."restore-cursor-4.0.0" sources."reusify-1.0.4" - (sources."rimraf-3.0.2" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - ]; - }) + sources."rimraf-3.0.2" sources."robust-predicates-3.0.2" sources."run-parallel-1.2.0" sources."rw-1.3.3" @@ -82520,24 +80067,23 @@ in sources."stdin-discarder-0.1.0" sources."stoppable-1.1.0" sources."string-width-4.2.3" - sources."string-width-cjs-4.2.3" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" - sources."strip-ansi-cjs-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" sources."text-table-0.2.0" sources."tmp-0.2.3" sources."to-regex-range-5.0.1" sources."ts-api-utils-1.3.0" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."tunnel-0.0.6" sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.11" - sources."typescript-5.5.4" + sources."typescript-5.6.2" sources."uc.micro-1.0.6" sources."underscore-1.13.7" + sources."undici-6.19.8" sources."uri-js-4.4.1" sources."url-join-4.0.1" sources."util-deprecate-1.0.2" @@ -82546,10 +80092,11 @@ in sources."vscode-languageclient-8.1.0" sources."vscode-languageserver-protocol-3.17.3" sources."vscode-languageserver-types-3.17.3" + sources."whatwg-encoding-3.1.1" + sources."whatwg-mimetype-4.0.0" sources."which-2.0.2" sources."word-wrap-1.2.5" sources."wrap-ansi-7.0.0" - sources."wrap-ansi-cjs-7.0.0" sources."wrappy-1.0.2" sources."xml2js-0.5.0" sources."xmlbuilder-11.0.1" @@ -82571,28 +80118,16 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.77.8"; + version = "1.79.2"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz"; - sha512 = "4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ=="; + url = "https://registry.npmjs.org/sass/-/sass-1.79.2.tgz"; + sha512 = "YmT1aoF1MwHsZEu/eXhbAJNsPGAhNP4UixW9ckEwWCvPcVdVF0/C104OGDVEqtoctKq0N+wM20O/rj+sSPsWeg=="; }; dependencies = [ - sources."anymatch-3.1.3" - sources."binary-extensions-2.3.0" - sources."braces-3.0.3" - sources."chokidar-3.6.0" - sources."fill-range-7.1.1" - sources."glob-parent-5.1.2" + sources."chokidar-4.0.0" sources."immutable-4.3.7" - sources."is-binary-path-2.1.0" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."normalize-path-3.0.0" - sources."picomatch-2.3.1" - sources."readdirp-3.6.0" - sources."source-map-js-1.2.0" - sources."to-regex-range-5.0.1" + sources."readdirp-4.0.1" + sources."source-map-js-1.2.1" ]; buildInputs = globalBuildInputs; meta = { @@ -82641,7 +80176,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-6.2.1" sources."arch-2.2.0" sources."arg-5.0.2" @@ -82765,14 +80300,14 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."base64-arraybuffer-0.1.2" sources."base64id-0.1.0" sources."bcrypt-nodejs-0.0.3" sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.2" - sources."body-parser-1.20.2" + sources."body-parser-1.20.3" sources."bytes-3.1.2" sources."call-bind-1.0.7" sources."callsite-1.0.0" @@ -82789,11 +80324,7 @@ in sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."dashdash-1.14.1" - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) + sources."debug-2.6.9" sources."define-data-property-1.1.4" sources."delayed-stream-1.0.0" sources."depd-2.0.0" @@ -82810,7 +80341,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" (sources."engine.io-1.3.1" // { dependencies = [ sources."debug-0.6.0" @@ -82828,12 +80359,12 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."event-stream-3.3.5" - sources."express-4.19.2" + sources."express-4.21.0" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."finalhandler-1.2.0" + sources."finalhandler-1.3.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.2.0" @@ -82878,7 +80409,7 @@ in sources."lodash-2.4.2" sources."map-stream-0.0.7" sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.52.0" @@ -82886,7 +80417,7 @@ in sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."moment-2.7.0" - sources."ms-2.1.3" + sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nan-0.3.2" sources."negotiator-0.6.3" @@ -82899,13 +80430,13 @@ in sources."parseqs-0.0.2" sources."parseuri-0.0.2" sources."parseurl-1.3.3" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" sources."pause-stream-0.0.11" sources."performance-now-2.1.0" sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."punycode-2.3.1" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."range-parser-1.2.1" sources."raw-body-2.5.2" sources."read-1.0.7" @@ -82917,8 +80448,13 @@ in }) sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."send-0.18.0" - sources."serve-static-1.15.0" + (sources."send-0.19.0" // { + dependencies = [ + sources."encodeurl-1.0.2" + sources."ms-2.1.3" + ]; + }) + sources."serve-static-1.16.2" sources."set-function-length-1.2.2" sources."setprototypeof-1.2.0" sources."side-channel-1.0.6" @@ -83000,7 +80536,7 @@ in sha512 = "tnB+gi6TiFpt3qmCGfaV+78dfKwLiH5HRohkW+PnJYHNAcEdk408uxWG+F/3pu4w1eyCO2NC5CpZKuiyMac5GQ=="; }; dependencies = [ - sources."async-3.2.5" + sources."async-3.2.6" sources."cli-table-0.3.11" sources."colors-1.0.3" sources."commander-11.1.0" @@ -83182,24 +80718,24 @@ in sources."@socket.io/component-emitter-3.1.2" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.17" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.8" sources."cookie-0.4.2" sources."cors-2.8.5" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."engine.io-6.5.5" sources."engine.io-parser-5.2.3" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."negotiator-0.6.3" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."object-assign-4.1.1" sources."socket.io-adapter-2.5.5" sources."socket.io-parser-4.2.4" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."utf-8-validate-6.0.4" sources."vary-1.1.2" sources."ws-8.17.1" @@ -83239,7 +80775,7 @@ in sources."@types/normalize-package-data-2.4.4" sources."agent-base-4.3.0" sources."ansi-escapes-5.0.0" - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-4.3.0" sources."arrify-1.0.1" sources."base64-js-1.5.1" @@ -83281,7 +80817,7 @@ in sources."indent-string-5.0.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-fullwidth-code-point-4.0.0" sources."is-interactive-2.0.0" sources."is-plain-obj-1.1.0" @@ -83315,7 +80851,7 @@ in sources."p-locate-5.0.0" sources."parse-json-5.2.0" sources."path-exists-4.0.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."quick-lru-5.1.1" sources."read-pkg-6.0.0" sources."read-pkg-up-8.0.0" @@ -83335,7 +80871,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" (sources."speedtest-net-1.6.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -83381,10 +80917,10 @@ in sql-formatter = nodeEnv.buildNodePackage { name = "sql-formatter"; packageName = "sql-formatter"; - version = "15.3.2"; + version = "15.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.3.2.tgz"; - sha512 = "pNxSMf5DtwhpZ8gUcOGCGZIWtCcyAUx9oLgAtlO4ag7DvlfnETL0BGqXaISc84pNrXvTWmt8Wal1FWKxdTsL3Q=="; + url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.4.2.tgz"; + sha512 = "Pw4aAgfuyml/SHMlhbJhyOv+GR+Z1HNb9sgX3CVBVdN5YNM+v2VWkYJ3NNbYS7cu37GY3vP/PgnwoVynCuXRxg=="; }; dependencies = [ sources."argparse-2.0.1" @@ -83428,229 +80964,52 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "3.8.4"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.8.4.tgz"; - sha512 = "61aHMkdinWyH8BkkTX9jPLYxYzaAAz/FK/VQqdr2FiCQQ/q04WCwDlpGbHff1GdrMYTmW8chlTFvRWL9k0A8vg=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-4.0.2.tgz"; + sha512 = "w2yqcG9ELJe2RJCnAvB7v0OgkHhL3czzz/tVoxGFfO6y4mOrF6QHCDhXijeXzsU7LVKEwWS3Qd9tza4JBuDxqA=="; }; dependencies = [ sources."@ampproject/remapping-2.3.0" - sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.9" - (sources."@babel/core-7.24.9" // { - dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" - sources."semver-6.3.1" - ]; - }) - sources."@babel/generator-7.24.10" - (sources."@babel/helper-compilation-targets-7.24.8" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/helper-environment-visitor-7.24.7" - sources."@babel/helper-function-name-7.24.7" - sources."@babel/helper-hoist-variables-7.24.7" - sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.9" - sources."@babel/helper-simple-access-7.24.7" - sources."@babel/helper-split-export-declaration-7.24.7" - sources."@babel/helper-string-parser-7.24.8" - sources."@babel/helper-validator-identifier-7.24.7" - sources."@babel/helper-validator-option-7.24.8" - sources."@babel/helpers-7.24.8" - sources."@babel/highlight-7.24.7" - sources."@babel/parser-7.24.8" - sources."@babel/template-7.24.7" - (sources."@babel/traverse-7.24.8" // { - dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" - ]; - }) - sources."@babel/types-7.24.9" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" - sources."@types/estree-1.0.5" - sources."@types/pug-2.0.10" - sources."acorn-7.4.1" - (sources."acorn-typescript-1.4.13" // { - dependencies = [ - sources."acorn-8.12.1" - ]; - }) - sources."ansi-styles-3.2.1" + sources."@types/estree-1.0.6" + sources."acorn-8.12.1" + sources."acorn-typescript-1.4.13" sources."anymatch-3.1.3" - sources."aria-query-5.3.0" - sources."asap-2.0.6" - sources."assert-never-1.3.0" - sources."atob-2.1.2" + sources."aria-query-5.3.1" sources."axobject-query-4.1.0" - sources."babel-walk-3.0.0-canary-5" - sources."balanced-match-1.0.2" sources."binary-extensions-2.3.0" - sources."brace-expansion-1.1.11" sources."braces-3.0.3" - sources."browserslist-4.23.2" - sources."buffer-crc32-1.0.0" - sources."call-bind-1.0.7" - sources."caniuse-lite-1.0.30001643" - sources."chalk-2.4.2" - sources."character-parser-2.2.0" sources."chokidar-3.6.0" - sources."coffeescript-2.7.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."concat-map-0.0.1" - sources."constantinople-4.0.1" - sources."convert-source-map-2.0.0" - sources."copy-anything-2.0.6" - sources."css-3.0.0" - sources."debug-3.1.0" - sources."decode-uri-component-0.2.2" - sources."define-data-property-1.1.4" - sources."dequal-2.0.3" - sources."detect-indent-6.1.0" - sources."doctypes-1.1.0" - sources."electron-to-chromium-1.5.1" - sources."errno-0.1.8" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."es6-promise-3.3.1" - sources."esbuild-0.21.5" - sources."escalade-3.1.2" - sources."escape-string-regexp-1.0.5" sources."esm-env-1.0.0" sources."esrap-1.2.2" + (sources."fdir-6.3.0" // { + dependencies = [ + sources."picomatch-4.0.2" + ]; + }) sources."fill-range-7.1.1" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.4" - sources."get-tsconfig-4.7.6" - sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-11.12.0" - sources."gopd-1.0.1" - sources."graceful-fs-4.2.11" - sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.2" - sources."hasown-2.0.2" - sources."iconv-lite-0.6.3" - sources."image-size-0.5.5" - sources."immutable-4.3.7" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.15.0" - sources."is-expression-4.0.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."is-promise-2.2.2" sources."is-reference-3.0.2" - sources."is-regex-1.1.4" - sources."is-what-3.14.1" - sources."jiti-1.21.6" - sources."js-stringify-1.0.2" - sources."js-tokens-4.0.0" - sources."jsesc-2.5.2" - sources."json5-2.2.3" - sources."jstransformer-1.0.0" - sources."less-4.2.0" - sources."lilconfig-3.1.2" sources."locate-character-3.0.0" - sources."lru-cache-5.1.1" - sources."magic-string-0.30.10" - sources."make-dir-2.1.0" - sources."mime-1.6.0" - sources."min-indent-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" + sources."magic-string-0.30.11" sources."mri-1.2.0" - sources."ms-2.0.0" - sources."nanoid-3.3.7" - sources."needle-3.3.1" - sources."node-releases-2.0.18" sources."normalize-path-3.0.0" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."parse-node-version-1.0.1" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" - sources."pify-4.0.1" - sources."postcss-8.4.40" - sources."postcss-load-config-5.1.0" - sources."promise-7.3.1" - sources."prr-1.0.1" - sources."pug-3.0.3" - sources."pug-attrs-3.0.0" - sources."pug-code-gen-3.0.3" - sources."pug-error-2.1.0" - sources."pug-filters-4.0.0" - sources."pug-lexer-5.0.1" - sources."pug-linker-4.0.0" - sources."pug-load-3.0.0" - sources."pug-parser-6.0.0" - sources."pug-runtime-3.0.1" - sources."pug-strip-comments-2.0.0" - sources."pug-walk-2.0.0" sources."readdirp-3.6.0" - sources."resolve-1.22.8" - sources."resolve-pkg-maps-1.0.0" - sources."rimraf-2.7.1" sources."sade-1.8.1" - sources."safer-buffer-2.1.2" - sources."sander-0.5.1" - sources."sass-1.77.8" - sources."sax-1.4.1" - sources."semver-5.7.2" - sources."set-function-length-1.2.2" - sources."sorcery-0.11.1" - sources."source-map-0.6.1" - sources."source-map-js-1.2.0" - sources."source-map-resolve-0.6.0" - sources."strip-indent-3.0.0" - (sources."stylus-0.55.0" // { - dependencies = [ - sources."mkdirp-1.0.4" - sources."sax-1.2.4" - sources."semver-6.3.1" - sources."source-map-0.7.4" - ]; - }) - sources."sugarss-4.0.1" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - (sources."svelte-5.0.0-next.198" // { - dependencies = [ - sources."acorn-8.12.1" - ]; - }) - sources."svelte-preprocess-5.1.4" - sources."to-fast-properties-2.0.0" + sources."svelte-5.0.0-next.257" sources."to-regex-range-5.0.1" - sources."token-stream-1.0.0" - sources."tslib-2.6.3" - sources."tsx-4.16.2" - sources."typescript-5.5.4" - sources."update-browserslist-db-1.1.0" - sources."void-elements-3.1.0" - sources."with-7.0.2" - sources."wrappy-1.0.2" - sources."yallist-3.1.1" - sources."yaml-2.5.0" + sources."typescript-5.6.2" sources."zimmerframe-1.1.2" ]; buildInputs = globalBuildInputs; @@ -83694,8 +81053,8 @@ in sources."entities-4.5.0" sources."mdn-data-2.0.28" sources."nth-check-2.1.1" - sources."picocolors-1.0.1" - sources."source-map-js-1.2.0" + sources."picocolors-1.1.0" + sources."source-map-js-1.2.1" ]; buildInputs = globalBuildInputs; meta = { @@ -83710,39 +81069,39 @@ in tailwindcss = nodeEnv.buildNodePackage { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.4.6"; + version = "3.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.6.tgz"; - sha512 = "1uRHzPB+Vzu57ocybfZ4jh5Q3SdlH7XW23J5sQoM9LhE9eIOlzxer/3XPSsycvih3rboRsvt0QCmzSrqyOYUIA=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.12.tgz"; + sha512 = "Htf/gHj2+soPb9UayUNci/Ja3d8pTmu9ONTfh4QY8r3MATTZOzmv6UYWF7ZwikEIC8okpfqmGqrmDehua8mF8w=="; }; dependencies = [ sources."@alloc/quick-lru-5.2.0" - (sources."@cspotcode/source-map-support-0.8.1" // { + sources."@cspotcode/source-map-support-0.8.1" + sources."@isaacs/cliui-8.0.2" + (sources."@jridgewell/gen-mapping-0.3.5" // { dependencies = [ - sources."@jridgewell/trace-mapping-0.3.9" + sources."@jridgewell/trace-mapping-0.3.25" ]; }) - sources."@isaacs/cliui-8.0.2" - sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.25" + sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.7.1" + sources."@swc/core-1.7.26" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.12" + sources."@swc/helpers-0.5.13" sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.1" + sources."@swc/wasm-1.7.26" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."acorn-8.12.1" - sources."acorn-walk-8.3.3" + sources."acorn-walk-8.3.4" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" sources."any-promise-1.3.0" @@ -83776,13 +81135,13 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.2.1" + sources."foreground-child-3.3.0" sources."function-bind-1.1.2" sources."glob-10.4.5" sources."glob-parent-6.0.2" sources."hasown-2.0.2" sources."is-binary-path-2.1.0" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -83795,7 +81154,7 @@ in sources."lru-cache-10.4.3" sources."make-error-1.3.6" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."minimatch-9.0.5" sources."minipass-7.1.2" sources."mz-2.7.0" @@ -83807,11 +81166,11 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-scurry-1.11.1" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.40" + sources."postcss-8.4.47" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { @@ -83820,7 +81179,7 @@ in ]; }) sources."postcss-nested-6.2.0" - sources."postcss-selector-parser-6.1.1" + sources."postcss-selector-parser-6.1.2" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" @@ -83831,7 +81190,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" - sources."source-map-js-1.2.0" + sources."source-map-js-1.2.1" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -83841,7 +81200,7 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" @@ -83856,9 +81215,9 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.3" - sources."typescript-5.5.4" - sources."undici-types-5.26.5" + sources."tslib-2.7.0" + sources."typescript-5.6.2" + sources."undici-types-6.19.8" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."which-2.0.2" @@ -83871,7 +81230,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.5.0" + sources."yaml-2.5.1" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -83952,14 +81311,13 @@ in sources."@types/cors-2.8.17" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/responselike-1.0.3" sources."abstract-logging-2.0.1" sources."accepts-1.3.8" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" ]; }) sources."ansi-styles-4.3.0" @@ -83993,7 +81351,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.37.1" + sources."core-js-3.38.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-5.1.0" @@ -84023,8 +81381,7 @@ in sources."end-of-stream-1.4.4" (sources."engine.io-6.4.2" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" ]; }) sources."engine.io-parser-5.0.7" @@ -84064,8 +81421,7 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.1" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" ]; }) sources."iconv-lite-0.4.24" @@ -84110,7 +81466,7 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."node-forge-1.3.0" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."normalize-url-6.1.0" sources."nth-check-2.1.1" sources."object-assign-4.1.1" @@ -84129,7 +81485,7 @@ in sources."possible-typed-array-names-1.0.0" sources."precond-0.2.3" sources."proxy-addr-2.0.7" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."qs-6.9.7" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -84154,21 +81510,18 @@ in sources."smart-buffer-4.2.0" (sources."socket.io-4.6.1" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" ]; }) (sources."socket.io-adapter-2.5.5" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" sources."ws-8.17.1" ]; }) (sources."socket.io-parser-4.2.4" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" ]; }) sources."socks-2.8.3" @@ -84189,7 +81542,7 @@ in sources."type-is-1.6.18" sources."ua-parser-js-1.0.33" sources."uc.micro-1.0.6" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."unpipe-1.0.0" sources."urlsafe-base64-1.0.0" sources."utf-8-validate-5.0.10" @@ -84262,7 +81615,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."axios-0.19.2" sources."backo2-1.0.2" sources."backoff-2.5.0" @@ -84319,7 +81672,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.37.1" + sources."core-js-3.38.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -84498,7 +81851,7 @@ in ]; }) sources."negotiator-0.6.3" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.2" @@ -84537,9 +81890,9 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" - sources."qs-6.12.3" + sources."qs-6.13.0" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ @@ -84921,7 +82274,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -84933,8 +82286,8 @@ in sources."after-0.8.2" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."ajv-6.12.6" @@ -84957,7 +82310,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."backo2-1.0.2" sources."backoff-2.5.0" sources."balanced-match-1.0.2" @@ -85007,7 +82360,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.37.1" + sources."core-js-3.38.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -85104,8 +82457,8 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.1" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."iconv-lite-0.4.24" @@ -85182,7 +82535,7 @@ in sources."tar-2.2.2" ]; }) - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.2" @@ -85244,7 +82597,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" sources."qs-6.7.0" sources."quick-lru-5.1.1" @@ -85340,7 +82693,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."ua-parser-js-0.7.21" sources."uc.micro-1.0.6" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" @@ -85392,7 +82745,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -85404,8 +82757,8 @@ in sources."after-0.8.2" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."ajv-6.12.6" @@ -85428,7 +82781,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" + sources."aws4-1.13.2" sources."backo2-1.0.2" sources."backoff-2.5.0" sources."balanced-match-1.0.2" @@ -85478,7 +82831,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.37.1" + sources."core-js-3.38.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -85575,8 +82928,8 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.1" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."iconv-lite-0.4.24" @@ -85653,7 +83006,7 @@ in sources."tar-2.2.2" ]; }) - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.2" @@ -85715,7 +83068,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" sources."qs-6.7.0" sources."quick-lru-5.1.1" @@ -85811,7 +83164,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."ua-parser-js-0.7.21" sources."uc.micro-1.0.6" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" @@ -86298,7 +83651,7 @@ in sources."supports-color-2.0.0" sources."temp-0.8.4" sources."tslib-1.14.1" - sources."typescript-5.5.4" + sources."typescript-5.6.2" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" ]; @@ -86325,25 +83678,25 @@ in sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.7.1" + sources."@swc/core-1.7.26" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.12" + sources."@swc/helpers-0.5.13" sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.1" + sources."@swc/wasm-1.7.26" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."acorn-8.12.1" - sources."acorn-walk-8.3.3" + sources."acorn-walk-8.3.4" sources."arg-4.1.3" sources."create-require-1.1.1" sources."diff-4.0.2" sources."make-error-1.3.6" - sources."tslib-2.6.3" - sources."typescript-5.5.4" - sources."undici-types-5.26.5" + sources."tslib-2.7.0" + sources."typescript-5.6.2" + sources."undici-types-6.19.8" sources."v8-compile-cache-lib-3.0.1" sources."yn-3.1.1" ]; @@ -86392,28 +83745,18 @@ in sources."@babel/highlight-7.24.7" sources."@isaacs/cliui-8.0.2" sources."@npmcli/config-8.3.4" - (sources."@npmcli/git-5.0.8" // { - dependencies = [ - sources."isexe-3.1.1" - sources."which-4.0.0" - ]; - }) + sources."@npmcli/git-5.0.8" sources."@npmcli/map-workspaces-3.0.6" sources."@npmcli/name-from-folder-2.0.0" - sources."@npmcli/package-json-5.2.0" - (sources."@npmcli/promise-spawn-7.0.2" // { - dependencies = [ - sources."isexe-3.1.1" - sources."which-4.0.0" - ]; - }) + sources."@npmcli/package-json-5.2.1" + sources."@npmcli/promise-spawn-7.0.2" sources."@types/concat-stream-2.0.3" sources."@types/debug-4.1.12" sources."@types/is-empty-1.2.3" sources."@types/ms-0.7.34" - sources."@types/node-20.14.12" + sources."@types/node-20.16.5" sources."@types/supports-color-8.1.3" - sources."@types/unist-3.0.2" + sources."@types/unist-3.0.3" sources."abbrev-2.0.0" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" @@ -86431,8 +83774,13 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-stream-2.0.0" - sources."cross-spawn-7.0.3" - sources."debug-4.3.5" + (sources."cross-spawn-7.0.3" // { + dependencies = [ + sources."isexe-2.0.0" + sources."which-2.0.2" + ]; + }) + sources."debug-4.3.7" sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" sources."err-code-2.0.3" @@ -86440,11 +83788,11 @@ in sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."find-up-6.3.0" - sources."foreground-child-3.2.1" + sources."foreground-child-3.3.0" sources."glob-10.4.5" sources."has-flag-3.0.0" sources."hosted-git-info-7.0.2" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."import-meta-resolve-4.1.0" sources."inherits-2.0.4" sources."ini-4.1.3" @@ -86452,7 +83800,7 @@ in sources."is-empty-1.2.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-4.1.0" - sources."isexe-2.0.0" + sources."isexe-3.1.1" sources."jackspeak-3.4.3" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-3.0.2" @@ -86462,7 +83810,7 @@ in sources."lru-cache-10.4.3" sources."minimatch-9.0.5" sources."minipass-7.1.2" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."nopt-7.2.1" sources."normalize-package-data-6.0.2" sources."npm-install-checks-6.3.0" @@ -86476,7 +83824,7 @@ in sources."path-exists-5.0.0" sources."path-key-3.1.1" sources."path-scurry-1.11.1" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."proc-log-4.2.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" @@ -86491,7 +83839,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" + sources."spdx-license-ids-3.0.20" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -86502,7 +83850,7 @@ in sources."string_decoder-1.3.0" (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" @@ -86510,7 +83858,7 @@ in sources."trough-2.2.0" sources."type-fest-3.13.1" sources."typedarray-0.0.6" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."unified-engine-11.2.1" sources."unist-util-inspect-8.1.0" sources."unist-util-lsp-2.1.0" @@ -86518,11 +83866,11 @@ in sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-5.0.1" - sources."vfile-6.0.2" + sources."vfile-6.0.3" sources."vfile-message-4.0.2" (sources."vfile-reporter-8.1.1" // { dependencies = [ - sources."emoji-regex-10.3.0" + sources."emoji-regex-10.4.0" sources."string-width-6.1.0" sources."supports-color-9.4.0" ]; @@ -86532,10 +83880,10 @@ in sources."vscode-jsonrpc-8.2.0" sources."vscode-languageserver-9.0.1" sources."vscode-languageserver-protocol-3.17.5" - sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-textdocument-1.0.12" sources."vscode-languageserver-types-3.17.5" sources."walk-up-path-3.0.1" - sources."which-2.0.2" + sources."which-4.0.0" sources."wrap-ansi-8.1.0" (sources."wrap-ansi-cjs-7.0.0" // { dependencies = [ @@ -86545,7 +83893,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.5.0" + sources."yaml-2.5.1" sources."yocto-queue-1.1.1" ]; buildInputs = globalBuildInputs; @@ -86568,7 +83916,7 @@ in }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.11" - sources."@types/estree-1.0.5" + sources."@types/estree-1.0.6" sources."@types/geojson-7946.0.4" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -86606,14 +83954,14 @@ in sources."d3-time-3.1.0" sources."d3-time-format-4.1.0" sources."d3-timer-3.0.1" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."decompress-response-4.2.1" sources."delaunator-5.0.1" sources."delegates-1.0.0" sources."detect-libc-2.0.3" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" - sources."escalade-3.1.2" + sources."escalade-3.2.0" (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" @@ -86644,7 +83992,7 @@ in ]; }) sources."mkdirp-1.0.4" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."nan-2.20.0" sources."node-fetch-2.7.0" sources."nopt-5.0.0" @@ -86728,13 +84076,13 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "5.19.0"; + version = "5.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.19.0.tgz"; - sha512 = "DtSArHnomfYdKnkz7rDCLkXpuh4O6kHVU1YSDoMtQR0ewEwqelb5YY85mvJPCJRT9E7UG84RGdxjDbuwowtHRg=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.21.0.tgz"; + sha512 = "hNxM9nuMqpI1vkUOhEx6ewEf23WWLmJxSFJ4TA86AW43ixJyqcLV+iSCO0NipuVTE0rlDcc2e8joSewWyOlEwA=="; }; dependencies = [ - sources."@types/estree-1.0.5" + sources."@types/estree-1.0.6" sources."@types/geojson-7946.0.4" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -86764,7 +84112,7 @@ in sources."delaunator-5.0.1" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."get-caller-file-2.0.5" sources."iconv-lite-0.6.3" sources."internmap-2.0.3" @@ -86834,10 +84182,10 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "35.2.0"; + version = "37.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-35.2.0.tgz"; - sha512 = "ZEdRDfw3kIhcryMOZvVMrFSSS5fkK2qpYr1QNOswW3sHtowuQglpVcvvyqNHrNLAbtETiO/svjNnFKEF22/fhg=="; + url = "https://registry.npmjs.org/vercel/-/vercel-37.5.2.tgz"; + sha512 = "DabMENHmWttPrwNqiKFBricMTQTt/Ec9RnRBwLMuXtIMl7MPKEiGFhhKH0v9smcp1vGoayYGT/H17AH294O4ig=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -86873,11 +84221,11 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@rollup/pluginutils-4.2.1" sources."@sinclair/typebox-0.25.24" - sources."@swc/core-1.7.1" + sources."@swc/core-1.7.26" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.12" + sources."@swc/helpers-0.5.13" sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.1" + sources."@swc/wasm-1.7.26" sources."@tootallnate/once-2.0.0" (sources."@ts-morph/common-0.11.1" // { dependencies = [ @@ -86890,35 +84238,35 @@ in sources."@tsconfig/node16-1.0.4" sources."@types/json-schema-7.0.15" sources."@types/node-16.18.11" - sources."@vercel/build-utils-8.3.5" + sources."@vercel/build-utils-8.4.2" sources."@vercel/error-utils-2.0.2" sources."@vercel/fun-1.1.0" sources."@vercel/gatsby-plugin-vercel-analytics-1.0.11" - (sources."@vercel/gatsby-plugin-vercel-builder-2.0.39" // { + (sources."@vercel/gatsby-plugin-vercel-builder-2.0.46" // { dependencies = [ sources."fs-extra-11.1.0" sources."jsonfile-6.1.0" sources."universalify-2.0.1" ]; }) - sources."@vercel/go-3.1.1" - sources."@vercel/hydrogen-1.0.4" - sources."@vercel/next-4.3.6" + sources."@vercel/go-3.1.3" + sources."@vercel/hydrogen-1.0.6" + sources."@vercel/next-4.3.10" sources."@vercel/nft-0.27.3" - (sources."@vercel/node-3.2.7" // { + (sources."@vercel/node-3.2.14" // { dependencies = [ sources."async-listen-3.0.0" sources."node-fetch-2.6.9" sources."path-to-regexp-6.2.1" ]; }) - sources."@vercel/python-4.3.0" - (sources."@vercel/redwood-2.1.3" // { + sources."@vercel/python-4.3.1" + (sources."@vercel/redwood-2.1.5" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@vercel/remix-builder-2.2.1" + sources."@vercel/remix-builder-2.2.9" (sources."@vercel/routing-utils-3.1.0" // { dependencies = [ sources."ajv-6.12.6" @@ -86927,12 +84275,12 @@ in ]; }) sources."@vercel/ruby-2.1.0" - sources."@vercel/static-build-2.5.17" + sources."@vercel/static-build-2.5.24" sources."@vercel/static-config-3.0.0" sources."abbrev-1.1.1" sources."acorn-8.12.1" sources."acorn-import-attributes-1.9.5" - sources."acorn-walk-8.3.3" + sources."acorn-walk-8.3.4" sources."agent-base-6.0.2" sources."ajv-8.6.3" sources."ansi-regex-5.0.1" @@ -87050,7 +84398,7 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micro-9.3.5-canary.3" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" sources."minimist-1.2.8" @@ -87064,7 +84412,7 @@ in sources."mri-1.2.0" sources."ms-2.1.1" sources."node-fetch-2.6.7" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" @@ -87084,13 +84432,13 @@ in sources."inherits-2.0.1" ]; }) - sources."path-to-regexp-1.8.0" + sources."path-to-regexp-1.9.0" sources."pend-1.2.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pretty-ms-7.0.1" sources."promisepipe-3.0.0" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."raw-body-2.4.1" @@ -87135,7 +84483,7 @@ in sources."ts-morph-12.0.0" sources."ts-node-10.9.1" sources."ts-toolbelt-6.15.5" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."typescript-4.9.5" sources."uid-promise-1.0.0" sources."undici-5.28.4" @@ -87192,10 +84540,10 @@ in ]; }) sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.11.0" + sources."@eslint-community/regexpp-4.11.1" sources."@eslint/eslintrc-2.1.4" - sources."@eslint/js-8.57.0" - sources."@humanwhocodes/config-array-0.11.14" + sources."@eslint/js-8.57.1" + sources."@humanwhocodes/config-array-0.13.0" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-2.0.3" sources."@nodelib/fs.scandir-2.1.5" @@ -87222,7 +84570,7 @@ in sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."cssesc-3.0.0" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."deep-is-0.1.4" sources."define-data-property-1.1.4" sources."diff-4.0.2" @@ -87230,8 +84578,8 @@ in sources."es-define-property-1.0.0" sources."es-errors-1.3.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.57.0" - sources."eslint-plugin-vue-9.27.0" + sources."eslint-8.57.1" + sources."eslint-plugin-vue-9.28.0" sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" sources."espree-9.6.1" @@ -87262,12 +84610,12 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.2" sources."hasown-2.0.2" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" (sources."is-expression-4.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -87291,7 +84639,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."mkdirp-0.5.6" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."natural-compare-1.4.0" sources."nth-check-2.1.1" sources."object-assign-4.1.1" @@ -87304,8 +84652,8 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-parse-1.0.7" - sources."picocolors-1.0.1" - sources."postcss-selector-parser-6.1.1" + sources."picocolors-1.1.0" + sources."postcss-selector-parser-6.1.2" sources."prelude-ls-1.2.1" sources."prettier-2.8.8" sources."pug-error-2.1.0" @@ -87395,7 +84743,7 @@ in sources."vscode-languageserver-types-3.16.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-textdocument-1.0.12" sources."vscode-languageserver-types-3.17.5" sources."vscode-nls-4.1.2" sources."vscode-uri-3.0.8" @@ -87418,7 +84766,7 @@ in sha512 = "KX07T/WHnXfmoo2wvjLlx0eKeGIotB0C5GnfWVHylPfSa7BuNo0bktRCL2+zJ3g72IKc1psuRIGZIn7/soexag=="; }; dependencies = [ - (sources."@babel/runtime-7.24.8" // { + (sources."@babel/runtime-7.25.6" // { dependencies = [ sources."regenerator-runtime-0.14.1" ]; @@ -87473,11 +84821,11 @@ in sources."color-name-1.1.4" sources."dom-walk-0.1.2" sources."emoji-regex-8.0.0" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."estraverse-5.3.0" sources."exif-parser-0.1.12" sources."file-type-16.5.4" - sources."follow-redirects-1.15.6" + sources."follow-redirects-1.15.9" sources."fs-extra-11.2.0" sources."get-caller-file-2.0.5" sources."gifwrap-0.9.4" @@ -87556,10 +84904,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.93.0"; + version = "5.94.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz"; - sha512 = "Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz"; + sha512 = "KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.5" @@ -87568,11 +84916,9 @@ in sources."@jridgewell/source-map-0.3.6" sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" - sources."@types/eslint-9.6.0" - sources."@types/eslint-scope-3.7.7" - sources."@types/estree-1.0.5" + sources."@types/estree-1.0.6" sources."@types/json-schema-7.0.15" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@webassemblyjs/ast-1.12.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -87594,15 +84940,15 @@ in sources."acorn-import-attributes-1.9.5" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.23.2" + sources."browserslist-4.23.3" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001643" + sources."caniuse-lite-1.0.30001662" sources."chrome-trace-event-1.0.4" sources."commander-2.20.3" - sources."electron-to-chromium-1.5.1" + sources."electron-to-chromium-1.5.26" sources."enhanced-resolve-5.17.1" sources."es-module-lexer-1.5.4" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { dependencies = [ @@ -87625,7 +84971,7 @@ in sources."mime-types-2.1.35" sources."neo-async-2.6.2" sources."node-releases-2.0.18" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."punycode-2.3.1" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" @@ -87635,13 +84981,13 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.31.3" + sources."terser-5.33.0" sources."terser-webpack-plugin-5.3.10" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."update-browserslist-db-1.1.0" sources."uri-js-4.4.1" - sources."watchpack-2.4.1" - sources."webpack-5.93.0" + sources."watchpack-2.4.2" + sources."webpack-5.94.0" sources."webpack-sources-3.2.3" ]; buildInputs = globalBuildInputs; @@ -87670,11 +85016,9 @@ in sources."@jridgewell/source-map-0.3.6" sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" - sources."@types/eslint-9.6.0" - sources."@types/eslint-scope-3.7.7" - sources."@types/estree-1.0.5" + sources."@types/estree-1.0.6" sources."@types/json-schema-7.0.15" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@webassemblyjs/ast-1.12.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -87699,19 +85043,19 @@ in sources."acorn-import-attributes-1.9.5" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.23.2" + sources."browserslist-4.23.3" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001643" + sources."caniuse-lite-1.0.30001662" sources."chrome-trace-event-1.0.4" sources."clone-deep-4.0.1" sources."colorette-2.0.20" sources."commander-10.0.1" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.5.1" + sources."electron-to-chromium-1.5.26" sources."enhanced-resolve-5.17.1" - sources."envinfo-7.13.0" + sources."envinfo-7.14.0" sources."es-module-lexer-1.5.4" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { dependencies = [ @@ -87732,7 +85076,7 @@ in sources."hasown-2.0.2" sources."import-local-3.2.0" sources."interpret-3.1.1" - sources."is-core-module-2.15.0" + sources."is-core-module-2.15.1" sources."is-plain-object-2.0.4" sources."isexe-2.0.0" sources."isobject-3.0.1" @@ -87753,7 +85097,7 @@ in sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.7" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."pkg-dir-4.2.0" sources."punycode-2.3.1" sources."randombytes-2.1.0" @@ -87772,17 +85116,17 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.31.3" // { + (sources."terser-5.33.0" // { dependencies = [ sources."commander-2.20.3" ]; }) sources."terser-webpack-plugin-5.3.10" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."update-browserslist-db-1.1.0" sources."uri-js-4.4.1" - sources."watchpack-2.4.1" - sources."webpack-5.93.0" + sources."watchpack-2.4.2" + sources."webpack-5.94.0" sources."webpack-cli-5.1.4" sources."webpack-merge-5.10.0" sources."webpack-sources-3.2.3" @@ -87802,13 +85146,12 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "5.0.4"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz"; - sha512 = "dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.1.0.tgz"; + sha512 = "aQpaN81X6tXie1FoOB7xlMfCsN19pSvRAeYUHOdFWOlhpQ/LlbfTqYwwmEDFV0h8GGuqmCmKmT+pxcUV/Nt2gQ=="; }; dependencies = [ - sources."@isaacs/cliui-8.0.2" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" @@ -87816,32 +85159,30 @@ in sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@jsonjoy.com/base64-1.1.2" - sources."@jsonjoy.com/json-pack-1.0.4" - sources."@jsonjoy.com/util-1.2.0" + sources."@jsonjoy.com/json-pack-1.1.0" + sources."@jsonjoy.com/util-1.3.0" sources."@leichtgewicht/ip-codec-2.0.5" sources."@types/body-parser-1.19.5" sources."@types/bonjour-3.5.13" sources."@types/connect-3.4.38" sources."@types/connect-history-api-fallback-1.5.4" - sources."@types/eslint-9.6.0" - sources."@types/eslint-scope-3.7.7" - sources."@types/estree-1.0.5" + sources."@types/estree-1.0.6" sources."@types/express-4.17.21" sources."@types/express-serve-static-core-4.19.5" sources."@types/http-errors-2.0.4" - sources."@types/http-proxy-1.17.14" + sources."@types/http-proxy-1.17.15" sources."@types/json-schema-7.0.15" sources."@types/mime-1.3.5" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@types/node-forge-1.3.11" - sources."@types/qs-6.9.15" + sources."@types/qs-6.9.16" sources."@types/range-parser-1.2.7" sources."@types/retry-0.12.2" sources."@types/send-0.17.4" sources."@types/serve-index-1.9.4" sources."@types/serve-static-1.15.7" sources."@types/sockjs-0.3.36" - sources."@types/ws-8.5.11" + sources."@types/ws-8.5.12" sources."@webassemblyjs/ast-1.12.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -87866,43 +85207,30 @@ in sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."ansi-html-community-0.0.8" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" sources."anymatch-3.1.3" sources."array-flatten-1.1.1" - sources."balanced-match-1.0.2" sources."batch-0.6.1" sources."binary-extensions-2.3.0" - (sources."body-parser-1.20.2" // { + (sources."body-parser-1.20.3" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."bytes-3.1.2" ]; }) sources."bonjour-service-1.2.1" - sources."brace-expansion-2.0.1" sources."braces-3.0.3" - sources."browserslist-4.23.2" + sources."browserslist-4.23.3" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."bundle-name-4.1.0" - sources."bytes-3.1.2" + sources."bytes-3.0.0" sources."call-bind-1.0.7" - sources."caniuse-lite-1.0.30001643" + sources."caniuse-lite-1.0.30001662" sources."chokidar-3.6.0" sources."chrome-trace-event-1.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."colorette-2.0.20" sources."commander-2.20.3" sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."bytes-3.0.0" - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) + sources."compression-1.7.4" sources."connect-history-api-fallback-2.0.0" (sources."content-disposition-0.5.4" // { dependencies = [ @@ -87913,27 +85241,23 @@ in sources."cookie-0.6.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" - sources."cross-spawn-7.0.3" - sources."debug-4.3.5" + sources."debug-2.6.9" sources."default-browser-5.2.1" sources."default-browser-id-5.0.0" - sources."default-gateway-6.0.3" sources."define-data-property-1.1.4" sources."define-lazy-prop-3.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" sources."detect-node-2.1.0" sources."dns-packet-5.6.1" - sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.5.1" - sources."emoji-regex-9.2.2" - sources."encodeurl-1.0.2" + sources."electron-to-chromium-1.5.26" + sources."encodeurl-2.0.0" sources."enhanced-resolve-5.17.1" sources."es-define-property-1.0.0" sources."es-errors-1.3.0" sources."es-module-lexer-1.5.4" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-html-1.0.3" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -87945,15 +85269,8 @@ in sources."etag-1.8.1" sources."eventemitter3-4.0.7" sources."events-3.3.0" - (sources."execa-5.1.1" // { + (sources."express-4.21.0" // { dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - (sources."express-4.19.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" sources."safe-buffer-5.2.1" ]; }) @@ -87962,20 +85279,12 @@ in sources."fast-uri-3.0.1" sources."faye-websocket-0.11.4" sources."fill-range-7.1.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."follow-redirects-1.15.6" - sources."foreground-child-3.2.1" + sources."finalhandler-1.3.1" + sources."follow-redirects-1.15.9" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."function-bind-1.1.2" sources."get-intrinsic-1.2.4" - sources."get-stream-6.0.1" - sources."glob-10.4.5" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."gopd-1.0.1" @@ -87997,7 +85306,6 @@ in sources."http-parser-js-0.5.8" sources."http-proxy-1.18.1" sources."http-proxy-middleware-2.0.6" - sources."human-signals-2.1.0" sources."hyperdyperid-1.2.0" sources."iconv-lite-0.4.24" sources."inherits-2.0.4" @@ -88005,58 +85313,45 @@ in sources."is-binary-path-2.1.0" sources."is-docker-3.0.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-inside-container-1.0.0" sources."is-network-error-1.1.0" sources."is-number-7.0.0" sources."is-plain-obj-3.0.0" - sources."is-stream-2.0.1" sources."is-wsl-3.1.0" sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."jackspeak-3.4.3" sources."jest-worker-27.5.1" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" - sources."launch-editor-2.8.0" + sources."launch-editor-2.9.1" sources."loader-runner-4.3.0" - sources."lru-cache-10.4.3" sources."media-typer-0.3.0" - sources."memfs-4.9.4" - sources."merge-descriptors-1.0.1" + sources."memfs-4.12.0" + sources."merge-descriptors-1.0.3" sources."merge-stream-2.0.0" sources."methods-1.1.2" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" - sources."minimatch-9.0.5" - sources."minipass-7.1.2" - sources."ms-2.1.2" + sources."ms-2.0.0" sources."multicast-dns-7.2.5" sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."node-forge-1.3.1" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."node-releases-2.0.18" sources."normalize-path-3.0.0" - sources."npm-run-path-4.0.1" sources."object-inspect-1.13.2" sources."obuf-1.1.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" - sources."onetime-5.1.2" sources."open-10.1.0" sources."p-retry-6.2.0" - sources."package-json-from-dist-1.0.0" sources."parseurl-1.3.3" - sources."path-key-3.1.1" - sources."path-scurry-1.11.1" - sources."path-to-regexp-0.1.7" - sources."picocolors-1.0.1" + sources."path-to-regexp-0.1.10" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."process-nextick-args-2.0.1" (sources."proxy-addr-2.0.7" // { @@ -88065,76 +85360,66 @@ in ]; }) sources."punycode-2.3.1" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.2" + (sources."raw-body-2.5.2" // { + dependencies = [ + sources."bytes-3.1.2" + ]; + }) sources."readable-stream-3.6.2" sources."readdirp-3.6.0" sources."require-from-string-2.0.2" sources."requires-port-1.0.0" sources."retry-0.13.1" - sources."rimraf-5.0.9" sources."run-applescript-7.0.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."schema-utils-4.2.0" sources."select-hose-2.0.0" sources."selfsigned-2.4.1" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) + sources."encodeurl-1.0.2" sources."ms-2.1.3" ]; }) sources."serialize-javascript-6.0.2" (sources."serve-index-1.9.1" // { dependencies = [ - sources."debug-2.6.9" sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" - sources."ms-2.0.0" sources."setprototypeof-1.1.0" sources."statuses-1.5.0" ]; }) - sources."serve-static-1.15.0" + sources."serve-static-1.16.2" sources."set-function-length-1.2.2" sources."setprototypeof-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" sources."shell-quote-1.8.1" sources."side-channel-1.0.6" - sources."signal-exit-4.1.0" sources."sockjs-0.3.24" sources."source-map-0.6.1" sources."source-map-support-0.5.21" - sources."spdy-4.0.2" - sources."spdy-transport-3.0.0" - sources."statuses-2.0.1" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { + (sources."spdy-4.0.2" // { dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - sources."string_decoder-1.1.1" - (sources."strip-ansi-7.1.0" // { + (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - sources."strip-ansi-cjs-6.0.1" - sources."strip-final-newline-2.0.0" + sources."statuses-2.0.1" + sources."string_decoder-1.1.1" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.31.3" + sources."terser-5.33.0" (sources."terser-webpack-plugin-5.3.10" // { dependencies = [ sources."ajv-6.12.6" @@ -88148,9 +85433,9 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tree-dump-1.0.2" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."type-is-1.6.18" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."unpipe-1.0.0" sources."update-browserslist-db-1.1.0" sources."uri-js-4.4.1" @@ -88159,9 +85444,9 @@ in sources."utils-merge-1.0.1" sources."uuid-8.3.2" sources."vary-1.1.2" - sources."watchpack-2.4.1" + sources."watchpack-2.4.2" sources."wbuf-1.7.3" - (sources."webpack-5.93.0" // { + (sources."webpack-5.94.0" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -88169,20 +85454,10 @@ in sources."schema-utils-3.3.0" ]; }) - sources."webpack-dev-middleware-7.3.0" + sources."webpack-dev-middleware-7.4.2" sources."webpack-sources-3.2.3" sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) sources."ws-8.18.0" ]; buildInputs = globalBuildInputs; @@ -88214,11 +85489,9 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/merge-streams-2.3.0" - sources."@types/eslint-9.6.0" - sources."@types/eslint-scope-3.7.7" - sources."@types/estree-1.0.5" + sources."@types/estree-1.0.6" sources."@types/json-schema-7.0.15" - sources."@types/node-20.14.12" + sources."@types/node-22.5.5" sources."@webassemblyjs/ast-1.12.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -88242,15 +85515,15 @@ in sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."braces-3.0.3" - sources."browserslist-4.23.2" + sources."browserslist-4.23.3" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001643" + sources."caniuse-lite-1.0.30001662" sources."chrome-trace-event-1.0.4" sources."commander-2.20.3" - sources."electron-to-chromium-1.5.1" + sources."electron-to-chromium-1.5.26" sources."enhanced-resolve-5.17.1" sources."es-module-lexer-1.5.4" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { dependencies = [ @@ -88274,7 +85547,7 @@ in sources."globby-14.0.2" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" @@ -88284,14 +85557,14 @@ in sources."loader-runner-4.3.0" sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.7" + sources."micromatch-4.0.8" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."neo-async-2.6.2" sources."node-releases-2.0.18" sources."normalize-path-3.0.0" sources."path-type-5.0.0" - sources."picocolors-1.0.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."punycode-2.3.1" sources."queue-microtask-1.2.3" @@ -88307,7 +85580,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.31.3" + sources."terser-5.33.0" (sources."terser-webpack-plugin-5.3.10" // { dependencies = [ sources."ajv-6.12.6" @@ -88317,12 +85590,12 @@ in ]; }) sources."to-regex-range-5.0.1" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."unicorn-magic-0.1.0" sources."update-browserslist-db-1.1.0" sources."uri-js-4.4.1" - sources."watchpack-2.4.1" - (sources."webpack-5.93.0" // { + sources."watchpack-2.4.2" + (sources."webpack-5.94.0" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -88353,22 +85626,21 @@ in dependencies = [ (sources."@silentbot1/nat-api-0.4.7" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" sources."xml2js-0.6.2" ]; }) - sources."@thaunknown/idb-chunk-store-1.0.4" (sources."@thaunknown/simple-peer-10.0.10" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) (sources."@thaunknown/simple-websocket-9.1.3" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."@thaunknown/thirty-two-1.0.5" @@ -88385,30 +85657,30 @@ in sources."bencode-4.0.0" sources."bep53-range-1.1.1" sources."bitfield-4.2.0" - (sources."bittorrent-dht-11.0.6" // { + (sources."bittorrent-dht-11.0.8" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) (sources."bittorrent-lsd-2.0.0" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."bittorrent-peerid-1.3.6" - (sources."bittorrent-protocol-4.1.13" // { + (sources."bittorrent-protocol-4.1.15" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - (sources."bittorrent-tracker-11.1.1" // { + (sources."bittorrent-tracker-11.1.2" // { dependencies = [ - sources."debug-4.3.5" + sources."debug-4.3.7" sources."ip-2.0.1" - sources."ms-2.1.2" + sources."ms-2.1.3" ]; }) (sources."bl-4.1.0" // { @@ -88472,7 +85744,7 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."err-code-3.0.1" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."event-target-shim-5.0.1" @@ -88492,7 +85764,7 @@ in ]; }) sources."fs-constants-1.0.0" - sources."fsa-chunk-store-1.1.5" + sources."fsa-chunk-store-1.3.0" sources."get-caller-file-2.0.5" sources."get-stdin-8.0.0" sources."get-stream-6.0.1" @@ -88501,9 +85773,7 @@ in sources."he-1.2.0" sources."http-parser-js-0.4.13" sources."human-signals-2.1.0" - sources."hybrid-chunk-store-1.2.6" sources."iconv-lite-0.4.24" - sources."idb-7.1.1" sources."ieee754-1.2.1" sources."immediate-chunk-store-2.2.0" sources."inherits-2.0.4" @@ -88538,10 +85808,10 @@ in sources."lodash-4.17.21" sources."log-symbols-4.1.0" sources."lru-3.1.0" - (sources."lt_donthave-2.0.1" // { + (sources."lt_donthave-2.0.3" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."magnet-uri-6.2.0" @@ -88558,7 +85828,7 @@ in sources."napi-build-utils-1.0.2" sources."netmask-2.0.2" sources."network-address-1.1.2" - sources."node-abi-3.65.0" + sources."node-abi-3.68.0" (sources."node-datachannel-0.10.1" // { dependencies = [ sources."node-domexception-2.0.1" @@ -88566,7 +85836,7 @@ in }) sources."node-domexception-1.0.0" sources."node-fetch-3.3.2" - sources."node-gyp-build-4.8.1" + sources."node-gyp-build-4.8.2" sources."node-ssdp-2.9.1" sources."npm-run-path-4.0.1" sources."on-finished-2.4.1" @@ -88594,7 +85864,7 @@ in }) sources."prettier-bytes-1.0.4" sources."process-nextick-args-2.0.1" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."queue-microtask-1.2.3" sources."queue-tick-1.0.1" sources."random-access-file-4.0.7" @@ -88648,14 +85918,14 @@ in sources."throughput-1.0.1" sources."thunky-0.1.0" sources."tmp-0.0.33" - (sources."torrent-discovery-11.0.7" // { + (sources."torrent-discovery-11.0.11" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."torrent-piece-3.0.0" - sources."tslib-2.6.3" + sources."tslib-2.7.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.21.3" sources."typedarray-0.0.6" @@ -88666,8 +85936,8 @@ in sources."url-join-4.0.1" (sources."ut_metadata-4.0.3" // { dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."ut_pex-4.0.4" @@ -88677,13 +85947,13 @@ in sources."wcwidth-1.0.1" sources."web-streams-polyfill-3.3.3" sources."webrtc-polyfill-1.1.8" - (sources."webtorrent-2.4.12" // { + (sources."webtorrent-2.5.1" // { dependencies = [ sources."bep53-range-2.0.0" - sources."debug-4.3.5" + sources."debug-4.3.7" sources."get-stdin-9.0.0" sources."magnet-uri-7.0.5" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."parse-torrent-11.0.17" ]; }) @@ -88764,14 +86034,14 @@ in sources."concat-map-0.0.1" sources."detect-indent-6.1.0" sources."emoji-regex-8.0.0" - sources."escalade-3.1.2" + sources."escalade-3.2.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."glob-7.2.3" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."ignore-5.3.1" + sources."ignore-5.3.2" sources."ignore-walk-3.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index bdd80fa64da0f..c3db837580060 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -36,18 +36,9 @@ final: prev: { buildInputs = [ final.node-gyp-build ]; }; - bower2nix = prev.bower2nix.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : ${lib.makeBinPath [ pkgs.git pkgs.nix ]} - done - ''; - }; - expo-cli = prev."expo-cli".override (oldAttrs: { # The traveling-fastlane-darwin optional dependency aborts build on Linux. - dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") oldAttrs.dependencies; + dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.hostPlatform.isLinux then "darwin" else "linux"}") oldAttrs.dependencies; }); fast-cli = prev.fast-cli.override { @@ -88,15 +79,11 @@ final: prev: { nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ pkgs.psc-package final.pulp ]; }); - intelephense = prev.intelephense.override (oldAttrs: { - meta = oldAttrs.meta // { license = lib.licenses.unfree; }; - }); - joplin = prev.joplin.override (oldAttrs:{ nativeBuildInputs = [ pkgs.pkg-config (pkgs.python3.withPackages (ps: [ ps.setuptools ])) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.xcbuild ]; buildInputs = with pkgs; [ @@ -111,7 +98,7 @@ final: prev: { pixman cairo pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; @@ -132,7 +119,7 @@ final: prev: { meta = oldAttrs.meta // { # ModuleNotFoundError: No module named 'distutils' - broken = stdenv.isDarwin; # still broken on darwin + broken = stdenv.hostPlatform.isDarwin; # still broken on darwin }; }); @@ -155,7 +142,7 @@ final: prev: { pixman cairo pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreText ]; }; @@ -164,7 +151,7 @@ final: prev: { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postFixup = '' wrapProgram "$out/bin/makam" --prefix PATH : ${lib.makeBinPath [ nodejs ]} - ${lib.optionalString stdenv.isLinux "patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""} + ${lib.optionalString stdenv.hostPlatform.isLinux "patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""} ''; }; @@ -214,7 +201,7 @@ final: prev: { version = esbuild-version; src = fetchurl { url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-${esbuild-version}.tgz"; - sha512 = "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ=="; + sha512 = "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ=="; }; }; esbuild-linux-arm64 = { @@ -223,7 +210,7 @@ final: prev: { version = esbuild-version; src = fetchurl { url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-${esbuild-version}.tgz"; - sha512 = "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A=="; + sha512 = "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g=="; }; }; esbuild-darwin-x64 = { @@ -232,7 +219,7 @@ final: prev: { version = esbuild-version; src = fetchurl { url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-${esbuild-version}.tgz"; - sha512 = "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA=="; + sha512 = "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw=="; }; }; esbuild-darwin-arm64 = { @@ -241,16 +228,16 @@ final: prev: { version = esbuild-version; src = fetchurl { url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-${esbuild-version}.tgz"; - sha512 = "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA=="; + sha512 = "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q=="; }; }; in{ nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; dependencies = oldAttrs.dependencies - ++ lib.optional (stdenv.isLinux && stdenv.isx86_64) esbuild-linux-x64 - ++ lib.optional (stdenv.isLinux && stdenv.isAarch64) esbuild-linux-arm64 - ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) esbuild-darwin-x64 - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) esbuild-darwin-arm64; + ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) esbuild-linux-x64 + ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) esbuild-linux-arm64 + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) esbuild-darwin-x64 + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) esbuild-darwin-arm64; postInstall = '' wrapProgram "$out/bin/postcss" \ --prefix NODE_PATH : ${final.postcss}/lib/node_modules \ @@ -357,7 +344,7 @@ final: prev: { cairo pango libjpeg - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreText ]; }; @@ -387,7 +374,7 @@ final: prev: { pixman cairo pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreText ]; }; diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index a96848fba08f3..4c6ed4064ef64 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "angstrom"; - version = "0.16.0"; + version = "0.16.1"; minimalOCamlVersion = "4.04"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - hash = "sha256-vilGto5ciyKzVJd72z4B+AvM1nf3x3O7DHXrK5SIajQ="; + hash = "sha256-EPqDK+7RU2vHEHvuoTXb8V2FkdXQ6tGu0ghbNPS3gZ4="; }; checkInputs = [ alcotest ppx_let ]; diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index fb93fd2f18753..7b993168e1679 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - ./configure -prefix $out ${lib.optionalString stdenv.isDarwin "--no-strip"} + ./configure -prefix $out ${lib.optionalString stdenv.hostPlatform.isDarwin "--no-strip"} mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs runHook postConfigure ''; diff --git a/pkgs/development/ocaml-modules/arp/default.nix b/pkgs/development/ocaml-modules/arp/default.nix index a4facc6cddfcd..b8cc579e5661c 100644 --- a/pkgs/development/ocaml-modules/arp/default.nix +++ b/pkgs/development/ocaml-modules/arp/default.nix @@ -47,7 +47,7 @@ buildDunePackage rec { ]; ## NOTE: As of 18 april 2023 and ARP version 3.0.0, tests fail on Darwin. - doCheck = ! stdenv.isDarwin; + doCheck = ! stdenv.hostPlatform.isDarwin; checkInputs = [ alcotest mirage-clock-unix diff --git a/pkgs/development/ocaml-modules/augeas/default.nix b/pkgs/development/ocaml-modules/augeas/default.nix new file mode 100644 index 0000000000000..b06471a495d16 --- /dev/null +++ b/pkgs/development/ocaml-modules/augeas/default.nix @@ -0,0 +1,60 @@ +{ + stdenv, + fetchurl, + fetchDebianPatch, + autoreconfHook, + makeWrapper, + pkg-config, + ocaml, + findlib, + libxml2, + augeas, + lib, +}: + +stdenv.mkDerivation rec { + pname = "ocaml-augeas"; + version = "0.6"; + + src = fetchurl { + url = "https://people.redhat.com/~rjones/augeas/files/ocaml-augeas-0.6.tar.gz"; + sha256 = "04bn62hqdka0658fgz0p0fil2fyic61i78plxvmni1yhmkfrkfla"; + }; + + patches = [ + (fetchDebianPatch { + inherit pname version; + debianRevision = "1"; + patch = "0001-Use-ocamlopt-g-option.patch"; + hash = "sha256-EMd/EfWO2ni0AMonfS7G5FENpVVq0+q3gUPd4My+Upg="; + }) + (fetchDebianPatch { + inherit pname version; + debianRevision = "1"; + patch = "0002-caml_named_value-returns-const-value-pointer-in-OCam.patch"; + hash = "sha256-Y53UHwrTVeV3hnsvABmWxlPi2Fanm0Iy1OR8Zql5Ub8="; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + makeWrapper + pkg-config + ]; + + buildInputs = [ + ocaml + findlib + augeas + libxml2 + ]; + + createFindlibDestdir = true; + + meta = with lib; { + homepage = "https://people.redhat.com/~rjones/augeas/"; + description = "OCaml bindings for Augeas"; + license = with licenses; lgpl21Plus; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index f814cba26b1dd..98da1f31f3128 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -18,11 +18,11 @@ buildDunePackage rec { ppxlib ]; - meta = with lib; { + meta = { description = "Bisect_ppx is a code coverage tool for OCaml and Reason. It helps you test thoroughly by showing what's not tested"; homepage = "https://github.com/aantron/bisect_ppx"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ momeemt ]; mainProgram = "bisect-ppx-report"; }; } diff --git a/pkgs/development/ocaml-modules/bjack/default.nix b/pkgs/development/ocaml-modules/bjack/default.nix index 197d31638d615..21052759233a9 100644 --- a/pkgs/development/ocaml-modules/bjack/default.nix +++ b/pkgs/development/ocaml-modules/bjack/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { hash = "sha256-jIxxqBVWphWYyLh+24rTxk4WWfPPdGCvNdevFJEKw70="; }; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreAudio ]; propagatedBuildInputs = [ libsamplerate libjack2 ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix index e0057f07464e1..addaedd5acae8 100644 --- a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix +++ b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { ppxlib ]; - meta = with lib; { + meta = { description = "React.js-like reconciler implemented in OCaml/Reason"; longDescription = '' Easily model any `tree-shaped state` with simple `stateful functions`. @@ -29,7 +29,7 @@ buildDunePackage rec { * stateful functions: Functions that maintain state over time. Imagine that you can take any variable in your function and manage its value over the function's invocation. Now, imagine that any function invocation really creates its own "instance" of the function which will track this state separately from other invocations of this function. ''; homepage = "https://github.com/briskml/brisk-reconciler"; - maintainers = [ ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ momeemt ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/brr/default.nix b/pkgs/development/ocaml-modules/brr/default.nix index e010bedebb0ea..7dd46af26cb4d 100644 --- a/pkgs/development/ocaml-modules/brr/default.nix +++ b/pkgs/development/ocaml-modules/brr/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-brr"; - version = "0.0.6"; + version = "0.0.7"; src = fetchurl { url = "https://erratique.ch/software/brr/releases/brr-${version}.tbz"; - hash = "sha256-paYZlzujXsG1S+s/4/kAPBlDuV1Ljorw7okAu4qaAV0="; + hash = "sha256-rcWuW6avI/RJZNAlxKOsPSEtDQZ1hb51oKpSk3iG7oY="; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel ]; diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index 0b560f2004f60..eefac702d7ef5 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -14,9 +14,9 @@ buildDunePackage rec { useDune2 = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cairo dune-configurator ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; + buildInputs = [ cairo dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; - doCheck = !(stdenv.isDarwin + doCheck = !(stdenv.hostPlatform.isDarwin # https://github.com/Chris00/ocaml-cairo/issues/19 || lib.versionAtLeast ocaml.version "4.10"); diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index e4856062adb16..94e858ff9fb4b 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -36,7 +36,7 @@ let params = hash = "sha256-HklX+VPD0Ta3Knv++dBT2rhsDSlDRH90k4Cj1YtWIa8="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin darwin.sigtool; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.sigtool; propagatedBuildInputs = [ camlp-streams dune-site ]; }; diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index 204128adec226..e5de1b6485348 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -1,10 +1,10 @@ -{ lib, buildDunePackage, fetchFromGitHub, ocaml, m4, camlp-streams, core_kernel, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, m4, camlp-streams, core_kernel, ounit }: buildDunePackage rec { pname = "cfstream"; version = "1.3.2"; - minimalOCamlVersion = "4.07"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "biocaml"; @@ -15,13 +15,11 @@ buildDunePackage rec { patches = [ ./git_commit.patch ./janestreet-0.17.patch ]; - strictDeps = true; - nativeBuildInputs = [ m4 ]; checkInputs = [ ounit ]; propagatedBuildInputs = [ camlp-streams core_kernel ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 252a61369febd..8d7f666056bcb 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -5,7 +5,7 @@ }: buildDunePackage rec { - version = "3.13.1"; + version = "3.14"; pname = "containers"; minimalOCamlVersion = "4.08"; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - hash = "sha256-jkXh/dBRotWXvA77M/+tm39qsCiBsH/HSs+Y9D9QCek="; + hash = "sha256-+r1zv7tfCS/dqnTSxpWSagTKVRauqgN6Np1Xa+aQT8k="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/cpu/default.nix b/pkgs/development/ocaml-modules/cpu/default.nix index a61a597b20939..ee16765c1bcfb 100644 --- a/pkgs/development/ocaml-modules/cpu/default.nix +++ b/pkgs/development/ocaml-modules/cpu/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { nativeBuildInputs = [ autoconf ]; - hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "strictoverflow"; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/crowbar/default.nix b/pkgs/development/ocaml-modules/crowbar/default.nix index d321abfe9daa9..24ef96f57331b 100644 --- a/pkgs/development/ocaml-modules/crowbar/default.nix +++ b/pkgs/development/ocaml-modules/crowbar/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocplib-endian cmdliner afl-persistent ]; checkInputs = [ calendar fpath pprint uutf uunf uucp ]; # uunf is broken on aarch64 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = with lib; { description = "Property fuzzing for OCaml"; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index e104f94d13a9c..157c2b4202905 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "cryptokit"; - version = "1.19"; + version = "1.20.1"; minimalOCamlVersion = "4.08"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "xavierleroy"; repo = "cryptokit"; rev = "release${lib.replaceStrings ["."] [""] version}"; - hash = "sha256-8RRAPFgL2pqKotc1I3fIB9q2cNi46SP8pt+0rZM+QUc="; + hash = "sha256-VFY10jGctQfIUVv7dK06KP8zLZHLXTxvLyTCObS+W+E="; }; # dont do autotools configuration, but do trigger findlib's preConfigure hook diff --git a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix index 84565e8007e05..171b084829408 100644 --- a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix +++ b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix @@ -2,7 +2,7 @@ lib, fetchFromGitLab, buildDunePackage , integers_stubs_js, ctypes, ppx_expect , js_of_ocaml-compiler -, nodejs +, nodejs, stdenv }: buildDunePackage rec { @@ -28,7 +28,7 @@ buildDunePackage rec { ctypes ppx_expect ]; - doCheck = true; + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); meta = { description = "Js_of_ocaml Javascript stubs for the OCaml ctypes library"; diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index 5d5cdb360f475..229ad666cb24a 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { doCheck = lib.versionAtLeast ocaml.version "4.08" # Some test fails in macOS sandbox # > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "") - && !stdenv.isDarwin; + && !stdenv.hostPlatform.isDarwin; postPatch = '' substituteInPlace src/curly.ml \ diff --git a/pkgs/development/ocaml-modules/dates_calc/default.nix b/pkgs/development/ocaml-modules/dates_calc/default.nix index d577cd61664ac..e1def37250e79 100644 --- a/pkgs/development/ocaml-modules/dates_calc/default.nix +++ b/pkgs/development/ocaml-modules/dates_calc/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "dates_calc"; - version = "0.0.4"; + version = "0.0.6"; minimalOCamlVersion = "4.11"; duneVersion = "3"; @@ -13,7 +13,7 @@ buildDunePackage rec { owner = "catalalang"; repo = "dates-calc"; rev = version; - sha256 = "sha256-tpKOoPVXkg/k+NW5R8A4fGAKhdMn9UcqMogCjafJuw4="; + sha256 = "sha256-B4li8vIK6AnPXJ1QSJ8rtr+JOcy4+h5sc1SH97U+Vgw="; }; propagatedBuildInputs = []; diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index fede56388a774..ccecc8a33f764 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -1,22 +1,23 @@ { lib, fetchurl, buildDunePackage , menhir, menhirLib , fmt +, hmap , qcheck }: buildDunePackage rec { pname = "dolmen"; - version = "0.9"; + version = "0.10"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/Gbury/dolmen/releases/download/v${version}/dolmen-${version}.tbz"; - hash = "sha256-AD21OFS6zDoz+lXtac95gXwQNppPfGvpRK8dzDZXigo="; + hash = "sha256-xchfd+OSTzeOjYLxZu7+QTG04EG/nN7KRnQQ8zxx+mE="; }; nativeBuildInputs = [ menhir ]; - propagatedBuildInputs = [ menhirLib fmt ]; + propagatedBuildInputs = [ menhirLib fmt hmap ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/dolmen/loop.nix b/pkgs/development/ocaml-modules/dolmen/loop.nix index 19349bcb6e6aa..572c161edc49e 100644 --- a/pkgs/development/ocaml-modules/dolmen/loop.nix +++ b/pkgs/development/ocaml-modules/dolmen/loop.nix @@ -1,6 +1,7 @@ { buildDunePackage, dolmen, dolmen_type , gen , pp_loc +, mdx }: buildDunePackage { @@ -9,6 +10,10 @@ buildDunePackage { propagatedBuildInputs = [ dolmen dolmen_type gen pp_loc ]; + doCheck = true; + nativeCheckInputs = [ mdx.bin ]; + checkInputs = [ mdx ]; + meta = dolmen.meta // { description = "Tool library for automated deduction tools"; }; diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix index 5c75c4cb10441..0b02539d64cbc 100644 --- a/pkgs/development/ocaml-modules/eigen/default.nix +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.02"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; propagatedBuildInputs = [ ctypes ]; diff --git a/pkgs/development/ocaml-modules/eio-ssl/default.nix b/pkgs/development/ocaml-modules/eio-ssl/default.nix new file mode 100644 index 0000000000000..087a667d4e2df --- /dev/null +++ b/pkgs/development/ocaml-modules/eio-ssl/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildDunePackage +, fetchurl +, eio +, ssl +}: + +buildDunePackage rec { + pname = "eio-ssl"; + version = "0.3.0"; + + src = fetchurl { + url = "https://github.com/anmonteiro/eio-ssl/releases/download/${version}/eio-ssl-${version}.tbz"; + hash = "sha256-m4CiUQtXVSMfLthbDsAftpiOsr24I5IGiU1vv7Rz8go="; + }; + + propagatedBuildInputs = [ eio ssl ]; + + meta = { + homepage = "https://github.com/anmonteiro/eio-ssl"; + description = "OpenSSL binding to EIO"; + license = lib.licenses.lgpl21; + }; +} diff --git a/pkgs/development/ocaml-modules/eio/main.nix b/pkgs/development/ocaml-modules/eio/main.nix index a65b27b8db411..48c15e99ae0c3 100644 --- a/pkgs/development/ocaml-modules/eio/main.nix +++ b/pkgs/development/ocaml-modules/eio/main.nix @@ -16,7 +16,7 @@ buildDunePackage { propagatedBuildInputs = [ eio_posix - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ eio_linux ]; } diff --git a/pkgs/development/ocaml-modules/eio/posix.nix b/pkgs/development/ocaml-modules/eio/posix.nix index c18cdd506141e..fa63c1ea713bf 100644 --- a/pkgs/development/ocaml-modules/eio/posix.nix +++ b/pkgs/development/ocaml-modules/eio/posix.nix @@ -16,7 +16,7 @@ buildDunePackage { dontStrip = true; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; }; diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index de000f8aaf833..de3f1094143d3 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--use-opam" "--apron-prefix" apron ] - ++ lib.optional stdenv.isDarwin "--absolute-dylibs" + ++ lib.optional stdenv.hostPlatform.isDarwin "--absolute-dylibs" ; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 30b955876ace5..205fa78371fb5 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -17,13 +17,13 @@ buildDunePackage rec { pname = "eliom"; - version = "10.4.1"; + version = "11.0.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - hash = "sha256-j4t6GEd8hYyM87b9XvgcnaV9XMkouz6+v0SYW22/bqg="; + hash = "sha256-RgIK3xkKdX+zOurhML4370rsO4blJrWoEla09Nfe9Mw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 980c68298adcc..f9ee8ca6a1935 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -9,39 +9,36 @@ , ppxlib_0_15, ppx_deriving_0_15 , coqPackages , version ? if lib.versionAtLeast ocaml.version "4.08" then "1.18.1" - else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" + else "1.15.2" }: let p5 = camlp5; in let camlp5 = p5.override { legacy = true; }; in let fetched = coqPackages.metaFetch ({ - release."1.19.2".sha256 = "sha256-7VTUbsFVoNT6srLwcAn5WNSsWC7cVUdphKRWBHHiH5M="; - release."1.18.1".sha256 = "sha256-zgBJefQDe3JyCGbC0wvMcx/9iMVbftBJ43NPogkNeHY="; - release."1.17.0".sha256 = "sha256-DTxE8CvYl0et20pxueydI+WzraI6UPHMNvxyp2gU/+w="; - release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; - release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s="; - release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar"; - release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis="; - release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r"; - release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka"; - release."1.13.1".sha256 = "12a9nbdvg9gybpw63lx3nw5wnxfznpraprb0wj3l68v1w43xq044"; - release."1.13.0".sha256 = "0dmzy058m1mkndv90byjaik6lzzfk3aaac7v84mpmkv6my23bygr"; - release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is"; - release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5"; + release."1.19.2".sha256 = "sha256-dBj5Ek7PWq/8Btq/dggJUqa8cUtfvbi6EWo/lJEDOU4="; + release."1.18.1".sha256 = "sha256-rrIv/mVC0Ez3nU7fpnzwduIC3tI6l73DjgAbv1gd2v0="; + release."1.17.0".sha256 = "sha256-J8FJBeaB+2HtHjrkgNzOZJngZ2AcYU+npL9Y1HNPnzo="; + release."1.15.2".sha256 = "sha256-+sQYQiN3n+dlzXzi5opOjhkJZqpkNwlHZcUjaUM6+xQ="; + release."1.15.0".sha256 = "sha256-vpQzbkDqJPCmaBmXcBnzlWGS7djW9wWv8xslkIlXgP0="; + release."1.13.7".sha256 = "sha256-0QbOEnrRCYA2mXDGRKe+QYCXSESLJvLzRW0Iq+/3P9Y="; + release."1.12.0".sha256 = "sha256-w4JzLZB8jcxw7nA7AfgU9jTZTr6IYUxPU5E2vNIFC4Q="; + release."1.11.4".sha256 = "sha256-dyzEpzokgffsF9lt+FZgUlcZEuAb70vGuHfGUtjZYIM="; releaseRev = v: "v${v}"; + releaseArtifact = v: if lib.versionAtLeast v "1.13.8" + then "elpi-${v}.tbz" + else "elpi-v${v}.tbz"; location = { domain = "github.com"; owner = "LPCIC"; repo = "elpi"; }; }) version; in -buildDunePackage rec { +buildDunePackage { pname = "elpi"; inherit (fetched) version src; patches = lib.optional (version == "1.16.5") ./atd_2_10.patch; - minimalOCamlVersion = "4.04"; - duneVersion = "3"; + minimalOCamlVersion = "4.07"; # atdgen is both a library and executable nativeBuildInputs = [ perl ] @@ -68,6 +65,6 @@ buildDunePackage rec { }; postPatch = '' - substituteInPlace elpi_REPL.ml --replace "tput cols" "${ncurses}/bin/tput cols" + substituteInPlace elpi_REPL.ml --replace-warn "tput cols" "${ncurses}/bin/tput cols" ''; } diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index 58055aa6698c3..4d85556131777 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -14,7 +14,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 8f268d4d5ec2c..85f03825cdbd0 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -15,7 +15,7 @@ buildDunePackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] - ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index c8a1bf9de5a1a..f966706cc737a 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -21,7 +21,7 @@ buildDunePackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit AudioToolbox AVFoundation diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 89d9824839863..1f9ded9bd0241 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -17,7 +17,7 @@ buildDunePackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] - ++ lib.optionals stdenv.isDarwin [ AppKit CoreImage OpenGL VideoToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreImage OpenGL VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index 8e299a536f635..8374304fe4888 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -12,7 +12,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index d21e0d02ad4c7..5fda062454f07 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -13,7 +13,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index b03d87596b03c..518f18b1509bd 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -13,7 +13,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 980a3efa9bd08..29d7b492c8375 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -31,7 +31,7 @@ buildDunePackage rec { checkInputs = [ alcotest alcotest-lwt mirage-crypto-rng crowbar cmdliner ]; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = { description = "Git format and protocol in pure OCaml"; diff --git a/pkgs/development/ocaml-modules/gluten/default.nix b/pkgs/development/ocaml-modules/gluten/default.nix index 1c8b2597b2bbb..255f92378febc 100644 --- a/pkgs/development/ocaml-modules/gluten/default.nix +++ b/pkgs/development/ocaml-modules/gluten/default.nix @@ -7,11 +7,11 @@ buildDunePackage rec { pname = "gluten"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz"; - hash = "sha256-VZcbMFDRv+TVSXG05wUYxaWbTnBSa43RiVx9OesPnZY="; + hash = "sha256-se7Yn59ggLtL0onMjSUsa88B8D05Vybmb6YGcgfnAV8="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix index 27791d6aa5f3a..fc81d53f17178 100644 --- a/pkgs/development/ocaml-modules/gsl/default.nix +++ b/pkgs/development/ocaml-modules/gsl/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator gsl ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; meta = with lib; { homepage = "https://mmottl.github.io/gsl-ocaml/"; diff --git a/pkgs/development/ocaml-modules/gstreamer/default.nix b/pkgs/development/ocaml-modules/gstreamer/default.nix index 34407299914a5..689603c8e19c4 100644 --- a/pkgs/development/ocaml-modules/gstreamer/default.nix +++ b/pkgs/development/ocaml-modules/gstreamer/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Foundation ]; propagatedBuildInputs = [ glib.dev gst_all_1.gstreamer.dev gst_all_1.gst-plugins-base ]; CFLAGS_COMPILE = [ diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix index f65aeaf0e4615..12aebd57774d9 100644 --- a/pkgs/development/ocaml-modules/h2/default.nix +++ b/pkgs/development/ocaml-modules/h2/default.nix @@ -5,7 +5,7 @@ , faraday , base64 , psq -, httpaf +, httpun-types , alcotest , yojson , hex @@ -34,7 +34,7 @@ buildDunePackage rec { base64 psq hpack - httpaf + httpun-types ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/h2/eio.nix b/pkgs/development/ocaml-modules/h2/eio.nix new file mode 100644 index 0000000000000..0beb6f3e086ef --- /dev/null +++ b/pkgs/development/ocaml-modules/h2/eio.nix @@ -0,0 +1,18 @@ +{ buildDunePackage +, h2 +, eio +, gluten-eio +}: + +buildDunePackage { + pname = "h2-eio"; + + inherit (h2) src version; + + propagatedBuildInputs = [ eio gluten-eio h2 ]; + + meta = h2.meta // { + description = "EIO support for h2"; + }; +} + diff --git a/pkgs/development/ocaml-modules/hpack/default.nix b/pkgs/development/ocaml-modules/hpack/default.nix index eb42f51585893..c6c52a38dffd1 100644 --- a/pkgs/development/ocaml-modules/hpack/default.nix +++ b/pkgs/development/ocaml-modules/hpack/default.nix @@ -7,11 +7,11 @@ buildDunePackage rec { pname = "hpack"; - version = "0.11.0"; + version = "0.13.0"; src = fetchurl { url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz"; - hash = "sha256-GdXwazlgDurjzy7ekLpuMkCii8W+F/jl/IBv/WTHgFM="; + hash = "sha256-DYm28XgXUpTnogciO+gdW4P8Mbl1Sb7DTwQyo7KoBw8="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/httpun-ws/default.nix b/pkgs/development/ocaml-modules/httpun-ws/default.nix new file mode 100644 index 0000000000000..89ac696301b30 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun-ws/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchurl +, buildDunePackage +, angstrom +, base64 +, bigstringaf +, faraday +, gluten +, httpun +, alcotest +}: + +buildDunePackage rec { + pname = "httpun-ws"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/anmonteiro/httpun-ws/releases/download/${version}/httpun-ws-${version}.tbz"; + hash = "sha256-6uDNLg61tPyctthitxFqbw/IUDsuQ5BGvw5vTLLCl/0="; + }; + + propagatedBuildInputs = [ + angstrom + base64 + bigstringaf + faraday + gluten + httpun + ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "Websocket implementation for httpun"; + license = lib.licenses.bsd3; + homepage = "https://github.com/anmonteiro/httpun-ws"; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/httpun/default.nix b/pkgs/development/ocaml-modules/httpun/default.nix new file mode 100644 index 0000000000000..f45ffe5eca2e7 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun/default.nix @@ -0,0 +1,22 @@ +{ buildDunePackage +, httpun-types +, angstrom +, bigstringaf +, faraday +, alcotest +}: + +buildDunePackage { + pname = "httpun"; + + inherit (httpun-types) src version; + + propagatedBuildInputs = [ angstrom bigstringaf faraday httpun-types ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = httpun-types.meta // { + description = "A high-performance, memory-efficient, and scalable HTTP library for OCaml"; + }; +} diff --git a/pkgs/development/ocaml-modules/httpun/eio.nix b/pkgs/development/ocaml-modules/httpun/eio.nix new file mode 100644 index 0000000000000..1b3160d699f1c --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun/eio.nix @@ -0,0 +1,16 @@ +{ buildDunePackage +, httpun +, gluten-eio +}: + +buildDunePackage { + pname = "httpun-eio"; + + inherit (httpun) src version; + + propagatedBuildInputs = [ gluten-eio httpun ]; + + meta = httpun.meta // { + description = "EIO support for httpun"; + }; +} diff --git a/pkgs/development/ocaml-modules/httpun/types.nix b/pkgs/development/ocaml-modules/httpun/types.nix new file mode 100644 index 0000000000000..f69535129a31c --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun/types.nix @@ -0,0 +1,24 @@ +{ lib +, buildDunePackage +, fetchurl +, faraday +}: + +buildDunePackage rec { + pname = "httpun-types"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/anmonteiro/httpun/releases/download/${version}/httpun-${version}.tbz"; + hash = "sha256-os4n70yFro4cEAjR49Xok9ayEbk0WGod0pQvfbaHvSw="; + }; + + propagatedBuildInputs = [ faraday ]; + + meta = { + description = "Common HTTP/1.x types"; + homepage = "https://github.com/anmonteiro/httpun"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index c0ba327dd2fc0..2a4f1ccd01ffb 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -4,14 +4,14 @@ }: buildDunePackage rec { - version = "2.5"; + version = "2.6"; pname = "inotify"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-inotify"; rev = "v${version}"; - hash = "sha256-3Ju6l6aF5eJgIZJKO0lQGXjjGDzCdX2fuwyNSAjIyAs="; + hash = "sha256-Vg9uVIx6/OMS1WoJIHwZbSt5ZyFy+Xgw5167FJWGslg="; }; buildInputs = [ lwt ]; diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 1fb45ebdd8dfc..780213ad07925 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ ocaml findlib makeWrapper ]; - buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ tcl tk ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index e8d0e966c40f6..e747b64de6e22 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ lapack blas ] ++ - lib.optionals stdenv.isDarwin + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix index a5b61880da7d1..c8c6c545cbaaf 100644 --- a/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "lambdasoup"; - version = "1.0.0"; + version = "1.1.1"; minimalOCamlVersion = "4.03"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "aantron"; repo = pname; rev = version; - hash = "sha256-PZkhN5vkkLu8A3gYrh5O+nq9wFtig0Q4qD8zLGUGTRI="; + hash = "sha256-+d1JPU7OyQgt8pDTlwZraqPHH+OBQD1ycsELKpHT95Y="; }; propagatedBuildInputs = [ camlp-streams markup ]; diff --git a/pkgs/development/ocaml-modules/linol/default.nix b/pkgs/development/ocaml-modules/linol/default.nix index dc7ee48358013..97630cc3db93e 100644 --- a/pkgs/development/ocaml-modules/linol/default.nix +++ b/pkgs/development/ocaml-modules/linol/default.nix @@ -12,7 +12,13 @@ rec { hash = "sha256-MwEisPJdzZN1VRnssotvExNMYOQdffS+Y2B8ZSUDVfo="; }; - propagatedBuildInputs = [ yojson logs lsp ppx_yojson_conv_lib trace ]; + propagatedBuildInputs = [ + yojson + logs + (lsp.override { version = "1.18.0"; }) + ppx_yojson_conv_lib + trace + ]; meta = with lib; { description = "LSP server library"; diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix index 2c0fa7186e84a..cb77d21479ca6 100644 --- a/pkgs/development/ocaml-modules/mccs/default.nix +++ b/pkgs/development/ocaml-modules/mccs/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "mccs"; - version = "1.1+17"; + version = "1.1+18"; src = fetchFromGitHub { owner = "AltGr"; repo = "ocaml-mccs"; rev = version; - hash = "sha256-0NZF2W/eWwZRXnMJh9LmOdbE/CRDYeLUUx6ty4irP6U="; + hash = "sha256-Swfqq7O5KASf1nkK/lgIO9byWDUv1FiWh8cNULF7wfI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/menhir/lib.nix b/pkgs/development/ocaml-modules/menhir/lib.nix index a10a1e0277335..27af2c1b5200e 100644 --- a/pkgs/development/ocaml-modules/menhir/lib.nix +++ b/pkgs/development/ocaml-modules/menhir/lib.nix @@ -1,8 +1,14 @@ -{ lib, buildDunePackage, coqPackages, version ? "20231231" }: +{ lib +, buildDunePackage +, ocaml +, coqPackages +, version ? if lib.versionAtLeast ocaml.version "4.08" then "20240715" else "20231231" +}: let fetched = coqPackages.metaFetch ({ release."20231231".sha256 = "sha256-veB0ORHp6jdRwCyDDAfc7a7ov8sOeHUmiELdOFf/QYk="; - releaseRev = v: "v${v}"; + release."20240715".sha256 = "sha256-9CSxAIm0aEXkwF+aj8u/bqLG30y5eDNz65EnohJPjzI="; + releaseRev = v: "${v}"; location = { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "menhir"; }; }) version; in diff --git a/pkgs/development/ocaml-modules/miou/default.nix b/pkgs/development/ocaml-modules/miou/default.nix index 0a5970fe73911..1b4e1c318fb30 100644 --- a/pkgs/development/ocaml-modules/miou/default.nix +++ b/pkgs/development/ocaml-modules/miou/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "miou"; - version = "0.2.0"; + version = "0.3.0"; minimalOCamlVersion = "5.0.0"; src = fetchurl { url = "https://github.com/robur-coop/miou/releases/download/v${version}/miou-${version}.tbz"; - hash = "sha256-hxYCG1NkDEbVyDvN8eS/Fj6s10YyS7NRGlyNOkLy6sA="; + hash = "sha256-kjGAbm1glF427gYOXKSogb+HpgUQqK5fqL9F06FtC4Q="; }; meta = { diff --git a/pkgs/development/ocaml-modules/mlbdd/default.nix b/pkgs/development/ocaml-modules/mlbdd/default.nix new file mode 100644 index 0000000000000..0392597c2f3b4 --- /dev/null +++ b/pkgs/development/ocaml-modules/mlbdd/default.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + buildDunePackage, + ounit, +}: + +buildDunePackage { + pname = "mlbdd"; + version = "0.7.2"; + + minimalOCamlVersion = "4.04"; + + src = fetchFromGitHub { + owner = "arlencox"; + repo = "mlbdd"; + rev = "v0.7.2"; + hash = "sha256-GRkaUL8LQDdQx9mPvlJIXatgRfen/zKt+nGLiH7Mfvs="; + }; + + checkInputs = [ ounit ]; + + doCheck = true; + + meta = { + homepage = "https://github.com/arlencox/mlbdd"; + description = "A not-quite-so-simple Binary Decision Diagrams implementation for OCaml"; + maintainers = with lib.maintainers; [ katrinafyi ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mrmime/default.nix b/pkgs/development/ocaml-modules/mrmime/default.nix index a2d118765616d..8e9a3e1049e19 100644 --- a/pkgs/development/ocaml-modules/mrmime/default.nix +++ b/pkgs/development/ocaml-modules/mrmime/default.nix @@ -2,14 +2,12 @@ , alcotest , angstrom , base64 -, bigarray-compat , bigarray-overlap , bigstringaf , buildDunePackage , cmdliner , emile -, fetchzip -, fmt +, fetchurl , fpath , hxd , ipaddr @@ -17,56 +15,49 @@ , ke , lib , mirage-crypto-rng -, ocaml , pecu , prettym , ptime , rosetta -, rresult , unstrctrd , uutf }: buildDunePackage rec { pname = "mrmime"; - version = "0.5.0"; + version = "0.6.1"; - src = fetchzip { - url = "https://github.com/mirage/mrmime/releases/download/v${version}/mrmime-v${version}.tbz"; - sha256 = "14k67v0b39b8jq3ny2ymi8g8sqx2gd81mlzsjphdzdqnlx6fk716"; + src = fetchurl { + url = "https://github.com/mirage/mrmime/releases/download/v${version}/mrmime-${version}.tbz"; + hash = "sha256-Dzsr7xPzu5RIzIdubF4OAAjHJY7CdBVnHRZxQbcCsBY="; }; - duneVersion = "3"; - - buildInputs = [ cmdliner hxd ]; - propagatedBuildInputs = [ angstrom base64 emile - fmt ipaddr ke pecu prettym ptime rosetta - rresult unstrctrd uutf - afl-persistent - bigarray-compat bigarray-overlap bigstringaf - fpath - mirage-crypto-rng ]; checkInputs = [ + afl-persistent alcotest + cmdliner + fpath + hxd jsonm + mirage-crypto-rng ]; - doCheck = lib.versionOlder ocaml.version "5.0"; + doCheck = true; meta = { description = "Parser and generator of mail in OCaml"; diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 67741516af19e..e27fbca0a4a08 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ocaml ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 6ad8420fc134a..1a2a97d21f2bd 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -8,7 +8,9 @@ , lib , ocaml , version ? - if lib.versionAtLeast ocaml.version "4.14" then + if lib.versionAtLeast ocaml.version "5.02" then + "1.19.0" + else if lib.versionAtLeast ocaml.version "4.14" then "1.18.0" else if lib.versionAtLeast ocaml.version "4.13" then "1.10.5" @@ -19,6 +21,11 @@ }: let params = { + "1.19.0" = { + name = "lsp"; + minimalOCamlVersion = "5.02"; + sha256 = "sha256-54PZ8af4nOG/TJFIqjSiKDaL0Um7zKQ96AtFkiHe5ew="; + }; "1.18.0" = { name = "lsp"; minimalOCamlVersion = "4.14"; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index c77d1ed40453c..b22561666b344 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -22,7 +22,9 @@ , ocamlformat-rpc-lib , ocaml , version ? - if lib.versionAtLeast ocaml.version "4.14" then + if lib.versionAtLeast ocaml.version "5.02" then + "1.19.0" + else if lib.versionAtLeast ocaml.version "4.14" then "1.18.0" else if lib.versionAtLeast ocaml.version "4.13" then "1.10.5" diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix index a60b02e4f3c3e..c475cc7a97d0b 100644 --- a/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ocaml-version"; - version = "3.6.7"; + version = "3.6.8"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; - hash = "sha256-1Q/9W2adM+2w2InEdqcd5IiNkACNWDNgONIQztKPgQw="; + hash = "sha256-mCIeXsvpea/iFuJkvearu6wr804qFPCcH4WOaUKYC9k="; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index c475ebdecd26a..0984416020e93 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,6 +1,6 @@ { lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl, findlib , bigstringaf, lwt, cstruct, mirage-crypto, zarith, mirage-crypto-ec, ptime, mirage-crypto-rng, mtime, ca-certs -, cohttp, cohttp-lwt-unix, hmap +, cohttp, cohttp-lwt-unix , lwt_log, re, cryptokit, xml-light, ipaddr , camlzip , makeWrapper @@ -17,7 +17,7 @@ let caml_ld_library_path = ; in buildDunePackage rec { - version = "5.1.2"; + version = "6.0.0"; pname = "ocsigenserver"; minimalOCamlVersion = "4.08"; @@ -26,13 +26,13 @@ buildDunePackage rec { owner = "ocsigen"; repo = "ocsigenserver"; rev = "refs/tags/${version}"; - hash = "sha256-piWHA4RMO370TETC9FtISyBvS1Uhk5CAGAtZleJTpjU="; + hash = "sha256-T3bgPZpDO6plgebLJDBtBuR2eR/bN3o24UAUv1VwgtI="; }; nativeBuildInputs = [ makeWrapper which ]; buildInputs = [ lwt_react camlzip findlib ]; - propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit hmap ipaddr lwt_log lwt_ssl + propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit ipaddr lwt_log lwt_ssl re xml-light ]; diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index ca04e6bcfe37c..0c25da1453abd 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -19,6 +19,7 @@ , uri , alcotest-lwt , cstruct +, httpaf }: buildDunePackage rec { @@ -43,6 +44,7 @@ buildDunePackage rec { tls cstruct tcpip + httpaf ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/piaf/default.nix b/pkgs/development/ocaml-modules/piaf/default.nix index cc964df9ffbd1..9c2e481b76e4d 100644 --- a/pkgs/development/ocaml-modules/piaf/default.nix +++ b/pkgs/development/ocaml-modules/piaf/default.nix @@ -1,50 +1,57 @@ -{ alcotest-lwt +{ alcotest , buildDunePackage -, ocaml -, dune-site , fetchurl -, gluten-lwt-unix +, eio-ssl +, faraday +, h2-eio +, httpun-eio +, httpun-ws +, ipaddr +, ke , lib , logs , magic-mime -, mrmime -, psq +, pecu +, prettym +, unstrctrd , uri +, uutf +, dune-site +, eio_main }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "piaf is not available for OCaml ${ocaml.version}" - buildDunePackage rec { pname = "piaf"; - version = "0.1.0"; - - duneVersion = "3"; + version = "0.2.0"; src = fetchurl { url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz"; - hash = "sha256-AMO+ptGox33Bi7u/H0SaeCU88XORrRU3UbLof3EwcmU="; + hash = "sha256-B/qQCaUvrqrm2GEW51AH9SebGFx7x8laq5RV8hBzcPs="; }; - postPatch = '' - substituteInPlace ./vendor/dune --replace "mrmime.prettym" "prettym" - ''; - propagatedBuildInputs = [ + eio-ssl + faraday + h2-eio + httpun-eio + httpun-ws + ipaddr logs magic-mime - mrmime - psq + pecu + prettym + unstrctrd uri - gluten-lwt-unix + uutf ]; - nativeCheckInputs = [ - alcotest-lwt + # Some test cases fail + doCheck = false; + checkInputs = [ + alcotest dune-site + eio_main ]; - # Check fails with OpenSSL 3 - doCheck = false; meta = { description = "HTTP library with HTTP/2 support written entirely in OCaml"; diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index 3de1013838912..62ac0769d6eb7 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -2,18 +2,18 @@ buildDunePackage rec { pname = "ppx_blob"; - version = "0.8.0"; + version = "0.9.0"; - duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz"; - sha256 = "sha256-drobFwMTKd/a3aP5CX/08WhvgS1CkARH6zo+nSiwl08="; + sha256 = "sha256-8RXpCl8Qdc7cnZMKuRJx+GcOzk3uENwRR6s5uK+1cOQ="; }; checkInputs = [ alcotest ]; propagatedBuildInputs = [ ppxlib ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = with lib; { homepage = "https://github.com/johnwhitington/ppx_blob"; diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix index 7ddbc1f5d5148..49d02693843c0 100644 --- a/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix +++ b/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "ppx_yojson_conv_lib"; - version = "0.16.0"; + version = "0.17.0"; minimalOCamlVersion = "4.02.3"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "janestreet"; repo = pname; rev = "v${version}"; - hash = "sha256-TOf6DKyvc+RsSWsLi//LXW+J0sd5uJtF/HFQllcL7No="; + hash = "sha256-XGgpcAEemBNEagblBjpK+BiL0OUsU2JPqOq+heHbqVk="; }; propagatedBuildInputs = [ yojson ]; diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index fe7e655ba60c3..56d9628ebfaf6 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -4,9 +4,7 @@ buildDunePackage rec { pname = "printbox"; version = "0.11"; - useDune2 = true; - - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "c-cube"; diff --git a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix index 84355d9160856..7f51f8235d487 100644 --- a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix +++ b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "qcheck-multicoretests-util"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "ocaml-multicore"; repo = "multicoretests"; rev = version; - hash = "sha256-0fbMDksC23jojJV+aegBoSwKf1hNzDUvDEbo31HUDoM="; + hash = "sha256-5UyQs99x2CWK9ncsRwdvA5iGhry9JnMs5nKoFSRHg3M="; }; propagatedBuildInputs = [ qcheck-core ]; diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix index 56f4f8f30323a..8e887d263657b 100644 --- a/pkgs/development/ocaml-modules/resto/default.nix +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "resto"; - version = "1.0"; + version = "1.2"; duneVersion = "3"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "resto"; rev = "v${version}"; - hash = "sha256-DIm7fmISsCgRDi4p3NsUk7Cvs/dHpIKMdAOVdYLX2mc="; + hash = "sha256-VdkYUy7Fi53ku6F/1FV55/VcyF/tDZKN4NTMabDd/T4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix index 87fb82adcbeb1..a3777f7d8aec8 100644 --- a/pkgs/development/ocaml-modules/sodium/default.nix +++ b/pkgs/development/ocaml-modules/sodium/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "strictoverflow"; meta = with lib; { homepage = "https://github.com/dsheets/ocaml-sodium"; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index cfd03493d3afd..e45961f403e12 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "sqlite3"; - version = "5.1.0"; + version = "5.2.0"; duneVersion = "3"; minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/${version}/sqlite3-${version}.tbz"; - hash = "sha256-uw23EWkajfok/insTstpEkRK2Q4PTER6+Jgx5tHf/qU="; + hash = "sha256-lCKDpFT0sh91F/Lovj06MFlHeceKawR49LcLjKfJjLs="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/terml/default.nix b/pkgs/development/ocaml-modules/terml/default.nix new file mode 100644 index 0000000000000..b70371e623fc2 --- /dev/null +++ b/pkgs/development/ocaml-modules/terml/default.nix @@ -0,0 +1,30 @@ +{ + buildDunePackage, + fetchFromGitHub, + lib, + uutf, +}: + +buildDunePackage rec { + pname = "terml"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "wllfaria"; + repo = "terml"; + rev = "${version}"; + hash = "sha256-2ifMfUaYYsCFOACgXgJ5IuoSEicHyIqumLpun2ZqcDc="; + }; + + propagatedBuildInputs = [ uutf ]; + + minimalOCamlVersion = "4.13"; + + meta = { + changelog = "https://github.com/wllfaria/terml/blob/${version}/CHANGES.md"; + description = "Terminal manipulation library in pure Ocaml"; + homepage = "https://github.com/wllfaria/terml"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.PhilVoel ]; + }; +} diff --git a/pkgs/development/ocaml-modules/tezt/default.nix b/pkgs/development/ocaml-modules/tezt/default.nix index afad07e779177..0dc05750896a2 100644 --- a/pkgs/development/ocaml-modules/tezt/default.nix +++ b/pkgs/development/ocaml-modules/tezt/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { pname = "tezt"; - version = "4.0.0"; + version = "4.1.0"; minimalOCamlVersion = "4.12"; @@ -17,7 +17,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = pname; rev = version; - hash = "sha256-waFjE/yR+XAJOew1YsCnbvsJR8oe9gflyVj4yXAvNuM="; + hash = "sha256-1Cl/GOB+MDPJIl/6600PLTSL+vCYcAZGjedd6hr7rJw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/timedesc/default.nix b/pkgs/development/ocaml-modules/timedesc/default.nix index b77f5af17b408..9acd69305bee8 100644 --- a/pkgs/development/ocaml-modules/timedesc/default.nix +++ b/pkgs/development/ocaml-modules/timedesc/default.nix @@ -10,11 +10,11 @@ buildDunePackage rec { pname = "timedesc"; - version = "2.0.0"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/daypack-dev/timere/releases/download/timedesc-${version}/timedesc-${version}.tar.gz"; - hash = "sha256-NnnQpWOE1mt/F5lkWRPdDwpqXCUlcNi+Z5GE6YQQLK8="; + hash = "sha256-nEachJymJC8TP/Ha2rOFU3n09rxVlIZYmgQnYiNCiHE="; }; sourceRoot = "."; diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index f24a4fe968197..83446cdf0e173 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -57,7 +57,7 @@ buildDunePackage rec { preBuild = "export LIBTORCH=${torch.dev}/"; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix index 888c88029d261..4e5aa3650b161 100644 --- a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { pname = "tsdl-mixer"; - version = "0.5"; + version = "0.6"; duneVersion = "3"; @@ -17,7 +17,7 @@ buildDunePackage rec { owner = "sanette"; repo = pname; rev = version; - hash = "sha256-HGtO5iO3lxuVa707MDIhw0pgDZLHt9qY+Rd24sFkags="; + hash = "sha256-szuGmLzgGyQExCQwpopVNswtZZdhP29Q1+uNQJZb43Q="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 2d35f76d5bf0d..1395a37c69d39 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; propagatedBuildInputs = [ SDL2 ctypes ctypes-foreign ] - ++ lib.optionals stdenv.isDarwin [ AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback ]; preConfigure = '' # The following is done to avoid an additional dependency (ncurses) diff --git a/pkgs/development/ocaml-modules/unisim_archisec/default.nix b/pkgs/development/ocaml-modules/unisim_archisec/default.nix index 8db9abd3630b5..f29ea64f4f101 100644 --- a/pkgs/development/ocaml-modules/unisim_archisec/default.nix +++ b/pkgs/development/ocaml-modules/unisim_archisec/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "unisim_archisec"; - version = "0.0.8"; + version = "0.0.9"; src = fetchurl { - url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.8/unisim_archisec-0.0.8.tbz"; - sha256 = "sha256-D8DumHaQnLsMaVHoUL7w8KgGRTh9Rk+22NNSa0a/qII="; + url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.9/unisim_archisec-0.0.9.tbz"; + sha256 = "sha256-K7nBQQvnsGUgzGMLGO71P9L1P43yDol3e17glI8y35E="; }; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 847868032ca1b..d350071304c0d 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "15.1.0"; + version = "16.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - hash = "sha256-HIANZ5SDJcytlpw/W9Ae2eFTutrutJj2PgJCfByobfI="; + hash = "sha256-VVGPG6ZjchUqo8xMCJRahqCCF5WheDBpK1stuts+orM="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 1703cac867f72..10b4cc4ff4e6d 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -2,7 +2,7 @@ let pname = "uucp"; - version = "15.1.0"; + version = "16.0.0"; webpage = "https://erratique.ch/software/${pname}"; minimalOCamlVersion = "4.03"; doCheck = true; @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - hash = "sha256-qR5LiAZHt4oD3ak0x17GqbYXNaJmJxFk/WGoxT+yWYc="; + hash = "sha256-5//UGI4u3OROYdxtwz9K2vCTzYiN16mOyEFhUQWtgEQ="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 2d473a4b83516..ae2d8d6c2987e 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, cmdliner , cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1" -, version ? if lib.versionAtLeast ocaml.version "4.14" then "15.1.0" else "15.0.0" +, version ? if lib.versionAtLeast ocaml.version "4.14" then "16.0.0" else "15.0.0" }: let @@ -8,7 +8,7 @@ let webpage = "https://erratique.ch/software/${pname}"; hash = { "15.0.0" = "sha256-B/prPAwfqS8ZPS3fyDDIzXWRbKofwOCyCfwvh9veuug="; - "15.1.0" = "sha256-D8yvb7hVWaYxMqMZ5089/5tWDfvyGXKUOjhfU/4zSeQ="; + "16.0.0" = "sha256-iQNkT1av6ONJXn3yWbNbEVV8lKGYOKh/nPU0tkUdX64="; }."${version}"; in @@ -31,7 +31,7 @@ stdenv.mkDerivation { strictDeps = true; - prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384"; + prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 "ulimit -s 16384"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 9a8cfa29491f2..44a58ab49a59c 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uucp, uutf, cmdliner -, version ? if lib.versionAtLeast ocaml.version "4.14" then "15.1.0" else "15.0.0" +, version ? if lib.versionAtLeast ocaml.version "4.14" then "16.0.0" else "15.0.0" , cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1" }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; hash = { - "15.1.0" = "sha256-IPI3Wd51HzX4n+uGcgc04us29jMjnKbGgVEAdp0CVMU="; + "16.0.0" = "sha256-WAP9uyofhtw6ag6/U4GQAanIFoKWvyA4NgeVweTs/iQ="; "15.0.0" = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM="; }."${version}"; }; diff --git a/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix index e1be60da8bd7e..51aae9b59b345 100644 --- a/pkgs/development/ocaml-modules/vchan/default.nix +++ b/pkgs/development/ocaml-modules/vchan/default.nix @@ -32,6 +32,6 @@ buildDunePackage rec { description = "Xen Vchan implementation"; homepage = "https://github.com/mirage/ocaml-vchan"; license = licenses.isc; - maintainers = [ maintainers.sternenseemann ]; + maintainers = teams.xen.members ++ [ maintainers.sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index 296597a6a6292..2955755ccb41c 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -25,10 +25,7 @@ buildDunePackage rec { meta = with lib; { description = "Xenstore protocol in pure OCaml"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ - sternenseemann - sigmasquadron - ]; + maintainers = teams.xen.members ++ [ maintainers.sternenseemann ]; homepage = "https://github.com/mirage/ocaml-xenstore"; }; } diff --git a/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/pkgs/development/ocaml-modules/xenstore_transport/default.nix index f0867b4ec314e..5ef03349e68a8 100644 --- a/pkgs/development/ocaml-modules/xenstore_transport/default.nix +++ b/pkgs/development/ocaml-modules/xenstore_transport/default.nix @@ -23,5 +23,6 @@ buildDunePackage rec { description = "Low-level libraries for connecting to a xenstore service on a xen host"; license = licenses.lgpl21Only; homepage = "https://github.com/xapi-project/ocaml-xenstore-clients"; + maintainers = teams.xen.members; }; } diff --git a/pkgs/development/ocaml-modules/zelus/default.nix b/pkgs/development/ocaml-modules/zelus/default.nix index 07d268d45de9a..4d52640d53bc5 100644 --- a/pkgs/development/ocaml-modules/zelus/default.nix +++ b/pkgs/development/ocaml-modules/zelus/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { }; # ./configure: cannot execute: required file not found - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' patchShebangs configure ''; diff --git a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix index 05f15cfb1519c..5d6a188bd77da 100644 --- a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix +++ b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix @@ -5,13 +5,13 @@ buildOctavePackage rec { pname = "fuzzy-logic-toolkit"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "lmarkowsky"; repo = "fuzzy-logic-toolkit"; rev = "refs/tags/${version}"; - sha256 = "sha256-veU+3DPFJ2IeGw5PkpxGO8Oo9qEyR890hs4IAzbfxls="; + sha256 = "sha256-lnYzX4rq3j7rrbD8m0EnrWpbMJD6tqtMVCYu4mlLFCM="; }; meta = with lib; { diff --git a/pkgs/development/octave-modules/gsl/default.nix b/pkgs/development/octave-modules/gsl/default.nix index e050f381a9148..2ce92f43d6181 100644 --- a/pkgs/development/octave-modules/gsl/default.nix +++ b/pkgs/development/octave-modules/gsl/default.nix @@ -25,6 +25,6 @@ buildOctavePackage rec { description = "Octave bindings to the GNU Scientific Library"; # error: use of undeclared identifier 'feval'; did you mean 'octave::feval'? # error: no member named 'is_real_type' in 'octave_value' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/octave-modules/image-acquisition/default.nix b/pkgs/development/octave-modules/image-acquisition/default.nix index e1410fd8368f5..69f7c1a60a546 100644 --- a/pkgs/development/octave-modules/image-acquisition/default.nix +++ b/pkgs/development/octave-modules/image-acquisition/default.nix @@ -7,18 +7,21 @@ buildOctavePackage rec { pname = "image-acquisition"; - version = "0.2.2"; + version = "0.2.6"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "1amp6npkddnnz2i5rm6gvn65qrbn0nxzl2cja3dvc2xqg396wrhh"; + sha256 = "sha256-Uehwk68GZ/M4WL5M3GF++mCPUg3M08Y0gkdO36/yhNI="; }; buildInputs = [ - libv4l fltk ]; + propagatedBuildInputs = [ + libv4l + ]; + meta = with lib; { homepage = "https://octave.sourceforge.io/image-acquisition/index.html"; license = licenses.gpl3Plus; @@ -28,7 +31,5 @@ buildOctavePackage rec { The Octave-forge Image Aquisition package provides functions to capture images from connected devices. Currently only v4l2 is supported. ''; - # Got broke with octave 8.x update, and wasn't updated since 2015 - broken = true; }; } diff --git a/pkgs/development/octave-modules/ocl/default.nix b/pkgs/development/octave-modules/ocl/default.nix index eb20f7dc7c771..72242d165543e 100644 --- a/pkgs/development/octave-modules/ocl/default.nix +++ b/pkgs/development/octave-modules/ocl/default.nix @@ -24,6 +24,6 @@ buildOctavePackage rec { using available OpenCL hardware and drivers. ''; # error: structure has no member 'dir' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/octave-modules/signal/default.nix b/pkgs/development/octave-modules/signal/default.nix index 0c4c2d9c6e235..1693d8360628d 100644 --- a/pkgs/development/octave-modules/signal/default.nix +++ b/pkgs/development/octave-modules/signal/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "signal"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-VVreL/gPcRiQk5XDNAXwoXpPvNIrxtL7nD9/Rf72SOc="; + sha256 = "sha256-lO74/qeMiWCfjd9tX/i/wuDauTK0P4bOkRR0pYtcce4="; }; requiredOctavePackages = [ diff --git a/pkgs/development/octave-modules/strings/default.nix b/pkgs/development/octave-modules/strings/default.nix index 35887d2495765..fbf7aec786afc 100644 --- a/pkgs/development/octave-modules/strings/default.nix +++ b/pkgs/development/octave-modules/strings/default.nix @@ -40,6 +40,6 @@ buildOctavePackage rec { maintainers = with maintainers; [ KarlJoad ]; description = "Additional functions for manipulation and analysis of strings"; # Some pcre symbols claimed to be missing - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix index 08d207e3bbac1..46efb33f23ca2 100644 --- a/pkgs/development/perl-modules/ImageExifTool/default.nix +++ b/pkgs/development/perl-modules/ImageExifTool/default.nix @@ -18,9 +18,9 @@ buildPerlPackage rec { hash = "sha256-sfSnx5bS7vI0KIhBOpB5VYzP6g8oi0rR7mUTxxNWEA0="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/exiftool ''; diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index cba9ef9863624..0669f5b7c7af8 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -22,14 +22,14 @@ buildPerlPackage rec { sha256 = "9Z4fv2B0AnwtYsp7h9phnRMmHtBOMObIJvK8DmKQRxs="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ LWP LWPProtocolHttps DataDump JSON ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/youtube-viewer ''; diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 4da9f7a982128..f87bb2b9e177b 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -23,7 +23,10 @@ preConfigure() { fi done - perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" + local flagsArray=() + concatTo flagsArray makeMakerFlags + + perl Makefile.PL PREFIX=$out INSTALLDIRS=site "${flagsArray[@]}" PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" } if test -n "$perlPreHook"; then diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index e50d61b878980..fe6328ea39462 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -24,7 +24,7 @@ buildPerlPackage rec { }; strictDeps = true; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; buildInputs = [ ArchiveZip ArchiveCpio @@ -45,7 +45,7 @@ buildPerlPackage rec { # we don’t need the debhelper script rm $out/bin/dh_strip_nondeterminism rm $out/share/man/man1/dh_strip_nondeterminism.1 - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/strip-nondeterminism ''; @@ -56,7 +56,7 @@ buildPerlPackage rec { ''; # running shortenPerlShebang in postBuild results in non-functioning binary 'exec format error' - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; doInstallCheck = true; meta = with lib; { diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 150d069ca67c7..f8838ba834751 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer"; - version = "2.7.7"; + version = "2.7.9"; # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to # use together with the version from this package to keep the # bootstrap phar file up-to-date together with the end user composer # package. - passthru.pharHash = "sha256-qrlAzVPShaVMUEZYIKIID8txgqS6Hl95Wr+xBBSktL4="; + passthru.pharHash = "sha256-tt5eZcGZ2AuhGJf74TZOBj6FjUg/aoGhdsTWDysdY0c="; composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { inherit (finalAttrs) version; @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "composer"; repo = "composer"; rev = finalAttrs.version; - hash = "sha256-N8el4oyz3ZGIXN2qmpf6Df0SIjuc1GjyuMuQCcR/xN4="; + hash = "sha256-aVD3hB7a/Ji1sEsfo0EQ7SDBqjVg6+FRi1dpO94VtZs="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -86,7 +86,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-AsuiTDXJs7jN4N/dJr10BT2PH0f6K2CWDvI8zQW5L9c="; + outputHash = "sha256-iNx7AXNsfiDeEaGYKVi+kzzPpMeg+R18WYquful5E0o="; }; installPhase = '' diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 15b16582435dd..3cc5732adca77 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -38,11 +38,11 @@ buildPecl rec { cargo rustc ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ rustPlatform.bindgenHook rustPlatform.cargoSetupHook ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.rustPlatform.bindgenHook darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook ]; @@ -52,7 +52,7 @@ buildPecl rec { curl pcre2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security libiconv diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 95b2929abca08..edb6d900c99a2 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -16,13 +16,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.19.3"; + version = "1.20.0"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-gpnL4mXOD/MDG7xWxUpLLKfRD2w6HqNokC5358OkFSg="; + hash = "sha256-+Q/z5xrhiKTh2hVT6sdpI6sY6E7MTtTJQZBGASy5tAU="; fetchSubmodules = true; }; @@ -36,7 +36,7 @@ buildPecl rec { zlib pcre2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security darwin.apple_sdk_11_0.Libsystem libiconv diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index 83c59fb3212c3..b250db4a30038 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -21,7 +21,7 @@ buildPecl { hash = "sha256-Z26E1PdKypB/MImCHFgA3rJW5LvVaLZsQUxRv0RcFuo="; }; - buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; + buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ]; meta = with lib; { changelog = "https://github.com/openswoole/swoole-src/releases/tag/v${version}"; diff --git a/pkgs/development/php-packages/opentelemetry/default.nix b/pkgs/development/php-packages/opentelemetry/default.nix index 044e180607086..8ce92a6781f15 100644 --- a/pkgs/development/php-packages/opentelemetry/default.nix +++ b/pkgs/development/php-packages/opentelemetry/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.0.3"; + version = "1.1.0"; in buildPecl rec { inherit version; @@ -15,7 +15,7 @@ buildPecl rec { owner = "open-telemetry"; repo = "opentelemetry-php-instrumentation"; rev = version; - hash = "sha256-KqLbKnAHxXbldNYVN7eMQ7NdZmPecu0UKHQdlUm7Ur0="; + hash = "sha256-X3rGzKDI16W21O9BaCuvVCreuce6is+URFSa1FNcznM="; }; sourceRoot = "${src.name}/ext"; diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix index 1ee88135b3b13..02af71c12e6e7 100644 --- a/pkgs/development/php-packages/pcov/default.nix +++ b/pkgs/development/php-packages/pcov/default.nix @@ -4,6 +4,7 @@ php, pcre2, fetchFromGitHub, + fetchpatch, }: let @@ -22,6 +23,14 @@ buildPecl { buildInputs = [ pcre2 ]; + patches = [ + # Allow building for PHP 8.4 + (fetchpatch { + url = "https://github.com/krakjoe/pcov/commit/7d764c7c2555e8287351961d72be3ebec4d8743f.patch"; + sha256 = "sha256-5wIHrrCwUXQpPdUg+3Kwyop5yvOzQQ3qc4pQXU8q2OM="; + }) + ]; + meta = with lib; { changelog = "https://github.com/krakjoe/pcov/releases/tag/v${version}"; description = "Self contained php-code-coverage compatible driver for PHP"; diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index 7da343ac55649..1b61f74d4094e 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -15,7 +15,7 @@ buildPecl { internalDeps = [ php.extensions.pdo ]; - buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ unixODBC ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { description = "Microsoft Drivers for PHP for SQL Server"; diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index 56d826cb4b948..4a3f21a08a904 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -77,8 +77,8 @@ stdenv.mkDerivation (finalAttrs: { system = stdenv.hostPlatform.system; phpMajor = lib.versions.majorMinor php.version; }; - nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ autoPatchelfHook ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl zstd lz4 @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { chmod +w $out/lib/php/extensions/relay.so '' + ( - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then let args = lib.strings.concatMapStrings diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix index aa5faa665afb5..8a2e5a45f7f17 100644 --- a/pkgs/development/php-packages/snuffleupagus/default.nix +++ b/pkgs/development/php-packages/snuffleupagus/default.nix @@ -11,18 +11,18 @@ buildPecl rec { pname = "snuffleupagus"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "jvoisin"; repo = "snuffleupagus"; rev = "v${version}"; - hash = "sha256-NwG8gBaToBaJGrZoCD7bDym7hQidWU0ArckoQCHN81o="; + hash = "sha256-W+EQXjvmDHih5YW/SjRcEdUELePUPKrNWB8vW9dLK/g="; }; buildInputs = [ pcre2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreFoundation darwin.apple_sdk_11_0.Libsystem libiconv diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix index caab4d59335a8..d861eab67a0b5 100644 --- a/pkgs/development/php-packages/spx/default.nix +++ b/pkgs/development/php-packages/spx/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.4.16"; + version = "0.4.17"; in buildPecl { inherit version; @@ -16,7 +16,7 @@ buildPecl { owner = "NoiseByNorthwest"; repo = "php-spx"; rev = "v${version}"; - hash = "sha256-1HOLMbCuV1bxi4DV26QOhi93VsBF3NJymk4SMn2ze4g="; + hash = "sha256-MH/0G9KKmwcVsJKpe6uE1xjvykBEWuYU0DIOGfXiLAw="; }; configureFlags = [ "--with-zlib-dir=${zlib.dev}" ]; diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix index 303f2327d1e55..08c59275c8488 100644 --- a/pkgs/development/php-packages/sqlsrv/default.nix +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -12,7 +12,7 @@ buildPecl { version = "5.10.1"; sha256 = "sha256-XNrttNiihjQ+azuZmS2fy0So+2ndAqpde8IOsupeWdI="; - buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ unixODBC ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { description = "Microsoft Drivers for PHP for SQL Server"; diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index f519522a83578..6cc399be10dc3 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -22,7 +22,7 @@ buildPecl { hash = "sha256-WTsntvauiooj081mOoFcK6CVpnCCR/cEQtJbsOIJ/wo="; }; - buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; + buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ]; # tests require internet access doCheck = false; diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 72d309cd32980..c4807df9a90ca 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { tqdm unicrypto winsspi - ] ++ lib.optionals (stdenv.isDarwin) [ iconv ]; + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ iconv ]; # Module doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index f6d97b8eef72c..a809c48b73133 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -4,35 +4,40 @@ buildPythonPackage, fetchFromGitHub, pythonAtLeast, - pythonOlder, + + # buildInputs llvmPackages, - pytest7CheckHook, + + # build-system setuptools, + + # dependencies numpy, packaging, psutil, pyyaml, safetensors, torch, - config, - cudatoolkit, + + # tests evaluate, parameterized, + pytest7CheckHook, transformers, + config, + cudatoolkit, }: buildPythonPackage rec { pname = "accelerate"; - version = "0.33.0"; + version = "0.34.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "huggingface"; repo = "accelerate"; rev = "refs/tags/v${version}"; - hash = "sha256-SYhAYz180jdOUhzbe0iUFBuGRv4n4PmgfCVOEOZKBGA="; + hash = "sha256-4kDNLta6gGev16A4hNOArTpoD8p6LMRwqwHS/DZjtz0="; }; buildInputs = [ llvmPackages.openmp ]; @@ -91,7 +96,7 @@ buildPythonPackage rec { "test_dynamo_extract_model" "test_send_to_device_compiles" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "CheckpointTest" # TypeError: unsupported operand type(s) for /: 'NoneType' and 'int' (it seems cpuinfo doesn't work here) @@ -101,12 +106,20 @@ buildPythonPackage rec { # requires ptxas from cudatoolkit, which is unfree "test_dynamo_extract_model" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + # RuntimeError: 'accelerate-launch /nix/store/a7vhm7b74a7bmxc35j26s9iy1zfaqjs... + "test_accelerate_test" + "test_init_trackers" + "test_init_trackers" + "test_log" + "test_log_with_tensor" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # RuntimeError: torch_shm_manager: execl failed: Permission denied "CheckpointTest" ]; - disabledTestPaths = lib.optionals (!(stdenv.isLinux && stdenv.isx86_64)) [ + disabledTestPaths = lib.optionals (!(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64)) [ # numerous instances of torch.multiprocessing.spawn.ProcessRaisedException: "tests/test_cpu.py" "tests/test_grad_sync.py" @@ -118,12 +131,12 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { homepage = "https://huggingface.co/docs/accelerate"; description = "Simple way to train and use PyTorch models with multi-GPU, TPU, mixed-precision"; changelog = "https://github.com/huggingface/accelerate/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; mainProgram = "accelerate"; }; } diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index f8f9897a6b3af..35d39fed9a6f4 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. - env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; # performance tests aren't useful to us and disabling them allows us to # decouple ourselves from an unnecessary build dep diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index d8ac033eca285..2157e0fc7b206 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.15"; + version = "3.16"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-+bA/6CW/1k9JfkXBk/JKXgOlrVHcMcKggzOAHyjdkX0="; + hash = "sha256-wurnYHvzN5KfpikempYeztR9hkvGfRjR6M3tch6qFo4="; }; build-system = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { dissect-target ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ dissect-target minio @@ -52,7 +52,7 @@ buildPythonPackage rec { ] ++ dissect-target.optional-dependencies.full; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; pythonImportsCheck = [ "acquire" ]; diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix index 3177c78047669..e0f1122a464e1 100644 --- a/pkgs/development/python-modules/adafruit-io/default.nix +++ b/pkgs/development/python-modules/adafruit-io/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "adafruit-io"; - version = "2.7.2"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "adafruit"; repo = "Adafruit_IO_Python"; rev = "refs/tags/${version}"; - hash = "sha256-JBpF08WGe1pMK1y7HZLH/jSQkJtbWdiTGYHWRd39UIk="; + hash = "sha256-OwTHMyc2ePSdYVuY1h3PY+uDBl6/7fTMXiZC3sZm8fU="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 2614a9925fd8c..5f433ee5bfc39 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.73.0"; + version = "3.74.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-IwkJityP+Hs9mkpdOu6+P3t/VasOE9Get1/6hl82+rg="; + hash = "sha256-rVmtqpVjQgovAsVCu3+hgglga9LJPGT8zzlhySmpba8="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index a7347c080d787..b37440c51c8b8 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { rsa ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles async-timeout @@ -46,7 +46,7 @@ buildPythonPackage rec { mock pycryptodome pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "adb_shell" ]; diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 7faeab491f628..67170159f348e 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreFoundation Security diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index a7e5ee1436673..385ec7ed52595 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -108,6 +108,6 @@ buildPythonPackage rec { changelog = "https://github.com/aesara-devs/aesara/releases/tag/rel-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ Etjean ]; - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/python-modules/ahocorasick-rs/default.nix b/pkgs/development/python-modules/ahocorasick-rs/default.nix index 3ad7ebbc44bd4..63c849e3537b3 100644 --- a/pkgs/development/python-modules/ahocorasick-rs/default.nix +++ b/pkgs/development/python-modules/ahocorasick-rs/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, rustPlatform, - typing-extensions, pytestCheckHook, pyahocorasick, hypothesis, @@ -19,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "ahocorasick_rs"; - sha256 = "sha256-lzRwODlJlymMSih3CqNIeR+HrUbgVhroM1JuHFfW848="; + hash = "sha256-lzRwODlJlymMSih3CqNIeR+HrUbgVhroM1JuHFfW848="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -31,7 +30,6 @@ buildPythonPackage rec { nativeBuildInputs = with rustPlatform; [ maturinBuildHook cargoSetupHook - typing-extensions ]; nativeCheckInputs = [ @@ -46,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast Aho-Corasick algorithm for Python"; homepage = "https://github.com/G-Research/ahocorasick_rs/"; + changelog = "https://github.com/G-Research/ahocorasick_rs/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ erictapen ]; }; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 0843f83380767..25ed8e73ec101 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.117"; + version = "9.2.119"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-OYbLaMtelNxohrOfb4A9NC9Zado+0qvm3i2zgkgt6p4="; + hash = "sha256-mVzgwCzCba4xNJMbrDTRRHFUQ48tKihm3VGqpFq6Heo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aio-georss-client/default.nix b/pkgs/development/python-modules/aio-georss-client/default.nix index 8aea98efa5a4d..7bdf88b7654a6 100644 --- a/pkgs/development/python-modules/aio-georss-client/default.nix +++ b/pkgs/development/python-modules/aio-georss-client/default.nix @@ -17,23 +17,23 @@ buildPythonPackage rec { pname = "aio-georss-client"; - version = "0.12"; + version = "0.13"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-client"; rev = "refs/tags/v${version}"; - hash = "sha256-qs0/TkGZlwsucnkgCBco2Pqr9mf5fZHY7ikMBKff+gA="; + hash = "sha256-2qo5G/L2yh/6IXswkOyrCYnBNLDLx3EOpR53lnnpNOo="; }; __darwinAllowLocalNetworking = true; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp haversine xmltodict diff --git a/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/pkgs/development/python-modules/aio-georss-gdacs/default.nix index 457f4bca26ec9..c0741c8ff67cd 100644 --- a/pkgs/development/python-modules/aio-georss-gdacs/default.nix +++ b/pkgs/development/python-modules/aio-georss-gdacs/default.nix @@ -3,35 +3,35 @@ aio-georss-client, aioresponses, buildPythonPackage, - dateparser, fetchFromGitHub, pytest-asyncio, pytestCheckHook, + python-dateutil, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "aio-georss-gdacs"; - version = "0.9"; + version = "0.10"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-gdacs"; rev = "refs/tags/v${version}"; - hash = "sha256-B0qVCh2u0WleF0iv0o1/d5UIS2kbYCAqCgmNHyCpJ8Q="; + hash = "sha256-PhOI0v3dKTNGZLk1/5wIgvQkm4Cwfr1UYilr5rW7e3g="; }; __darwinAllowLocalNetworking = true; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aio-georss-client - dateparser + python-dateutil ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 4f25e486dd931..06964c3c9cb93 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.6.2"; + version = "0.6.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-ByXSLfcUyj8i6t5guHnJedZrevGm71ad19vA/CxwTJ4="; + hash = "sha256-+F1kcs3XBBRNSmiuobFIFHsZOHEFjwYq0oxkHViuWXw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 6df7d3bf140af..34bdc5b65dd16 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.8.2"; + version = "0.9.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,12 +18,12 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; rev = "refs/tags/${version}"; - hash = "sha256-v/fLWsaVxgKa70X6Lac4ieVU3l3jhIWphWDtLPUZwlA="; + hash = "sha256-ThmHiZmXbpzTJ0JBm6gVsxZgmdzRqQfjNrJSFbwOIdU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; # Module has no tests doCheck = false; @@ -34,7 +34,7 @@ buildPythonPackage rec { description = "Module to control AirZone devices"; homepage = "https://github.com/Noltari/aioairzone"; changelog = "https://github.com/Noltari/aioairzone/releases/tag/${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix index 54ab5e62bcf32..15822fe46e53c 100644 --- a/pkgs/development/python-modules/aioaseko/default.nix +++ b/pkgs/development/python-modules/aioaseko/default.nix @@ -1,32 +1,34 @@ { lib, aiohttp, + apischema, buildPythonPackage, fetchFromGitHub, + gql, pythonOlder, setuptools, - pyjwt, }: buildPythonPackage rec { pname = "aioaseko"; - version = "0.2.0"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "milanmeu"; - repo = pname; + repo = "aioaseko"; rev = "refs/tags/v${version}"; - hash = "sha256-X2H+5roq5yNXET23Q3QNmYmG1oAFfvuvSsInsJi42/s="; + hash = "sha256-jUvpu/lOFKRUwEuYD1zRp0oODjf4AgH84fnGngtv9jw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp - pyjwt + apischema + gql ]; # Module has no tests @@ -38,7 +40,7 @@ buildPythonPackage rec { description = "Module to interact with the Aseko Pool Live API"; homepage = "https://github.com/milanmeu/aioaseko"; changelog = "https://github.com/milanmeu/aioaseko/releases/tag/v${version}"; - license = with licenses; [ lgpl3Plus ]; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 39fe9d62672b3..675657c7be255 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.7.3"; + version = "2024.9.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-tjdpQglhg78DsmtIHo5QDsP1U8f0fnaasF0IYUtrGh4="; + hash = "sha256-2jPQcMD05SUYnBwAaWHbGKXy7Du2JKPVq3eui9YaqxI="; }; postPatch = '' @@ -58,6 +58,8 @@ buildPythonPackage rec { disabledTests = [ # File is missing "test_standard_mower" + # Call no found + "test_post_commands" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix index 9ecfe8e17ec21..70be2375adf97 100644 --- a/pkgs/development/python-modules/aioazuredevops/default.nix +++ b/pkgs/development/python-modules/aioazuredevops/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aioazuredevops"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = "aioazuredevops"; rev = "refs/tags/${version}"; - hash = "sha256-1v58I9WOyyrp9n+qdvVeMZ3EObqP/06XCOZYS0nEvPU="; + hash = "sha256-RZBiFPzYtEoc51T3irVHL9xVlZgACyM2lu1TkMoatqU="; }; postPatch = '' @@ -58,6 +58,15 @@ buildPythonPackage rec { syrupy ]; + disabledTests = [ + # https://github.com/timmo001/aioazuredevops/issues/44 + "test_get_project" + "test_get_builds" + "test_get_build" + ]; + + pytestFlagsArray = [ "--snapshot-update" ]; + pythonImportsCheck = [ "aioazuredevops" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 75fa1cc5b5dc8..40a5adfd3c237 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { awscli = [ awscli ]; boto3 = [ boto3 ]; }; diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 54a2bfb88ef78..d1e87d08deaac 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -7,33 +7,29 @@ marshmallow, msgpack, pkgs, - pythonOlder, pytest-asyncio, + pytest-cov-stub, pytest-mock, pytestCheckHook, + pythonOlder, redis, setuptools, }: buildPythonPackage rec { pname = "aiocache"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiocache"; rev = "refs/tags/v${version}"; - hash = "sha256-yvXDNJL8uxReaU81klVWudJwh1hmvg5GeeILcNpm/YA="; + hash = "sha256-4QYCRXMWlt9fsiWgUTc2pKzXG7AG/zGmd4HT5ggIZNM="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=aiocache --cov=tests/ --cov-report term" "" - ''; - build-system = [ setuptools ]; optional-dependencies = { @@ -46,6 +42,7 @@ buildPythonPackage rec { aiohttp marshmallow pytest-asyncio + pytest-cov-stub pytest-mock pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index 51a73cc4ecbf0..00592ed89516f 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { oscore = [ cbor2 cryptography diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index da4efbbdbb389..b374d2e519309 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -18,7 +18,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.7.1"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,21 +27,21 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = "aioconsole"; rev = "refs/tags/v${version}"; - hash = "sha256-c8zeKebS04bZS9pMIKAauaLPvRrWaGoDKbnF906tFzQ="; + hash = "sha256-gexVeMlDRxZXcBi/iIYPip0DZIKvxCxKmTd+9jm0ud8="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail " --cov aioconsole --strict-markers --count 2 -vv" "" + ''; + + build-system = [ setuptools ]; nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov aioconsole --count 2" "" - ''; - __darwinAllowLocalNetworking = true; disabledTests = [ @@ -53,11 +53,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "aioconsole" ]; meta = with lib; { - changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${version}"; description = "Asynchronous console and interfaces for asyncio"; - mainProgram = "apython"; + changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${version}"; homepage = "https://github.com/vxgmichel/aioconsole"; license = licenses.gpl3Only; maintainers = with maintainers; [ catern ]; + mainProgram = "apython"; }; } diff --git a/pkgs/development/python-modules/aiodukeenergy/default.nix b/pkgs/development/python-modules/aiodukeenergy/default.nix new file mode 100644 index 0000000000000..01e0fa7cae1af --- /dev/null +++ b/pkgs/development/python-modules/aiodukeenergy/default.nix @@ -0,0 +1,49 @@ +{ + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + lib, + poetry-core, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + yarl, +}: + +buildPythonPackage rec { + pname = "aiodukeenergy"; + version = "0.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hunterjm"; + repo = "aiodukeenergy"; + rev = "refs/tags/v${version}"; + hash = "sha256-aDBleEp3ZlY1IfFCbsUEU+wzYgjNaJeip8crHlh5qHE="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + yarl + ]; + + pythonImportsCheck = [ "aiodukeenergy" ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/hunterjm/aiodukeenergy/blob/${src.rev}/CHANGELOG.md"; + description = "Asyncio Duke Energy"; + homepage = "https://github.com/hunterjm/aiodukeenergy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 074a1025c4585..4d6f597fb2a9f 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "25.3.1"; + version = "27.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-3srw745rEDS8G4270kHPGjOr4Tnbrt5EMO/B/cb03Vs="; + hash = "sha256-2FA0QleMJG69vhyC85tO4ZAY0U8qPIdyJROHKxC35GM="; }; build-system = [ diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index dd9e903a4369c..a80581bc30883 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_sendfile_file" # require loopback networking: diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index bd448f41c8499..a926f96b8d125 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ siosocks ]; - passthru.optional-dependencies = { + optional-dependencies = { socks = [ siosocks ]; }; @@ -42,9 +42,9 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trustme - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # uses 127.0.0.2, which macos doesn't like "test_pasv_connection_pasv_forced_response_address" ]; diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index c3b073ba84399..9c0021c0a7239 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -1,8 +1,9 @@ { lib, + aiodns, aiofiles, - aiohttp, aiohttp-socks, + aiohttp, aresponses, babel, buildPythonPackage, @@ -22,11 +23,12 @@ pythonOlder, pytz, redis, + uvloop, }: buildPythonPackage rec { pname = "aiogram"; - version = "3.12.0"; + version = "3.13.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,36 +37,42 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; rev = "refs/tags/v${version}"; - hash = "sha256-5W7GuWZsUjTwjgKnNs7j4wZhOME1Giz757cM3sKuSQY="; + hash = "sha256-uTFh1ncIPF9SmAEVGeBnXEKrYzgifZan1sxk5UiG92U="; }; build-system = [ hatchling ]; - - pythonRelaxDeps = [ "pydantic" ]; - dependencies = [ aiofiles aiohttp - babel certifi magic-filter pydantic ]; + optional-dependencies = { + fast = [ + aiodns + uvloop + ]; + mongo = [ + motor + pymongo + ]; + redis = [ redis ]; + proxy = [ aiohttp-socks ]; + i18n = [ babel ]; + }; + nativeCheckInputs = [ - aiohttp-socks aresponses - motor pycryptodomex - pymongo pytest-aiohttp pytest-asyncio pytest-lazy-fixture pytestCheckHook pytz - redis - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ "-W" @@ -79,6 +87,8 @@ buildPythonPackage rec { passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Modern and fully asynchronous framework for Telegram Bot API"; homepage = "https://github.com/aiogram/aiogram"; diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix new file mode 100644 index 0000000000000..969e72889da69 --- /dev/null +++ b/pkgs/development/python-modules/aiohasupervisor/default.nix @@ -0,0 +1,64 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchPypi, + mashumaro, + orjson, + pytest-aiohttp, + pytest-cov-stub, + pytest-timeout, + pytestCheckHook, + pythonOlder, + setuptools, + yarl, +}: + +buildPythonPackage rec { + pname = "aiohasupervisor"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.12"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Jq9cSdMMXVgRHhQK1LuGwVR6GBTIrw3th7y9huRSQjM="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools~=68.0.0" "setuptools>=68.0.0" \ + --replace-fail "wheel~=0.40.0" "wheel>=0.40.0" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + mashumaro + orjson + yarl + ]; + + nativeCheckInputs = [ + aioresponses + pytest-aiohttp + pytest-cov-stub + pytest-timeout + pytestCheckHook + ]; + + # Import issue, check with next release + doCheck = false; + + pythonImportsCheck = [ "aiohasupervisor" ]; + + meta = { + description = "Client for Home Assistant Supervisor"; + homepage = "https://github.com/home-assistant-libs/python-supervisor-client"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp-basicauth/default.nix b/pkgs/development/python-modules/aiohttp-basicauth/default.nix index ee3e5483a1e48..eede039d4854f 100644 --- a/pkgs/development/python-modules/aiohttp-basicauth/default.nix +++ b/pkgs/development/python-modules/aiohttp-basicauth/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohttp-basicauth"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "romis2012"; repo = "aiohttp-basicauth"; - rev = "v${version}"; - hash = "sha256-UaRzauHmBHYwXFqRwDn1py79BScqq5j5SWALM4dQBP4="; + rev = "refs/tags/v${version}"; + hash = "sha256-DjwrMlkVVceA5kDzm0c/on0VMOxyMMA3Hu4Y2Tiu0lI="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix index 72ae35816ecb2..6f31169384653 100644 --- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix +++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix @@ -1,32 +1,87 @@ { lib, - fetchPypi, - buildPythonPackage, - poetry-core, + aioboto3, + aiobotocore, + aiofiles, aiohttp, + aiosqlite, attrs, + buildPythonPackage, + faker, + fetchPypi, itsdangerous, + motor, + poetry-core, + pytest-aiohttp, + pytestCheckHook, + pythonOlder, + redis, url-normalize, }: buildPythonPackage rec { - pname = "aiohttp_client_cache"; - version = "0.11.0"; + pname = "aiohttp-client-cache"; + version = "0.11.1"; pyproject = true; + + disabled = pythonOlder "3.8"; + src = fetchPypi { - inherit pname version; - hash = "sha256-B2b/9O2gVJjHUlN0pYeBDcwsy3slaAnd5SroeQqEU+s="; + pname = "aiohttp_client_cache"; + inherit version; + hash = "sha256-MuY60hAkD4Ik8+Encv5TrBAs8kx88Y3bhqy7n9+eS28="; }; - nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp attrs itsdangerous url-normalize ]; + + optional-dependencies = { + all = [ + aioboto3 + aiobotocore + aiofiles + aiosqlite + motor + redis + ]; + dynamodb = [ + aioboto3 + aiobotocore + ]; + filesystem = [ + aiofiles + aiosqlite + ]; + mongodb = [ motor ]; + redis = [ redis ]; + sqlite = [ aiosqlite ]; + }; + + nativeCheckInputs = [ + faker + pytest-aiohttp + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + pythonImportsCheck = [ "aiohttp_client_cache" ]; + + disabledTestPaths = [ + # Tests require running instances of the services + "test/integration/test_dynamodb.py" + "test/integration/test_redis.py" + "test/integration/test_sqlite.py" + ]; + meta = with lib; { description = "Async persistent cache for aiohttp requests"; - homepage = "https://pypi.org/project/aiohttp-client-cache/"; + homepage = "https://github.com/requests-cache/aiohttp-client-cache"; + changelog = "https://github.com/requests-cache/aiohttp-client-cache/blob/v${version}/HISTORY.md"; license = licenses.mit; maintainers = with maintainers; [ seirl ]; }; diff --git a/pkgs/development/python-modules/aiohttp-session/default.nix b/pkgs/development/python-modules/aiohttp-session/default.nix index d526349721651..78d044573bcdf 100644 --- a/pkgs/development/python-modules/aiohttp-session/default.nix +++ b/pkgs/development/python-modules/aiohttp-session/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "aiohttp-session"; - version = "2.12.0"; + version = "2.12.1"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp-session"; - rev = "v${version}"; - hash = "sha256-7MNah4OIQnoxLoZkLOdeu5uCwSyPMhc6Wsht8dFconc="; + rev = "refs/tags/v${version}"; + hash = "sha256-mGWtHo/+jdCmv3TmUUv42hWSiLzPiP5ytB25pVyvZig="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiohttp-sse-client2/default.nix b/pkgs/development/python-modules/aiohttp-sse-client2/default.nix new file mode 100644 index 0000000000000..f4d3709a3d910 --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-sse-client2/default.nix @@ -0,0 +1,57 @@ +{ + aiohttp, + attrs, + buildPythonPackage, + fetchFromGitHub, + lib, + multidict, + pytest-aiohttp, + pytestCheckHook, + setuptools, + yarl, +}: + +buildPythonPackage rec { + pname = "aiohttp-sse-client2"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "compat-fork"; + repo = "aiohttp-sse-client"; + rev = "refs/tags/${version}"; + hash = "sha256-uF39gpOYzNotVVYQShUoiuvYAhSRex2T1NfuhgwSCR4="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "pytest-runner" "" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + attrs + multidict + yarl + ]; + + pythonImportsCheck = [ "aiohttp_sse_client2" ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + # tests access the internet + doCheck = false; + + meta = { + changelog = "https://github.com/compat-fork/aiohttp-sse-client/blob/${src.rev}/README.rst#fork-changelog"; + description = "Server-Sent Event python client library based on aiohttp"; + homepage = "https://github.com/compat-fork/aiohttp-sse-client"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index c96f0b1384e7a..576ea16a39f82 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -5,12 +5,16 @@ pythonOlder, fetchFromGitHub, substituteAll, - llhttp, python, - # build_requires + + # build-system cython, setuptools, - # install_requires + + # native dependencies + llhttp, + + # dependencies aiohappyeyeballs, attrs, multidict, @@ -20,12 +24,14 @@ aiosignal, aiodns, brotli, - # tests_require + + # tests freezegun, gunicorn, proxy-py, + pytest-cov-stub, pytest-mock, - pytest7CheckHook, + pytestCheckHook, python-on-whales, re-assert, trustme, @@ -33,7 +39,7 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.10.3"; + version = "3.10.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +48,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiohttp"; rev = "refs/tags/v${version}"; - hash = "sha256-3dWd/IcCiPI3Ral6ULEUzOEOLkcdWVreDn7EI6eEy2k="; + hash = "sha256-HN2TJ8hVbClakV3ldTOn3wbrhCuf2Qn9EjWCSlSyJpw="; }; patches = [ @@ -54,8 +60,6 @@ buildPythonPackage rec { ]; postPatch = '' - sed -i '/--cov/d' setup.cfg - rm -r vendor patchShebangs tools touch .git # tools/gen.py uses .git to find the project root @@ -92,8 +96,9 @@ buildPythonPackage rec { freezegun gunicorn proxy-py + pytest-cov-stub pytest-mock - pytest7CheckHook + pytestCheckHook python-on-whales re-assert trustme @@ -108,8 +113,8 @@ buildPythonPackage rec { # don't run benchmarks "test_import_time" ] - ++ lib.optionals stdenv.is32bit [ "test_cookiejar" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.is32bit [ "test_cookiejar" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0 "test_close" ]; @@ -124,7 +129,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Work around "OSError: AF_UNIX path too long" export TMPDIR="/tmp" ''; diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index 6d59d99d14c8a..879d1d5c6b529 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -16,19 +16,19 @@ buildPythonPackage rec { pname = "aioitertools"; - version = "0.11.0"; - format = "pyproject"; + version = "0.12.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QsaLjdOmnCv38iM7999LtYtVe8pSUqwC7VGHu8Z9aDE="; + hash = "sha256-wqkFW0+7dwX1YbnYYFPor10QzIRdIsMgCMQ0kLLY3Ws="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + dependencies = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeCheckInputs = [ unittestCheckHook ]; @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables"; homepage = "https://aioitertools.omnilib.dev/"; + changelog = "https://github.com/omnilib/aioitertools/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 437e5a3ce0ce7..8ee952feb39fc 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { pytestCheckHook pytest-aiohttp pytest-cov-stub - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "aiojobs" ]; diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index 6044c069609be..c44bf8e444682 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -2,17 +2,15 @@ lib, async-timeout, buildPythonPackage, + cramjam, cython, fetchFromGitHub, gssapi, - kafka-python, - lz4, packaging, - python-snappy, pythonOlder, setuptools, + typing-extensions, zlib, - zstandard, }: buildPythonPackage rec { @@ -20,7 +18,7 @@ buildPythonPackage rec { version = "0.11.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aio-libs"; @@ -38,15 +36,19 @@ buildPythonPackage rec { dependencies = [ async-timeout - kafka-python packaging + typing-extensions ]; optional-dependencies = { - snappy = [ python-snappy ]; - lz4 = [ lz4 ]; - zstd = [ zstandard ]; + snappy = [ cramjam ]; + lz4 = [ cramjam ]; + zstd = [ cramjam ]; gssapi = [ gssapi ]; + all = [ + cramjam + gssapi + ]; }; # Checks require running Kafka server diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 83553044bf89c..76d690b16c9c1 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.5.2"; + version = "0.5.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-0qC8FvXk7MlvdO4k7tihjE91tbMbnzOs8YvOyzpL4J4="; + hash = "sha256-Q4PlEnbdEUWYG/odD+xSG975lsRQqhOgFb//hk+PWIw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 5811fc2344c7e..8aec71d126e93 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "1.0.8"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GbChqlBOcrDvzwrY0Vd6TTqPOhUjKbcYtULdQDVsY2o="; + hash = "sha256-oZpq2qUAtqDaRhgW9SbbQY9z81VqrqXhRLmpaPto9+A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix index 1c73118ffc5d6..ee4ad62a1baff 100644 --- a/pkgs/development/python-modules/aiomealie/default.nix +++ b/pkgs/development/python-modules/aiomealie/default.nix @@ -8,6 +8,7 @@ orjson, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, syrupy, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "aiomealie"; - version = "0.8.1"; + version = "0.9.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,14 +26,9 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-mealie"; rev = "refs/tags/v${version}"; - hash = "sha256-1n/AMXEoJJ/jftYzYHvo+jTSasNEqnFVAYqlipHFmGc="; + hash = "sha256-FJhmipWE3DE4PRWkEq8/j9iz9HQ7G7J5I9hwjU6e3FA="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -45,6 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aioresponses pytest-asyncio + pytest-cov-stub pytestCheckHook syrupy ]; diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 8f3050f3ed48e..a9dabfd3ee2a3 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { dependencies = [ colorlog ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ] - ++ lib.optionals stdenv.isLinux [ logging-journald ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ logging-journald ]; nativeCheckInputs = [ aiocontextvars @@ -45,9 +45,9 @@ buildPythonPackage rec { fastapi pytestCheckHook setproctitle - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; #asgi = [ aiohttp-asgi ]; cron = [ croniter ]; diff --git a/pkgs/development/python-modules/aiomultiprocess/default.nix b/pkgs/development/python-modules/aiomultiprocess/default.nix index f07b225890a5c..b1fc1479b7f36 100644 --- a/pkgs/development/python-modules/aiomultiprocess/default.nix +++ b/pkgs/development/python-modules/aiomultiprocess/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { "test_pool_worker_exceptions" "test_pool_worker_max_tasks" "test_pool_worker_stop" + # error message changed with python 3.12 + "test_spawn_method" ]; pythonImportsCheck = [ "aiomultiprocess" ]; diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index bb62273772031..2c372e0a63351 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.6.2"; + version = "0.6.6"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-XsNeIUgHFPatGAhxcwtfSXUi+0sCQf9E6GH5C8OrpJg="; + hash = "sha256-KFs5r7C7CorjEix2yL+NT/0liz3ivoiL6ZV5lJbBWBc="; }; pythonRelaxDeps = [ "pydantic" ]; diff --git a/pkgs/development/python-modules/aioprometheus/default.nix b/pkgs/development/python-modules/aioprometheus/default.nix index 0c74e4a6ac25e..2dc49ae5b1f82 100644 --- a/pkgs/development/python-modules/aioprometheus/default.nix +++ b/pkgs/development/python-modules/aioprometheus/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { quantile-python ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; starlette = [ starlette ]; quart = [ quart ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { httpx fastapi uvicorn - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "aioprometheus" ]; diff --git a/pkgs/development/python-modules/aiopulse/default.nix b/pkgs/development/python-modules/aiopulse/default.nix index 3155e6d7d9ef3..7309f774b14fa 100644 --- a/pkgs/development/python-modules/aiopulse/default.nix +++ b/pkgs/development/python-modules/aiopulse/default.nix @@ -4,24 +4,24 @@ buildPythonPackage, fetchPypi, pythonOlder, - setuptools, + hatchling, }: buildPythonPackage rec { pname = "aiopulse"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yrltqnePNnNwsVGkfXgtrtL/FuazRvmoVL4L0H4j4Bg="; + hash = "sha256-juubQHAAQYN9mSssfF3prYByy+wxscZFxwgspJU8zYA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ async-timeout ]; + dependencies = [ async-timeout ]; # Tests are not present doCheck = false; diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix index 7dd16b1f48113..0c80e43542641 100644 --- a/pkgs/development/python-modules/aiormq/default.nix +++ b/pkgs/development/python-modules/aiormq/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiormq"; - version = "6.8.0"; + version = "6.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = "aiormq"; rev = "refs/tags/${version}"; - hash = "sha256-XD1g4JXQJlJyXuZbo4hYW7cwQhy8+p4/inwNw2WOD9Y="; + hash = "sha256-3+PoDB5Owy8BWBUisX0i1mV8rqs5K9pBFQwup8vKxlg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index c330c7fb03db1..05263b49c77b5 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -9,29 +9,29 @@ mashumaro, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, + rich, + typer, yarl, }: buildPythonPackage rec { pname = "aiortm"; - version = "0.8.20"; + version = "0.9.7"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-W0o4RdaGExfTlTIndY3QUmqqeG2GA3pf3zeokY6xPvk="; + hash = "sha256-dkQihn2x6WHEPA4bbbeONhQlFXR0xc1vC1A+sWAhSl8="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=aiortm --cov-report=term-missing:skip-covered" "" - ''; + pythonRelaxDeps = [ "typer" ]; build-system = [ poetry-core ]; @@ -40,12 +40,15 @@ buildPythonPackage rec { ciso8601 click mashumaro + rich + typer yarl ]; nativeCheckInputs = [ aioresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiortsp/default.nix b/pkgs/development/python-modules/aiortsp/default.nix index 4bdf43d387666..0e3920cfd6a8b 100644 --- a/pkgs/development/python-modules/aiortsp/default.nix +++ b/pkgs/development/python-modules/aiortsp/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiortsp"; - version = "1.3.7"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "marss"; repo = "aiortsp"; - rev = version; - hash = "sha256-bxfnKAzMYh0lhS3he617eGhO7hmNbiwEYHh8k/PZ6r4="; + rev = "refs/tags/v${version}"; + hash = "sha256-/ydsu+53WOocdWk3AW0/cXBEx1qAlhIC0LUDy459pbQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioruckus/default.nix b/pkgs/development/python-modules/aioruckus/default.nix index bcd1ce1919fe8..e38c13e782699 100644 --- a/pkgs/development/python-modules/aioruckus/default.nix +++ b/pkgs/development/python-modules/aioruckus/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + aioresponses, buildPythonPackage, cryptography, fetchFromGitHub, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "aioruckus"; - version = "0.40"; + version = "0.41"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,14 +23,9 @@ buildPythonPackage rec { owner = "ms264556"; repo = "aioruckus"; rev = "refs/tags/v${version}"; - hash = "sha256-oEm0+ktEJHJPg4PUPfSmG9SyVRDrxs7kosQ0tIY+bRc="; + hash = "sha256-acu0EWP/k0qyylPtM8IBxhJhhQhXpbG2NheYpD8RTG8="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=68.1" "setuptools" - ''; - build-system = [ setuptools ]; dependencies = [ @@ -39,6 +35,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix index a71111fccc890..6e702e7927cb4 100644 --- a/pkgs/development/python-modules/aiorussound/default.nix +++ b/pkgs/development/python-modules/aiorussound/default.nix @@ -2,30 +2,49 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, # build-system - setuptools, + poetry-core, + + # dependencies + mashumaro, + orjson, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "aiorussound"; - version = "2.3.2"; + version = "4.0.5"; pyproject = true; + # requires newer f-strings introduced in 3.12 + disabled = pythonOlder "3.12"; + src = fetchFromGitHub { owner = "noahhusby"; repo = "aiorussound"; rev = "refs/tags/${version}"; - hash = "sha256-lQDHwm6dpernRYktu6eqV8uP7FHHHAU28viLg0q58+8="; + hash = "sha256-W0vhVK1SmnTsNuXpDn2e1BrBnsdBwgiNyXucC+ASg1M="; }; - build-system = [ setuptools ]; + build-system = [ poetry-core ]; + + dependencies = [ + mashumaro + orjson + ]; - doCheck = false; # no tests + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "aiorussound" ]; meta = with lib; { + changelog = "https://github.com/noahhusby/aiorussound/releases/tag/${version}"; description = "Async python package for interfacing with Russound RIO hardware"; homepage = "https://github.com/noahhusby/aiorussound"; license = licenses.mit; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 67eb0ae35edf2..a7d2a53498529 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -6,6 +6,8 @@ fetchFromGitHub, habluetooth, orjson, + pytest-asyncio, + pytestCheckHook, pythonOlder, setuptools, yarl, @@ -13,16 +15,16 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "11.2.4"; + version = "11.4.2"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "aioshelly"; rev = "refs/tags/${version}"; - hash = "sha256-a2hjK1YA/L5w2fYgWYgyyqTMZ4cOzTRzGzMCu5X35/o="; + hash = "sha256-aJA+iE8cyUPrL2n72N8/HI8//h0qR6k/hgD34vpwI+0="; }; build-system = [ setuptools ]; @@ -35,8 +37,10 @@ buildPythonPackage rec { yarl ]; - # Project has no test - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "aioshelly" ]; diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index 0fe74733ff646..22b41376c464f 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -10,6 +10,7 @@ prompt-toolkit, pycryptodomex, pythonOlder, + setuptools, six, tqdm, winacl, @@ -18,17 +19,19 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.4.10"; - format = "setuptools"; + version = "0.4.11"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uN5lbhuPt9axp2ZTTxDgHuDRwlQjXANEkGPgQJL1o90="; + hash = "sha256-bWb1HtI1T3byBmE+rA1j83z9ntRL6figZZTUECRCc9c="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ asyauth asysocks colorama @@ -51,7 +54,7 @@ buildPythonPackage rec { description = "Python SMB library"; homepage = "https://github.com/skelsec/aiosmb"; changelog = "https://github.com/skelsec/aiosmb/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix index e4dd72e700cdd..b5f4e5406b8bf 100644 --- a/pkgs/development/python-modules/aiosonic/default.nix +++ b/pkgs/development/python-modules/aiosonic/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiosonic" ]; disabledTests = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ # need network "test_simple_get" "test_get_python" @@ -132,7 +132,7 @@ buildPythonPackage rec { "test_get_with_cookies" "test_proxy_request" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # "FAILED tests/test_proxy.py::test_proxy_request - Exception: port 8865 never got active" "test_proxy_request" ]; diff --git a/pkgs/development/python-modules/aiostreammagic/default.nix b/pkgs/development/python-modules/aiostreammagic/default.nix new file mode 100644 index 0000000000000..4b631f5e0e4a6 --- /dev/null +++ b/pkgs/development/python-modules/aiostreammagic/default.nix @@ -0,0 +1,52 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + mashumaro, + orjson, + poetry-core, + pythonOlder, + websockets, + yarl, +}: + +buildPythonPackage rec { + pname = "aiostreammagic"; + version = "2.5.0"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "noahhusby"; + repo = "aiostreammagic"; + rev = "refs/tags/${version}"; + hash = "sha256-Tb15ro+6K+7jqmer/bXDJUEBonMv1sZSU/0ZtCWOCfc="; + }; + + pythonRelaxDeps = [ "websockets" ]; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + mashumaro + orjson + websockets + yarl + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "aiostreammagic" ]; + + meta = { + description = "Module for interfacing with Cambridge Audio/Stream Magic compatible streamers"; + homepage = "https://github.com/noahhusby/aiostreammagic"; + changelog = "https://github.com/noahhusby/aiostreammagic/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index cfdde67b22dd6..421e8ebc9b3cc 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -1,13 +1,15 @@ { lib, + aiohttp, assertpy, buildPythonPackage, fetchFromGitHub, + freezegun, poetry-core, + pycryptodome, pytest-asyncio, pytest-mockservers, pytest-resource-path, - pytest-sugar, pytestCheckHook, pythonAtLeast, pythonOlder, @@ -16,21 +18,28 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "3.4.3"; + version = "4.0.3"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "TomerFi"; - repo = pname; + repo = "aioswitcher"; rev = "refs/tags/${version}"; - hash = "sha256-yKHSExtnO9m8Tc3BmCqV8tJs59ynKOqUmekaOatGRTc="; + hash = "sha256-QSnroxVHlfZd6QDaqUTMyoctiEsxWmGmFxzql1YIAD0="; }; __darwinAllowLocalNetworking = true; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; + + pythonRelaxDeps = [ "aiohttp" ]; + + dependencies = [ + aiohttp + pycryptodome + ]; preCheck = '' export TZ=Asia/Jerusalem @@ -38,10 +47,10 @@ buildPythonPackage rec { nativeCheckInputs = [ assertpy + freezegun pytest-asyncio pytest-mockservers pytest-resource-path - pytest-sugar pytestCheckHook time-machine ]; @@ -66,7 +75,7 @@ buildPythonPackage rec { description = "Python module to interact with Switcher water heater"; homepage = "https://github.com/TomerFi/aioswitcher"; changelog = "https://github.com/TomerFi/aioswitcher/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aiotankerkoenig/default.nix b/pkgs/development/python-modules/aiotankerkoenig/default.nix index a1a2fd2471712..a82a963419cc1 100644 --- a/pkgs/development/python-modules/aiotankerkoenig/default.nix +++ b/pkgs/development/python-modules/aiotankerkoenig/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiotankerkoenig"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jpbede"; repo = "aiotankerkoenig"; rev = "refs/tags/v${version}"; - hash = "sha256-BB1Cy4Aji5m06LlNj03as4CWF8RcYKAYy4oxPomOP68="; + hash = "sha256-WRR4CLVkHN1JR4rwNu0ULoiu0zO0M2YdvCHYp0Tt9VU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix index bbc5ff1ca0f0c..cfebe114b4ced 100644 --- a/pkgs/development/python-modules/aiovlc/default.nix +++ b/pkgs/development/python-modules/aiovlc/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "aiovlc"; - version = "0.4.3"; + version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "MartinHjelmare"; repo = "aiovlc"; rev = "refs/tags/v${version}"; - hash = "sha256-kiF2BRqaQLNpd+EoKrI9/9m3E1DlyJqM3Ng0qA0TfyQ="; + hash = "sha256-2YG/m/z2xHUep2VJuCQs4+gGHUolj/u3kycpYZmUyBs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix index e2794d241193a..85af5993d8e42 100644 --- a/pkgs/development/python-modules/aiowithings/default.nix +++ b/pkgs/development/python-modules/aiowithings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiowithings"; - version = "3.0.3"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-withings"; rev = "refs/tags/v${version}"; - hash = "sha256-YM+7raD5Wp+pC+R4DV92QN5E+TlNoMnt5M+n6Ax0W9k="; + hash = "sha256-pTDHbnL5MfcsQFiaRnKTDAoJ1JwwxRUTB6fQsXjIFl0="; }; postPatch = '' @@ -31,9 +31,9 @@ buildPythonPackage rec { --replace "--cov" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp yarl ]; @@ -47,6 +47,29 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiowithings" ]; + pytestFlagsArray = [ "--snapshot-update" ]; + + disabledTests = [ + # Tests require network access + "test_creating_own_session" + "test_error_codes" + "test_get_activities" + "test_get_devices" + "test_get_goals" + "test_get_measurement" + "test_get_new_device" + "test_get_sleep_summary" + "test_get_sleep" + "test_get_workouts" + "test_list_all_subscriptions" + "test_list_subscriptions" + "test_putting_in_own_session" + "test_revoking" + "test_subscribing" + "test_timeout" + "test_unexpected_server_response" + ]; + meta = with lib; { description = "Module to interact with Withings"; homepage = "https://github.com/joostlek/python-withings"; diff --git a/pkgs/development/python-modules/airgradient/default.nix b/pkgs/development/python-modules/airgradient/default.nix index 2eed753ffa906..86773cfd4c272 100644 --- a/pkgs/development/python-modules/airgradient/default.nix +++ b/pkgs/development/python-modules/airgradient/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "airgradient"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "airgradienthq"; repo = "python-airgradient"; rev = "refs/tags/v${version}"; - hash = "sha256-NONOfM61oCtiNgmKCXvkEvCzSjumwjaeuzg9l/7hX8M="; + hash = "sha256-BBJ9pYE9qAE62FJFwycWBnvsoeobjsg0uIDZffIg18o="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix index 335c10e103b31..07f2e3f4ce72c 100644 --- a/pkgs/development/python-modules/albucore/default.nix +++ b/pkgs/development/python-modules/albucore/default.nix @@ -7,13 +7,12 @@ pytestCheckHook, numpy, opencv4, - tomli, typing-extensions, }: buildPythonPackage rec { pname = "albucore"; - version = "0.0.13"; + version = "0.0.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albucore"; rev = "refs/tags/${version}"; - hash = "sha256-TqEOey6PxVesk1Xs9YvnFto8LrSVsfTMq+MqP/mwYCA="; + hash = "sha256-9fv5jewfL3JKhZyD0YS1WDNZ7wWt+8iF2DcygCOl168="; }; pythonRemoveDeps = [ "opencv-python" ]; @@ -32,7 +31,6 @@ buildPythonPackage rec { dependencies = [ numpy opencv4 - tomli typing-extensions ]; diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index a7bc2d5251401..65a26d13baa05 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -15,8 +15,12 @@ pydantic, pyyaml, scikit-image, - scikit-learn, + # optional dependencies + huggingface-hub, + pillow, + + # tests deepdiff, pytestCheckHook, pytest-mock, @@ -26,7 +30,7 @@ buildPythonPackage rec { pname = "albumentations"; - version = "1.4.11"; + version = "1.4.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +39,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albumentations"; rev = "refs/tags/${version}"; - hash = "sha256-1070V9+EZ4qrhxmbMyvTbu89pLoonrn0Peb8nwp2lwA="; + hash = "sha256-4JOqaSpBXSrAR3qrOeab+PvhXPcoEnblO0n9TSqW0bY="; }; pythonRemoveDeps = [ "opencv-python" ]; @@ -50,9 +54,13 @@ buildPythonPackage rec { pydantic pyyaml scikit-image - scikit-learn ]; + optional-dependencies = { + hub = [ huggingface-hub ]; + text = [ pillow ]; + }; + nativeCheckInputs = [ deepdiff pytestCheckHook @@ -62,6 +70,7 @@ buildPythonPackage rec { ]; disabledTests = [ + "test_pca_inverse_transform" # this test hangs up "test_transforms" ]; diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index cdf2363a52f13..852a94ed3adae 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -30,16 +30,14 @@ buildPythonPackage rec { pname = "ale-py"; - version = "0.9.1"; + version = "0.10.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; rev = "refs/tags/v${version}"; - hash = "sha256-MpumAQ5OW/+fRIvrBlRWkgioxMVceb5LxEH2JjRk5zY="; + hash = "sha256-MDMCYnyLZYbQXwyr5VuPeVEop825nD++yQ7hhsW4BX8="; }; build-system = [ @@ -64,12 +62,8 @@ buildPythonPackage rec { postPatch = # Relax the pybind11 version '' - substituteInPlace src/python/CMakeLists.txt \ + substituteInPlace src/ale/python/CMakeLists.txt \ --replace-fail 'find_package(pybind11 ''${PYBIND11_VER} QUIET)' 'find_package(pybind11 QUIET)' - '' - + '' - substituteInPlace pyproject.toml \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; dontUseCmakeConfigure = true; @@ -93,6 +87,6 @@ buildPythonPackage rec { changelog = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v${version}"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ billhuang ]; - broken = stdenv.isDarwin; # fails to link with missing library + broken = stdenv.hostPlatform.isDarwin; # fails to link with missing library }; } diff --git a/pkgs/development/python-modules/alpha-vantage/default.nix b/pkgs/development/python-modules/alpha-vantage/default.nix index 3e39efa7d3843..7830701eabee1 100644 --- a/pkgs/development/python-modules/alpha-vantage/default.nix +++ b/pkgs/development/python-modules/alpha-vantage/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { pandas = [ pandas ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { aioresponses requests-mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Starting with 3.0.0 most tests require an API key doCheck = false; diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index 24707baa4cdf8..bac25d70f0407 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "amaranth"; format = "pyproject"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; rev = "refs/tags/v${version}"; - hash = "sha256-76wuxWz6RikFFJH+5kte57GcVhusJKtcMo5M/2U+Cl8="; + hash = "sha256-pf9X1B60FgqTbSw7D80ERHp4GCvCe5lqrlS96xPXLNo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 799306fa30f01..c277a6e28993e 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pure-python-adb ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; inherit (adb-shell.optional-dependencies) usb; }; @@ -39,7 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.async ++ passthru.optional-dependencies.usb; + ] ++ optional-dependencies.async ++ optional-dependencies.usb; disabledTests = [ # Requires git but fails anyway diff --git a/pkgs/development/python-modules/androidtvremote2/default.nix b/pkgs/development/python-modules/androidtvremote2/default.nix index df179dab636be..3c01a2f28135f 100644 --- a/pkgs/development/python-modules/androidtvremote2/default.nix +++ b/pkgs/development/python-modules/androidtvremote2/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtvremote2"; - version = "0.1.1"; + version = "0.1.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "androidtvremote2"; rev = "refs/tags/v${version}"; - hash = "sha256-Zem2IWBUWmyVdBjqoVKFk+/lg5T7CPXCKFXhFusQFLY="; + hash = "sha256-4iVM7BCqOFHrW2BvPakXxp3MfZa+WlB7g/ix239NldE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 2f93cb48fc360..d382cc49c987c 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.117"; + version = "9.2.119"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,15 +45,22 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-woIid0DdaZqn7BZJrQ3UoOfGC1cP8r+t+++Sw8ZtX80="; + hash = "sha256-GwfQj8KU6M5ylgJPN1Blz8Chz2zEDTZayFdvjXXWoHY="; }; - pythonRelaxDeps = [ "capstone" ]; + postPatch = '' + # unicorn is also part of build-system + substituteInPlace pyproject.toml \ + --replace-fail "unicorn==2.0.1.post1" "unicorn" + ''; - build-system = [ - setuptools + pythonRelaxDeps = [ + "capstone" + "unicorn" ]; + build-system = [ setuptools ]; + dependencies = [ ailment archinfo @@ -84,11 +91,11 @@ buildPythonPackage rec { unique-log-filter ]; - passthru.optional-dependencies = { + optional-dependencies = { AngrDB = [ sqlalchemy ]; }; - setupPyBuildFlags = lib.optionals stdenv.isLinux [ + setupPyBuildFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" ]; @@ -110,5 +117,7 @@ buildPythonPackage rec { homepage = "https://angr.io/"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ fab ]; + # angr is pining unicorn + broken = versionAtLeast unicorn.version "2.0.1.post1"; }; } diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 939517887e401..d822f66800d54 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.2.9"; + version = "9.2.10"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angrop"; rev = "refs/tags/v${version}"; - hash = "sha256-T07Y23UDp9eL2DK5gakV8kPNGsXf+4EofZJDSW/JS1Q="; + hash = "sha256-+epX+tCSv5Kit4lncDNtjokehCSl+tO7rbi3L+RrI+E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/annotated-types/default.nix b/pkgs/development/python-modules/annotated-types/default.nix index 77ab71785200e..a69159a7a173e 100644 --- a/pkgs/development/python-modules/annotated-types/default.nix +++ b/pkgs/development/python-modules/annotated-types/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Reusable constraint types to use with typing.Annotated"; homepage = "https://github.com/annotated-types/annotated-types"; - changelog = "https://github.com/annotated-types/annotated-types/releases/tag/${src.rev}"; + changelog = "https://github.com/annotated-types/annotated-types/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ blaggacao ]; }; diff --git a/pkgs/development/python-modules/ansible-builder/default.nix b/pkgs/development/python-modules/ansible-builder/default.nix index f5a67d28eddb6..064de3b127adf 100644 --- a/pkgs/development/python-modules/ansible-builder/default.nix +++ b/pkgs/development/python-modules/ansible-builder/default.nix @@ -1,11 +1,16 @@ { lib, - python3Packages, + setuptools, + setuptools-scm, + jsonschema, + requirements-parser, + pyyaml, podman, fetchPypi, bindep, + buildPythonPackage, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "ansible-builder"; version = "3.0.1"; format = "pyproject"; @@ -15,14 +20,14 @@ python3Packages.buildPythonPackage rec { hash = "sha256-rxyhgj9Cad751tPAptCTLCtXQLUXaRYv39bkoFzzjOk="; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = [ setuptools setuptools-scm ]; buildInputs = [ bindep ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ podman jsonschema requirements-parser diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 012a749e3831c..68eb5fb6a75e5 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "24.8.0"; + version = "24.9.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ansible_compat"; inherit version; - hash = "sha256-z6rcY/TYXcv0eI97zsLKhWPntcn9MFgAXv15iPHBciw="; + hash = "sha256-n/ICReG9nemyOjZ5AlJKsOEfvPt0GDGZbaXaW2Crld8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-pylibssh/default.nix b/pkgs/development/python-modules/ansible-pylibssh/default.nix index 26dbb4413a9ec..9ca0f8fefd124 100644 --- a/pkgs/development/python-modules/ansible-pylibssh/default.nix +++ b/pkgs/development/python-modules/ansible-pylibssh/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ansible-pylibssh"; - version = "1.2.0.post4"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-brnSrzSnumK32/mEON0l0iSPdoYrFwYmBc4MT7WcrX8="; + hash = "sha256-dT5XDc3OtquONi6RzA1Zk77ryT0oe4gXjbVVCfZCOrU="; }; # Remove after https://github.com/ansible/pylibssh/pull/502 is merged diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 746877f57e2ef..11d0f37773e49 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '"setuptools>=45, <=69.0.2", "setuptools-scm[toml]>=6.2, <=8.0.4"' '"setuptools", "setuptools-scm"' + --replace-fail '"setuptools>=45, <=69.0.2", "setuptools-scm[toml]>=6.2, <=8.0.4"' '"setuptools", "setuptools-scm"' ''; build-system = [ @@ -69,13 +69,18 @@ buildPythonPackage rec { ''; disabledTests = [ - # Requires network access + # Tests require network access "test_callback_plugin_task_args_leak" "test_env_accuracy" # Times out on slower hardware "test_large_stdout_blob" # Failed: DID NOT RAISE <class 'RuntimeError'> "test_validate_pattern" + # Assertion error + "test_get_role_list" + "test_include_role_from_collection_events" + "test_resolved_actions" + "test_callback_plugin_censoring_does_not_overwrite" ]; disabledTestPaths = @@ -84,7 +89,7 @@ buildPythonPackage rec { "test/integration/test_runner.py" "test/unit/test_runner.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Integration tests on Darwin are not regularly passing in ansible-runner's own CI "test/integration" # These tests write to `/tmp` which is not writable on Darwin @@ -95,9 +100,10 @@ buildPythonPackage rec { meta = with lib; { description = "Helps when interfacing with Ansible"; - mainProgram = "ansible-runner"; homepage = "https://github.com/ansible/ansible-runner"; + changelog = "https://github.com/ansible/ansible-runner/releases/tag/${version}"; license = licenses.asl20; maintainers = [ ]; + mainProgram = "ansible-runner"; }; } diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 4933ca6ee46f9..fc0e5f9ab36e2 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -30,12 +30,12 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.17.3"; + version = "2.17.4"; src = fetchPypi { pname = "ansible_core"; inherit version; - hash = "sha256-kXVXBlM5/jbnB46b6kfu+rbWh3871DX6Xw12bQTFhIU="; + hash = "sha256-RKHzAHZ5ZTa6JFXK0Y025ihw8E5jLjyi6+lw176s8k0="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index cf484c1f07b34..03d7e6c235192 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -22,7 +22,7 @@ let pname = "ansible"; - version = "10.1.0"; + version = "10.2.0"; in buildPythonPackage { inherit pname version; @@ -32,7 +32,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-fYxEVX9XBocwbhnQ4ylq0jBZPLEr2jXc/JJ0pgY68io="; + hash = "sha256-iqBim6js7WRl4s60kCnpPTN8Sm/Fo+bpiCXCWN1qcFc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 014b1feaa0f64..ce0eb296ec269 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.34.0"; + version = "0.34.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-UjwBxuhXuwJfWewg9si/oIuXgiqbNAYm4lK2f+C6VJU="; + hash = "sha256-JSc1Atl6nN0eOJf4dx7tkb05creU43zRM08HKorznW4="; }; build-system = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { vertex = [ google-auth ]; }; diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 296fbcdc35630..d2655fa2a1e18 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { trio = [ trio ]; }; @@ -69,7 +69,7 @@ buildPythonPackage rec { pytestCheckHook trustme uvloop - ] ++ passthru.optional-dependencies.trio; + ] ++ optional-dependencies.trio; pytestFlagsArray = [ "-W" @@ -78,7 +78,7 @@ buildPythonPackage rec { "'not network'" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # PermissionError: [Errno 1] Operation not permitted: '/dev/console' "test_is_block_device" ]; diff --git a/pkgs/development/python-modules/apeye-core/default.nix b/pkgs/development/python-modules/apeye-core/default.nix new file mode 100644 index 0000000000000..d86560254517a --- /dev/null +++ b/pkgs/development/python-modules/apeye-core/default.nix @@ -0,0 +1,38 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + hatchling, + hatch-requirements-txt, + domdf-python-tools, + idna, +}: +buildPythonPackage rec { + pname = "apeye-core"; + version = "1.1.5"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "apeye_core"; + hash = "sha256-Xecu09AMybIP6lXlS3q49e+FAOszpTaLwWKlWF4jilU="; + }; + + build-system = [ hatchling ]; + + nativeBuildInputs = [ + hatch-requirements-txt + ]; + + dependencies = [ + domdf-python-tools + idna + ]; + + meta = { + description = "Core (offline) functionality for the apeye library."; + homepage = "https://github.com/domdfcoding/apyey-core"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyberius-prime ]; + }; +} diff --git a/pkgs/development/python-modules/apischema/default.nix b/pkgs/development/python-modules/apischema/default.nix index 1034d1d02160a..59ba920c15777 100644 --- a/pkgs/development/python-modules/apischema/default.nix +++ b/pkgs/development/python-modules/apischema/default.nix @@ -6,12 +6,13 @@ pytest-asyncio, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "apischema"; - version = "0.18.1"; - format = "setuptools"; + version = "0.18.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,23 +20,32 @@ buildPythonPackage rec { owner = "wyfo"; repo = "apischema"; rev = "refs/tags/v${version}"; - hash = "sha256-omw6znk09r2SigPfaVrtA6dd8KeSfjaPgGfK12ty23g="; + hash = "sha256-YFJbNxCwDrJb603Bf8PDrvhVt4T53PNWOYs716c0f1I="; }; - passthru.optional-dependencies = { + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==75.1.0" "setuptools" \ + --replace-fail "wheel~=0.44.0" "wheel" + ''; + + build-system = [ setuptools ]; + + optional-dependencies = { graphql = [ graphql-core ]; }; nativeCheckInputs = [ pytest-asyncio pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "apischema" ]; meta = with lib; { description = "JSON (de)serialization, GraphQL and JSON schema generation using typing"; homepage = "https://github.com/wyfo/apischema"; + changelog = "https://github.com/wyfo/apischema/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/apispec-webframeworks/default.nix b/pkgs/development/python-modules/apispec-webframeworks/default.nix index 3953083d41a6f..a89d12ea0d505 100644 --- a/pkgs/development/python-modules/apispec-webframeworks/default.nix +++ b/pkgs/development/python-modules/apispec-webframeworks/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "apispec-webframeworks"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,12 +24,12 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = "apispec-webframeworks"; rev = "refs/tags/${version}"; - hash = "sha256-qepiaRW36quIgxBtEHMF3HN0wO6jp2uGAHgg5fJoMUY="; + hash = "sha256-V4tdqcHfYRh9VoXUTPXM3SIOogJDJB14SLj5dSd7LzU="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ apispec ] ++ apispec.optional-dependencies.yaml; + dependencies = [ apispec ] ++ apispec.optional-dependencies.yaml; nativeCheckInputs = [ aiohttp diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 2ca9be416c8f5..9c487d1dd6f3b 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { marshmallow = [ marshmallow ]; yaml = [ pyyaml ]; validation = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "apispec" ]; diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix index 0b5539795ec42..e6ebec3b320d4 100644 --- a/pkgs/development/python-modules/apkinspector/default.nix +++ b/pkgs/development/python-modules/apkinspector/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apkinspector"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "erev0s"; repo = "apkInspector"; rev = "refs/tags/v${version}"; - hash = "sha256-zVMY1KMUCSqctAAHOEFXM9yT1X0PDC75ETshF+fc4pU="; + hash = "sha256-trEbm9EFZLoFBWKKOlbI305r+8GdSmU5zWPnNhb5qzQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 657537bbc5689..cf6aef5fb69f5 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.8.1"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CKIP5yZyt+kPeWnVuHnWV8Li2zhaiowQ9Uy6VlvyN/I="; + hash = "sha256-tck6/WMxr+S2OlXRzqkHbke+y0uom1YrGBwT4luwx9Y="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index fc07530ed65f3..ed93d5dc27921 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "6.0.8"; + version = "6.0.14"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-lgt609UDuHTGQTTrpvxNvgUk6GU+TYqwc19dzatI4Io="; + hash = "sha256-Xm/2AHV4r6SmKK1wZS20xh9xRO3zhdEB/hpRT1o3z2Q="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix index d409a535b4632..7005690b53eff 100644 --- a/pkgs/development/python-modules/apscheduler/default.nix +++ b/pkgs/development/python-modules/apscheduler/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { "test_add_pending_job" "test_shutdown" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_submit_job" "test_max_instances" ]; diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index aec388af308aa..d2effb1ae435f 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { "testVFSWithWAL" # no lines in errout.txt "testWriteUnraisable" - ] ++ lib.optionals stdenv.isDarwin [ "testzzForkChecker" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "testzzForkChecker" ]; pythonImportsCheck = [ "apsw" ]; diff --git a/pkgs/development/python-modules/apsystems-ez1/default.nix b/pkgs/development/python-modules/apsystems-ez1/default.nix index d5005a1d1ca33..f9a50715322b4 100644 --- a/pkgs/development/python-modules/apsystems-ez1/default.nix +++ b/pkgs/development/python-modules/apsystems-ez1/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "apsystems-ez1"; - version = "1.3.3"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "SonnenladenGmbH"; repo = "APsystems-EZ1-API"; rev = "refs/tags/${version}"; - hash = "sha256-V6GcTSupjhjGEOsO+C9pImYJRnvdDbttW3Zh0PDYt5I="; + hash = "sha256-CG+QpdJfZt1S6IDDjabRjwuRflURFc1QYo39kf/p0Zw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index d431ea4301404..2c0b156272d31 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.13"; + version = "0.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-MXzF/nqJj+lsNjl3YLFHTqRLBVxBaKOY+GVboT6Pc4g="; + hash = "sha256-sunqCWfXz91nqbJXGeivo3DoQOVgcA8grO5j3atrLbo="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/arabic-reshaper/default.nix b/pkgs/development/python-modules/arabic-reshaper/default.nix index 36c9aaf013954..6e1610e6f0cd8 100644 --- a/pkgs/development/python-modules/arabic-reshaper/default.nix +++ b/pkgs/development/python-modules/arabic-reshaper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-ucSC5aTvpnlAVQcT0afVecnoN3hIZKtzUhEQ6Qg0jQM="; }; - passthru.optional-dependencies = { + optional-dependencies = { with-fonttools = [ fonttools ]; }; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 2d041f5459013..c1b6e88ed3c52 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.117"; + version = "9.2.119"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-eMhj+OQEfkD4AgwNEEVil7p/XoaREsM+72/bN72XnzE="; + hash = "sha256-81vaHTzRCOw8C/KHwFSEMGOWEwpHVK0HicGVi9j4MqU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 50ea4cbb74f8e..c767e7ca3eed3 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -106,7 +106,7 @@ buildPythonPackage rec { typer ]; - passthru.optional-dependencies = { + optional-dependencies = { server = [ aiofiles @@ -178,7 +178,7 @@ buildPythonPackage rec { pytest-mock pytest-asyncio factory-boy - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ "tests/server/datasets/test_dao.py" ]; diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix index 77bd37acd6f67..e3423a8c56e36 100644 --- a/pkgs/development/python-modules/argparse-manpage/default.nix +++ b/pkgs/development/python-modules/argparse-manpage/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "argparse_manpage" ]; - passthru.optional-dependencies = { + optional-dependencies = { setuptools = [ setuptools ]; }; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 132f467e0499d..b2ac4e967398d 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { tui = [ asciimatics pyperclip @@ -64,7 +64,7 @@ buildPythonPackage rec { responses psutil uvicorn - ] ++ passthru.optional-dependencies.tui; + ] ++ optional-dependencies.tui; disabledTests = [ # require a running display server diff --git a/pkgs/development/python-modules/array-api-compat/default.nix b/pkgs/development/python-modules/array-api-compat/default.nix index 3f25d7763b9e2..258e69f44bda4 100644 --- a/pkgs/development/python-modules/array-api-compat/default.nix +++ b/pkgs/development/python-modules/array-api-compat/default.nix @@ -14,19 +14,18 @@ config, cudaSupport ? config.cudaSupport, cupy, - nix-update-script, }: buildPythonPackage rec { pname = "array-api-compat"; - version = "1.8"; + version = "1.9"; pyproject = true; src = fetchFromGitHub { owner = "data-apis"; repo = "array-api-compat"; rev = "refs/tags/${version}"; - hash = "sha256-DZs51yWgeMX7lmzR6jily0S3MRD4AVlk7BP8aU99Zp8="; + hash = "sha256-azd98kJtW8QKizfOr670pyr44BHNkWCO7BMFg3zr23g="; }; build-system = [ setuptools ]; @@ -45,13 +44,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "array_api_compat" ]; # CUDA (used via cupy) is not available in the testing sandbox - checkPhase = '' - runHook preCheck - python -m pytest -k 'not cupy' - runHook postCheck - ''; - - passthru.updateScript = nix-update-script { }; + pytestFlagsArray = [ + "-k" + "'not cupy'" + ]; meta = { homepage = "https://data-apis.org/array-api-compat"; diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix index 0f43d311f88c1..b0d50295a8aac 100644 --- a/pkgs/development/python-modules/art/default.nix +++ b/pkgs/development/python-modules/art/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, }: buildPythonPackage rec { pname = "art"; - version = "6.2"; - format = "setuptools"; + version = "6.3"; + pyproject = true; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; rev = "refs/tags/v${version}"; - hash = "sha256-lFe6J3R+A1WE+LGywupjOGwhOcrUH5JE26Cit0DaT/4="; + hash = "sha256-9kz6uyLdcrQqgWzT9g2qI9a+IituY/OFmbot+HlQsCE="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "art" ]; # TypeError: art() missing 1 required positional argument: 'artname' diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 2d43abfd70b22..0406894c8b057 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -1,7 +1,7 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -9,7 +9,6 @@ setuptools, # dependencies - dm-tree, h5netcdf, matplotlib, numpy, @@ -39,16 +38,14 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "arviz-devs"; repo = "arviz"; rev = "refs/tags/v${version}"; - hash = "sha256-fwDCl1KWClIOBWIL/ETw3hJUyHdpVpLnRmZoZXL3QXI="; + hash = "sha256-6toqOGwk8YbatfiDCTEG4r0z3zZAA8zcNVZJqqssYrY="; }; build-system = [ @@ -57,7 +54,6 @@ buildPythonPackage rec { ]; dependencies = [ - dm-tree h5netcdf matplotlib numpy @@ -104,6 +100,9 @@ buildPythonPackage rec { "test_plot_pair" ]; + # Tests segfault on darwin + doCheck = !stdenv.isDarwin; + pythonImportsCheck = [ "arviz" ]; meta = { diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index 326d51f55a64c..dbdcbce067539 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { flask pillow psycopg2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tkinter ]; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index fecc4b98f490f..1fdb7f50ae31f 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytest-asyncio ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix index 6b406b13961b0..b3591e0610e91 100644 --- a/pkgs/development/python-modules/asn1/default.nix +++ b/pkgs/development/python-modules/asn1/default.nix @@ -5,12 +5,13 @@ fetchFromGitHub, future, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "asn1"; - version = "2.7.0"; - format = "setuptools"; + version = "2.7.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,10 +19,12 @@ buildPythonPackage rec { owner = "andrivet"; repo = "python-asn1"; rev = "refs/tags/v${version}"; - hash = "sha256-pXLG2Mkrv6EeJn6Dk+SefzNtrPdQ6of95LbVTKjTADQ="; + hash = "sha256-xdkSJIe7qmz0Zu5IZ3Rl/h4v2j3YFrm1gz7lsNQ0ORs="; }; - propagatedBuildInputs = [ future ]; + build-system = [ setuptools ]; + + dependencies = [ future ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aspy-refactor-imports/default.nix b/pkgs/development/python-modules/aspy-refactor-imports/default.nix index bcfb80b32e814..dbc97cca6efb4 100644 --- a/pkgs/development/python-modules/aspy-refactor-imports/default.nix +++ b/pkgs/development/python-modules/aspy-refactor-imports/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # fails on darwin due to case-insensitive file system - disabledTests = lib.optionals stdenv.isDarwin [ "test_application_directory_case" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_application_directory_case" ]; meta = with lib; { description = "Utilities for refactoring imports in python-like syntax"; diff --git a/pkgs/development/python-modules/assay/default.nix b/pkgs/development/python-modules/assay/default.nix index 25108a26d4044..b71a3b9be0900 100644 --- a/pkgs/development/python-modules/assay/default.nix +++ b/pkgs/development/python-modules/assay/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "assay"; - version = "unstable-2022-01-19"; + version = "0-unstable-2024-05-09"; format = "setuptools"; src = fetchFromGitHub { owner = "brandon-rhodes"; repo = pname; - rev = "bb62d1f7d51d798b05a88045fff3a2ff92c299c3"; - hash = "sha256-FuAD74mFJ9F9AMgB3vPmODAlZKgPR7FQ4yn7HEBS5Rw="; + rev = "74617d70e77afa09f58b3169cf496679ac5d5621"; + hash = "sha256-zYpLtcXZ16EJWKSCqxFkSz/G9PwIZEQGBrYiJKuqnc4="; }; pythonImportsCheck = [ "assay" ]; @@ -24,6 +24,5 @@ buildPythonPackage rec { description = "Attempt to write a Python testing framework I can actually stand"; license = licenses.mit; maintainers = with maintainers; [ zane ]; - broken = pythonAtLeast "3.11"; }; } diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index 322bb50e711fe..5ec7d2b59b64e 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "1.0.2"; + version = "1.0.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "lmfit"; repo = "asteval"; rev = "refs/tags/${version}"; - hash = "sha256-TIMyfX8bpzey0hw0lBMcdZVnc07j9PFVjn4YbX4oW/8="; + hash = "sha256-PRmTbP3zRnkCxdeb45LBz5m/Ymoi4lq2poKuG9Esg9g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index c88029cb09a8b..c6a7f9fea08be 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -99,7 +99,7 @@ buildPythonPackage rec { "test_datetime_to_timedelta" "test_datetime_difference_agrees_with_timedelta_no_hypothesis" - ] ++ lib.optionals stdenv.isDarwin [ "test_sidereal_lat_independent" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_sidereal_lat_independent" ]; meta = { description = "Astronomy/Astrophysics library for Python"; diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 786bfc4c7fe78..56b1ad8712bc8 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -6,22 +6,25 @@ fetchPypi, minikerberos, pythonOlder, + setuptools, unicrypto, }: buildPythonPackage rec { pname = "asyauth"; - version = "0.0.20"; - format = "setuptools"; + version = "0.0.21"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QQVgIPdonPXwpVl1nH8Cps4nGb2oTfeDvRBY1XgeUUs="; + hash = "sha256-NMwQxfhij/LiW1EW3JjvxcpFUy8WPM0/kUej4C3YEOs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ asn1crypto asysocks minikerberos diff --git a/pkgs/development/python-modules/async-cache/default.nix b/pkgs/development/python-modules/async-cache/default.nix new file mode 100644 index 0000000000000..d54fb2d48c7a6 --- /dev/null +++ b/pkgs/development/python-modules/async-cache/default.nix @@ -0,0 +1,24 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, +}: + +buildPythonPackage rec { + pname = "async-cache"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "iamsinghrajat"; + repo = "async-cache"; + rev = "9925f07920e6b585dc6345f49b7f477b3e1b8c2c"; # doesn't tag releases :( + hash = "sha256-AVSdtWPs1c8AE5PNOq+BdXzBXkI0aeFVzxxPl/ATyU0="; + }; + + meta = with lib; { + description = "Caching solution for asyncio"; + homepage = "https://github.com/iamsinghrajat/async-cache"; + license = licenses.mit; + maintainers = [ maintainers.lukegb ]; + }; +} diff --git a/pkgs/development/python-modules/async-interrupt/default.nix b/pkgs/development/python-modules/async-interrupt/default.nix index f166eff8db1ae..1d96a8cbd61fa 100644 --- a/pkgs/development/python-modules/async-interrupt/default.nix +++ b/pkgs/development/python-modules/async-interrupt/default.nix @@ -4,33 +4,30 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "async-interrupt"; - version = "1.1.2"; - format = "pyproject"; + version = "1.2.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bdraco"; repo = "async_interrupt"; rev = "refs/tags/v${version}"; - hash = "sha256-CFCWlIx4iAG6gW2ORRYfZpFWRvjukqdcR2yg6NjVqps="; + hash = "sha256-opV5h3aLDDpjlRZRZ9OnrPjUOf/i7g+B9T6msk8wtgI="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=async_interrupt --cov-report=term-missing:skip-covered" "" - ''; - nativeBuildInputs = [ poetry-core ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/async-stagger/default.nix b/pkgs/development/python-modules/async-stagger/default.nix index 51c18ed367739..27bf138c375a5 100644 --- a/pkgs/development/python-modules/async-stagger/default.nix +++ b/pkgs/development/python-modules/async-stagger/default.nix @@ -1,8 +1,9 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, + setuptools, pytestCheckHook, pytest-asyncio, pytest-mock, @@ -10,17 +11,20 @@ buildPythonPackage rec { pname = "async-stagger"; - version = "0.3.1"; - format = "setuptools"; + version = "0.4.0.post1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.11"; - src = fetchPypi { - pname = "async_stagger"; - inherit version; - hash = "sha256-qp81fp79J36aUWqUvegSStXkZ+m8Zcn62qrJjpVqQ9Y="; + src = fetchFromGitHub { + owner = "twisteroidambassador"; + repo = "async_stagger"; + rev = "refs/tags/v${version}"; + hash = "sha256-uJohc3EsAKevqT0J+N0Cqop3xy0PCM5jsP6YYtx+HuQ="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook pytest-asyncio @@ -28,8 +32,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # RuntimeError: Logic bug in... - "test_stagger_coro_gen" + # "OSError: [Errno 0] fileno not supported" during teardown + "test_create_connected_sock_normal" ]; pythonImportsCheck = [ "async_stagger" ]; diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 18969f48233de..d1719497d7ba5 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { # socket.gaierror: [Errno -2] Name or service not known "test_async_get_local_ip" "test_get_local_ip" - ] ++ lib.optionals stdenv.isDarwin [ "test_deferred_callback_url" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_deferred_callback_url" ]; disabledTestPaths = [ # Tries to bind to multicast socket and fails to find proper interface diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index 24837d824d6c9..c144b7da381f0 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncinotify"; - version = "4.0.9"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "absperf"; repo = "asyncinotify"; rev = "refs/tags/v${version}"; - hash = "sha256-Pmv1BXmKUNjFE5h99GR0GmjYKYmTi8ECKAUCKwIAMzc="; + hash = "sha256-SzsPYVA5fBXVcv7vE3FB4jFkIRr6NBlTeHrPxf5d8Ks="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index cdd6ac9b97811..5608a8632e473 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; # OSError: AF_UNIX path too long - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ "test_protocol_pause_resume" diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 427178dfa037b..bcbb85e7dca9e 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.15.0"; + version = "2.17.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ChOkOBb0bPCEZX+wVZaCO5PVtI5173djyKdW7BIXg3o="; + hash = "sha256-OxWcEFqjiMHiJFxPr0g/VArajK2ZQCKBEZEAFm5e2zw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index d095b203d72f1..59c42fd028383 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { disabledTests = [ # Failed: DID NOT RAISE <class 'asyncio.exceptions.TimeoutError'> "test_publish" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # OSError: [Errno 48] error while attempting to bind on address ('127.0.0.1',... "test_anonymous_rejection" "test_certificate_handling_success" diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index d0df75b17dd53..97ad3303da4c7 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -2,23 +2,32 @@ lib, asn1crypto, buildPythonPackage, + cryptography, fetchPypi, + h11, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "asysocks"; - version = "0.2.12"; - format = "setuptools"; + version = "0.2.13"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uilvJjuZrvdC2m4zhXCkbzLjwtbC1liWEZ20Ya7FYJ0="; + hash = "sha256-RBhbLEceY7cpMXOWfu87D15g7VzBt2UKMKlWnkn/Jfg="; }; - propagatedBuildInputs = [ asn1crypto ]; + build-system = [ setuptools ]; + + dependencies = [ + asn1crypto + cryptography + h11 + ]; # Upstream hasn't release the tests yet doCheck = false; diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index 1dde4152f0ace..f60b281112cd5 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, async-timeout, - pysnmp-lextudio, + pysnmp, pythonOlder, poetry-core, }: @@ -20,11 +20,16 @@ buildPythonPackage rec { hash = "sha256-KzRoE4tE/tQkKYroq5PbWKREmEl8AwbIOg3IHRZZtsQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail pysnmp-lextudio pysnmp + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ async-timeout - pysnmp-lextudio + pysnmp ]; # Module has no test diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 5d1a308953820..20e01126b9745 100644 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.41.15"; + version = "3.41.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DnsDulCbkilfD51r8x/L3RJXTDclAi4gYNktfuQC0w8="; + hash = "sha256-HhFGM8EPGCT3WqVf6WP6VvwsppvzFvHg+ys7GhUUwW0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix index 88d2d9af34340..64b89bb1897fc 100644 --- a/pkgs/development/python-modules/aubio/default.nix +++ b/pkgs/development/python-modules/aubio/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { }) ]; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Accelerate diff --git a/pkgs/development/python-modules/audible/default.nix b/pkgs/development/python-modules/audible/default.nix index 1eb984dcbc162..87a809bfe1ed2 100644 --- a/pkgs/development/python-modules/audible/default.nix +++ b/pkgs/development/python-modules/audible/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "audible"; - version = "0.9.1"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "mkb79"; repo = "Audible"; rev = "refs/tags/v${version}"; - hash = "sha256-qLU8FjJBPKFgjpumPqRiiMBwZi+zW46iEmWM8UerMgs="; + hash = "sha256-ILGhjuPIxpRxu/dVDmz531FUgMWosk4P+onPJltuPIs="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix index a6b485d7b2c9c..b714062be313e 100644 --- a/pkgs/development/python-modules/audiotools/default.nix +++ b/pkgs/development/python-modules/audiotools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AudioUnit CoreServices diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix index f9e843ec7a574..c6afff489d654 100644 --- a/pkgs/development/python-modules/autarco/default.nix +++ b/pkgs/development/python-modules/autarco/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "autarco"; - version = "2.0.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-autarco"; rev = "refs/tags/v${version}"; - hash = "sha256-e/wi4suDMSQTaSdyYsTiBxVUNvisYBVPqy9Rpk0lwJw="; + hash = "sha256-7Q6kvJxhds0myu3pMOLSCJKwoGPzHjNSo8H3ctgFvjM="; }; pythonRelaxDeps = [ "orjson" ]; diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index b292153e7d627..3958abba6de3e 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.7.1"; + version = "4.7.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "auth0"; repo = "auth0-python"; rev = "refs/tags/${version}"; - hash = "sha256-udtrvAr8wfg1DbNbBEjA/tlrYhIiXtTFqi4bZCuKI0Q="; + hash = "sha256-g6sbxPglKDGbDMiB9crnua86y6TPIbLiFddeymrLAP0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index 10596261a5f6d..d4c9a525d87f0 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -12,27 +12,29 @@ pytestCheckHook, pythonOlder, requests, + setuptools, starlette, werkzeug, }: buildPythonPackage rec { pname = "authlib"; - version = "1.3.1"; - format = "setuptools"; + version = "1.3.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "lepture"; repo = "authlib"; rev = "refs/tags/v${version}"; - hash = "sha256-5AZca4APi2gLwj/AHtXOPzIFnJkCmK9mDV0bAAvIx8A="; + hash = "sha256-gaFnai5QzHhnyn73JB+QzybaolLWC9barBFdnlEMyMU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cryptography - requests ]; nativeCheckInputs = [ @@ -43,6 +45,7 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook + requests starlette werkzeug ]; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 08187be3a2e80..98f2f16b1f74f 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, attrs, argon2-cffi, base58, @@ -28,7 +28,7 @@ pygobject3, pyopenssl, qrcode, - pytest-asyncio_0_21, + pytest-asyncio, python-snappy, pytestCheckHook, pythonOlder, @@ -50,21 +50,18 @@ buildPythonPackage rec { pname = "autobahn"; - version = "23.6.2"; + version = "24.4.2"; pyproject = true; disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-7JQhxSohAzZNHvBGgDbmAZ7oT3FyHoazb+Ga1pZsEYE="; + src = fetchFromGitHub { + owner = "crossbario"; + repo = "autobahn-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-aeTE4a37zr83KZ+v947XikzFrHAhkZ4mj4tXdkQnB84="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "pytest>=2.8.6,<3.3.0" "pytest" - ''; - build-system = [ setuptools ]; dependencies = [ @@ -77,7 +74,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock - pytest-asyncio_0_21 + pytest-asyncio pytestCheckHook ] ++ optional-dependencies.scram ++ optional-dependencies.serialization ++ optional-dependencies.xbr; @@ -87,7 +84,10 @@ buildPythonPackage rec { export USE_ASYNCIO=1 ''; - pytestFlagsArray = [ "--pyargs autobahn" ]; + pytestFlagsArray = [ + "--ignore=./autobahn/twisted" + "./autobahn" + ]; pythonImportsCheck = [ "autobahn" ]; @@ -141,6 +141,7 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://github.com/crossbario/autobahn-python/blob/${src.rev}/docs/changelog.rst"; description = "WebSocket and WAMP in Python for Twisted and asyncio"; homepage = "https://crossbar.io/autobahn"; license = licenses.mit; diff --git a/pkgs/development/python-modules/autotrash/default.nix b/pkgs/development/python-modules/autotrash/default.nix deleted file mode 100644 index 6c628b3925357..0000000000000 --- a/pkgs/development/python-modules/autotrash/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - poetry-core, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "autotrash"; - version = "0.4.7"; - pyproject = true; - - src = fetchFromGitHub { - owner = "bneijt"; - repo = "autotrash"; - rev = "refs/tags/${version}"; - hash = "sha256-qMU3jjBL5+fd9vKX5BIqES5AM8D/54aBOmdHFiBtfEo="; - }; - - build-system = [ poetry-core ]; - - pythonImportsCheck = [ "autotrash" ]; - nativeCheckInputs = [ pytestCheckHook ]; - - meta = { - description = "Tool to automatically purge old trashed files"; - license = lib.licenses.gpl3Plus; - homepage = "https://bneijt.nl/pr/autotrash"; - maintainers = with lib.maintainers; [ sigmanificient ]; - mainProgram = "autotrash"; - }; -} diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index a030344e8f4c3..e3da4e6427cc4 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { ]; # `__darwinAllowLocalNetworking` doesn’t work for these; not sure why. - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_timeout.py" ]; diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix index af6162dc92637..808530221781f 100644 --- a/pkgs/development/python-modules/avwx-engine/default.nix +++ b/pkgs/development/python-modules/avwx-engine/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { xmltodict ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ numpy rapidfuzz @@ -61,7 +61,7 @@ buildPythonPackage rec { pytest-cov-stub pytestCheckHook time-machine - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "avwx" ]; diff --git a/pkgs/development/python-modules/aw-core/default.nix b/pkgs/development/python-modules/aw-core/default.nix index 84b13c6f100de..591c862597d52 100644 --- a/pkgs/development/python-modules/aw-core/default.nix +++ b/pkgs/development/python-modules/aw-core/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aw-core"; - version = "0.5.16"; + version = "0.5.17"; format = "pyproject"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "ActivityWatch"; repo = "aw-core"; rev = "v${version}"; - sha256 = "sha256-7xT7bOGzH5G4WpgNo8pDyiQqX0dWNLNHpgssozUa9kQ="; + sha256 = "sha256-bKxf+fqm+6V3JgDluKVpqq5hRL3Z+x8SHMRQmNe8vUA="; }; disabled = pythonOlder "3.8"; @@ -51,7 +51,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "platformdirs" - "iso8601" ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -65,11 +64,11 @@ buildPythonPackage rec { passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "Core library for ActivityWatch"; mainProgram = "aw-cli"; homepage = "https://github.com/ActivityWatch/aw-core"; - maintainers = with maintainers; [ huantian ]; - license = licenses.mpl20; + maintainers = with lib.maintainers; [ huantian ]; + license = lib.licenses.mpl20; }; } diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index b6ff257f71d1d..f503f2ad0af5b 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, cmake, ninja, @@ -12,15 +11,13 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "37"; + version = "38"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "awkward_cpp"; inherit version; - hash = "sha256-bf9fzkr8rbSSu/fLIJCFctmb3DKqK+qGgbrPtpsqqG0="; + hash = "sha256-l0SVah14fD0hXqE8WqG2EQnIk/Ad0e/i2mj1jt6K0Vs="; }; build-system = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 4bcfc343458db..aefec7c8f3266 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -32,16 +32,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.6.7"; + version = "2.6.8"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-6Q2eXriMYmfrgv69ytxvyrxK9HPMX8AIZ3ZStZUMGIk="; + hash = "sha256-2VhG4Elv1neBEfogfhjwlPltQK64wjaLUMhDg7xB/Ow="; }; build-system = [ @@ -74,7 +72,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # no support for darwin jax jaxlib @@ -84,7 +82,13 @@ buildPythonPackage rec { disabledTestPaths = [ "tests-cuda" # Disable tests dependending on jax on darwin - ] ++ lib.optionals stdenv.isDarwin [ "tests/test_2603_custom_behaviors_with_jax.py" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_2603_custom_behaviors_with_jax.py" ]; + + disabledTests = [ + # AssertionError: Regex pattern did not match. + "test_serialise_with_nonserialisable_attrs" + "test_serialise_with_nonserialisable_attrs" + ]; meta = { description = "Manipulate JSON-like data with NumPy-like idioms"; diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 3201deab50299..08c902f138329 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,22 +12,22 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.21.2"; + version = "0.21.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N6zijQ16kfkIYt0plIcqFZYre08TduC3sBqCGVRhFQc="; + hash = "sha256-fsKmevMPvzhklN8Au9+Zb3AkAA32sBqxYAFK/vK5EAU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; - nativeBuildInputs = [ cmake ] ++ lib.optionals (!stdenv.isDarwin) [ perl ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ perl ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/awsiotsdk/default.nix b/pkgs/development/python-modules/awsiotsdk/default.nix new file mode 100644 index 0000000000000..080efc5476dad --- /dev/null +++ b/pkgs/development/python-modules/awsiotsdk/default.nix @@ -0,0 +1,51 @@ +{ + lib, + awscrt, + boto3, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "awsiotsdk"; + version = "1.22.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-iot-device-sdk-python-v2"; + rev = "refs/tags/v${version}"; + hash = "sha256-2ZMNG+6yshEvjEpyN6uV62m11LZUrUHAzpRbm1foif0="; + }; + + pythonRelaxDeps = [ "awscrt" ]; + + build-system = [ setuptools ]; + + dependencies = [ awscrt ]; + + nativeCheckInputs = [ + boto3 + pytestCheckHook + ]; + + disabledTestPaths = [ + # Those tests require a custom loader + "servicetests/" + ]; + + pythonImportsCheck = [ "awsiot" ]; + + meta = { + description = "Next generation AWS IoT Client SDK for Python using the AWS Common Runtime"; + homepage = "https://github.com/aws/aws-iot-device-sdk-python-v2"; + changelog = "https://github.com/aws/aws-iot-device-sdk-python-v2/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index a831b5300eb90..e72e6baa62477 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, isPy27, pytestCheckHook, autoconf271, @@ -11,14 +10,14 @@ cmake, gcc, libtool, + parameterized, perl, setuptools, simplejson, }: - buildPythonPackage rec { pname = "awslambdaric"; - version = "2.0.11"; + version = "2.2.1"; pyproject = true; disabled = isPy27; @@ -27,22 +26,9 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; rev = "refs/tags/${version}"; - sha256 = "sha256-9DiUpgeL4bY7G3b5R06FjpN0st03F84fj0bhp70moKo="; + sha256 = "sha256-IA2Kx4+U0+8lPl9TTTZC46Y3WhSUb5HR5Hr9QZSJIDU="; }; - patches = [ - (fetchpatch { - # https://github.com/aws/aws-lambda-python-runtime-interface-client/pull/58 - url = "https://github.com/aws/aws-lambda-python-runtime-interface-client/commit/162c3c0051bb9daa92e4a2a4af7e90aea60ee405.patch"; - sha256 = "09qqq5x6npc9jw2qbhzifqn5sqiby4smiin1aw30psmlp21fv7j8"; - }) - ]; - - postPatch = '' - substituteInPlace requirements/base.txt \ - --replace 'simplejson==3' 'simplejson~=3' - ''; - propagatedBuildInputs = [ simplejson ]; nativeBuildInputs = [ @@ -58,11 +44,9 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTests = [ - # Test fails with: Assertion error - "test_handle_event_request_fault_exception_logging_syntax_error" + nativeCheckInputs = [ + parameterized + pytestCheckHook ]; pythonImportsCheck = [ @@ -71,7 +55,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; description = "AWS Lambda Runtime Interface Client for Python"; homepage = "https://github.com/aws/aws-lambda-python-runtime-interface-client"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 3f770c272c552..5ef6e53e67437 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { requests-aws4auth ]; - passthru.optional-dependencies = { + optional-dependencies = { sqlserver = [ pyodbc ]; sparql = [ sparqlwrapper ]; }; diff --git a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix new file mode 100644 index 0000000000000..3e2819fa0feaf --- /dev/null +++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix @@ -0,0 +1,52 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + lib, + pytest-asyncio, + pytestCheckHook, + requests, + setuptools, + ujson, +}: + +buildPythonPackage rec { + pname = "ayla-iot-unofficial"; + version = "1.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rewardone"; + repo = "ayla-iot-unofficial"; + rev = "refs/tags/v${version}"; + hash = "sha256-SAfDpABOWsic3kqsN0txlchEIRKJ0xtpJERZUH5CKR0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + requests + ujson + ]; + + pythonImportsCheck = [ "ayla_iot_unofficial" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/ayla_iot_unofficial.py" ]; + + # tests interact with the actual API + doCheck = false; + + meta = { + changelog = "https://github.com/rewardone/ayla-iot-unofficial/releases/tag/v${version}"; + description = "Unofficial python library for interacting with the Ayla IoT API"; + homepage = "https://github.com/rewardone/ayla-iot-unofficial"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index 33f24c827fdbe..02d8447c12ade 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-appconfiguration"; - version = "1.6.0"; + version = "1.7.1"; pyporject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-z2KKPh6mZDR5ZDzSRt2kZO3Eq3hXQzOaao/oCbwTf+w="; + hash = "sha256-Pr5B6b4/SubKYeXbxCxLfMAHoBBUqFBlAaJt/Bmf0+w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 67178fac58aaa..14fa56f4958d0 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ aiohttp ]; }; @@ -54,7 +54,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trio - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # test server needs to be available preCheck = '' @@ -75,7 +75,7 @@ buildPythonPackage rec { # disable 8 tests failing on some darwin machines with errors: # azure.core.polling.base_polling.BadStatus: Invalid return status 403 for 'GET' operation # azure.core.exceptions.HttpResponseError: Operation returned an invalid status 'Forbidden' - ] ++ lib.optionals stdenv.isDarwin [ "location_polling_fail" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "location_polling_fail" ]; disabledTestPaths = [ # requires testing modules which aren't published, and likely to create cyclic dependencies diff --git a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix index 8d66700b5413c..0be4aa8e3c01a 100644 --- a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-appcontainers"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oqKPEOnZaIU7IMzDqT552IBJr9RtWt3vFO3SlG8igs0="; + hash = "sha256-PHlDnxK8788UCvjG572LUWJOlx/ZH1rOmKzAc8Lm+uw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 27ec12780e71c..d41e95e2e42ea 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "31.0.0"; + version = "33.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WlscT8GhnssCKhLe0b6LGxVfaXnQP7nvwEZC9gZkS78="; + hash = "sha256-o8wP5PCcjh01I8G/uSYg3+JjoKiTsKwToz1wV+nd3dI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 68d45218f7888..876c7f25fdec4 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "31.0.0"; + version = "32.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-E0NY1/iMTSm0AJ+R12GYYeH61dvqXhR0At1hrZa1Yko="; + pname = "azure_mgmt_containerservice"; + inherit version; + hash = "sha256-zLWHR52Kk+x49xYlkK3ILk+6TeduStw0GfM60iXvspI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 2ae19e4d8e256..ff5d9d0bf27b2 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -6,21 +6,25 @@ fetchPypi, isodate, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "9.5.1"; - format = "setuptools"; + version = "9.6.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-TlXTlz8RzwLPeoBVruhmFSM9fL47siegfBdrrIvH7wI="; + pname = "azure_mgmt_cosmosdb"; + inherit version; + hash = "sha256-Znx9io9UKw55cuYydK9TatmFGH4kpswuPI7vNVYIgfw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ isodate azure-common azure-mgmt-core diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 3c511be3ca531..325db23d062f1 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "8.0.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-CL1Z50yjbEkncmKT4FhJ7UaOiUtw1CD85TVEJ7KHjQ4="; + hash = "sha256-j1TMe2/jkSVa7p4Ar9HmZjh56GNqtkHP+QbSuyTDT04="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 8d12b418a1942..0a5ca8dcfefc3 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "13.1.0"; + version = "13.2.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-8JzJFZTplNGo74wBelP8Geo7+FQ7WYmAOAef4jv533M="; + hash = "sha256-31wzzDeQrs04AL8Qsz050RY/AllvXwy+8Ng+QbUihjo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 8e0590238007c..735184f21b1a9 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-network"; - version = "25.4.0"; + version = "26.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ozjmLYH9vwUPgCFDwoy5ZbB+3UOADvBQTN+muIVNdVQ="; + hash = "sha256-TeZ2GEGVBT/bEGpuoQQqiU5wxzGm08imM9UvUin07hs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix index 9e3f437ced846..aeb519515bebe 100644 --- a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix @@ -5,30 +5,32 @@ buildPythonPackage, fetchPypi, isodate, - msrest, pythonOlder, + setuptools, typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-privatedns"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-MtucYFpKj/ANNON1UdXrBrTsJnq53iph3SJ1ypWj+5g="; - extension = "zip"; + pname = "azure_mgmt_privatedns"; + inherit version; + hash = "sha256-NCMYcvAblPYZXY7lQo4XRpJS7QTqCCjVIyXr578KEgs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core isodate - msrest - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + typing-extensions + ]; # no tests included doCheck = false; @@ -40,7 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure DNS Private Zones Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/network/azure-mgmt-privatedns"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-privatedns_${version}/sdk/network/azure-mgmt-privatedns/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index adbae42173ca9..aec11200508d4 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "7.3.0"; + version = "7.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IDK/TVDfC7uCLqAMrDv74OZ0h9LJzBGCwIWPgxSc3qk="; + hash = "sha256-h7dxQ2vJmnqN9Z0K0YW5aHmgbc4UdkoGs/w9r6j8tWs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 994394d3aec4b..1a8a6b49031b0 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "azure-multiapi-storage"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-CQuoWHeh0EMitTRsvifotrTwpWd/Q9LWWD7jZ2w9r8I="; + hash = "sha256-tlKogIs39tIoMVl3p/YConfPdPrpX9oc9WqQ+FuhgQk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 9a3ed6f0a1e98..5169b9a733662 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,14 +12,15 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.17.0"; + version = "12.18.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-97LGz8G3y4AJelOx7S76nlRbSaKRQw02nNtJ+vvIQdY="; + pname = "azure_storage_file_share"; + inherit version; + hash = "sha256-CoHa7l4TWYrM3jxzsa7Mxu39zsXpV79AFQwGIvuV3HY="; }; build-system = [ setuptools ]; @@ -31,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ azure-core ] ++ azure-core.optional-dependencies.aio; }; diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index c6fcce00fddd3..dbeb4286bbfea 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -12,26 +12,27 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.11.0"; + version = "12.12.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-Cox3eDnbpcUIJMrEivo8xWvgRPqkXKYbcmnrMZ6/AXE="; + pname = "azure_storage_queue"; + inherit version; + hash = "sha256-uvLxvIK31PUpGSLD6k8jziJD6ULb50lPyheCKQs38eQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-core cryptography isodate typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ azure-core ] ++ azure-core.optional-dependencies.aio; }; diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 3bcca268dab33..7b56d75ddd03f 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook tqdm - ] ++ lib.optionals stdenv.isLinux [ glibcLocales ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glibcLocales ]; disabledTestPaths = [ # requires aws s3 auth diff --git a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix index a9aa34ec01acd..103ee2561aaae 100644 --- a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix +++ b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "backports-datetime-fromisoformat"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "movermeyer"; repo = "backports.datetime_fromisoformat"; rev = "refs/tags/v${version}"; - hash = "sha256-c3LCTOKva99+x96iLHNnL1e1Ft1M1CsjQX+nEqAlXUs="; + hash = "sha256-v9Njic7zN2bv1lQgdbJNeZLF3VXcC9A4UoE/znLF0gM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index 8495ccf626f7e..bb91d65287bf3 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.9"; + version = "1.7.10"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fDlaQ2dDAY974KTLsKTqm5ArbYcmTd7PjP3HO094/2E="; + hash = "sha256-We1cr12Stq2kv2W8ZDf+6kqdoQkzhERf7U1HKsxs/3s="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/base2048/default.nix b/pkgs/development/python-modules/base2048/default.nix index e092fecc1c1c2..9deaf973f7937 100644 --- a/pkgs/development/python-modules/base2048/default.nix +++ b/pkgs/development/python-modules/base2048/default.nix @@ -39,9 +39,9 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - passthru.optional-dependencies = { + optional-dependencies = { fuzz = [ frelatage ]; }; diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index 24b86e8f224b5..582a6d507e6db 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "bayes_opt" ]; meta = with lib; { - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; description = '' A Python implementation of global optimization with gaussian processes ''; diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index 526562f1286a7..3a0884103c7b1 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.5.15"; + version = "1.5.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-D4TJnaxaCCJWgDPbGvbxkW6yg/Ph1jaIT9QBjxFcxAw="; + hash = "sha256-SXwaZv7aki+lQvRe6S5SLF7UFvf3n9MaUFqw2Um8ENg="; }; build-system = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { unidiff ]; - passthru.optional-dependencies = { + optional-dependencies = { word_list = [ pyahocorasick ]; gibberish = [ gibberish-detector ]; }; @@ -47,7 +47,7 @@ buildPythonPackage rec { pkgs.gitMinimal pytestCheckHook responses - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 396a9668b777c..ee51533e6e3aa 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; # Remove when https://github.com/NixOS/nixpkgs/pull/190093 lands. - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix index 98b5c8faed110..c798ada3ff0b1 100644 --- a/pkgs/development/python-modules/beanhub-cli/default.nix +++ b/pkgs/development/python-modules/beanhub-cli/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "beanhub-cli"; - version = "1.2.3"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-cli"; rev = "refs/tags/${version}"; - hash = "sha256-oHlI3hloquD86fHr3AgwW5SqKxUw2gphP76wi6mCy44="; + hash = "sha256-P6XypAiMHaxOzGn+R7G6o/1c+lIOV/LqUmeRaMOVLNg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/beanhub-import/default.nix b/pkgs/development/python-modules/beanhub-import/default.nix index bfb3480bac996..9a844507f2ad1 100644 --- a/pkgs/development/python-modules/beanhub-import/default.nix +++ b/pkgs/development/python-modules/beanhub-import/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "beanhub-import"; - version = "0.3.4"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-import"; rev = "refs/tags/${version}"; - hash = "sha256-igaW8vFUYagBfVQXL1Ulo7uhGilbOxxuyZV9Eda/Gto="; + hash = "sha256-6Y1gYAi8A6H0a0vj2avWxGS7hvjrvLBUS+LsgvY4sZo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 4ebcfd4128df6..764f91ec409e4 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -47,14 +47,14 @@ buildPythonPackage rec { soupsieve ]; - passthru.optional-dependencies = { + optional-dependencies = { html5lib = [ html5lib ]; lxml = [ lxml ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "bs4" ]; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index e7a9de7f1bc0d..30f6c81c851d4 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -60,7 +60,9 @@ buildPythonPackage rec { # timing-based test flaky on Darwin # https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824 - disabledTests = lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + "test_step_decorator_async_run_until_complete" + ]; postCheck = '' ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index bdda94a0f499e..e75685b747689 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.40.4"; + version = "0.40.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-9YReXaD4qmd2gzbGwzhslzT4K3ajCQrCN7TVl/6fOMU="; + hash = "sha256-c0ebEulI1wY/ws6eqgkMQbprq5bzv+hJW0WDPkW/sys="; }; postPatch = '' diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix index bf6c93b633d3e..01135c55dbbf1 100644 --- a/pkgs/development/python-modules/berkeleydb/default.nix +++ b/pkgs/development/python-modules/berkeleydb/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, setuptools, @@ -19,6 +20,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; + # Every test currently fails with: + # berkeleydb.db.DBRunRecoveryError: (-30973, 'BDB0087 DB_RUNRECOVERY: Fatal error, run database recovery -- BDB1546 unable to join the environment') + doCheck = !stdenv.isDarwin; + checkPhase = '' ${python.interpreter} test.py ''; diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index 5f42d46b1e588..ab36e1dda5628 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies.compiler = [ + optional-dependencies.compiler = [ black jinja2 isort @@ -54,7 +54,7 @@ buildPythonPackage rec { pytest-mock pytest7CheckHook tomlkit - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "betterproto" ]; diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index 75e799ce44b97..43cb84bac0ed1 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -2,29 +2,39 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - poetry-core, - protobuf, + rustPlatform, pytestCheckHook, }: buildPythonPackage rec { pname = "biliass"; - version = "1.3.11"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + version = "2.0.0-beta.1"; + pyproject = true; src = fetchFromGitHub { owner = "yutto-dev"; - repo = "biliass"; - rev = "refs/tags/v${version}"; - hash = "sha256-hBorYAqtxTZ4LElxxJOGxC2g7sBRhRKVv6HOVHZn9FA="; + repo = "yutto"; + rev = "refs/tags/biliass@${version}"; + hash = "sha256-Clma0Ggkphk6F+K+h3TdMUX4WyWQorh9g2uAT4+Fc9I="; }; - nativeBuildInputs = [ poetry-core ]; + sourceRoot = "source/packages/biliass"; + cargoRoot = "rust"; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit + pname + version + src + ; + sourceRoot = "${sourceRoot}/${cargoRoot}"; + hash = "sha256-h/UOolWQ2k5krOZy/kPywpeiLyXWLzvNu+pcn97or1A="; + }; - propagatedBuildInputs = [ protobuf ]; + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; doCheck = false; # test artifacts missing diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index d3358fe645639..4604eb15f43d3 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -1,7 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, pytestCheckHook, psutil, pythonOlder, @@ -9,33 +10,32 @@ buildPythonPackage rec { pname = "billiard"; - version = "4.2.0"; - format = "setuptools"; + version = "4.2.1"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-mjwxhMsnWqF6cy+T9lsgxSXT2fJTci0mqCGUgDreWiw="; + src = fetchFromGitHub { + owner = "celery"; + repo = "billiard"; + rev = "refs/tags/v${version}"; + hash = "sha256-9LuAlIn6hNiZGvWuaaDQxx9g0aBVF6Z2krxEOrssqRs="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ psutil pytestCheckHook ]; - disabledTests = [ - # psutil.NoSuchProcess: process no longer exists (pid=168) - "test_set_pdeathsig" - ]; - pythonImportsCheck = [ "billiard" ]; - meta = with lib; { + meta = { description = "Python multiprocessing fork with improvements and bugfixes"; homepage = "https://github.com/celery/billiard"; changelog = "https://github.com/celery/billiard/blob/v${version}/CHANGES.txt"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 86573d8c19f42..da526eeba18d2 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.16.1"; + version = "0.16.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-rklWek0XDedJXxVlRLLVMOkU0wMOlv8+Uzn8aVAmc2k="; + hash = "sha256-IrGOhUnWTtCI5juFFuNdWSWxeFr7s8bRNT8sUludGo0="; }; build-system = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { pyjwt ]; - passthru.optional-dependencies = { + optional-dependencies = { china = [ pillow ]; }; @@ -57,7 +57,7 @@ buildPythonPackage rec { pytestCheckHook respx time-machine - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # presumably regressed in pytest-asyncio 0.23.0 diff --git a/pkgs/development/python-modules/binance-connector/default.nix b/pkgs/development/python-modules/binance-connector/default.nix index 5e76268d7cf42..cec5c8b4a4ad7 100644 --- a/pkgs/development/python-modules/binance-connector/default.nix +++ b/pkgs/development/python-modules/binance-connector/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "binance-connector"; - version = "3.8.1"; + version = "3.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "binance"; repo = "${pname}-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VUv9n+GePixsJ2Bqy4YOJpHEVkOjEO1HkBK+jxmkZpA="; + hash = "sha256-i0dJ7UO7HZ9bWhWtWBZ5OwloRBUiZgUKRXab4sm2w/o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix index 8acd7ecf7cf08..7feb91d8d9713 100644 --- a/pkgs/development/python-modules/bindep/default.nix +++ b/pkgs/development/python-modules/bindep/default.nix @@ -1,42 +1,49 @@ { lib, - python3Packages, + buildPythonPackage, + distro, fetchPypi, + packaging, + parsley, + pbr, + setuptools, }: -python3Packages.buildPythonPackage rec { + +buildPythonPackage rec { pname = "bindep"; version = "2.11.0"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-rLLyWbzh/RUIhzR5YJu95bmq5Qg3hHamjWtqGQAufi8="; }; - buildInputs = with python3Packages; [ + env.PBR_VERSION = version; + + build-system = [ distro pbr setuptools ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = [ parsley pbr packaging distro ]; - patchPhase = '' - # Setting the pbr version will skip any version checking logic - # This is required because pbr thinks it gets it's own version from git tags - # See https://docs.openstack.org/pbr/latest/user/packagers.html - export PBR_VERSION=5.11.1 - ''; + # Checks moved to 'passthru.tests' to workaround infinite recursion + doCheck = false; + + pythonImportsCheck = [ "bindep" ]; meta = with lib; { description = "Bindep is a tool for checking the presence of binary packages needed to use an application / library"; homepage = "https://docs.opendev.org/opendev/bindep/latest/"; license = licenses.asl20; - maintainers = with maintainers; [ melkor333 ]; + mainProgram = "bindep"; + maintainers = teams.openstack.members; }; } diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 25365c67fbde3..024bd4d2dea36 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { pyqtgraph pyqt5 ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ cramfsprogs cramfsswap sasquatch diff --git a/pkgs/development/python-modules/biopandas/default.nix b/pkgs/development/python-modules/biopandas/default.nix index 998974d90ee1c..fcb3bbe926d14 100644 --- a/pkgs/development/python-modules/biopandas/default.nix +++ b/pkgs/development/python-modules/biopandas/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = { description = "Working with molecular structures in pandas DataFrames"; homepage = "https://github.com/BioPandas/biopandas"; - changelog = "https://github.com/BioPandas/biopandas/releases/tag/${src.rev}"; + changelog = "https://github.com/BioPandas/biopandas/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 06b53f599e30d..f2648124c05c2 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { colorama = [ colorama ]; d = [ aiohttp ]; uvloop = [ uvloop ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook parameterized - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "-W" @@ -86,7 +86,7 @@ buildPythonPackage rec { # Make /build the project root for black tests to avoid excluding files. touch ../.git '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Work around https://github.com/psf/black/issues/2105 export TMPDIR="/tmp" ''; @@ -96,7 +96,7 @@ buildPythonPackage rec { # requires network access "test_gen_check_output" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails on darwin "test_expression_diff" # Fail on Hydra, see https://github.com/NixOS/nixpkgs/pull/130785 @@ -104,7 +104,7 @@ buildPythonPackage rec { "test_skip_magic_trailing_comma" ]; # multiple tests exceed max open files on hydra builders - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); meta = with lib; { description = "Uncompromising Python code formatter"; diff --git a/pkgs/development/python-modules/blacken-docs/default.nix b/pkgs/development/python-modules/blacken-docs/default.nix new file mode 100644 index 0000000000000..7370471c2604f --- /dev/null +++ b/pkgs/development/python-modules/blacken-docs/default.nix @@ -0,0 +1,42 @@ +{ + black, + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "blacken-docs"; + version = "1.15.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "adamchainz"; + repo = "blacken-docs"; + rev = version; + hash = "sha256-3FGuFOAHCcybPwujWlh58NWtuF5CebaKTgBWgCGpSL8="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + black + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/adamchainz/blacken-docs"; + changelog = "https://github.com/adamchainz/blacken-docs/blob/${src.rev}/CHANGELOG.rst"; + description = "Run Black on Python code blocks in documentation files"; + license = licenses.mit; + maintainers = with maintainers; [ l0b0 ]; + mainProgram = "blacken-docs"; + }; +} diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 9f7917738665b..7fd97a4c27075 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -24,16 +23,14 @@ buildPythonPackage rec { pname = "blackjax"; - version = "1.2.3"; + version = "1.2.4"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "blackjax-devs"; repo = "blackjax"; rev = "refs/tags/${version}"; - hash = "sha256-f1piE79TLVLtIe9/DaLhXss/ifhU719nEylyl70SVJc="; + hash = "sha256-qaQBbRAKExRHr4Uhm5/Q1Ydon6ePsjG2PWbwSdR9QZM="; }; build-system = [ setuptools-scm ]; @@ -54,7 +51,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/test_benchmarks.py" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Assertion errors on numerical values "tests/mcmc/test_integrators.py" ]; @@ -64,7 +61,7 @@ buildPythonPackage rec { # too slow "test_adaptive_tempered_smc" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Numerical test (AssertionError) # https://github.com/blackjax-devs/blackjax/issues/668 "test_chees_adaptation" diff --git a/pkgs/development/python-modules/blackrenderer/default.nix b/pkgs/development/python-modules/blackrenderer/default.nix new file mode 100644 index 0000000000000..98e404c2dbd6f --- /dev/null +++ b/pkgs/development/python-modules/blackrenderer/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + setuptools-scm, + fonttools, + uharfbuzz, + pycairo, + pillow, +}: + +buildPythonPackage rec { + pname = "blackrenderer"; + version = "0.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "BlackFoundryCom"; + repo = "black-renderer"; + rev = "refs/tags/v${version}"; + hash = "sha256-b2W0M32Y4HUyxObjvh0yMUBe5gfcSDXnw1GfhW7hoZk="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + fonttools + uharfbuzz + ]; + + optional-dependencies = { + cairo = [ pycairo ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pillow + ]; + + disabledTestPaths = [ + # Wants None existing fonts + "Tests/test_mainprog.py" + "Tests/test_glyph_render.py" + ]; + + pythonImportsCheck = [ "blackrenderer" ]; + + meta = { + description = "Renderer for OpenType COLR fonts, with multiple backends"; + homepage = "https://github.com/BlackFoundryCom/black-renderer"; + changelog = "https://github.com/BlackFoundryCom/black-renderer/releases/tag/v${version}"; + license = lib.licenses.asl20; + mainProgram = "blackrenderer"; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/blake3/Cargo.lock b/pkgs/development/python-modules/blake3/Cargo.lock new file mode 100644 index 0000000000000..7b8ef04d66e1e --- /dev/null +++ b/pkgs/development/python-modules/blake3/Cargo.lock @@ -0,0 +1,412 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "blake3" +version = "0.4.1" +dependencies = [ + "blake3 1.5.4", + "hex", + "pyo3", + "rayon", +] + +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "memmap2", + "rayon-core", +] + +[[package]] +name = "cc" +version = "1.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[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 = "memmap2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[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", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +dependencies = [ + "bitflags", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/pkgs/development/python-modules/blake3/default.nix b/pkgs/development/python-modules/blake3/default.nix new file mode 100644 index 0000000000000..c59998b8fb96c --- /dev/null +++ b/pkgs/development/python-modules/blake3/default.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + libiconv, + numpy, + pytestCheckHook, + rustPlatform, +}: + +buildPythonPackage rec { + pname = "blake3"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oconnor663"; + repo = "blake3-py"; + rev = "refs/tags/${version}"; + hash = "sha256-Ju40ea8IQMOPg9BiN47BMmr/WU8HptbqqzVI+jNGpA8="; + }; + + postPatch = '' + ln -s '${./Cargo.lock}' Cargo.lock + ''; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + nativeCheckInputs = [ + pytestCheckHook + numpy + ]; + + pythonImportsCheck = [ "blake3" ]; + + meta = { + description = "Python bindings for the BLAKE3 cryptographic hash function"; + homepage = "https://github.com/oconnor663/blake3-py"; + changelog = "https://github.com/oconnor663/blake3-py/releases/tag/${version}"; + license = with lib.licenses; [ + cc0 + asl20 + ]; + maintainers = with lib.maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 00fcd0bf91257..5adbde446d959 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { webencodings ]; - passthru.optional-dependencies = { + optional-dependencies = { css = [ tinycss2 ]; }; diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix deleted file mode 100644 index d4d4e887ce113..0000000000000 --- a/pkgs/development/python-modules/blessings/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - six, - nose, -}: - -buildPythonPackage rec { - pname = "blessings"; - version = "1.7"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "98e5854d805f50a5b58ac2333411b0482516a8210f23f43308baeb58d77c157d"; - }; - - # 4 failing tests, 2to3 - doCheck = false; - - propagatedBuildInputs = [ six ]; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests - ''; - - meta = with lib; { - homepage = "https://github.com/erikrose/blessings"; - description = "Thin, practical wrapper around terminal coloring, styling, and positioning"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - }; -} diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index f6075a7e5bc67..26cb315a62e04 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -3,33 +3,41 @@ buildPythonPackage, fetchFromGitHub, setuptools, - cython_0, + cython, hypothesis, numpy, pytestCheckHook, pythonOlder, + blis, + numpy_2, gitUpdater, }: buildPythonPackage rec { pname = "blis"; - version = "0.7.11"; + version = "1.0.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "explosion"; repo = "cython-blis"; - rev = "refs/tags/v${version}"; - hash = "sha256-p8pzGZc5OiiGTvXULDgzsBC3jIhovTKUq3RtPnQ/+to="; + rev = "refs/tags/release-v${version}"; + hash = "sha256-8JaQgTda1EBiZdSrZtKwJ8e/aDENQ+dMmTiH/t1ax5I="; }; postPatch = '' + # The commit pinning numpy to version 2 doesn't have any functional changes: + # https://github.com/explosion/cython-blis/pull/108 + # BLIS should thus work with numpy and numpy_2. + substituteInPlace pyproject.toml setup.py \ + --replace-fail "numpy>=2.0.0,<3.0.0" numpy + # See https://github.com/numpy/numpy/issues/21079 # has no functional difference as the name is only used in log output substituteInPlace blis/benchmark.py \ - --replace 'numpy.__config__.blas_ilp64_opt_info["libraries"]' '["dummy"]' + --replace-fail 'numpy.__config__.blas_ilp64_opt_info["libraries"]' '["dummy"]' ''; preCheck = '' @@ -37,12 +45,13 @@ buildPythonPackage rec { rm -rf ./blis ''; - nativeBuildInputs = [ + build-system = [ setuptools - cython_0 + cython + numpy ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ hypothesis @@ -52,16 +61,18 @@ buildPythonPackage rec { pythonImportsCheck = [ "blis" ]; passthru = { - # Do not update to BLIS 0.9.x until the following issue is resolved: - # https://github.com/explosion/thinc/issues/771#issuecomment-1255825935 - skipBulkUpdate = true; + tests = { + numpy_2 = blis.overridePythonAttrs (old: { + numpy = numpy_2; + }); + }; updateScript = gitUpdater { - rev-prefix = "v"; - ignoredVersions = "0\.9\..*"; + rev-prefix = "release-v"; }; }; meta = with lib; { + changelog = "https://github.com/explosion/cython-blis/releases/tag/release-v${version}"; description = "BLAS-like linear algebra library"; homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/blobfile/default.nix b/pkgs/development/python-modules/blobfile/default.nix index 3e4c1dc7da63c..9208381cc9e4e 100644 --- a/pkgs/development/python-modules/blobfile/default.nix +++ b/pkgs/development/python-modules/blobfile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "blobfile"; - version = "2.1.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "christopher-hesse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VBh1JMP+8FEqD0uXpxA5RRMFH9XIUb4FUgsPq3vZWHM="; + hash = "sha256-/v48rLvlN4lsfWKJvXRNuIO6jdsCgRcSPlJzdOfl3xk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index 7acdf490acb40..5859e00c6cd80 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -71,6 +71,10 @@ buildPythonPackage rec { disabledTests = [ # Test require network access "test_app_cleans_up_images" + # DeprecationWarning in dependency: reportlab + "test_align_option_1" + # Comparison w/ magic values in test + "test_generate_with_separate" ]; pythonImportsCheck = [ "blockdiag" ]; diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix index 1351b26698b89..fb1856f7a245e 100644 --- a/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, pyasyncore, pysnmp, + pysnmplib, pytestCheckHook, python-gnupg, pythonAtLeast, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "blocksat-cli"; - version = "2.4.6"; + version = "2.4.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,14 +26,17 @@ buildPythonPackage rec { owner = "Blockstream"; repo = "satellite"; rev = "refs/tags/v${version}"; - hash = "sha256-1gz2lAS/AHeY54AaVXGeofLC68KjAP7POsIaBL3v2EY="; + hash = "sha256-OmIQUrUH3kWgf+v+9Hl2OgDdGPwb3guNY0+H64CWkeg="; }; - nativeBuildInputs = [ setuptools ]; + pythonRelaxDeps = [ "pyasyncore" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ distro pysnmp + pysnmplib python-gnupg qrcode requests @@ -50,10 +54,10 @@ buildPythonPackage rec { meta = with lib; { description = "Blockstream Satellite CLI"; - mainProgram = "blocksat-cli"; homepage = "https://github.com/Blockstream/satellite"; changelog = "https://github.com/Blockstream/satellite/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ prusnak ]; + mainProgram = "blocksat-cli"; }; } diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix index 394589c86f42c..6e986b20840f4 100644 --- a/pkgs/development/python-modules/bloodyad/default.nix +++ b/pkgs/development/python-modules/bloodyad/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bloodyad"; - version = "2.0.6"; + version = "2.0.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "CravateRouge"; repo = "bloodyAD"; rev = "refs/tags/v${version}"; - hash = "sha256-o035D6GYG1Uf59tFAAMsMF9kiY3yE15EDOCkg4V4tr4="; + hash = "sha256-FfEOpu23dSanWQLw1c5TbYiD2oNT0voqJV0QvW2wksQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 12b9d8f048c87..b50a20eb84bf9 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -14,29 +14,29 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.19.4"; - format = "pyproject"; + version = "1.20.0"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "bluetooth-data-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-VoldKrlD/1Crw0tJcHoMGiLR8uTUI25IlwZ/1AICx84="; + hash = "sha256-qg2QZc95DD2uTO0fTwoNaPfL+QSrcqDwJvx41lIZDRs="; }; # The project can build both an optimized cython version and an unoptimized # python version. This ensures we fail if we build the wrong one. env.REQUIRE_CYTHON = 1; - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools ]; - propagatedBuildInputs = [ cryptography ]; + dependencies = [ cryptography ]; nativeCheckInputs = [ pytest-benchmark diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index bdd5665f59223..62c537e8de7ac 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -17,7 +17,6 @@ pytestCheckHook, pyyaml, setuptools, - setuptools-git-versioning, xyzservices, beautifulsoup4, channels, @@ -47,21 +46,21 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.5.0"; - format = "pyproject"; + version = "3.5.2"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Zeia3b6QDDevJaIFKuF0ttO6HvCMkf1att/XEuGEw5k="; + hash = "sha256-A6VKZ9tne4iBg0JxxiCngbODrlk69cPqIUkWR1REDQc="; }; src_test = fetchFromGitHub { owner = "bokeh"; - repo = pname; + repo = "bokeh"; rev = "refs/tags/${version}"; - hash = "sha256-PK9iLOCcivr4oF9Riq73dzxGfxzWRk3bdrCCpRrTv5g="; + hash = "sha256-MAv+6bwc5f+jZasRDsYTJ/ir0i1pYCuwqPMumsYWvws="; }; patches = [ @@ -72,11 +71,16 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "setuptools-git-versioning"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + + build-system = [ colorama nodejs setuptools - setuptools-git-versioning ]; nativeCheckInputs = [ @@ -106,7 +110,7 @@ buildPythonPackage rec { typing-extensions ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 contourpy numpy diff --git a/pkgs/development/python-modules/bonsai/default.nix b/pkgs/development/python-modules/bonsai/default.nix index 0f2c5f180f05b..ad14127686ce5 100644 --- a/pkgs/development/python-modules/bonsai/default.nix +++ b/pkgs/development/python-modules/bonsai/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { openldap ]; - passthru.optional-dependencies = { + optional-dependencies = { gevent = [ gevent ]; tornado = [ tornado ]; trio = [ trio ]; diff --git a/pkgs/development/python-modules/boto/0005-Don-t-mock-list-subclass.patch b/pkgs/development/python-modules/boto/0005-Don-t-mock-list-subclass.patch deleted file mode 100644 index 4add58640d7ae..0000000000000 --- a/pkgs/development/python-modules/boto/0005-Don-t-mock-list-subclass.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Jochen Sprickerhof <jspricke@debian.org> -Date: Thu, 15 Dec 2022 07:44:54 +0100 -Subject: Don't mock list subclass - ---- - tests/unit/ec2/test_volume.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/unit/ec2/test_volume.py b/tests/unit/ec2/test_volume.py -index 81d7f55..d4d8e4f 100644 ---- a/tests/unit/ec2/test_volume.py -+++ b/tests/unit/ec2/test_volume.py -@@ -55,7 +55,7 @@ class VolumeTests(unittest.TestCase): - @mock.patch("boto.resultset.ResultSet") - def test_startElement_with_name_tagSet_calls_ResultSet(self, ResultSet, startElement): - startElement.return_value = None -- result_set = mock.Mock(ResultSet([("item", Tag)])) -+ result_set = ResultSet([("item", Tag)]) - volume = Volume() - volume.tags = result_set - retval = volume.startElement("tagSet", None, None) diff --git a/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch b/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch deleted file mode 100644 index ac56210423753..0000000000000 --- a/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: python-boto/tests/unit/utils/test_utils.py -=================================================================== ---- python-boto.orig/tests/unit/utils/test_utils.py -+++ python-boto/tests/unit/utils/test_utils.py -@@ -85,7 +85,7 @@ class TestPassword(unittest.TestCase): - def hmac_hashfunc(cls, msg): - if not isinstance(msg, bytes): - msg = msg.encode('utf-8') -- return hmac.new(b'mysecretkey', msg) -+ return hmac.new(b'mysecretkey', msg, digestmod='sha256') - - class HMACPassword(Password): - hashfunc = hmac_hashfunc -@@ -95,15 +95,15 @@ class TestPassword(unittest.TestCase): - password.set('foo') - - self.assertEquals(str(password), -- hmac.new(b'mysecretkey', b'foo').hexdigest()) -+ hmac.new(b'mysecretkey', b'foo', digestmod='sha256').hexdigest()) - - def test_constructor(self): -- hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg) -+ hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg, digestmod='sha256') - - password = Password(hashfunc=hmac_hashfunc) - password.set('foo') - self.assertEquals(password.str, -- hmac.new(b'mysecretkey', b'foo').hexdigest()) -+ hmac.new(b'mysecretkey', b'foo', digestmod='sha256').hexdigest()) - - - class TestPythonizeName(unittest.TestCase): -Index: python-boto/boto/ecs/item.py -=================================================================== ---- python-boto.orig/boto/ecs/item.py -+++ python-boto/boto/ecs/item.py -@@ -22,6 +22,7 @@ - - import xml.sax - import cgi -+from html import escape - from boto.compat import six, StringIO - - class ResponseGroup(xml.sax.ContentHandler): -@@ -67,7 +68,7 @@ class ResponseGroup(xml.sax.ContentHandl - return None - - def endElement(self, name, value, connection): -- self._xml.write("%s</%s>" % (cgi.escape(value).replace("&amp;", "&"), name)) -+ self._xml.write("%s</%s>" % (escape(value).replace("&amp;", "&"), name)) - if len(self._nodepath) == 0: - return - obj = None diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix deleted file mode 100644 index 0d352c9e2c52a..0000000000000 --- a/pkgs/development/python-modules/boto/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - python, - nose, - mock, - requests, - httpretty, -}: - -buildPythonPackage rec { - pname = "boto"; - version = "2.49.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"; - }; - - patches = [ - # fixes hmac tests - # https://sources.debian.org/src/python-boto/2.49.0-4/debian/patches/bug-953970_python3.8-compat.patch/ - ./bug-953970_python3.8-compat.patch - # fixes test_startElement_with_name_tagSet_calls_ResultSet - # https://sources.debian.org/src/python-boto/2.49.0-4.1/debian/patches/0005-Don-t-mock-list-subclass.patch/ - ./0005-Don-t-mock-list-subclass.patch - ]; - - # boto is deprecated by upstream as of 2021-05-27 (https://github.com/boto/boto/commit/4980ac58764c3d401cb0b9552101f9c61c18f445) - # this patch is a bit simpler than https://github.com/boto/boto/pull/3898 - # as we don't have to take care of pythonOlder "3.3". - postPatch = '' - substituteInPlace boto/dynamodb/types.py --replace 'from collections import Mapping' 'from collections.abc import Mapping' - substituteInPlace boto/mws/connection.py --replace 'import collections' 'import collections.abc as collections' - ''; - - checkPhase = '' - ${python.interpreter} tests/test.py default - ''; - - nativeCheckInputs = [ - nose - mock - ]; - propagatedBuildInputs = [ - requests - httpretty - ]; - - meta = with lib; { - homepage = "https://github.com/boto/boto"; - license = licenses.mit; - description = "Python interface to Amazon Web Services"; - longDescription = '' - The boto module is an integrated interface to current and - future infrastructural services offered by Amazon Web - Services. This includes S3, SQS, EC2, among others. - ''; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 8d03a8c9d511c..fae0b5ff4fd37 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -9,7 +9,6 @@ mypy-boto3-account, mypy-boto3-acm, mypy-boto3-acm-pca, - mypy-boto3-alexaforbusiness, mypy-boto3-amp, mypy-boto3-amplify, mypy-boto3-amplifybackend, @@ -36,7 +35,6 @@ mypy-boto3-autoscaling-plans, mypy-boto3-backup, mypy-boto3-backup-gateway, - mypy-boto3-backupstorage, mypy-boto3-batch, mypy-boto3-billingconductor, mypy-boto3-braket, @@ -137,7 +135,6 @@ mypy-boto3-frauddetector, mypy-boto3-fsx, mypy-boto3-gamelift, - mypy-boto3-gamesparks, mypy-boto3-glacier, mypy-boto3-globalaccelerator, mypy-boto3-glue, @@ -148,7 +145,6 @@ mypy-boto3-guardduty, mypy-boto3-health, mypy-boto3-healthlake, - mypy-boto3-honeycode, mypy-boto3-iam, mypy-boto3-identitystore, mypy-boto3-imagebuilder, @@ -159,7 +155,6 @@ mypy-boto3-iot, mypy-boto3-iot-data, mypy-boto3-iot-jobs-data, - mypy-boto3-iot-roborunner, mypy-boto3-iot1click-devices, mypy-boto3-iot1click-projects, mypy-boto3-iotanalytics, @@ -207,7 +202,6 @@ mypy-boto3-lookoutvision, mypy-boto3-m2, mypy-boto3-machinelearning, - mypy-boto3-macie, mypy-boto3-macie2, mypy-boto3-managedblockchain, mypy-boto3-managedblockchain-query, @@ -232,7 +226,6 @@ mypy-boto3-migrationhub-config, mypy-boto3-migrationhuborchestrator, mypy-boto3-migrationhubstrategy, - mypy-boto3-mobile, mypy-boto3-mq, mypy-boto3-mturk, mypy-boto3-mwaa, @@ -385,18 +378,16 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { accessanalyzer = [ mypy-boto3-accessanalyzer ]; account = [ mypy-boto3-account ]; acm = [ mypy-boto3-acm ]; acm-pca = [ mypy-boto3-acm-pca ]; - alexaforbusiness = [ mypy-boto3-alexaforbusiness ]; all = [ mypy-boto3-accessanalyzer mypy-boto3-account mypy-boto3-acm mypy-boto3-acm-pca - mypy-boto3-alexaforbusiness mypy-boto3-amp mypy-boto3-amplify mypy-boto3-amplifybackend @@ -423,7 +414,6 @@ buildPythonPackage rec { mypy-boto3-autoscaling-plans mypy-boto3-backup mypy-boto3-backup-gateway - mypy-boto3-backupstorage mypy-boto3-batch mypy-boto3-billingconductor mypy-boto3-braket @@ -524,7 +514,6 @@ buildPythonPackage rec { mypy-boto3-frauddetector mypy-boto3-fsx mypy-boto3-gamelift - mypy-boto3-gamesparks mypy-boto3-glacier mypy-boto3-globalaccelerator mypy-boto3-glue @@ -535,7 +524,6 @@ buildPythonPackage rec { mypy-boto3-guardduty mypy-boto3-health mypy-boto3-healthlake - mypy-boto3-honeycode mypy-boto3-iam mypy-boto3-identitystore mypy-boto3-imagebuilder @@ -546,7 +534,6 @@ buildPythonPackage rec { mypy-boto3-iot mypy-boto3-iot-data mypy-boto3-iot-jobs-data - mypy-boto3-iot-roborunner mypy-boto3-iot1click-devices mypy-boto3-iot1click-projects mypy-boto3-iotanalytics @@ -594,7 +581,6 @@ buildPythonPackage rec { mypy-boto3-lookoutvision mypy-boto3-m2 mypy-boto3-machinelearning - mypy-boto3-macie mypy-boto3-macie2 mypy-boto3-managedblockchain mypy-boto3-managedblockchain-query @@ -619,7 +605,6 @@ buildPythonPackage rec { mypy-boto3-migrationhub-config mypy-boto3-migrationhuborchestrator mypy-boto3-migrationhubstrategy - mypy-boto3-mobile mypy-boto3-mq mypy-boto3-mturk mypy-boto3-mwaa @@ -772,7 +757,6 @@ buildPythonPackage rec { autoscaling-plans = [ mypy-boto3-autoscaling-plans ]; backup = [ mypy-boto3-backup ]; backup-gateway = [ mypy-boto3-backup-gateway ]; - backupstorage = [ mypy-boto3-backupstorage ]; batch = [ mypy-boto3-batch ]; billingconductor = [ mypy-boto3-billingconductor ]; boto3 = [ @@ -886,7 +870,6 @@ buildPythonPackage rec { frauddetector = [ mypy-boto3-frauddetector ]; fsx = [ mypy-boto3-fsx ]; gamelift = [ mypy-boto3-gamelift ]; - gamesparks = [ mypy-boto3-gamesparks ]; glacier = [ mypy-boto3-glacier ]; globalaccelerator = [ mypy-boto3-globalaccelerator ]; glue = [ mypy-boto3-glue ]; @@ -897,7 +880,6 @@ buildPythonPackage rec { guardduty = [ mypy-boto3-guardduty ]; health = [ mypy-boto3-health ]; healthlake = [ mypy-boto3-healthlake ]; - honeycode = [ mypy-boto3-honeycode ]; iam = [ mypy-boto3-iam ]; identitystore = [ mypy-boto3-identitystore ]; imagebuilder = [ mypy-boto3-imagebuilder ]; @@ -908,7 +890,6 @@ buildPythonPackage rec { iot = [ mypy-boto3-iot ]; iot-data = [ mypy-boto3-iot-data ]; iot-jobs-data = [ mypy-boto3-iot-jobs-data ]; - iot-roborunner = [ mypy-boto3-iot-roborunner ]; iot1click-devices = [ mypy-boto3-iot1click-devices ]; iot1click-projects = [ mypy-boto3-iot1click-projects ]; iotanalytics = [ mypy-boto3-iotanalytics ]; @@ -956,7 +937,6 @@ buildPythonPackage rec { lookoutvision = [ mypy-boto3-lookoutvision ]; m2 = [ mypy-boto3-m2 ]; machinelearning = [ mypy-boto3-machinelearning ]; - macie = [ mypy-boto3-macie ]; macie2 = [ mypy-boto3-macie2 ]; managedblockchain = [ mypy-boto3-managedblockchain ]; managedblockchain-query = [ mypy-boto3-managedblockchain-query ]; @@ -981,7 +961,6 @@ buildPythonPackage rec { migrationhub-config = [ mypy-boto3-migrationhub-config ]; migrationhuborchestrator = [ mypy-boto3-migrationhuborchestrator ]; migrationhubstrategy = [ mypy-boto3-migrationhubstrategy ]; - mobile = [ mypy-boto3-mobile ]; mq = [ mypy-boto3-mq ]; mturk = [ mypy-boto3-mturk ]; mwaa = [ mypy-boto3-mwaa ]; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index f6998d6400a26..f1d9105c5f76b 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "tests/integration" ]; - passthru.optional-dependencies = { + optional-dependencies = { crt = [ botocore.optional-dependencies.crt ]; }; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 68a1ae7c68dce..dd08f7215a119 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "botocore" ]; - passthru.optional-dependencies = { + optional-dependencies = { crt = [ awscrt ]; }; diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix index 97fd086b1f5cf..e4ad37696e257 100644 --- a/pkgs/development/python-modules/bpycv/default.nix +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { homepage = "https://github.com/DIYer22/bpycv"; license = licenses.mit; maintainers = [ maintainers.lucasew ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; inherit (blender.meta) platforms; }; } diff --git a/pkgs/development/python-modules/braceexpand/default.nix b/pkgs/development/python-modules/braceexpand/default.nix index 0b32a37698bef..ffa97d4c19097 100644 --- a/pkgs/development/python-modules/braceexpand/default.nix +++ b/pkgs/development/python-modules/braceexpand/default.nix @@ -3,13 +3,14 @@ buildPythonPackage, pythonOlder, fetchPypi, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "braceexpand"; version = "0.1.7"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -18,15 +19,20 @@ buildPythonPackage rec { sha256 = "01gpcnksnqv6np28i4x8s3wkngawzgs99zvjfia57spa42ykkrg6"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "braceexpand" ]; - meta = with lib; { + meta = { description = "Bash-style brace expansion for Python"; homepage = "https://github.com/trendels/braceexpand"; changelog = "https://github.com/trendels/braceexpand/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ newam ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + newam + pbsds + ]; }; } diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index de779d7f3e4cd..759af9e47b87f 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { setuptools-rust ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; propagatedBuildInputs = [ @@ -71,9 +71,15 @@ buildPythonPackage rec { tzlocal urllib3 ] - ++ passthru.optional-dependencies.launchpad - ++ passthru.optional-dependencies.fastimport - ++ passthru.optional-dependencies.github; + ++ optional-dependencies.launchpad + ++ optional-dependencies.fastimport + ++ optional-dependencies.github; + + optional-dependencies = { + launchpad = [ launchpadlib ]; + fastimport = [ fastimport ]; + github = [ pygithub ]; + }; nativeCheckInputs = [ testtools ]; @@ -107,11 +113,6 @@ buildPythonPackage rec { package = breezy; command = "HOME=$TMPDIR brz --version"; }; - optional-dependencies = { - launchpad = [ launchpadlib ]; - fastimport = [ fastimport ]; - github = [ pygithub ]; - }; }; meta = with lib; { diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index 596b173151145..eb38597a222fb 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bring-api"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "miaucl"; repo = "bring-api"; rev = "refs/tags/${version}"; - hash = "sha256-w7DV+Idcg7OobFx+ECimngQKk0SCzd5F+DTg+WcnJwA="; + hash = "sha256-eXT7H2GGNpSo58eK5f6b5eLWYgjxEV8iLgaVTpkt9EU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index 10d0a020d3633..ec12adaa7f289 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -1,43 +1,37 @@ { fetchPypi, - fetchpatch, buildPythonPackage, + setuptools, future, packbits, pillow, pyusb, click, attrs, + jsons, lib, }: buildPythonPackage rec { pname = "brother-ql"; - version = "0.9.4"; - format = "setuptools"; + version = "0.11.2"; + pyproject = true; src = fetchPypi { - pname = "brother_ql"; + pname = "brother_ql_next"; inherit version; - hash = "sha256-H1xXoDnwEsnCBDl/RwAB9267dINCHr3phdDLPGFOhmA="; + hash = "sha256-3rTf+4W5KK7zSGIE3bBHXHE0hjyvpjB0IiEtbax6mkU="; }; propagatedBuildInputs = [ + setuptools future packbits pillow pyusb click attrs - ]; - - patches = [ - (fetchpatch { - # Make compatible with Pillow>=10.0; https://github.com/pklaus/brother_ql/pull/143 - name = "brother-ql-pillow10-compat.patch"; - url = "https://github.com/pklaus/brother_ql/commit/a7e1b94b41f3a6e0f8b365598bc34fb47ca95a6d.patch"; - hash = "sha256-v3YhmsUWBwE/Vli1SbTQO8q1zbtWYI9iMlVFvz5sxmg="; - }) + jsons ]; meta = with lib; { @@ -46,8 +40,8 @@ buildPythonPackage rec { Python package for the raster language protocol of the Brother QL series label printers (QL-500, QL-550, QL-570, QL-700, QL-710W, QL-720NW, QL-800, QL-820NWB, QL-1050 and more) ''; - homepage = "https://github.com/pklaus/brother_ql"; - license = licenses.gpl3; + homepage = "https://github.com/LunarEclipse363/brother_ql_next"; + license = licenses.gpl3Only; maintainers = with maintainers; [ grahamc ]; mainProgram = "brother_ql"; }; diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 94380a638c639..84ad97686b48e 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, freezegun, dacite, - pysnmp-lextudio, + pysnmp, pytest-asyncio, pytest-error-for-skips, pytestCheckHook, @@ -15,23 +15,23 @@ buildPythonPackage rec { pname = "brother"; - version = "4.2.0"; + version = "4.3.1"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "bieniu"; - repo = pname; + repo = "brother"; rev = "refs/tags/${version}"; - hash = "sha256-5fd+UznnOFnqYL8CPX90Y2z6q35oUH638mz4l+Ux6oE="; + hash = "sha256-fWa5FNBGV8tnJ3CozMicXLGsDvnTjNzU8PdV266MeeQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ dacite - pysnmp-lextudio + pysnmp ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/btchip-python/default.nix b/pkgs/development/python-modules/btchip-python/default.nix index 66c22bafac3ed..a15708b79394b 100644 --- a/pkgs/development/python-modules/btchip-python/default.nix +++ b/pkgs/development/python-modules/btchip-python/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ecdsa ]; - passthru.optional-dependencies.smartcard = [ pyscard ]; + optional-dependencies.smartcard = [ pyscard ]; # tests requires hardware doCheck = false; diff --git a/pkgs/development/python-modules/bucketstore/default.nix b/pkgs/development/python-modules/bucketstore/default.nix index 46f29ff43e5e1..285fbf15451bf 100644 --- a/pkgs/development/python-modules/bucketstore/default.nix +++ b/pkgs/development/python-modules/bucketstore/default.nix @@ -6,26 +6,24 @@ pytestCheckHook, boto3, moto, + poetry-core, }: buildPythonPackage rec { pname = "bucketstore"; - version = "0.2.2"; - format = "setuptools"; + version = "0.3.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "jpetrucciani"; repo = "bucketstore"; rev = "refs/tags/${version}"; - hash = "sha256-BtoyGqFbeBhGQeXnmeSfiuJLZtXFrK26WO0SDlAtKG4="; + hash = "sha256-WjweYFnlDEoR+TYzNgjPMdCLdUUEbdPROubov6kancc="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "version=__version__," 'version="${version}",' - ''; + build-system = [ poetry-core ]; propagatedBuildInputs = [ boto3 ]; diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index bfb6f582dd3a9..dd609be90c490 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webob ]; - passthru.optional-dependencies = { + optional-dependencies = { flask = [ blinker flask diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index b3a8c905bc8b0..d3329230305e0 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -86,7 +86,7 @@ buildPythonPackage rec { "test_output" "test_wheel_metadata" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Expects Apple's Python and its quirks "test_can_get_venv_paths_with_conflicting_default_scheme" ]; diff --git a/pkgs/development/python-modules/bump2version/default.nix b/pkgs/development/python-modules/bump2version/default.nix new file mode 100644 index 0000000000000..c7bbb8f327f9d --- /dev/null +++ b/pkgs/development/python-modules/bump2version/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + testfixtures, +}: + +buildPythonPackage rec { + pname = "bump2version"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "c4urself"; + repo = "bump2version"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + testfixtures + ]; + + disabledTests = [ + # X's in pytest are git tests which won't run in sandbox + "usage_string_fork" + "test_usage_string" + "test_defaults_in_usage_with_config" + ]; + + pythonImportsCheck = [ "bumpversion" ]; + + meta = with lib; { + description = "Version-bump your software with a single command"; + longDescription = '' + A small command line tool to simplify releasing software by updating + all version strings in your source code by the correct increment. + ''; + homepage = "https://github.com/c4urself/bump2version"; + changelog = "https://github.com/c4urself/bump2version/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ jefflabonte ]; + }; +} diff --git a/pkgs/development/python-modules/bumpfontversion/default.nix b/pkgs/development/python-modules/bumpfontversion/default.nix new file mode 100644 index 0000000000000..8ee90f9795a53 --- /dev/null +++ b/pkgs/development/python-modules/bumpfontversion/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonRelaxDepsHook, + poetry-core, + fonttools, + openstep-plist, + ufolib2, + glyphslib, + bump2version, +}: + +buildPythonPackage rec { + pname = "bumpfontversion"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "simoncozens"; + repo = "bumpfontversion"; + rev = "refs/tags/v${version}"; + hash = "sha256-qcKZGv/KeeSRBq4SdnuZlurp0CUs40iEQjw9/1LltUg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'poetry>=' 'poetry-core>=' \ + --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api' + ''; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "glyphslib" ]; + + build-system = [ poetry-core ]; + + dependencies = [ + fonttools + openstep-plist + ufolib2 + glyphslib + bump2version + ]; + + meta = { + description = "Version-bump your font sources"; + homepage = "https://github.com/simoncozens/bumpfontversion"; + license = lib.licenses.asl20; + mainProgram = "bumpfontversion"; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 35790227d5e53..1a1f03dea2889 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { pname = "bundlewrap"; - version = "4.19.0"; - format = "setuptools"; + version = "4.20.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -27,11 +27,11 @@ buildPythonPackage rec { owner = "bundlewrap"; repo = "bundlewrap"; rev = "refs/tags/${version}"; - hash = "sha256-sNdtJRpP54xlkYis4whoGiJJ/Tjnrs4TW6EO3eAMBAo="; + hash = "sha256-GoMOEPZb7efFoZn7D2y1XO4XtP9z+1EmakLvSxcCT8I="; }; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + dependencies = [ setuptools cryptography jinja2 diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix index 3ce11307c87d1..757b2d7e9f213 100644 --- a/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { disabledTestPaths = [ "bx_py_utils_tests/tests/test_project_setup.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # processify() doesn't work under darwin # https://github.com/boxine/bx_py_utils/issues/80 "bx_py_utils_tests/tests/test_processify.py" @@ -84,7 +84,7 @@ buildPythonPackage rec { description = "Various Python utility functions"; mainProgram = "publish"; homepage = "https://github.com/boxine/bx_py_utils"; - changelog = "https://github.com/boxine/bx_py_utils/releases/tag/${src.rev}"; + changelog = "https://github.com/boxine/bx_py_utils/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix index 22d022c454bef..d7fe5f9a00ec0 100644 --- a/pkgs/development/python-modules/bytewax/default.nix +++ b/pkgs/development/python-modules/bytewax/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonpickle ]; - passthru.optional-dependencies = { + optional-dependencies = { kafka = [ confluent-kafka ]; }; @@ -85,7 +85,7 @@ buildPythonPackage rec { checkInputs = [ myst-docutils pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # dependens on an old myst-docutils version @@ -104,6 +104,6 @@ buildPythonPackage rec { kfollesdal ]; # mismatched type expected u8, found i8 - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index fe81e67424494..1f749cfb31326 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { filecache = [ filelock ]; redis = [ redis ]; }; @@ -46,7 +46,7 @@ buildPythonPackage rec { mock pytestCheckHook requests - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cachecontrol" ]; diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix index 985a2ada9b5e3..de17cb4106b4e 100644 --- a/pkgs/development/python-modules/cached-ipaddress/default.nix +++ b/pkgs/development/python-modules/cached-ipaddress/default.nix @@ -4,47 +4,43 @@ cython, fetchFromGitHub, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, - wheel, }: buildPythonPackage rec { pname = "cached-ipaddress"; - version = "0.3.0"; + version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bdraco"; repo = "cached-ipaddress"; rev = "refs/tags/v${version}"; - hash = "sha256-iTQ1DSCZqjAzsf95nYUxnNj5YCb1Y4JIUW5VGIi7yoY="; + hash = "sha256-wF5GBQCmKHo3sX4lYA9/wS69x4fFNNh08VG3qMp9UKs="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=cached_ipaddress --cov-report=term-missing:skip-covered" "" \ - --replace "Cython>=3.0.5" "Cython" - ''; - - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools - wheel ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "cached_ipaddress" ]; meta = with lib; { description = "Cache construction of ipaddress objects"; homepage = "https://github.com/bdraco/cached-ipaddress"; - changelog = "https://github.com/bdraco/cached-ipaddress/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/bdraco/cached-ipaddress/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index a2f64cb79c991..0d81670d44936 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -50,12 +50,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "cairosvg" ]; - meta = with lib; { + meta = { homepage = "https://cairosvg.org"; changelog = "https://github.com/Kozea/CairoSVG/releases/tag/${version}"; - license = licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; description = "SVG converter based on Cairo"; mainProgram = "cairosvg"; - maintainers = [ ]; + maintainers = [ lib.maintainers.sarahec ]; }; } diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix index 80bd4e14db8b6..79ab007d22459 100644 --- a/pkgs/development/python-modules/camel-converter/default.nix +++ b/pkgs/development/python-modules/camel-converter/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, pydantic, pytestCheckHook, pytest-cov-stub, @@ -11,28 +11,28 @@ buildPythonPackage rec { pname = "camel-converter"; - version = "3.1.2"; + version = "4.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "sanders41"; repo = "camel-converter"; rev = "refs/tags/v${version}"; - hash = "sha256-CJbflRI3wfUmPoVuLwZDYcobESmySvnS99PdpSDhDLk="; + hash = "sha256-JdONlMTBnZ2QMcsr+GXmfQzxaFOndmG77qbBa9A3m+k="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { pydantic = [ pydantic ]; }; nativeCheckInputs = [ pytestCheckHook pytest-cov-stub - ] ++ passthru.optional-dependencies.pydantic; + ] ++ optional-dependencies.pydantic; pythonImportsCheck = [ "camel_converter" ]; @@ -42,10 +42,10 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Client for the Meilisearch API"; + description = "Module to convert strings from snake case to camel case or camel case to snake case"; homepage = "https://github.com/sanders41/camel-converter"; changelog = "https://github.com/sanders41/camel-converter/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix index 938a6279e0026..a57300a77b841 100644 --- a/pkgs/development/python-modules/canals/default.nix +++ b/pkgs/development/python-modules/canals/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { docs = [ mkdocs-material mkdocs-mermaid2-plugin @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # Test requires internet connection to mermaid.ink diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 634eec1da39d5..42f9c1757a930 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { arxml = [ lxml ]; fibex = [ lxml ]; kcd = [ lxml ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ # long_envvar_name_imports requires stable key value pair ordering diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index a2a65df02e91b..4e4dff8984243 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -42,12 +42,12 @@ buildPythonPackage rec { textparser ]; - passthru.optional-dependencies.plot = [ matplotlib ]; + optional-dependencies.plot = [ matplotlib ]; nativeCheckInputs = [ parameterized pytestCheckHook - ] ++ passthru.optional-dependencies.plot; + ] ++ optional-dependencies.plot; pythonImportsCheck = [ "cantools" ]; diff --git a/pkgs/development/python-modules/capstone/4.nix b/pkgs/development/python-modules/capstone/4.nix index 66b57a01bcb21..b7c31d336091e 100644 --- a/pkgs/development/python-modules/capstone/4.nix +++ b/pkgs/development/python-modules/capstone/4.nix @@ -30,7 +30,7 @@ buildPythonPackage { # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. - setupPyBuildFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + setupPyBuildFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "--plat-name" "macosx_11_0" ]; diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 74035c9bef303..e735871268e52 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. - setupPyBuildFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + setupPyBuildFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "--plat-name" "macosx_11_0" ]; diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 856da1f953695..b9895dd18f974 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ humanfriendly ]; # hangs on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index 74440cc504dee..4b253740d6d65 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -1,19 +1,24 @@ { lib, buildPythonPackage, + cachetools, fetchPypi, + nixosTests, + pytestCheckHook, + pythonOlder, + setuptools, twisted, - whisper, txamqp, - cachetools, urllib3, - nixosTests, + whisper, }: buildPythonPackage rec { pname = "carbon"; version = "1.1.10"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; @@ -21,28 +26,41 @@ buildPythonPackage rec { }; # Carbon-s default installation is /opt/graphite. This env variable ensures - # carbon is installed as a regular python module. + # carbon is installed as a regular Python module. GRAPHITE_NO_PREFIX = "True"; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "cf.readfp(f, 'setup.cfg')" "cf.read(f, 'setup.cfg')" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + cachetools twisted - whisper txamqp - cachetools urllib3 + whisper ]; + # Tests are not shipped with PyPI + doCheck = false; + passthru.tests = { inherit (nixosTests) graphite; }; + pythonImportsCheck = [ "carbon" ]; + meta = with lib; { - homepage = "http://graphiteapp.org/"; description = "Backend data caching and persistence daemon for Graphite"; + homepage = "https://github.com/graphite-project/carbon"; + changelog = "https://github.com/graphite-project/carbon/releases/tag/${version}"; + license = licenses.asl20; maintainers = with maintainers; [ offline basvandijk ]; - license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index dbd7659ab81e9..5f7659b61346f 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { shapely ]; - passthru.optional-dependencies = { + optional-dependencies = { ows = [ owslib pillow @@ -80,7 +80,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mpl pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf diff --git a/pkgs/development/python-modules/cashews/default.nix b/pkgs/development/python-modules/cashews/default.nix index d5f0801c358f8..af6f0a3d0cefc 100644 --- a/pkgs/development/python-modules/cashews/default.nix +++ b/pkgs/development/python-modules/cashews/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { dill = [ dill ]; diskcache = [ diskcache ]; redis = [ redis ]; diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 9548bd1214d83..b72fd7d8a525c 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { pytz pyyaml sure - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # This is used to determine the version of cython that can be used CASS_DRIVER_ALLOWED_CYTHON_VERSION = cython.version; @@ -86,7 +86,7 @@ buildPythonPackage rec { # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox, # also /etc/resolv.conf is referenced by some tests preCheck = - (lib.optionalString stdenv.isLinux '' + (lib.optionalString stdenv.hostPlatform.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) export LD_PRELOAD=${libredirect}/lib/libredirect.so @@ -127,7 +127,7 @@ buildPythonPackage rec { "test_nts_token_performance" ]; - passthru.optional-dependencies = { + optional-dependencies = { cle = [ cryptography ]; eventlet = [ eventlet ]; gevent = [ gevent ]; diff --git a/pkgs/development/python-modules/catppuccin/default.nix b/pkgs/development/python-modules/catppuccin/default.nix index 2726aa4f98de1..25b94db8f5ae7 100644 --- a/pkgs/development/python-modules/catppuccin/default.nix +++ b/pkgs/development/python-modules/catppuccin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "catppuccin"; - version = "2.3.0"; + version = "2.3.4"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "catppuccin"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-1CPNs+n9S7fV+EvhFWBwnv6/N3UWQ/jiyRcn4XKzmd8="; + hash = "sha256-0+sbf2m0vJCf6EOl6DMqgtL35RJh+rehi/p0ylTPJK8="; }; build-system = [ diff --git a/pkgs/development/python-modules/causal-conv1d/default.nix b/pkgs/development/python-modules/causal-conv1d/default.nix new file mode 100644 index 0000000000000..0653959ed6da4 --- /dev/null +++ b/pkgs/development/python-modules/causal-conv1d/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + ninja, + setuptools, + torch, + cudaPackages, + rocmPackages, + config, + cudaSupport ? config.cudaSupport, + which, +}: + +buildPythonPackage rec { + pname = "causal-conv1d"; + version = "1.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Dao-AILab"; + repo = "causal-conv1d"; + rev = "refs/tags/v${version}"; + hash = "sha256-p5x5u3zEmEMN3mWd88o3jmcpKUnovTvn7I9jIOj/ie0="; + }; + + build-system = [ + ninja + setuptools + torch + ]; + + nativeBuildInputs = [ which ]; + + buildInputs = ( + lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart # cuda_runtime.h, -lcudart + cuda_cccl + libcusparse # cusparse.h + libcusolver # cusolverDn.h + cuda_nvcc + libcublas + ] + ) + ); + + dependencies = [ + torch + ]; + + # pytest tests not enabled due to nvidia GPU dependency + pythonImportsCheck = [ "causal_conv1d" ]; + + env = { + CAUSAL_CONV1D_FORCE_BUILD = "TRUE"; + } // lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; }; + + meta = with lib; { + description = "Causal depthwise conv1d in CUDA with a PyTorch interface"; + homepage = "https://github.com/Dao-AILab/causal-conv1d"; + license = licenses.bsd3; + maintainers = with maintainers; [ cfhammill ]; + # The package requires CUDA or ROCm, the ROCm build hasn't + # been completed or tested, so broken if not using cuda. + broken = !cudaSupport; + }; +} diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index d5c372c5d4981..1ab0ee43a711a 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { vine ]; - passthru.optional-dependencies = { + optional-dependencies = { gcs = [ google-cloud-storage ]; mongodb = [ pymongo ]; msgpack = [ msgpack ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { pytest-timeout pytest-xdist pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # test_eventlet touches network @@ -97,7 +97,7 @@ buildPythonPackage rec { "test_stamping_headers_in_options" "test_stamping_with_replace" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Too many open files on hydra "test_cleanup" "test_with_autoscaler_file_descriptor_safety" diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index d6ed789655f54..bfdbd7635200a 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.13"; + version = "2.2.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ejAgPSHeE2842WvGjH+2HbaA7HoNDuIGNvmqXgCjuLE="; + hash = "sha256-3evll1Ll8krvAfelGoJHOrmH7RvkeM/ZU1j13cTuXR4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix index e9311df36e82f..b04866a54607c 100644 --- a/pkgs/development/python-modules/certomancer/default.nix +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { requests-mocker = [ requests-mock ]; web-api = [ jinja2 @@ -73,7 +73,7 @@ buildPythonPackage rec { pytestCheckHook pytz requests - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # pyhanko_certvalidator.errors.DisallowedAlgorithmError diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index 49bf0b39adf55..a60f3f0e4aefd 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -25,16 +24,14 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "xarray-contrib"; repo = "cf-xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-zio00ki86DZqWtGnVseDR28He4DW1jjKdwfsxRwFDfg="; + hash = "sha256-Rz0E7GBaN/7zb0dqAxo0SJ4Bd+eQuOOv6x1WubIUh6A="; }; build-system = [ @@ -45,7 +42,7 @@ buildPythonPackage rec { dependencies = [ xarray ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ matplotlib pint @@ -60,7 +57,7 @@ buildPythonPackage rec { dask pytestCheckHook scipy - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cf_xarray" ]; diff --git a/pkgs/development/python-modules/cffconvert/default.nix b/pkgs/development/python-modules/cffconvert/default.nix index befd378ac31d3..c7dba79bb5cb0 100644 --- a/pkgs/development/python-modules/cffconvert/default.nix +++ b/pkgs/development/python-modules/cffconvert/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { "tests/cli/test_rawify_url.py" ]; - pythonImportsCheckHook = [ "cffconvert" ]; + pythonImportsCheck = [ "cffconvert" ]; meta = { changelog = "https://github.com/citation-file-format/cffconvert/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 199324d0e4207..9ddc6ba9cc63c 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -4,13 +4,11 @@ buildPythonPackage, isPyPy, fetchPypi, - fetchpatch2, setuptools, pytestCheckHook, libffi, pkg-config, pycparser, - pythonAtLeast, }: let @@ -51,7 +49,7 @@ else ./clang-pointer-substraction-warning.diff ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Remove setup.py impurities substituteInPlace setup.py \ --replace "'-iwithsysroot/usr/include/ffi'" "" \ @@ -59,14 +57,13 @@ else --replace '/usr/include/libffi' '${lib.getDev libffi}/include' ''; - nativeBuildInputs = [ - pkg-config - setuptools - ]; + nativeBuildInputs = [ pkg-config ]; + + build-system = [ setuptools ]; buildInputs = [ libffi ]; - propagatedBuildInputs = [ pycparser ]; + dependencies = [ pycparser ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument -Wno-unreachable-code -Wno-c++11-narrowing"; diff --git a/pkgs/development/python-modules/cffsubr/default.nix b/pkgs/development/python-modules/cffsubr/default.nix index c9642235e37ea..46dabb2711af7 100644 --- a/pkgs/development/python-modules/cffsubr/default.nix +++ b/pkgs/development/python-modules/cffsubr/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cffsubr" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/adobe-type-tools/cffsubr/releases/tag/v${version}"; description = "Standalone CFF subroutinizer based on AFDKO tx"; mainProgram = "cffsubr"; diff --git a/pkgs/development/python-modules/chainstream/default.nix b/pkgs/development/python-modules/chainstream/default.nix index d5ee7775ac827..8d247e234d2d3 100644 --- a/pkgs/development/python-modules/chainstream/default.nix +++ b/pkgs/development/python-modules/chainstream/default.nix @@ -1,16 +1,17 @@ { lib, fetchPypi, - python3Packages, + buildPythonPackage, + setuptools, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "chainstream"; version = "1.0.1"; pyproject = true; - nativeBuildInputs = [ python3Packages.setuptools ]; + nativeBuildInputs = [ setuptools ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index 73538fcdce4c8..e6743a93bf68f 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { msgpack ]; - passthru.optional-dependencies = { + optional-dependencies = { cryptography = [ cryptography ]; }; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index f7a204f1f3e27..df15fbdf4c75a 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -10,28 +10,31 @@ pytest-django, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "channels"; - version = "4.0.0"; - format = "setuptools"; + version = "4.1.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "django"; - repo = pname; - rev = version; - hash = "sha256-n88MxwYQ4O2kBy/W0Zvi3FtIlhZQQRCssB/lYrFNvps="; + repo = "channels"; + rev = "refs/tags/${version}"; + hash = "sha256-JUU1N+Sc7t//0vEdkgQy20iVKgHr4Ys+XnLgqPMcKM8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ asgiref django ]; - passthru.optional-dependencies = { + optional-dependencies = { daphne = [ daphne ]; }; @@ -40,13 +43,14 @@ buildPythonPackage rec { pytest-asyncio pytest-django pytestCheckHook - ] ++ passthru.optional-dependencies.daphne; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "channels" ]; meta = with lib; { description = "Brings event-driven capabilities to Django with a channel system"; homepage = "https://github.com/django/channels"; + changelog = "https://github.com/django/channels/blob/${version}/CHANGELOG.txt"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix index 4a17afb2f1b30..7a1e122b737d1 100644 --- a/pkgs/development/python-modules/checkdmarc/default.nix +++ b/pkgs/development/python-modules/checkdmarc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "checkdmarc"; - version = "4.8.4"; + version = "5.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "domainaware"; repo = "checkdmarc"; rev = "refs/tags/${version}"; - hash = "sha256-NNB5dYQzzdNapjP4mtpCW08BzfZ+FFRESUtpxCOzrdk="; + hash = "sha256-skQqLWBEmfyiW2DsRRbj3Lfj52QZca0zKenFC7LltjM="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 01773d1c20cfd..2b4c9f427acb3 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { "tls" # touches network "peercreds_unix_sock" # test urls no longer allowed ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "http_over_https_error" "bind_addr_unix" "test_ssl_env" diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 71d9a9aedfb56..7f3bd134f29fc 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -101,15 +101,17 @@ buildPythonPackage rec { "test_1_Ram_Concurrency" "test_2_File_Concurrency" ] - ++ lib.optionals stdenv.isDarwin [ "test_block" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_block" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ "cherrypy/test/test_config_server.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + "cherrypy/test/test_config_server.py" + ]; __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "cherrypy" ]; - passthru.optional-dependencies = { + optional-dependencies = { json = [ simplejson ]; memcached_session = [ python-memcached ]; routes_dispatcher = [ routes ]; diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index 803c352c71549..3f52a6ac3311b 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -1,40 +1,43 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system setuptools, + + # dependencies absl-py, - cloudpickle, - dm-tree, jax, jaxlib, numpy, - pytestCheckHook, toolz, typing-extensions, + + # tests + cloudpickle, + dm-tree, + pytestCheckHook, }: buildPythonPackage rec { pname = "chex"; - version = "0.1.86"; + version = "0.1.87"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "deepmind"; repo = "chex"; rev = "refs/tags/v${version}"; - hash = "sha256-Z5Ns4fG5pC99I4xdGjDMKX6YZpTtd1y0TWcIOtr7dug="; + hash = "sha256-TPh7XLWHk0y/VLXxHLANUiDmfveHPeMLks9QKf16doo="; }; build-system = [ setuptools ]; dependencies = [ absl-py - jaxlib jax + jaxlib numpy toolz typing-extensions @@ -48,11 +51,11 @@ buildPythonPackage rec { pytestCheckHook ]; - meta = with lib; { + meta = { description = "Chex is a library of utilities for helping to write reliable JAX code"; homepage = "https://github.com/deepmind/chex"; changelog = "https://github.com/google-deepmind/chex/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ ndl ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ndl ]; }; } diff --git a/pkgs/development/python-modules/chroma-hnswlib/default.nix b/pkgs/development/python-modules/chroma-hnswlib/default.nix index 52fe376961323..fb8bdc1deea1b 100644 --- a/pkgs/development/python-modules/chroma-hnswlib/default.nix +++ b/pkgs/development/python-modules/chroma-hnswlib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "chroma-hnswlib"; - version = "0.7.5"; + version = "0.7.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "hnswlib"; rev = "refs/tags/${version}"; - hash = "sha256-KU/t37MZMFeNWPme+rgCHchZH7B8timIV2EH40laXkA="; + hash = "sha256-pjz5SGg2drO6fkml9ojFG7/Gq3/Y7vPaOHc+3LKnjUw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 368bf0fc07210..eb44d2a9b5c26 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -15,6 +15,7 @@ importlib-resources, kubernetes, mmh3, + nixosTests, numpy, onnxruntime, openssl, @@ -27,6 +28,7 @@ pkg-config, posthog, protobuf, + psutil, pulsar-client, pydantic, pypika, @@ -37,8 +39,8 @@ requests, rustc, rustPlatform, - setuptools, setuptools-scm, + setuptools, tenacity, tokenizers, tqdm, @@ -46,12 +48,11 @@ typing-extensions, uvicorn, zstd, - nixosTests, }: buildPythonPackage rec { pname = "chromadb"; - version = "0.5.5"; + version = "0.5.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -60,13 +61,13 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "chroma"; rev = "refs/tags/${version}"; - hash = "sha256-e6ZctUFeq9hHXWaxGdVTiqFpwaU7A+EKn2EdQPI7DHE="; + hash = "sha256-+wRauCRrTQsGTadA6Ps0fXcpAl6ajsJRjcVEhP2+2ss="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-3FmnQEpknYNzI3WlQ3kc8qa4LFcn1zpxKDbkATU7/48="; + hash = "sha256-Y2mkWGgS77sGOOL+S/pw/UmrKDRyO+ZbN2Msj35sIl8="; }; pythonRelaxDeps = [ @@ -90,7 +91,7 @@ buildPythonPackage rec { buildInputs = [ openssl zstd - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; dependencies = [ bcrypt @@ -126,6 +127,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis + psutil pytest-asyncio pytestCheckHook ]; @@ -173,6 +175,6 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "chroma"; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index b87e4c42568b8..858b9142121cb 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; # On darwin: Too many open files - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' ulimit -n 1024 ''; diff --git a/pkgs/development/python-modules/cirq-aqt/default.nix b/pkgs/development/python-modules/cirq-aqt/default.nix index 1bead28588e3d..6e20f84d26e6f 100644 --- a/pkgs/development/python-modules/cirq-aqt/default.nix +++ b/pkgs/development/python-modules/cirq-aqt/default.nix @@ -3,21 +3,24 @@ cirq-core, requests, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq-aqt"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ - --replace "requests~=2.18" "requests" + --replace-fail "requests~=2.18" "requests" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-core requests ]; diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index e12dc6f3255e2..4c20d01f302f7 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -1,57 +1,58 @@ { lib, stdenv, - buildPythonPackage, - pythonOlder, - fetchFromGitHub, attrs, + autoray ? null, + buildPythonPackage, duet, + fetchFromGitHub, + freezegun, matplotlib, networkx, numpy, + opt-einsum, pandas, + ply, + pylatex ? null, + pyquil ? null, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + quimb ? null, requests, scipy, + setuptools, sortedcontainers, sympy, tqdm, typing-extensions, - # Contrib requirements withContribRequires ? false, - autoray ? null, - opt-einsum, - ply, - pylatex ? null, - pyquil ? null, - quimb ? null, - # test inputs - pytestCheckHook, - freezegun, - pytest-asyncio, }: buildPythonPackage rec { pname = "cirq-core"; - version = "1.4.0"; - format = "setuptools"; + version = "1.4.1"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "quantumlib"; repo = "cirq"; rev = "refs/tags/v${version}"; - hash = "sha256-KHwVq0qVtc8E9i2lugILYNwk9awq952w0x4DM+HG7Pg="; + hash = "sha256-1GcRDVgYF+1igZQFlQbiWZmU1WNIJh4CcOftQe6OP6I="; }; sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ - --replace "matplotlib~=3.0" "matplotlib" + --replace-fail "matplotlib~=3.0" "matplotlib" ''; - propagatedBuildInputs = + build-system = [ setuptools ]; + + dependencies = [ attrs duet @@ -88,7 +89,7 @@ buildPythonPackage rec { "cirq/_version_test.py" ]; - disabledTests = lib.optionals stdenv.isAarch64 [ + disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [ # https://github.com/quantumlib/Cirq/issues/5924 "test_prepare_two_qubit_state_using_sqrt_iswap" ]; diff --git a/pkgs/development/python-modules/cirq-ft/default.nix b/pkgs/development/python-modules/cirq-ft/default.nix deleted file mode 100644 index 6ee4c28c88797..0000000000000 --- a/pkgs/development/python-modules/cirq-ft/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - attrs, - buildPythonPackage, - cachetools, - cirq-core, - ipython, - ipywidgets, - nbconvert, - nbformat, - pytestCheckHook, - setuptools, -}: - -buildPythonPackage rec { - pname = "cirq-ft"; - pyproject = true; - inherit (cirq-core) version src meta; - - sourceRoot = "${src.name}/${pname}"; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - attrs - cachetools - cirq-core - ipython - ipywidgets - nbconvert - nbformat - ]; - - nativeCheckInputs = [ - ipython - pytestCheckHook - ]; - - disabledTests = [ - # Upstream doesn't always adjust the version - "test_version" - ]; - - # cirq's importlib hook doesn't work here - #pythonImportsCheck = [ "cirq_ft" ]; -} diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index b7b70b00afed4..6c84cd1440e6a 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -15,11 +15,9 @@ buildPythonPackage rec { sourceRoot = "${src.name}/${pname}"; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cirq-core google-api-core protobuf diff --git a/pkgs/development/python-modules/cirq-ionq/default.nix b/pkgs/development/python-modules/cirq-ionq/default.nix index b4fa846366234..518334432441c 100644 --- a/pkgs/development/python-modules/cirq-ionq/default.nix +++ b/pkgs/development/python-modules/cirq-ionq/default.nix @@ -3,21 +3,24 @@ cirq-core, requests, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq-ionq"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ - --replace "requests~=2.18" "requests" + --replace-fail "requests~=2.18" "requests" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-core requests ]; diff --git a/pkgs/development/python-modules/cirq-pasqal/default.nix b/pkgs/development/python-modules/cirq-pasqal/default.nix index ea13cb2cc4dad..62d946ea4617a 100644 --- a/pkgs/development/python-modules/cirq-pasqal/default.nix +++ b/pkgs/development/python-modules/cirq-pasqal/default.nix @@ -3,21 +3,24 @@ cirq-core, requests, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq-pasqal"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ - --replace "requests~=2.18" "requests" + --replace-fail "requests~=2.18" "requests" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-core requests ]; diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix index 932ab71a15003..5791950fc1368 100644 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -1,78 +1,47 @@ { + lib, buildPythonPackage, cirq-core, - lib, - pytestCheckHook, - attrs, - certifi, - h11, - httpcore, - idna, - httpx, - iso8601, - pydantic, - pyjwt, + fetchpatch2, pyquil, - python-dateutil, + pytestCheckHook, pythonOlder, - qcs-api-client, - retrying, - rfc3339, - rfc3986, - six, - sniffio, - toml, + qcs-sdk-python, + setuptools, }: buildPythonPackage rec { pname = "cirq-rigetti"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; + + patches = [ + # https://github.com/quantumlib/Cirq/pull/6734 + (fetchpatch2 { + name = "fix-rigetti-check-for-aspen-family-device-kind.patch"; + url = "https://github.com/quantumlib/Cirq/commit/dd395fb71fb7f92cfd34f008bf2a98fc70b57fae.patch"; + stripLen = 1; + hash = "sha256-EWB2CfMS2+M3zNFX5PwFNtEBdgJkNVUVNd+I/E6n9kI="; + }) + ]; sourceRoot = "${src.name}/${pname}"; - pythonRelaxDeps = [ - "attrs" - "certifi" - "h11" - "httpcore" - "httpx" - "idna" - "iso8601" - "pydantic" - "pyjwt" - "pyquil" - "qcs-api-client" - "rfc3986" - ]; + pythonRelaxDeps = [ "pyquil" ]; postPatch = '' # Remove outdated test rm cirq_rigetti/service_test.py ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-core - attrs - certifi - h11 - httpcore - httpx - idna - iso8601 - pydantic - pyjwt pyquil - python-dateutil - qcs-api-client - retrying - rfc3339 - rfc3986 - six - sniffio - toml + qcs-sdk-python ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -84,9 +53,4 @@ buildPythonPackage rec { # cirq's importlib hook doesn't work here #pythonImportsCheck = [ "cirq_rigetti" ]; - - meta = cirq-core.meta // { - # ModuleNotFoundError: No module named 'pyquil.parser' - broken = lib.versionAtLeast pyquil.version "4"; - }; } diff --git a/pkgs/development/python-modules/cirq-web/default.nix b/pkgs/development/python-modules/cirq-web/default.nix index 95af99b1360b7..782aec95c4efe 100644 --- a/pkgs/development/python-modules/cirq-web/default.nix +++ b/pkgs/development/python-modules/cirq-web/default.nix @@ -2,16 +2,19 @@ buildPythonPackage, cirq-core, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq-web"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; - propagatedBuildInputs = [ cirq-core ]; + build-system = [ setuptools ]; + + dependencies = [ cirq-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index d640655c4cd82..0d755c34b7674 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -2,24 +2,25 @@ buildPythonPackage, cirq-aqt, cirq-core, - cirq-ft, cirq-google, cirq-ionq, cirq-pasqal, cirq-rigetti, cirq-web, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-aqt cirq-core - cirq-ft cirq-ionq cirq-google cirq-rigetti @@ -34,7 +35,6 @@ buildPythonPackage rec { disabledTestPaths = [ "cirq-aqt" "cirq-core" - "cirq-ft" "cirq-google" "cirq-ionq" "cirq-pasqal" diff --git a/pkgs/development/python-modules/clarabel/default.nix b/pkgs/development/python-modules/clarabel/default.nix index d81f01b34fc5f..f6e4e09edc7cc 100644 --- a/pkgs/development/python-modules/clarabel/default.nix +++ b/pkgs/development/python-modules/clarabel/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; propagatedBuildInputs = [ numpy diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 3366bc18900a2..e79aab479c3b7 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.7.3"; + version = "10.8.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-32ICs4V2XNEOjHBSmBAC0ZacQGam3fsTizEZ6Wz/xWw="; + hash = "sha256-En4zOSIOK+1JGmG6UhGieb4lM/q6akl7xF0s/64ocPg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index f3fb349f412d3..68dfea58f94f0 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "10.7.0"; + version = "10.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-a/twKAwlvn017fqUsDBOcDxoZ63W0p6whQf53wlXFRU="; + hash = "sha256-dRhFZACfdMW0cIBDVUOSGDl5fai0gFXDPyfDil+itwQ="; }; pythonRelaxDeps = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { tritonclient ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ pycocotools ]; }; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 18eebebd220aa..baaa3200ba315 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.117"; + version = "9.2.119"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-f9rb5UvkEB3SkxqFQI82m4RrY6jWnD7YTjIGLVSx4gk="; + hash = "sha256-dnx5aiZ8ssgC0SFEipYuCXbYbdLt7Ma6xBfN1OlO8Do="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 35be77a8a4962..554b36650ef31 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -18,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.117"; + version = "9.2.119"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-yTCE0QjUoHIGW0xJvCsC01w75SxzTW2zQ/UUhSqY1mQ="; + hash = "sha256-cIh8ahJGEVzKSylCBVF1RbNftqADjewuiybPiCWfmhw="; }; in buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-WpMfHd5mHZp9hp8twYjiIbDCk61LWBF4lJpHZnnIfjk="; + hash = "sha256-jOqhwSxdHJsNUZqx/ViPDh09Uk+2hqyxm4p8XwyHZ0k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix index e5f227f7545e1..66bcee0c48ba3 100644 --- a/pkgs/development/python-modules/cleanlab/default.nix +++ b/pkgs/development/python-modules/cleanlab/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -15,6 +14,7 @@ pandas, # test dependencies + cleanvision, datasets, fasttext, hypothesis, @@ -31,16 +31,14 @@ buildPythonPackage rec { pname = "cleanlab"; - version = "2.6.6"; + version = "2.7.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "cleanlab"; repo = "cleanlab"; rev = "refs/tags/v${version}"; - hash = "sha256-08ePFTCRuggr4hTCfr/gbzMhLozz4KCywhPFSKYDNng="; + hash = "sha256-0kCEIHNOXIkdwDH5zCVWnR/W79ppc/1PFsJ/a4goGzk="; }; build-system = [ setuptools ]; @@ -61,6 +59,7 @@ buildPythonPackage rec { doCheck = true; nativeCheckInputs = [ + cleanvision datasets fasttext hypothesis diff --git a/pkgs/development/python-modules/cleanvision/default.nix b/pkgs/development/python-modules/cleanvision/default.nix new file mode 100644 index 0000000000000..e82ebeb52f7ca --- /dev/null +++ b/pkgs/development/python-modules/cleanvision/default.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + fsspec, + imagehash, + matplotlib, + numpy, + pandas, + pillow, + tabulate, + tqdm, + + # tests + datasets, + psutil, + pytestCheckHook, + torchvision, +}: + +buildPythonPackage rec { + pname = "cleanvision"; + version = "0.3.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cleanlab"; + repo = "cleanvision"; + rev = "refs/tags/v${version}"; + hash = "sha256-QAydDqLJx/jYKXqxRUElTdM5dOFA6nZag8rNAjPZjRg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + fsspec + imagehash + matplotlib + numpy + pandas + pillow + tabulate + tqdm + ]; + + pythonImportsCheck = [ "cleanvision" ]; + + nativeCheckInputs = [ + datasets + psutil + pytestCheckHook + torchvision + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + # Requires accessing s3 (online) + "test_s3_dataset" + ]; + + meta = { + description = "Automatically find issues in image datasets and practice data-centric computer vision"; + homepage = "https://github.com/cleanlab/cleanvision"; + changelog = "https://github.com/cleanlab/cleanvision/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + # Fatal Python error: Aborted + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index eb9c003c913fd..91372bca1be74 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ faust-cchardet pandas @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; pythonImportsCheck = [ "clevercsv" diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 1d1e2c741b6ce..e043ff31da298 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { tabulate ] ++ tabulate.optional-dependencies.widechars; - passthru.optional-dependencies = { + optional-dependencies = { styles = [ pygments ]; }; nativeCheckInputs = [ pytestCheckHook mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { description = "Python helpers for common CLI tasks"; diff --git a/pkgs/development/python-modules/cli-ui/default.nix b/pkgs/development/python-modules/cli-ui/default.nix index ecd30ce3fc079..3b93c3eb7be8b 100644 --- a/pkgs/development/python-modules/cli-ui/default.nix +++ b/pkgs/development/python-modules/cli-ui/default.nix @@ -1,6 +1,5 @@ { lib, - python3Packages, fetchPypi, pytestCheckHook, pythonOlder, @@ -8,8 +7,9 @@ colorama, tabulate, unidecode, + buildPythonPackage, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "cli-ui"; version = "0.17.2"; pyproject = true; diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index 50b2f1b1d241b..a8109184f251c 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ AdsonCicilioti ]; # fails with: # ld: unknown option: -zdefs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index d5300b5499a8e..4640b71cee046 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-dotenv - ] ++ passthru.optional-dependencies.sqlalchemy ++ passthru.optional-dependencies.numpy; + ] ++ optional-dependencies.sqlalchemy ++ optional-dependencies.numpy; # these tests require a running clickhouse instance disabledTestPaths = [ @@ -68,14 +68,12 @@ buildPythonPackage rec { "clickhouse_connect.driverc.npconv" ]; - passthru = { - optional-dependencies = { - sqlalchemy = [ sqlalchemy ]; - numpy = [ numpy ]; - pandas = [ pandas ]; - arrow = [ pyarrow ]; - orjson = [ orjson ]; - }; + optional-dependencies = { + sqlalchemy = [ sqlalchemy ]; + numpy = [ numpy ]; + pandas = [ pandas ]; + arrow = [ pyarrow ]; + orjson = [ orjson ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index 3689a9d0dab46..8c642edda2420 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ cloudpathlib ]; azure = [ azure-storage-blob ]; gs = [ google-cloud-storage ]; diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index fa8b93558fb4e..25c05cdd1e8ce 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.6.3"; + version = "0.7.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "salesforce"; repo = "cloudsplaining"; rev = "refs/tags/${version}"; - hash = "sha256-mRWfb14zKS141cYzShXY+OoHWfs9PB1oJu3spsvv6mI="; + hash = "sha256-ZraWGOiJNqVSmxnllaTvpk9+rUQRFcxFIdp91gpAQW0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/clr-loader/default.nix b/pkgs/development/python-modules/clr-loader/default.nix index 6b3d2c3faa391..90006a6fe44e5 100644 --- a/pkgs/development/python-modules/clr-loader/default.nix +++ b/pkgs/development/python-modules/clr-loader/default.nix @@ -36,10 +36,7 @@ buildPythonPackage { format = "pyproject"; - buildInputs = [ - dotnetCorePackages.sdk_6_0.packages - dotnet-build.nugetDeps - ]; + buildInputs = dotnetCorePackages.sdk_6_0.packages ++ dotnet-build.nugetDeps; nativeBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/cltk/default.nix b/pkgs/development/python-modules/cltk/default.nix new file mode 100644 index 0000000000000..7635ace28648e --- /dev/null +++ b/pkgs/development/python-modules/cltk/default.nix @@ -0,0 +1,92 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + boltons, + gensim, + gitpython, + greek-accentuation, + nltk, + pyyaml, + rapidfuzz, + requests, + scikit-learn, + scipy, + spacy, + stanza, + stringcase, + torch, + tqdm, + + # tests + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "cltk"; + version = "1.3.0"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "cltk"; + repo = "cltk"; + rev = "refs/tags/v${version}"; + hash = "sha256-/rdv96lnSGN+aJJmPSIan79zoXxnStokFEAjBtCLKy4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry>=1.1.13" poetry-core \ + --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" \ + --replace-fail 'scipy = "<1.13.0"' 'scipy = "^1"' \ + --replace-fail 'boltons = "^21.0.0"' 'boltons = "^24.0.0"' + ''; + + build-system = [ poetry-core ]; + + pythonRelaxDeps = [ + "spacy" + ]; + + dependencies = [ + boltons + gensim + gitpython + greek-accentuation + nltk + pyyaml + rapidfuzz + requests + scikit-learn + scipy + spacy + stanza + stringcase + torch + tqdm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Most of tests fail as they require local files to be present and also internet access + doCheck = false; + + meta = { + description = "Natural language processing (NLP) framework for pre-modern languages"; + homepage = "https://cltk.org"; + changelog = "https://github.com/cltk/cltk/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kmein ]; + }; +} diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 964b2724d07c3..f52f290be8d52 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -3,9 +3,11 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + distutils, pyyaml, openssh, - nose, + unittestCheckHook, bc, hostname, bash, @@ -14,6 +16,7 @@ buildPythonPackage rec { pname = "clustershell"; version = "1.9.2"; + pyproject = true; src = fetchPypi { pname = "ClusterShell"; @@ -21,30 +24,29 @@ buildPythonPackage rec { hash = "sha256-rsF/HG4GNBC+N49b+sDO2AyUI1G44wJNBUwQNPzShD0="; }; + build-system = [ + setuptools + distutils + ]; + postPatch = '' substituteInPlace lib/ClusterShell/Worker/Ssh.py \ - --replace '"ssh"' '"${openssh}/bin/ssh"' \ - --replace '"scp"' '"${openssh}/bin/scp"' + --replace-fail '"ssh"' '"${openssh}/bin/ssh"' \ + --replace-fail '"scp"' '"${openssh}/bin/scp"' substituteInPlace lib/ClusterShell/Worker/fastsubprocess.py \ - --replace '"/bin/sh"' '"${bash}/bin/sh"' + --replace-fail '"/bin/sh"' '"${bash}/bin/sh"' for f in tests/*; do substituteInPlace $f \ - --replace '/bin/hostname' '${hostname}/bin/hostname' \ - --replace '/bin/sleep' 'sleep' \ - --replace '/bin/echo' 'echo' \ - --replace '/bin/uname' 'uname' \ - --replace '/bin/false' 'false' \ - --replace '/bin/true' 'true' \ - --replace '/usr/bin/printf' 'printf' + --replace-quiet '/bin/hostname' '${hostname}/bin/hostname' \ + --replace-quiet '/bin/sleep' 'sleep' \ + --replace-quiet '/bin/echo' 'echo' \ + --replace-quiet '/bin/uname' 'uname' \ + --replace-quiet '/bin/false' 'false' \ + --replace-quiet '/bin/true' 'true' \ + --replace-quiet '/usr/bin/printf' 'printf' done - - # Fix warnings - substituteInPlace lib/ClusterShell/Task.py \ - --replace "notifyAll" "notify_all" - substituteInPlace tests/TaskPortTest.py lib/ClusterShell/Task.py \ - --replace "currentThread" "current_thread" ''; propagatedBuildInputs = [ pyyaml ]; @@ -52,18 +54,22 @@ buildPythonPackage rec { nativeCheckInputs = [ bc hostname - nose + unittestCheckHook ]; pythonImportsCheck = [ "ClusterShell" ]; - doCheck = false; # tests often get stuck + unittestFlagsArray = [ + "tests" + "-p" + "'*Test.py'" + ]; # Many tests want to open network connections # https://github.com/cea-hpc/clustershell#test-suite # # Several tests fail on Darwin - checkPhase = '' + preCheck = '' rm tests/CLIClushTest.py rm tests/TreeWorkerTest.py rm tests/TaskDistantMixin.py @@ -72,33 +78,10 @@ buildPythonPackage rec { rm tests/TaskDistantPdshTest.py rm tests/TaskRLimitsTest.py rm tests/TreeGatewayTest.py - - nosetests -v \ - -e test_fromall_grouplist \ - -e test_rank_placeholder \ - -e test_engine_on_the_fly_launch \ - -e test_ev_pickup_fanout \ - -e test_ev_pickup_fanout_legacy \ - -e test_timeout \ - -e test_008_broken_pipe_on_write \ - -e testLocalBufferRCGathering \ - -e testLocalBuffers \ - -e testLocalErrorBuffers \ - -e testLocalFanout \ - -e testLocalRetcodes \ - -e testLocalRCBufferGathering \ - -e testLocalSingleLineBuffers \ - -e testLocalWorkerFanout \ - -e testSimpleMultipleCommands \ - -e testClushConfigSetRlimit \ - -e testTimerInvalidateInHandler \ - -e testTimerSetNextFireInHandler \ - -e test_node_placeholder \ - tests/*.py ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Scalable Python framework for cluster administration"; homepage = "https://cea-hpc.github.io/clustershell"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 1d2dd4a8faefc..39567ede68d22 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cma"; - version = "3.4.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "CMA-ES"; repo = "pycma"; rev = "refs/tags/r${version}"; - hash = "sha256-wbAH0A5vpnnXqt7TTvLDPnCp6M3QjeCwD6l6LoTVu1w="; + hash = "sha256-W4KDtX/Ho/XUrZr2cmS66Q0q90FEHRJN0VF4sMgonRw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cmaes/default.nix b/pkgs/development/python-modules/cmaes/default.nix index 3ba69af216183..6a0f96d469e51 100644 --- a/pkgs/development/python-modules/cmaes/default.nix +++ b/pkgs/development/python-modules/cmaes/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cmaes"; - version = "0.11.0"; + version = "0.11.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "CyberAgentAILab"; repo = "cmaes"; rev = "refs/tags/v${version}"; - hash = "sha256-YuoJUo+bMMHkB9LH6mX3iw06NT8xFeu9LJvX94vfLc4="; + hash = "sha256-u2CgU9n8N9AMxfMBbDbnYzBMdl/IGOLTxOeh8RlnB/Y="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index c78eda4078714..75b2d05479091 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { '' sed -i "/--cov/d" setup.cfg '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin echo '#!${stdenv.shell}' > bin/pbpaste @@ -69,7 +69,7 @@ buildPythonPackage rec { export PATH=$(realpath bin):$PATH ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "cmd2" ]; diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix index cb31be20a1702..6fcf618bafef4 100644 --- a/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/pkgs/development/python-modules/cmdstanpy/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { stanio ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ xarray ]; }; @@ -59,7 +59,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; disabledTestPaths = [ # No need to test these when using Nix @@ -77,7 +77,7 @@ buildPythonPackage rec { "test_pathfinder_threads" "test_save_profile" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_init_types" # CmdStan error: error during processing Operation not permitted ]; diff --git a/pkgs/development/python-modules/cmigemo/default.nix b/pkgs/development/python-modules/cmigemo/default.nix index 599f91f141067..9237631c0532f 100644 --- a/pkgs/development/python-modules/cmigemo/default.nix +++ b/pkgs/development/python-modules/cmigemo/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cmigemo" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/mooz/python-cmigemo"; description = "Pure python binding for C/Migemo"; license = licenses.mit; diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 85ef05db3e523..c1ce182aa6c54 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -37,7 +37,9 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; propagatedNativeBuildInputs = [ cffi ]; - buildInputs = [ libiconv ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = [ + libiconv + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ appdirs pyyaml diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index e7c8e70725380..5a245fc58f21c 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "coconut"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; rev = "refs/tags/v${version}"; - hash = "sha256-AqKLSghuyha4wSaC/91bfNna7v8xyw8NLRWBjwu5Rjo="; + hash = "sha256-Vd6ZY3PlbPOy63/0/0YJ1U2PpsVdctOoInyKftj//cM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index b7713f9a025f9..cd97bc6cbd1ac 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -38,20 +37,19 @@ distributed, pyinstrument, pytestCheckHook, + pytest-xdist, }: buildPythonPackage rec { pname = "coffea"; - version = "2024.8.3"; + version = "2024.9.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-aOe1U0IWQIgTJgUAs6WZWQmYnOTzdS+hRlK9QgU3qqk="; + hash = "sha256-IX9c1EhQfFF2Gsn8atxngJ4gpgrwX5SnolUQ3nphhUY="; }; build-system = [ @@ -90,6 +88,7 @@ buildPythonPackage rec { distributed pyinstrument pytestCheckHook + pytest-xdist ]; pythonImportsCheck = [ "coffea" ]; diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 2525aeceba41c..79fcf2764bd36 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -23,16 +22,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.9.0"; + version = "5.10.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; rev = "refs/tags/${version}"; - hash = "sha256-lD/J21RfJ6iBLOr0lzYBJmbTdiZUV8z6IMhZFbfWixM="; + hash = "sha256-9d72JWEz2L8yyZQKkdwQMgwQM3nz4yVHnmVCERaa5C8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index a15b774d40e3c..81294e45b9fb7 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2024.8.16.10"; + version = "2024.8.20.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-HYNmDN3gzmQ7gcUSSXI7/TwDDFPDZJUSu9P0Xz1z2Tk="; + hash = "sha256-IBfHHAmT1BTgA6eMkZf8ggfiknNYp7mfELSRyFARWNk="; }; pythonRelaxDeps = [ "typer" ]; @@ -48,14 +48,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-mock - ] ++ passthru.optional-dependencies.pandas; + ] ++ optional-dependencies.pandas; pythonImportsCheck = [ "coinmetrics.api_client" ]; - passthru = { - optional-dependencies = { - pandas = [ pandas ]; - }; + optional-dependencies = { + pandas = [ pandas ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/colbert-ai/default.nix b/pkgs/development/python-modules/colbert-ai/default.nix new file mode 100644 index 0000000000000..a7d707d383701 --- /dev/null +++ b/pkgs/development/python-modules/colbert-ai/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + + # dependencies + bitarray, + datasets, + flask, + python-dotenv, + ninja, + scipy, + tqdm, + transformers, + ujson, + gitpython, + torch, + faiss, +}: + +buildPythonPackage rec { + pname = "colbert-ai"; + version = "0.2.21"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "colbert_ai"; + hash = "sha256-qNb9tOInLysI7Tf45QlgchYNhBXR5AWFdRiYt35iW6s="; + }; + + pythonRemoveDeps = [ "git-python" ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + bitarray + datasets + faiss + flask + gitpython + python-dotenv + ninja + scipy + torch + tqdm + transformers + ujson + ]; + + pythonImportsCheck = [ "colbert" ]; + + # There is no tests + doCheck = false; + + meta = { + description = "Fast and accurate retrieval model, enabling scalable BERT-based search over large text collections in tens of milliseconds"; + homepage = "https://github.com/stanford-futuredata/ColBERT"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + bachp + ]; + }; +} diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index 348d4080498de..182c5c3706241 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # capturer is broken on darwin / py38, so we skip the test until a fix for # https://github.com/xolox/python-capturer/issues/10 is released. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' # Required for the CLI test diff --git a/pkgs/development/python-modules/command-runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix index 945400c194810..2ef03194928c1 100644 --- a/pkgs/development/python-modules/command-runner/default.nix +++ b/pkgs/development/python-modules/command-runner/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "command-runner"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "netinvent"; repo = "command_runner"; rev = "refs/tags/v${version}"; - hash = "sha256-QzqkcF2/YExK/dz+b0Uk0Af/rAXRMuRIeEynyFgDql8="; + hash = "sha256-rdbZtqNndtIxrLA90eWzR6dB8EyFrBALduBUkOVq4oE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 17e10e8c0f42f..bdcb00d589c1f 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "commitizen"; - version = "3.29.0"; + version = "3.29.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "commitizen-tools"; repo = "commitizen"; rev = "refs/tags/v${version}"; - hash = "sha256-7EQFip8r2Ey7Rbbwns1gvhsBOj7Hjm94NYhq8aANDIo="; + hash = "sha256-qB0XP5y9NjD0AV9gVleq+MbL5l/7M5JBb57pgssbyo4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 7cc96f4d856f8..3e8c1eb0182e3 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -6,7 +6,6 @@ buildPythonPackage, click, fetchFromGitHub, - fetchpatch2, pytest-xdist, pytestCheckHook, pythonOlder, @@ -18,26 +17,18 @@ buildPythonPackage rec { pname = "commoncode"; - version = "31.2.1"; + version = "32.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nexB"; repo = "commoncode"; rev = "refs/tags/v${version}"; - hash = "sha256-4ZgyNlMj1i1fRru4wgDOyP3qzbne8D2eH/tFI60kgrE="; + hash = "sha256-yqvsBJHrxVkSqp3QnYmHDJr3sef/g4pkSlkSioYuOc4="; }; - patches = [ - # https://github.com/nexB/commoncode/pull/66 - (fetchpatch2 { - url = "https://github.com/nexB/commoncode/commit/4f87b3c9272dcf209b9c4b997e98b58e0edaf570.patch"; - hash = "sha256-loUtAww+SK7kMt5uqZmLQ8Wg/OqB7LWVA4BiztnwHsA="; - }) - ]; - dontConfigure = true; build-system = [ setuptools-scm ]; @@ -66,7 +57,7 @@ buildPythonPackage rec { "test_walk_can_walk_non_utf8_path_from_unicode_path" "test_resource_iter_can_walk_non_utf8_path_from_unicode_path_with_dirs" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # expected result is tailored towards the quirks of upstream's # CI environment on darwin "test_searchable_paths" diff --git a/pkgs/development/python-modules/compressai/default.nix b/pkgs/development/python-modules/compressai/default.nix index 4848df28167f5..66fa915ebef60 100644 --- a/pkgs/development/python-modules/compressai/default.nix +++ b/pkgs/development/python-modules/compressai/default.nix @@ -1,54 +1,63 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system pybind11, setuptools, - wheel, + + # dependencies + einops, numpy, matplotlib, + pandas, pytorch-msssim, scipy, torch, + torch-geometric, torchvision, + + # optional-dependencies ipywidgets, jupyter, + + # tests plotly, pytestCheckHook, }: buildPythonPackage rec { pname = "compressai"; - version = "1.2.4"; + version = "1.2.6"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "InterDigitalInc"; repo = "CompressAI"; rev = "refs/tags/v${version}"; - hash = "sha256-nT2vd7t67agIWobJalORbRuns0UJGRGGbTX2/8vbTiY="; + hash = "sha256-xvzhhLn0iBzq3h1nro8/83QWEQe9K4zRa3RSZk+hy3Y="; fetchSubmodules = true; }; - nativeBuildInputs = [ + build-system = [ pybind11 setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ + einops numpy matplotlib + pandas pytorch-msssim scipy torch + torch-geometric torchvision ]; - passthru.optional-dependencies = { + optional-dependencies = { tutorials = [ ipywidgets jupyter @@ -81,10 +90,10 @@ buildPythonPackage rec { "test_pretrained" ]; - meta = with lib; { + meta = { description = "PyTorch library and evaluation platform for end-to-end compression research"; homepage = "https://github.com/InterDigitalInc/CompressAI"; - license = licenses.bsd3Clear; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.bsd3Clear; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index c2038f77e1bb4..eb4a1515e026f 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "conda-libmamba-solver"; - version = "24.7.0"; + version = "24.9.0"; pyproject = true; src = fetchFromGitHub { @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda-libmamba-solver"; rev = "refs/tags/${version}"; - hash = "sha256-HBbApS6hyIbRyxOpOwbC1+IalIYk17rYRo6HLcwKKW4="; + hash = "sha256-hHuuRMx9PQ3mMdxpSRTtg81xeq2XLmxhz1/gtnq54qg="; }; diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 59f89df05231d..9a1cdb8798d41 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { hash = "sha256-m77MY0IZ1AJkd4/Y7ltApvdF9y17Lgn92WZPYTCU9tA="; }; - passthru.optional-dependencies = { + optional-dependencies = { yaml = [ pyyaml ]; }; nativeCheckInputs = [ pytestCheckHook mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "configargparse" ]; diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index d078fceee371b..6e6e38f0b3af8 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; preConfigure = '' - export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 + export LC_ALL=${if stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8 ''; meta = with lib; { diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 95cf2c7bf0b69..b0098ded880c3 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - passthru.optional-dependencies = { + optional-dependencies = { avro = [ avro fastavro @@ -49,7 +49,7 @@ buildPythonPackage rec { pyflakes pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "confluent_kafka" ]; diff --git a/pkgs/development/python-modules/confusable-homoglyphs/default.nix b/pkgs/development/python-modules/confusable-homoglyphs/default.nix new file mode 100644 index 0000000000000..109bf574c11e0 --- /dev/null +++ b/pkgs/development/python-modules/confusable-homoglyphs/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, + click, +}: + +let + libName = "confusable-homoglyphs"; + snakeLibName = builtins.replaceStrings [ "-" ] [ "_" ] libName; +in +buildPythonPackage rec { + pname = libName; + version = "3.3.1"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = snakeLibName; + hash = "sha256-uZUAHJsuG0zqDPXzhAp8eRiKjLutBT1pNXK9jBwexGA="; + }; + + build-system = [ setuptools ]; + + disabled = pythonOlder "3.7"; + + optional-dependencies = { + cli = [ click ]; + }; + + pythonImportsCheck = [ snakeLibName ]; + + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.cli; + + disabledTests = [ + "test_generate_categories" # touches network + "test_generate_confusables" # touches network + ]; + + meta = + let + inherit (lib) licenses maintainers; + in + { + description = "Detect confusable usage of unicode homoglyphs, prevent homograph attacks"; + homepage = "https://sr.ht/~valhalla/confusable_homoglyphs/"; + changelog = "https://confusable-homoglyphs.readthedocs.io/en/latest/history.html"; + license = licenses.mit; + maintainers = with maintainers; [ ajaxbits ]; + }; +} diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 0e599c2945c30..a43fccb0170ec 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { werkzeug ]; - passthru.optional-dependencies = { + optional-dependencies = { flask = [ a2wsgi flask @@ -75,7 +75,7 @@ buildPythonPackage rec { pytest-aiohttp pytestCheckHook testfixtures - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "connexion" ]; diff --git a/pkgs/development/python-modules/consolekit/default.nix b/pkgs/development/python-modules/consolekit/default.nix new file mode 100644 index 0000000000000..3da148baf4dfc --- /dev/null +++ b/pkgs/development/python-modules/consolekit/default.nix @@ -0,0 +1,40 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + flit-core, + click, + colorama, + deprecation-alias, + domdf-python-tools, + mistletoe, + typing-extensions, +}: +buildPythonPackage rec { + pname = "consolekit"; + version = "1.7.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Dqi84qeUGirw4z1ay3burLeHESeNK2DDPtPnpJzD/Qw=A"; + }; + + build-system = [ flit-core ]; + + dependencies = [ + click + colorama + deprecation-alias + domdf-python-tools + mistletoe + typing-extensions + ]; + + meta = { + description = "Additional utilities for click."; + homepage = "https://pypi.org/project/consolekit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyberius-prime ]; + }; +} diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 729d6df5644d6..b0fdf8d7c326a 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { lz4 ]; - passthru.optional-dependencies = { + optional-dependencies = { extras = [ arrow cloudpickle @@ -47,11 +47,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "construct" ]; - disabledTests = [ "test_benchmarks" ] ++ lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; + disabledTests = [ + "test_benchmarks" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing" ]; meta = with lib; { description = "Powerful declarative parser (and builder) for binary data"; diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index b72e9a2ec99ee..01edc594a594b 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -1,34 +1,36 @@ { lib, buildPythonPackage, - fetchPypi, - pythonAtLeast, + fetchFromGitHub, + setuptools, pythonOlder, unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "contextlib2"; - version = "21.6.0"; - format = "setuptools"; + version = "21.6.0-unstable-2024-05-23"; + pyproject = true; - # Python 3.11 not currently supported - # https://github.com/jazzband/contextlib2/issues/43 - disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-qx4r/h0B2Wjht+jZAjvFHvNQm7ohe7cwzuOCfh7oKGk="; + src = fetchFromGitHub { + owner = "jazzband"; + repo = "contextlib2"; + rev = "f64cf04df8a1f6a32ce2095192b4638d229ff25e"; + hash = "sha256-HX9N8G8jl6cpEwdJ80pDcoo4osTO/f8fz5sNcY/R1Nk="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "contextlib2" ]; - meta = with lib; { + meta = { description = "Backports and enhancements for the contextlib module"; homepage = "https://contextlib2.readthedocs.org/"; - license = licenses.psfl; - maintainers = [ ]; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/controku/default.nix b/pkgs/development/python-modules/controku/default.nix index e41e38b8ccd4e..9aff50bfc0870 100644 --- a/pkgs/development/python-modules/controku/default.nix +++ b/pkgs/development/python-modules/controku/default.nix @@ -1,6 +1,5 @@ { lib, - python3Packages, fetchFromGitHub, setuptools, requests, @@ -10,10 +9,11 @@ gobject-introspection, gtk3, wrapGAppsHook3, + buildPythonPackage, buildApplication ? false, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "controku"; version = "1.1.0"; format = "pyproject"; diff --git a/pkgs/development/python-modules/corner/default.nix b/pkgs/development/python-modules/corner/default.nix index 68446453e200b..50ab12a81f9a4 100644 --- a/pkgs/development/python-modules/corner/default.nix +++ b/pkgs/development/python-modules/corner/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { dependencies = [ matplotlib ]; - passthru.optional-dependencies = { + optional-dependencies = { arviz = [ arviz ]; docs = [ arviz @@ -66,7 +66,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "corner" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ corner.passthru.optional-dependencies.test; + nativeCheckInputs = [ pytestCheckHook ] ++ corner.optional-dependencies.test; # matplotlib.testing.exceptions.ImageComparisonFailure: images not close disabledTests = [ @@ -79,13 +79,18 @@ buildPythonPackage rec { "test_extended_overplotting" "test_hist_bin_factor" "test_labels" + "test_levels2" "test_lowNfilled" "test_no_fill_contours" + "test_overplot" "test_overplot_log" "test_pandas" "test_quantiles" "test_range_fig_arg" + "test_reverse" "test_reverse_overplotting" + "test_reverse_truths" + "test_smooth1" "test_tight" "test_title_quantiles" "test_title_quantiles_default" diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index ac144b26450b0..fb3a138627ad9 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { "test_serial_fixup_stubbed" "test_serial_fixup_stubbed_create" "test_serial_fixup_stubbed_vm_not_found" - ] ++ lib.optionals stdenv.isDarwin [ "test_serial_fixup_invalid_host" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_serial_fixup_invalid_host" ]; pythonImportsCheck = [ "COT" ]; diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 04c488586c9ef..d51a12f46cb91 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -10,12 +10,13 @@ fetchFromGitHub, git, hypothesis, + license-expression, nix-update-script, - pydantic-yaml, pyfakefs, pygit2, pytest-check, pytest-mock, + pytest-subprocess, pytestCheckHook, pythonOlder, pyyaml, @@ -26,7 +27,7 @@ buildPythonPackage rec { pname = "craft-application"; - version = "3.2.0"; + version = "4.2.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -35,12 +36,12 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-application"; rev = "refs/tags/${version}"; - hash = "sha256-2JfCe7FJtuObC/4miA+OC/ctGy1fhdgI7DsowNYjQk8="; + hash = "sha256-Y/Eci0ByE1HxUcxWhpQq0F2Ef1xkXZMBDGmUSIyPKII="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==70.1.0" "setuptools" + --replace-fail "setuptools==74.1.1" "setuptools" ''; build-system = [ setuptools-scm ]; @@ -56,7 +57,7 @@ buildPythonPackage rec { craft-grammar craft-parts craft-providers - pydantic-yaml + license-expression pygit2 pyyaml snap-helpers @@ -68,6 +69,7 @@ buildPythonPackage rec { pyfakefs pytest-check pytest-mock + pytest-subprocess pytestCheckHook responses ]; @@ -96,7 +98,7 @@ buildPythonPackage rec { # Tests expecting pytest-time "test_monitor_builds_success" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # These tests have hardcoded "amd64" strings which fail on aarch64 "test_process_grammar_build_for" "test_process_grammar_platform" diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index 6369acc78208b..f401b5fb52943 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -6,7 +6,7 @@ launchpadlib, lazr-restfulclient, overrides, - pydantic_1, + pydantic, setuptools, setuptools-scm, tabulate, @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "craft-archives"; - version = "1.2.0"; + version = "2.0.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-archives"; rev = "refs/tags/${version}"; - hash = "sha256-4BYRwuBDKFbVvK805e+L4ZR8wtS8GHHYteexH4YZmSE="; + hash = "sha256-BrKyOdfbwt9qU5Bt/kX/+GgxH7LCFmmFg4mevBWVp2I="; }; postPatch = '' @@ -36,16 +36,13 @@ buildPythonPackage rec { --replace-fail "setuptools==67.7.2" "setuptools" ''; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ launchpadlib lazr-restfulclient overrides - pydantic_1 + pydantic tabulate ]; diff --git a/pkgs/development/python-modules/craft-cli/default.nix b/pkgs/development/python-modules/craft-cli/default.nix index 193616f1583ed..16fdbf181583d 100644 --- a/pkgs/development/python-modules/craft-cli/default.nix +++ b/pkgs/development/python-modules/craft-cli/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "craft-cli"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-cli"; rev = "refs/tags/${version}"; - hash = "sha256-8+dyFOEW0F4t2issRlOqdbzf0Avg0NsADgk96mZFpEQ="; + hash = "sha256-PNurNP0ghG/R0rcUc5GfuPM5PTt+9FbJRjs61YJ1ytc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix index 6b920aaa7a4a2..1aeb3c32e10e6 100644 --- a/pkgs/development/python-modules/craft-grammar/default.nix +++ b/pkgs/development/python-modules/craft-grammar/default.nix @@ -4,15 +4,15 @@ fetchFromGitHub, nix-update-script, overrides, - setuptools, + setuptools-scm, pytestCheckHook, - pydantic_1, + pydantic, pyyaml, }: buildPythonPackage rec { pname = "craft-grammar"; - version = "1.2.0"; + version = "2.0.1"; pyproject = true; @@ -20,17 +20,17 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-grammar"; rev = "refs/tags/${version}"; - hash = "sha256-YQpxgdmUxYLkhAXDLlkLAK6VpjIEycLFY3nsE/M4o2g="; + hash = "sha256-xex+7rCXqRegnws470VtVltM49fx7fSHzWDZawRmOdM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ overrides ]; + dependencies = [ overrides ]; pythonImportsCheck = [ "craft_grammar" ]; nativeCheckInputs = [ - pydantic_1 + pydantic pytestCheckHook pyyaml ]; diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index 2ad66a7d4a757..bdd97d35643e2 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -4,8 +4,7 @@ fetchFromGitHub, nix-update-script, overrides, - pydantic_1, - pydantic-yaml, + pydantic, pyxdg, pyyaml, requests, @@ -17,6 +16,7 @@ pytest-subprocess, requests-mock, hypothesis, + jsonschema, git, squashfsTools, setuptools-scm, @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "1.33.0"; + version = "2.1.1"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; rev = "refs/tags/${version}"; - hash = "sha256-SP2mkaXsU0btnA3aanSA18GkdW6ReLgImOWdpnwZiyU="; + hash = "sha256-I98YQDJJroCnAQgepDXqYnH5M2WZTGDljm/KufGd7yM="; }; patches = [ ./bash-path.patch ]; @@ -43,12 +43,12 @@ buildPythonPackage rec { pythonRelaxDeps = [ "requests" "urllib3" + "pydantic" ]; dependencies = [ overrides - pydantic_1 - pydantic-yaml + pydantic pyxdg pyyaml requests @@ -61,6 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ git hypothesis + jsonschema pytest-check pytest-mock pytest-subprocess @@ -96,7 +97,7 @@ buildPythonPackage rec { "tests/unit/packages/test_deb.py" "tests/unit/packages/test_chisel.py" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # These tests have hardcoded "amd64" strings which fail on aarch64 "tests/unit/executor/test_environment.py" "tests/unit/features/overlay/test_executor_environment.py" @@ -105,7 +106,6 @@ buildPythonPackage rec { passthru.updateScript = nix-update-script { }; meta = { - broken = lib.versionAtLeast pydantic-yaml.version "1"; description = "Software artifact parts builder from Canonical"; homepage = "https://github.com/canonical/craft-parts"; changelog = "https://github.com/canonical/craft-parts/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix index f183449961d35..6a1a4936092ac 100644 --- a/pkgs/development/python-modules/craft-platforms/default.nix +++ b/pkgs/development/python-modules/craft-platforms/default.nix @@ -5,16 +5,16 @@ distro, fetchFromGitHub, nix-update-script, + hypothesis, pytest-check, pytestCheckHook, pythonOlder, - setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "craft-platforms"; - version = "0.2.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,17 +23,14 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-platforms"; rev = "refs/tags/${version}"; - hash = "sha256-chCPuncy+//Y5iohTh0d8qRNaEno6Sqze2Zoas3uwPQ="; + hash = "sha256-VDSwvBWoGHcjGCEA4RDVwRzQGNVaphwZu/iaktAweb0="; }; postPatch = '' substituteInPlace craft_platforms/__init__.py --replace-fail "dev" "${version}" ''; - build-system = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; dependencies = [ annotated-types @@ -41,6 +38,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + hypothesis pytestCheckHook pytest-check ]; diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index 8b91b0005ed5b..7dcf2fff8b52c 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -5,10 +5,9 @@ nix-update-script, packaging, platformdirs, - pydantic_1, + pydantic, pyyaml, requests-unixsocket, - setuptools, setuptools-scm, urllib3, pytest-check, @@ -22,7 +21,7 @@ buildPythonPackage rec { pname = "craft-providers"; - version = "1.24.2"; + version = "2.0.3"; pyproject = true; @@ -30,7 +29,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-providers"; rev = "refs/tags/${version}"; - hash = "sha256-2629Xk2KB1WX3JzAupBWmKg+Ztp5FFJ0x9Xa/w+8tns="; + hash = "sha256-DTUXT5vFIDI06oxka3diWJ5E5oqiX6GXB4ivq6+VrDk="; }; patches = [ @@ -52,21 +51,18 @@ buildPythonPackage rec { # The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69 # This is already patched in nixpkgs. substituteInPlace pyproject.toml \ - --replace-fail "setuptools==" "setuptools>=" \ + --replace-fail "setuptools==73.0.1" "setuptools" \ --replace-fail "urllib3<2" "urllib3" ''; pythonRelaxDeps = [ "requests" ]; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ packaging platformdirs - pydantic_1 + pydantic pyyaml requests-unixsocket urllib3 diff --git a/pkgs/development/python-modules/craft-store/default.nix b/pkgs/development/python-modules/craft-store/default.nix index 4011b01d60d06..f9f8f73e8eb04 100644 --- a/pkgs/development/python-modules/craft-store/default.nix +++ b/pkgs/development/python-modules/craft-store/default.nix @@ -7,7 +7,7 @@ setuptools-scm, pytest-check, pytest-mock, - pydantic_1, + pydantic, pyyaml, pytestCheckHook, keyring_24, @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "craft-store"; - version = "2.6.2"; + version = "3.0.2"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-store"; rev = "refs/tags/${version}"; - hash = "sha256-QKfXOgAWMV1mVm32ZP3HQTJmWKm82dEDmy3fo5d67TU="; + hash = "sha256-l8WnuaMJN4/nZRkWoU6omgbd4hKR2m7YC+YVcvAqzcA="; }; postPatch = '' @@ -36,16 +36,13 @@ buildPythonPackage rec { --replace-fail "setuptools==" "setuptools>=" ''; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ keyring_24 macaroonbakery overrides - pydantic_1 + pydantic pyxdg requests requests-toolbelt @@ -56,7 +53,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "craft_store" ]; nativeCheckInputs = [ - pydantic_1 + pydantic pytest-check pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix index 13ed15f5246da..1f92211953ca8 100644 --- a/pkgs/development/python-modules/cram/default.nix +++ b/pkgs/development/python-modules/cram/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ jluttine ]; # Tests fail on i686: https://hydra.nixos.org/build/52896671/nixlog/4 - broken = stdenv.isi686; + broken = stdenv.hostPlatform.isi686; }; } diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index e61e75da117f5..34571f05f774c 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; nativeCheckInputs = [ hypothesis diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix index 43e5ac7e6163b..c038eb46668ae 100644 --- a/pkgs/development/python-modules/cryptg/default.nix +++ b/pkgs/development/python-modules/cryptg/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { cargo ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix index 9fe0ad7acaeba..ba5d3a0fcf1c6 100644 --- a/pkgs/development/python-modules/cryptodatahub/default.nix +++ b/pkgs/development/python-modules/cryptodatahub/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { preCheck = '' # failing tests rm test/updaters/test_common.py + rm test/common/test_key.py # Tests require network access rm test/common/test_utils.py ''; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 29076051578e9..1d1e43a031657 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ] diff --git a/pkgs/development/python-modules/css-html-js-minify/default.nix b/pkgs/development/python-modules/css-html-js-minify/default.nix index a1a26dd9eaa64..df6f74caa5716 100644 --- a/pkgs/development/python-modules/css-html-js-minify/default.nix +++ b/pkgs/development/python-modules/css-html-js-minify/default.nix @@ -2,26 +2,36 @@ lib, buildPythonPackage, fetchPypi, + distutils, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "css-html-js-minify"; version = "2.5.5"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4a9f11f7e0496f5284d12111f3ba4ff5ff2023d12f15d195c9c48bd97013746c"; + hash = "sha256-Sp8R9+BJb1KE0SER87pP9f8gI9EvFdGVycSL2XATdGw="; }; - doCheck = false; # Tests are useless and broken + build-system = [ + distutils + setuptools + ]; + + # Tests are useless and broken + doCheck = false; pythonImportsCheck = [ "css_html_js_minify" ]; meta = with lib; { description = "StandAlone Async cross-platform Minifier for the Web"; - mainProgram = "css-html-js-minify"; homepage = "https://github.com/juancarlospaco/css-html-js-minify"; license = with licenses; [ gpl3Plus @@ -29,5 +39,6 @@ buildPythonPackage rec { mit ]; maintainers = with maintainers; [ FlorianFranzen ]; + mainProgram = "css-html-js-minify"; }; } diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index b9faf71842b69..a108599eb6ba2 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security SystemConfiguration @@ -70,7 +70,7 @@ buildPythonPackage rec { "test_cache" "test_remote_stylesheet" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # pyo3_runtime.PanicException: event loop thread panicked "test_invalid_href" ]; diff --git a/pkgs/development/python-modules/ctypesgen/default.nix b/pkgs/development/python-modules/ctypesgen/default.nix new file mode 100644 index 0000000000000..ff7a8f7b32539 --- /dev/null +++ b/pkgs/development/python-modules/ctypesgen/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools-scm, + setuptools, + toml, + wheel, +}: + +buildPythonPackage rec { + pname = "ctypesgen"; + version = "1.1.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "ctypesgen"; + repo = "ctypesgen"; + rev = "refs/tags/${version}"; + hash = "sha256-TwIWPellmjMpTGQ+adJBLNMdAqB0kLOMl4YAubvXKqo="; + }; + + build-system = [ + setuptools + setuptools-scm + toml + wheel + ]; + + # Various compiler errors + doCheck = false; + + pythonImportsCheck = [ "ctypesgen" ]; + + meta = with lib; { + description = "Pure-python wrapper generator for ctypes"; + homepage = "https://github.com/ctypesgen/ctypesgen"; + changelog = "https://github.com/ctypesgen/ctypesgen/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 087d85405e260..434af5cb974aa 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { "test_unix_echo" # socket bind error on hydra when built with other packages "test_unix_ssl_server" # socket bind error on hydra when built with other packages ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # connects to python.org:1, expects an OsError, hangs in the darwin sandbox "test_create_bad_connection" ]; diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index b2467a02e09b5..7be20c559019f 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { changelog = "https://github.com/bpython/curtsies/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix index c7364e5589a06..5cbd7ab56bf48 100644 --- a/pkgs/development/python-modules/cvss/default.nix +++ b/pkgs/development/python-modules/cvss/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cvss"; - version = "3.1"; + version = "3.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,10 +19,10 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvss"; rev = "refs/tags/v${version}"; - hash = "sha256-e/zwOfbt3YLlRiLFObjps3tFFk6BAWBKdanio6sus8c="; + hash = "sha256-r4IWaOEZUX+3wW47rX8+lsixIjr14zAaXfFIFcbLVMM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ jsonschema @@ -37,10 +37,10 @@ buildPythonPackage rec { meta = with lib; { description = "Library for CVSS2/3/4"; - mainProgram = "cvss_calculator"; homepage = "https://github.com/RedHatProductSecurity/cvss"; changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/v${version}"; - license = with licenses; [ lgpl3Plus ]; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab ]; + mainProgram = "cvss_calculator"; }; } diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 7ed3c75637779..4e49046a1e239 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -21,7 +21,7 @@ # checks pytestCheckHook, - useOpenmp ? (!stdenv.isDarwin), + useOpenmp ? (!stdenv.hostPlatform.isDarwin), }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cwl-utils/default.nix b/pkgs/development/python-modules/cwl-utils/default.nix index fe6c94829e0e4..8e5eb6dd772db 100644 --- a/pkgs/development/python-modules/cwl-utils/default.nix +++ b/pkgs/development/python-modules/cwl-utils/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "cwl-utils"; - version = "0.33"; + version = "0.34"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "common-workflow-language"; repo = "cwl-utils"; rev = "refs/tags/v${version}"; - hash = "sha256-+GvG5Uu2nQWYCcuAkBkegsmMCWhf269jH6Zcex99I4M="; + hash = "sha256-HzLDUhiFegYPWAKt3YoiWiunNHcDEx9FvRXwxKd7wp0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index 44dc7e32fd4bb..d8e05e3e70fe0 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -1,54 +1,53 @@ { lib, buildPythonPackage, + distutils, fetchPypi, pythonOlder, ncurses, + packaging, setuptools, filelock, - typing-extensions, wheel, patchelf, }: buildPythonPackage rec { pname = "cx-freeze"; - version = "7.1.1"; + version = "7.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchPypi { pname = "cx_freeze"; inherit version; - hash = "sha256-M1wwutDj5lNlXyMJkzCEWL7cmXuvW3qZXoZB3rousoc="; + hash = "sha256-xX9xAbTTUTJGSx7IjLiUjDt8W07OS7NUwWCRWJyzNYM="; }; - pythonRelaxDeps = [ - "setuptools" - "wheel" - ]; + postPatch = '' + sed -i /patchelf/d pyproject.toml + # Build system requirements + substituteInPlace pyproject.toml \ + --replace-fail "setuptools>=65.6.3,<71" "setuptools" \ + --replace-fail "wheel>=0.42.0,<=0.43.0" "wheel" + ''; build-system = [ setuptools wheel ]; - buildInputs = [ - ncurses - ]; + buildInputs = [ ncurses ]; dependencies = [ + distutils filelock + packaging setuptools - ] ++ lib.optionals (pythonOlder "3.10") [ - typing-extensions + wheel ]; - postPatch = '' - sed -i /patchelf/d pyproject.toml - ''; - makeWrapperArgs = [ "--prefix" "PATH" @@ -56,7 +55,7 @@ buildPythonPackage rec { (lib.makeBinPath [ patchelf ]) ]; - # fails to find Console even though it exists on python 3.x + # Fails to find Console even though it exists on python 3.x doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/cxxheaderparser/default.nix b/pkgs/development/python-modules/cxxheaderparser/default.nix index ba53da3679a20..2d6a079f1d607 100644 --- a/pkgs/development/python-modules/cxxheaderparser/default.nix +++ b/pkgs/development/python-modules/cxxheaderparser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cxxheaderparser"; - version = "1.3.4"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "robotpy"; repo = "cxxheaderparser"; rev = version; - hash = "sha256-Cyo+18mH1p5Zy4dWP3mjZRIkZZOyb61ABedk/amDi0g="; + hash = "sha256-Gf7O1jFICLUcN0z4WYQmh7co2AxdzJY+tdXzu/AdG/g="; }; postPatch = '' @@ -35,5 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/robotpy/cxxheaderparser"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/cybox/default.nix b/pkgs/development/python-modules/cybox/default.nix new file mode 100644 index 0000000000000..24c991a05862e --- /dev/null +++ b/pkgs/development/python-modules/cybox/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + lxml, + mixbox, + pytestCheckHook, + python-dateutil, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "cybox"; + version = "2.1.0.21"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "CybOXProject"; + repo = "python-cybox"; + rev = "refs/tags/v${version}"; + hash = "sha256-Gn/gH7pvvOqLIGExgCNa5KswPazIZUZXdQe3LRAUVjw="; + }; + + patches = [ + # Import ABC from collections.abc for Python 3 compatibility, https://github.com/CybOXProject/python-cybox/pull/332 + (fetchpatch { + name = "collections-abc.patch"; + url = "https://github.com/CybOXProject/python-cybox/commit/fd4631dac12943d89e9ea2e94105cbc3b81d52f9.patch"; + hash = "sha256-dXEsJujtbU/SuUBge8abWgMPeYO1ZR3c5758Bd0dnwE="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ + lxml + mixbox + python-dateutil + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cybox" ]; + + meta = { + description = "Library for parsing, manipulating, and generating CybOX content"; + homepage = "https://github.com/CybOXProject/python-cybox/"; + changelog = "https://github.com/CybOXProject/python-cybox/blob/${src.rev}/CHANGES.txt"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 35e307e7e5ac6..f895557a32b3b 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "7.6.0"; + version = "7.6.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-4778eTsgHxVnbJiFvZdOIXtRUeZ0S3nANEGC3eNlEpU="; + hash = "sha256-KvP3msV2qIn26pSLv0XrxnwqRx7uWcllLTJg9vig5V0="; }; pythonRelaxDeps = [ "py-serializable" ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { types-toml ]; - passthru.optional-dependencies = { + optional-dependencies = { validation = [ jsonschema lxml @@ -69,7 +69,7 @@ buildPythonPackage rec { ddt pytestCheckHook xmldiff - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cyclonedx" ]; diff --git a/pkgs/development/python-modules/cyrtranslit/default.nix b/pkgs/development/python-modules/cyrtranslit/default.nix index 03e32e91d4c56..6d524bcf222a2 100644 --- a/pkgs/development/python-modules/cyrtranslit/default.nix +++ b/pkgs/development/python-modules/cyrtranslit/default.nix @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "opendatakosovo"; repo = "cyrillic-transliteration"; - rev = "v${version}"; - sha256 = "sha256-t8UTOmjGqjmxU7+Po0/HmOPWAvcgZibaUC9dMlttA/0="; + rev = "refs/tags/v${version}"; + hash = "sha256-t8UTOmjGqjmxU7+Po0/HmOPWAvcgZibaUC9dMlttA/0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cython/0.nix b/pkgs/development/python-modules/cython/0.nix index 8dc7db31fe3f4..a484892c00400 100644 --- a/pkgs/development/python-modules/cython/0.nix +++ b/pkgs/development/python-modules/cython/0.nix @@ -24,8 +24,8 @@ let # Some tests in the test suite isn't working on aarch64. Disable them for # now until upstream finds a workaround. # Upstream issue here: https://github.com/cython/cython/issues/2308 - ++ lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ] - ++ lib.optionals stdenv.isi686 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "numpy_memoryview" ] + ++ lib.optionals stdenv.hostPlatform.isi686 [ "future_division" "overflow_check_longlong" ]; @@ -87,7 +87,7 @@ buildPythonPackage rec { # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; - # doCheck = !stdenv.isDarwin; + # doCheck = !stdenv.hostPlatform.isDarwin; # force regeneration of generated code in source distributions # https://github.com/cython/cython/issues/5089 diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index 2d3333ecec6a3..63e2821cde39b 100644 --- a/pkgs/development/python-modules/cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -26,8 +26,8 @@ let # Some tests in the test suite isn't working on aarch64. Disable them for # now until upstream finds a workaround. # Upstream issue here: https://github.com/cython/cython/issues/2308 - ++ lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ] - ++ lib.optionals stdenv.isi686 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "numpy_memoryview" ] + ++ lib.optionals stdenv.hostPlatform.isi686 [ "future_division" "overflow_check_longlong" ]; @@ -70,7 +70,7 @@ buildPythonPackage rec { # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; - # doCheck = !stdenv.isDarwin; + # doCheck = !stdenv.hostPlatform.isDarwin; passthru.tests = { inherit sage; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 0cae95af4c801..7e85adb0c29df 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { ]; # Most tests fail on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "daphne" ]; diff --git a/pkgs/development/python-modules/darkdetect/default.nix b/pkgs/development/python-modules/darkdetect/default.nix index fe38977f2ac06..c51f22fb368d4 100644 --- a/pkgs/development/python-modules/darkdetect/default.nix +++ b/pkgs/development/python-modules/darkdetect/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "darkdetect" ]; - postPatch = lib.optionalString (stdenv.isLinux) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isLinux) '' substituteInPlace darkdetect/_linux_detect.py \ --replace "'gsettings'" "'${glib.bin}/bin/gsettings'" ''; diff --git a/pkgs/development/python-modules/dash-bootstrap-components/default.nix b/pkgs/development/python-modules/dash-bootstrap-components/default.nix index 9e6cfa1daaead..ce39e11af1f59 100644 --- a/pkgs/development/python-modules/dash-bootstrap-components/default.nix +++ b/pkgs/development/python-modules/dash-bootstrap-components/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, dash, setuptools, pythonOlder, @@ -14,11 +14,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "facultyai"; - repo = "dash-bootstrap-components"; - rev = "refs/tags/${version}"; - hash = "sha256-6tx7rOB5FVj44NbTznyZd1Q0HOc8QdxiZOhja5kgpAE="; + src = fetchPypi { + inherit version; + pname = "dash_bootstrap_components"; + hash = "sha256-lgoeyTl1dHkvSagkECT6POzeD1kwyXGj/IHwFsvrEJU="; }; build-system = [ setuptools ]; @@ -28,8 +27,7 @@ buildPythonPackage rec { # Tests a additional requirements doCheck = false; - # Circular import - # pythonImportsCheck = [ "dash_bootstrap_components" ]; + pythonImportsCheck = [ "dash_bootstrap_components" ]; meta = with lib; { description = "Bootstrap components for Plotly Dash"; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 125c25d8a6b59..d514c8b454e7b 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -1,14 +1,13 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, - setuptools, - nodejs, - yarn, - fixup-yarn-lock, + yarnConfigHook, fetchYarnDeps, + nodejs, + + setuptools, flask, werkzeug, @@ -37,23 +36,19 @@ buildPythonPackage rec { pname = "dash"; - version = "2.17.1"; + version = "2.18.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "plotly"; repo = "dash"; rev = "refs/tags/v${version}"; - hash = "sha256-51/nMnXUhb+hTL4xS9x4urI+2eENo/8sEKtk/kt6xTk="; + hash = "sha256-2LwM1lrJNdekoDN+wDHgaSlGOnpK618r65UHj7cP59E="; }; nativeBuildInputs = [ - setuptools + yarnConfigHook nodejs - yarn - fixup-yarn-lock ]; yarnOfflineCache = fetchYarnDeps { @@ -61,25 +56,25 @@ buildPythonPackage rec { hash = "sha256-L/or8jO6uEypI5krwy/ElIxa6jJrXGsCRZ9mh+0kcGA="; }; - preBuild = '' + # as of writing this yarnConfigHook has no parameter that changes in which directory it will be run + # until then we use preConfigure for entering the directory and preBuild for exiting it + preConfigure = '' pushd @plotly/dash-jupyterlab - export HOME=$(mktemp -d) - - yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} - fixup-yarn-lock yarn.lock - - substituteInPlace package.json --replace jlpm yarn - yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts - patchShebangs node_modules + substituteInPlace package.json \ + --replace-fail 'jlpm' 'yarn' + ''; - # Generates the jupyterlab extension files - yarn run build:pack + preBuild = '' + # Generate the jupyterlab extension files + yarn --offline run build:pack popd ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ flask werkzeug plotly @@ -93,7 +88,7 @@ buildPythonPackage rec { nest-asyncio ]; - passthru.optional-dependencies = { + optional-dependencies = { celery = [ celery redis diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 959d83b96bcd8..8f14ceb76e1f9 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -28,20 +27,16 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.7.0"; + version = "2024.9.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-xy3rq/gXQUtquvyWSCcBjZ+gUYT3RzxMgXThyT6Fwec="; + hash = "sha256-4CwixPj0bJHVjnwZ7fPkRdiDHs8/IzvNlwSPynXvcAo="; }; - pythonRelaxDeps = [ "awkward" ]; - build-system = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 750ef76131976..4e9de770a193b 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -21,16 +20,14 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.11"; + version = "1.1.15"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-D26b8HkcRqsMuzSTZdmDmS59dlAbj4F93kfY27UAhKw="; + hash = "sha256-b5nY3srMADzYZ0GYCeyUfxhJLm7E4dTbM7qrsCR9d7A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix index 8935e536996af..f1aa0dbc6fb36 100644 --- a/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { traitlets ]; - passthru.optional-dependencies = { + optional-dependencies = { kerberos = [ pykerberos ]; jobqueue = [ sqlalchemy ]; local = [ sqlalchemy ]; diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix index 26ca90ab020f5..032f978cdef95 100644 --- a/pkgs/development/python-modules/dask-histogram/default.nix +++ b/pkgs/development/python-modules/dask-histogram/default.nix @@ -2,31 +2,37 @@ lib, buildPythonPackage, fetchFromGitHub, - boost-histogram, - dask, + + # build-system hatchling, hatch-vcs, + + # dependencies + boost-histogram, + dask, + + # tests pytestCheckHook, }: buildPythonPackage rec { pname = "dask-histogram"; - version = "2024.3.0"; + version = "2024.9.1"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; rev = "refs/tags/${version}"; - hash = "sha256-RqZMAEGFqEXNmNv7SWCyQw9cI+I+Oa6s8O/7Jp+9id8="; + hash = "sha256-k+hD5y9K6Jsm++H+IAWJ/Z3wlCN4fV8RIcyAnvOvem0="; }; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ boost-histogram dask ]; @@ -35,11 +41,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "dask_histogram" ]; - meta = with lib; { + meta = { description = "Histograms with task scheduling"; homepage = "https://dask-histogram.readthedocs.io/"; changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${version}"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ veprbl ]; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index 55a528499d449..8c43fc9f260f8 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -1,8 +1,7 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, - pythonAtLeast, fetchFromGitHub, # build-system @@ -20,17 +19,14 @@ buildPythonPackage rec { pname = "dask-jobqueue"; - version = "0.8.5"; + version = "0.9.0"; pyproject = true; - # Python 3.12 support should be added in 0.8.6 - disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; - src = fetchFromGitHub { owner = "dask"; repo = "dask-jobqueue"; rev = "refs/tags/${version}"; - hash = "sha256-NBFfPTNIXezwv7f1P3VRnkBYlOutD30+8rdiBBssHDE="; + hash = "sha256-YujfhjOJzl4xsjjsyrQkEu/CBR04RwJ79c1iSTcMIgw="; }; build-system = [ setuptools ]; @@ -46,46 +42,54 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # Require some unavailable pytest fixtures - "test_adapt" - "test_adaptive" - "test_adaptive_cores_mem" - "test_adaptive_grouped" - "test_adapt_parameters" - "test_basic" - "test_basic_scale_edge_cases" - "test_cluster" - "test_cluster_error_scheduler_arguments_should_use_scheduler_options" - "test_cluster_has_cores_and_memory" - "test_command_template" - "test_complex_cancel_command" - "test_config" - "test_dashboard_link" - "test_default_number_of_worker_processes" - "test_deprecation_env_extra" - "test_deprecation_extra" - "test_deprecation_job_extra" - "test_different_interfaces_on_scheduler_and_workers" - "test_docstring_cluster" - "test_extra_args_broken_cancel" - "test_forward_ip" - "test_import_scheduler_options_from_config" - "test_job" - "test_jobqueue_job_call" - "test_log_directory" - "test_scale_cores_memory" - "test_scale_grouped" - "test_scheduler_options" - "test_scheduler_options_interface" - "test_security" - "test_security_temporary" - "test_security_temporary_defaults" - "test_shebang_settings" - "test_use_stdin" - "test_worker_name_uses_cluster_name" - "test_wrong_parameter_error" - ]; + disabledTests = + [ + # Require some unavailable pytest fixtures + "test_adapt" + "test_adaptive" + "test_adaptive_cores_mem" + "test_adaptive_grouped" + "test_adapt_parameters" + "test_basic" + "test_basic_scale_edge_cases" + "test_cluster" + "test_cluster_error_scheduler_arguments_should_use_scheduler_options" + "test_cluster_has_cores_and_memory" + "test_command_template" + "test_complex_cancel_command" + "test_config" + "test_dashboard_link" + "test_default_number_of_worker_processes" + "test_deprecation_env_extra" + "test_deprecation_extra" + "test_deprecation_job_extra" + "test_different_interfaces_on_scheduler_and_workers" + "test_docstring_cluster" + "test_extra_args_broken_cancel" + "test_forward_ip" + "test_import_scheduler_options_from_config" + "test_job" + "test_jobqueue_job_call" + "test_log_directory" + "test_scale_cores_memory" + "test_scale_grouped" + "test_scheduler_options" + "test_scheduler_options_interface" + "test_security" + "test_security_temporary" + "test_security_temporary_defaults" + "test_shebang_settings" + "test_use_stdin" + "test_worker_name_uses_cluster_name" + "test_wrong_parameter_error" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # ValueError: invalid operation on non-started TCPListener + "test_header" + "test_lsf_unit_detection" + "test_lsf_unit_detection_without_file" + "test_runner" + ]; pythonImportsCheck = [ "dask_jobqueue" ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 0aa358b334afa..e47ced4264ab9 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -34,22 +34,19 @@ pytest-rerunfailures, pytest-xdist, pytestCheckHook, - pythonOlder, }: let self = buildPythonPackage rec { pname = "dask"; - version = "2024.8.1"; + version = "2024.9.1"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-ztB5T8VFc1WoQB7lWQlonAyq7duqft9OE5FYvmjZd48="; + hash = "sha256-lbWV6qgLQ8itJsnz7ojrgfrO12+AwNe1/DJvxBo5A+Q="; }; build-system = [ setuptools ]; @@ -126,14 +123,14 @@ let ]; disabledTests = - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ # Test requires features of python3Packages.psutil that are # blocked in sandboxed-builds "test_auto_blocksize_csv" # AttributeError: 'str' object has no attribute 'decode' "test_read_dir_nometa" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly... "test_foldby_tree_reduction" "test_to_bag" diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 33fd15cded4b1..55f3489a0144f 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy ]; - passthru.optional-dependencies = { + optional-dependencies = { postgresql = [ asyncpg ]; asyncpg = [ asyncpg ]; aiopg = [ aiopg ]; diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix index 39f0f0aa39fa7..2a063482fe17b 100644 --- a/pkgs/development/python-modules/dataclass-wizard/default.nix +++ b/pkgs/development/python-modules/dataclass-wizard/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { timedelta = [ pytimeparse ]; yaml = [ pyyaml ]; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-mock - ] ++ passthru.optional-dependencies.timedelta ++ passthru.optional-dependencies.yaml; + ] ++ optional-dependencies.timedelta ++ optional-dependencies.yaml; disabledTests = [ ] diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 6df2f77721f99..da178007ba92e 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.49.1"; + version = "0.50.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TLenmRr2ytuGj+RQzUVkc+ZfEfxni3189hBE/xxgdNg="; + hash = "sha256-V51NtUvW75GMUlAhftsVuAt7EVgrjiT85DcCdow/Li0="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index 1b968fe500074..96ac76d17530f 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -11,6 +11,8 @@ pyarrow, Security, SystemConfiguration, + typing-extensions, + pythonOlder, }: let @@ -18,22 +20,22 @@ let name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "5bab2f264a23f5af68f69ea93d24ef1e8e77fc88"; - hash = "sha256-Pxx8ohUpXb5u1995IvXmxQMqWiDJ+7LAll/AjQP7ph8="; + rev = "4d209492d514c2d3cb2d392681b9aa00e6d8da1c"; + hash = "sha256-IkiCbuy0bWyClPZ4ZEdkEP7jFYLhM7RCuNLd6Lazd4o="; }; parquet-testing = fetchFromGitHub { name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "e13af117de7c4f0a4d9908ae3827b3ab119868f3"; - hash = "sha256-rVI9zyk9IRDlKv4u8BeMb0HRdWLfCpqOlYCeUdA7BB8="; + rev = "50af3d8ce206990d81014b1862e5ce7380dc3e08"; + hash = "sha256-edyv/r5olkj09aHtm8LHZY0b3jUtLNUcufwI41qKYaY="; }; in buildPythonPackage rec { pname = "datafusion"; - version = "38.0.1"; + version = "40.1.0"; pyproject = true; src = fetchFromGitHub { @@ -41,13 +43,13 @@ buildPythonPackage rec { owner = "apache"; repo = "arrow-datafusion-python"; rev = "refs/tags/${version}"; - hash = "sha256-rBS6i2HqpdhnhZZfO0ywL/e4a+rnUZkHzezKd8PuG80="; + hash = "sha256-5WOSlx4XW9zO6oTY16lWQElShLv0ubflVPfSSEGrFgg="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "datafusion-cargo-deps"; - inherit src pname version; - hash = "sha256-M2ZNAFWdsnN9C4+YbqFxZVH9fHR10Bimf1Xzrd9oy9E="; + inherit src; + hash = "sha256-hN03tbnH77VsMDxSMddMHIH00t7lUs5h8rTHbiMIExw="; }; nativeBuildInputs = with rustPlatform; [ @@ -57,19 +59,23 @@ buildPythonPackage rec { buildInputs = [ protobuf ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security SystemConfiguration ]; - propagatedBuildInputs = [ pyarrow ]; + dependencies = [ + pyarrow + ] ++ lib.optionals (pythonOlder "3.13") [ typing-extensions ]; nativeCheckInputs = [ pytestCheckHook numpy ]; + pythonImportsCheck = [ "datafusion" ]; + pytestFlagsArray = [ "--pyargs" pname diff --git a/pkgs/development/python-modules/datalad-gooey/default.nix b/pkgs/development/python-modules/datalad-gooey/default.nix index a84e6c7a2be7e..fcc3fa3763302 100644 --- a/pkgs/development/python-modules/datalad-gooey/default.nix +++ b/pkgs/development/python-modules/datalad-gooey/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { datalad-next outdated datalad - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppleScriptKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppleScriptKit ]; pythonRemoveDeps = [ "applescript" ]; diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix index b82fa0900fbb4..f988112c533f5 100644 --- a/pkgs/development/python-modules/dataproperty/default.nix +++ b/pkgs/development/python-modules/dataproperty/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { tcolorpy ] ++ typepy.optional-dependencies.datetime; - passthru.optional-dependencies = { + optional-dependencies = { logging = [ loguru ]; }; diff --git a/pkgs/development/python-modules/datasalad/default.nix b/pkgs/development/python-modules/datasalad/default.nix index 66303c1ff0cdb..a9eba3978ae22 100644 --- a/pkgs/development/python-modules/datasalad/default.nix +++ b/pkgs/development/python-modules/datasalad/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "datasalad"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "datalad"; repo = "datasalad"; rev = "refs/tags/v${version}"; - hash = "sha256-qgHWTokNBzJcBbEPCA/YfklzqyX1lM2yro7ElqBfrig="; + hash = "sha256-WkU3MqAveeANrRGLj1A4UGlT5Sel5wxNcYbIeKlPIqE="; }; build-system = [ diff --git a/pkgs/development/python-modules/datashaper/default.nix b/pkgs/development/python-modules/datashaper/default.nix index 1da7346f26693..3ad28d2228ed3 100644 --- a/pkgs/development/python-modules/datashaper/default.nix +++ b/pkgs/development/python-modules/datashaper/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pythonOlder, - pythonRelaxDepsHook, poetry-core, dacite, diskcache, @@ -26,8 +25,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "pyarrow" ]; dependencies = [ diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 6a7c80ada33e7..1608ec12e8f21 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; LLVM = llvm; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; # test suite is very cpu intensive, only run small subset to ensure package is working as expected pytestFlagsArray = [ "tests/test-sets.py" ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 3f1fec78aeb30..e87f6d2a72c66 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { calendars = [ hijri-converter convertdate @@ -60,7 +60,7 @@ buildPythonPackage rec { parsel requests ruamel-yaml - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export HOME="$TEMPDIR" diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix index e73892f1f998f..3c1c982b74a5b 100644 --- a/pkgs/development/python-modules/dazl/default.nix +++ b/pkgs/development/python-modules/dazl/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "dazl"; - version = "7.11.0"; + version = "7.12.0"; src = fetchPypi { inherit pname version; - hash = "sha256-IErym/Fd8G75NOa+xOyV87UNmEaB31XPvg8GWCSP7k8="; + hash = "sha256-fbemLaOh1PHBvQAmMy06JWgnOqdy/kLByAZh4U8ghxc="; }; patches = [ diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix index 776725659d691..50a775edfa4e9 100644 --- a/pkgs/development/python-modules/dbt-adapters/default.nix +++ b/pkgs/development/python-modules/dbt-adapters/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "dbt-adapters"; - version = "1.3.3"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-M7n+WcHGBMNZ5k9GZRR05g8KzPDWjmB83iZSD16G774="; + hash = "sha256-I3A3rIMpT+MAq+ebid9RMr6I3W1l4ir78UmfeEr5U3U="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index bf9a93abafab6..0bb43248db080 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -1,34 +1,37 @@ { lib, - buildPythonPackage, - fetchFromGitHub, - hatchling, agate, + buildPythonPackage, colorama, + deepdiff, + fetchPypi, + hatchling, isodate, jinja2, jsonschema, mashumaro, pathspec, protobuf, - python-dateutil, - requests, - typing-extensions, pytest-mock, pytest-xdist, pytestCheckHook, + python-dateutil, + pythonOlder, + requests, + typing-extensions, }: buildPythonPackage rec { pname = "dbt-common"; - version = "1.3.0"; + version = "1.8.0"; pyproject = true; - src = fetchFromGitHub { - owner = "dbt-labs"; - repo = "dbt-common"; - rev = "refs/tags/v${version}"; - hash = "sha256-3UjwQy257ks21fQV0uZNKu5EsuzjlIAEcVtRWkR9x/4="; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "dbt_common"; + inherit version; + hash = "sha256-ehZ+a3zznnWMY9NJx9LfRtkV1vHiIH0HEhsYWfMbmb4="; }; build-system = [ hatchling ]; @@ -38,6 +41,7 @@ buildPythonPackage rec { dependencies = [ agate colorama + deepdiff isodate jinja2 jsonschema @@ -49,7 +53,8 @@ buildPythonPackage rec { typing-extensions ] ++ mashumaro.optional-dependencies.msgpack; - pythonImportsCheck = [ "dbt_common" ]; + # Upstream stopped to tag the source fo rnow + doCheck = false; nativeCheckInputs = [ pytest-mock @@ -57,10 +62,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "dbt_common" ]; + meta = { description = "Shared common utilities for dbt-core and adapter implementations use"; homepage = "https://github.com/dbt-labs/dbt-common"; - changelog = "https://github.com/dbt-labs/dbt-common/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/dbt-labs/dbt-common/blob/${version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 20d45f74723c9..4388c972c4d62 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -17,7 +17,7 @@ packaging, pathspec, protobuf, - python, + callPackage, pythonOlder, pytz, pyyaml, @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.8.6"; + version = "1.8.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-Zd1qPTfJgoGpkrMSt0K1jAdYAxICdru9vIXXqbmZryo="; + hash = "sha256-1NvdRAr8T2dDgtyj5tUIqhjHIu4sZYS+oj7hOMEqs0A="; }; sourceRoot = "${src.name}/core"; @@ -85,7 +85,7 @@ buildPythonPackage rec { doCheck = false; passthru = { - withAdapters = python.pkgs.callPackage ./with-adapters.nix { }; + withAdapters = callPackage ./with-adapters.nix { }; }; meta = with lib; { diff --git a/pkgs/development/python-modules/dbt-extractor/default.nix b/pkgs/development/python-modules/dbt-extractor/default.nix index 2e3eecc5dfcdd..89066e5c9c506 100644 --- a/pkgs/development/python-modules/dbt-extractor/default.nix +++ b/pkgs/development/python-modules/dbt-extractor/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # no python tests exist doCheck = false; diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index f018af1bce0cb..552207472c4dd 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -3,27 +3,29 @@ async-timeout, buildPythonPackage, cython, + dbus, fetchFromGitHub, poetry-core, + pytest, pytest-asyncio, - pytestCheckHook, + pytest-cov-stub, + python, pythonOlder, setuptools, - wheel, }: buildPythonPackage rec { pname = "dbus-fast"; - version = "2.22.1"; + version = "2.24.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "dbus-fast"; rev = "refs/tags/v${version}"; - hash = "sha256-WT32nkRcS+JFCJCZNXXFm38nzttYLsqU98tJD7YBn9w="; + hash = "sha256-8M2SRyAkuxNbwT5NRN6cwJ82OtprfBZXi9Yqwh1NLVY="; }; # The project can build both an optimized cython version and an unoptimized @@ -34,21 +36,17 @@ buildPythonPackage rec { cython poetry-core setuptools - wheel ]; dependencies = [ async-timeout ]; nativeCheckInputs = [ + dbus + pytest pytest-asyncio - pytestCheckHook + pytest-cov-stub ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=dbus_fast --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "dbus_fast" "dbus_fast.aio" @@ -56,52 +54,21 @@ buildPythonPackage rec { "dbus_fast.message" ]; - disabledTests = [ - # Test require a running Dbus instance - "test_aio_big_message" - "test_aio_properties" - "test_aio_proxy_object" - "test_bus_disconnect_before_reply" - "test_error_handling" - "test_export_alias" - "test_export_introspection" - "test_export_unexport" - "test_fast_disconnect" - "test_glib_big_message" - "test_high_level_service_fd_passing" - "test_interface_add_remove_signal" - "test_introspectable_interface" - "test_methods" - "test_multiple_flags_in_message" - "test_name_requests" - "test_object_manager" - "test_peer_interface" - "test_property_changed_signal" - "test_property_changed_signal" - "test_property_methods" - "test_sending_file_descriptor_low_level" - "test_sending_file_descriptor_with_proxy" - "test_sending_messages_between_buses" - "test_sending_signals_between_buses" - "test_signals" - "test_standard_interface_properties" - "test_standard_interfaces" - "test_tcp_connection_with_forwarding" - "test_unexpected_disconnect" - # NameError: name '_cast_uint32_native' is not defined - "test_unmarshall_bluez_interfaces_added_message" - "test_unmarshall_bluez_interfaces_removed_message" - "test_unmarshall_bluez_message" - "test_unmarshall_bluez_properties_changed_with_service_data" - "test_unmarshall_can_resume" - "test_unmarshalling_with_table" - "test_ay_buffer" - ]; + checkPhase = '' + runHook preCheck + + # test_peer_interface times out + dbus-run-session \ + --config-file=${dbus}/share/dbus-1/session.conf \ + ${python.interpreter} -m pytest -k "not test_peer_interface" + + runHook postCheck + ''; meta = with lib; { description = "Faster version of dbus-next"; homepage = "https://github.com/bluetooth-devices/dbus-fast"; - changelog = "https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v${version}"; + changelog = "https://github.com/Bluetooth-Devices/dbus-fast/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index bbbabdc08375e..117fa8c089481 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -37,9 +37,11 @@ buildPythonPackage rec { # test_tcp_connection_with_forwarding fails due to dbus # creating unix socket anyway on v1.14.4 checkPhase = '' + runHook preCheck dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \ ${python.interpreter} -m pytest -sv --cov=dbus_next \ -k "not test_peer_interface and not test_tcp_connection_with_forwarding" + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/debuglater/default.nix b/pkgs/development/python-modules/debuglater/default.nix index 503dc862497b6..fcb0b4f1f9451 100644 --- a/pkgs/development/python-modules/debuglater/default.nix +++ b/pkgs/development/python-modules/debuglater/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorama ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ dill ]; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { numpy pandas pytestCheckHook - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; pythonImportsCheck = [ "debuglater" ]; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 18e9acec9b57a..4bf451d834beb 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.8.5"; + version = "1.8.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; rev = "refs/tags/v${version}"; - hash = "sha256-SmSYhmLnVpBPEPO2o40wIv+e3cBbmZXSz+IKMRcnScw="; + hash = "sha256-kkFNIJ3QwojwgiRAOmBiWIg5desxOKTmo9YH1Qup6fI="; }; patches = @@ -58,14 +58,14 @@ buildPythonPackage rec { # - https://github.com/NixOS/nixpkgs/issues/251045 ./skip-attach-pid-tests.patch ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # Hard code GDB path (used to attach to process) (substituteAll { src = ./hardcode-gdb.patch; inherit gdb; }) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Hard code LLDB path (used to attach to process) (substituteAll { src = ./hardcode-lldb.patch; @@ -119,12 +119,12 @@ buildPythonPackage rec { export DEBUGPY_PROCESS_SPAWN_TIMEOUT=0 export DEBUGPY_PROCESS_EXIT_TIMEOUT=0 '' - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; ''; - postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + postCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' unset no_proxy ''; diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index 5cc68b21b3c63..d977f78771f5b 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -1,13 +1,13 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 85f3353b..56fab577 100644 +index a1a852a0..0bb91807 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -@@ -410,7 +410,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show +@@ -412,7 +412,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ -- 'gdb', +- "gdb", + '@gdb@/bin/gdb', - '--nw', # no gui interface - '--nh', # no ~/.gdbinit - '--nx', # no .gdbinit + "--nw", # no gui interface + "--nh", # no ~/.gdbinit + "--nx", # no .gdbinit diff --git a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch index 215e7ee0f9cad..5edbe35456959 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch @@ -1,13 +1,13 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 56fab577..989ede03 100644 +index 0bb91807..8026a5ad 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -@@ -500,7 +500,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d +@@ -503,7 +503,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ -- 'lldb', +- "lldb", + '@lldb@/bin/lldb', - '--no-lldbinit', # Do not automatically parse any '.lldbinit' files. + "--no-lldbinit", # Do not automatically parse any '.lldbinit' files. # '--attach-pid', # str(pid), diff --git a/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch b/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch index a993940f72667..cef0a97eb3004 100644 --- a/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch +++ b/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch @@ -12,7 +12,7 @@ index dc60d0ae..cf4a06a3 100644 log.info("Attaching {0} to {1} by PID.", session, target) diff --git a/tests/debugpy/test_attach.py b/tests/debugpy/test_attach.py -index afabc1ac..2fff3982 100644 +index 017d7f59..63e86328 100644 --- a/tests/debugpy/test_attach.py +++ b/tests/debugpy/test_attach.py @@ -151,8 +151,7 @@ def test_reattach(pyfile, target, run): diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 64b3f1db8ba48..59564f4eefc58 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -7,21 +7,21 @@ defusedxml, docker, fetchFromGitHub, + hatch-vcs, + hatchling, numpy, pillow, pycountry, pytest-asyncio, pytestCheckHook, pythonOlder, - setuptools, - setuptools-scm, svg-py, testfixtures, }: buildPythonPackage rec { pname = "deebot-client"; - version = "8.3.0"; + version = "8.4.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,15 +30,18 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-a6gFy+w+5FEs4YwS2Pfcyiv0grLcSzFpxxbcZ0AYIL4="; + hash = "sha256-VWXJykG9XSrpTjnv5radUAp/OMCH2YVlmkT6L8S+wyI="; }; - build-system = [ - setuptools - setuptools-scm + pythonRelaxDeps = [ + "aiohttp" + "defusedxml" ]; - pythonRelaxDeps = [ "aiohttp" ]; + build-system = [ + hatch-vcs + hatchling + ]; dependencies = [ aiohttp diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index af4500ffd5806..ff583a572018f 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { orjson ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ clevercsv click @@ -56,7 +56,7 @@ buildPythonPackage rec { pytestCheckHook python-dateutil tomli-w - ] ++ passthru.optional-dependencies.cli; + ] ++ optional-dependencies.cli; disabledTests = [ # not compatible with pydantic 2.x diff --git a/pkgs/development/python-modules/deepl/default.nix b/pkgs/development/python-modules/deepl/default.nix index aaa294f39ecbf..1dd175a10d556 100644 --- a/pkgs/development/python-modules/deepl/default.nix +++ b/pkgs/development/python-modules/deepl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "deepl"; - version = "1.18.0"; + version = "1.19.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-WuQXY5OUQe28p2QP00QoDL7kfUkGQc41IGkQqLAed44="; + hash = "sha256-ufsikWgcQsc/ex/LP5P5fVN3IvfAD9ZOPatwGM+bsqY="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 309b02d14fa1b..4e2c4d9b75e20 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "defcon" ]; - passthru.optional-dependencies = { + optional-dependencies = { pens = [ fontpens ]; lxml = [ fonttools ] ++ fonttools.optional-dependencies.lxml; }; diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix index a30d199a22872..e4065fa10b971 100644 --- a/pkgs/development/python-modules/deltalake/default.nix +++ b/pkgs/development/python-modules/deltalake/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration libiconv diff --git a/pkgs/development/python-modules/demesdraw/default.nix b/pkgs/development/python-modules/demesdraw/default.nix index d4fe828315d38..6a3c4d44e99a6 100644 --- a/pkgs/development/python-modules/demesdraw/default.nix +++ b/pkgs/development/python-modules/demesdraw/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. - env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/demoji/default.nix b/pkgs/development/python-modules/demoji/default.nix index 4538f6c9c8be5..b63b2c12a1c08 100644 --- a/pkgs/development/python-modules/demoji/default.nix +++ b/pkgs/development/python-modules/demoji/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { ujson = [ ujson ]; }; diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix index f17acbdc4b95d..8cc15b7210c71 100644 --- a/pkgs/development/python-modules/dendropy/default.nix +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -1,45 +1,54 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pythonOlder, + nix-update-script, + setuptools, + paup, + paupIntegration ? false, }: +let + paupPath = if paupIntegration then lib.getExe paup else "NONE"; +in buildPythonPackage rec { pname = "dendropy"; - version = "4.5.1"; - format = "setuptools"; + version = "5.0.2"; - disabled = pythonOlder "3.7"; + pyproject = true; + build-system = [ setuptools ]; src = fetchFromGitHub { owner = "jeetsukumaran"; - repo = pname; - rev = "v${version}"; - hash = "sha256-FP0+fJkkFtSysPxoHXjyMgF8pPin7aRyzmHe9bH8LlM="; + repo = "dendropy"; + rev = "refs/tags/v${version}"; + hash = "sha256-OiFei/6226FDtL4w1XrXL2OVn3/hfQwnIhTzM4OneKc="; }; - nativeCheckInputs = [ pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.py \ + --replace '["pytest-runner"],' '[],' + + substituteInPlace src/dendropy/interop/paup.py \ + --replace 'PAUP_PATH = os.environ.get(metavar.DENDROPY_PAUP_PATH_ENVAR, "paup")' 'PAUP_PATH = os.environ.get(metavar.DENDROPY_PAUP_PATH_ENVAR, "${paupPath}")' + ''; - disabledTests = [ - # FileNotFoundError: [Errno 2] No such file or directory: 'paup' - "test_basic_split_count_with_incorrect_rootings_raises_error" - "test_basic_split_count_with_incorrect_weight_treatment_raises_error" - "test_basic_split_counting_under_different_rootings" - "test_group1" - # AssertionError: 6 != 5 - "test_by_num_lineages" - # AttributeError: module 'collections' has no attribute 'Iterable' - "test_findall_multiple" - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "dendropy" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Python library for phylogenetic computing"; - homepage = "https://dendropy.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ unode ]; + homepage = "https://jeetsukumaran.github.io/DendroPy/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + unode + pandapip1 + ]; }; } diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 5f113865c388b..771e615eca467 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.11.6"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,14 +28,14 @@ buildPythonPackage rec { owner = "ol-iver"; repo = "denonavr"; rev = "refs/tags/${version}"; - hash = "sha256-VxoRK1qeGrIunsiCzeZJUHxW/sxk+PFpntInL+G/yI8="; + hash = "sha256-/K2pz3B4H205grDeuMWZmEeA4wJqKhP0XdpmbqFguTM="; }; pythonRelaxDeps = [ "defusedxml" ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ asyncstdlib attrs defusedxml @@ -57,7 +57,7 @@ buildPythonPackage rec { description = "Automation Library for Denon AVR receivers"; homepage = "https://github.com/ol-iver/denonavr"; changelog = "https://github.com/ol-iver/denonavr/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ colemickens ]; }; } diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix index d68c1c457bc48..ac79804624650 100644 --- a/pkgs/development/python-modules/dep-logic/default.nix +++ b/pkgs/development/python-modules/dep-logic/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dep-logic"; - version = "0.4.4"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pdm-project"; repo = "dep-logic"; rev = "refs/tags/${version}"; - hash = "sha256-7w5yN+3/u7mcGwBZAgTc/HHpZGyVZzSTWktmmcVSqpA="; + hash = "sha256-5PEHkxwIgDz3Qs993qI4eaQZ5Him4i/MAnUam820AWc="; }; nativeBuildInputs = [ pdm-backend ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dep_logic" ]; meta = { - changelog = "https://github.com/pdm-project/dep-logic/releases/tag/${src.rev}"; + changelog = "https://github.com/pdm-project/dep-logic/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; description = "Python dependency specifications supporting logical operations"; homepage = "https://github.com/pdm-project/dep-logic"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index be655a971dd49..5980eaff54db3 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; pydantic = [ pydantic ]; flask = [ flask ]; @@ -50,10 +50,10 @@ buildPythonPackage rec { pytestCheckHook scipy ] - ++ passthru.optional-dependencies.aiohttp - ++ passthru.optional-dependencies.pydantic - ++ passthru.optional-dependencies.yaml - ++ passthru.optional-dependencies.flask; + ++ optional-dependencies.aiohttp + ++ optional-dependencies.pydantic + ++ optional-dependencies.yaml + ++ optional-dependencies.flask; pythonImportsCheck = [ "dependency_injector" ]; diff --git a/pkgs/development/python-modules/deploykit/default.nix b/pkgs/development/python-modules/deploykit/default.nix index 01183b27a8d7d..e2882a7fa7f54 100644 --- a/pkgs/development/python-modules/deploykit/default.nix +++ b/pkgs/development/python-modules/deploykit/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_ssh" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_ssh" ]; # don't swallow stdout/stderr pytestFlagsArray = [ "-s" ]; diff --git a/pkgs/development/python-modules/deprecation-alias/default.nix b/pkgs/development/python-modules/deprecation-alias/default.nix new file mode 100644 index 0000000000000..0d97bb0b44139 --- /dev/null +++ b/pkgs/development/python-modules/deprecation-alias/default.nix @@ -0,0 +1,37 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + setuptools, + deprecation, + packaging, +}: +buildPythonPackage rec { + pname = "deprecation-alias"; + version = "0.3.3"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-5zJm1MhmwEAHnXoEf5KsLNRotGCAMkht8f/X7xR+ZRU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + deprecation + packaging + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' + ''; + + meta = { + description = "A wrapper around ‘deprecation’ providing support for deprecated aliases."; + homepage = "https://github.com/domdfcoding/deprecation-alias"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyberius-prime ]; + }; +} diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index fd502d99eef90..30c5275edbf95 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -4,31 +4,35 @@ fetchFromGitHub, pythonOlder, stdenv, + bidict, packaging, setuptools, - dbus-next, + dbus-fast, rubicon-objc, }: buildPythonPackage rec { pname = "desktop-notifier"; - version = "5.0.1"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; - repo = pname; + repo = "desktop-notifier"; rev = "refs/tags/v${version}"; - hash = "sha256-A+25T0xgUcE1NaOKNZgeP80VlEmqa137YGn3g/pwpxM="; + hash = "sha256-HynREkiPxv/1y1/ICVwqANIe9tAkIvdpDy4oXxQarec="; }; build-system = [ setuptools ]; dependencies = - [ packaging ] - ++ lib.optionals stdenv.isLinux [ dbus-next ] + [ + bidict + packaging + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus-fast ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ]; # no tests available, do the imports check instead diff --git a/pkgs/development/python-modules/detectron2/default.nix b/pkgs/development/python-modules/detectron2/default.nix index 2247b4581a4d2..42b8f0a6f43c2 100644 --- a/pkgs/development/python-modules/detectron2/default.nix +++ b/pkgs/development/python-modules/detectron2/default.nix @@ -99,7 +99,7 @@ buildPythonPackage { pydot # no idea why this is not in their setup.py ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; nativeCheckInputs = [ av @@ -163,7 +163,7 @@ buildPythonPackage { "test_overlay_instances_no_boxes" "test_get_bounding_box" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ "test_build_batch_dataloader_inference" "test_build_dataloader_inference" "test_build_iterable_dataloader_inference" diff --git a/pkgs/development/python-modules/devgoldyutils/default.nix b/pkgs/development/python-modules/devgoldyutils/default.nix index fb70dba6d40c3..db7b236e19eed 100644 --- a/pkgs/development/python-modules/devgoldyutils/default.nix +++ b/pkgs/development/python-modules/devgoldyutils/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Collection of utility functions for Python used by mov-cli"; homepage = "https://github.com/THEGOLDENPRO/devgoldyutils"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ roshaen ]; + maintainers = with lib.maintainers; [ youhaveme9 ]; }; } diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 95ec86ff5eb36..47340bd1325cb 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -100,18 +100,18 @@ buildPythonPackage rec { "test_subdomainset_mpi" "test_subdomains_mpi" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False "test_v0" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # FAILED tests/test_caching.py::TestCaching::test_special_symbols - ValueError: not enough values to unpack (expected 3, got 2) "test_special_symbols" # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - codepy.CompileError: module compilation failed "test_v0" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Numerical tests "test_lm_fb" "test_lm_ds" @@ -127,7 +127,9 @@ buildPythonPackage rec { "tests/test_dse.py" "tests/test_gradient.py" ] - ++ lib.optionals ((stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin) [ "tests/test_dle.py" ]; + ++ lib.optionals ( + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin + ) [ "tests/test_dle.py" ]; pythonImportsCheck = [ "devito" ]; diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index e83e9d88d7241..218db0fe558d0 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -2,13 +2,14 @@ lib, buildPythonPackage, fetchPypi, + lazy, + packaging-legacy, + pytestCheckHook, pythonOlder, - setuptools, - setuptools-changelog-shortener, requests, + setuptools-changelog-shortener, + setuptools, tomli, - pytestCheckHook, - lazy, }: buildPythonPackage rec { @@ -24,14 +25,15 @@ buildPythonPackage rec { hash = "sha256-I1oKmkXJblTGC6a6L3fYVs+Q8aacG+6UmIfp7cA6Qcw="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-changelog-shortener ]; - propagatedBuildInputs = [ - requests + dependencies = [ lazy + packaging-legacy + requests tomli ]; diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 814f5f40de036..9a15282ef9385 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "9.1.1"; + version = "9.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-te0glVs+ve6UR25CnP2fEyThwZoExKrjKok7EcNnPx4="; + hash = "sha256-haCzU+u7Z4+eh+owP3W1Rb0LrKOPVjIZu3LyroYrujY="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/diffenator2/default.nix b/pkgs/development/python-modules/diffenator2/default.nix new file mode 100644 index 0000000000000..e5297364fc183 --- /dev/null +++ b/pkgs/development/python-modules/diffenator2/default.nix @@ -0,0 +1,95 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonRelaxDepsHook, + pytestCheckHook, + poetry-core, + poetry-dynamic-versioning, + blackrenderer, + fonttools, + freetype-py, + gflanguages, + glyphsets, + jinja2, + ninja, + pillow, + protobuf, + pyahocorasick, + python-bidi, + selenium, + tqdm, + uharfbuzz, + unicodedata2, + youseedee, + numpy, +}: + +buildPythonPackage rec { + pname = "diffenator2"; + version = "0.4.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "diffenator2"; + rev = "refs/tags/v${version}"; + hash = "sha256-zeNcNR14ieY6Inp4kOwIPXd6S+/wFdMFp6wbiqgB/iA="; + }; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "protobuf" ]; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + blackrenderer + fonttools + freetype-py + gflanguages + glyphsets + jinja2 + ninja + pillow + protobuf + pyahocorasick + python-bidi + selenium + tqdm + uharfbuzz + unicodedata2 + youseedee + numpy + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + # requires internet + "test_download_google_fonts_family_to_file" + "test_download_google_fonts_family_to_bytes" + "test_download_google_fonts_family_not_existing" + "test_download_latest_github_release" + ]; + + disabledTestPaths = [ + # Want the files downloaded by the tests above + "tests/test_functional.py" + "tests/test_html.py" + "tests/test_matcher.py" + "tests/test_font.py" + ]; + + meta = { + description = "Font comparison tool that will not stop until your fonts are exhaustively compared"; + homepage = "https://github.com/googlefonts/diffenator2"; + changelog = "https://github.com/googlefonts/diffenator2/releases/tag/v${version}"; + license = lib.licenses.asl20; + mainProgram = "diffenator2"; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index 031cd52a6f0d5..e7e736927ea0b 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { safetensors ]; - passthru.optional-dependencies = { + optional-dependencies = { flax = [ flax jax @@ -102,7 +102,7 @@ buildPythonPackage rec { sentencepiece torchsde transformers - ] ++ passthru.optional-dependencies.torch; + ] ++ optional-dependencies.torch; preCheck = let @@ -153,7 +153,7 @@ buildPythonPackage rec { description = "State-of-the-art diffusion models for image and audio generation in PyTorch"; mainProgram = "diffusers-cli"; homepage = "https://github.com/huggingface/diffusers"; - changelog = "https://github.com/huggingface/diffusers/releases/tag/${src.rev}"; + changelog = "https://github.com/huggingface/diffusers/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix index 9fa09e0df0704..03566cf27dc11 100644 --- a/pkgs/development/python-modules/diofant/default.nix +++ b/pkgs/development/python-modules/diofant/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mpmath ]; - passthru.optional-dependencies = { + optional-dependencies = { exports = [ cython numpy diff --git a/pkgs/development/python-modules/dirigera/default.nix b/pkgs/development/python-modules/dirigera/default.nix index ddff1bfcb7a08..7bb2a1150aef8 100644 --- a/pkgs/development/python-modules/dirigera/default.nix +++ b/pkgs/development/python-modules/dirigera/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dirigera"; - version = "1.1.8"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Leggin"; repo = "dirigera"; rev = "refs/tags/v${version}"; - hash = "sha256-hJE3K3h6hyjeHVrE1Sj/S9eRD4JEGIhq4BWkScy1AEk="; + hash = "sha256-JmrKeHypWhqOWO0LpzNe1qyeXuYnMyZoM+2IQbz6WDU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 023b14113622b..73d8cdc7abd4e 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -6,62 +6,56 @@ fetchFromGitHub, libopus, pynacl, - pythonOlder, withVoice ? true, ffmpeg, + setuptools, }: -buildPythonPackage rec { +let pname = "discord.py"; version = "2.4.0"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; src = fetchFromGitHub { owner = "Rapptz"; - repo = pname; + repo = "discord.py"; rev = "refs/tags/v${version}"; hash = "sha256-GIwXx7bRCH2+G3zlilJ/Tb8el50SDbxGGX2/1bqL3+U="; }; - propagatedBuildInputs = - [ aiohttp ] - ++ lib.optionals withVoice [ - libopus - pynacl - ffmpeg - ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ] ++ lib.optionals withVoice [ pynacl ]; + + patchPhase = lib.optionalString withVoice '' + substituteInPlace "discord/opus.py" \ + --replace-fail "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}'" - patchPhase = - '' - substituteInPlace "discord/opus.py" \ - --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}'" - '' - + lib.optionalString withVoice '' - substituteInPlace "discord/player.py" \ - --replace "executable='ffmpeg'" "executable='${ffmpeg}/bin/ffmpeg'" - ''; + substituteInPlace "discord/player.py" \ + --replace-fail "executable: str = 'ffmpeg'" "executable: str = '${lib.getExe ffmpeg}'" + ''; # Only have integration tests with discord doCheck = false; pythonImportsCheck = [ "discord" - "discord.file" - "discord.member" - "discord.user" - "discord.state" - "discord.guild" + "discord.types" + "discord.ui" "discord.webhook" - "discord.ext.commands.bot" + "discord.app_commands" + "discord.ext.commands" + "discord.ext.tasks" ]; - meta = with lib; { + meta = { description = "Python wrapper for the Discord API"; homepage = "https://discordpy.rtfd.org/"; changelog = "https://github.com/Rapptz/discord.py/blob/v${version}/docs/whats_new.rst"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getpsyched ]; }; } diff --git a/pkgs/development/python-modules/discum/default.nix b/pkgs/development/python-modules/discum/default.nix index acc3a6e49a031..50254162ff06c 100644 --- a/pkgs/development/python-modules/discum/default.nix +++ b/pkgs/development/python-modules/discum/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, setuptools, - pythonRelaxDepsHook, brotli, colorama, filetype, @@ -28,8 +27,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - dependencies = [ brotli colorama @@ -40,7 +37,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { ra = [ pycryptodome pypng diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index c2a18535a7634..8211267f2eb09 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; # Darwin sandbox causes most tests to fail - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # Very time sensitive, can fail on over subscribed machines diff --git a/pkgs/development/python-modules/dissect-btrfs/default.nix b/pkgs/development/python-modules/dissect-btrfs/default.nix index ef7f8fdd9f4ac..e854feb88a2ff 100644 --- a/pkgs/development/python-modules/dissect-btrfs/default.nix +++ b/pkgs/development/python-modules/dissect-btrfs/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { dissect-util ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ python-lzo zstandard diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 3924f0c5164b4..0795b7aaee8e6 100644 --- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { lark ]; - passthru.optional-dependencies = { + optional-dependencies = { c2 = [ flow-record httpx @@ -68,7 +68,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-httpserver pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "dissect.cobaltstrike" ]; @@ -78,5 +78,8 @@ buildPythonPackage rec { changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; + # Compatibility with dissect.struct 4.x + # https://github.com/fox-it/dissect.cobaltstrike/issues/53 + broken = versionAtLeast dissect-cstruct.version "4"; }; } diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index e4d8f0037e5d9..05127c50e84dd 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "4.0"; + version = "4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-iQbHt8qhplwR/CHaDOWr/pDCZ+lPbrWDJKr3989DLDA="; + hash = "sha256-8CEvn2TJTXm0t4GBG9OQo9TgSy1+sTZIusaiiGNu05M="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 6ea8e4bc82783..4a1cb39782d36 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.14"; + version = "3.15"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-27GfO1HEy9EWdWuPkznOjju6Xy3W2kjKDP0gF3NqYs0="; + hash = "sha256-bSDO8MMkDbyJ8ylB5PXmVHnzp/4UYQ4NKhOTXONVBzc="; }; build-system = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { dissect-util ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ pycryptodome rich diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index 6e79803b03bfd..772df769ae392 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -12,8 +12,8 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.11"; - format = "pyproject"; + version = "3.12"; + pyproject = true; disabled = pythonOlder "3.11"; @@ -21,15 +21,15 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ntfs"; rev = "refs/tags/${version}"; - hash = "sha256-rwn7nKfEmv92JdSMhKztMWptvggzlWhGA0gg5C0EbFM="; + hash = "sha256-zRAZqziVS4I7FDa7E4j67ekl9FXt0X+0oUpwmpNeI+I="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 8718b156a42b2..e8fbec0f8b133 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-shellitem"; - version = "3.9"; + version = "3.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.shellitem"; rev = "refs/tags/${version}"; - hash = "sha256-bkh8eiq07cspRQfs1amiyDuFmoXSBwG/fS/6nn9KV/Y="; + hash = "sha256-BS+c9QbMMsaoZHyuv6jMxbQFQNJeLt3da8Fq/wwXesQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix index b932c18daad2a..a85b51abcf19d 100644 --- a/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dissect-squashfs"; - version = "1.6"; + version = "1.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.squashfs"; rev = "refs/tags/${version}"; - hash = "sha256-XTVGhTnDtuYTAjEeliwYDjuKfP7ljHIxaQAsQI1x5lk="; + hash = "sha256-ZRMCh/ycF594pADnX01S9oVxuY/cnJa4LLXP4ARoDs0="; }; build-system = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { dissect-util ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ lz4 python-lzo diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index d2c632a1f564e..409f8444c33d5 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { structlog ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ asn1crypto dissect-btrfs @@ -102,12 +102,12 @@ buildPythonPackage rec { yara-python zstandard ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - yara = [ yara-python ] ++ passthru.optional-dependencies.full; - smb = [ impacket ] ++ passthru.optional-dependencies.full; - mqtt = [ paho-mqtt ] ++ passthru.optional-dependencies.full; + yara = [ yara-python ] ++ optional-dependencies.full; + smb = [ impacket ] ++ optional-dependencies.full; + mqtt = [ paho-mqtt ] ++ optional-dependencies.full; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; pythonImportsCheck = [ "dissect.target" ]; diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index b14ad477132ec..3873a87d53099 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.15"; + version = "3.16.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-9LRF5WBaxCaj2MEa2q90294seAU+89p5t5JBVa3vb5w="; + hash = "sha256-OpTznjOVV3hyreJv4WCHwP09ULMTz+vjjcmBtYL685E="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/dist-meta/default.nix b/pkgs/development/python-modules/dist-meta/default.nix new file mode 100644 index 0000000000000..a6d6119429c59 --- /dev/null +++ b/pkgs/development/python-modules/dist-meta/default.nix @@ -0,0 +1,39 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + setuptools, + domdf-python-tools, + handy-archives, + packaging, +}: +buildPythonPackage rec { + pname = "dist-meta"; + version = "0.8.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-5zuHOwg2GDXiVZLU10Ep8DU7ykRR3RK/oQqvFK9GguQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + domdf-python-tools + handy-archives + packaging + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' + ''; + + meta = { + description = "Parse and create Python distribution metadata."; + homepage = "https://github.com/repo-helper/dist-meta"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyberius-prime ]; + }; +} diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 1d5c939de4144..063d30ca405fd 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -1,40 +1,41 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + versioneer, + + # dependencies click, cloudpickle, dask, - fetchFromGitHub, jinja2, locket, msgpack, packaging, psutil, - pythonOlder, pyyaml, - setuptools, - setuptools-scm, sortedcontainers, tblib, toolz, tornado, urllib3, - versioneer, zict, }: buildPythonPackage rec { pname = "distributed"; - version = "2024.8.1"; + version = "2024.9.1"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-LKf0z/xGvMVjoG02G2doS/XOiDN2/PmR72rCmwaQqtM="; + hash = "sha256-UDfa59o+3RVN3QppoUamScdcH8XGOB+KAxArI5w7x6M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 1f0ac3747c878..9dddc459a3cc3 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -40,13 +40,13 @@ buildPythonPackage rec { dependencies = [ djangorestframework ]; - passthru.optional-dependencies.with_social = [ django-allauth ]; + optional-dependencies.with_social = [ django-allauth ]; nativeCheckInputs = [ djangorestframework-simplejwt responses unittest-xml-reporting - ] ++ passthru.optional-dependencies.with_social; + ] ++ optional-dependencies.with_social; preCheck = '' # Test connects to graph.facebook.com diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix index 29d9e7b82689c..1fb7a4c825a74 100644 --- a/pkgs/development/python-modules/django-admin-sortable2/default.nix +++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-admin-sortable2"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jrief"; repo = "django-admin-sortable2"; rev = "refs/tags/${version}"; - hash = "sha256-BgydzSrbEMC6fE3W9TqjedBYtxMhK/bsYexNTXnJfUo="; + hash = "sha256-ZXaLe6H6il27DXMwclKR4iRGyus6zyYt3rNWRsLPHSU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index fb7eb5ffac844..4b75865cf326f 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { preBuild = "${python.interpreter} -m django compilemessages"; - passthru.optional-dependencies = { + optional-dependencies = { saml = [ python3-saml ]; mfa = [ qrcode ]; }; @@ -71,7 +71,7 @@ buildPythonPackage rec { pillow pytestCheckHook pytest-django - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index ca5f881f3a3a1..2c69453d79598 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "11.1"; + version = "12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "anymail"; repo = "django-anymail"; rev = "refs/tags/v${version}"; - hash = "sha256-gJrGrezaRY0htS+ouNj1sOBR7jMYvQC1oqn/smzExtc="; + hash = "sha256-TuEEwxwgZVv97Ns4sRWdQjaNymE03nj8CTiU9S6ynZ8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix index 2715638ed9594..4c9712305ea0c 100644 --- a/pkgs/development/python-modules/django-appconf/default.nix +++ b/pkgs/development/python-modules/django-appconf/default.nix @@ -1,27 +1,30 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pythonOlder, django, + fetchFromGitHub, python, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-appconf"; - version = "1.0.5"; - format = "setuptools"; + version = "1.0.6"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "django-compressor"; repo = "django-appconf"; - rev = "v${version}"; - hash = "sha256-nS4Hwp/NYg1XGvZO1tiE9mzJA7WFifyvgAjyp3YpqS4="; + rev = "refs/tags/v${version}"; + hash = "sha256-H9MwX5LtHkYN6TshP7rRKlX/iOJZHbQVsZeki95yks4="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; preCheck = '' # prove we're running tests against installed package, not build dir @@ -30,13 +33,18 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck + ${python.interpreter} -m django test --settings=tests.test_settings + runHook postCheck ''; + pythonImportsCheck = [ "appconf" ]; + meta = with lib; { description = "Helper class for handling configuration defaults of packaged apps gracefully"; homepage = "https://django-appconf.readthedocs.org/"; + changelog = "https://github.com/django-compressor/django-appconf/blob/v${version}/docs/changelog.rst"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix index a20b282c6450a..fb8a2bca0de99 100644 --- a/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-bootstrap3"; - version = "24.2"; + version = "24.3"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap3"; rev = "refs/tags/v${version}"; - hash = "sha256-5nBJ5vfsoGoaG1s3K1hCHcSnGf51ZirYYg+uJGsBmG8="; + hash = "sha256-7aHGTa98NaHg6C+fxuQsrPk/8XjHB3awp+gAWysOhAw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index e34ce0f4b6249..7aa95c4717776 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -15,35 +15,39 @@ # tests python, + pytest-django, + pytestCheckHook, }: buildPythonPackage rec { pname = "django-bootstrap4"; - version = "24.3"; - format = "pyproject"; + version = "24.4"; + pyproject = true; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; rev = "refs/tags/v${version}"; - hash = "sha256-sZY/0f1PbYQu9fN65H6H7xLvsdE9AXK0cMt9TyAKuUw="; + hash = "sha256-9URZ+10GVX171Zht49UQEDkVOZ7LfOtUvapLydzNAlk="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ beautifulsoup4 ]; + dependencies = [ beautifulsoup4 ]; pythonImportsCheck = [ "bootstrap4" ]; - nativeCheckInputs = [ (django.override { withGdal = true; }) ]; + nativeCheckInputs = [ + (django.override { withGdal = true; }) + pytest-django + pytestCheckHook + ]; - checkPhase = '' - runHook preCheck - ${python.interpreter} manage.py test -v1 --noinput - runHook postCheck + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.app.settings ''; meta = with lib; { diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix index a66912ee09fcc..64127acc69234 100644 --- a/pkgs/development/python-modules/django-celery-beat/default.nix +++ b/pkgs/development/python-modules/django-celery-beat/default.nix @@ -5,7 +5,7 @@ cron-descriptor, django-timezone-field, ephem, - fetchPypi, + fetchFromGitHub, pytest-django, pytest-timeout, pytestCheckHook, @@ -17,19 +17,23 @@ buildPythonPackage rec { pname = "django-celery-beat"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-91stEpcx8SFL6Dg+GPrmv+rNtV3/shFs6EkiLAEG+a0="; + src = fetchFromGitHub { + owner = "celery"; + repo = "django-celery-beat"; + rev = "refs/tags/v${version}"; + hash = "sha256-XWcmKQXNw8eoGkld77E3rHpR9ofa1i2qO/JI8Hnpi9M="; }; - nativeBuildInputs = [ setuptools ]; + pythonRelaxDeps = [ "django" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cron-descriptor python-crontab celery diff --git a/pkgs/development/python-modules/django-ckeditor/default.nix b/pkgs/development/python-modules/django-ckeditor/default.nix index 4b7a5ee3303b9..1396b45d60243 100644 --- a/pkgs/development/python-modules/django-ckeditor/default.nix +++ b/pkgs/development/python-modules/django-ckeditor/default.nix @@ -14,21 +14,21 @@ buildPythonPackage rec { pname = "django-ckeditor"; - version = "6.7"; - format = "pyproject"; + version = "6.7.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "django-ckeditor"; - repo = pname; + repo = "django-ckeditor"; rev = "refs/tags/${version}"; - hash = "sha256-mZQ5s3YbumYmT0zRWPFIvzt2TbtDLvVcJjZVAwn31E8="; + hash = "sha256-tPwWXQAKoHPpZDZ+fnEoOA29at6gUXBw6CcPdireTr8="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ django django-js-asset pillow diff --git a/pkgs/development/python-modules/django-crispy-bootstrap3/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap3/default.nix index caf2f6655badb..3fe7e0c74978f 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap3/default.nix @@ -21,15 +21,16 @@ buildPythonPackage rec { hash = "sha256-w5CGWf14Wa8hndpk5r4hlz6gGykvRL+1AhA5Pz5Ejtk="; }; + build-system = [ setuptools ]; + dependencies = [ django - setuptools + django-crispy-forms ]; nativeCheckInputs = [ pytest-django pytestCheckHook - django-crispy-forms ]; pythonImportsCheck = [ "crispy_bootstrap3" ]; @@ -37,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bootstrap 3 template pack for django-crispy-forms"; homepage = "https://github.com/django-crispy-forms/crispy-bootstrap3"; + changelog = "https://github.com/django-crispy-forms/crispy-bootstrap3/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ erictapen ]; }; diff --git a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix index 7db68ffc9ccda..eb533ddec43f0 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-crispy-bootstrap4"; version = "2024.1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "django-crispy-forms"; @@ -21,15 +21,16 @@ buildPythonPackage rec { hash = "sha256-upHrNDhoY+8qD+aeXPcY452xUIyYjW0apf8mVo6pqY4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django - setuptools + django-crispy-forms ]; nativeCheckInputs = [ pytest-django pytestCheckHook - django-crispy-forms ]; pythonImportsCheck = [ "crispy_bootstrap4" ]; @@ -37,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bootstrap 4 template pack for django-crispy-forms"; homepage = "https://github.com/django-crispy-forms/crispy-bootstrap4"; + changelog = "https://github.com/django-crispy-forms/crispy-bootstrap4/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix index 6fc014bcb38a7..87ccaa6a9e6ae 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-crispy-bootstrap5"; version = "2024.2"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "django-crispy-forms"; @@ -21,15 +21,16 @@ buildPythonPackage rec { hash = "sha256-ehcDwy53pZCqouvUm6qJG2FJzlFZaygTZxNYPOqH1q0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django - setuptools + django-crispy-forms ]; nativeCheckInputs = [ pytest-django pytestCheckHook - django-crispy-forms ]; pythonImportsCheck = [ "crispy_bootstrap5" ]; @@ -37,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bootstrap 5 template pack for django-crispy-forms"; homepage = "https://github.com/django-crispy-forms/crispy-bootstrap5"; + changelog = "https://github.com/django-crispy-forms/crispy-bootstrap5/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 5900e4a42ff5e..097a90f821bc3 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.6.0"; + version = "3.6.1"; pyproject = true; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-uece+tR3Nd32nfKn1gtcWqckN4z5iUP+C0dJxyDPXBA="; + hash = "sha256-xnRVoCs+TyAbvFSBD58MJhwLw7ecKpMFuWewAgmnzqk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 52f1ff4d5b4c3..d2d65daa66892 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { tablib ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ tablib ] ++ tablib.optional-dependencies.all; cli = [ tablib ] ++ tablib.optional-dependencies.cli; ods = [ tablib ] ++ tablib.optional-dependencies.ods; @@ -52,7 +52,7 @@ buildPythonPackage rec { chardet psycopg2 pytz - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/django-markup/default.nix b/pkgs/development/python-modules/django-markup/default.nix index dce53f40ad93d..61ce9fd91cec7 100644 --- a/pkgs/development/python-modules/django-markup/default.nix +++ b/pkgs/development/python-modules/django-markup/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { dependencies = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { all_filter_dependencies = [ bleach docutils @@ -63,7 +63,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-django pytestCheckHook - ] ++ passthru.optional-dependencies.all_filter_dependencies; + ] ++ optional-dependencies.all_filter_dependencies; preCheck = '' export DJANGO_SETTINGS_MODULE=django_markup.tests diff --git a/pkgs/development/python-modules/django-model-utils/default.nix b/pkgs/development/python-modules/django-model-utils/default.nix index 1dbbeff2cb933..8ddb17d2b3506 100644 --- a/pkgs/development/python-modules/django-model-utils/default.nix +++ b/pkgs/development/python-modules/django-model-utils/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-model-utils"; - version = "4.5.1"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-model-utils"; rev = "refs/tags/${version}"; - hash = "sha256-GaBTCrEwEkJyVeY5YVptPioYcmivyQtBKjs+TgC9IqA="; + hash = "sha256-iRtTYXsgD8NYG3k9ZWAr2Nwazo3HUa6RgdbMeDxc7NI="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix index a7efa70261fbc..acb7fd370429c 100644 --- a/pkgs/development/python-modules/django-modelcluster/default.nix +++ b/pkgs/development/python-modules/django-modelcluster/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pytz ]; - passthru.optional-dependencies.taggit = [ django-taggit ]; + optional-dependencies.taggit = [ django-taggit ]; env.DJANGO_SETTINGS_MODULE = "tests.settings"; nativeCheckInputs = [ pytest-django pytestCheckHook - ] ++ passthru.optional-dependencies.taggit; + ] ++ optional-dependencies.taggit; # https://github.com/wagtail/django-modelcluster/issues/173 disabledTests = lib.optionals (lib.versionAtLeast django.version "4.2") [ diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 35cd50fe4f53b..3b7cd55b494cd 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -13,7 +13,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.19.7"; + version = "0.19.9"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -23,7 +23,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; rev = "refs/tags/v${version}"; - hash = "sha256-jZm51HmK4pgEPeDirMkbLdLJQONspjuqSc2HgiSCtOY="; + hash = "sha256-2GTz+niXfEsi++KyL6+HtwdzO1YFhpKQsDK3F8GAl4A="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/django-otp-webauthn/default.nix b/pkgs/development/python-modules/django-otp-webauthn/default.nix index 870e36cbcb4ed..304d6f543ae42 100644 --- a/pkgs/development/python-modules/django-otp-webauthn/default.nix +++ b/pkgs/development/python-modules/django-otp-webauthn/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "django_otp_webauthn"; - sha256 = "sha256-+Y46/PDeXL9zayoZykaU63faQmnLHzYPmqJJeRBx+hs="; + hash = "sha256-+Y46/PDeXL9zayoZykaU63faQmnLHzYPmqJJeRBx+hs="; }; build-system = [ hatchling ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Passkey support for Django"; homepage = "https://github.com/Stormbase/django-otp-webauthn"; - changelog = "https://github.com/Stormbase/django-otp-webauthn/blob/main/CHANGELOG.md"; + changelog = "https://github.com/Stormbase/django-otp-webauthn/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ erictapen ]; }; diff --git a/pkgs/development/python-modules/django-otp/default.nix b/pkgs/development/python-modules/django-otp/default.nix index a2982d48a64fc..791ee2716d32d 100644 --- a/pkgs/development/python-modules/django-otp/default.nix +++ b/pkgs/development/python-modules/django-otp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "django-otp"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; src = fetchFromGitHub { owner = "django-otp"; repo = "django-otp"; rev = "v${version}"; - hash = "sha256-1tatp4CQowaHZ5w9IPiKZ3rT5jREXZnwK9iSAYaUhis="; + hash = "sha256-fn3MptdlnqY0rOLwcPhKiLfrhYvov4YVLZ58Jp/j6zc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-payments/default.nix b/pkgs/development/python-modules/django-payments/default.nix index 62e4484e45537..33824cb5b2554 100644 --- a/pkgs/development/python-modules/django-payments/default.nix +++ b/pkgs/development/python-modules/django-payments/default.nix @@ -11,7 +11,6 @@ requests, setuptools, setuptools-scm, - sphinx-rtd-theme, stripe, suds-community, xmltodict, diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index d3fb086fc4174..cf9685e0b2acd 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { six ]; - doCheck = !stdenv.isDarwin; # could not create shared memory segment: Operation not permitted + doCheck = !stdenv.hostPlatform.isDarwin; # could not create shared memory segment: Operation not permitted nativeCheckInputs = [ djangorestframework diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index 99b8aec53a36d..0cc7ea246e8cc 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { "test_mongo" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Multiprocessing distributed task queue for Django"; diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix index eefb715e17088..94249cebd94c6 100644 --- a/pkgs/development/python-modules/django-redis/default.nix +++ b/pkgs/development/python-modules/django-redis/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { redis ]; - passthru.optional-dependencies = { + optional-dependencies = { hiredis = [ redis ] ++ redis.optional-dependencies.hiredis; }; @@ -67,7 +67,7 @@ buildPythonPackage rec { pytest-django pytest-mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/django-rosetta/default.nix b/pkgs/development/python-modules/django-rosetta/default.nix index a2ae0c0b34aef..98234ebb575a2 100644 --- a/pkgs/development/python-modules/django-rosetta/default.nix +++ b/pkgs/development/python-modules/django-rosetta/default.nix @@ -6,12 +6,13 @@ polib, pythonOlder, requests, + setuptools, }: buildPythonPackage rec { pname = "django-rosetta"; - version = "0.9.9"; - format = "setuptools"; + version = "0.10.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,10 +20,12 @@ buildPythonPackage rec { owner = "mbi"; repo = "django-rosetta"; rev = "refs/tags/v${version}"; - hash = "sha256-OuKgqGYBlzQNKKAJYFhNi+LnONB/mxINMj4VBAVWjqI="; + hash = "sha256-b+iCUA3i3Ej6S5XcGQhBIEIJFx6vOL2sq3xkkA9wqek="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django polib requests diff --git a/pkgs/development/python-modules/django-simple-history/default.nix b/pkgs/development/python-modules/django-simple-history/default.nix index 0179760be698e..45e1854de8d94 100644 --- a/pkgs/development/python-modules/django-simple-history/default.nix +++ b/pkgs/development/python-modules/django-simple-history/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-simple-history"; version = "3.7.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,13 +24,13 @@ buildPythonPackage rec { hash = "sha256-bPdMdtiEDRvRD00ZBwUQkeCDKCx2SW65+FsbuMwVdK0="; }; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatchling hatch-vcs ]; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; checkPhase = '' runHook preCheck @@ -41,7 +41,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "simple_history" ]; meta = with lib; { - description = "django-simple-history stores Django model state on every create/update/delete"; + description = "Module to store Django model state on every create/update/delete"; homepage = "https://github.com/jazzband/django-simple-history/"; changelog = "https://github.com/jazzband/django-simple-history/releases/tag/${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 84378ee311a86..1014efc09e65d 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { azure = [ azure-storage-blob ]; boto3 = [ boto3 ]; dropbox = [ dropbox ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { moto pytestCheckHook rsa - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "storages" ]; diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix index 557e6410daeaf..e899451185cc0 100644 --- a/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -3,15 +3,17 @@ buildPythonPackage, django, fetchPypi, + oracledb, pytestCheckHook, pythonOlder, + redis, setuptools, typing-extensions, }: buildPythonPackage rec { pname = "django-stubs-ext"; - version = "5.0.4"; + version = "5.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,16 +21,21 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_stubs_ext"; inherit version; - hash = "sha256-hdoGUiQgR3Qgi+KcfQK0SC1aaSGKcoRlwvvkFyX9yBk="; + hash = "sha256-7X1RwLcxZRh5/HXzMfsIBtmLZ7+rRk6W4nJNtrRu+SY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ django typing-extensions ]; + optional-dependencies = { + redis = [ redis ]; + oracle = [ oracledb ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "django_stubs_ext" ]; diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index 0bdd73e774884..9b955fcfff7e3 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "5.0.4"; + version = "5.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,12 +24,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_stubs"; inherit version; - hash = "sha256-eON2RIj9/SaV8SUCE2VI7CL41LF4BUGoNQQrgjjRFRQ="; + hash = "sha256-hhKMIotl5smoXl3FbrHG9BElkX2uDiHmz+zfGyfmMMU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ django django-stubs-ext types-pytz @@ -37,13 +37,13 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { compatible-mypy = [ mypy ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "django-stubs" ]; diff --git a/pkgs/development/python-modules/django-tables2/default.nix b/pkgs/development/python-modules/django-tables2/default.nix index cb1f2307d527e..b5692c1d0f6d5 100644 --- a/pkgs/development/python-modules/django-tables2/default.nix +++ b/pkgs/development/python-modules/django-tables2/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { tablib = [ tablib ] ++ tablib.optional-dependencies.xls ++ tablib.optional-dependencies.yaml; }; @@ -53,7 +53,7 @@ buildPythonPackage rec { pyyaml pytest-django pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTestPaths = [ # requires django-filters diff --git a/pkgs/development/python-modules/django-two-factor-auth/default.nix b/pkgs/development/python-modules/django-two-factor-auth/default.nix index 718d2206700b4..1a35580d19e5e 100644 --- a/pkgs/development/python-modules/django-two-factor-auth/default.nix +++ b/pkgs/development/python-modules/django-two-factor-auth/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { qrcode ]; - passthru.optional-dependencies = { + optional-dependencies = { call = [ twilio ]; sms = [ twilio ]; webauthn = [ diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix index 236d1f60935a2..cb3160ed814a9 100644 --- a/pkgs/development/python-modules/django-vite/default.nix +++ b/pkgs/development/python-modules/django-vite/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "django-vite"; - version = "3.0.4"; + version = "3.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "MrBin99"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rIT4WA45v353vSV56fBOa0euiuwnXWmhbxniAWPAkMo="; + hash = "sha256-v6jmtiQjTJegD7aeuu3HkuKnYWgMZ7TqW5onkSnc7Xs="; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-webpush/default.nix b/pkgs/development/python-modules/django-webpush/default.nix index 0c9b0ac657878..803de4851118a 100644 --- a/pkgs/development/python-modules/django-webpush/default.nix +++ b/pkgs/development/python-modules/django-webpush/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for integrating and sending Web Push Notification in Django Application"; homepage = "https://github.com/safwanrahman/django-webpush/"; - changelog = "https://github.com/safwanrahman/django-webpush/releases/tag/${src.rev}"; + changelog = "https://github.com/safwanrahman/django-webpush/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ derdennisop ]; }; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 398e0516b7d48..3e79caf801342 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.15"; + version = "4.2.16"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-SWENMUsTgP3X3EvFiTgpKCZO0/KaZ1x1stSyp2kM/P4="; + hash = "sha256-VW/qfqOadivtU8Xg70FLqENtOV7GqJM4bR2Ik6Yag+o="; }; patches = @@ -94,7 +94,7 @@ buildPythonPackage rec { sqlparse ]; - passthru.optional-dependencies = { + optional-dependencies = { argon2 = [ argon2-cffi ]; bcrypt = [ bcrypt ]; }; @@ -116,9 +116,9 @@ buildPythonPackage rec { selenium tblib tzdata - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' # make sure the installed library gets imported diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index b44571368f7d7..6cf85445c4020 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, pythonOlder, substituteAll, @@ -44,7 +43,7 @@ buildPythonPackage rec { pname = "django"; - version = "5.0.8"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +52,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-mH8o1f3UMuKEHwfXK2ck1GVj/T50F+7IgTsnXJn7aHU="; + hash = "sha256-4w5MSu3xdF9Pl0iRcD6bOgUF0tLMiZdCWt3JKsx/Rqc="; }; patches = @@ -76,17 +75,13 @@ buildPythonPackage rec { }) ]; - postPatch = - '' - substituteInPlace tests/utils_tests/test_autoreload.py \ - --replace "/usr/bin/python" "${python.interpreter}" - '' - + lib.optionalString (pythonAtLeast "3.12" && stdenv.hostPlatform.system == "aarch64-linux") '' - # Test regression after xz was reverted from 5.6.0 to 5.4.6 - # https://hydra.nixos.org/build/254532197 - substituteInPlace tests/view_tests/tests/test_debug.py \ - --replace-fail "test_files" "dont_test_files" - ''; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools>=61.0.0,<69.3.0" setuptools + + substituteInPlace tests/utils_tests/test_autoreload.py \ + --replace-fail "/usr/bin/python" "${python.interpreter}" + ''; build-system = [ setuptools ]; @@ -119,14 +114,19 @@ buildPythonPackage rec { tzdata ] ++ lib.flatten (lib.attrValues optional-dependencies); - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' # make sure the installed library gets imported rm -rf django + # fails to import github_links from docs/_ext/github_links.py + rm tests/sphinx/test_github_links.py + # provide timezone data, works only on linux export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo + + export PYTHONPATH=$PWD/docs/_ext:$PYTHONPATH ''; checkPhase = '' diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index abf6c29ed81b2..dc91ad35fa03c 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyjwt ]; - passthru.optional-dependencies = { + optional-dependencies = { python-jose = [ python-jose ]; crypto = [ cryptography ]; }; diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix index 140168e8260c5..826bb862248cb 100644 --- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix +++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "djangorestframework-stubs"; - version = "3.15.0"; + version = "3.15.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "typeddjango"; repo = "djangorestframework-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-5fZzSRn59ii41QKOqkZUXTDnm70Um9SY445Vfoo8sgg="; + hash = "sha256-m9KxC3dGe+uRB3YIykV/SCOHeItRYNKopF9fqCd10Vk="; }; nativeBuildInputs = [ setuptools ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { compatible-mypy = [ mypy ] ++ django-stubs.optional-dependencies.compatible-mypy; coreapi = [ coreapi ]; markdown = [ types-markdown ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { py pytest-mypy-plugins pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Upstream recommends mypy > 1.7 which we don't have yet, thus all testsare failing with 3.14.5 and below doCheck = false; diff --git a/pkgs/development/python-modules/djangosaml2/default.nix b/pkgs/development/python-modules/djangosaml2/default.nix new file mode 100644 index 0000000000000..ff484907e69f7 --- /dev/null +++ b/pkgs/development/python-modules/djangosaml2/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + defusedxml, + django, + pysaml2, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "djangosaml2"; + version = "1.9.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "IdentityPython"; + repo = "djangosaml2"; + rev = "refs/tags/v${version}"; + hash = "sha256-rbmEJuG2mgozpCFOXZUJFxv8v52IRQeaeAKfeUDACeU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + defusedxml + pysaml2 + ]; + + # Falsely complains that 'defusedxml>=0.4.1 not satisfied by version 0.8.0rc2' + pythonRelaxDeps = [ "defusedxml" ]; + + pythonImportsCheck = [ "djangosaml2" ]; + + checkPhase = '' + runHook preCheck + + python tests/run_tests.py + + runHook postCheck + ''; + + meta = { + description = "Django SAML2 Service Provider based on pySAML2"; + homepage = "https://github.com/IdentityPython/djangosaml2"; + changelog = "https://github.com/IdentityPython/djangosaml2/blob/v${version}/CHANGES"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ melvyn2 ]; + }; +} diff --git a/pkgs/development/python-modules/dlinfo/default.nix b/pkgs/development/python-modules/dlinfo/default.nix index bb9c849592dd4..1b774b8e85c03 100644 --- a/pkgs/development/python-modules/dlinfo/default.nix +++ b/pkgs/development/python-modules/dlinfo/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/cloudflightio/python-dlinfo"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index 567b79ab9bd79..9e324474291d6 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -30,16 +29,14 @@ buildPythonPackage rec { pname = "dm-control"; - version = "1.0.22"; + version = "1.0.23"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "google-deepmind"; repo = "dm_control"; rev = "refs/tags/${version}"; - hash = "sha256-Tw4VZmunSeb0H7ltPnLCEidSZ2cvcoWLei1DB32vWpw="; + hash = "sha256-eSvER3lceAEZZ+DhCjvjNW3YpdzCeP/lly5AP3eDnbA="; }; build-system = [ diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 7290b31b7f37b..06b01a4478437 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { wrapt ] ++ etils.optional-dependencies.epath; - passthru.optional-dependencies = { + optional-dependencies = { tensorflow = [ tensorflow ]; }; diff --git a/pkgs/development/python-modules/dm-tree/default.nix b/pkgs/development/python-modules/dm-tree/default.nix index 6062d202a3ce7..909cd3aa523a0 100644 --- a/pkgs/development/python-modules/dm-tree/default.nix +++ b/pkgs/development/python-modules/dm-tree/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { patches = [ patchCMakeAbseil patchCMakePybind - ] ++ (lib.optional stdenv.isDarwin ./0003-don-t-configure-apple.patch); + ] ++ (lib.optional stdenv.hostPlatform.isDarwin ./0003-don-t-configure-apple.patch); dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/dnf4/wrapper.nix b/pkgs/development/python-modules/dnf4/wrapper.nix index b84584f52fad6..c8cd1c1c261dd 100644 --- a/pkgs/development/python-modules/dnf4/wrapper.nix +++ b/pkgs/development/python-modules/dnf4/wrapper.nix @@ -1,15 +1,16 @@ { lib, wrapPython, - python3, + python, stdenv, + dnf4, dnf-plugins-core, plugins ? [ dnf-plugins-core ], }: let - pluginPaths = map (p: "${p}/${python3.sitePackages}/dnf-plugins") plugins; + pluginPaths = map (p: "${p}/${python.sitePackages}/dnf-plugins") plugins; - dnf4-unwrapped = python3.pkgs.dnf4; + dnf4-unwrapped = dnf4; in stdenv.mkDerivation { diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix index 225a04ee5342b..89f98539f7a4f 100644 --- a/pkgs/development/python-modules/dns-lexicon/default.nix +++ b/pkgs/development/python-modules/dns-lexicon/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { tldextract ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { route53 = [ boto3 ]; localzone = [ localzone ]; softlayer = [ softlayer ]; @@ -66,7 +66,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-vcr - ] ++ passthru.optional-dependencies.full; + ] ++ optional-dependencies.full; pytestFlagsArray = [ "tests/" ]; diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 56098c6250c5b..d1d0d61398de1 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { DOH = [ httpx h2 @@ -53,7 +53,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ cacert ] ++ passthru.optional-dependencies.DNSSEC; + checkInputs = [ cacert ] ++ optional-dependencies.DNSSEC; disabledTests = [ # dns.exception.SyntaxError: protocol not found diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index bd47412044f6b..68c9377d3bffe 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -53,6 +53,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + pythonRelaxDeps = [ "docutils" ]; + pythonImportsCheck = [ "doc8" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 7a36c27e8e223..59ab52857824a 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit" ]; # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "api_test" "stream_response" "socket_file" diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index cdfb53572213d..695d351f03ca5 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -37,7 +37,7 @@ let # Only Darwin needs LANG, but we could set it in general. # It's done here conditionally to prevent mass-rebuilds. checkPhase = - lib.optionalString stdenv.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + lib.optionalString stdenv.hostPlatform.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + '' ${python.interpreter} test/alltests.py ''; diff --git a/pkgs/development/python-modules/docx2python/default.nix b/pkgs/development/python-modules/docx2python/default.nix index 5ee6990ff93b9..374a840050e10 100644 --- a/pkgs/development/python-modules/docx2python/default.nix +++ b/pkgs/development/python-modules/docx2python/default.nix @@ -2,15 +2,18 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - poetry-core, lxml, + paragraphs, + setuptools, + setuptools-scm, pytestCheckHook, + pythonOlder, + typing-extensions, }: buildPythonPackage rec { pname = "docx2python"; - version = "2.11.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,22 +22,29 @@ buildPythonPackage rec { owner = "ShayHill"; repo = "docx2python"; rev = "refs/tags/${version}"; - hash = "sha256-SavRYnNbESRQh9Elk8qCt/qdI2x+sYZJFMYy+Gojg2k="; + hash = "sha256-ucLDdfmLAWcGunOKvh8tBQknXTPI1qOqyXgVGjQOGoQ="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ lxml ]; + dependencies = [ + lxml + paragraphs + typing-extensions + ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "docx2python" ]; meta = with lib; { - homepage = "https://github.com/ShayHill/docx2python"; description = "Extract docx headers, footers, (formatted) text, footnotes, endnotes, properties, and images"; + homepage = "https://github.com/ShayHill/docx2python"; changelog = "https://github.com/ShayHill/docx2python/blob/${src.rev}/CHANGELOG.md"; - maintainers = [ ]; license = licenses.mit; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dohq-artifactory/default.nix b/pkgs/development/python-modules/dohq-artifactory/default.nix index 839bfd2f38f34..2e44d4464791e 100644 --- a/pkgs/development/python-modules/dohq-artifactory/default.nix +++ b/pkgs/development/python-modules/dohq-artifactory/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "dohq-artifactory"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "devopshq"; repo = "artifactory"; rev = version; - hash = "sha256-gccVwshGBgbhTSX4o0vANIRct1isqDj+gWeZZxExj9Q="; + hash = "sha256-lMT1b6JUDT01fJzQrVc0lMqeGrJnvk6ms4KIYtfTQps="; }; # https://github.com/devopshq/artifactory/issues/430 diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index 4b49ba50fe470..188fb1ddbb3b7 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -30,11 +30,14 @@ let hash = "sha256-cdB8zJUUyyL+WdmJmVd2ZeqrV+FvZE0EM2rgtLriNLw="; }; - propagatedBuildInputs = [ - cloudpickle - importlib-metadata - toml - ] ++ lib.optional stdenv.isLinux pyinotify ++ lib.optional stdenv.isDarwin macfsevents; + propagatedBuildInputs = + [ + cloudpickle + importlib-metadata + toml + ] + ++ lib.optional stdenv.hostPlatform.isLinux pyinotify + ++ lib.optional stdenv.hostPlatform.isDarwin macfsevents; nativeCheckInputs = [ configclass @@ -51,7 +54,7 @@ let passthru.tests = { # hangs on darwin check = doit.overridePythonAttrs (_: { - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; }); }; diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix new file mode 100644 index 0000000000000..99ff069ce49f9 --- /dev/null +++ b/pkgs/development/python-modules/dom-toml/default.nix @@ -0,0 +1,36 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + flit-core, + setuptools, + domdf-python-tools, + tomli, +}: +buildPythonPackage rec { + pname = "dom-toml"; + version = "2.0.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "dom_toml"; + hash = "sha256-PAfoQ2U4mUl0Ensa4DdmHRp3mskVxE/Qazq1/hQP9Yk="; + }; + + build-system = [ flit-core ]; + + nativeBuildInputs = [ setuptools ]; + + dependencies = [ + domdf-python-tools + tomli + ]; + + meta = { + description = "Dom's tools for Tom's Obvious, Minimal Language."; + homepage = "https://github.com/domdfcoding/dom_toml"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyberius-prime ]; + }; +} diff --git a/pkgs/development/python-modules/domdf-python-tools/default.nix b/pkgs/development/python-modules/domdf-python-tools/default.nix new file mode 100644 index 0000000000000..832674256a0e4 --- /dev/null +++ b/pkgs/development/python-modules/domdf-python-tools/default.nix @@ -0,0 +1,38 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + setuptools, + natsort, + typing-extensions, +}: +buildPythonPackage rec { + pname = "domdf-python-tools"; + version = "3.9.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "domdf_python_tools"; + hash = "sha256-H4qWlxF4MzpV4IPjVhDXaIzXYgrSuZeQFk4fwaNhTBg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + natsort + typing-extensions + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' + ''; + + meta = { + description = "Helpful functions for Python"; + homepage = "https://github.com/domdfcoding/domdf_python_tools"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyberius-prime ]; + }; +} diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix index 59a19b30caeba..cbe4b8518763f 100644 --- a/pkgs/development/python-modules/dparse/default.nix +++ b/pkgs/development/python-modules/dparse/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { # FIXME pipenv = [ pipenv ]; conda = [ pyyaml ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "dparse" ]; diff --git a/pkgs/development/python-modules/draftjs-exporter/default.nix b/pkgs/development/python-modules/draftjs-exporter/default.nix index 29205e3d5dd4b..0573af0c60a3b 100644 --- a/pkgs/development/python-modules/draftjs-exporter/default.nix +++ b/pkgs/development/python-modules/draftjs-exporter/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-4MmCVRx350p6N9XqTZSo8ROI/OJ0s4aKSYH9+Oxgvf4="; }; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; html5lib = [ beautifulsoup4 @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; }; - checkInputs = passthru.optional-dependencies.lxml ++ passthru.optional-dependencies.html5lib; + checkInputs = optional-dependencies.lxml ++ optional-dependencies.html5lib; checkPhase = '' # 2 tests in this file randomly fail because they depend on the order of diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix index b44873e99f9a6..b02da84182f7e 100644 --- a/pkgs/development/python-modules/dramatiq/default.nix +++ b/pkgs/development/python-modules/dramatiq/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ prometheus-client ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ gevent pika @@ -88,7 +88,7 @@ buildPythonPackage rec { "test_rabbitmq_process_10k_fib_with_cli" "test_rabbitmq_process_1k_latency_with_cli" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Takes too long for darwin ofborg "test_retry_exceptions_can_specify_a_delay" ]; diff --git a/pkgs/development/python-modules/drawsvg/default.nix b/pkgs/development/python-modules/drawsvg/default.nix index 8feb1a1151ea6..d6df1c87a2dc5 100644 --- a/pkgs/development/python-modules/drawsvg/default.nix +++ b/pkgs/development/python-modules/drawsvg/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ numpy imageio diff --git a/pkgs/development/python-modules/drivelib/default.nix b/pkgs/development/python-modules/drivelib/default.nix index ff378520cdde2..0135ca72954cf 100644 --- a/pkgs/development/python-modules/drivelib/default.nix +++ b/pkgs/development/python-modules/drivelib/default.nix @@ -1,38 +1,53 @@ { lib, buildPythonPackage, - fetchPypi, expiringdict, + fetchPypi, + google-api-python-client, google-auth-httplib2, google-auth-oauthlib, - google-api-python-client, + pythonOlder, + setuptools, + versioneer, }: buildPythonPackage rec { pname = "drivelib"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "1bz3dn6wm9mlm2w8czwjmhvf3ws3iggr57hvd8z8acl1qafr2g4m"; + hash = "sha256-lTyRncKBMoU+ahuekt+LQ/PhNqySf4a4qLSmyo1t468="; }; - propagatedBuildInputs = [ + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ + expiringdict google-api-python-client - google-auth-oauthlib google-auth-httplib2 - expiringdict + google-auth-oauthlib ]; - # tests depend on a google auth token + # Tests depend on a google auth token doCheck = false; pythonImportsCheck = [ "drivelib" ]; meta = with lib; { description = "Easy access to the most common Google Drive API calls"; - homepage = "https://pypi.org/project/drivelib/"; + homepage = "https://github.com/Lykos153/python-drivelib"; license = licenses.gpl3Only; maintainers = with maintainers; [ gravndal ]; }; diff --git a/pkgs/development/python-modules/dsnap/default.nix b/pkgs/development/python-modules/dsnap/default.nix index f14636df06547..1908de7692e80 100644 --- a/pkgs/development/python-modules/dsnap/default.nix +++ b/pkgs/development/python-modules/dsnap/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer ]; scannerd = [ aws-sam-cli @@ -55,7 +55,7 @@ buildPythonPackage rec { moto mypy-boto3-ebs pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # https://github.com/RhinoSecurityLabs/dsnap/issues/26 # ImportError: cannot import name 'mock_iam' from 'moto' diff --git a/pkgs/development/python-modules/dtlssocket/default.nix b/pkgs/development/python-modules/dtlssocket/default.nix index 2d8e3988bee10..a9810c51cb07a 100644 --- a/pkgs/development/python-modules/dtlssocket/default.nix +++ b/pkgs/development/python-modules/dtlssocket/default.nix @@ -3,26 +3,31 @@ buildPythonPackage, fetchPypi, autoconf, - cython_0, + automake, + cython, + pkg-config, setuptools, }: buildPythonPackage rec { pname = "dtlssocket"; - version = "0.1.19"; - - format = "pyproject"; + version = "0.2.2"; + pyproject = true; src = fetchPypi { - pname = "DTLSSocket"; - inherit version; - hash = "sha256-hKwWkQ/K+FTgn2Gs8Pynz/ihuVeO8grqekPPbGK5eDI="; + inherit pname version; + hash = "sha256-TnbXFXJuDEbcCeNdqbZxewY8I4mwbBcj3sw7o4tzh/Q="; }; + build-system = [ + cython + setuptools + ]; + nativeBuildInputs = [ autoconf - cython_0 - setuptools + automake + pkg-config ]; # no tests on PyPI, no tags on GitLab diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index d4875e0da8aa8..2dffd2d5bc95d 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { broken = ( # Library not loaded: @rpath/libfdt.1.dylib - stdenv.isDarwin + stdenv.hostPlatform.isDarwin || # see https://github.com/devicetree-org/dt-schema/issues/108 diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index 1282fdfc9952d..cf5b3ed3568d2 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -5,6 +5,7 @@ pytestCheckHook, pythonAtLeast, pythonOlder, + python, duckdb, hypothesis, pandas, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.13.1"; + version = "0.13.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +27,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-6aVVs3ii8pJOSaLx0maoFmiMvbUh/LOdizmPSpqPiM4="; + hash = "sha256-zao8kzzQbnjwJqjHyqDkgmXa3E9nlBH2W0wh7Kjk/qw="; }; nativeBuildInputs = [ poetry-core ]; @@ -63,6 +64,15 @@ buildPythonPackage rec { "duckdb_engine/tests/test_datatypes.py" ]; + disabledTests = [ + # incompatible with duckdb 1.1.1 + "test_with_cache" + ] ++ lib.optionals (python.pythonVersion == "3.11") [ + # incompatible with duckdb 1.1.1 + "test_all_types_reflection" + "test_nested_types" + ]; + pythonImportsCheck = [ "duckdb_engine" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 132f72d70ee5f..77b348e271f00 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { ]; # test flags from .github/workflows/Python.yml - pytestFlagsArray = [ "--verbose" ] ++ lib.optionals stdenv.isDarwin [ "tests/fast" ]; + pytestFlagsArray = [ "--verbose" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/fast" ]; disabledTestPaths = [ # avoid dependency on mypy diff --git a/pkgs/development/python-modules/duet/default.nix b/pkgs/development/python-modules/duet/default.nix index de9685345ba1d..2f9720bc0de1a 100644 --- a/pkgs/development/python-modules/duet/default.nix +++ b/pkgs/development/python-modules/duet/default.nix @@ -3,25 +3,33 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pythonOlder, + setuptools, typing-extensions, }: buildPythonPackage rec { pname = "duet"; - version = "0.2.7"; - format = "setuptools"; + version = "0.2.9"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "google"; repo = "duet"; - rev = "v${version}"; - hash = "sha256-9CTAupAxZI1twoLpgr7VfECw70QunE6pk+SskiT3JDw="; + rev = "refs/tags/v${version}"; + hash = "sha256-P7JxUigD7ZyhtocV+YuAVxuUYVa4F7PpXuA1CCmcMvg="; }; - propagatedBuildInputs = [ typing-extensions ]; + build-system = [ setuptools ]; + + dependencies = [ typing-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "duet" ]; + meta = with lib; { description = "Simple future-based async library for python"; homepage = "https://github.com/google/duet"; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 0618a1b2aaea7..e4b3663dda90d 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { rm tests/compat/test_pack.py ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "dulwich" ]; diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 3a725f625c4f8..9732318367675 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "3.16.5"; + version = "3.16.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; rev = "refs/tags/${version}"; - hash = "sha256-QTsKjF7aVUUFi/6WtuLDVaKOOEzkbkQKpT9L2Mg6724="; + hash = "sha256-2KYAFNCh6QfGdTzHE5LCumWoi+DM4t857qg6LrFO5x4="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index 2cab268fecf6e..749abe71e0bc8 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { table = [ flatten-dict tabulate @@ -46,9 +46,9 @@ buildPythonPackage rec { pytestCheckHook pytest-mock pytest-test-utils - ] ++ passthru.optional-dependencies.table ++ passthru.optional-dependencies.markdown; + ] ++ optional-dependencies.table ++ optional-dependencies.markdown; - disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_vega.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_vega.py" ]; pythonImportsCheck = [ "dvc_render" ]; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 94f598abbe19c..ee197c22044c2 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.55.0"; + version = "3.55.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -66,7 +66,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-nKzMHVMaoDu/d1wMAxA2q8DHdwoIb7+YG/7AhAtRVEM="; + hash = "sha256-yNnOSYh4lCefTnIgNstsKaRbrPCgSiWEgKeF66KD66k="; }; pythonRelaxDeps = [ @@ -124,14 +124,14 @@ buildPythonPackage rec { voluptuous zc-lockfile ] - ++ lib.optionals enableGoogle passthru.optional-dependencies.gs - ++ lib.optionals enableAWS passthru.optional-dependencies.s3 - ++ lib.optionals enableAzure passthru.optional-dependencies.azure - ++ lib.optionals enableSSH passthru.optional-dependencies.ssh + ++ lib.optionals enableGoogle optional-dependencies.gs + ++ lib.optionals enableAWS optional-dependencies.s3 + ++ lib.optionals enableAzure optional-dependencies.azure + ++ lib.optionals enableSSH optional-dependencies.ssh ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - passthru.optional-dependencies = { + optional-dependencies = { azure = [ dvc-azure ]; gdrive = [ dvc-gdrive ]; gs = [ dvc-gs ]; diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 7973a0e769676..6124823fce597 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pynvml ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ jsonargparse lightgbm diff --git a/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch b/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch deleted file mode 100644 index 15548b7aec1ca..0000000000000 --- a/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 189681bbfb703a7026ca7bbb3b21ef554807b144 Mon Sep 17 00:00:00 2001 -From: tali auster <taliauster@gmail.com> -Date: Wed, 15 Nov 2023 12:15:34 -0700 -Subject: [PATCH] use distro over ld - -The `ld` module (linux distribution) was renamed to `distro`, presumably -so as not to subsume binutils name. - ---- - setup.py | 2 +- - src/e3/os/platform.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index c32f46f..de1ada6 100644 ---- a/setup.py -+++ b/setup.py -@@ -25,7 +25,7 @@ for p in ("darwin", "linux", "linux2", "win32"): - platform_string = ":sys_platform=='%s'" % p - extras_require[platform_string] = ["psutil"] - if p in ("linux", "linux2"): -- extras_require[platform_string].append("ld") -+ extras_require[platform_string].append("distro") - - # Get e3 version from the VERSION file. - version_file = os.path.join(os.path.dirname(__file__), "VERSION") -diff --git a/src/e3/os/platform.py b/src/e3/os/platform.py -index 2d4e174..a9d12d3 100644 ---- a/src/e3/os/platform.py -+++ b/src/e3/os/platform.py -@@ -78,7 +78,7 @@ class SystemInfo: - - # Fetch linux distribution info on linux OS - if cls.uname.system == "Linux": # linux-only -- import ld -+ import distro as ld - - cls.ld_info = { - "name": ld.name(), --- -2.40.1 - diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix index 3c001d39392a8..9f37786ba4d6f 100644 --- a/pkgs/development/python-modules/e3-core/default.nix +++ b/pkgs/development/python-modules/e3-core/default.nix @@ -1,18 +1,19 @@ { + lib, + stdenv, autoPatchelfHook, buildPythonPackage, colorama, distro, fetchFromGitHub, - lib, packaging, psutil, python-dateutil, + pythonOlder, pyyaml, - requests, requests-cache, requests-toolbelt, - stdenv, + requests, setuptools, stevedore, tqdm, @@ -20,38 +21,37 @@ buildPythonPackage rec { pname = "e3-core"; - version = "22.5.0"; + version = "22.6.0"; pyproject = true; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "AdaCore"; repo = "e3-core"; rev = "refs/tags/v${version}"; - hash = "sha256-7csZYohU89uavSMPOKGJ8HClmtiweGSghyR7QgFfSY8="; + hash = "sha256-6rClGDo8KhBbOg/Rw0nVISVtOAACf5cwSafNInlBGCw="; }; - patches = [ ./0001-use-distro-over-ld.patch ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - autoPatchelfHook - setuptools - ]; + nativeBuildInputs = [ autoPatchelfHook ]; - propagatedBuildInputs = + dependencies = [ colorama packaging - pyyaml python-dateutil + pyyaml requests requests-cache requests-toolbelt - tqdm stevedore + tqdm ] - ++ lib.optional stdenv.isLinux [ - # See setup.py:24. These are required only on Linux. Darwin has its own set - # of requirements. + ++ lib.optional stdenv.hostPlatform.isLinux [ + # See https://github.com/AdaCore/e3-core/blob/v22.6.0/pyproject.toml#L37-L42 + # These are required only on Linux. Darwin has its own set of requirements psutil distro ]; @@ -62,7 +62,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - changelog = "https://github.com/AdaCore/e3-core/releases/tag/${src.rev}"; + changelog = "https://github.com/AdaCore/e3-core/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; homepage = "https://github.com/AdaCore/e3-core/"; description = "Core framework for developing portable automated build systems"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/e3-testsuite/default.nix b/pkgs/development/python-modules/e3-testsuite/default.nix index bf8ba8850a3d1..d1b61186195e8 100644 --- a/pkgs/development/python-modules/e3-testsuite/default.nix +++ b/pkgs/development/python-modules/e3-testsuite/default.nix @@ -1,8 +1,9 @@ { + lib, buildPythonPackage, e3-core, fetchFromGitHub, - lib, + pythonOlder, setuptools, }: @@ -11,23 +12,25 @@ buildPythonPackage rec { version = "26.0"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "AdaCore"; repo = "e3-testsuite"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-V20tX0zi2DRHO42udUcW/CDMyBxh1uSTgac0zZGubsI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ e3-core ]; + dependencies = [ e3-core ]; pythonImportsCheck = [ "e3" ]; meta = with lib; { - changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/${src.rev}"; - homepage = "https://github.com/AdaCore/e3-testsuite/"; description = "Generic testsuite framework in Python"; + changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + homepage = "https://github.com/AdaCore/e3-testsuite/"; license = licenses.gpl3Only; maintainers = with maintainers; [ heijligen ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix index 170ff96c35c8a..a1ff17f2b3602 100644 --- a/pkgs/development/python-modules/easyocr/default.nix +++ b/pkgs/development/python-modules/easyocr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "easyocr"; - version = "1.7.1"; + version = "1.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "JaidedAI"; repo = "EasyOCR"; rev = "refs/tags/v${version}"; - hash = "sha256-EiiJ2LJ3uYIvgPd2y25MraV5kTa47JalDR7SLbkM9UI="; + hash = "sha256-9mrAxt2lphYtLW81lGO5SYHsnMnSA/VpHiY2NffD/Js="; }; postPatch = '' diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index e710689aaa26e..25af1e1e6ded6 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 ]; - passthru.optional-dependencies = { + optional-dependencies = { reporting = [ pandas pyparsing @@ -52,7 +52,7 @@ buildPythonPackage rec { pytestCheckHook which yosys - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "edalize" ]; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 59059586c89be..a5c30114c4b92 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.10"; + version = "0.21.12"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-77Eu1yqCsYgRgEMxBFEmV51Tj/NGH1sFjx016fC3uMM="; + hash = "sha256-PIQ/OrZnm+WOlvTzCHb64/bj7/JGKBEbh6lHD0Pm0ro="; }; build-system = [ diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index d1b1b5c539b8b..d1844d34baedf 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eigenpy"; - version = "3.8.1"; + version = "3.10.0"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; rev = "refs/tags/v${version}"; - hash = "sha256-U+amWjvA4r2S9qoVW0h8daiUO9g7rMQWmq4aH3/wd+w="; + hash = "sha256-ac667pEKXcbLLzCVGKYpyCQO805qhCEf8dCnC4QwxBs="; }; outputs = [ diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 6fb1abd35fdb4..fb27b98608dd2 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { # Exclude tornado tests "tests/contrib/asyncio/tornado/tornado_tests.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Flaky tests on Darwin "tests/utils/threading_tests.py" ]; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 562d66e9bc2a6..68621f96c1510 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { certifi ]; - passthru.optional-dependencies = { + optional-dependencies = { requests = [ requests ]; async = [ aiohttp ]; }; diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 3d3594ae4b344..3428dfbff8b62 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { dependencies = [ elastic-transport ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiohttp ]; requests = [ requests ]; orjson = [ orjson ]; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index d8a89c437ade1..9c2532d6132c9 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-n1Ps0CybeLeDR5E4UnqmSkbFe0SXyplomEGDchAweSY="; + hash = "sha256-zyJ+UtPTGEziIlucIXN1dIzfN5sfLkeOia7tiqOGFjk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index fd6f3b0d3802d..d2d661cb3b0fd 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "elevenlabs"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "elevenlabs"; repo = "elevenlabs-python"; rev = "refs/tags/v${version}"; - hash = "sha256-wRgDKaSNSdpOJLVeYx2gTbtQ8rcxEAjrxvCI9W1v5V4="; + hash = "sha256-puYRVPWMNV+nOHwa//hZQAq1pAkNeU5CFjlMls9C7MM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index e5f447b233c61..04cb574509c2b 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pytestCheckHook testtools twisted - ] ++ lib.optionals stdenv.isLinux [ daemontools ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ daemontools ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index a1c04262a5bb8..911f33b809f71 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -3,7 +3,7 @@ async-timeout, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, pyserial-asyncio-fast, pytest-asyncio, pytestCheckHook, @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.2.7"; + version = "2.2.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,10 +21,10 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = "refs/tags/${version}"; - hash = "sha256-5YdmZO/8HimQ9Ft/K/I6xu0Av2SjUBp3+poBe7aVUpM="; + hash = "sha256-tUHpDVHx3eIWGftAViVbW9zt7wyWqD+5vJeOPf9jeIg="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ async-timeout diff --git a/pkgs/development/python-modules/embrace/default.nix b/pkgs/development/python-modules/embrace/default.nix index 7572e77728b21..4ad658d7736c5 100644 --- a/pkgs/development/python-modules/embrace/default.nix +++ b/pkgs/development/python-modules/embrace/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # Some test for hot-reload fails on Darwin, but the rest of the library # should remain usable. (https://todo.sr.ht/~olly/embrace-sql/4) - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Embrace SQL keeps your SQL queries in SQL files"; diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index d6f1fd2459313..0a0bb89d89bde 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.12.1"; + version = "2.13.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "carpedm20"; - repo = pname; + repo = "emoji"; rev = "refs/tags/v${version}"; - hash = "sha256-m9V9ryIE2U+KsyzFhAoMCGYMkPCBUl/ex1Ue5OUwslc="; + hash = "sha256-FTQTbp5Ud3CyqkAiGvY8hBOKnvFR29CgZPbz4eZp/ik="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 826e9fbe78051..ca0916c610a4b 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { "test_floats_prefixed" "test_subcounter_prefixed" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/Rockhopper-Technologies/enlighten/issues/44 "test_autorefresh" ]; diff --git a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix index 2a7e328f978b9..d582c5cfc37c8 100644 --- a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix +++ b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # can't find hostname in our darwin build environment "test_fqdn" ]; diff --git a/pkgs/development/python-modules/epicstore-api/default.nix b/pkgs/development/python-modules/epicstore-api/default.nix index 43d6faec34d9f..e31ab47d04953 100644 --- a/pkgs/development/python-modules/epicstore-api/default.nix +++ b/pkgs/development/python-modules/epicstore-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "epicstore-api"; - version = "0.1.8"; + version = "0.1.9"; pyproject = true; src = fetchFromGitHub { owner = "SD4RK"; repo = "epicstore_api"; rev = "refs/tags/v_${version}"; - hash = "sha256-AF2yNb06GShdaMS74pGFdHeM4U6ULdMCPzCyh8gSck0="; + hash = "sha256-9Gh9bsNgZx/SinKr7t1dvqrOUP+z4Gs8BFMLYtboFmg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index 592d10d8f8cdd..80f1b114f4733 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -22,16 +21,14 @@ buildPythonPackage rec { pname = "equinox"; - version = "0.11.5"; + version = "0.11.7"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "patrick-kidger"; repo = "equinox"; rev = "refs/tags/v${version}"; - hash = "sha256-r4HKn+WJmC7BrTeDDAQ1++TpQhhtLcK6HL2CoM/MGx8="; + hash = "sha256-0waIpsVWoABtf4M0IOie9nJDk+e75ArTVmGqYg9AlnI="; }; build-system = [ hatchling ]; @@ -52,28 +49,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "equinox" ]; - disabledTests = [ - # For simplicity, JAX has removed its internal frames from the traceback of the following exception. - # https://github.com/patrick-kidger/equinox/issues/716 - "test_abstract" - "test_complicated" - "test_grad" - "test_jvp" - "test_mlp" - "test_num_traces" - "test_pytree_in" - "test_simple" - "test_vmap" - - # AssertionError: assert 'foo:\n pri...pe=float32)\n' == 'foo:\n pri...pe=float32)\n' - # Also reported in patrick-kidger/equinox#716 - "test_backward_nan" - - # Flaky test - # See https://github.com/patrick-kidger/equinox/issues/781 - "test_traceback_runtime_eqx" - ]; - meta = { description = "JAX library based around a simple idea: represent parameterised functions (such as neural networks) as PyTrees"; changelog = "https://github.com/patrick-kidger/equinox/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/esig/default.nix b/pkgs/development/python-modules/esig/default.nix index 68af34c82e3a4..ba89418c0b693 100644 --- a/pkgs/development/python-modules/esig/default.nix +++ b/pkgs/development/python-modules/esig/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { iisignature = [ iisignature ]; }; diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix index 7438c2ef6e981..b6cc242620736 100644 --- a/pkgs/development/python-modules/essentials-openapi/default.nix +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ click jinja2 diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index 18d5488bee365..5157aa329dcd4 100644 --- a/pkgs/development/python-modules/etebase/default.nix +++ b/pkgs/development/python-modules/etebase/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; propagatedBuildInputs = [ msgpack ]; @@ -76,7 +76,7 @@ buildPythonPackage rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://www.etebase.com/"; description = "Python client library for Etebase"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index c53e052b76fcb..241a4260e43ac 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest ] - ++ passthru.optional-dependencies.pycryptodome + ++ optional-dependencies.pycryptodome # eth-hash can use either safe-pysha3 or pycryptodome; # safe-pysha3 requires Python 3.9+ while pycryptodome does not. # https://github.com/ethereum/eth-hash/issues/46#issuecomment-1314029211 - ++ lib.optional (pythonAtLeast "3.9") passthru.optional-dependencies.pysha3; + ++ lib.optional (pythonAtLeast "3.9") optional-dependencies.pysha3; checkPhase = '' @@ -38,7 +38,7 @@ buildPythonPackage rec { pytest tests/backends/pysha3/ ''; - passthru.optional-dependencies = { + optional-dependencies = { pycryptodome = [ pycryptodome ]; pysha3 = [ safe-pysha3 ]; }; diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index 964f4f08326dc..c64470a2c485c 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pyasn1 pytestCheckHook ] - ++ passthru.optional-dependencies.coincurve + ++ optional-dependencies.coincurve ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3 ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome; @@ -63,7 +63,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "eth_keys" ]; - passthru.optional-dependencies = { + optional-dependencies = { coincurve = [ coincurve ]; }; diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index f1df16ed59337..0f925eadb23ad 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -29,19 +29,19 @@ buildPythonPackage rec { pname = "etils"; - version = "1.9.2"; + version = "1.9.4"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-FdzTWsDAzCQEtGrAhGrzzE6Hb9PYDzb1eVHifoudY3k="; + hash = "sha256-+tlQQU8KHKWMcMcJFbABT5lT3ZvPiqlRoPdf+b7L6yQ="; }; nativeBuildInputs = [ flit-core ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { array-types = enp; eapp = [ absl-py # FIXME package simple-parsing @@ -91,7 +91,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook yapf - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; disabledTests = [ "test_public_access" # requires network access diff --git a/pkgs/development/python-modules/evaluate/default.nix b/pkgs/development/python-modules/evaluate/default.nix index 9eeb02422a47d..b4ca546498503 100644 --- a/pkgs/development/python-modules/evaluate/default.nix +++ b/pkgs/development/python-modules/evaluate/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "evaluate"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "evaluate"; rev = "refs/tags/v${version}"; - hash = "sha256-CGBluY7wFr+RdUW4QTUN18z1WKAB104ayrkzzPZHZ/w="; + hash = "sha256-G/SK0nMpkpCEzX8AX/IJqpOPZWAQhP8tyr7TJ+F0NCE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 5fa638ddddd54..24f9ef57ed687 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { # libredirect is not available on darwin # tests hang on pypy indefinitely - doCheck = !stdenv.isDarwin && !isPyPy; + doCheck = !stdenv.hostPlatform.isDarwin && !isPyPy; preCheck = lib.optionalString doCheck '' echo "nameserver 127.0.0.1" > resolv.conf diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix index afa4969732490..a31b963462a39 100644 --- a/pkgs/development/python-modules/evtx/default.nix +++ b/pkgs/development/python-modules/evtx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "evtx"; - version = "0.8.4"; + version = "0.8.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,13 +20,13 @@ buildPythonPackage rec { owner = "omerbenamram"; repo = "pyevtx-rs"; rev = "refs/tags/${version}"; - hash = "sha256-s94KCUIJplrkMvFsFxPokTucB5TwVYD1xxcoJyvk5NU="; + hash = "sha256-wo6CeHlEBbu3klzzC4dUbjSfu7XwLo/cmtmZsVIKgS8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-i16FNFbYrF2BONahLP7APMi9RPaLGmbnBH4hBPnHWzg="; + hash = "sha256-qBpc3PwvAceOMuRH4vrgURCsvKYhG2Id62n7sxW5AAg="; }; nativeBuildInputs = with rustPlatform; [ @@ -34,7 +34,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 805c348756e1f..0f6e58d0cb2cb 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "5.4.2"; + version = "5.4.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = "exchangelib"; rev = "refs/tags/v${version}"; - hash = "sha256-UAc8Aju2+AM7m8XbWliVNzfWlL5fdPDa2q6Fsw04nHQ="; + hash = "sha256-SX5F0OXKdxA2HoDwvCe4M7RftdjUEdQuFbxRyuABC4E="; }; pythonRelaxDeps = [ "defusedxml" ]; @@ -61,7 +61,7 @@ buildPythonPackage rec { tzlocal ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; - passthru.optional-dependencies = { + optional-dependencies = { complete = [ requests-gssapi # requests-negotiate-sspi diff --git a/pkgs/development/python-modules/exiv2/default.nix b/pkgs/development/python-modules/exiv2/default.nix index d533e4f58c6f7..9529615d0b1dd 100644 --- a/pkgs/development/python-modules/exiv2/default.nix +++ b/pkgs/development/python-modules/exiv2/default.nix @@ -3,20 +3,23 @@ pkg-config, exiv2, gettext, - python3Packages, fetchFromGitHub, gitUpdater, + buildPythonPackage, + setuptools, + toml, + unittestCheckHook, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "exiv2"; - version = "0.17.0"; + version = "0.17.1"; pyproject = true; src = fetchFromGitHub { owner = "jim-easterbrook"; repo = "python-exiv2"; rev = "refs/tags/${version}"; - hash = "sha256-nPSspQPq0y2Vg2S+iwQ1E+TdaOJ9aJN3eeXRrcDzdsM="; + hash = "sha256-AXBhCe7AvhQkGZaLMTGExwgUYQGdRkk14Rtceugexag="; }; # FAIL: test_localisation (test_types.TestTypesModule.test_localisation) @@ -30,7 +33,7 @@ python3Packages.buildPythonPackage rec { def test_localisation(self):" ''; - build-system = with python3Packages; [ + build-system = [ setuptools toml ]; @@ -42,7 +45,7 @@ python3Packages.buildPythonPackage rec { ]; pythonImportsCheck = [ "exiv2" ]; - nativeCheckInputs = with python3Packages; [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" diff --git a/pkgs/development/python-modules/expecttest/default.nix b/pkgs/development/python-modules/expecttest/default.nix index e9cdcf3f57451..0d52c20ba8f0e 100644 --- a/pkgs/development/python-modules/expecttest/default.nix +++ b/pkgs/development/python-modules/expecttest/default.nix @@ -7,19 +7,19 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "expecttest"; - version = "0.1.4"; - format = "pyproject"; + version = "0.2.1"; + pyproject = true; src = fetchFromGitHub { - owner = "ezyang"; - repo = pname; - rev = "v${version}"; - hash = "sha256-BFM0jFWXfH72n9XuFtU9URW8LWGPVJncXniBV5547W4="; + owner = "pytorch"; + repo = "expecttest"; + rev = "683b09a352cc426851adc2e3a9f46e0ab25e4dee"; # no tags + hash = "sha256-e9/KxPN/w0mrFYgesRGqaiDQ6gor7BpX/5/B0NPtXLY="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ hypothesis @@ -32,7 +32,7 @@ buildPythonPackage rec { maintainers = [ lib.maintainers.SomeoneSerge ]; license = lib.licenses.mit; description = ''EZ Yang "golden" tests (testing against a reference implementation)''; - homepage = "https://github.com/ezyang/expecttest"; + homepage = "https://github.com/pytorch/expecttest"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 391881204e29a..0d4a31376f32d 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -47,9 +47,9 @@ buildPythonPackage rec { igraph ]; - passthru.optional-dependencies.pygments = [ pygments ]; + optional-dependencies.pygments = [ pygments ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pygments; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pygments; pythonImportsCheck = [ "explorerscript" ]; diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index fa62b17548938..4aa0af9aa8db9 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { lua = [ lupa ]; json = [ jsonpath-ng ]; bf = [ pyprobables ]; diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index 4cd2944f6b99e..a9ce3ef4a4513 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-xFrTOsoh/qCCnzJq97pHW2TogiWfnw4zL4Lul4jRaA0="; + hash = "sha256-ypr5/6mnATFswZPX4aeusH8PoYRa+yVL1gk+pdz7r0w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 21897db2c8431..9111890efd0f3 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.19.0"; + version = "1.19.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-ZKib2tpL7Yn3yWuyZFOQ3saNQLwrUEeuojSMpoTy89M="; + hash = "sha256-XWPj348kAuA9BF7Y2/hX712eLRfUZ9kH3oL1jb17/K0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fastapi-cli/default.nix b/pkgs/development/python-modules/fastapi-cli/default.nix index b802b058df49c..bfbfa0509a21a 100644 --- a/pkgs/development/python-modules/fastapi-cli/default.nix +++ b/pkgs/development/python-modules/fastapi-cli/default.nix @@ -55,6 +55,10 @@ let self = buildPythonPackage rec { mainProgram = "fastapi"; license = licenses.mit; maintainers = [ ]; + # This package provides a `fastapi`-executable that is in conflict with the one from + # python3Packages.fastapi. Because this package is primarily used for the purpose of + # implementing the CLI for python3Packages.fastapi, we reduce the executable's priority + priority = 10; }; }; in self diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 06b86d13aaf13..16ede5ab211ed 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -9,16 +9,17 @@ pandas, pytestCheckHook, python-dateutil, - python-snappy, + cramjam, pythonOlder, + setuptools, zlib-ng, zstandard, }: buildPythonPackage rec { pname = "fastavro"; - version = "1.9.5"; - format = "setuptools"; + version = "1.9.7"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -26,22 +27,25 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rw0kTSROCFthjo8SrLevBiACNaKpKWcZfIYoc89Q3eM="; + hash = "sha256-hKhwQqNJ+QvYf4x9FesNOPg36m8zC6D6dmlhANXCcsk="; }; preBuild = '' export FASTAVRO_USE_CYTHON=1 ''; - nativeBuildInputs = [ cython ]; + build-system = [ + cython + setuptools + ]; - passthru.optional-dependencies = { + optional-dependencies = { codecs = [ + cramjam lz4 - python-snappy zstandard ]; - snappy = [ python-snappy ]; + snappy = [ cramjam ]; zstandard = [ zstandard ]; lz4 = [ lz4 ]; }; @@ -52,7 +56,7 @@ buildPythonPackage rec { pytestCheckHook python-dateutil zlib-ng - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # Fails with "AttributeError: module 'fastavro._read_py' has no attribute # 'CYTHON_MODULE'." Doesn't appear to be serious. See https://github.com/fastavro/fastavro/issues/112#issuecomment-387638676. diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 95b8e17b88591..f1047b6adac2a 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.7.2"; + version = "1.7.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-3BOsOd3g+SepFUH2czywyaBnA88qLVyu/8eyHGkuEPY="; + hash = "sha256-ksHJrgNju2rEVHcKU6jpW6izQPFgrWvDrvDZy0/Cgug="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index 1096add5b6278..4b906c6d6c1dc 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = [ ]; # resulting compiled object panics at import - broken = stdenv.is32bit; + broken = stdenv.hostPlatform.is32bit; }; } diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index e3f69aad972ce..4b518e5f8ef1d 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { "remote ref" "definitions" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_compile_to_code_custom_format" # cannot import temporary module created during test ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 4add91da09261..5beafcea7a1c7 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { lzo = [ python-lzo ]; }; diff --git a/pkgs/development/python-modules/fasttext-predict/default.nix b/pkgs/development/python-modules/fasttext-predict/default.nix index 6bfddc120c6ff..bdd19640609ef 100644 --- a/pkgs/development/python-modules/fasttext-predict/default.nix +++ b/pkgs/development/python-modules/fasttext-predict/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-rMbf09pCHvVYI9g/aq74+PcsuU2LezpmDz4b/w9vRyc="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace setup.py \ --replace-fail "-flto" "" ''; diff --git a/pkgs/development/python-modules/fenics/default.nix b/pkgs/development/python-modules/fenics/default.nix index a5b9902fecf8b..b2750f7a7054c 100644 --- a/pkgs/development/python-modules/fenics/default.nix +++ b/pkgs/development/python-modules/fenics/default.nix @@ -8,7 +8,6 @@ cmake, doxygen, eigen, - gtest, hdf5, lapack, mpi, diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix index d9c37657adf36..447dbb8e0f24e 100644 --- a/pkgs/development/python-modules/ffcv/default.nix +++ b/pkgs/development/python-modules/ffcv/default.nix @@ -17,6 +17,7 @@ psutil, torchvision, webdataset, + stdenv, }: buildPythonPackage rec { @@ -108,5 +109,8 @@ buildPythonPackage rec { samuela djacu ]; + # OSError: dlopen(libc.so.6, 0x0006): tried: '/usr/lib/libc.so.6' (no such file, not in dyld cache), + # 'libc.so.6' (no such file), '/usr/local/lib/libc.so.6' (no such file), '/usr/lib/libc.so.6' (no such file, not in dyld cache) + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index 00a8a73aadad5..ec639f9ef821c 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { go ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # expects a FFExecutableNotFoundError, gets a NotADirectoryError raised by os "test_invalid_executable_path" ]; diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix new file mode 100644 index 0000000000000..44bb00c6bec67 --- /dev/null +++ b/pkgs/development/python-modules/fickling/default.nix @@ -0,0 +1,53 @@ +{ + lib, + astunparse, + buildPythonPackage, + distutils, + fetchFromGitHub, + flit-core, + pytestCheckHook, + pythonOlder, + torch, + torchvision, +}: + +buildPythonPackage rec { + pname = "fickling"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "fickling"; + rev = "refs/tags/v${version}"; + hash = "sha256-/cV1XhJ8KMFby9nZ/qXEYxf+P6352Q2DZOLuvebyuHQ="; + }; + + build-system = [ + distutils + flit-core + ]; + + dependencies = [ astunparse ]; + + optional-dependencies = { + torch = [ + torch + torchvision + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + pythonImportsCheck = [ "fickling" ]; + + meta = with lib; { + description = "A Python pickling decompiler and static analyzer"; + homepage = "https://github.com/trailofbits/fickling"; + changelog = "https://github.com/trailofbits/fickling/releases/tag/v${version}"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 8b5a06c4a1fc5..0dd47d31ed703 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { dependencies = [ cryptography ]; - passthru.optional-dependencies = { + optional-dependencies = { pcsc = [ pyscard ]; }; diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix index 0ff7318f0bb3d..808c8e1ab6962 100644 --- a/pkgs/development/python-modules/finetuning-scheduler/default.nix +++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix @@ -36,10 +36,18 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests" ]; - disabledTests = lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ - # slightly exceeds numerical tolerance on aarch64-linux: - "test_fts_frozen_bn_track_running_stats" - ]; + disabledTests = + # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: + # LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler' + lib.optionals (pythonOlder "3.12") [ + "test_fts_dynamo_enforce_p0" + "test_fts_dynamo_resume" + "test_fts_dynamo_intrafit" + ] + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ + # slightly exceeds numerical tolerance on aarch64-linux: + "test_fts_frozen_bn_track_running_stats" + ]; pythonImportsCheck = [ "finetuning_scheduler" ]; @@ -50,6 +58,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; # "No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package" at import time: - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/finvizfinance/default.nix b/pkgs/development/python-modules/finvizfinance/default.nix index 0c3ff788d4684..4796f53037be1 100644 --- a/pkgs/development/python-modules/finvizfinance/default.nix +++ b/pkgs/development/python-modules/finvizfinance/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "finvizfinance"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "lit26"; repo = "finvizfinance"; rev = "refs/tags/v${version}"; - hash = "sha256-4aR1x9GgbxnJUpn1+i95djZEVBFTAIzhMLxHe2FaciY="; + hash = "sha256-HCxq8jCT3aHOXeYue7KP5sYzO6nJnB9Sy8gKGZpZHbc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 753bcc32278c9..eabd53ac55553 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,67 +1,75 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system cython, gdal, - oldest-supported-numpy, setuptools, - wheel, + + # dependencies attrs, certifi, click, click-plugins, cligj, - munch, + + # optional-dependencies + pyparsing, shapely, boto3, + + # tests + fsspec, pytestCheckHook, pytz, + snuggs, }: buildPythonPackage rec { pname = "fiona"; - version = "1.9.6"; + version = "1.10.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Toblerity"; repo = "Fiona"; rev = "refs/tags/${version}"; - hash = "sha256-MboM3IwGF8cuz+jMQ3QVZFAHjpspQ6kVJincq7OEkCM="; + hash = "sha256-5NN6PBh+6HS9OCc9eC2TcBvkcwtI4DV8qXnz4tlaMXc="; }; - nativeBuildInputs = [ + build-system = [ cython gdal # for gdal-config - oldest-supported-numpy setuptools - wheel ]; buildInputs = [ gdal ]; - propagatedBuildInputs = [ + dependencies = [ attrs certifi click - cligj click-plugins - munch + cligj ]; - passthru.optional-dependencies = { - calc = [ shapely ]; + optional-dependencies = { + calc = [ + pyparsing + shapely + ]; s3 = [ boto3 ]; }; nativeCheckInputs = [ + fsspec pytestCheckHook pytz - ] ++ passthru.optional-dependencies.s3; + shapely + snuggs + ] ++ optional-dependencies.s3; preCheck = '' rm -r fiona # prevent importing local fiona @@ -87,12 +95,12 @@ buildPythonPackage rec { doInstallCheck = true; - meta = with lib; { + meta = { changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt"; description = "OGR's neat, nimble, no-nonsense API for Python"; mainProgram = "fio"; homepage = "https://fiona.readthedocs.io/"; - license = licenses.bsd3; - maintainers = teams.geospatial.members; + license = lib.licenses.bsd3; + maintainers = lib.teams.geospatial.members; }; } diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index 17f148f39f7ca..2be37738ebb18 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -45,9 +45,9 @@ buildPythonPackage rec { future scikit-fmm openssh - ] ++ lib.optionals (!stdenv.isDarwin) [ gmsh ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gmsh ]; - nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ]; + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ gmsh ]; # NOTE: Two of the doctests in fipy.matrices.scipyMatrix._ScipyMatrix.CSR fail, and there is no # clean way to disable them. diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 05a94d1f2dc37..aa29025c3f246 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "fire"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "google"; repo = "python-fire"; rev = "refs/tags/v${version}"; - hash = "sha256-tBmsy0MuJu0Ei+4lUy/XfKoOU+OuH4xqmjPv/uKVuwg="; + hash = "sha256-cYlkMnZOa0J6dOiWsWZplk/MajVRiCYe8tK3641fD0w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix index 0d6118e44c4e8..a64bc19ea2e61 100644 --- a/pkgs/development/python-modules/firebase-messaging/default.nix +++ b/pkgs/development/python-modules/firebase-messaging/default.nix @@ -6,8 +6,9 @@ buildPythonPackage, cryptography, fetchFromGitHub, + hatchling, http-ece, - poetry-core, + myst-parser, protobuf, pytest-asyncio, pytest-mock, @@ -23,16 +24,16 @@ buildPythonPackage rec { pname = "firebase-messaging"; - version = "0.3.0"; + version = "0.4.4"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "sdb9696"; repo = "firebase-messaging"; rev = "refs/tags/${version}"; - hash = "sha256-pZpnekJ11yx3L8l56vZOa4uS+jJMxUkYODgNAqysVeY="; + hash = "sha256-duUqDioIBo2QQP/4VGGwklDt4F8pDm/sHrvOx4wcTWQ="; }; outputs = [ @@ -40,20 +41,28 @@ buildPythonPackage rec { "doc" ]; + build-system = [ + hatchling + ]; + nativeBuildInputs = [ - poetry-core sphinxHook - ] ++ passthru.optional-dependencies.docs; + ] ++ optional-dependencies.docs; + + pythonRelaxDeps = [ + "http-ece" + ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp cryptography http-ece protobuf ]; - passthru.optional-dependencies = { + optional-dependencies = { docs = [ + myst-parser sphinx sphinx-autodoc-typehints sphinx-rtd-theme diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index a14f24cb8e5fd..ca122ad9c7db6 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ pbr ]; - passthru.optional-dependencies = { + optional-dependencies = { streams = [ testtools ]; }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.streams; + ] ++ optional-dependencies.streams; meta = { description = "Reusable state for writing clean tests and more"; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 8fa7a8fa99a94..624f36a7447aa 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flake8"; - version = "7.1.0"; + version = "7.1.1"; disabled = pythonOlder "3.8"; @@ -22,12 +22,12 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "flake8"; rev = version; - hash = "sha256-jkRr/k/XjiKOkcd4jlOQTnnFun7/hMHdVUWBlS1QZ1E="; + hash = "sha256-6iCZEapftHqd9okJS1wMzIjjmWahrmmZtXd7SUMVcmE="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ mccabe pycodestyle pyflakes @@ -36,6 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { + changelog = "https://github.com/PyCQA/flake8/blob/${src.rev}/docs/source/release-notes/${version}.rst"; description = "Modular source code checker: pep8, pyflakes and co"; homepage = "https://github.com/PyCQA/flake8"; license = licenses.mit; diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 38ab5efc74703..e9da4f44b6659 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -1,7 +1,6 @@ { lib, azure-storage-blob, - boto, buildPythonPackage, fetchpatch, fetchFromGitHub, @@ -53,7 +52,6 @@ buildPythonPackage rec { ]; optional-dependencies = { - aws = [ boto ]; azure = [ azure-storage-blob ]; }; diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 0f733a1b9a38c..29e997acdf9a9 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "Redis" "Memcache" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # ignore flaky test "test_cache_timeout_dynamic" "test_cached_view_class" diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 6e6fb8d2b437e..130c767c39f46 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -6,41 +6,48 @@ setuptools, setuptools-scm, flask, + zstandard, brotli, brotlicffi, pytestCheckHook, }: buildPythonPackage rec { - version = "1.14"; - pname = "Flask-Compress"; - format = "pyproject"; + version = "1.15"; + pname = "flask-compress"; + pyproject = true; src = fetchFromGitHub { owner = "colour-science"; repo = "flask-compress"; rev = "refs/tags/v${version}"; - hash = "sha256-eP6i4h+O4vkjlhfy3kyB+PY7iHVzOnRBRD8lj5yHehU="; + hash = "sha256-J7d/OIUsDWM6DoXS0P4EOE3k6txXKm6m4Yq/EJk6FRE="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ flask + zstandard ] ++ lib.optionals (!isPyPy) [ brotli ] ++ lib.optionals isPyPy [ brotlicffi ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "flask_compress" ]; - meta = with lib; { + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools_scm[toml]<8" "setuptools_scm" + ''; + + meta = { description = "Compress responses in your Flask app with gzip, deflate or brotli"; homepage = "https://github.com/colour-science/flask-compress"; changelog = "https://github.com/colour-science/flask-compress/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ nickcao ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index d05524e905fb0..00c9862355875 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -31,11 +31,11 @@ buildPythonPackage rec { werkzeug ]; - passthru.optional-dependencies.asymmetric_crypto = [ cryptography ]; + optional-dependencies.asymmetric_crypto = [ cryptography ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "flask_jwt_extended" ]; diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index 69ad443789edd..6c256c4968351 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { marshmallow ]; - passthru.optional-dependencies = { + optional-dependencies = { sqlalchemy = [ flask-sqlalchemy marshmallow-sqlalchemy ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.sqlalchemy; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.sqlalchemy; pythonImportsCheck = [ "flask_marshmallow" ]; diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 65ba830e91035..8fa9a23335613 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { mongoengine ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { wtf = [ flask-wtf wtforms diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 55f41f6f77375..85f0218fd91b5 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { "--deselect=tests/test_inputs.py::EmailTest::test_valid_value_check" "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--deselect=tests/test_inputs.py::EmailTest::test_invalid_values_check" ]; diff --git a/pkgs/development/python-modules/flask-security/default.nix b/pkgs/development/python-modules/flask-security/default.nix index 8cfc0f5996b97..558880850878e 100644 --- a/pkgs/development/python-modules/flask-security/default.nix +++ b/pkgs/development/python-modules/flask-security/default.nix @@ -46,6 +46,7 @@ peewee, pony, pytestCheckHook, + requests, zxcvbn, }: @@ -114,6 +115,7 @@ buildPythonPackage rec { peewee pony pytestCheckHook + requests zxcvbn ] ++ optional-dependencies.babel diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 7bfda242546c8..6235c3ebac39e 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-socketio"; - version = "5.3.6"; + version = "5.4.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "Flask-SocketIO"; rev = "refs/tags/v${version}"; - hash = "sha256-YjCe34Mvt7tvp3w5yH52lrq4bWi7aIYAUssNqxlQ8CA="; + hash = "sha256-owlgbw0QBUz2wCBxd1rjMI+4nPVTZ6JgmU2tL+vIj5g="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index 6574dcf1613e8..07d410fa1b17d 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; # Some of the tests use localhost networking on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # RuntimeError and NotImplementedError diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 487c2c997b8ee..09fa23575fa47 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { wtforms ]; - passthru.optional-dependencies = { + optional-dependencies = { email = [ email-validator ]; }; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index d8effec2045e5..850dba14f28e1 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { werkzeug ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ asgiref ]; dotenv = [ python-dotenv ]; }; @@ -58,7 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ greenlet ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); passthru.tests = { inherit diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index c176c825943ce..4f93bd4f8ea50 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -26,6 +25,7 @@ pytest-xdist, pytestCheckHook, tensorflow, + treescope, # optional-dependencies matplotlib, @@ -33,16 +33,14 @@ buildPythonPackage rec { pname = "flax"; - version = "0.8.5"; + version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "google"; repo = "flax"; rev = "refs/tags/v${version}"; - hash = "sha256-6WOFq0758gtNdrlWqSQBlKmWVIGe5e4PAaGrvHoGjr0="; + hash = "sha256-iDWuUJKO7V4QrbVsS4ALgy6fbllOC43o7W4mhjtZ9xc="; }; build-system = [ @@ -62,7 +60,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ matplotlib ]; }; @@ -75,6 +73,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook tensorflow + treescope ]; pytestFlagsArray = [ @@ -95,13 +94,18 @@ buildPythonPackage rec { "flax/nnx/examples/*" # See https://github.com/google/flax/issues/3232. "tests/jax_utils_test.py" - # Requires tree + # Too old version of tensorflow: + # ModuleNotFoundError: No module named 'keras.api._v2' "tests/tensorboard_test.py" ]; disabledTests = [ # ValueError: Checkpoint path should be absolute "test_overwrite_checkpoints0" + # Fixed in more recent versions of jax: https://github.com/google/flax/issues/4211 + # TODO: Re-enable when jax>0.4.28 will be available in nixpkgs + "test_vmap_and_cond_passthrough" # ValueError: vmap has mapped output but out_axes is None + "test_vmap_and_cond_passthrough_error" # AssertionError: "at vmap.*'broadcast'.*got axis spec ... ]; meta = { diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index 9f55251a2c991..9bbd11bd65b6b 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -9,23 +9,32 @@ pytestCheckHook, responses, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "flickrapi"; version = "2.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sybrenstuvel"; - repo = pname; + repo = "flickrapi"; rev = "version-${version}"; hash = "sha256-vRZrlXKI0UDdmDevh3XUngH4X8G3VlOCSP0z/rxhIgw="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace tests/test_tokencache.py \ + --replace-fail "assertEquals" "assertEqual" \ + --replace-fail "assertNotEquals" "assertNotEqual" + ''; + + build-system = [ setuptools ]; + + dependencies = [ requests requests-toolbelt requests-oauthlib @@ -61,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to the Flickr API"; homepage = "https://stuvel.eu/flickrapi"; + changelog = "https://github.com/sybrenstuvel/flickrapi/blob/version-${version}/CHANGELOG.md"; license = licenses.psfl; maintainers = with maintainers; [ obadz ]; }; diff --git a/pkgs/development/python-modules/flipr-api/default.nix b/pkgs/development/python-modules/flipr-api/default.nix index 336e16e811ed3..8b725ccc20509 100644 --- a/pkgs/development/python-modules/flipr-api/default.nix +++ b/pkgs/development/python-modules/flipr-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "flipr-api"; - version = "1.5.1"; + version = "1.6.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,12 +22,12 @@ buildPythonPackage rec { owner = "cnico"; repo = "flipr-api"; rev = "refs/tags/${version}"; - hash = "sha256-xgLi2lH+EPPNlMixqOzdBGVLuoJh5dhZ2tHZ0UH+lOk="; + hash = "sha256-/px8NuBwukAPMxdXvHdyfO/j/a9UatKbdrjDNuT0f4k="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ python-dateutil requests ]; @@ -38,6 +38,12 @@ buildPythonPackage rec { pytestCheckHook ]; + env = { + # used in test_session + FLIPR_USERNAME = "foobar"; + FLIPR_PASSWORD = "secret"; + }; + pythonImportsCheck = [ "flipr_api" ]; meta = with lib; { @@ -45,7 +51,7 @@ buildPythonPackage rec { mainProgram = "flipr-api"; homepage = "https://github.com/cnico/flipr-api"; changelog = "https://github.com/cnico/flipr-api/releases/tag/${version}"; - license = licenses.mit; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index d9c61a791615b..b926605875494 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { dependencies = [ msgpack ]; - passthru.optional-dependencies = { + optional-dependencies = { compression = [ lz4 zstandard @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest7CheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "flow.record" ]; diff --git a/pkgs/development/python-modules/fnv-hash-fast/default.nix b/pkgs/development/python-modules/fnv-hash-fast/default.nix index 0f25cc83eac21..26730aa7f434f 100644 --- a/pkgs/development/python-modules/fnv-hash-fast/default.nix +++ b/pkgs/development/python-modules/fnv-hash-fast/default.nix @@ -5,40 +5,37 @@ cython, poetry-core, setuptools, - wheel, fnvhash, + pytest-cov-stub, pytestCheckHook, }: buildPythonPackage rec { pname = "fnv-hash-fast"; - version = "0.5.0"; - format = "pyproject"; + version = "1.0.2"; + pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "fnv-hash-fast"; - rev = "v${version}"; - hash = "sha256-gAHCssJC6sTR6ftkQHrtF/5Nf9dXE4ykRhVusb0Gu3I="; + rev = "refs/tags/v${version}"; + hash = "sha256-kJQZnj1ja7cVZSDOuUI3rkNIvyH508wFKAvJ5XfwCNU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--cov=fnv_hash_fast --cov-report=term-missing:skip-covered" "" - ''; - - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools - wheel ]; - propagatedBuildInputs = [ fnvhash ]; + dependencies = [ fnvhash ]; pythonImportsCheck = [ "fnv_hash_fast" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; meta = with lib; { description = "Fast version of fnv1a"; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index c57065ec64fb2..6898f34cb1331 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { ]; plot = [ matplotlib ]; symfont = [ sympy ]; - type1 = lib.optional stdenv.isDarwin xattr; + type1 = lib.optional stdenv.hostPlatform.isDarwin xattr; pathops = [ skia-pathops ]; repacker = [ uharfbuzz ]; }; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 246c97aa9c015..3cf3b2beb1b8b 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "foolscap"; - version = "23.3.0"; + version = "24.9.0"; pyproject = true; build-system = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-Vu7oXC1brsgBwr2q59TAgx8j1AFRbi5mjRNIWZTbkUU="; + hash = "sha256-vWsAdUDbWQuG3e0oAtLq8rA4Ys2wg38fD/h+E1ViQQg="; }; postPatch = '' @@ -42,7 +42,7 @@ buildPythonPackage rec { pyopenssl ] ++ twisted.optional-dependencies.tls; - passthru.optional-dependencies = { + optional-dependencies = { i2p = [ txi2p-tahoe ]; tor = [ txtorcon ]; }; @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "foolscap" ]; diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index af7edb24ae95b..f9faef8be2bdf 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { [ tkinter ] # we currently build SuperCollider only on Linux # but FoxDot is totally usable on macOS with the official SuperCollider binary - ++ lib.optionals stdenv.isLinux [ supercollider ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ supercollider ]; # Requires a running SuperCollider instance doCheck = false; diff --git a/pkgs/development/python-modules/free-proxy/default.nix b/pkgs/development/python-modules/free-proxy/default.nix index c6d78bedfab6d..4d67d28961496 100644 --- a/pkgs/development/python-modules/free-proxy/default.nix +++ b/pkgs/development/python-modules/free-proxy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "free-proxy"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "jundymek"; repo = "free-proxy"; - rev = "refs/tags/${version}"; - hash = "sha256-82usyhUzZrdYir8puiAfaF650f0PxYJSXBE75zxYjK8="; + rev = "refs/tags/v${version}"; + hash = "sha256-5eYioshdqUC5QWHqMIU6+GvInihSOJxWvMlJ/xad/3I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix index a681bd1f14b13..9fa555e281700 100644 --- a/pkgs/development/python-modules/freud/default.nix +++ b/pkgs/development/python-modules/freud/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { matplotlib sympy ]; - disabledTests = lib.optionals stdenv.isAarch64 [ + disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [ # https://github.com/glotzerlab/freud/issues/961 "test_docstring" ]; diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix index d73e5645e5177..8bef789110cf7 100644 --- a/pkgs/development/python-modules/frida-python/default.nix +++ b/pkgs/development/python-modules/frida-python/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 7bf6d5a6d2a72..4914314384b88 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.18.21"; + version = "0.18.23"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = "frigidaire"; rev = "refs/tags/${version}"; - hash = "sha256-7fpVFKhLXBD0ec2mGfbFHygaH8BtOIOd5NoYz03IKp8="; + hash = "sha256-RzwTQRo5cIh6I8VQAJNcLg5TBiF6dAnZICGfvwCvx5Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 4ed60bd8a704f..9e49e8c420c83 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - passthru.optional-dependencies = { + optional-dependencies = { qr = [ segno ]; }; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 5941243645ef1..e0c07195df497 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { disabledTests = [ "user_data_repr" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # remove if https://github.com/PyFilesystem/pyfilesystem2/issues/430#issue-707878112 resolved "test_ftpfs" ] diff --git a/pkgs/development/python-modules/fschat/default.nix b/pkgs/development/python-modules/fschat/default.nix index d086073f1a4d0..d86fd4d91062f 100644 --- a/pkgs/development/python-modules/fschat/default.nix +++ b/pkgs/development/python-modules/fschat/default.nix @@ -63,7 +63,7 @@ buildPythonPackage { # ] ++ markdown2.optional-dependencies.all; ]; - passthru.optional-dependencies = { + optional-dependencies = { llm_judge = [ anthropic openai diff --git a/pkgs/development/python-modules/fsspec-xrootd/default.nix b/pkgs/development/python-modules/fsspec-xrootd/default.nix index 9876b51a4ec6a..73799c933f802 100644 --- a/pkgs/development/python-modules/fsspec-xrootd/default.nix +++ b/pkgs/development/python-modules/fsspec-xrootd/default.nix @@ -1,37 +1,40 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system setuptools, setuptools-scm, + + # dependencies fsspec, xrootd, + + # tests pkgs, pytestCheckHook, - stdenv, }: buildPythonPackage rec { pname = "fsspec-xrootd"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "fsspec-xrootd"; rev = "refs/tags/v${version}"; - hash = "sha256-fhamfMWlsiiqfU9c9XDfLEEkRbMAqm74rc2bGF3fRaM="; + hash = "sha256-Ge7pVrcCYNp8yNV+ZkBftLeCCSUhtO+HJHsSHT58jcs="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ fsspec xrootd ]; @@ -52,11 +55,11 @@ buildPythonPackage rec { # Timeout related tests hang indifinetely disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_basicio.py" ]; - meta = with lib; { + meta = { description = "XRootD implementation for fsspec"; homepage = "https://github.com/CoffeaTeam/fsspec-xrootd"; changelog = "https://github.com/CoffeaTeam/fsspec-xrootd/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index e423f32d799e7..8f6e77800b565 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { entrypoints = [ ]; abfs = [ adlfs ]; adl = [ adlfs ]; @@ -110,10 +110,10 @@ buildPythonPackage rec { "test_urlpath_inference_errors" "test_mismatch" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # works locally on APFS, fails on hydra with AssertionError comparing timestamps # darwin hydra builder uses HFS+ and has only one second timestamp resolution - # this two tests however, assume nanosecond resolution + # this two tests however, assume nanosecond resolution "test_modified" "test_touch" # tries to access /home, ignores $HOME diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 2ca4ab01e716a..d51041828a648 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -17,19 +17,21 @@ buildPythonPackage rec { pname = "ftfy"; - version = "6.2.0"; + version = "6.2.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XkIUPHAl75eUTKJhnWthsGGfxmVPmHcdOehiwUJMdcA="; + hash = "sha256-ebUFmI8p1XelipBpr+dVU6AqRuQt5gkcBmDNxngSutw="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ wcwidth ]; + dependencies = [ wcwidth ]; + + pythonImportsCheck = [ "ftfy" ]; nativeCheckInputs = [ versionCheckHook @@ -49,7 +51,7 @@ buildPythonPackage rec { description = "Given Unicode text, make its representation consistent and possibly less broken"; mainProgram = "ftfy"; homepage = "https://github.com/LuminosoInsight/python-ftfy"; - license = licenses.mit; + license = licenses.asl20; maintainers = with maintainers; [ aborsu ]; }; } diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix index 99c0853b461c6..ab617d6264734 100644 --- a/pkgs/development/python-modules/fugashi/default.nix +++ b/pkgs/development/python-modules/fugashi/default.nix @@ -34,9 +34,9 @@ buildPythonPackage rec { nativeCheckInputs = [ ipadic pytestCheckHook - ] ++ passthru.optional-dependencies.unidic-lite; + ] ++ optional-dependencies.unidic-lite; - passthru.optional-dependencies = { + optional-dependencies = { unidic-lite = [ unidic-lite ]; unidic = [ unidic ]; }; diff --git a/pkgs/development/python-modules/funsor/default.nix b/pkgs/development/python-modules/funsor/default.nix index 6afeeb9e4cda7..dda85f2c798d6 100644 --- a/pkgs/development/python-modules/funsor/default.nix +++ b/pkgs/development/python-modules/funsor/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { # TODO: Try to re-enable this test at next release "test_torch_save" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Failures related to JIT # RuntimeError: required keyword attribute 'Subgraph' has the wrong type "test_local_param_ok" diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index ddd6d394cd0ce..35eab496d91b1 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "fuse" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Python bindings for FUSE"; homepage = "https://github.com/libfuse/python-fuse"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 35718a54d635a..6e33666d69516 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # On macOS, users are expected to install macFUSE. This means fusepy should # be able to find libfuse in /usr/local/lib. - patchPhase = lib.optionalString (!stdenv.isDarwin) '' + patchPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace fuse.py --replace \ "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'" ''; diff --git a/pkgs/development/python-modules/fuzzyfinder/default.nix b/pkgs/development/python-modules/fuzzyfinder/default.nix index 7d183d471c73d..f5f23158a3d80 100644 --- a/pkgs/development/python-modules/fuzzyfinder/default.nix +++ b/pkgs/development/python-modules/fuzzyfinder/default.nix @@ -1,25 +1,31 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "fuzzyfinder"; - version = "2.1.0"; - format = "setuptools"; + version = "2.2.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "c56d86f110866becad6690c7518f7036c20831c0f82fc87eba8fdb943132f04b"; + src = fetchFromGitHub { + owner = "amjith"; + repo = "fuzzyfinder"; + rev = "refs/tags/v${version}"; + hash = "sha256-QWUABljgtzsZONl1klCrxEh0tPYodMOXokEb3YvWsyg="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "fuzzyfinder" ]; meta = with lib; { + changelog = "https://github.com/amjith/fuzzyfinder/blob/${src.rev}/CHANGELOG.rst"; description = "Fuzzy Finder implemented in Python"; homepage = "https://github.com/amjith/fuzzyfinder"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/fvcore/default.nix b/pkgs/development/python-modules/fvcore/default.nix index 6d00d662b0550..a3f359bad457c 100644 --- a/pkgs/development/python-modules/fvcore/default.nix +++ b/pkgs/development/python-modules/fvcore/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { pythonImportsCheck = [ "fvcore" ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; meta = with lib; { description = "Collection of common code that's shared among different research projects in FAIR computer vision team"; diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix index 359cf04b5a016..e3cf900417ac0 100644 --- a/pkgs/development/python-modules/fyta-cli/default.nix +++ b/pkgs/development/python-modules/fyta-cli/default.nix @@ -1,35 +1,49 @@ { lib, aiohttp, + aioresponses, buildPythonPackage, fetchFromGitHub, hatchling, + mashumaro, + pytest-asyncio, + pytestCheckHook, pythonOlder, + syrupy, }: buildPythonPackage rec { pname = "fyta-cli"; - version = "0.5.1"; + version = "0.6.6"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "dontinelli"; repo = "fyta_cli"; rev = "refs/tags/v${version}"; - hash = "sha256-V6yf5XFPPePQkRKyH6pyVFDsviYjnIs9g+PavCTDiZo="; + hash = "sha256-yuTfrWiGxoiEmQ1zaYM2ZrlrssZ+hCupPxar9SUP4uU="; }; build-system = [ hatchling ]; - dependencies = [ aiohttp ]; + dependencies = [ + aiohttp + mashumaro + ]; - # Module has no tests - doCheck = false; + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; pythonImportsCheck = [ "fyta_cli" ]; + pytestFlagsArray = [ "--snapshot-update" ]; + meta = with lib; { description = "Module to access the FYTA API"; homepage = "https://github.com/dontinelli/fyta_cli"; diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index 139e103d40a17..50999a139bf01 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -13,8 +13,8 @@ buildPythonPackage rec { pname = "galois"; - version = "0.4.1"; - format = "pyproject"; + version = "0.4.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,14 +22,17 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-ZNVBP/c1Q7635PbySk5Yxz7riYNLnBnJLG6AMxy/ZeA="; + hash = "sha256-DbmrrNw7XwTL4i6pJIfkBOUs+KGEmdV2FmQa1xfOHYU="; }; - nativeBuildInputs = [ - setuptools-scm + pythonRelaxDeps = [ + "numpy" + "numba" ]; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + dependencies = [ numpy numba typing-extensions @@ -40,11 +43,6 @@ buildPythonPackage rec { pytest-xdist ]; - pythonRelaxDeps = [ - "numpy" - "numba" - ]; - pythonImportsCheck = [ "galois" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/gardena-bluetooth/default.nix b/pkgs/development/python-modules/gardena-bluetooth/default.nix index d637618255275..45cbdea0d5461 100644 --- a/pkgs/development/python-modules/gardena-bluetooth/default.nix +++ b/pkgs/development/python-modules/gardena-bluetooth/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gardena-bluetooth"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,18 +23,18 @@ buildPythonPackage rec { owner = "elupus"; repo = "gardena-bluetooth"; rev = "refs/tags/${version}"; - hash = "sha256-eze99JvNSwhot8t43oy30iaFrrkpeMNFyHvfQcA56IM="; + hash = "sha256-H2v96G/mu17puq8jNyk6L9iuWUvRombPd+s6byNQ4Zw="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bleak bleak-retry-connector tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ asyncclick ]; }; diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix index 72504c986d2ef..233d12f3eac6c 100644 --- a/pkgs/development/python-modules/gb-io/default.nix +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gb_io" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/althonos/gb-io.py"; description = "Python interface to gb-io, a fast GenBank parser written in Rust"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix index 8c4252e490292..7dd4d3a2c1267 100644 --- a/pkgs/development/python-modules/gbulb/default.nix +++ b/pkgs/development/python-modules/gbulb/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gbulb" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GLib implementation of PEP 3156"; homepage = "https://github.com/beeware/gbulb"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 2c42a1008ad1b..4fcf343a71c81 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "6.1.4"; + version = "6.1.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-aKLuv/hH9ZVM8WeUwCtJ6BB2/aQh6NHJKh890hR23eM="; + hash = "sha256-qEvXSyiqTj5rLI+voieNzCUKsOxcJVhI0z3pbbL7VcQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix b/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix deleted file mode 100644 index 0cb900cffb8d9..0000000000000 --- a/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - boto, - buildPythonPackage, - fetchFromGitHub, - freezegun, - google-reauth, - httplib2, - oauth2client, - pyopenssl, - pytestCheckHook, - pythonOlder, - retry-decorator, - rsa, - six, -}: - -buildPythonPackage rec { - pname = "gcs-oauth2-boto-plugin"; - version = "3.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "GoogleCloudPlatform"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-slTxh2j9VhLiSyiTmJIFFakzpzH/+mgilDRxx0VqqKQ="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "rsa==4.7.2" "rsa" \ - --replace "version='2.7'" "version='${version}'" - ''; - - propagatedBuildInputs = [ - boto - freezegun - google-reauth - httplib2 - oauth2client - pyopenssl - retry-decorator - rsa - six - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "gcs_oauth2_boto_plugin" ]; - - meta = with lib; { - description = "Auth plugin allowing use the use of OAuth 2.0 credentials for Google Cloud Storage"; - homepage = "https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin"; - changelog = "https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/gemfileparser2/default.nix b/pkgs/development/python-modules/gemfileparser2/default.nix index 1f92395c8a293..de981df2e4aae 100644 --- a/pkgs/development/python-modules/gemfileparser2/default.nix +++ b/pkgs/development/python-modules/gemfileparser2/default.nix @@ -4,30 +4,28 @@ fetchPypi, pytestCheckHook, pythonOlder, + setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "gemfileparser2"; - version = "0.9.3"; - format = "pyproject"; + version = "0.9.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BFKJZOf0W2b0YNbKIwnrmoKGvtP8A6R9PrUt7kYC/Dk="; + hash = "sha256-ezfioBwlZMGb1cEzzwa1afXUrTnxsgpzX0CNOTyVzgY="; }; dontConfigure = true; - postPatch = '' - # https://github.com/nexB/gemfileparser2/pull/8 - substituteInPlace setup.cfg \ - --replace ">=3.6.*" ">=3.6" - ''; - - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -35,8 +33,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library to parse Rubygem gemspec and Gemfile files"; - homepage = "https://github.com/nexB/gemfileparser2"; - changelog = "https://github.com/nexB/gemfileparser2/blob/v${version}/CHANGELOG.rst"; + homepage = "https://github.com/aboutcode-org/gemfileparser2"; + changelog = "https://github.com/aboutcode-org/gemfileparser2/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ mit # or gpl3Plus diff --git a/pkgs/development/python-modules/geodatasets/default.nix b/pkgs/development/python-modules/geodatasets/default.nix index e61305cd03712..d056d10fe0571 100644 --- a/pkgs/development/python-modules/geodatasets/default.nix +++ b/pkgs/development/python-modules/geodatasets/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geodatasets"; - version = "2024.7.0"; + version = "2024.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "geopandas"; repo = "geodatasets"; rev = "refs/tags/${version}"; - hash = "sha256-DNM3DUtj+hfwiqjnCf3OSiSuuf1AbFnyCN9KPDBisyU="; + hash = "sha256-GJ7RyFlohlRz0RbQ80EewZUmIX9CJkSfUMY/uMNTtEM="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index b4a4583275878..45b9545397ab9 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "geoip2" ]; disabledTests = - lib.optionals (pythonAtLeast "3.11") [ + lib.optionals (pythonAtLeast "3.10") [ # https://github.com/maxmind/GeoIP2-python/pull/136 "TestAsyncClient" ] diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index e8e78f80acc67..4b8f06c50b08c 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -13,6 +13,17 @@ pyproj, rtree, shapely, + + # optional-dependencies + folium, + geoalchemy2, + geopy, + mapclassify, + matplotlib, + psycopg, + pyarrow, + sqlalchemy, + xyzservices, }: buildPythonPackage rec { @@ -39,12 +50,32 @@ buildPythonPackage rec { shapely ]; + optional-dependencies = { + all = [ + # prevent infinite recursion + (folium.overridePythonAttrs (prevAttrs: { + doCheck = false; + })) + geoalchemy2 + geopy + # prevent infinite recursion + (mapclassify.overridePythonAttrs (prevAttrs: { + doCheck = false; + })) + matplotlib + psycopg + pyarrow + sqlalchemy + xyzservices + ]; + }; + nativeCheckInputs = [ pytestCheckHook rtree - ]; + ] ++ optional-dependencies.all; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/geoparquet/default.nix b/pkgs/development/python-modules/geoparquet/default.nix index ce50e2484c2d1..d4b54610c506b 100644 --- a/pkgs/development/python-modules/geoparquet/default.nix +++ b/pkgs/development/python-modules/geoparquet/default.nix @@ -34,7 +34,7 @@ buildPythonPackage { ]; nativeCheckInputs = [ pytestCheckHook ]; - pythonImportCheck = "geoparquet"; + pythonImportsCheck = [ "geoparquet" ]; doCheck = false; # no tests diff --git a/pkgs/development/python-modules/getjump/default.nix b/pkgs/development/python-modules/getjump/default.nix index 153f25ad2cb11..6b6994db50716 100644 --- a/pkgs/development/python-modules/getjump/default.nix +++ b/pkgs/development/python-modules/getjump/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "getjump"; - version = "2.5.0"; + version = "2.6.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-3VxsKum6aB35XYjz9ZKkUBdPuofOWzG+ttkX9pnzu7U="; + hash = "sha256-WuAsTfOe38i90jWqOpIBYbizmb9gLtXD+ttZ1WAFDes="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 230d8f300e294..3e9c51c7dcd1d 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; # lots of: [Errno 48] Address already in use: ('127.0.0.1', 54323) - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/gftools/default.nix b/pkgs/development/python-modules/gftools/default.nix new file mode 100644 index 0000000000000..b75172ad53662 --- /dev/null +++ b/pkgs/development/python-modules/gftools/default.nix @@ -0,0 +1,207 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + pytestCheckHook, + setuptools, + setuptools-scm, + absl-py, + afdko, + axisregistry, + babelfont, + beautifulsoup4, + black, + brotli, + bumpfontversion, + coreutils, + diffenator2, + font-v, + fontbakery, + fontfeatures, + fontmake, + fonttools, + gflanguages, + gfsubsets, + glyphsets, + glyphslib, + harfbuzz, + jinja2, + nanoemoji, + networkx, + ninja, + opentype-feature-freezer, + ots-python, + packaging, + paintcompiler, + pillow, + protobuf, + pycairo, + pygit2, + pygithub, + pytest, + pyyaml, + requests, + rich, + ruamel-yaml, + skia-pathops, + statmake, + strictyaml, + tabulate, + ttfautohint-py, + ufomerge, + unidecode, + vharfbuzz, + vttlib, + python, +}: + +let + fontmake' = python.withPackages (ps: [ ps.fontmake ] ++ ps.fontmake.optional-dependencies.json); + fonttools' = python.withPackages (ps: [ ps.fonttools ] ++ ps.fonttools.optional-dependencies.ufo); +in +buildPythonPackage rec { + pname = "gftools"; + version = "0.9.71"; + pyproject = true; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "gftools"; + rev = "refs/tags/v${version}"; + hash = "sha256-YVuTozuONZbBtrst4Q+NmHxqEZa/YPVRMiagjmjcW9U="; + }; + + postPatch = '' + substituteInPlace \ + Lib/gftools/builder/operations/{buildTTF,glyphs2ds,buildVariable,buildOTF}.py \ + --replace-fail '"fontmake' '"${lib.getExe' fontmake' "fontmake"}' + + substituteInPlace \ + Lib/gftools/builder/operations/instantiateUfo.py \ + --replace-fail "'fontmake" "'${lib.getExe' fontmake' "fontmake"}" + + substituteInPlace \ + Lib/gftools/builder/operations/{compress,subspace}.py \ + --replace-fail '"fonttools' '"${lib.getExe' fonttools' "fonttools"}' + + substituteInPlace \ + Lib/gftools/builder/operations/hbsubset.py \ + --replace-fail '"pyftsubset"' '"${lib.getExe' fonttools' "pyftsubset"}"' \ + --replace-fail '"hb-subset"' '"${lib.getExe' harfbuzz "hb-subset"}"' + + substituteInPlace \ + Lib/gftools/builder/operations/autohintOTF.py \ + --replace-fail '"otfautohint' '"${lib.getExe' afdko "otfautohint"}' + + substituteInPlace \ + Lib/gftools/builder/operations/paintcompiler.py \ + --replace-fail '"paintcompiler' '"${lib.getExe paintcompiler}' + + substituteInPlace \ + Lib/gftools/builder/operations/featureFreeze.py \ + --replace-fail '"pyftfeatfreeze' '"${lib.getExe opentype-feature-freezer}' + + substituteInPlace \ + Lib/gftools/builder/operations/copy.py \ + --replace-fail '"cp' '"${lib.getExe' coreutils "cp"}' + + substituteInPlace \ + Lib/gftools/builder/operations/{fix,remap,autohint,buildStat,addSubset,remapLayout,buildVTT}.py \ + --replace-fail '"gftools' '"${placeholder "out"}/bin/gftools' + + substituteInPlace \ + Lib/gftools/builder/operations/rename.py \ + --replace-fail "'gftools" "'${placeholder "out"}t/bin/gftools" + ''; + + pythonRelaxDeps = [ + "protobuf" + "pygit2" + ]; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + absl-py + afdko + axisregistry + babelfont + beautifulsoup4 + brotli + bumpfontversion + font-v + fontfeatures + fontmake + fonttools + gflanguages + gfsubsets + glyphsets + glyphslib + jinja2 + nanoemoji + networkx + ninja + ots-python + packaging + pillow + protobuf + pygit2 + pygithub + pyyaml + requests + rich + ruamel-yaml + setuptools + skia-pathops + statmake + strictyaml + tabulate + ttfautohint-py + ufomerge + unidecode + vharfbuzz + vttlib + ] ++ fonttools.optional-dependencies.ufo ++ fontmake.optional-dependencies.json; + + optional-dependencies = { + qa = [ + diffenator2 + fontbakery + pycairo + ]; + test = [ + black + pytest + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # Wants none exsiting module + "bin/test_args.py" + # Requires internet + "tests/push/test_items.py" + "tests/test_gfgithub.py" + "tests/test_usage.py" + "tests/push/test_servers.py" + # Can't find directory + "tests/test_builder.py" + "tests/test_dependencies.py" + "tests/test_fix.py" + ]; + + pythonImportsCheck = [ "gftools" ]; + + meta = with lib; { + description = "Misc tools for working with the Google Fonts library"; + homepage = "https://github.com/googlefonts/gftools"; + changelog = "https://github.com/googlefonts/gftools/releases/tag/v${version}"; + license = licenses.asl20; + mainProgram = "gftools"; + maintainers = with maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix index f0edfa48049fa..64b96698cc62f 100644 --- a/pkgs/development/python-modules/gguf/default.nix +++ b/pkgs/development/python-modules/gguf/default.nix @@ -5,26 +5,26 @@ numpy, poetry-core, pythonOlder, + tqdm, }: buildPythonPackage rec { pname = "gguf"; - version = "0.6.0"; + version = "0.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-suIuq6KhBsGtFIGGoUrZ8pxCk1Fob+nXzhbfOaBgfmU="; + hash = "sha256-9ecJh+FbGcVF9qn3UztAM/swYzDrHzxclf0osUw/0zs="; }; dependencies = [ numpy poetry-core + tqdm ]; - doCheck = false; - meta = with lib; { description = "Module for writing binary files in the GGUF format"; homepage = "https://ggml.ai/"; diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix index 154f3b86614d3..feb509d4d87ee 100644 --- a/pkgs/development/python-modules/ghapi/default.nix +++ b/pkgs/development/python-modules/ghapi/default.nix @@ -5,12 +5,13 @@ fastcore, packaging, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "ghapi"; - version = "1.0.3"; - format = "setuptools"; + version = "1.0.6"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -18,10 +19,12 @@ buildPythonPackage rec { owner = "fastai"; repo = "ghapi"; rev = "refs/tags/${version}"; - hash = "sha256-nH3OciLhet4620WAEmm8mUAmlnpniyIsF2oIzqbZ7FI="; + hash = "sha256-ii19wuFAxMiGce37TNXRNSdvMcGWQjCfPukeqxySYnc="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ fastcore packaging ]; @@ -34,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to GitHub's API"; homepage = "https://github.com/fastai/ghapi"; + changelog = "https://github.com/fastai/ghapi/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index 5d69969fa5dce..b09f275147278 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.11.8"; + version = "0.11.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; rev = "refs/tags/v${version}"; - hash = "sha256-FTNLyCcwDU6EssQDJlwtmA7cQj57fsOaecvbpwswirU="; + hash = "sha256-04Cy4NtC3+/qv4kFcDB1aszmO6x1TguhCOF0CqxYPtw="; }; pythonRelaxDeps = [ "hishel" ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ anyio pyjwt @@ -59,7 +59,7 @@ buildPythonPackage rec { pytestCheckHook pytest-cov-stub pytest-xdist - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "githubkit" ]; diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 5dea3e4736652..11b7157f4b12b 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "glean" ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Telemetry client libraries and are a part of the Glean project"; homepage = "https://mozilla.github.io/glean/book/index.html"; license = lib.licenses.mpl20; diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index f54ccc14df0cc..b9a37779603cf 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -37,12 +37,12 @@ buildPythonPackage rec { }) ]; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace glymur/lib/tiff.py \ --replace-fail "glymur_config('c')" "ctypes.CDLL('${lib.getLib glibc}/lib/libc.so.6')" ''; - __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; + __propagatedImpureHostDeps = lib.optional stdenv.hostPlatform.isDarwin "/usr/lib/libc.dylib"; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 043fce83f167e..f490c9328fb12 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.7.2"; + version = "6.8.2"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-wiDLFRoP7MBzZuDA5drdXPS58Mhrw83xUKES3b1tBow="; + hash = "sha256-AcAk9lFueIWYsDK1ESSK6D0/i1qW7udDfUa1pFRqGQs="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index 58f4cc08f6720..713cb42faef8d 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -52,12 +52,12 @@ buildPythonPackage rec { ]; disabledTests = - lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # issue with some overflow logic "test_mpz_to_bytes" "test_mpz_from_bytes" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # TypeError: mpq() requires numeric or string argument # not sure why it only fails on Darwin "test_mpq_from_Decimal" diff --git a/pkgs/development/python-modules/gmqtt/default.nix b/pkgs/development/python-modules/gmqtt/default.nix new file mode 100644 index 0000000000000..e56b9f4cfed11 --- /dev/null +++ b/pkgs/development/python-modules/gmqtt/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + + # tests + pytestCheckHook, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "gmqtt"; + version = "0.6.16"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-3dH9wcauYE50N3z3DpnwZ+V5wDwccaas1JThmek7f6Q="; + }; + + build-system = [ setuptools ]; + + # Tests require local socket connection which is forbidden in the sandbox + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + pythonImportsCheck = [ "gmqtt" ]; + + meta = { + description = "Python MQTT v5.0 async client"; + homepage = "https://github.com/wialon/gmqtt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/gocardless-pro/default.nix b/pkgs/development/python-modules/gocardless-pro/default.nix index c87af7633b86f..575a7a0bc2d22 100644 --- a/pkgs/development/python-modules/gocardless-pro/default.nix +++ b/pkgs/development/python-modules/gocardless-pro/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "gocardless-pro"; - version = "1.53.0"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "gocardless"; repo = "gocardless-pro-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Z58akjaYuvKVQWFfiP5TZlM/+4CB/vmLzd4eWmnWV90="; + hash = "sha256-RHvGrBIDtjnLax2x7FPu0S5vizUW7dQMaQsyGPXqEh4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index ccfeaa3debacb..8d9083115fd5b 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { grpc = [ grpcio grpcio-status diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 863cf6bb6dfcf..2d4e0bed73acd 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -14,38 +14,39 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - hash = "sha256-KS0tN4M0nysHNKCgIHseHjIqwZPCwJ2PfGE/t8xQHqg="; + pname = "google_auth_oauthlib"; + inherit version; + hash = "sha256-r9DK0JKi6qU82OgphVfW3hA0xstKdAUAtTV7ZIr5cmM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-auth requests-oauthlib ]; - passthru.optional-dependencies = { + optional-dependencies = { tool = [ click ]; }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.tool; + ] ++ optional-dependencies.tool; disabledTests = [ # Flaky test. See https://github.com/NixOS/nixpkgs/issues/288424#issuecomment-1941609973. "test_run_local_server_occupied_port" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # This test fails if the hostname is not associated with an IP (e.g., in `/etc/hosts`). "test_run_local_server_bind_addr" ]; @@ -53,11 +54,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "google_auth_oauthlib" ]; meta = with lib; { - changelog = "https://github.com/googleapis/google-auth-library-python-oauthlib/blob/v${version}/CHANGELOG.md"; description = "Google Authentication Library: oauthlib integration"; homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib"; + changelog = "https://github.com/googleapis/google-auth-library-python-oauthlib/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - mainProgram = "google-oauthlib-tool"; maintainers = with maintainers; [ terlar ]; + mainProgram = "google-oauthlib-tool"; }; } diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 5556429082f11..ea25b7f2a6b66 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { rsa ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp requests @@ -75,16 +75,16 @@ buildPythonPackage rec { pytestCheckHook responses ] - ++ passthru.optional-dependencies.aiohttp - ++ passthru.optional-dependencies.enterprise_cert - ++ passthru.optional-dependencies.reauth; + ++ optional-dependencies.aiohttp + ++ optional-dependencies.enterprise_cert + ++ optional-dependencies.reauth; pythonImportsCheck = [ "google.auth" "google.oauth2" ]; - disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Disable tests using pyOpenSSL as it does not build on M1 Macs "tests/transport/test__mtls_helper.py" "tests/transport/test_requests.py" diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 83a6a8ffe478b..671a72368381b 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -10,19 +10,20 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-pbQkMSwISwK2+Ywev7avKBMvwB5dcZgX+kmeeMh+BLc="; + pname = "google_cloud_access_context_manager"; + inherit version; + hash = "sha256-O/rGqO4ub5UQWo7s9OGJCxp5Y3AuuMZV/s8CVX00joo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core protobuf ] ++ google-api-core.optional-dependencies.grpc; diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index 9fd7a92d85ec6..3f4a7b9e52ff4 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -14,19 +14,20 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.11.4"; + version = "1.11.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-Rf1kC+XSFciXMeZ2LjdkqQ0AYQZ0cdN2TvccGvOXgkk="; + pname = "google_cloud_artifact_registry"; + inherit version; + hash = "sha256-lNWDbgu9DDNRSh7cC1TfiYvy237bH16QduskPzQt9Mg="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-auth grpc-google-iam-v1 diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 350faaddb76d4..5f6c9c54f2b44 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -20,14 +20,15 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.26.2"; + version = "3.26.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-DCFDVdtuXwY7hphChHSzCTc8hw8MEohX67SRGOaRQ6A="; + pname = "google_cloud_asset"; + inherit version; + hash = "sha256-c/xmHAD8zXdi+2ifs4bHWPS2B49Fcnr4RqLfrpGwQzs="; }; build-system = [ setuptools ]; @@ -43,7 +44,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix index 113e8a0c3dda9..aa05e225fd9b8 100644 --- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -5,26 +5,30 @@ googleapis-common-protos, protobuf, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-audit-log"; - version = "0.2.5"; - format = "setuptools"; + version = "0.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-huL6ujODrcj9BKW9f9T5YLPkrtqn7ZUPL4kc4WkC62s="; + pname = "google_cloud_audit_log"; + inherit version; + hash = "sha256-kBQoslcCDYwdETPg+gBBZKVV5aOVx8o827hIZRPfOmU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ googleapis-common-protos protobuf ]; - # tests are a bit wonky to setup and are not very deep either + # Tests are a bit wonky to setup and are not very deep either doCheck = false; pythonImportsCheck = [ "google.cloud.audit" ]; diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 43c6da42b468b..83e861edd52da 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -18,25 +18,26 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.13.4"; + version = "2.13.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-NxAoob0wJKobtcEQNTgH+fylnTtJdL98h23IVNfLhew="; + pname = "google_cloud_automl"; + inherit version; + hash = "sha256-ypmK9Gq7HF2ozS6OFbAJZDPiW8sngucN86b5FHLuiTE="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; pandas = [ pandas ]; storage = [ google-cloud-storage ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 7830d012c7c72..e830e78dd09db 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -16,14 +16,15 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.15.4"; + version = "3.15.7"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-rjVTnrJIUMJsnh/vdpiiL9e4g0iZP9ftYksVQd6cG4M="; + pname = "google_cloud_bigquery_datatransfer"; + inherit version; + hash = "sha256-GLarRvI2eud/iNwj7ujZwIpK/b0ClhO0XUdBi4J9Lp0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 807c9c8acb91b..22389251e06c2 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -11,26 +11,30 @@ pyarrow, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.25.0"; - format = "setuptools"; + version = "2.26.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-GV/9KxgOnqoivqs+QKC2Hs0UbssyZnz0Immo1xEbTUg="; + pname = "google_cloud_bigquery_storage"; + inherit version; + hash = "sha256-hAJ1vQpLIHwKyCG8xnQUBv+zte+UD6BQiakOtEA0U/o="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ google-api-core protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { fastavro = [ fastavro ]; pandas = [ pandas ]; pyarrow = [ pyarrow ]; @@ -57,10 +61,10 @@ buildPythonPackage rec { meta = with lib; { description = "BigQuery Storage API API client library"; - mainProgram = "fixup_bigquery_storage_v1_keywords.py"; homepage = "https://github.com/googleapis/python-bigquery-storage"; changelog = "https://github.com/googleapis/python-bigquery-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ ]; + mainProgram = "fixup_bigquery_storage_v1_keywords.py"; }; } diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index d9ea0eba51ba7..5451d1857a652 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { python-dateutil ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { bqstorage = [ google-cloud-bigquery-storage grpcio @@ -78,7 +78,7 @@ buildPythonPackage rec { google-cloud-storage pytestCheckHook pytest-xdist - ] ++ passthru.optional-dependencies.pandas ++ passthru.optional-dependencies.ipython; + ] ++ optional-dependencies.pandas ++ optional-dependencies.ipython; # prevent google directory from shadowing google imports preCheck = '' diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 116e83effc962..fe8e5f4963604 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -17,14 +17,15 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.24.0"; + version = "2.26.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-rOdfYso8UtZhnU/3rtmCEpyuUIuvd22BszMT9PnqXtQ="; + pname = "google_cloud_bigtable"; + inherit version; + hash = "sha256-g88QrbMzNISzme+uWk0kEhfBiFxj/bmwTCaTAXYrGLc="; }; build-system = [ setuptools ]; @@ -37,7 +38,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index 1613121d34003..7535e9f3f8c10 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -14,14 +14,15 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.19.1"; + version = "1.19.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-a0pbhsLLvNpd2Q9OM4xRA/PoRgTs+wAtTss6DF1BUxs="; + pname = "google_cloud_compute"; + inherit version; + hash = "sha256-P86Cq+FOdvqqgSNNmnvh5jSy7Yon9V/u/PKxRkZ/f6s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 16794b8df65ba..386b240f6b1f8 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -15,14 +15,15 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.49.0"; + version = "2.51.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-HBZFJ5oUVS1PIS/WBm4Xt/D0S+OGuM7gV43mInN8Lv8="; + pname = "google_cloud_container"; + inherit version; + hash = "sha256-q1F+/uzyVY10pP/XrF1sL0+6o7uKfITSuZTc+NqA/Zw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index bd5fbf7ee044b..e0b052ba2fb03 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { google-api-core ]; - passthru.optional-dependencies = { + optional-dependencies = { grpc = [ grpcio ]; }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.grpc; + ] ++ optional-dependencies.grpc; # prevent google directory from shadowing google imports preCheck = '' diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 2aab9d33f9487..74cce025116a4 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -16,14 +16,15 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.19.1"; + version = "3.20.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-BqD8VvOHrJw42atKxRyaWxaA1afzTlo52LPkuEk7+8E="; + pname = "google_cloud_datacatalog"; + inherit version; + hash = "sha256-ggzQ85PzgEk4nnD9ykYd1VGPmtf2T6guAzv51SLlkmI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 456411f13f9a6..34e3ab0ceae1d 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -16,19 +16,20 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.10.0"; + version = "5.11.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-HjIv6DujcvnUPYgdr9z97VDaqpoZe6ReOA1vI7pQSWA="; + pname = "google_cloud_dataproc"; + inherit version; + hash = "sha256-6jiAOYf9eBjRMyQ9tvR3EWfnqk1MfYIUTm98Plnfkhg="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core grpc-google-iam-v1 libcst diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 44f38f1e9ba4e..e826e6c77bc3a 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -12,28 +12,32 @@ pytest-asyncio, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.19.0"; - format = "setuptools"; + version = "2.20.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-B/xYcKAmHyVGbFV8E035Wpbf0lN6vQiLnVN/ur6ZuXQ="; + pname = "google_cloud_datastore"; + inherit version; + hash = "sha256-B5ULnIhlCHxWX0X6P916BdTD2ZrfeeEMP1lv8Ip9m7o="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ google-api-core google-cloud-core proto-plus protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 6a7ddacb06494..15bbab8155a34 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.18.1"; + version = "3.22.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-KYqhwSa9Z+1s41Ve+GGbnR0BfSZE5UwAqgmqEWfxOC0="; + pname = "google_cloud_dlp"; + inherit version; + hash = "sha256-SabiX00pD91acxz83PdkDnPynLp5L9MAqKGY/IIUDAU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf @@ -41,7 +42,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # Test requires credentials + # Tests require credentials "test_inspect_content" "test_list_dlp_jobs" ]; diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 30b2aae7d6392..2c3dcdf790632 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -18,14 +18,15 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.17.1"; + version = "2.19.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-4gRp51JgDkEwBUjo9aFpBQjG1nXk0QpuwCE9L8qvwj4="; + pname = "google_cloud_firestore"; + inherit version; + hash = "sha256-Gyzm4LeRruiaHk8HK+uhASJH6Juso2Hu1yH7Rn/gVLA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 04f88778036e4..6571959153ddc 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -13,19 +13,20 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.13.4"; + version = "2.14.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-j8ZgMxoTxkDbdqSLrBP56AIBJjGvm63TViaep/Z3xZI="; + pname = "google_cloud_language"; + inherit version; + hash = "sha256-BeXnoiGavnq9TvUaMpzFy7ZMMd0CS9U3LZ+iv2GVF6k="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 9fbd08a30863a..cd8eab718411a 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -11,6 +11,7 @@ google-cloud-testutils, grpc-google-iam-v1, mock, + opentelemetry-api, pandas, proto-plus, protobuf, @@ -23,24 +24,26 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.10.0"; + version = "3.11.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-2T00c1EkDdsUz+IBmHotMs+df0eLiy+r7TAVtCWzJ08="; + pname = "google_cloud_logging"; + inherit version; + hash = "sha256-SJdEHCt09u2pGBwjqIFyI7YUWUMxSoIdZLcp0wdmyys="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-cloud-appengine-logging google-cloud-audit-log google-cloud-core grpc-google-iam-v1 + opentelemetry-api proto-plus protobuf ] ++ google-api-core.optional-dependencies.grpc; diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 5b6c969a9ce39..ff4f7bb7ed49c 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -16,14 +16,15 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.22.1"; + version = "2.22.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-2xexWvjUfaDPj7DjZfqvvNEfmqYngc4EjCmYiAiz3H0="; + pname = "google_cloud_monitoring"; + inherit version; + hash = "sha256-n8ItrEjRTdHH+4PuSlT3pXv5hS7mtcncqeO7CTsEx+4="; }; build-system = [ setuptools ]; @@ -34,7 +35,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { pandas = [ pandas ]; }; @@ -43,7 +44,7 @@ buildPythonPackage rec { mock pytestCheckHook pytest-asyncio - ] ++ passthru.optional-dependencies.pandas; + ] ++ optional-dependencies.pandas; disabledTests = [ # Test requires credentials diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index 66b341273fd2c..4fd68969054e2 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -15,14 +15,15 @@ buildPythonPackage rec { pname = "google-cloud-netapp"; - version = "0.3.11"; + version = "0.3.14"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-VFdqldB85ZP+U2CNk19nSbgRFa0UnUc0kq9oNW5nJqs="; + pname = "google_cloud_netapp"; + inherit version; + hash = "sha256-XjhNY4YG51+9OTZBj3jivgA2Del7RafXCIE/ATtyqWE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index ebc945eb848a4..569583b66649d 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -13,14 +13,15 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.11.0"; - format = "setuptools"; + version = "1.11.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-3BJDTwbIDhscHDR8rcjLQP/JYZrktcW+tcK9WFyV2X8="; + pname = "google_cloud_org_policy"; + inherit version; + hash = "sha256-E+H/y5UGlWselMwoHU4B9APkmEeQnTLxhMelowEJsa8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index e4c45f2e3fb4a..ab2af5b45cbfa 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -13,19 +13,20 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.17.4"; + version = "1.17.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-ocZ41cEZVjSfFMVoNiPOxwaymn9eylWmw6qlp/R/yMQ="; + pname = "google_cloud_os_config"; + inherit version; + hash = "sha256-O4yGoidanx9zdMb+KhjTljEjaXTC0A2kbejzL0VWTCg="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 94b11b4513fc8..dae730accaa80 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.23.0"; + version = "2.23.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_pubsub"; inherit version; - hash = "sha256-zz1vKrEbXI38CqfUyuXuHWa0CNlmbxdiycF+JpzYtlg="; + hash = "sha256-4f3nm1tktyEpCvTAIpB6/LuDUS2S9OXDNMORz7sCKss="; }; build-system = [ setuptools ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 83a14eb68c4f8..7944da13d9320 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -13,19 +13,20 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.15.4"; + version = "2.15.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-vG8+mL1A5j9Cuwzmz+aYbjmYXWlGCzriDNtQoLbwmoU="; + pname = "google_cloud_redis"; + inherit version; + hash = "sha256-0k3Ww3mznGAUQ4uQMAA+/5gTr71a8rj730cz3GXzZ2A="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 6cb795d073f36..d1dd18cd342a6 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.12.4"; + version = "1.12.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-PtqRSpJekkZe+A+qq34PepMS1IbdThI9LHbgS6xoj/A="; + pname = "google_cloud_resource_manager"; + inherit version; + hash = "sha256-t69CVEAe1O+jq6OpKcs924A/prr5GnhIXkVYNZfeWJE="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-cloud-core grpc-google-iam-v1 @@ -40,7 +41,7 @@ buildPythonPackage rec { pytestCheckHook ]; - # prevent google directory from shadowing google imports + # Prevent google directory from shadowing google imports preCheck = '' rm -r google ''; diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 3b30ec1851c89..c89f4d0576fa9 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -14,14 +14,15 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.20.1"; + version = "2.20.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-kcpPVCTYDOT1543sqCmW7jh7jI4GDRaYFpDjHjpCE4s="; + pname = "google_cloud_secret_manager"; + inherit version; + hash = "sha256-u+JIJeM0+eZ56CXnDZMhGKf/U25nwc6wSNpEERyHpFw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 1a45f67cb5df0..fb6365ec61b29 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -14,14 +14,15 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.33.0"; + version = "1.34.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-/BsKTEMKyj+dTRIutNMu3JP/DHgHBNgvJvp+ehb58nk="; + pname = "google_cloud_securitycenter"; + inherit version; + hash = "sha256-GDvl7W6gFe3c8MHtAOyjzDw/ByNnkxHe2NjgviP10LI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 421f2ade417bd..da4dbf120eb17 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.48.0"; + version = "3.49.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "googleapis"; repo = "python-spanner"; rev = "refs/tags/v${version}"; - hash = "sha256-QgLZQ0rgBEmYDAE16K84bSx4bFWJRviY1WqsVwKcO6w="; + hash = "sha256-KwANiuzVyqsz+KKTqNPM1WftuoMtUXRI8xbIdAzZF+s="; }; build-system = [ setuptools ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { sqlparse ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index fd1d084cd14f4..38e430bca5dd8 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -14,19 +14,20 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.26.1"; + version = "2.27.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-EqzrAuNMFO1J7qMQKufndt/Yciur3RRm3k2w3owfkak="; + pname = "google_cloud_speech"; + inherit version; + hash = "sha256-YXTTIcyBpYs2veboOZ11MdUBI5OVOHKkaMtmTkKGg4U="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 4a5081468f9c5..d5a4d97cf7ce0 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { protobuf = [ protobuf ]; }; diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 144f568cd484c..a5388a85cf08f 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.16.4"; + version = "2.16.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-YQM8Ht19xao7n75cjetkvgxQ4LrunZRl8/i3WyzaVbk="; + pname = "google_cloud_tasks"; + inherit version; + hash = "sha256-i9wpSgnjRkfhIKLkDdfsIIcwJNX04JOLL/DDn/N07aw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core grpc-google-iam-v1 proto-plus diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 80b22fb2ecd92..5387654ffc7c4 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -14,19 +14,20 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.16.4"; + version = "2.17.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-B7fioSbikhnSAk3WnkDLMf8IBb2uSVfcukUsatSGJAU="; + pname = "google_cloud_texttospeech"; + inherit version; + hash = "sha256-hRzD46MqUA/edzeEBh6c6l6ZYKxXaIOid19w1hNZhQo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf @@ -39,7 +40,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # Disable tests that require credentials + # Tests that require credentials "test_list_voices" "test_synthesize_speech" ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index caf839ce54c2a..18f08c81820e4 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.13.4"; + version = "1.13.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-wCO8ySoD2iAsA0ydtQki65yw1qteAHn1EUFLFhV0qdQ="; + pname = "google_cloud_trace"; + inherit version; + hash = "sha256-aJVMHEriU29cw3RzbQZc6WNwi9NcnZXvNuiz1L8HxqI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf @@ -41,7 +42,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # require credentials + # Tests require credentials "test_batch_write_spans" "test_list_traces" ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index f3cbe6abc8551..ef1a3925b957e 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -5,6 +5,7 @@ google-api-core, google-cloud-core, google-cloud-testutils, + grpc-google-iam-v1, mock, proto-plus, protobuf, @@ -16,21 +17,23 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.15.4"; + version = "3.16.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-nZ3YzyJe+fsGdahvkuecrDKVoo0JpEeeEj7wy+VHSWs="; + pname = "google_cloud_translate"; + inherit version; + hash = "sha256-B5fZVMT26gcyKelQASugg6TMl1K0MdwGJOJZTih0ae8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-cloud-core + grpc-google-iam-v1 proto-plus protobuf ] ++ google-api-core.optional-dependencies.grpc; diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index bf5358dce44cc..835a80491cd00 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.13.4"; + version = "2.13.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-bwKYqNnttZCXte51PeXdcfN6kmbJpMXq4/tNDSQLEMA="; + pname = "google_cloud_videointelligence"; + inherit version; + hash = "sha256-cpx3TA+1Ukr8rsRjN7lGCI2qWu2RoOLhXwA1TXw7+KM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 75cc08070a317..c1c89e10081b7 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -14,19 +14,20 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.7.3"; + version = "3.7.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-7kjEjoIMfgmTJmOYaXD+9FbcD0XHr3KdRvHz3ZfB37Y="; + pname = "google_cloud_vision"; + inherit version; + hash = "sha256-gLZ/Ci3Fh6MddILT0mkqdz8l+9CUaP2d5F0AtnGq2Zk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 5c55dd74169b5..880802fdbd6f9 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -14,19 +14,20 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.14.4"; + version = "1.14.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-JqI7ELEfq8MUEdk5PI94YZHUc0Hyf3V1qb1ORXPBUz4="; + pname = "google_cloud_websecurityscanner"; + inherit version; + hash = "sha256-H2yBAljtBaJ23+Y0AAi9wu5mC6sohvuJSOTNqtvGAjs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index ae1bdc82ae7f5..70d7da0936fe1 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.7.2"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-KVKoPCpMaaVMU6VqYXD7vHmhv1AS5slRobRVDDuaDHc="; + hash = "sha256-7l7Tg4sCdRtYnDwrQBA4rUIz4gO2YGf+3qn7OQRMCDc="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index d13183bacf354..49d081c8efa65 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -10,8 +10,8 @@ buildPythonPackage rec { pname = "google-i18n-address"; - version = "3.1.0"; - format = "pyproject"; + version = "3.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,12 +19,12 @@ buildPythonPackage rec { owner = "mirumee"; repo = "google-i18n-address"; rev = "refs/tags/${version}"; - hash = "sha256-dW/1wwnFDjYpym1ZaSZ7mOLpkHxsvuAHC8zBRekxWaw="; + hash = "sha256-7RqS/+6zInlhWydJwp4xf2uGpfmSdiSwvJugpL8Mlpk="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,10 +32,10 @@ buildPythonPackage rec { meta = with lib; { description = "Google's i18n address data packaged for Python"; - mainProgram = "update-validation-files"; homepage = "https://github.com/mirumee/google-i18n-address"; changelog = "https://github.com/mirumee/google-i18n-address/releases/tag/${version}"; license = licenses.bsd3; maintainers = [ ]; + mainProgram = "update-validation-files"; }; } diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index bf576a7e54235..699430682d4be 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "5.0.0"; + version = "5.0.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-1jN3X7Cxh2yX58Hup89bW16mc8F/C3CsUcz91FZHo70="; + hash = "sha256-oooWPQ4O7+FjCzIoBwm+jgGTkG7eFwekbIAEbJh44I4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-photos-library-api/default.nix b/pkgs/development/python-modules/google-photos-library-api/default.nix new file mode 100644 index 0000000000000..49feac0a0be27 --- /dev/null +++ b/pkgs/development/python-modules/google-photos-library-api/default.nix @@ -0,0 +1,49 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + google-api-python-client, + google-auth, + lib, + mashumaro, + pytest-aiohttp, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "google-photos-library-api"; + version = "0.12.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "allenporter"; + repo = "python-google-photos-library-api"; + rev = "refs/tags/${version}"; + hash = "sha256-xSwUzVwC7RPpmC9M1x/WYIaoiUlcF2h2fwiP6FYA6sw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + google-api-python-client + google-auth + mashumaro + ]; + + pythonImportsCheck = [ "google_photos_library_api" ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/allenporter/python-google-photos-library-api/releases/tag/${version}"; + description = "Python client library for Google Photos Library API"; + homepage = "https://github.com/allenporter/python-google-photos-library-api"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 504987669e7e3..bf55a48543a27 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { google-crc32c ]; - passthru.optional-dependencies = { + optional-dependencies = { requests = [ requests ]; aiohttp = [ aiohttp ]; }; @@ -40,7 +40,7 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.requests; + ] ++ optional-dependencies.requests; preCheck = '' # prevent shadowing imports diff --git a/pkgs/development/python-modules/gotailwind/default.nix b/pkgs/development/python-modules/gotailwind/default.nix index 8593c49ddc115..bc77ffb251d19 100644 --- a/pkgs/development/python-modules/gotailwind/default.nix +++ b/pkgs/development/python-modules/gotailwind/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "gotailwind"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-gotailwind"; rev = "refs/tags/v${version}"; - hash = "sha256-FRFcFn5aRg+H9M6ZwEfLO1Dwcybvs0ODQv2ruCG+4v0="; + hash = "sha256-g4wYjMJXSm7cjb5Zck1O0A+ETfqMTmiI8In26mcGhNw="; }; postPatch = '' @@ -51,7 +51,7 @@ buildPythonPackage rec { zeroconf ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer ]; }; diff --git a/pkgs/development/python-modules/govee-local-api/default.nix b/pkgs/development/python-modules/govee-local-api/default.nix index f6eabfe721afd..e2e6976b602eb 100644 --- a/pkgs/development/python-modules/govee-local-api/default.nix +++ b/pkgs/development/python-modules/govee-local-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "govee-local-api"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Galorhallen"; repo = "govee-local-api"; rev = "refs/tags/v${version}"; - hash = "sha256-pmExXQmkkjeMHegXV/b94a95qkoOHA7SJOkR1NUV4lE="; + hash = "sha256-sxxw/XAPENtNeY/64+pxnPgMBBM7+lpF52ixRm18d48="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/gptcache/default.nix b/pkgs/development/python-modules/gptcache/default.nix index 3613f16bd6068..78bd67682c4fb 100644 --- a/pkgs/development/python-modules/gptcache/default.nix +++ b/pkgs/development/python-modules/gptcache/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { description = "Semantic cache for LLMs and fully integrated with LangChain and llama_index"; mainProgram = "gptcache_server"; homepage = "https://github.com/zilliztech/GPTCache"; - changelog = "https://github.com/zilliztech/GPTCache/releases/tag/${src.rev}"; + changelog = "https://github.com/zilliztech/GPTCache/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index 161c364694e3a..9bca05da8e5ab 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -16,19 +16,23 @@ buildPythonPackage rec { pname = "gpy"; - version = "1.13.1"; + version = "1.13.2"; pyproject = true; disabled = pythonOlder "3.9"; - # 1.13.0 not on PyPI yet src = fetchFromGitHub { owner = "SheffieldML"; repo = "GPy"; rev = "refs/tags/v${version}"; - hash = "sha256-ykoGdXy1uagKrP9Nqn74mDESZwKVPq6wQgnHlCznevM="; + hash = "sha256-kggXePDKJcgw8qwLIBTxbwhiLw2H4dkx7082FguKP0Y="; }; + pythonRelaxDeps = [ + "paramz" + "scipy" + ]; + nativeBuildInputs = [ setuptools ]; buildInputs = [ cython ]; propagatedBuildInputs = [ @@ -47,14 +51,18 @@ buildPythonPackage rec { done ''; + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # Rounding difference break comparison + "TestGradientMultiOutputGPModel" + ]; + pythonImportsCheck = [ "GPy" ]; meta = with lib; { description = "Gaussian process framework in Python"; homepage = "https://sheffieldml.github.io/GPy"; - changelog = "https://github.com/SheffieldML/GPy/releases/tag/v.${version}"; + changelog = "https://github.com/SheffieldML/GPy/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; - broken = stdenv.isDarwin; # See inscrutable error message here: https://github.com/NixOS/nixpkgs/pull/107653#issuecomment-751527547 }; } diff --git a/pkgs/development/python-modules/gradio-pdf/default.nix b/pkgs/development/python-modules/gradio-pdf/default.nix index 47c175697586f..abceb8b1c5c0b 100644 --- a/pkgs/development/python-modules/gradio-pdf/default.nix +++ b/pkgs/development/python-modules/gradio-pdf/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "gradio-pdf"; - version = "0.0.13"; + version = "0.0.15"; format = "pyproject"; src = fetchPypi { pname = "gradio_pdf"; inherit version; - hash = "sha256-lxfbQSJavJQSYMGqxG7zmg/XT8V8TU2I3zGiq+B/dnw="; + hash = "sha256-R+4CDJo84/+PUTTxoz9CsZlHUVsldgjufWsRkALrfN4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 327a242a6a21c..d07f962b2668a 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -92,7 +92,7 @@ buildPythonPackage rec { #"-x" "-W" "ignore" # uncomment for debugging help ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # flaky: OSError: Cannot find empty port in range: 7860-7959 "test_layout_components_in_output" "test_layout_and_state_components_in_output" diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 45ace5ac0570a..2e59cce67546d 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.41.0"; + version = "4.44.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -72,7 +72,7 @@ buildPythonPackage rec { # We use the Pypi release, since it provides prebuilt webui assets src = fetchPypi { inherit pname version; - hash = "sha256-d4li7kQFMzlUVGdm2nTSnj25pTOWIqnZuOvTOtwPLpc="; + hash = "sha256-ovjRJ52giPZxVCOv8TuD3kcbgHbDTBqaSBNrrTN1MkE="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -127,7 +127,7 @@ buildPythonPackage rec { tomlkit ]; - passthru.optional-dependencies.oauth = [ + optional-dependencies.oauth = [ authlib itsdangerous ]; @@ -151,7 +151,7 @@ buildPythonPackage rec { # mock calls to `shutil.which(...)` (writeShellScriptBin "npm" "false") - ] ++ passthru.optional-dependencies.oauth ++ pydantic.optional-dependencies.email; + ] ++ optional-dependencies.oauth ++ pydantic.optional-dependencies.email; # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi. @@ -160,7 +160,7 @@ buildPythonPackage rec { export HOME=$TMPDIR cat ${./conftest-skip-network-errors.py} >> test/conftest.py '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # OSError: [Errno 24] Too many open files ulimit -n 4096 ''; @@ -195,7 +195,7 @@ buildPythonPackage rec { # tests if pip and other tools are installed "test_get_executable_path" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky on darwin (depend on port availability) "test_all_status_messages" "test_async_generators" diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 254b2ae16a53f..2ebc4dbfe9a2d 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { "test_should_multiplechoicefield_convert_to_list_of_enum" "test_perform_mutate_success_with_enum_choice_field" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # this test touches files in the "/" directory and fails in darwin sandbox "test_should_filepath_convert_string" ]; diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix index 487ed13ca83ff..0bc8f6f59dc0f 100644 --- a/pkgs/development/python-modules/graphrag/default.nix +++ b/pkgs/development/python-modules/graphrag/default.nix @@ -12,27 +12,25 @@ datashaper, devtools, environs, - fastparquet, graspologic, json-repair, lancedb, + matplotlib, networkx, nltk, - numba, numpy, openai, + pandas, pyaml-env, + pyarrow, pydantic, python-dotenv, pyyaml, rich, - scipy, - swifter, tenacity, - textual, tiktoken, typing-extensions, - uvloop, + umap-learn, nbformat, pytest-asyncio, pytestCheckHook, @@ -40,14 +38,14 @@ buildPythonPackage rec { pname = "graphrag"; - version = "0.3.1"; + version = "0.3.6"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "graphrag"; rev = "refs/tags/v${version}"; - hash = "sha256-97X9a3ietWDc5UgdgQ2ZSc7DPDEi96LxfO5aVZMNOfg="; + hash = "sha256-H5ITK4m3l+rlIEYXoMIpsE9faCu6rRZuB5zaZQeArOU="; }; build-system = [ @@ -66,27 +64,25 @@ buildPythonPackage rec { datashaper devtools environs - fastparquet graspologic json-repair lancedb + matplotlib networkx nltk - numba numpy openai + pandas pyaml-env + pyarrow pydantic python-dotenv pyyaml rich - scipy - swifter tenacity - textual tiktoken typing-extensions - uvloop + umap-learn ]; env.NUMBA_CACHE_DIR = "$TMPDIR"; diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index 7ecdeb1adf846..5b3f70dcc1f3e 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -1,14 +1,17 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pytestCheckHook, - pythonOlder, colorama, + distutils, + fetchFromGitHub, + fickling, intervaltree, json5, + pytestCheckHook, + pythonOlder, pyyaml, scipy, + setuptools, tqdm, typing-extensions, }: @@ -16,24 +19,27 @@ buildPythonPackage rec { pname = "graphtage"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "trailofbits"; - repo = pname; + repo = "graphtage"; rev = "refs/tags/v${version}"; hash = "sha256-Bz2T8tVdVOdXt23yPITkDNL46Y5LZPhY3SXZ5bF3CHw="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "json5==0.9.5" "json5>=0.9.5" - ''; + pythonRelaxDeps = [ "json5" ]; + + build-system = [ + distutils + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ colorama + fickling intervaltree json5 pyyaml @@ -48,10 +54,10 @@ buildPythonPackage rec { meta = with lib; { description = "Utility to diff tree-like files such as JSON and XML"; - mainProgram = "graphtage"; homepage = "https://github.com/trailofbits/graphtage"; changelog = "https://github.com/trailofbits/graphtage/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ veehaitch ]; + mainProgram = "graphtage"; }; } diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 2bf0cfe01c114..7ce60f9f06ff8 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { ''; # Too many failures due to attempting to connect to com.apple.fonts daemon - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Simple Python interface for Graphviz"; diff --git a/pkgs/development/python-modules/great-tables/default.nix b/pkgs/development/python-modules/great-tables/default.nix new file mode 100644 index 0000000000000..bca215084c168 --- /dev/null +++ b/pkgs/development/python-modules/great-tables/default.nix @@ -0,0 +1,89 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + babel, + commonmark, + htmltools, + importlib-metadata, + importlib-resources, + numpy, + typing-extensions, + + # tests + ipykernel, + ipython, + pandas, + polars, + pyarrow, + pytestCheckHook, + pytest-cov-stub, + requests, + shiny, + syrupy, +}: + +buildPythonPackage rec { + pname = "great-tables"; + version = "0.11.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "posit-dev"; + repo = "great-tables"; + rev = "refs/tags/v${version}"; + hash = "sha256-IlukgnhOT8NF1WxRJCnNuNEI31DByWoNzbk/x458atA="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + babel + commonmark + htmltools + importlib-metadata + importlib-resources + numpy + typing-extensions + ]; + + pythonImportsCheck = [ "great_tables" ]; + + nativeCheckInputs = [ + ipykernel + ipython + pandas + polars + pyarrow + pytestCheckHook + pytest-cov-stub + requests + shiny + syrupy + ]; + + disabledTests = [ + # require selenium with chrome driver: + "test_save_image_file" + "test_save_non_png" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "Library for rendering and formatting dataframes"; + homepage = "https://github.com/posit-dev/great-tables"; + changelog = "https://github.com/posit-dev/great-tables/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index 9383ec903700c..2ed9792df3b23 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "greatfet"; - version = "2024.0.1"; + version = "2024.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "greatscottgadgets"; repo = "greatfet"; rev = "refs/tags/v${version}"; - hash = "sha256-AKpaJZJTzMY3IQXLvVnLWh3IHeGp759z6tvaBl28BHQ="; + hash = "sha256-1GfyhxwA6Nhf/umvllR/hkh5hyn42141QOT7+6IGAis="; }; sourceRoot = "${src.name}/host"; diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 3970ef993cb59..50aa51e82e927 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Discover, connect and control Gree based minisplit systems"; homepage = "https://github.com/cmroche/greeclimate"; changelog = "https://github.com/cmroche/greeclimate/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/greek-accentuation/default.nix b/pkgs/development/python-modules/greek-accentuation/default.nix new file mode 100644 index 0000000000000..a40448f569a9b --- /dev/null +++ b/pkgs/development/python-modules/greek-accentuation/default.nix @@ -0,0 +1,19 @@ +{ + buildPythonPackage, + lib, + fetchPypi, +}: +buildPythonPackage rec { + pname = "greek-accentuation"; + version = "1.2.0"; + src = fetchPypi { + inherit pname version; + hash = "sha256-l2HZXdqlLubvy2bWhhZVYGMpF0DXVKTDFehkcGF5xdk="; + }; + meta = with lib; { + description = "Python 3 library for accenting (and analyzing the accentuation of) Ancient Greek words"; + homepage = "https://github.com/jtauber/greek-accentuation"; + license = licenses.mit; + maintainers = with maintainers; [ kmein ]; + }; +} diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 59494d65f7539..6bc84c1e56778 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "1.2.0"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-oxZZIfzPsGs2hhVRdWEvPhIR5JwTMAmO5VgEQHzBO90="; + hash = "sha256-IDIacG1FM/JidHV76PGTaPnkIfulAli8+YLuiuPHdZ8="; }; build-system = [ pdm-backend ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; }; diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 7d859b3af7cd5..acd09b1eb425c 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -9,20 +9,15 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.64.1"; - format = "setuptools"; + version = "1.65.1"; + pyproject = true; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-crNVC5GtuDVGVuzw9tHUYRKZBEuuEfsefMHRu2a4wes="; + hash = "sha256-JM/+i8kPuCN/C88kC9bHAwQlX+J7adsyYBSZoEP4cb4="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'protobuf>=4.21.6,<5.0dev' 'protobuf' - ''; - outputs = [ "out" "dev" @@ -30,7 +25,14 @@ buildPythonPackage rec { enableParallelBuilding = true; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ + "protobuf" + "grpcio" + ]; + + dependencies = [ protobuf grpcio setuptools diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 44c591d783a28..5dc26d50be2b5 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS=1 fi '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' unset AR ''; diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 8913ba789f484..e0b270c95c076 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,27 +4,33 @@ cython, fetchFromGitHub, numpy, + numpy_2, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "gsd"; - version = "3.3.1"; - format = "setuptools"; + version = "3.3.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "glotzerlab"; - repo = pname; + repo = "gsd"; rev = "refs/tags/v${version}"; - hash = "sha256-9C66k3OI+Xw+DPe8ZxuQmOiXmPWDTvJ2tVLHhfsEhgU="; + hash = "sha256-4NxZPu4DrwQW6qHeYairefabfN7J0+48tvVwi6ti4vk="; }; - nativeBuildInputs = [ cython ]; + build-system = [ + cython + numpy_2 + setuptools + ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index efcc03f3bc2bd..034300b2b3183 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "6.1.2"; + version = "6.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-hvT4e1l3MTT3WMDSfKvZ7BU8dzkzgPROHrnx5mKyCR4="; + hash = "sha256-ZMzgIRLwMXvJ+JIz3BUps7CTaV/MhfjZYqkEbgHQh+A="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 08683996db8dd..525cfa3208a69 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -53,10 +53,10 @@ buildPythonPackage rec { dependencies = [ decorator ]; - buildInputs = lib.optionals stdenv.isDarwin [ GSS ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ GSS ]; # k5test is marked as broken on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ k5test diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix index cd0897ee20eda..754d7109c6929 100644 --- a/pkgs/development/python-modules/guidance/default.nix +++ b/pkgs/development/python-modules/guidance/default.nix @@ -79,6 +79,9 @@ buildPythonPackage rec { "test_recursion_error" "test_openai_class_detection" "test_openai_chat_without_roles" + + # flaky tests + "test_remote_mock_gen" # frequently fails when building packages in parallel ]; disabledTestPaths = [ @@ -97,7 +100,7 @@ buildPythonPackage rec { meta = with lib; { description = "Guidance language for controlling large language models"; homepage = "https://github.com/guidance-ai/guidance"; - changelog = "https://github.com/guidance-ai/guidance/releases/tag/${src.rev}"; + changelog = "https://github.com/guidance-ai/guidance/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index 83b45412b0ffe..f478acffb27ef 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -50,7 +50,7 @@ buildPythonPackage { 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath ${libgumath}/lib $out/${python.sitePackages}/gumath/_gumath.*.so ''; diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix index 5cb114c51490c..d7642559e537f 100644 --- a/pkgs/development/python-modules/gymnasium/default.nix +++ b/pkgs/development/python-modules/gymnasium/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { # marked as broken and throws an error during evaluation if the package is evaluated anyway. # disabling checks on Darwin avoids this and allows the package to be built. # if jaxlib is ever fixed on Darwin, remove this. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTestPaths = [ # mujoco is required for those tests but the mujoco python bindings are not packaged in nixpkgs. diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index ad9fb88eb7bac..b8d52cd944c49 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { hash = "sha256-LUlF2VhRnuDwJLdITgmXIQV/IuKdx1KXQkiPVHKrl4Q="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./no-darwin-cflags.patch ./no-xcode.patch ]; diff --git a/pkgs/development/python-modules/h5io/default.nix b/pkgs/development/python-modules/h5io/default.nix index 9e32bdefeaeb0..f41e815a6f21d 100644 --- a/pkgs/development/python-modules/h5io/default.nix +++ b/pkgs/development/python-modules/h5io/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Read and write simple Python objects using HDF5"; homepage = "https://github.com/h5io/h5io"; - changelog = "https://github.com/h5io/h5io/releases/tag/${src.rev}"; + changelog = "https://github.com/h5io/h5io/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.bsd3; maintainers = with maintainers; [ mbalatsko ]; }; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 13a464dccb4c2..14f7532f8c56d 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -7,7 +7,6 @@ setuptools, numpy, hdf5, - pythonRelaxDepsHook, cython_0, pkgconfig, mpi4py ? null, @@ -15,7 +14,6 @@ pytestCheckHook, pytest-mpi, cached-property, - stdenv, }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -67,7 +65,6 @@ buildPythonPackage rec { preBuild = lib.optionalString mpiSupport "export CC=${lib.getDev mpi}/bin/mpicc"; nativeBuildInputs = [ - pythonRelaxDepsHook cython_0 pkgconfig setuptools diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 170a29ef8cf92..a23e54ff53fda 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -11,15 +11,15 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, - wheel, }: buildPythonPackage rec { pname = "habluetooth"; - version = "3.1.3"; + version = "3.4.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,19 +28,13 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-HG2G/ymSw6e03KJOB/F5ja2Cv5nD+nPgOjMHPCYNSH8="; + hash = "sha256-qmb7hfrcKWSs1dkyozuTPsVbI0cjVAJ9Em0JIIKsyck="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=habluetooth --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ cython poetry-core setuptools - wheel ]; dependencies = [ @@ -54,6 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/handy-archives/default.nix b/pkgs/development/python-modules/handy-archives/default.nix new file mode 100644 index 0000000000000..6bafb066cb57c --- /dev/null +++ b/pkgs/development/python-modules/handy-archives/default.nix @@ -0,0 +1,30 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + flit-core, +}: +buildPythonPackage rec { + pname = "handy-archives"; + version = "0.2.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "handy_archives"; + hash = "sha256-+6IRAf2eKdXjtygjJhqq4GuTUGhvDSBneG1k3Oc+s/Y="; + }; + + build-system = [ flit-core ]; + + dependencies = + [ + ]; + + meta = { + description = "Some handy archive helpers for Python."; + homepage = "https://github.com/domdfcoding/handy-archives"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyberius-prime ]; + }; +} diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 97b5c1f480e30..8c7ae2b3bc2c6 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { zeroconf ]; - passthru.optional-dependencies.QRCode = [ + optional-dependencies.QRCode = [ base36 pyqrcode ]; @@ -48,7 +48,7 @@ buildPythonPackage rec { pytest-asyncio pytest-timeout pytestCheckHook - ] ++ passthru.optional-dependencies.QRCode; + ] ++ optional-dependencies.QRCode; disabledTestPaths = [ # Disable tests requiring network access diff --git a/pkgs/development/python-modules/harlequin-bigquery/default.nix b/pkgs/development/python-modules/harlequin-bigquery/default.nix new file mode 100644 index 0000000000000..e43e00a4b3b27 --- /dev/null +++ b/pkgs/development/python-modules/harlequin-bigquery/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + google-cloud-bigquery, + google-cloud-bigquery-storage, +}: + +buildPythonPackage rec { + pname = "harlequin-bigquery"; + version = "1.0.2"; + pyproject = true; + + src = fetchPypi { + pname = "harlequin_bigquery"; + inherit version; + hash = "sha256-uIPYhK4R6N7pqsKY2GozkG76WI+gru2unsK5BxO4+/Y="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + google-cloud-bigquery + google-cloud-bigquery-storage + ]; + + # To prevent circular dependency + # as harlequin-bigquery requires harlequin which requires harlequin-bigquery + doCheck = false; + pythonRemoveDeps = [ + "harlequin" + ]; + + meta = { + description = "A Harlequin adapter for Google BigQuery"; + homepage = "https://pypi.org/project/harlequin-bigquery/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + }; +} diff --git a/pkgs/development/python-modules/harlequin-postgres/default.nix b/pkgs/development/python-modules/harlequin-postgres/default.nix new file mode 100644 index 0000000000000..65ec22fb04aab --- /dev/null +++ b/pkgs/development/python-modules/harlequin-postgres/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + psycopg, +}: + +buildPythonPackage rec { + pname = "harlequin-postgres"; + version = "0.4.0"; + pyproject = true; + + src = fetchPypi { + pname = "harlequin_postgres"; + inherit version; + hash = "sha256-1y8S3z6ZTt+PZg75aB/bKnEPdAtqjZ2IqyBtUBk8IFA="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + psycopg + psycopg.pool + ]; + + # To prevent circular dependency + # as harlequin-postgres requires harlequin which requires harlequin-postgres + doCheck = false; + pythonRemoveDeps = [ + "harlequin" + ]; + + meta = { + description = "A Harlequin adapter for Postgres"; + homepage = "https://pypi.org/project/harlequin-postgres/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + }; +} diff --git a/pkgs/development/python-modules/hass-client/default.nix b/pkgs/development/python-modules/hass-client/default.nix new file mode 100644 index 0000000000000..29b1a94965c2a --- /dev/null +++ b/pkgs/development/python-modules/hass-client/default.nix @@ -0,0 +1,56 @@ +{ + aiodns, + aiohttp, + brotli, + buildPythonPackage, + faust-cchardet, + fetchFromGitHub, + lib, + orjson, + setuptools, +}: + +buildPythonPackage rec { + pname = "hass-client"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "music-assistant"; + repo = "python-hass-client"; + rev = "refs/tags/${version}"; + hash = "sha256-FA3acaXLWcBMDsabLPxVk6EArSxcTAnmFeO1ixTXB1Q="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + aiohttp + ]; + + optional-dependencies = { + speedups = [ + aiodns + brotli + faust-cchardet + orjson + ]; + }; + + pythonImportsCheck = [ + "hass_client" + ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/music-assistant/python-hass-client/releases/tag/${version}"; + description = "Basic client for connecting to Home Assistant over websockets and REST"; + homepage = "https://github.com/music-assistant/python-hass-client"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index 5d3a7876e9545..0d8aaa732636b 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -138,7 +138,7 @@ buildPythonPackage rec { env.HOME = "$(mktemp -d)"; - passthru.optional-dependencies = { + optional-dependencies = { # all = [ # farm-haystack # ]; @@ -262,7 +262,7 @@ buildPythonPackage rec { longDescription = '' LLM orchestration framework to build customizable, production-ready LLM applications. Connect components (models, vector DBs, file converters) to pipelines or agents that can interact with your data. With advanced retrieval methods, it's best suited for building RAG, question answering, semantic search or conversational agent chatbots ''; - changelog = "https://github.com/deepset-ai/haystack/releases/tag/${src.rev}"; + changelog = "https://github.com/deepset-ai/haystack/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; homepage = "https://github.com/deepset-ai/haystack"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/development/python-modules/hcs-utils/default.nix b/pkgs/development/python-modules/hcs-utils/default.nix index a69622a440d4f..646e6a636cce7 100644 --- a/pkgs/development/python-modules/hcs-utils/default.nix +++ b/pkgs/development/python-modules/hcs-utils/default.nix @@ -2,38 +2,45 @@ lib, buildPythonPackage, fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, six, - glibcLocales, - pytest, + versioneer, }: buildPythonPackage rec { pname = "hcs-utils"; version = "2.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "hcs_utils"; inherit version; - sha256 = "04xq69hrys8lf9kp8pva0c4aphjjfw412km7c32ydkwq0i59rhp2"; + hash = "sha256-4sKcSgSYz+bFYKdOEQh3UsKrCANqX3RnchRpn2EyuBM="; }; - LC_ALL = "en_US.UTF-8"; - - checkPhase = '' - # root does not has /root as home in sandbox - py.test -k 'not test_expand' hcs_utils/test + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py ''; - buildInputs = [ - six - glibcLocales + build-system = [ + setuptools + versioneer ]; - nativeCheckInputs = [ pytest ]; + + dependencies = [ six ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ "test_expand" ]; meta = with lib; { description = "Library collecting some useful snippets"; - homepage = "https://pypi.python.org/pypi/hcs_utils/1.3"; + homepage = "https://gitlab.com/hcs/hcs_utils"; license = licenses.isc; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix index fd7bff5d3e02e..5e139ab76cce7 100644 --- a/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/pkgs/development/python-modules/hdf5plugin/default.nix @@ -2,21 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + py-cpuinfo, h5py, }: buildPythonPackage rec { pname = "hdf5plugin"; - version = "4.4.0"; - format = "setuptools"; + version = "5.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "silx-kit"; repo = "hdf5plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-MnqY1PyGzo31H696J9CekiA2rJrUYzUMDC3UJMZaFLA="; + hash = "sha256-6lEU8ZGJKazDqloel5QcaXAbNGzV1fAbAjYC/hFUOdI="; }; + build-system = [ + setuptools + py-cpuinfo + ]; + dependencies = [ h5py ]; checkPhase = '' diff --git a/pkgs/development/python-modules/hf-transfer/default.nix b/pkgs/development/python-modules/hf-transfer/default.nix new file mode 100644 index 0000000000000..6a526c59be7d5 --- /dev/null +++ b/pkgs/development/python-modules/hf-transfer/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cargo, + pkg-config, + rustPlatform, + rustc, + + # buildInputs + openssl, + stdenv, + darwin, + libiconv, +}: + +buildPythonPackage rec { + pname = "hf-transfer"; + version = "0.1.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = "hf_transfer"; + rev = "refs/tags/v${version}"; + hash = "sha256-Uh8q14OeN0fYsywYyNrH8C3wq/qRjQKEAIufi/a5RXA="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-I4APdz1r2KJ8pTfKAg8g240wYy8gtMlHwmBye4796Tk="; + }; + + build-system = [ + cargo + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + libiconv + ]; + + pythonImportsCheck = [ "hf_transfer" ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; + + meta = { + description = "High speed download python library"; + homepage = "https://github.com/huggingface/hf_transfer"; + changelog = "https://github.com/huggingface/hf_transfer/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/hfst/default.nix b/pkgs/development/python-modules/hfst/default.nix index 06e2ed94bb033..37869ffad3e3e 100644 --- a/pkgs/development/python-modules/hfst/default.nix +++ b/pkgs/development/python-modules/hfst/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { setupPyBuildFlags = [ "--inplace" ]; # Find foma in Darwin tests - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${foma}/lib" ''; diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index ee69705614c91..976961d2164be 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { sha256 = "sha256-bA6XumsFmjCdUbSVqPDV77zqh1a2QNmLb2u5/e8kWKw="; }; - nativeBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + nativeBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; propagatedBuildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ libusb1 udev ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit @@ -37,7 +37,7 @@ buildPythonPackage rec { ); # Fix the USB backend library lookup - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' libusb=${libusb1.dev}/include/libusb-1.0 test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index 25148892a0b40..646ba22abda5f 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pydicom ]; - passthru.optional-dependencies = { + optional-dependencies = { libjpeg = [ pylibjpeg pylibjpeg-libjpeg @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.libjpeg; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.libjpeg; preCheck = '' export HOME=$TMP/test-home mkdir -p $HOME/.pydicom/ diff --git a/pkgs/development/python-modules/hikari-lightbulb/default.nix b/pkgs/development/python-modules/hikari-lightbulb/default.nix index 9fb3952ce0a77..a87c5fb7c2d4f 100644 --- a/pkgs/development/python-modules/hikari-lightbulb/default.nix +++ b/pkgs/development/python-modules/hikari-lightbulb/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hikari ]; - passthru.optional-dependencies = { + optional-dependencies = { crontrigger = [ croniter ]; }; diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index 026176e7a7b8d..709b9cde7f495 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -4,13 +4,12 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, - pytest-runner, aiohttp, attrs, multidict, colorlog, pynacl, - pytest-cov, + pytest-cov-stub, pytest-randomly, pytest-asyncio, mock, @@ -46,15 +45,14 @@ buildPythonPackage rec { pythonRelaxDeps = true; - passthru.optional-dependencies = { + optional-dependencies = { server = [ pynacl ]; }; nativeCheckInputs = [ pytestCheckHook - pytest-runner pytest-asyncio - pytest-cov + pytest-cov-stub pytest-randomly mock ]; diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index 0edd09dc64ac8..f997fba130ac6 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.0.30"; + version = "0.0.33"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-+ine7Q60dT9GyFWGHtbH6G1E4TzTQaY5y9Yxxxbgnp8="; + hash = "sha256-zi+13X7u2pk9w2EoYjfl3/Y8O5hHpA0wZx3sSv2vU6U="; }; build-system = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { dependencies = [ httpx ]; - passthru.optional-dependencies = { + optional-dependencies = { redis = [ redis ]; s3 = [ boto3 ]; sqlite = [ anysqlite ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trio - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "hishel" ]; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index df4237a8e9a6b..12c868ea1f44b 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.55"; + version = "0.57"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-4TJgXY0n7UMr5dGuhfE7WqPCgEBfvb0QUxJNYdaAOLE="; + hash = "sha256-/aijcDD0gzg217NuD7A9qdgArek1fHWjb2SfA2H4gww="; }; build-system = [ diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index e48cc94bccc4f..248a2f8cb258f 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -49,13 +49,9 @@ buildPythonPackage rec { "-DBUILD_HPMC=${onOffBool components.hpmc}" "-DBUILD_MD=${onOffBool components.md}" "-DBUILD_METAL=${onOffBool components.metal}" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python.sitePackages}" ]; - preConfigure = '' - # Since we can't expand $out in `cmakeFlags` - cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out/${python.sitePackages}" - ''; - # tests fail but have tested that package runs properly doCheck = false; checkTarget = "test"; diff --git a/pkgs/development/python-modules/horizon-eda/default.nix b/pkgs/development/python-modules/horizon-eda/default.nix index 2741dbc3675ab..f1b64a71ae32b 100644 --- a/pkgs/development/python-modules/horizon-eda/default.nix +++ b/pkgs/development/python-modules/horizon-eda/default.nix @@ -33,13 +33,13 @@ buildPythonPackage { nativeBuildInputs = base.nativeBuildInputs; - buildFlags = [ "pymodule" ]; + ninjaFlags = [ "horizon.so" ]; installPhase = '' runHook preInstall mkdir -p $out/${python.sitePackages} - cp build/horizon.so $out/${python.sitePackages} + cp horizon.so $out/${python.sitePackages} runHook postInstall ''; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 53995d2de5d70..4a716b8b037b2 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, appdirs, buildPythonPackage, @@ -7,6 +6,7 @@ colorama, cssselect, fetchFromGitHub, + fetchpatch, keep, lxml, pygments, @@ -15,23 +15,36 @@ rich, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "howdoi"; version = "2.0.20"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "gleitz"; - repo = pname; - rev = "v${version}"; + repo = "howdoi"; + rev = "refs/tags/v${version}"; hash = "sha256-u0k+h7Sp2t/JUnfPqRzDpEA+vNXB7CpyZ/SRvk+B9t0="; }; - propagatedBuildInputs = [ + patches = [ + # Bad test case fix: comparing hardcoded string to internet search result + # PR merged: https://github.com/gleitz/howdoi/pull/497 + # Please remove on the next release + (fetchpatch { + url = "https://github.com/gleitz/howdoi/commit/7d24e9e1c87811a6e66d60f504381383cf1ac3fd.patch"; + hash = "sha256-AFQMnMEijaExqiimbNaVeIRmZJ4Yj0nGUOEjfsvBLh8="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ appdirs cachelib colorama @@ -50,15 +63,25 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - disabledTests = [ "test_colorize" ]; + disabledTests = [ + "test_colorize" + # Tests are flaky, OSError: [Errno 24] Too many open files happpens + "test_answer_links_using_l_option" + "test_answers_bing" + "test_answers" + "test_json_output" + "test_missing_pre_or_code_query" + "test_multiple_answers" + "test_position" + "test_unicode_answer" + ]; pythonImportsCheck = [ "howdoi" ]; meta = with lib; { - broken = stdenv.isDarwin; - changelog = "https://github.com/gleitz/howdoi/blob/v${version}/CHANGES.txt"; description = "Instant coding answers via the command line"; homepage = "https://github.com/gleitz/howdoi"; + changelog = "https://github.com/gleitz/howdoi/blob/v${version}/CHANGES.txt"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 64ed6cba12e97..dacb9e2dcaaf6 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2024.8.1"; + version = "2024.10.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-zVBwV+pCmZAnTJi8oyTCs9FxUktDFOxctGeB8fZcsfw="; + hash = "sha256-so693xMgVb7pUoin3oYT26F02/C5KeVCuPQjOAJ6axQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/html2image/default.nix b/pkgs/development/python-modules/html2image/default.nix index 4d7252b1c3055..bcf78da3db8f1 100644 --- a/pkgs/development/python-modules/html2image/default.nix +++ b/pkgs/development/python-modules/html2image/default.nix @@ -9,25 +9,25 @@ buildPythonPackage rec { pname = "html2image"; - version = "2.0.4.3"; + version = "2.0.5"; pyproject = true; src = fetchFromGitHub { owner = "vgalin"; repo = "html2image"; - rev = version; - hash = "sha256-BDl2Kibp1WOAOYNlXa2aaEgQTitk+OZu72OgytciZYI="; + rev = "refs/tags/${version}"; + hash = "sha256-k5y89nUF+fhUj9uzTAPkkAdOb2TsTL2jm/ZXwHlxu/A="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api \ - --replace "poetry>=" "poetry-core>=" + --replace-fail poetry.masonry.api poetry.core.masonry.api \ + --replace-fail "poetry>=" "poetry-core>=" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ requests websocket-client ]; diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix index 7ba14ca5e7147..adfeb0b7949e1 100644 --- a/pkgs/development/python-modules/htmldate/default.nix +++ b/pkgs/development/python-modules/htmldate/default.nix @@ -5,7 +5,7 @@ charset-normalizer, dateparser, faust-cchardet, - fetchPypi, + fetchFromGitHub, lxml, pytestCheckHook, python-dateutil, @@ -16,14 +16,16 @@ buildPythonPackage rec { pname = "htmldate"; - version = "1.8.1"; + version = "1.9.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-yvFobPdcYd0fBh7eXXpG51mxXV+Zh82OE8jEI3URJj0="; + src = fetchFromGitHub { + owner = "adbar"; + repo = "htmldate"; + rev = "refs/tags/v${version}"; + hash = "sha256-sddPlVaYenR8sQG/ronkYIcVH5nyQzcjF8rfeMr5I78="; }; build-system = [ setuptools ]; @@ -34,9 +36,9 @@ buildPythonPackage rec { lxml python-dateutil urllib3 - ] ++ lib.optionals (pythonOlder "3.7") [ backports-datetime-fromisoformat ]; + ]; - passthru.optional-dependencies = { + optional-dependencies = { speed = [ faust-cchardet @@ -55,11 +57,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - # disable tests that require an internet connection disabledTests = [ + # Tests that require an internet connection "test_input" "test_cli" "test_download" + "test_readme_examples" ]; pythonImportsCheck = [ "htmldate" ]; diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 4b670b4c17bde..ef9fe211f55c4 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { werkzeug ]; - passthru.optional-dependencies = { + optional-dependencies = { mainapp = [ gunicorn gevent diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index b1d64e6526be4..979fe3b3ef516 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { h11 ]; - passthru.optional-dependencies = { + optional-dependencies = { asyncio = [ anyio ]; http2 = [ h2 ]; socks = [ socksio ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-httpbin pytest-trio pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "httpcore" ]; diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix index aba7e3fe32c13..86b4e4e51224f 100644 --- a/pkgs/development/python-modules/httpie/default.nix +++ b/pkgs/development/python-modules/httpie/default.nix @@ -2,45 +2,51 @@ lib, stdenv, buildPythonPackage, - fetchFromGitHub, - installShellFiles, - pandoc, - # BuildInputs charset-normalizer, defusedxml, + fetchFromGitHub, + installShellFiles, multidict, - pygments, - requests, - requests-toolbelt, - setuptools, - rich, + pandoc, pip, + pygments, pytest-httpbin, pytest-lazy-fixture, pytest-mock, pytestCheckHook, + requests-toolbelt, + requests, responses, + rich, + setuptools, werkzeug, }: buildPythonPackage rec { pname = "httpie"; - version = "3.2.2"; - format = "setuptools"; + version = "3.2.3"; + pyproject = true; src = fetchFromGitHub { owner = "httpie"; repo = "httpie"; - rev = version; - hash = "sha256-hPsjEpvT6tnPm68AUB2Tv3Gon4DfSzO2VYCGqP8ozSI="; + rev = "refs/tags/${version}"; + hash = "sha256-ogUqhMVY1fm+hKCMFYqfYsqHX+Gj6y8CMOUsxA3q29g="; }; + pythonRelaxDeps = [ + "defusedxml" + "requests" + ]; + + build-system = [ setuptools ]; + nativeBuildInputs = [ installShellFiles pandoc ]; - propagatedBuildInputs = [ + dependencies = [ charset-normalizer defusedxml multidict @@ -81,36 +87,23 @@ buildPythonPackage rec { pythonImportsCheck = [ "httpie" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ - # flaky + disabledTestPaths = [ + # Tests are flaky "tests/test_plugins_cli.py" ]; disabledTests = [ - # flaky + # Test is flaky "test_stdin_read_warning" - # Re-evaluate those tests with the next release - "test_duplicate_keys_support_from_response" - "test_invalid_xml" - "test_json_formatter_with_body_preceded_by_non_json_data" - "test_pretty_options_with_and_without_stream_with_converter" - "test_response_mime_overwrite" - "test_terminal_output_response_charset_detection" - "test_terminal_output_response_charset_override" - "test_terminal_output_response_content_type_charset_with_stream" - "test_terminal_output_response_content_type_charset" - "test_valid_xml" - "test_xml_format_options" - "test_xml_xhtm" # httpbin compatibility issues "test_compress_form" "test_binary_suppresses_when_terminal" "test_binary_suppresses_when_not_terminal_but_pretty" "test_binary_included_and_correct_when_suitable" ] - ++ lib.optionals stdenv.isDarwin [ - # flaky + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Test is flaky "test_daemon_runner" ]; diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 67e38601cfa51..a6c3e42a5317f 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { "test_head_301" "test_303" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails with "ConnectionResetError: [Errno 54] Connection reset by peer" "test_connection_close" # fails with HTTP 408 Request Timeout, instead of expected 200 OK diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 64049235003aa..97d65fafa3f2a 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { python-socks ]; - passthru.optional-dependencies = { + optional-dependencies = { asyncio = [ async-timeout ]; trio = [ trio ]; }; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 4d4c264ea015e..0a32af68bab9d 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { sniffio ]; - passthru.optional-dependencies = { + optional-dependencies = { http2 = [ h2 ]; socks = [ socksio ]; brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; @@ -68,7 +68,7 @@ buildPythonPackage rec { }; # trustme uses pyopenssl - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); nativeCheckInputs = [ chardet @@ -78,7 +78,7 @@ buildPythonPackage rec { pytest-trio trustme uvicorn - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # testsuite wants to find installed packages for testing entrypoint preCheck = '' diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index 11d41ca0334d0..5b50ba6b2566f 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "huey"; - version = "2.5.1"; + version = "2.5.2"; format = "pyproject"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0oiYmLOwUsZjq7mR0nXwS00VVsLWOXY25whw6262uEo="; + hash = "sha256-0X4gUIFqkE4GLW5Eqbolpk7KZdsvjkRxD20YmLPG11A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 213d4f2f4e0b7..6573cdd1ac893 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -19,16 +18,14 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.24.6"; + version = "0.25.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-1W+hfe2m5mXidbepVPMObnOZH6LCQG9dvFRbo9iUjKg="; + hash = "sha256-MloCUtvJ3A7t6NbCCPp4kcR+7apTrIjbvm6Ppe0SgdA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index a7a6525e942da..0c69762ec8f1e 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -19,7 +19,9 @@ buildPythonPackage rec { # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent # segfaults in the testsuite that end up failing the tests in a background thread (in myapp) - nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (!stdenv.isDarwin) [ watchdog ]; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ]; disabledTestPaths = [ # Doesn't work with an exported home, RuntimeError: timeout waiting for change to file=/build/tmpgfn145cx diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index fb506ab96f3c4..70f8b48fce924 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hwi"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bitcoin-core"; repo = "HWI"; rev = "refs/tags/${version}"; - hash = "sha256-hpMH3Zy3/TTBYUukJQZw63f0KuE3O9G2aYcGdL6Q3eM="; + hash = "sha256-sQqft+5M+X+91bFqpUrbDRrFzpe/l1+w+pnIHwqezR8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index 8a8b29315f8e5..a07181cdcd2eb 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hy"; - version = "0.29.0"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hylang"; repo = "hy"; rev = "refs/tags/${version}"; - hash = "sha256-8b2V78mwzSThmVl1SfMGBw8VSpE5rCuucnIyD0nq5To="; + hash = "sha256-o6txdC8TOdaILAJP9LDAhJ587p+mw0bUEGLneQQYW9c="; }; # https://github.com/hylang/hy/blob/1.0a4/get_version.py#L9-L10 diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index a69c0c08214e4..c53c3c2e3670c 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -1,5 +1,6 @@ { lib, + black, buildPythonPackage, fetchPypi, hypothesis, @@ -7,59 +8,45 @@ libcst, parso, pytestCheckHook, + pytest-cov-stub, pytest-xdist, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "hypothesmith"; version = "0.3.3"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-lsFIAtbI6F2JdSZBdoeNtUso0u2SH9v+3C5rjOPIFxY="; }; - patches = [ ./remove-black.patch ]; + build-system = [ setuptools ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "lark-parser" "lark" - - substituteInPlace tox.ini \ - --replace "--cov=hypothesmith" "" \ - --replace "--cov-branch" "" \ - --replace "--cov-report=term-missing:skip-covered" "" \ - --replace "--cov-fail-under=100" "" - ''; - - propagatedBuildInputs = [ + dependencies = [ hypothesis lark libcst ]; nativeCheckInputs = [ + black parso pytestCheckHook + pytest-cov-stub pytest-xdist ]; - pytestFlagsArray = [ "-v" ]; - disabledTests = [ - # https://github.com/Zac-HD/hypothesmith/issues/21 + # super slow "test_source_code_from_libcst_node_type" ]; - disabledTestPaths = [ - # missing blib2to3 - "tests/test_syntactic.py" - ]; - pythonImportsCheck = [ "hypothesmith" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/hypothesmith/remove-black.patch b/pkgs/development/python-modules/hypothesmith/remove-black.patch deleted file mode 100644 index d37222ef4b2ce..0000000000000 --- a/pkgs/development/python-modules/hypothesmith/remove-black.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/tests/test_cst.py b/tests/test_cst.py -index 8532240..bdba2d7 100644 ---- a/tests/test_cst.py -+++ b/tests/test_cst.py -@@ -3,7 +3,6 @@ import ast - from inspect import isabstract - from operator import attrgetter - --import black - import libcst - import parso - import pytest -@@ -51,27 +50,6 @@ def test_ast_unparse_from_nodes(source_code): - assert ast.dump(first) == ast.dump(second) - - --@pytest.mark.xfail --@example("A\u2592", black.Mode()) --@given( -- source_code=hypothesmith.from_node(), -- mode=st.builds( -- black.Mode, -- line_length=st.just(88) | st.integers(0, 200), -- string_normalization=st.booleans(), -- is_pyi=st.booleans(), -- ), --) --def test_black_autoformatter_from_nodes(source_code, mode): -- try: -- result = black.format_file_contents(source_code, fast=False, mode=mode) -- except black.NothingChanged: -- pass -- else: -- with pytest.raises(black.NothingChanged): -- black.format_file_contents(result, fast=False, mode=mode) -- -- - @given(source_code=hypothesmith.from_node()) - def test_from_node_always_compilable(source_code): - compile(source_code, "<string>", "exec") -diff --git a/tests/test_syntactic.py b/tests/test_syntactic.py -index 7fe9835..17c4f7c 100644 ---- a/tests/test_syntactic.py -+++ b/tests/test_syntactic.py -@@ -3,7 +3,6 @@ import ast - import io - import tokenize - --import black - import blib2to3 - import parso - import pytest -@@ -58,34 +57,6 @@ def test_ast_unparse_from_grammar(source_code): - assert ast.dump(first) == ast.dump(second) - - --@example("\\", black.Mode()) --@example("A#\r#", black.Mode()) --@given( -- source_code=hypothesmith.from_grammar(), -- mode=st.builds( -- black.Mode, -- line_length=st.just(88) | st.integers(0, 200), -- string_normalization=st.booleans(), -- is_pyi=st.booleans(), -- ), --) --def test_black_autoformatter_from_grammar(source_code, mode): -- try: -- result = black.format_file_contents(source_code, fast=False, mode=mode) -- except black.NothingChanged: -- pass -- except blib2to3.pgen2.tokenize.TokenError: -- # Fails to tokenise e.g. "\\", though compile("\\", "<string>", "exec") works. -- # See https://github.com/psf/black/issues/1012 -- reject() -- except black.InvalidInput: -- # e.g. "A#\r#", see https://github.com/psf/black/issues/970 -- reject() -- else: -- with pytest.raises(black.NothingChanged): -- black.format_file_contents(result, fast=False, mode=mode) -- -- - @given(source_code=hypothesmith.from_grammar("eval_input")) - def test_eval_input_generation(source_code): - compile(source_code, filename="<string>", mode="eval") diff --git a/pkgs/development/python-modules/hyrule/default.nix b/pkgs/development/python-modules/hyrule/default.nix index 3229e5137ea12..d62e3ab517a1d 100644 --- a/pkgs/development/python-modules/hyrule/default.nix +++ b/pkgs/development/python-modules/hyrule/default.nix @@ -4,27 +4,24 @@ fetchFromGitHub, hy, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "hyrule"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "hylang"; repo = "hyrule"; rev = "refs/tags/${version}"; - hash = "sha256-pmJhhOpNxVEUH8YwBUKSywYgYu43oLSmpWJM4HXGMiI="; + hash = "sha256-w1Q2w/P1bDt/F1+zTkUFi5PxycXXE3p0qadfBcyWElg="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ hy ]; + dependencies = [ hy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 8f62f52f6536a..2ad38a1ea4acd 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -6,6 +6,7 @@ makeWrapper, setuptools, numpy, + scipy, distutils, pytestCheckHook, mock, @@ -32,7 +33,10 @@ buildPythonPackage rec { makeWrapper ]; - dependencies = [ numpy ]; + dependencies = [ + numpy + scipy + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index abaabb11f1bb1..16f3e395e7620 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -5,20 +5,19 @@ pythonOlder, pytestCheckHook, atpublic, - bidict, black, clickhouse-connect, dask, datafusion, db-dtypes, duckdb, + fetchpatch, filelock, geopandas, google-cloud-bigquery, google-cloud-bigquery-storage, graphviz, hypothesis, - multipledispatch, numpy, oracledb, packaging, @@ -57,25 +56,24 @@ }: let testBackends = [ - "datafusion" "duckdb" - "pandas" "sqlite" + "datafusion" ]; ibisTestingData = fetchFromGitHub { name = "ibis-testing-data"; owner = "ibis-project"; repo = "testing-data"; - # https://github.com/ibis-project/ibis/blob/9.1.0/nix/overlay.nix#L20-L26 - rev = "6737d1cb5951cabaccd095a3ae62a93dbd11ecb9"; - hash = "sha256-MoVTZPWh4KVlrICYACrgfeLdl/fqoa1iweNg3zUtdrs="; + # https://github.com/ibis-project/ibis/blob/9.5.0/nix/overlay.nix#L20-L26 + rev = "b26bd40cf29004372319df620c4bbe41420bb6f8"; + sha256 = "sha256-1fenQNQB+Q0pbb0cbK2S/UIwZDE4PXXG15MH3aVbyLU="; }; in buildPythonPackage rec { pname = "ibis-framework"; - version = "9.1.0"; + version = "9.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -85,9 +83,18 @@ buildPythonPackage rec { repo = "ibis"; owner = "ibis-project"; rev = "refs/tags/${version}"; - hash = "sha256-GmzmXzYMs7K7B//is3ZoD4muPAkb0tM56zFBbsA+NEo="; + hash = "sha256-6ebw/E3jZFMHKqC5ZY//2Ke0NrklyoGp5JGKBfDxy40="; }; + patches = [ + # remove after the 10.0 release + (fetchpatch { + name = "ibis-framework-duckdb-1.1.1.patch"; + url = "https://github.com/ibis-project/ibis/commit/a54eceabac1d6592e9f6ab0ca7749e37a748c2ad.patch"; + hash = "sha256-j5BPYVqnEF9GQV5N3/VhFUCdsEwAIOQC0KfZ5LNBSRg="; + }) + ]; + nativeBuildInputs = [ poetry-core poetry-dynamic-versioning @@ -98,16 +105,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ atpublic - bidict - multipledispatch - numpy - pandas parsy - pyarrow - pyarrow-hotfix python-dateutil pytz - rich sqlglot toolz typing-extensions @@ -124,13 +124,17 @@ buildPythonPackage rec { pytest-randomly pytest-snapshot pytest-timeout + # this dependency is still needed due to use of strict markers and + # `pytest.mark.xdist_group` in the ibis codebase pytest-xdist - ] ++ lib.concatMap (name: passthru.optional-dependencies.${name}) testBackends; + ] ++ lib.concatMap (name: optional-dependencies.${name}) testBackends; + + dontUsePytestXdist = true; pytestFlagsArray = [ - "--dist=loadgroup" "-m" - "'${lib.concatStringsSep " or " testBackends} or core'" + # tpcds and tpch are slow, so disable them + "'not tpcds and not tpch and (${lib.concatStringsSep " or " testBackends} or core)'" ]; disabledTests = [ @@ -142,6 +146,7 @@ buildPythonPackage rec { "test_register_sqlite" # requires network connection "test_s3_403_fallback" + "test_hugging_face" # requires pytest 8.2+ "test_roundtrip_delta" ]; @@ -167,54 +172,139 @@ buildPythonPackage rec { pythonImportsCheck = [ "ibis" ] ++ map (backend: "ibis.backends.${backend}") testBackends; - passthru = { - optional-dependencies = { - bigquery = [ - db-dtypes - google-cloud-bigquery - google-cloud-bigquery-storage - pydata-google-auth - ]; - clickhouse = [ clickhouse-connect ]; - dask = [ - dask - regex - packaging - ]; - datafusion = [ datafusion ]; - druid = [ pydruid ]; - duckdb = [ duckdb ]; - flink = [ ]; - geospatial = [ - geopandas - shapely - ]; - mssql = [ pyodbc ]; - mysql = [ pymysql ]; - oracle = [ - oracledb - packaging - ]; - pandas = [ - regex - packaging - ]; - polars = [ - polars - packaging - ]; - postgres = [ psycopg2 ]; - pyspark = [ - pyspark - packaging - ]; - snowflake = [ snowflake-connector-python ]; - sqlite = [ regex ]; - trino = [ trino-python-client ]; - visualization = [ graphviz ]; - decompiler = [ black ]; - examples = [ pins ] ++ pins.optional-dependencies.gcs; - }; + optional-dependencies = { + bigquery = [ + db-dtypes + google-cloud-bigquery + google-cloud-bigquery-storage + pyarrow + pyarrow-hotfix + pydata-google-auth + numpy + pandas + rich + ]; + clickhouse = [ + clickhouse-connect + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + datafusion = [ + datafusion + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + druid = [ + pydruid + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + duckdb = [ + duckdb + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + flink = [ + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + geospatial = [ + geopandas + shapely + ]; + mssql = [ + pyodbc + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + mysql = [ + pymysql + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + oracle = [ + oracledb + packaging + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + polars = [ + polars + packaging + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + postgres = [ + psycopg2 + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + pyspark = [ + pyspark + packaging + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + snowflake = [ + snowflake-connector-python + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + sqlite = [ + regex + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + trino = [ + trino-python-client + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + visualization = [ graphviz ]; + decompiler = [ black ]; + examples = [ pins ] ++ pins.optional-dependencies.gcs; }; meta = with lib; { diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 9acf56259bc87..81ce3ddee218a 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -7,7 +7,6 @@ python-dateutil, pythonAtLeast, pythonOlder, - pythonRelaxDepsHook, requests, responses, setuptools, @@ -29,8 +28,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - dependencies = [ pyjwt python-dateutil diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 53eaa42d30c0f..e021c6574a85e 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ical"; - version = "8.1.1"; + version = "8.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; rev = "refs/tags/${version}"; - hash = "sha256-b0laQRDATmx4401bJKkdHsfT9gpMff8vGaZJ9l8O7w4="; + hash = "sha256-9mnyhDKcZTZAGRxojQN9I9ZAgBmsSSsBPzCMZO6Rl5k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix index 7cbffd265e8f2..8c08395906764 100644 --- a/pkgs/development/python-modules/icalevents/default.nix +++ b/pkgs/development/python-modules/icalevents/default.nix @@ -5,7 +5,6 @@ pythonOlder, pytestCheckHook, poetry-core, - datetime, httplib2, icalendar, python-dateutil, @@ -14,24 +13,23 @@ buildPythonPackage rec { pname = "icalevents"; - version = "0.1.27"; + version = "0.1.29"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jazzband"; - repo = pname; + repo = "icalevents"; rev = "refs/tags/v${version}"; - hash = "sha256-vSYQEJFBjXUF4WwEAtkLtcO3y/am00jGS+8Vj+JMMqQ="; + hash = "sha256-Bp+Wz88q65Gem8LyRz0A4xE5hIgOD+iZ7E1UlnfFiD4="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - datetime + dependencies = [ httplib2 icalendar python-dateutil @@ -39,7 +37,6 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "datetime" "httplib2" "icalendar" "pytz" diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index 7076732ba63c8..090886d2ddda2 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "icontract"; - version = "2.6.6"; + version = "2.7.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Parquery"; repo = "icontract"; rev = "refs/tags/v${version}"; - hash = "sha256-R5/FBfuTvXItfTlNZMSnO18Q+etnHbQyXFWpaOpOLes="; + hash = "sha256-7mRQ1g2mllHIaZh0jEd/iCgaDja1KJXuRnamhDo/Pbo="; }; preCheck = '' diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 5ffd7c74df529..a04317e4ed9ed 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = "identify"; rev = "refs/tags/v${version}"; - hash = "sha256-ZusDe675QdQyiiGSdmWT+l1jGEGXEY+Dobm4y20WWX8="; + hash = "sha256-EbJiMTDE9eumhkWTXlcB38rHrX5DPAZdqix2H4ocnkE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 6e17149079cf6..f9b1fb66ec202 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Open source IFC library and geometry engine"; homepage = "http://ifcopenshell.org/"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index d1bac885264fc..26009c97d47e4 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -1,23 +1,25 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + pythonOlder, + setuptools, pytestCheckHook, pytest-xdist, torchvision, - pythonOlder, matplotlib, mock, packaging, torch, - scikit-learn, - tqdm, }: buildPythonPackage rec { pname = "ignite"; version = "0.5.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pytorch"; @@ -26,6 +28,13 @@ buildPythonPackage rec { hash = "sha256-J0xrqAGwH0bAs59T7zA8irMWOGbE2+Zd9kwqxYUYYMA="; }; + build-system = [ setuptools ]; + + dependencies = [ + packaging + torch + ]; + nativeCheckInputs = [ pytestCheckHook matplotlib @@ -33,12 +42,6 @@ buildPythonPackage rec { pytest-xdist torchvision ]; - propagatedBuildInputs = [ - packaging - torch - scikit-learn - tqdm - ]; # runs successfully in 3.9, however, async isn't correctly closed so it will fail after test suite. doCheck = pythonOlder "3.9"; @@ -76,10 +79,24 @@ buildPythonPackage rec { "visdom" ]; - meta = with lib; { + pythonImportsCheck = [ + "ignite" + "ignite.engine" + "ignite.handlers" + "ignite.metrics" + "ignite.distributed" + "ignite.exceptions" + "ignite.utils" + "ignite.contrib" + ]; + + meta = { description = "High-level training library for PyTorch"; - homepage = "https://pytorch.org/ignite"; - license = licenses.bsd3; - maintainers = [ maintainers.bcdarwin ]; + homepage = "https://pytorch-ignite.ai"; + changelog = "https://github.com/pytorch/ignite/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.bcdarwin ]; + # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 3f13cf77b7293..48983a575805a 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { dependencies = [ texttable ]; - passthru.optional-dependencies = { + optional-dependencies = { cairo = [ cairocffi ]; matplotlib = [ matplotlib ]; plotly = [ plotly ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ "testAuthorityScore" diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index ff87abcfa20aa..bf7b81b05dadb 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ihm"; - version = "1.3"; + version = "1.6"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-ywZdhumFFeImODeFn8VYD0CR1DZMlAg52wMNRjEItec="; + hash = "sha256-G6u1z0bPC6EDVMLL9oCWi2B7AEj4UikGnSDQ8AOpuMA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/pkgs/development/python-modules/imagecodecs-lite/default.nix index cca83672a31d6..b21b80c7c6949 100644 --- a/pkgs/development/python-modules/imagecodecs-lite/default.nix +++ b/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -29,7 +29,8 @@ buildPythonPackage rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Block-oriented, in-memory buffer transformation, compression, and decompression functions"; homepage = "https://www.lfd.uci.edu/~gohlke/"; maintainers = [ maintainers.tbenst ]; diff --git a/pkgs/development/python-modules/imagededup/default.nix b/pkgs/development/python-modules/imagededup/default.nix index b12d6a7b2f01f..e6152a3d586aa 100644 --- a/pkgs/development/python-modules/imagededup/default.nix +++ b/pkgs/development/python-modules/imagededup/default.nix @@ -88,7 +88,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://idealo.github.io/imagededup/"; - changelog = "https://github.com/idealo/imagededup/releases/tag/${src.rev}"; + changelog = "https://github.com/idealo/imagededup/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; description = "Finding duplicate images made easy"; license = licenses.asl20; maintainers = with maintainers; [ stunkymonkey ]; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 145d08730fe40..47018744c6b45 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { hash = "sha256-WeoZE2TPBAhzBBcZNQqoiqvribMCLSZWk/XpdMydvCQ="; }; - patches = lib.optionals (!stdenv.isDarwin) [ + patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ (substituteAll { src = ./libgl-path.patch; libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -100,7 +100,7 @@ buildPythonPackage rec { "tests/test_swf.py" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Segmentation fault "test_bayer_write" # RuntimeError: No valid H.264 encoder was found with the ffmpeg installation diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index e3bdcc2a059e9..09ebc40b7abb6 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.12.3"; + version = "0.12.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WwB5agFBnpECvUJeJ8MZ1Y0fbPLfp1HgLtf07fZ8PBs="; + hash = "sha256-gVO6OF0pawfZfgkBomJKhsBrSMlML5LaOlNUgnaXt6M="; }; nativeBuildInputs = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { threadpoolctl ]; - passthru.optional-dependencies = { + optional-dependencies = { optional = [ keras pandas diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 1a887a87d29b0..62efb51697af6 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { (substituteAll { src = ./default-icc-profile.patch; srgbProfile = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "/System/Library/ColorSync/Profiles/sRGB Profile.icc" else # break runtime dependency chain all of colord dependencies @@ -65,7 +65,9 @@ buildPythonPackage rec { # FIXME: Only add "sRGB Profile.icc" to __impureHostDeps once # https://github.com/NixOS/nix/issues/9301 is fixed. - __impureHostDeps = lib.optionals stdenv.isDarwin [ "/System/Library/ColorSync/Profiles" ]; + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ + "/System/Library/ColorSync/Profiles" + ]; nativeCheckInputs = [ exiftool diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 477e6f06a1246..17fa94212c770 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.29.1"; + version = "2.30.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-R00Q6y+SS5Mg9vcJPkwUnQo4wSTQQZwSoHo+ypQt4CU="; + hash = "sha256-jeC4K7azOBFls46VdhoCcBiaAIPNuS4VTfFlfsZRmkA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index 8cd34b50f8283..b9ca971b1e4c8 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -8,6 +8,7 @@ ldap3, ldapdomaindump, pyasn1, + pyasn1-modules, pycryptodomex, pyopenssl, pythonOlder, @@ -18,16 +19,18 @@ buildPythonPackage rec { pname = "impacket"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7kA5tNKu3o9fZEeLxZ+qyGA2eWviTeqNwY8An7CQXko="; + hash = "sha256-iVh9G4NqUiDXSEjJNHV5YrOCiG3KixtKDETWk/JgBkM="; }; + pythonRelaxDeps = [ "pyopenssl" ]; + build-system = [ setuptools ]; dependencies = [ @@ -37,6 +40,7 @@ buildPythonPackage rec { ldap3 ldapdomaindump pyasn1 + pyasn1-modules pycryptodomex pyopenssl setuptools diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix index 7dec7e5dadd07..369495b96e29a 100644 --- a/pkgs/development/python-modules/import-expression/default.nix +++ b/pkgs/development/python-modules/import-expression/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { psfl ]; mainProgram = "import-expression"; - maintainers = with lib.maintainers; [ lychee ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/inference-gym/default.nix b/pkgs/development/python-modules/inference-gym/default.nix new file mode 100644 index 0000000000000..dd1a854b92c92 --- /dev/null +++ b/pkgs/development/python-modules/inference-gym/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchPypi, +}: + +buildPythonPackage rec { + pname = "inference-gym"; + version = "0.0.4"; + format = "wheel"; + + src = fetchPypi { + inherit format version; + pname = "inference_gym"; + dist = "py3"; + python = "py3"; + hash = "sha256-bpi/IB8PuLPIKoTjmBeVl/4XGvE/yyG8WYxNqNcruvE="; + }; + + pythonImportsCheck = [ "inference_gym" ]; + + # The package does not ship any test. + doCheck = false; + + meta = { + description = "Place to exercise inference methods to help make them faster, leaner and more robust"; + homepage = "https://github.com/tensorflow/probability/tree/main/spinoffs/inference_gym"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 21792943efacd..9360f6d780100 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.45.0"; + version = "1.46.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Mhbje/wRltU04jrDQBZVG4OuGdBn20gmBRnnPqyzjcU="; + hash = "sha256-oq6VXsCizqs7ZGocFWvD6SK1HRgQerlAEDW6+SBoM+A="; }; build-system = [ setuptools ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiocsv aiohttp diff --git a/pkgs/development/python-modules/influxdb3-python/default.nix b/pkgs/development/python-modules/influxdb3-python/default.nix index e54b39c03846f..6c96217d9efd8 100644 --- a/pkgs/development/python-modules/influxdb3-python/default.nix +++ b/pkgs/development/python-modules/influxdb3-python/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "influxdb3-python"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "InfluxCommunity"; repo = "influxdb3-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Knub5rZ27OXsiJanA+sI85DaUIskiGcuedKk1wF5zss="; + hash = "sha256-4P+bQEldyBNh4qsIkoZLXnUOrQ5wVGbr55xbS0oQMMM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index c796a01369532..2435c7e467868 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -68,7 +68,7 @@ buildPythonPackage { "test_extract_multiple" "test_lookup_and" ] - ++ lib.optional stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isDarwin [ "test_image_extract" "test_path_number_nodes" "test_plotter" # Hangs diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index 8b65de7cfe35a..63db32d65b53e 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -20,21 +20,21 @@ buildPythonPackage rec { pname = "inquirer"; - version = "3.2.5"; - format = "pyproject"; + version = "3.3.0"; + pyproject = true; disabled = pythonOlder "3.8"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "magmax"; repo = "python-inquirer"; rev = "refs/tags/v${version}"; - hash = "sha256-7No4Yw0zBGflvglx7G1/yjrsU/DkTrSz93DfIzokBYM="; + hash = "sha256-M4EgQ/DX00CtAXRNvXoVKVWxj1jRpnNdG4qxOv20/MI="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ blessed editor readchar diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix index 31207450761fd..b6b51142e80e4 100644 --- a/pkgs/development/python-modules/instructor/default.nix +++ b/pkgs/development/python-modules/instructor/default.nix @@ -1,38 +1,42 @@ { lib, - aiohttp, - anthropic, buildPythonPackage, - docstring-parser, fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + aiohttp, + docstring-parser, jiter, openai, - poetry-core, pydantic, - pytest-examples, - pytest-asyncio, - pytestCheckHook, - fastapi, - diskcache, - redis, - pythonOlder, rich, tenacity, typer, + + # tests + anthropic, + diskcache, + fastapi, + google-generativeai, + jinja2, + pytest-asyncio, + pytestCheckHook, + redis, }: buildPythonPackage rec { pname = "instructor"; - version = "1.3.7"; + version = "1.5.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "jxnl"; repo = "instructor"; rev = "refs/tags/${version}"; - hash = "sha256-XouTXv8wNPPBKVs2mCue1o4hfHlPlq6uXBuDXiZLIHI="; + hash = "sha256-UrLbKDaQu2ioQHqKKS8SdRTpQj+Z0w+bcLrRuZT3DC0="; }; pythonRelaxDeps = [ @@ -57,12 +61,13 @@ buildPythonPackage rec { nativeCheckInputs = [ anthropic - fastapi - redis diskcache + fastapi + google-generativeai + jinja2 pytest-asyncio - pytest-examples pytestCheckHook + redis ]; pythonImportsCheck = [ "instructor" ]; @@ -72,6 +77,9 @@ buildPythonPackage rec { "successfully" "test_mode_functions_deprecation_warning" "test_partial" + + # Requires unpackaged `vertexai` + "test_json_preserves_description_of_non_english_characters_in_json_mode" ]; disabledTestPaths = [ @@ -80,12 +88,12 @@ buildPythonPackage rec { "tests/llm/" ]; - meta = with lib; { + meta = { description = "Structured outputs for llm"; homepage = "https://github.com/jxnl/instructor"; changelog = "https://github.com/jxnl/instructor/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mic92 ]; mainProgram = "instructor"; }; } diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 80907730ffcf4..7ee914aca70f3 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -59,9 +59,9 @@ buildPythonPackage rec { nativeCheckInputs = [ intake-parquet pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); - passthru.optional-dependencies = { + optional-dependencies = { server = [ msgpack python-snappy @@ -124,7 +124,8 @@ buildPythonPackage rec { # Timing-based, flaky on darwin and possibly others "test_idle_timer" ] - ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") + ++ lib.optionals + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ # Flaky with older low-res mtime on darwin < 10.13 (#143987) "test_second_load_timestamp" diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix index 968669ec92bcc..445774979df72 100644 --- a/pkgs/development/python-modules/invisible-watermark/default.nix +++ b/pkgs/development/python-modules/invisible-watermark/default.nix @@ -72,7 +72,8 @@ buildPythonPackage rec { let testName = "${if withOnnx then "withOnnx" else "withoutOnnx"}-${method}"; # This test fails in the sandbox on aarch64-linux, see https://github.com/microsoft/onnxruntime/issues/10038 - skipTest = stdenv.isLinux && stdenv.isAarch64 && withOnnx && method == "rivaGan"; + skipTest = + stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 && withOnnx && method == "rivaGan"; in lib.optionalAttrs (!skipTest) { "${testName}" = callPackage ./tests/cli.nix { diff --git a/pkgs/development/python-modules/invisible-watermark/tests/cli.nix b/pkgs/development/python-modules/invisible-watermark/tests/cli.nix index 89de1174384a9..a1563d67c7169 100644 --- a/pkgs/development/python-modules/invisible-watermark/tests/cli.nix +++ b/pkgs/development/python-modules/invisible-watermark/tests/cli.nix @@ -1,7 +1,7 @@ { image, method, - python3Packages, + invisible-watermark, runCommand, testName, withOnnx, @@ -25,7 +25,7 @@ let else "fnörd1"; length = (builtins.stringLength message) * 8; - invisible-watermark' = python3Packages.invisible-watermark.override { inherit withOnnx; }; + invisible-watermark' = invisible-watermark.override { inherit withOnnx; }; expected-exit-code = if method == "rivaGan" && !withOnnx then "1" else "0"; in runCommand "invisible-watermark-test-${testName}" { nativeBuildInputs = [ invisible-watermark' ]; } diff --git a/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix b/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix index e713f9bfe20c4..617dd0bb13cb0 100644 --- a/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix +++ b/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix @@ -2,7 +2,7 @@ image, invisible-watermark, opencv4, - python3, + python, runCommand, stdenvNoCC, }: @@ -13,12 +13,10 @@ let message = "fnörd1"; method = "dwtDct"; - pythonWithPackages = python3.withPackages ( - pp: with pp; [ - invisible-watermark - opencv4 - ] - ); + pythonWithPackages = python.withPackages (_: [ + invisible-watermark + opencv4 + ]); pythonInterpreter = pythonWithPackages.interpreter; encode = stdenvNoCC.mkDerivation { diff --git a/pkgs/development/python-modules/invocations/default.nix b/pkgs/development/python-modules/invocations/default.nix index 17828c47ae466..68160afc5435c 100644 --- a/pkgs/development/python-modules/invocations/default.nix +++ b/pkgs/development/python-modules/invocations/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - blessings, + blessed, fetchFromGitHub, invoke, pythonOlder, @@ -10,6 +10,11 @@ tabulate, tqdm, twine, + pytestCheckHook, + pytest-relaxed, + pytest-mock, + icecream, + pip, }: buildPythonPackage rec { @@ -26,13 +31,15 @@ buildPythonPackage rec { hash = "sha256-JnhdcxhBNsYgDMcljtGKjOT1agujlao/66QifGuh6I0="; }; + patches = [ ./replace-blessings-with-blessed.patch ]; + postPatch = '' substituteInPlace setup.py \ --replace "semantic_version>=2.4,<2.7" "semantic_version" ''; propagatedBuildInputs = [ - blessings + blessed invoke releases semantic-version @@ -41,11 +48,27 @@ buildPythonPackage rec { twine ]; - # There's an error loading the test suite. See https://github.com/pyinvoke/invocations/issues/29. - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-relaxed + pytest-mock + icecream + pip + ]; pythonImportsCheck = [ "invocations" ]; + disabledTests = [ + # invoke.exceptions.UnexpectedExit + "autodoc_" + + # ValueError: Call either Version('1.2.3') or Version(major=1, ...) + "component_state_enums_contain_human_readable_values" + "load_version_" + "prepare_" + "status_" + ]; + meta = with lib; { description = "Common/best-practice Invoke tasks and collections"; homepage = "https://invocations.readthedocs.io/"; diff --git a/pkgs/development/python-modules/invocations/replace-blessings-with-blessed.patch b/pkgs/development/python-modules/invocations/replace-blessings-with-blessed.patch new file mode 100644 index 0000000000000..fe03889e85550 --- /dev/null +++ b/pkgs/development/python-modules/invocations/replace-blessings-with-blessed.patch @@ -0,0 +1,26 @@ +diff --git a/invocations/packaging/release.py b/invocations/packaging/release.py +index 54322c3..81ac173 100644 +--- a/invocations/packaging/release.py ++++ b/invocations/packaging/release.py +@@ -23,7 +23,7 @@ from shutil import rmtree + + from invoke.vendor.lexicon import Lexicon + +-from blessings import Terminal ++from blessed import Terminal + from docutils.utils import Reporter + from enum import Enum + from invoke import Collection, task, Exit +diff --git a/setup.py b/setup.py +index 78ae28b..c78a74c 100644 +--- a/setup.py ++++ b/setup.py +@@ -16,7 +16,7 @@ requirements = [ + # time if missing), but that got hairy fast, and these are all + # pure-Python packages, so it shouldn't be a huge burden for users to + # obtain them. +- "blessings>=1.6", ++ "blessed", + "releases>=1.6", + "semantic_version>=2.4,<2.7", + "tabulate>=0.7.5", diff --git a/pkgs/development/python-modules/iopath/default.nix b/pkgs/development/python-modules/iopath/default.nix index 53159f5a84571..66ea7ae87f2e0 100644 --- a/pkgs/development/python-modules/iopath/default.nix +++ b/pkgs/development/python-modules/iopath/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { pythonImportsCheck = [ "iopath" ]; - passthru.optional-dependencies = { + optional-dependencies = { aws = [ boto3 ]; }; diff --git a/pkgs/development/python-modules/iottycloud/default.nix b/pkgs/development/python-modules/iottycloud/default.nix index bd710c5e3cb87..0f9b72bd91862 100644 --- a/pkgs/development/python-modules/iottycloud/default.nix +++ b/pkgs/development/python-modules/iottycloud/default.nix @@ -10,15 +10,14 @@ buildPythonPackage rec { pname = "iottycloud"; - version = "0.1.3"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "pburgio"; repo = "iottyCloud"; - # https://github.com/pburgio/iottyCloud/issues/1 - rev = "c328cc497bf58a1da148ea88e309129177d69af0"; - hash = "sha256-G06kvp4VG0OmZxDqvKnMJ+uD+6i5BFL/Iuke4vOdO/k="; + rev = "refs/tags/v${version}"; + hash = "sha256-EtAAUyVL7FTn0VoGmU5bU9XouMuEQUOx2t6j/wd1OEo="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/ipwhois/default.nix b/pkgs/development/python-modules/ipwhois/default.nix index bd69e5ccd5147..ea8fa078833db 100644 --- a/pkgs/development/python-modules/ipwhois/default.nix +++ b/pkgs/development/python-modules/ipwhois/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ipwhois" ]; - preCheck = lib.optionalString stdenv.isLinux '' + preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ LD_PRELOAD=${libredirect}/lib/libredirect.so diff --git a/pkgs/development/python-modules/ipycanvas/default.nix b/pkgs/development/python-modules/ipycanvas/default.nix index 34bb4c7916ab2..2a0e06c9ec025 100644 --- a/pkgs/development/python-modules/ipycanvas/default.nix +++ b/pkgs/development/python-modules/ipycanvas/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ipycanvas"; - version = "0.13.2"; + version = "0.13.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ujh9nYf2WVXzlVL7eSfEReXl5JN9hTgU2RDL6O+g+3k="; + hash = "sha256-ToZ8UJsB9cTPwAn32SHjLloSoCmshW54wE/xW2VpLEo="; }; # We relax dependencies here instead of pulling in a patch because upstream diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 7fd7702193015..4da948088c9a3 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -8,7 +8,6 @@ pythonOlder, appnope, comm, - debugpy, ipython, jupyter-client, jupyter-core, @@ -37,15 +36,12 @@ buildPythonPackage rec { }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 - postPatch = '' - sed -i "/debugpy/d" pyproject.toml - ''; + pythonRemoveDeps = [ "debugpy" ]; nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ comm - debugpy ipython jupyter-client jupyter-core @@ -56,7 +52,7 @@ buildPythonPackage rec { pyzmq tornado traitlets - ] ++ lib.optionals stdenv.isDarwin [ appnope ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ appnope ]; # check in passthru.tests.pytest to escape infinite recursion with ipyparallel doCheck = false; diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix index 4d96d4c6787db..89ac0be2d3d60 100644 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -46,7 +46,7 @@ buildPythonPackage { # traitlets.config.configurable.MultipleInstanceError: An incompatible siblin... "test_install_kernelspec" ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( [ # see https://github.com/NixOS/nixpkgs/issues/76197 "test_subprocess_print" diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index e13f14a2411e9..077ea0e4ac10d 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { # UnboundLocalError: local variable 'child' referenced before assignment "test_system_interrupt" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # FileNotFoundError: [Errno 2] No such file or directory: 'pbpaste' "test_clipboard_get" ]; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 8c985163653b0..e21b5ac8bbf02 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -2,14 +2,13 @@ buildPythonPackage, fetchPypi, setuptools, - wheel, comm, ipykernel, ipython, jsonschema, jupyterlab-widgets, lib, - pytest7CheckHook, + pytestCheckHook, pytz, traitlets, widgetsnbextension, @@ -17,20 +16,17 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "8.1.3"; + version = "8.1.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9fnuquCCsYI86erCV1JylS9A10iJOXKVbcCXAKY5LZw="; + hash = "sha256-hw5DsaNWVqgMGMlQO78tFoAtsctIfuxvqyfWgzgd3hc="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ comm ipython jupyterlab-widgets @@ -41,7 +37,7 @@ buildPythonPackage rec { nativeCheckInputs = [ ipykernel jsonschema - pytest7CheckHook + pytestCheckHook pytz ]; diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix index 370040f2b6feb..7fcb1280987fb 100644 --- a/pkgs/development/python-modules/ircrobots/default.nix +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -2,33 +2,31 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, anyio, asyncio-rlock, asyncio-throttle, ircstates, async-stagger, async-timeout, - python, + unittestCheckHook, }: buildPythonPackage rec { pname = "ircrobots"; - version = "0.6.6"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "0.7.2"; + pyproject = true; src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - hash = "sha256-mIh3tERwHtGH9eA0AT8Lcnwp1Wn9lQhKkUjuZcOXO/c="; + hash = "sha256-slz4AH2Mi21N3aV+OrnoXoQsseS7arW2NuUZARQJsf0="; }; - postPatch = '' - # too specific pins https://github.com/jesopo/ircrobots/issues/3 - sed -iE 's/anyio.*/anyio/' requirements.txt - ''; + build-system = [ setuptools ]; + + pythonRelaxDeps = true; propagatedBuildInputs = [ anyio @@ -39,9 +37,7 @@ buildPythonPackage rec { async-timeout ]; - checkPhase = '' - ${python.interpreter} -m unittest test - ''; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "ircrobots" ]; diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix index ab28fb911aa3a..3efe469fe093d 100644 --- a/pkgs/development/python-modules/ircstates/default.nix +++ b/pkgs/development/python-modules/ircstates/default.nix @@ -2,36 +2,36 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, irctokens, pendulum, freezegun, - python, + unittestCheckHook, }: buildPythonPackage rec { pname = "ircstates"; - version = "0.12.1"; - format = "setuptools"; - disabled = pythonOlder "3.6"; # f-strings + version = "0.13.0"; + pyproject = true; src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - hash = "sha256-F9yOY3YBacyoUzNTvPs7pxp6yNx08tiq1jWQKhGiagc="; + hash = "sha256-Mq9aOj6PXzPjaz3ofoPcAbur59oUWffmEg8aHt0v+0Q="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ irctokens pendulum ]; - nativeCheckInputs = [ freezegun ]; - - checkPhase = '' - ${python.interpreter} -m unittest test - ''; + nativeCheckInputs = [ + freezegun + unittestCheckHook + ]; pythonImportsCheck = [ "ircstates" ]; diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix index 5ad937806155a..1e2b962d0f6ae 100644 --- a/pkgs/development/python-modules/irctokens/default.nix +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -3,14 +3,16 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, pyyaml, - python, + unittestCheckHook, }: buildPythonPackage rec { pname = "irctokens"; version = "2.0.2"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.6"; # f-strings src = fetchFromGitHub { @@ -20,10 +22,12 @@ buildPythonPackage rec { hash = "sha256-Y9NBqxGUkt48hnXxsmfydHkJmWWb+sRrElV8C7l9bpw="; }; - nativeCheckInputs = [ pyyaml ]; - checkPhase = '' - ${python.interpreter} -m unittest test - ''; + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pyyaml + unittestCheckHook + ]; pythonImportsCheck = [ "irctokens" ]; diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix index 3a7ca9a07a2b6..0594330edaf84 100644 --- a/pkgs/development/python-modules/isal/default.nix +++ b/pkgs/development/python-modules/isal/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "isal"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { owner = "pycompression"; repo = "python-isal"; rev = "v${version}"; - hash = "sha256-wasybbNWBa6Zd0JI2/lBNUkvEOY3/iBqsVWh/4WPM2s="; + hash = "sha256-KLnSE7QLM3q8DdoWnCEN6dOxsMr8eSH9k3FqFquZFlE="; }; patches = [ diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index d111e6b523d27..5cded1ba84a5c 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -2,31 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - setuptools, + # build-system cmake, nanobind, ninja, pcpp, scikit-build, + setuptools, + + # buildInputs isl, + # tests pytestCheckHook, }: buildPythonPackage rec { pname = "islpy"; - version = "2024.1"; + version = "2024.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; rev = "refs/tags/v${version}"; - hash = "sha256-N5XI6V3BvNobCh7NAvtzVejtDMnlcb31S5gseyab1T0="; + hash = "sha256-ixw9U4WqcXBW6KGBOsUImjsxmvG5XKCv4jCbTjJ4pjg="; }; postPatch = '' @@ -35,12 +36,12 @@ buildPythonPackage rec { ''; build-system = [ - setuptools cmake nanobind ninja pcpp scikit-build + setuptools ]; buildInputs = [ isl ]; diff --git a/pkgs/development/python-modules/iterative-telemetry/default.nix b/pkgs/development/python-modules/iterative-telemetry/default.nix index bc7ad3796450f..a3c57d4e07985 100644 --- a/pkgs/development/python-modules/iterative-telemetry/default.nix +++ b/pkgs/development/python-modules/iterative-telemetry/default.nix @@ -14,8 +14,8 @@ buildPythonPackage rec { pname = "iterative-telemtry"; - version = "0.0.8"; - format = "pyproject"; + version = "0.0.9"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,12 +23,12 @@ buildPythonPackage rec { owner = "iterative"; repo = "telemetry-python"; rev = "refs/tags/${version}"; - hash = "sha256-jD1AyQTdz/NfTRpvEuTE/gUfgNIhNlnimuCks5ImhwA="; + hash = "sha256-bcGniytjlN3JFPeMQYjyIP8Ruty9/dnzp9neclbdsfU="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ requests appdirs filelock diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index 666f527fce405..0b96700f267de 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jaraco-abode"; - version = "5.2.1"; + version = "6.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.abode"; rev = "refs/tags/v${version}"; - hash = "sha256-1omRBbUNS2/U2laK7E1M0uZfejZVMdGezG5oIGILj70="; + hash = "sha256-t5AI2wpSM6xMzULEZYkUgGvcODM8PVxdd2Vy/PV0Ga4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix index c5554812cbe84..de22f3eda857c 100644 --- a/pkgs/development/python-modules/jaraco-net/default.nix +++ b/pkgs/development/python-modules/jaraco-net/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { python-dateutil pathvalidate jsonpickle - ] ++ lib.optionals stdenv.isDarwin [ ifconfig-parser ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ifconfig-parser ]; pythonImportsCheck = [ "jaraco.net" ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { importlib-resources pyparsing requests-mock - ] ++ lib.optionals stdenv.isDarwin [ nettools ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ nettools ]; disabledTestPaths = [ # doesn't actually contain tests diff --git a/pkgs/development/python-modules/jaraco-path/default.nix b/pkgs/development/python-modules/jaraco-path/default.nix index 5537811d592da..48ee8b4fdd2b7 100644 --- a/pkgs/development/python-modules/jaraco-path/default.nix +++ b/pkgs/development/python-modules/jaraco-path/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/jaraco.path"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; - broken = stdenv.isDarwin; # pyobjc is missing + broken = stdenv.hostPlatform.isDarwin; # pyobjc is missing }; } diff --git a/pkgs/development/python-modules/jaraco-test/default.nix b/pkgs/development/python-modules/jaraco-test/default.nix index ae018f6f83057..47510c9c4a6e2 100644 --- a/pkgs/development/python-modules/jaraco-test/default.nix +++ b/pkgs/development/python-modules/jaraco-test/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, setuptools-scm, toml, jaraco-functools, @@ -14,15 +14,16 @@ buildPythonPackage rec { pname = "jaraco-test"; - version = "5.4.0"; + version = "5.5.1"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "jaraco.test"; - inherit version; - hash = "sha256-29NDh4dYrcVER9YRXEYXia2zH8QHOyEpUCQwk7oxfsI="; + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.test"; + rev = "refs/tags/v${version}"; + hash = "sha256-jbnU6PFVUd/eD9CWHyJvaTFkcZaIIwztkN9UbQZH1RU="; }; build-system = [ setuptools-scm ]; @@ -47,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Testing support by jaraco"; homepage = "https://github.com/jaraco/jaraco.test"; - changelog = "https://github.com/jaraco/jaraco.test/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/jaraco/jaraco.test/blob/${src.rev}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index ec8c53daab464..ba9a621b1eab7 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { # PermissionError: [Errno 13] Permission denied: '/tmp/back_compat_testdata/test_*.py' # See https://github.com/google/jax/blob/jaxlib-v0.4.27/jax/_src/internal_test_util/export_back_compat_test_util.py#L240-L241 # NOTE: this doesn't seem to be an issue on linux - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export TEST_UNDECLARED_OUTPUTS_DIR=$(mktemp -d) ''; @@ -108,7 +108,7 @@ buildPythonPackage rec { "test_custom_root_with_aux" "testEigvalsGrad_shape" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # See https://github.com/google/jax/issues/14793. "test_for_loop_fixpoint_correctly_identifies_loop_varying_residuals_unrolled_for_loop" "testQdwhWithRandomMatrix3" @@ -131,7 +131,7 @@ buildPythonPackage rec { # Segmentation fault. See https://gist.github.com/zimbatm/e9b61891f3bcf5e4aaefd13f94344fba "tests/linalg_test.py" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # RuntimeWarning: invalid value encountered in cast "tests/lax_test.py" ]; diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 0932222e02b89..a08264849770a 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -181,12 +181,12 @@ buildPythonPackage { or (throw "jaxlib-bin is not supported on ${stdenv.hostPlatform.system}") ) else - gpuSrcs."${gpuSrcVersionString}"; + gpuSrcs."${gpuSrcVersionString}" or (throw "jaxlib-bin: No gpuSrc for ${gpuSrcVersionString}"); # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. nativeBuildInputs = - lib.optionals stdenv.isLinux [ autoPatchelfHook ] + lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]; # Dynamic link dependencies buildInputs = [ stdenv.cc.cc.lib ]; @@ -238,12 +238,12 @@ buildPythonPackage { broken = !(cudaSupport -> lib.versionAtLeast cudaVersion "11.1") || !(cudaSupport -> lib.versionAtLeast cudaPackages.cudnn.version "8.2") - || !(cudaSupport -> stdenv.isLinux) + || !(cudaSupport -> stdenv.hostPlatform.isLinux) || !(cudaSupport -> (gpuSrcs ? "cuda${cudaVersion}-${pythonVersion}")) # Fails at pythonImportsCheckPhase: # ...-python-imports-check-hook.sh/nix-support/setup-hook: line 10: 28017 Illegal instruction: 4 # /nix/store/5qpssbvkzfh73xih07xgmpkj5r565975-python3-3.11.9/bin/python3.11 -c # 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ["pythonImportsCheck"].split()))' - || (stdenv.isDarwin && stdenv.isx86_64); + || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); }; } diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 0fc50fa9243f0..de7fea0a26e8a 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -240,7 +240,7 @@ let wheel build which - ] ++ lib.optionals effectiveStdenv.isDarwin [ cctools ]; + ] ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ @@ -259,8 +259,8 @@ let snappy zlib ] - ++ lib.optionals effectiveStdenv.isDarwin [ IOKit ] - ++ lib.optionals (!effectiveStdenv.isDarwin) [ nsync ]; + ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ IOKit ] + ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ]; # We don't want to be quite so picky regarding bazel version postPatch = '' @@ -406,7 +406,7 @@ let TF_SYSTEM_LIBS = lib.concatStringsSep "," ( tf_system_libs - ++ lib.optionals (!effectiveStdenv.isDarwin) [ + ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ "nsync" # fails to build on darwin ] ); @@ -414,7 +414,7 @@ let # Note: we cannot do most of this patching at `patch` phase as the deps # are not available yet. Framework search paths aren't added by bintools # hook. See https://github.com/NixOS/nixpkgs/pull/41914. - preBuild = lib.optionalString effectiveStdenv.isDarwin '' + preBuild = lib.optionalString effectiveStdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -F${IOKit}/Library/Frameworks" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \ --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool" diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index 8159533fc2033..b617e21c1c277 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { # https://github.com/google/jaxopt/issues/592 "test_solve_sparse" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # https://github.com/google/jaxopt/issues/577 "test_binary_logit_log_likelihood" "test_solve_sparse" @@ -87,7 +87,7 @@ buildPythonPackage rec { # AssertionError: Array(0.01411963, dtype=float32) not less than or equal to 0.01 "test_multiclass_logreg6" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Fatal Python error: Aborted "test_dtype_consistency" diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index e28c6aecef3db..e741b66f27d38 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -3,8 +3,14 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system hatchling, + + # dependencies typeguard, + + # tests cloudpickle, equinox, ipython, @@ -18,7 +24,7 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.33"; + version = "0.2.34"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,16 +33,12 @@ let owner = "google"; repo = "jaxtyping"; rev = "refs/tags/v${version}"; - hash = "sha256-CL1EONbjjT3SCAn2o1x+1cgfuYWMEgQwbX9j34t+HGs="; + hash = "sha256-zkB8/+0PmBKDFhj9dd8QZ5Euglm+W3BBUM4dwFUYYW8="; }; - build-system = [ - hatchling - ]; + build-system = [ hatchling ]; - dependencies = [ - typeguard - ]; + dependencies = [ typeguard ]; pythonRelaxDeps = [ "typeguard" ]; diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index 096c327ae9862..e67d04be02c18 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { HOME="$(mktemp -d)" ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/pappasam/jedi-language-server/issues/313 "test_publish_diagnostics_on_change" "test_publish_diagnostics_on_save" diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index a47398cb9ca3e..b88dc9311e91b 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -58,9 +58,17 @@ buildPythonPackage rec { # sensitive to platform, causes false negatives on darwin "test_import" ] - ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && pythonOlder "3.9") [ # AssertionError: assert 'foo' in ['setup'] "test_init_extension_module" + ] + ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [ + # InvalidPythonEnvironment: The python binary is potentially unsafe. + "test_create_environment_executable" + # AssertionError: assert ['', '.1000000000000001'] == ['', '.1'] + "test_dict_keys_completions" + # AssertionError: assert ['', '.1000000000000001'] == ['', '.1'] + "test_dict_completion" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 4210f5499d282..8517c239de44d 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index da220641dbe21..995f436a8242a 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -35,15 +35,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { i18n = [ babel ]; }; # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 - doCheck = !stdenv.is32bit; + doCheck = !stdenv.hostPlatform.is32bit; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.i18n; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.i18n; disabledTests = lib.optionals (pythonAtLeast "3.13") [ # https://github.com/pallets/jinja/issues/1900 diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 2e2ff91c8b0a3..dae3210280e31 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ ipython keyring diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix index bcb026bae11c5..32a560a1a1f25 100644 --- a/pkgs/development/python-modules/jishaku/default.nix +++ b/pkgs/development/python-modules/jishaku/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { description = "Debugging and testing cog for discord.py bots"; homepage = "https://jishaku.readthedocs.io/en/latest"; changelog = "https://github.com/Gorialis/jishaku/releases/tag/${version}"; - maintainers = with lib.maintainers; [ lychee ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "jishaku"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 65b728b34e9ae..0cd4182d42414 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests "test_nested_parallel_warnings" # tests is flaky under load ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin. ] ++ lib.optionals (pythonAtLeast "3.12") [ diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index 19d02b1189878..1704fc6b9a619 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -1,41 +1,45 @@ { lib, stdenv, - fetchFromGitHub, buildPythonPackage, - rustPlatform, - pkg-config, - pcsclite, - nettle, + fetchFromGitHub, httpx, + libiconv, + nettle, + PCSC, + pcsclite, + pkg-config, pytestCheckHook, pythonOlder, + rustPlatform, vcrpy, - PCSC, - libiconv, }: buildPythonPackage rec { pname = "johnnycanencrypt"; - version = "0.14.1"; + version = "0.15.0"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "kushaldas"; repo = "johnnycanencrypt"; - rev = "v${version}"; - hash = "sha256-13zIC+zH/BebMplUfdtiwEEVODS+jTURC1vudbmQPlA="; + rev = "refs/tags/v${version}"; + hash = "sha256-tbHW3x+vwFz0nqFGWvgxjhw8XH6/YKz1uagU339SZyk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-u3qKli76XGS0Ijg15BQzbFlfLPpBPFKh++EZLfnO9ps="; + hash = "sha256-vDlMdzZgmaRkviEk8IjIN+Q5x95gnpQiW5c8fT+dats="; }; - format = "pyproject"; - - propagatedBuildInputs = [ httpx ]; + build-system = with rustPlatform; [ + bindgenHook + cargoSetupHook + maturinBuildHook + ]; nativeBuildInputs = [ pkg-config ] @@ -47,12 +51,14 @@ buildPythonPackage rec { buildInputs = [ nettle ] - ++ lib.optionals stdenv.isLinux [ pcsclite ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ PCSC libiconv ]; + dependencies = [ httpx ]; + nativeCheckInputs = [ pytestCheckHook vcrpy @@ -66,9 +72,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "johnnycanencrypt" ]; meta = with lib; { + description = "Python module for OpenPGP written in Rust"; homepage = "https://github.com/kushaldas/johnnycanencrypt"; changelog = "https://github.com/kushaldas/johnnycanencrypt/blob/v${version}/changelog.md"; - description = "Python module for OpenPGP written in Rust"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ _0x4A6F ]; }; diff --git a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix index 9a65903e384de..86473e609bfe2 100644 --- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix +++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { wheel ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # Tests depend on json-stream, which depends on this package. # To avoid infinite recursion, we only enable tests when building passthru.tests. diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix index 26b7ef5f8ea21..fd5f61399f189 100644 --- a/pkgs/development/python-modules/json-stream/default.nix +++ b/pkgs/development/python-modules/json-stream/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - buildInputs = lib.optionals stdenv.isDarwin [ iconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ iconv ]; propagatedBuildInputs = [ requests diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index f1c26abd3767a..762e7f892b0a4 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.32.1"; + version = "4.33.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -32,14 +32,14 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; rev = "refs/tags/v${version}"; - hash = "sha256-DardzvEiydlsaOY60p2fNR6cGGvombSSUXCxHHFT7b0="; + hash = "sha256-r3TIuKzFkJ1CzdVwxkKLWqi1uo7Goe9mzgKCRZFxwH8="; }; build-system = [ setuptools ]; dependencies = [ pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ argcomplete fsspec diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index b0db522f61e91..cc0adcaffc167 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { pkgutil-resolve-name ]; - passthru.optional-dependencies = { + optional-dependencies = { format = [ fqdn idna diff --git a/pkgs/development/python-modules/jsonstreams/default.nix b/pkgs/development/python-modules/jsonstreams/default.nix index 58c3513e1ee08..49ffcee24b82b 100644 --- a/pkgs/development/python-modules/jsonstreams/default.nix +++ b/pkgs/development/python-modules/jsonstreams/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests --doctest-modules jsonstreams" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "JSON streaming writer"; homepage = "https://github.com/dcbaker/jsonstreams"; license = licenses.mit; diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix index de21f76224e7c..ec9f51237679e 100644 --- a/pkgs/development/python-modules/jupysql/default.nix +++ b/pkgs/development/python-modules/jupysql/default.nix @@ -2,45 +2,50 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + + # build-system setuptools, - prettytable, - sqlalchemy, - sqlparse, + + # dependencies ipython-genutils, jinja2, - sqlglot, jupysql-plugin, ploomber-core, - ploomber-extension, - ipython, + prettytable, + sqlalchemy, + sqlglot, + sqlparse, + + # optional-dependencies duckdb, duckdb-engine, - matplotlib, - polars, + grpcio, + ipython, ipywidgets, + js2py, + matplotlib, numpy, pandas, - js2py, - pyspark, + polars, pyarrow, - grpcio, + pyspark, + + # tests pytestCheckHook, psutil, }: buildPythonPackage rec { pname = "jupysql"; - version = "0.10.11"; + version = "0.10.13"; pyproject = true; - disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ploomber"; repo = "jupysql"; rev = "refs/tags/${version}"; - hash = "sha256-A9zTjH+9RYKcgy4mI6uOMHOc46om06y1zK3IbxeVcWE="; + hash = "sha256-vNuMGHFkatJS5KjxaOBwZ7JolIDAdYqGq3JNKSV2fKE="; }; pythonRelaxDeps = [ "sqlalchemy" ]; @@ -48,30 +53,29 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - prettytable - sqlalchemy - sqlparse ipython-genutils jinja2 - sqlglot jupysql-plugin ploomber-core - ploomber-extension + prettytable + sqlalchemy + sqlglot + sqlparse ]; optional-dependencies.dev = [ - ipython duckdb duckdb-engine - matplotlib - polars + grpcio + ipython ipywidgets + js2py + matplotlib numpy pandas - js2py - pyspark + polars pyarrow - grpcio + pyspark ]; nativeCheckInputs = [ @@ -79,6 +83,11 @@ buildPythonPackage rec { psutil ] ++ optional-dependencies.dev; + disabledTests = [ + # AttributeError: 'DataFrame' object has no attribute 'frame_equal' + "test_resultset_polars_dataframe" + ]; + disabledTestPaths = [ # require docker "src/tests/integration" @@ -101,11 +110,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "sql" ]; - meta = with lib; { + meta = { description = "Better SQL in Jupyter"; homepage = "https://github.com/ploomber/jupysql"; changelog = "https://github.com/ploomber/jupysql/blob/${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ pacien ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pacien ]; }; } diff --git a/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix b/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix deleted file mode 100644 index 622ad6ceff84f..0000000000000 --- a/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - ipython-genutils, - jupyter-contrib-core, - jupyter-highlight-selected-word, - jupyter-nbextensions-configurator, - lxml, - nose, - pytestCheckHook, - notebook, -}: - -buildPythonPackage rec { - pname = "jupyter-contrib-nbextensions"; - version = "0.7.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "ipython-contrib"; - repo = "jupyter_contrib_nbextensions"; - rev = "refs/tags/${version}"; - hash = "sha256-1o8tBfRw6jNcKfNE7xXrQaEhx+KOv7mLOruvuMDtJ1Q="; - }; - - propagatedBuildInputs = [ - ipython-genutils - jupyter-contrib-core - jupyter-highlight-selected-word - jupyter-nbextensions-configurator - lxml - ]; - - nativeCheckInputs = [ - nose - pytestCheckHook - ]; - - disabledTestPaths = [ - # Thoses tests fail upstream because of nbconvert being too recent - # https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1606 - "tests/test_exporters.py" - - # Requires to run jupyter which is not feasible here - "tests/test_application.py" - ]; - - pythonImportsCheck = [ "jupyter_contrib_nbextensions" ]; - - meta = with lib; { - description = "Collection of various notebook extensions for Jupyter"; - homepage = "https://github.com/ipython-contrib/jupyter_contrib_nbextensions"; - license = licenses.bsd3; - maintainers = with maintainers; [ GaetanLepage ]; - # https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1647 - broken = versionAtLeast notebook.version "7"; - }; -} diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index 66de5a91ff5fd..6a5431fd1abf9 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { traitlets ] ++ jsonschema.optional-dependencies.format-nongpl; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click rich @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-asyncio pytest-console-scripts pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export PATH="$out/bin:$PATH" diff --git a/pkgs/development/python-modules/jupyter-server-fileid/default.nix b/pkgs/development/python-modules/jupyter-server-fileid/default.nix index 7f05c8c95863e..01355ab24c232 100644 --- a/pkgs/development/python-modules/jupyter-server-fileid/default.nix +++ b/pkgs/development/python-modules/jupyter-server-fileid/default.nix @@ -6,32 +6,36 @@ hatchling, jupyter-events, jupyter-server, + click, pytest-jupyter, pytestCheckHook, }: buildPythonPackage rec { pname = "jupyter-server-fileid"; - version = "0.9.2"; + version = "0.9.3"; + pyproject = true; disables = pythonOlder "3.7"; - format = "pyproject"; - src = fetchFromGitHub { owner = "jupyter-server"; repo = "jupyter_server_fileid"; rev = "refs/tags/v${version}"; - hash = "sha256-ApCDBVjJqpkC5FGEjU/LxwWBunTkL6i5Ki85M6MMLE0="; + hash = "sha256-ob7hnqU7GdaDHEPF7+gwkmsboKZgiiLzzwxbBUwYHYo="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ jupyter-events jupyter-server ]; + optional-dependencies = { + cli = [ click ]; + }; + pythonImportsCheck = [ "jupyter_server_fileid" ]; checkInputs = [ diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index a367bc3c0f35c..071b3707225ba 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { ]; # https://github.com/NixOS/nixpkgs/issues/299427 - stripExclude = lib.optionals stdenv.isDarwin [ "favicon.ico" ]; + stripExclude = lib.optionals stdenv.hostPlatform.isDarwin [ "favicon.ico" ]; nativeCheckInputs = [ ipykernel @@ -102,13 +102,13 @@ buildPythonPackage rec { # test is presumable broken in sandbox "test_authorized_requests" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # attempts to use trashcan, build env doesn't allow this "test_delete" # Insufficient access privileges for operation "test_regression_is_hidden" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # Failed: DID NOT RAISE <class 'tornado.web.HTTPError'> "test_copy_big_dir" ]; diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index 7d43784db6bda..cc5769b7c759c 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jupyter Sphinx Extensions"; homepage = "https://github.com/jupyter/jupyter-sphinx/"; - changelog = "https://github.com/jupyter/jupyter-sphinx/releases/tag/${src.rev}"; + changelog = "https://github.com/jupyter/jupyter-sphinx/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/jupyter/default.nix b/pkgs/development/python-modules/jupyter/default.nix index 72f9238edb8bf..a3c9be6510592 100644 --- a/pkgs/development/python-modules/jupyter/default.nix +++ b/pkgs/development/python-modules/jupyter/default.nix @@ -2,41 +2,45 @@ lib, buildPythonPackage, fetchPypi, - notebook, - qtconsole, - jupyter-console, - nbconvert, + setuptools, ipykernel, ipywidgets, + jupyter-console, + jupyterlab, + nbconvert, + notebook, }: buildPythonPackage rec { - version = "1.0.0"; - format = "setuptools"; pname = "jupyter"; + version = "1.1.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f"; + hash = "sha256-1VRnvOq96knX42JK9+M9WcN//1PtOjUOGslXvtcx3no="; }; - propagatedBuildInputs = [ - notebook - qtconsole - jupyter-console - nbconvert + build-system = [ setuptools ]; + + dependencies = [ ipykernel ipywidgets + jupyter-console + jupyterlab + nbconvert + notebook ]; # Meta-package, no tests doCheck = false; + dontUsePythonImportsCheck = true; + meta = with lib; { description = "Installs all the Jupyter components in one go"; homepage = "https://jupyter.org/"; license = licenses.bsd3; - platforms = platforms.all; priority = 100; # This is a metapackage which is unimportant }; } diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 38a2fc97a6628..76fbe01ae3d17 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -171,6 +171,6 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = teams.jupyter.members; # darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix index f2efc2e7d5e82..3734c7d0bcd5d 100644 --- a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix +++ b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jupyterlab-execute-time"; - version = "3.1.2"; + version = "3.2.0"; pyproject = true; src = fetchPypi { pname = "jupyterlab_execute_time"; inherit version; - hash = "sha256-DiyGsoNXXh+ieMfpSrA6A/5c0ftNV9Ygs9Tl2/VEdbk="; + hash = "sha256-mxO2XCwTm/q7P2/xcGxNM+1aViA6idApdggzThW8nAs="; }; # jupyterlab is required to build from source but we use the pre-build package diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index cd538beade251..bf8b0a0141aef 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "3.0.11"; + version = "3.0.13"; pyproject = true; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - hash = "sha256-3VrGeVk8lprynJvtBUwk8mhCuqUTUhFHNnVrwDXe7ic="; + hash = "sha256-opZtOFMowZQraDqM2WuJuN2CyLj4HdqQK7K8BtRvW+0="; }; # jupyterlab is required to build from source but we use the pre-build package diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index ab4c0c705323f..8105bf1ebc6fd 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.2.4"; + version = "4.2.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NDqXn7lYL9CMhRGCPjIHAygc0HKgBJvNr9x6/tp/JTc="; + hash = "sha256-rn86G4y4i09VAJznn6fAb5nXDNY2Ae5KqRgV0FT0b3U="; }; build-system = [ diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 4708b5363141c..df0fc676633f3 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/external" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # requires access to trash "test_load_save_rename" ]; diff --git a/pkgs/development/python-modules/k5test/fix-paths.patch b/pkgs/development/python-modules/k5test/fix-paths.patch index 04103df36d538..feb24226dc2fc 100644 --- a/pkgs/development/python-modules/k5test/fix-paths.patch +++ b/pkgs/development/python-modules/k5test/fix-paths.patch @@ -49,7 +49,7 @@ if provider_cls == K5Realm: - krb5_config = _discover_path("krb5-config", "/usr/bin/krb5-config", kwargs) -+ krb5_config = _discover_path("krb5-config", "@krb5@/bin/krb5-config", kwargs) ++ krb5_config = _discover_path("krb5-config", "@krb5Dev@/bin/krb5-config", kwargs) try: krb5_version = subprocess.check_output( @@ -58,7 +58,7 @@ # macOS output doesn't contain Heimdal if "heimdal" in krb5_version.lower() or ( - sys.platform == "darwin" and krb5_config == "/usr/bin/krb5-config" -+ sys.platform == "darwin" and krb5_config == "@krb5@/bin/krb5-config" ++ sys.platform == "darwin" and krb5_config == "@krb5Dev@/bin/krb5-config" ): provider_cls = HeimdalRealm else: diff --git a/pkgs/development/python-modules/kafka-python-ng/default.nix b/pkgs/development/python-modules/kafka-python-ng/default.nix index 4e3997d5ed1f6..79d253cacc8ed 100644 --- a/pkgs/development/python-modules/kafka-python-ng/default.nix +++ b/pkgs/development/python-modules/kafka-python-ng/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { crc32c = [ crc32c ]; lz4 = [ lz4 ]; snappy = [ python-snappy ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook xxhash - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = { changelog = "https://github.com/wbarnha/kafka-python-ng/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix deleted file mode 100644 index 67e7febd7f177..0000000000000 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pytest, - six, - mock, -}: - -buildPythonPackage rec { - version = "2.0.2"; - format = "setuptools"; - pname = "kafka-python"; - - src = fetchPypi { - inherit pname version; - sha256 = "04dfe7fea2b63726cd6f3e79a2d86e709d608d74406638c5da33a01d45a9d7e3"; - }; - - nativeCheckInputs = [ - pytest - six - mock - ]; - - checkPhase = '' - py.test - ''; - - # Upstream uses tox but we don't on Nix. Running tests manually produces however - # from . import unittest - # E ImportError: cannot import name 'unittest' - doCheck = false; - - meta = with lib; { - description = "Pure Python client for Apache Kafka"; - homepage = "https://github.com/dpkp/kafka-python"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix new file mode 100644 index 0000000000000..ef889a0aa7152 --- /dev/null +++ b/pkgs/development/python-modules/kaleido/default.nix @@ -0,0 +1,118 @@ +{ + lib, + stdenv, + python, + buildPythonPackage, + callPackage, + fetchurl, + autoPatchelfHook, + bash, + dejavu_fonts, + expat, + fontconfig, + lato, + libGL, + makeWrapper, + nspr, + nss, + sbclPackages, + sqlite, +}: + +buildPythonPackage rec { + pname = "kaleido"; + version = "0.2.1"; + format = "wheel"; + + src = + { + # This library is so cursed that I have to use fetchurl instead of fetchPypi. I am not happy. + x86_64-linux = fetchurl { + url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-manylinux1_x86_64.whl"; + hash = "sha256-qiHPG/HHj4+lCp99ReEAPDh709b+CnZ8+780S5W9w6g="; + }; + aarch64-linux = fetchurl { + url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-manylinux2014_aarch64.whl"; + hash = "sha256-hFgZhEyAgslGnZwX5CYh+/hcKyN++KhuyKhSf5i2USo="; + }; + x86_64-darwin = fetchurl { + url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-macosx_10_11_x86_64.whl"; + hash = "sha256-ym9z5/8AquvyhD9z8dO6zeGTDvUEEJP+drg6FXhQSac="; + }; + aarch64-darwin = fetchurl { + url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-macosx_11_0_arm64.whl"; + hash = "sha256-u5pdH3EDV9XUMu4kDvZlim0STD5hCTWBe0tC2px4fAU="; + }; + } + ."${stdenv.hostPlatform.system}" + or (throw "Unsupported system for ${pname}: ${stdenv.hostPlatform.system}"); + + nativeBuildInputs = (lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]) ++ [ + makeWrapper + ]; + buildInputs = [ + bash + dejavu_fonts + expat + fontconfig + lato + libGL + nspr + nss + sbclPackages.cl-dejavu + sqlite + ]; + + pythonImportsCheck = [ "kaleido" ]; + + postInstall = '' + # Expose kaleido binary + mkdir -p $out/bin + ln -s $out/${python.sitePackages}/kaleido/executable/bin/kaleido $out/bin/kaleido + + # Replace bundled swiftshader with libGL + rm -rf $out/${python.sitePackages}/kaleido/executable/bin/swiftshader + ln -s ${libGL}/lib $out/${python.sitePackages}/kaleido/executable/bin/swiftshader + + # Relace bundled libraries with nixpkgs-packaged libraries + rm -rf $out/${python.sitePackages}/kaleido/executable/lib + mkdir -p $out/${python.sitePackages}/kaleido/executable/lib + ln -s ${expat}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ + ln -s ${nspr}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ + ln -s ${nss}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ + ln -s ${sqlite}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ + + # Replace bundled font configuration with nixpkgs-packaged font configuration + rm -rf $out/${python.sitePackages}/kaleido/executable/etc/fonts + mkdir -p $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d + ln -s ${fontconfig}/etc/fonts/fonts.conf $out/${python.sitePackages}/kaleido/executable/etc/fonts/ + ls -s ${fontconfig}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/ + ln -s ${sbclPackages.cl-dejavu}/dejavu-fonts-ttf-2.37/fontconfig/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/ + + # Replace bundled fonts with nixpkgs-packaged fonts + # Currently this causes an issue where the fonts aren't found. I'm not sure why, so I'm leaving this commented out for now. + #rm -rf $out/${python.sitePackages}/kaleido/executable/xdg/fonts + #mkdir -p $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato + #ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/ + #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/ + ''; + + passthru.tests = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { + kaleido = callPackage ./tests.nix { }; + }; + + meta = { + description = "Fast static image export for web-based visualization libraries with zero dependencies"; + homepage = "https://github.com/plotly/Kaleido"; + changelog = "https://github.com/plotly/Kaleido/releases"; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + "aarch64-darwin" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; # Trust me, I'm not happy. But after literal hours of trying to reverse-engineer their build system and getting nowhere, I'll use the stupid binaries >:( + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pandapip1 ]; + }; +} diff --git a/pkgs/development/python-modules/kaleido/tests.nix b/pkgs/development/python-modules/kaleido/tests.nix new file mode 100644 index 0000000000000..e09f4947a563e --- /dev/null +++ b/pkgs/development/python-modules/kaleido/tests.nix @@ -0,0 +1,15 @@ +{ + runCommand, + python, + plotly, + pandas, + kaleido, +}: + +runCommand "${kaleido.pname}-tests" { + nativeBuildInputs = [ + python + plotly + pandas + ]; +} "python3 ${./tests.py}" diff --git a/pkgs/development/python-modules/kaleido/tests.py b/pkgs/development/python-modules/kaleido/tests.py new file mode 100644 index 0000000000000..0cbcaaae60bed --- /dev/null +++ b/pkgs/development/python-modules/kaleido/tests.py @@ -0,0 +1,11 @@ +import plotly.express as px +import os +import os.path + +out = os.environ["out"] +if not os.path.exists(out): + os.makedirs(out) + +outfile = os.path.join(out, "figure.png") +fig = px.scatter(px.data.iris(), x="sepal_length", y="sepal_width", color="species") +fig.write_image(outfile, engine="kaleido") diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 00796239d3418..5dbd5f77fbbc8 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "karton-core"; - version = "5.4.0"; + version = "5.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-4IU4ttJdh5BU79076kbQOtzqzeQ3/Xb9Qd6Bh9iNXrA="; + hash = "sha256-fjzZPq98AwNT+tiTvKZY2QsSD+FRUFx+oY84hPP7QdI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index ac5d47623a8ac..9ee9110ef092e 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -19,21 +18,18 @@ packaging, rich, tensorflow, - tf-keras, }: buildPythonPackage rec { pname = "keras"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; rev = "refs/tags/v${version}"; - hash = "sha256-hp+kKsKI2Jmh30/KeUZ+uBW0MG49+QgsyR5yCS63p08="; + hash = "sha256-zbeGa4g2psAofYAVuM7BNWI2gI21e739N5ZtxVfnVUg="; }; build-system = [ @@ -52,7 +48,6 @@ buildPythonPackage rec { packaging rich tensorflow - tf-keras ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 20ed4c5dfb911..45166fb322b20 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "keyring"; - version = "25.3.0"; + version = "25.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "keyring"; rev = "refs/tags/v${version}"; - hash = "sha256-P7rm5fkNudUEWdzVPMeGsP9sjBXoCBKojbh5oHhw4y4="; + hash = "sha256-B1uU4INod2iSXIftPlDOr7mzWPY3FTpLhUuInl1Hg/M="; }; build-system = [ setuptools-scm ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { jaraco-context jaraco-functools ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ jeepney secretstorage ] @@ -68,7 +68,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/backends/test_macOS.py" ] # These tests fail when sandboxing is enabled because they are unable to get a password from keychain. - ++ lib.optional stdenv.isDarwin "tests/test_multiprocess.py"; + ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py"; meta = with lib; { description = "Store and access your passwords safely"; diff --git a/pkgs/development/python-modules/keyring_24/default.nix b/pkgs/development/python-modules/keyring_24/default.nix index 9739a6f7b20a0..05fbb3178147a 100644 --- a/pkgs/development/python-modules/keyring_24/default.nix +++ b/pkgs/development/python-modules/keyring_24/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { jaraco-context jaraco-functools ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ jeepney secretstorage ] @@ -68,7 +68,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/backends/test_macOS.py" ] # These tests fail when sandboxing is enabled because they are unable to get a password from keychain. - ++ lib.optional stdenv.isDarwin "tests/test_multiprocess.py"; + ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py"; meta = with lib; { description = "Store and access your passwords safely"; diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix index 4db10bd0ed5af..528d4becda6b6 100644 --- a/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -2,7 +2,7 @@ lib, argon2-cffi, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, keyring, pycryptodome, @@ -13,15 +13,16 @@ buildPythonPackage rec { pname = "keyrings-cryptfile"; - version = "1.3.9"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.5"; - src = fetchPypi { - pname = "keyrings.cryptfile"; - inherit version; - hash = "sha256-fCpFPKuZhUJrjCH3rVSlfkn/joGboY4INAvYgBrPAJE="; + src = fetchFromGitHub { + owner = "frispete"; + repo = "keyrings.cryptfile"; + rev = "refs/tags/v${version}"; + hash = "sha256-cDXx0s3o8hNqgzX4oNkjGhNcaUX5vi1uN2d9sdbiZwk="; }; build-system = [ setuptools ]; @@ -40,8 +41,10 @@ buildPythonPackage rec { ]; disabledTests = [ - # FileNotFoundError: [Errno 2] No such file or directory: '/build/... - "test_versions" + # correct raise `ValueError`s which pytest fails to catch for some reason: + "test_empty_username" + # TestEncryptedFileKeyring::test_file raises 'ValueError: Incorrect Password' for some reason, maybe mock related: + "TestEncryptedFileKeyring" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/keystone-engine/default.nix b/pkgs/development/python-modules/keystone-engine/default.nix index 61e27473ec982..4e526346dced9 100644 --- a/pkgs/development/python-modules/keystone-engine/default.nix +++ b/pkgs/development/python-modules/keystone-engine/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig"; }; - setupPyBuildFlags = lib.optionals stdenv.isLinux [ + setupPyBuildFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" ]; diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix index f71c8288c74eb..26a1bba38bcef 100644 --- a/pkgs/development/python-modules/kivy/default.nix +++ b/pkgs/development/python-modules/kivy/default.nix @@ -49,11 +49,11 @@ buildPythonPackage rec { SDL2_ttf SDL2_mixer ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ mesa mtdev ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate ApplicationServices AVFoundation @@ -84,9 +84,9 @@ buildPythonPackage rec { # prefer pkg-config over hardcoded framework paths USE_OSX_FRAMEWORKS = 0; # work around python distutils compiling C++ with $CC (see issue #26709) - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace kivy/lib/mtdev.py \ --replace "LoadLibrary('libmtdev.so.1')" "LoadLibrary('${mtdev}/lib/libmtdev.so.1')" ''; diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index d71b613b58b8b..24322524eb93a 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-5X5WOlf7IqFC2jTziswvwaXIZLwpyhUXqIq8lj5g1uw="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/knocki/default.nix b/pkgs/development/python-modules/knocki/default.nix index b37f50cd5ac86..c5c5442fdfe77 100644 --- a/pkgs/development/python-modules/knocki/default.nix +++ b/pkgs/development/python-modules/knocki/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "knocki"; - version = "0.3.1"; + version = "0.3.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "swan-solutions"; repo = "knocki-homeassistant"; - rev = "v${version}"; - hash = "sha256-tWtANsujAcdIddoUBrKWIPfiPzDqWhW94Goz0QQ2BfE="; + rev = "refs/tags/v${version}"; + hash = "sha256-Fb3skFttY5gtm80k1LCUQ4Z7/TQGClCNcWt1k6bLQoI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix index 2224a7c59a064..e7625b59a46ad 100644 --- a/pkgs/development/python-modules/knx-frontend/default.nix +++ b/pkgs/development/python-modules/knx-frontend/default.nix @@ -7,17 +7,17 @@ buildPythonPackage rec { pname = "knx-frontend"; - version = "2024.8.9.225351"; - format = "pyproject"; + version = "2024.9.10.221729"; + pyproject = true; # TODO: source build, uses yarn.lock src = fetchPypi { pname = "knx_frontend"; inherit version; - hash = "sha256-ZxEcGXSsdBZQAcwsXI7K/bmxw8+DFQc+aBbgaIfTQgU="; + hash = "sha256-Imv4DcQCdT5iHIsDtxzLRwTWQqRgR4ASx/kdkmIbK6o="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "knx_frontend" ]; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 187d5a8bbba44..696860862b11d 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.4.0"; + version = "5.4.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-rSAKjb2qorvF8m0u59cH2aH97TU6D0vXUc6MfZ9EnGA="; + hash = "sha256-7vVy3S/Z/GFLN1gOPK6v3Vr0bB7/Mef7qJE4zbQG8s8="; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/krb5/default.nix b/pkgs/development/python-modules/krb5/default.nix index f64b73447ac06..5b4de628d7ca6 100644 --- a/pkgs/development/python-modules/krb5/default.nix +++ b/pkgs/development/python-modules/krb5/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "krb5"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cSugkvvjoo7BiCC7Gx7SzBA3t1xccDP5cMaoyXu9Egk="; + hash = "sha256-ajCPLhfRUcOVsk5q7Hvf9qVv42J6MgQvyG1BI5ipLd0="; }; build-system = [ @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/jborean93/pykrb5"; license = licenses.mit; maintainers = teams.deshaw.members; - broken = stdenv.isDarwin; # TODO: figure out how to build on Darwin + broken = stdenv.hostPlatform.isDarwin; # TODO: figure out how to build on Darwin }; } diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index f4aa517c4ef8b..f11863d01409b 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -10,17 +10,24 @@ # dependencies async-timeout, + asgi-logger, cloudevents, fastapi, grpcio, httpx, + azure-identity, kubernetes, numpy, orjson, pandas, prometheus-client, protobuf, + requests, psutil, + azure-storage-blob, + azure-storage-file-share, + boto3, + google-cloud-storage, pydantic, python-dateutil, pyyaml, @@ -32,11 +39,6 @@ # checks avro, - azure-storage-blob, - azure-storage-file-share, - boto3, - botocore, - google-cloud-storage, grpcio-testing, pytest-asyncio, pytestCheckHook, @@ -59,6 +61,16 @@ buildPythonPackage rec { sourceRoot = "${src.name}/python/kserve"; + pythonRelaxDeps = [ + "fastapi" + "httpx" + "prometheus-client" + "protobuf" + "ray" + "uvicorn" + "psutil" + ]; + build-system = [ deprecation poetry-core @@ -87,30 +99,28 @@ buildPythonPackage rec { uvicorn ] ++ ray.optional-dependencies.serve-deps; - pythonRelaxDeps = [ - "fastapi" - "httpx" - "prometheus-client" - "protobuf" - "ray" - "uvicorn" - "psutil" - ]; - - pythonImportsCheck = [ "kserve" ]; + optional-dependencies = { + storage = [ + azure-identity + azure-storage-blob + azure-storage-file-share + boto3 + google-cloud-storage + requests + ]; + logging = [ asgi-logger ]; + ray = [ ray ]; + }; nativeCheckInputs = [ avro - azure-storage-blob - azure-storage-file-share - boto3 - botocore - google-cloud-storage grpcio-testing pytest-asyncio pytestCheckHook tomlkit - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + pythonImportsCheck = [ "kserve" ]; disabledTestPaths = [ # Looks for a config file at the root of the repository @@ -122,6 +132,8 @@ buildPythonPackage rec { "test_health_handler" "test_infer" "test_infer_v2" + # Assertion error due to HTTP response code + "test_unload" ]; meta = { diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index b7387675c9540..66a295dcc5a78 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # AssertionError: <class 'urllib3.poolmanager.ProxyManager'> != <class 'urllib3.poolmanager.Poolmanager'> "test_rest_proxycare" ]; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 25d5df9ee0122..09e7f9fa48456 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.77.1"; + version = "5.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - hash = "sha256-sp0lgUnFRmQLix530xoR/qibYFjGwG7i7+mvEQX0x4k="; + hash = "sha256-M55cwT7BrY+8m9ec+2bKDCxGkHJp/c50Gzib4sEg7Bk="; }; sourceRoot = "${src.name}/libs/labelbox"; @@ -99,7 +99,7 @@ buildPythonPackage rec { meta = with lib; { description = "Platform API for LabelBox"; homepage = "https://github.com/Labelbox/labelbox-python"; - changelog = "https://github.com/Labelbox/labelbox-python/blob/v.${version}/CHANGELOG.md"; + changelog = "https://github.com/Labelbox/labelbox-python/releases/tag/v.${version}"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; }; diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 08572db40152b..a263fa60c1528 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.10.12"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-A81zSdEpCNgPjSAGs/1Ja6MR2WcDf7Xx31Lm4SKkBtc="; + hash = "sha256-O9nB+hxMrIJDeK6BrxmX/yr0OoIXxshKJxz9fU6b2V0="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/lammps/default.nix b/pkgs/development/python-modules/lammps/default.nix index b9e0f45402d0b..1267792855b04 100644 --- a/pkgs/development/python-modules/lammps/default.nix +++ b/pkgs/development/python-modules/lammps/default.nix @@ -12,8 +12,11 @@ buildPythonPackage { inherit (lammps) pname version src; env = { + # Needed for tests inherit LAMMPS_SHARED_LIB; }; + # Don't perform checks if GPU is enabled - because libcuda.so cannot be opened in the sandbox + doCheck = if lammps.passthru.packages ? GPU then !lammps.passthru.packages.GPU else true; preConfigure = '' cd python # Upstream assumes that the shared library is located in the same directory diff --git a/pkgs/development/python-modules/lancedb/Cargo.lock b/pkgs/development/python-modules/lancedb/Cargo.lock index 8ab09e80ea683..9fd06f89770b6 100644 --- a/pkgs/development/python-modules/lancedb/Cargo.lock +++ b/pkgs/development/python-modules/lancedb/Cargo.lock @@ -4,19 +4,13 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -46,6 +40,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "allocator-api2" version = "0.2.18" @@ -118,9 +127,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" [[package]] name = "arbitrary" @@ -298,7 +307,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.4.0", + "indexmap 2.5.0", "lexical-core", "num", "serde", @@ -467,18 +476,18 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -516,9 +525,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "aws-config" -version = "1.5.5" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e95816a168520d72c0e7680c405a5a8c1fb6a035b4bc4b9d7b0de8e1a941697" +checksum = "848d7b9b605720989929279fa644ce8f244d0ce3146fcca5b70e4eb7b3c020fc" dependencies = [ "aws-credential-types", "aws-runtime", @@ -533,7 +542,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "hex", "http 0.2.12", "ring", @@ -546,9 +555,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" +checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -558,20 +567,21 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.4.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42c2d4218de4dcd890a109461e2f799a1a2ba3bcd2cde9af88360f5df9266c6" +checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468" dependencies = [ "aws-credential-types", "aws-sigv4", "aws-smithy-async", "aws-smithy-eventstream", "aws-smithy-http", + "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "http 0.2.12", "http-body 0.4.6", "once_cell", @@ -583,9 +593,9 @@ dependencies = [ [[package]] name = "aws-sdk-dynamodb" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aadafd673822026e7ae6be7900c7886f609514b620874c9e3054f4ae38ab82f" +checksum = "c7f3d9e807092149e3df266e3f4d9760dac439b90f82d8438e5b2c0bbe62007f" dependencies = [ "aws-credential-types", "aws-runtime", @@ -597,7 +607,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "http 0.2.12", "once_cell", "regex-lite", @@ -606,9 +616,9 @@ dependencies = [ [[package]] name = "aws-sdk-kms" -version = "1.40.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ebbbc319551583b9233a74b359ede7349102e779fc12371d2478e80b50d218" +checksum = "d9f7cb482caa5444d445c94417b9c74e49a849beb09ede4f2f4c3c15f8157387" dependencies = [ "aws-credential-types", "aws-runtime", @@ -628,9 +638,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.46.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abf69a87be33b6f125a93d5046b5f7395c26d1f449bf8d3927f5577463b6de0" +checksum = "e518950d4ac43508c8bfc2fe4e24b0752d99eab80134461d5e162dcda0214b55" dependencies = [ "ahash", "aws-credential-types", @@ -647,7 +657,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "hex", "hmac", "http 0.2.12", @@ -663,9 +673,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.39.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11822090cf501c316c6f75711d77b96fba30658e3867a7762e5e2f5d32d31e81" +checksum = "27bf24cd0d389daa923e974b0e7c38daf308fc21e963c049f57980235017175e" dependencies = [ "aws-credential-types", "aws-runtime", @@ -685,9 +695,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.40.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a2a06ff89176123945d1bbe865603c4d7101bea216a550bb4d2e4e9ba74d74" +checksum = "3b43b3220f1c46ac0e9dcc0a97d94b93305dacb36d1dd393996300c6b9b74364" dependencies = [ "aws-credential-types", "aws-runtime", @@ -707,9 +717,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.39.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20a91795850826a6f456f4a48eff1dfa59a0e69bdbf5b8c50518fd372106574" +checksum = "d1c46924fb1add65bba55636e12812cae2febf68c0f37361766f627ddcca91ce" dependencies = [ "aws-credential-types", "aws-runtime", @@ -730,9 +740,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.3" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be" +checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -791,9 +801,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.60.4" +version = "0.60.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" +checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90" dependencies = [ "aws-smithy-types", "bytes", @@ -802,9 +812,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.60.9" +version = "0.60.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e" +checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -842,16 +852,16 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.6.3" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0abbf454960d0db2ad12684a1640120e7557294b0ff8e2f11236290a1b293225" +checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", @@ -886,9 +896,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.2" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cee7cadb433c781d3299b916fbf620fea813bf38f49db282fb6858141a05cc8" +checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605" dependencies = [ "base64-simd", "bytes", @@ -912,9 +922,9 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.8" +version = "0.60.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55" +checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc" dependencies = [ "xmlparser", ] @@ -949,17 +959,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -1059,6 +1069,27 @@ dependencies = [ "generic-array", ] +[[package]] +name = "brotli" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bumpalo" version = "3.16.0" @@ -1073,9 +1104,9 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] @@ -1088,7 +1119,7 @@ checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1201,9 +1232,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.13" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "jobserver", "libc", @@ -1399,9 +1430,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1555,7 +1586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1585,7 +1616,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1596,7 +1627,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1643,7 +1674,7 @@ dependencies = [ "glob", "half", "hashbrown 0.14.5", - "indexmap 2.4.0", + "indexmap 2.5.0", "itertools 0.12.1", "log", "num_cpus", @@ -1803,7 +1834,7 @@ dependencies = [ "datafusion-expr", "datafusion-physical-expr", "hashbrown 0.14.5", - "indexmap 2.4.0", + "indexmap 2.5.0", "itertools 0.12.1", "log", "paste", @@ -1832,7 +1863,7 @@ dependencies = [ "half", "hashbrown 0.14.5", "hex", - "indexmap 2.4.0", + "indexmap 2.5.0", "itertools 0.12.1", "log", "paste", @@ -1878,7 +1909,7 @@ dependencies = [ "futures", "half", "hashbrown 0.14.5", - "indexmap 2.4.0", + "indexmap 2.5.0", "itertools 0.12.1", "log", "once_cell", @@ -1953,38 +1984,38 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "derive_builder" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "derive_builder_macro" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" dependencies = [ "derive_builder_core", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2027,7 +2058,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2113,14 +2144,14 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2132,7 +2163,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2279,9 +2310,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "ff" @@ -2311,12 +2342,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -2361,15 +2392,15 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "windows-sys 0.52.0", ] [[package]] name = "fsst" -version = "0.15.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9178c033f667093b96b8f8e26e62dc5e96b81fa45ee8703933a33892fbb96991" +checksum = "26212c1db7eee3ec0808bd99107cf62ba4d3edd3489df601e2d0c73c5d739aec" dependencies = [ "rand", ] @@ -2451,7 +2482,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2633,9 +2664,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -2666,7 +2697,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -2685,7 +2716,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -2930,16 +2961,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.12", - "rustls-native-certs 0.7.2", + "rustls 0.23.13", + "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -2961,9 +2992,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -3040,9 +3071,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -3093,9 +3124,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -3195,9 +3226,9 @@ dependencies = [ [[package]] name = "lance" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7215c36aa9b0319b11369c0955e1e6bf42b47a7b7266279e0742ae1638df1284" +checksum = "a427160737dd74d2d4f566f3111027edc63927106541d173459d010209371c42" dependencies = [ "arrow", "arrow-arith", @@ -3235,7 +3266,6 @@ dependencies = [ "lazy_static", "log", "moka", - "num_cpus", "object_store", "pin-project", "prost", @@ -3255,9 +3285,9 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73975ef4393a50a24cfc827e751633038c1f456f4fb16b1c1c2aa0ca827db1b0" +checksum = "c2f1cfebe08c64b1edabe9b6ccd6f8ea1bc6349d0870d47f2db8cdadf02ab8e2" dependencies = [ "arrow-array", "arrow-buffer", @@ -3273,9 +3303,9 @@ dependencies = [ [[package]] name = "lance-core" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfe010f4bdab8e6484540c7c03d01e3c263cd664080a946cab0961a166cb8da9" +checksum = "243aa2323dee6fcab6bb9bb3a21ae8f040c98a5de9bbfb7ab8484a036176185a" dependencies = [ "arrow-array", "arrow-buffer", @@ -3311,9 +3341,9 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4789165245fe0f4588c514faa3dfd727229a6b022272c6ef72c378682f71faa7" +checksum = "c0a69d039f93a43477245b51a8f1ce58a1f41485f8ded946f53031a11ded8c97" dependencies = [ "arrow", "arrow-array", @@ -3329,6 +3359,7 @@ dependencies = [ "futures", "lance-arrow", "lance-core", + "lazy_static", "log", "prost", "snafu", @@ -3337,26 +3368,28 @@ dependencies = [ [[package]] name = "lance-encoding" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37853a7f2903ec77add0a2f4cca23890ca4e8b2bf01a27dc6d111b4b1116f2b" +checksum = "3b713e49ce6039d0ca0f88e8ded66ee64d89c42f85107bc9e684fbff41386a65" dependencies = [ "arrow", "arrow-arith", "arrow-array", "arrow-buffer", "arrow-cast", + "arrow-data", "arrow-schema", "arrow-select", "bytes", "fsst", "futures", + "hex", "hyperloglogplus", + "itertools 0.12.1", "lance-arrow", "lance-core", "log", "num-traits", - "num_cpus", "prost", "prost-build", "prost-types", @@ -3369,9 +3402,9 @@ dependencies = [ [[package]] name = "lance-file" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6fa4833bd13f45ea2c8868cad9b02b8de19ffeec0e62342f4bbc1f678abcac7" +checksum = "4e0eaebd40c77f8f06a0cbadcd07f9344aea616dcd4d8712f6cad81c2eda14d5" dependencies = [ "arrow-arith", "arrow-array", @@ -3392,7 +3425,6 @@ dependencies = [ "lance-io", "log", "num-traits", - "num_cpus", "object_store", "prost", "prost-build", @@ -3406,9 +3438,9 @@ dependencies = [ [[package]] name = "lance-index" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948ac3698a815d2f217441c34cb59e852e0a1c715164ca4cb1686e584262ffbf" +checksum = "d1ad5a42b9a4909749ee62fc94c64d19259c2aadca7c8446f42ee8e9c7a097d3" dependencies = [ "arrow", "arrow-array", @@ -3441,7 +3473,6 @@ dependencies = [ "log", "moka", "num-traits", - "num_cpus", "object_store", "prost", "prost-build", @@ -3455,13 +3486,14 @@ dependencies = [ "tempfile", "tokio", "tracing", + "uuid", ] [[package]] name = "lance-io" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169f7fc1f472b3ad8c38bc3aff3c5bb4e978813fd3bfc4aedd8bee48355c5423" +checksum = "d0f334f2c279f80f19803141cf7f98c6b82e6ace3c7f75c8740f1df7a73bb720" dependencies = [ "arrow", "arrow-arith", @@ -3485,7 +3517,6 @@ dependencies = [ "lance-core", "lazy_static", "log", - "num_cpus", "object_store", "path_abs", "pin-project", @@ -3501,9 +3532,9 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08820921b613efec6b8909dfbbb2056ccd79baffa3d813014fb6c610c62c3bdb" +checksum = "8fa019770a0afb287360a4ea919cff482371ad43318607d1e797534c819bf356" dependencies = [ "arrow-array", "arrow-ord", @@ -3518,7 +3549,6 @@ dependencies = [ "lazy_static", "log", "num-traits", - "num_cpus", "rand", "rayon", "tokio", @@ -3527,9 +3557,9 @@ dependencies = [ [[package]] name = "lance-table" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a367224fcce42d88c0193151577d70c8b8dc7179ea5136c82d0cfd0d91768f17" +checksum = "99fa39bede133d578431db3f77b0c2c63fcaff12a088000648014c27266830a2" dependencies = [ "arrow", "arrow-array", @@ -3568,9 +3598,9 @@ dependencies = [ [[package]] name = "lance-testing" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fd0bc5dedee83c040bf31be9618129d0e189ce41f6010fd1922c4079895763" +checksum = "fb4eae0993cda6130cfd75d3d9d11830dd4ec8d4c66cf81def939837c419d4bc" dependencies = [ "arrow-array", "arrow-schema", @@ -3581,7 +3611,7 @@ dependencies = [ [[package]] name = "lancedb" -version = "0.8.0" +version = "0.10.0-beta.1" dependencies = [ "arrow", "arrow-array", @@ -3611,6 +3641,7 @@ dependencies = [ "lance-encoding", "lance-index", "lance-linalg", + "lance-table", "lance-testing", "lazy_static", "log", @@ -3620,6 +3651,7 @@ dependencies = [ "polars", "polars-arrow", "rand", + "random_word", "regex", "reqwest 0.11.27", "serde", @@ -3652,7 +3684,7 @@ dependencies = [ [[package]] name = "lancedb-node" -version = "0.8.0" +version = "0.10.0-beta.1" dependencies = [ "arrow-array", "arrow-ipc", @@ -3690,7 +3722,7 @@ dependencies = [ [[package]] name = "lancedb-python" -version = "0.12.0" +version = "0.13.0" dependencies = [ "arrow", "env_logger 0.10.2", @@ -3861,19 +3893,18 @@ dependencies = [ [[package]] name = "lz4" -version = "1.26.0" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958b4caa893816eea05507c20cfe47574a43d9a697138a7872990bba8a0ece68" +checksum = "a231296ca742e418c43660cb68e082486ff2538e8db432bc818580f3965025ed" dependencies = [ - "libc", "lz4-sys", ] [[package]] name = "lz4-sys" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" +checksum = "fcb44a01837a858d47e5a630d2ccf304c8efcc4b83b8f9f75b7a9ee4fcc6e57d" dependencies = [ "cc", "libc", @@ -4000,15 +4031,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -4082,7 +4104,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4121,9 +4143,9 @@ checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" [[package]] name = "napi" -version = "2.16.9" +version = "2.16.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1277600d452e570cc83cf5f4e8efb389cc21e5cbefadcfba7239f4551e2e3e99" +checksum = "04409e8c2d61995696e44d2181b79b68c1dd41f7e24a17cde60bbd9f54ddddef" dependencies = [ "bitflags 2.6.0", "ctor", @@ -4141,23 +4163,23 @@ checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a" [[package]] name = "napi-derive" -version = "2.16.11" +version = "2.16.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "150d87c4440b9f4815cb454918db498b5aae9a57aa743d20783fe75381181d01" +checksum = "17435f7a00bfdab20b0c27d9c56f58f6499e418252253081bfff448099da31d1" dependencies = [ "cfg-if", "convert_case", "napi-derive-backend", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "napi-derive-backend" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd81b794fc1d6051acf8c4f3cb4f82833b0621272a232b4ff0cf3df1dbddb61" +checksum = "967c485e00f0bf3b1bdbe510a38a4606919cf1d34d9a37ad41f25a81aa077abe" dependencies = [ "convert_case", "once_cell", @@ -4165,7 +4187,7 @@ dependencies = [ "quote", "regex", "semver 1.0.23", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4372,7 +4394,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4383,9 +4405,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.3" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -4478,7 +4500,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4533,9 +4555,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -4606,7 +4628,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.4.0", + "indexmap 2.5.0", ] [[package]] @@ -4664,7 +4686,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4799,7 +4821,7 @@ dependencies = [ "comfy-table", "either", "hashbrown 0.14.5", - "indexmap 2.4.0", + "indexmap 2.5.0", "num-traits", "once_cell", "polars-arrow", @@ -4897,7 +4919,7 @@ dependencies = [ "either", "hashbrown 0.14.5", "hex", - "indexmap 2.4.0", + "indexmap 2.5.0", "memchr", "num-traits", "polars-arrow", @@ -5041,7 +5063,7 @@ dependencies = [ "ahash", "bytemuck", "hashbrown 0.14.5", - "indexmap 2.4.0", + "indexmap 2.5.0", "num-traits", "once_cell", "polars-error", @@ -5092,19 +5114,19 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ "toml_edit", ] @@ -5145,7 +5167,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.75", + "syn 2.0.77", "tempfile", ] @@ -5159,7 +5181,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5173,9 +5195,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" dependencies = [ "cc", ] @@ -5285,7 +5307,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5298,7 +5320,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config 0.21.2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5329,16 +5351,16 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.12", + "rustls 0.23.13", "socket2 0.5.7", "thiserror", "tokio", @@ -5347,15 +5369,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand", "ring", "rustc-hash 2.0.0", - "rustls 0.23.12", + "rustls 0.23.13", "slab", "thiserror", "tinyvec", @@ -5364,22 +5386,22 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", "socket2 0.5.7", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -5430,6 +5452,20 @@ dependencies = [ "rand", ] +[[package]] +name = "random_word" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07eed67a16dde2cc3c7f65c072acd8d5b2e53d4aab95067c320db851c7651f29" +dependencies = [ + "ahash", + "brotli", + "once_cell", + "paste", + "rand", + "unicase", +] + [[package]] name = "rangemap" version = "1.5.1" @@ -5508,14 +5544,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" dependencies = [ "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -5623,7 +5659,7 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.4.1", - "hyper-rustls 0.27.2", + "hyper-rustls 0.27.3", "hyper-util", "ipnet", "js-sys", @@ -5634,8 +5670,8 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.12", - "rustls-native-certs 0.7.2", + "rustls 0.23.13", + "rustls-native-certs 0.7.3", "rustls-pemfile 2.1.3", "rustls-pki-types", "serde", @@ -5736,9 +5772,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] @@ -5759,9 +5795,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -5784,15 +5820,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] @@ -5811,9 +5847,22 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", "rustls-pemfile 2.1.3", @@ -5859,9 +5908,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -5882,9 +5931,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safetensors" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7725d4d98fa515472f43a6e2bbf956c48e06b89bb50593a040e5945160214450" +checksum = "44560c11236a6130a46ce36c836a62936dc81ebf8c36a37947423571be0e55b6" dependencies = [ "serde", "serde_json", @@ -5901,11 +5950,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6012,29 +6061,29 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -6073,7 +6122,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -6090,7 +6139,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6308,7 +6357,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6319,15 +6368,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -6394,7 +6443,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6407,7 +6456,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6429,9 +6478,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.75" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -6472,7 +6521,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6696,9 +6745,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", + "fastrand 2.1.1", "once_cell", - "rustix 0.38.34", + "rustix 0.38.37", "windows-sys 0.59.0", ] @@ -6728,7 +6777,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6820,9 +6869,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -6843,7 +6892,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6872,16 +6921,16 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -6890,9 +6939,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -6909,11 +6958,11 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "toml_datetime", "winnow", ] @@ -6964,7 +7013,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7021,9 +7070,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" @@ -7093,7 +7142,7 @@ dependencies = [ "log", "native-tls", "once_cell", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "serde", "serde_json", @@ -7211,7 +7260,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -7245,7 +7294,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7281,9 +7330,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -7584,9 +7633,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -7642,7 +7691,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", "synstructure", ] @@ -7664,7 +7713,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7684,7 +7733,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", "synstructure", ] @@ -7704,7 +7753,7 @@ dependencies = [ "crc32fast", "crossbeam-utils", "displaydoc", - "indexmap 2.4.0", + "indexmap 2.5.0", "num_enum", "thiserror", ] diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index 1f9534953ea74..e1dcbd2a1a229 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -28,19 +28,16 @@ buildPythonPackage rec { pname = "lancedb"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lancedb"; rev = "refs/tags/python-v${version}"; - hash = "sha256-LDxq49aFxUmRAw8tQvFxnExtU0IKKqMbxIBuY95cBHU="; + hash = "sha256-6E20WgyoEALdxmiOfgq89dCkqovvIMzc/wy+kvjDWwU="; }; - # ratelimiter only support up to python310 and it has been removed from nixpkgs - patches = [ ./remove-ratelimiter.patch ]; - buildAndTestSubdir = "python"; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; @@ -61,7 +58,7 @@ buildPythonPackage rec { libiconv protobuf ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ IOKit @@ -70,8 +67,6 @@ buildPythonPackage rec { ] ); - pythonRemoveDeps = [ "ratelimiter" ]; - dependencies = [ attrs cachetools @@ -104,6 +99,10 @@ buildPythonPackage rec { disabledTests = [ # require tantivy which is not packaged in nixpkgs "test_basic" + + # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size' + # https://github.com/lancedb/lancedb/issues/1539 + "test_polars" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/lancedb/remove-ratelimiter.patch b/pkgs/development/python-modules/lancedb/remove-ratelimiter.patch deleted file mode 100644 index bdfbdc4622ae1..0000000000000 --- a/pkgs/development/python-modules/lancedb/remove-ratelimiter.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/python/python/lancedb/embeddings/utils.py b/python/python/lancedb/embeddings/utils.py -index 813631c..4ae6025 100644 ---- a/python/python/lancedb/embeddings/utils.py -+++ b/python/python/lancedb/embeddings/utils.py -@@ -111,7 +111,7 @@ class FunctionWrapper: - - if len(self.rate_limiter_kwargs) > 0: - v = int(sys.version_info.minor) -- if v >= 11: -+ if True: - print( - "WARNING: rate limit only support up to 3.10, proceeding " - "without rate limiter" -diff --git a/python/python/tests/test_embeddings.py b/python/python/tests/test_embeddings.py -index ed7b105..28ca9cb 100644 ---- a/python/python/tests/test_embeddings.py -+++ b/python/python/tests/test_embeddings.py -@@ -35,7 +35,7 @@ def mock_embed_func(input_data): - - def test_with_embeddings(): - for wrap_api in [True, False]: -- if wrap_api and sys.version_info.minor >= 11: -+ if wrap_api: - # ratelimiter package doesn't work on 3.11 - continue - data = pa.Table.from_arrays( diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index 65dd79a8498bc..767f2262c2870 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -2,25 +2,31 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies boto3, langchain-core, numpy, - poetry-core, - pytestCheckHook, - pytest-asyncio, + + # tests langchain-standard-tests, + pytest-asyncio, + pytestCheckHook, }: buildPythonPackage rec { pname = "langchain-aws"; - version = "0.1.17"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-n9nQheuUZMrjZMpR3aqbrRb/AhcgiF4CFO9ROh9aFNc="; + hash = "sha256-P9CfAVpKh7djhUQc3DyyJTWqs9RbrTeLyynLei0x00o="; }; postPatch = '' @@ -49,6 +55,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_aws" ]; + passthru = { + inherit (langchain-core) updateScript; + }; + meta = { changelog = "https://github.com/langchain-ai/langchain-aws/releases/tag/v${version}"; description = "Build LangChain application on AWS"; diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix index 8dbb0ed2a725a..9bf287ea2c341 100644 --- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix +++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix @@ -1,19 +1,24 @@ { lib, - azure-identity, buildPythonPackage, fetchFromGitHub, - freezegun, + + # build-system + poetry-core, + + # dependencies + azure-identity, langchain-core, langchain-openai, + + # tests + freezegun, lark, pandas, - poetry-core, pytest-asyncio, pytest-mock, pytest-socket, pytestCheckHook, - pythonOlder, requests-mock, responses, syrupy, @@ -22,16 +27,14 @@ buildPythonPackage rec { pname = "langchain-azure-dynamic-sessions"; - version = "0.1.0"; + version = "0.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-azure-dynamic-sessions==${version}"; - hash = "sha256-jz4IBMnWuk8FsSsyfLN14B0xWZrmZrvEW95a45S+FOo="; + hash = "sha256-tgvoOSr4tpi+tFBan+kw8FZUfUJHcQXv9e1nyeGP0so="; }; sourceRoot = "${src.name}/libs/partners/azure-dynamic-sessions"; @@ -62,6 +65,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_azure_dynamic_sessions" ]; + passthru = { + inherit (langchain-core) updateScript; + }; + meta = { description = "Integration package connecting Azure Container Apps dynamic sessions and LangChain"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/azure-dynamic-sessions"; diff --git a/pkgs/development/python-modules/langchain-chroma/001-async-test.patch b/pkgs/development/python-modules/langchain-chroma/001-async-test.patch new file mode 100644 index 0000000000000..178fd37199f85 --- /dev/null +++ b/pkgs/development/python-modules/langchain-chroma/001-async-test.patch @@ -0,0 +1,13 @@ +diff --git a/libs/partners/chroma/tests/integration_tests/test_vectorstores.py b/libs/partners/chroma/tests/integration_tests/test_vectorstores.py +index 382b24cb5..f99a34112 100644 +--- a/tests/integration_tests/test_vectorstores.py ++++ b/tests/integration_tests/test_vectorstores.py +@@ -36,7 +36,7 @@ def test_chroma() -> None: + + assert output == [Document(page_content="foo")] + +- ++@pytest.mark.asyncio + async def test_chroma_async() -> None: + """Test end to end construction and search.""" + texts = ["foo", "bar", "baz"] diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index 2331babc4d7e4..1ec6ce71ed5dc 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -7,25 +7,29 @@ numpy, poetry-core, pytestCheckHook, - nix-update-script, + pytest-asyncio, }: buildPythonPackage rec { pname = "langchain-chroma"; - version = "0.1.2"; + version = "0.1.4"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-chroma==${version}"; - hash = "sha256-PQ3bepiAqzWhQdKofQSzQKxRrwI6dxBfSNV91462aJE="; + hash = "sha256-pU7H8OYXa+JjdkSO36xESPI6r3xA+9cFXxeJnfpYuHc="; }; sourceRoot = "${src.name}/libs/partners/chroma"; + patches = [ ./001-async-test.patch ]; + build-system = [ poetry-core ]; + pythonRelaxDeps = [ "chromadb" ]; + dependencies = [ langchain-core chromadb @@ -34,13 +38,18 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_chroma" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "langchain-chroma==(.*)" - ]; + disabledTests = [ + # Bad integration test, not used or vetted by the langchain team + "test_chroma_update_document" + ]; + + passthru = { + inherit (langchain-core) updateScript; }; meta = { @@ -48,6 +57,9 @@ buildPythonPackage rec { description = "Integration package connecting Chroma and LangChain"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/chroma"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index aa6e68471fa54..6d29c6e12ffd2 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -2,56 +2,65 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system poetry-core, - pythonOlder, + + # dependencies aiohttp, dataclasses-json, - langchain, langchain-core, - langchain-standard-tests, + langchain, langsmith, + pydantic-settings, + pyyaml, + requests, + sqlalchemy, + tenacity, + + # optional-dependencies + typer, + numpy, + + # tests httpx, + langchain-standard-tests, lark, - numpy, pandas, pytest-asyncio, pytest-mock, pytestCheckHook, - pyyaml, - requests, requests-mock, responses, - sqlalchemy, syrupy, - tenacity, toml, - typer, }: buildPythonPackage rec { pname = "langchain-community"; - version = "0.2.12"; + version = "0.3.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-community==${version}"; - hash = "sha256-HsKWGiWA6uKmRQOMw3efXkjwbBuvDHhf5waNvnvBdG4="; + hash = "sha256-h7+89w8PkSpFxGGQKFC6FuB6Q2B27EYgLk0aiPqwp4s="; }; sourceRoot = "${src.name}/libs/community"; build-system = [ poetry-core ]; + pythonRelaxDeps = [ "pydantic-settings" ]; + dependencies = [ aiohttp dataclasses-json langchain-core langchain langsmith + pydantic-settings pyyaml requests sqlalchemy @@ -82,7 +91,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit_tests" ]; passthru = { - updateScript = langchain-core.updateScript; + inherit (langchain-core) updateScript; }; __darwinAllowLocalNetworking = true; @@ -90,6 +99,7 @@ buildPythonPackage rec { disabledTests = [ # Test require network access "test_ovhcloud_embed_documents" + "test_yandex" # duckdb-engine needs python-wasmer which is not yet available in Python 3.12 # See https://github.com/NixOS/nixpkgs/pull/326337 and https://github.com/wasmerio/wasmer-python/issues/778 "test_table_info" diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 3012cda9b4fcc..3ba1fcb50f952 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -3,38 +3,45 @@ stdenv, buildPythonPackage, fetchFromGitHub, - freezegun, - grandalf, - httpx, + + # build-system + poetry-core, + + # dependencies jsonpatch, langsmith, - numpy, packaging, - poetry-core, + pyyaml, + tenacity, + + # optional-dependencies pydantic, + + # tests + freezegun, + grandalf, + httpx, + numpy, pytest-asyncio, pytest-mock, pytest-xdist, pytestCheckHook, - pythonOlder, - pyyaml, syrupy, - tenacity, + + # passthru writeScript, }: buildPythonPackage rec { pname = "langchain-core"; - version = "0.2.33"; + version = "0.3.7"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-vM3FY9E8PeC8LHP4QCTM1ggFynI+PscF7pv7CMaSZlU="; + hash = "sha256-s2tqBJpWJNy0SnHWt0RQowmRbBD+7zqFEeDuFrUzr2U="; }; sourceRoot = "${src.name}/libs/core"; @@ -76,15 +83,25 @@ buildPythonPackage rec { ''; passthru = { + # Updates to core tend to drive updates in everything else updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-update - set -eu -o pipefail + set -u -o pipefail +e + # Common core nix-update --commit --version-regex 'langchain-core==(.*)' python3Packages.langchain-core nix-update --commit --version-regex 'langchain-text-splitters==(.*)' python3Packages.langchain-text-splitters nix-update --commit --version-regex 'langchain==(.*)' python3Packages.langchain nix-update --commit --version-regex 'langchain-community==(.*)' python3Packages.langchain-community + + # Extensions + nix-update --commit --version-regex 'langchain-aws==(.*)' python3Packages.langchain-aws + nix-update --commit --version-regex 'langchain-azure-dynamic-sessions==(.*)' python3Packages.langchain-azure-dynamic-sessions + nix-update --commit --version-regex 'langchain-chroma==(.*)' python3Packages.langchain-chroma + nix-update --commit --version-regex 'langchain-huggingface==(.*)' python3Packages.langchain-huggingface + nix-update --commit --version-regex 'langchain-mongodb==(.*)' python3Packages.langchain-mongodb + nix-update --commit --version-regex 'langchain-openai==(.*)' python3Packages.langchain-openai ''; }; @@ -93,10 +110,15 @@ buildPythonPackage rec { # flaky, sometimes fail to strip uuid from AIMessageChunk before comparing to test value "test_map_stream" # Compares with machine-specific timings - "test_rate_limit_invoke" - "test_rate_limit_stream" + "test_rate_limit" + # flaky: assert (1726352133.7419367 - 1726352132.2697523) < 1 + "test_benchmark_model" + + # TypeError: exceptions must be derived from Warning, not <class 'NoneType'> + "test_chat_prompt_template_variable_names" + "test_create_model_v2" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Langchain-core the following tests due to the test comparing execution time with magic values. "test_queue_for_streaming_via_sync_call" "test_same_event_loop" diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix index 9c035c50a1d7e..91866b4121128 100644 --- a/pkgs/development/python-modules/langchain-huggingface/default.nix +++ b/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -2,20 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, - freezegun, + + # build-system + poetry-core, + + # dependencies huggingface-hub, langchain-core, sentence-transformers, tokenizers, transformers, + + # tests + freezegun, + httpx, lark, pandas, - poetry-core, pytest-asyncio, pytest-mock, pytest-socket, pytestCheckHook, - pythonOlder, requests-mock, responses, syrupy, @@ -24,16 +30,14 @@ buildPythonPackage rec { pname = "langchain-huggingface"; - version = "0.0.3"; + version = "0.1.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-huggingface==${version}"; - hash = "sha256-4k3C6T2N7SBM/wP8KAwMQqt9DkXDdYNt2i/OkZilWw0="; + hash = "sha256-ESWhhjWjCbBV/3KjeSwEQzvK6os1mmc3at+8gonfGt4="; }; sourceRoot = "${src.name}/libs/partners/huggingface"; @@ -50,6 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun + httpx lark pandas pytest-asyncio @@ -66,6 +71,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_huggingface" ]; + passthru = { + inherit (langchain-core) updateScript; + }; + meta = { changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-huggingface==${version}"; description = "An integration package connecting Huggingface related classes and LangChain"; diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index e14fe4fb0e47f..0a064621887c6 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -2,36 +2,34 @@ lib, buildPythonPackage, fetchFromGitHub, - freezegun, - langchain, + + # build-system + poetry-core, + + # dependencies langchain-core, + numpy, pymongo, - lark, - pandas, - poetry-core, + + freezegun, + httpx, + langchain, pytest-asyncio, - pytest-mock, - pytest-socket, pytestCheckHook, - pythonOlder, - requests-mock, - responses, + pytest-mock, syrupy, - toml, }: buildPythonPackage rec { pname = "langchain-mongodb"; - version = "0.1.8"; + version = "0.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-mongodb==${version}"; - hash = "sha256-fjSvn9O/CrKBexcwuILXFR7AGx/tZtGDWjA0L6XV4Hk="; + hash = "sha256-Jd9toXkS9dGtSIrJQ/5W+swV1z2BJOJKBtkyGzj3oSc="; }; sourceRoot = "${src.name}/libs/partners/mongodb"; @@ -40,28 +38,28 @@ buildPythonPackage rec { dependencies = [ langchain-core + numpy pymongo ]; nativeCheckInputs = [ freezegun + httpx langchain - lark - pandas pytest-asyncio - pytest-mock - pytest-socket pytestCheckHook - requests-mock - responses + pytest-mock syrupy - toml ]; pytestFlagsArray = [ "tests/unit_tests" ]; pythonImportsCheck = [ "langchain_mongodb" ]; + passthru = { + inherit (langchain-core) updateScript; + }; + meta = { changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-mongodb==${version}"; description = "Integration package connecting MongoDB and LangChain"; diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix new file mode 100644 index 0000000000000..72bcf180d414b --- /dev/null +++ b/pkgs/development/python-modules/langchain-ollama/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + langchain-core, + ollama, + + # testing + langchain-standard-tests, + pytestCheckHook, + pytest-asyncio, + syrupy, + + nix-update-script, +}: + +buildPythonPackage rec { + pname = "langchain-ollama"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "refs/tags/langchain-ollama==${version}"; + hash = "sha256-NtlJqIevdaoOO4oDqKsL4OFbw8tHb3FjV9LrTytOGKE="; + }; + + sourceRoot = "${src.name}/libs/partners/ollama"; + + build-system = [ poetry-core ]; + + dependencies = [ + langchain-core + ollama + ]; + + nativeCheckInputs = [ + langchain-standard-tests + pytestCheckHook + pytest-asyncio + syrupy + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; + + pythonImportsCheck = [ "langchain_ollama" ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "langchain-ollama==(.*)" + ]; + }; + + meta = { + changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-ollama==${version}"; + description = "Integration package connecting Ollama and LangChain"; + homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/ollama"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sarahec ]; + }; +} diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index c2376cf89d884..7b0e88098b0bd 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -2,19 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, - freezegun, + + # build-system + poetry-core, + + # dependencies langchain-core, - langchain-standard-tests, openai, tiktoken, + + # tests + freezegun, + langchain-standard-tests, lark, pandas, - poetry-core, pytest-asyncio, + pytestCheckHook, pytest-mock, pytest-socket, - pytestCheckHook, - pythonOlder, requests-mock, responses, syrupy, @@ -23,16 +28,14 @@ buildPythonPackage rec { pname = "langchain-openai"; - version = "0.1.22"; + version = "0.2.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-openai==${version}"; - hash = "sha256-5UAijSTfQ6nQxdZvKHl2o01wDW6+Jphf38V+dAs7Ffk="; + hash = "sha256-M1gyw0Nmh+aLU9scbuqmK2kPyfwtaFaCfue+T8PLguQ="; }; sourceRoot = "${src.name}/libs/partners/openai"; @@ -56,9 +59,9 @@ buildPythonPackage rec { lark pandas pytest-asyncio + pytestCheckHook pytest-mock pytest-socket - pytestCheckHook requests-mock responses syrupy @@ -84,6 +87,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_openai" ]; + passthru = { + inherit (langchain-core) updateScript; + }; + meta = { changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-openai==${version}"; description = "Integration package connecting OpenAI and LangChain"; diff --git a/pkgs/development/python-modules/langchain-standard-tests/default.nix b/pkgs/development/python-modules/langchain-standard-tests/default.nix index 9b45f412f3373..3bec0ee76be3e 100644 --- a/pkgs/development/python-modules/langchain-standard-tests/default.nix +++ b/pkgs/development/python-modules/langchain-standard-tests/default.nix @@ -1,10 +1,19 @@ { lib, buildPythonPackage, + + # build-system poetry-core, + + # dependencies httpx, langchain-core, + syrupy, + + # buildInputs pytest, + + # tests numpy, pytest-asyncio, pytestCheckHook, @@ -23,8 +32,9 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ - langchain-core httpx + langchain-core + syrupy ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index d35c78c22ceda..a19f3ceb7d7ef 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -2,36 +2,43 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system poetry-core, + + # dependencies langchain-core, + + # tests + httpx, pytest-asyncio, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.2.2"; + version = "0.3.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-text-splitters==${version}"; - hash = "sha256-SixF3ZkN+gjQ4KYLhGoezdQAOQ1AlGEC6IBzHePF6/o="; + hash = "sha256-Z0UAUhOjC0wgCY/f1aWsnjFyOPYz/6JnloEKT6b6Ii0="; }; sourceRoot = "${src.name}/libs/text-splitters"; build-system = [ poetry-core ]; - dependencies = [ langchain-core ]; + dependencies = [ + langchain-core + ]; pythonImportsCheck = [ "langchain_text_splitters" ]; nativeCheckInputs = [ + httpx pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 249e1d74fdd74..49b268e97acce 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -1,46 +1,55 @@ { lib, - aiohttp, - async-timeout, - bash, buildPythonPackage, fetchFromGitHub, - freezegun, + pythonOlder, + + # build-system + poetry-core, + + # buildInputs + bash, + + # dependencies + aiohttp, langchain-core, langchain-text-splitters, langsmith, - lark, + pydantic, + pyyaml, + requests, + sqlalchemy, + tenacity, + async-timeout, + + # optional-dependencies numpy, + + # tests + freezegun, + httpx, + lark, pandas, - poetry-core, - pydantic, pytest-asyncio, pytest-mock, pytest-socket, pytestCheckHook, - pythonOlder, - pyyaml, requests-mock, - requests, responses, - sqlalchemy, syrupy, - tenacity, toml, }: buildPythonPackage rec { pname = "langchain"; - version = "0.2.14"; + version = "0.3.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain==${version}"; - hash = "sha256-dgXcZu7dtmwlXp8dzHSNfbBnK7RWvrSwqYELm1fczzc="; + hash = "sha256-Zg+9ZwzTDKCyfz4T/tVIGfRUUmkE939hocxSWpFRngQ="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -67,6 +76,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun + httpx lark pandas pytest-asyncio diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 981b90bbc5ec1..342459baea457 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "langcodes"; - version = "3.4.0"; + version = "3.4.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-rlp30aAdDR6RhUpnGJCJK3zpq7YBq3Mn/FyHT4meGXk="; + hash = "sha256-okh5/tI4ATrDryQkudESTji0o4sgRP0pfI/zjlkS5xg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index 26577d3f3927d..6a434fb0cb005 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langfuse"; - version = "2.44.1"; + version = "2.51.2"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; rev = "refs/tags/v${version}"; - hash = "sha256-RoejwWVV3+zRWKkbhV82Gf9DSqrQ2r+SoR99mzmc3TM="; + hash = "sha256-MaTR7hEE+Ed9pCXJ2JSxzLAJ0O0SnN3M3b5/7tdmQBw="; }; build-system = [ poetry-core ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = { description = "Instrument your LLM app with decorators or low-level SDK and get detailed tracing/observability"; homepage = "https://github.com/langfuse/langfuse-python"; - changelog = "https://github.com/langfuse/langfuse-python/releases/tag/${src.rev}"; + changelog = "https://github.com/langfuse/langfuse-python/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix index a3e9d63d62136..7d511994b6d50 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix @@ -5,6 +5,7 @@ langgraph-checkpoint, orjson, psycopg, + psycopg-pool, langgraph-sdk, poetry-core, pythonOlder, @@ -12,11 +13,12 @@ postgresqlTestHook, pytestCheckHook, pytest-asyncio, + stdenvNoCC, }: buildPythonPackage rec { pname = "langgraph-checkpoint-postgres"; - version = "1.0.3"; + version = "1.0.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +27,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpointpostgres==${version}"; - hash = "sha256-U7Bymo+Nj82kwjxN33W2MT10jv+lioZUxIKUt8Yxh/s="; + hash = "sha256-F9sgZQQBFs5hDUsaR5BI9ERve9L8LTUvEKOgyz5ioqY="; }; postgresqlTestSetupPost = '' @@ -41,8 +43,13 @@ buildPythonPackage rec { langgraph-checkpoint orjson psycopg + psycopg-pool ]; + pythonRelaxDeps = [ "psycopg-pool" ]; + + doCheck = !(stdenvNoCC.hostPlatform.isDarwin); + pythonImportsCheck = [ "langgraph.checkpoint.postgres" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix index 323faf5ffb1b7..e94cca80eb542 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-sqlite"; - version = "1.0.0"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpointsqlite==${version}"; - hash = "sha256-TUiZOf34jhs+nkeTsprtTdoVqDt7kZd8NxYLKX4l0kQ="; + hash = "sha256-/pHJtK691anqn2It4ZstCGXJS0JGtdKZvqS9f3ly+FQ="; }; sourceRoot = "${src.name}/libs/checkpoint-sqlite"; diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix index 77b3ba34826e2..3857de5bd7353 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix @@ -4,6 +4,7 @@ dataclasses-json, fetchFromGitHub, langchain-core, + langgraph-sdk, poetry-core, pytest-asyncio, pytestCheckHook, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint"; - version = "1.0.3"; + version = "1.0.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpoint==${version}"; - hash = "sha256-5JP9f2uHNo71btQ96sBPlS7JPqo35C3VEMeHN1cJSro="; + hash = "sha256-3gm+L67pPAKpY1kqnX1lPnca40KoBVZdRZ1Cy6D0dzU="; }; sourceRoot = "${src.name}/libs/checkpoint"; @@ -38,6 +39,15 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # AssertionError + "test_serde_jsonplus" + ]; + + passthru = { + updateScript = langgraph-sdk.updateScript; + }; + meta = { changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpoint==${version}"; description = "Library with base interfaces for LangGraph checkpoint savers"; diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index d002f958fb407..710433dfe1346 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -2,26 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies httpx, httpx-sse, orjson, - poetry-core, - pythonOlder, + + # passthru writeScript, }: buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.1.26"; + version = "0.1.30"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/sdk==${version}"; - hash = "sha256-o7JrB2WSWfPm927tDRMcjzx+6Io6Q+Yjp4XPVs2+F4o="; + hash = "sha256-gI12XuxFplqIKVlVjeO60YxT7WG/SSsZ0aWfjg5bHIs="; }; sourceRoot = "${src.name}/libs/sdk-py"; @@ -45,6 +48,9 @@ buildPythonPackage rec { set -eu -o pipefail nix-update --commit --version-regex '(.*)' python3Packages.langgraph nix-update --commit --version-regex 'sdk==(.*)' python3Packages.langgraph-sdk + nix-update --commit --version-regex 'checkpoint==(.*)' python3Packages.langgraph-checkpoint + nix-update --commit --version-regex 'checkpointpostgres==(.*)' python3Packages.langgraph-checkpoint-postgres + nix-update --commit --version-regex 'checkpointsqlite==(.*)' python3Packages.langgraph-checkpoint-sqlite ''; }; diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index 712e90a602c11..087db330d195f 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -1,43 +1,49 @@ { lib, + stdenv, buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + langchain-core, + langgraph-checkpoint, + + # tests aiosqlite, dataclasses-json, - fetchFromGitHub, grandalf, httpx, - langchain-core, - langgraph-sdk, - langgraph-checkpoint, langgraph-checkpoint-postgres, langgraph-checkpoint-sqlite, - psycopg, langsmith, - poetry-core, + psycopg, pydantic, pytest-asyncio, pytest-mock, pytest-repeat, pytest-xdist, pytestCheckHook, - pythonOlder, syrupy, postgresql, postgresqlTestHook, + + # passthru + langgraph-sdk, }: buildPythonPackage rec { pname = "langgraph"; - version = "0.2.4"; + version = "0.2.21"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/${version}"; - hash = "sha256-jUBaWXrHCXAph8EGEJnH7lbKIyjQ8oPt4eDMyIkbURo="; + hash = "sha256-1Ch2V85omAKnXK9rMihNtyjIoOvmVUm8Dbdo5GBoik4="; }; postgresqlTestSetupPost = '' @@ -56,6 +62,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "langgraph" ]; + # postgresql doesn't play nicely with the darwin sandbox: + # FATAL: could not create shared memory segment: Operation not permitted + doCheck = !stdenv.hostPlatform.isDarwin; + nativeCheckInputs = [ aiosqlite dataclasses-json @@ -65,6 +75,7 @@ buildPythonPackage rec { langgraph-checkpoint-sqlite langsmith psycopg + psycopg.pool pydantic pytest-asyncio pytest-mock @@ -93,6 +104,12 @@ buildPythonPackage rec { "test_remove_message_via_state_update" ]; + disabledTestPaths = [ + # psycopg.errors.InsufficientPrivilege: permission denied to create database + "tests/test_pregel_async.py" + "tests/test_pregel.py" + ]; + passthru = { updateScript = langgraph-sdk.updateScript; }; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 16e3b19f71b39..2a9d8446fb55b 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -1,37 +1,40 @@ { lib, stdenv, - anthropic, - attr, buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + orjson, + pydantic, + requests, + + # tests + anthropic, dataclasses-json, fastapi, - fetchFromGitHub, freezegun, httpx, instructor, - orjson, - poetry-core, - pydantic, pytest-asyncio, pytestCheckHook, - pythonOlder, - requests, uvicorn, + attr, }: buildPythonPackage rec { pname = "langsmith"; - version = "0.1.99"; + version = "0.1.129"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-aN5HiQAXX7ZlVBzkit4DAw+7KQHI3ck1DLvBPDSKVhM="; + hash = "sha256-GIWDGr6zd/YaSgcSrIw0a1Ul9RxdmtJBMTEbGapudtw="; }; sourceRoot = "${src.name}/python"; @@ -56,7 +59,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook uvicorn - ] ++ lib.optionals stdenv.isLinux [ attr ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ attr ]; disabledTests = [ # These tests require network access @@ -89,12 +92,12 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform"; homepage = "https://github.com/langchain-ai/langsmith-sdk"; changelog = "https://github.com/langchain-ai/langsmith-sdk/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; mainProgram = "langsmith"; }; } diff --git a/pkgs/development/python-modules/latexrestricted/default.nix b/pkgs/development/python-modules/latexrestricted/default.nix new file mode 100644 index 0000000000000..394176397b74c --- /dev/null +++ b/pkgs/development/python-modules/latexrestricted/default.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchPypi, + buildPythonPackage, + setuptools, +}: + +buildPythonPackage rec { + pname = "latexrestricted"; + version = "0.4.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-AMfDTruJKejDdXW98VkeeEwELql5566bsL1SutLDpso="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "latexrestricted" ]; + + # upstream has no tests + doCheck = false; + + meta = { + homepage = "https://github.com/gpoore/latexrestricted"; + description = "Python library for creating executables compatible with LaTeX restricted shell escape"; + changelog = "https://github.com/gpoore/latexrestricted/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.lppl13c; + maintainers = with lib.maintainers; [ romildo ]; + }; +} diff --git a/pkgs/development/python-modules/layoutparser/default.nix b/pkgs/development/python-modules/layoutparser/default.nix index 3b6b8165aea2c..4a6c983e75abb 100644 --- a/pkgs/development/python-modules/layoutparser/default.nix +++ b/pkgs/development/python-modules/layoutparser/default.nix @@ -40,7 +40,7 @@ let torchvision effdet ]; - # paddledetection = [ paddlepaddle ] + # paddledetection = [ paddlepaddle ] }; in buildPythonPackage { @@ -96,7 +96,7 @@ buildPythonPackage { "tests_deps/test_only_paddledetection.py" # requires paddlepaddle not yet packaged ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; meta = with lib; { description = "Unified toolkit for Deep Learning Based Document Image Analysis"; diff --git a/pkgs/development/python-modules/lcn-frontend/default.nix b/pkgs/development/python-modules/lcn-frontend/default.nix new file mode 100644 index 0000000000000..2ddb12711b41c --- /dev/null +++ b/pkgs/development/python-modules/lcn-frontend/default.nix @@ -0,0 +1,39 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "lcn-frontend"; + version = "0.1.6"; + pyproject = true; + + src = fetchPypi { + pname = "lcn_frontend"; + inherit version; + hash = "sha256-bOR2BFYHZjRVhlH72ljqp4WKtWdqBkzZNyrmtuIzmIM="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools~=68.0" setuptools \ + --replace-fail "wheel~=0.40.0" wheel + ''; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "lcn_frontend" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/alengwenus/lcn-frontend/releases/tag/${version}"; + description = "LCN panel for Home Assistant"; + homepage = "https://github.com/alengwenus/lcn-frontend"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix b/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix new file mode 100644 index 0000000000000..23733a9be2fac --- /dev/null +++ b/pkgs/development/python-modules/ldap3-bleeding-edge/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + cryptography, + fetchPypi, + gssapi, + pyasn1, + pycryptodomex, + setuptools, +}: + +buildPythonPackage rec { + pname = "ldap3-bleeding-edge"; + version = "2.10.1.1337"; + pyproject = true; + + src = fetchPypi { + pname = "ldap3_bleeding_edge"; + inherit version; + hash = "sha256-j4hzcqwOONol6YqY9Ldz9YphjPmacFoVyqUnMHW1aZk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + cryptography + gssapi + pyasn1 + pycryptodomex + ]; + + pythonImportsCheck = [ "ldap3" ]; + + # Tests require network access + doCheck = false; + + meta = { + description = "Strictly RFC 4510 conforming LDAP V3 client library (bleeding edge)"; + homepage = "https://pypi.org/project/ldap3-bleeding-edge/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 5010d81530326..4885fa14524e8 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { python-gnupg python-u2flib-host websocket-client - ] ++ lib.optionals stdenv.isLinux [ bleak ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bleak ]; # No tests doCheck = false; diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index 8afa1ea14cb51..0cbc048ee6708 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { buildInputs = [ setuptools setuptools-scm - ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; propagatedBuildInputs = [ cryptography click diff --git a/pkgs/development/python-modules/lektricowifi/default.nix b/pkgs/development/python-modules/lektricowifi/default.nix new file mode 100644 index 0000000000000..b6b4a5142c3c9 --- /dev/null +++ b/pkgs/development/python-modules/lektricowifi/default.nix @@ -0,0 +1,58 @@ +{ + async-timeout, + buildPythonPackage, + fetchFromGitHub, + httpx, + lib, + pydantic, + pytest-asyncio, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "lektricowifi"; + version = "0.0.43"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Lektrico"; + repo = "lektricowifi"; + rev = "refs/tags/v.${version}"; + hash = "sha256-NwM1WpH6tS0iAVpG2gSFJpDPPn9nECHAzpOnWzeYPH4="; + }; + + postPatch = '' + substituteInPlace tests/test_mocked_devices.py \ + --replace-fail "from asyncmock import AsyncMock" "from unittest.mock import AsyncMock" + ''; + + build-system = [ setuptools ]; + + pythonRelaxDeps = [ + "pydantic" + ]; + + dependencies = [ + async-timeout + httpx + pydantic + ]; + + pythonImportsCheck = [ "lektricowifi" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + # AttributeError: type object 'InfoForCharger' has no attribute 'from_dict' + doCheck = false; + + meta = { + description = "Communication with Lektrico's chargers"; + homepage = "https://github.com/Lektrico/lektricowifi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/leveldb/default.nix b/pkgs/development/python-modules/leveldb/default.nix index 7212c2c4e02b3..a13f11c742064 100644 --- a/pkgs/development/python-modules/leveldb/default.nix +++ b/pkgs/development/python-modules/leveldb/default.nix @@ -1,19 +1,26 @@ { lib, - fetchPypi, buildPythonPackage, + fetchPypi, + pythonAtLeast, + setuptools, }: buildPythonPackage rec { pname = "leveldb"; version = "0.201"; - format = "setuptools"; + + pyproject = true; + + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; sha256 = "1cffe776842917e09f073bd6ea5856c64136aebddbe51bd17ea29913472fecbf"; }; + nativeBuildInputs = [ setuptools ]; + meta = with lib; { homepage = "https://code.google.com/archive/p/py-leveldb/"; description = "Thread-safe Python bindings for LevelDB"; diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index dbf4d5a5025fd..e7e581174b613 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lib4sbom"; - version = "0.7.4"; + version = "0.7.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "anthonyharrison"; repo = "lib4sbom"; rev = "refs/tags/v${version}"; - hash = "sha256-Uqv6E9qMJRsfYICVAiZEQGlG/0w8aECuh8wMa85FnlE="; + hash = "sha256-NWrHz4G5Ps5GoZUcx0LiSQzbTZlU4eGYgli6znG+NSs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 4cfe741189085..3422ae2ced2d7 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -3,6 +3,7 @@ fetchFromGitHub, bech32, buildPythonPackage, + setuptools, cryptography, ed25519, ecdsa, @@ -11,7 +12,7 @@ mnemonic, unidecode, mock, - pytest, + pytestCheckHook, backports-shutil-which, configargparse, python-daemon, @@ -23,14 +24,14 @@ buildPythonPackage rec { pname = "libagent"; - version = "0.14.8"; - format = "setuptools"; + version = "0.15.0"; + pyproject = true; src = fetchFromGitHub { owner = "romanz"; repo = "trezor-agent"; - rev = "v${version}"; - hash = "sha256-tcVott/GlHsICQf640Gm5jx89fZWsCdcYnBxi/Kh2oc="; + rev = "refs/tags/v${version}"; + hash = "sha256-NmpFyLjLdR9r1tc06iDNH8Tc7isUelTg13mWPrQvxSc="; }; # hardcode the path to gpgconf in the libagent library @@ -40,7 +41,9 @@ buildPythonPackage rec { --replace "'gpg-connect-agent'" "'${gnupg}/bin/gpg-connect-agent'" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ unidecode backports-shutil-which configargparse @@ -55,14 +58,17 @@ buildPythonPackage rec { cryptography ]; + pythonImportsCheck = [ "libagent" ]; + nativeCheckInputs = [ mock - pytest + pytestCheckHook ]; - checkPhase = '' - py.test libagent/tests - ''; + disabledTests = [ + # test fails in sandbox + "test_get_agent_sock_path" + ]; meta = with lib; { description = "Using hardware wallets as SSH/GPG agent"; diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix index 730d1a9217d5a..b81e67f8f926f 100644 --- a/pkgs/development/python-modules/libasyncns/default.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { patches = [ ./libasyncns-fix-res-consts.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace resquery.c \ --replace '<arpa/nameser.h>' '<arpa/nameser_compat.h>' ''; diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index ab176fd8252f1..3ccf4c8e12fbe 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -3,8 +3,10 @@ stdenv, buildPythonPackage, fetchFromGitHub, + callPackage, cargo, - hypothesis, + hypothesmith, + libcst, libiconv, pytestCheckHook, python, @@ -16,14 +18,15 @@ setuptools-scm, typing-extensions, typing-inspect, + ufmt, }: buildPythonPackage rec { pname = "libcst"; version = "1.4.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "instagram"; @@ -41,60 +44,61 @@ buildPythonPackage rec { cargoRoot = "native"; - postPatch = '' - # avoid infinite recursion by not formatting the release files - substituteInPlace libcst/codegen/generate.py \ - --replace '"ufmt"' '"true"' - ''; - - nativeBuildInputs = [ + build-system = [ setuptools-rust setuptools-scm + ]; + + nativeBuildInputs = [ rustPlatform.cargoSetupHook cargo rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - propagatedBuildInputs = [ + dependencies = [ typing-extensions typing-inspect pyyaml ]; nativeCheckInputs = [ - hypothesis + hypothesmith pytestCheckHook + ufmt ]; preCheck = '' - # otherwise import libcst.native fails - cp build/lib.*/libcst/native.* libcst/ - - ${python.interpreter} -m libcst.codegen.generate visitors - ${python.interpreter} -m libcst.codegen.generate return_types - - # Can't run all tests due to circular dependency on hypothesmith -> libcst - rm -r {libcst/tests,libcst/codegen/tests,libcst/m*/tests} + # import from $out instead + rm libcst/__init__.py ''; disabledTests = [ - # No files are generated - "test_codemod_formatter_error_input" + # FIXME package pyre-test + "TypeInferenceProviderTest" + # we'd need to run `python -m libcst.codegen.generate all` but shouldn't modify $out + "test_codegen_clean_visitor_functions" ]; + # circular dependency on hypothesmith and ufmt + doCheck = false; + + passthru.tests = { + pytest = libcst.overridePythonAttrs { doCheck = true; }; + }; + pythonImportsCheck = [ "libcst" ]; - meta = with lib; { + meta = { description = "Concrete Syntax Tree (CST) parser and serializer library for Python"; homepage = "https://github.com/Instagram/libcst"; changelog = "https://github.com/Instagram/LibCST/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ mit asl20 psfl ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 03f249969a002..7d0ce1a2ed28b 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.3.9"; + version = "3.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-AAjH5+IQdkzTIp1+q638d9dzAfo7nXUudOLQm81P7lU="; + hash = "sha256-BtESc9BIZeDNNPJYyMLTeMsNHm+xBcLueyJ7/1iXFos="; }; postPatch = '' diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix index 5f5725a6a8ce5..980109e499b66 100644 --- a/pkgs/development/python-modules/libmambapy/default.nix +++ b/pkgs/development/python-modules/libmambapy/default.nix @@ -22,14 +22,14 @@ }: buildPythonPackage rec { pname = "libmambapy"; - version = "2024.03.25"; + version = "2024.09.20"; pyproject = true; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "refs/tags/${version}"; - hash = "sha256-sxZDlMFoMLq2EAzwBVO++xvU1C30JoIoZXEX/sqkXS0="; + hash = "sha256-/mfZEfpB4CQ2f8zyzYbnjvBgK4VEPngTNQJT4Oh62Qs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index eae30cc7407d9..39a2b99ddf0dd 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "libretranslate"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; src = fetchFromGitHub { owner = "LibreTranslate"; repo = "LibreTranslate"; rev = "refs/tags/v${version}"; - hash = "sha256-QH+H1UubDDv2SZa/razs+JYu4BbZzWHh7DLWfZEWCes="; + hash = "sha256-c/MbO8KST2QnP32Y2FfXjJcfh6O7hqQFcZOn1U0FqRM="; }; build-system = [ diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 9b015e335b754..2c9e2447e33c1 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies.matplotlib = [ matplotlib ]; + optional-dependencies.matplotlib = [ matplotlib ]; # check that import works, this allows to capture errors like https://github.com/librosa/librosa/issues/1160 pythonImportsCheck = [ "librosa" ]; @@ -90,7 +90,7 @@ buildPythonPackage rec { pytestCheckHook resampy samplerate - ] ++ passthru.optional-dependencies.matplotlib; + ] ++ optional-dependencies.matplotlib; preCheck = '' export HOME=$TMPDIR @@ -106,7 +106,7 @@ buildPythonPackage rec { "test_cite_badversion" "test_cite_unreleased" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # crashing the python interpreter "test_unknown_time_unit" "test_unknown_wavaxis" diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 0bb5cb5cda287..917b20ef077f7 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -47,12 +47,12 @@ buildPythonPackage rec { # Assertion error "test_capture_pane_start" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # tests/test_pane.py:113: AssertionError "test_capture_pane_start" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_test.py" ]; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 6e07d603b1b42..231b9e5c258ce 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -29,7 +29,7 @@ boost, ocl-icd, opencl-headers, - gpuSupport ? stdenv.isLinux && !cudaSupport, + gpuSupport ? stdenv.hostPlatform.isLinux && !cudaSupport, cudaSupport ? config.cudaSupport, cudaPackages, }: @@ -84,7 +84,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - passthru.optional-dependencies = { + optional-dependencies = { arrow = [ cffi pyarrow diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index 393a965535e71..4d437ac67c54f 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -19,16 +19,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.11.6"; + version = "0.11.7"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-Bw28mLz9GaMucqP+EqR1F3OKLxDJiIVacrCBIV35G/I="; + hash = "sha256-0XxBDe9OGQLfl4viuUm5Hx8WvZhSj+J0FoDqD/JOiZM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index 0873eff17d0fa..dce3a93374e0a 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { scikit-build ]; - passthru.optional-dependencies = { + optional-dependencies = { ipython = [ ipython ]; }; nativeCheckInputs = [ pytestCheckHook ubelt - ] ++ passthru.optional-dependencies.ipython; + ] ++ optional-dependencies.ipython; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/lineax/default.nix b/pkgs/development/python-modules/lineax/default.nix new file mode 100644 index 0000000000000..8f547bc1d9d76 --- /dev/null +++ b/pkgs/development/python-modules/lineax/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + equinox, + jax, + jaxtyping, + typing-extensions, + + # tests + beartype, + pytest, + python, +}: + +buildPythonPackage rec { + pname = "lineax"; + version = "0.0.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "patrick-kidger"; + repo = "lineax"; + rev = "refs/tags/v${version}"; + hash = "sha256-rM3H+q75F98eEIJkEszWgxD5C5vGK5RlYtVv8GD/VC0="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + equinox + jax + jaxtyping + typing-extensions + ]; + + pythonImportsCheck = [ "lineax" ]; + + nativeCheckInputs = [ + beartype + pytest + ]; + + # Intentionaly not using pytest directly as it leads to JAX out-of-memory'ing + # https://github.com/patrick-kidger/lineax/blob/1909d190c1963d5f2d991508c1b2714f2266048b/tests/README.md + checkPhase = '' + runHook preCheck + + ${python.interpreter} -m tests + + runHook postCheck + ''; + + meta = { + description = "Linear solvers in JAX and Equinox"; + homepage = "https://github.com/patrick-kidger/lineax"; + changelog = "https://github.com/patrick-kidger/lineax/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/lingva/default.nix b/pkgs/development/python-modules/lingva/default.nix index 153284d88125f..3f6002284a5c7 100644 --- a/pkgs/development/python-modules/lingva/default.nix +++ b/pkgs/development/python-modules/lingva/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lingva"; - version = "5.0.3"; + version = "5.0.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "lingva"; rev = "refs/tags/v${version}"; - hash = "sha256-usJyEbHtwhsc0ulG9+7zJ/kDUFrxfqykZLOAWwzP+Dw="; + hash = "sha256-2h3J+pvXRmjD7noMA7Cyu5Tf/9R8Akv08A7xJMLVD08="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix index 6904fccd83bf4..c2dfa51bbf2a7 100644 --- a/pkgs/development/python-modules/linien-common/default.nix +++ b/pkgs/development/python-modules/linien-common/default.nix @@ -5,7 +5,7 @@ setuptools, importlib-metadata, numpy, - rpyc4, + rpyc, scipy, appdirs, callPackage, @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "linien-common"; - version = "2.0.4"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "linien-org"; repo = "linien"; rev = "refs/tags/v${version}"; - hash = "sha256-TCQ1jLZpeQlG/ZyWY0qrHceMJ1TH7AYO7toYc74ZWq4="; + hash = "sha256-j6oiP/usLfV5HZtKLcXQ5pHhhxRG05kP2FMwingiWm0="; }; sourceRoot = "${src.name}/linien-common"; @@ -29,12 +29,14 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "importlib-metadata" ]; + + dependencies = [ importlib-metadata numpy - rpyc4 + rpyc scipy appdirs ]; diff --git a/pkgs/development/python-modules/linien-common/tests.nix b/pkgs/development/python-modules/linien-common/tests.nix index 40a69986187c9..b95307fce9ac5 100644 --- a/pkgs/development/python-modules/linien-common/tests.nix +++ b/pkgs/development/python-modules/linien-common/tests.nix @@ -1,26 +1,45 @@ { buildPythonPackage, - linien-common, + cma, linien-client, + linien-common, + matplotlib, + migen, + misoc, + pytest-plt, pytestCheckHook, }: buildPythonPackage { pname = "linien-tests"; inherit (linien-common) version src; - format = "other"; pyproject = false; dontBuild = true; dontInstall = true; nativeCheckInputs = [ - linien-common + cma linien-client + linien-common + matplotlib + migen + misoc + pytest-plt pytestCheckHook ]; preCheck = '' export HOME=$(mktemp -d) ''; + + disabledTestPaths = [ + # require linien-server which is not packaged + "tests/test_algorithm_selection.py" + "tests/test_approacher.py" + "tests/test_optimizer_engines.py" + "tests/test_optimizer_utils.py" + "tests/test_robust_autolock.py" + "tests/test_simple_autolock_cpu.py" + ]; } diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 816c72e5f288c..c05d3bbc75a20 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -5,8 +5,10 @@ pythonOlder, setuptools, requests, + polling, pytestCheckHook, mock, + httpretty, }: buildPythonPackage rec { @@ -26,11 +28,20 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + polling + ]; nativeCheckInputs = [ - mock pytestCheckHook + mock + httpretty + ]; + + disabledTestPaths = [ + # needs api token + "test/integration" ]; pythonImportsCheck = [ "linode_api4" ]; diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 9d6ae0c7a8158..8b19dd4915a08 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.44.7"; + version = "1.47.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-qEO5QWaW3Nd/zKNjZ31e5y5hNc55qZGDYCD66z+ftUk="; + hash = "sha256-onFBSClB+FDbpc7VYkm2jks8G6L/LGsZq9tyFW+uHZc="; }; build-system = [ poetry-core ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { tokenizers ]; - passthru.optional-dependencies = { + optional-dependencies = { proxy = [ apscheduler backoff diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index f949eef4cf6b9..8e409c9fe79ae 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.0.11"; + version = "0.0.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-EAiCtSiJIGUhFDbaBIJS1X7KFNhoPS/eb4nusglQrBg="; + hash = "sha256-f9aFe7u5GTdTVXLMtI2qOBifVc3XQRGF2Ag9qym6Epk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix index c7a1d2e46676d..4835a3240510d 100644 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-agent-openai"; - version = "0.2.9"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-3r6G2m2dmD2zK0Rd3KfHmKwUD+WVc7r97XNZWzmV89U="; + hash = "sha256-gONAjZcSG+vKP6P/0UtRKFhwwcPHPU7gTT0Yz+YEBGY="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index 5d6795dce9729..d3229e4de03cb 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-cli"; - version = "0.1.13"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_cli"; inherit version; - hash = "sha256-hhR97UQ5+6sdbHwNcujyMdKTXan99cnT8N3k811Eqlk="; + hash = "sha256-GJDdaHz0QPNlE2WlSeMDNjFiwWe4772Ho6oQBY1tXHc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index f6dab9b1f0fbc..df02b96ff3096 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -6,13 +6,13 @@ deprecated, dirtyjson, fetchFromGitHub, - fetchzip, fsspec, jsonpath-ng, llamaindex-py-client, nest-asyncio, networkx, nltk, + nltk-data, numpy, openai, pandas, @@ -33,21 +33,9 @@ typing-inspect, }: -let - stopwords = fetchzip { - url = "https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/stopwords.zip"; - hash = "sha256-tX1CMxSvFjr0nnLxbbycaX/IBnzHFxljMZceX5zElPY="; - }; - - punkt = fetchzip { - url = "https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/tokenizers/punkt.zip"; - hash = "sha256-SKZu26K17qMUg7iCFZey0GTECUZ+sTTrF/pqeEgJCos="; - }; -in - buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.60"; + version = "0.11.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -56,7 +44,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-CH/YTG0/SVDhwY1iN+K1s7cdTDFDZboO6N9208qLFf4="; + hash = "sha256-mkABEjyZb8ONS1BaETbL47sDHo/BOD7G+fJGO0MQyd0="; }; sourceRoot = "${src.name}/${pname}"; @@ -67,12 +55,12 @@ buildPythonPackage rec { # Setting `NLTK_DATA` to a writable path can also solve this problem, but it needs to be done in # every package that depends on `llama-index-core` for `pythonImportsCheck` not to fail, so this # solution seems more elegant. - patchPhase = '' + postPatch = '' mkdir -p llama_index/core/_static/nltk_cache/corpora/stopwords/ - cp -r ${stopwords}/* llama_index/core/_static/nltk_cache/corpora/stopwords/ + cp -r ${nltk-data.stopwords}/corpora/stopwords/* llama_index/core/_static/nltk_cache/corpora/stopwords/ mkdir -p llama_index/core/_static/nltk_cache/tokenizers/punkt/ - cp -r ${punkt}/* llama_index/core/_static/nltk_cache/tokenizers/punkt/ + cp -r ${nltk-data.punkt}/tokenizers/punkt/* llama_index/core/_static/nltk_cache/tokenizers/punkt/ ''; build-system = [ poetry-core ]; @@ -135,6 +123,12 @@ buildPythonPackage rec { "tests/tools/" ]; + disabledTests = [ + # Tests require network access + "test_from_namespaced_persist_dir" + "test_from_persist_dir" + ]; + meta = with lib; { description = "Data framework for your LLM applications"; homepage = "https://github.com/run-llama/llama_index/"; diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix index 466f936533375..76dcdacb5c1e2 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-gemini"; - version = "0.1.8"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_gemini"; inherit version; - hash = "sha256-rQKyPqZnyVYH2h5TTVV53kYYldGURWARWjYBrBb4d5M="; + hash = "sha256-7ftu+Gh8Ar9+yrFkUldlAvUfVtAw+xzrmyzqr7TeQdc="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix index f848acf1fd42f..060b3f562c494 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-google"; - version = "0.1.6"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_google"; inherit version; - hash = "sha256-XPqZ+4aZfrTGU4sOLxMElG6kuGVJa8/3uxW+icSHpzQ="; + hash = "sha256-7L24jKB7uFs+4OIIsXdweJ3TRuP4SFjY/p97ocUfmL8="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix index 4da4ef2ab654f..935590283d858 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-huggingface"; - version = "0.2.2"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_huggingface"; inherit version; - hash = "sha256-Q7KXh0DSkpGuTHVmki0rHHVD3JeeJoeUtXjhoq37Qxk="; + hash = "sha256-eu9jJKGVdua5W/6SfDvU/BxXJe3Onya05dLu+ifAL9s="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix index db3ef8d5b9947..3f309d4ec12d0 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix @@ -3,13 +3,14 @@ buildPythonPackage, fetchPypi, llama-index-core, + ollama, poetry-core, pythonOlder, }: buildPythonPackage rec { pname = "llama-index-embeddings-ollama"; - version = "0.1.3"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,12 +18,15 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_ollama"; inherit version; - hash = "sha256-S9HdMjDJvgTPpFsow6gGbkbBZU1DYPy+zcFxiskBPso="; + hash = "sha256-Wj51+hS+fisagpN0FsiAIE3JbhsdJibcW96T8CHntUA="; }; build-system = [ poetry-core ]; - dependencies = [ llama-index-core ]; + dependencies = [ + llama-index-core + ollama + ]; # Tests are only available in the mono repo doCheck = false; diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix index f6027aee43f84..24d78be21ef9e 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-openai"; - version = "0.1.10"; + version = "0.2.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_openai"; inherit version; - hash = "sha256-G8H8m0Z3OhKHDF0wl9NzXXyjOAXxJGKo41ropuXOHPY="; + hash = "sha256-AEfdcddHBoZF7XKMKTEqqRtlu+TGFCGAA0xk38XG9ug="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix index cd093a05e17cf..65be86795ec7e 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-nebula"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_nebula"; inherit version; - hash = "sha256-wX/j4wSUp12QlXLy0B0dUB0V7zjDX75NBE9mNWbj0w8="; + hash = "sha256-yT1jxJEnBKWcsHCgBPx8Ue+wkggdL9S2havmJtSYcD4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 3700c2bc96ba4..62fe9f4660028 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.2.11"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-nXKpwbE28vq2Ew8Vrw0rxveHBVbu6542wt+aM1t4xl0="; + hash = "sha256-O/iTlpbREmN1tbojbaqZ7gLAN2JdKmKEzhKCnpth6S0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix index dbc2bd5238b1d..81592cb086e79 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neptune"; - version = "0.1.3"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neptune"; inherit version; - hash = "sha256-ZveFCJJT7Qal82cuVTs+3AmSuvdc7GsHqqqNvcDb3CY="; + hash = "sha256-0dT1T5DJEXBvCilwf4YZVZ2H43piI6xkpUGGpKu8GsY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index eeef4efe2ed8c..7445ff6453ae7 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.2.7"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-1+m0zFAhSzz8116mPKzOTuNgkstnLAA/Ff0jujHEnsA="; + hash = "sha256-++v/eHaiGbarlokq58QyqSmRlfq49n1KSg6/baIQskI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-legacy/default.nix b/pkgs/development/python-modules/llama-index-legacy/default.nix index e7c350cdd0a04..f51ae416bb1d2 100644 --- a/pkgs/development/python-modules/llama-index-legacy/default.nix +++ b/pkgs/development/python-modules/llama-index-legacy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-legacy"; - version = "0.9.48"; + version = "0.9.48.post3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_legacy"; inherit version; - hash = "sha256-gt3EaR7b9JUz1lWCwkm6IsA/6W+9PpL3dY3M7yjkODQ="; + hash = "sha256-9pafEIXvsKvr1jZ+RvNRICDz9rnAhvRYpRmDDdYeggY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index 998759b62920d..7967890cb317a 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.2.2"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-DH8ZLLi3aHB71RVLl+KkEoRzLWIHDrdhkN7hJelSReo="; + hash = "sha256-J54Z9tWb81DcIIDVzaXqa9JkKd576gvGdMoiTDoTOII="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix index 4415127ee30c9..fd6b916bec0a0 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai-like"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai_like"; inherit version; - hash = "sha256-w0EjJQd8dSY+N9YNUBMUub3HcPEtiisW51bn2ayPnj8="; + hash = "sha256-0E7r8TZadpl557DevF3dXLHLx8oXXyeWABvUPLgx7Nw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 5a10557cc9cc6..8b113fe587a1e 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -3,13 +3,14 @@ buildPythonPackage, fetchPypi, llama-index-core, + openai, poetry-core, pythonOlder, }: buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.1.27"; + version = "0.2.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,12 +18,20 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-N8LRFZtWYH06gH2QJg7iW08AIIbWJRxycq+8U/JRRgM="; + hash = "sha256-VjdvOeOkAlO1xPuQ0Ptq8JPyG7KTWSVhXwwooo0CgYc="; }; + pythonRemoveDeps = [ + # Circular dependency + "llama-index-agent-openai" + ]; + build-system = [ poetry-core ]; - dependencies = [ llama-index-core ]; + dependencies = [ + llama-index-core + openai + ]; # Tests are only available in the mono repo doCheck = false; diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index 963f054cd6ef1..aa71aea79b97d 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.1.8"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-XiyUpkFaJQnK0DXM6jRGGVmuMnpZANPoIEF+nruaE+w="; + hash = "sha256-G1vmkdX6KGH9S1oHGIPclNgts+HH/2hthN2EBIo1THs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix index 781e03a06a447..62b9f6c2527f3 100644 --- a/pkgs/development/python-modules/llama-index-program-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-program-openai"; - version = "0.1.7"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_program_openai"; inherit version; - hash = "sha256-v362GgczgXFL5aBJ2TtABE3+Ub1DM77lOdFTK3QHYh8="; + hash = "sha256-QTmTVUHAESV/v+uWYrO/Eje3Ke9LHI9N31tnidI3SsQ="; }; pythonRelaxDeps = [ "llama-index-agent-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix index 4633a56770ad1..7f7615953bba0 100644 --- a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-question-gen-openai"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_question_gen_openai"; inherit version; - hash = "sha256-RIYZgRekVFfS4DauYLk69YBSiTzH14+ptvR91HuB4uE="; + hash = "sha256-Pd4c7L1lEABjnCADHX6iMzQnaquxgcrED/Qk814QRl4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix index b6c36bbabe85b..b77afe7b8dda8 100644 --- a/pkgs/development/python-modules/llama-index-readers-database/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-database"; - version = "0.1.4"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_database"; inherit version; - hash = "sha256-x71+szDNDZNaVc8AMXruKvxSNXg561ibE2+kx53zHfI="; + hash = "sha256-/hI/3lCo0RpJ1yLJDFrnuQ565WoQQm9Sw7Sr4qp1fa0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index ee6c4453e4d52..e25ec90e1fef6 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.1.27"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-BMm8MGOpQJ/Nh3932bKr/VAuBydjqm3XiODGN0GLhmQ="; + hash = "sha256-x/kgdISfxZsQBJ1JakrlJmmr/LFZoZnZoROFKi/tcLg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix index 6ec922a3a2626..0fcc1da35ef2b 100644 --- a/pkgs/development/python-modules/llama-index-readers-json/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-json"; - version = "0.1.5"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_json"; inherit version; - hash = "sha256-H+CG+2FtoOF/DUG6EuAWzY2xe1upLX0pakVutJTZFE0="; + hash = "sha256-Sxya3Iw75sl6mGmKvRMe9Y8bIWh4cfXQPYbCyAvhnvU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix index 877acc82c84d6..b9a879047a542 100644 --- a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-readers-llama-parse"; - version = "0.1.6"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_llama_parse"; inherit version; - hash = "sha256-BPLc+7D7h85wiQ9aL0+JlB15vmqBi0NzjwU1YOS0Uc8="; + hash = "sha256-pf6toIlXFNzEHWXdUSwcOM9w2K4ZlHz/grgNWOaqNn4="; }; pythonRelaxDeps = [ "llama-parse" ]; diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix index 8beec615d8be8..3b0f5cb2c0ced 100644 --- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-s3"; - version = "0.1.9"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_s3"; inherit version; - hash = "sha256-ramC3INitu++AHKCWov78ad66/XnZG+Z4bZJHBdN5Uk="; + hash = "sha256-BXld0+j4UpwUFtkjkmfn3CwxMQoCZFj84D4R3Rr2jso="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix index 168e3b6917571..51bc5d5499768 100644 --- a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-readers-twitter"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_twitter"; inherit version; - hash = "sha256-ZPwluiPdSkwMZ3JQy/HHhR7erYhUE9BWtplkfHk+TK8="; + hash = "sha256-1bxg/tbv5NrMezm9OQUojiQGutv+yhWY4gkeUXb4z2o="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix index 0e8e43b4d4d30..6cf4a9fb87f4a 100644 --- a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-txtai"; - version = "0.1.2"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_txtai"; inherit version; - hash = "sha256-F1P3/ZICFDTqowpqu0AF2RIKfLTH9Phuw0O+VsHpI4U="; + hash = "sha256-jaCg3TeMkBKHtZRxpa5KrQb+uGP95qN1nWtrE08Oq98="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix index d3f84bf306f19..1eee073053bd1 100644 --- a/pkgs/development/python-modules/llama-index-readers-weather/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-weather"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_weather"; inherit version; - hash = "sha256-LJy2nU9f+yZZQm9stNn9mIqOkT5lOHaMIIm1Ezf2D0Q="; + hash = "sha256-m4EaV14tcH2I5veHdgGjBloKKAShJqsJGS9Ci8xRnMg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 5af67033af979..6ab0835a135c0 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.1.10"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-l5cfezZGHvN74CO5zrVTE5bMSDYNC9vaUczhKQMBzEc="; + hash = "sha256-n6fGNgXB4pbhea1e5QT0Co/sVnd8r3L5+pVCut5U2Uw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix index fcf3e0fa9742c..aea4617dc9925 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-google"; - version = "0.1.5"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_google"; inherit version; - hash = "sha256-E6RNf2DzktoZW89P0VKfmeZ5SEslGkyFLRxVtnsQOYc="; + hash = "sha256-7BEgRLkhyCo0z3puoWcFRqa+xG6vQdkKFWvr9oz6xs4="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index a07dd4e6f02da..dae67d6440213 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.1.13"; + version = "0.2.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-aqSSgXb1fmEY98pj8xNQolDLOFbsq/UOXCVZReHYgD4="; + hash = "sha256-x6KOZMZ5W8F8FATH3ZAwAeyrZ/rvjzrEooaFgQsSATQ="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index 38bf71e355196..b45bfd7c0bd53 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.2.14"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-+wwwZNQXt2NBSVqYcF5ATiy5K2Cku+Auuhuni7usnKI="; + hash = "sha256-mWY86wyS3aVd+cBhY8pCvn6w86Z0AdWrjOlz987Wg6I="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 051fc5745af2c..9026edb15344c 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.4.9"; + version = "0.5.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-ZX+PpffTmfFMBFT8BcrmA02gNz8ZHfbPyhehtKcE74c="; + hash = "sha256-PHTaEkbJvdYdY7f8ISBA6i29IY1H/JhqGOOXTmRZG4A="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 8e7028c944213..a110a8082c143 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.5.0"; + version = "1.5.1"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "python-llfuse"; repo = "python-llfuse"; rev = "refs/tags/release-${version}"; - hash = "sha256-6/iW5eHmX6ODVPLFkOo3bN9yW8ixqy2MHwQ2r9FA0iI="; + hash = "sha256-wni/b1hEn6/G0RszCJi+wmBHx6F0Ov1cZ/sRf8PLmps="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { ''; # On Darwin, the test requires macFUSE to be installed outside of Nix. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ pytestCheckHook which diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 7680577f6316b..bd5a3e34a4a4e 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -25,7 +25,7 @@ let llm = buildPythonPackage rec { pname = "llm"; - version = "0.15"; + version = "0.16"; pyproject = true; build-system = [ setuptools ]; @@ -36,7 +36,7 @@ let owner = "simonw"; repo = "llm"; rev = "refs/tags/${version}"; - hash = "sha256-PPmbqY9+OYGs4U3z3LHs7a3BjQ0AlRY6J+SKmCY3bXk="; + hash = "sha256-ew8080Lv1ObjUaGicaGrj8IXXA7rtdgcWhp41O8gfVE="; }; patches = [ ./001-disable-install-uninstall-commands.patch ]; @@ -81,37 +81,18 @@ let changelog = "https://github.com/simonw/llm/releases/tag/${version}"; license = licenses.asl20; mainProgram = "llm"; - maintainers = with maintainers; [ aldoborrero ]; + maintainers = with maintainers; [ + aldoborrero + mccartykim + ]; }; }; - withPlugins = - plugins: - buildPythonApplication { - inherit (llm) pname version; - format = "other"; + withPlugins = throw '' + llm.withPlugins was confusing to use and has been removed. + Please migrate to using python3.withPackages(ps: [ ps.llm ]) instead. - disabled = pythonOlder "3.8"; - - dontUnpack = true; - dontBuild = true; - doCheck = false; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - makeWrapper ${llm}/bin/llm $out/bin/llm \ - --prefix PYTHONPATH : "${llm}/${python.sitePackages}:$PYTHONPATH" - ln -sfv ${llm}/lib $out/lib - ''; - - propagatedBuildInputs = llm.propagatedBuildInputs ++ plugins; - - passthru = llm.passthru // { - withPlugins = morePlugins: withPlugins (morePlugins ++ plugins); - }; - - inherit (llm) meta; - }; + See https://nixos.org/manual/nixpkgs/stable/#python.withpackages-function for more usage examples. + ''; in llm diff --git a/pkgs/development/python-modules/llmx/default.nix b/pkgs/development/python-modules/llmx/default.nix index d5ddcfdaec425..aa1b526782dac 100644 --- a/pkgs/development/python-modules/llmx/default.nix +++ b/pkgs/development/python-modules/llmx/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { web = [ fastapi uvicorn diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 9fdcab6d7534e..19941cd4b4a31 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -6,12 +6,14 @@ isPyPy, pythonAtLeast, - # build-system - llvm, setuptools, # tests pytestCheckHook, + llvm, + libxml2, + + withStaticLLVM ? true, }: buildPythonPackage rec { @@ -28,32 +30,27 @@ buildPythonPackage rec { hash = "sha256-5QBSRDb28Bui9IOhGofj+c7Rk7J5fNv5nPksEPY/O5o="; }; - nativeBuildInputs = [ - llvm - setuptools - ]; + build-system = [ setuptools ]; - postPatch = '' - substituteInPlace llvmlite/tests/test_binding.py \ - --replace-fail "test_linux" "nope" + buildInputs = [ llvm ] ++ lib.optionals withStaticLLVM [ libxml2.dev ]; + + postPatch = lib.optionalString withStaticLLVM '' + substituteInPlace ffi/build.py --replace-fail "--system-libs --libs all" "--system-libs --libs --link-static all" ''; # Set directory containing llvm-config binary - preConfigure = '' - export LLVM_CONFIG=${llvm.dev}/bin/llvm-config - ''; + env.LLVM_CONFIG = "${llvm.dev}/bin/llvm-config"; + + nativeCheckInputs = [ pytestCheckHook ]; - nativeCheckInputs = [ - pytestCheckHook - ]; # https://github.com/NixOS/nixpkgs/issues/255262 preCheck = '' cd $out ''; - __impureHostDeps = lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/usr/lib/libm.dylib" ]; - passthru.llvm = llvm; + passthru = lib.optionalAttrs (!withStaticLLVM) { inherit llvm; }; meta = { changelog = "https://github.com/numba/llvmlite/blob/v${version}/CHANGE_LOG"; diff --git a/pkgs/development/python-modules/lm-format-enforcer/default.nix b/pkgs/development/python-modules/lm-format-enforcer/default.nix index fd6d202f0f4cb..f615bea4926ce 100644 --- a/pkgs/development/python-modules/lm-format-enforcer/default.nix +++ b/pkgs/development/python-modules/lm-format-enforcer/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lm-format-enforcer"; - version = "0.10.4"; + version = "0.10.7"; pyproject = true; src = fetchFromGitHub { owner = "noamgat"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GOnMj910rgzYeIeN2yLcXZDDel/Hu6nv7ov5BrlHJLg="; + hash = "sha256-25/qnSKBXbyAnasNYuv+LV2U2KLipKtH6B+wXlH6eRs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/lmcloud/default.nix b/pkgs/development/python-modules/lmcloud/default.nix index adf2cbfd0cfce..ce50a769ced9c 100644 --- a/pkgs/development/python-modules/lmcloud/default.nix +++ b/pkgs/development/python-modules/lmcloud/default.nix @@ -5,23 +5,26 @@ buildPythonPackage, fetchFromGitHub, httpx, + pytest-asyncio, + pytestCheckHook, pythonOlder, setuptools, + syrupy, websockets, }: buildPythonPackage rec { pname = "lmcloud"; - version = "1.2.1"; + version = "1.2.3"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "zweckj"; - repo = "lmcloud"; - rev = "refs/tags/v${version}"; - hash = "sha256-dkYfcXU6RbnGcJpKdsNw05PgxGNdsZ1wNzq8uDvS0rU="; + repo = "pylamarzocco"; + rev = "refs/tags/v.${version}"; + hash = "sha256-iRxn4xAP5b/2byeWbYm6mQwAu1TUmJgOVEqm/bZT9Xw="; }; build-system = [ setuptools ]; @@ -33,15 +36,18 @@ buildPythonPackage rec { websockets ]; - # Module has no tests - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + syrupy + ]; pythonImportsCheck = [ "lmcloud" ]; meta = with lib; { description = "Library to interface with La Marzocco's cloud"; - homepage = "https://github.com/zweckj/lmcloud"; - changelog = "https://github.com/zweckj/lmcloud/releases/tag/v${version}"; + homepage = "https://github.com/zweckj/pylamarzocco"; + changelog = "https://github.com/zweckj/pylamarzocco/releases/tag/v.${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index 926944ee55e36..16046208ea9ae 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -1,40 +1,43 @@ { lib, buildPythonPackage, - fetchPypi, - setuptools, - setuptools-scm, asteval, dill, + fetchPypi, + matplotlib, numpy, + pandas, + pytestCheckHook, + pythonOlder, scipy, + setuptools-scm, + setuptools, uncertainties, - pytestCheckHook, - pandas, - matplotlib, }: buildPythonPackage rec { pname = "lmfit"; version = "1.3.2"; - pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; hash = "sha256-Mb7q4fAnwbjBTc1/LoSIqAt1+zied/ymd1Sb3C/ll7s="; }; postPatch = '' - substituteInPlace pyproject.toml --replace "--cov=lmfit --cov-report html" "" + substituteInPlace pyproject.toml \ + --replace-fail "--cov=lmfit --cov-report html" "" ''; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ asteval dill numpy @@ -43,14 +46,19 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook - pandas matplotlib + pandas + pytestCheckHook ]; + pythonImportsCheck = [ "lmfit" ]; + + disabledTests = [ "test_check_ast_errors" ]; + meta = with lib; { description = "Least-Squares Minimization with Bounds and Constraints"; - homepage = "https://lmfit-py.readthedocs.io/"; + homepage = "https://lmfit.github.io/lmfit-py/"; + changelog = "https://github.com/lmfit/lmfit-py/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ nomeata ]; }; diff --git a/pkgs/development/python-modules/lockfile/default.nix b/pkgs/development/python-modules/lockfile/default.nix index 5423a1abb300f..04e4bc881bfc4 100644 --- a/pkgs/development/python-modules/lockfile/default.nix +++ b/pkgs/development/python-modules/lockfile/default.nix @@ -4,7 +4,7 @@ fetchPypi, setuptools, pbr, - nose, + pytestCheckHook, }: buildPythonPackage rec { @@ -14,25 +14,21 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"; + hash = "sha256-au0C3gPLok76vNYAswVAFAY0/AbPpgOCLVCNU2Hp95k="; }; + patches = [ ./fix-tests.patch ]; + build-system = [ pbr setuptools ]; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - runHook preCheck - nosetests - runHook postcheck - ''; + nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { homepage = "https://launchpad.net/pylockfile"; description = "Platform-independent advisory file locking capability for Python applications"; - license = licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/lockfile/fix-tests.patch b/pkgs/development/python-modules/lockfile/fix-tests.patch new file mode 100644 index 0000000000000..882a7dc2af718 --- /dev/null +++ b/pkgs/development/python-modules/lockfile/fix-tests.patch @@ -0,0 +1,28 @@ +diff --git a/test/compliancetest.py b/test/compliancetest.py +index bf4e59c..f55e258 100644 +--- a/test/compliancetest.py ++++ b/test/compliancetest.py +@@ -6,18 +6,19 @@ import lockfile + + + class ComplianceTest(object): +- def __init__(self): +- self.saved_class = lockfile.LockFile ++ @classmethod ++ def setup_class(cls): ++ cls.saved_class = lockfile.LockFile + + def _testfile(self): + """Return platform-appropriate file. Helper for tests.""" + import tempfile + return os.path.join(tempfile.gettempdir(), 'trash-%s' % os.getpid()) + +- def setup(self): ++ def setup_method(self): + lockfile.LockFile = self.class_to_test + +- def teardown(self): ++ def teardown_method(self): + try: + tf = self._testfile() + if os.path.isdir(tf): diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index 62a00fa1c8fab..5750985977a3b 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { execnet = [ execnet ]; sqlalchemy = [ sqlalchemy ]; redis = [ redis ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index b3ec041169fe6..216a20663381e 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/test_type_hinting.py" # avoid dependency on mypy - ] ++ lib.optionals stdenv.isDarwin [ "tests/test_multiprocessing.py" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ]; disabledTests = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { # Slow test "test_time_rotation" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix index eb0e1ebd53685..df79cc9dc3e46 100644 --- a/pkgs/development/python-modules/logutils/default.nix +++ b/pkgs/development/python-modules/logutils/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { "test_hashandlers" ]; - disabledTestPaths = lib.optionals (stdenv.isDarwin) [ + disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin) [ # Exception: unable to connect to Redis server "tests/test_redis.py" ]; diff --git a/pkgs/development/python-modules/loompy/default.nix b/pkgs/development/python-modules/loompy/default.nix new file mode 100644 index 0000000000000..1240a01be03a3 --- /dev/null +++ b/pkgs/development/python-modules/loompy/default.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchPypi, + buildPythonPackage, + h5py, + numpy, + scipy, + numba, + click, + numpy-groupies, + setuptools, + pytestCheckHook, +}: +let + finalAttrs = { + pname = "loompy"; + version = "3.0.7"; + pyproject = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-tc33tUc0xr7ToYHRGUevcK8sbg3K3AL9Docd8jL6qPQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + h5py + numpy + scipy + numba + click + numpy-groupies + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # Deprecated numpy attributes access + disabledTests = [ + "test_scan_with_default_ordering" + "test_get" + ]; + + pythonImportsCheck = [ "loompy" ]; + + meta = { + changelog = "https://github.com/linnarsson-lab/loompy/releases"; + description = "Python implementation of the Loom file format"; + homepage = "https://github.com/linnarsson-lab/loompy"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "loompy"; + }; + }; +in +buildPythonPackage finalAttrs diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 205c33f28fe4b..067d8b06c969e 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.9"; + version = "1.20.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "refs/tags/v${version}"; - hash = "sha256-rokoecBjBrk0iYbsGFkpSVZK5UcEw62TRGwLl8uaSAw="; + hash = "sha256-1CxcA9/FvKP3P0Q02by0hBHQTAcbfLCp3AualHhZyvY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index 27bfd2092388e..f85a1f134eba4 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lsassy"; - version = "3.1.11"; + version = "3.1.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Hackndo"; repo = "lsassy"; rev = "refs/tags/v${version}"; - hash = "sha256-boPFrmPqaHpezxXM3VM50i+n+n+gXkuwP4ErpMpN/AI="; + hash = "sha256-Idel52GAzir+SVgKfMU+e8Z0EkMf+PBdIcaQd0o8qJE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/lsp-tree-sitter/default.nix b/pkgs/development/python-modules/lsp-tree-sitter/default.nix index a0530544a9380..b4bba57240775 100644 --- a/pkgs/development/python-modules/lsp-tree-sitter/default.nix +++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "lsp-tree-sitter"; - version = "0.0.15"; + version = "0.0.16"; pyproject = true; src = fetchFromGitHub { owner = "neomutt"; repo = "lsp-tree-sitter"; - rev = version; - hash = "sha256-yzScgix3BtSCBzlDoE1kMYGtVzkup/+ZK9L1C7VA3do="; + rev = "refs/tags/${version}"; + hash = "sha256-nRzyVZFgb08M0I+xmhuX1LDwPsghlBLdZ2Ou8stKzk0="; }; build-system = [ diff --git a/pkgs/development/python-modules/ltpycld2/default.nix b/pkgs/development/python-modules/ltpycld2/default.nix index 7635b631170c2..510259d72d6e7 100644 --- a/pkgs/development/python-modules/ltpycld2/default.nix +++ b/pkgs/development/python-modules/ltpycld2/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/LibreTranslate/pycld2"; license = licenses.asl20; maintainers = with maintainers; [ misuzu ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/lttng/default.nix b/pkgs/development/python-modules/lttng/default.nix index 735eb4408a320..521def0abf77b 100644 --- a/pkgs/development/python-modules/lttng/default.nix +++ b/pkgs/development/python-modules/lttng/default.nix @@ -2,7 +2,7 @@ toPythonModule, python, lttng-tools, - swig4, + swig, }: toPythonModule ( @@ -15,7 +15,7 @@ toPythonModule ( { pname = "lttng"; - nativeBuildInputs = nativeBuildInputs ++ [ swig4 ]; + nativeBuildInputs = nativeBuildInputs ++ [ swig ]; configureFlags = configureFlags ++ [ "--enable-python-bindings" diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index d8538f1ccbc62..368f51341d4d5 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.4.4"; + version = "0.5.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-O8uqGo4pgN1xb6/hwEb0B/ymeA9as9/mFj9t9dI4pNg="; + hash = "sha256-sFtfjDhG3dEMD49GxEVlYm338M3E4xoH5chIvlRVOQg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lxml-html-clean/default.nix b/pkgs/development/python-modules/lxml-html-clean/default.nix index 0215f85215dc4..3b0308fe24c7b 100644 --- a/pkgs/development/python-modules/lxml-html-clean/default.nix +++ b/pkgs/development/python-modules/lxml-html-clean/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "lxml-html-clean"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fedora-python"; repo = "lxml_html_clean"; rev = "refs/tags/${version}"; - hash = "sha256-3ifuEgjCLDj0dBh9AbjAT/hNFGfINbvyjgRuxIRuarw="; + hash = "sha256-DiHbO2m/JckdXFMU7/LAW2hkyskqWtrQ93sgsVcdDSo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index bc09e20503e9a..c035c52467956 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { libxslt.dev cython setuptools - ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; buildInputs = [ libxml2 libxslt diff --git a/pkgs/development/python-modules/lzallright/default.nix b/pkgs/development/python-modules/lzallright/default.nix index 697acafb6ed6d..ee5be2d8dc440 100644 --- a/pkgs/development/python-modules/lzallright/default.nix +++ b/pkgs/development/python-modules/lzallright/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; pythonImportsCheck = [ "lzallright" ]; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 75f1e94f3bb26..1043325e10334 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { env = { - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ "-Wno-error=implicit-function-declaration" "-Wno-error=incompatible-pointer-types" ]); diff --git a/pkgs/development/python-modules/macholib/default.nix b/pkgs/development/python-modules/macholib/default.nix new file mode 100644 index 0000000000000..6bf2ec3eeeb72 --- /dev/null +++ b/pkgs/development/python-modules/macholib/default.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + unittestCheckHook, + altgraph, + setuptools, + typing-extensions, + pyinstaller, +}: + +buildPythonPackage rec { + pname = "macholib"; + version = "1.16.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ronaldoussoren"; + repo = pname; + rev = "v${version}"; + hash = "sha256-bTql10Ceny4fBCxnEWz1m1wi03EWMDW9u99IQiWYbnY="; + }; + + build-system = [ setuptools ]; + + dependencies = + [ + altgraph + ] + ++ lib.optionals (pythonOlder "3.11") [ + typing-extensions + ]; + + # Checks assume to find darwin specific libraries + doCheck = stdenv.buildPlatform.isDarwin; + nativeCheckInputs = [ + unittestCheckHook + ]; + + passthru.tests = { + inherit pyinstaller; # Requires macholib for darwin + }; + + preCheck = '' + export PATH="$PATH:$out/bin" + ''; + + meta = with lib; { + description = "Analyze and edit Mach-O headers, the executable format used by Mac OS X."; + homepage = "https://github.com/ronaldoussoren/macholib"; + changelog = "https://github.com/ronaldoussoren/macholib/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ eveeifyeve ]; + }; +} diff --git a/pkgs/development/python-modules/maec/default.nix b/pkgs/development/python-modules/maec/default.nix new file mode 100644 index 0000000000000..2c29be54289fd --- /dev/null +++ b/pkgs/development/python-modules/maec/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + cybox, + distutils, + fetchFromGitHub, + lxml, + mixbox, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "maec"; + version = "4.1.0.17"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "MAECProject"; + repo = "python-maec"; + rev = "refs/tags/v${version}"; + hash = "sha256-I2Ov2AQiC9D8ivHqn7owcTsNS7Kw+CWVyijK3VO52Og="; + }; + + build-system = [ + distutils + setuptools + ]; + + dependencies = [ + cybox + lxml + mixbox + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "maec" ]; + + meta = { + description = "Library for parsing, manipulating, and generating MAEC content"; + homepage = "https://github.com/MAECProject/python-maec/"; + changelog = "https://github.com/MAECProject/python-maec/blob/${src.rev}/CHANGES.txt"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 55bc5da3fd359..d98cfa2595793 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { mock ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # these tests fail in Darwin's sandbox "src/wormhole_mailbox_server/test/test_web.py" ]; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index e765a52cc76f4..81cd8589605b1 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -52,12 +52,16 @@ buildPythonPackage rec { 'return "${placeholder "out"}/bin/wormhole"' '' # fix the location of the ifconfig binary - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; build-system = [ setuptools ]; + pythonRelaxDeps = [ + "spake2" + ]; + dependencies = [ attrs autobahn @@ -74,7 +78,7 @@ buildPythonPackage rec { zipstream-ng ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; - passthru.optional-dependencies = { + optional-dependencies = { dilation = [ noiseprotocol ]; }; @@ -87,8 +91,8 @@ buildPythonPackage rec { mock pytestCheckHook ] - ++ passthru.optional-dependencies.dilation - ++ lib.optionals stdenv.isDarwin [ unixtools.locale ]; + ++ optional-dependencies.dilation + ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/development/python-modules/magika/default.nix index 0c670a8137411..444f4d844ea37 100644 --- a/pkgs/development/python-modules/magika/default.nix +++ b/pkgs/development/python-modules/magika/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ mihaimaruseac ]; mainProgram = "magika"; # Currently, disabling on AArch64 as it onnx runtime crashes on ofborg - broken = stdenv.isAarch64 && stdenv.isLinux; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; }; } diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 144aae89c79d4..307ed168acdb2 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -49,10 +49,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "mahotas" ]; - disabled = stdenv.isi686; # Failing tests + disabled = stdenv.hostPlatform.isi686; # Failing tests meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Computer vision package based on numpy"; homepage = "https://mahotas.readthedocs.io/"; maintainers = with maintainers; [ luispedro ]; diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 2216aa7937cde..06aabd241b551 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "6.0.5"; + version = "6.0.9"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jdcewXJO8I83zvAKb4UbKmuQC4SUbtS5H+RmFDTNwcI="; + hash = "sha256-8X6Qf/5vb67cJD9X6wyclR9h3smvjpaSLB3NCTOJuI0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index 5e58f90b58d8f..0735cf8f2c9e7 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { babel = [ babel ]; lingua = [ lingua ]; }; @@ -48,7 +48,7 @@ buildPythonPackage rec { chameleon mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = lib.optionals isPyPy [ diff --git a/pkgs/development/python-modules/mamba-ssm/default.nix b/pkgs/development/python-modules/mamba-ssm/default.nix new file mode 100644 index 0000000000000..11ac68c1e19da --- /dev/null +++ b/pkgs/development/python-modules/mamba-ssm/default.nix @@ -0,0 +1,77 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + causal-conv1d, + einops, + ninja, + setuptools, + torch, + transformers, + triton, + cudaPackages, + rocmPackages, + config, + cudaSupport ? config.cudaSupport, + which, +}: + +buildPythonPackage rec { + pname = "mamba"; + version = "2.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "state-spaces"; + repo = "mamba"; + rev = "refs/tags/v${version}"; + hash = "sha256-R702JjM3AGk7upN7GkNK8u1q4ekMK9fYQkpO6Re45Ng="; + }; + + build-system = [ + ninja + setuptools + torch + ]; + + nativeBuildInputs = [ which ]; + + buildInputs = ( + lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart # cuda_runtime.h, -lcudart + cuda_cccl + libcusparse # cusparse.h + libcusolver # cusolverDn.h + cuda_nvcc + libcublas + ] + ) + ); + + dependencies = [ + causal-conv1d + einops + torch + transformers + triton + ]; + + env = { + MAMBA_FORCE_BUILD = "TRUE"; + } // lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; }; + + # pytest tests not enabled due to nvidia GPU dependency + pythonImportsCheck = [ "mamba_ssm" ]; + + meta = with lib; { + description = "Linear-Time Sequence Modeling with Selective State Spaces"; + homepage = "https://github.com/state-spaces/mamba"; + license = licenses.asl20; + maintainers = with maintainers; [ cfhammill ]; + # The package requires CUDA or ROCm, the ROCm build hasn't + # been completed or tested, so broken if not using cuda. + broken = !cudaSupport; + }; +} diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix index 942643cc457c1..17c8b691b4a8b 100644 --- a/pkgs/development/python-modules/mandown/default.nix +++ b/pkgs/development/python-modules/mandown/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { typer ]; - passthru.optional-dependencies = { + optional-dependencies = { gui = [ pyside6 ]; updateScript = nix-update-script { }; }; diff --git a/pkgs/development/python-modules/manga-ocr/default.nix b/pkgs/development/python-modules/manga-ocr/default.nix index 03de5065e011c..e5ee0bf3c36a5 100644 --- a/pkgs/development/python-modules/manga-ocr/default.nix +++ b/pkgs/development/python-modules/manga-ocr/default.nix @@ -1,48 +1,30 @@ { lib, fetchFromGitHub, - buildPythonPackage, - fire, - fugashi, - jaconv, - loguru, - numpy, - pillow, - pyperclip, - torch, - transformers, - unidic-lite, - pythonOlder, + python3Packages, }: + +with python3Packages; + buildPythonPackage rec { pname = "manga-ocr"; - version = "0.1.11"; + version = "0.1.12"; disabled = pythonOlder "3.7"; + format = "pyproject"; src = fetchFromGitHub { owner = "kha-white"; - repo = pname; + repo = "manga-ocr"; rev = "refs/tags/v${version}"; - hash = "sha256-cLmgHBt6HvhY6Hb9yQ425Gk181axnMr+Mp2LxSmPoDg="; + hash = "sha256-uSWnrHS59fNcF7ve3imMwwNJ+/dmplBAavbDoBkEgGc="; }; - preBuild = '' - # remove subproject dedicated to model training - rm -rf manga_ocr_dev - # copy assets/example.jpg inside the package - # required by https://github.com/kha-white/manga-ocr/blob/ba1b0d94a8ef6676b618ba4e5ffe8ce2ab655270/manga_ocr/ocr.py#L27-L30 - # see also package_data.patch - mkdir manga_ocr/assets - cp assets/example.jpg manga_ocr/assets/example.jpg - ''; - - patches = [ - # instruct setuptool to copy assets/example.jpg to package when building wheel - ./package_data.patch + build-system = [ + setuptools + setuptools-scm ]; - propagatedBuildInputs = [ - # taken from requirements.txt + dependencies = [ fire fugashi jaconv diff --git a/pkgs/development/python-modules/manga-ocr/package_data.patch b/pkgs/development/python-modules/manga-ocr/package_data.patch deleted file mode 100644 index 6c643f669d3c8..0000000000000 --- a/pkgs/development/python-modules/manga-ocr/package_data.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -18,6 +18,9 @@ setup( - ], - packages=['manga_ocr'], - include_package_data=True, -+ package_data={ -+ 'manga_ocr': ['assets/example.jpg'], -+ }, - install_requires=[ - "fire", \ No newline at end of file diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index d1ca10b9e81c3..940dc355e4823 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # {test_locals,test_socket_path} fail to remove /tmp/manhole-socket # on the x86_64-darwin builder. # - # TODO: change this back to `doCheck = stdenv.isLinux` after + # TODO: change this back to `doCheck = stdenv.hostPlatform.isLinux` after # https://github.com/ionelmc/python-manhole/issues/54 is fixed doCheck = false; diff --git a/pkgs/development/python-modules/manifest-ml/default.nix b/pkgs/development/python-modules/manifest-ml/default.nix index 7eeec2a60fee1..80d80d51f9341 100644 --- a/pkgs/development/python-modules/manifest-ml/default.nix +++ b/pkgs/development/python-modules/manifest-ml/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { xxhash ]; - passthru.optional-dependencies = { + optional-dependencies = { api = [ accelerate # deepspeed @@ -84,7 +84,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index 35b713babb5fb..b52039bf7fbae 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "1.7"; + version = "1.8"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-CLYySNkMysd81ZBA2yfHGSvBuuf8vEvVXkzVsTeEoNM="; + hash = "sha256-AjvwG9j2TILslTR4GwK6eHfql4l7I+QIwUd6XQ2ojmg="; }; nativeBuildInputs = [ hatch-vcs ]; diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix index 0ef0941b2ba37..9c520c0bde76d 100644 --- a/pkgs/development/python-modules/manim-slides/default.nix +++ b/pkgs/development/python-modules/manim-slides/default.nix @@ -35,7 +35,7 @@ }: buildPythonPackage rec { pname = "manim-slides"; - version = "5.1.7"; + version = "5.1.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "jeertmans"; repo = "manim-slides"; rev = "refs/tags/v${version}"; - hash = "sha256-egQYL4Qvs1fQcJ5WEM461TSYqs2XN39wbyfx9uEFeIs="; + hash = "sha256-0csCUJpIeq3EyER9gqiUgqrfHL9WSzX144Y0djL3dqQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index c0f8e475b3650..6a1876ed6376c 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pango ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = [ pango ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; propagatedBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/manuf/default.nix b/pkgs/development/python-modules/manuf/default.nix index 20961a139682d..2210f4a40fae9 100644 --- a/pkgs/development/python-modules/manuf/default.nix +++ b/pkgs/development/python-modules/manuf/default.nix @@ -3,9 +3,9 @@ buildPythonPackage, fetchFromGitHub, runCommand, - python3, wireshark-cli, pytestCheckHook, + manuf, # remove when buildPythonPackage supports finalAttrs }: buildPythonPackage rec { @@ -42,7 +42,7 @@ buildPythonPackage rec { passthru.tests = { testMacAddress = runCommand "${pname}-test" { } '' - ${python3.pkgs.manuf}/bin/manuf BC:EE:7B:00:00:00 > $out + ${lib.getExe manuf} BC:EE:7B:00:00:00 > $out [ "$(cat $out | tr -d '\n')" = "Vendor(manuf='ASUSTekC', manuf_long='ASUSTek COMPUTER INC.', comment=None)" ] ''; }; diff --git a/pkgs/development/python-modules/mapbox/default.nix b/pkgs/development/python-modules/mapbox/default.nix deleted file mode 100644 index 80555ea8c008f..0000000000000 --- a/pkgs/development/python-modules/mapbox/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildPythonPackage, - boto3, - cachecontrol, - fetchFromGitHub, - iso3166, - python-dateutil, - requests, - responses, - polyline, - pytestCheckHook, - uritemplate, -}: - -buildPythonPackage rec { - pname = "mapbox"; - version = "0.18.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "mapbox"; - repo = "mapbox-sdk-py"; - rev = "0.18.0"; - sha256 = "123wsa4j11ps5pkjgylbmw4gnzh2vi22swgmvy50w26glkszh075"; - }; - - propagatedBuildInputs = [ - boto3 - cachecontrol - iso3166 - python-dateutil - requests - polyline - uritemplate - ]; - nativeCheckInputs = [ - pytestCheckHook - responses - ]; - - meta = with lib; { - homepage = "https://github.com/mapbox/mapbox-sdk-py"; - license = licenses.mit; - description = "Mapbox SDK for Python"; - longDescription = "Low-level client API for Mapbox web services."; - maintainers = with maintainers; [ ersin ]; - # ImportError: cannot import name 'Mapping' from 'collections' - # and archived upstreamed - broken = true; - }; -} diff --git a/pkgs/development/python-modules/mapclassify/default.nix b/pkgs/development/python-modules/mapclassify/default.nix index 0045daf1bd9fd..9a01fd4790162 100644 --- a/pkgs/development/python-modules/mapclassify/default.nix +++ b/pkgs/development/python-modules/mapclassify/default.nix @@ -7,6 +7,7 @@ geopandas, libpysal, + matplotlib, networkx, numpy, pandas, @@ -17,15 +18,15 @@ buildPythonPackage rec { pname = "mapclassify"; - version = "2.6.1"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pysal"; repo = "mapclassify"; - rev = "v${version}"; - hash = "sha256-lb2Ui6zdx6MQBtBrL/Xj9k7cm6De8aLEuBLZDhPPDnE="; + rev = "refs/tags/v${version}"; + hash = "sha256-VClkMOR8P9sX3slVjJ2xYYLVnvZuOgVYZiCGrBxoZEc="; }; build-system = [ setuptools-scm ]; @@ -42,16 +43,21 @@ buildPythonPackage rec { pytestCheckHook geopandas libpysal + matplotlib ]; # requires network access - disabledTestPaths = [ "mapclassify/tests/test_greedy.py" ]; + disabledTestPaths = [ + "mapclassify/tests/test_greedy.py" + "mapclassify/tests/test_rgba.py" + ]; pythonImportsCheck = [ "mapclassify" ]; meta = { description = "Classification Schemes for Choropleth Maps"; homepage = "https://pysal.org/mapclassify/"; + changelog = "https://github.com/pysal/mapclassify/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = lib.teams.geospatial.members; }; diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index c5adc0e91f3c0..1a7405994e449 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.8.3"; + version = "0.8.22"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-t7VYKInsZ0hYW+svD0vnsMyGcMtIeuWaor8nijyDhn8="; + hash = "sha256-JSWsL0GIO+6DZAWnGej6LL3aApIjlIEyyEl0WEOh9Io="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 1754ec45b76e7..3f0af08d192a4 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -50,17 +50,17 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-regressions pytestCheckHook - ] ++ passthru.optional-dependencies.linkify; + ] ++ optional-dependencies.linkify; # disable and remove benchmark tests preCheck = '' rm -r benchmarking ''; - doCheck = !stdenv.isi686; + doCheck = !stdenv.hostPlatform.isi686; pythonImportsCheck = [ "markdown_it" ]; - passthru.optional-dependencies = { + optional-dependencies = { compare = [ commonmark markdown diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 77f5fe0fc656a..25412d4c0009a 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -35,12 +35,10 @@ buildPythonPackage rec { runHook postCheck ''; - passthru.optional-dependencies = { + optional-dependencies = { code_syntax_highlighting = [ pygments ]; wavedrom = [ wavedrom ]; - all = lib.flatten ( - lib.attrValues (lib.filterAttrs (n: v: n != "all") passthru.optional-dependencies) - ); + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); }; meta = with lib; { diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 163bc05167875..a06997a09e408 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -6,28 +6,32 @@ pytestCheckHook, pythonAtLeast, pythonOlder, + setuptools, typeguard, + typing-extensions, typing-inspect, }: buildPythonPackage rec { pname = "marshmallow-dataclass"; - version = "8.7.0"; - format = "setuptools"; + version = "8.7.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "lovasoa"; repo = "marshmallow_dataclass"; rev = "refs/tags/v${version}"; - hash = "sha256-O96Xv732euS0X+1ilhLVMoazpC4kUSJvyVYwdj10e2E="; + hash = "sha256-0OXP78oyNe/UcI05NHskPyXAuX3dwAW4Uz4dI4b8KV0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ marshmallow typing-inspect - ]; + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeCheckInputs = [ pytestCheckHook @@ -51,7 +55,7 @@ buildPythonPackage rec { description = "Automatic generation of marshmallow schemas from dataclasses"; homepage = "https://github.com/lovasoa/marshmallow_dataclass"; changelog = "https://github.com/lovasoa/marshmallow_dataclass/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index 153eb0298fce4..0cab2ca8dd70b 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { orjson = [ orjson ]; msgpack = [ msgpack ]; yaml = [ pyyaml ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { pendulum pytest-mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "mashumaro" ]; diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index b8b93bc84eaa4..e8c80177cbf5a 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { blurhash = [ blurhash ]; webpush = [ http-ece @@ -58,7 +58,7 @@ buildPythonPackage rec { pytest-vcr requests-mock setuptools - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ "test_notifications_dismiss_pre_2_9_2" diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index b1e11ba6de23a..0ebcc212617bf 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { openimageio imath ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ OpenGL Cocoa ] ) - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXt libGL @@ -54,7 +54,9 @@ buildPythonPackage rec { (lib.cmakeBool "MATERIALX_BUILD_OIIO" true) (lib.cmakeBool "MATERIALX_BUILD_PYTHON" true) # don't build MSL shader back-end on x86_x64-darwin, as it requires a newer SDK with metal support - (lib.cmakeBool "MATERIALX_BUILD_GEN_MSL" (stdenv.isLinux || (stdenv.isAarch64 && stdenv.isDarwin))) + (lib.cmakeBool "MATERIALX_BUILD_GEN_MSL" ( + stdenv.hostPlatform.isLinux || (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) + )) ]; pythonImportsCheck = [ "MaterialX" ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 2bcf4d246c450..d91c96e6dd74f 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -52,7 +52,7 @@ # Tk # Darwin has its own "MacOSX" backend, PyPy has tkagg backend and does not support tkinter - enableTk ? (!stdenv.isDarwin && !isPyPy), + enableTk ? (!stdenv.hostPlatform.isDarwin && !isPyPy), tcl, tk, tkinter, @@ -114,7 +114,7 @@ buildPythonPackage rec { --replace-fail '"numpy>=2.0.0rc1,<2.3",' "" patchShebangs tools '' - + lib.optionalString (stdenv.isLinux && interactive) '' + + lib.optionalString (stdenv.hostPlatform.isLinux && interactive) '' # fix paths to libraries in dlopen calls (headless detection) substituteInPlace src/_c_internal_utils.cpp \ --replace-fail libX11.so.6 ${libX11}/lib/libX11.so.6 \ @@ -139,10 +139,10 @@ buildPythonPackage rec { tcl tk ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; # clang-11: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] - hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ]; build-system = [ certifi diff --git a/pkgs/development/python-modules/matplotx/default.nix b/pkgs/development/python-modules/matplotx/default.nix index 978e35e2404e9..17bf869e874a4 100644 --- a/pkgs/development/python-modules/matplotx/default.nix +++ b/pkgs/development/python-modules/matplotx/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ networkx pypng @@ -45,9 +45,9 @@ buildPythonPackage rec { # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. - env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; disabledTestPaths = [ "tests/test_spy.py" # Requires meshzoo (non-free) and pytest-codeblocks (not packaged) diff --git a/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch b/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch new file mode 100644 index 0000000000000..392f163e4be9d --- /dev/null +++ b/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch @@ -0,0 +1,59 @@ +diff --git a/tests/async_client_test.py b/tests/async_client_test.py +index b0f7a5a..2494fc6 100644 +--- a/tests/async_client_test.py ++++ b/tests/async_client_test.py +@@ -140,7 +140,10 @@ from nio.api import ( + ThreadInclusion, + ) + from nio.client.async_client import connect_wrapper, on_request_chunk_sent +-from nio.crypto import OlmDevice, Session, decrypt_attachment ++try: ++ from nio.crypto import OlmDevice, Session, decrypt_attachment ++except ImportError: ++ pass + from nio.responses import PublicRoom, PublicRoomsResponse + + BASE_URL_V1 = f"https://example.org{MATRIX_API_PATH_V1}" +diff --git a/tests/conftest.py b/tests/conftest.py +index 0c67ee0..6b77e02 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -10,11 +10,17 @@ from conftest_async import ( # noqa: F401 + async_client_pair_same_user, + unauthed_async_client, + ) +-from olm import Account ++try: ++ from olm import Account ++except ImportError: ++ pass + + from nio import Client, ClientConfig, HttpClient +-from nio.crypto import Olm, OlmDevice +-from nio.store import SqliteMemoryStore ++try: ++ from nio.crypto import Olm, OlmDevice ++ from nio.store import SqliteMemoryStore ++except ImportError: ++ pass + + ALICE_ID = "@alice:example.org" + ALICE_DEVICE_ID = "JLAFKJWSCS" +diff --git a/tests/helpers.py b/tests/helpers.py +index 63445b6..05096d1 100644 +--- a/tests/helpers.py ++++ b/tests/helpers.py +@@ -26,8 +26,11 @@ from hyperframe.frame import ( + WindowUpdateFrame, + ) + +-from nio.crypto import OlmAccount, OlmDevice +-from nio.store import Ed25519Key ++try: ++ from nio.crypto import OlmAccount, OlmDevice ++ from nio.store import Ed25519Key ++except ImportError: ++ pass + + SAMPLE_SETTINGS = { + SettingsFrame.HEADER_TABLE_SIZE: 4096, diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 6e28fe1cffef5..eaed123ef9031 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - poetry-core, + setuptools, # dependencies aiofiles, @@ -38,23 +38,30 @@ pantalaimon, weechatScripts, zulip, + + withOlm ? false, }: buildPythonPackage rec { pname = "matrix-nio"; - version = "0.24.0"; - format = "pyproject"; + version = "0.25.1"; + pyproject = true; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; - rev = version; - hash = "sha256-XlswVHLvKOi1qr+I7Mbm4IBjn1DG7glgDsNY48NA5Ew="; + rev = "refs/tags/${version}"; + hash = "sha256-cfxM/k0AXP/47goWahAzY36dpZiR00gmNveyoxQWvjo="; }; - nativeBuildInputs = [ poetry-core ]; + patches = [ + # Ignore olm import failures when testing + ./allow-tests-without-olm.patch + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles aiohttp aiohttp-socks @@ -63,13 +70,9 @@ buildPythonPackage rec { jsonschema pycryptodome unpaddedbase64 - ]; - - pythonRelaxDeps = [ - "aiohttp-socks" # Pending matrix-nio/matrix-nio#516 - ]; + ] ++ lib.optionals withOlm optional-dependencies.e2e; - passthru.optional-dependencies = { + optional-dependencies = { e2e = [ atomicwrites cachetools @@ -78,6 +81,11 @@ buildPythonPackage rec { ]; }; + pythonRelaxDeps = [ + "aiofiles" + "aiohttp-socks" # Pending matrix-nio/matrix-nio#516 + ]; + nativeCheckInputs = [ aioresponses faker @@ -87,17 +95,60 @@ buildPythonPackage rec { pytest-aiohttp pytest-benchmark pytestCheckHook - ] ++ passthru.optional-dependencies.e2e; + ]; pytestFlagsArray = [ "--benchmark-disable" ]; - disabledTests = [ - # touches network - "test_connect_wrapper" - # time dependent and flaky - "test_transfer_monitor_callbacks" + disabledTestPaths = lib.optionals (!withOlm) [ + "tests/encryption_test.py" + "tests/key_export_test.py" + "tests/memory_store_test.py" + "tests/sas_test.py" + "tests/sessions_test.py" + "tests/store_test.py" ]; + disabledTests = + [ + # touches network + "test_connect_wrapper" + # time dependent and flaky + "test_transfer_monitor_callbacks" + ] + ++ lib.optionals (!withOlm) [ + "test_client_account_sharing" + "test_client_key_query" + "test_client_login" + "test_client_protocol_error" + "test_client_restore_login" + "test_client_room_creation" + "test_device_store" + "test_e2e_sending" + "test_early_store_loading" + "test_encrypted_data_generator" + "test_http_client_keys_query" + "test_key_claiming" + "test_key_exports" + "test_key_invalidation" + "test_key_sharing" + "test_key_sharing_callbacks" + "test_key_sharing_cancellation" + "test_keys_query" + "test_keys_upload" + "test_marking_sessions_as_shared" + "test_message_sending" + "test_query_rule" + "test_room_devices" + "test_sas_verification" + "test_sas_verification_cancel" + "test_session_sharing" + "test_session_sharing_2" + "test_session_unwedging" + "test_storing_room_encryption_state" + "test_sync_forever" + "test_sync_token_restoring" + ]; + passthru.tests = { inherit (nixosTests) dendrite diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 9895f64171841..1746fa01dbe97 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pythonOlder, # deps + setuptools, aiohttp, attrs, yarl, @@ -18,12 +19,14 @@ aiosqlite, asyncpg, ruamel-yaml, + + withOlm ? false, }: buildPythonPackage rec { pname = "mautrix"; version = "0.20.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -34,13 +37,15 @@ buildPythonPackage rec { hash = "sha256-g6y2u3ipSp5HoakHqd/ryPlyA+kR7zO6uY4AqfqbwiE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp attrs yarl - ]; + ] ++ lib.optionals withOlm optional-dependencies.encryption; - passthru.optional-dependencies = { + optional-dependencies = { detect_mimetype = [ python-magic ]; encryption = [ python-olm @@ -55,7 +60,9 @@ buildPythonPackage rec { aiosqlite asyncpg ruamel-yaml - ] ++ passthru.optional-dependencies.encryption; + ]; + + disabledTestPaths = lib.optionals (!withOlm) [ "mautrix/crypto/" ]; pythonImportsCheck = [ "mautrix" ]; diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index d510be3b3a2cd..0dffe5503122d 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # The multiprocessing tests fail on Darwin because multiprocessing uses spawn instead of fork, # resulting in an exception when it can’t pickle the `lookup` local function. - disabledTests = lib.optionals stdenv.isDarwin [ "multiprocessing" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "multiprocessing" ]; meta = with lib; { description = "Reader for the MaxMind DB format"; diff --git a/pkgs/development/python-modules/mayim/default.nix b/pkgs/development/python-modules/mayim/default.nix index 49d4a23c80e15..44630b5121e49 100644 --- a/pkgs/development/python-modules/mayim/default.nix +++ b/pkgs/development/python-modules/mayim/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { wheel ]; - passthru.optional-dependencies = { + optional-dependencies = { postgres = [ psycopg ] ++ psycopg.optional-dependencies.pool; mysql = [ asyncmy ]; sqlite = [ aiosqlite ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { pytest-asyncio pytest-cov-stub ] - ++ (with passthru.optional-dependencies; [ + ++ (with optional-dependencies; [ postgres mysql sqlite diff --git a/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix b/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix new file mode 100644 index 0000000000000..097e2b912cf88 --- /dev/null +++ b/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + mdformat, + mdit-py-plugins, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "mdformat-gfm-alerts"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "KyleKing"; + repo = "mdformat-gfm-alerts"; + rev = "refs/tags/v${version}"; + hash = "sha256-2EYdNCyS1LxcEnCXkOugAAGx5XLWV4cWTNkXjR8RVQo="; + }; + + build-system = [ flit-core ]; + + dependencies = [ + mdformat + mdit-py-plugins + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "mdformat_gfm_alerts" ]; + + meta = { + description = "Format 'GitHub Markdown Alerts', which use blockquotes to render admonitions"; + homepage = "https://github.com/KyleKing/mdformat-gfm-alerts"; + changelog = "https://github.com/KyleKing/mdformat-gfm-alerts/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index a51d21a08fbb3..e4a2dc8587e8c 100644 --- a/pkgs/development/python-modules/mdtraj/default.nix +++ b/pkgs/development/python-modules/mdtraj/default.nix @@ -107,7 +107,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open library for the analysis of molecular dynamics trajectories"; homepage = "https://github.com/mdtraj/mdtraj"; - changelog = "https://github.com/mdtraj/mdtraj/releases/tag/${src.rev}"; + changelog = "https://github.com/mdtraj/mdtraj/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/mdutils/default.nix b/pkgs/development/python-modules/mdutils/default.nix index 22ea7ee473c17..5e39efda428be 100644 --- a/pkgs/development/python-modules/mdutils/default.nix +++ b/pkgs/development/python-modules/mdutils/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { this way, mdutils will make things easy for creating Markdown files. ''; homepage = "https://github.com/didix21/mdutils"; - changelog = "https://github.com/didix21/mdutils/releases/tag/${src.rev}"; + changelog = "https://github.com/didix21/mdutils/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ azahi ]; }; diff --git a/pkgs/development/python-modules/meeko/default.nix b/pkgs/development/python-modules/meeko/default.nix index c422b962925c2..1d2afdbe10979 100644 --- a/pkgs/development/python-modules/meeko/default.nix +++ b/pkgs/development/python-modules/meeko/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = { description = "Python package for preparing small molecule for docking"; homepage = "https://github.com/forlilab/Meeko"; - changelog = "https://github.com/forlilab/Meeko/releases/tag/${src.rev}"; + changelog = "https://github.com/forlilab/Meeko/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index b3ed0bc72832f..d6ab3cc7fc55a 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.49.0"; + version = "1.51.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4/FiF8eEziaD3ka/XVdAxDI8WWuWlYoMoLupQXVCBA8="; + hash = "sha256-3JUUTi+6oe+mDn4n9NtlWXji4j3E6AZODZZ+PEvSSzg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 3616351622c6d..e3a5bf6a39b7c 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.4.0"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-qEjwlIkgZGsnvKCSL4jcJl472HIlQDynwPWRCNE/EQE="; + hash = "sha256-LyWb7BWwRi0Q/dOZkFu/FwOBIqR2mPr3c8/mpsqw/ec="; }; pythonRelaxDeps = [ @@ -75,7 +75,7 @@ buildPythonPackage rec { webencodings ]; - passthru.optional-dependencies = { + optional-dependencies = { tunnel = [ pytap2 ]; }; @@ -84,7 +84,7 @@ buildPythonPackage rec { hypothesis pytestCheckHook riden - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export PATH="$PATH:$out/bin"; diff --git a/pkgs/development/python-modules/meteoswiss-async/default.nix b/pkgs/development/python-modules/meteoswiss-async/default.nix new file mode 100644 index 0000000000000..b837f49c08c65 --- /dev/null +++ b/pkgs/development/python-modules/meteoswiss-async/default.nix @@ -0,0 +1,52 @@ +{ + lib, + aiohttp, + asyncstdlib, + buildPythonPackage, + dataclasses-json, + fetchFromGitHub, + pytest-cov-stub, + pytest-mock, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "meteoswiss-async"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "albertomontesg"; + repo = "meteoswiss-async"; + rev = "refs/tags/${version}"; + hash = "sha256-xFvfyLZvBfnbzShKN+94piNUVjV1cfi4jWpc/Xw6XG4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + asyncstdlib + dataclasses-json + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + pytest-cov-stub + ]; + + pythonImportsCheck = [ "meteoswiss_async" ]; + + meta = { + description = "Asynchronous client library for MeteoSwiss API"; + homepage = "https://github.com/albertomontesg/meteoswiss-async"; + changelog = "https://github.com/albertomontesg/meteoswiss-async/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix index 68b4624125a40..b33e95fbdf8a4 100644 --- a/pkgs/development/python-modules/mhcflurry/default.nix +++ b/pkgs/development/python-modules/mhcflurry/default.nix @@ -1,29 +1,34 @@ { - appdirs, + lib, buildPythonPackage, fetchFromGitHub, + + # dependencies + appdirs, keras, - lib, mhcgnomes, - nose, pandas, - pytestCheckHook, pyyaml, scikit-learn, tensorflow, + tf-keras, tqdm, + + # tests + nose, + pytestCheckHook, }: buildPythonPackage rec { pname = "mhcflurry"; - version = "2.1.1"; + version = "2.1.4"; pyproject = true; src = fetchFromGitHub { owner = "openvax"; repo = "mhcflurry"; rev = "refs/tags/v${version}"; - hash = "sha256-absIKvcFo6I1Uu0t+l8OLOU/AQ4kD295P4+KVwMAWMc="; + hash = "sha256-dxCGCPnk1IFKg8ZVqMJsojQL0KlNirKlHJoaaOYIzMU="; }; # keras and tensorflow are not in the official setup.py requirements but are required for the CLI utilities to run. @@ -35,6 +40,7 @@ buildPythonPackage rec { pyyaml scikit-learn tensorflow + tf-keras tqdm ]; @@ -88,7 +94,7 @@ buildPythonPackage rec { changelog = "https://github.com/openvax/mhcflurry/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ samuela ]; - # ModuleNotFoundError: No module named 'keras.api._v2' as tensorflow is too outdated - broken = true; + # Requires a recent version of tensorflow + broken = lib.versionOlder tensorflow.version "2.15.0"; }; } diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index d28922b286621..864b6c8cc5a66 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-json"; - version = "1.3.1"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-serialization-json-python"; rev = "refs/tags/v${version}"; - hash = "sha256-V1s2MMO987ADp2nRxpIFlyx+OHNhSv8xCt3JOTzQCOM="; + hash = "sha256-J+wX2vF1LZHq88RDhda6NDeYioZzAz2BxovVFz2xxfw="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/minari/default.nix b/pkgs/development/python-modules/minari/default.nix index fdf38918ff33a..dd6373a58c56a 100644 --- a/pkgs/development/python-modules/minari/default.nix +++ b/pkgs/development/python-modules/minari/default.nix @@ -3,28 +3,34 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system setuptools, - wheel, - google-cloud-storage, + + # dependencies gymnasium, - h5py, numpy, packaging, - portion, - rich, - tqdm, typer, typing-extensions, - imageio, - nbmake, + + # optional-dependencies + pyarrow, + jax, + google-cloud-storage, + tqdm, + h5py, + mktestdocs, pytest, - pytest-markdown-docs, + + # tests + jaxlib, pytestCheckHook, }: buildPythonPackage rec { pname = "minari"; - version = "0.4.3"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,40 +39,52 @@ buildPythonPackage rec { owner = "Farama-Foundation"; repo = "Minari"; rev = "refs/tags/v${version}"; - hash = "sha256-DwuANo0PCb2pPTVST8EwuJHe5HKRV8JIpFBpSqoJNh8="; + hash = "sha256-SVt93d0GbCxeZXhh5vMPvnsBAeJAfGWNceFi0W9RgeM="; }; build-system = [ setuptools - wheel ]; dependencies = [ - google-cloud-storage gymnasium - h5py numpy packaging - portion - rich - tqdm typer typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { + arrow = [ pyarrow ]; + create = [ jax ]; + gcs = [ + google-cloud-storage + tqdm + ]; + hdf5 = [ h5py ]; testing = [ # gymnasium-robotics - imageio - nbmake + mktestdocs pytest - pytest-markdown-docs ]; }; pythonImportsCheck = [ "minari" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + jaxlib + pytestCheckHook + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + disabledTests = [ + # Require internet access + "test_download_namespace_dataset" + "test_download_namespace_metadata" + "test_markdown" + + # Attempts at installing minari using pip (impossible in the sandbox) + "test_readme" + ]; disabledTestPaths = [ # Require internet access @@ -74,15 +92,15 @@ buildPythonPackage rec { "tests/test_cli.py" ]; - meta = with lib; { + meta = { description = "Standard format for offline reinforcement learning datasets, with popular reference datasets and related utilities"; homepage = "https://github.com/Farama-Foundation/Minari"; changelog = "https://github.com/Farama-Foundation/Minari/releases/tag/v${version}"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "minari"; }; } diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index e7e98b265e2d7..0f86ee525000b 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox CoreAudio ]; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 17d7b4e3096b0..2cf9cd45c03c7 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -22,16 +22,16 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.7"; + version = "7.2.9"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-Qb3KPwSODtIqwS4FfR+DHphx4duPsNdMlHt2rpdV2+Y="; + hash = "sha256-ObbU0skqNBebkmX5gtJ9/QHlSZFB3tvaFnitmD+lKBc="; }; postPatch = '' @@ -39,9 +39,9 @@ buildPythonPackage rec { --replace-fail "assertEquals" "assertEqual" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ argon2-cffi certifi urllib3 diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index a23ef91c8a813..04d8a08bf1c3d 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-KwpNVl+tZTZHHZKW9p3a/S0nZJW6lZftjBK9ECkRUMo="; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools which ]; diff --git a/pkgs/development/python-modules/mip/default.nix b/pkgs/development/python-modules/mip/default.nix index 16ecf80905aaf..a2c6e80e3f16a 100644 --- a/pkgs/development/python-modules/mip/default.nix +++ b/pkgs/development/python-modules/mip/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { # Tests that rely on Gurobi are activated only when Gurobi support is enabled disabledTests = lib.optional (!gurobiSupport) "gurobi"; - passthru.optional-dependencies = { + optional-dependencies = { inherit gurobipy numpy; }; @@ -89,7 +89,7 @@ buildPythonPackage rec { downloadPage = "https://github.com/coin-or/python-mip/releases"; changelog = "https://github.com/coin-or/python-mip/releases/tag/${version}"; license = licenses.epl20; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; maintainers = with maintainers; [ nessdoor ]; }; } diff --git a/pkgs/development/python-modules/mitmproxy-rs/default.nix b/pkgs/development/python-modules/mitmproxy-rs/default.nix index bc2ed1694071f..cbe1442da06b8 100644 --- a/pkgs/development/python-modules/mitmproxy-rs/default.nix +++ b/pkgs/development/python-modules/mitmproxy-rs/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv mitmproxy-macos diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index b50216ece8adb..5e01020bb21fd 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ + "protobuf" "urwid" ]; @@ -90,7 +91,7 @@ buildPythonPackage rec { urwid wsproto zstandard - ] ++ lib.optionals stdenv.isDarwin [ mitmproxy-macos ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ mitmproxy-macos ]; nativeCheckInputs = [ hypothesis diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index 738c6cf57f32b..49d7b7d215a36 100644 --- a/pkgs/development/python-modules/mitogen/default.nix +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mitogen"; - version = "0.3.9"; + version = "0.3.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mitogen-hq"; repo = "mitogen"; rev = "refs/tags/v${version}"; - hash = "sha256-dfOufUvDsrBFvnz8/mp7iY9Tm52KoFFuQQnbq85qTGs="; + hash = "sha256-zOTuvc25J2Q9swSntFzjmVCkN13CnYFgnsPc5/rkvVI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mixbox/default.nix b/pkgs/development/python-modules/mixbox/default.nix new file mode 100644 index 0000000000000..7e348f8bc6762 --- /dev/null +++ b/pkgs/development/python-modules/mixbox/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + lxml, + ordered-set, + pytestCheckHook, + python-dateutil, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "mixbox"; + version = "1.0.5"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "CybOXProject"; + repo = "mixbox"; + rev = "refs/tags/v${version}"; + hash = "sha256-qK3cKOf0s345M1pVFro5NFhDj4lch12UegOY1ZUEOBQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + lxml + ordered-set + python-dateutil + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "mixbox" ]; + + pytestFlagsArray = [ "test/*.py" ]; + + disabledTests = [ + # Tests are out-dated + "test_serialize_datetime_as_date" + "test_preferred_prefixes" + ]; + + meta = { + description = "Library of common code leveraged by cybox, maec and stix"; + homepage = "https://github.com/CybOXProject/mixbox"; + changelog = "https://github.com/CybOXProject/mixbox/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index dd134c9d4c1de..92ced96774e0b 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = "mizani"; rev = "refs/tags/v${version}"; - hash = "sha256-a/+yZ7oUZG0fKgBUMwIf3XHUjac8Gsh3AosDVuUVoJU="; + hash = "sha256-aTc8LC/2zLrrTfOXABWs049m752PctpvlguA6qhyhp8="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix index d5bf6d5e44ff8..a13ab343e6e73 100644 --- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "mkdocs-autorefs"; - version = "1.1.0"; - format = "pyproject"; + version = "1.2.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "autorefs"; rev = "refs/tags/${version}"; - hash = "sha256-quN5Ow5mEQ1o5RGYVCcFLrMG9bl51Mg/hrc+VR/SVwM="; + hash = "sha256-C1ca7tx9s88U7Xp/bd3KhlWeb32a612RyCVBQz0vJ1g="; }; postPatch = '' @@ -28,9 +28,9 @@ buildPythonPackage rec { --replace 'dynamic = ["version"]' 'version = "${version}"' ''; - nativeBuildInputs = [ pdm-backend ]; + build-system = [ pdm-backend ]; - propagatedBuildInputs = [ + dependencies = [ markdown mkdocs ]; diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix index f50ed05a643fe..dd0c300ab1754 100644 --- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -16,15 +16,15 @@ buildPythonPackage rec { pname = "mkdocs-jupyter"; - version = "0.24.8"; + version = "0.25.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "mkdocs_jupyter"; inherit version; - hash = "sha256-Cadi9ITVQNnA6UTTSyjLU2oyhp4iS0YOL8eRsUP3aUA="; + hash = "sha256-4mwdNBkWvFf5bqP5PY0KiPx3yH1M7iIvZtIAd5jZJPU="; }; pythonRelaxDeps = [ "nbconvert" ]; diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index c3d9dd8505638..51ee57283f448 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.33"; + version = "9.5.38"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-WKZHI4f4l3OKrqNuH+7jiUV6F7impcW2trGgGMQ1I+8="; + hash = "sha256-HKIKGxuq6kwQi0ECD2jSmgiU5cJC9vTAUtIVC3BboZY="; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { recommended = [ mkdocs-minify-plugin mkdocs-redirects diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index fc3b7fd4d8a9e..da196135439b2 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "mkdocs"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tpDKomHFoGYPLz7rcohkU9w7G/5+YkJ5Y6wJJRyMecI="; + hash = "sha256-JQSOgV12iYE6FubxdoJpWy9EHKFxyKoxrm/7arCn9Ak="; }; build-system = [ hatchling ]; @@ -66,14 +66,14 @@ buildPythonPackage rec { watchdog ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { i18n = [ babel ] ++ lib.optionals (pythonAtLeast "3.12") [ setuptools ]; }; nativeCheckInputs = [ unittestCheckHook mock - ] ++ passthru.optional-dependencies.i18n; + ] ++ optional-dependencies.i18n; unittestFlagsArray = [ "-v" diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index c9c79e52b1b40..1b741ff733150 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.10.9"; + version = "1.11.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-ClIWH3JixDI7SMOaDKELeYlX7HqhzJ3JNO8FW/eCpuA="; + hash = "sha256-g6F6xIFKLzNqgbWGZXdJeoqQz/GIlC3XmrG9Kjkr1rU="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index b15b9a728d1f2..b0bfc0ca15546 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.25.2"; + version = "0.26.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-720qF1t/xl2voOMtkOR7U3lFXia4nI0VirgEFHpb39k="; + hash = "sha256-YV9Cncry+RXXGxRYN4dXp5E2msGA4Kq2QSvcPywWV2c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mktestdocs/default.nix b/pkgs/development/python-modules/mktestdocs/default.nix new file mode 100644 index 0000000000000..f1a1b654bf127 --- /dev/null +++ b/pkgs/development/python-modules/mktestdocs/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "mktestdocs"; + version = "0.2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "koaning"; + repo = "mktestdocs"; + rev = "refs/tags/${version}"; + hash = "sha256-egLlgq0lQOk0cPBly01zQ0rkl7D7Rf/bZ4en5oG+wlE="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "mktestdocs" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Run pytest against markdown files/docstrings"; + homepage = "https://github.com/koaning/mktestdocs"; + changelog = "https://github.com/koaning/mktestdocs/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/ml-dtypes/default.nix b/pkgs/development/python-modules/ml-dtypes/default.nix index 0fd14edd7b215..b23ca450327cd 100644 --- a/pkgs/development/python-modules/ml-dtypes/default.nix +++ b/pkgs/development/python-modules/ml-dtypes/default.nix @@ -1,26 +1,29 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system setuptools, + + # dependencies numpy, - pytestCheckHook, + + # tests absl-py, + pytestCheckHook, }: buildPythonPackage rec { pname = "ml-dtypes"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "jax-ml"; repo = "ml_dtypes"; rev = "refs/tags/v${version}"; - hash = "sha256-3qZ1lS1IdSXNLRNE9tyuO9qauVBDlECZvmmwaOffD30="; + hash = "sha256-+6job9fEHVguh9JBE/NUv+QezwQohuKPO8DlhbaawZ4="; # Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521), # the attempts to use the nixpkgs packaged eigen dependency have failed. # Hence, we rely on the bundled eigen library. @@ -29,20 +32,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "numpy~=1.21.2" "numpy" \ - --replace "numpy~=1.23.3" "numpy" \ - --replace "numpy~=1.26.0" "numpy" \ - --replace "numpy==2.0.0rc1" "numpy" \ - --replace "setuptools~=68.1.0" "setuptools" + --replace-fail "numpy~=2.0" "numpy" \ + --replace-fail "setuptools~=73.0.1" "setuptools" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ - pytestCheckHook absl-py + pytestCheckHook ]; preCheck = '' @@ -53,12 +53,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "ml_dtypes" ]; - meta = with lib; { + meta = { description = "Stand-alone implementation of several NumPy dtype extensions used in machine learning libraries"; homepage = "https://github.com/jax-ml/ml_dtypes"; changelog = "https://github.com/jax-ml/ml_dtypes/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage samuela ]; diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index 2084b8c19f759..614aed274ba04 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -2,13 +2,13 @@ lib, fetchFromGitHub, buildPythonPackage, - python3Packages, pybind11, cmake, xcbuild, zsh, blas, lapack, + setuptools, }: let @@ -69,7 +69,8 @@ buildPythonPackage rec { zsh gguf-tools nlohmann_json - ] ++ (with python3Packages; [ setuptools ]); + setuptools + ]; buildInputs = [ blas diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix index d552736a6920e..ba3a72976f582 100644 --- a/pkgs/development/python-modules/mmcv/default.nix +++ b/pkgs/development/python-modules/mmcv/default.nix @@ -21,35 +21,12 @@ tifffile, lmdb, mmengine, - symlinkJoin, }: let inherit (torch) cudaCapabilities cudaPackages cudaSupport; - inherit (cudaPackages) backendStdenv cudaVersion; + inherit (cudaPackages) backendStdenv; - cuda-common-redist = with cudaPackages; [ - cuda_cccl # <thrust/*> - libcublas # cublas_v2.h - libcusolver # cusolverDn.h - libcusparse # cusparse.h - ]; - - cuda-native-redist = symlinkJoin { - name = "cuda-native-redist-${cudaVersion}"; - paths = - with cudaPackages; - [ - cuda_cudart # cuda_runtime.h - cuda_nvcc - ] - ++ cuda-common-redist; - }; - - cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; - paths = cuda-common-redist; - }; in buildPythonPackage rec { pname = "mmcv"; @@ -65,6 +42,8 @@ buildPythonPackage rec { hash = "sha256-NNF9sLJWV1q6uBE73LUW4UWwYm4TBMTBJjJkFArBmsc="; }; + env.CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc); + preConfigure = '' export MMCV_WITH_OPS=1 @@ -77,7 +56,7 @@ buildPythonPackage rec { ''; postPatch = '' - substituteInPlace setup.py --replace "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES" + substituteInPlace setup.py --replace-fail "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES" ''; preCheck = '' @@ -102,12 +81,23 @@ buildPythonPackage rec { nativeBuildInputs = [ ninja which - ] ++ lib.optionals cudaSupport [ cuda-native-redist ]; + ]; - buildInputs = [ - pybind11 - torch - ] ++ lib.optionals cudaSupport [ cuda-redist ]; + buildInputs = + [ + pybind11 + torch + ] + ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart # cuda_runtime.h + cuda_cccl # <thrust/*> + libcublas # cublas_v2.h + libcusolver # cusolverDn.h + libcusparse # cusparse.h + ] + ); nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix index 89992981ea2f8..f31daa71f4433 100644 --- a/pkgs/development/python-modules/mmengine/default.nix +++ b/pkgs/development/python-modules/mmengine/default.nix @@ -1,38 +1,44 @@ { lib, - addict, + stdenv, buildPythonPackage, - coverage, fetchFromGitHub, - lmdb, + + # build-system + setuptools, + + # dependencies + addict, matplotlib, - mlflow, numpy, opencv4, - parameterized, - pytestCheckHook, - pythonOlder, pyyaml, rich, - setuptools, - stdenv, termcolor, - torch, yapf, + + # checks + bitsandbytes, + coverage, + dvclive, + lion-pytorch, + lmdb, + mlflow, + parameterized, + pytestCheckHook, + transformers, }: buildPythonPackage rec { pname = "mmengine"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "open-mmlab"; repo = "mmengine"; rev = "refs/tags/v${version}"; - hash = "sha256-+YDtYHp3BwKvzhmHC6hAZ3Qtc9uRZMo/TpWqdpm2hn0="; + hash = "sha256-bZ6O4UOYUCwq11YmgRWepOIngYxYD/fNfM/VmcyUv9k="; }; build-system = [ setuptools ]; @@ -49,12 +55,15 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + # bitsandbytes (broken as of 2024-07-06) coverage + dvclive + lion-pytorch lmdb mlflow parameterized pytestCheckHook - torch + transformers ]; preCheck = @@ -77,6 +86,14 @@ buildPythonPackage rec { "tests/test_runner/test_activation_checkpointing.py" # missing dependencies "tests/test_visualizer/test_vis_backend.py" + # Tests are outdated (runTest instead of run_test) + "mmengine/testing/_internal" + "tests/test_dist/test_dist.py" + "tests/test_dist/test_utils.py" + "tests/test_hooks/test_sync_buffers_hook.py" + "tests/test_model/test_wrappers/test_model_wrapper.py" + "tests/test_optim/test_optimizer/test_optimizer.py" + "tests/test_optim/test_optimizer/test_optimizer_wrapper.py" ]; disabledTests = [ @@ -100,12 +117,13 @@ buildPythonPackage rec { "test_close" ]; - meta = with lib; { + meta = { description = "Library for training deep learning models based on PyTorch"; homepage = "https://github.com/open-mmlab/mmengine"; changelog = "https://github.com/open-mmlab/mmengine/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ rxiao ]; - broken = stdenv.isDarwin || (stdenv.isLinux && stdenv.isAarch64); + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ rxiao ]; + broken = + stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 460d128f5a9e8..8b4b66ce4fca3 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { lazy-loader ]; - passthru.optional-dependencies.hdf5 = [ + optional-dependencies.hdf5 = [ h5io pymatreader ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-timeout - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/mobly/default.nix b/pkgs/development/python-modules/mobly/default.nix index 046edf9a3da15..dc76a6d6ea095 100644 --- a/pkgs/development/python-modules/mobly/default.nix +++ b/pkgs/development/python-modules/mobly/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "mobly"; - version = "1.12.3"; + version = "1.12.4"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "mobly"; rev = "refs/tags/${version}"; - hash = "sha256-hhI1jrHJk4wo49MK8J4VTS2dGmHG2kwzgZeSWBXdXkA="; + hash = "sha256-77wZK5dqxXUkOgWE7NBpGJBbbtYYxRCJwPbtwLIX09I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index eb5ffb2b244f9..eef43dc79fd84 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { pook = [ pook ]; speedups = [ xxhash ]; }; @@ -72,14 +72,14 @@ buildPythonPackage rec { sure ] ++ lib.optionals (pythonOlder "3.12") [ aiohttp ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); - preCheck = lib.optionalString stdenv.isLinux '' + preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' ${redis-server}/bin/redis-server & REDIS_PID=$! ''; - postCheck = lib.optionalString stdenv.isLinux '' + postCheck = lib.optionalString stdenv.hostPlatform.isLinux '' kill $REDIS_PID ''; @@ -98,7 +98,7 @@ buildPythonPackage rec { "test_no_dangling_fds" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/main/test_redis.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/main/test_redis.py" ]; pythonImportsCheck = [ "mocket" ]; diff --git a/pkgs/development/python-modules/modelcif/default.nix b/pkgs/development/python-modules/modelcif/default.nix index 5604a067734da..47c167237836b 100644 --- a/pkgs/development/python-modules/modelcif/default.nix +++ b/pkgs/development/python-modules/modelcif/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "modelcif"; - version = "1.0"; + version = "1.1"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-modelcif"; rev = "refs/tags/${version}"; - hash = "sha256-zJLwBdyUyWnH1hBx9Kejl5NfY7zJUxeGb//swBT02Dw="; + hash = "sha256-HUS9MW6jbwjK3I6egmmsH+Bx+nNgszWc3t3QRo/EWpc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index 04655a61378f5..43459fc5a5989 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -34,7 +34,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "modeled" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Universal data modeling for Python"; homepage = "https://github.com/modeled/modeled"; license = licenses.lgpl3Only; diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix index 27fd4ef9663d1..073c99026b9a5 100644 --- a/pkgs/development/python-modules/moderngl-window/default.nix +++ b/pkgs/development/python-modules/moderngl-window/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pyrr ]; - passthru.optional-dependencies = { + optional-dependencies = { trimesh = [ trimesh scipy @@ -72,6 +72,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ c0deaddict ]; inherit (mesa.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 834b336f48bc8..5d935550d3c8e 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "molecule"; - version = "24.8.0"; + version = "24.9.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-FAc4kE6fF4FXgFaKxAjJ9zu54qxyHjRoWjWebTUH5nc="; + hash = "sha256-hUjtoTwxoepBugeGsp3eRmz7gSYXwleSFRM1sXpBD2M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/molecule/plugins.nix b/pkgs/development/python-modules/molecule/plugins.nix index b87c3b121b546..3d98ecd039805 100644 --- a/pkgs/development/python-modules/molecule/plugins.nix +++ b/pkgs/development/python-modules/molecule/plugins.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { docker = [ docker ]; vagrant = [ python-vagrant ]; }; diff --git a/pkgs/development/python-modules/momepy/default.nix b/pkgs/development/python-modules/momepy/default.nix index 6b551d58a909e..7d6ffd6ff94d0 100644 --- a/pkgs/development/python-modules/momepy/default.nix +++ b/pkgs/development/python-modules/momepy/default.nix @@ -19,15 +19,15 @@ buildPythonPackage rec { pname = "momepy"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "pysal"; repo = "momepy"; - rev = "v${version}"; - hash = "sha256-r2iGzk54MsrkYB3Sp9/B1QGKnvqPGUj3MQhk6yqIoXE="; + rev = "refs/tags/v${version}"; + hash = "sha256-9GVX+OaBkLb3Q/RRHbGOlAJ3gu2K+V07ez6v9dWU6JU="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix index 8b138a383080d..46e8e0f354926 100644 --- a/pkgs/development/python-modules/monotonic/default.nix +++ b/pkgs/development/python-modules/monotonic/default.nix @@ -15,9 +15,9 @@ buildPythonPackage rec { sha256 = "3a55207bcfed53ddd5c5bae174524062935efed17792e9de2ad0205ce9ad63f7"; }; - __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; + __propagatedImpureHostDeps = lib.optional stdenv.hostPlatform.isDarwin "/usr/lib/libc.dylib"; - patchPhase = lib.optionalString stdenv.isLinux '' + patchPhase = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace monotonic.py --replace \ "ctypes.util.find_library('c')" "'${stdenv.cc.libc}/lib/libc.so'" ''; diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix index 00a6a7c533b47..d7e31fa4af6e2 100644 --- a/pkgs/development/python-modules/morecantile/default.nix +++ b/pkgs/development/python-modules/morecantile/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "morecantile"; - version = "5.3.0"; + version = "5.4.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "developmentseed"; repo = "morecantile"; rev = version; - hash = "sha256-F7xYQrOngoRsZjmS6ZHRGN0/GD53AYcMQzyY1LZ1O7I="; + hash = "sha256-kUAde+6IUu95tFHFCB6kWoYsRf9GxR+gRJki/tvhIaY="; }; nativeBuildInputs = [ flit ]; @@ -42,6 +43,11 @@ buildPythonPackage rec { rasterio ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # https://github.com/developmentseed/morecantile/issues/156 + "test_tiles_when_tms_bounds_and_provided_bounds_cross_antimeridian" + ]; + pythonImportsCheck = [ "morecantile" ]; meta = { diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 451d4e0edfa2f..b791f9483ead7 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.24"; + version = "0.6.25"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - hash = "sha256-4ao0FalOFrr4or7iUqx5aAw93yqI2i3/uF4rdHOsa7M="; + hash = "sha256-MU+zMka8d8wocc90vdS56BMHg6Z/LAAdRetiysh9Ssc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index 1d27f9e0dbbb5..487de3c3228cd 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/dermotduffy/motioneye-client"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 1c9e917b60abb..74fadd5d2e493 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { optionals = [ matplotlib scikit-image @@ -62,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "moviepy" ]; diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix index 0714dd07bcff1..053b922c148bc 100644 --- a/pkgs/development/python-modules/mozart-api/default.nix +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "3.4.1.8.6"; + version = "3.4.1.8.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-a0yjVS1FnR/n7Hjw/VRFztkUFD0gQQg7OXbyPTf+Kus="; + hash = "sha256-Lonv9f7/FSEdisKOuL+T1gKbxpog22DcNZTaK9L84Mc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index 3f8b44f5dcf74..7ca19c597c161 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { twisted = [ twisted ]; }; - nativeCheckInputs = [ unittestCheckHook ] ++ passthru.optional-dependencies.twisted; + nativeCheckInputs = [ unittestCheckHook ] ++ optional-dependencies.twisted; meta = with lib; { changelog = "https://github.com/Mic92/python-mpd2/blob/v${version}/doc/changes.rst"; diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index 49a7ccd5db2ac..36480a05393e5 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.51"; + version = "0.3.52"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "mplhep"; rev = "refs/tags/v${version}"; - hash = "sha256-5uXqBifJNWznXX4l5G79DLvD6VdD8xRBwZJbzp1+HP8="; + hash = "sha256-fcc/DG4irTvAOjCGAW7hW96z0yJNSvcpanfDGN9H9XI="; }; build-system = [ diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 6f0f289e853b9..308b57376dce2 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { gmpy = lib.optionals (!isPyPy) [ gmpy2 ]; }; diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix index 669fee8887fb0..35af2272ff586 100644 --- a/pkgs/development/python-modules/mrjob/default.nix +++ b/pkgs/development/python-modules/mrjob/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { aws = [ boto3 botocore @@ -60,7 +60,7 @@ buildPythonPackage rec { pyspark unittestCheckHook warcio - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); unittestFlagsArray = [ "-v" ]; diff --git a/pkgs/development/python-modules/ms-active-directory/default.nix b/pkgs/development/python-modules/ms-active-directory/default.nix index 9f0b1315a8263..7844373918f52 100644 --- a/pkgs/development/python-modules/ms-active-directory/default.nix +++ b/pkgs/development/python-modules/ms-active-directory/default.nix @@ -8,24 +8,27 @@ pycryptodome, pythonOlder, pytz, + setuptools, six, }: buildPythonPackage rec { pname = "ms-active-directory"; - version = "1.13.0"; - format = "setuptools"; + version = "1.14.1"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "zorn96"; repo = "ms_active_directory"; rev = "refs/tags/v${version}"; - hash = "sha256-+wfhtEGuC1R5jbEnWm4mDHIR096KKEcG/K8SuItwjGk="; + hash = "sha256-ZFIeG95+G9ofk54bYZpqu8uVfzjqsOrwWlIZvQgIWRI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ dnspython ldap3 pyasn1 @@ -43,7 +46,7 @@ buildPythonPackage rec { description = "Python module for integrating with Microsoft Active Directory domains"; homepage = "https://github.com/zorn96/ms_active_directory/"; changelog = "https://github.com/zorn96/ms_active_directory/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index a22a45e5714cd..c2e9a8b653d02 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.1.2"; + version = "1.1.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; rev = "refs/tags/v${version}"; - hash = "sha256-Wc/FWwBZ6IkGoZKKhyybcfKqPpDCJx3YcxOAUcUy2JM="; + hash = "sha256-cyqhNpV3gowSDmZhdI3NbbJ1VOwnrJTXZYR/rYNnFVE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 2f676433386cb..1a8e6c78c56e2 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.5.4"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Ty9e+xJ3+h4d0hmwtiZA9k5WMeuvT4iwNpR06KRpnfI="; + hash = "sha256-Vud/MaRmY/xmTJXofF8BHpl3TRxfrxlUdX0xDHKpwIA="; }; build-system = [ flit-core ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Graph SDK for Python"; homepage = "https://github.com/microsoftgraph/msgraph-sdk-python"; - changelog = "https://github.com/microsoftgraph/msgraph-sdk-python/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/microsoftgraph/msgraph-sdk-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index aed2317480d85..7bfe74af8ab99 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -17,19 +17,19 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.5.10"; + version = "0.5.12"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zb/g5QLJTSb0XTZvVnzbYkYvJ/ZVvQri8CKP48n5ibg="; + hash = "sha256-RKKj0oUPkl5QtrgtRRXHTO6lSLfB/E09DT9t9loMxUA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ unicrypto asyauth asysocks diff --git a/pkgs/development/python-modules/msmart-ng/default.nix b/pkgs/development/python-modules/msmart-ng/default.nix new file mode 100644 index 0000000000000..0612e47799d44 --- /dev/null +++ b/pkgs/development/python-modules/msmart-ng/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + httpx, + pycryptodome, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "msmart-ng"; + version = "2024.9.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mill1000"; + repo = "midea-msmart"; + rev = version; + hash = "sha256-djo+sINurnrt0GO8045bgNstjh+yl+CE2GJ1vWivAqY="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + httpx + pycryptodome + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # network access + "msmart/tests/test_cloud.py" + ]; + + pythonImportsCheck = [ "msmart" ]; + + meta = with lib; { + changelog = "https://github.com/mill1000/midea-msmart/releases/tag/${version}"; + description = "Python library for local control of Midea (and associated brands) smart air conditioners"; + homepage = "https://github.com/mill1000/midea-msmart"; + license = licenses.mit; + mainProgram = "msmart-ng"; + maintainers = with maintainers; [ + hexa + emilylange + ]; + }; +} diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix index 1c709d57884d4..fe5d79ece2d3e 100644 --- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "msoffcrypto-tool"; - version = "5.4.1"; + version = "5.4.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "nolze"; repo = "msoffcrypto-tool"; rev = "refs/tags/v${version}"; - hash = "sha256-BVm4hMKvvNI3bJ82t4NIRcx8o8mgQgoulIerDwoVIT0="; + hash = "sha256-nwCjgcZqD0hptHC0WqIodHC5m/JHYyUdfEngIoXzNqA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index b104034ea550d..6416d75a38482 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -1,19 +1,28 @@ { - absl-py, + lib, + stdenv, buildPythonPackage, + fetchPypi, + + # nativeBuildInputs cmake, + + # build-system + setuptools, + + # buildInputs + mujoco, + pybind11, + + # dependencies + absl-py, etils, - fetchPypi, glfw, - lib, - mujoco, numpy, - perl, - pybind11, pyopengl, + + perl, python, - setuptools, - stdenv, }: buildPythonPackage rec { @@ -28,19 +37,21 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-HDN6KA2JYDZqad/MybsX1oV/VvXPshb0mi0UBZq47Qs="; + hash = "sha256-3WF/QMHARPXff7yTM9MJTTyIYp1OPYYiTly0LeQKaos="; }; - nativeBuildInputs = [ - cmake - setuptools - ]; + nativeBuildInputs = [ cmake ]; + dontUseCmakeConfigure = true; + + build-system = [ setuptools ]; + buildInputs = [ mujoco pybind11 ]; - propagatedBuildInputs = [ + + dependencies = [ absl-py etils glfw diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix index 78e368360a41a..094065310854e 100644 --- a/pkgs/development/python-modules/myjwt/default.nix +++ b/pkgs/development/python-modules/myjwt/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; # Build failures - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 84c247a4fa5cf..e778813075043 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -19,7 +19,10 @@ let disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version hash; }; + src = fetchPypi { + pname = "mypy_boto3_${toUnderscore serviceName}"; + inherit version hash; + }; build-system = [ setuptools ]; @@ -43,1422 +46,1394 @@ let in rec { mypy-boto3-accessanalyzer = - buildMypyBoto3Package "accessanalyzer" "1.34.67" - "sha256-tgiKSWgKebdPAsyuJTQoFGR9BSLfGMeTVbi1rnPnvfQ="; + buildMypyBoto3Package "accessanalyzer" "1.35.0" + "sha256-xqzlZtspREjzFnslOFdBOwgRuX7+/QhFY2pnvWdvZbg="; mypy-boto3-account = - buildMypyBoto3Package "account" "1.34.0" - "sha256-C2iAiA83tZ/7XRlccf1iddDfDNkuO2F0B5aOxKbHy2Q="; + buildMypyBoto3Package "account" "1.35.0" + "sha256-NnLjEDyv4dYH/dKeCtka8P9K2V66844WLwynk1CqIbA="; mypy-boto3-acm = - buildMypyBoto3Package "acm" "1.34.0" - "sha256-SvDBi8A9414Hxb8twcM/6Y2OoUz+/LbZZJ86lu/zmmo="; + buildMypyBoto3Package "acm" "1.35.0" + "sha256-kdakfB1uRg5K+FZyeNSQxvBYj0+ztJrDTq4Dkh6dqAA="; mypy-boto3-acm-pca = - buildMypyBoto3Package "acm-pca" "1.34.28" - "sha256-4x4M49/Ot/HDZrA30PCu0OzXn3636dxCO4exR3lJAUs="; - - mypy-boto3-alexaforbusiness = - buildMypyBoto3Package "alexaforbusiness" "1.34.0" - "sha256-wrMSoM3F0HgajmM9X6P+3i6mqD55TWGVv8eJ7XqNjrw="; + buildMypyBoto3Package "acm-pca" "1.35.0" + "sha256-YU4Djb4Z9//5WYvkSgv9vlv4oG8Da6dP/Oktpuff4q0="; mypy-boto3-amp = - buildMypyBoto3Package "amp" "1.34.39" - "sha256-XOousDfEQsZ9z48iH2wVHuUaIwoECwbkHvIAlV3+zu4="; + buildMypyBoto3Package "amp" "1.35.0" + "sha256-Pm/KyqcUUAQBZjQKaVhuL/9c+qfkgfeD51esgE+EgQw="; mypy-boto3-amplify = - buildMypyBoto3Package "amplify" "1.34.63" - "sha256-alOtCCZwBcx6g3lm80AzI5aF8WbEABd44A0e6gfZ42o="; + buildMypyBoto3Package "amplify" "1.35.19" + "sha256-EP342ZP67DkGOrA2hLiv0iE1mL6SpaUOY8BHCdhaqRE="; mypy-boto3-amplifybackend = - buildMypyBoto3Package "amplifybackend" "1.34.0" - "sha256-wP6fOHAUg4dvrlQ2rUNk/lgIr6JnpWu/0Tr2prTckOk="; + buildMypyBoto3Package "amplifybackend" "1.35.0" + "sha256-rCVMZIStwQKsE7e2NAk9mOYkZExCiNLMfnrCUa2RBUE="; mypy-boto3-amplifyuibuilder = - buildMypyBoto3Package "amplifyuibuilder" "1.34.51" - "sha256-umxA1d0jlSysBkUFP8VPRMwuwYxdsRz0yRH7lgr/Hhc="; + buildMypyBoto3Package "amplifyuibuilder" "1.35.0" + "sha256-/muCi4o6A3bmAvc4w5lSla9ZtE3rMkJoL3LlEjzKoms="; mypy-boto3-apigateway = - buildMypyBoto3Package "apigateway" "1.34.56" - "sha256-WrFdsw1zAZg4TWRF1QzB/smDYbhTZt0JKxDpufShoss="; + buildMypyBoto3Package "apigateway" "1.35.25" + "sha256-6jtBmuho1j8GE+6sxqdYYf1XtonWoUu3Vi7tMDkTpa4="; mypy-boto3-apigatewaymanagementapi = - buildMypyBoto3Package "apigatewaymanagementapi" "1.34.0" - "sha256-911Sd+7hnHpAhDFE2lDhl+b3Pewd5QWWOPdg+TcZ6VU="; + buildMypyBoto3Package "apigatewaymanagementapi" "1.35.0" + "sha256-UuryQVRq+v2w7uGXJrr5EDvCiFF6eAG8jvW3poFv4x8="; mypy-boto3-apigatewayv2 = - buildMypyBoto3Package "apigatewayv2" "1.34.0" - "sha256-ydpZ3osSSMwTtGsnRn1SygX5d9Kq8jHwqdQDKcmKXTY="; + buildMypyBoto3Package "apigatewayv2" "1.35.0" + "sha256-yZy38db9vBO64Bw01X2iDEQFb4dBGik+3qLntaG4538="; mypy-boto3-appconfig = - buildMypyBoto3Package "appconfig" "1.34.58" - "sha256-f073cXEkDyzkPeOPclhS0O6ZVvEmYPkGPMXrAD8LkE4="; + buildMypyBoto3Package "appconfig" "1.35.8" + "sha256-YLoxt3nGjbgDjjyfyRX/qQamX5LpuXhCU6i9msGl/aI="; mypy-boto3-appconfigdata = - buildMypyBoto3Package "appconfigdata" "1.34.24" - "sha256-pSo1Qw6ZKN0XzERlCRmCtvJEOjgyd+a82t6Q3pPaU8Q="; + buildMypyBoto3Package "appconfigdata" "1.35.0" + "sha256-4rtLxGyFJwEDtI8ec8mZXS2adTsmwiAOF2+ExtQgkxE="; mypy-boto3-appfabric = - buildMypyBoto3Package "appfabric" "1.34.0" - "sha256-wjvOtCvFrj+YPvyqvR8cKIvwvC6x15WeSX6PkNp4OWg="; + buildMypyBoto3Package "appfabric" "1.35.0" + "sha256-jwjD2mkz6YpUEOwEHMNiIzBNoVwYUUONQjKZemGFEl8="; mypy-boto3-appflow = - buildMypyBoto3Package "appflow" "1.34.0" - "sha256-XruMwzBrjV7QTHOcHKqszt75cHX+578wbTwFMwyXHzE="; + buildMypyBoto3Package "appflow" "1.35.0" + "sha256-tNCfrUzsRHhpfIY+D2Y+OscMnYw7lGeYhFvs+wHq9zk="; mypy-boto3-appintegrations = - buildMypyBoto3Package "appintegrations" "1.34.6" - "sha256-iVaOlWOiCeocOJpcsxF0hlzKhGE3iq6Z7OifLWA3kkM="; + buildMypyBoto3Package "appintegrations" "1.35.0" + "sha256-aPoEEfQvhPoT0CPcfoyhzdXl2jSKeIoD3gBEw1f1XWU="; mypy-boto3-application-autoscaling = - buildMypyBoto3Package "application-autoscaling" "1.34.0" - "sha256-xW+Rc6yjDBviNDBDB63ssg0aPZFytaVfrVlA32wY/D4="; + buildMypyBoto3Package "application-autoscaling" "1.35.0" + "sha256-JsQYZqlzCM64Uxk3btQZm8dX/oSHsy1l29dUG7n025s="; mypy-boto3-application-insights = - buildMypyBoto3Package "application-insights" "1.34.0" - "sha256-p/yLWmIGBSkMcqbjMUjyTYiskfSRWW3hKvtqepJZtyM="; + buildMypyBoto3Package "application-insights" "1.35.0" + "sha256-PQcqaUxzDx91mwL55prFG2EFdQQw278ugQUAVhgzLX8="; mypy-boto3-applicationcostprofiler = - buildMypyBoto3Package "applicationcostprofiler" "1.34.0" - "sha256-ToSRJScC8711J5fkZj/TNmUrpiBNwTplGjvpu1gidys="; + buildMypyBoto3Package "applicationcostprofiler" "1.35.0" + "sha256-1ReFVDH1azvSYlTskq9WBsfjmW9tOvYvDOoH9Vq7X3U="; mypy-boto3-appmesh = - buildMypyBoto3Package "appmesh" "1.34.0" - "sha256-AXJ4z/54qPQeHKbZF6Is4OXt9/gZNacmYnLwfxPcn+E="; + buildMypyBoto3Package "appmesh" "1.35.0" + "sha256-SromjIAtmmIEf90outLLcA/LQjmvj/QoIwpxFcXJfls="; mypy-boto3-apprunner = - buildMypyBoto3Package "apprunner" "1.34.11" - "sha256-p4txQ08e6jpYiJmjG/JIXyObXhTnlXB8S5QDtUPUFt0="; + buildMypyBoto3Package "apprunner" "1.35.0" + "sha256-NDA1+HZ+Srs5XyNTnHxOjsUPAPRPXgeum0Q6h3Ca7zo="; mypy-boto3-appstream = - buildMypyBoto3Package "appstream" "1.34.5" - "sha256-1m9YDw1fzoe4Y37yW6a1545SR2QGSrr5qbqYfXEax7o="; + buildMypyBoto3Package "appstream" "1.35.0" + "sha256-KuDlcfOuF3krMocvgR2LaP2+xKeYl2CMPKRewN8inj4="; mypy-boto3-appsync = - buildMypyBoto3Package "appsync" "1.34.49" - "sha256-J2qTVaXhqsfdupN6eLgpyGTHkPRRC1TZGNP2PRKF0v0="; + buildMypyBoto3Package "appsync" "1.35.12" + "sha256-mHIUStFvFUTvHYWdZUNcIIOI//vNACI0veXXNLAAOVY="; mypy-boto3-arc-zonal-shift = - buildMypyBoto3Package "arc-zonal-shift" "1.34.0" - "sha256-FhQaiu0Sc4HkkaRuhtgvUBMOgj80DbIBzZLEbZB41Cs="; + buildMypyBoto3Package "arc-zonal-shift" "1.35.0" + "sha256-l5hKmbwel2Z5BvQbuKXRsfusKU28laF5mVDDPW+Ij0g="; mypy-boto3-athena = - buildMypyBoto3Package "athena" "1.34.23" - "sha256-PDvz2+2XcNi/nYkGjOeb8t1JbIN+SxSSifU6sDXoNyc="; + buildMypyBoto3Package "athena" "1.35.25" + "sha256-XcD23pDz3oaNwME+iqmDQr9Lbz8z7NVduFEiTnxV55c="; mypy-boto3-auditmanager = - buildMypyBoto3Package "auditmanager" "1.34.0" - "sha256-22Xkl1A5wzKDpRQcr/lp7gQsDPtQjvjK3nBm5O2ZS+k="; + buildMypyBoto3Package "auditmanager" "1.35.0" + "sha256-nr00I/1oqR16ZIw3+iA2BrS0C0Wr7UlJ48VnuOFIcb0="; mypy-boto3-autoscaling = - buildMypyBoto3Package "autoscaling" "1.34.54" - "sha256-MGACE7CeturY9BN6Gq3VAvz4TqeoQ/ASlSdbX9LLTbQ="; + buildMypyBoto3Package "autoscaling" "1.35.4" + "sha256-XRAj8UYVmjQ0GjAevPGs1/g2XRsoCElCNaj1kPrWyCo="; mypy-boto3-autoscaling-plans = - buildMypyBoto3Package "autoscaling-plans" "1.34.0" - "sha256-16siojcxNe5MuSZSRJXPAz2UudJozEEyCYUrsGNDAM8="; + buildMypyBoto3Package "autoscaling-plans" "1.35.0" + "sha256-Xvclx5MTWaT4fh1P5+xud3CuWYM+Y0F0j69iz2ITuts="; mypy-boto3-backup = - buildMypyBoto3Package "backup" "1.34.64" - "sha256-RvxhEmrOtkvagjaj8x2H7AAp+uK9qDIDe7T9p52rKRc="; + buildMypyBoto3Package "backup" "1.35.10" + "sha256-wgEgdD94/Ynb/Zd5rKbtUX196618kRzu1osq2Zi0h6M="; mypy-boto3-backup-gateway = - buildMypyBoto3Package "backup-gateway" "1.34.0" - "sha256-nSIEEDKJfI852/WBQ7OuDPuVijEiMr1vhpkzODbhRRc="; - - mypy-boto3-backupstorage = - buildMypyBoto3Package "backupstorage" "1.34.0" - "sha256-Y8kjZ+ov8OsiJ8Sm1LlvP8YbgVc+AkLkbZIhOh4y7ZY="; + buildMypyBoto3Package "backup-gateway" "1.35.0" + "sha256-8IRkY4sMGkj2ZxZBM4n/7clzQHwuon8wmXIOAGa4nEI="; mypy-boto3-batch = - buildMypyBoto3Package "batch" "1.34.83" - "sha256-mJ6t+8ov7x8tfJNavY6qZpHxwenVGhTXy6NRlD7muPc="; + buildMypyBoto3Package "batch" "1.35.0" + "sha256-LVwSfDll7H0xxvF6b2wlqr/gQ5nR4oqtev4ZT4hgJX0="; mypy-boto3-billingconductor = - buildMypyBoto3Package "billingconductor" "1.34.1" - "sha256-uXxQkoe2u3idcYta9YFbjxoK8HsvUiRQSyYrYhVi1kU="; + buildMypyBoto3Package "billingconductor" "1.35.0" + "sha256-PlOL9fmTgWo8jF17Um+aDDNShQWpCxkkp5dFBHl/494="; mypy-boto3-braket = - buildMypyBoto3Package "braket" "1.34.39" - "sha256-laMrKu9oN5a9yvB8lyhdjpq5hm1HGAFn3iJ0lReRpOI="; + buildMypyBoto3Package "braket" "1.35.0" + "sha256-6iUVQMXsam6ALxL+g7o/l3KIQLjnBlp3qgkuarPW/SU="; mypy-boto3-budgets = - buildMypyBoto3Package "budgets" "1.34.0" - "sha256-gs8JYnpFNOMWppBO2R3DO+c6RecQC0vzaox5DqXCKOA="; + buildMypyBoto3Package "budgets" "1.35.26" + "sha256-WJ0Vjppi+dDYwqL3Xu+VWc+KIbhc9CHzAU3C5x5eTHA="; mypy-boto3-ce = - buildMypyBoto3Package "ce" "1.34.71" - "sha256-VfB823/q+ie97Bv5GXhsBaGxAuXSDbfFq2rO6TjThXY="; + buildMypyBoto3Package "ce" "1.35.22" + "sha256-1MB5ldBGqYDZMkYaEJ0nK+jM5q/TkcN3wllT1X8YnQc="; mypy-boto3-chime = - buildMypyBoto3Package "chime" "1.34.0" - "sha256-/IBkHJf4t1K/Ubdf/hUw5XToNBTCziMfTSdksxMwA2Q="; + buildMypyBoto3Package "chime" "1.35.0" + "sha256-nMDg2tBX6gakw4nHwxmkMshM26hf+x1knK1GRLY/BeE="; mypy-boto3-chime-sdk-identity = - buildMypyBoto3Package "chime-sdk-identity" "1.34.0" - "sha256-3gXUFr3+Tc5PgwsQuQY8D2J0SKGQJRXgQz7/XKYNr5k="; + buildMypyBoto3Package "chime-sdk-identity" "1.35.0" + "sha256-BAHAhOT7WanSavOe4iNVeJ0I4+QW2Ymn6C915sTQbwU="; mypy-boto3-chime-sdk-media-pipelines = - buildMypyBoto3Package "chime-sdk-media-pipelines" "1.34.0" - "sha256-h5RD+anRtH0UQ5pFjhygN9oZDFdIRZMfGXSKlT2HuSY="; + buildMypyBoto3Package "chime-sdk-media-pipelines" "1.35.0" + "sha256-eXgK8DJugHC1r9qPVK5ajdr/ppDnfxBHxB0tSld0icw="; mypy-boto3-chime-sdk-meetings = - buildMypyBoto3Package "chime-sdk-meetings" "1.34.4" - "sha256-AmwzLd8iLGdmo1Ajv4IVrxwyf/UljG0I06um2S3PG+E="; + buildMypyBoto3Package "chime-sdk-meetings" "1.35.0" + "sha256-mw4aJjeN00ES6lSvjDHBCRowQmPqRzvdJoSk11gJop0="; mypy-boto3-chime-sdk-messaging = - buildMypyBoto3Package "chime-sdk-messaging" "1.34.0" - "sha256-8Pq48GBFKQRdmoAu9qxAR14xRSP8/roBrZHxzaTBB54="; + buildMypyBoto3Package "chime-sdk-messaging" "1.35.0" + "sha256-FytBZE72zKuoagYWnfv77mS7Wx6WcE427Spd/2h78kc="; mypy-boto3-chime-sdk-voice = - buildMypyBoto3Package "chime-sdk-voice" "1.34.0" - "sha256-9fQQgWFKeabSblJIhP6mN0CEnSixkz1r3mf/k6IL/BE="; + buildMypyBoto3Package "chime-sdk-voice" "1.35.16" + "sha256-O7mrqn+S0rDcOnhxXI10mB/NHzI+f23HqNXoO5gxiPc="; mypy-boto3-cleanrooms = - buildMypyBoto3Package "cleanrooms" "1.34.82" - "sha256-KaCs/P3NM3IeZ9V9khIwysyBXBG/8RuGFBAlrbMYn4Y="; + buildMypyBoto3Package "cleanrooms" "1.35.0" + "sha256-+RAqaRHKax8sUaOoIaaT+HvW/EGir2daS+aqDWNoDwA="; mypy-boto3-cloud9 = - buildMypyBoto3Package "cloud9" "1.34.24" - "sha256-fryD7UfO5cdFS7vMxmZaT9LW4nNSGTQCd3NyD60f9wA="; + buildMypyBoto3Package "cloud9" "1.35.0" + "sha256-Sh+w+fi1myX1QUR0JnQeE4/fh2TSVvXIp5tVzxigu5I="; mypy-boto3-cloudcontrol = - buildMypyBoto3Package "cloudcontrol" "1.34.0" - "sha256-81M2llb46sviZ874/vHVaqOU1PvQs+Zdil8bxr1pEWM="; + buildMypyBoto3Package "cloudcontrol" "1.35.0" + "sha256-T7rLgdtj8PUAZ6WRRkFYH/I6bqq+NA29kddxeI72UVU="; mypy-boto3-clouddirectory = - buildMypyBoto3Package "clouddirectory" "1.34.0" - "sha256-lWJQClNEhyq9CN8ThcHtVcEsowIp+V8RXh4rgHAclfM="; + buildMypyBoto3Package "clouddirectory" "1.35.30" + "sha256-D64DZgrma3/kvhyH6ZbPtD8nlRrzFVM8WT8Ex2fTZLM="; mypy-boto3-cloudformation = - buildMypyBoto3Package "cloudformation" "1.34.77" - "sha256-mQAUGCaB+d8iV/GFBWEmwNswvxJg9s09Rs7bPPRn8K0="; + buildMypyBoto3Package "cloudformation" "1.35.0" + "sha256-DQN9nWvbQ5qE4jkbqYek4D/O360OiB2xzw94YdJ1kHw="; mypy-boto3-cloudfront = - buildMypyBoto3Package "cloudfront" "1.34.83" - "sha256-glPRMg4IS/5Mz6ckyQWgZuu9G3IlPsfA97fx41YpSw0="; + buildMypyBoto3Package "cloudfront" "1.35.0" + "sha256-ewZmBuNAs3YS2tG5WDbNBRr1y1BmmOTxvXrSASNhAp4="; mypy-boto3-cloudhsm = - buildMypyBoto3Package "cloudhsm" "1.34.0" - "sha256-Sd/YlKNm/1VRoJ+e+3YlOf4jKoewYVGM4FNYlST+9AY="; + buildMypyBoto3Package "cloudhsm" "1.35.0" + "sha256-/zmoWmzYLCtRC6ZnnltNeXL3MtXzHyDgoP9LKsR1dAo="; mypy-boto3-cloudhsmv2 = - buildMypyBoto3Package "cloudhsmv2" "1.34.0" - "sha256-TCKdRXnA2x3LBop9boixNmkPafTdIOY8sGaUSeA9Sic="; + buildMypyBoto3Package "cloudhsmv2" "1.35.0" + "sha256-twEjxoeN4rSCJ3uN4Jcyhd2cowPnMQ+O7zoWooE/Nxs="; mypy-boto3-cloudsearch = - buildMypyBoto3Package "cloudsearch" "1.34.0" - "sha256-S1re04NWngrjlcLIPzP4D0I1cVqvt/Taku6CTTfvtMw="; + buildMypyBoto3Package "cloudsearch" "1.35.0" + "sha256-BfQ8gM+yWcqOpmM+G8DQzJCJYwQk2zbf6v25ZkGH0y8="; mypy-boto3-cloudsearchdomain = - buildMypyBoto3Package "cloudsearchdomain" "1.34.0" - "sha256-jhhwFXH80aZjVqVMZulwoCvu3EmXj4BbJ3DQ6eJPS4E="; + buildMypyBoto3Package "cloudsearchdomain" "1.35.0" + "sha256-8QLyd1uCh26njr6VnNBFROHWFXMSvpO7WRzV8DFZ01U="; mypy-boto3-cloudtrail = - buildMypyBoto3Package "cloudtrail" "1.34.59" - "sha256-0gwq1zhZcLc8gVGo337AqqC39w8MJR6JK948No/yzVA="; + buildMypyBoto3Package "cloudtrail" "1.35.27" + "sha256-EZzFE8myIt72X3Mxr+ZZ4lx8O+nTARvm93OhT4ekYpE="; mypy-boto3-cloudtrail-data = - buildMypyBoto3Package "cloudtrail-data" "1.34.0" - "sha256-ACiJrI+VTHr06i8PKgDY/K8houFUZQNS1lluouadCTQ="; + buildMypyBoto3Package "cloudtrail-data" "1.35.0" + "sha256-YGz59Mf6cNqNAJmdI0YQF9dzzUY6Mwi7fgzsDwMWv3w="; mypy-boto3-cloudwatch = - buildMypyBoto3Package "cloudwatch" "1.34.83" - "sha256-dm4WbFtGPZiFpZKdwWu1kuD6fXvq9WmqT1AdhahIvBM="; + buildMypyBoto3Package "cloudwatch" "1.35.0" + "sha256-DXAn45lDLDoA5T7yDRRYwz7HI0l2SYxB6TZAsXZS2oY="; mypy-boto3-codeartifact = - buildMypyBoto3Package "codeartifact" "1.34.68" - "sha256-Ey0cmx0OxN1/VXIyvn0EOBP9qYIuc/XyFVZniHLaNEY="; + buildMypyBoto3Package "codeartifact" "1.35.31" + "sha256-wCjyRnd7RlnLRQrADd2Xmh74IsQxBfUgLIJuaZW7kjw="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.34.83" - "sha256-nf1rO/BmEFenb/Z/bWKHRDpZVG3WZb9OPIsxcKOdATo="; + buildMypyBoto3Package "codebuild" "1.35.21" + "sha256-sCIMOBe3VppVALMDc4BV3rK+RYlCbxK80YUKPnckvT8="; mypy-boto3-codecatalyst = - buildMypyBoto3Package "codecatalyst" "1.34.73" - "sha256-jQ/DIoWXQWo1oVWi4Gn88cxr78QCs45EVtgfc6fZkFk="; + buildMypyBoto3Package "codecatalyst" "1.35.0" + "sha256-VaY7Xe06Mih4/nj03+e2rbSuRKZhuNlcWv9B5lqVM80="; mypy-boto3-codecommit = - buildMypyBoto3Package "codecommit" "1.34.6" - "sha256-wCw6e7yvMjM+A6jXfB2D4Z+i9s3e/F9Ih/VxD6iiwws="; + buildMypyBoto3Package "codecommit" "1.35.0" + "sha256-uYcDPjNaXSQrGjkvkARXZCd0zinppzlxzwqXSDln8UM="; mypy-boto3-codedeploy = - buildMypyBoto3Package "codedeploy" "1.34.0" - "sha256-Sxtcl/fO+A2/s/6O3VC1BPIJ3dDamshEEmKXqyg4fN8="; + buildMypyBoto3Package "codedeploy" "1.35.0" + "sha256-1IJOc/HNHlKr8Fu3mz0eSvjl0O4T15qvfQtBI7B8yIQ="; mypy-boto3-codeguru-reviewer = - buildMypyBoto3Package "codeguru-reviewer" "1.34.0" - "sha256-20W+LBYsQE/pNs94ZbVWNw0+2817gwfGKaJHCoiDsPM="; + buildMypyBoto3Package "codeguru-reviewer" "1.35.0" + "sha256-CtUYNrOocrt2lKCNb0K2/GitWFYhhspM4upo2Q6qbuU="; mypy-boto3-codeguru-security = - buildMypyBoto3Package "codeguru-security" "1.34.0" - "sha256-DTtYCgcy3LWGxuxqSAkeS9qoBq1YWwAWfZU2DD44BOY="; + buildMypyBoto3Package "codeguru-security" "1.35.0" + "sha256-6YRFmSjoVc+wEoYAElh0xeJ+V+TK2WCQuxW0i2yh7s0="; mypy-boto3-codeguruprofiler = - buildMypyBoto3Package "codeguruprofiler" "1.34.0" - "sha256-pAZL9m0SHRYiIrXzBf+IeEkQOXS4/6OJqoDI6og3N5s="; + buildMypyBoto3Package "codeguruprofiler" "1.35.0" + "sha256-UJmPVW20ofQmmer9/IYwaFIU2+xhXcT+0s2aUxFDGZY="; mypy-boto3-codepipeline = - buildMypyBoto3Package "codepipeline" "1.34.43" - "sha256-omGtS0+5qBDBxCcKoOM+dsraE22m129zYUJB2yRxBtQ="; + buildMypyBoto3Package "codepipeline" "1.35.13" + "sha256-tLQEsxoPyDA5cFlsm3HAOQPCyZApCQOBJMxVPDH6Q+w="; mypy-boto3-codestar = - buildMypyBoto3Package "codestar" "1.34.0" - "sha256-BAueRLlYZGDiF6DtjxL24twLYYZqD3ErdJ73fsFoG1k="; + buildMypyBoto3Package "codestar" "1.35.0" + "sha256-B9Aq+hh9BOzCIYMkS21IZYb3tNCnKnV2OpSIo48aeJM="; mypy-boto3-codestar-connections = - buildMypyBoto3Package "codestar-connections" "1.34.60" - "sha256-WH/cN8BXG7c79gGR/0m3xvEPNdPAFRosInmO9DeAVdM="; + buildMypyBoto3Package "codestar-connections" "1.35.0" + "sha256-FgwTiMwMb0ujBqMcl1kCQVEk0HeCzq3Zcj5dXu9BCYk="; mypy-boto3-codestar-notifications = - buildMypyBoto3Package "codestar-notifications" "1.34.0" - "sha256-JmXEpHbOhcO9F++G+ohXPuXoNILbcL9r5qyH4OooCtc="; + buildMypyBoto3Package "codestar-notifications" "1.35.0" + "sha256-7IzW60xRrkzLorC3QJMX+iP6DN46sdaYKizNFTNTL98="; mypy-boto3-cognito-identity = - buildMypyBoto3Package "cognito-identity" "1.34.0" - "sha256-6UlyNX0a1wG5FR/WHMZOwysikGffNCX6Fo1MYvFuFwM="; + buildMypyBoto3Package "cognito-identity" "1.35.16" + "sha256-UVEJn/VNbYEIRPHV9CuDI0Hos5POiMQThiN4OlncQIE="; mypy-boto3-cognito-idp = - buildMypyBoto3Package "cognito-idp" "1.34.59" - "sha256-kZpXb5MzK4IceWnNs9tWWLhQnysfWGuOLf00J4/ypvw="; + buildMypyBoto3Package "cognito-idp" "1.35.18" + "sha256-StmODomtTdvtjYL54eNQBWWuVLozMB+sowpZKeGsYX0="; mypy-boto3-cognito-sync = - buildMypyBoto3Package "cognito-sync" "1.34.0" - "sha256-JTkmpEHwKN5IyoGVs4beVAEOr1fZPxBoYjzNBgjTEY0="; + buildMypyBoto3Package "cognito-sync" "1.35.0" + "sha256-eKmSJqNDB4rLeaiwors2mvDteM5qNQGsGz3Xq8VqUzU="; mypy-boto3-comprehend = - buildMypyBoto3Package "comprehend" "1.34.30" - "sha256-G7mSJWcr0ntPX6WoaeTWPw/uB32yn6xXPyyQvDVfa8s="; + buildMypyBoto3Package "comprehend" "1.35.0" + "sha256-x0D+Dar+VWHY59zIKkp8+gSL5I8gUSgct9ANplZ5aSE="; mypy-boto3-comprehendmedical = - buildMypyBoto3Package "comprehendmedical" "1.34.0" - "sha256-4KzL56xU474te8tW5xVZo6D5Pwe3GLRQbQfX8CXTz9g="; + buildMypyBoto3Package "comprehendmedical" "1.35.0" + "sha256-goeKEyNrj2ofR5v0nEpDZ1CLNpR0qvN13u8KS1sImZQ="; mypy-boto3-compute-optimizer = - buildMypyBoto3Package "compute-optimizer" "1.34.73" - "sha256-WOPbzONtQ+hnVYwWCWC2Q/E1mqWNww0K2tbJhZxjAHo="; + buildMypyBoto3Package "compute-optimizer" "1.35.0" + "sha256-pP0c6lk9l3seKkYBW9AjoaypkRWw4YwDgJjIpkwkLMA="; mypy-boto3-config = - buildMypyBoto3Package "config" "1.34.45" - "sha256-LN1CcIOj9cgzSNCvnUVwLRNPXlitHAlt+5jj6wu6i8E="; + buildMypyBoto3Package "config" "1.35.0" + "sha256-1pS2EkJapoNVi5lUEftaxbdoN4fd7XSFjWyLXH1noL0="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.34.82" - "sha256-QyZteRrk1d+Qwqj87uUb4f2ZK5SjPdMJV4NGv6kwrl4="; + buildMypyBoto3Package "connect" "1.35.30" + "sha256-QTUZHkDIsCUtFUXnydjwTrHUiYFh5uRyOKwW70isSaE="; mypy-boto3-connect-contact-lens = - buildMypyBoto3Package "connect-contact-lens" "1.34.0" - "sha256-Wx9vcjlgXdWZ2qP3Y/hTY2LAeTd+hyyV5JSIuKQ5I5k="; + buildMypyBoto3Package "connect-contact-lens" "1.35.0" + "sha256-S47wzXzOyTs27UzjtqtYJg38QGvBpnJ7boNlrueiZoQ="; mypy-boto3-connectcampaigns = - buildMypyBoto3Package "connectcampaigns" "1.34.16" - "sha256-CR1FuVJgYODKEhDmmwcWrjPyZm7HsFRlzq3HlnKe81E="; + buildMypyBoto3Package "connectcampaigns" "1.35.0" + "sha256-7nPkRP30c2KVarTw4OhebqHeWQ3wTm10PPkxoP3OvbE="; mypy-boto3-connectcases = - buildMypyBoto3Package "connectcases" "1.34.24" - "sha256-a3P7wPx2FQ3V5T68B4fYzuq2juiqs7R8K5WSbyWu5ug="; + buildMypyBoto3Package "connectcases" "1.35.0" + "sha256-lq4OWLz7+cycAuSr5dAoQ8aCbggAdLRv/dc7aUa/N7Y="; mypy-boto3-connectparticipant = - buildMypyBoto3Package "connectparticipant" "1.34.44" - "sha256-kP4ovwHfJoeRjSyfeL0M1U70aJoApMUUWOLFRpt6H+w="; + buildMypyBoto3Package "connectparticipant" "1.35.0" + "sha256-rYvtpy8Uac5YO4x/WSvUHz0aY8vYVf30gW1aLyYDbRM="; mypy-boto3-controltower = - buildMypyBoto3Package "controltower" "1.34.42" - "sha256-HwVES0lu75XkBPE7WQMSP2tOSogAqO3yr+cIeWaw9Is="; + buildMypyBoto3Package "controltower" "1.35.0" + "sha256-Hc9S/t+sTaMHIk93/pIWowMm0qXyyKf2Jth0j/JdtyA="; mypy-boto3-cur = - buildMypyBoto3Package "cur" "1.34.0" - "sha256-vwMILmIX7uzAGXdl1Z5mxVMJlgZCtA3Svp8mFmoZ6tQ="; + buildMypyBoto3Package "cur" "1.35.0" + "sha256-YEm3nBfWCSzwPZ3Yvm4Nf3cMxaTccvHdBrs84g7KE4g="; mypy-boto3-customer-profiles = - buildMypyBoto3Package "customer-profiles" "1.34.0" - "sha256-LxonO6G0Qa8j6VORcAwvR9j+w879Di5pqTzlicC9Dp8="; + buildMypyBoto3Package "customer-profiles" "1.35.29" + "sha256-RBT3HkjCx8HpPIn/CMLiW1zA29B1F1skhxnfxYzfMNM="; mypy-boto3-databrew = - buildMypyBoto3Package "databrew" "1.34.0" - "sha256-DP1Cuyogrs/K6qM7fnbHWSTPcpjoy1m0XEsq1ONbhxM="; + buildMypyBoto3Package "databrew" "1.35.0" + "sha256-zzd0tw46A9NwxUJ+7tz3Xlb4RbVTY3v7szDG4/189Ng="; mypy-boto3-dataexchange = - buildMypyBoto3Package "dataexchange" "1.34.0" - "sha256-gLJ6AJQLKSiGcwWEgDwipg0D1NqYwNFiXwAUGwCJ2+0="; + buildMypyBoto3Package "dataexchange" "1.35.0" + "sha256-DZ8sYkjFA0yFfRKNQbEW2YA3Dl04FbG6Hu8myRuFlUs="; mypy-boto3-datapipeline = - buildMypyBoto3Package "datapipeline" "1.34.0" - "sha256-Amn6pdW5i8+yBzuSRAmj0EnTYEGjzguQxaoLmhFFXck="; + buildMypyBoto3Package "datapipeline" "1.35.0" + "sha256-JlarWblBOzB64JV7866QjxIWqQH17qH4Lcig2g7WsAw="; mypy-boto3-datasync = - buildMypyBoto3Package "datasync" "1.34.37" - "sha256-uVZsnbghzbjDAuR+d6l7EET6S9fvx2NYGEllCPLtIXQ="; + buildMypyBoto3Package "datasync" "1.35.0" + "sha256-lUzOmIoPNgEbJC54tre1m5ddhca05GyTSPOG4uIfumk="; mypy-boto3-dax = - buildMypyBoto3Package "dax" "1.34.0" - "sha256-DH5kqV+C4vbZ8fbvAtR93jd5YB22hkYe/xgOF4oru1Y="; + buildMypyBoto3Package "dax" "1.35.0" + "sha256-kAOvmRLOPBKhHiipN17YTgKSkZU4fjdJtay16uV/10Y="; mypy-boto3-detective = - buildMypyBoto3Package "detective" "1.34.43" - "sha256-VevmUTgN0UKhWAtGfSbQoqAhgv19XiOBBoNNsHfHezg="; + buildMypyBoto3Package "detective" "1.35.0" + "sha256-pLurujlWUyHNeHqGDdLNPOZ91VyzVsnIdDPSgGEWhOo="; mypy-boto3-devicefarm = - buildMypyBoto3Package "devicefarm" "1.34.0" - "sha256-X0D4Am4GUDFl703FmdrPcHXihFdzuch/eQBofDTameQ="; + buildMypyBoto3Package "devicefarm" "1.35.8" + "sha256-NuCFTZ3+3NSlXtaG3hJTP58CBevyt5+qjIK8BY/VMOA="; mypy-boto3-devops-guru = - buildMypyBoto3Package "devops-guru" "1.34.0" - "sha256-IxSTAjcJcGySV1Zzlxal23nZz7m1eaCDa8UX41+9l5o="; + buildMypyBoto3Package "devops-guru" "1.35.0" + "sha256-KOvVP0ttOXBxmDF05GPRNvr2fKUc6+qJz3Pw53oAI+o="; mypy-boto3-directconnect = - buildMypyBoto3Package "directconnect" "1.34.0" - "sha256-H3xxqWZwjjzf7gFwsEfAcQmFfm3ZxNOBge0yFsfQpLM="; + buildMypyBoto3Package "directconnect" "1.35.0" + "sha256-HCSark4bQG673j5KZ1ZULwNiOBk/cichkGwuH1XNAPk="; mypy-boto3-discovery = - buildMypyBoto3Package "discovery" "1.34.0" - "sha256-QT3KX4bHVigaeOxMCBBtLR3lbTLOQAl1JDnMzN7gt9s="; + buildMypyBoto3Package "discovery" "1.35.0" + "sha256-kM9eR8OQ2la4tad+Q2PvO0auuEQNj0My5q4l8//9i+I="; mypy-boto3-dlm = - buildMypyBoto3Package "dlm" "1.34.0" - "sha256-uBcxQvYlWvhoVdWThvaETCKCmju0xtIFRcE8Eon6ovI="; + buildMypyBoto3Package "dlm" "1.35.0" + "sha256-yJ3ApQy6xeEdxNcRQG5mekfK1aP7FPdR79TfbRZkESo="; mypy-boto3-dms = - buildMypyBoto3Package "dms" "1.34.0" - "sha256-xGGMtqja+ipLpWRMXO1VzxHqjlaZDZ31p634u5kmyNs="; + buildMypyBoto3Package "dms" "1.35.0" + "sha256-mTwE5mn8GTCMuidyk8cYnZEk3PkrnP2ykVZgn2geMTo="; mypy-boto3-docdb = - buildMypyBoto3Package "docdb" "1.34.77" - "sha256-7iJn4wzvQ6FAD2xU04fLwJW8hWRfmJmFxVH/2KnsUdE="; + buildMypyBoto3Package "docdb" "1.35.0" + "sha256-gRSlQ63BPat6gxy+jZP/vtZIn6a4fXN0tx6oPvvgROo="; mypy-boto3-docdb-elastic = - buildMypyBoto3Package "docdb-elastic" "1.34.53" - "sha256-sNoS7ujT0rMi4WAFXwIfwkoGP3c88+l6cW7eliHheJ4="; + buildMypyBoto3Package "docdb-elastic" "1.35.0" + "sha256-bmhGGMR9x0QKFl2p0p4xhxtE+A5PZQ/HO1FdLuAgLtI="; mypy-boto3-drs = - buildMypyBoto3Package "drs" "1.34.50" - "sha256-UWqnQAyxBnQjGYofZMOD3nhnqxTMh2U7/FNtMId1isk="; + buildMypyBoto3Package "drs" "1.35.0" + "sha256-Fzdqwy9NA+R2ZYNuXcxTv5RlY9X1d609CZHbSQUp3Is="; mypy-boto3-ds = - buildMypyBoto3Package "ds" "1.34.0" - "sha256-qVtMpsnVLF2rN4WaEhrqlTvWvW28RcHIBjsZYwmYapc="; + buildMypyBoto3Package "ds" "1.35.22" + "sha256-OgK+ZM7wn7Elp6xzb1YnZtYP+eARgsP+BIYkQb+E4YE="; mypy-boto3-dynamodb = - buildMypyBoto3Package "dynamodb" "1.34.67" - "sha256-CUR+8+pr3+C+TjLKIyg4IFczQdNAvqMGXe0hU8xZPSI="; + buildMypyBoto3Package "dynamodb" "1.35.24" + "sha256-Vb+Jeh0ONUV57bBQAfS8T0crlFK63Z2ySHbDG98/cqE="; mypy-boto3-dynamodbstreams = - buildMypyBoto3Package "dynamodbstreams" "1.34.0" - "sha256-Zx5cJE+fU9NcvK5rLR966AGIKUvfIwdpLaWWdLmuDzc="; + buildMypyBoto3Package "dynamodbstreams" "1.35.0" + "sha256-oiyT6g9Rnfv1LLHv5NgIUiXLS5Q3jsz9f0EswUUnrKs="; mypy-boto3-ebs = - buildMypyBoto3Package "ebs" "1.34.0" - "sha256-xIrrXOayZed+Jcn4CFXXNgKz/G+RdiuwA04wq+Ry/fs="; + buildMypyBoto3Package "ebs" "1.35.0" + "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.34.78" - "sha256-vfKasmXtPV8AlNmwyNNA6tnmtgn1w7m2eQYB6GYfikg="; + buildMypyBoto3Package "ec2" "1.35.27" + "sha256-fop723a6ylbitijRkYLBWw0ijtYyi/oNP53ZNZZYxpI="; mypy-boto3-ec2-instance-connect = - buildMypyBoto3Package "ec2-instance-connect" "1.34.63" - "sha256-kExmGXEJ5jrvOewmWx7AjVb3boD5GU0cEUp/2PQhzlw="; + buildMypyBoto3Package "ec2-instance-connect" "1.35.0" + "sha256-0Xe77fz+lA+nuUGK+PjU0EgWeQ7AJ9Smsb/4yK1tow0="; mypy-boto3-ecr = - buildMypyBoto3Package "ecr" "1.34.0" - "sha256-uD+wMR6WikLUyoIbAGwY1KPj42S4zr7nWOpPqXxaw0U="; + buildMypyBoto3Package "ecr" "1.35.21" + "sha256-1+jCQIbOOyWeSsKicfw07U7/3pnHiZrH1kwto8/wrNc="; mypy-boto3-ecr-public = - buildMypyBoto3Package "ecr-public" "1.34.0" - "sha256-38ZiRVPr9L+KUF6oL23xsIiKMW0pT/nIngFkhSS3z2Y="; + buildMypyBoto3Package "ecr-public" "1.35.0" + "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.34.76" - "sha256-y8B4Qh1WWJEgP+VHzznJdsdCsAA1pUizEh+qTDDFeoQ="; + buildMypyBoto3Package "ecs" "1.35.21" + "sha256-DSmCf9/TXUfoEYppEZOxAJOxuOCZK5p6GRIKWIa3aPQ="; mypy-boto3-efs = - buildMypyBoto3Package "efs" "1.34.0" - "sha256-VAK7mfnPBPDC8Azm6Bxl86E8CkeArTmfgqYkIcSblYA="; + buildMypyBoto3Package "efs" "1.35.0" + "sha256-6o825Pz7Vbg/xuFXR7mTLv3zWcLoRIqbFqjRcQtZOJ8="; mypy-boto3-eks = - buildMypyBoto3Package "eks" "1.34.73" - "sha256-sSVfQvBmH9wYnqInvF8ixsyb0pbvHPx0zQwfPxa5caE="; + buildMypyBoto3Package "eks" "1.35.0" + "sha256-w+uJ5Jqfbnj3ykj59C8sbhitp5MyTIE+PnZXrlIkOag="; mypy-boto3-elastic-inference = - buildMypyBoto3Package "elastic-inference" "1.34.0" - "sha256-gbWKw0zDQf3qBlp1KeO7MX1j/GqRUpFAxLG0BKFrHBk="; + buildMypyBoto3Package "elastic-inference" "1.35.0" + "sha256-GpOOU/ritDu+hDZL8adN5fLYhYt0bgBTqCv2mDjt1T0="; mypy-boto3-elasticache = - buildMypyBoto3Package "elasticache" "1.34.72" - "sha256-yZd2KB7wIw23PybblyIlCo/5IEFYxAUfbLD2J91eOzw="; + buildMypyBoto3Package "elasticache" "1.35.0" + "sha256-m80E+gaUJNpmrY9k4TuKaMbaAm+fCDqUbgH5IVgrArw="; mypy-boto3-elasticbeanstalk = - buildMypyBoto3Package "elasticbeanstalk" "1.34.0" - "sha256-ftVFUwY81mg/9zJ4xxVjhXF1HgKpzj1koIS32cMKRLw="; + buildMypyBoto3Package "elasticbeanstalk" "1.35.0" + "sha256-mQMBfRyxFW0Mj/VX74luXxxfVTqSgMswet1fZe5qiyE="; mypy-boto3-elastictranscoder = - buildMypyBoto3Package "elastictranscoder" "1.34.0" - "sha256-tC+9Ks0DDC3zWBd9C964X8TFoL6kblWxG0jUQrzdID0="; + buildMypyBoto3Package "elastictranscoder" "1.35.0" + "sha256-5fyZdBW/KdryVUv9NiSUa8TGEgh4U8eLXWv/Z0DhIew="; mypy-boto3-elb = - buildMypyBoto3Package "elb" "1.34.0" - "sha256-5Eh5D872pVDd7Q+DDh3zpGMVgS8fUJsV+63H1fet73s="; + buildMypyBoto3Package "elb" "1.35.0" + "sha256-fw/vfzKXXQSG7xj9FolkJgzciHBz4ELlFh2MlEJ6wQI="; mypy-boto3-elbv2 = - buildMypyBoto3Package "elbv2" "1.34.63" - "sha256-snXMLMHLEpJjfX1GJp6FfYgIjkS8vkbf/hESBdhxIfk="; + buildMypyBoto3Package "elbv2" "1.35.18" + "sha256-BlHZi/WM1rKK0QWbAYfHmdpZmgm8ZpWZPZQ4gz0k4oY="; mypy-boto3-emr = - buildMypyBoto3Package "emr" "1.34.75" - "sha256-Irxd4i5b1bbZuWBhXfLOuvoS1X5SoZH8GsgbQyy3UrY="; + buildMypyBoto3Package "emr" "1.35.18" + "sha256-yXm2k6pDyJ1N93q6ltz6jvQy17AKpKsKhVFMpS1oGaI="; mypy-boto3-emr-containers = - buildMypyBoto3Package "emr-containers" "1.34.78" - "sha256-GvoXMnpqahn3DIZFAAye0DGwIkAQhYaXektYC6hN3Ng="; + buildMypyBoto3Package "emr-containers" "1.35.4" + "sha256-ARmcy8oINHgph9PqNtQYyBVEVshBuSHDeju2ynNSqQ8="; mypy-boto3-emr-serverless = - buildMypyBoto3Package "emr-serverless" "1.34.0" - "sha256-YgccYi2+XhKiPGCMimrCooYPRV+iRuA1h120UdqJKUc="; + buildMypyBoto3Package "emr-serverless" "1.35.25" + "sha256-9aQOr3oGVejk34AInlyoS9//4DBIR0JBbHGumvanOtw="; mypy-boto3-entityresolution = - buildMypyBoto3Package "entityresolution" "1.34.0" - "sha256-qfRZtRaxysW+Ev16gnj48CePZzLBWrXmrq3tEGtfNbM="; + buildMypyBoto3Package "entityresolution" "1.35.3" + "sha256-NpMzNHyIMc850GHCLi3ENku96S8QvR/SAShsLqhwrks="; mypy-boto3-es = - buildMypyBoto3Package "es" "1.34.36" - "sha256-uVLB1fjZRhlqJ/isKl5TDORmIN4ffKKqzyGZcEffa5g="; + buildMypyBoto3Package "es" "1.35.0" + "sha256-ad5PQgRxRqEQ4QOjM0wPGe/4JXPNqlB5exRHacx7YKw="; mypy-boto3-events = - buildMypyBoto3Package "events" "1.34.17" - "sha256-L/78a975mFWw5xBH4et01j4Ba9/aGb5NUK7d/bPtsJU="; + buildMypyBoto3Package "events" "1.35.0" + "sha256-IXJGXd/J+EwN1FcHofPq9AatYysD6FRrny39MzqF6yY="; mypy-boto3-evidently = - buildMypyBoto3Package "evidently" "1.34.0" - "sha256-MkBB5iTYJYg2cWFYHR3Qu7TcsDglLPEw0MnoHqij6+A="; + buildMypyBoto3Package "evidently" "1.35.0" + "sha256-C7hTVrCUdBpYj0y5cLGKnruJcgaHFMkeY6R0fZ/Zp78="; mypy-boto3-finspace = - buildMypyBoto3Package "finspace" "1.34.71" - "sha256-bgPwDXqu73DjQCADmjTig6kLNOWvQ39flwhyYAbTai4="; + buildMypyBoto3Package "finspace" "1.35.12" + "sha256-zO4rFI2pzAFhHHyRPYeeV0eC4daRJ57GeAnAqrOyQAQ="; mypy-boto3-finspace-data = - buildMypyBoto3Package "finspace-data" "1.34.0" - "sha256-8mND5BbdKY5srFwdpxSyfCUTIP4fa9hztP4daUJOB8k="; + buildMypyBoto3Package "finspace-data" "1.35.0" + "sha256-KQqb3NdsN8SloK7kIbJoy5I3zhO5CUr9rB8ZqtVLaDc="; mypy-boto3-firehose = - buildMypyBoto3Package "firehose" "1.34.69" - "sha256-GCMH/XA9ETSuo39OnlvyhfHDKylsTeLO1R1+7tl2S/E="; + buildMypyBoto3Package "firehose" "1.35.0" + "sha256-7ibqWrvc1mwCDzsm/tqha/2Y2EbfxTpsf7omIZg/EbM="; mypy-boto3-fis = - buildMypyBoto3Package "fis" "1.34.63" - "sha256-TJnzgQGDcybpVqg+p7Tuvw/RoY79cQPPChyHWlMxhiY="; + buildMypyBoto3Package "fis" "1.35.12" + "sha256-rm0PB0oie7q+8pl+efohmHe8StLZVvSWYgLIajxd3Fo="; mypy-boto3-fms = - buildMypyBoto3Package "fms" "1.34.0" - "sha256-tzaSecIXzkC+Zr5MGpU7GaoiGHGsywEglZ8+Ja0XDDo="; + buildMypyBoto3Package "fms" "1.35.0" + "sha256-Y+FKtBDxQ2SyN8uHLkt7KKylo8uOa6mCHUwf98TsBRg="; mypy-boto3-forecast = - buildMypyBoto3Package "forecast" "1.34.0" - "sha256-DuNZe9Q7HuEeJYuBqo7JRBTJgclyUpU9fJ62SCGYpLQ="; + buildMypyBoto3Package "forecast" "1.35.0" + "sha256-s+4P39vLxQiAoVpxPKLJd4BgP9/OOFUrnt61EnMXUMs="; mypy-boto3-forecastquery = - buildMypyBoto3Package "forecastquery" "1.34.0" - "sha256-IEKWQbwRDHiT/n5dSXXtLDqRVK12+EiSg9J+dGXfqx8="; + buildMypyBoto3Package "forecastquery" "1.35.0" + "sha256-ityNtprzMtWbAsRARL+c7q1czj+E1Pxv+6bJdci6Fcg="; mypy-boto3-frauddetector = - buildMypyBoto3Package "frauddetector" "1.34.0" - "sha256-EjiFEFpLKN0NmrNY43CFhQZHN+COTwRXx513X6X7vlE="; + buildMypyBoto3Package "frauddetector" "1.35.0" + "sha256-dUbtx84rCJ5zRHxmdpGFAychNH/F98eviwdwqmslPLk="; mypy-boto3-fsx = - buildMypyBoto3Package "fsx" "1.34.55" - "sha256-XsIX4C8sF1m8jGbwrDWGoV7onHA9tRlI5Dki43bf9FM="; + buildMypyBoto3Package "fsx" "1.35.27" + "sha256-rPVWNk0+Xt9kMAl8xD0xM/EIbiYPSUL8Yc8b+2RcD4o="; mypy-boto3-gamelift = - buildMypyBoto3Package "gamelift" "1.34.1" - "sha256-EUdVrcriXRUqjcyKzyuoIdDTxMSAdyKcnbJ96s/Y8Uc="; - - mypy-boto3-gamesparks = - buildMypyBoto3Package "gamesparks" "1.28.36" - "sha256-6lQXNJ55FYvkFA14rgJGhRMjBHA3YrOybnsKNecX7So="; + buildMypyBoto3Package "gamelift" "1.35.13" + "sha256-Xd0jrg/w4CPn5mDgHTaahyRAu5RZxdMcpci0cx7/1sQ="; mypy-boto3-glacier = - buildMypyBoto3Package "glacier" "1.34.0" - "sha256-j8LUD8EjjRL1av7UEXBqNPEARaSFgstaioGJtbel4oM="; + buildMypyBoto3Package "glacier" "1.35.0" + "sha256-WpSdaAf/s2jPoGG4cLjeNKZz6kUSApTMVq4nnB1nkfI="; mypy-boto3-globalaccelerator = - buildMypyBoto3Package "globalaccelerator" "1.34.70" - "sha256-7Su+rgV6KD9I4j630Qybufwn39rp/8tYQ2ldEe2Untc="; + buildMypyBoto3Package "globalaccelerator" "1.35.0" + "sha256-RJEZBr3yU/lGEainrpidLsdYBvVOPMq3cIaIpsTAziQ="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.34.76" - "sha256-bo88vETpsKBVDQ7n0a75iJrIyslBUAe0xjcfJp/y9IE="; + buildMypyBoto3Package "glue" "1.35.25" + "sha256-hWpxnfHPaCUlxFg/3vNhluQnc2IHYoNVq9owH3D2eME="; mypy-boto3-grafana = - buildMypyBoto3Package "grafana" "1.34.58" - "sha256-dr+fCDf0DcWGxPPLMnzqrOCRMfoLhznyv6n679fFU/0="; + buildMypyBoto3Package "grafana" "1.35.0" + "sha256-AxH6/D5K4m2nmZor6T6bb7/PbimJSI+0DxyLOXUexnI="; mypy-boto3-greengrass = - buildMypyBoto3Package "greengrass" "1.34.0" - "sha256-ZU/xVWGlMngX0JiAhy9NEFDoXS4fsZvmLAkWqv2pocQ="; + buildMypyBoto3Package "greengrass" "1.35.0" + "sha256-XtMbgVoGmFTTFJTSQT0NRR7shxW81tmmn6JMa98k+kM="; mypy-boto3-greengrassv2 = - buildMypyBoto3Package "greengrassv2" "1.34.0" - "sha256-O3g6JHvnfvgKL0ax9R6IWgxdEoALaycfsBAhvWdERH0="; + buildMypyBoto3Package "greengrassv2" "1.35.0" + "sha256-dUtwgf8DDz3ShH5aHW8WdII8VOSDDK+g1q4ObppA2W4="; mypy-boto3-groundstation = - buildMypyBoto3Package "groundstation" "1.34.77" - "sha256-g0pN7BeRZMZqyJVjABaRSE77ZMZxDRcLv+/JHjJ/cQc="; + buildMypyBoto3Package "groundstation" "1.35.0" + "sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM="; mypy-boto3-guardduty = - buildMypyBoto3Package "guardduty" "1.34.73" - "sha256-DasHgBMa4/hnh/otzh0Zz4nalmESIS2/HkaY4vTltRs="; + buildMypyBoto3Package "guardduty" "1.35.22" + "sha256-+Ro4QM8DwrDlbroFb6YV6fZGYPieHB0B5+EgdNrnIzQ="; mypy-boto3-health = - buildMypyBoto3Package "health" "1.34.0" - "sha256-st3ygy9yZbAbh1ZWnT8XDZTBz1qWhRWXCEfr5ILQHpo="; + buildMypyBoto3Package "health" "1.35.0" + "sha256-k0c7P8ozVzHSyMAGLg5arVjr+bABfZFwFU4EBQZufUA="; mypy-boto3-healthlake = - buildMypyBoto3Package "healthlake" "1.34.43" - "sha256-Xci7f0/o60v1TAazFC34GjpzOBQlD+SvAMCF4xM3ymI="; - - mypy-boto3-honeycode = - buildMypyBoto3Package "honeycode" "1.34.0" - "sha256-HNp/STFuMLoO4qyL0iaYeiPpnMV3uzNBNFUDgzrHt9s="; + buildMypyBoto3Package "healthlake" "1.35.0" + "sha256-Df0AUKZh6S4OdqGBUtEC4cnic9E06Frj0McQH+yQwFc="; mypy-boto3-iam = - buildMypyBoto3Package "iam" "1.34.83" - "sha256-cmExVhZ1fr91Cd8OmwkdWULkcOtRxLI8ZioGhzqajso="; + buildMypyBoto3Package "iam" "1.35.0" + "sha256-s3mgHDyhejZ8t6RgkF+c4at4MKmruMilbyil/xCHZX8="; mypy-boto3-identitystore = - buildMypyBoto3Package "identitystore" "1.34.0" - "sha256-OdJsMjraTe4qhpblBOuwr++4QfiMXtaaMHDAEOTBII4="; + buildMypyBoto3Package "identitystore" "1.35.0" + "sha256-wHm7wHBhEX3c29MwZtbZPXH1su5MsAzLmj5h8V3/3V0="; mypy-boto3-imagebuilder = - buildMypyBoto3Package "imagebuilder" "1.34.57" - "sha256-r11JVMvO/IL1d2+fGZoc4nt1JnyUXir38a8i7IsZmLQ="; + buildMypyBoto3Package "imagebuilder" "1.35.0" + "sha256-yL54l1/+3Lz4C0Um47rsybbYujc1nde2jirX/DUeSIY="; mypy-boto3-importexport = - buildMypyBoto3Package "importexport" "1.34.0" - "sha256-GnIzCaCuRLPdvaAmmID62uY/te1Lx5DFGin2zJuDdAM="; + buildMypyBoto3Package "importexport" "1.35.0" + "sha256-RtMsMIw5YqPiO8GNKa4VPPb+oaA/IdQgsZVNK9kpSuc="; mypy-boto3-inspector = - buildMypyBoto3Package "inspector" "1.34.0" - "sha256-85aAE1+azKZ9sFYxLOpVR4SkqrnfFQ1gXgGpzOBK1PE="; + buildMypyBoto3Package "inspector" "1.35.0" + "sha256-4QXRWahJ0y9Svi/WRIiRFfo36tkKM25bXCTMrZjE41g="; mypy-boto3-inspector2 = - buildMypyBoto3Package "inspector2" "1.34.29" - "sha256-ZMdNVgKXQnEHyK4tV/XegvFX7xdk5A1AiSfpTKWCtcY="; + buildMypyBoto3Package "inspector2" "1.35.4" + "sha256-NslpiIBwxTvcEe/Lh8wM2PJE31JNmu4qyCZMbB+9noE="; mypy-boto3-internetmonitor = - buildMypyBoto3Package "internetmonitor" "1.34.74" - "sha256-VFIeJqQHHvbB+mLyzxHpZUvgGS5dJJen4AAJAMJTDqE="; + buildMypyBoto3Package "internetmonitor" "1.35.8" + "sha256-BWNccaLrGmm5liiAOHCeFqSlkDk8wnj+/ipExaVZVis="; mypy-boto3-iot = - buildMypyBoto3Package "iot" "1.34.52" - "sha256-YWGotOPKljY4B0JL1I+axk4MJZIk84rVxoZu9tzBGss="; + buildMypyBoto3Package "iot" "1.35.20" + "sha256-3D1VjhsSVOedLhn7W6Huch4aowjlJgCuotUyln71n6k="; mypy-boto3-iot-data = - buildMypyBoto3Package "iot-data" "1.34.0" - "sha256-N6UoHopsT3FM7bU01eWuqRSyyyaLBekkM+hsOU1byIM="; + buildMypyBoto3Package "iot-data" "1.35.0" + "sha256-6Dy72Ui8OI7ROdKCBEKvHTGco33OcI30QpXErPz7MPg="; mypy-boto3-iot-jobs-data = - buildMypyBoto3Package "iot-jobs-data" "1.34.0" - "sha256-ceqk+Gt+IcIVuLp/LMsrjnUXrPt+SY+mI8G3hKdE7TY="; - - mypy-boto3-iot-roborunner = - buildMypyBoto3Package "iot-roborunner" "1.34.0" - "sha256-TfhJHtE2zlEr80SGbxAZfK2+M/ad596fdwex+4GhBf8="; + buildMypyBoto3Package "iot-jobs-data" "1.35.0" + "sha256-pHVZNE6mAr/IJrM/jY8fiEt1o8hQOJ1aw+oKuKijpyU="; mypy-boto3-iot1click-devices = - buildMypyBoto3Package "iot1click-devices" "1.34.0" - "sha256-Zpv/kw541LoC3Z58eKGe7sK5qioWMGswQS0O+jvNZgY="; + buildMypyBoto3Package "iot1click-devices" "1.35.0" + "sha256-I6bQTR11cWwa9ifrBsU7biYN8T7AyNDg3DvHQ0tyzFI="; mypy-boto3-iot1click-projects = - buildMypyBoto3Package "iot1click-projects" "1.34.0" - "sha256-QZ06B5UQSuDPUaXqZYPjawSEjIQjBwP7d5/obpvNivI="; + buildMypyBoto3Package "iot1click-projects" "1.35.0" + "sha256-eVH+EYKSz5rZcetDp378EyswOgPqhmOcIuApwiOlOZw="; mypy-boto3-iotanalytics = - buildMypyBoto3Package "iotanalytics" "1.34.0" - "sha256-aDlptQYJQ71WWYsgv+bFRoD2fmeGgiUl1Fv/oOAQJEM="; + buildMypyBoto3Package "iotanalytics" "1.35.0" + "sha256-jVb/qDhi0onfEMXDnJHodqKrEgXqPrUTseiGIUwCPWk="; mypy-boto3-iotdeviceadvisor = - buildMypyBoto3Package "iotdeviceadvisor" "1.34.0" - "sha256-DBI4dJXxprfHO3ipLIVb5Ii5NK7qWJRuWjzVfHTnqO4="; + buildMypyBoto3Package "iotdeviceadvisor" "1.35.0" + "sha256-mo5rWGiyoaWRsaCZsGVmnHalVpV4WlcM+SKEXm0y6eY="; mypy-boto3-iotevents = - buildMypyBoto3Package "iotevents" "1.34.47" - "sha256-ppsjLI2yY9+6SmAh1mfVBuZz+gHNNZS6eKDr3fHHmJM="; + buildMypyBoto3Package "iotevents" "1.35.0" + "sha256-NApPJ95ciwJF400DGuTHm/xeeorYcyc5iXejPwJ9nUY="; mypy-boto3-iotevents-data = - buildMypyBoto3Package "iotevents-data" "1.34.0" - "sha256-K7yAnxjpJfSh6bWnmcdySkCQhhVFt42zU6REiy3zKrk="; + buildMypyBoto3Package "iotevents-data" "1.35.0" + "sha256-haDAVJsgAUYlFIC2Gv5w6qDUfMtbH2eWmYW3wEURH/E="; mypy-boto3-iotfleethub = - buildMypyBoto3Package "iotfleethub" "1.34.0" - "sha256-wNm6OJUgAhvrXhtGaty19Tyva+nvonDOHsj9RT37FbY="; + buildMypyBoto3Package "iotfleethub" "1.35.0" + "sha256-Hse02blZttIxqJovJ3h6yCEi+jN3e+pfznIXjBAid1k="; mypy-boto3-iotfleetwise = - buildMypyBoto3Package "iotfleetwise" "1.34.20" - "sha256-Pe5Pw19H2y6koJxajW46oazxoFL5UHSOQHgXnhfIQJk="; + buildMypyBoto3Package "iotfleetwise" "1.35.0" + "sha256-VQCFJX2wZYKWey8yxEBoAK29uDxb/xn5+EuZH739DV8="; mypy-boto3-iotsecuretunneling = - buildMypyBoto3Package "iotsecuretunneling" "1.34.0" - "sha256-E8658X3yWpIcRKDTtnacjuAAWqr/qnmYXFRJ/7uyKm8="; + buildMypyBoto3Package "iotsecuretunneling" "1.35.0" + "sha256-A1sYvlnpbfKZyxZvFCzBfD/Jbzd1PwlQwgj+fvcybGU="; mypy-boto3-iotsitewise = - buildMypyBoto3Package "iotsitewise" "1.34.0" - "sha256-/WDIf5WRUYbuhkzjXrX1t3BvHd7ZXBem2o8TysFWYQw="; + buildMypyBoto3Package "iotsitewise" "1.35.6" + "sha256-WICduOodvGT0EP7Txjbe49f0+ZhtVmzkIg6XJV4qHJU="; mypy-boto3-iotthingsgraph = - buildMypyBoto3Package "iotthingsgraph" "1.34.0" - "sha256-8D0jqOuusz6SLCr+eKAZpTr9dvdonIc7+UYyXDzVzYQ="; + buildMypyBoto3Package "iotthingsgraph" "1.35.0" + "sha256-no67GUF7Z4TcqbWUYG18bHRP+FEccN9P/drOP5HQx/g="; mypy-boto3-iottwinmaker = - buildMypyBoto3Package "iottwinmaker" "1.34.0" - "sha256-K5LEh8wdXvftxGstThSBN73K+1FUVlE40JxvjWv6GMA="; + buildMypyBoto3Package "iottwinmaker" "1.35.0" + "sha256-6w4Q6vynF47uBeTNBqus4hM9Fy5Bs3C0Qh/Ig3sPBhw="; mypy-boto3-iotwireless = - buildMypyBoto3Package "iotwireless" "1.34.74" - "sha256-57ZO7LlQ9/itiynqSjXu7SJrNLNaFo5WCJBqSXEYeLs="; + buildMypyBoto3Package "iotwireless" "1.35.0" + "sha256-e4a8Na1spmmaUVAiAWPvn7DqzYHzEL4EatCewrRxJKE="; mypy-boto3-ivs = - buildMypyBoto3Package "ivs" "1.34.78" - "sha256-ddugPjG15nmI2WsWp27TEQj8jwBLXaogznFwf1UP1nE="; + buildMypyBoto3Package "ivs" "1.35.19" + "sha256-CXQnPKSn8oMyj2V2+iTjcqPEGykM2mOrRDVTkYEX/Jo="; mypy-boto3-ivs-realtime = - buildMypyBoto3Package "ivs-realtime" "1.34.62" - "sha256-/8P/S2xdYub8/tC0yaUbUfcxfDKpDnfAvmqneXFcAOo="; + buildMypyBoto3Package "ivs-realtime" "1.35.15" + "sha256-pO8W60U+c56/1F7LECM4AcOMIW7sHifSd9Ov+HJ4TpQ="; mypy-boto3-ivschat = - buildMypyBoto3Package "ivschat" "1.34.76" - "sha256-y4CqrYMo6BQAhRr3adH3Ndb2q/DkOjef8Q89Vfz4QP4="; + buildMypyBoto3Package "ivschat" "1.35.19" + "sha256-Eb2polqqaboA93F86ZpJ9IzZRY5FRRceq+wLp/V2/2U="; mypy-boto3-kafka = - buildMypyBoto3Package "kafka" "1.34.61" - "sha256-nXd3Qi8IZsQN595vnsMLSn6pfZU70yPb6Ebhv4SijfE="; + buildMypyBoto3Package "kafka" "1.35.15" + "sha256-mY1AapHaDKxJTZyP44wgZhRfJEGJubYMsV+PhKgFxIM="; mypy-boto3-kafkaconnect = - buildMypyBoto3Package "kafkaconnect" "1.34.50" - "sha256-frPPAQeFyO92uMqqzBcSC3MVK4V4hbdO9tx4awAKAUU="; + buildMypyBoto3Package "kafkaconnect" "1.35.0" + "sha256-xHARaL3zzxY6jy5VyQIrZLXqwvfprktif4pcSk+7xzY="; mypy-boto3-kendra = - buildMypyBoto3Package "kendra" "1.34.69" - "sha256-OKUSsCfv2X9ad5XUSwm0KRwW++qb+AVtvCOurlRM/bo="; + buildMypyBoto3Package "kendra" "1.35.0" + "sha256-fnpRggcnA4mhk1vU7I0x+nn6wvx9PQ5Gi/WckSgfZ7c="; mypy-boto3-kendra-ranking = - buildMypyBoto3Package "kendra-ranking" "1.34.0" - "sha256-hbemz5ECtfP3oi645lZT7CCx31yg8MNqbAD32Am6l1U="; + buildMypyBoto3Package "kendra-ranking" "1.35.0" + "sha256-lBZ9MJQsuM0vRyrDcelDXTIhP9sex6CjnRjYY3qjIdE="; mypy-boto3-keyspaces = - buildMypyBoto3Package "keyspaces" "1.34.45" - "sha256-Ucmttfi8oQIPpdfr3KPvrX1Tj3zbYxHGoYH0JNYX5UM="; + buildMypyBoto3Package "keyspaces" "1.35.0" + "sha256-ZtixXownfAnqUfNY53sVGbDZTQ2Q+Hhzgs1Txuyn3gM="; mypy-boto3-kinesis = - buildMypyBoto3Package "kinesis" "1.34.0" - "sha256-9ATnW63Vl36fCXQbdpuIiIVL3UEcYxNEaGq4ie/ph0E="; + buildMypyBoto3Package "kinesis" "1.35.26" + "sha256-hl8ml/Yt/H0EBSQ2qSW98NOakxfN6MaYGmrEbmWcHH8="; mypy-boto3-kinesis-video-archived-media = - buildMypyBoto3Package "kinesis-video-archived-media" "1.34.10" - "sha256-B66x9erx5SlnDmTBpf4izGckF4GysChy+VRXy9tWSf4="; + buildMypyBoto3Package "kinesis-video-archived-media" "1.35.0" + "sha256-NJtU+ccNQoz85Q9TEs2TlmLtbMGo1U4Poan1d3Vpcxk="; mypy-boto3-kinesis-video-media = - buildMypyBoto3Package "kinesis-video-media" "1.34.0" - "sha256-YgkG14UzymthRLg4cga80ZDK9cxZzFBTISmnfTPt8nM="; + buildMypyBoto3Package "kinesis-video-media" "1.35.0" + "sha256-bQ0w9UuocZjfxjdcwms1vaNnCoSM2Xis8bBNzuROiXU="; mypy-boto3-kinesis-video-signaling = - buildMypyBoto3Package "kinesis-video-signaling" "1.34.0" - "sha256-aNFuruM0kQNhp+wEJr+Bo9MzLieG6a8xzbrHGAovgw8="; + buildMypyBoto3Package "kinesis-video-signaling" "1.35.0" + "sha256-5dPgAwcPymYdrKT+YhyRkFOhfDj71xfA/P50KdurMXI="; mypy-boto3-kinesis-video-webrtc-storage = - buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.34.0" - "sha256-Oi6r/AxePB0znUPg3fb22qZLDS4Cola5Vvs38Railnc="; + buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.35.0" + "sha256-8DtIRagCl2UAfHGZSxX8BuHdrWHVSHSJ+Wftr3mA3x4="; mypy-boto3-kinesisanalytics = - buildMypyBoto3Package "kinesisanalytics" "1.34.0" - "sha256-eEoSmwMTa/hsbKbuKuzAZv4jHljGKq3b5Rw7K2Pgc50="; + buildMypyBoto3Package "kinesisanalytics" "1.35.0" + "sha256-aKdkj9FTE3yDnyWySWx1xXAzzPypaGZ2IYg+6AwHHKQ="; mypy-boto3-kinesisanalyticsv2 = - buildMypyBoto3Package "kinesisanalyticsv2" "1.34.64" - "sha256-7sJyrWtBcbrWlCjR7pLdBLgW7sXcRazDPBW+OGwh4Xg="; + buildMypyBoto3Package "kinesisanalyticsv2" "1.35.13" + "sha256-UoRFrbwA6QdFsO2z7R8If5/0Jf6ebMTJ91jqEh/Ys38="; mypy-boto3-kinesisvideo = - buildMypyBoto3Package "kinesisvideo" "1.34.48" - "sha256-uYSkwOuYKF3B+sj5IWbDL789Xue2yNY9g14j/2b6k6w="; + buildMypyBoto3Package "kinesisvideo" "1.35.0" + "sha256-pQB1whgSUK17rS16iaiucSiKMKJPP/AocWH+YlbyX6o="; mypy-boto3-kms = - buildMypyBoto3Package "kms" "1.34.65" - "sha256-jot13mfxhgvayvQkMxnDvjdwkpGLkwsC2eeAQpMW0II="; + buildMypyBoto3Package "kms" "1.35.0" + "sha256-oGpeVJ4uuNUAIsZwc2k0QKLtzLSHC+ULM1f3Pcm+ZPk="; mypy-boto3-lakeformation = - buildMypyBoto3Package "lakeformation" "1.34.7" - "sha256-/IPOF44ohg59XX+lmMbx8WsaHFpBaMH440Wm5jgrKD4="; + buildMypyBoto3Package "lakeformation" "1.35.0" + "sha256-d6dz+lqK8RJ4kwDvK8WYf5U3N9oic5s+4KJgW08/3oU="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.34.77" - "sha256-e4HSpWBPtZLpL+CyhOzSWd4HFwM2CjO3HJtU30bYHJw="; + buildMypyBoto3Package "lambda" "1.35.28" + "sha256-hHPXHug6yoAJ0xflfNIJSjVeyQx8U2zyblLbcbL3Uos="; mypy-boto3-lex-models = - buildMypyBoto3Package "lex-models" "1.34.0" - "sha256-LkD3CCjJYGwlSYRP0meJUCEdVSGGdSRrL9uBtimX4GU="; + buildMypyBoto3Package "lex-models" "1.35.0" + "sha256-VkE2UkY88ZksHpwTVGgjA80mTzO50CI1QPdh3Ug/RGc="; mypy-boto3-lex-runtime = - buildMypyBoto3Package "lex-runtime" "1.34.0" - "sha256-oFUSsfT7RXHRAVUUk014lqPylPa+TZuyNuvHRixIxt8="; + buildMypyBoto3Package "lex-runtime" "1.35.0" + "sha256-oZo6Drdgh8LaT1aheCZTmOLfa8aacXbwtkU33pqX2Hw="; mypy-boto3-lexv2-models = - buildMypyBoto3Package "lexv2-models" "1.34.53" - "sha256-xeuLY+rMoqtJc75pf2A/DYcsG86qqsIDO225QIwjlDw="; + buildMypyBoto3Package "lexv2-models" "1.35.17" + "sha256-Z7WxCRl7U+nEEeCHgQavY35pvYrS7vDOpf9KPzbMDSs="; mypy-boto3-lexv2-runtime = - buildMypyBoto3Package "lexv2-runtime" "1.34.0" - "sha256-V1OkUcwFYp8TVS2ASFjARJUrIKAx/9zcfQbQMngU5Uc="; + buildMypyBoto3Package "lexv2-runtime" "1.35.0" + "sha256-DXz53R1jyNNfcHzADr8U/jnhBrhlhrNA+C6Y8CD5dcU="; mypy-boto3-license-manager = - buildMypyBoto3Package "license-manager" "1.34.0" - "sha256-93G6q8UIQ/6VtreLOSTQm99tFvsW917t0UgfKkp0kqs="; + buildMypyBoto3Package "license-manager" "1.35.0" + "sha256-NVBQJN2YIg/2FNG9oViLw7pWhcECaYCZdOU9tWM9z7Q="; mypy-boto3-license-manager-linux-subscriptions = - buildMypyBoto3Package "license-manager-linux-subscriptions" "1.34.0" - "sha256-yHvpZZn49SjTn/DLjSRhzGc2vg0IVv5GCeOFnhtScKA="; + buildMypyBoto3Package "license-manager-linux-subscriptions" "1.35.0" + "sha256-xrNvzGZkTDmWtEJwfoZmoe0vqHWmltV9sV3OxLy5JeM="; mypy-boto3-license-manager-user-subscriptions = - buildMypyBoto3Package "license-manager-user-subscriptions" "1.34.0" - "sha256-PR+u+i5zSHFTN6+GuOcWBcON1E2SNABbPavByXz3unE="; + buildMypyBoto3Package "license-manager-user-subscriptions" "1.35.0" + "sha256-1xu8CxA0xJeHPjAkAr6+csVax9Kzuzc0DdZkTu7iVWI="; mypy-boto3-lightsail = - buildMypyBoto3Package "lightsail" "1.34.75" - "sha256-ICBUixptVS5sWBHgYms9GgrY2XQblTZkq3Qr614qZMc="; + buildMypyBoto3Package "lightsail" "1.35.0" + "sha256-+5GMpqC4EY+1atRrP0D+KweA7mvHSwZ9kKvrVDDP+HU="; mypy-boto3-location = - buildMypyBoto3Package "location" "1.34.18" - "sha256-rsjIGenXgdEdgxvilA3IKJkYkpDDQNDfjDQRoj/mxSU="; + buildMypyBoto3Package "location" "1.35.0" + "sha256-6Vs5eRibHCZvDDIcIEThPa6T1OmfJXjLg4GAZlworsM="; mypy-boto3-logs = - buildMypyBoto3Package "logs" "1.34.66" - "sha256-z1+sSAHdkvBQB/sbRET/mCWFRNHyHmTpIo40GIBG+EE="; + buildMypyBoto3Package "logs" "1.35.12" + "sha256-H+B1dxaGAAwAqWU5/WKKYz1HT9wKmvjVEg57kGvTDh0="; mypy-boto3-lookoutequipment = - buildMypyBoto3Package "lookoutequipment" "1.34.47" - "sha256-M7NaoRHxlH5/zkuMnOlrco2BCPXErv/N7TAVwv2oZuA="; + buildMypyBoto3Package "lookoutequipment" "1.35.0" + "sha256-BLE7wcDwJIbuDHbK6x5ala2fzMy+Di/1pSBfUoYnLy4="; mypy-boto3-lookoutmetrics = - buildMypyBoto3Package "lookoutmetrics" "1.34.0" - "sha256-2SRBUd8fZ7i2GbDgBWJcYS0Fbr/U65UmrLbHx57IZ5A="; + buildMypyBoto3Package "lookoutmetrics" "1.35.0" + "sha256-q1jBCSiyznyNPEa7ZQwsCQRQ1J8Wvj/RHugaT6ZDBeY="; mypy-boto3-lookoutvision = - buildMypyBoto3Package "lookoutvision" "1.34.0" - "sha256-+zl9JmGel0rkmGeYaHMlBIfPQfHdJQOk+sG/nuHnzD0="; + buildMypyBoto3Package "lookoutvision" "1.35.0" + "sha256-0Tz/X8RIuLvbDRXmZ+g0aEOcO7Qyg7ZKDLW1bN4yfJA="; mypy-boto3-m2 = - buildMypyBoto3Package "m2" "1.34.0" - "sha256-ZF3ZViV0pN64OEc8aHuCRR0lnVyHOiTRfqVQGCmMMKE="; + buildMypyBoto3Package "m2" "1.35.0" + "sha256-rn9xCU8qtkR/zRzi5MM9dNInJOa30VrYRj2hBLN9Zao="; mypy-boto3-machinelearning = - buildMypyBoto3Package "machinelearning" "1.34.0" - "sha256-DeiBu3PQMageEUlVdjH/1uELsPwo4IVhYzDlJFBohKg="; - - mypy-boto3-macie = - buildMypyBoto3Package "macie" "1.29.0" - "sha256-lFOPbIBrGuv9W83fsyzyI5fyOleXf4j3sCh9IM0gaQ4="; + buildMypyBoto3Package "machinelearning" "1.35.0" + "sha256-TNj5R4DxrKdlOa5u7O9gNwkzMkLPP1mcxYyu3bbONgY="; mypy-boto3-macie2 = - buildMypyBoto3Package "macie2" "1.34.20" - "sha256-erqa/ptOBMd8x+N1A6ibSULfBH75gEWsKDd/jhc/9tg="; + buildMypyBoto3Package "macie2" "1.35.0" + "sha256-0L8kIa+KYf4hQW7ErpCMSEcgkHmqS95vt0YaCFLk1BU="; mypy-boto3-managedblockchain = - buildMypyBoto3Package "managedblockchain" "1.34.0" - "sha256-gUPuS8/ygIdsfCx6S1zpxP936Ah0o5BT4TaDiEW4wPQ="; + buildMypyBoto3Package "managedblockchain" "1.35.0" + "sha256-q1fKZi0acgBXZ1Rvugvl0iwdapObzDsZnhRlTS1bShc="; mypy-boto3-managedblockchain-query = - buildMypyBoto3Package "managedblockchain-query" "1.34.67" - "sha256-c2BoAKpgurKaNOTkl3cqc3X1CiaQVfQL5kvQV3/WLww="; + buildMypyBoto3Package "managedblockchain-query" "1.35.0" + "sha256-WaFRp1G7BeKwm6g4rAWmf5OxoETzwit8YlN3R5hazuQ="; mypy-boto3-marketplace-catalog = - buildMypyBoto3Package "marketplace-catalog" "1.34.74" - "sha256-+ehJMgzEt0R0sV1IL4/eEEltEIcFDqr4GzeTraabW90="; + buildMypyBoto3Package "marketplace-catalog" "1.35.0" + "sha256-RXCmmjnGhMm6+EiYRGhlHgkgcftZardnyOBWaq5eQ0s="; mypy-boto3-marketplace-entitlement = - buildMypyBoto3Package "marketplace-entitlement" "1.34.0" - "sha256-yGaeDZLEmp/Nap++wI6GgQvVW3HxQFcM+ipk7RAuG4g="; + buildMypyBoto3Package "marketplace-entitlement" "1.35.0" + "sha256-fVtsD81DbUIsAtsfAeR9QC9NfjKV4fAswGpleBfHJMk="; mypy-boto3-marketplacecommerceanalytics = - buildMypyBoto3Package "marketplacecommerceanalytics" "1.34.0" - "sha256-Gzmd4GQnM2sRrL4/FE9kI0R9ItKJ5xdaC/cCGqQ0XAY="; + buildMypyBoto3Package "marketplacecommerceanalytics" "1.35.0" + "sha256-POYl0YUu3WsZ9lfseKTNuT6PaOVDfvKbqtKM064Ksak="; mypy-boto3-mediaconnect = - buildMypyBoto3Package "mediaconnect" "1.34.7" - "sha256-A8Sal8qNijZ/PdwLLC3mGAt8btMGOHXzOAOVFn+JDtU="; + buildMypyBoto3Package "mediaconnect" "1.35.11" + "sha256-v+a4wc62OnHXJv5BHy/oq88FRn3piimmenmAPAOZXOA="; mypy-boto3-mediaconvert = - buildMypyBoto3Package "mediaconvert" "1.34.81" - "sha256-MGULtrMziQpOXF4eNZabcu83rR13AHBMZrN5RgkqATk="; + buildMypyBoto3Package "mediaconvert" "1.35.23" + "sha256-TvkVif/foJUzw1tPg8l2Y81neHUfxeZ9aDKtaIYKyRg="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.34.83" - "sha256-VFyz2fNgx2fFFsU3843vwpZBQxGrVzNbyZWF1kv6KaY="; + buildMypyBoto3Package "medialive" "1.35.23" + "sha256-emjiDJ1sZylGgclL3E90nYBwqJgJq20fQx2Ug4e9UbQ="; mypy-boto3-mediapackage = - buildMypyBoto3Package "mediapackage" "1.34.0" - "sha256-4DJ2zVk0satmVn+TZdDExx/+ClJpc1bdmbvl72Joe5U="; + buildMypyBoto3Package "mediapackage" "1.35.0" + "sha256-a3ToXuhOWn4H6yEf77XWFRpG1QOFWn3tuBzj5MV3HZM="; mypy-boto3-mediapackage-vod = - buildMypyBoto3Package "mediapackage-vod" "1.34.0" - "sha256-XwGc3+WD8o/MUfcBocl52TPK/RhiCjEb2qDqcuYwB+g="; + buildMypyBoto3Package "mediapackage-vod" "1.35.0" + "sha256-ur1A0iPMGgfI0XNSOiXX4VF5nR6XJcnpk0KM62Ujp/0="; mypy-boto3-mediapackagev2 = - buildMypyBoto3Package "mediapackagev2" "1.34.60" - "sha256-tm54AEKAAuhp8+KeoW/yesl0M8utg7iIbkOpLyotpa8="; + buildMypyBoto3Package "mediapackagev2" "1.35.0" + "sha256-b8TqRWLKSkN74xBzyCeABdd69s0ET2QTSNsTZaJXPfc="; mypy-boto3-mediastore = - buildMypyBoto3Package "mediastore" "1.34.0" - "sha256-v2G2wDXGJwMalYnHTRGvdRTUv41bm8adIOj9tgQV0ys="; + buildMypyBoto3Package "mediastore" "1.35.0" + "sha256-iQi2/pE6ojnp6jWtkzWD7T11dxST+UYbETnUjEH0r2E="; mypy-boto3-mediastore-data = - buildMypyBoto3Package "mediastore-data" "1.34.0" - "sha256-bYlKkBh7Kq4PsToHQ4+K5B3h8+IwyS+7ngEJ5AALBus="; + buildMypyBoto3Package "mediastore-data" "1.35.0" + "sha256-pOvrDLzo9rXF8CHLX6OL0gwjWW+EklFQ/B635zcm828="; mypy-boto3-mediatailor = - buildMypyBoto3Package "mediatailor" "1.34.65" - "sha256-JJDQuyACp+y5PntLhMZ2rIb1wR/IW0PPPqS8HB54mNk="; + buildMypyBoto3Package "mediatailor" "1.35.0" + "sha256-mECUsZiuYN9O4WvUdu5Ge/WsFLEKhxLnD9WBpxZvKTc="; mypy-boto3-medical-imaging = - buildMypyBoto3Package "medical-imaging" "1.34.77" - "sha256-biBe/kSBJRnGrYFr55Lc1GEZ5O457qOlujjiYQxp9hc="; + buildMypyBoto3Package "medical-imaging" "1.35.0" + "sha256-u+GgBEtw2AVonu+XqL8gDIJig9foiUufz1++qmrfx00="; mypy-boto3-memorydb = - buildMypyBoto3Package "memorydb" "1.34.0" - "sha256-bq2FQsYZ/7xi2o4cdacva510FjDRfbNRO2IrA0oxtAg="; + buildMypyBoto3Package "memorydb" "1.35.0" + "sha256-hulSiv/A/GXV9rCjjSSIGKQSZqeBkKUKZuuKGwl8/aU="; mypy-boto3-meteringmarketplace = - buildMypyBoto3Package "meteringmarketplace" "1.34.0" - "sha256-1un4l+XXDAen0NS1lQ2e1XOyUaoOjt+n8AU0VvGlTP0="; + buildMypyBoto3Package "meteringmarketplace" "1.35.0" + "sha256-qFXZE2y5MSpOZMSKhFEeriXHgbboQigOufmTqbArmns="; mypy-boto3-mgh = - buildMypyBoto3Package "mgh" "1.34.0" - "sha256-tyA+ywgjdRkIU2vbZwCsQfWIYctw/kLjIGTEAZuf8oU="; + buildMypyBoto3Package "mgh" "1.35.0" + "sha256-mGKHl9Ld7DNwma0Nl2lTwb3cN2N1SqnZlYZX0bxnS1w="; mypy-boto3-mgn = - buildMypyBoto3Package "mgn" "1.34.80" - "sha256-eLfAHkhqlU9HK6bLfBFOZ+UzFI1q/vJLFmxQcBRJNt8="; + buildMypyBoto3Package "mgn" "1.35.0" + "sha256-sbnfx714qwWSTOgf/ptxpV55wdTa47yfNgkOtu/BpDc="; mypy-boto3-migration-hub-refactor-spaces = - buildMypyBoto3Package "migration-hub-refactor-spaces" "1.34.0" - "sha256-T37s/ubwuU1zsKk8DmTFum6Ml3+WNZCJ+q8T6F75iUY="; + buildMypyBoto3Package "migration-hub-refactor-spaces" "1.35.0" + "sha256-HARwGwot9kfEvVJwk5c0sjeLEcq/jAhh+2kRBUDDdPw="; mypy-boto3-migrationhub-config = - buildMypyBoto3Package "migrationhub-config" "1.34.0" - "sha256-feqiUjFrwYaAyRh1MZ96VILeEa/WBzUytsnRxXZMxoQ="; + buildMypyBoto3Package "migrationhub-config" "1.35.0" + "sha256-j5Lw7w2lzVJAsR69yMsccEV0WStBBhR/EdR62suDJ1o="; mypy-boto3-migrationhuborchestrator = - buildMypyBoto3Package "migrationhuborchestrator" "1.34.53" - "sha256-kreU8blZ61EaKmKJpZ17iS6xFUig5FrMnOs5/1JTn4s="; + buildMypyBoto3Package "migrationhuborchestrator" "1.35.0" + "sha256-TMOu+TzMU3qQn8upnPKYinhToe3cW5fKbxEXj0QGl7w="; mypy-boto3-migrationhubstrategy = - buildMypyBoto3Package "migrationhubstrategy" "1.34.0" - "sha256-N/NcnXF14SAs9F1ZwUYxc/5kp7iUWIFJisUfZxMStLU="; - - mypy-boto3-mobile = - buildMypyBoto3Package "mobile" "1.34.0" - "sha256-fzP70K6S7KPi6GnEj92shU+Dr07ieqDkmrAUEBxMVdI="; + buildMypyBoto3Package "migrationhubstrategy" "1.35.0" + "sha256-uzkFo1wOgpLdpSI2ErtfRo0uTdY/XbYltubzg4kC5ro="; mypy-boto3-mq = - buildMypyBoto3Package "mq" "1.34.0" - "sha256-yua6b3bSoXnJjAvsDHa+aE6DebBjQkAKdsy+nM7TcTE="; + buildMypyBoto3Package "mq" "1.35.0" + "sha256-WusbzKkon1Ep+639LtHqwcLRXvtSLeSaSXdAYTm4gmc="; mypy-boto3-mturk = - buildMypyBoto3Package "mturk" "1.34.0" - "sha256-qhyVd+9KIaL4hxjjDnw7qdyJdcT6ApCxhoTggOVDr80="; + buildMypyBoto3Package "mturk" "1.35.0" + "sha256-iYVnkwqOe0UMOqI1NcD58Ej3Bk84adPWC3yq7/+3x8I="; mypy-boto3-mwaa = - buildMypyBoto3Package "mwaa" "1.34.57" - "sha256-D0W/03zhllRLYGyXQ/XvMBlcsKuEb2MPr0hmyUVy5xc="; + buildMypyBoto3Package "mwaa" "1.35.0" + "sha256-J1tV2BTUW2Bu8ll+Yn0cJpUpMCCCkfqUEAnis/OJxrA="; mypy-boto3-neptune = - buildMypyBoto3Package "neptune" "1.34.0" - "sha256-oMS6e1cPfOZhh+obhOZTMjmwScEzwCBtvmjtpPIjltA="; + buildMypyBoto3Package "neptune" "1.35.24" + "sha256-2hgamfnf5SPWo8R15FWJHO37IC0y2oLDTHsb/oPjArE="; mypy-boto3-neptunedata = - buildMypyBoto3Package "neptunedata" "1.34.0" - "sha256-ZKTaSuLNtxUyP1mW2q8RF8jvXKSfEyHZfJp77xRqbZc="; + buildMypyBoto3Package "neptunedata" "1.35.0" + "sha256-Epx+p5M+3x0plFaXdc8Rsz+p18ZnxbNlr4IhH5STvZM="; mypy-boto3-network-firewall = - buildMypyBoto3Package "network-firewall" "1.34.0" - "sha256-I861Vg32yZJjg9/6q2KmFhysk/ysLZAg2ukNlWMEpuY="; + buildMypyBoto3Package "network-firewall" "1.35.0" + "sha256-41zAgq4F07hIl7I6S+M7ngxdFOKjmUB3BFhncLel7ZI="; mypy-boto3-networkmanager = - buildMypyBoto3Package "networkmanager" "1.34.0" - "sha256-vubUkzOk3bBuXVgHzMhYszMOhUqhBoupc7COdP0nneA="; + buildMypyBoto3Package "networkmanager" "1.35.0" + "sha256-z1YOK7DoyTEWnaWJ8x8VKZNETw/7jPXBjmN4ZX7m5E0="; mypy-boto3-nimble = - buildMypyBoto3Package "nimble" "1.34.0" - "sha256-i0E9kLunDRl+XzU3Ti3vxqHNa2oGHQQ9xDjCtNKi1Lw="; + buildMypyBoto3Package "nimble" "1.35.0" + "sha256-gs9eGyRaZN7Fsl0D5fSqtTiYZ+Exp0s8QW/X8ZR7guA="; mypy-boto3-oam = - buildMypyBoto3Package "oam" "1.34.73" - "sha256-MAnS/E6BKcaubeOdblitGzS7y7YUZr35M4679iJL6lE="; + buildMypyBoto3Package "oam" "1.35.0" + "sha256-jHEgFpoHJmep4Lv+ge3DSDthO6d9zt23lWBp0MztcHQ="; mypy-boto3-omics = - buildMypyBoto3Package "omics" "1.34.83" - "sha256-66IykobW8D/oemTVIGf0xw7H+mb4yNzXMQHv/dnzqGg="; + buildMypyBoto3Package "omics" "1.35.7" + "sha256-CwD0stU2217XD+SXTp+WRyf/qH3EOA5PuBSdTWcXOGU="; mypy-boto3-opensearch = - buildMypyBoto3Package "opensearch" "1.34.43" - "sha256-EOl56YqzuIUWlSewnVCtEdzt3Ei5yueP4emtTQq3QrA="; + buildMypyBoto3Package "opensearch" "1.35.0" + "sha256-AQLU4or4flXLxTrZJy0XHIn9MFRTmgHjUWjLzuP2pXA="; mypy-boto3-opensearchserverless = - buildMypyBoto3Package "opensearchserverless" "1.34.0" - "sha256-YpbQWnVIXMqTzieWya4MiFz9HpN5YYSSmBjUvmO0VMo="; + buildMypyBoto3Package "opensearchserverless" "1.35.2" + "sha256-df8udPQOjXo5GEo6Gk5G6oKx7pBW4c0A82wkC1PA0BI="; mypy-boto3-opsworks = - buildMypyBoto3Package "opsworks" "1.34.0" - "sha256-398ugKoRKeRqIH/1upx1K6d0Y/WIsMJCNM2Mmwk+S/A="; + buildMypyBoto3Package "opsworks" "1.35.0" + "sha256-SkQUH/vYdyq+YvCfqZlC4hwxirn7JvPwxBVg/Z17M0A="; mypy-boto3-opsworkscm = - buildMypyBoto3Package "opsworkscm" "1.34.0" - "sha256-HsUXwbXRPmEaSJjs4EezSHugssLtP2g/NvaI0CnGStA="; + buildMypyBoto3Package "opsworkscm" "1.35.0" + "sha256-qyUZN9Gz8Q6TBDg1LW+M58TLwDlmqJ9aCr4021LbSL0="; mypy-boto3-organizations = - buildMypyBoto3Package "organizations" "1.34.56" - "sha256-iVOUgkTI0sNixbfr/Z/H9Hsc2thCqDCqHrlthneZLVU="; + buildMypyBoto3Package "organizations" "1.35.28" + "sha256-lT/74MV0ZKA1rBoHOuZBM0uAf4/aOQ2V5AMxzGY5RFM="; mypy-boto3-osis = - buildMypyBoto3Package "osis" "1.34.0" - "sha256-2mSI1VTmQWuwxsCgQtmr1w8xE3zIcwztvMuKMqXFF3k="; + buildMypyBoto3Package "osis" "1.35.0" + "sha256-PdOH3KaQn9d455qCR565qFlyCb8t7R8x8wXBebHgtt8="; mypy-boto3-outposts = - buildMypyBoto3Package "outposts" "1.34.27" - "sha256-nkXVo8Qr2k+pV3SChRezoiU0e2kT9kz1vr2J8MLfm+0="; + buildMypyBoto3Package "outposts" "1.35.0" + "sha256-CFULIBMCKb4mUQ7ogh5hvfewDMpsP1jnQEJmtuArCck="; mypy-boto3-panorama = - buildMypyBoto3Package "panorama" "1.34.0" - "sha256-Pw0yRgawY5TC0OIgcYmzK3KEQusyRf3coThpeHL4X30="; + buildMypyBoto3Package "panorama" "1.35.0" + "sha256-HFjrSRkc3cEqImMkqC4V/lfk/ArD9/2swrK7xo9Hut4="; mypy-boto3-payment-cryptography = - buildMypyBoto3Package "payment-cryptography" "1.34.20" - "sha256-WdyhWl00Khf3gA6OeWeKrlgFnTvWhk+AFoS2UhM5Haw="; + buildMypyBoto3Package "payment-cryptography" "1.35.0" + "sha256-b9gTTuQxsXE4CjZgRgbZn4xGSC7N/4v3eF4fF9fFSow="; mypy-boto3-payment-cryptography-data = - buildMypyBoto3Package "payment-cryptography-data" "1.34.58" - "sha256-mc4NO3yjdLlXc9TBkmIsGFqNfW2RT7/jVMC9uhug4tc="; + buildMypyBoto3Package "payment-cryptography-data" "1.35.0" + "sha256-tHHuRkz2nA550ldsMbiUS7XJGMHgx3rRt5scFV7tFNM="; mypy-boto3-pca-connector-ad = - buildMypyBoto3Package "pca-connector-ad" "1.34.0" - "sha256-pSGVZPLuj8xcSfLqa+xvf4UL/l2Xb5t43KuXlTCfskc="; + buildMypyBoto3Package "pca-connector-ad" "1.35.0" + "sha256-xIWR2C4YbVpSDhZesWi0IUJbR/eaH6Ej3/EREAfSP9o="; mypy-boto3-personalize = - buildMypyBoto3Package "personalize" "1.34.20" - "sha256-1Q+rXczO15oM/KXRLVP8D96HW4nILpxig4stjT1KwuY="; + buildMypyBoto3Package "personalize" "1.35.9" + "sha256-Z10I4CW8XudCHhEr1ccnuf49EFdiZNAwaZi+EJDmArY="; mypy-boto3-personalize-events = - buildMypyBoto3Package "personalize-events" "1.34.0" - "sha256-dklttvls5In+d9uWONxmhfSOP1TQf+4VMW56JjKICr4="; + buildMypyBoto3Package "personalize-events" "1.35.0" + "sha256-F9RA+t49GTchoKXlZTuUAlfUj/23ZwH/jlm5GqTbhLg="; mypy-boto3-personalize-runtime = - buildMypyBoto3Package "personalize-runtime" "1.34.20" - "sha256-sKEXkOlMb7t4jBQrLLx90wFhCN1R4ZOk8w9kMpKI0os="; + buildMypyBoto3Package "personalize-runtime" "1.35.0" + "sha256-mz35kZg6nuxkIqwPuNRmiFK0HX+VRo0l9SzJ0tJ1s50="; mypy-boto3-pi = - buildMypyBoto3Package "pi" "1.34.0" - "sha256-97giGYtpINPHxtcUU6cE/mPF0/r6YfLixAdcC/LGKC0="; + buildMypyBoto3Package "pi" "1.35.0" + "sha256-VpDsWrHlAD1KT29S8X/vAMRbfqS7dg+koPXEOBHYG/o="; mypy-boto3-pinpoint = - buildMypyBoto3Package "pinpoint" "1.34.81" - "sha256-vs7gJCsMrpXBhPFwcHmQ/IT4sOYBMJ6IlcCLGMPuog8="; + buildMypyBoto3Package "pinpoint" "1.35.0" + "sha256-iNYUjASrJsgEA5fGa8J4H37lzWHXdDHIi+1dRdJxfkc="; mypy-boto3-pinpoint-email = - buildMypyBoto3Package "pinpoint-email" "1.34.0" - "sha256-AHwJtYsAxFiEX16L0HZXz9JzjNZck9V40bFwzicMKUE="; + buildMypyBoto3Package "pinpoint-email" "1.35.0" + "sha256-cLs9DwibD7GB546pEd8Zx/Xx5ki2tKYc8drFEetNh48="; mypy-boto3-pinpoint-sms-voice = - buildMypyBoto3Package "pinpoint-sms-voice" "1.34.0" - "sha256-oDhem97q9QpsQNy9zCfWOC1cHup3pvLflClVxeWEBuw="; + buildMypyBoto3Package "pinpoint-sms-voice" "1.35.0" + "sha256-AYfD/JY1//vPw1obZAmwqW3NYwSpqg1zjQqTpIk80Rw="; mypy-boto3-pinpoint-sms-voice-v2 = - buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.34.0" - "sha256-Ci/nnvgq6YbVPHLZVmLDHjF8GHpViVP7mfUJREFKndg="; + buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.26" + "sha256-NLr2dUrIW3bwuYg9XMMaBE97aWZqQr3onXBcME3EEbE="; mypy-boto3-pipes = - buildMypyBoto3Package "pipes" "1.34.83" - "sha256-Z//eO1IEEolh+5loNBmS5R5W5sdyGt/0T88kI726PKA="; + buildMypyBoto3Package "pipes" "1.35.16" + "sha256-Mur45GAzHsGamKaooUdGwuydMbfaQCSTVrRwwENbmFs="; mypy-boto3-polly = - buildMypyBoto3Package "polly" "1.34.43" - "sha256-rx5sW32N6H47fpy5yGvwlKKVKS/uIKOtLfsjoGoNPJg="; + buildMypyBoto3Package "polly" "1.35.7" + "sha256-aIKpT15gBmM2gkkSbmzs5pVvAIfessdzlQTspmvK+LQ="; mypy-boto3-pricing = - buildMypyBoto3Package "pricing" "1.34.69" - "sha256-0+bak3+4FQK0vAjI1r7uKvhwspZxt/zLCJRVMvH41qs="; + buildMypyBoto3Package "pricing" "1.35.30" + "sha256-THSL/TxygrV/E4XO4YQQBS5p2xU7MyPFdR2ZkVx2o0k="; mypy-boto3-privatenetworks = - buildMypyBoto3Package "privatenetworks" "1.34.0" - "sha256-WFX0KaJRo0LCPKEAq8LES0P3WJkt6ywLXqTlOFZyZ1w="; + buildMypyBoto3Package "privatenetworks" "1.35.0" + "sha256-TdWk5wgJ8DVwLgTUGto9wrXaTdFZ4LNG2uxahFkYeKo="; mypy-boto3-proton = - buildMypyBoto3Package "proton" "1.34.0" - "sha256-wRBMw/7PWi0s9sJTfnDq3MXcbA5pKwogMDC3UZtLJoY="; + buildMypyBoto3Package "proton" "1.35.0" + "sha256-zhkzENeWyzHsJVqEHa1iJzikaC8zsz1Yu1Bud/zNp7A="; mypy-boto3-qldb = - buildMypyBoto3Package "qldb" "1.34.49" - "sha256-yiqWryr4vKt/6k+dVoDMDdtL6yP4ClVY0rFwZDDcvWY="; + buildMypyBoto3Package "qldb" "1.35.0" + "sha256-SgDXUGMc0VwsKcGLtUGA565c4uDy4BhGcW6TIVP8988="; mypy-boto3-qldb-session = - buildMypyBoto3Package "qldb-session" "1.34.0" - "sha256-JHePiaFCfIJPxZzvC1U38xrBGkDvB9+yKwPecaZl7BY="; + buildMypyBoto3Package "qldb-session" "1.35.0" + "sha256-mtpp+ro3b7tOrN4TrWr8BjLzaPo264ty8Sng6wtciMs="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.34.79" - "sha256-oHaZrX3aRoaFs5VLC7dQMihSocWLmCupHGhReXPbGBo="; + buildMypyBoto3Package "quicksight" "1.35.29" + "sha256-CzKgkJToddpBtTnmVJCc+jbAeAxQVC1h++UMrXjiry0="; mypy-boto3-ram = - buildMypyBoto3Package "ram" "1.34.0" - "sha256-9sOspEfirpVQ8cT9ILUSWypxBswpAD75A0hHRV7glNg="; + buildMypyBoto3Package "ram" "1.35.0" + "sha256-kwKCaPtSl9xFVw0cTDbveXOFs5r7YzowGfceDSo+qnc="; mypy-boto3-rbin = - buildMypyBoto3Package "rbin" "1.34.0" - "sha256-Y+a/p3r5IgWk4oH6MOeq0e7rMiNvLCqoz1ZE+xXNtOw="; + buildMypyBoto3Package "rbin" "1.35.0" + "sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.34.83" - "sha256-/H99xDRpX9egs39pRaYkvJ3GM6syh+famJmTTRsCgYs="; + buildMypyBoto3Package "rds" "1.35.31" + "sha256-WX0o2LkYYNXMi6IOR8Cqm6faTwW5/Y2pir4+GOpBytI="; mypy-boto3-rds-data = - buildMypyBoto3Package "rds-data" "1.34.6" - "sha256-d+WXt3cSUe5ZxynSjPSJxXgv6evP/rhZrX1ua9rtSx8="; + buildMypyBoto3Package "rds-data" "1.35.28" + "sha256-XPb/7sVSVFkDjPQ2x6w7tJmIBiS1YH10805lv/eGsyw="; mypy-boto3-redshift = - buildMypyBoto3Package "redshift" "1.34.57" - "sha256-MDhI9DW5I6SWXIAnENiPqSanDjCB3vf2n24eVxzmtso="; + buildMypyBoto3Package "redshift" "1.35.0" + "sha256-8YX4mAvSCQgacJy+BLxuW6+gojDz0oT3wMtJG5P/WP0="; mypy-boto3-redshift-data = - buildMypyBoto3Package "redshift-data" "1.34.0" - "sha256-NdBZxkLTwnY7fgmoqGZKTN/lhCyY/3VGFWWOGeCf//0="; + buildMypyBoto3Package "redshift-data" "1.35.10" + "sha256-LP5RjvMCfCsFD6z/0mIZJEWN3y+z35aZzboz6KaFlZQ="; mypy-boto3-redshift-serverless = - buildMypyBoto3Package "redshift-serverless" "1.34.16" - "sha256-ag5tKb1+4cHiG99OszDNGdnX9RPRPraaqM8p3IqgLBg="; + buildMypyBoto3Package "redshift-serverless" "1.35.0" + "sha256-uHY9c+p407QBVS18N0lEshdB1mXV+LONhTXSIr+NiV4="; mypy-boto3-rekognition = - buildMypyBoto3Package "rekognition" "1.34.82" - "sha256-qy7yacSuG6cARR2L/YjBGWYM1BU5/qtMr/H08x3XFIM="; + buildMypyBoto3Package "rekognition" "1.35.0" + "sha256-mG3TeywuB5+87Z3nhqjFwf0y2WO49oETPMz+oL0LbOA="; mypy-boto3-resiliencehub = - buildMypyBoto3Package "resiliencehub" "1.34.0" - "sha256-F/ZRCp/M/6kBI4Apb3mISzqe1Zi4Y7gq/vu0dvyyTvM="; + buildMypyBoto3Package "resiliencehub" "1.35.0" + "sha256-MKlBdSJGl7WCnD66fx5nCPhGAtLtLjoahe08KHTT+KM="; mypy-boto3-resource-explorer-2 = - buildMypyBoto3Package "resource-explorer-2" "1.34.41" - "sha256-Q4MCAvEZkYRnDLEF9d8x+FOMUJ9O2eCb2mZr/e8Ut24="; + buildMypyBoto3Package "resource-explorer-2" "1.35.25" + "sha256-49Ysavsq6tDUQAcJiP4GQkt5zgBz36qufByA88bltco="; mypy-boto3-resource-groups = - buildMypyBoto3Package "resource-groups" "1.34.79" - "sha256-tSCHhtaSb+dnXD8D2aNR6DBAlhHbvU3zx6YceGTlzgM="; + buildMypyBoto3Package "resource-groups" "1.35.30" + "sha256-f+4F+0VuLAmx+3+qBwNj8jit9DYC/Dfrhd5/L0ledW4="; mypy-boto3-resourcegroupstaggingapi = - buildMypyBoto3Package "resourcegroupstaggingapi" "1.34.0" - "sha256-ko55TJeH/EGsAp1Y8ZTYhmGEqWGKQTnN3IQEF31V6Ns="; + buildMypyBoto3Package "resourcegroupstaggingapi" "1.35.0" + "sha256-3DVLn61w42L8qwyQB1WbOPjOZXqXalLZ9rITcmcDkQI="; mypy-boto3-robomaker = - buildMypyBoto3Package "robomaker" "1.34.0" - "sha256-dAL2P2bxhSc5oLZXhhekrt9y4bWXg7kIr+/FVbkFTww="; + buildMypyBoto3Package "robomaker" "1.35.0" + "sha256-Yl7v7zQHeixpG244Qld1vceR8ZazGjcUc26LUuane3I="; mypy-boto3-rolesanywhere = - buildMypyBoto3Package "rolesanywhere" "1.34.76" - "sha256-y346Go7PySWVFPZI7CvFElW2cK708Q1D3K0LdfPDp0Q="; + buildMypyBoto3Package "rolesanywhere" "1.35.0" + "sha256-Ss85x4OJ+RtOmP7LzIIMcikxjMvMyi3VUT9WLvxODSM="; mypy-boto3-route53 = - buildMypyBoto3Package "route53" "1.34.31" - "sha256-MtmEtt57vhFRG1O+VnFXFUhSWAQ7JrnV3hBZx4TpOh8="; + buildMypyBoto3Package "route53" "1.35.4" + "sha256-gPor5Roaoo3i0zJa4xXIIb1SOar80KQvVi5h003vGZM="; mypy-boto3-route53-recovery-cluster = - buildMypyBoto3Package "route53-recovery-cluster" "1.34.0" - "sha256-1IUmycikAtBBNykch2aj7tI6XLRjN7D56YwJn6QRmIQ="; + buildMypyBoto3Package "route53-recovery-cluster" "1.35.0" + "sha256-G4Rh+i27qcxmB3vK+CfOhseC9Etso3Vs6Kt9x6hBrDA="; mypy-boto3-route53-recovery-control-config = - buildMypyBoto3Package "route53-recovery-control-config" "1.34.0" - "sha256-hlwovA3tocSTUzsj+TH4VMO/bDrxDNALrAFiTpcgNa0="; + buildMypyBoto3Package "route53-recovery-control-config" "1.35.0" + "sha256-ofD5Ho5hI9wFujM4fR258i8XtFUJGiouGKErQEOzpkI="; mypy-boto3-route53-recovery-readiness = - buildMypyBoto3Package "route53-recovery-readiness" "1.34.0" - "sha256-DyNRWZ9daJ6VFa7moTjgEIdxcCRgjvZ2n7UKyNfr9z4="; + buildMypyBoto3Package "route53-recovery-readiness" "1.35.0" + "sha256-n4arbk3VN6P/7abnM5yhgOQFdLJwioOdyx2ILcc6Mag="; mypy-boto3-route53domains = - buildMypyBoto3Package "route53domains" "1.34.40" - "sha256-N81sytOFacuG3pHSk35QbxVxUVEZUx8DK4Y7uUonyh4="; + buildMypyBoto3Package "route53domains" "1.35.0" + "sha256-pM5+b6he5Gp9DuD2Uz/x+SYmVzxhZIh/gJ626S9I19g="; mypy-boto3-route53resolver = - buildMypyBoto3Package "route53resolver" "1.34.15" - "sha256-ER9jhGIeEeHc0llpy4aqRnI9iFfubJFIik04gB81vr0="; + buildMypyBoto3Package "route53resolver" "1.35.0" + "sha256-F0ixOVQ8zmCrspV3+a5QmuJdvc5NOV8WiWdepiIeW9E="; mypy-boto3-rum = - buildMypyBoto3Package "rum" "1.34.49" - "sha256-Mq2H+13cjxYRwFfxJpWTAb+W5bx+Vew+jl+zbreRIkQ="; + buildMypyBoto3Package "rum" "1.35.0" + "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.34.65" - "sha256-L830Es4pJLLws021mr8GqcC75M0zYfFPDSweIRwPfd0="; + buildMypyBoto3Package "s3" "1.35.22" + "sha256-n2ThGW/+zCxqt77pXoSGkrX0ZKHfFCETYepru8IDg4c="; mypy-boto3-s3control = - buildMypyBoto3Package "s3control" "1.34.83" - "sha256-A0P6rAebwt9IUKTderlE8tWQJexUjthpO6KClrDbNyc="; + buildMypyBoto3Package "s3control" "1.35.12" + "sha256-GpZ3lr2WenLA+FNOBnot9X7DQKtmxWxvP85bTM5l1+g="; mypy-boto3-s3outposts = - buildMypyBoto3Package "s3outposts" "1.34.0" - "sha256-xLuGP9Fe0S7zRimt1AKd9KOrytmNd/GTRg5OVi5Xpos="; + buildMypyBoto3Package "s3outposts" "1.35.0" + "sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.34.74" - "sha256-gTSksOsEH4IRLqw+AZ/CNLO28Ir18oy7iP2h6a38rmE="; + buildMypyBoto3Package "sagemaker" "1.35.28" + "sha256-ivB/tQpf+KLEYFAKnMShvntBS0z5mVXYi1KhvCXxYBk="; mypy-boto3-sagemaker-a2i-runtime = - buildMypyBoto3Package "sagemaker-a2i-runtime" "1.34.0" - "sha256-jMZ3aWKQPhNec4A/02S1waQi6Mx9JVdENc3kblhsKjA="; + buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0" + "sha256-UThrKjwdje3TF/p8TXfAbKiTTCU3/5wVS4TWqipAeaU="; mypy-boto3-sagemaker-edge = - buildMypyBoto3Package "sagemaker-edge" "1.34.0" - "sha256-F3IN/KA7uzS16HZydXmFXlXseNIdhCais6Abfq7gRdI="; + buildMypyBoto3Package "sagemaker-edge" "1.35.0" + "sha256-+1rI1wBBp2sNpSyxG0dMGhz/8B5nGSx4W3ITbVfPuf8="; mypy-boto3-sagemaker-featurestore-runtime = - buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.34.22" - "sha256-4dFjwJSTgudHHgpVl2TxUl8fWskuzWO+BhTqa5k+4mw="; + buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.35.0" + "sha256-eAjvYeqZMeNRz7iLCM4gXixaIWbgdv4u/w3BDeoCvmw="; mypy-boto3-sagemaker-geospatial = - buildMypyBoto3Package "sagemaker-geospatial" "1.34.0" - "sha256-9hKKH/025QQYLrlXCOAQoxuWzTMQlmLSov/hVsubF7M="; + buildMypyBoto3Package "sagemaker-geospatial" "1.35.0" + "sha256-ES0cThhoMFB4NKVTzThXATiicjq+MTRunsDCMC6YPbI="; mypy-boto3-sagemaker-metrics = - buildMypyBoto3Package "sagemaker-metrics" "1.34.0" - "sha256-KniU+0ZJKfjrBKDDZz+QyLb1oomSeD/K6fcJgmMAcJQ="; + buildMypyBoto3Package "sagemaker-metrics" "1.35.24" + "sha256-WBwXrGv877AZv6wIxYGwFNTVofmcmTqv/hqXAcraDyQ="; mypy-boto3-sagemaker-runtime = - buildMypyBoto3Package "sagemaker-runtime" "1.34.0" - "sha256-OJYEdi4xILUZoePcGBcLRHAhwppeybNO+l0kyW3a0Co="; + buildMypyBoto3Package "sagemaker-runtime" "1.35.15" + "sha256-2afZNIvBO29vNemskWbxx9X1PqL7j2knxHUSEap6lp4="; mypy-boto3-savingsplans = - buildMypyBoto3Package "savingsplans" "1.34.67" - "sha256-t+0Ko+Onv24p1Sn59mvR/auXkDTowOEpKwpzuMUqk8w="; + buildMypyBoto3Package "savingsplans" "1.35.0" + "sha256-u7RvDLzY2r6bnnfR9xN5qGnnqlGmDwH/GUZTU90/+YE="; mypy-boto3-scheduler = - buildMypyBoto3Package "scheduler" "1.34.0" - "sha256-+gnQjWPtp7KVI/qIY2aXHD9iM7RZIDl0JwRostfhjzc="; + buildMypyBoto3Package "scheduler" "1.35.0" + "sha256-E3hmY8JtrkoLrIgiM47JnzPrS5jnmG+oG9bDrlh5mBg="; mypy-boto3-schemas = - buildMypyBoto3Package "schemas" "1.34.0" - "sha256-OyWnGUQZKwmAw7tRMt63wG7puIWA7WPyV/rZfPO/KSc="; + buildMypyBoto3Package "schemas" "1.35.0" + "sha256-pjy/HFGJ4pY4t/FSI1fbCAv9meFCEQoG32GStdaPDcg="; mypy-boto3-sdb = - buildMypyBoto3Package "sdb" "1.34.0" - "sha256-13BuAQD8uDwwDhCw+8O3V882H6/oor5Z8mBmjb7HHAU="; + buildMypyBoto3Package "sdb" "1.35.0" + "sha256-87wPEWSMc083Rn1+lvADZJVeuoN82A+foWetNnIzMBY="; mypy-boto3-secretsmanager = - buildMypyBoto3Package "secretsmanager" "1.34.72" - "sha256-0HM8W1Potee9oA9LQu2ErxLjaiDISJF+ScFzoEIu8Dw="; + buildMypyBoto3Package "secretsmanager" "1.35.0" + "sha256-w30YExW6ENhUaHIwTX8mbnRhQpsI5jUHwjzFCMPvQmQ="; mypy-boto3-securityhub = - buildMypyBoto3Package "securityhub" "1.34.76" - "sha256-3Y3uF5b+Mr6YZu9YPM70fFCgkveIeD1BrNfYuuIjay4="; + buildMypyBoto3Package "securityhub" "1.35.29" + "sha256-RQXlvvSr0DNC2eXEVTQjx4TCR6A/v9qsRArIfg9Mq+w="; mypy-boto3-securitylake = - buildMypyBoto3Package "securitylake" "1.34.53" - "sha256-O/RHRoeUYT5DerEXIQ1NL288bcgA6bGdI29sN7WoQac="; + buildMypyBoto3Package "securitylake" "1.35.0" + "sha256-cI6Ei0p1LtQ+QuM4URYu+k2kJiUUjyEs8rbeX5c7Vvk="; mypy-boto3-serverlessrepo = - buildMypyBoto3Package "serverlessrepo" "1.34.0" - "sha256-abWCJqFbD/AyPV+7hmY4OlsedFs+p8WpNSXG7hjrj3s="; + buildMypyBoto3Package "serverlessrepo" "1.35.0" + "sha256-AzO2GU4SZs0rBg4R5bsajAX5dAJH3OFiHw1X1UDg5b0="; mypy-boto3-service-quotas = - buildMypyBoto3Package "service-quotas" "1.34.0" - "sha256-wWbm/udCn5Je1gJZ+uDJ4LE8NbQlq1yHVQc6eQ2umIw="; + buildMypyBoto3Package "service-quotas" "1.35.0" + "sha256-yhSUu8Rf27PHTYsbcz3oQ/APUx0ECKTwbzEOaYMZ/1k="; mypy-boto3-servicecatalog = - buildMypyBoto3Package "servicecatalog" "1.34.13" - "sha256-60XUP/uZDAkB0RaJgUD4wk+DknbsuygMnTmc3bKlr3U="; + buildMypyBoto3Package "servicecatalog" "1.35.0" + "sha256-GnuDqVaAnWFGFLylpvYxtaL8yUlRxVu6jKB2QhSGeTI="; mypy-boto3-servicecatalog-appregistry = - buildMypyBoto3Package "servicecatalog-appregistry" "1.34.0" - "sha256-XYqa3aiC9pasmkMDXFmHKuK/PWwi6fZs/pt7rXuRFDw="; + buildMypyBoto3Package "servicecatalog-appregistry" "1.35.0" + "sha256-7133sb2IoSsgQIk48MLOL69Gc0G3BCqOlGXlpiC6TaM="; mypy-boto3-servicediscovery = - buildMypyBoto3Package "servicediscovery" "1.34.0" - "sha256-h9wTiaEakgBlrlwzUulqoEMWmVAKV/METiQppUC+FVI="; + buildMypyBoto3Package "servicediscovery" "1.35.0" + "sha256-avjVAYAQf5ad7CYweewSsbg0JmLnK3KhY2RabXdiqAY="; mypy-boto3-ses = - buildMypyBoto3Package "ses" "1.34.0" - "sha256-ieFDjZ8tTPM5wCRWFjNNUuDKOj8K4s4NH1SiJXxbnaQ="; + buildMypyBoto3Package "ses" "1.35.3" + "sha256-+TyI+ffXN0M9HVWA3iQfg3T/xF49wslYFx9MTxHCfYw="; mypy-boto3-sesv2 = - buildMypyBoto3Package "sesv2" "1.34.56" - "sha256-xW5M8RMTSqRvRfbb3+zeL3i3tWO3w8+G9eMgbhI6K9I="; + buildMypyBoto3Package "sesv2" "1.35.29" + "sha256-rGP+LaoeO6lOMr65C274Qx6EbfwqTau9Q/NgmxIppX0="; mypy-boto3-shield = - buildMypyBoto3Package "shield" "1.34.0" - "sha256-w0D4JKdlitCBIF3NaKn+POYch5CPGIiUZXqBoFzjzz4="; + buildMypyBoto3Package "shield" "1.35.0" + "sha256-cCYQ7ixo2v3kP3+cpvaIhLoJ0ErTfyv/XfBJZnovMjo="; mypy-boto3-signer = - buildMypyBoto3Package "signer" "1.34.0" - "sha256-wR7ZQ8zTjuVPwMqQ7TR+93DWld9JU16rlt2X+z29xZI="; + buildMypyBoto3Package "signer" "1.35.0" + "sha256-BmU7vCuS8Ow5DSYi4qbLrYoZGsdYwh4IA9EVHNGMgjI="; mypy-boto3-simspaceweaver = - buildMypyBoto3Package "simspaceweaver" "1.34.0" - "sha256-3J7s6FMRBcI7XaVoXjB3gSNI/Eh7TrE5ij8wRmagK/M="; + buildMypyBoto3Package "simspaceweaver" "1.35.0" + "sha256-CT7Xv0u/xY36/SnJuC3f0396G3TwNdtY0w/cL+w/N2Q="; mypy-boto3-sms = - buildMypyBoto3Package "sms" "1.34.0" - "sha256-ktneEYqlmdhb386de2oQuDN5W4FLTxjWBmnZ0COVASA="; + buildMypyBoto3Package "sms" "1.35.0" + "sha256-ZNICMrB+oc/gPikX2R9WNKAOoiywMTzkRvlRh/P4bQA="; mypy-boto3-sms-voice = - buildMypyBoto3Package "sms-voice" "1.34.0" - "sha256-KaF8cWo+vin1YA63S6PDTpvjKWtz0Akl18yMVvhjdLo="; + buildMypyBoto3Package "sms-voice" "1.35.0" + "sha256-zDjnBLKg9MI/E1mSLT2Jb9mjShmcreCxHA1rhpC3UQ0="; mypy-boto3-snow-device-management = - buildMypyBoto3Package "snow-device-management" "1.34.0" - "sha256-buPLN3Qu+asEf2qrv1Jvhu3gKN6aBrK55jB8IxPoFMs="; + buildMypyBoto3Package "snow-device-management" "1.35.0" + "sha256-qUIwQPj564EnKNxz/hpEoE/Ai1VNXeKB9zOZh5mrOHQ="; mypy-boto3-snowball = - buildMypyBoto3Package "snowball" "1.34.58" - "sha256-z60jinh1shgZv2Q4uW2eFphJXRC0ONVN5bPE1UBgC9Y="; + buildMypyBoto3Package "snowball" "1.35.0" + "sha256-H1axrr9JdiGzMu+GugTv16V5A5w9GpJmdHDTBE0obDs="; mypy-boto3-sns = - buildMypyBoto3Package "sns" "1.34.44" - "sha256-qYW1KB0AoVbdfJCT5YE8EMTqa5Hy67cVZ/57t7IQplI="; + buildMypyBoto3Package "sns" "1.35.0" + "sha256-+wg1gb5M2pliaC/dvBBtlWc6MgWNrIwYyJTAe9SU4r0="; mypy-boto3-sqs = - buildMypyBoto3Package "sqs" "1.34.0" - "sha256-C/iZX1iRmrKVOYEA5y6qfaiYrc/Z0zmkLzxIzkc0GdU="; + buildMypyBoto3Package "sqs" "1.35.0" + "sha256-YXUvHCvy76OBX2TUPCW0o529vZ5HKuSKoY18bSp6brg="; mypy-boto3-ssm = - buildMypyBoto3Package "ssm" "1.34.61" - "sha256-TLyZ9CtpE8U2xsxBwC0/Flkg0ee6u5uxd4K0EFVs3gA="; + buildMypyBoto3Package "ssm" "1.35.21" + "sha256-XtVcdQn63aYVVxj+WXKbPasPi3b/HgN6h6v/ndJHX0k="; mypy-boto3-ssm-contacts = - buildMypyBoto3Package "ssm-contacts" "1.34.0" - "sha256-wkKPGLm24/zgMKitcF9ZaPt/W4m+yHerR1wbEqJALBM="; + buildMypyBoto3Package "ssm-contacts" "1.35.0" + "sha256-0X0GgJ9dQr20jgQXNg9f4ulETPVHEQYaAs7+KxxIo/g="; mypy-boto3-ssm-incidents = - buildMypyBoto3Package "ssm-incidents" "1.34.0" - "sha256-OB5/E5ZArGtLZ/UaVjDEnzoH4J4vEFehULG8RKCB6gg="; + buildMypyBoto3Package "ssm-incidents" "1.35.0" + "sha256-sMJnd2csYnc0MxS36LdvHuvmYax+zEKWLiSRMNMzV8o="; mypy-boto3-ssm-sap = - buildMypyBoto3Package "ssm-sap" "1.34.0" - "sha256-Sz3inwP5mRKJdFqrf5FYmTp6M9o8J/S4H6k/7SMq25E="; + buildMypyBoto3Package "ssm-sap" "1.35.1" + "sha256-OG2416B70WCHMhuWykf1LZWufgn0pB4EsLhydVYH/pY="; mypy-boto3-sso = - buildMypyBoto3Package "sso" "1.34.0" - "sha256-Iu1KwyWW8DjFJcV46L50gK/G8p2nAqxzzjgBAVTX6nU="; + buildMypyBoto3Package "sso" "1.35.0" + "sha256-GQGf654mGic7mXbPb0PEAMytnkau/LbOWzoZRRNCt+k="; mypy-boto3-sso-admin = - buildMypyBoto3Package "sso-admin" "1.34.0" - "sha256-befPkyehC4AKxMotvRzyfZpkqlpkfpI2OKVSw4IFnjo="; + buildMypyBoto3Package "sso-admin" "1.35.0" + "sha256-RPWIx+TuWRPkfN/a1S6/t/I+H6WFbWudA6mkgCC6vr8="; mypy-boto3-sso-oidc = - buildMypyBoto3Package "sso-oidc" "1.34.0" - "sha256-uDHRoc7H3vtM/KYSeH95PdibjiEq/pSSJFcm5kgMMAg="; + buildMypyBoto3Package "sso-oidc" "1.35.0" + "sha256-aTKMQz0w0d0WOWHGU3HIqSb3z6PvbuSqtX+saBIIRog="; mypy-boto3-stepfunctions = - buildMypyBoto3Package "stepfunctions" "1.34.0" - "sha256-BtIpbO51DRfLYhcUIO6kYU8g8pvkXuNhhU+LWZpugRA="; + buildMypyBoto3Package "stepfunctions" "1.35.9" + "sha256-wIirZ3Ueg3xdtAWT1su3BQXI5W4OBPsyoCQeebsigSs="; mypy-boto3-storagegateway = - buildMypyBoto3Package "storagegateway" "1.34.27" - "sha256-iKn048AdvM6XSOqT/w6edWoe0VMi3V305oHMth/QkF0="; + buildMypyBoto3Package "storagegateway" "1.35.18" + "sha256-RiAqxt45cMOkbGjWVWufiqZcCKQm++RE3FOdZ5BFkuE="; mypy-boto3-sts = - buildMypyBoto3Package "sts" "1.34.0" - "sha256-s0fgozbWAWLdlAdNnRD2FPKwmkVcm0JBWFDVTWduIGc="; + buildMypyBoto3Package "sts" "1.35.0" + "sha256-YZWAwLz01/eYCMgyiniUoO6sVvlFQYM8WjKcvHCPdng="; mypy-boto3-support = - buildMypyBoto3Package "support" "1.34.0" - "sha256-3y+uFRJKahLAPoG9gqxK8gqZKJ+OL1Rom/dr/zWIq+k="; + buildMypyBoto3Package "support" "1.35.0" + "sha256-SLGLKpeq8kficWOg7if8IdTHuWLhe76Wn+72g7Ym8Tw="; mypy-boto3-support-app = - buildMypyBoto3Package "support-app" "1.34.0" - "sha256-/aYEPAnGgAPB6Tnh5jwYASbP2kVJth+3ZxcMCYgo9n0="; + buildMypyBoto3Package "support-app" "1.35.0" + "sha256-DtF++oBv7Jb7yXY2ymC/KsQDgMPqWJWP3MZQOlx/NXM="; mypy-boto3-swf = - buildMypyBoto3Package "swf" "1.34.0" - "sha256-T8QYHzRjjQyLGqSwc7J6hPXqpeoeCUvlpHbXwnT99rQ="; + buildMypyBoto3Package "swf" "1.35.0" + "sha256-72VjJGOWAphFUZfMxzSaYyycUtoL1St08G/SAEhDriQ="; mypy-boto3-synthetics = - buildMypyBoto3Package "synthetics" "1.34.0" - "sha256-gGEu4vQ5T1gSLM33V8Ouj+ZlPQIoY+RRbUz7nvD7PbY="; + buildMypyBoto3Package "synthetics" "1.35.18" + "sha256-p/jKkj4a1vUkgfmUAkKY6nbDKKaBNAJeuFOea7Uvq7M="; mypy-boto3-textract = - buildMypyBoto3Package "textract" "1.34.0" - "sha256-AeukQ85jOCNpUxfnedEyacm/bK6pFA32tmhQrieLoMo="; + buildMypyBoto3Package "textract" "1.35.0" + "sha256-i0NmNRPwEypr4m0vNtJDXHEAbCcqdxTexY3MDaltvh8="; mypy-boto3-timestream-query = - buildMypyBoto3Package "timestream-query" "1.34.65" - "sha256-RSGOulFIOZi/9Z5grP/Zv0A5fy3MJTzph+D9a45MkHA="; + buildMypyBoto3Package "timestream-query" "1.35.0" + "sha256-sOjhGZ2h77NOLcoQX2AdLae9cB2VbBYSx+W8ge9oqwA="; mypy-boto3-timestream-write = - buildMypyBoto3Package "timestream-write" "1.34.0" - "sha256-fKi5nIyU5BffflHVh21HjcuYE+RXDiq0gXbFOKOAYPE="; + buildMypyBoto3Package "timestream-write" "1.35.0" + "sha256-kDRm9b1g1M9qaiA8CDZLNBrGxw1os1c1giwDc+CpFxA="; mypy-boto3-tnb = - buildMypyBoto3Package "tnb" "1.34.0" - "sha256-32Pcqs7DamX+sZt3pDF+gCjnAs8JhtJm9+Jl0agIuOA="; + buildMypyBoto3Package "tnb" "1.35.0" + "sha256-ZZ/BGdnThJpysJGlKxPyTWyP6IdOhtf7PfjiBSYVg/8="; mypy-boto3-transcribe = - buildMypyBoto3Package "transcribe" "1.34.0" - "sha256-cKiJ306Y96xLHB7vX46uaw145BPLK/1g3OrMIMB0pPo="; + buildMypyBoto3Package "transcribe" "1.35.0" + "sha256-pRyowqpW9cqiZe0aCDvcJAqIaRkEhG8DFRxP89daIPo="; mypy-boto3-transfer = - buildMypyBoto3Package "transfer" "1.34.77" - "sha256-fqta7EJ7rP8dIKJTG8sJCYCNmcqqNljqf9jyk0j6feA="; + buildMypyBoto3Package "transfer" "1.35.0" + "sha256-at9iKdpW8fCiOOX6smp8lDg8xWT9M6RdHJr7Qtpzrbo="; mypy-boto3-translate = - buildMypyBoto3Package "translate" "1.34.0" - "sha256-4tjjmwMtIPpMwKZ3yqB96XEb1WidCxMIj2Cfjn0nTy8="; + buildMypyBoto3Package "translate" "1.35.0" + "sha256-j9ZU1UHzKNo1+gb+uUYiMTIwjGi9OEg0jAmKGx+mGno="; mypy-boto3-verifiedpermissions = - buildMypyBoto3Package "verifiedpermissions" "1.34.79" - "sha256-su6Lq/NVOp2Shgb6UPdrJLqAv9qG8Mx3bQk9PwihybM="; + buildMypyBoto3Package "verifiedpermissions" "1.35.30" + "sha256-wOoPXyHx/yCdGtLFLFyO9WJLSx0XyIiwMWMLff3v25U="; mypy-boto3-voice-id = - buildMypyBoto3Package "voice-id" "1.34.0" - "sha256-c6HseKIqRPs8NmFZYsg+9jWCMGpMi+VpvM9BiWq16PY="; + buildMypyBoto3Package "voice-id" "1.35.0" + "sha256-mxpiis9WGSEclfaHOxFJxGIAO42R2c5zc58xQo4MOn0="; mypy-boto3-vpc-lattice = - buildMypyBoto3Package "vpc-lattice" "1.34.0" - "sha256-zyqcDplqAYFrUjrz28SHrIemPSTzvfUb7x6CXxXCTNc="; + buildMypyBoto3Package "vpc-lattice" "1.35.0" + "sha256-hjsCIge5vyWpgeklpO+u3QGPwCbpdnZcfJErYrPPyeA="; mypy-boto3-waf = - buildMypyBoto3Package "waf" "1.34.0" - "sha256-TVOBwTITXBYFoGvXULoi8OL7OJXZKJbCpZPaZ5siWXk="; + buildMypyBoto3Package "waf" "1.35.0" + "sha256-KeoPZIXTGHoS69QR5y4y3N4AVlscQ6Cqlbg+6H3MIu4="; mypy-boto3-waf-regional = - buildMypyBoto3Package "waf-regional" "1.34.0" - "sha256-zv/IPDU6lqmmIfTq57d7VH3SyA7UkgWW2Hysk2zamcM="; + buildMypyBoto3Package "waf-regional" "1.35.0" + "sha256-rqjBKxMMg/gkt9PJyFyE3g2msAiTtiMZWF4TY3/grcs="; mypy-boto3-wafv2 = - buildMypyBoto3Package "wafv2" "1.34.58" - "sha256-gPNY3XJr/50nejQFzti9igktryZHsgQDiB9BOYnT94I="; + buildMypyBoto3Package "wafv2" "1.35.9" + "sha256-snz65w4vU7DMSVJmhWHvQay38q17RYkmbk3986HlXT8="; mypy-boto3-wellarchitected = - buildMypyBoto3Package "wellarchitected" "1.34.0" - "sha256-tzXpOWC6/WJ+/wUgwYtgI7scq7wRpACW8q1z9RwyhbA="; + buildMypyBoto3Package "wellarchitected" "1.35.0" + "sha256-3s7RVd51W47/QhDdYe7GmhPy/NZtGXp3RSNZZsNh0H0="; mypy-boto3-wisdom = - buildMypyBoto3Package "wisdom" "1.34.16" - "sha256-VhRrQLqmrHn/uWI6lWFJ27hiSmZbW1y+VE2Uf8ssrOw="; + buildMypyBoto3Package "wisdom" "1.35.0" + "sha256-HoIUtkfoV5prtgdD7KOcxJnFb08cGqcJywdgO39s6zM="; mypy-boto3-workdocs = - buildMypyBoto3Package "workdocs" "1.34.0" - "sha256-96V+xgJ+DvqA4A7teCEpVVirlTVxCehXzNcPWUojPH4="; + buildMypyBoto3Package "workdocs" "1.35.0" + "sha256-q19sL/CSFtahdAO9srUHTsKBxXlp7w25rWHY8ZzpnJY="; mypy-boto3-worklink = - buildMypyBoto3Package "worklink" "1.34.0" - "sha256-dEWnbAtuUH14ojkOdeQvPvnVYZYxEsPvXuamyil2AHE="; + buildMypyBoto3Package "worklink" "1.35.0" + "sha256-AgK4Xg1dloJmA+h4+mcBQQVTvYKjLCk5tPDbl/ItCVQ="; mypy-boto3-workmail = - buildMypyBoto3Package "workmail" "1.34.0" - "sha256-D0gfIW2sbxQ/JOi5f9S6/KezsEKz4239srdL8EfFjG8="; + buildMypyBoto3Package "workmail" "1.35.0" + "sha256-1hjejKCAu9pNPzJ0gaz8mbyQLFkzEUB0mO7g7Da06mk="; mypy-boto3-workmailmessageflow = - buildMypyBoto3Package "workmailmessageflow" "1.34.0" - "sha256-e4wgFvtlfx0u6eGphRU7viGzZ4gbZijj4vjziPLPWX8="; + buildMypyBoto3Package "workmailmessageflow" "1.35.0" + "sha256-Om/TFPBZh3xr0inpGzCpvTNij9DTPq8dV1ikX8g4YtE="; mypy-boto3-workspaces = - buildMypyBoto3Package "workspaces" "1.34.58" - "sha256-EtAL93MtIZppL57xP4JDGoWT/SqgptRgCJyq/3bm9ts="; + buildMypyBoto3Package "workspaces" "1.35.24" + "sha256-j7eEUDul3+bMWN80+gH+/gFBWqQHVQ2yN+YBx5VFZNM="; mypy-boto3-workspaces-web = - buildMypyBoto3Package "workspaces-web" "1.34.0" - "sha256-RImlbT5Lpu2IoTrEQv5Bzk3NnkMV9jQjHGDnxCK3x18="; + buildMypyBoto3Package "workspaces-web" "1.35.23" + "sha256-/uATkqLhOOPKwegWRQOSRGeM2tmq+VbWY3t780IvSek="; mypy-boto3-xray = - buildMypyBoto3Package "xray" "1.34.0" - "sha256-8weFeYAit/DBFOhReQr5uSy0Am7Sh1fpYtMPtDka+OI="; + buildMypyBoto3Package "xray" "1.35.0" + "sha256-o8Om2D9ln23E2/OSrBSBApr2uUHpSF6kh4u/YOM4+Cw="; } diff --git a/pkgs/development/python-modules/mypy-boto3/update.sh b/pkgs/development/python-modules/mypy-boto3/update.sh index f9dc1aa8a5c71..53622b479ed4c 100755 --- a/pkgs/development/python-modules/mypy-boto3/update.sh +++ b/pkgs/development/python-modules/mypy-boto3/update.sh @@ -5,14 +5,13 @@ set -eu -o pipefail source_file=pkgs/development/python-modules/mypy-boto3/default.nix -nix-update python312Packages.botocore-stubs --commit --build +#nix-update python312Packages.botocore-stubs --commit --build packages=( mypy-boto3-accessanalyzer mypy-boto3-account mypy-boto3-acm mypy-boto3-acm-pca - mypy-boto3-alexaforbusiness mypy-boto3-amp mypy-boto3-amplify mypy-boto3-amplifybackend @@ -39,7 +38,6 @@ packages=( mypy-boto3-autoscaling-plans mypy-boto3-backup mypy-boto3-backup-gateway - mypy-boto3-backupstorage mypy-boto3-batch mypy-boto3-billingconductor mypy-boto3-braket @@ -140,7 +138,6 @@ packages=( mypy-boto3-frauddetector mypy-boto3-fsx mypy-boto3-gamelift -# mypy-boto3-gamesparks mypy-boto3-glacier mypy-boto3-globalaccelerator mypy-boto3-glue @@ -151,7 +148,6 @@ packages=( mypy-boto3-guardduty mypy-boto3-health mypy-boto3-healthlake - mypy-boto3-honeycode mypy-boto3-iam mypy-boto3-identitystore mypy-boto3-imagebuilder @@ -162,7 +158,6 @@ packages=( mypy-boto3-iot mypy-boto3-iot-data mypy-boto3-iot-jobs-data - mypy-boto3-iot-roborunner mypy-boto3-iot1click-devices mypy-boto3-iot1click-projects mypy-boto3-iotanalytics @@ -210,7 +205,6 @@ packages=( mypy-boto3-lookoutvision mypy-boto3-m2 mypy-boto3-machinelearning - #mypy-boto3-macie mypy-boto3-macie2 mypy-boto3-managedblockchain mypy-boto3-managedblockchain-query @@ -235,7 +229,7 @@ packages=( mypy-boto3-migrationhub-config mypy-boto3-migrationhuborchestrator mypy-boto3-migrationhubstrategy - mypy-boto3-mobile + # mypy-boto3-mobile mypy-boto3-mq mypy-boto3-mturk mypy-boto3-mwaa @@ -365,25 +359,31 @@ packages=( mypy-boto3-xray) for package in "${packages[@]}"; do - echo "Updating ${package} ..." - - old_version=$(awk -v pkg="$package" -F'"' '$1 ~ pkg " = " {print $4}' ${source_file}) + package_short_name="${package#mypy-boto3-}" + old_version=$(awk -v pkg="\"$package_short_name\"" -F'"' '$0 ~ pkg {printf $4}' ${source_file}) version=$(curl -s https://pypi.org/pypi/${package}/json | jq -r '.info.version') + echo "Updating ${package} from ${old_version} to ${version}" + if [ "${version}" != "${old_version}" ]; then - url="https://pypi.io/packages/source/m/${package}/${package}-${version}.tar.gz" + url="https://pypi.io/packages/source/m/${package//-/_}/${package//-/_}-${version}.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) sri_hash="$(nix hash to-sri --type sha256 $hash)" - awk -i inplace -v package="$package" -v new_version="$version" -v new_sha256="$sri_hash" ' - $1 == package { - $5 = "\"" new_version "\""; - $6 = "\"" new_sha256 "\";"; + awk -i inplace -v pkg="\"$package_short_name\"" -v new_version="$version" -v new_sha256="$sri_hash" ' + # Match the line containing the package name + $0 ~ pkg && $0 ~ /buildMypyBoto3Package/ { + # Update the version + sub(/"[^"]+"/, "\"" new_version "\"", $3); + print; + # Update the next line with the new sha256 + getline; + sub(/"[^"]+"/, "\"" new_sha256 "\""); } - {print} - ' $source_file + { print } + ' ${source_file} - nixpkgs-fmt ${source_file} + nixfmt ${source_file} git commit ${source_file} -m "python312Packages.${package}: ${old_version} -> ${version}" fi diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 97628a5e3e87d..520919e7fa461 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "myst-nb"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "myst_nb"; - hash = "sha256-dCJ8EfdtA0lPQ7d4hlmxYblPTe3vIwopEkEryMPJ5VM="; + hash = "sha256-lhtABWVwKcqJiSpMde2/CFbFTOr2FyNotGv3Z2wfdwA="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/n3fit/default.nix b/pkgs/development/python-modules/n3fit/default.nix deleted file mode 100644 index 01c56659465c2..0000000000000 --- a/pkgs/development/python-modules/n3fit/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - buildPythonPackage, - hyperopt, - keras, - nnpdf, - psutil, - tensorflow, - validphys2, -}: - -buildPythonPackage rec { - pname = "n3fit"; - version = "4.0"; - format = "setuptools"; - - inherit (nnpdf) src; - - prePatch = '' - cd n3fit - ''; - - postPatch = '' - substituteInPlace src/n3fit/version.py \ - --replace '= __give_git()' '= "'$version'"' - ''; - - propagatedBuildInputs = [ - hyperopt - keras - psutil - tensorflow - validphys2 - ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH "$PYTHONPATH:$(toPythonPath "$out")" - done - ''; - - doCheck = false; # no tests - pythonImportsCheck = [ "n3fit" ]; - - meta = with lib; { - description = "NNPDF fitting framework"; - homepage = "https://docs.nnpdf.science"; - inherit (nnpdf.meta) license; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/python-modules/nanoemoji/default.nix b/pkgs/development/python-modules/nanoemoji/default.nix new file mode 100644 index 0000000000000..9d2dfffcaf9f1 --- /dev/null +++ b/pkgs/development/python-modules/nanoemoji/default.nix @@ -0,0 +1,101 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + pytestCheckHook, + setuptools, + setuptools-scm, + resvg, + pngquant, + absl-py, + fonttools, + lxml, + ninja, + picosvg, + pillow, + regex, + toml, + tomlkit, + ufo2ft, + ufolib2, + zopfli, +}: + +buildPythonPackage rec { + pname = "nanoemoji"; + version = "0.15.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "nanoemoji"; + rev = "refs/tags/v${version}"; + hash = "sha256-P/lT0PnjTdYzyttICzszu4OL5kj+X8GHZ8doL3tpXQM="; + }; + + patches = [ + # this is necessary because the tests clear PATH/PYTHONPATH otherwise + ./test-pythonpath.patch + # minor difference in the test output, most likely due to different dependency versions + ./fix-test.patch + ]; + + build-system = [ + setuptools + setuptools-scm + ]; + + nativeBuildInputs = [ + pngquant + resvg + ]; + + # these two packages are just prebuilt wheels containing the respective binaries + pythonRemoveDeps = [ + "pngquant-cli" + "resvg-cli" + ]; + + dependencies = [ + absl-py + fonttools + lxml + ninja + picosvg + pillow + regex + toml + tomlkit + ufo2ft + ufolib2 + zopfli + ]; + + nativeCheckInputs = [ + pytestCheckHook + ninja + picosvg + ]; + + makeWrapperArgs = [ + "--prefix PATH : ${ + lib.makeBinPath [ + pngquant + resvg + ] + }" + ]; + + preCheck = '' + # make sure the built binaries (nanoemoji/maximum_color) can be found by the test + export PATH="$out/bin:$PATH" + ''; + + meta = with lib; { + description = "Wee tool to build color fonts"; + homepage = "https://github.com/googlefonts/nanoemoji"; + changelog = "https://github.com/googlefonts/nanoemoji/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ _999eagle ]; + }; +} diff --git a/pkgs/tools/misc/nanoemoji/fix-test.patch b/pkgs/development/python-modules/nanoemoji/fix-test.patch similarity index 100% rename from pkgs/tools/misc/nanoemoji/fix-test.patch rename to pkgs/development/python-modules/nanoemoji/fix-test.patch diff --git a/pkgs/tools/misc/nanoemoji/test-pythonpath.patch b/pkgs/development/python-modules/nanoemoji/test-pythonpath.patch similarity index 100% rename from pkgs/tools/misc/nanoemoji/test-pythonpath.patch rename to pkgs/development/python-modules/nanoemoji/test-pythonpath.patch diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index a79a068f86dd0..ffd604f6daec1 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.8.0"; + version = "2.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,14 +24,14 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-xPjyi5dFR9xVp1Fl6mM2JNKTRlLBQ6J9aB0dpjnZ+eQ="; + hash = "sha256-r94dDXPpkLS1PsB9L4qlDw15tPa2vpxOS52eqJk2dNU="; }; build-system = [ setuptools ]; dependencies = [ ed25519 ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; nkeys = [ nkeys ]; # fast_parse = [ @@ -47,17 +47,18 @@ buildPythonPackage rec { disabledTests = [ - # AssertionError: assert 5 == 0 - "test_pull_subscribe_limits" + # AssertionError "test_fetch_n" - "test_subscribe_no_echo" + "test_kv_simple" + "test_pull_subscribe_limits" "test_stream_management" + "test_subscribe_no_echo" # Tests fail on hydra, often Time-out "test_subscribe_iterate_next_msg" "test_ordered_consumer_larger_streams" "test_object_file_basics" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_subscribe_iterate_next_msg" "test_buf_size_force_flush_timeout" ]; diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix index 1de1a82ac6f1f..f935b934b3cce 100644 --- a/pkgs/development/python-modules/nbconflux/default.nix +++ b/pkgs/development/python-modules/nbconflux/default.nix @@ -2,27 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, nbconvert, pytestCheckHook, requests, responses, + setuptools, + versioneer, }: buildPythonPackage rec { pname = "nbconflux"; version = "0.7.0"; - format = "setuptools"; - disabled = isPy27; # no longer compatible with python 2 urllib + pyproject = true; src = fetchFromGitHub { - owner = "Valassis-Digital-Media"; + owner = "vericast"; repo = "nbconflux"; rev = "refs/tags/${version}"; hash = "sha256-kHIuboFKLVsu5zlZ0bM1BUoQR8f1l0XWcaaVI9bECJw="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ nbconvert requests ]; @@ -37,6 +42,11 @@ buildPythonPackage rec { ./setup-py.patch ]; + postPatch = '' + # remove vendorized versioneer.py + rm versioneer.py + ''; + JUPYTER_PATH = "${nbconvert}/share/jupyter"; disabledTests = [ "test_post_to_confluence" diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index 130ab24cbb8d5..f3b766f086c52 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.27"; + version = "2.3.31"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vF79mY5dy00xfaGR8L9HPpdxOiEpiJ1AQt42hO9DIMs="; + hash = "sha256-a0BOBwzlZ1HFvpamqQHn8rtgghdkTfr9778wW84q7Xo="; }; diff --git a/pkgs/development/python-modules/nbdime/749.patch b/pkgs/development/python-modules/nbdime/749.patch deleted file mode 100644 index b88aec0f67e31..0000000000000 --- a/pkgs/development/python-modules/nbdime/749.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/nbdime/webapp/nbdimeserver.py -+++ b/nbdime/webapp/nbdimeserver.py -@@ -388,6 +388,7 @@ - 'jinja2_env': env, - 'local_hostnames': ['localhost', '127.0.0.1'], - 'cookie_secret': base64.encodebytes(os.urandom(32)), # Needed even for an unsecured server. -+ 'allow_unauthenticated_access': True, - } - - try: diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 7441a6123d23f..7a873014640e2 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -22,29 +22,23 @@ buildPythonPackage rec { pname = "nbdime"; - version = "4.0.1"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8adgwLAMG6m0lFwWzpJXfzk/tR0YTzUbdoW6boUCCY4="; + hash = "sha256-2Cefj0sjbAslOyDWDEgxu2eEPtjb1uCfI06wEdNvG/I="; }; - patches = [ - # this fixes the webserver (nbdiff-web) when jupyter-server >=2.13 is used - # see https://github.com/jupyter/nbdime/issues/749 - ./749.patch - ]; - - nativeBuildInputs = [ + build-system = [ hatch-jupyter-builder hatchling jupyterlab ]; - propagatedBuildInputs = [ + dependencies = [ nbformat colorama pygments diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index aac9c4e6ef259..c819eee79ab60 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BCpggG/CPVGbxb71nZVXBxORP+RC/adZ1T46r2IQR5Q="; + hash = "sha256-c2kW57Daso/JBPSprjtTqaUMKfzMYynAUvzHSFq88rc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index 5bd31f3042a12..dc03557da2511 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { --replace "--flakes" "" ''; - passthru.optional-dependencies.arrays = [ numpy ]; + optional-dependencies.arrays = [ numpy ]; pythonImportsCheck = [ "ndindex" ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { hypothesis pytest-cov-stub pytestCheckHook - ] ++ passthru.optional-dependencies.arrays; + ] ++ optional-dependencies.arrays; meta = with lib; { description = ""; diff --git a/pkgs/development/python-modules/ndspy/default.nix b/pkgs/development/python-modules/ndspy/default.nix index 2a5ef941e1b35..e6539d7caecb4 100644 --- a/pkgs/development/python-modules/ndspy/default.nix +++ b/pkgs/development/python-modules/ndspy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ndspy"; - version = "4.1.0"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RoadrunnerWMC"; repo = pname; - rev = "v${version}"; - hash = "sha256-V7phRZCA0WbUpYLgS/4nJbje/JM61RksDUZQ2pnbQyU="; + rev = "refs/tags/v${version}"; + hash = "sha256-PQONVEuh5Fg2LHr4gq0XTGcOpps/s9FSgoyDn4BCcik="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 55ec525d44202..d3eb0a25ed015 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -36,7 +36,7 @@ buildPythonPackage { mkdir $out/include cp python/ndtypes/*.h $out/include '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so ''; diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index 4358aef2f5553..66cf09a955080 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, numpy, packaging, quantities, @@ -14,14 +14,16 @@ buildPythonPackage rec { pname = "neo"; - version = "0.13.2"; + version = "0.13.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-aYDZVC55XVNR/VtdnTlBBKR/MNDvfwUR+spqe14ncrw="; + src = fetchFromGitHub { + owner = "NeuralEnsemble"; + repo = "python-neo"; + rev = "refs/tags/${version}"; + hash = "sha256-7Q80vbQInVWxPCr6VvmI9tFfTIAzo9FPJ19q51Xd2KM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 498e644a05e50..4e36e2dc37ece 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.24.0"; + version = "5.25.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-bkLz+4eOS+c1qUC2PbPNcn19sJqUqONSgKhAe1Ga1U8="; + hash = "sha256-aGUfyfN85JNOQSnnM+zep07cmLqq9YN1bc7UyH3uFWg="; }; postPatch = '' @@ -41,7 +41,7 @@ buildPythonPackage rec { tomlkit ]; - passthru.optional-dependencies = { + optional-dependencies = { numpy = [ numpy ]; pandas = [ numpy diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 9ca4600148222..f1c1a4f383a06 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.9.1"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,14 +23,14 @@ buildPythonPackage rec { owner = "networktocode"; repo = "netutils"; rev = "refs/tags/v${version}"; - hash = "sha256-hB5ySup7vd01VPyRuNT5d3FufuMvbHF8x5ULOzR1TWY="; + hash = "sha256-VhX0KDlGf0J6fiO1RzOoqJ4WMDM8Bb2+lYYMlgQ9nkc="; }; build-system = [ poetry-core ]; dependencies = [ jsonschema ]; - passthru.optional-dependencies.optionals = [ + optional-dependencies.optionals = [ jsonschema napalm ]; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index eb3051d8e14bd..46ba43afb1390 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { default = [ numpy scipy diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index ed8ac6f948326..ec762c7050d6b 100644 --- a/pkgs/development/python-modules/nextdns/default.nix +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nextdns"; - version = "3.2.0"; + version = "3.3.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "nextdns"; rev = "refs/tags/${version}"; - hash = "sha256-/gBNJYCkDQ5SeM4q/4rWdsSldrMeo5GdUBaG57NiEIY="; + hash = "sha256-WNdS8sAW7Ci8w8diYIsrVADvpgMSDuM0NLBTw7irzKg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix index 1699b18c182df..f438525e51829 100644 --- a/pkgs/development/python-modules/nh3/default.nix +++ b/pkgs/development/python-modules/nh3/default.nix @@ -34,7 +34,7 @@ buildPythonPackage { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index 31060540d170c..9295c45cd23ca 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -6,15 +6,17 @@ nltk, numpy, pandas, + plotly, poetry-core, pytestCheckHook, pythonOlder, + scikit-learn, tomli, }: buildPythonPackage rec { pname = "niaarm"; - version = "0.3.9"; + version = "0.3.12"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,9 +25,11 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "NiaARM"; rev = "refs/tags/${version}"; - hash = "sha256-J3126RSJYBCSyxoPsvsDgmx9E+9fP2h6avPiCHISL7c="; + hash = "sha256-rYFfLtPJgIdSjRIzDIQeHwoQm9NrI6nM3/BF7wAMr1Y="; }; + pythonRelaxDeps = [ "scikit-learn" ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -33,6 +37,8 @@ buildPythonPackage rec { nltk numpy pandas + plotly + scikit-learn ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; disabledTests = [ diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 1fb80ed06f347..c0a51cd1dd39e 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { packaging ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { all = dicom ++ dicomfs ++ minc2 ++ spm ++ zstd; dicom = [ pydicom ]; dicomfs = [ pillow ] ++ dicom; @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-httpserver pytest-xdist pytest7CheckHook - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; preCheck = '' export PATH=$out/bin:$PATH diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index c08da4abe5170..cba7bfe4b69af 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { tenacity ]; - passthru.optional-dependencies = { + optional-dependencies = { convert = [ pandas python-slugify diff --git a/pkgs/development/python-modules/nice-go/default.nix b/pkgs/development/python-modules/nice-go/default.nix new file mode 100644 index 0000000000000..946d129e95c44 --- /dev/null +++ b/pkgs/development/python-modules/nice-go/default.nix @@ -0,0 +1,59 @@ +{ + buildPythonPackage, + fetchFromGitHub, + aiobotocore, + aiohttp, + lib, + poetry-core, + pycognito, + pytest-aiohttp, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + syrupy, + tenacity, + yarl, +}: + +buildPythonPackage rec { + pname = "nice-go"; + version = "0.3.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "IceBotYT"; + repo = "nice-go"; + rev = "refs/tags/${version}"; + hash = "sha256-Gb6VDHADtqmVXMPwic0NokWm5GmhTpy7g+o/rYxrBZk="; + }; + + build-system = [ poetry-core ]; + + pythonRelaxDeps = [ "tenacity" ]; + + dependencies = [ + aiobotocore + aiohttp + pycognito + tenacity + yarl + ]; + + pythonImportsCheck = [ "nice_go" ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytest-asyncio + pytest-cov-stub + pytestCheckHook + syrupy + ]; + + meta = { + changelog = "https://github.com/IceBotYT/nice-go/blob/${src.rev}/CHANGELOG.md"; + description = "Control various Nice access control products"; + homepage = "https://github.com/IceBotYT/nice-go"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index da8452a437ed7..6169a0f69da38 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -93,7 +93,7 @@ buildPythonPackage rec { ]; # checks on darwin inspect memory which doesn't work in build environment - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # ignore tests which incorrect fail to detect xvfb checkPhase = '' LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display and not test_no_et_multiproc' diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index 6cc35b662c000..35b8eb4c46fc0 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.isDarwin; # tests hang indefinitely + doCheck = !stdenv.hostPlatform.isDarwin; # tests hang indefinitely pythonImportsCheck = [ "nitime" ]; diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 22a9234125622..f50c1df9902f6 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -2,29 +2,33 @@ lib, buildPythonPackage, fetchPypi, - pytest7CheckHook, - six, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "nocasedict"; - version = "2.0.3"; - format = "setuptools"; + version = "2.0.4"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-HJImx/WoqXrVHcsK4xV6cg4/fLnEVo0i6joF4/hWWKk="; + hash = "sha256-TKk09l31exDQ/KtfDDnp3MuTV3/58ivvmCZd2/EvivE="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytest7CheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "nocasedict" ]; meta = with lib; { description = "Case-insensitive ordered dictionary for Python"; homepage = "https://github.com/pywbem/nocasedict"; + changelog = "https://github.com/pywbem/nocasedict/blob/${version}/docs/changes.rst"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ freezeboy ]; }; diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index c8129568a5ce8..ddb10ecf6fdc0 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -2,26 +2,29 @@ lib, buildPythonPackage, fetchPypi, - pytest7CheckHook, + pytestCheckHook, pythonOlder, + setuptools, six, }: buildPythonPackage rec { pname = "nocaselist"; - version = "2.0.2"; - format = "setuptools"; + version = "2.0.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-MnCLcAoaUxM+a7XMUzMsl3Wwx8lZpflyV5MXH9L0yKU="; + hash = "sha256-VXFNqEM/tIQ855dASXfkOF1ePfnkqgD33emD/YdBD+8="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytest7CheckHook ]; + dependencies = [ six ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "nocaselist" ]; diff --git a/pkgs/development/python-modules/nodriver/default.nix b/pkgs/development/python-modules/nodriver/default.nix index 3d17b64b4772a..9a19815af991e 100644 --- a/pkgs/development/python-modules/nodriver/default.nix +++ b/pkgs/development/python-modules/nodriver/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, pythonOlder, deprecated, mss, @@ -9,16 +9,14 @@ setuptools, }: -buildPythonPackage { +buildPythonPackage rec { pname = "nodriver"; - version = "0.36"; + version = "0.37"; pyproject = true; - src = fetchFromGitHub { - owner = "ultrafunkamsterdam"; - repo = "nodriver"; - rev = "e630abfc5dce2023966a61cec739348b18bd465d"; - hash = "sha256-pUWvHcsEPbRob5DDXBFOzqonSWigNPnPUHIu9omzYII="; + src = fetchPypi { + inherit pname version; + hash = "sha256-FF/E0hNZvo26Urtgw+nBH5Rmk7UCaqAsckCLDMuCK0A="; }; disabled = pythonOlder "3.9"; diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix index 940447c711a8f..fc00d09f8033e 100644 --- a/pkgs/development/python-modules/noise/default.nix +++ b/pkgs/development/python-modules/noise/default.nix @@ -2,22 +2,33 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "noise"; version = "1.2.2"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp"; + hash = "sha256-V6J5dDZXQ5H/Y6ER6FLlOkFk7Nga0jY5ZBdDzRogm2U="; }; + build-system = [ setuptools ]; + + # PyPI release don't contain tests + doCheck = false; + + pythonImportsCheck = [ "noise" ]; + meta = with lib; { - homepage = "https://github.com/caseman/noise"; description = "Native-code and shader implementations of Perlin noise"; + homepage = "https://github.com/caseman/noise"; license = licenses.mit; - platforms = platforms.all; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 6ffc0da4c30f7..34dd918982878 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.4.9"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-Ut/YifODoiHCo3bhN8nV5ZPNIr70FM6MjlZCrUuNaFc="; + hash = "sha256-7LzReT1iuCbZYNJWjDriMaCljLzpyKWfCX6HjTt18ls="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/norfair/default.nix b/pkgs/development/python-modules/norfair/default.nix index c3c50cd13334d..24376e28863f3 100644 --- a/pkgs/development/python-modules/norfair/default.nix +++ b/pkgs/development/python-modules/norfair/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { metrics = [ motmetrics ]; video = [ opencv4 ]; }; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index b2a65a5648ef3..cbf66277951b5 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { coverage = [ coverage ]; }; @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); meta = with lib; { changelog = "https://github.com/nose-devs/nose2/blob/${version}/docs/changelog.rst"; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 7718611df06cc..9e796f6bf5374 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.2.1"; + version = "7.2.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Qoe22ll0CzIXPQHWQfdj0pL0nDDnpRuJxGuoRzEmNB4="; + hash = "sha256-LvB9QiBCFiOtP+iBGNaHvARQBVVwzdFggUpZzzocUW4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index 38f4ff5af1403..cc46dbe77fdf0 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { }; patches = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ # hardcode paths to aplay and notify-send (substituteAll { src = ./linux-paths.patch; @@ -39,7 +39,7 @@ buildPythonPackage rec { notifysend = "${libnotify}/bin/notify-send"; }) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # hardcode path to which (substituteAll { src = ./darwin-paths.patch; @@ -53,19 +53,19 @@ buildPythonPackage rec { pythonRelaxDeps = [ "loguru" ]; - propagatedBuildInputs = [ loguru ] ++ lib.optionals stdenv.isLinux [ jeepney ]; + propagatedBuildInputs = [ loguru ] ++ lib.optionals stdenv.hostPlatform.isLinux [ jeepney ]; - nativeCheckInputs = [ pytest ] ++ lib.optionals stdenv.isLinux [ dbus ]; + nativeCheckInputs = [ pytest ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus ]; checkPhase = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then '' # Tests search for "afplay" binary which is built in to macOS and not available in nixpkgs mkdir $TMP/bin ln -s ${coreutils}/bin/true $TMP/bin/afplay PATH="$TMP/bin:$PATH" pytest '' - else if stdenv.isLinux then + else if stdenv.hostPlatform.isLinux then '' dbus-run-session \ --config-file=${dbus}/share/dbus-1/session.conf \ diff --git a/pkgs/development/python-modules/notobuilder/default.nix b/pkgs/development/python-modules/notobuilder/default.nix new file mode 100644 index 0000000000000..0dce59c8d16be --- /dev/null +++ b/pkgs/development/python-modules/notobuilder/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + unstableGitUpdater, + setuptools, + setuptools-scm, + fonttools, + ufomerge, + fontmake, + glyphslib, + ttfautohint-py, + ufo2ft, + gftools, + fontbakery, + diffenator2, + chevron, + sh, + ninja, +}: + +buildPythonPackage { + pname = "notobuilder"; + version = "0-unstable-2024-08-03"; + pyproject = true; + + src = fetchFromGitHub { + owner = "notofonts"; + repo = "notobuilder"; + rev = "d7bcfc8e5c5ee9b273e7b1eeb2dd6d619da68c33"; + hash = "sha256-1tdHbJixd1s1grGh0enqXhp+u5TEic6/W88X/f8vagM="; + }; + + postPatch = '' + substituteInPlace Lib/notobuilder/__main__.py \ + --replace-fail '"ninja"' '"${lib.getExe ninja}"' + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + fonttools + ufomerge + fontmake + glyphslib + ttfautohint-py + ufo2ft + gftools + fontbakery + diffenator2 + chevron + sh + ] ++ gftools.optional-dependencies.qa; + + pythonImportsCheck = [ + "notobuilder" + "notoqa" + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Python module for building Noto fonts"; + homepage = "https://github.com/notofonts/notobuilder"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index 722570a25870d..4b0936f22948d 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "5.1.0"; + version = "6.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SnmI1/lB1p/zldgn9jIid4yJ5+ubr5mh/IAqXY/1Wbc="; + hash = "sha256-E8n4ZcCH8xxU5XXVxQUl8844RnRpnbHy/LnjHlz7Eeg="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index cce4467e73e5c..45e7fa77eb03e 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - ccache, fetchFromGitHub, isPyPy, ordered-set, @@ -27,7 +26,6 @@ buildPythonPackage rec { setuptools wheel ]; - nativeCheckInputs = [ ccache ]; dependencies = [ ordered-set diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index eec0c6a83a289..18bd264c5d76f 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -7,6 +7,7 @@ python, buildPythonPackage, setuptools, + numpy, numpy_2, llvmlite, libcxx, @@ -77,10 +78,11 @@ buildPythonPackage rec { "dldir = [ '${addDriverRunpath.driverLink}/lib', " ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; build-system = [ setuptools + numpy ]; nativeBuildInputs = lib.optionals cudaSupport [ @@ -88,12 +90,10 @@ buildPythonPackage rec { cudaPackages.cuda_nvcc ]; - buildInputs = [ - # Not propagating it, because it numba can work with either numpy_2 or numpy_1 - numpy_2 - ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; + buildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; dependencies = [ + numpy llvmlite setuptools ] ++ lib.optionals (pythonOlder "3.9") [ importlib-metadata ]; @@ -161,6 +161,9 @@ buildPythonPackage rec { doFullCheck = true; testsWithoutSandbox = false; }; + numpy_2 = numba.override { + numpy = numpy_2; + }; }; meta = with lib; { diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 23f49c77ad438..7f04ae4bf4140 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { msgpack = [ msgpack ]; # zfpy = [ zfpy ]; }; diff --git a/pkgs/development/python-modules/numpy-groupies/default.nix b/pkgs/development/python-modules/numpy-groupies/default.nix index 73d56a69305b7..52feff514904d 100644 --- a/pkgs/development/python-modules/numpy-groupies/default.nix +++ b/pkgs/development/python-modules/numpy-groupies/default.nix @@ -37,11 +37,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "numpy_groupies" ]; - meta = with lib; { + meta = { homepage = "https://github.com/ml31415/numpy-groupies"; changelog = "https://github.com/ml31415/numpy-groupies/releases/tag/v${version}"; description = "Optimised tools for group-indexing operations: aggregated sum and more"; - license = licenses.bsd2; - maintainers = [ maintainers.berquist ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ berquist ]; }; } diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix index f20bd095cf97f..2bd7a44903fa7 100644 --- a/pkgs/development/python-modules/numpy/1.nix +++ b/pkgs/development/python-modules/numpy/1.nix @@ -3,6 +3,7 @@ stdenv, fetchPypi, python, + numpy_1, pythonAtLeast, pythonOlder, buildPythonPackage, @@ -104,7 +105,7 @@ buildPythonPackage rec { meson-python pkg-config ] - ++ lib.optionals (stdenv.isDarwin) [ xcbuild.xcrun ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; buildInputs = [ @@ -154,13 +155,13 @@ buildPythonPackage rec { # https://github.com/numpy/numpy/issues/24548 disabledTests = - lib.optionals stdenv.isi686 [ + lib.optionals stdenv.hostPlatform.isi686 [ "test_new_policy" # AssertionError: assert False "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded "test_float_remainder_overflow" # AssertionError: FloatingPointError not raised by divmod "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1 ] - ++ lib.optionals stdenv.isAarch32 [ + ++ lib.optionals stdenv.hostPlatform.isAarch32 [ "test_impossible_feature_enable" # AssertionError: Failed to generate error "test_features" # AssertionError: Failure Detection "test_new_policy" # AssertionError: assert False @@ -172,10 +173,10 @@ buildPythonPackage rec { "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha... "test_multinomial_pvals_float32" # Failed: DID NOT RAISE <class 'ValueError'> ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_big_arrays" # OOM on a 16G machine ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # can fail on virtualized machines confused over their cpu identity "test_dispatcher" ]; @@ -185,6 +186,7 @@ buildPythonPackage rec { blas = blas.provider; blasImplementation = blas.implementation; inherit cfg; + coreIncludeDir = "${numpy_1}/${python.sitePackages}/numpy/core/include"; tests = { inherit sage; }; diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index 4164b7c80a93c..e8f6d36b73d88 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -3,6 +3,7 @@ stdenv, fetchPypi, python, + numpy_2, pythonAtLeast, pythonOlder, buildPythonPackage, @@ -58,7 +59,7 @@ let in buildPythonPackage rec { pname = "numpy"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -66,7 +67,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-fckNoAgffh2knsTjmO3mqOnMT16+X54GtEPtiJ7pqqI="; + hash = "sha256-0M99VbEFE4eAdAWziY76+oYpl7TLqKpdvmV755Sv6v0="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ @@ -89,7 +90,7 @@ buildPythonPackage rec { meson-python pkg-config ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; # we default openblas to build with 64 threads @@ -143,7 +144,7 @@ buildPythonPackage rec { # https://github.com/numpy/numpy/issues/26713 "test_iter_refcount" ] - ++ lib.optionals stdenv.isAarch32 [ + ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # https://github.com/numpy/numpy/issues/24548 "test_impossible_feature_enable" # AssertionError: Failed to generate error "test_features" # AssertionError: Failure Detection @@ -156,7 +157,7 @@ buildPythonPackage rec { "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha... "test_multinomial_pvals_float32" # Failed: DID NOT RAISE <class 'ValueError'> ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # AssertionError: (np.int64(0), np.longdouble('9.9999999999999994515e-21'), np.longdouble('3.9696755572509052902e+20'), 'arctanh') "test_loss_of_precision" ]; @@ -166,6 +167,7 @@ buildPythonPackage rec { blas = blas.provider; blasImplementation = blas.implementation; inherit cfg; + coreIncludeDir = "${numpy_2}/${python.sitePackages}/numpy/_core/include"; tests = { inherit sage; }; @@ -176,5 +178,6 @@ buildPythonPackage rec { description = "Scientific tools for Python"; homepage = "https://numpy.org/"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index dd5aca045f434..a1aed20a52686 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -1,8 +1,7 @@ { lib, buildPythonPackage, - pythonOlder, - fetchPypi, + fetchFromGitHub, # build-system setuptools, @@ -14,23 +13,31 @@ numpy, tqdm, - # checks + # tests + # Our current version of tensorflow (2.13.0) is too old and doesn't support python>=3.12 + # We remove optional test dependencies that require tensorflow and skip the corresponding tests to + # avoid introducing a useless incompatibility with python 3.12: + # dm-haiku, + # flax, + # tensorflow-probability, funsor, + graphviz, + optax, + pyro-api, pytestCheckHook, -# TODO: uncomment when tensorflow-probability gets fixed. -# , tensorflow-probability + scikit-learn, }: buildPythonPackage rec { pname = "numpyro"; - version = "0.15.2"; + version = "0.15.3"; pyproject = true; - disabled = pythonOlder "3.9"; - - src = fetchPypi { - inherit version pname; - hash = "sha256-6G3TrDyQ5N2uuzLzzEus1czCtvg3M0wBorLo2vQZozE="; + src = fetchFromGitHub { + owner = "pyro-ppl"; + repo = "numpyro"; + rev = "refs/tags/${version}"; + hash = "sha256-g+ep221hhLbCjQasKpiEAXkygI5A3Hglqo1tV8lv5eg="; }; build-system = [ setuptools ]; @@ -44,9 +51,14 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + # dm-haiku + # flax funsor + graphviz + optax + pyro-api pytestCheckHook - # TODO: uncomment when tensorflow-probability gets fixed. + scikit-learn # tensorflow-probability ]; @@ -63,17 +75,50 @@ buildPythonPackage rec { "test_kl_dirichlet_dirichlet" "test_kl_univariate" "test_mean_var" + # Tests want to download data "data_load" "test_jsb_chorales" + # RuntimeWarning: overflow encountered in cast "test_zero_inflated_logits_probs_agree" + # NameError: unbound axis name: _provenance "test_model_transformation" + + # require dm-haiku + "test_flax_state_dropout_smoke" + "test_flax_module" + "test_random_module_mcmc" + + # require flax + "test_haiku_state_dropout_smoke" + "test_haiku_module" + "test_random_module_mcmc" + + # require tensorflow-probability + "test_modified_bessel_first_kind_vect" + "test_diag_spectral_density_periodic" + "test_kernel_approx_periodic" + "test_modified_bessel_first_kind_one_dim" + "test_modified_bessel_first_kind_vect" + "test_periodic_gp_one_dim_model" + "test_no_tracer_leak_at_lazy_property_sample" + + # flaky on darwin + # TODO: uncomment at next release (0.15.4) as it has been fixed: + # https://github.com/pyro-ppl/numpyro/pull/1863 + "test_change_point_x64" ]; - # TODO: remove when tensorflow-probability gets fixed. - disabledTestPaths = [ "test/test_distributions.py" ]; + disabledTestPaths = [ + # require jaxns (unpackaged) + "test/contrib/test_nested_sampling.py" + + # requires tensorflow-probability + "test/contrib/test_tfp.py" + "test/test_distributions.py" + ]; meta = { description = "Library for probabilistic programming with NumPy"; diff --git a/pkgs/development/python-modules/nutils-poly/default.nix b/pkgs/development/python-modules/nutils-poly/default.nix index 3acda2fe55f13..e15b2fcd2a27d 100644 --- a/pkgs/development/python-modules/nutils-poly/default.nix +++ b/pkgs/development/python-modules/nutils-poly/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeBuildInputs = [ rustPlatform.cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; build-system = [ rustPlatform.maturinBuildHook ]; diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index 81be2102daddd..57f0a7c682400 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.14.1"; + version = "2.15.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "lilydjwg"; repo = "nvchecker"; rev = "v${version}"; - hash = "sha256-V2lTGeaiwUsh8IONbZ5GQrqevJMhjeuFLTDF8UdWg8Q="; + hash = "sha256-dK3rZCoSukCzPOFVectQiF6qplUuDBh9qyN8JL0+j20="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 0c438815d8434..c971467d17a12 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.3.1"; + version = "17.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gFhhOCcmorkrLxrup9fICh5ueCrc64fxfuZXTQG1tMk="; + hash = "sha256-0eRfcuI+GuhgF0myZPy8ZcL4kBCLv6PcGEk+92J+GZ0="; }; build-system = [ setuptools ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { traitlets ]; - passthru.optional-dependencies = { + optional-dependencies = { googlegroups = [ google-api-python-client google-auth-oauthlib @@ -57,7 +57,7 @@ buildPythonPackage rec { pytest-cov-stub pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index e8211953bb44c..fbbc8a6a1ad92 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { rsa = [ cryptography ]; signedtoken = [ cryptography @@ -45,7 +45,12 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + disabledTests = [ + # https://github.com/oauthlib/oauthlib/issues/877 + "test_rsa_bad_keys" + ]; pythonImportsCheck = [ "oauthlib" ]; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 231c14e4ceff3..bdd104518852b 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { ipython = [ graphviz ]; }; diff --git a/pkgs/development/python-modules/obspy/default.nix b/pkgs/development/python-modules/obspy/default.nix index be94fa1bd0c7c..8133d63c6f2ea 100644 --- a/pkgs/development/python-modules/obspy/default.nix +++ b/pkgs/development/python-modules/obspy/default.nix @@ -1,9 +1,13 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies decorator, - future, lxml, matplotlib, numpy, @@ -14,18 +18,22 @@ buildPythonPackage rec { pname = "obspy"; - version = "1.2.2"; - format = "setuptools"; + version = "1.4.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "a0f2b0915beeb597762563fa0358aa1b4d6b09ffda49909c760b5cdf5bdc419e"; + src = fetchFromGitHub { + owner = "obspy"; + repo = "obspy"; + rev = "refs/tags/${version}"; + hash = "sha256-Y833OWWBDYduyky0+MRbPoBtATTytak87hgh68QAgfw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "sqlalchemy" ]; + + dependencies = [ decorator - future lxml matplotlib numpy @@ -39,10 +47,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "obspy" ]; - meta = with lib; { + meta = { description = "Python framework for seismological observatories"; homepage = "https://www.obspy.org"; - license = licenses.lgpl3; - maintainers = [ maintainers.ametrine ]; + changelog = "https://github.com/obspy/obspy/releases/tag/${version}"; + license = lib.licenses.lgpl3Only; + maintainers = [ lib.maintainers.ametrine ]; }; } diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 847d45fc823d3..9c804b54e9b45 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.128.2"; + version = "2.135.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-AT4jE4apkZ0uK1Z03nVnMN9CS5uiMwPNsarq7pY+Pnw="; + hash = "sha256-wm0IwcDXdRU/7YCJe9nlmXClzxGRxF9HfAKjGRYO6NE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 4c093aa744065..4f9149cc72b6d 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -4,6 +4,8 @@ deprecation, fetchFromGitHub, ghostscript, + hatch-vcs, + hatchling, hypothesis, img2pdf, jbig2enc, @@ -19,7 +21,6 @@ pythonOlder, rich, reportlab, - setuptools-scm, substituteAll, tesseract, unpaper, @@ -28,7 +29,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.4.3"; + version = "16.5.0"; disabled = pythonOlder "3.10"; @@ -44,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-SHinfAWUqrPnHdDDXa1meVfxsyct17b1ak5U91GEc1w="; + hash = "sha256-jqe4BRW0U7gqcf+FtDWjDDvRStAqaEPTuU+B+BrFR5Y="; }; patches = [ @@ -59,7 +60,10 @@ buildPythonPackage rec { }) ]; - build-system = [ setuptools-scm ]; + build-system = [ + hatch-vcs + hatchling + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 438078c56e73d..fbef31e9f50a0 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -1,41 +1,54 @@ { lib, nix-update-script, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + setuptools, deprecated, regex, - pip, + pytest-cov-stub, + pytest-forked, + pytest-random-order, + pytestCheckHook, }: buildPythonPackage rec { pname = "oelint-parser"; - version = "3.5.5"; - format = "setuptools"; + version = "5.1.0"; + pyproject = true; - src = fetchPypi { - inherit version; - pname = "oelint_parser"; - hash = "sha256-4x7OgC5UKhAII2S1kDu+1RZyusr9F5cZDaRG9HFyhkA="; + src = fetchFromGitHub { + owner = "priv-kweihmann"; + repo = "oelint-parser"; + rev = "refs/tags/${version}"; + hash = "sha256-0cCcbnipijQgWH+08eZbE6Cqcx5cenrb+bQlf3h04tw="; }; - buildInputs = [ pip ]; - propagatedBuildInputs = [ - deprecated + pythonRelaxDeps = [ "regex" ]; + + build-system = [ setuptools ]; + + dependencies = [ regex + deprecated + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytest-forked + pytest-random-order + pytestCheckHook ]; - pythonImportsCheck = [ "oelint_parser" ]; - # Fail to run inside the code the build. - doCheck = false; + pythonImportsCheck = [ "oelint_parser" ]; passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Alternative parser for bitbake recipes"; homepage = "https://github.com/priv-kweihmann/oelint-parser"; changelog = "https://github.com/priv-kweihmann/oelint-parser/releases/tag/${version}"; - license = licenses.bsd2; - maintainers = with maintainers; [ otavio ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ otavio ]; }; } diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix index 816b93c833a70..d8b909b9a5710 100644 --- a/pkgs/development/python-modules/okonomiyaki/default.nix +++ b/pkgs/development/python-modules/okonomiyaki/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { substituteInPlace okonomiyaki/runtimes/tests/test_runtime.py \ --replace 'runtime_info = PythonRuntime.from_running_python()' 'raise unittest.SkipTest() #' '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace okonomiyaki/platforms/tests/test_pep425.py \ --replace 'self.assertEqual(platform_tag, self.tag.platform)' 'raise unittest.SkipTest()' ''; diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index fae10081d33b9..4f5266494e5cb 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.3.1"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ollama"; repo = "ollama-python"; rev = "refs/tags/v${version}"; - hash = "sha256-uz2mUcFFVeJ+85DElJ3kcxpke3DZjXl91FJ+6tYGj9c="; + hash = "sha256-27OJwPvHBxCdaiHk8EQ2s1OeBzgsrzp1MjgKHNgvz+A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index 297d35fb0deb4..ae082ec7d8574 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { requests scikit-image toolz - ] ++ fsspec.passthru.optional-dependencies.s3; + ] ++ fsspec.optional-dependencies.s3; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/omniorbpy/default.nix b/pkgs/development/python-modules/omniorbpy/default.nix new file mode 100644 index 0000000000000..c541ddd2ba7de --- /dev/null +++ b/pkgs/development/python-modules/omniorbpy/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchurl, + omniorb, + pkg-config, + python, +}: + +buildPythonPackage rec { + pname = "omniorbpy"; + version = "4.3.2"; + pyproject = false; + + src = fetchurl { + url = "http://downloads.sourceforge.net/omniorb/omniORBpy-${version}.tar.bz2"; + hash = "sha256-y1cX1BKhAbr0MPWYysfWkjGITa5DctjirfPd7rxffrs="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ pkg-config ]; + + propagatedBuildInputs = [ omniorb ]; + + configureFlags = [ + "--with-omniorb=${omniorb}" + "PYTHON_PREFIX=$out" + "PYTHON=${python.interpreter}" + ]; + + # Transform omniidl_be into a PEP420 namespace + postInstall = '' + rm $out/${python.sitePackages}/omniidl_be/__init__.py + rm $out/${python.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc + ''; + + # Ensure both python & cxx backends are available + pythonImportsCheck = [ + "omniidl_be.cxx" + "omniidl_be.python" + "omniORB" + ]; + + meta = with lib; { + description = "Python backend for omniorb"; + homepage = "http://omniorb.sourceforge.net"; + license = with licenses; [ + gpl2Plus + lgpl21Plus + ]; + maintainers = with maintainers; [ nim65s ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/onecache/default.nix b/pkgs/development/python-modules/onecache/default.nix index 03a8520bbfe05..fb1aa5c654843 100644 --- a/pkgs/development/python-modules/onecache/default.nix +++ b/pkgs/development/python-modules/onecache/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pytest-asyncio ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # test fails due to unknown reason on darwin "test_lru_and_ttl_refresh" ]; diff --git a/pkgs/development/python-modules/onigurumacffi/default.nix b/pkgs/development/python-modules/onigurumacffi/default.nix index 09be239936528..2d2faef572fd2 100644 --- a/pkgs/development/python-modules/onigurumacffi/default.nix +++ b/pkgs/development/python-modules/onigurumacffi/default.nix @@ -1,10 +1,12 @@ { lib, - python3Packages, + buildPythonPackage, fetchPypi, oniguruma, + setuptools, + cffi, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "onigurumacffi"; version = "1.3.0"; format = "pyproject"; @@ -14,7 +16,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-d0XNxWCWrOyIofOwhmCiKwnGWe040/WdtsHK12qXa+8="; }; - buildInputs = with python3Packages; [ + buildInputs = [ oniguruma setuptools cffi diff --git a/pkgs/development/python-modules/onnx/1.15.0-CVE-2024-27318.patch b/pkgs/development/python-modules/onnx/1.15.0-CVE-2024-27318.patch deleted file mode 100644 index 3b95d1fc588c9..0000000000000 --- a/pkgs/development/python-modules/onnx/1.15.0-CVE-2024-27318.patch +++ /dev/null @@ -1,360 +0,0 @@ -Based on upstream 66b7fb630903fdcf3e83b6b6d56d82e904264a20, adjusted to -apply to 1.15.0 & avoid implicit inclusion of changes from other -intermediate commits - -diff --git a/onnx/checker.cc b/onnx/checker.cc -index fac56f56..c9fda9b2 100644 ---- a/onnx/checker.cc -+++ b/onnx/checker.cc -@@ -13,7 +13,6 @@ - #include <vector> - - #include "onnx/common/file_utils.h" --#include "onnx/common/path.h" - #include "onnx/defs/schema.h" - #include "onnx/defs/tensor_proto_util.h" - #include "onnx/proto_utils.h" -@@ -135,85 +134,7 @@ void check_tensor(const TensorProto& tensor, const CheckerContext& ctx) { - for (const StringStringEntryProto& entry : tensor.external_data()) { - if (entry.has_key() && entry.has_value() && entry.key() == "location") { - has_location = true; --#ifdef _WIN32 -- auto file_path = std::filesystem::path(utf8str_to_wstring(entry.value())); -- if (file_path.is_absolute()) { -- fail_check( -- "Location of external TensorProto ( tensor name: ", -- tensor.name(), -- ") should be a relative path, but it is an absolute path: ", -- entry.value()); -- } -- auto relative_path = file_path.lexically_normal().make_preferred().wstring(); -- // Check that normalized relative path contains ".." on Windows. -- if (relative_path.find(L"..", 0) != std::string::npos) { -- fail_check( -- "Data of TensorProto ( tensor name: ", -- tensor.name(), -- ") should be file inside the ", -- ctx.get_model_dir(), -- ", but the '", -- entry.value(), -- "' points outside the directory"); -- } -- std::wstring data_path = path_join(utf8str_to_wstring(ctx.get_model_dir()), relative_path); -- struct _stat64 buff; -- if (_wstat64(data_path.c_str(), &buff) != 0) { -- fail_check( -- "Data of TensorProto ( tensor name: ", -- tensor.name(), -- ") should be stored in ", -- entry.value(), -- ", but it doesn't exist or is not accessible."); -- } --#else // POSIX -- if (entry.value().empty()) { -- fail_check("Location of external TensorProto ( tensor name: ", tensor.name(), ") should not be empty."); -- } else if (entry.value()[0] == '/') { -- fail_check( -- "Location of external TensorProto ( tensor name: ", -- tensor.name(), -- ") should be a relative path, but it is an absolute path: ", -- entry.value()); -- } -- std::string relative_path = clean_relative_path(entry.value()); -- // Check that normalized relative path contains ".." on POSIX -- if (relative_path.find("..", 0) != std::string::npos) { -- fail_check( -- "Data of TensorProto ( tensor name: ", -- tensor.name(), -- ") should be file inside the ", -- ctx.get_model_dir(), -- ", but the '", -- entry.value(), -- "' points outside the directory"); -- } -- std::string data_path = path_join(ctx.get_model_dir(), relative_path); -- // use stat64 to check whether the file exists --#if defined(__APPLE__) || defined(__wasm__) || !defined(__GLIBC__) -- struct stat buffer; // APPLE, wasm and non-glic stdlibs do not have stat64 -- if (stat((data_path).c_str(), &buffer) != 0) { --#else -- struct stat64 buffer; // All POSIX under glibc except APPLE and wasm have stat64 -- if (stat64((data_path).c_str(), &buffer) != 0) { --#endif -- fail_check( -- "Data of TensorProto ( tensor name: ", -- tensor.name(), -- ") should be stored in ", -- data_path, -- ", but it doesn't exist or is not accessible."); -- } -- // Do not allow symlinks or directories. -- if (!S_ISREG(buffer.st_mode)) { -- fail_check( -- "Data of TensorProto ( tensor name: ", -- tensor.name(), -- ") should be stored in ", -- data_path, -- ", but it is not regular file."); -- } --#endif -+ resolve_external_data_location(ctx.get_model_dir(), entry.value(), tensor.name()); - } - } - if (!has_location) { -@@ -1054,6 +975,93 @@ void check_model(const ModelProto& model, bool full_check, bool skip_opset_compa - } - } - -+std::string resolve_external_data_location( -+ const std::string& base_dir, -+ const std::string& location, -+ const std::string& tensor_name) { -+#ifdef _WIN32 -+ auto file_path = std::filesystem::path(utf8str_to_wstring(location)); -+ if (file_path.is_absolute()) { -+ fail_check( -+ "Location of external TensorProto ( tensor name: ", -+ tensor_name, -+ ") should be a relative path, but it is an absolute path: ", -+ location); -+ } -+ auto relative_path = file_path.lexically_normal().make_preferred().wstring(); -+ // Check that normalized relative path contains ".." on Windows. -+ if (relative_path.find(L"..", 0) != std::string::npos) { -+ fail_check( -+ "Data of TensorProto ( tensor name: ", -+ tensor_name, -+ ") should be file inside the ", -+ base_dir, -+ ", but the '", -+ location, -+ "' points outside the directory"); -+ } -+ std::wstring data_path = path_join(utf8str_to_wstring(base_dir), relative_path); -+ struct _stat64 buff; -+ if (_wstat64(data_path.c_str(), &buff) != 0) { -+ fail_check( -+ "Data of TensorProto ( tensor name: ", -+ tensor_name, -+ ") should be stored in ", -+ location, -+ ", but it doesn't exist or is not accessible."); -+ } -+ return wstring_to_utf8str(data_path); -+#else // POSIX -+ if (location.empty()) { -+ fail_check("Location of external TensorProto ( tensor name: ", tensor_name, ") should not be empty."); -+ } else if (location[0] == '/') { -+ fail_check( -+ "Location of external TensorProto ( tensor name: ", -+ tensor_name, -+ ") should be a relative path, but it is an absolute path: ", -+ location); -+ } -+ std::string relative_path = clean_relative_path(location); -+ // Check that normalized relative path contains ".." on POSIX -+ if (relative_path.find("..", 0) != std::string::npos) { -+ fail_check( -+ "Data of TensorProto ( tensor name: ", -+ tensor_name, -+ ") should be file inside the ", -+ base_dir, -+ ", but the '", -+ location, -+ "' points outside the directory"); -+ } -+ std::string data_path = path_join(base_dir, relative_path); -+ // use stat64 to check whether the file exists -+#if defined(__APPLE__) || defined(__wasm__) || !defined(__GLIBC__) -+ struct stat buffer; // APPLE, wasm and non-glic stdlibs do not have stat64 -+ if (stat((data_path).c_str(), &buffer) != 0) { -+#else -+ struct stat64 buffer; // All POSIX under glibc except APPLE and wasm have stat64 -+ if (stat64((data_path).c_str(), &buffer) != 0) { -+#endif -+ fail_check( -+ "Data of TensorProto ( tensor name: ", -+ tensor_name, -+ ") should be stored in ", -+ data_path, -+ ", but it doesn't exist or is not accessible."); -+ } -+ // Do not allow symlinks or directories. -+ if (!S_ISREG(buffer.st_mode)) { -+ fail_check( -+ "Data of TensorProto ( tensor name: ", -+ tensor_name, -+ ") should be stored in ", -+ data_path, -+ ", but it is not regular file."); -+ } -+ return data_path; -+#endif -+} -+ - std::set<std::string> experimental_ops = { - "ATen", - "Affine", -diff --git a/onnx/checker.h b/onnx/checker.h -index 6796acab..83012213 100644 ---- a/onnx/checker.h -+++ b/onnx/checker.h -@@ -160,7 +160,10 @@ void check_model_local_functions( - - void check_model(const ModelProto& model, bool full_check = false, bool skip_opset_compatibility_check = false); - void check_model(const std::string& model_path, bool full_check = false, bool skip_opset_compatibility_check = false); -- -+std::string resolve_external_data_location( -+ const std::string& base_dir, -+ const std::string& location, -+ const std::string& tensor_name); - bool check_is_experimental_op(const NodeProto& node); - - } // namespace checker -diff --git a/onnx/common/path.h b/onnx/common/path.h -index 6eaf5e67..09212747 100644 ---- a/onnx/common/path.h -+++ b/onnx/common/path.h -@@ -31,11 +31,22 @@ inline std::wstring utf8str_to_wstring(const std::string& utf8str) { - if (utf8str.size() > INT_MAX) { - fail_check("utf8str_to_wstring: string is too long for converting to wstring."); - } -- int size_required = MultiByteToWideChar(CP_UTF8, 0, utf8str.c_str(), (int)utf8str.size(), NULL, 0); -+ int size_required = MultiByteToWideChar(CP_UTF8, 0, utf8str.c_str(), static_cast<int>(utf8str.size()), NULL, 0); - std::wstring ws_str(size_required, 0); -- MultiByteToWideChar(CP_UTF8, 0, utf8str.c_str(), (int)utf8str.size(), &ws_str[0], size_required); -+ MultiByteToWideChar(CP_UTF8, 0, utf8str.c_str(), static_cast<int>(utf8str.size()), &ws_str[0], size_required); - return ws_str; - } -+inline std::string wstring_to_utf8str(const std::wstring& ws_str) { -+ if (ws_str.size() > INT_MAX) { -+ fail_check("wstring_to_utf8str: string is too long for converting to UTF-8."); -+ } -+ int size_required = -+ WideCharToMultiByte(CP_UTF8, 0, ws_str.c_str(), static_cast<int>(ws_str.size()), NULL, 0, NULL, NULL); -+ std::string utf8str(size_required, 0); -+ WideCharToMultiByte( -+ CP_UTF8, 0, ws_str.c_str(), static_cast<int>(ws_str.size()), &utf8str[0], size_required, NULL, NULL); -+ return utf8str; -+} - - #else - std::string path_join(const std::string& origin, const std::string& append); -diff --git a/onnx/cpp2py_export.cc b/onnx/cpp2py_export.cc -index bc2594db..83cea68f 100644 ---- a/onnx/cpp2py_export.cc -+++ b/onnx/cpp2py_export.cc -@@ -545,6 +545,8 @@ PYBIND11_MODULE(onnx_cpp2py_export, onnx_cpp2py_export) { - "full_check"_a = false, - "skip_opset_compatibility_check"_a = false); - -+ checker.def("_resolve_external_data_location", &checker::resolve_external_data_location); -+ - // Submodule `version_converter` - auto version_converter = onnx_cpp2py_export.def_submodule("version_converter"); - version_converter.doc() = "VersionConverter submodule"; -diff --git a/onnx/external_data_helper.py b/onnx/external_data_helper.py -index bbc2717f..05c486c6 100644 ---- a/onnx/external_data_helper.py -+++ b/onnx/external_data_helper.py -@@ -8,6 +8,7 @@ import uuid - from itertools import chain - from typing import Callable, Iterable, Optional - -+import onnx.onnx_cpp2py_export.checker as c_checker - from onnx.onnx_pb import AttributeProto, GraphProto, ModelProto, TensorProto - - -@@ -39,9 +40,9 @@ def load_external_data_for_tensor(tensor: TensorProto, base_dir: str) -> None: - base_dir: directory that contains the external data. - """ - info = ExternalDataInfo(tensor) -- file_location = _sanitize_path(info.location) -- external_data_file_path = os.path.join(base_dir, file_location) -- -+ external_data_file_path = c_checker._resolve_external_data_location( # type: ignore[attr-defined] -+ base_dir, info.location, tensor.name -+ ) - with open(external_data_file_path, "rb") as data_file: - if info.offset: - data_file.seek(info.offset) -@@ -259,14 +260,6 @@ def _get_attribute_tensors(onnx_model_proto: ModelProto) -> Iterable[TensorProto - yield from _get_attribute_tensors_from_graph(onnx_model_proto.graph) - - --def _sanitize_path(path: str) -> str: -- """Remove path components which would allow traversing up a directory tree from a base path. -- -- Note: This method is currently very basic and should be expanded. -- """ -- return path.lstrip("/.") -- -- - def _is_valid_filename(filename: str) -> bool: - """Utility to check whether the provided filename is valid.""" - exp = re.compile('^[^<>:;,?"*|/]+$') -diff --git a/onnx/test/test_external_data.py b/onnx/test/test_external_data.py -index 63f6b4ef..bb14d279 100644 ---- a/onnx/test/test_external_data.py -+++ b/onnx/test/test_external_data.py -@@ -3,6 +3,7 @@ - # SPDX-License-Identifier: Apache-2.0 - from __future__ import annotations - -+import itertools - import os - import pathlib - import tempfile -@@ -204,6 +205,52 @@ class TestLoadExternalDataSingleFile(TestLoadExternalDataBase): - attribute_tensor = new_model.graph.node[0].attribute[0].t - np.testing.assert_allclose(to_array(attribute_tensor), self.attribute_value) - -+ @parameterized.parameterized.expand(itertools.product((True, False), (True, False))) -+ def test_save_external_invalid_single_file_data_and_check( -+ self, use_absolute_path: bool, use_model_path: bool -+ ) -> None: -+ model = onnx.load_model(self.model_filename, self.serialization_format) -+ -+ model_dir = os.path.join(self.temp_dir, "save_copy") -+ os.mkdir(model_dir) -+ -+ traversal_external_data_dir = os.path.join( -+ self.temp_dir, "invlid_external_data" -+ ) -+ os.mkdir(traversal_external_data_dir) -+ -+ if use_absolute_path: -+ traversal_external_data_location = os.path.join( -+ traversal_external_data_dir, "tensors.bin" -+ ) -+ else: -+ traversal_external_data_location = "../invlid_external_data/tensors.bin" -+ -+ external_data_dir = os.path.join(self.temp_dir, "external_data") -+ os.mkdir(external_data_dir) -+ new_model_filepath = os.path.join(model_dir, "model.onnx") -+ -+ def convert_model_to_external_data_no_check(model: ModelProto, location: str): -+ for tensor in model.graph.initializer: -+ if tensor.HasField("raw_data"): -+ set_external_data(tensor, location) -+ -+ convert_model_to_external_data_no_check( -+ model, -+ location=traversal_external_data_location, -+ ) -+ -+ onnx.save_model(model, new_model_filepath, self.serialization_format) -+ if use_model_path: -+ with self.assertRaises(onnx.checker.ValidationError): -+ _ = onnx.load_model(new_model_filepath, self.serialization_format) -+ else: -+ onnx_model = onnx.load_model( -+ new_model_filepath, self.serialization_format, load_external_data=False -+ ) -+ with self.assertRaises(onnx.checker.ValidationError): -+ load_external_data_for_model(onnx_model, external_data_dir) -+ - - @parameterized.parameterized_class( - [ diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index a0cc441e2e502..f8bdd75368a1e 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -123,7 +123,7 @@ buildPythonPackage rec { "test_vgg19_cpu" "test_zfnet512_cpu" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # AssertionError: Output 0 of test 0 in folder "test__pytorch_converted_Conv2d_depthwise_padded" "test__pytorch_converted_Conv2d_dilated" diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix index c0227ee831f0f..48c342c1626f7 100644 --- a/pkgs/development/python-modules/onnxruntime/default.nix +++ b/pkgs/development/python-modules/onnxruntime/default.nix @@ -35,7 +35,7 @@ buildPythonPackage { chmod +w dist ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; # This project requires fairly large dependencies such as sympy which we really don't always need. pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix index dc3bf4d785917..a315c3d0d0704 100644 --- a/pkgs/development/python-modules/open-clip-torch/default.nix +++ b/pkgs/development/python-modules/open-clip-torch/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { # fails due to type errors "test_num_shards" ] - ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ "test_training" "test_training_coca" "test_training_unfreezing_vit" diff --git a/pkgs/development/python-modules/open-interpreter/default.nix b/pkgs/development/python-modules/open-interpreter/default.nix index 12e4cabb07688..d771128a79034 100644 --- a/pkgs/development/python-modules/open-interpreter/default.nix +++ b/pkgs/development/python-modules/open-interpreter/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { pythonRemoveDeps = [ "git-python" ]; pythonRelaxDeps = [ + "google-generativeai" "psutil" "pynput" "yaspin" diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 06d4a1f55d9ac..871182550d2ad 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "whisper"; - version = "20231117"; + version = "20240930"; pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MJ1XjB/GuYUiECCuuHS0NWHvvs+ko0oTvLuDI7zLNiY="; + hash = "sha256-6wfHJM2pg+y1qUfVF1VRG86G3CtQ+UNIwMXR8pPi2k4="; }; patches = [ diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 9c6b66fdd20da..3a58661778e85 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.42.0"; + version = "1.51.0"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Pj4MmylUB6JGTlueOgtAd9RgOxn3QoPe2Xf1hYnOZ9c="; + hash = "sha256-VwsW7wVNSVlZg+RJoQ3C9AuqHL5dFO+f9pyfUbRbrSM="; }; build-system = [ @@ -63,7 +63,7 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; - passthru.optional-dependencies = { + optional-dependencies = { datalib = [ numpy pandas diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index a4a54e9a879dc..34ccb51cd7d04 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyusb ]; - passthru.optional-dependencies = { + optional-dependencies = { serial = [ pyserial ]; influx = [ influxdb-client ]; }; diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index d7effd7ab68ea..bb9f310497c32 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.19.3"; + version = "0.19.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-UJkfAVorALGRqeoGr4136n98iTyPt9qzQxwnhkKgRNM="; + hash = "sha256-JvWusDokov8G0UO9oOkGicAI7wYZTnNywbvKMZKQWiQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/opencontainers/default.nix b/pkgs/development/python-modules/opencontainers/default.nix index b5672a5590f21..c3dbd0e1bfde6 100644 --- a/pkgs/development/python-modules/opencontainers/default.nix +++ b/pkgs/development/python-modules/opencontainers/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { sed -i "/pytest-runner/d" setup.py ''; - passthru.optional-dependencies.reggie = [ requests ]; + optional-dependencies.reggie = [ requests ]; pythonImportsCheck = [ "opencontainers" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.reggie; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.reggie; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix index 90da26c44fe3b..0914a8ca67014 100644 --- a/pkgs/development/python-modules/opensearch-py/default.nix +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "opensearch-py"; - version = "2.6.0"; + version = "2.7.1"; pyproject = true; src = fetchFromGitHub { owner = "opensearch-project"; repo = "opensearch-py"; rev = "refs/tags/v${version}"; - hash = "sha256-qpay0EDD99MzxDMkjk3hU/34rxLD71PM8zdcIcHj/0Q="; + hash = "sha256-GC0waXxHRiXVXjhTGbet3HvDKmUBKzoufu/J4fmrM+k="; }; nativeBuildInputs = [ setuptools ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { events ]; - passthru.optional-dependencies.async = [ aiohttp ]; + optional-dependencies.async = [ aiohttp ]; nativeCheckInputs = [ botocore @@ -60,7 +60,7 @@ buildPythonPackage rec { pytestCheckHook pyyaml pytz - ] ++ passthru.optional-dependencies.async; + ] ++ optional-dependencies.async; disabledTestPaths = [ # require network diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix index bd5b97ab2852a..bfaa8b8f1b73e 100644 --- a/pkgs/development/python-modules/opensfm/default.nix +++ b/pkgs/development/python-modules/opensfm/default.nix @@ -113,7 +113,7 @@ buildPythonPackage rec { [ "test_run_all" # Matplotlib issues. Broken integration is less useless than a broken build ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reconstruction_incremental" "test_reconstruction_triangulation" ]; @@ -121,7 +121,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "opensfm" ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = [ lib.maintainers.SomeoneSerge ]; license = lib.licenses.bsd2; changelog = "https://github.com/mapillary/OpenSfM/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index 20c0dd9c176c1..b316a7aaeee25 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -6,19 +6,20 @@ pbr, sphinx, pythonAtLeast, + setuptools, }: buildPythonPackage rec { pname = "openstackdocstheme"; - version = "3.2.0"; - format = "setuptools"; + version = "3.3.0"; + pyproject = true; # breaks on import due to distutils import through pbr.packaging disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; - hash = "sha256-PwSWLJr5Hjwz8cRXXutnE4Jc+vLcL3TJTZl6biK/4E4="; + hash = "sha256-wmZJmX5bQKM1uwqWxynkY5jPJaBn+Y2eqSRkE2Ub0qM="; }; postPatch = '' @@ -27,7 +28,9 @@ buildPythonPackage rec { rm test-requirements.txt ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ dulwich pbr sphinx diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 5bf0f23accba2..121f64dd535b4 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "3.3.0"; + version = "4.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; outputs = [ "out" @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-BghpDKN8pzMnsPo3YdF+ZTlb43/yALhzXY8kJ3tPSYA="; + hash = "sha256-54YN2WtwUxMJI8EdVx0lgCuWjx4xOIRct8rHxrMzv0s="; }; postPatch = '' @@ -44,14 +44,15 @@ buildPythonPackage rec { --replace-fail "'sphinxcontrib.rsvgconverter'," "#'sphinxcontrib.rsvgconverter'," ''; - build-system = [ + nativeBuildInputs = [ openstackdocstheme - setuptools sphinxHook ]; sphinxBuilders = [ "man" ]; + build-system = [ setuptools ]; + dependencies = [ platformdirs cryptography diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix index 43633f98a0385..c5bbc68e3d6cc 100644 --- a/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/pkgs/development/python-modules/openstacksdk/tests.nix @@ -39,7 +39,7 @@ buildPythonPackage { '' stestr run -e <(echo " '' - + lib.optionalString stdenv.isAarch64 '' + + lib.optionalString stdenv.hostPlatform.isAarch64 '' openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_node_set_provision_state_with_retries openstack.tests.unit.cloud.test_role_assignment.TestRoleAssignment.test_grant_role_user_domain_exists openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_force @@ -56,6 +56,7 @@ buildPythonPackage { openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_error_396 openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_wait + openstack.tests.unit.test_resource.TestWaitForDelete.test_callback openstack.tests.unit.test_resource.TestWaitForDelete.test_callback_without_progress openstack.tests.unit.test_resource.TestWaitForDelete.test_status openstack.tests.unit.test_resource.TestWaitForDelete.test_success_not_found diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index d81a0ed098126..fdaa41d289ef0 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -7,7 +7,6 @@ hatchling, importlib-metadata, opentelemetry-test-utils, - setuptools, pytestCheckHook, writeScript, }: @@ -65,7 +64,7 @@ let meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api"; description = "OpenTelemetry Python API"; - changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/${self.src.rev}"; + changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/${lib.removePrefix "refs/tags/" self.src.rev}"; license = licenses.asl20; maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; }; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 5a85e42a04d35..a8b14f1cfd2ce 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { opentelemetry-util-http ]; - passthru.optional-dependencies = { + optional-dependencies = { asgi = [ opentelemetry-instrumentation-asgi ]; }; nativeCheckInputs = [ opentelemetry-test-utils pytestCheckHook - ] ++ passthru.optional-dependencies.asgi; + ] ++ optional-dependencies.asgi; pythonImportsCheck = [ "opentelemetry.instrumentation.django" ]; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index 9cf347c046ac9..9716dbc767c22 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -42,7 +42,7 @@ buildPythonPackage { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { instruments = [ grpcio ]; }; @@ -52,7 +52,7 @@ buildPythonPackage { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # RuntimeError: Failed to bind to address "TestOpenTelemetryServerInterceptorUnix" ]; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 9fba4ade03c0c..8c8ae9534ae6f 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"; homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; - changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${src.rev}"; + changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.asl20; maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; }; diff --git a/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/pkgs/development/python-modules/opentelemetry-sdk/default.nix index cfa6e6249512b..9e4b577a606ec 100644 --- a/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -6,7 +6,6 @@ opentelemetry-api, opentelemetry-semantic-conventions, opentelemetry-test-utils, - setuptools, typing-extensions, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/opentsne/default.nix b/pkgs/development/python-modules/opentsne/default.nix index 9dfe9b1ebde3e..492d6ee009467 100644 --- a/pkgs/development/python-modules/opentsne/default.nix +++ b/pkgs/development/python-modules/opentsne/default.nix @@ -4,38 +4,35 @@ fetchFromGitHub, cython, numpy, - oldest-supported-numpy, scipy, scikit-learn, pytestCheckHook, pythonOlder, setuptools, - wheel, }: let self = buildPythonPackage rec { pname = "opentsne"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pavlin-policar"; repo = "openTSNE"; rev = "refs/tags/v${version}"; - hash = "sha256-UTfEjjNz1mm5fhyTw9GRlMNURwWlr6kLMjrMngkFV3Y="; + hash = "sha256-e1YXF9cdguzcEW0KanIHYlZQiUc+FH8IVOaPshAswco="; }; - nativeBuildInputs = [ + build-system = [ cython - oldest-supported-numpy + numpy setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy scikit-learn diff --git a/pkgs/development/python-modules/opentype-feature-freezer/default.nix b/pkgs/development/python-modules/opentype-feature-freezer/default.nix new file mode 100644 index 0000000000000..3d7d953dce5f1 --- /dev/null +++ b/pkgs/development/python-modules/opentype-feature-freezer/default.nix @@ -0,0 +1,63 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + unstableGitUpdater, + pytestCheckHook, + fonttools, + poetry-core, + configparser, + biplist, +}: + +buildPythonPackage { + pname = "opentype-feature-freezer"; + version = "0-unstable-2022-07-09"; + pyproject = true; + + src = fetchFromGitHub { + owner = "twardoch"; + repo = "fonttools-opentype-feature-freezer"; + rev = "2ae16853bc724c3e377726f81d9fc661d3445827"; + hash = "sha256-mIWQF9LTVKxIkwHLCTVK1cOuiaduJyX8pyBZ/0RKIVE="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail poetry.masonry.api poetry.core.masonry.api \ + --replace-fail "poetry>=" "poetry-core>=" + ''; + + build-system = [ + poetry-core + configparser + ]; + + dependencies = [ fonttools ]; + + nativeCheckInputs = [ + pytestCheckHook + biplist + ]; + + disabledTestPaths = [ + # Wants to check path outside of nix store + "src/opentype_feature_freezer/cli.py" + # NameError: name 'defines' is not defined + "app/dmgbuild_settings.py" + # Missing module + "app/OTFeatureFreezer.py" + # AttributeError: 'types.SimpleNamespace' object has no attribute 'suffix' + "tests/test_rename.py" + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Permanently \"apply\" OpenType features to fonts, by remapping their Unicode assignments"; + homepage = "https://github.com/twardoch/fonttools-opentype-feature-freezer"; + license = lib.licenses.asl20; + mainProgram = "pyftfeatfreeze"; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index f281bc352d1bd..7315865b75c2e 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -60,7 +60,8 @@ buildPythonPackage rec { hash = "sha256-akwLIB5YUbnDiaQXX/K5YLXzWlTYWZG51dtxbSFxPt0="; }; - stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; + stdenv = + if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; outputs = [ "out" ] ++ lib.optional withDocs "doc"; @@ -92,7 +93,7 @@ buildPythonPackage rec { (lib.cmakeBool "PXR_BUILD_USDVIEW" withUsdView) (lib.cmakeBool "PXR_BUILD_USD_TOOLS" withTools) (lib.cmakeBool "PXR_ENABLE_MATERIALX_SUPPORT" true) - (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.isDarwin && withOsl)) + (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.hostPlatform.isDarwin && withOsl)) ]; nativeBuildInputs = @@ -124,15 +125,15 @@ buildPythonPackage rec { ptex tbb ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL libX11 libXt ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ]) ++ lib.optionals withOsl [ osl ] ++ lib.optionals withUsdView [ qt6.qtbase ] - ++ lib.optionals (withUsdView && stdenv.isLinux) [ + ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [ qt6.qtbase qt6.qtwayland ]; diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 64c19060ca4d7..6f8ec1fb2a896 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -4,6 +4,7 @@ aiozoneinfo, arrow, buildPythonPackage, + cryptography, fetchFromGitHub, pyotp, python-dotenv, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.7.0"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-H1OOj/KYwHAh6SAmwejAaQFLR/mJ92vm0+cLaTqdSWI="; + hash = "sha256-p1fvfAQVmizfsW+6F3gKkNQTYUF+A0cafh3PZZTpTRw="; }; build-system = [ setuptools ]; @@ -32,6 +33,7 @@ buildPythonPackage rec { aiohttp aiozoneinfo arrow + cryptography pyotp ]; diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix new file mode 100644 index 0000000000000..a7cb8b7c5e7e6 --- /dev/null +++ b/pkgs/development/python-modules/optimistix/default.nix @@ -0,0 +1,63 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + equinox, + jax, + jaxtyping, + lineax, + typing-extensions, + + # checks + beartype, + jaxlib, + optax, + pytestCheckHook, + pytest-xdist, +}: + +buildPythonPackage rec { + pname = "optimistix"; + version = "0.0.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "patrick-kidger"; + repo = "optimistix"; + rev = "refs/tags/v${version}"; + hash = "sha256-0ehNApiBoiAb8LFBW81ZCRPsjTVQG8zRTVSAp7oHF8w="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + equinox + jax + jaxtyping + lineax + typing-extensions + ]; + + pythonImportsCheck = [ "optimistix" ]; + + nativeCheckInputs = [ + beartype + jaxlib + optax + pytestCheckHook + pytest-xdist + ]; + + meta = { + description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox"; + homepage = "https://github.com/patrick-kidger/optimistix"; + changelog = "https://github.com/patrick-kidger/optimistix/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index f3388356962ea..d23fe4ab529b4 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.21.4"; + version = "1.22.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-ElF+RmZjsXhaA8yhTEK2kp5gigGheyJL36R8e0hSgzA="; + hash = "sha256-fVpSoa6s7puYO8BiA6aSAhSOTfiZJgaX5iwYkd9VdVo="; }; build-system = [ setuptools ]; @@ -120,7 +120,7 @@ buildPythonPackage rec { description = "Accelerate training and inference of 🤗 Transformers and 🤗 Diffusers with easy to use hardware optimization tools"; mainProgram = "optimum-cli"; homepage = "https://github.com/huggingface/optimum"; - changelog = "https://github.com/huggingface/optimum/releases/tag/${src.rev}"; + changelog = "https://github.com/huggingface/optimum/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/optree/default.nix b/pkgs/development/python-modules/optree/default.nix index c1f9085e5bea3..a9eb9d9a36264 100644 --- a/pkgs/development/python-modules/optree/default.nix +++ b/pkgs/development/python-modules/optree/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "optree"; - version = "0.12.1"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "metaopt"; repo = "optree"; rev = "refs/tags/v${version}"; - hash = "sha256-4GvB9Z7qnEjsUSl+x5wd8czV80F50MwJdlNdylUU0zY="; + hash = "sha256-HuzfQ1arAF/DbJd9MF0jAxfzWvOHtAfkEMUF+aPfaII="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 8ace135676fec..37675f4b58079 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -27,7 +27,6 @@ pyyaml, redis, scikit-learn, - scikit-optimize, scipy, setuptools, shap, @@ -44,7 +43,7 @@ buildPythonPackage rec { pname = "optuna"; - version = "3.6.1"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -53,7 +52,7 @@ buildPythonPackage rec { owner = "optuna"; repo = "optuna"; rev = "refs/tags/v${version}"; - hash = "sha256-+ZqMRIza4K5VWTUm7tC87S08SI+C8GKd2Uh3rGoHwd0="; + hash = "sha256-ZCK6otX90s8SB91TLkKwJ4net2dGmAKdIESeHXy87K0="; }; nativeBuildInputs = [ @@ -71,7 +70,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { integration = [ botorch catboost @@ -83,7 +82,6 @@ buildPythonPackage rec { # pytorch-ignite pytorch-lightning scikit-learn - scikit-optimize shap tensorflow torch @@ -115,7 +113,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook scipy - ] ++ fakeredis.optional-dependencies.lua ++ passthru.optional-dependencies.optional; + ] ++ fakeredis.optional-dependencies.lua ++ optional-dependencies.optional; pytestFlagsArray = [ "-m 'not integration'" ]; diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index cac6da956644d..65006e4753fe5 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "2.3.0"; + version = "2.4.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ubDE7CgLEAY+Z4m+0j3cJDWumFaevmTguaJweAuRA9U="; + hash = "sha256-vVl2vvDkZuD50bn2Ux+1uBcdyFNHF8ywSybmgLbHVx0="; }; build-system = [ diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 7aaef933a66c4..3db1f35784bd6 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -1,7 +1,12 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies anyqt, cachecontrol, commonmark, @@ -10,24 +15,34 @@ filelock, lockfile, numpy, - pytest-qt, - pytestCheckHook, + pip, qasync, - qt5, requests-cache, + typing-extensions, + + # tests + qt5, + pytest-qt, + pytestCheckHook, + + stdenv, }: buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.2.1"; - format = "setuptools"; + version = "0.2.2"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-f0E/7jnzoIrV4V1KSbec0MZB/BLz0UVbBCsc3v4dp0o="; + src = fetchFromGitHub { + owner = "biolab"; + repo = "orange-canvas-core"; + rev = "refs/tags/${version}"; + hash = "sha256-Jp3vCQmRdkFADStVkbCFPiCBqpbI0a4JiJ8qs60rpqw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ anyqt cachecontrol commonmark @@ -36,8 +51,10 @@ buildPythonPackage rec { filelock lockfile numpy + pip qasync requests-cache + typing-extensions ]; pythonImportsCheck = [ "orangecanvas" ]; @@ -54,12 +71,29 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Failed: CALL ERROR: Exceptions caught in Qt event loop + "test_create_new_window" + "test_dont_load_swp_on_new_window" + "test_editlinksnode" + "test_flattened" + "test_links_edit" + "test_links_edit_widget" + "test_new_window" + "test_toolbox" + "test_tooltree_registry" + "test_widgettoolgrid" + ]; + disabledTestPaths = [ "orangecanvas/canvas/items/tests/test_graphicstextitem.py" ]; meta = { description = "Orange framework for building graphical user interfaces for editing workflows"; homepage = "https://github.com/biolab/orange-canvas-core"; + changelog = "https://github.com/biolab/orange-canvas-core/releases/tag/${version}"; license = [ lib.licenses.gpl3 ]; maintainers = [ lib.maintainers.lucasew ]; + # Segmentation fault during tests + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix index 50a1e956919a5..28c97fdb4238c 100644 --- a/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/pkgs/development/python-modules/orange-widget-base/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyqtgraph pyqtwebengine typing-extensions - ] ++ lib.optionals stdenv.isDarwin [ appnope ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ appnope ]; pythonImportsCheck = [ "orangewidget" ]; diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index e3140c40c4f85..511542d0a4902 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -1,14 +1,16 @@ { lib, + stdenv, absl-py, buildPythonPackage, + fetchFromGitHub, # build-system flit-core, # dependencies etils, - fetchPypi, + humanize, importlib-resources, jax, jaxlib, @@ -20,32 +22,34 @@ tensorstore, typing-extensions, - # checks + # tests + chex, google-cloud-logging, mock, pytest-xdist, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.5.20"; + version = "0.6.4"; pyproject = true; - disabled = pythonOlder "3.9"; - - src = fetchPypi { - pname = "orbax_checkpoint"; - inherit version; - hash = "sha256-V91BdeaYqMSVeZGrfmwZ17OoeSrnByuc0rJnzls0iE0="; + src = fetchFromGitHub { + owner = "google"; + repo = "orbax"; + rev = "refs/tags/v${version}"; + hash = "sha256-xd75/AKBFUdA6a8sQnCB2rVbHl/Foy4LTb07jnwrTjA="; }; + sourceRoot = "${src.name}/checkpoint"; + build-system = [ flit-core ]; dependencies = [ absl-py etils + humanize importlib-resources jax jaxlib @@ -59,6 +63,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + chex google-cloud-logging mock pytest-xdist @@ -70,6 +75,13 @@ buildPythonPackage rec { "orbax.checkpoint" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # Probably failing because of a filesystem impurity + # self.assertFalse(os.path.exists(dst_dir)) + # AssertionError: True is not false + "test_create_snapshot" + ]; + disabledTestPaths = [ # Circular dependency flax "orbax/checkpoint/transform_utils_test.py" @@ -79,7 +91,7 @@ buildPythonPackage rec { meta = { description = "Orbax provides common utility libraries for JAX users"; homepage = "https://github.com/google/orbax/tree/main/checkpoint"; - changelog = "https://github.com/google/orbax/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/google/orbax/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/orgparse/default.nix b/pkgs/development/python-modules/orgparse/default.nix index 488a0e6e4d987..0ad3b30aaeba0 100644 --- a/pkgs/development/python-modules/orgparse/default.nix +++ b/pkgs/development/python-modules/orgparse/default.nix @@ -1,10 +1,11 @@ { lib, - python3Packages, + setuptools-scm, fetchPypi, + buildPythonPackage, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "orgparse"; version = "0.4.20231004"; @@ -13,7 +14,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-pOOK6tq/mYiw9npmrNCCedGCILy8QioSkGDCiQu6kaA="; }; - nativeBuildInputs = [ python3Packages.setuptools-scm ]; + nativeBuildInputs = [ setuptools-scm ]; pyproject = true; diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 650d8a634d51a..9fd8fe941adb5 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { maturinBuildHook ]); - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ numpy diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index a2ef75c52bb1e..bb65573eee640 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { postgresql = [ asyncpg ]; postgres = [ asyncpg ]; aiopg = [ aiopg ]; @@ -89,7 +89,7 @@ buildPythonPackage rec { httpx nest-asyncio pytest-asyncio - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; disabledTestPaths = [ "benchmarks/test_benchmark_*.py" ]; diff --git a/pkgs/development/python-modules/oryx/default.nix b/pkgs/development/python-modules/oryx/default.nix new file mode 100644 index 0000000000000..fdf4780a801da --- /dev/null +++ b/pkgs/development/python-modules/oryx/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + jax, + jaxlib, + tensorflow-probability, + + # tests + inference-gym, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "oryx"; + version = "0.2.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jax-ml"; + repo = "oryx"; + rev = "refs/tags/v${version}"; + hash = "sha256-1n7ogGuFNAeOyXWe0/pAouhg2+aA3MXxlCcsrfqRTdU="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + jax + jaxlib + tensorflow-probability + ]; + + pythonImportsCheck = [ "oryx" ]; + + nativeCheckInputs = [ + inference-gym + pytestCheckHook + ]; + + meta = { + description = "Library for probabilistic programming and deep learning built on top of Jax"; + homepage = "https://github.com/jax-ml/oryx"; + changelog = "https://github.com/jax-ml/oryx/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/os-client-config/default.nix b/pkgs/development/python-modules/os-client-config/default.nix new file mode 100644 index 0000000000000..e06fa9be9f4be --- /dev/null +++ b/pkgs/development/python-modules/os-client-config/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + fixtures, + hacking, + jsonschema, + openstacksdk, + oslotest, + python-glanceclient, + setuptools, + stestr, + subunit, + testscenarios, + testtools, +}: + +buildPythonPackage rec { + pname = "os-client-config"; + version = "2.1.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-q8OKNR+MAG009+5fP2SN5ePs9kVcxdds/YidKRzfP04="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + openstacksdk + python-glanceclient + ]; + + nativeCheckInputs = [ + hacking + fixtures + jsonschema + subunit + oslotest + stestr + testscenarios + testtools + ]; + + checkPhase = '' + runHook preCheck + + stestr run + + runHook postCheck + ''; + + pythonImportsCheck = [ "os_client_config" ]; + + meta = with lib; { + homepage = "https://opendev.org/openstack/os-client-config"; + description = "Collect client configuration for using OpenStack in consistent and comprehensive manner"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/osc-placement/default.nix b/pkgs/development/python-modules/osc-placement/default.nix new file mode 100644 index 0000000000000..8165e098ddd3a --- /dev/null +++ b/pkgs/development/python-modules/osc-placement/default.nix @@ -0,0 +1,73 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-serialization, + oslo-utils, + oslotest, + pbr, + pythonOlder, + setuptools, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "osc-placement"; + version = "4.5.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "osc-placement"; + rev = "refs/tags/${version}"; + hash = "sha256-PUwyYOg1dymlnnTr6TnxS42ISmbS00YfOdkL+5MbYFI="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + keystoneauth1 + osc-lib + oslo-utils + pbr + ]; + + nativeCheckInputs = [ + oslo-serialization + oslotest + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "osc_placement" ]; + + meta = { + homepage = "https://opendev.org/openstack/osc-placement"; + description = "OpenStackClient plugin for the Placement service"; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index f794b91fb0cbd..bb16aa7d40e08 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { preCheck = "HOME=$TOP/tmp"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/openSUSE/osc"; description = "opensuse-commander with svn like handling"; mainProgram = "osc"; diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index fe80b0ac42d44..ef90df289af64 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "oscrypto" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index c799b6c67f30f..dbcde501d3451 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "9.5.0"; + version = "9.6.0"; pyproject = true; src = fetchPypi { pname = "oslo.config"; inherit version; - hash = "sha256-qlAARIhrbFX3ZXfLWpNJKkWWxfkoM3Z2DqeFLMScmaM="; + hash = "sha256-nwXvcOSNmmGo0Mm+04naJPLvWonfW26N63x0HWETZn4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index b6cdf96619530..81a9bd5b8e4b0 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { oslo-utils pbr python-dateutil - ] ++ lib.optionals stdenv.isLinux [ pyinotify ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pyinotify ]; nativeCheckInputs = [ eventlet diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix index e18bc804cfdae..ad9bb84c747e4 100644 --- a/pkgs/development/python-modules/ospd/default.nix +++ b/pkgs/development/python-modules/ospd/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "21.4.4"; format = "setuptools"; - disabled = pythonOlder "3.7" || stdenv.isDarwin; + disabled = pythonOlder "3.7" || stdenv.hostPlatform.isDarwin; src = fetchFromGitHub { owner = "greenbone"; diff --git a/pkgs/development/python-modules/osprofiler/default.nix b/pkgs/development/python-modules/osprofiler/default.nix new file mode 100644 index 0000000000000..01c8c09f1c156 --- /dev/null +++ b/pkgs/development/python-modules/osprofiler/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + netaddr, + oslo-concurrency, + oslo-config, + oslo-serialization, + oslo-utils, + prettytable, + requests, + setuptools, + webob, +}: + +buildPythonPackage rec { + pname = "osprofiler"; + version = "4.2.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-bdHEviZFqPJBIQVdpbtGFojcr8fmtNS6vA7xumaQJ4E="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + netaddr + oslo-concurrency + oslo-config + oslo-serialization + oslo-utils + prettytable + requests + webob + ]; + + # NOTE(vinetos): OSProfiler depends on jeager-client which use opentracing + # Opentracing and jeager-client are archived since 2022. + # As this package is made only to support old OpenStack clients and bindings, + # We do not really care + doCheck = false; + + pythonImportsCheck = [ "osprofiler" ]; + + meta = with lib; { + description = "OpenStack Library to profile request between all involved services"; + homepage = "https://opendev.org/openstack/osprofiler/"; + license = licenses.asl20; + mainProgram = "osprofiler"; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix index 118e59dc82793..0af996f622a84 100644 --- a/pkgs/development/python-modules/osxphotos/default.nix +++ b/pkgs/development/python-modules/osxphotos/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "osxphotos"; - version = "0.68.5"; + version = "0.68.6"; pyproject = true; src = fetchFromGitHub { owner = "RhetTbull"; repo = "osxphotos"; rev = "refs/tags/v${version}"; - hash = "sha256-JhtbbtiCxIGurRAFvk7UP9qzyXw1CCaGlyLHGs/G/uE="; + hash = "sha256-5cKxlfm4i743bJlS2HVPBO1Fbvz1c6wgkkG8Vle8Ajo="; }; build-system = [ setuptools ]; @@ -107,6 +107,6 @@ buildPythonPackage rec { changelog = "https://github.com/RhetTbull/osxphotos/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/overly/default.nix b/pkgs/development/python-modules/overly/default.nix index f234c910865eb..ea3b291700a01 100644 --- a/pkgs/development/python-modules/overly/default.nix +++ b/pkgs/development/python-modules/overly/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/theelous3/overly"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; - broken = stdenv.isDarwin; # https://github.com/theelous3/overly/issues/2 + broken = stdenv.hostPlatform.isDarwin; # https://github.com/theelous3/overly/issues/2 }; } diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index f1cfb05367390..f32ebc23797ab 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -5,21 +5,28 @@ pytestCheckHook, pythonOlder, requests, + requests-oauthlib, + setuptools, }: buildPythonPackage rec { pname = "ovh"; - version = "1.1.2"; - format = "setuptools"; + version = "1.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Yarx6ymS/Vr4Gbpa3Qgmbp7eLgAkUeOhYGpMNn3aoE8="; + hash = "sha256-0xHwjsF7YsxhIWs9rPA+6J+VodqQNqWV2sKfydeYuCc="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ + requests + requests-oauthlib + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,6 +39,11 @@ buildPythonPackage rec { "test_config_from_invalid_ini_file" "test_config_from_only_one_file" "test_endpoints" + # Tests require API key + "test_config_oauth2" + "test_config_invalid_both" + "test_config_invalid_oauth2" + "test_config_incompatible_oauth2" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/packaging-legacy/default.nix b/pkgs/development/python-modules/packaging-legacy/default.nix new file mode 100644 index 0000000000000..1f6b2f314c001 --- /dev/null +++ b/pkgs/development/python-modules/packaging-legacy/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + packaging, + pretend, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "packaging-legacy"; + version = "23.0.post0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "di"; + repo = "packaging_legacy"; + rev = "refs/tags/${version}"; + hash = "sha256-2TnJjxasC8+c+qHY60e6Jyqhf1nQJfj/tmIA/LvUsT8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ packaging ]; + + nativeCheckInputs = [ + pretend + pytestCheckHook + ]; + + pythonImportsCheck = [ "packaging_legacy" ]; + + meta = { + description = "Module to support for legacy Python Packaging functionality"; + homepage = "https://github.com/di/packaging_legacy"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix index 2388807940429..8263ae8ec8c59 100644 --- a/pkgs/development/python-modules/paddlepaddle/default.nix +++ b/pkgs/development/python-modules/paddlepaddle/default.nix @@ -76,7 +76,7 @@ buildPythonPackage { ) ); - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' function fixRunPath { p=$(patchelf --print-rpath $1) patchelf --set-rpath "$p:$libraryPath" $1 diff --git a/pkgs/development/python-modules/paho-mqtt/1.nix b/pkgs/development/python-modules/paho-mqtt/1.nix index 83582102767b8..437f7899fad04 100644 --- a/pkgs/development/python-modules/paho-mqtt/1.nix +++ b/pkgs/development/python-modules/paho-mqtt/1.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { six ] ++ lib.optionals (!isPy3k) [ mock ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "paho.mqtt" ]; diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 437aa9884beb0..890cf28a7462b 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -37,7 +37,7 @@ in buildPythonPackage rec { pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "paho.mqtt" ]; diff --git a/pkgs/development/python-modules/paintcompiler/default.nix b/pkgs/development/python-modules/paintcompiler/default.nix new file mode 100644 index 0000000000000..c2e6009fa4f7b --- /dev/null +++ b/pkgs/development/python-modules/paintcompiler/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + fonttools, + black, +}: + +buildPythonPackage rec { + pname = "paintcompiler"; + version = "0.3.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "simoncozens"; + repo = "paintcompiler"; + rev = "v${version}"; + hash = "sha256-dmVBQUUyFc71zq8fXBQ4ii/llrGdtUCOponCzSeut6g="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + fonttools + black + ]; + + pythonImportsCheck = [ + "paintcompiler" + "paintdecompiler" + ]; + + meta = { + description = "Paint compiler for COLRv1 fonts"; + homepage = "https://github.com/simoncozens/paintcompiler"; + license = lib.licenses.asl20; + mainProgram = "paintcompiler"; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/pandantic/default.nix b/pkgs/development/python-modules/pandantic/default.nix new file mode 100644 index 0000000000000..a33f2ee706ce8 --- /dev/null +++ b/pkgs/development/python-modules/pandantic/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + multiprocess, + pandas-stubs, + pandas, + poetry-core, + pydantic, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "pandantic"; + version = "0.3.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "wesselhuising"; + repo = "pandantic"; + rev = "refs/tags/${version}"; + hash = "sha256-JRhnDVRYX0OV/dZkfqNoS2qFcoHOZHm9QZphF/JhgxM="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + multiprocess + pandas + pandas-stubs + pydantic + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pandantic" ]; + + meta = { + description = "Module to enriche the Pydantic BaseModel class"; + homepage = "https://github.com/wesselhuising/pandantic"; + changelog = "https://github.com/wesselhuising/pandantic/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index 843ae520be02e..f216673fc7f09 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -24,6 +24,7 @@ pandas, pyarrow, pyreadstat, + python-calamine, scipy, sqlalchemy, tables, @@ -35,16 +36,16 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "2.2.2.240603"; + version = "2.2.2.240909"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "pandas-dev"; repo = "pandas-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-wJ7lN1+BGNqhwgPLmmpb3foX6rIEy3R62rOvu0mr8xs="; + hash = "sha256-Dt2a4l5WAOizUeaDa80CRuvyPT9mWfFz+zGZMm3vQP4="; }; build-system = [ poetry-core ]; @@ -73,9 +74,7 @@ buildPythonPackage rec { typing-extensions xarray xlsxwriter - - # missing dependencies in nixpkgs - # python-calamine + python-calamine ]; disabledTests = @@ -83,15 +82,17 @@ buildPythonPackage rec { # Missing dependencies, error and warning checks "test_all_read_without_lxml_dtype_backend" # pyarrow.orc "test_orc" # pyarrow.orc - "test_read_excel" # python-calamine "test_plotting" # UserWarning: No artists with labels found to put in legend. "test_spss" # FutureWarning: ChainedAssignmentError: behaviour will change in pandas 3.0! "test_show_version" + # FutureWarning: In the future `np.bool` will be defined as the corresponding... + "test_timedelta_cmp" + "test_timestamp_cmp" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_clipboard" # FileNotFoundError: [Errno 2] No such file or directory: 'pbcopy' ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Disable tests for types that are not supported on aarch64 in `numpy` < 2.0 "test_astype_float" # `f16` and `float128` "test_astype_complex" # `c32` and `complex256` diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 3323c5c9a83bf..abf91dc56aae6 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -108,7 +108,7 @@ let tzdata ]; - passthru.optional-dependencies = + optional-dependencies = let extras = { aws = [ s3fs ]; @@ -183,12 +183,12 @@ let pytest-xdist pytestCheckHook ] - ++ lib.flatten (lib.attrValues passthru.optional-dependencies) - ++ lib.optionals (stdenv.isLinux) [ + ++ lib.flatten (lib.attrValues optional-dependencies) + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ # for locale executable glibc ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # for locale executable adv_cmds ]; @@ -213,13 +213,13 @@ let # AssertionError: Did not see expected warning of class 'FutureWarning' "test_parsing_tzlocal_deprecated" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # tests/generic/test_finalize.py::test_binops[and_-args4-right] - AssertionError: assert {} == {'a': 1} "test_binops" # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921. "test_rolling" ] - ++ lib.optional stdenv.is32bit [ + ++ lib.optional stdenv.hostPlatform.is32bit [ # https://github.com/pandas-dev/pandas/issues/37398 "test_rolling_var_numerical_issues" ]; @@ -234,7 +234,7 @@ let '' # TODO: Get locale and clipboard support working on darwin. # Until then we disable the tests. - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy echo "#!${runtimeShell}" > pbcopy echo "#!${runtimeShell}" > pbpaste @@ -246,7 +246,7 @@ let meta = with lib; { # pandas devs no longer test i686, it's commonly broken - # broken = stdenv.isi686; + # broken = stdenv.hostPlatform.isi686; changelog = "https://pandas.pydata.org/docs/whatsnew/index.html"; description = "Powerful data structures for data analysis, time series, and statistics"; downloadPage = "https://github.com/pandas-dev/pandas"; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 2a5352b9d0580..bf81409491cec 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { ansicolors ] ++ lib.optionals (pythonAtLeast "3.12") [ aiohttp ]; - passthru.optional-dependencies = { + optional-dependencies = { azure = [ azure-datalake-store azure-identity @@ -69,16 +69,12 @@ buildPythonPackage rec { s3 = [ boto3 ]; }; - nativeCheckInputs = - [ - ipykernel - moto - pytest-mock - pytestCheckHook - ] - ++ passthru.optional-dependencies.azure - ++ passthru.optional-dependencies.s3 - ++ passthru.optional-dependencies.gcs; + nativeCheckInputs = [ + ipykernel + moto + pytest-mock + pytestCheckHook + ] ++ optional-dependencies.azure ++ optional-dependencies.s3 ++ optional-dependencies.gcs; preCheck = '' export HOME=$(mktemp -d) @@ -91,7 +87,7 @@ buildPythonPackage rec { # pytest 8 compat "test_read_with_valid_file_extension" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # might fail due to the sandbox "test_end2end_autosave_slow_notebook" ]; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 06c4f97cde5e9..f7f36edfb2012 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -100,7 +100,7 @@ buildPythonPackage rec { "test_valid_dblp_key" "test_validate_arxivid" "test_yaml" - ] ++ lib.optionals stdenv.isDarwin [ "test_default_opener" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_default_opener" ]; pythonImportsCheck = [ "papis" ]; diff --git a/pkgs/development/python-modules/paragraphs/default.nix b/pkgs/development/python-modules/paragraphs/default.nix new file mode 100644 index 0000000000000..d9f79769cdeeb --- /dev/null +++ b/pkgs/development/python-modules/paragraphs/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools-scm, + setuptools, +}: + +buildPythonPackage rec { + pname = "paragraphs"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ShayHill"; + repo = "paragraphs"; + rev = "refs/tags/${version}"; + hash = "sha256-u5/oNOCLdvfQVEIEpraeNLjTUoh3eJQ6qSExnkzTmNw="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ + "paragraphs" + ]; + + meta = { + description = "Module to incorporate long strings"; + homepage = "https://github.com/ShayHill/paragraphs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 248dc1f513189..8903d65550e77 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -44,9 +44,9 @@ buildPythonPackage rec { cryptography pyasn1 six - ] ++ passthru.optional-dependencies.ed25519; # remove on 3.0 update + ] ++ optional-dependencies.ed25519; # remove on 3.0 update - passthru.optional-dependencies = { + optional-dependencies = { gssapi = [ pyasn1 gssapi @@ -62,7 +62,7 @@ buildPythonPackage rec { icecream mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # disable tests that require pytest-relaxed, which is broken diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index 69f562f512ff1..2e2a8dcba79c8 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "parse-type"; - version = "0.6.2"; + version = "0.6.3"; format = "setuptools"; src = fetchFromGitHub { owner = "jenisys"; repo = "parse_type"; rev = "refs/tags/v${version}"; - hash = "sha256-dunvcSi+nN5VruvRUPIEpkyUsmeS+kIYDfS8ibDR96s="; + hash = "sha256-oKPyzEKrP9umnDzPC3HwSgWmWkCg/h0ChYVrpseklf8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 0dd614644d2d5..ac75974739b2f 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { toolz ]; - passthru.optional-dependencies = { + optional-dependencies = { complete = [ blosc2 numpy diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index 0fe769d05238e..112b733ed2848 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "particle"; - version = "0.25.0"; - format = "pyproject"; + version = "0.25.1"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-ji1fo2VV5q8hi2bpe5WFsdT1IIV4XZbAZ3NvCy5X9a0="; + hash = "sha256-lwZ0jpWnBt/9SUJts5MpgZf+GvgZchxdLG5RV2Sh+wE="; }; postPatch = '' @@ -32,12 +32,12 @@ buildPythonPackage rec { --replace '"--benchmark-disable",' "" ''; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ attrs deprecated hepunits @@ -51,13 +51,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "particle" ]; - disabledTestPaths = [ "tests/particle/test_performance.py" ]; + disabledTestPaths = [ + # Requires pytest-benchmark and pytest-cov which we want to avoid using, as + # it doesn't really test functionality. + "tests/particle/test_performance.py" + ]; - meta = with lib; { + meta = { description = "Package to deal with particles, the PDG particle data table and others"; homepage = "https://github.com/scikit-hep/particle"; changelog = "https://github.com/scikit-hep/particle/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 29d1b111e9219..ee1eaa0645053 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-3v1Q9ytlxUAqssVzgwppeOXyAq0NmEeTyN3ixBUuvgQ"; }; - passthru.optional-dependencies = { + optional-dependencies = { argon2 = [ argon2-cffi ]; bcrypt = [ bcrypt ]; totp = [ cryptography ]; @@ -35,14 +35,10 @@ buildPythonPackage rec { "version = getattr(getattr(_bcrypt, '__about__', _bcrypt), '__version__', '<unknown>')" ''; - nativeCheckInputs = - [ - pytestCheckHook - pytest-xdist - ] - ++ passthru.optional-dependencies.argon2 - ++ passthru.optional-dependencies.bcrypt - ++ passthru.optional-dependencies.totp; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ] ++ optional-dependencies.argon2 ++ optional-dependencies.bcrypt ++ optional-dependencies.totp; pythonImportsCheck = [ "passlib" ]; diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index b548dd3c6f0ba..b82f3319426cf 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.3.2"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "uqfoundation"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-b4HCiAvBGkFMxWh2PHC2kZ9G4PsQqVhKeIxLBKj09jU="; + hash = "sha256-J3rwnsn/3DXmChydwNC5yvsdSk1mzvPSnSo21BwkhSE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index feaef66da2b76..fa0ae199bd749 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { "test_unzip_file" "test_zip" "test_zip_file" - ] ++ lib.optionals stdenv.isDarwin [ "test_ar" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_ar" ]; meta = with lib; { description = "portable archive file manager"; diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix index 8ab7896ea0d19..8404c8bc0b902 100644 --- a/pkgs/development/python-modules/pbs-installer/default.nix +++ b/pkgs/development/python-modules/pbs-installer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pbs-installer"; - version = "2024.08.14"; + version = "2024.09.09"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "frostming"; repo = "pbs-installer"; rev = "refs/tags/${version}"; - hash = "sha256-Hitd7Ze8pujkRBoTapP5SekpdiDwJz/0UNe0wW7eaRA="; + hash = "sha256-c9jd85CLQPrwA1HmsedGhbBoQIuEWiPsZN0Srq+DyVE="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/pdf2docx/default.nix b/pkgs/development/python-modules/pdf2docx/default.nix index af91594808b5f..12d347227a9be 100644 --- a/pkgs/development/python-modules/pdf2docx/default.nix +++ b/pkgs/development/python-modules/pdf2docx/default.nix @@ -49,7 +49,7 @@ buildPythonPackage { python-docx ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' # on linux the icon file can only be xbm format convert $out/${python.sitePackages}/pdf2docx/gui/icon.ico \ $out/${python.sitePackages}/pdf2docx/gui/icon.xbm diff --git a/pkgs/development/python-modules/pdfminer-six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix index 1f736189e85c4..56ff16b94fe83 100644 --- a/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, cryptography, charset-normalizer, pythonOlder, @@ -26,6 +27,13 @@ buildPythonPackage rec { }; patches = [ + # https://github.com/pdfminer/pdfminer.six/pull/1027 + (fetchpatch2 { + name = "fix-dereference-MediaBox.patch"; + url = "https://github.com/pdfminer/pdfminer.six/pull/1027/commits/ad101c152c71431a21bfa5a8dbe33b3ba385ceec.patch?full_index=1"; + excludes = [ "CHANGELOG.md" ]; + hash = "sha256-fsSXvN92MVtNFpAst0ctvGrbxVvoe4Nyz4wMZqJ1aw8="; + }) (substituteAll { src = ./disable-setuptools-git-versioning.patch; inherit version; @@ -52,6 +60,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # The binary file samples/contrib/issue-1004-indirect-mediabox.pdf is + # stripped from fix-dereference-MediaBox.patch. + "test_contrib_issue_1004_mediabox" + ]; + passthru = { tests = { inherit ocrmypdf; diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix index b42070e321707..47e0dd303d462 100644 --- a/pkgs/development/python-modules/pdfplumber/default.nix +++ b/pkgs/development/python-modules/pdfplumber/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pdfplumber"; - version = "0.11.1"; + version = "0.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jsvine"; repo = "pdfplumber"; rev = "refs/tags/v${version}"; - hash = "sha256-5A1hjmC6GCS0Uqq5AiCEGqDTwASbJBX0pJGNNyvP3+4="; + hash = "sha256-62S5DMQwSgehl0BcjeRaTocko8xg72pQQ5YLoL3+QbU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix b/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix index cf53273f73bbd..9e74fa519175c 100644 --- a/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix +++ b/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit pname version src; + inherit src; hash = "sha256-KrEBr998AV/bKcIoq0tX72/QwPD9bQplrS0Zw+JiSMQ="; }; @@ -32,7 +32,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; pythonImportsCheck = [ "pdoc_pyo3_sample_library" ]; diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index 6f20b2234cfff..f979e9b7510b0 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pdoc"; - version = "14.6.1"; + version = "14.7.0"; disabled = pythonOlder "3.8"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-9bnkpzHbYYrxVGPPdM1sWkk7IVvNd3GNJ/8CaYV52ko="; + hash = "sha256-U6gLEuyKvGGP5yKXb+bWDGJqmHTdPYLLPgHLVySAJ6I="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index f3757841f2119..0d608a2e36337 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.11.1"; + version = "19.11.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yG8zDC2cirP7fXVTP7TP+BoCjRNgyj6AmXUt6anMy/k="; + hash = "sha256-DQdmZ51jAG+JZkZal17+NIaQ+0lrMS7tqMSZj47tNWw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pebble/default.nix b/pkgs/development/python-modules/pebble/default.nix index 827e45f12590a..ea618df3293f6 100644 --- a/pkgs/development/python-modules/pebble/default.nix +++ b/pkgs/development/python-modules/pebble/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "pebble" ]; diff --git a/pkgs/development/python-modules/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix index c5eadd8e5cd16..34b0970ce5452 100644 --- a/pkgs/development/python-modules/pefile/default.nix +++ b/pkgs/development/python-modules/pefile/default.nix @@ -1,28 +1,25 @@ { lib, buildPythonPackage, - future, fetchPypi, - setuptools-scm, + setuptools, pythonOlder, }: buildPythonPackage rec { pname = "pefile"; - version = "2023.2.7"; - format = "setuptools"; + version = "2024.8.26"; + pyproject = true; disabled = pythonOlder "3.6"; # DON'T fetch from github, the repo is >60 MB due to test artifacts, which we cannot use src = fetchPypi { inherit pname version; - hash = "sha256-guYRQASz1pEcd8OVPjg4ZUsEURuLZuhYPbcMZZmAF9w="; + hash = "sha256-P/bF2LQ+jDe7bm3VCFZY1linoL3NILagex/PwcTp1jI="; }; - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ future ]; + build-system = [ setuptools ]; # Test data contains properitary executables and malware, and is therefore encrypted doCheck = false; diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index 73a1d47855d3d..60f91eb7245fd 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.12.0"; + version = "0.13.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7LYlqWiOPTvQyJgpUZeZ5Wl17RswhYyit0/MaHyN5Ak="; + hash = "sha256-LvAZrMEHzaQie641Xk7vsYRdHfq4eRP0Sr8ancRpW58="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 627769ff18c8f..bd74e66c69157 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { rustPlatform.cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ iconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ iconv ]; propagatedBuildInputs = [ @@ -82,7 +82,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/benchmarks" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # PermissionError: [Errno 1] Operation not permitted: '/etc/localtime' "tests/testing/test_time_travel.py" ]; diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 78cd6bdaf9994..e713588573548 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. - env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix index 1e03c7734dde4..e2e562f0d0f18 100644 --- a/pkgs/development/python-modules/pettingzoo/default.nix +++ b/pkgs/development/python-modules/pettingzoo/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ chess # multi-agent-ale-py @@ -117,7 +117,7 @@ buildPythonPackage rec { # ImportError: cannot import name 'pytest_plugins' from 'pettingzoo.classic' "test_chess" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Crashes on darwin: `Fatal Python error: Aborted` "test_multi_episode_parallel_env_wrapper" ]; diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix index 38bbed27eef56..ce812bcdf2257 100644 --- a/pkgs/development/python-modules/pgcli/default.nix +++ b/pkgs/development/python-modules/pgcli/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { disabledTests = [ # requires running postgres "test_application_name_in_env" - ] ++ lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_application_name_db_uri" ]; meta = with lib; { description = "Command-line interface for PostgreSQL"; diff --git a/pkgs/development/python-modules/pgmpy/default.nix b/pkgs/development/python-modules/pgmpy/default.nix index d9505528c64b1..1217f573cdcd9 100644 --- a/pkgs/development/python-modules/pgmpy/default.nix +++ b/pkgs/development/python-modules/pgmpy/default.nix @@ -2,9 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, - pythonOlder, - # build inputs + + # dependencies networkx, numpy, scipy, @@ -16,42 +15,29 @@ tqdm, joblib, opt-einsum, - # check inputs + xgboost, + google-generativeai, + + # tests pytestCheckHook, pytest-cov, coverage, mock, black, }: -let +buildPythonPackage rec { pname = "pgmpy"; - version = "0.1.25"; -in -# optional-dependencies = { -# all = [ daft ]; -# }; -buildPythonPackage { - inherit pname version; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "0.1.26"; + pyproject = true; src = fetchFromGitHub { owner = "pgmpy"; - repo = pname; + repo = "pgmpy"; rev = "refs/tags/v${version}"; - hash = "sha256-d2TNcJQ82XxTWdetLgtKXRpFulAEEzrr+cyRewoA6YI="; + hash = "sha256-RusVREhEXYaJuQXTaCQ7EJgbo4+wLB3wXXCAc3sBGtU="; }; - # TODO: Remove this patch after updating to pgmpy 0.1.26. - # The PR https://github.com/pgmpy/pgmpy/pull/1745 will have been merged. - # It contains the fix below, among other things, which is why we do not use fetchpatch. - postPatch = lib.optionalString (pythonAtLeast "3.12") '' - substituteInPlace pgmpy/tests/test_estimators/test_MarginalEstimator.py \ - --replace-fail 'self.assert_' 'self.assertTrue' - ''; - - propagatedBuildInputs = [ + dependencies = [ networkx numpy scipy @@ -63,10 +49,21 @@ buildPythonPackage { tqdm joblib opt-einsum + xgboost + google-generativeai ]; disabledTests = [ - "test_to_daft" # requires optional dependency daft + # flaky: + # AssertionError: -45.78899127622197 != -45.788991276221964 + "test_score" + + # self.assertTrue(np.isclose(coef, dep_coefs[i], atol=1e-4)) + # AssertionError: False is not true + "test_pillai" + + # requires optional dependency daft + "test_to_daft" ]; nativeCheckInputs = [ @@ -78,11 +75,11 @@ buildPythonPackage { black ]; - meta = with lib; { + meta = { description = "Python Library for learning (Structure and Parameter), inference (Probabilistic and Causal), and simulations in Bayesian Networks"; homepage = "https://github.com/pgmpy/pgmpy"; changelog = "https://github.com/pgmpy/pgmpy/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ happysalada ]; }; } diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index 68c5148f7eb46..9f736b9ca2e19 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ bottleneck gwcs diff --git a/pkgs/development/python-modules/phply/default.nix b/pkgs/development/python-modules/phply/default.nix index 5844e92d28072..b3550f79a49fa 100644 --- a/pkgs/development/python-modules/phply/default.nix +++ b/pkgs/development/python-modules/phply/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, ply, pytestCheckHook, }: @@ -10,12 +11,15 @@ buildPythonPackage rec { pname = "phply"; version = "1.2.6"; + pyproject = true; + src = fetchPypi { - pname = "phply"; - inherit version; - sha256 = "sha256-Cyd3TShfUHo0RYBaBfj7KZj1bXCScPeLiSCLZbDYSRc="; + inherit pname version; + hash = "sha256-Cyd3TShfUHo0RYBaBfj7KZj1bXCScPeLiSCLZbDYSRc="; }; + build-system = [ setuptools ]; + dependencies = [ ply ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pick/default.nix b/pkgs/development/python-modules/pick/default.nix index 171c639afefc0..5d26864fac794 100644 --- a/pkgs/development/python-modules/pick/default.nix +++ b/pkgs/development/python-modules/pick/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pick"; - version = "2.3.2"; + version = "2.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "wong2"; repo = "pick"; rev = "refs/tags/v${version}"; - hash = "sha256-6bkV9XEum5kbANqv/Xth+taCUl4nmuWskucq4jmV+Lc="; + hash = "sha256-SnH37n0MCjO60IU6kUPxJkIC5vBCVGZXBhFfwvRI/tQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/picosvg/default.nix b/pkgs/development/python-modules/picosvg/default.nix index 2e938d5115d8d..f147b22ad97eb 100644 --- a/pkgs/development/python-modules/picosvg/default.nix +++ b/pkgs/development/python-modules/picosvg/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # a few tests are failing on aarch64 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = with lib; { description = "Tool to simplify SVGs"; diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index d512839a797c0..5c8488b9f17ce 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -90,12 +90,12 @@ buildPythonPackage rec { # Time based "test_decode_threads" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/bigcat88/pillow_heif/issues/89 # not reproducible in nixpkgs "test_opencv_crash" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # RuntimeError: Encoder plugin generated an error: Unsupported bit depth: Bit depth not supported by x265 "test_open_heif_compare_non_standard_modes_data" "test_open_save_disable_16bit" diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index e913a10b4fbfd..2d3551d171e9a 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -44,7 +44,8 @@ import ../pillow/generic.nix ( }; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; homepage = "https://python-pillow.github.io/pillow-perf/"; description = "Friendly PIL fork - SIMD version"; longDescription = '' diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 36fe5b0421fed..1ecaea6b205df 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { "test_basic" "test_custom_metadata" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable darwin tests which require executables: `iconutil` and `screencapture` "test_grab" "test_grabclipboard" diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix index 30f9c503c34b1..34d224669b3c6 100644 --- a/pkgs/development/python-modules/pins/default.nix +++ b/pkgs/development/python-modules/pins/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { xxhash ]; - passthru.optional-dependencies = { + optional-dependencies = { aws = [ s3fs ]; azure = [ adlfs ]; gcs = [ gcsfs ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { pytest-cases pytest-parallel pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pins" ]; diff --git a/pkgs/development/python-modules/pint-pandas/default.nix b/pkgs/development/python-modules/pint-pandas/default.nix index 3e7f183662668..67e1f109c8e03 100644 --- a/pkgs/development/python-modules/pint-pandas/default.nix +++ b/pkgs/development/python-modules/pint-pandas/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Pandas support for pint"; license = lib.licenses.bsd3; homepage = "https://github.com/hgrecco/pint-pandas"; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 10f83a4203d85..9d44c2e383e09 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { tomli-w ]; - preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; ''; diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 2ba2d47cae9e2..5b7e66f6916cd 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { graphviz = [ graphviz ]; }; @@ -47,7 +47,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook virtualenv - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pipdeptree" ]; diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 38f54f0963995..68f3bcd562917 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.5.8"; + version = "0.5.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-/wWAkO2WKn6o9JClkcxoGfHKZNI3GW9hSXmxmoUJpUM="; + hash = "sha256-oV3HdqDuC0t6manVlBqf4cxAWx6U6CbNpCUsBwfAn+o="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index a5ad0d280fd81..471aa322d1bff 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pkgs, qtbase, qmake, @@ -10,16 +11,18 @@ buildPythonPackage rec { pname = "pivy"; - version = "0.6.8"; - format = "setuptools"; + version = "0.6.9"; + pyproject = true; src = fetchFromGitHub { owner = "coin3d"; repo = "pivy"; rev = "refs/tags/${version}"; - hash = "sha256-y72nzZAelyRDR2JS73/0jo2x/XiDZpsERPZV3gzIhAI="; + hash = "sha256-wWM8eKTehWCIbRxxWkZ4YrYyeIJuzQaBOUMrW9a5MVo="; }; + build-system = [ setuptools ]; + dontUseCmakeConfigure = true; nativeBuildInputs = with pkgs; [ @@ -60,6 +63,8 @@ buildPythonPackage rec { \$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}' ''; + pythonImportsCheck = [ "pivy" ]; + meta = with lib; { homepage = "https://github.com/coin3d/pivy/"; description = "Python binding for Coin"; diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix index 9fd818691610c..c24cd66e2face 100644 --- a/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "plantuml-markdown"; - version = "3.10.3"; + version = "3.10.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9G+llIojgNyxupvKLfJC4igjtNK1YjbEMxcape9xqmk="; + hash = "sha256-5K8NSxMCdAsOtV0egY8gMbHnHifvYNRHzafR0LAcm+Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 42472024e0201..e27e2a33ca30b 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -12,6 +12,7 @@ setuptools, setuptools-scm, playwright-driver, + nixosTests, nodejs, }: @@ -21,7 +22,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.44.0"; + version = "1.47.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; rev = "refs/tags/v${version}"; - hash = "sha256-RM04I1QiyJhPvKdAdy8w2GmOOR+BWilxrZ5QUrwxBWA="; + hash = "sha256-C/spH54hhLI0Egs2jjTjQ5BH1pIw1syrfSyUvVQRoKM="; }; patches = [ @@ -51,11 +52,11 @@ buildPythonPackage rec { git commit -m "workaround setuptools-scm" substituteInPlace setup.py \ - --replace "setuptools-scm==8.0.4" "setuptools-scm" \ + --replace "setuptools-scm==8.1.0" "setuptools-scm" \ --replace-fail "wheel==0.42.0" "wheel" substituteInPlace pyproject.toml \ - --replace 'requires = ["setuptools==68.2.2", "setuptools-scm==8.0.4", "wheel==0.42.0", "auditwheel==5.4.0"]' \ + --replace 'requires = ["setuptools==68.2.2", "setuptools-scm==8.1.0", "wheel==0.42.0", "auditwheel==5.4.0"]' \ 'requires = ["setuptools", "setuptools-scm", "wheel"]' # Skip trying to download and extract the driver. @@ -66,14 +67,14 @@ buildPythonPackage rec { # Set the correct driver path with the help of a patch in patches substituteInPlace playwright/_impl/_driver.py \ --replace-fail "@node@" "${lib.getExe nodejs}" \ - --replace-fail "@driver@" "${driver}/package/cli.js" + --replace-fail "@driver@" "${driver}/cli.js" ''; nativeBuildInputs = [ git setuptools-scm setuptools - ] ++ lib.optionals stdenv.isLinux [ auditwheel ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ auditwheel ]; pythonRelaxDeps = [ "pyee" ]; @@ -93,10 +94,14 @@ buildPythonPackage rec { passthru = { inherit driver; - tests = { - driver = playwright-driver; - browsers = playwright-driver.browsers; - }; + tests = + { + driver = playwright-driver; + browsers = playwright-driver.browsers; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + inherit (nixosTests) playwright-python; + }; updateScript = ./update.sh; }; diff --git a/pkgs/development/python-modules/playwright/driver-location.patch b/pkgs/development/python-modules/playwright/driver-location.patch index 033b785e4eed3..87e193f6812e8 100644 --- a/pkgs/development/python-modules/playwright/driver-location.patch +++ b/pkgs/development/python-modules/playwright/driver-location.patch @@ -1,19 +1,22 @@ diff --git a/playwright/_impl/_driver.py b/playwright/_impl/_driver.py -index 9e8cdc1..7ee382d 100644 +index 22b53b8..2d86626 100644 --- a/playwright/_impl/_driver.py +++ b/playwright/_impl/_driver.py -@@ -23,11 +23,7 @@ from playwright._repo_version import version - - +@@ -23,14 +23,7 @@ from playwright._repo_version import version + + def compute_driver_executable() -> Tuple[str, str]: - driver_path = Path(inspect.getfile(playwright)).parent / "driver" - cli_path = str(driver_path / "package" / "cli.js") - if sys.platform == "win32": -- return (str(driver_path / "node.exe"), cli_path) +- return ( +- os.getenv("PLAYWRIGHT_NODEJS_PATH", str(driver_path / "node.exe")), +- cli_path, +- ) - return (os.getenv("PLAYWRIGHT_NODEJS_PATH", str(driver_path / "node")), cli_path) -+ return "@node@", "@driver@" - - ++ return "@node@", "@driver@" + + def get_driver_env() -> dict: diff --git a/setup.py b/setup.py index 8709e52..59784dd 100644 diff --git a/pkgs/development/python-modules/playwright/update.sh b/pkgs/development/python-modules/playwright/update.sh index 23c3276088659..2b283d3b607a1 100755 --- a/pkgs/development/python-modules/playwright/update.sh +++ b/pkgs/development/python-modules/playwright/update.sh @@ -1,35 +1,94 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix-prefetch common-updater-scripts node2nix jq +#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps unzip set -euo pipefail root="$(dirname "$(readlink -f "$0")")" -driver_file="$root/../../web/playwright/driver.nix" -playwright_test="$root/../../web/playwright-test" version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s https://api.github.com/repos/microsoft/playwright-python/releases/latest | jq -r '.tag_name | sub("^v"; "")') - # Most of the time, this should be the latest stable release of the Node-based # Playwright version, but that isn't a guarantee, so this needs to be specified # as well: setup_py_url="https://github.com/microsoft/playwright-python/raw/v${version}/setup.py" driver_version=$(curl -Ls "$setup_py_url" | grep '^driver_version =' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') -fetch_driver_arch() { - nix-prefetch-url "https://playwright.azureedge.net/builds/driver/playwright-${driver_version}-${1}.zip" -} +# TODO: skip if update-source-version reported the same version +update-source-version playwright-driver "$driver_version" +update-source-version python3Packages.playwright "$version" + +playwright_dir="$root/../../web/playwright" +driver_file="$playwright_dir/driver.nix" +repo_url_prefix="https://github.com/microsoft/playwright/raw" + +temp_dir=$(mktemp -d) +trap 'rm -rf "$temp_dir"' EXIT + + +# update binaries of browsers, used by playwright. replace_sha() { - sed -i "s|$1 = \".\{44,52\}\"|$1 = \"$2\"|" "$driver_file" + sed -i "s|$2 = \".\{44,52\}\"|$2 = \"$3\"|" "$1" +} + +prefetch_browser() { + nix store prefetch-file --json --hash-type sha256 --unpack "$1" | jq -r .hash +} + +update_browser() { + name="$1" + suffix="$2" + arm64_suffix="${3:-$2-arm64}" + revision="$(jq -r ".browsers.$name.revision" "$playwright_dir/browsers.json")" + replace_sha "$playwright_dir/$name.nix" "x86_64-linux" \ + "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$suffix.zip")" + replace_sha "$playwright_dir/$name.nix" "aarch64-linux" \ + "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$arm64_suffix.zip")" } -# Replace SHAs for the driver downloads -replace_sha "x86_64-linux" "$(fetch_driver_arch "linux")" -replace_sha "x86_64-darwin" "$(fetch_driver_arch "mac")" -replace_sha "aarch64-linux" "$(fetch_driver_arch "linux-arm64")" -replace_sha "aarch64-darwin" "$(fetch_driver_arch "mac-arm64")" - -# Update the version stamps -sed -i "s/version =\s*\"[^\$]*\"/version = \"$driver_version\"/" "$driver_file" -sed -i "s/\"@playwright\/test\": \"[^\$]*\"/\"@playwright\/test\": \"$driver_version\"/" "$playwright_test/node-packages.json" -(cd "$playwright_test"; node2nix -i node-packages.json) -update-source-version playwright "$version" --rev="v$version" +curl -fsSl \ + "https://raw.githubusercontent.com/microsoft/playwright/v${driver_version}/packages/playwright-core/browsers.json" \ + | jq ' + .comment = "This file is kept up to date via update.sh" + | .browsers |= ( + [.[] + | select(.installByDefault) | del(.installByDefault)] + | map({(.name): . | del(.name)}) + | add + ) + ' > "$playwright_dir/browsers.json" + +# We currently use Chromium from nixpkgs, so we don't need to download it here +# Likewise, darwin can be ignored here atm as we are using an impure install anyway. +update_browser "firefox" "ubuntu-22.04" +update_browser "webkit" "ubuntu-22.04" +update_browser "ffmpeg" "linux" + + +# Update package-lock.json files for all npm deps that are built in playwright + +# Function to download `package-lock.json` for a given source path and update hash +update_hash() { + local source_root_path="$1" + local existing_hash="$2" + + # Formulate download URL + local download_url="${repo_url_prefix}/v${driver_version}${source_root_path}/package-lock.json" + # Download package-lock.json to temporary directory + curl -fsSL -o "${temp_dir}/package-lock.json" "$download_url" + + # Calculate the new hash + local new_hash + new_hash=$(prefetch-npm-deps "${temp_dir}/package-lock.json") + + # Update npmDepsHash in the original file + sed -i "s|$existing_hash|${new_hash}|" "$driver_file" +} + +while IFS= read -r source_root_line; do + [[ "$source_root_line" =~ sourceRoot ]] || continue + source_root_path=$(echo "$source_root_line" | sed -e 's/^.*"${src.name}\(.*\)";.*$/\1/') + # Extract the current npmDepsHash for this sourceRoot + existing_hash=$(grep -A1 "$source_root_line" "$driver_file" | grep 'npmDepsHash' | sed -e 's/^.*npmDepsHash = "\(.*\)";$/\1/') + + # Call the function to download and update the hash + update_hash "$source_root_path" "$existing_hash" +done < "$driver_file" diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 4ca77cb5cabe0..e35e94376e317 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.25.14"; + version = "1.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-1MTU/teBs2HisW0L0o5RyAAi8wlkrVFwc/K70O4YfKg="; + hash = "sha256-v6n+zsiLEQHeAeSALDxu4FWwwQaD/zu3rwxIjR57Ly4="; }; pythonRelaxDeps = [ @@ -61,7 +61,7 @@ buildPythonPackage rec { w3lib ]; - passthru.optional-dependencies = { + optional-dependencies = { recaptcha = [ speechrecognition pydub diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 6623b8ace1ee1..38b4ed40dca25 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -5,6 +5,7 @@ setuptools, packaging, tenacity, + kaleido, }: buildPythonPackage rec { @@ -29,6 +30,7 @@ buildPythonPackage rec { dependencies = [ packaging tenacity + kaleido ]; pythonImportsCheck = [ "plotly" ]; @@ -41,6 +43,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/plotly/plotly.py"; homepage = "https://plot.ly/python/"; license = with licenses; [ mit ]; - maintainers = [ ]; + maintainers = with maintainers; [ pandapip1 ]; }; } diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 7fddf000ddb37..b018fdfbd3e1f 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -1,28 +1,23 @@ { lib, aiohttp, - async-timeout, buildPythonPackage, - crcmod, defusedxml, fetchFromGitHub, freezegun, jsonpickle, munch, - pyserial, pytest-aiohttp, pytest-asyncio, pytestCheckHook, python-dateutil, pythonOlder, - semver, setuptools, - wheel, }: buildPythonPackage rec { pname = "plugwise"; - version = "1.1.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,30 +26,21 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-IaLXCuope/6shF3HmKAo7IrXxVJLzAQzsqlx0dASllk="; + hash = "sha256-lMcehjG1Zc9s02MBsRUXZHQjxcrZetOgOSne0nCGVV0="; }; postPatch = '' - # setuptools - sed -i -e "s/~=[0-9.]*//" pyproject.toml - # wheel - sed -i -e "s/~=[0-9.]*//" pyproject.toml + # setuptools and wheel + sed -i -e "s/~=[0-9.]*//g" pyproject.toml ''; - build-system = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp - async-timeout - crcmod defusedxml munch - pyserial python-dateutil - semver ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index 302b67eea7b22..0ca2084fd8c4e 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "plux"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; # Tests are not available from PyPi @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "localstack"; repo = "plux"; rev = "refs/tags/v${version}"; - hash = "sha256-krlI7WimBluzkw3MVtGeotK5NFf+gsaUfL4CfhNPfpE="; + hash = "sha256-M4N3Ccuw95OcLsWQVtITv4QShBJKliTh5QIoqji8x9o="; }; build-system = [ diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix index 6a77e4a56005a..f0398ac862356 100644 --- a/pkgs/development/python-modules/plyer/default.nix +++ b/pkgs/development/python-modules/plyer/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "plyer" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Plyer is a platform-independent api to use features commonly found on various platforms"; homepage = "https://github.com/kivy/plyer"; license = licenses.mit; diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index 11f3a62535b47..14525a16d8d80 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { urllib3 ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { progress_bar = [ rich ]; }; diff --git a/pkgs/development/python-modules/polars/Cargo.lock b/pkgs/development/python-modules/polars/Cargo.lock index caba522cc1432..94a0a87e3d8c9 100644 --- a/pkgs/development/python-modules/polars/Cargo.lock +++ b/pkgs/development/python-modules/polars/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "adler32" version = "1.2.0" @@ -39,9 +45,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -63,9 +69,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -90,32 +96,33 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "apache-avro" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb7c683b2f8f40970b70e39ff8be514c95b96fcb9c4af87e1ed2cb2e10801a0" +checksum = "1aef82843a0ec9f8b19567445ad2421ceeb1d711514384bdd3d49fe37102ee13" dependencies = [ + "bigdecimal", "crc32fast", "digest", - "lazy_static", - "libflate 2.0.0", + "libflate 2.1.0", "log", "num-bigint", "quad-rand", "rand", "regex-lite", "serde", + "serde_bytes", "serde_json", "snap", "strum", @@ -125,6 +132,21 @@ dependencies = [ "uuid", ] +[[package]] +name = "arboard" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +dependencies = [ + "clipboard-win", + "log", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot", + "x11rb", +] + [[package]] name = "argminmax" version = "0.6.2" @@ -140,11 +162,23 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" +[[package]] +name = "arrayref" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + [[package]] name = "arrow-array" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d390feeb7f21b78ec997a4081a025baef1e2e0d6069e181939b61864c9779609" +checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c" dependencies = [ "ahash", "arrow-buffer", @@ -152,15 +186,15 @@ dependencies = [ "arrow-schema", "chrono", "half", - "hashbrown 0.14.3", + "hashbrown", "num", ] [[package]] name = "arrow-buffer" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69615b061701bcdffbc62756bc7e85c827d5290b472b580c972ebbbf690f5aa4" +checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1" dependencies = [ "bytes", "half", @@ -169,9 +203,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d644b91a162f3ad3135ce1184d0a31c28b816a581e08f29e8e9277a574c64e" +checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5" dependencies = [ "arrow-buffer", "arrow-schema", @@ -181,9 +215,9 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ff3e9c01f7cd169379d269f926892d0e622a704960350d09d331be3ec9e0029" +checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8" [[package]] name = "arrow2" @@ -224,18 +258,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -253,11 +287,17 @@ version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ae037714f313c1353189ead58ef9eec30a8e8dc101b2622d461418fd59e28a9" +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "avro-schema" @@ -277,9 +317,9 @@ dependencies = [ [[package]] name = "aws-config" -version = "1.1.7" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b96342ea8948ab9bef3e6234ea97fc32e2d8a88d8fb6a084e52267317f94b6b" +checksum = "4e95816a168520d72c0e7680c405a5a8c1fb6a035b4bc4b9d7b0de8e1a941697" dependencies = [ "aws-credential-types", "aws-runtime", @@ -297,19 +337,19 @@ dependencies = [ "fastrand", "hex", "http 0.2.12", - "hyper", "ring", "time", "tokio", "tracing", + "url", "zeroize", ] [[package]] name = "aws-credential-types" -version = "1.1.7" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "273fa47dafc9ef14c2c074ddddbea4561ff01b7f68d5091c0e9737ced605c01d" +checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -319,9 +359,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.1.7" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e38bab716c8bf07da24be07ecc02e0f5656ce8f30a891322ecdcb202f943b85" +checksum = "f42c2d4218de4dcd890a109461e2f799a1a2ba3bcd2cde9af88360f5df9266c6" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -334,7 +374,8 @@ dependencies = [ "bytes", "fastrand", "http 0.2.12", - "http-body", + "http-body 0.4.6", + "once_cell", "percent-encoding", "pin-project-lite", "tracing", @@ -343,10 +384,11 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.17.0" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d35d39379445970fc3e4ddf7559fff2c32935ce0b279f9cb27080d6b7c6d94" +checksum = "67520cfee50a8a075a86e7960a6ff30a0a93f6b83ef36f7dff42a9fad9ec1818" dependencies = [ + "ahash", "aws-credential-types", "aws-runtime", "aws-sigv4", @@ -361,20 +403,25 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes", + "fastrand", + "hex", + "hmac", "http 0.2.12", - "http-body", + "http-body 0.4.6", + "lru", "once_cell", "percent-encoding", "regex-lite", + "sha2", "tracing", "url", ] [[package]] name = "aws-sdk-sso" -version = "1.15.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84bd3925a17c9adbf6ec65d52104a44a09629d8f70290542beeee69a95aee7f" +checksum = "11822090cf501c316c6f75711d77b96fba30658e3867a7762e5e2f5d32d31e81" dependencies = [ "aws-credential-types", "aws-runtime", @@ -394,9 +441,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.15.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c2dae39e997f58bc4d6292e6244b26ba630c01ab671b6f9f44309de3eb80ab8" +checksum = "78a2a06ff89176123945d1bbe865603c4d7101bea216a550bb4d2e4e9ba74d74" dependencies = [ "aws-credential-types", "aws-runtime", @@ -416,9 +463,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.15.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17fd9a53869fee17cea77e352084e1aa71e2c5e323d974c13a9c2bcfd9544c7f" +checksum = "a20a91795850826a6f456f4a48eff1dfa59a0e69bdbf5b8c50518fd372106574" dependencies = [ "aws-credential-types", "aws-runtime", @@ -439,9 +486,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.1.7" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ada00a4645d7d89f296fe0ddbc3fe3554f03035937c849a05d37ddffc1f29a1" +checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -468,9 +515,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.1.7" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf7f09a27286d84315dfb9346208abb3b0973a692454ae6d0bc8d803fcce3b4" +checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" dependencies = [ "futures-util", "pin-project-lite", @@ -479,9 +526,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.60.6" +version = "0.60.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd4b66f2a8e7c84d7e97bda2666273d41d2a2e25302605bcf906b7b2661ae5e" +checksum = "509e33efbd853e1e670c47e49af2f4df3d2ae0de8b845b068ddbf04636a6700d" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -490,7 +537,7 @@ dependencies = [ "crc32fast", "hex", "http 0.2.12", - "http-body", + "http-body 0.4.6", "md-5", "pin-project-lite", "sha1", @@ -511,9 +558,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.60.6" +version = "0.60.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6ca214a6a26f1b7ebd63aa8d4f5e2194095643023f9608edf99a58247b9d80d" +checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -522,7 +569,7 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.12", - "http-body", + "http-body 0.4.6", "once_cell", "percent-encoding", "pin-project-lite", @@ -532,18 +579,18 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.60.6" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1af80ecf3057fb25fe38d1687e94c4601a7817c6a1e87c1b0635f7ecb644ace5" +checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.60.6" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb27084f72ea5fc20033efe180618677ff4a2f474b53d84695cfe310a6526cbc" +checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" dependencies = [ "aws-smithy-types", "urlencoding", @@ -551,9 +598,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.1.7" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb5fca54a532a36ff927fbd7407a7c8eb9c3b4faf72792ba2965ea2cad8ed55" +checksum = "0abbf454960d0db2ad12684a1640120e7557294b0ff8e2f11236290a1b293225" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -561,24 +608,26 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", - "hyper", - "hyper-rustls", + "http-body 0.4.6", + "http-body 1.0.1", + "httparse", + "hyper 0.14.30", + "hyper-rustls 0.24.2", "once_cell", "pin-project-lite", "pin-utils", - "rustls", + "rustls 0.21.12", "tokio", "tracing", ] [[package]] name = "aws-smithy-runtime-api" -version = "1.1.7" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22389cb6f7cac64f266fb9f137745a9349ced7b47e0d2ba503e9e40ede4f7060" +checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -593,16 +642,19 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.1.7" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f081da5481210523d44ffd83d9f0740320050054006c719eae0232d411f024d3" +checksum = "6cee7cadb433c781d3299b916fbf620fea813bf38f49db282fb6858141a05cc8" dependencies = [ "base64-simd", "bytes", "bytes-utils", "futures-core", "http 0.2.12", - "http-body", + "http 1.1.0", + "http-body 0.4.6", + "http-body 1.0.1", + "http-body-util", "itoa", "num-integer", "pin-project-lite", @@ -616,39 +668,38 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.6" +version = "0.60.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fccd8f595d0ca839f9f2548e66b99514a85f92feb4c01cf2868d93eb4888a42" +checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "1.1.7" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07c63521aa1ea9a9f92a701f1a08ce3fd20b46c6efc0d5c8947c1fd879e3df1" +checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef" dependencies = [ "aws-credential-types", "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", - "http 0.2.12", "rustc_version", "tracing", ] [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -665,6 +716,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64-simd" version = "0.8.0" @@ -681,6 +738,20 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bigdecimal" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" +dependencies = [ + "autocfg", + "libm", + "num-bigint", + "num-integer", + "num-traits", + "serde", +] + [[package]] name = "bincode" version = "1.3.3" @@ -692,17 +763,24 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.3.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] [[package]] -name = "bitflags" -version = "2.4.2" +name = "blake3" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ - "serde", + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", ] [[package]] @@ -714,11 +792,20 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + [[package]] name = "brotli" -version = "3.4.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -727,9 +814,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -737,9 +824,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" dependencies = [ "cargo-lock", "chrono", @@ -748,35 +835,41 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] -name = "bytes" +name = "byteorder" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "bytes-utils" @@ -815,14 +908,24 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +[[package]] +name = "castaway" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +dependencies = [ + "rustversion", +] + [[package]] name = "cc" -version = "1.0.90" +version = "1.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -833,15 +936,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -895,18 +998,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.2" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstyle", "clap_lex", @@ -914,24 +1017,33 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "clipboard-win" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +dependencies = [ + "error-code", +] [[package]] name = "cmake" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" dependencies = [ "cc", ] [[package]] name = "comfy-table" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ "crossterm", "strum", @@ -939,6 +1051,21 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "compact_str" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "rustversion", + "ryu", + "serde", + "static_assertions", +] + [[package]] name = "const-oid" version = "0.9.6" @@ -965,6 +1092,12 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + [[package]] name = "core-foundation" version = "0.9.4" @@ -977,9 +1110,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core2" @@ -992,9 +1125,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -1016,18 +1149,18 @@ checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" [[package]] name = "crc32c" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" +checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" dependencies = [ "rustc_version", ] [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -1070,9 +1203,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1107,9 +1240,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" @@ -1117,7 +1250,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.2", + "bitflags", "crossterm_winapi", "libc", "parking_lot", @@ -1233,9 +1366,12 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] [[package]] name = "elliptic-curve" @@ -1257,25 +1393,16 @@ dependencies = [ "zeroize", ] -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - [[package]] name = "enum_dispatch" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1296,14 +1423,20 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + [[package]] name = "ethnum" version = "1.5.0" @@ -1324,9 +1457,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "ff" @@ -1340,13 +1473,13 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "libz-ng-sys", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1379,6 +1512,16 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs4" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c6b3bd49c37d2aa3f3f2220233b29a7cd23f79d1fe70e5337d25fb390793de" +dependencies = [ + "rustix", + "windows-sys 0.52.0", +] + [[package]] name = "futures" version = "0.3.30" @@ -1435,7 +1578,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1478,11 +1621,21 @@ dependencies = [ "version_check", ] +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1493,17 +1646,17 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git2" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.4.2", + "bitflags", "libc", "libgit2-sys", "log", @@ -1529,9 +1682,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1546,11 +1699,30 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1563,7 +1735,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" dependencies = [ - "hashbrown 0.14.3", + "hashbrown", "serde", ] @@ -1575,22 +1747,14 @@ checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c" [[package]] name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", "rayon", + "serde", ] [[package]] @@ -1599,12 +1763,24 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -1662,11 +1838,34 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", +] + [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1682,17 +1881,17 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -1704,6 +1903,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1712,12 +1931,50 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper", + "hyper 0.14.30", "log", - "rustls", - "rustls-native-certs", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.1", + "hyper-util", + "rustls 0.23.12", + "rustls-native-certs 0.7.2", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2", "tokio", - "tokio-rustls", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1731,7 +1988,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1755,20 +2012,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", "serde", ] [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "inventory" @@ -1784,11 +2041,11 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -1804,18 +2061,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "itoap" @@ -1845,18 +2102,18 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1874,9 +2131,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lexical-core" @@ -1944,9 +2201,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libflate" @@ -1961,15 +2218,15 @@ dependencies = [ [[package]] name = "libflate" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" +checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e" dependencies = [ "adler32", "core2", "crc32fast", "dary_heap", - "libflate_lz77 2.0.0", + "libflate_lz77 2.1.0", ] [[package]] @@ -1983,20 +2240,20 @@ dependencies = [ [[package]] name = "libflate_lz77" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" +checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d" dependencies = [ "core2", - "hashbrown 0.13.2", + "hashbrown", "rle-decode-fast", ] [[package]] name = "libgit2-sys" -version = "0.16.2+1.7.2" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -2006,12 +2263,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.48.5", ] [[package]] @@ -2022,9 +2279,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" -version = "0.1.35" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -2032,9 +2289,9 @@ dependencies = [ [[package]] name = "libz-ng-sys" -version = "1.1.15" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5" +checksum = "4436751a01da56f1277f323c80d584ffad94a3d14aecd959dd0dff75aa73a438" dependencies = [ "cmake", "libc", @@ -2042,9 +2299,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.15" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -2054,15 +2311,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2070,15 +2327,24 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lru" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +dependencies = [ + "hashbrown", +] [[package]] name = "lz4" -version = "1.24.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" +checksum = "958b4caa893816eea05507c20cfe47574a43d9a697138a7872990bba8a0ece68" dependencies = [ "libc", "lz4-sys", @@ -2086,19 +2352,28 @@ dependencies = [ [[package]] name = "lz4-sys" -version = "1.9.4" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" dependencies = [ "cc", "libc", ] +[[package]] +name = "lz4_flex" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" +dependencies = [ + "twox-hash", +] + [[package]] name = "matrixmultiply" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ "autocfg", "rawpointer", @@ -2116,9 +2391,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2131,18 +2406,18 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] name = "mimalloc" -version = "0.1.39" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -2155,29 +2430,39 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "multiversion" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c7b9d7fe61760ce5ea19532ead98541f6b4c495d87247aff9826445cf6872a" +checksum = "c4851161a11d3ad0bf9402d90ffc3967bf231768bfd7aeb61755ad06dbf1a142" dependencies = [ "multiversion-macros", "target-features", @@ -2185,9 +2470,9 @@ dependencies = [ [[package]] name = "multiversion-macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a83d8500ed06d68877e9de1dde76c1dbb83885dcdbda4ef44ccbc3fbda2ac8" +checksum = "79a74ddee9e0c27d2578323c13905793e91622148f138ba29738f9dddb835e90" dependencies = [ "proc-macro2", "quote", @@ -2228,9 +2513,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -2242,20 +2527,20 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", + "serde", ] [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -2277,9 +2562,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2288,11 +2573,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -2300,62 +2584,150 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "numpy" +version = "0.21.0" +source = "git+https://github.com/stinodego/rust-numpy.git?rev=9ba9962ae57ba26e35babdce6f179edf5fe5b9c8#9ba9962ae57ba26e35babdce6f179edf5fe5b9c8" +dependencies = [ + "libc", + "ndarray", + "num-complex", + "num-integer", + "num-traits", + "pyo3", + "rustc-hash 1.1.0", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "hermit-abi", + "bitflags", + "block2", "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", ] [[package]] -name = "numpy" -version = "0.20.0" +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef41cbb417ea83b30525259e30ccef6af39b31c240bda578889494c5392d331" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ + "bitflags", + "block2", "libc", - "ndarray", - "num-complex", - "num-integer", - "num-traits", - "pyo3", - "rustc-hash", + "objc2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] [[package]] name = "object_store" -version = "0.9.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8718f8b65fdf67a45108d1548347d4af7d71fb81ce727bbf9e3b2535e079db3" +checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3" dependencies = [ "async-trait", - "base64", + "base64 0.22.1", "bytes", "chrono", "futures", "humantime", - "hyper", - "itertools 0.12.1", + "hyper 1.4.1", + "itertools 0.13.0", "md-5", "parking_lot", "percent-encoding", @@ -2363,7 +2735,7 @@ dependencies = [ "rand", "reqwest", "ring", - "rustls-pemfile 2.1.1", + "rustls-pemfile 2.1.3", "serde", "serde_json", "snafu", @@ -2381,9 +2753,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "openssl-probe" @@ -2410,9 +2782,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2420,15 +2792,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -2443,9 +2815,9 @@ dependencies = [ [[package]] name = "parse-zoneinfo" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" dependencies = [ "regex", ] @@ -2494,11 +2866,31 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2533,9 +2925,9 @@ dependencies = [ [[package]] name = "plotters" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" dependencies = [ "num-traits", "plotters-backend", @@ -2546,25 +2938,26 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" [[package]] name = "plotters-svg" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" dependencies = [ "plotters-backend", ] [[package]] name = "polars" -version = "0.38.1" +version = "0.43.1" dependencies = [ "ahash", "apache-avro", + "arrow-buffer", "avro-schema", "either", "ethnum", @@ -2590,7 +2983,7 @@ dependencies = [ [[package]] name = "polars-arrow" -version = "0.38.1" +version = "0.43.1" dependencies = [ "ahash", "arrow-array", @@ -2612,10 +3005,9 @@ dependencies = [ "ethnum", "fast-float", "flate2", - "foreign_vec", "futures", "getrandom", - "hashbrown 0.14.3", + "hashbrown", "hex", "indexmap", "itoa", @@ -2623,16 +3015,18 @@ dependencies = [ "lz4", "multiversion", "num-traits", + "parking_lot", "polars-arrow-format", "polars-error", + "polars-schema", "polars-utils", "proptest", "rand", "regex", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", "ryu", "sample-arrow2", - "sample-std 0.1.1", + "sample-std", "sample-test", "serde", "simdutf8", @@ -2658,7 +3052,7 @@ dependencies = [ [[package]] name = "polars-compute" -version = "0.38.1" +version = "0.43.1" dependencies = [ "bytemuck", "either", @@ -2673,18 +3067,18 @@ dependencies = [ [[package]] name = "polars-core" -version = "0.38.1" +version = "0.43.1" dependencies = [ "ahash", "arrow-array", "bincode", - "bitflags 2.4.2", + "bitflags", "bytemuck", "chrono", "chrono-tz", "comfy-table", "either", - "hashbrown 0.14.3", + "hashbrown", "indexmap", "ndarray", "num-traits", @@ -2693,6 +3087,7 @@ dependencies = [ "polars-compute", "polars-error", "polars-row", + "polars-schema", "polars-utils", "rand", "rand_distr", @@ -2700,7 +3095,6 @@ dependencies = [ "regex", "serde", "serde_json", - "smartstring", "thiserror", "version_check", "xxhash-rust", @@ -2708,10 +3102,11 @@ dependencies = [ [[package]] name = "polars-doc-examples" -version = "0.38.1" +version = "0.43.1" dependencies = [ "aws-config", "aws-sdk-s3", + "aws-smithy-checksums", "chrono", "polars", "rand", @@ -2721,7 +3116,7 @@ dependencies = [ [[package]] name = "polars-error" -version = "0.38.1" +version = "0.43.1" dependencies = [ "avro-schema", "object_store", @@ -2731,9 +3126,28 @@ dependencies = [ "thiserror", ] +[[package]] +name = "polars-expr" +version = "0.43.1" +dependencies = [ + "ahash", + "bitflags", + "once_cell", + "polars-arrow", + "polars-compute", + "polars-core", + "polars-io", + "polars-json", + "polars-ops", + "polars-plan", + "polars-time", + "polars-utils", + "rayon", +] + [[package]] name = "polars-ffi" -version = "0.38.1" +version = "0.43.1" dependencies = [ "polars-arrow", "polars-core", @@ -2741,17 +3155,21 @@ dependencies = [ [[package]] name = "polars-io" -version = "0.38.1" +version = "0.43.1" dependencies = [ "ahash", "async-trait", "atoi_simd", + "blake3", "bytes", "chrono", "chrono-tz", "fast-float", "flate2", + "fs4", "futures", + "glob", + "hashbrown", "home", "itoa", "memchr", @@ -2765,6 +3183,7 @@ dependencies = [ "polars-error", "polars-json", "polars-parquet", + "polars-schema", "polars-time", "polars-utils", "rayon", @@ -2775,7 +3194,6 @@ dependencies = [ "serde_json", "simd-json", "simdutf8", - "smartstring", "tempfile", "tokio", "tokio-util", @@ -2785,12 +3203,13 @@ dependencies = [ [[package]] name = "polars-json" -version = "0.38.1" +version = "0.43.1" dependencies = [ "ahash", "chrono", + "chrono-tz", "fallible-streaming-iterator", - "hashbrown 0.14.3", + "hashbrown", "indexmap", "itoa", "num-traits", @@ -2804,43 +3223,66 @@ dependencies = [ [[package]] name = "polars-lazy" -version = "0.38.1" +version = "0.43.1" dependencies = [ "ahash", - "bitflags 2.4.2", + "bitflags", "futures", - "glob", + "memchr", "once_cell", "polars-arrow", "polars-core", + "polars-expr", "polars-io", "polars-json", + "polars-mem-engine", "polars-ops", "polars-pipe", "polars-plan", + "polars-stream", "polars-time", "polars-utils", "pyo3", "rayon", "serde_json", - "smartstring", "tokio", "version_check", ] +[[package]] +name = "polars-mem-engine" +version = "0.43.1" +dependencies = [ + "futures", + "memmap2", + "polars-arrow", + "polars-core", + "polars-error", + "polars-expr", + "polars-io", + "polars-json", + "polars-ops", + "polars-plan", + "polars-time", + "polars-utils", + "pyo3", + "rayon", + "tokio", +] + [[package]] name = "polars-ops" -version = "0.38.1" +version = "0.43.1" dependencies = [ "ahash", "aho-corasick", "argminmax", - "base64", + "base64 0.22.1", "bytemuck", "chrono", "chrono-tz", "either", - "hashbrown 0.14.3", + "hashbrown", "hex", "indexmap", "jsonpath_lib_polars_vendor", @@ -2851,6 +3293,7 @@ dependencies = [ "polars-core", "polars-error", "polars-json", + "polars-schema", "polars-utils", "rand", "rand_distr", @@ -2858,30 +3301,33 @@ dependencies = [ "regex", "serde", "serde_json", - "smartstring", "unicode-reverse", "version_check", ] [[package]] name = "polars-parquet" -version = "0.38.1" +version = "0.43.1" dependencies = [ "ahash", "async-stream", - "base64", + "base64 0.22.1", "brotli", + "bytemuck", "ethnum", "fallible-streaming-iterator", "flate2", "futures", + "hashbrown", "lz4", + "lz4_flex", "num-traits", "parquet-format-safe", "polars-arrow", + "polars-compute", "polars-error", "polars-utils", - "seq-macro", + "rand", "serde", "simdutf8", "snap", @@ -2892,24 +3338,24 @@ dependencies = [ [[package]] name = "polars-pipe" -version = "0.38.1" +version = "0.43.1" dependencies = [ "crossbeam-channel", "crossbeam-queue", "enum_dispatch", "futures", - "hashbrown 0.14.3", + "hashbrown", "num-traits", "polars-arrow", "polars-compute", "polars-core", + "polars-expr", "polars-io", "polars-ops", "polars-plan", "polars-row", "polars-utils", "rayon", - "smartstring", "tokio", "uuid", "version_check", @@ -2917,15 +3363,20 @@ dependencies = [ [[package]] name = "polars-plan" -version = "0.38.1" +version = "0.43.1" dependencies = [ "ahash", + "bitflags", "bytemuck", + "bytes", "chrono", "chrono-tz", "ciborium", + "either", "futures", + "hashbrown", "libloading", + "memmap2", "once_cell", "percent-encoding", "polars-arrow", @@ -2939,16 +3390,51 @@ dependencies = [ "polars-utils", "pyo3", "rayon", + "recursive", "regex", "serde", - "smartstring", + "serde_json", "strum_macros", "version_check", ] +[[package]] +name = "polars-python" +version = "0.43.1" +dependencies = [ + "ahash", + "arboard", + "bytemuck", + "bytes", + "ciborium", + "either", + "itoa", + "libc", + "ndarray", + "num-traits", + "numpy", + "once_cell", + "polars", + "polars-core", + "polars-error", + "polars-io", + "polars-lazy", + "polars-ops", + "polars-parquet", + "polars-plan", + "polars-stream", + "polars-time", + "polars-utils", + "pyo3", + "recursive", + "serde_json", + "thiserror", + "version_check", +] + [[package]] name = "polars-row" -version = "0.38.1" +version = "0.43.1" dependencies = [ "bytemuck", "polars-arrow", @@ -2956,27 +3442,70 @@ dependencies = [ "polars-utils", ] +[[package]] +name = "polars-schema" +version = "0.43.1" +dependencies = [ + "indexmap", + "polars-error", + "polars-utils", + "serde", + "version_check", +] + [[package]] name = "polars-sql" -version = "0.38.1" +version = "0.43.1" dependencies = [ "hex", + "once_cell", "polars-arrow", "polars-core", "polars-error", "polars-lazy", + "polars-ops", "polars-plan", + "polars-time", + "polars-utils", "rand", "serde", "serde_json", "sqlparser", ] +[[package]] +name = "polars-stream" +version = "0.43.1" +dependencies = [ + "atomic-waker", + "crossbeam-deque", + "crossbeam-utils", + "futures", + "memmap2", + "parking_lot", + "pin-project-lite", + "polars-core", + "polars-error", + "polars-expr", + "polars-io", + "polars-mem-engine", + "polars-parquet", + "polars-plan", + "polars-utils", + "rand", + "rayon", + "recursive", + "slotmap", + "tokio", + "version_check", +] + [[package]] name = "polars-time" -version = "0.38.1" +version = "0.43.1" dependencies = [ "atoi", + "bytemuck", "chrono", "chrono-tz", "now", @@ -2988,33 +3517,37 @@ dependencies = [ "polars-utils", "regex", "serde", - "smartstring", ] [[package]] name = "polars-utils" -version = "0.38.1" +version = "0.43.1" dependencies = [ "ahash", "bytemuck", - "hashbrown 0.14.3", + "bytes", + "compact_str", + "hashbrown", "indexmap", + "libc", + "memmap2", "num-traits", "once_cell", "polars-error", "rand", "raw-cpuid", "rayon", - "smartstring", + "serde", + "stacker", "sysinfo", "version_check", ] [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "powerfmt" @@ -3024,32 +3557,35 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ - "bitflags 2.4.2", + "bitflags", "lazy_static", "num-traits", "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", "unarray", ] @@ -3076,44 +3612,36 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + [[package]] name = "py-polars" -version = "0.20.15" +version = "1.7.1" dependencies = [ - "ahash", "built", - "ciborium", - "either", - "itoa", "jemallocator", "libc", "mimalloc", - "ndarray", - "num-traits", - "numpy", - "once_cell", "polars", - "polars-core", - "polars-error", - "polars-lazy", - "polars-ops", - "polars-parquet", - "polars-plan", - "polars-utils", + "polars-python", "pyo3", - "pyo3-built", - "serde_json", - "smartstring", - "thiserror", ] [[package]] name = "pyo3" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" dependencies = [ "cfg-if", + "chrono", "indoc", "inventory", "libc", @@ -3128,25 +3656,19 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" dependencies = [ "once_cell", "target-lexicon", ] -[[package]] -name = "pyo3-built" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be6d574e0f8cab2cdd1eeeb640cbf845c974519fa9e9b62fa9c08ecece0ca5de" - [[package]] name = "pyo3-ffi" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" dependencies = [ "libc", "pyo3-build-config", @@ -3154,27 +3676,27 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "pyo3-macros-backend" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -3185,9 +3707,9 @@ checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88" [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" dependencies = [ "memchr", "serde", @@ -3204,11 +3726,59 @@ dependencies = [ "rand", ] +[[package]] +name = "quinn" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls 0.23.12", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash 2.0.0", + "rustls 0.23.12", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3274,11 +3844,11 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "11.0.1" +version = "11.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" +checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" dependencies = [ - "bitflags 2.4.2", + "bitflags", ] [[package]] @@ -3289,9 +3859,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3307,63 +3877,83 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "recursive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0786a43debb760f491b1bc0269fe5e84155353c67482b9e60d0cfb596054b43e" +dependencies = [ + "recursive-proc-macro-impl", + "stacker", +] + +[[package]] +name = "recursive-proc-macro-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" +dependencies = [ + "quote", + "syn 2.0.76", +] + [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] name = "ref-cast" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "regex" -version = "1.10.3" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] name = "regex-lite" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" @@ -3373,26 +3963,28 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.11.24" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "base64", + "base64 0.22.1", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", - "http 0.2.12", - "http-body", - "hyper", - "hyper-rustls", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls 0.27.2", + "hyper-util", "ipnet", "js-sys", "log", @@ -3400,16 +3992,17 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-native-certs", - "rustls-pemfile 1.0.4", + "quinn", + "rustls 0.23.12", + "rustls-native-certs 0.7.2", + "rustls-pemfile 2.1.3", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", - "tokio-rustls", + "tokio-rustls 0.26.0", "tokio-util", "tower-service", "url", @@ -3417,7 +4010,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg", + "windows-registry", ] [[package]] @@ -3454,9 +4047,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3464,6 +4057,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -3475,11 +4074,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -3488,16 +4087,30 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.6", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -3510,30 +4123,43 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64", + "base64 0.21.7", ] [[package]] name = "rustls-pemfile" -version = "2.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.3.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" @@ -3545,17 +4171,28 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3573,20 +4210,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "502b30097ae5cc57ee8359bb59d8af349db022492de04596119d83f561ab8977" dependencies = [ "arrow2", - "sample-std 0.2.1", -] - -[[package]] -name = "sample-std" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567a153dc3302ce838920fb095c025a6d0529fff0290d25deeec2136e41a57c8" -dependencies = [ - "casey", - "quickcheck", - "rand", - "rand_regex", - "regex", + "sample-std", ] [[package]] @@ -3604,24 +4228,24 @@ dependencies = [ [[package]] name = "sample-test" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713e500947ff19fc1ae2805afa33ef45f3bb2ec656c77d92252d24cf9e3091b2" +checksum = "e8b253ca516416756b09b582e2b7275de8f51f35e5d5711e20712b9377c7d5bf" dependencies = [ "quickcheck", - "sample-std 0.1.1", + "sample-std", "sample-test-macros", ] [[package]] name = "sample-test-macros" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1a2c832a259aae95b6ed1da3aa377111ffde38d4282fa734faa3fff356534e" +checksum = "5cc6439a7589bb4581fdadb6391700ce4d26f8bffd34e2a75acb320822e9b5ef" dependencies = [ "proc-macro2", "quote", - "sample-std 0.1.1", + "sample-std", "syn 1.0.109", ] @@ -3666,11 +4290,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -3679,9 +4303,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3689,56 +4313,60 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] -name = "seq-macro" -version = "0.3.5" +name = "serde" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] [[package]] -name = "serde" -version = "1.0.197" +name = "serde_bytes" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ - "serde_derive", + "serde", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -3777,11 +4405,17 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3798,9 +4432,9 @@ dependencies = [ [[package]] name = "simd-json" -version = "0.13.8" +version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2faf8f101b9bc484337a6a6b0409cf76c139f2fb70a9e3aee6b6774be7bfbf76" +checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" dependencies = [ "ahash", "getrandom", @@ -3836,23 +4470,20 @@ dependencies = [ ] [[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "smartstring" -version = "1.0.1" +name = "slotmap" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ - "autocfg", - "serde", - "static_assertions", "version_check", ] +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + [[package]] name = "snafu" version = "0.7.5" @@ -3869,7 +4500,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -3883,9 +4514,9 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3909,13 +4540,26 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.39.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7" +checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" dependencies = [ "log", ] +[[package]] +name = "stacker" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a5daa25ea337c85ed954c0496e3bdd2c7308cc3b24cf7b50d04876654c579f" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "windows-sys 0.36.1", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -3945,28 +4589,28 @@ checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -3981,9 +4625,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -3992,94 +4636,76 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "sysinfo" -version = "0.30.7" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c385888ef380a852a16209afc8cfad22795dd8873d69c9a14d2e2088f118d18" +checksum = "2b92e0bdf838cbc1c4c9ba14f9c97a7ec6cdcd1ae66b10e1e42775a25553f45d" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", "windows", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "target-features" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb5fa503293557c5158bd215fdc225695e567a77e453f5d4452a50a193969bd" +checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5" [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "num-conv", @@ -4097,9 +4723,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -4126,9 +4752,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4141,31 +4767,30 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -4174,15 +4799,26 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.12", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -4190,7 +4826,6 @@ dependencies = [ "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4207,9 +4842,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -4227,11 +4862,32 @@ dependencies = [ "winnow", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4252,7 +4908,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -4270,24 +4926,34 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + [[package]] name = "typed-builder" -version = "0.16.2" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34085c17941e36627a879208083e25d357243812c30e7d7387c3b954f30ade16" +checksum = "a06fbd5b8de54c5f7c91f6fe4cebb949be2125d7758e630bb58b1d831dbce600" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.16.2" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" +checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -4325,9 +4991,9 @@ dependencies = [ [[package]] name = "unicode-reverse" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bea5dacebb0d2d0a69a6700a05b59b3908bf801bf563a49bd27a1b60122962c" +checksum = "4b6f4888ebc23094adfb574fdca9fdc891826287a6397d2cd28802ffd6f20c76" dependencies = [ "unicode-segmentation", ] @@ -4340,9 +5006,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unindent" @@ -4358,9 +5024,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4375,9 +5041,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "uuid" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "serde", @@ -4403,9 +5069,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vsimd" @@ -4440,34 +5106,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4477,9 +5144,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4487,22 +5154,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" @@ -4519,9 +5186,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4545,11 +5212,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -4560,12 +5227,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-core", - "windows-targets 0.52.4", + "windows-core 0.57.0", + "windows-targets 0.52.6", ] [[package]] @@ -4574,16 +5241,93 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows-targets 0.48.5", + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", ] [[package]] @@ -4592,7 +5336,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4612,17 +5365,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4633,9 +5387,15 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" @@ -4645,9 +5405,15 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" @@ -4657,9 +5423,21 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" @@ -4669,9 +5447,15 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" @@ -4681,9 +5465,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4693,9 +5477,15 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" @@ -4705,9 +5495,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -4719,15 +5509,22 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.50.0" +name = "x11rb" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "gethostname", + "rustix", + "x11rb-protocol", ] +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + [[package]] name = "xmlparser" version = "0.13.6" @@ -4736,59 +5533,60 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xxhash-rust" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zstd" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.0.0" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index c6aca67e2859b..a1eeda11a3aff 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -2,12 +2,10 @@ lib, stdenv, buildPythonPackage, - pythonOlder, rustPlatform, cmake, libiconv, fetchFromGitHub, - typing-extensions, jemalloc, rust-jemalloc-sys, darwin, @@ -21,16 +19,14 @@ in buildPythonPackage rec { pname = "polars"; - version = "0.20.15"; + version = "1.7.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; rev = "refs/tags/py-${version}"; - hash = "sha256-N/VIi0s5unYWqlR5Mpaq9cqXl2ccbzWPuOtE2UbmQw8="; + hash = "sha256-vbligrFrCd7BiPV8n1iRIlurPNirJKOiD4/P5qEpirg="; }; # Cargo.lock file is sometimes behind actual release which throws an error, @@ -40,20 +36,23 @@ buildPythonPackage rec { #sed -i 's/version = "0.18.0"/version = "${version}"/g' Cargo.lock ''; - cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "numpy-0.21.0" = "sha256-u0Z+6L8pXSPaA3cE1sUpY6sCoaU1clXUcj/avnNzmsw="; + }; + }; buildAndTestSubdir = "py-polars"; # Revisit this whenever package or Rust is upgraded RUSTC_BOOTSTRAP = 1; - propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - # trick taken from the polars repo since there seems to be a problem # with simd enabled with our stable rust (instead of nightly). maturinBuildFlags = [ "--no-default-features" - "--features=all" + "--all-features" ]; dontUseCmakeConfigure = true; @@ -71,8 +70,9 @@ buildPythonPackage rec { buildInputs = [ rust-jemalloc-sys' ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv + darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -89,11 +89,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "polars" ]; - meta = with lib; { + meta = { description = "Fast multi-threaded DataFrame library"; homepage = "https://github.com/pola-rs/polars"; changelog = "https://github.com/pola-rs/polars/releases/tag/py-${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; }; } diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index 09e909eaa1424..d83761083c8ad 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, click, fetchFromGitHub, + orjson, pytestCheckHook, pythonOlder, pyyaml, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.12.12"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = "policy_sentry"; rev = "refs/tags/${version}"; - hash = "sha256-1LYcUlGoSalbdo4tiNIYbdA04IHRTImhdWScpiCZk50="; + hash = "sha256-OUe6NAz4w9/OXWQg4W+TmEI5qiSdEp+/tspQnIISTnc="; }; build-system = [ setuptools ]; @@ -31,8 +32,9 @@ buildPythonPackage rec { dependencies = [ beautifulsoup4 click - requests + orjson pyyaml + requests schema ]; diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix index 089505631840a..3bce5e796233c 100644 --- a/pkgs/development/python-modules/polyswarm-api/default.nix +++ b/pkgs/development/python-modules/polyswarm-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "polyswarm-api"; - version = "3.9.0"; + version = "3.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "polyswarm"; repo = "polyswarm-api"; rev = "refs/tags/${version}"; - hash = "sha256-RjzB7S3qTCl6fo+qZ+mVCsQg6CLUnSwutNse5QPQOHU="; + hash = "sha256-3K0FdqsEjt5cTymgxmt0Ohud/+bsILe9bDclZXJqPV8="; }; pythonRelaxDeps = [ "future" ]; diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index b5b41ae6d9923..aeae266c62b0a 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "24.3.2"; + version = "24.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,12 +28,12 @@ buildPythonPackage rec { owner = "greenbone"; repo = "pontos"; rev = "refs/tags/v${version}"; - hash = "sha256-DXZDXipYBClqSdlTJsaPWaKr3qTiJ3osm3hHPp/MPow="; + hash = "sha256-CgO88I2M8RGpYyJchXZtqxIBjNaULSqnDgfFCUQDFUw="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ colorful httpx lxml diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 92aa40650ebc6..790c162e6fb6e 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pony"; - version = "0.7.18"; + version = "0.7.19"; pyproject = true; disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ponyorm"; repo = "pony"; rev = "refs/tags/v${version}"; - hash = "sha256-2qGkHPBbfFrjJatKVa44bDbn/i3/YH/8LWd8CXyFRqo="; + hash = "sha256-fYzwdHRB9QrIJPEk8dqtPggSnJeugDyC9zQSM6u3rN0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/portion/default.nix b/pkgs/development/python-modules/portion/default.nix index 51ca2c1190264..6af448dccd055 100644 --- a/pkgs/development/python-modules/portion/default.nix +++ b/pkgs/development/python-modules/portion/default.nix @@ -1,32 +1,25 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, setuptools, - wheel, sortedcontainers, pytestCheckHook, }: buildPythonPackage rec { pname = "portion"; - version = "2.4.2"; + version = "2.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "AlexandreDecan"; repo = "portion"; rev = "refs/tags/${version}"; - hash = "sha256-URoyuE0yivUqPjJZbvATkAnTxicY4F2eiJ16rIUdY3Y="; + hash = "sha256-sNOieFenrWh6iDXCyCBedx+qIsS+daAr+WVBpkc8yVQ="; }; - build-system = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; dependencies = [ sortedcontainers ]; @@ -34,11 +27,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Portion, a Python library providing data structure and operations for intervals"; homepage = "https://github.com/AlexandreDecan/portion"; changelog = "https://github.com/AlexandreDecan/portion/blob/${src.rev}/CHANGELOG.md"; - license = licenses.lgpl3; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 6e1f724a35ddc..76bab717715fb 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { python-hglib pygit2 pyuv - ] ++ lib.optionals (!stdenv.isDarwin) [ i3ipc ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ i3ipc ]; # tests are travis-specific doCheck = false; diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 53eaa5657e7a3..a2672cc5e45e7 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; # darwin seems to hang - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 0017582e25cc5..131928baba252 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click ]; flex = [ flex ]; icu = [ pyicu ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-cov-stub pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # Disable tests that require network disabledTestPaths = [ "tests/test_convert.py" ]; diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index 646d2b343518e..55058f846d08d 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { # Note: this is not likely to ever work on Darwin # https://github.com/pre-commit/pre-commit-hooks/pull/655 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # the tests require a functional git installation which requires a valid HOME # directory. diff --git a/pkgs/development/python-modules/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix index 8b0509006a6e1..c869b7c2e04bf 100644 --- a/pkgs/development/python-modules/prefixed/default.nix +++ b/pkgs/development/python-modules/prefixed/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "prefixed"; - version = "0.8.0"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E1uT1NGKLKSSQ8xbYvegKWl1nhcBNc0BIXWfSmZs02k="; + hash = "sha256-FkQD+p68gygLvEcF9LJDoog34WQxC05lw4zKseuv7rM="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix index 336042e595d45..83f57c4a70e32 100644 --- a/pkgs/development/python-modules/primer3/default.nix +++ b/pkgs/development/python-modules/primer3/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython setuptools - ] ++ lib.optionals stdenv.isDarwin [ gcc ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; nativeCheckInputs = [ click diff --git a/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix index 2824587d7c256..4642f2dd32214 100644 --- a/pkgs/development/python-modules/private-gpt/default.nix +++ b/pkgs/development/python-modules/private-gpt/default.nix @@ -1,51 +1,56 @@ { lib, buildPythonPackage, - python, fetchFromGitHub, + fetchurl, + + # build-system poetry-core, + + # dependencies + docx2txt, fastapi, injector, llama-index-core, llama-index-readers-file, - huggingface-hub, python-multipart, pyyaml, transformers, uvicorn, watchdog, + + # optional-dependencies + python, + huggingface-hub, gradio, - fetchurl, - fetchpatch, + + # tests nixosTests, }: buildPythonPackage rec { pname = "private-gpt"; - version = "0.5.0"; + version = "0.6.2"; pyproject = true; src = fetchFromGitHub { owner = "zylon-ai"; repo = "private-gpt"; - rev = "v${version}"; - hash = "sha256-bjydzJhOJjmbflcJbuMyNsmby7HtNPFW3MY2Tw12cHw="; + rev = "refs/tags/v${version}"; + hash = "sha256-IYTysU3W/NrtBuLe3ZJkztVSK+gzjkGIg0qcBYzB3bs="; }; - patches = [ - # Fix a vulnerability, to be removed in the next bump version - # See https://github.com/zylon-ai/private-gpt/pull/1890 - (fetchpatch { - url = "https://github.com/zylon-ai/private-gpt/commit/86368c61760c9cee5d977131d23ad2a3e063cbe9.patch"; - hash = "sha256-4ysRUuNaHW4bmNzg4fn++89b430LP6AzYDoX2HplVH0="; - }) - ]; - build-system = [ poetry-core ]; - pythonRelaxDeps = [ "fastapi" ]; + pythonRelaxDeps = [ + "cryptography" + "fastapi" + "llama-index-core" + "llama-index-readers-file" + ]; dependencies = [ + docx2txt fastapi injector llama-index-core @@ -55,7 +60,7 @@ buildPythonPackage rec { transformers uvicorn watchdog - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # This is needed for running the tests and the service in offline mode, # See related issue at https://github.com/zylon-ai/private-gpt/issues/1870 @@ -64,7 +69,7 @@ buildPythonPackage rec { hash = "sha256-Ijkht27pm96ZW3/3OFE+7xAPtR0YyTWXoRO8/+hlsqc="; }; - passthru.optional-dependencies = with python.pkgs; { + optional-dependencies = with python.pkgs; { embeddings-huggingface = [ huggingface-hub llama-index-embeddings-huggingface @@ -98,6 +103,6 @@ buildPythonPackage rec { homepage = "https://github.com/zylon-ai/private-gpt"; license = lib.licenses.asl20; mainProgram = "private-gpt"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/prometheus-async/default.nix b/pkgs/development/python-modules/prometheus-async/default.nix index 95d2277697d6e..22627f161fa22 100644 --- a/pkgs/development/python-modules/prometheus-async/default.nix +++ b/pkgs/development/python-modules/prometheus-async/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 9f0704d7a3d0b..3c465a430a292 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.20.0"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "prometheus"; repo = "client_python"; rev = "refs/tags/v${version}"; - hash = "sha256-IMw0mpOUzjXBy4bMTeSFMc5pdibI5lGxZHKiufjPLbM="; + hash = "sha256-LrCBCfIcpxNjy/yjwCG4J34eJO4AdUr21kp9FBwSeAY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix index 8f33fc7aa808d..4ccfdb7fc7262 100644 --- a/pkgs/development/python-modules/prophet/default.nix +++ b/pkgs/development/python-modules/prophet/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { importlib-resources ]; - passthru.optional-dependencies.parallel = [ + optional-dependencies.parallel = [ dask distributed ] ++ dask.optional-dependencies.dataframe; diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index df76396f68e34..ae3cd88eeef75 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.23.0"; + version = "1.24.0"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-iQdRce8RmIs/oVf129i5zwnWX//ul+Kc5APNje+6GdI="; + hash = "sha256-MLcqXsr+RAaw0znbNbVsQFkGTmkie4w72nRiOX+WZEU="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 75dc81ccbad34..049833dc1b09d 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "protobuf"; - version = "5.27.2"; + version = "5.28.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8+ze8ia5r4VgdfKCJ/8skM46WU0JLDm+5VE1c/JeJxQ="; + hash = "sha256-3edK8Pp3T6mIkiCZkila2/uR2j+pjI9nqIr+j1o0mt0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix index c19ef3b31d17a..12df2934bff23 100644 --- a/pkgs/development/python-modules/proton-core/default.nix +++ b/pkgs/development/python-modules/proton-core/default.nix @@ -9,23 +9,25 @@ python-gnupg, requests, pytestCheckHook, + pyotp, + pytest-cov-stub, }: buildPythonPackage rec { pname = "proton-core"; - version = "0.1.16"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; rev = "refs/tags/v${version}"; - hash = "sha256-072XuHvgWludlFwp/tqLpuAU89vzifFhwQ01FuiCoL8="; + hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ bcrypt aiohttp pyopenssl @@ -33,14 +35,13 @@ buildPythonPackage rec { requests ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=proton --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + pyotp + ]; disabledTestPaths = [ # Single test, requires internet connection @@ -68,6 +69,6 @@ buildPythonPackage rec { description = "Core logic used by the other Proton components"; homepage = "https://github.com/ProtonVPN/python-proton-core"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix index ab9cefd53a993..4bb419d21b20d 100644 --- a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix @@ -5,6 +5,7 @@ setuptools, proton-keyring-linux, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -19,23 +20,21 @@ buildPythonPackage rec { hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ proton-keyring-linux ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=proton.keyring_linux.secretservice --cov-report html --cov-report term" "" - ''; + dependencies = [ proton-keyring-linux ]; pythonImportsCheck = [ "proton.keyring_linux" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; - meta = with lib; { + meta = { description = "ProtonVPN component to access Linux's keyring secret service API"; homepage = "https://github.com/ProtonVPN/python-proton-keyring-linux-secretservice"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix index a0f63f4222da2..51617e71a0f83 100644 --- a/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -6,6 +6,7 @@ keyring, proton-core, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -20,26 +21,24 @@ buildPythonPackage rec { hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ keyring proton-core ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=proton.keyring_linux.core --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.keyring_linux.core" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; - meta = with lib; { + meta = { description = "ProtonVPN core component to access Linux's keyring"; homepage = "https://github.com/ProtonVPN/python-proton-keyring-linux"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index c3597acd9e5ce..219dd94b31426 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -11,23 +11,24 @@ sentry-sdk, distro, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.22.3"; + version = "0.32.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; - rev = "refs/tags/v${version}"; - hash = "sha256-BGei6tw6VTKkHmaIWa2VJfKOL5cRUbauOQ7zp1RY9Bo="; + rev = "v${version}"; + hash = "sha256-n4TZkp2ZMSJ1w1wQUMsAhX8kmWu59udlsXXEhIM83mI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ distro proton-core proton-vpn-connection @@ -37,24 +38,33 @@ buildPythonPackage rec { sentry-sdk ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=proton/vpn/core/ --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.vpn.core" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; preCheck = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) ''; - meta = with lib; { + disabledTests = [ + # Permission denied: '/run' + "test_ensure_configuration_file_is_created" + "test_ovpnconfig_with_settings" + "test_wireguard_config_content_generation" + "test_wireguard_with_non_certificate" + "test_ensure_generate_is_returning_expected_content" + "test_ensure_same_configuration_file_in_case_of_duplicate" + "test_ensure_configuration_file_is_deleted" + ]; + + meta = { description = "Acts as a facade to the other Proton VPN components, exposing a uniform API to the available Proton VPN services"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-api-core"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/proton-vpn-connection/default.nix b/pkgs/development/python-modules/proton-vpn-connection/default.nix index 0df1b42a2bc40..7da811dc3a315 100644 --- a/pkgs/development/python-modules/proton-vpn-connection/default.nix +++ b/pkgs/development/python-modules/proton-vpn-connection/default.nix @@ -8,6 +8,7 @@ proton-vpn-logger, jinja2, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -22,23 +23,21 @@ buildPythonPackage rec { hash = "sha256-Ze/te0G0tDzyZPGVVqvuJlZoHWJqJ36LnHO+Cy5nxx8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 proton-core proton-vpn-killswitch proton-vpn-logger ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=proton.vpn.connection --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.vpn.connection" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; disabledTests = [ # Permission denied: '/run' @@ -59,10 +58,10 @@ buildPythonPackage rec { "test_ovpnconfig_with_malformed_server_and_credentials" ]; - meta = with lib; { + meta = { description = "Defines the interface that VPN connection backends should implement"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-connection"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix new file mode 100644 index 0000000000000..8ff9321fc57c8 --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix @@ -0,0 +1,67 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gobject-introspection, + setuptools, + networkmanager, + proton-vpn-api-core, + proton-vpn-killswitch, + proton-vpn-logger, + pycairo, + pygobject3, + pytestCheckHook, + iproute2, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "proton-vpn-killswitch-network-manager-wireguard"; + version = "0.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-killswitch-network-manager-wireguard"; + rev = "v${version}"; + hash = "sha256-4sYD2X1U066FMjrtbTb31wvkCDWAw+eXod+pi0gGsCQ="; + }; + + nativeBuildInputs = [ + # Solves ImportError: cannot import name NM, introspection typelib not found + gobject-introspection + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + # Needed here for the NM namespace + networkmanager + proton-vpn-api-core + proton-vpn-killswitch + proton-vpn-logger + pycairo + pygobject3 + ]; + + postPatch = '' + substituteInPlace proton/vpn/killswitch/backend/linux/wireguard/killswitch_connection_handler.py \ + --replace '/usr/sbin/ip' '${iproute2}/bin/ip' + ''; + + pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.wireguard" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + meta = { + description = "Implementation of the proton-vpn-killswitch interface using Network Manager with wireguard-protocol"; + homepage = "https://github.com/ProtonVPN/proton-vpn-killswitch-network-manager-wireguard"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; + }; +} diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix index 68e024501cb65..c8d30741930c9 100644 --- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix @@ -5,53 +5,57 @@ gobject-introspection, setuptools, networkmanager, + proton-vpn-api-core, proton-vpn-killswitch, proton-vpn-logger, pycairo, pygobject3, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "proton-vpn-killswitch-network-manager"; - version = "0.4.3"; + version = "0.5.4"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-killswitch-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-kN41b6OZ2YXoBsmNZD3NrX4uJChSmm6DVP+5LYwiZMw="; + hash = "sha256-iUm+hpqgI4jG+1Cd9F6pBjodxHpq9/2ovXRT877biXQ="; }; nativeBuildInputs = [ # Solves ImportError: cannot import name NM, introspection typelib not found gobject-introspection + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ # Needed here for the NM namespace networkmanager + proton-vpn-api-core proton-vpn-killswitch proton-vpn-logger pycairo pygobject3 ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=proton.vpn.killswitch.backend.linux.networkmanager --cov-report=html --cov-report=term" "" - ''; - pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.networkmanager" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; - meta = with lib; { + meta = { description = "Implementation of the proton-vpn-killswitch interface using Network Manager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch-network-manager"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix index c2ed563df880e..ae83dd1e5baad 100644 --- a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix +++ b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix @@ -5,6 +5,7 @@ setuptools, proton-core, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -19,23 +20,21 @@ buildPythonPackage rec { hash = "sha256-XZqjAhxgIiATJd3JcW2WWUMC1b6+cfZRhXlIPyMUFH8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ proton-core ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=proton --cov-report=html --cov-report=term" "" - ''; + dependencies = [ proton-core ]; pythonImportsCheck = [ "proton.vpn.killswitch.interface" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; - meta = with lib; { + meta = { description = "Defines the ProtonVPN kill switch interface"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/proton-vpn-logger/default.nix b/pkgs/development/python-modules/proton-vpn-logger/default.nix index d492ed146eb7e..402b6e0e49105 100644 --- a/pkgs/development/python-modules/proton-vpn-logger/default.nix +++ b/pkgs/development/python-modules/proton-vpn-logger/default.nix @@ -5,6 +5,7 @@ setuptools, proton-core, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -19,28 +20,28 @@ buildPythonPackage rec { hash = "sha256-/LfMjyTs/EusgnKEQugsdJzqDZBvaAhbsTUVLDCRw0I="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ proton-core ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=proton/vpn/logging/ --cov-report html --cov-report term" "" - ''; + dependencies = [ proton-core ]; pythonImportsCheck = [ "proton.vpn.logging" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; preCheck = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) ''; - meta = with lib; { + meta = { description = "General purpose logging package for the entire ProtonVPN Linux client"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-logger"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix index c10b489ed6b0d..25c9715e7e6be 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix @@ -7,44 +7,46 @@ proton-core, proton-vpn-network-manager, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "proton-vpn-network-manager-openvpn"; - version = "0.0.7"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager-openvpn"; rev = "refs/tags/v${version}"; - hash = "sha256-AHG4jEEv1ihpboQwz6FmNtlqCE83qyOeGzBDHQcvD6o="; + hash = "sha256-eDBcpuz37crfAFX6oysB4FCkSmVLyfLJ0R2L0cZgjRo="; }; nativeBuildInputs = [ # Solves Namespace NM not available gobject-introspection + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ proton-core proton-vpn-network-manager ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=proton.vpn.backend.linux.networkmanager.protocol.openvpn --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager.protocol" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; - meta = with lib; { + meta = { description = "Adds support for the OpenVPN protocol using NetworkManager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-openvpn"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix new file mode 100644 index 0000000000000..e32a4b5a1b88a --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gobject-introspection, + setuptools, + proton-core, + proton-vpn-killswitch-network-manager-wireguard, + proton-vpn-network-manager, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "proton-vpn-network-manager-wireguard"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-network-manager-wireguard"; + rev = "v${version}"; + hash = "sha256-DZXixcm2VwXhbN4buABlkybDgXIg/mbeUVHOpdoj0Kw="; + }; + + nativeBuildInputs = [ + # Solves Namespace NM not available + gobject-introspection + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + proton-core + proton-vpn-killswitch-network-manager-wireguard + proton-vpn-network-manager + ]; + + preCheck = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + meta = { + description = "Adds support for the Wireguard protocol using NetworkManager"; + homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-wireguard"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; + }; +} diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index 97dd1d52dca98..fea0d2e304d00 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -6,56 +6,58 @@ setuptools, networkmanager, proton-core, + proton-vpn-api-core, proton-vpn-connection, pycairo, pygobject3, pytest-asyncio, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.4.2"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-zw6fzay1zCBIrouDg2EMhaxDLKIYV5TKYK5lQ3v8W6o="; + hash = "sha256-hTJE9sUjPMsE9d0fIA/OhoasumtfsWuFwn0aTm10PN4="; }; nativeBuildInputs = [ # Needed to recognize the NM namespace gobject-introspection + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ # Needed here for the NM namespace networkmanager proton-core + proton-vpn-api-core proton-vpn-connection pycairo pygobject3 ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=proton/vpn/backend/linux/networkmanager --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager" ]; nativeCheckInputs = [ - pytest-asyncio pytestCheckHook + pytest-cov-stub + pytest-asyncio ]; - meta = with lib; { + meta = { description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/proton-vpn-session/default.nix b/pkgs/development/python-modules/proton-vpn-session/default.nix index 5210c42373111..ee27bfb9b4669 100644 --- a/pkgs/development/python-modules/proton-vpn-session/default.nix +++ b/pkgs/development/python-modules/proton-vpn-session/default.nix @@ -13,6 +13,7 @@ pytest-asyncio, requests, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -27,9 +28,11 @@ buildPythonPackage rec { hash = "sha256-/5ju/2bxhqK6JWchkxFe3amBKHtO98GCVQWIrUsn+nQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ cryptography distro proton-core @@ -37,11 +40,6 @@ buildPythonPackage rec { pynacl ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=proton.vpn.session --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.vpn.session" ]; postInstall = '' @@ -55,12 +53,13 @@ buildPythonPackage rec { pytest-asyncio requests pytestCheckHook + pytest-cov-stub ]; meta = { description = "Provides utility classes to manage VPN sessions"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-session"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix index 7502d2daf3cc5..ee2862361081f 100644 --- a/pkgs/development/python-modules/prox-tv/default.nix +++ b/pkgs/development/python-modules/prox-tv/default.nix @@ -41,7 +41,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ "test_tvp_1d" ] ++ lib.optionals stdenv.isDarwin [ "test_tv2_1d" ]; + disabledTests = [ "test_tvp_1d" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_tv2_1d" ]; meta = with lib; { homepage = "https://github.com/albarji/proxTV"; diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index f6ffef6ea7278..9a5c0cf60fdcc 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, attrs, docopt, pillow, @@ -11,15 +12,15 @@ numpy, aggdraw, pytestCheckHook, - pytest-cov, + pytest-cov-stub, ipython, cython, }: buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.34"; - format = "setuptools"; + version = "1.10.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,20 +28,18 @@ buildPythonPackage rec { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UFdprXoHFsbH3Tbui44n8FTdbkynnYVL1LHtFzFInio="; + hash = "sha256-H3Szd8/NjXCkWyG/q+6O5L0Iq5u/g4UNdEmhDqQsAY8="; }; - postPatch = '' - sed -i "/addopts =/d" pyproject.toml - ''; - - nativeBuildInputs = [ cython ]; + build-system = [ + setuptools + cython + ]; - propagatedBuildInputs = [ + dependencies = [ aggdraw attrs docopt - ipython numpy pillow scikit-image @@ -49,7 +48,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub + ipython ]; pythonImportsCheck = [ "psd_tools" ]; diff --git a/pkgs/development/python-modules/psrpcore/default.nix b/pkgs/development/python-modules/psrpcore/default.nix index 72c8da5f54078..8003780b86c28 100644 --- a/pkgs/development/python-modules/psrpcore/default.nix +++ b/pkgs/development/python-modules/psrpcore/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { changelog = "https://github.com/jborean93/psrpcore/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 4c0a93d2faa44..ee3f390b79af3 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { buildInputs = # workaround for https://github.com/NixOS/nixpkgs/issues/146760 - lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ CoreFoundation ] - ++ lib.optionals stdenv.isDarwin [ IOKit ]; + lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ CoreFoundation ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; nativeCheckInputs = [ pytestCheckHook ]; # Segfaults on darwin: # https://github.com/giampaolo/psutil/issues/1715 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # In addition to the issues listed above there are some that occure due to # our sandboxing which we can work around by disabling some tests: diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 7d1f8c54f3d04..7d7692018e80f 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -35,13 +35,13 @@ let pname = "psycopg"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jQMIgfMyQpd9bD3F1IhPff39BrFaBD6U7Exryna+Acw="; + hash = "sha256-Udysl00lB6rxmQByME6PI3KL4tlzIZ0/CZNWLVKssS8="; }; patches = [ @@ -74,11 +74,16 @@ let nativeBuildInputs = [ cython + # needed to find pg_config with strictDeps postgresql setuptools tomli ]; + buildInputs = [ + postgresql + ]; + # tested in psycopg doCheck = false; @@ -156,7 +161,7 @@ buildPythonPackage rec { "psycopg_pool" ]; - passthru.optional-dependencies = { + optional-dependencies = { c = [ psycopg-c ]; pool = [ psycopg-pool ]; }; @@ -169,9 +174,9 @@ buildPythonPackage rec { pytestCheckHook postgresql ] - ++ lib.optional (stdenv.isLinux) postgresqlTestHook - ++ passthru.optional-dependencies.c - ++ passthru.optional-dependencies.pool; + ++ lib.optional (stdenv.hostPlatform.isLinux) postgresqlTestHook + ++ optional-dependencies.c + ++ optional-dependencies.pool; env = { postgresqlEnableTCP = 1; @@ -183,7 +188,7 @@ buildPythonPackage rec { '' cd .. '' - + lib.optionalString (stdenv.isLinux) '' + + lib.optionalString (stdenv.hostPlatform.isLinux) '' export PSYCOPG_TEST_DSN="host=/build/run/postgresql user=$PGUSER" ''; @@ -200,13 +205,16 @@ buildPythonPackage rec { # Mypy typing test "tests/test_typing.py" "tests/crdb/test_typing.py" + # https://github.com/psycopg/psycopg/pull/915 + "tests/test_notify.py" + "tests/test_notify_async.py" ]; pytestFlagsArray = [ "-o" "cache_dir=$TMPDIR" "-m" - "'not refcount and not timing'" + "'not refcount and not timing and not flakey'" # pytest.PytestRemovedIn9Warning: Marks applied to fixtures have no effect "-W" "ignore::pytest.PytestRemovedIn9Warning" diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index ec958d7525c94..aaab94547a02c 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { # some linker flags are added but the linker ignores them because they're incompatible # https://github.com/psycopg/psycopg2/blob/89005ac5b849c6428c05660b23c5a266c96e677d/setup.py substituteInPlace setup.py \ - --replace "self.pg_config_exe = self.build_ext.pg_config" 'self.pg_config_exe = "${lib.getExe' buildPackages.postgresql "pg_config"}"' + --replace-fail "self.pg_config_exe = self.build_ext.pg_config" 'self.pg_config_exe = "${lib.getDev buildPackages.postgresql}/bin/pg_config"' ''; nativeBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { sphinx-better-theme ]; - buildInputs = [ postgresql ] ++ lib.optionals stdenv.isDarwin [ openssl ]; + buildInputs = [ postgresql ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; sphinxRoot = "doc/src"; diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix index b8c86c970a841..4201bd1540716 100644 --- a/pkgs/development/python-modules/psycopg2cffi/default.nix +++ b/pkgs/development/python-modules/psycopg2cffi/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; # FATAL: could not create shared memory segment: Operation not permitted - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ postgresqlTestHook diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 9ddbd38d9339e..3ec9a6f76d763 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -4,30 +4,32 @@ pythonOlder, fetchPypi, appdirs, - importlib-metadata, jedi, prompt-toolkit, pygments, + setuptools, }: buildPythonPackage rec { pname = "ptpython"; - version = "3.0.28"; - format = "setuptools"; + version = "3.0.29"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vFBvVNuvRHykdMhRytNx5J4rdg2JGcQidAMH+tIqUIc="; + hash = "sha256-udYlGDrvk6Zz/DLL4cH8r1FBLnpPGVkFIc2syt8lGG4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ appdirs jedi prompt-toolkit pygments - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # no tests to run doCheck = false; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 4edaaaed333f5..b3a0785c2ad2c 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20240724"; + version = "1.0.2.20241002"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7pxRDUkWC1Umu5Eq6JiUnRadbMmjC96uMJynYPhSfUI="; + hash = "sha256-IPeNtpXAbonbHHpNVkv8zfD7T+InkIk9s/7sU64wRQ0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pulsectl-asyncio/default.nix b/pkgs/development/python-modules/pulsectl-asyncio/default.nix index 1a985c8ab1d33..8b7c70dc79eba 100644 --- a/pkgs/development/python-modules/pulsectl-asyncio/default.nix +++ b/pkgs/development/python-modules/pulsectl-asyncio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pulsectl-asyncio"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mhthies"; repo = "pulsectl-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-WqUO4eERJkRg6O+gCmjqfdVbBT/3TVVBUUduoIxcPNQ="; + hash = "sha256-VmogNphVZNJSUKUqp7xADRl78Ooofhl1YYrtYz5MBYc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index abdc439fd611e..756826b4500a5 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "24.4.0"; + version = "24.8.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-aX7VDn1FLnhniuOOKrk1hDAIvsRIlVKDzQ+zYoZ+MWU="; + hash = "sha256-sFFQbQ1z08xDV879PeF7uFnX7PAE6ZSw98+oeFG8cVY="; }; patches = [ diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index f5f31cd83ffb6..ca59412c74d75 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.49.1"; + version = "6.54.1"; pyproject = true; build-system = [ setuptools ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-THgLOVCr+LWNO1SCGUrh8L/I75d2RSNw84FcovCSsBM="; + hash = "sha256-OFkXLH8r4BSvALv8kd7vm8k5TDJPBJSuJ04FzNdsrF8="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/pure-python-adb/default.nix b/pkgs/development/python-modules/pure-python-adb/default.nix index 39ca6addf0080..9b861f821a4a3 100644 --- a/pkgs/development/python-modules/pure-python-adb/default.nix +++ b/pkgs/development/python-modules/pure-python-adb/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { sha256 = "0kdr7w2fhgjpcf1k3l6an9im583iqkr6v8hb4q1zw30nh3bqkk0f"; }; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; }; doCheck = pythonOlder "3.10"; # all tests result in RuntimeError on 3.10 - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.async; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.async; pythonImportsCheck = [ "ppadb.client" ] ++ lib.optionals doCheck [ "ppadb.client_async" ]; diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 3012925d4103c..9881df2a4c43f 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.27"; + version = "1.28"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-93akHgfkNbYGDJxXXJTk9yobvpiycqdroVBEeOzDiFQ="; + hash = "sha256-a7jRQUSbH3E6eJiXNKr4ikdSXRZ6+/csl/EMiKXMzmk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pwkit/default.nix b/pkgs/development/python-modules/pwkit/default.nix index f1fe2ad54556e..6a4e3de6badd8 100644 --- a/pkgs/development/python-modules/pwkit/default.nix +++ b/pkgs/development/python-modules/pwkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pwkit"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkgw"; repo = "pwkit"; rev = "refs/tags/pwkit@${version}"; - hash = "sha256-bQno1SIbxAJ1TL068eshfFgAkRXFmbGu2GTbv1BRGU0="; + hash = "sha256-X3nQPtPrY1+HH0Cs7PrFLqMP3fUEcwXQGap1F/3Aom0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pwndbg/default.nix b/pkgs/development/python-modules/pwndbg/default.nix index 110fd273fbe1a..f71117d7497a8 100644 --- a/pkgs/development/python-modules/pwndbg/default.nix +++ b/pkgs/development/python-modules/pwndbg/default.nix @@ -19,33 +19,16 @@ gdb-pt-dump, poetry-core, }: -let - # The newest gdb-pt-dump is incompatible with pwndbg 2024.02.14. - # See https://github.com/martinradev/gdb-pt-dump/issues/29 - gdb-pt-dump' = gdb-pt-dump.overrideAttrs (oldAttrs: { - version = "0-unstable-2023-11-11"; - - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "89ea252f6efc5d75eacca16fc17ff8966a389690"; - hash = "sha256-i+SAcZ/kgfKstJnkyCVMh/lWtrJJOHTYoJH4tVfYHrE="; - }; - - # This revision relies on the package being imported from within GDB, which - # won't work with pythonImportsCheck. - pythonImportsCheck = [ ]; - }); -in buildPythonPackage rec { pname = "pwndbg"; - version = "2024.02.14"; + version = "2024.08.29"; pyproject = true; src = fetchFromGitHub { owner = "pwndbg"; repo = "pwndbg"; rev = version; - hash = "sha256-/pDo2J5EtpWWCurD7H34AlTlQi7WziIRRxHxGm3K2yk="; + hash = "sha256-mpkUEP0GBwOfbbpogupmDvCo8dkbSGy1YtH8T55rX9g="; }; nativeBuildInputs = [ @@ -68,7 +51,7 @@ buildPythonPackage rec { tabulate typing-extensions unicorn - gdb-pt-dump' + gdb-pt-dump ]; meta = { diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 390c65120854e..228b89890f964 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -33,12 +33,12 @@ let in buildPythonPackage rec { pname = "pwntools"; - version = "4.13.0"; + version = "4.13.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-HVyiU4PsEPtk4o0ULB2Gj5HqHFOpPTUx0wFdgwgo08M="; + hash = "sha256-szInJftQMdwwll44VQc2CNmr900qv5enLGfUSq3843w="; }; postPatch = '' @@ -82,7 +82,7 @@ buildPythonPackage rec { installShellCompletion --bash extra/bash_completion.d/shellcraft ''; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/bin" makeWrapper "${debugger}/bin/${debuggerName}" "$out/bin/pwntools-gdb" ''; diff --git a/pkgs/development/python-modules/py-bip39-bindings/default.nix b/pkgs/development/python-modules/py-bip39-bindings/default.nix index 24521f5289ac1..72ea11e585220 100644 --- a/pkgs/development/python-modules/py-bip39-bindings/default.nix +++ b/pkgs/development/python-modules/py-bip39-bindings/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix index cf734872942d9..8485fe8c28376 100644 --- a/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # On Darwin sysctl is used to read CPU information. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cpuinfo/cpuinfo.py \ --replace "len(_program_paths('sysctl')) > 0" "True" \ --replace "_run_and_get_stdout(['sysctl'" "_run_and_get_stdout(['${sysctl}/bin/sysctl'" diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix index b66839c0722fd..b5d8e7f4ab292 100644 --- a/pkgs/development/python-modules/py-libzfs/default.nix +++ b/pkgs/development/python-modules/py-libzfs/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, fetchpatch2, - setuptools, cython_0, zfs, }: @@ -32,7 +31,7 @@ buildPythonPackage rec { buildInputs = [ zfs ]; # Passing CFLAGS in configureFlags does not work, see https://github.com/truenas/py-libzfs/issues/107 - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace configure \ --replace-fail \ 'CFLAGS="-DCYTHON_FALLTHROUGH"' \ diff --git a/pkgs/development/python-modules/py-madvr2/default.nix b/pkgs/development/python-modules/py-madvr2/default.nix index 1018978cd338e..05799d43226ae 100644 --- a/pkgs/development/python-modules/py-madvr2/default.nix +++ b/pkgs/development/python-modules/py-madvr2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-madvr2"; - version = "1.6.29"; + version = "1.6.32"; pyproject = true; src = fetchFromGitHub { owner = "iloveicedgreentea"; repo = "py-madvr"; rev = "refs/tags/${version}"; - hash = "sha256-ibgmUpHSmOr5glSZPIJXTBDlEnQoWtmJzmEGsggQxnk="; + hash = "sha256-yD8DNhYG9oauEGKnX8Qnh0oSwG/AZa8FIRtHVq4DyTE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix new file mode 100644 index 0000000000000..03fbc02e36870 --- /dev/null +++ b/pkgs/development/python-modules/py-ocsf-models/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + cryptography, + email-validator, + fetchFromGitHub, + poetry-core, + pydantic, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "py-ocsf-models"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "prowler-cloud"; + repo = "py-ocsf-models"; + rev = "refs/tags/${version}"; + hash = "sha256-cFtWPO78KRh7IY+ePTzXpLPbZm+EtNvuJkhZZzKKjaA="; + }; + + pythonRelaxDeps = true; + + build-system = [ poetry-core ]; + + dependencies = [ + cryptography + email-validator + pydantic + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # Tests are outdated + doCheck = false; + + pythonImportsCheck = [ "py_ocsf_models" ]; + + meta = { + description = "OCSF models in Python using Pydantic"; + homepage = "https://github.com/prowler-cloud/py-ocsf-models"; + changelog = "https://github.com/prowler-cloud/py-ocsf-models/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix index d1908b79d3d0d..a9d4988c6fe9e 100644 --- a/pkgs/development/python-modules/py-serializable/default.nix +++ b/pkgs/development/python-modules/py-serializable/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "py-serializable"; - version = "1.1.0"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "madpah"; repo = "serializable"; rev = "refs/tags/v${version}"; - hash = "sha256-8rGsFQzZbWJydzGhdobeN/L2LH2BEpC7O9D/h8zoXcM="; + hash = "sha256-2A+QjokZ7gtgstclZ7PFSPymYjQYKsLVXy9xbFOfxLo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix index 51915de513a78..123562c8d21ad 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 93a5f245ff1ba..8361171fc261f 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.4.5"; - format = "pyproject"; + version = "2.5.3"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mib1185"; repo = "py-synologydsm-api"; rev = "refs/tags/v${version}"; - hash = "sha256-aVU+E5TwGIH+y7qtS5pBkW14EbZI6kb1Hy2zEqk1nrk="; + hash = "sha256-3DpgJqL8pSiAK/t/Qe2CxntQStTqDumkivhnPKHVlnE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index 38bdf6c4c18d8..e9f0efe24030a 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; # Work around Python distutils compiling C++ with $CC (see issue #26709) - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; pythonImportsCheck = [ "pyexiv2" ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Python binding to the library exiv2"; homepage = "https://launchpad.net/py3exiv2"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index b131b1b11bb97..77d33a7d9b791 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.22.0"; + version = "4.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,12 +29,12 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-hP9MXv3/754ouvPgyOZKzBtEU2BugHUUE/e8biZPLFY="; + hash = "sha256-R/RbkiKkhcZd17hgDJnEpr3OCVMvn744YM+lmzSXKWs="; }; build-system = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { json = [ ujson ]; PIL = [ pillow ]; redis = [ redis ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook requests - ] ++ passthru.optional-dependencies.watchdog ++ passthru.optional-dependencies.aiohttp; + ] ++ optional-dependencies.watchdog ++ optional-dependencies.aiohttp; pythonImportsCheck = [ "telebot" ]; diff --git a/pkgs/development/python-modules/pyairports/default.nix b/pkgs/development/python-modules/pyairports/default.nix index b6c8b2a8a4c41..3803d95492183 100644 --- a/pkgs/development/python-modules/pyairports/default.nix +++ b/pkgs/development/python-modules/pyairports/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; - pythonImportChecks = [ "pyairports" ]; + pythonImportsCheck = [ "pyairports" ]; meta = with lib; { description = "pyairports is a package which enables airport lookup by 3-letter IATA code."; diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix index d8a2da0da957f..2ed166b9a78bf 100644 --- a/pkgs/development/python-modules/pyais/default.nix +++ b/pkgs/development/python-modules/pyais/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.7.2"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "M0r13n"; repo = "pyais"; rev = "refs/tags/v${version}"; - hash = "sha256-itv5tVM8ff2gNUDGxY4aMKrpJVgfwPB/FWYog+CzJY4="; + hash = "sha256-qggtwz6cSz5mLKLVY0i7gWs09EcOoxlWWQoHZv+TDc8="; }; build-system = [ setuptools ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for decoding and encoding AIS messages (AIVDM/AIVDO)"; homepage = "https://github.com/M0r13n/pyais"; - changelog = "https://github.com/M0r13n/pyais/blob/${version}/CHANGELOG.txt"; + changelog = "https://github.com/M0r13n/pyais/blob/v${version}/CHANGELOG.txt"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 3c9b1d3bc211f..e22429f0716fa 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -122,7 +122,7 @@ buildPythonPackage rec { # expects arrow-cpp headers to be bundled "--deselect=pyarrow/tests/test_cpp_internals.py::test_pyarrow_include" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Requires loopback networking "--deselect=pyarrow/tests/test_ipc.py::test_socket_" "--deselect=pyarrow/tests/test_flight.py::test_never_sends_data" @@ -136,7 +136,7 @@ buildPythonPackage rec { # Repr output is printing number instead of enum name so these tests fail "--deselect=pyarrow/tests/test_fs.py::test_get_file_info" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # this test requires local networking "--deselect=pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs" ]; @@ -152,7 +152,7 @@ buildPythonPackage rec { mv pyarrow/conftest.py pyarrow/tests/parent_conftest.py substituteInPlace pyarrow/tests/conftest.py --replace ..conftest .parent_conftest '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # OSError: [Errno 24] Too many open files ulimit -n 1024 ''; diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 9d76a23bc780f..56deb73693279 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "8.0.3"; + version = "8.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,20 +26,18 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "refs/tags/v${version}"; - hash = "sha256-FnDXj+bY/TMdengnxgludXUTiZw9wpeFiNbWTIxrlzw="; + hash = "sha256-SRuBV7XWt4Myks7kbUzGAscggspUbRoLOvYNiorF8To="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "oauthlib~=3.1" "oauthlib" \ - --replace "requests~=2.24" "requests" - ''; - - pythonRelaxDeps = [ "requests-oauthlib" ]; + pythonRelaxDeps = [ + "oauthlib" + "requests-oauthlib" + "requests" + ]; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp oauthlib requests diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index eea3e1c697023..3ffed8bd8acd5 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.15.0"; + version = "0.15.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "postlund"; repo = "pyatv"; rev = "refs/tags/v${version}"; - hash = "sha256-59XDh+TA4UYzfLJtbTiMC6Wz7EvUW22ONM4JQw5t/5o="; + hash = "sha256-8ODhDuc4jaLtrLZYd1yJlpYygO6KaguyR/yLWb/rMR4="; }; postPatch = '' @@ -95,7 +95,7 @@ buildPythonPackage rec { # https://github.com/postlund/pyatv/issues/2365 "test_simple_dispatch" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False "test_stream_retransmission" ]; diff --git a/pkgs/development/python-modules/pyaussiebb/default.nix b/pkgs/development/python-modules/pyaussiebb/default.nix index f33fe89fc2ea5..57e758d25f9f7 100644 --- a/pkgs/development/python-modules/pyaussiebb/default.nix +++ b/pkgs/development/python-modules/pyaussiebb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyaussiebb"; - version = "0.1.1"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,23 +21,23 @@ buildPythonPackage rec { owner = "yaleman"; repo = "aussiebb"; rev = "refs/tags/v${version}"; - hash = "sha256-XNf9vYMlTLqhYIVNw9GjPcXpOm5EYCcC4aGukR8g3zc="; + hash = "sha256-IW2HraJbgvf0G1eRXNpnsPMWlLXi2P9DTyk+tG5Hc2U="; }; - nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'requests = "^2.27.1"' 'requests = "*"' + ''; + + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp requests loguru pydantic ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'requests = "^2.27.1"' 'requests = "*"' - ''; - # Tests require credentials and requests-testing doCheck = false; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 9ca1e37695664..750ee618f9d2b 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -33,7 +33,7 @@ let # support for C++17 aligned allocations on macOS. # Tell clang we’re targeting 10.13 on x86_64-darwin while continuing to use the default SDK. stdenv' = - if stdenv.isDarwin && stdenv.isx86_64 then + if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then python.stdenv.override (oldStdenv: { buildPlatform = oldStdenv.buildPlatform // { darwinMinVersion = "10.13"; @@ -50,14 +50,14 @@ let in buildPythonPackage rec { pname = "pybind11"; - version = "2.13.1"; + version = "2.13.5"; pyproject = true; src = fetchFromGitHub { owner = "pybind"; repo = "pybind11"; rev = "v${version}"; - hash = "sha256-sQUq39CmgsDEMfluKMrrnC5fio//pgExcyqJAE00UjU="; + hash = "sha256-cpxhrTFihA+gWmX62a+EQF3lccUyvu+d1MU2IC/CN6Q="; }; build-system = [ @@ -115,7 +115,7 @@ buildPythonPackage rec { "tests/extra_setuptools/test_setuphelper.py" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # expects KeyError, gets RuntimeError # https://github.com/pybind/pybind11/issues/4243 "test_cross_module_exception_translator" diff --git a/pkgs/development/python-modules/pyblu/default.nix b/pkgs/development/python-modules/pyblu/default.nix index 7aa6faf27c3d2..867ca8ba31cb1 100644 --- a/pkgs/development/python-modules/pyblu/default.nix +++ b/pkgs/development/python-modules/pyblu/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyblu"; - version = "1.0.1"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "LouisChrist"; repo = "pyblu"; rev = "refs/tags/v${version}"; - hash = "sha256-Qe6GNzF8ffNSwqRL5QlN9x3dqwaX/YCfY/keEDwWW/8="; + hash = "sha256-1H7TqFPVstB+nCYwWOT8E2HcmkLQx9pekBq2WIAf8DQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index d3842358db2f1..ca745113c5925 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/pybluez/pybluez"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars ]; - broken = stdenv.isDarwin; # requires pyobjc-core, pyobjc-framework-Cocoa + broken = stdenv.hostPlatform.isDarwin; # requires pyobjc-core, pyobjc-framework-Cocoa }; } diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index 0707726f58e94..c00712fdfaf90 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.2.12"; + version = "2.2.14"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pbs"; repo = "pycaption"; rev = "refs/tags/${version}"; - hash = "sha256-vdSoqNWEubK0np14EiI/hRbrEx0722qg6Ggcpmhz8FM="; + hash = "sha256-9COO8cJRxXiWWceh3XtasSMBq7E5Py0p+1b3sWMaMWE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index f14248b781b08..df5007d938286 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "14.0.1"; + version = "14.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - hash = "sha256-4W4Kf5SIMZGRuLT6IcoL60vxLu2lyb9kAkEYjyvqCj4="; + hash = "sha256-CSxl9CGZG8pWUzi8YaDBSGHEfg9cCmWRml6T8C39Bxo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix index 65f9afc40903f..631bebd566bfe 100644 --- a/pkgs/development/python-modules/pyclip/default.nix +++ b/pkgs/development/python-modules/pyclip/default.nix @@ -30,19 +30,19 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ xclip xvfb-run ]; checkPhase = '' runHook preCheck - ${lib.optionalString stdenv.isLinux "xvfb-run -s '-screen 0 800x600x24'"} pytest tests + ${lib.optionalString stdenv.hostPlatform.isLinux "xvfb-run -s '-screen 0 800x600x24'"} pytest tests runHook postCheck ''; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Cross-platform clipboard utilities supporting both binary and text data"; mainProgram = "pyclip"; homepage = "https://github.com/spyoungtech/pyclip"; diff --git a/pkgs/development/python-modules/pycontrol4/default.nix b/pkgs/development/python-modules/pycontrol4/default.nix index 7363381bdecda..4276c1dde7489 100644 --- a/pkgs/development/python-modules/pycontrol4/default.nix +++ b/pkgs/development/python-modules/pycontrol4/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycontrol4"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lawtancool"; repo = "pyControl4"; rev = "refs/tags/v${version}"; - hash = "sha256-1gZebYseuEBI0dlXlD72f/uozNuoxHPqVsc8AWJV148="; + hash = "sha256-0ZuztqHbrd+kMDGv3xyUYoTF/Ho+oHkycjSrKz8JABM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix index be5d6f82cba6b..97b7d7d48c8d1 100644 --- a/pkgs/development/python-modules/pycookiecheat/default.nix +++ b/pkgs/development/python-modules/pycookiecheat/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { "test_load_firefox_cookie_db" "test_no_cookies" "test_warns_for_string_browser" - ] ++ lib.optionals stdenv.isDarwin [ "test_slack_config" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_slack_config" ]; meta = with lib; { description = "Borrow cookies from your browser's authenticated session for use in Python scripts"; diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix index 9f69727808a16..3d7d3d45a19eb 100644 --- a/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -1,17 +1,25 @@ { lib, buildPythonPackage, - fetchFromGitHub, pythonOlder, + fetchFromGitHub, + + # build-system hatchling, + + # dependencies anyio, + pycrdt, + sqlite-anyio, + + # optional-dependencies channels, + + # tests httpx-ws, hypercorn, - pycrdt, pytest-asyncio, pytestCheckHook, - sqlite-anyio, trio, uvicorn, websockets, @@ -19,7 +27,7 @@ buildPythonPackage rec { pname = "pycrdt-websocket"; - version = "0.14.1"; + version = "0.14.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +36,7 @@ buildPythonPackage rec { owner = "jupyter-server"; repo = "pycrdt-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-lQ8ZYzFKdVvIEp38WztOWFpJhi4LtA8ODpAFgSZVpU8="; + hash = "sha256-YsAeEUFxCwu7KA2d83J/rb1IlZTQZZecHJAewh+TqWs="; }; build-system = [ hatchling ]; @@ -62,11 +70,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "WebSocket Connector for pycrdt"; homepage = "https://github.com/jupyter-server/pycrdt-websocket"; changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = teams.jupyter.members; + license = lib.licenses.mit; + maintainers = lib.teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 1b6ad5bb32ce3..4cfd8c41c19c5 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -9,16 +9,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] -name = "atomic_refcell" -version = "0.1.13" +name = "async-lock" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bitflags" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bumpalo" @@ -32,11 +54,61 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" dependencies = [ "getrandom", ] @@ -54,6 +126,12 @@ dependencies = [ "wasm-bindgen", ] +[[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" @@ -74,18 +152,28 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.155" +version = "0.2.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "lock_api" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] [[package]] name = "log" @@ -110,15 +198,43 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[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", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "proc-macro2" @@ -131,7 +247,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.9.8" +version = "0.9.16" dependencies = [ "pyo3", "yrs", @@ -139,9 +255,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" +checksum = "15ee168e30649f7f234c3d49ef5a7a6cbf5134289bc46c29ff3155fa3221c225" dependencies = [ "cfg-if", "indoc", @@ -157,9 +273,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" +checksum = "e61cef80755fe9e46bb8a0b8f20752ca7676dcc07a5277d8b7768c6172e529b3" dependencies = [ "once_cell", "target-lexicon", @@ -167,9 +283,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" +checksum = "67ce096073ec5405f5ee2b8b31f03a68e02aa10d5d4f565eca04acc41931fa1c" dependencies = [ "libc", "pyo3-build-config", @@ -177,9 +293,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" +checksum = "2440c6d12bc8f3ae39f1e775266fa5122fd0c8891ce7520fa6048e683ad3de28" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -189,9 +305,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" +checksum = "1be962f0e06da8f8465729ea2cb71a416d2257dff56cbe40a70d3e62a93ae5d1" dependencies = [ "heck", "proc-macro2", @@ -202,33 +318,48 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags", +] + [[package]] name = "ryu" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +[[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.206" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.206" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -237,9 +368,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.124" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -264,9 +395,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.74" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -281,18 +412,18 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -301,9 +432,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unindent" @@ -319,19 +450,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -344,9 +476,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -354,9 +486,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -367,18 +499,84 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "yrs" -version = "0.19.2" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8ca5126331b9a5ef5bb10f3f1c3d01b05f298d348c66f8fb15497d83ee73176" +checksum = "7a6eac182a01ef4cbf4edb5e71e2c560a34144ae82680aab66a62c172b7ae2a2" dependencies = [ "arc-swap", - "atomic_refcell", + "async-lock", + "async-trait", + "dashmap", "fastrand", "serde", "serde_json", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 7cc073ff81a57..952052246a4a1 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -3,27 +3,34 @@ stdenv, buildPythonPackage, fetchFromGitHub, + + # buildInputs libiconv, + + # nativeBuildInputs rustPlatform, + + # tests anyio, objsize, pydantic, pytestCheckHook, trio, y-py, + nix-update-script, }: buildPythonPackage rec { pname = "pycrdt"; - version = "0.9.8"; + version = "0.9.16"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; rev = "refs/tags/v${version}"; - hash = "sha256-W93rLSDcCB9jrxC/Z88ToCkcfMGnCTGjBkVRNk3lLaI="; + hash = "sha256-AO5KGBG4I+D5q/VSifzmg0ImAujR1ol9zGU4Y61fImc="; }; postPatch = '' @@ -37,7 +44,9 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + + dependencies = [ anyio ]; pythonImportsCheck = [ "pycrdt" ]; @@ -52,11 +61,11 @@ buildPythonPackage rec { passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; - meta = with lib; { + meta = { description = "CRDTs based on Yrs"; homepage = "https://github.com/jupyter-server/pycrdt"; - changelog = "https://github.com/jupyter-server/pycrdt/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = teams.jupyter.members; + changelog = "https://github.com/jupyter-server/pycrdt/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + license = lib.licenses.mit; + maintainers = lib.teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix index 79c1646b1059c..8a89193a64ebf 100644 --- a/pkgs/development/python-modules/pycups/default.nix +++ b/pkgs/development/python-modules/pycups/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-hD44XB2/aUmWyoTvAqfzDCg3YDVYj1++rNa64AXPfI0="; }; - buildInputs = [ cups ] ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ cups ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; # Wants to connect to CUPS doCheck = false; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 689e23e3c1aef..5f9334ebb1eeb 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { # https://github.com/pycurl/pycurl/issues/836 "test_proxy_tlsauth" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fatal Python error: Segmentation fault "cadata_test" ]; diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix index 698a9e20595a7..5dc9dec212477 100644 --- a/pkgs/development/python-modules/pycyphal/default.nix +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nunavut ]; - passthru.optional-dependencies = { + optional-dependencies = { transport-can-pythoncan = [ python-can ] ++ python-can.optional-dependencies.serial; transport-serial = [ cobs @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-asyncio - ] ++ builtins.foldl' (x: y: x ++ y) [ ] (builtins.attrValues passthru.optional-dependencies); + ] ++ builtins.foldl' (x: y: x ++ y) [ ] (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index a11d993323510..140a13f6678dc 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.13.6"; + version = "2.13.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fredrike"; repo = "pydaikin"; rev = "refs/tags/v${version}"; - hash = "sha256-b1dvPrtvYJuTZNUase4GgXFGq69QKJZoxUr2iuYShxk="; + hash = "sha256-pLr878LbflRlHzDjarwDLQFHbRZjRvlAZEqP1tfVBNA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index 48e8f7188bce9..77d3395258780 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -47,7 +47,7 @@ let typing-extensions ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ typing-extensions ]; diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index 2b268d2bf543f..cfd0df8c7603a 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { dotenv = [ python-dotenv ]; email = [ email-validator ]; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mock pytest7CheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ # https://github.com/pydantic/pydantic/issues/4817 diff --git a/pkgs/development/python-modules/pydeck/default.nix b/pkgs/development/python-modules/pydeck/default.nix index e0c77c5a2ce1c..51cb247a51799 100644 --- a/pkgs/development/python-modules/pydeck/default.nix +++ b/pkgs/development/python-modules/pydeck/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { carto = [ # pydeck-carto ]; @@ -61,7 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pandas - ] ++ passthru.optional-dependencies.jupyter; + ] ++ optional-dependencies.jupyter; # tries to start a jupyter server disabledTests = [ "test_nbconvert" ]; diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 68e31e0002701..1cd8c6e8a91d3 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "116"; + version = "117"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-XtcAs+xKSTJcQN0mCj6ewkT7owvA7nlZ8PhWfL9NZh8="; + hash = "sha256-G04Lb92yrSQBs/Vc3wW60jR74nsWzfjAUfQPzqVhoLk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix index 8cb99dd9806ff..207e5e5c9edfd 100644 --- a/pkgs/development/python-modules/pydevd/default.nix +++ b/pkgs/development/python-modules/pydevd/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { # https://github.com/fabioz/PyDev.Debugger/issues/269 "test_evaluate_expression" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing_simple" "test_evaluate_exception_trace" ]; diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index e2d86333c1cc5..94822a24d4445 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -66,11 +66,11 @@ buildPythonPackage { # tries to remove a dicom inside $HOME/.pydicom/data/ and download it again "test_fetch_data_files" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # https://github.com/pydicom/pydicom/issues/1386 "test_array" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky, hard to reproduce failure outside hydra "test_time_check" ]; diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix index 919eec4fae1f8..8a5379fd1bdd3 100644 --- a/pkgs/development/python-modules/pydiscovergy/default.nix +++ b/pkgs/development/python-modules/pydiscovergy/default.nix @@ -11,13 +11,12 @@ poetry-core, pytestCheckHook, pythonOlder, - pytz, respx, }: buildPythonPackage rec { pname = "pydiscovergy"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +25,7 @@ buildPythonPackage rec { owner = "jpbede"; repo = "pydiscovergy"; rev = "refs/tags/v${version}"; - hash = "sha256-0zyg1EBPOfcA1jAgtNbDCVaTv9hJQ2Xidl+doHbjKrM="; + hash = "sha256-g6KWX7APdqB0dNe7p6WGualxSj5fiw+jRq+0qfqTs4w="; }; postPatch = '' @@ -35,13 +34,11 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - dependencies = [ authlib httpx mashumaro orjson - pytz ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index 8e53cf0865019..47abe284a8672 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ snowballstemmer ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies.toml = [ tomli ]; + optional-dependencies.toml = [ tomli ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.toml; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.toml; disabledTestPaths = [ "src/tests/test_integration.py" # runs pip install diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 163e49e38f759..3161bb8aaaf84 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.8.0"; + version = "2024.9.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-svy2bYyXDmN4mZK3VqVjr7GLUgnin09aEoTMKKbPJxk="; + hash = "sha256-8S1Ce4MW/iD8xRloUtKbUhFIN0+nconnklqxBy7xMm0="; }; build-system = [ diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index f96380877eccb..a360b48083eac 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { fsspec = [ appdirs fsspec diff --git a/pkgs/development/python-modules/pydruid/default.nix b/pkgs/development/python-modules/pydruid/default.nix index 69ba702507b0c..37838c6fed9d1 100644 --- a/pkgs/development/python-modules/pydruid/default.nix +++ b/pkgs/development/python-modules/pydruid/default.nix @@ -41,17 +41,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pycurl - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "pydruid" ]; - passthru = { - optional-dependencies = { - pandas = [ pandas ]; - async = [ tornado ]; - sqlalchemy = [ sqlalchemy ]; - # druid has a `cli` extra, but it doesn't work with nixpkgs pygments - }; + optional-dependencies = { + pandas = [ pandas ]; + async = [ tornado ]; + sqlalchemy = [ sqlalchemy ]; + # druid has a `cli` extra, but it doesn't work with nixpkgs pygments }; meta = with lib; { diff --git a/pkgs/development/python-modules/pyduotecno/default.nix b/pkgs/development/python-modules/pyduotecno/default.nix index e8ea8acf0c4cf..7333019c90559 100644 --- a/pkgs/development/python-modules/pyduotecno/default.nix +++ b/pkgs/development/python-modules/pyduotecno/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyduotecno"; - version = "2024.5.1"; + version = "2024.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-huzv7f1Aq/n3cD9S4oXqGQogq7VpPpzAUqkOhiB879A="; + hash = "sha256-h4OB4V4O645QAPdtO+OtLWffTuA7xlzIveIl+Cyhg3w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix index e9b916c888e22..b4172a855052b 100644 --- a/pkgs/development/python-modules/pydy/default.nix +++ b/pkgs/development/python-modules/pydy/default.nix @@ -6,22 +6,36 @@ scipy, sympy, setuptools, - nose, + pytestCheckHook, cython, + fetchpatch2, }: buildPythonPackage rec { pname = "pydy"; version = "0.7.1"; - pyproject = true; - build-system = [ setuptools ]; src = fetchPypi { inherit pname version; hash = "sha256-aaRinJMGR8v/OVkeSp1hA4+QLOrmDWq50wvA6b/suvk="; }; + build-system = [ setuptools ]; + + patches = [ + # Migrate tests to pytest + (fetchpatch2 { + url = "https://github.com/pydy/pydy/commit/e679638fecf80def25f5ed20f01c49c5d931e4d8.patch?full_index=1"; + hash = "sha256-wJmYkyc5Yh0152OyNL5ZbZJxmpX7C65Hqrms4gm3zt0="; + excludes = [ + ".github/workflows/oldest.yml" + ".github/workflows/tests.yml" + "bin/test" + ]; + }) + ]; + dependencies = [ numpy scipy @@ -29,24 +43,16 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + pytestCheckHook cython ]; - checkPhase = '' - runHook preCheck - - nosetests pydy - - runHook postCheck - ''; - pythonImportsCheck = [ "pydy" ]; - meta = with lib; { + meta = { description = "Python tool kit for multi-body dynamics"; homepage = "http://pydy.org"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix index 70fb7aeb59754..d1fec77647843 100644 --- a/pkgs/development/python-modules/pyeclib/default.nix +++ b/pkgs/development/python-modules/pyeclib/default.nix @@ -2,44 +2,57 @@ lib, stdenv, buildPythonPackage, + distutils, fetchFromGitHub, liberasurecode, + pytestCheckHook, + setuptools, six, }: buildPythonPackage rec { pname = "pyeclib"; - version = "unstable-2022-03-11"; - format = "setuptools"; + version = "1.6.1"; + pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "pyeclib"; - rev = "b50040969a03f7566ffcb468336e875d21486113"; - hash = "sha256-nYYjocStC0q/MC6pum3J4hlXiu/R5xODwIE97Ho3iEY="; + rev = "refs/tags/${version}"; + hash = "sha256-pa3majZ68+DQGtgGCpZVRshof+w9jvpxreo4dkckLXk="; }; postPatch = '' # patch dlopen call substituteInPlace src/c/pyeclib_c/pyeclib_c.c \ - --replace "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so" + --replace-fail "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so" + # python's platform.platform() doesn't return "Darwin" (anymore?) substituteInPlace setup.py \ - --replace '"Darwin"' '"macOS"' + --replace-fail '"Darwin"' '"macOS"' ''; + build-system = [ + distutils + setuptools + ]; + preBuild = let - ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + ldLibraryPathEnvName = + if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' # required for the custom _find_library function in setup.py export ${ldLibraryPathEnvName}="${lib.makeLibraryPath [ liberasurecode ]}" ''; - buildInputs = [ liberasurecode ]; + dependencies = [ liberasurecode ]; - nativeCheckInputs = [ six ]; + nativeCheckInputs = [ + pytestCheckHook + six + ]; pythonImportsCheck = [ "pyeclib" ]; diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index 9da32d7034b83..72b17a5bf0f80 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pyee"; - version = "11.1.0"; + version = "12.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-tTr5j2mQyBDt2bVrh3kQIaj1T9E9tO3RFCQ41EuiJj8="; + hash = "sha256-xIBgP0qikn1HZutB+oJ5P+YKgsv9uNaI4NCMVaU04UU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 4912e84a904ed..ef1424fd00631 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.32"; + version = "0.2.37"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-IoLgOAFso8Fx0Fx8bZTwL6QJIg2MJudQeJ/gDNDGm4I="; + hash = "sha256-Z+pwss6CHy2tVz418oz2RxNYJff3x03fU7kjPkMwc5Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index ff29175870ab4..0486b2b7f6651 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { --replace "test_path_links_not_resolved" "notest_path_links_not_resolved" \ --replace "test_append_mode_tell_linux_windows" "notest_append_mode_tell_linux_windows" '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' # this test fails on darwin due to case-insensitive file system substituteInPlace pyfakefs/tests/fake_os_test.py \ --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" diff --git a/pkgs/development/python-modules/pyfronius/default.nix b/pkgs/development/python-modules/pyfronius/default.nix index 7887c9f5f5795..c5cf2f3512b10 100644 --- a/pkgs/development/python-modules/pyfronius/default.nix +++ b/pkgs/development/python-modules/pyfronius/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nielstron"; repo = "pyfronius"; - rev = "release-${version}"; + rev = "refs/tags/release-${version}"; hash = "sha256-7GtY/6uuLe7K9T7xMVt2ytpA6MKVWnyEoLtA5dSMiH4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -34,7 +34,9 @@ buildPythonPackage rec { description = "Python module to communicate with Fronius Symo"; homepage = "https://github.com/nielstron/pyfronius"; changelog = "https://github.com/nielstron/pyfronius/releases/tag/release-${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + # https://github.com/nielstron/pyfronius/issues/18 + broken = versionAtLeast aiohttp.version "3.10.1"; }; } diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index efe1c179777b9..24ec863842f29 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { dependencies = [ pysendfile ]; - passthru.optional-dependencies = { + optional-dependencies = { ssl = [ pyopenssl ]; }; diff --git a/pkgs/development/python-modules/pyfunctional/default.nix b/pkgs/development/python-modules/pyfunctional/default.nix index 843eebd17399e..1e4039cc54526 100644 --- a/pkgs/development/python-modules/pyfunctional/default.nix +++ b/pkgs/development/python-modules/pyfunctional/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytestCheckHook ]; - pythonImportCheck = "pyfunctional"; + pythonImportsCheck = [ "functional" ]; meta = { description = "Python library for creating data pipelines with chain functional programming"; diff --git a/pkgs/development/python-modules/pyfwup/default.nix b/pkgs/development/python-modules/pyfwup/default.nix index 5203a2bcf98c7..ae3bb2ca109be 100644 --- a/pkgs/development/python-modules/pyfwup/default.nix +++ b/pkgs/development/python-modules/pyfwup/default.nix @@ -6,13 +6,12 @@ tqdm, libusb1, setuptools, - setuptools-git-versioning, pythonOlder, }: buildPythonPackage rec { pname = "pyfwup"; - version = "0.5.0"; + version = "0.5.2"; pyproject = true; @@ -22,19 +21,22 @@ buildPythonPackage rec { owner = "greatscottgadgets"; repo = "pyfwup"; rev = "refs/tags/${version}"; - hash = "sha256-HZaR7X19kWb8w/VcnRHReGPkUBQ/u89BjmkTPpayoxE="; + hash = "sha256-Kyc3f8beTg0W1+U7SvZuNPN1pdsco9rBUfoEtR7AI44="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + dependencies = [ pyusb tqdm libusb1 ]; - build-system = [ - setuptools - setuptools-git-versioning - ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "fwup" diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index c16eae5e8e513..7f7c72eb518dc 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; png = [ cairosvg ]; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pyquery pytestCheckHook - ] ++ passthru.optional-dependencies.png; + ] ++ optional-dependencies.png; preCheck = '' # necessary on darwin to pass the testsuite diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 19c4221097683..5c9e2432c822f 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -65,7 +65,9 @@ buildPythonPackage rec { postPatch = '' + # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015) substituteInPlace pyproject.toml \ + --replace-fail '"cython<=3.0.10",' '"cython",' \ --replace-fail '"meson<=1.5.0",' '"meson",' \ --replace-fail '"sphinx<=7.2.6",' "" \ --replace-fail '"ninja<=1.11.1.1",' "" @@ -75,7 +77,7 @@ buildPythonPackage rec { --replace-fail 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \ --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # flaky rm test/system_test.py substituteInPlace test/meson.build \ @@ -100,7 +102,7 @@ buildPythonPackage rec { SDL2_image SDL2_mixer SDL2_ttf - ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; nativeCheckInputs = [ numpy diff --git a/pkgs/development/python-modules/pygame-sdl2/default.nix b/pkgs/development/python-modules/pygame-sdl2/default.nix index f788c969a8f4e..43ce26585f30e 100644 --- a/pkgs/development/python-modules/pygame-sdl2/default.nix +++ b/pkgs/development/python-modules/pygame-sdl2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { src = fetchurl { url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}+renpy${renpy_version}.tar.gz"; - hash = "sha256-Zib39NyQ1pGVCWPrK5/Tl3dAylUlmKZKxU8pf+OpAdY="; + hash = "sha256-bcTrdXWLTCnZQ/fP5crKIPoqJiyz+o6s0PzRChV7TQE="; }; # force rebuild of headers needed for install diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 65315b3243b89..94efd4227e2ed 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -99,7 +99,7 @@ buildPythonPackage rec { SDL2_image SDL2_mixer SDL2_ttf - ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; preConfigure = '' ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 80cd4b04b4091..db08e6efe974a 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-pjVSX/x0EoZp3i9jRgqUydVgljSkh1wKr85RD97sF6w="; }; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 2b674559b604b..1bd193e0cc322 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.16.0"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-2yuYu02Nd9B3UfzrM0p19hDM5HmvigBf48gu+ZSO0kU="; + hash = "sha256-+L0rF5wy4iL/6nPdLSXwYazxsobH2G3pCATrqYe9B6U="; }; pythonRelaxDeps = [ @@ -71,6 +71,7 @@ buildPythonPackage rec { "test_read_metadata_bad_response" "test_read_metadata_no_remediation_message" "test_read_metadata_remediation_message" + "test_retrieve_secret_incident" "test_sca_client_scan_diff" "test_sca_scan_all_with_params" "test_sca_scan_directory_invalid_tar" diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix index e5edee26e22d2..93232d3816af1 100644 --- a/pkgs/development/python-modules/pygithub/default.nix +++ b/pkgs/development/python-modules/pygithub/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "pygithub"; - version = "2.3.0"; + version = "2.4.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "refs/tags/v${version}"; - hash = "sha256-ccAbn9x1r+wBIAK66ur8+2Op9ij09rQvHumq5Wh7TUU="; + hash = "sha256-VM3xxLa4MlR3vTpeOunsq4/bxZhuKXNKFZbFVul1cMw="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyglm/default.nix b/pkgs/development/python-modules/pyglm/default.nix index 5074546308a1b..2afcae3d3bb43 100644 --- a/pkgs/development/python-modules/pyglm/default.nix +++ b/pkgs/development/python-modules/pyglm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/Zuzu-Typ/PyGLM"; description = "OpenGL Mathematics (GLM) library for Python written in C++"; - changelog = "https://github.com/Zuzu-Typ/PyGLM/releases/tag/${src.rev}"; + changelog = "https://github.com/Zuzu-Typ/PyGLM/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.zlib; maintainers = with maintainers; [ sund3RRR ]; }; diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index c75cf68715ed8..48791db6a2752 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { typeguard ]; - passthru.optional-dependencies = { + optional-dependencies = { ws = [ websockets ]; }; @@ -52,7 +52,7 @@ buildPythonPackage rec { # Fixes hanging tests on Darwin __darwinAllowLocalNetworking = true; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin issue: OSError: [Errno 24] Too many open files ulimit -n 1024 ''; diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix index 5536490860d16..11bd26ee95316 100644 --- a/pkgs/development/python-modules/pygmars/default.nix +++ b/pkgs/development/python-modules/pygmars/default.nix @@ -5,7 +5,6 @@ pytestCheckHook, setuptools-scm, pythonOlder, - setuptools, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 77d2669ee0ac1..a5850801030ed 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -67,8 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/GenericMappingTools/pygmt"; license = licenses.bsd3; changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/v${version}"; - # pygmt.exceptions.GMTCLibNotFoundError: Error loading the GMT shared library '/nix/store/r3xnnqgl89vrnq0kzxx0bmjwzks45mz8-gmt-6.1.1/lib/libgmt.dylib' - broken = stdenv.isDarwin; maintainers = with maintainers; [ sikmir ]; }; } diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 185e7fd5ddf8f..1f4592c7ddcfc 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { buildInputs = [ cairo glib - ] ++ lib.optionals stdenv.isDarwin [ ncurses ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ncurses ]; propagatedBuildInputs = [ pycairo diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 201902949cf2a..028f69488777b 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.13"; + version = "1.14"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pygraphviz"; repo = "pygraphviz"; rev = "refs/tags/pygraphviz-${version}"; - hash = "sha256-/H7eHgs3jtbgat8//1Y1S3iV5s0UBKW+J+zK+f8qGqI="; + hash = "sha256-RyUmT2djj2GnVG82xO9HULMAJZb2LYMUGDRvCwaYBg8="; }; patches = [ diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix index 947f3911ce3d5..cf46658aec26d 100644 --- a/pkgs/development/python-modules/pyhanko/default.nix +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -1,32 +1,40 @@ { lib, - aiohttp, - asn1crypto, + stdenv, buildPythonPackage, - certomancer, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + asn1crypto, click, cryptography, - defusedxml, - fetchFromGitHub, - fonttools, - freezegun, - oscrypto, - pillow, pyhanko-certvalidator, - pytest-aiohttp, - pytestCheckHook, - python-barcode, - python-pae, - python-pkcs11, - pythonOlder, pyyaml, qrcode, requests, - requests-mock, - setuptools, tzlocal, + + # optional-dependencies + oscrypto, + defusedxml, + fonttools, uharfbuzz, + pillow, + python-barcode, + python-pkcs11, + aiohttp, xsdata, + + # tests + certomancer, + freezegun, + pytest-aiohttp, + pytestCheckHook, + python-pae, + requests-mock, }: buildPythonPackage rec { @@ -34,8 +42,6 @@ buildPythonPackage rec { version = "0.25.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "pyHanko"; @@ -56,7 +62,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { extra-pubkey-algs = [ oscrypto ]; xmp = [ defusedxml ]; opentype = [ @@ -76,11 +82,11 @@ buildPythonPackage rec { aiohttp certomancer freezegun - python-pae pytest-aiohttp - requests-mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + python-pae + requests-mock + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTestPaths = [ # ModuleNotFoundError: No module named 'csc_dummy' @@ -115,12 +121,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyhanko" ]; - meta = with lib; { + meta = { description = "Sign and stamp PDF files"; mainProgram = "pyhanko"; homepage = "https://github.com/MatthiasValvekens/pyHanko"; changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/v${version}/docs/changelog.rst"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; + # Most tests fail with: + # OSError: One or more parameters passed to a function were not valid. + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyheck/default.nix b/pkgs/development/python-modules/pyheck/default.nix index 7b7e5205447fe..fca55ff984b5c 100644 --- a/pkgs/development/python-modules/pyheck/default.nix +++ b/pkgs/development/python-modules/pyheck/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyheif/default.nix b/pkgs/development/python-modules/pyheif/default.nix index dc6b6e1ea5aff..1771bf1ea7f95 100644 --- a/pkgs/development/python-modules/pyheif/default.nix +++ b/pkgs/development/python-modules/pyheif/default.nix @@ -1,24 +1,39 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, cffi, libheif, + piexif, + pillow, + pytestCheckHook, }: buildPythonPackage rec { pname = "pyheif"; - version = "0.7.1"; - format = "setuptools"; + version = "0.8.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-hqXFF0N51xRrXtGmiJL69yaKE1+39QOaARv7em6QMgA="; + src = fetchFromGitHub { + owner = "carsales"; + repo = "pyheif"; + rev = "refs/tags/release-${version}"; + hash = "sha256-7De8ekDceSkUcOgK7ppKad5W5qE0yxdS4kbgYVjxTGg="; }; - propagatedBuildInputs = [ - cffi - libheif + build-system = [ setuptools ]; + + buildInputs = [ libheif ]; + + dependencies = [ cffi ]; + + pythonImportsCheck = [ "pyheif" ]; + + nativeCheckInputs = [ + piexif + pillow + pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyicumessageformat/default.nix b/pkgs/development/python-modules/pyicumessageformat/default.nix index efa0969006b8e..f37cee1ad919e 100644 --- a/pkgs/development/python-modules/pyicumessageformat/default.nix +++ b/pkgs/development/python-modules/pyicumessageformat/default.nix @@ -13,8 +13,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; src = fetchPypi { - pname = "pyicumessageformat"; - inherit version; + inherit pname version; hash = "sha256-s+l8DtEMKxA/DzpwGqZSlwDqCrZuDzsj3I5K7hgfyEA="; }; @@ -25,6 +24,8 @@ buildPythonPackage rec { meta = with lib; { description = "Unopinionated Python3 parser for ICU MessageFormat"; homepage = "https://github.com/SirStendec/pyicumessageformat/"; + # Based on master, as upstream doesn't tag their releases on GitHub anymore + changelog = "https://github.com/SirStendec/pyicumessageformat/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ erictapen ]; }; diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 62d57ef653628..9492aa9484789 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "3.1"; + version = "3.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Fizzadar"; repo = "pyinfra"; rev = "refs/tags/v${version}"; - hash = "sha256-uTGJX92AIaMLLLq0XPpfIhL9kFPR+aJgMxxoKYJf0PM="; + hash = "sha256-NHQpYOXlqFU4BtiwiESGV8pM0O8kqCz2TpXOGz8T4zQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix index c8b4d4697202e..c7b770f1b4182 100644 --- a/pkgs/development/python-modules/pyinstaller/default.nix +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -11,7 +11,9 @@ , pyinstaller , glibc , binutils +, macholib , installShellFiles +, stdenv }: buildPythonPackage rec { @@ -34,10 +36,11 @@ buildPythonPackage rec { dependencies = [ altgraph packaging + macholib pyinstaller-hooks-contrib ]; - makeWrapperArgs = [ + makeWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix" "PATH" ":" (lib.makeBinPath [ glibc binutils ]) ]; diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix index 9019091a003d1..4cda737f82e70 100644 --- a/pkgs/development/python-modules/pyinstrument/default.nix +++ b/pkgs/development/python-modules/pyinstrument/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyinstrument"; - version = "4.7.2"; + version = "4.7.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "joerick"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-X28GRYlGrlDUcY+7teaCiJkG+kQ7p367TK0zOjfHi5o="; + hash = "sha256-Dvpx6Bf4obHL3inzIHhOrM3u/7X+0NRfEAyynDjtEwE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix new file mode 100644 index 0000000000000..844299d01bc67 --- /dev/null +++ b/pkgs/development/python-modules/pyiskra/default.nix @@ -0,0 +1,41 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + lib, + pymodbus, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyiskra"; + version = "0.1.14"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Iskramis"; + repo = "pyiskra"; + rev = "refs/tags/v${version}"; + hash = "sha256-OLNUa11UULiW6E8nVy5rUyN7iAD7KdM+R76m2zaDOgc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + pymodbus + ]; + + pythonImportsCheck = [ "pyiskra" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/Iskramis/pyiskra/releases/tag/v${version}"; + description = "Python Iskra devices interface"; + homepage = "https://github.com/Iskramis/pyiskra"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyixapi/default.nix b/pkgs/development/python-modules/pyixapi/default.nix index 3a051450c5dcd..50c825dcc959d 100644 --- a/pkgs/development/python-modules/pyixapi/default.nix +++ b/pkgs/development/python-modules/pyixapi/default.nix @@ -1,10 +1,12 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, poetry-core, - requests, pyjwt, + pythonOlder, + pytestCheckHook, + requests, }: buildPythonPackage rec { @@ -12,24 +14,32 @@ buildPythonPackage rec { version = "0.2.3"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-qkgPBIYv9xzGa29RiPAU3zNhcyutTUX1Vkmpd9YdeJU="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "peering-manager"; + repo = "pyixapi"; + rev = "refs/tags/${version}"; + hash = "sha256-IiLjxOtyxGSaItxgEbsF8AER/j4Qe7SP9ZAEPjTiYI4="; }; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "pyjwt" ]; + + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ requests pyjwt ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "pyixapi" ]; meta = with lib; { + description = "Python API client library for IX-API"; homepage = "https://github.com/peering-manager/pyixapi/"; changelog = "https://github.com/peering-manager/pyixapi/releases/tag/${version}"; - description = "Python API client library for IX-API"; license = licenses.asl20; maintainers = teams.wdz.members; }; diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 62c9c8c859db6..daffbcb6d70c0 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, cryptography, pytestCheckHook, @@ -9,42 +9,39 @@ sphinxHook, sphinx-rtd-theme, zope-interface, + oauthlib, }: buildPythonPackage rec { pname = "pyjwt"; - version = "2.8.0"; - format = "pyproject"; + version = "2.9.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "PyJWT"; - inherit version; - hash = "sha256-V+KNFW49XBAIjgxoq7kL+sPfgrQKcb0NqiDGXM1cI94="; + src = fetchFromGitHub { + owner = "jpadilla"; + repo = "pyjwt"; + rev = "refs/tags/${version}"; + hash = "sha256-z1sqaSeign0ZDFcg94cli0fIVBxcK14VUlgP+mSaxRA="; }; - postPatch = '' - sed -i '/types-cryptography/d' setup.cfg - ''; - outputs = [ "out" "doc" ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ - setuptools sphinxHook sphinx-rtd-theme zope-interface ]; - passthru.optional-dependencies.crypto = [ cryptography ]; + optional-dependencies.crypto = [ cryptography ]; - nativeCheckInputs = [ - pytestCheckHook - ] ++ (lib.flatten (lib.attrValues passthru.optional-dependencies)); + nativeCheckInputs = [ pytestCheckHook ] ++ (lib.flatten (lib.attrValues optional-dependencies)); disabledTests = [ # requires internet connection @@ -53,6 +50,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "jwt" ]; + passthru.tests = { + inherit oauthlib; + }; + meta = with lib; { changelog = "https://github.com/jpadilla/pyjwt/blob/${version}/CHANGELOG.rst"; description = "JSON Web Token implementation in Python"; diff --git a/pkgs/development/python-modules/pykcs11/default.nix b/pkgs/development/python-modules/pykcs11/default.nix index 5700fd4523a68..b4fdeb938147b 100644 --- a/pkgs/development/python-modules/pykcs11/default.nix +++ b/pkgs/development/python-modules/pykcs11/default.nix @@ -4,7 +4,7 @@ callPackage, fetchPypi, setuptools, - swig4, + swig, }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ swig4 ]; + nativeBuildInputs = [ swig ]; pypaBuildFlags = [ "--skip-dependency-check" ]; diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index 8e09b744ff8ae..f169201b2cc54 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.12"; + version = "1.3.13"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zCCypnxkBWSFoxTSwrbbo1SvfuHI+42uG+byk2o3Q0E="; + hash = "sha256-Osz4UulGZT45nD1Nu+EZ28bT9yz9LVqVyr8L8Mf5JP4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index a4f605692c5f2..cbca76c7467d5 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pydantic ]; - passthru.optional-dependencies = { + optional-dependencies = { CLI = [ click prompt-toolkit diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 221c1e936f03d..112d9392d80d5 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -12,7 +12,6 @@ pyflakes, vulture, setuptools, - isort, pylint, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/pylance/Cargo.lock b/pkgs/development/python-modules/pylance/Cargo.lock index b993a333f665a..781104da1ac52 100644 --- a/pkgs/development/python-modules/pylance/Cargo.lock +++ b/pkgs/development/python-modules/pylance/Cargo.lock @@ -4,19 +4,13 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -84,9 +78,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" [[package]] name = "arc-swap" @@ -371,13 +365,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -430,7 +424,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.7.3", - "rustix 0.38.34", + "rustix 0.38.37", "slab", "tracing", "windows-sys 0.59.0", @@ -473,24 +467,24 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "async-std" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" dependencies = [ "async-channel 1.9.0", "async-global-executor", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io 2.3.4", + "async-lock 3.4.0", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite 1.13.0", + "futures-lite 2.3.0", "gloo-timers", "kv-log-macro", "log", @@ -510,13 +504,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -548,9 +542,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "aws-config" -version = "1.5.5" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e95816a168520d72c0e7680c405a5a8c1fb6a035b4bc4b9d7b0de8e1a941697" +checksum = "848d7b9b605720989929279fa644ce8f244d0ce3146fcca5b70e4eb7b3c020fc" dependencies = [ "aws-credential-types", "aws-runtime", @@ -565,7 +559,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "hex", "http 0.2.12", "ring", @@ -578,9 +572,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" +checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -590,19 +584,20 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.4.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42c2d4218de4dcd890a109461e2f799a1a2ba3bcd2cde9af88360f5df9266c6" +checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468" dependencies = [ "aws-credential-types", "aws-sigv4", "aws-smithy-async", "aws-smithy-http", + "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "http 0.2.12", "http-body 0.4.6", "once_cell", @@ -614,9 +609,9 @@ dependencies = [ [[package]] name = "aws-sdk-dynamodb" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aadafd673822026e7ae6be7900c7886f609514b620874c9e3054f4ae38ab82f" +checksum = "c7f3d9e807092149e3df266e3f4d9760dac439b90f82d8438e5b2c0bbe62007f" dependencies = [ "aws-credential-types", "aws-runtime", @@ -628,7 +623,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "http 0.2.12", "once_cell", "regex-lite", @@ -637,9 +632,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.39.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11822090cf501c316c6f75711d77b96fba30658e3867a7762e5e2f5d32d31e81" +checksum = "27bf24cd0d389daa923e974b0e7c38daf308fc21e963c049f57980235017175e" dependencies = [ "aws-credential-types", "aws-runtime", @@ -659,9 +654,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.40.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a2a06ff89176123945d1bbe865603c4d7101bea216a550bb4d2e4e9ba74d74" +checksum = "3b43b3220f1c46ac0e9dcc0a97d94b93305dacb36d1dd393996300c6b9b74364" dependencies = [ "aws-credential-types", "aws-runtime", @@ -681,9 +676,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.39.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20a91795850826a6f456f4a48eff1dfa59a0e69bdbf5b8c50518fd372106574" +checksum = "d1c46924fb1add65bba55636e12812cae2febf68c0f37361766f627ddcca91ce" dependencies = [ "aws-credential-types", "aws-runtime", @@ -704,9 +699,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.3" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be" +checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68" dependencies = [ "aws-credential-types", "aws-smithy-http", @@ -738,9 +733,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.60.9" +version = "0.60.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e" +checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", @@ -777,16 +772,16 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.6.3" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0abbf454960d0db2ad12684a1640120e7557294b0ff8e2f11236290a1b293225" +checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", "bytes", - "fastrand 2.1.0", + "fastrand 2.1.1", "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", @@ -821,9 +816,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.2" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cee7cadb433c781d3299b916fbf620fea813bf38f49db282fb6858141a05cc8" +checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605" dependencies = [ "base64-simd", "bytes", @@ -847,9 +842,9 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.8" +version = "0.60.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55" +checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc" dependencies = [ "xmlparser", ] @@ -870,17 +865,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -1017,9 +1012,9 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -1097,9 +1092,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.13" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "jobserver", "libc", @@ -1197,9 +1192,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -1219,9 +1214,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1845,15 +1840,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "filetime" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", @@ -1879,12 +1874,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -1908,13 +1903,13 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "windows-sys 0.52.0", ] [[package]] name = "fsst" -version = "0.15.1" +version = "0.17.0" dependencies = [ "rand", ] @@ -1994,7 +1989,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -2009,7 +2004,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2067,9 +2062,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -2079,9 +2074,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gloo-timers" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" dependencies = [ "futures-channel", "futures-core", @@ -2349,16 +2344,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.12", - "rustls-native-certs 0.7.2", + "rustls 0.23.13", + "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -2367,9 +2362,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -2429,9 +2424,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", @@ -2480,9 +2475,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -2566,7 +2561,7 @@ dependencies = [ [[package]] name = "lance" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrow", "arrow-arith", @@ -2604,7 +2599,6 @@ dependencies = [ "lazy_static", "log", "moka", - "num_cpus", "object_store", "pin-project", "prost 0.12.6", @@ -2625,7 +2619,7 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrow-array", "arrow-buffer", @@ -2641,7 +2635,7 @@ dependencies = [ [[package]] name = "lance-core" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrow-array", "arrow-buffer", @@ -2677,7 +2671,7 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrow", "arrow-array", @@ -2694,6 +2688,7 @@ dependencies = [ "futures", "lance-arrow", "lance-core", + "lazy_static", "log", "prost 0.12.6", "snafu", @@ -2702,7 +2697,7 @@ dependencies = [ [[package]] name = "lance-datagen" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrow", "arrow-array", @@ -2717,24 +2712,26 @@ dependencies = [ [[package]] name = "lance-encoding" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrow", "arrow-arith", "arrow-array", "arrow-buffer", "arrow-cast", + "arrow-data", "arrow-schema", "arrow-select", "bytes", "fsst", "futures", + "hex", "hyperloglogplus", + "itertools 0.12.1", "lance-arrow", "lance-core", "log", "num-traits", - "num_cpus", "prost 0.12.6", "prost-build 0.12.6", "prost-types 0.12.6", @@ -2747,7 +2744,7 @@ dependencies = [ [[package]] name = "lance-file" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrow-arith", "arrow-array", @@ -2768,7 +2765,6 @@ dependencies = [ "lance-io", "log", "num-traits", - "num_cpus", "object_store", "prost 0.12.6", "prost-build 0.12.6", @@ -2782,7 +2778,7 @@ dependencies = [ [[package]] name = "lance-index" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrow", "arrow-array", @@ -2815,7 +2811,6 @@ dependencies = [ "log", "moka", "num-traits", - "num_cpus", "object_store", "prost 0.12.6", "prost-build 0.12.6", @@ -2829,11 +2824,12 @@ dependencies = [ "tempfile", "tokio", "tracing", + "uuid", ] [[package]] name = "lance-io" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrow", "arrow-arith", @@ -2857,7 +2853,6 @@ dependencies = [ "lance-core", "lazy_static", "log", - "num_cpus", "object_store", "path_abs", "pin-project", @@ -2873,7 +2868,7 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrow-array", "arrow-ord", @@ -2888,7 +2883,6 @@ dependencies = [ "lazy_static", "log", "num-traits", - "num_cpus", "rand", "rayon", "tokio", @@ -2897,7 +2891,7 @@ dependencies = [ [[package]] name = "lance-table" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrow", "arrow-array", @@ -3164,15 +3158,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -3367,9 +3352,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -3461,9 +3446,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -3659,7 +3644,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -3681,7 +3666,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] @@ -3717,7 +3702,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", "windows-sys 0.59.0", ] @@ -3755,12 +3740,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -3827,11 +3812,11 @@ dependencies = [ "multimap 0.10.0", "once_cell", "petgraph", - "prettyplease 0.2.20", + "prettyplease 0.2.22", "prost 0.12.6", "prost-types 0.12.6", "regex", - "syn 2.0.75", + "syn 2.0.77", "tempfile", ] @@ -3858,7 +3843,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -3892,13 +3877,14 @@ dependencies = [ [[package]] name = "pylance" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrow", "arrow-array", "arrow-data", "arrow-schema", "async-trait", + "bytes", "chrono", "env_logger", "futures", @@ -3915,7 +3901,6 @@ dependencies = [ "lance-table", "lazy_static", "log", - "num_cpus", "object_store", "prost 0.12.6", "prost-build 0.11.9", @@ -3979,7 +3964,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -3992,7 +3977,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4023,16 +4008,16 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.12", + "rustls 0.23.13", "socket2 0.5.7", "thiserror", "tokio", @@ -4041,15 +4026,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand", "ring", "rustc-hash 2.0.0", - "rustls 0.23.12", + "rustls 0.23.13", "slab", "thiserror", "tinyvec", @@ -4058,22 +4043,22 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", "socket2 0.5.7", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -4170,9 +4155,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -4248,7 +4233,7 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.4.1", - "hyper-rustls 0.27.2", + "hyper-rustls 0.27.3", "hyper-util", "ipnet", "js-sys", @@ -4258,8 +4243,8 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.12", - "rustls-native-certs 0.7.2", + "rustls 0.23.13", + "rustls-native-certs 0.7.3", "rustls-pemfile 2.1.3", "rustls-pki-types", "serde", @@ -4333,9 +4318,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] @@ -4356,9 +4341,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -4381,15 +4366,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] @@ -4408,9 +4393,22 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.2" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", "rustls-pemfile 2.1.3", @@ -4456,9 +4454,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -4488,11 +4486,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4525,7 +4523,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4584,22 +4582,22 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4610,14 +4608,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -4634,7 +4632,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4823,7 +4821,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4869,7 +4867,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -4882,7 +4880,7 @@ dependencies = [ "pbjson", "pbjson-build", "pbjson-types", - "prettyplease 0.2.20", + "prettyplease 0.2.22", "prost 0.12.6", "prost-build 0.12.6", "prost-types 0.12.6", @@ -4891,7 +4889,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "syn 2.0.75", + "syn 2.0.77", "typify", "walkdir", ] @@ -4915,9 +4913,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.75" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -5110,9 +5108,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", + "fastrand 2.1.1", "once_cell", - "rustix 0.38.34", + "rustix 0.38.37", "windows-sys 0.59.0", ] @@ -5171,7 +5169,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5252,9 +5250,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -5275,7 +5273,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5294,16 +5292,16 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -5312,9 +5310,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -5369,7 +5367,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5471,7 +5469,7 @@ dependencies = [ "semver", "serde", "serde_json", - "syn 2.0.75", + "syn 2.0.77", "thiserror", "unicode-ident", ] @@ -5489,7 +5487,7 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn 2.0.75", + "syn 2.0.77", "typify-impl", ] @@ -5510,9 +5508,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" @@ -5563,7 +5561,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "url", "webpki-roots", @@ -5679,7 +5677,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -5713,7 +5711,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5749,9 +5747,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -5765,7 +5763,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -6003,7 +6001,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.14", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -6039,7 +6037,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index d7eb53ad2d0a3..1563bcf88dd42 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -2,34 +2,47 @@ lib, stdenv, buildPythonPackage, - rustPlatform, fetchFromGitHub, - darwin, - libiconv, + rustPlatform, + + # nativeBuildInputs pkg-config, + + # buildInputs + libiconv, protobuf, + darwin, + + # dependencies numpy, pyarrow, + + # optional-dependencies + torch, + + # tests + duckdb, ml-dtypes, pandas, pillow, polars, pytestCheckHook, - torch, tqdm, + + # passthru nix-update-script, }: buildPythonPackage rec { pname = "pylance"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; rev = "refs/tags/v${version}"; - hash = "sha256-bB+6q3kkSxY8i5xf4wumREHizUGWWOZ8Tr5Gt10CVAs="; + hash = "sha256-E+29CbVNbzmrQnBZt0860IvL4xYZqzE+uzSuKDwgxzg="; }; buildAndTestSubdir = "python"; @@ -52,7 +65,7 @@ buildPythonPackage rec { libiconv protobuf ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security @@ -74,6 +87,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "lance" ]; nativeCheckInputs = [ + duckdb ml-dtypes pandas pillow @@ -86,11 +100,21 @@ buildPythonPackage rec { cd python/python/tests ''; - disabledTests = [ - # Error during planning: Invalid function 'invert'. - "test_polar_scan" - "test_simple_predicates" - ]; + disabledTests = + lib.optionals stdenv.hostPlatform.isDarwin [ + # AttributeError: module 'torch.distributed' has no attribute 'is_initialized' + "test_convert_int_tensors" + "test_ground_truth" + "test_index_cast_centroids" + "test_index_with_no_centroid_movement" + "test_iter_filter" + "test_iter_over_dataset_fixed_shape_tensor" + "test_iter_over_dataset_fixed_size_lists" + ] + ++ [ + # incompatible with duckdb 1.1.1 + "test_duckdb_pushdown_extension_types" + ]; passthru.updateScript = nix-update-script { extraArgs = [ @@ -103,7 +127,11 @@ buildPythonPackage rec { meta = { description = "Python wrapper for Lance columnar format"; homepage = "https://github.com/lancedb/lance"; + changelog = "https://github.com/lancedb/lance/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ natsukium ]; + # test_indices.py ...sss.Fatal Python error: Fatal Python error: Illegal instructionIllegal instruction + # File "/nix/store/wiiccrs0vd1qbh4j6ki9p40xmamsjix3-python3.12-pylance-0.17.0/lib/python3.12/site-packages/lance/indices.py", line 237 in train_ivf + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix index 33f1b807ac50f..e7b1fa52a8716 100644 --- a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix @@ -71,6 +71,7 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ bcdarwin ]; # x86-linux: test_encode.py::TestEncodeBuffer failures # darwin: numerous test failures, seemingly due to issues setting up test data - broken = (stdenv.isAarch64 && stdenv.isLinux) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index 4e95fc4475308..8f25327bc060b 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "1.2.1"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "square"; repo = "pylink"; rev = "refs/tags/v${version}"; - hash = "sha256-WMpb/b9kF1rFlegDYxNGJbZ2Nz8nuG21tyjgUFLs5mg="; + hash = "sha256-4tdtyb0AjsAmFOPdkxbbro8PH3akC5uihN59lgijhkc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index cac67ca5051ae..5cf7838dea18e 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pylint-plugin-utils ]; - passthru.optional-dependencies = { + optional-dependencies = { with_django = [ django ]; }; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index eb96516e84e47..9076d39d83f69 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "3.2.3"; + version = "3.2.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "pylint-dev"; repo = "pylint"; rev = "refs/tags/v${version}"; - hash = "sha256-J+68YwjVhaMPlvLCMI/BdnUCQPDYU9u0pIvOYlbzWvs="; + hash = "sha256-b3KkSgTmN6ojMJaVQGwvHIa41M2eZS9prxcL5peX/xU="; }; build-system = [ setuptools ]; @@ -101,7 +101,7 @@ buildPythonPackage rec { # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')] "test_functional_relation_extraction" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_parallel_execution" "test_py3k_jobs_option" ]; diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index 17f9c244e7020..42baae0b0659f 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.6.8"; + version = "0.6.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - hash = "sha256-oEWUXkE8U7/ye6puJZRSkQFi10BPGuc8XZQbHwqOPEI="; + hash = "sha256-MP9a8dI5ggM+XEJYB6O4nYDYIXbtxi2TK5b+JQgViZQ="; }; build-system = [ setuptools ]; @@ -33,8 +33,7 @@ buildPythonPackage rec { dependencies = [ mypy python-lsp-server - tomli - ]; + ] ++ lib.optional (pythonOlder "3.11") tomli; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 2bd1368ffb02b..94bae7f24eb5e 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click xdg diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 005a65b63169f..303d7680e8d3e 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { uncertainties ]; - passthru.optional-dependencies = { + optional-dependencies = { ase = [ ase ]; joblib = [ joblib ]; seekpath = [ seekpath ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-xdist - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' # ensure tests can find these diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 30161191dd59d..b4978a83621d1 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system setuptools, + versioneer, # dependencies arviz, @@ -22,16 +22,14 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.16.2"; + version = "5.17.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-vOU5P45AJPULGWj9lscZKP3JqfSpkPDnq1Fyq9lIawc="; + hash = "sha256-vElS6f46xVvK+p5/IvjgCI4wMZlBe3Q5ZaQUie1yLJw="; }; postPatch = '' @@ -39,7 +37,10 @@ buildPythonPackage rec { --replace-fail ', "pytest-cov"' "" ''; - build-system = [ setuptools ]; + build-system = [ + setuptools + versioneer + ]; dependencies = [ arviz diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index c80f512e74982..6f570f8d83065 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { sed -i "/--cov/d" setup.cfg ''; - disabledTests = lib.optionals stdenv.is32bit [ + disabledTests = lib.optionals stdenv.hostPlatform.is32bit [ # test_compressed_complex is broken on 32-bit platforms # this can be removed on the next version bump # see also https://github.com/pinterest/pymemcache/pull/480 diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index 7c6d63bf2e54d..0c0279099b33b 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pymetno"; - version = "0.12.0"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "PyMetno"; rev = "refs/tags/${version}"; - hash = "sha256-wRSUIaonjjucLM+A4GsF9Lrq2vZYCquEvblbmjKYpQE="; + hash = "sha256-0QODCJmGxgSKsTbsq4jsoP3cTy/0y6hq63j36bj7Dvo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymfy/default.nix b/pkgs/development/python-modules/pymfy/default.nix index 3e71ac6fbb841..5f4a95431f0ca 100644 --- a/pkgs/development/python-modules/pymfy/default.nix +++ b/pkgs/development/python-modules/pymfy/default.nix @@ -13,20 +13,22 @@ buildPythonPackage rec { pname = "pymfy"; version = "0.11.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tetienne"; repo = "somfy-open-api"; - rev = "v${version}"; - sha256 = "0wpjwjmywfyqgwvfa5kwcjpaljc32qa088kk88nl9nqdvc31mzhv"; + rev = "refs/tags/v${version}"; + hash = "sha256-G/4aBtsN20QtQnMiBBQWg0mqrmR8FuU2f9g77qvk8nI="; }; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "requests-oauthlib" ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ requests requests-oauthlib ]; @@ -41,7 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the Somfy Open API"; homepage = "https://github.com/tetienne/somfy-open-api"; - license = with licenses; [ gpl3Only ]; + changelog = "https://github.com/tetienne/somfy-open-api/releases/tag/v${version}"; + license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 38411beca94b3..bb0fb022d2ef7 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { repl = [ aiohttp typer @@ -57,7 +57,7 @@ buildPythonPackage rec { redis sqlalchemy twisted - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' pushd test diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index cb23141284d79..212e8e54dd24e 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi ]; - buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; preBuild = '' ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 5280c2d91255f..4ee28f0b62081 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -88,7 +88,7 @@ buildPythonPackage rec { }; # TODO: manually add mupdf rpath until upstream fixes it - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for lib in */*.so $out/${python.sitePackages}/*/*.so; do install_name_tool -add_rpath ${lib.getLib mupdf-cxx}/lib "$lib" done @@ -175,7 +175,7 @@ buildPythonPackage rec { # Exclude lint tests "test_flake8" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # darwin does not support OCR right now "test_tesseract" ]; @@ -187,12 +187,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "fitz" ]; - meta = with lib; { + meta = { description = "Python bindings for MuPDF's rendering library"; homepage = "https://github.com/pymupdf/PyMuPDF"; changelog = "https://github.com/pymupdf/PyMuPDF/releases/tag/${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ teto ]; - platforms = platforms.unix; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ teto ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index df42f2a4cc373..9178399610b30 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { voluptuous ]; - passthru.optional-dependencies = { + optional-dependencies = { mqtt-client = [ paho-mqtt ]; }; diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 9206787f49731..46af3ed5db2fc 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeCheckInputs = [ which ]; propagatedBuildInputs = [ python-dateutil ]; - preInstall = lib.optionalString stdenv.isDarwin '' + preInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py ''; diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index e58ae0afdf451..14ce4a0de9292 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -2,34 +2,38 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, setuptools-scm, packaging, requests, - six, pytestCheckHook, pyyaml, }: buildPythonPackage rec { pname = "pynetbox"; - version = "7.3.4"; - format = "setuptools"; + version = "7.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; - repo = pname; + repo = "pynetbox"; rev = "refs/tags/v${version}"; - hash = "sha256-Ie309I19BhzASrmc3Ws1zV/BySc49AhFPNrNKQhTD0U="; + hash = "sha256-JOUgQvOtvXRDM79Sp472OHPh1YEoA82T3R9aZFes8SI="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ packaging requests - six ]; + pythonImportsCheck = [ "pynetbox" ]; + nativeCheckInputs = [ pytestCheckHook pyyaml diff --git a/pkgs/development/python-modules/pyngo/default.nix b/pkgs/development/python-modules/pyngo/default.nix index 23f0a904d4ac4..ee1d1d2276658 100644 --- a/pkgs/development/python-modules/pyngo/default.nix +++ b/pkgs/development/python-modules/pyngo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pyngo"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "yezz123"; repo = "pyngo"; rev = "refs/tags/${version}"; - hash = "sha256-vzqm+g/jYkxue5DiUe+iYA5x0zMKLKQtAatOSKCUWzs="; + hash = "sha256-E3UNgn/L1bbfYljufPp+bGAvSsADpPAvv/eJimD8v50="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix index f697e347852e7..99964e420c00a 100644 --- a/pkgs/development/python-modules/pynmeagps/default.nix +++ b/pkgs/development/python-modules/pynmeagps/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pynmeagps"; - version = "1.0.39"; + version = "1.0.42"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "semuconsulting"; repo = "pynmeagps"; rev = "refs/tags/v${version}"; - hash = "sha256-aBNvrqGDCUOn3wiTwqmanUQzBuiPNDSguZhlznYXUkY="; + hash = "sha256-hlGqc4vZ/C98vQwJewK0cfC3zP9xyO0oXXtlyNUDg0Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index ed6b964f0ca57..6d73c35e5ba62 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -44,11 +44,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ evdev xlib ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ ApplicationServices @@ -61,7 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Library to control and monitor input devices"; homepage = "https://github.com/moses-palmer/pynput"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/pynslookup/default.nix b/pkgs/development/python-modules/pynslookup/default.nix new file mode 100644 index 0000000000000..42591c750ca71 --- /dev/null +++ b/pkgs/development/python-modules/pynslookup/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + dnspython, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "pynslookup"; + version = "1.8.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "wesinator"; + repo = "pynslookup"; + rev = "refs/tags/v${version}"; + hash = "sha256-cb8oyI8D8SzBP+tm1jGPPshJYhPegYOH0RwIH03/K/A="; + }; + + build-system = [ setuptools ]; + + dependencies = [ dnspython ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "nslookup" ]; + + meta = with lib; { + description = "Module to do DNS lookups"; + homepage = "https://github.com/wesinator/pynslookup"; + license = licenses.mpl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix index 15a0a2dbdbfaf..bb10f18811187 100644 --- a/pkgs/development/python-modules/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { pyusb pyyaml typing-extensions - ] ++ lib.optionals (!stdenv.isLinux) [ hidapi ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ hidapi ]; pythonImportsCheck = [ "pyocd" ]; diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix index 63f798d21d859..ec66d35900d94 100644 --- a/pkgs/development/python-modules/pyogrio/default.nix +++ b/pkgs/development/python-modules/pyogrio/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "pyogrio"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "geopandas"; repo = "pyogrio"; rev = "v${version}"; - hash = "sha256-HC7+dDehDwEIDQnCMYrsC1jE78AyfHqEhfOZLYSzTIw="; + hash = "sha256-AyKBktZWzUxD1HKKp89gQ97c4WPB5PkXnkFqN+RHx7c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 7a0e475a0058b..edf4a4bfe7a25 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -6,17 +6,19 @@ # build-system cmake, - scikit-build-core, - ninja, nanobind, + ninja, + numpy, + scikit-build-core, - # dependencies + # buildInputs + opencl-headers, + pybind11, darwin, - numpy, ocl-icd, - opencl-headers, + + # dependencies platformdirs, - pybind11, pytools, # tests @@ -24,7 +26,8 @@ }: let - os-specific-buildInputs = if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.OpenCL ] else [ ocl-icd ]; + os-specific-buildInputs = + if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.OpenCL ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; @@ -65,25 +68,30 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d) - # import from $out - rm -r pyopencl + # https://github.com/NixOS/nixpkgs/issues/255262 + cd $out ''; - # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR + # https://github.com/inducer/pyopencl/issues/784 Note that these failing + # tests are all the tests that are available. doCheck = false; pythonImportsCheck = [ "pyopencl" "pyopencl.array" "pyopencl.cltypes" + "pyopencl.compyte" "pyopencl.elementwise" "pyopencl.tools" ]; - meta = with lib; { - changelog = "https://github.com/inducer/pyopencl/releases/tag/v${version}"; + meta = { description = "Python wrapper for OpenCL"; - homepage = "https://github.com/inducer/pyopencl"; - license = licenses.mit; + homepage = "https://github.com/pyopencl/pyopencl"; + changelog = "https://github.com/inducer/pyopencl/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + # ld: symbol(s) not found for architecture arm64 + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index a66fcc6463a4e..a4c4b1cbf21d7 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { let ext = stdenv.hostPlatform.extensions.sharedLibrary; in - lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Theses lines are patching the name of dynamic libraries # so pyopengl can find them at runtime. substituteInPlace OpenGL/platform/glx.py \ diff --git a/pkgs/development/python-modules/pyopengltk/default.nix b/pkgs/development/python-modules/pyopengltk/default.nix index 2f0440d83daf8..b50780336e508 100644 --- a/pkgs/development/python-modules/pyopengltk/default.nix +++ b/pkgs/development/python-modules/pyopengltk/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ sigmanificient ]; license = lib.licenses.mit; # not supported yet, see: https://github.com/jonwright/pyopengltk/issues/12 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index b9691b2a2827d..0d8ae7f649eb0 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { "test_dump_certificate_request" "test_export_text" ] - ++ lib.optionals stdenv.is32bit [ + ++ lib.optionals stdenv.hostPlatform.is32bit [ # https://github.com/pyca/pyopenssl/issues/974 "test_verify_with_time" ]; diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 664054df075b1..19fe009ced119 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -13,6 +13,7 @@ pythonOlder, pytest-httpserver, pytestCheckHook, + setuptools, shapely, werkzeug, isPyPy, @@ -22,18 +23,20 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "3.7.0"; - format = "setuptools"; + version = "4.0.1"; + pyproject = true; - disabled = pythonOlder "3.6" || isPyPy; + disabled = pythonOlder "3.7" || isPyPy; src = fetchFromGitHub { owner = "osmcode"; - repo = pname; + repo = "pyosmium"; rev = "refs/tags/v${version}"; - hash = "sha256-DBFDAKNrD93MRXjoM8dIJQ/HJ9Aj8oMJuPVQxTrKYfI="; + hash = "sha256-qi4GsjQVe2nIcvQThAlxQu3kUdWhRuJFHVPjKbMBxdM="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -47,7 +50,7 @@ buildPythonPackage rec { lz4 ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; preBuild = "cd .."; @@ -58,11 +61,13 @@ buildPythonPackage rec { pytest-httpserver ]; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "Python bindings for libosmium"; homepage = "https://osmcode.org/pyosmium"; changelog = "https://github.com/osmcode/pyosmium/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ sikmir ]; }; } diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix index 03a07846b89b9..322e915b9be9f 100644 --- a/pkgs/development/python-modules/pyotgw/default.nix +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyotgw"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mvn23"; repo = "pyotgw"; rev = "refs/tags/${version}"; - hash = "sha256-SowM+glni1PGkM87JT9+QWTD4Tu9XmsfXg99GZzSCJM="; + hash = "sha256-jms7uSeafLxq26E9pyVVXtnW7yYD0OrU4KrXxTXoC4M="; }; build-system = [ setuptools ]; @@ -34,6 +34,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyotgw" ]; + disabledTests = [ + # Tests require network access + "connect_timeouterror" + ]; + meta = with lib; { description = "Python module to interact the OpenTherm Gateway"; homepage = "https://github.com/mvn23/pyotgw"; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 0cc34cdc4b0bf..e0efa2fd575f3 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -7,7 +7,6 @@ boto3, buildPythonPackage, fetchFromGitHub, - fetchpatch2, poetry-core, pyhumps, pytest-asyncio, @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.13.14"; + version = "1.14.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,24 +26,9 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-HlDydPreHe/O+fqVwjkwQlQx0o9UxI/fwA+idB02Gng="; + hash = "sha256-mpD8seRGZZ+1Rgg1ADFiFgYZ1JmLRNdscRwfXIK6Pr4="; }; - patches = [ - # https://github.com/iMicknl/python-overkiz-api/pull/1309 - (fetchpatch2 { - url = "https://github.com/iMicknl/python-overkiz-api/commit/9e5bbec3fc88faac9dae0c0c001ed7582c4933e2.patch"; - excludes = [ "poetry.lock" ]; - hash = "sha256-KzagDvljkKoUJT+41o7Jv5OPLpPXQDeGmz3O/HOk1YQ="; - }) - # https://github.com/iMicknl/python-overkiz-api/pull/1326 - (fetchpatch2 { - name = "aiohttp-3.10-compat.patch"; - url = "https://github.com/iMicknl/python-overkiz-api/commit/f745c0a9cd654579135624aa472723f85d301aed.patch"; - hash = "sha256-FXyWLnbu0Kqe/dWrWdi4cvyttDQqexhHo0nTumfUo4g="; - }) - ]; - build-system = [ poetry-core ]; dependencies = [ diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index ebdd762b6d067..24acecdaf8c2b 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| ' tests/test__ped_ped.py '' - + lib.optionalString stdenv.isi686 '' + + lib.optionalString stdenv.hostPlatform.isi686 '' # remove some integers in this test case which overflow on 32bit systems sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \ tests/test__ped_ped.py diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 784a5e213c3ba..1b9dc08d67200 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { disabledTests = [ "test_show_clip" ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Password manager pass in Python"; mainProgram = "pypass"; homepage = "https://github.com/aviau/python-pass"; diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 1dea0e3ee9577..a24b786a30c32 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.21"; + version = "0.7.24"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = "pypck"; rev = "refs/tags/${version}"; - hash = "sha256-6Ng+Jw5ZDtkKOftFVhy1uOjzcmeKI5VqWzPn3EkKfGI="; + hash = "sha256-DWdQUnURL3WBi916vOTawtBqq+SHTu4iLViGczwAWQE="; }; postPatch = '' @@ -38,7 +38,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "--asyncio-mode=auto" ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_connection_lost" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_connection_lost" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index 23c90f841ac55..b9176cc76dbe0 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pythonOlder, # build-system @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "4.3.1"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { @@ -36,7 +37,7 @@ buildPythonPackage rec { rev = "refs/tags/${version}"; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-wSF20I5WaxRoN0n0jxB5O3mAAIOxP/TclYBTRAUwYHo="; + hash = "sha256-omnNC1mzph59aqrXqLCuCk0LgzfJv/JhbQRrAgRhAIg="; }; outputs = [ @@ -53,6 +54,14 @@ buildPythonPackage rec { myst-parser ]; + patches = [ + (fetchpatch2 { + # Mark test_increment_writer as enable_socket (https://github.com/py-pdf/pypdf/pull/2867) + url = "https://github.com/py-pdf/pypdf/commit/d974d5c755a7b65f3b9c68c5742afdbc0c1693f6.patch"; + hash = "sha256-4xiCAStP615IktTUgk31JbIxkxx8d6PQdu8Nfmhc1jo="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "--disable-socket" "" diff --git a/pkgs/development/python-modules/pyperscan/default.nix b/pkgs/development/python-modules/pyperscan/default.nix index fae3060a744a6..7f2bde698eb8d 100644 --- a/pkgs/development/python-modules/pyperscan/default.nix +++ b/pkgs/development/python-modules/pyperscan/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - buildInputs = [ vectorscan ] ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ vectorscan ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; pythonImportsCheck = [ "pyperscan" ]; diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index e51909faab5b9..48f4d8d798111 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.52.0"; + version = "0.53.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mozillazg"; repo = "python-pinyin"; rev = "refs/tags/v${version}"; - hash = "sha256-XoRH9vBO0vJl7DqgGrFLfxGFtiQTpXdZoM4FO3TFWeY="; + hash = "sha256-NGW94Labk3vAv4bfq/+ba2lnL/uebg0ODZWEi2yNIjg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix index e403e7394cbcc..563f0311ee947 100644 --- a/pkgs/development/python-modules/pypiserver/default.nix +++ b/pkgs/development/python-modules/pypiserver/default.nix @@ -1,13 +1,14 @@ { lib, buildPythonPackage, + distutils, fetchFromGitHub, passlib, pip, pytestCheckHook, pythonOlder, - setuptools, setuptools-git, + setuptools, twine, watchdog, webtest, @@ -17,30 +18,41 @@ buildPythonPackage rec { pname = "pypiserver"; version = "2.0.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "pypiserver"; + repo = "pypiserver"; rev = "refs/tags/v${version}"; hash = "sha256-Eh/3URt7pcJhoDDLRP8iHyjlPsE5E9M/0Hixqi5YNdg="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-git wheel ]; - propagatedBuildInputs = [ pip ]; + dependencies = [ + distutils + pip + ]; - passthru.optional-dependencies = { + optional-dependencies = { passlib = [ passlib ]; cache = [ watchdog ]; }; + nativeCheckInputs = [ + pip + pytestCheckHook + setuptools + twine + webtest + ] ++ lib.flatten (builtins.attrValues optional-dependencies); + __darwinAllowLocalNetworking = true; # Tests need these permissions in order to use the FSEvents API on macOS. @@ -52,14 +64,6 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - nativeCheckInputs = [ - pip - pytestCheckHook - setuptools - twine - webtest - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - disabledTests = [ # Fails to install the package "test_hash_algos" @@ -76,7 +80,6 @@ buildPythonPackage rec { meta = with lib; { description = "Minimal PyPI server for use with pip/easy_install"; - mainProgram = "pypi-server"; homepage = "https://github.com/pypiserver/pypiserver"; changelog = "https://github.com/pypiserver/pypiserver/releases/tag/v${version}"; license = with licenses; [ @@ -84,5 +87,6 @@ buildPythonPackage rec { zlib ]; maintainers = with maintainers; [ austinbutler ]; + mainProgram = "pypi-server"; }; } diff --git a/pkgs/development/python-modules/pypoint/default.nix b/pkgs/development/python-modules/pypoint/default.nix index e0e5aab54350c..d7062da6c80bb 100644 --- a/pkgs/development/python-modules/pypoint/default.nix +++ b/pkgs/development/python-modules/pypoint/default.nix @@ -2,26 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, - authlib, - httpx, + setuptools, + aiohttp, }: buildPythonPackage rec { pname = "pypoint"; - version = "2.3.2"; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "fredrike"; repo = "pypoint"; rev = "v${version}"; - hash = "sha256-tQ5rQs6ECn9O9dVXKWhmy9BBpOzgqSmwpmbIRbJn2CQ="; + hash = "sha256-Ri+vf/vnjQQ+9eZ1Gzt+v68FAxVGt0IY9S3SpeVem3A="; }; - propagatedBuildInputs = [ - authlib - httpx - ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # upstream has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pypoolstation/default.nix b/pkgs/development/python-modules/pypoolstation/default.nix index f9ddc503ede65..14e2c906f9a5e 100644 --- a/pkgs/development/python-modules/pypoolstation/default.nix +++ b/pkgs/development/python-modules/pypoolstation/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pypoolstation"; - version = "0.5.4"; + version = "0.5.6"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SA5Eqz0WoisVVAjeKQymVh17+fHa7SuiYXgOL2BiJcc="; + hash = "sha256-E5/Z7TgIZlbIDB9I+DJI812ce8ctidDAXGCHBFzk7F8="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyproject-parser/default.nix b/pkgs/development/python-modules/pyproject-parser/default.nix new file mode 100644 index 0000000000000..a3b6ca4b03197 --- /dev/null +++ b/pkgs/development/python-modules/pyproject-parser/default.nix @@ -0,0 +1,48 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + setuptools, + apeye-core, + attrs, + dom-toml, + domdf-python-tools, + natsort, + packaging, + shippinglabel, + typing-extensions, +}: +buildPythonPackage rec { + pname = "pyproject-parser"; + version = "0.11.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-0ejtu6OlSA6w/z/+j2lDuikFGZh4r/HLBZhJAKZhggE="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + apeye-core + attrs + dom-toml + domdf-python-tools + natsort + packaging + shippinglabel + typing-extensions + ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' + ''; + + meta = { + description = "Parser for ‘pyproject.toml’"; + homepage = "https://github.com/repo-helper/pyproject-parser"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyberius-prime ]; + }; +} diff --git a/pkgs/development/python-modules/pyprosegur/default.nix b/pkgs/development/python-modules/pyprosegur/default.nix index ff835d0234962..6e79fae9dde87 100644 --- a/pkgs/development/python-modules/pyprosegur/default.nix +++ b/pkgs/development/python-modules/pyprosegur/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyprosegur"; - version = "0.0.11"; + version = "0.0.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,12 +21,12 @@ buildPythonPackage rec { owner = "dgomes"; repo = "pyprosegur"; rev = "refs/tags/${version}"; - hash = "sha256-DBr/MtomB7MlZlK8YBvtY1MIstLxotOkv07zZNNuRtM="; + hash = "sha256-A223aafa0eXNBVd2cVVV7p2wXg4Z2rcoggM3czmRsOE="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles aiohttp backoff diff --git a/pkgs/development/python-modules/pypsrp/default.nix b/pkgs/development/python-modules/pypsrp/default.nix index faddf2906f5fe..286b8a2ad9024 100644 --- a/pkgs/development/python-modules/pypsrp/default.nix +++ b/pkgs/development/python-modules/pypsrp/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { xmldiff ]; - passthru.optional-dependencies = { + optional-dependencies = { credssp = [ requests-credssp ]; kerberos = pyspnego.optional-dependencies.kerberos; named_pipe = [ psutil ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2fdd86b3b5ea0..5e1c966735559 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -23,7 +23,7 @@ withSerialPort ? false, withTools ? false, pkgsBuildTarget, - dbusSupport ? !stdenv.isDarwin, + dbusSupport ? !stdenv.hostPlatform.isDarwin, }: buildPythonPackage rec { @@ -59,7 +59,7 @@ buildPythonPackage rec { # Due to bug in SIP .whl name generation we have to bump minimal macos sdk upto 11.0 for # aarch64-darwin. This patch can be removed once SIP will fix it in upstream, # see https://github.com/NixOS/nixpkgs/pull/186612#issuecomment-1214635456. - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' minimum-macos-version = "11.0" '' + '' diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index 8c5653826d259..9f031347d354e 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -118,7 +118,7 @@ buildPythonPackage rec { setuptools ] # ld: library not found for -lcups - ++ lib.optionals (withPrintSupport && stdenv.isDarwin) [ cups ]; + ++ lib.optionals (withPrintSupport && stdenv.hostPlatform.isDarwin) [ cups ]; passthru = { inherit sip pyqt6-sip; @@ -145,7 +145,7 @@ buildPythonPackage rec { # ++ lib.optional withConnectivity "PyQt6.QtConnectivity" ++ lib.optional withLocation "PyQt6.QtPositioning"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-address-of-temporary"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-address-of-temporary"; meta = with lib; { description = "Python bindings for Qt6"; diff --git a/pkgs/development/python-modules/pyqt/pyqt6-sip.nix b/pkgs/development/python-modules/pyqt/pyqt6-sip.nix index 30b2fa9011c89..e4b6c28d8b536 100644 --- a/pkgs/development/python-modules/pyqt/pyqt6-sip.nix +++ b/pkgs/development/python-modules/pyqt/pyqt6-sip.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyqt6-sip"; - version = "13.6.0"; + version = "13.8.0"; src = fetchPypi { pname = "PyQt6_sip"; inherit version; - hash = "sha256-JIbhWIBxlD1PZle6CQltyf/9IyKtLDAEHnjqPwN7V3g="; + hash = "sha256-L3TPPW2cq1FSvZ9J1XCy37h1U+u1xJGav94n9bn9adQ="; }; # There is no test code and the check phase fails with: @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for Qt5"; - homepage = "https://www.riverbankcomputing.com/software/sip/"; + homepage = "https://github.com/Python-SIP/sip"; license = licenses.gpl3Only; inherit (mesa.meta) platforms; maintainers = with maintainers; [ LunNova ]; diff --git a/pkgs/development/python-modules/pyqt/sip.nix b/pkgs/development/python-modules/pyqt/sip.nix index a9042856e4669..4a4ceebf66a6e 100644 --- a/pkgs/development/python-modules/pyqt/sip.nix +++ b/pkgs/development/python-modules/pyqt/sip.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyqt5-sip"; - version = "12.13.0"; + version = "12.15.0"; src = fetchPypi { pname = "PyQt5_sip"; inherit version; - hash = "sha256-fzIdr4S5ydvKYbgOHvN72v/A6TMS7a4s19oluVOXHZE="; + hash = "sha256-0j/fzzY7XO3Z05+KnFcQ59UoBPWwiljpHGOLNur8twI="; }; # There is no test code and the check phase fails with: @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for Qt5"; - homepage = "https://www.riverbankcomputing.com/software/sip/"; + homepage = "https://github.com/Python-SIP/sip"; license = licenses.gpl3Only; inherit (mesa.meta) platforms; maintainers = with maintainers; [ sander ]; diff --git a/pkgs/development/python-modules/pyqt3d/default.nix b/pkgs/development/python-modules/pyqt3d/default.nix index abf60dcad115e..487ab3a109859 100644 --- a/pkgs/development/python-modules/pyqt3d/default.nix +++ b/pkgs/development/python-modules/pyqt3d/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyqt3d"; - version = "5.15.6"; + version = "5.15.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyQt3D"; inherit version; - hash = "sha256-fWxtVc2PwiGzE8mVwPhymjdxFJJvA3f46QEdRevziBw="; + hash = "sha256-6ng+tUbH2tLV6q+C6lBQ3eRSVamELgoddYSIHp4lqVE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyqtchart/default.nix b/pkgs/development/python-modules/pyqtchart/default.nix index 1a6675b9ad80d..2ee389ad20750 100644 --- a/pkgs/development/python-modules/pyqtchart/default.nix +++ b/pkgs/development/python-modules/pyqtchart/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyqtchart"; - version = "5.15.6"; + version = "5.15.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyQtChart"; inherit version; - hash = "sha256-JpF5b+kqKUphdZKlxcNeeF3JH3dZ3vnrItp532N2Izk="; + hash = "sha256-vJ8dJscl6CCw//jbbpBuiyhhKKFLOpjFmgzQw9mSQJU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyqtdatavisualization/default.nix b/pkgs/development/python-modules/pyqtdatavisualization/default.nix index d0c1ba5b8d051..9fce4b02bc7d2 100644 --- a/pkgs/development/python-modules/pyqtdatavisualization/default.nix +++ b/pkgs/development/python-modules/pyqtdatavisualization/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyqtdatavisualization"; - version = "5.15.5"; + version = "5.15.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyQtDataVisualization"; inherit version; - hash = "sha256-iSf496pwhX7wDFHj379vg92fOFX0FuDVMVknYcu53H8="; + hash = "sha256-ntM7IOdHvGnh1hnxR7sWJcwA1u9ATb8Ha6E6n/b2Bh0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index 6bfa11c30fcb6..629f96d76df4e 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { # https://github.com/pyqtgraph/pyqtgraph/issues/2110 "test_PolyLineROI" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # https://github.com/pyqtgraph/pyqtgraph/issues/2645 "test_rescaleData" ]; diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 8b54e55c037fa..11d0f847d8328 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -21,7 +21,7 @@ in buildPythonPackage ( rec { pname = "pyqtwebengine"; - version = "5.15.6"; + version = "5.15.7"; format = "pyproject"; disabled = isPy27; @@ -29,7 +29,7 @@ buildPythonPackage ( src = fetchPypi { pname = "PyQtWebEngine"; inherit version; - hash = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE="; + hash = "sha256-8SGsbkovlqwolhm8/Df2Tmg2LySjRlU/XWxC76Qiik0="; }; postPatch = '' @@ -60,7 +60,9 @@ buildPythonPackage ( setuptools ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ libsForQt5.qtdeclarative ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + autoSignDarwinBinariesHook + ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index 6e9c6ca53f26d..84e97f2bf050d 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "4.14.2"; + version = "4.14.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "pyquil"; rev = "refs/tags/v${version}"; - hash = "sha256-9P2AJPr65jNOHsKuF9qYcF/8s8IIIb9WeNUfAwrnlgE="; + hash = "sha256-kGrOvec2q1GoVweu5tTbz8kvnjG6RAfjlF64Uf3RTxw="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index e2c39b05b0209..56894f1c4df43 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -9,13 +9,14 @@ python, pythonOlder, readstat, + setuptools, zlib, }: buildPythonPackage rec { pname = "pyreadstat"; - version = "1.2.6"; - format = "setuptools"; + version = "1.2.7"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,14 +24,17 @@ buildPythonPackage rec { owner = "Roche"; repo = "pyreadstat"; rev = "refs/tags/v${version}"; - hash = "sha256-VcPpGRrE/5udNijodO88Lw69JPOm6ZN7BZb4xD34srQ="; + hash = "sha256-XuLFLpZbaCj/MHq0+l6GoNqR5nAldAlEJhoO5ioWYTA="; }; - nativeBuildInputs = [ cython ]; + build-system = [ + cython + setuptools + ]; - buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - propagatedBuildInputs = [ + dependencies = [ readstat pandas ]; diff --git a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix index 1dc215bf0ee8f..33e5958430d14 100644 --- a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix +++ b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv SystemConfiguration ]; env.BORING_BSSL_PATH = boringssl-wrapper; - passthru.optional-dependencies = { + optional-dependencies = { dev = [ pytest ]; }; diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 51ed8f0cc31f9..621f703992968 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { xmlschema ]; - passthru.optional-dependencies = { + optional-dependencies = { s2repoze = [ paste repoze-who diff --git a/pkgs/development/python-modules/pyscaffold/default.nix b/pkgs/development/python-modules/pyscaffold/default.nix index 7b3bc447ef488..6e738b07d3dc5 100644 --- a/pkgs/development/python-modules/pyscaffold/default.nix +++ b/pkgs/development/python-modules/pyscaffold/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { tomlkit ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ pre-commit pyscaffoldext-cookiecutter diff --git a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix index bcc4ed68bfdd2..a34bf93334e9a 100644 --- a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix index f487b25c9eea6..ee4bc3aa728b5 100644 --- a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/pkgs/development/python-modules/pyscaffoldext-django/default.nix index c85e01e099252..e0e9ca4cf69f2 100644 --- a/pkgs/development/python-modules/pyscaffoldext-django/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-django/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix index 5f2cd21069fea..9763ba8ace954 100644 --- a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pyscaffoldext-markdown ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix index 82b25bac417ce..4d6157ed4d99e 100644 --- a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { wheel ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix index 46d27e7480b41..6c08f6c23adc0 100644 --- a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 3fd9d3c2fbd46..4582cc1852036 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -13,7 +13,7 @@ let # Package does not support configuring the pcsc library. - withApplePCSC = stdenv.isDarwin; + withApplePCSC = stdenv.hostPlatform.isDarwin; in buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 5866abddf4cfc..e7a85d7730802 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pyscf"; - version = "2.6.2"; + version = "2.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "pyscf"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gudkKhC5Cpd6ZM9mJ1SfemqmwDqhDmpAfYE8XGFpzmA="; + hash = "sha256-lXOREy0BABcjpAkxIMy245SAX8HfJKj/QSHGob14GgI="; }; # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake. diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index e5ec8d7093c44..7fa1cb40565f6 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -3,22 +3,25 @@ aiohttp, buildPythonPackage, fetchPypi, + poetry-core, pythonOlder, }: buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.36"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-lsHKwFzfkGWuUiZGkt9zwjNDDU7i6gcqcEsi5SQqsSQ="; + hash = "sha256-yITcVEBtqH1B+MyhQweOzmdgPgWrueAkczp/UsT4J/4="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; # No tests implemented doCheck = false; diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix index 3fb8236f9b71b..f2c07cd5e4181 100644 --- a/pkgs/development/python-modules/pysequoia/default.nix +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { openssl pcsclite ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security libiconv @@ -62,6 +62,6 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; # Broken since the 0.1.20 update according to ofborg. The errors are not clear... - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index ba92fdaebd281..7e4cff21d1812 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { # KeyError: 'Packet of index 0 does not exist in capture' "test_getting_packet_summary" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails on darwin # _pickle.PicklingError: logger cannot be pickled "test_iterate_empty_psml_capture" diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index d66ef9a52257b..2a3ff3c5ad343 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -1,6 +1,5 @@ { python, - pythonAtLeast, fetchurl, lib, stdenv, @@ -35,28 +34,9 @@ stdenv.mkDerivation rec { ./Modify-sendCommand-signatures.patch ]; - postPatch = - (lib.optionalString (pythonAtLeast "3.12") '' - substituteInPlace \ - ez_setup.py \ - build_scripts/main.py \ - build_scripts/options.py \ - build_scripts/utils.py \ - build_scripts/wheel_override.py \ - build_scripts/wheel_utils.py \ - sources/pyside2/CMakeLists.txt \ - --replace-fail "from distutils" "import setuptools; from distutils" - substituteInPlace \ - build_scripts/config.py \ - build_scripts/main.py \ - build_scripts/options.py \ - build_scripts/setup_runner.py \ - build_scripts/utils.py \ - --replace-fail "import distutils" "import setuptools; import distutils" - '') - + '' - cd sources/pyside2 - ''; + postPatch = '' + cd sources/pyside2 + ''; cmakeFlags = [ "-DBUILD_TESTS=OFF" @@ -69,8 +49,12 @@ stdenv.mkDerivation rec { cmake ninja qt5.qmake - python - python.pkgs.setuptools + (python.withPackages ( + ps: with ps; [ + distutils + setuptools + ] + )) ]; buildInputs = @@ -113,6 +97,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 2dc0078c369a0..088f4e785af64 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -71,24 +71,26 @@ stdenv.mkDerivation (finalAttrs: { 'string(FIND "''${_module_dir}" "''${_core_abs_dir}" found_basepath)' \ 'set (found_basepath 0)' '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/PySideHelpers.cmake \ --replace-fail \ "Designer" "" ''; # "Couldn't find libclang.dylib You will likely need to add it manually to PATH to ensure the build succeeds." - env = lib.optionalAttrs stdenv.isDarwin { LLVM_INSTALL_DIR = "${llvmPackages.libclang.lib}/lib"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + LLVM_INSTALL_DIR = "${llvmPackages.libclang.lib}/lib"; + }; nativeBuildInputs = [ cmake ninja python pythonImportsCheckHook - ] ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; buildInputs = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then # qtwebengine fails under darwin # see https://github.com/NixOS/nixpkgs/pull/312987 packages ++ [ python.pkgs.qt6.qtwebengine ] diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index 561f117c49f38..f80113fa1bb15 100644 --- a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-NrA7+iwjmYIOqLGRUJSWhOjFb6V542r0PWxuZG3O/Yo="; + hash = "sha256-7XecgpZ2DQr2f/Ge7skbielK7qwuGoy/KAoxzNvk9w4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index b062ff4356060..9ecc23541ce64 100644 --- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-insightidr"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-insightidr"; rev = "refs/tags/v${version}"; - hash = "sha256-wQMnnJ0KU+53MS3PIBkwIhUiyUdCrDbdUT6upk2Pp/8="; + hash = "sha256-dc25zDYQeU9W9qwrRz7zsM2wOl8kMapDvwFhB6VOwhY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index 8acb5470019ee..53c693974c2a6 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-crowdstrike"; - version = "1.0.3"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,17 +19,22 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-crowdstrike"; rev = "refs/tags/v${version}"; - hash = "sha256-0uSoZC2cUgdOGE5saLlx5n0gbVPX61kkASCBFD4F5QM="; + hash = "sha256-9rYTBMVb664R9heOw/N/PUFotwOP1avdPUjPDhICkVU="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ pysigma ]; + dependencies = [ pysigma ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "sigma.pipelines.crowdstrike" ]; + disabledTests = [ + # Windows binary not mocked + "test_crowdstrike_pipeline_parentimage" + ]; + meta = with lib; { description = "Library to support CrowdStrike pipeline for pySigma"; homepage = "https://github.com/SigmaHQ/pySigma-pipeline-crowdstrike"; diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 3ccbefb250e3f..8987f9820e84d 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.11.7"; + version = "0.11.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-vc2f5qrPHSU/CUENj+MuD0rjsEj68JPnL39fuOOcRCU="; + hash = "sha256-jxVTXw3WZcOL5IDUHs+DRGoXDRFn99UWOz5j5mCEf8A="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pysilero-vad/default.nix b/pkgs/development/python-modules/pysilero-vad/default.nix index bee85a4b2bc36..020677f05e6a4 100644 --- a/pkgs/development/python-modules/pysilero-vad/default.nix +++ b/pkgs/development/python-modules/pysilero-vad/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { # what(): /build/source/include/onnxruntime/core/common/logging/logging.h:294 static const onnxruntime::logging::Logger& onnxruntime::logging::LoggingManager::DefaultLogger() Attempt to use DefaultLogger but none has been registered. - broken = stdenv.isAarch64 && stdenv.isLinux; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; description = "Pre-packaged voice activity detector using silero-vad"; homepage = "https://github.com/rhasspy/pysilero-vad"; changelog = "https://github.com/rhasspy/pysilero-vad/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix deleted file mode 100644 index ac2d7482496a2..0000000000000 --- a/pkgs/development/python-modules/pysimplegui/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - tkinter, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "pysimplegui"; - version = "5.0.5"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - pname = "PySimpleGUI"; - inherit version; - hash = "sha256-4B2LgWmdXAU9ACSR0F26Q9+eP3izRI+p6QS/o9m6Hfk="; - }; - - propagatedBuildInputs = [ tkinter ]; - - pythonImportsCheck = [ "PySimpleGUI" ]; - - meta = with lib; { - description = "Python GUIs for Humans"; - homepage = "https://github.com/PySimpleGUI/PySimpleGUI"; - license = licenses.unfree; - maintainers = with maintainers; [ lucasew ]; - broken = true; # update to v5 broke the package, it now needs rsa and is trying to access an X11 socket? - }; -} diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 5a2733c302052..d58336d0019c5 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pyasn1, pythonOlder, tqdm, @@ -9,8 +10,8 @@ buildPythonPackage rec { pname = "pysmb"; - version = "1.2.9.1"; - format = "setuptools"; + version = "1.2.10"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,10 +19,12 @@ buildPythonPackage rec { owner = "miketeo"; repo = "pysmb"; rev = "refs/tags/pysmb-${version}"; - hash = "sha256-psV6fYymE6k2YqxOvFM2s7JTG51fI5pSqmkZnvfmprw="; + hash = "sha256-Zid6KGNr7BBuyHaxdXkhRC/Ug93HmVXKMtreFf+M7OE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyasn1 tqdm ]; diff --git a/pkgs/development/python-modules/pysmi-lextudio/default.nix b/pkgs/development/python-modules/pysmi-lextudio/default.nix deleted file mode 100644 index 1b6225c3f8bf0..0000000000000 --- a/pkgs/development/python-modules/pysmi-lextudio/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - jinja2, - ply, - poetry-core, - pythonOlder, - requests, -}: - -buildPythonPackage rec { - pname = "pysmi-lextudio"; - version = "1.4.3"; - pyproject = true; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "lextudio"; - repo = "pysmi"; - rev = "refs/tags/v${version}"; - hash = "sha256-JrWVoK7fqESUIJeprjB28iaqOEWgsTpTqUEmSZp9XDk="; - }; - - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ - jinja2 - ply - requests - ]; - - # Circular dependency on pysnmp-lextudio - doCheck = false; - - pythonImportsCheck = [ "pysmi" ]; - - meta = with lib; { - description = "SNMP MIB parser"; - homepage = "https://github.com/lextudio/pysmi"; - changelog = "https://github.com/lextudio/pysmi/blob/v${version}/CHANGES.rst"; - license = licenses.bsd2; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix index 0d268a6c63ad4..69aac0ffc10fa 100644 --- a/pkgs/development/python-modules/pysmi/default.nix +++ b/pkgs/development/python-modules/pysmi/default.nix @@ -1,29 +1,56 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + jinja2, ply, + poetry-core, + pysmi, + pysnmp, + pytestCheckHook, + pythonOlder, + requests, }: buildPythonPackage rec { - version = "0.3.4"; - format = "setuptools"; + version = "1.5.0"; pname = "pysmi"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "bd15a15020aee8376cab5be264c26330824a8b8164ed0195bd402dd59e4e8f7c"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "lextudio"; + repo = "pysmi"; + rev = "refs/tags/v${version}"; + hash = "sha256-9yAsseMI50RhVeyFvuTo/pN9ftrvvUWYCacy2v3VVT8="; }; - propagatedBuildInputs = [ ply ]; + build-system = [ poetry-core ]; + + dependencies = [ + ply + jinja2 + requests + ]; + + nativeCheckInputs = [ + pysnmp + pytestCheckHook + ]; # Tests require pysnmp, which in turn requires pysmi => infinite recursion doCheck = false; + pythonImportsCheck = [ "pysmi" ]; + + passthru.tests.pytest = pysmi.overridePythonAttrs { doCheck = true; }; + meta = with lib; { - homepage = "http://pysmi.sf.net"; - description = "SNMP SMI/MIB Parser"; + description = "SNMP MIB parser"; + homepage = "https://github.com/lextudio/pysmi"; + changelog = "https://github.com/lextudio/pysmi/blob/v${version}/CHANGES.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ koral ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix index febe4a190b0bf..73a2d67ed8edd 100644 --- a/pkgs/development/python-modules/pysml/default.nix +++ b/pkgs/development/python-modules/pysml/default.nix @@ -12,28 +12,28 @@ buildPythonPackage rec { pname = "pysml"; - version = "0.1.2"; - format = "pyproject"; + version = "0.1.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mtdcr"; - repo = pname; + repo = "pysml"; rev = "refs/tags/${version}"; - hash = "sha256-TLIpc0bVx1As2oLyYD+BBMalwJiKdvBCcrd1tUNyh6Y="; + hash = "sha256-LmybrMHHWsLd6Y2xMqJ8g65SQCsysBGxeL43qouo3SM="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout bitstring pyserial-asyncio ]; - # Project has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ "sml" ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for EDL21 smart meters using Smart Message Language (SML)"; homepage = "https://github.com/mtdcr/pysml"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix new file mode 100644 index 0000000000000..907fbad8fd675 --- /dev/null +++ b/pkgs/development/python-modules/pysmlight/default.nix @@ -0,0 +1,49 @@ +{ + aiohttp, + aiohttp-sse-client2, + aresponses, + buildPythonPackage, + fetchFromGitHub, + lib, + mashumaro, + poetry-core, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pysmlight"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "smlight-tech"; + repo = "pysmlight"; + rev = "refs/tags/v${version}"; + hash = "sha256-ouPUNKlTlF2t2K7RMG7oDSfeITjNPoGb5pNC7oUyGDI="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + aiohttp-sse-client2 + mashumaro + ]; + + pythonImportsCheck = [ "pysmlight" ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/smlight-tech/pysmlight/releases/tag/v${version}"; + description = "Library implementing API control of the SMLIGHT SLZB-06 LAN Coordinators"; + homepage = "https://github.com/smlight-tech/pysmlight"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pysnmp-lextudio/default.nix b/pkgs/development/python-modules/pysnmp-lextudio/default.nix deleted file mode 100644 index d8df1a72c5c4d..0000000000000 --- a/pkgs/development/python-modules/pysnmp-lextudio/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - poetry-core, - - # dependencies - pyasn1, - pysmi-lextudio, - pysnmpcrypto, - - # tests - pytestCheckHook, - pytest-asyncio, -}: - -buildPythonPackage rec { - pname = "pysnmp-lextudio"; - version = "6.1.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "lextudio"; - repo = "pysnmp"; - rev = "refs/tags/v${version}"; - hash = "sha256-iVej39OmTPiZL11+IetnqHaxFAhZ/YR7tjiRoc7pu8U="; - }; - - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ - pyasn1 - pysmi-lextudio - pysnmpcrypto - ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-asyncio - ]; - - disabledTests = [ - # Temporary failure in name resolutionc - "test_custom_asn1_mib_search_path" - "test_send_notification" - "test_send_trap" - "test_send_v3_inform_notification" - "test_send_v3_inform_sync" - "test_usm_sha_aes128" - "test_v1_get" - "test_v1_next" - "test_v1_set" - "test_v2c_bulk" - # pysnmp.smi.error.MibNotFoundError - "test_send_v3_trap_notification" - "test_addAsn1MibSource" - "test_v1_walk" - "test_v2_walk" - ]; - - pythonImportsCheck = [ "pysnmp" ]; - - meta = with lib; { - description = "Python SNMP library"; - homepage = "https://github.com/lextudio/pysnmp"; - changelog = "https://github.com/lextudio/pysnmp/blob/${src.rev}/CHANGES.txt"; - license = licenses.bsd2; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index 7bc9db63943a9..540d1fbff830c 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -1,40 +1,74 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies pyasn1, - pycryptodomex, pysmi, + pysnmpcrypto, + + # tests + pytestCheckHook, + pytest-asyncio, }: buildPythonPackage rec { pname = "pysnmp"; - version = "4.4.12"; - format = "setuptools"; + version = "6.2.6"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "1acbfvpbr45i137s00mbhh21p71ywjfw3r8z0ybcmjjqz7rbwg8c"; + src = fetchFromGitHub { + owner = "lextudio"; + repo = "pysnmp"; + rev = "refs/tags/v${version}"; + hash = "sha256-+FfXvsfn8XzliaGUKZlzqbozoo6vDxUkgC87JOoVasY="; }; - patches = [ ./setup.py-Fix-the-setuptools-version-check.patch ]; + pythonRemoveDeps = [ "pytest-cov" ]; - # NameError: name 'mibBuilder' is not defined - doCheck = false; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ pyasn1 - pycryptodomex pysmi + pysnmpcrypto + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + disabledTests = [ + # Temporary failure in name resolution + "test_custom_asn1_mib_search_path" + "test_send_notification" + "test_send_trap" + "test_send_v3_inform_notification" + "test_send_v3_inform_sync" + "test_usm_sha_aes128" + "test_v1_get" + "test_v1_next" + "test_v1_set" + "test_v2c_bulk" + # pysnmp.smi.error.MibNotFoundError + "test_send_v3_trap_notification" + "test_addAsn1MibSource" + "test_v1_walk" + "test_v2_walk" ]; + pythonImportsCheck = [ "pysnmp" ]; + meta = with lib; { - homepage = "http://snmplabs.com/pysnmp/index.html"; - description = "Pure-Python SNMPv1/v2c/v3 library"; + description = "Python SNMP library"; + homepage = "https://github.com/lextudio/pysnmp"; + changelog = "https://github.com/lextudio/pysnmp/blob/${src.rev}/CHANGES.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ - primeos - koral - ]; + maintainers = with maintainers; [ hexa ]; }; } diff --git a/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch b/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch deleted file mode 100644 index 784ddd3f34275..0000000000000 --- a/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5f843f7c8554e2feab7f57d8718231408196fd80 Mon Sep 17 00:00:00 2001 -From: Michael Weiss <dev.primeos@gmail.com> -Date: Fri, 1 Nov 2019 18:47:14 +0100 -Subject: [PATCH] setup.py: Fix the setuptools version check - -This broke the Nix build after setuptools.__version__ changed from -"41.2.0" to "41.4.0.post20191022". ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 0d987d5c..4f625d7c 100644 ---- a/setup.py -+++ b/setup.py -@@ -63,7 +63,7 @@ try: - - setup, Command = setuptools.setup, setuptools.Command - -- observed_version = [int(x) for x in setuptools.__version__.split('.')] -+ observed_version = [int(x) for x in setuptools.__version__.split('.')[0:3]] - required_version = [36, 2, 0] - - # NOTE(etingof): require fresh setuptools to build proper wheels --- -2.23.0 - diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 7ffcf52bea8a3..93078d91dad91 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ py4j ]; - passthru.optional-dependencies = { + optional-dependencies = { ml = [ numpy ]; mllib = [ numpy ]; sql = [ diff --git a/pkgs/development/python-modules/pyspeex-noise/default.nix b/pkgs/development/python-modules/pyspeex-noise/default.nix new file mode 100644 index 0000000000000..4db2a5f2855cf --- /dev/null +++ b/pkgs/development/python-modules/pyspeex-noise/default.nix @@ -0,0 +1,43 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pybind11, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyspeex-noise"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "pyspeex-noise"; + rev = "refs/tags/${version}"; + hash = "sha256-XtLA5yVVCZdpALPu3fx+U+aaA729Vs1UeOJsIm6/S+k="; + }; + + build-system = [ + pybind11 + setuptools + ]; + + pythonImportsCheck = [ "pyspeex_noise" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/rhasspy/pyspeex-noise/blob/${src.rev}/CHANGELOG.md"; + description = "Noise suppression and automatic gain with speex"; + homepage = "https://github.com/rhasspy/pyspeex-noise"; + license = with lib.licenses; [ + mit # pyspeex-noise + bsd3 # speex (vendored) + ]; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 992318ff06672..401ccbe27097f 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ]; - passthru.optional-dependencies = { + optional-dependencies = { kerberos = [ gssapi krb5 diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index f6f0de014d36d..e148d8af8b06e 100644 --- a/pkgs/development/python-modules/pysptk/default.nix +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pysptk" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Wrapper for Speech Signal Processing Toolkit (SPTK)"; homepage = "https://pysptk.readthedocs.io/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index c3f17e2bf9033..ad4bfba537e0d 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -1,29 +1,36 @@ { lib, aiohttp, + async-timeout, buildPythonPackage, fetchFromGitHub, pytest-asyncio, pytestCheckHook, pythonAtLeast, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.7.1"; - format = "setuptools"; + version = "0.9.3"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "rajlaud"; - repo = pname; + repo = "pysqueezebox"; rev = "refs/tags/v${version}"; - hash = "sha256-WnL9Va3uaWlUHVBtit4v+XdYOFmPpxG91mAHEGwI+7c="; + hash = "sha256-gW05YOmFXIKJcJfrjaaJzZO7R5EijQsaztCMfJzujkk="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ + async-timeout + aiohttp + ]; nativeCheckInputs = [ pytest-asyncio @@ -45,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous library to control Logitech Media Server"; homepage = "https://github.com/rajlaud/pysqueezebox"; + changelog = "https://github.com/rajlaud/pysqueezebox/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/pkgs/development/python-modules/pystac-client/default.nix b/pkgs/development/python-modules/pystac-client/default.nix new file mode 100644 index 0000000000000..841e0f91b45e7 --- /dev/null +++ b/pkgs/development/python-modules/pystac-client/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + + pystac, + pytest-benchmark, + pytest-console-scripts, + pytest-mock, + pytest-recording, + python-dateutil, + requests, + requests-mock, + setuptools, +}: + +buildPythonPackage rec { + pname = "pystac-client"; + version = "0.8.3"; + pyproject = true; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "stac-utils"; + repo = "pystac-client"; + rev = "v${version}"; + hash = "sha256-tzfpvNtj+KkKjA75En+OwxYQWGzxHLACLkzWT2j/ThU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pystac + python-dateutil + requests + ]; + + nativeCheckInputs = [ + pytest-benchmark + pytestCheckHook + pytest-console-scripts + pytest-mock + pytest-recording + requests-mock + ]; + + pytestFlagsArray = [ + # Tests accessing Internet + "-m 'not vcr'" + ]; + + pythonImportsCheck = [ "pystac_client" ]; + + meta = { + description = "A Python client for working with STAC Catalogs and APIs"; + homepage = "https://github.com/stac-utils/pystac-client"; + license = lib.licenses.asl20; + maintainers = lib.teams.geospatial.members; + }; +} diff --git a/pkgs/development/python-modules/pystac/default.nix b/pkgs/development/python-modules/pystac/default.nix index eb7f653db9de0..c97862176e264 100644 --- a/pkgs/development/python-modules/pystac/default.nix +++ b/pkgs/development/python-modules/pystac/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "pystac"; - version = "1.10.1"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "stac-utils"; repo = "pystac"; - rev = "v${version}"; - hash = "sha256-zJGDhKRX50Muo1YDEzfwypMLISnYBYKkPvUULYkUf68="; + rev = "refs/tags/v${version}"; + hash = "sha256-yuAam/sXaGMFp1Kwxd28v3nOV05GC3sUY+gKJ4nLwTs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pystatgrab/default.nix b/pkgs/development/python-modules/pystatgrab/default.nix index 04d460bdf558f..942fe48d95b55 100644 --- a/pkgs/development/python-modules/pystatgrab/default.nix +++ b/pkgs/development/python-modules/pystatgrab/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { buildInputs = [ libstatgrab - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 3df9edb39f9c7..24c75bf05e816 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -29,15 +29,18 @@ buildPythonPackage rec { patches = [ ./replace-python-first.patch ]; - buildInputs = [ - bash - subversion - apr - aprutil - expat - neon - openssl - ] ++ lib.optionals stdenv.isLinux [ e2fsprogs ] ++ lib.optionals stdenv.isDarwin [ gcc ]; + buildInputs = + [ + bash + subversion + apr + aprutil + expat + neon + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ e2fsprogs ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; preConfigure = '' cd Source @@ -84,6 +87,6 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; # g++: command not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix index 1b074f1b8584f..d7996053a7b43 100644 --- a/pkgs/development/python-modules/pytablewriter/default.nix +++ b/pkgs/development/python-modules/pytablewriter/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { typepy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ dominate elasticsearch @@ -84,7 +84,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pathvalidate" ]; diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 0eb36db86388e..d61bc800d3a82 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -1,18 +1,22 @@ { lib, buildPythonPackage, + cryptography, defusedxml, fetchFromGitHub, + gql, + graphql-core, marshmallow, + pytest-cov-stub, pytest-datafiles, pytest-vcr, pytestCheckHook, python-box, python-dateutil, pythonOlder, - requests, requests-pkcs12, requests-toolbelt, + requests, responses, restfly, semver, @@ -22,7 +26,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.5.0"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,10 +35,13 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = "refs/tags/${version}"; - hash = "sha256-uLZ1TQx5awHOOF+IR3aWTwwYTd71O/V+EHaDrb1LAXU="; + hash = "sha256-kau350L2WCyuxwsmnD85iWte6LIIqprSVe0yNn+BikE="; }; - pythonRelaxDeps = [ "defusedxml" ]; + pythonRelaxDeps = [ + "cryptography" + "defusedxml" + ]; build-system = [ setuptools ]; @@ -42,6 +49,9 @@ buildPythonPackage rec { defusedxml marshmallow python-box + cryptography + gql + graphql-core python-dateutil requests requests-toolbelt @@ -51,6 +61,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-cov-stub pytest-datafiles pytest-vcr pytestCheckHook diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index 328d21ebe8d2b..8d227fe1103e9 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -22,7 +22,6 @@ numba, pytest-mock, pytestCheckHook, - pythonOlder, tensorflow-probability, nix-update-script, @@ -30,16 +29,14 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.25.4"; + version = "2.25.6"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-NPMUfSbujT1qHsdpCazDX2xF54HvFJkOaxHSUG/FQwM="; + hash = "sha256-6emtX0tNqVqKyKXnwxvAwCyM3TRJ2MNClPNg0tVxBU8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index b59b781419af4..bc8106a999a6f 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "24.8.0"; + version = "24.9.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "pytest-ansible"; rev = "refs/tags/v${version}"; - hash = "sha256-+kGVSutTKO6eGH6oHSZ86Hp4jLbofYDcvsiJRXSGQHE="; + hash = "sha256-OlRWtKMgcZCDCFcUl3YXzG/ERPfx2KBEaKNf0strgCU="; }; postPatch = '' @@ -62,7 +62,7 @@ buildPythonPackage rec { "test_connection_failure_v2" "test_connection_failure_extra_inventory_v2" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # These tests fail in the Darwin sandbox "test_ansible_facts" "test_func" @@ -74,7 +74,7 @@ buildPythonPackage rec { # Test want s to execute pytest in a subprocess "tests/integration/test_molecule.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # These tests fail in the Darwin sandbox "tests/test_adhoc.py" "tests/test_adhoc_result.py" diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 70dc1d0f7fb1d..585092787483d 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ py-cpuinfo ]; - passthru.optional-dependencies = { + optional-dependencies = { aspect = [ aspectlib ]; histogram = [ pygal ]; elasticsearch = [ elasticsearch ]; @@ -70,7 +70,7 @@ buildPythonPackage rec { mercurial pytestCheckHook pytest-xdist - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index c9f7b131c9d49..e73940edb312b 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "2.3.1"; + version = "2.4.1"; pyproject = true; src = fetchPypi { pname = "pytest_check"; inherit version; - hash = "sha256-UbjxiozKpCbF2RPE4ORvAUqqdXlIHqA9Itfh9Jj2ibI="; + hash = "sha256-UiTvzvBZv38M2iU/jQ9icEtIGf9IyT9RxnWupqAU9lA="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix index 05f16043172a5..fe4489dcf0ecc 100644 --- a/pkgs/development/python-modules/pytest-examples/default.nix +++ b/pkgs/development/python-modules/pytest-examples/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-examples"; - version = "0.0.12"; + version = "0.0.13"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pytest-examples"; rev = "refs/tags/v${version}"; - hash = "sha256-hTLTL3w4OEv8Pkzc/h9qDMnlhe6P+Q6XUImLVDsDKvk="; + hash = "sha256-R0gSWQEGMkJhkeXImyris2wzqjJ0hC3zO0voEdhWLoY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index 477be61ebefd2..cc0096db1fd75 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -36,7 +36,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_flask" ]; - pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_live_server.py" ]; + pytestFlagsArray = lib.optionals stdenv.hostPlatform.isDarwin [ + "--ignore=tests/test_live_server.py" + ]; meta = with lib; { description = "Set of pytest fixtures to test Flask applications"; diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 64c43164a01b3..6a508417e2e1a 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; disabledTests = - if (pythonAtLeast "3.12" && stdenv.isDarwin && stdenv.isx86_64) then + if (pythonAtLeast "3.12" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then [ # non reproducible test failure on hydra, works on community builder # https://hydra.nixos.org/build/252537267 diff --git a/pkgs/development/python-modules/pytest-harvest/default.nix b/pkgs/development/python-modules/pytest-harvest/default.nix index 2d93e53dea247..35e5945c1a62a 100644 --- a/pkgs/development/python-modules/pytest-harvest/default.nix +++ b/pkgs/development/python-modules/pytest-harvest/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools-scm, - pytest-runner, pytest, decopatch, makefun, @@ -34,11 +33,14 @@ buildPythonPackage rec { # we disable this file creation as it touches internet postPatch = '' echo "version = '${version}'" > pytest_harvest/_version.py + + substituteInPlace pytest_harvest/tests/test_lazy_and_harvest.py \ + --replace-fail "from distutils.version import LooseVersion" "from packaging.version import parse" \ + --replace-fail "LooseVersion" "parse" ''; nativeBuildInputs = [ setuptools-scm - pytest-runner ]; buildInputs = [ pytest ]; @@ -62,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Store data created during your `pytest` tests execution, and retrieve it at the end of the session, e.g. for applicative benchmarking purposes"; homepage = "https://github.com/smarie/python-pytest-harvest"; - changelog = "https://github.com/smarie/python-pytest-harvest/releases/tag/${src.rev}"; + changelog = "https://github.com/smarie/python-pytest-harvest/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.bsd3; maintainers = with maintainers; [ mbalatsko ]; }; diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix index 36e45343a3082..560f17f02592a 100644 --- a/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -40,7 +40,7 @@ let propagatedBuildInputs = [ jupyter-core ]; - passthru.optional-dependencies = { + optional-dependencies = { client = [ jupyter-client nbformat @@ -59,7 +59,7 @@ let nativeCheckInputs = [ pytest-timeout pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); passthru.tests = { check = self.overridePythonAttrs (_: { diff --git a/pkgs/development/python-modules/pytest-order/default.nix b/pkgs/development/python-modules/pytest-order/default.nix index 34ea352474164..86db6d272fe6e 100644 --- a/pkgs/development/python-modules/pytest-order/default.nix +++ b/pkgs/development/python-modules/pytest-order/default.nix @@ -1,8 +1,8 @@ { buildPythonPackage, - fetchPypi, + fetchFromGitHub, lib, - pytest, + setuptools, pytest-xdist, pytest-dependency, pytest-mock, @@ -11,15 +11,17 @@ buildPythonPackage rec { pname = "pytest-order"; - version = "1.2.1"; - format = "setuptools"; + version = "1.3.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-RFG9iCG6T6IQlFWi/MiCr2DvjlPgnSRNZ2dL4I9W6sM="; + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pytest-order"; + rev = "refs/tags/v${version}"; + hash = "sha256-V1qJGkXn+HhuK5wiwkkJBEbfnv23R4x9Cv0J6ZTj5xE="; }; - buildInputs = [ pytest ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix index 5f7f559585950..31f75b538f325 100644 --- a/pkgs/development/python-modules/pytest-playwright/default.nix +++ b/pkgs/development/python-modules/pytest-playwright/default.nix @@ -8,13 +8,14 @@ pytest-base-url, python-slugify, pythonOlder, + setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "pytest-playwright"; - version = "0.5.0"; - format = "setuptools"; + version = "0.5.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -22,14 +23,17 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-pytest"; rev = "refs/tags/v${version}"; - hash = "sha256-HS0Qpr5R4dAoXe0bpPGU7JABB7CmwugReRD75XeJ8l4="; + hash = "sha256-F5tbqm1k4SdTHIUgwSunLIL2W5mhJoMI4x4UZBLidlA="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ playwright pytest-base-url python-slugify diff --git a/pkgs/development/python-modules/pytest-recording/default.nix b/pkgs/development/python-modules/pytest-recording/default.nix index 23471054526ca..dd9e84b3517ef 100644 --- a/pkgs/development/python-modules/pytest-recording/default.nix +++ b/pkgs/development/python-modules/pytest-recording/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { disabledTests = [ "test_block_network_with_allowed_hosts" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Missing socket.AF_NETLINK "test_other_socket" ]; diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 5e47e2e1c6d5c..bb1584aa162ef 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { "pytest_regressions.plugin" ]; - passthru.optional-dependencies = { + optional-dependencies = { dataframe = [ pandas numpy diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 6eecdcbc958b2..522202a510110 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, decorator, fetchPypi, - invocations, invoke, pytest, pytestCheckHook, @@ -27,7 +26,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator ]; nativeCheckInputs = [ - invocations invoke pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-runner/default.nix b/pkgs/development/python-modules/pytest-runner/default.nix deleted file mode 100644 index 57b970fc98df6..0000000000000 --- a/pkgs/development/python-modules/pytest-runner/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools-scm, - pytest, -}: - -buildPythonPackage rec { - pname = "pytest-runner"; - version = "6.0.1"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-cNRzlYWnAI83v0kzwBP9sye4h4paafy7MxbIiILw9Js="; - }; - - postPatch = '' - rm pytest.ini - ''; - - nativeBuildInputs = [ - setuptools-scm - pytest - ]; - - checkPhase = '' - py.test tests - ''; - - # Fixture not found - doCheck = false; - - meta = with lib; { - description = "Invoke py.test as distutils command with dependency resolution"; - homepage = "https://github.com/pytest-dev/pytest-runner"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/pytest-textual-snapshot/default.nix b/pkgs/development/python-modules/pytest-textual-snapshot/default.nix index 6661b9397ac90..911cdd5d0def0 100644 --- a/pkgs/development/python-modules/pytest-textual-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-textual-snapshot/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-textual-snapshot"; - version = "0.4.0"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "pytest-textual-snapshot"; rev = "refs/tags/v${version}"; - hash = "sha256-XkXeyodRdwWqCP63Onx82Z3IbNLDDR/Lvaw8xUY7fAg="; + hash = "sha256-C8vL2kLOvVcDlTtNiG/pf7PwHzb/F0sWdkEcLvdGrd8="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix index 93e74cf1c01a7..a430b889b53f9 100644 --- a/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/pkgs/development/python-modules/pytest-twisted/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytest-twisted"; - version = "1.14.2"; + version = "1.14.3"; pyproject = true; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-twisted"; rev = "refs/tags/v${version}"; - hash = "sha256-1NkKTdk5D36VngJtBEdT42o1MmMT6stBne9KyC17518="; + hash = "sha256-1dAfCa6hON0Vh9StI1Xw69IAwBzUkR6DdjQ0HNyoyME="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest/7.nix b/pkgs/development/python-modules/pytest/7.nix index 8ca33b158e5ce..b00e988d2e97c 100644 --- a/pkgs/development/python-modules/pytest/7.nix +++ b/pkgs/development/python-modules/pytest/7.nix @@ -60,7 +60,7 @@ let tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ argcomplete attrs diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index fc5ca9c2a37b8..4d1b33f2cbe32 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ argcomplete attrs diff --git a/pkgs/development/python-modules/python-aodhclient/default.nix b/pkgs/development/python-modules/python-aodhclient/default.nix new file mode 100644 index 0000000000000..9c3b015a53747 --- /dev/null +++ b/pkgs/development/python-modules/python-aodhclient/default.nix @@ -0,0 +1,82 @@ +{ + lib, + buildPythonPackage, + cliff, + fetchFromGitHub, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-i18n, + oslo-serialization, + oslo-utils, + oslotest, + osprofiler, + pbr, + pyparsing, + pythonOlder, + setuptools, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "python-aodhclient"; + version = "3.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-aodhclient"; + rev = "refs/tags/${version}"; + hash = "sha256-FArXBkDOY0Weu3Fm/M0Qgg0XHTy95MqlUidZ/hUZfB8="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + cliff + keystoneauth1 + osc-lib + oslo-i18n + oslo-serialization + oslo-utils + osprofiler + pbr + pyparsing + ]; + + nativeCheckInputs = [ + oslotest + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "aodhclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-aodhclient"; + description = "Client library for OpenStack Aodh API"; + license = lib.licenses.asl20; + mainProgram = "aodh"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 944c2f1c7959f..2242b0b7c891c 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -33,7 +33,7 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "8.1.0"; + version = "8.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "arangodb"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-bMCzuqKLOQYmBGhdfHaff+0ZIVmZ4iy5jFtmV7X0pIM="; + hash = "sha256-EK1jZajACdc5IWF/Tgg3albUAH566G0IwUsHk4dZpoQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-barcode/default.nix b/pkgs/development/python-modules/python-barcode/default.nix index 214e074ffd7a4..432a910b95c6f 100644 --- a/pkgs/development/python-modules/python-barcode/default.nix +++ b/pkgs/development/python-modules/python-barcode/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { images = [ pillow ]; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { --replace "--no-cov-on-fail" "" ''; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.images; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.images; pythonImportsCheck = [ "barcode" ]; diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 055a993ca013b..3bdb639be493b 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ beautifulsoup4 boto3 @@ -95,7 +95,7 @@ buildPythonPackage rec { orjson pytestCheckHook python-decouple - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix index 0c35e6579696a..f2b52b1cbc70b 100644 --- a/pkgs/development/python-modules/python-bidi/default.nix +++ b/pkgs/development/python-modules/python-bidi/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, rustPlatform, + libiconv, pytestCheckHook, }: @@ -24,6 +25,8 @@ buildPythonPackage rec { hash = "sha256-34R8T8cXiX1iRx/Zb51Eb/nf0wLpN38hz0VnsmzPzws="; }; + buildInputs = [ libiconv ]; + build-system = [ rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook @@ -35,11 +38,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { homepage = "https://github.com/MeirKriheli/python-bidi"; description = "Pure python implementation of the BiDi layout algorithm"; mainProgram = "pybidi"; - platforms = platforms.unix; - maintainers = with maintainers; [ freezeboy ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ freezeboy ]; }; } diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 97885c27a9522..2ab21191104cb 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ msgpack ruamel-yaml @@ -47,7 +47,7 @@ buildPythonPackage rec { msgpack = [ msgpack ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; pythonImportsCheck = [ "box" ]; diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 198d283c521a6..b6312d2c0178f 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -2,13 +2,15 @@ lib, aiohttp, aresponses, + async-timeout, backoff, buildPythonPackage, fetchFromGitHub, packaging, poetry-core, - pydantic, + mashumaro, pytest-asyncio, + pytest-cov-stub, pytest-mock, pytestCheckHook, pythonOlder, @@ -17,56 +19,50 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.18"; - format = "pyproject"; + version = "0.6.2"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "liudger"; - repo = pname; + repo = "python-bsblan"; rev = "refs/tags/v${version}"; - hash = "sha256-SJUIJhsVn4LZiUx9h3Q2uWoeaQiKoIRrijTfPgCHnAA="; + hash = "sha256-/rdYCd5eyFqW96XaIzQOhsApzcTkrI46Gt226sLTLUQ="; }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace "--cov" "" - sed -i "/covdefaults/d" pyproject.toml sed -i "/ruff/d" pyproject.toml ''; - nativeBuildInputs = [ poetry-core ]; + env.PACKAGE_VERSION = version; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ aiohttp + async-timeout backoff packaging - pydantic + mashumaro yarl ]; nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytest-mock pytestCheckHook ]; - disabledTests = lib.optionals (lib.versionAtLeast aiohttp.version "3.9.0") [ - # https://github.com/liudger/python-bsblan/issues/808 - "test_http_error400" - "test_not_authorized_401_response" - ]; - pythonImportsCheck = [ "bsblan" ]; meta = with lib; { description = "Module to control and monitor an BSBLan device programmatically"; homepage = "https://github.com/liudger/python-bsblan"; changelog = "https://github.com/liudger/python-bsblan/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/python-calamine/Cargo.lock b/pkgs/development/python-modules/python-calamine/Cargo.lock new file mode 100644 index 0000000000000..ed92700823815 --- /dev/null +++ b/pkgs/development/python-modules/python-calamine/Cargo.lock @@ -0,0 +1,914 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytecount" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "calamine" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58785077b99914cfa7aa07b7203b1d5eb91efcd7d5ffd0f51a98b95c36112ef4" +dependencies = [ + "byteorder", + "chrono", + "codepage", + "encoding_rs", + "log", + "quick-xml", + "serde", + "zip", +] + +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", +] + +[[package]] +name = "cc" +version = "1.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets", +] + +[[package]] +name = "codepage" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48f68d061bc2828ae826206326e61251aca94c1e4a5305cf52d9138639c918b4" +dependencies = [ + "encoding_rs", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[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-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "flate2" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[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 = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "once_cell" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe" + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pulldown-cmark" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +dependencies = [ + "bitflags", + "memchr", + "unicase", +] + +[[package]] +name = "pyo3" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" +dependencies = [ + "cfg-if", + "chrono", + "indoc", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" +dependencies = [ + "once_cell", + "python3-dll-a", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-file" +version = "0.8.1" +source = "git+https://github.com/dimastbk/pyo3-file?rev=6da7c16902dde695a7b88fd83ce78ef4406e9bb7#6da7c16902dde695a7b88fd83ce78ef4406e9bb7" +dependencies = [ + "pyo3", + "skeptic", +] + +[[package]] +name = "pyo3-macros" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "python-calamine" +version = "0.2.3" +dependencies = [ + "calamine", + "chrono", + "pyo3", + "pyo3-build-config", + "pyo3-file", +] + +[[package]] +name = "python3-dll-a" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0b78171a90d808b319acfad166c4790d9e9759bbc14ac8273fe133673dd41b" +dependencies = [ + "cc", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "encoding_rs", + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags", + "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 = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "skeptic" +version = "0.13.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" +dependencies = [ + "bytecount", + "cargo_metadata", + "error-chain", + "glob", + "pulldown-cmark", + "tempfile", + "walkdir", +] + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "zip" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "flate2", + "indexmap", + "num_enum", + "thiserror", +] diff --git a/pkgs/development/python-modules/python-calamine/default.nix b/pkgs/development/python-modules/python-calamine/default.nix new file mode 100644 index 0000000000000..ba4eb23badbd1 --- /dev/null +++ b/pkgs/development/python-modules/python-calamine/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + + # buildInputs + libiconv, + + # build-system + cargo, + poetry-core, + rustc, + + # dependencies + packaging, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "python-calamine"; + version = "0.2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dimastbk"; + repo = "python-calamine"; + rev = "refs/tags/v${version}"; + hash = "sha256-zZqhvfpkkbWLhPJIthDgxqvPUMpaXkyptuzY2fcecHU="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "pyo3-file-0.8.1" = "sha256-EqeXykP7CF8SU5LgT9+y/FDy79E/DAJT2fc1OrmlOZE="; + }; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + buildInputs = [ libiconv ]; + + build-system = [ + cargo + poetry-core + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + dependencies = [ packaging ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "python_calamine" ]; + + meta = { + description = "Python binding for calamine"; + homepage = "https://github.com/dimastbk/python-calamine"; + changelog = "https://github.com/dimastbk/python-calamine/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "python-calamine"; + }; +} diff --git a/pkgs/development/python-modules/python-can/default.nix b/pkgs/development/python-modules/python-can/default.nix index 26bd3a27474ed..019fd93c4a00d 100644 --- a/pkgs/development/python-modules/python-can/default.nix +++ b/pkgs/development/python-modules/python-can/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { serial = [ pyserial ]; seeedstudio = [ pyserial ]; pcan = [ uptime ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { parameterized pytest-timeout pytestCheckHook - ] ++ passthru.optional-dependencies.serial; + ] ++ optional-dependencies.serial; disabledTestPaths = [ # We don't support all interfaces @@ -74,7 +74,7 @@ buildPythonPackage rec { "test_pack_unpack" "test_receive" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # timing sensitive "test_general" "test_gap" diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index b942574c6e9cc..92e896e3ff65b 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -4,29 +4,46 @@ fetchPypi, ddt, keystoneauth1, + openstackdocstheme, oslo-i18n, oslo-serialization, oslo-utils, pbr, requests, prettytable, + pythonOlder, + reno, requests-mock, + setuptools, simplejson, + sphinxHook, stestr, stevedore, }: buildPythonPackage rec { pname = "python-cinderclient"; - version = "9.5.0"; - format = "setuptools"; + version = "9.6.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-G51xev+TytQgBF+2xS9jdqty8IX4GTEwiSAg7EbJNVU="; + hash = "sha256-P+/eJoJS5S4w/idz9lgienjG3uN4/LEy0xyG5uybojg="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ + openstackdocstheme + reno + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + build-system = [ setuptools ]; + + dependencies = [ simplejson keystoneauth1 oslo-i18n @@ -45,7 +62,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck stestr run + runHook postCheck ''; pythonImportsCheck = [ "cinderclient" ]; diff --git a/pkgs/development/python-modules/python-datemath/default.nix b/pkgs/development/python-modules/python-datemath/default.nix index 44b05d8fa72de..efa1e5aed576c 100644 --- a/pkgs/development/python-modules/python-datemath/default.nix +++ b/pkgs/development/python-modules/python-datemath/default.nix @@ -3,7 +3,6 @@ arrow, buildPythonPackage, fetchFromGitHub, - fetchpatch, freezegun, pytestCheckHook, pythonOlder, @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "python-datemath"; - version = "3.0.1"; + version = "3.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "nickmaccarthy"; repo = "python-datemath"; rev = "refs/tags/v${version}"; - hash = "sha256-BL+F2oHM49QiwV1/rjXz3wLp+EaTfmc5tAdlsGKq8ag="; + hash = "sha256-VwdY6Gmbmoy7EKZjUlWj56uSiE0OdegPiQv+rmigkq8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-designateclient/default.nix b/pkgs/development/python-modules/python-designateclient/default.nix index fa2a61d85aa43..44b5b4a665efc 100644 --- a/pkgs/development/python-modules/python-designateclient/default.nix +++ b/pkgs/development/python-modules/python-designateclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-designateclient"; - version = "6.0.1"; + version = "6.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,21 +32,24 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-designateclient"; rev = version; - hash = "sha256-vuaouOA69REx+ZrzXjLGVz5Az1/d6x4WRT1h78xeebk="; + hash = "sha256-MwcpRQXH8EjWv41iHxorbFL9EpYu8qOLkDeUx6inEAU="; }; env.PBR_VERSION = version; - build-system = [ + nativeBuildInputs = [ openstackdocstheme - pbr - setuptools sphinxHook sphinxcontrib-apidoc ]; sphinxBuilders = [ "man" ]; + build-system = [ + pbr + setuptools + ]; + dependencies = [ debtcollector jsonschema @@ -57,8 +60,6 @@ buildPythonPackage rec { requests ]; - doCheck = true; - nativeCheckInputs = [ oslotest requests-mock diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix index 4a99321dc880c..079aa23b8ad72 100644 --- a/pkgs/development/python-modules/python-ecobee-api/default.nix +++ b/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-ecobee-api"; - version = "0.2.19"; + version = "0.2.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nkgilley"; repo = "python-ecobee-api"; rev = "refs/tags/${version}"; - hash = "sha256-osEqDUVf7fU5DWRUQyFaM8jOi2OgSqbtMaLSWMKQMPw="; + hash = "sha256-ffCd109hweeKJn+nnsVo/kDVg3bam/WONZWJOA2EibE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index a7eb7fe8dd17e..28bf7840a30b7 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dependencies = [ simple-websocket ]; - passthru.optional-dependencies = { + optional-dependencies = { client = [ requests websocket-client @@ -53,9 +53,9 @@ buildPythonPackage rec { pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; - preCheck = lib.optionalString stdenv.isLinux '' + preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ LD_PRELOAD=${libredirect}/lib/libredirect.so diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix index 27d768c4e96ee..031efa7b31e33 100644 --- a/pkgs/development/python-modules/python-etcd/default.nix +++ b/pkgs/development/python-modules/python-etcd/default.nix @@ -39,7 +39,7 @@ buildPythonPackage { ]; # arm64 is an unsupported platform on etcd 3.4. should be able to be removed on >= etcd 3.5 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; preCheck = '' for file in "test_auth" "integration/test_simple"; do diff --git a/pkgs/development/python-modules/python-ffmpeg/default.nix b/pkgs/development/python-modules/python-ffmpeg/default.nix index 12b734c37700f..1991f74926670 100644 --- a/pkgs/development/python-modules/python-ffmpeg/default.nix +++ b/pkgs/development/python-modules/python-ffmpeg/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyee ]; nativeBuildInputs = [ setuptools-scm ]; - pythonImportCheck = [ "ffmpeg" ]; + pythonImportsCheck = [ "ffmpeg" ]; meta = { homepage = "https://github.com/jonghwanhyeon/python-ffmpeg"; description = "Python binding for FFmpeg which provides sync and async APIs"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ roshaen ]; + maintainers = with lib.maintainers; [ youhaveme9 ]; }; } diff --git a/pkgs/development/python-modules/python-flirt/default.nix b/pkgs/development/python-modules/python-flirt/default.nix index 8034a621f8b28..47fdc3cfa08dc 100644 --- a/pkgs/development/python-modules/python-flirt/default.nix +++ b/pkgs/development/python-modules/python-flirt/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildAndTestSubdir = "pyflirt"; diff --git a/pkgs/development/python-modules/python-fx/default.nix b/pkgs/development/python-modules/python-fx/default.nix index 0d906cd2e379f..40b09992d749d 100644 --- a/pkgs/development/python-modules/python-fx/default.nix +++ b/pkgs/development/python-modules/python-fx/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { ]; # FAILED tests/test_event_loops.py::TwistedEventLoopTest::test_run - AssertionError: 'callback called with future outcome: True' not found in ['... - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "pyfx" ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index ca44848e76d0d..33a15d52d7ed1 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,41 +1,39 @@ { lib, + argcomplete, buildPythonPackage, - pythonOlder, fetchPypi, - - # build-system - setuptools, - - # dependencies - argcomplete, - requests, - requests-toolbelt, + gql, + pythonOlder, pyyaml, + requests-toolbelt, + requests, + setuptools, }: buildPythonPackage rec { pname = "python-gitlab"; - version = "4.10.0"; + version = "4.11.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "python_gitlab"; inherit version; - hash = "sha256-hvmcGRUIji0lc4F6yov2urXk8S1CsE72st8qu1KNV/0="; + hash = "sha256-evovnDBhi8Pa7pXSGGoG4c8Yyi+peJDrVf2N3E4zmBI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ requests requests-toolbelt ]; - passthru.optional-dependencies = { + optional-dependencies = { autocompletion = [ argcomplete ]; + graphql = [ gql ] ++ gql.optional-dependencies.httpx; yaml = [ pyyaml ]; }; @@ -46,10 +44,10 @@ buildPythonPackage rec { meta = with lib; { description = "Interact with GitLab API"; - mainProgram = "gitlab"; homepage = "https://github.com/python-gitlab/python-gitlab"; changelog = "https://github.com/python-gitlab/python-gitlab/blob/v${version}/CHANGELOG.md"; license = licenses.lgpl3Only; maintainers = with maintainers; [ nyanloutre ]; + mainProgram = "gitlab"; }; } diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 32c9ccd33a9ac..77a960e889589 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.5.2"; + version = "0.5.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-AdgBOTHJ+j9Fgku+pwVMA9bhHyWKcufghuFo28uRhUw="; + hash = "sha256-KQ2N25zWPfls/pKEubJl8Z/W4UXlWC3Fj9cnHwJtCkc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 763999be86ada..6d346d6c638b1 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { # No running SSH available "test_connect_error" "test_feed_xml_error" - ] ++ lib.optionals stdenv.isDarwin [ "test_feed_xml_error" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_feed_xml_error" ]; pythonImportsCheck = [ "gvm" ]; diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index 8afb965dbaca4..e06a0760fbdd6 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # test uses timeout mechanism unsafe for use with the "spawn" # multiprocessing backend used on macos - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace tests/test_jenkins_sockets.py \ --replace test_jenkins_open_no_timeout dont_test_jenkins_open_no_timeout ''; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 449fec2d7d076..037b352ccc7ea 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { rsa ]; - passthru.optional-dependencies = { + optional-dependencies = { cryptography = [ cryptography ]; pycrypto = [ pycrypto ]; pycryptodome = [ pycryptodome ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # https://github.com/mpdavis/python-jose/issues/348 diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index cba50fc0a373b..9561deec1b07e 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -6,14 +6,15 @@ buildPythonPackage, cryptography, fetchFromGitHub, + hatchling, kasa-crypt, orjson, - poetry-core, ptpython, pydantic, pytest-asyncio, pytest-freezer, pytest-mock, + pytest-socket, pytestCheckHook, pythonOlder, rich, @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.7.2"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,10 +32,10 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-JfTFed591z1ZxTKP5FqYyaMBq8uCs4StlnqKp3Tc7Ug="; + hash = "sha256-dzDbA/iJUfTQNKq2V1PlCYpIeg031Fm0JyZvHrDWqHI="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ aiohttp @@ -48,11 +49,12 @@ buildPythonPackage rec { pytest-asyncio pytest-freezer pytest-mock + pytest-socket pytestCheckHook voluptuous ]; - passthru.optional-dependencies = { + optional-dependencies = { shell = [ ptpython rich diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix index e8f19e2a01a26..3c25f946ea2ec 100644 --- a/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -9,6 +9,7 @@ pbr, pythonOlder, requests-mock, + setuptools, stestr, testresources, testscenarios, @@ -16,17 +17,19 @@ buildPythonPackage rec { pname = "python-keystoneclient"; - version = "5.4.0"; - format = "setuptools"; + version = "5.5.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-srS9vp2vews1O4gHZy7u0B+H3QO0+LQtDQYbCbiTH0E="; + hash = "sha256-wvWTT5VXaTbJjkW/WZrUi8sKxFFZPl+DROv1LLD0EfU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ keystoneauth1 oslo-config oslo-serialization @@ -42,7 +45,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck stestr run + runHook postCheck ''; pythonImportsCheck = [ "keystoneclient" ]; diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index 4f1c9bd9636e9..ebb042b848ec6 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { "test_tls_ext_noca" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { changelog = "https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-${version}"; diff --git a/pkgs/development/python-modules/python-libnmap/default.nix b/pkgs/development/python-modules/python-libnmap/default.nix index 3e3937051aaf6..4647160406935 100644 --- a/pkgs/development/python-modules/python-libnmap/default.nix +++ b/pkgs/development/python-modules/python-libnmap/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-cI8wdOvTmRy2cxLBkJn7vXRBRvewDMNl/tkIiRGhZJ8="; }; - passthru.optional-dependencies = { + optional-dependencies = { defusedxml = [ defusedxml ]; }; diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index b8240e0c23f6b..9b6509591ed3f 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.0.9"; + version = "0.0.14"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; rev = "refs/tags/v${version}"; - hash = "sha256-SA+FKssA9ucbEWCAYfjFgZUt0RIIWBSAWQGZ7SCIyYE="; + hash = "sha256-Sj22bbSJoD52WQBWzdFW36WFQcfvPadpd6mv84vN73U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-magnumclient/default.nix b/pkgs/development/python-modules/python-magnumclient/default.nix new file mode 100644 index 0000000000000..06866a59ce848 --- /dev/null +++ b/pkgs/development/python-modules/python-magnumclient/default.nix @@ -0,0 +1,97 @@ +{ + lib, + buildPythonPackage, + cryptography, + decorator, + fetchFromGitHub, + fixtures, + keystoneauth1, + openstackdocstheme, + os-client-config, + osc-lib, + oslo-i18n, + oslo-log, + oslo-serialization, + oslo-utils, + oslotest, + osprofiler, + pbr, + prettytable, + python-openstackclient, + pythonOlder, + requests-mock, + requests, + setuptools, + sphinxHook, + stestr, + testtools, +}: + +buildPythonPackage rec { + pname = "python-magnumclient"; + version = "4.7.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-magnumclient"; + rev = "refs/tags/${version}"; + hash = "sha256-2JHI3CB/DSZZ4LXzL3PCUSmubTciUXtZkc5jpeEc4kk="; + }; + + env.PBR_VERSION = version; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + build-system = [ + pbr + setuptools + ]; + + dependencies = [ + cryptography + decorator + keystoneauth1 + os-client-config + osc-lib + oslo-i18n + oslo-log + oslo-serialization + oslo-utils + prettytable + requests + ]; + + nativeCheckInputs = [ + fixtures + python-openstackclient + osprofiler + oslotest + requests-mock + stestr + testtools + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "magnumclient" ]; + + meta = { + homepage = "https://github.com/openstack/python-magnumclient"; + description = "Client library for OpenStack Magnum API"; + license = lib.licenses.asl20; + mainProgram = "magnum"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index bb444dd15ab27..41b9912463bd5 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -10,7 +10,6 @@ oslo-utils, prettytable, requests, - simplejson, setuptools, sphinxHook, sphinxcontrib-programoutput, @@ -23,12 +22,12 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.9.1"; + version = "5.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-TebykdG0fkeC+5Vs9eiwuJpXam41gg8gR4F2poYKDhI="; + hash = "sha256-Mk/MSEYj/poibXl+h318gN3rTuNC/ebhKYO3/ACA4II="; }; build-system = [ @@ -48,7 +47,6 @@ buildPythonPackage rec { oslo-utils prettytable requests - simplejson babel osc-lib python-keystoneclient diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index eed723f10d8e1..c06251663e0ba 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ./python-mapnik_std_optional.patch ]; - stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; + stdenv = if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; build-system = [ setuptools ]; @@ -103,7 +103,7 @@ buildPythonPackage rec { # import from $out rm -r mapnik '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Replace the hardcoded /tmp references with $TMPDIR sed -i "s,/tmp,$TMPDIR,g" test/python_tests/*.py ''; @@ -114,7 +114,7 @@ buildPythonPackage rec { "test_passing_pycairo_context_pdf" "test_pdf_printing" "test_render_with_scale_factor" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_passing_pycairo_context_png" "test_passing_pycairo_context_svg" "test_pycairo_pdf_surface1" diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 453bf9b8b7c28..8a736730ef544 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -24,6 +24,7 @@ zeroconf, # tests + aioresponses, python, pytest, pytest-aiohttp, @@ -55,7 +56,7 @@ in buildPythonPackage rec { pname = "python-matter-server"; - version = "6.3.0"; + version = "6.6.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -64,7 +65,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-/e7U0knkWQq9PnTimA2/ncNTyekx7QOcFEdtJHUcb9I="; + hash = "sha256-g+97a/X0FSapMLfdW6iNf1akkHGLqCmHYimQU/M6loo="; }; patches = [ @@ -105,6 +106,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + aioresponses pytest-aiohttp pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); diff --git a/pkgs/development/python-modules/python-mistralclient/default.nix b/pkgs/development/python-modules/python-mistralclient/default.nix new file mode 100644 index 0000000000000..6452fe3063e29 --- /dev/null +++ b/pkgs/development/python-modules/python-mistralclient/default.nix @@ -0,0 +1,95 @@ +{ + lib, + buildPythonPackage, + cliff, + fetchFromGitea, + keystoneauth1, + openstackdocstheme, + os-client-config, + osc-lib, + oslo-i18n, + oslo-serialization, + oslo-utils, + oslotest, + osprofiler, + pbr, + pythonOlder, + pyyaml, + requests-mock, + requests, + setuptools, + sphinxcontrib-apidoc, + sphinxHook, + stestr, + stevedore, + tempest, +}: + +buildPythonPackage rec { + pname = "python-mistralclient"; + version = "5.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitea { + domain = "opendev.org"; + owner = "openstack"; + repo = "python-mistralclient"; + rev = version; + hash = "sha256-Vi56+OlFU2Aj7yJ/cH5y0ZbzPhglTciJcTnkbA0S7Qo="; + }; + + env.PBR_VERSION = version; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + sphinxcontrib-apidoc + ]; + + sphinxBuilders = [ "man" ]; + + build-system = [ + setuptools + pbr + ]; + + dependencies = [ + cliff + keystoneauth1 + osc-lib + oslo-i18n + oslo-serialization + oslo-utils + pbr + pyyaml + requests + stevedore + ]; + + nativeCheckInputs = [ + os-client-config + oslotest + osprofiler + requests-mock + stestr + tempest + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "mistralclient" ]; + + meta = with lib; { + description = "OpenStack Mistral Command-line Client"; + homepage = "https://opendev.org/openstack/python-mistralclient/"; + license = licenses.asl20; + mainProgram = "mistral"; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-motionmount/default.nix b/pkgs/development/python-modules/python-motionmount/default.nix index de451018a874f..a97d7be87769f 100644 --- a/pkgs/development/python-modules/python-motionmount/default.nix +++ b/pkgs/development/python-modules/python-motionmount/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-motionmount"; - version = "2.0.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vogelsproducts"; repo = "python-MotionMount"; rev = "refs/tags/${version}"; - hash = "sha256-jmHFsJwnmdSUKz2W9pWtc9KpUAs6QWnO2V5KROwmTGs="; + hash = "sha256-07wTlyfUSt44dBwOXjkXADA+HDy8531KYxJAKqBWKeQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-neutronclient/default.nix b/pkgs/development/python-modules/python-neutronclient/default.nix new file mode 100644 index 0000000000000..0c68f8c086db3 --- /dev/null +++ b/pkgs/development/python-modules/python-neutronclient/default.nix @@ -0,0 +1,98 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + # Build and Runtime + pbr, + cliff, + debtcollector, + iso8601, + netaddr, + openstacksdk, + osc-lib, + oslo-i18n, + oslo-log, + oslo-serialization, + oslo-utils, + os-client-config, + keystoneauth1, + python-keystoneclient, + requests, + hacking, + # Tests + fixtures, + oslotest, + osprofiler, + python-openstackclient, + subunit, + requests-mock, + stestr, + testtools, + testscenarios, + tempest, +}: + +buildPythonPackage rec { + pname = "python-neutronclient"; + version = "11.3.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-U82ZI/Q6OwdypA41YfdGVa3IA4+QJhqz3gW2IR0S7cs="; + }; + + build-system = [ + setuptools + pbr + ]; + + dependencies = [ + cliff + debtcollector + iso8601 + netaddr + openstacksdk + osc-lib + oslo-i18n + oslo-log + oslo-serialization + oslo-utils + os-client-config + keystoneauth1 + python-keystoneclient + requests + ]; + + nativeCheckInputs = [ + hacking + fixtures + oslotest + osprofiler + python-openstackclient + subunit + requests-mock + stestr + testtools + testscenarios + tempest + ]; + + checkPhase = '' + runHook preCheck + + stestr run + + runHook postCheck + ''; + + pythonImportsCheck = [ "neutronclient" ]; + + meta = with lib; { + description = "Python bindings for the OpenStack Networking API"; + homepage = "https://opendev.org/openstack/python-neutronclient/"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index e0257ae1cfda0..481827342f53c 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -6,29 +6,43 @@ iso8601, keystoneauth1, openssl, + openstackdocstheme, oslo-i18n, oslo-serialization, pbr, prettytable, pythonOlder, requests-mock, + setuptools, + sphinxcontrib-apidoc, + sphinxHook, stestr, testscenarios, }: buildPythonPackage rec { pname = "python-novaclient"; - version = "18.6.0"; - format = "setuptools"; + version = "18.7.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-VzwQqkILCJjTX7FG7di7AFgGv/8BMa4rWjDKIqyJR3s="; + hash = "sha256-lMrQ8PTBYc7VKl7NhdE0/Wc7mX2nGUoDHAymk0Q0Cw0="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ + openstackdocstheme + sphinxcontrib-apidoc + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + build-system = [ setuptools ]; + + dependencies = [ iso8601 keystoneauth1 oslo-i18n @@ -46,12 +60,14 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck stestr run -e <(echo " novaclient.tests.unit.test_shell.ParserTest.test_ambiguous_option novaclient.tests.unit.test_shell.ParserTest.test_not_really_ambiguous_option novaclient.tests.unit.test_shell.ShellTest.test_osprofiler novaclient.tests.unit.test_shell.ShellTestKeystoneV3.test_osprofiler ") + runHook postCheck ''; pythonImportsCheck = [ "novaclient" ]; diff --git a/pkgs/development/python-modules/python-octaviaclient/default.nix b/pkgs/development/python-modules/python-octaviaclient/default.nix new file mode 100644 index 0000000000000..5c671398eed5d --- /dev/null +++ b/pkgs/development/python-modules/python-octaviaclient/default.nix @@ -0,0 +1,89 @@ +{ + lib, + buildPythonPackage, + cliff, + doc8, + docutils, + fetchPypi, + hacking, + keystoneauth1, + openstackclient, + openstackdocstheme, + osc-lib, + oslotest, + oslo-serialization, + oslo-utils, + pbr, + pygments, + python-neutronclient, + requests, + requests-mock, + setuptools, + sphinx, + sphinxcontrib-apidoc, + stestr, + subunit, + testscenarios, +}: + +buildPythonPackage rec { + pname = "python-octaviaclient"; + version = "3.8.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wrYhCY3gqcklSK8lapsgFq25Yi3awEGgarW2a7W1kO4="; + }; + + build-system = [ + setuptools + pbr + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinx + sphinxcontrib-apidoc + ]; + + dependencies = [ + cliff + keystoneauth1 + python-neutronclient + openstackclient + osc-lib + oslo-serialization + oslo-utils + requests + ]; + + nativeCheckInputs = [ + hacking + requests-mock + doc8 + docutils + pygments + subunit + oslotest + stestr + testscenarios + ]; + + checkPhase = '' + runHook preCheck + + stestr run + + runHook postCheck + ''; + + pythonImportsCheck = [ "octaviaclient" ]; + + meta = with lib; { + description = "OpenStack Octavia Command-line Client"; + homepage = "https://opendev.org/openstack/python-octaviaclient/"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-opendata-transport/default.nix b/pkgs/development/python-modules/python-opendata-transport/default.nix index 0473b5dcfe19e..d94ed2604721a 100644 --- a/pkgs/development/python-modules/python-opendata-transport/default.nix +++ b/pkgs/development/python-modules/python-opendata-transport/default.nix @@ -10,20 +10,20 @@ buildPythonPackage rec { pname = "python-opendata-transport"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchPypi { pname = "python_opendata_transport"; inherit version; - hash = "sha256-2lEKPu5vjyqNUqz1NGmZ5b6YP3oWnCgoubDdiQCbdps="; + hash = "sha256-CtYsks7Q33ww0Mr9ehhq7+fJhCsj4gxKytiCZ6G4Aqc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp urllib3 ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { description = "Python client for interacting with transport.opendata.ch"; homepage = "https://github.com/home-assistant-ecosystem/python-opendata-transport"; changelog = "https://github.com/home-assistant-ecosystem/python-opendata-transport/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 114b2aae444b7..3fa1de5b4e21c 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -5,15 +5,23 @@ ddt, openstackdocstheme, osc-lib, + osc-placement, pbr, + python-aodhclient, python-barbicanclient, python-cinderclient, python-designateclient, python-heatclient, python-ironicclient, python-keystoneclient, + python-magnumclient, python-manilaclient, + python-mistralclient, + python-neutronclient, python-openstackclient, + python-watcherclient, + python-zaqarclient, + python-zunclient, requests-mock, requests, setuptools, @@ -25,12 +33,12 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "7.0.0"; + version = "7.1.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1HDjWYySnZI/12j9+Gb1G9NKkb+xfrcMoTY/q7aL0uA="; + hash = "sha256-hLbxcm/LkqMU2dyTMYhIB12iR7eYMUhC0bFS8zZEGl0="; }; build-system = [ @@ -64,17 +72,26 @@ buildPythonPackage rec { pythonImportsCheck = [ "openstackclient" ]; + optional-dependencies = { + # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst + cli-plugins = [ + osc-placement + python-aodhclient + python-barbicanclient + python-designateclient + python-heatclient + python-ironicclient + python-magnumclient + python-manilaclient + python-mistralclient + python-neutronclient + python-watcherclient + python-zaqarclient + python-zunclient + ]; + }; + passthru = { - optional-dependencies = { - # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst - cli-plugins = [ - python-barbicanclient - python-designateclient - python-heatclient - python-ironicclient - python-manilaclient - ]; - }; tests.version = testers.testVersion { package = python-openstackclient; command = "openstack --version"; diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index e50bbeff87cec..a891f0a0e48c3 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { # For Django tests preCheck = "export DJANGO_SETTINGS_MODULE=test_project.settings"; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # fail on Darwin because it defaults to multiprocessing `spawn` "test_reset_signalizes" "test_reset_all_signalizes" diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index add99dfb341dd..289a4e41005e9 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { dacite paho-mqtt pycryptodome - ] ++ lib.optionals stdenv.isDarwin [ pycryptodomex ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index f29a3097c631c..818eeb919b291 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -43,11 +43,11 @@ buildPythonPackage rec { buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libjack2 alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio CoreMIDI CoreServices diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index c640a72873259..142e5883cf8a7 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ text-unidecode ]; - passthru.optional-dependencies = { + optional-dependencies = { unidecode = [ unidecode ]; }; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 2ed6d3aecaf8d..c59201a466cd0 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.11.3"; + version = "5.11.4"; pyproject = true; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "refs/tags/v${version}"; - hash = "sha256-8LpTrDxugZS6skSRCcDK4+sbSYV9ZBRSma4QfIXFJT8="; + hash = "sha256-iWe9IwUR+nq9SAmHzFZYUJpVOOEbc1ZdiMAjaBjQrVs="; }; nativeBuildInputs = [ setuptools ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { python-engineio ]; - passthru.optional-dependencies = { + optional-dependencies = { client = [ requests websocket-client @@ -58,7 +58,7 @@ buildPythonPackage rec { pytestCheckHook uvicorn simple-websocket - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "socketio" ]; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 2a2b5d714deea..15647160b5258 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { SOAP = [ zeep ]; }; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 354c97ffc4e47..b664291e2c850 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "21.4"; + version = "21.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,21 +33,25 @@ buildPythonPackage rec { owner = "python-telegram-bot"; repo = "python-telegram-bot"; rev = "refs/tags/v${version}"; - hash = "sha256-5raEejd8WH9JrFvMIy2AuMGK9O/FJ2rq9PeVqK+IMOU="; + hash = "sha256-FwAlceRqQfTjCCi+Mqrf0LCxSZD4mV/CVN6YPs947c4="; }; - build-system = [ setuptools hatchling ]; - - dependencies = [ - httpx + build-system = [ + setuptools + hatchling ]; + dependencies = [ httpx ]; + optional-dependencies = rec { all = ext ++ http2 ++ passport ++ socks; callback-data = [ cachetools ]; ext = callback-data ++ job-queue ++ rate-limiter ++ webhooks; http2 = httpx.optional-dependencies.http2; - job-queue = [ apscheduler pytz ]; + job-queue = [ + apscheduler + pytz + ]; passport = [ cryptography ] ++ lib.optionals (pythonAtLeast "3.13") [ cffi ]; rate-limiter = [ aiolimiter ]; socks = httpx.optional-dependencies.socks; diff --git a/pkgs/development/python-modules/python-troveclient/default.nix b/pkgs/development/python-modules/python-troveclient/default.nix new file mode 100644 index 0000000000000..891a907e55bfb --- /dev/null +++ b/pkgs/development/python-modules/python-troveclient/default.nix @@ -0,0 +1,87 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + httplib2, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-i18n, + oslo-utils, + pbr, + prettytable, + python-mistralclient, + python-openstackclient, + python-swiftclient, + pythonOlder, + requests-mock, + requests, + setuptools, + sphinxcontrib-apidoc, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "python-troveclient"; + version = "8.5.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-troveclient"; + rev = "refs/tags/${version}"; + hash = "sha256-lfnAmQ/IxEdc+XxC0dYxK2FgY7csNewGPuQuq0dNffM="; + }; + + env.PBR_VERSION = version; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + sphinxcontrib-apidoc + ]; + + sphinxBuilders = [ "man" ]; + + build-system = [ + pbr + setuptools + ]; + + dependencies = [ + keystoneauth1 + osc-lib + oslo-i18n + oslo-utils + prettytable + python-mistralclient + python-openstackclient + python-swiftclient + requests + ]; + + nativeCheckInputs = [ + httplib2 + requests-mock + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "troveclient" ]; + + meta = { + homepage = "https://github.com/openstack/python-troveclient"; + description = "Client library for OpenStack Trove API"; + license = lib.licenses.asl20; + mainProgram = "trove"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-u2flib-server/default.nix b/pkgs/development/python-modules/python-u2flib-server/default.nix index e1b44777dfeea..fa93cb83fce8a 100644 --- a/pkgs/development/python-modules/python-u2flib-server/default.nix +++ b/pkgs/development/python-modules/python-u2flib-server/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { u2f_server = [ webob ]; }; @@ -42,7 +42,7 @@ buildPythonPackage rec { "u2flib_server.u2f" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.u2f_server; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.u2f_server; meta = with lib; { description = "Python based U2F server library"; diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 6fabd9a81763d..8b86add144939 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, loguru, pytest-asyncio, pytestCheckHook, @@ -11,8 +12,8 @@ buildPythonPackage rec { pname = "python-utils"; - version = "3.8.2"; - format = "setuptools"; + version = "3.9.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "WoLpH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2scWyj0Fz39Thu0T0+UirT+he6tPYKGsvmYzzpD+/ls="; + hash = "sha256-ZmCT41VMz8BkIqF8Od5PqteyXToA4xASs0qCPD0cNc8="; }; postPatch = '' @@ -29,16 +30,18 @@ buildPythonPackage rec { -e '/--mypy/d' ''; - propagatedBuildInputs = [ typing-extensions ]; + build-system = [ setuptools ]; - passthru.optional-dependencies = { + dependencies = [ typing-extensions ]; + + optional-dependencies = { loguru = [ loguru ]; }; nativeCheckInputs = [ pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.loguru; + ] ++ optional-dependencies.loguru; pythonImportsCheck = [ "python_utils" ]; diff --git a/pkgs/development/python-modules/python-watcherclient/default.nix b/pkgs/development/python-modules/python-watcherclient/default.nix new file mode 100644 index 0000000000000..b3cc4267f30c4 --- /dev/null +++ b/pkgs/development/python-modules/python-watcherclient/default.nix @@ -0,0 +1,75 @@ +{ + lib, + buildPythonPackage, + cliff, + fetchFromGitHub, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-i18n, + oslo-serialization, + oslo-utils, + pbr, + pythonOlder, + setuptools, + sphinxcontrib-apidoc, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "python-watcherclient"; + version = "4.4.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-watcherclient"; + rev = "refs/tags/${version}"; + hash = "sha256-lDdiZKaeteKZEyfjpBx8KY+0FLFOYAnQXl0pTbqq0Ss="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxcontrib-apidoc + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + cliff + keystoneauth1 + osc-lib + oslo-i18n + oslo-serialization + oslo-utils + ]; + + nativeCheckInputs = [ stestr ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "watcherclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-watcherclient"; + description = "Client library for OpenStack Watcher API"; + license = lib.licenses.asl20; + mainProgram = "watcher"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index edcb3e0047e71..f5594e983ace5 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -35,7 +35,7 @@ buildPythonPackage { ''; # hangs on darwin + sandbox - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' rm test/{test_exempi,test_files}.py diff --git a/pkgs/development/python-modules/python-xz/default.nix b/pkgs/development/python-modules/python-xz/default.nix index 83fbc0997e579..526c542451040 100644 --- a/pkgs/development/python-modules/python-xz/default.nix +++ b/pkgs/development/python-modules/python-xz/default.nix @@ -9,18 +9,18 @@ buildPythonPackage rec { pname = "python-xz"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-oYjwQ26BFFXxvaYdzp2+bw/BQwM0v/n1r9DmaLs1R3Q="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - # has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ "xz" ]; @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python library for seeking within compressed xz files"; homepage = "https://github.com/Rogdham/python-xz"; + changelog = "https://github.com/Rogdham/python-xz/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with lib.maintainers; [ mxmlnkn ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/python-zaqarclient/default.nix b/pkgs/development/python-modules/python-zaqarclient/default.nix new file mode 100644 index 0000000000000..ee8c99b6b642a --- /dev/null +++ b/pkgs/development/python-modules/python-zaqarclient/default.nix @@ -0,0 +1,82 @@ +{ + lib, + buildPythonPackage, + ddt, + fetchFromGitHub, + jsonschema, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-i18n, + oslo-log, + oslo-utils, + pbr, + pythonOlder, + requests-mock, + requests, + setuptools, + sphinxHook, + stestr, + stevedore, +}: + +buildPythonPackage rec { + pname = "python-zaqarclient"; + version = "2.7.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-zaqarclient"; + rev = "refs/tags/${version}"; + hash = "sha256-WphTlqhrwxg5g88NH1W4b3uLAxLImnS34hDrlJjWeEU="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + jsonschema + keystoneauth1 + osc-lib + oslo-i18n + oslo-log + oslo-utils + requests + stevedore + ]; + + nativeCheckInputs = [ + ddt + requests-mock + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "zaqarclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-zaqarclient"; + description = "Client library for OpenStack Zaqar API"; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-zunclient/default.nix b/pkgs/development/python-modules/python-zunclient/default.nix new file mode 100644 index 0000000000000..f538cdbac638c --- /dev/null +++ b/pkgs/development/python-modules/python-zunclient/default.nix @@ -0,0 +1,92 @@ +{ + lib, + buildPythonPackage, + docker, + fetchFromGitHub, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-i18n, + oslo-log, + oslo-utils, + pbr, + prettytable, + pythonOlder, + setuptools, + sphinxHook, + stestr, + websocket-client, +}: + +buildPythonPackage rec { + pname = "python-zunclient"; + version = "5.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-zunclient"; + rev = "refs/tags/${version}"; + hash = "sha256-EVfrxSc/eHYZR0FGFnNAxFCiXangt8uRkAC2zpwWqcA="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + # python-openstackclient is unused upstream + # and will cause infinite recursion in openstackclient-full package. + pythonRemoveDeps = [ "python-openstackclient" ]; + + dependencies = [ + docker + keystoneauth1 + osc-lib + oslo-i18n + oslo-log + oslo-utils + prettytable + websocket-client + ]; + + nativeCheckInputs = [ stestr ]; + + checkPhase = '' + runHook preCheck + stestr run -e <(echo " + zunclient.tests.unit.test_shell.ShellTest.test_main_endpoint_internal + zunclient.tests.unit.test_shell.ShellTest.test_main_endpoint_public + zunclient.tests.unit.test_shell.ShellTest.test_main_env_region + zunclient.tests.unit.test_shell.ShellTest.test_main_no_region + zunclient.tests.unit.test_shell.ShellTest.test_main_option_region + zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_endpoint_internal + zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_endpoint_public + zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_env_region + zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_no_region + zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_option_region + ") + runHook postCheck + ''; + + pythonImportsCheck = [ "zunclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-zunclient"; + description = "Client library for OpenStack Zun API"; + license = lib.licenses.asl20; + mainProgram = "zun"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 1261da097fe0c..3af465ba2de13 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click ]; }; nativeCheckInputs = [ pytest-timeout pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pythonfinder" ]; diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 969534e80cef7..9119f1a27268c 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { --replace 'dynamic = ["version"]' 'version = "${version}"' ''; - buildInputs = [ dotnet-build.nugetDeps ]; + buildInputs = dotnet-build.nugetDeps; nativeBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 1718cf91593ea..755834eecd32e 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -15,7 +15,7 @@ libXmu, opencascade-occt, rapidjson, - swig4, + swig, }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - swig4 + swig ]; buildInputs = [ python @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { libXi fontconfig rapidjson - ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; cmakeFlags = [ "-Wno-dev" diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix index bec278f08e6f6..563d1e4d2ecdb 100644 --- a/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -46,11 +46,11 @@ buildPythonPackage rec { sphinx-autodoc-typehints sphinx-rtd-theme sphinxHook - ] ++ passthru.optional-dependencies.doc; + ] ++ optional-dependencies.doc; propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { validation = [ pydantic ]; global = [ platformdirs ]; doc = [ @@ -63,7 +63,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { description = "Python tool configuration"; diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 116997ceb8e4d..b23ea7188d10c 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = { description = "Lightweight PyTorch wrapper for machine learning researchers"; homepage = "https://github.com/Lightning-AI/pytorch-lightning"; - changelog = "https://github.com/Lightning-AI/pytorch-lightning/releases/tag/${src.rev}"; + changelog = "https://github.com/Lightning-AI/pytorch-lightning/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ tbenst ]; }; diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 049064754937b..19678c01938ef 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; disabled = isPy27; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1y7VCnzgwFOMeMloVdYyszNhf/zZlBJUjuF4qgA5c0A="; + hash = "sha256-xlTqUUF+tUIbULd1B8XR18Kxd7kl2TRKdbp0GoAfi4g="; }; build-system = [ @@ -83,7 +83,7 @@ buildPythonPackage rec { "test_get_nearest_neighbors" "test_list_of_text" "test_untrained_indexer" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # AttributeError: module 'torch.distributed' has no attribute 'init_process_group' "test_single_proc" ] ++ lib.optionals cudaSupport [ diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index f77d143f7b036..60d03910bcfb4 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -1,40 +1,38 @@ { + lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, - lib, + + # build-system + setuptools, + + # dependencies numpy, - onnx, packaging, + torch, + typing-extensions, + + # tests + onnx, pytestCheckHook, + torchvision, + pythonAtLeast, - setuptools, stdenv, - torch, - torchvision, - typing-extensions, }: buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.7.6"; + version = "0.7.7"; pyproject = true; src = fetchFromGitHub { owner = "pfnet"; repo = "pytorch-pfn-extras"; rev = "refs/tags/v${version}"; - hash = "sha256-vSon/0GxQfaRtSPsQbYAvE3s/F0HEN59VpzE3w1PnVE="; + hash = "sha256-0+ltkm7OH18hlpHYyZCmy1rRleF52IM2BjLoW44tJUY="; }; - patches = [ - (fetchpatch { - name = "relax-setuptools.patch"; - url = "https://github.com/pfnet/pytorch-pfn-extras/commit/96abe38c4baa6a144d604bdd4744c55627e55440.patch"; - hash = "sha256-85UDGcgJyQS5gINbgpNM58b3XJGvf+ArtGhwJ5EXdhk="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ @@ -54,10 +52,26 @@ buildPythonPackage rec { # Requires CUDA access which is not possible in the nix environment. "-m 'not gpu and not mpi'" "-Wignore::DeprecationWarning" + + # FutureWarning: You are using `torch.load` with `weights_only=False` (the current default value), which uses the default pickle module implicitly... + "-Wignore::FutureWarning" ]; pythonImportsCheck = [ "pytorch_pfn_extras" ]; + disabledTests = + [ + # AssertionError: assert 4 == 0 + # where 4 = <MagicMock id='140733587469184'>.call_count + "test_lr_scheduler_wait_for_first_optimizer_step" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + # torch.distributed is not available on darwin + "test_create_distributed_evaluator" + "test_distributed_evaluation" + "test_distributed_evaluator_progress_bar" + ]; + disabledTestPaths = [ # Requires optuna which is currently (2022-02-16) marked as broken. @@ -84,6 +98,11 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # torch.distributed is not available on darwin + "tests/pytorch_pfn_extras_tests/distributed_tests/test_distributed_validation_sampler.py" + "tests/pytorch_pfn_extras_tests/nn_tests/parallel_tests/test_distributed.py" + "tests/pytorch_pfn_extras_tests/profiler_tests/test_record.py" + "tests/pytorch_pfn_extras_tests/profiler_tests/test_time_summary.py" + "tests/pytorch_pfn_extras_tests/training_tests/extensions_tests/test_accumulate.py" "tests/pytorch_pfn_extras_tests/training_tests/extensions_tests/test_sharded_snapshot.py" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ @@ -92,10 +111,11 @@ buildPythonPackage rec { "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_conv.py" ]; - meta = with lib; { + meta = { description = "Supplementary components to accelerate research and development in PyTorch"; homepage = "https://github.com/pfnet/pytorch-pfn-extras"; - license = licenses.mit; - maintainers = with maintainers; [ samuela ]; + changelog = "https://github.com/pfnet/pytorch-pfn-extras/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ samuela ]; }; } diff --git a/pkgs/development/python-modules/pytouchlinesl/default.nix b/pkgs/development/python-modules/pytouchlinesl/default.nix index 209c5f270f703..423d29f6cef09 100644 --- a/pkgs/development/python-modules/pytouchlinesl/default.nix +++ b/pkgs/development/python-modules/pytouchlinesl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytouchlinesl"; - version = "0.1.5"; + version = "0.1.7"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jnsgruk"; repo = "pytouchlinesl"; rev = "refs/tags/${version}"; - hash = "sha256-kdLMuxA1Ig85mH7s9rlmVjEsItXxRlDA1JTFasnJogg="; + hash = "sha256-Xth1zC08SIL8j7t2n64I4cyLd6UQABoSeg57tYhnvtE="; }; build-system = [ setuptools ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "A Python API client for Roth's TouchlineSL API"; homepage = "https://github.com/jnsgruk/pytouchlinesl"; - changelog = "https://github.com/jnsgruk/pytouchlinesl/releases/tag/${src.rev}"; + changelog = "https://github.com/jnsgruk/pytouchlinesl/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jnsgruk ]; }; diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 9e710823127aa..8227ac4846417 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ pydantic ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiocoap dtlssocket ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.async; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.async; pythonImportsCheck = [ "pytradfri" ]; diff --git a/pkgs/development/python-modules/pyttsx3/default.nix b/pkgs/development/python-modules/pyttsx3/default.nix index df854d4073f87..deeddc6b6d521 100644 --- a/pkgs/development/python-modules/pyttsx3/default.nix +++ b/pkgs/development/python-modules/pyttsx3/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyttsx3"; - version = "2.91"; + version = "2.97"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "sha256-jxkhfE1lpGhw4LgvLn6xVw7CssqAUX++7gleVPdvc+I="; + sha256 = "sha256-GM4wZDtnutHZc2H7s6PHyo/MdQ7Y6YrCJuu2I7AeSw8="; dist = "py3"; python = "py3"; }; diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index a42273fee7cc6..343bcca0a9654 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/JuanBindez/pytubefix"; description = "Pytube fork with additional features and fixes"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ roshaen ]; + maintainers = with lib.maintainers; [ youhaveme9 ]; }; } diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index 21d08646ef84a..eb08b2e9873e3 100644 --- a/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -12,20 +12,20 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.7.5"; + version = "1.7.7"; pyproject = true; src = fetchFromGitHub { owner = "lilohuang"; repo = "PyTurboJPEG"; rev = "refs/tags/v${version}"; - hash = "sha256-HML56qnv//fSeXBcQC+nED/CNqUY9p8Hwrmd0EGCzx0="; + hash = "sha256-JPjGZGVMZH6sDNRdV6kWsCpEjLT2aMrTy+bI4mRbdpw="; }; patches = [ (substituteAll { src = ./lib-path.patch; - libturbojpeg = "${libjpeg_turbo.out}/lib/libturbojpeg${stdenv.hostPlatform.extensions.sharedLibrary}"; + libturbojpeg = "${lib.getLib libjpeg_turbo}/lib/libturbojpeg${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 13073a59f4810..f7b75f0ff22e6 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-LpRUJ6IWdIk7uXYyQB22ITnZHOoe6WE3zHsHrSIZj8c="; }; - postPatch = lib.optionalString stdenvNoCC.isLinux '' + postPatch = lib.optionalString stdenvNoCC.hostPlatform.isLinux '' substituteInPlace src/pyudev/_ctypeslib/utils.py \ --replace "find_library(name)" "'${lib.getLib udev}/lib/libudev.so'" ''; diff --git a/pkgs/development/python-modules/pyunbound/default.nix b/pkgs/development/python-modules/pyunbound/default.nix index a5d33cbfa4405..13357faec5931 100644 --- a/pkgs/development/python-modules/pyunbound/default.nix +++ b/pkgs/development/python-modules/pyunbound/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { rm -r $out/bin $out/share $out/include $out/etc/unbound '' # patchelf is only available on Linux and no patching is needed on darwin - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --replace-needed libunbound.so.8 $out/${python.sitePackages}/libunbound.so.8 $out/${python.sitePackages}/_unbound.so ''; diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix deleted file mode 100644 index bfbd39ce5cc40..0000000000000 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ - lib, - aiofiles, - aiohttp, - aioshutil, - async-timeout, - buildPythonPackage, - dateparser, - fetchFromGitHub, - ffmpeg, - hatch-vcs, - hatchling, - ipython, - orjson, - packaging, - pillow, - platformdirs, - py, - pydantic, - pyjwt, - pytest-aiohttp, - pytest-asyncio, - pytest-benchmark, - pytest-timeout, - pytest-xdist, - pytestCheckHook, - python-dotenv, - pythonOlder, - pytz, - termcolor, - typer, -}: - -buildPythonPackage rec { - pname = "pyunifiprotect"; - version = "5.1.2"; - pyproject = true; - - disabled = pythonOlder "3.9"; - - src = fetchFromGitHub { - owner = "briis"; - repo = "pyunifiprotect"; - rev = "refs/tags/v${version}"; - hash = "sha256-DtQm6u3O0kdVJ23Ch+hJQ6HTOt5iAMdhCzC1K/oICWk="; - }; - - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--strict-markers -ra -Wd --ignore=.* --no-cov-on-fail --cov=pyunifiprotect --cov-append --maxfail=10 -n=auto" "" - ''; - - build-system = [ - hatch-vcs - hatchling - ]; - - dependencies = [ - aiofiles - aiohttp - aioshutil - dateparser - orjson - packaging - pillow - platformdirs - pydantic - pyjwt - pytz - typer - ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; - - passthru.optional-dependencies = { - shell = [ - ipython - python-dotenv - termcolor - ]; - }; - - nativeCheckInputs = [ - ffmpeg # Required for command ffprobe - py - pytest-aiohttp - pytest-asyncio - pytest-benchmark - pytest-timeout - pytest-xdist - pytestCheckHook - ]; - - pythonImportsCheck = [ "pyunifiprotect" ]; - - pytestFlagsArray = [ "--benchmark-disable" ]; - - meta = with lib; { - description = "Library for interacting with the Unifi Protect API"; - mainProgram = "unifi-protect"; - homepage = "https://github.com/briis/pyunifiprotect"; - changelog = "https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index a98538cc43eab..6c079b11712fb 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { versioneer ]; - passthru.optional-dependencies = { + optional-dependencies = { jsonutil = [ simplejson ]; # Module not available # randcookie = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { mock twisted pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pyutil" ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 5126815dbb0ad..39f5574596749 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.117"; + version = "9.2.119"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-hW5uCploPx7+Q8RYZSm6bp/SkbPftkfMkhLvBjHJuBc="; + hash = "sha256-c9CaftT7VInEMRsWN7FhDHwXJccma5wkUfiN9EpjUTQ="; }; build-system = [ setuptools ]; @@ -30,12 +30,12 @@ buildPythonPackage rec { pycparser ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace vex/Makefile-gcc \ --replace-fail '/usr/bin/ar' 'ar' ''; - setupPyBuildFlags = lib.optionals stdenv.isLinux [ + setupPyBuildFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" ]; diff --git a/pkgs/development/python-modules/pyvicare-neo/default.nix b/pkgs/development/python-modules/pyvicare-neo/default.nix new file mode 100644 index 0000000000000..5980fca223f28 --- /dev/null +++ b/pkgs/development/python-modules/pyvicare-neo/default.nix @@ -0,0 +1,43 @@ +{ + authlib, + buildPythonPackage, + fetchFromGitHub, + lib, + poetry-core, + pytestCheckHook, + requests, + types-requests, +}: + +buildPythonPackage rec { + pname = "pyvicare-neo"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "CFenner"; + repo = "PyViCare"; + rev = "refs/tags/v${version}"; + hash = "sha256-QjFrBf58uM5OProKsesyY43MuE1MnIVIVqs5rWUTmes="; + }; + + build-system = [ poetry-core ]; + + propagatedBuildInputs = [ + authlib + requests + types-requests + ]; + + pythonImportsCheck = [ "PyViCare" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + changelog = "https://github.com/CFenner/PyViCare/releases/tag/v${version}"; + description = "Library to communicate with the Viessmann ViCare API"; + homepage = "https://github.com/CFenner/PyViCare"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix deleted file mode 100644 index 69edcefbb4a0c..0000000000000 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - authlib, - buildPythonPackage, - fetchFromGitHub, - pkce, - pytestCheckHook, - pythonOlder, - simplejson, -}: - -buildPythonPackage rec { - pname = "pyvicare"; - version = "2.32.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "somm15"; - repo = "PyViCare"; - rev = "refs/tags/${version}"; - hash = "sha256-qK5JCaCL+gbgNcBo5IjhlRrXD1IhA1B56hmcjvPie6Y="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "version_config=True," 'version="${version}",' \ - --replace "'setuptools-git-versioning<1.8.0'" "" - ''; - - propagatedBuildInputs = [ - authlib - pkce - ]; - - nativeCheckInputs = [ - pytestCheckHook - simplejson - ]; - - pythonImportsCheck = [ "PyViCare" ]; - - meta = with lib; { - description = "Python Library to access Viessmann ViCare API"; - homepage = "https://github.com/somm15/PyViCare"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 4a2b39a87ab21..aec66ed08f4a9 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { gpib-ctypes = [ gpib-ctypes ]; serial = [ pyserial ]; usb = [ pyusb ]; diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 0bfb49ebc3833..65c469091eeae 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { changelog = "https://github.com/Julius2342/pyvlx/releases/tag/${version}"; license = with licenses; [ lgpl2Only ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 16260ed5de0a3..80a8f5832a10a 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { sso = [ lxml pyopenssl diff --git a/pkgs/development/python-modules/pywavefront/default.nix b/pkgs/development/python-modules/pywavefront/default.nix index 534b5647c046d..676f2aaab6612 100644 --- a/pkgs/development/python-modules/pywavefront/default.nix +++ b/pkgs/development/python-modules/pywavefront/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies.visualization = [ pyglet ]; + optional-dependencies.visualization = [ pyglet ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix index edd1534e6f667..61ba21dc75867 100644 --- a/pkgs/development/python-modules/pywerview/default.nix +++ b/pkgs/development/python-modules/pywerview/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, gssapi, impacket, - ldap3, + ldap3-bleeding-edge, lxml, pyasn1, pycryptodome, @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pywerview"; - version = "0.6.1"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,16 +24,16 @@ buildPythonPackage rec { owner = "the-useless-one"; repo = "pywerview"; rev = "refs/tags/v${version}"; - hash = "sha256-hsilBqk73txYIlgRtbn/l/kWORMGft7ne5BffchDLPc="; + hash = "sha256-G4kcKlb6bq9Vx52MVZ+DCN5k1QcvkoMXm9P959nA1fI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 gssapi impacket - ldap3 + ldap3-bleeding-edge lxml pycryptodome pyasn1 @@ -46,10 +46,10 @@ buildPythonPackage rec { meta = with lib; { description = "Module for PowerSploit's PowerView support"; - mainProgram = "pywerview"; homepage = "https://github.com/the-useless-one/pywerview"; changelog = "https://github.com/the-useless-one/pywerview/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; + mainProgram = "pywerview"; }; } diff --git a/pkgs/development/python-modules/pywfa/default.nix b/pkgs/development/python-modules/pywfa/default.nix index 1741cbb9bf717..e782071aadbd2 100644 --- a/pkgs/development/python-modules/pywfa/default.nix +++ b/pkgs/development/python-modules/pywfa/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for wavefront alignment using WFA2-lib"; homepage = "https://github.com/kcleal/pywfa"; - changelog = "https://github.com/kcleal/pywfa/releases/tag/${src.rev}"; + changelog = "https://github.com/kcleal/pywfa/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 7e81354ceae0b..f9aafffd09055 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -3,43 +3,39 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - cython_0, + cython, setuptools, libyaml, - python, + pytestCheckHook, }: buildPythonPackage rec { pname = "pyyaml"; - version = "6.0.1"; + version = "6.0.2"; + pyproject = true; - disabled = pythonOlder "3.6"; - - format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "yaml"; repo = "pyyaml"; - rev = version; - hash = "sha256-YjWMyMVDByLsN5vEecaYjHpR1sbBey1L/khn4oH9SPA="; + rev = "refs/tags/${version}"; + hash = "sha256-IQoZd9Lp0ZHLAQN3PFwMsZVTsIVJyIaT9D6fpkzA8IA="; }; - nativeBuildInputs = [ - cython_0 + build-system = [ + cython setuptools ]; buildInputs = [ libyaml ]; - checkPhase = '' - runHook preCheck - PYTHONPATH="tests/lib:$PYTHONPATH" ${python.interpreter} -m test_all - runHook postCheck - ''; - pythonImportsCheck = [ "yaml" ]; + nativeCheckInputs = [ pytestCheckHook ]; + meta = with lib; { + changelog = "https://github.com/yaml/pyyaml/blob/${src.rev}/CHANGES"; description = "Next generation YAML parser and emitter for Python"; homepage = "https://github.com/yaml/pyyaml"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyytlounge/default.nix b/pkgs/development/python-modules/pyytlounge/default.nix new file mode 100644 index 0000000000000..2ec7c32555629 --- /dev/null +++ b/pkgs/development/python-modules/pyytlounge/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + aiohttp, + pytest, + pytestCheckHook, + pytest-mock, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "pyytlounge"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "FabioGNR"; + repo = "pyytlounge"; + rev = "v${version}"; + hash = "sha256-0QPa3EzOBv5fuw3FGgmoN4KiC4KHo1Z+Svjcneoe0pc="; + }; + + pyproject = true; + + doCheck = true; + + build-system = [ hatchling ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ + pytest + pytestCheckHook + pytest-mock + pytest-asyncio + ]; + + meta = with lib; { + description = "Python YouTube Lounge API"; + homepage = "https://github.com/FabioGNR/pyytlounge"; + license = licenses.gpl3Only; + maintainers = [ maintainers.lukegb ]; + }; +} diff --git a/pkgs/development/python-modules/pyzx/default.nix b/pkgs/development/python-modules/pyzx/default.nix index a391f26a31395..d39d2b48ef240 100644 --- a/pkgs/development/python-modules/pyzx/default.nix +++ b/pkgs/development/python-modules/pyzx/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - pythonRelaxDepsHook, pytestCheckHook, setuptools, ipywidgets, diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index a299e2caa3ba3..bae26634aa2ab 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2024.8.65"; + version = "2024.9.67"; pyproject = true; src = fetchPypi { pname = "qbittorrent_api"; inherit version; - hash = "sha256-lC31v6WLNk0RZDFz1GOlqrd2kAijTHffZ7NsUsm2vAk="; + hash = "sha256-+NfttxsUzNVg0YL6H0ULeDb/xobMvUeGwWY/egN9aWY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index e5a2688d0011a..71cfa490452b0 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcelemental" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Periodic table, physical constants and molecule parsing for quantum chemistry"; homepage = "https://github.com/MolSSI/QCElemental"; changelog = "https://github.com/MolSSI/QCElemental/blob/v${version}/docs/changelog.rst"; diff --git a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix index eb9d0e74021ec..d6bd8c809582a 100644 --- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix +++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix @@ -49,10 +49,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcodes_contrib_drivers" ]; - disabledTests = lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ - # At index 13 diff: 'sour6:volt 0.29000000000000004' != 'sour6:volt 0.29' - "test_stability_diagram_external" - ]; + disabledTests = + lib.optionals (stdenv.hostPlatform.isDarwin) [ + # At index 13 diff: 'sour6:volt 0.29000000000000004' != 'sour6:volt 0.29' + "test_stability_diagram_external" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # AssertionError: assert ['outp:trig4:...9999996', ...] == ['outp:trig4:...t 0.266', ...] + "test_stability_diagram_external" + ]; postInstall = '' export HOME="$TMPDIR" diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index 8d48679236925..e10eb77d2816a 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -38,13 +37,13 @@ xarray, # optional-dependencies + furo, jinja2, nbsphinx, pyvisa-sim, scipy, sphinx, sphinx-issues, - sphinx-rtd-theme, towncrier, opencensus, opencensus-ext-azure, @@ -63,16 +62,14 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.47.0"; + version = "0.48.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "microsoft"; repo = "Qcodes"; rev = "refs/tags/v${version}"; - hash = "sha256-Gp+HeYJGWyW49jisadnavjIpzu7C2uS2qWn7eC6okqg="; + hash = "sha256-Q1WyuK1mCbs75kGY1Aaw7S5EfFRjwqzZnhNyeSx7qc8="; }; build-system = [ @@ -112,6 +109,7 @@ buildPythonPackage rec { optional-dependencies = { docs = [ # autodocsumm + furo jinja2 nbsphinx pyvisa-sim @@ -121,7 +119,6 @@ buildPythonPackage rec { # sphinx-favicon sphinx-issues # sphinx-jsonschema - sphinx-rtd-theme # sphinxcontrib-towncrier towncrier ]; @@ -195,9 +192,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcodes" ]; + # Remove the `asyncio_default_fixture_loop_scope` option as it has been introduced in newer `pytest-asyncio` v0.24 + # which is not in nixpkgs yet: + # pytest.PytestConfigWarning: Unknown config option: asyncio_default_fixture_loop_scope postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'default-version = "0.0"' 'default-version = "${version}"' + --replace-fail 'default-version = "0.0"' 'default-version = "${version}"' \ + --replace-fail 'asyncio_default_fixture_loop_scope = "function"' "" ''; postInstall = '' diff --git a/pkgs/development/python-modules/qcs-api-client-common/Cargo.lock b/pkgs/development/python-modules/qcs-api-client-common/Cargo.lock new file mode 100644 index 0000000000000..e014440032fd6 --- /dev/null +++ b/pkgs/development/python-modules/qcs-api-client-common/Cargo.lock @@ -0,0 +1,3879 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" + +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + +[[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "async-attributes" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.3.1", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-io" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-object-pool" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "333c456b97c3f2d50604e8b2624253b7f787208cb72eb75e64b0ad11b221652c" +dependencies = [ + "async-std", +] + +[[package]] +name = "async-process" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" +dependencies = [ + "async-channel 2.3.1", + "async-io", + "async-lock", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.1", + "futures-lite", + "rustix", + "tracing", +] + +[[package]] +name = "async-signal" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-socks5" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77f634add2445eb2c1f785642a67ca1073fedd71e73dc3ca69435ef9b9bdedc7" +dependencies = [ + "async-trait", + "thiserror", + "tokio", +] + +[[package]] +name = "async-std" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" +dependencies = [ + "async-attributes", + "async-channel 1.9.0", + "async-global-executor", + "async-io", + "async-lock", + "async-process", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom", + "instant", + "pin-project-lite", + "rand", + "tokio", +] + +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "basic-cookies" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67bd8fd42c16bdb08688243dc5f0cc117a3ca9efeeaba3a345a18a6159ad96f7" +dependencies = [ + "lalrpop", + "lalrpop-util", + "regex", +] + +[[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.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel 2.3.1", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "cc" +version = "1.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bcde016d64c21da4be18b655631e5ab6d3107607e71a73a9f53eb48aae23fb" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.77", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive_builder" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" +dependencies = [ + "derive_builder_core", + "syn 2.0.77", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.77", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "ena" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5" +dependencies = [ + "log", +] + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "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 = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "figment" +version = "0.10.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" +dependencies = [ + "atomic", + "parking_lot", + "pear", + "serde", + "tempfile", + "toml", + "uncased", + "version_check", +] + +[[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 = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 2.5.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "headers" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "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 = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "httpmock" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08ec9586ee0910472dec1a1f0f8acf52f0fdde93aea74d70d4a3107b4be0fd5b" +dependencies = [ + "assert-json-diff", + "async-object-pool", + "async-std", + "async-trait", + "base64 0.21.7", + "basic-cookies", + "crossbeam-utils", + "form_urlencoded", + "futures-util", + "hyper", + "lazy_static", + "levenshtein", + "log", + "regex", + "serde", + "serde_json", + "serde_regex", + "similar", + "tokio", + "url", +] + +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-proxy" +version = "0.9.1" +source = "git+https://github.com/rigetti/hyper-proxy#e08329b56787326d6ec8d0bbcc1f96913af105c8" +dependencies = [ + "bytes", + "futures-util", + "headers", + "http", + "hyper", + "hyper-rustls", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", + "tower-service", + "webpki", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "log", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-socks2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc38166fc2732d450e9372388d269eb38ff0b75a3cfb4c542e65b2f6893629c4" +dependencies = [ + "async-socks5", + "futures", + "http", + "hyper", + "thiserror", + "tokio", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "inventory" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" + +[[package]] +name = "ipnet" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jsonwebtoken" +version = "9.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +dependencies = [ + "base64 0.21.7", + "js-sys", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "lalrpop" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" +dependencies = [ + "ascii-canvas", + "bit-set", + "ena", + "itertools 0.11.0", + "lalrpop-util", + "petgraph", + "pico-args", + "regex", + "regex-syntax", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", + "walkdir", +] + +[[package]] +name = "lalrpop-util" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "levenshtein" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "value-bag", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "multimap" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[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 = "opentelemetry" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" +dependencies = [ + "opentelemetry_api", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-http" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry_api", +] + +[[package]] +name = "opentelemetry_api" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" +dependencies = [ + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "ordered-float", + "percent-encoding", + "rand", + "regex", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "3.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pbjson" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90" +dependencies = [ + "base64 0.21.7", + "serde", +] + +[[package]] +name = "pbjson-build" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735" +dependencies = [ + "heck 0.4.1", + "itertools 0.11.0", + "prost", + "prost-types", +] + +[[package]] +name = "pbjson-types" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12" +dependencies = [ + "bytes", + "chrono", + "pbjson", + "pbjson-build", + "prost", + "prost-build", + "serde", +] + +[[package]] +name = "pear" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "pem" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +dependencies = [ + "base64 0.22.1", + "serde", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap 2.5.0", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "polling" +version = "3.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "prettyplease" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +dependencies = [ + "proc-macro2", + "syn 2.0.77", +] + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", + "version_check", + "yansi", +] + +[[package]] +name = "prost" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +dependencies = [ + "bytes", + "heck 0.5.0", + "itertools 0.12.1", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 2.0.77", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "prost-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost", +] + +[[package]] +name = "pyo3" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +dependencies = [ + "cfg-if", + "indoc", + "inventory", + "libc", + "memoffset", + "num-complex", + "parking_lot", + "portable-atomic", + "pyo3-build-config 0.20.3", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-asyncio" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea6b68e93db3622f3bb3bf363246cf948ed5375afe7abff98ccbdd50b184995" +dependencies = [ + "futures", + "once_cell", + "pin-project-lite", + "pyo3", + "tokio", +] + +[[package]] +name = "pyo3-build-config" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-build-config" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e61cef80755fe9e46bb8a0b8f20752ca7676dcc07a5277d8b7768c6172e529b3" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +dependencies = [ + "libc", + "pyo3-build-config 0.20.3", +] + +[[package]] +name = "pyo3-macros" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "pyo3-build-config 0.20.3", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "qcs-api-client-common" +version = "0.10.2" +dependencies = [ + "async-trait", + "backoff", + "base64 0.22.1", + "chrono", + "derive_builder", + "figment", + "futures", + "home", + "http", + "httpmock", + "jsonwebtoken", + "paste", + "pyo3", + "pyo3-asyncio", + "pyo3-build-config 0.22.3", + "reqwest", + "rigetti-pyo3", + "rstest 0.21.0", + "serde", + "serial_test", + "shellexpand", + "thiserror", + "time", + "tokio", + "toml", + "tracing", + "url", + "urlpattern", +] + +[[package]] +name = "qcs-api-client-grpc" +version = "0.10.2" +dependencies = [ + "async-std", + "backoff", + "futures-util", + "http", + "http-body", + "hyper", + "hyper-proxy", + "hyper-socks2", + "jsonwebtoken", + "once_cell", + "opentelemetry", + "opentelemetry-http", + "opentelemetry_api", + "opentelemetry_sdk", + "pbjson", + "pbjson-build", + "pbjson-types", + "prost", + "prost-build", + "qcs-api-client-common", + "rstest 0.17.0", + "serde", + "serde_json", + "tempfile", + "thiserror", + "tokio", + "tokio-stream", + "tonic", + "tonic-build", + "tonic-health", + "tonic-web", + "tower", + "tracing", + "tracing-opentelemetry", + "tracing-subscriber", + "url", + "urlpattern", +] + +[[package]] +name = "qcs-api-client-openapi" +version = "0.11.2" +dependencies = [ + "anyhow", + "qcs-api-client-common", + "reqwest", + "reqwest-middleware", + "reqwest-tracing", + "rstest 0.17.0", + "serde", + "serde_json", + "task-local-extensions", + "tokio", + "tracing", + "url", + "urlpattern", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "relative-path" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls 0.24.1", + "tokio-socks", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "reqwest-middleware" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" +dependencies = [ + "anyhow", + "async-trait", + "http", + "reqwest", + "serde", + "task-local-extensions", + "thiserror", +] + +[[package]] +name = "reqwest-tracing" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190838e54153d7a7e2ea98851304b3ce92daeabf14c54d32b01b84a3e636f683" +dependencies = [ + "anyhow", + "async-trait", + "getrandom", + "matchit", + "opentelemetry", + "reqwest", + "reqwest-middleware", + "task-local-extensions", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "rigetti-pyo3" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59068763670399bb3e895a17cc631d9214c3172b64fc74d3ab63dac7371c340" +dependencies = [ + "num-complex", + "num-traits", + "paste", + "pyo3", + "time", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rstest" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de1bb486a691878cd320c2f0d319ba91eeaa2e894066d8b5f8f117c000e9d962" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros 0.17.0", + "rustc_version", +] + +[[package]] +name = "rstest" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros 0.21.0", + "rustc_version", +] + +[[package]] +name = "rstest_macros" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290ca1a1c8ca7edb7c3283bd44dc35dd54fdec6253a3912e201ba1072018fca8" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", + "unicode-ident", +] + +[[package]] +name = "rstest_macros" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" +dependencies = [ + "cfg-if", + "glob", + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "relative-path", + "rustc_version", + "syn 2.0.77", + "unicode-ident", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scc" +version = "2.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c947adb109a8afce5fc9c7bf951f87f146e9147b3a6a58413105628fb1d1e66" +dependencies = [ + "sdd", +] + +[[package]] +name = "schannel" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sdd" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a7b59a5d9b0099720b417b6325d91a52cbf5b3dcb5041d864be53eefa58abc" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_regex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" +dependencies = [ + "regex", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serial_test" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +dependencies = [ + "futures", + "log", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "dirs", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "similar" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" + +[[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared", + "precomputed-hash", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "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.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "task-local-extensions" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" +dependencies = [ + "pin-utils", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +dependencies = [ + "indexmap 2.5.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tonic" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.7", + "bytes", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "rustls-native-certs 0.7.3", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic-build" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "tonic-health" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cef6e24bc96871001a7e48e820ab240b3de2201e59b517cf52835df2f1d2350" +dependencies = [ + "async-stream", + "prost", + "tokio", + "tokio-stream", + "tonic", +] + +[[package]] +name = "tonic-web" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc3b0e1cedbf19fdfb78ef3d672cb9928e0a91a9cb4629cc0c916e8cff8aaaa1" +dependencies = [ + "base64 0.21.7", + "bytes", + "http", + "http-body", + "hyper", + "pin-project", + "tokio-stream", + "tonic", + "tower-http", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-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-opentelemetry" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc09e402904a5261e42cf27aea09ccb7d5318c6717a9eec3d8e2e65c56b18f19" +dependencies = [ + "once_cell", + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log 0.1.4", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log 0.2.0", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uncased" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" +dependencies = [ + "version_check", +] + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-ucd-ident" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-xid" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "urlpattern" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" +dependencies = [ + "derive_more", + "regex", + "serde", + "unic-ucd-ident", + "url", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.77", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/development/python-modules/qcs-api-client-common/default.nix b/pkgs/development/python-modules/qcs-api-client-common/default.nix new file mode 100644 index 0000000000000..fc0a04a74ba04 --- /dev/null +++ b/pkgs/development/python-modules/qcs-api-client-common/default.nix @@ -0,0 +1,77 @@ +{ + buildPythonPackage, + cargo, + fetchFromGitHub, + grpc-interceptor, + grpcio, + httpx, + lib, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + rustc, + rustPlatform, + syrupy, +}: + +buildPythonPackage rec { + pname = "qcs-api-client-common"; + version = "0.10.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rigetti"; + repo = "qcs-api-client-rust"; + rev = "refs/tags/common/v${version}"; + hash = "sha256-WXTqzdbBZmBj/+mVK/watOuaq/WqKtaMVhp+ogjmhqM="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "hyper-proxy-0.9.1" = "sha256-P9/qMHfq56rkQoBQF3o/SmbOfcePcFf8yh1YQve3oGM="; + }; + }; + + # FIXME use + # buildAndTestSubdir = "qcs-api-client-common"; + # instead, which makes the tests fail + postPatch = '' + cd qcs-api-client-common + ''; + cargoRoot = ".."; + + build-system = [ rustPlatform.maturinBuildHook ]; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustc + ]; + + dependencies = [ + grpc-interceptor + grpcio + httpx + ]; + + preCheck = '' + # import from $out + rm -r qcs_api_client_common + ''; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + syrupy + ]; + + meta = { + changelog = "https://github.com/rigetti/qcs-api-client-rust/blob/${src.rev}/qcs-api-client-common/CHANGELOG-py.md"; + description = "Contains core QCS client functionality and middleware implementations"; + homepage = "https://github.com/rigetti/qcs-api-client-rust/tree/main/qcs-api-client-common"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 181fb7585e20c..34984ec5755ec 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -15,6 +15,7 @@ python-dateutil, pythonAtLeast, pythonOlder, + tenacity, respx, retrying, rfc3339, @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.25.3"; + version = "0.25.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-MkM7cRgDGjW8nh4JOqH0aKKlTV5qpQDLCR5kGfdKp2A="; + hash = "sha256-fVUvAXtZcMWBBK0wdGJA0oIneCNKI4GI2qNIc30HU9M="; }; patches = [ @@ -64,6 +65,7 @@ buildPythonPackage rec { python-dateutil retrying rfc3339 + tenacity toml ]; diff --git a/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock b/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock index 2309fd0205f39..6a205f28323de 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock +++ b/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock @@ -1592,18 +1592,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lexical" -version = "6.1.1" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" +checksum = "8ecd3381ac77c22d4e2607284ac71e44b21c21bd3785ee807d21976d54ee16f9" dependencies = [ "lexical-core", ] [[package]] name = "lexical-core" -version = "0.8.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +checksum = "0885f6cdfe75c96e45bbf1c4e49511f128201391ce3b56e60e29f5a1fadbc1c1" dependencies = [ "lexical-parse-float", "lexical-parse-integer", @@ -1614,9 +1614,9 @@ dependencies = [ [[package]] name = "lexical-parse-float" -version = "0.8.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +checksum = "924f7ec090cd4f60bd873f160b0fb69a0c80bb3a98f2e778a1893ae0e5c4b0b9" dependencies = [ "lexical-parse-integer", "lexical-util", @@ -1625,9 +1625,9 @@ dependencies = [ [[package]] name = "lexical-parse-integer" -version = "0.8.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +checksum = "8feab1da84a2ab0ddbbad2fb1830b755f71a9a8d996c7a1f2a553faf72aa3686" dependencies = [ "lexical-util", "static_assertions", @@ -1635,18 +1635,18 @@ dependencies = [ [[package]] name = "lexical-util" -version = "0.8.5" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +checksum = "591ce1a12ecd3b26d4121ab360a6a4483a67f05a5372add6acbfd0b65c9285d9" dependencies = [ "static_assertions", ] [[package]] name = "lexical-write-float" -version = "0.8.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +checksum = "05b0f3f9ddada5942b54e97654d535df37c9340ad66c24b50360a90619779f41" dependencies = [ "lexical-util", "lexical-write-integer", @@ -1655,9 +1655,9 @@ dependencies = [ [[package]] name = "lexical-write-integer" -version = "0.8.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +checksum = "48c6d47254ddb292771dce7697ae2be9619f8e369d01a9ccda15ef2ff50443fc" dependencies = [ "lexical-util", "static_assertions", @@ -2551,7 +2551,7 @@ dependencies = [ "num-complex", "parking_lot", "portable-atomic", - "pyo3-build-config", + "pyo3-build-config 0.20.3", "pyo3-ffi", "pyo3-macros", "unindent", @@ -2580,6 +2580,16 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "pyo3-build-config" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7879eb018ac754bba32cb0eec7526391c02c14a093121857ed09fbf1d1057d41" +dependencies = [ + "once_cell", + "target-lexicon", +] + [[package]] name = "pyo3-ffi" version = "0.20.3" @@ -2587,7 +2597,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" dependencies = [ "libc", - "pyo3-build-config", + "pyo3-build-config 0.20.3", ] [[package]] @@ -2621,7 +2631,7 @@ checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" dependencies = [ "heck 0.4.1", "proc-macro2", - "pyo3-build-config", + "pyo3-build-config 0.20.3", "quote", "syn 2.0.66", ] @@ -2674,7 +2684,7 @@ dependencies = [ [[package]] name = "qcs" -version = "0.23.2" +version = "0.24.1" dependencies = [ "assert2", "async-trait", @@ -2736,19 +2746,25 @@ dependencies = [ [[package]] name = "qcs-api-client-common" -version = "0.8.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "040552f233992abe94376304cf17dab2d79ff62d4a9ee986d75efe3d19337f57" +checksum = "1cf1692d12ab36478f43f1ef493a8b2445f7f5d17164f739d8b0fd57ad59e6e6" dependencies = [ "async-trait", "backoff", + "base64 0.22.1", "derive_builder 0.20.0", "figment", "futures", "home", "http", "jsonwebtoken", + "paste", + "pyo3", + "pyo3-asyncio", + "pyo3-build-config 0.22.1", "reqwest", + "rigetti-pyo3 0.3.6", "serde", "shellexpand", "thiserror", @@ -2762,9 +2778,9 @@ dependencies = [ [[package]] name = "qcs-api-client-grpc" -version = "0.8.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb755cd59b1b3ce99abe52ff6898ad74ca26463e94300c103cafaac4f345c4f3" +checksum = "b6224aeaaafb92d44439a398a03b042889edacbe23a115cfb1ff1e17c80c8bf2" dependencies = [ "backoff", "http", @@ -2795,9 +2811,9 @@ dependencies = [ [[package]] name = "qcs-api-client-openapi" -version = "0.9.4" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008d06c4051dd4b3e7d5b6c1f31457c68384f8f36b05b304de6059bbd81c6128" +checksum = "c5107bbd313d31d1eede8dec2bc9c69e0aa50ffc6207457bb4d8c3ab3cb32434" dependencies = [ "anyhow", "qcs-api-client-common", @@ -2815,7 +2831,7 @@ dependencies = [ [[package]] name = "qcs-sdk-python" -version = "0.19.3" +version = "0.20.1" dependencies = [ "async-trait", "numpy", @@ -2823,9 +2839,10 @@ dependencies = [ "opentelemetry 0.23.0", "opentelemetry_sdk 0.23.0", "paste", + "prost", "pyo3", "pyo3-asyncio", - "pyo3-build-config", + "pyo3-build-config 0.20.3", "pyo3-log", "pyo3-opentelemetry", "pyo3-tracing-subscriber", @@ -2835,7 +2852,7 @@ dependencies = [ "qcs-api-client-grpc", "qcs-api-client-openapi", "quil-rs", - "rigetti-pyo3", + "rigetti-pyo3 0.4.1", "serde_json", "thiserror", "tokio", @@ -2850,8 +2867,8 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quil-rs" -version = "0.27.1" -source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.11.1#ab5b976573b38f3ba2605f57482ccadb1f13bf30" +version = "0.28.1" +source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.12.1#a0f2776893d3ce33eb9f29449f3b4b0e9ed24174" dependencies = [ "approx", "indexmap 2.2.6", @@ -3099,6 +3116,19 @@ dependencies = [ "time", ] +[[package]] +name = "rigetti-pyo3" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f924032d36104a859f936762576a9e6fc0811b37a1f4a8144c0b9b25ee89607b" +dependencies = [ + "num-complex", + "num-traits", + "paste", + "pyo3", + "time", +] + [[package]] name = "ring" version = "0.16.20" diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix index b0d4808f9e0c3..854ed41a3437a 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/default.nix +++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -8,6 +8,7 @@ pytest-asyncio, pytestCheckHook, pythonOlder, + qcs-api-client-common, quil, rustPlatform, darwin, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "qcs-sdk-python"; - version = "0.19.3"; + version = "0.20.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,13 +27,13 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-sdk-rust"; rev = "python/v${version}"; - hash = "sha256-TyXUkuiYdz6Z6s96DD33QdEuI0ch4hRjUGWahEBpkX4="; + hash = "sha256-OuFEygZWfNnhRDLeEY10gGYD9EF5LkPd+K3Uu8X0hwY="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "quil-rs-0.27.1" = "sha256-w97kkdwRnVVfKNTIKypl3shFQJV5Rh/kF6jp7jCiyqw="; + "quil-rs-0.28.1" = "sha256-nyKLBL5Q51u2OTkpr9oKb0c5saWeW3wmZC3g7vxyeEQ="; }; }; @@ -43,13 +44,16 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - dependencies = [ quil ]; + dependencies = [ + qcs-api-client-common + quil + ]; optional-dependencies = { tracing-opentelemetry = [ opentelemetry-api ]; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration libiconv diff --git a/pkgs/development/python-modules/qdldl/default.nix b/pkgs/development/python-modules/qdldl/default.nix index 4491788552c76..c63b45d896113 100644 --- a/pkgs/development/python-modules/qdldl/default.nix +++ b/pkgs/development/python-modules/qdldl/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "qdldl"; - version = "0.1.7.post3"; + version = "0.1.7.post4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WbOqK6IkyvI3StJArXmmlbxHdjnGTjFkzvTyyZyHzx0="; + hash = "sha256-DBY7mvuSxLadRGOHsdQpUJRDiwQexOhRAnG2xP8fhv0="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 4410fcd51bdaa..a42bdab7c1abe 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.11.1"; + version = "1.11.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; rev = "refs/tags/v${version}"; - hash = "sha256-NIGmQMtGvm6zifYJIMFx+d9w9IZmQUAqieBo/3JmYbM="; + hash = "sha256-1tBlWwD2GaphwupWUWRYwYrqGV9cTfG4k1L9N5mub/Q="; }; build-system = [ poetry-core ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { # Tests require network access doCheck = false; - passthru.optional-dependencies = { + optional-dependencies = { fastembed = [ fastembed ]; }; diff --git a/pkgs/development/python-modules/qds-sdk/default.nix b/pkgs/development/python-modules/qds-sdk/default.nix deleted file mode 100644 index 34876b7aaa856..0000000000000 --- a/pkgs/development/python-modules/qds-sdk/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - boto, - inflection, - requests, - six, - urllib3, - mock, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "qds-sdk"; - version = "1.16.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "qubole"; - repo = "qds-sdk-py"; - rev = "refs/tags/V${version}"; - hash = "sha256-8aPIE2E3Fy2EiBM2FPRyjnJolIBdOzafI3Fvlod5hxU="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - boto - inflection - requests - six - urllib3 - ]; - - nativeCheckInputs = [ - pytestCheckHook - mock - ]; - - pythonImportsCheck = [ "qds_sdk" ]; - - meta = with lib; { - description = "Python module that provides the tools you need to authenticate with, and use the Qubole Data Service API"; - homepage = "https://github.com/qubole/qds-sdk-py"; - license = licenses.asl20; - maintainers = with maintainers; [ shahrukh330 ]; - mainProgram = "qds.py"; - }; -} diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index a5744586b1a52..a51ad99805b9e 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { [ "test_tensored_meas_cal_on_circuit" # Flaky test, occasionally returns result outside bounds ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_fitters" # Fails check that arrays are close. Might be due to aarch64 math issues. ]; diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 44ae18a933d08..eb433a22e8ef7 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { rustPlatform.cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 468099e7b59ee..af278cea4c09d 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -20,14 +20,14 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "4.3.3"; + version = "4.4.0"; pyproject = true; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; rev = "refs/tags/v${version}"; - hash = "sha256-AQHd3tBfPzISQXsXHQQyh59nmym5gt8Jfogd6gRG3EM="; + hash = "sha256-/yIFLxy2gjEFg/J9A5pcbrVmq4A3Tz2efEAntH0Twk8="; }; nativeBuildInputs = [ flit-core ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { # FIXME commented out solvers have not been packaged yet clarabel = [ clarabel ]; cvxopt = [ cvxopt ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { quadprog = [ quadprog ]; scs = [ scs ]; open_source_solvers = - with passthru.optional-dependencies; + with optional-dependencies; lib.flatten [ clarabel cvxopt @@ -68,7 +68,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ unittestCheckHook ] ++ passthru.optional-dependencies.open_source_solvers; + nativeCheckInputs = [ unittestCheckHook ] ++ optional-dependencies.open_source_solvers; meta = with lib; { changelog = "https://github.com/qpsolvers/qpsolvers/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index 2c7df77b33a10..e14d4ab416fcd 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -32,12 +32,12 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies.pil = [ pillow ]; + optional-dependencies.pil = [ pillow ]; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.pil; + ] ++ optional-dependencies.pil; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index bab2320b0d6ff..2ef0d3280f83d 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pythonPackages.setuptools ]; buildInputs = [ qtbase ]; - propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; + propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; dontWrapQtApps = true; @@ -47,7 +47,7 @@ buildPythonPackage rec { echo 'sip-include-dirs = [ "${pyqt5}/${python.sitePackages}/PyQt5/bindings"]' \ >> pyproject.toml '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace project.py \ --replace \ "if self.project.qsci_external_lib: diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index b8e1280ceb3d2..858785307a47b 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -1,30 +1,34 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies ipykernel, jupyter-core, jupyter-client, pygments, pyqt5, - pytestCheckHook, - pythonOlder, - pyzmq, qtpy, - setuptools, traitlets, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "qtconsole"; - version = "5.5.2"; + version = "5.6.0"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-a1+xEnSyl0Y3Bq+E3LvVySJzsfYZ5tJdCIdLCohRaYk="; + src = fetchFromGitHub { + owner = "jupyter"; + repo = "qtconsole"; + rev = "refs/tags/${version}"; + hash = "sha256-V82tGAmpvfGeUoewtJXXsBBXx2HNcV9/IMJxJg3bJL8="; }; build-system = [ setuptools ]; @@ -35,7 +39,6 @@ buildPythonPackage rec { jupyter-client pygments pyqt5 - pyzmq qtpy traitlets ]; @@ -47,11 +50,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "qtconsole" ]; - meta = with lib; { + meta = { description = "Jupyter Qt console"; mainProgram = "jupyter-qtconsole"; homepage = "https://qtconsole.readthedocs.io/"; - license = licenses.bsd3; - platforms = platforms.unix; + changelog = "https://qtconsole.readthedocs.io/en/stable/changelog.html#changes-in-jupyter-qt-console"; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/quantile-forest/default.nix b/pkgs/development/python-modules/quantile-forest/default.nix index 544171a28e572..78c90591e5958 100644 --- a/pkgs/development/python-modules/quantile-forest/default.nix +++ b/pkgs/development/python-modules/quantile-forest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "quantile-forest"; - version = "1.3.9"; + version = "1.3.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zillow"; repo = "quantile-forest"; rev = "refs/tags/v${version}"; - hash = "sha256-uvfY17ADyuLc3zx2Z2uEKOijqiuefiN2uSh0j+ZOz4w="; + hash = "sha256-0gdXjr+mRInZtvmgH1vRjLCkXZmTn1zWmD3E1ass9hQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 17a7b28d05030..991274fd267ad 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -1,7 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + fetchpatch2, numpy, pytestCheckHook, pythonOlder, @@ -12,21 +13,31 @@ buildPythonPackage rec { pname = "quantities"; version = "0.15.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-nqMeKg11F88k1UaxQUbe+SkmOZk6YWzKYbh173lrSys="; + src = fetchFromGitHub { + owner = "python-quantities"; + repo = "python-quantities"; + rev = "refs/tags/v${version}"; + hash = "sha256-N20xfzGtM0VnfkJtzMytNLySTkgVz2xf1nEJxlwBSCI="; }; - nativeBuildInputs = [ + patches = [ + (fetchpatch2 { + name = "prevent-arbitrary-code-eval.patch"; + url = "https://github.com/python-quantities/python-quantities/pull/236.patch"; + hash = "sha256-H1tOfXqNMIKY01m6o2PsfZG0CvnWNxW2qIWA5ce1lRk="; + }) + ]; + + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index ea68441599303..9663e8e1fdd13 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' ulimit -n 1024 ''; diff --git a/pkgs/development/python-modules/quil/default.nix b/pkgs/development/python-modules/quil/default.nix index 2aee70c5d34d7..98175f1cbbdad 100644 --- a/pkgs/development/python-modules/quil/default.nix +++ b/pkgs/development/python-modules/quil/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "quil"; - version = "0.11.2"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,13 +22,13 @@ buildPythonPackage rec { owner = "rigetti"; repo = "quil-rs"; rev = "quil-py/v${version}"; - hash = "sha256-c5ujyXIHKJ7OgRpL2HPlvDHycXmcHaMbBQ3gsLEWePI="; + hash = "sha256-OCQp8WKOxyZNMu2waeasSZ4E8VhFqDZcgGbDoMpKeHg="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-GT+IeMqpecCDWFIcs/lJT88XZUTlQL7PP+d3afhHU2s="; + hash = "sha256-EmSDjheLEyFr0w6XOvJYdRmGGlv2L/wh3qAN8Nn5lyg="; }; buildAndTestSubdir = "quil-py"; @@ -38,11 +38,16 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ numpy ]; - pythonImportsCheck = [ "numpy" ]; + pythonImportsCheck = [ + "quil.expression" + "quil.instructions" + "quil.program" + "quil.validation" + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 8cc5ccba6c306..12b6c1b9e9d99 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-rerunfailures - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # QuTiP tries to access the home directory to create an rc file for us. # We need to go to another directory to run the tests from there. @@ -68,7 +68,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "qutip" ]; - passthru.optional-dependencies = { + optional-dependencies = { graphics = [ matplotlib ]; ipython = [ ipython ]; semidefinite = [ diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index d248b962f0d3d..a1de5b4107c39 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.9.2"; + version = "1.9.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-BNWP2uAJcEOCE92QakNI7Ils0iXRN5PUA9cSVrhDmx4="; + hash = "sha256-Ah3kb+Hk1pMlQ8D1SMPAISbL2n6TDG0Ih9ezmW7oIRk="; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix index fd185ac7be4bd..e42e16f307c2e 100644 --- a/pkgs/development/python-modules/radian/default.nix +++ b/pkgs/development/python-modules/radian/default.nix @@ -6,6 +6,7 @@ pyte, pexpect, ptyprocess, + pythonOlder, jedi, git, lineedit, @@ -14,21 +15,22 @@ rchitect, R, rPackages, - pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "radian"; - version = "0.6.12"; - format = "setuptools"; + version = "0.6.13"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cojKbDNqcUay5RxvWszQ96eC4jVI4G7iRv/ZYWgidCQ="; + hash = "sha256-gz2VczAgVbvISzvY/v0GvZ/Erv6ipZwPU61r6OJ+3Fo="; }; postPatch = '' @@ -36,6 +38,11 @@ buildPythonPackage rec { --replace '"pytest-runner"' "" ''; + build-system = [ + setuptools + setuptools-scm + ]; + nativeBuildInputs = [ R # needed at setup time to detect R_HOME ]; diff --git a/pkgs/development/python-modules/radon/default.nix b/pkgs/development/python-modules/radon/default.nix index 5d494b4c2996b..007368986c829 100644 --- a/pkgs/development/python-modules/radon/default.nix +++ b/pkgs/development/python-modules/radon/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { colorama ]; - passthru.optional-dependencies = { + optional-dependencies = { toml = [ tomli ]; }; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 59c78777a6fed..36bf7fdfc6af3 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.9.6"; + version = "3.9.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-vO63Zkc2ltgfpAq81qRP5MjQ08GTkJhnfqwLIxP5eEI="; + hash = "sha256-hyjzY9ogroUa4nGSG8HOyr5FxifX9d7Hf8ezKq6zxVk="; }; postPatch = '' @@ -56,11 +56,11 @@ buildPythonPackage rec { '' export RAPIDFUZZ_BUILD_EXTENSION=1 '' - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB" ''; - passthru.optional-dependencies = { + optional-dependencies = { full = [ numpy ]; }; @@ -74,7 +74,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # segfaults "test_cdist" ]; diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index eef3e3b975ce8..5739ca88b3b03 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -115,7 +115,7 @@ buildPythonPackage { meta = { # This seems to be related to https://github.com/microsoft/onnxruntime/issues/10038 # Also some related issue: https://github.com/NixOS/nixpkgs/pull/319053#issuecomment-2167713362 - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/v${version}"; description = "Cross platform OCR Library based on OnnxRuntime"; homepage = "https://github.com/RapidAI/RapidOCR"; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index d7ab45fd4732d..40033924bfda5 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.3.10"; + version = "1.3.11"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "rasterio"; repo = "rasterio"; rev = "refs/tags/${version}"; - hash = "sha256-FidUaSpbTR8X1/Cqy/IwApkOOl2RRtPqYJaSISRPThI="; + hash = "sha256-Yh3n2oyARf7LAtJU8Oa3WWc+oscl7e2N7jpW0v1uTVk="; }; postPatch = '' @@ -49,9 +49,9 @@ buildPythonPackage rec { substituteInPlace rasterio/rio/calc.py \ --replace-fail "from distutils.version import LooseVersion" "" - # relax dependency on yet non-packaged, RC version of numpy + # relax numpy dependency substituteInPlace pyproject.toml \ - --replace-fail "numpy==2.0.0rc1" "numpy" + --replace-fail "numpy>=2.0.0,<3.0" "numpy" ''; nativeBuildInputs = [ @@ -73,7 +73,7 @@ buildPythonPackage rec { snuggs ]; - passthru.optional-dependencies = { + optional-dependencies = { ipython = [ ipython ]; plot = [ matplotlib ]; s3 = [ boto3 ]; @@ -99,13 +99,7 @@ buildPythonPackage rec { disabledTests = [ # flaky "test_outer_boundless_pixel_fidelity" - - # Failing with GDAL 3.9. - # Fixed in https://github.com/rasterio/rasterio/commit/24d0845e576158217f6541c3c81b163d873a994d - # Re-enable in next rasterio update. - "test_create_sidecar_mask" - "test_update_tags" - ] ++ lib.optionals stdenv.isDarwin [ "test_reproject_error_propagation" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reproject_error_propagation" ]; pythonImportsCheck = [ "rasterio" ]; diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix index 8e32579cb7378..bdfa8a21c883c 100644 --- a/pkgs/development/python-modules/ratarmount/default.nix +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -2,26 +2,43 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, fusepy, + indexed-gzip, + indexed-zstd, + libarchive-c, + python-xz, + pythonOlder, + rapidgzip, + rarfile, ratarmountcore, + setuptools, }: buildPythonPackage rec { pname = "ratarmount"; - version = "0.15.1"; - format = "setuptools"; + version = "0.15.2"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-hprXZGgE2fpg8Km3gWO60e7teUB4Age5skNPc4p+wIg="; + hash = "sha256-1JAj9vA/aZLDvZC7j5PD1OL9n4I0gag4Ezc0i68OQsw="; }; - propagatedBuildInputs = [ - ratarmountcore + pythonRelaxDeps = [ "python-xz" ]; + + build-system = [ setuptools ]; + + dependencies = [ fusepy + indexed-gzip + indexed-zstd + libarchive-c + python-xz + rapidgzip + rarfile + ratarmountcore ]; checkPhase = '' @@ -34,10 +51,10 @@ buildPythonPackage rec { meta = with lib; { description = "Mounts archives as read-only file systems by way of indexing"; - mainProgram = "ratarmount"; homepage = "https://github.com/mxmlnkn/ratarmount"; + changelog = "https://github.com/mxmlnkn/ratarmount/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with lib.maintainers; [ mxmlnkn ]; - platforms = platforms.all; + mainProgram = "ratarmount"; }; } diff --git a/pkgs/development/python-modules/ratarmountcore/default.nix b/pkgs/development/python-modules/ratarmountcore/default.nix index eb97b7a4a64e1..b966e0a319be7 100644 --- a/pkgs/development/python-modules/ratarmountcore/default.nix +++ b/pkgs/development/python-modules/ratarmountcore/default.nix @@ -2,53 +2,61 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - pytestCheckHook, - indexed-bzip2, indexed-gzip, indexed-zstd, + libarchive-c, + pytestCheckHook, python-xz, - setuptools, + pythonOlder, rapidgzip, rarfile, + setuptools, zstandard, # Python bindings zstd, # System tool }: buildPythonPackage rec { pname = "ratarmountcore"; - version = "0.6.3"; + version = "0.7.2"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "mxmlnkn"; repo = "ratarmount"; rev = "core-v${version}"; - hash = "sha256-2jG066BUkhyHRqRyFAucQRJrjXQNw2ccCxERKkltO3Y="; + hash = "sha256-2LPGKdofx2ID8BU0dZhGiZ3tUkd+niEVGvTSBFX4InU="; fetchSubmodules = true; }; sourceRoot = "${src.name}/core"; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ - indexed-gzip - indexed-bzip2 - indexed-zstd - python-xz - rapidgzip - rarfile - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ "ratarmountcore" ]; + optional-dependencies = { + full = [ + indexed-gzip + indexed-zstd + python-xz + rapidgzip + rarfile + ]; + _7z = [ libarchive-c ]; + bzip2 = [ rapidgzip ]; + gzip = [ indexed-gzip ]; + rar = [ rarfile ]; + xz = [ python-xz ]; + zstd = [ indexed-zstd ]; + }; nativeCheckInputs = [ pytestCheckHook zstandard zstd - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + pythonImportsCheck = [ "ratarmountcore" ]; disabledTestPaths = [ # Disable this test because for arcane reasons running pytest with nix-build uses 10-100x @@ -60,9 +68,17 @@ buildPythonPackage rec { "tests/test_BlockParallelReaders.py" ]; + disabledTests = [ + # Tests with issues + "test_file_versions" + "test_stream_compressed" + "test_chimera_file" + ]; + meta = with lib; { description = "Library for accessing archives by way of indexing"; homepage = "https://github.com/mxmlnkn/ratarmount/tree/master/core"; + changelog = "https://github.com/mxmlnkn/ratarmount/blob/core-v${version}/core/CHANGELOG.md"; license = licenses.mit; maintainers = with lib.maintainers; [ mxmlnkn ]; }; diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 88727591db838..ac4f03faaa78e 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "raven" ]; - passthru.optional-dependencies = { + optional-dependencies = { flask = [ blinker flask diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index ca32a86cf85b4..4ce40625e3c30 100644 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,11 +1,11 @@ { cp310 = { - hash = "sha256-dnFaktwQ1/CQvftJD25tSXzI0hLaeBdNDeUWunAhzuQ="; + hash = "sha256-KZMkQeaKt9rTWydsdjZwv0Lr9yHN3E9N6CAL2SrAXFg="; }; cp311 = { - hash = "sha256-tgjWhlYAy9NRaIKhm7O3E7bxYbFQzh7jHZIITQlAi5o="; + hash = "sha256-tCAnnKFPAswn/Fkv8fKNqaoIuWIxa/Zd3zcNuHcILpE="; }; cp312 = { - hash = "sha256-rqrFzgZXKxWUfJlbbWWmyHBqGyM27r7VuY6Qc/6Uq+A="; + hash = "sha256-AmjHvC6Ltu+buJaSmd61hXv2cr/LWdqV23SVqKUC+Lo="; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index ba2d8afe9be97..6a9532f953d52 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -56,7 +56,7 @@ let pname = "ray"; - version = "2.34.0"; + version = "2.37.0"; in buildPythonPackage rec { inherit pname version; @@ -162,6 +162,7 @@ buildPythonPackage rec { changelog = "https://github.com/ray-project/ray/releases/tag/ray-${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ billhuang ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/python-modules/raylib-python-cffi/default.nix b/pkgs/development/python-modules/raylib-python-cffi/default.nix index f1d46c1822d14..eaaa13c96cb33 100644 --- a/pkgs/development/python-modules/raylib-python-cffi/default.nix +++ b/pkgs/development/python-modules/raylib-python-cffi/default.nix @@ -1,4 +1,6 @@ { + stdenv, + gcc, buildPythonPackage, fetchFromGitHub, setuptools, @@ -9,19 +11,29 @@ raylib, physac, raygui, - lib + darwin, + lib, }: +let + inherit (darwin.apple_sdk.frameworks) + OpenGL + Cocoa + IOKit + CoreFoundation + CoreVideo + ; +in buildPythonPackage rec { pname = "raylib-python-cffi"; - version = "5.0.0.2"; + version = "5.0.0.3"; pyproject = true; src = fetchFromGitHub { owner = "electronstudio"; repo = "raylib-python-cffi"; rev = "refs/tags/v${version}"; - hash = "sha256-DlnZRJZ0ZnkLii09grA/lGsJHPUYrbaJ55BVWJ8JzfM="; + hash = "sha256-R/w39zYkoOF5JqHDyqVIdON9yXFo2PeosyEQZOd4aYo="; }; build-system = [ setuptools ]; @@ -31,22 +43,36 @@ buildPythonPackage rec { # This patch fixes to the builder script function to call pkg-config # using the library name rather than searching only through raylib ./fix_pyray_builder.patch + + # use get_lib_flags() instead of linking to libraylib.a directly + ./fix_macos_raylib.patch ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + gcc + ]; # tests require a graphic environment doCheck = false; pythonImportsCheck = [ "pyray" ]; - buildInputs = [ - glfw - libffi - raylib - physac - raygui - ]; + buildInputs = + [ + glfw + libffi + raylib + physac + raygui + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + OpenGL + Cocoa + IOKit + CoreFoundation + CoreVideo + ]; meta = { description = "Python CFFI bindings for Raylib"; diff --git a/pkgs/development/python-modules/raylib-python-cffi/fix_macos_raylib.patch b/pkgs/development/python-modules/raylib-python-cffi/fix_macos_raylib.patch new file mode 100644 index 0000000000000..be2f41a3720cb --- /dev/null +++ b/pkgs/development/python-modules/raylib-python-cffi/fix_macos_raylib.patch @@ -0,0 +1,11 @@ +--- a/raylib/build.py ++++ b/raylib/build.py +@@ -158,7 +158,7 @@ def build_unix(): + + if platform.system() == "Darwin": + print("BUILDING FOR MAC") +- extra_link_args = [get_the_lib_path() + '/libraylib.a', '-framework', 'OpenGL', '-framework', 'Cocoa', ++ extra_link_args = get_lib_flags() + ['-framework', 'OpenGL', '-framework', 'Cocoa', + '-framework', 'IOKit', '-framework', 'CoreFoundation', '-framework', + 'CoreVideo'] + libraries = [] diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix index dc2f22e97194e..785b0218d9f28 100644 --- a/pkgs/development/python-modules/rchitect/default.nix +++ b/pkgs/development/python-modules/rchitect/default.nix @@ -3,27 +3,29 @@ buildPythonPackage, fetchFromGitHub, cffi, + packaging, pytestCheckHook, pytest-mock, pythonOlder, R, rPackages, + setuptools, + setuptools-scm, six, - packaging, }: buildPythonPackage rec { pname = "rchitect"; - version = "0.4.6"; - format = "setuptools"; + version = "0.4.7"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IVyYzf433m03RRfL5SmUOdaXFy0NHf/QuAdtUeUjIz0="; + hash = "sha256-M7OWDo3mEEOYtjIpzPIpzPMBtv2TZJKJkSfHczZYS8Y="; }; postPatch = '' @@ -31,6 +33,11 @@ buildPythonPackage rec { --replace '"pytest-runner"' "" ''; + build-system = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ cffi six diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index b0f2b4c7cd2a2..f6a5ded15e74f 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pyparsing ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { html = [ html5lib ]; networkx = [ networkx ]; }; @@ -63,7 +63,7 @@ buildPythonPackage rec { # Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted. pytest7CheckHook setuptools - ] ++ passthru.optional-dependencies.networkx ++ passthru.optional-dependencies.html; + ] ++ optional-dependencies.networkx ++ optional-dependencies.html; pytestFlagsArray = [ # requires network access @@ -82,7 +82,7 @@ buildPythonPackage rec { "test_guess_format_for_parse" "rdflib.extras.infixowl" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Require loopback network access "TestGraphHTTP" ]; diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 44096b6910c0d..248f212f0abeb 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -100,10 +100,10 @@ buildPythonPackage rec { preConfigure = '' # Since we can't expand with bash in cmakeFlags - cmakeFlags="$cmakeFlags -DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')" - cmakeFlags="$cmakeFlags -DFREESASA_DIR=$PWD/External/FreeSASA/freesasa" - cmakeFlags="$cmakeFlags -DFREESASA_SRC_DIR=$PWD/External/FreeSASA/freesasa" - cmakeFlags="$cmakeFlags -DAVALONTOOLS_DIR=$PWD/External/AvalonTools/avalon" + appendToVar cmakeFlags "-DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')" + appendToVar cmakeFlags "-DFREESASA_DIR=$PWD/External/FreeSASA/freesasa" + appendToVar cmakeFlags "-DFREESASA_SRC_DIR=$PWD/External/FreeSASA/freesasa" + appendToVar cmakeFlags "-DAVALONTOOLS_DIR=$PWD/External/AvalonTools/avalon" ''; cmakeFlags = [ diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix index e676918cb6988..7c75c32be269e 100644 --- a/pkgs/development/python-modules/readability-lxml/default.nix +++ b/pkgs/development/python-modules/readability-lxml/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { timeout-decorator ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Test is broken on darwin. Fix in master from https://github.com/buriy/python-readability/pull/178 "test_many_repeated_spaces" ]; diff --git a/pkgs/development/python-modules/reconplogger/default.nix b/pkgs/development/python-modules/reconplogger/default.nix index 6b1800c7052bf..0881bc5c3c052 100644 --- a/pkgs/development/python-modules/reconplogger/default.nix +++ b/pkgs/development/python-modules/reconplogger/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ flask requests diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index f5a266700b978..3be853d2fc5e4 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch2, setuptools, icalendar, python-dateutil, @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "3.2.0"; + version = "3.3.0"; disabled = pythonOlder "3.8"; @@ -27,18 +26,9 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-qglApMoRtMqg03HBO00k9anRquA5X9ew919QUMWIpjo="; + hash = "sha256-1Ggxi61epge6Rxc/vJ7OuuNjjeaQYReEPeOZV8DLghk="; }; - patches = [ - # https://github.com/niccokunzmann/python-recurring-ical-events/pull/169 - (fetchpatch2 { - name = "make-tests-compatible-with-icalendar-v5.patch"; - url = "https://github.com/niccokunzmann/python-recurring-ical-events/commit/0bb4b4586b55978a1d154cd7abbc42eaf1cefb92.patch"; - hash = "sha256-1tG/U0ELMIwS50eolXNou0aFQBZGNjcc2Zcz1gd8rd4="; - }) - ]; - build-system = [ setuptools ]; pythonRelaxDeps = [ "icalendar" ]; @@ -57,6 +47,12 @@ buildPythonPackage rec { pygments ]; + disabledTests = lib.optionals (lib.versionOlder icalendar.version "6") [ + # ModuleNotFoundError: No module named 'icalendar.timezone' + "test_can_import_zoneinfo" + "test_documentation_file" + ]; + pythonImportsCheck = [ "recurring_ical_events" ]; meta = { diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix index 98cdc98457b88..c3f6455c725dd 100644 --- a/pkgs/development/python-modules/redis-om/default.nix +++ b/pkgs/development/python-modules/redis-om/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { description = "Object mapping, and more, for Redis and Python"; mainProgram = "migrate"; homepage = "https://github.com/redis/redis-om-python"; - changelog = "https://github.com/redis/redis-om-python/releases/tag/${src.rev}"; + changelog = "https://github.com/redis/redis-om-python/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index a55e5b293bb46..8cee5fa57311a 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { hiredis = [ hiredis ]; ocsp = [ cryptography diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix new file mode 100644 index 0000000000000..49b893a9b2bbc --- /dev/null +++ b/pkgs/development/python-modules/reflex-chakra/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "reflex-chakra"; + version = "0.6.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "reflex-dev"; + repo = "reflex-chakra"; + rev = "refs/tags/v${version}"; + hash = "sha256-nmZ41V/1TbslAQIkJQLgdLfWS2qSVrAnVqbv8sajL5c="; + }; + + pythonRemoveDeps = [ + # Circular dependency + "reflex" + ]; + + build-system = [ poetry-core ]; + + # pythonImportsCheck = [ "reflex_chakra" ]; + + doCheck = false; + + meta = with lib; { + description = "Chakra Implementation in Reflex"; + homepage = "https://github.com/reflex-dev/reflex-chakra"; + changelog = "https://github.com/reflex-dev/reflex-chakra/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 75b5198e0663e..572a4417ccad3 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -23,11 +23,14 @@ pydantic, pytest-asyncio, pytest-mock, + playwright, pytestCheckHook, python-engineio, python-multipart, python-socketio, + pythonOlder, redis, + reflex-chakra, reflex-hosting-cli, rich, sqlmodel, @@ -44,17 +47,23 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.5.9"; + version = "0.6.1"; pyproject = true; + disabled = pythonOlder "3.10"; + src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex"; - rev = "v${version}"; - hash = "sha256-QeEggHPilCLjUQ76AYDkqdf1iWLwCyAYTnf17RdhDq0="; + rev = "refs/tags/v${version}"; + hash = "sha256-p7o7e/OBX8P5QKsHNInKKQO1jklTr61SXuGk+ceakJU="; }; - pythonRelaxDeps = [ "fastapi" ]; + pythonRelaxDeps = [ + "fastapi" + "gunicorn" + ]; + pythonRemoveDeps = [ "setuptools" "build" @@ -80,6 +89,7 @@ buildPythonPackage rec { python-multipart python-socketio redis + reflex-chakra reflex-hosting-cli rich sqlmodel @@ -97,6 +107,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-mock + playwright attrs numpy plotly @@ -105,11 +116,16 @@ buildPythonPackage rec { unzip ]; + preCheck = '' + export HOME="$(mktemp -d)" + ''; + disabledTests = [ - # touches network + # Tests touch network "test_find_and_check_urls" "test_event_actions" "test_upload_file" + "test_node_version" # /proc is too funky in nix sandbox "test_get_cpu_info" # broken @@ -118,9 +134,10 @@ buildPythonPackage rec { "test_preprocess" # KeyError: 'reflex___state____state' "test_send" # AssertionError: Expected 'post' to have been called once. Called 0 times. ]; + disabledTestPaths = [ "benchmarks/" - "integration/" + "tests/integration/" ]; pythonImportsCheck = [ "reflex" ]; @@ -128,7 +145,7 @@ buildPythonPackage rec { meta = with lib; { description = "Web apps in pure Python"; homepage = "https://github.com/reflex-dev/reflex"; - changelog = "https://github.com/reflex-dev/reflex/releases/tag/${src.rev}"; + changelog = "https://github.com/reflex-dev/reflex/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ pbsds ]; mainProgram = "reflex"; diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 458633c1a36a2..1a45c719e061d 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { lxml ]; - passthru.optional-dependencies = { + optional-dependencies = { chart = [ # pycha pyyaml @@ -36,7 +36,7 @@ buildPythonPackage rec { fodt = [ python-magic ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.fodt; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.fodt; pythonImportsCheck = [ "relatorio" ]; diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index ec46ea720f4d9..5a932562f5734 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.2.6"; + version = "0.2.7"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "hacf-fr"; repo = "renault-api"; rev = "refs/tags/v${version}"; - hash = "sha256-opxEQIpZkaSWglPh4gwLJIi89B/ooHlwc9nKZRIS/j8="; + hash = "sha256-tke2bE+djV1N70meMOytYmbPmYDN8fU+Da81Mf6nNAI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 4b63eb5dd7593..d3ffb497799b0 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.8"; + version = "0.9.11"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-3rwL47mXVzWBL4REE1Dchg8GQLWJn+bzoZnmXHgKX40="; + hash = "sha256-xIN6ioX02YgzY3sh3l7rFT6UQCMnzlrX/CJj483G6ig="; }; build-system = [ setuptools ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { description = "Module to interact with the Reolink IP camera API"; homepage = "https://github.com/starkillerOG/reolink_aio"; changelog = "https://github.com/starkillerOG/reolink_aio/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/reportengine/default.nix b/pkgs/development/python-modules/reportengine/default.nix deleted file mode 100644 index ec88a805dd736..0000000000000 --- a/pkgs/development/python-modules/reportengine/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - flit, - jinja2, - ruamel-yaml, - matplotlib, - pandas, - pandoc, - pygments, - blessings, - curio, - hypothesis, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "reportengine"; - version = "0.31"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-jrt+ml8o1PUidV1bY0hCyNgcPaVTBloW574/i5Pl7iE="; - }; - - nativeBuildInputs = [ flit ]; - - propagatedBuildInputs = [ - jinja2 - ruamel-yaml - matplotlib - pandas - pygments - blessings - curio - ]; - - nativeCheckInputs = [ - hypothesis - pandoc - pytestCheckHook - ]; - - pythonImportsCheck = [ "reportengine" ]; - - meta = with lib; { - description = "Framework for declarative data analysis"; - homepage = "https://github.com/NNPDF/reportengine/"; - license = with licenses; [ gpl2Only ]; - maintainers = with maintainers; [ veprbl ]; - # Incompatibility with ruamel >= 0.18 - # https://github.com/NNPDF/reportengine/issues/60 - broken = versionAtLeast ruamel-yaml.version "0.18"; - }; -} diff --git a/pkgs/development/python-modules/reportlab-qrcode/default.nix b/pkgs/development/python-modules/reportlab-qrcode/default.nix index b540fd219caf7..67d69ef8cf0ff 100644 --- a/pkgs/development/python-modules/reportlab-qrcode/default.nix +++ b/pkgs/development/python-modules/reportlab-qrcode/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { reportlab ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ pillow pytest diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index c1c8473c26580..aad655cc13e77 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.22"; + version = "0.23"; pyproject = true; disabled = pythonOlder "3.9"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-OAHhpVQIAT3+f/+Oo2MNcS+xP7KB/LVvXLpOyY1rumM="; + hash = "sha256-IZjPdfg6q5uWEpvQE3djekvChcB7HWbbPqAv/0tu6fM="; }; pythonRelaxDeps = true; @@ -69,14 +69,14 @@ buildPythonPackage rec { xmltodict ]; - passthru.optional-dependencies = { + optional-dependencies = { ghostwriter = [ gql ] ++ gql.optional-dependencies.aiohttp; translate = [ deepl ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 3df15dd5ca4e1..aa8b918ca8c1e 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { url-normalize ]; - passthru.optional-dependencies = { + optional-dependencies = { dynamodb = [ boto3 botocore @@ -79,7 +79,7 @@ buildPythonPackage rec { tenacity time-machine timeout-decorator - ] ++ passthru.optional-dependencies.json ++ passthru.optional-dependencies.security; + ] ++ optional-dependencies.json ++ optional-dependencies.security; preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/requests-credssp/default.nix b/pkgs/development/python-modules/requests-credssp/default.nix index f6be7b9908f28..428b4ac187771 100644 --- a/pkgs/development/python-modules/requests-credssp/default.nix +++ b/pkgs/development/python-modules/requests-credssp/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { kerberos = pyspnego.optional-dependencies.kerberos; }; diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index ffa706fcd58ba..70a5eebacdb5d 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyspnego ] # Avoid broken Python krb5 package on Darwin - ++ lib.optionals (!stdenv.isDarwin) pyspnego.optional-dependencies.kerberos; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) pyspnego.optional-dependencies.kerberos; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index c8ec3c490ecf6..6ffe869c0a6a7 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -72,13 +72,13 @@ buildPythonPackage rec { "TestRequests" "TestTimeout" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fatal Python error: Aborted "test_basic_response" "test_text_response" ]; - disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fatal Python error: Aborted "tests/test_lowlevel.py" ]; diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index 4c8ac5c3933f1..13b7226782ba9 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -14,19 +14,26 @@ pytestCheckHook, python, libiconv, + semver, + opencv4, }: buildPythonPackage { pname = "rerun-sdk"; - inherit (rerun) version; pyproject = true; - inherit (rerun) src; - inherit (rerun) cargoDeps; + inherit (rerun) + src + version + cargoDeps + cargoPatches + patches + ; nativeBuildInputs = [ rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook + rerun ]; buildInputs = @@ -44,6 +51,8 @@ buildPythonPackage { pillow pyarrow typing-extensions + semver + opencv4 ]; buildAndTestSubdir = "rerun_py"; @@ -66,7 +75,7 @@ buildPythonPackage { ]; inherit (rerun) addDlopenRunpaths addDlopenRunpathsPhase; - postPhases = lib.optionals stdenv.isLinux [ "addDlopenRunpathsPhase" ]; + postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ]; disabledTestPaths = [ # "fixture 'benchmark' not found" diff --git a/pkgs/development/python-modules/restfly/default.nix b/pkgs/development/python-modules/restfly/default.nix index e7cb1dcbf694d..3cdb15c0044de 100644 --- a/pkgs/development/python-modules/restfly/default.nix +++ b/pkgs/development/python-modules/restfly/default.nix @@ -3,36 +3,43 @@ arrow, buildPythonPackage, fetchFromGitHub, + pytest-cov-stub, pytest-datafiles, pytest-vcr, pytestCheckHook, python-box, pythonOlder, - responses, requests, + responses, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "restfly"; - version = "1.4.7"; - format = "setuptools"; + version = "1.5.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "stevemcgrath"; - repo = pname; - rev = version; - hash = "sha256-PPXJHatJKve9fIjveVYRnTSIDHFmnSDWTnkgO91twJs="; + repo = "restfly"; + rev = "refs/tags/${version}"; + hash = "sha256-Zdn/hUvAZ9TaAWyDpNiEiA9mYDbWmiXBUa+IV/g8n2M="; }; - propagatedBuildInputs = [ - requests + build-system = [ setuptools ]; + + dependencies = [ arrow python-box + requests + typing-extensions ]; nativeCheckInputs = [ + pytest-cov-stub pytest-datafiles pytest-vcr pytestCheckHook @@ -49,7 +56,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python RESTfly API Library Framework"; homepage = "https://github.com/stevemcgrath/restfly"; - license = with licenses; [ mit ]; + changelog = "https://github.com/librestfly/restfly/blob/${version}/CHANGELOG.md"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index daba92a14a6c6..2d85f85eb80b9 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "restrictedpython"; - version = "7.2"; + version = "7.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "RestrictedPython"; inherit version; - hash = "sha256-TR0w9wmmYhynxCNvCLZ7cyplHICZFF8TcHjH3UvtPSE="; + hash = "sha256-iIgwTHhY/c/YbFC1hWF5c3W6QDGdK2/7XSSwi2otzWE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rfc8785/default.nix b/pkgs/development/python-modules/rfc8785/default.nix index c3505ebc460e4..e4eb48964d084 100644 --- a/pkgs/development/python-modules/rfc8785/default.nix +++ b/pkgs/development/python-modules/rfc8785/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "rfc8785"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "trailofbits"; repo = "rfc8785.py"; rev = "refs/tags/v${version}"; - hash = "sha256-hMH//DpxgNoNLZJ8XL8SikcTfj0w0FvlBMfnPCkqzZ4="; + hash = "sha256-0Gze3voFXEhf13DuTuBWDbYPmqHXs0FSRn2NprFWoB8="; }; build-system = [ diff --git a/pkgs/development/python-modules/rich-pixels/default.nix b/pkgs/development/python-modules/rich-pixels/default.nix index 62ce70c52576a..a5b94f5a9504e 100644 --- a/pkgs/development/python-modules/rich-pixels/default.nix +++ b/pkgs/development/python-modules/rich-pixels/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rich-compatible library for writing pixel images and ASCII art to the terminal"; homepage = "https://github.com/darrenburns/rich-pixels"; - changelog = "https://github.com/darrenburns/rich-pixels/releases/tag/${src.rev}"; + changelog = "https://github.com/darrenburns/rich-pixels/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index e32427b7b1e43..c9c29a1287be7 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pygments ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { jupyter = [ ipywidgets ]; }; diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index 7491f3fa5e51e..b417ea9269c97 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -1,57 +1,62 @@ { lib, + aiofiles, + aiohttp, + aioresponses, asyncclick, buildPythonPackage, fetchPypi, firebase-messaging, + freezegun, + hatchling, oauthlib, - poetry-core, pytest-asyncio, + pytest-freezer, pytest-mock, pytest-socket, pytestCheckHook, pythonOlder, pytz, - requests, - requests-mock, - requests-oauthlib, + typing-extensions, + websockets, }: buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.8.12"; + version = "0.9.6"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-CcnGfiJuv3hzez/G/Nu4OyruPL+bbSAtMAfGruqyPUU="; + hash = "sha256-pSHsQ2bJ0zNk6eJfDERVFqZM/IWorL8HFFjnwnhaHhY="; }; pythonRelaxDeps = [ "requests-oauthlib" ]; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ + aiofiles + aiohttp asyncclick + firebase-messaging oauthlib pytz - requests - requests-oauthlib + typing-extensions + websockets ]; - passthru.optional-dependencies = { - listen = [ firebase-messaging ]; - }; - nativeCheckInputs = [ + aioresponses + freezegun pytest-asyncio + pytest-freezer pytest-mock pytest-socket pytestCheckHook - requests-mock ]; pythonImportsCheck = [ "ring_doorbell" ]; @@ -59,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to communicate with Ring Door Bell"; homepage = "https://github.com/tchellomello/python-ring-doorbell"; - changelog = "https://github.com/tchellomello/python-ring-doorbell/releases/tag/${version}"; + changelog = "https://github.com/tchellomello/python-ring-doorbell/blob/${version}/CHANGELOG.md"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ graham33 ]; mainProgram = "ring-doorbell"; diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix index 008fb69e8aa76..88e126d4d5ccf 100644 --- a/pkgs/development/python-modules/rio-tiler/default.nix +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -23,25 +23,17 @@ buildPythonPackage rec { pname = "rio-tiler"; - version = "6.6.1"; + version = "6.7.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "cogeotiff"; repo = "rio-tiler"; - rev = version; - hash = "sha256-MR6kyoGM3uXt6JiIEfGcsmTmxqlLxUF9Wn+CFuK5LtQ="; + rev = "refs/tags/${version}"; + hash = "sha256-i70Bh7RHPgLLaqBo9vHRrJylsNE3Ly3xJq9j12Ch58E="; }; - patches = [ - # fix xarray tests, remove on next release - (fetchpatch { - url = "https://github.com/cogeotiff/rio-tiler/commit/7a36ed58b649d2f4d644f280b54851ecb7ffa4e9.patch"; - hash = "sha256-QlX5ZKpjSpXevi76gx39dXok0aClApkLU0cAVpCuYYs="; - }) - ]; - build-system = [ hatchling ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix index c6d36a7b8849e..014f651e18c39 100644 --- a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytz ]; - passthru.optional-dependencies = { + optional-dependencies = { fast = [ ujson ]; }; diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index fee5c590de512..49b38e2e3426b 100644 --- a/pkgs/development/python-modules/rising/default.nix +++ b/pkgs/development/python-modules/rising/default.nix @@ -1,46 +1,60 @@ { - stdenv, lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, - pytestCheckHook, - dill, + + # build-system + versioneer, + + # dependencies lightning-utilities, numpy, torch, threadpoolctl, tqdm, + + # tests + dill, + pytestCheckHook, + + stdenv, }: buildPythonPackage rec { pname = "rising"; version = "0.3.0"; - format = "setuptools"; - disabled = pythonOlder "3.8"; + pyproject = true; src = fetchFromGitHub { owner = "PhoenixDL"; - repo = pname; + repo = "rising"; rev = "refs/tags/v${version}"; hash = "sha256-sBzVTst5Tp2oZZ+Xsg3M7uAMbucL6idlpYwHvib3EaY="; }; - pythonRelaxDeps = [ "lightning-utilities" ]; - propagatedBuildInputs = [ + # Remove vendorized versioneer (incompatible with python 3.12) + postPatch = '' + rm versioneer.py + ''; + + build-system = [ versioneer ]; + + dependencies = [ lightning-utilities numpy torch threadpoolctl tqdm ]; + nativeCheckInputs = [ dill pytestCheckHook ]; - disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + + disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly: "test_progressive_resize_integration" ]; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index bc7f88d5dc59e..32c195d8bc15f 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -2,16 +2,18 @@ lib, buildPythonPackage, cryptography, + esptool, fetchFromGitHub, netifaces, pyserial, pythonOlder, + replaceVars, setuptools, }: buildPythonPackage rec { pname = "rns"; - version = "0.7.5"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,9 +22,15 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-TWaDRJQ695kjoKjWQeAO+uxSZGgQiHoWYIsS+XnYVOQ="; + hash = "sha256-S0IqMlNoOMzA+Dei1D111Jcj41jYNzzUjpTxUWlN3s0="; }; + patches = [ + (replaceVars ./unvendor-esptool.patch { + esptool = lib.getExe esptool; + }) + ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/rns/unvendor-esptool.patch b/pkgs/development/python-modules/rns/unvendor-esptool.patch new file mode 100644 index 0000000000000..ed05812ddd5ae --- /dev/null +++ b/pkgs/development/python-modules/rns/unvendor-esptool.patch @@ -0,0 +1,263 @@ +diff --git a/RNS/Utilities/rnodeconf.py b/RNS/Utilities/rnodeconf.py +index 566df60..8f6201d 100755 +--- a/RNS/Utilities/rnodeconf.py ++++ b/RNS/Utilities/rnodeconf.py +@@ -1453,18 +1453,17 @@ def main(): + print("\nReady to extract firmware images from the RNode") + print("Press enter to start the extraction process") + input() +- extract_recovery_esptool() + + hash_f = open(EXT_DIR+"/extracted_rnode_firmware.version", "wb") + hash_f.write(v_str.encode("utf-8")) + hash_f.close() + + extraction_parts = [ +- ("bootloader", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x1000 0x4650 \""+EXT_DIR+"/extracted_rnode_firmware.bootloader\""), +- ("partition table", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x8000 0xC00 \""+EXT_DIR+"/extracted_rnode_firmware.partitions\""), +- ("app boot", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0xe000 0x2000 \""+EXT_DIR+"/extracted_rnode_firmware.boot_app0\""), +- ("application image", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x10000 0x200000 \""+EXT_DIR+"/extracted_rnode_firmware.bin\""), +- ("console image", "python \""+CNF_DIR+"/recovery_esptool.py\" --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x210000 0x1F0000 \""+EXT_DIR+"/extracted_console_image.bin\""), ++ ("bootloader", "@esptool@ --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x1000 0x4650 \""+EXT_DIR+"/extracted_rnode_firmware.bootloader\""), ++ ("partition table", "@esptool@ --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x8000 0xC00 \""+EXT_DIR+"/extracted_rnode_firmware.partitions\""), ++ ("app boot", "@esptool@ --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0xe000 0x2000 \""+EXT_DIR+"/extracted_rnode_firmware.boot_app0\""), ++ ("application image", "@esptool@ --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x10000 0x200000 \""+EXT_DIR+"/extracted_rnode_firmware.bin\""), ++ ("console image", "@esptool@ --chip esp32 --port "+port_path+" --baud "+args.baud_flash+" --before default_reset --after hard_reset read_flash 0x210000 0x1F0000 \""+EXT_DIR+"/extracted_console_image.bin\""), + ] + import subprocess, shlex + for part, command in extraction_parts: +@@ -2290,25 +2289,12 @@ def main(): + graceful_exit() + elif platform == ROM.PLATFORM_ESP32: + numeric_version = float(selected_version) +- flasher_dir = UPD_DIR+"/"+selected_version +- flasher = flasher_dir+"/esptool.py" +- if not os.path.isfile(flasher): +- if os.path.isfile(CNF_DIR+"/recovery_esptool.py"): +- import shutil +- if not os.path.isdir(flasher_dir): +- os.makedirs(flasher_dir) +- shutil.copy(CNF_DIR+"/recovery_esptool.py", flasher) +- RNS.log("No flasher present, using recovery flasher to write firmware to device") +- +- if os.path.isfile(flasher): +- import stat +- os.chmod(flasher, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP) + +- if which(flasher) is not None: ++ if True: + if fw_filename == "rnode_firmware_tbeam.zip": + if numeric_version >= 1.55: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2326,7 +2312,7 @@ def main(): + ] + else: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2344,7 +2330,7 @@ def main(): + elif fw_filename == "rnode_firmware_tbeam_sx1262.zip": + if numeric_version >= 1.55: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2362,7 +2348,7 @@ def main(): + ] + else: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2380,7 +2366,7 @@ def main(): + elif fw_filename == "rnode_firmware_lora32v10.zip": + if numeric_version >= 1.59: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2398,7 +2384,7 @@ def main(): + ] + else: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2416,7 +2402,7 @@ def main(): + elif fw_filename == "rnode_firmware_lora32v20.zip": + if numeric_version >= 1.55: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2434,7 +2420,7 @@ def main(): + ] + else: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2452,7 +2438,7 @@ def main(): + elif fw_filename == "rnode_firmware_lora32v21.zip": + if numeric_version >= 1.55: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2470,7 +2456,7 @@ def main(): + ] + else: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2487,7 +2473,7 @@ def main(): + ] + elif fw_filename == "rnode_firmware_lora32v21_tcxo.zip": + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2506,7 +2492,7 @@ def main(): + elif fw_filename == "rnode_firmware_heltec32v2.zip": + if numeric_version >= 1.55: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2524,7 +2510,7 @@ def main(): + ] + else: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2541,7 +2527,7 @@ def main(): + ] + elif fw_filename == "rnode_firmware_heltec32v3.zip": + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32-s3", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2559,7 +2545,7 @@ def main(): + elif fw_filename == "rnode_firmware_featheresp32.zip": + if numeric_version >= 1.55: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2577,7 +2563,7 @@ def main(): + ] + else: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2595,7 +2581,7 @@ def main(): + elif fw_filename == "rnode_firmware_esp32_generic.zip": + if numeric_version >= 1.55: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2613,7 +2599,7 @@ def main(): + ] + else: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2631,7 +2617,7 @@ def main(): + elif fw_filename == "rnode_firmware_ng20.zip": + if numeric_version >= 1.55: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2649,7 +2635,7 @@ def main(): + ] + else: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2667,7 +2653,7 @@ def main(): + elif fw_filename == "rnode_firmware_ng21.zip": + if numeric_version >= 1.55: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2685,7 +2671,7 @@ def main(): + ] + else: + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2702,7 +2688,7 @@ def main(): + ] + elif fw_filename == "rnode_firmware_t3s3.zip": + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32s3", + "--port", args.port, + "--baud", args.baud_flash, +@@ -2720,7 +2706,7 @@ def main(): + ] + elif fw_filename == "extracted_rnode_firmware.zip": + return [ +- sys.executable, flasher, ++ "@esptool@", + "--chip", "esp32", + "--port", args.port, + "--baud", args.baud_flash, diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index c2ac5e3cba691..eaaf3eff9faf3 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "roadlib"; - version = "0.24.1"; + version = "0.26.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tQbJWHXxvjGhqGBI9nn8EL7rJcVyH095FfNSsxkrImQ="; + hash = "sha256-qh+xVBqQ/bkXl7Xa6w+SIkQRwIUW5ut4yosGko+8xrY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index cfd0c71d38d48..c32adc8dc3094 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "robotframework-seleniumlibrary"; - version = "6.5.0"; + version = "6.6.1"; pyproject = true; # no tests included in PyPI tarball @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sB2lWFFpCGgF0XFes84fBBvR8GF+S8aWWJoih+xBmW8="; + sha256 = "sha256-ULY0FH1RFQIlhS45LU3vUKi6urZJHiDgi6NdqU5tV2g="; }; build-system = [ setuptools ]; @@ -46,6 +46,8 @@ buildPythonPackage rec { mkdir utest/output_dir ''; + __darwinAllowLocalNetworking = true; + meta = { changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${src.rev}/docs/SeleniumLibrary-${version}.rst"; description = "Web testing library for Robot Framework"; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index b961d6ca07263..ddc6071451c51 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework"; - version = "7.0.1"; + version = "7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "robotframework"; rev = "refs/tags/v${version}"; - hash = "sha256-pr7x40ja1DwMPffmXQ2W53g1wuD0p63f+6ATfXhqGvE="; + hash = "sha256-nzkgJdSWbFcAnAqRTq4+Wy1lqdz+Xxf2i4RKnj/A5SA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix index 4593f30b8db2f..b5b527b2b402f 100644 --- a/pkgs/development/python-modules/rocketchat-api/default.nix +++ b/pkgs/development/python-modules/rocketchat-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rocketchat-api"; - version = "1.32.0"; + version = "1.33.0"; pyproject = true; src = fetchFromGitHub { owner = "jadolg"; repo = "rocketchat_API"; rev = "refs/tags/${version}"; - hash = "sha256-mzcesoBU8sOznAgvi2u8NsUheyLXPZuyIkGghbc556c="; + hash = "sha256-t1t0uksmdPTrksDF0K3/f3KxAv0fX2W8wDIIcWAPEVs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ronin/default.nix b/pkgs/development/python-modules/ronin/default.nix deleted file mode 100644 index 63d6d419cf14f..0000000000000 --- a/pkgs/development/python-modules/ronin/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - blessings, - colorama, - glob2, -}: - -buildPythonPackage rec { - pname = "ronin"; - version = "1.1.1"; - format = "setuptools"; - - src = fetchPypi { - inherit version pname; - hash = "sha256-5gZ8S0NR4JzKBIdi/xYtVmFg9ObbCSkT7sz+OKWnK/U="; - }; - - propagatedBuildInputs = [ - blessings - colorama - glob2 - ]; - - pythonImportsCheck = [ "ronin" ]; - - meta = with lib; { - homepage = "https://github.com/tliron/ronin/"; - description = "Straightforward but powerful build system based on Ninja and Python"; - license = licenses.asl20; - maintainers = with maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index a24a589e6ce43..6dcbe3c0e897e 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.6.5"; + version = "0.8.4"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = "refs/tags/${version}"; - hash = "sha256-w44nD3oaG3jPME66EIZnF0/QOiw/+P4XX4EYyar6niE="; + hash = "sha256-VHaCpoASy+pYmfx5X7hrH7hMnP0OTxD/5EPPZy7POaA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 1fd58cb565fe1..582e35508502c 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { simplegeneric ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # https://github.com/rpy2/rpy2/issues/1111 disabledTests = [ diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index a9873de906320..4035fd5e9e1cc 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rpyc"; - version = "6.0.0"; + version = "6.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tomerfiliba"; repo = "rpyc"; rev = "refs/tags/${version}"; - hash = "sha256-BvXEXZlVbOmKBwnSBCDksUkbT7JPcMX48KZe/Gd5Y8Q="; + hash = "sha256-ZYGOwg2IJtVVxHV2hC3inliTLP4BBFOnOz7VPhRpcgg="; }; build-system = [ hatchling ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "rpyc" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; diff --git a/pkgs/development/python-modules/rpyc4/default.nix b/pkgs/development/python-modules/rpyc4/default.nix deleted file mode 100644 index 09842a0045d6e..0000000000000 --- a/pkgs/development/python-modules/rpyc4/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - lib, - stdenv, - buildPythonPackage, - fetchFromGitHub, - setuptools, - hatchling, - plumbum, - pytestCheckHook, - pythonOlder, - pythonAtLeast, -}: - -buildPythonPackage rec { - pname = "rpyc4"; - # Pinned version for linien, see also: - # https://github.com/linien-org/pyrp3/pull/10#discussion_r1302816237 - version = "4.1.5"; - format = "pyproject"; - - # Since this is an outdated version, upstream might have fixed the - # compatibility issues with Python3.12, but we can't enjoy them yet. - disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; - - src = fetchFromGitHub { - owner = "tomerfiliba"; - repo = "rpyc"; - rev = version; - hash = "sha256-8NOcXZDR3w0TNj1+LZ7lzQAt7yDgspjOp2zk1bsbVls="; - }; - - nativeBuildInputs = [ - setuptools - hatchling - ]; - - propagatedBuildInputs = [ plumbum ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTests = [ - # Disable tests that requires network access - "test_api" - "test_close_timeout" - "test_deploy" - "test_listing" - "test_pruning" - "test_rpyc" - # Test is outdated - # ssl.SSLError: [SSL: NO_CIPHERS_AVAILABLE] no ciphers available (_ssl.c:997) - "test_ssl_conenction" - ]; - disabledTestPaths = [ - "tests/test_ssh.py" - "tests/test_teleportation.py" - ]; - - pythonImportsCheck = [ "rpyc" ]; - - doCheck = !stdenv.isDarwin; - - meta = with lib; { - description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; - homepage = "https://rpyc.readthedocs.org"; - changelog = "https://github.com/tomerfiliba-org/rpyc/blob/${version}/CHANGELOG.rst"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index a403db7086813..206f9192d92aa 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved. "test_error_without_config_file_macos" "test_file_1_is_bad_without_config_macos" diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix index 6d8bf78b6d3c5..cdb87a0c86573 100644 --- a/pkgs/development/python-modules/rtmidi-python/default.nix +++ b/pkgs/development/python-modules/rtmidi-python/default.nix @@ -26,8 +26,8 @@ buildPythonPackage rec { nativeBuildInputs = [ cython_0 ]; buildInputs = - lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio CoreMIDI CoreServices diff --git a/pkgs/development/python-modules/ruff-api/default.nix b/pkgs/development/python-modules/ruff-api/default.nix index 13bcdefa34962..a363c4c7d32ad 100644 --- a/pkgs/development/python-modules/ruff-api/default.nix +++ b/pkgs/development/python-modules/ruff-api/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices libiconv diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix index 44a1b8939795e..f7c96b10d3e1a 100644 --- a/pkgs/development/python-modules/ruffus/default.nix +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; # tests very flaky & hang often on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # test files do indeed need to be executed separately checkPhase = '' pushd ruffus/test diff --git a/pkgs/development/python-modules/rules/default.nix b/pkgs/development/python-modules/rules/default.nix index c2ab611d6f9c0..81af412a75d63 100644 --- a/pkgs/development/python-modules/rules/default.nix +++ b/pkgs/development/python-modules/rules/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "rules"; - version = "3.4.0"; + version = "3.5.0"; pyproject = true; src = fetchFromGitHub { owner = "dfunckt"; repo = "django-rules"; - rev = "v${version}"; - hash = "sha256-fxLaxjni+0S59vtvKBduR0pYMwJWWBPzR5mnH+j6gVE="; + rev = "refs/tags/v${version}"; + hash = "sha256-8Kay2b2uwaI/ml/cPpcj9svoDQI0ptV8tyGeZ76SgZw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index b0be3a51573cb..3f17b45e2d20f 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = [ numpy ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; checkInputs = [ fixtures diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix index 9bbac4b45437b..3102568bcb82c 100644 --- a/pkgs/development/python-modules/rx/default.nix +++ b/pkgs/development/python-modules/rx/default.nix @@ -3,13 +3,14 @@ fetchPypi, buildPythonPackage, pythonOlder, - nose, + setuptools, }: buildPythonPackage rec { pname = "rx"; version = "3.2.0"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.6"; # Use fetchPypi to avoid the updater script to migrate it to `reactivex` which @@ -20,12 +21,9 @@ buildPythonPackage rec { sha256 = "b657ca2b45aa485da2f7dcfd09fac2e554f7ac51ff3c2f8f2ff962ecd963d91c"; }; - nativeCheckInputs = [ nose ]; + build-system = [ setuptools ]; - # Some tests are nondeterministic. (`grep sleep -r tests`) - # test_timeout_schedule_action_cancel: https://hydra.nixos.org/build/74954646 - # test_new_thread_scheduler_timeout: https://hydra.nixos.org/build/74949851 - doCheck = false; + doCheck = false; # PyPI tarball does not provides tests pythonImportsCheck = [ "rx" ]; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index e138d2193a5c9..3ac85beed8948 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -38,11 +38,11 @@ buildPythonPackage rec { # There was a change in python 3.8 that defaults multiprocessing to spawn instead of fork on macOS # See https://bugs.python.org/issue33725 and https://github.com/python/cpython/pull/13603. # I suspect the underlying issue here is that upstream tests aren't compatible with spawn multiprocessing, and pass on linux where the default is still fork - lib.optionals stdenv.isDarwin [ "tests/unit/test_compat.py" ]; + lib.optionals stdenv.hostPlatform.isDarwin [ "tests/unit/test_compat.py" ]; pythonImportsCheck = [ "s3transfer" ]; - passthru.optional-dependencies = { + optional-dependencies = { crt = [ botocore.optional-dependencies.crt ]; }; diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix index 9d818bb3808d2..584cc1e7d6af1 100644 --- a/pkgs/development/python-modules/safetensors/default.nix +++ b/pkgs/development/python-modules/safetensors/default.nix @@ -1,51 +1,54 @@ { - stdenv, lib, + stdenv, buildPythonPackage, - cargo, fetchFromGitHub, + rustPlatform, + + # nativeBuildInputs + cargo, + rustc, + setuptools-rust, + + # buildInputs + libiconv, + + # tests h5py, numpy, - pythonOlder, pytestCheckHook, - rustc, - rustPlatform, - setuptools-rust, torch, - libiconv, }: buildPythonPackage rec { pname = "safetensors"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "huggingface"; repo = "safetensors"; rev = "refs/tags/v${version}"; - hash = "sha256-7tJeWs7kodK4Su8EaCjBuuWoMb93Ty3uiBrHZHdeTJc="; + hash = "sha256-gr4hBbecaGHaoNhRQQXWfLfNB0/wQPKftSiTnGgngog="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/bindings/python"; - hash = "sha256-Frcru/GGWHDxd027mvjJu3iR30KO2ddpPz54kGD6mjc="; + hash = "sha256-zDXzEVvmJF1dEVUFGBc3losr9U1q/qJCjNFkdJ/pCd4="; }; sourceRoot = "${src.name}/bindings/python"; nativeBuildInputs = [ - setuptools-rust cargo rustc rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook + setuptools-rust ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ h5py @@ -61,7 +64,7 @@ buildPythonPackage rec { "tests/test_paddle_comparison.py" "tests/test_tf_comparison.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # don't require mlx (not in Nixpkgs) to run tests "tests/test_mlx_comparison.py" ]; diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 8bef717dabf5a..4c9a40d06dc89 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "safety"; - version = "3.2.7"; + version = "3.2.8"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "pyupio"; repo = "safety"; rev = "refs/tags/${version}"; - hash = "sha256-JWbiw9qgfDo0UMAcqIhk1Y5tW0aSaZtbVdpdaY2z+3w="; + hash = "sha256-H8YF9rax6dM6KCLGiRk7bIHhYVw0RNkH/B9VTZRHe9c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix new file mode 100644 index 0000000000000..2ae837fa6e40c --- /dev/null +++ b/pkgs/development/python-modules/sagemaker-core/default.nix @@ -0,0 +1,82 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + boto3, + importlib-metadata, + jsonschema, + mock, + platformdirs, + pydantic, + pyyaml, + rich, + + # optional-dependencies + black, + pandas, + pylint, + pytest, +}: + +buildPythonPackage rec { + pname = "sagemaker-core"; + version = "1.0.10"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aws"; + repo = "sagemaker-core"; + rev = "refs/tags/v${version}"; + hash = "sha256-UloQJ5B10XXPbwsktVZzjcW7BLW8wCAw3wGmAkSl6wc="; + }; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ + "importlib-metadata" + "mock" + ]; + + dependencies = [ + boto3 + importlib-metadata + jsonschema + mock + platformdirs + pydantic + pyyaml + rich + ]; + + optional-dependencies = { + codegen = [ + black + pandas + pylint + pytest + ]; + }; + + pythonImportsCheck = [ + "sagemaker_core" + ]; + + # Only a single test which fails with: + # ValueError: Must setup local AWS configuration with a region supported by SageMaker. + doCheck = false; + + meta = { + description = "Python SDK designed to provide an object-oriented interface for interacting with Amazon SageMaker resources"; + homepage = "https://github.com/aws/sagemaker-core"; + changelog = "https://github.com/aws/sagemaker-core/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 23906dc2d9a34..7c3b26cbb25ce 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -1,47 +1,51 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, fetchpatch, - setuptools, + + # build-system + hatchling, + + # dependencies attrs, boto3, cloudpickle, + docker, google-pasta, - numpy, - protobuf, - smdebug-rulesconfig, importlib-metadata, + jsonschema, + numpy, packaging, pandas, pathos, - schema, - pyyaml, - jsonschema, platformdirs, - tblib, - urllib3, + protobuf, + psutil, + pyyaml, requests, - docker, + sagemaker-core, + schema, + smdebug-rulesconfig, + tblib, tqdm, - psutil, + urllib3, + + # optional-dependencies scipy, accelerate, }: buildPythonPackage rec { pname = "sagemaker"; - version = "2.224.1"; + version = "2.232.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-Kc66sygHGFqMvSY7rACb62wJEJesnN4KDmtYZLIOsqc="; + hash = "sha256-I+iZKx1CnZIGYgYuYhhs8BnY84KPyKOGw8M0He26DGU="; }; patches = [ @@ -58,10 +62,11 @@ buildPythonPackage rec { ]; build-system = [ - setuptools + hatchling ]; pythonRelaxDeps = [ + "boto3" "cloudpickle" "importlib-metadata" ]; @@ -70,24 +75,25 @@ buildPythonPackage rec { attrs boto3 cloudpickle + docker google-pasta - numpy - protobuf - smdebug-rulesconfig importlib-metadata + jsonschema + numpy packaging pandas pathos - schema - pyyaml - jsonschema platformdirs - tblib - urllib3 + protobuf + psutil + pyyaml requests - docker + sagemaker-core + schema + smdebug-rulesconfig + tblib tqdm - psutil + urllib3 ]; doCheck = false; # many test dependencies are not available in nixpkgs @@ -97,7 +103,7 @@ buildPythonPackage rec { "sagemaker.lineage.visualizer" ]; - passthru.optional-dependencies = { + optional-dependencies = { local = [ urllib3 docker @@ -108,11 +114,11 @@ buildPythonPackage rec { # feature-processor = [ pyspark sagemaker-feature-store-pyspark ]; # not available in nixpkgs }; - meta = with lib; { + meta = { description = "Library for training and deploying machine learning models on Amazon SageMaker"; homepage = "https://github.com/aws/sagemaker-python-sdk/"; changelog = "https://github.com/aws/sagemaker-python-sdk/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ nequissimus ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nequissimus ]; }; } diff --git a/pkgs/development/python-modules/salib/default.nix b/pkgs/development/python-modules/salib/default.nix new file mode 100644 index 0000000000000..9b1f1ccd799bc --- /dev/null +++ b/pkgs/development/python-modules/salib/default.nix @@ -0,0 +1,64 @@ +{ + lib, + fetchPypi, + buildPythonPackage, + hatchling, + hatch-vcs, + numpy, + scipy, + matplotlib, + pandas, + multiprocess, + pathos, +}: +let + finalAttrs = { + pname = "salib"; + version = "1.5.1"; + pyproject = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-5KnDGbjdAplajcmD9XxFLLflttvUPnt4VskMtqMyu18="; + }; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + numpy + scipy + matplotlib + pandas + multiprocess + ]; + + optional-dependencies = { + distributed = [ pathos ]; + }; + + # There are no tests in the pypi package + doCheck = false; + + pythonImportsCheck = [ + "SALib" + "SALib.analyze" + "SALib.plotting" + "SALib.sample" + "SALib.test_functions" + "SALib.util" + ]; + + meta = { + changelog = "https://github.com/SALib/SALib/releases"; + description = "Python implementations of commonly used sensitivity analysis methods, useful in systems modeling to calculate the effects of model inputs or exogenous factors on outputs of interest"; + homepage = "https://github.com/SALib/SALib"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "salib"; + }; + }; +in +buildPythonPackage finalAttrs diff --git a/pkgs/development/python-modules/samarium/default.nix b/pkgs/development/python-modules/samarium/default.nix index 89d5a700a7bcb..9e32e1c5b5dfe 100644 --- a/pkgs/development/python-modules/samarium/default.nix +++ b/pkgs/development/python-modules/samarium/default.nix @@ -5,7 +5,6 @@ poetry-core, crossandra, dahlia, - pythonRelaxDepsHook }: buildPythonPackage rec { @@ -20,11 +19,9 @@ buildPythonPackage rec { hash = "sha256-sOkJ67B8LaIA2cwCHaFnc16lMG8uaegBJCzF6Li77vk="; }; - build-system = [ poetry-core pythonRelaxDepsHook ]; + build-system = [ poetry-core ]; dependencies = [ crossandra dahlia ]; - pythonRelaxDeps = [ "crossandra" ]; - meta = with lib; { changelog = "https://github.com/samarium-lang/samarium/blob/${src.rev}/CHANGELOG.md"; description = "The Samarium Programming Language"; diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix index c139a1d1a4c63..43ed26ace4e28 100644 --- a/pkgs/development/python-modules/samsungctl/default.nix +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g"; }; - passthru.optional-dependencies = { + optional-dependencies = { websocket = [ websocket-client ]; # interactive_ui requires curses package }; diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index 7111961f9224c..3a99d9c891650 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiohttp websockets @@ -55,7 +55,7 @@ buildPythonPackage rec { aioresponses pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.async ++ passthru.optional-dependencies.encrypted; + ] ++ optional-dependencies.async ++ optional-dependencies.encrypted; pythonImportsCheck = [ "samsungtvws" ]; diff --git a/pkgs/development/python-modules/saneyaml/default.nix b/pkgs/development/python-modules/saneyaml/default.nix index 1f27c46dd6417..0e47b565bba7b 100644 --- a/pkgs/development/python-modules/saneyaml/default.nix +++ b/pkgs/development/python-modules/saneyaml/default.nix @@ -6,7 +6,6 @@ pyyaml, pytestCheckHook, pythonOlder, - setuptools, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 04f00668ed922..05cdff616166e 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -5,7 +5,7 @@ aioquic, beautifulsoup4, buildPythonPackage, - doCheck ? !stdenv.isDarwin, # on Darwin, tests fail but pkg still works + doCheck ? !stdenv.hostPlatform.isDarwin, # on Darwin, tests fail but pkg still works fetchFromGitHub, gunicorn, html5tagger, @@ -55,7 +55,7 @@ buildPythonPackage rec { websockets ]; - passthru.optional-dependencies = { + optional-dependencies = { ext = [ # TODO: sanic-ext ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { pytestCheckHook sanic-testing uvicorn - ] ++ passthru.optional-dependencies.http3; + ] ++ optional-dependencies.http3; inherit doCheck; @@ -82,7 +82,7 @@ buildPythonPackage rec { # needed for relative paths for some packages cd tests '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # OSError: [Errno 24] Too many open files ulimit -n 1024 ''; diff --git a/pkgs/development/python-modules/sarif-tools/default.nix b/pkgs/development/python-modules/sarif-tools/default.nix index 911e21198b8ac..c499d021447d7 100644 --- a/pkgs/development/python-modules/sarif-tools/default.nix +++ b/pkgs/development/python-modules/sarif-tools/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "sarif-tools"; - version = "2.0.0"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "sarif-tools"; - rev = "v${version}"; - hash = "sha256-80amYGnf7xZdpxzTjBGwgg39YN/jJsEkTm0uAlVbH0w="; + rev = "refs/tags/v${version}"; + hash = "sha256-MYwhewUTZ3Wl93p6bN3+bHqtXz+BAlAhte+JaetPQYU="; }; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 0f044c6e28b5c..5443545d5af53 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -2,20 +2,23 @@ lib, fetchFromGitHub, buildPythonPackage, - pytest, + setuptools, + pytestCheckHook, numpy, scipy, - matplotlib, + bumps, docutils, - pyopencl, + matplotlib, opencl-headers, + pycuda, + pyopencl, pythonOlder, }: buildPythonPackage rec { pname = "sasmodels"; - version = "1.0.7"; - format = "setuptools"; + version = "1.0.8"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,25 +26,34 @@ buildPythonPackage rec { owner = "SasView"; repo = "sasmodels"; rev = "refs/tags/v${version}"; - hash = "sha256-GZQYVvQ4bEBizTmJ+o5fIfGr8gn2/4uD3PxIswEjzSE="; + hash = "sha256-fa6/13z11AuTRItZOEmTbjpU1aT6Ur7evi6UvVvXQck="; }; + build-system = [ setuptools ]; + buildInputs = [ opencl-headers ]; - propagatedBuildInputs = [ - docutils - matplotlib + dependencies = [ numpy scipy - pyopencl ]; - # Note: the 1.0.5 release should be compatible with pytest6, so this can - # be set back to 'pytest' at that point - nativeCheckInputs = [ pytest ]; + optional-dependencies = { + full = [ + docutils + bumps + matplotlib + # columnize + ]; + server = [ bumps ]; + opencl = [ pyopencl ]; + cuda = [ pycuda ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; - checkPhase = '' - HOME=$(mktemp -d) py.test -c ./pytest.ini + preCheck = '' + export HOME=$TMPDIR ''; pythonImportsCheck = [ "sasmodels" ]; diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 6e3b6e3d5ed62..e90abc94768c0 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { hash = "sha256-fke75FCCn23LAMJ5bDWJpuBR6E9XIpjmzzXSbjqpxn8="; } ) ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pycodegen; preCheck = '' rm tox.ini @@ -80,7 +80,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "schema_salad" ]; - passthru.optional-dependencies = { + optional-dependencies = { pycodegen = [ black ]; }; diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 9b71e49368e1a..611474d85df60 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.47"; + version = "0.4.48"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "scikit-hep-testdata"; rev = "refs/tags/v${version}"; - hash = "sha256-YCzqAe+TVNbPrHPxD/OjxkjmYCb5pZO0+l68xUJp72w="; + hash = "sha256-B0YmO48aGDRsQ56+q7/Z6xquCNjbAQ55fkY6auvwB90="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 7e4486f63dcf4..6eb9bc428949f 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -27,7 +27,6 @@ scipy, setuptools, simpleitk, - six, tifffile, wheel, }: @@ -78,7 +77,7 @@ let tifffile ]; - passthru.optional-dependencies = { + optional-dependencies = { data = [ pooch ]; optional = [ astropy @@ -126,7 +125,7 @@ let "skimage/io/tests/test_io.py::test_imread_http_url" "skimage/restoration/tests/test_rolling_ball.py::test_ndim" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Matplotlib tests are broken inside darwin sandbox "skimage/feature/tests/test_util.py::test_plot_matches" "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold" @@ -134,7 +133,7 @@ let # See https://github.com/scikit-image/scikit-image/issues/7061 and https://github.com/scikit-image/scikit-image/issues/7104 "skimage/measure/tests/test_fit.py" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # https://github.com/scikit-image/scikit-image/issues/7104 "skimage/measure/tests/test_moments.py" ] @@ -164,7 +163,7 @@ let meta = { description = "Image processing routines for SciPy"; homepage = "https://scikit-image.org"; - changelog = "https://github.com/scikit-image/scikit-image/releases/tag/${src.rev}"; + changelog = "https://github.com/scikit-image/scikit-image/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ yl3dy ]; }; diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 7e975cb159494..eeba3f116d9d9 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -80,12 +80,12 @@ buildPythonPackage rec { ''; # PermissionError: [Errno 1] Operation not permitted: '/nix/nix-installer' - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # Skip test_feature_importance_regression - does web fetch "test_feature_importance_regression" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # doesn't seem to produce correct results? # possibly relevant: https://github.com/scikit-learn/scikit-learn/issues/25838#issuecomment-2308650816 "test_sparse_input" diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix deleted file mode 100644 index bc5beda2b27ca..0000000000000 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - isPy27, - buildPythonPackage, - fetchFromGitHub, - matplotlib, - numpy, - scipy, - scikit-learn, - pyaml, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "scikit-optimize"; - version = "0.9.0"; - format = "setuptools"; - disabled = isPy27; - - src = fetchFromGitHub { - owner = "scikit-optimize"; - repo = "scikit-optimize"; - rev = "v${version}"; - sha256 = "0hsq6pmryimxc275yrcy4bv217bx7ma6rz0q6m4138bv4zgq18d1"; - }; - - propagatedBuildInputs = [ - matplotlib - numpy - scipy - scikit-learn - pyaml - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = with lib; { - description = "Sequential model-based optimization toolbox"; - homepage = "https://scikit-optimize.github.io/"; - license = licenses.bsd3; - maintainers = [ ]; - broken = true; # It will fix by https://github.com/scikit-optimize/scikit-optimize/pull/1123 - }; -} diff --git a/pkgs/development/python-modules/scikit-posthocs/0001-increased-abs-tolerance-for-wilcoxon-test.patch b/pkgs/development/python-modules/scikit-posthocs/0001-increased-abs-tolerance-for-wilcoxon-test.patch deleted file mode 100644 index e3fa524e5a4ff..0000000000000 --- a/pkgs/development/python-modules/scikit-posthocs/0001-increased-abs-tolerance-for-wilcoxon-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 02266a00ce0eb6a089e7efe07816da1aa5152fc9 Mon Sep 17 00:00:00 2001 -From: Maksim Terpilovskii <maximtrp@gmail.com> -Date: Sun, 31 Jul 2022 12:25:14 +0300 -Subject: [PATCH] increased abs tolerance for wilcoxon test - ---- - tests/test_posthocs.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_posthocs.py b/tests/test_posthocs.py -index 956d808..8cc65e4 100644 ---- a/tests/test_posthocs.py -+++ b/tests/test_posthocs.py -@@ -471,7 +471,7 @@ class TestPosthocs(unittest.TestCase): - [2.857818e-06, 1.230888e-05, 1]]) - - results = sp.posthoc_wilcoxon(self.df.sort_index(), val_col = 'pulse', group_col = 'kind') -- self.assertTrue(np.allclose(results, r_results)) -+ self.assertTrue(np.allclose(results, r_results, atol=1e-4)) - - - def test_posthoc_scheffe(self): --- -2.36.1 - diff --git a/pkgs/development/python-modules/scikit-posthocs/0002-Update-test_posthocs.py.patch b/pkgs/development/python-modules/scikit-posthocs/0002-Update-test_posthocs.py.patch deleted file mode 100644 index fa4d6d3ececff..0000000000000 --- a/pkgs/development/python-modules/scikit-posthocs/0002-Update-test_posthocs.py.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5416ffba3ab01aebab3909400b5a9e847022898e Mon Sep 17 00:00:00 2001 -From: Maksim Terpilovskii <maximtrp@gmail.com> -Date: Thu, 16 Mar 2023 00:20:02 +0300 -Subject: [PATCH] Update test_posthocs.py - ---- - tests/test_posthocs.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/test_posthocs.py b/tests/test_posthocs.py -index 8cc65e4..42ca5f3 100644 ---- a/tests/test_posthocs.py -+++ b/tests/test_posthocs.py -@@ -71,7 +71,7 @@ class TestPosthocs(unittest.TestCase): - a = splt.sign_plot(x, flat=True, labels=False) - with self.assertRaises(ValueError): - splt.sign_plot(x.astype(float), flat=True, labels=False) -- self.assertTrue(isinstance(a, ma._subplots.Axes)) -+ self.assertTrue(isinstance(a, ma._axes.Axes)) - - def test_sign_plot_nonflat(self): - -@@ -85,7 +85,7 @@ class TestPosthocs(unittest.TestCase): - with self.assertRaises(ValueError): - splt.sign_plot(x.astype(np.int64), labels=False) - -- self.assertTrue(isinstance(a, ma._subplots.Axes) and isinstance(cbar, mpl.colorbar.ColorbarBase)) -+ self.assertTrue(isinstance(a, ma._axes.Axes) and isinstance(cbar, mpl.colorbar.ColorbarBase)) - - # Outliers tests - def test_outliers_iqr(self): --- -2.36.1 - diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index 39a5e8437ab12..3cbaf5f39e45e 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "scikit-rf"; repo = "scikit-rf"; rev = "refs/tags/v${version}"; - hash = "sha256-K+iOpgEKwYtv8be/dLeDHYUDI8xZsoqB7mYDkVeCA10="; + hash = "sha256-cYQDoEX33fjxekTA2COHMvcLxCFCD7g9bp3y9sE4uUU="; }; postPatch = '' @@ -68,7 +68,7 @@ buildPythonPackage rec { ]; }; - env = lib.optionalAttrs stdenv.isDarwin { MPLBACKEND = "Agg"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { MPLBACKEND = "Agg"; }; nativeCheckInputs = [ pytest-mock @@ -83,7 +83,7 @@ buildPythonPackage rec { # test_calibration.py generates a divide by zero error on darwin # https://github.com/scikit-rf/scikit-rf/issues/972 disabledTestPaths = lib.optional ( - stdenv.isAarch64 && stdenv.isDarwin + stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin ) "skrf/calibration/tests/test_calibration.py"; pythonImportsCheck = [ "skrf" ]; diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index e2d4ebff287bf..78e58877d5160 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { "test_survival_svm" "test_tree" ] - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) # floating point mismatch on aarch64 # 27079905.88052468 to far from 27079905.880496684 "test_coxnet"; diff --git a/pkgs/development/python-modules/scim2-filter-parser/default.nix b/pkgs/development/python-modules/scim2-filter-parser/default.nix index 4ea0d1a6c7d5d..2ddf986971858 100644 --- a/pkgs/development/python-modules/scim2-filter-parser/default.nix +++ b/pkgs/development/python-modules/scim2-filter-parser/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sly ]; - passthru.optional-dependencies = { + optional-dependencies = { django-query = [ django ]; }; @@ -49,7 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.django-query; + ] ++ optional-dependencies.django-query; meta = with lib; { description = "Customizable parser/transpiler for SCIM2.0 filters"; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index c6daa99905d2d..4677b47f1188f 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,34 +1,41 @@ { lib, stdenv, - fetchFromGitHub, - fetchpatch, fetchurl, writeText, - xcbuild, python, buildPythonPackage, + fetchFromGitHub, + fetchpatch, + + # build-system cython, gfortran, meson-python, nukeReferences, - pkg-config, pythran, - wheel, + pkg-config, setuptools, - hypothesis, - pytest7CheckHook, - pytest-xdist, - numpy, - pybind11, - pooch, - xsimd, + xcbuild, + + # buildInputs # Upstream has support for using Darwin's Accelerate package. However this # requires a Darwin user to work on a nice way to do that via an override. # See: # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L194-L211 blas, lapack, + pybind11, + pooch, + xsimd, + + # dependencies + numpy, + + # tests + hypothesis, + pytest7CheckHook, + pytest-xdist, # Reverse dependency sage, @@ -58,7 +65,7 @@ let # Additional cross compilation related properties that scipy reads in scipy/meson.build crossFileScipy = writeText "cross-file-scipy.conf" '' [properties] - numpy-include-dir = '${numpy}/${python.sitePackages}/numpy/core/include' + numpy-include-dir = '${numpy.coreIncludeDir}' pythran-include-dir = '${pythran}/${python.sitePackages}/pythran' host-python-path = '${python.interpreter}' host-python-version = '${python.pythonVersion}' @@ -66,12 +73,12 @@ let in buildPythonPackage { inherit pname version; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "scipy"; - repo = pname; - rev = "v${version}"; + repo = "scipy"; + rev = "refs/tags/v${version}"; hash = srcHash; fetchSubmodules = true; }; @@ -95,22 +102,23 @@ buildPythonPackage { --replace-fail "pybind11>=2.12.0,<2.13.0" "pybind11>=2.12.0" \ ''; - nativeBuildInputs = [ - cython - gfortran - meson-python - nukeReferences - pythran - pkg-config - wheel - setuptools - ] ++ lib.optionals stdenv.isDarwin [ - # Minimal version required according to: - # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L185-L188 - (xcbuild.override { - sdkVer = "13.3"; - }) - ]; + build-system = + [ + cython + gfortran + meson-python + nukeReferences + pythran + pkg-config + setuptools + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Minimal version required according to: + # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L185-L188 + (xcbuild.override { + sdkVer = "13.3"; + }) + ]; buildInputs = [ blas @@ -120,7 +128,7 @@ buildPythonPackage { xsimd ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; __darwinAllowLocalNetworking = true; @@ -133,7 +141,7 @@ buildPythonPackage { # The following tests are broken on aarch64-darwin with newer compilers and library versions. # See https://github.com/scipy/scipy/issues/18308 - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "test_a_b_neg_int_after_euler_hypergeometric_transformation" "test_dst4_definition_ortho" "test_load_mat4_le" @@ -142,7 +150,7 @@ buildPythonPackage { "test_uint64_max" ]; - doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); + doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin); preConfigure = '' @@ -179,7 +187,9 @@ buildPythonPackage { # # ldr x0, [x0, ___stack_chk_guard];momd # - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ + "stackprotector" + ]; # remove references to dev dependencies postInstall = '' @@ -211,12 +221,12 @@ buildPythonPackage { SCIPY_USE_G77_ABI_WRAPPER = 1; - meta = with lib; { + meta = { changelog = "https://github.com/scipy/scipy/releases/tag/v${version}"; description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering"; downloadPage = "https://github.com/scipy/scipy"; homepage = "https://www.scipy.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 6c39cc2af8b62..6d38658041b5a 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "3.3.7"; + version = "3.3.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "scmrepo"; rev = "refs/tags/${version}"; - hash = "sha256-Z9HUeZPsskEPTwRRwK4z4p2Lv7Ukg7du6OAxvDwEcPc="; + hash = "sha256-8fx4yZcdOb32x5eo04ixpMe3Mh21LwqzNKVRVEnjfQo="; }; build-system = [ diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index f291798d0500d..010481da31e8a 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -117,7 +117,7 @@ buildPythonPackage rec { # Test fails on Hydra "test_start_requests_laziness" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_xmliter_encoding" "test_download" "test_reactor_default_twisted_reactor_select" diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index dc32cbb1dd6b3..9f1a6c3a6e241 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "screeninfo" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Fetch location and size of physical screens"; homepage = "https://github.com/rr-/screeninfo"; license = licenses.mit; diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 8736930939e3d..e311b2f2f25f8 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; buildInputs = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then [ Accelerate ] else [ diff --git a/pkgs/development/python-modules/sdkmanager/default.nix b/pkgs/development/python-modules/sdkmanager/default.nix index b83579ae3a73a..225600d174661 100644 --- a/pkgs/development/python-modules/sdkmanager/default.nix +++ b/pkgs/development/python-modules/sdkmanager/default.nix @@ -6,14 +6,15 @@ pythonAtLeast, argcomplete, requests, + setuptools, looseversion, gnupg, }: buildPythonPackage rec { pname = "sdkmanager"; - version = "0.6.7"; - format = "setuptools"; + version = "0.6.8"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -21,10 +22,14 @@ buildPythonPackage rec { owner = "fdroid"; repo = pname; rev = version; - hash = "sha256-8Iq3sVp9/dZi4zNZIgNm38ntoA2koS/Ism+pIVATr4Q="; + hash = "sha256-Ev90WS/T+Rb8h/21XHQdy/GePhGiYWwyfP88OUyBojQ="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "urllib3" ]; + + build-system = [ setuptools ]; + + dependencies = [ argcomplete requests ] ++ requests.optional-dependencies.socks ++ lib.optionals (pythonAtLeast "3.12") [ looseversion ]; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 16e9d1b98078b..74987d59dcc49 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { stats = [ scipy statsmodels diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index fe084d9b820ed..8ea5a67932fe4 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -12,6 +12,7 @@ # dependneices numpy, + libusb-compat-0_1, # optional-dependenices pyusb, @@ -29,17 +30,26 @@ buildPythonPackage rec { pname = "seabreeze"; - version = "2.6.0"; + version = "2.9.2"; pyproject = true; src = fetchFromGitHub { owner = "ap--"; repo = "python-seabreeze"; rev = "refs/tags/v${version}"; - hash = "sha256-Ead9G4i8/mFwPqL2PGsndtmX93Njld3nvTTr6ROJTac="; + hash = "sha256-NzZ+ZRfJ97Ufp6hmqN6ziBFfdvJXpmWwh9A66od/8Hc="; leaveDotGit = true; }; + enableParallelBuilding = true; + + postPatch = '' + # pkgconfig cant find libusb, doing it manually + substituteInPlace setup.py \ + --replace-fail 'pkgconfig.parse("libusb")' \ + "{'include_dirs': ['${libusb-compat-0_1}/include'], 'library_dirs': ['${libusb-compat-0_1}/lib'], 'libraries': ['usb']}" + ''; + nativeBuildInputs = [ cython git @@ -48,9 +58,12 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + libusb-compat-0_1 + ]; - passthru.optional-dependencies = { + optional-dependencies = { pyseabreeze = [ pyusb ]; }; @@ -64,7 +77,9 @@ buildPythonPackage rec { pytestCheckHook mock zipp - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + disabledTests = [ "TestHardware" ]; setupPyBuildFlags = [ "--without-cseabreeze" ]; diff --git a/pkgs/development/python-modules/seasonal/default.nix b/pkgs/development/python-modules/seasonal/default.nix index f6aa8d2e36461..cef289ff5c8ec 100644 --- a/pkgs/development/python-modules/seasonal/default.nix +++ b/pkgs/development/python-modules/seasonal/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { csv = [ pandas ]; plot = [ matplotlib ]; }; @@ -51,7 +51,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { description = "Robustly estimate trend and periodicity in a timeseries"; diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix index 21cff0dc498e4..62fb78f356539 100644 --- a/pkgs/development/python-modules/securesystemslib/default.nix +++ b/pkgs/development/python-modules/securesystemslib/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { PySPX = [ pyspx ]; awskms = [ boto3 @@ -70,7 +70,7 @@ buildPythonPackage rec { nativeCheckInputs = [ ed25519 pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "securesystemslib" ]; diff --git a/pkgs/development/python-modules/selenium-wire/default.nix b/pkgs/development/python-modules/selenium-wire/default.nix index defbf1fe8fdc6..b301c953bb71a 100644 --- a/pkgs/development/python-modules/selenium-wire/default.nix +++ b/pkgs/development/python-modules/selenium-wire/default.nix @@ -36,9 +36,9 @@ buildPythonPackage rec { hash = "sha256-KgaDxHS0dAK6CT53L1qqx1aORMmkeaiXAUtGC82hiIQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ blinker brotli certifi @@ -73,5 +73,6 @@ buildPythonPackage rec { changelog = "https://github.com/wkeeling/selenium-wire/blob/${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + broken = versionAtLeast blinker.version "1.8"; }; } diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 9009d6bf3c4fe..ab3b46b438164 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -47,11 +47,11 @@ buildPythonPackage rec { cp ../javascript/cdp-support/mutation-listener.js $DST_REMOTE cp ../third_party/js/selenium/webdriver.json $DST_FF/webdriver_prefs.json '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $DST_PREFIX/common/macos ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/macos/ '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $DST_PREFIX/common/linux/ ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/linux/ ''; diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 06beaabdbcd5f..f497e2fef41cd 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index 7b870da888792..b9cf305a8d659 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -1,35 +1,41 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies huggingface-hub, nltk, numpy, - pytestCheckHook, - pythonOlder, scikit-learn, scipy, sentencepiece, - setuptools, tokenizers, torch, - torchvision, tqdm, transformers, + + # tests + accelerate, + datasets, + pytestCheckHook, + pytest-cov, }: buildPythonPackage rec { pname = "sentence-transformers"; - version = "2.7.0"; + version = "3.1.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-xER+WHprW83KWJ0bom+lTn0HNU7PgGROnp/QLG1uUcw="; + hash = "sha256-YtAgv0vH2aL7UX3ETVfwDEQYEWYo5Pj/R45CeH7T3BU="; }; build-system = [ setuptools ]; @@ -43,39 +49,56 @@ buildPythonPackage rec { sentencepiece tokenizers torch - torchvision tqdm transformers ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + accelerate + datasets + pytestCheckHook + pytest-cov + ]; pythonImportsCheck = [ "sentence_transformers" ]; disabledTests = [ # Tests require network access - "test_simple_encode" - "test_paraphrase_mining" "test_cmnrl_same_grad" "test_LabelAccuracyEvaluator" + "test_model_card_reuse" + "test_paraphrase_mining" "test_ParaphraseMiningEvaluator" + "test_simple_encode" + "test_trainer" + "test_trainer_invalid_column_names" + "test_trainer_multi_dataset_errors" ]; disabledTestPaths = [ # Tests require network access - "tests/test_pretrained_stsb.py" - "tests/test_sentence_transformer.py" + "tests/evaluation/test_information_retrieval_evaluator.py" "tests/test_compute_embeddings.py" - "tests/test_multi_process.py" "tests/test_cross_encoder.py" + "tests/test_model_card_data.py" + "tests/test_multi_process.py" + "tests/test_pretrained_stsb.py" + "tests/test_sentence_transformer.py" "tests/test_train_stsb.py" ]; - meta = with lib; { + # Sentence-transformer needs a writable hf_home cache + postInstall = '' + export HF_HOME=$(mktemp -d) + ''; + + meta = { description = "Multilingual Sentence & Image Embeddings with BERT"; homepage = "https://github.com/UKPLab/sentence-transformers"; changelog = "https://github.com/UKPLab/sentence-transformers/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ dit7ya ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dit7ya ]; + # Segmentation fault at import + broken = stdenv.hostPlatform.system == "x86_64-darwin"; }; } diff --git a/pkgs/development/python-modules/sentry-sdk/1.nix b/pkgs/development/python-modules/sentry-sdk/1.nix index 3f57549a1e39d..c09abf95944c0 100644 --- a/pkgs/development/python-modules/sentry-sdk/1.nix +++ b/pkgs/development/python-modules/sentry-sdk/1.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; beam = [ apache-beam ]; bottle = [ bottle ]; @@ -102,7 +102,7 @@ buildPythonPackage rec { pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # Issue with the asseration diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index e389cf4d08dcc..14c1db3403481 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -63,14 +63,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "2.13.0"; + version = "2.14.0"; pyproject = true; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-TZzu9cR5HrgmsPRkuP1LqEBA7uosbBzLGT63LLj2yyc="; + hash = "sha256-VrrzM81O3tG2GveP8Eq9kxVPSok7JIj3XjGOauGIlxY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix index 25722095f4328..d68d4485a0954 100644 --- a/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -5,8 +5,8 @@ defusedxml, fetchFromGitHub, httpx, + mashumaro, poetry-core, - pydantic, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -15,32 +15,31 @@ buildPythonPackage rec { pname = "sfrbox-api"; - version = "0.0.9"; + version = "0.0.11"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "hacf-fr"; repo = "sfrbox-api"; rev = "refs/tags/v${version}"; - hash = "sha256-rMfX9vA8IuWxXvVs4WYNHO6neeoie/3gABwhXyJoAF8="; + hash = "sha256-Ec3UOserFijBK6goyM6AMOekfLgjBq8l/9sMKYnj240="; }; pythonRelaxDeps = [ "defusedxml" - "pydantic" ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml + mashumaro httpx - pydantic ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click ]; }; @@ -48,16 +47,16 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook respx - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "sfrbox_api" ]; meta = with lib; { description = "Module for the SFR Box API"; - mainProgram = "sfrbox-api"; homepage = "https://github.com/hacf-fr/sfrbox-api"; changelog = "https://github.com/hacf-fr/sfrbox-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "sfrbox-api"; }; } diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 51a4a9d842f67..655e93f4e964b 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { # https://github.com/amoffat/sh/issues/684 "test_general_signal" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable tests that fail on Darwin sandbox "test_background_exception" "test_cwd" diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 25246028a5144..e2b3deaa92301 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { plots = [ matplotlib ipython diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index db6e185cb9b21..0959a8e3e0c95 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { cd $out ''; - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # FIXME(lf-): these logging tests are broken, which is definitely our # fault. I've tried figuring out the cause and failed. # diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix index bfa3f7c9211a5..06f058b03275e 100644 --- a/pkgs/development/python-modules/shazamio/default.nix +++ b/pkgs/development/python-modules/shazamio/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Free asynchronous library from reverse engineered Shazam API"; homepage = "https://github.com/dotX12/ShazamIO"; - changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.rev}"; + changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; # https://github.com/shazamio/ShazamIO/issues/80 diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index e35ca8ff6f027..88f59fc86ebb2 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -1,6 +1,5 @@ { python, - pythonAtLeast, lib, stdenv, pyside2, @@ -15,35 +14,20 @@ stdenv.mkDerivation { inherit (pyside2) version src patches; - postPatch = - (lib.optionalString (pythonAtLeast "3.12") '' - substituteInPlace \ - ez_setup.py \ - build_scripts/main.py \ - build_scripts/options.py \ - build_scripts/utils.py \ - build_scripts/wheel_override.py \ - build_scripts/wheel_utils.py \ - sources/shiboken2/CMakeLists.txt \ - sources/shiboken2/data/shiboken_helpers.cmake \ - --replace-fail "from distutils" "import setuptools; from distutils" - substituteInPlace \ - build_scripts/config.py \ - build_scripts/main.py \ - build_scripts/options.py \ - build_scripts/setup_runner.py \ - build_scripts/utils.py \ - --replace-fail "import distutils" "import setuptools; import distutils" - '') - + '' - cd sources/shiboken2 - ''; + postPatch = '' + cd sources/shiboken2 + ''; CLANG_INSTALL_DIR = llvmPackages_15.libclang.out; nativeBuildInputs = [ cmake - (python.withPackages (ps: with ps; [ setuptools ])) + (python.withPackages ( + ps: with ps; [ + distutils + setuptools + ] + )) ]; buildInputs = diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index e3d5490a6c36a..2c491e193d80d 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -28,7 +28,7 @@ stdenv'.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake (python.pythonOnBuildForHost.withPackages (ps: [ ps.setuptools ])) - ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ llvmPackages.llvm diff --git a/pkgs/development/python-modules/shippinglabel/default.nix b/pkgs/development/python-modules/shippinglabel/default.nix new file mode 100644 index 0000000000000..c523714e4ff2b --- /dev/null +++ b/pkgs/development/python-modules/shippinglabel/default.nix @@ -0,0 +1,43 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + setuptools, + dist-meta, + dom-toml, + domdf-python-tools, + packaging, + typing-extensions, +}: +buildPythonPackage rec { + pname = "shippinglabel"; + version = "2.0.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-hZYsK+IX/a4bZMtD+hMEYDnwgqhdkkEHkG0MPkAgy20="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + dist-meta + dom-toml + domdf-python-tools + packaging + typing-extensions + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' + ''; + + meta = { + description = "Utilities for handling packages."; + homepage = "https://github.com/domdfcoding/shippinglabel"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyberius-prime ]; + }; +} diff --git a/pkgs/development/python-modules/show-in-file-manager/default.nix b/pkgs/development/python-modules/show-in-file-manager/default.nix index a43b08ee1c9e1..a08a874d690c0 100644 --- a/pkgs/development/python-modules/show-in-file-manager/default.nix +++ b/pkgs/development/python-modules/show-in-file-manager/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ packaging ] ++ lib.optional (stdenv.isLinux) pyxdg; + propagatedBuildInputs = [ packaging ] ++ lib.optional (stdenv.hostPlatform.isLinux) pyxdg; meta = with lib; { homepage = "https://github.com/damonlynch/showinfilemanager"; diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix index 74c88e6a56449..731d9299fc2c3 100644 --- a/pkgs/development/python-modules/simpful/default.nix +++ b/pkgs/development/python-modules/simpful/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { plotting = [ matplotlib seaborn @@ -44,7 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "simpful" ]; @@ -54,6 +54,6 @@ buildPythonPackage rec { changelog = "https://github.com/aresio/simpful/releases/tag/${version}"; license = with licenses; [ lgpl3Only ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/simple-parsing/default.nix b/pkgs/development/python-modules/simple-parsing/default.nix new file mode 100644 index 0000000000000..b263f24ba1d6d --- /dev/null +++ b/pkgs/development/python-modules/simple-parsing/default.nix @@ -0,0 +1,83 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + poetry-dynamic-versioning, + + # dependencies + docstring-parser, + typing-extensions, + + # optional-dependencies + tomli, + tomli-w, + pyyaml, + + # tests + matplotlib, + numpy, + orion, + pytest-benchmark, + pytest-regressions, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "simple-parsing"; + version = "0.1.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lebrice"; + repo = "SimpleParsing"; + rev = "refs/tags/v${version}"; + hash = "sha256-RDS1sWzaQqXp/0a7dXlUHnd6z+GTIpUN1MnUCTI9LGw="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + docstring-parser + typing-extensions + ]; + + optional-dependencies = { + toml = [ + tomli + tomli-w + ]; + yaml = [ pyyaml ]; + }; + + pythonImportsCheck = [ "simple_parsing" ]; + + nativeCheckInputs = [ + matplotlib + numpy + orion + pytest-benchmark + pytest-regressions + pytestCheckHook + ]; + + disabledTests = [ + # Expected: OrderedDict([('a', 1), ('b', 2), ('c', 5), ('d', 6), ('e', 7)]) + # Got: OrderedDict({'a': 1, 'b': 2, 'c': 5, 'd': 6, 'e': 7}) + # https://github.com/lebrice/SimpleParsing/issues/326 + "simple_parsing.utils.dict_union" + ]; + + meta = { + description = "Simple, Elegant, Typed Argument Parsing with argparse"; + changelog = "https://github.com/lebrice/SimpleParsing/releases/tag/v${version}"; + homepage = "https://github.com/lebrice/SimpleParsing"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix index 71d9cb43c06dd..8e336d4e61c2f 100644 --- a/pkgs/development/python-modules/simpleaudio/default.nix +++ b/pkgs/development/python-modules/simpleaudio/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { sha256 = "12nypzb1m14yip4zrbzin5jc5awyp1d5md5y40g5anj4phb4hx1i"; }; + patches = [ ./python312-fix.patch ]; + buildInputs = [ alsa-lib ]; meta = with lib; { diff --git a/pkgs/development/python-modules/simpleaudio/python312-fix.patch b/pkgs/development/python-modules/simpleaudio/python312-fix.patch new file mode 100644 index 0000000000000..4fc689fc8d3ad --- /dev/null +++ b/pkgs/development/python-modules/simpleaudio/python312-fix.patch @@ -0,0 +1,98 @@ +From 6a7cb95c5af4537bad72bad9b190e09cb6d7883c Mon Sep 17 00:00:00 2001 +From: cexen <cexenial@gmail.com> +Date: Sun, 21 Jan 2024 21:01:29 +0900 +Subject: [PATCH] replace PyMem_* to PyMem_Raw* + +Fixes #72. +--- + c_src/posix_mutex.c | 4 ++-- + c_src/simpleaudio.c | 8 ++++---- + c_src/simpleaudio_win.c | 8 ++++---- + 3 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/c_src/posix_mutex.c b/c_src/posix_mutex.c +index 533a3f1..04619f1 100644 +--- a/c_src/posix_mutex.c ++++ b/c_src/posix_mutex.c +@@ -10,14 +10,14 @@ MIT License (see LICENSE.txt) + + void* create_mutex() { + void* mutex; +- mutex = PyMem_Malloc(sizeof(pthread_mutex_t)); ++ mutex = PyMem_RawMalloc(sizeof(pthread_mutex_t)); + pthread_mutex_init((pthread_mutex_t*)mutex, NULL); + return mutex; + } + + void destroy_mutex(void* mutex) { + pthread_mutex_destroy((pthread_mutex_t*)mutex); +- PyMem_Free(mutex); ++ PyMem_RawFree(mutex); + } + + void grab_mutex(void* mutex) { +diff --git a/c_src/simpleaudio.c b/c_src/simpleaudio.c +index edacba3..b0b24b8 100644 +--- a/c_src/simpleaudio.c ++++ b/c_src/simpleaudio.c +@@ -219,7 +219,7 @@ void delete_list_item(play_item_t* play_item) { + play_item->prev_item->next_item = play_item->next_item; + } + destroy_mutex(play_item->mutex); +- PyMem_Free(play_item); ++ PyMem_RawFree(play_item); + } + + /*********************************************/ +@@ -228,7 +228,7 @@ play_item_t* new_list_item(play_item_t* list_head) { + play_item_t* new_item; + play_item_t* old_tail; + +- new_item = PyMem_Malloc(sizeof(play_item_t)); ++ new_item = PyMem_RawMalloc(sizeof(play_item_t)); + new_item->next_item = NULL; + + old_tail = list_head; +@@ -269,13 +269,13 @@ void destroy_audio_blob(audio_blob_t* audio_blob) { + grab_mutex(audio_blob->list_mutex); + delete_list_item(audio_blob->play_list_item); + release_mutex(audio_blob->list_mutex); +- PyMem_Free(audio_blob); ++ PyMem_RawFree(audio_blob); + } + + /********************************************/ + + audio_blob_t* create_audio_blob() { +- audio_blob_t* audio_blob = PyMem_Malloc(sizeof(audio_blob_t)); ++ audio_blob_t* audio_blob = PyMem_RawMalloc(sizeof(audio_blob_t)); + + dbg1("created audio blob at %p\n", audio_blob); + +diff --git a/c_src/simpleaudio_win.c b/c_src/simpleaudio_win.c +index 5aed022..ba79d23 100644 +--- a/c_src/simpleaudio_win.c ++++ b/c_src/simpleaudio_win.c +@@ -57,8 +57,8 @@ MMRESULT fill_buffer(WAVEHDR* wave_header, audio_blob_t* audio_blob) { + if (audio_blob->num_buffers > 0) { + dbg2("done buffering - dellocating a buffer\n"); + +- PyMem_Free(wave_header->lpData); +- PyMem_Free(wave_header); ++ PyMem_RawFree(wave_header->lpData); ++ PyMem_RawFree(wave_header); + audio_blob->num_buffers--; + } + if (audio_blob->num_buffers == 0) { +@@ -182,9 +182,9 @@ PyObject* play_os(Py_buffer buffer_obj, int len_samples, int num_channels, int b + dbg1("allocating %d buffers of %d bytes\n", NUM_BUFS, buffer_size); + + for (i = 0; i < NUM_BUFS; i++) { +- temp_wave_hdr = PyMem_Malloc(sizeof(WAVEHDR)); ++ temp_wave_hdr = PyMem_RawMalloc(sizeof(WAVEHDR)); + memset(temp_wave_hdr, 0, sizeof(WAVEHDR)); +- temp_wave_hdr->lpData = PyMem_Malloc(buffer_size); ++ temp_wave_hdr->lpData = PyMem_RawMalloc(buffer_size); + temp_wave_hdr->dwBufferLength = buffer_size; + + result = fill_buffer(temp_wave_hdr, audio_blob); diff --git a/pkgs/development/python-modules/simpleitk/default.nix b/pkgs/development/python-modules/simpleitk/default.nix index f241cd0a29689..e15a2a7a726d6 100644 --- a/pkgs/development/python-modules/simpleitk/default.nix +++ b/pkgs/development/python-modules/simpleitk/default.nix @@ -2,7 +2,7 @@ buildPythonPackage, pythonOlder, cmake, - swig4, + swig, elastix, itk, numpy, @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake - swig4 + swig scikit-build ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index bbebbfd358673..b8d70a31b7aaa 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "simplejson" ]; diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix index f0981334e2174..3f81b311c811d 100644 --- a/pkgs/development/python-modules/simplesat/default.nix +++ b/pkgs/development/python-modules/simplesat/default.nix @@ -4,14 +4,16 @@ writeText, lib, attrs, - six, + mock, okonomiyaki, + pytestCheckHook, + pyyaml, + setuptools, + six, }: let - version = "0.8.2"; - format = "setuptools"; - + version = "0.9.0"; versionFile = writeText "simplesat_ver" '' version = '${version}' full_version = '${version}' @@ -24,27 +26,37 @@ in buildPythonPackage rec { pname = "simplesat"; inherit version; - - propagatedBuildInputs = [ - attrs - six - okonomiyaki - ]; + pyproject = true; src = fetchFromGitHub { owner = "enthought"; repo = "sat-solver"; - rev = "v${version}"; - hash = "sha256-6BQn1W2JGrMmNqgxi+sXx06XzNMcvwqYGMkpD0SSpT8="; + rev = "refs/tags/v${version}"; + hash = "sha256-8sUOV42MLM3otG3EKvVzKKGAUpSlaTj850QZxZa62bE="; }; preConfigure = '' cp ${versionFile} simplesat/_version.py ''; - dontUseSetuptoolsCheck = true; + + build-system = [ setuptools ]; + + dependencies = [ + attrs + okonomiyaki + six + ]; pythonImportsCheck = [ "simplesat" ]; + nativeCheckInputs = [ + mock + pytestCheckHook + pyyaml + ]; + + pytestFlagsArray = [ "simplesat/tests" ]; + meta = with lib; { homepage = "https://github.com/enthought/sat-solver"; description = "Prototype for SAT-based dependency handling"; diff --git a/pkgs/development/python-modules/siphashc/default.nix b/pkgs/development/python-modules/siphashc/default.nix index 76c9ea7ad5c0b..639f06ead5f1e 100644 --- a/pkgs/development/python-modules/siphashc/default.nix +++ b/pkgs/development/python-modules/siphashc/default.nix @@ -13,8 +13,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; src = fetchPypi { - pname = "siphashc"; - inherit version; + inherit pname version; sha256 = "sha256-ptNpy7VkUXHbjvdir6v+eYOmtQ/j8XPXq4lj7ceS/5s="; }; @@ -25,7 +24,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python c-module for siphash"; homepage = "https://github.com/WeblateOrg/siphashc"; - license = licenses.mit; + changelog = "https://github.com/WeblateOrg/siphashc/blob/${version}/CHANGES.rst"; + license = licenses.isc; maintainers = with maintainers; [ erictapen ]; }; } diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix index 15806e8b1bce7..8e27202ad838c 100644 --- a/pkgs/development/python-modules/skia-pathops/default.nix +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { --replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \ 'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]' '' - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' substituteInPlace src/cpp/skia-builder/skia/gn/skia/BUILD.gn \ --replace "-march=armv7-a" "-march=armv8-a" \ --replace "-mfpu=neon" "" \ @@ -42,7 +42,7 @@ buildPythonPackage rec { --replace "defined(SK_CPU_ARM64)" "0" '' + - lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) # old compiler? + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) # old compiler? '' patch -p1 <<EOF --- a/src/cpp/skia-builder/skia/include/private/base/SkTArray.h @@ -57,9 +57,9 @@ buildPythonPackage rec { cython ninja setuptools-scm - ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices OpenGL ]; diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix index a8c22a53f24b4..70df89009fd35 100644 --- a/pkgs/development/python-modules/skops/default.nix +++ b/pkgs/development/python-modules/skops/default.nix @@ -10,6 +10,7 @@ matplotlib, pandas, scikit-learn, + stdenv, streamlit, tabulate, }: @@ -44,13 +45,18 @@ buildPythonPackage rec { streamlit ]; pytestFlagsArray = [ "skops" ]; - disabledTestPaths = [ - # try to download data from Huggingface Hub: - "skops/hub_utils/tests" - "skops/card/tests" - # minor output formatting issue - "skops/card/_model_card.py" - ]; + disabledTestPaths = + [ + # try to download data from Huggingface Hub: + "skops/hub_utils/tests" + "skops/card/tests" + # minor output formatting issue + "skops/card/_model_card.py" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Segfaults on darwin + "skops/io/tests/test_persist.py" + ]; pythonImportsCheck = [ "skops" ]; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 28a8f1771f4e1..3e139d4714a82 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { # failing tests "test_pickle_load" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # there is a problem with the compiler selection "test_fit_and_predict_with_compile" ] diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix index d4d6fa3f1b96b..8fe675eb5bed6 100644 --- a/pkgs/development/python-modules/skyfield/default.nix +++ b/pkgs/development/python-modules/skyfield/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "skyfield"; - version = "1.45"; + version = "1.49"; pyproject = true; src = fetchFromGitHub { owner = "skyfielders"; repo = "python-skyfield"; rev = version; - hash = "sha256-kZrXNVE+JGPGiVsd6CTwOqfciYLsD2A4pTS3FpqO+Dk="; + hash = "sha256-PZ63sohdfpop3nYQr2RIMjPbrL9jdfincEhw5D8NZ+Y="; }; # Fix broken tests on "exotic" platforms. @@ -49,9 +49,7 @@ buildPythonPackage rec { assay ]; - # assay is broken on Python >= 3.11 - # https://github.com/brandon-rhodes/assay/issues/15 - doCheck = pythonOlder "3.11"; + doCheck = true; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 8d1087f4ab838..57551e9e67402 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { range-typed-integers ]; - passthru.optional-dependencies = { + optional-dependencies = { spritecollab = [ aiohttp gql @@ -85,7 +85,7 @@ buildPythonPackage rec { pytestCheckHook parameterized xmldiff - ] ++ passthru.optional-dependencies.spritecollab; + ] ++ optional-dependencies.spritecollab; pytestFlagsArray = [ "test/" ]; disabledTestPaths = [ "test/skytemple_files_test/common/spritecollab/sc_online_test.py" @@ -100,6 +100,6 @@ buildPythonPackage rec { mainProgram = "skytemple_export_maps"; license = licenses.gpl3Plus; maintainers = with maintainers; [ marius851000 ]; - broken = stdenv.isDarwin; # pyobjc is missing + broken = stdenv.hostPlatform.isDarwin; # pyobjc is missing }; } diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index ed60b724f840f..83873d2e0aa3b 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { hash = "sha256-0a57RmZPztcIeRs7GNYe18JO+LlWoeNWG3nD9cG0XIU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Foundation ]; diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index 7eeb546c5d5d9..ace86514b22aa 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { dependencies = [ slack-sdk ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiohttp websockets @@ -94,7 +94,7 @@ buildPythonPackage rec { docker pytest-asyncio pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME="$(mktemp -d)" diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 9f6e1cba8a5b0..2f4c2d0f00819 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.31.0"; + version = "3.33.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-6fuC2yIGtjIxnEiI2/1sQ5RZB18WlteozyS8/XDTwkg="; + hash = "sha256-OcGzpYwa8Ouf1ojQS9KnqlL37EYCZo5yjNeXXrkd0B4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix index dea81113d3908..9c8031a6b878b 100644 --- a/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/pkgs/development/python-modules/sleekxmpp/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { }; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "XMPP library for Python"; license = licenses.mit; homepage = "http://sleekxmpp.com/"; diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index e531acb40b991..68405f52beff5 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/jborean93/smbprotocol/issues/119 "test_copymode_local_to_local_symlink_dont_follow" "test_copystat_local_to_local_symlink_dont_follow_fail" diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index d9d3d09a45526..e2df0cedfc652 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "snakemake-interface-common"; - version = "1.17.3"; + version = "1.17.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "snakemake"; repo = "snakemake-interface-common"; rev = "refs/tags/v${version}"; - hash = "sha256-91Sh6JNpCEWPRkrEwoJeycZS1D4lXWA4IJLVcxBYLnI="; + hash = "sha256-PMEs7yeVfSnZKbabLrbXfIKCIPteNV1wzbt9RIDG3qU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix index c20a0ad122462..5d5518de96dbf 100644 --- a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snakemake-interface-report-plugins"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-30x4avA3FrqZ4GoTl6Js5h3VG5LW7BNHOcNWxznXoT0="; + hash = "sha256-yk2fYlueaobXJgF7ob6jTccEz8r0geq1HFVsa+ZO30Q="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix new file mode 100644 index 0000000000000..18925b034c051 --- /dev/null +++ b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + snakemake-interface-storage-plugins, + snakemake-interface-common, + sysrsync, +}: + +buildPythonPackage rec { + pname = "snakemake-storage-plugin-fs"; + version = "1.0.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "snakemake"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-9A2W+V0d9K1Ei4WXqIZfIcOYsWgpGVP7P/ANy8jOGu0="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + snakemake-interface-storage-plugins + snakemake-interface-common + sysrsync + ]; + + # The current tests are not worth dealing with cyclic dependency on snakemake + doCheck = false; + + # Use nothing due to a cyclic dependency on snakemake + pythonImportsCheck = [ ]; + + meta = with lib; { + description = "A Snakemake storage plugin that reads and writes from a locally mounted filesystem using rsync"; + homepage = "https://github.com/snakemake/snakemake-storage-plugin-fs"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix index 99a540790bca3..405020619195e 100644 --- a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix +++ b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "snakemake-storage-plugin-xrootd"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Wo6eF8XlHh9OiD2rTMCchyq1sQ8gjkKnoD4JsKDmJ2A="; + hash = "sha256-1plBss9jRzIIGQE7rXDEnAomFxNzSUKsw0VyhYA2mIc="; }; # xrootd<6.0.0,>=5.6.4 not satisfied by version 5.7rc20240303 diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index a0192ee1188e0..13a86fb63e9d5 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { # AssertionError: Expected 'fileno' to not have been called. Called 1 times. "test_client_stop_no_wait" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 # port binding conflicts "test_snitun_single_runner_timeout" diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 8b1b0407477b2..0dd9835e617bd 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -5,19 +5,20 @@ certifi, cffi, charset-normalizer, + cryptography, cython, - fetchPypi, + fetchFromGitHub, filelock, idna, keyring, - oscrypto, packaging, pandas, platformdirs, pyarrow, - pycryptodomex, pyjwt, pyopenssl, + pytest-xdist, + pytestCheckHook, pythonOlder, pytz, requests, @@ -25,40 +26,37 @@ sortedcontainers, tomlkit, typing-extensions, - wheel, }: buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.12.1"; + version = "3.12.2"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "snowflake_connector_python"; - inherit version; - hash = "sha256-5Dt9S0SI7Nl7W/YlOcxQLX6E2CFcVH6utN2SjAtyErk="; + src = fetchFromGitHub { + owner = "snowflakedb"; + repo = "snowflake-connector-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-A6QnKCROd1vJpFCTrLEoHVo43xojdjpgYS3qQm64gcY="; }; build-system = [ cython setuptools - wheel ]; - dependencies = [ asn1crypto certifi cffi charset-normalizer + cryptography filelock idna - oscrypto packaging platformdirs - pycryptodomex pyjwt pyopenssl pytz @@ -68,7 +66,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { pandas = [ pandas pyarrow @@ -76,9 +74,35 @@ buildPythonPackage rec { secure-local-storage = [ keyring ]; }; - # Tests require encrypted secrets, see - # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters - doCheck = false; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + ]; + + disabledTestPaths = [ + # Tests require encrypted secrets, see + # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters + "test/extras/simple_select1.py" + "test/integ" + # error getting schema from stream, error code: 0, error info: Expected to + # be able to read 19504 bytes for message body but got 19503 + "test/unit/test_connection.py" + "test/unit/test_cursor.py" + "test/unit/test_error_arrow_stream.py" + "test/unit/test_ocsp.py" + "test/unit/test_retry_network.py" + "test/unit/test_s3_util.py" + ]; + + disabledTests = [ + # Tests connect to the internet + "test_status_when_num_of_chunks_is_zero" + "test_test_socket_get_cert" + ]; pythonImportsCheck = [ "snowflake" diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index 2b9f149e20c89..b2b4622c38382 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -3,6 +3,7 @@ beautifulsoup4, buildPythonPackage, fetchFromGitHub, + fetchpatch, filelock, lxml, pythonOlder, @@ -14,20 +15,29 @@ buildPythonPackage rec { pname = "snscrape"; version = "0.7.0.20230622"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "JustAnotherArchivist"; - repo = pname; + repo = "snscrape"; rev = "refs/tags/v${version}"; hash = "sha256-9xAUMr1SWFePEvIz6DFEexk9Txex3u8wPNfMAdxEUCA="; }; - nativeBuildInputs = [ setuptools-scm ]; + patches = [ + # Fix find_module deprecation, https://github.com/JustAnotherArchivist/snscrape/pull/1036 + (fetchpatch { + name = "fix-find-module.patch"; + url = "https://github.com/JustAnotherArchivist/snscrape/commit/7f4717aaaaa8d4c96fa1dbe72ded799a722732ee.patch"; + hash = "sha256-6O9bZ5GlTPuR0MML/O4DDRBcDX/CJbU54ZE551cfPHo="; + }) + ]; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + dependencies = [ beautifulsoup4 filelock lxml @@ -44,9 +54,9 @@ buildPythonPackage rec { meta = with lib; { description = "Social networking service scraper"; - mainProgram = "snscrape"; homepage = "https://github.com/JustAnotherArchivist/snscrape"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ivan ]; + mainProgram = "snscrape"; }; } diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index 7f9091b46f435..b2641bed1e7f8 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { requests-oauthlib ]; - passthru.optional-dependencies = { + optional-dependencies = { openidconnect = [ python-jose ]; saml = [ lxml @@ -56,7 +56,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook httpretty - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # Disable checking the code coverage prePatch = '' diff --git a/pkgs/development/python-modules/solarlog-cli/default.nix b/pkgs/development/python-modules/solarlog-cli/default.nix index 25a4fc4deecbf..a2b039d217a89 100644 --- a/pkgs/development/python-modules/solarlog-cli/default.nix +++ b/pkgs/development/python-modules/solarlog-cli/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "solarlog-cli"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dontinelli"; repo = "solarlog_cli"; rev = "refs/tags/v${version}"; - hash = "sha256-x9MovIKFImu60Ns2sJTy71S22cR9Az/yNMWzGM50y7Y="; + hash = "sha256-jNvwSh89Ncl/rR/cUNVbJfJThJTa9JlANjvH/vRruAU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 5d4e946c85184..bcf489a45330d 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { dependencies = [ regex ]; # loops forever - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "somajo" ]; diff --git a/pkgs/development/python-modules/sopel/python311-support.patch b/pkgs/development/python-modules/sopel/python311-support.patch deleted file mode 100644 index dfa0283409acd..0000000000000 --- a/pkgs/development/python-modules/sopel/python311-support.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff --git a/sopel/plugins/handlers.py b/sopel/plugins/handlers.py -index 76902aa0..05f0279d 100644 ---- a/sopel/plugins/handlers.py -+++ b/sopel/plugins/handlers.py -@@ -46,20 +46,15 @@ from __future__ import absolute_import, division, print_function, unicode_litera - - import imp - import importlib -+import importlib.util - import inspect - import itertools - import os -+import sys - - from sopel import loader - from . import exceptions - --try: -- reload = importlib.reload --except AttributeError: -- # py2: no reload function -- # TODO: imp is deprecated, to be removed when py2 support is dropped -- reload = imp.reload -- - - class AbstractPluginHandler(object): - """Base class for plugin handlers. -@@ -301,7 +296,7 @@ class PyModulePlugin(AbstractPluginHandler): - - This method assumes the plugin is already loaded. - """ -- self._module = reload(self._module) -+ self._module = importlib.reload(self._module) - - def is_loaded(self): - return self._module is not None -@@ -402,45 +397,31 @@ class PyFilePlugin(PyModulePlugin): - - if good_file: - name = os.path.basename(filename)[:-3] -- module_type = imp.PY_SOURCE -+ spec = importlib.util.spec_from_file_location( -+ name, -+ filename, -+ ) - elif good_dir: - name = os.path.basename(filename) -- module_type = imp.PKG_DIRECTORY -+ spec = importlib.util.spec_from_file_location( -+ name, -+ os.path.join(filename, '__init__.py'), -+ submodule_search_locations=filename, -+ ) - else: - raise exceptions.PluginError('Invalid Sopel plugin: %s' % filename) - - self.filename = filename - self.path = filename -- self.module_type = module_type -+ self.module_spec = spec - - super(PyFilePlugin, self).__init__(name) - - def _load(self): -- # The current implementation uses `imp.load_module` to perform the -- # load action, which also reloads the module. However, `imp` is -- # deprecated in Python 3, so that might need to be changed when the -- # support for Python 2 is dropped. -- # -- # However, the solution for Python 3 is non-trivial, since the -- # `importlib` built-in module does not have a similar function, -- # therefore requires to dive into its public internals -- # (``importlib.machinery`` and ``importlib.util``). -- # -- # All of that is doable, but represents a lot of work. As long as -- # Python 2 is supported, we can keep it for now. -- # -- # TODO: switch to ``importlib`` when Python2 support is dropped. -- if self.module_type == imp.PY_SOURCE: -- with open(self.path) as mod: -- description = ('.py', 'U', self.module_type) -- mod = imp.load_module(self.name, mod, self.path, description) -- elif self.module_type == imp.PKG_DIRECTORY: -- description = ('', '', self.module_type) -- mod = imp.load_module(self.name, None, self.path, description) -- else: -- raise TypeError('Unsupported module type') -- -- return mod -+ module = importlib.util.module_from_spec(self.module_spec) -+ sys.modules[self.name] = module -+ self.module_spec.loader.exec_module(module) -+ return module - - def get_meta_description(self): - """Retrieve a meta description for the plugin. diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index 819975014f147..3e421ab2ac864 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "0.12.1"; format = "setuptools"; # https://github.com/bastibe/python-soundfile/issues/157 - disabled = isPyPy || stdenv.isi686; + disabled = isPyPy || stdenv.hostPlatform.isi686; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index aefb730b229d2..8e29c2845d12f 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -21,7 +21,8 @@ pytestCheckHook, }: let - stdenv' = if stdenv.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.14"; } else stdenv; + stdenv' = + if stdenv.hostPlatform.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.14"; } else stdenv; in buildPythonPackage rec { pname = "sourmash"; diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix index 66b1c20655124..9315953b5a25c 100644 --- a/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # Fails because spacy_alignments module cannot be loaded correctly. doCheck = false; diff --git a/pkgs/development/python-modules/spacy/annotation-test/annotate.py b/pkgs/development/python-modules/spacy/annotation-test/annotate.py index 5acc3ddc60fdb..db5fac2f7f6cf 100644 --- a/pkgs/development/python-modules/spacy/annotation-test/annotate.py +++ b/pkgs/development/python-modules/spacy/annotation-test/annotate.py @@ -29,7 +29,7 @@ def test_entities(doc_en_core_web_sm): ('Google', 'ORG'), ('2007', 'DATE'), ('American', 'NORP'), - ('Thrun', 'PERSON'), + ('Thrun', 'GPE'), ('Recode', 'ORG'), ('earlier this week', 'DATE'), ] diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 9842e22c92d94..df9004d483ff6 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - blis, buildPythonPackage, callPackage, catalogue, @@ -10,13 +9,11 @@ fetchPypi, hypothesis, jinja2, - jsonschema, langcodes, mock, murmurhash, numpy, packaging, - pathy, preshed, pydantic, pytestCheckHook, @@ -29,7 +26,6 @@ thinc, tqdm, typer, - typing-extensions, wasabi, weasel, writeScript, @@ -40,36 +36,42 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.7.5"; + version = "3.8.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pkjGy/Ksx6Vaae6ef6TyK99pqoKKWHobxc//CM88LdM="; + hash = "sha256-Szfr0lraQFmw3J4Ik+cN3l34NIUymgaO8EWA5wiSpl0="; }; - pythonRelaxDeps = [ - "smart-open" - "typer" - ]; + postPatch = '' + # spaCy is compatible with NumPy v1 and v2 + substituteInPlace pyproject.toml setup.cfg \ + --replace-fail "numpy>=2.0.0,<2.1.0" numpy + ''; - nativeBuildInputs = [ + build-system = [ + cymem cython_0 + murmurhash + numpy + thinc + ]; + + pythonRelaxDeps = [ + "thinc" ]; - propagatedBuildInputs = [ - blis + dependencies = [ catalogue cymem jinja2 - jsonschema langcodes murmurhash numpy packaging - pathy preshed pydantic requests @@ -82,7 +84,7 @@ buildPythonPackage rec { typer wasabi weasel - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; nativeCheckInputs = [ pytestCheckHook @@ -90,8 +92,6 @@ buildPythonPackage rec { mock ]; - doCheck = true; - # Fixes ModuleNotFoundError when running tests on Cythonized code. See #255262 preCheck = '' cd $out @@ -132,7 +132,7 @@ buildPythonPackage rec { description = "Industrial-strength Natural Language Processing (NLP)"; mainProgram = "spacy"; homepage = "https://github.com/explosion/spaCy"; - changelog = "https://github.com/explosion/spaCy/releases/tag/v${version}"; + changelog = "https://github.com/explosion/spaCy/releases/tag/release-v${version}"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 7f25c4281c37b..f5049b13c3ac8 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,506 +1,506 @@ [ { "pname": "ca_core_news_lg", - "version": "3.7.0", - "sha256": "1hlrbrgiahj6jkap3hrhki6zk10wg7dpajxcp540darprl7w60vy", + "version": "3.8.0", + "sha256": "0xb707rrd8z080rzh85hivl771s10d38l3bnwpa6and5qxz96nf2", "license": "gpl3" }, { "pname": "ca_core_news_md", - "version": "3.7.0", - "sha256": "0ygygvw8bs510dyz4k9sfmxxlqssmv566aac9k3xiip3k5lfgysi", + "version": "3.8.0", + "sha256": "0aav6dmilwjz343hw5741n2hriw1mcgmjbw1ncjrbwzp63034qff", "license": "gpl3" }, { "pname": "ca_core_news_sm", - "version": "3.7.0", - "sha256": "1cj53w9vzdb2xqjpprkhgrglm70g0vaw0308jxnd7nvgn6vfx09s", + "version": "3.8.0", + "sha256": "0yv9f7bj14g5kqgxdwr6fa2w4h7kwapwxgaxv493q0ha5fxva3ij", "license": "gpl3" }, { "pname": "ca_core_news_trf", - "version": "3.7.0", - "sha256": "1il0ak0wh4dlxxdddwz8a2vr6817cn5fwrflxwgcd25njx7w886g", + "version": "3.8.0", + "sha256": "0j04hf59a2hndwqifk2rm2risbnj7mcafjl9bfzci8n019x0aisz", "license": "gpl3" }, { "pname": "da_core_news_lg", - "version": "3.7.0", - "sha256": "04bm53v7dpdlnlk39wppfir792jp2qq9kkw0zs9i0ki68sxh8giz", + "version": "3.8.0", + "sha256": "1gn2cmfc9vpd5bs7n7aprsvqxfds210lfcn7r7nhspa1d5377ss5", "license": "cc-by-sa-40" }, { "pname": "da_core_news_md", - "version": "3.7.0", - "sha256": "1c35avbhkx16icnqsp571nvilcra143kqjvnszd7j0xnnzn5iqyx", + "version": "3.8.0", + "sha256": "0hgjj1k5cclr1ljvr4q2v3zkwl5z8jrqfc2pzz8xszgpyzgjpr00", "license": "cc-by-sa-40" }, { "pname": "da_core_news_sm", - "version": "3.7.0", - "sha256": "1hlx9zgixv91x4xa489gnwm3qdghffk4fimg7mjncyjw1g9xskif", + "version": "3.8.0", + "sha256": "1xnziq02y7pjib98bh7rbv4fp37kbl88qxm06mwj9hwm8cfzd3wh", "license": "cc-by-sa-40" }, { "pname": "da_core_news_trf", - "version": "3.7.0", - "sha256": "02hbg58ql1dcd7zdlgb959106inaqnvxphc2dmxf7myjr4si3w37", + "version": "3.8.0", + "sha256": "03ikrbpwp6cpgcn17kz791mjjdzr561mabbbjwasnvds9mkmmg8k", "license": "cc-by-sa-40" }, { "pname": "de_core_news_lg", - "version": "3.7.0", - "sha256": "1aag695nygpbxrvvknlcic79hyfzdwcc2d9vjgzq2bc43zdf05a0", + "version": "3.8.0", + "sha256": "1b4nfpxmfh4hqkvn95rqr65zppsd1i1arllj8cigv2f47jh4jdz4", "license": "mit" }, { "pname": "de_core_news_md", - "version": "3.7.0", - "sha256": "1qnq7yy38nw1pg8ysxjqyxd82yc3ncl148p90hil2njxg771g1hk", + "version": "3.8.0", + "sha256": "1kbh4g29rqr3wg0rgvvf58bvlijzxpqm7yylwfsla95ixj9r685j", "license": "mit" }, { "pname": "de_core_news_sm", - "version": "3.7.0", - "sha256": "0r0wgf044r0nl267m5dc3zp4cq5ml4b9i6gpkas1hhn708d5sjb1", + "version": "3.8.0", + "sha256": "0ib0sqx6aj03ydc3g5gml1pf9628rny2ijdi9zwr2qilsm9015h6", "license": "mit" }, { "pname": "de_dep_news_trf", - "version": "3.7.0", - "sha256": "05xca8gjpmn7dlj8jb93rv7r0s4wa3nq5h7rkmq6d7h7gy6zpz8f", + "version": "3.8.0", + "sha256": "0qdahnb74zlg4yabzfc57mi3m4cykm2j0spyv9fzy64gibv5r1dz", "license": "mit" }, { "pname": "el_core_news_lg", - "version": "3.7.0", - "sha256": "0n7xk8kbqqis1fivsgvyfmhd6qj853wylrwjl9q352cvbv8zg6dk", + "version": "3.8.0", + "sha256": "0nrd83jx57agpxirjckiiyfjvpdp9wxjx4wn0g4620hac19kidsq", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_md", - "version": "3.7.0", - "sha256": "042vmymi40zgwxg87sfsvq7b9crigh6g9ai7cyz49spcqmvq2qd3", + "version": "3.8.0", + "sha256": "14jlcf7xljz6381ap29ngibpwpgdsicgip6fg7zzhy56kklqvh3h", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_sm", - "version": "3.7.0", - "sha256": "0apky61l3gh2dvfpqaj6vqql5g6sh4bp9i91y7zfgacqvf7jp67g", + "version": "3.8.0", + "sha256": "0chbzki6ldqac89sh3y2nxm7xs31ffhi930k2nbqzzpfkx5583pl", "license": "cc-by-nc-sa-30" }, { "pname": "en_core_web_lg", - "version": "3.7.0", - "sha256": "192mhp5niixq0crqwwmp70g63wbahgr41dpmmjsdqf9189s7qswr", + "version": "3.8.0", + "sha256": "0qpd70cvs8wbwbp4imb7qkgf5gdvfx114prc20500l1r4krqjg3s", "license": "mit" }, { "pname": "en_core_web_md", - "version": "3.7.0", - "sha256": "1wy2kpsninpxwjbqavh963i12041a0av4wmrn8plvb73czp995dg", + "version": "3.8.0", + "sha256": "0lam8a1614j2ab2gkwsd74ky2ap9h2z5yf0yy55ldafw2l3yfksh", "license": "mit" }, { "pname": "en_core_web_sm", - "version": "3.7.0", - "sha256": "01hps9i3v73prqfjrch0da0s38vhbvx0d73g3x1bkrmavan26bj7", + "version": "3.8.0", + "sha256": "0m8g5h6byqms3imxsbj4793zvggs92cqrshrk00qgbvnqhdz78hl", "license": "mit" }, { "pname": "en_core_web_trf", - "version": "3.7.0", - "sha256": "1pnm63bk5k6g6kc5s8v5pwdahqgbh3rlm5mxq3gxk8my3cfkklpc", + "version": "3.8.0", + "sha256": "07v2jk9js1404162ddl7myd0s0ci41f57lh50qdssvxxgjkiivga", "license": "mit" }, { "pname": "es_core_news_lg", - "version": "3.7.0", - "sha256": "1qfadw61yjz1hkp5wldg5ncj50db0b3wvpcfklybij56r4ibz6f2", + "version": "3.8.0", + "sha256": "08g2yydfbrz6i886rw52q1bmb6f785arx2zqk5510b3bp6089cra", "license": "gpl3" }, { "pname": "es_core_news_md", - "version": "3.7.0", - "sha256": "1z9m6f2c3cbjrljdlywdd4c4qj4lky1rb3n20yav5zb9k7jbj3s4", + "version": "3.8.0", + "sha256": "0mgfrd1i9rci0i9f01d9lza4p0yaww6j5l8zpwlygb75vbgwmf3r", "license": "gpl3" }, { "pname": "es_core_news_sm", - "version": "3.7.0", - "sha256": "07fm2bmiwkkia4v491dzkgb3dbp1qfh4j7iba2h4wv8yci6la3n4", + "version": "3.8.0", + "sha256": "1nbbajq0nrbvv6a9hzi3i5axhszmddrg6di8rqj20zwkavp96g7i", "license": "gpl3" }, { "pname": "es_dep_news_trf", - "version": "3.7.0", - "sha256": "1n5sk5jlj6gx4w2ka1ia93bmi4nm2cyfg7fbca2kvmsg6zw8hq27", + "version": "3.8.0", + "sha256": "0xfbibm431jrxwmwk4nvrkwly63w6vwfpd901jp7wjza9p3d0i73", "license": "gpl3" }, { "pname": "fi_core_news_lg", - "version": "3.7.0", - "sha256": "08lk2dgwm99nj2a355s682ar4xwg1av4z3r6qpwq72rkm2h8jkmm", + "version": "3.8.0", + "sha256": "06q1lah7afpgak0l3r6fxjfiizmpld6fn0sbiycrsn2bsqk5nby3", "license": "cc-by-sa-40" }, { "pname": "fi_core_news_md", - "version": "3.7.0", - "sha256": "07hqjw6w8332zf3ki5pbrv7m1kc4y6j3f0czharvv0grr2sfvh84", + "version": "3.8.0", + "sha256": "06g4mkrrmnksf1fxkcwid3dvzs9ri2z4l4dgcvripm6yymchfyjy", "license": "cc-by-sa-40" }, { "pname": "fi_core_news_sm", - "version": "3.7.0", - "sha256": "03bhh3z3r70km19p3x202g66hikfyh309hgb96sycb8lhfr737lk", + "version": "3.8.0", + "sha256": "1r962x11lha38hmmv47hc7hk2whsy3qvnbf3hsqjc4nbagzia4bh", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_lg", - "version": "3.7.0", - "sha256": "02dv00w67alc1avwq93hara49va7mnsmmm2kww961p5a3k3ldz20", + "version": "3.8.0", + "sha256": "11x2cydzc8x5bv5d1bkyqnfawzj1kb5lslndqq226jvb6yc7kkcp", "license": "lgpllr" }, { "pname": "fr_core_news_md", - "version": "3.7.0", - "sha256": "184gxwgf980x3vsn45zycd3cr1mkl3r1vbf3hb5hrhs8xk3y1v34", + "version": "3.8.0", + "sha256": "1afnibp9r84xxv5dvds7jvz953khamcklj8vmjrgh3ix9bicylq3", "license": "lgpllr" }, { "pname": "fr_core_news_sm", - "version": "3.7.0", - "sha256": "1ifbazd9hs1fhy22hjqhwkq0bnnsr3km3ff60v8arkyq5vlprhdb", + "version": "3.8.0", + "sha256": "1377rja1x0v0fwnvqyqgiqdgnba6fsj83d3gpc2l88qqrplhaxai", "license": "lgpllr" }, { "pname": "fr_dep_news_trf", - "version": "3.7.0", - "sha256": "0shhlmyyd79bbvxf6dfr5r99lfhjcywvvrji67k2hxz4604q8bxv", + "version": "3.8.0", + "sha256": "1g7d3ifagifp0mwqn7d5zafac2cywvykd8fcngr5zzhffgk6x0bk", "license": "lgpllr" }, { "pname": "hr_core_news_lg", - "version": "3.7.0", - "sha256": "1r8cdyawf6fdvx1xn1l470mx31lbx5cjpivlx1pvv9ckp71zp28z", + "version": "3.8.0", + "sha256": "1rpk4ppdpzv20sak198rvdp2v53rh3k0qfbnayjmhq76pv43g972", "license": "cc-by-sa-40" }, { "pname": "hr_core_news_md", - "version": "3.7.0", - "sha256": "1dzi6dxwjpbddc0rjqajj4k1c61sacyycwnjvy03h3aclxacqn53", + "version": "3.8.0", + "sha256": "1rv4q1kz5mjsisi3v3kh836jb8i7gh01qhylni5pxbgp1ysrhrmv", "license": "cc-by-sa-40" }, { "pname": "hr_core_news_sm", - "version": "3.7.0", - "sha256": "0dmhv1fa46hi78jgv562v4x3mfl7svchs6kiz35s63ph9ik5r6f2", + "version": "3.8.0", + "sha256": "12hncjs9ihy5807a73c6dx8sk409ps9jzh5m33298nx0vx6jaaq9", "license": "cc-by-sa-40" }, + { + "pname": "it_core_news_lg", + "version": "3.8.0", + "sha256": "1qnz7r8pax2pim9a3ywawpmz40hwawsfkv4wziqglm1wwp92jbf4", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "it_core_news_md", + "version": "3.8.0", + "sha256": "0kfbb8n8jczdqr5g653nbgpgs8cg637dhby37s0dss7nkfwci5dm", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "it_core_news_sm", + "version": "3.8.0", + "sha256": "0jzrj6rh7cq09dpgab2ji88d3d4py28ai4s3pafxpq5cz19wdd19", + "license": "cc-by-nc-sa-30" + }, { "pname": "ja_core_news_lg", - "version": "3.7.0", - "sha256": "1nb77kivzy0wixsw8ijmw78fffkpqa63kykqph04jzmh75ra4wvg", + "version": "3.8.0", + "sha256": "0bg247vg6al2mr5rpwhpzc14g4i9lgq7n5559jv655s58pipknn3", "license": "cc-by-sa-40" }, { "pname": "ja_core_news_md", - "version": "3.7.0", - "sha256": "0p22bwc24q76cl7ndszvhqgllvq3ws3i3vbjsp5xvhxxls6p49x9", + "version": "3.8.0", + "sha256": "1xiyl8w0x0s6v3532xjyh73hrbv6plcrx4ifpv7j76856kjqk459", "license": "cc-by-sa-40" }, { "pname": "ja_core_news_sm", - "version": "3.7.0", - "sha256": "0bfvkds4dqynjshk2lxfya9yfcnbvwjfhc6n7yh0852ms1ycicaw", + "version": "3.8.0", + "sha256": "0553lk1vzld383cqw7hjmrwm0cad48xhvc92c9i528axv8ahwvw5", "license": "cc-by-sa-40" }, { "pname": "ja_core_news_trf", - "version": "3.7.0", - "sha256": "0n2lqql4flnilgf671n5mcdp8vi5pdjfz3vymxsapc1gyp29jykk", + "version": "3.8.0", + "sha256": "1zlih4fjl1122m8zl9ai80pabisb4hqy8h90l63k2syv6778i88k", "license": "cc-by-sa-30" }, - { - "pname": "it_core_news_lg", - "version": "3.7.0", - "sha256": "0gwn6pf0rzbplahs2wnzp6379mmj066dqhijhq4ln4552fz4d1yx", - "license": "cc-by-nc-sa-30" - }, - { - "pname": "it_core_news_md", - "version": "3.7.0", - "sha256": "003w99glj5jgb6gfqygb4c5jljhc85ck6yqn49h9m8fa9vmaylhx", - "license": "cc-by-nc-sa-30" - }, - { - "pname": "it_core_news_sm", - "version": "3.7.0", - "sha256": "0kng2w5xj1irz6c5d6vl4px9my1z41h8zfvf9b01rh9yvjmhfyzc", - "license": "cc-by-nc-sa-30" - }, { "pname": "ko_core_news_lg", - "version": "3.7.0", - "sha256": "0hxwkb1w58vb4g1162ry12a63hnj20q20n66xnlvc0r96ibj4fia", + "version": "3.8.0", + "sha256": "17s9r82zwdkymvk1h1bwzxxkzy77bsyh29g8aansdhzrvdr4xvc4", "license": "cc-by-sa-40" }, { "pname": "ko_core_news_md", - "version": "3.7.0", - "sha256": "1ai7cyk58c7rj0dy82l01w5r4fkp2cpnhcsarzas1ml0icnk1srm", + "version": "3.8.0", + "sha256": "0bmb04b6xl5a70hsy33lwhyipwrnsih9vmd5kg8ilpj3728916px", "license": "cc-by-sa-40" }, { "pname": "ko_core_news_sm", - "version": "3.7.0", - "sha256": "16m1lsikf8ghsazpdprd9fc4n3m8an9qzjbyjwyvwkr0f2p0nmph", + "version": "3.8.0", + "sha256": "0r6n4vazi5fqn88sfnd9yxzr341j211ndinncl0m7z995db92vcd", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_lg", - "version": "3.7.0", - "sha256": "174p8i2lnwq324qcs85s3c0j7iyav12yk0i896l23khg9gyzkmlg", + "version": "3.8.0", + "sha256": "1gl8iqb10ah29i1hlrqbych9xzlwliszb97j4adjk1ahq1bdir84", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_md", - "version": "3.7.0", - "sha256": "1117sij5w4s297q5j6h210hafh2amm6pd9m9m7m3608rfwsvm9g8", + "version": "3.8.0", + "sha256": "1z8zxralxaymj22p67wdi0r9z8rz7y7adjg8xdarcg6gz3znvssh", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "3.7.0", - "sha256": "1j04apdc63c2b2namic4blhm9mk8inmr8ynid09mncljwskg0fjb", + "version": "3.8.0", + "sha256": "1alg1sspi044pwkq5kascdhx0x7038n8jgln4l7k8wwjpm8b9ri7", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_lg", - "version": "3.7.0", - "sha256": "0fshypj08hvcbbqjfxkzyfs72p5rm5fw1pfclgln2y0whfap0lqx", + "version": "3.8.0", + "sha256": "0miw79yr5rl3sbgjc614lrnywqhjkk7x2hiksh45b889pzff3kn8", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_md", - "version": "3.7.0", - "sha256": "1il8pzfk2nd09hd8kmk5znf66ir4bsrp1ax7jaxghi76ggrbpzyx", + "version": "3.8.0", + "sha256": "1qr7418j5gv05aix449x4mnqqgw6fdaz6bmgbd685x2dzk8avnv8", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_sm", - "version": "3.7.0", - "sha256": "1805hkkm3hjbzw8pg6q08p61bpjk5h13ldzpik0gb9wqw9f69dbp", + "version": "3.8.0", + "sha256": "1nhwgqyqaw7zmb42l20bxql9dib8qnzhxh41194glg9lplifgdx3", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_lg", - "version": "3.7.0", - "sha256": "1zqwp8a8d26mi94dkib5ahhkr9hawxx4vag4fhibfa6m0prpzh9h", + "version": "3.8.0", + "sha256": "1pmcbgyswk7q163nwqisc5qqp8vbc4vhyc1qza84axprwxpj7yy5", "license": "mit" }, { "pname": "nb_core_news_md", - "version": "3.7.0", - "sha256": "1ilxscc6hnmiby7ip7kgx3aih9msqmg21iqakkwny3z1lnnly466", + "version": "3.8.0", + "sha256": "1ch77iqiij62w9xy3ylh7f9rzm987dxm9yp03136j0niqm11cxkl", "license": "mit" }, { "pname": "nb_core_news_sm", - "version": "3.7.0", - "sha256": "1wrchw1rhlzrji5j46lpwzydiaxcywaglz0nvm4vk1np45r7l3dm", + "version": "3.8.0", + "sha256": "0s4fjfxiycn8fgm0j581l2ax23f3r5zvkfvc5rsylapmvsnf6xkh", "license": "mit" }, { "pname": "nl_core_news_lg", - "version": "3.7.0", - "sha256": "1777sdmjcc7lnj0j26zf00ab7pr09v1220k47fq724cw9l0knin1", + "version": "3.8.0", + "sha256": "1d096m2q9g1xh985fibvmdid406c3h9h5qhy727mf6p00ys04www", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_md", - "version": "3.7.0", - "sha256": "19g6hzljz0zi1fppl7c3w8gdak42af3f7z45cg12qyw7vnjl9988", + "version": "3.8.0", + "sha256": "1wy5nvcn8v2rnqyxb397ylf89m1w9sfpm9cvjhn6w2x0kw1xqi37", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "3.7.0", - "sha256": "0gcbb0vs5snif4j5a7z9ha2sj9jby0hnxbp0w5h73yxyg37fk8d4", + "version": "3.8.0", + "sha256": "0zpwkfw620nj2p2ij5xzzjf2iskd782lbxgi6va18z4ipva9j7yk", "license": "cc-by-sa-40" }, { "pname": "pl_core_news_lg", - "version": "3.7.0", - "sha256": "0glpd8lv7gwq3bryx32q84ny6pdvwrjm7lhxg9h2cdjrair8vx94", + "version": "3.8.0", + "sha256": "17alf74nf9zbchmz1c7146111nyynnx8m21dwd8my66pyy3wg227", "license": "gpl3" }, { "pname": "pl_core_news_md", - "version": "3.7.0", - "sha256": "04qwfh3dam7advyysdcdak7vna5gvirns001zq09kxhj766bc2k9", + "version": "3.8.0", + "sha256": "060qk4k3frjyzx45d8blxm7z58hz58f3m2nnf1npkw0rqyxysqzg", "license": "gpl3" }, { "pname": "pl_core_news_sm", - "version": "3.7.0", - "sha256": "00wygnwjpvfgiccb643720691pxhcb4pnk3zjj35hv9gbbx6qb8c", + "version": "3.8.0", + "sha256": "1w7z1jbhl3j2985ap7nkv41pscvsd94f9kz1qy8d5j3vrpmbcpxc", "license": "gpl3" }, { "pname": "pt_core_news_lg", - "version": "3.7.0", - "sha256": "1im0hgr6wd4sfsfb0ddnl2ad9pi1vs0vvr7rq3g14vda3x2f1rxy", + "version": "3.8.0", + "sha256": "114nxw6zjb8r2jl9s7056gs2vdr4vk1myk9mxbj5phs3w1lhmc7d", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_md", - "version": "3.7.0", - "sha256": "0zpgxg3ass084qv4bvk9wz15ya92w6a7d2p9p24g49a530b8gd7y", + "version": "3.8.0", + "sha256": "1kvvj62f1msbb3qbn7vlh43aihxyzz4jz3955kr63sj61ygnfrmq", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "3.7.0", - "sha256": "0z64w8599xwjvxdmrdlr08yyk4a5174m4a39m3zivgib0b5jyvdq", + "version": "3.8.0", + "sha256": "0da37fd4ly5czimly84lz9dpa4hjshrbha059fwaly1cmdlcr40m", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_lg", - "version": "3.7.0", - "sha256": "1y45xhdjlhf8026vlsdrxvmiwj8p9hzlpdg628kdcdzmcrr23l5j", + "version": "3.8.0", + "sha256": "1yddlyd8p5jsbvadli2n4yl5sxq2c3r13fsl2izpkzh7j1fgilrr", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_md", - "version": "3.7.0", - "sha256": "0jw71lav2fim48ff34mf137dsnn3arac555b9rf4flamiy8xg7y6", + "version": "3.8.0", + "sha256": "1hb6n1jbc1xr543x879vhcphi1f8ndn7gzm9ixa99dgsmka6jkrd", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_sm", - "version": "3.7.0", - "sha256": "0r35hxm6dgk2fnwl79ss25g6lfkgrd1h24zf96ys2p3cppp2i167", + "version": "3.8.0", + "sha256": "0ilvp6lpvwn4v969zi2jydjf05qi75x8cdw6ih96hwscz8nijwcr", "license": "cc-by-sa-40" }, { "pname": "ru_core_news_lg", - "version": "3.7.0", - "sha256": "02qnl0cfvx0m0icdbpn9zfsv39sp9k6sfdarzazhz7xnxzxib93q", + "version": "3.8.0", + "sha256": "1ica150slrxj1wysjnf114khqbbg4rdjvr1qf4md731iwg3iyi4w", "license": "mit" }, { "pname": "ru_core_news_md", - "version": "3.7.0", - "sha256": "187lkkm04x1ylg3jzyhf9avzpj2jkb48n86i36hqi6iqdv6yhfd5", + "version": "3.8.0", + "sha256": "023fpckxrar2d10y1pm2nlrha3xp49wmci7jyc64w5scssm1fj89", "license": "mit" }, { "pname": "ru_core_news_sm", - "version": "3.7.0", - "sha256": "11mh1rd0q024xfagdqkly1n4nndksrlq650n51jl1x1pmzlsdgzl", + "version": "3.8.0", + "sha256": "040k26qch2c847al1w1k451v5zjfplwan3mn2fvsjcrzjnwa4k56", "license": "mit" }, { "pname": "sl_core_news_lg", - "version": "3.7.0", - "sha256": "128ayhp21szc31ckiq3i8vib42i9xnz4lpi1709gjdc38cpmpnlp", + "version": "3.8.0", + "sha256": "01hcvzb0n1yxhgflrpchc9r1ja9wfksi16jahf0z57n4hj5a0d34", "license": "cc-by-sa-40" }, { "pname": "sl_core_news_md", - "version": "3.7.0", - "sha256": "07gx174gw5q1zgyyg1xhfplihhnr311f9562ri5pdd2hgjyz58yb", + "version": "3.8.0", + "sha256": "1msfdbpxhcxfg6ngv329vsbj418lj7kqspld38m2zfyxkyd71azx", "license": "cc-by-sa-40" }, { "pname": "sl_core_news_sm", - "version": "3.7.0", - "sha256": "005xwsnh5y3pf8y64lhvrzcbh8y34yr3in204as6hv7krsfg8bxa", + "version": "3.8.0", + "sha256": "07kz0rhka4s7vq5c9vrvlhrm83kr2k4wvhkq0bfcr49km2sxy5xw", "license": "cc-by-sa-40" }, { "pname": "sl_core_news_trf", - "version": "3.7.0", - "sha256": "0x97lwm1i2dq4kdg6rvarh9mnlcx45cnwq80qpjwv3b7zmviyq8c", + "version": "3.8.0", + "sha256": "1idihnpsxaxazkzqgmxigcd488627cr2i1xz7gdbvybqxzkn0qpm", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_lg", - "version": "3.7.0", - "sha256": "05qaff8r3vs30zaxja1lgpibd12njp9ciq49zs26i6d4dqa18hdp", + "version": "3.8.0", + "sha256": "1277yk9vn5f45js32kgqm825b8q0wpbafdlmamf9sgv4dvcv7942", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_md", - "version": "3.7.0", - "sha256": "0c64lqm10zmy863gs5h3ghx7662c8g7iyapn2rjhmz6909d82yyl", + "version": "3.8.0", + "sha256": "1k9hkjzhm5vfh83zrdgbfw5m2vlwyqlafpg9ba01iz8v60n0pqjp", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_sm", - "version": "3.7.0", - "sha256": "1ik8b2nvxdalglwqg0zl4wbqnd2dyhdcy5hvxh40gi77rg2qd6kb", + "version": "3.8.0", + "sha256": "1v1x66gn7qsfn01a3gijzn8n167s4b665i4023szdm139dcjyz02", "license": "cc-by-sa-40" }, { "pname": "uk_core_news_lg", - "version": "3.7.0", - "sha256": "1qbw16y3ha690fqq71w7r46n8mz7d8za2iw1lljpqpf49my408q1", + "version": "3.8.0", + "sha256": "0953hh9axsdp7jcm4i75m92wj2zpb185mbmm128p0qj2h38506s9", "license": "mit" }, { "pname": "uk_core_news_md", - "version": "3.7.0", - "sha256": "0znfyl8cdvxbxfhypwkjv84hcs6n457wh4j2cl1sfp9pgsd7bmzb", + "version": "3.8.0", + "sha256": "0mvlkpnz0waxmm7fl366s22jw59whc4mav65wxghkjc42sk00yvh", "license": "mit" }, { "pname": "uk_core_news_sm", - "version": "3.7.0", - "sha256": "08scx97j87rrhyrg5smj9ydwmdhl81859qaqj2klgqqpykg0xwlc", + "version": "3.8.0", + "sha256": "094nnpr61h5rr074rpq2bwlk9yg5qaf76bwf4zpncvia936xnzvp", "license": "mit" }, { "pname": "uk_core_news_trf", - "version": "3.7.0", - "sha256": "14s4xwr0qs8x3d2fca2m1nj6ksl82gggj2by7c817gii1bdvn47p", + "version": "3.8.0", + "sha256": "0450y8pla94qj04ijf95qahnj9wvzmavqfy3mnliczkz04z3hgmw", "license": "mit" }, { "pname": "xx_ent_wiki_sm", - "version": "3.7.0", - "sha256": "1k06aa8xsx2qcmd4lz02sfxmgif5nngni8dc4y0w0d4x88icdscn", + "version": "3.8.0", + "sha256": "0sxyys9by4hfksgizwm87crrhrijb9yiywcxpw5315madyzg3w50", "license": "mit" }, { "pname": "xx_sent_ud_sm", - "version": "3.7.0", - "sha256": "13fc4dmmmkanxaxabyx0sa2sh53p92jp3mj263pf31yh98kryxpw", + "version": "3.8.0", + "sha256": "1pwyl23nvmmkpvq5wgafdqq0mlnq14l2svh9m6gi6w0skv7dd5fq", "license": "cc-by-sa-30" }, { "pname": "zh_core_web_lg", - "version": "3.7.0", - "sha256": "1kqdczq5id0sqnyg3sq5g8n7fcknz53srvd72qmz4wrymy5h81qa", + "version": "3.8.0", + "sha256": "0d0c71w18vm4ld9njx4bk8p26d5vyyx6n6j60d2qa1ss9w87bfpm", "license": "mit" }, { "pname": "zh_core_web_md", - "version": "3.7.0", - "sha256": "03m5gnx47mcyx7sh1g3dgqnarvprdkvkyxibsli6yrnvx3vz434j", + "version": "3.8.0", + "sha256": "1y3k6lczs42vhza46v2jaraf8gd2i5f6dfdmmbvdvjq6ykh09ka2", "license": "mit" }, { "pname": "zh_core_web_sm", - "version": "3.7.0", - "sha256": "1x9y4z2883m21rsvv6sw71l1nva3j8an8csdsabs4y84kb5y2by2", + "version": "3.8.0", + "sha256": "1sil5iwm5b1grbsnyi11rkbw6hxj62mc95gjzwgmj3lc7wd896dh", "license": "mit" }, { "pname": "zh_core_web_trf", - "version": "3.7.0", - "sha256": "1y4c9z4vjywmpg61yxsyp80cmz5s3aa95car01wq3i42qj09bvm6", + "version": "3.8.0", + "sha256": "18gmv0s4pz7f2q7m0kjvpj8w7dnabyya6fbd8d9nlkx2924qn03q", "license": "mit" } ] diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix index 956c15ab0b0ea..98602e7d521b2 100644 --- a/pkgs/development/python-modules/spake2/default.nix +++ b/pkgs/development/python-modules/spake2/default.nix @@ -1,35 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, fetchpatch2, setuptools, - hkdf, + cryptography, pytestCheckHook, }: buildPythonPackage rec { pname = "spake2"; - version = "0.8"; + version = "0.9"; pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4"; + src = fetchFromGitHub { + owner = "warner"; + repo = "python-spake2"; + rev = "refs/tags/v${version}"; + hash = "sha256-WPMGH1OzG+5O+2lNl2sv06/dNardY+BHYDS290Z36vQ="; }; - patches = [ - # https://github.com/warner/python-spake2/pull/16 - (fetchpatch2 { - name = "python312-compat.patch"; - url = "https://github.com/warner/python-spake2/commit/1b04d33106b105207c97c64b2589c45790720b0b.patch"; - hash = "sha256-OoBz0lN17VyVGg6UfT+Zj9M1faFTNpPIhxrwCgUwMc8="; - }) - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ hkdf ]; + dependencies = [ cryptography ]; pythonImportsCheck = [ "spake2" ]; diff --git a/pkgs/development/python-modules/spatialmath-python/default.nix b/pkgs/development/python-modules/spatialmath-python/default.nix index 3613763f3105d..259383492a25f 100644 --- a/pkgs/development/python-modules/spatialmath-python/default.nix +++ b/pkgs/development/python-modules/spatialmath-python/default.nix @@ -17,7 +17,6 @@ pytest-xvfb, sympy, pytestCheckHook, - pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -36,7 +35,6 @@ buildPythonPackage rec { nativeBuildInputs = [ oldest-supported-numpy setuptools - pythonRelaxDepsHook ]; pythonRemoveDeps = [ "pre-commit" ]; @@ -49,7 +47,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { dev = [ coverage flake8 diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index 336d8cb5549c1..c50145cac6b26 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "spdx-tools"; - version = "0.8.2"; + version = "0.8.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "spdx"; repo = "tools-python"; rev = "refs/tags/v${version}"; - hash = "sha256-KB+tfuz0ZnoQcMX3H+IZXjcmPZ4x2ecl8ofz1/3r0/8="; + hash = "sha256-r7+RYGoq3LJYN1jYfwzb1r3fc/kL+CPd4pmGATFq8Pw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 444761c461590..d9c3e6466143d 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -60,7 +60,9 @@ buildPythonPackage rec { # On x86_darwin, this test fails with "Fatal Python error: Aborted" # when sandbox = true. - disabledTestPaths = lib.optionals stdenv.isDarwin [ "spectral_cube/tests/test_visualization.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + "spectral_cube/tests/test_visualization.py" + ]; pythonImportsCheck = [ "spectral_cube" ]; diff --git a/pkgs/development/python-modules/speechbrain/default.nix b/pkgs/development/python-modules/speechbrain/default.nix index 4705db0866d5e..670f1e004aae9 100644 --- a/pkgs/development/python-modules/speechbrain/default.nix +++ b/pkgs/development/python-modules/speechbrain/default.nix @@ -1,13 +1,14 @@ { + lib, buildPythonPackage, fetchFromGitHub, + + # dependencies huggingface-hub, hyperpyyaml, joblib, - lib, numpy, packaging, - pythonOlder, sentencepiece, scipy, torch, @@ -17,19 +18,17 @@ buildPythonPackage rec { pname = "speechbrain"; - version = "1.0.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "1.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "speechbrain"; repo = "speechbrain"; rev = "refs/tags/v${version}"; - hash = "sha256-s23RHxqr+ZCWPYNchFpyYa01mY+Bum3thgNbJP8rAmA="; + hash = "sha256-5ZMS1g74G4w83kNrXyt9IUsXe5uYS1qC+MwleQrjhTY="; }; - propagatedBuildInputs = [ + dependencies = [ huggingface-hub hyperpyyaml joblib @@ -46,11 +45,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "speechbrain" ]; - meta = with lib; { + meta = { description = "PyTorch-based Speech Toolkit"; homepage = "https://speechbrain.github.io"; changelog = "https://github.com/speechbrain/speechbrain/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index 931f08e8068e9..1da00715ba974 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -9,52 +9,50 @@ # dependencies astroid, - anyascii, jinja2, pyyaml, sphinx, + stdlib-list, # tests beautifulsoup4, - mock, pytestCheckHook, }: buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "3.2.1"; + version = "3.3.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "sphinx_autoapi"; inherit version; - hash = "sha256-H51Ws6mNVlPR+tVkSr7tLAQs7DBKEm73LCNtrkrxa5A="; + hash = "sha256-6/i0Sy66tcKPAmPsbC+KzdFW6bLVOaWOyjnS82hEUXM="; }; build-system = [ setuptools ]; - dependencies = [ - anyascii - astroid - jinja2 - pyyaml - sphinx - ]; + dependencies = + [ + astroid + jinja2 + pyyaml + sphinx + ] + ++ lib.optionals (pythonOlder "3.10") [ + stdlib-list + ]; nativeCheckInputs = [ beautifulsoup4 - mock pytestCheckHook ]; disabledTests = [ - # failing typing assertions + # require network access "test_integration" - "test_annotations" - # sphinx.errors.SphinxWarning: cannot cache unpickable configuration value: 'autoapi_prepare_jinja_env' (because it contains a function, class, or module object) - "test_custom_jinja_filters" ]; pythonImportsCheck = [ "autoapi" ]; diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix index 643e3111311d1..903005d0df9a7 100644 --- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix +++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, flit-core, - pythonImportsCheckHook, # documentation build dependencies sphinxHook, sphinx-notfound-page, @@ -37,7 +36,6 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core - pythonImportsCheckHook sphinxHook sphinx-notfound-page diff --git a/pkgs/development/python-modules/sphinx-material/default.nix b/pkgs/development/python-modules/sphinx-material/default.nix index c7faabcd5d8d5..752c15928d408 100644 --- a/pkgs/development/python-modules/sphinx-material/default.nix +++ b/pkgs/development/python-modules/sphinx-material/default.nix @@ -7,14 +7,16 @@ lxml, python-slugify, pythonOlder, + setuptools, sphinx, unidecode, + versioneer, }: buildPythonPackage rec { pname = "sphinx-material"; version = "0.0.36"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +26,17 @@ buildPythonPackage rec { hash = "sha256-7v9ffT3AFq8yuv33DGbmcdFch1Tb4GE9+9Yp++2RKGk="; }; - propagatedBuildInputs = [ + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ sphinx beautifulsoup4 python-slugify @@ -33,13 +45,15 @@ buildPythonPackage rec { lxml ]; - doCheck = false; # no tests + # Module has no tests + doCheck = false; pythonImportsCheck = [ "sphinx_material" ]; meta = with lib; { description = "Material-based, responsive theme inspired by mkdocs-material"; homepage = "https://bashtage.github.io/sphinx-material"; + changelog = "https://github.com/bashtage/sphinx-material/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ FlorianFranzen ]; }; diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index 58c81240c42a6..93e7662214ef4 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, flit-core, - pythonImportsCheckHook, pythonOlder, # documentation build dependencies sphinxHook, @@ -38,7 +37,6 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core - pythonImportsCheckHook sphinxHook sphinx-prompt sphinx-rtd-theme diff --git a/pkgs/development/python-modules/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix index 6856bcd4fee7d..771b674c18de8 100644 --- a/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - pythonImportsCheckHook, pythonOlder, setuptools, sphinx, @@ -47,7 +46,6 @@ buildPythonPackage { ]; nativeBuildInputs = [ - pythonImportsCheckHook sphinx-autoapi sphinx-prompt sphinx-rtd-theme diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 1710b5212fd91..afbe62d9c9894 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.6.1"; + version = "2.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-9ymYfxL50ZDGlLzo2LXiBnuo2svWxnl37H/c6ENACjA="; + hash = "sha256-Tj9m0TcPkg+FIWwYixahpox27Yn+0tXPppwb5EwmBk0="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 2740b83afbb4d..7cfc6b174a3a6 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { social_cards_generation = [ matplotlib ]; }; @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook beautifulsoup4 - ] ++ passthru.optional-dependencies.social_cards_generation; + ] ++ optional-dependencies.social_cards_generation; pythonImportsCheck = [ "sphinxext.opengraph" ]; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index c85096167742e..c8ce42bc73513 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { "zope.testbrowser" = [ zope-testbrowser lxml @@ -54,7 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # driver is present and fails with a different error during loading diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index f872e2d2bcee6..46bf6bb70bb29 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -1,14 +1,16 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system setuptools, + + # dependencies cloudpickle, - fetchPypi, ipykernel, ipython, jupyter-client, - packaging, - pythonOlder, pyxdg, pyzmq, wurlitzer, @@ -16,15 +18,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.5.2"; + version = "3.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "spyder_kernels"; - inherit version; - hash = "sha256-cfJSkA4CsDlIIMxwSfie1yUkP2/M9kC3bdMpIDxBOWA="; + src = fetchFromGitHub { + owner = "spyder-ide"; + repo = "spyder-kernels"; + rev = "refs/tags/v${version}"; + hash = "sha256-oyPgujvaj2tqouZKuMVDq3gxm0GNrKmeUWqUFUkEMB4="; }; build-system = [ setuptools ]; @@ -34,7 +35,6 @@ buildPythonPackage rec { ipykernel ipython jupyter-client - packaging pyxdg pyzmq wurlitzer diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index b3d91997fc903..6c18f7e382e8d 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -2,14 +2,16 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, # dependencies + aiohttp, + asyncssh, atomicwrites, chardet, cloudpickle, cookiecutter, diff-match-patch, + fzf, intervaltree, jedi, jellyfish, @@ -20,6 +22,7 @@ numpydoc, pickleshare, psutil, + pygithub, pygments, pylint-venv, pyls-spyder, @@ -27,7 +30,7 @@ pyqtwebengine, python-lsp-black, python-lsp-server, - pyxdg, + pyuca, pyzmq, qdarkstyle, qstylizer, @@ -39,21 +42,21 @@ scipy, setuptools, spyder-kernels, + superqt, textdistance, three-merge, watchdog, + yarl, }: buildPythonPackage rec { pname = "spyder"; - version = "5.5.6"; + version = "6.0.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; - hash = "sha256-lYtmn0oBXFw5EFDrbv+o2EZWqL/Eel9GrbopeEnYK90="; + hash = "sha256-cJeC6ICRWIu+YU3m673ntHVEpNbCJeGZ3lrSK3fYsTA="; }; patches = [ ./dont-clear-pythonpath.patch ]; @@ -64,11 +67,14 @@ buildPythonPackage rec { ]; dependencies = [ + aiohttp + asyncssh atomicwrites chardet cloudpickle cookiecutter diff-match-patch + fzf intervaltree jedi jellyfish @@ -79,6 +85,7 @@ buildPythonPackage rec { numpydoc pickleshare psutil + pygithub pygments pylint-venv pyls-spyder @@ -86,7 +93,7 @@ buildPythonPackage rec { pyqtwebengine python-lsp-black python-lsp-server - pyxdg + pyuca pyzmq qdarkstyle qstylizer @@ -97,9 +104,11 @@ buildPythonPackage rec { rtree scipy spyder-kernels + superqt textdistance three-merge watchdog + yarl ] ++ python-lsp-server.optional-dependencies.all; # There is no test for spyder diff --git a/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch b/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch index abb021e395543..0d623c69ee346 100644 --- a/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch +++ b/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch @@ -1,25 +1,21 @@ diff --git a/spyder/app/start.py b/spyder/app/start.py -index 97b08a600..66486e510 100644 +index ad9f2b8d0..442b4fc46 100644 --- a/spyder/app/start.py +++ b/spyder/app/start.py -@@ -6,20 +6,8 @@ +@@ -6,16 +6,8 @@ # (see spyder/__init__.py for details) # ----------------------------------------------------------------------------- - + -# Remove PYTHONPATH paths from sys.path before other imports to protect against -# shadowed standard libraries. import os import sys -if os.environ.get('PYTHONPATH'): - for path in os.environ['PYTHONPATH'].split(os.pathsep): -- if os.name == 'nt' and 'pkgs' in path: -- # Don't remove pynsist installer entry for 'pkgs' directory -- continue -- else: -- try: -- sys.path.remove(path.rstrip(os.sep)) -- except ValueError: -- pass - +- try: +- sys.path.remove(path.rstrip(os.sep)) +- except ValueError: +- pass + # Standard library imports import ctypes diff --git a/pkgs/development/python-modules/spython/default.nix b/pkgs/development/python-modules/spython/default.nix index 60786d3cd48ae..aeddaa35e7885 100644 --- a/pkgs/development/python-modules/spython/default.nix +++ b/pkgs/development/python-modules/spython/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "spython"; - version = "0.3.12"; + version = "0.3.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,15 +18,15 @@ buildPythonPackage rec { owner = "singularityhub"; repo = "singularity-cli"; rev = "refs/tags/${version}"; - hash = "sha256-fRtqOpDgVMYlVDwbPkrnpd7PT4fV+2WS6RmpJoxaKdQ="; + hash = "sha256-PNMzqnKb691wcd8aGSleqHOcsUrahl8e0r5s5ek5GmQ="; }; postPatch = '' substituteInPlace setup.py \ - --replace '"pytest-runner"' "" + --replace-fail '"pytest-runner"' "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -46,10 +46,10 @@ buildPythonPackage rec { meta = with lib; { description = "Streamlined singularity python client (spython) for singularity"; - mainProgram = "spython"; homepage = "https://github.com/singularityhub/singularity-cli"; changelog = "https://github.com/singularityhub/singularity-cli/blob/${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ fab ]; + mainProgram = "spython"; }; } diff --git a/pkgs/development/python-modules/sqids/default.nix b/pkgs/development/python-modules/sqids/default.nix index c9e587555700a..11ab9463a812c 100644 --- a/pkgs/development/python-modules/sqids/default.nix +++ b/pkgs/development/python-modules/sqids/default.nix @@ -4,24 +4,28 @@ fetchPypi, pythonOlder, setuptools-scm, + hypothesis, pytestCheckHook, }: buildPythonPackage rec { pname = "sqids"; - version = "0.4.1"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/8P7/vY0kb7ouUCpgGU4g0Xb77BtSeQVt6nkdcogD50="; + hash = "sha256-ZHeY59W/6yNuesRwnP1M2AhjCmxQ+AIF3xe0yT5WAUA="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; pythonImportsCheck = [ "sqids" ]; diff --git a/pkgs/development/python-modules/sqlalchemy-file/default.nix b/pkgs/development/python-modules/sqlalchemy-file/default.nix index 3fad04838acd2..0cd6d46988aef 100644 --- a/pkgs/development/python-modules/sqlalchemy-file/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-file/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { export LOCAL_PATH="$PWD/.storage" ''; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # very flaky, sandbox issues? # libcloud.storage.types.ContainerDoesNotExistError # sqlite3.OperationalError: attempt to write a readonly database diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index e4865cd091af8..1cf2d9418e988 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { babel = [ babel ]; arrow = [ arrow ]; pendulum = [ pendulum ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { pymysql pyodbc ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies) + ++ lib.flatten (builtins.attrValues optional-dependencies) ++ lib.optionals (pythonOlder "3.12") [ # requires distutils, which were removed in 3.12 psycopg2cffi diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index 45664292350cf..2384a4f0c0566 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -36,28 +36,25 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "1.4.53"; + version = "1.4.54"; pyproject = true; src = fetchFromGitHub { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-CpFvL0W/X7/4N/FpufAdud5o11LHBuox8m+8EailqXg="; + hash = "sha256-6qAjyqMVrugABHssAQuql3z1YHTAOSm5hARJuJXJJvo="; }; postPatch = '' sed -i '/tag_build = dev/d' setup.cfg - - substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=44,<69.3" "setuptools" ''; nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ greenlet ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { asyncio = [ greenlet ]; mypy = [ mypy ]; mssql = [ pyodbc ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 426be56eea9d4..efd9f7a3af464 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { asyncio = [ greenlet ]; mypy = [ mypy ]; mssql = [ pyodbc ]; diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix new file mode 100644 index 0000000000000..37f23ca89ee72 --- /dev/null +++ b/pkgs/development/python-modules/sqlfmt/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + fetchFromGitHub, + importlib-metadata, + black, + poetry-core, + click, + jinja2, + platformdirs, + tomli, + tqdm, + gitpython, +}: + +buildPythonPackage rec { + pname = "sqlfmt"; + version = "0.23.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tconbeer"; + repo = "sqlfmt"; + rev = "refs/tags/v${version}"; + hash = "sha256-g2ycfpsBFMh16pYVzCmde0mhQhhvAhH25i3LJTcG7Ac="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + click + importlib-metadata + jinja2 + platformdirs + tomli + tqdm + ]; + + optional-dependencies = { + jinjafmt = [ + black + ]; + sqlfmt_primer = [ + gitpython + ]; + }; + + pythonRelaxDeps = [ + "platformdirs" + ]; + + pythonImportsCheck = [ + "sqlfmt" + ]; + + meta = { + description = "Sqlfmt formats your dbt SQL files so you don't have to"; + homepage = "https://github.com/tconbeer/sqlfmt"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pcboy ]; + mainProgram = "sqlfmt"; + }; +} diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index f146f9d8a7f5e..d03bccf6b66d4 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sqlglot"; - version = "23.12.1"; + version = "25.20.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { repo = "sqlglot"; owner = "tobymao"; rev = "refs/tags/v${version}"; - hash = "sha256-VUG/l1iZ/8vAJwhktN/tx8U8KVLgaghUPArtxEyIA54="; + hash = "sha256-RE9Hbb3g6j4j5X2ksjcBZ610RcV7Zd3YaKaBIUyD2vU="; }; nativeBuildInputs = [ @@ -39,11 +39,6 @@ buildPythonPackage rec { duckdb ]; - disabledTestPaths = [ - # These integration tests assume a running Spark instance - "tests/dataframe/integration" - ]; - pythonImportsCheck = [ "sqlglot" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 2a1a3f42593a6..f7632133b5450 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.8.8"; + version = "1.8.9"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TtJF6IHQdpx9OZ6wACmON1HQXhvvi67QZU/gI+zsy2Q="; + hash = "sha256-0ARkSUzmrqyRSPl3EXU7NzcnaWf+Zbt4zQZ626gvfEs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlmodel/default.nix b/pkgs/development/python-modules/sqlmodel/default.nix index 5b39b5b89bc48..89f19b1e65057 100644 --- a/pkgs/development/python-modules/sqlmodel/default.nix +++ b/pkgs/development/python-modules/sqlmodel/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sqlmodel"; - version = "0.0.21"; + version = "0.0.22"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "sqlmodel"; rev = "refs/tags/${version}"; - hash = "sha256-8Lw3UHHDs/jn65JHGh3bQOQJeNiSnjdc10yRQrwIC/8="; + hash = "sha256-y6lY6DlfdCF5dliRkiU6r+ny/a9ssDtqRmF+/rcKFkg="; }; patches = [ diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index 300cba868c0c3..451976c79b522 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -1,11 +1,12 @@ { - stdenv, lib, + stdenv, asyncssh, bcrypt, buildPythonPackage, fetchFromGitHub, fsspec, + importlib-metadata, mock-ssh-server, pytest-asyncio, pytestCheckHook, @@ -15,39 +16,53 @@ buildPythonPackage rec { pname = "sshfs"; - version = "2024.4.1"; + version = "2024.9.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "sshfs"; rev = "refs/tags/${version}"; - hash = "sha256-qkEojf/3YBMoYbRt0Q93MJYXyL9AWR24AEe3/zdn58U="; + hash = "sha256-rRcXimthyFLBqt0nMEv7bisL+JNLLZuRH7BopSLM7QQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ asyncssh - bcrypt fsspec ]; + optional-dependencies = { + bcrypt = [ asyncssh ] ++ asyncssh.optional-dependencies.bcrypt; + fido2 = [ asyncssh ] ++ asyncssh.optional-dependencies.fido2; + gssapi = [ asyncssh ] ++ asyncssh.optional-dependencies.gssapi; + libnacl = [ asyncssh ] ++ asyncssh.optional-dependencies.libnacl; + pkcs11 = [ asyncssh ] ++ asyncssh.optional-dependencies.python-pkcs11; + pyopenssl = [ asyncssh ] ++ asyncssh.optional-dependencies.pyopenssl; + }; + __darwinAllowLocalNetworking = true; nativeCheckInputs = [ + importlib-metadata mock-ssh-server pytest-asyncio pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ - # test fails with sandbox enabled - "test_checksum" - ]; + disabledTests = + [ + # Test requires network access + "test_config_expansions" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Test fails with sandbox enabled + "test_checksum" + ]; pythonImportsCheck = [ "sshfs" ]; diff --git a/pkgs/development/python-modules/stamina/default.nix b/pkgs/development/python-modules/stamina/default.nix index eb80b58254add..9597bc5496439 100644 --- a/pkgs/development/python-modules/stamina/default.nix +++ b/pkgs/development/python-modules/stamina/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "stamina"; - version = "24.2.0"; + version = "24.3.0"; pyproject = true; src = fetchFromGitHub { owner = "hynek"; repo = "stamina"; - rev = version; - hash = "sha256-gn8kbLLj+wMPtIwnsOdKDEhBsLApkl3K6mf/bQT3qT8="; + rev = "refs/tags/${version}"; + hash = "sha256-DasubVqKRhX4CRyKyJ3fIA9Rxmy+kGxkW0pDdu8OPPo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix index dbc64f227bda2..543ab64e63bf2 100644 --- a/pkgs/development/python-modules/stanza/default.nix +++ b/pkgs/development/python-modules/stanza/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "stanza"; - version = "1.8.2"; + version = "1.9.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "stanfordnlp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-twgMWKWUvhnGNqQ42MOptnikdSBiDFpiMCI2RPo+3XU="; + hash = "sha256-hrRn6ITsN7kFL1T6VjSXPDytANEeJYKwMaSdCG+YJyM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/starlette-admin/default.nix b/pkgs/development/python-modules/starlette-admin/default.nix index 41f3a10013452..a60768ef42206 100644 --- a/pkgs/development/python-modules/starlette-admin/default.nix +++ b/pkgs/development/python-modules/starlette-admin/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { export LOCAL_PATH="$PWD/.storage" ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # flaky, depends on test order "test_ensuring_pk" # flaky, of-by-one @@ -99,7 +99,7 @@ buildPythonPackage rec { # needs mongodb running on port 27017 "tests/mongoengine" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # very flaky, sandbox issues? # libcloud.storage.types.ContainerDoesNotExistError # sqlite3.OperationalError: attempt to write a readonly database diff --git a/pkgs/development/python-modules/static3/default.nix b/pkgs/development/python-modules/static3/default.nix index 050fb2119daee..13a41618feb31 100644 --- a/pkgs/development/python-modules/static3/default.nix +++ b/pkgs/development/python-modules/static3/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { --replace ", 'pytest-cov'" "" ''; - passthru.optional-dependencies = { + optional-dependencies = { KidMagic = [ # TODO: kid ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook webtest - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { changelog = "https://github.com/rmohr/static3/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/std2/default.nix b/pkgs/development/python-modules/std2/default.nix index aa46ad29dd9f5..f25c28601d123 100644 --- a/pkgs/development/python-modules/std2/default.nix +++ b/pkgs/development/python-modules/std2/default.nix @@ -7,22 +7,22 @@ buildPythonPackage { pname = "std2"; - version = "unstable-2023-10-07"; + version = "0-unstable-2024-09-02"; pyproject = true; src = fetchFromGitHub { owner = "ms-jpq"; repo = "std2"; - rev = "6332e559ee51c3a7c956804afdd7e1cc6ad47965"; - hash = "sha256-huN7P/Ws6anrFXDG7L5xxMenS25BHquV9cMi1s7WFJ4="; + rev = "205d1f52e9b5438ef2b732c77e1144847cafa8d0"; + hash = "sha256-WdUefadEk92cGnDI+KbQBpjg+d7KgI6bjlQlyhRRRFA="; }; nativeBuildInputs = [ setuptools ]; - meta = with lib; { + meta = { homepage = "https://github.com/ms-jpq/std2"; description = "Dependency to chadtree and coq_nvim plugins"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index b1642c4df1999..5d6c048ecfb40 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -1,38 +1,49 @@ { lib, buildPythonPackage, + callPackage, fetchPypi, pythonOlder, importlib-metadata, pbr, setuptools, - six, }: buildPythonPackage rec { pname = "stevedore"; - version = "5.2.0"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "5.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Rrk8pA4RFM6pPXOKbB42U5aYG7a7eMJwRbdYfJRzVE0="; + hash = "sha256-mmQmX0BgMSgoFRwgTvvpt6mFKg2SKHVjRNvH5AI+N1o="; }; - propagatedBuildInputs = [ + build-system = [ pbr setuptools - six - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; + + dependencies = [ + importlib-metadata + setuptools + ]; + # Checks moved to 'passthru.tests' to workaround infinite recursion doCheck = false; + + passthru.tests = { + tests = callPackage ./tests.nix { }; + }; + pythonImportsCheck = [ "stevedore" ]; meta = with lib; { description = "Manage dynamic plugins for Python applications"; homepage = "https://docs.openstack.org/stevedore/"; license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + maintainers = teams.openstack.members ++ (with maintainers; [ fab ]); }; } diff --git a/pkgs/development/python-modules/stevedore/tests.nix b/pkgs/development/python-modules/stevedore/tests.nix new file mode 100644 index 0000000000000..7ae013a6e241b --- /dev/null +++ b/pkgs/development/python-modules/stevedore/tests.nix @@ -0,0 +1,29 @@ +{ + buildPythonPackage, + docutils, + sphinx, + stestr, + stevedore, +}: + +buildPythonPackage { + pname = "stevedore-tests"; + inherit (stevedore) version src; + format = "other"; + + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + docutils + sphinx + stestr + stevedore + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; +} diff --git a/pkgs/development/python-modules/stix2-validator/default.nix b/pkgs/development/python-modules/stix2-validator/default.nix new file mode 100644 index 0000000000000..105e11713d0ef --- /dev/null +++ b/pkgs/development/python-modules/stix2-validator/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + colorama, + cpe, + fetchFromGitHub, + jsonschema, + python-dateutil, + pythonOlder, + requests, + setuptools, + simplejson, + stix2-patterns, +}: + +buildPythonPackage rec { + pname = "stix2-validator"; + version = "3.2.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "oasis-open"; + repo = "cti-stix-validator"; + rev = "refs/tags/v${version}"; + hash = "sha256-OI1SXILyCRGl1ZsoyYDl+/RsBhTP24eqECtW3uazS2k="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + colorama + cpe + jsonschema + python-dateutil + requests + simplejson + stix2-patterns + ]; + + # Tests need more work + # Exception: Could not deserialize ATN with version (expected 4). + doCheck = false; + + # nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Validator for STIX 2.0 JSON normative requirements and best practices"; + homepage = "https://github.com/oasis-open/cti-stix-validator/"; + changelog = "https://github.com/oasis-open/cti-stix-validator/blob/${src.rev}/CHANGELOG"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 4fab0c1b30774..b27d221d75f46 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -44,13 +44,13 @@ buildPythonPackage rec { pyserial ]; - passthru.optional-dependencies = { + optional-dependencies = { hex = [ intelhex ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "tests/unit" ]; diff --git a/pkgs/development/python-modules/stookwijzer/default.nix b/pkgs/development/python-modules/stookwijzer/default.nix index e7ca1728ee101..6a2cb56f1161b 100644 --- a/pkgs/development/python-modules/stookwijzer/default.nix +++ b/pkgs/development/python-modules/stookwijzer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stookwijzer"; - version = "1.4.9"; + version = "1.4.10"; pyproject = true; src = fetchFromGitHub { owner = "fwestenberg"; repo = "stookwijzer"; rev = "refs/tags/v${version}"; - hash = "sha256-QXCusmbt40Tg73ozl9nIDgMtQJ152uNhOuFyHn+OEA8="; + hash = "sha256-uvmv35rdmqfr+psGQdnb3g2q72qCx4ew3gJdGeun6W8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 1e3a816d6572d..95fd2c9161b91 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp pytest-aiohttp @@ -146,7 +146,7 @@ buildPythonPackage rec { pytest-snapshot pytestCheckHook sanic-testing - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "strawberry" ]; diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 899ee9edc698b..71ce1b81aa9aa 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.37.1"; + version = "1.38.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vH44E9lKOd2lbxVnhDfrN4MJc8YB6OV08iJae/GI6lo="; + hash = "sha256-xL82s++HFJntRZRXSDRYMRP5Pwd90wNdUW0pV4byrWM="; }; build-system = [ @@ -76,7 +76,7 @@ buildPythonPackage rec { typing-extensions tzlocal validators - ] ++ lib.optionals (!stdenv.isDarwin) [ watchdog ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ]; # pypi package does not include the tests, but cannot be built with fetchFromGitHub doCheck = false; diff --git a/pkgs/development/python-modules/stringbrewer/default.nix b/pkgs/development/python-modules/stringbrewer/default.nix index 8b79efd7be55d..9b5fe137e0871 100644 --- a/pkgs/development/python-modules/stringbrewer/default.nix +++ b/pkgs/development/python-modules/stringbrewer/default.nix @@ -4,7 +4,6 @@ fetchPypi, rstr, sre-yield, - pythonImportsCheckHook, }: buildPythonPackage rec { @@ -21,7 +20,6 @@ buildPythonPackage rec { rstr sre-yield ]; - nativeBuildInputs = [ pythonImportsCheckHook ]; # Package has no tests doCheck = false; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 5db44269d0f04..3d3bd39ca13af 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "10.7.0"; + version = "10.12.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ntrb2osKtZRajWo7WNTw0UyPTneE9b1+c6uF/jYBRe8="; + hash = "sha256-Wr7ERUjTgUvB4HCqGFK8s/xcwCnpR8D3MxVusfjIcDA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/subprocess-tee/default.nix b/pkgs/development/python-modules/subprocess-tee/default.nix index 1ca46a4652061..d7e572746520d 100644 --- a/pkgs/development/python-modules/subprocess-tee/default.nix +++ b/pkgs/development/python-modules/subprocess-tee/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/pycontribs/subprocess-tee"; description = "Subprocess.run drop-in replacement that supports a tee mode"; - changelog = "https://github.com/pycontribs/subprocess-tee/releases/tag/${src.rev}"; + changelog = "https://github.com/pycontribs/subprocess-tee/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ putchar ]; }; diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index d756f3c7ac7e9..87d63c8c1b689 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/pkgs/development/python-modules/succulent/default.nix @@ -4,17 +4,17 @@ fetchFromGitHub, flask, lxml, + numpy, pandas, pyyaml, poetry-core, pytestCheckHook, pythonOlder, - xmltodict, }: buildPythonPackage rec { pname = "succulent"; - version = "0.3.4"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,10 +23,13 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "succulent"; rev = "refs/tags/${version}"; - hash = "sha256-lU4M/ObX2mhHgYsc72zLp87g1lJ6ikfTeEojEdJwjGs="; + hash = "sha256-rD0qKYmWTu0LMRdWgul8OGp1FcczSY2/OxT8+oXO78E="; }; - pythonRelaxDeps = [ "flask" ]; + pythonRelaxDeps = [ + "flask" + "numpy" + ]; nativeBuildInputs = [ poetry-core @@ -35,9 +38,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask lxml + numpy pandas pyyaml - xmltodict ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sudachipy/default.nix b/pkgs/development/python-modules/sudachipy/default.nix index d722b368756e0..20233c1f7d9a0 100644 --- a/pkgs/development/python-modules/sudachipy/default.nix +++ b/pkgs/development/python-modules/sudachipy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools-rust ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; preBuild = '' cd python diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index e1bfc94ceab46..8c4688807d26e 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { parfive ]; - passthru.optional-dependencies = { + optional-dependencies = { asdf = [ asdf # asdf-astropy @@ -91,11 +91,11 @@ buildPythonPackage rec { pytest-mock pytestCheckHook ] - ++ passthru.optional-dependencies.asdf - ++ passthru.optional-dependencies.database - ++ passthru.optional-dependencies.image - ++ passthru.optional-dependencies.net - ++ passthru.optional-dependencies.timeseries; + ++ optional-dependencies.asdf + ++ optional-dependencies.database + ++ optional-dependencies.image + ++ optional-dependencies.net + ++ optional-dependencies.timeseries; postPatch = '' substituteInPlace setup.cfg \ @@ -103,7 +103,7 @@ buildPythonPackage rec { ''; # darwin has write permission issues - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index c2fbba8406847..713f688a4c17a 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { quantity = [ pint ]; pyside2 = [ pyside2 ]; pyside6 = [ pyside6 ]; diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index e75998606b63a..8a6bb95f3c3cd 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # wants to write to /tmp/foo which is likely already owned by another # nixbld user on hydra - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ mock diff --git a/pkgs/development/python-modules/svg-py/default.nix b/pkgs/development/python-modules/svg-py/default.nix index b59d23c539a07..30396791e8761 100644 --- a/pkgs/development/python-modules/svg-py/default.nix +++ b/pkgs/development/python-modules/svg-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "svg-py"; - version = "1.4.3"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "orsinium-labs"; repo = "svg.py"; rev = "refs/tags/${version}"; - hash = "sha256-rnxznJM3ihuEJrD3ba6uMdGMozIrLw/QyGzA3JPygH4="; + hash = "sha256-Lxzk3IVCD4PG36Pozz2crccwxCAAAM2QfS4rgwbjs6g="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index ddcecdb3e6b32..26806dea71a87 100644 --- a/pkgs/development/python-modules/swift/default.nix +++ b/pkgs/development/python-modules/swift/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "swift"; - version = "2.33.0"; - format = "setuptools"; + version = "2.34.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4TlJcquK8MC9zQfLKmb88B5xHje1kbPD2jSLiR+N8hs="; + hash = "sha256-ZvdWWvPUdZIEadxV0nhqgTXhgJJu+hD1LnYCAP+9gpM="; }; postPatch = '' @@ -38,9 +38,11 @@ buildPythonPackage rec { rm test/functional/s3api/{__init__.py,s3_test_client.py} ''; - nativeBuildInputs = [ - installShellFiles + nativeBuildInputs = [ installShellFiles ]; + + build-system = [ pbr + setuptools ]; propagatedBuildInputs = [ @@ -57,17 +59,17 @@ buildPythonPackage rec { xattr ]; - postInstall = '' - installManPage doc/manpages/* - ''; - - nativeCheckInputs = [ + dependencies = [ boto3 mock stestr swiftclient ]; + postInstall = '' + installManPage doc/manpages/* + ''; + # a lot of tests currently fail while establishing a connection doCheck = false; diff --git a/pkgs/development/python-modules/sysrsync/default.nix b/pkgs/development/python-modules/sysrsync/default.nix new file mode 100644 index 0000000000000..809ca324cce12 --- /dev/null +++ b/pkgs/development/python-modules/sysrsync/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + setuptools, + rsync, + toml, +}: + +buildPythonPackage rec { + pname = "sysrsync"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "gchamon"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-2Sz3JrNmIGOnad+qjRzbAgsFEzDtwBT0KLEFyQKZra4="; + }; + + postPatch = '' + substituteInPlace sysrsync/command_maker.py \ + --replace-fail "'rsync'" "'${rsync}/bin/rsync'" + ''; + + build-system = [ + poetry-core + setuptools + ]; + + dependencies = [ + toml + ]; + + pythonImportsCheck = [ "sysrsync" ]; + + meta = with lib; { + description = "Simple and safe system's rsync wrapper for Python"; + homepage = "https://github.com/gchamon/sysrsync"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index 443b83ce78103..bd1ed07849ed2 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ markuppy odfpy diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index c781a453397ac..d0c635cc919c7 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { widechars = [ wcwidth ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = { description = "Pretty-print tabular data"; diff --git a/pkgs/development/python-modules/taxii2-client/default.nix b/pkgs/development/python-modules/taxii2-client/default.nix new file mode 100644 index 0000000000000..49ad9b8916306 --- /dev/null +++ b/pkgs/development/python-modules/taxii2-client/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytz, + requests, + setuptools, + six, +}: + +buildPythonPackage rec { + pname = "taxii2-client"; + version = "2.3.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "oasis-open"; + repo = "cti-taxii-client"; + rev = "refs/tags/v${version}"; + hash = "sha256-e22bJdLAlm30vv/xIgLSjcwmzfN0Pwt2JydLgEbA+Is="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pytz + requests + six + ]; + + pythonImportsCheck = [ "taxii2client" ]; + + meta = { + description = "TAXII 2 client library"; + homepage = "https://github.com/oasis-open/cti-taxii-client/"; + changelog = "https://github.com/oasis-open/cti-taxii-client/blob/${src.rev}/CHANGES.txt"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index d9a0c20070de4..9daa9648fe1ec 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Skip on macOS because /etc/localtime is accessed through the pendulum # library, which is not allowed in a sandboxed build. "test_create_parser_filter_dates" "test_parse_args" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # Skip on macOS because /etc/localtime is accessed through the pendulum # library, which is not allowed in a sandboxed build. "tests/test_datetime.py" diff --git a/pkgs/development/python-modules/tcolorpy/default.nix b/pkgs/development/python-modules/tcolorpy/default.nix index ab7b6bc198de2..f807ca1bf08a0 100644 --- a/pkgs/development/python-modules/tcolorpy/default.nix +++ b/pkgs/development/python-modules/tcolorpy/default.nix @@ -3,20 +3,29 @@ fetchFromGitHub, lib, pytestCheckHook, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "tcolorpy"; - version = "0.1.4"; - format = "setuptools"; + version = "0.1.6"; + pyproject = true; src = fetchFromGitHub { owner = "thombashi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cCdKeixRfXkvEGBqozMWw2RjliLdzhlMv8GE2Q40LZQ="; + hash = "sha256-esucU+So1YKzkuMt6ICCrQ5SzQVv24lh12SE1Jl5Y/w="; }; + build-system = [ + setuptools + setuptools-scm + ]; + + pythonImportsCheck = [ "tcolorpy" ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/telegraph/default.nix b/pkgs/development/python-modules/telegraph/default.nix index 387c7034bb82d..80a4d12c7b164 100644 --- a/pkgs/development/python-modules/telegraph/default.nix +++ b/pkgs/development/python-modules/telegraph/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ httpx ]; }; diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 77326c7152c18..fcae826816fb8 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -1,78 +1,80 @@ { lib, + bash, buildPythonPackage, + cliff, + debtcollector, defusedxml, fetchPypi, - pbr, - cliff, + fixtures, + hacking, jsonschema, - testtools, - paramiko, netaddr, oslo-concurrency, oslo-config, oslo-log, - stestr, oslo-serialization, oslo-utils, - fixtures, + oslotest, + paramiko, + pbr, + prettytable, + python, pythonOlder, pyyaml, - subunit, + setuptools, + stestr, stevedore, - prettytable, + subunit, + testscenarios, + testtools, urllib3, - debtcollector, - hacking, - oslotest, - bash, - python, - setuptools, }: buildPythonPackage rec { pname = "tempest"; - version = "39.0.0"; + version = "40.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-l4qKbTfQRWiRsoHN9fiAAiGMGP+q3gwRH1pMSXV/eSU="; + hash = "sha256-s2EvD1TDoRoKrvpRc6h3P7xRyT941nW1hveucXDLB4w="; }; pythonRelaxDeps = [ "defusedxml" ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - pbr + dependencies = [ cliff + debtcollector defusedxml + fixtures jsonschema - testtools - paramiko netaddr oslo-concurrency oslo-config oslo-log - stestr oslo-serialization oslo-utils - fixtures + paramiko + pbr + prettytable pyyaml - subunit + stestr stevedore - prettytable + subunit + testscenarios + testtools urllib3 - debtcollector ]; nativeCheckInputs = [ - stestr hacking oslotest + stestr ]; checkPhase = '' @@ -94,6 +96,7 @@ buildPythonPackage rec { description = "OpenStack integration test suite that runs against live OpenStack cluster and validates an OpenStack deployment"; homepage = "https://github.com/openstack/tempest"; license = licenses.asl20; + mainProgram = "tempest"; maintainers = teams.openstack.members; }; } diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 23c8e031c4892..8ac06879c1052 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,38 +1,38 @@ { lib, buildPythonPackage, - fetchPypi, - freezegun, + fetchFromGitHub, jaraco-functools, - pytest-freezegun, + pytest-freezer, pytestCheckHook, + python-dateutil, pythonOlder, - pytz, setuptools-scm, }: buildPythonPackage rec { pname = "tempora"; - version = "5.6.0"; - format = "pyproject"; + version = "5.7.0"; + pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-O/zBLL27uv7KrMuQl/w3VENbnQY9zkMzjk+ofTkQSu0="; + src = fetchFromGitHub { + owner = "jaraco"; + repo = "tempora"; + rev = "refs/tags/v${version}"; + hash = "sha256-M6nWKYvgn4tk2diiTDAYb1uQdP8H1M8yqhsFLJ9H7HU="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ jaraco-functools - pytz + python-dateutil ]; nativeCheckInputs = [ - freezegun - pytest-freezegun + pytest-freezer pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index aa55057c63ea9..c5d250698715f 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1222"; + version = "3.0.1244"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-984uvizJ6gz4+y2fABp3IUBrJw/Z9HMbLo7zOfuf1Ik="; + hash = "sha256-T6vYefIN57iD/wBy4ZpVXAJyZNHr/faO08VNSDYRs+8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index e0c4231be405b..aab6bc7e9df6a 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { # Requires network access (FileNotFoundError: [Errno 2] No such file or directory: 'wget') "test_onnx_graph" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Fails with a mysterious error in pytorch: # RuntimeError: required keyword attribute 'name' has the wrong type "test_pytorch_graph" diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index fff726f5beeb9..1ad591e13be6b 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -73,6 +73,7 @@ buildPythonPackage rec { # torch._dynamo.exc.BackendCompilerFailed # Requires a more recent version of triton # Re-enable when https://github.com/NixOS/nixpkgs/pull/328247 is merged + "test_functional" "test_linear" "test_seq" "test_seq_lmbda" @@ -90,7 +91,7 @@ buildPythonPackage rec { "test_map_iter_interrupt_early" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: # OpenMP support not found. "test/test_compile.py" diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 587f6b683a7da..7b059969ebb6d 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,34 +1,45 @@ { lib, stdenv, - fetchFromGitHub, - bazel_6, + + # bazel wheel buildBazelPackage, - buildPythonPackage, - cctools, + fetchFromGitHub, + + # nativeBuildInputs python, setuptools, wheel, absl-py, - tensorflow, - six, - numpy, - dm-tree, - keras, - decorator, + + bazel_6, + cctools, + + # python package + buildPythonPackage, + + # dependencies cloudpickle, + decorator, + dm-tree, gast, + keras, + numpy, + six, + tensorflow, + + # tests hypothesis, - scipy, - pandas, - mpmath, matplotlib, mock, + mpmath, + pandas, pytest, + scipy, }: let - version = "0.21.0"; + version = "0.24.0"; pname = "tensorflow-probability"; # first build all binaries and generate setup.py using bazel @@ -38,21 +49,21 @@ let owner = "tensorflow"; repo = "probability"; rev = "refs/tags/v${version}"; - hash = "sha256-DsJd1E5n86xNS7Ci0DXxoUxQ9jH8OwTZq2UuLlQtMUU="; + hash = "sha256-V6aw4NtGOHlvcbgLWMH29x81eck1PyzV93ANelvpL4c="; }; nativeBuildInputs = [ + absl-py # needed to create the output wheel in installPhase python setuptools - wheel - absl-py tensorflow + wheel ]; bazel = bazel_6; bazelTargets = [ ":pip_pkg" ]; - LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; + LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { sha256 = "sha256-TbWcWYidyXuAMgBnO2/k0NKCzc4wThf2uUeC3QxdBJY="; @@ -83,27 +94,27 @@ buildPythonPackage { src = bazel-wheel; - propagatedBuildInputs = [ - tensorflow - six - numpy - decorator + dependencies = [ cloudpickle - gast + decorator dm-tree + gast keras + numpy + six + tensorflow ]; # Listed here: # https://github.com/tensorflow/probability/blob/f3777158691787d3658b5e80883fe1a933d48989/testing/dependency_install_lib.sh#L83 nativeCheckInputs = [ hypothesis - pytest - scipy - pandas - mpmath matplotlib mock + mpmath + pandas + pytest + scipy ]; # Ideally, we run unit tests with pytest, but in checkPhase, only the Bazel-build wheel is available. @@ -114,10 +125,11 @@ buildPythonPackage { # sanity check pythonImportsCheck = [ "tensorflow_probability" ]; - meta = with lib; { + meta = { description = "Library for probabilistic reasoning and statistical analysis"; homepage = "https://www.tensorflow.org/probability/"; - license = licenses.asl20; - maintainers = with maintainers; [ GaetanLepage ]; + changelog = "https://github.com/tensorflow/probability/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 140a77942dab1..c187737eeeadc 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -20,6 +20,7 @@ distutils, wheel, jax, + ml-dtypes, opt-einsum, tensorflow-estimator-bin, tensorboard, @@ -38,30 +39,34 @@ typing-extensions, }: -# We keep this binary build for two reasons: +# We keep this binary build for three reasons: # - the source build doesn't work on Darwin. # - the source build is currently brittle and not easy to maintain +# - the source build doesn't work on NVIDIA Jetson platforms # unsupported combination -assert !(stdenv.isDarwin && cudaSupport); +assert !(stdenv.hostPlatform.isDarwin && cudaSupport); let packages = import ./binary-hashes.nix; inherit (cudaPackages) cudatoolkit cudnn; + + isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild; + isCudaX64 = cudaSupport && stdenv.hostPlatform.isx86_64; in buildPythonPackage { pname = "tensorflow" + lib.optionalString cudaSupport "-gpu"; - inherit (packages) version; + version = packages."${"version" + lib.optionalString isCudaJetson "_jetson"}"; format = "wheel"; src = let pyVerNoDot = lib.strings.stringAsChars (x: lib.optionalString (x != ".") x) python.pythonVersion; platform = stdenv.system; - cuda = lib.optionalString cudaSupport "_gpu"; + cuda = lib.optionalString cudaSupport (if isCudaJetson then "_jetson" else "_gpu"); key = "${platform}_${pyVerNoDot}${cuda}"; in - fetchurl (packages.${key} or (throw "tensoflow-bin: unsupported system: ${stdenv.system}")); + fetchurl (packages.${key} or (throw "tensoflow-bin: unsupported configuration: ${key}")); buildInputs = [ llvmPackages.openmp ]; @@ -73,7 +78,7 @@ buildPythonPackage { protobuf numpy scipy - jax + (if isCudaX64 then jax else ml-dtypes) termcolor grpcio six @@ -90,10 +95,13 @@ buildPythonPackage { h5py ] ++ lib.optional (!isPy3k) mock; - build-system = [ - distutils - wheel - ] ++ lib.optionals cudaSupport [ addDriverRunpath ]; + build-system = + [ + distutils + wheel + ] + ++ lib.optionals cudaSupport [ addDriverRunpath ] + ++ lib.optionals isCudaJetson [ cudaPackages.autoAddCudaCompatRunpath ]; preConfigure = '' unset SOURCE_DATE_EPOCH @@ -103,6 +111,11 @@ buildPythonPackage { pushd dist + for f in tensorflow-*+nv*.whl; do + # e.g. *nv24.07* -> *nv24.7* + mv "$f" "$(sed -E 's/(nv[0-9]+)\.0*([0-9]+)/\1.\2/' <<< "$f")" + done + wheel unpack --dest unpacked ./*.whl rm ./*.whl ( @@ -147,7 +160,7 @@ buildPythonPackage { rpath = lib.makeLibraryPath (libpaths ++ cudapaths); in - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' # This is an array containing all the directories in the tensorflow2 # package that contain .so files. # diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix index 53cff3494dea1..2a6a31b540b26 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix @@ -1,5 +1,6 @@ { version = "2.17.0"; + version_jetson = "2.16.1+nv24.07"; x86_64-linux_39 = { url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow_cpu-2.17.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; sha256 = "1aacn68b88bnnmpl1q0irih0avzm2lfyhwr3wldg144n5zljlrbx"; @@ -48,6 +49,10 @@ url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; sha256 = "1zrscms9qkfpiscnl8c7ibfipwpw8jrdfvwh4wb69p9rxvqgxbbj"; }; + aarch64-linux_310_jetson = { + url = "https://developer.download.nvidia.com/compute/redist/jp/v60/tensorflow/tensorflow-2.16.1+nv24.07-cp310-cp310-linux_aarch64.whl"; + sha256 = "1ymdknl5v41z6z0wg068diici30am8vysg6b6sqxr8w6yk4aib42"; + }; aarch64-darwin_39 = { url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp39-cp39-macosx_12_0_arm64.whl"; sha256 = "01a3hjnrgjp2i0ciwyy0gki41cy32prvjhr20zhlcjwbssarxy4p"; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 31639d48f9349..69df6b23d50a9 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -107,7 +107,7 @@ let stdenv = if cudaSupport then cudaPackages.backendStdenv - else if originalStdenv.isDarwin then + else if originalStdenv.hostPlatform.isDarwin then llvmPackages.stdenv else originalStdenv; @@ -274,7 +274,7 @@ let ''; }; bazel-build = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then _bazel-build.overrideAttrs (prev: { bazelFlags = prev.bazelFlags ++ [ "--override_repository=rules_cc=${rules_cc_darwin_patched}" @@ -341,16 +341,16 @@ let cudnnMerged ] ++ lib.optionals mklSupport [ mkl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation Security ] - ++ lib.optionals (!stdenv.isDarwin) [ nsync ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ nsync ]; # arbitrarily set to the current latest bazel version, overly careful TF_IGNORE_MAX_BAZEL_VERSION = true; - LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; + LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool"; # Take as many libraries from the system as possible. Keep in sync with # list of valid syslibs in @@ -395,7 +395,7 @@ let "wrapt" "zlib" ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "nsync" # fails to build on darwin ] ); @@ -598,12 +598,12 @@ let maintainers = with lib.maintainers; [ abbradar ]; platforms = with lib.platforms; linux ++ darwin; broken = - stdenv.isDarwin + stdenv.hostPlatform.isDarwin || !(xlaSupport -> cudaSupport) || !(cudaSupport -> builtins.hasAttr cudnnAttribute cudaPackages) || !(cudaSupport -> cudaPackages ? cudatoolkit); } - // lib.optionalAttrs stdenv.isDarwin { + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s }; diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index b0ad86eccab8e..912977ecc42a5 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,8 +1,10 @@ #!/usr/bin/env bash version="2.17.0" +version_jetson="2.16.1+nv24.07" bucket="https://storage.googleapis.com/tensorflow/versions/${version}" +bucket_jetson="https://developer.download.nvidia.com/compute/redist/jp/v60/tensorflow" # List of binary wheels for Tensorflow. The most recent versions can be found # on the following page: @@ -20,6 +22,7 @@ url_and_key_list=( "aarch64-linux_310 $bucket/tensorflow-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux_311 $bucket/tensorflow-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux_312 $bucket/tensorflow-${version}-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" +"aarch64-linux_310_jetson $bucket_jetson/tensorflow-${version_jetson}-cp310-cp310-linux_aarch64.whl" "aarch64-darwin_39 $bucket/tensorflow-${version}-cp39-cp39-macosx_12_0_arm64.whl" "aarch64-darwin_310 $bucket/tensorflow-${version}-cp310-cp310-macosx_12_0_arm64.whl" "aarch64-darwin_311 $bucket/tensorflow-${version}-cp311-cp311-macosx_12_0_arm64.whl" @@ -30,6 +33,7 @@ hashfile=binary-hashes.nix rm -f $hashfile echo "{" >> $hashfile echo "version = \"$version\";" >> $hashfile +echo "version_jetson = \"$version_jetson\";" >> $hashfile for url_and_key in "${url_and_key_list[@]}"; do key=$(echo "$url_and_key" | cut -d' ' -f1) diff --git a/pkgs/development/python-modules/tensorstore/default.nix b/pkgs/development/python-modules/tensorstore/default.nix index 31c126f628357..7a550a5c4ede7 100644 --- a/pkgs/development/python-modules/tensorstore/default.nix +++ b/pkgs/development/python-modules/tensorstore/default.nix @@ -16,17 +16,17 @@ let "aarch64-darwin" = "macosx_11_0_arm64"; }; hashes = { - "310-x86_64-linux" = "sha256-1b6w9wgT6fffTTpJ3MxdPSrFD7Xaby6prQYFljVn4x4="; - "311-x86_64-linux" = "sha256-8+HlzaxH30gB5N+ZKR0Oq+yswhq5gjiSF9jVsg8U22E="; - "312-x86_64-linux" = "sha256-e8iEQzB4D3RSXgrcPC4me/vsFKoXf1QFNZfQ7968zQE="; - "310-aarch64-darwin" = "sha256-2C60yJk/Pbx2woV7hzEmWGzNKWWnySDfTPm247PWIRA="; - "311-aarch64-darwin" = "sha256-rdLB7l/8ZYjV589qKtORiyu1rC7W30wzrsz1uihNRpk="; - "312-aarch64-darwin" = "sha256-DpbYMIbqceQeiL7PYwnvn9jLtv8EmfHXmxvPfZCw914="; + "310-x86_64-linux" = "sha256-oB68FjYzmRARWpbajQuLpAzWwg9CCji4tLZRFCsztjk="; + "311-x86_64-linux" = "sha256-kGEecBu7b3TFGUIRirI9q2W3nipiQwsh/1OB92RqDB4="; + "312-x86_64-linux" = "sha256-Vw8sT5kahSN20BQs3MOYesSUZqk4CuvfZR1z5nAO7g8="; + "310-aarch64-darwin" = "sha256-2vuVxmJMx/GeaHgzUS6rRdysQFHreVzZ5IT5YSDUJro="; + "311-aarch64-darwin" = "sha256-0xRVDSDE9upz2yU7mzpa3Y6l6M5FWOMAPKWBC8eY3Eo="; + "312-aarch64-darwin" = "sha256-i2TmLOl2aHD5iyzF6YpjbHKFmBGPx5ixPYyNKKQfRNM="; }; in buildPythonPackage rec { pname = "tensorstore"; - version = "0.1.53"; + version = "0.1.65"; format = "wheel"; # The source build involves some wonky Bazel stuff. @@ -42,21 +42,21 @@ buildPythonPackage rec { or (throw "unsupported system/python version combination"); }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - propagatedBuildInputs = [ + dependencies = [ ml-dtypes numpy ]; pythonImportsCheck = [ "tensorstore" ]; - meta = with lib; { + meta = { description = "Library for reading and writing large multi-dimensional arrays"; homepage = "https://google.github.io/tensorstore"; changelog = "https://github.com/google/tensorstore/releases/tag/v${version}"; - license = licenses.asl20; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; - maintainers = with maintainers; [ samuela ]; + license = lib.licenses.asl20; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = with lib.maintainers; [ samuela ]; }; } diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 1efd28a3041e3..9e854fc168d61 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.7.4"; + version = "0.7.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-lZuluzOiqqeDFf+DrX0/KNbsUKanUn2xglp3HW0ITso="; + hash = "sha256-jExS2bnxz35mqzN2f6qrqInpoNWGUYLzueKeXp//9/8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index a6d0ea2e8ee66..2c293c5d7bd40 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.12.0"; + version = "3.12.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = "teslajsonpy"; rev = "refs/tags/v${version}"; - hash = "sha256-oIuIE5N/cHCEP3azMrwNiknP4q3rDxg4BiFQiJqcFkc="; + hash = "sha256-kUuvzjQBHWy3Si/Ha9M01ijv4QyQwK/g5gyhd7/lIdA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 4e0c517ca55e8..e1ef6e67796ad 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -1,27 +1,30 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system poetry-core, + + # buildInputs deprecation, docker, wrapt, + + # dependencies typing-extensions, }: buildPythonPackage rec { pname = "testcontainers"; - version = "4.8.0"; + version = "4.8.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-4PYtWn3NqGYe4BrYTG/CwPAdPVFkdUyFuAxwGQvd6y8="; + hash = "sha256-UCT0AmpDWMiAeRuW4BadZl4cJFCQPDogHOSkTYi/tqM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index 7403d9c2af240..913226ddc78b0 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { rm testpath/cli-32.exe testpath/cli-64.exe ''; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Work around https://github.com/jupyter/testpath/issues/24 export TMPDIR="/tmp" ''; diff --git a/pkgs/development/python-modules/textile/default.nix b/pkgs/development/python-modules/textile/default.nix index 725e6adae5498..09e83fa1caeba 100644 --- a/pkgs/development/python-modules/textile/default.nix +++ b/pkgs/development/python-modules/textile/default.nix @@ -2,45 +2,57 @@ lib, buildPythonPackage, fetchFromGitHub, - html5lib, + nh3, + pillow, + pytest-cov-stub, pytestCheckHook, pythonOlder, regex, + setuptools-scm, + setuptools, }: buildPythonPackage rec { pname = "textile"; - version = "4.0.2"; - format = "setuptools"; + version = "4.0.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; + owner = "textile"; repo = "python-textile"; - rev = version; - hash = "sha256-WwX7h07Bq8sNsViHwmfhrrqleXacmrIY4ZBBaP2kKnI="; + rev = "refs/tags/${version}"; + hash = "sha256-KVDppsvX48loV9OJ70yqmQ5ZSypzcxrjH1j31DcyfM8="; }; - propagatedBuildInputs = [ - html5lib + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + nh3 regex ]; - nativeCheckInputs = [ pytestCheckHook ]; + optional-dependencies = { + imagesize = [ pillow ]; + }; - postPatch = '' - substituteInPlace pytest.ini \ - --replace " --cov=textile --cov-report=html --cov-append --cov-report=term-missing" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "textile" ]; meta = with lib; { description = "MOdule for generating web text"; - mainProgram = "pytextile"; homepage = "https://github.com/textile/python-textile"; + changelog = "https://github.com/textile/python-textile/blob/${version}/CHANGELOG.textile"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; + mainProgram = "pytextile"; }; } diff --git a/pkgs/development/python-modules/textual-fastdatatable/default.nix b/pkgs/development/python-modules/textual-fastdatatable/default.nix new file mode 100644 index 0000000000000..16d5418a27364 --- /dev/null +++ b/pkgs/development/python-modules/textual-fastdatatable/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + pyarrow, + pytz, + textual, + tzdata, + polars, +}: + +buildPythonPackage rec { + pname = "textual-fastdatatable"; + version = "0.9.0"; + pyproject = true; + + src = fetchPypi { + pname = "textual_fastdatatable"; + inherit version; + hash = "sha256-AS3SiwetCHkCMu8H81xbp5QvN/2GCvMlWgU4qZKvBRU="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + pyarrow + pytz + textual + tzdata + ]; + + optional-dependencies = { + polars = [ + polars + ]; + }; + + pythonImportsCheck = [ + "textual_fastdatatable" + ]; + + meta = { + description = "A performance-focused reimplementation of Textual's DataTable widget, with a pluggable data storage backend"; + homepage = "https://pypi.org/project/textual-fastdatatable/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + }; +} diff --git a/pkgs/development/python-modules/textual-slider/default.nix b/pkgs/development/python-modules/textual-slider/default.nix new file mode 100644 index 0000000000000..1a6734a314620 --- /dev/null +++ b/pkgs/development/python-modules/textual-slider/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + textual, +}: + +buildPythonPackage rec { + pname = "textual-slider"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "TomJGooding"; + repo = "textual-slider"; + rev = "91e64bafe3aa72f8d875e76b437d6af9320e039e"; + hash = "sha256-lwN7igiEB8uC9e7qBSVLuKCpF41+Ni7ZJ3cVK19cEY8="; + }; + + pyproject = true; + + build-system = [ setuptools ]; + + dependencies = [ textual ]; + + meta = with lib; { + description = "Textual widget for a simple slider"; + homepage = "https://github.com/TomJGooding/textual-slider"; + license = licenses.gpl3Only; + maintainers = [ maintainers.lukegb ]; + }; +} diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix new file mode 100644 index 0000000000000..74293ee3c2e42 --- /dev/null +++ b/pkgs/development/python-modules/textual-textarea/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + pyperclip, + textual, +}: + +buildPythonPackage rec { + pname = "textual-textarea"; + version = "0.14.2"; + pyproject = true; + + src = fetchPypi { + pname = "textual_textarea"; + inherit version; + hash = "sha256-AJU7BBoev6pBrLhvbfF4I7l+E8YnO5jCD5OIsNf6NW0="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + pyperclip + textual + ]; + + pythonImportsCheck = [ + "textual_textarea" + ]; + + meta = { + description = "A text area (multi-line input) with syntax highlighting for Textual"; + homepage = "https://pypi.org/project/textual-textarea/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + }; +} diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix index e5355261be252..9da4e1e82ee78 100644 --- a/pkgs/development/python-modules/textual-universal-directorytree/default.nix +++ b/pkgs/development/python-modules/textual-universal-directorytree/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { universal-pathlib ]; - passthru.optional-dependencies = { + optional-dependencies = { remote = [ adlfs aiohttp @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Textual plugin for a DirectoryTree compatible with remote filesystems"; homepage = "https://github.com/juftin/textual-universal-directorytree"; - changelog = "https://github.com/juftin/textual-universal-directorytree/releases/tag/${src.rev}"; + changelog = "https://github.com/juftin/textual-universal-directorytree/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index f0ee4ea3b8722..0ad102fcfdb2a 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -4,8 +4,10 @@ fetchFromGitHub, jinja2, markdown-it-py, + platformdirs, poetry-core, pytest-aiohttp, + pytest-xdist, pytestCheckHook, pythonOlder, rich, @@ -18,7 +20,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.72.0"; + version = "0.81.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,12 +29,13 @@ buildPythonPackage rec { owner = "Textualize"; repo = "textual"; rev = "refs/tags/v${version}"; - hash = "sha256-iNl9bos1GBLmHRvSgqYD8b6cptmmMktXkDXQbm3xMtc="; + hash = "sha256-IQmpMBuG7K4x1F8GcPBe2juWUqVyE0g5fQLTfZZso/8="; }; build-system = [ poetry-core ]; dependencies = [ + platformdirs markdown-it-py rich typing-extensions @@ -41,13 +44,13 @@ buildPythonPackage rec { optional-dependencies = { syntax = [ tree-sitter - tree-sitter-languages - ]; + ] ++ lib.optionals (!tree-sitter-languages.meta.broken) [ tree-sitter-languages ]; }; nativeCheckInputs = [ jinja2 pytest-aiohttp + pytest-xdist pytestCheckHook syrupy time-machine @@ -68,6 +71,10 @@ buildPythonPackage rec { "test_language_binary_missing" ]; + # Some tests in groups require state from previous tests + # See https://github.com/Textualize/textual/issues/4924#issuecomment-2304889067 + pytestFlagsArray = [ "--dist=loadgroup" ]; + pythonImportsCheck = [ "textual" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix index ea0f56717d522..9244644395784 100644 --- a/pkgs/development/python-modules/textx/default.nix +++ b/pkgs/development/python-modules/textx/default.nix @@ -3,17 +3,9 @@ buildPythonPackage, python, fetchFromGitHub, - mkdocs, - twine, arpeggio, click, - future, - setuptools, callPackage, - gprof2dot, - html5lib, - jinja2, - psutil, flit-core, }: diff --git a/pkgs/development/python-modules/tf2onnx/default.nix b/pkgs/development/python-modules/tf2onnx/default.nix index 73c19842f103e..54a837089bc8a 100644 --- a/pkgs/development/python-modules/tf2onnx/default.nix +++ b/pkgs/development/python-modules/tf2onnx/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest-runner, # runtime dependencies numpy, onnx, @@ -34,9 +33,10 @@ buildPythonPackage rec { hash = "sha256-qtRzckw/KHWm3gjFwF+cPuBhGbfktjhYIwImwHn2CFk="; }; - nativeBuildInputs = [ - pytest-runner - ]; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'pytest-runner'" "" + ''; pythonRelaxDeps = [ "flatbuffers" ]; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 86700bd0aed20..99126084f28a9 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -16,59 +16,65 @@ mock, murmurhash, numpy, - plac, preshed, pydantic, pytestCheckHook, - python, pythonOlder, setuptools, srsly, - tqdm, typing-extensions, wasabi, }: buildPythonPackage rec { pname = "thinc"; - version = "8.2.3"; - format = "setuptools"; + version = "8.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9a/FIikSqAvai9zslYNiorpTjXAn3I22FUhF0oWdynY="; + hash = "sha256-6zvtVPXADsmt2qogjFHM+gWUg9cxQM1RWqMzc3Fcblk="; }; postPatch = '' + # As per https://github.com/explosion/thinc/releases/tag/release-v8.3.0 no + # code changes were required for NumPy 2.0. Thus Thinc should be compatible + # with NumPy 1.0 and 2.0. + substituteInPlace pyproject.toml setup.cfg \ + --replace-fail "numpy>=2.0.0,<2.1.0" numpy substituteInPlace setup.cfg \ - --replace "preshed>=3.0.2,<3.1.0" "preshed" + --replace-fail "numpy>=2.0.1,<2.1.0" numpy ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ + blis + cymem + cython_0 + murmurhash + numpy + preshed + setuptools + ]; - buildInputs = - [ cython_0 ] - ++ lib.optionals stdenv.isDarwin [ - Accelerate - CoreFoundation - CoreGraphics - CoreVideo - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + Accelerate + CoreFoundation + CoreGraphics + CoreVideo + ]; - propagatedBuildInputs = [ + dependencies = [ blis catalogue confection cymem murmurhash numpy - plac preshed pydantic srsly - tqdm wasabi ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; @@ -78,10 +84,7 @@ buildPythonPackage rec { pytestCheckHook ]; - # Add native extensions. preCheck = '' - export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH - # avoid local paths, relative imports wont resolve correctly mv thinc/tests tests rm -r thinc diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix new file mode 100644 index 0000000000000..0b269d0ff3d7b --- /dev/null +++ b/pkgs/development/python-modules/thinqconnect/default.nix @@ -0,0 +1,46 @@ +{ + lib, + aiohttp, + awsiotsdk, + buildPythonPackage, + fetchFromGitHub, + pyopenssl, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "pythinqconnect"; + version = "0.9.7-unstable-2024-09-09"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "thinq-connect"; + repo = "pythinqconnect"; + # https://github.com/thinq-connect/pythinqconnect/issues/1 + rev = "39d535a2a5d1067a110eea37ae92002d0793b7e9"; + hash = "sha256-+nQAUqg5rB2eJgPBJJR8NsQ1O2Wb4UsbBQVPir1jyAU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + awsiotsdk + pyopenssl + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "thinqconnect" ]; + + meta = { + description = "Module to interacting with the LG ThinQ Connect Open API"; + homepage = "https://github.com/thinq-connect/pythinqconnect"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index edde349d41253..bb85250daebfa 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -8,22 +8,25 @@ numpy, pytestCheckHook, pythonOlder, + setuptools, zarr, }: buildPythonPackage rec { pname = "tifffile"; - version = "2024.6.18"; - format = "setuptools"; + version = "2024.9.20"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-V+DSoDS8tih+oxVdhxZQjfrIZEOiV/ZQK1fuf4ozs7Y="; + hash = "sha256-P7874vmVpwUaiuBaS+cMlvwHifIu1vHEEEyXPPaKZAs="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; nativeCheckInputs = [ dask diff --git a/pkgs/development/python-modules/tiktoken/default.nix b/pkgs/development/python-modules/tiktoken/default.nix index ffcead40165d8..9ce945ebf7c33 100644 --- a/pkgs/development/python-modules/tiktoken/default.nix +++ b/pkgs/development/python-modules/tiktoken/default.nix @@ -54,7 +54,7 @@ buildPythonPackage { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ requests diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 94482d760678e..e869dc7ddc855 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "6.5.2"; + version = "6.5.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,16 +23,17 @@ buildPythonPackage rec { owner = "jannikmi"; repo = "timezonefinder"; rev = "refs/tags/${version}"; - hash = "sha256-2vQk7aSsyyh3mN1l4A5Y5yASJ2V7e4fegsOExGwyhGA="; + hash = "sha256-8fDKgM6LVe7aJgD4UfTpg0EjKGuudzYsmqniocozmAE="; }; - nativeBuildInputs = [ - cffi + build-system = [ poetry-core setuptools ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ cffi ]; + + dependencies = [ cffi h3 numpy @@ -53,9 +54,9 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/jannikmi/timezonefinder/blob/${version}/CHANGELOG.rst"; description = "Module for finding the timezone of any point on earth (coordinates) offline"; - mainProgram = "timezonefinder"; homepage = "https://github.com/MrMinimal64/timezonefinder"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "timezonefinder"; }; } diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix index cd322ecfacde9..14fd91a1bb12a 100644 --- a/pkgs/development/python-modules/tinygrad/default.nix +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -11,38 +11,43 @@ ocl-icd, stdenv, rocmPackages, + # build-system setuptools, - wheel, + # dependencies numpy, - tqdm, - # nativeCheckInputs + + # tests + blobfile, + bottle, clang, hexdump, hypothesis, librosa, onnx, pillow, + pydot, pytest-xdist, pytestCheckHook, safetensors, sentencepiece, tiktoken, torch, + tqdm, transformers, }: buildPythonPackage rec { pname = "tinygrad"; - version = "0.9.0"; + version = "0.9.2"; pyproject = true; src = fetchFromGitHub { owner = "tinygrad"; repo = "tinygrad"; rev = "refs/tags/v${version}"; - hash = "sha256-opBxciETZruZjHqz/3vO7rogzjvVJKItulIiok/Zs2Y="; + hash = "sha256-fCKtJhZtqq6yjc6m41uvikzM9GArUlB8Q7jN/Np8+SM="; }; patches = [ @@ -62,31 +67,27 @@ buildPythonPackage rec { substituteInPlace tinygrad/runtime/autogen/opencl.py \ --replace-fail "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'" '' - # hipGetDevicePropertiesR0600 is a symbol from rocm-6. We are currently at rocm-5. - # We are not sure that this works. Remove when rocm gets updated to version 6. + # Patch `clang` directly in the source file + + '' + substituteInPlace tinygrad/runtime/ops_clang.py \ + --replace-fail "'clang'" "'${lib.getExe clang}'" + '' + lib.optionalString rocmSupport '' - substituteInPlace extra/hip_gpu_driver/hip_ioctl.py \ - --replace-fail "processor = platform.processor()" "processor = ${stdenv.hostPlatform.linuxArch}" substituteInPlace tinygrad/runtime/autogen/hip.py \ --replace-fail "/opt/rocm/lib/libamdhip64.so" "${rocmPackages.clr}/lib/libamdhip64.so" \ --replace-fail "/opt/rocm/lib/libhiprtc.so" "${rocmPackages.clr}/lib/libhiprtc.so" \ - --replace-fail "hipGetDevicePropertiesR0600" "hipGetDeviceProperties" substituteInPlace tinygrad/runtime/autogen/comgr.py \ --replace-fail "/opt/rocm/lib/libamd_comgr.so" "${rocmPackages.rocm-comgr}/lib/libamd_comgr.so" ''; - build-system = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; dependencies = [ numpy - tqdm ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # pyobjc-framework-libdispatch # pyobjc-framework-metal ]; @@ -94,18 +95,22 @@ buildPythonPackage rec { pythonImportsCheck = [ "tinygrad" ]; nativeCheckInputs = [ + blobfile + bottle clang hexdump hypothesis librosa onnx pillow + pydot pytest-xdist pytestCheckHook safetensors sentencepiece tiktoken torch + tqdm transformers ]; @@ -115,6 +120,10 @@ buildPythonPackage rec { disabledTests = [ + # flaky: https://github.com/tinygrad/tinygrad/issues/6542 + # TODO: re-enable when https://github.com/tinygrad/tinygrad/pull/6560 gets merged + "test_broadcastdot" + # Require internet access "test_benchmark_openpilot_model" "test_bn_alone" @@ -129,12 +138,14 @@ buildPythonPackage rec { "test_e2e_big" "test_fetch_small" "test_huggingface_enet_safetensors" + "test_index_mnist" "test_linear_mnist" "test_load_convnext" "test_load_enet" "test_load_enet_alt" "test_load_llama2bfloat" "test_load_resnet" + "test_mnist_val" "test_openpilot_model" "test_resnet" "test_shufflenet" @@ -148,33 +159,29 @@ buildPythonPackage rec { ] # Fail on aarch64-linux with AssertionError ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ - "test_casts_to" - "test_casts_to" - "test_int8_to_uint16_negative" - "test_casts_to" - "test_casts_to" "test_casts_from" "test_casts_to" "test_int8" - "test_casts_to" + "test_int8_to_uint16_negative" ]; - disabledTestPaths = - [ - # Require internet access - "test/models/test_mnist.py" - "test/models/test_real_world.py" - "test/testextra/test_lr_scheduler.py" - ] - ++ lib.optionals (!rocmSupport) [ "extra/hip_gpu_driver/" ]; + disabledTestPaths = [ + # Require internet access + "test/models/test_mnist.py" + "test/models/test_real_world.py" + "test/testextra/test_lr_scheduler.py" + + # Files under this directory are not considered as tests by upstream and should be skipped + "extra/" + ]; - meta = with lib; { + meta = { description = "Simple and powerful neural network framework"; homepage = "https://github.com/tinygrad/tinygrad"; changelog = "https://github.com/tinygrad/tinygrad/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; # Requires unpackaged pyobjc-framework-libdispatch and pyobjc-framework-metal - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch b/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch index 6b77173b4eccf..db74eab45bc05 100644 --- a/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch +++ b/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch @@ -1,32 +1,49 @@ diff --git a/tinygrad/runtime/autogen/cuda.py b/tinygrad/runtime/autogen/cuda.py -index 359083a9..3cd5f7be 100644 +index a30c8f53..e2078ff6 100644 --- a/tinygrad/runtime/autogen/cuda.py +++ b/tinygrad/runtime/autogen/cuda.py -@@ -143,10 +143,25 @@ def char_pointer_cast(string, encoding='utf-8'): - return ctypes.cast(string, ctypes.POINTER(ctypes.c_char)) +@@ -145,7 +145,19 @@ def char_pointer_cast(string, encoding='utf-8'): -+NAME_TO_PATHS = { -+ "libcuda.so": ["@driverLink@/lib/libcuda.so"], -+ "libnvrtc.so": ["@libnvrtc@"], -+} -+def _try_dlopen(name): -+ try: -+ return ctypes.CDLL(name) -+ except OSError: -+ pass -+ for candidate in NAME_TO_PATHS.get(name, []): -+ try: -+ return ctypes.CDLL(candidate) -+ except OSError: -+ pass -+ raise RuntimeError(f"{name} not found") - _libraries = {} -_libraries['libcuda.so'] = ctypes.CDLL(ctypes.util.find_library('cuda')) --_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc')) -+_libraries['libcuda.so'] = _try_dlopen('libcuda.so') -+_libraries['libnvrtc.so'] = _try_dlopen('libnvrtc.so') ++libcuda = None ++try: ++ libcuda = ctypes.CDLL('libcuda.so') ++except OSError: ++ pass ++try: ++ libcuda = ctypes.CDLL('@driverLink@/lib/libcuda.so') ++except OSError: ++ pass ++if libcuda is None: ++ raise RuntimeError(f"`libcuda.so` not found") ++ ++_libraries['libcuda.so'] = libcuda cuuint32_t = ctypes.c_uint32 +diff --git a/tinygrad/runtime/autogen/nvrtc.py b/tinygrad/runtime/autogen/nvrtc.py +index 6af74187..c5a6c6c4 100644 +--- a/tinygrad/runtime/autogen/nvrtc.py ++++ b/tinygrad/runtime/autogen/nvrtc.py +@@ -10,7 +10,18 @@ import ctypes, ctypes.util + + + _libraries = {} +-_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc')) ++libnvrtc = None ++try: ++ libnvrtc = ctypes.CDLL('libnvrtc.so') ++except OSError: ++ pass ++try: ++ libnvrtc = ctypes.CDLL('@libnvrtc@') ++except OSError: ++ pass ++if libnvrtc is None: ++ raise RuntimeError(f"`libnvrtc.so` not found") ++_libraries['libnvrtc.so'] = ctypes.CDLL(libnvrtc) + def string_cast(char_pointer, encoding='utf-8', errors='strict'): + value = ctypes.cast(char_pointer, ctypes.c_char_p).value + if value is not None and encoding is not None: diff --git a/pkgs/development/python-modules/tinytuya/default.nix b/pkgs/development/python-modules/tinytuya/default.nix index cb9b37a01a84d..20398ec3584d9 100644 --- a/pkgs/development/python-modules/tinytuya/default.nix +++ b/pkgs/development/python-modules/tinytuya/default.nix @@ -1,27 +1,26 @@ { lib, buildPythonPackage, - fetchFromGitHub, - - # build-system - setuptools, - - # dependencies + colorama, cryptography, + fetchFromGitHub, + pythonOlder, requests, - colorama, + setuptools, }: buildPythonPackage rec { pname = "tinytuya"; - version = "1.14.0"; + version = "1.15.1"; pyproject = true; + disabled = pythonOlder "3.10"; + src = fetchFromGitHub { owner = "jasonacox"; repo = "tinytuya"; rev = "refs/tags/v${version}"; - hash = "sha256-ytM7S0V/hDOCb3RyzAXZEd2zV/sMVQPrah/2zRACMsQ="; + hash = "sha256-T7bT4be/h67iPIH/7hjNCYsUDP+4o4HLV523sBIjGVs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix index beba9834e703c..e051bbf86d98d 100644 --- a/pkgs/development/python-modules/tkinter/default.nix +++ b/pkgs/development/python-modules/tkinter/default.nix @@ -21,7 +21,7 @@ buildPythonPackage { mkdir -p $out/${py.sitePackages} mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/ '' - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Update the rpath to point to python without x11Support old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*) new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" ) diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 8bc321100aeba..ceaea06ebd741 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -3,22 +3,25 @@ buildPythonPackage, fetchFromGitHub, cmake, + setuptools, }: buildPythonPackage rec { pname = "tlsh"; - version = "4.10.0"; - format = "setuptools"; + version = "4.12.0"; + pyproject = true; src = fetchFromGitHub { owner = "trendmicro"; repo = "tlsh"; - rev = version; - hash = "sha256-9Vkj7a5xU/coFyM/8i8JB0DdnbgDAEMOjmmMF8ckKuE="; + rev = "refs/tags/${version}"; + hash = "sha256-Ht4LkcNmxPEvzFHXeS/XhPt/xo+0sE4RBcLCn9N/zwE="; }; nativeBuildInputs = [ cmake ]; + build-system = [ setuptools ]; + # no test data doCheck = false; @@ -26,10 +29,12 @@ buildPythonPackage rec { cd ../py_ext ''; + pythonImportsCheck = [ "tlsh" ]; + meta = with lib; { description = "Trend Micro Locality Sensitive Hash"; homepage = "https://tlsh.org/"; + changelog = "https://github.com/trendmicro/tlsh/releases/tag/${version}"; license = licenses.asl20; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index a2a9b7a04e7c0..1af40f588f575 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Token Bucket Implementation for Python Web Apps"; diff --git a/pkgs/development/python-modules/tokenizers/Cargo.lock b/pkgs/development/python-modules/tokenizers/Cargo.lock index a0324bff8aba5..aa12731f49c23 100644 --- a/pkgs/development/python-modules/tokenizers/Cargo.lock +++ b/pkgs/development/python-modules/tokenizers/Cargo.lock @@ -13,57 +13,58 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "base64" @@ -79,15 +80,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "byteorder" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.0.94" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" [[package]] name = "cfg-if" @@ -97,9 +104,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "console" @@ -111,7 +118,7 @@ dependencies = [ "lazy_static", "libc", "unicode-width", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -135,15 +142,15 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -151,9 +158,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", @@ -165,9 +172,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", @@ -207,9 +214,9 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -219,9 +226,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -229,9 +236,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -242,12 +249,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -261,9 +268,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fnv" @@ -273,9 +280,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -321,13 +328,19 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.11.0" @@ -354,27 +367,27 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -382,9 +395,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "macro_rules_attribute" @@ -404,9 +417,9 @@ checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" [[package]] name = "matrixmultiply" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ "autocfg", "rawpointer", @@ -414,9 +427,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -435,9 +448,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "monostate" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20fffcd8ca4c69d31e036a71abc400147b41f90895df4edcb36497a1f8af8bf" +checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e" dependencies = [ "monostate-impl", "serde", @@ -445,9 +458,9 @@ dependencies = [ [[package]] name = "monostate-impl" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf307cbbbd777a9c10cec88ddafee572b3484caad5cce0c9236523c3803105a6" +checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" dependencies = [ "proc-macro2", "quote", @@ -479,9 +492,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -497,9 +510,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -555,9 +568,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -565,22 +578,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pkg-config" @@ -590,21 +603,24 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -750,18 +766,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -771,9 +787,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -782,9 +798,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustc-hash" @@ -794,22 +810,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scopeguard" @@ -819,18 +835,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" dependencies = [ "proc-macro2", "quote", @@ -839,11 +855,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -868,15 +885,15 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.60" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -885,36 +902,37 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -923,7 +941,7 @@ dependencies = [ [[package]] name = "tokenizers" -version = "0.19.1-rc0" +version = "0.20.0-rc1" dependencies = [ "aho-corasick", "derive_builder", @@ -953,14 +971,13 @@ dependencies = [ [[package]] name = "tokenizers-python" -version = "0.19.1-rc0" +version = "0.20.0-rc1" dependencies = [ "env_logger", "itertools 0.12.1", "libc", "ndarray", "numpy", - "onig", "pyo3", "rayon", "serde", @@ -992,9 +1009,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode_categories" @@ -1010,9 +1027,9 @@ checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "wasi" @@ -1026,126 +1043,99 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets", ] [[package]] -name = "windows-targets" -version = "0.48.5" +name = "windows-sys" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" 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", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", "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", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_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" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" 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" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[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" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.6" 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" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.5" +name = "windows_x86_64_msvc" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" +name = "zerocopy" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] [[package]] -name = "windows_x86_64_msvc" -version = "0.52.5" +name = "zerocopy-derive" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index aca17db0e74e5..edf0c6f3784fc 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -2,24 +2,32 @@ lib, stdenv, linkFarm, + fetchurl, buildPythonPackage, - cargo, - datasets, - huggingface-hub, fetchFromGitHub, - fetchurl, - libiconv, - numpy, - openssl, - pkg-config, - pytestCheckHook, python, - pythonOlder, - requests, + + # nativeBuildInputs + pkg-config, + setuptools-rust, rustPlatform, + cargo, rustc, + + # buildInputs + openssl, + libiconv, Security, - setuptools-rust, + + # dependencies + huggingface-hub, + numpy, + + # tests + datasets, + pytestCheckHook, + requests, + tiktoken, }: let @@ -28,23 +36,23 @@ let test-data = linkFarm "tokenizers-test-data" { "roberta-base-vocab.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-vocab.json"; - sha256 = "0m86wpkfb2gdh9x9i9ng2fvwk1rva4p0s98xw996nrjxs7166zwy"; + hash = "sha256-nn9jwtFdZmtS4h0lDS5RO4fJtxPPpph6gu2J5eblBlU="; }; "roberta-base-merges.txt" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-merges.txt"; - sha256 = "1idd4rvkpqqbks51i2vjbd928inw7slij9l4r063w3y5fd3ndq8w"; + hash = "sha256-HOFmR3PFDz4MyIQmGak+3EYkUltyixiKngvjO3cmrcU="; }; "albert-base-v1-tokenizer.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/albert-base-v1-tokenizer.json"; - sha256 = "1hra9pn8rczx7378z88zjclw2qsdrdwq20m56sy42s2crbas6akf"; + hash = "sha256-biqj1cpMaEG8NqUCgXnLTWPBKZMfoY/OOP2zjOxNKsM="; }; "bert-base-uncased-vocab.txt" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/bert-base-uncased-vocab.txt"; - sha256 = "18rq42cmqa8zanydsbzrb34xwy4l6cz1y900r4kls57cbhvyvv07"; + hash = "sha256-B+ztN1zsFE0nyQAkHz4zlHjeyVj5L928VR8pXJkgOKM="; }; "big.txt" = fetchurl { url = "https://norvig.com/big.txt"; - sha256 = "0yz80icdly7na03cfpl0nfk5h3j3cam55rj486n03wph81ynq1ps"; + sha256 = "sha256-+gZsfUDw8gGsQUTmUqpiQw5YprOAXscGUPZ42lgE6Hs="; }; "bert-wiki.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-pipeline/tokenizer.json"; @@ -56,26 +64,24 @@ let }; "openai-gpt-vocab.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json"; - sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x"; + hash = "sha256-/fSbGefeI2hSCR2gm4Sno81eew55kWN2z0X2uBJ7gHg="; }; "openai-gpt-merges.txt" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-merges.txt"; - sha256 = "09a754pm4djjglv3x5pkgwd6f79i2rq8ydg0f7c3q1wmwqdbba8f"; + hash = "sha256-Dqm1GuaVBzzYceA1j3AWMR1nGn/zlj42fVI2Ui8pRyU="; }; }; in buildPythonPackage rec { pname = "tokenizers"; - version = "0.19.1"; + version = "0.20.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "huggingface"; repo = "tokenizers"; rev = "refs/tags/v${version}"; - hash = "sha256-sKEAt46cdme821tzz9WSKnQb3hPmFJ4zvHgBNRxjEuk="; + hash = "sha256-uuSHsdyx77YQjf1aiz7EJ/X+6RaOgfmjGqHSlMaCWDI="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; @@ -94,20 +100,21 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; dependencies = [ - numpy huggingface-hub + numpy ]; nativeCheckInputs = [ datasets pytestCheckHook requests + tiktoken ]; postUnpack = '' @@ -127,17 +134,23 @@ buildPythonPackage rec { "test_encode_special_tokens" "test_splitting" "TestTrainFromIterators" + # Those tests require more data "test_from_pretrained" "test_from_pretrained_revision" "test_continuing_prefix_trainer_mistmatch" ]; - meta = with lib; { + disabledTestPaths = [ + # fixture 'model' not found + "benches/test_tiktoken.py" + ]; + + meta = { description = "Fast State-of-the-Art Tokenizers optimized for Research and Production"; homepage = "https://github.com/huggingface/tokenizers"; - license = licenses.asl20; - maintainers = [ ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index 03bb2f2ea81e7..9548f2d77657e 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "tololib" ]; # Network discovery doesn't work in the sandbox for darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Python Library for Controlling TOLO Sauna/Steam Bath Devices"; diff --git a/pkgs/development/python-modules/torch-geometric/default.nix b/pkgs/development/python-modules/torch-geometric/default.nix new file mode 100644 index 0000000000000..ed3bbdc735690 --- /dev/null +++ b/pkgs/development/python-modules/torch-geometric/default.nix @@ -0,0 +1,179 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + flit-core, + + # dependencies + aiohttp, + fsspec, + jinja2, + numpy, + psutil, + pyparsing, + requests, + torch, + tqdm, + + # optional-dependencies + matplotlib, + networkx, + pandas, + protobuf, + wandb, + ipython, + matplotlib-inline, + pre-commit, + torch-geometric, + ase, + # captum, + graphviz, + h5py, + numba, + opt-einsum, + pgmpy, + pynndescent, + # pytorch-memlab, + rdflib, + rdkit, + scikit-image, + scikit-learn, + scipy, + statsmodels, + sympy, + tabulate, + torchmetrics, + trimesh, + pytorch-lightning, + yacs, + huggingface-hub, + onnx, + onnxruntime, + pytest, + pytest-cov, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "torch-geometric"; + version = "2.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pyg-team"; + repo = "pytorch_geometric"; + rev = "refs/tags/${version}"; + hash = "sha256-Zw9YqPQw2N0ZKn5i5Kl4Cjk9JDTmvZmyO/VvIVr6fTU="; + }; + + build-system = [ + flit-core + ]; + + dependencies = [ + aiohttp + fsspec + jinja2 + numpy + psutil + pyparsing + requests + torch + tqdm + ]; + + optional-dependencies = { + benchmark = [ + matplotlib + networkx + pandas + protobuf + wandb + ]; + dev = [ + ipython + matplotlib-inline + pre-commit + torch-geometric + ]; + full = [ + ase + # captum + graphviz + h5py + matplotlib + networkx + numba + opt-einsum + pandas + pgmpy + pynndescent + # pytorch-memlab + rdflib + rdkit + scikit-image + scikit-learn + scipy + statsmodels + sympy + tabulate + torch-geometric + torchmetrics + trimesh + ]; + graphgym = [ + protobuf + pytorch-lightning + yacs + ]; + modelhub = [ + huggingface-hub + ]; + test = [ + onnx + onnxruntime + pytest + pytest-cov + ]; + }; + + pythonImportsCheck = [ + "torch_geometric" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + # TODO: try to re-enable when triton will have been updated to 3.0 + # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: + # LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler' + "test_compile_hetero_conv_graph_breaks" + "test_compile_multi_aggr_sage_conv" + + # RuntimeError: addmm: computation on CPU is not implemented for SparseCsr + SparseCsr @ SparseCsr without MKL. + # PyTorch built with MKL has better support for addmm with sparse CPU tensors. + "test_asap" + "test_graph_unet" + + # AttributeError: type object 'Any' has no attribute '_name' + "test_type_repr" + ]; + + meta = { + description = "Graph Neural Network Library for PyTorch"; + homepage = "https://github.com/pyg-team/pytorch_geometric"; + changelog = "https://github.com/pyg-team/pytorch_geometric/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/torch-pitch-shift/default.nix b/pkgs/development/python-modules/torch-pitch-shift/default.nix index 910b65c6363ae..754cd282a015f 100644 --- a/pkgs/development/python-modules/torch-pitch-shift/default.nix +++ b/pkgs/development/python-modules/torch-pitch-shift/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "torch-pitch-shift"; - version = "1.2.4"; + version = "1.2.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "KentoNishi"; repo = "torch-pitch-shift"; rev = "refs/tags/v${version}"; - hash = "sha256-s3z+6jOGC7RfF9TzVZ9HFbIFz2BsBm6Yhx7lgaEKv6o="; + hash = "sha256-QuDz9IpmBdzfMjwAuG2Ln0x2OL/w3RVd/EfO4Ws78dw="; }; pythonRelaxDeps = [ "torchaudio" ]; diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index 4ecaac16be187..bcd5008984fad 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -1,34 +1,41 @@ { lib, stdenv, - buildPythonPackage, - autoAddDriverRunpath, - fetchurl, python, - pythonAtLeast, + buildPythonPackage, pythonOlder, + pythonAtLeast, + fetchurl, + + # nativeBuildInputs addDriverRunpath, - callPackage, + autoAddDriverRunpath, + autoPatchelfHook, + + # buildInputs cudaPackages, + + # dependencies + filelock, future, + jinja2, + networkx, numpy, - autoPatchelfHook, pyyaml, requests, setuptools, - typing-extensions, sympy, - jinja2, - networkx, - filelock, + typing-extensions, triton, + + callPackage, }: let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.4.0"; + version = "2.4.1"; in buildPythonPackage { inherit version; @@ -42,13 +49,13 @@ buildPythonPackage { src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ addDriverRunpath - autoPatchelfHook autoAddDriverRunpath + autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux ( + buildInputs = lib.optionals stdenv.hostPlatform.isLinux ( with cudaPackages; [ # $out/${sitePackages}/nvfuser/_C*.so wants libnvToolsExt.so.1 but torch/lib only ships @@ -68,7 +75,7 @@ buildPythonPackage { ] ); - autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.isLinux [ + autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.hostPlatform.isLinux [ # This is the hardware-dependent userspace driver that comes from # nvidia_x11 package. It must be deployed at runtime in # /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather @@ -77,24 +84,24 @@ buildPythonPackage { ]; dependencies = [ + filelock future + jinja2 + networkx numpy pyyaml requests setuptools - typing-extensions sympy - jinja2 - networkx - filelock - ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ triton ]; + typing-extensions + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ triton ]; postInstall = '' # ONNX conversion rm -rf $out/bin ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' addAutoPatchelfSearchPath "$out/${python.sitePackages}/torch/lib" ''; @@ -105,7 +112,7 @@ buildPythonPackage { extraRunpaths = lib.optionals stdenv.hostPlatform.isLinux [ "${lib.getLib cudaPackages.cuda_nvrtc}/lib" ]; - postPhases = lib.optionals stdenv.isLinux [ "postPatchelfPhase" ]; + postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "postPatchelfPhase" ]; postPatchelfPhase = '' while IFS= read -r -d $'\0' elf ; do for extra in $extraRunpaths ; do diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 8a2cbc2ffa9c6..1db23d136ba4a 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.4.0" = { + "2.4.1" = { x86_64-linux-38 = { - name = "torch-2.4.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-ikebcXQK+SpOG5kEW+qDHz2nMYfIw+PSErHm/jkxWyE="; + name = "torch-2.4.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-y09QL5ELR+HjZsz3sjHawpZ9LvtH1LjLM/xjtLxe7tg="; }; x86_64-linux-39 = { - name = "torch-2.4.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-iIObriuWfdOFeaqwu6lRDpKxHau8Th3V5jDF/WVfXac="; + name = "torch-2.4.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-mYatNVXd//Vekl2CmPiytJEGp9xg+BGiB2pEX+RFjis="; }; x86_64-linux-310 = { - name = "torch-2.4.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-KL+6CE3KUqBsRl160PPMNyw1/FA/PquIHMF6X9gpFOc="; + name = "torch-2.4.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-ml8LEDz+hAs1aEFqpQZ/bnuf7GfZxWWf1DsSB0UP6XU="; }; x86_64-linux-311 = { - name = "torch-2.4.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-qf/zLTZeDHS2kJSAVIsuKRMUogStsptrtvLG0z+L4mw="; + name = "torch-2.4.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-kU0Sjlq8u+ecobnrUxGxhURPGy1xF99VX+QYSH7PuJQ="; }; x86_64-linux-312 = { - name = "torch-2.4.0-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-SaxVpkl93W0M3VG16ifY6+IMknMHeFXpyW6w3CifB8M="; + name = "torch-2.4.1-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-q0kWELFVUeCNp0urKdCTPmvxC6tE+31LEyjx6EXAWlM="; }; aarch64-darwin-38 = { - name = "torch-2.4.0-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-OvTeKmGPsGXnhATEuieoGKe3lX6u/yjGxmzn+1BLaLg="; + name = "torch-2.4.1-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-X8HU1+0mXvhTV5yvJyaG0e2Hzr3NBPKkmPgA/8U9q3E="; }; aarch64-darwin-39 = { - name = "torch-2.4.0-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-iUD8i5ekxh/bXUajaPIfSjpWKheHnpMutRpexiMQyzE="; + name = "torch-2.4.1-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-o43igD7mBQMJqsAyZ2U2w9O2qYBCSFN+OOCY0OFIF+w="; }; aarch64-darwin-310 = { - name = "torch-2.4.0-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-aFQYq5NzDvvucVKIIf9UAFWWlw3Ul78DyJIE+34/cd4="; + name = "torch-2.4.1-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-02qO8QD1v/Ppw86pNLng1+onfLghDHFS00qabFgw6t0="; }; aarch64-darwin-311 = { - name = "torch-2.4.0-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-8Wm06m3JOzozMZYR/MR9wUBuTdU5hE3L0t7EwbluFm0="; + name = "torch-2.4.1-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-3d29iwZudDk0pCALPVQmekbbAhBodtIc8x99p6lvmOo="; }; aarch64-darwin-312 = { - name = "torch-2.4.0-cp312-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp312-none-macosx_11_0_arm64.whl"; - hash = "sha256-karwC/4f+kTcW1KAnZqVEp/KECEuyjrCZCDrEXJ8Yog="; + name = "torch-2.4.1-cp312-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp312-none-macosx_11_0_arm64.whl"; + hash = "sha256-crSE1bbOwac1vz+locSIPQF0hpjF6c/b60/6t8eYfg0="; }; aarch64-linux-38 = { - name = "torch-2.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-nrqD+Kj5hUL5F+OQAMkD8VRlWs9jdcBzz81DBqFU64A="; + name = "torch-2.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-Vq0qdgt6eIJyWh7r9WV6u7O1FE6ya8tHtSBZNXRjxUg="; }; aarch64-linux-39 = { - name = "torch-2.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-J4akfI2N7BdvxnnSqrmm9UnCVFJRC0llCrE0E1JmujM="; + name = "torch-2.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-FJUTLzD3Iq8aCRlQCIuuo4P+OZA9sGsg5pNv2ZQCgD4="; }; aarch64-linux-310 = { - name = "torch-2.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-fBWeidTs8IQD+dE3PVVEIiQLmxFGoKGRKQadw1enKys="; + name = "torch-2.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-+iewSNMhmM2m6c/wv3aOhoPZh0OQO35dKx9QmN7R00M="; }; aarch64-linux-311 = { - name = "torch-2.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-OBacsPHmcnw9rI2si5pI0HKkn2Q7kIqZFV7x2Bthves="; + name = "torch-2.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-ML4oRNDJORYaEQc7+69kXxx8tD9i9GzG5N8cEZ+yp5g="; }; aarch64-linux-312 = { - name = "torch-2.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-7IY1E1C716vqNDb6b0Iws7C793oibkS6RhhA4gT8zXE="; + name = "torch-2.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-NhCUMrEL1xY8mzDOiW88LMobhrl2X5VqFZTw/0MJHio="; }; }; } diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index bd6b1b2628379..7b5b8e9f6726c 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -53,7 +53,7 @@ click, typing-extensions, # ROCm build and `torch.compile` requires `triton` - tritonSupport ? (!stdenv.isDarwin), + tritonSupport ? (!stdenv.hostPlatform.isDarwin), triton, # Unit tests @@ -62,7 +62,7 @@ # Disable MKLDNN on aarch64-darwin, it negatively impacts performance, # this is also what official pytorch build does - mklDnnSupport ? !(stdenv.isDarwin && stdenv.isAarch64), + mklDnnSupport ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64), # virtual pkg that consistently instantiates blas across nixpkgs # See https://github.com/NixOS/nixpkgs/pull/83888 @@ -193,7 +193,7 @@ let brokenConditions = attrsets.filterAttrs (_: cond: cond) { "CUDA and ROCm are mutually exclusive" = cudaSupport && rocmSupport; - "CUDA is not targeting Linux" = cudaSupport && !stdenv.isLinux; + "CUDA is not targeting Linux" = cudaSupport && !stdenv.hostPlatform.isLinux; "Unsupported CUDA version" = cudaSupport && !(builtins.elem cudaPackages.cudaMajorVersion [ @@ -214,7 +214,7 @@ in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.4.0"; + version = "2.4.1"; pyproject = true; disabled = pythonOlder "3.8.0"; @@ -232,7 +232,7 @@ buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-s49rtarGNNFpnNG+kfJtZLE8ND53Ma201I0cOjeFSts="; + hash = "sha256-x/zM/57syr46CP1TfGaefSjzvNm4jJbWFZGVGyzPMg8="; }; patches = @@ -242,7 +242,7 @@ buildPythonPackage rec { ./passthrough-python-lib-rel-path.patch ] ++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) # that is available starting with macOS 10.13. However, our current @@ -250,7 +250,7 @@ buildPythonPackage rec { # pthread support. ./pthreadpool-disable-gcd.diff ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # Propagate CUPTI to Kineto by overriding the search path with environment variables. # https://github.com/pytorch/pytorch/pull/108847 ./pytorch-pr-108847.patch @@ -296,7 +296,8 @@ buildPythonPackage rec { # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. + - lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") + lib.optionalString + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") '' substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace-fail '#if (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) inline void *aligned_alloc(size_t align, size_t size)' '#if 0 @@ -492,8 +493,8 @@ buildPythonPackage rec { ) ++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ] ++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ] - ++ lib.optionals stdenv.isLinux [ numactl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreServices libobjc @@ -600,7 +601,7 @@ buildPythonPackage rec { mkdir -p "$cxxdev/nix-support" printWords "''${propagatedCxxBuildInputs[@]}" >> "$cxxdev/nix-support/propagated-build-inputs" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $(ls $lib/lib/*.dylib); do install_name_tool -id $lib/lib/$(basename $f) $f || true done @@ -620,7 +621,7 @@ buildPythonPackage rec { # This is a quick hack to add `libnvrtc` to the runpath so that torch can find # it when it is needed at runtime. extraRunpaths = lib.optionals cudaSupport [ "${lib.getLib cudaPackages.cuda_nvrtc}/lib" ]; - postPhases = lib.optionals stdenv.isLinux [ "postPatchelfPhase" ]; + postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "postPatchelfPhase" ]; postPatchelfPhase = '' while IFS= read -r -d $'\0' elf ; do for extra in $extraRunpaths ; do diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 31b119a264063..d9aa2b6de388c 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -1,22 +1,28 @@ { lib, stdenv, - addDriverRunpath, - autoPatchelfHook, buildPythonPackage, - cudaPackages, + python, fetchurl, + pythonOlder, + pythonAtLeast, + + # buildInputs + cudaPackages, ffmpeg_6, sox, - pythonAtLeast, - pythonOlder, - python, + + # nativeBuildInputs + addDriverRunpath, + autoPatchelfHook, + + # dependencies torch-bin, }: buildPythonPackage rec { pname = "torchaudio"; - version = "2.4.0"; + version = "2.4.1"; format = "wheel"; src = @@ -35,7 +41,7 @@ buildPythonPackage rec { ffmpeg_6.dev sox ] - ++ lib.optionals stdenv.isLinux ( + ++ lib.optionals stdenv.hostPlatform.isLinux ( with cudaPackages; [ # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libcudart.so.11.0 but torch/lib only ships @@ -48,14 +54,14 @@ buildPythonPackage rec { ] ); - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook addDriverRunpath ]; dependencies = [ torch-bin ]; - preInstall = lib.optionals stdenv.isLinux '' + preInstall = lib.optionals stdenv.hostPlatform.isLinux '' addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch" ''; diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 53004bc2c0b97..ea62ccc724f5b 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.4.0" = { + "2.4.1" = { x86_64-linux-38 = { - name = "torchaudio-2.4.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-HbbFZ4nETaygQRxSMYg6d3Omqxbx6uSrXrUzRt71RTw="; + name = "torchaudio-2.4.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-/PvxFpkpX2WwRYHNBDcv4CojmAbrfSXaJ0bzXeD10tk="; }; x86_64-linux-39 = { - name = "torchaudio-2.4.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-5wG1xXOR9ApLTdWQtt8eGt+83GwT6zfEW+Kay4pz5vQ="; + name = "torchaudio-2.4.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-cbuwbBAYeZ2zoLzAlN0IuAvCi7e18nq4sOLziwFLEcY="; }; x86_64-linux-310 = { - name = "torchaudio-2.4.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-R+F2Pr3UEID6Otlv9OTyKHgxz6jd51IzrRMpxhOr2lA="; + name = "torchaudio-2.4.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-2oyHyAocE3akjcM+7zCwO73x3yWgW9KxxiC4gRx7Gb4="; }; x86_64-linux-311 = { - name = "torchaudio-2.4.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-KcjEOkm0MDZnvyDNhcP26borSg+0tqrsLgKzstbMbOo="; + name = "torchaudio-2.4.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-AbBO25E1p9YPoBAPwB/7QKCFgBD1ma5kGPQOCeiOaBs="; }; x86_64-linux-312 = { - name = "torchaudio-2.4.0-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-gTwbojelvYBZo0BOav9xtc09SXmtCV3PreFZJoCFUDE="; + name = "torchaudio-2.4.1-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-a3TXBquoHbX4OMpBTwPT9lmOqIC3IQYGXbycXTwGP+E="; }; aarch64-darwin-38 = { - name = "torchaudio-2.4.0-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-/D+OzW8Lv8ZU07xSdWp8o1nx2ItPoCkOHNt2OjExt7k="; + name = "torchaudio-2.4.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-TqD9ABQv55XHW8wgowOYG1byMnx/fTIbQqj+8deKr6k="; }; aarch64-darwin-39 = { - name = "torchaudio-2.4.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-H9ZwyAjjIsEBlXoHZR4pk1+G7DiSQ8DEOiTt16GFSEE="; + name = "torchaudio-2.4.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-OtzlUIUJArmqbNI3jM1yCsnsjPMeLrqXQ8zIT/y+dtY="; }; aarch64-darwin-310 = { - name = "torchaudio-2.4.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-cz6dhZuI2r7+rwCOOrK4x4hbKUZgaLS3mkJ2a+RhnkY="; + name = "torchaudio-2.4.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-ZhkJdRkJNAsk9jdBDf7AKoiIZ4FsPbGe1PQQKuEFJEo="; }; aarch64-darwin-311 = { - name = "torchaudio-2.4.0-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-rLz5Ep/8/OgIJU4sv/EDNjxQXOBu1MQjGz9DahBnnU0="; + name = "torchaudio-2.4.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-YK8VMYFdImWeVBLqQBvtVSoWw4mTjElmTkRuTP1d3AY="; }; aarch64-darwin-312 = { - name = "torchaudio-2.4.0-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-rhOpXvb6vK2w7/NthfUEjXBHSi6XBPqchumQPLzsDUo="; + name = "torchaudio-2.4.1-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-lTlGz2EP/Ve7P90ijv+iES+lHF3+NqlmEe/8kHSj074="; }; aarch64-linux-38 = { - name = "torchaudio-2.4.0-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-1/6efy/oJQ/eB7IDVsRNdw1fqjyid6vc2jr31IQEj7o="; + name = "torchaudio-2.4.1-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-dNGc+co9rTlK/Ku35vftmrn1nyVA1QKCbH7D4zmFJR0="; }; aarch64-linux-39 = { - name = "torchaudio-2.4.0-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-yECJTeEqbdPqV8uw0AhhI6qkgAG6Otme9xT+AJ6ujrk="; + name = "torchaudio-2.4.1-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-NsfnvGs1jL9Ct2nIAgZ4D6FJfRQamFxrPndo3kRSTpo="; }; aarch64-linux-310 = { - name = "torchaudio-2.4.0-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-F8tz1DNncdRVzY3ai0iRMHpTRriQpOax1Lc9VlJY/uE="; + name = "torchaudio-2.4.1-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-VEMRedmpzPP+6umKrOB9ifrp/XKOK8hlbvvXDn7cxvg="; }; aarch64-linux-311 = { - name = "torchaudio-2.4.0-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-vpacCUZts14Nebiwnf9myu27lWm0LJA6LV4Nsq92Djw="; + name = "torchaudio-2.4.1-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-dkCq/7IFbhLykGGHsDoiIooJCMh9ApX930sLkjNKKQs="; }; aarch64-linux-312 = { - name = "torchaudio-2.4.0-cp312-cp312-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp312-cp312-linux_aarch64.whl"; - hash = "sha256-U00ZB7slLs0rqeHWHP9yIP1mCQ5j33s8EJzqd6GdTLg="; + name = "torchaudio-2.4.1-cp312-cp312-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.1-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-W2L8exbtcIsMB9Q5MTd5fpL2P8O9VwVgfZe6app88/A="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index f736036b1350e..760ea740b9f82 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -1,12 +1,16 @@ { lib, + symlinkJoin, buildPythonPackage, fetchFromGitHub, + + # nativeBuildInputs cmake, - symlinkJoin, - ffmpeg-full, pkg-config, ninja, + + # buildInputs + ffmpeg-full, pybind11, sox, torch, @@ -72,14 +76,14 @@ let in buildPythonPackage rec { pname = "torchaudio"; - version = "2.4.0"; + version = "2.4.1"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; rev = "refs/tags/v${version}"; - hash = "sha256-ltBPoFDA7GS9XRHyWeTRn1YTVqdaE/38KnkG4fp7Th8="; + hash = "sha256-zQqIIzOW9vboP5XQSOUWB0edz6XJvz06RqbcYPO9K24="; }; patches = [ ./0001-setup.py-propagate-cmakeFlags.patch ]; diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index c0aae74f178f6..3fbfe404febc3 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { # tries to download models: "test_load_all" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "test_queue_multiprocessing" ]; diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index a98c7178fe715..cf08a09e552ad 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # dependencies @@ -29,19 +28,17 @@ let pname = "torchmetrics"; - version = "1.4.1"; + version = "1.4.2"; in buildPythonPackage { inherit pname version; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Lightning-AI"; repo = "torchmetrics"; rev = "refs/tags/v${version}"; - hash = "sha256-NOxj1vVY9ynCS/Pf6V+ONNx50jjKqfkhzYbc60Sf4Qw="; + hash = "sha256-YieIz99QFnuW3hTtNFgxhkNnSXGsTG2qqYhRCyvZo7Q="; }; dependencies = [ diff --git a/pkgs/development/python-modules/torchsnapshot/default.nix b/pkgs/development/python-modules/torchsnapshot/default.nix index dc1e66156a7ec..c28ce3f55e717 100644 --- a/pkgs/development/python-modules/torchsnapshot/default.nix +++ b/pkgs/development/python-modules/torchsnapshot/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { # https://github.com/pytorch/torchsnapshot/issues/175 pythonAtLeast "3.12" # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package - || stdenv.isDarwin; + || stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index 27dd914d77007..ea03954c14d7a 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -1,15 +1,21 @@ { lib, stdenv, - addDriverRunpath, - autoPatchelfHook, + python, buildPythonPackage, - cudaPackages, fetchurl, - pythonAtLeast, pythonOlder, + pythonAtLeast, + + # buildInputs + cudaPackages, + + # nativeBuildInputs + addDriverRunpath, + autoPatchelfHook, + + # dependencies pillow, - python, torch-bin, }: @@ -17,7 +23,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.19.0"; + version = "0.19.1"; in buildPythonPackage { inherit version; @@ -33,15 +39,15 @@ buildPythonPackage { # Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support. buildInputs = with cudaPackages; - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ # $out/${sitePackages}/torchvision/_C.so wants libcudart.so.11.0 but torchvision.libs only ships # libcudart.$hash.so.11.0 cuda_cudart ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ - autoPatchelfHook + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ addDriverRunpath + autoPatchelfHook ]; dependencies = [ @@ -54,7 +60,7 @@ buildPythonPackage { pythonImportsCheck = [ "torchvision" ]; - preInstall = lib.optionalString stdenv.isLinux '' + preInstall = lib.optionalString stdenv.hostPlatform.isLinux '' addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch" ''; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 177a3ae30a991..43ab9f1790ba6 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "0.19.0" = { + "0.19.1" = { x86_64-linux-38 = { - name = "torchvision-0.19.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-5GynSUL5Of12jXr29wqhfAciLKj6abBXtAi05u29bys="; + name = "torchvision-0.19.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-MFL5ci3Dn9fwJrRKb73vk6so95UgBwEs6E0xPWeWQBE="; }; x86_64-linux-39 = { - name = "torchvision-0.19.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-R2KGR72zWQyauWXvtwhTMA1eHGh1lRHumUpvH5fywSM="; + name = "torchvision-0.19.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-FFMN7gzEx8BgJPC9zJV/d94NK5DptyIZ3NYh+ilSXQA="; }; x86_64-linux-310 = { - name = "torchvision-0.19.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-XuEDx+tH+LCIN+DkixePfsyR12nSthJAuQy1qi0Gznc="; + name = "torchvision-0.19.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-uMxL84G3VSKZW2AeB6G0M7X9kl3D40p/ps0i9EnWU3k="; }; x86_64-linux-311 = { - name = "torchvision-0.19.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-NpTVJ7SPribGrEpDWWC4tXk9YcXxQgtr77lLM8mm/Ng="; + name = "torchvision-0.19.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-U2QXNAaUspzFTDCFB9CYsAy9zB/oaAcqNLVTvtc9nTA="; }; x86_64-linux-312 = { - name = "torchvision-0.19.0-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-9M7FuSc1N6VG5V6eCI++01kM+2kn+IFX1K/s7iPBJek="; + name = "torchvision-0.19.1-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-+wzQYi40nfhK1zutjrvqaxx08DPa3YTZqAz0opGSfq4="; }; aarch64-darwin-38 = { - name = "torchvision-0.19.0-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-hU6WehapQJ6UG1u+WqNXsj9xWLzLneNa4g/UlF8F7NE="; + name = "torchvision-0.19.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-TE5PWyTqawh7Au1JKrHiG7ozUsRXfi3vFCSM/GBzIzg="; }; aarch64-darwin-39 = { - name = "torchvision-0.19.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-3RJ5Vx1LaNWlPZt6Na7fkcTLHgsICZ9qHv+nsluMlec="; + name = "torchvision-0.19.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-cx9DTZFYZ2niVbXXDtGkRX4KE5SpX0qs8OHn4h+AwJg="; }; aarch64-darwin-310 = { - name = "torchvision-0.19.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-7IdO+F3LJMaeYA9uJ2r4ksgM3j/9rrcnXv2kYyQrwqg="; + name = "torchvision-0.19.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-VOhRMJnm9YY1bHD4CdNPORr3GtGC/gccwyiiivLEBgg="; }; aarch64-darwin-311 = { - name = "torchvision-0.19.0-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-2/OqcaOJkkT8iEMD7TxGBKFggk/vrHfoIxelRj78HZs="; + name = "torchvision-0.19.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-QFFCgrSJbWJ2W44m1wkcMuF8NYF9AOxL4jYuo7o9F4c="; }; aarch64-darwin-312 = { - name = "torchvision-0.19.0-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-wJ747RhPqHf2JRtiAibnT2grjx1rNBRWQo1JVbjZxnA="; + name = "torchvision-0.19.1-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-J+zid/8PbNx/7QYnJ5xjLcsuWBh9p3HsoksPvPP4WQ0="; }; aarch64-linux-38 = { - name = "torchvision-0.19.0-cp38-cp38-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-B5ppbgsstS5L4wr6jps9fSgPAqK1/+3X6CH6Hv0aWo0="; + name = "torchvision-0.19.1-cp38-cp38-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-TRC8kIPE1frdft17cpcAp75I2rT2InjfO8c/pI5IoVU="; }; aarch64-linux-39 = { - name = "torchvision-0.19.0-cp39-cp39-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-X5pZjc+CvfyORDbOdHY7OHfavsOzP5RhO5Tt4T4+Te4="; + name = "torchvision-0.19.1-cp39-cp39-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-4ygwm4ZwouiJsv52ocJ0SgmcEcmE2pqCI1e9nevWmaU="; }; aarch64-linux-310 = { - name = "torchvision-0.19.0-cp310-cp310-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-1GfUNABf0Foieiunr0xZG7Z+bUqXu9Bu2o2oP0Pp/Qc="; + name = "torchvision-0.19.1-cp310-cp310-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-ewYxFhZL5S/G3rR2Lef4yQv6OmX41crxf44tWq3HWgQ="; }; aarch64-linux-311 = { - name = "torchvision-0.19.0-cp311-cp311-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-Tmqk+j8Lw1mfoHHBSeZRo+a91nyRYXlEePn5FHHEBqI="; + name = "torchvision-0.19.1-cp311-cp311-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-1xpqb+OlKByjSH1MVq1KrSD/cPgvHXx5vLbnsMKvAMg="; }; aarch64-linux-312 = { - name = "torchvision-0.19.0-cp312-cp312-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp312-cp312-linux_aarch64.whl"; - hash = "sha256-vg8noouOnyrpijGvNKS90qW/FU2SvXOleXyNIVb7OrY="; + name = "torchvision-0.19.1-cp312-cp312-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.1-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-wHv0PCoUXXkuzZ0FA9bHNXcUfs5QjUVgDYqsd+TN/Pk="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index b25fdc2c42816..e00846c824a9f 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -1,16 +1,24 @@ { + lib, + torch, buildPythonPackage, fetchFromGitHub, - lib, - libjpeg_turbo, + + # nativeBuildInputs libpng, ninja, + which, + + # buildInputs + libjpeg_turbo, + + # dependencies numpy, pillow, - pytest, scipy, - torch, - which, + + # tests + pytest, }: let @@ -18,7 +26,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.19.0"; + version = "0.19.1"; in buildPythonPackage { inherit pname version; @@ -27,7 +35,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-OVwdEqKEoZR1jtcg4ODyvIZvP9UQPodPv8qnTqbA/pc="; + hash = "sha256-UMBFR/Vw13A+bBfr0p3rRwpCRVMq+ihdlG3C/iuOC30="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 60cf57c14f294..7edc33b88e5b5 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-Dt1F7mCuRrzEk3NDVfxScSLrK0omHQFMWhYrrwc+Pq0="; + hash = "sha256-REzjeZs2Ddhw2TLD4Vp75XT2iLaxxzDK/F3UmrC1deo="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index a12ffea156bd0..91945de8dc89a 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # specifically needed for darwin export HOME=$(mktemp -d) mkdir -p $HOME/.matplotlib @@ -55,6 +55,6 @@ buildPythonPackage rec { changelog = "https://github.com/soft-matter/trackpy/releases/tag/v${version}"; license = licenses.bsd3; maintainers = [ ]; - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/python-modules/trafilatura/default.nix b/pkgs/development/python-modules/trafilatura/default.nix index 984d95c00cb12..06d380df90fdb 100644 --- a/pkgs/development/python-modules/trafilatura/default.nix +++ b/pkgs/development/python-modules/trafilatura/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "trafilatura"; - version = "1.12.0"; + version = "1.12.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-F9IHTs/ixWK/CGPefoOfrRTMZtX5gJB0HqqRjqv7+dU="; + hash = "sha256-iYkdtkbdhNmPs0ovrte6hMIuVJAAe1h9BZkDbTUWR2A="; }; # Patch out gui cli because it is not supported in this packaging and @@ -55,13 +55,14 @@ buildPythonPackage rec { "test_cli_pipeline" "test_crawl_page" "test_download" + "test_feeds_helpers" "test_fetch" + "test_is_live_page" "test_meta_redirections" "test_probing" "test_queue" "test_redirection" "test_whole" - "test_is_live_page" ]; pythonImportsCheck = [ "trafilatura" ]; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 066732b8b9201..91253909d565e 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -58,14 +58,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.44.2"; + version = "4.45.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-2nMt1orhQCTkHG0HKwqVyB7mQeJh7O6I3Eftv2bnnIc="; + hash = "sha256-5fGEnw4YllQdZV/0vDGXYsCyTw0rtPRD/V7UWoBBZjQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index 74ce55dd4b133..545e5667da8c5 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { "test_diagram" "test_ordered_with_graph" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Upstream issue https://github.com/pygraphviz/pygraphviz/issues/441 "test_binary_stream" ]; diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix index 0db2168149a63..89bc4a2fde543 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "translate_toolkit"; inherit version; - sha256 = "sha256-95zIAelFSNK5+f1GY8DUgHPDQBS5K+9ULjXaSaa0wWM="; + hash = "sha256-95zIAelFSNK5+f1GY8DUgHPDQBS5K+9ULjXaSaa0wWM="; }; dependencies = [ diff --git a/pkgs/development/python-modules/translation-finder/default.nix b/pkgs/development/python-modules/translation-finder/default.nix index c31c764136467..1341054331d88 100644 --- a/pkgs/development/python-modules/translation-finder/default.nix +++ b/pkgs/development/python-modules/translation-finder/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, charset-normalizer, ruamel-yaml, weblate-language-data, @@ -12,14 +13,17 @@ buildPythonPackage rec { pname = "translation-finder"; version = "2.16"; + pyproject = true; + src = fetchPypi { - pname = "translation-finder"; - inherit version; + inherit pname version; hash = "sha256-a1C+j4Zo0DJ9BWDn5Zsu4zAftcUixfPktAWdqiFJpiU="; }; patches = [ ./fix_tests.patch ]; + build-system = [ setuptools ]; + dependencies = [ charset-normalizer ruamel-yaml @@ -33,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Translation file finder for Weblate"; homepage = "https://github.com/WeblateOrg/translation-finder"; + changelog = "https://github.com/WeblateOrg/translation-finder/blob/${version}/CHANGES.rst"; license = licenses.gpl3Only; maintainers = with maintainers; [ erictapen ]; }; diff --git a/pkgs/development/python-modules/tree-sitter-html/default.nix b/pkgs/development/python-modules/tree-sitter-html/default.nix index 361f53b29bb6e..4c5060294231c 100644 --- a/pkgs/development/python-modules/tree-sitter-html/default.nix +++ b/pkgs/development/python-modules/tree-sitter-html/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-javascript/default.nix b/pkgs/development/python-modules/tree-sitter-javascript/default.nix index f6a8782f14061..39766ce588f79 100644 --- a/pkgs/development/python-modules/tree-sitter-javascript/default.nix +++ b/pkgs/development/python-modules/tree-sitter-javascript/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-json/default.nix b/pkgs/development/python-modules/tree-sitter-json/default.nix index 45557bd5e2eaf..0e6cd37f8b87a 100644 --- a/pkgs/development/python-modules/tree-sitter-json/default.nix +++ b/pkgs/development/python-modules/tree-sitter-json/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-python/default.nix b/pkgs/development/python-modules/tree-sitter-python/default.nix index 399fcb0afc188..4ca4ec1d7b81c 100644 --- a/pkgs/development/python-modules/tree-sitter-python/default.nix +++ b/pkgs/development/python-modules/tree-sitter-python/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-rust/default.nix b/pkgs/development/python-modules/tree-sitter-rust/default.nix index c532127dcd145..526d1907a0a65 100644 --- a/pkgs/development/python-modules/tree-sitter-rust/default.nix +++ b/pkgs/development/python-modules/tree-sitter-rust/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/treescope/default.nix b/pkgs/development/python-modules/treescope/default.nix new file mode 100644 index 0000000000000..c27e95cdff388 --- /dev/null +++ b/pkgs/development/python-modules/treescope/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + flit-core, + + # dependencies + numpy, + + # optional-dependencies + ipython, + jax, + palettable, + + # tests + absl-py, + jaxlib, + pytestCheckHook, + torch, +}: + +buildPythonPackage rec { + pname = "treescope"; + version = "0.1.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "google-deepmind"; + repo = "treescope"; + rev = "refs/tags/v${version}"; + hash = "sha256-+Hm60O9tEXIiE0av1O0BsOdMln4e1s7ijb3WNiQ74jE="; + }; + + build-system = [ flit-core ]; + + dependencies = [ numpy ]; + + optional-dependencies = { + notebook = [ + ipython + jax + palettable + ]; + }; + + pythonImportsCheck = [ "treescope" ]; + + nativeCheckInputs = [ + absl-py + jax + jaxlib + pytestCheckHook + torch + ]; + + meta = { + description = "An interactive HTML pretty-printer for machine learning research in IPython notebooks"; + homepage = "https://github.com/google-deepmind/treescope"; + changelog = "https://github.com/google-deepmind/treescope/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 1d2a9b15374c7..aa313179af97f 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "treq"; - version = "23.11.0"; + version = "24.9.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-CRT/kp/RYyzhZ5cjUmD4vBnSD/fEWcHeq9ZbjGjL6sU="; + hash = "sha256-Fdp/xATz5O1Z0Kvl+O70lm+rvmGAOaKiO8fBUwXO/qg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 302c5d975676e..62c94ce4bd7c7 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { mnemonic requests typing-extensions - ] ++ lib.optionals stdenv.isLinux [ trezor-udev-rules ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index f0788b6e146e6..272a5d535a31b 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.4.7"; + version = "4.4.9"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5mGccMmQBtQfF1vV4bosjD39sAwrQdZQWZF5QuL2lxo="; + hash = "sha256-6fVMtO9w+dtJRGytOEW3qAQ/x9YtkZKyQXQfP7DYE6w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix index a75171f6957f9..b76dba2b7692e 100644 --- a/pkgs/development/python-modules/trino-python-client/default.nix +++ b/pkgs/development/python-modules/trino-python-client/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { kerberos = [ requests-kerberos ]; sqlalchemy = [ sqlalchemy ]; external-authentication-token-cache = [ keyring ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ httpretty pytestCheckHook - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; pythonImportsCheck = [ "trino" ]; diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix index 39a9ee4baa4f3..2804bcaa76e59 100644 --- a/pkgs/development/python-modules/trio-websocket/default.nix +++ b/pkgs/development/python-modules/trio-websocket/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "test_client_connect_networking_error" "test_finalization_dropped_exception" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Failed: DID NOT RAISE <class 'ValueError'> "test_finalization_dropped_exception" # Timing related diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index b4e37ee448f6a..968d67b27adb1 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; # tests are failing on Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ astor diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index 42326544c3405..fee2015a8ab06 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.8.0"; + version = "4.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JmoPXYEqaFxDIW8NmmZ8VpKX9gfZ1rVFu+dPZOL7C5k="; + hash = "sha256-Mz6n7QjNvK2HEQeWCySdxioA1dD5CLUh7jCQb1Q6mdc="; }; propagatedBuildInputs = [ cfn-flip ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { unittestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { policy = [ awacs ]; }; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 8a2bdcfd5d8aa..b12ef6e9061ea 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { homepage = "http://www.tryton.org/"; changelog = "https://foss.heptapod.net/tryton/tryton/-/blob/trytond-${version}/trytond/CHANGELOG?ref_type=tags"; license = licenses.gpl3Plus; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ udono johbo diff --git a/pkgs/development/python-modules/ts1-signatures/default.nix b/pkgs/development/python-modules/ts1-signatures/default.nix new file mode 100644 index 0000000000000..a0d94e3b3ab34 --- /dev/null +++ b/pkgs/development/python-modules/ts1-signatures/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + dpkt, + pyyaml, + pythonOlder, + pytestCheckHook, +}: +buildPythonPackage { + pname = "ts1-signatures"; + version = "0-unstable-2024-08-10"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "yifeikong"; + repo = "th1"; + rev = "efa682bd37c668ae00d2225deb753e01f6cd1406"; + hash = "sha256-fz5EFPO5UPPbFnqe4wE1y2lIROPByse9awyBa49o8ZE="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + dpkt + pyyaml + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_nghttpd_log_parsing" # Attempts to load things from logs/ which it cannot find for some reason. + ]; + + meta = { + description = "TLS and HTTP signature and fingerprint library"; + homepage = "https://github.com/yifeikong/th1"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ggg ]; + }; +} diff --git a/pkgs/development/python-modules/ttfautohint-py/default.nix b/pkgs/development/python-modules/ttfautohint-py/default.nix index 60ded9cc82ddf..98358555eed62 100644 --- a/pkgs/development/python-modules/ttfautohint-py/default.nix +++ b/pkgs/development/python-modules/ttfautohint-py/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ttfautohint" ]; meta = { - description = "Command line utility and Python library that merges two UFO source format fonts into a single file"; + description = "Python wrapper for ttfautohint, a free auto-hinter for TrueType fonts"; homepage = "https://github.com/fonttools/ttfautohint-py"; changelog = "https://github.com/fonttools/ttfautohint-py/releases/tag/v${version}"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix index 43a223bdfd5ee..abed46cc766ec 100644 --- a/pkgs/development/python-modules/turnt/default.nix +++ b/pkgs/development/python-modules/turnt/default.nix @@ -2,24 +2,24 @@ lib, buildPythonPackage, fetchPypi, - flit, + flit-core, click, tomli, }: buildPythonPackage rec { pname = "turnt"; - version = "1.11.0"; - format = "pyproject"; + version = "1.12.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-XN+qzRgZMSdeBmW0OM36mQ79sRCuP8E++SqH8FOoEq0="; + hash = "sha256-4K7cqGwKErGbZ+dxVa06v8aIfrpVLC293d29QT+vsBw="; }; - nativeBuildInputs = [ flit ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ click tomli ]; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 7e14cc581a63e..6340a655cfe31 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.2.4"; + version = "9.3.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-5HHHSAvyUxR5myKucWpjkF7NQv/b1pViij606TZGzTY="; + hash = "sha256-Yb5eeg8m21gjx9ZS7Z/N46p7LGfIBCdrmGoHpD+B+as="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index ffeee44aa8c79..cc72a5e86697f 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -138,7 +138,7 @@ buildPythonPackage rec { substituteInPlace src/twisted/test/test_failure.py \ --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None" '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' echo 'PTYProcessTestsBuilder_EPollReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py echo 'PTYProcessTestsBuilder_PollReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py echo 'UNIXTestsBuilder_EPollReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py @@ -149,7 +149,7 @@ buildPythonPackage rec { substituteInPlace src/twisted/python/_inotify.py --replace \ "ctypes.util.find_library(\"c\")" "'${stdenv.cc.libc}/lib/libc.so.6'" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' echo 'ProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py echo 'ProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py echo 'ProcessTestsBuilder_AsyncioSelectorReactorTests.test_processEnded.skip = "exit code 120"' >> src/twisted/internet/test/test_process.py @@ -171,11 +171,13 @@ buildPythonPackage rec { hypothesis pyhamcrest ] - ++ passthru.optional-dependencies.conch - ++ passthru.optional-dependencies.http2 - ++ passthru.optional-dependencies.serial + ++ optional-dependencies.conch + ++ optional-dependencies.http2 + ++ optional-dependencies.serial # not supported on aarch64-darwin: https://github.com/pyca/pyopenssl/issues/873 - ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) passthru.optional-dependencies.tls; + ++ lib.optionals ( + !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + ) optional-dependencies.tls; checkPhase = '' export SOURCE_DATE_EPOCH=315532800 @@ -184,26 +186,26 @@ buildPythonPackage rec { ${python.interpreter} -m twisted.trial -j1 twisted ''; - passthru = { - optional-dependencies = { - conch = [ - appdirs - bcrypt - cryptography - pyasn1 - ]; - http2 = [ - h2 - priority - ]; - serial = [ pyserial ]; - tls = [ - idna - pyopenssl - service-identity - ]; - }; + optional-dependencies = { + conch = [ + appdirs + bcrypt + cryptography + pyasn1 + ]; + http2 = [ + h2 + priority + ]; + serial = [ pyserial ]; + tls = [ + idna + pyopenssl + service-identity + ]; + }; + passthru = { tests = { inherit cassandra-driver diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 28bb7ba4adb30..7fa9b9d0f22cb 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "4.2.1"; + version = "4.3.1"; disabled = pythonOlder "3.7"; @@ -21,12 +21,20 @@ buildPythonPackage rec { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "refs/tags/v${version}"; - hash = "sha256-DT8Q8x+OvrxnoLWwdS/Gv8x5cepJPIF1ZPyOumnwq2E="; + hash = "sha256-pXbrI4WbId6nYbDSpF9cYnQBOkbNGvzW6/opCztZ1ck="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + sed -i "/document_enum/d" twitchAPI/type.py + ''; - propagatedBuildInputs = [ + pythonRemoveDeps = [ + "enum-tools" + ]; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp python-dateutil typing-extensions diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index c9be16e2eba4c..7b08166e1d564 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -174,7 +174,7 @@ buildPythonPackage { regex ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; pythonImportsCheck = [ "txtai" ]; diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 6c6f7c86b3a0a..66329d3b09855 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,42 +4,33 @@ automat, buildPythonPackage, cryptography, - fetchpatch2, fetchPypi, geoip, - incremental, lsof, mock, pytestCheckHook, pythonOlder, + setuptools, twisted, zope-interface, }: buildPythonPackage rec { pname = "txtorcon"; - version = "23.11.0"; - format = "setuptools"; + version = "24.8.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cfha6T121yZRAFnJ7XTmCLxaXJ99EDhTtJ5BQoBAai8="; + hash = "sha256-vv4ZE42cjFMHtu5tT+RG0MIB/9HMQErrJl7ZAwmXitA="; }; - patches = [ - # https://github.com/meejah/txtorcon/pull/400 - (fetchpatch2 { - name = "twisted-24.7.0-fixes.patch"; - url = "https://github.com/meejah/txtorcon/commit/88b5dc2971514babd36d837c93550715dea44b09.patch"; - hash = "sha256-O7kFZw+y1PHJRcMdxCczy8UZd3ruLhjLMxh2tcawWI4="; - }) - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography - incremental twisted automat zope-interface @@ -52,7 +43,9 @@ buildPythonPackage rec { geoip ]; - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); + + pythonImportsCheck = [ "txtorcon" ]; meta = with lib; { description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index a39f18bad504d..4b30159221467 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { dependencies = lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ attrs cattrs @@ -57,7 +57,7 @@ buildPythonPackage rec { hypothesis pytestCheckHook typing-extensions - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ "tests" ]; diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix index 91e01efa20192..0de0eea1ca8ec 100644 --- a/pkgs/development/python-modules/typepy/default.nix +++ b/pkgs/development/python-modules/typepy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mbstrdecoder ]; - passthru.optional-dependencies = { + optional-dependencies = { datetime = [ python-dateutil pytz @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook tcolorpy - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "typepy" ]; diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 9839f6d6c55d5..74bb969473a7d 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { # fails also on Linux "test_show_completion" "test_install_completion" - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "test_install_completion" ]; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ "test_install_completion" ]; pythonImportsCheck = [ "typer" ]; diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index e29c3127290a3..230615d276d01 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -1,30 +1,55 @@ -{ lib, stdenv, aiobotocore, botocore, buildPythonPackage, fetchPypi, pythonOlder -, setuptools, typing-extensions, }: +{ + lib, + stdenv, + aiobotocore, + boto3, + botocore, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, + typing-extensions, +}: let toUnderscore = str: builtins.replaceStrings [ "-" ] [ "_" ] str; - buildTypesAiobotocorePackage = serviceName: version: hash: + buildTypesAiobotocorePackage = + serviceName: version: hash: buildPythonPackage rec { pname = "types-aiobotocore-${serviceName}"; inherit version; pyproject = true; + disabled = pythonOlder "3.7"; - oldStylePackages = [ "gamesparks" "iot-roborunner" "macie" ]; + oldStylePackages = [ + "gamesparks" + "iot-roborunner" + "macie" + ]; src = fetchPypi { - pname = if builtins.elem serviceName oldStylePackages then - "types-aiobotocore-${serviceName}" - else - "types_aiobotocore_${toUnderscore serviceName}"; + pname = + if builtins.elem serviceName oldStylePackages then + "types-aiobotocore-${serviceName}" + else + "types_aiobotocore_${toUnderscore serviceName}"; inherit version hash; }; + build-system = [ setuptools ]; - dependencies = [ aiobotocore botocore ] - ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; + + dependencies = [ + aiobotocore + boto3 + botocore + ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; + # Module has no tests doCheck = false; + pythonImportsCheck = [ "types_aiobotocore_${toUnderscore serviceName}" ]; + meta = with lib; { description = "Type annotations for aiobotocore ${serviceName}"; homepage = "https://github.com/youtype/mypy_boto3_builder"; @@ -32,1291 +57,1417 @@ let maintainers = with maintainers; [ mbalatsko ]; }; }; -in rec { +in +rec { types-aiobotocore-accessanalyzer = - buildTypesAiobotocorePackage "accessanalyzer" "2.13.1" - "sha256-Uaet2w0Re7mCVBJhbjxMv6dvBj96VfKTl5XTAG1WoaY="; + buildTypesAiobotocorePackage "accessanalyzer" "2.15.1" + "sha256-DALSwzPriQHPReCA4DxiqDE4egt1d0kVadDLqXSEV6k="; - types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.13.1" - "sha256-eOfLc045Qvn5lz36My+v1vNAvQkPzSfabaVxIBC+kok="; + types-aiobotocore-account = + buildTypesAiobotocorePackage "account" "2.15.1" + "sha256-7VNgcslaFFeprI+G9Owfj24o8CFmGxqct4QWSGgxwI8="; - types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.13.1" - "sha256-+X87aqLD7+COapS6//oMv+lLxjs6ULQptAXW7FYSgcE="; + types-aiobotocore-acm = + buildTypesAiobotocorePackage "acm" "2.15.1" + "sha256-ItdsLbXVs92zb9JDwuHHvYVKArUAAeDUdt6tPxNikV0="; - types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.13.1" - "sha256-vc/stXsbP5/HF4SpDZoxNJ11prW2Dg38s7v3sxWHOMg="; + types-aiobotocore-acm-pca = + buildTypesAiobotocorePackage "acm-pca" "2.15.1" + "sha256-JSvY8qqA91SUMXs7ajfVQ6wZFNHc2XisO2haiygJg8o="; types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.13.0" - "sha256-+w/InoQR2aZ5prieGhgEEp7auBiSSghG5zIIHY5Kyao="; + "sha256-+w/InoQR2aZ5prieGhgEEp7auBiSSghG5zIIHY5Kyao="; - types-aiobotocore-amp = buildTypesAiobotocorePackage "amp" "2.13.1" - "sha256-KybFUBaKKGfZJmJ/hdu3M7evD8yD1cwZS1AUPsy+kX4="; + types-aiobotocore-amp = + buildTypesAiobotocorePackage "amp" "2.15.1" + "sha256-RJKzIa6b/ov0xpayGBgDVW2DUjIo0xNfDDh2hAvK918="; - types-aiobotocore-amplify = buildTypesAiobotocorePackage "amplify" "2.13.1" - "sha256-a9p6mO8N+jbuifKbeshURjlVDENL1m1XzZE7pI6OPQU="; + types-aiobotocore-amplify = + buildTypesAiobotocorePackage "amplify" "2.15.1" + "sha256-TNhrmgAjuJLBLXU2dlp+Ri8pJ+swgjXu1lJFGUnLEfQ="; types-aiobotocore-amplifybackend = - buildTypesAiobotocorePackage "amplifybackend" "2.13.1" - "sha256-PysfMHgo+GsSi+fK6jyk90wNVX4ItZwg1clES+ShzAM="; + buildTypesAiobotocorePackage "amplifybackend" "2.15.1" + "sha256-T2mqIUobrEepz6vS/VLWq8OpUZTYRMme0SgWv+UtxmQ="; types-aiobotocore-amplifyuibuilder = - buildTypesAiobotocorePackage "amplifyuibuilder" "2.13.1" - "sha256-tNOZIhKR8QkDBbD9baqRHqoRCJAdRJPjkW0FVj8/k0M="; + buildTypesAiobotocorePackage "amplifyuibuilder" "2.15.1" + "sha256-oFgte9lbXb9IM3Ezn0Jmd5djrLwgJLqeDePdBb5OZrI="; types-aiobotocore-apigateway = - buildTypesAiobotocorePackage "apigateway" "2.13.1" - "sha256-SEU6Qw0LCpYKvlnjh4XZXGogmXilbLVuN/eYEt18aO0="; + buildTypesAiobotocorePackage "apigateway" "2.15.1" + "sha256-3gDSD6Z28yicogEeDv2i/rcmh7X9nRWrwxRL0YFZIpc="; types-aiobotocore-apigatewaymanagementapi = - buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.13.1" - "sha256-zUgJ0eOJkzcu0y7zcrfHwhar0wdon7antjzy0HeJuQU="; + buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.15.1" + "sha256-3NC66/pp4F8GsH40z0mBoaLqIKyPHGpgEAGgOnOOAGI="; types-aiobotocore-apigatewayv2 = - buildTypesAiobotocorePackage "apigatewayv2" "2.13.1" - "sha256-+8A7eXo01Z2EAaps1fFFiWWvNdO+DpTM8PV0n2whpvg="; + buildTypesAiobotocorePackage "apigatewayv2" "2.15.1" + "sha256-qsiFXNECUVFDrreYOi2MLa655WAECXuPqi11z8liVN4="; types-aiobotocore-appconfig = - buildTypesAiobotocorePackage "appconfig" "2.13.1" - "sha256-uhhxVP+Og+FiOoko8gjdUavhTP4o+wwrXm834wc4Lac="; + buildTypesAiobotocorePackage "appconfig" "2.15.1" + "sha256-QPhmF5urmZBb+e7KAIJihDujuDAopgQqrBspAxD6YJ4="; types-aiobotocore-appconfigdata = - buildTypesAiobotocorePackage "appconfigdata" "2.13.1" - "sha256-xCrDWBX8jR2851rMALz7itYxffvnah6yOq8S6UO4NvE="; + buildTypesAiobotocorePackage "appconfigdata" "2.15.1" + "sha256-1rQCSuTShglGMwqcxiVULSbmgzpUZmubTgqlum5EeqE="; types-aiobotocore-appfabric = - buildTypesAiobotocorePackage "appfabric" "2.13.1" - "sha256-oz8iPiF6L2aITqmDraIZ4vMJTHMEFfNF9gDMj21vggE="; + buildTypesAiobotocorePackage "appfabric" "2.15.1" + "sha256-l/dJepTAEpsV3eJWzMbw43SrqgWuL1I3IVlVQQzZPSM="; - types-aiobotocore-appflow = buildTypesAiobotocorePackage "appflow" "2.13.1" - "sha256-1rlhU3wAGvl1XSE+wkulJdyeV93en4VvnjpnaB12gi8="; + types-aiobotocore-appflow = + buildTypesAiobotocorePackage "appflow" "2.15.1" + "sha256-v30RZvCTHOMxsypX+Id5W7VEPC4QFYvRklPu9zaJ9x4="; types-aiobotocore-appintegrations = - buildTypesAiobotocorePackage "appintegrations" "2.13.1" - "sha256-DB7kuMeIW9XStOSw2h9jsQPfAiwK94m7xbdOoy6cpPw="; + buildTypesAiobotocorePackage "appintegrations" "2.15.1" + "sha256-ceiFklxI0RK06gj2ZQcvpGyW903SOxXA654MzRy3A7U="; types-aiobotocore-application-autoscaling = - buildTypesAiobotocorePackage "application-autoscaling" "2.13.1" - "sha256-aJaPxZXm4lBh4EDsiC7HauXmS+GNzhtQXPTF73mDHw8="; + buildTypesAiobotocorePackage "application-autoscaling" "2.15.1" + "sha256-P9XULdNPREbu2xksZXIIxZUEggYlU3j0Jo7RzFKMawk="; types-aiobotocore-application-insights = - buildTypesAiobotocorePackage "application-insights" "2.13.1" - "sha256-tZj8H/seTnIxtTybQhJ8u5p9Roiq0mbxuX/k6OriZOI="; + buildTypesAiobotocorePackage "application-insights" "2.15.1" + "sha256-nvNJsUkMwJd41vlj7pKEn37f1Ab4l4WAJbYGqfxCmZw="; types-aiobotocore-applicationcostprofiler = - buildTypesAiobotocorePackage "applicationcostprofiler" "2.13.1" - "sha256-QYyROZOiHB40gRKjQnRcwQWGAX44zbwPPamfdGrpvhU="; + buildTypesAiobotocorePackage "applicationcostprofiler" "2.15.1" + "sha256-/rMS/1K9dGzW89Rzd6sg9o/L56kNAO0bkDUTNKsKxxI="; - types-aiobotocore-appmesh = buildTypesAiobotocorePackage "appmesh" "2.13.1" - "sha256-o+pcPaWXhZsVadQzDWQi/8+IHY44Sk4z7ckzGO9rPtE="; + types-aiobotocore-appmesh = + buildTypesAiobotocorePackage "appmesh" "2.15.1" + "sha256-yPEPmU3CVzddnsFd2CQp+eAji1+/bH/Vvhv6D2JbjvM="; types-aiobotocore-apprunner = - buildTypesAiobotocorePackage "apprunner" "2.13.1" - "sha256-EOv5cWNlnQkmg5iJNliw/PXBGwYdriOnuUAOpvE+QiE="; + buildTypesAiobotocorePackage "apprunner" "2.15.1" + "sha256-gzzXHrMC0MF9RykwGmZiUtgufuRPrmGekVicXzdlFw8="; types-aiobotocore-appstream = - buildTypesAiobotocorePackage "appstream" "2.13.1" - "sha256-WD7ddhaEp6cs9wswWYvyABEVwvvn8dNGmjcQhRfOG7I="; + buildTypesAiobotocorePackage "appstream" "2.15.1" + "sha256-qbiOK2G95NdBTt1AmrQsDJbz885ugrdRBXMb9ZQcssE="; - types-aiobotocore-appsync = buildTypesAiobotocorePackage "appsync" "2.13.1" - "sha256-azWY8AV3qVs70WKd8/izDCbyddAZaa+AJoWKZhOcX70="; + types-aiobotocore-appsync = + buildTypesAiobotocorePackage "appsync" "2.15.1" + "sha256-WYgJ2GLOxy/Va+ZY7DwwX7pBFF4zv1iQ8rptFoOlFsA="; types-aiobotocore-arc-zonal-shift = - buildTypesAiobotocorePackage "arc-zonal-shift" "2.13.1" - "sha256-auQRpYcMG/DQXNWCu4KFKqMomo2MeQENeDFvpBC864Q="; + buildTypesAiobotocorePackage "arc-zonal-shift" "2.15.1" + "sha256-9lToTikNN5kH9TCGSeQDnm6g2iM+1OGbtSpN4f6M7FM="; - types-aiobotocore-athena = buildTypesAiobotocorePackage "athena" "2.13.1" - "sha256-7caEszKVxK7pyoyqDr0kkT7rtekljZ/+E6svg99pL1E="; + types-aiobotocore-athena = + buildTypesAiobotocorePackage "athena" "2.15.1" + "sha256-8NEZDefM/mP11YPnOCn11QfbWAMaCB5Yh2R9zQRtPpw="; types-aiobotocore-auditmanager = - buildTypesAiobotocorePackage "auditmanager" "2.13.1" - "sha256-bNfXtBabYFgNdWu6F4tmmgHBvM5xRHpruDTPVIX10WU="; + buildTypesAiobotocorePackage "auditmanager" "2.15.1" + "sha256-JU7s8pqfJQptll0Kh3KPDeFULM2cga0nYZSvhLk2ul4="; types-aiobotocore-autoscaling = - buildTypesAiobotocorePackage "autoscaling" "2.13.1" - "sha256-yOKRClE2ziH7YraQ/RDKuJosPmFbk6l2VyY/VNKzyPI="; + buildTypesAiobotocorePackage "autoscaling" "2.15.1" + "sha256-PddQSNJ9KNGL8LQDD82+IeD4cVCR7huBkSWTqbYQfUk="; types-aiobotocore-autoscaling-plans = - buildTypesAiobotocorePackage "autoscaling-plans" "2.13.1" - "sha256-Pq9A+24LbD/izfWjv2my7RZRmuEoEkpYnqKsJUTGVIc="; + buildTypesAiobotocorePackage "autoscaling-plans" "2.15.1" + "sha256-hUEFUNC1WdPpdu+9AQFWLvFhvBrmy3Xg7Xl4LlB4z6k="; - types-aiobotocore-backup = buildTypesAiobotocorePackage "backup" "2.13.1" - "sha256-fAoxWR8TV+8boe1XHt+dhSK0e+1RDc4MEy+Wn7DZcPk="; + types-aiobotocore-backup = + buildTypesAiobotocorePackage "backup" "2.15.1" + "sha256-E8LmUYpLqVF0WooWUXtqv4nhst1o050tx3/sRDBhd+w="; types-aiobotocore-backup-gateway = - buildTypesAiobotocorePackage "backup-gateway" "2.13.1" - "sha256-UU3C5zdJG3OXpevSnLnWiPIQR/0ear0IC7pBvRw6SJo="; + buildTypesAiobotocorePackage "backup-gateway" "2.15.1" + "sha256-Yx/e2UIEzn47L4mQ61S0PkHBuDbz7uqc5yIw/6XrBkI="; types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.13.0" - "sha256-YUKtBdBrdwL2yqDqOovvzDPbcv/sD8JLRnKz3Oh7iSU="; + "sha256-YUKtBdBrdwL2yqDqOovvzDPbcv/sD8JLRnKz3Oh7iSU="; - types-aiobotocore-batch = buildTypesAiobotocorePackage "batch" "2.13.1" - "sha256-7K1ifpUy/tnVyOn5cT0Bpqp01LL3mFlJQjxb5BAiR28="; + types-aiobotocore-batch = + buildTypesAiobotocorePackage "batch" "2.15.1" + "sha256-vZJddKOLsljDKP4WrUDZrc4hkk01FtN3wL8MXKpfuII="; types-aiobotocore-billingconductor = - buildTypesAiobotocorePackage "billingconductor" "2.13.1" - "sha256-jIddm3hMFtQ2/LYEpHCSnTUq/DfBco7TzFUN9VeO/lw="; + buildTypesAiobotocorePackage "billingconductor" "2.15.1" + "sha256-sbgwQEs21yd+xl2AuEiYEzc0Lgx7Uo/Ctibd2SEHY0c="; - types-aiobotocore-braket = buildTypesAiobotocorePackage "braket" "2.13.1" - "sha256-4icZ+SDl/c3Cnzikw+FDuNO14QxihzqcXTaGd89SOQ8="; + types-aiobotocore-braket = + buildTypesAiobotocorePackage "braket" "2.15.1" + "sha256-CThsP2a03VbAIFr4x2x0L2fLgIxvqFV1MuMLp1eoo6A="; - types-aiobotocore-budgets = buildTypesAiobotocorePackage "budgets" "2.13.1" - "sha256-57X0EZ8KLu3A2RYSZDEhqltgWtMEH4Hr8gXTbIAXUrY="; + types-aiobotocore-budgets = + buildTypesAiobotocorePackage "budgets" "2.15.1" + "sha256-b1M6ZdlrG/AM3h5iM/mMAW7SrwrjApF/K0kgbFpAM14="; - types-aiobotocore-ce = buildTypesAiobotocorePackage "ce" "2.13.1" - "sha256-518KyYlsHBtAimVhM6ADzQkCKZ2hMtS4sKXQZjrSZ/A="; + types-aiobotocore-ce = + buildTypesAiobotocorePackage "ce" "2.15.1" + "sha256-MV6dma7+hf1ITv3HJ4cJZyfpimMT5MBuspTCEjMix7I="; - types-aiobotocore-chime = buildTypesAiobotocorePackage "chime" "2.13.1" - "sha256-5KtJXVleXuSVrRMb9Dc/dcIuMRlx1R2dkH8uOA8kebQ="; + types-aiobotocore-chime = + buildTypesAiobotocorePackage "chime" "2.15.1" + "sha256-24ukZo0shYVOz0HlrIj0g/xsfKz48fZHlUqcuTFvSoE="; types-aiobotocore-chime-sdk-identity = - buildTypesAiobotocorePackage "chime-sdk-identity" "2.13.1" - "sha256-lGKZbWAXwEutqjkj9kV/88VqZMjDpIXeuye20E7quPY="; + buildTypesAiobotocorePackage "chime-sdk-identity" "2.15.1" + "sha256-/R22nTYf7XQBH9u8R10jHqHA4+s2iliX5+pFUyWdaG0="; types-aiobotocore-chime-sdk-media-pipelines = - buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.13.1" - "sha256-nZhgUByQ/2hmY77PPPICSiOpSg5pabOFCfxUq374wqw="; + buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.15.1" + "sha256-UGogN6rRabJuNokJPeQUol9DOMBbc/pkPL+lRg5GYk0="; types-aiobotocore-chime-sdk-meetings = - buildTypesAiobotocorePackage "chime-sdk-meetings" "2.13.1" - "sha256-KNZ79bAJQemRhR65c/Zruh8SRubdHcPfVeqwsf5y/vg="; + buildTypesAiobotocorePackage "chime-sdk-meetings" "2.15.1" + "sha256-EDQ5H7R5U9AQnLy2rkRzSSAkFVzfZiWCqlLqP24wv2g="; types-aiobotocore-chime-sdk-messaging = - buildTypesAiobotocorePackage "chime-sdk-messaging" "2.13.1" - "sha256-SYvTxDOoqoje4fp0V7CMMKns7PNaGF2uEuXTbhIPHFY="; + buildTypesAiobotocorePackage "chime-sdk-messaging" "2.15.1" + "sha256-7iJ+npfPI64WtlKYPLQUkJsJvhjSKCDbYBWWrv5dHwo="; types-aiobotocore-chime-sdk-voice = - buildTypesAiobotocorePackage "chime-sdk-voice" "2.13.1" - "sha256-CZmTJGl9IXnYnlKsnq49o7TOHjFYQXf7g7H6dQ98Clg="; + buildTypesAiobotocorePackage "chime-sdk-voice" "2.15.1" + "sha256-BCj6/x6lnNdUx/FjP8mLzv7zLukjwDQw2/tWrFSuU0A="; types-aiobotocore-cleanrooms = - buildTypesAiobotocorePackage "cleanrooms" "2.13.1" - "sha256-0sxIwTUs2usAhuJ0sghw1QUDKu87pwx1zKOUdDvPCXM="; + buildTypesAiobotocorePackage "cleanrooms" "2.15.1" + "sha256-GbRu1vn7S1bILtKKf75+bR4y7OYQ6WnlUVt0HQqr/8s="; - types-aiobotocore-cloud9 = buildTypesAiobotocorePackage "cloud9" "2.13.1" - "sha256-4JNR2drXNI2sJ1JXkk5NQgwK1CeAxrpxTHvSbdcX7Ds="; + types-aiobotocore-cloud9 = + buildTypesAiobotocorePackage "cloud9" "2.15.1" + "sha256-7r/W5Hbv4J58aqpedt3ehe3E99U74sFiMHo5YnIPvh8="; types-aiobotocore-cloudcontrol = - buildTypesAiobotocorePackage "cloudcontrol" "2.13.1" - "sha256-CHdqWRL1ZIJCQ65Dts87w6IFlU4ZpRD9GSvXah78Kow="; + buildTypesAiobotocorePackage "cloudcontrol" "2.15.1" + "sha256-TwBEzvuYmKyL5Bx2VCZwK0przb4MWhDVqOfl1RF3uog="; types-aiobotocore-clouddirectory = - buildTypesAiobotocorePackage "clouddirectory" "2.13.1" - "sha256-2oXpXFuO3jJ+lvFsjuAh3pw2lhfnuRLGtIcUep4QwJw="; + buildTypesAiobotocorePackage "clouddirectory" "2.15.1" + "sha256-ApxmZb2xwj0Leynjqi5YC4stEt0qcWQoSq3HffbvL3k="; types-aiobotocore-cloudformation = - buildTypesAiobotocorePackage "cloudformation" "2.13.1" - "sha256-M4D5z53xl8hX4q4/Co5UJIUw9JxbxTQf7hhQp/FpVA0="; + buildTypesAiobotocorePackage "cloudformation" "2.15.1" + "sha256-ngI/9VlHFOpAjcXi04JX+MVEdjs1cxC2UT+9MQTblGo="; types-aiobotocore-cloudfront = - buildTypesAiobotocorePackage "cloudfront" "2.13.1" - "sha256-GQrg1dPD0HgIe04znp1rajEd/Fmp7B/rP06lsLQ8uV0="; + buildTypesAiobotocorePackage "cloudfront" "2.15.1" + "sha256-+y931CL0UdxZd5dnkSkNBAOmyuXqSb9XdIwQUKoXDTQ="; - types-aiobotocore-cloudhsm = buildTypesAiobotocorePackage "cloudhsm" "2.13.1" - "sha256-ASmEjSNYbZ1CANSSNw2Fi7ieKVE42WNDISpqTjBOVM4="; + types-aiobotocore-cloudhsm = + buildTypesAiobotocorePackage "cloudhsm" "2.15.1" + "sha256-Mv6fm2JLK4QVL1dTlVCIM1TaehUSlXTBATHvXHO26uM="; types-aiobotocore-cloudhsmv2 = - buildTypesAiobotocorePackage "cloudhsmv2" "2.13.1" - "sha256-154gs9XMFcz2urECTUwyeZK3iafwK2OYaCKaCMjCZf8="; + buildTypesAiobotocorePackage "cloudhsmv2" "2.15.1" + "sha256-9koftVpoxrFkg/WWYoLZPEf1nnWxqwEeAzeMIJB+n8A="; types-aiobotocore-cloudsearch = - buildTypesAiobotocorePackage "cloudsearch" "2.13.1" - "sha256-QCm7i0wXtPBG5pT9V0WA9SCWjcT9bPDU2T2alCNfZEI="; + buildTypesAiobotocorePackage "cloudsearch" "2.15.1" + "sha256-1s+EM9O5Hfsa0qKK+HFrif2dH+C7+V51MkqvuKeYwyw="; types-aiobotocore-cloudsearchdomain = - buildTypesAiobotocorePackage "cloudsearchdomain" "2.13.1" - "sha256-V39w95ufoIbbDWUIPiVtdqZPTiaosV+cMBXKljbuEWY="; + buildTypesAiobotocorePackage "cloudsearchdomain" "2.15.1" + "sha256-lDC8Za+QGc622FVrsNKPCuitYzU521BC20g7ZGUZMAI="; types-aiobotocore-cloudtrail = - buildTypesAiobotocorePackage "cloudtrail" "2.13.1" - "sha256-BB7gmQoj30OZ2PqEzwzz8XwZuuJsLRJAXETzkP/nTzg="; + buildTypesAiobotocorePackage "cloudtrail" "2.15.1" + "sha256-911ynsQTCCv9kd4TgeWR5Hv8ulz/kCnYxnw9PWk41IY="; types-aiobotocore-cloudtrail-data = - buildTypesAiobotocorePackage "cloudtrail-data" "2.13.1" - "sha256-FwnZNsSIHD5pLYJepyP5Vde7nd/TFNPMCEcKLsKZv28="; + buildTypesAiobotocorePackage "cloudtrail-data" "2.15.1" + "sha256-dh/wbIJ6VTU8++QGXa/IDUCcGpdzBB4jfaizyn9jfyo="; types-aiobotocore-cloudwatch = - buildTypesAiobotocorePackage "cloudwatch" "2.13.1" - "sha256-hgn4kDF2hEasQG2JjvQ8alzWEhfHeFvfk4mTOCHLfvs="; + buildTypesAiobotocorePackage "cloudwatch" "2.15.1" + "sha256-nnyLWvv9esKWKlyZs9j+hUHTCBs55qC8PX5st0OHBxg="; types-aiobotocore-codeartifact = - buildTypesAiobotocorePackage "codeartifact" "2.13.1" - "sha256-CE4aG69icMYwW/y+IpBhN1Vtkt+yIaQuIPCiZ0lnV58="; + buildTypesAiobotocorePackage "codeartifact" "2.15.1" + "sha256-f8xrPRkEOrw1fFI/q0U//LjzDCymhPOBpqrGPas5te4="; types-aiobotocore-codebuild = - buildTypesAiobotocorePackage "codebuild" "2.13.1" - "sha256-HLKQS+IaiJsVQpgGKocHgHFews+br3qogOHw+fhGbJA="; + buildTypesAiobotocorePackage "codebuild" "2.15.1" + "sha256-9lTVbw1mtKgIiDsI7pc2Lmd7W/1OjMBZtvWTL1mNqxM="; types-aiobotocore-codecatalyst = - buildTypesAiobotocorePackage "codecatalyst" "2.13.1" - "sha256-EYP61ycy0paJ/Q6H7b67aRvEvqam3q4wAtbLlG/+2zc="; + buildTypesAiobotocorePackage "codecatalyst" "2.15.1" + "sha256-hEASqSTOFl8Pc+qBZ0Xqf36JivPVgHbZ2yZszo5Z9Uo="; types-aiobotocore-codecommit = - buildTypesAiobotocorePackage "codecommit" "2.13.1" - "sha256-yFKsTfVAe6lN9WFzHRtmCuuNElQzC1LkMnvgLFayDwM="; + buildTypesAiobotocorePackage "codecommit" "2.15.1" + "sha256-1L7UGZNkl89ULZV5LiajDZxQmLpelTsjNSvUzUzwk+I="; types-aiobotocore-codedeploy = - buildTypesAiobotocorePackage "codedeploy" "2.13.1" - "sha256-8W/45jb4kJhaIIr9SoSDkhsl9FLZtsijaxsPjuk7tno="; + buildTypesAiobotocorePackage "codedeploy" "2.15.1" + "sha256-HaO/GSX14cKdKlwYmowzgWPfTDrUXyiyNlhz23lPyT8="; types-aiobotocore-codeguru-reviewer = - buildTypesAiobotocorePackage "codeguru-reviewer" "2.13.1" - "sha256-5Uz2Cfxg1GMsoYS5i337jVcXXrZYPZEhHt7KM2OlTrA="; + buildTypesAiobotocorePackage "codeguru-reviewer" "2.15.1" + "sha256-0vNZTr6RNUv2TjQJ9GZIwe6jTFJH1KgJW82fVERSFIw="; types-aiobotocore-codeguru-security = - buildTypesAiobotocorePackage "codeguru-security" "2.13.1" - "sha256-u6h54g4yHE6rVfi7t9q8RtRZWPgEGqGOIOphOAwq/MU="; + buildTypesAiobotocorePackage "codeguru-security" "2.15.1" + "sha256-Mk5xbw1OhHcBDhohKu7emIz7c4BkxFA+LRtHrLL/LoQ="; types-aiobotocore-codeguruprofiler = - buildTypesAiobotocorePackage "codeguruprofiler" "2.13.1" - "sha256-Ryj6wcXqRcT5qXQIvD2foKz+5HuH0VT2K3hvzoc6tx0="; + buildTypesAiobotocorePackage "codeguruprofiler" "2.15.1" + "sha256-i/a6O3B69uPMsJsjW2hxMdLm/q2nvRwTlcpvqg0zcnQ="; types-aiobotocore-codepipeline = - buildTypesAiobotocorePackage "codepipeline" "2.13.1" - "sha256-CoU0OEGz2DuFLeNqCWWj8oE2MoSSdXyKB+NT3Pt942A="; + buildTypesAiobotocorePackage "codepipeline" "2.15.1" + "sha256-2i5cZ7cCy0zt71bTmAZHPCKR8GVutVR2TXeGJIlTQ54="; - types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.13.1" - "sha256-bbn+UQa3FTVDSh9MkkSIzjXrJ5VRE2Cey0qsy8ayKKo="; + types-aiobotocore-codestar = + buildTypesAiobotocorePackage "codestar" "2.13.3" + "sha256-Z1ewx2RjmxbOQZ7wXaN54PVOuRs6LP3rMpsrVTacwjo="; types-aiobotocore-codestar-connections = - buildTypesAiobotocorePackage "codestar-connections" "2.13.1" - "sha256-IlKwnmjBJGg4/t/nsmNU3SHg9Bt/xUTlPHEyDyDHPP8="; + buildTypesAiobotocorePackage "codestar-connections" "2.15.1" + "sha256-Qcz4JHpT34WKY0+/CRDavwiI99GCwxA/SBftb6Wi9J0="; types-aiobotocore-codestar-notifications = - buildTypesAiobotocorePackage "codestar-notifications" "2.13.1" - "sha256-A50/E6erKSQWHjAJ9CpRIz5/waUwO4yqagdVULraO9o="; + buildTypesAiobotocorePackage "codestar-notifications" "2.15.1" + "sha256-qdVJ+6ELs5YKqIV/26Ar2FW4KC3DGofHJ/+xo5xzT3M="; types-aiobotocore-cognito-identity = - buildTypesAiobotocorePackage "cognito-identity" "2.13.1" - "sha256-GXDC1bJbPy6wWrHWQMOlMR7x9hGhO9jzWv/8JXkPyGk="; + buildTypesAiobotocorePackage "cognito-identity" "2.15.1" + "sha256-wlpdAHtWZd1l8jYduPT0Dc0LIWxOiiA05uXTpL8fQWo="; types-aiobotocore-cognito-idp = - buildTypesAiobotocorePackage "cognito-idp" "2.13.1" - "sha256-vlKEPVh/5By2I7McROQdNa8XlF3Q6nrA/pgIeDWUPgg="; + buildTypesAiobotocorePackage "cognito-idp" "2.15.1" + "sha256-zpuLoNTgcbYQJ0DF52qoPVm7nspMiITQczoREaCtlCI="; types-aiobotocore-cognito-sync = - buildTypesAiobotocorePackage "cognito-sync" "2.13.1" - "sha256-lFEn4TQ8ESrm0HAb+YMYiEqaZAqkX1kZLLn7hbSzAQc="; + buildTypesAiobotocorePackage "cognito-sync" "2.15.1" + "sha256-XYPt1jgk+BEjDpNH2XHNf0hoOwzewoxqxy+2qjv2dMw="; types-aiobotocore-comprehend = - buildTypesAiobotocorePackage "comprehend" "2.13.1" - "sha256-F2t0c8J+h2o5fZlAwRGtF9UmHyYilrrncRkTIMA5mC4="; + buildTypesAiobotocorePackage "comprehend" "2.15.1" + "sha256-XbQ3BYHXGNb4aKFo+WegaZ8613FiVRdthZ0zU7borjQ="; types-aiobotocore-comprehendmedical = - buildTypesAiobotocorePackage "comprehendmedical" "2.13.1" - "sha256-nkjUjOLIuYC95pltFInfXDrvM4SckHf7+iJSQC2WQ1k="; + buildTypesAiobotocorePackage "comprehendmedical" "2.15.1" + "sha256-3cifXhAhIxxZVRdE0Pt3SmaWwoj75iIpp6ThnLeL+BM="; types-aiobotocore-compute-optimizer = - buildTypesAiobotocorePackage "compute-optimizer" "2.13.1" - "sha256-p/49yh4DHMWyetWVyLh1vqOnpWxKfQaP26UNOzQJ/U0="; + buildTypesAiobotocorePackage "compute-optimizer" "2.15.1" + "sha256-8awRuy2iD9mYSuLaMrbpu0bZ1HlY9kIrF4/ZY7kECbQ="; - types-aiobotocore-config = buildTypesAiobotocorePackage "config" "2.13.1" - "sha256-JXg+fCdaGBJ++phhSjUz9tFtZTH2L8RwlGbkE00b/WE="; + types-aiobotocore-config = + buildTypesAiobotocorePackage "config" "2.15.1" + "sha256-n8RP98EO8AB0a3zqKlc7TZBttT7bHRV2EFYBy999q4g="; - types-aiobotocore-connect = buildTypesAiobotocorePackage "connect" "2.13.1" - "sha256-8eI2xD1RcI7djPKdCL1vevnFUSZPuHYEsOdqiVM0cfA="; + types-aiobotocore-connect = + buildTypesAiobotocorePackage "connect" "2.15.1" + "sha256-9AfqyTav6mIPiBrMGP6Rh+ytAS92LdLg/4VdTaSKB6I="; types-aiobotocore-connect-contact-lens = - buildTypesAiobotocorePackage "connect-contact-lens" "2.13.1" - "sha256-n8vtERLR98IyPF7jOBdzkEz+Jf+A234MbORfcVN0wRw="; + buildTypesAiobotocorePackage "connect-contact-lens" "2.15.1" + "sha256-qTq+tsvlPDq9LDTNgZuwa1zva17PDm1zBMnDX5nLR1g="; types-aiobotocore-connectcampaigns = - buildTypesAiobotocorePackage "connectcampaigns" "2.13.1" - "sha256-QSOX1MYrg+L1ESOEzE296Ne8d5F3aaKztiBlxJtsAiE="; + buildTypesAiobotocorePackage "connectcampaigns" "2.15.1" + "sha256-kIF+sS4RpsmhiuttzwFViHaOLZ5B69O//hwEYGrMfr8="; types-aiobotocore-connectcases = - buildTypesAiobotocorePackage "connectcases" "2.13.1" - "sha256-4EdnxtOLZDryEUaMulCkenje8zSt8mujs0QPvl7MhpA="; + buildTypesAiobotocorePackage "connectcases" "2.15.1" + "sha256-hTUDhtsv5KWOiM9jYrT4/IW+GmnCmWnhMZpoQIClQ3k="; types-aiobotocore-connectparticipant = - buildTypesAiobotocorePackage "connectparticipant" "2.13.1" - "sha256-6iMw+gk9HIPv6l7j6lwSKmQPeHs07bhEL7eY5TnIEJk="; + buildTypesAiobotocorePackage "connectparticipant" "2.15.1" + "sha256-ffSs8Z/TQatJDUKmjdclI5DYMf5/EI/uEi8r4EnKFds="; types-aiobotocore-controltower = - buildTypesAiobotocorePackage "controltower" "2.13.1" - "sha256-vPCIltZMsBBEqHCKh5BQ9ZuwZrjqzhUIpLfS1KGCtz4="; + buildTypesAiobotocorePackage "controltower" "2.15.1" + "sha256-5Sa+K+DTpM2YwTfhlufD9MxTk4pv+K1wE9PYKM1zAxw="; - types-aiobotocore-cur = buildTypesAiobotocorePackage "cur" "2.13.1" - "sha256-PPFJQ2Hh3KCTTe6dGAyuTNjYSQ8s42lvf4/ZIhLxVnk="; + types-aiobotocore-cur = + buildTypesAiobotocorePackage "cur" "2.15.1" + "sha256-NfY/cGT+ft8bWitgYHbySblXNdYj/c/4p5jr2yOs5+c="; types-aiobotocore-customer-profiles = - buildTypesAiobotocorePackage "customer-profiles" "2.13.1" - "sha256-qckqfZP20Rlg/MiZUsFV+mBmrbRNob5jm655l2Osons="; + buildTypesAiobotocorePackage "customer-profiles" "2.15.1" + "sha256-fQONh48vGKkr+ICjI3EqKW+jNXH/DSm0a96pTf4JQmk="; - types-aiobotocore-databrew = buildTypesAiobotocorePackage "databrew" "2.13.1" - "sha256-qmh7lRfGBt6YsyC08BDAFyPsJ/h4JqCqUNup5Fmymbg="; + types-aiobotocore-databrew = + buildTypesAiobotocorePackage "databrew" "2.15.1" + "sha256-DNayl61Eorza7nIjjbxbFzs+lIN3oUwpDIImJEMHX7Y="; types-aiobotocore-dataexchange = - buildTypesAiobotocorePackage "dataexchange" "2.13.1" - "sha256-A+FeXDt+0noA2GwfHYiq7qyZ1/qYS+WlIn/ZmJvkPPs="; + buildTypesAiobotocorePackage "dataexchange" "2.15.1" + "sha256-v9bq7ub+8q2NrZtaqWqQh2MSKoGfDBdTVW1qKTSooug="; types-aiobotocore-datapipeline = - buildTypesAiobotocorePackage "datapipeline" "2.13.1" - "sha256-5IEPIDBzw3BnFjMpuBhPxjPwcWoKBEhGcYIv7BFHzjk="; + buildTypesAiobotocorePackage "datapipeline" "2.15.1" + "sha256-9hBxeCltGrxtMGuTKTwVp/aHHccnfDKuI0QXv50uKNA="; - types-aiobotocore-datasync = buildTypesAiobotocorePackage "datasync" "2.13.1" - "sha256-PBThgOkESfmfCgehLRboigoPNgB1ncQy+pTArVwyNNQ="; + types-aiobotocore-datasync = + buildTypesAiobotocorePackage "datasync" "2.15.1" + "sha256-z7t65Ioz0NtiToPkTIbYcBjWlJg1rcTIj0u/qmPkhMA="; - types-aiobotocore-dax = buildTypesAiobotocorePackage "dax" "2.13.1" - "sha256-XnENL/AXDPbiYHoP4q5dIPnZjntzEps4Z7+Zz0idGGc="; + types-aiobotocore-dax = + buildTypesAiobotocorePackage "dax" "2.15.1" + "sha256-/NyvlFx8/nOWClB3ZPqTt67yGN2ssYojWukw0S3v274="; types-aiobotocore-detective = - buildTypesAiobotocorePackage "detective" "2.13.1" - "sha256-HPG0D8TOQDotnHwL6PsG4mpB2IgBA9mlC5sWQPwy9iQ="; + buildTypesAiobotocorePackage "detective" "2.15.1" + "sha256-DWf6HTvFyMYRiOLQrawp5GwhXniNS9mhwPNyprCYrt0="; types-aiobotocore-devicefarm = - buildTypesAiobotocorePackage "devicefarm" "2.13.1" - "sha256-e2RQBZS4cXWEKtN6cQdUG/lSyP7J+alzfNlZ/8hYKUc="; + buildTypesAiobotocorePackage "devicefarm" "2.15.1" + "sha256-05IkwZCPZvQGkRya7TdN1huFpMxuR1zxB+b8JSFI/oM="; types-aiobotocore-devops-guru = - buildTypesAiobotocorePackage "devops-guru" "2.13.1" - "sha256-zWl43w6QWSzXnBcoCuvQFv33TbgcQrPZ1A/YdturwVk="; + buildTypesAiobotocorePackage "devops-guru" "2.15.1" + "sha256-n62US1ENdO1MFljx5zeLx+LblbiJyxefhN2+nlxu2GA="; types-aiobotocore-directconnect = - buildTypesAiobotocorePackage "directconnect" "2.13.1" - "sha256-1pSPSX7Agzst4aTALLE0ZCyMZVrdnI43GQIjrO95b7E="; + buildTypesAiobotocorePackage "directconnect" "2.15.1" + "sha256-knhkLyC1uPX4KjiFcgFf9ys2hCz38++q55nbnUM3n/Q="; types-aiobotocore-discovery = - buildTypesAiobotocorePackage "discovery" "2.13.1" - "sha256-8AL6/4Hc0e6Ew+IttkS+TH/elbNk7kAEVrlEykdiYZU="; + buildTypesAiobotocorePackage "discovery" "2.15.1" + "sha256-JG/1ZQ9cSCMzqF6CVTIu7EIm0ORbLn3gM8gcCCSRhsQ="; - types-aiobotocore-dlm = buildTypesAiobotocorePackage "dlm" "2.13.1" - "sha256-2CyerhSqGOrXVvPVBe0f1Z/EzZVwWXHtskTAQHX9iDE="; + types-aiobotocore-dlm = + buildTypesAiobotocorePackage "dlm" "2.15.1" + "sha256-Pyi45ZWBuEsb3GoumJkX+c8QnX3J6HobLFqwkm7I0ng="; - types-aiobotocore-dms = buildTypesAiobotocorePackage "dms" "2.13.1" - "sha256-u2fQo8rxuAwME7tBm16HrSUy+WXS/Pd9HW/MEMZ+Tc4="; + types-aiobotocore-dms = + buildTypesAiobotocorePackage "dms" "2.15.1" + "sha256-wius84bAUyldt84o8qUeBSzajkY8mLco85rI4NAIQcc="; - types-aiobotocore-docdb = buildTypesAiobotocorePackage "docdb" "2.13.1" - "sha256-tuBnHhnTRo/3qp8ZVSOsgZA8uY/9ZAKhu5GTcxGSbas="; + types-aiobotocore-docdb = + buildTypesAiobotocorePackage "docdb" "2.15.1" + "sha256-MF8CGeObwgB5LW1o1ynwahm9GZHTvxjlgNXDyFRjpWM="; types-aiobotocore-docdb-elastic = - buildTypesAiobotocorePackage "docdb-elastic" "2.13.1" - "sha256-DEFQP9zCXZaol/CIw1DYfFcIq2eia8dFxFA2wXdt3oI="; + buildTypesAiobotocorePackage "docdb-elastic" "2.15.1" + "sha256-+gyO2dno529rxF5Uj1pyQ0+fH1CJK7LJs/U4WIpRIX4="; - types-aiobotocore-drs = buildTypesAiobotocorePackage "drs" "2.13.1" - "sha256-ZElJBbRMRxIbpEGGfukE3960MoeprT2Cutf72657KJ0="; + types-aiobotocore-drs = + buildTypesAiobotocorePackage "drs" "2.15.1" + "sha256-qtMwQ17MpJ0K7zbKr4dyAGWEfHqfM+wXQe22raG/i1E="; - types-aiobotocore-ds = buildTypesAiobotocorePackage "ds" "2.13.1" - "sha256-0+zSG+xITYFMddqkeFLPTD3nKdZhJXRbIgqbWQ9COB0="; + types-aiobotocore-ds = + buildTypesAiobotocorePackage "ds" "2.15.1" + "sha256-qU+5PMZqxbskuB/ubXeigzS5t+A5m0WW0e4NVQjFLO4="; - types-aiobotocore-dynamodb = buildTypesAiobotocorePackage "dynamodb" "2.13.1" - "sha256-YJxyiLgbryyzCOpWUdpw28uSALB4+aNPX4kc7kq5LHA="; + types-aiobotocore-dynamodb = + buildTypesAiobotocorePackage "dynamodb" "2.15.1" + "sha256-hQt2Htye+VubSHw+2Iz5E8IgzHGwAwmyYEkNI0br7eU="; types-aiobotocore-dynamodbstreams = - buildTypesAiobotocorePackage "dynamodbstreams" "2.13.1" - "sha256-L2MY8Bg84pACtheQqvx5ifZE8Vk/BPP0WV9phEJkzYQ="; + buildTypesAiobotocorePackage "dynamodbstreams" "2.15.1" + "sha256-n2NZxFSH9ymucBLagUAaWDgAN4kDsfKqB2W2ir6aEC8="; - types-aiobotocore-ebs = buildTypesAiobotocorePackage "ebs" "2.13.1" - "sha256-sFwvDd2fIsK/86xxpJ+V3WyIQQTpCLzJL5U01ecliSk="; + types-aiobotocore-ebs = + buildTypesAiobotocorePackage "ebs" "2.15.1" + "sha256-nzm7mnREUd6MEHan4cTc0MaorGo/X+eKbGH1/giG16w="; - types-aiobotocore-ec2 = buildTypesAiobotocorePackage "ec2" "2.13.1" - "sha256-2UZIX3qB+1+zmI2MNNvWuW0W8J7ALTn6L2HulWJkNbE="; + types-aiobotocore-ec2 = + buildTypesAiobotocorePackage "ec2" "2.15.1" + "sha256-QzPGQirl2zA5m2yqqXjUC8MIsUDbOg1yl252KJU+Ipc="; types-aiobotocore-ec2-instance-connect = - buildTypesAiobotocorePackage "ec2-instance-connect" "2.13.1" - "sha256-1JfthjzoPg7AKiJ8+IDeub+z2h6jc8PSELzbSsZPJ+s="; + buildTypesAiobotocorePackage "ec2-instance-connect" "2.15.1" + "sha256-A5OdqOTax+3/v6GG3IzU771A4l3OXQhqlowknE0DnNU="; - types-aiobotocore-ecr = buildTypesAiobotocorePackage "ecr" "2.13.1" - "sha256-M7SBFTH0R0pR/DNspYLVJT3ZjEIakkqcCVxt0by8GPI="; + types-aiobotocore-ecr = + buildTypesAiobotocorePackage "ecr" "2.15.1" + "sha256-3b5SI5qHhvVIa8hqLp/YZu9b3DDpZm5ogRv0I0NuI0Y="; types-aiobotocore-ecr-public = - buildTypesAiobotocorePackage "ecr-public" "2.13.1" - "sha256-5xDlfYf5sVngVkz7cUlBVp3mZgyy7Ir9NTI9OABaAg4="; + buildTypesAiobotocorePackage "ecr-public" "2.15.1" + "sha256-enLMc0Vg+RwO3SBzvDd/nKQvNbCllMJMS4BBKGUNWuQ="; - types-aiobotocore-ecs = buildTypesAiobotocorePackage "ecs" "2.13.1" - "sha256-/Agvt1KPHs4tlvUPIsv3WkSISYzTf5MDF2W2p4K4ix0="; + types-aiobotocore-ecs = + buildTypesAiobotocorePackage "ecs" "2.15.1" + "sha256-GOUkXglekGMNDlWdz9dyGvZpgSTfnZAh3e80CMvzumA="; - types-aiobotocore-efs = buildTypesAiobotocorePackage "efs" "2.13.1" - "sha256-lZip3L9g49AhZDfiLMI6Sub4tareaGK21M3x/8SL0Ds="; + types-aiobotocore-efs = + buildTypesAiobotocorePackage "efs" "2.15.1" + "sha256-+KZQnRFKF+0nmOqec1jHa0ewAcfLBoW9mrMVNZn6q78="; - types-aiobotocore-eks = buildTypesAiobotocorePackage "eks" "2.13.1" - "sha256-jcLVLCcwX2rZX6rkFXK/WnrFY24DP4cs1KOS4/SatdU="; + types-aiobotocore-eks = + buildTypesAiobotocorePackage "eks" "2.15.1" + "sha256-4d/rL6L/W2zfZ1naceSfH/E1y2DUNMcQ2tJaaKsRjLw="; types-aiobotocore-elastic-inference = - buildTypesAiobotocorePackage "elastic-inference" "2.13.1" - "sha256-fpf+83EIrfw0b8eRVPzv8Jso2rig/YwNvwnV1BXUTjU="; + buildTypesAiobotocorePackage "elastic-inference" "2.15.1" + "sha256-AOhrrWLtKq5Wr79TcFNa+A3/MhHMnAPMIPEgcum2/ZA="; types-aiobotocore-elasticache = - buildTypesAiobotocorePackage "elasticache" "2.13.1" - "sha256-YJDj31GBbfqvMzQieBbiqroi1c7XY+ls5WLioDopfxs="; + buildTypesAiobotocorePackage "elasticache" "2.15.1" + "sha256-Psxy6JILUzvwmUj9QP2wTeIgt/nbtpbG3LUozN9ltek="; types-aiobotocore-elasticbeanstalk = - buildTypesAiobotocorePackage "elasticbeanstalk" "2.13.1" - "sha256-QQftlSV3/ecfKJ+XLnh28dfQksqKSu6GL07YfnEeLjM="; + buildTypesAiobotocorePackage "elasticbeanstalk" "2.15.1" + "sha256-3Jt67THyNfn92g6L/GZwPi0HLb6bpLuoDAkuXKPZu1Y="; types-aiobotocore-elastictranscoder = - buildTypesAiobotocorePackage "elastictranscoder" "2.13.1" - "sha256-L1Dvy5scS/PP3YWQ/Z8N/YjqeEennSbIGwxUNFwLYAM="; + buildTypesAiobotocorePackage "elastictranscoder" "2.15.1" + "sha256-mGNHO2T129nPrODffC8Y9+R+XKjVVUnFrw1yDkJ0g/A="; - types-aiobotocore-elb = buildTypesAiobotocorePackage "elb" "2.13.1" - "sha256-/vVRG4ss0RWlPk7fuSfITmFcXvRRGeRt4BDQlQudRgM="; + types-aiobotocore-elb = + buildTypesAiobotocorePackage "elb" "2.15.1" + "sha256-wceBAH30EypOqb4GqTP6aL6Ribm4l6b082+vB4sRDMs="; - types-aiobotocore-elbv2 = buildTypesAiobotocorePackage "elbv2" "2.13.1" - "sha256-YBnWgaK55Jo1IoQRziUoY7IIcVHjwXXlBQ5HmvEXwpw="; + types-aiobotocore-elbv2 = + buildTypesAiobotocorePackage "elbv2" "2.15.1" + "sha256-4si+dqz/nPdXAF+eUkTICZQ8JaT+DcxEbmrxKZcF5G0="; - types-aiobotocore-emr = buildTypesAiobotocorePackage "emr" "2.13.1" - "sha256-6vuMBCR5cd8H7VXvPZpTyxPex9/71PfE2aVmZSRPVxw="; + types-aiobotocore-emr = + buildTypesAiobotocorePackage "emr" "2.15.1" + "sha256-4Ak5F+RnUlOnMvEhVTXrHXkQQzWSo7iRIojrwYifMnA="; types-aiobotocore-emr-containers = - buildTypesAiobotocorePackage "emr-containers" "2.13.1" - "sha256-oiAWpmJBs/kvNdKXnHqvWpY3DnX31r3QvW2JzOXXZVg="; + buildTypesAiobotocorePackage "emr-containers" "2.15.1" + "sha256-Q1ZGZfpub4fceqFyBTLxj5G27ByHYPRH8KvEMyFZWyQ="; types-aiobotocore-emr-serverless = - buildTypesAiobotocorePackage "emr-serverless" "2.13.1" - "sha256-+nuAIs7l6xVSGcMg01AdohUqTkU4vSWbU+8hZ+jT5PI="; + buildTypesAiobotocorePackage "emr-serverless" "2.15.1" + "sha256-lHSPS5/HAW2NFg6zCKXARznJ1UjTWIn/YDR9XlMa1ag="; types-aiobotocore-entityresolution = - buildTypesAiobotocorePackage "entityresolution" "2.13.1" - "sha256-zgMGXC6b2ooZhZFdaQDnf/Nx5IJAsqTW6egXMRtO4qg="; + buildTypesAiobotocorePackage "entityresolution" "2.15.1" + "sha256-QXAAHqiq1ThUvS5Y59SXA0OKQza0IrxPUyGwpZ1Ft1U="; - types-aiobotocore-es = buildTypesAiobotocorePackage "es" "2.13.1" - "sha256-xjWWFmGM03NGlOKlOo0v7L8lVy03q3P8wBhLYEKa7xs="; + types-aiobotocore-es = + buildTypesAiobotocorePackage "es" "2.15.1" + "sha256-lHKKWM984zvnbcO2ord+XkbFm91y2OAJlddm3dongo8="; - types-aiobotocore-events = buildTypesAiobotocorePackage "events" "2.13.1" - "sha256-Pvsd2abp28BF7V+2IOJgNlxHLiXy/3rDxNQ0S6aowCU="; + types-aiobotocore-events = + buildTypesAiobotocorePackage "events" "2.15.1" + "sha256-3XQ9EjRu2qfpvHAWbM7XHodvMCR5PXOzM5ttes7ggEM="; types-aiobotocore-evidently = - buildTypesAiobotocorePackage "evidently" "2.13.1" - "sha256-6icdeO3oML5yEkfbA6Oaao+bX3scvXhTqefVO9SpBBo="; + buildTypesAiobotocorePackage "evidently" "2.15.1" + "sha256-DR+GYAUdE7Nfn0X0sp3IshbfKjcrtFVCk3KObFlQbdM="; - types-aiobotocore-finspace = buildTypesAiobotocorePackage "finspace" "2.13.1" - "sha256-Ee30GzLvU5oERCCJEzzxNHim4Dy1kA0UZ1GJBvBWLZc="; + types-aiobotocore-finspace = + buildTypesAiobotocorePackage "finspace" "2.15.1" + "sha256-kIg535sFaySMannjaMHmVEZqx7Lh1OnGpBc/CxMqWzY="; types-aiobotocore-finspace-data = - buildTypesAiobotocorePackage "finspace-data" "2.13.1" - "sha256-1e7WBzT7N9q0zq2xBihunaUUPgg5LE/krn3rRnB4gLw="; + buildTypesAiobotocorePackage "finspace-data" "2.15.1" + "sha256-rGvEfMJt7mmrned4uLGaN58ZGgFJzNPwxFCRu3SghWg="; - types-aiobotocore-firehose = buildTypesAiobotocorePackage "firehose" "2.13.1" - "sha256-Tso0OK3RVPr3MEalyLKZlnBPAA3W1dIE26ZOxSV4uRs="; + types-aiobotocore-firehose = + buildTypesAiobotocorePackage "firehose" "2.15.1" + "sha256-gkBhNs6Cpy7dL4o/SyOxwF7eCwlnHaGxbSjO0FvPxpM="; - types-aiobotocore-fis = buildTypesAiobotocorePackage "fis" "2.13.1" - "sha256-XL0LHEP21vqplbAe8YnakAFM47LCp8D+uXnlzUxG+DY="; + types-aiobotocore-fis = + buildTypesAiobotocorePackage "fis" "2.15.1" + "sha256-BKyTNVhRzYjQDXwhTpo9rblgEonzPubmJIOrCnwaEus="; - types-aiobotocore-fms = buildTypesAiobotocorePackage "fms" "2.13.1" - "sha256-VfwYpj2KVH6P1ELW1YTHlfms4pNdFsbJ/cPch5ygM7I="; + types-aiobotocore-fms = + buildTypesAiobotocorePackage "fms" "2.15.1" + "sha256-9v2x/BYM6tiPWPC/c7ZNJufl5EStBRq7dSW9S3jaWTc="; - types-aiobotocore-forecast = buildTypesAiobotocorePackage "forecast" "2.13.1" - "sha256-jn2O34ZHKZXzoTSreNfPUn8hdY4OR8JYmK3bbkh7Gjk="; + types-aiobotocore-forecast = + buildTypesAiobotocorePackage "forecast" "2.15.1" + "sha256-7B24s2z0hwaXZzj/ryhfIqbiFPaiFuC8GOn5MaYsB0U="; types-aiobotocore-forecastquery = - buildTypesAiobotocorePackage "forecastquery" "2.13.1" - "sha256-ZBup38Uw4U9d7QbLgAfxortKEIUq3TJbevgJIya77fk="; + buildTypesAiobotocorePackage "forecastquery" "2.15.1" + "sha256-Z/Ul3IhUDhYjijXU9fFCOsG2r927wvl3pOWP+SxZ7rE="; types-aiobotocore-frauddetector = - buildTypesAiobotocorePackage "frauddetector" "2.13.1" - "sha256-xSR3m24DmGDvaq7aCYcmM5ZYktoNDaTYIat0N1qICD4="; + buildTypesAiobotocorePackage "frauddetector" "2.15.1" + "sha256-ZNnWPccp4nnNAUk6tsAfV6xYS0U98rh17bTXG9+NjBY="; - types-aiobotocore-fsx = buildTypesAiobotocorePackage "fsx" "2.13.1" - "sha256-YIZ3hBCtHtT0S9DUC0nMTUv6CIf+zeBhcCwaR1AOfvM="; + types-aiobotocore-fsx = + buildTypesAiobotocorePackage "fsx" "2.15.1" + "sha256-72IyOCvtGPR2JNpIIy0rgiACfmDfxKlV/wo5AvzTdf4="; - types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.13.1" - "sha256-V1G7mp/+nvF5bA/E6yGby1lykK/G7O9Q1cPbEuyJQ+8="; + types-aiobotocore-gamelift = + buildTypesAiobotocorePackage "gamelift" "2.15.1" + "sha256-jFgO3ks0u/1YMjeQXHvMYoa4O35+VrvpeXWIAeJRj2I="; types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.7.0" - "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; + "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; - types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.13.1" - "sha256-hEwuAdbhYop3DmUQQFSrFG1pgqGVqFWp+LGutURhPao="; + types-aiobotocore-glacier = + buildTypesAiobotocorePackage "glacier" "2.15.1" + "sha256-5BewcGF6cDdPnTqyKLHlJIYuiv5N4GSuIlouRCEMeAQ="; types-aiobotocore-globalaccelerator = - buildTypesAiobotocorePackage "globalaccelerator" "2.13.1" - "sha256-eId3UX9+TGCRGXfQKQl0nFdhtsKex6G4t8FWstwi+c0="; + buildTypesAiobotocorePackage "globalaccelerator" "2.15.1" + "sha256-fh2RP530haUdEOM7noDiBmiHf5Cv+YvF8S4Xoh84K20="; - types-aiobotocore-glue = buildTypesAiobotocorePackage "glue" "2.13.1" - "sha256-sCQiehUAJHXQ5gaSrR4Cly3X4xYelficyLvdudBFVmg="; + types-aiobotocore-glue = + buildTypesAiobotocorePackage "glue" "2.15.1" + "sha256-z4fe7DbzI2AIkCa4qBS4kGyPcgti1d/CPJCqe82OuR4="; - types-aiobotocore-grafana = buildTypesAiobotocorePackage "grafana" "2.13.1" - "sha256-TAUw1rS+xXf6CDJ1tZBoBQ+0QF3va81ZKr9kAfZCi1g="; + types-aiobotocore-grafana = + buildTypesAiobotocorePackage "grafana" "2.15.1" + "sha256-V6uqUzVntsISmOUH9Mjy5DjLxiYkPN9k6BtQFwer4wM="; types-aiobotocore-greengrass = - buildTypesAiobotocorePackage "greengrass" "2.13.1" - "sha256-CNPpXxrRN83LzxrsGpzdevytWDR/fpCADkRo59SNMQ8="; + buildTypesAiobotocorePackage "greengrass" "2.15.1" + "sha256-C/W6eBJauG9QI8MMc7hFzkN4A21RRMH6kSU5Wq/qXus="; types-aiobotocore-greengrassv2 = - buildTypesAiobotocorePackage "greengrassv2" "2.13.1" - "sha256-WI+Jt+83JB3khjm1gix094Sapxbs+yNKIRhgRs6L+pk="; + buildTypesAiobotocorePackage "greengrassv2" "2.15.1" + "sha256-00hMhRWJ4W91I6cG5IXyyNqjyxPFrwmbHp69EWIIkMg="; types-aiobotocore-groundstation = - buildTypesAiobotocorePackage "groundstation" "2.13.1" - "sha256-7wDtgajzXuJx2Ydpfvi7SWyr3bR5jw20mnadkyienfA="; + buildTypesAiobotocorePackage "groundstation" "2.15.1" + "sha256-++YYod+5UlCzknDJ/0l3hwPNukO9o2M0CoZR0lyOTnA="; types-aiobotocore-guardduty = - buildTypesAiobotocorePackage "guardduty" "2.13.1" - "sha256-e35CQoyx1e5wSd5A5W4pAWK8WmbAftJqTpMcmijUShw="; + buildTypesAiobotocorePackage "guardduty" "2.15.1" + "sha256-+fJrH77TQKCBoio2R3LEJLmUOtSXd9oaf+PaN0YyEdA="; - types-aiobotocore-health = buildTypesAiobotocorePackage "health" "2.13.1" - "sha256-DAMRdMfG+Ry8PkiECiJCwIXUbjTXWGZ6EfgxPI6BRfo="; + types-aiobotocore-health = + buildTypesAiobotocorePackage "health" "2.15.1" + "sha256-KNaHkgFc1W6cK7nwt7ZibmeL3zMmO2/6O1OlRkrUERY="; types-aiobotocore-healthlake = - buildTypesAiobotocorePackage "healthlake" "2.13.1" - "sha256-m1LqsoGlWh7Hga+l/uZ3OZa6NK9yd00BviT0VDfuue4="; + buildTypesAiobotocorePackage "healthlake" "2.15.1" + "sha256-JtP47qVkcTMtafPT/YbEu/CFOh4yp1VLICTVzB2LeV4="; types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.13.0" - "sha256-DeeheoQeFEcDH21DSNs2kSR1rjnPLtTgz0yNCFnE+Io="; + "sha256-DeeheoQeFEcDH21DSNs2kSR1rjnPLtTgz0yNCFnE+Io="; - types-aiobotocore-iam = buildTypesAiobotocorePackage "iam" "2.13.1" - "sha256-g9Tkt2rOIg9Y9RwlTh80eiX2BEj4TqhGNWWMKomFEKU="; + types-aiobotocore-iam = + buildTypesAiobotocorePackage "iam" "2.15.1" + "sha256-CKNmGY362fvOEdm9+UvElI9U3dZhjY4sTDnuzBaPJyw="; types-aiobotocore-identitystore = - buildTypesAiobotocorePackage "identitystore" "2.13.1" - "sha256-SslzL8/NmeF4nHNO/7BGHle/brlzc/V4D+ssqfcZNFo="; + buildTypesAiobotocorePackage "identitystore" "2.15.1" + "sha256-LIEyxMseTo/G44R9gUeWFOoR/k1aZ1a6nLA8uuoti70="; types-aiobotocore-imagebuilder = - buildTypesAiobotocorePackage "imagebuilder" "2.13.1" - "sha256-GgkFg7I/a5wa03SlZtxYV2aGolNgzoB7TZrQkp7rjYI="; + buildTypesAiobotocorePackage "imagebuilder" "2.15.1" + "sha256-YromFw8hMXBV3v9rAfmAFg/1MWMSsBR8jCjgnN3Qjdc="; types-aiobotocore-importexport = - buildTypesAiobotocorePackage "importexport" "2.13.1" - "sha256-ovXUrl03Mut4QJZeItbxbtiuTDt3beGv0SjUBxZLyrs="; + buildTypesAiobotocorePackage "importexport" "2.15.1" + "sha256-UvwCZclRwoDaAMhY6CdhCADFs0m258Z34FVTH95CrZ8="; types-aiobotocore-inspector = - buildTypesAiobotocorePackage "inspector" "2.13.1" - "sha256-imFheQxmne5h9hN6yQOlSLWRDjdEYAW2enHhbTv+ei0="; + buildTypesAiobotocorePackage "inspector" "2.15.1" + "sha256-5vgqzDYe/y3vHvKFuYfhArZfmLHRPDuhGaSBRHWUiis="; types-aiobotocore-inspector2 = - buildTypesAiobotocorePackage "inspector2" "2.13.1" - "sha256-N/xZO2FneEYp7Ux5OIM9XXHEyiZGfA5pDogPB7R8Les="; + buildTypesAiobotocorePackage "inspector2" "2.15.1" + "sha256-2CPWpQt1jylh05MtxFIoig4DVoSBkHYVKEl0j/2s1v0="; types-aiobotocore-internetmonitor = - buildTypesAiobotocorePackage "internetmonitor" "2.13.1" - "sha256-vEDQ6b8yf6yopj0cce1LIKR53ipmbAx5T/BI47shgEQ="; + buildTypesAiobotocorePackage "internetmonitor" "2.15.1" + "sha256-aXAhRpaoJC0BR/KqG/0FF139mLFBTaqQdr0m5B8vz/k="; - types-aiobotocore-iot = buildTypesAiobotocorePackage "iot" "2.13.1" - "sha256-osgn2jHhrm9TiecS+jPV7VQW80ci8klwS85yFf4U6ik="; + types-aiobotocore-iot = + buildTypesAiobotocorePackage "iot" "2.15.1" + "sha256-iVdmdRpw4/gj6Lsy6gP8C6HwvIKhKmKHpvR5HoB4jE8="; - types-aiobotocore-iot-data = buildTypesAiobotocorePackage "iot-data" "2.13.1" - "sha256-WLlWLxNPIOi+f2lsL/aM7TMfHsW+nCP+kDv8irqKlK0="; + types-aiobotocore-iot-data = + buildTypesAiobotocorePackage "iot-data" "2.15.1" + "sha256-WVcWtkcrV0jTqCuygnDi6CZFVt/xuReFy6ji+BAjylQ="; types-aiobotocore-iot-jobs-data = - buildTypesAiobotocorePackage "iot-jobs-data" "2.13.1" - "sha256-O5Qi0KLLqwZhK45Uzt3ufoS2sIuNaB/0gKR9y+KjEEU="; + buildTypesAiobotocorePackage "iot-jobs-data" "2.15.1" + "sha256-Ym5Pxg3N++/QRdLNzHAOZQmObdroyhgO6tPHLmGfCPY="; types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.12.2" - "sha256-O/nGvYfUibI4EvHgONtkYHFv/dZSpHCehXjietPiMJo="; + "sha256-O/nGvYfUibI4EvHgONtkYHFv/dZSpHCehXjietPiMJo="; types-aiobotocore-iot1click-devices = - buildTypesAiobotocorePackage "iot1click-devices" "2.13.1" - "sha256-56U6mEIPQxNaBbml+3efOg0Bcoy0aTe6wlYGVg/Rkjk="; + buildTypesAiobotocorePackage "iot1click-devices" "2.15.1" + "sha256-OJmSfZaKAfiq7UImpgF/wKTzYaqxlhqrkOAbk7OchrM="; types-aiobotocore-iot1click-projects = - buildTypesAiobotocorePackage "iot1click-projects" "2.13.1" - "sha256-jkU6nulurbaTVshG1RCdvYFB23kQNn8VJhuuvLrpI8M="; + buildTypesAiobotocorePackage "iot1click-projects" "2.15.1" + "sha256-8Q6P8K87YIs+UsR5Vyyx9IMBW0fLAMqCu/LkqkUQYEU="; types-aiobotocore-iotanalytics = - buildTypesAiobotocorePackage "iotanalytics" "2.13.1" - "sha256-3m6Naodc/JUxmSIVO3St6DVvBGMNQmelz7UW7xw7g5w="; + buildTypesAiobotocorePackage "iotanalytics" "2.15.1" + "sha256-HkzZSHFbEWv67uQRIH6W/CsAFI1HpsFeNLvbqjQEJsQ="; types-aiobotocore-iotdeviceadvisor = - buildTypesAiobotocorePackage "iotdeviceadvisor" "2.13.1" - "sha256-HScTcygNmLUZIaj+jBp0gbPHEyhvpWC3l5KrON7+yNQ="; + buildTypesAiobotocorePackage "iotdeviceadvisor" "2.15.1" + "sha256-SMNXQLSk9rFAXgEKXk23cjWRRvhnUcskkQyeSetngcE="; types-aiobotocore-iotevents = - buildTypesAiobotocorePackage "iotevents" "2.13.1" - "sha256-f3GMaGbe8iaz9oBX3A9GVCeyDztAl/Z8FFUqNlt60K8="; + buildTypesAiobotocorePackage "iotevents" "2.15.1" + "sha256-vRnjkeGogwcdtRFybEuqB4FjR89N0KR8pdDWs4caa8I="; types-aiobotocore-iotevents-data = - buildTypesAiobotocorePackage "iotevents-data" "2.13.1" - "sha256-5gf8jxI3g2aB6Nq+6qZELrFc3S0yyxswnAP7lDERSvs="; + buildTypesAiobotocorePackage "iotevents-data" "2.15.1" + "sha256-j9yAFJUVBUtViPCO3DBCo1tC9AcLO2Uy4I2lfThBV+I="; types-aiobotocore-iotfleethub = - buildTypesAiobotocorePackage "iotfleethub" "2.13.1" - "sha256-ioxTcKwSmYOuLykUwiRwFkOUim5TWqL8aD4KCMONHkI="; + buildTypesAiobotocorePackage "iotfleethub" "2.15.1" + "sha256-k7D8o7sxTlyjmlCBmt2uY/FKC6KUWmx9LL9k2zedszU="; types-aiobotocore-iotfleetwise = - buildTypesAiobotocorePackage "iotfleetwise" "2.13.1" - "sha256-R04IXZingyp/1DDL30QOhNjnbfoLIj4+GLkzWoCquqQ="; + buildTypesAiobotocorePackage "iotfleetwise" "2.15.1" + "sha256-lozZuY4r9CkPi+SD9p/T35HyjiHVMmJ33GKNEZ/htPc="; types-aiobotocore-iotsecuretunneling = - buildTypesAiobotocorePackage "iotsecuretunneling" "2.13.1" - "sha256-q2zWTqraceZkg8kPVptFBmK2xuVvhFbx6EEpqcuWi7I="; + buildTypesAiobotocorePackage "iotsecuretunneling" "2.15.1" + "sha256-3Bw3N2aIUzKNLyMGnHsxQB8bofonIcqJANariAKqXsI="; types-aiobotocore-iotsitewise = - buildTypesAiobotocorePackage "iotsitewise" "2.13.1" - "sha256-r8ye5bXfJjggdS2CSAzB1MTxUqW3WYnRhgyty1zUt8E="; + buildTypesAiobotocorePackage "iotsitewise" "2.15.1" + "sha256-WZqYRDV21kkgBMb5z+6KKTlGxDJKXmMl1u3RlTPavl4="; types-aiobotocore-iotthingsgraph = - buildTypesAiobotocorePackage "iotthingsgraph" "2.13.1" - "sha256-DUyf0i1vj8/YKZEvpeI28Cxaa4m9jz9LNKIxM8mLFvQ="; + buildTypesAiobotocorePackage "iotthingsgraph" "2.15.1" + "sha256-/ArOj+prhHoDPRymOW4NN8IXNkWuE/wZJuRAXMVmzpg="; types-aiobotocore-iottwinmaker = - buildTypesAiobotocorePackage "iottwinmaker" "2.13.1" - "sha256-apD3UPBHiyMDEbf3y1L5tENdWEfum8LvCNc5dIq7tvc="; + buildTypesAiobotocorePackage "iottwinmaker" "2.15.1" + "sha256-gE3/juMs0BFJZEq291UGWAh41NCRHWHmZY+KcZ9IFJE="; types-aiobotocore-iotwireless = - buildTypesAiobotocorePackage "iotwireless" "2.13.1" - "sha256-Z133nUtghZZJNhSJdn1kwCyoerN+sANlikrse2Up0Mo="; + buildTypesAiobotocorePackage "iotwireless" "2.15.1" + "sha256-PRORLAzdQ0QmYSPYWrQaPSwW8JaeTyzg8Z+N8/Hqjz8="; - types-aiobotocore-ivs = buildTypesAiobotocorePackage "ivs" "2.13.1" - "sha256-/xTDdUOgKRBROTAWa/Yo1to7fEDXDzeidbljgFe1QQo="; + types-aiobotocore-ivs = + buildTypesAiobotocorePackage "ivs" "2.15.1" + "sha256-OIvBSFt9S+SmZIjdw/zcC/FC/3d9Huce5jQXgj5D+ik="; types-aiobotocore-ivs-realtime = - buildTypesAiobotocorePackage "ivs-realtime" "2.13.1" - "sha256-rnGISy6NHILsoihnWVOAt9ESTcOTeBHt2VD/mlgwWXc="; + buildTypesAiobotocorePackage "ivs-realtime" "2.15.1" + "sha256-Eh5fuYJawPwAFuQl0/wLq+gTJ02C5wFZsETDsOSi3LU="; - types-aiobotocore-ivschat = buildTypesAiobotocorePackage "ivschat" "2.13.1" - "sha256-9xCBsQGk8LKSl3sbZ+wgbzWICNfZM6rPcTrVBZ6qEjM="; + types-aiobotocore-ivschat = + buildTypesAiobotocorePackage "ivschat" "2.15.1" + "sha256-jk6zZ3zX94kIfld9oXd6zW7ILhaa01XOt7c+/5pn8kk="; - types-aiobotocore-kafka = buildTypesAiobotocorePackage "kafka" "2.13.1" - "sha256-xksZ5c/RNGUQkaLjchkngrsNFrS4MPcLp6t6RUkyeTo="; + types-aiobotocore-kafka = + buildTypesAiobotocorePackage "kafka" "2.15.1" + "sha256-NJv1QF3qBn5LJ7yhKcSmy6W3OJ8kenfzQ4RkSRx8iTo="; types-aiobotocore-kafkaconnect = - buildTypesAiobotocorePackage "kafkaconnect" "2.13.1" - "sha256-YXWl72Ai1/RMXtHIjyNgrq14Kar64OcZumCzotqI0Oo="; + buildTypesAiobotocorePackage "kafkaconnect" "2.15.1" + "sha256-7EDrF3TxDgLeAnbUeLQj7SpFPLB+uMjqc/sQxWaXYlU="; - types-aiobotocore-kendra = buildTypesAiobotocorePackage "kendra" "2.13.1" - "sha256-6SHFiSXNJGeq2FdvSW/G8adYO3CGw/IBH5Q0TLWCvfI="; + types-aiobotocore-kendra = + buildTypesAiobotocorePackage "kendra" "2.15.1" + "sha256-8k/FEmIfl2dKDt4JrCWdrLskYuj+A2VEHm0jqHWfUp8="; types-aiobotocore-kendra-ranking = - buildTypesAiobotocorePackage "kendra-ranking" "2.13.1" - "sha256-+OhqW5cU8bu5bYf6u4hcilZYfUrxaVwJCSY77MrkPXU="; + buildTypesAiobotocorePackage "kendra-ranking" "2.15.1" + "sha256-ZaDBuYlm35DRaiKv+xV2L+e/E5x1rGN59UTL2U5bRp8="; types-aiobotocore-keyspaces = - buildTypesAiobotocorePackage "keyspaces" "2.13.1" - "sha256-OYXYg9JF3cwJFvWVkvrWNSJN1VYpqBAlzxCBvNW4Z1I="; + buildTypesAiobotocorePackage "keyspaces" "2.15.1" + "sha256-UgzrxIq3vh8dfw80VCue7gf8l19TqRUmRuAS/cW/G1M="; - types-aiobotocore-kinesis = buildTypesAiobotocorePackage "kinesis" "2.13.1" - "sha256-JhGNdHtkiPvMht53v6n7wNR8/bry/zoDoqqzygMyo4g="; + types-aiobotocore-kinesis = + buildTypesAiobotocorePackage "kinesis" "2.15.1" + "sha256-MF7n5Z70BFUAXaFuTDWIzFuiZ3u1fpYoZrBfRQR97Qw="; types-aiobotocore-kinesis-video-archived-media = - buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.13.1" - "sha256-uE/3/iBMMIk2qSjLcZ9Jv26Tfpr83p12jNnZme7gWLU="; + buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.15.1" + "sha256-bEZV3TDr3l6Ogn49kFW/3IcFi/4NjQQnaC1LrDChlcI="; types-aiobotocore-kinesis-video-media = - buildTypesAiobotocorePackage "kinesis-video-media" "2.13.1" - "sha256-e1zl7BksbzYyhrNz3y+b+6g/iPmeUZkj4lgJjWFIyQY="; + buildTypesAiobotocorePackage "kinesis-video-media" "2.15.1" + "sha256-PPT89cO2FukHtnXQHgcNZie3vPCDBmbrfRDiZCZaJ1E="; types-aiobotocore-kinesis-video-signaling = - buildTypesAiobotocorePackage "kinesis-video-signaling" "2.13.1" - "sha256-2+B07qNWd1UXfVa7yeV31mBQ8d9L/5arYWTNjMaYfpQ="; + buildTypesAiobotocorePackage "kinesis-video-signaling" "2.15.1" + "sha256-Fez2At/MFggTu7ZtfKLWCm7iELH6gumBhn3t7KdJzVA="; types-aiobotocore-kinesis-video-webrtc-storage = - buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.13.1" - "sha256-f4ZEhcEKLz9tXnZ5jY2YlbBejX6H80be3GPIRbx4XxE="; + buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.15.1" + "sha256-5h9x9Rgb1Sb8wIQwRcjkonc2070QahwPkKXfQ/lFFI8="; types-aiobotocore-kinesisanalytics = - buildTypesAiobotocorePackage "kinesisanalytics" "2.13.1" - "sha256-hHR/i8xW0Qy+IG3grNl7cyzBJDfXCcAzUaOEP1wF3G0="; + buildTypesAiobotocorePackage "kinesisanalytics" "2.15.1" + "sha256-JEye+bOxLrRJDToMs5jQZ2wcHy1K/2C5oPFUIRrtO5g="; types-aiobotocore-kinesisanalyticsv2 = - buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.13.1" - "sha256-csqNXzwvVd0nMKA+52gVLt/PGik94ObuCxUrCWUfAAQ="; + buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.15.1" + "sha256-j2gcnHFfWTVD3NatfJXsp3hRVEsy4930OclgR5IPbDM="; types-aiobotocore-kinesisvideo = - buildTypesAiobotocorePackage "kinesisvideo" "2.13.1" - "sha256-O129CbGxMDABLOQca2Xb4tK76+Xm/ZdfLASp42kT/JE="; + buildTypesAiobotocorePackage "kinesisvideo" "2.15.1" + "sha256-mnKzF2lgYtHTNEwecoqs4qt9hQ5m2xLo79/kZHFyF5I="; - types-aiobotocore-kms = buildTypesAiobotocorePackage "kms" "2.13.1" - "sha256-WXaLZBIbash+K+F1RaSUGU1WnEg58DON2dgzsgUpZ0Y="; + types-aiobotocore-kms = + buildTypesAiobotocorePackage "kms" "2.15.1" + "sha256-CCyhwWkjtI7wp5CN1MCK0M//bOu4ZGttbHJSUcidjUA="; types-aiobotocore-lakeformation = - buildTypesAiobotocorePackage "lakeformation" "2.13.1" - "sha256-0951Vo8Y8hRrgveEGigll6mfG7YYSpNSXBPfzgS/4o0="; + buildTypesAiobotocorePackage "lakeformation" "2.15.1" + "sha256-+BlDjTPv+fmKmUInm6FpOQFt5H5atz7BWKhrt56A3Co="; - types-aiobotocore-lambda = buildTypesAiobotocorePackage "lambda" "2.13.1" - "sha256-7B6cg/p00awvo8rN0NKh+A1vbBer6TTAYNjIFYQAW10="; + types-aiobotocore-lambda = + buildTypesAiobotocorePackage "lambda" "2.15.1" + "sha256-hCTL2KBMt5p51YwnOYNcpGvzG2wvZjt23kK3FX4Qp5U="; types-aiobotocore-lex-models = - buildTypesAiobotocorePackage "lex-models" "2.13.1" - "sha256-mcJOptD3eqAg+C2Ghgemd6juQCklxAmeiELstnubF4g="; + buildTypesAiobotocorePackage "lex-models" "2.15.1" + "sha256-A8BAADavGEB7sa+fh9SRahoqN3mne7ABZjcnZI9YfBk="; types-aiobotocore-lex-runtime = - buildTypesAiobotocorePackage "lex-runtime" "2.13.1" - "sha256-4j0rWpj8fE+MOZ0s6kB9KTQ2KIeWBXrxfmnY8qkKXtw="; + buildTypesAiobotocorePackage "lex-runtime" "2.15.1" + "sha256-QVYHr4fbnZPozVghHOZVsyChTuP2S0Ys+876slONaEc="; types-aiobotocore-lexv2-models = - buildTypesAiobotocorePackage "lexv2-models" "2.13.1" - "sha256-mHRxhIYfxjSSEFc3AHF/wcJHt3CAEqlfH6dJC/NWLnA="; + buildTypesAiobotocorePackage "lexv2-models" "2.15.1" + "sha256-uqZrNG/mOCnfYjNF5FQofjSUeXhnidunT1754yame7E="; types-aiobotocore-lexv2-runtime = - buildTypesAiobotocorePackage "lexv2-runtime" "2.13.1" - "sha256-QfTy63MBeZpwVNOowmy9VmkMEkpy9ZVyIHyifyDTmiU="; + buildTypesAiobotocorePackage "lexv2-runtime" "2.15.1" + "sha256-hQGTDbhJNiJc5dORzg7XJ4p+ZatNcI0qoT70qtMHzHc="; types-aiobotocore-license-manager = - buildTypesAiobotocorePackage "license-manager" "2.13.1" - "sha256-S23klxiPDQkyCy4xMzxh0exywft91qwkAxDit/vUb2Y="; + buildTypesAiobotocorePackage "license-manager" "2.15.1" + "sha256-4whyQ2X/R2eMdQ7DOygNQFqMgLA+w+6ydyN8s7yxgB4="; types-aiobotocore-license-manager-linux-subscriptions = - buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.13.1" - "sha256-u2O+8yfE8goI29SUJ1lKTJ8h5KNmVFAb0Iob9RF1ZmQ="; + buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.15.1" + "sha256-uD/N/ueijWNwibOrivY0r2HiQjYOuHQUONcW3iRCVUY="; types-aiobotocore-license-manager-user-subscriptions = - buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.13.1" - "sha256-Zet0z6TYa7VPEJd8f6fOkI44hC8Ia6h3gsQ/CLokBy4="; + buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.15.1" + "sha256-wWghsiPCvWY7VX5XV0ad65nnG9bI5F+E5xEUzOGDdnY="; types-aiobotocore-lightsail = - buildTypesAiobotocorePackage "lightsail" "2.13.1" - "sha256-RozP6XcqZnOuSWlSK4C9tLm74OnzBe8n9f9mrXHQhX0="; + buildTypesAiobotocorePackage "lightsail" "2.15.1" + "sha256-dcGUPUxGvD/ZEyoo193VVOhSJhoFkgwSjpOV1kX/vMM="; - types-aiobotocore-location = buildTypesAiobotocorePackage "location" "2.13.1" - "sha256-skC7EDojgvq38MIZLBwFnMCEPcnYs3bB8nEN2Ca0Toc="; + types-aiobotocore-location = + buildTypesAiobotocorePackage "location" "2.15.1" + "sha256-4rTqmcRB3HjskWJZLbQaPDyNQGHXmVVJqb5LK+EPH6Y="; - types-aiobotocore-logs = buildTypesAiobotocorePackage "logs" "2.13.1" - "sha256-GRK5GRJBX9jn7hiXrBxTH3cyByDbfoW7Q+SxBi1tsPg="; + types-aiobotocore-logs = + buildTypesAiobotocorePackage "logs" "2.15.1" + "sha256-CRluCc0/byuRlGr3uQyWg/MfCpPnoiS5inNLiYkhwCY="; types-aiobotocore-lookoutequipment = - buildTypesAiobotocorePackage "lookoutequipment" "2.13.1" - "sha256-dokSUVIcQAXkiPjB8cL4/HNW0vwh6Qz+npRzvELA0fc="; + buildTypesAiobotocorePackage "lookoutequipment" "2.15.1" + "sha256-q5ExCn4HAdAGISDIRckrnlmQ+J1RDNgBa5hmYSJHtVc="; types-aiobotocore-lookoutmetrics = - buildTypesAiobotocorePackage "lookoutmetrics" "2.13.1" - "sha256-/CWGYa+qwyI9ULV7uAM8FXJOnP/pdiHQK1A+C2se1gw="; + buildTypesAiobotocorePackage "lookoutmetrics" "2.15.1" + "sha256-SvJor9naL/MzyTtHjOn2QMNnLYXnmHYH11DuWg0+y/U="; types-aiobotocore-lookoutvision = - buildTypesAiobotocorePackage "lookoutvision" "2.13.1" - "sha256-r5VzRqV7QHygTvRNb3Hfucr1V97U6k77SWYpz4hbSaw="; + buildTypesAiobotocorePackage "lookoutvision" "2.15.1" + "sha256-68PGFV+fSjjwAq4SoiOAaJXw1jKdQegFgz2UeHV9iL8="; - types-aiobotocore-m2 = buildTypesAiobotocorePackage "m2" "2.13.1" - "sha256-rM8R5/foSrAn6tg/mKSI33fRuZHcvvZE4gReNgMUdxo="; + types-aiobotocore-m2 = + buildTypesAiobotocorePackage "m2" "2.15.1" + "sha256-TrP432QWYmAmnka3CiWklZh3g/xrLhGJVw8iWLR5f8E="; types-aiobotocore-machinelearning = - buildTypesAiobotocorePackage "machinelearning" "2.13.1" - "sha256-DphFsB4gD/drCtzonYMi00Uf6xZDxnZMwrPe3NhghOQ="; + buildTypesAiobotocorePackage "machinelearning" "2.15.1" + "sha256-0+nIbuZeuKIhQiC2+kSaDztMLOUe9rZ+guDROGM+YI4="; - types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.7.0" - "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; + types-aiobotocore-macie = + buildTypesAiobotocorePackage "macie" "2.7.0" + "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; - types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.13.1" - "sha256-biycbIuk14p+Ith65PIqsYjjXsJJfKu3zpmSE+OzYWo="; + types-aiobotocore-macie2 = + buildTypesAiobotocorePackage "macie2" "2.15.1" + "sha256-lJq53Sxg+RpZSeQKG+nu0EhRQEEUSPoWqiORJUcoqEI="; types-aiobotocore-managedblockchain = - buildTypesAiobotocorePackage "managedblockchain" "2.13.1" - "sha256-Y0f3zLBsmV4q1CHr3EnFJEfonvl/rxlSiJv6KZRE5Io="; + buildTypesAiobotocorePackage "managedblockchain" "2.15.1" + "sha256-RZUktF80I0PXhIPEZJav1i1a4FyFSyHODTeUsIcDHGE="; types-aiobotocore-managedblockchain-query = - buildTypesAiobotocorePackage "managedblockchain-query" "2.13.1" - "sha256-eafaAWDhDSUnw/JmvlHi0h8Ozm5ZHx23cKmwLQgbouU="; + buildTypesAiobotocorePackage "managedblockchain-query" "2.15.1" + "sha256-xmPCGjlO0EThkhUWy+VlHLplAx7f7+zXKzr5hb/1e6A="; types-aiobotocore-marketplace-catalog = - buildTypesAiobotocorePackage "marketplace-catalog" "2.13.1" - "sha256-11WiQ99Eel1MZtnjQgmifvsq7teJPqhyJxC979W+Ttg="; + buildTypesAiobotocorePackage "marketplace-catalog" "2.15.1" + "sha256-OJeNrERgHfCYfgpn+DMmo7ZgUujg5G3bQpedipAxbX4="; types-aiobotocore-marketplace-entitlement = - buildTypesAiobotocorePackage "marketplace-entitlement" "2.13.1" - "sha256-LjDaNH9w+pyWsMPqa2GbRIs1kbAhNbNeFR6bOnFrSlw="; + buildTypesAiobotocorePackage "marketplace-entitlement" "2.15.1" + "sha256-0tSQ1wnz7R7KaRVsoNGeUcbmf4cRBrUMArCEEDJRrtc="; types-aiobotocore-marketplacecommerceanalytics = - buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.13.1" - "sha256-kIl2+04Iev+BLFrW0HsvQFac2qB6u/hTlkT+To65bl4="; + buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.15.1" + "sha256-gq//bvGswyJgLHypO0vC0rUruMvr5DH0TQPgxb6Xkrc="; types-aiobotocore-mediaconnect = - buildTypesAiobotocorePackage "mediaconnect" "2.13.1" - "sha256-Aou0aqeTNsykokkuUGn8KJ+5+pIqcTFHnCc4yNbLsiU="; + buildTypesAiobotocorePackage "mediaconnect" "2.15.1" + "sha256-E0hjBGm+mIW0wG8kdLAhXc4BzMzJK4gESiyS2xVIEpU="; types-aiobotocore-mediaconvert = - buildTypesAiobotocorePackage "mediaconvert" "2.13.1" - "sha256-CGKpFDh5+MXhGF8yfZlsUDOW1bLnQ4E6W/PyAexYtF8="; + buildTypesAiobotocorePackage "mediaconvert" "2.15.1" + "sha256-bHWlDRHqZ6vYcsM01peSdcQ5oqvSGiG/UHWlOinT1QQ="; types-aiobotocore-medialive = - buildTypesAiobotocorePackage "medialive" "2.13.1" - "sha256-dhicdKLUuAFUHNihBeyME4Im1rtaAn/jECoA0Vartj8="; + buildTypesAiobotocorePackage "medialive" "2.15.1" + "sha256-PrQPNUQI065kb8+ihArJOroydrAbOhFdS2yzq55nTKw="; types-aiobotocore-mediapackage = - buildTypesAiobotocorePackage "mediapackage" "2.13.1" - "sha256-7ho2qJjBNWqcJ2qdvTCFUbc2R8CZRuzjyH7tkHv8ZlI="; + buildTypesAiobotocorePackage "mediapackage" "2.15.1" + "sha256-2/pUMsZsuW44TpNCdtciCJ9z+Z7aREyBMBIFdV80lgU="; types-aiobotocore-mediapackage-vod = - buildTypesAiobotocorePackage "mediapackage-vod" "2.13.1" - "sha256-O5Gk5Ok0wWHYsP/6IrPL/8tkh1teCDmBoeph4eYOpnw="; + buildTypesAiobotocorePackage "mediapackage-vod" "2.15.1" + "sha256-QIaQ06qrpPa4nb7PgOyhbYH1Oz1KL1dwwy6/D60tgKk="; types-aiobotocore-mediapackagev2 = - buildTypesAiobotocorePackage "mediapackagev2" "2.13.1" - "sha256-ik87A7P4Oro/Fy/gz/KQJsPubsun9ZMlEP5Y/xHGM2w="; + buildTypesAiobotocorePackage "mediapackagev2" "2.15.1" + "sha256-+YxeyUt3GqsliHI/T8ZMxfweAhnAXWHLxBZSNbmPVDg="; types-aiobotocore-mediastore = - buildTypesAiobotocorePackage "mediastore" "2.13.1" - "sha256-v1JAKOy99C2H7k2vkE3SdM/BRjoBpEm0pHRSoxwyGKM="; + buildTypesAiobotocorePackage "mediastore" "2.15.1" + "sha256-09o+YQysUdNGoNT+IXaPIOCSHUxYFXezjxTvqPPWBNo="; types-aiobotocore-mediastore-data = - buildTypesAiobotocorePackage "mediastore-data" "2.13.1" - "sha256-7HAibOEHV2DOsLNmd5sjXePOnGiX7sQClwiD1IMAS5Q="; + buildTypesAiobotocorePackage "mediastore-data" "2.15.1" + "sha256-yDovPCnikCe4qHPCyZPZEu7UlIHLW59EySO3xValmgw="; types-aiobotocore-mediatailor = - buildTypesAiobotocorePackage "mediatailor" "2.13.1" - "sha256-Ymg6jpoBQDcy/VEaLEluYII/817DcK69uii9EHmjX1A="; + buildTypesAiobotocorePackage "mediatailor" "2.15.1" + "sha256-BnrpdnphOkjk9D3MuhMEEBFL08NZE140o4+VR1Rp4O4="; types-aiobotocore-medical-imaging = - buildTypesAiobotocorePackage "medical-imaging" "2.13.1" - "sha256-OzNc5eyipNPA0TFajfpXFa6kXj7tNupoe7p2EeDFygM="; + buildTypesAiobotocorePackage "medical-imaging" "2.15.1" + "sha256-6ona+KE489SPJSlokzwpiqERuBgWjqIYofh1rUmeKwo="; - types-aiobotocore-memorydb = buildTypesAiobotocorePackage "memorydb" "2.13.1" - "sha256-GvcEWHpCR0J1ftCbH4rK3JJcG5KtRtvTm5YSEEn6gjg="; + types-aiobotocore-memorydb = + buildTypesAiobotocorePackage "memorydb" "2.15.1" + "sha256-lYBb737JcKQa5cKm94O1C/psjuRNFFNftn3dctUeOnQ="; types-aiobotocore-meteringmarketplace = - buildTypesAiobotocorePackage "meteringmarketplace" "2.13.1" - "sha256-TNg2yvdEcBSJ9U1nsc+ihWodc//IPdOJ9miMZDYC05U="; + buildTypesAiobotocorePackage "meteringmarketplace" "2.15.1" + "sha256-9Z5s03sTVEzzXO43CTuf+YICuXisAZ/OGFyH44KOuF8="; - types-aiobotocore-mgh = buildTypesAiobotocorePackage "mgh" "2.13.1" - "sha256-t5owrAOVv4cMsUKbrT/QDd66pdz3LrWm0DcJ0g/fxVo="; + types-aiobotocore-mgh = + buildTypesAiobotocorePackage "mgh" "2.15.1" + "sha256-Oqi4SM+L1FQLs0jfyWXILG/XHs5X5K+5jvGcIr76OeY="; - types-aiobotocore-mgn = buildTypesAiobotocorePackage "mgn" "2.13.1" - "sha256-xsAWfONvXq6x0BHSQkH+L2ikANbsq8+RNWV4iPhq94Y="; + types-aiobotocore-mgn = + buildTypesAiobotocorePackage "mgn" "2.15.1" + "sha256-RqvU6K50yGzVQBSzS90htrFOScpondnyceN3ISshYlI="; types-aiobotocore-migration-hub-refactor-spaces = - buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.13.1" - "sha256-PDpmWUxroS2y8Kh3aasITL4w+7XGcwEZ3nJL+ffCRKQ="; + buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.15.1" + "sha256-j4LVmlaI8tuJxjkweiZRWgnYlR5p/M2u8JSkMg3Yufs="; types-aiobotocore-migrationhub-config = - buildTypesAiobotocorePackage "migrationhub-config" "2.13.1" - "sha256-pdT8i6eGekkTPAa87cibkSyjw6KyI482jOhkfFqiyRs="; + buildTypesAiobotocorePackage "migrationhub-config" "2.15.1" + "sha256-yQDw0I8jlsVpL8MSerOV66yRdCE5ik7R/v+rkBAzKrk="; types-aiobotocore-migrationhuborchestrator = - buildTypesAiobotocorePackage "migrationhuborchestrator" "2.13.1" - "sha256-AA25qAEWLaQBQ+1hJKoRrGax4f23CGSGoMpvdaym2xo="; + buildTypesAiobotocorePackage "migrationhuborchestrator" "2.15.1" + "sha256-2XxADXGruMbzM50bElDkwlKQZ/r+6HPhMOjj8InGOlM="; types-aiobotocore-migrationhubstrategy = - buildTypesAiobotocorePackage "migrationhubstrategy" "2.13.1" - "sha256-CEqR0phDFZUtMH+JJqjbxLwHIC8ReiFTYG9MKFZajbE="; + buildTypesAiobotocorePackage "migrationhubstrategy" "2.15.1" + "sha256-+VYnuMVf16mrgMJ5DMqdy6CPLGavuA0gUW1kv9Uu9rs="; - types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.13.1" - "sha256-OBWSp6n3xpuAdWEP1DB+LoSd/Ds6tWSzMgC0fIYepPs="; + types-aiobotocore-mobile = + buildTypesAiobotocorePackage "mobile" "2.13.2" + "sha256-OxB91BCAmYnY72JBWZaBlEkpAxN2Q5aY4i1Pt3eD9hc="; - types-aiobotocore-mq = buildTypesAiobotocorePackage "mq" "2.13.1" - "sha256-xv2s3Ek2KvWUzDrOPWOpXC/kLC+VGhzQBihimhFZelY="; + types-aiobotocore-mq = + buildTypesAiobotocorePackage "mq" "2.15.1" + "sha256-2WEJoWXSfDmFl9liWtIaviLnAHgRA5dAamQx1YfXgzE="; - types-aiobotocore-mturk = buildTypesAiobotocorePackage "mturk" "2.13.1" - "sha256-a1f/szq1zAskaf+28hpcxz9d5S5mYteZUo9TksnTAok="; + types-aiobotocore-mturk = + buildTypesAiobotocorePackage "mturk" "2.15.1" + "sha256-TK9wWp3GEHhn4jypBdQEeJZp31IvKFFTuSLKxqxZoNU="; - types-aiobotocore-mwaa = buildTypesAiobotocorePackage "mwaa" "2.13.1" - "sha256-vUQSThUV6hGv4gsNMp+HC0thbxGf9j7XjWECUULJYT4="; + types-aiobotocore-mwaa = + buildTypesAiobotocorePackage "mwaa" "2.15.1" + "sha256-E1sWcLfHIlFelP3vb0yfhRpcyboyIutPrF3ByCNJITQ="; - types-aiobotocore-neptune = buildTypesAiobotocorePackage "neptune" "2.13.1" - "sha256-du5vrwZMa/1UkKImJ2AM1FYAsdZlvmHwB+jWvf9IPHA="; + types-aiobotocore-neptune = + buildTypesAiobotocorePackage "neptune" "2.15.1" + "sha256-EtmxI6j5SlZZcv+YYsDki6VcMdRhZWEoJVT5VDFV/0g="; types-aiobotocore-network-firewall = - buildTypesAiobotocorePackage "network-firewall" "2.13.1" - "sha256-NZT7U3kF9He4+MhlKU/CDzt0Q6wW2dBIsGqXqQ1ne0o="; + buildTypesAiobotocorePackage "network-firewall" "2.15.1" + "sha256-xiDYqvt2e7MiAe8nCQR51q5Ov8B94eYJhQgN+lvFDuA="; types-aiobotocore-networkmanager = - buildTypesAiobotocorePackage "networkmanager" "2.13.1" - "sha256-xxcaP5s5vDReUEVQxis/4Kz+7e8UPXt0Mp4Uu9yLVXA="; + buildTypesAiobotocorePackage "networkmanager" "2.15.1" + "sha256-0SFOWAIckxRoWupRztC50CkOKqtUuxdNnM44SnPLYwQ="; - types-aiobotocore-nimble = buildTypesAiobotocorePackage "nimble" "2.13.1" - "sha256-uLVJekBSmrJ1KjR1yXK4I97S1iAWiNobiShDBujRmmw="; + types-aiobotocore-nimble = + buildTypesAiobotocorePackage "nimble" "2.15.1" + "sha256-Hz6tsIdCcx5vzwD0PDmPKSpjqYEYENAiZz7WuZC9Ago="; - types-aiobotocore-oam = buildTypesAiobotocorePackage "oam" "2.13.1" - "sha256-thtnloGS4BEg5bdnEc4dIOZ/rAaojWQlQ+Nso5E1uks="; + types-aiobotocore-oam = + buildTypesAiobotocorePackage "oam" "2.15.1" + "sha256-abqiY/pGLnV7UzoojcX5aaUtKC//y5UFYG8XoS9hJgM="; - types-aiobotocore-omics = buildTypesAiobotocorePackage "omics" "2.13.1" - "sha256-Ak4nOBS8PlchtSZ7u2WdcvqcPS8CHx2gkb1IeE7CO78="; + types-aiobotocore-omics = + buildTypesAiobotocorePackage "omics" "2.15.1" + "sha256-5k0LPHH0qUlEEAV6ASredhR65Phs0133c37N+YB+tcY="; types-aiobotocore-opensearch = - buildTypesAiobotocorePackage "opensearch" "2.13.1" - "sha256-lrX9vNiaXekBoqBCUwiRcGrFOj98eAw+1VdtM/VrFvM="; + buildTypesAiobotocorePackage "opensearch" "2.15.1" + "sha256-4VqaoYwKkNckmb4BZDbWPLeEVa7tCxBD8g6pGQrr0Ng="; types-aiobotocore-opensearchserverless = - buildTypesAiobotocorePackage "opensearchserverless" "2.13.1" - "sha256-gYTMzWB1EpskiLA+CQvShpCnvJ7PM5x65NavdsksrJg="; + buildTypesAiobotocorePackage "opensearchserverless" "2.15.1" + "sha256-80E81Kv3FzkgGQvpVHxmYqnNIRtureOvIDmKdnUo7z4="; - types-aiobotocore-opsworks = buildTypesAiobotocorePackage "opsworks" "2.13.1" - "sha256-BqudWGmHb0LhamtuuKnKf7S7aXIrQQUo0jcdAch1Kl0="; + types-aiobotocore-opsworks = + buildTypesAiobotocorePackage "opsworks" "2.15.1" + "sha256-bAAgU0b33CNXVK0Q9ynyPGbL5KBiQq6sT/mL1pWJpD0="; types-aiobotocore-opsworkscm = - buildTypesAiobotocorePackage "opsworkscm" "2.13.1" - "sha256-e90/qTD/BfUnlJPwZS3VvUR5MA58qZ8Dz40emRzeqQ8="; + buildTypesAiobotocorePackage "opsworkscm" "2.15.1" + "sha256-nVywDMlzkITUEW7K6FWoYz953wAqCiUemT0tu48yO6M="; types-aiobotocore-organizations = - buildTypesAiobotocorePackage "organizations" "2.13.1" - "sha256-rSxR2YdgwNIPAVreMalDA2CBwAjFqmjV9vpeuzexGKM="; + buildTypesAiobotocorePackage "organizations" "2.15.1" + "sha256-N7VzNLh+LCFrfdgmO982cau3B/d5uGoGO43vMMpTNBs="; - types-aiobotocore-osis = buildTypesAiobotocorePackage "osis" "2.13.1" - "sha256-pjnHLL/OY2Z30DbB/dG+EmQmw26mpMNLJRiVu75zhhE="; + types-aiobotocore-osis = + buildTypesAiobotocorePackage "osis" "2.15.1" + "sha256-NpjX3LpbF1CajlqY9ow4GqCVjlrTBVT1U/Gn3wHSQTE="; - types-aiobotocore-outposts = buildTypesAiobotocorePackage "outposts" "2.13.1" - "sha256-+gsLaRbZBueYif1UC90Ig6gPYTR3OIn7SAoiROg+CQA="; + types-aiobotocore-outposts = + buildTypesAiobotocorePackage "outposts" "2.15.1" + "sha256-lFRMsg9LhjizD8NsSyK209h+xtvYgTmJf5lc3OQyqdY="; - types-aiobotocore-panorama = buildTypesAiobotocorePackage "panorama" "2.13.1" - "sha256-mCpsk5JMKBf44kTImSSK7tUd+VOXRDAwsT3DdOAoW2U="; + types-aiobotocore-panorama = + buildTypesAiobotocorePackage "panorama" "2.15.1" + "sha256-mdhrS+4Cg2VgH5AWroB2i5Pe6LEFfn9J9rEe+UQovxQ="; types-aiobotocore-payment-cryptography = - buildTypesAiobotocorePackage "payment-cryptography" "2.13.1" - "sha256-JnT1V2QCppuYsl8s2UHGHSowVWubTLj54sgV3/D3JkY="; + buildTypesAiobotocorePackage "payment-cryptography" "2.15.1" + "sha256-Lddnm936PSivXBygA44rgyd5wyPoPDns5XIYbQfQ91g="; types-aiobotocore-payment-cryptography-data = - buildTypesAiobotocorePackage "payment-cryptography-data" "2.13.1" - "sha256-tTib8+P2WYf02iYlek/yp0miVOa1aIhEG2+vHeB1gik="; + buildTypesAiobotocorePackage "payment-cryptography-data" "2.15.1" + "sha256-jTgsyYOLrTYNEfyhotGbbTrlQkTKqmd/0uKOMvmm06U="; types-aiobotocore-personalize = - buildTypesAiobotocorePackage "personalize" "2.13.1" - "sha256-uNKKj6WvtZStJJhsetQhvPIMpLHrnlEyO+JYYIztNnc="; + buildTypesAiobotocorePackage "personalize" "2.15.1" + "sha256-RULc20Hv5VUT+MO1/hj+LlsdL88c1KuChWjzYY150Xs="; types-aiobotocore-personalize-events = - buildTypesAiobotocorePackage "personalize-events" "2.13.1" - "sha256-8M6LEacfNmx7o5wCInAKhwzABh8EJ0yQovDsE5cuJFo="; + buildTypesAiobotocorePackage "personalize-events" "2.15.1" + "sha256-3gl7NVGwfh1jy8VewE76+Pe/cPKQitdnC3JAau1S9dE="; types-aiobotocore-personalize-runtime = - buildTypesAiobotocorePackage "personalize-runtime" "2.13.1" - "sha256-AxfHzSWpYq0bz3VXJ+8z0b8K55dTGGzs09S83tPYLEw="; + buildTypesAiobotocorePackage "personalize-runtime" "2.15.1" + "sha256-XnuLw62YOZN+EwJ6b1ZQCOwhIqzE8ntkrgmuqTY62vw="; - types-aiobotocore-pi = buildTypesAiobotocorePackage "pi" "2.13.1" - "sha256-N6aLsYFKnrACA/ia6EjiBxQXhp7Pi2TcUUfTaGukoOc="; + types-aiobotocore-pi = + buildTypesAiobotocorePackage "pi" "2.15.1" + "sha256-g8pzgnV5puJSLogXJrQn1zhYiOB7446R4xkxOQCwqSY="; - types-aiobotocore-pinpoint = buildTypesAiobotocorePackage "pinpoint" "2.13.1" - "sha256-w3Z9eEu6Ty+yOxvKDyLfwqT7hZLEh7szwXX2ciHYYoY="; + types-aiobotocore-pinpoint = + buildTypesAiobotocorePackage "pinpoint" "2.15.1" + "sha256-gZJM4c3tSilImlxeKWU3szTmpnXxpS6kAvF/zKXglFQ="; types-aiobotocore-pinpoint-email = - buildTypesAiobotocorePackage "pinpoint-email" "2.13.1" - "sha256-KnfpYd7H1e4ftRz8KubCVTqtjASurWkK2Qxfpq2z6hU="; + buildTypesAiobotocorePackage "pinpoint-email" "2.15.1" + "sha256-eXcDiAQjLAObgX3gfGtlVL6BNK8fq81f70tPNNcKJJ8="; types-aiobotocore-pinpoint-sms-voice = - buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.13.1" - "sha256-yXiitAUhSJXi4sx/EgKfa3kZ/RWgVnAuA6ieZ2Z1w7Q="; + buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.15.1" + "sha256-OPJiALIiUDioRjXkeLtksPBMlmsUpIRsZtuoTESnKpU="; types-aiobotocore-pinpoint-sms-voice-v2 = - buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.13.1" - "sha256-kaQJUyXlPVDTa7ay30X+MCCexF2ZHYodsgI5Bp1J16g="; + buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.15.1" + "sha256-SN3dXMpqcuJcWnpeUi4Jwtat9erU0KdSjfEbyf8pHXc="; - types-aiobotocore-pipes = buildTypesAiobotocorePackage "pipes" "2.13.1" - "sha256-4BUUZPTbKpbWMCUNH3Mamg0rREiiHt2qic+XVHDKq+4="; + types-aiobotocore-pipes = + buildTypesAiobotocorePackage "pipes" "2.15.1" + "sha256-Ru3j6tm6I+wtpKzkxBSFCfAleI52WnOSqgvlCIla9fE="; - types-aiobotocore-polly = buildTypesAiobotocorePackage "polly" "2.13.1" - "sha256-jve+PnNP4cmyBWeSxM6G349DbymY7kCE1sfbpDjDTGM="; + types-aiobotocore-polly = + buildTypesAiobotocorePackage "polly" "2.15.1" + "sha256-U9FwTzLVdE0UbAMTjMjrIMlRVlkuQRzKiIEd7ZepOWA="; - types-aiobotocore-pricing = buildTypesAiobotocorePackage "pricing" "2.13.1" - "sha256-gT+aYlKxQm0sXB1iPC59x7rzNmHk9V/CJokpKtmnHaE="; + types-aiobotocore-pricing = + buildTypesAiobotocorePackage "pricing" "2.15.1" + "sha256-FEzR+YjEGFKWbihsat2gaDp87fdIPDCmeRv79U08fFo="; types-aiobotocore-privatenetworks = - buildTypesAiobotocorePackage "privatenetworks" "2.13.1" - "sha256-xvb+RgzOJFN35as+bWNFf5WvYRpbr+qmhLQHV15aUQI="; + buildTypesAiobotocorePackage "privatenetworks" "2.15.1" + "sha256-7OB4PIbZDsnXqLp+9cXd5ER5QIkUpjtJk+A+jT0286Y="; - types-aiobotocore-proton = buildTypesAiobotocorePackage "proton" "2.13.1" - "sha256-zxAn9a/jagk+QDoAtTqw+0E/qGPAHSrWGJzDIwE4mz4="; + types-aiobotocore-proton = + buildTypesAiobotocorePackage "proton" "2.15.1" + "sha256-MBUaIQIThP+JZHbVAU5r0yCHQs13wLAU87y1gRECFHU="; - types-aiobotocore-qldb = buildTypesAiobotocorePackage "qldb" "2.13.1" - "sha256-NQcylhXkGqADCiagW4KNL5PEeGB0dT+ggRjPQSfpyQY="; + types-aiobotocore-qldb = + buildTypesAiobotocorePackage "qldb" "2.15.1" + "sha256-yES1WELzrI3Xz0F4S7y3NajtNTQO10S3hi+pQsZ4KVE="; types-aiobotocore-qldb-session = - buildTypesAiobotocorePackage "qldb-session" "2.13.1" - "sha256-SAkisanmZM1N2XnKE5quH6HkMugkggEjQbJ1+kq9MGQ="; + buildTypesAiobotocorePackage "qldb-session" "2.15.1" + "sha256-ISAoyu08TEXIr2VONRLIvRDaAOazDPEtPp66/CnmHv8="; types-aiobotocore-quicksight = - buildTypesAiobotocorePackage "quicksight" "2.13.1" - "sha256-YOz+MKPoF+NoicK1bbVyNePbvuk4IsauXofTtA7jzhA="; + buildTypesAiobotocorePackage "quicksight" "2.15.1" + "sha256-eruqWUL7Yje7OJlV1arhKInqnXChEmI49nq75j4ZOrg="; - types-aiobotocore-ram = buildTypesAiobotocorePackage "ram" "2.13.1" - "sha256-TOxkThUwnulFpdyMFeZB2SjmY0fMDSLkVh15zDEhuLw="; + types-aiobotocore-ram = + buildTypesAiobotocorePackage "ram" "2.15.1" + "sha256-/7+C/b51gkVW8QXyXg/5b1vzvTtZXS5ts9K6PWXAZU4="; - types-aiobotocore-rbin = buildTypesAiobotocorePackage "rbin" "2.13.1" - "sha256-LVYmvDjYKBHumG3jjk1NrDSwhZXF/+9QCbKA62lAodU="; + types-aiobotocore-rbin = + buildTypesAiobotocorePackage "rbin" "2.15.1" + "sha256-/joJicKfFNQhy24zZp6vM/EmGZGBTwPTQ8w8KHv6CF0="; - types-aiobotocore-rds = buildTypesAiobotocorePackage "rds" "2.13.1" - "sha256-RnEkNwOuI6m0ySLqL8pUzy2DeLsjYfN5EdtlPA7nQBw="; + types-aiobotocore-rds = + buildTypesAiobotocorePackage "rds" "2.15.1" + "sha256-btYigxx5bnWll5u0IHDVpciY4ZV9dOxPDKReEv1i0AM="; - types-aiobotocore-rds-data = buildTypesAiobotocorePackage "rds-data" "2.13.1" - "sha256-PU2usWylU13a3I/GBmymLqt2ViDvMacfS++cPnhwxKo="; + types-aiobotocore-rds-data = + buildTypesAiobotocorePackage "rds-data" "2.15.1" + "sha256-Kn4uM9F1UkiWGshjX62WD5qROnnTw6TgG4bPv9EWz4A="; - types-aiobotocore-redshift = buildTypesAiobotocorePackage "redshift" "2.13.1" - "sha256-CXWyK8HJZx3YIBID2vy0xB8kjnOBONij8fWlCuYVZHg="; + types-aiobotocore-redshift = + buildTypesAiobotocorePackage "redshift" "2.15.1" + "sha256-cOu5LEVvs1VdXyfgtM7PYzIUsNN1l//gHTiY0ArmFf0="; types-aiobotocore-redshift-data = - buildTypesAiobotocorePackage "redshift-data" "2.13.1" - "sha256-u3ghdTZxEWdjhQVmdv5a/7XUNQcG7NByxzllB4oD89U="; + buildTypesAiobotocorePackage "redshift-data" "2.15.1" + "sha256-9A4p2lohJEhOcL868mMJcmmjYSS8Gd/5ShbkvTunDQs="; types-aiobotocore-redshift-serverless = - buildTypesAiobotocorePackage "redshift-serverless" "2.13.1" - "sha256-jMnGJ2mri3hzQnOGigTejZVSuElPpacPiTJLp81M148="; + buildTypesAiobotocorePackage "redshift-serverless" "2.15.1" + "sha256-s+maghPzS18nSG+ozOp/hKQJRHZHwPhsASqUXaOs6Pk="; types-aiobotocore-rekognition = - buildTypesAiobotocorePackage "rekognition" "2.13.1" - "sha256-eQJWy1kiCd6Ke/vKMVdNDvPitw4rqVtMvmhYPqcZXpA="; + buildTypesAiobotocorePackage "rekognition" "2.15.1" + "sha256-aLCYGd8+LIgHxsR8Qr+rrruL5JERkn1etCL3o/A8sZw="; types-aiobotocore-resiliencehub = - buildTypesAiobotocorePackage "resiliencehub" "2.13.1" - "sha256-09BtkNGhgwjuMaIpc/O+oMQT23mJ+uXrYojcMTt8HYg="; + buildTypesAiobotocorePackage "resiliencehub" "2.15.1" + "sha256-e8WN5g/vbWaYSNMZS43GOkdx6AFL15cPUvZn0Ufsvqk="; types-aiobotocore-resource-explorer-2 = - buildTypesAiobotocorePackage "resource-explorer-2" "2.13.1" - "sha256-ujnFPsH+IR+XUr2LMRpGw+Ej9ASQjXDJH3nUYN31OHc="; + buildTypesAiobotocorePackage "resource-explorer-2" "2.15.1" + "sha256-/WiO9zp/YK8+2p97cbY5GwQcb1XB5i86QBlXERTDxk8="; types-aiobotocore-resource-groups = - buildTypesAiobotocorePackage "resource-groups" "2.13.1" - "sha256-IV05dhVccTKTINbgZevIWBX/4BSlTs6UoQaz/sNttCY="; + buildTypesAiobotocorePackage "resource-groups" "2.15.1" + "sha256-hGUdTC5ksWqneEqIROSc3XqYANVrtL2caM+OqTVnlcw="; types-aiobotocore-resourcegroupstaggingapi = - buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.13.1" - "sha256-j67iuVzyZq6Ps14uQV100KVuHgJ4bW6bE3pDVktDVUU="; + buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.15.1" + "sha256-zJvPU3lXoxxw1LF0HkPTfO7d62Q0mTCuqGKQT/8LbPQ="; types-aiobotocore-robomaker = - buildTypesAiobotocorePackage "robomaker" "2.13.1" - "sha256-zc1mEMFn0FcjxMjvRib8UrUMUX1Jp2bAN7+qeOsPe7o="; + buildTypesAiobotocorePackage "robomaker" "2.15.1" + "sha256-X1hQ7pzhlsD9AcD2JdM/1u9W8PGRFnJaWhArHhZLPrk="; types-aiobotocore-rolesanywhere = - buildTypesAiobotocorePackage "rolesanywhere" "2.13.1" - "sha256-98F7KmVtYoS4LK7q8J29PYBAXTTz1Uaac4mBkqflYt0="; + buildTypesAiobotocorePackage "rolesanywhere" "2.15.1" + "sha256-VjjHrGv8GuQ+4Fd8meBih98YxFpVChvusBZDKJ7jvAA="; - types-aiobotocore-route53 = buildTypesAiobotocorePackage "route53" "2.13.1" - "sha256-s9UDZkNyY52aQZS0MNV9g1GMJBGaGNozRLx15Jmuhps="; + types-aiobotocore-route53 = + buildTypesAiobotocorePackage "route53" "2.15.1" + "sha256-p1N0+9s+QDRoSkgiRtsmyGrxmse405CDwuPW10r2TFY="; types-aiobotocore-route53-recovery-cluster = - buildTypesAiobotocorePackage "route53-recovery-cluster" "2.13.1" - "sha256-mFpBl/GVTFOkU7YkrfIVUfzWhhgetmI6UkRj66LeDzg="; + buildTypesAiobotocorePackage "route53-recovery-cluster" "2.15.1" + "sha256-L27J6hqxLMwxm8r2DK3xc7LrtNOgt5HSBE/YsjqH9c8="; types-aiobotocore-route53-recovery-control-config = - buildTypesAiobotocorePackage "route53-recovery-control-config" "2.13.1" - "sha256-awmCwODj+26VDh05ObLDIsqWCARBMJxR9ug/GLBWnWA="; + buildTypesAiobotocorePackage "route53-recovery-control-config" "2.15.1" + "sha256-njXhqJ+7xnxabYnNqknXA67I2J88jxHk9oErziic1FU="; types-aiobotocore-route53-recovery-readiness = - buildTypesAiobotocorePackage "route53-recovery-readiness" "2.13.1" - "sha256-3lCdo3P9ma3lmJgHdhBE9M117NUjDecGCACj7hQB3e0="; + buildTypesAiobotocorePackage "route53-recovery-readiness" "2.15.1" + "sha256-U0jzrXqfz/X/Dg1S03/is/xkQwIO9ICwg5s/YYImBf4="; types-aiobotocore-route53domains = - buildTypesAiobotocorePackage "route53domains" "2.13.1" - "sha256-cgqvHKBkj/spPFVTL19oWRiYubLDmtspXBek8JN7Xig="; + buildTypesAiobotocorePackage "route53domains" "2.15.1" + "sha256-PL1oQYboRsEDlCACZ/f+WORfaj/3pv05XyyZf118cl0="; types-aiobotocore-route53resolver = - buildTypesAiobotocorePackage "route53resolver" "2.13.1" - "sha256-2zHZi66843jrAwXotc59HHbY160whGKMpiUCpo589Qg="; + buildTypesAiobotocorePackage "route53resolver" "2.15.1" + "sha256-P4Iq5h9zo7y0UIcwLml8cCjjP5wKgtxP2EX3KTVPobw="; - types-aiobotocore-rum = buildTypesAiobotocorePackage "rum" "2.13.1" - "sha256-rFmOs1OOYWF1+vUIsuaZ9VcqYVNVPFZgKKBwpkedi50="; + types-aiobotocore-rum = + buildTypesAiobotocorePackage "rum" "2.15.1" + "sha256-3WO3zTqIDqRR+bkAdsEg8KxruV43uUKGV86c+7jAKgw="; - types-aiobotocore-s3 = buildTypesAiobotocorePackage "s3" "2.13.1" - "sha256-YUnUEu+lR236JG98JscIVjdHEaSiIRkDpbiCbh/6XUY="; + types-aiobotocore-s3 = + buildTypesAiobotocorePackage "s3" "2.15.1" + "sha256-nm1iUImUWba9BNV0JUKC1uYWxiFTKLCw3vUBsuqd188="; types-aiobotocore-s3control = - buildTypesAiobotocorePackage "s3control" "2.13.1" - "sha256-Sqrr0hJgjPEUjkuatFhREo1u5Nm5dW9Qi+tZXKexvK4="; + buildTypesAiobotocorePackage "s3control" "2.15.1" + "sha256-VDIAA8d4/zv5pI1frk6tFZJ9qWtC29b9rZdIYN0YYLA="; types-aiobotocore-s3outposts = - buildTypesAiobotocorePackage "s3outposts" "2.13.1" - "sha256-rTQbNJbMUyP06qm+LTTZ/ivPxnyEu84vNGNR3fo61u8="; + buildTypesAiobotocorePackage "s3outposts" "2.15.1" + "sha256-3IyAJHmya+ycc0do6H4NZnhn3Duhj/ITiW+b90x7d8o="; types-aiobotocore-sagemaker = - buildTypesAiobotocorePackage "sagemaker" "2.13.1" - "sha256-6jnWrBqSQdp/GaCxNh7FjIEJbcNiBNik8cxgVr9kPEA="; + buildTypesAiobotocorePackage "sagemaker" "2.15.1" + "sha256-kwB5VOix83ehKTJ6cXvR5aHO5ogYQvg3+CAnWEFll1k="; types-aiobotocore-sagemaker-a2i-runtime = - buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.13.1" - "sha256-73hItZdNaqCpN6M6IOfN8YFVbPBGwv3D5VkmWxgr650="; + buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.15.1" + "sha256-qGMnLC7fZA+OEwZNbfCQMJFiwO0mf/1chvMFi0CpIco="; types-aiobotocore-sagemaker-edge = - buildTypesAiobotocorePackage "sagemaker-edge" "2.13.1" - "sha256-2GE6RCGoc1loaJ5rJfNCj+BRtZqLTLe9csSCA5jHIB4="; + buildTypesAiobotocorePackage "sagemaker-edge" "2.15.1" + "sha256-oDvjSp0rQFBDclkyLifawL/hobIcT3RuNXS3IuJmG+4="; types-aiobotocore-sagemaker-featurestore-runtime = - buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.13.1" - "sha256-S/Hof7uG0BMFmPVVviUkMBEbpV8QjXbsbpfpIz7BSUw="; + buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.15.1" + "sha256-ynKSN7dB42JJw6DQOpLjwZXSrNvIgqfYrlEaXKE+agw="; types-aiobotocore-sagemaker-geospatial = - buildTypesAiobotocorePackage "sagemaker-geospatial" "2.13.1" - "sha256-2WWplzOpmcjwhOkmrjX1a80IlCwsA5tfla9jqS+9zPM="; + buildTypesAiobotocorePackage "sagemaker-geospatial" "2.15.1" + "sha256-GW0b2GWrahRsWM9p/sS896CLotC4NlHC+Tyya4AbANs="; types-aiobotocore-sagemaker-metrics = - buildTypesAiobotocorePackage "sagemaker-metrics" "2.13.1" - "sha256-PHF1mdrFHGQTopPgPvEl+cekfs5eCuUbcPRHW5U2aCU="; + buildTypesAiobotocorePackage "sagemaker-metrics" "2.15.1" + "sha256-xT0K4NB2r9ajVEDgTr8tAPtUQLVwZj4/q/9lFxNoRy4="; types-aiobotocore-sagemaker-runtime = - buildTypesAiobotocorePackage "sagemaker-runtime" "2.13.1" - "sha256-hPHBgjvUsCY+eSRkpGzEwLkJ+jrn+cen6r9b7PtNgBc="; + buildTypesAiobotocorePackage "sagemaker-runtime" "2.15.1" + "sha256-EKfd1G+A7T5A/7h+ZfWm+feD7VCEUU+RohAM8804Th8="; types-aiobotocore-savingsplans = - buildTypesAiobotocorePackage "savingsplans" "2.13.1" - "sha256-3YmkCihwnizc15LPScXdvJ2aDQn10ZbQ7Fqvy4OMDlY="; + buildTypesAiobotocorePackage "savingsplans" "2.15.1" + "sha256-fpMpgVdydbNYhse3LemZWeu6pvLuXWYy7Nt3+CSedl0="; types-aiobotocore-scheduler = - buildTypesAiobotocorePackage "scheduler" "2.13.1" - "sha256-qHeotLVmL5kJZXA+moqVgxbDg4WyF3MJ/bxX6l7ypcM="; + buildTypesAiobotocorePackage "scheduler" "2.15.1" + "sha256-786gr8xrz39LVOuU0EYtyBhUxDbo3YEH5UXzmY4+xSo="; - types-aiobotocore-schemas = buildTypesAiobotocorePackage "schemas" "2.13.1" - "sha256-vJg4UFhLHg5464oB9cXl2Ls/rVDg5BQ82CYtTEzpcyA="; + types-aiobotocore-schemas = + buildTypesAiobotocorePackage "schemas" "2.15.1" + "sha256-JUC3Sa94XRotK9rTelvMVG4TUQyrnVQ9Mdd+byd4A3w="; - types-aiobotocore-sdb = buildTypesAiobotocorePackage "sdb" "2.13.1" - "sha256-eb/6qwofizpmfQdYDRdbu4MAMdsXJk+e8Aoo9zhWDFc="; + types-aiobotocore-sdb = + buildTypesAiobotocorePackage "sdb" "2.15.1" + "sha256-EV0eNjxdjT/JNuTip75SuCVDZfvQz71UbIgUHWfbakc="; types-aiobotocore-secretsmanager = - buildTypesAiobotocorePackage "secretsmanager" "2.13.1" - "sha256-ydSlw+KitEn8QaGz0NnYljZGX7uYspum136Qvu8PGVs="; + buildTypesAiobotocorePackage "secretsmanager" "2.15.1" + "sha256-GW4y+JyGelERL39KPMOcF/7+pwGBuPwKhNwecBi5BBg="; types-aiobotocore-securityhub = - buildTypesAiobotocorePackage "securityhub" "2.13.1" - "sha256-Pc8hF8ZDrVD2Wb/MMf99nRx5FpfzBHPyvIg2NaRAnH4="; + buildTypesAiobotocorePackage "securityhub" "2.15.1" + "sha256-ONJsSG+d2fSaoPyrchl+oosIeVSjwoN5d0BPolDhhbk="; types-aiobotocore-securitylake = - buildTypesAiobotocorePackage "securitylake" "2.13.1" - "sha256-yM+H0NFlqfkTJAJfr+SZ5shdUMSCWubeg3dwmQjFNxQ="; + buildTypesAiobotocorePackage "securitylake" "2.15.1" + "sha256-ggAfufDDaW+LdNindZoAR1xeWr+hQKr1ImTl+nGE0B8="; types-aiobotocore-serverlessrepo = - buildTypesAiobotocorePackage "serverlessrepo" "2.13.1" - "sha256-dXPQTeu3zEtimgdXFJ1KLQTvRxfCXiYabLhl0YpmJjk="; + buildTypesAiobotocorePackage "serverlessrepo" "2.15.1" + "sha256-zUBoLdhvpvI/tTza9abj//Hkc59gMe70kqEF1SEW+FE="; types-aiobotocore-service-quotas = - buildTypesAiobotocorePackage "service-quotas" "2.13.1" - "sha256-fVGD8IxKwrtxqBYz3yZjxgoy7NXcDYBpqP5Gp7+0rKg="; + buildTypesAiobotocorePackage "service-quotas" "2.15.1" + "sha256-M1elV0BE1RyFOo2XlKVIt5gH1M4bIU7rld77+cGCptg="; types-aiobotocore-servicecatalog = - buildTypesAiobotocorePackage "servicecatalog" "2.13.1" - "sha256-d2PU9AWighlEsgWRzC3Jdzq9oL0GTTCfcRaqQZL85oQ="; + buildTypesAiobotocorePackage "servicecatalog" "2.15.1" + "sha256-fgFgmDsx68FgZHOXTrJEB6OqVOlaVWgSer29dKwiBJo="; types-aiobotocore-servicecatalog-appregistry = - buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.13.1" - "sha256-O2SbST9ZOtEc0eANm/D5PakAazJBAmBO8wPeCACRMQQ="; + buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.15.1" + "sha256-NG2E4XxicGVtpLqi8n/j2C+BsxdMyWb554XX/HlnExI="; types-aiobotocore-servicediscovery = - buildTypesAiobotocorePackage "servicediscovery" "2.13.1" - "sha256-cwkclyVKSsjJEUkW+qadtx/1P953xRntntpVhjGGW6U="; + buildTypesAiobotocorePackage "servicediscovery" "2.15.1" + "sha256-/6OTsZUTgwYXFzTf1G8hkngaN32L8dPJzgdNMSXisfo="; - types-aiobotocore-ses = buildTypesAiobotocorePackage "ses" "2.13.1" - "sha256-/UJ3+qbExc59yTEfPl5hQl8ti5QDedOmZnZ5QD8+BI8="; + types-aiobotocore-ses = + buildTypesAiobotocorePackage "ses" "2.15.1" + "sha256-H3mZA65etYo+frlSNEMs/lT8G86oWbNjlkPefoIc6AA="; - types-aiobotocore-sesv2 = buildTypesAiobotocorePackage "sesv2" "2.13.1" - "sha256-GTHNhwOyBApeddCI4lqTHvPUzkzrnnydXudUrUww+GA="; + types-aiobotocore-sesv2 = + buildTypesAiobotocorePackage "sesv2" "2.15.1" + "sha256-diE7lw1LMxiy4gRam1zymw98VJGKaEWwQ5FudCma9ZU="; - types-aiobotocore-shield = buildTypesAiobotocorePackage "shield" "2.13.1" - "sha256-gOdnwTbWVK1KYshuFN+Cic4fqC4sdphYbKG+GTuSDw8="; + types-aiobotocore-shield = + buildTypesAiobotocorePackage "shield" "2.15.1" + "sha256-jeklWyR6ArvO9/i/2Iji+YbAsv2rnNLqKoSTBL5VDSQ="; - types-aiobotocore-signer = buildTypesAiobotocorePackage "signer" "2.13.1" - "sha256-q0PCBQsNMamebAlxydinILcH6xE4ZCSB37nItUoY5fY="; + types-aiobotocore-signer = + buildTypesAiobotocorePackage "signer" "2.15.1" + "sha256-I+Cfmn14B9W1O/LBNWZZ9384H0DexJav2bkc4+2zV58="; types-aiobotocore-simspaceweaver = - buildTypesAiobotocorePackage "simspaceweaver" "2.13.1" - "sha256-bwDH6nst28rVEYlMFs6UlcyhpAnZdsoZYzlSu6qulKA="; + buildTypesAiobotocorePackage "simspaceweaver" "2.15.1" + "sha256-1B4R4cjzz3fnevwRsT4o3mzlzw4tXbO1kENgWOWbU7w="; - types-aiobotocore-sms = buildTypesAiobotocorePackage "sms" "2.13.1" - "sha256-HqNKZ6DGH+Wdho2bTfNeq72OEs1UzylNPu+nbyf3jd0="; + types-aiobotocore-sms = + buildTypesAiobotocorePackage "sms" "2.15.1" + "sha256-w2iD7ZpVIIDRuTWikJAp3j7j7jBfcpPnKXfTm6KWq10="; types-aiobotocore-sms-voice = - buildTypesAiobotocorePackage "sms-voice" "2.13.1" - "sha256-lC4YEVdgp6ZLjVkwygsi7dUsX9vZ1L/fqbk1EpX/DmE="; + buildTypesAiobotocorePackage "sms-voice" "2.15.1" + "sha256-+SZAFFyf+UTytFecjCv/MH9VykOCxFxXJEen1DZdljs="; types-aiobotocore-snow-device-management = - buildTypesAiobotocorePackage "snow-device-management" "2.13.1" - "sha256-yniuI6Hgp8XTmRjO74MZRxZYV0ohEE7CAtahIYQz6cg="; + buildTypesAiobotocorePackage "snow-device-management" "2.15.1" + "sha256-kaiXmu24wDGIzDtXJ2pT87Wdr3zzRioLVU5TjaNVsRo="; - types-aiobotocore-snowball = buildTypesAiobotocorePackage "snowball" "2.13.1" - "sha256-bKjZGXIWbCFIo7SyLueX8gj9WWjx7nh2P4DArfsMcFI="; + types-aiobotocore-snowball = + buildTypesAiobotocorePackage "snowball" "2.15.1" + "sha256-YvZxBJGNtRVSsJAtv46Nq9xliVvXShiI2exeir+bp8U="; - types-aiobotocore-sns = buildTypesAiobotocorePackage "sns" "2.13.1" - "sha256-VvbiWdwlApbJcRlAoFzZOG4SekaP7mJVbJCpoF+E6Tk="; + types-aiobotocore-sns = + buildTypesAiobotocorePackage "sns" "2.15.1" + "sha256-U/VvZwz7qMrnPjgQUL0NMnNS6e5X4PgW/rjwBi65iAU="; - types-aiobotocore-sqs = buildTypesAiobotocorePackage "sqs" "2.13.1" - "sha256-pVRELwjlkLApPYUV+f6ax/ijc7N6C3nsqPBeGisB0HY="; + types-aiobotocore-sqs = + buildTypesAiobotocorePackage "sqs" "2.15.1" + "sha256-CI9nNt+zfztYT6DwgjAe9RNtebegPAAsSl692FBF7hA="; - types-aiobotocore-ssm = buildTypesAiobotocorePackage "ssm" "2.13.1" - "sha256-bdeTdx6+Pde+hFzqH5Bn4Jk/4fFe68ihYDCXmpbR44w="; + types-aiobotocore-ssm = + buildTypesAiobotocorePackage "ssm" "2.15.1" + "sha256-x/b1hpCTHqZcTJTzwQc+pYjdOYCiyQdsLw1vBpuPQyc="; types-aiobotocore-ssm-contacts = - buildTypesAiobotocorePackage "ssm-contacts" "2.13.1" - "sha256-lJvrcgICIvcGbwPuYlJ4oT3iceItzkOEnSqdJtJB86E="; + buildTypesAiobotocorePackage "ssm-contacts" "2.15.1" + "sha256-3N8kaI67M6xKuTsESi/x4FVXy2Lsdoc9RRGIo7bKAok="; types-aiobotocore-ssm-incidents = - buildTypesAiobotocorePackage "ssm-incidents" "2.13.1" - "sha256-mpDPfMZqKQV1PYrK5MqNZK/z9x0ObIiZbScpPSZFb1A="; + buildTypesAiobotocorePackage "ssm-incidents" "2.15.1" + "sha256-Fkl8ZgS3DD3hRYWQHl1cM2RCNHi8tWk9a1fyCQa+/KM="; - types-aiobotocore-ssm-sap = buildTypesAiobotocorePackage "ssm-sap" "2.13.1" - "sha256-mFpwV41A5WDkzxSeKxGnw+NjByPH2M40ShgcNCDw+jM="; + types-aiobotocore-ssm-sap = + buildTypesAiobotocorePackage "ssm-sap" "2.15.1" + "sha256-23gDeTpYf9sNK2ARSPwZTkNSlGIze8ybLymQ+X0cf74="; - types-aiobotocore-sso = buildTypesAiobotocorePackage "sso" "2.13.1" - "sha256-DIKi/0zz0O66P+CvgrLZRZ8NvqB0N4zlmIcF8DR5fvg="; + types-aiobotocore-sso = + buildTypesAiobotocorePackage "sso" "2.15.1" + "sha256-7uJXGduh2yrj0nLWgTyELxdB6ZaU7TX35GywXTECU64="; types-aiobotocore-sso-admin = - buildTypesAiobotocorePackage "sso-admin" "2.13.1" - "sha256-WO6KbaKvmijEaWCKPbEusudo4vHpJCcSX3aJ6zxWFG0="; + buildTypesAiobotocorePackage "sso-admin" "2.15.1" + "sha256-qTAoxjZnze1ffC/QdVnCRy37H4Tzc1AkAERvvtVxkik="; - types-aiobotocore-sso-oidc = buildTypesAiobotocorePackage "sso-oidc" "2.13.1" - "sha256-YriIVUyOpoC6Ry6F28yNRDuH3gwoYishq4TqUgW3CU4="; + types-aiobotocore-sso-oidc = + buildTypesAiobotocorePackage "sso-oidc" "2.15.1" + "sha256-+MsbvjZLLdY/JOr/yWBvrfHQ3SEWvUtzvaImsYNX0YI="; types-aiobotocore-stepfunctions = - buildTypesAiobotocorePackage "stepfunctions" "2.13.1" - "sha256-HijHsOB9bT5ESGdkwS8m3ulkPef8TLsJclAdum8aWCk="; + buildTypesAiobotocorePackage "stepfunctions" "2.15.1" + "sha256-4YKcuhem2grrKP2I0y+fayyQ4beVhKQJ7KAC70TgN14="; types-aiobotocore-storagegateway = - buildTypesAiobotocorePackage "storagegateway" "2.13.1" - "sha256-KETzBkIcOB8pWBYIzFzIYh2/Y7dc0TGBU6tRQFzGBhQ="; + buildTypesAiobotocorePackage "storagegateway" "2.15.1" + "sha256-DDxzE4KcnC4sjVgBMt2cldFgm2JIeA7pRR7lqocvXN8="; - types-aiobotocore-sts = buildTypesAiobotocorePackage "sts" "2.13.1" - "sha256-mUp9bdMDsAPqnFmDjfCusId6N2L/oqVgDK3jZjO29s8="; + types-aiobotocore-sts = + buildTypesAiobotocorePackage "sts" "2.15.1" + "sha256-LMs2iAbogup0JrXFBIJhpgn8oFuhH3jGnb/Xh60xsMg="; - types-aiobotocore-support = buildTypesAiobotocorePackage "support" "2.13.1" - "sha256-0qjcW4bo4LRYtsNde3ft34sjLEDZkvEOhWOQ9T283fM="; + types-aiobotocore-support = + buildTypesAiobotocorePackage "support" "2.15.1" + "sha256-fpQ5fan2CkWJrnir65tBHyXAqSa1CVQXt/Q1h7NiyjU="; types-aiobotocore-support-app = - buildTypesAiobotocorePackage "support-app" "2.13.1" - "sha256-OvZuJ4yU5el/xSLLJu2ZY94wiHXCtirBeykiHCVsb78="; + buildTypesAiobotocorePackage "support-app" "2.15.1" + "sha256-W/uBm0i+eNsPdSpZ+WvxSRJpZTzRdnt4snregNIeghQ="; - types-aiobotocore-swf = buildTypesAiobotocorePackage "swf" "2.13.1" - "sha256-sG4tBgtIZ5Gxhg9kWQ/p852XplThz6C46Ck1GsKWWnw="; + types-aiobotocore-swf = + buildTypesAiobotocorePackage "swf" "2.15.1" + "sha256-ijmqVcESbAfQLCgWhIEqq1+V8fChp1Pq0IfeBjmPtPM="; types-aiobotocore-synthetics = - buildTypesAiobotocorePackage "synthetics" "2.13.1" - "sha256-ps6hwRhG5iofY95IV0oigJg32AxLJ4SVHN6vrJQ2x6s="; + buildTypesAiobotocorePackage "synthetics" "2.15.1" + "sha256-mDvgYxDjVc2Z+IGCiaNR3xOYuht1LHJPW1lViQsfsfQ="; - types-aiobotocore-textract = buildTypesAiobotocorePackage "textract" "2.13.1" - "sha256-L2Cc0AT30rVvRFXg3ESH1g03Ay4lAlQHymG5S9Kr9fc="; + types-aiobotocore-textract = + buildTypesAiobotocorePackage "textract" "2.15.1" + "sha256-HLjYbm4OK2gvKMKBkNZytKlChMW43y8g2k0CMVVvcGY="; types-aiobotocore-timestream-query = - buildTypesAiobotocorePackage "timestream-query" "2.13.1" - "sha256-is97L08grAhe1l3SKOudv+X08Bn91j5XDc4MJDnM8iI="; + buildTypesAiobotocorePackage "timestream-query" "2.15.1" + "sha256-Jx3U+EzIZzTntyq5YxlSJkHQaGX3JkKqCOlHtGqO7vY="; types-aiobotocore-timestream-write = - buildTypesAiobotocorePackage "timestream-write" "2.13.1" - "sha256-hA3oQKMzs4A6JOgZ0LJy1lBWLseeJh6Phh+T9sEaBss="; + buildTypesAiobotocorePackage "timestream-write" "2.15.1" + "sha256-h1eonOUwVXsybJ25UfQwZtZWuhDh1v8M10ZT9JM1NVo="; - types-aiobotocore-tnb = buildTypesAiobotocorePackage "tnb" "2.13.1" - "sha256-bZy4/BTpRQ432zzSpJYpxva8204wVuCn2vKXNG8lXRg="; + types-aiobotocore-tnb = + buildTypesAiobotocorePackage "tnb" "2.15.1" + "sha256-6b9c2UdaNHM3/GAiGWFnZVR7sUP+cUy9Z5W3Ig+7fSM="; types-aiobotocore-transcribe = - buildTypesAiobotocorePackage "transcribe" "2.13.1" - "sha256-vjVVzDiImqPgP2HEsOQYzpU4LXNAzpIyO1qgAoit2tQ="; + buildTypesAiobotocorePackage "transcribe" "2.15.1" + "sha256-bLQrTDUhbYOTYY+KvUxMwiHgPFHrAJxB8Yjy3TUAMCc="; - types-aiobotocore-transfer = buildTypesAiobotocorePackage "transfer" "2.13.1" - "sha256-WB9TqJahHVmhrOUqJ/cj2zh/eqzVmqzXdX3+0V2PXqk="; + types-aiobotocore-transfer = + buildTypesAiobotocorePackage "transfer" "2.15.1" + "sha256-+cSgukEugB7RSrkWsEgbiMS6tvjAJDPwVP+rVEsAMJE="; types-aiobotocore-translate = - buildTypesAiobotocorePackage "translate" "2.13.1" - "sha256-IAi/rWYer5DV2QJO4NeS6THQ+dAwR0+EvjsPeIlBgdQ="; + buildTypesAiobotocorePackage "translate" "2.15.1" + "sha256-Hf46I5GHQyLAN6IXL0X0VN6Mr3CsMhhPFKqx/fDrHv8="; types-aiobotocore-verifiedpermissions = - buildTypesAiobotocorePackage "verifiedpermissions" "2.13.1" - "sha256-XUuwg1HtJ46K3AhRx4l74x6mVfJxyTv7R1gCgeapHOk="; + buildTypesAiobotocorePackage "verifiedpermissions" "2.15.1" + "sha256-yxamVPkF/RexBvdBpjUi8rYzEy5jOf15otKqi64gnOc="; - types-aiobotocore-voice-id = buildTypesAiobotocorePackage "voice-id" "2.13.1" - "sha256-RKJA0GBvEQtZV1fx2W26fF2QCkh0BlEh1FNwuS6hxxo="; + types-aiobotocore-voice-id = + buildTypesAiobotocorePackage "voice-id" "2.15.1" + "sha256-B7Q0TAT7rMWVZf4wSE6qGxMalHwvV7hPrcnCw3vcQkw="; types-aiobotocore-vpc-lattice = - buildTypesAiobotocorePackage "vpc-lattice" "2.13.1" - "sha256-bh1qQDmivNGTgQOBxJXlCK4Onmr13d7z9qpdIMjuaH4="; + buildTypesAiobotocorePackage "vpc-lattice" "2.15.1" + "sha256-ybBzzhKX3NClXHnYR7GBpQZGsF+xPprHrbHgOjeR+9U="; - types-aiobotocore-waf = buildTypesAiobotocorePackage "waf" "2.13.1" - "sha256-xjqghC+Ul6XFeZSu+tOIe6UCJmAvh5iCZTV6pALk6ls="; + types-aiobotocore-waf = + buildTypesAiobotocorePackage "waf" "2.15.1" + "sha256-YPYrL6RRL0UhABcDZXpJQ8RQWDvPkD+y/qDQ1PbLCuU="; types-aiobotocore-waf-regional = - buildTypesAiobotocorePackage "waf-regional" "2.13.1" - "sha256-07Xbf+aRF1YNjK4MK/dNzmjbyFdTA/Aw/a/XxPLz1mA="; + buildTypesAiobotocorePackage "waf-regional" "2.15.1" + "sha256-fkKB2Cmg0i/OOJKkHmLzU0UWkUDXVAjXYmBWpal6pg4="; - types-aiobotocore-wafv2 = buildTypesAiobotocorePackage "wafv2" "2.13.1" - "sha256-H/jRDzPfruygc278Rey4ZlpSqjJjPAxFfbB5Hwx5z34="; + types-aiobotocore-wafv2 = + buildTypesAiobotocorePackage "wafv2" "2.15.1" + "sha256-f5xAh/57zMcvjJHeqDDSrlSx3u/J3e78oQmGVSyD4Vc="; types-aiobotocore-wellarchitected = - buildTypesAiobotocorePackage "wellarchitected" "2.13.1" - "sha256-/x0aoRNtAdezLG3+8XISYaHhK6jEJDduIHThdbUxfBE="; + buildTypesAiobotocorePackage "wellarchitected" "2.15.1" + "sha256-j1yGNqM32RKzz5xmL52+cwS9JIj1DUIJQatHz7ZjZrg="; - types-aiobotocore-wisdom = buildTypesAiobotocorePackage "wisdom" "2.13.1" - "sha256-N86oMUzLeyorE5kOKzdzNZ7xcPTj3RfMUi8Y/COUir8="; + types-aiobotocore-wisdom = + buildTypesAiobotocorePackage "wisdom" "2.15.1" + "sha256-0rngVEUa9yBIeoMC2dKVVDty4DAiesQZJRm73C4PAhg="; - types-aiobotocore-workdocs = buildTypesAiobotocorePackage "workdocs" "2.13.1" - "sha256-vze4j28+URgY81Huiv9rLhga+3ZpmZbg9Kok7Kj9Hs0="; + types-aiobotocore-workdocs = + buildTypesAiobotocorePackage "workdocs" "2.15.1" + "sha256-Jypse/lhsvGWfu8551dngM+Jp8BdIp2T1WRfqdV02ug="; - types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.13.1" - "sha256-0GqKRn4wmfqWo2h4bVkBrU8l9rp2l4MEL+mNDzcNk6A="; + types-aiobotocore-worklink = + buildTypesAiobotocorePackage "worklink" "2.15.1" + "sha256-VvuxiybvGaehPqyVUYGO1bbVSQ0OYgk6LbzgoKLHF2c="; - types-aiobotocore-workmail = buildTypesAiobotocorePackage "workmail" "2.13.1" - "sha256-k0ZNjys7B3Kgh5k71tL8Pe9TfosuMXrjPB8EGk5sHSA="; + types-aiobotocore-workmail = + buildTypesAiobotocorePackage "workmail" "2.15.1" + "sha256-o2n4u7wgJPSS02LLZe+PLsxdwm5r+0j3VzDFVnR7bGc="; types-aiobotocore-workmailmessageflow = - buildTypesAiobotocorePackage "workmailmessageflow" "2.13.1" - "sha256-Xs5k6yyCaSdHTCtWw6Xp7LDK5lpIS2oUv3xBavIw+yc="; + buildTypesAiobotocorePackage "workmailmessageflow" "2.15.1" + "sha256-PQQLKPZYaCqIVTXS8PWAjrYjp4ZTMl1XDuvz27s10sY="; types-aiobotocore-workspaces = - buildTypesAiobotocorePackage "workspaces" "2.13.1" - "sha256-DLDVHnrT7OEK3HBd5HOdTx+RQruFOowzVIpg8Sv/wzo="; + buildTypesAiobotocorePackage "workspaces" "2.15.1" + "sha256-eU+8eBZ52BEAqpvHWJ4aVr2kuz6/6fMu7yu4bA9f/TQ="; types-aiobotocore-workspaces-web = - buildTypesAiobotocorePackage "workspaces-web" "2.13.1" - "sha256-JOsQKGy81RNaOebeCph4PXrgngFIva4eHCXQlA8PIko="; + buildTypesAiobotocorePackage "workspaces-web" "2.15.1" + "sha256-+lUuiVz/wqkuH59QzB8ZIv+bvNGeNZvBDzUctYd6LAg="; - types-aiobotocore-xray = buildTypesAiobotocorePackage "xray" "2.13.1" - "sha256-bxPi1ZV2DOv4Itv/DRoGvop2wHhloj49ovoXBdhWxZY="; + types-aiobotocore-xray = + buildTypesAiobotocorePackage "xray" "2.15.1" + "sha256-+MKFgYPnSmSLjE9YP8fDjAo91o+mYkN2T4FbOMVSmnw="; } diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index b493ca0331a18..29fffba265bc5 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.13.1"; + version = "2.15.1"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-iJCVMd8HK22CsAbOg3c4hlnatiyMNFw97V8XtjWJwPQ="; + hash = "sha256-DW7QyEVvvlnew0WqFCgA2wg3uYvKHtX2jPbvbVITd0U="; }; build-system = [ setuptools ]; @@ -380,7 +380,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { accessanalyzer = [ types-aiobotocore-accessanalyzer ]; account = [ types-aiobotocore-account ]; acm = [ types-aiobotocore-acm ]; diff --git a/pkgs/development/python-modules/types-aiobotocore/update.sh b/pkgs/development/python-modules/types-aiobotocore/update.sh index f98f653a72783..ea5b05fdaacd3 100755 --- a/pkgs/development/python-modules/types-aiobotocore/update.sh +++ b/pkgs/development/python-modules/types-aiobotocore/update.sh @@ -5,14 +5,14 @@ set -eu -o pipefail source_file=pkgs/development/python-modules/types-aiobotocore-packages/default.nix -#nix-update python312Packages.types-aiobotocore --commit --build +nix-update python312Packages.types-aiobotocore --commit --build packages=( types-aiobotocore-accessanalyzer types-aiobotocore-account types-aiobotocore-acm types-aiobotocore-acm-pca - types-aiobotocore-alexaforbusiness + # types-aiobotocore-alexaforbusiness Obsolete, will be removed soon types-aiobotocore-amp types-aiobotocore-amplify types-aiobotocore-amplifybackend @@ -39,7 +39,7 @@ packages=( types-aiobotocore-autoscaling-plans types-aiobotocore-backup types-aiobotocore-backup-gateway - types-aiobotocore-backupstorage + # types-aiobotocore-backupstorage Obsolete, will be removed soon types-aiobotocore-batch types-aiobotocore-billingconductor types-aiobotocore-braket @@ -73,7 +73,7 @@ packages=( types-aiobotocore-codeguru-security types-aiobotocore-codeguruprofiler types-aiobotocore-codepipeline - types-aiobotocore-codestar + # types-aiobotocore-codestar Obsolete, will be removed soon types-aiobotocore-codestar-connections types-aiobotocore-codestar-notifications types-aiobotocore-cognito-identity @@ -151,7 +151,7 @@ packages=( types-aiobotocore-guardduty types-aiobotocore-health types-aiobotocore-healthlake - types-aiobotocore-honeycode + # types-aiobotocore-honeycode Obsolete, will be removed soon types-aiobotocore-iam types-aiobotocore-identitystore types-aiobotocore-imagebuilder @@ -235,7 +235,7 @@ packages=( types-aiobotocore-migrationhub-config types-aiobotocore-migrationhuborchestrator types-aiobotocore-migrationhubstrategy - types-aiobotocore-mobile + # types-aiobotocore-mobile Obsolete, will be removed soon types-aiobotocore-mq types-aiobotocore-mturk types-aiobotocore-mwaa diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 97f9f348d7e27..bbf905dcb82c8 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -2,24 +2,24 @@ lib, buildPythonPackage, fetchPypi, - poetry-core, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "types-awscrt"; - version = "0.21.2"; + version = "0.21.5"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-hKn09CLsUlwxT99Uwjoec+37zsloVglDyi1Bz65iOzg="; + hash = "sha256-n39H3mh5nLK8ueSG9I13ufWJYrkvukPLiGDacLPFfRs="; }; - build-system = [ poetry-core ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "awscrt-stubs" ]; diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 57c1f550b2e49..6bdcf999bed7b 100644 --- a/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.20240511"; + version = "4.12.0.20240907"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-AE9glv3YOxnNv2yxDk6uV7ECBezMNl0Kadd9qDYBLig="; + hash = "sha256-jQI7hlMJIgcEF6HUxNkWeKsP8kObOyss/6O2KLSeurE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix index 5f45fd8a4176e..85b8b5c331e9d 100644 --- a/pkgs/development/python-modules/types-lxml/default.nix +++ b/pkgs/development/python-modules/types-lxml/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "types-lxml"; - version = "2024.08.07"; + version = "2024.09.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "abelcheung"; repo = "types-lxml"; rev = "refs/tags/${version}"; - hash = "sha256-odllaOqqVGI/k84cro5YXkhDlUx+BRSe5WWwYWXhCY0="; + hash = "sha256-LQqs9wg6kgubY4SygTNQt5YTtF3LsFj7+RkAlcp4SSo="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/types-markdown/default.nix b/pkgs/development/python-modules/types-markdown/default.nix index 35b93b468eaeb..38307a848fc2a 100644 --- a/pkgs/development/python-modules/types-markdown/default.nix +++ b/pkgs/development/python-modules/types-markdown/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-markdown"; - version = "3.6.0.20240316"; + version = "3.7.0.20240822"; pyproject = true; src = fetchPypi { pname = "types-Markdown"; inherit version; - hash = "sha256-3p+4SGC1W2R7FwyldolfzKYbk0puzcZcMZMsZ5W0QLg="; + hash = "sha256-GDVXyfT4Zb3v2PX5ajgUXDGBknHN4RHTVVfDvSBp540="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 55aefbd5fd390..7e6986f2a95ac 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2024.1.0.20240417"; + version = "2024.2.0.20240913"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-aBDIofaPIf3w9PN0pDJIfHdkWgrAsx3kv0aQzyGtOYE="; + hash = "sha256-RDO130pvxYe77UFxbYalul2DK0N45Qb0DTS8nIHfLCQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Modules doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 0e2954f895254..ed5295ea0d976 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.32.0.20240712"; + version = "2.32.0.20240914"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-kMB5/wXlSfa/UOAukQIQuYuP8evdGOGchzzSN3N8E1g="; + hash = "sha256-KFDheNs5Gdm/gJ5DTu9luknQ5+M6yS1Yj0peKV//1AU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 81f1ed1d2b806..a4e6ba12061c0 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { "test_conflicting" "test_noconflict" "test_symlink_localtime" - ] ++ lib.optional stdenv.isDarwin "test_assert_tz_offset"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "test_assert_tz_offset"; pythonImportsCheck = [ "tzlocal" ]; diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 0bde984b93e52..89063357a5650 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { }; patches = - lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ ./darwin-azure-c-shared-utility-corefoundation.patch ] ++ [ @@ -53,7 +53,7 @@ buildPythonPackage rec { ./clang-fix-incompatible-function-pointer-conversion.patch ]; - postPatch = lib.optionalString (stdenv.isDarwin && !stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isx86_64) '' # force darwin aarch64 to use openssl instead of applessl, removing # some quirks upstream thinks they need to use openssl on macos sed -i \ @@ -76,7 +76,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation CFNetwork Security diff --git a/pkgs/development/python-modules/ubelt/default.nix b/pkgs/development/python-modules/ubelt/default.nix index 85764d05986c2..11491426bd097 100644 --- a/pkgs/development/python-modules/ubelt/default.nix +++ b/pkgs/development/python-modules/ubelt/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { wheel ]; - passthru.optional-dependencies = { + optional-dependencies = { optional = [ numpy python-dateutil @@ -51,7 +51,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # fail due to sandbox environment "CacheStamp.expired" "userhome" diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix index 232508310c076..a510f0f468aaa 100644 --- a/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/pkgs/development/python-modules/ucsmsdk/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.19"; + version = "0.9.20"; format = "setuptools"; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; rev = "refs/tags/v${version}"; - hash = "sha256-PPxslqY8v6WbRiRXnR9jVSGAo8k89lHomXpqgSK0meo="; + hash = "sha256-X8lGpfVjIZIpNneOM/mE+9RvglW9FlYoGz7pFs7ellk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix index e494d280ed726..e18b8062f1ff8 100644 --- a/pkgs/development/python-modules/ufmt/default.nix +++ b/pkgs/development/python-modules/ufmt/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "ufmt"; - version = "2.7.0"; + version = "2.7.3"; pyproject = true; - disabled = pythonOlder "3."; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "omnilib"; repo = "ufmt"; rev = "refs/tags/v${version}"; - hash = "sha256-hIbzW7yDqk8siob+RhcnbOonkl+67sl/IGHimIeMM+Q="; + hash = "sha256-hXCOsetw5o3V9NCR0TOfYSFyfBnuOOZDMiUd/6ER9WU="; }; build-system = [ flit-core ]; @@ -44,14 +44,14 @@ buildPythonPackage rec { usort ]; - passthru.optional-dependencies = { + optional-dependencies = { lsp = [ pygls ]; ruff = [ ruff-api ]; }; nativeCheckInputs = [ unittestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "ufmt" ]; diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index d42a40980629b..cd438f890d50a 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.2.7"; + version = "3.2.8"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fA5It0mr6sjAQECGPOsS//lZJ9OqKelfhdzV770sMHQ="; + hash = "sha256-HSD66FbCxZyACRq7b8p2uizoO4ZqPAn1O8BFoi1/Mkc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ufolib2/default.nix b/pkgs/development/python-modules/ufolib2/default.nix index 6eaac11f17f03..201413ed9b9de 100644 --- a/pkgs/development/python-modules/ufolib2/default.nix +++ b/pkgs/development/python-modules/ufolib2/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { fonttools ] ++ fonttools.optional-dependencies.ufo; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; converters = [ cattrs ]; json = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "ufoLib2" ]; diff --git a/pkgs/development/python-modules/ufomerge/default.nix b/pkgs/development/python-modules/ufomerge/default.nix new file mode 100644 index 0000000000000..99e7666584e16 --- /dev/null +++ b/pkgs/development/python-modules/ufomerge/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonRelaxDepsHook, + pytestCheckHook, + setuptools, + setuptools-scm, + fonttools, + fontfeatures, + ufolib2, +}: + +buildPythonPackage rec { + pname = "ufomerge"; + version = "1.8.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "ufomerge"; + rev = "refs/tags/v${version}"; + hash = "sha256-D+BhKCKWgprQn+eXFgwnSN/06+JF5CiUS0VAS1Kvedw="; + }; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "fonttools" ]; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + fonttools + ufolib2 + ]; + + nativeCheckInputs = [ + pytestCheckHook + fontfeatures + ]; + + disabledTestPaths = [ + # Failing due to fonttools being to old + "tests/test_layout.py" + ]; + + pythonImportsCheck = [ "ufomerge" ]; + + meta = { + description = "Command line utility and Python library that merges two UFO source format fonts into a single file"; + homepage = "https://github.com/googlefonts/ufomerge"; + changelog = "https://github.com/googlefonts/ufomerge/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index 0dc8fea9bc8ad..de30a78091665 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { setuptools-scm ]; - buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 6580e40e92e33..ee01a24bebcce 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -30,6 +30,7 @@ ffmpeg, pytest-asyncio, pytest-benchmark, + pytest-cov-stub, pytest-timeout, pytest-xdist, pytestCheckHook, @@ -37,7 +38,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "6.0.1"; + version = "6.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -46,16 +47,15 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-2rkXaFzdIOCGF60k7TpqAqTSxFFhmqhY8yKm7cEvgkE="; + hash = "sha256-SWEWh1c5GcMrjJlcLtXScRNoem2ACGt3nFC4+ARMIIw="; }; - postPatch = '' - sed -i "/addopts =/d" pyproject.toml - ''; - build-system = [ poetry-core ]; - pythonRelaxDeps = [ "pydantic" ]; + pythonRelaxDeps = [ + "aiofiles" + "pydantic" + ]; dependencies = [ aiofiles @@ -81,6 +81,7 @@ buildPythonPackage rec { ffmpeg # Required for command ffprobe pytest-asyncio pytest-benchmark + pytest-cov-stub pytest-timeout pytest-xdist pytestCheckHook @@ -88,10 +89,16 @@ buildPythonPackage rec { pytestFlagsArray = [ "--benchmark-disable" ]; + disabledTests = [ + # https://127.0.0.1 vs https://127.0.0.1:0 + "test_base_url" + "test_bootstrap" + ]; + pythonImportsCheck = [ "uiprotect" ]; meta = with lib; { - description = "Python API for UniFi Protect (Unofficial"; + description = "Python API for UniFi Protect (Unofficial)"; homepage = "https://github.com/uilibs/uiprotect"; changelog = "https://github.com/uilibs/uiprotect/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix index 1ddfe0e5a5ba9..58a84849c5d9f 100644 --- a/pkgs/development/python-modules/ulid-transform/default.nix +++ b/pkgs/development/python-modules/ulid-transform/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "0.13.1"; - format = "pyproject"; + version = "1.0.2"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bdraco"; - repo = pname; + repo = "ulid-transform"; rev = "refs/tags/v${version}"; - hash = "sha256-tOtOTFKBVQmCm02k9Q8r+EgF39iN+XNXCnlw2ppYM58="; + hash = "sha256-99hq329jUpok+rP8WzxN1yTOp15Zfy7tIGRpQMecrc0="; }; - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to create and transform ULIDs"; homepage = "https://github.com/bdraco/ulid-transform"; - changelog = "https://github.com/bdraco/ulid-transform/releases/tag/v${version}"; + changelog = "https://github.com/bdraco/ulid-transform/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 8a6f51bded2af..9fbe57c250e98 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { plot = [ bokeh colorcet diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index abf225feb5eee..720ff9bba0264 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -6,19 +6,19 @@ spark-parser, xdis, nose, - pytest, + pytestCheckHook, hypothesis, six, }: buildPythonPackage rec { pname = "uncompyle6"; - version = "3.9.1"; + version = "3.9.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-xFHDjrPFzINOuLip5uCwzzIm5NlNCP0nbdA/6RWO2yc="; + hash = "sha256-b3CYD/4IpksRS2hxgy/QLYbJkDX4l2qPH4Eh2tb8pCU="; }; propagatedBuildInputs = [ @@ -28,25 +28,19 @@ buildPythonPackage rec { nativeCheckInputs = [ nose - pytest + pytestCheckHook hypothesis six ]; - # Tests attempt to decompile bytecode of the python version - # that is running the tests - this does not work for versions - # above 3.8, but they decompile older bytecode fine + # No tests are provided for versions past 3.8, + # as the project only targets bytecode of versions <= 3.8 doCheck = pythonOlder "3.9"; - # six import errors (yet it is supplied...) - checkPhase = '' - runHook preCheck - pytest ./pytest --ignore=pytest/test_function_call.py - runHook postCheck - ''; - meta = with lib; { - description = "Python cross-version byte-code deparser"; - homepage = "https://github.com/rocky/python-uncompyle6/"; - license = licenses.gpl3; + meta = { + description = "A bytecode decompiler for Python versions 3.8 and below"; + homepage = "https://github.com/rocky/python-uncompyle6"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ melvyn2 ]; }; } diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index 3bc0fec5e355c..8710237952330 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.17.1"; + version = "0.17.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Ts2cK/nWXuFHapMhnMgj61TKSQgFVd5XVSlWdlj9Y5U="; + hash = "sha256-C4oq/TR28athVfxXlQGsR//+Q1R9iKcOWlt2p/5sqiw="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/unicodeit/default.nix b/pkgs/development/python-modules/unicodeit/default.nix new file mode 100644 index 0000000000000..30372a2c8e831 --- /dev/null +++ b/pkgs/development/python-modules/unicodeit/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + pytestCheckHook, + runCommand, + + setuptools, + unicodeit, +}: +buildPythonPackage rec { + pname = "unicodeit"; + version = "0.7.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "svenkreiss"; + repo = "unicodeit"; + rev = "refs/tags/v${version}"; + hash = "sha256-NeR3fGDbOzwyq85Sep9KuUiARCvefN6l5xcb8D/ntHE="; + }; + + patches = [ + (fetchpatch { + # Defines a CLI entry point, so `setuptools` generates an `unicodeit` executable + url = "https://github.com/svenkreiss/unicodeit/pull/79/commits/9f4a4fee5cb62a101075adf3054832cdb1e6a5ad.patch"; + hash = "sha256-mAhmU17K0adEFFAIf7ZeJ/cNohrzrL+sol7gYfWbPGo="; + }) + ]; + + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ + "unicodeit" + "unicodeit.cli" + ]; + + passthru.tests.entrypoint = + runCommand "python3-unicodeit-test-entrypoint" + { + nativeBuildInputs = [ unicodeit ]; + preferLocalBuild = true; + } + '' + [[ "$(unicodeit "\BbbR")" = "ℝ" ]] + touch $out + ''; + + meta = { + description = "Converts LaTeX tags to unicode"; + mainProgram = "unicodeit"; + homepage = "https://github.com/svenkreiss/unicodeit"; + license = with lib.licenses; [ + lppl13c + mit + ]; + maintainers = with lib.maintainers; [ nicoo ]; + }; +} diff --git a/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch b/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch deleted file mode 100644 index 904538880a228..0000000000000 --- a/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bcc65c0be18fc6ea6ec39da89d0de77544fa18c7 Mon Sep 17 00:00:00 2001 -From: Mrmaxmeier <Mrmaxmeier@gmail.com> -Date: Tue, 9 Jul 2024 17:41:08 +0200 -Subject: [PATCH] Drop removed `distutils` import in favor of `sysconfig` - -This patch is available online as https://github.com/unicorn-engine/unicorn/pull/1973 - -diff --git a/unicorn/unicorn.py b/unicorn/unicorn.py -index 2e6a938f43..7204b8215f 100644 ---- a/unicorn/unicorn.py -+++ b/unicorn/unicorn.py -@@ -2,7 +2,7 @@ - from __future__ import annotations - import ctypes - import ctypes.util --import distutils.sysconfig -+import sysconfig - from functools import wraps - from typing import Any, Callable, List, Tuple, Union - import pkg_resources -@@ -85,7 +85,7 @@ def _load_lib(path, lib_name): - pkg_resources.resource_filename(__name__, 'lib'), - os.path.join(os.path.split(__file__)[0], 'lib'), - '', -- distutils.sysconfig.get_python_lib(), -+ sysconfig.get_path('platlib'), - "/usr/local/lib/" if sys.platform == 'darwin' else '/usr/lib64', - os.getenv('PATH', '')] - diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index de3a0f6a30408..6ce310bfb5d1d 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -9,35 +9,30 @@ buildPythonPackage rec { pname = "unicorn"; version = lib.getVersion unicorn-emu; - format = "setuptools"; + pyproject = true; src = unicorn-emu.src; sourceRoot = "${src.name}/bindings/python"; - patches = [ - # Python 3.12 compatibility: Drop removed `distutils` import in favor of `sysconfig` - ./avoid-distutils-python312.patch - ]; - prePatch = '' ln -s ${unicorn-emu}/lib/libunicorn.* prebuilt/ ''; - # needed on non-x86 linux + # Needed on non-x86 linux setupPyBuildFlags = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" ] # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "--plat-name" "macosx_11_0" ]; - propagatedBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/unifi-ap/default.nix b/pkgs/development/python-modules/unifi-ap/default.nix new file mode 100644 index 0000000000000..f5bfb6088bc0e --- /dev/null +++ b/pkgs/development/python-modules/unifi-ap/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + paramiko, +}: + +buildPythonPackage rec { + pname = "unifi-ap"; + version = "0.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tofuSCHNITZEL"; + repo = "unifi_ap"; + rev = "v${version}"; + hash = "sha256-dEaDRcQEx+n+zvxVHD58B1AdFj004L76AtVDesnP+gQ="; + }; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ "paramiko" ]; + + dependencies = [ + paramiko + ]; + + pythonImportsCheck = [ + "unifi_ap" + ]; + + doCheck = false; # no tests + + meta = { + changelog = "https://github.com/tofuSCHNITZEL/unifi_ap/releases/tag/v${version}"; + description = "Python API for UniFi accesspoints"; + homepage = "https://github.com/tofuSCHNITZEL/unifi_ap"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix index 7caf423379784..3e0c0d3094f41 100644 --- a/pkgs/development/python-modules/univers/default.nix +++ b/pkgs/development/python-modules/univers/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "univers"; - version = "30.12.0"; + version = "30.12.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NbsoYfTk5SWyUQZnOdm+ZCXK7wD+DV/updRHqHoU49c="; + hash = "sha256-whuUM3IHnuK5bkXJ8SPrMoO3cRnm0yxKBPxBSfeQIFY="; }; build-system = [ @@ -58,8 +58,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library for parsing version ranges and expressions"; - homepage = "https://github.com/nexB/univers"; - changelog = "https://github.com/nexB/univers/blob/v${version}/CHANGELOG.rst"; + homepage = "https://github.com/aboutcode-org/univers"; + changelog = "https://github.com/aboutcode-org/univers/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ asl20 bsd3 diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix index b01e2dab57f1a..007aaab546ad6 100644 --- a/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/pkgs/development/python-modules/universal-pathlib/default.nix @@ -10,23 +10,23 @@ buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.2.3"; - format = "pyproject"; + version = "0.2.5"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-IvXyif7exLZjlWWWdCZS4hd7yiRmG2yKFz9ZdM/uAFI="; + hash = "sha256-6l1PuBeMKrRpz0+kbQzrFsyzeNpG27woqLnB7r3MxlU="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ fsspec ]; + dependencies = [ fsspec ]; pythonImportsCheck = [ "upath" ]; diff --git a/pkgs/development/python-modules/unrardll/default.nix b/pkgs/development/python-modules/unrardll/default.nix index 14a32c0ba8621..b539d805f66ef 100644 --- a/pkgs/development/python-modules/unrardll/default.nix +++ b/pkgs/development/python-modules/unrardll/default.nix @@ -18,9 +18,9 @@ buildPythonPackage rec { buildInputs = [ unrar ]; - NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names"; + NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libunrar.so ${unrar}/lib/libunrar.so $out/lib/python*/site-packages/unrardll/unrar.*-darwin.so install_name_tool -change libunrar.so ${unrar}/lib/libunrar.so build/lib.*/unrardll/unrar.*-darwin.so ''; diff --git a/pkgs/development/python-modules/unrpa/default.nix b/pkgs/development/python-modules/unrpa/default.nix index c64443ff66614..b806af03a2c1b 100644 --- a/pkgs/development/python-modules/unrpa/default.nix +++ b/pkgs/development/python-modules/unrpa/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0yl4qdwp3in170ks98qnldqz3r2iyzil5g1775ccg98qkh95s724"; }; - passthru.optional-dependencies = { + optional-dependencies = { ZiX = [ uncompyle6 ]; }; diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 0c87b41ba848a..dc0b24644733c 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -57,7 +57,7 @@ grpcio, }: let - version = "0.15.8"; + version = "0.15.13"; optional-dependencies = { huggingflace = [ langdetect @@ -100,7 +100,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-smNbkSBntGRaJuzJRcp0J5vdjf/xWMqF1IaHMAKPXjw="; + hash = "sha256-DbOuNh+p+4vsEO6AQUeMq25RTLm5Zn9FyzcTKJedbTM="; }; propagatedBuildInputs = [ @@ -143,7 +143,7 @@ buildPythonPackage { grpcio ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; meta = with lib; { description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines"; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 7806daf5ff7d6..e0e666d7ffa7f 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.3.12"; + version = "5.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-ozrC/I6CNHE/7S0ioL+ED9Vk6q0v3i4lNxv7ipvProk="; + hash = "sha256-iCyGG4y7cnJqHEaqpzFc/LjWiLZw3HArU5hDtEyLgFo="; }; build-system = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { numpy fsspec packaging + xxhash ]; nativeCheckInputs = [ @@ -57,7 +58,6 @@ buildPythonPackage rec { pytest-timeout rangehttpserver scikit-hep-testdata - xxhash ]; preCheck = '' diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 1bffd501e763d..3fae3b0b70f0c 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -34,7 +34,7 @@ let nativeBuildInputs = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; socks = [ pysocks ]; }; @@ -47,7 +47,7 @@ let trustme ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); # Tests in urllib3 are mostly timeout-based instead of event-based and # are therefore inherently flaky. On your own machine, the tests will diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 7c2024af44d8f..f11af5836ca85 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { wcwidth ]; - passthru.optional-dependencies = { + optional-dependencies = { glib = [ pygobject3 ]; tornado = [ tornado ]; trio = [ @@ -62,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ glibcLocales pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); env.LC_ALL = "en_US.UTF8"; diff --git a/pkgs/development/python-modules/urwidgets/default.nix b/pkgs/development/python-modules/urwidgets/default.nix index 4a1bbdd9ff172..3f528c40a533b 100644 --- a/pkgs/development/python-modules/urwidgets/default.nix +++ b/pkgs/development/python-modules/urwidgets/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "urwidgets"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "AnonymouX47"; repo = "urwidgets"; rev = "refs/tags/v${version}"; - hash = "sha256-ultlfNeCGFTqKaMeXu0+NihkN5/6NtMewk33YfIzhu8="; + hash = "sha256-RgY7m0smcdUspGkCdzepxruEMDq/mAsVFNjHMLoWAyc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix index 707a464d7e4f0..4f37152ef71f5 100644 --- a/pkgs/development/python-modules/uvcclient/default.nix +++ b/pkgs/development/python-modules/uvcclient/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "uvcclient"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ilZTRoSuoJMWlyRfvY/PpTBbr+d6wx+T3cVyW3ZkXlY="; + hash = "sha256-V7xIvZ9vIXHPpkEeJZ6QedWk+4ZVNwCzj5ffLyixFz4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 48bd9e9ef85ec..f81acc469a3d3 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { h11 ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - passthru.optional-dependencies.standard = [ + optional-dependencies.standard = [ httptools python-dotenv pyyaml diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix index 24dd8d2b848c9..b5d7cee2f7c5e 100644 --- a/pkgs/development/python-modules/uvicorn/tests.nix +++ b/pkgs/development/python-modules/uvicorn/tests.nix @@ -34,7 +34,7 @@ buildPythonPackage { wsproto ] ++ uvicorn.optional-dependencies.standard; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 06447432f2189..f5d0e08cbb288 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { buildInputs = [ libuv ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ApplicationServices ]; @@ -61,7 +61,7 @@ buildPythonPackage rec { "--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # Segmentation fault "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" # Broken: https://github.com/NixOS/nixpkgs/issues/160904 @@ -78,7 +78,7 @@ buildPythonPackage rec { # force using installed/compiled uvloop rm -rf uvloop '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Work around "OSError: AF_UNIX path too long" # https://github.com/MagicStack/uvloop/issues/463 export TMPDIR="/tmp" diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix index 0c6a0c5ff1e9e..15d10eb5fe626 100644 --- a/pkgs/development/python-modules/uxsim/default.nix +++ b/pkgs/development/python-modules/uxsim/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { pname = "uxsim"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "toruseo"; repo = "UXsim"; rev = "refs/tags/v${version}"; - hash = "sha256-hZjyUKDzI8AZW8OFC+RKbJNt8qXuHjTX9STYJTWszF4="; + hash = "sha256-+nJsP/XAp6F7LZQI559rI3OCFnMTXJ4eFKEEJyEDHDg="; }; patches = [ ./add-qt-plugin-path-to-env.patch ]; diff --git a/pkgs/development/python-modules/validphys2/default.nix b/pkgs/development/python-modules/validphys2/default.nix deleted file mode 100644 index fd408820a2d72..0000000000000 --- a/pkgs/development/python-modules/validphys2/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildPythonPackage, - lhapdf, - nnpdf, - prompt-toolkit, - reportengine, - requests, - seaborn, - validobj, -}: - -buildPythonPackage rec { - pname = "validphys2"; - version = "4.0"; - format = "setuptools"; - - inherit (nnpdf) src; - - prePatch = '' - cd validphys2 - ''; - - postPatch = '' - substituteInPlace src/validphys/version.py \ - --replace '= __give_git()' '= "'$version'"' - ''; - - propagatedBuildInputs = [ - lhapdf - nnpdf - prompt-toolkit - reportengine - requests - seaborn - validobj - ]; - - doCheck = false; # no tests - pythonImportsCheck = [ "validphys" ]; - - meta = with lib; { - description = "NNPDF analysis framework"; - homepage = "https://data.nnpdf.science/validphys-docs/guide.html"; - inherit (nnpdf.meta) license; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix index e74f735538e58..28f08948fce1d 100644 --- a/pkgs/development/python-modules/vdf/default.nix +++ b/pkgs/development/python-modules/vdf/default.nix @@ -2,8 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, mock, pytestCheckHook, + nix-update-script, }: buildPythonPackage rec { @@ -13,17 +15,30 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ValvePython"; - repo = pname; - rev = "v${version}"; + repo = "vdf"; + rev = "refs/tags/v${version}"; hash = "sha256-6ozglzZZNKDtADkHwxX2Zsnkh6BE8WbcRcC9HkTTgPU="; }; + patches = [ + # Support appinfo.vdf v29 (required by protontricks 1.12.0) + (fetchpatch2 { + url = "https://github.com/Matoking/vdf/commit/981cad270c2558aeb8eccaf42cfcf9fabbbed199.patch"; + hash = "sha256-kLAbbB0WHjxq4rokLoGTPx43BU44EshteR59Ey9JnXo="; + }) + ]; + nativeCheckInputs = [ mock pytestCheckHook ]; + pythonImportsCheck = [ "vdf" ]; + # Use nix-update-script instead of the default python updater + # The python updater requires GitHub releases, but vdf only uses tags + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Library for working with Valve's VDF text format"; homepage = "https://github.com/ValvePython/vdf"; diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index ad5efb0c81055..cf1ed3878e36e 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "vector"; - version = "1.4.1"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "vector"; rev = "refs/tags/v${version}"; - hash = "sha256-ckwJgh5aWFTwoEBVmKukdk+cmQeOuecLiYD2EcuELGw="; + hash = "sha256-bTCcuJosoR0/n6QiJuCIeE9oPab9RKAbUXXA+sAkX48="; }; build-system = [ @@ -62,10 +62,16 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - # AssertionError: assert 2.1073424255447017e-08 == 0.0 - "test_issue_463" - ]; + disabledTests = + [ + # AssertionError (unclear why) + "test_rhophi_eta_tau" + "test_xy_eta_tau" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # AssertionError: assert 2.1073424255447017e-08 == 0.0 + "test_issue_463" + ]; meta = { description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index d7fbe2cabaa2f..1acb25ddf8094 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { widget = [ ipywidgets ]; jupyterlab = [ jupyterlab ]; }; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index d98aa5ab71d1b..613859ff61e01 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { toml = lib.optionals (pythonOlder "3.11") [ tomli ]; }; diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index ac2dc4d195fc9..19a8b8ba0df7d 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -2,29 +2,30 @@ lib, buildPythonPackage, fetchPypi, - future, mock, parameterized, pytestCheckHook, python-dateutil, pythonOlder, + setuptools, six, }: buildPythonPackage rec { pname = "vertica-python"; - version = "1.3.8"; - format = "setuptools"; + version = "1.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5SuJT8Mu/4MnAmTWb9TL5b0f0Hug2n70X5BhZME2vrw="; + hash = "sha256-VCB4ri/t7mlK3tsE2Bxu3Cd7h+10QDApQhB9hqC81EU="; }; - propagatedBuildInputs = [ - future + build-system = [ setuptools ]; + + dependencies = [ python-dateutil six ]; diff --git a/pkgs/development/python-modules/vharfbuzz/default.nix b/pkgs/development/python-modules/vharfbuzz/default.nix index 5d41a3a2e57bc..e822dacb633a1 100644 --- a/pkgs/development/python-modules/vharfbuzz/default.nix +++ b/pkgs/development/python-modules/vharfbuzz/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, fonttools, - pythonImportsCheckHook, uharfbuzz, }: @@ -21,7 +20,6 @@ buildPythonPackage rec { fonttools uharfbuzz ]; - nativeBuildInputs = [ pythonImportsCheckHook ]; # Package has no tests. doCheck = false; diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix index 4815ce63413f4..553721e83eea5 100644 --- a/pkgs/development/python-modules/virtkey/default.nix +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Extension to emulate keypresses and to get the layout information from the X server"; homepage = "https://launchpad.net/virtkey"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/visions/default.nix b/pkgs/development/python-modules/visions/default.nix index 6d3da09118f97..f79a34ce58c9b 100644 --- a/pkgs/development/python-modules/visions/default.nix +++ b/pkgs/development/python-modules/visions/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { type-geometry = [ shapely ]; type-image-path = [ imagehash pillow ]; plotting = [ matplotlib pydot pygraphviz ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # requires running Apache Spark: diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index ef939cbdca6e0..e99a473b48a60 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { cxxfilt msgpack pycparser - ] ++ lib.optionals (withGui) passthru.optional-dependencies.gui; + ] ++ lib.optionals (withGui) optional-dependencies.gui; - passthru.optional-dependencies.gui = [ + optional-dependencies.gui = [ pyqt5 pyqtwebengine ]; diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 3b9e6ee434871..fa5b9d8481527 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -176,6 +176,8 @@ buildPythonPackage rec { happysalada lach ]; - broken = !cudaSupport && !rocmSupport; + # RuntimeError: Unknown runtime environment + broken = true; + # broken = !cudaSupport && !rocmSupport; }; } diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 23677ab4ec4f3..c61971b587f41 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - passthru.optional-dependencies = { + optional-dependencies = { console = [ certifi docopt @@ -55,7 +55,7 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.mqtt; + ] ++ optional-dependencies.mqtt; pythonImportsCheck = [ "volvooncall" ]; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 7f4feb2ba9ad0..558d47529b689 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; # Python ctypes.find_library uses DYLD_LIBRARY_PATH. - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${python.pkgs.boost}/lib" ''; @@ -71,6 +71,6 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ teh ]; # Test again when new version is released - broken = stdenv.isLinux; + broken = stdenv.hostPlatform.isLinux; }; } diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index ca26ec29bd554..c0f593de627f8 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.18.3"; + version = "0.18.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "vt-py"; rev = "refs/tags/${version}"; - hash = "sha256-Zu4lUniXfKaZ1SvX3YCzMLa76HgUWpmddV2N9buNS3o="; + hash = "sha256-pMljLoJBSLq1UxXn+iOeiebWgVfdxW8uzdXPsZtANuw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/vttlib/default.nix b/pkgs/development/python-modules/vttlib/default.nix new file mode 100644 index 0000000000000..d90b9c3c3bfdb --- /dev/null +++ b/pkgs/development/python-modules/vttlib/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + setuptools-scm, + fonttools, + pyparsing, + ufolib2, + ufo2ft, +}: + +buildPythonPackage rec { + pname = "vttlib"; + version = "0.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "daltonmaag"; + repo = "vttLib"; + rev = "v${version}"; + hash = "sha256-ChsuzeFRQFDYGlAE4TWzE+et7yGLOfha1VqGcOdayOs="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + fonttools + pyparsing + ufolib2 + ]; + + nativeCheckInputs = [ + pytestCheckHook + ufo2ft + ]; + + pythonImportsCheck = [ "vttLib" ]; + + meta = { + description = "Dump, merge and compile Visual TrueType data in UFO3 with FontTools"; + homepage = "https://github.com/daltonmaag/vttLib"; + changelog = "https://github.com/daltonmaag/vttLib/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/w1thermsensor/default.nix b/pkgs/development/python-modules/w1thermsensor/default.nix index eca3bdd9302ec..af8854ce96ec7 100644 --- a/pkgs/development/python-modules/w1thermsensor/default.nix +++ b/pkgs/development/python-modules/w1thermsensor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; }; @@ -46,7 +46,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ tomli ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "w1thermsensor" ]; diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index 5312633cd8036..43aa722abdaad 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -18,21 +18,21 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.9"; + version = "1.10"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { repo = "wagtail-localize"; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-ENdUXfvQOfd9cgHr6fd5Hf+8AJXFix3YbsYJQfpu4ZE="; + hash = "sha256-khGzJj7LBxz5WPU8l20CmQjC9p5umk6spSyMMHBBguc="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ django wagtail polib @@ -47,7 +47,7 @@ buildPythonPackage rec { google-cloud-translate ]; - passthru.optional-dependencies = { + optional-dependencies = { google = [ google-cloud-translate ]; }; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index fbd5d9baabf58..59dc57777e6d1 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -31,7 +31,6 @@ nbformat, pandas, parameterized, - pathtools, protobuf, psutil, pydantic, @@ -85,7 +84,6 @@ buildPythonPackage rec { click docker-pycreds gitpython - pathtools protobuf psutil pyyaml @@ -282,11 +280,11 @@ buildPythonPackage rec { # See https://github.com/wandb/wandb/issues/6836 "tests/pytest_tests/unit_tests_old/test_logging.py" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # Same as above "tests/pytest_tests/unit_tests/test_artifacts/test_storage.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Same as above "tests/pytest_tests/unit_tests/test_lib/test_filesystem.py" ]; @@ -303,7 +301,7 @@ buildPythonPackage rec { "test_pytorch_saved_model" "test_tensorflow_keras_saved_model" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable test that fails on darwin due to issue with python3Packages.psutil: # https://github.com/giampaolo/psutil/issues/1219 "test_tpu_system_stats" diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 8408780ef637d..c903ede48d27b 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -56,7 +56,7 @@ let --replace "package.metadata.maturin" "broken" ''; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] ++ extraBuildInputs; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ extraBuildInputs; inherit buildAndTestSubdir; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 4e83fb0264259..e68d2acbf1308 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -26,18 +26,20 @@ buildPythonPackage rec { # force kqueue on x86_64-darwin, because our api version does # not support fsevents - patches = lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ ./force-kqueue.patch ]; + patches = lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [ + ./force-kqueue.patch + ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - passthru.optional-dependencies.watchmedo = [ pyyaml ]; + optional-dependencies.watchmedo = [ pyyaml ]; nativeCheckInputs = [ eventlet flaky pytest-timeout pytestCheckHook - ] ++ passthru.optional-dependencies.watchmedo; + ] ++ optional-dependencies.watchmedo; postPatch = '' substituteInPlace setup.cfg \ @@ -50,13 +52,13 @@ buildPythonPackage rec { "--deselect=tests/test_emitter.py::test_create_wrong_encoding" "--deselect=tests/test_emitter.py::test_close" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # fails to stop process in teardown "--deselect=tests/test_0_watchmedo.py::test_auto_restart_subprocess_termination" # assert cap.out.splitlines(keepends=False).count('+++++ 0') == 2 != 3 "--deselect=tests/test_0_watchmedo.py::test_auto_restart_on_file_change_debounce" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # FileCreationEvent != FileDeletionEvent "--deselect=tests/test_emitter.py::test_separate_consecutive_moves" "--deselect=tests/test_observers_polling.py::test___init__" @@ -66,7 +68,7 @@ buildPythonPackage rec { # AttributeError: '_thread.RLock' object has no attribute 'key'" "--deselect=tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # segfaults "--deselect=tests/test_delayed_queue.py::test_delayed_get" "--deselect=tests/test_0_watchmedo.py::test_tricks_from_file" @@ -89,7 +91,7 @@ buildPythonPackage rec { # tests timeout easily "tests/test_inotify_buffer.py" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # segfaults the testsuite "tests/test_emitter.py" # unsupported on x86_64-darwin diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index 22cd171afae50..3b09081249b0a 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { hash = "sha256-n9yN/VRNQWCxh+BoliIMkKqJC51inpB9DQ9WtqR4oA0="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices libiconv ]; diff --git a/pkgs/development/python-modules/watermark/default.nix b/pkgs/development/python-modules/watermark/default.nix index b6f9eeeb90a83..5eefa67895c5c 100644 --- a/pkgs/development/python-modules/watermark/default.nix +++ b/pkgs/development/python-modules/watermark/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "watermark"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "rasbt"; repo = "watermark"; rev = "refs/tags/v${version}"; - hash = "sha256-4/1Y7cdh1tF33jgPrqdxCGPcRnnxx+Wf8lyztF54Ck0="; + hash = "sha256-UR4kV6UoZ/JLO19on+qEH+M05QIsT0SXvXJtTMCKuZM="; }; nativeBuildInputs = [ setuptools ]; @@ -31,13 +31,13 @@ buildPythonPackage rec { importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { gpu = [ py3nvml ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "watermark" ]; diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix index 6be8a9fd7f17f..4faf5b1805ceb 100644 --- a/pkgs/development/python-modules/wcmatch/default.nix +++ b/pkgs/development/python-modules/wcmatch/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "wcmatch"; - version = "9.0"; + version = "10.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Vn1msRrXQ4SVTIr4b2B4V8O9+TaCNJrTIGYjGr1VbJI="; + hash = "sha256-5y8N4Ju6agTg3nCTewzwblXzbzez3rQi36+FS4Z7hAo="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix index ac48a838ff5a1..d4417374d4911 100644 --- a/pkgs/development/python-modules/weatherflow4py/default.nix +++ b/pkgs/development/python-modules/weatherflow4py/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "weatherflow4py"; - version = "0.2.23"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "jeeftor"; repo = "weatherflow4py"; rev = "refs/tags/v${version}"; - hash = "sha256-ghdjQyZPLFzgmrB2ppzNbqM/D2/zW872tw4emzInLBY="; + hash = "sha256-NOruMysLm0Pu2fsaA/qCNdeCTacomvJ51oqI8V2WFWI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 0ccf377ad50db..506aa956bda60 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -9,14 +9,14 @@ httpx, pydantic, pythonOlder, + requests, setuptools-scm, - tqdm, validators, }: buildPythonPackage rec { pname = "weaviate-client"; - version = "4.7.1"; + version = "4.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; rev = "refs/tags/v${version}"; - hash = "sha256-JgnasbhAcdJwa3lpdID+B3Iwuc9peRQZBAC7tBBm54c="; + hash = "sha256-JVn9Xhq7MJD+o6DA/EaW1NNnvsjjqyW+pmFctuQStgo="; }; pythonRelaxDeps = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { grpcio-tools httpx pydantic - tqdm + requests validators ]; diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 49415d090f5c6..08fc850f9e507 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { }; # Note: to reflect the extra_requires in main/setup.py. - passthru.optional-dependencies = { + optional-dependencies = { ipfs = [ ipfshttpclient ]; }; diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix index 17a2d3c081b60..f0a4497c69447 100644 --- a/pkgs/development/python-modules/webdataset/default.nix +++ b/pkgs/development/python-modules/webdataset/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { pname = "webdataset"; - version = "0.2.96"; + version = "0.2.107"; pyproject = true; src = fetchFromGitHub { owner = "webdataset"; repo = "webdataset"; - rev = "refs/tags/${version}"; - hash = "sha256-Wz6dLi2xW9aF+QjDx4yn64zU7u7SCyDXVKkS+1TyYaU="; + rev = "refs/tags/v${version}"; + hash = "sha256-L9RUQItmW/7O/eTst2Sl/415EP4Jo662bKWbYA6p5bk="; }; build-system = [ @@ -67,16 +67,16 @@ buildPythonPackage rec { "test_unbatched" "test_yaml3" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # pickling error "test_background_download" ] - ++ lib.optionals (stdenv.isx86_64 && stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [ "test_concurrent_access" # fails to patch 'init_process_group' from torch.distributed "TestDistributedChunkedSampler" ] - ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ # segfaults on aarch64-linux "test_webloader" "test_webloader2" @@ -84,7 +84,7 @@ buildPythonPackage rec { "test_webloader_unbatched" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # AttributeError: <module 'torch.distributed' from /nix/store/... "tests/test_wids.py" diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix index 9a6459fa375e7..ce0d6d58b61fe 100644 --- a/pkgs/development/python-modules/webdav4/default.nix +++ b/pkgs/development/python-modules/webdav4/default.nix @@ -47,9 +47,9 @@ buildPythonPackage rec { pytestCheckHook pytest-cov-stub wsgidav - ] ++ passthru.optional-dependencies.fsspec; + ] ++ optional-dependencies.fsspec; - passthru.optional-dependencies = { + optional-dependencies = { fsspec = [ fsspec ]; http2 = [ httpx.optional-dependencies.http2 ]; all = [ diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix index 1566f83019dce..98740f668d17f 100644 --- a/pkgs/development/python-modules/weblate-language-data/default.nix +++ b/pkgs/development/python-modules/weblate-language-data/default.nix @@ -8,16 +8,17 @@ buildPythonPackage rec { pname = "weblate-language-data"; - version = "2024.5"; + version = "2024.6"; pyproject = true; - build-system = [ setuptools ]; src = fetchPypi { pname = "weblate_language_data"; inherit version; - hash = "sha256-kDt5ZF8cFH6HoQVlGX+jbchbwVCUIvmxHsCY3hjtjDM="; + hash = "sha256-FGLrjptIqMeKAV/O2H6ZcP+uGcr1ghqIxAHsYnOpVxg="; }; + build-system = [ setuptools ]; + dependencies = [ translate-toolkit ]; # No tests diff --git a/pkgs/development/python-modules/weblate-schemas/default.nix b/pkgs/development/python-modules/weblate-schemas/default.nix index 728612b8a103f..1fff774c17159 100644 --- a/pkgs/development/python-modules/weblate-schemas/default.nix +++ b/pkgs/development/python-modules/weblate-schemas/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, fqdn, jsonschema, rfc3987, @@ -13,12 +14,16 @@ buildPythonPackage rec { pname = "weblate-schemas"; version = "2024.1"; + pyproject = true; + src = fetchPypi { pname = "weblate_schemas"; inherit version; hash = "sha256-nYPLD3VDO1Z97HI79J6Yjj3bWp1xKB79FWPCW146iz4="; }; + build-system = [ setuptools ]; + dependencies = [ fqdn jsonschema @@ -33,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Schemas used by Weblate"; homepage = "https://github.com/WeblateOrg/weblate_schemas"; + changelog = "https://github.com/WeblateOrg/weblate_schemas/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ erictapen ]; }; diff --git a/pkgs/development/python-modules/webrtc-noise-gain/default.nix b/pkgs/development/python-modules/webrtc-noise-gain/default.nix index 68cc5938bc889..3df09891253da 100644 --- a/pkgs/development/python-modules/webrtc-noise-gain/default.nix +++ b/pkgs/development/python-modules/webrtc-noise-gain/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { buildInputs = [ abseil-cpp - ] ++ lib.optionals (stdenv.isDarwin) [ darwin.apple_sdk.frameworks.CoreServices ]; + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.CoreServices ]; pythonImportsCheck = [ "webrtc_noise_gain" ]; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index f2c7ce30d7993..907024735afb2 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook ]; # Tests fail on Darwin with `OSError: AF_UNIX path too long` - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "websockets" ]; diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 2dee5231dc723..2aaa1078200be 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # this test failed on macos # https://github.com/novnc/websockify/issues/552 "test_socket_set_keepalive_options" diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index b18dcd38c2a7e..f7166b86e459d 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { changelog = "https://github.com/huashengdun/webssh/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ davidtwco ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index bd168ccb8f599..1094573081109 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.60.4"; + version = "0.60.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Ht+TSjI1FZ+y/lt5IlepxpT5uOBYeJaNmF7aBw2YUPA="; + hash = "sha256-vWnqitYGh68PM9IM2qKJG3g0JrVfIA+s9Ngh8jpNJKg="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { Images = [ ascii-magic pillow diff --git a/pkgs/development/python-modules/weheat/default.nix b/pkgs/development/python-modules/weheat/default.nix new file mode 100644 index 0000000000000..a8f42433894ab --- /dev/null +++ b/pkgs/development/python-modules/weheat/default.nix @@ -0,0 +1,52 @@ +{ + lib, + aenum, + buildPythonPackage, + fetchFromGitHub, + pydantic, + python-dateutil, + pythonOlder, + setuptools, + urllib3, +}: + +buildPythonPackage rec { + pname = "weheat"; + version = "2024.09.23"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "wefabricate"; + repo = "wh-python"; + rev = "refs/tags/${version}"; + hash = "sha256-egxc4gJaFIjbdvDVmenN61Rsg1NmlJSqxdG/7con9mU="; + }; + + pythonRelaxDeps = [ + "urllib3" + "pydantic" + ]; + + build-system = [ setuptools ]; + + dependencies = [ + aenum + pydantic + python-dateutil + urllib3 + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "weheat" ]; + + meta = { + description = "Library to interact with the weheat API"; + homepage = "https://github.com/wefabricate/wh-python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 43758f06157b5..ebd1983a0c7fe 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -43,8 +43,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { - watchdog = lib.optionals (!stdenv.isDarwin) [ + optional-dependencies = { + watchdog = lib.optionals (!stdenv.hostPlatform.isDarwin) [ # watchdog requires macos-sdk 10.13 watchdog ]; @@ -59,11 +59,11 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ greenlet ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "werkzeug" ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_get_machine_id" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_get_machine_id" ]; disabledTestPaths = [ # ConnectionRefusedError: [Errno 111] Connection refused diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index 5673c472bd7a1..9f6e763a149a4 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.6.7"; + version = "0.6.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "ariebovenberg"; repo = "whenever"; rev = "refs/tags/${version}"; - hash = "sha256-aQ6mE9UZg/wa+N2kErDo3edXVvjL/4Bhjmi6//CCmJw="; + hash = "sha256-Y2+ZQhQpUf747OlzhQRdT1B3jZgCr0BViJ6ujPJWo3w="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -45,7 +45,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/development/python-modules/whey-pth/default.nix b/pkgs/development/python-modules/whey-pth/default.nix new file mode 100644 index 0000000000000..c40292ede641f --- /dev/null +++ b/pkgs/development/python-modules/whey-pth/default.nix @@ -0,0 +1,37 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + setuptools, + dom-toml, + whey, +}: +buildPythonPackage rec { + pname = "whey-pth"; + version = "0.0.6"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-CIpgqzNXW3VpS+k6BCpc2DNyqwgt/Af3ms59AH/V5KM="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + dom-toml + whey + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' + ''; + + meta = { + description = "Extension to whey to support .pth files."; + homepage = "https://pypi.org/project/whey-pth"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyberius-prime ]; + }; +} diff --git a/pkgs/development/python-modules/whey/default.nix b/pkgs/development/python-modules/whey/default.nix new file mode 100644 index 0000000000000..7c1aaec13e6c6 --- /dev/null +++ b/pkgs/development/python-modules/whey/default.nix @@ -0,0 +1,55 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + setuptools, + attrs, + click, + consolekit, + dist-meta, + dom-toml, + domdf-python-tools, + handy-archives, + natsort, + packaging, + pyproject-parser, + shippinglabel, +}: +buildPythonPackage rec { + pname = "whey"; + version = "0.1.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-l72fjczuuDXg/cDiqJ7roNVm4X+au+1u4AA8Szs1bNo="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + attrs + click + consolekit + dist-meta + dom-toml + domdf-python-tools + handy-archives + natsort + packaging + pyproject-parser + shippinglabel + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' + ''; + + meta = { + description = "A simple Python wheel builder for simple projects."; + homepage = "https://pypi.org/project/whey"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyberius-prime ]; + }; +} diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 6cf9a308b8202..e717e925cf16f 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "4.0.11"; + version = "4.0.13"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-iyKo8ZEL/RiOWW/n/AXcvYfoEMikugEL2z2oZjc5hHQ="; + hash = "sha256-/8tnvJ/r0QI0o2J5X2Q5J/TgwF2TQscntl0jhPj+rLY="; }; nativeBuildInputs = [ jupyter-packaging ]; diff --git a/pkgs/development/python-modules/wikitextparser/default.nix b/pkgs/development/python-modules/wikitextparser/default.nix index df3ecfa5e2dcd..1b5fe1da7e3a9 100644 --- a/pkgs/development/python-modules/wikitextparser/default.nix +++ b/pkgs/development/python-modules/wikitextparser/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "wikitextparser"; - version = "0.55.13"; + version = "0.56.2"; format = "pyproject"; src = fetchFromGitHub { owner = "5j9"; repo = "wikitextparser"; rev = "v${version}"; - hash = "sha256-qLctOX0BsKAn2JzfmV2sTLJ/KcNfaJFAjOB3pxd5LQI="; + hash = "sha256-g0Hvxw8evmCebM2joGT7XMnakVjDG74VJmZhlvUiQMU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index f2ab1675d0438..83b446947683f 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { defusedxml ]; - passthru.optional-dependencies = { + optional-dependencies = { heif = [ pillow-heif ]; }; @@ -52,7 +52,7 @@ buildPythonPackage rec { pytestCheckHook pillow wand - ] ++ passthru.optional-dependencies.heif; + ] ++ optional-dependencies.heif; meta = with lib; { description = "Python image library that sits on top of Pillow, Wand and OpenCV"; diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix index 23529f04a3568..de011db9a56d8 100644 --- a/pkgs/development/python-modules/wktutils/default.nix +++ b/pkgs/development/python-modules/wktutils/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { shapely ]; - passthru.optional-dependencies = { + optional-dependencies = { extras = [ requests scikit-learn diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 00e3c9e24412c..196397ab7f1d9 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { yarl ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer zeroconf diff --git a/pkgs/development/python-modules/wsgi-intercept/default.nix b/pkgs/development/python-modules/wsgi-intercept/default.nix index 3a1e587fc106c..e99c8a6d0f46c 100644 --- a/pkgs/development/python-modules/wsgi-intercept/default.nix +++ b/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -1,10 +1,9 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, six, httplib2, - py, pytestCheckHook, pythonOlder, requests, @@ -19,10 +18,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "wsgi_intercept"; - inherit version; - hash = "sha256-eb1sY5qxH36r5dGK2aIPYu6CocQ1EkqHbP/YA49sJME="; + src = fetchFromGitHub { + owner = "cdent"; + repo = "wsgi-intercept"; + rev = "refs/tags/v${version}"; + hash = "sha256-hs5yB0+eDlh/pNPaqYIU9C+RBpyrdPOAscQGIoqzmvU="; }; build-system = [ setuptools ]; @@ -30,9 +30,8 @@ buildPythonPackage rec { dependencies = [ six ]; nativeCheckInputs = [ - httplib2 - py pytestCheckHook + httplib2 requests urllib3 ]; @@ -48,11 +47,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "wsgi_intercept" ]; - meta = with lib; { + meta = { description = "Module that acts as a WSGI application in place of a real URI for testing"; homepage = "https://github.com/cdent/wsgi-intercept"; changelog = "https://github.com/cdent/wsgi-intercept/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ mikecm ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mikecm ]; }; } diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 4712aefbed07a..99cd521f6c5c8 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -41,13 +41,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { email = [ email-validator ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "wtforms" ]; diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index 8ad524a17c9ba..be3a181da9aaf 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -75,14 +75,14 @@ buildPythonPackage rec { sip which wxGTK - ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ wxGTK SDL ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ gst_all_1.gst-plugins-base gst_all_1.gstreamer libGL diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix index bc1eb85ab3ba0..3c63c6a739168 100644 --- a/pkgs/development/python-modules/wyoming/default.nix +++ b/pkgs/development/python-modules/wyoming/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { zeroconf = [ zeroconf ]; }; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 9ea50cdae1572..a0abc6074a35b 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -1,8 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, - flaky, + fetchFromGitHub, numpy, packaging, pandas, @@ -14,40 +13,37 @@ buildPythonPackage rec { pname = "xarray"; - version = "2024.6.0"; + version = "2024.07.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; - src = fetchPypi { - inherit pname version; - hash = "sha256-C5HgvE3AKWlHlHZA/jHsboZ84ljS98vBC+30ptaDQMc="; + src = fetchFromGitHub { + owner = "pydata"; + repo = "xarray"; + rev = "refs/tags/v${version}"; + hash = "sha256-pt0qnkgf3E/QQHQAaZLommakhqEJ4NuTyjx5tdk2N1U="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ numpy packaging pandas ]; nativeCheckInputs = [ - flaky pytestCheckHook ]; - pytestFlagsArray = [ - # ModuleNotFoundError: No module named 'xarray.datatree_' - "--ignore xarray/tests/datatree" - ]; - pythonImportsCheck = [ "xarray" ]; meta = with lib; { + changelog = "https://github.com/pydata/xarray/blob/${src.rev}/doc/whats-new.rst"; description = "N-D labeled arrays and datasets in Python"; homepage = "https://github.com/pydata/xarray"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index ebbad75f84088..9a17ffa465176 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, click, fetchFromGitHub, + fetchpatch, pytestCheckHook, pythonOlder, six, @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "xdis"; - version = "6.1.0"; + version = "6.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,9 +20,22 @@ buildPythonPackage rec { owner = "rocky"; repo = "python-xdis"; rev = "refs/tags/${version}"; - hash = "sha256-KgKTO99T2/be1sBs5rY3Oy7/Yl9WGgdG3hqqkZ7D7ZY="; + hash = "sha256-Fn1cyUPMrn1SEXl4sdQwJiNHaY+BbxBDz3nKZY965/0="; }; + # Backport magics for newer newer python versions + # 6.1.1 only supports up to 3.12.4 while nixpkgs is already on 3.12.5+ + patches = [ + (fetchpatch { + url = "https://github.com/rocky/python-xdis/commit/fcba74a7f64c5e2879ca0779ff10f38f9229e7da.patch"; + hash = "sha256-D7eJ97g4G6pmYL/guq0Ndf8yKTVBD2gAuUCAKwvlYbE="; + }) + (fetchpatch { + url = "https://github.com/rocky/python-xdis/commit/b66976ff53a2c6e17a73fb7652ddd6c8054df8db.patch"; + hash = "sha256-KO1y0nDTPmEZ+0/3Pjh+CvTdpr/p4AYZ8XdH5J+XzXo="; + }) + ]; + propagatedBuildInputs = [ click six @@ -41,6 +55,9 @@ buildPythonPackage rec { # Doesn't run on non-2.7 but has global-level mis-import "test_unit/test_dis27.py" + + # Has Python 2 style prints + "test/decompyle/test_nested_scopes.py" ]; disabledTests = [ @@ -50,11 +67,14 @@ buildPythonPackage rec { "test_basic" ]; - meta = with lib; { + meta = { description = "Python cross-version byte-code disassembler and marshal routines"; homepage = "https://github.com/rocky/python-xdis"; changelog = "https://github.com/rocky/python-xdis/releases/tag/${version}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ onny ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + onny + melvyn2 + ]; }; } diff --git a/pkgs/development/python-modules/xdoctest/default.nix b/pkgs/development/python-modules/xdoctest/default.nix index 7965d1db3efad..db4865f48e29e 100644 --- a/pkgs/development/python-modules/xdoctest/default.nix +++ b/pkgs/development/python-modules/xdoctest/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, wheel, pytestCheckHook, @@ -10,16 +9,14 @@ buildPythonPackage rec { pname = "xdoctest"; - version = "1.1.6"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "Erotemic"; repo = "xdoctest"; rev = "refs/tags/v${version}"; - hash = "sha256-L/RtD/e0ubW3j4623HQGfowXQYZjl7dDfwwbfxm3ll8="; + hash = "sha256-1c3wnQ30J2OfnBffzGfPPt9St8VpLGmFGbifzbw+cOc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 542096715a884..a053c5313997b 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.31.1"; + version = "0.32.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-ggI0beyE3gfgs5hyh7Rn9YDDkIvqqd0hA/XCy55/r2E="; + hash = "sha256-dZJsB40BMPo0tOFq0vLILrwfezf5dnspFK/aZWOV4uc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index cc04d6611f99e..89323aa8d7208 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "3.1.1"; + version = "3.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknx"; rev = "refs/tags/${version}"; - hash = "sha256-mlY9jPB3Sme9iajh5kWGf+8MHI0vMUilHe8W7AwmuCo="; + hash = "sha256-hgCmzWncHTsvfVeU/ePpu59THtmuLlqeCO11/L4BRvM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix index bd7e126de6a1d..1973c26c06209 100644 --- a/pkgs/development/python-modules/xknxproject/default.nix +++ b/pkgs/development/python-modules/xknxproject/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknxproject"; - version = "3.7.1"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-/Zg4MYOvbsbJ0zyKuq+gX0PNbm8TyyBMziIaGCq6Lt8="; + hash = "sha256-TiFeyXgu7JKrCEzGCnamguWEP+HN4DRzYOErmdlWZFY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index a24b9fe21a6a4..fb5685de6adf1 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index a2f1191de9a38..db7c59df4c1c3 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -22,13 +22,12 @@ pythonOlder, pyyaml, requests, - six, wcwidth, }: buildPythonPackage rec { pname = "xml2rfc"; - version = "3.21.0"; + version = "3.23.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,15 +36,13 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-7lYNEyoLYbxn1ld08eXaN8BumYhN9EftpHQKxdu64MY="; + hash = "sha256-8AtQxLOOgEKhkbza9YwXrZVh/++UeJq8n8a7VwIzHSc="; }; postPatch = '' substituteInPlace Makefile \ - --replace "SHELL := /bin/bash" "SHELL := bash" \ - --replace "test flaketest" "test" - substituteInPlace setup.py \ - --replace "'tox'," "" + --replace-fail "SHELL := /bin/bash" "SHELL := bash" \ + --replace-fail "test flaketest" "test" ''; propagatedBuildInputs = [ @@ -64,7 +61,6 @@ buildPythonPackage rec { pypdf2 pyyaml requests - six wcwidth ]; diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 927296f072f79..660f520c246bb 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "3.3.2"; + version = "3.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-cZVNgY0Y9tE+ud8596Ujidc7aq+Gon9x6q/XDCuJ9oI="; + hash = "sha256-0x8nk8F+kg5SSDQI4dOnv67ilyN4z2MZ5phPC3PW4WQ="; }; build-system = [ setuptools ]; @@ -35,10 +35,9 @@ buildPythonPackage rec { ]; disabledTests = [ - # -file://///filer01/MY_HOME/dev/XMLSCHEMA/test.xsd - # +file:////filer01/MY_HOME/dev/XMLSCHEMA/test.xsd - "test_normalize_url_slashes" - "test_normalize_url_with_base_unc_path" + # Incorrect error message in pickling test for Python 3.12 in Debian + # https://github.com/sissaschool/xmlschema/issues/412 + "test_pickling_subclassed_schema__issue_263" ]; pythonImportsCheck = [ "xmlschema" ]; diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index 404069497e976..8317f30e462b4 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, buildPythonPackage, python, ndtypes, @@ -20,15 +19,6 @@ buildPythonPackage { buildInputs = [ libndtypes ]; - patches = [ - # python311 fixes which are on main. remove on update - (fetchpatch { - name = "python311.patch"; - url = "https://github.com/xnd-project/xnd/commit/e1a06d9f6175f4f4e1da369b7e907ad6b2952c00.patch"; - hash = "sha256-xzrap+FL5be13bVdsJ3zeV7t57ZC4iyhuZhuLsOzHyE="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \ @@ -44,7 +34,7 @@ buildPythonPackage { mkdir $out/include cp python/xnd/*.h $out/include '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath ${libxnd}/lib $out/${python.sitePackages}/xnd/_xnd.*.so ''; diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 0e16d17bd348e..96c32ac9349a2 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "xsdata"; - version = "24.7"; + version = "24.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tefra"; repo = "xsdata"; rev = "refs/tags/v${version}"; - hash = "sha256-7rROd0iKs/SuIZGUwVDbusKgp7APIlvFto43Q3QCfZk="; + hash = "sha256-wQSrdAS4E6AmpP+pKviFomLrcSHLROhTWHg/hYGTaeQ="; }; patches = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { dependencies = [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click click-default-group @@ -59,11 +59,9 @@ buildPythonPackage rec { soap = [ requests ]; }; - nativeCheckInputs = - [ pytestCheckHook ] - ++ passthru.optional-dependencies.cli - ++ passthru.optional-dependencies.lxml - ++ passthru.optional-dependencies.soap; + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.cli ++ optional-dependencies.lxml ++ optional-dependencies.soap; disabledTestPaths = [ "tests/integration/benchmarks" ]; diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix index 41c7083520c3d..8dc572ce04fed 100644 --- a/pkgs/development/python-modules/xyzservices/default.nix +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xyzservices"; - version = "2024.6.0"; + version = "2024.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WMG9q0JX0lUbnvkc1IVx93t8TSvEW/XjwFrJezpNcoI="; + hash = "sha256-aPuDU8nbuk8f9sDy5eTllrueHbf5T099+8sm4lqmb94="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/y-py/default.nix b/pkgs/development/python-modules/y-py/default.nix index 7284ceca55a45..b01d8f5dcca3a 100644 --- a/pkgs/development/python-modules/y-py/default.nix +++ b/pkgs/development/python-modules/y-py/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; pythonImportsCheck = [ "y_py" ]; diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix index 79fffcda613df..7846303b562f9 100644 --- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix +++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yalesmartalarmclient"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "domwillcode"; repo = "yale-smart-alarm-client"; rev = "refs/tags/v${version}"; - hash = "sha256-/0Vydy7udmiaxtgxhSrwafTR37zHwsEll3VUF+hx25c="; + hash = "sha256-a0rzPEixJXLBfN+kJRPYiJiHY1BKxg/mM14RO3RiVdA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index e785273c0b2bc..7505c8e5449fd 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -10,8 +10,12 @@ freenub, poetry-core, pyjwt, + pytest-asyncio, + pytest-cov-stub, + pytest-freezegun, pytestCheckHook, python-dateutil, + python-socketio, pythonOlder, requests-mock, requests, @@ -20,7 +24,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "8.4.1"; + version = "8.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,16 +33,13 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-2n/+3VkKtwNlDgxoraIrx/ZUZ9TydybWIkLDTdbMd1w="; + hash = "sha256-+1Ff0VttUm9cwrEWNiKQfBmYjrtA3AZxWVm/iU21XCE="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "-v -Wdefault --cov=yalexs --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; + pythonRelaxDeps = [ "aiohttp" ]; + dependencies = [ aiofiles aiohttp @@ -46,16 +47,17 @@ buildPythonPackage rec { freenub pyjwt python-dateutil + python-socketio requests typing-extensions - ]; - - # aiounittest is not supported on 3.12 - doCheck = pythonOlder "3.12"; + ] ++ python-socketio.optional-dependencies.asyncio_client; nativeCheckInputs = [ aioresponses aiounittest + pytest-asyncio + pytest-cov-stub + pytest-freezegun pytestCheckHook requests-mock ]; @@ -65,7 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for Yale Access (formerly August) Smart Lock and Doorbell"; homepage = "https://github.com/bdraco/yalexs"; - changelog = "https://github.com/bdraco/yalexs/releases/tag/v${version}"; + changelog = "https://github.com/bdraco/yalexs/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index ff7560587aa47..b645cd8b56e65 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { # test failure reported upstream: https://github.com/adrienverge/yamllint/issues/373 "test_find_files_recursively" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # locale tests are broken on BSDs; see https://github.com/adrienverge/yamllint/issues/307 "test_locale_accents" "test_locale_case" diff --git a/pkgs/development/python-modules/ydata-profiling/default.nix b/pkgs/development/python-modules/ydata-profiling/default.nix index 8ad3ac1967142..d9e88875777e7 100644 --- a/pkgs/development/python-modules/ydata-profiling/default.nix +++ b/pkgs/development/python-modules/ydata-profiling/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "ydata-profiling"; - version = "4.8.3"; + version = "4.10.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -36,14 +36,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ydataai"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-tMwhoVnn65EvZK5NBvh/G36W8tH7I9qaL+NTK3IZVdI="; + rev = "refs/tags/v${version}"; + hash = "sha256-uB8E7qp1xohAdcIIt1T2DxwSu93XhJoI8/qn54fSvGY="; }; preBuild = '' echo ${version} > VERSION ''; + pythonRelaxDeps = [ + "scipy" + ]; + propagatedBuildInputs = [ dacite htmlmin diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index d9c3041c038ce..b49e0e4cbd824 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.43"; + version = "0.2.44"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = "yfinance"; rev = "refs/tags/${version}"; - hash = "sha256-pHjOXxnANnqypcycqdIV8/6u/qVVNnRFAeL4xsHjk3w="; + hash = "sha256-XaenqZMvbimuptfCpvyhXxvbJTPA94+nN938HI5gDQo="; }; build-system = [ setuptools ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { nospam = [ requests-cache requests-ratelimiter diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index d5965d455f6ed..67bee46658f64 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { requests-toolbelt ]; - passthru.optional-dependencies = { + optional-dependencies = { async_require = [ httpx ]; xmlsec_require = [ xmlsec ]; }; @@ -68,7 +68,7 @@ buildPythonPackage rec { pytest-httpx pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Failed: External connections not allowed during tests. diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 8a61451a62216..7d6cc236f8f4c 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "Ice" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://zeroc.com/"; license = licenses.gpl2; description = "Comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more"; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index a611985ad8559..b06ccc46b0ad4 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -7,6 +7,7 @@ ifaddr, poetry-core, pytest-asyncio, + pytest-cov-stub, pytest-timeout, pythonOlder, pytestCheckHook, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.132.2"; + version = "0.135.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,14 +25,9 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-Jmz9zs//EVdBbEElq6OEfGZiOiMvjV5CJxZOM/lHvok="; + hash = "sha256-3zUY9zOmC2avR7rO5O22lqqEY5ql612fRutbGl7SYKs="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "Cython>=3.0.8" "Cython" - ''; - build-system = [ cython poetry-core @@ -42,14 +38,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytest-timeout pytestCheckHook ]; - preCheck = '' - sed -i '/addopts/d' pyproject.toml - ''; - disabledTests = [ # OSError: [Errno 19] No such device "test_close_multiple_times" diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index d3be6151e7fbf..05040663a5790 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.119"; + version = "0.0.122"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-QvytImEpDk+3IeWVh9bYaX60u+mx4SVXuRxAd/YjPTE="; + hash = "sha256-/xxMcZPwIL76F+E3Rp0/VtzFOrk7e4i1knf/OIAf+48="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 6dd2540bab6f1..1847b2c49d8e4 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.31"; + version = "0.0.34"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-H1VmB20ldUyKIiMRT8YMgiFIno41WN2bY8rhqFsGYcA="; + hash = "sha256-or4mZpfcVl7fTf8O1vBxEeeJvhYNgrlV+FClrzQG/lg="; }; postPatch = '' @@ -45,10 +45,6 @@ buildPythonPackage rec { --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; - pythonRelaxDeps = [ - "pyserial-asyncio-fast" - ]; - build-system = [ setuptools wheel @@ -87,7 +83,7 @@ buildPythonPackage rec { "test_check_available_unsuccessful" "test_device_counter_sensors" "test_device_tracker" - "test_device_unavailable_skips_entity_polling" + "test_device_unavailable_or_disabled_skips_entity_polling" "test_elec_measurement_sensor_polling" "test_electrical_measurement_init" "test_group_member_assume_state" diff --git a/pkgs/development/python-modules/ziafont/checkfonts.nix b/pkgs/development/python-modules/ziafont/checkfonts.nix new file mode 100644 index 0000000000000..773d8a1ea0664 --- /dev/null +++ b/pkgs/development/python-modules/ziafont/checkfonts.nix @@ -0,0 +1,88 @@ +# Based on the calls to testfont(url) in test/manyfonts.ipynb +# Note that Tinos-Regular is also needed for test/test.ipynb +[ + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTAbbie.otf"; + hash = "sha256-/Lu7EGtF7kZgP0dYyaIFPIO7jWCbtc3iT0ux3bFhe9w="; + } + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTJupiter.otf"; + hash = "sha256-BocJZnrGGt1fpq5Jmnl1fiuo7YllN5xCF6lgWZyVcXE="; + } + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTVagaRound.otf"; + hash = "sha256-JffWcGdBN2OIZXdZxf7G3G+kZRZi2cKFUIOAOCuR8gM="; + } + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTBlackForest.otf"; + hash = "sha256-P4TQSCBHPfty3l+IhY1CuVkr0KNk2t6bbeieT21fz9A="; + } + { + url = "https://mirrors.ctan.org/fonts/punknova/punknova-regular.otf"; + hash = "sha256-UC4Zdh647wTBYXRyOzFDliVA0ukK88K8CcIS8nzxeoo="; + } + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTSnowCaps.otf"; + hash = "sha256-XtZbEhCcHlc1eHEkR+52tuVoA6GTf//5mU/ehHq/H8g="; + } + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTStoryTimeCaps.otf"; + hash = "sha256-bwW8KZD40i8rpGqZuoVBeosfjk/tWHex4KPm8mlQ4po="; + } + { + url = "https://mirrors.ctan.org/fonts/alegreya/opentype/Alegreya-Regular.otf"; + hash = "sha256-oZo6XeaTcnaSymYWrkl71t3JsWvLuKgKsNAirONNax4="; + } + { + url = "https://mirrors.ctan.org/fonts/nimbus15/opentype/zco-Oblique.otf"; + hash = "sha256-j7WbsSnLGh+OdpdBwIlp3cPL8rpYS3OcW3jtxltgArE="; + } + { + url = "https://mirrors.ctan.org/fonts/merriweather/opentype/Merriweather-Black.otf"; + hash = "sha256-3pQdqHw1eRUVCRwnVbZBbftrZ7fJ7USD+CyNfA41u3g="; + } + { + url = "https://mirrors.ctan.org/fonts/qualitype/opentype/QTArtiston.otf"; + hash = "sha256-6bfL3Po4erta9q49EgzYZXZs9NtdoWFjnpR3WT1y+vU="; + } + { + url = "https://mirrors.ctan.org/fonts/nunito/opentype/Nunito-Black.otf"; + hash = "sha256-/QJud/q2MVwrXEibDDe/gty3a3x2weodNBqCOkVV7fA="; + } + { + url = "https://mirrors.ctan.org/fonts/kurier/fonts/opentype/nowacki/kurier/KurierHeavy-Regular.otf"; + hash = "sha256-ynFz+IIntQeEK2+Cu64wJRTffZvmuYdx1IrKKDe1VA0="; + } + { + url = "https://mirrors.ctan.org/fonts/clearsans/truetype/ClearSans-MediumItalic.ttf"; + hash = "sha256-Bv+6I2ClJo71iZbj3XmUpJ3NHBZ/+8h07azt7ucbmyE="; + } + { + url = "https://mirrors.ctan.org/fonts/tinos/truetype/Tinos-Regular.ttf"; + hash = "sha256-/03rOV/yQmu9CNt0ywBbIjJhdd8A8KFWuH5tKu8e9Qg="; + } + { + url = "https://mirrors.ctan.org/fonts/gofonts/truetype/Go-Medium.ttf"; + hash = "sha256-GvMsI34wBeBQUC9RQjVNS6TukXf5faoVrPoI9L9qPEY="; + } + { + url = "https://mirrors.ctan.org/fonts/comfortaa/truetype/Comfortaa-Regular.ttf"; + hash = "sha256-eu7K9MeZ8k8i6HGm9UbKiRFs8RKIx6j/QvEUAd1URcY="; + } + { + url = "https://mirrors.ctan.org/fonts/quattrocento/truetype/Quattrocento-Regular.ttf"; + hash = "sha256-kv5NsgyBybySJha4xJ4VIEaCdMfJwyz19VRCJOwVeHs="; + } + { + url = "https://mirrors.ctan.org/fonts/kurier/fonts/opentype/nowacki/kurier/KurierCond-Regular.otf"; + hash = "sha256-y9gD/ovTuZeh5/OaQelhGLuTPFjLcPSMLfIUyHe1QXI="; + } + { + url = "https://mirrors.ctan.org/fonts/garamond-math/Garamond-Math.otf"; + hash = "sha256-xhYTd+lwhBUrlI9iq+h0y+J0BZOJVjRrVKTGSIpQCfE="; + } + { + url = "https://github.com/google/fonts/raw/main/ofl/arizonia/Arizonia-Regular.ttf"; + hash = "sha256-jfHBC8FdCroUXUWZwlyvrYPbaG0s76QmGfBptvG7zmI="; + } +] diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix index 8f4f9f8769917..c25177dc23c1d 100644 --- a/pkgs/development/python-modules/ziafont/default.nix +++ b/pkgs/development/python-modules/ziafont/default.nix @@ -6,20 +6,20 @@ setuptools, pytestCheckHook, nbval, + fetchurl, }: - buildPythonPackage rec { pname = "ziafont"; - version = "0.8"; + version = "0.9"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "cdelker"; - repo = pname; - rev = version; - hash = "sha256-C+dC+mNquDuj6RfJpiEbeuGZOIXcgSrTB4XM21reBPs="; + repo = "ziafont"; + rev = "refs/tags/${version}"; + hash = "sha256-S7IDL3ItP14/GrCUtSTT+JWuqRAY/Po0Kerq8mggDdg="; }; build-system = [ setuptools ]; @@ -29,16 +29,24 @@ buildPythonPackage rec { nbval ]; - preCheck = "rm test/manyfonts.ipynb"; # Tries to download fonts + preCheck = + let + # The test notebooks try to download font files, unless they already exist in the test directory, + # so we prepare them in advance. + checkFonts = lib.map fetchurl (import ./checkfonts.nix); + copyFontCmd = font: "cp ${font} test/${lib.last (lib.splitString "/" font.url)}\n"; + in + lib.concatMapStrings copyFontCmd checkFonts; pytestFlagsArray = [ "--nbval-lax" ]; pythonImportsCheck = [ "ziafont" ]; - meta = with lib; { + meta = { description = "Convert TTF/OTF font glyphs to SVG paths"; homepage = "https://ziafont.readthedocs.io/en/latest/"; - license = licenses.mit; - maintainers = with maintainers; [ sfrijters ]; + changelog = "https://github.com/cdelker/ziafont/blob/main/CHANGES.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sfrijters ]; }; } diff --git a/pkgs/development/python-modules/ziamath/checkfonts.nix b/pkgs/development/python-modules/ziamath/checkfonts.nix new file mode 100644 index 0000000000000..ce29060d3f184 --- /dev/null +++ b/pkgs/development/python-modules/ziamath/checkfonts.nix @@ -0,0 +1,19 @@ +# Based on the calls to testfont(url) in test/styles.ipynb +[ + { + url = "https://mirrors.ctan.org/fonts/libertinus-fonts/otf/LibertinusMath-Regular.otf"; + hash = "sha256-PY4QUzxz9/vO4k2rl5GBfno0r3/Zh1FAhif1OPDic7w="; + } + { + url = "https://mirrors.ctan.org/fonts/firamath/FiraMath-Regular.otf"; + hash = "sha256-ICjL091NjAzxYIUg60dZlWqDpnkx17bY58MTUgGG41s="; + } + { + url = "https://mirrors.ctan.org/fonts/erewhon-math/Erewhon-Math.otf"; + hash = "sha256-7SjKC+XP9KpFAWtZxc+FZZ4VETnDxokUGz+nZ/CWIbI="; + } + { + url = "https://mirrors.ctan.org/fonts/concmath-otf/Concrete-Math.otf"; + hash = "sha256-YCukkUgNQoBlotuD0vF1ts9JL8x6xaEW9JxK++GVGZ4="; + } +] diff --git a/pkgs/development/python-modules/ziamath/default.nix b/pkgs/development/python-modules/ziamath/default.nix index ac2cd86109296..7505d578ba525 100644 --- a/pkgs/development/python-modules/ziamath/default.nix +++ b/pkgs/development/python-modules/ziamath/default.nix @@ -8,20 +8,20 @@ pytestCheckHook, nbval, latex2mathml, + fetchurl, }: - buildPythonPackage rec { pname = "ziamath"; - version = "0.10"; + version = "0.11"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "cdelker"; - repo = pname; - rev = version; - hash = "sha256-Drssi+YySh4OhVYAOvgIwzeeu5dQbUUXuhwTedhUUt8="; + repo = "ziamath"; + rev = "refs/tags/${version}"; + hash = "sha256-DLpbidQEeQVKxGCbS2jeeCvmVK9ElDIDQMj5bh/x7/Q="; }; build-system = [ setuptools ]; @@ -34,22 +34,24 @@ buildPythonPackage rec { latex2mathml ]; - pytestFlagsArray = [ "--nbval-lax" ]; + preCheck = + let + # The test notebooks try to download font files, unless they already exist in the test directory, + # so we prepare them in advance. + checkFonts = lib.map fetchurl (import ./checkfonts.nix); + copyFontCmd = font: "cp ${font} test/${lib.last (lib.splitString "/" font.url)}\n"; + in + lib.concatMapStrings copyFontCmd checkFonts; - # Prevent the test suite from attempting to download fonts - postPatch = '' - substituteInPlace test/styles.ipynb \ - --replace '"def testfont(exprs, fonturl):\n",' '"def testfont(exprs, fonturl):\n", " return\n",' \ - --replace "mathfont='FiraMath-Regular.otf', " "" - ''; + pytestFlagsArray = [ "--nbval-lax" ]; pythonImportsCheck = [ "ziamath" ]; - meta = with lib; { + meta = { description = "Render MathML and LaTeX Math to SVG without Latex installation"; homepage = "https://ziamath.readthedocs.io/en/latest/"; changelog = "https://ziamath.readthedocs.io/en/latest/changes.html"; - license = licenses.mit; - maintainers = with maintainers; [ sfrijters ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sfrijters ]; }; } diff --git a/pkgs/development/python-modules/zigpy-zboss/default.nix b/pkgs/development/python-modules/zigpy-zboss/default.nix new file mode 100644 index 0000000000000..8f3ca45b5c83f --- /dev/null +++ b/pkgs/development/python-modules/zigpy-zboss/default.nix @@ -0,0 +1,63 @@ +{ + async-timeout, + buildPythonPackage, + coloredlogs, + fetchFromGitHub, + jsonschema, + lib, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + setuptools, + voluptuous, + zigpy, +}: + +buildPythonPackage rec { + pname = "zigpy-zboss"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kardia-as"; + repo = "zigpy-zboss"; + rev = "refs/tags/v${version}"; + hash = "sha256-T2R291GeFIsnDRI1tAydTlLamA3LF5tKxKFhPtcEUus="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + async-timeout + coloredlogs + jsonschema + voluptuous + zigpy + ]; + + pythonImportsCheck = [ "zigpy_zboss" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + disabledTestPaths = [ + # AttributeError: 'Ledvance' object has no attribute 'get' + "tests/application/test_connect.py" + "tests/application/test_join.py" + "tests/application/test_requests.py" + "tests/application/test_startup.py" + "tests/application/test_zdo_requests.py" + "tests/application/test_zigpy_callbacks.py" + ]; + + meta = { + changelog = "https://github.com/kardia-as/zigpy-zboss/releases/tag/v${version}"; + description = "Library for zigpy which communicates with Nordic nRF52 radios"; + homepage = "https://github.com/kardia-as/zigpy-zboss"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 1ce192040777d..9edb65707b9f7 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -27,16 +27,16 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.65.4"; + version = "0.67.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-+z25W3ubw1TJbrRghsYzcuUZUHaL5xPMeZceJ1aUrKw="; + hash = "sha256-06RKvKOXMhq6LwKSk451cR7EUW+78AZzWsrqSMgq02E="; }; postPatch = '' @@ -72,10 +72,14 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # assert quirked.quirk_metadata.quirk_location.endswith("zigpy/tests/test_quirks_v2.py]-line:104") is False - "test_quirks_v2" - ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ "test_periodic_scan_priority" ]; + disabledTests = + [ + # assert quirked.quirk_metadata.quirk_location.endswith("zigpy/tests/test_quirks_v2.py]-line:104") is False + "test_quirks_v2" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ + "test_periodic_scan_priority" + ]; disabledTestPaths = [ # Tests require network access diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix index 697a8405ecbd0..77b3743c0137e 100644 --- a/pkgs/development/python-modules/zlib-ng/default.nix +++ b/pkgs/development/python-modules/zlib-ng/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "zlib-ng"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "pycompression"; repo = "python-zlib-ng"; rev = "v${version}"; - hash = "sha256-H8Niz6BbmNCccNKHBfRma4SUt0RY846fCiHidEvcd5E="; + hash = "sha256-UsdZgpRI7h6GemT1+1g/cP/8uhLykZ//saH4JMwwlY4="; }; patches = [ diff --git a/pkgs/development/python-modules/zpp/default.nix b/pkgs/development/python-modules/zpp/default.nix new file mode 100644 index 0000000000000..c30a60fa6466e --- /dev/null +++ b/pkgs/development/python-modules/zpp/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + testers, + zpp, +}: +buildPythonPackage rec { + pname = "zpp"; + version = "1.1.0"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "jbigot"; + repo = "zpp"; + rev = "refs/tags/${version}"; + hash = "sha256-Jvh80TfOonZ57lb+4PulVOUKi9Y74nplIcrPzlUPw3M="; + }; + + build-system = [ setuptools ]; + + passthru = { + tests.version = testers.testVersion { package = zpp; }; + }; + + meta = { + description = "The 'Z' pre-processor, the last preprocessor you'll ever need"; + homepage = "https://github.com/jbigot/zpp"; + license = lib.licenses.mit; + mainProgram = "zpp"; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/zulip-emoji-mapping/default.nix b/pkgs/development/python-modules/zulip-emoji-mapping/default.nix new file mode 100644 index 0000000000000..d27d2fd355b08 --- /dev/null +++ b/pkgs/development/python-modules/zulip-emoji-mapping/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "zulip-emoji-mapping"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "GearKite"; + repo = "zulip-emoji-mapping"; + rev = "v${version}"; + hash = "sha256-logm5uAnLAcFqI7mUxKEO9ZmHqRkd6CFiCW4B5tqZzg="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ + "zulip_emoji_mapping" + ]; + + meta = { + description = "Get emojis by Zulip names"; + homepage = "https://github.com/GearKite/zulip-emoji-mapping"; + changelog = "https://github.com/GearKite/zulip-emoji-mapping/releases"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ robertrichter ]; + }; +} diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index bb374e1ec42b6..d2caa2c2f383d 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.57.0"; + version = "0.58.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; rev = "refs/tags/${version}"; - hash = "sha256-5Kvk73tRnHFi5YDzMmRj1r7gKuAPkecPF9q9L2qhAUI="; + hash = "sha256-hszt14ymZQsUg0zfJ7+cY08DlXNaWzxKwV/i4i29DtI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python2-modules/cffi/default.nix b/pkgs/development/python2-modules/cffi/default.nix index adeda6e90d229..aa6f49f95e3ce 100644 --- a/pkgs/development/python2-modules/cffi/default.nix +++ b/pkgs/development/python2-modules/cffi/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, cffi }: if cffi == null then null else cffi.overridePythonAttrs { - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # cannot load library 'c' "test_FILE" "test_FILE_object" diff --git a/pkgs/development/python2-modules/configparser/default.nix b/pkgs/development/python2-modules/configparser/default.nix index 5cb0e9cf89617..956c12f44c5dc 100644 --- a/pkgs/development/python2-modules/configparser/default.nix +++ b/pkgs/development/python2-modules/configparser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; preConfigure = '' - export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 + export LC_ALL=${if stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8 ''; meta = with lib; { diff --git a/pkgs/development/python2-modules/futures/default.nix b/pkgs/development/python2-modules/futures/default.nix index d1cdb679d0d1e..5cad6c13029d9 100644 --- a/pkgs/development/python2-modules/futures/default.nix +++ b/pkgs/development/python2-modules/futures/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ${python.interpreter} test_futures.py ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Backport of the concurrent.futures package from Python 3.2"; diff --git a/pkgs/development/python2-modules/jinja2/default.nix b/pkgs/development/python2-modules/jinja2/default.nix index 3b593338763f0..1b6948a66aade 100644 --- a/pkgs/development/python2-modules/jinja2/default.nix +++ b/pkgs/development/python2-modules/jinja2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 # warnings are no longer being filtered correctly for python2 - doCheck = !stdenv.is32bit && isPy3k; + doCheck = !stdenv.hostPlatform.is32bit && isPy3k; checkPhase = '' pytest -v tests -W ignore::DeprecationWarning diff --git a/pkgs/development/python2-modules/more-itertools/default.nix b/pkgs/development/python2-modules/more-itertools/default.nix index 615b1d00d2040..7a09dda8e9cd7 100644 --- a/pkgs/development/python2-modules/more-itertools/default.nix +++ b/pkgs/development/python2-modules/more-itertools/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, nose +, unittestCheckHook , six , stdenv }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"; }; - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ unittestCheckHook ]; propagatedBuildInputs = [ six ]; # iterable = range(10 ** 10) # Is efficiently reversible diff --git a/pkgs/development/python2-modules/pygobject/default.nix b/pkgs/development/python2-modules/pygobject/default.nix index 00c98fba39aff..3202c6e6af76d 100644 --- a/pkgs/development/python2-modules/pygobject/default.nix +++ b/pkgs/development/python2-modules/pygobject/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { outputs = [ "out" "devdoc" ]; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./pygobject-2.0-fix-darwin.patch (fetchpatch { url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch"; diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix index 003474ee85827..68a7dba4c8e36 100644 --- a/pkgs/development/python2-modules/pygtk/default.nix +++ b/pkgs/development/python2-modules/pygtk/default.nix @@ -37,8 +37,8 @@ buildPythonPackage rec { buildPhase = "buildPhase"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-ObjC" - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -lpython2.7"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-ObjC" + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) " -lpython2.7"; installPhase = "installPhase"; diff --git a/pkgs/development/python2-modules/wcwidth/default.nix b/pkgs/development/python2-modules/wcwidth/default.nix index 023b92a869071..eccaadf66c54f 100644 --- a/pkgs/development/python2-modules/wcwidth/default.nix +++ b/pkgs/development/python2-modules/wcwidth/default.nix @@ -1,10 +1,24 @@ { backports-functools-lru-cache , wcwidth +, lib }: wcwidth.overridePythonAttrs(oldAttrs: { propagatedBuildInputs = oldAttrs.propagatedBuildInputs or [] ++ [ backports-functools-lru-cache ]; -}) + /** + As of version 0.2.13 upstream still supports python2. In the future, this + package should be dropped or pinned to the last working version after the + final release for python2. See: + https://github.com/jquast/wcwidth/pull/117#issuecomment-1946609638 + */ + disabled = false; + + meta = oldAttrs.meta // { + /** maintainers overridden here for python2; this makes sure that python3 + maintainers are not blamed for the breakage here. */ + maintainers = with lib.maintainers; [ bryango ]; + }; +}) diff --git a/pkgs/development/r-modules/bioc-annotation-packages.json b/pkgs/development/r-modules/bioc-annotation-packages.json index 33924055d395f..1f127a9744086 100644 --- a/pkgs/development/r-modules/bioc-annotation-packages.json +++ b/pkgs/development/r-modules/bioc-annotation-packages.json @@ -763,7 +763,7 @@ "name": "ENCODExplorerData", "version": "0.99.5", "sha256": "00gfm5l8pxrfs4cw4jlw6n0cz5s31isg69k833n89800v26w3kvh", - "depends": ["data_table", "jsonlite", "RCurl"] + "depends": ["RCurl", "data_table", "jsonlite"] }, "EPICv2manifest": { "name": "EPICv2manifest", @@ -847,13 +847,13 @@ "name": "FDb.InfiniumMethylation.hg18", "version": "2.2.0", "sha256": "0vwzqzj49imjdsn8ssiwqi7qic7rqw5pbsiinyxgy7y10fn2i42a", - "depends": ["AnnotationDbi", "Biostrings", "GenomicFeatures", "org_Hs_eg_db", "TxDb_Hsapiens_UCSC_hg18_knownGene"] + "depends": ["AnnotationDbi", "Biostrings", "GenomicFeatures", "TxDb_Hsapiens_UCSC_hg18_knownGene", "org_Hs_eg_db"] }, "FDb_InfiniumMethylation_hg19": { "name": "FDb.InfiniumMethylation.hg19", "version": "2.2.0", "sha256": "0gq90fvph6kgrpjb89nvzq6hl1k24swn19rgjh5g98l86mja6nk0", - "depends": ["AnnotationDbi", "Biostrings", "GenomicFeatures", "org_Hs_eg_db", "TxDb_Hsapiens_UCSC_hg19_knownGene"] + "depends": ["AnnotationDbi", "Biostrings", "GenomicFeatures", "TxDb_Hsapiens_UCSC_hg19_knownGene", "org_Hs_eg_db"] }, "FDb_UCSC_snp135common_hg19": { "name": "FDb.UCSC.snp135common.hg19", @@ -901,7 +901,7 @@ "name": "GenomicState", "version": "0.99.15", "sha256": "1r7z3n6wyrd2cclj5b7sg15wpmjdh9k5b1hjlw7jjx8j384l7l1h", - "depends": ["AnnotationDbi", "AnnotationHub", "bumphunter", "derfinder", "GenomeInfoDb", "GenomicFeatures", "IRanges", "org_Hs_eg_db", "rtracklayer"] + "depends": ["AnnotationDbi", "AnnotationHub", "GenomeInfoDb", "GenomicFeatures", "IRanges", "bumphunter", "derfinder", "org_Hs_eg_db", "rtracklayer"] }, "HDO_db": { "name": "HDO.db", @@ -919,7 +919,7 @@ "name": "Homo.sapiens", "version": "1.3.1", "sha256": "151vj7h5p1c8yd5swrchk46z469p135wk50hvkl0nhgndvy0jj01", - "depends": ["AnnotationDbi", "GenomicFeatures", "GO_db", "org_Hs_eg_db", "OrganismDbi", "TxDb_Hsapiens_UCSC_hg19_knownGene"] + "depends": ["AnnotationDbi", "GO_db", "GenomicFeatures", "OrganismDbi", "TxDb_Hsapiens_UCSC_hg19_knownGene", "org_Hs_eg_db"] }, "Hs6UG171_db": { "name": "Hs6UG171.db", @@ -1177,13 +1177,13 @@ "name": "MafH5.gnomAD.v3.1.2.GRCh38", "version": "3.15.1", "sha256": "1q9hlva814sjfz8vm9bzw7xzppbcfy5qq7nnz9w742yr59cjb6mp", - "depends": ["BSgenome", "GenomeInfoDb", "GenomicRanges", "GenomicScores", "HDF5Array", "IRanges", "rhdf5", "S4Vectors"] + "depends": ["BSgenome", "GenomeInfoDb", "GenomicRanges", "GenomicScores", "HDF5Array", "IRanges", "S4Vectors", "rhdf5"] }, "MafH5_gnomAD_v4_0_GRCh38": { "name": "MafH5.gnomAD.v4.0.GRCh38", "version": "3.19.0", "sha256": "1hb905rvxvzh2nap52agcm488yarn2j99d23yxa133jw9d8a9zqk", - "depends": ["BSgenome", "GenomeInfoDb", "GenomicRanges", "GenomicScores", "HDF5Array", "IRanges", "rhdf5", "S4Vectors"] + "depends": ["BSgenome", "GenomeInfoDb", "GenomicRanges", "GenomicScores", "HDF5Array", "IRanges", "S4Vectors", "rhdf5"] }, "MmAgilentDesign026655_db": { "name": "MmAgilentDesign026655.db", @@ -1213,7 +1213,7 @@ "name": "Mus.musculus", "version": "1.3.1", "sha256": "143zdf83gbfqhy8jm9df7gzhw5q3a64jrjrxrzjf0zd76j8s8j6y", - "depends": ["AnnotationDbi", "GenomicFeatures", "GO_db", "org_Mm_eg_db", "OrganismDbi", "TxDb_Mmusculus_UCSC_mm10_knownGene"] + "depends": ["AnnotationDbi", "GO_db", "GenomicFeatures", "OrganismDbi", "TxDb_Mmusculus_UCSC_mm10_knownGene", "org_Mm_eg_db"] }, "Norway981_db": { "name": "Norway981.db", @@ -1273,7 +1273,7 @@ "name": "Rattus.norvegicus", "version": "1.3.1", "sha256": "0bpd7i5jvl2jvf822mhxankx7cqqr4l70xp4f7hcknxw3lxia2f1", - "depends": ["AnnotationDbi", "GenomicFeatures", "GO_db", "org_Rn_eg_db", "OrganismDbi", "TxDb_Rnorvegicus_UCSC_rn5_refGene"] + "depends": ["AnnotationDbi", "GO_db", "GenomicFeatures", "OrganismDbi", "TxDb_Rnorvegicus_UCSC_rn5_refGene", "org_Rn_eg_db"] }, "RmiR_Hs_miRNA": { "name": "RmiR.Hs.miRNA", @@ -1321,37 +1321,37 @@ "name": "SNPlocs.Hsapiens.dbSNP144.GRCh37", "version": "0.99.20", "sha256": "1z8kx43ki1jvj7ms7pcybakcdimfwr6zpjvspkjmma97bdz093iz", - "depends": ["BiocGenerics", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] }, "SNPlocs_Hsapiens_dbSNP144_GRCh38": { "name": "SNPlocs.Hsapiens.dbSNP144.GRCh38", "version": "0.99.20", "sha256": "0yxmsnxncr7w30r0d7bg5i96pclm2vf40p9jdqa02rc67a6sximn", - "depends": ["BiocGenerics", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] }, "SNPlocs_Hsapiens_dbSNP149_GRCh38": { "name": "SNPlocs.Hsapiens.dbSNP149.GRCh38", "version": "0.99.20", "sha256": "17bv25p1261hn9d7mxfp6pvivj15pxyvr92gms8a8msfqg9y0xkb", - "depends": ["BiocGenerics", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] }, "SNPlocs_Hsapiens_dbSNP150_GRCh38": { "name": "SNPlocs.Hsapiens.dbSNP150.GRCh38", "version": "0.99.20", "sha256": "0jkwwgxxpm9ry8kizq8hs70sky41pks1ag40y5aqq91yjbpqlckj", - "depends": ["BiocGenerics", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] }, "SNPlocs_Hsapiens_dbSNP155_GRCh37": { "name": "SNPlocs.Hsapiens.dbSNP155.GRCh37", "version": "0.99.24", "sha256": "0am2r8hn5ybxlvlw7c0i91n5xii0km3iy7d9a0wc9v1ykvk6qmgz", - "depends": ["BiocGenerics", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] }, "SNPlocs_Hsapiens_dbSNP155_GRCh38": { "name": "SNPlocs.Hsapiens.dbSNP155.GRCh38", "version": "0.99.24", "sha256": "1yzywcyk1yngjys9pyykilzw0w4nfxdmwz04w3b17chsbxvckl5s", - "depends": ["BiocGenerics", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] }, "SomaScan_db": { "name": "SomaScan.db", @@ -1657,13 +1657,13 @@ "name": "XtraSNPlocs.Hsapiens.dbSNP144.GRCh37", "version": "0.99.12", "sha256": "0k823fvqjmdkmd47m7wyra6jxmv8lnk2i1xl4pp0mh3zgb87hgfb", - "depends": ["BiocGenerics", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] }, "XtraSNPlocs_Hsapiens_dbSNP144_GRCh38": { "name": "XtraSNPlocs.Hsapiens.dbSNP144.GRCh38", "version": "0.99.12", "sha256": "0d4q32ij2x4726wvw06sgmivid0n94vfdmszdyh607xlcahqxa5z", - "depends": ["BiocGenerics", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] }, "adme16cod_db": { "name": "adme16cod.db", @@ -2089,7 +2089,7 @@ "name": "geneplast.data", "version": "0.99.9", "sha256": "1i31kx4kckfg965s9l3pilvmg847av3rpa05aql43259ccyng4hi", - "depends": ["ape", "BiocFileCache", "dplyr", "geneplast", "igraph", "purrr", "readr", "tibble", "tidyr", "treeio"] + "depends": ["BiocFileCache", "ape", "dplyr", "geneplast", "igraph", "purrr", "readr", "tibble", "tidyr", "treeio"] }, "geneplast_data_string_v91": { "name": "geneplast.data.string.v91", @@ -2119,7 +2119,7 @@ "name": "grasp2db", "version": "1.1.0", "sha256": "1aq19myhcl9kdmzy8f4c3ilf0s0ng99rl58jja2xlmqsm2hik7ya", - "depends": ["AnnotationHub", "dbplyr", "digest", "dplyr", "GenomeInfoDb", "RSQLite"] + "depends": ["AnnotationHub", "GenomeInfoDb", "RSQLite", "dbplyr", "digest", "dplyr"] }, "gwascatData": { "name": "gwascatData", @@ -3277,13 +3277,13 @@ "name": "miRBaseVersions.db", "version": "1.1.0", "sha256": "09n0309glsj53g6wainl5m0vwnlx71ija5zmlqd0cpbhdis5zihw", - "depends": ["AnnotationDbi", "DBI", "gtools", "RSQLite"] + "depends": ["AnnotationDbi", "DBI", "RSQLite", "gtools"] }, "miRNAtap_db": { "name": "miRNAtap.db", "version": "0.99.10", "sha256": "1j4igmyb9f4fa0a72hkmq3f7xgvyv38wai3mds5sd6mfgfc3brs3", - "depends": ["AnnotationDbi", "DBI", "miRNAtap", "RSQLite"] + "depends": ["AnnotationDbi", "DBI", "RSQLite", "miRNAtap"] }, "mirbase_db": { "name": "mirbase.db", @@ -3799,1015 +3799,1015 @@ "name": "pd.081229.hg18.promoter.medip.hx1", "version": "0.99.4", "sha256": "1h4925dmw0vfsnhllg55gswq3sxfmx9rcjzifdvgs9y27399psrr", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "oligo", "oligoClasses"] }, "pd_2006_07_18_hg18_refseq_promoter": { "name": "pd.2006.07.18.hg18.refseq.promoter", "version": "1.8.1", "sha256": "09593qkh3jqlgxlqrpl3gla3y1kcshnzlq6nf10xhlps0qdlskhx", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "oligo", "oligoClasses"] }, "pd_2006_07_18_mm8_refseq_promoter": { "name": "pd.2006.07.18.mm8.refseq.promoter", "version": "0.99.3", "sha256": "14cm7z1y7rsk5m2zazg27wvjabckb9ifwa1g091ckwn1jfaf7aqn", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "oligo", "oligoClasses"] }, "pd_2006_10_31_rn34_refseq_promoter": { "name": "pd.2006.10.31.rn34.refseq.promoter", "version": "0.99.3", "sha256": "0v0fa1hn5bwa15vg31dar2x0xfki0xby6qf5p1a0ivrx3pnvbsrl", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "oligo", "oligoClasses"] }, "pd_ag": { "name": "pd.ag", "version": "3.12.0", "sha256": "0kh7ridgihqpibazpxpf9y8qiznxm4nng39701abamadxb5r6qmq", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_aragene_1_0_st": { "name": "pd.aragene.1.0.st", "version": "3.12.0", "sha256": "0255bgsqz8fflnlnxw77wvv6rky46n3pcryk9yhw7nfx0cq19v4r", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_aragene_1_1_st": { "name": "pd.aragene.1.1.st", "version": "3.12.0", "sha256": "105qfxg8p9z0bzffm6zg16c5f6nnv5hddlpcxs0kp3daddap8h5s", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_ath1_121501": { "name": "pd.ath1.121501", "version": "3.12.0", "sha256": "0j83s6402xrggnlnqjyphy577by9w1ncvf1az4immzaixdamaaxc", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_barley1": { "name": "pd.barley1", "version": "3.12.0", "sha256": "0mha6w2zh7gi4y7ngkh84jaff50h8l9a0q9dwc8a00m5npkpkv4g", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_bovgene_1_0_st": { "name": "pd.bovgene.1.0.st", "version": "3.12.0", "sha256": "00ys19pdc7zgprfrhmk0pzfb5q96qy0vqxi2a6g28pxwf3367b30", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_bovgene_1_1_st": { "name": "pd.bovgene.1.1.st", "version": "3.12.0", "sha256": "0npjm9rpcwj5j8sh1mdr5j1fz7dbwrqvjh2jx69fpslry69i6daq", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_bovine": { "name": "pd.bovine", "version": "3.12.0", "sha256": "1g03za5jc8lz21wpx1h2rcxdwsx7ddmmnyflz46z35ginzy41g7h", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_bsubtilis": { "name": "pd.bsubtilis", "version": "3.12.0", "sha256": "07x4dss0zp3p315q38bi7xarycav2hr44x7jb1jx4dypr0jh98mh", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_cangene_1_0_st": { "name": "pd.cangene.1.0.st", "version": "3.12.0", "sha256": "0dcwy6gnlj51hkc2gsv6fdq02vczci4z37f3iy1n8zkvz5b4yw6c", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_cangene_1_1_st": { "name": "pd.cangene.1.1.st", "version": "3.12.0", "sha256": "0pgw1424rvg3k9m3z6ffiyfj91i930dx2slqd15bnvc9hrr75094", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_canine": { "name": "pd.canine", "version": "3.12.0", "sha256": "0xpisxv7c990w44gd5g2iwfzqi3618xa3mdps69z2j4bfrcm37vq", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_canine_2": { "name": "pd.canine.2", "version": "3.12.0", "sha256": "1dx914yyq6ry88d6fipsxsvp41pgcgllznpwsqqm2xa99y85ka5y", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_celegans": { "name": "pd.celegans", "version": "3.12.0", "sha256": "08byc5xvnbfdlikv9118k52pk37br4k8hn86xypkrmbz67fzlzpd", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_charm_hg18_example": { "name": "pd.charm.hg18.example", "version": "0.99.4", "sha256": "0nqv3h4zp83vp7q49n956920x5hdfcbw4z3hlvmqx8dixbgr1jrg", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "oligo", "oligoClasses"] }, "pd_chicken": { "name": "pd.chicken", "version": "3.12.0", "sha256": "1alkhr297ar6iv7nrjxnlhmq3xvjzpl46mdckkbxw13w73vj6p32", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_chigene_1_0_st": { "name": "pd.chigene.1.0.st", "version": "3.12.0", "sha256": "0smfgx1brfla96ijsv3a3ljcn02kpbk6sczgp06dik3g0k54788h", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_chigene_1_1_st": { "name": "pd.chigene.1.1.st", "version": "3.12.0", "sha256": "013baf38h35fsxq0f32v00rizik8iq76jm1s8azkicv90bvw5g8k", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_chogene_2_0_st": { "name": "pd.chogene.2.0.st", "version": "3.12.0", "sha256": "0pljjz466y2aav9045qgr5hbrv7alyl3gw3br4a8knbijk6fbw15", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_chogene_2_1_st": { "name": "pd.chogene.2.1.st", "version": "3.12.0", "sha256": "0d9pslimh0w37yvvfgqljbr2z5arjn6kx0wnjhp19gcch44jvkr2", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_citrus": { "name": "pd.citrus", "version": "3.12.0", "sha256": "1792gsxdr24264n121zvspdq39ac3khaghv5j66rn2nzqds75qch", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_clariom_d_human": { "name": "pd.clariom.d.human", "version": "3.14.1", "sha256": "11q4s4q07fpkl5wpmhhjfkrp4l8i8gy1i8wc80aar84lp1261vvx", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_clariom_s_human": { "name": "pd.clariom.s.human", "version": "3.14.1", "sha256": "0a68mnwv735mi9k9qxs2vv4hnh76yg1n7jjyaw34g8m7405yjxxp", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_clariom_s_human_ht": { "name": "pd.clariom.s.human.ht", "version": "3.14.1", "sha256": "08fzm8xp6wa4x03vqb28dvlz3hiwv2q5n5h9m2np0g4g40hbhg89", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_clariom_s_mouse": { "name": "pd.clariom.s.mouse", "version": "3.14.1", "sha256": "15fc25840lnhv0rlxc98akda1gis1s4xn61ycvymjii3lgx8hwpk", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_clariom_s_mouse_ht": { "name": "pd.clariom.s.mouse.ht", "version": "3.14.1", "sha256": "1ka9mganvymml306yh196rqan333ykrmqp9dfl4xs9mz57p405kk", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_clariom_s_rat": { "name": "pd.clariom.s.rat", "version": "3.14.1", "sha256": "1bx0vipcw3vjpz59h5820yanwy7b8mxb8bkgwp3n58vm24x7l304", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_clariom_s_rat_ht": { "name": "pd.clariom.s.rat.ht", "version": "3.14.1", "sha256": "17fk4qiznh2ks7r4mzbv1gnpjca39n6rzshb5dw5n73rbnd24160", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_cotton": { "name": "pd.cotton", "version": "3.12.0", "sha256": "1h71klvndi32j7hb7cy2w6asf7lb1xhs5glxajnd30y7ksigba7l", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_cyngene_1_0_st": { "name": "pd.cyngene.1.0.st", "version": "3.12.0", "sha256": "1xkv8m346x1zrnp4bhbjk2xwfq5jkbprbh417bya8swqvcyv3zbj", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_cyngene_1_1_st": { "name": "pd.cyngene.1.1.st", "version": "3.12.0", "sha256": "1kicrk0n2lik32q9nkpfy8ydh8klsy6i5cy6m2grddv80g5hc6n4", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_cyrgene_1_0_st": { "name": "pd.cyrgene.1.0.st", "version": "3.12.0", "sha256": "1s7rrwcmaar230y90hhvrx3wxlp228j88pwdh2glap2pn3d3rlnd", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_cyrgene_1_1_st": { "name": "pd.cyrgene.1.1.st", "version": "3.12.0", "sha256": "0p7j8ygyx8f5aqyy847rfcc35hrkcavi1700af971jjrha3gllc0", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_cytogenetics_array": { "name": "pd.cytogenetics.array", "version": "3.12.0", "sha256": "0gd7q64zfxda9irdmmr92iqxlswaj5v4pklsfm96xkn8lxq34dlb", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_drogene_1_0_st": { "name": "pd.drogene.1.0.st", "version": "3.12.0", "sha256": "1zp85q3a2bayr0q5r0ij62kfypzngcz9v791xsf9n9k7nx6714fi", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_drogene_1_1_st": { "name": "pd.drogene.1.1.st", "version": "3.12.0", "sha256": "0yjxjzmcx2hh6rm15p9d36vfj77fwmd7q2kbjk8h7hbpkm72ssdf", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_drosgenome1": { "name": "pd.drosgenome1", "version": "3.12.0", "sha256": "1cp3fs2g88yv50gkd6m769idlj7kci2g82wafn17ci65g64q0g05", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_drosophila_2": { "name": "pd.drosophila.2", "version": "3.12.0", "sha256": "0rr3l6203nfzhz21wps7dfcifvzmbnixcr2piv5jdfh7birj23aa", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_e_coli_2": { "name": "pd.e.coli.2", "version": "3.12.0", "sha256": "1nny0w0adg433n1i20q0jdmi5yy1anpa91dgrklpvxyxbr5902vz", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_ecoli": { "name": "pd.ecoli", "version": "3.12.0", "sha256": "0mi5i0cp5xz97pb3ic6qmwl3fp4byyddvas2npll4ngarl5wv5ag", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_ecoli_asv2": { "name": "pd.ecoli.asv2", "version": "3.12.0", "sha256": "19pn7691cr0vakxlx0q0x3p1pfc0z8l5f14475bv2fr4djljhhma", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_elegene_1_0_st": { "name": "pd.elegene.1.0.st", "version": "3.12.0", "sha256": "1if8gwvvk9jybsrcwr8sayg1czchpnlmysa9plrm50g7r2ki7m4l", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_elegene_1_1_st": { "name": "pd.elegene.1.1.st", "version": "3.12.0", "sha256": "18v3n3ss3rl2ksvjg1jk1w0mprhhxra55znixfcd8ikqsrdfj2a2", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_equgene_1_0_st": { "name": "pd.equgene.1.0.st", "version": "3.12.0", "sha256": "01vcj6a6hm9j2fbhrz244sbig63j1jyxyg068q4hizpl9lpzaibd", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_equgene_1_1_st": { "name": "pd.equgene.1.1.st", "version": "3.12.0", "sha256": "0migyzmrgqvvnkl8w61qv26hj5kjy720q4ipamdn99z9s4r8cxrn", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_feinberg_hg18_me_hx1": { "name": "pd.feinberg.hg18.me.hx1", "version": "0.99.3", "sha256": "1k50khs7mrp1qy9z0whm5drwv59m8zn7v0zxhv26bpvmwbrnlhfg", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "oligo", "oligoClasses"] }, "pd_feinberg_mm8_me_hx1": { "name": "pd.feinberg.mm8.me.hx1", "version": "0.99.3", "sha256": "1xk4rmpxjh9mwijwglzlycg7bk2zk599fk7xbnk114rj216y2jsm", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "oligo", "oligoClasses"] }, "pd_felgene_1_0_st": { "name": "pd.felgene.1.0.st", "version": "3.12.0", "sha256": "1lf3lp3zjprfwni2nfdpkvj2j6y7hd7znmxqcgj46vccznc49hh6", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_felgene_1_1_st": { "name": "pd.felgene.1.1.st", "version": "3.12.0", "sha256": "027cgqxfgmlkx64y6nm9h36ji781fkrnnrdxblh8h4jwjd5n36rj", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_fingene_1_0_st": { "name": "pd.fingene.1.0.st", "version": "3.12.0", "sha256": "0l19h920cghw65nqbh79s1rwijqdl7k84km0iv1fgx0kxhh28xa0", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_fingene_1_1_st": { "name": "pd.fingene.1.1.st", "version": "3.12.0", "sha256": "1habbw9fvygailw73azfrvczgp6ap1az688vz8pklqq77vlqs1qz", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_genomewidesnp_5": { "name": "pd.genomewidesnp.5", "version": "3.14.1", "sha256": "1kiqmcc07q2m7hkgqczqndk7frpwibpsi2c0ihr5av0vjrp118ak", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_genomewidesnp_6": { "name": "pd.genomewidesnp.6", "version": "3.14.1", "sha256": "1f35nw987axlc5rsr97i7rwcy1dd8zjjj6jf4cg75y0la6rvhfw4", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_guigene_1_0_st": { "name": "pd.guigene.1.0.st", "version": "3.12.0", "sha256": "1rq5gbdm6k0shv82zy7vrqxahzffh1xikrd3a6d1ai67n129bv6f", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_guigene_1_1_st": { "name": "pd.guigene.1.1.st", "version": "3.12.0", "sha256": "0p53kkhaa4d6ib32sfnwvs363zir227dmzxp8yqma0z4kz0djdna", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hc_g110": { "name": "pd.hc.g110", "version": "3.12.0", "sha256": "014bb45m2pwwbz7aca6l6442188mkp5bsk46z7x18g0aa66p06hv", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_focus": { "name": "pd.hg.focus", "version": "3.12.0", "sha256": "1qlkhxq76nb55c299g7x7x8wn8nx1mg4ra5b0faflsjirkh4b32s", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_u133_plus_2": { "name": "pd.hg.u133.plus.2", "version": "3.12.0", "sha256": "02ip0mf24lw818ij8xgk7cylb5q1059jwvbdd2aynqqwy2mg31h0", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_u133a": { "name": "pd.hg.u133a", "version": "3.12.0", "sha256": "08bk5im2zkb1vif1i6bgfx068xcl5q5m0ac33zpscfdq4jashm7k", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_u133a_2": { "name": "pd.hg.u133a.2", "version": "3.12.0", "sha256": "1rlh62r5zmxllkc9izr6a4yr2n88flfz1rybwvi90yggc788chxy", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_u133a_tag": { "name": "pd.hg.u133a.tag", "version": "3.12.0", "sha256": "1ndjzcydshh5f3cnrav91hi47bx92z6rqliiwirhx2cqk8bvz5yp", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_u133b": { "name": "pd.hg.u133b", "version": "3.12.0", "sha256": "1mafh53bj6g30869pdyl59040m2crqqbfcbdpdxfpigxpqr3rb4c", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_u219": { "name": "pd.hg.u219", "version": "3.12.0", "sha256": "04kqvh5ilf83z2iwvfw7m8xsgjxy29vqayp1lgh38y48j0nn24dk", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_u95a": { "name": "pd.hg.u95a", "version": "3.12.0", "sha256": "1c7d16im1xxs8v0ccn19klwv43qr6b4iw0k5hz9cl8m10jmyw49b", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_u95av2": { "name": "pd.hg.u95av2", "version": "3.12.0", "sha256": "1l3y2bhjk67jwxvxwn5rngzn5c2dzk4lk24cm74f6px845qw5sk7", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_u95b": { "name": "pd.hg.u95b", "version": "3.12.0", "sha256": "0gyxh7nagya1hgh5vvwalxmhbqm9pii3l6h1mndvx2ib58msh49h", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_u95c": { "name": "pd.hg.u95c", "version": "3.12.0", "sha256": "0p9yrwjw75r5dg3z0pl4yr04agjpqv9rz3in2faw3pqawdzndihq", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_u95d": { "name": "pd.hg.u95d", "version": "3.12.0", "sha256": "0ygfx73b122b468zvr9lhw2vkr1aijasrazarqjqc8bjbfm4fybw", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg_u95e": { "name": "pd.hg.u95e", "version": "3.12.0", "sha256": "0cksi811m9fzjq5linlsarfswp3p7rdgks0js3chv91jr3v2z3a7", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hg18_60mer_expr": { "name": "pd.hg18.60mer.expr", "version": "3.12.0", "sha256": "1lsfsgsj6gyv0q509d0axr6g2yv226zxqh8f2n1hw0kfxwl27bm8", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_ht_hg_u133_plus_pm": { "name": "pd.ht.hg.u133.plus.pm", "version": "3.12.0", "sha256": "1000f1d28yzc0kcdf380fkx3xlgla3kn4n9f2ddawzjb7igash92", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_ht_hg_u133a": { "name": "pd.ht.hg.u133a", "version": "3.12.0", "sha256": "14bnnxsn02mpyynn8bvl8c47id9l2wfakngbvpq4h5yjy689jm1c", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_ht_mg_430a": { "name": "pd.ht.mg.430a", "version": "3.12.0", "sha256": "10shsap47217p6zmb9fn86na7if965h45l2r787cisgyyn9n45mq", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hta_2_0": { "name": "pd.hta.2.0", "version": "3.12.2", "sha256": "004mm93wag59arzirws3cfqjv4whl8sbv558xxg7pj1ar026g4m3", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hu6800": { "name": "pd.hu6800", "version": "3.12.0", "sha256": "07dj0avpx53kwaab9s126pn844nal9kn3h288n1m0kihir2mrjmv", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_huex_1_0_st_v2": { "name": "pd.huex.1.0.st.v2", "version": "3.14.1", "sha256": "1chlvjy1gvw5r8hfmkb34m3h7w2z4s5x9gsc50qbj84988k4gzga", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hugene_1_0_st_v1": { "name": "pd.hugene.1.0.st.v1", "version": "3.14.1", "sha256": "1ikd6h7wnyxm11j0had2wcsxfbfrwdfw9605bvvdgd63dlvdv5dk", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hugene_1_1_st_v1": { "name": "pd.hugene.1.1.st.v1", "version": "3.14.1", "sha256": "0bsvwr4h8j4niagnmf7d2jd714dqk4yzdhr664z6vpx6429s0rsw", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hugene_2_0_st": { "name": "pd.hugene.2.0.st", "version": "3.14.1", "sha256": "02m5x9mrz4ca0w84ljmdpw7rnlzqbqdq0q5k4sg7izx99k5c8r59", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_hugene_2_1_st": { "name": "pd.hugene.2.1.st", "version": "3.14.1", "sha256": "07la78206cvilfm8l2fwrcyy3gpwnhn0p32ilv043ln9drka2r8h", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_maize": { "name": "pd.maize", "version": "3.12.0", "sha256": "02viqnqf02d75sbarxh1k76966yay5i6wwdx118s4c9nlr5q6aqg", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mapping250k_nsp": { "name": "pd.mapping250k.nsp", "version": "3.12.0", "sha256": "10j8c18glhvg07zp6w84hlc6l3a3qkvcvfnq0blpjfdk3a2lndz7", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mapping250k_sty": { "name": "pd.mapping250k.sty", "version": "3.12.0", "sha256": "1hpyijrkr6svxxhrdp6s4jjcvr44hhbrdhrzvnw5ywpykmbphryc", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mapping50k_hind240": { "name": "pd.mapping50k.hind240", "version": "3.12.0", "sha256": "1whpjdr4aql846cm8nzgs613pi12qdqfixhqcfv8wrqyks27kq6s", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mapping50k_xba240": { "name": "pd.mapping50k.xba240", "version": "3.12.0", "sha256": "1a1f3lh5ywhyjawdbj2fzban85c8jz70lfcv3pagd5piincjwxq8", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_margene_1_0_st": { "name": "pd.margene.1.0.st", "version": "3.12.0", "sha256": "1s4l57hw511cnzj197jvvzqs8ymfbf14khxcv4llg55prxnvvnfc", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_margene_1_1_st": { "name": "pd.margene.1.1.st", "version": "3.12.0", "sha256": "067jv9486win2kv563gr4vpc96lpl02zqd09cnma7ycd7l1nvj9s", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_medgene_1_0_st": { "name": "pd.medgene.1.0.st", "version": "3.12.0", "sha256": "0f5blbhlp160av6r37icjdq2lyrvip09r4yzxhfa2vlxpcm7i83m", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_medgene_1_1_st": { "name": "pd.medgene.1.1.st", "version": "3.12.0", "sha256": "1mlyv6qjcxj9q416pmjq36q0aqp5l47pkd557ayaqd7gm3ygikcq", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_medicago": { "name": "pd.medicago", "version": "3.12.0", "sha256": "1wm81jr9d04yiyg0alj197fjigcvjhz2kvh8j6jw9yaawppr0c5p", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mg_u74a": { "name": "pd.mg.u74a", "version": "3.12.0", "sha256": "1jji6g49icsxyam9qx3mbaspg24q0hjavi0w75k99m2ckmllc47c", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mg_u74av2": { "name": "pd.mg.u74av2", "version": "3.12.0", "sha256": "08ym915fb26qbz2r9kzgf7znai4mc06lr59l1da0x02iaixagg32", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mg_u74b": { "name": "pd.mg.u74b", "version": "3.12.0", "sha256": "0yav9ghdk8y12bsqam2r0p4q3r1yymfwrz1kdg0l7qfzw3mn141d", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mg_u74bv2": { "name": "pd.mg.u74bv2", "version": "3.12.0", "sha256": "0hxczlax8qnghp4f7d3ph2y5j3vz3k4iwl6lyw3sig51msl4q6sd", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mg_u74c": { "name": "pd.mg.u74c", "version": "3.12.0", "sha256": "13sq8jmwlqrci87bnl313dyqzy6v141r3fqzh1frl1w66ilw9chm", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mg_u74cv2": { "name": "pd.mg.u74cv2", "version": "3.12.0", "sha256": "1s59s9ch1ynrmnsn5jl2b19phij4qamgcpfs3f5zhji6ip41lckj", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mirna_1_0": { "name": "pd.mirna.1.0", "version": "3.12.0", "sha256": "0klkmrljgvkqvdlm07c47bl0jppbzz95ikxabfi8b3ajv78k6gn1", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mirna_2_0": { "name": "pd.mirna.2.0", "version": "3.12.0", "sha256": "12ynrrr0jrc0kl6s4pkn9fv3r3bh6wsbrfyywb5bvxf71n75wnqy", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mirna_3_0": { "name": "pd.mirna.3.0", "version": "3.12.0", "sha256": "0awghps8nlisdj2anvs400dn1hwdi8iw6xlrw17qr70fznbihdsy", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mirna_3_1": { "name": "pd.mirna.3.1", "version": "3.8.1", "sha256": "0g8fjwhxmps1w5f7lvnv258qn2ipggs1ar4r810amqqxd0yd5ah2", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "oligo", "oligoClasses"] }, "pd_mirna_4_0": { "name": "pd.mirna.4.0", "version": "3.12.0", "sha256": "000gqhcvlpydrpr61853q22x8gvzmlf1kp7w98lll5g1vvwkw1ad", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_moe430a": { "name": "pd.moe430a", "version": "3.12.0", "sha256": "15qys3pm8nwkr385y8mj976k16as8r65lmzykm8cy0skl071i8wb", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_moe430b": { "name": "pd.moe430b", "version": "3.12.0", "sha256": "1xas3ld65xp2g1cfkd1n4v3yvx3g0g221c3ag550k552v0alfbyd", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_moex_1_0_st_v1": { "name": "pd.moex.1.0.st.v1", "version": "3.14.1", "sha256": "13bqzbyqngbhj7yji568cc36fq0zw0bjaglfp2n9nnhdddd8b62x", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mogene_1_0_st_v1": { "name": "pd.mogene.1.0.st.v1", "version": "3.14.1", "sha256": "1hmb8kf91jd9q6b4pxiwlaj6ajzmkv1c3xsszyps5cwv13pgdjix", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mogene_1_1_st_v1": { "name": "pd.mogene.1.1.st.v1", "version": "3.14.1", "sha256": "13s7r8g29y56qbj2xm81r5kj65y2qcp5d24bakbhfcvz60wzljqf", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mogene_2_0_st": { "name": "pd.mogene.2.0.st", "version": "3.14.1", "sha256": "0205jk6x8r35bmma771q6km631jlppm4y72zy85bv87dv4adxci8", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mogene_2_1_st": { "name": "pd.mogene.2.1.st", "version": "3.14.1", "sha256": "14qwcq6yyy2ayrqv8kr33chlpgw3vkgq8iwb3yycsh3x3wz40jb8", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mouse430_2": { "name": "pd.mouse430.2", "version": "3.12.0", "sha256": "1ix7vkjy175cxbsbs67z38dhszxjik6370j0jkfpcknms6bh1db3", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mouse430a_2": { "name": "pd.mouse430a.2", "version": "3.12.0", "sha256": "11ywfshqxjmwf9q4sj97zv3ylynfkswcfaqglj883p4719lhxmc3", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mta_1_0": { "name": "pd.mta.1.0", "version": "3.12.0", "sha256": "07vznamds5lc1xnpv7kjwcrsd5zq0ap4gk8a85xqb93fmcc9ypqi", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mu11ksuba": { "name": "pd.mu11ksuba", "version": "3.12.0", "sha256": "10fkys7y5b5frdrjqw3x2gqzp51lgg29nw6gxz25yi5fznc3nnv2", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_mu11ksubb": { "name": "pd.mu11ksubb", "version": "3.12.0", "sha256": "08734j3asq56v090zi0gzk3ryycjm78dfbb0xqmpr7ggqys96qp9", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_nugo_hs1a520180": { "name": "pd.nugo.hs1a520180", "version": "3.4.0", "sha256": "1qc87zrrccld1hdqmrk1if98c6jq343gzlmib40wvshmrijp3sk3", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_nugo_mm1a520177": { "name": "pd.nugo.mm1a520177", "version": "3.4.0", "sha256": "0568zvxc11w2i32wimhmi4271jbmpn97kb0vn4ns20hfg4h63m99", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_ovigene_1_0_st": { "name": "pd.ovigene.1.0.st", "version": "3.12.0", "sha256": "0vga20rb0v4yzd28szsppbgfhmn6ky85qrjj9llvacnlj1riwxsi", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_ovigene_1_1_st": { "name": "pd.ovigene.1.1.st", "version": "3.12.0", "sha256": "1vzrizvk1dbj6ngjxv9wpbm89q5mr8dkfhr0azrczs54c92xy48r", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_pae_g1a": { "name": "pd.pae.g1a", "version": "3.12.0", "sha256": "0b0bmzfrh7lm2i5d66z24iz0d5zj3qhw89aw011yssks7sr9lq90", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_plasmodium_anopheles": { "name": "pd.plasmodium.anopheles", "version": "3.12.0", "sha256": "0njd97jkg4hxd0jyq03227i00gmy0ccxznzqmp0mjqmkkhljn7nm", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_poplar": { "name": "pd.poplar", "version": "3.12.0", "sha256": "0j5xmf5hqvbb8ylsrvih92vxn1c1lah3mkffn64fji2lgqy9vjp9", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_porcine": { "name": "pd.porcine", "version": "3.12.0", "sha256": "0zx2gz90hhalaas3sf2rh8wcapjwmnckr0gq1r8p572chwf2rb81", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_porgene_1_0_st": { "name": "pd.porgene.1.0.st", "version": "3.12.0", "sha256": "1jiajzn31yjzs942w3i4cjqlpq81rkbryk961fqb9jpwldzg1pmy", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_porgene_1_1_st": { "name": "pd.porgene.1.1.st", "version": "3.12.0", "sha256": "038zwlckx58bw4x5naspfnvk4jcyc2g9bijrh1wd4m4k5mr1i4dk", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rabgene_1_0_st": { "name": "pd.rabgene.1.0.st", "version": "3.12.0", "sha256": "0vwxzwgwh1a0fpyqsc3mnagin67wf2jmymm9kwhcnxargpmslm7k", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rabgene_1_1_st": { "name": "pd.rabgene.1.1.st", "version": "3.12.0", "sha256": "0qs3ka3pdlrpqh66zb62jdfm2y6p2wyn6rcp7gb5qw0s8q9h170a", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rae230a": { "name": "pd.rae230a", "version": "3.12.0", "sha256": "14kb35pcgxh2hmpzyqp9c2xirs0p6y5dvc3h2n568jmmdd14s7j5", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rae230b": { "name": "pd.rae230b", "version": "3.12.0", "sha256": "1db6bm6qyrzwwa2scyw6qg7qcdqq97s5vy8kv0fnqc604b1jdzzq", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_raex_1_0_st_v1": { "name": "pd.raex.1.0.st.v1", "version": "3.14.1", "sha256": "11sxhhpb4fy7wh5k7yxwwv141xgn4r1yshx097wicpa6561ffdkc", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_ragene_1_0_st_v1": { "name": "pd.ragene.1.0.st.v1", "version": "3.14.1", "sha256": "0afnv1f5xvdh1vdsdfi5k1zscqzpdbf4b399wib3c8dg9vslccgx", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_ragene_1_1_st_v1": { "name": "pd.ragene.1.1.st.v1", "version": "3.14.1", "sha256": "1krygwjhqs97gyh94xfbsfd8gg285fg5bgm7rqk7wlwp8fxx8xnn", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_ragene_2_0_st": { "name": "pd.ragene.2.0.st", "version": "3.14.1", "sha256": "1rq4ivv107853pyr4jrnbms4fgfzddndibrasgql9d4msca0sbz9", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_ragene_2_1_st": { "name": "pd.ragene.2.1.st", "version": "3.14.1", "sha256": "1k9zqhnck7fgp6g0b8vmasqjvdyqshzs567rz8qabw6jk5ifssvz", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rat230_2": { "name": "pd.rat230.2", "version": "3.12.0", "sha256": "0ysn0qi26b3llqs312an0mlgyahf4pgmixlcq2x2n925drns34gg", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rcngene_1_0_st": { "name": "pd.rcngene.1.0.st", "version": "3.12.0", "sha256": "0hrhvy6dbw8g1h9qgm9frpmfp45pd5h0fnbvbvz94l98a5gda7xx", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rcngene_1_1_st": { "name": "pd.rcngene.1.1.st", "version": "3.12.0", "sha256": "1lyizr096x5idasvlivl3lb67g7n2xvblrk5zfxglaf2fgpbrgwn", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rg_u34a": { "name": "pd.rg.u34a", "version": "3.12.0", "sha256": "18jl5w1say8zyp50iqmd6jiw8ffa7qsk6sw7h7cw0j1g90ssf4y3", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rg_u34b": { "name": "pd.rg.u34b", "version": "3.12.0", "sha256": "19v2g9lvadvba2dy0c0qn6j8qnsds2xa4cliiq12byad21833ss0", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rg_u34c": { "name": "pd.rg.u34c", "version": "3.12.0", "sha256": "10j3hcszx637dfd55552b75qni0yryrjk8q6p0wkd5dh6p628qrx", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rhegene_1_0_st": { "name": "pd.rhegene.1.0.st", "version": "3.12.0", "sha256": "1mx221xvxr4ng01ibq1pc472bn5rknfv3sjsbvvfmvqgpwk6z079", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rhegene_1_1_st": { "name": "pd.rhegene.1.1.st", "version": "3.12.0", "sha256": "0f400qal4qmkxv705n5bzz07rkrz5zgs7swk8xp4pyp161fgb171", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rhesus": { "name": "pd.rhesus", "version": "3.12.0", "sha256": "1zrpq7ppl2gaiprvz4sm0zsxqcw2nvn6qzwi3b0cimqf7r2091dd", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rice": { "name": "pd.rice", "version": "3.12.0", "sha256": "0fmd505vianfspb1s5glr6aacnz45dq9skbk1qwm0a9ck6a6paav", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rjpgene_1_0_st": { "name": "pd.rjpgene.1.0.st", "version": "3.12.0", "sha256": "18qj6sdjw17553lwcb3swdx0aiv54izdzzblgl88g90ijny8rbpa", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rjpgene_1_1_st": { "name": "pd.rjpgene.1.1.st", "version": "3.12.0", "sha256": "0i99fyf6ya13z4hfjf3f5ssvys8wjhmwk894zy0p59p7nmphigyc", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rn_u34": { "name": "pd.rn.u34", "version": "3.12.0", "sha256": "0ayp6r7z7p61b1lfq9dkq4ips4apgjg6igrcnvsivlfhcfcfs0wf", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rta_1_0": { "name": "pd.rta.1.0", "version": "3.12.2", "sha256": "0x3j1a47lxhlqnhfvh1cii11rd433x16i6xmydwq2dkvm4xgd63h", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rusgene_1_0_st": { "name": "pd.rusgene.1.0.st", "version": "3.12.0", "sha256": "1ik28yykkpdclr5hrv8lzafzfivakwvzgz49q7bpb1g6ihwylshw", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_rusgene_1_1_st": { "name": "pd.rusgene.1.1.st", "version": "3.12.0", "sha256": "090lxwxzj39d6qzlr7c3x50zf98g8x987rv1gdn0gcas15imya6n", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_s_aureus": { "name": "pd.s.aureus", "version": "3.12.0", "sha256": "0kszw94ymxgwd3midzkpl307ch3pyr4g5qjcf4s2jsq6mrvxw666", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_soybean": { "name": "pd.soybean", "version": "3.12.0", "sha256": "0xg90m7k1x9sgmhcp1qdwhxsyr2y5g28p7a4z6gd6mng2l7cgyh0", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_soygene_1_0_st": { "name": "pd.soygene.1.0.st", "version": "3.12.0", "sha256": "1hg90pma4ikdgxpw1f5mkjcw7na4mmjbhpr06dcssjl3bvmd4yxc", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_soygene_1_1_st": { "name": "pd.soygene.1.1.st", "version": "3.12.0", "sha256": "0978vbl59afgrzy0cmwq4mhsdz5rn5d929nz90fvczm6q8g24616", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_sugar_cane": { "name": "pd.sugar.cane", "version": "3.12.0", "sha256": "09m8m99l9mrhs4gr1rb02l54k8i2wgdzz88qlbpl4xmrfnfn99h6", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_tomato": { "name": "pd.tomato", "version": "3.12.0", "sha256": "12jn8i691j3kkgwa771f4kffzfcxv19vi0waw13akch7x7cc09q7", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_u133_x3p": { "name": "pd.u133.x3p", "version": "3.12.0", "sha256": "171rv9syn90k70ivaj8c48s827c08nycpyyc2b76jy405kaqb1gl", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_vitis_vinifera": { "name": "pd.vitis.vinifera", "version": "3.12.0", "sha256": "19r2k7wx3kygw6syqph24glw0b273gpi0z0y8n4bnd3a184g6hxz", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_wheat": { "name": "pd.wheat", "version": "3.12.0", "sha256": "12n8k5ah8fncbrb2hrpi2ah29fj5rxnh5j5zk8lfwhijg2zf52ra", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_x_laevis_2": { "name": "pd.x.laevis.2", "version": "3.12.0", "sha256": "0zf3rc8rz05hzga2g5b8khszz6sr29dlp8z1jyn94ial284d0fn3", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_x_tropicalis": { "name": "pd.x.tropicalis", "version": "3.12.0", "sha256": "1pb6jm14k0g4z9vffi3clyh7rwc11c89hinb2amczg4xfm5lqrdr", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_xenopus_laevis": { "name": "pd.xenopus.laevis", "version": "3.12.0", "sha256": "1fxd95ak5s2dw16prxdwk20hisss32nywy9dc7y72bpqrv0v309y", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_yeast_2": { "name": "pd.yeast.2", "version": "3.12.0", "sha256": "0l6sxg79xmlb7gdxx4bx24l35jgx5y2qfp3pxzcmdnd7c7qy6z5j", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_yg_s98": { "name": "pd.yg.s98", "version": "3.12.0", "sha256": "1krx7kkjlyc41739c349z0sdbslp19iqfai0xzy6f4jk15524vhj", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_zebgene_1_0_st": { "name": "pd.zebgene.1.0.st", "version": "3.12.0", "sha256": "1vywph8shn23k0s8jmvx34rj34y1zxgwcssjnzbipm71f2sa15hw", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_zebgene_1_1_st": { "name": "pd.zebgene.1.1.st", "version": "3.12.0", "sha256": "0xs3kx7l78dfqkasgz8n5s8qjia5qhdcnj1l8al0ivy8mwvlpyxs", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pd_zebrafish": { "name": "pd.zebrafish", "version": "3.12.0", "sha256": "0gg7y7w51pv0vf39qzyaf09wl3vxy222nr69zgxg7cylwxmaky7v", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pedbarrayv10_db": { "name": "pedbarrayv10.db", @@ -5311,7 +5311,7 @@ "name": "synaptome.db", "version": "0.99.16", "sha256": "0sd3kwhf9gh74j6qiaf1i2qzgn69i9yyvza26aysiplirbsy1jr0", - "depends": ["AnnotationHub", "DBI", "dbplyr", "dplyr", "igraph", "Rdpack", "RSQLite", "synaptome_data"] + "depends": ["AnnotationHub", "DBI", "RSQLite", "Rdpack", "dbplyr", "dplyr", "igraph", "synaptome_data"] }, "targetscan_Hs_eg_db": { "name": "targetscan.Hs.eg.db", diff --git a/pkgs/development/r-modules/bioc-experiment-packages.json b/pkgs/development/r-modules/bioc-experiment-packages.json index 540a84d8b8e46..9e371d34469a6 100644 --- a/pkgs/development/r-modules/bioc-experiment-packages.json +++ b/pkgs/development/r-modules/bioc-experiment-packages.json @@ -85,7 +85,7 @@ "name": "BeadArrayUseCases", "version": "1.42.0", "sha256": "1s62vqvl3zxf97syp5lymacah594m8szk23skl4bk88jkzkkx6a5", - "depends": ["beadarray", "GEOquery", "limma"] + "depends": ["GEOquery", "beadarray", "limma"] }, "BeadSorted_Saliva_EPIC": { "name": "BeadSorted.Saliva.EPIC", @@ -97,19 +97,19 @@ "name": "BioImageDbs", "version": "1.12.0", "sha256": "1cs6c80h34xbzpsgrpy5aj1f0nlxmy713jj1q5g156z5kiz3mzwc", - "depends": ["animation", "AnnotationHub", "EBImage", "einsum", "ExperimentHub", "filesstrings", "magick", "magrittr", "markdown", "rmarkdown"] + "depends": ["AnnotationHub", "EBImage", "ExperimentHub", "animation", "einsum", "filesstrings", "magick", "magrittr", "markdown", "rmarkdown"] }, "BioPlex": { "name": "BioPlex", "version": "1.10.0", "sha256": "1bkakf7yi1lhwc48pmwifk7qdnc9hzaqnlcni7sy0ypwgb1mfsh7", - "depends": ["BiocFileCache", "GenomeInfoDb", "GenomicRanges", "GEOquery", "graph", "SummarizedExperiment"] + "depends": ["BiocFileCache", "GEOquery", "GenomeInfoDb", "GenomicRanges", "SummarizedExperiment", "graph"] }, "BloodCancerMultiOmics2017": { "name": "BloodCancerMultiOmics2017", "version": "1.24.0", "sha256": "16c6nirflpj0zf2wrj0hb5xcq2168si95np3sm76r3kvwlr48zm7", - "depends": ["beeswarm", "Biobase", "DESeq2", "devtools", "dplyr", "ggdendro", "ggplot2", "glmnet", "gtable", "ipflasso", "RColorBrewer", "reshape2", "scales", "SummarizedExperiment", "survival", "tibble"] + "depends": ["Biobase", "DESeq2", "RColorBrewer", "SummarizedExperiment", "beeswarm", "devtools", "dplyr", "ggdendro", "ggplot2", "glmnet", "gtable", "ipflasso", "reshape2", "scales", "survival", "tibble"] }, "CCl4": { "name": "CCl4", @@ -121,7 +121,7 @@ "name": "CLL", "version": "1.44.0", "sha256": "18bjaqf6cjvjfcp80b5zmb48qbywacqs6aiarsh6ksq2yj4np4zs", - "depends": ["affy", "Biobase"] + "depends": ["Biobase", "affy"] }, "CLLmethylation": { "name": "CLLmethylation", @@ -259,19 +259,19 @@ "name": "DNAZooData", "version": "1.4.0", "sha256": "1bs2pnak2v2szp7zly8ysf8pqh7f70w70cbqqzvnxlf35npv7cxd", - "depends": ["BiocFileCache", "HiCExperiment", "rjson", "S4Vectors"] + "depends": ["BiocFileCache", "HiCExperiment", "S4Vectors", "rjson"] }, "DeSousa2013": { "name": "DeSousa2013", "version": "1.40.0", "sha256": "1icjl4rr8jk16hs8ri925v3gf9lasi4x39yf5a7av39byb2zwqif", - "depends": ["affy", "AnnotationDbi", "Biobase", "cluster", "ConsensusClusterPlus", "frma", "frmaTools", "gplots", "hgu133plus2_db", "hgu133plus2frmavecs", "pamr", "rgl", "ROCR", "siggenes", "survival", "sva"] + "depends": ["AnnotationDbi", "Biobase", "ConsensusClusterPlus", "ROCR", "affy", "cluster", "frma", "frmaTools", "gplots", "hgu133plus2_db", "hgu133plus2frmavecs", "pamr", "rgl", "siggenes", "survival", "sva"] }, "DmelSGI": { "name": "DmelSGI", "version": "1.36.0", "sha256": "0xjj2ky0k8vazw97qsaf79c6cc3whxg0n5v6lrj6slk4hyfcmbw4", - "depends": ["abind", "gplots", "igraph", "knitr", "limma", "rhdf5", "TSP"] + "depends": ["TSP", "abind", "gplots", "igraph", "knitr", "limma", "rhdf5"] }, "DonaPLLP2013": { "name": "DonaPLLP2013", @@ -295,7 +295,7 @@ "name": "DuoClustering2018", "version": "1.22.0", "sha256": "042v3dpirp68qsdbhygvx3apx94xxdmzpm0swii30kzkw1r1xfck", - "depends": ["dplyr", "ExperimentHub", "ggplot2", "ggthemes", "magrittr", "mclust", "purrr", "reshape2", "tidyr", "viridis"] + "depends": ["ExperimentHub", "dplyr", "ggplot2", "ggthemes", "magrittr", "mclust", "purrr", "reshape2", "tidyr", "viridis"] }, "DvDdata": { "name": "DvDdata", @@ -319,7 +319,7 @@ "name": "EatonEtAlChIPseq", "version": "0.42.0", "sha256": "109law5cc64xipwqyanw71h8v5nx08s1iaskh05hm1w18dsjxff1", - "depends": ["GenomicRanges", "rtracklayer", "ShortRead"] + "depends": ["GenomicRanges", "ShortRead", "rtracklayer"] }, "EpiMix_data": { "name": "EpiMix.data", @@ -349,13 +349,13 @@ "name": "Fletcher2013a", "version": "1.40.0", "sha256": "0l839hd76xr94qjcnscr9c40nvsx99ir6vsy1zx6dn7cha52mpar", - "depends": ["Biobase", "gplots", "limma", "VennDiagram"] + "depends": ["Biobase", "VennDiagram", "gplots", "limma"] }, "Fletcher2013b": { "name": "Fletcher2013b", "version": "1.40.0", "sha256": "0agnkc207bma3h89xxrzcywny664f42vfd63qnmyda4kvdvvk0km", - "depends": ["Fletcher2013a", "igraph", "RColorBrewer", "RedeR", "RTN"] + "depends": ["Fletcher2013a", "RColorBrewer", "RTN", "RedeR", "igraph"] }, "FlowSorted_Blood_450k": { "name": "FlowSorted.Blood.450k", @@ -367,7 +367,7 @@ "name": "FlowSorted.Blood.EPIC", "version": "2.8.0", "sha256": "1b0azyslk2g08i6v1vv2niw32f0zqasw85b9klw83zdy2f5dcdvh", - "depends": ["AnnotationHub", "ExperimentHub", "genefilter", "minfi", "nlme", "quadprog", "S4Vectors", "SummarizedExperiment"] + "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "genefilter", "minfi", "nlme", "quadprog"] }, "FlowSorted_CordBlood_450k": { "name": "FlowSorted.CordBlood.450k", @@ -379,7 +379,7 @@ "name": "FlowSorted.CordBloodCombined.450k", "version": "1.20.0", "sha256": "14486v4cs3j1jmifsgy3ihpm5x7i9581yz4bwsl3h2a7p86cdsbv", - "depends": ["AnnotationHub", "ExperimentHub", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "minfi", "SummarizedExperiment"] + "depends": ["AnnotationHub", "ExperimentHub", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "SummarizedExperiment", "minfi"] }, "FlowSorted_CordBloodNorway_450k": { "name": "FlowSorted.CordBloodNorway.450k", @@ -415,7 +415,7 @@ "name": "GSE13015", "version": "1.12.0", "sha256": "0l1v30g1g93wk5bnhkw52pwypby6n0rxpp11aw93j733whn9j2y4", - "depends": ["Biobase", "GEOquery", "preprocessCore", "SummarizedExperiment"] + "depends": ["Biobase", "GEOquery", "SummarizedExperiment", "preprocessCore"] }, "GSE159526": { "name": "GSE159526", @@ -445,7 +445,7 @@ "name": "GenomicDistributionsData", "version": "1.12.0", "sha256": "16cj8w6n053aciz9wclppmc22b9s4a9lh58r6wi2lhs0sp7iirzn", - "depends": ["AnnotationFilter", "AnnotationHub", "BSgenome", "data_table", "ensembldb", "ExperimentHub", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges"] + "depends": ["AnnotationFilter", "AnnotationHub", "BSgenome", "ExperimentHub", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "data_table", "ensembldb"] }, "GeuvadisTranscriptExpr": { "name": "GeuvadisTranscriptExpr", @@ -463,19 +463,19 @@ "name": "HCATonsilData", "version": "1.2.0", "sha256": "1wg0mvc3gwf80bgsfkvdcnnzy7qbnffbbrcy3f87jyw4a20irpp1", - "depends": ["base64enc", "ExperimentHub", "HDF5Array", "htmltools", "rmarkdown", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment"] + "depends": ["ExperimentHub", "HDF5Array", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "base64enc", "htmltools", "rmarkdown"] }, "HD2013SGI": { "name": "HD2013SGI", "version": "1.44.0", "sha256": "0r4nlbz7b70z1ii9wisk8nj218m2j5qmpfj8k2sp8k723gmsg4x0", - "depends": ["EBImage", "geneplotter", "gplots", "limma", "LSD", "RColorBrewer", "splots", "vcd"] + "depends": ["EBImage", "LSD", "RColorBrewer", "geneplotter", "gplots", "limma", "splots", "vcd"] }, "HDCytoData": { "name": "HDCytoData", "version": "1.24.0", "sha256": "0pmzgp7x1zam3b7agi8mdq14qmx8nln9lnhiglax2pvg2a5n4ii4", - "depends": ["ExperimentHub", "flowCore", "SummarizedExperiment"] + "depends": ["ExperimentHub", "SummarizedExperiment", "flowCore"] }, "HEEBOdata": { "name": "HEEBOdata", @@ -493,13 +493,13 @@ "name": "HMP16SData", "version": "1.24.0", "sha256": "16x7mw5bdsyda1qv0v739pkr8lxq8hga84vhmaa8qnx45pwqyyh0", - "depends": ["AnnotationHub", "assertthat", "dplyr", "ExperimentHub", "kableExtra", "knitr", "magrittr", "readr", "S4Vectors", "stringr", "SummarizedExperiment", "tibble"] + "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "assertthat", "dplyr", "kableExtra", "knitr", "magrittr", "readr", "stringr", "tibble"] }, "HMP2Data": { "name": "HMP2Data", "version": "1.18.0", "sha256": "014bf29kg9dizi3p0fdxrs42bf9a0dc2f7zd7yxzvzs3jqvniji2", - "depends": ["AnnotationHub", "assertthat", "data_table", "dplyr", "ExperimentHub", "kableExtra", "knitr", "magrittr", "MultiAssayExperiment", "phyloseq", "readr", "S4Vectors", "SummarizedExperiment"] + "depends": ["AnnotationHub", "ExperimentHub", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "assertthat", "data_table", "dplyr", "kableExtra", "knitr", "magrittr", "phyloseq", "readr"] }, "HSMMSingleCell": { "name": "HSMMSingleCell", @@ -529,7 +529,7 @@ "name": "HiBED", "version": "1.2.0", "sha256": "0sqxlm2nn8g7qfwhndf79dg7v57ngmznr0b297v59nhhpigs1g2q", - "depends": ["AnnotationHub", "dplyr", "FlowSorted_Blood_EPIC", "FlowSorted_DLPFC_450k", "minfi", "SummarizedExperiment", "tibble"] + "depends": ["AnnotationHub", "FlowSorted_Blood_EPIC", "FlowSorted_DLPFC_450k", "SummarizedExperiment", "dplyr", "minfi", "tibble"] }, "HiCDataHumanIMR90": { "name": "HiCDataHumanIMR90", @@ -559,7 +559,7 @@ "name": "Hiiragi2013", "version": "1.40.0", "sha256": "0xn3ayh2x04cvwrr476k8vlp8lhk5lxaqg01a0ynkrrc4scf2f99", - "depends": ["affy", "Biobase", "boot", "clue", "cluster", "genefilter", "geneplotter", "gplots", "gtools", "KEGGREST", "lattice", "latticeExtra", "MASS", "mouse4302_db", "RColorBrewer", "xtable"] + "depends": ["Biobase", "KEGGREST", "MASS", "RColorBrewer", "affy", "boot", "clue", "cluster", "genefilter", "geneplotter", "gplots", "gtools", "lattice", "latticeExtra", "mouse4302_db", "xtable"] }, "HumanAffyData": { "name": "HumanAffyData", @@ -571,7 +571,7 @@ "name": "IHWpaper", "version": "1.32.0", "sha256": "0s3x2chbr8ik3rhgzmfhaq8xlsnnkzfhjh4p327sn5aar6xhaj67", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "cowplot", "DESeq2", "dplyr", "fdrtool", "genefilter", "ggplot2", "IHW", "qvalue", "Rcpp", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "DESeq2", "IHW", "Rcpp", "SummarizedExperiment", "cowplot", "dplyr", "fdrtool", "genefilter", "ggplot2", "qvalue"] }, "ITALICSData": { "name": "ITALICSData", @@ -613,7 +613,7 @@ "name": "JohnsonKinaseData", "version": "1.0.0", "sha256": "1ry5p2zll8hazxil4sa57v50b7xr9bk4p5a509i4mvasb089al3l", - "depends": ["BiocParallel", "checkmate", "dplyr", "ExperimentHub", "purrr", "stringr", "tidyr"] + "depends": ["BiocParallel", "ExperimentHub", "checkmate", "dplyr", "purrr", "stringr", "tidyr"] }, "KEGGandMetacoreDzPathwaysGEO": { "name": "KEGGandMetacoreDzPathwaysGEO", @@ -679,7 +679,7 @@ "name": "MAQCsubset", "version": "1.42.0", "sha256": "0x59gbv91d90hasa2gwkv00c06zp8fj4fk18386ajfag0wpvpb2n", - "depends": ["affy", "Biobase", "lumi"] + "depends": ["Biobase", "affy", "lumi"] }, "MEDIPSData": { "name": "MEDIPSData", @@ -733,25 +733,25 @@ "name": "MetaGxBreast", "version": "1.24.0", "sha256": "05cz500r6fhlq5pfviiqj8cfv173027dqsdvhvvi57cbbx3qqn6r", - "depends": ["AnnotationHub", "Biobase", "ExperimentHub", "impute", "lattice", "SummarizedExperiment"] + "depends": ["AnnotationHub", "Biobase", "ExperimentHub", "SummarizedExperiment", "impute", "lattice"] }, "MetaGxOvarian": { "name": "MetaGxOvarian", "version": "1.24.0", "sha256": "01cnm2rf6ls1q5plgazxqkrrw3b6mcrxbq0wrmi0ra8daqh6asi7", - "depends": ["AnnotationHub", "Biobase", "ExperimentHub", "impute", "lattice", "SummarizedExperiment"] + "depends": ["AnnotationHub", "Biobase", "ExperimentHub", "SummarizedExperiment", "impute", "lattice"] }, "MetaGxPancreas": { "name": "MetaGxPancreas", "version": "1.24.0", "sha256": "150i72jrq3qshsh0m20kxdcx7zxz1cgvlk0y2nxnacs1xbdnywxv", - "depends": ["AnnotationHub", "ExperimentHub", "impute", "S4Vectors", "SummarizedExperiment"] + "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "impute"] }, "MetaScope": { "name": "MetaScope", "version": "1.4.0", "sha256": "1kaisvhp66g95w4dycw8jzsxh00f2c193rjcla6l5k2dn5rnsyr9", - "depends": ["BiocFileCache", "Biostrings", "data_table", "dplyr", "ggplot2", "magrittr", "Matrix", "MultiAssayExperiment", "Rbowtie2", "readr", "rlang", "Rsamtools", "S4Vectors", "stringr", "SummarizedExperiment", "taxize", "tibble", "tidyr"] + "depends": ["BiocFileCache", "Biostrings", "Matrix", "MultiAssayExperiment", "Rbowtie2", "Rsamtools", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "ggplot2", "magrittr", "readr", "rlang", "stringr", "taxize", "tibble", "tidyr"] }, "MethylAidData": { "name": "MethylAidData", @@ -763,13 +763,13 @@ "name": "MethylSeqData", "version": "1.14.0", "sha256": "197347pavq9hjcpwa9lq66lyjr1jb7mymd9pjz01rr9f77d7rqq5", - "depends": ["ExperimentHub", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "rhdf5", "S4Vectors", "SummarizedExperiment"] + "depends": ["ExperimentHub", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "S4Vectors", "SummarizedExperiment", "rhdf5"] }, "MicrobiomeBenchmarkData": { "name": "MicrobiomeBenchmarkData", "version": "1.6.0", "sha256": "00lr183x24yx4xd9cpxvzkcxmqp4dinfi1nz2arqqxnbfcp2s25j", - "depends": ["ape", "BiocFileCache", "S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment"] + "depends": ["BiocFileCache", "S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment", "ape"] }, "MouseAgingData": { "name": "MouseAgingData", @@ -811,7 +811,7 @@ "name": "NestLink", "version": "1.20.0", "sha256": "1yh1nivipyrx3h0par8cf943licl1rs47jvfwz1392hi09vji15j", - "depends": ["AnnotationHub", "Biostrings", "ExperimentHub", "gplots", "protViz", "ShortRead"] + "depends": ["AnnotationHub", "Biostrings", "ExperimentHub", "ShortRead", "gplots", "protViz"] }, "NetActivityData": { "name": "NetActivityData", @@ -823,7 +823,7 @@ "name": "Neve2006", "version": "0.42.0", "sha256": "0w3ph610lhxyg1knhsnnxpw32sw2n5p57svpbhqm3zmphx29nw3h", - "depends": ["annotate", "Biobase", "hgu133a_db"] + "depends": ["Biobase", "annotate", "hgu133a_db"] }, "NxtIRFdata": { "name": "NxtIRFdata", @@ -859,7 +859,7 @@ "name": "PREDAsampledata", "version": "0.44.0", "sha256": "0ydb4y2s8kshia7k6mr941f1fc7nsqahm1g86ig3wpcq7al33z1b", - "depends": ["affy", "annotate", "Biobase", "PREDA"] + "depends": ["Biobase", "PREDA", "affy", "annotate"] }, "PWMEnrich_Dmelanogaster_background": { "name": "PWMEnrich.Dmelanogaster.background", @@ -961,7 +961,7 @@ "name": "RNAinteractMAPK", "version": "1.42.0", "sha256": "0vm20x1lfgl671rrwvxybcwjgk7falb3d5xi6hiq9jivvbms9120", - "depends": ["Biobase", "fields", "gdata", "genefilter", "lattice", "MASS", "RNAinteract", "sparseLDA"] + "depends": ["Biobase", "MASS", "RNAinteract", "fields", "gdata", "genefilter", "lattice", "sparseLDA"] }, "RNAmodR_Data": { "name": "RNAmodR.Data", @@ -1051,7 +1051,7 @@ "name": "ReactomeGSA.data", "version": "1.18.0", "sha256": "1410ks6s7albf6sly8ry0ln58ws9jlfn62amniqqsg46kx4xc4bh", - "depends": ["edgeR", "limma", "ReactomeGSA", "Seurat"] + "depends": ["ReactomeGSA", "Seurat", "edgeR", "limma"] }, "RegParallel": { "name": "RegParallel", @@ -1063,7 +1063,7 @@ "name": "RforProteomics", "version": "1.42.0", "sha256": "0irg6wrwy82xhlkgj1vphh6ncp9s6qcpp40mxv1vq969qjjchkk9", - "depends": ["BiocManager", "biocViews", "MSnbase", "R_utils"] + "depends": ["BiocManager", "MSnbase", "R_utils", "biocViews"] }, "RnBeads_hg19": { "name": "RnBeads.hg19", @@ -1201,13 +1201,13 @@ "name": "SpikeInSubset", "version": "1.44.0", "sha256": "118v972wwq4h2ww2nlb7mzva3d38c4hzmbq0v28500q2zc1ykv4l", - "depends": ["affy", "Biobase"] + "depends": ["Biobase", "affy"] }, "SubcellularSpatialData": { "name": "SubcellularSpatialData", "version": "1.0.0", "sha256": "0lyg6hiv8ch7c8a7zzi02c9fmq2zqif88khhslj15gvg5dznw79v", - "depends": ["dplyr", "hexbin", "Matrix", "SpatialExperiment"] + "depends": ["Matrix", "SpatialExperiment", "dplyr", "hexbin"] }, "TBX20BamSubset": { "name": "TBX20BamSubset", @@ -1291,7 +1291,7 @@ "name": "TabulaMurisSenisData", "version": "1.10.0", "sha256": "1b1aj06qacvzpabz8r0vkqpm0pp48vx26xx84h5ihzg9232wrqmy", - "depends": ["AnnotationHub", "ExperimentHub", "gdata", "HDF5Array", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["AnnotationHub", "ExperimentHub", "HDF5Array", "SingleCellExperiment", "SummarizedExperiment", "gdata"] }, "TargetScoreData": { "name": "TargetScoreData", @@ -1321,7 +1321,7 @@ "name": "TumourMethData", "version": "1.2.0", "sha256": "1xwm2amlb1vrf3hpdw9387nglc6pbxxdxik56byr5p8856fkjdav", - "depends": ["ExperimentHub", "GenomicRanges", "HDF5Array", "R_utils", "rhdf5", "SummarizedExperiment"] + "depends": ["ExperimentHub", "GenomicRanges", "HDF5Array", "R_utils", "SummarizedExperiment", "rhdf5"] }, "VariantToolsData": { "name": "VariantToolsData", @@ -1357,7 +1357,7 @@ "name": "XhybCasneuf", "version": "1.42.0", "sha256": "0n0k6h9b9gkywy6cmlx15g09287aqzvc228j3jgjkv0ljbwsq756", - "depends": ["affy", "ath1121501cdf", "RColorBrewer", "tinesath1cdf"] + "depends": ["RColorBrewer", "affy", "ath1121501cdf", "tinesath1cdf"] }, "adductData": { "name": "adductData", @@ -1369,7 +1369,7 @@ "name": "affycompData", "version": "1.42.0", "sha256": "16fri51jhp0lm3aj9hw2s6jzxjlxz2qbd36j9zcbcs7sb6jh42jy", - "depends": ["affycomp", "Biobase"] + "depends": ["Biobase", "affycomp"] }, "affydata": { "name": "affydata", @@ -1405,7 +1405,7 @@ "name": "beadarrayExampleData", "version": "1.42.0", "sha256": "0l5n1d7x4gc3w2kc6vq0gqxp1wdpa2sn5k75yf5fc802m11nrkd1", - "depends": ["beadarray", "Biobase"] + "depends": ["Biobase", "beadarray"] }, "benchmarkfdrData2019": { "name": "benchmarkfdrData2019", @@ -1429,7 +1429,7 @@ "name": "biscuiteerData", "version": "1.18.0", "sha256": "1qv2ajy312diacb3mihc3q7hrrlq48k5vd9v0g6w38cqz6gnz0as", - "depends": ["AnnotationHub", "curl", "ExperimentHub", "GenomicRanges"] + "depends": ["AnnotationHub", "ExperimentHub", "GenomicRanges", "curl"] }, "bladderbatch": { "name": "bladderbatch", @@ -1537,7 +1537,7 @@ "name": "celldex", "version": "1.14.0", "sha256": "155hnh62ra06b52xk78f111b10gm34d1djvl5w5mabvrk4vknwj6", - "depends": ["alabaster_base", "alabaster_matrix", "alabaster_se", "AnnotationDbi", "AnnotationHub", "DBI", "DelayedArray", "DelayedMatrixStats", "ExperimentHub", "gypsum", "jsonlite", "Matrix", "RSQLite", "S4Vectors", "SummarizedExperiment"] + "depends": ["AnnotationDbi", "AnnotationHub", "DBI", "DelayedArray", "DelayedMatrixStats", "ExperimentHub", "Matrix", "RSQLite", "S4Vectors", "SummarizedExperiment", "alabaster_base", "alabaster_matrix", "alabaster_se", "gypsum", "jsonlite"] }, "cfToolsData": { "name": "cfToolsData", @@ -1549,7 +1549,7 @@ "name": "chipenrich.data", "version": "2.28.0", "sha256": "1kpc3ljayxycadshdgyzkbagh4vd7cmyqqccy61269skpasdnwbv", - "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "readr", "rtracklayer", "S4Vectors"] + "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "readr", "rtracklayer"] }, "chipseqDBData": { "name": "chipseqDBData", @@ -1615,7 +1615,7 @@ "name": "curatedBreastData", "version": "2.32.0", "sha256": "0zglh1h9hw6rnpdl4v5v7cmzgcvxa0phfixfwwmi8il0rn40jd68", - "depends": ["Biobase", "BiocStyle", "ggplot2", "impute", "XML"] + "depends": ["Biobase", "BiocStyle", "XML", "ggplot2", "impute"] }, "curatedCRCData": { "name": "curatedCRCData", @@ -1627,7 +1627,7 @@ "name": "curatedMetagenomicData", "version": "3.12.0", "sha256": "1hp1s5v567xidmmpn6jv7i3fid5hwg3i43y9471aabq00nsg67b1", - "depends": ["AnnotationHub", "dplyr", "ExperimentHub", "magrittr", "mia", "purrr", "rlang", "S4Vectors", "stringr", "SummarizedExperiment", "tibble", "tidyr", "tidyselect", "TreeSummarizedExperiment"] + "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment", "dplyr", "magrittr", "mia", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] }, "curatedOvarianData": { "name": "curatedOvarianData", @@ -1639,7 +1639,7 @@ "name": "curatedPCaData", "version": "1.0.0", "sha256": "0wqvg0z19lxyqbbsl7fbq12jgycpqycx45vy24z4sph48kz2ag3w", - "depends": ["AnnotationHub", "ExperimentHub", "MultiAssayExperiment", "RaggedExperiment", "rlang", "S4Vectors"] + "depends": ["AnnotationHub", "ExperimentHub", "MultiAssayExperiment", "RaggedExperiment", "S4Vectors", "rlang"] }, "curatedTBData": { "name": "curatedTBData", @@ -1663,7 +1663,7 @@ "name": "depmap", "version": "1.18.0", "sha256": "0imajc5kiqf45sjwxagvg5bjvmnrzrk3ls4bflwxj9rnd84v2r62", - "depends": ["AnnotationHub", "BiocFileCache", "curl", "dplyr", "ExperimentHub", "httr2", "tibble"] + "depends": ["AnnotationHub", "BiocFileCache", "ExperimentHub", "curl", "dplyr", "httr2", "tibble"] }, "derfinderData": { "name": "derfinderData", @@ -1717,7 +1717,7 @@ "name": "emtdata", "version": "1.12.0", "sha256": "0b3hvggndw3bzddk0vflbn0wx8fr08b6nphjhil1wqlyp3535xk4", - "depends": ["edgeR", "ExperimentHub", "SummarizedExperiment"] + "depends": ["ExperimentHub", "SummarizedExperiment", "edgeR"] }, "epimutacionsData": { "name": "epimutacionsData", @@ -1801,7 +1801,7 @@ "name": "furrowSeg", "version": "1.32.0", "sha256": "125wyqi4h7kkrhbcn4gknwlw6panian2hfsapwyqfxz0mg6ssg5z", - "depends": ["abind", "dplyr", "EBImage", "locfit", "tiff"] + "depends": ["EBImage", "abind", "dplyr", "locfit", "tiff"] }, "gDNAinRNAseqData": { "name": "gDNAinRNAseqData", @@ -1915,7 +1915,7 @@ "name": "healthyControlsPresenceChecker", "version": "1.8.0", "sha256": "14gq24z99l04kcn13414zjn17184l3p5l6draxwy3820m9sijzgq", - "depends": ["geneExpressionFromGEO", "GEOquery", "magrittr", "xml2"] + "depends": ["GEOquery", "geneExpressionFromGEO", "magrittr", "xml2"] }, "healthyFlowData": { "name": "healthyFlowData", @@ -1951,7 +1951,7 @@ "name": "homosapienDEE2CellScore", "version": "1.0.0", "sha256": "1vwasylfqv4xgmhkzykdwhlxh0kk4pl4bcndx5dpn7i386zp6chs", - "depends": ["BiocGenerics", "DESeq2", "ExperimentHub", "getDEE2", "MatrixGenerics", "Rtsne", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocGenerics", "DESeq2", "ExperimentHub", "MatrixGenerics", "Rtsne", "S4Vectors", "SummarizedExperiment", "getDEE2"] }, "humanStemCell": { "name": "humanStemCell", @@ -1963,7 +1963,7 @@ "name": "imcdatasets", "version": "1.12.0", "sha256": "135sffkn322g6zp6wz6ri2cg4wj9pwadmv4b6zaaxwximpx5xy04", - "depends": ["cytomapper", "DelayedArray", "ExperimentHub", "HDF5Array", "S4Vectors", "SingleCellExperiment", "SpatialExperiment"] + "depends": ["DelayedArray", "ExperimentHub", "HDF5Array", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "cytomapper"] }, "kidpack": { "name": "kidpack", @@ -1975,7 +1975,7 @@ "name": "leeBamViews", "version": "1.40.0", "sha256": "15prksw8pi302i8qpw3skwljyj3hfm9wld2lzpcgz7nnpzrqm8bc", - "depends": ["Biobase", "BSgenome", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors"] + "depends": ["BSgenome", "Biobase", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors"] }, "leukemiasEset": { "name": "leukemiasEset", @@ -2069,9 +2069,9 @@ }, "microbiomeDataSets": { "name": "microbiomeDataSets", - "version": "1.12.0", - "sha256": "0ng0sbdn3y2h7dyn42rq5ci12xx5y3hqb87n7xi7lc1gp1pcxcf2", - "depends": ["ape", "BiocGenerics", "Biostrings", "ExperimentHub", "MultiAssayExperiment", "SummarizedExperiment", "TreeSummarizedExperiment"] + "version": "1.12.1", + "sha256": "1jc5xcf48xwa7m1g55z38mjnbsqj7gqzwdb37kg1q60rk6bj4mj2", + "depends": ["BiocGenerics", "Biostrings", "ExperimentHub", "MultiAssayExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "ape"] }, "minfiData": { "name": "minfiData", @@ -2161,7 +2161,7 @@ "name": "mvoutData", "version": "1.40.0", "sha256": "01rxr4867w2zcy4gmcg868g2xqal5vb4xw2izfmcwplxah5380wv", - "depends": ["affy", "Biobase", "lumi"] + "depends": ["Biobase", "affy", "lumi"] }, "nanotubes": { "name": "nanotubes", @@ -2197,7 +2197,7 @@ "name": "orthosData", "version": "1.2.0", "sha256": "000jqijl7mpp0qfgg0aqx7jzn5bviybp2ndxmikyn0rmcvi9057k", - "depends": ["AnnotationHub", "BiocFileCache", "ExperimentHub", "HDF5Array", "stringr", "SummarizedExperiment"] + "depends": ["AnnotationHub", "BiocFileCache", "ExperimentHub", "HDF5Array", "SummarizedExperiment", "stringr"] }, "pRolocdata": { "name": "pRolocdata", @@ -2233,7 +2233,7 @@ "name": "pd.atdschip.tiling", "version": "0.42.0", "sha256": "17sf3x7mhkjk605hmc0idx1d3pbx49hyfaxzifkc6bq1mmq5113x", - "depends": ["Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"] }, "pepDat": { "name": "pepDat", @@ -2305,7 +2305,7 @@ "name": "qPLEXdata", "version": "1.22.0", "sha256": "1a8mzbll0s9w82y4sy153jna6677sdpp3bfzs83qaqpnjymjzfpc", - "depends": ["dplyr", "knitr", "MSnbase", "qPLEXanalyzer"] + "depends": ["MSnbase", "dplyr", "knitr", "qPLEXanalyzer"] }, "rRDPData": { "name": "rRDPData", @@ -2317,7 +2317,7 @@ "name": "raerdata", "version": "1.2.0", "sha256": "15j7sw3kvgqqb7m4y4kn40p8g8s1f204lfnb5zskkjfakj6c2j03", - "depends": ["BiocGenerics", "ExperimentHub", "Rsamtools", "rtracklayer", "SingleCellExperiment"] + "depends": ["BiocGenerics", "ExperimentHub", "Rsamtools", "SingleCellExperiment", "rtracklayer"] }, "rcellminerData": { "name": "rcellminerData", @@ -2347,19 +2347,19 @@ "name": "scATAC.Explorer", "version": "1.10.0", "sha256": "0s2w9b9bb1bzqnlhlrgvp17bifhryvymzaid02ypkqaql06d6nyx", - "depends": ["BiocFileCache", "data_table", "Matrix", "S4Vectors", "SingleCellExperiment"] + "depends": ["BiocFileCache", "Matrix", "S4Vectors", "SingleCellExperiment", "data_table"] }, "scMultiome": { "name": "scMultiome", - "version": "1.4.0", - "sha256": "1fiivxs35zanssfkjv83fa898fjr93xgq5g2i9m2qkv2pxqlyan8", - "depends": ["AnnotationHub", "AzureStor", "checkmate", "DelayedArray", "ExperimentHub", "GenomicRanges", "HDF5Array", "MultiAssayExperiment", "rhdf5", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "version": "1.4.1", + "sha256": "0rgcg8qhpap7wnlndf9bmild55yxv21zdn89hs5h1503rfchlx2d", + "depends": ["AnnotationHub", "AzureStor", "DelayedArray", "ExperimentHub", "GenomicRanges", "HDF5Array", "MultiAssayExperiment", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "checkmate", "rhdf5"] }, "scRNAseq": { "name": "scRNAseq", "version": "2.18.0", "sha256": "0jsq037ba4xsb3bwwf021jw2hqv30vb5nrjag97xadx75z5fzqlr", - "depends": ["alabaster_base", "alabaster_matrix", "alabaster_sce", "AnnotationDbi", "AnnotationHub", "BiocGenerics", "DBI", "DelayedArray", "ensembldb", "ExperimentHub", "GenomicFeatures", "GenomicRanges", "gypsum", "jsonlite", "Matrix", "RSQLite", "S4Vectors", "SingleCellExperiment", "SparseArray", "SummarizedExperiment"] + "depends": ["AnnotationDbi", "AnnotationHub", "BiocGenerics", "DBI", "DelayedArray", "ExperimentHub", "GenomicFeatures", "GenomicRanges", "Matrix", "RSQLite", "S4Vectors", "SingleCellExperiment", "SparseArray", "SummarizedExperiment", "alabaster_base", "alabaster_matrix", "alabaster_sce", "ensembldb", "gypsum", "jsonlite"] }, "scTHI_data": { "name": "scTHI.data", @@ -2407,7 +2407,7 @@ "name": "sesameData", "version": "1.22.0", "sha256": "05k67isysszzfkkbi811dkab0cmxnwz81p2ldcqz3gsq5qin3p1g", - "depends": ["AnnotationHub", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "IRanges", "readr", "S4Vectors", "stringr"] + "depends": ["AnnotationHub", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "readr", "stringr"] }, "seventyGeneData": { "name": "seventyGeneData", @@ -2425,7 +2425,7 @@ "name": "signatureSearchData", "version": "1.18.0", "sha256": "11y1dbixj9b91whzq4lrmad5f4f6gqdv70ar4rg20ql1699dx5l5", - "depends": ["affy", "Biobase", "dplyr", "ExperimentHub", "limma", "magrittr", "R_utils", "rhdf5"] + "depends": ["Biobase", "ExperimentHub", "R_utils", "affy", "dplyr", "limma", "magrittr", "rhdf5"] }, "simpIntLists": { "name": "simpIntLists", @@ -2449,7 +2449,7 @@ "name": "spatialLIBD", "version": "1.16.2", "sha256": "0bbwh9mfz7iscv8a1jlc7g1c452hv4qr95hwv3z6h2mqf8pcr5g8", - "depends": ["AnnotationHub", "benchmarkme", "BiocFileCache", "BiocGenerics", "cowplot", "DT", "edgeR", "ExperimentHub", "fields", "GenomicRanges", "ggplot2", "golem", "IRanges", "jsonlite", "limma", "magick", "Matrix", "MatrixGenerics", "paletteer", "plotly", "png", "RColorBrewer", "rlang", "rtracklayer", "S4Vectors", "scater", "scuttle", "sessioninfo", "shiny", "shinyWidgets", "SingleCellExperiment", "SpatialExperiment", "statmod", "SummarizedExperiment", "tibble", "viridisLite"] + "depends": ["AnnotationHub", "BiocFileCache", "BiocGenerics", "DT", "ExperimentHub", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "benchmarkme", "cowplot", "edgeR", "fields", "ggplot2", "golem", "jsonlite", "limma", "magick", "paletteer", "plotly", "png", "rlang", "rtracklayer", "scater", "scuttle", "sessioninfo", "shiny", "shinyWidgets", "statmod", "tibble", "viridisLite"] }, "spqnData": { "name": "spqnData", @@ -2521,7 +2521,7 @@ "name": "tuberculosis", "version": "1.10.0", "sha256": "1l9gm8jlvall905053mmbn0wd053ssnsxy74gza37w669il85awn", - "depends": ["AnnotationHub", "dplyr", "ExperimentHub", "magrittr", "purrr", "rlang", "S4Vectors", "stringr", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "dplyr", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"] }, "tweeDEseqCountData": { "name": "tweeDEseqCountData", diff --git a/pkgs/development/r-modules/bioc-packages.json b/pkgs/development/r-modules/bioc-packages.json index 4a2723c2da336..12ddee64deeee 100644 --- a/pkgs/development/r-modules/bioc-packages.json +++ b/pkgs/development/r-modules/bioc-packages.json @@ -19,7 +19,7 @@ "name": "ACE", "version": "1.22.0", "sha256": "1gpn9z09cfcy2mj7m32xfb2bjjwl01g9qn9nqaivmqbi4k6icrr8", - "depends": ["Biobase", "GenomicRanges", "ggplot2", "QDNAseq"] + "depends": ["Biobase", "GenomicRanges", "QDNAseq", "ggplot2"] }, "ACME": { "name": "ACME", @@ -31,25 +31,25 @@ "name": "ADAM", "version": "1.20.0", "sha256": "0z0rmpwfhd8p6c4zscviwsningsm740r3pb95cl8brasfdg1kl3v", - "depends": ["dplyr", "DT", "GO_db", "KEGGREST", "knitr", "pbapply", "Rcpp", "stringr", "SummarizedExperiment"] + "depends": ["DT", "GO_db", "KEGGREST", "Rcpp", "SummarizedExperiment", "dplyr", "knitr", "pbapply", "stringr"] }, "ADAMgui": { "name": "ADAMgui", "version": "1.20.0", "sha256": "08kxkb6hgbw7l9dv1wn3jfdkc0sizqdgmjkrzpq73q7rf0p4248g", - "depends": ["ADAM", "colorRamps", "data_table", "dplyr", "DT", "ggplot2", "ggpubr", "ggrepel", "ggsignif", "GO_db", "gridExtra", "knitr", "RColorBrewer", "reshape2", "shiny", "shinyjs", "stringi", "stringr", "testthat", "varhandle"] + "depends": ["ADAM", "DT", "GO_db", "RColorBrewer", "colorRamps", "data_table", "dplyr", "ggplot2", "ggpubr", "ggrepel", "ggsignif", "gridExtra", "knitr", "reshape2", "shiny", "shinyjs", "stringi", "stringr", "testthat", "varhandle"] }, "ADImpute": { "name": "ADImpute", "version": "1.14.0", "sha256": "0kihg0mwm2ysgnx3jg6xln7ibvgmky0x2hjbcmdqlg65znczh4b6", - "depends": ["BiocParallel", "checkmate", "data_table", "DrImpute", "kernlab", "MASS", "Matrix", "rsvd", "S4Vectors", "SAVER", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocParallel", "DrImpute", "MASS", "Matrix", "S4Vectors", "SAVER", "SingleCellExperiment", "SummarizedExperiment", "checkmate", "data_table", "kernlab", "rsvd"] }, "ADaCGH2": { "name": "ADaCGH2", "version": "2.44.0", "sha256": "1j9dn0xw8mdfvi2ccm1d5j9q740wb89wqi6715n6jy3dljlc8irz", - "depends": ["aCGH", "bit", "cluster", "DNAcopy", "ff", "GLAD", "tilingArray", "waveslim"] + "depends": ["DNAcopy", "GLAD", "aCGH", "bit", "cluster", "ff", "tilingArray", "waveslim"] }, "AGDEX": { "name": "AGDEX", @@ -73,13 +73,13 @@ "name": "ALDEx2", "version": "1.36.0", "sha256": "1bqpk93bbyajw2dm54d68f3dkc0jgcny109asfm6kcz7dg7szi3y", - "depends": ["BiocParallel", "directlabels", "GenomicRanges", "IRanges", "lattice", "latticeExtra", "multtest", "Rfast", "S4Vectors", "SummarizedExperiment", "zCompositions"] + "depends": ["BiocParallel", "GenomicRanges", "IRanges", "Rfast", "S4Vectors", "SummarizedExperiment", "directlabels", "lattice", "latticeExtra", "multtest", "zCompositions"] }, "AMARETTO": { "name": "AMARETTO", "version": "1.20.0", "sha256": "0n3w00x1qajkg43ip3l63k2qs0d1x2zv8wv4xj0iqwl6r6cqgxnf", - "depends": ["BiocFileCache", "callr", "circlize", "ComplexHeatmap", "curatedTCGAData", "doParallel", "dplyr", "DT", "foreach", "ggplot2", "glmnet", "gridExtra", "httr", "impute", "knitr", "limma", "Matrix", "matrixStats", "MultiAssayExperiment", "Rcpp", "readr", "reshape2", "rmarkdown", "tibble"] + "depends": ["BiocFileCache", "ComplexHeatmap", "DT", "Matrix", "MultiAssayExperiment", "Rcpp", "callr", "circlize", "curatedTCGAData", "doParallel", "dplyr", "foreach", "ggplot2", "glmnet", "gridExtra", "httr", "impute", "knitr", "limma", "matrixStats", "readr", "reshape2", "rmarkdown", "tibble"] }, "AMOUNTAIN": { "name": "AMOUNTAIN", @@ -91,25 +91,25 @@ "name": "ANCOMBC", "version": "2.6.0", "sha256": "14jdfcv3hghl1z2f7zj2mdqdyblz5sn4l1iwh8bhvih86cpigb58", - "depends": ["CVXR", "DescTools", "doParallel", "doRNG", "energy", "foreach", "gtools", "Hmisc", "lme4", "lmerTest", "MASS", "Matrix", "mia", "multcomp", "nloptr", "Rdpack", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TreeSummarizedExperiment"] + "depends": ["CVXR", "DescTools", "Hmisc", "MASS", "Matrix", "Rdpack", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "doParallel", "doRNG", "energy", "foreach", "gtools", "lme4", "lmerTest", "mia", "multcomp", "nloptr"] }, "ANF": { "name": "ANF", "version": "1.26.0", "sha256": "00s2rlkh5snqmvlz5a21ilmm0ngh4g362y7iayr6f78nh8gwp617", - "depends": ["Biobase", "igraph", "MASS", "RColorBrewer", "survival"] + "depends": ["Biobase", "MASS", "RColorBrewer", "igraph", "survival"] }, "APAlyzer": { "name": "APAlyzer", "version": "1.18.0", "sha256": "102zs1rlz58dzvrgidf7cvq4wcmk6sffc9fv4b0xlqk5d6il32w4", - "depends": ["DESeq2", "dplyr", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggrepel", "HybridMTest", "repmis", "Rsamtools", "Rsubread", "rtracklayer", "SummarizedExperiment", "tidyr", "VariantAnnotation"] + "depends": ["DESeq2", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "HybridMTest", "Rsamtools", "Rsubread", "SummarizedExperiment", "VariantAnnotation", "dplyr", "ggplot2", "ggrepel", "repmis", "rtracklayer", "tidyr"] }, "APL": { "name": "APL", "version": "1.8.0", "sha256": "1mkm9aad0qamqs7595mqcbz37qz4ykn0y24wsl3ngj6ifyfxf643", - "depends": ["ggplot2", "ggrepel", "magrittr", "Matrix", "org_Hs_eg_db", "org_Mm_eg_db", "plotly", "reticulate", "rlang", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "topGO", "viridisLite"] + "depends": ["Matrix", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "ggrepel", "magrittr", "org_Hs_eg_db", "org_Mm_eg_db", "plotly", "reticulate", "rlang", "topGO", "viridisLite"] }, "ARRmNormalization": { "name": "ARRmNormalization", @@ -139,7 +139,7 @@ "name": "ASICS", "version": "2.20.1", "sha256": "0halznbl3bflnn38rh9h5a5f0dsc88n6x6kwdffbpnin9i192q1k", - "depends": ["BiocParallel", "ggplot2", "glmnet", "gridExtra", "Matrix", "mvtnorm", "PepsNMR", "plyr", "quadprog", "ropls", "SummarizedExperiment", "zoo"] + "depends": ["BiocParallel", "Matrix", "PepsNMR", "SummarizedExperiment", "ggplot2", "glmnet", "gridExtra", "mvtnorm", "plyr", "quadprog", "ropls", "zoo"] }, "ASSET": { "name": "ASSET", @@ -151,43 +151,43 @@ "name": "ASSIGN", "version": "1.40.0", "sha256": "1aq302awy940jrc1hnsf0rn05y4fg5m9aljsl1mclxxig6b8mrd2", - "depends": ["ggplot2", "gplots", "msm", "Rlab", "sva", "yaml"] + "depends": ["Rlab", "ggplot2", "gplots", "msm", "sva", "yaml"] }, "ASURAT": { "name": "ASURAT", "version": "1.8.0", "sha256": "1fjzmvc4if1kqhwzhd38l5ryvk2qg3001jwapbnkfagxkhmnwymg", - "depends": ["circlize", "cluster", "ComplexHeatmap", "plot3D", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["ComplexHeatmap", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "circlize", "cluster", "plot3D"] }, "ASpli": { "name": "ASpli", "version": "2.14.0", "sha256": "1br4apbc3zn06ilg8fjb8xcxaimz4h7rnx9i60ak4wnpvgzgbyh2", - "depends": ["AnnotationDbi", "BiocGenerics", "BiocStyle", "data_table", "DT", "edgeR", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "htmltools", "igraph", "IRanges", "limma", "MASS", "pbmcapply", "Rsamtools", "S4Vectors", "tidyr", "txdbmaker", "UpSetR"] + "depends": ["AnnotationDbi", "BiocGenerics", "BiocStyle", "DT", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "MASS", "Rsamtools", "S4Vectors", "UpSetR", "data_table", "edgeR", "htmltools", "igraph", "limma", "pbmcapply", "tidyr", "txdbmaker"] }, "ATACCoGAPS": { "name": "ATACCoGAPS", "version": "1.6.0", "sha256": "09h32q9y7z65ck33rwqzw2wkl8l6016s0sdkhf2g094yxhkz26rh", - "depends": ["BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Mmusculus_UCSC_mm10", "chromVAR", "CoGAPS", "dplyr", "fgsea", "GeneOverlap", "GenomicFeatures", "GenomicRanges", "gplots", "gtools", "Homo_sapiens", "IRanges", "JASPAR2016", "motifmatchr", "msigdbr", "Mus_musculus", "projectR", "rGREAT", "stringr", "TFBSTools", "tidyverse"] + "depends": ["BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Mmusculus_UCSC_mm10", "CoGAPS", "GeneOverlap", "GenomicFeatures", "GenomicRanges", "Homo_sapiens", "IRanges", "JASPAR2016", "Mus_musculus", "TFBSTools", "chromVAR", "dplyr", "fgsea", "gplots", "gtools", "motifmatchr", "msigdbr", "projectR", "rGREAT", "stringr", "tidyverse"] }, "ATACseqQC": { "name": "ATACseqQC", "version": "1.28.0", "sha256": "0licdpzhh6xlma0hnvs4rr4bjr5q4q3g18kipf0is47zj4l91smy", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "ChIPpeakAnno", "edgeR", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "GenomicScores", "IRanges", "KernSmooth", "limma", "motifStack", "preseqR", "randomForest", "Rsamtools", "rtracklayer", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "ChIPpeakAnno", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "GenomicScores", "IRanges", "KernSmooth", "Rsamtools", "S4Vectors", "edgeR", "limma", "motifStack", "preseqR", "randomForest", "rtracklayer"] }, "ATACseqTFEA": { "name": "ATACseqTFEA", "version": "1.6.0", "sha256": "1dfw6vb0fx02xx21msvy8iarwmn41p1l3ryx1zs39668bz6zz06j", - "depends": ["BiocGenerics", "dplyr", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "ggrepel", "IRanges", "limma", "Matrix", "motifmatchr", "pracma", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment", "TFBSTools"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Matrix", "Rsamtools", "S4Vectors", "SummarizedExperiment", "TFBSTools", "dplyr", "ggplot2", "ggrepel", "limma", "motifmatchr", "pracma", "rtracklayer"] }, "AUCell": { "name": "AUCell", "version": "1.26.0", "sha256": "009ha82393giapvmfw2mi8pmi88f61mr69qj64y5vphcr1smvcl0", - "depends": ["BiocGenerics", "data_table", "DelayedArray", "DelayedMatrixStats", "GSEABase", "Matrix", "mixtools", "R_utils", "SummarizedExperiment"] + "depends": ["BiocGenerics", "DelayedArray", "DelayedMatrixStats", "GSEABase", "Matrix", "R_utils", "SummarizedExperiment", "data_table", "mixtools"] }, "AWFisher": { "name": "AWFisher", @@ -199,7 +199,7 @@ "name": "AffiXcan", "version": "1.22.0", "sha256": "1241vpqkv4p3yarr6fsz1a7awvc4ff7q75ia3ra7vgkvg7gx9p93", - "depends": ["BiocParallel", "crayon", "MultiAssayExperiment", "SummarizedExperiment"] + "depends": ["BiocParallel", "MultiAssayExperiment", "SummarizedExperiment", "crayon"] }, "AffyRNADegradation": { "name": "AffyRNADegradation", @@ -211,13 +211,13 @@ "name": "AgiMicroRna", "version": "2.54.0", "sha256": "1bm8rxfdgd0fx48fi70by08qr855jv6r4xcr7al2v9akv6vphws2", - "depends": ["affy", "affycoretools", "Biobase", "limma", "preprocessCore"] + "depends": ["Biobase", "affy", "affycoretools", "limma", "preprocessCore"] }, "AllelicImbalance": { "name": "AllelicImbalance", "version": "1.42.0", "sha256": "0mbmw450gdlr46ggvhrgimkbir3lg5dnqsfadn7yyrn7wkcr302f", - "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "gridExtra", "Gviz", "IRanges", "lattice", "latticeExtra", "nlme", "Rsamtools", "S4Vectors", "seqinr", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["AnnotationDbi", "BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "gridExtra", "lattice", "latticeExtra", "nlme", "seqinr"] }, "AlphaBeta": { "name": "AlphaBeta", @@ -229,25 +229,25 @@ "name": "AlphaMissenseR", "version": "1.0.2", "sha256": "1y8dzcrjqmqagnl4jiwcsfkj28n544j2d6li0ga6rrqmjwrnxzv0", - "depends": ["BiocBaseUtils", "BiocFileCache", "curl", "DBI", "dplyr", "duckdb", "memoise", "rjsoncons", "rlang", "spdl", "whisker"] + "depends": ["BiocBaseUtils", "BiocFileCache", "DBI", "curl", "dplyr", "duckdb", "memoise", "rjsoncons", "rlang", "spdl", "whisker"] }, "AlpsNMR": { "name": "AlpsNMR", "version": "4.6.0", "sha256": "1c8ynw9424ygc4wj4drbm9gdkdqwgb5z7p72zk3x5zh3zqai0d1d", - "depends": ["baseline", "BiocParallel", "cli", "dplyr", "fs", "future", "generics", "ggplot2", "glue", "htmltools", "magrittr", "matrixStats", "mixOmics", "pcaPP", "purrr", "readxl", "reshape2", "rlang", "rmarkdown", "scales", "signal", "speaq", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] + "depends": ["BiocParallel", "baseline", "cli", "dplyr", "fs", "future", "generics", "ggplot2", "glue", "htmltools", "magrittr", "matrixStats", "mixOmics", "pcaPP", "purrr", "readxl", "reshape2", "rlang", "rmarkdown", "scales", "signal", "speaq", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] }, "AnVIL": { "name": "AnVIL", - "version": "1.16.0", - "sha256": "0859gsgvljl2adjz4md52z4k1bcqh24i5xdfqddflw4gaq1zlm69", - "depends": ["BiocBaseUtils", "BiocManager", "dplyr", "DT", "futile_logger", "htmltools", "httr", "jsonlite", "miniUI", "rapiclient", "rlang", "shiny", "tibble", "tidyr", "tidyselect", "yaml"] + "version": "1.16.1", + "sha256": "0i4skg2bpj0rbb3fbaprfs4d4nxg9aj8d6pni4a3k0wip3dw1cf9", + "depends": ["BiocBaseUtils", "BiocManager", "DT", "dplyr", "futile_logger", "htmltools", "httr", "jsonlite", "miniUI", "rapiclient", "rlang", "shiny", "tibble", "tidyr", "tidyselect", "yaml"] }, "AnVILBilling": { "name": "AnVILBilling", "version": "1.14.0", "sha256": "0z05zp70l7r1wxf1s825gsgaj6kzj4fgw3962gp0z90whz398jyf", - "depends": ["bigrquery", "DBI", "dplyr", "DT", "ggplot2", "lubridate", "magrittr", "plotly", "shiny", "shinytoastr"] + "depends": ["DBI", "DT", "bigrquery", "dplyr", "ggplot2", "lubridate", "magrittr", "plotly", "shiny", "shinytoastr"] }, "AnVILPublish": { "name": "AnVILPublish", @@ -265,13 +265,13 @@ "name": "Anaquin", "version": "2.28.0", "sha256": "0hfvwzkfy6bm2ffghax5b228k2l6wf8zq82q13h6bxfps4wz0jgb", - "depends": ["DESeq2", "ggplot2", "knitr", "locfit", "plyr", "qvalue", "ROCR"] + "depends": ["DESeq2", "ROCR", "ggplot2", "knitr", "locfit", "plyr", "qvalue"] }, "AneuFinder": { "name": "AneuFinder", "version": "1.32.0", "sha256": "0dgmg0slyrh025wgz299dzzmpirlmdhmabxspci1qfarakw5yicf", - "depends": ["AneuFinderData", "bamsignals", "BiocGenerics", "Biostrings", "cowplot", "DNAcopy", "doParallel", "ecp", "foreach", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggdendro", "ggplot2", "ggrepel", "IRanges", "mclust", "reshape2", "Rsamtools", "S4Vectors"] + "depends": ["AneuFinderData", "BiocGenerics", "Biostrings", "DNAcopy", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "bamsignals", "cowplot", "doParallel", "ecp", "foreach", "ggdendro", "ggplot2", "ggrepel", "mclust", "reshape2"] }, "AnnotationDbi": { "name": "AnnotationDbi", @@ -295,13 +295,13 @@ "name": "AnnotationHub", "version": "3.12.0", "sha256": "1da2n13j2xysnd175zi7s6zm8yllnp0k59vygkx9id85jcldqf51", - "depends": ["AnnotationDbi", "BiocFileCache", "BiocGenerics", "BiocManager", "BiocVersion", "curl", "dplyr", "httr", "rappdirs", "RSQLite", "S4Vectors", "yaml"] + "depends": ["AnnotationDbi", "BiocFileCache", "BiocGenerics", "BiocManager", "BiocVersion", "RSQLite", "S4Vectors", "curl", "dplyr", "httr", "rappdirs", "yaml"] }, "AnnotationHubData": { "name": "AnnotationHubData", "version": "1.34.0", "sha256": "0wcbghjvgr8sx1qg9kyjxb7znkxhihy7jvzycrv4pyq746154xbi", - "depends": ["AnnotationDbi", "AnnotationForge", "AnnotationHub", "Biobase", "BiocCheck", "BiocGenerics", "BiocManager", "biocViews", "Biostrings", "DBI", "futile_logger", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "graph", "IRanges", "jsonlite", "OrganismDbi", "RCurl", "Rsamtools", "RSQLite", "rtracklayer", "S4Vectors", "XML"] + "depends": ["AnnotationDbi", "AnnotationForge", "AnnotationHub", "Biobase", "BiocCheck", "BiocGenerics", "BiocManager", "Biostrings", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "OrganismDbi", "RCurl", "RSQLite", "Rsamtools", "S4Vectors", "XML", "biocViews", "futile_logger", "graph", "jsonlite", "rtracklayer"] }, "ArrayExpress": { "name": "ArrayExpress", @@ -331,19 +331,19 @@ "name": "BANDITS", "version": "1.20.0", "sha256": "1iizs0bvs7rbkwv3vs6xk26jy222kql80fp6cki0qs9h9igpzk5h", - "depends": ["BiocParallel", "data_table", "doParallel", "doRNG", "DRIMSeq", "foreach", "ggplot2", "MASS", "R_utils", "Rcpp", "RcppArmadillo"] + "depends": ["BiocParallel", "DRIMSeq", "MASS", "R_utils", "Rcpp", "RcppArmadillo", "data_table", "doParallel", "doRNG", "foreach", "ggplot2"] }, "BASiCS": { "name": "BASiCS", "version": "2.16.0", "sha256": "0rcc8na0nravf2687bcvbaklwa0z8b43lvdy0nf9xvfrfpr1zjnw", - "depends": ["assertthat", "Biobase", "BiocGenerics", "BiocParallel", "coda", "cowplot", "ggExtra", "ggplot2", "hexbin", "MASS", "Matrix", "matrixStats", "posterior", "Rcpp", "RcppArmadillo", "reshape2", "S4Vectors", "scran", "scuttle", "SingleCellExperiment", "SummarizedExperiment", "viridis"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "assertthat", "coda", "cowplot", "ggExtra", "ggplot2", "hexbin", "matrixStats", "posterior", "reshape2", "scran", "scuttle", "viridis"] }, "BASiCStan": { "name": "BASiCStan", "version": "1.6.0", "sha256": "1q6lhmdy19v30aq9hzphxicq6blyzr6z94wcqsqzwb0xjij1z5f9", - "depends": ["BASiCS", "BH", "glmGamPoi", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "scran", "scuttle", "SingleCellExperiment", "StanHeaders", "SummarizedExperiment"] + "depends": ["BASiCS", "BH", "Rcpp", "RcppEigen", "RcppParallel", "SingleCellExperiment", "StanHeaders", "SummarizedExperiment", "glmGamPoi", "rstan", "rstantools", "scran", "scuttle"] }, "BBCAnalyzer": { "name": "BBCAnalyzer", @@ -361,31 +361,31 @@ "name": "BEARscc", "version": "1.24.0", "sha256": "0f66pbhf4fz66021k7f6rlwzxdikznbhjqqpxwrj07yg65q5sd1l", - "depends": ["data_table", "ggplot2", "SingleCellExperiment"] + "depends": ["SingleCellExperiment", "data_table", "ggplot2"] }, "BEAT": { "name": "BEAT", "version": "1.42.0", "sha256": "0s63nwf21ai1gys0dzjsjqy64sal7dpp040f0jqskyf2y6gdf9v9", - "depends": ["Biostrings", "BSgenome", "GenomicRanges", "ShortRead"] + "depends": ["BSgenome", "Biostrings", "GenomicRanges", "ShortRead"] }, "BERT": { "name": "BERT", "version": "1.0.0", "sha256": "1n2v8sdvh40sqz8gpzszwhp2w6npxnl48bsp9l0bzz8w148cwyk8", - "depends": ["BiocParallel", "cluster", "comprehenr", "foreach", "invgamma", "iterators", "janitor", "limma", "logging", "SummarizedExperiment", "sva"] + "depends": ["BiocParallel", "SummarizedExperiment", "cluster", "comprehenr", "foreach", "invgamma", "iterators", "janitor", "limma", "logging", "sva"] }, "BEclear": { "name": "BEclear", "version": "2.20.0", "sha256": "17i93h0q1fwl8wymmlgjsh8hbnaws6baf4jid5k579aap32zb5ha", - "depends": ["abind", "BiocParallel", "data_table", "dixonTest", "futile_logger", "ids", "Matrix", "Rcpp", "Rdpack"] + "depends": ["BiocParallel", "Matrix", "Rcpp", "Rdpack", "abind", "data_table", "dixonTest", "futile_logger", "ids"] }, "BG2": { "name": "BG2", "version": "1.4.0", "sha256": "0nby9b7kha4bz2x7a8b9nk78qai98m76csndnaikcpg79mpzygv5", - "depends": ["caret", "GA", "MASS", "Matrix", "memoise"] + "depends": ["GA", "MASS", "Matrix", "caret", "memoise"] }, "BHC": { "name": "BHC", @@ -397,49 +397,49 @@ "name": "BLMA", "version": "1.28.0", "sha256": "1b6hcjy6dv55cpprm8ylz7akl4vyvi6lky0qc31q6skxxdp3266k", - "depends": ["Biobase", "graph", "GSA", "limma", "metafor", "PADOG", "ROntoTools"] + "depends": ["Biobase", "GSA", "PADOG", "ROntoTools", "graph", "limma", "metafor"] }, "BOBaFIT": { "name": "BOBaFIT", "version": "1.8.0", "sha256": "18xzy91rblcdc4x8c4cxi5b03cskdwjpryzajhzycdpdb4hfg89q", - "depends": ["dplyr", "GenomicRanges", "ggbio", "ggforce", "ggplot2", "magrittr", "NbClust", "plyranges", "stringr", "tidyr"] + "depends": ["GenomicRanges", "NbClust", "dplyr", "ggbio", "ggforce", "ggplot2", "magrittr", "plyranges", "stringr", "tidyr"] }, "BPRMeth": { "name": "BPRMeth", "version": "1.30.0", "sha256": "0ax88n7i72lhlrrq4zc6ay5mg9ds37qlg10xafgkilgliz309ykn", - "depends": ["assertthat", "BiocStyle", "cowplot", "data_table", "doParallel", "e1071", "earth", "foreach", "GenomicRanges", "ggplot2", "IRanges", "kernlab", "magrittr", "MASS", "matrixcalc", "mvtnorm", "randomForest", "Rcpp", "RcppArmadillo", "S4Vectors", "truncnorm"] + "depends": ["BiocStyle", "GenomicRanges", "IRanges", "MASS", "Rcpp", "RcppArmadillo", "S4Vectors", "assertthat", "cowplot", "data_table", "doParallel", "e1071", "earth", "foreach", "ggplot2", "kernlab", "magrittr", "matrixcalc", "mvtnorm", "randomForest", "truncnorm"] }, "BRAIN": { "name": "BRAIN", "version": "1.50.0", "sha256": "0l712ilc308amafhbl9g6g6jvn1px0x0wlc53y2ql397l9bivva3", - "depends": ["Biostrings", "lattice", "PolynomF"] + "depends": ["Biostrings", "PolynomF", "lattice"] }, "BREW3R_r": { "name": "BREW3R.r", "version": "1.0.1", "sha256": "0i0r5sryvq721dlffs9d092776jx0j7r9mfiyi24glgqalmrslag", - "depends": ["GenomicRanges", "rlang", "S4Vectors"] + "depends": ["GenomicRanges", "S4Vectors", "rlang"] }, "BSgenome": { "name": "BSgenome", "version": "1.72.0", "sha256": "1pjbkakrycvaifl7xrmri2h94zc1ap8a9d1q4c83qji3xa21cm4q", - "depends": ["BiocGenerics", "BiocIO", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "matrixStats", "Rsamtools", "rtracklayer", "S4Vectors", "XVector"] + "depends": ["BiocGenerics", "BiocIO", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "XVector", "matrixStats", "rtracklayer"] }, "BSgenomeForge": { "name": "BSgenomeForge", "version": "1.4.0", "sha256": "0100y9lqj0xjz1ycazn4v74m7h26fxdbb03xa7ryvpdq61b0gc8p", - "depends": ["Biobase", "BiocGenerics", "BiocIO", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "rtracklayer", "S4Vectors"] + "depends": ["BSgenome", "Biobase", "BiocGenerics", "BiocIO", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "rtracklayer"] }, "BUMHMM": { "name": "BUMHMM", "version": "1.28.0", "sha256": "0c35x7bjp97qiahykkvk8krsnvy1w29qvrb6x8wa4vwn58a56naa", - "depends": ["Biostrings", "devtools", "gtools", "IRanges", "stringi", "SummarizedExperiment"] + "depends": ["Biostrings", "IRanges", "SummarizedExperiment", "devtools", "gtools", "stringi"] }, "BUS": { "name": "BUS", @@ -451,37 +451,37 @@ "name": "BUScorrect", "version": "1.22.0", "sha256": "1crq6h9s3kxk1z7xpapq1jwwqwpa2fznhykm84k2zjl8jzvc7lmi", - "depends": ["gplots", "SummarizedExperiment"] + "depends": ["SummarizedExperiment", "gplots"] }, "BUSpaRse": { "name": "BUSpaRse", - "version": "1.18.0", - "sha256": "08lq6g6sh5vgr4nn3cmn5gz735zsf8lwhhlqpg9l3d8lzfcb22d5", - "depends": ["AnnotationDbi", "AnnotationFilter", "BH", "BiocGenerics", "biomaRt", "Biostrings", "BSgenome", "dplyr", "ensembldb", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "magrittr", "Matrix", "plyranges", "Rcpp", "RcppArmadillo", "RcppProgress", "S4Vectors", "stringr", "tibble", "tidyr", "zeallot"] + "version": "1.18.1", + "sha256": "0dvs4c47v27ndc7xvpzx1acrh9v6dw99nz21lf1q7d0liiy26iyb", + "depends": ["AnnotationDbi", "AnnotationFilter", "BH", "BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "S4Vectors", "biomaRt", "dplyr", "ensembldb", "ggplot2", "magrittr", "plyranges", "stringr", "tibble", "tidyr", "zeallot"] }, "BUSseq": { "name": "BUSseq", "version": "1.10.0", "sha256": "19ajpfgz3aj1p6955z128smanna1gff6dfgh7dz8vhjyyz5nbi1q", - "depends": ["gplots", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "gplots"] }, "BaalChIP": { "name": "BaalChIP", "version": "1.30.0", "sha256": "1xm6czgbfz2rjrz5996d0n7xmlh9pd1mw9i8ac66pmn5fi44pbz2", - "depends": ["coda", "doBy", "doParallel", "foreach", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "IRanges", "reshape2", "Rsamtools", "scales"] + "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "coda", "doBy", "doParallel", "foreach", "ggplot2", "reshape2", "scales"] }, "BadRegionFinder": { "name": "BadRegionFinder", "version": "1.32.0", "sha256": "1hs1mv8gj4w0wk6sw6r08j237vw3lhjrv9zip5nk6l1g1r0pg597", - "depends": ["biomaRt", "GenomicRanges", "Rsamtools", "S4Vectors", "VariantAnnotation"] + "depends": ["GenomicRanges", "Rsamtools", "S4Vectors", "VariantAnnotation", "biomaRt"] }, "Banksy": { "name": "Banksy", "version": "1.0.0", "sha256": "1qz5nhf2qcdwcbi4kbwdjgbxpql8w5391cnb8i73gj54chc8bvn1", - "depends": ["aricode", "data_table", "dbscan", "igraph", "irlba", "leidenAlg", "matrixStats", "mclust", "RcppHungarian", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "uwot"] + "depends": ["RcppHungarian", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "aricode", "data_table", "dbscan", "igraph", "irlba", "leidenAlg", "matrixStats", "mclust", "uwot"] }, "BaseSpaceR": { "name": "BaseSpaceR", @@ -493,7 +493,7 @@ "name": "Basic4Cseq", "version": "1.40.0", "sha256": "0ipxhdsqa8q49d2i17kvwyn6w2rpyl9jmq9bhch7cjawykjla5kf", - "depends": ["Biostrings", "BSgenome_Ecoli_NCBI_20080805", "caTools", "GenomicAlignments", "GenomicRanges", "RCircos"] + "depends": ["BSgenome_Ecoli_NCBI_20080805", "Biostrings", "GenomicAlignments", "GenomicRanges", "RCircos", "caTools"] }, "BasicSTARRseq": { "name": "BasicSTARRseq", @@ -505,7 +505,7 @@ "name": "BatchQC", "version": "2.0.0", "sha256": "1kijj3ivlrwk4490jsb7vsrc7kmx32hla52cg3zb3vj6l5cwq7g6", - "depends": ["data_table", "DESeq2", "dplyr", "EBSeq", "ggdendro", "ggnewscale", "ggplot2", "limma", "matrixStats", "pheatmap", "RColorBrewer", "reader", "reshape2", "scran", "shiny", "SummarizedExperiment", "sva", "tibble", "tidyr", "tidyverse"] + "depends": ["DESeq2", "EBSeq", "RColorBrewer", "SummarizedExperiment", "data_table", "dplyr", "ggdendro", "ggnewscale", "ggplot2", "limma", "matrixStats", "pheatmap", "reader", "reshape2", "scran", "shiny", "sva", "tibble", "tidyr", "tidyverse"] }, "BayesKnockdown": { "name": "BayesKnockdown", @@ -517,7 +517,7 @@ "name": "BayesSpace", "version": "1.14.0", "sha256": "0q1haqsyc61yxz1n197sv3s6csjpns4fi288kf58nnf5jgdwnyx5", - "depends": ["assertthat", "BiocFileCache", "BiocSingular", "coda", "DirichletReg", "ggplot2", "Matrix", "mclust", "purrr", "Rcpp", "RcppArmadillo", "RcppDist", "RcppProgress", "RCurl", "rhdf5", "S4Vectors", "scales", "scater", "scran", "SingleCellExperiment", "SummarizedExperiment", "xgboost"] + "depends": ["BiocFileCache", "BiocSingular", "DirichletReg", "Matrix", "RCurl", "Rcpp", "RcppArmadillo", "RcppDist", "RcppProgress", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "assertthat", "coda", "ggplot2", "mclust", "purrr", "rhdf5", "scales", "scater", "scran", "xgboost"] }, "BeadDataPackR": { "name": "BeadDataPackR", @@ -525,11 +525,17 @@ "sha256": "0wz3prri0mfjczmb432faxfjc99wg4lq26l3a60rmxyxq8mcnpkv", "depends": [] }, + "BgeeCall": { + "name": "BgeeCall", + "version": "1.20.1", + "sha256": "02k83a01fb4gydnw81j2vc3d1m92y0n44bskbdrlm7cb1zscvc13", + "depends": ["Biostrings", "GenomicFeatures", "biomaRt", "data_table", "dplyr", "jsonlite", "rhdf5", "rslurm", "rtracklayer", "sjmisc", "txdbmaker", "tximport"] + }, "BgeeDB": { "name": "BgeeDB", "version": "2.30.0", "sha256": "1jbb93inv7z0i8b1jr6ax98gqkqn73m86hj61irgyysk7hn4bbg6", - "depends": ["Biobase", "curl", "data_table", "digest", "dplyr", "graph", "R_utils", "RCurl", "RSQLite", "tidyr", "topGO"] + "depends": ["Biobase", "RCurl", "RSQLite", "R_utils", "curl", "data_table", "digest", "dplyr", "graph", "tidyr", "topGO"] }, "BiFET": { "name": "BiFET", @@ -541,19 +547,19 @@ "name": "BiGGR", "version": "1.40.0", "sha256": "1ja5j9753rgx61jwkax0mzkxh7ybh3m4ampkr5ikw3afda23wg1z", - "depends": ["hyperdraw", "hypergraph", "LIM", "limSolve", "rsbml", "stringr"] + "depends": ["LIM", "hyperdraw", "hypergraph", "limSolve", "rsbml", "stringr"] }, "BiRewire": { "name": "BiRewire", "version": "3.36.0", "sha256": "1l3hkq6n7i9j82aym4ngwablj8jqb70a7y6skx0rjkflya6wbim7", - "depends": ["igraph", "Matrix", "Rtsne", "slam"] + "depends": ["Matrix", "Rtsne", "igraph", "slam"] }, "BiSeq": { "name": "BiSeq", "version": "1.44.0", "sha256": "12nkdaz54ga133v38mmqaf3xcsx7ps2rcxxvni100vsk93hv155z", - "depends": ["betareg", "Biobase", "BiocGenerics", "Formula", "GenomeInfoDb", "GenomicRanges", "globaltest", "IRanges", "lokern", "rtracklayer", "S4Vectors", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "Formula", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "betareg", "globaltest", "lokern", "rtracklayer"] }, "BicARE": { "name": "BicARE", @@ -565,7 +571,7 @@ "name": "BindingSiteFinder", "version": "2.2.0", "sha256": "1icgz7wfayqzr1wd0n7sb71bh149d4d1m7rh5s5ap07llnn7vsq1", - "depends": ["ComplexHeatmap", "dplyr", "forcats", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggdist", "ggforce", "ggplot2", "IRanges", "kableExtra", "lifecycle", "matrixStats", "plyr", "RColorBrewer", "rlang", "rtracklayer", "S4Vectors", "tibble", "tidyr"] + "depends": ["ComplexHeatmap", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "dplyr", "forcats", "ggdist", "ggforce", "ggplot2", "kableExtra", "lifecycle", "matrixStats", "plyr", "rlang", "rtracklayer", "tibble", "tidyr"] }, "BioCartaImage": { "name": "BioCartaImage", @@ -583,31 +589,31 @@ "name": "BioMVCClass", "version": "1.72.0", "sha256": "0dfdksk3nc6pzw21sbd4cdqr05489qh4984wv0f906hyb52waxk2", - "depends": ["Biobase", "graph", "MVCClass", "Rgraphviz"] + "depends": ["Biobase", "MVCClass", "Rgraphviz", "graph"] }, "BioNAR": { "name": "BioNAR", - "version": "1.6.0", - "sha256": "1airs789p970v5j4nfmsvba70r3yadc4rw3z3sykqnc1qxzinvxq", - "depends": ["AnnotationDbi", "clusterCons", "cowplot", "data_table", "dplyr", "fgsea", "ggplot2", "ggrepel", "GO_db", "igraph", "latex2exp", "Matrix", "minpack_lm", "org_Hs_eg_db", "poweRlaw", "Rdpack", "RSpectra", "rSpectral", "scales", "stringr", "viridis", "WGCNA"] + "version": "1.6.3", + "sha256": "0gr3pf34xgs778bfndmml9df7l0w6ypa8d83h31krlxzd1h4wz0h", + "depends": ["AnnotationDbi", "GO_db", "Matrix", "RSpectra", "Rdpack", "WGCNA", "clusterCons", "cowplot", "data_table", "dplyr", "fgsea", "ggplot2", "ggrepel", "igraph", "latex2exp", "minpack_lm", "org_Hs_eg_db", "poweRlaw", "rSpectral", "scales", "stringr", "viridis"] }, "BioNERO": { "name": "BioNERO", "version": "1.12.0", "sha256": "02jqlpd31mhxbvksj7ny34f6dv8skkkr76lkiaj5gm078kfr0zx5", - "depends": ["BiocParallel", "ComplexHeatmap", "dynamicTreeCut", "GENIE3", "ggdendro", "ggnetwork", "ggplot2", "ggrepel", "igraph", "intergraph", "matrixStats", "minet", "NetRep", "patchwork", "RColorBrewer", "reshape2", "rlang", "SummarizedExperiment", "sva", "WGCNA"] + "depends": ["BiocParallel", "ComplexHeatmap", "GENIE3", "NetRep", "RColorBrewer", "SummarizedExperiment", "WGCNA", "dynamicTreeCut", "ggdendro", "ggnetwork", "ggplot2", "ggrepel", "igraph", "intergraph", "matrixStats", "minet", "patchwork", "reshape2", "rlang", "sva"] }, "BioNet": { "name": "BioNet", "version": "1.64.0", "sha256": "0lpqvm0cx7pnb99jh7na49x10w2v04xydiwxn9l41ngxysp8v0h6", - "depends": ["AnnotationDbi", "Biobase", "graph", "igraph", "RBGL"] + "depends": ["AnnotationDbi", "Biobase", "RBGL", "graph", "igraph"] }, "BioQC": { "name": "BioQC", "version": "1.32.0", "sha256": "14yrqf5wl9r596zvlpf4y48nykg0gwzlxfgi3kdx0i5pfgvi43vk", - "depends": ["Biobase", "edgeR", "Rcpp"] + "depends": ["Biobase", "Rcpp", "edgeR"] }, "Biobase": { "name": "Biobase", @@ -625,7 +631,7 @@ "name": "BiocBook", "version": "1.2.0", "sha256": "0rdsx2slwp69l6svsaj3pndd6bv318jkla5j84avwgfi63wks092", - "depends": ["available", "BiocGenerics", "cli", "dplyr", "gert", "gh", "gitcreds", "glue", "httr", "purrr", "quarto", "renv", "rlang", "rprojroot", "stringr", "tibble", "usethis", "yaml"] + "depends": ["BiocGenerics", "available", "cli", "dplyr", "gert", "gh", "gitcreds", "glue", "httr", "purrr", "quarto", "renv", "rlang", "rprojroot", "stringr", "tibble", "usethis", "yaml"] }, "BiocCheck": { "name": "BiocCheck", @@ -637,13 +643,13 @@ "name": "BiocFHIR", "version": "1.6.0", "sha256": "0zw59xb6jxxqg9aiwn6h4ak4056b64y22irkysl51rvdrb12n32h", - "depends": ["BiocBaseUtils", "dplyr", "DT", "graph", "jsonlite", "shiny", "tidyr", "visNetwork"] + "depends": ["BiocBaseUtils", "DT", "dplyr", "graph", "jsonlite", "shiny", "tidyr", "visNetwork"] }, "BiocFileCache": { "name": "BiocFileCache", "version": "2.12.0", "sha256": "0jv6hni5x91ssvz4ilhi3y6lylrw4w3xfk8ljmq6gjvyl886sw9f", - "depends": ["curl", "DBI", "dbplyr", "dplyr", "filelock", "httr", "RSQLite"] + "depends": ["DBI", "RSQLite", "curl", "dbplyr", "dplyr", "filelock", "httr"] }, "BiocGenerics": { "name": "BiocGenerics", @@ -655,13 +661,13 @@ "name": "BiocHail", "version": "1.4.0", "sha256": "1p8wkl31c7snv8l8zkmg2hf9pb2p0gif4gfgjia0npi91y2h5hfp", - "depends": ["basilisk", "BiocFileCache", "BiocGenerics", "dplyr", "reticulate"] + "depends": ["BiocFileCache", "BiocGenerics", "basilisk", "dplyr", "reticulate"] }, "BiocHubsShiny": { "name": "BiocHubsShiny", "version": "1.4.0", "sha256": "19ihc6fi04kbgmlvn5k1cjpckc03p5yfjpc3gjmmf3pn69qgljzf", - "depends": ["AnnotationHub", "DT", "ExperimentHub", "htmlwidgets", "S4Vectors", "shiny", "shinyAce", "shinyjs", "shinythemes", "shinytoastr"] + "depends": ["AnnotationHub", "DT", "ExperimentHub", "S4Vectors", "htmlwidgets", "shiny", "shinyAce", "shinyjs", "shinythemes", "shinytoastr"] }, "BiocIO": { "name": "BiocIO", @@ -679,7 +685,7 @@ "name": "BiocOncoTK", "version": "1.24.0", "sha256": "0h4cr7lrmbyx7kdj81s7ff75svr01rvzn54svqi93vjilawmpbm3", - "depends": ["bigrquery", "car", "ComplexHeatmap", "curatedTCGAData", "DBI", "dplyr", "DT", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggpubr", "graph", "httr", "IRanges", "magrittr", "MASS", "plyr", "Rgraphviz", "rjson", "S4Vectors", "scales", "shiny", "SummarizedExperiment"] + "depends": ["ComplexHeatmap", "DBI", "DT", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "Rgraphviz", "S4Vectors", "SummarizedExperiment", "bigrquery", "car", "curatedTCGAData", "dplyr", "ggplot2", "ggpubr", "graph", "httr", "magrittr", "plyr", "rjson", "scales", "shiny"] }, "BiocParallel": { "name": "BiocParallel", @@ -691,30 +697,30 @@ "name": "BiocPkgTools", "version": "1.22.0", "sha256": "1nbzr1yjz65r0y8c312hnvagnc1pdgda4v6sxbpvlkl3z93jsy6x", - "depends": ["BiocFileCache", "BiocManager", "biocViews", "dplyr", "DT", "gh", "graph", "htmltools", "htmlwidgets", "httr", "igraph", "jsonlite", "magrittr", "RBGL", "readr", "rlang", "rorcid", "rvest", "stringr", "tibble", "xml2"] + "depends": ["BiocFileCache", "BiocManager", "DT", "RBGL", "biocViews", "dplyr", "gh", "graph", "htmltools", "htmlwidgets", "httr", "igraph", "jsonlite", "magrittr", "readr", "rlang", "rorcid", "rvest", "stringr", "tibble", "xml2"] }, "BiocSet": { "name": "BiocSet", "version": "1.18.0", "sha256": "1r1if1k7qgni3dk7gsl4vcyvd6hnhx94rcq5yi9w7dvyyrbvnwwa", - "depends": ["AnnotationDbi", "BiocIO", "dplyr", "KEGGREST", "ontologyIndex", "plyr", "rlang", "S4Vectors", "tibble", "tidyr"] + "depends": ["AnnotationDbi", "BiocIO", "KEGGREST", "S4Vectors", "dplyr", "ontologyIndex", "plyr", "rlang", "tibble", "tidyr"] }, "BiocSingular": { "name": "BiocSingular", "version": "1.20.0", "sha256": "1xl9wn3slj3ywjglb8zq2p0ifx4xwxbqsm99fjlf6hanfhmnxyay", - "depends": ["beachmat", "BiocGenerics", "BiocParallel", "DelayedArray", "irlba", "Matrix", "Rcpp", "rsvd", "S4Vectors", "ScaledMatrix"] + "depends": ["BiocGenerics", "BiocParallel", "DelayedArray", "Matrix", "Rcpp", "S4Vectors", "ScaledMatrix", "beachmat", "irlba", "rsvd"] }, "BiocSklearn": { "name": "BiocSklearn", "version": "1.26.0", "sha256": "19s38zpgdscbrqypyg17l1jw53x88lgkcrqg20gchfi6mig36a3w", - "depends": ["basilisk", "reticulate", "SummarizedExperiment"] + "depends": ["SummarizedExperiment", "basilisk", "reticulate"] }, "BiocStyle": { "name": "BiocStyle", - "version": "2.32.0", - "sha256": "1vm9wj4hzzjivdi6rnxyhxwqscdvbmc45w9zq17h3r53qnva530x", + "version": "2.32.1", + "sha256": "1m0nn2m548726w576mx8mx29xj428q1rkpn7z7a7m8kzgcvvgkkr", "depends": ["BiocManager", "bookdown", "knitr", "rmarkdown", "yaml"] }, "BiocVersion": { @@ -733,13 +739,13 @@ "name": "Biostrings", "version": "2.72.1", "sha256": "067vy2v7spbdsknvi0fcpdi085kn8v20pyrhkc7wy357v21h7hgs", - "depends": ["BiocGenerics", "crayon", "GenomeInfoDb", "IRanges", "S4Vectors", "XVector"] + "depends": ["BiocGenerics", "GenomeInfoDb", "IRanges", "S4Vectors", "XVector", "crayon"] }, "BloodGen3Module": { "name": "BloodGen3Module", "version": "1.12.0", "sha256": "0mksc9jfzcj255a01hg8gjrs6k2plkpfqgv951csldvy7vqrdkma", - "depends": ["circlize", "ComplexHeatmap", "ExperimentHub", "ggplot2", "gtools", "limma", "matrixStats", "preprocessCore", "randomcoloR", "reshape2", "SummarizedExperiment", "testthat", "V8"] + "depends": ["ComplexHeatmap", "ExperimentHub", "SummarizedExperiment", "V8", "circlize", "ggplot2", "gtools", "limma", "matrixStats", "preprocessCore", "randomcoloR", "reshape2", "testthat"] }, "BridgeDbR": { "name": "BridgeDbR", @@ -757,7 +763,7 @@ "name": "BubbleTree", "version": "2.34.0", "sha256": "0l69q8l6dacyqdbfdnxlg70f064xm8w5p07pi2x0baacxv8bs5d4", - "depends": ["Biobase", "BiocGenerics", "BiocStyle", "biovizBase", "dplyr", "e1071", "GenomicRanges", "ggplot2", "gridExtra", "gtable", "gtools", "IRanges", "limma", "magrittr", "plyr", "RColorBrewer", "WriteXLS"] + "depends": ["Biobase", "BiocGenerics", "BiocStyle", "GenomicRanges", "IRanges", "RColorBrewer", "WriteXLS", "biovizBase", "dplyr", "e1071", "ggplot2", "gridExtra", "gtable", "gtools", "limma", "magrittr", "plyr"] }, "BufferedMatrix": { "name": "BufferedMatrix", @@ -787,25 +793,25 @@ "name": "CAFE", "version": "1.40.0", "sha256": "1vq1yf78yfsfnsjpqb89zghzr677mdwvpi5zl3ikz2j5z40h1rjj", - "depends": ["affy", "annotate", "Biobase", "biovizBase", "GenomicRanges", "ggbio", "ggplot2", "gridExtra", "IRanges"] + "depends": ["Biobase", "GenomicRanges", "IRanges", "affy", "annotate", "biovizBase", "ggbio", "ggplot2", "gridExtra"] }, "CAGEfightR": { "name": "CAGEfightR", "version": "1.24.0", "sha256": "1i6q5bwg55d3iydcy3h6j9hg30581vvc592rs5cac310qxzcj8hj", - "depends": ["assertthat", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicInteractions", "GenomicRanges", "Gviz", "InteractionSet", "IRanges", "Matrix", "pryr", "rtracklayer", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicInteractions", "GenomicRanges", "Gviz", "IRanges", "InteractionSet", "Matrix", "S4Vectors", "SummarizedExperiment", "assertthat", "pryr", "rtracklayer"] }, "CAGEr": { "name": "CAGEr", "version": "2.10.0", "sha256": "1amx7l5y1v8ccmlpjmr9wm2dbc85xadx4ayy8m45vabi97j8nrp4", - "depends": ["BiocGenerics", "BiocParallel", "BSgenome", "CAGEfightR", "data_table", "DelayedArray", "DelayedMatrixStats", "formula_tools", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "gtools", "IRanges", "KernSmooth", "memoise", "MultiAssayExperiment", "plyr", "reshape2", "Rsamtools", "rtracklayer", "S4Vectors", "som", "stringdist", "stringi", "SummarizedExperiment", "vegan", "VGAM"] + "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "CAGEfightR", "DelayedArray", "DelayedMatrixStats", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "KernSmooth", "MultiAssayExperiment", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VGAM", "data_table", "formula_tools", "ggplot2", "gtools", "memoise", "plyr", "reshape2", "rtracklayer", "som", "stringdist", "stringi", "vegan"] }, "CAMERA": { "name": "CAMERA", "version": "1.60.0", "sha256": "1wcihfi7vzdb5xkk2r7cdb4pqdbnph01m3dsz126984rzplpcd44", - "depends": ["Biobase", "graph", "Hmisc", "igraph", "RBGL", "xcms"] + "depends": ["Biobase", "Hmisc", "RBGL", "graph", "igraph", "xcms"] }, "CARNIVAL": { "name": "CARNIVAL", @@ -817,19 +823,19 @@ "name": "CATALYST", "version": "1.28.0", "sha256": "168yfkqlg6af8ndlw4wzb9adg4lgkgkjbsi4a435ks0n4c9dycb7", - "depends": ["circlize", "ComplexHeatmap", "ConsensusClusterPlus", "cowplot", "data_table", "dplyr", "drc", "flowCore", "FlowSOM", "ggplot2", "ggrepel", "ggridges", "gridExtra", "Matrix", "matrixStats", "nnls", "purrr", "RColorBrewer", "reshape2", "Rtsne", "S4Vectors", "scales", "scater", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["ComplexHeatmap", "ConsensusClusterPlus", "FlowSOM", "Matrix", "RColorBrewer", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "circlize", "cowplot", "data_table", "dplyr", "drc", "flowCore", "ggplot2", "ggrepel", "ggridges", "gridExtra", "matrixStats", "nnls", "purrr", "reshape2", "scales", "scater"] }, "CBEA": { "name": "CBEA", "version": "1.4.0", "sha256": "0j43lvz55xawwk723rsfpir6vir5wbxpwslpk4x2frslf5i00mky", - "depends": ["BiocParallel", "BiocSet", "dplyr", "fitdistrplus", "generics", "glue", "goftest", "lmom", "magrittr", "mixtools", "Rcpp", "rlang", "SummarizedExperiment", "tibble", "tidyr", "TreeSummarizedExperiment"] + "depends": ["BiocParallel", "BiocSet", "Rcpp", "SummarizedExperiment", "TreeSummarizedExperiment", "dplyr", "fitdistrplus", "generics", "glue", "goftest", "lmom", "magrittr", "mixtools", "rlang", "tibble", "tidyr"] }, "CBNplot": { "name": "CBNplot", "version": "1.4.0", "sha256": "1n85clswpk1xxfq423sgk38qb9kjkjj2kghnxw8a4618vxypwsrv", - "depends": ["BiocFileCache", "bnlearn", "clusterProfiler", "depmap", "dplyr", "enrichplot", "ExperimentHub", "ggdist", "ggforce", "ggplot2", "ggraph", "graphite", "graphlayouts", "igraph", "magrittr", "oaqc", "org_Hs_eg_db", "patchwork", "purrr", "pvclust", "reshape2", "rlang", "Rmpfr", "stringr", "tidyr"] + "depends": ["BiocFileCache", "ExperimentHub", "Rmpfr", "bnlearn", "clusterProfiler", "depmap", "dplyr", "enrichplot", "ggdist", "ggforce", "ggplot2", "ggraph", "graphite", "graphlayouts", "igraph", "magrittr", "oaqc", "org_Hs_eg_db", "patchwork", "purrr", "pvclust", "reshape2", "rlang", "stringr", "tidyr"] }, "CCPROMISE": { "name": "CCPROMISE", @@ -841,19 +847,19 @@ "name": "CCPlotR", "version": "1.2.0", "sha256": "05qh8yqk2yv4vw314aflys7qn4kwhy839wj5cdw9iysaklkyjscg", - "depends": ["circlize", "ComplexHeatmap", "dplyr", "forcats", "ggbump", "ggh4x", "ggplot2", "ggraph", "ggtext", "igraph", "patchwork", "plyr", "RColorBrewer", "scales", "scatterpie", "stringr", "tibble", "tidyr", "viridis"] + "depends": ["ComplexHeatmap", "RColorBrewer", "circlize", "dplyr", "forcats", "ggbump", "ggh4x", "ggplot2", "ggraph", "ggtext", "igraph", "patchwork", "plyr", "scales", "scatterpie", "stringr", "tibble", "tidyr", "viridis"] }, "CDI": { "name": "CDI", "version": "1.2.0", "sha256": "0nc4s8prs6p0k7qp2lc5fzdqx177y1xamrwizldwi5p3yq1zq1nx", - "depends": ["BiocParallel", "ggplot2", "ggsci", "matrixStats", "reshape2", "Seurat", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocParallel", "Seurat", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "ggsci", "matrixStats", "reshape2"] }, "CEMiTool": { "name": "CEMiTool", "version": "1.28.0", "sha256": "1pcyw8njyrcjriyzq52km0qhn1n288gqvn1qdkzx2yfv4a1i6rxk", - "depends": ["clusterProfiler", "data_table", "dplyr", "DT", "fastcluster", "fgsea", "ggdendro", "ggplot2", "ggpmisc", "ggrepel", "ggthemes", "gridExtra", "gtable", "htmltools", "igraph", "intergraph", "knitr", "matrixStats", "network", "pracma", "rmarkdown", "scales", "sna", "stringr", "WGCNA"] + "depends": ["DT", "WGCNA", "clusterProfiler", "data_table", "dplyr", "fastcluster", "fgsea", "ggdendro", "ggplot2", "ggpmisc", "ggrepel", "ggthemes", "gridExtra", "gtable", "htmltools", "igraph", "intergraph", "knitr", "matrixStats", "network", "pracma", "rmarkdown", "scales", "sna", "stringr"] }, "CFAssay": { "name": "CFAssay", @@ -895,25 +901,25 @@ "name": "CHETAH", "version": "1.20.0", "sha256": "19vb0c9kla6jn79v5sc8sig195lnzzhki2089pvjsy4gw2q3nmnh", - "depends": ["bioDist", "corrplot", "cowplot", "dendextend", "ggplot2", "pheatmap", "plotly", "reshape2", "S4Vectors", "shiny", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "bioDist", "corrplot", "cowplot", "dendextend", "ggplot2", "pheatmap", "plotly", "reshape2", "shiny"] }, "CHRONOS": { "name": "CHRONOS", "version": "1.32.0", "sha256": "06ynbgmzp820l85n25lrhks1vl1ccaf3giypgp59s79v496vps3x", - "depends": ["biomaRt", "circlize", "doParallel", "foreach", "graph", "igraph", "openxlsx", "RBGL", "RCurl", "rJava", "XML"] + "depends": ["RBGL", "RCurl", "XML", "biomaRt", "circlize", "doParallel", "foreach", "graph", "igraph", "openxlsx", "rJava"] }, "CIMICE": { "name": "CIMICE", "version": "1.12.0", "sha256": "18m6mb1r9s8cqi1lsignmf9p8q7qigazxyif14z6f1h5kdcs6707", - "depends": ["assertthat", "dplyr", "expm", "ggcorrplot", "ggplot2", "ggraph", "glue", "igraph", "maftools", "Matrix", "networkD3", "purrr", "tidygraph", "tidyr", "visNetwork"] + "depends": ["Matrix", "assertthat", "dplyr", "expm", "ggcorrplot", "ggplot2", "ggraph", "glue", "igraph", "maftools", "networkD3", "purrr", "tidygraph", "tidyr", "visNetwork"] }, "CINdex": { "name": "CINdex", "version": "1.32.0", "sha256": "1cgq0bcrgdwzxci47issdck4pz8pnbpfzz7i57mi0ga3jqih0g2i", - "depends": ["bitops", "dplyr", "GenomeInfoDb", "GenomicRanges", "gplots", "gridExtra", "IRanges", "png", "S4Vectors", "som", "stringr"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "bitops", "dplyr", "gplots", "gridExtra", "png", "som", "stringr"] }, "CMA": { "name": "CMA", @@ -931,13 +937,13 @@ "name": "CNEr", "version": "1.40.0", "sha256": "19kfh7p8zlb1nbwpsj6i1b7pqy829dij7n7iavznhxw44cmif6sv", - "depends": ["annotate", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "GO_db", "IRanges", "KEGGREST", "poweRlaw", "pwalign", "R_utils", "readr", "reshape2", "RSQLite", "rtracklayer", "S4Vectors", "XVector"] + "depends": ["BiocGenerics", "Biostrings", "DBI", "GO_db", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "KEGGREST", "RSQLite", "R_utils", "S4Vectors", "XVector", "annotate", "ggplot2", "poweRlaw", "pwalign", "readr", "reshape2", "rtracklayer"] }, "CNORdt": { "name": "CNORdt", "version": "1.46.0", "sha256": "1f9d2jmqxcmzvwvshf8yni0j28y13cdb5w9z1mcl7f3gcd0vn3rx", - "depends": ["abind", "CellNOptR"] + "depends": ["CellNOptR", "abind"] }, "CNORfeeder": { "name": "CNORfeeder", @@ -967,61 +973,61 @@ "name": "CNVMetrics", "version": "1.8.0", "sha256": "1vf04v7sr4f8mizzvbr3q4w83vdb62mabg5pl5dh53zvhrrzk1hi", - "depends": ["BiocParallel", "GenomicRanges", "gridExtra", "IRanges", "magrittr", "pheatmap", "rBeta2009", "S4Vectors"] + "depends": ["BiocParallel", "GenomicRanges", "IRanges", "S4Vectors", "gridExtra", "magrittr", "pheatmap", "rBeta2009"] }, "CNVPanelizer": { "name": "CNVPanelizer", "version": "1.36.0", "sha256": "0gpi1psr14b572xn4qx92lfxwy6d7jdkarf67w7f3glvif93vm9k", - "depends": ["BiocGenerics", "foreach", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gplots", "IRanges", "NOISeq", "openxlsx", "plyr", "reshape2", "Rsamtools", "S4Vectors", "shiny", "shinyFiles", "shinyjs", "stringr", "testthat"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "NOISeq", "Rsamtools", "S4Vectors", "foreach", "ggplot2", "gplots", "openxlsx", "plyr", "reshape2", "shiny", "shinyFiles", "shinyjs", "stringr", "testthat"] }, "CNVRanger": { "name": "CNVRanger", "version": "1.20.0", "sha256": "1lwav9nv9rm7zyqxl9sx46vp4016i2175hvys3skj8myyjgcdd7n", - "depends": ["BiocGenerics", "BiocParallel", "data_table", "edgeR", "GDSArray", "gdsfmt", "GenomeInfoDb", "GenomicRanges", "IRanges", "lattice", "limma", "plyr", "qqman", "RaggedExperiment", "rappdirs", "reshape2", "S4Vectors", "SNPRelate", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocParallel", "GDSArray", "GenomeInfoDb", "GenomicRanges", "IRanges", "RaggedExperiment", "S4Vectors", "SNPRelate", "SummarizedExperiment", "data_table", "edgeR", "gdsfmt", "lattice", "limma", "plyr", "qqman", "rappdirs", "reshape2"] }, "CNVfilteR": { "name": "CNVfilteR", "version": "1.18.0", "sha256": "1jqpdqcnyxww2h5x784yl3i07i3x5kf0xyqgv558rzs936gzc23a", - "depends": ["assertthat", "Biostrings", "CopyNumberPlots", "GenomeInfoDb", "GenomicRanges", "IRanges", "karyoploteR", "pracma", "regioneR", "Rsamtools", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["Biostrings", "CopyNumberPlots", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "SummarizedExperiment", "VariantAnnotation", "assertthat", "karyoploteR", "pracma", "regioneR"] }, "CNViz": { "name": "CNViz", "version": "1.12.0", "sha256": "1s7j8lrl999b7v76z91y56m8nyy3lwjmqlnd1qpxg23jdlgb6bhv", - "depends": ["CopyNumberPlots", "dplyr", "DT", "GenomicRanges", "karyoploteR", "magrittr", "plotly", "scales", "shiny"] + "depends": ["CopyNumberPlots", "DT", "GenomicRanges", "dplyr", "karyoploteR", "magrittr", "plotly", "scales", "shiny"] }, "CNVrd2": { "name": "CNVrd2", "version": "1.42.0", "sha256": "1kbs82a7pri8xv3ci9xdi47ml7r70wjxi0jnsxhrzbaqjss5b4v6", - "depends": ["DNAcopy", "ggplot2", "gridExtra", "IRanges", "rjags", "Rsamtools", "VariantAnnotation"] + "depends": ["DNAcopy", "IRanges", "Rsamtools", "VariantAnnotation", "ggplot2", "gridExtra", "rjags"] }, "COCOA": { "name": "COCOA", "version": "2.18.0", "sha256": "0achirgsp2psybk140wiiagjr9qsapkhdmy4mnf5zg4hc8nx3yn3", - "depends": ["Biobase", "BiocGenerics", "ComplexHeatmap", "data_table", "fitdistrplus", "GenomicRanges", "ggplot2", "IRanges", "MIRA", "S4Vectors", "simpleCache", "tidyr"] + "depends": ["Biobase", "BiocGenerics", "ComplexHeatmap", "GenomicRanges", "IRanges", "MIRA", "S4Vectors", "data_table", "fitdistrplus", "ggplot2", "simpleCache", "tidyr"] }, "CODEX": { "name": "CODEX", "version": "1.36.0", "sha256": "0p3d7hqi14qclz4d7fhp3x4z2dnkwpzpzlgrwacj4njkw94cwdaz", - "depends": ["Biostrings", "BSgenome_Hsapiens_UCSC_hg19", "GenomeInfoDb", "IRanges", "Rsamtools", "S4Vectors"] + "depends": ["BSgenome_Hsapiens_UCSC_hg19", "Biostrings", "GenomeInfoDb", "IRanges", "Rsamtools", "S4Vectors"] }, "COMPASS": { "name": "COMPASS", "version": "1.42.0", "sha256": "0xh3ysmcz4bjqcyqdv9wrmfgblj3k7g7i6wiw2m1vmx5gf98rfpa", - "depends": ["abind", "BiocStyle", "clue", "coda", "data_table", "dplyr", "foreach", "knitr", "magrittr", "pdist", "plyr", "RColorBrewer", "Rcpp", "reshape2", "rlang", "rmarkdown", "scales", "tidyr"] + "depends": ["BiocStyle", "RColorBrewer", "Rcpp", "abind", "clue", "coda", "data_table", "dplyr", "foreach", "knitr", "magrittr", "pdist", "plyr", "reshape2", "rlang", "rmarkdown", "scales", "tidyr"] }, "CONFESS": { "name": "CONFESS", "version": "1.32.0", "sha256": "14m7nz6ls58g4c45x5m7r30ms3kgxslg22jikjsi1cx49ycyk9dl", - "depends": ["changepoint", "cluster", "contrast", "data_table", "EBImage", "ecp", "flexmix", "flowClust", "flowCore", "flowMeans", "flowMerge", "flowPeaks", "foreach", "ggplot2", "limma", "MASS", "moments", "outliers", "plotrix", "raster", "readbitmap", "reshape2", "SamSPECTRAL", "waveslim", "wavethresh", "zoo"] + "depends": ["EBImage", "MASS", "SamSPECTRAL", "changepoint", "cluster", "contrast", "data_table", "ecp", "flexmix", "flowClust", "flowCore", "flowMeans", "flowMerge", "flowPeaks", "foreach", "ggplot2", "limma", "moments", "outliers", "plotrix", "raster", "readbitmap", "reshape2", "waveslim", "wavethresh", "zoo"] }, "CONSTANd": { "name": "CONSTANd", @@ -1037,27 +1043,27 @@ }, "COTAN": { "name": "COTAN", - "version": "2.4.3", - "sha256": "13yw1mrx38im9g87is0ska6piw0ibzfmkk1h46alj1hxc0n3n5gh", - "depends": ["assertthat", "BiocSingular", "circlize", "ComplexHeatmap", "dendextend", "dplyr", "ggplot2", "ggrepel", "ggthemes", "Matrix", "parallelDist", "parallelly", "PCAtools", "plyr", "RColorBrewer", "Rfast", "rlang", "scales", "Seurat", "stringr", "tibble", "tidyr", "umap", "withr", "zeallot"] + "version": "2.4.4", + "sha256": "1b4g6wkk90kjrv8dz4larg3b7pyyid3z7336niwjp7x0ms6hp3zw", + "depends": ["BiocSingular", "ComplexHeatmap", "Matrix", "PCAtools", "RColorBrewer", "Rfast", "Seurat", "assertthat", "circlize", "dendextend", "dplyr", "ggplot2", "ggrepel", "ggthemes", "parallelDist", "parallelly", "plyr", "rlang", "scales", "stringr", "tibble", "tidyr", "umap", "withr", "zeallot"] }, "CRISPRball": { "name": "CRISPRball", "version": "1.0.0", "sha256": "1gxwmasr37azvc7h98izv0npxq5n7hvk1bvl2rgj5fv6da2ddmki", - "depends": ["circlize", "colourpicker", "ComplexHeatmap", "dittoSeq", "DT", "ggplot2", "htmlwidgets", "InteractiveComplexHeatmap", "MAGeCKFlute", "matrixStats", "PCAtools", "plotly", "shiny", "shinyBS", "shinycssloaders", "shinyjqui", "shinyjs", "shinyWidgets"] + "depends": ["ComplexHeatmap", "DT", "InteractiveComplexHeatmap", "MAGeCKFlute", "PCAtools", "circlize", "colourpicker", "dittoSeq", "ggplot2", "htmlwidgets", "matrixStats", "plotly", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "shinyjqui", "shinyjs"] }, "CRISPRseek": { "name": "CRISPRseek", "version": "1.44.0", "sha256": "1vmqwpbl1gplrr45bqs90np0cmrkqshw660k4sxmj9s9k0xdms7c", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "data_table", "DelayedArray", "dplyr", "GenomeInfoDb", "GenomicRanges", "hash", "IRanges", "keras", "mltools", "reticulate", "rhdf5", "S4Vectors", "seqinr", "XVector"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "XVector", "data_table", "dplyr", "hash", "keras", "mltools", "reticulate", "rhdf5", "seqinr"] }, "CRImage": { "name": "CRImage", "version": "1.52.0", "sha256": "0nnyzgdn25s2m9x4xglp12z2b4fai5sbfnx935qadk0b9gb62bdg", - "depends": ["aCGH", "DNAcopy", "e1071", "EBImage", "foreach", "MASS", "sgeostat"] + "depends": ["DNAcopy", "EBImage", "MASS", "aCGH", "e1071", "foreach", "sgeostat"] }, "CSAR": { "name": "CSAR", @@ -1069,19 +1075,19 @@ "name": "CSSQ", "version": "1.16.0", "sha256": "1jwrp0b6qkkc538j1vshqgkazajs9q3fq3dda3cl9a8cbma9jpfg", - "depends": ["GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment"] + "depends": ["GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "ggplot2", "rtracklayer"] }, "CTDquerier": { "name": "CTDquerier", "version": "2.12.0", "sha256": "11z3gy6gn735dydjissdc09kllfd9qvg0gsf5v7a700fz6d78j2a", - "depends": ["BiocFileCache", "ggplot2", "gridExtra", "igraph", "RCurl", "S4Vectors", "stringdist", "stringr"] + "depends": ["BiocFileCache", "RCurl", "S4Vectors", "ggplot2", "gridExtra", "igraph", "stringdist", "stringr"] }, "CTSV": { "name": "CTSV", "version": "1.6.0", "sha256": "1m7a0dqkpiwf234xags4fpg7s41bdhmsdd2ma375w49624wbwkyz", - "depends": ["BiocParallel", "knitr", "pscl", "qvalue", "SpatialExperiment", "SummarizedExperiment"] + "depends": ["BiocParallel", "SpatialExperiment", "SummarizedExperiment", "knitr", "pscl", "qvalue"] }, "CTdata": { "name": "CTdata", @@ -1093,37 +1099,37 @@ "name": "CTexploreR", "version": "1.0.0", "sha256": "0ld0hzd7vynwvks0bjggc3kfgdzb0jlsjxn1ggk68f2gxrqxv8i8", - "depends": ["BiocGenerics", "circlize", "ComplexHeatmap", "CTdata", "dplyr", "GenomicRanges", "ggplot2", "ggrepel", "IRanges", "MatrixGenerics", "rlang", "SingleCellExperiment", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["BiocGenerics", "CTdata", "ComplexHeatmap", "GenomicRanges", "IRanges", "MatrixGenerics", "SingleCellExperiment", "SummarizedExperiment", "circlize", "dplyr", "ggplot2", "ggrepel", "rlang", "tibble", "tidyr"] }, "CaDrA": { "name": "CaDrA", "version": "1.2.0", "sha256": "1m7ggdji6j64b6mz6ak2y8f8xyyi8l1gig5b13ksz7j6fgcbyx71", - "depends": ["doParallel", "ggplot2", "gplots", "gtable", "MASS", "misc3d", "plyr", "ppcor", "R_cache", "reshape2", "SummarizedExperiment"] + "depends": ["MASS", "R_cache", "SummarizedExperiment", "doParallel", "ggplot2", "gplots", "gtable", "misc3d", "plyr", "ppcor", "reshape2"] }, "CaMutQC": { "name": "CaMutQC", "version": "1.0.0", "sha256": "1rri2730mpmz0nqb26kqfq950sgw0x97j8xk9vw09m7g89973zzs", - "depends": ["clusterProfiler", "data_table", "dplyr", "DT", "ggplot2", "maftools", "MesKit", "org_Hs_eg_db", "stringr", "tidyr", "vcfR"] + "depends": ["DT", "MesKit", "clusterProfiler", "data_table", "dplyr", "ggplot2", "maftools", "org_Hs_eg_db", "stringr", "tidyr", "vcfR"] }, "Cardinal": { "name": "Cardinal", - "version": "3.6.2", - "sha256": "038dlgr4p1x42hb5xrz8apvdi4d18si2vr3r8g3i4aiyvpc2rfwj", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "CardinalIO", "EBImage", "irlba", "Matrix", "matter", "nlme", "ProtGenerics", "S4Vectors"] + "version": "3.6.5", + "sha256": "08ka7llgnjprfxnwj6fdydsr6azxj66mgkyjx0g9hbdcqn5ph6av", + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "CardinalIO", "EBImage", "Matrix", "ProtGenerics", "S4Vectors", "irlba", "matter", "nlme"] }, "CardinalIO": { "name": "CardinalIO", "version": "1.2.1", "sha256": "1kzqz2zba8i5z1pkwwi0hzb6fm7xh22bymkk1jwicyrk94fzfw1l", - "depends": ["matter", "ontologyIndex", "S4Vectors"] + "depends": ["S4Vectors", "matter", "ontologyIndex"] }, "Category": { "name": "Category", "version": "2.70.0", "sha256": "0paz6h8rsbqvlxxj4di8cl76aybgjr842z5gdv8xi6c2d7zwbclw", - "depends": ["annotate", "AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "genefilter", "graph", "GSEABase", "Matrix", "RBGL"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "GSEABase", "Matrix", "RBGL", "annotate", "genefilter", "graph"] }, "CausalR": { "name": "CausalR", @@ -1135,19 +1141,19 @@ "name": "CeTF", "version": "1.16.0", "sha256": "0vpy0ns19wnq9pqhkc1dlx2b0y9rjxznq61z242p53gvh05zmzxi", - "depends": ["circlize", "clusterProfiler", "ComplexHeatmap", "DESeq2", "dplyr", "GenomicTools_fileHandler", "GGally", "ggnetwork", "ggplot2", "ggpubr", "ggrepel", "igraph", "Matrix", "network", "Rcpp", "RcppArmadillo", "RCy3", "S4Vectors", "SummarizedExperiment"] + "depends": ["ComplexHeatmap", "DESeq2", "GGally", "GenomicTools_fileHandler", "Matrix", "RCy3", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment", "circlize", "clusterProfiler", "dplyr", "ggnetwork", "ggplot2", "ggpubr", "ggrepel", "igraph", "network"] }, "CellBarcode": { "name": "CellBarcode", "version": "1.10.0", "sha256": "006mlhzw5pwdr335q27f05jwwwra8fs563qph7ghlr8s7ws55q9g", - "depends": ["BH", "Biostrings", "Ckmeans_1d_dp", "data_table", "egg", "ggplot2", "magrittr", "plyr", "Rcpp", "Rsamtools", "S4Vectors", "seqinr", "ShortRead", "stringr", "zlibbioc"] + "depends": ["BH", "Biostrings", "Ckmeans_1d_dp", "Rcpp", "Rsamtools", "S4Vectors", "ShortRead", "data_table", "egg", "ggplot2", "magrittr", "plyr", "seqinr", "stringr", "zlibbioc"] }, "CellBench": { "name": "CellBench", "version": "1.20.0", "sha256": "0azswhd2r9yf2qlz31105kk911iaxfxd2b4drvdq2f57asqw6mwm", - "depends": ["assertthat", "BiocFileCache", "BiocGenerics", "BiocParallel", "dplyr", "glue", "lubridate", "magrittr", "memoise", "purrr", "rappdirs", "rlang", "SingleCellExperiment", "tibble", "tidyr", "tidyselect"] + "depends": ["BiocFileCache", "BiocGenerics", "BiocParallel", "SingleCellExperiment", "assertthat", "dplyr", "glue", "lubridate", "magrittr", "memoise", "purrr", "rappdirs", "rlang", "tibble", "tidyr", "tidyselect"] }, "CellMapper": { "name": "CellMapper", @@ -1159,91 +1165,97 @@ "name": "CellMixS", "version": "1.20.0", "sha256": "16l2kw8rbnhn4qyz6sg1pnjfc6cjc12lsx5qzyysnpbpmgm7yqrv", - "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "cowplot", "dplyr", "ggplot2", "ggridges", "kSamples", "magrittr", "purrr", "scater", "SingleCellExperiment", "SummarizedExperiment", "tidyr", "viridis"] + "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "SingleCellExperiment", "SummarizedExperiment", "cowplot", "dplyr", "ggplot2", "ggridges", "kSamples", "magrittr", "purrr", "scater", "tidyr", "viridis"] }, "CellNOptR": { "name": "CellNOptR", "version": "1.50.0", "sha256": "0b6q0xrhyqnpzwkwsdywv008axhikmagpx11z85vik1mml12nhs7", - "depends": ["ggplot2", "graph", "igraph", "RBGL", "RCurl", "Rgraphviz", "rmarkdown", "stringi", "stringr", "XML"] + "depends": ["RBGL", "RCurl", "Rgraphviz", "XML", "ggplot2", "graph", "igraph", "rmarkdown", "stringi", "stringr"] }, "CellScore": { "name": "CellScore", "version": "1.24.0", "sha256": "17aspmnfs4asixn6cc12k0q4an70642cgx0wy650aqhhkqjlyq88", - "depends": ["Biobase", "gplots", "lsa", "RColorBrewer", "squash", "SummarizedExperiment"] + "depends": ["Biobase", "RColorBrewer", "SummarizedExperiment", "gplots", "lsa", "squash"] }, "CellTrails": { "name": "CellTrails", "version": "1.22.0", "sha256": "0pqazyf5da9zw95gpmhlj9mbhvv78c0rl6cncy3pij293xcy02l4", - "depends": ["Biobase", "BiocGenerics", "cba", "dendextend", "dtw", "EnvStats", "ggplot2", "ggrepel", "igraph", "maptree", "mgcv", "reshape2", "Rtsne", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "EnvStats", "Rtsne", "SingleCellExperiment", "SummarizedExperiment", "cba", "dendextend", "dtw", "ggplot2", "ggrepel", "igraph", "maptree", "mgcv", "reshape2"] }, "CelliD": { "name": "CelliD", "version": "1.12.0", "sha256": "0c7hls5qasjd5ahrqxp2mpd402jc12pi0pgy7spcbp1fkqm8qvbl", - "depends": ["BiocParallel", "data_table", "fastmatch", "fgsea", "ggplot2", "glue", "irlba", "Matrix", "matrixStats", "pbapply", "Rcpp", "RcppArmadillo", "reticulate", "Rtsne", "scater", "Seurat", "SingleCellExperiment", "stringr", "SummarizedExperiment", "tictoc", "umap"] + "depends": ["BiocParallel", "Matrix", "Rcpp", "RcppArmadillo", "Rtsne", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "data_table", "fastmatch", "fgsea", "ggplot2", "glue", "irlba", "matrixStats", "pbapply", "reticulate", "scater", "stringr", "tictoc", "umap"] + }, + "Cepo": { + "name": "Cepo", + "version": "1.10.2", + "sha256": "1vqfb797q3pd69ana2m7vbd89jzqkbhc3xhfzskj5cxrggd4d2cv", + "depends": ["BiocParallel", "DelayedArray", "DelayedMatrixStats", "GSEABase", "HDF5Array", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "patchwork", "purrr", "reshape2", "rlang"] }, "CexoR": { "name": "CexoR", "version": "1.42.0", "sha256": "09376wzlknf8nlq81rrbbfsbbgd4mi5aagry51nykw5vc0870vdn", - "depends": ["genomation", "GenomeInfoDb", "GenomicRanges", "idr", "IRanges", "RColorBrewer", "Rsamtools", "rtracklayer", "S4Vectors"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "genomation", "idr", "rtracklayer"] }, "ChAMP": { "name": "ChAMP", "version": "2.34.0", "sha256": "06q539yhbmbp7qr71cwjai2vdw5nnhhjdv2ajlqmlyjpg04arc7v", - "depends": ["bumphunter", "ChAMPdata", "combinat", "dendextend", "DMRcate", "DNAcopy", "doParallel", "DT", "GenomicRanges", "ggplot2", "globaltest", "goseq", "Hmisc", "Illumina450ProbeVariants_db", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "IlluminaHumanMethylationEPICmanifest", "illuminaio", "impute", "isva", "kpmt", "limma", "marray", "matrixStats", "minfi", "missMethyl", "plotly", "plyr", "preprocessCore", "prettydoc", "quadprog", "qvalue", "RColorBrewer", "rmarkdown", "RPMM", "shiny", "shinythemes", "sva", "wateRmelon"] + "depends": ["ChAMPdata", "DMRcate", "DNAcopy", "DT", "GenomicRanges", "Hmisc", "Illumina450ProbeVariants_db", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "IlluminaHumanMethylationEPICmanifest", "RColorBrewer", "RPMM", "bumphunter", "combinat", "dendextend", "doParallel", "ggplot2", "globaltest", "goseq", "illuminaio", "impute", "isva", "kpmt", "limma", "marray", "matrixStats", "minfi", "missMethyl", "plotly", "plyr", "preprocessCore", "prettydoc", "quadprog", "qvalue", "rmarkdown", "shiny", "shinythemes", "sva", "wateRmelon"] }, "ChIPComp": { "name": "ChIPComp", "version": "1.34.0", "sha256": "013lmgdkj596gqzm0nlxjqpv0w94hap9vndp5znqpk4inq88gj8m", - "depends": ["BiocGenerics", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Mmusculus_UCSC_mm9", "GenomeInfoDb", "GenomicRanges", "IRanges", "limma", "Rsamtools", "rtracklayer", "S4Vectors"] + "depends": ["BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Mmusculus_UCSC_mm9", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "limma", "rtracklayer"] }, "ChIPQC": { "name": "ChIPQC", "version": "1.40.0", "sha256": "0lnk5lchwjnrr03x2r6lwgrja42n0rhfp5w9sya2y69da47bcks4", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "chipseq", "DiffBind", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "gtools", "IRanges", "Nozzle_R1", "reshape2", "Rsamtools", "S4Vectors", "TxDb_Celegans_UCSC_ce6_ensGene", "TxDb_Dmelanogaster_UCSC_dm3_ensGene", "TxDb_Hsapiens_UCSC_hg18_knownGene", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "TxDb_Mmusculus_UCSC_mm9_knownGene", "TxDb_Rnorvegicus_UCSC_rn4_ensGene"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "DiffBind", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Nozzle_R1", "Rsamtools", "S4Vectors", "TxDb_Celegans_UCSC_ce6_ensGene", "TxDb_Dmelanogaster_UCSC_dm3_ensGene", "TxDb_Hsapiens_UCSC_hg18_knownGene", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "TxDb_Mmusculus_UCSC_mm9_knownGene", "TxDb_Rnorvegicus_UCSC_rn4_ensGene", "chipseq", "ggplot2", "gtools", "reshape2"] }, "ChIPXpress": { "name": "ChIPXpress", "version": "1.48.0", "sha256": "09lkm6s98ip9pw9cwdx8a0z816krr4cgzrcrd7b3d4v4bcywsy7z", - "depends": ["affy", "biganalytics", "bigmemory", "Biobase", "ChIPXpressData", "frma", "GEOquery"] + "depends": ["Biobase", "ChIPXpressData", "GEOquery", "affy", "biganalytics", "bigmemory", "frma"] }, "ChIPanalyser": { "name": "ChIPanalyser", "version": "1.26.0", "sha256": "0jxsy6xd4cr3w5zjjxkziiqpzhg8fld0fh4c3rr34823646ly9ja", - "depends": ["BiocManager", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "RcppRoll", "ROCR", "rtracklayer", "S4Vectors"] + "depends": ["BSgenome", "BiocManager", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "ROCR", "RcppRoll", "S4Vectors", "rtracklayer"] }, "ChIPexoQual": { "name": "ChIPexoQual", "version": "1.28.0", "sha256": "0y39fpbnykqf5ycpi9q3rw73dkn2ksll7n6nafimxvxsh463d8ky", - "depends": ["BiocParallel", "biovizBase", "broom", "data_table", "dplyr", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "hexbin", "IRanges", "RColorBrewer", "rmarkdown", "Rsamtools", "S4Vectors", "scales", "viridis"] + "depends": ["BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "biovizBase", "broom", "data_table", "dplyr", "ggplot2", "hexbin", "rmarkdown", "scales", "viridis"] }, "ChIPpeakAnno": { "name": "ChIPpeakAnno", - "version": "3.38.0", - "sha256": "1g7p53g91xx3x10kad2f190bmg10ryp928m0q5wxz9n8lycb5rgl", - "depends": ["AnnotationDbi", "BiocGenerics", "biomaRt", "Biostrings", "data_table", "DBI", "dplyr", "ensembldb", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "graph", "InteractionSet", "IRanges", "KEGGREST", "matrixStats", "multtest", "pwalign", "RBGL", "regioneR", "Rsamtools", "rtracklayer", "S4Vectors", "scales", "stringr", "SummarizedExperiment", "tibble", "tidyr", "universalmotif", "VennDiagram"] + "version": "3.38.1", + "sha256": "11mswd6y4c8l0adrpc4z8hh96dcx59bf70zy572r5lfsj8rz0rgk", + "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "InteractionSet", "KEGGREST", "RBGL", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VennDiagram", "biomaRt", "data_table", "dplyr", "ensembldb", "ggplot2", "graph", "matrixStats", "multtest", "pwalign", "regioneR", "rtracklayer", "scales", "stringr", "tibble", "tidyr", "universalmotif"] }, "ChIPseeker": { "name": "ChIPseeker", "version": "1.40.0", "sha256": "00iknjk7vgj48vj1pp7l98g7nvc3x495z3jcq5nbvdiff02faj1f", - "depends": ["AnnotationDbi", "aplot", "BiocGenerics", "boot", "dplyr", "enrichplot", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "gplots", "gtools", "IRanges", "magrittr", "plotrix", "rtracklayer", "S4Vectors", "tibble", "TxDb_Hsapiens_UCSC_hg19_knownGene", "yulab_utils"] + "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "aplot", "boot", "dplyr", "enrichplot", "ggplot2", "gplots", "gtools", "magrittr", "plotrix", "rtracklayer", "tibble", "yulab_utils"] }, "ChIPseqR": { "name": "ChIPseqR", "version": "1.58.0", "sha256": "1lgwy6qprrvx1yv04vx567kr5b6mwz46kwafsqldwgqr2by45kgm", - "depends": ["BiocGenerics", "Biostrings", "fBasics", "GenomicRanges", "HilbertVis", "IRanges", "S4Vectors", "ShortRead", "timsac"] + "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "HilbertVis", "IRanges", "S4Vectors", "ShortRead", "fBasics", "timsac"] }, "ChIPsim": { "name": "ChIPsim", @@ -1261,43 +1273,43 @@ "name": "ChemmineR", "version": "3.56.0", "sha256": "1252xy33bgjrd4gh4shrgzklgxry2lf67svzxjra5yckf8am0rdc", - "depends": ["base64enc", "BH", "BiocGenerics", "DBI", "digest", "DT", "ggplot2", "gridExtra", "jsonlite", "png", "Rcpp", "RCurl", "rjson", "rsvg", "stringi"] + "depends": ["BH", "BiocGenerics", "DBI", "DT", "RCurl", "Rcpp", "base64enc", "digest", "ggplot2", "gridExtra", "jsonlite", "png", "rjson", "rsvg", "stringi"] }, "Chicago": { "name": "Chicago", "version": "1.32.0", "sha256": "05djywxsyfxb26d0clx51q7wmsw3rq56va444d6iy5n7xlhj9m94", - "depends": ["data_table", "Delaporte", "Hmisc", "MASS", "matrixStats"] + "depends": ["Delaporte", "Hmisc", "MASS", "data_table", "matrixStats"] }, "ChromHeatMap": { "name": "ChromHeatMap", "version": "1.58.0", "sha256": "1kzrx26rj7wfki6l5g1426p30fch6b92x0y06rg17i3psbmmkmqg", - "depends": ["annotate", "AnnotationDbi", "Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "rtracklayer"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "annotate", "rtracklayer"] }, "ChromSCape": { "name": "ChromSCape", "version": "1.14.0", "sha256": "12chaigwnqm765p0qlf00s94kkg3dphj2cbqv3vfsyya54hbhfzr", - "depends": ["batchelor", "BiocParallel", "colorRamps", "colourpicker", "ConsensusClusterPlus", "coop", "DelayedArray", "dplyr", "DT", "edgeR", "forcats", "fs", "GenomicRanges", "gggenes", "ggplot2", "ggrepel", "gridExtra", "IRanges", "irlba", "jsonlite", "kableExtra", "Matrix", "matrixTests", "msigdbr", "plotly", "qs", "qualV", "Rcpp", "rlist", "Rsamtools", "rtracklayer", "Rtsne", "S4Vectors", "scater", "scran", "shiny", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyFiles", "shinyhelper", "shinyjs", "shinyWidgets", "SingleCellExperiment", "stringdist", "stringr", "SummarizedExperiment", "tibble", "tidyr", "umap", "viridis"] + "depends": ["BiocParallel", "ConsensusClusterPlus", "DT", "DelayedArray", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "Rsamtools", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "batchelor", "colorRamps", "colourpicker", "coop", "dplyr", "edgeR", "forcats", "fs", "gggenes", "ggplot2", "ggrepel", "gridExtra", "irlba", "jsonlite", "kableExtra", "matrixTests", "msigdbr", "plotly", "qs", "qualV", "rlist", "rtracklayer", "scater", "scran", "shiny", "shinyFiles", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyhelper", "shinyjs", "stringdist", "stringr", "tibble", "tidyr", "umap", "viridis"] }, "CircSeqAlignTk": { "name": "CircSeqAlignTk", "version": "1.6.0", "sha256": "1i9izbf9mzlc7sl2zi5gj4dhxa6mq9kkyysxdq9cj4myhrp9hgwz", - "depends": ["BiocGenerics", "Biostrings", "dplyr", "ggplot2", "htmltools", "IRanges", "magrittr", "plotly", "R_utils", "Rbowtie2", "Rhisat2", "rlang", "Rsamtools", "S4Vectors", "shiny", "shinyFiles", "shinyjs", "ShortRead", "tidyr"] + "depends": ["BiocGenerics", "Biostrings", "IRanges", "R_utils", "Rbowtie2", "Rhisat2", "Rsamtools", "S4Vectors", "ShortRead", "dplyr", "ggplot2", "htmltools", "magrittr", "plotly", "rlang", "shiny", "shinyFiles", "shinyjs", "tidyr"] }, "CiteFuse": { "name": "CiteFuse", "version": "1.16.0", "sha256": "1vxynidr7p0khq54d08vzzh2ijaxx1ghm7pxnpg7zppfxvlmsh35", - "depends": ["compositions", "cowplot", "dbscan", "ggplot2", "ggraph", "ggridges", "gridExtra", "igraph", "Matrix", "mixtools", "pheatmap", "randomForest", "Rcpp", "reshape2", "rhdf5", "rlang", "Rtsne", "S4Vectors", "scales", "scran", "SingleCellExperiment", "SummarizedExperiment", "uwot"] + "depends": ["Matrix", "Rcpp", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "compositions", "cowplot", "dbscan", "ggplot2", "ggraph", "ggridges", "gridExtra", "igraph", "mixtools", "pheatmap", "randomForest", "reshape2", "rhdf5", "rlang", "scales", "scran", "uwot"] }, "ClassifyR": { "name": "ClassifyR", - "version": "3.8.2", - "sha256": "1p78lxcannrfif2029pksc1minzf4jp0p4r79b7rz06p3nq54wav", - "depends": ["BiocParallel", "dplyr", "genefilter", "generics", "ggplot2", "ggpubr", "ggupset", "MultiAssayExperiment", "ranger", "reshape2", "rlang", "S4Vectors", "survival", "tidyr"] + "version": "3.8.3", + "sha256": "1p52jn7zq8kyfksrg74vjy43aw20qc02fw1cbhhb8liqq5bhxak0", + "depends": ["BiocParallel", "MultiAssayExperiment", "S4Vectors", "dplyr", "genefilter", "generics", "ggplot2", "ggpubr", "ggupset", "ranger", "reshape2", "rlang", "survival", "tidyr"] }, "Clomial": { "name": "Clomial", @@ -1309,13 +1321,13 @@ "name": "CluMSID", "version": "1.20.0", "sha256": "02y79fhzx2hzwj8sjafywm7zqqar48b1m156ld60jjvskrv8ywqf", - "depends": ["ape", "Biobase", "dbscan", "GGally", "ggplot2", "gplots", "MSnbase", "mzR", "network", "plotly", "RColorBrewer", "S4Vectors", "sna"] + "depends": ["Biobase", "GGally", "MSnbase", "RColorBrewer", "S4Vectors", "ape", "dbscan", "ggplot2", "gplots", "mzR", "network", "plotly", "sna"] }, "ClustAll": { "name": "ClustAll", "version": "1.0.0", "sha256": "13qg0r6lqvzyggkf8gjyxh8d871f483fcrhgbhr4xwpfpwssv8k8", - "depends": ["bigstatsr", "circlize", "cluster", "clValid", "ComplexHeatmap", "doSNOW", "dplyr", "FactoMineR", "flock", "foreach", "fpc", "ggplot2", "mice", "modeest", "networkD3", "pbapply", "RColorBrewer"] + "depends": ["ComplexHeatmap", "FactoMineR", "RColorBrewer", "bigstatsr", "circlize", "clValid", "cluster", "doSNOW", "dplyr", "flock", "foreach", "fpc", "ggplot2", "mice", "modeest", "networkD3", "pbapply"] }, "ClustIRR": { "name": "ClustIRR", @@ -1327,7 +1339,7 @@ "name": "ClusterFoldSimilarity", "version": "1.0.0", "sha256": "136bh473b8fznxlrszvxr4w0q6y2cxhhm0xd43fka5wq130x3nr9", - "depends": ["BiocParallel", "cowplot", "dplyr", "ggdendro", "ggplot2", "igraph", "Matrix", "reshape2", "scales", "Seurat", "SeuratObject", "SingleCellExperiment"] + "depends": ["BiocParallel", "Matrix", "Seurat", "SeuratObject", "SingleCellExperiment", "cowplot", "dplyr", "ggdendro", "ggplot2", "igraph", "reshape2", "scales"] }, "ClusterJudge": { "name": "ClusterJudge", @@ -1339,7 +1351,7 @@ "name": "ClusterSignificance", "version": "1.32.0", "sha256": "0n12085247f51n8sp7fic7il73h9k25fkc8sj7wr7nmi81j497ah", - "depends": ["pracma", "princurve", "RColorBrewer", "scatterplot3d"] + "depends": ["RColorBrewer", "pracma", "princurve", "scatterplot3d"] }, "CoCiteStats": { "name": "CoCiteStats", @@ -1351,31 +1363,31 @@ "name": "CoGAPS", "version": "3.24.0", "sha256": "1yq625qb5hb0j5jf0r6sxyhwm1zlycv4dkfr3kv2hkapfshirk2b", - "depends": ["BH", "BiocParallel", "cluster", "dplyr", "fgsea", "forcats", "ggplot2", "gplots", "RColorBrewer", "Rcpp", "rhdf5", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BH", "BiocParallel", "RColorBrewer", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cluster", "dplyr", "fgsea", "forcats", "ggplot2", "gplots", "rhdf5"] }, "Cogito": { "name": "Cogito", "version": "1.10.0", "sha256": "1xin0jxc38qzdh6jfq4pkydsxbyf36pl5b4vipgw145nvll537vr", - "depends": ["AnnotationDbi", "BiocManager", "entropy", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "jsonlite", "magrittr", "rmarkdown", "S4Vectors", "TxDb_Mmusculus_UCSC_mm9_knownGene"] + "depends": ["AnnotationDbi", "BiocManager", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "S4Vectors", "TxDb_Mmusculus_UCSC_mm9_knownGene", "entropy", "ggplot2", "jsonlite", "magrittr", "rmarkdown"] }, "ComPrAn": { "name": "ComPrAn", "version": "1.12.0", "sha256": "0nj1h3chqc1pspaj2r5ccxswdfz8zmwaqa1v3nmav54z5l5s70iv", - "depends": ["data_table", "dplyr", "DT", "forcats", "ggplot2", "magrittr", "purrr", "RColorBrewer", "rio", "rlang", "scales", "shiny", "shinydashboard", "shinyjs", "stringr", "tibble", "tidyr", "VennDiagram"] + "depends": ["DT", "RColorBrewer", "VennDiagram", "data_table", "dplyr", "forcats", "ggplot2", "magrittr", "purrr", "rio", "rlang", "scales", "shiny", "shinydashboard", "shinyjs", "stringr", "tibble", "tidyr"] }, "ComplexHeatmap": { "name": "ComplexHeatmap", "version": "2.20.0", "sha256": "1ppzx850nvvdhz2xiggr43c79w0nr0vmsmmnszasd4flf3jm7v8v", - "depends": ["circlize", "clue", "codetools", "colorspace", "digest", "doParallel", "foreach", "GetoptLong", "GlobalOptions", "IRanges", "matrixStats", "png", "RColorBrewer"] + "depends": ["GetoptLong", "GlobalOptions", "IRanges", "RColorBrewer", "circlize", "clue", "codetools", "colorspace", "digest", "doParallel", "foreach", "matrixStats", "png"] }, "CompoundDb": { "name": "CompoundDb", "version": "1.8.0", "sha256": "10rg8419ng2zmgn7ydlywxsfqdz8m15rs5wmsicfngagd2nwp5mf", - "depends": ["AnnotationFilter", "Biobase", "BiocGenerics", "BiocParallel", "ChemmineR", "DBI", "dbplyr", "dplyr", "IRanges", "jsonlite", "MetaboCoreUtils", "MsCoreUtils", "ProtGenerics", "RSQLite", "S4Vectors", "Spectra", "tibble", "xml2"] + "depends": ["AnnotationFilter", "Biobase", "BiocGenerics", "BiocParallel", "ChemmineR", "DBI", "IRanges", "MetaboCoreUtils", "MsCoreUtils", "ProtGenerics", "RSQLite", "S4Vectors", "Spectra", "dbplyr", "dplyr", "jsonlite", "tibble", "xml2"] }, "ConsensusClusterPlus": { "name": "ConsensusClusterPlus", @@ -1387,13 +1399,13 @@ "name": "CopyNumberPlots", "version": "1.20.0", "sha256": "1b3yschvrwsaj5szrnwbwrxswfxvalfs495q26g1r7w6l26qjv5b", - "depends": ["cn_mops", "GenomeInfoDb", "GenomicRanges", "IRanges", "karyoploteR", "regioneR", "rhdf5", "Rsamtools", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "SummarizedExperiment", "VariantAnnotation", "cn_mops", "karyoploteR", "regioneR", "rhdf5"] }, "CoreGx": { "name": "CoreGx", "version": "2.8.0", "sha256": "05fyncpqiq08a169rjwyc117wkyckh714z0is2r0g79920i36jas", - "depends": ["bench", "Biobase", "BiocGenerics", "BiocParallel", "BumpyMatrix", "checkmate", "crayon", "data_table", "glue", "lsa", "MatrixGenerics", "MultiAssayExperiment", "piano", "rlang", "S4Vectors", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "BumpyMatrix", "MatrixGenerics", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "bench", "checkmate", "crayon", "data_table", "glue", "lsa", "piano", "rlang"] }, "Cormotif": { "name": "Cormotif", @@ -1405,25 +1417,25 @@ "name": "CoverageView", "version": "1.42.0", "sha256": "1wgkn2adcxl6js3cvawhvzpxm3nmnnc16wbnzkrnsnd9l12aasih", - "depends": ["GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "rtracklayer", "S4Vectors"] + "depends": ["GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "rtracklayer"] }, "CrispRVariants": { "name": "CrispRVariants", "version": "1.32.0", "sha256": "1nlmznpypfabzrn430hs4k3b8zbw6n1brfy1x2j00bnq3sdd7zgc", - "depends": ["AnnotationDbi", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "gridExtra", "IRanges", "reshape2", "Rsamtools", "S4Vectors"] + "depends": ["AnnotationDbi", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ggplot2", "gridExtra", "reshape2"] }, "CuratedAtlasQueryR": { "name": "CuratedAtlasQueryR", "version": "1.2.0", "sha256": "0b0p4q4nsn1bxxyz61gh9r9bqkwkmjybqrv1ij565kbjnwimbcxj", - "depends": ["assertthat", "BiocGenerics", "cli", "DBI", "dbplyr", "dplyr", "duckdb", "glue", "HDF5Array", "httr", "purrr", "rlang", "S4Vectors", "Seurat", "SeuratObject", "SingleCellExperiment", "stringr", "SummarizedExperiment", "tibble"] + "depends": ["BiocGenerics", "DBI", "HDF5Array", "S4Vectors", "Seurat", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "assertthat", "cli", "dbplyr", "dplyr", "duckdb", "glue", "httr", "purrr", "rlang", "stringr", "tibble"] }, "CyTOFpower": { "name": "CyTOFpower", "version": "1.10.0", "sha256": "158ixl91yfhzik2d22xijarllirbxg33783i5pxixcdz3amp1z56", - "depends": ["CytoGLMM", "diffcyt", "dplyr", "DT", "ggplot2", "magrittr", "rlang", "shiny", "shinyFeedback", "shinyjs", "shinyMatrix", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["CytoGLMM", "DT", "SummarizedExperiment", "diffcyt", "dplyr", "ggplot2", "magrittr", "rlang", "shiny", "shinyFeedback", "shinyMatrix", "shinyjs", "tibble", "tidyr"] }, "CytoDx": { "name": "CytoDx", @@ -1435,7 +1447,7 @@ "name": "CytoGLMM", "version": "1.12.0", "sha256": "1dfrp97mx93fdx4mrd4p8w2v37hq9h5b829l75vxxpmx2xqv4c7a", - "depends": ["BiocParallel", "caret", "cowplot", "doParallel", "dplyr", "factoextra", "flexmix", "ggplot2", "ggrepel", "logging", "magrittr", "MASS", "Matrix", "mbest", "pheatmap", "RColorBrewer", "rlang", "stringr", "strucchange", "tibble", "tidyr"] + "depends": ["BiocParallel", "MASS", "Matrix", "RColorBrewer", "caret", "cowplot", "doParallel", "dplyr", "factoextra", "flexmix", "ggplot2", "ggrepel", "logging", "magrittr", "mbest", "pheatmap", "rlang", "stringr", "strucchange", "tibble", "tidyr"] }, "CytoMDS": { "name": "CytoMDS", @@ -1447,13 +1459,13 @@ "name": "CytoML", "version": "2.16.0", "sha256": "11kflx3yahl7xjl6x2rgpd4hl5y69qgarzhalmz4qdci7b7ln7kr", - "depends": ["BH", "Biobase", "cpp11", "cytolib", "data_table", "dplyr", "flowCore", "flowWorkspace", "ggcyto", "graph", "jsonlite", "openCyto", "RBGL", "Rgraphviz", "Rhdf5lib", "RProtoBufLib", "tibble", "XML", "yaml"] + "depends": ["BH", "Biobase", "RBGL", "RProtoBufLib", "Rgraphviz", "Rhdf5lib", "XML", "cpp11", "cytolib", "data_table", "dplyr", "flowCore", "flowWorkspace", "ggcyto", "graph", "jsonlite", "openCyto", "tibble", "yaml"] }, "CytoPipeline": { "name": "CytoPipeline", "version": "1.4.0", "sha256": "1c8w2v8990z8kp7wxc69ildhj0v5g3zx05dzyhb16nrlnb7bfcc4", - "depends": ["BiocFileCache", "BiocParallel", "diagram", "flowAI", "flowCore", "ggcyto", "ggplot2", "jsonlite", "PeacoQC", "rlang", "scales", "withr"] + "depends": ["BiocFileCache", "BiocParallel", "PeacoQC", "diagram", "flowAI", "flowCore", "ggcyto", "ggplot2", "jsonlite", "rlang", "scales", "withr"] }, "CytoPipelineGUI": { "name": "CytoPipelineGUI", @@ -1465,13 +1477,13 @@ "name": "DAMEfinder", "version": "1.16.0", "sha256": "1ffqa7a3a0f3m58j6al2hd7aa8bamv4z170y4yn1vr1f8jrb7kq5", - "depends": ["BiocGenerics", "Biostrings", "bumphunter", "cowplot", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "IRanges", "limma", "plyr", "readr", "reshape2", "Rsamtools", "S4Vectors", "stringr", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "bumphunter", "cowplot", "ggplot2", "limma", "plyr", "readr", "reshape2", "stringr"] }, "DAPAR": { "name": "DAPAR", "version": "1.36.2", "sha256": "1800c6g39gg9q43v1s5r13qm4aj53x18qzbbyz75fpwrril967gr", - "depends": ["Biobase", "DAPARdata", "foreach", "highcharter", "MSnbase"] + "depends": ["Biobase", "DAPARdata", "MSnbase", "foreach", "highcharter"] }, "DART": { "name": "DART", @@ -1483,7 +1495,7 @@ "name": "DCATS", "version": "1.2.0", "sha256": "1hf275h40d5ggya58malxbrmzqi5gi04w847gc567qzpzs1bqfp2", - "depends": ["aod", "e1071", "matrixStats", "MCMCpack", "robustbase"] + "depends": ["MCMCpack", "aod", "e1071", "matrixStats", "robustbase"] }, "DECIPHER": { "name": "DECIPHER", @@ -1495,19 +1507,19 @@ "name": "DEFormats", "version": "1.32.0", "sha256": "0sxflb9b148gkylxpfmmk9pmh3gblc4wp6594n0w4a711xrv1jr9", - "depends": ["checkmate", "data_table", "DESeq2", "edgeR", "GenomicRanges", "S4Vectors", "SummarizedExperiment"] + "depends": ["DESeq2", "GenomicRanges", "S4Vectors", "SummarizedExperiment", "checkmate", "data_table", "edgeR"] }, "DEGraph": { "name": "DEGraph", "version": "1.56.0", "sha256": "0pxh6kyi4blz039yw7vzi9dj4jpzsbv0p2fw44fz2q2pzr98g2m9", - "depends": ["graph", "KEGGgraph", "lattice", "mvtnorm", "NCIgraph", "R_methodsS3", "R_utils", "RBGL", "Rgraphviz", "rrcov"] + "depends": ["KEGGgraph", "NCIgraph", "RBGL", "R_methodsS3", "R_utils", "Rgraphviz", "graph", "lattice", "mvtnorm", "rrcov"] }, "DEGreport": { "name": "DEGreport", - "version": "1.40.0", - "sha256": "087c7x3vz8z3yz4jdwbcskdqmv3kgz4c4vi3r9gvvay5z36yhpl5", - "depends": ["Biobase", "BiocGenerics", "broom", "circlize", "cluster", "ComplexHeatmap", "ConsensusClusterPlus", "cowplot", "dendextend", "DESeq2", "dplyr", "edgeR", "ggdendro", "ggplot2", "ggrepel", "knitr", "logging", "magrittr", "psych", "RColorBrewer", "reshape", "rlang", "S4Vectors", "scales", "stringi", "stringr", "SummarizedExperiment", "tibble", "tidyr"] + "version": "1.40.1", + "sha256": "0z5wzdixw6pyfd72drh54aalmp9nd5p1xi5vn53d58w78hrb757p", + "depends": ["Biobase", "BiocGenerics", "ComplexHeatmap", "ConsensusClusterPlus", "DESeq2", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "broom", "circlize", "cluster", "cowplot", "dendextend", "dplyr", "edgeR", "ggdendro", "ggplot2", "ggrepel", "knitr", "logging", "magrittr", "psych", "reshape", "rlang", "scales", "stringi", "stringr", "tibble", "tidyr"] }, "DEGseq": { "name": "DEGseq", @@ -1519,43 +1531,43 @@ "name": "DELocal", "version": "1.4.0", "sha256": "0xxlf90h1zi97k5rsbv41l88yq7qgfmd1rrmyipfjzhbl3l2spaf", - "depends": ["DESeq2", "dplyr", "ggplot2", "limma", "matrixStats", "reshape2", "SummarizedExperiment"] + "depends": ["DESeq2", "SummarizedExperiment", "dplyr", "ggplot2", "limma", "matrixStats", "reshape2"] }, "DEP": { "name": "DEP", "version": "1.26.0", "sha256": "1z8ymvghbbr9igcdzqwaz62r8lk07c2b1gnjbk504cxrhyy301jx", - "depends": ["assertthat", "circlize", "cluster", "ComplexHeatmap", "dplyr", "DT", "fdrtool", "ggplot2", "ggrepel", "gridExtra", "imputeLCMD", "limma", "MSnbase", "purrr", "RColorBrewer", "readr", "rmarkdown", "shiny", "shinydashboard", "SummarizedExperiment", "tibble", "tidyr", "vsn"] + "depends": ["ComplexHeatmap", "DT", "MSnbase", "RColorBrewer", "SummarizedExperiment", "assertthat", "circlize", "cluster", "dplyr", "fdrtool", "ggplot2", "ggrepel", "gridExtra", "imputeLCMD", "limma", "purrr", "readr", "rmarkdown", "shiny", "shinydashboard", "tibble", "tidyr", "vsn"] }, "DEScan2": { "name": "DEScan2", "version": "1.24.0", "sha256": "15ncl95mf7mxazic0ig15isnblyj59dcr2xjv05dcwxc11wz1fr0", - "depends": ["BiocGenerics", "BiocParallel", "ChIPpeakAnno", "data_table", "DelayedArray", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "glue", "IRanges", "plyr", "Rcpp", "RcppArmadillo", "rtracklayer", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocParallel", "ChIPpeakAnno", "DelayedArray", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment", "data_table", "glue", "plyr", "rtracklayer"] }, "DESeq2": { "name": "DESeq2", "version": "1.44.0", "sha256": "1j7ivkxbc75hzxhl9d97w8vamrmxf6527n7841i1j9n6s7hz1cdn", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "GenomicRanges", "ggplot2", "IRanges", "locfit", "MatrixGenerics", "matrixStats", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "GenomicRanges", "IRanges", "MatrixGenerics", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment", "ggplot2", "locfit", "matrixStats"] }, "DESpace": { "name": "DESpace", "version": "1.4.0", "sha256": "0lx3igbclpxx6jjvsagwjdakg9iy325xhkw7iixj8m6b8s4dkmkp", - "depends": ["assertthat", "BiocGenerics", "BiocParallel", "cowplot", "data_table", "dplyr", "edgeR", "ggforce", "ggnewscale", "ggplot2", "ggpubr", "limma", "Matrix", "patchwork", "S4Vectors", "scales", "SpatialExperiment", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocParallel", "Matrix", "S4Vectors", "SpatialExperiment", "SummarizedExperiment", "assertthat", "cowplot", "data_table", "dplyr", "edgeR", "ggforce", "ggnewscale", "ggplot2", "ggpubr", "limma", "patchwork", "scales"] }, "DEWSeq": { "name": "DEWSeq", "version": "1.18.0", "sha256": "034p1rxc1w758zpy920sgpcfr0dmhkfqrcximqkary0n0m6n95i0", - "depends": ["BiocGenerics", "BiocParallel", "data_table", "DESeq2", "GenomeInfoDb", "GenomicRanges", "R_utils", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocParallel", "DESeq2", "GenomeInfoDb", "GenomicRanges", "R_utils", "S4Vectors", "SummarizedExperiment", "data_table"] }, "DEXSeq": { "name": "DEXSeq", "version": "1.50.0", "sha256": "13y3fhgvf7438yjv6qm28n8f42w4wgkklc0q229ypns1gfh54524", - "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "biomaRt", "DESeq2", "genefilter", "geneplotter", "GenomicRanges", "hwriter", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "statmod", "stringr", "SummarizedExperiment"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "DESeq2", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "biomaRt", "genefilter", "geneplotter", "hwriter", "statmod", "stringr"] }, "DEqMS": { "name": "DEqMS", @@ -1567,19 +1579,19 @@ "name": "DEsingle", "version": "1.24.0", "sha256": "06bnvyivj4bx5l2zvwjj4za2hpshsifsa83lsi9fpgdwhn3526kd", - "depends": ["bbmle", "BiocParallel", "gamlss", "MASS", "Matrix", "maxLik", "pscl", "VGAM"] + "depends": ["BiocParallel", "MASS", "Matrix", "VGAM", "bbmle", "gamlss", "maxLik", "pscl"] }, "DEsubs": { "name": "DEsubs", "version": "1.30.0", "sha256": "0p3vkm6116zl157nivwnm68svwm9h9cp9cplz9hncfywcii9a579", - "depends": ["circlize", "DESeq2", "EBSeq", "edgeR", "ggplot2", "graph", "igraph", "jsonlite", "limma", "locfit", "Matrix", "NBPSeq", "pheatmap", "RBGL"] + "depends": ["DESeq2", "EBSeq", "Matrix", "NBPSeq", "RBGL", "circlize", "edgeR", "ggplot2", "graph", "igraph", "jsonlite", "limma", "locfit", "pheatmap"] }, "DExMA": { "name": "DExMA", "version": "1.12.0", "sha256": "1mm45hvb3l1xvikgy25jxg9ppl71ha2sn4vh9qpf7wfr770hif3r", - "depends": ["Biobase", "bnstruct", "DExMAdata", "GEOquery", "impute", "limma", "pheatmap", "plyr", "RColorBrewer", "scales", "snpStats", "sva", "swamp"] + "depends": ["Biobase", "DExMAdata", "GEOquery", "RColorBrewer", "bnstruct", "impute", "limma", "pheatmap", "plyr", "scales", "snpStats", "sva", "swamp"] }, "DFP": { "name": "DFP", @@ -1591,37 +1603,37 @@ "name": "DIAlignR", "version": "2.12.0", "sha256": "19zgjnd9sjxx09pcf50fl3w4fmd1gj8g765x114l0cqcpk9qfmm5", - "depends": ["ape", "bit64", "data_table", "DBI", "dplyr", "ggplot2", "magrittr", "mzR", "phangorn", "pracma", "Rcpp", "RcppEigen", "reticulate", "rlang", "RMSNumpress", "RSQLite", "signal", "tidyr", "zoo"] + "depends": ["DBI", "RMSNumpress", "RSQLite", "Rcpp", "RcppEigen", "ape", "bit64", "data_table", "dplyr", "ggplot2", "magrittr", "mzR", "phangorn", "pracma", "reticulate", "rlang", "signal", "tidyr", "zoo"] }, "DMCFB": { "name": "DMCFB", "version": "1.18.0", "sha256": "0hpf7qkjy7hms4bpqb6y15gwkfah6p69icwab2vwsgmz8w94c44a", - "depends": ["arm", "benchmarkme", "BiocParallel", "data_table", "fastDummies", "GenomicRanges", "IRanges", "MASS", "matrixStats", "rtracklayer", "S4Vectors", "speedglm", "SummarizedExperiment", "tibble"] + "depends": ["BiocParallel", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "SummarizedExperiment", "arm", "benchmarkme", "data_table", "fastDummies", "matrixStats", "rtracklayer", "speedglm", "tibble"] }, "DMCHMM": { "name": "DMCHMM", "version": "1.26.0", "sha256": "0rv1v08nf7vbxci28j68sjxq77lj0swis26ryxp156alr397jfby", - "depends": ["BiocParallel", "calibrate", "fdrtool", "GenomicRanges", "IRanges", "multcomp", "rtracklayer", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocParallel", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "calibrate", "fdrtool", "multcomp", "rtracklayer"] }, "DMRScan": { "name": "DMRScan", "version": "1.26.0", "sha256": "0j68kxzmn3kskqy88j1dqznigiw1rb3b14hwnvcmyckmyhiysx73", - "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "MASS", "Matrix", "mvtnorm", "RcppRoll"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "MASS", "Matrix", "RcppRoll", "mvtnorm"] }, "DMRcaller": { "name": "DMRcaller", "version": "1.36.0", "sha256": "0r9xm77y6xs4mginwfshnpvn2l8phpag35a8mcasj63aqs05js2h", - "depends": ["betareg", "GenomicRanges", "IRanges", "Rcpp", "RcppRoll", "S4Vectors"] + "depends": ["GenomicRanges", "IRanges", "Rcpp", "RcppRoll", "S4Vectors", "betareg"] }, "DMRcate": { "name": "DMRcate", - "version": "3.0.1", - "sha256": "091bj5dkcqci032x01cnzryjjy5cw6l4cci9mlll0bm2g4l4k7p5", - "depends": ["AnnotationHub", "biomaRt", "bsseq", "edgeR", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "limma", "minfi", "missMethyl", "plyr", "S4Vectors", "SummarizedExperiment"] + "version": "3.0.5", + "sha256": "1m5ilcpknzxd3cdk0kyvqqsahshlwxi7xpscigr4w7a83p775vqc", + "depends": ["AnnotationHub", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "S4Vectors", "SummarizedExperiment", "biomaRt", "bsseq", "edgeR", "limma", "minfi", "missMethyl", "plyr"] }, "DNABarcodeCompatibility": { "name": "DNABarcodeCompatibility", @@ -1645,25 +1657,25 @@ "name": "DNAfusion", "version": "1.6.0", "sha256": "1rdm6x8dzk02ggx33bx9mgcq1p36ryysyxha333j05aysn2az2x0", - "depends": ["bamsignals", "BiocBaseUtils", "BiocGenerics", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "TxDb_Hsapiens_UCSC_hg38_knownGene"] + "depends": ["BiocBaseUtils", "BiocGenerics", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "TxDb_Hsapiens_UCSC_hg38_knownGene", "bamsignals"] }, "DNAshapeR": { "name": "DNAshapeR", "version": "1.32.0", "sha256": "0s5z3bh5dlym810rkb9i3bfxfap91qh7hj070i1nqnf4g2vamx9g", - "depends": ["Biostrings", "fields", "GenomicRanges", "Rcpp"] + "depends": ["Biostrings", "GenomicRanges", "Rcpp", "fields"] }, "DOSE": { "name": "DOSE", - "version": "3.30.1", - "sha256": "1kyrr1xxcif45ynyq4wsv2247bjily5sgzn17m1g3ypw2hkqcj53", - "depends": ["AnnotationDbi", "BiocParallel", "fgsea", "ggplot2", "GOSemSim", "HDO_db", "qvalue", "reshape2", "yulab_utils"] + "version": "3.30.2", + "sha256": "1jf6l0ngmdz1lca2rcjg3rhi9qdrv1pzmn93wa09svi4glsfhy1h", + "depends": ["AnnotationDbi", "BiocParallel", "GOSemSim", "HDO_db", "fgsea", "ggplot2", "qvalue", "reshape2", "yulab_utils"] }, "DRIMSeq": { "name": "DRIMSeq", "version": "1.32.0", "sha256": "10skx3n3r9vp1p1499ddccgabi7q3cy1dpi5pbp4ap0gff5ika5x", - "depends": ["BiocGenerics", "BiocParallel", "edgeR", "GenomicRanges", "ggplot2", "IRanges", "limma", "MASS", "reshape2", "S4Vectors"] + "depends": ["BiocGenerics", "BiocParallel", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "edgeR", "ggplot2", "limma", "reshape2"] }, "DSS": { "name": "DSS", @@ -1681,13 +1693,13 @@ "name": "DaMiRseq", "version": "2.16.0", "sha256": "029idkjbha250f8wgwy6sjnjvlxqs0lkwal066693mc2h40rql11", - "depends": ["arm", "caret", "corrplot", "DESeq2", "e1071", "EDASeq", "edgeR", "FactoMineR", "FSelector", "ggplot2", "Hmisc", "ineq", "kknn", "limma", "lubridate", "MASS", "pheatmap", "pls", "plsVarSel", "plyr", "randomForest", "RColorBrewer", "reshape2", "RSNNS", "SummarizedExperiment", "sva"] + "depends": ["DESeq2", "EDASeq", "FSelector", "FactoMineR", "Hmisc", "MASS", "RColorBrewer", "RSNNS", "SummarizedExperiment", "arm", "caret", "corrplot", "e1071", "edgeR", "ggplot2", "ineq", "kknn", "limma", "lubridate", "pheatmap", "pls", "plsVarSel", "plyr", "randomForest", "reshape2", "sva"] }, "Damsel": { "name": "Damsel", "version": "1.0.0", "sha256": "0n60wkrwk1npg1361x5plam6rabmqzlxdcij1qf5q351wfkqlp8y", - "depends": ["AnnotationDbi", "Biostrings", "dplyr", "edgeR", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggbio", "ggplot2", "goseq", "magrittr", "patchwork", "plyranges", "reshape2", "rlang", "Rsamtools", "Rsubread", "stringr", "tidyr"] + "depends": ["AnnotationDbi", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Rsamtools", "Rsubread", "dplyr", "edgeR", "ggbio", "ggplot2", "goseq", "magrittr", "patchwork", "plyranges", "reshape2", "rlang", "stringr", "tidyr"] }, "DeMAND": { "name": "DeMAND", @@ -1699,13 +1711,13 @@ "name": "DeMixT", "version": "1.20.0", "sha256": "1hnaaidmflyh768pc1ivlq8rfjh5vrwycc0r6k1cyiinm53vknns", - "depends": ["base64enc", "dendextend", "DSS", "ggplot2", "KernSmooth", "knitr", "matrixcalc", "matrixStats", "psych", "Rcpp", "rmarkdown", "SummarizedExperiment", "sva", "truncdist"] + "depends": ["DSS", "KernSmooth", "Rcpp", "SummarizedExperiment", "base64enc", "dendextend", "ggplot2", "knitr", "matrixStats", "matrixcalc", "psych", "rmarkdown", "sva", "truncdist"] }, "DeProViR": { "name": "DeProViR", "version": "1.0.0", "sha256": "0m1nhzq5kl6jyi3d8fzb77iplzc4p85v7lj5q7i7125kjv6bycsm", - "depends": ["BiocFileCache", "caret", "data_table", "dplyr", "fmsb", "ggplot2", "keras", "pROC", "PRROC", "readr"] + "depends": ["BiocFileCache", "PRROC", "caret", "data_table", "dplyr", "fmsb", "ggplot2", "keras", "pROC", "readr"] }, "DeconRNASeq": { "name": "DeconRNASeq", @@ -1717,19 +1729,19 @@ "name": "DeepPINCS", "version": "1.12.0", "sha256": "148klzaqa01yns02x38vnd3gn46ayi7p0z2f2s7m95ralby95qm0", - "depends": ["CatEncoders", "keras", "matlab", "PRROC", "purrr", "rcdk", "reticulate", "stringdist", "tensorflow", "tokenizers", "ttgsea", "webchem"] + "depends": ["CatEncoders", "PRROC", "keras", "matlab", "purrr", "rcdk", "reticulate", "stringdist", "tensorflow", "tokenizers", "ttgsea", "webchem"] }, "DegCre": { "name": "DegCre", "version": "1.0.0", "sha256": "1wv2h8x45qsj8p4awwb22z1ilymmkrgmrhsl2y7l7dx13qh5l3dr", - "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "InteractionSet", "IRanges", "plotgardener", "S4Vectors"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "S4Vectors", "plotgardener"] }, "DegNorm": { "name": "DegNorm", "version": "1.14.0", "sha256": "15bh4x6rnqil3gcwialcpnqq5inznmjhzf0f4r54xylril0ad268", - "depends": ["data_table", "doParallel", "foreach", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "heatmaply", "IRanges", "plotly", "plyr", "Rcpp", "RcppArmadillo", "Rsamtools", "S4Vectors", "txdbmaker", "viridis"] + "depends": ["GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rcpp", "RcppArmadillo", "Rsamtools", "S4Vectors", "data_table", "doParallel", "foreach", "ggplot2", "heatmaply", "plotly", "plyr", "txdbmaker", "viridis"] }, "DelayedArray": { "name": "DelayedArray", @@ -1753,13 +1765,13 @@ "name": "DelayedRandomArray", "version": "1.12.0", "sha256": "0lzx0p9hq4vd6w1rvlqd98b3rvfs1zzgvqm21s99vlmdc3db5pqn", - "depends": ["BH", "DelayedArray", "dqrng", "Rcpp"] + "depends": ["BH", "DelayedArray", "Rcpp", "dqrng"] }, "DelayedTensor": { "name": "DelayedTensor", "version": "1.10.0", "sha256": "1f8qpi3xfhgng7zjm7zdxmd32ynri2mavxs6ffqg1izclrzqsb5q", - "depends": ["BiocSingular", "DelayedArray", "DelayedRandomArray", "einsum", "HDF5Array", "irlba", "Matrix", "rTensor"] + "depends": ["BiocSingular", "DelayedArray", "DelayedRandomArray", "HDF5Array", "Matrix", "einsum", "irlba", "rTensor"] }, "DepInfeR": { "name": "DepInfeR", @@ -1771,13 +1783,13 @@ "name": "DepecheR", "version": "1.20.0", "sha256": "15lpn1p2p28lhmzi7svszr0p1zkyaivi69q8pxcrv4lvips38hk4", - "depends": ["beanplot", "ClusterR", "collapse", "doSNOW", "dplyr", "FNN", "foreach", "ggplot2", "gmodels", "gplots", "MASS", "matrixStats", "mixOmics", "moments", "Rcpp", "RcppEigen", "reshape2", "robustbase", "viridis"] + "depends": ["ClusterR", "FNN", "MASS", "Rcpp", "RcppEigen", "beanplot", "collapse", "doSNOW", "dplyr", "foreach", "ggplot2", "gmodels", "gplots", "matrixStats", "mixOmics", "moments", "reshape2", "robustbase", "viridis"] }, "DiffBind": { "name": "DiffBind", "version": "3.14.0", "sha256": "1sr0zy5pbjmjzkwkpjmr26k4dcf3f3kxsl7z2nqw0p0a14rh57pm", - "depends": ["amap", "apeglm", "ashr", "BiocParallel", "DESeq2", "dplyr", "GenomicAlignments", "GenomicRanges", "ggplot2", "ggrepel", "gplots", "GreyListChIP", "IRanges", "lattice", "limma", "locfit", "RColorBrewer", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "SummarizedExperiment", "systemPipeR"] + "depends": ["BiocParallel", "DESeq2", "GenomicAlignments", "GenomicRanges", "GreyListChIP", "IRanges", "RColorBrewer", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "SummarizedExperiment", "amap", "apeglm", "ashr", "dplyr", "ggplot2", "ggrepel", "gplots", "lattice", "limma", "locfit", "systemPipeR"] }, "DiffLogo": { "name": "DiffLogo", @@ -1787,15 +1799,15 @@ }, "DifferentialRegulation": { "name": "DifferentialRegulation", - "version": "2.2.0", - "sha256": "105jwyiqz3z12q4vmrsmw5d8j8w0s5prfa0l8z68jj36g8rxbl21", - "depends": ["BANDITS", "data_table", "doParallel", "doRNG", "foreach", "ggplot2", "gridExtra", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "SingleCellExperiment", "SummarizedExperiment", "tximport"] + "version": "2.2.1", + "sha256": "170sfmm11vcgwi4wak6y699cnmbqiw4p8bipb5k7qzqaww99541s", + "depends": ["BANDITS", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "SingleCellExperiment", "SummarizedExperiment", "data_table", "doParallel", "doRNG", "foreach", "ggplot2", "gridExtra", "tximport"] }, "Dino": { "name": "Dino", "version": "1.10.0", "sha256": "0nfn61i6iczg3k8brfajddlxavskjzm0x56qliy81f76sjb3njr3", - "depends": ["BiocParallel", "BiocSingular", "Matrix", "matrixStats", "S4Vectors", "scran", "Seurat", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocParallel", "BiocSingular", "Matrix", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "matrixStats", "scran"] }, "Director": { "name": "Director", @@ -1813,19 +1825,19 @@ "name": "DiscoRhythm", "version": "1.20.0", "sha256": "14scrzsx36j6rbnav5hn8xykhwyswr85kkvdvg66g4xdwc3d6v7b", - "depends": ["BiocGenerics", "BiocStyle", "broom", "data_table", "dplyr", "DT", "ggExtra", "ggplot2", "gridExtra", "heatmaply", "kableExtra", "knitr", "magick", "matrixStats", "matrixTests", "MetaCycle", "plotly", "reshape2", "rmarkdown", "S4Vectors", "shiny", "shinyBS", "shinycssloaders", "shinydashboard", "shinyjs", "SummarizedExperiment", "UpSetR", "VennDiagram", "viridis", "zip"] + "depends": ["BiocGenerics", "BiocStyle", "DT", "MetaCycle", "S4Vectors", "SummarizedExperiment", "UpSetR", "VennDiagram", "broom", "data_table", "dplyr", "ggExtra", "ggplot2", "gridExtra", "heatmaply", "kableExtra", "knitr", "magick", "matrixStats", "matrixTests", "plotly", "reshape2", "rmarkdown", "shiny", "shinyBS", "shinycssloaders", "shinydashboard", "shinyjs", "viridis", "zip"] }, "DominoEffect": { "name": "DominoEffect", "version": "1.24.0", "sha256": "1lwvji698xi63rx4i3g73xkv4k53m3gbjgkbcmxgm0gagn1mrczl", - "depends": ["AnnotationDbi", "biomaRt", "Biostrings", "data_table", "GenomeInfoDb", "GenomicRanges", "IRanges", "pwalign", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["AnnotationDbi", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "SummarizedExperiment", "VariantAnnotation", "biomaRt", "data_table", "pwalign"] }, "Doscheda": { "name": "Doscheda", "version": "1.26.0", "sha256": "0iqcsyk4y8wkhf9s84hzm4rdmyg7bb5db7frm6xbxlsydfpzqy3l", - "depends": ["affy", "calibrate", "corrgram", "drc", "DT", "ggplot2", "gridExtra", "httr", "jsonlite", "limma", "matrixStats", "prodlim", "readxl", "reshape2", "shiny", "shinydashboard", "stringr", "vsn"] + "depends": ["DT", "affy", "calibrate", "corrgram", "drc", "ggplot2", "gridExtra", "httr", "jsonlite", "limma", "matrixStats", "prodlim", "readxl", "reshape2", "shiny", "shinydashboard", "stringr", "vsn"] }, "DriverNet": { "name": "DriverNet", @@ -1837,19 +1849,19 @@ "name": "DropletUtils", "version": "1.24.0", "sha256": "01y88cnii02sn1jgyvvmbx8j60qbzqyznqfxzv06yi4y0xj37klg", - "depends": ["beachmat", "BH", "BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "dqrng", "edgeR", "GenomicRanges", "HDF5Array", "IRanges", "Matrix", "R_utils", "Rcpp", "rhdf5", "Rhdf5lib", "S4Vectors", "scuttle", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BH", "BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "GenomicRanges", "HDF5Array", "IRanges", "Matrix", "R_utils", "Rcpp", "Rhdf5lib", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "dqrng", "edgeR", "rhdf5", "scuttle"] }, "DrugVsDisease": { "name": "DrugVsDisease", "version": "2.46.0", "sha256": "1bzjjvv94hiyh7m0iqrvgl6lgxzz6s8jy5ry1mj2w821ivhz1gpy", - "depends": ["affy", "annotate", "ArrayExpress", "BiocGenerics", "biomaRt", "cMap2data", "DrugVsDiseasedata", "GEOquery", "hgu133a_db", "hgu133a2_db", "hgu133plus2_db", "limma", "qvalue", "RUnit", "xtable"] + "depends": ["ArrayExpress", "BiocGenerics", "DrugVsDiseasedata", "GEOquery", "RUnit", "affy", "annotate", "biomaRt", "cMap2data", "hgu133a2_db", "hgu133a_db", "hgu133plus2_db", "limma", "qvalue", "xtable"] }, "Dune": { "name": "Dune", "version": "1.16.0", "sha256": "0fiqbh9ywip75sxy54y76nbbqg6maji40d189qxarckdlmj09m7z", - "depends": ["aricode", "BiocParallel", "dplyr", "gganimate", "ggplot2", "magrittr", "purrr", "RColorBrewer", "SummarizedExperiment", "tidyr"] + "depends": ["BiocParallel", "RColorBrewer", "SummarizedExperiment", "aricode", "dplyr", "gganimate", "ggplot2", "magrittr", "purrr", "tidyr"] }, "DynDoc": { "name": "DynDoc", @@ -1861,7 +1873,7 @@ "name": "EBImage", "version": "4.46.0", "sha256": "0qaafn9l9lwrj0yph74g39pghjpg009qz7by64frxg1q0j7ksd2w", - "depends": ["abind", "BiocGenerics", "fftwtools", "htmltools", "htmlwidgets", "jpeg", "locfit", "png", "RCurl", "tiff"] + "depends": ["BiocGenerics", "RCurl", "abind", "fftwtools", "htmltools", "htmlwidgets", "jpeg", "locfit", "png", "tiff"] }, "EBSEA": { "name": "EBSEA", @@ -1873,7 +1885,7 @@ "name": "EBSeq", "version": "2.2.0", "sha256": "1lbvrw6fcjhrm6v71lmnphv4hbdh03czgx3822ckdk6xrvyh54cf", - "depends": ["BH", "blockmodeling", "gplots", "Rcpp", "RcppEigen", "testthat"] + "depends": ["BH", "Rcpp", "RcppEigen", "blockmodeling", "gplots", "testthat"] }, "EBarrays": { "name": "EBarrays", @@ -1891,7 +1903,7 @@ "name": "EDASeq", "version": "2.38.0", "sha256": "18h9zlah21lghy1sjpnzy6lddmff8vh3raxnqi15v00za9azk8yq", - "depends": ["AnnotationDbi", "aroma_light", "Biobase", "BiocGenerics", "BiocManager", "biomaRt", "Biostrings", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "ShortRead"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocManager", "Biostrings", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "ShortRead", "aroma_light", "biomaRt"] }, "EDIRquery": { "name": "EDIRquery", @@ -1903,19 +1915,19 @@ "name": "EGAD", "version": "1.32.0", "sha256": "0y1fwvqmrvv8v7i8ncqaxbmpflaybbgnjn09qqzpmsavfk10wvgh", - "depends": ["Biobase", "GEOquery", "gplots", "igraph", "impute", "limma", "MASS", "plyr", "RColorBrewer", "RCurl", "zoo"] + "depends": ["Biobase", "GEOquery", "MASS", "RColorBrewer", "RCurl", "gplots", "igraph", "impute", "limma", "plyr", "zoo"] }, "EGSEA": { "name": "EGSEA", "version": "1.32.0", "sha256": "1fpa26l0jimy1b36cw71abgmn1zj10j4lkpc5g4k09kc74nmivqi", - "depends": ["AnnotationDbi", "Biobase", "DT", "edgeR", "EGSEAdata", "gage", "ggplot2", "globaltest", "gplots", "GSVA", "HTMLUtils", "htmlwidgets", "hwriter", "limma", "metap", "org_Hs_eg_db", "org_Mm_eg_db", "org_Rn_eg_db", "PADOG", "pathview", "plotly", "RColorBrewer", "safe", "stringi", "topGO"] + "depends": ["AnnotationDbi", "Biobase", "DT", "EGSEAdata", "GSVA", "HTMLUtils", "PADOG", "RColorBrewer", "edgeR", "gage", "ggplot2", "globaltest", "gplots", "htmlwidgets", "hwriter", "limma", "metap", "org_Hs_eg_db", "org_Mm_eg_db", "org_Rn_eg_db", "pathview", "plotly", "safe", "stringi", "topGO"] }, "ELMER": { "name": "ELMER", "version": "2.28.0", "sha256": "012vxjagm3m9v98ds89xfwncnxzhwqlk7yigadnw73vg5r8ix6zd", - "depends": ["biomaRt", "circlize", "ComplexHeatmap", "DelayedArray", "doParallel", "downloader", "dplyr", "ELMER_data", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggpubr", "ggrepel", "gridExtra", "Gviz", "IRanges", "lattice", "magrittr", "Matrix", "MultiAssayExperiment", "plotly", "plyr", "progress", "purrr", "readr", "reshape", "reshape2", "rmarkdown", "rtracklayer", "rvest", "S4Vectors", "scales", "stringr", "SummarizedExperiment", "TCGAbiolinks", "tibble", "tidyr", "xml2"] + "depends": ["ComplexHeatmap", "DelayedArray", "ELMER_data", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "Matrix", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "TCGAbiolinks", "biomaRt", "circlize", "doParallel", "downloader", "dplyr", "ggplot2", "ggpubr", "ggrepel", "gridExtra", "lattice", "magrittr", "plotly", "plyr", "progress", "purrr", "readr", "reshape", "reshape2", "rmarkdown", "rtracklayer", "rvest", "scales", "stringr", "tibble", "tidyr", "xml2"] }, "EMDomics": { "name": "EMDomics", @@ -1925,21 +1937,21 @@ }, "ENmix": { "name": "ENmix", - "version": "1.40.1", - "sha256": "1f41wvj1c78kkdrzp8dv5mfjfrjqpd32sp6lhh5mii1lvjb77ycc", - "depends": ["AnnotationHub", "Biobase", "doParallel", "dynamicTreeCut", "ExperimentHub", "foreach", "genefilter", "geneplotter", "gplots", "gtools", "illuminaio", "impute", "IRanges", "irlba", "matrixStats", "minfi", "quadprog", "RPMM", "S4Vectors", "SummarizedExperiment"] + "version": "1.40.2", + "sha256": "1x8rzdzymibypb65axx3sgxsgrj5d1fldj9j70acvg46lqhmq8f2", + "depends": ["AnnotationHub", "Biobase", "ExperimentHub", "IRanges", "RPMM", "S4Vectors", "SummarizedExperiment", "doParallel", "dynamicTreeCut", "foreach", "genefilter", "geneplotter", "gplots", "gtools", "illuminaio", "impute", "irlba", "matrixStats", "minfi", "quadprog"] }, "ERSSA": { "name": "ERSSA", "version": "1.22.0", "sha256": "1bm64ydz0qlfm6vdrhqr699sc0njm6npdq0pmh2xb3w6iwh9dy92", - "depends": ["apeglm", "BiocParallel", "DESeq2", "edgeR", "ggplot2", "plyr", "RColorBrewer"] + "depends": ["BiocParallel", "DESeq2", "RColorBrewer", "apeglm", "edgeR", "ggplot2", "plyr"] }, "EWCE": { "name": "EWCE", "version": "1.12.0", "sha256": "19j1bl179kcih54ry9m4pgl9qvylkxyjaqk6pzna9wm5dpzdqnsl", - "depends": ["BiocParallel", "data_table", "DelayedArray", "dplyr", "ewceData", "ggplot2", "HGNChelper", "limma", "Matrix", "orthogene", "reshape2", "RNOmni", "SingleCellExperiment", "stringr", "SummarizedExperiment"] + "depends": ["BiocParallel", "DelayedArray", "HGNChelper", "Matrix", "RNOmni", "SingleCellExperiment", "SummarizedExperiment", "data_table", "dplyr", "ewceData", "ggplot2", "limma", "orthogene", "reshape2", "stringr"] }, "EasyCellType": { "name": "EasyCellType", @@ -1957,7 +1969,7 @@ "name": "EnMCB", "version": "1.16.0", "sha256": "1m3d92abl2qdkd82wnf6imx9xgxi4w94wiy84vnwn9g3r9kxl1p2", - "depends": ["BiocFileCache", "boot", "e1071", "ggplot2", "glmnet", "igraph", "Matrix", "mboost", "rms", "survival", "survivalROC", "survivalsvm"] + "depends": ["BiocFileCache", "Matrix", "boot", "e1071", "ggplot2", "glmnet", "igraph", "mboost", "rms", "survival", "survivalROC", "survivalsvm"] }, "EnhancedVolcano": { "name": "EnhancedVolcano", @@ -1969,61 +1981,61 @@ "name": "EnrichedHeatmap", "version": "1.34.0", "sha256": "0fmqz9xqs1108a5xxpsc63pplcc0i742r4zdk46p68my28ba2xfq", - "depends": ["circlize", "ComplexHeatmap", "GenomicRanges", "GetoptLong", "IRanges", "locfit", "matrixStats", "Rcpp"] + "depends": ["ComplexHeatmap", "GenomicRanges", "GetoptLong", "IRanges", "Rcpp", "circlize", "locfit", "matrixStats"] }, "EnrichmentBrowser": { "name": "EnrichmentBrowser", "version": "2.34.1", "sha256": "1drmdr1z2fyyf566vv5arkbwpfkwxajh555nasnkbnpqdrq3b93q", - "depends": ["AnnotationDbi", "BiocFileCache", "BiocManager", "edgeR", "GO_db", "graph", "graphite", "GSEABase", "hwriter", "KEGGgraph", "KEGGREST", "limma", "pathview", "Rgraphviz", "S4Vectors", "safe", "SPIA", "SummarizedExperiment"] + "depends": ["AnnotationDbi", "BiocFileCache", "BiocManager", "GO_db", "GSEABase", "KEGGREST", "KEGGgraph", "Rgraphviz", "S4Vectors", "SPIA", "SummarizedExperiment", "edgeR", "graph", "graphite", "hwriter", "limma", "pathview", "safe"] }, "EpiDISH": { "name": "EpiDISH", "version": "2.20.0", "sha256": "17qkm5inavfdfrim9baqxdhs3w64c6y94qadw4y5p9xsck318frq", - "depends": ["e1071", "locfdr", "MASS", "Matrix", "matrixStats", "quadprog", "stringr"] + "depends": ["MASS", "Matrix", "e1071", "locfdr", "matrixStats", "quadprog", "stringr"] }, "EpiMix": { "name": "EpiMix", "version": "1.6.1", "sha256": "1m8mlxhci56d4d1iingwj8ddmddpm02an8dhh6m4ka4vpg7q51as", - "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "biomaRt", "data_table", "doParallel", "doSNOW", "downloader", "dplyr", "ELMER_data", "EpiMix_data", "ExperimentHub", "foreach", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "impute", "IRanges", "limma", "plyr", "progress", "R_matlab", "RColorBrewer", "RCurl", "rlang", "RPMM", "S4Vectors", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "ELMER_data", "EpiMix_data", "ExperimentHub", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "RCurl", "RPMM", "R_matlab", "S4Vectors", "SummarizedExperiment", "biomaRt", "data_table", "doParallel", "doSNOW", "downloader", "dplyr", "foreach", "ggplot2", "impute", "limma", "plyr", "progress", "rlang", "tibble", "tidyr"] }, "EpiTxDb": { "name": "EpiTxDb", "version": "1.16.0", "sha256": "11f2a9qhbl605mzj6z673j0hlgd3a80c2qigkcw9q81745rd5lrg", - "depends": ["AnnotationDbi", "BiocFileCache", "BiocGenerics", "Biostrings", "curl", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "httr", "IRanges", "Modstrings", "rex", "RSQLite", "S4Vectors", "tRNAdbImport", "txdbmaker", "xml2"] + "depends": ["AnnotationDbi", "BiocFileCache", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Modstrings", "RSQLite", "S4Vectors", "curl", "httr", "rex", "tRNAdbImport", "txdbmaker", "xml2"] }, "EventPointer": { "name": "EventPointer", "version": "3.12.0", "sha256": "1d13s9pww3kjdm0nfnz598jng9vl66jl6y52rczdcflxikfgip0i", - "depends": ["abind", "affxparser", "Biostrings", "BSgenome", "cobs", "doParallel", "fgsea", "foreach", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "glmnet", "graph", "igraph", "IRanges", "iterators", "limma", "lpSolve", "MASS", "Matrix", "matrixStats", "nnls", "poibin", "prodlim", "qvalue", "RBGL", "rhdf5", "S4Vectors", "SGSeq", "speedglm", "stringr", "SummarizedExperiment", "tximport"] + "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "Matrix", "RBGL", "S4Vectors", "SGSeq", "SummarizedExperiment", "abind", "affxparser", "cobs", "doParallel", "fgsea", "foreach", "glmnet", "graph", "igraph", "iterators", "limma", "lpSolve", "matrixStats", "nnls", "poibin", "prodlim", "qvalue", "rhdf5", "speedglm", "stringr", "tximport"] }, "ExCluster": { "name": "ExCluster", "version": "1.22.0", "sha256": "1drpwz9pba4w36sbp53jrlmwbzr68fysrzqa06qb5347sxl94ac1", - "depends": ["GenomicRanges", "IRanges", "matrixStats", "Rsubread", "rtracklayer"] + "depends": ["GenomicRanges", "IRanges", "Rsubread", "matrixStats", "rtracklayer"] }, "ExiMiR": { "name": "ExiMiR", "version": "2.46.0", "sha256": "01bdi0d9afwyndfcjkaand4qpmbx6i437183s9g16i13vzwh1wk4", - "depends": ["affy", "affyio", "Biobase", "limma", "preprocessCore"] + "depends": ["Biobase", "affy", "affyio", "limma", "preprocessCore"] }, "ExperimentHub": { "name": "ExperimentHub", "version": "2.12.0", "sha256": "0mj1aqxyp84mn5m0fwk9lijysy594hhga3kv4mddv45vqxdsr08h", - "depends": ["AnnotationHub", "BiocFileCache", "BiocGenerics", "BiocManager", "rappdirs", "S4Vectors"] + "depends": ["AnnotationHub", "BiocFileCache", "BiocGenerics", "BiocManager", "S4Vectors", "rappdirs"] }, "ExperimentHubData": { "name": "ExperimentHubData", "version": "1.30.0", "sha256": "1adm3b0nacbdi4x5z71iiif9d876m3ip6crhbbr2hw4mbk6is7qn", - "depends": ["AnnotationHubData", "BiocGenerics", "BiocManager", "curl", "DBI", "ExperimentHub", "httr", "S4Vectors"] + "depends": ["AnnotationHubData", "BiocGenerics", "BiocManager", "DBI", "ExperimentHub", "S4Vectors", "curl", "httr"] }, "ExperimentSubset": { "name": "ExperimentSubset", @@ -2035,145 +2047,145 @@ "name": "ExploreModelMatrix", "version": "1.16.0", "sha256": "01ys9p7q3pmz7qfw1ggppchqq8yzrjsd91fa1r6h3a2rz8azdi2g", - "depends": ["cowplot", "dplyr", "DT", "ggplot2", "limma", "magrittr", "MASS", "rintrojs", "S4Vectors", "scales", "shiny", "shinydashboard", "shinyjs", "tibble", "tidyr"] + "depends": ["DT", "MASS", "S4Vectors", "cowplot", "dplyr", "ggplot2", "limma", "magrittr", "rintrojs", "scales", "shiny", "shinydashboard", "shinyjs", "tibble", "tidyr"] }, "ExpressionAtlas": { "name": "ExpressionAtlas", "version": "1.32.0", "sha256": "1plxw5jf2lpa8away57nr1jch14d3lz0f33sjv958kyqzhar7zml", - "depends": ["Biobase", "BiocStyle", "httr", "jsonlite", "limma", "RCurl", "S4Vectors", "SummarizedExperiment", "XML", "xml2"] + "depends": ["Biobase", "BiocStyle", "RCurl", "S4Vectors", "SummarizedExperiment", "XML", "httr", "jsonlite", "limma", "xml2"] }, "FEAST": { "name": "FEAST", "version": "1.12.0", "sha256": "0w6pkq3lc9l42fnwa35lcnbw52ylbjs65w6dsh2k5wcgs0jig8rp", - "depends": ["BiocParallel", "irlba", "matrixStats", "mclust", "SC3", "SingleCellExperiment", "SummarizedExperiment", "TSCAN"] + "depends": ["BiocParallel", "SC3", "SingleCellExperiment", "SummarizedExperiment", "TSCAN", "irlba", "matrixStats", "mclust"] }, "FELLA": { "name": "FELLA", "version": "1.24.0", "sha256": "1rbb5lfz7maicw0hx5sd1jg9rqxlcmv6bfyakp4ics9azxwk899i", - "depends": ["igraph", "KEGGREST", "Matrix", "plyr"] + "depends": ["KEGGREST", "Matrix", "igraph", "plyr"] }, "FGNet": { "name": "FGNet", "version": "3.38.0", "sha256": "128dc1mhqj0vxqcivra79k0c8jwr9zcrcwzkkr69czzv5i7szw8d", - "depends": ["hwriter", "igraph", "plotrix", "png", "R_utils", "RColorBrewer", "reshape2", "XML"] + "depends": ["RColorBrewer", "R_utils", "XML", "hwriter", "igraph", "plotrix", "png", "reshape2"] }, "FISHalyseR": { "name": "FISHalyseR", "version": "1.38.0", "sha256": "1f3iv48l2wbx8izn0z0lnk2k8ssm6bj6ai02kd5ww5kk7gqg6ka7", - "depends": ["abind", "EBImage"] + "depends": ["EBImage", "abind"] }, "FLAMES": { "name": "FLAMES", "version": "1.10.0", "sha256": "1fcz0v1vy0q5zmdpawlk4a7fbqd01954p0jby9nbzgbk85hl16mi", - "depends": ["bambu", "basilisk", "BiocGenerics", "Biostrings", "circlize", "ComplexHeatmap", "cowplot", "dplyr", "DropletUtils", "future", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggbio", "ggplot2", "gridExtra", "igraph", "IRanges", "jsonlite", "magrittr", "Matrix", "MultiAssayExperiment", "RColorBrewer", "Rcpp", "reticulate", "Rhtslib", "Rsamtools", "rtracklayer", "S4Vectors", "scater", "scran", "scuttle", "SingleCellExperiment", "stringr", "SummarizedExperiment", "testthat", "tibble", "tidyr", "tidyselect", "txdbmaker", "withr", "zlibbioc"] + "depends": ["BiocGenerics", "Biostrings", "ComplexHeatmap", "DropletUtils", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "MultiAssayExperiment", "RColorBrewer", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "bambu", "basilisk", "circlize", "cowplot", "dplyr", "future", "ggbio", "ggplot2", "gridExtra", "igraph", "jsonlite", "magrittr", "reticulate", "rtracklayer", "scater", "scran", "scuttle", "stringr", "testthat", "tibble", "tidyr", "tidyselect", "txdbmaker", "withr", "zlibbioc"] }, "FRASER": { "name": "FRASER", "version": "2.0.0", "sha256": "0q36p80ff0hq37ddjpx6czkllpmlkj00h6fq32hbmr9cyh3rz2d8", - "depends": ["AnnotationDbi", "BBmisc", "Biobase", "BiocGenerics", "BiocParallel", "biomaRt", "BSgenome", "cowplot", "data_table", "DelayedArray", "DelayedMatrixStats", "extraDistr", "generics", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggrepel", "HDF5Array", "IRanges", "matrixStats", "OUTRIDER", "pcaMethods", "pheatmap", "plotly", "PRROC", "R_utils", "RColorBrewer", "Rcpp", "RcppArmadillo", "rhdf5", "Rsamtools", "Rsubread", "S4Vectors", "SummarizedExperiment", "tibble", "VGAM"] + "depends": ["AnnotationDbi", "BBmisc", "BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "HDF5Array", "IRanges", "OUTRIDER", "PRROC", "RColorBrewer", "R_utils", "Rcpp", "RcppArmadillo", "Rsamtools", "Rsubread", "S4Vectors", "SummarizedExperiment", "VGAM", "biomaRt", "cowplot", "data_table", "extraDistr", "generics", "ggplot2", "ggrepel", "matrixStats", "pcaMethods", "pheatmap", "plotly", "rhdf5", "tibble"] }, "FRGEpistasis": { "name": "FRGEpistasis", "version": "1.40.0", "sha256": "0fpph9rrkakaxah4f8bcbny4yd8w4zp38666ff8mrvvlzx5fn313", - "depends": ["fda", "MASS"] + "depends": ["MASS", "fda"] }, "FamAgg": { "name": "FamAgg", "version": "1.32.0", "sha256": "0qcd028bamdj4v24rdqymk2zc02kj7yc8p1q19vvzk8h1hxvh98l", - "depends": ["BiocGenerics", "gap", "igraph", "kinship2", "Matrix", "survey"] + "depends": ["BiocGenerics", "Matrix", "gap", "igraph", "kinship2", "survey"] }, "FastqCleaner": { "name": "FastqCleaner", "version": "1.22.0", "sha256": "0bwbg3b8w27whbg8gl2ga58fwm95cyra45f2y609izrx9vjz7dcr", - "depends": ["Biostrings", "DT", "htmltools", "IRanges", "Rcpp", "S4Vectors", "shiny", "shinyBS", "ShortRead"] + "depends": ["Biostrings", "DT", "IRanges", "Rcpp", "S4Vectors", "ShortRead", "htmltools", "shiny", "shinyBS"] }, "FeatSeekR": { "name": "FeatSeekR", "version": "1.4.0", "sha256": "0r72wl0wjzfvh8wmpn6ppffsh6yrydkyni1pbxsw865j5rkiiyqd", - "depends": ["MASS", "pheatmap", "pracma", "SummarizedExperiment"] + "depends": ["MASS", "SummarizedExperiment", "pheatmap", "pracma"] }, "FilterFFPE": { "name": "FilterFFPE", "version": "1.14.0", "sha256": "1pjks7wadlyyhaz9lcrhxamjqjaq0nnyxkv6jxb4adrh5hwvgxfx", - "depends": ["doParallel", "foreach", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors"] + "depends": ["GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "doParallel", "foreach"] }, "FindIT2": { "name": "FindIT2", "version": "1.10.0", "sha256": "03bfmxln17lnvzmmsc3g64nk1vs6fg4bphlszqgxhdxwbjjg4nf2", - "depends": ["BiocGenerics", "BiocParallel", "dplyr", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggrepel", "glmnet", "IRanges", "MultiAssayExperiment", "patchwork", "progress", "purrr", "qvalue", "rlang", "rtracklayer", "S4Vectors", "stringr", "SummarizedExperiment", "tibble", "tidyr", "withr"] + "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "dplyr", "ggplot2", "ggrepel", "glmnet", "patchwork", "progress", "purrr", "qvalue", "rlang", "rtracklayer", "stringr", "tibble", "tidyr", "withr"] }, "FitHiC": { "name": "FitHiC", "version": "1.30.0", "sha256": "107hm9k9wfr34fradldmjym2bzxb6qx8109p4a7xrqkiya0hmwwa", - "depends": ["data_table", "fdrtool", "Rcpp"] + "depends": ["Rcpp", "data_table", "fdrtool"] }, "FlowSOM": { "name": "FlowSOM", "version": "2.12.0", "sha256": "0xqrp184p00pvzzf6ddmp2r8lpg97bm0q6smjwcrfb8rn4msxmis", - "depends": ["BiocGenerics", "colorRamps", "ConsensusClusterPlus", "dplyr", "flowCore", "ggforce", "ggnewscale", "ggplot2", "ggpubr", "igraph", "magrittr", "rlang", "Rtsne", "tidyr", "XML"] + "depends": ["BiocGenerics", "ConsensusClusterPlus", "Rtsne", "XML", "colorRamps", "dplyr", "flowCore", "ggforce", "ggnewscale", "ggplot2", "ggpubr", "igraph", "magrittr", "rlang", "tidyr"] }, "FuseSOM": { "name": "FuseSOM", "version": "1.6.0", "sha256": "1qbk2rdc7fdhkglwzhsyrysb51qwjsyjy9m6pgbbcwi14iwwhnf2", - "depends": ["analogue", "cluster", "coop", "diptest", "fastcluster", "FCPS", "fpc", "ggplot2", "ggplotify", "ggpubr", "pheatmap", "proxy", "psych", "Rcpp", "S4Vectors", "stringr", "SummarizedExperiment"] + "depends": ["FCPS", "Rcpp", "S4Vectors", "SummarizedExperiment", "analogue", "cluster", "coop", "diptest", "fastcluster", "fpc", "ggplot2", "ggplotify", "ggpubr", "pheatmap", "proxy", "psych", "stringr"] }, "GA4GHclient": { "name": "GA4GHclient", "version": "1.28.0", "sha256": "1x5k9l2f4fw5da1aacwd0b7rn9kjpbzf8vl9h76n4d92fdh25jlh", - "depends": ["BiocGenerics", "Biostrings", "dplyr", "GenomeInfoDb", "GenomicRanges", "httr", "IRanges", "jsonlite", "S4Vectors", "VariantAnnotation"] + "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "VariantAnnotation", "dplyr", "httr", "jsonlite"] }, "GA4GHshiny": { "name": "GA4GHshiny", "version": "1.26.0", "sha256": "1vj0p1akcgzq2q43yir0g2klggjw8970chhzibw7yb5qxr2fz9ai", - "depends": ["AnnotationDbi", "BiocGenerics", "dplyr", "DT", "GA4GHclient", "GenomeInfoDb", "GenomicFeatures", "openxlsx", "purrr", "S4Vectors", "shiny", "shinyjs", "shinythemes", "tidyr"] + "depends": ["AnnotationDbi", "BiocGenerics", "DT", "GA4GHclient", "GenomeInfoDb", "GenomicFeatures", "S4Vectors", "dplyr", "openxlsx", "purrr", "shiny", "shinyjs", "shinythemes", "tidyr"] }, "GARS": { "name": "GARS", "version": "1.24.0", "sha256": "1wi56b6h1fi1rr4hrpbby6iwgax36q01h6hr2nm4bgb7cx6l3bii", - "depends": ["cluster", "DaMiRseq", "ggplot2", "MLSeq", "SummarizedExperiment"] + "depends": ["DaMiRseq", "MLSeq", "SummarizedExperiment", "cluster", "ggplot2"] }, "GAprediction": { "name": "GAprediction", "version": "1.30.0", "sha256": "0p38ivjzp0nsyr85a323xgjwb2amsmvr10ajq9m51z9acl4jzakx", - "depends": ["glmnet", "Matrix"] + "depends": ["Matrix", "glmnet"] }, "GBScleanR": { "name": "GBScleanR", "version": "1.8.18", "sha256": "1il1h9njfvhi4kxn30bhc31nkmr91b9imfafq68ccz947ckzhkpm", - "depends": ["expm", "gdsfmt", "ggplot2", "Rcpp", "RcppParallel", "SeqArray", "tidyr"] + "depends": ["Rcpp", "RcppParallel", "SeqArray", "expm", "gdsfmt", "ggplot2", "tidyr"] }, "GDCRNATools": { "name": "GDCRNATools", "version": "1.24.0", "sha256": "1grhgzl08f2infvvpd5084mvplvgqb0qa7d6afrfv6n5wigwnvbv", - "depends": ["BiocParallel", "biomaRt", "clusterProfiler", "DESeq2", "DOSE", "DT", "edgeR", "GenomicDataCommons", "ggplot2", "gplots", "jsonlite", "limma", "org_Hs_eg_db", "pathview", "rjson", "shiny", "survival", "survminer", "XML"] + "depends": ["BiocParallel", "DESeq2", "DOSE", "DT", "GenomicDataCommons", "XML", "biomaRt", "clusterProfiler", "edgeR", "ggplot2", "gplots", "jsonlite", "limma", "org_Hs_eg_db", "pathview", "rjson", "shiny", "survival", "survminer"] }, "GDSArray": { "name": "GDSArray", - "version": "1.24.0", - "sha256": "0s78y646vr1m2lcsg91yy5xzc328hfbx0lnzyfg9pavp0d12yzip", - "depends": ["BiocGenerics", "DelayedArray", "gdsfmt", "S4Vectors", "SeqArray", "SNPRelate"] + "version": "1.24.2", + "sha256": "01sjx63m9affj46s6l3byj9m127bipid230jdlxnwans38x5jsxr", + "depends": ["BiocGenerics", "DelayedArray", "S4Vectors", "SNPRelate", "SeqArray", "gdsfmt"] }, "GEM": { "name": "GEM", @@ -2185,7 +2197,7 @@ "name": "GENESIS", "version": "2.34.0", "sha256": "1jk0mw183v2nxabx58kwm8fwm6r2ikbc90ilxdmivfsxc7gx534r", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "data_table", "gdsfmt", "GenomicRanges", "GWASTools", "igraph", "IRanges", "Matrix", "reshape2", "S4Vectors", "SeqArray", "SeqVarTools", "SNPRelate"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "GWASTools", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "SNPRelate", "SeqArray", "SeqVarTools", "data_table", "gdsfmt", "igraph", "reshape2"] }, "GENIE3": { "name": "GENIE3", @@ -2197,13 +2209,13 @@ "name": "GEOexplorer", "version": "1.10.0", "sha256": "0hb9hgkb5nc2mdri18y22s4qi5hdp3zclmpdz2q7hdvqhqg6kqzv", - "depends": ["Biobase", "car", "DT", "edgeR", "enrichR", "factoextra", "GEOquery", "ggplot2", "heatmaply", "htmltools", "httr", "impute", "knitr", "limma", "markdown", "pheatmap", "plotly", "R_utils", "readxl", "scales", "shiny", "shinybusy", "shinycssloaders", "shinyHeatmaply", "stringr", "sva", "umap", "xfun", "XML", "xml2"] + "depends": ["Biobase", "DT", "GEOquery", "R_utils", "XML", "car", "edgeR", "enrichR", "factoextra", "ggplot2", "heatmaply", "htmltools", "httr", "impute", "knitr", "limma", "markdown", "pheatmap", "plotly", "readxl", "scales", "shiny", "shinyHeatmaply", "shinybusy", "shinycssloaders", "stringr", "sva", "umap", "xfun", "xml2"] }, "GEOfastq": { "name": "GEOfastq", "version": "1.12.0", "sha256": "18wi24a6j04fflank3rw4z852j21zarca0by7g5kwq1ym2dy2xld", - "depends": ["doParallel", "foreach", "plyr", "RCurl", "rvest", "stringr", "xml2"] + "depends": ["RCurl", "doParallel", "foreach", "plyr", "rvest", "stringr", "xml2"] }, "GEOmetadb": { "name": "GEOmetadb", @@ -2215,13 +2227,13 @@ "name": "GEOquery", "version": "2.72.0", "sha256": "0rqyv95l8h3s68ywhv3r7hm7j1mbm8prql7p2rlvv4xg31yqmnpl", - "depends": ["Biobase", "curl", "data_table", "dplyr", "limma", "magrittr", "R_utils", "readr", "tidyr", "xml2"] + "depends": ["Biobase", "R_utils", "curl", "data_table", "dplyr", "limma", "magrittr", "readr", "tidyr", "xml2"] }, "GEOsubmission": { "name": "GEOsubmission", "version": "1.56.0", "sha256": "1kvk6v1pj6f252lzlvw79ffd7wadlc6kvpa174msi75ww5s2qfc0", - "depends": ["affy", "Biobase"] + "depends": ["Biobase", "affy"] }, "GEWIST": { "name": "GEWIST", @@ -2233,13 +2245,13 @@ "name": "GGPA", "version": "1.16.0", "sha256": "1lg62vxn4z6z3l9d18gmyvdr456hs76lczxfq8j2w509gflcrskb", - "depends": ["GGally", "matrixStats", "network", "Rcpp", "RcppArmadillo", "scales", "sna"] + "depends": ["GGally", "Rcpp", "RcppArmadillo", "matrixStats", "network", "scales", "sna"] }, "GIGSEA": { "name": "GIGSEA", "version": "1.22.0", "sha256": "1yhxpm1amm6anzcss31pkg5xzw4q1nq1hjb6rx5p7a5dh9h8hdna", - "depends": ["locfdr", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "locfdr"] }, "GLAD": { "name": "GLAD", @@ -2251,19 +2263,19 @@ "name": "GMRP", "version": "1.32.0", "sha256": "0g2pmnngpv9k7gaz7bd5b0gn9i0i86q36fcapai93w76ml8ccvab", - "depends": ["diagram", "GenomicRanges", "plotrix"] + "depends": ["GenomicRanges", "diagram", "plotrix"] }, "GNET2": { "name": "GNET2", "version": "1.20.0", "sha256": "1hgzvl4k5q84ig9njmfvmdwc64h7nwsg0kcsi3da3mizxahaj780", - "depends": ["DiagrammeR", "dplyr", "ggplot2", "igraph", "matrixStats", "Rcpp", "reshape2", "SummarizedExperiment", "xgboost"] + "depends": ["DiagrammeR", "Rcpp", "SummarizedExperiment", "dplyr", "ggplot2", "igraph", "matrixStats", "reshape2", "xgboost"] }, "GNOSIS": { "name": "GNOSIS", "version": "1.2.0", "sha256": "0m20w85kixxqydrrf5cbphr1hvzlc2wmwjf68s9rr0llcfv7gy3r", - "depends": ["car", "cBioPortalData", "compareGroups", "dashboardthemes", "DescTools", "DT", "fabricatr", "fontawesome", "maftools", "magrittr", "operator_tools", "partykit", "RColorBrewer", "reshape2", "rpart", "rstatix", "shiny", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyjs", "shinylogs", "shinymeta", "shinyWidgets", "survival", "survminer", "tidyverse"] + "depends": ["DT", "DescTools", "RColorBrewer", "cBioPortalData", "car", "compareGroups", "dashboardthemes", "fabricatr", "fontawesome", "maftools", "magrittr", "operator_tools", "partykit", "reshape2", "rpart", "rstatix", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyjs", "shinylogs", "shinymeta", "survival", "survminer", "tidyverse"] }, "GOSemSim": { "name": "GOSemSim", @@ -2275,61 +2287,61 @@ "name": "GOTHiC", "version": "1.40.0", "sha256": "101mf3pkchz0il0czrwixx1pv8hq9cjh8m59nii00m2vwma3slrd", - "depends": ["BiocGenerics", "BiocManager", "Biostrings", "BSgenome", "data_table", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "Rsamtools", "rtracklayer", "S4Vectors", "ShortRead"] + "depends": ["BSgenome", "BiocGenerics", "BiocManager", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "data_table", "ggplot2", "rtracklayer"] }, "GOexpress": { "name": "GOexpress", "version": "1.38.0", "sha256": "0hz01hmp4bf9njw79zqy08zx9q3c6qfs2xykz5x7xkngp65mzkxf", - "depends": ["Biobase", "biomaRt", "ggplot2", "gplots", "randomForest", "RColorBrewer", "RCurl", "stringr"] + "depends": ["Biobase", "RColorBrewer", "RCurl", "biomaRt", "ggplot2", "gplots", "randomForest", "stringr"] }, "GOfuncR": { "name": "GOfuncR", "version": "1.24.0", "sha256": "1g3nppcmyj81ia3v9zvsr8jplk8kmvssspvxd94zxh6yb3wrrc6v", - "depends": ["AnnotationDbi", "GenomicRanges", "gtools", "IRanges", "mapplots", "Rcpp", "vioplot"] + "depends": ["AnnotationDbi", "GenomicRanges", "IRanges", "Rcpp", "gtools", "mapplots", "vioplot"] }, "GOpro": { "name": "GOpro", "version": "1.30.0", "sha256": "0s8yyg5myxvw61zai54d3dhai1cm43i8s8wnpf0qc476q4v2xgzl", - "depends": ["AnnotationDbi", "BH", "dendextend", "doParallel", "foreach", "GO_db", "IRanges", "MultiAssayExperiment", "org_Hs_eg_db", "Rcpp", "S4Vectors"] + "depends": ["AnnotationDbi", "BH", "GO_db", "IRanges", "MultiAssayExperiment", "Rcpp", "S4Vectors", "dendextend", "doParallel", "foreach", "org_Hs_eg_db"] }, "GOstats": { "name": "GOstats", "version": "2.70.0", "sha256": "1dygsr8nlqksfpk00lk67dhj4fcpjg1x4dbl2r4sfanlk4hq76cs", - "depends": ["annotate", "AnnotationDbi", "AnnotationForge", "Biobase", "Category", "GO_db", "graph", "RBGL", "Rgraphviz"] + "depends": ["AnnotationDbi", "AnnotationForge", "Biobase", "Category", "GO_db", "RBGL", "Rgraphviz", "annotate", "graph"] }, "GPA": { "name": "GPA", "version": "1.16.0", "sha256": "1z97rwlqvahsjcrm1j00cz9lgnw1wym6lwhi7gf8g17avgk6s7g4", - "depends": ["DT", "ggplot2", "ggrepel", "plyr", "Rcpp", "shiny", "shinyBS", "vegan"] + "depends": ["DT", "Rcpp", "ggplot2", "ggrepel", "plyr", "shiny", "shinyBS", "vegan"] }, "GRENITS": { "name": "GRENITS", "version": "1.56.0", "sha256": "04nbvr080s6syb2d981g4402ghl2gh6f2gwsiv41nnj4narvs752", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "reshape2"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "reshape2"] }, "GRaNIE": { "name": "GRaNIE", "version": "1.8.0", "sha256": "1zdi6h1kmnj3b23qv268jg0iqfvgvn0h17d5l17yx3si9czcr8qr", - "depends": ["AnnotationHub", "biomaRt", "Biostrings", "checkmate", "circlize", "colorspace", "ComplexHeatmap", "data_table", "DESeq2", "dplyr", "ensembldb", "forcats", "futile_logger", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gridExtra", "igraph", "limma", "magrittr", "Matrix", "matrixStats", "patchwork", "progress", "RColorBrewer", "readr", "reshape2", "rlang", "S4Vectors", "scales", "stringr", "SummarizedExperiment", "tibble", "tidyr", "tidyselect", "topGO", "viridis"] + "depends": ["AnnotationHub", "Biostrings", "ComplexHeatmap", "DESeq2", "GenomeInfoDb", "GenomicRanges", "Matrix", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "biomaRt", "checkmate", "circlize", "colorspace", "data_table", "dplyr", "ensembldb", "forcats", "futile_logger", "ggplot2", "gridExtra", "igraph", "limma", "magrittr", "matrixStats", "patchwork", "progress", "readr", "reshape2", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect", "topGO", "viridis"] }, "GRmetrics": { "name": "GRmetrics", "version": "1.30.0", "sha256": "02dqb1n4q5zwhfhmdrynfa5djgnvry11x69r3z94rscxl94k9pan", - "depends": ["drc", "ggplot2", "plotly", "S4Vectors", "SummarizedExperiment"] + "depends": ["S4Vectors", "SummarizedExperiment", "drc", "ggplot2", "plotly"] }, "GSALightning": { "name": "GSALightning", "version": "1.32.0", "sha256": "0cmp5c22fhykld7napzk2220lzzizslsx2zi0slmiifapcrjg9vy", - "depends": ["data_table", "Matrix"] + "depends": ["Matrix", "data_table"] }, "GSAR": { "name": "GSAR", @@ -2341,19 +2353,19 @@ "name": "GSCA", "version": "2.34.0", "sha256": "1lycrigmlr8kcmc1svnxl3g8rzlhpk8kfmvspllyfp8cls35mypw", - "depends": ["ggplot2", "gplots", "RColorBrewer", "reshape2", "rhdf5", "shiny", "sp"] + "depends": ["RColorBrewer", "ggplot2", "gplots", "reshape2", "rhdf5", "shiny", "sp"] }, "GSEABase": { "name": "GSEABase", "version": "1.66.0", "sha256": "1pnd8rmpk7gm89cvrqa8qwk40dszkfkhyydxp3gl13zng9c5bq40", - "depends": ["annotate", "AnnotationDbi", "Biobase", "BiocGenerics", "graph", "XML"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "XML", "annotate", "graph"] }, "GSEABenchmarkeR": { "name": "GSEABenchmarkeR", "version": "1.24.0", "sha256": "11aczfpbc31wq9h2ri7gn17ki2f61s801zik2lkwgvly9627kfzi", - "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "BiocFileCache", "BiocParallel", "edgeR", "EnrichmentBrowser", "ExperimentHub", "KEGGandMetacoreDzPathwaysGEO", "KEGGdzPathwaysGEO", "S4Vectors", "SummarizedExperiment"] + "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "BiocFileCache", "BiocParallel", "EnrichmentBrowser", "ExperimentHub", "KEGGandMetacoreDzPathwaysGEO", "KEGGdzPathwaysGEO", "S4Vectors", "SummarizedExperiment", "edgeR"] }, "GSEAlm": { "name": "GSEAlm", @@ -2371,7 +2383,7 @@ "name": "GSRI", "version": "2.52.0", "sha256": "0b8r1cih0zn8aj9nbpmqwiiqfhk9a2f0bxcqyx77g5jlg9b504kq", - "depends": ["Biobase", "fdrtool", "genefilter", "GSEABase", "les"] + "depends": ["Biobase", "GSEABase", "fdrtool", "genefilter", "les"] }, "GSReg": { "name": "GSReg", @@ -2383,7 +2395,7 @@ "name": "GSVA", "version": "1.52.3", "sha256": "08nxg3q350n5gf975r6b0zq4cr7lchv2i811crc4xbb7q39kw8k4", - "depends": ["Biobase", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "GSEABase", "HDF5Array", "IRanges", "Matrix", "S4Vectors", "SingleCellExperiment", "sparseMatrixStats", "SpatialExperiment", "SummarizedExperiment"] + "depends": ["Biobase", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "GSEABase", "HDF5Array", "IRanges", "Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "sparseMatrixStats"] }, "GSgalgoR": { "name": "GSgalgoR", @@ -2395,25 +2407,25 @@ "name": "GUIDEseq", "version": "1.34.0", "sha256": "1xn44w1z1izzf2qr4xsmrvc468swjp6zmf4wxc33jbk5r9lv0n0x", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "ChIPpeakAnno", "CRISPRseek", "data_table", "dplyr", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "hash", "IRanges", "limma", "matrixStats", "multtest", "openxlsx", "patchwork", "purrr", "pwalign", "rio", "rlang", "Rsamtools", "S4Vectors", "stringr", "tidyr"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "CRISPRseek", "ChIPpeakAnno", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "data_table", "dplyr", "ggplot2", "hash", "limma", "matrixStats", "multtest", "openxlsx", "patchwork", "purrr", "pwalign", "rio", "rlang", "stringr", "tidyr"] }, "GWAS_BAYES": { "name": "GWAS.BAYES", "version": "1.14.0", "sha256": "05fp1wrddk9a961cx2ps0cad9rzagsyrfyfck6h1v3xb5gmz03ik", - "depends": ["caret", "GA", "limma", "MASS", "Matrix", "memoise"] + "depends": ["GA", "MASS", "Matrix", "caret", "limma", "memoise"] }, "GWASTools": { "name": "GWASTools", "version": "1.50.0", "sha256": "013qv2wac90s1rv992bwzq4diqfq7r18qk7gcifmi22samplpnw4", - "depends": ["Biobase", "data_table", "DBI", "DNAcopy", "gdsfmt", "GWASExactHW", "lmtest", "logistf", "quantsmooth", "RSQLite", "sandwich", "survival"] + "depends": ["Biobase", "DBI", "DNAcopy", "GWASExactHW", "RSQLite", "data_table", "gdsfmt", "lmtest", "logistf", "quantsmooth", "sandwich", "survival"] }, "GWENA": { "name": "GWENA", "version": "1.14.0", "sha256": "1vwc7n0kyza4w3p7fbfrji6vamn042nwz4wa51ymcwg62j5k6yxk", - "depends": ["cluster", "dplyr", "dynamicTreeCut", "ggplot2", "gprofiler2", "igraph", "magrittr", "matrixStats", "NetRep", "purrr", "RColorBrewer", "rlist", "stringr", "SummarizedExperiment", "tibble", "tidyr", "WGCNA"] + "depends": ["NetRep", "RColorBrewer", "SummarizedExperiment", "WGCNA", "cluster", "dplyr", "dynamicTreeCut", "ggplot2", "gprofiler2", "igraph", "magrittr", "matrixStats", "purrr", "rlist", "stringr", "tibble", "tidyr"] }, "GateFinder": { "name": "GateFinder", @@ -2423,9 +2435,9 @@ }, "GeDi": { "name": "GeDi", - "version": "1.0.0", - "sha256": "193fnp0v74bsdszxxxywz9r45xqlmvn5vg0n5fcq1w8f15rpgizg", - "depends": ["BiocFileCache", "BiocNeighbors", "BiocParallel", "bs4Dash", "ComplexHeatmap", "dplyr", "DT", "fontawesome", "GeneTonic", "ggdendro", "ggplot2", "GOSemSim", "igraph", "Matrix", "plotly", "RColorBrewer", "readxl", "rintrojs", "scales", "shiny", "shinyBS", "shinycssloaders", "shinyWidgets", "STRINGdb", "tm", "visNetwork", "wordcloud2"] + "version": "1.0.1", + "sha256": "0s0fln04m7ywvv33qpagcabsp90v804fdd1yjzpqfk67xdwa1svg", + "depends": ["BiocFileCache", "BiocNeighbors", "BiocParallel", "ComplexHeatmap", "DT", "GOSemSim", "GeneTonic", "Matrix", "RColorBrewer", "STRINGdb", "bs4Dash", "dplyr", "fontawesome", "ggdendro", "ggplot2", "igraph", "plotly", "readxl", "rintrojs", "scales", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "tm", "visNetwork", "wordcloud2"] }, "GenProSeq": { "name": "GenProSeq", @@ -2437,7 +2449,7 @@ "name": "GenVisR", "version": "1.36.0", "sha256": "1xzzdy2mcy8as3szygly3kw6k7g5dp2vxmimcw6738fj37zbcd77", - "depends": ["AnnotationDbi", "BiocGenerics", "biomaRt", "Biostrings", "BSgenome", "data_table", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "gridExtra", "gtable", "gtools", "IRanges", "plyr", "reshape2", "Rsamtools", "scales", "VariantAnnotation", "viridis"] + "depends": ["AnnotationDbi", "BSgenome", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "VariantAnnotation", "biomaRt", "data_table", "ggplot2", "gridExtra", "gtable", "gtools", "plyr", "reshape2", "scales", "viridis"] }, "GeneBreak": { "name": "GeneBreak", @@ -2461,7 +2473,7 @@ "name": "GeneGeneInteR", "version": "1.30.0", "sha256": "05d9i4nz7gf6g0g1bp0zpn3kqqfzf1lcjy7y67m1z8s96svkal47", - "depends": ["data_table", "FactoMineR", "GenomicRanges", "igraph", "IRanges", "kernlab", "mvtnorm", "Rsamtools", "snpStats"] + "depends": ["FactoMineR", "GenomicRanges", "IRanges", "Rsamtools", "data_table", "igraph", "kernlab", "mvtnorm", "snpStats"] }, "GeneMeta": { "name": "GeneMeta", @@ -2473,49 +2485,49 @@ "name": "GeneNetworkBuilder", "version": "1.46.0", "sha256": "1gjirjj809c1vc3y4k07j8md0m0bksjkfy68v1v8b2d9kfws5vwc", - "depends": ["graph", "htmlwidgets", "plyr", "Rcpp", "Rgraphviz", "rjson", "XML"] + "depends": ["Rcpp", "Rgraphviz", "XML", "graph", "htmlwidgets", "plyr", "rjson"] }, "GeneOverlap": { "name": "GeneOverlap", "version": "1.40.0", "sha256": "0bfd4322m6g7dvas214i17k8sjsf62lza9darmhiwb4r8h30qmb2", - "depends": ["gplots", "RColorBrewer"] + "depends": ["RColorBrewer", "gplots"] }, "GeneRegionScan": { "name": "GeneRegionScan", "version": "1.60.0", "sha256": "01vrw0k8s62i3mzk5f7mrnh7294i5smqgfz00bl0wjhy9yak5j34", - "depends": ["affxparser", "Biobase", "Biostrings", "RColorBrewer", "S4Vectors"] + "depends": ["Biobase", "Biostrings", "RColorBrewer", "S4Vectors", "affxparser"] }, "GeneSelectMMD": { "name": "GeneSelectMMD", "version": "2.48.0", "sha256": "044i85vnvr5l1c1sbsh6s777invnch9yjkx3ffki9m0xnilvv5al", - "depends": ["Biobase", "limma", "MASS"] + "depends": ["Biobase", "MASS", "limma"] }, "GeneStructureTools": { "name": "GeneStructureTools", "version": "1.24.0", "sha256": "19inj0ds7hh4n5cq9mgi4ahx46cxpad2pfdmmhrzvlbm8ss4yw6x", - "depends": ["Biostrings", "BSgenome_Mmusculus_UCSC_mm10", "data_table", "GenomicRanges", "Gviz", "IRanges", "plyr", "rtracklayer", "S4Vectors", "stringdist", "stringr"] + "depends": ["BSgenome_Mmusculus_UCSC_mm10", "Biostrings", "GenomicRanges", "Gviz", "IRanges", "S4Vectors", "data_table", "plyr", "rtracklayer", "stringdist", "stringr"] }, "GeneTonic": { "name": "GeneTonic", "version": "2.8.0", "sha256": "0f84sbqkhh74al1rn8fhkg4vmy0i06qadl7342gawqngxfcffzkn", - "depends": ["AnnotationDbi", "backbone", "bs4Dash", "circlize", "colorspace", "colourpicker", "ComplexHeatmap", "ComplexUpset", "dendextend", "DESeq2", "dplyr", "DT", "dynamicTreeCut", "expm", "ggforce", "ggplot2", "ggrepel", "ggridges", "GO_db", "igraph", "matrixStats", "plotly", "RColorBrewer", "rintrojs", "rlang", "rmarkdown", "S4Vectors", "scales", "shiny", "shinyAce", "shinycssloaders", "shinyWidgets", "SummarizedExperiment", "tidyr", "tippy", "viridis", "visNetwork"] + "depends": ["AnnotationDbi", "ComplexHeatmap", "ComplexUpset", "DESeq2", "DT", "GO_db", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "backbone", "bs4Dash", "circlize", "colorspace", "colourpicker", "dendextend", "dplyr", "dynamicTreeCut", "expm", "ggforce", "ggplot2", "ggrepel", "ggridges", "igraph", "matrixStats", "plotly", "rintrojs", "rlang", "rmarkdown", "scales", "shiny", "shinyAce", "shinyWidgets", "shinycssloaders", "tidyr", "tippy", "viridis", "visNetwork"] }, "GeneticsPed": { "name": "GeneticsPed", "version": "1.66.0", "sha256": "0cm65szy3nmkaxsrmv1qhpk8jsxma6b4y0v2nxg6hdqjn7z4zk43", - "depends": ["gdata", "genetics", "MASS"] + "depends": ["MASS", "gdata", "genetics"] }, "GenomAutomorphism": { "name": "GenomAutomorphism", "version": "1.6.0", "sha256": "13hflp7aglv8xadf1zgla8d0j1h4m4rrk0lyy0i0mxfhihl0wba8", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "data_table", "doParallel", "dplyr", "foreach", "GenomeInfoDb", "GenomicRanges", "IRanges", "matrixStats", "numbers", "S4Vectors", "XVector"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "XVector", "data_table", "doParallel", "dplyr", "foreach", "matrixStats", "numbers"] }, "GenomeInfoDb": { "name": "GenomeInfoDb", @@ -2533,49 +2545,49 @@ "name": "GenomicDataCommons", "version": "1.28.0", "sha256": "0jg4sa1lqn028y2ympb3x4s8yr7qa8ajrwqj2hhcl8zss3sx8gr2", - "depends": ["dplyr", "GenomicRanges", "httr", "IRanges", "jsonlite", "magrittr", "rappdirs", "readr", "rlang", "tibble", "tidyr", "xml2"] + "depends": ["GenomicRanges", "IRanges", "dplyr", "httr", "jsonlite", "magrittr", "rappdirs", "readr", "rlang", "tibble", "tidyr", "xml2"] }, "GenomicDistributions": { "name": "GenomicDistributions", "version": "1.12.0", "sha256": "0yicpl29qcwyzswaxqd50sa12lg8c9d5i7xgdf2m7jwskx6nx5hx", - "depends": ["Biostrings", "broom", "data_table", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "plyr", "reshape2", "scales"] + "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "broom", "data_table", "dplyr", "ggplot2", "plyr", "reshape2", "scales"] }, "GenomicFeatures": { "name": "GenomicFeatures", "version": "1.56.0", "sha256": "1r1d9g5vq5y946v2z2xgmfb31k0576nj8i0yg6xfj9y2a0a6akc5", - "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicRanges", "IRanges", "rtracklayer", "S4Vectors", "XVector"] + "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "XVector", "rtracklayer"] }, "GenomicFiles": { "name": "GenomicFiles", "version": "1.40.0", "sha256": "1b0n5aqvg6jb6rpikjzxndmcjxp31h6vhr1magzalqg7jmlvcv6i", - "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MatrixGenerics", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MatrixGenerics", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "rtracklayer"] }, "GenomicInteractionNodes": { "name": "GenomicInteractionNodes", "version": "1.8.0", "sha256": "1xkrmpsgqqsd470f4dgnbs5zb62qfrbpmzw97jsarri57pmqxy7a", - "depends": ["AnnotationDbi", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "GO_db", "graph", "IRanges", "RBGL", "S4Vectors"] + "depends": ["AnnotationDbi", "GO_db", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RBGL", "S4Vectors", "graph"] }, "GenomicInteractions": { "name": "GenomicInteractions", "version": "1.38.0", "sha256": "16aaaa4nr1y5ng1hzw87q950clid28iqf4gkypcpihg3cz69axxg", - "depends": ["Biobase", "BiocGenerics", "data_table", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gridExtra", "Gviz", "igraph", "InteractionSet", "IRanges", "Rsamtools", "rtracklayer", "S4Vectors", "stringr"] + "depends": ["Biobase", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "InteractionSet", "Rsamtools", "S4Vectors", "data_table", "dplyr", "ggplot2", "gridExtra", "igraph", "rtracklayer", "stringr"] }, "GenomicOZone": { "name": "GenomicOZone", "version": "1.18.0", "sha256": "0i130gwf2ifgm635dhshfmnj97jqlz5nkwb98jbgz4ciq7mpdwv8", - "depends": ["biomaRt", "Ckmeans_1d_dp", "GenomeInfoDb", "GenomicRanges", "ggbio", "ggplot2", "gridExtra", "IRanges", "lsr", "plyr", "Rdpack", "S4Vectors"] + "depends": ["Ckmeans_1d_dp", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rdpack", "S4Vectors", "biomaRt", "ggbio", "ggplot2", "gridExtra", "lsr", "plyr"] }, "GenomicPlot": { "name": "GenomicPlot", - "version": "1.2.2", - "sha256": "0s5slbkr6cpy5asl8v1fr914zgqg1q6gcwwf9nb0r8qh469c54pd", - "depends": ["BiocGenerics", "circlize", "ComplexHeatmap", "cowplot", "dplyr", "edgeR", "genomation", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggplotify", "ggpubr", "ggsci", "ggsignif", "IRanges", "plyranges", "RCAS", "Rsamtools", "rtracklayer", "scales", "tidyr", "txdbmaker", "VennDiagram", "viridis"] + "version": "1.2.4", + "sha256": "1r1fh28bmmpf7s7sm58xyxs7551d54avjafj2nq5d8gpfbwhy2js", + "depends": ["BiocGenerics", "ComplexHeatmap", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RCAS", "Rsamtools", "VennDiagram", "circlize", "cowplot", "dplyr", "edgeR", "genomation", "ggplot2", "ggplotify", "ggpubr", "ggsci", "ggsignif", "plyranges", "rtracklayer", "scales", "tidyr", "txdbmaker", "viridis"] }, "GenomicRanges": { "name": "GenomicRanges", @@ -2587,79 +2599,79 @@ "name": "GenomicScores", "version": "2.16.0", "sha256": "11sabicr2jm1cc9rdjr6vjqhf0gd9d7k04qlfhcdssvh02f957ia", - "depends": ["AnnotationHub", "Biobase", "BiocFileCache", "BiocGenerics", "BiocManager", "Biostrings", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "httr", "IRanges", "rhdf5", "S4Vectors", "XML"] + "depends": ["AnnotationHub", "Biobase", "BiocFileCache", "BiocGenerics", "BiocManager", "Biostrings", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "S4Vectors", "XML", "httr", "rhdf5"] }, "GenomicSuperSignature": { "name": "GenomicSuperSignature", "version": "1.12.0", "sha256": "0prplxp7l7hx6697a18kk2s5iyrdgpqwfh79n9lnala2h2q3vhs0", - "depends": ["Biobase", "BiocFileCache", "ComplexHeatmap", "dplyr", "flextable", "ggplot2", "ggpubr", "irlba", "plotly", "S4Vectors", "SummarizedExperiment"] + "depends": ["Biobase", "BiocFileCache", "ComplexHeatmap", "S4Vectors", "SummarizedExperiment", "dplyr", "flextable", "ggplot2", "ggpubr", "irlba", "plotly"] }, "GenomicTuples": { "name": "GenomicTuples", "version": "1.38.0", "sha256": "04inysn0aa2fmbnb01zk300x8qgz8bk4rhw68ka6ni7cbrn88ysa", - "depends": ["BiocGenerics", "data_table", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rcpp", "S4Vectors"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rcpp", "S4Vectors", "data_table"] }, "GeoDiff": { "name": "GeoDiff", "version": "1.10.0", "sha256": "17mm22cgq0259r15d49gv07igr8dpasylrnhsycx6mjg75zvz6jp", - "depends": ["Biobase", "GeomxTools", "lme4", "Matrix", "NanoStringNCTools", "plyr", "Rcpp", "RcppArmadillo", "robust", "roptim", "testthat", "withr"] + "depends": ["Biobase", "GeomxTools", "Matrix", "NanoStringNCTools", "Rcpp", "RcppArmadillo", "lme4", "plyr", "robust", "roptim", "testthat", "withr"] }, "GeoTcgaData": { "name": "GeoTcgaData", "version": "2.4.0", "sha256": "0hhhwnswjglxws75iqcn2sa66z9mr65n23p5i7c615n5qzrvcmw3", - "depends": ["cqn", "data_table", "plyr", "SummarizedExperiment", "topconfects"] + "depends": ["SummarizedExperiment", "cqn", "data_table", "plyr", "topconfects"] }, "GeomxTools": { "name": "GeomxTools", "version": "3.8.0", "sha256": "093900a8himdfh752ah2wk9x5iczri0f3djsfi2mwzkb7frxpj0c", - "depends": ["Biobase", "BiocGenerics", "data_table", "dplyr", "EnvStats", "GGally", "ggplot2", "lmerTest", "NanoStringNCTools", "readxl", "reshape2", "rjson", "rlang", "S4Vectors", "SeuratObject", "stringr"] + "depends": ["Biobase", "BiocGenerics", "EnvStats", "GGally", "NanoStringNCTools", "S4Vectors", "SeuratObject", "data_table", "dplyr", "ggplot2", "lmerTest", "readxl", "reshape2", "rjson", "rlang", "stringr"] }, "GladiaTOX": { "name": "GladiaTOX", "version": "1.20.0", "sha256": "0krgsih0w60sl0gw1rpff89piv3mf1sk86hmlqjxl6idag8n2jil", - "depends": ["brew", "data_table", "DBI", "ggplot2", "ggrepel", "numDeriv", "RColorBrewer", "RCurl", "RJSONIO", "RMariaDB", "RSQLite", "stringr", "tidyr", "XML", "xtable"] + "depends": ["DBI", "RColorBrewer", "RCurl", "RJSONIO", "RMariaDB", "RSQLite", "XML", "brew", "data_table", "ggplot2", "ggrepel", "numDeriv", "stringr", "tidyr", "xtable"] }, "Glimma": { "name": "Glimma", "version": "2.14.0", "sha256": "1d7rq3irp3n0fabfgjs2x2c9lscz70a38qf3wbxvi417qn7fpyla", - "depends": ["DESeq2", "edgeR", "htmlwidgets", "jsonlite", "limma", "S4Vectors", "SummarizedExperiment"] + "depends": ["DESeq2", "S4Vectors", "SummarizedExperiment", "edgeR", "htmlwidgets", "jsonlite", "limma"] }, "GloScope": { "name": "GloScope", - "version": "1.2.0", - "sha256": "0gdr5ws5p1xj4ip9xk10igrlwdr10x11j0wsfkr0f0y6352f2gm6", - "depends": ["BiocParallel", "FNN", "ggplot2", "MASS", "mclust", "mvnfast", "RANN", "rlang", "SingleCellExperiment"] + "version": "1.2.1", + "sha256": "02in9nq84gap80nyawvm434aqcc09idkfd3ihgnd3v8g6vx9sv3a", + "depends": ["BiocParallel", "FNN", "MASS", "RANN", "SingleCellExperiment", "ggplot2", "mclust", "mvnfast", "rlang"] }, "GlobalAncova": { "name": "GlobalAncova", "version": "4.22.0", "sha256": "0z71a5h4y740k0hx84aavfxl1kpshm4gqs7mh6zf895i2r761bqh", - "depends": ["annotate", "AnnotationDbi", "Biobase", "corpcor", "dendextend", "globaltest", "GSEABase", "VGAM"] + "depends": ["AnnotationDbi", "Biobase", "GSEABase", "VGAM", "annotate", "corpcor", "dendextend", "globaltest"] }, "GmicR": { "name": "GmicR", "version": "1.18.0", "sha256": "19zn4n21rprfhx8zmpcl7n5jyfhdz450b9dgw1ayrnnr0w4bf67h", - "depends": ["AnnotationDbi", "ape", "bnlearn", "Category", "data_table", "doParallel", "DT", "foreach", "GOstats", "gRain", "gRbase", "GSEABase", "org_Hs_eg_db", "org_Mm_eg_db", "reshape2", "shiny", "WGCNA"] + "depends": ["AnnotationDbi", "Category", "DT", "GOstats", "GSEABase", "WGCNA", "ape", "bnlearn", "data_table", "doParallel", "foreach", "gRain", "gRbase", "org_Hs_eg_db", "org_Mm_eg_db", "reshape2", "shiny"] }, "GrafGen": { "name": "GrafGen", "version": "1.0.0", "sha256": "180ag0wvbhmd1vsza5lfphdx8d2phcfa4lzisi5fbk6n4195g830", - "depends": ["cowplot", "dplyr", "GenomicRanges", "ggplot2", "ggpubr", "plotly", "RColorBrewer", "rlang", "scales", "shiny", "stringr", "zlibbioc"] + "depends": ["GenomicRanges", "RColorBrewer", "cowplot", "dplyr", "ggplot2", "ggpubr", "plotly", "rlang", "scales", "shiny", "stringr", "zlibbioc"] }, "GraphAT": { "name": "GraphAT", "version": "1.76.0", "sha256": "0mxsgd08qd7fb28gbbgx21vvd5sf3nn0ymrlshsdpsdya5vmmv3d", - "depends": ["graph", "MCMCpack"] + "depends": ["MCMCpack", "graph"] }, "GraphAlignment": { "name": "GraphAlignment", @@ -2671,31 +2683,31 @@ "name": "GraphPAC", "version": "1.46.0", "sha256": "0dy3yn6vhgbvn0ygrkznhaylhaslyrnmlw5kmq0inqvl9y2yl277", - "depends": ["igraph", "iPAC", "RMallow", "TSP"] + "depends": ["RMallow", "TSP", "iPAC", "igraph"] }, "GreyListChIP": { "name": "GreyListChIP", "version": "1.36.0", "sha256": "0dj3pcycnjll8z1r61l6gnjvq74w2l0glrx6hqwcqvk5j7ixcdz7", - "depends": ["BSgenome", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "MASS", "Rsamtools", "rtracklayer", "SummarizedExperiment"] + "depends": ["BSgenome", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "MASS", "Rsamtools", "SummarizedExperiment", "rtracklayer"] }, "Guitar": { "name": "Guitar", "version": "2.20.0", "sha256": "1agr3n787dqly09wy274v9dg52vdb0n0z3gdh2zsbklkbmayqxqy", - "depends": ["AnnotationDbi", "dplyr", "GenomicFeatures", "GenomicRanges", "ggplot2", "knitr", "magrittr", "rtracklayer"] + "depends": ["AnnotationDbi", "GenomicFeatures", "GenomicRanges", "dplyr", "ggplot2", "knitr", "magrittr", "rtracklayer"] }, "Gviz": { "name": "Gviz", "version": "1.48.0", "sha256": "07w37kq6zx99z980if4brwmw25vjgvxd8xj3l1893idbdf70py0p", - "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "biomaRt", "Biostrings", "biovizBase", "BSgenome", "digest", "ensembldb", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "lattice", "latticeExtra", "matrixStats", "RColorBrewer", "Rsamtools", "rtracklayer", "S4Vectors", "XVector"] + "depends": ["AnnotationDbi", "BSgenome", "Biobase", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "XVector", "biomaRt", "biovizBase", "digest", "ensembldb", "lattice", "latticeExtra", "matrixStats", "rtracklayer"] }, "HDF5Array": { "name": "HDF5Array", - "version": "1.32.0", - "sha256": "0j8rz99qw1rism3f5cv7rksccijmnchrkw7s9shxk0528f6dj6p1", - "depends": ["BiocGenerics", "DelayedArray", "IRanges", "Matrix", "rhdf5", "rhdf5filters", "Rhdf5lib", "S4Arrays", "S4Vectors"] + "version": "1.32.1", + "sha256": "1cfm15zwfp1gxgrkknyvdaqb5fm27s2nyjrhxwkrbn32yfdrgdnz", + "depends": ["BiocGenerics", "DelayedArray", "IRanges", "Matrix", "Rhdf5lib", "S4Arrays", "S4Vectors", "rhdf5", "rhdf5filters"] }, "HDTD": { "name": "HDTD", @@ -2719,13 +2731,13 @@ "name": "HERON", "version": "1.2.0", "sha256": "0z8bsvsj1xa4r93y244381yckqk4mc39ij3pabcbn2mgbihcs94d", - "depends": ["cluster", "data_table", "GenomicRanges", "harmonicmeanp", "IRanges", "limma", "Matrix", "matrixStats", "metap", "S4Vectors", "spdep", "SummarizedExperiment"] + "depends": ["GenomicRanges", "IRanges", "Matrix", "S4Vectors", "SummarizedExperiment", "cluster", "data_table", "harmonicmeanp", "limma", "matrixStats", "metap", "spdep"] }, "HGC": { "name": "HGC", "version": "1.12.0", "sha256": "10g4lmhs8brfrci6n28iarzwm4dlvsbysssv2n25l1rp8wnl2sip", - "depends": ["ape", "dendextend", "dplyr", "ggplot2", "Matrix", "mclust", "patchwork", "RANN", "Rcpp", "RcppEigen"] + "depends": ["Matrix", "RANN", "Rcpp", "RcppEigen", "ape", "dendextend", "dplyr", "ggplot2", "mclust", "patchwork"] }, "HIBAG": { "name": "HIBAG", @@ -2737,7 +2749,7 @@ "name": "HIPPO", "version": "1.16.0", "sha256": "1fp2jxi5xlf3archv3z8gnrc3rsh12vkprk6xhdffw9n2mqap56c", - "depends": ["dplyr", "ggplot2", "ggrepel", "gridExtra", "irlba", "magrittr", "Matrix", "reshape2", "rlang", "Rtsne", "SingleCellExperiment", "umap"] + "depends": ["Matrix", "Rtsne", "SingleCellExperiment", "dplyr", "ggplot2", "ggrepel", "gridExtra", "irlba", "magrittr", "reshape2", "rlang", "umap"] }, "HIREewas": { "name": "HIREewas", @@ -2761,7 +2773,7 @@ "name": "HPiP", "version": "1.10.0", "sha256": "1kjsa8q70zvmjqcvrpcijf7w6c5k21ysdd8pd8zsxwkvck174gih", - "depends": ["caret", "corrplot", "dplyr", "ggplot2", "httr", "igraph", "magrittr", "MCL", "pROC", "protr", "PRROC", "purrr", "readr", "stringr", "tibble", "tidyr"] + "depends": ["MCL", "PRROC", "caret", "corrplot", "dplyr", "ggplot2", "httr", "igraph", "magrittr", "pROC", "protr", "purrr", "readr", "stringr", "tibble", "tidyr"] }, "HTSFilter": { "name": "HTSFilter", @@ -2773,25 +2785,25 @@ "name": "HTSeqGenie", "version": "4.34.0", "sha256": "1np04hiijz9jdxvlg1mk74w19ma32qrdjb9bc5cscrs1lgw78idh", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "Cairo", "chipseq", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "gmapR", "hwriter", "IRanges", "pwalign", "Rsamtools", "rtracklayer", "S4Vectors", "ShortRead", "SummarizedExperiment", "VariantAnnotation", "VariantTools"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "Cairo", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "VariantAnnotation", "VariantTools", "chipseq", "gmapR", "hwriter", "pwalign", "rtracklayer"] }, "Harman": { "name": "Harman", "version": "1.32.0", "sha256": "1b6w8wrlsvxpzbsp4vkrpfvx4icbvncl11q4j773knz5q0q9l6q0", - "depends": ["Ckmeans_1d_dp", "matrixStats", "Rcpp"] + "depends": ["Ckmeans_1d_dp", "Rcpp", "matrixStats"] }, "HarmonizR": { "name": "HarmonizR", "version": "1.2.0", "sha256": "1bjyfxhlsslns7jiaaivld56w9j1gavdnrbciil6kiqs2q63fpj9", - "depends": ["doParallel", "foreach", "janitor", "limma", "plyr", "seriation", "SummarizedExperiment", "sva"] + "depends": ["SummarizedExperiment", "doParallel", "foreach", "janitor", "limma", "plyr", "seriation", "sva"] }, "Harshlight": { "name": "Harshlight", "version": "1.76.0", "sha256": "1nqi2ad9hnm6j8hn8f6xp9zav6rsa5wlzb2z5fjnm9q4xbjblnjl", - "depends": ["affy", "altcdfenvs", "Biobase"] + "depends": ["Biobase", "affy", "altcdfenvs"] }, "Heatplus": { "name": "Heatplus", @@ -2803,7 +2815,7 @@ "name": "HelloRanges", "version": "1.30.0", "sha256": "0idv6aravk0jj8p33kvc620p60ciyrkd293ba034g6j5921ym6gx", - "depends": ["BiocGenerics", "BiocIO", "Biostrings", "BSgenome", "docopt", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["BSgenome", "BiocGenerics", "BiocIO", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "docopt", "rtracklayer"] }, "Herper": { "name": "Herper", @@ -2815,49 +2827,49 @@ "name": "HiCBricks", "version": "1.22.0", "sha256": "0hbmy7vhg63n6r2lv8gvrlsj4xgqbf8mvaci2i4kpc9327jny2nn", - "depends": ["BiocParallel", "curl", "data_table", "digest", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "jsonlite", "R_utils", "R6", "RColorBrewer", "readr", "reshape2", "rhdf5", "S4Vectors", "scales", "stringr", "tibble", "viridis"] + "depends": ["BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "R6", "RColorBrewer", "R_utils", "S4Vectors", "curl", "data_table", "digest", "ggplot2", "jsonlite", "readr", "reshape2", "rhdf5", "scales", "stringr", "tibble", "viridis"] }, "HiCDCPlus": { "name": "HiCDCPlus", "version": "1.12.0", "sha256": "0x95v5h1qjks87gmis7p0y4bmj7xalqbgny0qfkaw8s561fhx3j9", - "depends": ["bbmle", "Biostrings", "BSgenome", "data_table", "dplyr", "GenomeInfoDb", "GenomicInteractions", "GenomicRanges", "InteractionSet", "IRanges", "MASS", "pscl", "R_utils", "Rcpp", "rlang", "rtracklayer", "S4Vectors", "tibble", "tidyr"] + "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicInteractions", "GenomicRanges", "IRanges", "InteractionSet", "MASS", "R_utils", "Rcpp", "S4Vectors", "bbmle", "data_table", "dplyr", "pscl", "rlang", "rtracklayer", "tibble", "tidyr"] }, "HiCDOC": { "name": "HiCDOC", "version": "1.6.0", "sha256": "1p8n3yljzlk8ic47101nw8d6dmxgadacgfh6pknkpxgk6vlcq6kh", - "depends": ["BiocGenerics", "BiocParallel", "cowplot", "data_table", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gridExtra", "gtools", "InteractionSet", "multiHiCcompare", "pbapply", "Rcpp", "S4Vectors", "SummarizedExperiment", "zlibbioc"] + "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "InteractionSet", "Rcpp", "S4Vectors", "SummarizedExperiment", "cowplot", "data_table", "ggplot2", "gridExtra", "gtools", "multiHiCcompare", "pbapply", "zlibbioc"] }, "HiCExperiment": { "name": "HiCExperiment", "version": "1.4.0", "sha256": "0wz08jwljv8zc658xl55rwwsfvy3lc3qg9dw7d41cw37wh40dkw1", - "depends": ["BiocGenerics", "BiocIO", "BiocParallel", "dplyr", "GenomeInfoDb", "GenomicRanges", "InteractionSet", "IRanges", "Matrix", "rhdf5", "S4Vectors", "strawr", "vroom"] + "depends": ["BiocGenerics", "BiocIO", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "Matrix", "S4Vectors", "dplyr", "rhdf5", "strawr", "vroom"] }, "HiCcompare": { "name": "HiCcompare", "version": "1.26.0", "sha256": "1rpdqij0lvs9cyl1z5lgw91332km1nb8053kk432bais9382jkxc", - "depends": ["BiocParallel", "data_table", "dplyr", "GenomicRanges", "ggplot2", "gridExtra", "gtools", "InteractionSet", "IRanges", "KernSmooth", "mgcv", "pheatmap", "rhdf5", "S4Vectors"] + "depends": ["BiocParallel", "GenomicRanges", "IRanges", "InteractionSet", "KernSmooth", "S4Vectors", "data_table", "dplyr", "ggplot2", "gridExtra", "gtools", "mgcv", "pheatmap", "rhdf5"] }, "HiContacts": { "name": "HiContacts", "version": "1.6.0", "sha256": "18rfv9z03dqdqifrxqv1l3m9s8nykygd9y6d7pya2sdfx8f0hgza", - "depends": ["BiocGenerics", "BiocIO", "BiocParallel", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "ggrastr", "HiCExperiment", "InteractionSet", "IRanges", "Matrix", "readr", "RSpectra", "S4Vectors", "scales", "stringr", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["BiocGenerics", "BiocIO", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "HiCExperiment", "IRanges", "InteractionSet", "Matrix", "RSpectra", "S4Vectors", "SummarizedExperiment", "dplyr", "ggplot2", "ggrastr", "readr", "scales", "stringr", "tibble", "tidyr"] }, "HiCool": { "name": "HiCool", "version": "1.4.0", "sha256": "06b26szb23mngcfx5xwdw6kz10gqjs69py0iz5piia4a7vppk8zk", - "depends": ["basilisk", "BiocIO", "dplyr", "GenomicRanges", "HiCExperiment", "InteractionSet", "IRanges", "plotly", "reticulate", "rmarkdown", "rmdformats", "S4Vectors", "sessioninfo", "stringr", "vroom"] + "depends": ["BiocIO", "GenomicRanges", "HiCExperiment", "IRanges", "InteractionSet", "S4Vectors", "basilisk", "dplyr", "plotly", "reticulate", "rmarkdown", "rmdformats", "sessioninfo", "stringr", "vroom"] }, "HiLDA": { "name": "HiLDA", "version": "1.18.0", "sha256": "1v5gvb84q09l8i7f1d4q7zpyxlzaq5bqifia706d60700wvfan29", - "depends": ["abind", "BiocGenerics", "Biostrings", "BSgenome_Hsapiens_UCSC_hg19", "cowplot", "forcats", "GenomicFeatures", "GenomicRanges", "ggplot2", "R2jags", "Rcpp", "S4Vectors", "stringr", "tidyr", "TxDb_Hsapiens_UCSC_hg19_knownGene", "XVector"] + "depends": ["BSgenome_Hsapiens_UCSC_hg19", "BiocGenerics", "Biostrings", "GenomicFeatures", "GenomicRanges", "R2jags", "Rcpp", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "XVector", "abind", "cowplot", "forcats", "ggplot2", "stringr", "tidyr"] }, "HiTC": { "name": "HiTC", @@ -2869,13 +2881,13 @@ "name": "HicAggR", "version": "1.0.2", "sha256": "1lpf7m3rsm3ng0i6gqyl6l3jvawnl8wcfjl0gkxz604bwszjvhb3", - "depends": ["BiocGenerics", "BiocParallel", "checkmate", "data_table", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gridExtra", "InteractionSet", "IRanges", "Matrix", "purrr", "reshape", "rhdf5", "rlang", "rtracklayer", "S4Vectors", "strawr", "stringr", "tibble", "tidyr", "withr"] + "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "Matrix", "S4Vectors", "checkmate", "data_table", "dplyr", "ggplot2", "gridExtra", "purrr", "reshape", "rhdf5", "rlang", "rtracklayer", "strawr", "stringr", "tibble", "tidyr", "withr"] }, "HilbertCurve": { "name": "HilbertCurve", "version": "1.34.0", "sha256": "0kka2haa84kv2xwqny0ii0mfq0gjdh4vv1zkjk0lbqszqk1h6hab", - "depends": ["circlize", "GenomicRanges", "HilbertVis", "IRanges", "png", "polylabelr"] + "depends": ["GenomicRanges", "HilbertVis", "IRanges", "circlize", "png", "polylabelr"] }, "HilbertVis": { "name": "HilbertVis", @@ -2893,31 +2905,31 @@ "name": "HubPub", "version": "1.12.0", "sha256": "02xqw3xkhzk2fxx4l1h5gl5v0diamssr1dw9x871glxjl4kw07xm", - "depends": ["available", "aws_s3", "BiocManager", "biocthis", "dplyr", "fs", "usethis"] + "depends": ["BiocManager", "available", "aws_s3", "biocthis", "dplyr", "fs", "usethis"] }, "HumanTranscriptomeCompendium": { "name": "HumanTranscriptomeCompendium", "version": "1.20.0", "sha256": "1y46zsl08k6sdih8psar85fyc5dfk2vraxmfry70zx57vbjbin92", - "depends": ["BiocManager", "S4Vectors", "shiny", "ssrch", "SummarizedExperiment"] + "depends": ["BiocManager", "S4Vectors", "SummarizedExperiment", "shiny", "ssrch"] }, "HybridExpress": { "name": "HybridExpress", "version": "1.0.0", "sha256": "1cpvw6ycbh60wn39ws0l6hrgy9x97glb56f87sn2qg9li6hxjshh", - "depends": ["BiocParallel", "ComplexHeatmap", "DESeq2", "ggplot2", "patchwork", "RColorBrewer", "rlang", "SummarizedExperiment"] + "depends": ["BiocParallel", "ComplexHeatmap", "DESeq2", "RColorBrewer", "SummarizedExperiment", "ggplot2", "patchwork", "rlang"] }, "HybridMTest": { "name": "HybridMTest", "version": "1.48.0", "sha256": "0fh0v29fpwzramqnbxmzpmgiziwswdx38734g2lx303b0blkbv7j", - "depends": ["Biobase", "fdrtool", "MASS", "survival"] + "depends": ["Biobase", "MASS", "fdrtool", "survival"] }, "IFAA": { "name": "IFAA", "version": "1.6.0", "sha256": "1y2vsz14d5a22m21n7zmfm64ffvh8hq0hkwnr44ifysy4zfmjg0x", - "depends": ["DescTools", "doParallel", "doRNG", "foreach", "glmnet", "HDCI", "mathjaxr", "Matrix", "MatrixExtra", "parallelly", "S4Vectors", "stringr", "SummarizedExperiment"] + "depends": ["DescTools", "HDCI", "Matrix", "MatrixExtra", "S4Vectors", "SummarizedExperiment", "doParallel", "doRNG", "foreach", "glmnet", "mathjaxr", "parallelly", "stringr"] }, "IHW": { "name": "IHW", @@ -2929,19 +2941,19 @@ "name": "ILoReg", "version": "1.14.0", "sha256": "1zw6m2a5jr77mbjbzc966v98pdfw2s0sg1sqssdf7qsb0izj10b0", - "depends": ["aricode", "cluster", "cowplot", "dendextend", "DescTools", "doRNG", "doSNOW", "dplyr", "fastcluster", "foreach", "ggplot2", "LiblineaR", "Matrix", "parallelDist", "pheatmap", "plyr", "reshape2", "RSpectra", "Rtsne", "S4Vectors", "scales", "SingleCellExperiment", "SparseM", "SummarizedExperiment", "umap"] + "depends": ["DescTools", "LiblineaR", "Matrix", "RSpectra", "Rtsne", "S4Vectors", "SingleCellExperiment", "SparseM", "SummarizedExperiment", "aricode", "cluster", "cowplot", "dendextend", "doRNG", "doSNOW", "dplyr", "fastcluster", "foreach", "ggplot2", "parallelDist", "pheatmap", "plyr", "reshape2", "scales", "umap"] }, "IMAS": { "name": "IMAS", "version": "1.28.0", "sha256": "1n55qs4v5x7clpbhlrby5dcz9xldqrsfp6g4k6g0s1g0lk2rplqm", - "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "doParallel", "foreach", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggfortify", "ggplot2", "gridExtra", "IRanges", "IVAS", "lattice", "lme4", "Matrix", "Rsamtools", "S4Vectors", "survival"] + "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "IVAS", "Matrix", "Rsamtools", "S4Vectors", "doParallel", "foreach", "ggfortify", "ggplot2", "gridExtra", "lattice", "lme4", "survival"] }, "IMMAN": { "name": "IMMAN", "version": "1.24.0", "sha256": "1yn0p53ar9b9g5d2gfyd70cp7vm69fsgn8av9lvc6qyac18w9y5j", - "depends": ["igraph", "pwalign", "seqinr", "STRINGdb"] + "depends": ["STRINGdb", "igraph", "pwalign", "seqinr"] }, "IMPCdata": { "name": "IMPCdata", @@ -2965,19 +2977,19 @@ "name": "INSPEcT", "version": "1.34.0", "sha256": "0147ss218d3dnqbdgfwsg24an63qln8l5kkv0y4hm56bncdrm1i0", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "DESeq2", "deSolve", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "KernSmooth", "plgem", "pROC", "readxl", "rootSolve", "Rsamtools", "rtracklayer", "S4Vectors", "shiny", "SummarizedExperiment", "TxDb_Mmusculus_UCSC_mm9_knownGene"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "KernSmooth", "Rsamtools", "S4Vectors", "SummarizedExperiment", "TxDb_Mmusculus_UCSC_mm9_knownGene", "deSolve", "pROC", "plgem", "readxl", "rootSolve", "rtracklayer", "shiny"] }, "INTACT": { "name": "INTACT", "version": "1.4.0", "sha256": "1r1v8cvms0dyjf0f5f9v6qp7hz0rfb2yfbckvvrkq26yjwfbmlaa", - "depends": ["bdsmatrix", "numDeriv", "SQUAREM", "tidyr"] + "depends": ["SQUAREM", "bdsmatrix", "numDeriv", "tidyr"] }, "IONiseR": { "name": "IONiseR", "version": "2.28.0", "sha256": "1ihski4akl70v6kq03di6w1pz63dx6rxgmyjkm0dv0nhgkmrza22", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "bit64", "dplyr", "ggplot2", "magrittr", "rhdf5", "ShortRead", "stringr", "tibble", "tidyr", "XVector"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "ShortRead", "XVector", "bit64", "dplyr", "ggplot2", "magrittr", "rhdf5", "stringr", "tibble", "tidyr"] }, "IPO": { "name": "IPO", @@ -2987,21 +2999,21 @@ }, "IRanges": { "name": "IRanges", - "version": "2.38.0", - "sha256": "047688hrxyg2hxd1wbywxqnvxk1622xlldzana9g5hhxg9lldrk2", + "version": "2.38.1", + "sha256": "07q9j00rvgdbv582p01nxc99j0gfx4fsarpl1w1fjx5nb8y86k4v", "depends": ["BiocGenerics", "S4Vectors"] }, "ISAnalytics": { "name": "ISAnalytics", "version": "1.14.0", "sha256": "05khils483a1d64ikg4j5vl3rcwsjgik04b75a6rr3crkdba7fl4", - "depends": ["bslib", "datamods", "dplyr", "DT", "forcats", "fs", "ggplot2", "ggrepel", "glue", "lifecycle", "lubridate", "purrr", "readr", "readxl", "rlang", "shiny", "shinyWidgets", "stringr", "tibble", "tidyr"] + "depends": ["DT", "bslib", "datamods", "dplyr", "forcats", "fs", "ggplot2", "ggrepel", "glue", "lifecycle", "lubridate", "purrr", "readr", "readxl", "rlang", "shiny", "shinyWidgets", "stringr", "tibble", "tidyr"] }, "ISLET": { "name": "ISLET", "version": "1.6.0", "sha256": "0vhpxr0civdhcxiy39aycir8a68vgrydv3nx1p9rn4hhpw7dq7gi", - "depends": ["abind", "BiocGenerics", "BiocParallel", "lme4", "Matrix", "nnls", "purrr", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocParallel", "Matrix", "SummarizedExperiment", "abind", "lme4", "nnls", "purrr"] }, "ISoLDE": { "name": "ISoLDE", @@ -3013,19 +3025,19 @@ "name": "ITALICS", "version": "2.64.0", "sha256": "06h6iqrqzlcj4hyhj1ikl9isr3ls1pph49v5n7cp87czinr0nd3s", - "depends": ["affxparser", "DBI", "GLAD", "ITALICSData", "oligo", "oligoClasses", "pd_mapping50k_xba240"] + "depends": ["DBI", "GLAD", "ITALICSData", "affxparser", "oligo", "oligoClasses", "pd_mapping50k_xba240"] }, "IVAS": { "name": "IVAS", "version": "2.24.0", "sha256": "15l0qga9a4q79y1r3pwcv3c0m0qpyjay3fvv7b4zwx7hvmkjfy1b", - "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "doParallel", "foreach", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggfortify", "ggplot2", "IRanges", "lme4", "Matrix", "S4Vectors"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "doParallel", "foreach", "ggfortify", "ggplot2", "lme4"] }, "IWTomics": { "name": "IWTomics", "version": "1.28.0", "sha256": "0ksmpa6f5zlgdhma1vxsfd64g7jhisffg5sbnz2xhf7faz14gc08", - "depends": ["fda", "GenomicRanges", "gtable", "IRanges", "KernSmooth", "S4Vectors"] + "depends": ["GenomicRanges", "IRanges", "KernSmooth", "S4Vectors", "fda", "gtable"] }, "Icens": { "name": "Icens", @@ -3043,19 +3055,19 @@ "name": "IgGeneUsage", "version": "1.18.0", "sha256": "0b2bndc36yd0a4yi2z3870g1b9c1ddpwp44gl42ysk29qwis2yi6", - "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "reshape2", "rstan", "rstantools", "StanHeaders", "SummarizedExperiment", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "SummarizedExperiment", "reshape2", "rstan", "rstantools", "tidyr"] }, "InPAS": { "name": "InPAS", "version": "2.12.0", "sha256": "05hzd8rixqz5d86d4gv7wh68kfbiynbp2xij9r2nj0h90av0h95b", - "depends": ["AnnotationDbi", "batchtools", "Biobase", "Biostrings", "BSgenome", "cleanUpdTSeq", "depmixS4", "dplyr", "flock", "future", "future_apply", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "limma", "magrittr", "parallelly", "plyranges", "preprocessCore", "readr", "reshape2", "RSQLite", "S4Vectors"] + "depends": ["AnnotationDbi", "BSgenome", "Biobase", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "batchtools", "cleanUpdTSeq", "depmixS4", "dplyr", "flock", "future", "future_apply", "ggplot2", "limma", "magrittr", "parallelly", "plyranges", "preprocessCore", "readr", "reshape2"] }, "InTAD": { "name": "InTAD", "version": "1.24.0", "sha256": "16npavms8qxccldpik27qbsv3w0drcjr132nz2ky2cvi01bcp4l2", - "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "ggplot2", "ggpubr", "IRanges", "mclust", "MultiAssayExperiment", "qvalue", "rtracklayer", "S4Vectors", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "ggplot2", "ggpubr", "mclust", "qvalue", "rtracklayer"] }, "Informeasure": { "name": "Informeasure", @@ -3067,19 +3079,19 @@ "name": "IntEREst", "version": "1.28.0", "sha256": "0i6q422vhf94ka0v69hs5irg506wb467rwnnn12xvsfyq54ak4dm", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "DBI", "DESeq2", "DEXSeq", "edgeR", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "IRanges", "RMySQL", "Rsamtools", "S4Vectors", "seqinr", "seqLogo", "SummarizedExperiment", "txdbmaker"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "DBI", "DESeq2", "DEXSeq", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "IRanges", "RMySQL", "Rsamtools", "S4Vectors", "SummarizedExperiment", "edgeR", "seqLogo", "seqinr", "txdbmaker"] }, "InterCellar": { "name": "InterCellar", "version": "2.10.0", "sha256": "020z08v199psgcl4z3kbwl1zgp10iwn5n60c4bq555fz6nbjb56n", - "depends": ["biomaRt", "circlize", "colorspace", "colourpicker", "ComplexHeatmap", "config", "data_table", "dendextend", "dplyr", "DT", "factoextra", "fmsb", "fs", "ggplot2", "golem", "htmltools", "htmlwidgets", "igraph", "plotly", "plyr", "readxl", "rlang", "scales", "shiny", "shinyalert", "shinycssloaders", "shinydashboard", "shinyFeedback", "shinyFiles", "signal", "tibble", "tidyr", "umap", "visNetwork", "wordcloud2"] + "depends": ["ComplexHeatmap", "DT", "biomaRt", "circlize", "colorspace", "colourpicker", "config", "data_table", "dendextend", "dplyr", "factoextra", "fmsb", "fs", "ggplot2", "golem", "htmltools", "htmlwidgets", "igraph", "plotly", "plyr", "readxl", "rlang", "scales", "shiny", "shinyFeedback", "shinyFiles", "shinyalert", "shinycssloaders", "shinydashboard", "signal", "tibble", "tidyr", "umap", "visNetwork", "wordcloud2"] }, "InterMineR": { "name": "InterMineR", "version": "1.26.0", "sha256": "0isw4rg89139xmrcfb9r7jc3z8jj1my4radhinah0vad2cwb36l0", - "depends": ["Biostrings", "GenomicRanges", "httr", "igraph", "IRanges", "RCurl", "RJSONIO", "S4Vectors", "sqldf", "SummarizedExperiment", "XML", "xml2"] + "depends": ["Biostrings", "GenomicRanges", "IRanges", "RCurl", "RJSONIO", "S4Vectors", "SummarizedExperiment", "XML", "httr", "igraph", "sqldf", "xml2"] }, "InteractionSet": { "name": "InteractionSet", @@ -3091,7 +3103,7 @@ "name": "InteractiveComplexHeatmap", "version": "1.12.0", "sha256": "0sfhr3f7fdw9zgw2wn7dhk1zwmhn3k3iy8xa0j9dv7bpa2mcvw1b", - "depends": ["clisymbols", "ComplexHeatmap", "digest", "fontawesome", "GetoptLong", "htmltools", "IRanges", "jsonlite", "kableExtra", "RColorBrewer", "S4Vectors", "shiny", "svglite"] + "depends": ["ComplexHeatmap", "GetoptLong", "IRanges", "RColorBrewer", "S4Vectors", "clisymbols", "digest", "fontawesome", "htmltools", "jsonlite", "kableExtra", "shiny", "svglite"] }, "IntramiRExploreR": { "name": "IntramiRExploreR", @@ -3101,15 +3113,15 @@ }, "IsoBayes": { "name": "IsoBayes", - "version": "1.2.0", - "sha256": "19vga38f9srbsb6vglb0ni33cfrzrn5z94d0v4apnki4r6plp2k2", - "depends": ["data_table", "doParallel", "doRNG", "foreach", "ggplot2", "glue", "HDInterval", "iterators", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment"] + "version": "1.2.6", + "sha256": "146xkxzaxsaj6rdx15jrrm3k5n7k58x7jvx3cmyc03zvr25yssm7", + "depends": ["HDInterval", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment", "data_table", "doParallel", "doRNG", "foreach", "ggplot2", "glue", "iterators"] }, "IsoCorrectoR": { "name": "IsoCorrectoR", "version": "1.22.0", "sha256": "19h5wndzj3sgvhb7blx07pjammh05kwp5vwjv0drvlj829pqhkia", - "depends": ["dplyr", "magrittr", "pracma", "quadprog", "readr", "readxl", "stringr", "tibble", "WriteXLS"] + "depends": ["WriteXLS", "dplyr", "magrittr", "pracma", "quadprog", "readr", "readxl", "stringr", "tibble"] }, "IsoCorrectoRGUI": { "name": "IsoCorrectoRGUI", @@ -3121,7 +3133,7 @@ "name": "IsoformSwitchAnalyzeR", "version": "2.4.0", "sha256": "0mmxyq1r4kq1igj108pr0r9215hwmyph5svx0djd460knak24y6z", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "DBI", "DEXSeq", "dplyr", "edgeR", "futile_logger", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gridExtra", "IRanges", "limma", "magrittr", "pfamAnalyzeR", "plyr", "pwalign", "RColorBrewer", "RCurl", "readr", "reshape2", "rtracklayer", "S4Vectors", "satuRn", "stringr", "SummarizedExperiment", "sva", "tibble", "tidyr", "tximeta", "tximport", "VennDiagram", "XVector"] + "depends": ["BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "DBI", "DEXSeq", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "RCurl", "S4Vectors", "SummarizedExperiment", "VennDiagram", "XVector", "dplyr", "edgeR", "futile_logger", "ggplot2", "gridExtra", "limma", "magrittr", "pfamAnalyzeR", "plyr", "pwalign", "readr", "reshape2", "rtracklayer", "satuRn", "stringr", "sva", "tibble", "tidyr", "tximeta", "tximport"] }, "KBoost": { "name": "KBoost", @@ -3137,21 +3149,21 @@ }, "KEGGREST": { "name": "KEGGREST", - "version": "1.44.0", - "sha256": "1xvi11ywr3vj2m8fpqblzg2pmj1vsc0dm8fgggv6w96l6x6sfyf0", + "version": "1.44.1", + "sha256": "09qdsdbz5ha3b2fafwv80n6pdajjgsc5w52n1dy6ds41vxgf0jis", "depends": ["Biostrings", "httr", "png"] }, "KEGGgraph": { "name": "KEGGgraph", "version": "1.64.0", "sha256": "0lffqbvwmfjbw5ymxr969znvb53hbqfgq1zwffsc768rv3h4c6p7", - "depends": ["graph", "RCurl", "Rgraphviz", "XML"] + "depends": ["RCurl", "Rgraphviz", "XML", "graph"] }, "KEGGlincs": { "name": "KEGGlincs", "version": "1.30.0", "sha256": "0jxa42ax4r991vc2cqjdzyfwknf5929xyvlpimra3fbpgpp8sjpg", - "depends": ["AnnotationDbi", "gtools", "hgu133a_db", "httr", "igraph", "KEGGgraph", "KEGGREST", "KOdata", "org_Hs_eg_db", "plyr", "RJSONIO", "XML"] + "depends": ["AnnotationDbi", "KEGGREST", "KEGGgraph", "KOdata", "RJSONIO", "XML", "gtools", "hgu133a_db", "httr", "igraph", "org_Hs_eg_db", "plyr"] }, "KinSwingR": { "name": "KinSwingR", @@ -3163,13 +3175,13 @@ "name": "KnowSeq", "version": "1.18.0", "sha256": "1iv6cghkq0qi0d2fsj9x74jzvf1zrrknc3kx1b1xpa7lc0x11ym4", - "depends": ["caret", "cqn", "e1071", "edgeR", "ggplot2", "gridExtra", "Hmisc", "httr", "jsonlite", "kernlab", "limma", "praznik", "R_utils", "randomForest", "reshape2", "rlist", "rmarkdown", "stringr", "sva", "XML"] + "depends": ["Hmisc", "R_utils", "XML", "caret", "cqn", "e1071", "edgeR", "ggplot2", "gridExtra", "httr", "jsonlite", "kernlab", "limma", "praznik", "randomForest", "reshape2", "rlist", "rmarkdown", "stringr", "sva"] }, "LACE": { "name": "LACE", "version": "2.8.0", "sha256": "07izkiljmq0rbrijsgv45qvpp4zmaw78qqavzbvaw729pl172haz", - "depends": ["biomaRt", "bsplus", "callr", "configr", "curl", "data_table", "data_tree", "doParallel", "dplyr", "DT", "forcats", "foreach", "fs", "ggplot2", "htmltools", "htmlwidgets", "igraph", "jsonlite", "logr", "Matrix", "purrr", "RColorBrewer", "readr", "Rfast", "shiny", "shinyBS", "shinydashboard", "shinyFiles", "shinyjs", "shinythemes", "shinyvalidate", "sortable", "stringi", "stringr", "SummarizedExperiment", "svglite", "tidyr"] + "depends": ["DT", "Matrix", "RColorBrewer", "Rfast", "SummarizedExperiment", "biomaRt", "bsplus", "callr", "configr", "curl", "data_table", "data_tree", "doParallel", "dplyr", "forcats", "foreach", "fs", "ggplot2", "htmltools", "htmlwidgets", "igraph", "jsonlite", "logr", "purrr", "readr", "shiny", "shinyBS", "shinyFiles", "shinydashboard", "shinyjs", "shinythemes", "shinyvalidate", "sortable", "stringi", "stringr", "svglite", "tidyr"] }, "LBE": { "name": "LBE", @@ -3193,7 +3205,7 @@ "name": "LOLA", "version": "1.34.0", "sha256": "1i5axxzdwl6j1cgxfdfnaisv6bj4qbrhic5ba2k3wbhkgr144xcc", - "depends": ["BiocGenerics", "data_table", "GenomicRanges", "IRanges", "reshape2", "S4Vectors"] + "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "data_table", "reshape2"] }, "LPE": { "name": "LPE", @@ -3211,31 +3223,31 @@ "name": "LRcell", "version": "1.12.0", "sha256": "129wwaa6ppayyirlyra720a2yhabvihy11yfbr3yddnk7jzgzm8a", - "depends": ["AnnotationHub", "BiocParallel", "dplyr", "ExperimentHub", "ggplot2", "ggrepel", "magrittr"] + "depends": ["AnnotationHub", "BiocParallel", "ExperimentHub", "dplyr", "ggplot2", "ggrepel", "magrittr"] }, "LedPred": { "name": "LedPred", "version": "1.38.0", "sha256": "1ziw6ya46s55gynlrl8dh6p3n0l1m01b0q6b9y6fc13pknjjbarh", - "depends": ["akima", "e1071", "ggplot2", "irr", "jsonlite", "plot3D", "plyr", "RCurl", "ROCR", "testthat"] + "depends": ["RCurl", "ROCR", "akima", "e1071", "ggplot2", "irr", "jsonlite", "plot3D", "plyr", "testthat"] }, "LinTInd": { "name": "LinTInd", "version": "1.8.0", "sha256": "01ij93fylp7bch2rywz31bpbhdgi8cbsn8nngsp730pd3pyw8mpf", - "depends": ["ape", "BiocGenerics", "Biostrings", "cowplot", "data_tree", "dplyr", "ggnewscale", "ggplot2", "ggtree", "IRanges", "networkD3", "pheatmap", "purrr", "pwalign", "reshape2", "rlist", "S4Vectors", "stringdist", "stringr"] + "depends": ["BiocGenerics", "Biostrings", "IRanges", "S4Vectors", "ape", "cowplot", "data_tree", "dplyr", "ggnewscale", "ggplot2", "ggtree", "networkD3", "pheatmap", "purrr", "pwalign", "reshape2", "rlist", "stringdist", "stringr"] }, "LinkHD": { "name": "LinkHD", "version": "1.18.0", "sha256": "00vfzs3121l4bqy3mb4pblfjcna5zaa4iqrzrz9pfkwm2wcf2zis", - "depends": ["cluster", "data_table", "emmeans", "ggplot2", "ggpubr", "gridExtra", "MultiAssayExperiment", "reshape2", "rio", "scales", "vegan"] + "depends": ["MultiAssayExperiment", "cluster", "data_table", "emmeans", "ggplot2", "ggpubr", "gridExtra", "reshape2", "rio", "scales", "vegan"] }, "Linnorm": { "name": "Linnorm", "version": "2.28.0", "sha256": "1la6fwaap7957rrb4cs6w48kjz4hqrw3h39lpps419d4cbnsp5jz", - "depends": ["amap", "apcluster", "ellipse", "fastcluster", "fpc", "ggdendro", "ggplot2", "gmodels", "igraph", "limma", "MASS", "mclust", "Rcpp", "RcppArmadillo", "Rtsne", "statmod", "vegan", "zoo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rtsne", "amap", "apcluster", "ellipse", "fastcluster", "fpc", "ggdendro", "ggplot2", "gmodels", "igraph", "limma", "mclust", "statmod", "vegan", "zoo"] }, "LiquidAssociation": { "name": "LiquidAssociation", @@ -3247,25 +3259,25 @@ "name": "LoomExperiment", "version": "1.22.0", "sha256": "12xx78pbfdhh1iprm8vfbnwi3dm7slf47y5a6p78spnhsykb3ris", - "depends": ["BiocIO", "DelayedArray", "GenomicRanges", "HDF5Array", "Matrix", "rhdf5", "S4Vectors", "SingleCellExperiment", "stringr", "SummarizedExperiment"] + "depends": ["BiocIO", "DelayedArray", "GenomicRanges", "HDF5Array", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "rhdf5", "stringr"] }, "LymphoSeq": { "name": "LymphoSeq", "version": "1.32.0", "sha256": "0km3k6sbcb573mk0wb6hq1xqmbkksnvkv8mx5b9jqr4r840lh909", - "depends": ["Biostrings", "circlize", "data_table", "dplyr", "ggplot2", "ggtree", "ineq", "LymphoSeqDB", "msa", "phangorn", "plyr", "RColorBrewer", "reshape", "stringdist", "UpSetR", "VennDiagram"] + "depends": ["Biostrings", "LymphoSeqDB", "RColorBrewer", "UpSetR", "VennDiagram", "circlize", "data_table", "dplyr", "ggplot2", "ggtree", "ineq", "msa", "phangorn", "plyr", "reshape", "stringdist"] }, "M3C": { "name": "M3C", "version": "1.26.0", "sha256": "1h3zxb3m68lq37g25zqxpmk2c9yrdhydyhh7ad2d30hif73qiacm", - "depends": ["cluster", "corpcor", "doParallel", "doSNOW", "foreach", "ggplot2", "Matrix", "matrixcalc", "Rtsne", "umap"] + "depends": ["Matrix", "Rtsne", "cluster", "corpcor", "doParallel", "doSNOW", "foreach", "ggplot2", "matrixcalc", "umap"] }, "M3Drop": { "name": "M3Drop", "version": "1.30.0", "sha256": "1ksdr7p517sidp99kl4bjy88i18c7hxgd7zlrj4h0zrvy3fjh1r4", - "depends": ["bbmle", "gplots", "Hmisc", "irlba", "Matrix", "matrixStats", "numDeriv", "RColorBrewer", "reldist", "scater", "statmod"] + "depends": ["Hmisc", "Matrix", "RColorBrewer", "bbmle", "gplots", "irlba", "matrixStats", "numDeriv", "reldist", "scater", "statmod"] }, "MACSQuantifyR": { "name": "MACSQuantifyR", @@ -3277,37 +3289,37 @@ "name": "MACSr", "version": "1.12.0", "sha256": "04qra9rwj3f259k2f8h1v8g8cnkm2ryrr84rq6pmkr9ax0wbym63", - "depends": ["AnnotationHub", "basilisk", "ExperimentHub", "reticulate", "S4Vectors"] + "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "basilisk", "reticulate"] }, "MADSEQ": { "name": "MADSEQ", "version": "1.30.0", "sha256": "0b15wg8nsavl2994clrv72rl6qn5b8pbxk1wqwqcrdab832pd4m7", - "depends": ["Biostrings", "BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "coda", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "preprocessCore", "rjags", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "vcfR", "VGAM", "zlibbioc"] + "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VGAM", "VariantAnnotation", "coda", "preprocessCore", "rjags", "rtracklayer", "vcfR", "zlibbioc"] }, "MAGAR": { "name": "MAGAR", "version": "1.12.0", "sha256": "10ki05dffrc9b4ghwjlcc51m9zviyffsldwp5w6m740y9gd0hjcg", - "depends": ["argparse", "bigstatsr", "crlmm", "data_table", "doParallel", "ff", "HDF5Array", "igraph", "impute", "jsonlite", "plyr", "reshape2", "rjson", "RnBeads", "RnBeads_hg19", "RnBeads_hg38", "snpStats", "UpSetR"] + "depends": ["HDF5Array", "RnBeads", "RnBeads_hg19", "RnBeads_hg38", "UpSetR", "argparse", "bigstatsr", "crlmm", "data_table", "doParallel", "ff", "igraph", "impute", "jsonlite", "plyr", "reshape2", "rjson", "snpStats"] }, "MAGeCKFlute": { "name": "MAGeCKFlute", "version": "2.8.0", "sha256": "1fbwd1wi9z6fgq2whqazyqwm71j7h87dcv4vh3f23yzxm337qpiy", - "depends": ["Biobase", "clusterProfiler", "depmap", "DOSE", "enrichplot", "ggplot2", "ggrepel", "gridExtra", "msigdbr", "pathview", "reshape2"] + "depends": ["Biobase", "DOSE", "clusterProfiler", "depmap", "enrichplot", "ggplot2", "ggrepel", "gridExtra", "msigdbr", "pathview", "reshape2"] }, "MAI": { "name": "MAI", "version": "1.10.0", "sha256": "0fj5q9bbwazicncyxn7940jxkka1m76327cgwl3skj8a1xr6nlfq", - "depends": ["caret", "doParallel", "e1071", "foreach", "future", "future_apply", "missForest", "pcaMethods", "S4Vectors", "SummarizedExperiment", "tidyverse"] + "depends": ["S4Vectors", "SummarizedExperiment", "caret", "doParallel", "e1071", "foreach", "future", "future_apply", "missForest", "pcaMethods", "tidyverse"] }, "MAIT": { "name": "MAIT", "version": "1.38.0", "sha256": "0b33n6n3v88rad6ndpldsz3kb3l35fq7w6vqm5fzd9nxn9h5ayws", - "depends": ["agricolae", "CAMERA", "caret", "class", "e1071", "gplots", "MASS", "pls", "plsgenomics", "Rcpp", "xcms"] + "depends": ["CAMERA", "MASS", "Rcpp", "agricolae", "caret", "class", "e1071", "gplots", "pls", "plsgenomics", "xcms"] }, "MANOR": { "name": "MANOR", @@ -3319,13 +3331,13 @@ "name": "MAPFX", "version": "1.0.0", "sha256": "16iqj70hhsgvnlb8g9z42xplfdsryzlc9cq4ndky01izmqi0ybvx", - "depends": ["Biobase", "circlize", "ComplexHeatmap", "cowplot", "e1071", "flowCore", "ggplot2", "glmnetUtils", "gtools", "iCellR", "igraph", "pbapply", "RColorBrewer", "reshape2", "Rfast", "stringr", "uwot", "xgboost"] + "depends": ["Biobase", "ComplexHeatmap", "RColorBrewer", "Rfast", "circlize", "cowplot", "e1071", "flowCore", "ggplot2", "glmnetUtils", "gtools", "iCellR", "igraph", "pbapply", "reshape2", "stringr", "uwot", "xgboost"] }, "MAST": { "name": "MAST", "version": "1.30.0", "sha256": "1k8an0ifcgx54lqzpim3q37y4rhv57i94i46dlpmdyfghqqw0fny", - "depends": ["abind", "Biobase", "BiocGenerics", "data_table", "ggplot2", "Matrix", "plyr", "progress", "reshape2", "S4Vectors", "SingleCellExperiment", "stringr", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "abind", "data_table", "ggplot2", "plyr", "progress", "reshape2", "stringr"] }, "MBASED": { "name": "MBASED", @@ -3349,13 +3361,13 @@ "name": "MBECS", "version": "1.8.0", "sha256": "15nv5rbw158d071gscms6p42wzf6ibnabiqcq256rcz6j0r69b63", - "depends": ["cluster", "dplyr", "ggplot2", "gridExtra", "limma", "lme4", "lmerTest", "magrittr", "Matrix", "pheatmap", "phyloseq", "rmarkdown", "ruv", "sva", "tibble", "tidyr", "vegan"] + "depends": ["Matrix", "cluster", "dplyr", "ggplot2", "gridExtra", "limma", "lme4", "lmerTest", "magrittr", "pheatmap", "phyloseq", "rmarkdown", "ruv", "sva", "tibble", "tidyr", "vegan"] }, "MBQN": { "name": "MBQN", "version": "2.16.0", "sha256": "0c5knn15yiki5vi6ln5f0r4hkq3bnv8da5yqflgbgqwn7fn277cr", - "depends": ["BiocFileCache", "ggplot2", "limma", "PairedData", "preprocessCore", "rappdirs", "RCurl", "rmarkdown", "SummarizedExperiment", "xml2"] + "depends": ["BiocFileCache", "PairedData", "RCurl", "SummarizedExperiment", "ggplot2", "limma", "preprocessCore", "rappdirs", "rmarkdown", "xml2"] }, "MBttest": { "name": "MBttest", @@ -3367,7 +3379,7 @@ "name": "MCbiclust", "version": "1.28.0", "sha256": "1alz583dnmm9xvby1fcfkz2pxach6saj2ni5qma1r31ac4sx0b3l", - "depends": ["AnnotationDbi", "BiocParallel", "cluster", "GGally", "ggplot2", "GO_db", "org_Hs_eg_db", "scales", "WGCNA"] + "depends": ["AnnotationDbi", "BiocParallel", "GGally", "GO_db", "WGCNA", "cluster", "ggplot2", "org_Hs_eg_db", "scales"] }, "MDTS": { "name": "MDTS", @@ -3379,43 +3391,43 @@ "name": "MEAL", "version": "1.34.0", "sha256": "1njqd9546ggnncmnri8nm9h2cq1wrq075fpng86d994zpgvq2xn8", - "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "ggplot2", "Gviz", "IRanges", "isva", "limma", "matrixStats", "minfi", "missMethyl", "MultiDataSet", "permute", "S4Vectors", "SmartSVA", "SummarizedExperiment", "vegan"] + "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "Gviz", "IRanges", "MultiDataSet", "S4Vectors", "SmartSVA", "SummarizedExperiment", "ggplot2", "isva", "limma", "matrixStats", "minfi", "missMethyl", "permute", "vegan"] }, "MEAT": { "name": "MEAT", "version": "1.16.0", "sha256": "0qq5k0xc7vsc32nh6f1qw4cy960rh43a8caqpjprvkfgp9mbvxfg", - "depends": ["dplyr", "dynamicTreeCut", "glmnet", "impute", "minfi", "RPMM", "stringr", "SummarizedExperiment", "tibble", "wateRmelon"] + "depends": ["RPMM", "SummarizedExperiment", "dplyr", "dynamicTreeCut", "glmnet", "impute", "minfi", "stringr", "tibble", "wateRmelon"] }, "MEB": { "name": "MEB", "version": "1.18.0", "sha256": "18vhf7f0jx13b8vs4kgm2qli3xxinv9rcm4r8xfd9p1ldmmbh6bn", - "depends": ["e1071", "edgeR", "scater", "SingleCellExperiment", "SummarizedExperiment", "wrswoR"] + "depends": ["SingleCellExperiment", "SummarizedExperiment", "e1071", "edgeR", "scater", "wrswoR"] }, "MEDIPS": { "name": "MEDIPS", "version": "1.56.0", "sha256": "0lv4x4ms3gabin47lv08rl2igddnr2r9d5xf3w1zaz8d2fj1k1wq", - "depends": ["biomaRt", "Biostrings", "BSgenome", "DNAcopy", "edgeR", "GenomicRanges", "gtools", "IRanges", "preprocessCore", "Rsamtools", "rtracklayer"] + "depends": ["BSgenome", "Biostrings", "DNAcopy", "GenomicRanges", "IRanges", "Rsamtools", "biomaRt", "edgeR", "gtools", "preprocessCore", "rtracklayer"] }, "MEDME": { "name": "MEDME", "version": "1.64.0", "sha256": "1zqqbb36qy1ad3fp2b29wm94g0qj95p8aj4jskkj7zca5j01jvzr", - "depends": ["Biostrings", "drc", "MASS"] + "depends": ["Biostrings", "MASS", "drc"] }, "MEIGOR": { "name": "MEIGOR", "version": "1.38.0", "sha256": "05k3n6zr75hd76l7v19i88hp0y7x2k2x4nhdwx86ya9gp8xad069", - "depends": ["CNORode", "deSolve", "Rsolnp", "snowfall"] + "depends": ["CNORode", "Rsolnp", "deSolve", "snowfall"] }, "MGFM": { "name": "MGFM", "version": "1.38.0", "sha256": "0f6j2bq0zv2lfypd4wbbmapgs132k7yzjw11h9rs6c4llhlk5ns2", - "depends": ["annotate", "AnnotationDbi"] + "depends": ["AnnotationDbi", "annotate"] }, "MGFR": { "name": "MGFR", @@ -3427,31 +3439,31 @@ "name": "MGnifyR", "version": "1.0.0", "sha256": "0siqjril79bcbs90v7ng1j2rzrs4nl5y4wv1ih2cgp464n8agh6a", - "depends": ["ape", "BiocGenerics", "dplyr", "httr", "mia", "MultiAssayExperiment", "plyr", "reshape2", "S4Vectors", "SummarizedExperiment", "tidyjson", "TreeSummarizedExperiment", "urltools"] + "depends": ["BiocGenerics", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment", "ape", "dplyr", "httr", "mia", "plyr", "reshape2", "tidyjson", "urltools"] }, "MICSQTL": { "name": "MICSQTL", "version": "1.2.2", "sha256": "141dgc7k28ig9yw6km7ahjp0zyshg4kp3f6bs0ixnv6566dlb4c9", - "depends": ["BiocParallel", "dirmult", "ggplot2", "ggpubr", "ggridges", "glue", "magrittr", "nnls", "purrr", "S4Vectors", "SummarizedExperiment", "TCA", "TOAST"] + "depends": ["BiocParallel", "S4Vectors", "SummarizedExperiment", "TCA", "TOAST", "dirmult", "ggplot2", "ggpubr", "ggridges", "glue", "magrittr", "nnls", "purrr"] }, "MIRA": { "name": "MIRA", "version": "1.26.0", "sha256": "05s4wm7cnjyb1sg6zawp5rxj23ym5kkh95cj79k6cx6l0fb946c0", - "depends": ["Biobase", "BiocGenerics", "bsseq", "data_table", "GenomicRanges", "ggplot2", "IRanges", "S4Vectors"] + "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "bsseq", "data_table", "ggplot2"] }, "MIRit": { "name": "MIRit", "version": "1.0.0", "sha256": "1c6zz24l2l362lkyha9ls7a990dpvpxskyzxz755zkf0q4cpdyn4", - "depends": ["AnnotationDbi", "BiocFileCache", "BiocParallel", "DESeq2", "edgeR", "fgsea", "genekitr", "geneset", "ggplot2", "ggpubr", "graph", "graphite", "httr", "limma", "MultiAssayExperiment", "Rcpp", "readxl", "Rgraphviz", "rlang"] + "depends": ["AnnotationDbi", "BiocFileCache", "BiocParallel", "DESeq2", "MultiAssayExperiment", "Rcpp", "Rgraphviz", "edgeR", "fgsea", "genekitr", "geneset", "ggplot2", "ggpubr", "graph", "graphite", "httr", "limma", "readxl", "rlang"] }, "MLInterfaces": { "name": "MLInterfaces", "version": "1.84.0", "sha256": "1m8clkb5rznzv2fwrl59csq8v0ibqwdm4fphq10b8pmyvj880qpn", - "depends": ["annotate", "Biobase", "BiocGenerics", "cluster", "fpc", "gbm", "gdata", "genefilter", "ggvis", "hwriter", "magrittr", "MASS", "mlbench", "pls", "RColorBrewer", "Rcpp", "rpart", "sfsmisc", "shiny", "SummarizedExperiment", "threejs"] + "depends": ["Biobase", "BiocGenerics", "MASS", "RColorBrewer", "Rcpp", "SummarizedExperiment", "annotate", "cluster", "fpc", "gbm", "gdata", "genefilter", "ggvis", "hwriter", "magrittr", "mlbench", "pls", "rpart", "sfsmisc", "shiny", "threejs"] }, "MLP": { "name": "MLP", @@ -3463,49 +3475,49 @@ "name": "MLSeq", "version": "2.22.0", "sha256": "0vm4giqqp2iq1w40nkn4bjc81ppdhqhbxq6w6ps3i2rdzwcq49ir", - "depends": ["Biobase", "caret", "DESeq2", "edgeR", "foreach", "ggplot2", "limma", "pamr", "plyr", "sSeq", "SummarizedExperiment", "testthat", "VennDiagram", "xtable"] + "depends": ["Biobase", "DESeq2", "SummarizedExperiment", "VennDiagram", "caret", "edgeR", "foreach", "ggplot2", "limma", "pamr", "plyr", "sSeq", "testthat", "xtable"] }, "MMDiff2": { "name": "MMDiff2", "version": "1.32.0", "sha256": "0yamcgjb5k77pkv1b0bja5f2i7aqw12wpyppf1mw9s8mqfx3cl0y", - "depends": ["Biobase", "Biostrings", "BSgenome", "GenomicRanges", "ggplot2", "locfit", "RColorBrewer", "Rsamtools", "S4Vectors", "shiny"] + "depends": ["BSgenome", "Biobase", "Biostrings", "GenomicRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "ggplot2", "locfit", "shiny"] }, "MMUPHin": { "name": "MMUPHin", "version": "1.18.1", "sha256": "0wh998bjbf8zkfrzmrnm8dmm7960w5dnaq1yyc1hl105al0j33aj", - "depends": ["cowplot", "dplyr", "fpc", "ggplot2", "igraph", "Maaslin2", "metafor", "stringr", "tidyr"] + "depends": ["Maaslin2", "cowplot", "dplyr", "fpc", "ggplot2", "igraph", "metafor", "stringr", "tidyr"] }, "MODA": { "name": "MODA", "version": "1.30.0", "sha256": "1cx3jz8hw1zm68cay84gkxq9wlfwfdm9ms70af6hck4fl2spxj66", - "depends": ["AMOUNTAIN", "cluster", "dynamicTreeCut", "igraph", "RColorBrewer", "WGCNA"] + "depends": ["AMOUNTAIN", "RColorBrewer", "WGCNA", "cluster", "dynamicTreeCut", "igraph"] }, "MOFA2": { "name": "MOFA2", "version": "1.14.0", "sha256": "0sf0vibw44ildxf5rdkqjhw85awl5iz9f62j9z660lf3f8h5v5qq", - "depends": ["basilisk", "corrplot", "cowplot", "DelayedArray", "dplyr", "forcats", "ggplot2", "ggrepel", "HDF5Array", "magrittr", "pheatmap", "RColorBrewer", "reshape2", "reticulate", "rhdf5", "Rtsne", "stringi", "tidyr", "uwot"] + "depends": ["DelayedArray", "HDF5Array", "RColorBrewer", "Rtsne", "basilisk", "corrplot", "cowplot", "dplyr", "forcats", "ggplot2", "ggrepel", "magrittr", "pheatmap", "reshape2", "reticulate", "rhdf5", "stringi", "tidyr", "uwot"] }, "MOGAMUN": { "name": "MOGAMUN", "version": "1.14.0", "sha256": "0l6pbn89a3pp157fbcwpkihmx869afi0qvm16yjac0mrhwspgbk8", - "depends": ["BiocParallel", "igraph", "RCy3", "RUnit", "stringr"] + "depends": ["BiocParallel", "RCy3", "RUnit", "igraph", "stringr"] }, "MOMA": { "name": "MOMA", "version": "1.16.0", "sha256": "1xbacfm9cikdhhb64l068hi4hcpqvh0g573cm8c3jxicxbgp3swv", - "depends": ["circlize", "cluster", "ComplexHeatmap", "dplyr", "ggplot2", "magrittr", "MKmisc", "MultiAssayExperiment", "qvalue", "RColorBrewer", "readr", "reshape2", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["ComplexHeatmap", "MKmisc", "MultiAssayExperiment", "RColorBrewer", "circlize", "cluster", "dplyr", "ggplot2", "magrittr", "qvalue", "readr", "reshape2", "rlang", "stringr", "tibble", "tidyr"] }, "MOSim": { "name": "MOSim", "version": "2.0.0", "sha256": "0mj53b4m4f2bzspgypiymhk780dcmbrfdrdki46bqjnb124y0c2q", - "depends": ["cpp11", "dplyr", "edgeR", "ggplot2", "HiddenMarkov", "IRanges", "lazyeval", "matrixStats", "Rcpp", "rlang", "S4Vectors", "scran", "Seurat", "Signac", "stringi", "stringr", "zoo"] + "depends": ["HiddenMarkov", "IRanges", "Rcpp", "S4Vectors", "Seurat", "Signac", "cpp11", "dplyr", "edgeR", "ggplot2", "lazyeval", "matrixStats", "rlang", "scran", "stringi", "stringr", "zoo"] }, "MPFE": { "name": "MPFE", @@ -3517,43 +3529,43 @@ "name": "MPRAnalyze", "version": "1.22.0", "sha256": "1gswhf7k4y0g28wv3hjwcrg9ms1g4ky0rxdlzli1in8d4cly7154", - "depends": ["BiocParallel", "progress", "SummarizedExperiment"] + "depends": ["BiocParallel", "SummarizedExperiment", "progress"] }, "MSA2dist": { "name": "MSA2dist", "version": "1.8.0", "sha256": "0bb37mdw671cc7751wfdsslcaz04i3sbjdp3y11n7yl5pmkx1k6b", - "depends": ["ape", "Biostrings", "doParallel", "dplyr", "foreach", "GenomicRanges", "IRanges", "pwalign", "Rcpp", "RcppThread", "rlang", "seqinr", "stringi", "stringr", "tibble", "tidyr"] + "depends": ["Biostrings", "GenomicRanges", "IRanges", "Rcpp", "RcppThread", "ape", "doParallel", "dplyr", "foreach", "pwalign", "rlang", "seqinr", "stringi", "stringr", "tibble", "tidyr"] }, "MSPrep": { "name": "MSPrep", "version": "1.14.0", "sha256": "0856s9a268sv2ablqb6s5gc98dl5z171xik1nk7jpx5vdx9iwj5b", - "depends": ["crmn", "dplyr", "magrittr", "missForest", "pcaMethods", "preprocessCore", "rlang", "S4Vectors", "stringr", "SummarizedExperiment", "sva", "tibble", "tidyr", "VIM"] + "depends": ["S4Vectors", "SummarizedExperiment", "VIM", "crmn", "dplyr", "magrittr", "missForest", "pcaMethods", "preprocessCore", "rlang", "stringr", "sva", "tibble", "tidyr"] }, "MSnID": { "name": "MSnID", "version": "1.38.0", "sha256": "0misrm4x4z5h8dfwcrwi24nhcjslqvbyk5n7qz6kf2zcgcwq8q44", - "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "BiocGenerics", "BiocStyle", "Biostrings", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "iterators", "msmsTests", "MSnbase", "mzID", "mzR", "ProtGenerics", "purrr", "R_cache", "Rcpp", "reshape2", "rlang", "RUnit", "stringr", "tibble", "xtable"] + "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "BiocGenerics", "BiocStyle", "Biostrings", "MSnbase", "ProtGenerics", "RUnit", "R_cache", "Rcpp", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "iterators", "msmsTests", "mzID", "mzR", "purrr", "reshape2", "rlang", "stringr", "tibble", "xtable"] }, "MSnbase": { "name": "MSnbase", "version": "2.30.1", "sha256": "0cdvi2mjvhj0h8x2rh3kkzrdnmzhr7d9a41m21r6b843a0q7hp6f", - "depends": ["affy", "Biobase", "BiocGenerics", "BiocParallel", "digest", "ggplot2", "impute", "IRanges", "lattice", "MALDIquant", "MASS", "MsCoreUtils", "mzID", "mzR", "pcaMethods", "plyr", "ProtGenerics", "PSMatch", "Rcpp", "S4Vectors", "scales", "vsn"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "IRanges", "MALDIquant", "MASS", "MsCoreUtils", "PSMatch", "ProtGenerics", "Rcpp", "S4Vectors", "affy", "digest", "ggplot2", "impute", "lattice", "mzID", "mzR", "pcaMethods", "plyr", "scales", "vsn"] }, "MSstats": { "name": "MSstats", - "version": "4.12.0", - "sha256": "0nrh0hjbsxmf390k5bnniichkwlw3scq8y90bw7hqv21k7wzwfvp", - "depends": ["checkmate", "data_table", "ggplot2", "ggrepel", "gplots", "htmltools", "limma", "lme4", "marray", "MASS", "MSstatsConvert", "plotly", "preprocessCore", "Rcpp", "RcppArmadillo", "statmod", "survival"] + "version": "4.12.1", + "sha256": "10dsw777qiaj042mfsram39n4bq0sps18lfgl98wb9y0d67c8xaz", + "depends": ["MASS", "MSstatsConvert", "Rcpp", "RcppArmadillo", "checkmate", "data_table", "ggplot2", "ggrepel", "gplots", "htmltools", "limma", "lme4", "marray", "plotly", "preprocessCore", "statmod", "survival"] }, "MSstatsBig": { "name": "MSstatsBig", "version": "1.2.0", "sha256": "1az35hsgij1cgpp6pl198dmlw26ddc1npdzaa5g8mwmdijwl3jz1", - "depends": ["arrow", "DBI", "dplyr", "MSstats", "MSstatsConvert", "readr", "sparklyr"] + "depends": ["DBI", "MSstats", "MSstatsConvert", "arrow", "dplyr", "readr", "sparklyr"] }, "MSstatsConvert": { "name": "MSstatsConvert", @@ -3565,43 +3577,43 @@ "name": "MSstatsLOBD", "version": "1.12.0", "sha256": "0jav2x8j07v4zmbwk89l85rycn7k9y0ifb07gzg64v0pkls4341s", - "depends": ["ggplot2", "minpack_lm", "Rcpp"] + "depends": ["Rcpp", "ggplot2", "minpack_lm"] }, "MSstatsLiP": { "name": "MSstatsLiP", "version": "1.10.0", "sha256": "1kpfybpzav4bvy3jb2p3ws899mifjr564jqsdy9s4vbk5pphm9j0", - "depends": ["Biostrings", "checkmate", "data_table", "dplyr", "factoextra", "ggplot2", "ggpubr", "gridExtra", "MSstats", "MSstatsConvert", "MSstatsPTM", "purrr", "Rcpp", "scales", "stringr", "tibble", "tidyr", "tidyverse"] + "depends": ["Biostrings", "MSstats", "MSstatsConvert", "MSstatsPTM", "Rcpp", "checkmate", "data_table", "dplyr", "factoextra", "ggplot2", "ggpubr", "gridExtra", "purrr", "scales", "stringr", "tibble", "tidyr", "tidyverse"] }, "MSstatsPTM": { "name": "MSstatsPTM", "version": "2.6.0", "sha256": "0ivcxd2awrswih6n7is7zkcfrqiihk998g081krcp25i832xfqvh", - "depends": ["Biostrings", "checkmate", "data_table", "dplyr", "ggplot2", "ggrepel", "gridExtra", "MSstats", "MSstatsConvert", "MSstatsTMT", "Rcpp", "stringi", "stringr"] + "depends": ["Biostrings", "MSstats", "MSstatsConvert", "MSstatsTMT", "Rcpp", "checkmate", "data_table", "dplyr", "ggplot2", "ggrepel", "gridExtra", "stringi", "stringr"] }, "MSstatsQC": { "name": "MSstatsQC", "version": "2.22.0", "sha256": "0pp813mx6kwmxyyi67qsak09k012nn05pv60ndx8x6dq9ph8aghn", - "depends": ["dplyr", "ggExtra", "ggplot2", "MSnbase", "plotly", "qcmetrics"] + "depends": ["MSnbase", "dplyr", "ggExtra", "ggplot2", "plotly", "qcmetrics"] }, "MSstatsQCgui": { "name": "MSstatsQCgui", "version": "1.24.0", "sha256": "0kjidspplam63367yc09a17a3gq52rbmfrcnaxnxpiwkl7mphzz0", - "depends": ["dplyr", "ggExtra", "gridExtra", "MSstatsQC", "plotly", "shiny"] + "depends": ["MSstatsQC", "dplyr", "ggExtra", "gridExtra", "plotly", "shiny"] }, "MSstatsShiny": { "name": "MSstatsShiny", "version": "1.6.2", "sha256": "0h79yy5b9n2kfpbc3fhfajfmrqdzghj3ycaparn1v1dzjmi87z9y", - "depends": ["data_table", "dplyr", "DT", "ggplot2", "ggrepel", "gplots", "Hmisc", "htmltools", "marray", "mockery", "MSstats", "MSstatsConvert", "MSstatsPTM", "MSstatsTMT", "plotly", "readxl", "shiny", "shinyBS", "shinybusy", "shinyjs", "tidyr", "uuid"] + "depends": ["DT", "Hmisc", "MSstats", "MSstatsConvert", "MSstatsPTM", "MSstatsTMT", "data_table", "dplyr", "ggplot2", "ggrepel", "gplots", "htmltools", "marray", "mockery", "plotly", "readxl", "shiny", "shinyBS", "shinybusy", "shinyjs", "tidyr", "uuid"] }, "MSstatsTMT": { "name": "MSstatsTMT", "version": "2.12.1", "sha256": "03nnwh5qbr3wd942yj5xa2gd2bk28ncxq2dri3my5gwsrlfxfxpn", - "depends": ["checkmate", "data_table", "ggplot2", "htmltools", "limma", "lme4", "lmerTest", "MSstats", "MSstatsConvert", "plotly"] + "depends": ["MSstats", "MSstatsConvert", "checkmate", "data_table", "ggplot2", "htmltools", "limma", "lme4", "lmerTest", "plotly"] }, "MVCClass": { "name": "MVCClass", @@ -3613,19 +3625,19 @@ "name": "MWASTools", "version": "1.28.0", "sha256": "1k72ycx0zlflcfpqapvh9m6mk3vc9wl0pbsi4jbcdigl6vx1zixv", - "depends": ["boot", "car", "ComplexHeatmap", "ggplot2", "glm2", "gridExtra", "igraph", "KEGGgraph", "KEGGREST", "ppcor", "qvalue", "RCurl", "SummarizedExperiment"] + "depends": ["ComplexHeatmap", "KEGGREST", "KEGGgraph", "RCurl", "SummarizedExperiment", "boot", "car", "ggplot2", "glm2", "gridExtra", "igraph", "ppcor", "qvalue"] }, "Maaslin2": { "name": "Maaslin2", "version": "1.18.0", "sha256": "0dl6s4lcd40nd7v0d3k3zn0mkm5rlzb8kf2cjxz298mgdif63xqh", - "depends": ["biglm", "car", "chemometrics", "cplm", "data_table", "dplyr", "edgeR", "ggplot2", "glmmTMB", "hash", "lme4", "lmerTest", "logging", "MASS", "metagenomeSeq", "optparse", "pbapply", "pcaPP", "pheatmap", "pscl", "robustbase", "tibble", "vegan"] + "depends": ["MASS", "biglm", "car", "chemometrics", "cplm", "data_table", "dplyr", "edgeR", "ggplot2", "glmmTMB", "hash", "lme4", "lmerTest", "logging", "metagenomeSeq", "optparse", "pbapply", "pcaPP", "pheatmap", "pscl", "robustbase", "tibble", "vegan"] }, "Macarron": { "name": "Macarron", - "version": "1.8.0", - "sha256": "18k6fxr4iihrxkraf2p01wmmkaahq95yb08bh4f8dw7ji3my50n7", - "depends": ["BiocParallel", "data_table", "DelayedArray", "dynamicTreeCut", "ff", "httr", "logging", "Maaslin2", "plyr", "psych", "RJSONIO", "SummarizedExperiment", "WGCNA", "xml2"] + "version": "1.8.1", + "sha256": "0v1sn04vkrxl0rj8mkq6ibmpsaavplm8hxl94kj4lp6ka81f4sqj", + "depends": ["BiocParallel", "DelayedArray", "Maaslin2", "RJSONIO", "SummarizedExperiment", "WGCNA", "data_table", "dynamicTreeCut", "ff", "httr", "logging", "plyr", "psych", "xml2"] }, "MantelCorr": { "name": "MantelCorr", @@ -3655,7 +3667,7 @@ "name": "MatrixQCvis", "version": "1.12.0", "sha256": "0hghmns8i1yhycr18yxp7b7knbdnf1f705z1pic1ql5llzsi8jzj", - "depends": ["ComplexHeatmap", "dplyr", "ExperimentHub", "ggplot2", "Hmisc", "htmlwidgets", "impute", "imputeLCMD", "limma", "MASS", "pcaMethods", "plotly", "proDA", "rlang", "rmarkdown", "Rtsne", "shiny", "shinydashboard", "shinyhelper", "shinyjs", "SummarizedExperiment", "tibble", "tidyr", "umap", "UpSetR", "vsn"] + "depends": ["ComplexHeatmap", "ExperimentHub", "Hmisc", "MASS", "Rtsne", "SummarizedExperiment", "UpSetR", "dplyr", "ggplot2", "htmlwidgets", "impute", "imputeLCMD", "limma", "pcaMethods", "plotly", "proDA", "rlang", "rmarkdown", "shiny", "shinydashboard", "shinyhelper", "shinyjs", "tibble", "tidyr", "umap", "vsn"] }, "MatrixRider": { "name": "MatrixRider", @@ -3679,7 +3691,7 @@ "name": "Melissa", "version": "1.20.0", "sha256": "0aswg1balk65rsnxnsdn65x5l5g1dya7z2n8yqr7agzigdw62pdf", - "depends": ["assertthat", "BiocStyle", "BPRMeth", "cowplot", "data_table", "doParallel", "foreach", "GenomicRanges", "ggplot2", "magrittr", "matrixcalc", "mclust", "MCMCpack", "mvtnorm", "ROCR", "truncnorm"] + "depends": ["BPRMeth", "BiocStyle", "GenomicRanges", "MCMCpack", "ROCR", "assertthat", "cowplot", "data_table", "doParallel", "foreach", "ggplot2", "magrittr", "matrixcalc", "mclust", "mvtnorm", "truncnorm"] }, "Mergeomics": { "name": "Mergeomics", @@ -3691,43 +3703,43 @@ "name": "MesKit", "version": "1.14.0", "sha256": "0r6a200zyp97vjdk78fch5xmvqbqjmhf9n7cc9y911ifll7md35a", - "depends": ["AnnotationDbi", "ape", "Biostrings", "circlize", "ComplexHeatmap", "cowplot", "data_table", "dplyr", "ggplot2", "ggrepel", "ggridges", "IRanges", "mclust", "phangorn", "pracma", "RColorBrewer", "S4Vectors", "tidyr"] + "depends": ["AnnotationDbi", "Biostrings", "ComplexHeatmap", "IRanges", "RColorBrewer", "S4Vectors", "ape", "circlize", "cowplot", "data_table", "dplyr", "ggplot2", "ggrepel", "ggridges", "mclust", "phangorn", "pracma", "tidyr"] }, "MetCirc": { "name": "MetCirc", "version": "1.34.0", "sha256": "1wkmhlxg3gxfxskhhxrm65y6vriggs34523adrsghx1ra0wgyjvf", - "depends": ["amap", "circlize", "ggplot2", "MsCoreUtils", "S4Vectors", "scales", "shiny", "Spectra"] + "depends": ["MsCoreUtils", "S4Vectors", "Spectra", "amap", "circlize", "ggplot2", "scales", "shiny"] }, "MetID": { "name": "MetID", "version": "1.22.0", "sha256": "0i6jpn1q0632klpa6817v9xs2kkdvsajhjv6h1p2f6jdx0smsd64", - "depends": ["ChemmineR", "devtools", "igraph", "Matrix", "stringr"] + "depends": ["ChemmineR", "Matrix", "devtools", "igraph", "stringr"] }, "MetNet": { "name": "MetNet", "version": "1.22.0", "sha256": "1dpp9z9h3dkbx9k0hxg5dr9178sbs095kyr2ka5sihxm2in0prrg", - "depends": ["BiocParallel", "bnlearn", "corpcor", "dplyr", "GeneNet", "GENIE3", "ggplot2", "parmigene", "psych", "rlang", "S4Vectors", "stabs", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["BiocParallel", "GENIE3", "GeneNet", "S4Vectors", "SummarizedExperiment", "bnlearn", "corpcor", "dplyr", "ggplot2", "parmigene", "psych", "rlang", "stabs", "tibble", "tidyr"] }, "MetaCyto": { "name": "MetaCyto", "version": "1.26.0", "sha256": "15yd35ql64ca9ixv6rcq9v6gaaxis9nzx4q2jdij3facrb2ryyfk", - "depends": ["cluster", "fastcluster", "flowCore", "FlowSOM", "ggplot2", "metafor", "tidyr"] + "depends": ["FlowSOM", "cluster", "fastcluster", "flowCore", "ggplot2", "metafor", "tidyr"] }, "MetaNeighbor": { "name": "MetaNeighbor", "version": "1.24.0", "sha256": "0sz15njb0y9vcmbv89k3x2sw4px8nmy3qhqkvyl69kxlcqdicgxi", - "depends": ["beanplot", "dplyr", "ggplot2", "gplots", "igraph", "Matrix", "matrixStats", "RColorBrewer", "SingleCellExperiment", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["Matrix", "RColorBrewer", "SingleCellExperiment", "SummarizedExperiment", "beanplot", "dplyr", "ggplot2", "gplots", "igraph", "matrixStats", "tibble", "tidyr"] }, "MetaPhOR": { "name": "MetaPhOR", "version": "1.6.0", "sha256": "0r3zqb7rmw5fnwm6hkpy22gndpn4jd24471acqfsi3a894g0868p", - "depends": ["clusterProfiler", "ggplot2", "ggrepel", "pheatmap", "RCy3", "RecordLinkage", "stringr"] + "depends": ["RCy3", "RecordLinkage", "clusterProfiler", "ggplot2", "ggrepel", "pheatmap", "stringr"] }, "MetaboAnnotation": { "name": "MetaboAnnotation", @@ -3745,7 +3757,7 @@ "name": "MetaboSignal", "version": "1.34.0", "sha256": "0ldi6qs0hfnwlpvwc0v0yn3j6gms4kgays8f5fap8vj8nw2gljbj", - "depends": ["AnnotationDbi", "biomaRt", "EnsDb_Hsapiens_v75", "hpar", "igraph", "KEGGgraph", "KEGGREST", "MWASTools", "mygene", "org_Hs_eg_db", "RCurl"] + "depends": ["AnnotationDbi", "EnsDb_Hsapiens_v75", "KEGGREST", "KEGGgraph", "MWASTools", "RCurl", "biomaRt", "hpar", "igraph", "mygene", "org_Hs_eg_db"] }, "MethPed": { "name": "MethPed", @@ -3757,7 +3769,7 @@ "name": "MethReg", "version": "1.14.0", "sha256": "1fzbrp09d57s2zvxl7jsc8dqwchz43xl0vnxkj2r0q0knlpsbbr2", - "depends": ["AnnotationHub", "DelayedArray", "dplyr", "ExperimentHub", "GenomicRanges", "ggplot2", "ggpubr", "IRanges", "JASPAR2024", "MASS", "Matrix", "openxlsx", "plyr", "progress", "pscl", "readr", "rlang", "RSQLite", "S4Vectors", "sesame", "sesameData", "sfsmisc", "stringr", "SummarizedExperiment", "TFBSTools", "tibble", "tidyr"] + "depends": ["AnnotationHub", "DelayedArray", "ExperimentHub", "GenomicRanges", "IRanges", "JASPAR2024", "MASS", "Matrix", "RSQLite", "S4Vectors", "SummarizedExperiment", "TFBSTools", "dplyr", "ggplot2", "ggpubr", "openxlsx", "plyr", "progress", "pscl", "readr", "rlang", "sesame", "sesameData", "sfsmisc", "stringr", "tibble", "tidyr"] }, "MethTargetedNGS": { "name": "MethTargetedNGS", @@ -3769,19 +3781,19 @@ "name": "MethylAid", "version": "1.38.0", "sha256": "084mnllaj6qp5ai5bmj6wgc90bs270qbzl60sch1f863x8fv9lzr", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "ggplot2", "gridBase", "hexbin", "matrixStats", "minfi", "RColorBrewer", "shiny", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "RColorBrewer", "SummarizedExperiment", "ggplot2", "gridBase", "hexbin", "matrixStats", "minfi", "shiny"] }, "MethylMix": { "name": "MethylMix", "version": "2.34.0", "sha256": "1mdhqqlbkh24bqz0bxvzih2cnl38nyacrfhsz8mq8ky2j5rsrbg0", - "depends": ["data_table", "digest", "foreach", "ggplot2", "impute", "limma", "R_matlab", "RColorBrewer", "RCurl", "RPMM"] + "depends": ["RColorBrewer", "RCurl", "RPMM", "R_matlab", "data_table", "digest", "foreach", "ggplot2", "impute", "limma"] }, "MethylSeekR": { "name": "MethylSeekR", "version": "1.44.0", "sha256": "10b3m0d5z426p74x4hjg4imqg8iic0xjjnjcllwphy0ylk3cpzd5", - "depends": ["BSgenome", "geneplotter", "GenomicRanges", "IRanges", "mhsmm", "rtracklayer"] + "depends": ["BSgenome", "GenomicRanges", "IRanges", "geneplotter", "mhsmm", "rtracklayer"] }, "Mfuzz": { "name": "Mfuzz", @@ -3799,7 +3811,7 @@ "name": "MiPP", "version": "1.76.0", "sha256": "12wk4kk7qbba3681ikldivs3np9qvvl0mivqds0dd6l52v1ngj9p", - "depends": ["Biobase", "e1071", "MASS"] + "depends": ["Biobase", "MASS", "e1071"] }, "MiRaGE": { "name": "MiRaGE", @@ -3811,25 +3823,25 @@ "name": "MicrobiomeProfiler", "version": "1.10.0", "sha256": "1xz2s2alz61s5hp5fq42m5n3bby89lyp5mr7pgav8xkyiglk471f", - "depends": ["clusterProfiler", "config", "DT", "enrichplot", "ggplot2", "golem", "gson", "htmltools", "magrittr", "shiny", "shinycustomloader", "shinyWidgets"] + "depends": ["DT", "clusterProfiler", "config", "enrichplot", "ggplot2", "golem", "gson", "htmltools", "magrittr", "shiny", "shinyWidgets", "shinycustomloader"] }, "MicrobiotaProcess": { "name": "MicrobiotaProcess", - "version": "1.16.0", - "sha256": "0jqvxr77c9karq8wm53khs47vwrrvy86q6sl0dpsbydfmjw0blln", - "depends": ["ape", "Biostrings", "cli", "coin", "data_table", "dplyr", "dtplyr", "foreach", "ggfun", "ggplot2", "ggrepel", "ggsignif", "ggstar", "ggtree", "ggtreeExtra", "magrittr", "MASS", "patchwork", "pillar", "plyr", "rlang", "SummarizedExperiment", "tibble", "tidyr", "tidyselect", "tidytree", "treeio", "vegan", "zoo"] + "version": "1.16.1", + "sha256": "1x0yjxzdri6x1yin0d54r9wx48y3x2vy79wnkg37i070ira5hddw", + "depends": ["Biostrings", "MASS", "SummarizedExperiment", "ape", "cli", "coin", "data_table", "dplyr", "dtplyr", "foreach", "ggfun", "ggplot2", "ggrepel", "ggsignif", "ggstar", "ggtree", "ggtreeExtra", "magrittr", "patchwork", "pillar", "plyr", "rlang", "tibble", "tidyr", "tidyselect", "tidytree", "treeio", "vegan", "zoo"] }, "MineICA": { "name": "MineICA", "version": "1.44.0", "sha256": "1qzqfnrf23lrlxmds8hjblj169sylq1m9h07vwlz5zik5mxj6y90", - "depends": ["annotate", "AnnotationDbi", "Biobase", "BiocGenerics", "biomaRt", "cluster", "colorspace", "fastICA", "foreach", "fpc", "ggplot2", "GOstats", "graph", "gtools", "Hmisc", "igraph", "JADE", "lumi", "lumiHumanAll_db", "marray", "mclust", "plyr", "RColorBrewer", "Rgraphviz", "scales", "xtable"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "GOstats", "Hmisc", "JADE", "RColorBrewer", "Rgraphviz", "annotate", "biomaRt", "cluster", "colorspace", "fastICA", "foreach", "fpc", "ggplot2", "graph", "gtools", "igraph", "lumi", "lumiHumanAll_db", "marray", "mclust", "plyr", "scales", "xtable"] }, "MinimumDistance": { "name": "MinimumDistance", "version": "1.48.0", "sha256": "1pqf2q5hxjb1dwg981aldl0sw10f86yszp6z511vzx1y70ca6j3h", - "depends": ["Biobase", "BiocGenerics", "data_table", "DNAcopy", "ff", "foreach", "GenomeInfoDb", "GenomicRanges", "IRanges", "lattice", "MatrixGenerics", "matrixStats", "oligoClasses", "S4Vectors", "SummarizedExperiment", "VanillaICE"] + "depends": ["Biobase", "BiocGenerics", "DNAcopy", "GenomeInfoDb", "GenomicRanges", "IRanges", "MatrixGenerics", "S4Vectors", "SummarizedExperiment", "VanillaICE", "data_table", "ff", "foreach", "lattice", "matrixStats", "oligoClasses"] }, "ModCon": { "name": "ModCon", @@ -3841,43 +3853,43 @@ "name": "Modstrings", "version": "1.20.0", "sha256": "0yc8gsgxlww2g9z1m6jl02aqmama10fkr2mvibvdi01s5pqwdbky", - "depends": ["BiocGenerics", "Biostrings", "crayon", "GenomicRanges", "IRanges", "S4Vectors", "stringi", "stringr", "XVector"] + "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "IRanges", "S4Vectors", "XVector", "crayon", "stringi", "stringr"] }, "MoleculeExperiment": { "name": "MoleculeExperiment", "version": "1.4.1", "sha256": "0w539058lm99z53lkjf9ljk1dr4fp150a9cwa9s9xrax90wpmy6j", - "depends": ["BiocParallel", "cli", "data_table", "dplyr", "EBImage", "ggplot2", "magrittr", "Matrix", "purrr", "rhdf5", "rjson", "rlang", "S4Vectors", "SpatialExperiment", "terra"] + "depends": ["BiocParallel", "EBImage", "Matrix", "S4Vectors", "SpatialExperiment", "cli", "data_table", "dplyr", "ggplot2", "magrittr", "purrr", "rhdf5", "rjson", "rlang", "terra"] }, "Moonlight2R": { "name": "Moonlight2R", "version": "1.2.0", "sha256": "0ff37hjp3llf875z4wym60vanda6gbysqmcp90dcbl33bx0fynja", - "depends": ["AnnotationHub", "Biobase", "BiocGenerics", "circlize", "clusterProfiler", "ComplexHeatmap", "doParallel", "DOSE", "dplyr", "easyPubMed", "EpiMix", "ExperimentHub", "foreach", "fuzzyjoin", "GenomicRanges", "GEOquery", "ggplot2", "gplots", "HiveR", "magrittr", "org_Hs_eg_db", "parmigene", "purrr", "qpdf", "randomForest", "RColorBrewer", "readr", "RISmed", "rtracklayer", "seqminer", "stringr", "tibble", "tidyHeatmap", "tidyr"] + "depends": ["AnnotationHub", "Biobase", "BiocGenerics", "ComplexHeatmap", "DOSE", "EpiMix", "ExperimentHub", "GEOquery", "GenomicRanges", "HiveR", "RColorBrewer", "RISmed", "circlize", "clusterProfiler", "doParallel", "dplyr", "easyPubMed", "foreach", "fuzzyjoin", "ggplot2", "gplots", "magrittr", "org_Hs_eg_db", "parmigene", "purrr", "qpdf", "randomForest", "readr", "rtracklayer", "seqminer", "stringr", "tibble", "tidyHeatmap", "tidyr"] }, "MoonlightR": { "name": "MoonlightR", "version": "1.30.0", "sha256": "0jhc7y01qrz3cg2jnjqwgi5cgrh6616q9k3f3hldkq0x6z0z1vwn", - "depends": ["Biobase", "circlize", "clusterProfiler", "doParallel", "DOSE", "foreach", "GEOquery", "gplots", "HiveR", "limma", "parmigene", "randomForest", "RColorBrewer", "RISmed", "SummarizedExperiment", "TCGAbiolinks"] + "depends": ["Biobase", "DOSE", "GEOquery", "HiveR", "RColorBrewer", "RISmed", "SummarizedExperiment", "TCGAbiolinks", "circlize", "clusterProfiler", "doParallel", "foreach", "gplots", "limma", "parmigene", "randomForest"] }, "Motif2Site": { "name": "Motif2Site", "version": "1.8.0", "sha256": "03rjhrxi016q0k7dzbfwr192sgc6z5kjyqdd6qzdajkpgq6dpi2m", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "edgeR", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "mixtools", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "edgeR", "mixtools"] }, "MotifDb": { "name": "MotifDb", "version": "1.46.0", "sha256": "1m8y76gg80625xz9g9101mfq19glk37p792yzz46807f7g6m8zbh", - "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "IRanges", "rtracklayer", "S4Vectors", "splitstackshape"] + "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "IRanges", "S4Vectors", "rtracklayer", "splitstackshape"] }, "MouseFM": { "name": "MouseFM", "version": "1.14.0", "sha256": "0vwccf4fj664vbl0ggps51rac42j7xs5m33szhwdqpik6p2hyz7j", - "depends": ["biomaRt", "curl", "data_table", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gtools", "httr", "IRanges", "jsonlite", "reshape2", "rlist", "scales", "tidyr"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "biomaRt", "curl", "data_table", "dplyr", "ggplot2", "gtools", "httr", "jsonlite", "reshape2", "rlist", "scales", "tidyr"] }, "MsBackendMassbank": { "name": "MsBackendMassbank", @@ -3901,19 +3913,19 @@ "name": "MsBackendRawFileReader", "version": "1.10.0", "sha256": "17xnbhnvz28ksfw51aba9p9wl5q0y7wl88yxsdhjwc58f3h8a1rn", - "depends": ["BiocParallel", "IRanges", "MsCoreUtils", "ProtGenerics", "rawrr", "S4Vectors", "Spectra"] + "depends": ["BiocParallel", "IRanges", "MsCoreUtils", "ProtGenerics", "S4Vectors", "Spectra", "rawrr"] }, "MsBackendSql": { "name": "MsBackendSql", "version": "1.4.0", "sha256": "1ng4ns03a8lbb63rczcl1j9c780vqnhc3plj5v3602xmnrxpadrl", - "depends": ["BiocGenerics", "BiocParallel", "data_table", "DBI", "IRanges", "MsCoreUtils", "progress", "ProtGenerics", "S4Vectors", "Spectra"] + "depends": ["BiocGenerics", "BiocParallel", "DBI", "IRanges", "MsCoreUtils", "ProtGenerics", "S4Vectors", "Spectra", "data_table", "progress"] }, "MsCoreUtils": { "name": "MsCoreUtils", - "version": "1.16.0", - "sha256": "18m6qbj43p6zsrsdp7in15z3hcnqzqcxbk24qvbq7328rrhdk84a", - "depends": ["clue", "MASS", "Rcpp", "S4Vectors"] + "version": "1.16.1", + "sha256": "1fjc0drsdkl9cyrq5k2kskb70x63mazbhpmlk9q7v77769v64gxb", + "depends": ["MASS", "Rcpp", "S4Vectors", "clue"] }, "MsDataHub": { "name": "MsDataHub", @@ -3937,13 +3949,13 @@ "name": "MsQuality", "version": "1.4.0", "sha256": "1khpjzzrrd2b7ngwq43y3sgndmrr6l8f504lyakr46xr1vyzppsl", - "depends": ["BiocParallel", "ggplot2", "htmlwidgets", "msdata", "MsExperiment", "plotly", "ProtGenerics", "rlang", "rmzqc", "shiny", "shinydashboard", "Spectra", "stringr", "tibble", "tidyr"] + "depends": ["BiocParallel", "MsExperiment", "ProtGenerics", "Spectra", "ggplot2", "htmlwidgets", "msdata", "plotly", "rlang", "rmzqc", "shiny", "shinydashboard", "stringr", "tibble", "tidyr"] }, "MuData": { "name": "MuData", "version": "1.8.0", "sha256": "0kjin6cfw9aipghd0imi2play19czplwcz2gi5akv6gk9wy98k8x", - "depends": ["DelayedArray", "Matrix", "MultiAssayExperiment", "rhdf5", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["DelayedArray", "Matrix", "MultiAssayExperiment", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "rhdf5"] }, "Mulcom": { "name": "Mulcom", @@ -3953,21 +3965,21 @@ }, "MultiAssayExperiment": { "name": "MultiAssayExperiment", - "version": "1.30.2", - "sha256": "1j74ql0lz2xf0jsf4cjfapdmxbf6hb22699d3dyj8gwd1s92myjz", + "version": "1.30.3", + "sha256": "0spws2kawf5rqhp5h5wi46sa07c2yhhnjhdxpmxz8gkvqsvdjqkp", "depends": ["Biobase", "BiocBaseUtils", "BiocGenerics", "DelayedArray", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "tidyr"] }, "MultiBaC": { "name": "MultiBaC", "version": "1.14.0", "sha256": "0m08620sii9181y0vlcrw9nbcnp4vnjjxvp96iqlgg5fsb23wbl7", - "depends": ["ggplot2", "Matrix", "MultiAssayExperiment", "pcaMethods", "plotrix", "ropls"] + "depends": ["Matrix", "MultiAssayExperiment", "ggplot2", "pcaMethods", "plotrix", "ropls"] }, "MultiDataSet": { "name": "MultiDataSet", "version": "1.32.0", "sha256": "1y1j5svi52cvixjsn13122kvd0z0c7zfki3p6rr8wjd5w7riiyqw", - "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "ggplot2", "ggrepel", "IRanges", "limma", "qqman", "S4Vectors", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "ggplot2", "ggrepel", "limma", "qqman"] }, "MultiMed": { "name": "MultiMed", @@ -3979,7 +3991,7 @@ "name": "MultiRNAflow", "version": "1.2.0", "sha256": "0i7zs0gd8p927zcdsx85wdk3wi4ywg4s4y3ichqqidqs01hdxccd", - "depends": ["Biobase", "ComplexHeatmap", "DESeq2", "factoextra", "FactoMineR", "ggalluvial", "ggplot2", "ggplotify", "ggrepel", "gprofiler2", "Mfuzz", "plot3D", "plot3Drgl", "reshape2", "S4Vectors", "SummarizedExperiment", "UpSetR"] + "depends": ["Biobase", "ComplexHeatmap", "DESeq2", "FactoMineR", "Mfuzz", "S4Vectors", "SummarizedExperiment", "UpSetR", "factoextra", "ggalluvial", "ggplot2", "ggplotify", "ggrepel", "gprofiler2", "plot3D", "plot3Drgl", "reshape2"] }, "MultimodalExperiment": { "name": "MultimodalExperiment", @@ -3989,33 +4001,33 @@ }, "MungeSumstats": { "name": "MungeSumstats", - "version": "1.12.0", - "sha256": "16msjxxmnzycj2nny35lvwvlxw1n4ga8g1wn4fcfv7xg4ad6vy4v", - "depends": ["Biostrings", "BSgenome", "data_table", "dplyr", "GenomeInfoDb", "GenomicRanges", "googleAuthR", "httr", "IRanges", "jsonlite", "magrittr", "R_utils", "RCurl", "rtracklayer", "stringr", "VariantAnnotation"] + "version": "1.12.2", + "sha256": "0qgcvdhb3z1380jfb3wl81kq9lgm90s6hnbkbrv3psn3bsgs78mi", + "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "RCurl", "R_utils", "VariantAnnotation", "data_table", "dplyr", "googleAuthR", "httr", "jsonlite", "magrittr", "rtracklayer", "stringr"] }, "MutationalPatterns": { "name": "MutationalPatterns", "version": "3.14.0", "sha256": "0smf4l023ckwsm5ckrqqw7kjyi1awp378mzhab7v8nk9n5smsj61", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "cowplot", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggalluvial", "ggdendro", "ggplot2", "IRanges", "magrittr", "NMF", "pracma", "purrr", "RColorBrewer", "S4Vectors", "stringr", "tibble", "tidyr", "VariantAnnotation"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "NMF", "RColorBrewer", "S4Vectors", "VariantAnnotation", "cowplot", "dplyr", "ggalluvial", "ggdendro", "ggplot2", "magrittr", "pracma", "purrr", "stringr", "tibble", "tidyr"] }, "NADfinder": { "name": "NADfinder", "version": "1.28.0", "sha256": "18bq7jf7f89263s4f4ib3qzlpwxsp181zjjm0cblkhjs7lw8p2zh", - "depends": ["ATACseqQC", "baseline", "BiocGenerics", "corrplot", "csaw", "EmpiricalBrownsMethod", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "limma", "metap", "Rsamtools", "rtracklayer", "S4Vectors", "signal", "SummarizedExperiment", "trackViewer"] + "depends": ["ATACseqQC", "BiocGenerics", "EmpiricalBrownsMethod", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "baseline", "corrplot", "csaw", "limma", "metap", "rtracklayer", "signal", "trackViewer"] }, "NBAMSeq": { "name": "NBAMSeq", "version": "1.20.0", "sha256": "1iglbxv7wcgn7lwah8jd1q7gsrqjr3874nivl1msla35hkqw4v9a", - "depends": ["BiocParallel", "DESeq2", "genefilter", "mgcv", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocParallel", "DESeq2", "S4Vectors", "SummarizedExperiment", "genefilter", "mgcv"] }, "NCIgraph": { "name": "NCIgraph", "version": "1.52.0", "sha256": "16kkg568hdjsn4jq9hd9gl1n31wavshn79bpwhg5jxci288zgai0", - "depends": ["graph", "KEGGgraph", "R_oo", "RBGL", "RCy3"] + "depends": ["KEGGgraph", "RBGL", "RCy3", "R_oo", "graph"] }, "NOISeq": { "name": "NOISeq", @@ -4027,7 +4039,7 @@ "name": "NPARC", "version": "1.16.0", "sha256": "0giq5nxqnsqppz12adln7kvdb8lifch57wg6avdl88xrdzpl3vfw", - "depends": ["BiocParallel", "broom", "dplyr", "magrittr", "MASS", "rlang", "tidyr"] + "depends": ["BiocParallel", "MASS", "broom", "dplyr", "magrittr", "rlang", "tidyr"] }, "NTW": { "name": "NTW", @@ -4039,19 +4051,19 @@ "name": "NanoMethViz", "version": "3.0.2", "sha256": "0nlbkikmxdq08m24sch8cy10m63v33536p5rx1zy5c4f4pa86yrw", - "depends": ["AnnotationDbi", "assertthat", "BiocSingular", "Biostrings", "bsseq", "cli", "cpp11", "data_table", "dbscan", "dplyr", "e1071", "forcats", "fs", "GenomicRanges", "ggplot2", "ggrastr", "glue", "IRanges", "limma", "patchwork", "purrr", "R_utils", "Rcpp", "readr", "rlang", "Rsamtools", "S4Vectors", "scales", "scico", "stringr", "SummarizedExperiment", "tibble", "tidyr", "withr", "zlibbioc"] + "depends": ["AnnotationDbi", "BiocSingular", "Biostrings", "GenomicRanges", "IRanges", "R_utils", "Rcpp", "Rsamtools", "S4Vectors", "SummarizedExperiment", "assertthat", "bsseq", "cli", "cpp11", "data_table", "dbscan", "dplyr", "e1071", "forcats", "fs", "ggplot2", "ggrastr", "glue", "limma", "patchwork", "purrr", "readr", "rlang", "scales", "scico", "stringr", "tibble", "tidyr", "withr", "zlibbioc"] }, "NanoStringDiff": { "name": "NanoStringDiff", "version": "1.34.0", "sha256": "0rasmzc12xl6mh9l2989wgp9q30665iqqgxr1fy6r57j7hixwbc1", - "depends": ["Biobase", "matrixStats", "Rcpp"] + "depends": ["Biobase", "Rcpp", "matrixStats"] }, "NanoStringNCTools": { "name": "NanoStringNCTools", "version": "1.12.0", "sha256": "1n1zc99v5xzd89q512v24wa7gmbgdp8g9aixvh6cjismah0vpgjr", - "depends": ["Biobase", "BiocGenerics", "Biostrings", "ggbeeswarm", "ggiraph", "ggplot2", "ggthemes", "IRanges", "pheatmap", "RColorBrewer", "S4Vectors"] + "depends": ["Biobase", "BiocGenerics", "Biostrings", "IRanges", "RColorBrewer", "S4Vectors", "ggbeeswarm", "ggiraph", "ggplot2", "ggthemes", "pheatmap"] }, "NanoTube": { "name": "NanoTube", @@ -4063,13 +4075,13 @@ "name": "Nebulosa", "version": "1.14.0", "sha256": "0m5z6rribsrk9mzcksjh0nmpf4d0x0hn8jd80h0hj0hj8sj1ifgv", - "depends": ["ggplot2", "ggrastr", "ks", "Matrix", "patchwork", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["Matrix", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "ggrastr", "ks", "patchwork"] }, "NetActivity": { "name": "NetActivity", "version": "1.6.0", "sha256": "0hssxa9i5c090929mnjs7nqn56fmg7qhq0iknfrl9d0wvpibm3bh", - "depends": ["airway", "DelayedArray", "DelayedMatrixStats", "DESeq2", "NetActivityData", "SummarizedExperiment"] + "depends": ["DESeq2", "DelayedArray", "DelayedMatrixStats", "NetActivityData", "SummarizedExperiment", "airway"] }, "NetPathMiner": { "name": "NetPathMiner", @@ -4081,37 +4093,37 @@ "name": "NetSAM", "version": "1.44.0", "sha256": "07l5cgl72mkh3j96lciwalsb0ps0bs7rfxzm78m5279palawf6vb", - "depends": ["AnnotationDbi", "biomaRt", "DBI", "doParallel", "foreach", "GO_db", "igraph", "R2HTML", "seriation", "survival", "WGCNA"] + "depends": ["AnnotationDbi", "DBI", "GO_db", "R2HTML", "WGCNA", "biomaRt", "doParallel", "foreach", "igraph", "seriation", "survival"] }, "NeuCA": { "name": "NeuCA", "version": "1.10.0", "sha256": "0k5bqdrja3x238fyrd7dm5jm94igh25b0ipb2zj6scpa4m15n67l", - "depends": ["e1071", "kableExtra", "keras", "limma", "SingleCellExperiment"] + "depends": ["SingleCellExperiment", "e1071", "kableExtra", "keras", "limma"] }, "NewWave": { "name": "NewWave", "version": "1.14.0", "sha256": "03m6dd0p2d542k36jwvz9ik8cddw1q3dz9ghqy0w1dbf685r0kf0", - "depends": ["BiocSingular", "DelayedArray", "irlba", "Matrix", "SharedObject", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocSingular", "DelayedArray", "Matrix", "SharedObject", "SingleCellExperiment", "SummarizedExperiment", "irlba"] }, "NoRCE": { "name": "NoRCE", "version": "1.16.0", "sha256": "0di23zmjfba4nmbbkcn2xhqamxxn4hfkhyh3skc46b66rl1yjy3n", - "depends": ["AnnotationDbi", "biomaRt", "DBI", "dbplyr", "dplyr", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "GO_db", "igraph", "IRanges", "KEGGREST", "png", "RCurl", "reactome_db", "readr", "reshape2", "RSQLite", "rtracklayer", "rWikiPathways", "S4Vectors", "stringr", "SummarizedExperiment", "tidyr", "zlibbioc"] + "depends": ["AnnotationDbi", "DBI", "GO_db", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "KEGGREST", "RCurl", "RSQLite", "S4Vectors", "SummarizedExperiment", "biomaRt", "dbplyr", "dplyr", "ggplot2", "igraph", "png", "rWikiPathways", "reactome_db", "readr", "reshape2", "rtracklayer", "stringr", "tidyr", "zlibbioc"] }, "NormalyzerDE": { "name": "NormalyzerDE", "version": "1.22.0", "sha256": "1kiwyf8fkdp7bml4b5f32schyl0s5c0b1ag4g826rakh487sb69b", - "depends": ["ape", "Biobase", "car", "ggforce", "ggplot2", "limma", "MASS", "matrixStats", "preprocessCore", "SummarizedExperiment", "vsn"] + "depends": ["Biobase", "MASS", "SummarizedExperiment", "ape", "car", "ggforce", "ggplot2", "limma", "matrixStats", "preprocessCore", "vsn"] }, "NormqPCR": { "name": "NormqPCR", "version": "1.50.0", "sha256": "1fl7qm6qmzxvv41qd1y8ds3r6dqk39rqgh6sl8imbggmnpb27j9h", - "depends": ["Biobase", "qpcR", "RColorBrewer", "ReadqPCR"] + "depends": ["Biobase", "RColorBrewer", "ReadqPCR", "qpcR"] }, "NuPoP": { "name": "NuPoP", @@ -4129,7 +4141,7 @@ "name": "OGRE", "version": "1.8.0", "sha256": "07xkprp1hjhavj9d360yhybpq9ghz0wxwaxlicpidm788nvksxqv", - "depends": ["AnnotationHub", "assertthat", "data_table", "DT", "GenomeInfoDb", "GenomicRanges", "ggplot2", "Gviz", "IRanges", "rtracklayer", "S4Vectors", "shiny", "shinyBS", "shinydashboard", "shinyFiles", "tidyr"] + "depends": ["AnnotationHub", "DT", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "S4Vectors", "assertthat", "data_table", "ggplot2", "rtracklayer", "shiny", "shinyBS", "shinyFiles", "shinydashboard", "tidyr"] }, "OLIN": { "name": "OLIN", @@ -4141,13 +4153,13 @@ "name": "OLINgui", "version": "1.78.0", "sha256": "0fcpy0g95l0h2id13dra46zyphyjdh2m7gw9i38i5jnr4arhy95z", - "depends": ["marray", "OLIN", "tkWidgets", "widgetTools"] + "depends": ["OLIN", "marray", "tkWidgets", "widgetTools"] }, "OMICsPCA": { "name": "OMICsPCA", "version": "1.22.0", "sha256": "0m5b6msnkvvv0lpj8zm976yqa5pd2vzkhpgzx58f95dbcaxpxflq", - "depends": ["cluster", "clValid", "corrplot", "cowplot", "data_table", "factoextra", "FactoMineR", "fpc", "GenomeInfoDb", "ggplot2", "HelloRanges", "IRanges", "kableExtra", "magick", "MASS", "MultiAssayExperiment", "NbClust", "OMICsPCAdata", "pdftools", "PerformanceAnalytics", "reshape2", "rgl", "rmarkdown", "rtracklayer", "tidyr"] + "depends": ["FactoMineR", "GenomeInfoDb", "HelloRanges", "IRanges", "MASS", "MultiAssayExperiment", "NbClust", "OMICsPCAdata", "PerformanceAnalytics", "clValid", "cluster", "corrplot", "cowplot", "data_table", "factoextra", "fpc", "ggplot2", "kableExtra", "magick", "pdftools", "reshape2", "rgl", "rmarkdown", "rtracklayer", "tidyr"] }, "OPWeight": { "name": "OPWeight", @@ -4159,13 +4171,13 @@ "name": "ORFhunteR", "version": "1.12.0", "sha256": "0ahs8j1qlfxblkbvxfd9836l72icr8lqaywpih9s4slx6j38l53p", - "depends": ["Biostrings", "BSgenome_Hsapiens_UCSC_hg38", "data_table", "Peptides", "randomForest", "Rcpp", "rtracklayer", "stringr", "xfun"] + "depends": ["BSgenome_Hsapiens_UCSC_hg38", "Biostrings", "Peptides", "Rcpp", "data_table", "randomForest", "rtracklayer", "stringr", "xfun"] }, "ORFik": { "name": "ORFik", "version": "1.24.0", "sha256": "0cm1rb4l0kciw8h1555qbixh9krwdnbgbvrb4dq753yjc3wdizfx", - "depends": ["AnnotationDbi", "BiocFileCache", "BiocGenerics", "BiocParallel", "biomaRt", "biomartr", "Biostrings", "BSgenome", "cowplot", "curl", "data_table", "DESeq2", "downloader", "fst", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "gridExtra", "httr", "IRanges", "jsonlite", "R_utils", "Rcpp", "RCurl", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment", "txdbmaker", "withr", "XML", "xml2"] + "depends": ["AnnotationDbi", "BSgenome", "BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RCurl", "R_utils", "Rcpp", "Rsamtools", "S4Vectors", "SummarizedExperiment", "XML", "biomaRt", "biomartr", "cowplot", "curl", "data_table", "downloader", "fst", "ggplot2", "gridExtra", "httr", "jsonlite", "rtracklayer", "txdbmaker", "withr", "xml2"] }, "OSAT": { "name": "OSAT", @@ -4183,19 +4195,19 @@ "name": "OUTRIDER", "version": "1.22.0", "sha256": "1zdv48ms62sy6pv24xnx5jf0286dr68zglckl38na2gvqymn8zj4", - "depends": ["BBmisc", "BiocGenerics", "BiocParallel", "data_table", "DESeq2", "generics", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggrepel", "heatmaply", "IRanges", "matrixStats", "pcaMethods", "pheatmap", "plotly", "plyr", "PRROC", "RColorBrewer", "Rcpp", "RcppArmadillo", "reshape2", "S4Vectors", "scales", "SummarizedExperiment", "txdbmaker"] + "depends": ["BBmisc", "BiocGenerics", "BiocParallel", "DESeq2", "GenomicFeatures", "GenomicRanges", "IRanges", "PRROC", "RColorBrewer", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment", "data_table", "generics", "ggplot2", "ggrepel", "heatmaply", "matrixStats", "pcaMethods", "pheatmap", "plotly", "plyr", "reshape2", "scales", "txdbmaker"] }, "OVESEG": { "name": "OVESEG", "version": "1.20.0", "sha256": "0bj2d8i5b9y3zrcpm7qapdywd1s3zgqiikz4by1l7832z7r2imyx", - "depends": ["BiocParallel", "fdrtool", "limma", "Rcpp", "SummarizedExperiment"] + "depends": ["BiocParallel", "Rcpp", "SummarizedExperiment", "fdrtool", "limma"] }, "OmaDB": { "name": "OmaDB", "version": "2.20.0", "sha256": "093hqayqa0gb3m6yckqa75i9ha9laxlkpjj4y64nzgja1ny2g17b", - "depends": ["ape", "Biostrings", "GenomicRanges", "httr", "IRanges", "jsonlite", "plyr", "topGO"] + "depends": ["Biostrings", "GenomicRanges", "IRanges", "ape", "httr", "jsonlite", "plyr", "topGO"] }, "OmicCircos": { "name": "OmicCircos", @@ -4211,8 +4223,8 @@ }, "OmnipathR": { "name": "OmnipathR", - "version": "3.11.10", - "sha256": "1izy0ycrvac0k67dxq8879rbdghkrczd3s2g5v607js7bmfxybjz", + "version": "3.12.2", + "sha256": "0ya013p8lsmmkv21r68c0bh72qrq3a6rxsmqvcbzhr558sqgv9mb", "depends": ["checkmate", "crayon", "curl", "digest", "dplyr", "httr", "igraph", "jsonlite", "later", "logger", "lubridate", "magrittr", "progress", "purrr", "rappdirs", "readr", "readxl", "rlang", "rmarkdown", "rvest", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "withr", "xml2", "yaml"] }, "OncoScore": { @@ -4225,13 +4237,13 @@ "name": "OncoSimulR", "version": "4.6.0", "sha256": "1j7d7ajlalhiwn12kpbagx8f0gnfsals4p5bkiik7a5ybwann33r", - "depends": ["car", "data_table", "dplyr", "ggplot2", "ggrepel", "graph", "gtools", "igraph", "RColorBrewer", "Rcpp", "Rgraphviz", "smatr", "stringr"] + "depends": ["RColorBrewer", "Rcpp", "Rgraphviz", "car", "data_table", "dplyr", "ggplot2", "ggrepel", "graph", "gtools", "igraph", "smatr", "stringr"] }, "OpenStats": { "name": "OpenStats", "version": "1.16.0", "sha256": "1hxazy0rf0rvvr1ivw33fi72099x3blzzzwymckxhqskmsj52120", - "depends": ["AICcmodavg", "car", "Hmisc", "jsonlite", "knitr", "MASS", "nlme", "rlist", "summarytools"] + "depends": ["AICcmodavg", "Hmisc", "MASS", "car", "jsonlite", "knitr", "nlme", "rlist", "summarytools"] }, "OrderedList": { "name": "OrderedList", @@ -4243,55 +4255,55 @@ "name": "Organism.dplyr", "version": "1.32.0", "sha256": "03z5pyqbaxwyrq5m858c8k69fwvclq98ksr84dc4m7r8lzz2hfxx", - "depends": ["AnnotationDbi", "AnnotationFilter", "BiocFileCache", "DBI", "dbplyr", "dplyr", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "rlang", "RSQLite", "S4Vectors", "tibble"] + "depends": ["AnnotationDbi", "AnnotationFilter", "BiocFileCache", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "dbplyr", "dplyr", "rlang", "tibble"] }, "OrganismDbi": { "name": "OrganismDbi", "version": "1.46.0", "sha256": "1cfh632rpmklmyd5cibwiy0i2pk2kk2m39g8mq5sxfwd2am4r0jk", - "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocManager", "DBI", "GenomicFeatures", "GenomicRanges", "graph", "IRanges", "RBGL", "S4Vectors", "txdbmaker"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocManager", "DBI", "GenomicFeatures", "GenomicRanges", "IRanges", "RBGL", "S4Vectors", "graph", "txdbmaker"] }, "Oscope": { "name": "Oscope", "version": "1.34.0", "sha256": "16d2ngakdg73rdx0bf1pz3z1n8npjzl3b7dn94g9zbayw4vp3x5z", - "depends": ["BiocParallel", "cluster", "EBSeq", "testthat"] + "depends": ["BiocParallel", "EBSeq", "cluster", "testthat"] }, "OutSplice": { "name": "OutSplice", "version": "1.4.0", "sha256": "1kln52s2a0icvsna2ip08gsmggbbp8arj4mnpaj068ff6maa4hy6", - "depends": ["AnnotationDbi", "GenomicFeatures", "GenomicRanges", "IRanges", "org_Hs_eg_db", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene"] + "depends": ["AnnotationDbi", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "org_Hs_eg_db"] }, "PAA": { "name": "PAA", "version": "1.38.0", "sha256": "1afkvcb4d5iqzmn1nk51kn9xmwpbps00ymarsj3bc7zlf9aani4c", - "depends": ["e1071", "gplots", "gtools", "limma", "MASS", "mRMRe", "randomForest", "Rcpp", "ROCR", "sva"] + "depends": ["MASS", "ROCR", "Rcpp", "e1071", "gplots", "gtools", "limma", "mRMRe", "randomForest", "sva"] }, "PADOG": { "name": "PADOG", "version": "1.46.0", "sha256": "0rm8zyvgipb22z47nxyalfpdww8c7360zbmx4n7g3lnd2v8csgks", - "depends": ["AnnotationDbi", "Biobase", "doRNG", "foreach", "GSA", "hgu133a_db", "hgu133plus2_db", "KEGGdzPathwaysGEO", "KEGGREST", "limma", "nlme"] + "depends": ["AnnotationDbi", "Biobase", "GSA", "KEGGREST", "KEGGdzPathwaysGEO", "doRNG", "foreach", "hgu133a_db", "hgu133plus2_db", "limma", "nlme"] }, "PAIRADISE": { "name": "PAIRADISE", "version": "1.20.0", "sha256": "1dj5rx6jhcr3k9szhvaqc1savfbpqbm9q4i6n18mj23wzvvqhrp4", - "depends": ["abind", "BiocParallel", "nloptr", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocParallel", "S4Vectors", "SummarizedExperiment", "abind", "nloptr"] }, "PANR": { "name": "PANR", "version": "1.50.0", "sha256": "14s6ldpxvzkxh356s5i40sx4x286g81qjyfsd2ax4y32kk7qdb7r", - "depends": ["igraph", "MASS", "pvclust", "RedeR"] + "depends": ["MASS", "RedeR", "igraph", "pvclust"] }, "PAST": { "name": "PAST", "version": "1.20.0", "sha256": "01d7lw7x0wfszpi9lnq9alpba3d54z6lcai4fpdn4y53diamaygy", - "depends": ["doParallel", "dplyr", "foreach", "GenomicRanges", "ggplot2", "iterators", "qvalue", "rlang", "rtracklayer", "S4Vectors"] + "depends": ["GenomicRanges", "S4Vectors", "doParallel", "dplyr", "foreach", "ggplot2", "iterators", "qvalue", "rlang", "rtracklayer"] }, "PCAN": { "name": "PCAN", @@ -4303,19 +4315,19 @@ "name": "PCAtools", "version": "2.16.0", "sha256": "04a1fvwgqxzf7992lyh9qzz2z2fgmfwfjvpw5xr21pcrpas57l2r", - "depends": ["beachmat", "BH", "BiocParallel", "BiocSingular", "cowplot", "DelayedArray", "DelayedMatrixStats", "dqrng", "ggplot2", "ggrepel", "lattice", "Matrix", "Rcpp", "reshape2"] + "depends": ["BH", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "Rcpp", "beachmat", "cowplot", "dqrng", "ggplot2", "ggrepel", "lattice", "reshape2"] }, "PDATK": { "name": "PDATK", "version": "1.12.0", "sha256": "079gdwh9m90r5b0p0szqv222sgdmjr6s3sz19l5xz0435r7h53nv", - "depends": ["BiocGenerics", "BiocParallel", "caret", "clusterRepro", "ConsensusClusterPlus", "CoreGx", "data_table", "dplyr", "genefu", "ggplot2", "ggplotify", "igraph", "MatrixGenerics", "matrixStats", "MultiAssayExperiment", "piano", "plyr", "pROC", "RColorBrewer", "reportROC", "rlang", "S4Vectors", "scales", "SummarizedExperiment", "survcomp", "survival", "survminer", "switchBox", "verification"] + "depends": ["BiocGenerics", "BiocParallel", "ConsensusClusterPlus", "CoreGx", "MatrixGenerics", "MultiAssayExperiment", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "caret", "clusterRepro", "data_table", "dplyr", "genefu", "ggplot2", "ggplotify", "igraph", "matrixStats", "pROC", "piano", "plyr", "reportROC", "rlang", "scales", "survcomp", "survival", "survminer", "switchBox", "verification"] }, "PECA": { "name": "PECA", "version": "1.40.0", "sha256": "0vx17yhls9ccmp0mns7w89dq49d3alqnzxvq3kvhjrdxnhgdn5d1", - "depends": ["affy", "aroma_affymetrix", "aroma_core", "genefilter", "limma", "preprocessCore", "ROTS"] + "depends": ["ROTS", "affy", "aroma_affymetrix", "aroma_core", "genefilter", "limma", "preprocessCore"] }, "PICS": { "name": "PICS", @@ -4327,19 +4339,19 @@ "name": "PING", "version": "2.48.0", "sha256": "1r09afnm6m9s9z7f0g6wsm677pc681j985psddzgqfmcdwbz75i3", - "depends": ["BiocGenerics", "BSgenome", "fda", "GenomicRanges", "Gviz", "IRanges", "PICS", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "GenomicRanges", "Gviz", "IRanges", "PICS", "S4Vectors", "fda"] }, "PIPETS": { "name": "PIPETS", - "version": "1.0.0", - "sha256": "12cbjmdgbjif3kjm9km55nvnb0srw8nzcf3x3gw86v1wi718jzv7", - "depends": ["BiocGenerics", "dplyr", "GenomicRanges"] + "version": "1.0.3", + "sha256": "0argzw874689hn4dddips86rpvn4i176gxj18j3f2jx5z4j61y4a", + "depends": ["BiocGenerics", "GenomicRanges", "dplyr"] }, "PIUMA": { "name": "PIUMA", "version": "1.0.0", "sha256": "10b8d8525pz7bl8kg5ga0ca2ngns7g9ik2grhvx920mza7pail46", - "depends": ["cluster", "dbscan", "ggplot2", "Hmisc", "igraph", "kernlab", "patchwork", "scales", "SummarizedExperiment", "tsne", "umap", "vegan"] + "depends": ["Hmisc", "SummarizedExperiment", "cluster", "dbscan", "ggplot2", "igraph", "kernlab", "patchwork", "scales", "tsne", "umap", "vegan"] }, "PLPE": { "name": "PLPE", @@ -4351,31 +4363,31 @@ "name": "PLSDAbatch", "version": "1.0.0", "sha256": "15zaxr8qv5rp04r8430bl8llkdx4vhwkjn8bl8a8sv6q39vvqvys", - "depends": ["Biobase", "BiocStyle", "ggplot2", "ggpubr", "gridExtra", "lmerTest", "mixOmics", "performance", "pheatmap", "Rdpack", "scales", "TreeSummarizedExperiment", "vegan"] + "depends": ["Biobase", "BiocStyle", "Rdpack", "TreeSummarizedExperiment", "ggplot2", "ggpubr", "gridExtra", "lmerTest", "mixOmics", "performance", "pheatmap", "scales", "vegan"] }, "POMA": { "name": "POMA", "version": "1.14.0", "sha256": "1g9xsmg3zv5h7l2wxk4zm4fsihzah8phg33p2hhqbinzkzk6pbkw", - "depends": ["broom", "caret", "ComplexHeatmap", "dbscan", "DESeq2", "dplyr", "FSA", "ggplot2", "ggrepel", "glmnet", "impute", "janitor", "limma", "lme4", "magrittr", "MASS", "mixOmics", "randomForest", "RankProd", "rlang", "SummarizedExperiment", "sva", "tibble", "tidyr", "uwot", "vegan"] + "depends": ["ComplexHeatmap", "DESeq2", "FSA", "MASS", "RankProd", "SummarizedExperiment", "broom", "caret", "dbscan", "dplyr", "ggplot2", "ggrepel", "glmnet", "impute", "janitor", "limma", "lme4", "magrittr", "mixOmics", "randomForest", "rlang", "sva", "tibble", "tidyr", "uwot", "vegan"] }, "POWSC": { "name": "POWSC", "version": "1.12.0", "sha256": "01jh4lhipkj5iga3vp0m42klpi8160mbzsqb5b029h7sil8n3w94", - "depends": ["Biobase", "ggplot2", "limma", "MAST", "pheatmap", "RColorBrewer", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["Biobase", "MAST", "RColorBrewer", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "limma", "pheatmap"] }, "PPInfer": { "name": "PPInfer", "version": "1.30.0", "sha256": "1b5x9z2w9vpnkbmgh05lxpg1pkjhxnsxaz86ma018czicarxqcx3", - "depends": ["biomaRt", "fgsea", "ggplot2", "httr", "igraph", "kernlab", "STRINGdb", "yeastExpData"] + "depends": ["STRINGdb", "biomaRt", "fgsea", "ggplot2", "httr", "igraph", "kernlab", "yeastExpData"] }, "PREDA": { "name": "PREDA", "version": "1.50.0", "sha256": "17xcaw5spcl41dgilpx6cq9df1zzzrk4x6xaxpa5pmmfn7gfk4zv", - "depends": ["annotate", "Biobase", "lokern", "multtest"] + "depends": ["Biobase", "annotate", "lokern", "multtest"] }, "PROMISE": { "name": "PROMISE", @@ -4405,25 +4417,25 @@ "name": "PSMatch", "version": "1.8.0", "sha256": "13w145is3d95392qqdq6qh3mrlcixbj0jzz4r590xas1qjp5d03h", - "depends": ["BiocGenerics", "BiocParallel", "igraph", "Matrix", "MsCoreUtils", "ProtGenerics", "QFeatures", "S4Vectors"] + "depends": ["BiocGenerics", "BiocParallel", "Matrix", "MsCoreUtils", "ProtGenerics", "QFeatures", "S4Vectors", "igraph"] }, "PWMEnrich": { "name": "PWMEnrich", "version": "4.40.0", "sha256": "0fzmsm880w1vwbjcakc5mkljx41rpk8m71g49kwmjgb1z36173m2", - "depends": ["BiocGenerics", "Biostrings", "evd", "gdata", "S4Vectors", "seqLogo"] + "depends": ["BiocGenerics", "Biostrings", "S4Vectors", "evd", "gdata", "seqLogo"] }, "PanViz": { "name": "PanViz", "version": "1.6.0", "sha256": "1h4fxqxkaph5j3vkfhmmkhvmqa8czzdzxcg6f06v94hqf38i86i5", - "depends": ["colorspace", "data_table", "dplyr", "easycsv", "futile_logger", "igraph", "magrittr", "RColorBrewer", "rentrez", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["RColorBrewer", "colorspace", "data_table", "dplyr", "easycsv", "futile_logger", "igraph", "magrittr", "rentrez", "rlang", "stringr", "tibble", "tidyr"] }, "PanomiR": { "name": "PanomiR", "version": "1.8.0", "sha256": "0hzhhrknspdw81dn48xqx532n27lj88k57ydsfxfm6rkix87pv96", - "depends": ["clusterProfiler", "dplyr", "forcats", "GSEABase", "igraph", "limma", "metap", "org_Hs_eg_db", "preprocessCore", "RColorBrewer", "rlang", "tibble", "withr"] + "depends": ["GSEABase", "RColorBrewer", "clusterProfiler", "dplyr", "forcats", "igraph", "limma", "metap", "org_Hs_eg_db", "preprocessCore", "rlang", "tibble", "withr"] }, "Path2PPI": { "name": "Path2PPI", @@ -4441,85 +4453,85 @@ "name": "PathoStat", "version": "1.30.0", "sha256": "1y3gzv4nq9jykdl07mabw51m60g267hb5sjjn3p9g7r6ysasj8c2", - "depends": ["ape", "BiocStyle", "ComplexHeatmap", "corpcor", "DESeq2", "devtools", "dplyr", "DT", "edgeR", "ggplot2", "glmnet", "gmodels", "knitr", "limma", "matrixStats", "phyloseq", "plotly", "plyr", "RColorBrewer", "rentrez", "reshape2", "ROCR", "scales", "shiny", "shinyjs", "tidyr", "vegan", "webshot", "XML"] + "depends": ["BiocStyle", "ComplexHeatmap", "DESeq2", "DT", "RColorBrewer", "ROCR", "XML", "ape", "corpcor", "devtools", "dplyr", "edgeR", "ggplot2", "glmnet", "gmodels", "knitr", "limma", "matrixStats", "phyloseq", "plotly", "plyr", "rentrez", "reshape2", "scales", "shiny", "shinyjs", "tidyr", "vegan", "webshot"] }, "PeacoQC": { "name": "PeacoQC", "version": "1.14.0", "sha256": "1r354h8lmp0r2nlvr9xj45dm8gbqrsfhl2p3wc9gvldsllq7z3ix", - "depends": ["circlize", "ComplexHeatmap", "flowCore", "flowWorkspace", "ggplot2", "gridExtra", "plyr"] + "depends": ["ComplexHeatmap", "circlize", "flowCore", "flowWorkspace", "ggplot2", "gridExtra", "plyr"] }, "Pedixplorer": { "name": "Pedixplorer", "version": "1.0.0", "sha256": "0nkvypb1gh0b43p864c9rnfbvsdc9jb2jr3c0jrg33crxjf6rmr0", - "depends": ["dplyr", "ggplot2", "Matrix", "plyr", "quadprog", "S4Vectors", "stringr", "testthat", "tidyr"] + "depends": ["Matrix", "S4Vectors", "dplyr", "ggplot2", "plyr", "quadprog", "stringr", "testthat", "tidyr"] }, "PepsNMR": { "name": "PepsNMR", "version": "1.22.0", "sha256": "0z3kw8j972zmrcyikag5js20zpgc3l5bgkn5q31dzi1q7ynpkwhv", - "depends": ["ggplot2", "gridExtra", "Matrix", "matrixStats", "ptw", "reshape2"] + "depends": ["Matrix", "ggplot2", "gridExtra", "matrixStats", "ptw", "reshape2"] }, "PhIPData": { "name": "PhIPData", "version": "1.12.0", "sha256": "1ar7fdsxngdyikcvi7j230jqfhdvji4cvfrxkn606wy764mrpyrm", - "depends": ["BiocFileCache", "BiocGenerics", "cli", "edgeR", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocFileCache", "BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "cli", "edgeR"] }, "PharmacoGx": { "name": "PharmacoGx", "version": "3.8.0", "sha256": "098zg2c8xiw6v8fc072cnwlls5q762yjykaf6cjhyrz00bqxmvh1", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "boot", "caTools", "checkmate", "coop", "CoreGx", "data_table", "downloader", "ggplot2", "jsonlite", "magicaxis", "MultiAssayExperiment", "RColorBrewer", "Rcpp", "reshape2", "S4Vectors", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "CoreGx", "MultiAssayExperiment", "RColorBrewer", "Rcpp", "S4Vectors", "SummarizedExperiment", "boot", "caTools", "checkmate", "coop", "data_table", "downloader", "ggplot2", "jsonlite", "magicaxis", "reshape2"] }, "PhenStat": { "name": "PhenStat", "version": "2.40.0", "sha256": "0dpnij94h808aab8pyvvk7lnfn00f1hkisaasv28blj14fml63s8", - "depends": ["car", "corrplot", "ggplot2", "graph", "knitr", "lme4", "logistf", "MASS", "msgps", "nlme", "nortest", "pingr", "reshape", "SmoothWin"] + "depends": ["MASS", "SmoothWin", "car", "corrplot", "ggplot2", "graph", "knitr", "lme4", "logistf", "msgps", "nlme", "nortest", "pingr", "reshape"] }, "PhenoGeneRanker": { "name": "PhenoGeneRanker", "version": "1.12.0", "sha256": "1l85ibg1nm4dvwjc7b1gqmq6z5yrg3phfr24i23fzlddbwyx75hh", - "depends": ["doParallel", "dplyr", "foreach", "igraph", "Matrix"] + "depends": ["Matrix", "doParallel", "dplyr", "foreach", "igraph"] }, "PhosR": { "name": "PhosR", "version": "1.14.0", "sha256": "05lc2l65nl15250f39rw7pcsfxw74rcakb6gg5wcp515iv13li07", - "depends": ["BiocGenerics", "circlize", "dendextend", "dplyr", "e1071", "GGally", "ggdendro", "ggplot2", "ggpubr", "ggtext", "igraph", "limma", "network", "pcaMethods", "pheatmap", "preprocessCore", "RColorBrewer", "reshape2", "rlang", "ruv", "S4Vectors", "stringi", "SummarizedExperiment", "tidyr"] + "depends": ["BiocGenerics", "GGally", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "circlize", "dendextend", "dplyr", "e1071", "ggdendro", "ggplot2", "ggpubr", "ggtext", "igraph", "limma", "network", "pcaMethods", "pheatmap", "preprocessCore", "reshape2", "rlang", "ruv", "stringi", "tidyr"] }, "PhyloProfile": { "name": "PhyloProfile", "version": "1.18.0", "sha256": "04z6k0i28d48v1d7n7zgxkb9n1747k27h5b5zlj8id8w293ggcaa", - "depends": ["ape", "BiocStyle", "bioDist", "Biostrings", "colourpicker", "data_table", "DT", "energy", "ExperimentHub", "ggplot2", "gridExtra", "OmaDB", "pbapply", "plyr", "RColorBrewer", "RCurl", "shiny", "shinyBS", "shinycssloaders", "shinyFiles", "shinyjs", "stringr", "xml2", "yaml", "zoo"] + "depends": ["BiocStyle", "Biostrings", "DT", "ExperimentHub", "OmaDB", "RColorBrewer", "RCurl", "ape", "bioDist", "colourpicker", "data_table", "energy", "ggplot2", "gridExtra", "pbapply", "plyr", "shiny", "shinyBS", "shinyFiles", "shinycssloaders", "shinyjs", "stringr", "xml2", "yaml", "zoo"] }, "Pigengene": { "name": "Pigengene", "version": "1.30.0", "sha256": "08jgn7cx3gvxsih8jp9xh1irf7f0j0yfw4srbc6ynffc0197papc", - "depends": ["BiocStyle", "bnlearn", "C50", "clusterProfiler", "DBI", "DOSE", "dplyr", "gdata", "ggplot2", "GO_db", "graph", "impute", "MASS", "matrixStats", "openxlsx", "partykit", "pheatmap", "preprocessCore", "ReactomePA", "Rgraphviz", "WGCNA"] + "depends": ["BiocStyle", "C50", "DBI", "DOSE", "GO_db", "MASS", "ReactomePA", "Rgraphviz", "WGCNA", "bnlearn", "clusterProfiler", "dplyr", "gdata", "ggplot2", "graph", "impute", "matrixStats", "openxlsx", "partykit", "pheatmap", "preprocessCore"] }, "PoDCall": { "name": "PoDCall", "version": "1.12.0", "sha256": "121clnkr598p7iy91s0dp76ammz853p2cds0zy15pjj8n21rc7lv", - "depends": ["diptest", "DT", "ggplot2", "gridExtra", "LaplacesDemon", "mclust", "purrr", "readr", "rlist", "shiny", "shinyjs"] + "depends": ["DT", "LaplacesDemon", "diptest", "ggplot2", "gridExtra", "mclust", "purrr", "readr", "rlist", "shiny", "shinyjs"] }, "PrInCE": { "name": "PrInCE", "version": "1.20.0", "sha256": "173vakwqjalh2spz1f7qq6ngw8hjkqpj4zf0rx6xsnycjn54jip0", - "depends": ["Biobase", "dplyr", "forecast", "Hmisc", "LiblineaR", "magrittr", "MSnbase", "naivebayes", "progress", "purrr", "ranger", "Rdpack", "robustbase", "speedglm", "tester", "tidyr"] + "depends": ["Biobase", "Hmisc", "LiblineaR", "MSnbase", "Rdpack", "dplyr", "forecast", "magrittr", "naivebayes", "progress", "purrr", "ranger", "robustbase", "speedglm", "tester", "tidyr"] }, "Prostar": { "name": "Prostar", "version": "1.36.2", "sha256": "140whr7klab1as5y8h9lbmlgn4f63kfdfhzjyxjp8pk3aq1xv53i", - "depends": ["Biobase", "colourpicker", "DAPAR", "DAPARdata", "data_table", "DT", "future", "ggplot2", "gplots", "gtools", "highcharter", "htmlwidgets", "later", "markdown", "promises", "R_utils", "rclipboard", "RColorBrewer", "rhandsontable", "sass", "shiny", "shinyAce", "shinyBS", "shinycssloaders", "shinyjqui", "shinyjs", "shinythemes", "shinyTree", "shinyWidgets", "tibble", "vioplot", "webshot", "XML"] + "depends": ["Biobase", "DAPAR", "DAPARdata", "DT", "RColorBrewer", "R_utils", "XML", "colourpicker", "data_table", "future", "ggplot2", "gplots", "gtools", "highcharter", "htmlwidgets", "later", "markdown", "promises", "rclipboard", "rhandsontable", "sass", "shiny", "shinyAce", "shinyBS", "shinyTree", "shinyWidgets", "shinycssloaders", "shinyjqui", "shinyjs", "shinythemes", "tibble", "vioplot", "webshot"] }, "ProtGenerics": { "name": "ProtGenerics", @@ -4531,7 +4543,7 @@ "name": "ProteoDisco", "version": "1.10.0", "sha256": "10cdniinadihp4acdz22c0zjg3if3rqn9cy753f2x1nq539n3vql", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "checkmate", "cleaver", "dplyr", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "ParallelLogger", "plyr", "rlang", "S4Vectors", "tibble", "tidyr", "VariantAnnotation", "XVector"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "ParallelLogger", "S4Vectors", "VariantAnnotation", "XVector", "checkmate", "cleaver", "dplyr", "plyr", "rlang", "tibble", "tidyr"] }, "ProteoMM": { "name": "ProteoMM", @@ -4543,79 +4555,79 @@ "name": "PureCN", "version": "2.10.0", "sha256": "1vywvl90nvqlzbamn6g6iparn3b09zkz95sw13rgp8qlqc192nbf", - "depends": ["Biobase", "BiocGenerics", "Biostrings", "data_table", "DNAcopy", "futile_logger", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "gridExtra", "IRanges", "Matrix", "mclust", "RColorBrewer", "rhdf5", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "VGAM"] + "depends": ["Biobase", "BiocGenerics", "Biostrings", "DNAcopy", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VGAM", "VariantAnnotation", "data_table", "futile_logger", "ggplot2", "gridExtra", "mclust", "rhdf5", "rtracklayer"] }, "Pviz": { "name": "Pviz", "version": "1.38.0", "sha256": "1hshfgnidshwfka8l0fs4x4znpmmdi42wnkrrl6rhchj9dymjcnr", - "depends": ["Biostrings", "biovizBase", "data_table", "GenomicRanges", "Gviz", "IRanges"] + "depends": ["Biostrings", "GenomicRanges", "Gviz", "IRanges", "biovizBase", "data_table"] }, "QDNAseq": { "name": "QDNAseq", "version": "1.40.0", "sha256": "1myk6qgl45ya7qw6sx6xc98d8m5ffl2ghm3zvqmyh9r0sp6x184f", - "depends": ["Biobase", "CGHbase", "CGHcall", "DNAcopy", "future_apply", "GenomicRanges", "IRanges", "matrixStats", "R_utils", "Rsamtools"] + "depends": ["Biobase", "CGHbase", "CGHcall", "DNAcopy", "GenomicRanges", "IRanges", "R_utils", "Rsamtools", "future_apply", "matrixStats"] }, "QFeatures": { "name": "QFeatures", - "version": "1.14.1", - "sha256": "1sgvabfad3zibrg449y7hw8l59yb2d8q01x7lp841m45b1g0q9d8", - "depends": ["AnnotationFilter", "Biobase", "BiocGenerics", "igraph", "IRanges", "lazyeval", "MsCoreUtils", "MultiAssayExperiment", "plotly", "ProtGenerics", "reshape2", "S4Vectors", "SummarizedExperiment", "tidyr", "tidyselect"] + "version": "1.14.2", + "sha256": "1vd1kvx2kr47czz58375msc2x8p155cn0zqr4w7i1v1ki951r3a4", + "depends": ["AnnotationFilter", "Biobase", "BiocGenerics", "IRanges", "MsCoreUtils", "MultiAssayExperiment", "ProtGenerics", "S4Vectors", "SummarizedExperiment", "igraph", "lazyeval", "plotly", "reshape2", "tidyr", "tidyselect"] }, "QSutils": { "name": "QSutils", "version": "1.22.0", "sha256": "10z7cmhaqn4cp2lw3xq1mhjcjbph2lsprdz8k9q3qkmxgzl3anik", - "depends": ["ape", "BiocGenerics", "Biostrings", "psych", "pwalign"] + "depends": ["BiocGenerics", "Biostrings", "ape", "psych", "pwalign"] }, "QTLExperiment": { "name": "QTLExperiment", "version": "1.2.0", "sha256": "1kns5kgfazfyg3bf19hvkqngq4n6xzqww5aya2h8bakl53bzk2sc", - "depends": ["ashr", "BiocGenerics", "checkmate", "collapse", "dplyr", "rlang", "S4Vectors", "SummarizedExperiment", "tibble", "tidyr", "vroom"] + "depends": ["BiocGenerics", "S4Vectors", "SummarizedExperiment", "ashr", "checkmate", "collapse", "dplyr", "rlang", "tibble", "tidyr", "vroom"] }, "QUBIC": { "name": "QUBIC", "version": "1.32.0", "sha256": "1dqg7vdpmsjd5prswz7g223q0wzwih44k8fz2cy5a83cdc1c7xl2", - "depends": ["biclust", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "biclust"] }, "Qtlizer": { "name": "Qtlizer", "version": "1.18.0", "sha256": "0m307wfjqg7rrgsxvphggy1vd3l9l58vknjqnc63j02qr0wsw43m", - "depends": ["curl", "GenomicRanges", "httr", "stringi"] + "depends": ["GenomicRanges", "curl", "httr", "stringi"] }, "QuartPAC": { "name": "QuartPAC", "version": "1.36.0", "sha256": "0ha8gv7a6ia4z2z2r7404hngc1sy269hrpj9gdxwhj7hl15nqs30", - "depends": ["Biostrings", "data_table", "GraphPAC", "iPAC", "pwalign", "SpacePAC"] + "depends": ["Biostrings", "GraphPAC", "SpacePAC", "data_table", "iPAC", "pwalign"] }, "QuasR": { "name": "QuasR", "version": "1.44.0", "sha256": "116qnp7d7z4a56fv6n55yzrdlmma9gwrw234nmy8iapkn5ms3xky", - "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "IRanges", "Rbowtie", "Rhtslib", "Rsamtools", "rtracklayer", "S4Vectors", "ShortRead", "txdbmaker"] + "depends": ["AnnotationDbi", "BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "IRanges", "Rbowtie", "Rhtslib", "Rsamtools", "S4Vectors", "ShortRead", "rtracklayer", "txdbmaker"] }, "QuaternaryProd": { "name": "QuaternaryProd", "version": "1.38.0", "sha256": "0bpx4lliz75jh6d2ngrmjc21577aawrcs7lh1k5pwg94jmj03pmg", - "depends": ["dplyr", "Rcpp", "yaml"] + "depends": ["Rcpp", "dplyr", "yaml"] }, "R3CPET": { "name": "R3CPET", "version": "1.36.0", "sha256": "12gq5mj6vbkd49slhpgnmwfdl65hr4wip9xbqx3j72b0f0yabg1h", - "depends": ["BiocGenerics", "clValid", "data_table", "GenomeInfoDb", "GenomicRanges", "ggbio", "ggplot2", "Hmisc", "igraph", "IRanges", "pheatmap", "Rcpp", "RCurl", "reshape2", "S4Vectors"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "Hmisc", "IRanges", "RCurl", "Rcpp", "S4Vectors", "clValid", "data_table", "ggbio", "ggplot2", "igraph", "pheatmap", "reshape2"] }, "R453Plus1Toolbox": { "name": "R453Plus1Toolbox", "version": "1.54.0", "sha256": "0x5p028x13hygd1b2l4g2dclm9lnwj1hsh6x58hmkpbx27w68rb9", - "depends": ["Biobase", "BiocGenerics", "biomaRt", "Biostrings", "BSgenome", "GenomicRanges", "IRanges", "pwalign", "R2HTML", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "TeachingDemos", "VariantAnnotation", "xtable", "XVector"] + "depends": ["BSgenome", "Biobase", "BiocGenerics", "Biostrings", "GenomicRanges", "IRanges", "R2HTML", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "TeachingDemos", "VariantAnnotation", "XVector", "biomaRt", "pwalign", "xtable"] }, "R4RNA": { "name": "R4RNA", @@ -4627,7 +4639,7 @@ "name": "RAIDS", "version": "1.2.0", "sha256": "0frwaqmbd74gccqj8ibkgkyj1ii7q8qczzmkv9wgi4m0d9m2cy0v", - "depends": ["AnnotationDbi", "AnnotationFilter", "BSgenome", "class", "ensembldb", "gdsfmt", "GENESIS", "GenomicRanges", "IRanges", "MatrixGenerics", "pROC", "rlang", "S4Vectors", "SNPRelate", "VariantAnnotation"] + "depends": ["AnnotationDbi", "AnnotationFilter", "BSgenome", "GENESIS", "GenomicRanges", "IRanges", "MatrixGenerics", "S4Vectors", "SNPRelate", "VariantAnnotation", "class", "ensembldb", "gdsfmt", "pROC", "rlang"] }, "RAREsim": { "name": "RAREsim", @@ -4651,7 +4663,7 @@ "name": "RBioFormats", "version": "1.4.0", "sha256": "1xwazjipv1yrxyx9mny7j7mmc7mvdlrmvjwy8v3i2hfmf137nlj1", - "depends": ["EBImage", "rJava", "S4Vectors"] + "depends": ["EBImage", "S4Vectors", "rJava"] }, "RBioinf": { "name": "RBioinf", @@ -4663,7 +4675,7 @@ "name": "RCAS", "version": "1.30.0", "sha256": "0ll0sj2zyazw0nxbpybq9frmxvmcjkgk3hwp3flnysjxg056dhxg", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "cowplot", "data_table", "DT", "genomation", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "gprofiler2", "IRanges", "knitr", "pbapply", "pheatmap", "plotly", "plotrix", "proxy", "ranger", "rmarkdown", "RSQLite", "rtracklayer", "S4Vectors", "seqLogo", "txdbmaker"] + "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BiocGenerics", "Biostrings", "DT", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "cowplot", "data_table", "genomation", "ggplot2", "gprofiler2", "knitr", "pbapply", "pheatmap", "plotly", "plotrix", "proxy", "ranger", "rmarkdown", "rtracklayer", "seqLogo", "txdbmaker"] }, "RCASPAR": { "name": "RCASPAR", @@ -4675,13 +4687,13 @@ "name": "RCM", "version": "1.20.0", "sha256": "03f8gifzqhc5hdppk4lfybj7p3gkqb5jnpsxpf515dd7c5y210gy", - "depends": ["alabama", "DBI", "edgeR", "ggplot2", "MASS", "nleqslv", "phyloseq", "RColorBrewer", "reshape2", "tensor", "tseries", "VGAM"] + "depends": ["DBI", "MASS", "RColorBrewer", "VGAM", "alabama", "edgeR", "ggplot2", "nleqslv", "phyloseq", "reshape2", "tensor", "tseries"] }, "RCSL": { "name": "RCSL", "version": "1.12.0", "sha256": "1r103i9v8b5w74b3ad7fr25sgsd0xx5kjrxawbwks57dk9k8m272", - "depends": ["ggplot2", "igraph", "MatrixGenerics", "NbClust", "pracma", "Rcpp", "RcppAnnoy", "Rtsne", "SingleCellExperiment", "umap"] + "depends": ["MatrixGenerics", "NbClust", "Rcpp", "RcppAnnoy", "Rtsne", "SingleCellExperiment", "ggplot2", "igraph", "pracma", "umap"] }, "RCX": { "name": "RCX", @@ -4693,13 +4705,13 @@ "name": "RCy3", "version": "2.24.0", "sha256": "03zmskcb8n87x6m5jlhsh2b0b2qjk91y16fdcj3kz5c1j7zfs18i", - "depends": ["base64enc", "base64url", "BiocGenerics", "fs", "glue", "gplots", "graph", "httr", "IRdisplay", "IRkernel", "RColorBrewer", "RCurl", "RJSONIO", "stringi", "uuid", "XML"] + "depends": ["BiocGenerics", "IRdisplay", "IRkernel", "RColorBrewer", "RCurl", "RJSONIO", "XML", "base64enc", "base64url", "fs", "glue", "gplots", "graph", "httr", "stringi", "uuid"] }, "RCyjs": { "name": "RCyjs", "version": "2.26.1", "sha256": "0apqkpcrl7snsaldzranz1sk6zl6vc0rgrdg5h0srkzwdqnx10sh", - "depends": ["base64enc", "BiocGenerics", "BrowserViz", "graph", "httpuv"] + "depends": ["BiocGenerics", "BrowserViz", "base64enc", "graph", "httpuv"] }, "RDRToolbox": { "name": "RDRToolbox", @@ -4717,25 +4729,25 @@ "name": "REDseq", "version": "1.50.0", "sha256": "15lx6sjw8rm0lrvyjfq3n4nq0r6rlgwvnm6bafd86a1dii934gf8", - "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "BSgenome", "BSgenome_Celegans_UCSC_ce2", "ChIPpeakAnno", "IRanges", "multtest"] + "depends": ["AnnotationDbi", "BSgenome", "BSgenome_Celegans_UCSC_ce2", "BiocGenerics", "Biostrings", "ChIPpeakAnno", "IRanges", "multtest"] }, "REMP": { "name": "REMP", "version": "1.28.0", "sha256": "1ss4170nxif8942095nk5lv1knqf082i4nlxsr3kyvf8ghqn2gmd", - "depends": ["AnnotationHub", "BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "caret", "doParallel", "foreach", "GenomeInfoDb", "GenomicRanges", "impute", "IRanges", "iterators", "kernlab", "minfi", "org_Hs_eg_db", "ranger", "readr", "rtracklayer", "S4Vectors", "settings", "SummarizedExperiment"] + "depends": ["AnnotationHub", "BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "caret", "doParallel", "foreach", "impute", "iterators", "kernlab", "minfi", "org_Hs_eg_db", "ranger", "readr", "rtracklayer", "settings"] }, "RESOLVE": { "name": "RESOLVE", "version": "1.6.0", "sha256": "12ax0f3vasppwn5z10fr2mhhaaiyiii5qi3ll4yzsn7qmy02ya52", - "depends": ["Biostrings", "BSgenome", "BSgenome_Hsapiens_1000genomes_hs37d5", "data_table", "GenomeInfoDb", "GenomicRanges", "ggplot2", "glmnet", "gridExtra", "IRanges", "lsa", "MutationalPatterns", "nnls", "reshape2", "S4Vectors"] + "depends": ["BSgenome", "BSgenome_Hsapiens_1000genomes_hs37d5", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "MutationalPatterns", "S4Vectors", "data_table", "ggplot2", "glmnet", "gridExtra", "lsa", "nnls", "reshape2"] }, "RGMQL": { "name": "RGMQL", "version": "1.24.0", "sha256": "1p7s17i18ql3b8yvg6pmcz62ql18ncd3hqk0rganmahfbd91idby", - "depends": ["BiocGenerics", "data_table", "dplyr", "GenomicRanges", "glue", "httr", "plyr", "RGMQLlib", "rJava", "rtracklayer", "S4Vectors", "xml2"] + "depends": ["BiocGenerics", "GenomicRanges", "RGMQLlib", "S4Vectors", "data_table", "dplyr", "glue", "httr", "plyr", "rJava", "rtracklayer", "xml2"] }, "RGSEA": { "name": "RGSEA", @@ -4753,7 +4765,7 @@ "name": "RITAN", "version": "1.28.0", "sha256": "1jvwvgdqgxlnccf8k2mc1ihg4nasdqbl0pnm7khw3px39b1bnlzl", - "depends": ["AnnotationFilter", "BgeeDB", "dynamicTreeCut", "EnsDb_Hsapiens_v86", "ensembldb", "GenomicFeatures", "ggplot2", "gplots", "gridExtra", "gsubfn", "hash", "igraph", "knitr", "linkcomm", "MCL", "plotrix", "png", "RColorBrewer", "reshape2", "RITANdata", "sqldf", "STRINGdb"] + "depends": ["AnnotationFilter", "BgeeDB", "EnsDb_Hsapiens_v86", "GenomicFeatures", "MCL", "RColorBrewer", "RITANdata", "STRINGdb", "dynamicTreeCut", "ensembldb", "ggplot2", "gplots", "gridExtra", "gsubfn", "hash", "igraph", "knitr", "linkcomm", "plotrix", "png", "reshape2", "sqldf"] }, "RIVER": { "name": "RIVER", @@ -4765,13 +4777,13 @@ "name": "RImmPort", "version": "1.32.0", "sha256": "0kvl9ivf0y7wjkaj7a5qbn9hv9ghbl00xm55i30p4vsvk8q32h3s", - "depends": ["data_table", "DBI", "dplyr", "plyr", "reshape2", "RSQLite", "sqldf"] + "depends": ["DBI", "RSQLite", "data_table", "dplyr", "plyr", "reshape2", "sqldf"] }, "RJMCMCNucleosomes": { "name": "RJMCMCNucleosomes", "version": "1.28.0", "sha256": "0w9d61zd6g3c8dp9i68nw8rmbnrf6lfa86m9a7ydkf54w7p33fsk", - "depends": ["BiocGenerics", "BiocParallel", "consensusSeekeR", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rcpp", "S4Vectors"] + "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rcpp", "S4Vectors", "consensusSeekeR"] }, "RLMM": { "name": "RLMM", @@ -4783,19 +4795,19 @@ "name": "RLassoCox", "version": "1.12.0", "sha256": "14zw0xnssh17c6v4qy3b81qrv453r2ayjnq62d1ix695xl7q2g43", - "depends": ["glmnet", "igraph", "Matrix", "survival"] + "depends": ["Matrix", "glmnet", "igraph", "survival"] }, "RMassBank": { "name": "RMassBank", "version": "3.14.0", "sha256": "05ymkjk6hkilm4wn7qn6dh1gf4pxp3zk339fbi10jri8ar0ilbls", - "depends": ["assertthat", "Biobase", "ChemmineOB", "ChemmineR", "data_table", "digest", "enviPat", "glue", "httr", "logger", "MSnbase", "mzR", "R_utils", "rcdk", "Rcpp", "readJDX", "rjson", "S4Vectors", "webchem", "XML", "yaml"] + "depends": ["Biobase", "ChemmineOB", "ChemmineR", "MSnbase", "R_utils", "Rcpp", "S4Vectors", "XML", "assertthat", "data_table", "digest", "enviPat", "glue", "httr", "logger", "mzR", "rcdk", "readJDX", "rjson", "webchem", "yaml"] }, "RNAAgeCalc": { "name": "RNAAgeCalc", "version": "1.16.0", "sha256": "1h221flwa8b4dchw3b65cx7z11744cljzimqc2pv991dp21bvhnk", - "depends": ["AnnotationDbi", "ggplot2", "impute", "org_Hs_eg_db", "recount", "SummarizedExperiment"] + "depends": ["AnnotationDbi", "SummarizedExperiment", "ggplot2", "impute", "org_Hs_eg_db", "recount"] }, "RNASeqPower": { "name": "RNASeqPower", @@ -4807,19 +4819,19 @@ "name": "RNAdecay", "version": "1.24.0", "sha256": "1bf0mgj1n38wqapabbw9d74s5099sqlpkhb9yd9p8w48hwfdk4nc", - "depends": ["ggplot2", "gplots", "nloptr", "scales", "TMB"] + "depends": ["TMB", "ggplot2", "gplots", "nloptr", "scales"] }, "RNAinteract": { "name": "RNAinteract", "version": "1.52.0", "sha256": "18jxg1wxa4z8ik9g7q3rr6mijrl1vk4b7wnkxs5pll6qz97mh726", - "depends": ["abind", "Biobase", "cellHTS2", "geneplotter", "gplots", "hwriter", "ICS", "ICSNP", "lattice", "latticeExtra", "limma", "locfit", "RColorBrewer", "splots"] + "depends": ["Biobase", "ICS", "ICSNP", "RColorBrewer", "abind", "cellHTS2", "geneplotter", "gplots", "hwriter", "lattice", "latticeExtra", "limma", "locfit", "splots"] }, "RNAmodR": { "name": "RNAmodR", "version": "1.18.0", "sha256": "0c4ndc7r3rpk8gmd0n4n5q0x72cz3ja48sq4w3w9ahn05l9qql2v", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "colorRamps", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "Gviz", "IRanges", "matrixStats", "Modstrings", "RColorBrewer", "reshape2", "ROCR", "Rsamtools", "rtracklayer", "S4Vectors", "txdbmaker"] + "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "Modstrings", "RColorBrewer", "ROCR", "Rsamtools", "S4Vectors", "colorRamps", "ggplot2", "matrixStats", "reshape2", "rtracklayer", "txdbmaker"] }, "RNAmodR_AlkAnilineSeq": { "name": "RNAmodR.AlkAnilineSeq", @@ -4831,7 +4843,7 @@ "name": "RNAmodR.ML", "version": "1.18.0", "sha256": "1xcpjq8w81gw52fjb5ijdlf2k94qwqf6s6c8h6y6rja1csqpkn9i", - "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "ranger", "RNAmodR", "S4Vectors"] + "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "RNAmodR", "S4Vectors", "ranger"] }, "RNAmodR_RiboMethSeq": { "name": "RNAmodR.RiboMethSeq", @@ -4843,7 +4855,7 @@ "name": "RNAsense", "version": "1.18.0", "sha256": "1ynaylwxb1vcwx5g14sw1lz6sidnbhc0gb4z3i8gz1yr32mpnmgl", - "depends": ["ggplot2", "NBPSeq", "qvalue", "SummarizedExperiment"] + "depends": ["NBPSeq", "SummarizedExperiment", "ggplot2", "qvalue"] }, "RNAseqCovarImpute": { "name": "RNAseqCovarImpute", @@ -4861,7 +4873,7 @@ "name": "ROCpAI", "version": "1.16.0", "sha256": "1nisrspdl4m6q9hpxhd49dxhfsi27znh4alcvc7gbhlqmbi0q9cs", - "depends": ["boot", "fission", "knitr", "SummarizedExperiment"] + "depends": ["SummarizedExperiment", "boot", "fission", "knitr"] }, "ROSeq": { "name": "ROSeq", @@ -4879,13 +4891,13 @@ "name": "ROntoTools", "version": "2.32.0", "sha256": "0idclyk1dwpmfksf9l9ms4nwpin1flw50bafxa0pqlh9fdj5bz0z", - "depends": ["boot", "graph", "KEGGgraph", "KEGGREST", "Rgraphviz"] + "depends": ["KEGGREST", "KEGGgraph", "Rgraphviz", "boot", "graph"] }, "RPA": { "name": "RPA", "version": "1.60.0", "sha256": "0v1jkny311ba43fz7x4i94ddm5hq9281gfj6wkr3disdbxjqgj37", - "depends": ["affy", "BiocGenerics", "BiocStyle", "phyloseq", "rmarkdown"] + "depends": ["BiocGenerics", "BiocStyle", "affy", "phyloseq", "rmarkdown"] }, "RProtoBufLib": { "name": "RProtoBufLib", @@ -4915,25 +4927,25 @@ "name": "RTCA", "version": "1.56.0", "sha256": "078bh47vfkr5a0qvhnjadjzd0ph3pg32dv1r3ssvz9fq8qg4g0hy", - "depends": ["Biobase", "gtools", "RColorBrewer"] + "depends": ["Biobase", "RColorBrewer", "gtools"] }, "RTCGA": { "name": "RTCGA", "version": "1.34.0", "sha256": "1a967id4anjzpdlbdd8a85fvb1z7mcr759pr91aashv12bzzhnk0", - "depends": ["assertthat", "data_table", "dplyr", "ggplot2", "ggthemes", "htmltools", "knitr", "purrr", "RCurl", "rmarkdown", "rvest", "scales", "stringi", "survival", "survminer", "viridis", "XML", "xml2"] + "depends": ["RCurl", "XML", "assertthat", "data_table", "dplyr", "ggplot2", "ggthemes", "htmltools", "knitr", "purrr", "rmarkdown", "rvest", "scales", "stringi", "survival", "survminer", "viridis", "xml2"] }, "RTCGAToolbox": { "name": "RTCGAToolbox", "version": "2.34.0", "sha256": "0l4idk6gsrnm7laj1xkm6jwmyy5l90kphm21zk7y33cpnp2ryjwr", - "depends": ["BiocGenerics", "data_table", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "httr", "RaggedExperiment", "RCurl", "RJSONIO", "rvest", "S4Vectors", "stringr", "SummarizedExperiment", "TCGAutils"] + "depends": ["BiocGenerics", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "RCurl", "RJSONIO", "RaggedExperiment", "S4Vectors", "SummarizedExperiment", "TCGAutils", "data_table", "httr", "rvest", "stringr"] }, "RTN": { "name": "RTN", "version": "2.28.0", "sha256": "09zd8z3wn26r7bamzq17slamydr73aqlx94zi0273npfggcwv4n1", - "depends": ["car", "data_table", "igraph", "IRanges", "limma", "minet", "mixtools", "pheatmap", "pwr", "RedeR", "S4Vectors", "snow", "SummarizedExperiment", "viper"] + "depends": ["IRanges", "RedeR", "S4Vectors", "SummarizedExperiment", "car", "data_table", "igraph", "limma", "minet", "mixtools", "pheatmap", "pwr", "snow", "viper"] }, "RTNduals": { "name": "RTNduals", @@ -4945,7 +4957,7 @@ "name": "RTNsurvival", "version": "1.28.0", "sha256": "1545jbis4gpcggw320kkrh7s2dllw4rwpq0qc95zm9v9yjxzzzk6", - "depends": ["data_table", "dunn_test", "egg", "ggplot2", "pheatmap", "RColorBrewer", "RTN", "RTNduals", "scales", "survival"] + "depends": ["RColorBrewer", "RTN", "RTNduals", "data_table", "dunn_test", "egg", "ggplot2", "pheatmap", "scales", "survival"] }, "RTopper": { "name": "RTopper", @@ -4957,13 +4969,13 @@ "name": "RUVSeq", "version": "1.38.0", "sha256": "0i91kjwransy6l217rmxfzfchb43h1sjk8ygf0y8a3rv6rp7ylfd", - "depends": ["Biobase", "EDASeq", "edgeR", "MASS"] + "depends": ["Biobase", "EDASeq", "MASS", "edgeR"] }, "RUVcorr": { "name": "RUVcorr", "version": "1.36.0", "sha256": "05fga28l65h21b84pn6gn6vrgglnvpblmrz551qj2djrmzda3pn1", - "depends": ["BiocParallel", "bladderbatch", "corrplot", "gridExtra", "lattice", "MASS", "psych", "reshape2", "snowfall"] + "depends": ["BiocParallel", "MASS", "bladderbatch", "corrplot", "gridExtra", "lattice", "psych", "reshape2", "snowfall"] }, "RUVnormalize": { "name": "RUVnormalize", @@ -4975,37 +4987,37 @@ "name": "RVS", "version": "1.26.0", "sha256": "10j84lhap7c74scar3gmk983zi6lhl8zvawp9ap46qf8wrpnqp4k", - "depends": ["GENLIB", "gRain", "kinship2", "R_utils", "snpStats"] + "depends": ["GENLIB", "R_utils", "gRain", "kinship2", "snpStats"] }, "RadioGx": { "name": "RadioGx", "version": "2.8.0", "sha256": "0ykw5hm48fh6xqxdfgmjjbqdd5hp4dmhnykg3zkmb9wrcfp4zx7f", - "depends": ["assertthat", "Biobase", "BiocGenerics", "BiocParallel", "caTools", "CoreGx", "data_table", "downloader", "magicaxis", "matrixStats", "RColorBrewer", "reshape2", "S4Vectors", "scales", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "CoreGx", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "assertthat", "caTools", "data_table", "downloader", "magicaxis", "matrixStats", "reshape2", "scales"] }, "RaggedExperiment": { "name": "RaggedExperiment", - "version": "1.28.0", - "sha256": "1mzjc52naf6brffv6d2bak16y3ygz9lsk8yqgcfa44180bslz3xx", + "version": "1.28.1", + "sha256": "0xfg88r5nh0qswsfc3mm595jmf2w8s2dr032apd15b3kc40hjlr9", "depends": ["BiocBaseUtils", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "S4Vectors", "SummarizedExperiment"] }, "RankProd": { "name": "RankProd", "version": "3.30.0", "sha256": "0y9c833zn3l4492cl7b71x5g7q6kr81zh2f3v9x4l52q6mw6l5qh", - "depends": ["gmp", "Rmpfr"] + "depends": ["Rmpfr", "gmp"] }, "RareVariantVis": { "name": "RareVariantVis", "version": "2.32.0", "sha256": "08siw7yzx1jd3cgg2mirc27ycpk6wdvv4vcwzln1ps35nkhy52in", - "depends": ["BiocGenerics", "BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "GenomicScores", "googleVis", "gtools", "IRanges", "phastCons100way_UCSC_hg19", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "VariantAnnotation"] + "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "GenomicScores", "IRanges", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "VariantAnnotation", "googleVis", "gtools", "phastCons100way_UCSC_hg19"] }, "Rarr": { "name": "Rarr", "version": "1.4.0", "sha256": "0ks576wqzywlk07wlb116sjzs1b1103mwrd5410qya13mwq6yx62", - "depends": ["httr", "jsonlite", "paws_storage", "R_utils", "stringr"] + "depends": ["R_utils", "httr", "jsonlite", "paws_storage", "stringr"] }, "RbcBook1": { "name": "RbcBook1", @@ -5017,7 +5029,7 @@ "name": "Rbec", "version": "1.12.0", "sha256": "1cf5g2q8ak45ipb0cvgnrqy4s131g9lnchzs6g7mfj7b6ynkgp6d", - "depends": ["dada2", "doParallel", "foreach", "ggplot2", "Rcpp", "readr"] + "depends": ["Rcpp", "dada2", "doParallel", "foreach", "ggplot2", "readr"] }, "Rbowtie": { "name": "Rbowtie", @@ -5029,7 +5041,7 @@ "name": "Rbowtie2", "version": "2.10.0", "sha256": "1spwpbx1jjfjcxbwjkl64ccp9k8xs6lm828546qddsgp20y3bhgp", - "depends": ["magrittr", "Rsamtools"] + "depends": ["Rsamtools", "magrittr"] }, "Rbwa": { "name": "Rbwa", @@ -5041,7 +5053,7 @@ "name": "RcisTarget", "version": "1.24.0", "sha256": "1856jnvqacr12j5hnnl4w2abjjd7qvkz7cs8yhbnqpy1896wki0v", - "depends": ["arrow", "AUCell", "BiocGenerics", "data_table", "dplyr", "GenomeInfoDb", "GenomicRanges", "GSEABase", "R_utils", "S4Vectors", "SummarizedExperiment", "tibble", "zoo"] + "depends": ["AUCell", "BiocGenerics", "GSEABase", "GenomeInfoDb", "GenomicRanges", "R_utils", "S4Vectors", "SummarizedExperiment", "arrow", "data_table", "dplyr", "tibble", "zoo"] }, "Rcollectl": { "name": "Rcollectl", @@ -5051,21 +5063,21 @@ }, "Rcpi": { "name": "Rcpi", - "version": "1.40.0", - "sha256": "1zi7fsq02cac60z92nan9374b2l07qx2fa7jrcngs0xgjcw6k31n", - "depends": ["Biostrings", "doParallel", "foreach", "GOSemSim", "pwalign", "RCurl", "rjson", "rlang"] + "version": "1.40.1", + "sha256": "01p3z2ylkxvcyrzd9yizw2niw3fv3kn30is4cniy6r68qhm1msxy", + "depends": ["Biostrings", "GOSemSim", "curl", "doParallel", "foreach", "httr2", "rjson", "rlang"] }, "Rcwl": { "name": "Rcwl", "version": "1.20.0", "sha256": "02pxjcf3bbvv4hh2vr796b3pyd8vxh5v4g2bkgicsc0jw40554rr", - "depends": ["basilisk", "batchtools", "BiocParallel", "codetools", "DiagrammeR", "R_utils", "S4Vectors", "shiny", "yaml"] + "depends": ["BiocParallel", "DiagrammeR", "R_utils", "S4Vectors", "basilisk", "batchtools", "codetools", "shiny", "yaml"] }, "RcwlPipelines": { "name": "RcwlPipelines", "version": "1.20.0", "sha256": "1bivrgd9f431spg0gv1achs258rmyxcnggn7zh63z2nlskxx3pp1", - "depends": ["BiocFileCache", "git2r", "httr", "rappdirs", "Rcwl", "S4Vectors"] + "depends": ["BiocFileCache", "Rcwl", "S4Vectors", "git2r", "httr", "rappdirs"] }, "Rdisop": { "name": "Rdisop", @@ -5077,7 +5089,7 @@ "name": "ReUseData", "version": "1.4.0", "sha256": "1dai0mxsnjmr6gs465mljfnydai276i5zjjbgxphgas1z3iv9sz6", - "depends": ["basilisk", "BiocFileCache", "jsonlite", "Rcwl", "RcwlPipelines", "S4Vectors", "yaml"] + "depends": ["BiocFileCache", "Rcwl", "RcwlPipelines", "S4Vectors", "basilisk", "jsonlite", "yaml"] }, "ReactomeContentService4R": { "name": "ReactomeContentService4R", @@ -5089,13 +5101,13 @@ "name": "ReactomeGSA", "version": "1.18.0", "sha256": "188c0vrbq01gy4zhsf9wsg9amjf9434g0fzf3lnwzxdm0xzw2b33", - "depends": ["Biobase", "dplyr", "ggplot2", "gplots", "httr", "jsonlite", "progress", "RColorBrewer", "tidyr"] + "depends": ["Biobase", "RColorBrewer", "dplyr", "ggplot2", "gplots", "httr", "jsonlite", "progress", "tidyr"] }, "ReactomeGraph4R": { "name": "ReactomeGraph4R", "version": "1.12.0", "sha256": "17xkrqyp5wdsdd0gpplsk3qfsr8sgf1ap0vz6v34xlhbmzdq3rs8", - "depends": ["data_table", "doParallel", "foreach", "getPass", "jsonlite", "magrittr", "neo4r", "purrr", "ReactomeContentService4R", "rlang"] + "depends": ["ReactomeContentService4R", "data_table", "doParallel", "foreach", "getPass", "jsonlite", "magrittr", "neo4r", "purrr", "rlang"] }, "ReactomePA": { "name": "ReactomePA", @@ -5125,49 +5137,49 @@ "name": "RegEnrich", "version": "1.14.0", "sha256": "1gma0xsw72pi3shxlnvx3ynkvys2hv3g95gx2x0whdsarxwki34h", - "depends": ["BiocParallel", "BiocSet", "BiocStyle", "DESeq2", "DOSE", "dplyr", "fgsea", "ggplot2", "limma", "magrittr", "randomForest", "reshape2", "S4Vectors", "SummarizedExperiment", "tibble", "WGCNA"] + "depends": ["BiocParallel", "BiocSet", "BiocStyle", "DESeq2", "DOSE", "S4Vectors", "SummarizedExperiment", "WGCNA", "dplyr", "fgsea", "ggplot2", "limma", "magrittr", "randomForest", "reshape2", "tibble"] }, "RegionalST": { "name": "RegionalST", "version": "1.2.0", "sha256": "0gzc1m6ds6bnkq26bpq9i0mbpyw2biwnn07d30cdzipfsxbjdhlk", - "depends": ["assertthat", "BayesSpace", "colorspace", "dplyr", "fgsea", "ggplot2", "gridExtra", "magrittr", "RColorBrewer", "S4Vectors", "scater", "Seurat", "shiny", "SingleCellExperiment", "SummarizedExperiment", "tibble", "TOAST"] + "depends": ["BayesSpace", "RColorBrewer", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "TOAST", "assertthat", "colorspace", "dplyr", "fgsea", "ggplot2", "gridExtra", "magrittr", "scater", "shiny", "tibble"] }, "RepViz": { "name": "RepViz", "version": "1.20.0", "sha256": "1rww94wdpswy27i26zn25g8j2s1l14xmljhkz6fl45jmkfn4cqxa", - "depends": ["biomaRt", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors"] + "depends": ["GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "biomaRt"] }, "Repitools": { "name": "Repitools", "version": "1.50.0", "sha256": "1ypiiwi7kp5j8ayz3c9b1gzsy7kd1iw3zv35hrg7pb5fry63dg9g", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "cluster", "DNAcopy", "edgeR", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "gplots", "gsmoothr", "IRanges", "MASS", "Rsamtools", "Rsolnp", "rtracklayer", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "DNAcopy", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "Rsamtools", "Rsolnp", "S4Vectors", "cluster", "edgeR", "gplots", "gsmoothr", "rtracklayer"] }, "ReportingTools": { "name": "ReportingTools", "version": "2.44.0", "sha256": "0vq46dj2v3imjmf6cw8mab6k9v4rrc5r2vh100jjlsm3z15gvl17", - "depends": ["annotate", "AnnotationDbi", "Biobase", "BiocGenerics", "Category", "DESeq2", "edgeR", "ggbio", "ggplot2", "GOstats", "GSEABase", "hwriter", "IRanges", "knitr", "lattice", "limma", "PFAM_db", "R_utils", "XML"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "Category", "DESeq2", "GOstats", "GSEABase", "IRanges", "PFAM_db", "R_utils", "XML", "annotate", "edgeR", "ggbio", "ggplot2", "hwriter", "knitr", "lattice", "limma"] }, "ResidualMatrix": { "name": "ResidualMatrix", - "version": "1.14.0", - "sha256": "1q27zzl570q22nk4xjpnpa674p76hzzvilynx9i6awnzs10zjggn", + "version": "1.14.1", + "sha256": "1zq75i20kv0lgnh19zbhw5khxrag627ynqjvh3rj5kxbhj1l2z7c", "depends": ["DelayedArray", "Matrix", "S4Vectors"] }, "Rfastp": { "name": "Rfastp", "version": "1.14.0", "sha256": "1zk2zm08nv8i9q39s7dbppd3pk5kxki17x00971wwsfvl261hnsy", - "depends": ["ggplot2", "Rcpp", "reshape2", "Rhtslib", "rjson", "zlibbioc"] + "depends": ["Rcpp", "Rhtslib", "ggplot2", "reshape2", "rjson", "zlibbioc"] }, "RgnTX": { "name": "RgnTX", "version": "1.6.0", "sha256": "15mw5j8wjbzygqj1v5pqh0dz6n37y55p08yi884hpw7sn9dwkfsw", - "depends": ["GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "regioneR", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene"] + "depends": ["GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "ggplot2", "regioneR"] }, "Rgraphviz": { "name": "Rgraphviz", @@ -5197,19 +5209,19 @@ "name": "RiboCrypt", "version": "1.10.0", "sha256": "0ay8yl1fc4iizina4aqvyjr6iqpc7dr457l7w4p3849d3i160304", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "bslib", "data_table", "dplyr", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "htmlwidgets", "httr", "IRanges", "jsonlite", "knitr", "markdown", "NGLVieweR", "ORFik", "plotly", "RCurl", "rlang", "shiny", "shinycssloaders", "shinyhelper", "shinyjqui", "stringr"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "NGLVieweR", "ORFik", "RCurl", "bslib", "data_table", "dplyr", "ggplot2", "htmlwidgets", "httr", "jsonlite", "knitr", "markdown", "plotly", "rlang", "shiny", "shinycssloaders", "shinyhelper", "shinyjqui", "stringr"] }, "RiboDiPA": { "name": "RiboDiPA", "version": "1.12.0", "sha256": "0an2hbjzi514kb0m4l8i46w4zyxp510vw2f3xdmldjdyv5yw4v1z", - "depends": ["BiocFileCache", "BiocGenerics", "data_table", "DESeq2", "doParallel", "elitism", "foreach", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "matrixStats", "qvalue", "Rcpp", "reldist", "Rsamtools", "S4Vectors", "txdbmaker"] + "depends": ["BiocFileCache", "BiocGenerics", "DESeq2", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rcpp", "Rsamtools", "S4Vectors", "data_table", "doParallel", "elitism", "foreach", "ggplot2", "matrixStats", "qvalue", "reldist", "txdbmaker"] }, "RiboProfiling": { "name": "RiboProfiling", "version": "1.34.0", "sha256": "0h0sxmg4knsarh7w7dnp539cs9sfxjw4413q1yyyz3gbi23bzww4", - "depends": ["BiocGenerics", "Biostrings", "data_table", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggbio", "ggplot2", "IRanges", "plyr", "reshape2", "Rsamtools", "rtracklayer", "S4Vectors", "sqldf"] + "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "data_table", "ggbio", "ggplot2", "plyr", "reshape2", "rtracklayer", "sqldf"] }, "Rmagpie": { "name": "Rmagpie", @@ -5221,43 +5233,43 @@ "name": "Rmmquant", "version": "1.22.0", "sha256": "1jshnr4xph4glrk0pl3r8pklxnzg495m74yx25xjqg8avwahwvw4", - "depends": ["apeglm", "BiocStyle", "DESeq2", "devtools", "GenomicRanges", "org_Mm_eg_db", "Rcpp", "S4Vectors", "SummarizedExperiment", "TBX20BamSubset", "TxDb_Mmusculus_UCSC_mm9_knownGene"] + "depends": ["BiocStyle", "DESeq2", "GenomicRanges", "Rcpp", "S4Vectors", "SummarizedExperiment", "TBX20BamSubset", "TxDb_Mmusculus_UCSC_mm9_knownGene", "apeglm", "devtools", "org_Mm_eg_db"] }, "RnBeads": { "name": "RnBeads", "version": "2.22.0", "sha256": "0v7dzmbyskq0vmja09dncg1g50dl3iycg883swb7lfvi4xzr42vj", - "depends": ["BiocGenerics", "cluster", "ff", "fields", "GenomicRanges", "ggplot2", "gplots", "gridExtra", "illuminaio", "IRanges", "limma", "MASS", "matrixStats", "methylumi", "plyr", "S4Vectors"] + "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "cluster", "ff", "fields", "ggplot2", "gplots", "gridExtra", "illuminaio", "limma", "matrixStats", "methylumi", "plyr"] }, "RnaSeqSampleSize": { "name": "RnaSeqSampleSize", "version": "2.14.0", "sha256": "0zfmrpfnz8bka6z4408bl5mzv1yr7648qizy8b93qc903vx3zhvs", - "depends": ["biomaRt", "dplyr", "edgeR", "ggplot2", "ggpubr", "heatmap3", "KEGGREST", "matlab", "Rcpp", "recount", "RnaSeqSampleSizeData", "SummarizedExperiment", "tidyr", "tidyselect"] + "depends": ["KEGGREST", "Rcpp", "RnaSeqSampleSizeData", "SummarizedExperiment", "biomaRt", "dplyr", "edgeR", "ggplot2", "ggpubr", "heatmap3", "matlab", "recount", "tidyr", "tidyselect"] }, "Rnits": { "name": "Rnits", "version": "1.38.0", "sha256": "1c4l6flfyamnjhb3givw4icx6cbl2pnrvscalrywyhxpqk64cirv", - "depends": ["affy", "Biobase", "boot", "ggplot2", "impute", "limma", "qvalue", "reshape2"] + "depends": ["Biobase", "affy", "boot", "ggplot2", "impute", "limma", "qvalue", "reshape2"] }, "RolDE": { "name": "RolDE", "version": "1.8.0", "sha256": "11ishff55z086qgc28vxamc5blfxs95qn758f5cgvf9rfr8h64rz", - "depends": ["doParallel", "doRNG", "foreach", "matrixStats", "nlme", "qvalue", "rngtools", "ROTS", "SummarizedExperiment"] + "depends": ["ROTS", "SummarizedExperiment", "doParallel", "doRNG", "foreach", "matrixStats", "nlme", "qvalue", "rngtools"] }, "Rqc": { "name": "Rqc", "version": "1.38.0", "sha256": "0szd5ygcvpaiwqss8galxzxpslpfh93rk42s865v0qpv0s9v9x0l", - "depends": ["BiocGenerics", "BiocParallel", "BiocStyle", "Biostrings", "biovizBase", "GenomicAlignments", "GenomicFiles", "ggplot2", "IRanges", "knitr", "markdown", "plyr", "Rcpp", "reshape2", "Rsamtools", "S4Vectors", "shiny", "ShortRead"] + "depends": ["BiocGenerics", "BiocParallel", "BiocStyle", "Biostrings", "GenomicAlignments", "GenomicFiles", "IRanges", "Rcpp", "Rsamtools", "S4Vectors", "ShortRead", "biovizBase", "ggplot2", "knitr", "markdown", "plyr", "reshape2", "shiny"] }, "Rsamtools": { "name": "Rsamtools", "version": "2.20.0", "sha256": "04lz0dzwmgi8j9wyspbmjln6yb5fv4f538nqyrfd31d0g16937b8", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "bitops", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rhtslib", "S4Vectors", "XVector", "zlibbioc"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rhtslib", "S4Vectors", "XVector", "bitops", "zlibbioc"] }, "Rsubread": { "name": "Rsubread", @@ -5275,7 +5287,7 @@ "name": "Rtreemix", "version": "1.66.0", "sha256": "0rlhrzpyv95mm9wdqmn2wqqkgb3nm3irqrffba81ip7mn9fmdjsw", - "depends": ["Biobase", "graph", "Hmisc"] + "depends": ["Biobase", "Hmisc", "graph"] }, "Rvisdiff": { "name": "Rvisdiff", @@ -5287,67 +5299,67 @@ "name": "S4Arrays", "version": "1.4.1", "sha256": "0wdzp1q6hyks4afm217yl2n770jsqaqxix71imni1r0qbxdfkdwl", - "depends": ["abind", "BiocGenerics", "crayon", "IRanges", "Matrix", "S4Vectors"] + "depends": ["BiocGenerics", "IRanges", "Matrix", "S4Vectors", "abind", "crayon"] }, "S4Vectors": { "name": "S4Vectors", - "version": "0.42.0", - "sha256": "0aq0j70sl8a42gc1abxdwdy74mi9k4krz56yrbpwqv78x42cjjm9", + "version": "0.42.1", + "sha256": "080fr8f4lqzvn73y50wgz19w0a0hvkd9ilwswmv5gi34sihp8795", "depends": ["BiocGenerics"] }, "SAIGEgds": { "name": "SAIGEgds", - "version": "2.4.0", - "sha256": "1pkg72pqqlmj51vjz5p3qrj3b2lqqnzmh4ddbrn73rs66sgm9zkp", - "depends": ["CompQuadForm", "gdsfmt", "Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "SeqArray", "survey"] + "version": "2.4.1", + "sha256": "1nzr62hg99z0zzp0y74nis3xxgjsw2qc4w5xcm8p8j9kh9w7rwzk", + "depends": ["CompQuadForm", "Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "SeqArray", "gdsfmt", "survey"] }, "SARC": { "name": "SARC", "version": "1.2.0", "sha256": "11hiz7lzhkp2459c92x0i9kia7yc8zbl7n7c3wd66g2pbzfjzv6f", - "depends": ["data_table", "DescTools", "GenomicFeatures", "GenomicRanges", "ggplot2", "gridExtra", "gtable", "IRanges", "metap", "multtest", "plotly", "plyranges", "RaggedExperiment", "RColorBrewer", "reshape2", "scales", "tidyverse"] + "depends": ["DescTools", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "RaggedExperiment", "data_table", "ggplot2", "gridExtra", "gtable", "metap", "multtest", "plotly", "plyranges", "reshape2", "scales", "tidyverse"] }, "SBGNview": { "name": "SBGNview", "version": "1.18.0", "sha256": "1smxxwyc03m6bbw1l5bzfl6q2g2f93z53z8iyk42lwkfp26zv6i5", - "depends": ["AnnotationDbi", "bookdown", "httr", "igraph", "KEGGREST", "knitr", "pathview", "Rdpack", "rmarkdown", "rsvg", "SBGNview_data", "SummarizedExperiment", "xml2"] + "depends": ["AnnotationDbi", "KEGGREST", "Rdpack", "SBGNview_data", "SummarizedExperiment", "bookdown", "httr", "igraph", "knitr", "pathview", "rmarkdown", "rsvg", "xml2"] }, "SBMLR": { "name": "SBMLR", "version": "2.0.0", "sha256": "1h0pwlq229hbvh6ab2sjv67zd24i15xn4jh7k8s64faw4gw8ji14", - "depends": ["deSolve", "XML"] + "depends": ["XML", "deSolve"] }, "SC3": { "name": "SC3", "version": "1.32.0", "sha256": "0ylpk7jjqmy7g1s5ah5zwrcmqplhjm0rpnw74kn5mdra3d7xdsnr", - "depends": ["BiocGenerics", "cluster", "doParallel", "doRNG", "e1071", "foreach", "ggplot2", "pheatmap", "Rcpp", "RcppArmadillo", "robustbase", "ROCR", "rrcov", "S4Vectors", "shiny", "SingleCellExperiment", "SummarizedExperiment", "WriteXLS"] + "depends": ["BiocGenerics", "ROCR", "Rcpp", "RcppArmadillo", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "WriteXLS", "cluster", "doParallel", "doRNG", "e1071", "foreach", "ggplot2", "pheatmap", "robustbase", "rrcov", "shiny"] }, "SCAN_UPC": { "name": "SCAN.UPC", "version": "2.46.0", "sha256": "1awsy1xfsl90yxqc2qir7p51d34jddcqg5q02cc0925w6yqanaci", - "depends": ["affy", "affyio", "Biobase", "Biostrings", "foreach", "GEOquery", "IRanges", "MASS", "oligo", "sva"] + "depends": ["Biobase", "Biostrings", "GEOquery", "IRanges", "MASS", "affy", "affyio", "foreach", "oligo", "sva"] }, "SCANVIS": { "name": "SCANVIS", "version": "1.18.0", "sha256": "0nywyi5bp3qgh9xaydhpsdh5nvq0ybfvjqhygrs7lypanj4n1k7p", - "depends": ["IRanges", "plotrix", "RCurl", "rtracklayer"] + "depends": ["IRanges", "RCurl", "plotrix", "rtracklayer"] }, "SCArray": { "name": "SCArray", "version": "1.12.0", "sha256": "1a5343azhqfagkf2cbszaisn505aqc49hxki42qb92n5x3bgqbnb", - "depends": ["BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "gdsfmt", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "gdsfmt"] }, "SCArray_sat": { "name": "SCArray.sat", "version": "1.4.0", "sha256": "0y94f6rbjzn2jqkww808vysfdk6j3qw81v79w087d3adiywkl9xj", - "depends": ["BiocGenerics", "BiocParallel", "BiocSingular", "DelayedArray", "gdsfmt", "Matrix", "S4Vectors", "SCArray", "Seurat", "SeuratObject", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocParallel", "BiocSingular", "DelayedArray", "Matrix", "S4Vectors", "SCArray", "Seurat", "SeuratObject", "SummarizedExperiment", "gdsfmt"] }, "SCBN": { "name": "SCBN", @@ -5359,25 +5371,25 @@ "name": "SCFA", "version": "1.14.0", "sha256": "1avbvkky6m5f5cbfbhabapidz6ypngddrkg2dss7y0a7gy48634x", - "depends": ["BiocParallel", "cluster", "coro", "glmnet", "igraph", "Matrix", "matrixStats", "psych", "RhpcBLASctl", "survival", "torch"] + "depends": ["BiocParallel", "Matrix", "RhpcBLASctl", "cluster", "coro", "glmnet", "igraph", "matrixStats", "psych", "survival", "torch"] }, "SCOPE": { "name": "SCOPE", "version": "1.16.0", "sha256": "1x7kad59rav9rrjkqkdfbziflx3bngclz4mwkfkf53yl8km62pw0", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "DescTools", "DNAcopy", "doParallel", "foreach", "GenomeInfoDb", "GenomicRanges", "gplots", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors"] + "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BiocGenerics", "Biostrings", "DNAcopy", "DescTools", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "doParallel", "foreach", "gplots"] }, "SCnorm": { "name": "SCnorm", "version": "1.26.0", "sha256": "11q8g6fmsib4ms2ks003v9qc8n4rzchbcd02xnbah97qgxrmicbm", - "depends": ["BiocGenerics", "BiocParallel", "cluster", "data_table", "forcats", "ggplot2", "moments", "quantreg", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocParallel", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cluster", "data_table", "forcats", "ggplot2", "moments", "quantreg"] }, "SDAMS": { "name": "SDAMS", "version": "1.24.0", "sha256": "088k6bxdmkwv4zw8pvj2f4hl4b5jhrmlnvsh9mcqga7pmf5ir96b", - "depends": ["qvalue", "SummarizedExperiment", "trust"] + "depends": ["SummarizedExperiment", "qvalue", "trust"] }, "SELEX": { "name": "SELEX", @@ -5389,25 +5401,31 @@ "name": "SEtools", "version": "1.18.0", "sha256": "0j4pn85icyf1jwcfjr8r9049lrhglp3s5ighmcp9hvsjws04scis", - "depends": ["BiocParallel", "circlize", "data_table", "DESeq2", "edgeR", "Matrix", "openxlsx", "pheatmap", "S4Vectors", "sechm", "SummarizedExperiment", "sva"] + "depends": ["BiocParallel", "DESeq2", "Matrix", "S4Vectors", "SummarizedExperiment", "circlize", "data_table", "edgeR", "openxlsx", "pheatmap", "sechm", "sva"] + }, + "SGCP": { + "name": "SGCP", + "version": "1.4.1", + "sha256": "0l16002hzn3myadjkdyj1s7l7kql6f3gd8fjm8rklgs8x6pblk8c", + "depends": ["DescTools", "GO_db", "GOstats", "RColorBrewer", "RSpectra", "Rgraphviz", "SummarizedExperiment", "annotate", "caret", "dplyr", "expm", "genefilter", "ggplot2", "ggridges", "graph", "openxlsx", "org_Hs_eg_db", "plyr", "reshape2", "xtable"] }, "SGSeq": { "name": "SGSeq", "version": "1.38.0", "sha256": "1i3dg3fn648mzy49m15vbzr3wfnk91xyph5j4sc7ss978l25h17n", - "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "igraph", "IRanges", "Rsamtools", "rtracklayer", "RUnit", "S4Vectors", "SummarizedExperiment"] + "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RUnit", "Rsamtools", "S4Vectors", "SummarizedExperiment", "igraph", "rtracklayer"] }, "SIAMCAT": { "name": "SIAMCAT", "version": "2.8.0", "sha256": "00l9w395fg6r8p2jzz85x1djlj4h7y86dgs8x5xf14bn1am9q0sh", - "depends": ["beanplot", "corrplot", "glmnet", "gridBase", "gridExtra", "infotheo", "lgr", "LiblineaR", "lmerTest", "matrixStats", "mlr3", "mlr3learners", "mlr3tuning", "paradox", "phyloseq", "pROC", "progress", "PRROC", "RColorBrewer", "scales", "stringr"] + "depends": ["LiblineaR", "PRROC", "RColorBrewer", "beanplot", "corrplot", "glmnet", "gridBase", "gridExtra", "infotheo", "lgr", "lmerTest", "matrixStats", "mlr3", "mlr3learners", "mlr3tuning", "pROC", "paradox", "phyloseq", "progress", "scales", "stringr"] }, "SICtools": { "name": "SICtools", "version": "1.34.0", "sha256": "0ymk18aj4r0526xqqkrvd75p4jrgrq2wshx7mqh2wj7nizjfn8fv", - "depends": ["Biostrings", "doParallel", "GenomicRanges", "IRanges", "matrixStats", "plyr", "Rsamtools", "stringr"] + "depends": ["Biostrings", "GenomicRanges", "IRanges", "Rsamtools", "doParallel", "matrixStats", "plyr", "stringr"] }, "SIM": { "name": "SIM", @@ -5419,7 +5437,7 @@ "name": "SIMAT", "version": "1.36.0", "sha256": "1gwcr7lfsnzvlx0v93adlxmzdcx9rwfmhacpz3m8q26jm4vjmqib", - "depends": ["ggplot2", "mzR", "Rcpp", "reshape2"] + "depends": ["Rcpp", "ggplot2", "mzR", "reshape2"] }, "SIMD": { "name": "SIMD", @@ -5431,7 +5449,7 @@ "name": "SIMLR", "version": "1.30.0", "sha256": "18mld0yvkmy1znsv3dkch6f8x9h9j20zm3qq84ggw0wsbgrrcm1z", - "depends": ["Matrix", "pracma", "Rcpp", "RcppAnnoy", "RSpectra"] + "depends": ["Matrix", "RSpectra", "Rcpp", "RcppAnnoy", "pracma"] }, "SLqPCR": { "name": "SLqPCR", @@ -5443,13 +5461,13 @@ "name": "SMAD", "version": "1.20.0", "sha256": "0rj4f38nlr3a5fmf0dqhqi7iln78lkvghv4w8yr2kcavnsl4lzar", - "depends": ["dplyr", "magrittr", "Rcpp", "RcppAlgos", "tidyr"] + "depends": ["Rcpp", "RcppAlgos", "dplyr", "magrittr", "tidyr"] }, "SMITE": { "name": "SMITE", "version": "1.32.0", "sha256": "0dp4yas2gdwnvvbxdkid61j9c2a32cfcn3iw9nwijp6aqlv9rrv9", - "depends": ["AnnotationDbi", "Biobase", "BioNet", "geneLenDataBase", "GenomicRanges", "ggplot2", "goseq", "Hmisc", "igraph", "IRanges", "KEGGREST", "org_Hs_eg_db", "plyr", "reactome_db", "S4Vectors", "scales"] + "depends": ["AnnotationDbi", "BioNet", "Biobase", "GenomicRanges", "Hmisc", "IRanges", "KEGGREST", "S4Vectors", "geneLenDataBase", "ggplot2", "goseq", "igraph", "org_Hs_eg_db", "plyr", "reactome_db", "scales"] }, "SNAGEE": { "name": "SNAGEE", @@ -5467,19 +5485,19 @@ "name": "SNPediaR", "version": "1.30.0", "sha256": "1p33fmjdpscc42wicx23xg1jbg2m18msf4rhg9pr52n6yzr42b8v", - "depends": ["jsonlite", "RCurl"] + "depends": ["RCurl", "jsonlite"] }, "SNPhood": { "name": "SNPhood", "version": "1.34.0", "sha256": "1jniag2yq67y6s9cw8722a58k86i0nbksc2dxyv3pni2wwdka6r6", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "checkmate", "cluster", "data_table", "DESeq2", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gridExtra", "IRanges", "lattice", "RColorBrewer", "reshape2", "Rsamtools", "S4Vectors", "scales", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "DESeq2", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "checkmate", "cluster", "data_table", "ggplot2", "gridExtra", "lattice", "reshape2", "scales"] }, "SOMNiBUS": { "name": "SOMNiBUS", "version": "1.12.0", "sha256": "0p33r1ibpnln2rn4ls23prg7nmxznki9x7jc7qg3gc5fxip5b9n6", - "depends": ["annotatr", "BiocManager", "bsseq", "data_table", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "Matrix", "mgcv", "reshape2", "rtracklayer", "S4Vectors", "tidyr", "VGAM", "yaml"] + "depends": ["BiocManager", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "VGAM", "annotatr", "bsseq", "data_table", "ggplot2", "mgcv", "reshape2", "rtracklayer", "tidyr", "yaml"] }, "SPEM": { "name": "SPEM", @@ -5495,57 +5513,63 @@ }, "SPIAT": { "name": "SPIAT", - "version": "1.6.0", - "sha256": "09bs0pm2gd8fgb2q5kihwnb3dgaxkwjxl86di7kdj0im5hyr0d1h", - "depends": ["apcluster", "dbscan", "dittoSeq", "dplyr", "ggplot2", "gridExtra", "gtools", "mmand", "pracma", "RANN", "raster", "reshape2", "rlang", "sp", "SpatialExperiment", "spatstat_explore", "spatstat_geom", "SummarizedExperiment", "tibble", "vroom"] + "version": "1.6.2", + "sha256": "0if22cin355bq5bz8cn56041h8rszg2wf00sljzcac3mv2k1bgs5", + "depends": ["RANN", "SpatialExperiment", "SummarizedExperiment", "apcluster", "dbscan", "dittoSeq", "dplyr", "ggplot2", "gridExtra", "gtools", "mmand", "pracma", "raster", "reshape2", "rlang", "sp", "spatstat_explore", "spatstat_geom", "tibble", "vroom"] }, "SPLINTER": { "name": "SPLINTER", "version": "1.30.0", "sha256": "1x9lak4s7rhllnczr4n7a88haq4a36pmxbrgd2m7v69nyzxlab9w", - "depends": ["biomaRt", "Biostrings", "BSgenome_Mmusculus_UCSC_mm9", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "googleVis", "Gviz", "IRanges", "plyr", "pwalign", "S4Vectors", "seqLogo", "stringr"] + "depends": ["BSgenome_Mmusculus_UCSC_mm9", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "S4Vectors", "biomaRt", "ggplot2", "googleVis", "plyr", "pwalign", "seqLogo", "stringr"] + }, + "SPONGE": { + "name": "SPONGE", + "version": "1.26.1", + "sha256": "01sfkdd01l78z4p494080pq5f6wa65lp2m9ny5zbls7ibz9jpl48", + "depends": ["Biobase", "ComplexHeatmap", "MASS", "MetBrewer", "biomaRt", "caret", "cvms", "data_table", "doRNG", "dplyr", "expm", "foreach", "gRbase", "ggplot2", "ggpubr", "ggridges", "glmnet", "igraph", "iterators", "logging", "ppcor", "randomForest", "rlang", "stringr", "tidyr", "tidyverse", "tnet"] }, "SPOTlight": { "name": "SPOTlight", "version": "1.8.0", "sha256": "08cnlm6l34gp2spy2x08jr6abm58wrana1930jzwvvgm0mql9nzb", - "depends": ["ggplot2", "Matrix", "matrixStats", "NMF", "nnls", "SingleCellExperiment", "sparseMatrixStats"] + "depends": ["Matrix", "NMF", "SingleCellExperiment", "ggplot2", "matrixStats", "nnls", "sparseMatrixStats"] }, "SPsimSeq": { "name": "SPsimSeq", "version": "1.14.0", "sha256": "09n39bgbx8xkngdc056lz1p20375w7fljmgnkg7vacjvp288y2pi", - "depends": ["edgeR", "fitdistrplus", "Hmisc", "limma", "mvtnorm", "phyloseq", "SingleCellExperiment", "WGCNA"] + "depends": ["Hmisc", "SingleCellExperiment", "WGCNA", "edgeR", "fitdistrplus", "limma", "mvtnorm", "phyloseq"] }, "SQLDataFrame": { "name": "SQLDataFrame", "version": "1.18.0", "sha256": "1fdf6dvrkg5cjnlh9466dnmqjfg7dq7dj06qjc61zyshlvslxlwh", - "depends": ["BiocGenerics", "DBI", "DelayedArray", "duckdb", "RSQLite", "S4Vectors"] + "depends": ["BiocGenerics", "DBI", "DelayedArray", "RSQLite", "S4Vectors", "duckdb"] }, "SRAdb": { "name": "SRAdb", "version": "1.66.0", "sha256": "0qvqixmn8am90a4n5ydva630kkxr735y6kdcikp1q0k8pxxvbm0j", - "depends": ["GEOquery", "graph", "RCurl", "RSQLite"] + "depends": ["GEOquery", "RCurl", "RSQLite", "graph"] }, "STATegRa": { "name": "STATegRa", "version": "1.40.0", "sha256": "1m78hixyjavvryfcyd5g3f898r7hcn1cwdwbv3i2b9yj7z6r7knv", - "depends": ["affy", "Biobase", "calibrate", "edgeR", "foreach", "ggplot2", "gplots", "gridExtra", "limma", "MASS"] + "depends": ["Biobase", "MASS", "affy", "calibrate", "edgeR", "foreach", "ggplot2", "gplots", "gridExtra", "limma"] }, "STRINGdb": { "name": "STRINGdb", "version": "2.16.4", "sha256": "02fim09w9s38hvgp1g3fxqabd5r2fjysljlfrya2nr17drqkzqyx", - "depends": ["gplots", "hash", "httr", "igraph", "plotrix", "plyr", "png", "RColorBrewer", "sqldf"] + "depends": ["RColorBrewer", "gplots", "hash", "httr", "igraph", "plotrix", "plyr", "png", "sqldf"] }, "STdeconvolve": { "name": "STdeconvolve", "version": "1.8.0", "sha256": "0pyyxmh4bnavsdw6riv72y5m8l53mfr0lpiy9mh0qn57rlmw5fr9", - "depends": ["BiocParallel", "clue", "ggplot2", "Matrix", "mgcv", "reshape2", "scatterpie", "slam", "topicmodels", "viridis"] + "depends": ["BiocParallel", "Matrix", "clue", "ggplot2", "mgcv", "reshape2", "scatterpie", "slam", "topicmodels", "viridis"] }, "SUITOR": { "name": "SUITOR", @@ -5557,7 +5581,7 @@ "name": "SVMDO", "version": "1.4.0", "sha256": "11cn7kffgssbjk307vxjr6i2cs94fn6hhz09dbx5qgg89m4gsdgi", - "depends": ["AnnotationDbi", "BSDA", "caret", "caTools", "data_table", "DOSE", "dplyr", "e1071", "golem", "klaR", "nortest", "org_Hs_eg_db", "shiny", "shinyFiles", "shinytitle", "sjmisc", "SummarizedExperiment", "survival"] + "depends": ["AnnotationDbi", "BSDA", "DOSE", "SummarizedExperiment", "caTools", "caret", "data_table", "dplyr", "e1071", "golem", "klaR", "nortest", "org_Hs_eg_db", "shiny", "shinyFiles", "shinytitle", "sjmisc", "survival"] }, "SWATH2stats": { "name": "SWATH2stats", @@ -5575,7 +5599,7 @@ "name": "Scale4C", "version": "1.26.0", "sha256": "1h2swrs0vj9nzcr748jbk8c4bpnyc0gcq8bn5cyhd8lbd2b9xhv0", - "depends": ["GenomicRanges", "IRanges", "smoothie", "SummarizedExperiment"] + "depends": ["GenomicRanges", "IRanges", "SummarizedExperiment", "smoothie"] }, "ScaledMatrix": { "name": "ScaledMatrix", @@ -5587,7 +5611,7 @@ "name": "Sconify", "version": "1.24.0", "sha256": "07bz9bi71qxaipiw998jshm0wcwllhxfjmdxxxwg520rhmfs1g04", - "depends": ["dplyr", "flowCore", "FNN", "ggplot2", "magrittr", "readr", "Rtsne", "tibble"] + "depends": ["FNN", "Rtsne", "dplyr", "flowCore", "ggplot2", "magrittr", "readr", "tibble"] }, "ScreenR": { "name": "ScreenR", @@ -5599,19 +5623,19 @@ "name": "SemDist", "version": "1.38.0", "sha256": "03qzsrxwnsb8spfmnsyiyz83r8476lq17n3a8hrm6i13hxdqps29", - "depends": ["annotate", "AnnotationDbi", "GO_db"] + "depends": ["AnnotationDbi", "GO_db", "annotate"] }, "SeqArray": { "name": "SeqArray", - "version": "1.44.0", - "sha256": "1g8867y66f8ihr0w2shc17wxnavnkwn9y25f850nwvnn9nsbk88k", - "depends": ["Biostrings", "gdsfmt", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] + "version": "1.44.1", + "sha256": "0b0i17kwa8141y568k2asiv46hz4z0lwiqjz687d96j6kz3r3zgg", + "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "gdsfmt"] }, "SeqGSEA": { "name": "SeqGSEA", "version": "1.44.0", "sha256": "0nxrl5ip289hqnp4g85njm55kpk81kr1l87la6r3r5h0qx5x01cy", - "depends": ["Biobase", "biomaRt", "DESeq2", "doParallel"] + "depends": ["Biobase", "DESeq2", "biomaRt", "doParallel"] }, "SeqGate": { "name": "SeqGate", @@ -5623,13 +5647,13 @@ "name": "SeqSQC", "version": "1.26.0", "sha256": "0xsgr7wfy9qyjffb6spm0szknk3rbcx89k1ypdymybnjmndcslqf", - "depends": ["e1071", "ExperimentHub", "gdsfmt", "GenomicRanges", "GGally", "ggplot2", "IRanges", "plotly", "RColorBrewer", "reshape2", "rmarkdown", "S4Vectors", "SNPRelate"] + "depends": ["ExperimentHub", "GGally", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "SNPRelate", "e1071", "gdsfmt", "ggplot2", "plotly", "reshape2", "rmarkdown"] }, "SeqVarTools": { "name": "SeqVarTools", "version": "1.42.0", "sha256": "1mx3b21595n1v1fhy7lv67kdlxc2qdmkj0lm8gdnrs0l5f88jpgy", - "depends": ["Biobase", "BiocGenerics", "data_table", "gdsfmt", "GenomicRanges", "GWASExactHW", "IRanges", "logistf", "Matrix", "S4Vectors", "SeqArray"] + "depends": ["Biobase", "BiocGenerics", "GWASExactHW", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "SeqArray", "data_table", "gdsfmt", "logistf"] }, "SharedObject": { "name": "SharedObject", @@ -5641,19 +5665,19 @@ "name": "ShortRead", "version": "1.62.0", "sha256": "0x5iqx2k2xs5rwjch0bpcb8pgc0nhb571991yahdr8hsxwbas3jm", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "hwriter", "IRanges", "lattice", "latticeExtra", "pwalign", "Rhtslib", "Rsamtools", "S4Vectors", "XVector", "zlibbioc"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rhtslib", "Rsamtools", "S4Vectors", "XVector", "hwriter", "lattice", "latticeExtra", "pwalign", "zlibbioc"] }, "SiPSiC": { "name": "SiPSiC", - "version": "1.4.0", - "sha256": "158sjiza9wqd5ipl3fm1gx63qas6j3rqlk6ayw5hnf0al1g64z5q", + "version": "1.4.3", + "sha256": "0h9bd5dcl53m482icwj1yiz3016dy9f54hmqvxn8qjzjhqy9xic2", "depends": ["Matrix", "SingleCellExperiment"] }, "SigCheck": { "name": "SigCheck", "version": "2.36.0", "sha256": "1bnvk2v1mh615xhqab6129bgvv24azq9h9r1n2b3msbadwd0by1d", - "depends": ["Biobase", "BiocParallel", "e1071", "MLInterfaces", "survival"] + "depends": ["Biobase", "BiocParallel", "MLInterfaces", "e1071", "survival"] }, "SigFuge": { "name": "SigFuge", @@ -5665,19 +5689,19 @@ "name": "SigsPack", "version": "1.18.0", "sha256": "1dq3zqbbz5wbw2yf8w1sjgf1kd1nxap808ydvjr63zn10rm6m3vm", - "depends": ["Biobase", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicRanges", "quadprog", "rtracklayer", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["BSgenome", "Biobase", "Biostrings", "GenomeInfoDb", "GenomicRanges", "SummarizedExperiment", "VariantAnnotation", "quadprog", "rtracklayer"] }, "SimBu": { "name": "SimBu", "version": "1.6.0", "sha256": "1may613jla4id0g9w4nxsfqm36ma82gmzykvnifi5hwa63jvi7pb", - "depends": ["basilisk", "BiocParallel", "data_table", "dplyr", "ggplot2", "Matrix", "phyloseq", "proxyC", "RColorBrewer", "RCurl", "reticulate", "sparseMatrixStats", "SummarizedExperiment", "tidyr"] + "depends": ["BiocParallel", "Matrix", "RColorBrewer", "RCurl", "SummarizedExperiment", "basilisk", "data_table", "dplyr", "ggplot2", "phyloseq", "proxyC", "reticulate", "sparseMatrixStats", "tidyr"] }, "SimFFPE": { "name": "SimFFPE", "version": "1.16.0", "sha256": "1ccdk4g16bh1j420dspnh6il98j6ck6w2vgmqi82mf6js3cakd2z", - "depends": ["Biostrings", "doParallel", "dplyr", "foreach", "GenomicRanges", "IRanges", "Rsamtools", "truncnorm"] + "depends": ["Biostrings", "GenomicRanges", "IRanges", "Rsamtools", "doParallel", "dplyr", "foreach", "truncnorm"] }, "SingleCellAlleleExperiment": { "name": "SingleCellAlleleExperiment", @@ -5695,31 +5719,31 @@ "name": "SingleCellSignalR", "version": "1.16.0", "sha256": "0w7zj2fb45hzjx44kgn9qs3ab69v29vpl41nxvy931m32ndl5j04", - "depends": ["BiocManager", "circlize", "data_table", "edgeR", "foreach", "gplots", "igraph", "limma", "multtest", "pheatmap", "Rtsne", "scran", "stringr"] + "depends": ["BiocManager", "Rtsne", "circlize", "data_table", "edgeR", "foreach", "gplots", "igraph", "limma", "multtest", "pheatmap", "scran", "stringr"] }, "SingleMoleculeFootprinting": { "name": "SingleMoleculeFootprinting", "version": "1.12.0", "sha256": "1hyqnzz05f2i0r2b5qs1j58py3b042aiffyd6ns2hkrgnr62yldw", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "data_table", "GenomeInfoDb", "GenomicRanges", "IRanges", "plyr", "QuasR", "RColorBrewer"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "QuasR", "RColorBrewer", "data_table", "plyr"] }, "SingleR": { "name": "SingleR", "version": "2.6.0", "sha256": "0l33bsi1zfj7f4hzlivhh89phhx0qscrwd08c28mqvcyp91mhq16", - "depends": ["beachmat", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "Rcpp", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "Rcpp", "S4Vectors", "SummarizedExperiment", "beachmat"] }, "SomaticSignatures": { "name": "SomaticSignatures", "version": "2.40.0", "sha256": "0yvn2famnyxkxnw4r1vr0vma6ym9kb343vqgaqkvcp3zpm1fi0p8", - "depends": ["Biobase", "Biostrings", "GenomeInfoDb", "GenomicRanges", "ggbio", "ggplot2", "IRanges", "NMF", "pcaMethods", "proxy", "reshape2", "S4Vectors", "VariantAnnotation"] + "depends": ["Biobase", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "NMF", "S4Vectors", "VariantAnnotation", "ggbio", "ggplot2", "pcaMethods", "proxy", "reshape2"] }, "SpaceMarkers": { "name": "SpaceMarkers", "version": "1.0.0", "sha256": "02pb6jka0irzxmw0bzjns7jfc9jbbslg3c1xxjq1v9zf3s3is21a", - "depends": ["ape", "hdf5r", "jsonlite", "Matrix", "matrixStats", "matrixTests", "qvalue", "rstatix", "spatstat_explore", "spatstat_geom"] + "depends": ["Matrix", "ape", "hdf5r", "jsonlite", "matrixStats", "matrixTests", "qvalue", "rstatix", "spatstat_explore", "spatstat_geom"] }, "SpacePAC": { "name": "SpacePAC", @@ -5731,73 +5755,73 @@ "name": "Spaniel", "version": "1.18.0", "sha256": "03iil9iyvv9sqmkpi3hn1vqx7a2187h1ng7bzfs302dj9dpcqfaj", - "depends": ["dplyr", "DropletUtils", "ggplot2", "igraph", "jpeg", "jsonlite", "magrittr", "png", "S4Vectors", "scater", "scran", "Seurat", "shiny", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["DropletUtils", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "igraph", "jpeg", "jsonlite", "magrittr", "png", "scater", "scran", "shiny"] }, "SparseArray": { "name": "SparseArray", "version": "1.4.8", "sha256": "1ahwv6ih1700h1sccv9wh7hr5bhdif0ji5jbmsprnhjxfgn6xidm", - "depends": ["BiocGenerics", "IRanges", "Matrix", "MatrixGenerics", "matrixStats", "S4Arrays", "S4Vectors", "XVector"] + "depends": ["BiocGenerics", "IRanges", "Matrix", "MatrixGenerics", "S4Arrays", "S4Vectors", "XVector", "matrixStats"] }, "SparseSignatures": { "name": "SparseSignatures", "version": "2.14.0", "sha256": "1wq1vs94pw2zb896pn6z1zk67adrqwlhrcy1sp3s3m9jw0yaiqbw", - "depends": ["Biostrings", "BSgenome", "data_table", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gridExtra", "IRanges", "NMF", "nnlasso", "nnls", "reshape2"] + "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "NMF", "data_table", "ggplot2", "gridExtra", "nnlasso", "nnls", "reshape2"] }, "SpatialCPie": { "name": "SpatialCPie", "version": "1.20.0", "sha256": "0pj6m66a1qw3hi37qa4k7gpl1b8r731v9wflzr0q1yw9gwl99nh8", - "depends": ["colorspace", "data_table", "digest", "dplyr", "ggforce", "ggiraph", "ggplot2", "ggrepel", "igraph", "lpSolve", "purrr", "readr", "rlang", "shiny", "shinycssloaders", "shinyjs", "shinyWidgets", "SummarizedExperiment", "tibble", "tidyr", "tidyselect", "zeallot"] + "depends": ["SummarizedExperiment", "colorspace", "data_table", "digest", "dplyr", "ggforce", "ggiraph", "ggplot2", "ggrepel", "igraph", "lpSolve", "purrr", "readr", "rlang", "shiny", "shinyWidgets", "shinycssloaders", "shinyjs", "tibble", "tidyr", "tidyselect", "zeallot"] }, "SpatialDecon": { "name": "SpatialDecon", "version": "1.14.0", "sha256": "0p49dwp380d642xkx92wlan70crb3jinsiawnkiif6i6ry7xdxjd", - "depends": ["Biobase", "GeomxTools", "logNormReg", "Matrix", "repmis", "SeuratObject"] + "depends": ["Biobase", "GeomxTools", "Matrix", "SeuratObject", "logNormReg", "repmis"] }, "SpatialExperiment": { "name": "SpatialExperiment", "version": "1.14.0", "sha256": "0f04azs6wscibcpbmc1m21wjswmgr2b8gvd1n2yavya1li0xxm4r", - "depends": ["BiocFileCache", "BiocGenerics", "magick", "rjson", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocFileCache", "BiocGenerics", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "magick", "rjson"] }, "SpatialFeatureExperiment": { "name": "SpatialFeatureExperiment", "version": "1.6.1", "sha256": "0p7wqhn72p538wrlkd51mac87sjd5bh2k0k9vkvvvpfls02vfx01", - "depends": ["Biobase", "BiocGenerics", "BiocNeighbors", "BiocParallel", "data_table", "DropletUtils", "EBImage", "lifecycle", "Matrix", "rjson", "rlang", "S4Vectors", "sf", "sfheaders", "SingleCellExperiment", "SpatialExperiment", "spdep", "SummarizedExperiment", "terra", "zeallot"] + "depends": ["Biobase", "BiocGenerics", "BiocNeighbors", "BiocParallel", "DropletUtils", "EBImage", "Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "data_table", "lifecycle", "rjson", "rlang", "sf", "sfheaders", "spdep", "terra", "zeallot"] }, "SpatialOmicsOverlay": { "name": "SpatialOmicsOverlay", "version": "1.4.0", "sha256": "041kdamj3whw24c6075n0f1xxxba160s3c3kq2z7dqxwzks1k6rz", - "depends": ["base64enc", "Biobase", "BiocFileCache", "data_table", "dplyr", "EBImage", "GeomxTools", "ggplot2", "ggtext", "magick", "pbapply", "plotrix", "RBioFormats", "readxl", "S4Vectors", "scattermore", "stringr", "XML"] + "depends": ["Biobase", "BiocFileCache", "EBImage", "GeomxTools", "RBioFormats", "S4Vectors", "XML", "base64enc", "data_table", "dplyr", "ggplot2", "ggtext", "magick", "pbapply", "plotrix", "readxl", "scattermore", "stringr"] }, "SpeCond": { "name": "SpeCond", "version": "1.58.0", "sha256": "0gj9f0rycd4d8ixmivgy4ijs9pikjyhsj47k5hi8lgk9w7hnk8p4", - "depends": ["Biobase", "fields", "hwriter", "mclust", "RColorBrewer"] + "depends": ["Biobase", "RColorBrewer", "fields", "hwriter", "mclust"] }, "Spectra": { "name": "Spectra", "version": "1.14.1", "sha256": "0mvfndd7n7varrzmv9cd3ygwbdn97x5qcgmzcxc6hr76lnkwp8al", - "depends": ["BiocGenerics", "BiocParallel", "fs", "IRanges", "MetaboCoreUtils", "MsCoreUtils", "ProtGenerics", "S4Vectors"] + "depends": ["BiocGenerics", "BiocParallel", "IRanges", "MetaboCoreUtils", "MsCoreUtils", "ProtGenerics", "S4Vectors", "fs"] }, "SpectralTAD": { "name": "SpectralTAD", "version": "1.20.0", "sha256": "0rk15gs7bs5xhgl0k5qa0zyh0dcd2pr5qmqcrzvfh49bhbaylqbx", - "depends": ["BiocParallel", "cluster", "dplyr", "GenomicRanges", "HiCcompare", "magrittr", "Matrix", "PRIMME"] + "depends": ["BiocParallel", "GenomicRanges", "HiCcompare", "Matrix", "PRIMME", "cluster", "dplyr", "magrittr"] }, "SpliceWiz": { "name": "SpliceWiz", - "version": "1.6.0", - "sha256": "11pad2gdra4bq6is34d7981f6vb4wzsmvihgf08514d1598qn1cc", - "depends": ["AnnotationHub", "BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "data_table", "DelayedArray", "DelayedMatrixStats", "DT", "fst", "genefilter", "GenomeInfoDb", "GenomicRanges", "ggplot2", "HDF5Array", "heatmaply", "htmltools", "IRanges", "magrittr", "matrixStats", "NxtIRFdata", "ompBAM", "patchwork", "pheatmap", "plotly", "progress", "R_utils", "RColorBrewer", "Rcpp", "RcppProgress", "rhandsontable", "rhdf5", "rtracklayer", "rvest", "S4Vectors", "scales", "shiny", "shinydashboard", "shinyFiles", "shinyWidgets", "stringi", "SummarizedExperiment", "zlibbioc"] + "version": "1.6.2", + "sha256": "1n1j7fd8s2jkfh2w9a7101ckib0nmc9303mvnqxsij9x1934182r", + "depends": ["AnnotationHub", "BSgenome", "BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "DT", "DelayedArray", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "NxtIRFdata", "RColorBrewer", "RSQLite", "R_utils", "Rcpp", "RcppProgress", "S4Vectors", "SummarizedExperiment", "data_table", "fst", "genefilter", "ggplot2", "heatmaply", "htmltools", "magrittr", "matrixStats", "ompBAM", "patchwork", "pheatmap", "plotly", "progress", "rhandsontable", "rhdf5", "rtracklayer", "rvest", "scales", "shiny", "shinyFiles", "shinyWidgets", "shinydashboard", "stringi"] }, "SplicingFactory": { "name": "SplicingFactory", @@ -5809,49 +5833,49 @@ "name": "SplicingGraphs", "version": "1.44.0", "sha256": "1k4j23i7ffw1q18y48jhhj7g5k3vjihq619np2y7p7xc9wv0d45g", - "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "graph", "igraph", "IRanges", "Rgraphviz", "Rsamtools", "S4Vectors"] + "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rgraphviz", "Rsamtools", "S4Vectors", "graph", "igraph"] }, "SpotClean": { "name": "SpotClean", "version": "1.6.1", "sha256": "1wq1igfyadmzszacnwx8rfhm82xslzqzjkvx6xigs1fng0c7yn61", - "depends": ["dplyr", "ggplot2", "Matrix", "RColorBrewer", "readbitmap", "rhdf5", "rjson", "rlang", "S4Vectors", "Seurat", "SpatialExperiment", "SummarizedExperiment", "tibble", "viridis"] + "depends": ["Matrix", "RColorBrewer", "S4Vectors", "Seurat", "SpatialExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "readbitmap", "rhdf5", "rjson", "rlang", "tibble", "viridis"] }, "SpotSweeper": { "name": "SpotSweeper", - "version": "1.0.0", - "sha256": "1jkc37ymip3r29fh041mfa2bq17qhxq7mp0i35zrjh2lzm83qxas", - "depends": ["BiocNeighbors", "escheR", "ggplot2", "MASS", "SingleCellExperiment", "spatialEco", "SpatialExperiment", "SummarizedExperiment"] + "version": "1.0.2", + "sha256": "058j58178k5c71ivwnb9l8japfldmdk6nqkzyxf9zmh3p9b7zkqz", + "depends": ["BiocNeighbors", "MASS", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "escheR", "ggplot2", "spatialEco"] }, "Statial": { "name": "Statial", "version": "1.6.0", "sha256": "0lzr0vc4zl5ryhs17l866w261ya9kxm7hx86g6xv16wr6fbw3mgv", - "depends": ["BiocParallel", "concaveman", "data_table", "dplyr", "ggplot2", "limma", "magrittr", "plotly", "purrr", "ranger", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "spatstat_explore", "spatstat_geom", "stringr", "SummarizedExperiment", "tibble", "tidyr", "tidyselect"] + "depends": ["BiocParallel", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "concaveman", "data_table", "dplyr", "ggplot2", "limma", "magrittr", "plotly", "purrr", "ranger", "spatstat_explore", "spatstat_geom", "stringr", "tibble", "tidyr", "tidyselect"] }, "Streamer": { "name": "Streamer", "version": "1.50.0", "sha256": "0biizsjg9ysr2d1kyh962znikvgwli0zf0jn8khbs4prakjxmjyn", - "depends": ["BiocGenerics", "graph", "RBGL"] + "depends": ["BiocGenerics", "RBGL", "graph"] }, "Structstrings": { "name": "Structstrings", "version": "1.20.0", "sha256": "1ka9kixhgc9vfar18fzd8vd5ydmdkqa2s6xsmhlh927zrijs3vz9", - "depends": ["BiocGenerics", "Biostrings", "crayon", "IRanges", "S4Vectors", "stringi", "stringr", "XVector"] + "depends": ["BiocGenerics", "Biostrings", "IRanges", "S4Vectors", "XVector", "crayon", "stringi", "stringr"] }, "StructuralVariantAnnotation": { "name": "StructuralVariantAnnotation", "version": "1.20.0", "sha256": "0hnpa6ykfasp2hshqdny29dyw6y9dib4rsm379fm7n8iami1rjp1", - "depends": ["assertthat", "BiocGenerics", "Biostrings", "dplyr", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "pwalign", "rlang", "rtracklayer", "S4Vectors", "stringr", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "assertthat", "dplyr", "pwalign", "rlang", "rtracklayer", "stringr"] }, "SubCellBarCode": { "name": "SubCellBarCode", "version": "1.20.0", "sha256": "1r4w6mbzfsgf6bd0x5g8chjqji7dll2vjdvzrlbzgdhb710hmil0", - "depends": ["AnnotationDbi", "caret", "e1071", "ggplot2", "ggrepel", "gridExtra", "networkD3", "org_Hs_eg_db", "Rtsne", "scatterplot3d"] + "depends": ["AnnotationDbi", "Rtsne", "caret", "e1071", "ggplot2", "ggrepel", "gridExtra", "networkD3", "org_Hs_eg_db", "scatterplot3d"] }, "SummarizedExperiment": { "name": "SummarizedExperiment", @@ -5869,13 +5893,13 @@ "name": "SurfR", "version": "1.0.0", "sha256": "0qbvwjcrxkv0as18af6436fi1i19gbvyj22fgglxmbmckxfwv14b", - "depends": ["assertr", "BiocFileCache", "BiocStyle", "biomaRt", "DESeq2", "dplyr", "edgeR", "enrichR", "ggplot2", "ggrepel", "gridExtra", "httr", "knitr", "magrittr", "metaRNASeq", "openxlsx", "rhdf5", "scales", "SPsimSeq", "stringr", "SummarizedExperiment", "TCGAbiolinks", "tidyr", "venn"] + "depends": ["BiocFileCache", "BiocStyle", "DESeq2", "SPsimSeq", "SummarizedExperiment", "TCGAbiolinks", "assertr", "biomaRt", "dplyr", "edgeR", "enrichR", "ggplot2", "ggrepel", "gridExtra", "httr", "knitr", "magrittr", "metaRNASeq", "openxlsx", "rhdf5", "scales", "stringr", "tidyr", "venn"] }, "SwathXtend": { "name": "SwathXtend", "version": "2.26.0", "sha256": "11k6a5m73pj49ahync5773w4wbz5mb27nss531nbqj738lnfidv4", - "depends": ["e1071", "lattice", "openxlsx", "VennDiagram"] + "depends": ["VennDiagram", "e1071", "lattice", "openxlsx"] }, "SynExtend": { "name": "SynExtend", @@ -5893,91 +5917,91 @@ "name": "TADCompare", "version": "1.14.0", "sha256": "1k80xwbc3h4994f8j5qr52rn2hk2l5qz1196r1kpn6m47h80fq6c", - "depends": ["cluster", "cowplot", "dplyr", "ggplot2", "ggpubr", "HiCcompare", "magrittr", "Matrix", "PRIMME", "RColorBrewer", "reshape2", "tidyr"] + "depends": ["HiCcompare", "Matrix", "PRIMME", "RColorBrewer", "cluster", "cowplot", "dplyr", "ggplot2", "ggpubr", "magrittr", "reshape2", "tidyr"] }, "TAPseq": { "name": "TAPseq", "version": "1.16.0", "sha256": "0nz70a68cn8is0hp8srp7clqwwnr045mpibz4yazskia7lhbm73i", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "dplyr", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "tidyr"] + "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "dplyr", "tidyr"] }, "TBSignatureProfiler": { "name": "TBSignatureProfiler", "version": "1.16.0", "sha256": "1vjd9dwnr6m867d1ax6kwj4w5qs5y81fzrnnjl6xkl2ch3g48jpk", - "depends": ["ASSIGN", "BiocParallel", "ComplexHeatmap", "DESeq2", "DT", "edgeR", "gdata", "ggplot2", "GSVA", "magrittr", "RColorBrewer", "reshape2", "rlang", "ROCit", "S4Vectors", "singscore", "SummarizedExperiment"] + "depends": ["ASSIGN", "BiocParallel", "ComplexHeatmap", "DESeq2", "DT", "GSVA", "RColorBrewer", "ROCit", "S4Vectors", "SummarizedExperiment", "edgeR", "gdata", "ggplot2", "magrittr", "reshape2", "rlang", "singscore"] }, "TCC": { "name": "TCC", "version": "1.44.0", "sha256": "0j9b6q7h3w7kcpwbc3f9aabj8jrh5hwpx8rnd415rq7fakq3ix6p", - "depends": ["DESeq2", "edgeR", "ROC"] + "depends": ["DESeq2", "ROC", "edgeR"] }, "TCGAbiolinks": { "name": "TCGAbiolinks", "version": "2.32.0", "sha256": "1br2dxi5rvl8z5myrnj4dnfh8xgksrqjyy0fsqh3vjspifvis4ih", - "depends": ["biomaRt", "data_table", "downloader", "dplyr", "GenomicRanges", "ggplot2", "httr", "IRanges", "jsonlite", "knitr", "plyr", "purrr", "R_utils", "readr", "rvest", "S4Vectors", "stringr", "SummarizedExperiment", "TCGAbiolinksGUI_data", "tibble", "tidyr", "XML", "xml2"] + "depends": ["GenomicRanges", "IRanges", "R_utils", "S4Vectors", "SummarizedExperiment", "TCGAbiolinksGUI_data", "XML", "biomaRt", "data_table", "downloader", "dplyr", "ggplot2", "httr", "jsonlite", "knitr", "plyr", "purrr", "readr", "rvest", "stringr", "tibble", "tidyr", "xml2"] }, "TCGAutils": { "name": "TCGAutils", "version": "1.24.0", "sha256": "0fmz1lfpn8ws584q4xlicg897qs36wgr78crw0d9415ci6qqb4r8", - "depends": ["AnnotationDbi", "BiocBaseUtils", "BiocGenerics", "GenomeInfoDb", "GenomicDataCommons", "GenomicFeatures", "GenomicRanges", "IRanges", "MultiAssayExperiment", "RaggedExperiment", "rvest", "S4Vectors", "stringr", "SummarizedExperiment", "xml2"] + "depends": ["AnnotationDbi", "BiocBaseUtils", "BiocGenerics", "GenomeInfoDb", "GenomicDataCommons", "GenomicFeatures", "GenomicRanges", "IRanges", "MultiAssayExperiment", "RaggedExperiment", "S4Vectors", "SummarizedExperiment", "rvest", "stringr", "xml2"] }, "TCseq": { "name": "TCseq", "version": "1.28.0", "sha256": "014al1b58rkfy1cqxwf3xgzrbdvqv2x3ac2clqmj1262ygrmiw5v", - "depends": ["BiocGenerics", "cluster", "e1071", "edgeR", "GenomicAlignments", "GenomicRanges", "ggplot2", "IRanges", "locfit", "reshape2", "Rsamtools", "SummarizedExperiment"] + "depends": ["BiocGenerics", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "SummarizedExperiment", "cluster", "e1071", "edgeR", "ggplot2", "locfit", "reshape2"] }, "TDbasedUFE": { "name": "TDbasedUFE", "version": "1.4.0", "sha256": "1q1ljwwkhkqq2pbzm60kkhyqrqixljcw0vqajbpwk68gmc8sxwyz", - "depends": ["GenomicRanges", "MOFAdata", "readr", "rTensor", "shiny", "tximport", "tximportData"] + "depends": ["GenomicRanges", "MOFAdata", "rTensor", "readr", "shiny", "tximport", "tximportData"] }, "TDbasedUFEadv": { "name": "TDbasedUFEadv", "version": "1.4.0", "sha256": "1iiil5vn95bsldxigjlyqraivrnwlajkn18y0880qinrbfcwpidz", - "depends": ["Biobase", "DOSE", "enrichplot", "enrichR", "GenomicRanges", "hash", "RTCGA", "rTensor", "shiny", "STRINGdb", "TDbasedUFE"] + "depends": ["Biobase", "DOSE", "GenomicRanges", "RTCGA", "STRINGdb", "TDbasedUFE", "enrichR", "enrichplot", "hash", "rTensor", "shiny"] }, "TEKRABber": { "name": "TEKRABber", "version": "1.8.0", "sha256": "0ivbj063awdh41ldj6cl68ydx8y4jv8wzwwxr67iwhxdgpcwlwx8", - "depends": ["apeglm", "biomaRt", "DESeq2", "doParallel", "dplyr", "foreach", "GenomeInfoDb", "magrittr", "Rcpp", "rtracklayer", "SCBN"] + "depends": ["DESeq2", "GenomeInfoDb", "Rcpp", "SCBN", "apeglm", "biomaRt", "doParallel", "dplyr", "foreach", "magrittr", "rtracklayer"] }, "TENxIO": { "name": "TENxIO", "version": "1.6.0", "sha256": "1bghch637h2cckkb8czzjnvn4vlh4cjk8izy6079wq8p39zr10fx", - "depends": ["BiocBaseUtils", "BiocGenerics", "BiocIO", "GenomeInfoDb", "GenomicRanges", "Matrix", "MatrixGenerics", "R_utils", "RCurl", "readr", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocBaseUtils", "BiocGenerics", "BiocIO", "GenomeInfoDb", "GenomicRanges", "Matrix", "MatrixGenerics", "RCurl", "R_utils", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "readr"] }, "TEQC": { "name": "TEQC", "version": "4.26.0", "sha256": "1cvc4lrnhkr5l5x0cpjmzxj449lmkw337a8gpan73yvj2p0r7axg", - "depends": ["Biobase", "BiocGenerics", "hwriter", "IRanges", "Rsamtools"] + "depends": ["Biobase", "BiocGenerics", "IRanges", "Rsamtools", "hwriter"] }, "TFARM": { "name": "TFARM", "version": "1.26.0", "sha256": "1l2763lxgda628i6abl2hp5ghxzzw1lk3zmd15aibf8rfl9cghha", - "depends": ["arules", "fields", "GenomicRanges", "gplots", "stringr"] + "depends": ["GenomicRanges", "arules", "fields", "gplots", "stringr"] }, "TFBSTools": { "name": "TFBSTools", "version": "1.42.0", "sha256": "0bmmsgmx7159bdrflykkis0v4z1ixwlnmw1kx0y0kw15lw3cjnsh", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "caTools", "CNEr", "DBI", "DirichletMultinomial", "GenomeInfoDb", "GenomicRanges", "gtools", "IRanges", "pwalign", "RSQLite", "rtracklayer", "S4Vectors", "seqLogo", "TFMPvalue", "XML", "XVector"] + "depends": ["BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "CNEr", "DBI", "DirichletMultinomial", "GenomeInfoDb", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "TFMPvalue", "XML", "XVector", "caTools", "gtools", "pwalign", "rtracklayer", "seqLogo"] }, "TFEA_ChIP": { "name": "TFEA.ChIP", "version": "1.24.0", "sha256": "0xn176h7dfb3sbg913xzwj3c2ymzf7i0y2an19zjvynk49xq12ph", - "depends": ["biomaRt", "dplyr", "GenomicFeatures", "GenomicRanges", "IRanges", "org_Hs_eg_db", "R_utils"] + "depends": ["GenomicFeatures", "GenomicRanges", "IRanges", "R_utils", "biomaRt", "dplyr", "org_Hs_eg_db"] }, "TFHAZ": { "name": "TFHAZ", @@ -5989,85 +6013,85 @@ "name": "TFutils", "version": "1.24.0", "sha256": "0n0szdh09zr7866pl6y5zps6izlylhh1n20zkv7xsaq91hsw9g52", - "depends": ["AnnotationDbi", "BiocFileCache", "dplyr", "DT", "GSEABase", "httr", "magrittr", "miniUI", "org_Hs_eg_db", "readxl", "rjson", "Rsamtools", "shiny"] + "depends": ["AnnotationDbi", "BiocFileCache", "DT", "GSEABase", "Rsamtools", "dplyr", "httr", "magrittr", "miniUI", "org_Hs_eg_db", "readxl", "rjson", "shiny"] }, "TIN": { "name": "TIN", "version": "1.36.0", "sha256": "06dmy5yjskaisibbr4qlw7bdbwj8v1b09c28v4wzd86a2554hywp", - "depends": ["aroma_affymetrix", "data_table", "impute", "squash", "stringr", "WGCNA"] + "depends": ["WGCNA", "aroma_affymetrix", "data_table", "impute", "squash", "stringr"] }, "TMixClust": { "name": "TMixClust", "version": "1.26.0", "sha256": "0p88kdl9v2q6wabr31v26q0612qcw1q5s71zbanamx0s2xsvyjgh", - "depends": ["Biobase", "BiocParallel", "cluster", "flexclust", "gss", "mvtnorm", "SPEM", "zoo"] + "depends": ["Biobase", "BiocParallel", "SPEM", "cluster", "flexclust", "gss", "mvtnorm", "zoo"] }, "TOAST": { "name": "TOAST", "version": "1.18.0", "sha256": "0srjx9z59a65nhrxbzxzxnkyn28zskc6z4p8drihq1lhw6mvdp4r", - "depends": ["corpcor", "doParallel", "EpiDISH", "GGally", "ggplot2", "limma", "nnls", "quadprog", "SummarizedExperiment", "tidyr"] + "depends": ["EpiDISH", "GGally", "SummarizedExperiment", "corpcor", "doParallel", "ggplot2", "limma", "nnls", "quadprog", "tidyr"] }, "TOP": { "name": "TOP", "version": "1.4.0", "sha256": "1lj7a9kry3ca2iz231si0vfxbnib5wqj5x4ldvb1l1wfjhdf4x2p", - "depends": ["assertthat", "caret", "ClassifyR", "directPA", "doParallel", "dplyr", "ggnewscale", "ggplot2", "ggraph", "ggrepel", "ggthemes", "glmnet", "Hmisc", "igraph", "latex2exp", "limma", "magrittr", "plotly", "pROC", "purrr", "reshape2", "statmod", "stringr", "survival", "tibble", "tidygraph", "tidyr"] + "depends": ["ClassifyR", "Hmisc", "assertthat", "caret", "directPA", "doParallel", "dplyr", "ggnewscale", "ggplot2", "ggraph", "ggrepel", "ggthemes", "glmnet", "igraph", "latex2exp", "limma", "magrittr", "pROC", "plotly", "purrr", "reshape2", "statmod", "stringr", "survival", "tibble", "tidygraph", "tidyr"] }, "TPP": { "name": "TPP", "version": "3.32.0", "sha256": "1pfnk9zfd7d8ysiiawj1xbcq7vck5xs25jy2rz94mpwvgpxkvkif", - "depends": ["Biobase", "biobroom", "broom", "data_table", "doParallel", "dplyr", "foreach", "futile_logger", "ggplot2", "gridExtra", "knitr", "limma", "magrittr", "MASS", "mefa", "nls2", "openxlsx", "plyr", "purrr", "RColorBrewer", "RCurl", "reshape2", "rmarkdown", "stringr", "tibble", "tidyr", "VennDiagram", "VGAM"] + "depends": ["Biobase", "MASS", "RColorBrewer", "RCurl", "VGAM", "VennDiagram", "biobroom", "broom", "data_table", "doParallel", "dplyr", "foreach", "futile_logger", "ggplot2", "gridExtra", "knitr", "limma", "magrittr", "mefa", "nls2", "openxlsx", "plyr", "purrr", "reshape2", "rmarkdown", "stringr", "tibble", "tidyr"] }, "TPP2D": { "name": "TPP2D", "version": "1.20.0", "sha256": "1r9fgxd6jx0py4727yzcn73hr3x7rjxmi5yli57wyd07hk0p3w0y", - "depends": ["BiocParallel", "doParallel", "dplyr", "foreach", "ggplot2", "limma", "MASS", "openxlsx", "RCurl", "stringr", "tidyr"] + "depends": ["BiocParallel", "MASS", "RCurl", "doParallel", "dplyr", "foreach", "ggplot2", "limma", "openxlsx", "stringr", "tidyr"] }, "TREG": { "name": "TREG", "version": "1.8.0", "sha256": "0yf2fmswkl01ymr1zy23d2xg8j8vb5q28grqb0r83b11rkxhfhqm", - "depends": ["Matrix", "purrr", "rafalib", "SummarizedExperiment"] + "depends": ["Matrix", "SummarizedExperiment", "purrr", "rafalib"] }, "TRESS": { "name": "TRESS", "version": "1.10.0", "sha256": "1dv6xr625gr7jf7rk7fxhfyxgkrkc71mdc3fvzi98r23sk1h62xq", - "depends": ["AnnotationDbi", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "matrixStats", "Rsamtools", "rtracklayer", "S4Vectors"] + "depends": ["AnnotationDbi", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rsamtools", "S4Vectors", "matrixStats", "rtracklayer"] }, "TRONCO": { "name": "TRONCO", "version": "2.36.0", "sha256": "1dliwyjsvwr6cjf4cp3w7h46ac4fzd7hnfw4nsb330ajdr38ri0y", - "depends": ["bnlearn", "circlize", "doParallel", "foreach", "gridExtra", "gtable", "gtools", "igraph", "iterators", "R_matlab", "RColorBrewer", "Rgraphviz", "scales", "xtable"] + "depends": ["RColorBrewer", "R_matlab", "Rgraphviz", "bnlearn", "circlize", "doParallel", "foreach", "gridExtra", "gtable", "gtools", "igraph", "iterators", "scales", "xtable"] }, "TSAR": { "name": "TSAR", "version": "1.2.0", "sha256": "1bnyrrc92m4v35ar640pnm1fb3cq3hlp8lpwicrzbv8dvyzsxw43", - "depends": ["dplyr", "ggplot2", "ggpubr", "jsonlite", "magrittr", "mgcv", "minpack_lm", "openxlsx", "plotly", "readxl", "rhandsontable", "shiny", "shinyjs", "shinyWidgets", "stringr", "tidyr"] + "depends": ["dplyr", "ggplot2", "ggpubr", "jsonlite", "magrittr", "mgcv", "minpack_lm", "openxlsx", "plotly", "readxl", "rhandsontable", "shiny", "shinyWidgets", "shinyjs", "stringr", "tidyr"] }, "TSCAN": { "name": "TSCAN", "version": "1.42.0", "sha256": "1s80n1yjmshy59ls607hp8hpq56hllbh0a4mbgvxd8bqh4njfc0j", - "depends": ["combinat", "DelayedArray", "fastICA", "ggplot2", "gplots", "igraph", "Matrix", "mclust", "mgcv", "plyr", "S4Vectors", "shiny", "SingleCellExperiment", "SummarizedExperiment", "TrajectoryUtils"] + "depends": ["DelayedArray", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TrajectoryUtils", "combinat", "fastICA", "ggplot2", "gplots", "igraph", "mclust", "mgcv", "plyr", "shiny"] }, "TTMap": { "name": "TTMap", "version": "1.26.0", "sha256": "0988hy3hr3cf7snj7k7d0gl0w4qg7ssk53pmvvng171b82m6szqw", - "depends": ["Biobase", "colorRamps", "rgl", "SummarizedExperiment"] + "depends": ["Biobase", "SummarizedExperiment", "colorRamps", "rgl"] }, "TVTB": { "name": "TVTB", - "version": "1.30.0", - "sha256": "0in5l9nq0br7c1n546wn29av5m25xxc82hvns5z8mshnnlk59pmn", - "depends": ["AnnotationFilter", "BiocGenerics", "BiocParallel", "Biostrings", "ensembldb", "ensemblVEP", "GenomeInfoDb", "GenomicRanges", "GGally", "ggplot2", "Gviz", "IRanges", "limma", "reshape2", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation"] + "version": "1.30.1", + "sha256": "1dacdp9rkh47mc1bpz1y0xhrncdc3hwgvi2436wpahra5adcg1mh", + "depends": ["AnnotationFilter", "BiocGenerics", "BiocParallel", "Biostrings", "GGally", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "ensembldb", "ggplot2", "limma", "reshape2"] }, "TargetDecoy": { "name": "TargetDecoy", @@ -6083,8 +6107,8 @@ }, "TargetSearch": { "name": "TargetSearch", - "version": "2.6.1", - "sha256": "1q6v6pfkpcm23a39vgp9ysbqa6wwkwv9dgnxd6m8gjlq3azgsnf6", + "version": "2.6.2", + "sha256": "0l3prcqi80g9n823gm2bnpn30r95dbmg5yfvdqwsvd465kyah3hz", "depends": ["assertthat", "ncdf4"] }, "TileDBArray": { @@ -6097,19 +6121,19 @@ "name": "TissueEnrich", "version": "1.24.1", "sha256": "02amlvaf5v30x2swxhi4na4c623v00gb3q1bvlcqias9gaaizzim", - "depends": ["dplyr", "ggplot2", "GSEABase", "SummarizedExperiment", "tidyr"] + "depends": ["GSEABase", "SummarizedExperiment", "dplyr", "ggplot2", "tidyr"] }, "TitanCNA": { "name": "TitanCNA", "version": "1.42.0", "sha256": "18ihvqn07g677r3facf43m69bnjx4i0s6w41h4mdn82hal0pfsx0", - "depends": ["BiocGenerics", "data_table", "dplyr", "foreach", "GenomeInfoDb", "GenomicRanges", "IRanges", "VariantAnnotation"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "VariantAnnotation", "data_table", "dplyr", "foreach"] }, "ToxicoGx": { "name": "ToxicoGx", "version": "2.8.0", "sha256": "0b34d5js6w50bm5cl5v8ppfc0lljsbm1zbrqlc5qifc8lcyliq8a", - "depends": ["assertthat", "Biobase", "BiocGenerics", "BiocParallel", "caTools", "CoreGx", "data_table", "downloader", "dplyr", "ggplot2", "jsonlite", "limma", "magrittr", "reshape2", "S4Vectors", "scales", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "CoreGx", "S4Vectors", "SummarizedExperiment", "assertthat", "caTools", "data_table", "downloader", "dplyr", "ggplot2", "jsonlite", "limma", "magrittr", "reshape2", "scales", "tibble", "tidyr"] }, "TrajectoryGeometry": { "name": "TrajectoryGeometry", @@ -6121,31 +6145,31 @@ "name": "TrajectoryUtils", "version": "1.12.0", "sha256": "15q1mq48nclf2lqc2v769q79frrbm2l65d54vcqg06b861q2wq9h", - "depends": ["igraph", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "igraph"] }, "TransView": { "name": "TransView", "version": "1.48.0", "sha256": "1bk4h1sh2xdm67mkzsg2l0kgg88m5z39hxmshh0j2bybyyy07jkp", - "depends": ["BiocGenerics", "GenomicRanges", "gplots", "IRanges", "Rhtslib", "S4Vectors", "zlibbioc"] + "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "Rhtslib", "S4Vectors", "gplots", "zlibbioc"] }, "TreeAndLeaf": { "name": "TreeAndLeaf", "version": "1.16.0", "sha256": "0fm1v6w73vs99smqk8i8b85pr38zlbpgyby6qh3s0xslxbyk6b32", - "depends": ["ape", "igraph", "RedeR"] + "depends": ["RedeR", "ape", "igraph"] }, "TreeSummarizedExperiment": { "name": "TreeSummarizedExperiment", "version": "2.12.0", "sha256": "0ygzw9nba5pxgrbib8sm7qwhzzm8m038banb0z7n42vkb1cb3d5i", - "depends": ["ape", "BiocGenerics", "BiocParallel", "Biostrings", "dplyr", "IRanges", "rlang", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "treeio"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "IRanges", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ape", "dplyr", "rlang", "treeio"] }, "Trendy": { "name": "Trendy", "version": "1.26.0", "sha256": "172hcq9zxah3m55j3kzpg5hvr06d656j1s8j3jcvksc0f3l9r990", - "depends": ["BiocParallel", "DT", "gplots", "magrittr", "S4Vectors", "segmented", "shiny", "shinyFiles", "SummarizedExperiment"] + "depends": ["BiocParallel", "DT", "S4Vectors", "SummarizedExperiment", "gplots", "magrittr", "segmented", "shiny", "shinyFiles"] }, "TurboNorm": { "name": "TurboNorm", @@ -6163,25 +6187,25 @@ "name": "UCSC.utils", "version": "1.0.0", "sha256": "0w9f5xd6ryniapbpcrpczn8wimph2154w45cvdgqfa3dv5qy379l", - "depends": ["httr", "jsonlite", "S4Vectors"] + "depends": ["S4Vectors", "httr", "jsonlite"] }, "UCell": { "name": "UCell", "version": "2.8.0", "sha256": "09r64rrydwgvvvq8f5vzvn7dsh24l9sa1if21wcimrl28ci1g1mv", - "depends": ["BiocNeighbors", "BiocParallel", "data_table", "Matrix", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocNeighbors", "BiocParallel", "Matrix", "SingleCellExperiment", "SummarizedExperiment", "data_table"] }, "UMI4Cats": { "name": "UMI4Cats", "version": "1.14.0", "sha256": "1cf2jsmhsmw6i381wxnb0zsyhkr2mjlxlzpjnlfxyf4kr6n8k797", - "depends": ["annotate", "BiocFileCache", "BiocGenerics", "Biostrings", "BSgenome", "cowplot", "DESeq2", "dplyr", "fda", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "magick", "magrittr", "org_Hs_eg_db", "R_utils", "rappdirs", "Rbowtie2", "RColorBrewer", "regioneR", "reshape2", "rlang", "Rsamtools", "S4Vectors", "scales", "ShortRead", "stringr", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "zoo"] + "depends": ["BSgenome", "BiocFileCache", "BiocGenerics", "Biostrings", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "R_utils", "Rbowtie2", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "annotate", "cowplot", "dplyr", "fda", "ggplot2", "magick", "magrittr", "org_Hs_eg_db", "rappdirs", "regioneR", "reshape2", "rlang", "scales", "stringr", "zoo"] }, "UNDO": { "name": "UNDO", "version": "1.46.0", "sha256": "1h7bri3hkl99gll5vpamgp7x60afdmq8h1mqw4plr9ypxv2kljpj", - "depends": ["Biobase", "BiocGenerics", "boot", "MASS", "nnls"] + "depends": ["Biobase", "BiocGenerics", "MASS", "boot", "nnls"] }, "UPDhmm": { "name": "UPDhmm", @@ -6193,25 +6217,25 @@ "name": "Ularcirc", "version": "1.22.0", "sha256": "0qzkvwg3gd9v9cqf3hmmyh4gzdqs5m6nxjjbnhqsdp6wshccdv4p", - "depends": ["AnnotationDbi", "AnnotationHub", "BiocGenerics", "Biostrings", "BSgenome", "data_table", "DT", "GenomeInfoDb", "GenomeInfoDbData", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggrepel", "gsubfn", "mirbase_db", "moments", "Organism_dplyr", "plotgardener", "R_utils", "S4Vectors", "shiny", "shinydashboard", "shinyFiles", "shinyjs", "yaml"] + "depends": ["AnnotationDbi", "AnnotationHub", "BSgenome", "BiocGenerics", "Biostrings", "DT", "GenomeInfoDb", "GenomeInfoDbData", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Organism_dplyr", "R_utils", "S4Vectors", "data_table", "ggplot2", "ggrepel", "gsubfn", "mirbase_db", "moments", "plotgardener", "shiny", "shinyFiles", "shinydashboard", "shinyjs", "yaml"] }, "UniProt_ws": { "name": "UniProt.ws", "version": "2.44.0", "sha256": "1vcbphksaanggig1yfmrihhw1a4fmy1cl7yq5w3z3lb6zik5rgx8", - "depends": ["AnnotationDbi", "BiocBaseUtils", "BiocFileCache", "BiocGenerics", "httpcache", "httr", "jsonlite", "progress", "rjsoncons", "RSQLite"] + "depends": ["AnnotationDbi", "BiocBaseUtils", "BiocFileCache", "BiocGenerics", "RSQLite", "httpcache", "httr", "jsonlite", "progress", "rjsoncons"] }, "Uniquorn": { "name": "Uniquorn", "version": "2.24.0", "sha256": "1f2hp395gfxnrf9mg8kqd6cjr9b651gzrj2bcfv5hx2qh0mh1z75", - "depends": ["data_table", "doParallel", "foreach", "GenomicRanges", "IRanges", "R_utils", "stringr", "VariantAnnotation", "WriteXLS"] + "depends": ["GenomicRanges", "IRanges", "R_utils", "VariantAnnotation", "WriteXLS", "data_table", "doParallel", "foreach", "stringr"] }, "VAExprs": { "name": "VAExprs", "version": "1.10.0", "sha256": "0mcdh0xsqjpc3nj1xfps3y2r62ayh8ykgpyblqxp2n52f781hcbx", - "depends": ["CatEncoders", "DeepPINCS", "DiagrammeR", "keras", "mclust", "purrr", "scater", "SingleCellExperiment", "SummarizedExperiment", "tensorflow"] + "depends": ["CatEncoders", "DeepPINCS", "DiagrammeR", "SingleCellExperiment", "SummarizedExperiment", "keras", "mclust", "purrr", "scater", "tensorflow"] }, "VCFArray": { "name": "VCFArray", @@ -6223,55 +6247,55 @@ "name": "VDJdive", "version": "1.6.0", "sha256": "1ml175pk27msai86pnm8jyy8li7f5rkkqqfw1a9m9d850n7ry37h", - "depends": ["BiocParallel", "cowplot", "ggplot2", "gridExtra", "IRanges", "Matrix", "RColorBrewer", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocParallel", "IRanges", "Matrix", "RColorBrewer", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cowplot", "ggplot2", "gridExtra"] }, "VERSO": { "name": "VERSO", "version": "1.14.0", "sha256": "1yixhbwa2wi3rddmyd37b9nznw4c7s36wz0mnzwqvx1n9w0zpdk3", - "depends": ["ape", "data_tree", "Rfast"] + "depends": ["Rfast", "ape", "data_tree"] }, "VaSP": { "name": "VaSP", "version": "1.16.0", "sha256": "1gh0mgci2jadv3g0wc3li6d9rlaaqybdx148gkzwnjf0bmhqxz34", - "depends": ["ballgown", "cluster", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "matrixStats", "Rsamtools", "S4Vectors"] + "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ballgown", "cluster", "matrixStats"] }, "VanillaICE": { "name": "VanillaICE", "version": "1.66.0", "sha256": "0a9yzlwnyq9840w25gqsc0ijydifq6kbr7z9bzq74s7zqxzxkkqv", - "depends": ["Biobase", "BiocGenerics", "BSgenome_Hsapiens_UCSC_hg18", "crlmm", "data_table", "foreach", "GenomeInfoDb", "GenomicRanges", "IRanges", "lattice", "MatrixGenerics", "matrixStats", "oligoClasses", "S4Vectors", "SummarizedExperiment"] + "depends": ["BSgenome_Hsapiens_UCSC_hg18", "Biobase", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "MatrixGenerics", "S4Vectors", "SummarizedExperiment", "crlmm", "data_table", "foreach", "lattice", "matrixStats", "oligoClasses"] }, "VarCon": { "name": "VarCon", "version": "1.12.0", "sha256": "1ns5sxb2qrh0y6hdg6qn6s1hl4d64cvsipl6mcwqiyka9lrlmlhy", - "depends": ["Biostrings", "BSgenome", "GenomicRanges", "ggplot2", "IRanges", "shiny", "shinycssloaders", "shinyFiles"] + "depends": ["BSgenome", "Biostrings", "GenomicRanges", "IRanges", "ggplot2", "shiny", "shinyFiles", "shinycssloaders"] }, "VariantAnnotation": { "name": "VariantAnnotation", "version": "1.50.0", "sha256": "0slvlhm65hkjspzlzs3gi04a6mlfwvda314z1nmzpdi3y5111fg7", - "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "Biostrings", "BSgenome", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "MatrixGenerics", "Rhtslib", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment", "XVector", "zlibbioc"] + "depends": ["AnnotationDbi", "BSgenome", "Biobase", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "MatrixGenerics", "Rhtslib", "Rsamtools", "S4Vectors", "SummarizedExperiment", "XVector", "rtracklayer", "zlibbioc"] }, "VariantExperiment": { "name": "VariantExperiment", "version": "1.18.1", "sha256": "0wxhfd92cfh9rg99jrw9rg7vfqk8lf2ylkpki2jf59hlx8zzs2z9", - "depends": ["Biostrings", "DelayedArray", "DelayedDataFrame", "GDSArray", "gdsfmt", "GenomicRanges", "IRanges", "S4Vectors", "SeqArray", "SNPRelate", "SummarizedExperiment"] + "depends": ["Biostrings", "DelayedArray", "DelayedDataFrame", "GDSArray", "GenomicRanges", "IRanges", "S4Vectors", "SNPRelate", "SeqArray", "SummarizedExperiment", "gdsfmt"] }, "VariantFiltering": { "name": "VariantFiltering", "version": "1.40.0", "sha256": "14kxlzgy71s8h34galx93q8kalspr1m23brssbr3wha0hxb0ghgd", - "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "DT", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "GenomicScores", "graph", "Gviz", "IRanges", "RBGL", "Rsamtools", "S4Vectors", "shiny", "shinyjs", "shinythemes", "shinyTree", "SummarizedExperiment", "VariantAnnotation", "XVector"] + "depends": ["AnnotationDbi", "BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "DT", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "GenomicScores", "Gviz", "IRanges", "RBGL", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "XVector", "graph", "shiny", "shinyTree", "shinyjs", "shinythemes"] }, "VariantTools": { "name": "VariantTools", "version": "1.46.0", "sha256": "1idil9vkd5risx9ahkagdacnj2g2a11gzsd7wmhg5gjmr77r53ww", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rsamtools", "rtracklayer", "S4Vectors", "VariantAnnotation"] + "depends": ["BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rsamtools", "S4Vectors", "VariantAnnotation", "rtracklayer"] }, "VegaMC": { "name": "VegaMC", @@ -6283,31 +6307,31 @@ "name": "VennDetail", "version": "1.20.0", "sha256": "0987ljk70lsjhwzk3dxslg80ng8cnjhh02zr2raphyliys0msvxz", - "depends": ["dplyr", "futile_logger", "ggplot2", "magrittr", "purrr", "tibble", "UpSetR", "VennDiagram"] + "depends": ["UpSetR", "VennDiagram", "dplyr", "futile_logger", "ggplot2", "magrittr", "purrr", "tibble"] }, "ViSEAGO": { "name": "ViSEAGO", "version": "1.18.0", "sha256": "06cqx88vndmgxb7vhn7w0kwkxrsn8hy3a3mz591pj48f3z0q9w16", - "depends": ["AnnotationDbi", "AnnotationForge", "biomaRt", "data_table", "dendextend", "DiagrammeR", "DT", "dynamicTreeCut", "fgsea", "ggplot2", "GO_db", "GOSemSim", "heatmaply", "htmlwidgets", "igraph", "plotly", "processx", "R_utils", "RColorBrewer", "scales", "topGO", "UpSetR"] + "depends": ["AnnotationDbi", "AnnotationForge", "DT", "DiagrammeR", "GOSemSim", "GO_db", "RColorBrewer", "R_utils", "UpSetR", "biomaRt", "data_table", "dendextend", "dynamicTreeCut", "fgsea", "ggplot2", "heatmaply", "htmlwidgets", "igraph", "plotly", "processx", "scales", "topGO"] }, "VisiumIO": { "name": "VisiumIO", "version": "1.0.0", "sha256": "01yvahz20fkvf2mj0zjl04w0dzs5jf4snlmry8d5a9y3smkspqyv", - "depends": ["BiocBaseUtils", "BiocGenerics", "BiocIO", "jsonlite", "S4Vectors", "SpatialExperiment", "SummarizedExperiment", "TENxIO"] + "depends": ["BiocBaseUtils", "BiocGenerics", "BiocIO", "S4Vectors", "SpatialExperiment", "SummarizedExperiment", "TENxIO", "jsonlite"] }, "Voyager": { "name": "Voyager", "version": "1.6.0", "sha256": "0nvcp1wcrisiljj4w61ykz82a2l8c9vx8ixh209v2ih004wyy1y1", - "depends": ["BiocParallel", "bluster", "ggnewscale", "ggplot2", "lifecycle", "Matrix", "matrixStats", "memuse", "patchwork", "rlang", "RSpectra", "S4Vectors", "scales", "scico", "sf", "SingleCellExperiment", "SpatialExperiment", "SpatialFeatureExperiment", "spdep", "SummarizedExperiment", "terra"] + "depends": ["BiocParallel", "Matrix", "RSpectra", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SpatialFeatureExperiment", "SummarizedExperiment", "bluster", "ggnewscale", "ggplot2", "lifecycle", "matrixStats", "memuse", "patchwork", "rlang", "scales", "scico", "sf", "spdep", "terra"] }, "VplotR": { "name": "VplotR", "version": "1.14.0", "sha256": "1cg5ifl2k2134k5lhxfvsr4xm31w0bdg0rzy8yb5k77gldilb0il", - "depends": ["cowplot", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "IRanges", "magrittr", "RColorBrewer", "reshape2", "Rsamtools", "S4Vectors", "zoo"] + "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "cowplot", "ggplot2", "magrittr", "reshape2", "zoo"] }, "Wrench": { "name": "Wrench", @@ -6319,19 +6343,19 @@ "name": "XDE", "version": "2.50.0", "sha256": "1f0aahpyrmkg5h3v6v5qw35gsjskh6dh16bgygkssa1qcafmqfv1", - "depends": ["Biobase", "BiocGenerics", "genefilter", "GeneMeta", "gtools", "mvtnorm", "RColorBrewer", "siggenes"] + "depends": ["Biobase", "BiocGenerics", "GeneMeta", "RColorBrewer", "genefilter", "gtools", "mvtnorm", "siggenes"] }, "XINA": { "name": "XINA", "version": "1.22.0", "sha256": "177yzqmkf3f2xgfrz1zpcw554yzm4njd2chhmvxi2vvijvnrgdf3", - "depends": ["alluvial", "ggplot2", "gridExtra", "igraph", "mclust", "plyr", "STRINGdb"] + "depends": ["STRINGdb", "alluvial", "ggplot2", "gridExtra", "igraph", "mclust", "plyr"] }, "XNAString": { "name": "XNAString", "version": "1.12.0", "sha256": "0dgdaq8w7q32scdxragi40x7mkgpvvyzs2bwfb6c2yb4n2j40imi", - "depends": ["Biostrings", "BSgenome", "data_table", "formattable", "future_apply", "GenomicRanges", "IRanges", "pwalign", "Rcpp", "S4Vectors", "stringi", "stringr"] + "depends": ["BSgenome", "Biostrings", "GenomicRanges", "IRanges", "Rcpp", "S4Vectors", "data_table", "formattable", "future_apply", "pwalign", "stringi", "stringr"] }, "XVector": { "name": "XVector", @@ -6343,19 +6367,19 @@ "name": "Xeva", "version": "1.20.0", "sha256": "1n6bxj5gshr2rzcxw6dc5wcmj1ajssrqzp7a7b6rlnszk2h4vgys", - "depends": ["BBmisc", "Biobase", "ComplexHeatmap", "doParallel", "downloader", "ggplot2", "nlme", "PharmacoGx", "Rmisc", "scales"] + "depends": ["BBmisc", "Biobase", "ComplexHeatmap", "PharmacoGx", "Rmisc", "doParallel", "downloader", "ggplot2", "nlme", "scales"] }, "YAPSA": { "name": "YAPSA", "version": "1.30.0", "sha256": "0908hyji07br1i1zms21a99m3mvi707xj8zbd1w64gzackghabhl", - "depends": ["Biostrings", "BSgenome_Hsapiens_UCSC_hg19", "circlize", "ComplexHeatmap", "corrplot", "dendextend", "doParallel", "dplyr", "GenomeInfoDb", "GenomicRanges", "GetoptLong", "ggbeeswarm", "ggplot2", "gridExtra", "gtrellis", "KEGGREST", "limSolve", "magrittr", "PMCMRplus", "pracma", "reshape2", "SomaticSignatures", "VariantAnnotation"] + "depends": ["BSgenome_Hsapiens_UCSC_hg19", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicRanges", "GetoptLong", "KEGGREST", "PMCMRplus", "SomaticSignatures", "VariantAnnotation", "circlize", "corrplot", "dendextend", "doParallel", "dplyr", "ggbeeswarm", "ggplot2", "gridExtra", "gtrellis", "limSolve", "magrittr", "pracma", "reshape2"] }, "ZygosityPredictor": { "name": "ZygosityPredictor", "version": "1.4.0", "sha256": "03yxnrbkfzc1dqa8zin8gwi9iryw3ir2k5s80dzxclr1651zh5xd", - "depends": ["DelayedArray", "dplyr", "GenomicAlignments", "GenomicRanges", "igraph", "IRanges", "knitr", "magrittr", "purrr", "readr", "rlang", "Rsamtools", "stringr", "tibble", "VariantAnnotation"] + "depends": ["DelayedArray", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "VariantAnnotation", "dplyr", "igraph", "knitr", "magrittr", "purrr", "readr", "rlang", "stringr", "tibble"] }, "a4": { "name": "a4", @@ -6367,13 +6391,13 @@ "name": "a4Base", "version": "1.52.0", "sha256": "19vapjmyd3ly3s2gqa2xfg99gyc6n6lv3c6rpi0ch4hzb7wiinvm", - "depends": ["a4Core", "a4Preproc", "annaffy", "Biobase", "genefilter", "glmnet", "gplots", "limma", "mpm", "multtest"] + "depends": ["Biobase", "a4Core", "a4Preproc", "annaffy", "genefilter", "glmnet", "gplots", "limma", "mpm", "multtest"] }, "a4Classif": { "name": "a4Classif", "version": "1.52.0", "sha256": "15jcd66brvbjz0p3z2b43ac5k81s3vmcbkwmga0f7f5v53fp8qvw", - "depends": ["a4Core", "a4Preproc", "Biobase", "glmnet", "pamr", "ROCR", "varSelRF"] + "depends": ["Biobase", "ROCR", "a4Core", "a4Preproc", "glmnet", "pamr", "varSelRF"] }, "a4Core": { "name": "a4Core", @@ -6403,7 +6427,7 @@ "name": "abseqR", "version": "1.22.0", "sha256": "0aj3kh4c8zk60n6yyh2jblbrvv77071r96m0mrcslqm71dwg9402", - "depends": ["BiocParallel", "BiocStyle", "circlize", "flexdashboard", "ggcorrplot", "ggdendro", "ggplot2", "gridExtra", "knitr", "plotly", "plyr", "png", "RColorBrewer", "reshape2", "rmarkdown", "stringr", "vegan", "VennDiagram"] + "depends": ["BiocParallel", "BiocStyle", "RColorBrewer", "VennDiagram", "circlize", "flexdashboard", "ggcorrplot", "ggdendro", "ggplot2", "gridExtra", "knitr", "plotly", "plyr", "png", "reshape2", "rmarkdown", "stringr", "vegan"] }, "acde": { "name": "acde", @@ -6415,19 +6439,19 @@ "name": "adSplit", "version": "1.74.0", "sha256": "13rrkb0vxkknvqhb8pgx8d13sxzy3w0wbkhhj5lrlc1kb1yqcfbh", - "depends": ["AnnotationDbi", "Biobase", "cluster", "GO_db", "KEGGREST", "multtest"] + "depends": ["AnnotationDbi", "Biobase", "GO_db", "KEGGREST", "cluster", "multtest"] }, "adductomicsR": { "name": "adductomicsR", "version": "1.20.0", "sha256": "0800jbfm488i6ccz48k49gpxr9sf9104cxcghgy9c4lzm5d3wfbm", - "depends": ["adductData", "ade4", "AnnotationHub", "bootstrap", "data_table", "doSNOW", "dplyr", "DT", "ExperimentHub", "fastcluster", "foreach", "fpc", "mzR", "OrgMassSpecR", "pastecs", "pracma", "RcppEigen", "reshape2", "rvest", "smoother", "zoo"] + "depends": ["AnnotationHub", "DT", "ExperimentHub", "OrgMassSpecR", "RcppEigen", "adductData", "ade4", "bootstrap", "data_table", "doSNOW", "dplyr", "fastcluster", "foreach", "fpc", "mzR", "pastecs", "pracma", "reshape2", "rvest", "smoother", "zoo"] }, "adverSCarial": { "name": "adverSCarial", "version": "1.2.0", "sha256": "1c8anqpxdrkc33pfm1phqjsb8kjdrfqxh93x8n2mpsywqg8q27pb", - "depends": ["DelayedArray", "gtools", "S4Vectors"] + "depends": ["DelayedArray", "S4Vectors", "gtools"] }, "affxparser": { "name": "affxparser", @@ -6439,25 +6463,25 @@ "name": "affy", "version": "1.82.0", "sha256": "19z22c1yd3rkwk7dp8q8xv16n0qv92iz00vzid3pniy7zr80cxxy", - "depends": ["affyio", "Biobase", "BiocGenerics", "BiocManager", "preprocessCore", "zlibbioc"] + "depends": ["Biobase", "BiocGenerics", "BiocManager", "affyio", "preprocessCore", "zlibbioc"] }, "affyContam": { "name": "affyContam", "version": "1.62.0", "sha256": "0r4pqda9pv60b867c6yi328687kyxjglk5jmcal6xnlr75nf4w0y", - "depends": ["affy", "affydata", "Biobase"] + "depends": ["Biobase", "affy", "affydata"] }, "affyILM": { "name": "affyILM", "version": "1.56.0", "sha256": "185kdrnvcp2jw0k71q0v4yk7583gwgi31h0n281x25hirixf6rm3", - "depends": ["affxparser", "affy", "Biobase", "gcrma"] + "depends": ["Biobase", "affxparser", "affy", "gcrma"] }, "affyPLM": { "name": "affyPLM", "version": "1.80.0", "sha256": "1khknl7k45amyw58mcgw7kl511llyddw31qzwqc2l5c4j3bwnpz5", - "depends": ["affy", "Biobase", "BiocGenerics", "gcrma", "preprocessCore", "zlibbioc"] + "depends": ["Biobase", "BiocGenerics", "affy", "gcrma", "preprocessCore", "zlibbioc"] }, "affycomp": { "name": "affycomp", @@ -6469,7 +6493,7 @@ "name": "affycoretools", "version": "1.76.0", "sha256": "0w138n3f68ndr0innk981vf8p5wb729m31p0d3f9qp08hmv58jfw", - "depends": ["affy", "AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "edgeR", "gcrma", "ggplot2", "Glimma", "GOstats", "gplots", "hwriter", "lattice", "limma", "oligoClasses", "ReportingTools", "RSQLite", "S4Vectors", "xtable"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "GOstats", "Glimma", "RSQLite", "ReportingTools", "S4Vectors", "affy", "edgeR", "gcrma", "ggplot2", "gplots", "hwriter", "lattice", "limma", "oligoClasses", "xtable"] }, "affyio": { "name": "affyio", @@ -6481,13 +6505,13 @@ "name": "affylmGUI", "version": "1.78.0", "sha256": "1qilkr3dcl6driah24kgz7lrzamq08qp2z03inm2m4r5yx8811wc", - "depends": ["affy", "affyio", "affyPLM", "AnnotationDbi", "BiocGenerics", "BiocManager", "gcrma", "limma", "R2HTML", "tkrplot", "xtable"] + "depends": ["AnnotationDbi", "BiocGenerics", "BiocManager", "R2HTML", "affy", "affyPLM", "affyio", "gcrma", "limma", "tkrplot", "xtable"] }, "aggregateBioVar": { "name": "aggregateBioVar", "version": "1.14.0", "sha256": "0qag99chj7n7l0wbb8ar0f58xs6883rgddkgj7jnrrlj3acrm12v", - "depends": ["Matrix", "rlang", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "tibble"] + "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "rlang", "tibble"] }, "agilp": { "name": "agilp", @@ -6499,7 +6523,7 @@ "name": "airpart", "version": "1.12.0", "sha256": "05l5rgjfjln3kip72wj4ll4cgak9yz60xg6dgxxj690pxs1pw7bg", - "depends": ["apeglm", "clue", "ComplexHeatmap", "dplyr", "dynamicTreeCut", "emdbook", "forestplot", "ggplot2", "lpSolve", "matrixStats", "mclust", "pbapply", "plyr", "RColorBrewer", "rlang", "S4Vectors", "scater", "SingleCellExperiment", "smurf", "SummarizedExperiment"] + "depends": ["ComplexHeatmap", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "apeglm", "clue", "dplyr", "dynamicTreeCut", "emdbook", "forestplot", "ggplot2", "lpSolve", "matrixStats", "mclust", "pbapply", "plyr", "rlang", "scater", "smurf"] }, "alabaster": { "name": "alabaster", @@ -6509,45 +6533,45 @@ }, "alabaster_base": { "name": "alabaster.base", - "version": "1.4.1", - "sha256": "1id8cs3m1kpcfmk9aa957vy7svf7aam4kzyzic36rxcqmarr130h", - "depends": ["alabaster_schemas", "jsonlite", "jsonvalidate", "Rcpp", "rhdf5", "Rhdf5lib", "S4Vectors"] + "version": "1.4.2", + "sha256": "1yf4j6dwva1d16fb8ss5hrpmj71azwjk9aqpad9wpnfapaldjzhb", + "depends": ["Rcpp", "Rhdf5lib", "S4Vectors", "alabaster_schemas", "jsonlite", "jsonvalidate", "rhdf5"] }, "alabaster_bumpy": { "name": "alabaster.bumpy", "version": "1.4.0", "sha256": "16q433asljnnx04b7q2a4ajhbsrzrqa35m6mcx9apg6q24iw869x", - "depends": ["alabaster_base", "BiocGenerics", "BumpyMatrix", "IRanges", "Matrix", "rhdf5", "S4Vectors"] + "depends": ["BiocGenerics", "BumpyMatrix", "IRanges", "Matrix", "S4Vectors", "alabaster_base", "rhdf5"] }, "alabaster_files": { "name": "alabaster.files", "version": "1.2.0", "sha256": "0mib4wix9ddgvhgff05gq2ijy6kyh884nv0j40rxzfkxqhp77gim", - "depends": ["alabaster_base", "BiocGenerics", "Rsamtools", "S4Vectors"] + "depends": ["BiocGenerics", "Rsamtools", "S4Vectors", "alabaster_base"] }, "alabaster_mae": { "name": "alabaster.mae", "version": "1.4.0", "sha256": "07w4q6dm4asrcdqynhdlxyaaf29s3ca8ij8iblwjnpgp9p5pbj6v", - "depends": ["alabaster_base", "alabaster_se", "jsonlite", "MultiAssayExperiment", "rhdf5", "S4Vectors"] + "depends": ["MultiAssayExperiment", "S4Vectors", "alabaster_base", "alabaster_se", "jsonlite", "rhdf5"] }, "alabaster_matrix": { "name": "alabaster.matrix", - "version": "1.4.0", - "sha256": "00k0lylyhz6glqhd463bbmmldqhv5i7an9nw95md7x2m43c9gzyk", - "depends": ["alabaster_base", "BiocGenerics", "DelayedArray", "HDF5Array", "Matrix", "Rcpp", "rhdf5", "S4Arrays", "S4Vectors", "SparseArray"] + "version": "1.4.2", + "sha256": "1b32qs2baq9s492a332vh1hpyxq62z16xj2w17m8wh8a4mcabry8", + "depends": ["BiocGenerics", "DelayedArray", "HDF5Array", "Matrix", "Rcpp", "S4Arrays", "S4Vectors", "SparseArray", "alabaster_base", "rhdf5"] }, "alabaster_ranges": { "name": "alabaster.ranges", - "version": "1.4.1", - "sha256": "0d3ygcn2sxkrdyjlwl98l50b0vqxrsp24vb029z5g8kjbvqhh5kr", - "depends": ["alabaster_base", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "rhdf5", "S4Vectors"] + "version": "1.4.2", + "sha256": "16r5wdlw2g9qnbvzpx5c5c04xa5dkwrmqlyc81iixkx6j98gsz2w", + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "alabaster_base", "rhdf5"] }, "alabaster_sce": { "name": "alabaster.sce", "version": "1.4.0", "sha256": "1i9nmivsfrd7fbb8njmwihfx4xpj4p3h5bnlj9fvk5308bbj3qcg", - "depends": ["alabaster_base", "alabaster_se", "jsonlite", "SingleCellExperiment"] + "depends": ["SingleCellExperiment", "alabaster_base", "alabaster_se", "jsonlite"] }, "alabaster_schemas": { "name": "alabaster.schemas", @@ -6559,49 +6583,49 @@ "name": "alabaster.se", "version": "1.4.1", "sha256": "134r4pwaa4nsmdgqxs16w3adn482zl70lgyd4s96pmx7hqm9i1vx", - "depends": ["alabaster_base", "alabaster_matrix", "alabaster_ranges", "BiocGenerics", "GenomicRanges", "IRanges", "jsonlite", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "alabaster_base", "alabaster_matrix", "alabaster_ranges", "jsonlite"] }, "alabaster_spatial": { "name": "alabaster.spatial", "version": "1.4.0", "sha256": "11mgs6smyiv4r5cajzqpw0k7q0jsm6xch1b5c9w7scl7d9bq981k", - "depends": ["alabaster_base", "alabaster_sce", "rhdf5", "S4Vectors", "SpatialExperiment"] + "depends": ["S4Vectors", "SpatialExperiment", "alabaster_base", "alabaster_sce", "rhdf5"] }, "alabaster_string": { "name": "alabaster.string", "version": "1.4.0", "sha256": "0p55dpfwjjikmgyq0vk9hmd6k0j3d2x4jjxd7wnabhga3vr4jg7q", - "depends": ["alabaster_base", "Biostrings", "S4Vectors"] + "depends": ["Biostrings", "S4Vectors", "alabaster_base"] }, "alabaster_vcf": { "name": "alabaster.vcf", "version": "1.4.0", "sha256": "1ry5gim6kkis8wy0v1afv44ay6nw8m9nd6jl89980z499pblf9j4", - "depends": ["alabaster_base", "alabaster_se", "alabaster_string", "Rsamtools", "S4Vectors", "VariantAnnotation"] + "depends": ["Rsamtools", "S4Vectors", "VariantAnnotation", "alabaster_base", "alabaster_se", "alabaster_string"] }, "alevinQC": { "name": "alevinQC", "version": "1.20.0", "sha256": "1pq42lvgggysg28ngxipqb1l7jfj498nxpg40h02siz6nb6inbdw", - "depends": ["cowplot", "dplyr", "DT", "GGally", "ggplot2", "Rcpp", "rjson", "rlang", "rmarkdown", "shiny", "shinydashboard", "tximport"] + "depends": ["DT", "GGally", "Rcpp", "cowplot", "dplyr", "ggplot2", "rjson", "rlang", "rmarkdown", "shiny", "shinydashboard", "tximport"] }, "altcdfenvs": { "name": "altcdfenvs", "version": "2.66.0", "sha256": "08k3j3dc93vg5c9ccw7mc4fri9xbdj7rdjyj0h6ig0s5866fqvlb", - "depends": ["affy", "Biobase", "BiocGenerics", "Biostrings", "hypergraph", "makecdfenv", "S4Vectors"] + "depends": ["Biobase", "BiocGenerics", "Biostrings", "S4Vectors", "affy", "hypergraph", "makecdfenv"] }, "amplican": { "name": "amplican", "version": "1.26.0", "sha256": "1nbyivd5020kqkmk5ngpaixhdxgmqpifaxnfgq6yc2njqizgbhxy", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "cluster", "data_table", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "ggthemes", "gridExtra", "gtable", "IRanges", "knitr", "Matrix", "matrixStats", "pwalign", "Rcpp", "rmarkdown", "S4Vectors", "ShortRead", "stringr", "waffle"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "S4Vectors", "ShortRead", "cluster", "data_table", "dplyr", "ggplot2", "ggthemes", "gridExtra", "gtable", "knitr", "matrixStats", "pwalign", "rmarkdown", "stringr", "waffle"] }, "animalcules": { "name": "animalcules", "version": "1.20.0", "sha256": "1g073n8nmckd388hy9gfiddil53wv692k69ywjc85jyp5jy2n265", - "depends": ["ape", "assertthat", "caret", "covr", "DESeq2", "dplyr", "DT", "forcats", "ggforce", "ggplot2", "GUniFrac", "lattice", "limma", "magrittr", "Matrix", "MultiAssayExperiment", "plotly", "rentrez", "reshape2", "ROCit", "S4Vectors", "scales", "shiny", "shinyjs", "SummarizedExperiment", "tibble", "tidyr", "tsne", "umap", "vegan", "XML"] + "depends": ["DESeq2", "DT", "GUniFrac", "Matrix", "MultiAssayExperiment", "ROCit", "S4Vectors", "SummarizedExperiment", "XML", "ape", "assertthat", "caret", "covr", "dplyr", "forcats", "ggforce", "ggplot2", "lattice", "limma", "magrittr", "plotly", "rentrez", "reshape2", "scales", "shiny", "shinyjs", "tibble", "tidyr", "tsne", "umap", "vegan"] }, "annaffy": { "name": "annaffy", @@ -6613,13 +6637,13 @@ "name": "annmap", "version": "1.46.0", "sha256": "1xijcm0c19wj2yknrlsz2ifm097z32rc58k608482686srj0bg2i", - "depends": ["Biobase", "BiocGenerics", "DBI", "digest", "genefilter", "GenomicRanges", "IRanges", "lattice", "RMySQL", "Rsamtools"] + "depends": ["Biobase", "BiocGenerics", "DBI", "GenomicRanges", "IRanges", "RMySQL", "Rsamtools", "digest", "genefilter", "lattice"] }, "annotate": { "name": "annotate", "version": "1.82.0", "sha256": "1v4sq22lwrhl50whag0jil788wwvi4rpdaij03iwak93q998ls0f", - "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "httr", "XML", "xtable"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "XML", "httr", "xtable"] }, "annotationTools": { "name": "annotationTools", @@ -6631,7 +6655,7 @@ "name": "annotatr", "version": "1.30.0", "sha256": "11cc3nknbckm0v5r7dzgqzw0137w4c08ab10s9svb1y02z45a0qz", - "depends": ["AnnotationDbi", "AnnotationHub", "dplyr", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "readr", "regioneR", "reshape2", "rtracklayer", "S4Vectors"] + "depends": ["AnnotationDbi", "AnnotationHub", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "dplyr", "ggplot2", "readr", "regioneR", "reshape2", "rtracklayer"] }, "anota": { "name": "anota", @@ -6643,7 +6667,7 @@ "name": "anota2seq", "version": "1.26.0", "sha256": "140k37wswl4w2136pz9y0z82sphzxmgzgk3cr400kkm39wjn7vxm", - "depends": ["DESeq2", "edgeR", "limma", "multtest", "qvalue", "RColorBrewer", "SummarizedExperiment"] + "depends": ["DESeq2", "RColorBrewer", "SummarizedExperiment", "edgeR", "limma", "multtest", "qvalue"] }, "antiProfiles": { "name": "antiProfiles", @@ -6655,73 +6679,73 @@ "name": "apComplex", "version": "2.70.0", "sha256": "1fsqrds5r8bhdf7fbnw6rf3vqapl6xk1a5l6jjb98raxmjsrfyqs", - "depends": ["graph", "org_Sc_sgd_db", "RBGL", "Rgraphviz"] + "depends": ["RBGL", "Rgraphviz", "graph", "org_Sc_sgd_db"] }, "apeglm": { "name": "apeglm", "version": "1.26.1", "sha256": "039my876v0k2mr50w90w3phj4cq55awf5ks07kr2fnm7w211gxvs", - "depends": ["emdbook", "GenomicRanges", "Rcpp", "RcppEigen", "RcppNumerical", "SummarizedExperiment"] + "depends": ["GenomicRanges", "Rcpp", "RcppEigen", "RcppNumerical", "SummarizedExperiment", "emdbook"] }, "appreci8R": { "name": "appreci8R", "version": "1.22.0", "sha256": "1nwb7475lhclyd0jdwm0sp1wh2rgs2h16k4hin6z44axix5v7jhr", - "depends": ["Biostrings", "BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "COSMIC_67", "DT", "GenomicFeatures", "GenomicRanges", "GenomicScores", "Homo_sapiens", "IRanges", "MafDb_1Kgenomes_phase3_hs37d5", "MafDb_ExAC_r1_0_hs37d5", "MafDb_gnomADex_r2_1_hs37d5", "openxlsx", "PolyPhen_Hsapiens_dbSNP131", "rentrez", "Rsamtools", "S4Vectors", "seqinr", "shiny", "shinyjs", "SIFT_Hsapiens_dbSNP137", "SNPlocs_Hsapiens_dbSNP144_GRCh37", "stringr", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "VariantAnnotation", "XtraSNPlocs_Hsapiens_dbSNP144_GRCh37"] + "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "Biostrings", "COSMIC_67", "DT", "GenomicFeatures", "GenomicRanges", "GenomicScores", "Homo_sapiens", "IRanges", "MafDb_1Kgenomes_phase3_hs37d5", "MafDb_ExAC_r1_0_hs37d5", "MafDb_gnomADex_r2_1_hs37d5", "PolyPhen_Hsapiens_dbSNP131", "Rsamtools", "S4Vectors", "SIFT_Hsapiens_dbSNP137", "SNPlocs_Hsapiens_dbSNP144_GRCh37", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "VariantAnnotation", "XtraSNPlocs_Hsapiens_dbSNP144_GRCh37", "openxlsx", "rentrez", "seqinr", "shiny", "shinyjs", "stringr"] }, "aroma_light": { "name": "aroma.light", "version": "3.34.0", "sha256": "1v24b43knsjpw44zkrzv8pvxjiw12rcz9wqp4ahd88dg23j7pvwz", - "depends": ["matrixStats", "R_methodsS3", "R_oo", "R_utils"] + "depends": ["R_methodsS3", "R_oo", "R_utils", "matrixStats"] }, "arrayMvout": { "name": "arrayMvout", "version": "1.62.0", "sha256": "11v3s972nyahdswqdcab0fj9jb73vd5dnd5kfb09572y4z0hn5xw", - "depends": ["affy", "affyContam", "Biobase", "lumi", "mdqc", "parody"] + "depends": ["Biobase", "affy", "affyContam", "lumi", "mdqc", "parody"] }, "arrayQuality": { "name": "arrayQuality", "version": "1.82.0", "sha256": "0wmczy2wdxki9pam9q6ly5clvqbl018v1ar4zkdm8algjddyc2cp", - "depends": ["gridBase", "hexbin", "limma", "marray", "RColorBrewer"] + "depends": ["RColorBrewer", "gridBase", "hexbin", "limma", "marray"] }, "arrayQualityMetrics": { "name": "arrayQualityMetrics", "version": "3.60.0", "sha256": "04y1vbpxqhqn1vsyqmscikaxn6wshsk4krcqzf2baf9x4azbdjk1", - "depends": ["affy", "affyPLM", "beadarray", "Biobase", "genefilter", "gridSVG", "Hmisc", "hwriter", "lattice", "latticeExtra", "limma", "RColorBrewer", "setRNG", "svglite", "vsn", "XML"] + "depends": ["Biobase", "Hmisc", "RColorBrewer", "XML", "affy", "affyPLM", "beadarray", "genefilter", "gridSVG", "hwriter", "lattice", "latticeExtra", "limma", "setRNG", "svglite", "vsn"] }, "artMS": { "name": "artMS", "version": "1.22.0", "sha256": "11a6igby8kz2r5wawrsisz22v4hak9004zr8y87v3pp92rnvb3ma", - "depends": ["AnnotationDbi", "bit64", "circlize", "cluster", "corrplot", "data_table", "dplyr", "getopt", "ggdendro", "ggplot2", "ggrepel", "gplots", "limma", "MSstats", "openxlsx", "org_Hs_eg_db", "pheatmap", "plotly", "plyr", "RColorBrewer", "scales", "seqinr", "stringr", "tidyr", "UpSetR", "VennDiagram", "yaml"] + "depends": ["AnnotationDbi", "MSstats", "RColorBrewer", "UpSetR", "VennDiagram", "bit64", "circlize", "cluster", "corrplot", "data_table", "dplyr", "getopt", "ggdendro", "ggplot2", "ggrepel", "gplots", "limma", "openxlsx", "org_Hs_eg_db", "pheatmap", "plotly", "plyr", "scales", "seqinr", "stringr", "tidyr", "yaml"] }, "atSNP": { "name": "atSNP", "version": "1.20.0", "sha256": "08pcbys8iy8wzqzzvlnwc3qw7m7cswkqa3x2x2x8m4ni1s4isd6z", - "depends": ["BiocFileCache", "BiocParallel", "BSgenome", "data_table", "ggplot2", "lifecycle", "motifStack", "rappdirs", "Rcpp", "testthat"] + "depends": ["BSgenome", "BiocFileCache", "BiocParallel", "Rcpp", "data_table", "ggplot2", "lifecycle", "motifStack", "rappdirs", "testthat"] }, "atena": { "name": "atena", "version": "1.10.0", "sha256": "1y2v8mi9awgfbcawpcir01qglxn0bdgj6v2dsdqp6if25cizl3sr", - "depends": ["AnnotationHub", "BiocGenerics", "BiocParallel", "cli", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "matrixStats", "Rsamtools", "S4Vectors", "sparseMatrixStats", "SQUAREM", "SummarizedExperiment"] + "depends": ["AnnotationHub", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "Rsamtools", "S4Vectors", "SQUAREM", "SummarizedExperiment", "cli", "matrixStats", "sparseMatrixStats"] }, "attract": { "name": "attract", "version": "1.56.0", "sha256": "08l634sk6y06y2m78vsd0ld4w3h6qvx4hk6wkqflkl9jjyqpx8jy", - "depends": ["AnnotationDbi", "Biobase", "cluster", "GOstats", "KEGGREST", "limma", "org_Hs_eg_db", "reactome_db"] + "depends": ["AnnotationDbi", "Biobase", "GOstats", "KEGGREST", "cluster", "limma", "org_Hs_eg_db", "reactome_db"] }, "autonomics": { "name": "autonomics", "version": "1.12.1", "sha256": "1fzzj0v6v4jvr3wh5bnjr6h2ny8zfm9pdlbhq5syaa2plvsbblpy", - "depends": ["abind", "BiocFileCache", "BiocGenerics", "bit64", "codingMatrices", "colorspace", "data_table", "dplyr", "edgeR", "ggforce", "ggplot2", "ggrepel", "gridExtra", "limma", "magrittr", "matrixStats", "MultiAssayExperiment", "R_utils", "RColorBrewer", "readxl", "rlang", "S4Vectors", "scales", "stringi", "SummarizedExperiment", "tidyr", "tidyselect", "vsn"] + "depends": ["BiocFileCache", "BiocGenerics", "MultiAssayExperiment", "RColorBrewer", "R_utils", "S4Vectors", "SummarizedExperiment", "abind", "bit64", "codingMatrices", "colorspace", "data_table", "dplyr", "edgeR", "ggforce", "ggplot2", "ggrepel", "gridExtra", "limma", "magrittr", "matrixStats", "readxl", "rlang", "scales", "stringi", "tidyr", "tidyselect", "vsn"] }, "awst": { "name": "awst", @@ -6739,13 +6763,13 @@ "name": "ballgown", "version": "2.36.0", "sha256": "0x3avbqf0ipmb70szf2chhbdg14ba2hwhyyz0wd66c1qwfk6aj9v", - "depends": ["Biobase", "GenomeInfoDb", "GenomicRanges", "IRanges", "limma", "RColorBrewer", "rtracklayer", "S4Vectors", "sva"] + "depends": ["Biobase", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "limma", "rtracklayer", "sva"] }, "bambu": { "name": "bambu", "version": "3.6.0", "sha256": "1pn6a74nvcpn0xzfb8167hbc6pdma0ybhh7kjpqdl4hgjp446w5w", - "depends": ["BiocGenerics", "BiocParallel", "BSgenome", "data_table", "dplyr", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rcpp", "RcppArmadillo", "Rsamtools", "S4Vectors", "SummarizedExperiment", "tidyr", "xgboost"] + "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rcpp", "RcppArmadillo", "Rsamtools", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "tidyr", "xgboost"] }, "bamsignals": { "name": "bamsignals", @@ -6757,7 +6781,7 @@ "name": "bandle", "version": "1.8.0", "sha256": "0lkmwr207s26kxmhfcsay4mb3fg70wjcrhhjj82g5yjrycmjidm9", - "depends": ["BH", "Biobase", "BiocParallel", "BiocStyle", "circlize", "dplyr", "ggalluvial", "ggplot2", "ggrepel", "knitr", "lbfgs", "MSnbase", "plyr", "pRoloc", "pRolocdata", "Rcpp", "RcppArmadillo", "rlang", "robustbase", "S4Vectors", "tidyr"] + "depends": ["BH", "Biobase", "BiocParallel", "BiocStyle", "MSnbase", "Rcpp", "RcppArmadillo", "S4Vectors", "circlize", "dplyr", "ggalluvial", "ggplot2", "ggrepel", "knitr", "lbfgs", "pRoloc", "pRolocdata", "plyr", "rlang", "robustbase", "tidyr"] }, "banocc": { "name": "banocc", @@ -6769,13 +6793,13 @@ "name": "barcodetrackR", "version": "1.12.0", "sha256": "0x0fpa44lyww2l1rdc35pdlgczz4y1vxjbn0s1frlpaacmqcxrly", - "depends": ["circlize", "cowplot", "dplyr", "ggdendro", "ggplot2", "ggridges", "magrittr", "plyr", "proxy", "RColorBrewer", "rlang", "S4Vectors", "scales", "shiny", "SummarizedExperiment", "tibble", "tidyr", "vegan", "viridis"] + "depends": ["RColorBrewer", "S4Vectors", "SummarizedExperiment", "circlize", "cowplot", "dplyr", "ggdendro", "ggplot2", "ggridges", "magrittr", "plyr", "proxy", "rlang", "scales", "shiny", "tibble", "tidyr", "vegan", "viridis"] }, "basecallQC": { "name": "basecallQC", "version": "1.28.0", "sha256": "033agi9xcyr2mpryyqjzd1diinv3cnam6f13qw4xfg0fncn0rm83", - "depends": ["data_table", "dplyr", "DT", "ggplot2", "knitr", "lazyeval", "magrittr", "prettydoc", "raster", "rmarkdown", "ShortRead", "stringr", "tidyr", "XML", "yaml"] + "depends": ["DT", "ShortRead", "XML", "data_table", "dplyr", "ggplot2", "knitr", "lazyeval", "magrittr", "prettydoc", "raster", "rmarkdown", "stringr", "tidyr", "yaml"] }, "basilisk": { "name": "basilisk", @@ -6793,19 +6817,19 @@ "name": "batchelor", "version": "1.20.0", "sha256": "1h70rm0h711ndj9kz3q10yd9f6npjiwvk9wmkg6w3pdgjni1nrl0", - "depends": ["beachmat", "BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "igraph", "Matrix", "Rcpp", "ResidualMatrix", "S4Vectors", "ScaledMatrix", "scuttle", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "Rcpp", "ResidualMatrix", "S4Vectors", "ScaledMatrix", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "igraph", "scuttle"] }, "bayNorm": { "name": "bayNorm", "version": "1.22.0", "sha256": "0b05446vcqxr7smxyhmvl6rxlckzzgqhf5v1059657kihhscqr7s", - "depends": ["BB", "BiocParallel", "doSNOW", "fitdistrplus", "foreach", "iterators", "locfit", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BB", "BiocParallel", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "SingleCellExperiment", "SummarizedExperiment", "doSNOW", "fitdistrplus", "foreach", "iterators", "locfit"] }, "baySeq": { "name": "baySeq", "version": "2.38.0", "sha256": "0nlkynzijxl6f8983vdpmcssvrpjf6s42zx3lxfwxwlhrvz1yg9l", - "depends": ["abind", "edgeR", "GenomicRanges"] + "depends": ["GenomicRanges", "abind", "edgeR"] }, "bcSeq": { "name": "bcSeq", @@ -6823,55 +6847,55 @@ "name": "beachmat.hdf5", "version": "1.2.0", "sha256": "1qjib3vw0b0nvfx3j5nfgwikcmc5jq49ddahv05arhdabd40vmg4", - "depends": ["beachmat", "DelayedArray", "HDF5Array", "Rcpp", "Rhdf5lib"] + "depends": ["DelayedArray", "HDF5Array", "Rcpp", "Rhdf5lib", "beachmat"] }, "beadarray": { "name": "beadarray", "version": "2.54.0", "sha256": "0yda6maj985k374bh6zkrs8qffw1jrz9gc3mja07ibyn4pvzkclq", - "depends": ["AnnotationDbi", "BeadDataPackR", "Biobase", "BiocGenerics", "GenomicRanges", "ggplot2", "hexbin", "illuminaio", "IRanges", "limma", "reshape2"] + "depends": ["AnnotationDbi", "BeadDataPackR", "Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "ggplot2", "hexbin", "illuminaio", "limma", "reshape2"] }, "beer": { "name": "beer", "version": "1.8.0", "sha256": "1b7pw7nwpryrdji14y9cbv03f8g8r8lzf1fd72ff2b69csp993ww", - "depends": ["BiocParallel", "cli", "edgeR", "PhIPData", "progressr", "rjags", "SummarizedExperiment"] + "depends": ["BiocParallel", "PhIPData", "SummarizedExperiment", "cli", "edgeR", "progressr", "rjags"] }, "benchdamic": { "name": "benchdamic", "version": "1.10.0", "sha256": "040lkmwz51za2biqlf3z3ai5j03rmw15kwz3i3v10rzq0322fsk3", - "depends": ["ALDEx2", "ANCOMBC", "BiocParallel", "corncob", "cowplot", "dearseq", "DESeq2", "edgeR", "ggdendro", "ggplot2", "ggridges", "GUniFrac", "limma", "lme4", "Maaslin2", "MAST", "metagenomeSeq", "MGLM", "MicrobiomeStat", "mixOmics", "NOISeq", "phyloseq", "plyr", "RColorBrewer", "reshape2", "Seurat", "SummarizedExperiment", "tidytext", "TreeSummarizedExperiment", "zinbwave"] + "depends": ["ALDEx2", "ANCOMBC", "BiocParallel", "DESeq2", "GUniFrac", "MAST", "MGLM", "Maaslin2", "MicrobiomeStat", "NOISeq", "RColorBrewer", "Seurat", "SummarizedExperiment", "TreeSummarizedExperiment", "corncob", "cowplot", "dearseq", "edgeR", "ggdendro", "ggplot2", "ggridges", "limma", "lme4", "metagenomeSeq", "mixOmics", "phyloseq", "plyr", "reshape2", "tidytext", "zinbwave"] }, "betaHMM": { "name": "betaHMM", "version": "1.0.0", "sha256": "1dwdjfvca22gaz0qjngf3fc32bpybz1dvvbwd91wgznzk7wjk6yq", - "depends": ["cowplot", "doParallel", "dplyr", "foreach", "GenomicRanges", "ggplot2", "pROC", "S4Vectors", "scales", "stringr", "SummarizedExperiment", "tidyr", "tidyselect"] + "depends": ["GenomicRanges", "S4Vectors", "SummarizedExperiment", "cowplot", "doParallel", "dplyr", "foreach", "ggplot2", "pROC", "scales", "stringr", "tidyr", "tidyselect"] }, "bettr": { "name": "bettr", "version": "1.0.0", "sha256": "19z7df9kmk4zfbljlq5ginl82zml37iyjnjm0fqinm2b9i1ww432", - "depends": ["bslib", "circlize", "ComplexHeatmap", "cowplot", "dplyr", "DT", "ggplot2", "Hmisc", "rlang", "S4Vectors", "scales", "shiny", "shinyjqui", "sortable", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["ComplexHeatmap", "DT", "Hmisc", "S4Vectors", "SummarizedExperiment", "bslib", "circlize", "cowplot", "dplyr", "ggplot2", "rlang", "scales", "shiny", "shinyjqui", "sortable", "tibble", "tidyr"] }, "bgx": { "name": "bgx", "version": "1.70.0", "sha256": "0sglk8q12fvqk6m699v3lajwr1zb8wnrldfv2n8y7jjy2fqcvs19", - "depends": ["affy", "Biobase", "gcrma", "Rcpp"] + "depends": ["Biobase", "Rcpp", "affy", "gcrma"] }, "bigmelon": { "name": "bigmelon", "version": "1.30.0", "sha256": "0fa1dwbk6hdiwg6dmbks7hy4cg3ydyd2sv94cyl0003awhf00nn9", - "depends": ["Biobase", "BiocGenerics", "gdsfmt", "GEOquery", "illuminaio", "methylumi", "minfi", "wateRmelon"] + "depends": ["Biobase", "BiocGenerics", "GEOquery", "gdsfmt", "illuminaio", "methylumi", "minfi", "wateRmelon"] }, "bioCancer": { "name": "bioCancer", "version": "1.32.0", "sha256": "0mwmdavakmrfa7d7h0h14lkk6k7ps3g8hvbja1hq01nkdfy7imvp", - "depends": ["AlgDesign", "AnnotationDbi", "Biobase", "cBioPortalData", "clusterProfiler", "DiagrammeR", "DOSE", "dplyr", "DT", "geNetClassifier", "GO_db", "htmlwidgets", "org_Bt_eg_db", "org_Hs_eg_db", "plyr", "r_import", "R_methodsS3", "R_oo", "radiant_data", "reactome_db", "ReactomePA", "shiny", "shinythemes", "tibble", "tidyr", "visNetwork", "XML"] + "depends": ["AlgDesign", "AnnotationDbi", "Biobase", "DOSE", "DT", "DiagrammeR", "GO_db", "R_methodsS3", "R_oo", "ReactomePA", "XML", "cBioPortalData", "clusterProfiler", "dplyr", "geNetClassifier", "htmlwidgets", "org_Bt_eg_db", "org_Hs_eg_db", "plyr", "r_import", "radiant_data", "reactome_db", "shiny", "shinythemes", "tibble", "tidyr", "visNetwork"] }, "bioDist": { "name": "bioDist", @@ -6883,7 +6907,7 @@ "name": "bioassayR", "version": "1.42.0", "sha256": "0rckhgg73cgz0ppqaywc7nvbnp1is6cyjfa7dn2l32xxrcl57pq6", - "depends": ["BiocGenerics", "ChemmineR", "DBI", "Matrix", "rjson", "RSQLite", "XML"] + "depends": ["BiocGenerics", "ChemmineR", "DBI", "Matrix", "RSQLite", "XML", "rjson"] }, "biobroom": { "name": "biobroom", @@ -6901,13 +6925,13 @@ "name": "biocGraph", "version": "1.66.0", "sha256": "0ji6pa8wfj57drpnp03vgas1pird84g15nnp6469jmx773izhfq0", - "depends": ["BiocGenerics", "geneplotter", "graph", "Rgraphviz"] + "depends": ["BiocGenerics", "Rgraphviz", "geneplotter", "graph"] }, "biocViews": { "name": "biocViews", "version": "1.72.0", "sha256": "10j9s50ppfx8r752wkabls0n4gxp17z7dnaf352f3dcdbfa8ijh5", - "depends": ["Biobase", "BiocManager", "graph", "RBGL", "RCurl", "RUnit", "XML"] + "depends": ["Biobase", "BiocManager", "RBGL", "RCurl", "RUnit", "XML", "graph"] }, "biocroxytest": { "name": "biocroxytest", @@ -6925,67 +6949,67 @@ "name": "biodb", "version": "1.12.0", "sha256": "0zkd6505q0myc5l9d69i1fvfhcrjqxkv208p84zr5p7xi8jmg3dw", - "depends": ["BiocFileCache", "chk", "git2r", "jsonlite", "lgr", "lifecycle", "openssl", "plyr", "progress", "R6", "rappdirs", "Rcpp", "RCurl", "RSQLite", "stringr", "testthat", "withr", "XML", "yaml"] + "depends": ["BiocFileCache", "R6", "RCurl", "RSQLite", "Rcpp", "XML", "chk", "git2r", "jsonlite", "lgr", "lifecycle", "openssl", "plyr", "progress", "rappdirs", "stringr", "testthat", "withr", "yaml"] }, "biodbChebi": { "name": "biodbChebi", "version": "1.10.0", "sha256": "1w3mnryv1x5a68llnpqfdsrkzwrwq2b7n6hm458gfkw6ql070109", - "depends": ["biodb", "R6"] + "depends": ["R6", "biodb"] }, "biodbExpasy": { "name": "biodbExpasy", - "version": "1.8.0", - "sha256": "1amzff4ndadialm5rhzy267c24h5fmh9w9w109zsbw8sixl0s0sd", - "depends": ["biodb", "chk", "R6", "stringr"] + "version": "1.8.1", + "sha256": "0n5avxhv5131122h18d3r2v9c64i3nb251hmz8hhc6chmk203fmj", + "depends": ["R6", "biodb", "chk", "stringr"] }, "biodbHmdb": { "name": "biodbHmdb", - "version": "1.10.0", - "sha256": "0xf63zj1bpkaymv3psvrkibjbirqb7bych95p4l5crsg8af730ra", - "depends": ["biodb", "R6", "Rcpp", "testthat", "zip"] + "version": "1.10.1", + "sha256": "14g5c043rgwp259z5km4wvl5h9810fxpsja4wmk326plqpnqhcjr", + "depends": ["R6", "Rcpp", "biodb", "testthat", "zip"] }, "biodbKegg": { "name": "biodbKegg", - "version": "1.10.0", - "sha256": "065a0c62xbbqc73gbcqcwfv1jyyy025dppjq93l0ic4qshh9kg79", - "depends": ["biodb", "chk", "lifecycle", "R6"] + "version": "1.10.2", + "sha256": "0rwxbg3ij5rg3agzsxib7f80b05ar40xnql2krl44c3n43yqkwyw", + "depends": ["R6", "biodb", "chk", "lifecycle"] }, "biodbLipidmaps": { "name": "biodbLipidmaps", "version": "1.10.0", "sha256": "1p181kwy9q8jj4m7flg71pqn7h6865hbwha4n6j2qki830vym6rv", - "depends": ["biodb", "lifecycle", "R6"] + "depends": ["R6", "biodb", "lifecycle"] }, "biodbNcbi": { "name": "biodbNcbi", "version": "1.8.0", "sha256": "01v0lym2kldcjypqsx9b8k8hvxdmnr1rsczdzl87nsax22q6g9hc", - "depends": ["biodb", "chk", "R6", "XML"] + "depends": ["R6", "XML", "biodb", "chk"] }, "biodbNci": { "name": "biodbNci", "version": "1.8.0", "sha256": "11xzf804v9dp25zw7kxwws2q386h22ybibrcplm3wrkrxj223kks", - "depends": ["biodb", "chk", "R6", "Rcpp", "testthat"] + "depends": ["R6", "Rcpp", "biodb", "chk", "testthat"] }, "biodbUniprot": { "name": "biodbUniprot", "version": "1.10.0", "sha256": "1jwv6y9kaq2d7iswgz602yhwg35c9d9yqa9c87d454n0wrl6h6yg", - "depends": ["biodb", "R6"] + "depends": ["R6", "biodb"] }, "biomaRt": { "name": "biomaRt", - "version": "2.60.0", - "sha256": "0vsjldksykgs6z7afn8kbqzl489irvvzrzq75kqkhavyhxnavqkq", + "version": "2.60.1", + "sha256": "0mzdxpagxwiwyznhd7h93cgy01a2j85rgb5dpnkzgp4sxw01n7rb", "depends": ["AnnotationDbi", "BiocFileCache", "digest", "httr2", "progress", "rappdirs", "stringr", "xml2"] }, "biomformat": { "name": "biomformat", "version": "1.32.0", "sha256": "0jys0nmp833ax96vfdh1adikpyapr5gkmldx5kvv5bqiqc8aipzb", - "depends": ["jsonlite", "Matrix", "plyr", "rhdf5"] + "depends": ["Matrix", "jsonlite", "plyr", "rhdf5"] }, "biomvRCNS": { "name": "biomvRCNS", @@ -6997,85 +7021,85 @@ "name": "biosigner", "version": "1.32.0", "sha256": "1c56s8lr5cdx27v0rdi4l4h680x6ga9wazf4dj1xkqyliqz65ps5", - "depends": ["Biobase", "e1071", "MultiAssayExperiment", "MultiDataSet", "randomForest", "ropls", "SummarizedExperiment"] + "depends": ["Biobase", "MultiAssayExperiment", "MultiDataSet", "SummarizedExperiment", "e1071", "randomForest", "ropls"] }, "biotmle": { "name": "biotmle", "version": "1.28.0", "sha256": "06kixhzkrzxyic44kdmqrv19v2c4a7sri8cbhbvww8km4n5l39sf", - "depends": ["assertthat", "BiocGenerics", "BiocParallel", "dplyr", "drtmle", "ggplot2", "ggsci", "limma", "S4Vectors", "SummarizedExperiment", "superheat", "tibble"] + "depends": ["BiocGenerics", "BiocParallel", "S4Vectors", "SummarizedExperiment", "assertthat", "dplyr", "drtmle", "ggplot2", "ggsci", "limma", "superheat", "tibble"] }, "biovizBase": { "name": "biovizBase", "version": "1.52.0", "sha256": "1jbcnjjwdjy7zfy0ybgfy1y5ym7rygzkailr5bm4hnh9bn2837p7", - "depends": ["AnnotationDbi", "AnnotationFilter", "BiocGenerics", "Biostrings", "dichromat", "ensembldb", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Hmisc", "IRanges", "RColorBrewer", "rlang", "Rsamtools", "S4Vectors", "scales", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["AnnotationDbi", "AnnotationFilter", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Hmisc", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "dichromat", "ensembldb", "rlang", "scales"] }, "biscuiteer": { "name": "biscuiteer", "version": "1.18.0", "sha256": "15bisrcgyiv9ndfvgm0p4igyr4jwsf68ccis1nf1hi9x291k7m6y", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "biscuiteerData", "bsseq", "data_table", "DelayedMatrixStats", "dmrseq", "GenomeInfoDb", "GenomicRanges", "gtools", "HDF5Array", "Homo_sapiens", "impute", "IRanges", "Matrix", "matrixStats", "Mus_musculus", "QDNAseq", "qualV", "R_utils", "readr", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "Homo_sapiens", "IRanges", "Matrix", "Mus_musculus", "QDNAseq", "R_utils", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "biscuiteerData", "bsseq", "data_table", "dmrseq", "gtools", "impute", "matrixStats", "qualV", "readr", "rtracklayer"] }, "blacksheepr": { "name": "blacksheepr", "version": "1.18.0", "sha256": "1avqq6m30x2bg3h32laxcpbd4f5s10548k3cj4xb1d25svnn8pax", - "depends": ["circlize", "ComplexHeatmap", "pasilla", "RColorBrewer", "SummarizedExperiment", "viridis"] + "depends": ["ComplexHeatmap", "RColorBrewer", "SummarizedExperiment", "circlize", "pasilla", "viridis"] }, "blima": { "name": "blima", "version": "1.38.0", "sha256": "1a5rzwgsvkwzl97p6pvbhi8dsvd7vbny0bajjp273czrm09yk8rc", - "depends": ["beadarray", "Biobase", "BiocGenerics", "Rcpp"] + "depends": ["Biobase", "BiocGenerics", "Rcpp", "beadarray"] }, "bluster": { "name": "bluster", "version": "1.14.0", "sha256": "1bj7wx2dnwbrv2gxcmqmq815vawfiqj2xy3624fjli11r8c1hywa", - "depends": ["BiocNeighbors", "BiocParallel", "cluster", "igraph", "Matrix", "Rcpp", "S4Vectors"] + "depends": ["BiocNeighbors", "BiocParallel", "Matrix", "Rcpp", "S4Vectors", "cluster", "igraph"] }, "bnbc": { "name": "bnbc", "version": "1.26.0", "sha256": "09vy9igcnw927j0zb4znrbcknkaic69ly6w4syb1cwysr0rvmrdz", - "depends": ["BiocGenerics", "data_table", "EBImage", "GenomeInfoDb", "GenomicRanges", "HiCBricks", "IRanges", "matrixStats", "preprocessCore", "Rcpp", "rhdf5", "S4Vectors", "SummarizedExperiment", "sva"] + "depends": ["BiocGenerics", "EBImage", "GenomeInfoDb", "GenomicRanges", "HiCBricks", "IRanges", "Rcpp", "S4Vectors", "SummarizedExperiment", "data_table", "matrixStats", "preprocessCore", "rhdf5", "sva"] }, "bnem": { "name": "bnem", "version": "1.12.0", "sha256": "15jzsba3qdkj5y7gqxklgv69r5bq2li4irvjkhmbjnjlv0pv4wdg", - "depends": ["affy", "binom", "Biobase", "CellNOptR", "cluster", "epiNEM", "flexclust", "graph", "limma", "matrixStats", "mnem", "RColorBrewer", "Rgraphviz", "rmarkdown", "snowfall", "sva", "vsn"] + "depends": ["Biobase", "CellNOptR", "RColorBrewer", "Rgraphviz", "affy", "binom", "cluster", "epiNEM", "flexclust", "graph", "limma", "matrixStats", "mnem", "rmarkdown", "snowfall", "sva", "vsn"] }, "borealis": { "name": "borealis", "version": "1.8.0", "sha256": "1m7yq1sx4ivbcrjm1w3l5qsyhlv0jdkb5l91kxd5hvisakfdrfz9", - "depends": ["Biobase", "bsseq", "cowplot", "doParallel", "dplyr", "DSS", "foreach", "gamlss", "gamlss_dist", "GenomicRanges", "ggplot2", "plyr", "purrr", "R_utils", "rlang", "snow"] + "depends": ["Biobase", "DSS", "GenomicRanges", "R_utils", "bsseq", "cowplot", "doParallel", "dplyr", "foreach", "gamlss", "gamlss_dist", "ggplot2", "plyr", "purrr", "rlang", "snow"] }, "branchpointer": { "name": "branchpointer", "version": "1.30.0", "sha256": "034sa73ll152s24cgrz47br7kyswr7jn6c735mp6dvbhppmlj2xm", - "depends": ["biomaRt", "Biostrings", "BSgenome_Hsapiens_UCSC_hg38", "caret", "cowplot", "data_table", "gbm", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "kernlab", "plyr", "rtracklayer", "S4Vectors", "stringr"] + "depends": ["BSgenome_Hsapiens_UCSC_hg38", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "biomaRt", "caret", "cowplot", "data_table", "gbm", "ggplot2", "kernlab", "plyr", "rtracklayer", "stringr"] }, "breakpointR": { "name": "breakpointR", "version": "1.22.0", "sha256": "0imbsqrslclvfyvc00sv6ngvl5hqlr6ian07v521m63ffpx6ll78", - "depends": ["BiocGenerics", "breakpointRdata", "cowplot", "doParallel", "foreach", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "gtools", "IRanges", "Rsamtools", "S4Vectors"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "breakpointRdata", "cowplot", "doParallel", "foreach", "ggplot2", "gtools"] }, "brendaDb": { "name": "brendaDb", "version": "1.18.0", "sha256": "1rhmd3v20y2cw70zpzykpz7bidf000dq904c2qlf58nqwclxj88l", - "depends": ["BiocFileCache", "BiocParallel", "crayon", "dplyr", "magrittr", "purrr", "rappdirs", "Rcpp", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["BiocFileCache", "BiocParallel", "Rcpp", "crayon", "dplyr", "magrittr", "purrr", "rappdirs", "rlang", "stringr", "tibble", "tidyr"] }, "bsseq": { "name": "bsseq", "version": "1.40.0", "sha256": "1b7a9ryl4lz6qy2pni3k9bk6hdf147s3m7fx0icg6fkgi0ymssyx", - "depends": ["beachmat", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "data_table", "DelayedArray", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "gtools", "HDF5Array", "IRanges", "limma", "locfit", "permute", "R_utils", "Rcpp", "rhdf5", "S4Vectors", "scales", "SummarizedExperiment"] + "depends": ["BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "DelayedArray", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "R_utils", "Rcpp", "S4Vectors", "SummarizedExperiment", "beachmat", "data_table", "gtools", "limma", "locfit", "permute", "rhdf5", "scales"] }, "bugsigdbr": { "name": "bugsigdbr", @@ -7087,25 +7111,25 @@ "name": "bumphunter", "version": "1.46.0", "sha256": "08b5d0grmpk5pryffdh6gdafhp1brana353q2kmwhz7x55aq3w68", - "depends": ["AnnotationDbi", "BiocGenerics", "doRNG", "foreach", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "iterators", "limma", "locfit", "matrixStats", "S4Vectors"] + "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "doRNG", "foreach", "iterators", "limma", "locfit", "matrixStats"] }, "cBioPortalData": { "name": "cBioPortalData", "version": "2.16.0", "sha256": "0s1qy46z78hlk37lnvqh1zi36y90299f6ym82k2d60jbw8aw2jxa", - "depends": ["AnVIL", "BiocFileCache", "digest", "dplyr", "GenomeInfoDb", "GenomicRanges", "httr", "IRanges", "MultiAssayExperiment", "RaggedExperiment", "readr", "RTCGAToolbox", "S4Vectors", "SummarizedExperiment", "TCGAutils", "tibble", "tidyr"] + "depends": ["AnVIL", "BiocFileCache", "GenomeInfoDb", "GenomicRanges", "IRanges", "MultiAssayExperiment", "RTCGAToolbox", "RaggedExperiment", "S4Vectors", "SummarizedExperiment", "TCGAutils", "digest", "dplyr", "httr", "readr", "tibble", "tidyr"] }, "cTRAP": { "name": "cTRAP", "version": "1.22.0", "sha256": "119hnbv0p3mgr3zh9dff9pwllnsk790hm0ahypzpr08gwg2ml9lb", - "depends": ["AnnotationDbi", "AnnotationHub", "binr", "cowplot", "data_table", "dplyr", "DT", "fastmatch", "fgsea", "ggplot2", "ggrepel", "highcharter", "htmltools", "httr", "limma", "pbapply", "purrr", "qs", "R_utils", "readxl", "reshape2", "rhdf5", "rlang", "scales", "shiny", "shinycssloaders", "tibble"] + "depends": ["AnnotationDbi", "AnnotationHub", "DT", "R_utils", "binr", "cowplot", "data_table", "dplyr", "fastmatch", "fgsea", "ggplot2", "ggrepel", "highcharter", "htmltools", "httr", "limma", "pbapply", "purrr", "qs", "readxl", "reshape2", "rhdf5", "rlang", "scales", "shiny", "shinycssloaders", "tibble"] }, "cageminer": { "name": "cageminer", "version": "1.10.0", "sha256": "0ijagv7yzlil4mdibip5css7asdrnzfr2lq3r9zq8fkf4fwr2mpx", - "depends": ["BioNERO", "GenomeInfoDb", "GenomicRanges", "ggbio", "ggplot2", "ggtext", "IRanges", "reshape2", "rlang"] + "depends": ["BioNERO", "GenomeInfoDb", "GenomicRanges", "IRanges", "ggbio", "ggplot2", "ggtext", "reshape2", "rlang"] }, "calm": { "name": "calm", @@ -7117,55 +7141,55 @@ "name": "canceR", "version": "1.38.0", "sha256": "1hmc4sw3w5wsix7ixr85lplpp6hxrd5xpf5apvr77hligw61dhvs", - "depends": ["Biobase", "cBioPortalData", "circlize", "dplyr", "Formula", "geNetClassifier", "GSEABase", "phenoTest", "plyr", "R_methodsS3", "R_oo", "rpart", "RUnit", "survival", "tidyr", "tkrplot"] + "depends": ["Biobase", "Formula", "GSEABase", "RUnit", "R_methodsS3", "R_oo", "cBioPortalData", "circlize", "dplyr", "geNetClassifier", "phenoTest", "plyr", "rpart", "survival", "tidyr", "tkrplot"] }, "cancerclass": { "name": "cancerclass", "version": "1.48.0", "sha256": "00lin7likd0ffqk2nqx5ql8v3zpr82xprv36c1gzw0wkrgp3rgmw", - "depends": ["binom", "Biobase"] + "depends": ["Biobase", "binom"] }, "cardelino": { "name": "cardelino", "version": "1.6.0", "sha256": "16mczwh41gf7ikbzxvggai7a8d64fn2k7q9w1yxf0sn6cwg3l0di", - "depends": ["combinat", "GenomeInfoDb", "GenomicRanges", "ggplot2", "ggtree", "Matrix", "matrixStats", "pheatmap", "S4Vectors", "snpStats", "VariantAnnotation", "vcfR"] + "depends": ["GenomeInfoDb", "GenomicRanges", "Matrix", "S4Vectors", "VariantAnnotation", "combinat", "ggplot2", "ggtree", "matrixStats", "pheatmap", "snpStats", "vcfR"] }, "casper": { "name": "casper", "version": "2.38.0", "sha256": "0bwjnncm93j99m38mv99i1pw42cjmib4sqzw5nhb6p9mj39mm3zb", - "depends": ["Biobase", "BiocGenerics", "coda", "EBarrays", "gaga", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "gtools", "IRanges", "limma", "mgcv", "Rsamtools", "rtracklayer", "S4Vectors", "sqldf", "survival", "VGAM"] + "depends": ["Biobase", "BiocGenerics", "EBarrays", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "VGAM", "coda", "gaga", "gtools", "limma", "mgcv", "rtracklayer", "sqldf", "survival"] }, "categoryCompare": { "name": "categoryCompare", "version": "1.48.0", "sha256": "0mfmv3wna7dddf4i3ckh2iin8vq05g4fjb1n2pvw0s9lz3da3rjf", - "depends": ["annotate", "AnnotationDbi", "Biobase", "BiocGenerics", "Category", "colorspace", "GOstats", "graph", "GSEABase", "hwriter", "RCy3"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "Category", "GOstats", "GSEABase", "RCy3", "annotate", "colorspace", "graph", "hwriter"] }, "cbaf": { "name": "cbaf", "version": "1.26.3", "sha256": "1lpz3n288v32nbb0g4jb1mxmx79amm29m40w3sfkgllnjjdwsyd3", - "depends": ["BiocFileCache", "cBioPortalData", "genefilter", "gplots", "openxlsx", "RColorBrewer"] + "depends": ["BiocFileCache", "RColorBrewer", "cBioPortalData", "genefilter", "gplots", "openxlsx"] }, "cbpManager": { "name": "cbpManager", "version": "1.12.0", "sha256": "1idlxmnbyvc1nzshnvf3p4y9xdjb2kdcm05kpf3ihh993igddk14", - "depends": ["basilisk", "dplyr", "DT", "htmltools", "jsonlite", "magrittr", "markdown", "plyr", "rapportools", "reticulate", "rintrojs", "rlang", "shiny", "shinyBS", "shinycssloaders", "shinydashboard", "vroom"] + "depends": ["DT", "basilisk", "dplyr", "htmltools", "jsonlite", "magrittr", "markdown", "plyr", "rapportools", "reticulate", "rintrojs", "rlang", "shiny", "shinyBS", "shinycssloaders", "shinydashboard", "vroom"] }, "ccImpute": { "name": "ccImpute", - "version": "1.6.0", - "sha256": "0pjdlh77wpv54m2kc26kyzmpqikgz666dkw5h6af7q7lmgp0xc19", - "depends": ["BiocParallel", "matrixStats", "Rcpp", "RcppEigen", "SIMLR"] + "version": "1.6.1", + "sha256": "043lw1v8kkilki5gq6rjbfbyln39qlld55ch6wnz8qh2yv3k427i", + "depends": ["BiocParallel", "Matrix", "Rcpp", "RcppEigen", "SingleCellExperiment", "SummarizedExperiment", "irlba", "sparseMatrixStats"] }, "ccfindR": { "name": "ccfindR", "version": "1.24.0", "sha256": "1n9dncj7d3ijk6h6fkgmh3a0c6xrfll2fifkl2bz26ndq9i4m1q9", - "depends": ["ape", "gtools", "irlba", "Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "Rdpack", "Rmpi", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "Rdpack", "Rmpi", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ape", "gtools", "irlba"] }, "ccmap": { "name": "ccmap", @@ -7189,25 +7213,25 @@ "name": "celaref", "version": "1.22.0", "sha256": "1l2bf3fhapvpaq30qdrc6nd1chfa4yjish9w9cq7lbhl3xm9b82z", - "depends": ["BiocGenerics", "DelayedArray", "dplyr", "ggplot2", "magrittr", "MAST", "Matrix", "readr", "rlang", "S4Vectors", "SummarizedExperiment", "tibble"] + "depends": ["BiocGenerics", "DelayedArray", "MAST", "Matrix", "S4Vectors", "SummarizedExperiment", "dplyr", "ggplot2", "magrittr", "readr", "rlang", "tibble"] }, "celda": { "name": "celda", "version": "1.20.0", "sha256": "0d2vmjgcz5d4nimi3rxk7smbl2ywrgayasjna7kaqvf726ab71qr", - "depends": ["circlize", "ComplexHeatmap", "data_table", "dbscan", "DelayedArray", "digest", "doParallel", "enrichR", "foreach", "ggplot2", "ggrepel", "gridExtra", "gtable", "Matrix", "matrixStats", "MCMCprecision", "plyr", "RColorBrewer", "Rcpp", "RcppEigen", "reshape2", "Rtsne", "S4Vectors", "scales", "scater", "scran", "SingleCellExperiment", "stringr", "SummarizedExperiment", "uwot", "withr"] + "depends": ["ComplexHeatmap", "DelayedArray", "MCMCprecision", "Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "circlize", "data_table", "dbscan", "digest", "doParallel", "enrichR", "foreach", "ggplot2", "ggrepel", "gridExtra", "gtable", "matrixStats", "plyr", "reshape2", "scales", "scater", "scran", "stringr", "uwot", "withr"] }, "cellHTS2": { "name": "cellHTS2", "version": "2.68.0", "sha256": "0iqsxs84dcr4d1y5pg4799vv3jpf5i1hhq4fhgdp05lanx5qqpsz", - "depends": ["Biobase", "BiocGenerics", "Category", "genefilter", "GSEABase", "hwriter", "locfit", "RColorBrewer", "splots", "vsn"] + "depends": ["Biobase", "BiocGenerics", "Category", "GSEABase", "RColorBrewer", "genefilter", "hwriter", "locfit", "splots", "vsn"] }, "cellbaseR": { "name": "cellbaseR", "version": "1.28.0", "sha256": "1g2y7pgpc500vls62xp817n9arsw8dbj3c0d9dbvb1d014gzmbdw", - "depends": ["BiocParallel", "data_table", "doParallel", "foreach", "httr", "jsonlite", "pbapply", "R_utils", "Rsamtools", "tidyr"] + "depends": ["BiocParallel", "R_utils", "Rsamtools", "data_table", "doParallel", "foreach", "httr", "jsonlite", "pbapply", "tidyr"] }, "cellity": { "name": "cellity", @@ -7219,7 +7243,7 @@ "name": "cellmigRation", "version": "1.12.0", "sha256": "0ahml812f6hm05dxnlsd59bfspxbi4py205kvs0wlijygfqd1ajy", - "depends": ["doParallel", "FactoMineR", "FME", "foreach", "Hmisc", "matrixStats", "reshape2", "sp", "SpatialTools", "tiff", "vioplot"] + "depends": ["FME", "FactoMineR", "Hmisc", "SpatialTools", "doParallel", "foreach", "matrixStats", "reshape2", "sp", "tiff", "vioplot"] }, "cellscape": { "name": "cellscape", @@ -7231,31 +7255,31 @@ "name": "cellxgenedp", "version": "1.8.0", "sha256": "0p3x0sfp4gpp64gwrlr71bgfk84wxf1gg19w1dxgihc8gpaxgb23", - "depends": ["curl", "dplyr", "DT", "httr", "rjsoncons", "shiny"] + "depends": ["DT", "curl", "dplyr", "httr", "rjsoncons", "shiny"] }, "censcyt": { "name": "censcyt", "version": "1.12.0", "sha256": "078s41rvlfwlxr2a651dff5sdbqb507qvicg84k99za6cb4707ry", - "depends": ["BiocParallel", "broom_mixed", "diffcyt", "dirmult", "dplyr", "edgeR", "fitdistrplus", "lme4", "magrittr", "MASS", "mice", "multcomp", "purrr", "rlang", "S4Vectors", "stringr", "SummarizedExperiment", "survival", "tibble", "tidyr"] + "depends": ["BiocParallel", "MASS", "S4Vectors", "SummarizedExperiment", "broom_mixed", "diffcyt", "dirmult", "dplyr", "edgeR", "fitdistrplus", "lme4", "magrittr", "mice", "multcomp", "purrr", "rlang", "stringr", "survival", "tibble", "tidyr"] }, "cfDNAPro": { "name": "cfDNAPro", "version": "1.10.0", "sha256": "0nnqfhqq7702zc4hy05wj7rf83vgjqmnpvw90vkg4zrbc7y5fv3w", - "depends": ["BiocGenerics", "BSgenome_Hsapiens_NCBI_GRCh38", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "dplyr", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "IRanges", "magrittr", "plyranges", "quantmod", "rlang", "Rsamtools", "stringr", "tibble"] + "depends": ["BSgenome_Hsapiens_NCBI_GRCh38", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "dplyr", "ggplot2", "magrittr", "plyranges", "quantmod", "rlang", "stringr", "tibble"] }, "cfTools": { "name": "cfTools", "version": "1.4.0", "sha256": "0hi9j7a13l18fi2m4w5x8lil1f81izivg8p8hzh3wy8idbsc46m2", - "depends": ["basilisk", "BH", "cfToolsData", "GenomicRanges", "R_utils", "Rcpp"] + "depends": ["BH", "GenomicRanges", "R_utils", "Rcpp", "basilisk", "cfToolsData"] }, "cfdnakit": { "name": "cfdnakit", "version": "1.2.0", "sha256": "1yzhh76r8zlzdg8mpamsr6jvx4j18wkv4dg2mrgclbdmy10dxhwx", - "depends": ["Biobase", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "magrittr", "PSCBS", "QDNAseq", "rlang", "Rsamtools", "S4Vectors"] + "depends": ["Biobase", "GenomeInfoDb", "GenomicRanges", "IRanges", "PSCBS", "QDNAseq", "Rsamtools", "S4Vectors", "dplyr", "ggplot2", "magrittr", "rlang"] }, "cghMCR": { "name": "cghMCR", @@ -7267,25 +7291,25 @@ "name": "chihaya", "version": "1.4.0", "sha256": "10j05n9grh9dzb87hiq06x855c2xhi2c09jryc2ixgxd8jx6g2wy", - "depends": ["DelayedArray", "HDF5Array", "Matrix", "Rcpp", "rhdf5", "Rhdf5lib"] + "depends": ["DelayedArray", "HDF5Array", "Matrix", "Rcpp", "Rhdf5lib", "rhdf5"] }, "chimeraviz": { "name": "chimeraviz", "version": "1.30.0", "sha256": "1nx258g96v7548a742201jf6yhjf537b6pkmcijhawchnzfn38vn", - "depends": ["AnnotationDbi", "AnnotationFilter", "BiocStyle", "Biostrings", "checkmate", "data_table", "dplyr", "DT", "ensembldb", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "graph", "gtools", "Gviz", "IRanges", "magick", "org_Hs_eg_db", "org_Mm_eg_db", "plyr", "RCircos", "RColorBrewer", "Rgraphviz", "rmarkdown", "Rsamtools", "S4Vectors"] + "depends": ["AnnotationDbi", "AnnotationFilter", "BiocStyle", "Biostrings", "DT", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "Gviz", "IRanges", "RCircos", "RColorBrewer", "Rgraphviz", "Rsamtools", "S4Vectors", "checkmate", "data_table", "dplyr", "ensembldb", "graph", "gtools", "magick", "org_Hs_eg_db", "org_Mm_eg_db", "plyr", "rmarkdown"] }, "chipenrich": { "name": "chipenrich", "version": "2.28.0", "sha256": "01sfl3ik12bha3a57gm34y5gnil0akz9f3qfcp9rxsg7zdj8q1mp", - "depends": ["AnnotationDbi", "BiocGenerics", "chipenrich_data", "GenomeInfoDb", "GenomicRanges", "IRanges", "lattice", "latticeExtra", "MASS", "mgcv", "org_Dm_eg_db", "org_Dr_eg_db", "org_Hs_eg_db", "org_Mm_eg_db", "org_Rn_eg_db", "plyr", "rms", "rtracklayer", "S4Vectors", "stringr"] + "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "chipenrich_data", "lattice", "latticeExtra", "mgcv", "org_Dm_eg_db", "org_Dr_eg_db", "org_Hs_eg_db", "org_Mm_eg_db", "org_Rn_eg_db", "plyr", "rms", "rtracklayer", "stringr"] }, "chipseq": { "name": "chipseq", "version": "1.54.0", "sha256": "1rd56knaf0ar8d0nh0mcnrrg5jy0csixig1d4abn1b64vbzrvzpz", - "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "lattice", "S4Vectors", "ShortRead"] + "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "ShortRead", "lattice"] }, "chopsticks": { "name": "chopsticks", @@ -7303,31 +7327,31 @@ "name": "chromPlot", "version": "1.32.0", "sha256": "187w8qm0kf8297yb5yzkd5rxzx6j03hysgpdm41dc247q50nv046", - "depends": ["biomaRt", "GenomicRanges"] + "depends": ["GenomicRanges", "biomaRt"] }, "chromVAR": { "name": "chromVAR", "version": "1.26.0", "sha256": "092y1x1sbqvjrwmr7sv2r5216wbwwc4lk6kwn57fnvvdnc0hc3sv", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "DT", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "Matrix", "miniUI", "nabor", "plotly", "RColorBrewer", "Rcpp", "RcppArmadillo", "Rsamtools", "Rtsne", "S4Vectors", "shiny", "SummarizedExperiment", "TFBSTools"] + "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "DT", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "RColorBrewer", "Rcpp", "RcppArmadillo", "Rsamtools", "Rtsne", "S4Vectors", "SummarizedExperiment", "TFBSTools", "ggplot2", "miniUI", "nabor", "plotly", "shiny"] }, "chromstaR": { "name": "chromstaR", "version": "1.30.0", "sha256": "0swkjq50p3ak0ddyg7pqg37fivdpr3v5jpakn38sk5i5ycn3qf3g", - "depends": ["bamsignals", "BiocGenerics", "chromstaRData", "doParallel", "foreach", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "IRanges", "mvtnorm", "reshape2", "Rsamtools", "S4Vectors"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "bamsignals", "chromstaRData", "doParallel", "foreach", "ggplot2", "mvtnorm", "reshape2"] }, "cicero": { "name": "cicero", "version": "1.22.0", "sha256": "0x5ly5hkqli5b67hiaa6ha02damyps7vb4l51p0az1j5fxl39n8r", - "depends": ["assertthat", "Biobase", "BiocGenerics", "data_table", "dplyr", "FNN", "GenomicRanges", "ggplot2", "glasso", "Gviz", "igraph", "IRanges", "Matrix", "monocle", "plyr", "reshape2", "S4Vectors", "stringi", "stringr", "tibble", "tidyr", "VGAM"] + "depends": ["Biobase", "BiocGenerics", "FNN", "GenomicRanges", "Gviz", "IRanges", "Matrix", "S4Vectors", "VGAM", "assertthat", "data_table", "dplyr", "ggplot2", "glasso", "igraph", "monocle", "plyr", "reshape2", "stringi", "stringr", "tibble", "tidyr"] }, "circRNAprofiler": { "name": "circRNAprofiler", "version": "1.18.0", "sha256": "0gjnx4645kd7qag7dzs5dp9lhsv6zg5xn6jna3bap4mginl1jvxi", - "depends": ["AnnotationHub", "Biostrings", "BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "DESeq2", "dplyr", "edgeR", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gwascat", "IRanges", "magrittr", "R_utils", "readr", "reshape2", "rlang", "rtracklayer", "S4Vectors", "seqinr", "stringi", "stringr", "universalmotif"] + "depends": ["AnnotationHub", "BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "Biostrings", "DESeq2", "GenomeInfoDb", "GenomicRanges", "IRanges", "R_utils", "S4Vectors", "dplyr", "edgeR", "ggplot2", "gwascat", "magrittr", "readr", "reshape2", "rlang", "rtracklayer", "seqinr", "stringi", "stringr", "universalmotif"] }, "cisPath": { "name": "cisPath", @@ -7339,7 +7363,7 @@ "name": "cleanUpdTSeq", "version": "1.42.0", "sha256": "0fc7lwglp9asssh7yvrqr3wrgdcdapi5zh0fkqmddc1w1n83053r", - "depends": ["Biostrings", "BSgenome", "BSgenome_Drerio_UCSC_danRer7", "e1071", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "seqinr", "stringr"] + "depends": ["BSgenome", "BSgenome_Drerio_UCSC_danRer7", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "e1071", "seqinr", "stringr"] }, "cleaver": { "name": "cleaver", @@ -7351,13 +7375,13 @@ "name": "clevRvis", "version": "1.4.0", "sha256": "08qmhyhd9z5cpgkccz8jbk81ni51xd4rkv18clzwfk85vbkmjywn", - "depends": ["colorspace", "colourpicker", "cowplot", "dplyr", "DT", "ggiraph", "ggnewscale", "ggplot2", "ggraph", "htmlwidgets", "igraph", "magrittr", "patchwork", "purrr", "R_utils", "readr", "readxl", "shiny", "shinycssloaders", "shinydashboard", "shinyhelper", "shinyWidgets", "tibble"] + "depends": ["DT", "R_utils", "colorspace", "colourpicker", "cowplot", "dplyr", "ggiraph", "ggnewscale", "ggplot2", "ggraph", "htmlwidgets", "igraph", "magrittr", "patchwork", "purrr", "readr", "readxl", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyhelper", "tibble"] }, "cliProfiler": { "name": "cliProfiler", "version": "1.10.0", "sha256": "10ikijimbhwijlq19xc8x730ihix19c5z15mq138jj9p85zrqcin", - "depends": ["Biostrings", "BSgenome", "dplyr", "GenomicRanges", "ggplot2", "rtracklayer", "S4Vectors"] + "depends": ["BSgenome", "Biostrings", "GenomicRanges", "S4Vectors", "dplyr", "ggplot2", "rtracklayer"] }, "clippda": { "name": "clippda", @@ -7369,19 +7393,25 @@ "name": "clipper", "version": "1.44.0", "sha256": "1jaf3xsl37jpwpiq9r3w13fa069jmq6b6j2inmfzdy7jx8vbfm0k", - "depends": ["Biobase", "corpcor", "graph", "gRbase", "igraph", "KEGGgraph", "Matrix", "qpgraph", "Rcpp"] + "depends": ["Biobase", "KEGGgraph", "Matrix", "Rcpp", "corpcor", "gRbase", "graph", "igraph", "qpgraph"] + }, + "cliqueMS": { + "name": "cliqueMS", + "version": "1.18.1", + "sha256": "1k51j9q2s8065sxb04ywdh6kwh1y6w4kslk9iww9vmq0p1dwsdb7", + "depends": ["BH", "MSnbase", "Rcpp", "RcppArmadillo", "coop", "igraph", "matrixStats", "slam", "xcms"] }, "clst": { "name": "clst", "version": "1.52.0", "sha256": "0ng8zmqrnjpavl7mz4sh0qfa3bvxd12vh1568f9brm80avypp02j", - "depends": ["lattice", "ROC"] + "depends": ["ROC", "lattice"] }, "clstutils": { "name": "clstutils", "version": "1.52.0", "sha256": "0ry1b3gq2mbdir84pipk8z0dkf0g1mph9yflx3snjdc4izgviasx", - "depends": ["ape", "clst", "lattice", "rjson", "RSQLite"] + "depends": ["RSQLite", "ape", "clst", "lattice", "rjson"] }, "clustComp": { "name": "clustComp", @@ -7393,19 +7423,19 @@ "name": "clusterExperiment", "version": "2.24.0", "sha256": "0pi6qnchh89fhfr50fk4hrrkz1r8gfwjcd7254pgiaxcazv2380a", - "depends": ["ape", "BiocGenerics", "BiocSingular", "cluster", "DelayedArray", "edgeR", "HDF5Array", "kernlab", "limma", "locfdr", "Matrix", "matrixStats", "mbkmeans", "NMF", "phylobase", "pracma", "RColorBrewer", "Rcpp", "S4Vectors", "scales", "SingleCellExperiment", "stringr", "SummarizedExperiment", "zinbwave"] + "depends": ["BiocGenerics", "BiocSingular", "DelayedArray", "HDF5Array", "Matrix", "NMF", "RColorBrewer", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ape", "cluster", "edgeR", "kernlab", "limma", "locfdr", "matrixStats", "mbkmeans", "phylobase", "pracma", "scales", "stringr", "zinbwave"] }, "clusterProfiler": { "name": "clusterProfiler", - "version": "4.12.0", - "sha256": "0wmfbr4n8a1mg8g3gl9gnqrvq5p6cfay2858fqx7wxpr2q8yynhz", - "depends": ["AnnotationDbi", "DOSE", "downloader", "dplyr", "enrichplot", "GO_db", "GOSemSim", "gson", "httr", "igraph", "magrittr", "plyr", "qvalue", "rlang", "tidyr", "yulab_utils"] + "version": "4.12.3", + "sha256": "1lcgbhrs32cdkph11p3xrhy5ic5d52zfajddvynqnzc9zhxmbgcf", + "depends": ["AnnotationDbi", "DOSE", "GOSemSim", "GO_db", "downloader", "dplyr", "enrichplot", "gson", "httr", "igraph", "magrittr", "plyr", "qvalue", "rlang", "tidyr", "yulab_utils"] }, "clusterSeq": { "name": "clusterSeq", "version": "1.28.0", "sha256": "0spf8kv15dchr852apzmwpq27a7gflxvah0yrdyaq7kgqv3107l9", - "depends": ["baySeq", "BiocGenerics", "BiocParallel"] + "depends": ["BiocGenerics", "BiocParallel", "baySeq"] }, "clusterStab": { "name": "clusterStab", @@ -7417,19 +7447,19 @@ "name": "clustifyr", "version": "1.16.0", "sha256": "14c7jr4q0zij2zqpcm6jihy0ch80yfp67lvhxiakcg33xq1jvmzv", - "depends": ["cowplot", "dplyr", "entropy", "fgsea", "ggplot2", "httr", "Matrix", "matrixStats", "proxy", "rlang", "S4Vectors", "scales", "SeuratObject", "SingleCellExperiment", "stringr", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["Matrix", "S4Vectors", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "cowplot", "dplyr", "entropy", "fgsea", "ggplot2", "httr", "matrixStats", "proxy", "rlang", "scales", "stringr", "tibble", "tidyr"] }, "cmapR": { "name": "cmapR", "version": "1.16.0", "sha256": "0gj0s6l7r5dln7h9z5y03bjxj3w73cy4x83ik1cp5nmffabypzm9", - "depends": ["data_table", "flowCore", "matrixStats", "rhdf5", "SummarizedExperiment"] + "depends": ["SummarizedExperiment", "data_table", "flowCore", "matrixStats", "rhdf5"] }, "cn_farms": { "name": "cn.farms", "version": "1.52.0", "sha256": "098p6bhibg14ahx2gn2jbqaf537w00428a8mqvzghy9519pwmsqd", - "depends": ["affxparser", "Biobase", "DBI", "DNAcopy", "ff", "lattice", "oligo", "oligoClasses", "preprocessCore", "snow"] + "depends": ["Biobase", "DBI", "DNAcopy", "affxparser", "ff", "lattice", "oligo", "oligoClasses", "preprocessCore", "snow"] }, "cn_mops": { "name": "cn.mops", @@ -7441,7 +7471,7 @@ "name": "cnvGSA", "version": "1.48.0", "sha256": "1njb31i1fsvisgjjczjbc9qb7w6bz8dh4856gghkb4f9gscn06rk", - "depends": ["brglm", "doParallel", "foreach", "GenomicRanges", "splitstackshape"] + "depends": ["GenomicRanges", "brglm", "doParallel", "foreach", "splitstackshape"] }, "coGPS": { "name": "coGPS", @@ -7453,7 +7483,7 @@ "name": "coMethDMR", "version": "1.8.0", "sha256": "1a0f0r11jdcf47b9nzswi9j1axhibij09lava57cv48a23hzrj6z", - "depends": ["AnnotationHub", "BiocParallel", "bumphunter", "ExperimentHub", "GenomicRanges", "IRanges", "lmerTest"] + "depends": ["AnnotationHub", "BiocParallel", "ExperimentHub", "GenomicRanges", "IRanges", "bumphunter", "lmerTest"] }, "coRdon": { "name": "coRdon", @@ -7465,13 +7495,13 @@ "name": "codelink", "version": "1.72.0", "sha256": "0maag5ns0j2c7l4pnrgb724108fmp4a2xj8nffk1kw4ag39k9xqc", - "depends": ["annotate", "Biobase", "BiocGenerics", "limma"] + "depends": ["Biobase", "BiocGenerics", "annotate", "limma"] }, "cogena": { "name": "cogena", "version": "1.38.0", "sha256": "0w41i4mvv085pvm0ars31qy0m6alb96kni3k6lcsikqch9nqiv3z", - "depends": ["amap", "apcluster", "Biobase", "biwt", "class", "cluster", "corrplot", "devtools", "doParallel", "dplyr", "fastcluster", "foreach", "ggplot2", "gplots", "kohonen", "mclust", "reshape2", "stringr", "tibble", "tidyr"] + "depends": ["Biobase", "amap", "apcluster", "biwt", "class", "cluster", "corrplot", "devtools", "doParallel", "dplyr", "fastcluster", "foreach", "ggplot2", "gplots", "kohonen", "mclust", "reshape2", "stringr", "tibble", "tidyr"] }, "cogeqc": { "name": "cogeqc", @@ -7483,25 +7513,25 @@ "name": "cola", "version": "2.10.0", "sha256": "014yx4r5as34f6g1xf4amqwkq0xqa66rv8g45r4cd4fp4dv9szzg", - "depends": ["BiocGenerics", "brew", "circlize", "clue", "cluster", "ComplexHeatmap", "crayon", "digest", "doParallel", "doRNG", "eulerr", "foreach", "GetoptLong", "GlobalOptions", "httr", "impute", "irlba", "knitr", "markdown", "matrixStats", "mclust", "microbenchmark", "png", "RColorBrewer", "Rcpp", "skmeans", "xml2"] + "depends": ["BiocGenerics", "ComplexHeatmap", "GetoptLong", "GlobalOptions", "RColorBrewer", "Rcpp", "brew", "circlize", "clue", "cluster", "crayon", "digest", "doParallel", "doRNG", "eulerr", "foreach", "httr", "impute", "irlba", "knitr", "markdown", "matrixStats", "mclust", "microbenchmark", "png", "skmeans", "xml2"] }, "comapr": { "name": "comapr", "version": "1.8.0", "sha256": "007r7q7p97w5rh8pvgrajlyv09m6h9q8zs0mb8xs1qw3jlkac5z4", - "depends": ["BiocParallel", "circlize", "dplyr", "foreach", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gridExtra", "Gviz", "IRanges", "Matrix", "plotly", "plyr", "RColorBrewer", "reshape2", "rlang", "S4Vectors", "scales", "SummarizedExperiment", "tidyr"] + "depends": ["BiocParallel", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "Matrix", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "circlize", "dplyr", "foreach", "ggplot2", "gridExtra", "plotly", "plyr", "reshape2", "rlang", "scales", "tidyr"] }, "combi": { "name": "combi", "version": "1.16.0", "sha256": "1s6nxigvmxq5c2y347k87by0krda63lwynvbgagvg9h2lhb588kv", - "depends": ["alabama", "BB", "Biobase", "cobs", "DBI", "ggplot2", "limma", "Matrix", "nleqslv", "phyloseq", "reshape2", "SummarizedExperiment", "tensor", "vegan"] + "depends": ["BB", "Biobase", "DBI", "Matrix", "SummarizedExperiment", "alabama", "cobs", "ggplot2", "limma", "nleqslv", "phyloseq", "reshape2", "tensor", "vegan"] }, "compEpiTools": { "name": "compEpiTools", "version": "1.38.0", "sha256": "04yhfihszw5s61195435cczk801rb8n29zrh8rqknf0rdyccxb2q", - "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "GO_db", "gplots", "IRanges", "methylPipe", "Rsamtools", "S4Vectors", "topGO", "XVector"] + "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "GO_db", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "XVector", "gplots", "methylPipe", "topGO"] }, "compSPOT": { "name": "compSPOT", @@ -7513,55 +7543,55 @@ "name": "compcodeR", "version": "1.40.0", "sha256": "0szixwgk85qpyag2i8spn0shpl8r6j5xjg90js3rgrx1b8saaqbm", - "depends": ["ape", "caTools", "edgeR", "ggplot2", "gplots", "gtools", "KernSmooth", "knitr", "lattice", "limma", "markdown", "MASS", "matrixStats", "modeest", "phylolm", "rmarkdown", "ROCR", "shiny", "shinydashboard", "sm", "stringr", "vioplot"] + "depends": ["KernSmooth", "MASS", "ROCR", "ape", "caTools", "edgeR", "ggplot2", "gplots", "gtools", "knitr", "lattice", "limma", "markdown", "matrixStats", "modeest", "phylolm", "rmarkdown", "shiny", "shinydashboard", "sm", "stringr", "vioplot"] }, "concordexR": { "name": "concordexR", "version": "1.4.0", "sha256": "0z8h4gr8lj6kpffi1zha4683ha46n5nrlc3yvyrwbf2gflzvdf3y", - "depends": ["BiocParallel", "cli", "DelayedArray", "ggplot2", "Matrix", "pheatmap", "rlang", "scales"] + "depends": ["BiocParallel", "DelayedArray", "Matrix", "cli", "ggplot2", "pheatmap", "rlang", "scales"] }, "condiments": { "name": "condiments", "version": "1.12.0", "sha256": "0wifi5npnzmwdvh6g2xa998ccl902jka1mfs4xxgrpdbc0rxny8r", - "depends": ["BiocParallel", "distinct", "dplyr", "Ecume", "igraph", "magrittr", "matrixStats", "mgcv", "pbapply", "RANN", "SingleCellExperiment", "slingshot", "SummarizedExperiment", "TrajectoryUtils"] + "depends": ["BiocParallel", "Ecume", "RANN", "SingleCellExperiment", "SummarizedExperiment", "TrajectoryUtils", "distinct", "dplyr", "igraph", "magrittr", "matrixStats", "mgcv", "pbapply", "slingshot"] }, "consICA": { "name": "consICA", "version": "2.2.0", "sha256": "061v9v4gpxxmb5yn6dhh1r2x52y3ik68v1y59sfaazhlp3kg970x", - "depends": ["BiocParallel", "fastICA", "ggplot2", "GO_db", "graph", "org_Hs_eg_db", "pheatmap", "Rfast", "sm", "SummarizedExperiment", "survival", "topGO"] + "depends": ["BiocParallel", "GO_db", "Rfast", "SummarizedExperiment", "fastICA", "ggplot2", "graph", "org_Hs_eg_db", "pheatmap", "sm", "survival", "topGO"] }, "consensus": { "name": "consensus", "version": "1.22.0", "sha256": "09g6qmvalbnyskvv6zb49h3ph4xv3rz71y6gdfayh5jmh82nw9fd", - "depends": ["gplots", "matrixStats", "RColorBrewer"] + "depends": ["RColorBrewer", "gplots", "matrixStats"] }, "consensusDE": { "name": "consensusDE", "version": "1.22.0", "sha256": "051rcanakn1kmlybhc57cp80rxdgvpd0grldsw014ss8s938nz8z", - "depends": ["airway", "AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "data_table", "dendextend", "DESeq2", "EDASeq", "edgeR", "EnsDb_Hsapiens_v86", "ensembldb", "GenomicAlignments", "GenomicFeatures", "limma", "org_Hs_eg_db", "pcaMethods", "RColorBrewer", "Rsamtools", "RUVSeq", "S4Vectors", "SummarizedExperiment", "TxDb_Dmelanogaster_UCSC_dm3_ensGene"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "DESeq2", "EDASeq", "EnsDb_Hsapiens_v86", "GenomicAlignments", "GenomicFeatures", "RColorBrewer", "RUVSeq", "Rsamtools", "S4Vectors", "SummarizedExperiment", "TxDb_Dmelanogaster_UCSC_dm3_ensGene", "airway", "data_table", "dendextend", "edgeR", "ensembldb", "limma", "org_Hs_eg_db", "pcaMethods"] }, "consensusOV": { "name": "consensusOV", "version": "1.26.0", "sha256": "0a2qrjid6a5yndkhd47km40qv2c3321xypr5mwlwsq5qp48x7vvq", - "depends": ["Biobase", "BiocParallel", "gdata", "genefu", "GSVA", "limma", "matrixStats", "randomForest"] + "depends": ["Biobase", "BiocParallel", "GSVA", "gdata", "genefu", "limma", "matrixStats", "randomForest"] }, "consensusSeekeR": { "name": "consensusSeekeR", "version": "1.32.0", "sha256": "0da6k6i372iqh1gnd4g6ifg75hkx2rrlp2bpwf1ai3g31n8ashiw", - "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "rtracklayer", "S4Vectors", "stringr"] + "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "rtracklayer", "stringr"] }, "conumee": { "name": "conumee", "version": "1.38.0", "sha256": "0ys8z4xgnmbg4dq81mr59imbz3p9j5ymi9y1dk030xrdh5iwi0am", - "depends": ["DNAcopy", "GenomeInfoDb", "GenomicRanges", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b2_hg19", "IlluminaHumanMethylationEPICmanifest", "IRanges", "minfi", "rtracklayer"] + "depends": ["DNAcopy", "GenomeInfoDb", "GenomicRanges", "IRanges", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b2_hg19", "IlluminaHumanMethylationEPICmanifest", "minfi", "rtracklayer"] }, "convert": { "name": "convert", @@ -7579,49 +7609,49 @@ "name": "corral", "version": "1.14.0", "sha256": "14zf8ya8yrr2bbxg8iiwxn3l7qvii0bmiwwdmypgv1qi32hx9ckp", - "depends": ["ggplot2", "ggthemes", "gridExtra", "irlba", "Matrix", "MultiAssayExperiment", "pals", "reshape2", "SingleCellExperiment", "SummarizedExperiment", "transport"] + "depends": ["Matrix", "MultiAssayExperiment", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "ggthemes", "gridExtra", "irlba", "pals", "reshape2", "transport"] }, "coseq": { "name": "coseq", "version": "1.28.0", "sha256": "0g24q3wb15qnj3igbj93k0rlw1s6ylgzhi8106qfmpybnq3rcry5", - "depends": ["BiocParallel", "capushe", "compositions", "corrplot", "DESeq2", "e1071", "edgeR", "ggplot2", "HTSCluster", "HTSFilter", "mvtnorm", "Rmixmod", "S4Vectors", "scales", "SummarizedExperiment"] + "depends": ["BiocParallel", "DESeq2", "HTSCluster", "HTSFilter", "Rmixmod", "S4Vectors", "SummarizedExperiment", "capushe", "compositions", "corrplot", "e1071", "edgeR", "ggplot2", "mvtnorm", "scales"] }, "cosmiq": { "name": "cosmiq", "version": "1.38.0", "sha256": "0rvayjwg9f3ns8mv657sww9azjjbavxfxcshazn48j7rvr4bqx8z", - "depends": ["faahKO", "MassSpecWavelet", "pracma", "Rcpp", "xcms"] + "depends": ["MassSpecWavelet", "Rcpp", "faahKO", "pracma", "xcms"] }, "cosmosR": { "name": "cosmosR", "version": "1.12.0", "sha256": "0rpy6dysf5p892dcad4z45i607km23pah4iq448g5mbzypsjkqsw", - "depends": ["CARNIVAL", "decoupleR", "dorothea", "dplyr", "GSEABase", "igraph", "progress", "purrr", "rlang", "stringr", "visNetwork"] + "depends": ["CARNIVAL", "GSEABase", "decoupleR", "dorothea", "dplyr", "igraph", "progress", "purrr", "rlang", "stringr", "visNetwork"] }, "countsimQC": { "name": "countsimQC", "version": "1.22.0", "sha256": "0zrxi7zvdiv1xx3hiy15a3wjgqvywikixx8lq3qx85dw2kz3nfpf", - "depends": ["caTools", "DESeq2", "dplyr", "DT", "edgeR", "genefilter", "GenomeInfoDbData", "ggplot2", "ragg", "randtests", "rmarkdown", "SummarizedExperiment", "tidyr"] + "depends": ["DESeq2", "DT", "GenomeInfoDbData", "SummarizedExperiment", "caTools", "dplyr", "edgeR", "genefilter", "ggplot2", "ragg", "randtests", "rmarkdown", "tidyr"] }, "covEB": { "name": "covEB", "version": "1.30.0", "sha256": "15yz54dhjwz6iafmvq33l43z3w887a6b7i150rqi23rzs9mabixa", - "depends": ["Biobase", "gsl", "igraph", "LaplacesDemon", "Matrix", "mvtnorm"] + "depends": ["Biobase", "LaplacesDemon", "Matrix", "gsl", "igraph", "mvtnorm"] }, "covRNA": { "name": "covRNA", "version": "1.30.0", "sha256": "12j69j73fkfn3s20jcyixp71a5j37m405962mxa2pihlqsrh7sxl", - "depends": ["ade4", "Biobase", "genefilter"] + "depends": ["Biobase", "ade4", "genefilter"] }, "cpvSNP": { "name": "cpvSNP", "version": "1.36.0", "sha256": "0kn65jzx9cif1w3hqyfjkxdcpnlk9b8msv3rk0ahdsln1d0mnyw6", - "depends": ["BiocParallel", "corpcor", "GenomicFeatures", "ggplot2", "GSEABase", "plyr"] + "depends": ["BiocParallel", "GSEABase", "GenomicFeatures", "corpcor", "ggplot2", "plyr"] }, "cqn": { "name": "cqn", @@ -7639,31 +7669,31 @@ "name": "crisprBowtie", "version": "1.8.0", "sha256": "0fyihnmrl92nl1r85axz9bck6l9clvc5a6px0214i064w8dn1njj", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "crisprBase", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rbowtie", "readr", "stringr"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rbowtie", "crisprBase", "readr", "stringr"] }, "crisprBwa": { "name": "crisprBwa", "version": "1.8.0", "sha256": "1vz99b632fzxdlpw5n2z2mbx7sb9hng58np1ra7gqc2wypk0sa8x", - "depends": ["BiocGenerics", "BSgenome", "crisprBase", "GenomeInfoDb", "Rbwa", "readr", "stringr"] + "depends": ["BSgenome", "BiocGenerics", "GenomeInfoDb", "Rbwa", "crisprBase", "readr", "stringr"] }, "crisprDesign": { "name": "crisprDesign", "version": "1.6.0", "sha256": "1zv8cc52r13b47r44qph892fhbgy1xp8xz4xf1hfyqgd7ywcl9kb", - "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "BSgenome", "crisprBase", "crisprBowtie", "crisprScore", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "rtracklayer", "S4Vectors", "txdbmaker", "VariantAnnotation"] + "depends": ["AnnotationDbi", "BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "S4Vectors", "VariantAnnotation", "crisprBase", "crisprBowtie", "crisprScore", "rtracklayer", "txdbmaker"] }, "crisprScore": { "name": "crisprScore", "version": "1.8.0", "sha256": "1czg5l4bvi5j3afip74qgl1kqgcllb5s1gz6sy7qk1cbf1fmvril", - "depends": ["basilisk", "basilisk_utils", "BiocGenerics", "Biostrings", "crisprScoreData", "IRanges", "randomForest", "reticulate", "stringr", "XVector"] + "depends": ["BiocGenerics", "Biostrings", "IRanges", "XVector", "basilisk", "basilisk_utils", "crisprScoreData", "randomForest", "reticulate", "stringr"] }, "crisprShiny": { "name": "crisprShiny", "version": "1.0.0", "sha256": "0fmp0gi70cv3g4c00l6g58kww9cg9rvpkhg8lsii9j8p8fj6hsjd", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "crisprBase", "crisprDesign", "crisprScore", "crisprViz", "DT", "GenomeInfoDb", "htmlwidgets", "pwalign", "S4Vectors", "shiny", "shinyBS", "shinyjs", "waiter"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "DT", "GenomeInfoDb", "S4Vectors", "crisprBase", "crisprDesign", "crisprScore", "crisprViz", "htmlwidgets", "pwalign", "shiny", "shinyBS", "shinyjs", "waiter"] }, "crisprVerse": { "name": "crisprVerse", @@ -7675,31 +7705,31 @@ "name": "crisprViz", "version": "1.6.0", "sha256": "1bbawsmah9h12kxwcq97q1mjbkniivfafm95k299bb93baqillih", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "crisprBase", "crisprDesign", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "S4Vectors", "txdbmaker"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "S4Vectors", "crisprBase", "crisprDesign", "txdbmaker"] }, "crlmm": { "name": "crlmm", "version": "1.62.0", "sha256": "0b0zwawxm07iy5g9z17057dsifrwyyl5rkgn09k7vh8rkfxbdydx", - "depends": ["affyio", "beanplot", "Biobase", "BiocGenerics", "ellipse", "ff", "foreach", "illuminaio", "lattice", "limma", "matrixStats", "mvtnorm", "oligoClasses", "preprocessCore", "RcppEigen", "VGAM"] + "depends": ["Biobase", "BiocGenerics", "RcppEigen", "VGAM", "affyio", "beanplot", "ellipse", "ff", "foreach", "illuminaio", "lattice", "limma", "matrixStats", "mvtnorm", "oligoClasses", "preprocessCore"] }, "crossmeta": { "name": "crossmeta", "version": "1.30.0", "sha256": "1ghgfby1rl3phldyipli550f0i289yanb0v4nzn5l1xnpkxaj6fa", - "depends": ["affxparser", "affy", "AnnotationDbi", "Biobase", "BiocGenerics", "BiocManager", "data_table", "DBI", "DT", "edgeR", "fdrtool", "GEOquery", "limma", "matrixStats", "metaMA", "miniUI", "oligo", "RCurl", "reader", "readxl", "RSQLite", "shiny", "shinyBS", "shinyjs", "shinypanel", "shinyWidgets", "stringr", "sva", "tibble", "XML"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocManager", "DBI", "DT", "GEOquery", "RCurl", "RSQLite", "XML", "affxparser", "affy", "data_table", "edgeR", "fdrtool", "limma", "matrixStats", "metaMA", "miniUI", "oligo", "reader", "readxl", "shiny", "shinyBS", "shinyWidgets", "shinyjs", "shinypanel", "stringr", "sva", "tibble"] }, "csaw": { "name": "csaw", "version": "1.38.0", "sha256": "0a870z480an3wwbp6z4qy034kvk6bvrydgk2if7x4q9k3qvknsz0", - "depends": ["BiocGenerics", "BiocParallel", "edgeR", "GenomeInfoDb", "GenomicRanges", "IRanges", "limma", "Matrix", "metapod", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "SummarizedExperiment", "zlibbioc"] + "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "SummarizedExperiment", "edgeR", "limma", "metapod", "zlibbioc"] }, "csdR": { "name": "csdR", "version": "1.10.0", "sha256": "13g6rq95888l4ach0yrw6nrfvyxnw3b5ni01v875gfk5jl9jcllv", - "depends": ["glue", "matrixStats", "Rcpp", "RhpcBLASctl", "WGCNA"] + "depends": ["Rcpp", "RhpcBLASctl", "WGCNA", "glue", "matrixStats"] }, "ctc": { "name": "ctc", @@ -7717,25 +7747,25 @@ "name": "cummeRbund", "version": "2.46.0", "sha256": "0hdm2214waz02ybr264xis48kj2anpad80jk640p49v9r17iia9l", - "depends": ["Biobase", "BiocGenerics", "fastcluster", "ggplot2", "Gviz", "plyr", "reshape2", "RSQLite", "rtracklayer", "S4Vectors"] + "depends": ["Biobase", "BiocGenerics", "Gviz", "RSQLite", "S4Vectors", "fastcluster", "ggplot2", "plyr", "reshape2", "rtracklayer"] }, "customCMPdb": { "name": "customCMPdb", "version": "1.14.0", "sha256": "1j56542mp1gimnbbakbilkmb59jngvx8w47ycnaj8c1j1yhar9ll", - "depends": ["AnnotationHub", "BiocFileCache", "ChemmineR", "rappdirs", "RSQLite", "XML"] + "depends": ["AnnotationHub", "BiocFileCache", "ChemmineR", "RSQLite", "XML", "rappdirs"] }, "customProDB": { "name": "customProDB", "version": "1.44.0", "sha256": "1pxn9nq84h9xgn2g0jzigbw7pbv4sjvf4jkzalp7l3yjax5llq3i", - "depends": ["AhoCorasickTrie", "AnnotationDbi", "biomaRt", "Biostrings", "DBI", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "plyr", "RCurl", "Rsamtools", "RSQLite", "rtracklayer", "S4Vectors", "stringr", "txdbmaker", "VariantAnnotation"] + "depends": ["AhoCorasickTrie", "AnnotationDbi", "Biostrings", "DBI", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RCurl", "RSQLite", "Rsamtools", "S4Vectors", "VariantAnnotation", "biomaRt", "plyr", "rtracklayer", "stringr", "txdbmaker"] }, "cyanoFilter": { "name": "cyanoFilter", "version": "1.12.0", "sha256": "1nymq5qiw5s2nfa67mccv0jn6gxy5y6sx483cw87j5pbmvg579rx", - "depends": ["Biobase", "cytometree", "flowClust", "flowCore", "flowDensity", "GGally", "ggplot2", "mrfDepth"] + "depends": ["Biobase", "GGally", "cytometree", "flowClust", "flowCore", "flowDensity", "ggplot2", "mrfDepth"] }, "cycle": { "name": "cycle", @@ -7747,19 +7777,19 @@ "name": "cydar", "version": "1.28.0", "sha256": "16lr3sry647wns2ycv3b604fmsma3a944g85c4ik7xk7ij1ady47", - "depends": ["Biobase", "BiocGenerics", "BiocNeighbors", "BiocParallel", "flowCore", "Rcpp", "S4Vectors", "shiny", "SingleCellExperiment", "SummarizedExperiment", "viridis"] + "depends": ["Biobase", "BiocGenerics", "BiocNeighbors", "BiocParallel", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "flowCore", "shiny", "viridis"] }, "cypress": { "name": "cypress", "version": "1.0.0", "sha256": "0dyywkg41ihff6f2f6p7854qkgx3lav1rviicrik2nlxg4scl034", - "depends": ["abind", "BiocParallel", "checkmate", "DESeq2", "dplyr", "e1071", "edgeR", "MASS", "mvtnorm", "preprocessCore", "PROPER", "RColorBrewer", "rlang", "sirt", "SummarizedExperiment", "TCA", "tibble", "TOAST"] + "depends": ["BiocParallel", "DESeq2", "MASS", "PROPER", "RColorBrewer", "SummarizedExperiment", "TCA", "TOAST", "abind", "checkmate", "dplyr", "e1071", "edgeR", "mvtnorm", "preprocessCore", "rlang", "sirt", "tibble"] }, "cytoKernel": { "name": "cytoKernel", "version": "1.10.0", "sha256": "0pzcsxshc60myzhq57gxyzrfd590ggydj2nq0byca7vyzxc6z3y6", - "depends": ["ashr", "BiocParallel", "circlize", "ComplexHeatmap", "data_table", "dplyr", "magrittr", "Rcpp", "rlang", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocParallel", "ComplexHeatmap", "Rcpp", "S4Vectors", "SummarizedExperiment", "ashr", "circlize", "data_table", "dplyr", "magrittr", "rlang"] }, "cytoMEM": { "name": "cytoMEM", @@ -7771,31 +7801,31 @@ "name": "cytofQC", "version": "1.4.0", "sha256": "1gn383vchgxs62z9p5h7b0wnakwmwclsk46px6ah1cagykrfgas3", - "depends": ["CATALYST", "e1071", "EZtune", "flowCore", "gbm", "ggplot2", "hrbrthemes", "matrixStats", "randomForest", "rmarkdown", "S4Vectors", "SingleCellExperiment", "ssc", "SummarizedExperiment"] + "depends": ["CATALYST", "EZtune", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "e1071", "flowCore", "gbm", "ggplot2", "hrbrthemes", "matrixStats", "randomForest", "rmarkdown", "ssc"] }, "cytolib": { "name": "cytolib", "version": "2.16.0", "sha256": "0nrj892jihi4fv58si3il42s0vyz3gm4gmb65kidkky63gmsy6iq", - "depends": ["BH", "Rhdf5lib", "RProtoBufLib"] + "depends": ["BH", "RProtoBufLib", "Rhdf5lib"] }, "cytomapper": { "name": "cytomapper", "version": "1.16.0", "sha256": "1njdhhnzy639v4w07wvgj2gygsipzkfzhbrw63fvxfpf4r1xjzix", - "depends": ["BiocParallel", "DelayedArray", "EBImage", "ggbeeswarm", "ggplot2", "HDF5Array", "matrixStats", "nnls", "raster", "RColorBrewer", "rhdf5", "S4Vectors", "shiny", "shinydashboard", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "svglite", "svgPanZoom", "viridis"] + "depends": ["BiocParallel", "DelayedArray", "EBImage", "HDF5Array", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "ggbeeswarm", "ggplot2", "matrixStats", "nnls", "raster", "rhdf5", "shiny", "shinydashboard", "svgPanZoom", "svglite", "viridis"] }, "cytoviewer": { "name": "cytoviewer", "version": "1.4.0", "sha256": "0s7jnr3z7p6v6x17a9a6cv9vbqgfk8snamcw8qkjpfd613gwk43r", - "depends": ["archive", "colourpicker", "cytomapper", "EBImage", "RColorBrewer", "S4Vectors", "shiny", "shinycssloaders", "shinydashboard", "SingleCellExperiment", "SummarizedExperiment", "svglite", "svgPanZoom", "viridis"] + "depends": ["EBImage", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "archive", "colourpicker", "cytomapper", "shiny", "shinycssloaders", "shinydashboard", "svgPanZoom", "svglite", "viridis"] }, "dStruct": { "name": "dStruct", "version": "1.10.0", "sha256": "144hyris6fsbs28pz4643njnpjfb0n9w6pm220q5hid4zvhn7dh7", - "depends": ["ggplot2", "IRanges", "purrr", "reshape2", "rlang", "S4Vectors", "zoo"] + "depends": ["IRanges", "S4Vectors", "ggplot2", "purrr", "reshape2", "rlang", "zoo"] }, "daMA": { "name": "daMA", @@ -7807,19 +7837,19 @@ "name": "dada2", "version": "1.32.0", "sha256": "1ac0nb5bcmzmqpi3vjdmns6xqq3ar61dks6qb3c0k48c78w88b7b", - "depends": ["BiocGenerics", "Biostrings", "ggplot2", "IRanges", "Rcpp", "RcppParallel", "reshape2", "ShortRead", "XVector"] + "depends": ["BiocGenerics", "Biostrings", "IRanges", "Rcpp", "RcppParallel", "ShortRead", "XVector", "ggplot2", "reshape2"] }, "dagLogo": { "name": "dagLogo", "version": "1.42.0", "sha256": "1qaa63ymsirwdvy9z82c81kknhqcpip7bry4b9d8xan48m5f63xl", - "depends": ["BiocGenerics", "biomaRt", "Biostrings", "httr", "motifStack", "pheatmap", "UniProt_ws"] + "depends": ["BiocGenerics", "Biostrings", "UniProt_ws", "biomaRt", "httr", "motifStack", "pheatmap"] }, "dar": { "name": "dar", "version": "1.0.0", "sha256": "0l5hjx86n34k3b4cdlndl5gh62f3jxps1iq2ir3fzacpxqsimkjw", - "depends": ["cli", "ComplexHeatmap", "crayon", "dplyr", "generics", "ggplot2", "glue", "gplots", "heatmaply", "magrittr", "mia", "phyloseq", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "tidyr", "UpSetR", "waldo"] + "depends": ["ComplexHeatmap", "UpSetR", "cli", "crayon", "dplyr", "generics", "ggplot2", "glue", "gplots", "heatmaply", "magrittr", "mia", "phyloseq", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "tidyr", "waldo"] }, "dcGSA": { "name": "dcGSA", @@ -7831,55 +7861,55 @@ "name": "dcanr", "version": "1.20.0", "sha256": "15way811xnlhb3qafvfibvqsvx72h8hr0jbwxvqd2dzc2gmkq2ib", - "depends": ["circlize", "doRNG", "foreach", "igraph", "Matrix", "plyr", "RColorBrewer", "reshape2", "stringr"] + "depends": ["Matrix", "RColorBrewer", "circlize", "doRNG", "foreach", "igraph", "plyr", "reshape2", "stringr"] }, "dce": { "name": "dce", "version": "1.12.0", "sha256": "1fxcbf21i8k5zydv4qqm41pm3lawkc66ic2rxhlgiwlh7c49awam", - "depends": ["assertthat", "dplyr", "edgeR", "epiNEM", "expm", "ggplot2", "ggraph", "glm2", "glue", "graph", "graphite", "harmonicmeanp", "igraph", "logger", "magrittr", "MASS", "Matrix", "metap", "mnem", "naturalsort", "org_Hs_eg_db", "pcalg", "ppcor", "purrr", "reshape2", "Rgraphviz", "rlang", "shadowtext", "tidygraph", "tidyverse"] + "depends": ["MASS", "Matrix", "Rgraphviz", "assertthat", "dplyr", "edgeR", "epiNEM", "expm", "ggplot2", "ggraph", "glm2", "glue", "graph", "graphite", "harmonicmeanp", "igraph", "logger", "magrittr", "metap", "mnem", "naturalsort", "org_Hs_eg_db", "pcalg", "ppcor", "purrr", "reshape2", "rlang", "shadowtext", "tidygraph", "tidyverse"] }, "ddCt": { "name": "ddCt", "version": "1.60.0", "sha256": "1q2j80wn5x0lkhpd0krsnw99rrn3kqn09d8xdi778cmvsgqxpahg", - "depends": ["Biobase", "BiocGenerics", "lattice", "RColorBrewer", "xtable"] + "depends": ["Biobase", "BiocGenerics", "RColorBrewer", "lattice", "xtable"] }, "ddPCRclust": { "name": "ddPCRclust", "version": "1.24.0", "sha256": "0nmnhykwzbyf2y9i3fi5hgwvc7m7bcikyr3c3nxyaw95f8cc52dp", - "depends": ["clue", "flowCore", "flowDensity", "flowPeaks", "ggplot2", "openxlsx", "plotrix", "R_utils", "SamSPECTRAL"] + "depends": ["R_utils", "SamSPECTRAL", "clue", "flowCore", "flowDensity", "flowPeaks", "ggplot2", "openxlsx", "plotrix"] }, "dearseq": { "name": "dearseq", "version": "1.16.0", "sha256": "0hy8cnqyvp2mrhj5wi1shh1cba79c5z8f17mfw764s2d6ivsfzz6", - "depends": ["CompQuadForm", "dplyr", "ggplot2", "KernSmooth", "magrittr", "matrixStats", "patchwork", "pbapply", "reshape2", "rlang", "scattermore", "statmod", "survey", "tibble", "viridisLite"] + "depends": ["CompQuadForm", "KernSmooth", "dplyr", "ggplot2", "magrittr", "matrixStats", "patchwork", "pbapply", "reshape2", "rlang", "scattermore", "statmod", "survey", "tibble", "viridisLite"] }, "debCAM": { "name": "debCAM", "version": "1.22.0", "sha256": "1lbgwv7009fpwqw6kl94gmm44xypn60r8kcm3fjzgbjbwijriwgq", - "depends": ["apcluster", "Biobase", "BiocParallel", "corpcor", "DMwR2", "geometry", "NMF", "nnls", "pcaPP", "rJava", "SummarizedExperiment"] + "depends": ["Biobase", "BiocParallel", "DMwR2", "NMF", "SummarizedExperiment", "apcluster", "corpcor", "geometry", "nnls", "pcaPP", "rJava"] }, "debrowser": { "name": "debrowser", "version": "1.32.0", "sha256": "0qgnx44j6lxw48wlpslagjq71mfx09vrfjq528z7vzn4phrax0by", - "depends": ["annotate", "AnnotationDbi", "apeglm", "ashr", "clusterProfiler", "colourpicker", "DESeq2", "DOSE", "DT", "edgeR", "enrichplot", "GenomicRanges", "ggplot2", "gplots", "Harman", "heatmaply", "igraph", "IRanges", "jsonlite", "limma", "org_Hs_eg_db", "org_Mm_eg_db", "pathview", "plotly", "RColorBrewer", "RCurl", "reshape2", "S4Vectors", "shiny", "shinyBS", "shinydashboard", "shinyjs", "stringi", "SummarizedExperiment", "sva"] + "depends": ["AnnotationDbi", "DESeq2", "DOSE", "DT", "GenomicRanges", "Harman", "IRanges", "RColorBrewer", "RCurl", "S4Vectors", "SummarizedExperiment", "annotate", "apeglm", "ashr", "clusterProfiler", "colourpicker", "edgeR", "enrichplot", "ggplot2", "gplots", "heatmaply", "igraph", "jsonlite", "limma", "org_Hs_eg_db", "org_Mm_eg_db", "pathview", "plotly", "reshape2", "shiny", "shinyBS", "shinydashboard", "shinyjs", "stringi", "sva"] }, "decompTumor2Sig": { "name": "decompTumor2Sig", "version": "2.20.0", "sha256": "1pnxnxz9zsxqs7cbxgkjapr57k2m1d57w5hak0dwcy5zcxjzmai8", - "depends": ["BiocGenerics", "Biostrings", "BSgenome_Hsapiens_UCSC_hg19", "data_table", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggseqlogo", "gridExtra", "Matrix", "plyr", "quadprog", "readxl", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "VariantAnnotation"] + "depends": ["BSgenome_Hsapiens_UCSC_hg19", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Matrix", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "VariantAnnotation", "data_table", "ggplot2", "ggseqlogo", "gridExtra", "plyr", "quadprog", "readxl"] }, "decontX": { "name": "decontX", "version": "1.2.0", "sha256": "0bxpzc9fib47c5prnshzykfd5a3mcik9n1ayd7jxygxy36icgqcj", - "depends": ["BH", "celda", "dbscan", "DelayedArray", "ggplot2", "Matrix", "MCMCprecision", "patchwork", "plyr", "Rcpp", "RcppEigen", "RcppParallel", "reshape2", "rstan", "rstantools", "S4Vectors", "scater", "Seurat", "SingleCellExperiment", "StanHeaders", "SummarizedExperiment", "withr"] + "depends": ["BH", "DelayedArray", "MCMCprecision", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "S4Vectors", "Seurat", "SingleCellExperiment", "StanHeaders", "SummarizedExperiment", "celda", "dbscan", "ggplot2", "patchwork", "plyr", "reshape2", "rstan", "rstantools", "scater", "withr"] }, "decontam": { "name": "decontam", @@ -7891,25 +7921,25 @@ "name": "deconvR", "version": "1.10.0", "sha256": "181dxjj8bzy1b9xq9hd3m3ak1698w7j0sf8h9g0bhf3blzlj4pmi", - "depends": ["assertthat", "BiocGenerics", "data_table", "dplyr", "e1071", "foreach", "GenomicRanges", "IRanges", "magrittr", "MASS", "matrixStats", "methylKit", "minfi", "nnls", "quadprog", "rsq", "S4Vectors", "tidyr"] + "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "assertthat", "data_table", "dplyr", "e1071", "foreach", "magrittr", "matrixStats", "methylKit", "minfi", "nnls", "quadprog", "rsq", "tidyr"] }, "decoupleR": { "name": "decoupleR", "version": "2.10.0", "sha256": "060ww5hlzk0dvh7a52i1nrz1s2xq5mmlw70rxpcs6d4j08k1cmic", - "depends": ["BiocParallel", "broom", "dplyr", "magrittr", "Matrix", "parallelly", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "withr"] + "depends": ["BiocParallel", "Matrix", "broom", "dplyr", "magrittr", "parallelly", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "withr"] }, "deepSNV": { "name": "deepSNV", "version": "1.50.0", "sha256": "1rcq2bg4z6z7czqi662w5gsdc1vd4p8vb353hqayhciv31dz51fr", - "depends": ["Biostrings", "GenomicRanges", "IRanges", "Rhtslib", "SummarizedExperiment", "VariantAnnotation", "VGAM"] + "depends": ["Biostrings", "GenomicRanges", "IRanges", "Rhtslib", "SummarizedExperiment", "VGAM", "VariantAnnotation"] }, "deltaCaptureC": { "name": "deltaCaptureC", "version": "1.18.0", "sha256": "019c6rlsl4glc4vkbz3kfcn9d9rh3vnfw0xbcsi33hk51z89qc78", - "depends": ["DESeq2", "GenomicRanges", "ggplot2", "IRanges", "SummarizedExperiment", "tictoc"] + "depends": ["DESeq2", "GenomicRanges", "IRanges", "SummarizedExperiment", "ggplot2", "tictoc"] }, "deltaGseg": { "name": "deltaGseg", @@ -7921,25 +7951,25 @@ "name": "demuxSNP", "version": "1.2.0", "sha256": "0inswz7w97wdy7bhl6p87cyr11z77ipf1rsmri9c2nra8s3ix51d", - "depends": ["BiocGenerics", "class", "demuxmix", "dplyr", "ensembldb", "GenomeInfoDb", "IRanges", "KernelKnn", "Matrix", "MatrixGenerics", "SingleCellExperiment", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["BiocGenerics", "GenomeInfoDb", "IRanges", "KernelKnn", "Matrix", "MatrixGenerics", "SingleCellExperiment", "SummarizedExperiment", "VariantAnnotation", "class", "demuxmix", "dplyr", "ensembldb"] }, "demuxmix": { "name": "demuxmix", "version": "1.6.0", "sha256": "18wn36rs7iif2cxz0iz17i0dba0llk2zkw7c81bi9v4c7lsijbcb", - "depends": ["ggplot2", "gridExtra", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "ggplot2", "gridExtra"] }, "densvis": { "name": "densvis", "version": "1.14.0", "sha256": "1xsafzcg6psb4ld7nk4wgdaa3xhy8i2v86asasf8h3mi1ms7lcv0", - "depends": ["assertthat", "basilisk", "irlba", "Rcpp", "reticulate", "Rtsne"] + "depends": ["Rcpp", "Rtsne", "assertthat", "basilisk", "irlba", "reticulate"] }, "derfinder": { "name": "derfinder", "version": "1.38.0", "sha256": "1i4m20wb08zncksz415jl8bd5r4gdygk7324cp6xhijrc1pfzl1i", - "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "bumphunter", "derfinderHelper", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "Hmisc", "IRanges", "qvalue", "Rsamtools", "rtracklayer", "S4Vectors"] + "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "Hmisc", "IRanges", "Rsamtools", "S4Vectors", "bumphunter", "derfinderHelper", "qvalue", "rtracklayer"] }, "derfinderHelper": { "name": "derfinderHelper", @@ -7951,13 +7981,13 @@ "name": "derfinderPlot", "version": "1.38.0", "sha256": "177j7bl552n80p2rip0zxjn72yf3pv6xg6g1hi312vapfvymcfbl", - "depends": ["derfinder", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggbio", "ggplot2", "IRanges", "limma", "plyr", "RColorBrewer", "reshape2", "S4Vectors", "scales"] + "depends": ["GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "derfinder", "ggbio", "ggplot2", "limma", "plyr", "reshape2", "scales"] }, "destiny": { "name": "destiny", "version": "3.18.0", "sha256": "0w7j6xh0gzhahk1r8w2wgnylq5v476jzz0g14yjmszfkzm10va3h", - "depends": ["Biobase", "BiocGenerics", "ggplot_multistats", "ggplot2", "ggthemes", "irlba", "knn_covertree", "Matrix", "pcaMethods", "proxy", "Rcpp", "RcppEigen", "RcppHNSW", "rlang", "RSpectra", "scales", "scatterplot3d", "SingleCellExperiment", "smoother", "SummarizedExperiment", "tidyr", "tidyselect", "VIM"] + "depends": ["Biobase", "BiocGenerics", "Matrix", "RSpectra", "Rcpp", "RcppEigen", "RcppHNSW", "SingleCellExperiment", "SummarizedExperiment", "VIM", "ggplot2", "ggplot_multistats", "ggthemes", "irlba", "knn_covertree", "pcaMethods", "proxy", "rlang", "scales", "scatterplot3d", "smoother", "tidyr", "tidyselect"] }, "diffGeneAnalysis": { "name": "diffGeneAnalysis", @@ -7969,31 +7999,31 @@ "name": "diffHic", "version": "1.36.1", "sha256": "1wzlzmmrxmnwgqkxqwga73x0kpj7d968c7jgrln9xfilhhn4fkyy", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "csaw", "edgeR", "GenomeInfoDb", "GenomicRanges", "InteractionSet", "IRanges", "limma", "locfit", "Rcpp", "rhdf5", "Rhtslib", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment", "zlibbioc"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "SummarizedExperiment", "csaw", "edgeR", "limma", "locfit", "rhdf5", "rtracklayer", "zlibbioc"] }, "diffUTR": { "name": "diffUTR", "version": "1.12.0", "sha256": "1rh3ndi8z6j4zr63w7nyvf5knrknzpl9525h3v9pc8m7gbk0jwk2", - "depends": ["ComplexHeatmap", "DEXSeq", "dplyr", "edgeR", "ensembldb", "GenomeInfoDb", "GenomicRanges", "ggplot2", "ggrepel", "IRanges", "limma", "matrixStats", "Rsubread", "rtracklayer", "S4Vectors", "stringi", "SummarizedExperiment", "viridisLite"] + "depends": ["ComplexHeatmap", "DEXSeq", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsubread", "S4Vectors", "SummarizedExperiment", "dplyr", "edgeR", "ensembldb", "ggplot2", "ggrepel", "limma", "matrixStats", "rtracklayer", "stringi", "viridisLite"] }, "diffcoexp": { "name": "diffcoexp", "version": "1.24.0", "sha256": "1cana6v3k7qab0x0fngl4abvh4nrznjwqhaq9m6qwn75ils3bh3f", - "depends": ["BiocGenerics", "DiffCorr", "igraph", "psych", "SummarizedExperiment", "WGCNA"] + "depends": ["BiocGenerics", "DiffCorr", "SummarizedExperiment", "WGCNA", "igraph", "psych"] }, "diffcyt": { "name": "diffcyt", "version": "1.24.0", "sha256": "1iyqvang5j55s19skd44c1zsxkphn3qqbl4sjhsw1y820ylws5r1", - "depends": ["circlize", "ComplexHeatmap", "dplyr", "edgeR", "flowCore", "FlowSOM", "limma", "lme4", "magrittr", "multcomp", "reshape2", "S4Vectors", "SummarizedExperiment", "tidyr"] + "depends": ["ComplexHeatmap", "FlowSOM", "S4Vectors", "SummarizedExperiment", "circlize", "dplyr", "edgeR", "flowCore", "limma", "lme4", "magrittr", "multcomp", "reshape2", "tidyr"] }, "diffuStats": { "name": "diffuStats", "version": "1.24.0", "sha256": "1d46rly5y4xc7hgjhvz2wlx6193jzpw3j8kkjvybr57d9vkl7x8s", - "depends": ["checkmate", "expm", "igraph", "MASS", "Matrix", "plyr", "precrec", "Rcpp", "RcppArmadillo", "RcppParallel"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "checkmate", "expm", "igraph", "plyr", "precrec"] }, "diggit": { "name": "diggit", @@ -8005,7 +8035,7 @@ "name": "dinoR", "version": "1.0.0", "sha256": "10fmj0f3fgga26rs39c9z69w0lnb4i2i00vq354s1qh0ciya6xpc", - "depends": ["BiocGenerics", "circlize", "ComplexHeatmap", "cowplot", "dplyr", "edgeR", "GenomicRanges", "ggplot2", "Matrix", "rlang", "stringr", "SummarizedExperiment", "tibble", "tidyr", "tidyselect"] + "depends": ["BiocGenerics", "ComplexHeatmap", "GenomicRanges", "Matrix", "SummarizedExperiment", "circlize", "cowplot", "dplyr", "edgeR", "ggplot2", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] }, "dir_expiry": { "name": "dir.expiry", @@ -8017,19 +8047,19 @@ "name": "discordant", "version": "1.28.0", "sha256": "034nxwm0z3r0cbjpg8l6cwc6f4jnlj8v9q7r9c9ha9xk6xbah0yr", - "depends": ["Biobase", "biwt", "dplyr", "gtools", "MASS", "Rcpp"] + "depends": ["Biobase", "MASS", "Rcpp", "biwt", "dplyr", "gtools"] }, "distinct": { "name": "distinct", "version": "1.16.0", "sha256": "19xpnll4fksbw5hbk3g7a8m34p7jqj31vm7jxapwxxkmng17cpka", - "depends": ["doParallel", "doRNG", "foreach", "ggplot2", "limma", "Matrix", "Rcpp", "RcppArmadillo", "scater", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "SingleCellExperiment", "SummarizedExperiment", "doParallel", "doRNG", "foreach", "ggplot2", "limma", "scater"] }, "dittoSeq": { "name": "dittoSeq", "version": "1.16.0", "sha256": "15p01f3yaan9x7y6ld1kx40jnbcn6vjjm5n6ir7cicdvv4w5ln49", - "depends": ["colorspace", "cowplot", "ggplot2", "ggrepel", "ggridges", "gridExtra", "pheatmap", "reshape2", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "colorspace", "cowplot", "ggplot2", "ggrepel", "ggridges", "gridExtra", "pheatmap", "reshape2"] }, "divergence": { "name": "divergence", @@ -8045,27 +8075,27 @@ }, "dmrseq": { "name": "dmrseq", - "version": "1.24.0", - "sha256": "0p7xpyl1wni17y7qsincpvllaynxwppmyg6hsza51srs4dhr7sf1", - "depends": ["AnnotationHub", "annotatr", "BiocParallel", "bsseq", "bumphunter", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "locfit", "matrixStats", "nlme", "outliers", "RColorBrewer", "rtracklayer", "S4Vectors"] + "version": "1.24.1", + "sha256": "0x7gwdzpn1ziq5vm80fs1fcyknapwjs8zfbjszw66zs36nqnqgw4", + "depends": ["AnnotationHub", "BiocParallel", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "annotatr", "bsseq", "bumphunter", "ggplot2", "locfit", "matrixStats", "nlme", "outliers", "rtracklayer"] }, "doppelgangR": { "name": "doppelgangR", "version": "1.32.0", "sha256": "1kxw5x1fwdn2hzzf6ckxz0k8qqghvr0qdx3fgx31jdla0zc9z1zm", - "depends": ["Biobase", "BiocParallel", "digest", "impute", "mnormt", "SummarizedExperiment", "sva"] + "depends": ["Biobase", "BiocParallel", "SummarizedExperiment", "digest", "impute", "mnormt", "sva"] }, "doseR": { "name": "doseR", "version": "1.20.0", "sha256": "09zr2r1vk1azrjwgx2bklv5sdypl3dba0szvh21nw1ndqyk9lwic", - "depends": ["digest", "edgeR", "lme4", "matrixStats", "mclust", "RUnit", "S4Vectors", "SummarizedExperiment"] + "depends": ["RUnit", "S4Vectors", "SummarizedExperiment", "digest", "edgeR", "lme4", "matrixStats", "mclust"] }, "doubletrouble": { "name": "doubletrouble", - "version": "1.4.0", - "sha256": "0xfrpz3ilxapcclxgf7drkwcrhvn2d70fx6q139faslp1zs19bv0", - "depends": ["AnnotationDbi", "BiocParallel", "Biostrings", "GenomicFeatures", "GenomicRanges", "ggplot2", "mclust", "MSA2dist", "rlang", "syntenet"] + "version": "1.4.1", + "sha256": "057l5qirwyh7swcyavyqd9d3qy9qxs8rasjzyglbz266sw3z5p36", + "depends": ["AnnotationDbi", "Biostrings", "GenomicFeatures", "GenomicRanges", "MSA2dist", "ggplot2", "mclust", "rlang", "syntenet"] }, "drawProteins": { "name": "drawProteins", @@ -8077,13 +8107,13 @@ "name": "dreamlet", "version": "1.2.1", "sha256": "06mpmwjxp7zs9fsggf2b3qc5vgmx6l5s7prl6l7b753zfq5gvjbg", - "depends": ["ashr", "beachmat", "BiocGenerics", "BiocParallel", "broom", "data_table", "DelayedArray", "DelayedMatrixStats", "dplyr", "edgeR", "ggbeeswarm", "ggplot2", "ggrepel", "GSEABase", "gtools", "IRanges", "irlba", "limma", "lme4", "mashr", "MASS", "Matrix", "MatrixGenerics", "metafor", "purrr", "Rcpp", "Rdpack", "remaCor", "reshape2", "rlang", "S4Vectors", "scattermore", "SingleCellExperiment", "sparseMatrixStats", "SummarizedExperiment", "tidyr", "variancePartition", "zenith"] + "depends": ["BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "GSEABase", "IRanges", "MASS", "Matrix", "MatrixGenerics", "Rcpp", "Rdpack", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ashr", "beachmat", "broom", "data_table", "dplyr", "edgeR", "ggbeeswarm", "ggplot2", "ggrepel", "gtools", "irlba", "limma", "lme4", "mashr", "metafor", "purrr", "remaCor", "reshape2", "rlang", "scattermore", "sparseMatrixStats", "tidyr", "variancePartition", "zenith"] }, "drugTargetInteractions": { "name": "drugTargetInteractions", "version": "1.12.0", "sha256": "079qy3mmv9skiybzh9ls3082wqb3r9x6fn50rgcwziapixlx2rh4", - "depends": ["AnnotationFilter", "BiocFileCache", "biomaRt", "dplyr", "ensembldb", "rappdirs", "RSQLite", "S4Vectors", "UniProt_ws"] + "depends": ["AnnotationFilter", "BiocFileCache", "RSQLite", "S4Vectors", "UniProt_ws", "biomaRt", "dplyr", "ensembldb", "rappdirs"] }, "dupRadar": { "name": "dupRadar", @@ -8101,13 +8131,13 @@ "name": "easier", "version": "1.10.0", "sha256": "00c0dssv41brpwsh09zh23b7r3y7vax16viwc33nniig3f724id2", - "depends": ["BiocParallel", "coin", "decoupleR", "DESeq2", "dorothea", "dplyr", "easierData", "ggplot2", "ggpubr", "ggrepel", "magrittr", "matrixStats", "progeny", "quantiseqr", "reshape2", "rlang", "ROCR", "rstatix", "tibble", "tidyr"] + "depends": ["BiocParallel", "DESeq2", "ROCR", "coin", "decoupleR", "dorothea", "dplyr", "easierData", "ggplot2", "ggpubr", "ggrepel", "magrittr", "matrixStats", "progeny", "quantiseqr", "reshape2", "rlang", "rstatix", "tibble", "tidyr"] }, "easyRNASeq": { "name": "easyRNASeq", - "version": "2.39.0", - "sha256": "1dfg8k2jxhnyms7nkgsdyhwca0hnm45c2p3x5dxlm8kd69z7wzdj", - "depends": ["Biobase", "BiocFileCache", "BiocGenerics", "BiocParallel", "biomaRt", "Biostrings", "edgeR", "GenomeInfoDb", "genomeIntervals", "GenomicAlignments", "GenomicRanges", "IRanges", "locfit", "LSD", "rappdirs", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment"] + "version": "2.40.1", + "sha256": "1j36g6nyzbsaqz798q6yvgqx2vpjnzsi7b2pvldfpzkx1734isbx", + "depends": ["Biobase", "BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "LSD", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "biomaRt", "edgeR", "genomeIntervals", "rappdirs"] }, "easylift": { "name": "easylift", @@ -8135,9 +8165,9 @@ }, "edgeR": { "name": "edgeR", - "version": "4.2.0", - "sha256": "1w3dp3h30jqylbkql33j5ibp9i4vp7n1x6wdd2v0kdnv82il6hqg", - "depends": ["limma", "locfit", "Rcpp"] + "version": "4.2.1", + "sha256": "0c9r4gcsaf6fqkc4r49vj8az6wplqsbkd423pb4fvrv5lka9aqi9", + "depends": ["Rcpp", "limma", "locfit"] }, "eds": { "name": "eds", @@ -8149,31 +8179,31 @@ "name": "eiR", "version": "1.44.0", "sha256": "1ia8ygj2sashjwign28xfilj7j0a4r03nmgq6qzfsyw679wq4m2v", - "depends": ["BiocGenerics", "ChemmineR", "DBI", "digest", "RcppAnnoy", "RCurl", "RUnit", "snow", "snowfall"] + "depends": ["BiocGenerics", "ChemmineR", "DBI", "RCurl", "RUnit", "RcppAnnoy", "digest", "snow", "snowfall"] }, "eisaR": { "name": "eisaR", "version": "1.16.0", "sha256": "0in6bkakplpqvfr8zya850sdl0jr4h1qdsw1shvd9wjr3yxdmsad", - "depends": ["BiocGenerics", "edgeR", "GenomicRanges", "IRanges", "limma", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "edgeR", "limma"] }, "enhancerHomologSearch": { "name": "enhancerHomologSearch", "version": "1.10.0", "sha256": "00hm42zvkgz0r3s0k4ljfcbwfkysd1sw6k3zm00fxglgigvfs8r3", - "depends": ["BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicRanges", "httr", "IRanges", "jsonlite", "Matrix", "motifmatchr", "pwalign", "Rcpp", "rtracklayer", "S4Vectors"] + "depends": ["BSgenome", "BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "S4Vectors", "httr", "jsonlite", "motifmatchr", "pwalign", "rtracklayer"] }, "enrichViewNet": { "name": "enrichViewNet", "version": "1.2.0", "sha256": "1xnxkcy0ifhf3d5qfngh5vrxz3699azjjigr17qm4zmq7qdsp7h2", - "depends": ["DOSE", "enrichplot", "gprofiler2", "jsonlite", "RCy3", "strex", "stringr"] + "depends": ["DOSE", "RCy3", "enrichplot", "gprofiler2", "jsonlite", "strex", "stringr"] }, "enrichplot": { "name": "enrichplot", - "version": "1.24.0", - "sha256": "0rkp1zidz34h4d02m4jqv509vw0wyrc084hvj3lxr7mb9j7rnq48", - "depends": ["aplot", "DOSE", "ggfun", "ggnewscale", "ggplot2", "ggraph", "ggtree", "GOSemSim", "igraph", "magrittr", "plyr", "purrr", "RColorBrewer", "reshape2", "rlang", "scatterpie", "shadowtext", "yulab_utils"] + "version": "1.24.2", + "sha256": "03p0a1vyaznk405xpkp57f22wg8x7lxiipjh101p7dq97rbzr4r7", + "depends": ["DOSE", "GOSemSim", "RColorBrewer", "aplot", "ggfun", "ggnewscale", "ggplot2", "ggraph", "ggtree", "igraph", "magrittr", "plyr", "purrr", "reshape2", "rlang", "scatterpie", "shadowtext", "yulab_utils"] }, "ensemblVEP": { "name": "ensemblVEP", @@ -8185,73 +8215,73 @@ "name": "ensembldb", "version": "2.28.0", "sha256": "10h3ngwq99y0d3ksf0303qjw263ard1zsawpq1pw5n9r5g7xll47", - "depends": ["AnnotationDbi", "AnnotationFilter", "Biobase", "BiocGenerics", "Biostrings", "curl", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "ProtGenerics", "Rsamtools", "RSQLite", "rtracklayer", "S4Vectors"] + "depends": ["AnnotationDbi", "AnnotationFilter", "Biobase", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "ProtGenerics", "RSQLite", "Rsamtools", "S4Vectors", "curl", "rtracklayer"] }, "epiNEM": { "name": "epiNEM", "version": "1.28.0", "sha256": "156qj9r121j6c9vr6fh2zi9aaq3kq9gabjxg4l5wj47vj1d427az", - "depends": ["BoolNet", "e1071", "graph", "gtools", "igraph", "latex2exp", "lattice", "latticeExtra", "minet", "mnem", "pcalg", "RColorBrewer"] + "depends": ["BoolNet", "RColorBrewer", "e1071", "graph", "gtools", "igraph", "latex2exp", "lattice", "latticeExtra", "minet", "mnem", "pcalg"] }, "epialleleR": { "name": "epialleleR", "version": "1.12.0", "sha256": "1jdhzcs6l3v4765dxlqc7gn2yxy9fvzk94aixl5bqxmn4v4hyasq", - "depends": ["BH", "BiocGenerics", "data_table", "GenomeInfoDb", "GenomicRanges", "Rcpp", "Rhtslib", "SummarizedExperiment", "VariantAnnotation", "zlibbioc"] + "depends": ["BH", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "Rcpp", "Rhtslib", "SummarizedExperiment", "VariantAnnotation", "data_table", "zlibbioc"] }, "epidecodeR": { "name": "epidecodeR", "version": "1.12.0", "sha256": "0gmdmjvl93zgsi9yclscw94y1caspb2pnjawxhv3yqmnhjq3dzhz", - "depends": ["dplyr", "EnvStats", "GenomicRanges", "ggplot2", "ggpubr", "IRanges", "rstatix", "rtracklayer"] + "depends": ["EnvStats", "GenomicRanges", "IRanges", "dplyr", "ggplot2", "ggpubr", "rstatix", "rtracklayer"] }, "epigenomix": { "name": "epigenomix", "version": "1.44.0", "sha256": "1c1lwz5lbq69anpk1q7dhlfrvb66g8vrfyw7130x1c6y5yryk23k", - "depends": ["beadarray", "Biobase", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "MCMCpack", "Rsamtools", "S4Vectors", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "MCMCpack", "Rsamtools", "S4Vectors", "SummarizedExperiment", "beadarray"] }, "epigraHMM": { "name": "epigraHMM", "version": "1.12.0", "sha256": "1zkb81jd2gsj92yzlxhshaw4csap9b06gyy5gl1qi3k3qkx69dq9", - "depends": ["bamsignals", "csaw", "data_table", "GenomeInfoDb", "GenomicRanges", "ggplot2", "ggpubr", "GreyListChIP", "IRanges", "limma", "magrittr", "MASS", "Matrix", "pheatmap", "Rcpp", "RcppArmadillo", "rhdf5", "Rhdf5lib", "Rsamtools", "rtracklayer", "S4Vectors", "scales", "SummarizedExperiment"] + "depends": ["GenomeInfoDb", "GenomicRanges", "GreyListChIP", "IRanges", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "Rhdf5lib", "Rsamtools", "S4Vectors", "SummarizedExperiment", "bamsignals", "csaw", "data_table", "ggplot2", "ggpubr", "limma", "magrittr", "pheatmap", "rhdf5", "rtracklayer", "scales"] }, "epimutacions": { "name": "epimutacions", "version": "1.8.0", "sha256": "15lrkz7fqmjg5d2l77xbiqwdd3f2jnbw9nc6l4k6wglw3za3prr1", - "depends": ["AnnotationDbi", "AnnotationHub", "BiocGenerics", "BiocParallel", "biomaRt", "bumphunter", "ensembldb", "epimutacionsData", "ExperimentHub", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggrepel", "gridExtra", "Gviz", "Homo_sapiens", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b2_hg19", "IlluminaHumanMethylationEPICmanifest", "IRanges", "isotree", "matrixStats", "minfi", "purrr", "reshape2", "robustbase", "rtracklayer", "S4Vectors", "SummarizedExperiment", "tibble", "TxDb_Hsapiens_UCSC_hg18_knownGene", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene"] + "depends": ["AnnotationDbi", "AnnotationHub", "BiocGenerics", "BiocParallel", "ExperimentHub", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Gviz", "Homo_sapiens", "IRanges", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b2_hg19", "IlluminaHumanMethylationEPICmanifest", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg18_knownGene", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "biomaRt", "bumphunter", "ensembldb", "epimutacionsData", "ggplot2", "ggrepel", "gridExtra", "isotree", "matrixStats", "minfi", "purrr", "reshape2", "robustbase", "rtracklayer", "tibble"] }, "epiregulon": { "name": "epiregulon", "version": "1.0.1", "sha256": "0zhnra2kl1r2kh9g21fx3nqyb5sksnf7j81dzhjnwjvmlr52xp8w", - "depends": ["AnnotationHub", "AUCell", "beachmat", "BiocParallel", "bluster", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "BSgenome_Mmusculus_UCSC_mm10", "checkmate", "entropy", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "IRanges", "lifecycle", "Matrix", "motifmatchr", "Rcpp", "S4Vectors", "scMultiome", "scran", "scuttle", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["AUCell", "AnnotationHub", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "BSgenome_Mmusculus_UCSC_mm10", "BiocParallel", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "bluster", "checkmate", "entropy", "lifecycle", "motifmatchr", "scMultiome", "scran", "scuttle"] }, "epiregulon_extra": { "name": "epiregulon.extra", - "version": "1.0.0", - "sha256": "04d85zp0yadbxrjk88arnf64hfnw67yqn60y03a0wvrw6hcv1zdz", - "depends": ["checkmate", "circlize", "clusterProfiler", "ComplexHeatmap", "ggplot2", "ggraph", "igraph", "lifecycle", "Matrix", "patchwork", "reshape2", "scales", "scater", "scran", "SingleCellExperiment", "SummarizedExperiment"] + "version": "1.0.1", + "sha256": "0wfslvp85vz792dacirqzmfqp1phs91v6lcmly9m14vw892651pn", + "depends": ["ComplexHeatmap", "Matrix", "SingleCellExperiment", "SummarizedExperiment", "checkmate", "circlize", "clusterProfiler", "ggplot2", "ggraph", "igraph", "lifecycle", "patchwork", "reshape2", "scales", "scater", "scran"] }, "epistack": { "name": "epistack", "version": "1.10.0", "sha256": "1kfviv9k43n6hy66x5r5hc2f7vb3y3v81qk1m9549nqvdii7ph5q", - "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "plotrix", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "plotrix"] }, "epistasisGA": { "name": "epistasisGA", "version": "1.6.0", "sha256": "1rq1jgd95zamg3fsyj8nbvg95chjaf9d30xlg8d6rr071ya9f03v", - "depends": ["batchtools", "BH", "bigmemory", "BiocParallel", "data_table", "ggplot2", "igraph", "matrixStats", "qgraph", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["BH", "BiocParallel", "Rcpp", "RcppArmadillo", "batchtools", "bigmemory", "data_table", "ggplot2", "igraph", "matrixStats", "qgraph", "survival"] }, "epivizr": { "name": "epivizr", "version": "2.34.0", "sha256": "07y6h9dk0mz5nh1ivbrf1l2smlw7y0ygdmh9k1fn50lc6120dq37", - "depends": ["bumphunter", "epivizrData", "epivizrServer", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "bumphunter", "epivizrData", "epivizrServer"] }, "epivizrChart": { "name": "epivizrChart", @@ -8263,85 +8293,85 @@ "name": "epivizrData", "version": "1.32.0", "sha256": "11x47w0rvn109brah7140nn5844vvmdpbgdc2c3q2ycxm40fl6rq", - "depends": ["Biobase", "ensembldb", "epivizrServer", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "OrganismDbi", "S4Vectors", "SummarizedExperiment"] + "depends": ["Biobase", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "OrganismDbi", "S4Vectors", "SummarizedExperiment", "ensembldb", "epivizrServer"] }, "epivizrServer": { "name": "epivizrServer", "version": "1.32.0", "sha256": "11ba652yhnl7xi7fgw3s32siwd38mrsxsklm0n6f5v081g3a7g3s", - "depends": ["httpuv", "mime", "R6", "rjson"] + "depends": ["R6", "httpuv", "mime", "rjson"] }, "epivizrStandalone": { "name": "epivizrStandalone", "version": "1.32.0", "sha256": "0qrngsga0qfadbijjikfzgpl6i0vnvkcssnf1z3y1fm8mkq35b4z", - "depends": ["BiocGenerics", "epivizr", "epivizrServer", "GenomeInfoDb", "GenomicFeatures", "git2r", "S4Vectors"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "S4Vectors", "epivizr", "epivizrServer", "git2r"] }, "erccdashboard": { "name": "erccdashboard", "version": "1.38.0", "sha256": "0cghksf9gkgkcak8493s4pixq2nd3a7zc91vqq158g5na6ca24n7", - "depends": ["edgeR", "ggplot2", "gplots", "gridExtra", "gtools", "limma", "locfit", "MASS", "plyr", "qvalue", "reshape2", "ROCR", "scales", "stringr"] + "depends": ["MASS", "ROCR", "edgeR", "ggplot2", "gplots", "gridExtra", "gtools", "limma", "locfit", "plyr", "qvalue", "reshape2", "scales", "stringr"] }, "erma": { "name": "erma", "version": "1.20.0", "sha256": "0f4y0szdqhg63vaw7f1lmgzb72bhfpz20g9naq84s8bq2xsf8cy6", - "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicFiles", "GenomicRanges", "ggplot2", "Homo_sapiens", "IRanges", "rtracklayer", "S4Vectors", "shiny", "SummarizedExperiment"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicFiles", "GenomicRanges", "Homo_sapiens", "IRanges", "S4Vectors", "SummarizedExperiment", "ggplot2", "rtracklayer", "shiny"] }, "esATAC": { "name": "esATAC", "version": "1.26.0", "sha256": "0gfil57zc5bzhk29cw16bv02kng7hqs5ry1kakly1kvcfafcn87s", - "depends": ["AnnotationDbi", "BiocGenerics", "BiocManager", "Biostrings", "BSgenome", "ChIPseeker", "clusterProfiler", "corrplot", "digest", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "igraph", "IRanges", "JASPAR2018", "knitr", "magrittr", "motifmatchr", "pipeFrame", "R_utils", "Rbowtie2", "Rcpp", "rJava", "rmarkdown", "Rsamtools", "rtracklayer", "S4Vectors", "ShortRead", "TFBSTools", "VennDiagram"] + "depends": ["AnnotationDbi", "BSgenome", "BiocGenerics", "BiocManager", "Biostrings", "ChIPseeker", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "JASPAR2018", "R_utils", "Rbowtie2", "Rcpp", "Rsamtools", "S4Vectors", "ShortRead", "TFBSTools", "VennDiagram", "clusterProfiler", "corrplot", "digest", "ggplot2", "igraph", "knitr", "magrittr", "motifmatchr", "pipeFrame", "rJava", "rmarkdown", "rtracklayer"] }, "escape": { "name": "escape", "version": "2.0.0", "sha256": "03wbrxd7kjyl3d4s418ql5fv7bmwdfyfp10jd8knr0xis7vxmz2x", - "depends": ["AUCell", "BiocParallel", "dplyr", "ggdist", "ggplot2", "ggpointdensity", "ggridges", "GSEABase", "GSVA", "MatrixGenerics", "msigdbr", "patchwork", "reshape2", "SeuratObject", "SingleCellExperiment", "stringr", "SummarizedExperiment", "UCell"] + "depends": ["AUCell", "BiocParallel", "GSEABase", "GSVA", "MatrixGenerics", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "UCell", "dplyr", "ggdist", "ggplot2", "ggpointdensity", "ggridges", "msigdbr", "patchwork", "reshape2", "stringr"] }, "escheR": { "name": "escheR", "version": "1.4.0", "sha256": "16sqxsvpvb9idb7crbr3kq5xcifpzdw29lcxvrn2kxq003n7hbqw", - "depends": ["ggplot2", "rlang", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment"] + "depends": ["SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "ggplot2", "rlang"] }, "esetVis": { "name": "esetVis", "version": "1.30.0", "sha256": "1b51cv3bl11jymjwnd8150lw5ab7bpa4jj09ssisn3qnb5nym7lj", - "depends": ["Biobase", "hexbin", "MASS", "MLP", "mpm", "Rtsne"] + "depends": ["Biobase", "MASS", "MLP", "Rtsne", "hexbin", "mpm"] }, "eudysbiome": { "name": "eudysbiome", "version": "1.34.0", "sha256": "12kbk17rfh1icxdj5kkz66d72p9rq4bw9nh52bvah5i3bq7wi5zn", - "depends": ["Biostrings", "plyr", "R_utils", "Rsamtools"] + "depends": ["Biostrings", "R_utils", "Rsamtools", "plyr"] }, "evaluomeR": { "name": "evaluomeR", - "version": "1.20.0", - "sha256": "1rcffshqlkilmfyziz95pac4c0rm5jjq0y9i3r47z55zmrnr4lz4", - "depends": ["class", "cluster", "corrplot", "flexmix", "fpc", "ggdendro", "ggplot2", "kableExtra", "MASS", "matrixStats", "mclust", "MultiAssayExperiment", "plotrix", "prabclus", "randomForest", "Rdpack", "reshape2", "SummarizedExperiment"] + "version": "1.20.5", + "sha256": "18hp7j6m7fpnaa4l9clqff1xg0lmvwsh0s26c5gq75r1d6k05m4p", + "depends": ["MASS", "MultiAssayExperiment", "RSKC", "Rdpack", "SummarizedExperiment", "class", "cluster", "corrplot", "dendextend", "dplyr", "flexmix", "fpc", "ggdendro", "ggplot2", "kableExtra", "matrixStats", "mclust", "plotrix", "prabclus", "randomForest", "reshape2", "sparcl"] }, "extraChIPs": { "name": "extraChIPs", - "version": "1.8.1", - "sha256": "0qmm7sffwv2b1qinwm39pahb4i1m2jk4hzwli481by24vc6p1y7j", - "depends": ["BiocIO", "BiocParallel", "broom", "ComplexUpset", "csaw", "dplyr", "edgeR", "forcats", "GenomeInfoDb", "GenomicInteractions", "GenomicRanges", "ggforce", "ggplot2", "ggrepel", "ggside", "glue", "InteractionSet", "IRanges", "matrixStats", "patchwork", "RColorBrewer", "rlang", "Rsamtools", "rtracklayer", "S4Vectors", "scales", "stringr", "SummarizedExperiment", "tibble", "tidyr", "tidyselect", "vctrs", "VennDiagram"] + "version": "1.8.5", + "sha256": "1cznznlr2w8p5wjc4i6vcmxv9lhvgf7xglxd75gm9s60w8hi31yj", + "depends": ["BiocIO", "BiocParallel", "ComplexUpset", "GenomeInfoDb", "GenomicInteractions", "GenomicRanges", "IRanges", "InteractionSet", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VennDiagram", "broom", "csaw", "dplyr", "edgeR", "forcats", "ggforce", "ggplot2", "ggrepel", "ggside", "glue", "matrixStats", "patchwork", "rlang", "rtracklayer", "scales", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] }, "fCCAC": { "name": "fCCAC", "version": "1.30.0", "sha256": "0qvwsqvv1g4fcjhy88kq2z5nzlhhvx6p6ffaqis70wbgvr5p4aw0", - "depends": ["ComplexHeatmap", "fda", "genomation", "GenomicRanges", "ggplot2", "IRanges", "RColorBrewer", "S4Vectors"] + "depends": ["ComplexHeatmap", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "fda", "genomation", "ggplot2"] }, "fCI": { "name": "fCI", "version": "1.34.0", "sha256": "0szrdyw57k6wa8zr80gyxidfhcc1v88gj6bjank3dc478f1kn9d0", - "depends": ["FNN", "gtools", "psych", "rgl", "VennDiagram", "zoo"] + "depends": ["FNN", "VennDiagram", "gtools", "psych", "rgl", "zoo"] }, "fabia": { "name": "fabia", @@ -8359,31 +8389,31 @@ "name": "factR", "version": "1.6.0", "sha256": "1y19wd0j9rlbfi2rqk73gcyszbg4p4cl2w3zqckyvv9969i9rjid", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "crayon", "data_table", "dplyr", "drawProteins", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "pbapply", "purrr", "RCurl", "rlang", "rtracklayer", "S4Vectors", "stringr", "tibble", "tidyr", "wiggleplotr", "XML"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RCurl", "S4Vectors", "XML", "crayon", "data_table", "dplyr", "drawProteins", "ggplot2", "pbapply", "purrr", "rlang", "rtracklayer", "stringr", "tibble", "tidyr", "wiggleplotr"] }, "faers": { "name": "faers", - "version": "1.0.0", - "sha256": "04q6h3hc2697dpk66ra6lppv808n0vgxk1py26nxjkpmqyc076xx", - "depends": ["BiocParallel", "brio", "cli", "curl", "data_table", "httr2", "MCMCpack", "openEBGM", "rlang", "rvest", "vroom", "xml2"] + "version": "1.0.3", + "sha256": "09cha2kzc3bjgd4yww9pymvk7d1wnw3qh70vl1sra52vz89hif4j", + "depends": ["BiocParallel", "MCMCpack", "brio", "cli", "curl", "data_table", "httr2", "openEBGM", "rlang", "rvest", "vroom", "xml2"] }, "famat": { "name": "famat", "version": "1.14.0", "sha256": "099l12m27ys5glbigi9q9hr7941yy9jxrzsbxf993gs71qajlsgh", - "depends": ["BiasedUrn", "clusterProfiler", "dplyr", "DT", "GO_db", "gprofiler2", "KEGGREST", "magrittr", "mgcv", "ontologyIndex", "org_Hs_eg_db", "plotly", "reactome_db", "rWikiPathways", "shiny", "shinyBS", "shinydashboard", "stringr", "tidyr"] + "depends": ["BiasedUrn", "DT", "GO_db", "KEGGREST", "clusterProfiler", "dplyr", "gprofiler2", "magrittr", "mgcv", "ontologyIndex", "org_Hs_eg_db", "plotly", "rWikiPathways", "reactome_db", "shiny", "shinyBS", "shinydashboard", "stringr", "tidyr"] }, "fastLiquidAssociation": { "name": "fastLiquidAssociation", "version": "1.40.0", "sha256": "0nhr2w0b491xh6bc2j9mc9a87yblr3l4kmnm8gxlnc27fav3jzj8", - "depends": ["doParallel", "Hmisc", "impute", "LiquidAssociation", "preprocessCore", "WGCNA"] + "depends": ["Hmisc", "LiquidAssociation", "WGCNA", "doParallel", "impute", "preprocessCore"] }, "fastreeR": { "name": "fastreeR", "version": "1.8.0", "sha256": "0r1xngxdblgshgkr4l762kgxqaq9s79g4f3lirlkd9bb248pzfvc", - "depends": ["ape", "data_table", "dynamicTreeCut", "R_utils", "rJava", "stringr"] + "depends": ["R_utils", "ape", "data_table", "dynamicTreeCut", "rJava", "stringr"] }, "fastseg": { "name": "fastseg", @@ -8395,7 +8425,7 @@ "name": "fcScan", "version": "1.18.0", "sha256": "1gb15zrv44yn65wns7dk24rp54qv7wafqxgk1q8jnbkq9lp5wj2y", - "depends": ["doParallel", "foreach", "GenomicRanges", "IRanges", "plyr", "rtracklayer", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["GenomicRanges", "IRanges", "SummarizedExperiment", "VariantAnnotation", "doParallel", "foreach", "plyr", "rtracklayer"] }, "fdrame": { "name": "fdrame", @@ -8407,31 +8437,31 @@ "name": "fedup", "version": "1.12.0", "sha256": "0q1bvx8zv5c1pzi82v8yxgdxb85l7nzan8k6xwsr1xmdy224lpgf", - "depends": ["data_table", "dplyr", "forcats", "ggplot2", "ggthemes", "openxlsx", "RColorBrewer", "RCy3", "tibble"] + "depends": ["RColorBrewer", "RCy3", "data_table", "dplyr", "forcats", "ggplot2", "ggthemes", "openxlsx", "tibble"] }, "fenr": { "name": "fenr", - "version": "1.2.0", - "sha256": "0d0rjvnbyp8w3hkb38fgbig1211w4gj74lgdnbx52jxym2pkg32y", - "depends": ["assertthat", "BiocFileCache", "dplyr", "ggplot2", "httr2", "progress", "purrr", "readr", "rlang", "rvest", "shiny", "stringr", "tibble", "tidyr", "tidyselect"] + "version": "1.2.1", + "sha256": "19hhdvfmml8njsw86ny1hp9x8pn7hdcqbbyd6qygr8z0lqpfpb9d", + "depends": ["BiocFileCache", "assertthat", "dplyr", "ggplot2", "httr2", "progress", "purrr", "readr", "rlang", "rvest", "shiny", "stringr", "tibble", "tidyr", "tidyselect"] }, "ffpe": { "name": "ffpe", "version": "1.48.0", "sha256": "1y769nnwbc9rjjpwxqgfw0v58ym4g9qy695adcyswl8z955yhjax", - "depends": ["affy", "Biobase", "BiocGenerics", "lumi", "methylumi", "sfsmisc", "TTR"] + "depends": ["Biobase", "BiocGenerics", "TTR", "affy", "lumi", "methylumi", "sfsmisc"] }, "fgga": { "name": "fgga", "version": "1.12.0", "sha256": "18bvf1qjdzd66sf479ghf3pg4cnwpwmzkhcvi6zriqd7mvsll8fr", - "depends": ["BiocFileCache", "curl", "e1071", "graph", "gRbase", "igraph", "jsonlite", "RBGL"] + "depends": ["BiocFileCache", "RBGL", "curl", "e1071", "gRbase", "graph", "igraph", "jsonlite"] }, "fgsea": { "name": "fgsea", "version": "1.30.0", "sha256": "0nnvqsyrj24h5y8qw8llk9f4jgy0v734k37kcksfcpja17frdyjy", - "depends": ["BH", "BiocParallel", "cowplot", "data_table", "fastmatch", "ggplot2", "Matrix", "Rcpp", "scales"] + "depends": ["BH", "BiocParallel", "Matrix", "Rcpp", "cowplot", "data_table", "fastmatch", "ggplot2", "scales"] }, "findIPs": { "name": "findIPs", @@ -8443,19 +8473,19 @@ "name": "fishpond", "version": "2.10.0", "sha256": "02lzx8whxd3z4k0saf0vaq4np8lag00nkp3hd6da1w91vczs1kjl", - "depends": ["abind", "GenomicRanges", "gtools", "IRanges", "jsonlite", "Matrix", "matrixStats", "qvalue", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "svMisc"] + "depends": ["GenomicRanges", "IRanges", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "abind", "gtools", "jsonlite", "matrixStats", "qvalue", "svMisc"] }, "flagme": { "name": "flagme", "version": "1.60.0", "sha256": "0gi2hwd13q4rdmzf45xcbmdpr3b3hbqabv6csmjfiqqqj4cl3wy9", - "depends": ["CAMERA", "gcspikelite", "gplots", "MASS", "SparseM", "xcms"] + "depends": ["CAMERA", "MASS", "SparseM", "gcspikelite", "gplots", "xcms"] }, "flowAI": { "name": "flowAI", "version": "1.34.0", "sha256": "1siqza92iak5lz38hbfznqndrmq995ihp6sbam0n2d3mj8vwv9qa", - "depends": ["changepoint", "flowCore", "ggplot2", "knitr", "plyr", "RColorBrewer", "reshape2", "rmarkdown", "scales"] + "depends": ["RColorBrewer", "changepoint", "flowCore", "ggplot2", "knitr", "plyr", "reshape2", "rmarkdown", "scales"] }, "flowBeads": { "name": "flowBeads", @@ -8491,7 +8521,7 @@ "name": "flowCore", "version": "2.16.0", "sha256": "1zq3qypmzk9ld48r50fmygfdqwwyykii8l0l6gh5bdrdan760bfn", - "depends": ["BH", "Biobase", "BiocGenerics", "cpp11", "cytolib", "matrixStats", "Rcpp", "RProtoBufLib", "S4Vectors"] + "depends": ["BH", "Biobase", "BiocGenerics", "RProtoBufLib", "Rcpp", "S4Vectors", "cpp11", "cytolib", "matrixStats"] }, "flowCut": { "name": "flowCut", @@ -8527,13 +8557,13 @@ "name": "flowGraph", "version": "1.12.0", "sha256": "1zxpiz8nm3awzkf7wqql73b9kgydgza72yp2kv59gyf1lcsli0ns", - "depends": ["data_table", "effsize", "furrr", "future", "ggiraph", "ggplot2", "ggrepel", "gridExtra", "htmlwidgets", "igraph", "Matrix", "matrixStats", "purrr", "Rdpack", "stringi", "stringr", "visNetwork"] + "depends": ["Matrix", "Rdpack", "data_table", "effsize", "furrr", "future", "ggiraph", "ggplot2", "ggrepel", "gridExtra", "htmlwidgets", "igraph", "matrixStats", "purrr", "stringi", "stringr", "visNetwork"] }, "flowMatch": { "name": "flowMatch", "version": "1.40.0", "sha256": "0k83702b9k5nsng67awr7mz3jq9yxs4dkvvg2hcn29m1s42a2i63", - "depends": ["Biobase", "flowCore", "Rcpp"] + "depends": ["Biobase", "Rcpp", "flowCore"] }, "flowMeans": { "name": "flowMeans", @@ -8545,7 +8575,7 @@ "name": "flowMerge", "version": "2.52.0", "sha256": "1z675mj3jsi0n9x03nbw12z001c8jz9pm64ypvb1g6f51bnq1fyx", - "depends": ["feature", "flowClust", "flowCore", "foreach", "graph", "Rgraphviz", "rrcov", "snow"] + "depends": ["Rgraphviz", "feature", "flowClust", "flowCore", "foreach", "graph", "rrcov", "snow"] }, "flowPeaks": { "name": "flowPeaks", @@ -8557,7 +8587,7 @@ "name": "flowPloidy", "version": "1.30.0", "sha256": "06grhvskia03xakfcs776fiz7i3i04crysykrmnyz1jxbaa2irba", - "depends": ["car", "caTools", "flowCore", "knitr", "minpack_lm", "rmarkdown", "shiny"] + "depends": ["caTools", "car", "flowCore", "knitr", "minpack_lm", "rmarkdown", "shiny"] }, "flowPlots": { "name": "flowPlots", @@ -8575,7 +8605,7 @@ "name": "flowStats", "version": "4.16.0", "sha256": "0q8g3sqmbhinfrb63yhv4lsczjz7pqwhwwsdlz2cg7s8yhp0cj6v", - "depends": ["Biobase", "BiocGenerics", "clue", "cluster", "corpcor", "fda", "flowCore", "flowViz", "flowWorkspace", "KernSmooth", "ks", "lattice", "MASS", "mnormt", "ncdfFlow", "RColorBrewer", "rrcov"] + "depends": ["Biobase", "BiocGenerics", "KernSmooth", "MASS", "RColorBrewer", "clue", "cluster", "corpcor", "fda", "flowCore", "flowViz", "flowWorkspace", "ks", "lattice", "mnormt", "ncdfFlow", "rrcov"] }, "flowTime": { "name": "flowTime", @@ -8599,19 +8629,19 @@ "name": "flowViz", "version": "1.68.0", "sha256": "1iz4skfs68jg2a59kfaxllf19mp9pk9mpfc2jh3vyas14c3l3zzj", - "depends": ["Biobase", "flowCore", "hexbin", "IDPmisc", "KernSmooth", "lattice", "latticeExtra", "MASS", "RColorBrewer"] + "depends": ["Biobase", "IDPmisc", "KernSmooth", "MASS", "RColorBrewer", "flowCore", "hexbin", "lattice", "latticeExtra"] }, "flowWorkspace": { "name": "flowWorkspace", "version": "4.16.0", "sha256": "0k22hifg4sv0xiw983gf1d6y7zkn9072famwj72x47w8vag4i0xz", - "depends": ["BH", "Biobase", "BiocGenerics", "cpp11", "cytolib", "data_table", "DelayedArray", "dplyr", "flowCore", "ggplot2", "graph", "matrixStats", "ncdfFlow", "RBGL", "Rgraphviz", "Rhdf5lib", "RProtoBufLib", "S4Vectors", "scales", "XML"] + "depends": ["BH", "Biobase", "BiocGenerics", "DelayedArray", "RBGL", "RProtoBufLib", "Rgraphviz", "Rhdf5lib", "S4Vectors", "XML", "cpp11", "cytolib", "data_table", "dplyr", "flowCore", "ggplot2", "graph", "matrixStats", "ncdfFlow", "scales"] }, "flowcatchR": { "name": "flowcatchR", "version": "1.38.0", "sha256": "0g9jza9gs526ch5sa9m91yrmf6n8l73052n41r2zvdwamzh9a6r9", - "depends": ["abind", "BiocParallel", "colorRamps", "EBImage", "plotly", "shiny"] + "depends": ["BiocParallel", "EBImage", "abind", "colorRamps", "plotly", "shiny"] }, "fmcsR": { "name": "fmcsR", @@ -8629,7 +8659,7 @@ "name": "fobitools", "version": "1.12.0", "sha256": "0n9zckl2zx7hcqz94xa32frra7v11y4gss1wdcdicj2sm40k9hgq", - "depends": ["clisymbols", "crayon", "dplyr", "fgsea", "ggplot2", "ggraph", "magrittr", "ontologyIndex", "purrr", "RecordLinkage", "stringr", "textclean", "tictoc", "tidygraph", "tidyr", "vroom"] + "depends": ["RecordLinkage", "clisymbols", "crayon", "dplyr", "fgsea", "ggplot2", "ggraph", "magrittr", "ontologyIndex", "purrr", "stringr", "textclean", "tictoc", "tidygraph", "tidyr", "vroom"] }, "frenchFISH": { "name": "frenchFISH", @@ -8641,13 +8671,13 @@ "name": "frma", "version": "1.56.0", "sha256": "0gg6hybrysqsd04dv3z7p1wx7zb35zk10f76c3yfhxg1wzv0f4wr", - "depends": ["affy", "Biobase", "BiocGenerics", "DBI", "MASS", "oligo", "oligoClasses", "preprocessCore"] + "depends": ["Biobase", "BiocGenerics", "DBI", "MASS", "affy", "oligo", "oligoClasses", "preprocessCore"] }, "frmaTools": { "name": "frmaTools", "version": "1.56.0", "sha256": "0ksnk253vvxrfql6wgbzmm64173fqv2lcls83iv4lgihix978x5x", - "depends": ["affy", "Biobase", "DBI", "preprocessCore"] + "depends": ["Biobase", "DBI", "affy", "preprocessCore"] }, "funtooNorm": { "name": "funtooNorm", @@ -8659,13 +8689,13 @@ "name": "gCrisprTools", "version": "2.10.0", "sha256": "1h7qx8j46sqhkrdln7mbw38w7p3n6c8sw1311kk2pady0bw14hqh", - "depends": ["Biobase", "ComplexHeatmap", "ggplot2", "limma", "rmarkdown", "RobustRankAggreg", "SummarizedExperiment"] + "depends": ["Biobase", "ComplexHeatmap", "RobustRankAggreg", "SummarizedExperiment", "ggplot2", "limma", "rmarkdown"] }, "gDNAx": { "name": "gDNAx", - "version": "1.2.0", - "sha256": "12pyiwhwlxskq17vwmdwh5g3zlzbd15mbrxjv1pliblbzjvxfpzx", - "depends": ["AnnotationDbi", "AnnotationHub", "BiocGenerics", "BiocParallel", "Biostrings", "bitops", "cli", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "IRanges", "matrixStats", "plotrix", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment"] + "version": "1.2.1", + "sha256": "1fr5kyy2jhn2qia9wqd505kp9w5ad6d7bxvi5073m6rw1b7x6231", + "depends": ["AnnotationDbi", "AnnotationHub", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "bitops", "cli", "matrixStats", "plotrix"] }, "gDR": { "name": "gDR", @@ -8677,13 +8707,13 @@ "name": "gDRcore", "version": "1.2.0", "sha256": "14hnmym7pzgfm4gmvq0dc0bym3kpr769fcdpspvqyzgq3b5swbva", - "depends": ["BiocParallel", "BumpyMatrix", "checkmate", "data_table", "futile_logger", "gDRutils", "MultiAssayExperiment", "purrr", "S4Vectors", "stringr", "SummarizedExperiment"] + "depends": ["BiocParallel", "BumpyMatrix", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "checkmate", "data_table", "futile_logger", "gDRutils", "purrr", "stringr"] }, "gDRimport": { "name": "gDRimport", "version": "1.2.0", "sha256": "1jfp3vgy2r0kmakn063bp1nrnwjfx2xxz0drkry5ghdmjig0g25y", - "depends": ["assertthat", "BumpyMatrix", "checkmate", "CoreGx", "data_table", "futile_logger", "gDRutils", "magrittr", "MultiAssayExperiment", "openxlsx", "PharmacoGx", "readxl", "rio", "S4Vectors", "stringi", "SummarizedExperiment", "tibble", "XML", "yaml"] + "depends": ["BumpyMatrix", "CoreGx", "MultiAssayExperiment", "PharmacoGx", "S4Vectors", "SummarizedExperiment", "XML", "assertthat", "checkmate", "data_table", "futile_logger", "gDRutils", "magrittr", "openxlsx", "readxl", "rio", "stringi", "tibble", "yaml"] }, "gDRstyle": { "name": "gDRstyle", @@ -8695,25 +8725,25 @@ "name": "gDRutils", "version": "1.2.0", "sha256": "0ql75k7aysf5kphjkajp2sshg953vx3nskg6qzhd8cc4lvldx9kq", - "depends": ["BiocParallel", "BumpyMatrix", "checkmate", "data_table", "drc", "jsonlite", "jsonvalidate", "MultiAssayExperiment", "S4Vectors", "stringr", "SummarizedExperiment"] + "depends": ["BiocParallel", "BumpyMatrix", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "checkmate", "data_table", "drc", "jsonlite", "jsonvalidate", "stringr"] }, "gINTomics": { "name": "gINTomics", "version": "1.0.0", "sha256": "0dscrxy846v5nv1fc0wfd5v7axwdhwpxhh0y9dwq25sdyfzknl8g", - "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "biomaRt", "callr", "circlize", "clusterProfiler", "ComplexHeatmap", "dplyr", "DT", "edgeR", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggridges", "ggtree", "ggvenn", "gtools", "InteractiveComplexHeatmap", "limma", "MASS", "MultiAssayExperiment", "OmnipathR", "org_Hs_eg_db", "org_Mm_eg_db", "plotly", "plyr", "randomForest", "RColorBrewer", "ReactomePA", "reshape2", "shiny", "shiny_gosling", "shinydashboard", "stringi", "stringr", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg38_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "visNetwork"] + "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "ComplexHeatmap", "DT", "GenomicFeatures", "GenomicRanges", "InteractiveComplexHeatmap", "MASS", "MultiAssayExperiment", "OmnipathR", "RColorBrewer", "ReactomePA", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg38_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "biomaRt", "callr", "circlize", "clusterProfiler", "dplyr", "edgeR", "ggplot2", "ggridges", "ggtree", "ggvenn", "gtools", "limma", "org_Hs_eg_db", "org_Mm_eg_db", "plotly", "plyr", "randomForest", "reshape2", "shiny", "shiny_gosling", "shinydashboard", "stringi", "stringr", "visNetwork"] }, "gaga": { "name": "gaga", "version": "2.50.0", "sha256": "10qckg06yf44x1giisglw978l63c4p9bdlrfh8q0i7cb19zihbnf", - "depends": ["Biobase", "coda", "EBarrays", "mgcv"] + "depends": ["Biobase", "EBarrays", "coda", "mgcv"] }, "gage": { "name": "gage", "version": "2.54.0", "sha256": "0iwdv9y5x0na38arjqacz00s7plk7aqc1h2ynhlpbyl3nz0a0kyq", - "depends": ["AnnotationDbi", "GO_db", "graph", "KEGGREST"] + "depends": ["AnnotationDbi", "GO_db", "KEGGREST", "graph"] }, "garfield": { "name": "garfield", @@ -8725,13 +8755,13 @@ "name": "gatom", "version": "1.2.0", "sha256": "1cmhlhr2gkfgpgncr9dy3qq0q764vhr5c7zgpbnnvp5qg95y6n6g", - "depends": ["BioNet", "data_table", "GGally", "ggplot2", "htmltools", "htmlwidgets", "igraph", "intergraph", "network", "plyr", "pryr", "shinyCyJS", "sna", "XML"] + "depends": ["BioNet", "GGally", "XML", "data_table", "ggplot2", "htmltools", "htmlwidgets", "igraph", "intergraph", "network", "plyr", "pryr", "shinyCyJS", "sna"] }, "gcapc": { "name": "gcapc", "version": "1.28.0", "sha256": "0k6k73i1mv6pxkpy2mq3xr0rfpn8rqa5wj1hjx3r3dqpw4rv8izl", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "matrixStats", "Rsamtools", "S4Vectors"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "Rsamtools", "S4Vectors", "matrixStats"] }, "gcatest": { "name": "gcatest", @@ -8743,7 +8773,7 @@ "name": "gcrma", "version": "2.76.0", "sha256": "01b9b4v19yh42552awl21yyx9vhf9yh9r3l8849x4zwjpnf6anp3", - "depends": ["affy", "affyio", "Biobase", "BiocManager", "Biostrings", "XVector"] + "depends": ["Biobase", "BiocManager", "Biostrings", "XVector", "affy", "affyio"] }, "gdsfmt": { "name": "gdsfmt", @@ -8755,7 +8785,7 @@ "name": "geNetClassifier", "version": "1.44.0", "sha256": "0jfczma8sh9dza105v306xr371f8mndndm6kw3ydgqlxd8zk3a6l", - "depends": ["Biobase", "e1071", "EBarrays", "minet"] + "depends": ["Biobase", "EBarrays", "e1071", "minet"] }, "gemini": { "name": "gemini", @@ -8765,9 +8795,9 @@ }, "gemma_R": { "name": "gemma.R", - "version": "3.0.6", - "sha256": "0aprq1ac2npnbs8ic8lq2z1rp67gsff7450sg08gri40mcrn8xz5", - "depends": ["assertthat", "Biobase", "bit64", "data_table", "digest", "glue", "httr", "jsonlite", "lubridate", "magrittr", "memoise", "rappdirs", "rlang", "S4Vectors", "stringr", "SummarizedExperiment", "tibble", "tidyr"] + "version": "3.0.14", + "sha256": "1psiag87wbg7g0jjpd6hy1b4jcr8hx6hflqa5p0nnkw6zxp5cxkk", + "depends": ["Biobase", "R_utils", "S4Vectors", "SummarizedExperiment", "assertthat", "base64enc", "bit64", "data_table", "digest", "glue", "httr", "jsonlite", "lubridate", "magrittr", "memoise", "rappdirs", "rlang", "stringr", "tibble", "tidyr"] }, "genArise": { "name": "genArise", @@ -8803,19 +8833,19 @@ "name": "geneXtendeR", "version": "1.30.0", "sha256": "06rmxlahnf0xiwvyfl6h9727g8cm24zk6p27j5bb4vln4phb81x7", - "depends": ["AnnotationDbi", "BiocStyle", "data_table", "dplyr", "GO_db", "networkD3", "org_Rn_eg_db", "RColorBrewer", "rtracklayer", "SnowballC", "tm", "wordcloud"] + "depends": ["AnnotationDbi", "BiocStyle", "GO_db", "RColorBrewer", "SnowballC", "data_table", "dplyr", "networkD3", "org_Rn_eg_db", "rtracklayer", "tm", "wordcloud"] }, "genefilter": { "name": "genefilter", "version": "1.86.0", "sha256": "0jp7jvgzb1bs0p76j9k8lhgliipjnif6bng7hdn5wi744jb5fmpr", - "depends": ["annotate", "AnnotationDbi", "Biobase", "MatrixGenerics", "survival"] + "depends": ["AnnotationDbi", "Biobase", "MatrixGenerics", "annotate", "survival"] }, "genefu": { "name": "genefu", "version": "2.36.0", "sha256": "032xfs2vp0n0r3sz79fs0v8q28n2sqbnazfwkc3p9dwh4s7nqfwx", - "depends": ["AIMS", "amap", "biomaRt", "impute", "limma", "mclust", "survcomp"] + "depends": ["AIMS", "amap", "biomaRt", "iC10", "impute", "limma", "mclust", "survcomp"] }, "geneplast": { "name": "geneplast", @@ -8827,7 +8857,7 @@ "name": "geneplotter", "version": "1.82.0", "sha256": "19znr3vwp20x84jiwy0im7s6vd8a71yng8w2ji88ffzq0xdkyyjm", - "depends": ["annotate", "AnnotationDbi", "Biobase", "BiocGenerics", "lattice", "RColorBrewer"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "RColorBrewer", "annotate", "lattice"] }, "genoCN": { "name": "genoCN", @@ -8839,13 +8869,13 @@ "name": "genomation", "version": "1.36.0", "sha256": "1bfy46kka77q93s42hsbxpiynfkin5mh7cz3w592smw2dzkh01j4", - "depends": ["Biostrings", "BSgenome", "data_table", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "gridBase", "impute", "IRanges", "matrixStats", "plotrix", "plyr", "Rcpp", "readr", "reshape2", "Rsamtools", "rtracklayer", "S4Vectors", "seqPattern"] + "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rcpp", "Rsamtools", "S4Vectors", "data_table", "ggplot2", "gridBase", "impute", "matrixStats", "plotrix", "plyr", "readr", "reshape2", "rtracklayer", "seqPattern"] }, "genomeIntervals": { "name": "genomeIntervals", "version": "1.60.0", "sha256": "1gyp2aa335gljb4igwg8c92m4rwwxwsv49dlj341gqphbx8b1vbr", - "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "intervals", "IRanges", "S4Vectors"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "intervals"] }, "genomes": { "name": "genomes", @@ -8857,25 +8887,25 @@ "name": "genomicInstability", "version": "1.10.0", "sha256": "08clvnj3pfxr0y8n2bh55x7aqs8pa6kjy5w8si78r5k2ywwxxl5y", - "depends": ["checkmate", "mixtools", "SummarizedExperiment"] + "depends": ["SummarizedExperiment", "checkmate", "mixtools"] }, "gep2pep": { "name": "gep2pep", "version": "1.24.0", "sha256": "1i8m3k7l5ymx6c0d6hrl6c1yn2fjvvrrpsf08r64ksl750cvab87", - "depends": ["Biobase", "digest", "foreach", "GSEABase", "iterators", "repo", "rhdf5", "XML"] + "depends": ["Biobase", "GSEABase", "XML", "digest", "foreach", "iterators", "repo", "rhdf5"] }, "gespeR": { "name": "gespeR", "version": "1.36.0", "sha256": "1c7pimggz4px7455frmg4fjbajl9pnw1wdi480wf0hcjfakk1i9h", - "depends": ["Biobase", "biomaRt", "cellHTS2", "doParallel", "dplyr", "foreach", "ggplot2", "glmnet", "Matrix", "reshape2"] + "depends": ["Biobase", "Matrix", "biomaRt", "cellHTS2", "doParallel", "dplyr", "foreach", "ggplot2", "glmnet", "reshape2"] }, "getDEE2": { "name": "getDEE2", "version": "1.14.0", "sha256": "1hkxyic2pjpxj5mbdf2lmkk7jm8ycmcjwychhy62qlvvcg58cd21", - "depends": ["htm2txt", "SummarizedExperiment"] + "depends": ["SummarizedExperiment", "htm2txt"] }, "geva": { "name": "geva", @@ -8893,43 +8923,43 @@ "name": "ggbio", "version": "1.52.0", "sha256": "0g6h1h8azy79pzm0g8967f58gp33nl8866b285ybq6501nj8pb1p", - "depends": ["AnnotationDbi", "AnnotationFilter", "Biobase", "BiocGenerics", "Biostrings", "biovizBase", "BSgenome", "ensembldb", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "GGally", "ggplot2", "gridExtra", "gtable", "Hmisc", "IRanges", "OrganismDbi", "reshape2", "rlang", "Rsamtools", "rtracklayer", "S4Vectors", "scales", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["AnnotationDbi", "AnnotationFilter", "BSgenome", "Biobase", "BiocGenerics", "Biostrings", "GGally", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Hmisc", "IRanges", "OrganismDbi", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "biovizBase", "ensembldb", "ggplot2", "gridExtra", "gtable", "reshape2", "rlang", "rtracklayer", "scales"] }, "ggcyto": { "name": "ggcyto", "version": "1.32.0", "sha256": "0z4cfpylj2y3jcljzg15fpjnrhrpzgw49kcprq5sg4cxr96ia2rm", - "depends": ["data_table", "flowCore", "flowWorkspace", "ggplot2", "gridExtra", "hexbin", "ncdfFlow", "plyr", "RColorBrewer", "rlang", "scales"] + "depends": ["RColorBrewer", "data_table", "flowCore", "flowWorkspace", "ggplot2", "gridExtra", "hexbin", "ncdfFlow", "plyr", "rlang", "scales"] }, "ggkegg": { "name": "ggkegg", - "version": "1.2.0", - "sha256": "177hz7xfkfjzqb7v2c3jf94jqa0ckcmxb5w64jy25lci8bl1klaw", - "depends": ["AnnotationDbi", "BiocFileCache", "data_table", "dplyr", "GetoptLong", "ggplot2", "ggraph", "gtable", "igraph", "magick", "org_Hs_eg_db", "patchwork", "shadowtext", "stringr", "tibble", "tidygraph", "XML"] + "version": "1.2.2", + "sha256": "0j77l3bzddmkf45v66zvhypramhv9fprv4rxz5r6vkjhabgyjdfb", + "depends": ["AnnotationDbi", "BiocFileCache", "GetoptLong", "XML", "data_table", "dplyr", "ggplot2", "ggraph", "gtable", "igraph", "magick", "org_Hs_eg_db", "patchwork", "shadowtext", "stringr", "tibble", "tidygraph"] }, "ggmanh": { "name": "ggmanh", "version": "1.8.0", "sha256": "0h7idg7s2s51gcd4fjbpad0kaq13xa5jxv34fwrw02285rl7zw7b", - "depends": ["gdsfmt", "ggplot2", "ggrepel", "RColorBrewer", "rlang", "scales", "SeqArray"] + "depends": ["RColorBrewer", "SeqArray", "gdsfmt", "ggplot2", "ggrepel", "rlang", "scales"] }, "ggmsa": { "name": "ggmsa", "version": "1.10.0", "sha256": "0pmy9aakp503aa3d9g96ajms153kphyr0shlnap5axxy6s99s2ak", - "depends": ["aplot", "Biostrings", "dplyr", "ggalt", "ggforce", "ggplot2", "ggtree", "magrittr", "R4RNA", "RColorBrewer", "seqmagick", "statebins", "tidyr"] + "depends": ["Biostrings", "R4RNA", "RColorBrewer", "aplot", "dplyr", "ggalt", "ggforce", "ggplot2", "ggtree", "magrittr", "seqmagick", "statebins", "tidyr"] }, "ggsc": { "name": "ggsc", "version": "1.2.0", "sha256": "1869xwlc4hqyzankrx3m7jara9am86pc8cw5lfdqfvf2ndp6ijdv", - "depends": ["cli", "dplyr", "ggfun", "ggplot2", "RColorBrewer", "Rcpp", "RcppArmadillo", "RcppParallel", "rlang", "scales", "scattermore", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "tibble", "tidydr", "tidyr", "yulab_utils"] + "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "RcppParallel", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "cli", "dplyr", "ggfun", "ggplot2", "rlang", "scales", "scattermore", "tibble", "tidydr", "tidyr", "yulab_utils"] }, "ggspavis": { "name": "ggspavis", "version": "1.10.0", "sha256": "0acbsbqnkl1xw9i3pgz1bibgzyvv52jzmyvnmggn5ag92ldd459c", - "depends": ["ggplot2", "ggrepel", "ggside", "RColorBrewer", "scales", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment"] + "depends": ["RColorBrewer", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "ggplot2", "ggrepel", "ggside", "scales"] }, "ggtree": { "name": "ggtree", @@ -8953,31 +8983,31 @@ "name": "ggtreeSpace", "version": "1.0.0", "sha256": "0ny22m469mnr70ipwy6brch1g5vklk5i0qkbgbpwrsdvi6vkibsr", - "depends": ["ape", "dplyr", "GGally", "ggplot2", "ggtree", "interp", "phytools", "rlang", "tibble", "tidyr", "tidyselect"] + "depends": ["GGally", "ape", "dplyr", "ggplot2", "ggtree", "interp", "phytools", "rlang", "tibble", "tidyr", "tidyselect"] }, "ginmappeR": { "name": "ginmappeR", - "version": "1.0.0", - "sha256": "1xq49lsfw7zri66nxn1z8s2w9ylhl3s07lwm7vqq6xjgfwfd8jn2", - "depends": ["cachem", "httr", "KEGGREST", "memoise", "rentrez", "UniProt_ws", "XML"] + "version": "1.0.4", + "sha256": "0s13z3naarspmdp9v82xjxqqhxygcsvw5vq6l1lmhj070fg8b9nz", + "depends": ["KEGGREST", "UniProt_ws", "XML", "cachem", "httr", "jsonlite", "memoise", "rentrez", "rvest"] }, "girafe": { "name": "girafe", "version": "1.56.0", "sha256": "17ma5xfqzy19cigim0bqkqvwln3qji2f5x4qwb74i40j2lbqn9qi", - "depends": ["Biobase", "BiocGenerics", "Biostrings", "genomeIntervals", "intervals", "IRanges", "pwalign", "Rsamtools", "S4Vectors", "ShortRead"] + "depends": ["Biobase", "BiocGenerics", "Biostrings", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "genomeIntervals", "intervals", "pwalign"] }, "glmGamPoi": { "name": "glmGamPoi", "version": "1.16.0", "sha256": "1my8v0zx5xsxjf8dj2yw92b8zp725hxhb2vrl5ccgz2w9xkn0dkj", - "depends": ["beachmat", "BiocGenerics", "DelayedArray", "DelayedMatrixStats", "HDF5Array", "MatrixGenerics", "matrixStats", "Rcpp", "RcppArmadillo", "rlang", "SingleCellExperiment", "SummarizedExperiment", "vctrs"] + "depends": ["BiocGenerics", "DelayedArray", "DelayedMatrixStats", "HDF5Array", "MatrixGenerics", "Rcpp", "RcppArmadillo", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "matrixStats", "rlang", "vctrs"] }, "glmSparseNet": { "name": "glmSparseNet", "version": "1.22.0", "sha256": "1yyl2i3f5s1l5q17471zwlj9cksbsnkv227qdlsgvzl0i9sh4m2h", - "depends": ["biomaRt", "checkmate", "dplyr", "forcats", "futile_logger", "ggplot2", "glmnet", "glue", "httr", "lifecycle", "Matrix", "MultiAssayExperiment", "readr", "rlang", "SummarizedExperiment", "survminer", "TCGAutils"] + "depends": ["Matrix", "MultiAssayExperiment", "SummarizedExperiment", "TCGAutils", "biomaRt", "checkmate", "dplyr", "forcats", "futile_logger", "ggplot2", "glmnet", "glue", "httr", "lifecycle", "readr", "rlang", "survminer"] }, "globalSeq": { "name": "globalSeq", @@ -8989,19 +9019,19 @@ "name": "globaltest", "version": "5.58.0", "sha256": "1cpvs1jcp9ibis06pkbqvhhksy6cis0zynx774d0hqdbb9ljl945", - "depends": ["annotate", "AnnotationDbi", "Biobase", "survival"] + "depends": ["AnnotationDbi", "Biobase", "annotate", "survival"] }, "gmapR": { "name": "gmapR", "version": "1.46.0", "sha256": "0zmn3gj5aamrkx0pa15fd2n2l7i0z8fkr4i2b9i50qgp7b46yv03", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "rtracklayer", "S4Vectors", "VariantAnnotation"] + "depends": ["BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "VariantAnnotation", "rtracklayer"] }, "gmoviz": { "name": "gmoviz", "version": "1.16.0", "sha256": "01znh8vfhqyls6f1y0zl3hnp67j4q6gzf6fjv3dx214ks6h3vk47", - "depends": ["BiocGenerics", "Biostrings", "circlize", "colorspace", "ComplexHeatmap", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "gridBase", "IRanges", "pracma", "Rsamtools", "rtracklayer", "S4Vectors"] + "depends": ["BiocGenerics", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "circlize", "colorspace", "gridBase", "pracma", "rtracklayer"] }, "goProfiles": { "name": "goProfiles", @@ -9013,13 +9043,13 @@ "name": "goSTAG", "version": "1.28.0", "sha256": "195vdjaxq8xwyz5ib9csk0a1fw6l9pzkpji78l3pbh9p5clw5592", - "depends": ["AnnotationDbi", "biomaRt", "GO_db", "memoise"] + "depends": ["AnnotationDbi", "GO_db", "biomaRt", "memoise"] }, "goSorensen": { "name": "goSorensen", "version": "1.6.0", "sha256": "1n0i9xmdxnh52lg60klblgi6bzfa910p4ajavir725p84hbqxdjh", - "depends": ["clusterProfiler", "GO_db", "goProfiles", "org_Hs_eg_db", "stringr"] + "depends": ["GO_db", "clusterProfiler", "goProfiles", "org_Hs_eg_db", "stringr"] }, "goTools": { "name": "goTools", @@ -9031,7 +9061,7 @@ "name": "goseq", "version": "1.56.0", "sha256": "0bc7dcpz0agbc42f8agf05amyhpavz55fdp622if5af5dn1ww6pr", - "depends": ["AnnotationDbi", "BiasedUrn", "BiocGenerics", "geneLenDataBase", "GO_db", "mgcv"] + "depends": ["AnnotationDbi", "BiasedUrn", "BiocGenerics", "GO_db", "geneLenDataBase", "mgcv"] }, "gpls": { "name": "gpls", @@ -9043,19 +9073,19 @@ "name": "gpuMagic", "version": "1.20.0", "sha256": "06ga6xkk95kgnzgy95kzysz8nim9v9aq2s6742hhknjndhy59n28", - "depends": ["BiocGenerics", "Deriv", "DescTools", "digest", "pryr", "Rcpp", "stringr"] + "depends": ["BiocGenerics", "Deriv", "DescTools", "Rcpp", "digest", "pryr", "stringr"] }, "granulator": { "name": "granulator", "version": "1.12.0", "sha256": "0757xhxn3156687nz8dksqqs0ifafrdwz0am532pw3xf5hirdz81", - "depends": ["cowplot", "dplyr", "dtangle", "e1071", "epiR", "ggplot2", "ggplotify", "limSolve", "magrittr", "MASS", "nnls", "pheatmap", "purrr", "rlang", "tibble", "tidyr"] + "depends": ["MASS", "cowplot", "dplyr", "dtangle", "e1071", "epiR", "ggplot2", "ggplotify", "limSolve", "magrittr", "nnls", "pheatmap", "purrr", "rlang", "tibble", "tidyr"] }, "graper": { "name": "graper", "version": "1.20.0", "sha256": "1hczvcv3kxzbxigbcxmsiwadxbwldipsv7slmsyznrkpwws4liwi", - "depends": ["BH", "cowplot", "ggplot2", "Matrix", "matrixStats", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "Matrix", "Rcpp", "RcppArmadillo", "cowplot", "ggplot2", "matrixStats"] }, "graph": { "name": "graph", @@ -9073,37 +9103,37 @@ "name": "groHMM", "version": "1.38.0", "sha256": "1vmck9ridjjk22477sv8wx0x7n5irrsaf6nsh9lm3krk4i3iv715", - "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "rtracklayer", "S4Vectors"] + "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "rtracklayer"] }, "gscreend": { "name": "gscreend", "version": "1.18.0", "sha256": "1y41rai3hhp290ga0ddcgs0jyri4aavcbyycs8z887h787sbihrn", - "depends": ["BiocParallel", "fGarch", "nloptr", "SummarizedExperiment"] + "depends": ["BiocParallel", "SummarizedExperiment", "fGarch", "nloptr"] }, "gsean": { "name": "gsean", "version": "1.24.0", "sha256": "14b4fg51j995af4i8lx84908jnlhw1y7j01871iy80s13d8nnz9b", - "depends": ["fgsea", "PPInfer"] + "depends": ["PPInfer", "fgsea"] }, "gtrellis": { "name": "gtrellis", "version": "1.36.0", "sha256": "1qlsjpjxcw96qhrqjlbbinpry9yagn50jc3dnz459dbfvnywr82q", - "depends": ["circlize", "GenomicRanges", "GetoptLong", "IRanges"] + "depends": ["GenomicRanges", "GetoptLong", "IRanges", "circlize"] }, "gwascat": { "name": "gwascat", "version": "2.36.0", "sha256": "08b70drlasws3h9d8iznaxxp0qf4n1fi943m4yngy1c65h3a30rc", - "depends": ["AnnotationDbi", "AnnotationHub", "BiocFileCache", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "readr", "S4Vectors", "snpStats", "VariantAnnotation"] + "depends": ["AnnotationDbi", "AnnotationHub", "BiocFileCache", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "VariantAnnotation", "readr", "snpStats"] }, "gwasurvivr": { "name": "gwasurvivr", "version": "1.22.0", "sha256": "0d9a9lrdpizh0bayq5yhqrssarbk90afn9s3cbkdxjrjgvlcair7", - "depends": ["GWASTools", "matrixStats", "SNPRelate", "SummarizedExperiment", "survival", "VariantAnnotation"] + "depends": ["GWASTools", "SNPRelate", "SummarizedExperiment", "VariantAnnotation", "matrixStats", "survival"] }, "gypsum": { "name": "gypsum", @@ -9115,7 +9145,7 @@ "name": "h5vc", "version": "2.38.0", "sha256": "0nv6x14adjwz7izsfyirnr13k9aa5kh34nqq9p4lawxa76d0bv4p", - "depends": ["abind", "BatchJobs", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gridExtra", "h5vcData", "IRanges", "reshape", "rhdf5", "Rhtslib", "Rsamtools", "S4Vectors"] + "depends": ["BatchJobs", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rhtslib", "Rsamtools", "S4Vectors", "abind", "ggplot2", "gridExtra", "h5vcData", "reshape", "rhdf5"] }, "hapFabia": { "name": "hapFabia", @@ -9127,37 +9157,43 @@ "name": "hca", "version": "1.12.0", "sha256": "143np5y93b3ik5lrjiz7hhwwp89hq8h9ygvprydwcvn6k530111r", - "depends": ["BiocFileCache", "digest", "dplyr", "DT", "httr", "jsonlite", "miniUI", "readr", "shiny", "tibble", "tidyr"] + "depends": ["BiocFileCache", "DT", "digest", "dplyr", "httr", "jsonlite", "miniUI", "readr", "shiny", "tibble", "tidyr"] + }, + "hdxmsqc": { + "name": "hdxmsqc", + "version": "1.0.1", + "sha256": "1ynjkwzfa84p2hg56nimbhfpw9ayah23lw8nb0mhkkqvb50nar19", + "depends": ["BiocStyle", "MsCoreUtils", "QFeatures", "S4Vectors", "Spectra", "dplyr", "ggplot2", "knitr", "tidyr"] }, "heatmaps": { "name": "heatmaps", "version": "1.28.0", "sha256": "0295lsiicwcdsnm1annyix7na6xipmvany8qpqwi4d87i5z2imhw", - "depends": ["BiocGenerics", "Biostrings", "EBImage", "GenomeInfoDb", "GenomicRanges", "IRanges", "KernSmooth", "Matrix", "plotrix", "RColorBrewer"] + "depends": ["BiocGenerics", "Biostrings", "EBImage", "GenomeInfoDb", "GenomicRanges", "IRanges", "KernSmooth", "Matrix", "RColorBrewer", "plotrix"] }, "hermes": { "name": "hermes", - "version": "1.8.0", - "sha256": "0acnxrbjdmjr73y12m4k62sazixpfp01790byrybg6l76j4y2akm", - "depends": ["assertthat", "Biobase", "BiocGenerics", "biomaRt", "checkmate", "circlize", "ComplexHeatmap", "DESeq2", "dplyr", "edgeR", "EnvStats", "forcats", "GenomicRanges", "ggfortify", "ggplot2", "ggrepel", "IRanges", "lifecycle", "limma", "magrittr", "matrixStats", "MultiAssayExperiment", "purrr", "R6", "Rdpack", "rlang", "S4Vectors", "SummarizedExperiment", "tidyr"] + "version": "1.8.1", + "sha256": "0mm9lvpgzbpcdbwks3ly7q4pl3w596jcin1c23mkvsj7gfh6r4nl", + "depends": ["Biobase", "BiocGenerics", "ComplexHeatmap", "DESeq2", "EnvStats", "GenomicRanges", "IRanges", "MultiAssayExperiment", "R6", "Rdpack", "S4Vectors", "SummarizedExperiment", "assertthat", "biomaRt", "checkmate", "circlize", "dplyr", "edgeR", "forcats", "ggfortify", "ggplot2", "ggrepel", "lifecycle", "limma", "magrittr", "matrixStats", "purrr", "rlang", "tidyr"] }, "hiAnnotator": { "name": "hiAnnotator", "version": "1.38.0", "sha256": "1mi15zpqbsf1x2bdagnd7mwspz7pdiq8v7s6a44zwxl0sas2qdmi", - "depends": ["BSgenome", "dplyr", "foreach", "GenomicRanges", "ggplot2", "iterators", "rtracklayer", "scales"] + "depends": ["BSgenome", "GenomicRanges", "dplyr", "foreach", "ggplot2", "iterators", "rtracklayer", "scales"] }, "hiReadsProcessor": { "name": "hiReadsProcessor", "version": "1.40.0", "sha256": "11hiz5ymjyjmsr78060602xi07lbjsq7gs4nh0pknjph2mzx9nqi", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "dplyr", "GenomicAlignments", "GenomicRanges", "hiAnnotator", "pwalign", "readxl", "sonicLength"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomicAlignments", "GenomicRanges", "dplyr", "hiAnnotator", "pwalign", "readxl", "sonicLength"] }, "hicVennDiagram": { "name": "hicVennDiagram", "version": "1.2.0", "sha256": "02ym5qiz38viddsrxmn3v6q791gwrc36hi505vcaar1fj2kblx2w", - "depends": ["ComplexUpset", "eulerr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "htmlwidgets", "InteractionSet", "IRanges", "reshape2", "rtracklayer", "S4Vectors", "svglite"] + "depends": ["ComplexUpset", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "S4Vectors", "eulerr", "ggplot2", "htmlwidgets", "reshape2", "rtracklayer", "svglite"] }, "hierGWAS": { "name": "hierGWAS", @@ -9175,7 +9211,7 @@ "name": "hipathia", "version": "3.4.0", "sha256": "140ihldl1m7b249d184f717w9pycrsrx13gzjhamjvpdrn96hra4", - "depends": ["AnnotationHub", "coin", "DelayedArray", "dplyr", "ggplot2", "ggpubr", "igraph", "limma", "matrixStats", "MetBrewer", "MultiAssayExperiment", "preprocessCore", "reshape2", "S4Vectors", "servr", "SummarizedExperiment", "tibble", "visNetwork"] + "depends": ["AnnotationHub", "DelayedArray", "MetBrewer", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "coin", "dplyr", "ggplot2", "ggpubr", "igraph", "limma", "matrixStats", "preprocessCore", "reshape2", "servr", "tibble", "visNetwork"] }, "hmdbQuery": { "name": "hmdbQuery", @@ -9187,7 +9223,7 @@ "name": "hoodscanR", "version": "1.2.0", "sha256": "1dqmj5nisrndkldsa2qhy50a2bckvvyf96hcya6yqcvz6hb3w7d0", - "depends": ["circlize", "ComplexHeatmap", "ggplot2", "knitr", "RANN", "Rcpp", "rlang", "rmarkdown", "scico", "SpatialExperiment", "SummarizedExperiment"] + "depends": ["ComplexHeatmap", "RANN", "Rcpp", "SpatialExperiment", "SummarizedExperiment", "circlize", "ggplot2", "knitr", "rlang", "rmarkdown", "scico"] }, "hopach": { "name": "hopach", @@ -9211,13 +9247,13 @@ "name": "hypeR", "version": "2.2.0", "sha256": "0qsz1fklbwlzlm6fk1xr27gv7ynvqgpzd3s8657pv79q2f7wkljf", - "depends": ["BiocStyle", "dplyr", "ggforce", "ggplot2", "htmltools", "httr", "igraph", "kableExtra", "magrittr", "msigdbr", "openxlsx", "purrr", "R6", "reactable", "reshape2", "rlang", "rmarkdown", "scales", "shiny", "stringr", "visNetwork"] + "depends": ["BiocStyle", "R6", "dplyr", "ggforce", "ggplot2", "htmltools", "httr", "igraph", "kableExtra", "magrittr", "msigdbr", "openxlsx", "purrr", "reactable", "reshape2", "rlang", "rmarkdown", "scales", "shiny", "stringr", "visNetwork"] }, "hyperdraw": { "name": "hyperdraw", "version": "1.56.0", "sha256": "104xwij9vq5gwq4ml7fnhsp4apcldbgxmhppwklg6zqdfixpmig5", - "depends": ["graph", "hypergraph", "Rgraphviz"] + "depends": ["Rgraphviz", "graph", "hypergraph"] }, "hypergraph": { "name": "hypergraph", @@ -9247,7 +9283,7 @@ "name": "iCARE", "version": "1.32.0", "sha256": "0m6cfcpviw1fxcg73zzjv1s8ynx47x2mfdpydsnkwfvc3r536xca", - "depends": ["gtools", "Hmisc", "plotrix"] + "depends": ["Hmisc", "gtools", "plotrix"] }, "iCNV": { "name": "iCNV", @@ -9259,13 +9295,13 @@ "name": "iCOBRA", "version": "1.32.0", "sha256": "1m3awsz8h3gbi82an73kbxcsch2gl737zaanckl1vq2ghymqykrp", - "depends": ["dplyr", "DT", "ggplot2", "limma", "markdown", "reshape2", "rlang", "ROCR", "scales", "shiny", "shinyBS", "shinydashboard", "UpSetR"] + "depends": ["DT", "ROCR", "UpSetR", "dplyr", "ggplot2", "limma", "markdown", "reshape2", "rlang", "scales", "shiny", "shinyBS", "shinydashboard"] }, "iCheck": { "name": "iCheck", "version": "1.34.0", "sha256": "1yz4f8cs8vna8rq3064md37mgidg4nzn2204zzbbpnwsx23mz1mc", - "depends": ["affy", "Biobase", "GeneSelectMMD", "gplots", "limma", "lmtest", "lumi", "MASS", "preprocessCore", "randomForest", "rgl", "scatterplot3d"] + "depends": ["Biobase", "GeneSelectMMD", "MASS", "affy", "gplots", "limma", "lmtest", "lumi", "preprocessCore", "randomForest", "rgl", "scatterplot3d"] }, "iChip": { "name": "iChip", @@ -9289,7 +9325,7 @@ "name": "iNETgrate", "version": "1.2.0", "sha256": "1lsj5lwwfr4h1n1nlgnbncrgsy4mzhj5lzygcb691fkvk84ki09p", - "depends": ["BiocStyle", "caret", "GenomicRanges", "glmnet", "gplots", "Homo_sapiens", "igraph", "matrixStats", "minfi", "Pigengene", "Rfast", "SummarizedExperiment", "survival", "tidyr", "tidyselect", "WGCNA"] + "depends": ["BiocStyle", "GenomicRanges", "Homo_sapiens", "Pigengene", "Rfast", "SummarizedExperiment", "WGCNA", "caret", "glmnet", "gplots", "igraph", "matrixStats", "minfi", "survival", "tidyr", "tidyselect"] }, "iPAC": { "name": "iPAC", @@ -9301,55 +9337,55 @@ "name": "iPath", "version": "1.10.0", "sha256": "0dh57yif0wcapr54ba9ln45s9s9m52rzfgapz429i40dqbbc518v", - "depends": ["BiocParallel", "ggplot2", "ggpubr", "matrixStats", "mclust", "Rcpp", "RcppArmadillo", "survival", "survminer"] + "depends": ["BiocParallel", "Rcpp", "RcppArmadillo", "ggplot2", "ggpubr", "matrixStats", "mclust", "survival", "survminer"] }, "iSEE": { "name": "iSEE", "version": "2.16.0", "sha256": "0rkk8n0hwmbqlnmjcdcljbsqqmbgw4x5cyjl5fndvzjs6xls4fal", - "depends": ["BiocGenerics", "circlize", "colourpicker", "ComplexHeatmap", "DT", "ggplot2", "ggrepel", "igraph", "listviewer", "mgcv", "rintrojs", "S4Vectors", "shiny", "shinyAce", "shinydashboard", "shinyjs", "shinyWidgets", "SingleCellExperiment", "SummarizedExperiment", "vipor", "viridisLite"] + "depends": ["BiocGenerics", "ComplexHeatmap", "DT", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "circlize", "colourpicker", "ggplot2", "ggrepel", "igraph", "listviewer", "mgcv", "rintrojs", "shiny", "shinyAce", "shinyWidgets", "shinydashboard", "shinyjs", "vipor", "viridisLite"] }, "iSEEde": { "name": "iSEEde", "version": "1.2.0", "sha256": "1fm7nav15kh2sn8lcgnywacsnv5z9mirv3vjvkk298141gdvnyiv", - "depends": ["DESeq2", "edgeR", "iSEE", "S4Vectors", "shiny", "SummarizedExperiment"] + "depends": ["DESeq2", "S4Vectors", "SummarizedExperiment", "edgeR", "iSEE", "shiny"] }, "iSEEfier": { "name": "iSEEfier", "version": "1.0.0", "sha256": "0qg64qp2b3c5l11xa1hb8whvshv9xdi27da2j447jxa81r42xgyh", - "depends": ["BiocBaseUtils", "ggplot2", "igraph", "iSEE", "iSEEu", "rlang", "SingleCellExperiment", "SummarizedExperiment", "visNetwork"] + "depends": ["BiocBaseUtils", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "iSEE", "iSEEu", "igraph", "rlang", "visNetwork"] }, "iSEEhex": { "name": "iSEEhex", "version": "1.6.0", "sha256": "0lwifv4bpb8hp0y5d2fphzclf3c223x015bc7jj92kmpzl0hg41h", - "depends": ["ggplot2", "hexbin", "iSEE", "shiny", "SummarizedExperiment"] + "depends": ["SummarizedExperiment", "ggplot2", "hexbin", "iSEE", "shiny"] }, "iSEEhub": { "name": "iSEEhub", "version": "1.6.0", "sha256": "0pwplhddy3nyszzbkjrv79kypc50pxr7jckfjdd0qy10v16314id", - "depends": ["AnnotationHub", "BiocManager", "DT", "ExperimentHub", "iSEE", "rintrojs", "S4Vectors", "shiny", "shinydashboard", "shinyjs", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["AnnotationHub", "BiocManager", "DT", "ExperimentHub", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "iSEE", "rintrojs", "shiny", "shinydashboard", "shinyjs"] }, "iSEEindex": { "name": "iSEEindex", "version": "1.2.0", "sha256": "0v8fww0rbldg6hdqyg9cfrsisahpwmc7q6pk156gz497av8gz250", - "depends": ["BiocFileCache", "DT", "iSEE", "paws_storage", "rintrojs", "shiny", "shinydashboard", "shinyjs", "SingleCellExperiment", "stringr", "SummarizedExperiment", "urltools"] + "depends": ["BiocFileCache", "DT", "SingleCellExperiment", "SummarizedExperiment", "iSEE", "paws_storage", "rintrojs", "shiny", "shinydashboard", "shinyjs", "stringr", "urltools"] }, "iSEEpathways": { "name": "iSEEpathways", "version": "1.2.0", "sha256": "168abrcfrrcnaz50lgkfqvap30xq63fjp61v365ar5zsh7qvys41", - "depends": ["ggplot2", "iSEE", "S4Vectors", "shiny", "shinyWidgets", "SummarizedExperiment"] + "depends": ["S4Vectors", "SummarizedExperiment", "ggplot2", "iSEE", "shiny", "shinyWidgets"] }, "iSEEu": { "name": "iSEEu", "version": "1.16.0", "sha256": "10l539zk0xha45h58j5y9sl0fmpr7vxy30n6xa54lbs3fs324jyv", - "depends": ["colourpicker", "DT", "ggplot2", "IRanges", "iSEE", "iSEEhex", "S4Vectors", "shiny", "shinyAce", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["DT", "IRanges", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "colourpicker", "ggplot2", "iSEE", "iSEEhex", "shiny", "shinyAce"] }, "iSeq": { "name": "iSeq", @@ -9361,7 +9397,7 @@ "name": "iasva", "version": "1.22.0", "sha256": "14p159ffi41lg56kjc2yafrxd8d0miqnavdnbspaal8l6r4qr10y", - "depends": ["BiocParallel", "cluster", "irlba", "SummarizedExperiment"] + "depends": ["BiocParallel", "SummarizedExperiment", "cluster", "irlba"] }, "ibh": { "name": "ibh", @@ -9373,19 +9409,19 @@ "name": "icetea", "version": "1.22.0", "sha256": "0l204ak1br5xhlmp21v4qxc5fzrpg74ylaac63dvvhpkhphl51iz", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "csaw", "DESeq2", "edgeR", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "limma", "Rsamtools", "rtracklayer", "S4Vectors", "ShortRead", "SummarizedExperiment", "TxDb_Dmelanogaster_UCSC_dm6_ensGene", "VariantAnnotation"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "DESeq2", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "TxDb_Dmelanogaster_UCSC_dm6_ensGene", "VariantAnnotation", "csaw", "edgeR", "ggplot2", "limma", "rtracklayer"] }, "ideal": { "name": "ideal", "version": "1.28.0", "sha256": "1fmqawzlg7dzhb6imsq9wjb3i4qr91f6aj4n4akpkrky7djdn3p2", - "depends": ["AnnotationDbi", "base64enc", "BiocParallel", "DESeq2", "dplyr", "DT", "GenomicRanges", "ggplot2", "ggrepel", "GO_db", "goseq", "GOstats", "gplots", "heatmaply", "IHW", "IRanges", "knitr", "limma", "pcaExplorer", "pheatmap", "plotly", "rentrez", "rintrojs", "rlang", "rmarkdown", "S4Vectors", "shiny", "shinyAce", "shinyBS", "shinydashboard", "stringr", "SummarizedExperiment", "topGO", "UpSetR"] + "depends": ["AnnotationDbi", "BiocParallel", "DESeq2", "DT", "GO_db", "GOstats", "GenomicRanges", "IHW", "IRanges", "S4Vectors", "SummarizedExperiment", "UpSetR", "base64enc", "dplyr", "ggplot2", "ggrepel", "goseq", "gplots", "heatmaply", "knitr", "limma", "pcaExplorer", "pheatmap", "plotly", "rentrez", "rintrojs", "rlang", "rmarkdown", "shiny", "shinyAce", "shinyBS", "shinydashboard", "stringr", "topGO"] }, "idiogram": { "name": "idiogram", "version": "1.80.0", "sha256": "0hhgxsc4lk2lpi7ih1z72n4ly8kh8pj9j3w79x7nn0jha5krjv48", - "depends": ["annotate", "Biobase", "plotrix"] + "depends": ["Biobase", "annotate", "plotrix"] }, "idpr": { "name": "idpr", @@ -9397,19 +9433,19 @@ "name": "idr2d", "version": "1.18.0", "sha256": "1c1x9nazmapdk820i3k2b4b956zy5ym333y2fjxg9nqfsvq153mn", - "depends": ["dplyr", "futile_logger", "GenomeInfoDb", "GenomicRanges", "ggplot2", "idr", "IRanges", "magrittr", "reticulate", "scales", "stringr"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "dplyr", "futile_logger", "ggplot2", "idr", "magrittr", "reticulate", "scales", "stringr"] }, "igvR": { "name": "igvR", "version": "1.24.0", "sha256": "0rkps3zj1zg8rksyrnp94xvasgrlvwnq4fqgkrhr8wn0jcqkpna1", - "depends": ["BiocGenerics", "BrowserViz", "GenomicAlignments", "GenomicRanges", "httpuv", "httr", "RColorBrewer", "rtracklayer", "VariantAnnotation"] + "depends": ["BiocGenerics", "BrowserViz", "GenomicAlignments", "GenomicRanges", "RColorBrewer", "VariantAnnotation", "httpuv", "httr", "rtracklayer"] }, "igvShiny": { "name": "igvShiny", - "version": "1.0.0", - "sha256": "0nb8cals6nw5l70yrnwq1pcfdc3m0w9ncsrdrd2zsm4ni2lpqjvx", - "depends": ["BiocGenerics", "checkmate", "futile_logger", "GenomeInfoDbData", "GenomicRanges", "htmlwidgets", "httr", "jsonlite", "randomcoloR", "RCurl", "shiny"] + "version": "1.0.1", + "sha256": "02n15bi9qxs5q1ripnvhjk4m9k9rwahi1dbwh4ym85aqjzxqpqks", + "depends": ["BiocGenerics", "GenomeInfoDbData", "GenomicRanges", "RCurl", "checkmate", "futile_logger", "htmlwidgets", "httr", "jsonlite", "randomcoloR", "shiny"] }, "illuminaio": { "name": "illuminaio", @@ -9421,7 +9457,7 @@ "name": "imcRtools", "version": "1.10.0", "sha256": "0wp5f0lrxi2f7kvdqqjl6gdhybcipppg3mr25r9zsfbaxf5d0160", - "depends": ["abind", "BiocNeighbors", "BiocParallel", "concaveman", "cytomapper", "data_table", "distances", "dplyr", "DT", "EBImage", "ggplot2", "ggraph", "igraph", "magrittr", "MatrixGenerics", "pheatmap", "readr", "rlang", "RTriangle", "S4Vectors", "scuttle", "sf", "SingleCellExperiment", "SpatialExperiment", "stringr", "SummarizedExperiment", "tidygraph", "tidyselect", "viridis", "vroom"] + "depends": ["BiocNeighbors", "BiocParallel", "DT", "EBImage", "MatrixGenerics", "RTriangle", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "abind", "concaveman", "cytomapper", "data_table", "distances", "dplyr", "ggplot2", "ggraph", "igraph", "magrittr", "pheatmap", "readr", "rlang", "scuttle", "sf", "stringr", "tidygraph", "tidyselect", "viridis", "vroom"] }, "immunoClust": { "name": "immunoClust", @@ -9445,7 +9481,7 @@ "name": "infercnv", "version": "1.20.0", "sha256": "1fi89fqzzb9n2c9jchkkgy3yq2fvisjcdavh9r455vmy0xqsyyyd", - "depends": ["ape", "argparse", "BiocGenerics", "caTools", "coda", "coin", "digest", "doParallel", "dplyr", "edgeR", "fastcluster", "fitdistrplus", "foreach", "futile_logger", "future", "ggplot2", "gplots", "gridExtra", "HiddenMarkov", "igraph", "Matrix", "parallelDist", "phyclust", "RANN", "RColorBrewer", "reshape2", "rjags", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "tidyr"] + "depends": ["BiocGenerics", "HiddenMarkov", "Matrix", "RANN", "RColorBrewer", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "ape", "argparse", "caTools", "coda", "coin", "digest", "doParallel", "dplyr", "edgeR", "fastcluster", "fitdistrplus", "foreach", "futile_logger", "future", "ggplot2", "gplots", "gridExtra", "igraph", "parallelDist", "phyclust", "reshape2", "rjags", "tidyr"] }, "infinityFlow": { "name": "infinityFlow", @@ -9457,19 +9493,19 @@ "name": "intansv", "version": "1.44.0", "sha256": "1njvcyk4gdk2bxvs6zbz7dypcbmfismxpv8afxn02i2lz3ykdyzd", - "depends": ["BiocGenerics", "GenomicRanges", "ggbio", "IRanges", "plyr"] + "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "ggbio", "plyr"] }, "interacCircos": { "name": "interacCircos", "version": "1.14.0", "sha256": "084136v9ghzgqgqv3k523416q2wl4qb6ix862fagjgwmkzdmr5s8", - "depends": ["htmlwidgets", "plyr", "RColorBrewer"] + "depends": ["RColorBrewer", "htmlwidgets", "plyr"] }, "interactiveDisplay": { "name": "interactiveDisplay", "version": "1.42.0", "sha256": "14k1j8bmpbrldx61fbvn20f7l2lc50bj9iy01a5jf0ddcbi27x5g", - "depends": ["AnnotationDbi", "BiocGenerics", "Category", "ggplot2", "gridSVG", "interactiveDisplayBase", "plyr", "RColorBrewer", "reshape2", "shiny", "XML"] + "depends": ["AnnotationDbi", "BiocGenerics", "Category", "RColorBrewer", "XML", "ggplot2", "gridSVG", "interactiveDisplayBase", "plyr", "reshape2", "shiny"] }, "interactiveDisplayBase": { "name": "interactiveDisplayBase", @@ -9481,7 +9517,7 @@ "name": "ipdDb", "version": "1.22.0", "sha256": "10pk87w4yd6kgsbg79ci6csmk3izpxc8kwhn5f0jywmjdci7k3nq", - "depends": ["AnnotationDbi", "AnnotationHub", "assertthat", "Biostrings", "DBI", "GenomicRanges", "IRanges", "RSQLite"] + "depends": ["AnnotationDbi", "AnnotationHub", "Biostrings", "DBI", "GenomicRanges", "IRanges", "RSQLite", "assertthat"] }, "isobar": { "name": "isobar", @@ -9493,13 +9529,13 @@ "name": "isomiRs", "version": "1.32.1", "sha256": "020ij0byr9pnzxp083yyjscn3iwv7yq7v2zsdalqs4bzn6z7mzq8", - "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "broom", "cluster", "cowplot", "DEGreport", "DESeq2", "dplyr", "GenomicRanges", "GGally", "ggplot2", "gplots", "gridExtra", "gtools", "IRanges", "limma", "RColorBrewer", "readr", "reshape", "rlang", "S4Vectors", "stringr", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DEGreport", "DESeq2", "GGally", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "broom", "cluster", "cowplot", "dplyr", "ggplot2", "gplots", "gridExtra", "gtools", "limma", "readr", "reshape", "rlang", "stringr", "tibble", "tidyr"] }, "iterativeBMA": { "name": "iterativeBMA", "version": "1.62.0", "sha256": "1h2nz7pfagd4ncm64b7zfqawp3gd88kvz8920wmk5s732490x522", - "depends": ["Biobase", "BMA", "leaps"] + "depends": ["BMA", "Biobase", "leaps"] }, "iterativeBMAsurv": { "name": "iterativeBMAsurv", @@ -9511,25 +9547,25 @@ "name": "ivygapSE", "version": "1.26.0", "sha256": "00i91a1r3xk7czcv5f7kxppgzjsvalxmzwyqj6mg5m3z4l77m17n", - "depends": ["ggplot2", "hwriter", "plotly", "S4Vectors", "shiny", "SummarizedExperiment", "survival", "survminer", "UpSetR"] + "depends": ["S4Vectors", "SummarizedExperiment", "UpSetR", "ggplot2", "hwriter", "plotly", "shiny", "survival", "survminer"] }, "karyoploteR": { "name": "karyoploteR", "version": "1.30.0", "sha256": "1g4pms5dcr4cdb47gr9kw3mc06v890b38zrsapd4x1cqhgfbgjyg", - "depends": ["AnnotationDbi", "bamsignals", "bezier", "biovizBase", "digest", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "memoise", "regioneR", "Rsamtools", "rtracklayer", "S4Vectors", "VariantAnnotation"] + "depends": ["AnnotationDbi", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "VariantAnnotation", "bamsignals", "bezier", "biovizBase", "digest", "memoise", "regioneR", "rtracklayer"] }, "katdetectr": { "name": "katdetectr", "version": "1.6.0", "sha256": "1hc3795f26cz1xml01zac83gmam15pvxd0pl2i9q4mardnkj9w7s", - "depends": ["Biobase", "BiocParallel", "BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "changepoint", "changepoint_np", "checkmate", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "ggtext", "IRanges", "maftools", "plyranges", "Rdpack", "rlang", "S4Vectors", "scales", "tibble", "tidyr", "VariantAnnotation"] + "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "Biobase", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rdpack", "S4Vectors", "VariantAnnotation", "changepoint", "changepoint_np", "checkmate", "dplyr", "ggplot2", "ggtext", "maftools", "plyranges", "rlang", "scales", "tibble", "tidyr"] }, "kebabs": { "name": "kebabs", "version": "1.38.0", "sha256": "0v4sgxvyhi3lzr3jw82w00ffdg0w55vi78ia9i805kqy77sq0677", - "depends": ["apcluster", "Biostrings", "e1071", "IRanges", "kernlab", "LiblineaR", "Matrix", "Rcpp", "S4Vectors", "XVector"] + "depends": ["Biostrings", "IRanges", "LiblineaR", "Matrix", "Rcpp", "S4Vectors", "XVector", "apcluster", "e1071", "kernlab"] }, "keggorthology": { "name": "keggorthology", @@ -9541,13 +9577,13 @@ "name": "kissDE", "version": "1.24.0", "sha256": "1700shil37hsij9h4q3zr2cq3wav9bpbm74d7spbyv0l1fnl8fx9", - "depends": ["ade4", "aods3", "Biobase", "DESeq2", "doParallel", "DSS", "DT", "factoextra", "foreach", "ggplot2", "gplots", "matrixStats", "shiny", "shinycssloaders"] + "depends": ["Biobase", "DESeq2", "DSS", "DT", "ade4", "aods3", "doParallel", "factoextra", "foreach", "ggplot2", "gplots", "matrixStats", "shiny", "shinycssloaders"] }, "knowYourCG": { "name": "knowYourCG", "version": "1.0.0", "sha256": "1nxg81p67d66bzy2fw6dsj02zh33pas02rai1prpsyjs7699bcqf", - "depends": ["dplyr", "GenomicRanges", "IRanges", "reshape2", "rlang", "S4Vectors", "sesameData", "stringr"] + "depends": ["GenomicRanges", "IRanges", "S4Vectors", "dplyr", "reshape2", "rlang", "sesameData", "stringr"] }, "lapmix": { "name": "lapmix", @@ -9559,61 +9595,61 @@ "name": "ldblock", "version": "1.34.0", "sha256": "1l4l35bpz4j1iliy9dj09qq8r4nimd9pcm0gm4g3sb4325z6cd5h", - "depends": ["BiocGenerics", "httr", "Matrix", "rlang"] + "depends": ["BiocGenerics", "Matrix", "httr", "rlang"] }, "lefser": { "name": "lefser", "version": "1.14.0", "sha256": "1qi4q3vijys4q1gfnflvvz8ws3j6f65rpprpgmrkqgiwfn7dvi6g", - "depends": ["coin", "dplyr", "ggplot2", "MASS", "S4Vectors", "SummarizedExperiment"] + "depends": ["MASS", "S4Vectors", "SummarizedExperiment", "coin", "dplyr", "ggplot2"] }, "lemur": { "name": "lemur", "version": "1.2.0", "sha256": "1hwnf8x9prqv96j66i5756510jviibbrchyizalhrlg8f427i5my", - "depends": ["BiocGenerics", "BiocNeighbors", "DelayedMatrixStats", "glmGamPoi", "harmony", "HDF5Array", "irlba", "limma", "Matrix", "MatrixGenerics", "matrixStats", "Rcpp", "RcppArmadillo", "rlang", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "vctrs"] + "depends": ["BiocGenerics", "BiocNeighbors", "DelayedMatrixStats", "HDF5Array", "Matrix", "MatrixGenerics", "Rcpp", "RcppArmadillo", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "glmGamPoi", "harmony", "irlba", "limma", "matrixStats", "rlang", "vctrs"] }, "les": { "name": "les", "version": "1.54.0", "sha256": "1dsdrdv06ab7rxpvmbgq1b6dhajjaw7zgvi9nshadm5gg28i60x3", - "depends": ["boot", "fdrtool", "gplots", "RColorBrewer"] + "depends": ["RColorBrewer", "boot", "fdrtool", "gplots"] }, "levi": { "name": "levi", "version": "1.22.0", "sha256": "0rknsfa5fbr4smxzj4p589sxxbypb2s1wvn33p9qj69mfcx7rmi3", - "depends": ["colorspace", "dplyr", "DT", "ggplot2", "httr", "igraph", "knitr", "RColorBrewer", "Rcpp", "reshape2", "rmarkdown", "shiny", "shinydashboard", "shinyjs", "testthat", "xml2"] + "depends": ["DT", "RColorBrewer", "Rcpp", "colorspace", "dplyr", "ggplot2", "httr", "igraph", "knitr", "reshape2", "rmarkdown", "shiny", "shinydashboard", "shinyjs", "testthat", "xml2"] }, "lfa": { "name": "lfa", "version": "2.4.0", "sha256": "1sbgr6h2kpfpzw3fkqd1075wrmbblb97pdywmvl8xv52vg0wqxz3", - "depends": ["corpcor", "RSpectra"] + "depends": ["RSpectra", "corpcor"] }, "limma": { "name": "limma", - "version": "3.60.2", - "sha256": "154fsg8vnks38f9phlbf15cpsf84p2gwygqgq4ayddfpxczzl159", + "version": "3.60.4", + "sha256": "123z062fc0qf43zplmw5svzpdmpgxagyl1gi1bxa34426s1hfv6m", "depends": ["statmod"] }, "limmaGUI": { "name": "limmaGUI", "version": "1.80.0", "sha256": "12ryq8l3jkxi5znzhb9bqp53sba7rk2fszsxp1dkwmyrdl12l4ns", - "depends": ["limma", "R2HTML", "tkrplot", "xtable"] + "depends": ["R2HTML", "limma", "tkrplot", "xtable"] }, "limpca": { "name": "limpca", "version": "1.0.0", "sha256": "1id38g2s7g0shcqz37i03zhhypilny8z2dwf74anj8yj4d1isdfr", - "depends": ["doParallel", "dplyr", "ggplot2", "ggrepel", "ggsci", "plyr", "reshape2", "S4Vectors", "stringr", "SummarizedExperiment", "tibble", "tidyr", "tidyverse"] + "depends": ["S4Vectors", "SummarizedExperiment", "doParallel", "dplyr", "ggplot2", "ggrepel", "ggsci", "plyr", "reshape2", "stringr", "tibble", "tidyr", "tidyverse"] }, "lineagespot": { "name": "lineagespot", "version": "1.8.0", "sha256": "0rjf4liq6lr6i3b2a0cn22qc1xisscsvn7zi11vq8wq0ym15pj6c", - "depends": ["data_table", "httr", "MatrixGenerics", "stringr", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["MatrixGenerics", "SummarizedExperiment", "VariantAnnotation", "data_table", "httr", "stringr"] }, "lionessR": { "name": "lionessR", @@ -9625,13 +9661,13 @@ "name": "lipidr", "version": "2.18.0", "sha256": "037xy9ci3h0913df5iy5xnciz26zr9frqfpk8krbx7qfzk4d0rk2", - "depends": ["data_table", "dplyr", "fgsea", "forcats", "ggplot2", "imputeLCMD", "limma", "magrittr", "rlang", "ropls", "S4Vectors", "SummarizedExperiment", "tidyr"] + "depends": ["S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "fgsea", "forcats", "ggplot2", "imputeLCMD", "limma", "magrittr", "rlang", "ropls", "tidyr"] }, "lisaClust": { "name": "lisaClust", - "version": "1.12.1", - "sha256": "1yagv5c398kk95c8gyny7ldhh7mpf1yrqp65ijk0xgx5xpl3kcfd", - "depends": ["BiocGenerics", "BiocParallel", "class", "concaveman", "data_table", "dplyr", "ggplot2", "pheatmap", "purrr", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "spatstat_explore", "spatstat_geom", "spatstat_random", "spicyR", "SummarizedExperiment", "tidyr"] + "version": "1.12.3", + "sha256": "19zb7h7k6yn2hjq204w49kz97r2fhflnw87b6qsmavhrpva6g9a1", + "depends": ["BiocGenerics", "BiocParallel", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "class", "concaveman", "data_table", "dplyr", "ggplot2", "pheatmap", "purrr", "spatstat_explore", "spatstat_geom", "spatstat_random", "spicyR", "tidyr"] }, "lmdme": { "name": "lmdme", @@ -9643,7 +9679,7 @@ "name": "loci2path", "version": "1.24.0", "sha256": "0igamscdyblh7ymj62qimwr48qfvpqld4ami0m3bnlzkkds6xm2n", - "depends": ["BiocParallel", "data_table", "GenomicRanges", "pheatmap", "RColorBrewer", "S4Vectors", "wordcloud"] + "depends": ["BiocParallel", "GenomicRanges", "RColorBrewer", "S4Vectors", "data_table", "pheatmap", "wordcloud"] }, "logicFS": { "name": "logicFS", @@ -9667,19 +9703,19 @@ "name": "lumi", "version": "2.56.0", "sha256": "04r7dw00yvjrxs0h6mwh79lwp55f5v8s4pgmzcy2fnpb2cdslpzy", - "depends": ["affy", "annotate", "AnnotationDbi", "Biobase", "DBI", "GenomicFeatures", "GenomicRanges", "KernSmooth", "lattice", "MASS", "methylumi", "mgcv", "nleqslv", "preprocessCore", "RSQLite"] + "depends": ["AnnotationDbi", "Biobase", "DBI", "GenomicFeatures", "GenomicRanges", "KernSmooth", "MASS", "RSQLite", "affy", "annotate", "lattice", "methylumi", "mgcv", "nleqslv", "preprocessCore"] }, "lute": { "name": "lute", "version": "1.0.0", "sha256": "02hqwxmqld3fkvs7c7l8hz39wksxgbcnckgvkzgpaknsb2fdmml0", - "depends": ["Biobase", "BiocGenerics", "dplyr", "ggplot2", "S4Vectors", "scran", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "scran"] }, "m6Aboost": { "name": "m6Aboost", "version": "1.10.0", "sha256": "141jrx1ngwb70pl769ablzvxcd4f4dfgzi0jdsmqgmhb3kb3qvg2", - "depends": ["adabag", "Biostrings", "BSgenome", "dplyr", "ExperimentHub", "GenomicRanges", "IRanges", "rtracklayer", "S4Vectors"] + "depends": ["BSgenome", "Biostrings", "ExperimentHub", "GenomicRanges", "IRanges", "S4Vectors", "adabag", "dplyr", "rtracklayer"] }, "mBPCR": { "name": "mBPCR", @@ -9691,7 +9727,7 @@ "name": "mCSEA", "version": "1.24.0", "sha256": "11mx1250kvdmkriznzp0a05jvf9paizj7qsgq7wzlvgz9f6nfwyw", - "depends": ["biomaRt", "fgsea", "GenomicFeatures", "GenomicRanges", "ggplot2", "Gviz", "Homo_sapiens", "IRanges", "limma", "mCSEAdata", "S4Vectors", "SummarizedExperiment"] + "depends": ["GenomicFeatures", "GenomicRanges", "Gviz", "Homo_sapiens", "IRanges", "S4Vectors", "SummarizedExperiment", "biomaRt", "fgsea", "ggplot2", "limma", "mCSEAdata"] }, "maCorrPlot": { "name": "maCorrPlot", @@ -9703,7 +9739,7 @@ "name": "maPredictDSC", "version": "1.42.0", "sha256": "015zp1ijl4sjqvrnaf0fzwzynvwjgphxba4q29m821hyvq1rjmx4", - "depends": ["affy", "AnnotationDbi", "caret", "class", "e1071", "gcrma", "hgu133plus2_db", "limma", "LungCancerACvsSCCGEO", "MASS", "ROC", "ROCR"] + "depends": ["AnnotationDbi", "LungCancerACvsSCCGEO", "MASS", "ROC", "ROCR", "affy", "caret", "class", "e1071", "gcrma", "hgu133plus2_db", "limma"] }, "maSigPro": { "name": "maSigPro", @@ -9715,19 +9751,19 @@ "name": "made4", "version": "1.78.0", "sha256": "0x96lhkz0fwp3qis8k2lllmi520b887bz26jcq3zlk1kjhbg91a8", - "depends": ["ade4", "Biobase", "gplots", "RColorBrewer", "scatterplot3d", "SummarizedExperiment"] + "depends": ["Biobase", "RColorBrewer", "SummarizedExperiment", "ade4", "gplots", "scatterplot3d"] }, "maftools": { "name": "maftools", "version": "2.20.0", "sha256": "0c2sf8l1wfgz3nh9ccm10y9wwh7rv55r09awavqlrr9glcbblp32", - "depends": ["data_table", "DNAcopy", "RColorBrewer", "Rhtslib", "survival", "zlibbioc"] + "depends": ["DNAcopy", "RColorBrewer", "Rhtslib", "data_table", "survival", "zlibbioc"] }, "magpie": { "name": "magpie", "version": "1.4.0", "sha256": "1m5xnbcyhglkg843fhfvynlinag8vv8sxg1ghzpwi0q9ki65kq9d", - "depends": ["AnnotationDbi", "aod", "BiocParallel", "DESeq2", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "matrixStats", "openxlsx", "RColorBrewer", "reshape2", "Rsamtools", "rtracklayer", "S4Vectors", "TRESS"] + "depends": ["AnnotationDbi", "BiocParallel", "DESeq2", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "RColorBrewer", "Rsamtools", "S4Vectors", "TRESS", "aod", "matrixStats", "openxlsx", "reshape2", "rtracklayer"] }, "magrene": { "name": "magrene", @@ -9739,7 +9775,7 @@ "name": "makecdfenv", "version": "1.80.0", "sha256": "0c1ks5f2rc0mwbfji6iicvypbmm46mq8yckmdpwiyp22l7l05aqz", - "depends": ["affy", "affyio", "Biobase", "zlibbioc"] + "depends": ["Biobase", "affy", "affyio", "zlibbioc"] }, "mapscape": { "name": "mapscape", @@ -9751,13 +9787,13 @@ "name": "mariner", "version": "1.4.0", "sha256": "1ndinmzzzpy154jmndnqf5xj3wz35jjijszg88ga4j19w2cxmnfp", - "depends": ["abind", "assertthat", "BiocGenerics", "BiocManager", "BiocParallel", "colourvalues", "data_table", "dbscan", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "glue", "HDF5Array", "InteractionSet", "IRanges", "magrittr", "plotgardener", "plyranges", "progress", "purrr", "RColorBrewer", "rhdf5", "rlang", "S4Vectors", "strawr", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocManager", "BiocParallel", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "InteractionSet", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "abind", "assertthat", "colourvalues", "data_table", "dbscan", "glue", "magrittr", "plotgardener", "plyranges", "progress", "purrr", "rhdf5", "rlang", "strawr"] }, "marr": { "name": "marr", "version": "1.14.0", "sha256": "1670fr6fcclrhgz6aqg0ph9iln0vjq3zgyp215na07ngwrzjw5nb", - "depends": ["dplyr", "ggplot2", "magrittr", "Rcpp", "rlang", "S4Vectors", "SummarizedExperiment"] + "depends": ["Rcpp", "S4Vectors", "SummarizedExperiment", "dplyr", "ggplot2", "magrittr", "rlang"] }, "marray": { "name": "marray", @@ -9769,13 +9805,13 @@ "name": "martini", "version": "1.24.0", "sha256": "07d1cyj2ms8mnglqzqs45gz32pdsqkfac00a118fahs1rw8j408f", - "depends": ["igraph", "Matrix", "memoise", "Rcpp", "RcppEigen", "snpStats"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "igraph", "memoise", "snpStats"] }, "maser": { "name": "maser", "version": "1.22.0", "sha256": "0w62dl65ysgcwixgmmb70qp6f85vhfnqjsww5snkjd48ypwx65ca", - "depends": ["BiocGenerics", "data_table", "dplyr", "DT", "GenomeInfoDb", "GenomicRanges", "ggplot2", "Gviz", "IRanges", "reshape2", "rtracklayer"] + "depends": ["BiocGenerics", "DT", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "data_table", "dplyr", "ggplot2", "reshape2", "rtracklayer"] }, "maskBAD": { "name": "maskBAD", @@ -9793,7 +9829,7 @@ "name": "mastR", "version": "1.4.0", "sha256": "1717hyil3x4c6jqv4zv6fwppwq1lc74kd8hg8z8yj8qqp92093f8", - "depends": ["AnnotationDbi", "Biobase", "dplyr", "edgeR", "ggplot2", "ggpubr", "GSEABase", "limma", "Matrix", "msigdb", "org_Hs_eg_db", "patchwork", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "tidyr"] + "depends": ["AnnotationDbi", "Biobase", "GSEABase", "Matrix", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "edgeR", "ggplot2", "ggpubr", "limma", "msigdb", "org_Hs_eg_db", "patchwork", "tidyr"] }, "matchBox": { "name": "matchBox", @@ -9803,21 +9839,21 @@ }, "matter": { "name": "matter", - "version": "2.6.2", - "sha256": "06ql73amrl5zy3ldm4ni3vwv65j1v9fy5s7a2pvwi31w4nwdly6h", - "depends": ["biglm", "BiocGenerics", "BiocParallel", "digest", "irlba", "Matrix", "ProtGenerics"] + "version": "2.6.3", + "sha256": "17903fjwxa77llwcf1r783ca3nh10l4lpxd2q65s1jnvk9sjcn65", + "depends": ["BiocGenerics", "BiocParallel", "Matrix", "ProtGenerics", "biglm", "digest", "irlba"] }, "mbQTL": { "name": "mbQTL", "version": "1.4.0", "sha256": "04ml4rv1hngr8lm9z9pcg7szb1cmla1m1vypwjk9bkkfy879ribf", - "depends": ["broom", "dplyr", "ggplot2", "MatrixEQTL", "metagenomeSeq", "pheatmap", "readxl", "stringr", "tidyr"] + "depends": ["MatrixEQTL", "broom", "dplyr", "ggplot2", "metagenomeSeq", "pheatmap", "readxl", "stringr", "tidyr"] }, "mbkmeans": { "name": "mbkmeans", "version": "1.20.0", "sha256": "0fnf6ymbcfchhlcbwpwlcq1jc3lfzh9f8mf76xfy7vrpwngds1fs", - "depends": ["beachmat", "benchmarkme", "BiocParallel", "ClusterR", "DelayedArray", "Matrix", "Rcpp", "RcppArmadillo", "Rhdf5lib", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocParallel", "ClusterR", "DelayedArray", "Matrix", "Rcpp", "RcppArmadillo", "Rhdf5lib", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "benchmarkme"] }, "mdp": { "name": "mdp", @@ -9829,37 +9865,37 @@ "name": "mdqc", "version": "1.66.0", "sha256": "1frn6s43j6sbwnb5h2hykccvi7cwbasp8l37rc3nkxpc6szvsby6", - "depends": ["cluster", "MASS"] + "depends": ["MASS", "cluster"] }, "megadepth": { "name": "megadepth", "version": "1.14.0", "sha256": "0394x1x81hgibvqb1dbrm8h3y72xfv9xi9fgqghjgnrw6farrkdk", - "depends": ["cmdfun", "dplyr", "fs", "GenomicRanges", "magrittr", "readr", "xfun"] + "depends": ["GenomicRanges", "cmdfun", "dplyr", "fs", "magrittr", "readr", "xfun"] }, "memes": { "name": "memes", "version": "1.12.0", "sha256": "03hrhydlgk57z9hzmwdgihlhsjyhhzw5vb5ql07ks169z15nix4h", - "depends": ["Biostrings", "cmdfun", "dplyr", "GenomicRanges", "ggplot2", "ggseqlogo", "magrittr", "matrixStats", "patchwork", "processx", "purrr", "readr", "rlang", "tibble", "tidyr", "universalmotif", "usethis", "xml2"] + "depends": ["Biostrings", "GenomicRanges", "cmdfun", "dplyr", "ggplot2", "ggseqlogo", "magrittr", "matrixStats", "patchwork", "processx", "purrr", "readr", "rlang", "tibble", "tidyr", "universalmotif", "usethis", "xml2"] }, "meshes": { "name": "meshes", "version": "1.30.0", "sha256": "0yc1drx7rbaxasj9p05hn4wa1nz0frymv7i9aw55ma59jjik8gi6", - "depends": ["AnnotationDbi", "AnnotationHub", "DOSE", "enrichplot", "GOSemSim", "MeSHDbi", "yulab_utils"] + "depends": ["AnnotationDbi", "AnnotationHub", "DOSE", "GOSemSim", "MeSHDbi", "enrichplot", "yulab_utils"] }, "meshr": { "name": "meshr", "version": "2.10.0", "sha256": "1cbxlypw937bafmzlz8v0g1bf16pmlqdc1jkisj8zmaj9xabbik9", - "depends": ["BiocGenerics", "BiocStyle", "Category", "fdrtool", "knitr", "markdown", "MeSHDbi", "rmarkdown", "RSQLite", "S4Vectors"] + "depends": ["BiocGenerics", "BiocStyle", "Category", "MeSHDbi", "RSQLite", "S4Vectors", "fdrtool", "knitr", "markdown", "rmarkdown"] }, "messina": { "name": "messina", "version": "1.40.0", "sha256": "0xcc5y4zqz0hn7bm0lgyb8dlnhhq5nz1pghq53lvdmgr5zcp8yqz", - "depends": ["foreach", "ggplot2", "plyr", "Rcpp", "survival"] + "depends": ["Rcpp", "foreach", "ggplot2", "plyr", "survival"] }, "metaCCA": { "name": "metaCCA", @@ -9883,7 +9919,7 @@ "name": "metabCombiner", "version": "1.14.0", "sha256": "0jp39qz7z3v7ndnxhc4lsjwf1mfhjq5nsg926s1x1i7w5x203fzd", - "depends": ["caret", "dplyr", "matrixStats", "mgcv", "rlang", "S4Vectors", "tidyr"] + "depends": ["S4Vectors", "caret", "dplyr", "matrixStats", "mgcv", "rlang", "tidyr"] }, "metabinR": { "name": "metabinR", @@ -9893,9 +9929,9 @@ }, "metabolomicsWorkbenchR": { "name": "metabolomicsWorkbenchR", - "version": "1.14.0", - "sha256": "0rsrla3gyh0fpx49kg0p5c02nskcl5rv7xmdnbgxk5d1kbzdsrcr", - "depends": ["data_table", "httr", "jsonlite", "MultiAssayExperiment", "struct", "SummarizedExperiment"] + "version": "1.14.2", + "sha256": "1aj3b9zpnvmb0h5bbmd7nsvfg50a834nwrgvqw6707ncyw1p7vgi", + "depends": ["MultiAssayExperiment", "SummarizedExperiment", "data_table", "httr", "jsonlite", "struct"] }, "metabomxtr": { "name": "metabomxtr", @@ -9907,13 +9943,13 @@ "name": "metagene2", "version": "1.20.0", "sha256": "1j5jl0xczj2g03k0lwq9h5snv4kpwqga836dkshnmf789gn2pzy3", - "depends": ["BiocParallel", "data_table", "dplyr", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "IRanges", "magrittr", "purrr", "R6", "reshape2", "Rsamtools", "rtracklayer"] + "depends": ["BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "R6", "Rsamtools", "data_table", "dplyr", "ggplot2", "magrittr", "purrr", "reshape2", "rtracklayer"] }, "metagenomeSeq": { "name": "metagenomeSeq", "version": "1.46.0", "sha256": "0bjbiwbgs0lv0j6gjv5rhqhmqk0p7f80lfig4n24i4bqwkd2j26k", - "depends": ["Biobase", "foreach", "glmnet", "gplots", "limma", "Matrix", "matrixStats", "RColorBrewer", "Wrench"] + "depends": ["Biobase", "Matrix", "RColorBrewer", "Wrench", "foreach", "glmnet", "gplots", "limma", "matrixStats"] }, "metahdep": { "name": "metahdep", @@ -9937,61 +9973,61 @@ "name": "metaseqR2", "version": "1.16.0", "sha256": "1rkaacb0jkfzhdd7q7v38by7wwmk4m4kfa01ky8yn2fady0sx3hm", - "depends": ["ABSSeq", "Biobase", "BiocGenerics", "BiocParallel", "biomaRt", "Biostrings", "corrplot", "DESeq2", "DSS", "DT", "EDASeq", "edgeR", "genefilter", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "gplots", "harmonicmeanp", "heatmaply", "htmltools", "httr", "IRanges", "jsonlite", "lattice", "limma", "locfit", "log4r", "magrittr", "MASS", "Matrix", "NBPSeq", "pander", "qvalue", "rmarkdown", "rmdformats", "Rsamtools", "RSQLite", "rtracklayer", "S4Vectors", "stringr", "SummarizedExperiment", "survcomp", "txdbmaker", "VennDiagram", "vsn", "yaml", "zoo"] + "depends": ["ABSSeq", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "DESeq2", "DSS", "DT", "EDASeq", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "Matrix", "NBPSeq", "RSQLite", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VennDiagram", "biomaRt", "corrplot", "edgeR", "genefilter", "gplots", "harmonicmeanp", "heatmaply", "htmltools", "httr", "jsonlite", "lattice", "limma", "locfit", "log4r", "magrittr", "pander", "qvalue", "rmarkdown", "rmdformats", "rtracklayer", "stringr", "survcomp", "txdbmaker", "vsn", "yaml", "zoo"] }, "methInheritSim": { "name": "methInheritSim", "version": "1.26.0", "sha256": "0c94sbqa0aiskrl8rxyiyj38a5n4vw1l2b51c2v0ryvjqk0zg93n", - "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "methylKit", "msm", "S4Vectors"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "methylKit", "msm"] }, "methimpute": { "name": "methimpute", "version": "1.26.0", "sha256": "1k9nasdfvrynvk2jsvxpbbp9zdqh516c41m654yfsdi5cl2y3jyd", - "depends": ["Biostrings", "data_table", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "minpack_lm", "Rcpp", "reshape2"] + "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rcpp", "data_table", "ggplot2", "minpack_lm", "reshape2"] }, "methodical": { "name": "methodical", "version": "1.0.0", "sha256": "13m75hf5dq36l20idp9alcikhhqa2qy5jwfnpkv2yp1ra6c9pq7j", - "depends": ["BiocParallel", "Biostrings", "BSgenome", "cowplot", "data_table", "DelayedArray", "dplyr", "ExperimentHub", "foreach", "GenomeInfoDb", "GenomicRanges", "ggplot2", "HDF5Array", "IRanges", "R_utils", "RcppRoll", "rhdf5", "rtracklayer", "S4Vectors", "scales", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["BSgenome", "BiocParallel", "Biostrings", "DelayedArray", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "R_utils", "RcppRoll", "S4Vectors", "SummarizedExperiment", "cowplot", "data_table", "dplyr", "foreach", "ggplot2", "rhdf5", "rtracklayer", "scales", "tibble", "tidyr"] }, "methrix": { "name": "methrix", "version": "1.18.0", "sha256": "0976y3aswyv7dk60ix9vvcvd6dgc0sy8qnakq3pdrl505znxsshi", - "depends": ["BSgenome", "data_table", "DelayedArray", "DelayedMatrixStats", "GenomicRanges", "ggplot2", "HDF5Array", "IRanges", "matrixStats", "rtracklayer", "S4Vectors", "SummarizedExperiment"] + "depends": ["BSgenome", "DelayedArray", "DelayedMatrixStats", "GenomicRanges", "HDF5Array", "IRanges", "S4Vectors", "SummarizedExperiment", "data_table", "ggplot2", "matrixStats", "rtracklayer"] }, "methyLImp2": { "name": "methyLImp2", "version": "1.0.0", "sha256": "1f86951l7gjqj48hxdm6ppc7bp84dm9fnlh0xhhl12fbdp2id94m", - "depends": ["BiocParallel", "ChAMPdata", "corpcor", "SummarizedExperiment"] + "depends": ["BiocParallel", "ChAMPdata", "SummarizedExperiment", "corpcor"] }, "methylCC": { "name": "methylCC", "version": "1.18.0", "sha256": "16i4yjx36pdbxf9vqnnr568lqcnql1pw3f5f1hlnq66kaai9hx34", - "depends": ["Biobase", "bsseq", "bumphunter", "dplyr", "FlowSorted_Blood_450k", "genefilter", "GenomicRanges", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "IRanges", "magrittr", "minfi", "plyranges", "quadprog", "S4Vectors"] + "depends": ["Biobase", "FlowSorted_Blood_450k", "GenomicRanges", "IRanges", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "S4Vectors", "bsseq", "bumphunter", "dplyr", "genefilter", "magrittr", "minfi", "plyranges", "quadprog"] }, "methylGSA": { "name": "methylGSA", "version": "1.22.0", "sha256": "0myii2c782my1lmqziaxdlrsfxgh194n58m1ydaqbxnhgkwvh10s", - "depends": ["AnnotationDbi", "BiocParallel", "clusterProfiler", "ggplot2", "GO_db", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "missMethyl", "org_Hs_eg_db", "reactome_db", "RobustRankAggreg", "shiny", "stringr"] + "depends": ["AnnotationDbi", "BiocParallel", "GO_db", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "RobustRankAggreg", "clusterProfiler", "ggplot2", "missMethyl", "org_Hs_eg_db", "reactome_db", "shiny", "stringr"] }, "methylInheritance": { "name": "methylInheritance", "version": "1.28.0", "sha256": "1pqd9ydgm071pa5lld1mn39yymkaghzx931ghlkshhh9dsrjqhg4", - "depends": ["BiocParallel", "GenomicRanges", "ggplot2", "gridExtra", "IRanges", "methylKit", "rebus", "S4Vectors"] + "depends": ["BiocParallel", "GenomicRanges", "IRanges", "S4Vectors", "ggplot2", "gridExtra", "methylKit", "rebus"] }, "methylKit": { "name": "methylKit", "version": "1.30.0", "sha256": "000dvi63cjikjbq3q83hlspd7y62rpswzg6hs5z1z1pj6a8rifdj", - "depends": ["data_table", "emdbook", "fastseg", "GenomeInfoDb", "GenomicRanges", "gtools", "IRanges", "KernSmooth", "limma", "mclust", "mgcv", "qvalue", "R_utils", "Rcpp", "Rhtslib", "Rsamtools", "rtracklayer", "S4Vectors", "zlibbioc"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "KernSmooth", "R_utils", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "data_table", "emdbook", "fastseg", "gtools", "limma", "mclust", "mgcv", "qvalue", "rtracklayer", "zlibbioc"] }, "methylMnM": { "name": "methylMnM", @@ -10003,37 +10039,37 @@ "name": "methylPipe", "version": "1.38.0", "sha256": "1v2qp5rp19d80aai8i5y32b62kynkkdkp3hqfvsk82ckwxvk2k60", - "depends": ["BiocGenerics", "Biostrings", "data_table", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "gplots", "Gviz", "IRanges", "marray", "Rsamtools", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "Gviz", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "data_table", "gplots", "marray"] }, "methylSig": { "name": "methylSig", "version": "1.16.0", "sha256": "03ghyx1xj2d06fj5kckrw810x92s8ndsq3wpj1kcjkf1v22vr0ln", - "depends": ["bsseq", "DelayedArray", "DelayedMatrixStats", "DSS", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"] + "depends": ["DSS", "DelayedArray", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "bsseq"] }, "methylclock": { "name": "methylclock", "version": "1.10.0", "sha256": "193ck7a501804424yqvg2c8zixzj56p3d8468sdisx577hhshhhm", - "depends": ["Biobase", "devtools", "dplyr", "dynamicTreeCut", "ExperimentHub", "ggplot2", "ggpmisc", "ggpubr", "gridExtra", "impute", "methylclockData", "minfi", "PerformanceAnalytics", "planet", "preprocessCore", "quadprog", "Rcpp", "RPMM", "tibble", "tidyr", "tidyverse"] + "depends": ["Biobase", "ExperimentHub", "PerformanceAnalytics", "RPMM", "Rcpp", "devtools", "dplyr", "dynamicTreeCut", "ggplot2", "ggpmisc", "ggpubr", "gridExtra", "impute", "methylclockData", "minfi", "planet", "preprocessCore", "quadprog", "tibble", "tidyr", "tidyverse"] }, "methylscaper": { "name": "methylscaper", "version": "1.12.0", "sha256": "19xpagmx9rn840acbm2cj3vkvhjzr1rslsjmjgvgcm4fip1yrskp", - "depends": ["BiocParallel", "Biostrings", "data_table", "pwalign", "Rfast", "seqinr", "seriation", "shiny", "shinyFiles", "shinyjs", "SummarizedExperiment"] + "depends": ["BiocParallel", "Biostrings", "Rfast", "SummarizedExperiment", "data_table", "pwalign", "seqinr", "seriation", "shiny", "shinyFiles", "shinyjs"] }, "methylumi": { "name": "methylumi", "version": "2.50.0", "sha256": "1ms3w43yvy810mr6dml9hqp3kw5jlpr9153kd62gvhjsgikaj3ja", - "depends": ["annotate", "AnnotationDbi", "Biobase", "BiocGenerics", "FDb_InfiniumMethylation_hg19", "genefilter", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "illuminaio", "IRanges", "lattice", "matrixStats", "minfi", "reshape2", "S4Vectors", "scales", "SummarizedExperiment"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "FDb_InfiniumMethylation_hg19", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "annotate", "genefilter", "ggplot2", "illuminaio", "lattice", "matrixStats", "minfi", "reshape2", "scales"] }, "mfa": { "name": "mfa", "version": "1.26.0", "sha256": "1vqmpxsl9dfq0h9cirip578crfnqxpabbwpzlglcm0qqwymh6ilr", - "depends": ["Biobase", "coda", "dplyr", "ggmcmc", "ggplot2", "magrittr", "MCMCglmm", "MCMCpack", "Rcpp", "tibble"] + "depends": ["Biobase", "MCMCglmm", "MCMCpack", "Rcpp", "coda", "dplyr", "ggmcmc", "ggplot2", "magrittr", "tibble"] }, "mgsa": { "name": "mgsa", @@ -10045,13 +10081,13 @@ "name": "miQC", "version": "1.12.0", "sha256": "04f7jza631y04mhy23yvipd88rywgpqw5jm9ff54hhfhmscdaczn", - "depends": ["flexmix", "ggplot2", "SingleCellExperiment"] + "depends": ["SingleCellExperiment", "flexmix", "ggplot2"] }, "miRLAB": { "name": "miRLAB", "version": "1.34.0", "sha256": "1r18s6d94csqqbkjis5dh5q4rbw1qvj61x8wmzw7jgyvrsyd5jqc", - "depends": ["Category", "ctc", "dplyr", "energy", "entropy", "glmnet", "GOstats", "gplots", "Hmisc", "httr", "impute", "InvariantCausalPrediction", "limma", "org_Hs_eg_db", "pcalg", "RCurl", "stringr", "SummarizedExperiment", "TCGAbiolinks"] + "depends": ["Category", "GOstats", "Hmisc", "InvariantCausalPrediction", "RCurl", "SummarizedExperiment", "TCGAbiolinks", "ctc", "dplyr", "energy", "entropy", "glmnet", "gplots", "httr", "impute", "limma", "org_Hs_eg_db", "pcalg", "stringr"] }, "miRNAmeConverter": { "name": "miRNAmeConverter", @@ -10069,13 +10105,13 @@ "name": "miRNAtap", "version": "1.38.0", "sha256": "07sff3h9hidw5xr11fx6n4ngajvsvbz4a1gkavd32wh6j8jccpyx", - "depends": ["AnnotationDbi", "DBI", "plyr", "RSQLite", "sqldf", "stringr"] + "depends": ["AnnotationDbi", "DBI", "RSQLite", "plyr", "sqldf", "stringr"] }, "miRSM": { "name": "miRSM", "version": "2.0.0", "sha256": "0wxwz00fsv8jf291zlfjim89vhsbqwlc9klq0szzl1p7msrs7vga", - "depends": ["BiBitR", "BicARE", "biclust", "Biobase", "clusterProfiler", "dbscan", "DOSE", "dynamicTreeCut", "energy", "fabia", "flashClust", "GFA", "GSEABase", "iBBiG", "igraph", "isa2", "linkcomm", "MatrixCorrelation", "MCL", "mclust", "NMF", "org_Hs_eg_db", "PMA", "ppclust", "Rcpp", "ReactomePA", "rqubic", "s4vd", "SOMbrero", "subspace", "SummarizedExperiment", "WGCNA"] + "depends": ["BiBitR", "BicARE", "Biobase", "DOSE", "GFA", "GSEABase", "MCL", "MatrixCorrelation", "NMF", "PMA", "Rcpp", "ReactomePA", "SOMbrero", "SummarizedExperiment", "WGCNA", "biclust", "clusterProfiler", "dbscan", "dynamicTreeCut", "energy", "fabia", "flashClust", "iBBiG", "igraph", "isa2", "linkcomm", "mclust", "org_Hs_eg_db", "ppclust", "rqubic", "s4vd", "subspace"] }, "miRcomp": { "name": "miRcomp", @@ -10083,23 +10119,29 @@ "sha256": "1gm8s0mprb5ybc1hb92w1z84qrj4vzfizd0ws4ppzj9k6fb12nn9", "depends": ["Biobase", "KernSmooth", "miRcompData"] }, + "miRspongeR": { + "name": "miRspongeR", + "version": "2.8.0", + "sha256": "0i7j33lwj5kw09dla7967f5z8zp8ls25db432m0ch2n8ialz0anc", + "depends": ["DOSE", "MCL", "Rcpp", "ReactomePA", "SPONGE", "clusterProfiler", "corpcor", "doParallel", "foreach", "igraph", "linkcomm", "org_Hs_eg_db", "survival"] + }, "mia": { "name": "mia", "version": "1.12.0", "sha256": "1wn2lb7hn4zqqcs2jwavpsbk5kw8d78kxg2yv4jjpikpdz7haa2i", - "depends": ["ape", "BiocGenerics", "BiocParallel", "Biostrings", "bluster", "DECIPHER", "decontam", "DelayedArray", "DelayedMatrixStats", "DirichletMultinomial", "dplyr", "IRanges", "MASS", "MatrixGenerics", "MultiAssayExperiment", "rlang", "S4Vectors", "scater", "scuttle", "SingleCellExperiment", "SummarizedExperiment", "tibble", "tidyr", "TreeSummarizedExperiment", "vegan"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "DECIPHER", "DelayedArray", "DelayedMatrixStats", "DirichletMultinomial", "IRanges", "MASS", "MatrixGenerics", "MultiAssayExperiment", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "ape", "bluster", "decontam", "dplyr", "rlang", "scater", "scuttle", "tibble", "tidyr", "vegan"] }, "miaSim": { "name": "miaSim", "version": "1.10.0", "sha256": "1grlkynbjkfndx8j44yd6sfr3yzy0fwmakjw4mg8flllqs9yqnmw", - "depends": ["deSolve", "MatrixGenerics", "poweRlaw", "S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment"] + "depends": ["MatrixGenerics", "S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment", "deSolve", "poweRlaw"] }, "miaViz": { "name": "miaViz", "version": "1.12.0", "sha256": "1dpvqvh9sg6visf4bbjd9x4wag2dzj2b5mylbxbqwcm8lic7gy03", - "depends": ["ape", "BiocGenerics", "BiocParallel", "DelayedArray", "DirichletMultinomial", "dplyr", "ggnewscale", "ggplot2", "ggraph", "ggrepel", "ggtree", "mia", "purrr", "rlang", "S4Vectors", "scater", "SingleCellExperiment", "SummarizedExperiment", "tibble", "tidygraph", "tidyr", "tidytree", "TreeSummarizedExperiment", "viridis"] + "depends": ["BiocGenerics", "BiocParallel", "DelayedArray", "DirichletMultinomial", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "ape", "dplyr", "ggnewscale", "ggplot2", "ggraph", "ggrepel", "ggtree", "mia", "purrr", "rlang", "scater", "tibble", "tidygraph", "tidyr", "tidytree", "viridis"] }, "microRNA": { "name": "microRNA", @@ -10111,55 +10153,55 @@ "name": "microSTASIS", "version": "1.4.0", "sha256": "1gf37nqcif6blpwrlq694gl78l2g1alx13wjdxay6qfg2iaf2dln", - "depends": ["BiocParallel", "ggplot2", "ggside", "rlang", "stringr", "TreeSummarizedExperiment"] + "depends": ["BiocParallel", "TreeSummarizedExperiment", "ggplot2", "ggside", "rlang", "stringr"] }, "microbiome": { "name": "microbiome", "version": "1.26.0", "sha256": "1azxfydcrxi46j6lykspzchwcj0dpghjia7vfb2bppz9gh8nvk37", - "depends": ["Biostrings", "compositions", "dplyr", "ggplot2", "phyloseq", "reshape2", "Rtsne", "scales", "tibble", "tidyr", "vegan"] + "depends": ["Biostrings", "Rtsne", "compositions", "dplyr", "ggplot2", "phyloseq", "reshape2", "scales", "tibble", "tidyr", "vegan"] }, "microbiomeDASim": { "name": "microbiomeDASim", "version": "1.18.0", "sha256": "123viwwyc4yjwkc1l7r9als4bvi2sb7yxmyfidqwamw8f2vwsfcz", - "depends": ["Biobase", "ggplot2", "MASS", "Matrix", "metagenomeSeq", "mvtnorm", "pbapply", "phyloseq", "tmvtnorm"] + "depends": ["Biobase", "MASS", "Matrix", "ggplot2", "metagenomeSeq", "mvtnorm", "pbapply", "phyloseq", "tmvtnorm"] }, "microbiomeExplorer": { "name": "microbiomeExplorer", "version": "1.14.0", "sha256": "0p15wp3n2v74rfsmap0331b3xkswfyaq8a4h2xrcn3v60m5qfmzq", - "depends": ["Biobase", "biomformat", "broom", "car", "DESeq2", "dplyr", "DT", "forcats", "heatmaply", "knitr", "limma", "lubridate", "magrittr", "matrixStats", "metagenomeSeq", "plotly", "purrr", "RColorBrewer", "readr", "reshape2", "rlang", "rmarkdown", "shiny", "shinycssloaders", "shinydashboard", "shinyjs", "shinyWidgets", "stringr", "tibble", "tidyr", "vegan"] + "depends": ["Biobase", "DESeq2", "DT", "RColorBrewer", "biomformat", "broom", "car", "dplyr", "forcats", "heatmaply", "knitr", "limma", "lubridate", "magrittr", "matrixStats", "metagenomeSeq", "plotly", "purrr", "readr", "reshape2", "rlang", "rmarkdown", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyjs", "stringr", "tibble", "tidyr", "vegan"] }, "microbiomeMarker": { "name": "microbiomeMarker", "version": "1.10.0", "sha256": "07w77cm7fjkqnc1rkj9dj6nashpkwbq43nwp6bsq5wp8k4y26gjn", - "depends": ["ALDEx2", "ANCOMBC", "Biobase", "BiocGenerics", "BiocParallel", "biomformat", "Biostrings", "caret", "coin", "ComplexHeatmap", "DESeq2", "dplyr", "edgeR", "ggplot2", "ggsignif", "ggtree", "IRanges", "limma", "magrittr", "MASS", "metagenomeSeq", "multtest", "patchwork", "phyloseq", "plotROC", "pROC", "purrr", "rlang", "S4Vectors", "tibble", "tidyr", "tidytree", "vegan", "yaml"] + "depends": ["ALDEx2", "ANCOMBC", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "ComplexHeatmap", "DESeq2", "IRanges", "MASS", "S4Vectors", "biomformat", "caret", "coin", "dplyr", "edgeR", "ggplot2", "ggsignif", "ggtree", "limma", "magrittr", "metagenomeSeq", "multtest", "pROC", "patchwork", "phyloseq", "plotROC", "purrr", "rlang", "tibble", "tidyr", "tidytree", "vegan", "yaml"] }, "midasHLA": { "name": "midasHLA", "version": "1.12.0", "sha256": "0d7zpv88mfs8bgym72ljbr0wammnppc5q0pcf5970z2zapxqmczy", - "depends": ["assertthat", "broom", "dplyr", "formattable", "HardyWeinberg", "kableExtra", "knitr", "magrittr", "MultiAssayExperiment", "qdapTools", "rlang", "S4Vectors", "stringi", "SummarizedExperiment", "tibble"] + "depends": ["HardyWeinberg", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "assertthat", "broom", "dplyr", "formattable", "kableExtra", "knitr", "magrittr", "qdapTools", "rlang", "stringi", "tibble"] }, "miloR": { "name": "miloR", "version": "2.0.0", "sha256": "1cb5iw90h6raflgmypd2wc8y4mbsv9g8alshh30k1kjm8vlsw92y", - "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "cowplot", "dplyr", "edgeR", "ggbeeswarm", "ggplot2", "ggraph", "ggrepel", "gtools", "igraph", "irlba", "limma", "Matrix", "MatrixGenerics", "matrixStats", "numDeriv", "patchwork", "RColorBrewer", "Rcpp", "RcppArmadillo", "S4Vectors", "SingleCellExperiment", "stringr", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "Matrix", "MatrixGenerics", "RColorBrewer", "Rcpp", "RcppArmadillo", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cowplot", "dplyr", "edgeR", "ggbeeswarm", "ggplot2", "ggraph", "ggrepel", "gtools", "igraph", "irlba", "limma", "matrixStats", "numDeriv", "patchwork", "stringr", "tibble", "tidyr"] }, "mimager": { "name": "mimager", "version": "1.28.0", "sha256": "0n535az50yvdvbjwy0rixy4lnlc0psb454xdzqp6rh718jh5yqrf", - "depends": ["affy", "affyPLM", "Biobase", "BiocGenerics", "DBI", "gtable", "oligo", "oligoClasses", "preprocessCore", "S4Vectors", "scales"] + "depends": ["Biobase", "BiocGenerics", "DBI", "S4Vectors", "affy", "affyPLM", "gtable", "oligo", "oligoClasses", "preprocessCore", "scales"] }, "mina": { "name": "mina", "version": "1.12.0", "sha256": "0fkc6cf267fcz7gqaf2grvd9dl1azvymsahszkb6w0rp289nbbn6", - "depends": ["apcluster", "biganalytics", "bigmemory", "foreach", "ggplot2", "Hmisc", "MCL", "parallelDist", "plyr", "Rcpp", "RcppArmadillo", "RcppParallel", "reshape2", "RSpectra", "stringr"] + "depends": ["Hmisc", "MCL", "RSpectra", "Rcpp", "RcppArmadillo", "RcppParallel", "apcluster", "biganalytics", "bigmemory", "foreach", "ggplot2", "parallelDist", "plyr", "reshape2", "stringr"] }, "minet": { "name": "minet", @@ -10171,127 +10213,127 @@ "name": "minfi", "version": "1.50.0", "sha256": "1hk44wddcygh4j7jmj1b0p40hf5qdy1m78x14j19h7z9aq4azdij", - "depends": ["beanplot", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "bumphunter", "data_table", "DelayedArray", "DelayedMatrixStats", "genefilter", "GenomeInfoDb", "GenomicRanges", "GEOquery", "HDF5Array", "illuminaio", "IRanges", "lattice", "limma", "MASS", "mclust", "nlme", "nor1mix", "preprocessCore", "quadprog", "RColorBrewer", "reshape", "S4Vectors", "siggenes", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "DelayedArray", "DelayedMatrixStats", "GEOquery", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "MASS", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "beanplot", "bumphunter", "data_table", "genefilter", "illuminaio", "lattice", "limma", "mclust", "nlme", "nor1mix", "preprocessCore", "quadprog", "reshape", "siggenes"] }, "mirIntegrator": { "name": "mirIntegrator", "version": "1.34.0", "sha256": "1saj71y2h3zczq16ypvmvy17z95klxawiifrlrxw3b61pnf7lpn0", - "depends": ["AnnotationDbi", "ggplot2", "graph", "org_Hs_eg_db", "Rgraphviz", "ROntoTools"] + "depends": ["AnnotationDbi", "ROntoTools", "Rgraphviz", "ggplot2", "graph", "org_Hs_eg_db"] }, "mirTarRnaSeq": { "name": "mirTarRnaSeq", "version": "1.12.0", "sha256": "1wn27pnmax2ay13a6mms6wrhskvqlwmg45jifbfhna1d5ly18rqh", - "depends": ["assertthat", "caTools", "corrplot", "data_table", "dplyr", "ggplot2", "MASS", "pheatmap", "pscl", "purrr", "R_utils", "reshape2", "viridis"] + "depends": ["MASS", "R_utils", "assertthat", "caTools", "corrplot", "data_table", "dplyr", "ggplot2", "pheatmap", "pscl", "purrr", "reshape2", "viridis"] }, "missMethyl": { "name": "missMethyl", "version": "1.38.0", "sha256": "0fnqa7v6lgld4pdqnvgdzly73aj4a4cn8sgszicxsyn1damxsjiw", - "depends": ["AnnotationDbi", "BiasedUrn", "Biobase", "BiocGenerics", "GenomicRanges", "GO_db", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "IlluminaHumanMethylationEPICmanifest", "IRanges", "limma", "methylumi", "minfi", "org_Hs_eg_db", "ruv", "S4Vectors", "statmod", "stringr", "SummarizedExperiment"] + "depends": ["AnnotationDbi", "BiasedUrn", "Biobase", "BiocGenerics", "GO_db", "GenomicRanges", "IRanges", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "IlluminaHumanMethylationEPICmanifest", "S4Vectors", "SummarizedExperiment", "limma", "methylumi", "minfi", "org_Hs_eg_db", "ruv", "statmod", "stringr"] }, "missRows": { "name": "missRows", "version": "1.24.0", "sha256": "0p51nnfxhz5lqxm4vbqhxczaa774g13sh65czj1kkrrzp1g65wm5", - "depends": ["ggplot2", "gtools", "MultiAssayExperiment", "plyr", "S4Vectors"] + "depends": ["MultiAssayExperiment", "S4Vectors", "ggplot2", "gtools", "plyr"] }, "mistyR": { "name": "mistyR", "version": "1.12.0", "sha256": "0w0ij222749pv89y0gq9c01cgsasw1lb3g0bx3sf6j62gdlf1gdp", - "depends": ["assertthat", "caret", "deldir", "digest", "distances", "dplyr", "filelock", "furrr", "ggplot2", "purrr", "R_utils", "ranger", "readr", "ridge", "rlang", "rlist", "stringr", "tibble", "tidyr", "tidyselect", "withr"] + "depends": ["R_utils", "assertthat", "caret", "deldir", "digest", "distances", "dplyr", "filelock", "furrr", "ggplot2", "purrr", "ranger", "readr", "ridge", "rlang", "rlist", "stringr", "tibble", "tidyr", "tidyselect", "withr"] }, "mitch": { "name": "mitch", "version": "1.16.0", "sha256": "1x65vxjbbd7vswv9lpa0fx5l1m629n0iayb54s3xhidn3xylizsb", - "depends": ["beeswarm", "echarts4r", "GGally", "ggplot2", "gplots", "gridExtra", "kableExtra", "knitr", "MASS", "plyr", "reshape2", "rmarkdown"] + "depends": ["GGally", "MASS", "beeswarm", "echarts4r", "ggplot2", "gplots", "gridExtra", "kableExtra", "knitr", "plyr", "reshape2", "rmarkdown"] }, "mitoClone2": { "name": "mitoClone2", "version": "1.10.0", "sha256": "1vmbyraranbfywk1mmr2arbzw8fsxkyqh5nkzd2w92vpahp7vn2d", - "depends": ["deepSNV", "GenomicRanges", "ggplot2", "pheatmap", "reshape2", "Rhtslib", "S4Vectors"] + "depends": ["GenomicRanges", "Rhtslib", "S4Vectors", "deepSNV", "ggplot2", "pheatmap", "reshape2"] }, "mixOmics": { "name": "mixOmics", "version": "6.28.0", "sha256": "03pdg2hz4wnyigqakb9098ak9ww8fhwypzn006hfad0s042p9wvj", - "depends": ["BiocParallel", "corpcor", "dplyr", "ellipse", "ggplot2", "ggrepel", "gridExtra", "igraph", "lattice", "MASS", "matrixStats", "rARPACK", "RColorBrewer", "reshape2", "tidyr"] + "depends": ["BiocParallel", "MASS", "RColorBrewer", "corpcor", "dplyr", "ellipse", "ggplot2", "ggrepel", "gridExtra", "igraph", "lattice", "matrixStats", "rARPACK", "reshape2", "tidyr"] }, "mnem": { "name": "mnem", "version": "1.20.0", "sha256": "0i93fnqpf8m90bkyvgzccj2x4phg9k1wb6k8fs04qsid0b9ksnpd", - "depends": ["cluster", "data_table", "e1071", "flexclust", "ggplot2", "graph", "lattice", "Linnorm", "matrixStats", "naturalsort", "Rcpp", "RcppEigen", "Rgraphviz", "snowfall", "tsne", "wesanderson"] + "depends": ["Linnorm", "Rcpp", "RcppEigen", "Rgraphviz", "cluster", "data_table", "e1071", "flexclust", "ggplot2", "graph", "lattice", "matrixStats", "naturalsort", "snowfall", "tsne", "wesanderson"] }, "moanin": { "name": "moanin", "version": "1.12.0", "sha256": "15agfggzbdgpx974yvixh8c8mv8wklg6zfzzr7ywpv2cixxazhwq", - "depends": ["ClusterR", "edgeR", "limma", "MASS", "matrixStats", "NMI", "reshape2", "S4Vectors", "SummarizedExperiment", "topGO", "viridis", "zoo"] + "depends": ["ClusterR", "MASS", "NMI", "S4Vectors", "SummarizedExperiment", "edgeR", "limma", "matrixStats", "reshape2", "topGO", "viridis", "zoo"] }, "mobileRNA": { "name": "mobileRNA", "version": "1.0.11", "sha256": "10p37qr8wz6chh44fh1nri2db5qqghbbzbpjm02safxdx7h88081", - "depends": ["BiocGenerics", "bioseq", "Biostrings", "data_table", "DESeq2", "dplyr", "edgeR", "GenomeInfoDb", "GenomicRanges", "ggplot2", "ggrepel", "IRanges", "pheatmap", "progress", "RColorBrewer", "reticulate", "rlang", "rtracklayer", "S4Vectors", "scales", "SimDesign", "SummarizedExperiment", "tidyr", "tidyselect"] + "depends": ["BiocGenerics", "Biostrings", "DESeq2", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "SimDesign", "SummarizedExperiment", "bioseq", "data_table", "dplyr", "edgeR", "ggplot2", "ggrepel", "pheatmap", "progress", "reticulate", "rlang", "rtracklayer", "scales", "tidyr", "tidyselect"] }, "mogsa": { "name": "mogsa", "version": "1.38.0", "sha256": "01hr97j5i20qwpck6nfr79wx31y7igz1wzr2m1zdivggb4jg94x7", - "depends": ["Biobase", "BiocGenerics", "cluster", "corpcor", "genefilter", "gplots", "graphite", "GSEABase", "svd"] + "depends": ["Biobase", "BiocGenerics", "GSEABase", "cluster", "corpcor", "genefilter", "gplots", "graphite", "svd"] }, "monaLisa": { "name": "monaLisa", - "version": "1.10.0", - "sha256": "0znan1yh35mxrjn6x5xz2g5pl0dhh0nklyx8rbsn09hn1khb8y5l", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "circlize", "ComplexHeatmap", "GenomeInfoDb", "GenomicRanges", "glmnet", "IRanges", "RSQLite", "S4Vectors", "stabs", "SummarizedExperiment", "TFBSTools", "vioplot", "XVector"] + "version": "1.10.1", + "sha256": "1pa7q4jr21yx4qf17bs7pjk21fjp4fdlij95gw9ffc5a98513m7b", + "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "SummarizedExperiment", "TFBSTools", "XVector", "circlize", "glmnet", "stabs", "vioplot"] }, "monocle": { "name": "monocle", "version": "2.32.0", "sha256": "0b09mf9fph0mb0zing0prc757d223858q9lj4j3kfpfjpd3jffai", - "depends": ["Biobase", "BiocGenerics", "biocViews", "cluster", "combinat", "DDRTree", "dplyr", "fastICA", "ggplot2", "HSMMSingleCell", "igraph", "irlba", "leidenbase", "limma", "MASS", "Matrix", "matrixStats", "pheatmap", "plyr", "proxy", "RANN", "Rcpp", "reshape2", "Rtsne", "slam", "stringr", "tibble", "VGAM", "viridis"] + "depends": ["Biobase", "BiocGenerics", "DDRTree", "HSMMSingleCell", "MASS", "Matrix", "RANN", "Rcpp", "Rtsne", "VGAM", "biocViews", "cluster", "combinat", "dplyr", "fastICA", "ggplot2", "igraph", "irlba", "leidenbase", "limma", "matrixStats", "pheatmap", "plyr", "proxy", "reshape2", "slam", "stringr", "tibble", "viridis"] }, "mosaics": { "name": "mosaics", "version": "2.42.0", "sha256": "000bwz1z8nwzgyaz69z6krr4ksggpsq48ni9rzl25m1bc27skldj", - "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "lattice", "MASS", "Rcpp", "Rsamtools", "S4Vectors"] + "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "Rcpp", "Rsamtools", "S4Vectors", "lattice"] }, "mosbi": { "name": "mosbi", "version": "1.10.0", "sha256": "0kvwsiwqvsphgjcflr1zjhp91k867bqg6x6gj72kl6x9an3rxpri", - "depends": ["akmbiclust", "BH", "biclust", "fabia", "igraph", "isa2", "QUBIC", "RColorBrewer", "Rcpp", "RcppParallel", "xml2"] + "depends": ["BH", "QUBIC", "RColorBrewer", "Rcpp", "RcppParallel", "akmbiclust", "biclust", "fabia", "igraph", "isa2", "xml2"] }, "mosdef": { "name": "mosdef", "version": "1.0.0", "sha256": "14zv9mgiqcj2s34hg8wfdij1gss324rkq42clg8f3ancambj74vp", - "depends": ["AnnotationDbi", "clusterProfiler", "DESeq2", "DT", "ggforce", "ggplot2", "ggrepel", "GO_db", "goseq", "htmltools", "RColorBrewer", "rlang", "S4Vectors", "scales", "SummarizedExperiment", "topGO"] + "depends": ["AnnotationDbi", "DESeq2", "DT", "GO_db", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "clusterProfiler", "ggforce", "ggplot2", "ggrepel", "goseq", "htmltools", "rlang", "scales", "topGO"] }, "motifStack": { "name": "motifStack", "version": "1.48.0", "sha256": "15v4z1a0kg4ic411aprzc9b7i2l6c456sfj3jaxy95anw3j3iskj", - "depends": ["ade4", "Biostrings", "ggplot2", "htmlwidgets", "TFBSTools", "XML"] + "depends": ["Biostrings", "TFBSTools", "XML", "ade4", "ggplot2", "htmlwidgets"] }, "motifTestR": { "name": "motifTestR", "version": "1.0.3", "sha256": "19m8y69cd1x79cqwgwf6360mv7kn0a2gv3lphy2i60p6vlq99s8j", - "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "ggplot2", "harmonicmeanp", "IRanges", "matrixStats", "patchwork", "rlang", "S4Vectors", "universalmotif"] + "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "ggplot2", "harmonicmeanp", "matrixStats", "patchwork", "rlang", "universalmotif"] }, "motifbreakR": { "name": "motifbreakR", "version": "2.18.0", "sha256": "1mxs83l8yrbcx353h0wpc0lczn1jc0y5vg59y9g9dabk41csib47", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "matrixStats", "MotifDb", "motifStack", "pwalign", "rtracklayer", "S4Vectors", "stringr", "SummarizedExperiment", "TFMPvalue", "VariantAnnotation"] + "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "MotifDb", "S4Vectors", "SummarizedExperiment", "TFMPvalue", "VariantAnnotation", "matrixStats", "motifStack", "pwalign", "rtracklayer", "stringr"] }, "motifcounter": { "name": "motifcounter", @@ -10303,61 +10345,61 @@ "name": "motifmatchr", "version": "1.26.0", "sha256": "1wpvdg5x51cbzpqa4s2s0zl9h7fsrsp87mxxlhxs65zx6yyfj2xl", - "depends": ["Biostrings", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "RcppArmadillo", "Rsamtools", "S4Vectors", "SummarizedExperiment", "TFBSTools"] + "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "RcppArmadillo", "Rsamtools", "S4Vectors", "SummarizedExperiment", "TFBSTools"] }, "mpra": { "name": "mpra", - "version": "1.26.0", - "sha256": "181v4ickndbng6bhvvzyn92kq61izjhx27hkbsryqgnf0xlx1c33", - "depends": ["BiocGenerics", "limma", "S4Vectors", "scales", "statmod", "SummarizedExperiment"] + "version": "1.26.2", + "sha256": "061pji88qrzclq7wyklba3492k133zzqsalx377n42fxrw0593z9", + "depends": ["BiocGenerics", "S4Vectors", "SummarizedExperiment", "limma", "scales", "statmod"] }, "msImpute": { "name": "msImpute", "version": "1.14.0", "sha256": "1qjkaa5ksd67izfw5jgg1l843jn6d7h0asp99sd340wbqcdfnyix", - "depends": ["data_table", "dplyr", "FNN", "limma", "matrixStats", "mvtnorm", "pdist", "reticulate", "scran", "softImpute", "tidyr"] + "depends": ["FNN", "data_table", "dplyr", "limma", "matrixStats", "mvtnorm", "pdist", "reticulate", "scran", "softImpute", "tidyr"] }, "msPurity": { "name": "msPurity", "version": "1.30.1", "sha256": "03h492l2x8isd1h4zmr5k6xykswimqfcxfgd67xpjjr0anrc8yl0", - "depends": ["DBI", "dbplyr", "doSNOW", "dplyr", "fastcluster", "foreach", "ggplot2", "magrittr", "mzR", "plyr", "Rcpp", "reshape2", "RSQLite", "stringr"] + "depends": ["DBI", "RSQLite", "Rcpp", "dbplyr", "doSNOW", "dplyr", "fastcluster", "foreach", "ggplot2", "magrittr", "mzR", "plyr", "reshape2", "stringr"] }, "msa": { "name": "msa", - "version": "1.36.0", - "sha256": "05i6pp10nn4icl51rx3b48s861hnd1yx72d933fphm6a5082zxms", + "version": "1.36.1", + "sha256": "16ixhinhcbf2nvdmqria231s4qhr8lzhr7yqr7ljrnnwiqadfr67", "depends": ["BiocGenerics", "Biostrings", "IRanges", "Rcpp", "S4Vectors"] }, "msgbsR": { "name": "msgbsR", "version": "1.28.0", "sha256": "06nbcb1nkci83kjl9l05d3vyfz4w21y0s51wg344bzjra1ycb9gl", - "depends": ["BSgenome", "easyRNASeq", "edgeR", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggbio", "ggplot2", "IRanges", "plyr", "R_utils", "Rsamtools", "S4Vectors", "SummarizedExperiment"] + "depends": ["BSgenome", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "R_utils", "Rsamtools", "S4Vectors", "SummarizedExperiment", "easyRNASeq", "edgeR", "ggbio", "ggplot2", "plyr"] }, "mslp": { "name": "mslp", "version": "1.6.0", "sha256": "0qafwb6rp0r0h5iazj13q703yvld5s1si93vn4gcxk66pgg9fm3w", - "depends": ["data_table", "doRNG", "fmsb", "foreach", "magrittr", "org_Hs_eg_db", "pROC", "randomForest", "RankProd"] + "depends": ["RankProd", "data_table", "doRNG", "fmsb", "foreach", "magrittr", "org_Hs_eg_db", "pROC", "randomForest"] }, "msmsEDA": { "name": "msmsEDA", "version": "1.42.0", "sha256": "1fzw36181rw7z62qggq7j22qhq8zrblpmv8qkqlfg140ywvwv08a", - "depends": ["gplots", "MASS", "MSnbase", "RColorBrewer"] + "depends": ["MASS", "MSnbase", "RColorBrewer", "gplots"] }, "msmsTests": { "name": "msmsTests", "version": "1.42.0", "sha256": "0fadwss9z4bfgkhrrqv322j8x40l5cl4ib85057h4fn03qdijqhq", - "depends": ["edgeR", "msmsEDA", "MSnbase", "qvalue"] + "depends": ["MSnbase", "edgeR", "msmsEDA", "qvalue"] }, "msqrob2": { "name": "msqrob2", "version": "1.12.0", "sha256": "1mg4a9mjvzj4y6jw5qpz53wg1h7z6a5l2b20ibp0wr67rns5xkix", - "depends": ["BiocParallel", "codetools", "limma", "lme4", "MASS", "Matrix", "MultiAssayExperiment", "purrr", "QFeatures", "SummarizedExperiment"] + "depends": ["BiocParallel", "MASS", "Matrix", "MultiAssayExperiment", "QFeatures", "SummarizedExperiment", "codetools", "limma", "lme4", "purrr"] }, "multiClust": { "name": "multiClust", @@ -10375,25 +10417,25 @@ "name": "multiHiCcompare", "version": "1.22.0", "sha256": "0h5b8yaqxy0gpm1kndv0dyz6pvacdy7vh3mbdkbz04q4ng1jnk12", - "depends": ["aggregation", "BiocParallel", "data_table", "dplyr", "edgeR", "GenomeInfoDb", "GenomeInfoDbData", "GenomicRanges", "HiCcompare", "pbapply", "pheatmap", "qqman"] + "depends": ["BiocParallel", "GenomeInfoDb", "GenomeInfoDbData", "GenomicRanges", "HiCcompare", "aggregation", "data_table", "dplyr", "edgeR", "pbapply", "pheatmap", "qqman"] }, "multiMiR": { "name": "multiMiR", "version": "1.26.0", "sha256": "0pzifw4b61v1wrfy6lsb5i4xxpmhl3g6sml09akfdy0skfx5lam8", - "depends": ["AnnotationDbi", "BiocGenerics", "dplyr", "purrr", "RCurl", "tibble", "XML"] + "depends": ["AnnotationDbi", "BiocGenerics", "RCurl", "XML", "dplyr", "purrr", "tibble"] }, "multiWGCNA": { "name": "multiWGCNA", "version": "1.2.0", "sha256": "1y2rwwy5q2ak861hg8nm5f13rmf2b9dmhsmjwvxc75nzdjg9yqcz", - "depends": ["cowplot", "data_table", "dcanr", "dplyr", "flashClust", "ggalluvial", "ggplot2", "ggrepel", "igraph", "patchwork", "readr", "reshape2", "scales", "stringr", "SummarizedExperiment", "WGCNA"] + "depends": ["SummarizedExperiment", "WGCNA", "cowplot", "data_table", "dcanr", "dplyr", "flashClust", "ggalluvial", "ggplot2", "ggrepel", "igraph", "patchwork", "readr", "reshape2", "scales", "stringr"] }, "multicrispr": { "name": "multicrispr", "version": "1.14.0", "sha256": "1625pqby6b0k67vn1h90j5899q5rhc815b64nywnvxlaia7hjvpm", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "CRISPRseek", "data_table", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "karyoploteR", "magrittr", "plyranges", "Rbowtie", "reticulate", "rtracklayer", "stringi", "tidyr", "tidyselect"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "CRISPRseek", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Rbowtie", "data_table", "ggplot2", "karyoploteR", "magrittr", "plyranges", "reticulate", "rtracklayer", "stringi", "tidyr", "tidyselect"] }, "multiscan": { "name": "multiscan", @@ -10405,7 +10447,7 @@ "name": "multistateQTL", "version": "1.0.0", "sha256": "1y983wj9awz29rv2fg8ryyindza8gjn54dn775p00zqs7qjnny3m", - "depends": ["circlize", "collapse", "ComplexHeatmap", "data_table", "dplyr", "fitdistrplus", "ggplot2", "mashr", "matrixStats", "QTLExperiment", "S4Vectors", "SummarizedExperiment", "tidyr", "viridis"] + "depends": ["ComplexHeatmap", "QTLExperiment", "S4Vectors", "SummarizedExperiment", "circlize", "collapse", "data_table", "dplyr", "fitdistrplus", "ggplot2", "mashr", "matrixStats", "tidyr", "viridis"] }, "multtest": { "name": "multtest", @@ -10417,13 +10459,13 @@ "name": "mumosa", "version": "1.12.0", "sha256": "1r3i19q5i2pfs8xaag4qcb64hxwkz49msbvv454n5cb2zp1nafvd", - "depends": ["batchelor", "beachmat", "BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "igraph", "IRanges", "Matrix", "metapod", "S4Vectors", "ScaledMatrix", "scran", "scuttle", "SingleCellExperiment", "SummarizedExperiment", "uwot"] + "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "IRanges", "Matrix", "S4Vectors", "ScaledMatrix", "SingleCellExperiment", "SummarizedExperiment", "batchelor", "beachmat", "igraph", "metapod", "scran", "scuttle", "uwot"] }, "muscat": { "name": "muscat", "version": "1.18.0", "sha256": "1gafcq3p693f28gz3p8hk8mlxd9zja95h8953sr56n7krfffy1gi", - "depends": ["BiocParallel", "blme", "ComplexHeatmap", "data_table", "DESeq2", "dplyr", "edgeR", "ggplot2", "glmmTMB", "limma", "lme4", "lmerTest", "Matrix", "matrixStats", "progress", "purrr", "S4Vectors", "scales", "scater", "sctransform", "scuttle", "SingleCellExperiment", "SummarizedExperiment", "variancePartition", "viridis"] + "depends": ["BiocParallel", "ComplexHeatmap", "DESeq2", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "blme", "data_table", "dplyr", "edgeR", "ggplot2", "glmmTMB", "limma", "lme4", "lmerTest", "matrixStats", "progress", "purrr", "scales", "scater", "sctransform", "scuttle", "variancePartition", "viridis"] }, "muscle": { "name": "muscle", @@ -10433,33 +10475,33 @@ }, "musicatk": { "name": "musicatk", - "version": "1.14.0", - "sha256": "1mp8c42pk5pl4ymvz0vjvgh0vq10kk67844vvspbhwpfdmsabr2b", - "depends": ["Biostrings", "BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "BSgenome_Mmusculus_UCSC_mm10", "BSgenome_Mmusculus_UCSC_mm9", "cluster", "ComplexHeatmap", "data_table", "decompTumor2Sig", "dplyr", "factoextra", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggpubr", "ggrepel", "gridExtra", "gtools", "IRanges", "maftools", "magrittr", "MASS", "Matrix", "matrixTests", "MCMCprecision", "NMF", "philentropy", "plotly", "rlang", "S4Vectors", "shiny", "stringi", "stringr", "SummarizedExperiment", "tibble", "tidyr", "tidyverse", "topicmodels", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "uwot", "VariantAnnotation"] + "version": "1.14.1", + "sha256": "1bz303lmxjvj24pb03mc64pv0595snhn6g99q3a40w73sqlxh14c", + "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "BSgenome_Mmusculus_UCSC_mm10", "BSgenome_Mmusculus_UCSC_mm9", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "MCMCprecision", "Matrix", "NMF", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "VariantAnnotation", "cluster", "data_table", "decompTumor2Sig", "dplyr", "factoextra", "ggplot2", "ggpubr", "ggrepel", "gridExtra", "gtools", "maftools", "magrittr", "matrixTests", "philentropy", "plotly", "rlang", "shiny", "stringi", "stringr", "tibble", "tidyr", "tidyverse", "topicmodels", "uwot"] }, "mygene": { "name": "mygene", "version": "1.40.0", "sha256": "0ybvabgdjm63yvvkpkldqddvdcfsncr25rnsw17kbdachar29shj", - "depends": ["GenomicFeatures", "Hmisc", "httr", "jsonlite", "plyr", "S4Vectors", "sqldf", "txdbmaker"] + "depends": ["GenomicFeatures", "Hmisc", "S4Vectors", "httr", "jsonlite", "plyr", "sqldf", "txdbmaker"] }, "myvariant": { "name": "myvariant", "version": "1.34.0", "sha256": "1f82x3vahbsccvyg5gvi34llanzscpvp0pbqhm1ki9frx9hqwysz", - "depends": ["GenomeInfoDb", "Hmisc", "httr", "jsonlite", "magrittr", "plyr", "S4Vectors", "VariantAnnotation"] + "depends": ["GenomeInfoDb", "Hmisc", "S4Vectors", "VariantAnnotation", "httr", "jsonlite", "magrittr", "plyr"] }, "mzID": { "name": "mzID", "version": "1.42.0", "sha256": "0kh9swzh3hvi6qi64cgr13f22s1mgvz2rid5psb1gy4l3biwadj5", - "depends": ["doParallel", "foreach", "iterators", "plyr", "ProtGenerics", "XML"] + "depends": ["ProtGenerics", "XML", "doParallel", "foreach", "iterators", "plyr"] }, "mzR": { "name": "mzR", "version": "2.38.0", "sha256": "02dz23xns9ryz98nip1w68h9q5ckxpyl1zvzklsp4j7p9z2400dk", - "depends": ["Biobase", "BiocGenerics", "ncdf4", "ProtGenerics", "Rcpp", "Rhdf5lib"] + "depends": ["Biobase", "BiocGenerics", "ProtGenerics", "Rcpp", "Rhdf5lib", "ncdf4"] }, "ncGTW": { "name": "ncGTW", @@ -10471,25 +10513,25 @@ "name": "ncRNAtools", "version": "1.14.0", "sha256": "151s12kg88x4nymzvpzwlfil7rvrbaa99agfxzz03r8dyjnqrqlq", - "depends": ["GenomicRanges", "ggplot2", "httr", "IRanges", "S4Vectors", "xml2"] + "depends": ["GenomicRanges", "IRanges", "S4Vectors", "ggplot2", "httr", "xml2"] }, "ncdfFlow": { "name": "ncdfFlow", "version": "2.50.0", "sha256": "1mbq3190nxlzhfb58i7s2f5f9fngda1icnihmyplagh64savlpcn", - "depends": ["BH", "Biobase", "BiocGenerics", "cpp11", "flowCore", "Rhdf5lib", "zlibbioc"] + "depends": ["BH", "Biobase", "BiocGenerics", "Rhdf5lib", "cpp11", "flowCore", "zlibbioc"] }, "ndexr": { "name": "ndexr", "version": "1.26.0", "sha256": "1jl7z4a1rdsivc774k15v3q40isgp1ly3lsmgflfkq7jsx62xl5j", - "depends": ["httr", "jsonlite", "plyr", "RCX", "tidyr"] + "depends": ["RCX", "httr", "jsonlite", "plyr", "tidyr"] }, "nearBynding": { "name": "nearBynding", "version": "1.14.0", "sha256": "0ni6mipdbwzc0gi8mws1d1b8ylj0pjlvi81kv9r3pm93psr67pj3", - "depends": ["BiocGenerics", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "gplots", "magrittr", "matrixStats", "plyranges", "R_utils", "rlang", "Rsamtools", "rtracklayer", "S4Vectors", "transport", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "R_utils", "Rsamtools", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "dplyr", "ggplot2", "gplots", "magrittr", "matrixStats", "plyranges", "rlang", "rtracklayer", "transport"] }, "nempi": { "name": "nempi", @@ -10501,55 +10543,55 @@ "name": "netDx", "version": "1.16.0", "sha256": "00ghcj5hzb06pi9aj2rdnasyqgqnvr9qjb0m6b0476yv2mx5x24k", - "depends": ["bigmemory", "BiocFileCache", "combinat", "doParallel", "foreach", "GenomeInfoDb", "GenomicRanges", "ggplot2", "glmnet", "httr", "igraph", "IRanges", "MultiAssayExperiment", "plotrix", "pracma", "rappdirs", "RColorBrewer", "reshape2", "ROCR", "Rtsne", "S4Vectors"] + "depends": ["BiocFileCache", "GenomeInfoDb", "GenomicRanges", "IRanges", "MultiAssayExperiment", "RColorBrewer", "ROCR", "Rtsne", "S4Vectors", "bigmemory", "combinat", "doParallel", "foreach", "ggplot2", "glmnet", "httr", "igraph", "plotrix", "pracma", "rappdirs", "reshape2"] }, "netSmooth": { "name": "netSmooth", "version": "1.24.0", "sha256": "0nry64lvqwwq672c6callfjfa0y14igvqpvrvfs2hm0qj8qmg2q8", - "depends": ["cluster", "clusterExperiment", "data_table", "DelayedArray", "entropy", "HDF5Array", "Matrix", "scater", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["DelayedArray", "HDF5Array", "Matrix", "SingleCellExperiment", "SummarizedExperiment", "cluster", "clusterExperiment", "data_table", "entropy", "scater"] }, "netZooR": { "name": "netZooR", "version": "1.8.0", "sha256": "0z1wi0csnpjz70q5pl5wmdfgqnq66yk9gysxxid8rmkagqxvbg73", - "depends": ["AnnotationDbi", "assertthat", "Biobase", "data_table", "doParallel", "dplyr", "foreach", "ggdendro", "ggplot2", "GO_db", "GOstats", "gplots", "igraph", "MASS", "Matrix", "matrixcalc", "matrixStats", "nnet", "org_Hs_eg_db", "pandaR", "penalized", "RCy3", "reshape", "reshape2", "reticulate", "STRINGdb", "tidyr", "vegan", "viridisLite", "yarn"] + "depends": ["AnnotationDbi", "Biobase", "GO_db", "GOstats", "MASS", "Matrix", "RCy3", "STRINGdb", "assertthat", "data_table", "doParallel", "dplyr", "foreach", "ggdendro", "ggplot2", "gplots", "igraph", "matrixStats", "matrixcalc", "nnet", "org_Hs_eg_db", "pandaR", "penalized", "reshape", "reshape2", "reticulate", "tidyr", "vegan", "viridisLite", "yarn"] }, "netboost": { "name": "netboost", "version": "2.12.0", "sha256": "0xirmys108qhxg7073vm90463a7qs6z557516ff1yczhldaq4psy", - "depends": ["BiocStyle", "colorspace", "dynamicTreeCut", "impute", "R_utils", "Rcpp", "RcppParallel", "WGCNA"] + "depends": ["BiocStyle", "R_utils", "Rcpp", "RcppParallel", "WGCNA", "colorspace", "dynamicTreeCut", "impute"] }, "nethet": { "name": "nethet", "version": "1.36.0", "sha256": "1mr42pdm2sjpbmiiwjpqd0pvbnc5imlgmg14swc2pp66dl60g7b3", - "depends": ["CompQuadForm", "GeneNet", "ggm", "ggplot2", "glasso", "glmnet", "GSA", "huge", "ICSNP", "limma", "mclust", "multtest", "mvtnorm", "network"] + "depends": ["CompQuadForm", "GSA", "GeneNet", "ICSNP", "ggm", "ggplot2", "glasso", "glmnet", "huge", "limma", "mclust", "multtest", "mvtnorm", "network"] }, "netprioR": { "name": "netprioR", "version": "1.30.0", "sha256": "0kgsgjc2q4wvdwbqfx79ql85k6xc60165zair7nwc89wn07rnswy", - "depends": ["doParallel", "dplyr", "foreach", "ggplot2", "gridExtra", "Matrix", "pROC", "sparseMVN"] + "depends": ["Matrix", "doParallel", "dplyr", "foreach", "ggplot2", "gridExtra", "pROC", "sparseMVN"] }, "netresponse": { "name": "netresponse", "version": "1.64.0", "sha256": "13lynfqsbv8cp6hd452bky4mkf029jwvryx8mzdcx15r4hwsqh5r", - "depends": ["BiocStyle", "ggplot2", "graph", "igraph", "mclust", "minet", "plyr", "qvalue", "RColorBrewer", "reshape2", "Rgraphviz", "rmarkdown"] + "depends": ["BiocStyle", "RColorBrewer", "Rgraphviz", "ggplot2", "graph", "igraph", "mclust", "minet", "plyr", "qvalue", "reshape2", "rmarkdown"] }, "ngsReports": { "name": "ngsReports", - "version": "2.6.0", - "sha256": "11k4fbwy6shkb3z9np7wnnhbjpka3ymm8ja8dnw1jpdc3l1jx537", + "version": "2.6.1", + "sha256": "13dmy1g822h8w9f2ylvs40zn810zxamy9jr7vncsbbk6cr87h9lg", "depends": ["BiocGenerics", "Biostrings", "checkmate", "dplyr", "forcats", "ggdendro", "ggplot2", "jsonlite", "lifecycle", "lubridate", "patchwork", "plotly", "reshape2", "rlang", "rmarkdown", "scales", "stringr", "tibble", "tidyr", "tidyselect", "zoo"] }, "nipalsMCIA": { "name": "nipalsMCIA", "version": "1.2.0", "sha256": "0r14hmglxlrwryc6qwn20vfrmy5k2pk7l73d3fz5bmfja06ms6n5", - "depends": ["ComplexHeatmap", "dplyr", "fgsea", "ggplot2", "MultiAssayExperiment", "pracma", "rlang", "RSpectra", "scales", "SummarizedExperiment"] + "depends": ["ComplexHeatmap", "MultiAssayExperiment", "RSpectra", "SummarizedExperiment", "dplyr", "fgsea", "ggplot2", "pracma", "rlang", "scales"] }, "nnNorm": { "name": "nnNorm", @@ -10561,7 +10603,7 @@ "name": "nnSVG", "version": "1.8.0", "sha256": "00346z7i5hgljylv00l5pcmj3y769mqnhac0f4l7jhiww3xswfbs", - "depends": ["BiocParallel", "BRISC", "Matrix", "matrixStats", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment"] + "depends": ["BRISC", "BiocParallel", "Matrix", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "matrixStats"] }, "normalize450K": { "name": "normalize450K", @@ -10573,7 +10615,7 @@ "name": "normr", "version": "1.30.0", "sha256": "1lkh4a6c499g4wicj4khkyhz361k4q0aydk4gc122vn4877z14c6", - "depends": ["bamsignals", "GenomeInfoDb", "GenomicRanges", "IRanges", "qvalue", "Rcpp", "rtracklayer"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rcpp", "bamsignals", "qvalue", "rtracklayer"] }, "npGSEA": { "name": "npGSEA", @@ -10591,7 +10633,7 @@ "name": "nucleR", "version": "2.36.0", "sha256": "1gbn4rpgil579xkrwd78wc7h6h0f8j1kjz0vvlijy63i6g380wfk", - "depends": ["Biobase", "BiocGenerics", "Biostrings", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "magrittr", "Rsamtools", "S4Vectors", "ShortRead"] + "depends": ["Biobase", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "dplyr", "ggplot2", "magrittr"] }, "nucleoSim": { "name": "nucleoSim", @@ -10603,7 +10645,7 @@ "name": "nullranges", "version": "1.10.0", "sha256": "0a20aqqja5nkp39v7mxjnc98in63zhl00mnhsm952ja7v1l2xfsw", - "depends": ["data_table", "GenomeInfoDb", "GenomicRanges", "ggplot2", "ggridges", "InteractionSet", "IRanges", "plyranges", "progress", "rlang", "S4Vectors", "scales"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "S4Vectors", "data_table", "ggplot2", "ggridges", "plyranges", "progress", "rlang", "scales"] }, "occugene": { "name": "occugene", @@ -10615,7 +10657,7 @@ "name": "octad", "version": "1.6.0", "sha256": "1nlad40c9mzs74zrc82smmmyknw4dr88c6zm0ywm62v0wb8l22n7", - "depends": ["AnnotationHub", "Biobase", "data_table", "DESeq2", "dplyr", "EDASeq", "edgeR", "ExperimentHub", "foreach", "ggplot2", "GSVA", "htmlwidgets", "httr", "limma", "magrittr", "octad_db", "plotly", "qpdf", "reshape2", "Rfast", "rhdf5", "RUVSeq", "S4Vectors"] + "depends": ["AnnotationHub", "Biobase", "DESeq2", "EDASeq", "ExperimentHub", "GSVA", "RUVSeq", "Rfast", "S4Vectors", "data_table", "dplyr", "edgeR", "foreach", "ggplot2", "htmlwidgets", "httr", "limma", "magrittr", "octad_db", "plotly", "qpdf", "reshape2", "rhdf5"] }, "odseq": { "name": "odseq", @@ -10627,49 +10669,49 @@ "name": "oligo", "version": "1.68.2", "sha256": "0ch6b4rg5v6fj0fgniqiigx1gnnqgwji90bxqngllman388bx867", - "depends": ["affxparser", "affyio", "Biobase", "BiocGenerics", "Biostrings", "DBI", "ff", "oligoClasses", "preprocessCore", "RSQLite", "zlibbioc"] + "depends": ["Biobase", "BiocGenerics", "Biostrings", "DBI", "RSQLite", "affxparser", "affyio", "ff", "oligoClasses", "preprocessCore", "zlibbioc"] }, "oligoClasses": { "name": "oligoClasses", "version": "1.66.0", "sha256": "15icfcmpwrnjpyahc4v168fpcbsml6x7h4drmsyh9l8d1284yb4n", - "depends": ["affyio", "Biobase", "BiocGenerics", "BiocManager", "Biostrings", "DBI", "ff", "foreach", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "BiocManager", "Biostrings", "DBI", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "SummarizedExperiment", "affyio", "ff", "foreach"] }, "omada": { "name": "omada", "version": "1.6.0", "sha256": "1by6im4frl724yif9pjgcmp016hahj5xj35h1zqa4k5g8nw54f9s", - "depends": ["clValid", "diceR", "dplyr", "fpc", "genieclust", "ggplot2", "glmnet", "kernlab", "pdfCluster", "Rcpp", "reshape"] + "depends": ["Rcpp", "clValid", "diceR", "dplyr", "fpc", "genieclust", "ggplot2", "glmnet", "kernlab", "pdfCluster", "reshape"] }, "omicRexposome": { "name": "omicRexposome", "version": "1.26.0", "sha256": "0p3x3pp3337nvmqqssrbfh6zn2fp260ss8wjc2c90b0gr4c4h6wc", - "depends": ["Biobase", "ggplot2", "ggrepel", "gridExtra", "isva", "limma", "MultiDataSet", "omicade4", "PMA", "rexposome", "SmartSVA", "stringr", "SummarizedExperiment", "sva"] + "depends": ["Biobase", "MultiDataSet", "PMA", "SmartSVA", "SummarizedExperiment", "ggplot2", "ggrepel", "gridExtra", "isva", "limma", "omicade4", "rexposome", "stringr", "sva"] }, "omicade4": { "name": "omicade4", "version": "1.44.0", "sha256": "18gp8qpmnbc5yjqyvvwvmrdybvm6zddc0r8bfglxz5wg4a91h4wk", - "depends": ["ade4", "Biobase", "made4"] + "depends": ["Biobase", "ade4", "made4"] }, "omicplotR": { "name": "omicplotR", "version": "1.24.0", "sha256": "1zb4xik2rvznbigfh42k97mlfc4ls997cyv4ixd34qp0z3929djc", - "depends": ["ALDEx2", "compositions", "DT", "jsonlite", "knitr", "matrixStats", "rmarkdown", "shiny", "vegan", "zCompositions"] + "depends": ["ALDEx2", "DT", "compositions", "jsonlite", "knitr", "matrixStats", "rmarkdown", "shiny", "vegan", "zCompositions"] }, "omicsPrint": { "name": "omicsPrint", "version": "1.24.0", "sha256": "0b5mccw1vpcw1i38lcy6cjr6im0iw17a3z8vwfs7f2z7nj72p8cf", - "depends": ["MASS", "matrixStats", "MultiAssayExperiment", "RaggedExperiment", "SummarizedExperiment"] + "depends": ["MASS", "MultiAssayExperiment", "RaggedExperiment", "SummarizedExperiment", "matrixStats"] }, "omicsViewer": { "name": "omicsViewer", "version": "1.8.0", "sha256": "0ij7slf4y708gdw06nmm2w7p3svcadvc9s44rzkgjb66is4h375g", - "depends": ["beeswarm", "Biobase", "curl", "drc", "DT", "fastmatch", "fgsea", "flatxml", "ggplot2", "ggseqlogo", "htmlwidgets", "httr", "Matrix", "matrixStats", "networkD3", "openxlsx", "plotly", "psych", "RColorBrewer", "reshape2", "ROCR", "RSQLite", "S4Vectors", "shiny", "shinybusy", "shinycssloaders", "shinyjs", "shinythemes", "shinyWidgets", "stringr", "SummarizedExperiment", "survival", "survminer"] + "depends": ["Biobase", "DT", "Matrix", "RColorBrewer", "ROCR", "RSQLite", "S4Vectors", "SummarizedExperiment", "beeswarm", "curl", "drc", "fastmatch", "fgsea", "flatxml", "ggplot2", "ggseqlogo", "htmlwidgets", "httr", "matrixStats", "networkD3", "openxlsx", "plotly", "psych", "reshape2", "shiny", "shinyWidgets", "shinybusy", "shinycssloaders", "shinyjs", "shinythemes", "stringr", "survival", "survminer"] }, "ompBAM": { "name": "ompBAM", @@ -10681,37 +10723,37 @@ "name": "oncomix", "version": "1.26.0", "sha256": "01ap90pyj3xdnhryiywa57pl0d8lj4q7qxxvf8ahhbr0a2hy8py0", - "depends": ["ggplot2", "ggrepel", "mclust", "RColorBrewer", "SummarizedExperiment"] + "depends": ["RColorBrewer", "SummarizedExperiment", "ggplot2", "ggrepel", "mclust"] }, "oncoscanR": { "name": "oncoscanR", "version": "1.6.0", "sha256": "1n5rcnbb06pl3b27wkzzmz0l7g3hgfjpi7v7anbhscr2i1hy46b9", - "depends": ["GenomicRanges", "IRanges", "magrittr", "readr", "S4Vectors"] + "depends": ["GenomicRanges", "IRanges", "S4Vectors", "magrittr", "readr"] }, "onlineFDR": { "name": "onlineFDR", "version": "2.12.0", "sha256": "1sivrkb21dmb7wgdxd0q3nmjlvaqrh21c20s4lq8azn685frlznh", - "depends": ["progress", "Rcpp", "RcppProgress"] + "depends": ["Rcpp", "RcppProgress", "progress"] }, "ontoProc": { "name": "ontoProc", - "version": "1.26.0", - "sha256": "0v4dv6rjrivrx3npjycrlqyivbpksikkj6l8h772sa5hfnwmf943", - "depends": ["AnnotationHub", "Biobase", "BiocFileCache", "dplyr", "DT", "graph", "httr", "igraph", "magrittr", "ontologyIndex", "ontologyPlot", "R_utils", "reticulate", "Rgraphviz", "S4Vectors", "shiny", "SummarizedExperiment"] + "version": "1.26.4", + "sha256": "0d3fypwwnb9qjdfkhd6w0ppy3hdp7ipds78300kq9yp0a6v7a9w2", + "depends": ["AnnotationHub", "Biobase", "BiocFileCache", "DT", "R_utils", "Rgraphviz", "S4Vectors", "SummarizedExperiment", "dplyr", "graph", "httr", "igraph", "magrittr", "ontologyIndex", "ontologyPlot", "reticulate", "shiny"] }, "openCyto": { "name": "openCyto", "version": "2.16.1", "sha256": "13ndjvm3l5pl1jgv7bqp78didqq3rx6br4p1ncqqp68mm048f2ll", - "depends": ["BH", "Biobase", "BiocGenerics", "cpp11", "data_table", "flowClust", "flowCore", "flowViz", "flowWorkspace", "graph", "ncdfFlow", "RBGL", "RColorBrewer"] + "depends": ["BH", "Biobase", "BiocGenerics", "RBGL", "RColorBrewer", "cpp11", "data_table", "flowClust", "flowCore", "flowViz", "flowWorkspace", "graph", "ncdfFlow"] }, "openPrimeR": { "name": "openPrimeR", "version": "1.26.0", "sha256": "1wcwg0hpnmfzzbxsqggmgim15f4zky0xx3ynyypykyh1c5i3f4yi", - "depends": ["ape", "BiocGenerics", "Biostrings", "DECIPHER", "digest", "dplyr", "foreach", "GenomicRanges", "ggplot2", "Hmisc", "IRanges", "lpSolveAPI", "magrittr", "openxlsx", "plyr", "pwalign", "RColorBrewer", "reshape2", "S4Vectors", "scales", "seqinr", "stringdist", "stringr", "uniqtag", "XML"] + "depends": ["BiocGenerics", "Biostrings", "DECIPHER", "GenomicRanges", "Hmisc", "IRanges", "RColorBrewer", "S4Vectors", "XML", "ape", "digest", "dplyr", "foreach", "ggplot2", "lpSolveAPI", "magrittr", "openxlsx", "plyr", "pwalign", "reshape2", "scales", "seqinr", "stringdist", "stringr", "uniqtag"] }, "openPrimeRui": { "name": "openPrimeRui", @@ -10723,7 +10765,7 @@ "name": "oposSOM", "version": "2.22.0", "sha256": "1i6jkhnb7b420zacxxiv4c0il1n7yrvg5v4qnd465d1s2wifwndn", - "depends": ["ape", "Biobase", "biomaRt", "fastICA", "fdrtool", "graph", "igraph", "pixmap", "png", "Rcpp", "RcppParallel", "RCurl", "scatterplot3d", "tsne", "XML"] + "depends": ["Biobase", "RCurl", "Rcpp", "RcppParallel", "XML", "ape", "biomaRt", "fastICA", "fdrtool", "graph", "igraph", "pixmap", "png", "scatterplot3d", "tsne"] }, "oppar": { "name": "oppar", @@ -10735,48 +10777,48 @@ "name": "oppti", "version": "1.18.0", "sha256": "1lmjvncp8h3p9vb4979v5spw2yp7w2mj4w60b728njhp9cxh8k6g", - "depends": ["devtools", "ggplot2", "knitr", "limma", "parallelDist", "pheatmap", "RColorBrewer", "reshape"] + "depends": ["RColorBrewer", "devtools", "ggplot2", "knitr", "limma", "parallelDist", "pheatmap", "reshape"] }, "optimalFlow": { "name": "optimalFlow", "version": "1.16.0", "sha256": "1b7a7xca1fb7732hwzcgz79p5pp6xsy0z5az5inv6g8z7a2wpngn", - "depends": ["dbscan", "doParallel", "dplyr", "ellipse", "flowMeans", "foreach", "optimalFlowData", "randomForest", "Rfast", "rgl", "rlang", "robustbase", "transport"] + "depends": ["Rfast", "dbscan", "doParallel", "dplyr", "ellipse", "flowMeans", "foreach", "optimalFlowData", "randomForest", "rgl", "rlang", "robustbase", "transport"] }, "orthogene": { "name": "orthogene", "version": "1.10.0", "sha256": "12rf9xjziziw7r02assnpa4ncryyqkfibj3bhbrq8vp7ygvbn64a", - "depends": ["babelgene", "data_table", "DelayedArray", "dplyr", "ggplot2", "ggpubr", "ggtree", "gprofiler2", "grr", "homologene", "jsonlite", "Matrix", "patchwork", "repmis"] + "depends": ["DelayedArray", "Matrix", "babelgene", "data_table", "dplyr", "ggplot2", "ggpubr", "ggtree", "gprofiler2", "grr", "homologene", "jsonlite", "patchwork", "repmis"] }, "orthos": { "name": "orthos", "version": "1.2.0", "sha256": "0y5q9dmn6qwq8psgclwzca3bpfiyi7xh325hxj328h3fis1sm9xb", - "depends": ["AnnotationHub", "basilisk", "BiocParallel", "colorspace", "cowplot", "DelayedArray", "dplyr", "ExperimentHub", "ggplot2", "ggpubr", "ggrepel", "ggsci", "HDF5Array", "keras", "orthosData", "plyr", "reticulate", "rlang", "S4Vectors", "SummarizedExperiment", "tensorflow", "tidyr"] + "depends": ["AnnotationHub", "BiocParallel", "DelayedArray", "ExperimentHub", "HDF5Array", "S4Vectors", "SummarizedExperiment", "basilisk", "colorspace", "cowplot", "dplyr", "ggplot2", "ggpubr", "ggrepel", "ggsci", "keras", "orthosData", "plyr", "reticulate", "rlang", "tensorflow", "tidyr"] }, "pRoloc": { "name": "pRoloc", - "version": "1.44.0", - "sha256": "0g3wlr8f5lhsz9yqs0fx2x1f07y5mxcknq0790l0hirmhlj0vvzr", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "biomaRt", "caret", "class", "coda", "dendextend", "e1071", "FNN", "ggplot2", "gtools", "hexbin", "kernlab", "knitr", "LaplacesDemon", "lattice", "MASS", "mclust", "mixtools", "MLInterfaces", "MSnbase", "mvtnorm", "nnet", "plyr", "proxy", "randomForest", "RColorBrewer", "Rcpp", "RcppArmadillo", "sampling", "scales"] + "version": "1.44.1", + "sha256": "09vm0308qzc5hrvck2ksyn5f4zgdg9jpgcxg4zzrczs4ygp5jpzz", + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "FNN", "LaplacesDemon", "MASS", "MLInterfaces", "MSnbase", "RColorBrewer", "Rcpp", "RcppArmadillo", "biomaRt", "caret", "class", "coda", "dendextend", "e1071", "ggplot2", "gtools", "hexbin", "kernlab", "knitr", "lattice", "mclust", "mixtools", "mvtnorm", "nnet", "plyr", "proxy", "randomForest", "sampling", "scales"] }, "pRolocGUI": { "name": "pRolocGUI", "version": "2.14.0", "sha256": "0lxnvh2hx7zayfmdfiqhlwp3gmpx0bsz3ds67zalhvf1xmn2cn88", - "depends": ["Biobase", "BiocGenerics", "colorspace", "colourpicker", "dplyr", "DT", "ggplot2", "MSnbase", "pRoloc", "scales", "shiny", "shinydashboard", "shinydashboardPlus", "shinyhelper", "shinyjs", "shinyWidgets"] + "depends": ["Biobase", "BiocGenerics", "DT", "MSnbase", "colorspace", "colourpicker", "dplyr", "ggplot2", "pRoloc", "scales", "shiny", "shinyWidgets", "shinydashboard", "shinydashboardPlus", "shinyhelper", "shinyjs"] }, "packFinder": { "name": "packFinder", "version": "1.16.0", "sha256": "0y8sw0vyfry6vfn4k9w81m9s4a98bhc5h2a4nvy666qjganhfm8i", - "depends": ["ape", "Biostrings", "GenomicRanges", "IRanges", "kmer", "S4Vectors"] + "depends": ["Biostrings", "GenomicRanges", "IRanges", "S4Vectors", "ape", "kmer"] }, "padma": { "name": "padma", - "version": "1.14.0", - "sha256": "1b5pjjd7nn6b64b0cj0alqgbp9782vf33b4m7kz9dvzacsp9n2l0", + "version": "1.14.1", + "sha256": "0h0hhdq1hxvysf7hrk0jpy1jb1b7zq8gh6k905glhqykmdzm0p25", "depends": ["FactoMineR", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment"] }, "pageRank": { @@ -10795,37 +10837,37 @@ "name": "pairedGSEA", "version": "1.4.0", "sha256": "181x2r7af4243b2jmsc71gi8jlq80d4gzkcprr0dk0sis9bh1pqj", - "depends": ["aggregation", "BiocParallel", "DESeq2", "DEXSeq", "fgsea", "ggplot2", "limma", "S4Vectors", "SummarizedExperiment", "sva"] + "depends": ["BiocParallel", "DESeq2", "DEXSeq", "S4Vectors", "SummarizedExperiment", "aggregation", "fgsea", "ggplot2", "limma", "sva"] }, "pairkat": { "name": "pairkat", "version": "1.10.0", "sha256": "1rxwf8nlmc18h6zi95v4xhs5hqaygpba15wsc06msslzr905s6id", - "depends": ["CompQuadForm", "data_table", "igraph", "KEGGREST", "magrittr", "SummarizedExperiment", "tibble"] + "depends": ["CompQuadForm", "KEGGREST", "SummarizedExperiment", "data_table", "igraph", "magrittr", "tibble"] }, "pandaR": { "name": "pandaR", "version": "1.36.0", "sha256": "1cgy9sx5nk94d43baxsm25lh64fmmmznxd832r2wnj6a7p07bbj2", - "depends": ["Biobase", "BiocGenerics", "ggplot2", "hexbin", "igraph", "matrixStats", "plyr", "reshape", "RUnit"] + "depends": ["Biobase", "BiocGenerics", "RUnit", "ggplot2", "hexbin", "igraph", "matrixStats", "plyr", "reshape"] }, "panelcn_mops": { "name": "panelcn.mops", "version": "1.26.0", "sha256": "1fmb1zixg909nqdf34z2aq0llzzsrf4pd73pc8xyachivyx73p4a", - "depends": ["cn_mops", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "cn_mops"] }, "panp": { "name": "panp", "version": "1.74.0", "sha256": "0w5hbjpdwy6g3x38c64r29106s1smyakzpm1qb50f6g8mf99lsvy", - "depends": ["affy", "Biobase"] + "depends": ["Biobase", "affy"] }, "pareg": { "name": "pareg", "version": "1.8.0", "sha256": "1b9vvn1ppw1vbfmkzkbd6b01pkqnsknbrjv1js983dpjv23x6xlb", - "depends": ["basilisk", "devtools", "doFuture", "doRNG", "DOSE", "dplyr", "foreach", "future", "ggplot2", "ggraph", "ggrepel", "glue", "hms", "igraph", "keras", "logger", "magrittr", "Matrix", "nloptr", "progress", "proxy", "purrr", "reticulate", "rlang", "stringr", "tensorflow", "tfprobability", "tibble", "tidygraph", "tidyr"] + "depends": ["DOSE", "Matrix", "basilisk", "devtools", "doFuture", "doRNG", "dplyr", "foreach", "future", "ggplot2", "ggraph", "ggrepel", "glue", "hms", "igraph", "keras", "logger", "magrittr", "nloptr", "progress", "proxy", "purrr", "reticulate", "rlang", "stringr", "tensorflow", "tfprobability", "tibble", "tidygraph", "tidyr"] }, "parglms": { "name": "parglms", @@ -10843,31 +10885,31 @@ "name": "partCNV", "version": "1.2.0", "sha256": "0f632ih6fy46923a4cf7njkgaqwkmgbwz74djbd2awsnk02afbbw", - "depends": ["AnnotationHub", "data_table", "depmixS4", "GenomicRanges", "magrittr", "Seurat", "SingleCellExperiment"] + "depends": ["AnnotationHub", "GenomicRanges", "Seurat", "SingleCellExperiment", "data_table", "depmixS4", "magrittr"] }, "pathRender": { "name": "pathRender", "version": "1.72.0", "sha256": "0dcds0agwphriqc0d8rw7yycqvxzhv7jj4xs2lvwhzwqrkxicpf1", - "depends": ["AnnotationDbi", "cMAP", "graph", "RColorBrewer", "Rgraphviz"] + "depends": ["AnnotationDbi", "RColorBrewer", "Rgraphviz", "cMAP", "graph"] }, "pathifier": { "name": "pathifier", "version": "1.42.0", "sha256": "1m21713zj4i5iygrj0ygc5zwcrw6038hb486l6c5nvykhzc5w64p", - "depends": ["princurve", "R_oo"] + "depends": ["R_oo", "princurve"] }, "pathlinkR": { "name": "pathlinkR", - "version": "1.0.0", - "sha256": "19i840an94hpyqxz4c4piqy322ynxzf48cxbmxvf5jylxdqjnzf2", - "depends": ["circlize", "clusterProfiler", "ComplexHeatmap", "dplyr", "ggforce", "ggplot2", "ggpubr", "ggraph", "ggrepel", "igraph", "purrr", "sigora", "stringr", "tibble", "tidygraph", "tidyr", "vegan", "visNetwork"] + "version": "1.0.1", + "sha256": "1zwcrxi926m6zyhv3na7jv8cj61m93a3mg7zz6rqblvxrg218gmg", + "depends": ["ComplexHeatmap", "circlize", "clusterProfiler", "dplyr", "ggforce", "ggplot2", "ggpubr", "ggraph", "ggrepel", "igraph", "purrr", "sigora", "stringr", "tibble", "tidygraph", "tidyr", "vegan", "visNetwork"] }, "pathview": { "name": "pathview", "version": "1.44.0", "sha256": "1papw23dhhkqmm864dc3xm028xm0ywc6sjcm7xk93f2j7yj65x0v", - "depends": ["AnnotationDbi", "graph", "KEGGgraph", "KEGGREST", "org_Hs_eg_db", "png", "Rgraphviz", "XML"] + "depends": ["AnnotationDbi", "KEGGREST", "KEGGgraph", "Rgraphviz", "XML", "graph", "org_Hs_eg_db", "png"] }, "pathwayPCA": { "name": "pathwayPCA", @@ -10879,13 +10921,13 @@ "name": "paxtoolsr", "version": "1.38.0", "sha256": "0m3r8ynqkhksgj0d3si3wcnk5a801g1qklin8zm81cr1nlfx67gw", - "depends": ["httr", "igraph", "jsonlite", "plyr", "R_utils", "rappdirs", "readr", "rJava", "rjson", "XML"] + "depends": ["R_utils", "XML", "httr", "igraph", "jsonlite", "plyr", "rJava", "rappdirs", "readr", "rjson"] }, "pcaExplorer": { "name": "pcaExplorer", "version": "2.30.0", "sha256": "1szl2gyhw55ad4phcb7qn14amjb6xg65l3p4hnjzp6rda2cy9437", - "depends": ["AnnotationDbi", "base64enc", "biomaRt", "DESeq2", "DT", "genefilter", "GenomicRanges", "ggplot2", "ggrepel", "GO_db", "GOstats", "heatmaply", "IRanges", "knitr", "limma", "NMF", "pheatmap", "plotly", "plyr", "rmarkdown", "S4Vectors", "scales", "shiny", "shinyAce", "shinyBS", "shinydashboard", "SummarizedExperiment", "threejs", "tidyr", "topGO"] + "depends": ["AnnotationDbi", "DESeq2", "DT", "GO_db", "GOstats", "GenomicRanges", "IRanges", "NMF", "S4Vectors", "SummarizedExperiment", "base64enc", "biomaRt", "genefilter", "ggplot2", "ggrepel", "heatmaply", "knitr", "limma", "pheatmap", "plotly", "plyr", "rmarkdown", "scales", "shiny", "shinyAce", "shinyBS", "shinydashboard", "threejs", "tidyr", "topGO"] }, "pcaMethods": { "name": "pcaMethods", @@ -10903,19 +10945,19 @@ "name": "pdInfoBuilder", "version": "1.68.0", "sha256": "1dcd0lscvywy5y5xfhfmn39n2iypjr4fjldfgmx8qa80b1d0xcbi", - "depends": ["affxparser", "Biobase", "BiocGenerics", "Biostrings", "DBI", "IRanges", "oligo", "oligoClasses", "RSQLite", "S4Vectors"] + "depends": ["Biobase", "BiocGenerics", "Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "affxparser", "oligo", "oligoClasses"] }, "peakPantheR": { "name": "peakPantheR", "version": "1.18.0", "sha256": "0rr8kmk6d4m7aipmz2pi2rzwxhxc600bk9r24fdgsw4kbh17fman", - "depends": ["bslib", "doParallel", "DT", "foreach", "ggplot2", "gridExtra", "lubridate", "minpack_lm", "MSnbase", "mzR", "pracma", "scales", "shiny", "shinycssloaders", "stringr", "svglite", "XML"] + "depends": ["DT", "MSnbase", "XML", "bslib", "doParallel", "foreach", "ggplot2", "gridExtra", "lubridate", "minpack_lm", "mzR", "pracma", "scales", "shiny", "shinycssloaders", "stringr", "svglite"] }, "peco": { "name": "peco", "version": "1.16.0", "sha256": "1w3yf77lk5whdhicq6rzp61cpivvkc0jj5wsasjxaqvl7lf1k6fs", - "depends": ["assertthat", "circular", "conicfit", "doParallel", "foreach", "genlasso", "scater", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["SingleCellExperiment", "SummarizedExperiment", "assertthat", "circular", "conicfit", "doParallel", "foreach", "genlasso", "scater"] }, "pengls": { "name": "pengls", @@ -10927,7 +10969,7 @@ "name": "pepStat", "version": "1.38.0", "sha256": "1k4nf5jlpcf7bgrv08mgd575gkp08sw9w7nzab7idizdz4pvqvj4", - "depends": ["Biobase", "data_table", "fields", "GenomicRanges", "ggplot2", "IRanges", "limma", "plyr"] + "depends": ["Biobase", "GenomicRanges", "IRanges", "data_table", "fields", "ggplot2", "limma", "plyr"] }, "pepXMLTab": { "name": "pepXMLTab", @@ -10939,7 +10981,7 @@ "name": "periodicDNA", "version": "1.14.0", "sha256": "1fx7kvgl9znzpz6i33zl6019m0r4jcwsvsycjwhqaz8g3b5k4z8q", - "depends": ["BiocParallel", "Biostrings", "BSgenome", "cowplot", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "magrittr", "rtracklayer", "S4Vectors", "zoo"] + "depends": ["BSgenome", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "cowplot", "ggplot2", "magrittr", "rtracklayer", "zoo"] }, "pfamAnalyzeR": { "name": "pfamAnalyzeR", @@ -10955,15 +10997,15 @@ }, "pgxRpi": { "name": "pgxRpi", - "version": "1.0.1", - "sha256": "063xyx9i6k06klb8zpq64ln77lyadz6m6h86krk4mfxfbn214v9b", - "depends": ["attempt", "circlize", "dplyr", "GenomicRanges", "ggplot2", "httr", "lubridate", "plyr", "S4Vectors", "SummarizedExperiment", "survival", "survminer"] + "version": "1.0.3", + "sha256": "18c5xpfyqjjj5vc3nnajwq5sq1w24lqqs4ik91vjw5qg41rbspy3", + "depends": ["GenomicRanges", "S4Vectors", "SummarizedExperiment", "attempt", "circlize", "dplyr", "ggplot2", "httr", "lubridate", "parallelly", "plyr", "survival", "survminer"] }, "phantasus": { "name": "phantasus", "version": "1.24.0", "sha256": "0gw7d8n4nb3rjari1zrdqqhdz0ca0mgw40yr56r3x3gsyqpjlzxa", - "depends": ["AnnotationDbi", "assertthat", "Biobase", "ccaPP", "config", "curl", "data_table", "DESeq2", "edgeR", "fgsea", "fs", "GEOquery", "ggplot2", "gtable", "htmltools", "httpuv", "httr", "jsonlite", "limma", "Matrix", "opencpu", "phantasusLite", "pheatmap", "protolite", "rhdf5", "rhdf5client", "Rook", "scales", "stringr", "svglite", "XML", "yaml"] + "depends": ["AnnotationDbi", "Biobase", "DESeq2", "GEOquery", "Matrix", "Rook", "XML", "assertthat", "ccaPP", "config", "curl", "data_table", "edgeR", "fgsea", "fs", "ggplot2", "gtable", "htmltools", "httpuv", "httr", "jsonlite", "limma", "opencpu", "phantasusLite", "pheatmap", "protolite", "rhdf5", "rhdf5client", "scales", "stringr", "svglite", "yaml"] }, "phantasusLite": { "name": "phantasusLite", @@ -10975,19 +11017,19 @@ "name": "phenoTest", "version": "1.52.0", "sha256": "1l5r19gksrbqsdl9v8r2f4hrsbsxbkircbp3rxiis5x6y17ca9hy", - "depends": ["annotate", "AnnotationDbi", "Biobase", "biomaRt", "BMA", "Category", "ellipse", "genefilter", "ggplot2", "gplots", "GSEABase", "Heatplus", "hgu133a_db", "Hmisc", "hopach", "limma", "mgcv", "survival", "xtable"] + "depends": ["AnnotationDbi", "BMA", "Biobase", "Category", "GSEABase", "Heatplus", "Hmisc", "annotate", "biomaRt", "ellipse", "genefilter", "ggplot2", "gplots", "hgu133a_db", "hopach", "limma", "mgcv", "survival", "xtable"] }, "phenomis": { "name": "phenomis", - "version": "1.6.0", - "sha256": "0d6kc034lbbsyvr30p0a1c3nrpa39kkpwjqbkdvm6cwvfyiaf3iy", - "depends": ["Biobase", "biodb", "biodbChebi", "data_table", "futile_logger", "ggplot2", "ggrepel", "htmlwidgets", "igraph", "limma", "MultiAssayExperiment", "MultiDataSet", "plotly", "PMCMRplus", "ranger", "RColorBrewer", "ropls", "SummarizedExperiment", "tibble", "tidyr", "VennDiagram"] + "version": "1.6.2", + "sha256": "06bwkhp503mqf8yyzqkl1sym8p6vl20sbb3ms9d5p81gnm87wg6q", + "depends": ["Biobase", "MultiAssayExperiment", "MultiDataSet", "PMCMRplus", "RColorBrewer", "SummarizedExperiment", "VennDiagram", "biodb", "biodbChebi", "data_table", "futile_logger", "ggplot2", "ggrepel", "htmlwidgets", "igraph", "limma", "plotly", "ranger", "ropls", "tibble", "tidyr"] }, "phenopath": { "name": "phenopath", "version": "1.28.0", "sha256": "073v6sxf3k10257npbmxxh6bvdjwnvk3zh1zq2yvm9jzg2n34i99", - "depends": ["dplyr", "ggplot2", "Rcpp", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["Rcpp", "SummarizedExperiment", "dplyr", "ggplot2", "tibble", "tidyr"] }, "philr": { "name": "philr", @@ -11005,7 +11047,7 @@ "name": "phyloseq", "version": "1.48.0", "sha256": "0a8q4wcqcxs7933bxg9bg03ps6hnybvcpqmlpz1pjy3affzghcbi", - "depends": ["ade4", "ape", "Biobase", "BiocGenerics", "biomformat", "Biostrings", "cluster", "data_table", "foreach", "ggplot2", "igraph", "multtest", "plyr", "reshape2", "scales", "vegan"] + "depends": ["Biobase", "BiocGenerics", "Biostrings", "ade4", "ape", "biomformat", "cluster", "data_table", "foreach", "ggplot2", "igraph", "multtest", "plyr", "reshape2", "scales", "vegan"] }, "piano": { "name": "piano", @@ -11023,13 +11065,13 @@ "name": "pipeComp", "version": "1.14.0", "sha256": "1wq7b5f5hdxg2q6av782dm2gmzzdx58ss7ns9vizyxli3k926p5n", - "depends": ["aricode", "BiocParallel", "circlize", "clue", "cluster", "ComplexHeatmap", "cowplot", "dplyr", "ggplot2", "intrinsicDimension", "knitr", "Matrix", "matrixStats", "randomcoloR", "RColorBrewer", "reshape2", "Rtsne", "S4Vectors", "scales", "scater", "scran", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "uwot", "viridisLite"] + "depends": ["BiocParallel", "ComplexHeatmap", "Matrix", "RColorBrewer", "Rtsne", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "aricode", "circlize", "clue", "cluster", "cowplot", "dplyr", "ggplot2", "intrinsicDimension", "knitr", "matrixStats", "randomcoloR", "reshape2", "scales", "scater", "scran", "uwot", "viridisLite"] }, "pipeFrame": { "name": "pipeFrame", "version": "1.20.0", "sha256": "12wi520dylsjmf3vzwsdqqfqgcz5g4znfs2n5sd9b4805smc8k8l", - "depends": ["Biostrings", "BSgenome", "digest", "GenomeInfoDb", "magrittr", "rmarkdown", "visNetwork"] + "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "digest", "magrittr", "rmarkdown", "visNetwork"] }, "planet": { "name": "planet", @@ -11059,31 +11101,31 @@ "name": "plier", "version": "1.74.0", "sha256": "0svk8p4h212l3igfmrxhqi90xz74jicr5y780556k9bcj3jwqg5c", - "depends": ["affy", "Biobase"] + "depends": ["Biobase", "affy"] }, "plotGrouper": { "name": "plotGrouper", "version": "1.22.0", "sha256": "169786jrqbcf8qhysar22cb5am2zh6j7w601k9784b4ywhxh3ac0", - "depends": ["colourpicker", "dplyr", "egg", "ggplot2", "ggpubr", "gridExtra", "gtable", "Hmisc", "magrittr", "readr", "readxl", "rlang", "scales", "shiny", "shinythemes", "stringr", "tibble", "tidyr"] + "depends": ["Hmisc", "colourpicker", "dplyr", "egg", "ggplot2", "ggpubr", "gridExtra", "gtable", "magrittr", "readr", "readxl", "rlang", "scales", "shiny", "shinythemes", "stringr", "tibble", "tidyr"] }, "plotgardener": { "name": "plotgardener", - "version": "1.10.1", - "sha256": "1pcjc4an5pspafb9pvmia73g8cdp6n2paz2m952p1xnwsp9ijsi7", - "depends": ["curl", "data_table", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplotify", "IRanges", "plyranges", "purrr", "RColorBrewer", "Rcpp", "rlang", "strawr", "withr"] + "version": "1.10.2", + "sha256": "115j3fh9abdrlgf2dsd9jx4lja1pjfg0fh0if3vwg1gfv7qnzfrn", + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "Rcpp", "curl", "data_table", "dplyr", "ggplotify", "plyranges", "purrr", "rlang", "strawr", "withr"] }, "plyinteractions": { "name": "plyinteractions", "version": "1.2.0", "sha256": "095sb616r5xwcbqsgw4b7kiywl6lbwp6rbs80qymglpqkbywwp7j", - "depends": ["BiocGenerics", "dplyr", "GenomeInfoDb", "GenomicRanges", "InteractionSet", "IRanges", "plyranges", "rlang", "S4Vectors", "tibble", "tidyselect"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "S4Vectors", "dplyr", "plyranges", "rlang", "tibble", "tidyselect"] }, "plyranges": { "name": "plyranges", "version": "1.24.0", "sha256": "0rh5l6bd80nhffqpnnc2c00mvp8p32ykld05h94c3y8c9mvmsl58", - "depends": ["BiocGenerics", "dplyr", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "magrittr", "rlang", "Rsamtools", "rtracklayer", "S4Vectors", "tidyselect"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "dplyr", "magrittr", "rlang", "rtracklayer", "tidyselect"] }, "pmm": { "name": "pmm", @@ -11095,37 +11137,37 @@ "name": "pmp", "version": "1.16.0", "sha256": "0ryjv1g63nzipym1ijln6nv2w5flv15030b9jp09ddi5p3hn5h1j", - "depends": ["ggplot2", "impute", "matrixStats", "missForest", "pcaMethods", "reshape2", "S4Vectors", "SummarizedExperiment"] + "depends": ["S4Vectors", "SummarizedExperiment", "ggplot2", "impute", "matrixStats", "missForest", "pcaMethods", "reshape2"] }, "podkat": { "name": "podkat", "version": "1.36.0", "sha256": "0bjan7w0mxylabvaf3c2nqv5yifddslhd4dh360il193qs07g72c", - "depends": ["Biobase", "BiocGenerics", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "Rhtslib", "Rsamtools"] + "depends": ["BSgenome", "Biobase", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "Rhtslib", "Rsamtools"] }, "pogos": { "name": "pogos", "version": "1.24.0", "sha256": "1i5cmz5icgmd2xd9r19i6xr9v4nydqpydbf84c8ann07p0qyg5b3", - "depends": ["ggplot2", "httr", "ontoProc", "rjson", "S4Vectors", "shiny"] + "depends": ["S4Vectors", "ggplot2", "httr", "ontoProc", "rjson", "shiny"] }, "polyester": { "name": "polyester", "version": "1.39.0", "sha256": "0fw0qhmbygjq4ryspyqikb8rxfn33ks000j7sshgfg8hf2rmqg3x", - "depends": ["Biostrings", "IRanges", "limma", "logspline", "S4Vectors", "zlibbioc"] + "depends": ["Biostrings", "IRanges", "S4Vectors", "limma", "logspline", "zlibbioc"] }, "powerTCR": { "name": "powerTCR", "version": "1.24.0", "sha256": "04w6jhpc1vkqrm3dr5igp1iwkammmi53mqafjz694n379hamxrhg", - "depends": ["cubature", "doParallel", "evmix", "foreach", "magrittr", "purrr", "truncdist", "vegan", "VGAM"] + "depends": ["VGAM", "cubature", "doParallel", "evmix", "foreach", "magrittr", "purrr", "truncdist", "vegan"] }, "ppcseq": { "name": "ppcseq", "version": "1.12.0", "sha256": "0b8s29zhw3s3nbxf57fa9cixfdwx0q4d3g4b6bi35fsr0r90a44q", - "depends": ["benchmarkme", "BH", "dplyr", "edgeR", "foreach", "ggplot2", "lifecycle", "magrittr", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders", "tibble", "tidybayes", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "benchmarkme", "dplyr", "edgeR", "foreach", "ggplot2", "lifecycle", "magrittr", "purrr", "rlang", "rstan", "rstantools", "tibble", "tidybayes", "tidyr"] }, "pqsfinder": { "name": "pqsfinder", @@ -11137,19 +11179,19 @@ "name": "pram", "version": "1.20.0", "sha256": "0cc74whwnjgf8svfps2i0c9n243rzq15ffdwdwdd986mwn6v5kvv", - "depends": ["BiocGenerics", "BiocParallel", "data_table", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "rtracklayer", "S4Vectors"] + "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "data_table", "rtracklayer"] }, "prebs": { "name": "prebs", "version": "1.44.0", "sha256": "0mzy2w5jq08370nl53ms2xadr46lc0hvlgv2kkw5ikjf58rsfgx7", - "depends": ["affy", "Biobase", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "RPA", "S4Vectors"] + "depends": ["Biobase", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "RPA", "S4Vectors", "affy"] }, "preciseTAD": { "name": "preciseTAD", "version": "1.14.0", "sha256": "0gxq07q8nv2h0j20vsjgbah8121l79sxjhjg9rf79r73pmm1733f", - "depends": ["caret", "cluster", "dbscan", "doSNOW", "e1071", "foreach", "GenomicRanges", "gtools", "IRanges", "ModelMetrics", "pbapply", "pROC", "PRROC", "randomForest", "rCGH", "S4Vectors"] + "depends": ["GenomicRanges", "IRanges", "ModelMetrics", "PRROC", "S4Vectors", "caret", "cluster", "dbscan", "doSNOW", "e1071", "foreach", "gtools", "pROC", "pbapply", "rCGH", "randomForest"] }, "preprocessCore": { "name": "preprocessCore", @@ -11161,13 +11203,13 @@ "name": "primirTSS", "version": "1.22.0", "sha256": "1c932ynp5rsymz6z7m9v38fwm30gja7z60yq3xjwj6gxw1rf7sy5", - "depends": ["BiocGenerics", "Biostrings", "BSgenome_Hsapiens_UCSC_hg38", "dplyr", "GenomicRanges", "GenomicScores", "Gviz", "IRanges", "JASPAR2018", "phastCons100way_UCSC_hg38", "purrr", "R_utils", "rtracklayer", "S4Vectors", "shiny", "stringr", "TFBSTools", "tibble", "tidyr"] + "depends": ["BSgenome_Hsapiens_UCSC_hg38", "BiocGenerics", "Biostrings", "GenomicRanges", "GenomicScores", "Gviz", "IRanges", "JASPAR2018", "R_utils", "S4Vectors", "TFBSTools", "dplyr", "phastCons100way_UCSC_hg38", "purrr", "rtracklayer", "shiny", "stringr", "tibble", "tidyr"] }, "proActiv": { "name": "proActiv", "version": "1.14.0", "sha256": "1x70jjym4220vkwzhr2cn4hjxvxdh2mhwfyd8rp3wp6gh7d9q87a", - "depends": ["AnnotationDbi", "BiocParallel", "data_table", "DESeq2", "dplyr", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "gplots", "IRanges", "rlang", "S4Vectors", "scales", "SummarizedExperiment", "tibble", "txdbmaker"] + "depends": ["AnnotationDbi", "BiocParallel", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "ggplot2", "gplots", "rlang", "scales", "tibble", "txdbmaker"] }, "proBAMr": { "name": "proBAMr", @@ -11179,13 +11221,13 @@ "name": "proDA", "version": "1.18.0", "sha256": "1h3695q4al7pr3q1vj1qfiig6c5lhljxlvxpfbv6k0h987ha1fiw", - "depends": ["BiocGenerics", "extraDistr", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocGenerics", "S4Vectors", "SummarizedExperiment", "extraDistr"] }, "procoil": { "name": "procoil", "version": "2.32.0", "sha256": "02p8dy3gi86zp5z842sjx3rcy8a7kvji8mg4xw5krzz4pkzjjk8y", - "depends": ["Biostrings", "kebabs", "S4Vectors"] + "depends": ["Biostrings", "S4Vectors", "kebabs"] }, "profileScoreDist": { "name": "profileScoreDist", @@ -11197,7 +11239,7 @@ "name": "profileplyr", "version": "1.20.0", "sha256": "1gpjmkn1s509smaal15rg3629y69vnxifhyfd8xa65x7m9v1fvbc", - "depends": ["BiocGenerics", "BiocParallel", "ChIPseeker", "circlize", "ComplexHeatmap", "dplyr", "EnrichedHeatmap", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "magrittr", "org_Hs_eg_db", "org_Mm_eg_db", "pheatmap", "R_utils", "rGREAT", "rjson", "rlang", "Rsamtools", "rtracklayer", "S4Vectors", "soGGi", "SummarizedExperiment", "tidyr", "tiff", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "TxDb_Mmusculus_UCSC_mm9_knownGene"] + "depends": ["BiocGenerics", "BiocParallel", "ChIPseeker", "ComplexHeatmap", "EnrichedHeatmap", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "R_utils", "Rsamtools", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "TxDb_Mmusculus_UCSC_mm9_knownGene", "circlize", "dplyr", "ggplot2", "magrittr", "org_Hs_eg_db", "org_Mm_eg_db", "pheatmap", "rGREAT", "rjson", "rlang", "rtracklayer", "soGGi", "tidyr", "tiff"] }, "progeny": { "name": "progeny", @@ -11209,13 +11251,13 @@ "name": "projectR", "version": "1.20.0", "sha256": "1c9v4iw8s4hm7wjdv3ir6df0yskz95b0wnpljiph4zv4h22q32ac", - "depends": ["cluster", "cowplot", "dplyr", "fgsea", "ggalluvial", "ggplot2", "ggrepel", "limma", "Matrix", "MatrixModels", "msigdbr", "NMF", "RColorBrewer", "reshape2", "ROCR", "scales", "tsne", "umap", "viridis"] + "depends": ["Matrix", "MatrixModels", "NMF", "RColorBrewer", "ROCR", "cluster", "cowplot", "dplyr", "fgsea", "ggalluvial", "ggplot2", "ggrepel", "limma", "msigdbr", "reshape2", "scales", "tsne", "umap", "viridis"] }, "protGear": { "name": "protGear", "version": "1.8.0", "sha256": "1wbdp7f55lbn0gcxgnp9xk0y5npn7jmk9vp7yq9v76j7f396vj2f", - "depends": ["Biobase", "data_table", "dplyr", "factoextra", "FactoMineR", "flexdashboard", "genefilter", "GGally", "ggplot2", "ggpubr", "gtools", "htmltools", "Kendall", "knitr", "limma", "magrittr", "MASS", "pheatmap", "plotly", "plyr", "purrr", "readr", "remotes", "rlang", "rmarkdown", "shiny", "shinydashboard", "styler", "tibble", "tidyr", "vsn"] + "depends": ["Biobase", "FactoMineR", "GGally", "Kendall", "MASS", "data_table", "dplyr", "factoextra", "flexdashboard", "genefilter", "ggplot2", "ggpubr", "gtools", "htmltools", "knitr", "limma", "magrittr", "pheatmap", "plotly", "plyr", "purrr", "readr", "remotes", "rlang", "rmarkdown", "shiny", "shinydashboard", "styler", "tibble", "tidyr", "vsn"] }, "proteinProfiles": { "name": "proteinProfiles", @@ -11227,43 +11269,43 @@ "name": "psichomics", "version": "1.30.0", "sha256": "0nwfaw1a4mxdzqk0zqadxispdasx75nlb19zla753nmydxlpavj0", - "depends": ["AnnotationDbi", "AnnotationHub", "BiocFileCache", "cluster", "colourpicker", "data_table", "digest", "dplyr", "DT", "edgeR", "fastICA", "fastmatch", "ggplot2", "ggrepel", "highcharter", "htmltools", "httr", "jsonlite", "limma", "pairsD3", "plyr", "purrr", "R_utils", "Rcpp", "recount", "reshape2", "Rfast", "shiny", "shinyBS", "shinyjs", "stringr", "SummarizedExperiment", "survival", "XML", "xtable"] + "depends": ["AnnotationDbi", "AnnotationHub", "BiocFileCache", "DT", "R_utils", "Rcpp", "Rfast", "SummarizedExperiment", "XML", "cluster", "colourpicker", "data_table", "digest", "dplyr", "edgeR", "fastICA", "fastmatch", "ggplot2", "ggrepel", "highcharter", "htmltools", "httr", "jsonlite", "limma", "pairsD3", "plyr", "purrr", "recount", "reshape2", "shiny", "shinyBS", "shinyjs", "stringr", "survival", "xtable"] }, "psygenet2r": { "name": "psygenet2r", "version": "1.36.0", "sha256": "1khjid5lkkn5qpnk9adw1in4km41q067mj5r5yqs2iz5hv4vx6xv", - "depends": ["BgeeDB", "Biobase", "biomaRt", "ggplot2", "GO_db", "igraph", "labeling", "RCurl", "reshape2", "stringr", "topGO"] + "depends": ["BgeeDB", "Biobase", "GO_db", "RCurl", "biomaRt", "ggplot2", "igraph", "labeling", "reshape2", "stringr", "topGO"] }, "ptairMS": { "name": "ptairMS", "version": "1.12.0", "sha256": "0r0h4mdvhbrr3j78qzdcfw7q5q492wx9v78rg2xzw59ynqbyv3gg", - "depends": ["Biobase", "bit64", "chron", "data_table", "doParallel", "DT", "enviPat", "foreach", "ggplot2", "ggpubr", "gridExtra", "Hmisc", "minpack_lm", "MSnbase", "plotly", "Rcpp", "rhdf5", "rlang", "scales", "shiny", "shinyscreenshot", "signal"] + "depends": ["Biobase", "DT", "Hmisc", "MSnbase", "Rcpp", "bit64", "chron", "data_table", "doParallel", "enviPat", "foreach", "ggplot2", "ggpubr", "gridExtra", "minpack_lm", "plotly", "rhdf5", "rlang", "scales", "shiny", "shinyscreenshot", "signal"] }, "puma": { "name": "puma", "version": "3.46.0", "sha256": "1l6xvj6l9f5kmff3a5q7vzf2sssyhkqpa4im46g53jhkindbqwg6", - "depends": ["affy", "affyio", "Biobase", "mclust", "oligo", "oligoClasses"] + "depends": ["Biobase", "affy", "affyio", "mclust", "oligo", "oligoClasses"] }, "pvac": { "name": "pvac", "version": "1.52.0", "sha256": "132hvlnp3cfxazvf0wq1q5v00q5x79fg60r7vsx07wi1vkjba3wg", - "depends": ["affy", "Biobase"] + "depends": ["Biobase", "affy"] }, "pvca": { "name": "pvca", "version": "1.44.0", "sha256": "0bk1nrjhn78wcbcawz8bx2lm3y45mhfv22yrrlxrz91sah9jjw27", - "depends": ["Biobase", "lme4", "Matrix", "vsn"] + "depends": ["Biobase", "Matrix", "lme4", "vsn"] }, "pwOmics": { "name": "pwOmics", "version": "1.36.0", "sha256": "00c198vm7zzsq2a43c6iar5937556s65183wk1k7wy1zl8vqi8vg", - "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "BiocGenerics", "biomaRt", "data_table", "GenomicRanges", "gplots", "graph", "igraph", "rBiopaxParser", "STRINGdb"] + "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "BiocGenerics", "GenomicRanges", "STRINGdb", "biomaRt", "data_table", "gplots", "graph", "igraph", "rBiopaxParser"] }, "pwalign": { "name": "pwalign", @@ -11275,43 +11317,43 @@ "name": "qPLEXanalyzer", "version": "1.22.0", "sha256": "15cmfrp1hilqqkkxphd4lbqmk4mgv3s8ky76bnidfv58qc5pa940", - "depends": ["assertthat", "Biobase", "BiocGenerics", "Biostrings", "dplyr", "ggdendro", "ggplot2", "IRanges", "limma", "magrittr", "MSnbase", "preprocessCore", "purrr", "RColorBrewer", "readr", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["Biobase", "BiocGenerics", "Biostrings", "IRanges", "MSnbase", "RColorBrewer", "assertthat", "dplyr", "ggdendro", "ggplot2", "limma", "magrittr", "preprocessCore", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect"] }, "qckitfastq": { "name": "qckitfastq", "version": "1.20.0", "sha256": "0wb6r4mdh3zf3hic88cn9s22s0dn7h65gl4djwrcl5sm5b1a6sxm", - "depends": ["data_table", "dplyr", "ggplot2", "magrittr", "Rcpp", "reshape2", "rlang", "RSeqAn", "seqTools", "zlibbioc"] + "depends": ["RSeqAn", "Rcpp", "data_table", "dplyr", "ggplot2", "magrittr", "reshape2", "rlang", "seqTools", "zlibbioc"] }, "qcmetrics": { "name": "qcmetrics", "version": "1.42.0", "sha256": "0r7c67bjf9j7r9yciljx2sgnarrjaf1gazf6n8rjjar2jfmrsmrm", - "depends": ["Biobase", "knitr", "pander", "S4Vectors", "xtable"] + "depends": ["Biobase", "S4Vectors", "knitr", "pander", "xtable"] }, "qmtools": { "name": "qmtools", "version": "1.8.0", "sha256": "1w0kd1kawf0w4rmlz8pfnabagrjvnyql2bcs2f7nl7sp6q7sfvni", - "depends": ["ggplot2", "heatmaply", "igraph", "limma", "MsCoreUtils", "patchwork", "rlang", "scales", "SummarizedExperiment", "VIM"] + "depends": ["MsCoreUtils", "SummarizedExperiment", "VIM", "ggplot2", "heatmaply", "igraph", "limma", "patchwork", "rlang", "scales"] }, "qpcrNorm": { "name": "qpcrNorm", "version": "1.62.0", "sha256": "1rcs9p5y50ynwmpxqwhigh9qxgs54shrglzjnakq08j24hxkyd2h", - "depends": ["affy", "Biobase", "limma"] + "depends": ["Biobase", "affy", "limma"] }, "qpgraph": { "name": "qpgraph", "version": "2.38.0", "sha256": "040haanlhmd11isghcrdidf2nal4195kskp0q8965x41fbdvsx37", - "depends": ["annotate", "AnnotationDbi", "Biobase", "BiocParallel", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "graph", "IRanges", "Matrix", "mvtnorm", "qtl", "Rgraphviz", "S4Vectors"] + "depends": ["AnnotationDbi", "Biobase", "BiocParallel", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rgraphviz", "S4Vectors", "annotate", "graph", "mvtnorm", "qtl"] }, "qsea": { "name": "qsea", "version": "1.30.0", "sha256": "141fi7zk9czr4j1d0y1hk1hz33nq3k79cdkawp0x92nvja1n9njd", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicRanges", "gtools", "HMMcopy", "IRanges", "limma", "Rsamtools", "rtracklayer", "S4Vectors", "zoo"] + "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "HMMcopy", "IRanges", "Rsamtools", "S4Vectors", "gtools", "limma", "rtracklayer", "zoo"] }, "qsmooth": { "name": "qsmooth", @@ -11323,19 +11365,19 @@ "name": "qsvaR", "version": "1.8.0", "sha256": "1ijmh0mby6j50icwlcfhn416x0cjj5y0v3qqjmcn4hx6395m90ma", - "depends": ["ggplot2", "SummarizedExperiment", "sva"] + "depends": ["SummarizedExperiment", "ggplot2", "sva"] }, "quantiseqr": { "name": "quantiseqr", "version": "1.12.0", "sha256": "0d1afsz7hv4ixpicskzw564cq593jcfkix7rryq5lbj27rz5da3c", - "depends": ["Biobase", "ggplot2", "limSolve", "MASS", "preprocessCore", "rlang", "SummarizedExperiment", "tidyr"] + "depends": ["Biobase", "MASS", "SummarizedExperiment", "ggplot2", "limSolve", "preprocessCore", "rlang", "tidyr"] }, "quantro": { "name": "quantro", "version": "1.38.0", "sha256": "0b8afvnczkhmbdg5zna2h5v42zdyvk1zybn9cwcbw22rijiysq99", - "depends": ["Biobase", "doParallel", "foreach", "ggplot2", "iterators", "minfi", "RColorBrewer"] + "depends": ["Biobase", "RColorBrewer", "doParallel", "foreach", "ggplot2", "iterators", "minfi"] }, "quantsmooth": { "name": "quantsmooth", @@ -11359,7 +11401,7 @@ "name": "r3Cseq", "version": "1.50.0", "sha256": "02dc6milwymwj90x24fip8av84ik9dp69sg9g7l300kwyk0hcrb7", - "depends": ["Biostrings", "data_table", "GenomeInfoDb", "GenomicRanges", "IRanges", "qvalue", "RColorBrewer", "Rsamtools", "rtracklayer", "sqldf", "VGAM"] + "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "VGAM", "data_table", "qvalue", "rtracklayer", "sqldf"] }, "rBLAST": { "name": "rBLAST", @@ -11371,13 +11413,13 @@ "name": "rBiopaxParser", "version": "2.44.0", "sha256": "0hzs6i7l8n1hifj3b91n1f6z3l40jdcl1jlnz8z5qczk84266lx2", - "depends": ["data_table", "XML"] + "depends": ["XML", "data_table"] }, "rCGH": { "name": "rCGH", "version": "1.34.0", "sha256": "0241nrg1kcc6vxj1p6pp5gyjff7k3mdsr764bn3zxvh1wqjnvfrm", - "depends": ["aCGH", "affy", "AnnotationDbi", "DNAcopy", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "lattice", "limma", "mclust", "org_Hs_eg_db", "plyr", "shiny", "TxDb_Hsapiens_UCSC_hg18_knownGene", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene"] + "depends": ["AnnotationDbi", "DNAcopy", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "TxDb_Hsapiens_UCSC_hg18_knownGene", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "aCGH", "affy", "ggplot2", "lattice", "limma", "mclust", "org_Hs_eg_db", "plyr", "shiny"] }, "rDGIdb": { "name": "rDGIdb", @@ -11389,19 +11431,19 @@ "name": "rGADEM", "version": "2.52.0", "sha256": "1d1vfnxj1p4y1074ybmkxv4x3v0i3sn5w3k4bddzlrqbzyb9kkna", - "depends": ["Biostrings", "BSgenome", "GenomicRanges", "IRanges", "seqLogo"] + "depends": ["BSgenome", "Biostrings", "GenomicRanges", "IRanges", "seqLogo"] }, "rGREAT": { "name": "rGREAT", "version": "2.6.0", "sha256": "0sszyfnnzzn5xhs39zgkzr7f3da820nxr6qaw68wknblgmyyddi8", - "depends": ["AnnotationDbi", "circlize", "digest", "doParallel", "DT", "foreach", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "GetoptLong", "GlobalOptions", "GO_db", "IRanges", "org_Hs_eg_db", "progress", "RColorBrewer", "Rcpp", "RCurl", "rjson", "S4Vectors", "shiny", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene"] + "depends": ["AnnotationDbi", "DT", "GO_db", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "GetoptLong", "GlobalOptions", "IRanges", "RColorBrewer", "RCurl", "Rcpp", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "circlize", "digest", "doParallel", "foreach", "org_Hs_eg_db", "progress", "rjson", "shiny"] }, "rGenomeTracks": { "name": "rGenomeTracks", "version": "1.10.0", "sha256": "0a34xdmpj1872vxhd9a2k1rbzgvsmhisyy2pknbz606924k13xnz", - "depends": ["imager", "reticulate", "rGenomeTracksData"] + "depends": ["imager", "rGenomeTracksData", "reticulate"] }, "rRDP": { "name": "rRDP", @@ -11419,13 +11461,13 @@ "name": "rScudo", "version": "1.20.0", "sha256": "0mhhv5p1z334qn92bql4rsd8p0xpnhd26kzahwi4wqkkb6yqbn8y", - "depends": ["Biobase", "BiocGenerics", "igraph", "S4Vectors", "stringr", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "S4Vectors", "SummarizedExperiment", "igraph", "stringr"] }, "rTRM": { "name": "rTRM", "version": "1.42.0", "sha256": "016vhij3rc6sbhi7caxxnpps4w0w2n28x4hqwdxkxk6r0f6kkvla", - "depends": ["AnnotationDbi", "DBI", "igraph", "RSQLite"] + "depends": ["AnnotationDbi", "DBI", "RSQLite", "igraph"] }, "rTRMui": { "name": "rTRMui", @@ -11437,13 +11479,13 @@ "name": "rWikiPathways", "version": "1.24.0", "sha256": "1m6djs70h58xs4323vp65j33i8mzql2sps9l04pgp28cs17yr4mc", - "depends": ["data_table", "dplyr", "httr", "lubridate", "purrr", "RCurl", "readr", "rjson", "stringr", "tidyr", "XML"] + "depends": ["RCurl", "XML", "data_table", "dplyr", "httr", "lubridate", "purrr", "readr", "rjson", "stringr", "tidyr"] }, "raer": { "name": "raer", "version": "1.2.0", "sha256": "0fxc1i3p1ha0yn6s5c334q2bv7mfwjd3yvlvss6whi16vi63kbwj", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "cli", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rhtslib", "Rsamtools", "rtracklayer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rhtslib", "Rsamtools", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cli", "rtracklayer"] }, "rain": { "name": "rain", @@ -11455,13 +11497,13 @@ "name": "ramr", "version": "1.12.0", "sha256": "096rxydr9qilg4lcczab1xlzv5ff2lq9r5l6bdzyhprm07mglc80", - "depends": ["BiocGenerics", "doParallel", "doRNG", "EnvStats", "ExtDist", "foreach", "GenomicRanges", "ggplot2", "IRanges", "matrixStats", "reshape2", "S4Vectors"] + "depends": ["BiocGenerics", "EnvStats", "ExtDist", "GenomicRanges", "IRanges", "S4Vectors", "doParallel", "doRNG", "foreach", "ggplot2", "matrixStats", "reshape2"] }, "ramwas": { "name": "ramwas", "version": "1.28.0", "sha256": "0azf24qvjy2dfizi0wp7lkrhjdm2xwwk6hmkg31ly501cjd4pn9s", - "depends": ["BiocGenerics", "biomaRt", "Biostrings", "digest", "filematrix", "GenomicAlignments", "glmnet", "KernSmooth", "Rsamtools"] + "depends": ["BiocGenerics", "Biostrings", "GenomicAlignments", "KernSmooth", "Rsamtools", "biomaRt", "digest", "filematrix", "glmnet"] }, "randPack": { "name": "randPack", @@ -11509,67 +11551,67 @@ "name": "receptLoss", "version": "1.16.0", "sha256": "1c110rpfbi6rgl97659qx5qyj6wp6sqzddpnjg3bir21nh6902fl", - "depends": ["dplyr", "ggplot2", "magrittr", "SummarizedExperiment", "tidyr"] + "depends": ["SummarizedExperiment", "dplyr", "ggplot2", "magrittr", "tidyr"] }, "reconsi": { "name": "reconsi", "version": "1.16.0", "sha256": "13xviw2qn8sk7ka6qskb39dsv9qz4vkfdydpzzvm14y6iy62zgzr", - "depends": ["ggplot2", "ks", "Matrix", "matrixStats", "phyloseq", "reshape2"] + "depends": ["Matrix", "ggplot2", "ks", "matrixStats", "phyloseq", "reshape2"] }, "recount": { "name": "recount", "version": "1.30.2", "sha256": "0fdnp0ilvxkzyzwblbchf6ns1v6fah32zyg3y68pz88ir5nwg49b", - "depends": ["BiocParallel", "derfinder", "downloader", "GenomeInfoDb", "GenomicRanges", "GEOquery", "IRanges", "RCurl", "rentrez", "rtracklayer", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocParallel", "GEOquery", "GenomeInfoDb", "GenomicRanges", "IRanges", "RCurl", "S4Vectors", "SummarizedExperiment", "derfinder", "downloader", "rentrez", "rtracklayer"] }, "recount3": { "name": "recount3", "version": "1.14.0", "sha256": "1dmc5s5mw95caq2pqpgik5z5nggy5mnas1dawssiyhr10wivnjd0", - "depends": ["BiocFileCache", "data_table", "GenomicRanges", "httr", "Matrix", "R_utils", "rtracklayer", "S4Vectors", "sessioninfo", "SummarizedExperiment"] + "depends": ["BiocFileCache", "GenomicRanges", "Matrix", "R_utils", "S4Vectors", "SummarizedExperiment", "data_table", "httr", "rtracklayer", "sessioninfo"] }, "recountmethylation": { "name": "recountmethylation", "version": "1.14.0", "sha256": "0cbp1cz6h1djwgrv2achgypmxiracrjm8y8sj1f9iqy6i1fgq8jl", - "depends": ["basilisk", "BiocFileCache", "DelayedMatrixStats", "HDF5Array", "minfi", "R_utils", "RCurl", "reticulate", "rhdf5", "S4Vectors"] + "depends": ["BiocFileCache", "DelayedMatrixStats", "HDF5Array", "RCurl", "R_utils", "S4Vectors", "basilisk", "minfi", "reticulate", "rhdf5"] }, "recoup": { "name": "recoup", "version": "1.32.0", "sha256": "07313l0b78x0m0vp8ipngzv069v7vjgr8q7vv4j9kbr33kql3bp6", - "depends": ["BiocGenerics", "biomaRt", "Biostrings", "circlize", "ComplexHeatmap", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "httr", "IRanges", "Rsamtools", "RSQLite", "rtracklayer", "S4Vectors", "stringr", "txdbmaker"] + "depends": ["BiocGenerics", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "Rsamtools", "S4Vectors", "biomaRt", "circlize", "ggplot2", "httr", "rtracklayer", "stringr", "txdbmaker"] }, "regionReport": { "name": "regionReport", "version": "1.38.0", "sha256": "1nxs0slhhnxpjg220irf0a6hsh1zp0xh54ffpvl25lzgy422xwpp", - "depends": ["BiocStyle", "DEFormats", "derfinder", "DESeq2", "GenomeInfoDb", "GenomicRanges", "knitr", "knitrBootstrap", "RefManageR", "rmarkdown", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocStyle", "DEFormats", "DESeq2", "GenomeInfoDb", "GenomicRanges", "RefManageR", "S4Vectors", "SummarizedExperiment", "derfinder", "knitr", "knitrBootstrap", "rmarkdown"] }, "regionalpcs": { "name": "regionalpcs", "version": "1.2.0", "sha256": "1hrmxb2ag0d823kn3ya07rwgfv931x2shqzdq3q310rw9jllcwgd", - "depends": ["dplyr", "GenomicRanges", "PCAtools", "tibble"] + "depends": ["GenomicRanges", "PCAtools", "dplyr", "tibble"] }, "regioneR": { "name": "regioneR", "version": "1.36.0", "sha256": "1ygdlqvhf165mqd247783pi1yzidqap8b913444vrs881n62xvrb", - "depends": ["Biostrings", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "memoise", "rtracklayer", "S4Vectors"] + "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "memoise", "rtracklayer"] }, "regioneReloaded": { "name": "regioneReloaded", "version": "1.6.0", "sha256": "1yi97sarqljayqm5lwci0z768qk0vzqiazpx8j6lvpsqhrsgmcry", - "depends": ["cluster", "ggplot2", "ggrepel", "RColorBrewer", "regioneR", "reshape2", "Rtsne", "scales", "umap"] + "depends": ["RColorBrewer", "Rtsne", "cluster", "ggplot2", "ggrepel", "regioneR", "reshape2", "scales", "umap"] }, "regsplice": { "name": "regsplice", "version": "1.30.0", "sha256": "0cmqigb2klpq7nqvhmvmyf9xzgjfvw22zpgpcjnlv24ga30sacak", - "depends": ["edgeR", "glmnet", "limma", "pbapply", "S4Vectors", "SummarizedExperiment"] + "depends": ["S4Vectors", "SummarizedExperiment", "edgeR", "glmnet", "limma", "pbapply"] }, "regutools": { "name": "regutools", @@ -11587,43 +11629,43 @@ "name": "rexposome", "version": "1.26.0", "sha256": "13ivwypcw58bmlrps16anhxf0dxk8v16wyadwz4wds4rd0ihjvcz", - "depends": ["Biobase", "circlize", "corrplot", "FactoMineR", "ggplot2", "ggrepel", "ggridges", "glmnet", "gplots", "gridExtra", "gtools", "Hmisc", "imputeLCMD", "lme4", "lsr", "mice", "pryr", "reshape2", "S4Vectors", "scales", "scatterplot3d", "stringr"] + "depends": ["Biobase", "FactoMineR", "Hmisc", "S4Vectors", "circlize", "corrplot", "ggplot2", "ggrepel", "ggridges", "glmnet", "gplots", "gridExtra", "gtools", "imputeLCMD", "lme4", "lsr", "mice", "pryr", "reshape2", "scales", "scatterplot3d", "stringr"] }, "rfPred": { "name": "rfPred", "version": "1.42.0", "sha256": "02clazsix7n4nnz1kn7hkk48fggxp2bqf97xbzngnljskvlhnakb", - "depends": ["data_table", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "data_table"] }, "rfaRm": { "name": "rfaRm", "version": "1.16.0", "sha256": "1c8kpcbwkz33cbc8xqfd5cqj1n979a9ijbj06nfgylkm71ma1682", - "depends": ["Biostrings", "data_table", "httr", "IRanges", "jsonlite", "magick", "rsvg", "rvest", "S4Vectors", "stringi", "xml2"] + "depends": ["Biostrings", "IRanges", "S4Vectors", "data_table", "httr", "jsonlite", "magick", "rsvg", "rvest", "stringi", "xml2"] }, "rgoslin": { "name": "rgoslin", "version": "1.8.0", "sha256": "0saxw5kppcw0hwjykgzx8873izbl509hq1ga8w9qg2c5zx5xahk9", - "depends": ["dplyr", "Rcpp"] + "depends": ["Rcpp", "dplyr"] }, "rgsepd": { "name": "rgsepd", "version": "1.36.0", "sha256": "18r2naxir299k0gcd9j3a5rvdma590m06v38j8wiligsgw5cmkfg", - "depends": ["AnnotationDbi", "biomaRt", "DESeq2", "GO_db", "goseq", "gplots", "org_Hs_eg_db", "SummarizedExperiment"] + "depends": ["AnnotationDbi", "DESeq2", "GO_db", "SummarizedExperiment", "biomaRt", "goseq", "gplots", "org_Hs_eg_db"] }, "rhdf5": { "name": "rhdf5", "version": "2.48.0", "sha256": "086bnwzmlwq3z9a4kb1rnzb2wnchhi4gvzpijhladgd83nqyb0wn", - "depends": ["rhdf5filters", "Rhdf5lib"] + "depends": ["Rhdf5lib", "rhdf5filters"] }, "rhdf5client": { "name": "rhdf5client", "version": "1.26.0", "sha256": "17c8r361za3760lkik2b88c3m8zska33qam2iwbl5hw9yhkrl6ck", - "depends": ["data_table", "DelayedArray", "httr", "rjson"] + "depends": ["DelayedArray", "data_table", "httr", "rjson"] }, "rhdf5filters": { "name": "rhdf5filters", @@ -11635,31 +11677,31 @@ "name": "riboSeqR", "version": "1.38.0", "sha256": "0p0q28n8hlai80pxxns9pzzg552pbwlxlph8zjf78bwbjagrfbz5", - "depends": ["abind", "baySeq", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "seqLogo"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "abind", "baySeq", "seqLogo"] }, "ribor": { "name": "ribor", "version": "1.16.0", "sha256": "0kymbmm96a7ccl0dz46sk0lzgf3n55qvdkywkj91kh0ddrsji0vi", - "depends": ["dplyr", "ggplot2", "hash", "rhdf5", "rlang", "S4Vectors", "tidyr", "yaml"] + "depends": ["S4Vectors", "dplyr", "ggplot2", "hash", "rhdf5", "rlang", "tidyr", "yaml"] }, "ribosomeProfilingQC": { "name": "ribosomeProfilingQC", "version": "1.16.0", "sha256": "0bblk7ncxdrbgmgcjvif9zgd1ynlh4205vlmgr42jbg5p1i7p3in", - "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "BSgenome", "cluster", "EDASeq", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggExtra", "ggfittext", "ggplot2", "ggrepel", "IRanges", "motifStack", "Rsamtools", "Rsubread", "rtracklayer", "RUVSeq", "S4Vectors", "scales", "txdbmaker", "XVector"] + "depends": ["AnnotationDbi", "BSgenome", "BiocGenerics", "Biostrings", "EDASeq", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RUVSeq", "Rsamtools", "Rsubread", "S4Vectors", "XVector", "cluster", "ggExtra", "ggfittext", "ggplot2", "ggrepel", "motifStack", "rtracklayer", "scales", "txdbmaker"] }, "rifi": { "name": "rifi", "version": "1.8.0", "sha256": "0yajsqm27zy5imb719x8knsrn9rk85q98wc65xqmvj9bkqkjfvdl", - "depends": ["car", "cowplot", "doMC", "dplyr", "egg", "foreach", "ggplot2", "nls2", "nnet", "reshape2", "rlang", "rtracklayer", "S4Vectors", "scales", "stringr", "SummarizedExperiment", "tibble"] + "depends": ["S4Vectors", "SummarizedExperiment", "car", "cowplot", "doMC", "dplyr", "egg", "foreach", "ggplot2", "nls2", "nnet", "reshape2", "rlang", "rtracklayer", "scales", "stringr", "tibble"] }, "rifiComparative": { "name": "rifiComparative", "version": "1.4.0", "sha256": "0isgcbmk7c99xhlasaaa2gyjf9827zfdq1vyf4xc21lyhv9q5j51", - "depends": ["cowplot", "devtools", "doMC", "dplyr", "DTA", "egg", "foreach", "ggplot2", "ggrepel", "LSD", "nnet", "reshape2", "rlang", "rtracklayer", "S4Vectors", "scales", "stringr", "SummarizedExperiment", "tibble", "writexl"] + "depends": ["DTA", "LSD", "S4Vectors", "SummarizedExperiment", "cowplot", "devtools", "doMC", "dplyr", "egg", "foreach", "ggplot2", "ggrepel", "nnet", "reshape2", "rlang", "rtracklayer", "scales", "stringr", "tibble", "writexl"] }, "rmelting": { "name": "rmelting", @@ -11677,7 +11719,7 @@ "name": "rnaEditr", "version": "1.14.0", "sha256": "1jghirl1iz11wm4sq8qvw2fvgha7q6ili6bddgpdfcn07abbkcsm", - "depends": ["BiocGenerics", "bumphunter", "corrplot", "GenomeInfoDb", "GenomicRanges", "IRanges", "logistf", "plyr", "S4Vectors", "survival"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "bumphunter", "corrplot", "logistf", "plyr", "survival"] }, "rnaseqcomp": { "name": "rnaseqcomp", @@ -11689,13 +11731,13 @@ "name": "roar", "version": "1.40.0", "sha256": "06d1w5kknm2mb6v6glmyd97n1a33529kgqkkyfbk277ikn45hi9f", - "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "rtracklayer", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "rtracklayer"] }, "roastgsa": { "name": "roastgsa", "version": "1.2.0", "sha256": "00rxmlx94y03mkz5jbwqx4px1cwv63nblhj2yxidy2k5374fk7fy", - "depends": ["Biobase", "ggplot2", "gplots", "limma", "RColorBrewer"] + "depends": ["Biobase", "RColorBrewer", "ggplot2", "gplots", "limma"] }, "rols": { "name": "rols", @@ -11707,31 +11749,31 @@ "name": "ropls", "version": "1.36.0", "sha256": "0cdkwzrbr6h1dfi3qdh629hi2jlm1hxgq4dvx4z3vc2r6w0c6m11", - "depends": ["Biobase", "ggplot2", "MultiAssayExperiment", "MultiDataSet", "plotly", "SummarizedExperiment"] + "depends": ["Biobase", "MultiAssayExperiment", "MultiDataSet", "SummarizedExperiment", "ggplot2", "plotly"] }, "rprimer": { "name": "rprimer", "version": "1.8.0", "sha256": "04maldspcfzszvbgvzq4fmaf62639kb2rs2dqm9r9miqqxqndkr3", - "depends": ["Biostrings", "bslib", "DT", "ggplot2", "IRanges", "mathjaxr", "patchwork", "reshape2", "S4Vectors", "shiny", "shinycssloaders", "shinyFeedback"] + "depends": ["Biostrings", "DT", "IRanges", "S4Vectors", "bslib", "ggplot2", "mathjaxr", "patchwork", "reshape2", "shiny", "shinyFeedback", "shinycssloaders"] }, "rpx": { "name": "rpx", "version": "2.12.0", "sha256": "1a3rh2f9wwgcgadgb5ryj8vs9kcyhqwz7wdnykv2pl3pgm8ba2zp", - "depends": ["BiocFileCache", "curl", "jsonlite", "RCurl", "xml2"] + "depends": ["BiocFileCache", "RCurl", "curl", "jsonlite", "xml2"] }, "rqubic": { "name": "rqubic", "version": "1.50.0", "sha256": "1hr0i7f8987x79ir34yg65bzkd7lij03rkfmw6dr289d8kjclap2", - "depends": ["biclust", "Biobase", "BiocGenerics"] + "depends": ["Biobase", "BiocGenerics", "biclust"] }, "rrvgo": { "name": "rrvgo", "version": "1.16.0", "sha256": "1339cxx5sizbdhhya1kxq9x31m2qvdl993abr4pn07hs3awya63p", - "depends": ["AnnotationDbi", "ggplot2", "ggrepel", "GO_db", "GOSemSim", "pheatmap", "shiny", "tm", "treemap", "umap", "wordcloud"] + "depends": ["AnnotationDbi", "GOSemSim", "GO_db", "ggplot2", "ggrepel", "pheatmap", "shiny", "tm", "treemap", "umap", "wordcloud"] }, "rsbml": { "name": "rsbml", @@ -11749,31 +11791,31 @@ "name": "rtracklayer", "version": "1.64.0", "sha256": "0h2cqr1jqqqxvkmqpngfl8ppm1p65vvlb1wgfwl9r4f99b8vz33g", - "depends": ["BiocGenerics", "BiocIO", "Biostrings", "curl", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "httr", "IRanges", "restfulr", "Rsamtools", "S4Vectors", "XML", "XVector", "zlibbioc"] + "depends": ["BiocGenerics", "BiocIO", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "XML", "XVector", "curl", "httr", "restfulr", "zlibbioc"] }, "runibic": { "name": "runibic", "version": "1.26.0", "sha256": "0q25b2dfgp82p156l37zzl5a842ah3hzq60f9gkcv4vqkns99z64", - "depends": ["biclust", "Rcpp", "SummarizedExperiment", "testthat"] + "depends": ["Rcpp", "SummarizedExperiment", "biclust", "testthat"] }, "sRACIPE": { "name": "sRACIPE", "version": "1.20.0", "sha256": "0kkfci9mifhb905c88cyfvwy6yacb1ar0ai6lcxhyx60bwnv6x7i", - "depends": ["BiocGenerics", "ggplot2", "gplots", "gridExtra", "htmlwidgets", "MASS", "RColorBrewer", "Rcpp", "reshape2", "S4Vectors", "SummarizedExperiment", "umap", "visNetwork"] + "depends": ["BiocGenerics", "MASS", "RColorBrewer", "Rcpp", "S4Vectors", "SummarizedExperiment", "ggplot2", "gplots", "gridExtra", "htmlwidgets", "reshape2", "umap", "visNetwork"] }, "sSNAPPY": { "name": "sSNAPPY", "version": "1.8.0", "sha256": "0ij3f7xax92jihzhf6axx7sq36jcnvyjfhgan1m1mcsaandb4d4k", - "depends": ["dplyr", "edgeR", "ggforce", "ggplot2", "ggraph", "graphite", "gtools", "igraph", "magrittr", "org_Hs_eg_db", "pheatmap", "reshape2", "rlang", "stringr", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["SummarizedExperiment", "dplyr", "edgeR", "ggforce", "ggplot2", "ggraph", "graphite", "gtools", "igraph", "magrittr", "org_Hs_eg_db", "pheatmap", "reshape2", "rlang", "stringr", "tibble", "tidyr"] }, "sSeq": { "name": "sSeq", "version": "1.42.0", "sha256": "08wjz54qsgdwbf3rscb8mzqx2ffm62dm589zj4hflb1ayhgza2ai", - "depends": ["caTools", "RColorBrewer"] + "depends": ["RColorBrewer", "caTools"] }, "safe": { "name": "safe", @@ -11791,13 +11833,13 @@ "name": "sampleClassifier", "version": "1.28.0", "sha256": "12c8di5xw7q3a78z75labq3qzwsnk7s1xr5c75xsy8k2f04npn0z", - "depends": ["annotate", "e1071", "ggplot2", "MGFM", "MGFR"] + "depends": ["MGFM", "MGFR", "annotate", "e1071", "ggplot2"] }, "sangeranalyseR": { "name": "sangeranalyseR", "version": "1.14.0", "sha256": "1l5capnvhd78lzaiv44q9qiw9vdlnygmflmrqyv3ck3qk59hwsaw", - "depends": ["ape", "BiocStyle", "Biostrings", "data_table", "DECIPHER", "DT", "excelR", "ggdendro", "gridExtra", "knitr", "logger", "openxlsx", "plotly", "pwalign", "reshape2", "rmarkdown", "sangerseqR", "seqinr", "shiny", "shinycssloaders", "shinydashboard", "shinyjs", "shinyWidgets", "stringr", "zeallot"] + "depends": ["BiocStyle", "Biostrings", "DECIPHER", "DT", "ape", "data_table", "excelR", "ggdendro", "gridExtra", "knitr", "logger", "openxlsx", "plotly", "pwalign", "reshape2", "rmarkdown", "sangerseqR", "seqinr", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyjs", "stringr", "zeallot"] }, "sangerseqR": { "name": "sangerseqR", @@ -11809,73 +11851,79 @@ "name": "sarks", "version": "1.16.0", "sha256": "1ayfxfgk1zwmychdlhbq3can76swa127z5r587frs3c23zbm8qi2", - "depends": ["binom", "Biostrings", "cluster", "IRanges", "rJava"] + "depends": ["Biostrings", "IRanges", "binom", "cluster", "rJava"] }, "saseR": { "name": "saseR", "version": "1.0.0", "sha256": "1ibr75zm09h9cwzizljlv33s09y2jz2fasnblhmm59xdb8gwl7vg", - "depends": ["ASpli", "BiocGenerics", "BiocParallel", "data_table", "DESeq2", "DEXSeq", "dplyr", "edgeR", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "igraph", "IRanges", "knitr", "limma", "MASS", "MatrixGenerics", "pracma", "precrec", "PRROC", "rrcov", "S4Vectors", "SummarizedExperiment"] + "depends": ["ASpli", "BiocGenerics", "BiocParallel", "DESeq2", "DEXSeq", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "MatrixGenerics", "PRROC", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "edgeR", "igraph", "knitr", "limma", "pracma", "precrec", "rrcov"] }, "satuRn": { "name": "satuRn", "version": "1.12.0", "sha256": "03mlb4j219w8760zm5hnryjwxns3qz9y3wl6zaqdfnl94bwyl9r8", - "depends": ["BiocParallel", "boot", "ggplot2", "limma", "locfdr", "Matrix", "pbapply", "SummarizedExperiment"] + "depends": ["BiocParallel", "Matrix", "SummarizedExperiment", "boot", "ggplot2", "limma", "locfdr", "pbapply"] }, "scAnnotatR": { "name": "scAnnotatR", "version": "1.10.0", "sha256": "1gzssp7im1d9pp2mbar27k854fcc3rqyza5d77flmhshq88xrskv", - "depends": ["AnnotationHub", "ape", "caret", "data_tree", "dplyr", "e1071", "ggplot2", "kernlab", "pROC", "ROCR", "Seurat", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["AnnotationHub", "ROCR", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "ape", "caret", "data_tree", "dplyr", "e1071", "ggplot2", "kernlab", "pROC"] }, "scBFA": { "name": "scBFA", "version": "1.18.0", "sha256": "0zq4xnvzlprhlv2n7d41ikms6cmwvm51sn3f61841ch6hdfai7my", - "depends": ["copula", "DESeq2", "ggplot2", "MASS", "Matrix", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "zinbwave"] + "depends": ["DESeq2", "MASS", "Matrix", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "copula", "ggplot2", "zinbwave"] }, "scBubbletree": { "name": "scBubbletree", "version": "1.6.0", "sha256": "0adzmw4bzs1a857bwwq63niwgn5wm3mdqxbqhily49h7yxnf3rv7", - "depends": ["ape", "future", "future_apply", "ggplot2", "ggtree", "patchwork", "proxy", "reshape2", "scales", "Seurat"] + "depends": ["Seurat", "ape", "future", "future_apply", "ggplot2", "ggtree", "patchwork", "proxy", "reshape2", "scales"] }, "scCB2": { "name": "scCB2", "version": "1.14.0", "sha256": "1iwcx1wra4f3lnqsmbs5m0agd6ffmpmdwn767n8q0qgvy8sdjaw0", - "depends": ["doParallel", "DropletUtils", "edgeR", "foreach", "iterators", "Matrix", "rhdf5", "Seurat", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["DropletUtils", "Matrix", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "doParallel", "edgeR", "foreach", "iterators", "rhdf5"] + }, + "scClassify": { + "name": "scClassify", + "version": "1.16.0", + "sha256": "1ymrxm5xmhiaj5vzv2xy35pxn0jxjjjdzclx7f3qznbxyfkd35nm", + "depends": ["BiocParallel", "Cepo", "Matrix", "S4Vectors", "cluster", "diptest", "ggplot2", "ggraph", "hopach", "igraph", "limma", "mgcv", "minpack_lm", "mixtools", "proxy", "proxyC", "statmod"] }, "scDD": { "name": "scDD", "version": "1.28.0", "sha256": "106hawmyln6xj9m2npibb4lkd8qvz60lwjabhn3cpx3908x88ryb", - "depends": ["arm", "BiocParallel", "EBSeq", "fields", "ggplot2", "mclust", "outliers", "S4Vectors", "scran", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocParallel", "EBSeq", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "arm", "fields", "ggplot2", "mclust", "outliers", "scran"] }, "scDDboost": { "name": "scDDboost", "version": "1.6.0", "sha256": "0q4vrrcnnhwb3r9jn13d1wsjn9mxai39pxaa9lf6zmg1v17aqmhg", - "depends": ["BH", "BiocParallel", "cluster", "EBSeq", "ggplot2", "mclust", "Oscope", "Rcpp", "RcppEigen", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BH", "BiocParallel", "EBSeq", "Oscope", "Rcpp", "RcppEigen", "SingleCellExperiment", "SummarizedExperiment", "cluster", "ggplot2", "mclust"] }, "scDataviz": { "name": "scDataviz", "version": "1.14.0", "sha256": "1njm8ym44ml51sbz001niclmkl4q78yid8ik76j9xnwldd9cb2c8", - "depends": ["corrplot", "flowCore", "ggplot2", "ggrepel", "MASS", "matrixStats", "RColorBrewer", "reshape2", "S4Vectors", "scales", "Seurat", "SingleCellExperiment", "umap"] + "depends": ["MASS", "RColorBrewer", "S4Vectors", "Seurat", "SingleCellExperiment", "corrplot", "flowCore", "ggplot2", "ggrepel", "matrixStats", "reshape2", "scales", "umap"] }, "scDblFinder": { "name": "scDblFinder", "version": "1.18.0", "sha256": "1np3arhjxxgif68i0wi0nqqbrwavy14dh9vy2g9mw4408k7789w0", - "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "bluster", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "igraph", "IRanges", "MASS", "Matrix", "Rsamtools", "rtracklayer", "S4Vectors", "scater", "scran", "scuttle", "SingleCellExperiment", "SummarizedExperiment", "xgboost"] + "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "IRanges", "MASS", "Matrix", "Rsamtools", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "bluster", "igraph", "rtracklayer", "scater", "scran", "scuttle", "xgboost"] }, "scDesign3": { "name": "scDesign3", "version": "1.2.0", "sha256": "0jf8g5llkcashxsjsm39fivdqpyjx40gn362yzpwcfh81f4x95x1", - "depends": ["BiocParallel", "coop", "dplyr", "gamlss", "gamlss_dist", "ggplot2", "irlba", "Matrix", "matrixStats", "mclust", "mgcv", "mvtnorm", "pbmcapply", "rvinecopulib", "SingleCellExperiment", "sparseMVN", "SummarizedExperiment", "tibble", "umap", "viridis"] + "depends": ["BiocParallel", "Matrix", "SingleCellExperiment", "SummarizedExperiment", "coop", "dplyr", "gamlss", "gamlss_dist", "ggplot2", "irlba", "matrixStats", "mclust", "mgcv", "mvtnorm", "pbmcapply", "rvinecopulib", "sparseMVN", "tibble", "umap", "viridis"] }, "scFeatureFilter": { "name": "scFeatureFilter", @@ -11887,91 +11935,91 @@ "name": "scFeatures", "version": "1.4.0", "sha256": "178xpi6r1avbp4g9v5yd46jhnra6md47mljpn9y8a5991wh0rc4i", - "depends": ["ape", "AUCell", "BiocParallel", "cli", "DelayedArray", "DelayedMatrixStats", "dplyr", "DT", "EnsDb_Hsapiens_v79", "EnsDb_Mmusculus_v79", "ensembldb", "glue", "GSVA", "gtools", "MatrixGenerics", "msigdbr", "proxyC", "reshape2", "rmarkdown", "Seurat", "SingleCellSignalR", "spatstat_explore", "spatstat_geom", "tidyr"] + "depends": ["AUCell", "BiocParallel", "DT", "DelayedArray", "DelayedMatrixStats", "EnsDb_Hsapiens_v79", "EnsDb_Mmusculus_v79", "GSVA", "MatrixGenerics", "Seurat", "SingleCellSignalR", "ape", "cli", "dplyr", "ensembldb", "glue", "gtools", "msigdbr", "proxyC", "reshape2", "rmarkdown", "spatstat_explore", "spatstat_geom", "tidyr"] }, "scGPS": { "name": "scGPS", "version": "1.18.0", "sha256": "1l4rn2amrgih6fi3dshxdjgmvimv93qfan6asy77lgaf8vwa7rlh", - "depends": ["caret", "DESeq2", "dplyr", "dynamicTreeCut", "fastcluster", "ggplot2", "glmnet", "locfit", "Rcpp", "RcppArmadillo", "RcppParallel", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["DESeq2", "Rcpp", "RcppArmadillo", "RcppParallel", "SingleCellExperiment", "SummarizedExperiment", "caret", "dplyr", "dynamicTreeCut", "fastcluster", "ggplot2", "glmnet", "locfit"] }, "scHOT": { "name": "scHOT", "version": "1.16.0", "sha256": "07sk0yn5ji2avhmdwyzdl466pqncvij1zf0yicw5lpb62f1ac446", - "depends": ["BiocParallel", "ggforce", "ggplot2", "igraph", "IRanges", "Matrix", "reshape", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocParallel", "IRanges", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ggforce", "ggplot2", "igraph", "reshape"] }, "scMET": { "name": "scMET", "version": "1.6.0", "sha256": "1v0x40720npv2c468mhydycrhff9bz2c8m35n3j4y7bja05qaazx", - "depends": ["assertthat", "BH", "BiocStyle", "coda", "cowplot", "data_table", "dplyr", "ggplot2", "logitnorm", "MASS", "Matrix", "matrixStats", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "S4Vectors", "SingleCellExperiment", "StanHeaders", "SummarizedExperiment", "VGAM", "viridis"] + "depends": ["BH", "BiocStyle", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "S4Vectors", "SingleCellExperiment", "StanHeaders", "SummarizedExperiment", "VGAM", "assertthat", "coda", "cowplot", "data_table", "dplyr", "ggplot2", "logitnorm", "matrixStats", "rstan", "rstantools", "viridis"] }, "scMerge": { "name": "scMerge", "version": "1.20.0", "sha256": "0v344a2r7hw0x3b3192796sa922sc3jgi7z7pzbx6pcn4c5c9zw4", - "depends": ["batchelor", "BiocNeighbors", "BiocParallel", "BiocSingular", "cluster", "cvTools", "DelayedArray", "DelayedMatrixStats", "distr", "igraph", "M3Drop", "proxyC", "ruv", "S4Vectors", "scater", "scran", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "M3Drop", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "batchelor", "cluster", "cvTools", "distr", "igraph", "proxyC", "ruv", "scater", "scran"] }, "scMitoMut": { "name": "scMitoMut", "version": "1.0.0", "sha256": "143h22x71pgmzky1z6g6qvqq1qcb1852341sfsv4dwj2w5j00njm", - "depends": ["data_table", "ggplot2", "magrittr", "pheatmap", "plyr", "RColorBrewer", "Rcpp", "RcppArmadillo", "readr", "rhdf5", "stringr", "zlibbioc"] + "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "data_table", "ggplot2", "magrittr", "pheatmap", "plyr", "readr", "rhdf5", "stringr", "zlibbioc"] }, "scMultiSim": { "name": "scMultiSim", "version": "1.0.0", "sha256": "16kdxksszq0zhl7z1xavsr5s5fq9259g86pfbg2bqdwqhl1xgf70", - "depends": ["ape", "assertthat", "crayon", "dplyr", "foreach", "ggplot2", "gplots", "igraph", "KernelKnn", "markdown", "MASS", "matrixStats", "phytools", "rlang", "Rtsne", "SummarizedExperiment", "zeallot"] + "depends": ["KernelKnn", "MASS", "Rtsne", "SummarizedExperiment", "ape", "assertthat", "crayon", "dplyr", "foreach", "ggplot2", "gplots", "igraph", "markdown", "matrixStats", "phytools", "rlang", "zeallot"] }, "scPCA": { "name": "scPCA", "version": "1.18.0", "sha256": "00lfwv1l9w9wjqqpgy9hx2sxb7lps7av3lpr5670c2ncf30jm68m", - "depends": ["assertthat", "BiocParallel", "cluster", "coop", "DelayedArray", "dplyr", "elasticnet", "kernlab", "Matrix", "MatrixGenerics", "matrixStats", "origami", "purrr", "Rdpack", "RSpectra", "ScaledMatrix", "sparsepca", "stringr", "tibble"] + "depends": ["BiocParallel", "DelayedArray", "Matrix", "MatrixGenerics", "RSpectra", "Rdpack", "ScaledMatrix", "assertthat", "cluster", "coop", "dplyr", "elasticnet", "kernlab", "matrixStats", "origami", "purrr", "sparsepca", "stringr", "tibble"] }, "scPipe": { "name": "scPipe", "version": "2.4.0", "sha256": "0n786qxxkfiag88fi4bsf9vgmvx179cxfah6sld5ij34vq224809", - "depends": ["AnnotationDbi", "basilisk", "BiocGenerics", "biomaRt", "Biostrings", "data_table", "dplyr", "DropletUtils", "flexmix", "GenomicAlignments", "GenomicRanges", "GGally", "ggplot2", "glue", "hash", "IRanges", "magrittr", "MASS", "Matrix", "mclust", "MultiAssayExperiment", "org_Hs_eg_db", "org_Mm_eg_db", "purrr", "Rcpp", "reshape", "reticulate", "Rhtslib", "rlang", "robustbase", "Rsamtools", "Rsubread", "rtracklayer", "S4Vectors", "scales", "SingleCellExperiment", "stringr", "SummarizedExperiment", "testthat", "tibble", "tidyr", "vctrs", "zlibbioc"] + "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "DropletUtils", "GGally", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "Matrix", "MultiAssayExperiment", "Rcpp", "Rhtslib", "Rsamtools", "Rsubread", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "basilisk", "biomaRt", "data_table", "dplyr", "flexmix", "ggplot2", "glue", "hash", "magrittr", "mclust", "org_Hs_eg_db", "org_Mm_eg_db", "purrr", "reshape", "reticulate", "rlang", "robustbase", "rtracklayer", "scales", "stringr", "testthat", "tibble", "tidyr", "vctrs", "zlibbioc"] }, "scRNAseqApp": { "name": "scRNAseqApp", "version": "1.4.0", "sha256": "19wwsmslhya3m5qmqyg6pmm510r0zrh8480h1z8b7jcmkkhyla81", - "depends": ["bibtex", "bslib", "circlize", "ComplexHeatmap", "data_table", "DBI", "DT", "GenomeInfoDb", "GenomicRanges", "ggdendro", "ggforce", "ggplot2", "ggrepel", "ggridges", "gridExtra", "htmltools", "IRanges", "jsonlite", "magrittr", "patchwork", "plotly", "RColorBrewer", "RefManageR", "rhdf5", "Rsamtools", "RSQLite", "rtracklayer", "S4Vectors", "scales", "scrypt", "Seurat", "SeuratObject", "shiny", "shinyhelper", "shinymanager", "SingleCellExperiment", "slingshot", "sortable", "xfun", "xml2"] + "depends": ["ComplexHeatmap", "DBI", "DT", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "RSQLite", "RefManageR", "Rsamtools", "S4Vectors", "Seurat", "SeuratObject", "SingleCellExperiment", "bibtex", "bslib", "circlize", "data_table", "ggdendro", "ggforce", "ggplot2", "ggrepel", "ggridges", "gridExtra", "htmltools", "jsonlite", "magrittr", "patchwork", "plotly", "rhdf5", "rtracklayer", "scales", "scrypt", "shiny", "shinyhelper", "shinymanager", "slingshot", "sortable", "xfun", "xml2"] }, "scReClassify": { "name": "scReClassify", "version": "1.10.0", "sha256": "1m7l19kyfnwzk2wcmc9v5xmssfx1nm4v00z986s4xx7mhhx05dki", - "depends": ["e1071", "randomForest", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["SingleCellExperiment", "SummarizedExperiment", "e1071", "randomForest"] }, "scRecover": { "name": "scRecover", "version": "1.20.0", "sha256": "0nxxsgm7sr4mlskgflbf3xi322j67zfdvbk6vxwwp5bxil2r0m13", - "depends": ["bbmle", "BiocParallel", "doParallel", "foreach", "gamlss", "kernlab", "MASS", "Matrix", "penalized", "preseqR", "pscl", "rsvd", "SAVER"] + "depends": ["BiocParallel", "MASS", "Matrix", "SAVER", "bbmle", "doParallel", "foreach", "gamlss", "kernlab", "penalized", "preseqR", "pscl", "rsvd"] }, "scRepertoire": { "name": "scRepertoire", "version": "2.0.0", "sha256": "1ifnyfzswisacvxxf041l1snfv1b8x30pjg2pwampg804c56f1wj", - "depends": ["cubature", "dplyr", "evmix", "ggalluvial", "ggdendro", "ggplot2", "ggraph", "hash", "igraph", "iNEXT", "plyr", "quantreg", "Rcpp", "reshape2", "rjson", "rlang", "S4Vectors", "SeuratObject", "SingleCellExperiment", "stringdist", "stringr", "SummarizedExperiment", "tidygraph", "truncdist", "VGAM"] + "depends": ["Rcpp", "S4Vectors", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "VGAM", "cubature", "dplyr", "evmix", "ggalluvial", "ggdendro", "ggplot2", "ggraph", "hash", "iNEXT", "igraph", "plyr", "quantreg", "reshape2", "rjson", "rlang", "stringdist", "stringr", "tidygraph", "truncdist"] }, "scShapes": { "name": "scShapes", "version": "1.10.0", "sha256": "003948wggm6hss2yl9hizil0jv78yd3jipvrs9js8c93fp78cbrw", - "depends": ["BiocParallel", "dgof", "emdbook", "magrittr", "MASS", "Matrix", "pscl", "VGAM"] + "depends": ["BiocParallel", "MASS", "Matrix", "VGAM", "dgof", "emdbook", "magrittr", "pscl"] }, "scTGIF": { "name": "scTGIF", "version": "1.18.0", "sha256": "13sj8gqmjaq2qcap7dh8gb2di4v59qw3g7l7ryc7crfmj7c9wipd", - "depends": ["Biobase", "BiocStyle", "ggplot2", "GSEABase", "igraph", "knitr", "msigdbr", "nnTensor", "plotly", "RColorBrewer", "Rcpp", "rmarkdown", "S4Vectors", "scales", "schex", "SingleCellExperiment", "SummarizedExperiment", "tagcloud", "tibble"] + "depends": ["Biobase", "BiocStyle", "GSEABase", "RColorBrewer", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "igraph", "knitr", "msigdbr", "nnTensor", "plotly", "rmarkdown", "scales", "schex", "tagcloud", "tibble"] }, "scTHI": { "name": "scTHI", @@ -11983,31 +12031,31 @@ "name": "scTensor", "version": "2.14.0", "sha256": "1s4ayn2wx63zfqj6vh2zmnb6a3khwfwq5s7jsllgdwcxq8039i11", - "depends": ["abind", "AnnotationDbi", "AnnotationHub", "BiocManager", "BiocStyle", "Category", "ccTensor", "checkmate", "crayon", "DOSE", "ggplot2", "GOstats", "heatmaply", "igraph", "knitr", "MeSHDbi", "meshr", "nnTensor", "outliers", "plotly", "plotrix", "reactome_db", "ReactomePA", "rmarkdown", "RSQLite", "rTensor", "S4Vectors", "schex", "SingleCellExperiment", "SummarizedExperiment", "tagcloud", "visNetwork"] + "depends": ["AnnotationDbi", "AnnotationHub", "BiocManager", "BiocStyle", "Category", "DOSE", "GOstats", "MeSHDbi", "RSQLite", "ReactomePA", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "abind", "ccTensor", "checkmate", "crayon", "ggplot2", "heatmaply", "igraph", "knitr", "meshr", "nnTensor", "outliers", "plotly", "plotrix", "rTensor", "reactome_db", "rmarkdown", "schex", "tagcloud", "visNetwork"] }, "scTreeViz": { "name": "scTreeViz", "version": "1.10.0", "sha256": "1vmqd4bml6ikpbbd90kqrrfhi1bkv9vdjlxcai588807vcckg54a", - "depends": ["clustree", "data_table", "digest", "epivizr", "epivizrData", "epivizrServer", "ggplot2", "ggraph", "httr", "igraph", "Matrix", "Rtsne", "S4Vectors", "scater", "scran", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "sys"] + "depends": ["Matrix", "Rtsne", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "clustree", "data_table", "digest", "epivizr", "epivizrData", "epivizrServer", "ggplot2", "ggraph", "httr", "igraph", "scater", "scran", "sys"] }, "scanMiR": { "name": "scanMiR", "version": "1.10.0", "sha256": "1nmkfpkvq3qbgnql8c7glmxjyszwqp546v1ah78crnn3lnqkdchx", - "depends": ["BiocParallel", "Biostrings", "cowplot", "data_table", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "pwalign", "S4Vectors", "seqLogo", "stringi"] + "depends": ["BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "cowplot", "data_table", "ggplot2", "pwalign", "seqLogo", "stringi"] }, "scanMiRApp": { "name": "scanMiRApp", "version": "1.10.0", "sha256": "12id6sla58gk1xj56vh7aamkrplx85f2am58brq3p384z5inx9kj", - "depends": ["AnnotationDbi", "AnnotationFilter", "AnnotationHub", "BiocParallel", "Biostrings", "data_table", "digest", "DT", "ensembldb", "fst", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "htmlwidgets", "IRanges", "Matrix", "plotly", "rintrojs", "rtracklayer", "S4Vectors", "scanMiR", "scanMiRData", "shiny", "shinycssloaders", "shinydashboard", "shinyjqui", "txdbmaker", "waiter"] + "depends": ["AnnotationDbi", "AnnotationFilter", "AnnotationHub", "BiocParallel", "Biostrings", "DT", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "data_table", "digest", "ensembldb", "fst", "ggplot2", "htmlwidgets", "plotly", "rintrojs", "rtracklayer", "scanMiR", "scanMiRData", "shiny", "shinycssloaders", "shinydashboard", "shinyjqui", "txdbmaker", "waiter"] }, "scater": { "name": "scater", - "version": "1.32.0", - "sha256": "096crwk5a9i7h2pykyi6vgnrnxas9wdz5dx920yh74smyh527jiq", - "depends": ["beachmat", "BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "ggbeeswarm", "ggplot2", "ggrastr", "ggrepel", "Matrix", "MatrixGenerics", "pheatmap", "RColorBrewer", "RcppML", "rlang", "Rtsne", "S4Vectors", "scuttle", "SingleCellExperiment", "SummarizedExperiment", "uwot", "viridis"] + "version": "1.32.1", + "sha256": "1052jlflk596q8dbzhwx150ql53lhz109lljc011ni42a5zvjnbm", + "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "Matrix", "MatrixGenerics", "RColorBrewer", "RcppML", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "ggbeeswarm", "ggplot2", "ggrastr", "ggrepel", "pheatmap", "rlang", "scuttle", "uwot", "viridis"] }, "scatterHatch": { "name": "scatterHatch", @@ -12019,73 +12067,73 @@ "name": "sccomp", "version": "1.8.0", "sha256": "1dgv5pyf765p84i070fwdmhj1878rcimzjd6n3kx8j5r7mv10ff5", - "depends": ["BH", "boot", "dplyr", "forcats", "ggplot2", "ggrepel", "glue", "lifecycle", "magrittr", "patchwork", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "readr", "rlang", "rstan", "rstantools", "scales", "SeuratObject", "SingleCellExperiment", "StanHeaders", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "SeuratObject", "SingleCellExperiment", "StanHeaders", "boot", "dplyr", "forcats", "ggplot2", "ggrepel", "glue", "lifecycle", "magrittr", "patchwork", "purrr", "readr", "rlang", "rstan", "rstantools", "scales", "stringr", "tibble", "tidyr", "tidyselect"] }, "scde": { "name": "scde", "version": "2.32.0", "sha256": "0s54h3p8kvlk7imv8w8m1gwslyahn6jrggpkbgga5z7mqakvag6c", - "depends": ["BiocParallel", "Cairo", "edgeR", "extRemes", "flexmix", "MASS", "mgcv", "nnet", "pcaMethods", "quantreg", "RColorBrewer", "Rcpp", "RcppArmadillo", "rjson", "RMTstat", "Rook"] + "depends": ["BiocParallel", "Cairo", "MASS", "RColorBrewer", "RMTstat", "Rcpp", "RcppArmadillo", "Rook", "edgeR", "extRemes", "flexmix", "mgcv", "nnet", "pcaMethods", "quantreg", "rjson"] }, "scds": { "name": "scds", "version": "1.20.0", "sha256": "19xma4kmx8s6m6dvqyw461ahqyfqb7z3n5dz4ppab4xcpmqvx0vh", - "depends": ["dplyr", "Matrix", "pROC", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "xgboost"] + "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "pROC", "xgboost"] }, "schex": { "name": "schex", "version": "1.18.0", "sha256": "1wb3sksxvj08zqg34scwg1xrzj3hdk2jmyqswd03cjppyjy3ysq6", - "depends": ["cluster", "concaveman", "dplyr", "entropy", "ggforce", "ggplot2", "hexbin", "rlang", "SingleCellExperiment"] + "depends": ["SingleCellExperiment", "cluster", "concaveman", "dplyr", "entropy", "ggforce", "ggplot2", "hexbin", "rlang"] }, "scider": { "name": "scider", "version": "1.2.0", "sha256": "0i1p5pf6jc2f39cfmi5d8ifc7lb5n7m7k0lkgif5vhm2z4nfhrnf", - "depends": ["ggplot2", "igraph", "isoband", "janitor", "knitr", "lwgeom", "pheatmap", "plotly", "rlang", "S4Vectors", "sf", "shiny", "SpatialExperiment", "spatstat_explore", "spatstat_geom", "SummarizedExperiment"] + "depends": ["S4Vectors", "SpatialExperiment", "SummarizedExperiment", "ggplot2", "igraph", "isoband", "janitor", "knitr", "lwgeom", "pheatmap", "plotly", "rlang", "sf", "shiny", "spatstat_explore", "spatstat_geom"] }, "scifer": { "name": "scifer", "version": "1.6.0", "sha256": "022dn1492hjiyxxq0mqhvs299lgzg26jik7y5brh0i0ajj1j63fv", - "depends": ["Biostrings", "data_table", "DECIPHER", "dplyr", "flowCore", "ggplot2", "gridExtra", "kableExtra", "knitr", "plyr", "rlang", "rmarkdown", "sangerseqR", "scales", "stringr", "tibble"] + "depends": ["Biostrings", "DECIPHER", "data_table", "dplyr", "flowCore", "ggplot2", "gridExtra", "kableExtra", "knitr", "plyr", "rlang", "rmarkdown", "sangerseqR", "scales", "stringr", "tibble"] }, "scmap": { "name": "scmap", "version": "1.26.0", "sha256": "0acy3sg4j36znsfxpkb190wbawbngx15cr5x2lhgrjivvw3637x1", - "depends": ["Biobase", "BiocGenerics", "dplyr", "e1071", "ggplot2", "googleVis", "matrixStats", "proxy", "randomForest", "Rcpp", "RcppArmadillo", "reshape2", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "Rcpp", "RcppArmadillo", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "e1071", "ggplot2", "googleVis", "matrixStats", "proxy", "randomForest", "reshape2"] }, "scmeth": { "name": "scmeth", "version": "1.24.0", "sha256": "1yrww6b0lnh4831iw9adjimdazfa3f1w66pypzi99ywdcbdyksg8", - "depends": ["AnnotationHub", "annotatr", "Biostrings", "BSgenome", "bsseq", "DelayedArray", "DT", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "knitr", "reshape2", "rmarkdown", "SummarizedExperiment"] + "depends": ["AnnotationHub", "BSgenome", "Biostrings", "DT", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "SummarizedExperiment", "annotatr", "bsseq", "knitr", "reshape2", "rmarkdown"] }, "scone": { "name": "scone", "version": "1.28.0", "sha256": "1qvnc6cds3avxh1k4z47vb2fih7q8a5b9hccnyrpfks5c0sd6yi0", - "depends": ["aroma_light", "BiocParallel", "boot", "class", "cluster", "compositions", "diptest", "edgeR", "fpc", "gplots", "hexbin", "limma", "MatrixGenerics", "matrixStats", "mixtools", "rARPACK", "RColorBrewer", "rhdf5", "RUVSeq", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocParallel", "MatrixGenerics", "RColorBrewer", "RUVSeq", "SingleCellExperiment", "SummarizedExperiment", "aroma_light", "boot", "class", "cluster", "compositions", "diptest", "edgeR", "fpc", "gplots", "hexbin", "limma", "matrixStats", "mixtools", "rARPACK", "rhdf5"] }, "scoreInvHap": { "name": "scoreInvHap", "version": "1.26.0", "sha256": "0sdawb2xsrwyqsk18rfzpk7f5ryl3pznawz3b6v5s143vg3d7s84", - "depends": ["BiocParallel", "Biostrings", "GenomicRanges", "snpStats", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["BiocParallel", "Biostrings", "GenomicRanges", "SummarizedExperiment", "VariantAnnotation", "snpStats"] }, "scp": { "name": "scp", "version": "1.14.0", "sha256": "1b8hfvjpvni672qz6y53sy2wxbrn8anpanjd9qnixxisg94c66qj", - "depends": ["dplyr", "ggplot2", "ggrepel", "IHW", "matrixStats", "metapod", "MsCoreUtils", "MultiAssayExperiment", "nipals", "QFeatures", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["IHW", "MsCoreUtils", "MultiAssayExperiment", "QFeatures", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "ggrepel", "matrixStats", "metapod", "nipals"] }, "scran": { "name": "scran", "version": "1.32.0", "sha256": "0s1y2q4v596wxh8p5sr43mk9cnsc4kg36ld7vx71hbn3hwscqaa1", - "depends": ["beachmat", "BH", "BiocGenerics", "BiocParallel", "BiocSingular", "bluster", "DelayedArray", "DelayedMatrixStats", "dqrng", "edgeR", "igraph", "limma", "Matrix", "metapod", "Rcpp", "S4Vectors", "scuttle", "SingleCellExperiment", "statmod", "SummarizedExperiment"] + "depends": ["BH", "BiocGenerics", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "bluster", "dqrng", "edgeR", "igraph", "limma", "metapod", "scuttle", "statmod"] }, "screenCounter": { "name": "screenCounter", @@ -12097,49 +12145,49 @@ "name": "scruff", "version": "1.22.0", "sha256": "0gw8xj4agiz1j5lwp5zpa6m5k9wkkzrvcyzrrnqva1768v8123vb", - "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "Biostrings", "data_table", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggbio", "ggplot2", "ggthemes", "parallelly", "plyr", "Rsamtools", "Rsubread", "rtracklayer", "S4Vectors", "scales", "ShortRead", "SingleCellExperiment", "stringdist", "SummarizedExperiment", "txdbmaker"] + "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Rsamtools", "Rsubread", "S4Vectors", "ShortRead", "SingleCellExperiment", "SummarizedExperiment", "data_table", "ggbio", "ggplot2", "ggthemes", "parallelly", "plyr", "rtracklayer", "scales", "stringdist", "txdbmaker"] }, "scry": { "name": "scry", "version": "1.16.0", "sha256": "16489ff1nc798nfcmqvqaczm7hqffkhpad1dfgr7dxlahd8sbnw9", - "depends": ["BiocSingular", "DelayedArray", "glmpca", "Matrix", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocSingular", "DelayedArray", "Matrix", "SingleCellExperiment", "SummarizedExperiment", "glmpca"] }, "scuttle": { "name": "scuttle", "version": "1.14.0", "sha256": "1cja56k5y5vi1x0jdxaxvh13fc2lzh8g30gp294pz6p61prrf3ws", - "depends": ["beachmat", "BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "GenomicRanges", "Matrix", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "GenomicRanges", "Matrix", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat"] }, "scviR": { "name": "scviR", "version": "1.4.0", "sha256": "0691v3kyhazmhzr2nqzc1inbc7i1kdjv4y94wl96fd20d48ypqhp", - "depends": ["basilisk", "BiocFileCache", "limma", "MatrixGenerics", "pheatmap", "reticulate", "S4Vectors", "scater", "shiny", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocFileCache", "MatrixGenerics", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "basilisk", "limma", "pheatmap", "reticulate", "scater", "shiny"] }, "sechm": { "name": "sechm", "version": "1.12.0", "sha256": "0ig46ikddqqd9sclbxrv1gffc6snz0h7pindfw06cdk2i4dsan30", - "depends": ["circlize", "ComplexHeatmap", "matrixStats", "randomcoloR", "S4Vectors", "seriation", "SummarizedExperiment"] + "depends": ["ComplexHeatmap", "S4Vectors", "SummarizedExperiment", "circlize", "matrixStats", "randomcoloR", "seriation"] }, "segmentSeq": { "name": "segmentSeq", "version": "2.38.0", "sha256": "114sv9k2zlgsg82z57wwnp74hmq8p22gy5dg8my91xb3rzv3h8xw", - "depends": ["abind", "baySeq", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ShortRead"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "abind", "baySeq"] }, "segmenter": { "name": "segmenter", "version": "1.10.0", "sha256": "0s4iphqgwdr0shg71gr273s20q9vrzhxq3nfqqv494z7raycf1qy", - "depends": ["bamsignals", "ChIPseeker", "chromhmmData", "ComplexHeatmap", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment"] + "depends": ["ChIPseeker", "ComplexHeatmap", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "bamsignals", "chromhmmData"] }, "selectKSigs": { "name": "selectKSigs", "version": "1.16.0", "sha256": "16cq4pg402a64vp0r1k9m91jqbdzij3la9gbzqqjc2vyr742yl14", - "depends": ["gtools", "HiLDA", "magrittr", "Rcpp"] + "depends": ["HiLDA", "Rcpp", "gtools", "magrittr"] }, "semisup": { "name": "semisup", @@ -12151,31 +12199,31 @@ "name": "seq.hotSPOT", "version": "1.4.0", "sha256": "0wyl4z54w1rk54c5sf3wvjg1sjpin0pj6j8j42g4a2zjkvvi5bva", - "depends": ["hash", "R_utils"] + "depends": ["R_utils", "hash"] }, "seq2pathway": { "name": "seq2pathway", "version": "1.36.0", "sha256": "0l1a53m4gjbgf6f53nndzdxldvi0j7xawd7m05wr23v64qd8a0ng", - "depends": ["biomaRt", "GenomicRanges", "GSA", "nnet", "seq2pathway_data", "WGCNA"] + "depends": ["GSA", "GenomicRanges", "WGCNA", "biomaRt", "nnet", "seq2pathway_data"] }, "seqArchR": { "name": "seqArchR", "version": "1.8.0", "sha256": "0q0ip73hvjq2j39mznd980fyvbwm9yb4ihk8yihv97i8h559ml9w", - "depends": ["BiocParallel", "Biostrings", "cli", "cluster", "cvTools", "fpc", "ggplot2", "ggseqlogo", "MASS", "Matrix", "matrixStats", "prettyunits", "reshape2", "reticulate"] + "depends": ["BiocParallel", "Biostrings", "MASS", "Matrix", "cli", "cluster", "cvTools", "fpc", "ggplot2", "ggseqlogo", "matrixStats", "prettyunits", "reshape2", "reticulate"] }, "seqArchRplus": { "name": "seqArchRplus", "version": "1.4.0", "sha256": "0wk87l3346v6fm77pywrwcfhwbvswkrxv79809c0wycn84qlqd0p", - "depends": ["BiocParallel", "Biostrings", "BSgenome", "ChIPseeker", "cli", "clusterProfiler", "cowplot", "factoextra", "GenomeInfoDb", "GenomicRanges", "ggimage", "ggplot2", "gridExtra", "heatmaps", "IRanges", "magick", "RColorBrewer", "S4Vectors", "scales", "seqArchR", "seqPattern"] + "depends": ["BSgenome", "BiocParallel", "Biostrings", "ChIPseeker", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "cli", "clusterProfiler", "cowplot", "factoextra", "ggimage", "ggplot2", "gridExtra", "heatmaps", "magick", "scales", "seqArchR", "seqPattern"] }, "seqCAT": { "name": "seqCAT", "version": "1.26.0", "sha256": "1b9y45src6yfz8fmiihp6p2s76gz1nva5swnf8fbar4mranfwi73", - "depends": ["dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "rlang", "rtracklayer", "S4Vectors", "scales", "SummarizedExperiment", "tidyr", "VariantAnnotation"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "dplyr", "ggplot2", "rlang", "rtracklayer", "scales", "tidyr"] }, "seqLogo": { "name": "seqLogo", @@ -12205,25 +12253,25 @@ "name": "seqsetvis", "version": "1.24.0", "sha256": "1aazar9k36hwlx9fq6iyd7f6g764nih9f0phl0sla7gizrmpwsms", - "depends": ["cowplot", "data_table", "eulerr", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "ggplotify", "IRanges", "limma", "pbapply", "pbmcapply", "png", "RColorBrewer", "Rsamtools", "rtracklayer", "S4Vectors", "scales", "UpSetR"] + "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "UpSetR", "cowplot", "data_table", "eulerr", "ggplot2", "ggplotify", "limma", "pbapply", "pbmcapply", "png", "rtracklayer", "scales"] }, "sesame": { "name": "sesame", - "version": "1.22.1", - "sha256": "07c7g493fiv13hxmfki1s450rganmyiwvdjhz6aqrbi2b9w08w4n", - "depends": ["BiocFileCache", "BiocParallel", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "MASS", "preprocessCore", "readr", "reshape2", "S4Vectors", "sesameData", "stringr", "SummarizedExperiment", "tibble", "wheatmap"] + "version": "1.22.2", + "sha256": "1d2vjglpbhmr4fjp3zwipf0nwj5pms4l9q1xngyxrsbr26x7jp1d", + "depends": ["BiocFileCache", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "SummarizedExperiment", "dplyr", "ggplot2", "preprocessCore", "readr", "reshape2", "sesameData", "stringr", "tibble", "wheatmap"] }, "sevenC": { "name": "sevenC", "version": "1.24.0", "sha256": "0x1r6zbwl6shhzf2xc7lp06dvlhqhgh70i71fwn25lndwyhkw280", - "depends": ["BiocGenerics", "boot", "data_table", "GenomeInfoDb", "GenomicRanges", "InteractionSet", "IRanges", "purrr", "readr", "rtracklayer", "S4Vectors"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "S4Vectors", "boot", "data_table", "purrr", "readr", "rtracklayer"] }, "sevenbridges": { "name": "sevenbridges", "version": "1.34.0", "sha256": "0vy7vz87z371q2plhxkp5src6la6hj1w7bd4xkqbm3nmym2p32pb", - "depends": ["curl", "data_table", "docopt", "httr", "jsonlite", "objectProperties", "S4Vectors", "stringr", "uuid", "yaml"] + "depends": ["S4Vectors", "curl", "data_table", "docopt", "httr", "jsonlite", "objectProperties", "stringr", "uuid", "yaml"] }, "shiny_gosling": { "name": "shiny.gosling", @@ -12235,19 +12283,19 @@ "name": "shinyMethyl", "version": "1.40.0", "sha256": "15r9x1fqladjviyisbhr8zff0a6g9kvbvx72xcp3bfadp3wpygds", - "depends": ["Biobase", "BiocGenerics", "htmltools", "MatrixGenerics", "minfi", "RColorBrewer", "shiny"] + "depends": ["Biobase", "BiocGenerics", "MatrixGenerics", "RColorBrewer", "htmltools", "minfi", "shiny"] }, "shinyepico": { "name": "shinyepico", "version": "1.12.0", "sha256": "0k6h2n8dy66k1vl5mrag45z5knhgn9xbim5b0nbrzh9pwi687nc1", - "depends": ["data_table", "doParallel", "dplyr", "DT", "foreach", "GenomicRanges", "ggplot2", "gplots", "heatmaply", "limma", "minfi", "plotly", "reshape2", "rlang", "rmarkdown", "rtracklayer", "shiny", "shinycssloaders", "shinyjs", "shinythemes", "shinyWidgets", "statmod", "tidyr", "zip"] + "depends": ["DT", "GenomicRanges", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "gplots", "heatmaply", "limma", "minfi", "plotly", "reshape2", "rlang", "rmarkdown", "rtracklayer", "shiny", "shinyWidgets", "shinycssloaders", "shinyjs", "shinythemes", "statmod", "tidyr", "zip"] }, "sigFeature": { "name": "sigFeature", "version": "1.22.0", "sha256": "0hgdzjlxxsxmrjrdlzabssdisn1rmi6h9nd37gid4dbr8xd1ibyh", - "depends": ["BiocParallel", "biocViews", "e1071", "Matrix", "nlme", "openxlsx", "pheatmap", "RColorBrewer", "SparseM", "SummarizedExperiment"] + "depends": ["BiocParallel", "Matrix", "RColorBrewer", "SparseM", "SummarizedExperiment", "biocViews", "e1071", "nlme", "openxlsx", "pheatmap"] }, "siggenes": { "name": "siggenes", @@ -12259,25 +12307,25 @@ "name": "sights", "version": "1.30.0", "sha256": "0kr52ng79wz6rh0rhk5kmjskn04xr89h14bdhryyzkhq80v0c2k8", - "depends": ["ggplot2", "lattice", "MASS", "qvalue", "reshape2"] + "depends": ["MASS", "ggplot2", "lattice", "qvalue", "reshape2"] }, "signatureSearch": { "name": "signatureSearch", "version": "1.18.0", "sha256": "1b32n67f5c804xxbpwxpykjhakixzf5zd1zbgwj976lvdb2adl34", - "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "clusterProfiler", "data_table", "DelayedArray", "DOSE", "dplyr", "ExperimentHub", "fastmatch", "fgsea", "ggplot2", "GSEABase", "HDF5Array", "magrittr", "Matrix", "org_Hs_eg_db", "qvalue", "Rcpp", "reactome_db", "readr", "reshape2", "rhdf5", "RSQLite", "scales", "SummarizedExperiment", "tibble", "visNetwork"] + "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "DOSE", "DelayedArray", "ExperimentHub", "GSEABase", "HDF5Array", "Matrix", "RSQLite", "Rcpp", "SummarizedExperiment", "clusterProfiler", "data_table", "dplyr", "fastmatch", "fgsea", "ggplot2", "magrittr", "org_Hs_eg_db", "qvalue", "reactome_db", "readr", "reshape2", "rhdf5", "scales", "tibble", "visNetwork"] }, "signeR": { "name": "signeR", "version": "2.6.0", "sha256": "0jc9z48sgzjgxdidp9qhn4ccnx7jjlj0xnfrwajh0xq0ai1vnqb6", - "depends": ["ada", "BiocFileCache", "BiocGenerics", "Biostrings", "BSgenome", "bsplus", "class", "clue", "cowplot", "dplyr", "DT", "e1071", "future", "future_apply", "GenomeInfoDb", "GenomicRanges", "ggplot2", "ggpubr", "glmnet", "IRanges", "kknn", "listenv", "magrittr", "MASS", "maxstat", "nloptr", "NMF", "pheatmap", "PMCMRplus", "ppclust", "pROC", "proxy", "pvclust", "randomForest", "RColorBrewer", "Rcpp", "RcppArmadillo", "readr", "reshape2", "rtracklayer", "scales", "shiny", "shinycssloaders", "shinydashboard", "shinyWidgets", "survival", "survivalAnalysis", "survminer", "tibble", "tidyr", "VariantAnnotation", "VGAM"] + "depends": ["BSgenome", "BiocFileCache", "BiocGenerics", "Biostrings", "DT", "GenomeInfoDb", "GenomicRanges", "IRanges", "MASS", "NMF", "PMCMRplus", "RColorBrewer", "Rcpp", "RcppArmadillo", "VGAM", "VariantAnnotation", "ada", "bsplus", "class", "clue", "cowplot", "dplyr", "e1071", "future", "future_apply", "ggplot2", "ggpubr", "glmnet", "kknn", "listenv", "magrittr", "maxstat", "nloptr", "pROC", "pheatmap", "ppclust", "proxy", "pvclust", "randomForest", "readr", "reshape2", "rtracklayer", "scales", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "survival", "survivalAnalysis", "survminer", "tibble", "tidyr"] }, "signifinder": { "name": "signifinder", "version": "1.6.0", "sha256": "0r6acaqk7zaryy8ddpfischw08b6sml3cydrw8v9wys0rfv207pb", - "depends": ["AnnotationDbi", "BiocGenerics", "ComplexHeatmap", "consensusOV", "cowplot", "DGEobj_utils", "dplyr", "ensembldb", "ggplot2", "ggridges", "GSVA", "IRanges", "magrittr", "matrixStats", "maxstat", "openair", "org_Hs_eg_db", "patchwork", "RColorBrewer", "sparrow", "SpatialExperiment", "SummarizedExperiment", "survival", "survminer", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "viridis"] + "depends": ["AnnotationDbi", "BiocGenerics", "ComplexHeatmap", "DGEobj_utils", "GSVA", "IRanges", "RColorBrewer", "SpatialExperiment", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "consensusOV", "cowplot", "dplyr", "ensembldb", "ggplot2", "ggridges", "magrittr", "matrixStats", "maxstat", "openair", "org_Hs_eg_db", "patchwork", "sparrow", "survival", "survminer", "viridis"] }, "sigsquared": { "name": "sigsquared", @@ -12289,7 +12337,7 @@ "name": "simPIC", "version": "1.0.0", "sha256": "0qspzkpdfpya2hkj1lry68cybcsscw9xj5ycpg87xg38n3jyqcbm", - "depends": ["actuar", "BiocGenerics", "checkmate", "fitdistrplus", "Matrix", "matrixStats", "rlang", "S4Vectors", "scales", "scuttle", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocGenerics", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "actuar", "checkmate", "fitdistrplus", "matrixStats", "rlang", "scales", "scuttle"] }, "similaRpeak": { "name": "similaRpeak", @@ -12301,55 +12349,55 @@ "name": "simona", "version": "1.2.0", "sha256": "04ynhnkb9qnniyvavfylg010pyry843362pjcw94kw9bwnklscy5", - "depends": ["circlize", "ComplexHeatmap", "GetoptLong", "GlobalOptions", "igraph", "matrixStats", "Polychrome", "Rcpp", "S4Vectors", "shiny", "xml2"] + "depends": ["ComplexHeatmap", "GetoptLong", "GlobalOptions", "Polychrome", "Rcpp", "S4Vectors", "circlize", "igraph", "matrixStats", "shiny", "xml2"] }, "simpleSeg": { "name": "simpleSeg", "version": "1.6.1", "sha256": "0rmd9kclh6x9gxqncw25563c4vh2xk206iia0qc058w9lbzqyp5f", - "depends": ["BiocParallel", "cytomapper", "EBImage", "S4Vectors", "spatstat_geom", "SummarizedExperiment", "terra"] + "depends": ["BiocParallel", "EBImage", "S4Vectors", "SummarizedExperiment", "cytomapper", "spatstat_geom", "terra"] }, "simplifyEnrichment": { "name": "simplifyEnrichment", "version": "1.14.0", "sha256": "1031rkl2gcgx4k1biz4bc38hfq7r6diqk48769jhii0r06ablrhi", - "depends": ["AnnotationDbi", "BiocGenerics", "circlize", "clue", "cluster", "colorspace", "ComplexHeatmap", "digest", "GetoptLong", "GlobalOptions", "GO_db", "GOSemSim", "Matrix", "org_Hs_eg_db", "proxyC", "slam", "tm"] + "depends": ["AnnotationDbi", "BiocGenerics", "ComplexHeatmap", "GOSemSim", "GO_db", "GetoptLong", "GlobalOptions", "Matrix", "circlize", "clue", "cluster", "colorspace", "digest", "org_Hs_eg_db", "proxyC", "slam", "tm"] }, "sincell": { "name": "sincell", "version": "1.36.0", "sha256": "1028mdjjxbnw5fzsdyjjgy7v6yhslhhm7053q3889yqamw0l82fg", - "depends": ["cluster", "entropy", "fastICA", "fields", "ggplot2", "igraph", "MASS", "proxy", "Rcpp", "reshape2", "Rtsne", "scatterplot3d", "statmod", "TSP"] + "depends": ["MASS", "Rcpp", "Rtsne", "TSP", "cluster", "entropy", "fastICA", "fields", "ggplot2", "igraph", "proxy", "reshape2", "scatterplot3d", "statmod"] }, "single": { "name": "single", "version": "1.7.0", "sha256": "0h7h9m4xr65nayr707jvjnbic1q4z0hsghw5i3pfpz2n6p9pb8s8", - "depends": ["BiocGenerics", "Biostrings", "dplyr", "GenomicAlignments", "IRanges", "reshape2", "rlang", "Rsamtools", "stringr", "tidyr"] + "depends": ["BiocGenerics", "Biostrings", "GenomicAlignments", "IRanges", "Rsamtools", "dplyr", "reshape2", "rlang", "stringr", "tidyr"] }, "singleCellTK": { "name": "singleCellTK", "version": "2.14.0", "sha256": "06qpdl1k5c94rsnbnb4vkml1sahvav3pkr71hfkqikyscbydnay4", - "depends": ["anndata", "AnnotationHub", "ape", "batchelor", "Biobase", "BiocParallel", "celda", "celldex", "circlize", "cluster", "colorspace", "colourpicker", "ComplexHeatmap", "cowplot", "data_table", "DelayedArray", "DelayedMatrixStats", "DESeq2", "dplyr", "DropletUtils", "DT", "eds", "enrichR", "ensembldb", "ExperimentHub", "fields", "ggplot2", "ggplotify", "ggrepel", "ggtree", "gridExtra", "GSEABase", "GSVA", "GSVAdata", "igraph", "KernSmooth", "limma", "magrittr", "MAST", "Matrix", "matrixStats", "metap", "msigdbr", "multtest", "plotly", "plyr", "R_utils", "reshape2", "reticulate", "rlang", "rmarkdown", "ROCR", "Rtsne", "S4Vectors", "scater", "scDblFinder", "scds", "scMerge", "scran", "scRNAseq", "scuttle", "Seurat", "shiny", "shinyalert", "shinycssloaders", "shinyjs", "SingleCellExperiment", "SingleR", "SoupX", "SummarizedExperiment", "sva", "TENxPBMCData", "tibble", "TrajectoryUtils", "TSCAN", "tximport", "VAM", "withr", "yaml", "zellkonverter", "zinbwave"] + "depends": ["AnnotationHub", "Biobase", "BiocParallel", "ComplexHeatmap", "DESeq2", "DT", "DelayedArray", "DelayedMatrixStats", "DropletUtils", "ExperimentHub", "GSEABase", "GSVA", "GSVAdata", "KernSmooth", "MAST", "Matrix", "ROCR", "R_utils", "Rtsne", "S4Vectors", "Seurat", "SingleCellExperiment", "SingleR", "SoupX", "SummarizedExperiment", "TENxPBMCData", "TSCAN", "TrajectoryUtils", "VAM", "anndata", "ape", "batchelor", "celda", "celldex", "circlize", "cluster", "colorspace", "colourpicker", "cowplot", "data_table", "dplyr", "eds", "enrichR", "ensembldb", "fields", "ggplot2", "ggplotify", "ggrepel", "ggtree", "gridExtra", "igraph", "limma", "magrittr", "matrixStats", "metap", "msigdbr", "multtest", "plotly", "plyr", "reshape2", "reticulate", "rlang", "rmarkdown", "scDblFinder", "scMerge", "scRNAseq", "scater", "scds", "scran", "scuttle", "shiny", "shinyalert", "shinycssloaders", "shinyjs", "sva", "tibble", "tximport", "withr", "yaml", "zellkonverter", "zinbwave"] }, "singscore": { "name": "singscore", "version": "1.24.0", "sha256": "12avzrc16mxz7v8jp4rxz5ia6008rjcja1h3hd0n60z644w9cng2", - "depends": ["Biobase", "BiocParallel", "edgeR", "ggplot2", "ggrepel", "GSEABase", "magrittr", "matrixStats", "plotly", "plyr", "RColorBrewer", "reshape", "reshape2", "S4Vectors", "SummarizedExperiment", "tidyr"] + "depends": ["Biobase", "BiocParallel", "GSEABase", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "edgeR", "ggplot2", "ggrepel", "magrittr", "matrixStats", "plotly", "plyr", "reshape", "reshape2", "tidyr"] }, "sitadela": { "name": "sitadela", "version": "1.12.0", "sha256": "1ynq19116z228cakznkpxd7msqxbvbgax2k6rk0wh9xksi6qzkpg", - "depends": ["Biobase", "BiocGenerics", "biomaRt", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "RSQLite", "rtracklayer", "S4Vectors", "txdbmaker"] + "depends": ["Biobase", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "Rsamtools", "S4Vectors", "biomaRt", "rtracklayer", "txdbmaker"] }, "sitePath": { "name": "sitePath", "version": "1.20.0", "sha256": "10g25has168cj7xjpn0q3da9rm7dxg6n2ysb8yc974gxqkabhzjh", - "depends": ["ape", "aplot", "ggplot2", "ggrepel", "ggtree", "gridExtra", "RColorBrewer", "Rcpp", "seqinr", "tidytree"] + "depends": ["RColorBrewer", "Rcpp", "ape", "aplot", "ggplot2", "ggrepel", "ggtree", "gridExtra", "seqinr", "tidytree"] }, "sizepower": { "name": "sizepower", @@ -12361,43 +12409,43 @@ "name": "sketchR", "version": "1.0.0", "sha256": "0jsv2rizfh72hrk9jrlhgl36cksa97858h7w57fkihq2hq155n67", - "depends": ["basilisk", "Biobase", "DelayedArray", "dplyr", "ggplot2", "reticulate", "rlang", "scales"] + "depends": ["Biobase", "DelayedArray", "basilisk", "dplyr", "ggplot2", "reticulate", "rlang", "scales"] }, "skewr": { "name": "skewr", "version": "1.36.0", "sha256": "1hh0519pqv6lq21plph7sy88918np12g7aw542sfblm81ma4p4qv", - "depends": ["IlluminaHumanMethylation450kmanifest", "methylumi", "minfi", "mixsmsn", "RColorBrewer", "S4Vectors", "wateRmelon"] + "depends": ["IlluminaHumanMethylation450kmanifest", "RColorBrewer", "S4Vectors", "methylumi", "minfi", "mixsmsn", "wateRmelon"] }, "slalom": { "name": "slalom", "version": "1.26.0", "sha256": "0km062qb7k7g18zz03nr6m7nigzpbxkasgirc4igslz4sfcldd9x", - "depends": ["BH", "ggplot2", "GSEABase", "Rcpp", "RcppArmadillo", "rsvd", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BH", "GSEABase", "Rcpp", "RcppArmadillo", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "rsvd"] }, "slingshot": { "name": "slingshot", "version": "2.12.0", "sha256": "055dylajbn94khi0829qhxx0lbn1pvh30xw09gjn1jvxsgzj49nc", - "depends": ["igraph", "matrixStats", "princurve", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TrajectoryUtils"] + "depends": ["S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TrajectoryUtils", "igraph", "matrixStats", "princurve"] }, "smartid": { "name": "smartid", "version": "1.0.2", "sha256": "1bm8g8n3xifc2dg1d9vpw79vpwssa9q6ssvzyf77gp24zp2r734i", - "depends": ["dplyr", "ggplot2", "Matrix", "mclust", "mixtools", "sparseMatrixStats", "SummarizedExperiment", "tidyr"] + "depends": ["Matrix", "SummarizedExperiment", "dplyr", "ggplot2", "mclust", "mixtools", "sparseMatrixStats", "tidyr"] }, "smoothclust": { "name": "smoothclust", "version": "1.0.0", "sha256": "17mcfjxsgdvignrx576v97iwapmkfc4my8pvm6b2y1w7pibilx65", - "depends": ["sparseMatrixStats", "SpatialExperiment", "spdep", "SummarizedExperiment"] + "depends": ["SpatialExperiment", "SummarizedExperiment", "sparseMatrixStats", "spdep"] }, "snapcount": { "name": "snapcount", "version": "1.16.0", "sha256": "1hjd6xdwgz2qal6scpldwpdqlrbgap45bq2h599df6hgvrdym3l7", - "depends": ["assertthat", "data_table", "GenomicRanges", "httr", "IRanges", "jsonlite", "magrittr", "Matrix", "purrr", "R6", "rlang", "stringr", "SummarizedExperiment"] + "depends": ["GenomicRanges", "IRanges", "Matrix", "R6", "SummarizedExperiment", "assertthat", "data_table", "httr", "jsonlite", "magrittr", "purrr", "rlang", "stringr"] }, "snifter": { "name": "snifter", @@ -12421,67 +12469,67 @@ "name": "soGGi", "version": "1.36.0", "sha256": "0z995iyffzglc26pava4icxl315b077983lxvaldz5xkyhgvgpz7", - "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "chipseq", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "IRanges", "preprocessCore", "reshape2", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "chipseq", "ggplot2", "preprocessCore", "reshape2", "rtracklayer"] }, "spaSim": { "name": "spaSim", "version": "1.6.0", "sha256": "1lac621ss7qhfrabyn3nsmgiif4bcgwrgzs1xvbvf4lvwcy7ychm", - "depends": ["dplyr", "ggplot2", "RANN", "SpatialExperiment", "spatstat_geom", "spatstat_random", "SummarizedExperiment"] + "depends": ["RANN", "SpatialExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "spatstat_geom", "spatstat_random"] }, "sparrow": { "name": "sparrow", "version": "1.10.1", "sha256": "0vd18ws47zhx87bi35lmbh9wkp6s6d5nd9x77gd7fh24ni5z338s", - "depends": ["babelgene", "BiocGenerics", "BiocParallel", "BiocSet", "checkmate", "circlize", "ComplexHeatmap", "data_table", "DelayedMatrixStats", "edgeR", "ggplot2", "GSEABase", "irlba", "limma", "Matrix", "plotly", "viridis"] + "depends": ["BiocGenerics", "BiocParallel", "BiocSet", "ComplexHeatmap", "DelayedMatrixStats", "GSEABase", "Matrix", "babelgene", "checkmate", "circlize", "data_table", "edgeR", "ggplot2", "irlba", "limma", "plotly", "viridis"] }, "sparseMatrixStats": { "name": "sparseMatrixStats", "version": "1.16.0", "sha256": "04hk9r6sh83dyxm2j7jdcj0m4g74ln218j21rs71c2gg6mrkmlgf", - "depends": ["Matrix", "MatrixGenerics", "matrixStats", "Rcpp"] + "depends": ["Matrix", "MatrixGenerics", "Rcpp", "matrixStats"] }, "sparsenetgls": { "name": "sparsenetgls", "version": "1.22.0", "sha256": "1x8qzqsr2rzx6683lmzw5ia21853l7gj3m5jkx0r8azmjk4r6kqb", - "depends": ["glmnet", "huge", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "glmnet", "huge"] }, "spatialDE": { "name": "spatialDE", "version": "1.10.0", "sha256": "02npzs4vmjgc7bmv4rmmnz82slqcyrsq4y7wqapm30m7slhzm11g", - "depends": ["basilisk", "checkmate", "ggplot2", "ggrepel", "gridExtra", "Matrix", "reticulate", "scales", "SpatialExperiment", "SummarizedExperiment"] + "depends": ["Matrix", "SpatialExperiment", "SummarizedExperiment", "basilisk", "checkmate", "ggplot2", "ggrepel", "gridExtra", "reticulate", "scales"] }, "spatialHeatmap": { "name": "spatialHeatmap", - "version": "2.10.0", - "sha256": "13f6q8gvwnq5saj6n90dgyhc8y3rl6m1vcc3z3zz08i469d948vq", - "depends": ["data_table", "dplyr", "edgeR", "genefilter", "ggplot2", "ggplotify", "gplots", "gridExtra", "grImport", "igraph", "Matrix", "reshape2", "rsvg", "S4Vectors", "scater", "scran", "scuttle", "shiny", "shinydashboard", "SingleCellExperiment", "spsComps", "SummarizedExperiment", "tibble", "xml2"] + "version": "2.10.2", + "sha256": "0arr3v3simkkq3wpf32jgm35s7mwbmpgn17g2y3glam37w8yc7gd", + "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "data_table", "dplyr", "edgeR", "genefilter", "ggplot2", "ggplotify", "gplots", "grImport", "gridExtra", "igraph", "reshape2", "rsvg", "scater", "scran", "scuttle", "shiny", "shinydashboard", "spsComps", "tibble", "xml2"] }, "spatzie": { "name": "spatzie", "version": "1.10.0", "sha256": "1jii3viq7ck1clkr59yafnh5a4pblskd77i1i3gxs7fpvl8ab7qb", - "depends": ["BiocGenerics", "BSgenome", "GenomeInfoDb", "GenomicFeatures", "GenomicInteractions", "GenomicRanges", "ggplot2", "IRanges", "MatrixGenerics", "matrixStats", "motifmatchr", "S4Vectors", "SummarizedExperiment", "TFBSTools"] + "depends": ["BSgenome", "BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicInteractions", "GenomicRanges", "IRanges", "MatrixGenerics", "S4Vectors", "SummarizedExperiment", "TFBSTools", "ggplot2", "matrixStats", "motifmatchr"] }, "specL": { "name": "specL", "version": "1.38.0", "sha256": "0klg19h1ijwd9f7pary77zn52mp8ryzvhv6g3h5xg8yjv1kl9m7r", - "depends": ["DBI", "protViz", "RSQLite", "seqinr"] + "depends": ["DBI", "RSQLite", "protViz", "seqinr"] }, "speckle": { "name": "speckle", "version": "1.4.0", "sha256": "1m7fl9l20f65w5il3jhj930i71kb1bvsz0iqb7yi1nczjx1b6hcw", - "depends": ["edgeR", "ggplot2", "limma", "Seurat", "SingleCellExperiment"] + "depends": ["Seurat", "SingleCellExperiment", "edgeR", "ggplot2", "limma"] }, "spicyR": { "name": "spicyR", - "version": "1.16.1", - "sha256": "03bmjr4vbma5ynj773b364vb05vf06fyzvbq75qi7mczjyh4kckw", - "depends": ["BiocParallel", "ClassifyR", "cli", "concaveman", "data_table", "dplyr", "ggforce", "ggplot2", "lmerTest", "magrittr", "pheatmap", "rlang", "S4Vectors", "scam", "SingleCellExperiment", "SpatialExperiment", "spatstat_explore", "spatstat_geom", "SummarizedExperiment", "tibble", "tidyr"] + "version": "1.16.3", + "sha256": "0xy964xx99wklh44m41h3066hndxv04i1jh623612sidhj4viih3", + "depends": ["BiocParallel", "ClassifyR", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "cli", "concaveman", "data_table", "dplyr", "ggforce", "ggplot2", "lmerTest", "magrittr", "pheatmap", "rlang", "scam", "spatstat_explore", "spatstat_geom", "tibble", "tidyr"] }, "spikeLI": { "name": "spikeLI", @@ -12493,31 +12541,31 @@ "name": "spiky", "version": "1.10.0", "sha256": "1cwvdqa4zy17nk6d04kg6rrsd6rk4f5nrg58pf882jn44rjfl49i", - "depends": ["bamlss", "Biostrings", "BlandAltmanLeh", "BSgenome", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "IRanges", "Rsamtools", "S4Vectors", "scales"] + "depends": ["BSgenome", "Biostrings", "BlandAltmanLeh", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "bamlss", "ggplot2", "scales"] }, "spillR": { "name": "spillR", - "version": "1.0.0", - "sha256": "1pqb9n0rvjx8wdw4vjfmi9m2d5lf6xddygpf1grab3yhkrn9akw8", - "depends": ["CATALYST", "dplyr", "ggplot2", "S4Vectors", "spatstat_geom", "SummarizedExperiment", "tibble", "tidyr", "tidyselect"] + "version": "1.0.1", + "sha256": "18194i0zz2cz2wc69gpifk2s6h58acp57adlkp5ciwv68h2af5dd", + "depends": ["CATALYST", "S4Vectors", "SummarizedExperiment", "dplyr", "ggplot2", "spatstat_univar", "tibble", "tidyr", "tidyselect"] }, "spkTools": { "name": "spkTools", "version": "1.60.0", "sha256": "1q6vhhdfh5xwpkwfcbjlbv9s8rd5mzn98xqcns7ix5d3rcqk5ixk", - "depends": ["Biobase", "gtools", "RColorBrewer"] + "depends": ["Biobase", "RColorBrewer", "gtools"] }, "splatter": { "name": "splatter", "version": "1.28.0", "sha256": "1drifr04nd8x40z6v0ig60l2zcm289kmxlmdy8siczn90xzy8cm7", - "depends": ["BiocGenerics", "BiocParallel", "checkmate", "crayon", "edgeR", "fitdistrplus", "locfit", "matrixStats", "rlang", "S4Vectors", "scuttle", "SingleCellExperiment", "SummarizedExperiment", "withr"] + "depends": ["BiocGenerics", "BiocParallel", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "checkmate", "crayon", "edgeR", "fitdistrplus", "locfit", "matrixStats", "rlang", "scuttle", "withr"] }, "splineTimeR": { "name": "splineTimeR", "version": "1.32.0", "sha256": "0y4sydqmwpj5jwalhbf1zs6mqk447c7f22a5qy9pj8sqblh042rn", - "depends": ["Biobase", "FIs", "GeneNet", "GSEABase", "gtools", "igraph", "limma", "longitudinal"] + "depends": ["Biobase", "FIs", "GSEABase", "GeneNet", "gtools", "igraph", "limma", "longitudinal"] }, "splots": { "name": "splots", @@ -12529,25 +12577,25 @@ "name": "spoon", "version": "1.0.0", "sha256": "1ygrb534nlsxckbc61y5s3rjc4cpmf265y5a48charjv9y3ahw19", - "depends": ["BiocParallel", "BRISC", "Matrix", "nnSVG", "scuttle", "SpatialExperiment", "SummarizedExperiment"] + "depends": ["BRISC", "BiocParallel", "Matrix", "SpatialExperiment", "SummarizedExperiment", "nnSVG", "scuttle"] }, "spqn": { "name": "spqn", "version": "1.16.0", "sha256": "0477rs2wq9319zj1pm7j96inhd38sqs85wvj06r47g2k77blcz87", - "depends": ["BiocGenerics", "ggplot2", "ggridges", "matrixStats", "SummarizedExperiment"] + "depends": ["BiocGenerics", "SummarizedExperiment", "ggplot2", "ggridges", "matrixStats"] }, "srnadiff": { "name": "srnadiff", "version": "1.24.0", "sha256": "0gr754qb5gc0lh1r513yrfrys7q13a0kmbzmbx5m0p7wwp508mdg", - "depends": ["BiocManager", "BiocParallel", "BiocStyle", "DESeq2", "devtools", "edgeR", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "Rcpp", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocManager", "BiocParallel", "BiocStyle", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "Rcpp", "Rsamtools", "S4Vectors", "SummarizedExperiment", "devtools", "edgeR", "rtracklayer"] }, "ssPATHS": { "name": "ssPATHS", "version": "1.18.0", "sha256": "0h2hs6snnh9kzqna94ndp3gk4bkldsxrg67fy6gx7d15agjl9y2s", - "depends": ["dml", "MESS", "ROCR", "SummarizedExperiment"] + "depends": ["MESS", "ROCR", "SummarizedExperiment", "dml"] }, "sscu": { "name": "sscu", @@ -12571,13 +12619,13 @@ "name": "ssviz", "version": "1.38.0", "sha256": "0m5jh45v58f92m4ib7b1fy7gpixpvgm65gx2sw1qmx1qihp4hkrb", - "depends": ["Biostrings", "ggplot2", "RColorBrewer", "reshape", "Rsamtools"] + "depends": ["Biostrings", "RColorBrewer", "Rsamtools", "ggplot2", "reshape"] }, "stJoincount": { "name": "stJoincount", "version": "1.6.0", "sha256": "1i8bkygxxl3cq8zjpfslakib1knivyc4wfil1sa4s0jcj4iyhlhx", - "depends": ["dplyr", "ggplot2", "magrittr", "pheatmap", "raster", "Seurat", "sp", "SpatialExperiment", "spdep", "SummarizedExperiment"] + "depends": ["Seurat", "SpatialExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "magrittr", "pheatmap", "raster", "sp", "spdep"] }, "staRank": { "name": "staRank", @@ -12595,31 +12643,31 @@ "name": "standR", "version": "1.8.0", "sha256": "0lnggcppcgd5k07yx5ig7gjyj7bkwk7mvs9l785mlr1wgmqz4vm0", - "depends": ["Biobase", "BiocGenerics", "dplyr", "edgeR", "ggalluvial", "ggplot2", "limma", "mclustcomp", "patchwork", "readr", "rlang", "ruv", "RUVSeq", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["Biobase", "BiocGenerics", "RUVSeq", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "dplyr", "edgeR", "ggalluvial", "ggplot2", "limma", "mclustcomp", "patchwork", "readr", "rlang", "ruv", "tibble", "tidyr"] }, "statTarget": { "name": "statTarget", "version": "1.34.0", "sha256": "0p89j6isdyy7zlniqd42s7y50sjyd7a9fpg3hwi92ssvv77zdd4c", - "depends": ["impute", "pdist", "pls", "plyr", "randomForest", "ROC", "rrcov"] + "depends": ["ROC", "impute", "pdist", "pls", "plyr", "randomForest", "rrcov"] }, "stepNorm": { "name": "stepNorm", "version": "1.76.0", "sha256": "18v5hqcwnbzw8kwq9ahia36ikr3fd1cgwvx0rj32qbs66kr9phhz", - "depends": ["marray", "MASS"] + "depends": ["MASS", "marray"] }, "strandCheckR": { "name": "strandCheckR", "version": "1.22.0", "sha256": "05r9d87y158pbnakqcli94nbwfvl72bsl1wbmbjyhk3cp9r1si2d", - "depends": ["BiocGenerics", "dplyr", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "gridExtra", "IRanges", "magrittr", "reshape2", "rmarkdown", "Rsamtools", "S4Vectors", "stringr", "TxDb_Hsapiens_UCSC_hg38_knownGene"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "TxDb_Hsapiens_UCSC_hg38_knownGene", "dplyr", "ggplot2", "gridExtra", "magrittr", "reshape2", "rmarkdown", "stringr"] }, "struct": { "name": "struct", "version": "1.16.0", "sha256": "086fjmhmywi8ciycnz29fgkjwmxws2d130fvgwmx504gf7l841lk", - "depends": ["knitr", "ontologyIndex", "rols", "S4Vectors", "SummarizedExperiment"] + "depends": ["S4Vectors", "SummarizedExperiment", "knitr", "ontologyIndex", "rols"] }, "structToolbox": { "name": "structToolbox", @@ -12637,31 +12685,31 @@ "name": "supersigs", "version": "1.12.0", "sha256": "00rnd7h7xrbpr5jqz7l03pk6rlyqfcmkyrxpjwayz9gj2yc87lk3", - "depends": ["assertthat", "Biostrings", "caret", "dplyr", "rlang", "rsample", "SummarizedExperiment", "tidyr"] + "depends": ["Biostrings", "SummarizedExperiment", "assertthat", "caret", "dplyr", "rlang", "rsample", "tidyr"] }, "supraHex": { "name": "supraHex", "version": "1.42.0", "sha256": "10qfvwbz5cbxvxbdmbc29jfp6apza4z70p4b9nfwgs4y95c11p7l", - "depends": ["ape", "dplyr", "hexbin", "igraph", "magrittr", "MASS", "purrr", "readr", "stringr", "tibble", "tidyr"] + "depends": ["MASS", "ape", "dplyr", "hexbin", "igraph", "magrittr", "purrr", "readr", "stringr", "tibble", "tidyr"] }, "surfaltr": { "name": "surfaltr", "version": "1.10.0", "sha256": "1i7ssmnnv81x5nb63sbk07mkirb99bsn9kyy59n8ib03akygv2mz", - "depends": ["biomaRt", "Biostrings", "dplyr", "ggplot2", "httr", "msa", "protr", "readr", "seqinr", "stringr", "testthat", "xml2"] + "depends": ["Biostrings", "biomaRt", "dplyr", "ggplot2", "httr", "msa", "protr", "readr", "seqinr", "stringr", "testthat", "xml2"] }, "survcomp": { "name": "survcomp", "version": "1.54.0", "sha256": "090dl580cwicn3px1khkhcix25snig0k7phb7z3nzmrbxmp82ygc", - "depends": ["bootstrap", "ipred", "KernSmooth", "prodlim", "rmeta", "SuppDists", "survival", "survivalROC"] + "depends": ["KernSmooth", "SuppDists", "bootstrap", "ipred", "prodlim", "rmeta", "survival", "survivalROC"] }, "survtype": { "name": "survtype", "version": "1.20.0", "sha256": "0pyyzkxqaa8xbrap1d2ppd4g4i4zxr8frjw0mlq8hw9gf1n94k0l", - "depends": ["clustvarsel", "pheatmap", "SummarizedExperiment", "survival", "survminer"] + "depends": ["SummarizedExperiment", "clustvarsel", "pheatmap", "survival", "survminer"] }, "sva": { "name": "sva", @@ -12673,13 +12721,13 @@ "name": "svaNUMT", "version": "1.10.0", "sha256": "15159bxq26w80nc160rk5k48435h6snxmsmynfjiaq3kzv5143pd", - "depends": ["assertthat", "BiocGenerics", "Biostrings", "dplyr", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "pwalign", "rlang", "rtracklayer", "S4Vectors", "stringr", "StructuralVariantAnnotation", "VariantAnnotation"] + "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "S4Vectors", "StructuralVariantAnnotation", "VariantAnnotation", "assertthat", "dplyr", "pwalign", "rlang", "rtracklayer", "stringr"] }, "svaRetro": { "name": "svaRetro", "version": "1.10.0", "sha256": "03scsdy5pypir0jqgj38y5hnj82sh21gip5xd8dbqjk9ryb75ays", - "depends": ["assertthat", "BiocGenerics", "Biostrings", "dplyr", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "rlang", "rtracklayer", "S4Vectors", "stringr", "StructuralVariantAnnotation", "VariantAnnotation"] + "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "S4Vectors", "StructuralVariantAnnotation", "VariantAnnotation", "assertthat", "dplyr", "rlang", "rtracklayer", "stringr"] }, "swfdr": { "name": "swfdr", @@ -12697,7 +12745,7 @@ "name": "switchde", "version": "1.30.0", "sha256": "033xpkivywvk4rg1gqr0drrhwgp58nlgr3in65c0fxlwd1jd6kpj", - "depends": ["dplyr", "ggplot2", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2"] }, "synapsis": { "name": "synapsis", @@ -12709,79 +12757,79 @@ "name": "synapter", "version": "2.28.0", "sha256": "1imhap1ny0x687qh9s1q9m978hwhhkci0j8i3qfwrvn3ykijlsa7", - "depends": ["Biobase", "Biostrings", "cleaver", "lattice", "MSnbase", "multtest", "qvalue", "RColorBrewer", "readr", "rmarkdown"] + "depends": ["Biobase", "Biostrings", "MSnbase", "RColorBrewer", "cleaver", "lattice", "multtest", "qvalue", "readr", "rmarkdown"] }, "synergyfinder": { "name": "synergyfinder", "version": "3.12.0", "sha256": "02d9615k8fl9bb7hd6f5vz11k9aard8zs880siac2s23pwzivjwn", - "depends": ["dplyr", "drc", "furrr", "future", "ggforce", "ggplot2", "ggrepel", "gstat", "kriging", "lattice", "magrittr", "metR", "mice", "nleqslv", "pbapply", "plotly", "purrr", "reshape2", "sp", "SpatialExtremes", "stringr", "tidyr", "tidyverse", "vegan"] + "depends": ["SpatialExtremes", "dplyr", "drc", "furrr", "future", "ggforce", "ggplot2", "ggrepel", "gstat", "kriging", "lattice", "magrittr", "metR", "mice", "nleqslv", "pbapply", "plotly", "purrr", "reshape2", "sp", "stringr", "tidyr", "tidyverse", "vegan"] }, "synlet": { "name": "synlet", "version": "2.4.0", "sha256": "0nfqm2qfavn71k5dhz6x2958yplasnbvjc6mqzh4i237x03184g4", - "depends": ["data_table", "ggplot2", "magrittr", "patchwork", "RankProd", "RColorBrewer"] + "depends": ["RColorBrewer", "RankProd", "data_table", "ggplot2", "magrittr", "patchwork"] }, "syntenet": { "name": "syntenet", "version": "1.6.0", "sha256": "1220hbkmg10ly0i5m6wnqnsa6m2f2xgs85798y9mlcqwxrp5ih35", - "depends": ["BiocParallel", "Biostrings", "GenomicRanges", "ggnetwork", "ggplot2", "igraph", "intergraph", "networkD3", "pheatmap", "RColorBrewer", "Rcpp", "rlang", "rtracklayer", "testthat"] + "depends": ["BiocParallel", "Biostrings", "GenomicRanges", "RColorBrewer", "Rcpp", "ggnetwork", "ggplot2", "igraph", "intergraph", "networkD3", "pheatmap", "rlang", "rtracklayer", "testthat"] }, "systemPipeR": { "name": "systemPipeR", "version": "2.10.0", "sha256": "13xxcqy5hhy45zglv6gc86ndmisfkjq4dg55x2j1kw3jqha1brnx", - "depends": ["BiocGenerics", "Biostrings", "crayon", "GenomicRanges", "ggplot2", "htmlwidgets", "magrittr", "Rsamtools", "S4Vectors", "ShortRead", "stringr", "SummarizedExperiment", "yaml"] + "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "crayon", "ggplot2", "htmlwidgets", "magrittr", "stringr", "yaml"] }, "systemPipeShiny": { "name": "systemPipeShiny", "version": "1.14.0", "sha256": "14wgamxg2jpj3xjlna9x5rd3kpndhxs20gh84acix3pa3ppr8xgf", - "depends": ["assertthat", "bsplus", "crayon", "dplyr", "drawer", "DT", "ggplot2", "glue", "htmltools", "magrittr", "openssl", "plotly", "R6", "rlang", "RSQLite", "rstudioapi", "shiny", "shinyAce", "shinydashboard", "shinydashboardPlus", "shinyFiles", "shinyjqui", "shinyjs", "shinytoastr", "shinyWidgets", "spsComps", "spsUtil", "stringr", "styler", "tibble", "vroom", "yaml"] + "depends": ["DT", "R6", "RSQLite", "assertthat", "bsplus", "crayon", "dplyr", "drawer", "ggplot2", "glue", "htmltools", "magrittr", "openssl", "plotly", "rlang", "rstudioapi", "shiny", "shinyAce", "shinyFiles", "shinyWidgets", "shinydashboard", "shinydashboardPlus", "shinyjqui", "shinyjs", "shinytoastr", "spsComps", "spsUtil", "stringr", "styler", "tibble", "vroom", "yaml"] }, "systemPipeTools": { "name": "systemPipeTools", "version": "1.12.0", "sha256": "08r0dglqpr638pbssr3l3xcly7mhj0jsq5rrzdnqh5sg4wz11gyj", - "depends": ["ape", "DESeq2", "dplyr", "DT", "GGally", "ggplot2", "ggrepel", "ggtree", "glmpca", "magrittr", "pheatmap", "plotly", "Rtsne", "SummarizedExperiment", "tibble"] + "depends": ["DESeq2", "DT", "GGally", "Rtsne", "SummarizedExperiment", "ape", "dplyr", "ggplot2", "ggrepel", "ggtree", "glmpca", "magrittr", "pheatmap", "plotly", "tibble"] }, "tLOH": { "name": "tLOH", "version": "1.12.0", "sha256": "0r8a0srff8y5ap2zz4kk6302gkb69bgylxggnz704zi3yzvyklv1", - "depends": ["bestNormalize", "data_table", "depmixS4", "dplyr", "GenomicRanges", "ggplot2", "MatrixGenerics", "naniar", "purrr", "scales", "stringr", "VariantAnnotation"] + "depends": ["GenomicRanges", "MatrixGenerics", "VariantAnnotation", "bestNormalize", "data_table", "depmixS4", "dplyr", "ggplot2", "naniar", "purrr", "scales", "stringr"] }, "tRNA": { "name": "tRNA", "version": "1.22.0", "sha256": "0dg4s5kxsdh2j8smqi8vm7yncy9kb79sj8xlvf4wgf3aljarms21", - "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "ggplot2", "IRanges", "Modstrings", "S4Vectors", "scales", "stringr", "Structstrings", "XVector"] + "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "IRanges", "Modstrings", "S4Vectors", "Structstrings", "XVector", "ggplot2", "scales", "stringr"] }, "tRNAdbImport": { "name": "tRNAdbImport", "version": "1.22.0", "sha256": "0yvgxxf5d5mh91cmbba66krj6jz5gl1qkgjck9310k4mk7pjfww3", - "depends": ["Biostrings", "GenomicRanges", "httr2", "IRanges", "Modstrings", "S4Vectors", "stringr", "Structstrings", "tRNA", "xml2"] + "depends": ["Biostrings", "GenomicRanges", "IRanges", "Modstrings", "S4Vectors", "Structstrings", "httr2", "stringr", "tRNA", "xml2"] }, "tRNAscanImport": { "name": "tRNAscanImport", "version": "1.24.0", "sha256": "12wn5sdq1miimn31ismzs2w06q3l66l774dbfndw8bx3awhrf7g1", - "depends": ["BiocGenerics", "Biostrings", "BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "rtracklayer", "S4Vectors", "stringr", "Structstrings", "tRNA", "XVector"] + "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "Structstrings", "XVector", "rtracklayer", "stringr", "tRNA"] }, "tRanslatome": { "name": "tRanslatome", "version": "1.42.0", "sha256": "0xnr7a7cm7lcvyipjj6p4347yqykpfghz37qxyam5ixplfwlh1cg", - "depends": ["anota", "Biobase", "DESeq2", "edgeR", "GOSemSim", "gplots", "Heatplus", "limma", "org_Hs_eg_db", "plotrix", "RankProd", "topGO"] + "depends": ["Biobase", "DESeq2", "GOSemSim", "Heatplus", "RankProd", "anota", "edgeR", "gplots", "limma", "org_Hs_eg_db", "plotrix", "topGO"] }, "tadar": { "name": "tadar", - "version": "1.2.0", - "sha256": "12jmrnaqf1hkdjw2qvxjkb2y2860ck9a5957h44nkhxf75lv35vb", - "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "ggplot2", "Gviz", "IRanges", "MatrixGenerics", "rlang", "Rsamtools", "S4Vectors", "VariantAnnotation"] + "version": "1.2.1", + "sha256": "19f9qzz2hg4j75v6xzma9va0wr3iq8la3dv0qj0aky81ncam4b8z", + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "MatrixGenerics", "Rsamtools", "S4Vectors", "VariantAnnotation", "ggplot2", "rlang"] }, "tanggle": { "name": "tanggle", @@ -12795,6 +12843,12 @@ "sha256": "1crqxj8wk66h2jvxnmw5rhdsdfhkd59d2pxw1lf05w7dkd495zfr", "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "matrixStats", "shiny"] }, + "tenXplore": { + "name": "tenXplore", + "version": "1.26.2", + "sha256": "088vs1pcq92qgismxz886nmciharsvdnj0h2pbs40n391icbp7if", + "depends": ["AnnotationDbi", "BiocFileCache", "SummarizedExperiment", "matrixStats", "ontoProc", "org_Mm_eg_db", "shiny"] + }, "ternarynet": { "name": "ternarynet", "version": "1.48.0", @@ -12805,55 +12859,55 @@ "name": "terraTCGAdata", "version": "1.8.0", "sha256": "18i933ndja1pa4iql96fvx2brjmcvvirlp048hjxvkapm0bhsm19", - "depends": ["AnVIL", "BiocFileCache", "dplyr", "GenomicRanges", "MultiAssayExperiment", "RaggedExperiment", "readr", "S4Vectors", "TCGAutils", "tidyr"] + "depends": ["AnVIL", "BiocFileCache", "GenomicRanges", "MultiAssayExperiment", "RaggedExperiment", "S4Vectors", "TCGAutils", "dplyr", "readr", "tidyr"] }, "tidyCoverage": { "name": "tidyCoverage", "version": "1.0.0", "sha256": "150q5qwifni2d2jvx1k3c0cq5n2k1s33yps8v5d6ksa3qs510p4s", - "depends": ["BiocIO", "BiocParallel", "cli", "dplyr", "fansi", "GenomeInfoDb", "GenomicRanges", "IRanges", "pillar", "purrr", "rlang", "rtracklayer", "S4Vectors", "SummarizedExperiment", "tidyr", "vctrs"] + "depends": ["BiocIO", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "cli", "dplyr", "fansi", "pillar", "purrr", "rlang", "rtracklayer", "tidyr", "vctrs"] }, "tidySingleCellExperiment": { "name": "tidySingleCellExperiment", "version": "1.14.0", "sha256": "1rvc0576ajxx7njyiyh2ql85an4dn9v8v4q7g8gfdgd9jg5v4hmz", - "depends": ["cli", "dplyr", "ellipsis", "fansi", "ggplot2", "lifecycle", "magrittr", "Matrix", "pillar", "pkgconfig", "purrr", "rlang", "S4Vectors", "SingleCellExperiment", "stringr", "SummarizedExperiment", "tibble", "tidyr", "tidyselect", "ttservice", "vctrs"] + "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cli", "dplyr", "ellipsis", "fansi", "ggplot2", "lifecycle", "magrittr", "pillar", "pkgconfig", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "ttservice", "vctrs"] }, "tidySpatialExperiment": { "name": "tidySpatialExperiment", "version": "1.0.0", "sha256": "0a2bramm53dvl7qib18z7s8zrfjprkrg6zzj5q7z4jf5smj7szzf", - "depends": ["BiocGenerics", "cli", "dplyr", "fansi", "ggplot2", "lifecycle", "magrittr", "Matrix", "pillar", "pkgconfig", "purrr", "rlang", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "stringr", "SummarizedExperiment", "tibble", "tidyr", "tidyselect", "tidySingleCellExperiment", "ttservice", "vctrs"] + "depends": ["BiocGenerics", "Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "cli", "dplyr", "fansi", "ggplot2", "lifecycle", "magrittr", "pillar", "pkgconfig", "purrr", "rlang", "stringr", "tibble", "tidySingleCellExperiment", "tidyr", "tidyselect", "ttservice", "vctrs"] }, "tidySummarizedExperiment": { "name": "tidySummarizedExperiment", "version": "1.14.0", "sha256": "0bcvna28shr27pdzi1n2g6bldqrakkwn0wh7ld39wbn439awshr9", - "depends": ["cli", "dplyr", "ellipsis", "fansi", "ggplot2", "lifecycle", "magrittr", "pillar", "pkgconfig", "purrr", "rlang", "S4Vectors", "stringr", "SummarizedExperiment", "tibble", "tidyr", "tidyselect", "ttservice", "vctrs"] + "depends": ["S4Vectors", "SummarizedExperiment", "cli", "dplyr", "ellipsis", "fansi", "ggplot2", "lifecycle", "magrittr", "pillar", "pkgconfig", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "ttservice", "vctrs"] }, "tidybulk": { "name": "tidybulk", "version": "1.16.0", "sha256": "1ij4x2fqcpdkdl62kwjhk3w19m7vwq8m3bglhsxz7pkzy49cfifx", - "depends": ["crayon", "dplyr", "GenomicRanges", "lifecycle", "magrittr", "Matrix", "preprocessCore", "purrr", "readr", "rlang", "S4Vectors", "scales", "stringi", "stringr", "SummarizedExperiment", "tibble", "tidyr", "tidyselect", "ttservice"] + "depends": ["GenomicRanges", "Matrix", "S4Vectors", "SummarizedExperiment", "crayon", "dplyr", "lifecycle", "magrittr", "preprocessCore", "purrr", "readr", "rlang", "scales", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "ttservice"] }, "tidyomics": { "name": "tidyomics", "version": "1.0.0", "sha256": "08d2bkaqya090y93wg8cj36bbqbiy62p9swiz9ci9z4055sv900y", - "depends": ["cli", "nullranges", "plyranges", "purrr", "rlang", "stringr", "tidybulk", "tidyseurat", "tidySingleCellExperiment", "tidySummarizedExperiment"] + "depends": ["cli", "nullranges", "plyranges", "purrr", "rlang", "stringr", "tidySingleCellExperiment", "tidySummarizedExperiment", "tidybulk", "tidyseurat"] }, "tigre": { "name": "tigre", "version": "1.58.0", "sha256": "1gdfiga7m4zdsr8vj8anlkj1jfdrlzhsik36jdgi4f92pyyllgwx", - "depends": ["annotate", "AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "gplots", "RSQLite"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "RSQLite", "annotate", "gplots"] }, "tilingArray": { "name": "tilingArray", "version": "1.82.0", "sha256": "1408275gvfilc2k8sfsja8bm5fdgnblf2sf5wdd3if51qi61clb0", - "depends": ["affy", "Biobase", "genefilter", "pixmap", "RColorBrewer", "strucchange", "vsn"] + "depends": ["Biobase", "RColorBrewer", "affy", "genefilter", "pixmap", "strucchange", "vsn"] }, "timeOmics": { "name": "timeOmics", @@ -12865,7 +12919,7 @@ "name": "timecourse", "version": "1.76.0", "sha256": "05q6vw76hhi4frpf4vivq1jxkh99xq44vw2p5gz4zgcinsc58yql", - "depends": ["Biobase", "limma", "marray", "MASS"] + "depends": ["Biobase", "MASS", "limma", "marray"] }, "timescape": { "name": "timescape", @@ -12883,19 +12937,19 @@ "name": "tomoda", "version": "1.14.0", "sha256": "0cx4153sknl0prpdm12y6n44kg10ib8b7qk3102pvgv9mz4xgrbv", - "depends": ["ggplot2", "ggrepel", "RColorBrewer", "reshape2", "Rtsne", "SummarizedExperiment", "umap"] + "depends": ["RColorBrewer", "Rtsne", "SummarizedExperiment", "ggplot2", "ggrepel", "reshape2", "umap"] }, "tomoseqr": { "name": "tomoseqr", "version": "1.8.0", "sha256": "14x665zaljr448gdb84d0y1hlqih7n9z2dy052y4ay22l10f8886", - "depends": ["animation", "BiocFileCache", "dplyr", "ggplot2", "plotly", "purrr", "readr", "shiny", "stringr", "tibble"] + "depends": ["BiocFileCache", "animation", "dplyr", "ggplot2", "plotly", "purrr", "readr", "shiny", "stringr", "tibble"] }, "topGO": { "name": "topGO", "version": "2.56.0", "sha256": "0ly4rai3na88dnfizsi60r6py0qmf0pw95b0hprfkvzpjyd72p75", - "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "GO_db", "graph", "lattice", "matrixStats", "SparseM"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "GO_db", "SparseM", "graph", "lattice", "matrixStats"] }, "topconfects": { "name": "topconfects", @@ -12907,67 +12961,67 @@ "name": "topdownr", "version": "1.26.0", "sha256": "1axqyjlp6386shcw95mg0ljj12683ix03yk5bcxr2bqd36csfa6y", - "depends": ["Biobase", "BiocGenerics", "Biostrings", "ggplot2", "Matrix", "MSnbase", "mzR", "ProtGenerics", "PSMatch", "S4Vectors"] + "depends": ["Biobase", "BiocGenerics", "Biostrings", "MSnbase", "Matrix", "PSMatch", "ProtGenerics", "S4Vectors", "ggplot2", "mzR"] }, "tpSVG": { "name": "tpSVG", "version": "1.0.0", "sha256": "135w2w6j3cgfrkfkzmmy40ii10zp32r7xjc0pg07h2gm0hdz5yj0", - "depends": ["BiocParallel", "MatrixGenerics", "mgcv", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment"] + "depends": ["BiocParallel", "MatrixGenerics", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "mgcv"] }, "trackViewer": { "name": "trackViewer", "version": "1.40.0", "sha256": "01m0jwig3l6dfhd3w5aq4sx2krsipjg5jjxa78kalfrzrm6k05s4", - "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "grImport", "Gviz", "htmlwidgets", "igraph", "InteractionSet", "IRanges", "plotrix", "rhdf5", "Rsamtools", "rtracklayer", "S4Vectors", "scales", "strawr", "txdbmaker"] + "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "InteractionSet", "Rsamtools", "S4Vectors", "grImport", "htmlwidgets", "igraph", "plotrix", "rhdf5", "rtracklayer", "scales", "strawr", "txdbmaker"] }, "tracktables": { "name": "tracktables", "version": "1.38.0", "sha256": "1rfpb13sd2rqhxkywif58fm2l8ch664ga149y1nxwf409hbqb81w", - "depends": ["GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "stringr", "tractor_base", "XML", "XVector"] + "depends": ["GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "XML", "XVector", "stringr", "tractor_base"] }, "tradeSeq": { "name": "tradeSeq", "version": "1.18.0", "sha256": "1kgvvvwvj3dgb2wik3y8j44ynda94bi05vvmiwlayrypqprwi1c1", - "depends": ["Biobase", "BiocParallel", "edgeR", "ggplot2", "igraph", "magrittr", "MASS", "Matrix", "matrixStats", "mgcv", "pbapply", "princurve", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "slingshot", "SummarizedExperiment", "tibble", "TrajectoryUtils", "viridis"] + "depends": ["Biobase", "BiocParallel", "MASS", "Matrix", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TrajectoryUtils", "edgeR", "ggplot2", "igraph", "magrittr", "matrixStats", "mgcv", "pbapply", "princurve", "slingshot", "tibble", "viridis"] }, "transcriptR": { "name": "transcriptR", "version": "1.32.0", "sha256": "1lx11dyr8q4yd57l7rj0788488amhiiahfml2m69554hk94cd46i", - "depends": ["BiocGenerics", "caret", "chipseq", "e1071", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "pROC", "reshape2", "Rsamtools", "rtracklayer", "S4Vectors"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "caret", "chipseq", "e1071", "ggplot2", "pROC", "reshape2", "rtracklayer"] }, "transcriptogramer": { "name": "transcriptogramer", "version": "1.26.0", "sha256": "0n44im93a72sihivlxn5x2k3s412b91ixqamc0wlk57vw0ppycm6", - "depends": ["biomaRt", "data_table", "doSNOW", "foreach", "ggplot2", "igraph", "limma", "progress", "RedeR", "snow", "tidyr", "topGO"] + "depends": ["RedeR", "biomaRt", "data_table", "doSNOW", "foreach", "ggplot2", "igraph", "limma", "progress", "snow", "tidyr", "topGO"] }, "transformGamPoi": { "name": "transformGamPoi", "version": "1.10.0", "sha256": "09z5d72zk6lnhjvfffpylgkk6w73wrlcasr8agy7ydy1b80cj36c", - "depends": ["DelayedArray", "glmGamPoi", "HDF5Array", "Matrix", "MatrixGenerics", "Rcpp", "SummarizedExperiment"] + "depends": ["DelayedArray", "HDF5Array", "Matrix", "MatrixGenerics", "Rcpp", "SummarizedExperiment", "glmGamPoi"] }, "transite": { "name": "transite", "version": "1.22.0", "sha256": "15r8q0j7475ccq592fiqvcxkggb8zkg6lq3zmz65jljfdggj6kn4", - "depends": ["BiocGenerics", "Biostrings", "dplyr", "GenomicRanges", "ggplot2", "gridExtra", "Rcpp", "scales", "TFMPvalue"] + "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "Rcpp", "TFMPvalue", "dplyr", "ggplot2", "gridExtra", "scales"] }, "transmogR": { "name": "transmogR", "version": "1.0.0", "sha256": "1531h4i6jn25r451ndf7jjscfbzs1k7477v0cn0rrr5hay8i2z3s", - "depends": ["Biostrings", "BSgenome", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "rlang", "S4Vectors", "scales", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "ggplot2", "rlang", "scales"] }, "transomics2cytoscape": { "name": "transomics2cytoscape", "version": "1.14.0", "sha256": "1f7qdymlgqh4la1rhlk5s580ka8p4f8ravm19i02ndx50jlnq12q", - "depends": ["dplyr", "KEGGREST", "pbapply", "purrr", "RCy3", "tibble"] + "depends": ["KEGGREST", "RCy3", "dplyr", "pbapply", "purrr", "tibble"] }, "traseR": { "name": "traseR", @@ -12979,13 +13033,13 @@ "name": "traviz", "version": "1.10.0", "sha256": "1jjdfl8xvzlr31w74j12s5pdg5b1yylg1i30n804p9mqyx11g5sc", - "depends": ["Biobase", "ggplot2", "mgcv", "princurve", "RColorBrewer", "rgl", "SingleCellExperiment", "slingshot", "SummarizedExperiment", "viridis"] + "depends": ["Biobase", "RColorBrewer", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "mgcv", "princurve", "rgl", "slingshot", "viridis"] }, "treeclimbR": { "name": "treeclimbR", "version": "1.0.0", "sha256": "1ynrc06f1dh1vaa24j25naydvj4lvygcv89ssz5gv0xpmr0ydlc1", - "depends": ["ape", "diffcyt", "dirmult", "dplyr", "edgeR", "ggnewscale", "ggplot2", "ggtree", "rlang", "S4Vectors", "SummarizedExperiment", "tibble", "tidyr", "TreeSummarizedExperiment", "viridis"] + "depends": ["S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment", "ape", "diffcyt", "dirmult", "dplyr", "edgeR", "ggnewscale", "ggplot2", "ggtree", "rlang", "tibble", "tidyr", "viridis"] }, "treeio": { "name": "treeio", @@ -12997,13 +13051,13 @@ "name": "treekoR", "version": "1.12.0", "sha256": "02mzd9ay9fij2qr9dkrg72h7yw9jpjmqx4gz0hsjpb03akc1npqw", - "depends": ["ape", "data_table", "diffcyt", "dplyr", "edgeR", "ggiraph", "ggplot2", "ggtree", "hopach", "lme4", "multcomp", "patchwork", "SingleCellExperiment", "tidyr"] + "depends": ["SingleCellExperiment", "ape", "data_table", "diffcyt", "dplyr", "edgeR", "ggiraph", "ggplot2", "ggtree", "hopach", "lme4", "multcomp", "patchwork", "tidyr"] }, "tricycle": { "name": "tricycle", "version": "1.12.0", "sha256": "11928pcd8xzmll28m0ihi3rasc4w1i0fshn4bh9n2lyigkr5ayi4", - "depends": ["AnnotationDbi", "circular", "dplyr", "GenomicRanges", "ggnewscale", "ggplot2", "IRanges", "RColorBrewer", "S4Vectors", "scater", "scattermore", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["AnnotationDbi", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "circular", "dplyr", "ggnewscale", "ggplot2", "scater", "scattermore"] }, "trigger": { "name": "trigger", @@ -13027,19 +13081,19 @@ "name": "tripr", "version": "1.10.0", "sha256": "0lh2qlqi6rxq4v5cw4qr2syyjig7iy6z3pc0d6gpr4lbhwcm50d5", - "depends": ["config", "data_table", "dplyr", "DT", "golem", "gridExtra", "plot3D", "plotly", "plyr", "RColorBrewer", "shiny", "shinyBS", "shinyFiles", "shinyjs", "stringdist", "stringr"] + "depends": ["DT", "RColorBrewer", "config", "data_table", "dplyr", "golem", "gridExtra", "plot3D", "plotly", "plyr", "shiny", "shinyBS", "shinyFiles", "shinyjs", "stringdist", "stringr"] }, "ttgsea": { "name": "ttgsea", "version": "1.12.0", "sha256": "1j09ircbzpvx661yrsnz7b6hxgsc0snm3q6gi72hcyjc9xgx46zs", - "depends": ["data_table", "DiagrammeR", "keras", "purrr", "stopwords", "text2vec", "textstem", "tm", "tokenizers"] + "depends": ["DiagrammeR", "data_table", "keras", "purrr", "stopwords", "text2vec", "textstem", "tm", "tokenizers"] }, "tweeDEseq": { "name": "tweeDEseq", "version": "1.50.0", "sha256": "0mmrp0x64k1cd0n7qqrpr191n57hciq75aw3gvfrplcfi75xb7q3", - "depends": ["cqn", "edgeR", "limma", "MASS", "Rcpp"] + "depends": ["MASS", "Rcpp", "cqn", "edgeR", "limma"] }, "twilight": { "name": "twilight", @@ -13051,25 +13105,25 @@ "name": "twoddpcr", "version": "1.28.0", "sha256": "13if809c4nxf5cprps9p9w6z1r3xxjq556315wbkyh0pw724nki0", - "depends": ["class", "ggplot2", "hexbin", "RColorBrewer", "S4Vectors", "scales", "shiny"] + "depends": ["RColorBrewer", "S4Vectors", "class", "ggplot2", "hexbin", "scales", "shiny"] }, "txcutr": { "name": "txcutr", "version": "1.10.0", "sha256": "165yfhmw8j91bx0x7kasxyiwdiy7yxzzjg4vlyic0bf2f3xvyn1g", - "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "Biostrings", "GenomicFeatures", "GenomicRanges", "IRanges", "rtracklayer", "S4Vectors", "txdbmaker"] + "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "Biostrings", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "rtracklayer", "txdbmaker"] }, "txdbmaker": { "name": "txdbmaker", - "version": "1.0.0", - "sha256": "099x6v4crp953jcgqipj0001kxg7gv5h0r4mmvh1cg7j69w0zd5m", - "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocIO", "biomaRt", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "httr", "IRanges", "rjson", "RSQLite", "rtracklayer", "S4Vectors", "UCSC_utils"] + "version": "1.0.1", + "sha256": "1nl7lr0x0kicd44gvwrdslcnnlmqaf57rgp1gb22yvz3lfzjziqi", + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocIO", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "UCSC_utils", "biomaRt", "httr", "rjson", "rtracklayer"] }, "tximeta": { "name": "tximeta", "version": "1.22.1", "sha256": "0lmkxl7zlp6z4i32jyy914kiwacnz89jnd2kqma81mq81r389p06", - "depends": ["AnnotationDbi", "AnnotationHub", "BiocFileCache", "Biostrings", "ensembldb", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "jsonlite", "Matrix", "S4Vectors", "SummarizedExperiment", "tibble", "txdbmaker", "tximport"] + "depends": ["AnnotationDbi", "AnnotationHub", "BiocFileCache", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "SummarizedExperiment", "ensembldb", "jsonlite", "tibble", "txdbmaker", "tximport"] }, "tximport": { "name": "tximport", @@ -13081,31 +13135,31 @@ "name": "uSORT", "version": "1.30.0", "sha256": "04k0763dykakv03gxvlwsp6qlg6lpzd5512p5rdq2v5dk19scvm1", - "depends": ["Biobase", "BiocGenerics", "cluster", "fpc", "gplots", "igraph", "Matrix", "monocle", "plyr", "RANN", "RSpectra", "VGAM"] + "depends": ["Biobase", "BiocGenerics", "Matrix", "RANN", "RSpectra", "VGAM", "cluster", "fpc", "gplots", "igraph", "monocle", "plyr"] }, "uncoverappLib": { "name": "uncoverappLib", "version": "1.14.0", "sha256": "17p2aqpg3q6yqplw2haazm1hhr6s0nwhghcvn3j9128n5pg2j58x", - "depends": ["BiocFileCache", "condformat", "DT", "EnsDb_Hsapiens_v75", "EnsDb_Hsapiens_v86", "GenomicRanges", "Gviz", "Homo_sapiens", "markdown", "openxlsx", "org_Hs_eg_db", "OrganismDbi", "processx", "rappdirs", "rlist", "Rsamtools", "S4Vectors", "shiny", "shinyBS", "shinycssloaders", "shinyjs", "shinyWidgets", "stringr", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene"] + "depends": ["BiocFileCache", "DT", "EnsDb_Hsapiens_v75", "EnsDb_Hsapiens_v86", "GenomicRanges", "Gviz", "Homo_sapiens", "OrganismDbi", "Rsamtools", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "condformat", "markdown", "openxlsx", "org_Hs_eg_db", "processx", "rappdirs", "rlist", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "shinyjs", "stringr"] }, "universalmotif": { "name": "universalmotif", - "version": "1.22.0", - "sha256": "1kasmib3lp68pq5f9qzh38z7gpv8hik536iz16g8a73pc6bcbmzy", - "depends": ["BiocGenerics", "Biostrings", "ggplot2", "IRanges", "MASS", "MatrixGenerics", "Rcpp", "RcppThread", "rlang", "S4Vectors", "yaml"] + "version": "1.22.1", + "sha256": "0nb2xc0rw9k6nr7bgf4ip33g2cs5vnhy55ms6zkwsnd30hi69wyy", + "depends": ["BiocGenerics", "Biostrings", "IRanges", "MASS", "MatrixGenerics", "Rcpp", "RcppThread", "S4Vectors", "ggplot2", "rlang", "yaml"] }, "updateObject": { "name": "updateObject", "version": "1.8.0", "sha256": "151nma7yyhk8s67bqim6jn86p85zdq7hj0xvvpnsl78bacncca8c", - "depends": ["BiocGenerics", "digest", "S4Vectors"] + "depends": ["BiocGenerics", "S4Vectors", "digest"] }, "variancePartition": { "name": "variancePartition", "version": "1.34.0", "sha256": "00hrizpx05jfh7yrab6na10zkahm8ibrbxy4pa4dcldw65klqmn9", - "depends": ["aod", "Biobase", "BiocParallel", "corpcor", "fANCOVA", "ggplot2", "gplots", "iterators", "limma", "lme4", "lmerTest", "MASS", "Matrix", "matrixStats", "pbkrtest", "Rdpack", "remaCor", "reshape2", "RhpcBLASctl", "rlang", "scales"] + "depends": ["Biobase", "BiocParallel", "MASS", "Matrix", "Rdpack", "RhpcBLASctl", "aod", "corpcor", "fANCOVA", "ggplot2", "gplots", "iterators", "limma", "lme4", "lmerTest", "matrixStats", "pbkrtest", "remaCor", "reshape2", "rlang", "scales"] }, "vbmp": { "name": "vbmp", @@ -13115,75 +13169,75 @@ }, "velociraptor": { "name": "velociraptor", - "version": "1.14.0", - "sha256": "0sr796g3hak3vv014fvibi95fqayhjdp9qj1lyd84lc84rwhzli2", - "depends": ["basilisk", "BiocGenerics", "BiocParallel", "BiocSingular", "DelayedArray", "Matrix", "reticulate", "S4Vectors", "scuttle", "SingleCellExperiment", "SummarizedExperiment", "zellkonverter"] + "version": "1.14.3", + "sha256": "0i8kzj79qszqaq6ynij006r80g2jacm4pmjkvv1h36mxp3a6z559", + "depends": ["BiocGenerics", "BiocParallel", "BiocSingular", "DelayedArray", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "basilisk", "reticulate", "scuttle", "zellkonverter"] }, "veloviz": { "name": "veloviz", "version": "1.10.0", "sha256": "0bni9ykffsa4zazycaki74xxwps40ngsrvq32bdr4anyhya2nk1v", - "depends": ["igraph", "Matrix", "mgcv", "Rcpp", "RSpectra"] + "depends": ["Matrix", "RSpectra", "Rcpp", "igraph", "mgcv"] }, "vidger": { "name": "vidger", "version": "1.24.0", "sha256": "1ladsgxqmmff7rw6w3x8jyxba4mdk7bb4f4wgimwfgvyjmygsaqr", - "depends": ["Biobase", "DESeq2", "edgeR", "GGally", "ggplot2", "ggrepel", "knitr", "RColorBrewer", "rmarkdown", "scales", "SummarizedExperiment", "tidyr"] + "depends": ["Biobase", "DESeq2", "GGally", "RColorBrewer", "SummarizedExperiment", "edgeR", "ggplot2", "ggrepel", "knitr", "rmarkdown", "scales", "tidyr"] }, "viper": { "name": "viper", "version": "1.38.0", "sha256": "00cl6lbi56dbd8dilg0iczca87wr3572vq7i352mgfdinlw7fcyk", - "depends": ["Biobase", "e1071", "KernSmooth", "mixtools"] + "depends": ["Biobase", "KernSmooth", "e1071", "mixtools"] }, "vissE": { "name": "vissE", "version": "1.12.0", "sha256": "1bw74vjag4g90d2s29w5j51dd30xqp6k6x6vwb0ihrxfvadns5dx", - "depends": ["ggforce", "ggplot2", "ggraph", "ggrepel", "ggwordcloud", "GSEABase", "igraph", "msigdb", "plyr", "RColorBrewer", "reshape2", "scales", "scico", "textstem", "tidygraph", "tm"] + "depends": ["GSEABase", "RColorBrewer", "ggforce", "ggplot2", "ggraph", "ggrepel", "ggwordcloud", "igraph", "msigdb", "plyr", "reshape2", "scales", "scico", "textstem", "tidygraph", "tm"] }, "vsclust": { "name": "vsclust", "version": "1.6.0", "sha256": "0kb63am4aa6gmlpbczdbmxc7vwnmnnkd78ql6nizd9sfixdmiqm5", - "depends": ["limma", "matrixStats", "MultiAssayExperiment", "qvalue", "Rcpp", "shiny"] + "depends": ["MultiAssayExperiment", "Rcpp", "limma", "matrixStats", "qvalue", "shiny"] }, "vsn": { "name": "vsn", "version": "3.72.0", "sha256": "1r6cd92d4xlx4zdyy1sfaxicjf4q3arflmswpdkckkc4h9c6zf8m", - "depends": ["affy", "Biobase", "ggplot2", "lattice", "limma"] + "depends": ["Biobase", "affy", "ggplot2", "lattice", "limma"] }, "vtpnet": { "name": "vtpnet", "version": "0.44.0", "sha256": "1fi4yjh7nvrq9fzba771i32p6qhq3cl7c9sil1hpc9l4k9bxfdfp", - "depends": ["doParallel", "foreach", "GenomicRanges", "graph", "gwascat"] + "depends": ["GenomicRanges", "doParallel", "foreach", "graph", "gwascat"] }, "vulcan": { "name": "vulcan", "version": "1.26.0", "sha256": "1fimj4rbrw6wy1kl6is49v33y6c1s3n9nkanpqibkgk4g3cljxfa", - "depends": ["Biobase", "caTools", "ChIPpeakAnno", "csaw", "DESeq2", "DiffBind", "GenomicRanges", "gplots", "locfit", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "viper", "wordcloud", "zoo"] + "depends": ["Biobase", "ChIPpeakAnno", "DESeq2", "DiffBind", "GenomicRanges", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "caTools", "csaw", "gplots", "locfit", "viper", "wordcloud", "zoo"] }, "waddR": { "name": "waddR", "version": "1.18.0", "sha256": "160v6qqcx3fn657p7blq261nqclww2wic3gp0k855d3kx4i12i5l", - "depends": ["arm", "BiocFileCache", "BiocParallel", "eva", "Rcpp", "RcppArmadillo", "SingleCellExperiment"] + "depends": ["BiocFileCache", "BiocParallel", "Rcpp", "RcppArmadillo", "SingleCellExperiment", "arm", "eva"] }, "wateRmelon": { "name": "wateRmelon", "version": "2.10.0", "sha256": "19zlv9aglllsjq3jcnlw994bkanjdq0ib46k7wjsig04cx4apz1v", - "depends": ["Biobase", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "illuminaio", "limma", "lumi", "matrixStats", "methylumi", "ROC"] + "depends": ["Biobase", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "ROC", "illuminaio", "limma", "lumi", "matrixStats", "methylumi"] }, "wavClusteR": { "name": "wavClusteR", "version": "2.38.0", "sha256": "0yr4jfaxs253xg5q0kds8fm97kqacx67pw1c80yx2w79v7nqskgv", - "depends": ["BiocGenerics", "Biostrings", "foreach", "GenomicFeatures", "GenomicRanges", "ggplot2", "Hmisc", "IRanges", "mclust", "Rsamtools", "rtracklayer", "S4Vectors", "seqinr", "stringr"] + "depends": ["BiocGenerics", "Biostrings", "GenomicFeatures", "GenomicRanges", "Hmisc", "IRanges", "Rsamtools", "S4Vectors", "foreach", "ggplot2", "mclust", "rtracklayer", "seqinr", "stringr"] }, "weaver": { "name": "weaver", @@ -13195,13 +13249,13 @@ "name": "webbioc", "version": "1.76.0", "sha256": "1ws4w2kf514adk50sjadgasm7z1xvklcb8s243m12fvlg63dia9i", - "depends": ["affy", "annaffy", "Biobase", "BiocManager", "gcrma", "multtest", "qvalue", "vsn"] + "depends": ["Biobase", "BiocManager", "affy", "annaffy", "gcrma", "multtest", "qvalue", "vsn"] }, "weitrix": { "name": "weitrix", "version": "1.16.0", "sha256": "01jp94k2qlxbci1kidx4lnxkz0bf4vaj5p31c4brcmgrzv0a1pz4", - "depends": ["assertthat", "BiocGenerics", "BiocParallel", "Ckmeans_1d_dp", "DelayedArray", "DelayedMatrixStats", "dplyr", "ggplot2", "glm2", "limma", "purrr", "reshape2", "RhpcBLASctl", "rlang", "S4Vectors", "scales", "SummarizedExperiment", "topconfects"] + "depends": ["BiocGenerics", "BiocParallel", "Ckmeans_1d_dp", "DelayedArray", "DelayedMatrixStats", "RhpcBLASctl", "S4Vectors", "SummarizedExperiment", "assertthat", "dplyr", "ggplot2", "glm2", "limma", "purrr", "reshape2", "rlang", "scales", "topconfects"] }, "widgetTools": { "name": "widgetTools", @@ -13213,31 +13267,31 @@ "name": "wiggleplotr", "version": "1.28.0", "sha256": "1px7rgvaj6kks6fp7yqsqjwy4knlzgllzxsiimv8nikmbd57dmi0", - "depends": ["assertthat", "cowplot", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "purrr", "rtracklayer", "S4Vectors"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "assertthat", "cowplot", "dplyr", "ggplot2", "purrr", "rtracklayer"] }, "wpm": { "name": "wpm", "version": "1.14.0", "sha256": "1623q58fjxnx1632fn5c5rhx0zpglbjpp7zqp15f2gch01ac0xdy", - "depends": ["Biobase", "cli", "config", "dplyr", "DT", "ggplot2", "golem", "logging", "RColorBrewer", "rlang", "shiny", "shinycustomloader", "shinydashboard", "shinyWidgets", "stringr", "SummarizedExperiment"] + "depends": ["Biobase", "DT", "RColorBrewer", "SummarizedExperiment", "cli", "config", "dplyr", "ggplot2", "golem", "logging", "rlang", "shiny", "shinyWidgets", "shinycustomloader", "shinydashboard", "stringr"] }, "wppi": { "name": "wppi", "version": "1.12.0", "sha256": "1mvr5bpsng87yl1bhd22h45830vw3sla1ysnr29px13if2q5ylmy", - "depends": ["dplyr", "igraph", "logger", "magrittr", "Matrix", "OmnipathR", "progress", "purrr", "RCurl", "rlang", "tibble", "tidyr"] + "depends": ["Matrix", "OmnipathR", "RCurl", "dplyr", "igraph", "logger", "magrittr", "progress", "purrr", "rlang", "tibble", "tidyr"] }, "xcms": { "name": "xcms", "version": "4.2.2", "sha256": "1zk9l4ll3047fj0rngvjka2hkg2by26n2h3xm1iyvfiw5068y74y", - "depends": ["Biobase", "BiocGenerics", "BiocParallel", "IRanges", "jsonlite", "lattice", "MassSpecWavelet", "MetaboCoreUtils", "MsCoreUtils", "MsExperiment", "MsFeatures", "MSnbase", "mzR", "progress", "ProtGenerics", "RColorBrewer", "S4Vectors", "Spectra", "SummarizedExperiment"] + "depends": ["Biobase", "BiocGenerics", "BiocParallel", "IRanges", "MSnbase", "MassSpecWavelet", "MetaboCoreUtils", "MsCoreUtils", "MsExperiment", "MsFeatures", "ProtGenerics", "RColorBrewer", "S4Vectors", "Spectra", "SummarizedExperiment", "jsonlite", "lattice", "mzR", "progress"] }, "xcore": { "name": "xcore", "version": "1.8.0", "sha256": "04156svl1cjbhy51d7fbgdilp832wfifg37yr9civ829iyi79fha", - "depends": ["DelayedArray", "edgeR", "foreach", "GenomicRanges", "glmnet", "IRanges", "iterators", "magrittr", "Matrix", "MultiAssayExperiment", "S4Vectors"] + "depends": ["DelayedArray", "GenomicRanges", "IRanges", "Matrix", "MultiAssayExperiment", "S4Vectors", "edgeR", "foreach", "glmnet", "iterators", "magrittr"] }, "xmapbridge": { "name": "xmapbridge", @@ -13249,37 +13303,37 @@ "name": "yamss", "version": "1.30.0", "sha256": "0l9wqijwlq1gwybj2fy6jwgq6ja1mvx8yfdv174g5mjflx8nmc06", - "depends": ["BiocGenerics", "data_table", "EBImage", "IRanges", "limma", "Matrix", "mzR", "S4Vectors", "SummarizedExperiment"] + "depends": ["BiocGenerics", "EBImage", "IRanges", "Matrix", "S4Vectors", "SummarizedExperiment", "data_table", "limma", "mzR"] }, "yarn": { "name": "yarn", "version": "1.30.0", "sha256": "1r0dj65i8xg1yb6x7ggb3s40hvzbh596k2g9bxblsbl18z867ydp", - "depends": ["Biobase", "biomaRt", "downloader", "edgeR", "gplots", "limma", "matrixStats", "preprocessCore", "quantro", "RColorBrewer", "readr"] + "depends": ["Biobase", "RColorBrewer", "biomaRt", "downloader", "edgeR", "gplots", "limma", "matrixStats", "preprocessCore", "quantro", "readr"] }, "zFPKM": { "name": "zFPKM", "version": "1.26.0", "sha256": "1pgmw41xdq9gd2shc6kawgxz9sw1ydlgs0p35k99k2v50f86r2wy", - "depends": ["checkmate", "dplyr", "ggplot2", "SummarizedExperiment", "tidyr"] + "depends": ["SummarizedExperiment", "checkmate", "dplyr", "ggplot2", "tidyr"] }, "zellkonverter": { "name": "zellkonverter", - "version": "1.14.0", - "sha256": "13qkj9adv5is4fas667kxzc2zgni3ayl5hbimakq8y4mw6qj04dn", - "depends": ["basilisk", "cli", "DelayedArray", "Matrix", "reticulate", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"] + "version": "1.14.1", + "sha256": "1fyy3v1papg46cclk5fg8iqmg0671ccr82alvv41hk5d85ck04aq", + "depends": ["DelayedArray", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "basilisk", "cli", "reticulate"] }, "zenith": { "name": "zenith", "version": "1.6.0", "sha256": "14mj5flig4f0s3qgny26wj8l50d5f8bdp66gnh83wsqnln784x8m", - "depends": ["EnrichmentBrowser", "ggplot2", "GSEABase", "limma", "msigdbr", "progress", "Rdpack", "reshape2", "Rfast", "tidyr", "variancePartition"] + "depends": ["EnrichmentBrowser", "GSEABase", "Rdpack", "Rfast", "ggplot2", "limma", "msigdbr", "progress", "reshape2", "tidyr", "variancePartition"] }, "zinbwave": { "name": "zinbwave", "version": "1.26.0", "sha256": "07zlvzfs1c4gcj9hwgqbjhgbrffi301620chrf5lvzly4v7hafwi", - "depends": ["BiocParallel", "edgeR", "genefilter", "Matrix", "SingleCellExperiment", "softImpute", "SummarizedExperiment"] + "depends": ["BiocParallel", "Matrix", "SingleCellExperiment", "SummarizedExperiment", "edgeR", "genefilter", "softImpute"] }, "zlibbioc": { "name": "zlibbioc", @@ -13357,13 +13411,6 @@ "depends": ["DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment"], "broken": true }, - "BgeeCall": { - "name": "BgeeCall", - "version": "1.18.1", - "sha256": "1ipypkyfqx6mahiwl0gzdsi7z9j9cm5rgfw4ybgh6blfq8kg9qyk", - "depends": ["biomaRt", "Biostrings", "data_table", "dplyr", "GenomicFeatures", "jsonlite", "rhdf5", "rslurm", "rtracklayer", "sjmisc", "tximport"], - "broken": true - }, "BioMM": { "name": "BioMM", "version": "1.15.0", @@ -13469,13 +13516,6 @@ "depends": ["BiocGenerics", "Biostrings", "dplyr", "forcats", "generics", "glue", "Matrix", "progress", "purrr", "Rcpp", "reshape2", "rlang", "S4Vectors", "stringr", "tibble", "tidyr"], "broken": true }, - "Cepo": { - "name": "Cepo", - "version": "1.8.0", - "sha256": "0s1zra4msgbp37r5lp0zs9j2aq054rcmrmhwi3liwp4wkvjbshw8", - "depends": ["BiocParallel", "DelayedArray", "DelayedMatrixStats", "dplyr", "ggplot2", "GSEABase", "HDF5Array", "patchwork", "reshape2", "rlang", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"], - "broken": true - }, "ChIC": { "name": "ChIC", "version": "1.19.0", @@ -14085,13 +14125,6 @@ "depends": ["corpcor", "limma"], "broken": true }, - "SGCP": { - "name": "SGCP", - "version": "1.2.0", - "sha256": "1cc0brhw77b73nircb3n2ghbihdjmk7l11s8nmkvljydx6b52sja", - "depends": ["annotate", "caret", "DescTools", "dplyr", "expm", "genefilter", "ggplot2", "ggridges", "GO_db", "GOstats", "graph", "openxlsx", "org_Hs_eg_db", "plyr", "RColorBrewer", "reshape2", "Rgraphviz", "RSpectra", "SummarizedExperiment", "xtable"], - "broken": true - }, "SISPA": { "name": "SISPA", "version": "1.30.0", @@ -14113,13 +14146,6 @@ "depends": [], "broken": true }, - "SPONGE": { - "name": "SPONGE", - "version": "1.22.0", - "sha256": "1ayvigqj5j7s7031gpyhaz3m3z85w9j8j850pggshy9gixvy1mnp", - "depends": ["Biobase", "biomaRt", "caret", "ComplexHeatmap", "cvms", "data_table", "doRNG", "dplyr", "expm", "foreach", "ggplot2", "ggpubr", "ggridges", "glmnet", "gRbase", "igraph", "iterators", "logging", "MASS", "MetBrewer", "miRBaseConverter", "ppcor", "randomForest", "rlang", "stringr", "tidyr", "tidyverse", "tnet"], - "broken": true - }, "SQUADD": { "name": "SQUADD", "version": "1.52.0", @@ -14344,13 +14370,6 @@ "depends": ["Biobase", "BiocParallel", "cluster", "dplyr", "GenomicRanges", "gplots", "IRanges", "lazyeval", "magrittr", "matrixStats", "NMF", "rtracklayer", "S4Vectors", "tidyr"], "broken": true }, - "cliqueMS": { - "name": "cliqueMS", - "version": "1.16.0", - "sha256": "1829i6vqplqyvibb7x6ahb7xk0z2s8amivjldnvr17d7hpggmqma", - "depends": ["BH", "igraph", "matrixStats", "MSnbase", "Rcpp", "RcppArmadillo", "xcms"], - "broken": true - }, "clonotypeR": { "name": "clonotypeR", "version": "1.34.0", @@ -14673,13 +14692,6 @@ "depends": ["SummarizedExperiment"], "broken": true }, - "miRspongeR": { - "name": "miRspongeR", - "version": "2.4.0", - "sha256": "1mzh0cjm2sbcxw3wgfa6yg98ynl74x41g15vsf54n1m1ys5s7xk0", - "depends": ["clusterProfiler", "corpcor", "doParallel", "DOSE", "foreach", "igraph", "linkcomm", "MCL", "org_Hs_eg_db", "Rcpp", "ReactomePA", "SPONGE", "survival"], - "broken": true - }, "multiOmicsViz": { "name": "multiOmicsViz", "version": "1.24.0", @@ -14876,13 +14888,6 @@ "depends": ["ape", "caret", "data_tree", "dplyr", "e1071", "ggplot2", "kernlab", "pROC", "ROCR", "Seurat", "SingleCellExperiment", "SummarizedExperiment"], "broken": true }, - "scClassify": { - "name": "scClassify", - "version": "1.14.0", - "sha256": "1il45fr3fq520jg2hi1b729wg82vhr826x9bh6lli743sjl2rmbf", - "depends": ["BiocParallel", "Cepo", "cluster", "diptest", "ggplot2", "ggraph", "hopach", "igraph", "limma", "Matrix", "mgcv", "minpack_lm", "mixtools", "proxy", "proxyC", "S4Vectors", "statmod"], - "broken": true - }, "scMAGeCK": { "name": "scMAGeCK", "version": "1.9.1", @@ -14946,13 +14951,6 @@ "depends": ["affy", "affyio"], "broken": true }, - "tenXplore": { - "name": "tenXplore", - "version": "1.24.0", - "sha256": "1sk8xxvrmxkqlz7hq6w10hsjf1x8g06gbaas75hx4m0f1hz6pdwm", - "depends": ["AnnotationDbi", "matrixStats", "ontoProc", "org_Mm_eg_db", "restfulSE", "shiny", "SummarizedExperiment"], - "broken": true - }, "tofsims": { "name": "tofsims", "version": "1.22.0", diff --git a/pkgs/development/r-modules/cran-packages.json b/pkgs/development/r-modules/cran-packages.json index 61021575dbca9..5026cbfc196a0 100644 --- a/pkgs/development/r-modules/cran-packages.json +++ b/pkgs/development/r-modules/cran-packages.json @@ -9,8 +9,8 @@ }, "AATtools": { "name": "AATtools", - "version": "0.0.2", - "sha256": "10adwxyqnbjw2a0pxrp4qbs68fn2bdxwcbaqmvx5xfgrj4skl68z", + "version": "0.0.3", + "sha256": "0sn8sc25syvni45w99h76z0als91a9cc4jg3visp81dqw1z4mml9", "depends": ["doParallel", "dplyr", "foreach", "magrittr"] }, "ABACUS": { @@ -77,7 +77,7 @@ "name": "ACDm", "version": "1.0.4.3", "sha256": "0g89827az5mnllp6l71znbvwxzygb8nvnmsv6x052w2ajhd16v7v", - "depends": ["dplyr", "ggplot2", "plyr", "Rsolnp", "zoo"] + "depends": ["Rsolnp", "dplyr", "ggplot2", "plyr", "zoo"] }, "ACE_CoCo": { "name": "ACE.CoCo", @@ -113,7 +113,13 @@ "name": "ACNE", "version": "0.9.1", "sha256": "12i1b5bbdn4wz80p8v6xygap7pkgdvidxmsd927ks7qf1yvaq93k", - "depends": ["aroma_affymetrix", "aroma_core", "MASS", "matrixStats", "R_filesets", "R_methodsS3", "R_oo", "R_utils"] + "depends": ["MASS", "R_filesets", "R_methodsS3", "R_oo", "R_utils", "aroma_affymetrix", "aroma_core", "matrixStats"] + }, + "ACSSpack": { + "name": "ACSSpack", + "version": "0.0.1.4", + "sha256": "18xj0svysm9qm6dyhx7ib2krwcfds8i3rrcd03ph3kz597vf41zi", + "depends": ["HDCI", "MASS", "Rcpp", "RcppArmadillo", "extraDistr"] }, "ACSWR": { "name": "ACSWR", @@ -131,7 +137,7 @@ "name": "ACV", "version": "1.0.2", "sha256": "078n1if2rkbdhivrzp3lsq35a8awrf5y3s7fi3f5l21a9dmrk4d1", - "depends": ["forecast", "Matrix"] + "depends": ["Matrix", "forecast"] }, "ACWR": { "name": "ACWR", @@ -155,7 +161,7 @@ "name": "ADDT", "version": "2.0", "sha256": "044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp", - "depends": ["coneproj", "Matrix", "nlme"] + "depends": ["Matrix", "coneproj", "nlme"] }, "ADER": { "name": "ADER", @@ -179,13 +185,13 @@ "name": "ADMM", "version": "0.3.3", "sha256": "04biinzr0x3jkwss00q6zxfnzk62dafc6386z5vfqs4ch0ifh60n", - "depends": ["doParallel", "foreach", "Matrix", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "Rdpack", "doParallel", "foreach"] }, "ADMMsigma": { "name": "ADMMsigma", "version": "2.1", "sha256": "1943dza086s22pr0yz41wzn9cdg11x7fl9zr3w012865yj219m7l", - "depends": ["doParallel", "dplyr", "foreach", "ggplot2", "Rcpp", "RcppArmadillo", "RcppProgress"] + "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "doParallel", "dplyr", "foreach", "ggplot2"] }, "ADMUR": { "name": "ADMUR", @@ -239,7 +245,7 @@ "name": "AER", "version": "1.2-12", "sha256": "11pas7lglcw1h5649bgab13g8xlnx109pc2aqphwc3fdgvqv1ism", - "depends": ["car", "Formula", "lmtest", "sandwich", "survival", "zoo"] + "depends": ["Formula", "car", "lmtest", "sandwich", "survival", "zoo"] }, "AEenrich": { "name": "AEenrich", @@ -299,7 +305,7 @@ "name": "AHM", "version": "1.0.1", "sha256": "00r1rn7d64a18rckbxvla5yapqv00p9ajxv72fx7s6p80kfal89w", - "depends": ["devtools", "dplyr", "glmnet", "Matrix", "mixexp", "plgp", "quadprog", "tibble", "tidyr"] + "depends": ["Matrix", "devtools", "dplyr", "glmnet", "mixexp", "plgp", "quadprog", "tibble", "tidyr"] }, "AHMbook": { "name": "AHMbook", @@ -327,8 +333,8 @@ }, "AHPtools": { "name": "AHPtools", - "version": "0.2.1", - "sha256": "1bmk7mcg3ma0d4a3gy5s3zkkw49nfbg6rh5ji9qvi99rj6ksfcry", + "version": "0.3.0", + "sha256": "053lk31xsv4hipah0px5xpxyd0s798pq08qpcynygkf84hjja2x0", "depends": [] }, "AHSurv": { @@ -347,25 +353,25 @@ "name": "AICcmodavg", "version": "2.3-3", "sha256": "0ylzd6fz5p86fdb8yily2v8bn8xz5mm6w19ch6gpp48jzkqvama0", - "depends": ["lattice", "MASS", "Matrix", "nlme", "survival", "unmarked", "VGAM", "xtable"] + "depends": ["MASS", "Matrix", "VGAM", "lattice", "nlme", "survival", "unmarked", "xtable"] }, "AID": { "name": "AID", "version": "2.9", "sha256": "0s7020vh93rnyhcfsmsn1swffrbg1fx3pqq2bd043m4b90yrlzpc", - "depends": ["ggplot2", "MASS", "meta", "nortest", "psych", "stringr", "tseries"] + "depends": ["MASS", "ggplot2", "meta", "nortest", "psych", "stringr", "tseries"] }, "AIPW": { "name": "AIPW", "version": "0.6.3.2", "sha256": "1iqq665qigw9dmc62x2dz1nvrk8s65ph0a3k2p7mkznr9frshhi2", - "depends": ["future_apply", "ggplot2", "progressr", "R6", "Rsolnp", "SuperLearner"] + "depends": ["R6", "Rsolnp", "SuperLearner", "future_apply", "ggplot2", "progressr"] }, "AIUQ": { "name": "AIUQ", - "version": "0.5.2", - "sha256": "00abxp3sd5ri4rny38q0125i8bb71hv5riicd7m8n9hz9hgww12j", - "depends": ["fftwtools", "plot3D", "SuperGauss"] + "version": "0.5.3", + "sha256": "0bbqckp0s9f9ljp0b8z65pzfh3hhfp910ca7hsivwi9j7vr61jaz", + "depends": ["SuperGauss", "fftwtools", "plot3D"] }, "ALDqr": { "name": "ALDqr", @@ -449,7 +455,7 @@ "name": "AMPLE", "version": "1.0.2", "sha256": "019r60rcx3biyicmyc4i1806d31i2hp107ba2l0mgh08fx3lfwhj", - "depends": ["ggplot2", "markdown", "R6", "RColorBrewer", "scales", "shiny", "shinyjs", "shinyscreenshot"] + "depends": ["R6", "RColorBrewer", "ggplot2", "markdown", "scales", "shiny", "shinyjs", "shinyscreenshot"] }, "AMR": { "name": "AMR", @@ -461,25 +467,25 @@ "name": "ANN2", "version": "2.3.4", "sha256": "1izljhz3rkzq05dkvg9q3fdyj7q871j8lsky67d5r8ffpzm1lk3z", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "reshape2", "testthat", "viridisLite"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "reshape2", "testthat", "viridisLite"] }, "ANOFA": { "name": "ANOFA", "version": "0.1.3", "sha256": "1ywcn4sq626dc3bb7r3pwddw5064cli4kmx8a9qp2dnxv9i6igjv", - "depends": ["ggplot2", "Rdpack", "rrapply", "superb"] + "depends": ["Rdpack", "ggplot2", "rrapply", "superb"] }, "ANOM": { "name": "ANOM", "version": "0.5", "sha256": "14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz", - "depends": ["ggplot2", "MCPAN", "multcomp", "nparcomp", "SimComp"] + "depends": ["MCPAN", "SimComp", "ggplot2", "multcomp", "nparcomp"] }, "ANOPA": { "name": "ANOPA", "version": "0.1.3", "sha256": "1i6flm4rwl0d0wmw001pwq45jysxb2d2bld25r10gjk3xlfrbr7i", - "depends": ["ggplot2", "plyr", "Rdpack", "rrapply", "scales", "superb"] + "depends": ["Rdpack", "ggplot2", "plyr", "rrapply", "scales", "superb"] }, "ANOVAIREVA": { "name": "ANOVAIREVA", @@ -491,13 +497,13 @@ "name": "ANOVAShiny", "version": "0.1.0", "sha256": "1z8wi8c8j3rlchfk1vx101qz1r9j2jl5lfh72y5lqsisqxl2fyyz", - "depends": ["DescTools", "dplyr", "HH", "rhandsontable", "rmarkdown", "shiny"] + "depends": ["DescTools", "HH", "dplyr", "rhandsontable", "rmarkdown", "shiny"] }, "ANOVAShiny2": { "name": "ANOVAShiny2", "version": "0.1.0", "sha256": "0bnxfg5c37wi5g53jd0zqq31yx29zvlk2m2jh6jlwki8khpp9y00", - "depends": ["DescTools", "dplyr", "HH", "rhandsontable", "rmarkdown", "shiny"] + "depends": ["DescTools", "HH", "dplyr", "rhandsontable", "rmarkdown", "shiny"] }, "ANSM5": { "name": "ANSM5", @@ -519,8 +525,8 @@ }, "APCalign": { "name": "APCalign", - "version": "1.0.1", - "sha256": "0v1m3m6r85yip449pcbn7vk3c4zm0y3w4lf9rwqv3cis8gd9xfap", + "version": "1.0.2", + "sha256": "1zd50bhq0amrpk53r2hgfzawb2fqinck02vnfglnwgdbkddx6vn3", "depends": ["arrow", "crayon", "curl", "dplyr", "httr", "jsonlite", "purrr", "readr", "rlang", "stringdist", "stringi", "stringr"] }, "APCanalysis": { @@ -545,7 +551,7 @@ "name": "APIS", "version": "2.0.4", "sha256": "02s7cpzsp53wk3k4cm6l3hpkc3f191zhg22vwbf8va7dni3d24rq", - "depends": ["cowplot", "data_table", "doParallel", "dplyr", "DT", "foreach", "ggplot2", "gridExtra", "htmltools", "plotly", "rlang", "shiny", "shinyBS", "shinythemes"] + "depends": ["DT", "cowplot", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "gridExtra", "htmltools", "plotly", "rlang", "shiny", "shinyBS", "shinythemes"] }, "APPEstimation": { "name": "APPEstimation", @@ -557,7 +563,7 @@ "name": "APackOfTheClones", "version": "1.2.0", "sha256": "1wirzf37n5xl0y3g9n9ic6vyaiyzmx9sip1qg4bilaqn7nazmq90", - "depends": ["dplyr", "ggforce", "ggplot2", "hash", "lifecycle", "magrittr", "Rcpp", "rlang", "Seurat", "SeuratObject"] + "depends": ["Rcpp", "Seurat", "SeuratObject", "dplyr", "ggforce", "ggplot2", "hash", "lifecycle", "magrittr", "rlang"] }, "APtools": { "name": "APtools", @@ -585,8 +591,8 @@ }, "AQuality": { "name": "AQuality", - "version": "1.0", - "sha256": "0zjv5wwdr4ivm1nx1yw27n1fxajxv9mdljd5jj95bv2wpvkn0pcz", + "version": "1.1", + "sha256": "17sd90va6wp6vyg1bjriyv0zkn1hqnrwkm2w92yc0n2kbdffq74l", "depends": [] }, "AR": { @@ -599,19 +605,13 @@ "name": "ARCensReg", "version": "3.0.1", "sha256": "0qrzxa93cj1ql4iw93ksk58ycfgmncry7q29axhydwh9hsh3lyms", - "depends": ["ggplot2", "gridExtra", "matrixcalc", "msm", "mvtnorm", "numDeriv", "qqplotr", "Rcpp", "RcppArmadillo", "Rdpack", "tmvtnorm"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "ggplot2", "gridExtra", "matrixcalc", "msm", "mvtnorm", "numDeriv", "qqplotr", "tmvtnorm"] }, "ARCokrig": { "name": "ARCokrig", "version": "0.1.2", "sha256": "0pk0y0gsw681py0vwizxvh1jqjnapzqfr0mbdpli1sray55xbjr2", - "depends": ["ggplot2", "mvtnorm", "Rcpp", "RcppArmadillo", "RcppEigen"] - }, - "ARDECO": { - "name": "ARDECO", - "version": "1.0.1", - "sha256": "1m249r65kh18v57wlhg9fv26fla5sbxqfqm725f95677ck852jf2", - "depends": ["dplyr", "ghql", "httr", "jsonlite", "rjstat", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "ggplot2", "mvtnorm"] }, "ARDL": { "name": "ARDL", @@ -623,7 +623,7 @@ "name": "ARGOS", "version": "0.1.1", "sha256": "0qjngax72mz4zhqlb7s8zzl0n3524crp67vmz3mpy2s5hdl3kz83", - "depends": ["boot", "deSolve", "glmnet", "magrittr", "Matrix", "Metrics", "signal", "tidyr", "tidyverse"] + "depends": ["Matrix", "Metrics", "boot", "deSolve", "glmnet", "magrittr", "signal", "tidyr", "tidyverse"] }, "ARHT": { "name": "ARHT", @@ -641,7 +641,7 @@ "name": "ARIbrain", "version": "0.2", "sha256": "18c7yxkrnqh18gcfzvdc5wqig6ywdmjcy8rlz0fdj3b8fb84dfpr", - "depends": ["hommel", "plyr", "RNifti"] + "depends": ["RNifti", "hommel", "plyr"] }, "ARMALSTM": { "name": "ARMALSTM", @@ -649,12 +649,6 @@ "sha256": "0qb0ll79n7j2zcgb0ng5mqzlcil6rg5mfpyygk8rkvqf05l8fxkl", "depends": ["keras", "reticulate", "rugarch", "tensorflow", "tseries"] }, - "AROC": { - "name": "AROC", - "version": "1.0-4", - "sha256": "0wwv63mlh8pl5pzaih57l2qy70fz2wpfyxns1lyp95sxhq7ddwza", - "depends": ["Hmisc", "MASS", "Matrix", "moments", "nor1mix", "np", "spatstat_geom"] - }, "ARPALData": { "name": "ARPALData", "version": "1.5.2", @@ -695,7 +689,7 @@ "name": "ARpLMEC", "version": "2.4.1", "sha256": "1d6gvgbnj19dislzjlxn7i0iq7h56zz7hm9x5l865ji790b9smqw", - "depends": ["expm", "LaplacesDemon", "MASS", "mnormt", "numDeriv", "relliptical", "TruncatedNormal"] + "depends": ["LaplacesDemon", "MASS", "TruncatedNormal", "expm", "mnormt", "numDeriv", "relliptical"] }, "ASGS_foyer": { "name": "ASGS.foyer", @@ -707,13 +701,19 @@ "name": "ASMap", "version": "1.0-7", "sha256": "04byjdz3dzgf06bmmpvslihya23lanl8dmjbq22vvwlhi82f88im", - "depends": ["fields", "gtools", "lattice", "qtl", "RColorBrewer"] + "depends": ["RColorBrewer", "fields", "gtools", "lattice", "qtl"] + }, + "ASMbook": { + "name": "ASMbook", + "version": "1.0.2", + "sha256": "18nprjb54kr5yvpfnmji8p5a9ggc33h5wkgvni567rdsnq7jv0d7", + "depends": ["MASS", "TMB", "coda", "lattice"] }, "ASRgenomics": { "name": "ASRgenomics", "version": "1.1.4", "sha256": "1k6qyp5ac8q3z7ifbqv2kkryh27ii0zbfmlcjl6i3y7s1mfyigg8", - "depends": ["AGHmatrix", "cowplot", "crayon", "data_table", "ellipse", "factoextra", "ggplot2", "Matrix", "scattermore", "superheat"] + "depends": ["AGHmatrix", "Matrix", "cowplot", "crayon", "data_table", "ellipse", "factoextra", "ggplot2", "scattermore", "superheat"] }, "ASSA": { "name": "ASSA", @@ -725,7 +725,7 @@ "name": "ASSISTant", "version": "1.4.3", "sha256": "0apaj4lfkbg08xrw8mknf50s1vyd4j5mbwciwgblq7ydh3pyjxaj", - "depends": ["dplyr", "knitr", "magrittr", "mvtnorm", "R6"] + "depends": ["R6", "dplyr", "knitr", "magrittr", "mvtnorm"] }, "AST": { "name": "AST", @@ -737,19 +737,25 @@ "name": "ASV", "version": "1.1.4", "sha256": "15k6gls2bcwnvpkqyz6jnhzk96rcnjdnxv63kh7zzp2qbidh27hb", - "depends": ["freqdom", "Rcpp", "RcppArmadillo", "RcppProgress"] + "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "freqdom"] }, "ATAforecasting": { "name": "ATAforecasting", "version": "0.0.60", "sha256": "0q21dg4p9xw28r3q0ayf2bvwwyccilw93849x4c7k82xpyfnwvpb", - "depends": ["forecast", "Rcpp", "RcppArmadillo", "Rdpack", "seasonal", "stlplus", "stR", "timeSeries", "TSA", "tseries", "xts"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "TSA", "forecast", "seasonal", "stR", "stlplus", "timeSeries", "tseries", "xts"] }, "ATNr": { "name": "ATNr", "version": "1.1.0", "sha256": "1wlzw5565hprlphjp3jrgyhmgqdbrzwka4m1ac7rhxdgljdfh2j5", - "depends": ["deSolve", "R_rsp", "Rcpp", "RcppArmadillo"] + "depends": ["R_rsp", "Rcpp", "RcppArmadillo", "deSolve"] + }, + "ATQ": { + "name": "ATQ", + "version": "0.2.3", + "sha256": "1hj1phyr8mr7xfbaizmsfh5j36paa6xlyg83v4vryplikba617gm", + "depends": ["dplyr", "ggplot2", "gridExtra", "purrr", "rlang", "scales", "zoo"] }, "ATR": { "name": "ATR", @@ -779,7 +785,7 @@ "name": "AVGAS", "version": "0.1.0", "sha256": "0s0h6rpsni73a0j679g22ngpaazdfifxpi7mwpa7ac3p0kdzvji0", - "depends": ["dplyr", "ggplot2", "Matrix", "pracma", "selectiveInference", "VariableScreening"] + "depends": ["Matrix", "VariableScreening", "dplyr", "ggplot2", "pracma", "selectiveInference"] }, "AWR": { "name": "AWR", @@ -797,7 +803,7 @@ "name": "AZIAD", "version": "0.0.3", "sha256": "0nzd3y4kcb628f1h0xpslx2nva8pv6i3mmp9vm5c49xiq43d82cz", - "depends": ["corpcor", "doParallel", "EnvStats", "extraDistr", "foreach", "QRM"] + "depends": ["EnvStats", "QRM", "corpcor", "doParallel", "extraDistr", "foreach"] }, "AalenJohansen": { "name": "AalenJohansen", @@ -827,7 +833,7 @@ "name": "AcceptReject", "version": "0.1.2", "sha256": "137qlqkazh665d7wvxkhxfz2a5ss3hy4acbc6jzbk7vq4qpbcj0i", - "depends": ["assertthat", "cli", "ggplot2", "glue", "numDeriv", "purrr", "Rcpp", "RcppArmadillo", "rlang", "scales", "scattermore"] + "depends": ["Rcpp", "RcppArmadillo", "assertthat", "cli", "ggplot2", "glue", "numDeriv", "purrr", "rlang", "scales", "scattermore"] }, "AcceptanceSampling": { "name": "AcceptanceSampling", @@ -839,7 +845,7 @@ "name": "Achilles", "version": "1.7.2", "sha256": "1xkhplw7jpz7y86nac2z5vk2xs898kfv6apmk3rahjr0rmdijdqg", - "depends": ["data_table", "DatabaseConnector", "dplyr", "jsonlite", "lubridate", "ParallelLogger", "readr", "rlang", "SqlRender", "tseries"] + "depends": ["DatabaseConnector", "ParallelLogger", "SqlRender", "data_table", "dplyr", "jsonlite", "lubridate", "readr", "rlang", "tseries"] }, "AcousticNDLCodeR": { "name": "AcousticNDLCodeR", @@ -865,6 +871,12 @@ "sha256": "08r3gwjz4fkyy85dxqix0ffm5xyq45032qv3snnzxnlqxslxbqn1", "depends": ["accelerometry", "dplyr", "ineq", "survival", "tidyr"] }, + "ActiSleep": { + "name": "ActiSleep", + "version": "0.2.2", + "sha256": "0byms52rk9snsr6z400qidbvpnfxxn0idv1hr9k3whbadr3nxyxi", + "depends": ["DBI", "RSQLite", "accelerometry", "dplyr", "lazyeval", "lubridate", "stringr", "tibble"] + }, "ActiveDriver": { "name": "ActiveDriver", "version": "1.0.0", @@ -873,15 +885,15 @@ }, "ActivePathways": { "name": "ActivePathways", - "version": "2.0.3", - "sha256": "0mgvxpqaq0jncr1kzmwhqkv3pajx2fz6vwhv5arw7fgla6w09p9h", + "version": "2.0.5", + "sha256": "098p21g7rm3q03wifg0zb71ldg3dyqp3iwhqmg3ci9r73dl4agjh", "depends": ["data_table", "ggplot2"] }, "ActivityIndex": { "name": "ActivityIndex", "version": "0.3.7", "sha256": "1zj2b6x31a1kxl80rarmkrlm7ack4154mrkbqs3fpi48zpmjbgd5", - "depends": ["data_table", "matrixStats", "R_utils"] + "depends": ["R_utils", "data_table", "matrixStats"] }, "ActuarialM": { "name": "ActuarialM", @@ -895,6 +907,12 @@ "sha256": "0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l", "depends": ["fftwtools", "imager", "plotrix"] }, + "AdIsMF": { + "name": "AdIsMF", + "version": "0.1.0", + "sha256": "1ddwnn6jmj0sm1b9mxdaa88rngn4vfw59malqqg5whq0hnl4mhwx", + "depends": ["AICcmodavg", "ggplot2", "nls2"] + }, "AdMit": { "name": "AdMit", "version": "2.1.9", @@ -905,7 +923,7 @@ "name": "AdaSampling", "version": "1.3", "sha256": "1c8dh8lxyb076317n4qk2g3qv5j4mc1dszbh3k1p2b0nxiprqk5i", - "depends": ["caret", "class", "e1071", "MASS"] + "depends": ["MASS", "caret", "class", "e1071"] }, "AdapSamp": { "name": "AdapSamp", @@ -917,7 +935,7 @@ "name": "AdaptGauss", "version": "1.6", "sha256": "04w0v2fv9ixfz148d8f5vv7w5ypdywwf1qysk2ypc7a7md4vv9qz", - "depends": ["DataVisualizations", "plotly", "pracma", "Rcpp", "shiny"] + "depends": ["DataVisualizations", "Rcpp", "plotly", "pracma", "shiny"] }, "AdequacyModel": { "name": "AdequacyModel", @@ -935,7 +953,7 @@ "name": "AdhereRViz", "version": "0.2.1", "sha256": "1jc5mfdydw9s515zi7lsmns79919vrdhh6lvh9z2bq0lrn9g1yci", - "depends": ["AdhereR", "clipr", "colourpicker", "data_table", "DBI", "highlight", "knitr", "manipulate", "RMariaDB", "RSQLite", "shiny", "shinyjs", "shinyWidgets", "V8", "viridisLite"] + "depends": ["AdhereR", "DBI", "RMariaDB", "RSQLite", "V8", "clipr", "colourpicker", "data_table", "highlight", "knitr", "manipulate", "shiny", "shinyWidgets", "shinyjs", "viridisLite"] }, "AdvBinomApps": { "name": "AdvBinomApps", @@ -971,7 +989,7 @@ "name": "AggregateR", "version": "0.1.1", "sha256": "1s2q888bqx6ilisv5s4g8ryja97nz6cz4ycm4sw1i63l5wjrwljc", - "depends": ["data_table", "NCmisc", "tibble"] + "depends": ["NCmisc", "data_table", "tibble"] }, "AgreementInterval": { "name": "AgreementInterval", @@ -983,7 +1001,7 @@ "name": "AgroR", "version": "1.3.6", "sha256": "0gbdba18fzk3x32wk1ycbj2ci8y1dpdmcysnmdd2361mp5yhvn7h", - "depends": ["cowplot", "crayon", "drc", "dunn_test", "emmeans", "ggplot2", "ggrepel", "gridExtra", "gtools", "knitr", "lme4", "lmtest", "MASS", "multcomp", "multcompView", "nortest", "RColorBrewer"] + "depends": ["MASS", "RColorBrewer", "cowplot", "crayon", "drc", "dunn_test", "emmeans", "ggplot2", "ggrepel", "gridExtra", "gtools", "knitr", "lme4", "lmtest", "multcomp", "multcompView", "nortest"] }, "AgroReg": { "name": "AgroReg", @@ -1007,7 +1025,7 @@ "name": "AirMonitor", "version": "0.4.0", "sha256": "1lxdnplv06g5j5lwiydgx3yimrpkm85i88cxq7yrpv2gcffalj4p", - "depends": ["dplyr", "dygraphs", "leaflet", "lubridate", "magrittr", "MazamaCoreUtils", "MazamaRollUtils", "MazamaTimeSeries", "readr", "rlang", "stringr", "tidyselect", "xts"] + "depends": ["MazamaCoreUtils", "MazamaRollUtils", "MazamaTimeSeries", "dplyr", "dygraphs", "leaflet", "lubridate", "magrittr", "readr", "rlang", "stringr", "tidyselect", "xts"] }, "Ake": { "name": "Ake", @@ -1043,13 +1061,13 @@ "name": "AlleleShift", "version": "1.1-2", "sha256": "1lv7ap40bc6l1wp68lbxyavl9dky1mz09zbdjg9kyf1b9ca5siqx", - "depends": ["adegenet", "BiodiversityR", "vegan"] + "depends": ["BiodiversityR", "adegenet", "vegan"] }, "AllelicSeries": { "name": "AllelicSeries", "version": "0.0.4.1", "sha256": "1i9p2hzi61mvl5gxcs7rlavcl70pvjscnqjlxms35n4ziq3hzrk0", - "depends": ["Rcpp", "RcppArmadillo", "RNOmni", "SKAT"] + "depends": ["RNOmni", "Rcpp", "RcppArmadillo", "SKAT"] }, "Allspice": { "name": "Allspice", @@ -1061,12 +1079,12 @@ "name": "AlphaPart", "version": "0.9.8", "sha256": "1ih76v3kgnladqq3nvlqrz5sqkg1j97m778kchz6k05cjxhj8l4q", - "depends": ["directlabels", "dplyr", "ggplot2", "magrittr", "pedigree", "Rcpp", "reshape", "tibble"] + "depends": ["Rcpp", "directlabels", "dplyr", "ggplot2", "magrittr", "pedigree", "reshape", "tibble"] }, "AlphaSimR": { "name": "AlphaSimR", - "version": "1.5.3", - "sha256": "1qv3bfn4xnpkiblzdig1zn3cli5g1h2binnsi4znxzd6z1406sq9", + "version": "1.6.0", + "sha256": "02cz2kppvw9ccx99r0i5afhqcprv1qsdbjq14r9v6b3pcpvsdvia", "depends": ["BH", "R6", "Rcpp", "RcppArmadillo", "Rdpack"] }, "AlteredPQR": { @@ -1079,7 +1097,7 @@ "name": "Amelia", "version": "1.8.2", "sha256": "0gpw6aki06ji6yszp7n9mfy8zbxvdwv1xwjlx11aj2x2ghj4mcjg", - "depends": ["foreign", "Rcpp", "RcppArmadillo", "rlang"] + "depends": ["Rcpp", "RcppArmadillo", "foreign", "rlang"] }, "AmesHousing": { "name": "AmesHousing", @@ -1127,25 +1145,25 @@ "name": "AnaCoDa", "version": "0.1.4.4", "sha256": "1b03bxysvw9v4j3bzsmrjf5ci06v6s83ix89qxy73ba5akf2gb7h", - "depends": ["mvtnorm", "Rcpp", "VGAM"] + "depends": ["Rcpp", "VGAM", "mvtnorm"] }, "Anaconda": { "name": "Anaconda", "version": "0.1.5", "sha256": "02ars06pmg0f0biy022yz2xf0sdmww9ff9zcpl74gah3sickq9ci", - "depends": ["ape", "data_table", "DESeq2", "ggplot2", "ggrepel", "lookup", "pheatmap", "plyr", "rafalib", "RColorBrewer"] + "depends": ["DESeq2", "RColorBrewer", "ape", "data_table", "ggplot2", "ggrepel", "lookup", "pheatmap", "plyr", "rafalib"] }, "AnalysisLin": { "name": "AnalysisLin", "version": "0.1.2", "sha256": "1mf77l74lfjlr856w48spjnn7pvjf9zygy1xcaj3fmi335h77j2x", - "depends": ["caret", "DT", "ggplot2", "Hmisc", "htmltools", "magrittr", "plotly", "RANN"] + "depends": ["DT", "Hmisc", "RANN", "caret", "ggplot2", "htmltools", "magrittr", "plotly"] }, "AnanseSeurat": { "name": "AnanseSeurat", "version": "1.2.0", "sha256": "12r6bxh0cvh94nb91lzdj7sa7na1ljc5gdmdfx6dwilhpdafn0a3", - "depends": ["dplyr", "ggplot2", "ggpubr", "magrittr", "patchwork", "png", "purrr", "rlang", "Seurat", "stringr"] + "depends": ["Seurat", "dplyr", "ggplot2", "ggpubr", "magrittr", "patchwork", "png", "purrr", "rlang", "stringr"] }, "AncestryMapper": { "name": "AncestryMapper", @@ -1163,7 +1181,7 @@ "name": "Andromeda", "version": "0.6.6", "sha256": "0k7w9jk9aw6pays5lg1spzac5kpka0i9vc2v5sxn2r4shbxr9yf9", - "depends": ["cli", "DBI", "dbplyr", "dplyr", "hms", "pillar", "rlang", "RSQLite", "tidyselect", "zip"] + "depends": ["DBI", "RSQLite", "cli", "dbplyr", "dplyr", "hms", "pillar", "rlang", "tidyselect", "zip"] }, "AnglerCreelSurveySimulation": { "name": "AnglerCreelSurveySimulation", @@ -1181,7 +1199,7 @@ "name": "AnnoProbe", "version": "0.1.7", "sha256": "0715bpifj8r4ji0m89wk4x7vd3pwx8kqy9vs8m0ivmq7bb56nx0b", - "depends": ["Biobase", "curl", "DT", "ggplot2", "ggpubr", "httr", "pheatmap", "xml2"] + "depends": ["Biobase", "DT", "curl", "ggplot2", "ggpubr", "httr", "pheatmap", "xml2"] }, "AnnotationBustR": { "name": "AnnotationBustR", @@ -1193,31 +1211,31 @@ "name": "AnnuityRIR", "version": "1.0-0", "sha256": "0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9", - "depends": ["actuar", "EnvStats", "fitdistrplus", "mc2d", "tseries"] + "depends": ["EnvStats", "actuar", "fitdistrplus", "mc2d", "tseries"] }, "AntAngioCOOL": { "name": "AntAngioCOOL", "version": "1.2", "sha256": "1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2", - "depends": ["caret", "rJava", "rpart", "RWeka"] + "depends": ["RWeka", "caret", "rJava", "rpart"] }, "AntMAN": { "name": "AntMAN", "version": "1.1.0", "sha256": "118jhjjfnp23kbkir66rdvlzsvms316zwr2r5msrjrb3nd8lz5va", - "depends": ["bayesplot", "GGally", "mcclust", "mvtnorm", "Rcpp", "RcppArmadillo", "Rdpack", "salso"] + "depends": ["GGally", "Rcpp", "RcppArmadillo", "Rdpack", "bayesplot", "mcclust", "mvtnorm", "salso"] }, "AnthropMMD": { "name": "AnthropMMD", "version": "4.0.3", "sha256": "03mvlw54a9xz7ggjbfi9yddzq1wv4skjvbv3r4bdrldpbd6scm0b", - "depends": ["dplyr", "MASS", "plotrix", "rlang", "scatterplot3d", "shiny", "smacof"] + "depends": ["MASS", "dplyr", "plotrix", "rlang", "scatterplot3d", "shiny", "smacof"] }, "Anthropometry": { "name": "Anthropometry", "version": "1.19", "sha256": "0aj70wm37bd5i4gzajvs6lf3zg0bz3kkf4srrcslg6drqk6n5z5l", - "depends": ["archetypes", "biclust", "cluster", "ddalpha", "FNN", "ICGE", "nnls", "rgl", "shapes"] + "depends": ["FNN", "ICGE", "archetypes", "biclust", "cluster", "ddalpha", "nnls", "rgl", "shapes"] }, "AntibodyTiters": { "name": "AntibodyTiters", @@ -1235,13 +1253,13 @@ "name": "Aoptbdtvc", "version": "0.0.3", "sha256": "19prbak6ssmzqaa88mw0h0bdsj8s6hvcsgrmlgq4h6iyp959yj73", - "depends": ["lpSolve", "MASS"] + "depends": ["MASS", "lpSolve"] }, "AovBay": { "name": "AovBay", "version": "0.1.0", "sha256": "110y9wbqr0m9b6wr1c5mncrdjpg247308989bswkqnim2msvnzcf", - "depends": ["BayesFactor", "BH", "broom", "car", "dplyr", "DT", "highcharter", "htmltools", "moments", "nortest", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "reshape", "rstan", "rstantools", "shiny", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "StanHeaders", "stringr", "tibble", "waiter"] + "depends": ["BH", "BayesFactor", "DT", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "broom", "car", "dplyr", "highcharter", "htmltools", "moments", "nortest", "purrr", "reshape", "rstan", "rstantools", "shiny", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "stringr", "tibble", "waiter"] }, "ApacheLogProcessor": { "name": "ApacheLogProcessor", @@ -1251,21 +1269,21 @@ }, "Apoderoides": { "name": "Apoderoides", - "version": "2.0.0", - "sha256": "0rgba2855gnavq4c8ik6vq0fh4m9wqyp0wgxjw7rdw1jsvi7dyqs", - "depends": ["ape", "Rcpp", "RcppProgress"] + "version": "3.0.0", + "sha256": "1hlcps0zf9ymcrfac7jhrnqzd0qihxfw363qj8zmjj3q6aa3v2k9", + "depends": ["Rcpp", "RcppProgress", "ape"] }, "Apollonius": { "name": "Apollonius", "version": "1.0.1", "sha256": "13iz0j2kc3jzzn77jawrm0fg23mqkxh7h7dasfjibmykamvw45nb", - "depends": ["abind", "BH", "colorsGen", "gyro", "plotrix", "Polychrome", "Rcpp", "RcppCGAL", "RcppEigen"] + "depends": ["BH", "Polychrome", "Rcpp", "RcppCGAL", "RcppEigen", "abind", "colorsGen", "gyro", "plotrix"] }, "AppliedPredictiveModeling": { "name": "AppliedPredictiveModeling", "version": "1.1-7", "sha256": "1wi0sw5w1c51rmh9z98wdpk5rgzsylkkb6g019djiwxvj92l99hh", - "depends": ["CORElearn", "ellipse", "lattice", "MASS", "plyr", "reshape2"] + "depends": ["CORElearn", "MASS", "ellipse", "lattice", "plyr", "reshape2"] }, "AquaBEHER": { "name": "AquaBEHER", @@ -1283,7 +1301,7 @@ "name": "AquaticLifeHistory", "version": "1.0.5", "sha256": "0h6q0ajw2k2f1p0k8j6772p7i78a13amwxzj4ffrykqgwi3pr22v", - "depends": ["broom", "dplyr", "ggplot2", "magrittr", "MASS", "minpack_lm", "MuMIn", "plyr", "readr", "rlist", "tidyr"] + "depends": ["MASS", "MuMIn", "broom", "dplyr", "ggplot2", "magrittr", "minpack_lm", "plyr", "readr", "rlist", "tidyr"] }, "ArArRedux": { "name": "ArArRedux", @@ -1295,7 +1313,7 @@ "name": "ArCo", "version": "0.3-1", "sha256": "1afjdmcalx3m19jlvqs83fg5qlds59l5zzg3pzk13qk31r0hz7mk", - "depends": ["boot", "glmnet", "Matrix"] + "depends": ["Matrix", "boot", "glmnet"] }, "ArDec": { "name": "ArDec", @@ -1319,13 +1337,13 @@ "name": "AriGaMyANNSVR", "version": "0.1.0", "sha256": "1faqripvb6alfajz37zqm70p0c2f6yf9f2ca2bzrsizp0yh81719", - "depends": ["AllMetrics", "aTSA", "DescribeDF", "dplyr", "e1071", "fGarch", "FinTS", "forecast", "neuralnet", "psych", "tseries"] + "depends": ["AllMetrics", "DescribeDF", "FinTS", "aTSA", "dplyr", "e1071", "fGarch", "forecast", "neuralnet", "psych", "tseries"] }, "Arothron": { "name": "Arothron", "version": "2.0.5", "sha256": "0clz01096fdkhnh89np3knhdnk78p2faj9zkm5qhg56jzaji8wxi", - "depends": ["abind", "alphashape3d", "compositions", "doParallel", "foreach", "geometry", "Morpho", "rgl", "Rvcg", "stringr", "vegan"] + "depends": ["Morpho", "Rvcg", "abind", "alphashape3d", "compositions", "doParallel", "foreach", "geometry", "rgl", "stringr", "vegan"] }, "AsioHeaders": { "name": "AsioHeaders", @@ -1337,13 +1355,13 @@ "name": "AssetAllocation", "version": "1.1.1", "sha256": "0qd58478bwg20x7ivfasmhs87swl6wj98vzlp608y208madl8ss6", - "depends": ["curl", "NMOF", "PerformanceAnalytics", "quantmod", "riskParityPortfolio", "RiskPortfolios", "xts", "zoo"] + "depends": ["NMOF", "PerformanceAnalytics", "RiskPortfolios", "curl", "quantmod", "riskParityPortfolio", "xts", "zoo"] }, "AssetCorr": { "name": "AssetCorr", "version": "1.0.4", "sha256": "0r98li2lxhfap1hn6h0l78phpm9m1nlcqhwzpq0ahhw0b1rd4qkf", - "depends": ["boot", "ggplot2", "knitr", "mvQuad", "mvtnorm", "numDeriv", "qpdf", "Rdpack", "VineCopula"] + "depends": ["Rdpack", "VineCopula", "boot", "ggplot2", "knitr", "mvQuad", "mvtnorm", "numDeriv", "qpdf"] }, "AssetPricing": { "name": "AssetPricing", @@ -1359,8 +1377,8 @@ }, "AssocBin": { "name": "AssocBin", - "version": "0.1-0", - "sha256": "0d5jd96mipwgfnc1qys61hly8bk8l8a0xhi4x677zm2sd9gkp6ic", + "version": "1.0-0", + "sha256": "16pl18b2jd45ys2cc4h74k2llc5daw8b727nmby4qdrja3qnifbr", "depends": [] }, "AssocTests": { @@ -1409,7 +1427,7 @@ "name": "AtmChile", "version": "1.0.1", "sha256": "0r8js8racs93vxbq62b44qj9m1vsp24dv81bmsg0a3smpk67zd46", - "depends": ["data_table", "DT", "lubridate", "openair", "plotly", "shiny", "shinycssloaders"] + "depends": ["DT", "data_table", "lubridate", "openair", "plotly", "shiny", "shinycssloaders"] }, "AurieLSHGaussian": { "name": "AurieLSHGaussian", @@ -1439,7 +1457,7 @@ "name": "AutoPipe", "version": "0.1.6", "sha256": "0bzllh92fgsmz79lh6m2f10vsx5qng4l7bwbwkp2kzwnncy7cq63", - "depends": ["annotate", "cluster", "clusterProfiler", "ConsensusClusterPlus", "fgsea", "msigdbr", "org_Hs_eg_db", "pamr", "RColorBrewer", "Rtsne", "siggenes"] + "depends": ["ConsensusClusterPlus", "RColorBrewer", "Rtsne", "annotate", "cluster", "clusterProfiler", "fgsea", "msigdbr", "org_Hs_eg_db", "pamr", "siggenes"] }, "AutoPlots": { "name": "AutoPlots", @@ -1451,7 +1469,7 @@ "name": "AutoScore", "version": "1.0.0", "sha256": "14wn566xm308zir12rckwc5fagm2x1mrphy0a7iri0cbrffgnkz4", - "depends": ["car", "coxed", "dplyr", "ggplot2", "Hmisc", "knitr", "magrittr", "ordinal", "plotly", "pROC", "randomForest", "randomForestSRC", "rlang", "survAUC", "survival", "survminer", "tableone", "tidyr"] + "depends": ["Hmisc", "car", "coxed", "dplyr", "ggplot2", "knitr", "magrittr", "ordinal", "pROC", "plotly", "randomForest", "randomForestSRC", "rlang", "survAUC", "survival", "survminer", "tableone", "tidyr"] }, "AutoStepwiseGLM": { "name": "AutoStepwiseGLM", @@ -1463,19 +1481,19 @@ "name": "AutoTransQF", "version": "0.1.3", "sha256": "1kqdzz719r2bp37b6fn21njgbiyn7rrpms7jcjl8i0znwxkspd82", - "depends": ["matlab2r", "moments", "VGAM"] + "depends": ["VGAM", "matlab2r", "moments"] }, "AutoWeatherIndices": { "name": "AutoWeatherIndices", "version": "0.1.0", "sha256": "08f2c026vn5kmsdlf54sxakzjp2f43dkrs6mv9qwnjfrd2hchzzi", - "depends": ["gtools", "Hmisc"] + "depends": ["Hmisc", "gtools"] }, "Autoplotprotein": { "name": "Autoplotprotein", "version": "1.1", "sha256": "13mxqmhhdiq7mz4m6nx39dsq7x3bm8fsgskswx48vsq6x2k6byxa", - "depends": ["ade4", "plotrix", "plyr", "seqinr", "XML"] + "depends": ["XML", "ade4", "plotrix", "plyr", "seqinr"] }, "AutoregressionMDE": { "name": "AutoregressionMDE", @@ -1505,7 +1523,7 @@ "name": "AzureAuth", "version": "1.3.3", "sha256": "1arr7vbcj9ibrx826md487hcmlch46b2h3r03a14wxq6ssxj4x0z", - "depends": ["httr", "jose", "jsonlite", "openssl", "R6", "rappdirs"] + "depends": ["R6", "httr", "jose", "jsonlite", "openssl", "rappdirs"] }, "AzureCognitive": { "name": "AzureCognitive", @@ -1517,7 +1535,7 @@ "name": "AzureContainers", "version": "1.3.2", "sha256": "0lykvf4kk1q7b7ln4l8jlrxgqyvrg1cfnap4ak8zkhxmrgzqpc5f", - "depends": ["AzureGraph", "AzureRMR", "httr", "openssl", "processx", "R6"] + "depends": ["AzureGraph", "AzureRMR", "R6", "httr", "openssl", "processx"] }, "AzureCosmosR": { "name": "AzureCosmosR", @@ -1529,19 +1547,19 @@ "name": "AzureGraph", "version": "1.3.4", "sha256": "0x7ya1yxk0cga9cfbfkd332l2syswdqjamzr2xqvb6ybwc5lpcy2", - "depends": ["AzureAuth", "curl", "httr", "jsonlite", "openssl", "R6"] + "depends": ["AzureAuth", "R6", "curl", "httr", "jsonlite", "openssl"] }, "AzureKeyVault": { "name": "AzureKeyVault", "version": "1.0.5", "sha256": "15x0mkgn7pq2yk05l5vwvd744gxkz28nb5azc1yz502ayr1s6hnm", - "depends": ["AzureAuth", "AzureGraph", "AzureRMR", "httr", "jose", "jsonlite", "openssl", "R6"] + "depends": ["AzureAuth", "AzureGraph", "AzureRMR", "R6", "httr", "jose", "jsonlite", "openssl"] }, "AzureKusto": { "name": "AzureKusto", "version": "1.1.3", "sha256": "0n0bkaj9gsg2xcczpbg8nm62ipgh4s6a8lvnaiylh8q3w1z6aqfl", - "depends": ["AzureAuth", "AzureRMR", "DBI", "dplyr", "httr", "jsonlite", "openssl", "R6", "rlang", "tibble", "tidyr", "tidyselect"] + "depends": ["AzureAuth", "AzureRMR", "DBI", "R6", "dplyr", "httr", "jsonlite", "openssl", "rlang", "tibble", "tidyr", "tidyselect"] }, "AzureQstor": { "name": "AzureQstor", @@ -1553,13 +1571,13 @@ "name": "AzureRMR", "version": "2.4.4", "sha256": "09mjc5ibk1g1azskqnrcgfb5bi88aw55g96cyas5vlwgi54xzs70", - "depends": ["AzureAuth", "AzureGraph", "httr", "jsonlite", "R6", "uuid"] + "depends": ["AzureAuth", "AzureGraph", "R6", "httr", "jsonlite", "uuid"] }, "AzureStor": { "name": "AzureStor", "version": "3.7.0", "sha256": "0jrc4m8p0hss07hna157z510rh84lhjmyqsa47wirpr0b5ba6kr3", - "depends": ["AzureRMR", "httr", "mime", "openssl", "R6", "vctrs", "xml2"] + "depends": ["AzureRMR", "R6", "httr", "mime", "openssl", "vctrs", "xml2"] }, "AzureTableStor": { "name": "AzureTableStor", @@ -1571,7 +1589,7 @@ "name": "AzureVM", "version": "2.2.2", "sha256": "0766a4y17qgq3vgb398n6zn8sdjrv65gpvrnr9b9g89zdsdy9fc4", - "depends": ["AzureRMR", "jsonlite", "R6"] + "depends": ["AzureRMR", "R6", "jsonlite"] }, "AzureVMmetadata": { "name": "AzureVMmetadata", @@ -1613,25 +1631,25 @@ "name": "BALLI", "version": "0.2.0", "sha256": "0qmjwpj56n07dvjwfknqvc02f0y5mlwh2yz4lrw7c4wqgrckcpgi", - "depends": ["edgeR", "limma", "MASS"] + "depends": ["MASS", "edgeR", "limma"] }, "BAMBI": { "name": "BAMBI", "version": "2.3.5", "sha256": "16pb04n30y8sl6m6qgrdxk7sck98233cravpbzw4fzl2j8h0mm3r", - "depends": ["bridgesampling", "coda", "future_apply", "gtools", "label_switching", "lattice", "loo", "mvtnorm", "numDeriv", "qrng", "RColorBrewer", "Rcpp", "RcppArmadillo", "scales"] + "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "bridgesampling", "coda", "future_apply", "gtools", "label_switching", "lattice", "loo", "mvtnorm", "numDeriv", "qrng", "scales"] }, "BAMMtools": { "name": "BAMMtools", "version": "2.1.11", "sha256": "0ymb1vwrzwg7gs4n3zjikg10ajk75r18j5rlgs25n4ab4fp6sibp", - "depends": ["ape", "gplots", "Rcpp"] + "depends": ["Rcpp", "ape", "gplots"] }, "BANAM": { "name": "BANAM", - "version": "0.2.0", - "sha256": "0k04d8ssfg078w52paj323bflzlbk5k0r17c4xl1xs2g6saa0iyn", - "depends": ["bain", "BFpack", "extraDistr", "Matrix", "matrixcalc", "mvtnorm", "psych", "rARPACK", "sna", "tmvtnorm"] + "version": "0.2.1", + "sha256": "0jiw42icj0zzxpf51fxjbgqzjlp5s90nd8pgav4nlq70h4y64g2n", + "depends": ["BFpack", "Matrix", "bain", "extraDistr", "matrixcalc", "mvtnorm", "psych", "rARPACK", "sna", "tmvtnorm"] }, "BANOVA": { "name": "BANOVA", @@ -1647,9 +1665,9 @@ }, "BART": { "name": "BART", - "version": "2.9.7", - "sha256": "15nm6ahi5kq2fd9zrksqq7ybmlzrw7hds5ws27zvlayyy2qxyq17", - "depends": ["nlme", "nnet", "Rcpp", "survival"] + "version": "2.9.9", + "sha256": "1jm17n2p6n0knbjzy3sqxaljbq9qfm7mn1swb6zpgw172hr7l22v", + "depends": ["Rcpp", "nlme", "survival"] }, "BAS": { "name": "BAS", @@ -1667,7 +1685,7 @@ "name": "BASiNET", "version": "0.0.5", "sha256": "09g2h38kz1g9kkjc69si5d6z6fkayys9hinjs3p6dn7sx7zn2bx1", - "depends": ["Biostrings", "igraph", "randomForest", "rJava", "rmcfs", "RWeka"] + "depends": ["Biostrings", "RWeka", "igraph", "rJava", "randomForest", "rmcfs"] }, "BASiNETEntropy": { "name": "BASiNETEntropy", @@ -1679,7 +1697,13 @@ "name": "BAT", "version": "2.9.6", "sha256": "04wsr8sz70z7z6cqhmc4npqvh6ay9r1x5ghkp2ick58s0f6sagbf", - "depends": ["ape", "geometry", "hypervolume", "MASS", "nls2", "phytools", "terra", "vegan"] + "depends": ["MASS", "ape", "geometry", "hypervolume", "nls2", "phytools", "terra", "vegan"] + }, + "BATSS": { + "name": "BATSS", + "version": "0.7.14", + "sha256": "1252hxqdplbk12m6ri9fh4p4zy8q561n8ix6m2qy404idggklnxc", + "depends": ["R_utils", "abind", "cli", "plyr", "rlang"] }, "BAYSTAR": { "name": "BAYSTAR", @@ -1703,7 +1727,7 @@ "name": "BBEST", "version": "0.1-8", "sha256": "0j3ykxsmxima75h40mhqm32l2ffc27pk11rfzjyvv1cm6q2q3gbh", - "depends": ["aws", "DEoptim", "ggplot2", "reshape2", "shiny"] + "depends": ["DEoptim", "aws", "ggplot2", "reshape2", "shiny"] }, "BBI": { "name": "BBI", @@ -1715,7 +1739,7 @@ "name": "BBSSL", "version": "0.1.0", "sha256": "0vb3afbx8p3frliy92sf2wlmx32rasxj39i8d023m2dvsblbh50x", - "depends": ["glmnet", "greybox", "Matrix", "mvnfast", "rmutil", "statmod", "svMisc", "truncnorm"] + "depends": ["Matrix", "glmnet", "greybox", "mvnfast", "rmutil", "statmod", "svMisc", "truncnorm"] }, "BBmisc": { "name": "BBmisc", @@ -1727,7 +1751,7 @@ "name": "BCA1SG", "version": "0.1.0", "sha256": "14jvi5gn19f72szcnyhfpdld00cc7gyih5qrm4bpzvp553f1svvk", - "depends": ["logOfGamma", "Matrix"] + "depends": ["Matrix", "logOfGamma"] }, "BCBCSF": { "name": "BCBCSF", @@ -1743,15 +1767,15 @@ }, "BCClong": { "name": "BCClong", - "version": "1.0.2", - "sha256": "06i77iz6i79dbwnjic7x7dgysbh4x22ixhzlpkmpb47yx7c2qmvf", - "depends": ["abind", "cluster", "coda", "ggplot2", "label_switching", "LaplacesDemon", "lme4", "MASS", "mclust", "MCMCpack", "mixAK", "mvtnorm", "nnet", "Rcpp", "RcppArmadillo", "Rmpfr", "truncdist"] + "version": "1.0.3", + "sha256": "1ighfc6zsgclvpfan0vdi0k896y4lnwkvm9g3fj1zmmzf2pym3mj", + "depends": ["LaplacesDemon", "MASS", "MCMCpack", "Rcpp", "RcppArmadillo", "Rmpfr", "abind", "cluster", "coda", "ggplot2", "gridExtra", "label_switching", "lme4", "mclust", "mixAK", "mvtnorm", "nnet", "truncdist"] }, "BCDAG": { "name": "BCDAG", "version": "1.1.1", "sha256": "1w6b72vcv9gdwxm5ynpy9jrw2qpbfi4qn8272qdbv4jz1p3k605n", - "depends": ["graph", "gRbase", "lattice", "mvtnorm", "Rgraphviz"] + "depends": ["Rgraphviz", "gRbase", "graph", "lattice", "mvtnorm"] }, "BCDating": { "name": "BCDating", @@ -1763,13 +1787,13 @@ "name": "BCEA", "version": "2.4.6", "sha256": "0qmnwh3j0mksgvnfnbkym7fpcngdnf1j83lqfilp5gn46akdqyvn", - "depends": ["cli", "dplyr", "ggplot2", "gridExtra", "MASS", "Matrix", "MCMCvis", "purrr", "Rdpack", "reshape2", "rlang", "rstan", "scales"] + "depends": ["MASS", "MCMCvis", "Matrix", "Rdpack", "cli", "dplyr", "ggplot2", "gridExtra", "purrr", "reshape2", "rlang", "rstan", "scales"] }, "BCEE": { "name": "BCEE", "version": "1.3.2", "sha256": "181khl93rsrqjm8cmn14a6bb7s47dp3xc31gm9rk088ixfjadq7h", - "depends": ["BMA", "boot", "leaps", "Rcpp", "RcppArmadillo"] + "depends": ["BMA", "Rcpp", "RcppArmadillo", "boot", "leaps"] }, "BCHM": { "name": "BCHM", @@ -1787,13 +1811,13 @@ "name": "BCSub", "version": "0.5", "sha256": "0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp", - "depends": ["MASS", "mcclust", "nFactors", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "mcclust", "nFactors"] }, "BCT": { "name": "BCT", "version": "1.2", "sha256": "0fs6wh59njgj7ybnkf5ki4g8phmzrchvml0f8jyhhxdarkj5vr5d", - "depends": ["igraph", "Rcpp", "stringr"] + "depends": ["Rcpp", "igraph", "stringr"] }, "BCgee": { "name": "BCgee", @@ -1805,7 +1829,7 @@ "name": "BClustLonG", "version": "0.1.3", "sha256": "1p6fm60vhs9l3b120h2l7nz4rf4ckhka7124kzwjd7znax2a336g", - "depends": ["lme4", "MASS", "mcclust", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "lme4", "mcclust"] }, "BDAlgo": { "name": "BDAlgo", @@ -1829,7 +1853,7 @@ "name": "BDWreg", "version": "1.3.0", "sha256": "0di2ll2sjj6js9fg3gx20kmjjzkqwhwq9g319jfwzzwxbclqs5ky", - "depends": ["coda", "doParallel", "DWreg", "foreach", "MASS"] + "depends": ["DWreg", "MASS", "coda", "doParallel", "foreach"] }, "BDgraph": { "name": "BDgraph", @@ -1847,19 +1871,25 @@ "name": "BEACH", "version": "1.3.1", "sha256": "0biq6c74k8vb8ykafzf3blyi08rp65x1vaw3bfpwdc1ihc9wrgjr", - "depends": ["devtools", "DT", "haven", "plyr", "rJava", "rtf", "sas7bdat", "shiny", "WriteXLS", "xtable"] + "depends": ["DT", "WriteXLS", "devtools", "haven", "plyr", "rJava", "rtf", "sas7bdat", "shiny", "xtable"] + }, + "BEAMR": { + "name": "BEAMR", + "version": "1.1.0", + "sha256": "0187ka2lgkkqbvkrss4sgfnihicvkyi9zp6dk79cfxjvl3jyh2xm", + "depends": ["MASS", "dplyr", "ggmosaic", "ggplot2", "ggpubr", "logistf", "magrittr", "purrr", "rlist", "stringr", "survival", "survminer"] }, "BED": { "name": "BED", "version": "1.5.2", "sha256": "0js227vn6mvn7zk2q0vw9w9cp2ayjzqja6mrmpw9wnx82fp0amcg", - "depends": ["dplyr", "DT", "miniUI", "neo2R", "readr", "rstudioapi", "shiny", "stringr", "visNetwork"] + "depends": ["DT", "dplyr", "miniUI", "neo2R", "readr", "rstudioapi", "shiny", "stringr", "visNetwork"] }, "BEDASSLE": { "name": "BEDASSLE", "version": "1.6.1", "sha256": "1zjgcfpsvghxz62qsg4s1w6gwpd804s8hfnwy5hifg6sy4phw9d7", - "depends": ["emdbook", "MASS", "matrixcalc"] + "depends": ["MASS", "emdbook", "matrixcalc"] }, "BEDMatrix": { "name": "BEDMatrix", @@ -1871,7 +1901,7 @@ "name": "BEKKs", "version": "1.4.4", "sha256": "1ai475d1ya8j8kl4w6qdpdmsarz74p1799fc9hl0if2r3gv211vn", - "depends": ["future", "future_apply", "GAS", "ggfortify", "ggplot2", "gridExtra", "ks", "lubridate", "mathjaxr", "moments", "numDeriv", "pbapply", "Rcpp", "RcppArmadillo", "reshape2", "xts"] + "depends": ["GAS", "Rcpp", "RcppArmadillo", "future", "future_apply", "ggfortify", "ggplot2", "gridExtra", "ks", "lubridate", "mathjaxr", "moments", "numDeriv", "pbapply", "reshape2", "xts"] }, "BEND": { "name": "BEND", @@ -1901,7 +1931,7 @@ "name": "BETS", "version": "0.4.9", "sha256": "0daixk7mqmk2jq35i7mjaslz11gxbnnjgwxfvj8x1s88vz9l74sm", - "depends": ["DBI", "digest", "dplyr", "DT", "dygraphs", "forecast", "foreign", "ggplot2", "grnn", "htmltools", "httr", "lubridate", "miniUI", "plotly", "rjson", "rmarkdown", "RMySQL", "rstudioapi", "rvest", "seasonal", "shiny", "sqldf", "stringr", "urca", "webshot", "xml2", "zoo"] + "depends": ["DBI", "DT", "RMySQL", "digest", "dplyr", "dygraphs", "forecast", "foreign", "ggplot2", "grnn", "htmltools", "httr", "lubridate", "miniUI", "plotly", "rjson", "rmarkdown", "rstudioapi", "rvest", "seasonal", "shiny", "sqldf", "stringr", "urca", "webshot", "xml2", "zoo"] }, "BElikelihood": { "name": "BElikelihood", @@ -1911,15 +1941,15 @@ }, "BFF": { "name": "BFF", - "version": "3.0.1", - "sha256": "1sya6ww8jwi56zb3i2rjhk1qd52n5s9sqlzndyk812zyxj6h5zim", - "depends": ["BSDA", "ggplot2", "gsl", "hypergeo", "Matrix"] + "version": "4.2.1", + "sha256": "1s4f9mjhx24hxm2aan25kmb5akpxl25ggic3mkwmh1d0npbgip6a", + "depends": ["Matrix", "ggplot2", "gsl", "rlang"] }, "BFI": { "name": "BFI", - "version": "1.1.4", - "sha256": "10xy9acjvq1c21wsb3lfhpza56zcb4ifb4i4330i02phxxc8a9fa", - "depends": ["devtools"] + "version": "2.0.1", + "sha256": "0szx9cjzhlxk6n83i6rm48db2lkj4zdsaqrgzipr71bwwjfk08nr", + "depends": [] }, "BFS": { "name": "BFS", @@ -1929,15 +1959,15 @@ }, "BFpack": { "name": "BFpack", - "version": "1.2.3", - "sha256": "1bji697998qkb56gid8jd6bp9gqwxkls73d8vk55z838r60irlla", - "depends": ["bain", "Bergm", "ergm", "extraDistr", "lme4", "MASS", "mvtnorm", "pracma", "QRM", "sandwich"] + "version": "1.3.0", + "sha256": "1ddcqcd8wzc1mc8d27kwv1xand8f4asvdirjbgncl5vs4akr924m", + "depends": ["Bergm", "MASS", "QRM", "bain", "ergm", "extraDistr", "lme4", "mvtnorm", "pracma", "sandwich"] }, "BGData": { "name": "BGData", "version": "2.4.1", "sha256": "1bx63spfmsn9hz3qxhkvipfvyqcdy4afqzcada3bgly265kdg10h", - "depends": ["BEDMatrix", "bigmemory", "bit", "crochet", "ff", "LinkedMatrix", "symDMatrix", "synchronicity"] + "depends": ["BEDMatrix", "LinkedMatrix", "bigmemory", "bit", "crochet", "ff", "symDMatrix", "synchronicity"] }, "BGFD": { "name": "BGFD", @@ -1953,9 +1983,9 @@ }, "BGGM": { "name": "BGGM", - "version": "2.1.1", - "sha256": "1k83x9x48vls5ahvl4fm3salss4vf27z23iiylkj7fcrf4br6q27", - "depends": ["BFpack", "GGally", "ggplot2", "ggridges", "MASS", "mvnfast", "network", "Rcpp", "RcppArmadillo", "RcppDist", "RcppProgress", "Rdpack", "reshape", "sna"] + "version": "2.1.3", + "sha256": "15yqbifnxlpwk25ki1yxfylkyb061375cxwq7dbid2381lvnslih", + "depends": ["BFpack", "GGally", "MASS", "Rcpp", "RcppArmadillo", "RcppDist", "RcppProgress", "Rdpack", "ggplot2", "ggridges", "mvnfast", "network", "reshape", "sna"] }, "BGLR": { "name": "BGLR", @@ -1971,15 +2001,15 @@ }, "BGVAR": { "name": "BGVAR", - "version": "2.5.5", - "sha256": "10cj8lx63jdzmvw674zj4vawvf3mwvyjxjpqicy9ajm6r6gbccj8", - "depends": ["abind", "bayesm", "coda", "GIGrvg", "knitr", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "RcppProgress", "readxl", "stochvol", "xts", "zoo"] + "version": "2.5.7", + "sha256": "1djccjwknghq33kzdyisfk0gxcqd54fmwad59kadgp39fah9hz9k", + "depends": ["GIGrvg", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "RcppProgress", "abind", "bayesm", "coda", "knitr", "readxl", "stochvol", "xts", "zoo"] }, "BGmisc": { "name": "BGmisc", - "version": "1.3.1", - "sha256": "01ka6rc5wivv4m44igfv9fm42pc1f8c6gxxwvabaz1p5hs725yx8", - "depends": ["data_table", "igraph", "kinship2", "Matrix", "stringr"] + "version": "1.3.2", + "sha256": "12m6c0b0nqgxiiy9vynygx186vb1v5i6s8gfjijsqn7wzpzfj6ig", + "depends": ["Matrix", "data_table", "igraph", "kinship2", "stringr"] }, "BH": { "name": "BH", @@ -2003,7 +2033,7 @@ "name": "BHMSMAfMRI", "version": "2.2", "sha256": "0xn4ss422mkshx5kcznaym04i5z5a9vw9hvcb10r38vq031wys8q", - "depends": ["oro_nifti", "Rcpp", "RcppArmadillo", "wavethresh"] + "depends": ["Rcpp", "RcppArmadillo", "oro_nifti", "wavethresh"] }, "BHSBVAR": { "name": "BHSBVAR", @@ -2027,25 +2057,25 @@ "name": "BIEN", "version": "1.2.6", "sha256": "17zrj5ckxaz4mdbgywxi8kf51ssbf2md1d2azf30dh96kzc2ayps", - "depends": ["ape", "DBI", "doParallel", "fasterize", "foreach", "raster", "RPostgreSQL", "sf", "terra"] + "depends": ["DBI", "RPostgreSQL", "ape", "doParallel", "fasterize", "foreach", "raster", "sf", "terra"] }, "BIFIEsurvey": { "name": "BIFIEsurvey", "version": "3.6-6", "sha256": "0g0v7sahh7kg84yi0gj7q21i2wld76vs8c0vzynyna3jal5a2ij7", - "depends": ["miceadds", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "miceadds"] }, "BIGDAWG": { "name": "BIGDAWG", "version": "3.0.3", "sha256": "1zbikvhyaksbddv2kz8nqkidjy4qsfp6a8wwyxjy5a0wcnqnwsxf", - "depends": ["haplo_stats", "httr", "XML"] + "depends": ["XML", "haplo_stats", "httr"] }, "BIGL": { "name": "BIGL", - "version": "1.9.1", - "sha256": "0cc67fg6b5vjjvq485bw374h1d0l7klcgprwpb472srsbdx6l4y2", - "depends": ["data_table", "ggplot2", "lifecycle", "MASS", "minpack_lm", "nleqslv", "numDeriv", "plotly", "progress", "robustbase", "scales"] + "version": "1.9.3", + "sha256": "17skfw03f6ycfkqinisd9mrslwj19g5mm99s4ma65kln3xlx692j", + "depends": ["MASS", "data_table", "ggplot2", "htmlwidgets", "lifecycle", "magrittr", "minpack_lm", "nleqslv", "numDeriv", "plotly", "progress", "robustbase", "scales"] }, "BINCOR": { "name": "BINCOR", @@ -2057,7 +2087,7 @@ "name": "BINtools", "version": "0.2.0", "sha256": "0x97h0b2krdgrd0x266fidj77an3dq8mf9lnbas9112p4mhkmk58", - "depends": ["BH", "combinat", "dplyr", "mvtnorm", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "stringi", "tibble"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "combinat", "dplyr", "mvtnorm", "rstan", "rstantools", "stringi", "tibble"] }, "BIOMASS": { "name": "BIOMASS", @@ -2079,21 +2109,21 @@ }, "BKTR": { "name": "BKTR", - "version": "0.1.1", - "sha256": "07qq6jxrwyvid6j54vzvf7a28ryk478kscn3z7dk9ic2y9c5ljj0", - "depends": ["data_table", "ggmap", "ggplot2", "R6", "R6P", "torch"] + "version": "0.2.0", + "sha256": "17nibqn0bwbzdrxqyq10m7ll958cp5v431zda3ja16az2mss38cy", + "depends": ["R6", "R6P", "data_table", "ggmap", "ggplot2", "torch"] }, "BLA": { "name": "BLA", "version": "1.0.1", "sha256": "06nfsn67vgmkm0rrbs2q56gswx4hj7swysaq6vizx6zsl0xp7rvr", - "depends": ["data_table", "MASS", "mvtnorm", "numDeriv"] + "depends": ["MASS", "data_table", "mvtnorm", "numDeriv"] }, "BLCOP": { "name": "BLCOP", "version": "0.3.3", "sha256": "08y9vmx3cknjvk6ngfwxlfnc03cqpj97i1ijrs1cw5sahjc0vmhc", - "depends": ["fBasics", "fMultivar", "fPortfolio", "knitr", "MASS", "quadprog", "rmarkdown", "RUnit", "timeSeries"] + "depends": ["MASS", "RUnit", "fBasics", "fMultivar", "fPortfolio", "knitr", "quadprog", "rmarkdown", "timeSeries"] }, "BLModel": { "name": "BLModel", @@ -2111,7 +2141,7 @@ "name": "BLPestimatoR", "version": "0.3.4", "sha256": "07q5ifsvw1ccxys6y01ldh2n9v7chyv88rda1jbznb3nnwka2wh0", - "depends": ["Formula", "Matrix", "mvQuad", "numDeriv", "randtoolbox", "Rcpp", "RcppArmadillo"] + "depends": ["Formula", "Matrix", "Rcpp", "RcppArmadillo", "mvQuad", "numDeriv", "randtoolbox"] }, "BLR": { "name": "BLR", @@ -2165,7 +2195,7 @@ "name": "BMRMM", "version": "1.0.1", "sha256": "1hkk1wwxl4hn9nj43akx6d01pivg3cmkbdngip5f7g2qxd483111", - "depends": ["fields", "logOfGamma", "MCMCpack", "multicool", "pracma"] + "depends": ["MCMCpack", "fields", "logOfGamma", "multicool", "pracma"] }, "BMS": { "name": "BMS", @@ -2183,7 +2213,7 @@ "name": "BMTAR", "version": "0.1.1", "sha256": "0c70vkgv2sdci33yrk2n297k105wnlxj1qchskdparkiipf47xsh", - "depends": ["Brobdingnag", "doParallel", "expm", "ggplot2", "ks", "MASS", "MCMCpack", "mvtnorm"] + "depends": ["Brobdingnag", "MASS", "MCMCpack", "doParallel", "expm", "ggplot2", "ks", "mvtnorm"] }, "BMconcor": { "name": "BMconcor", @@ -2195,7 +2225,7 @@ "name": "BMisc", "version": "1.4.6", "sha256": "1j1qxa5hgc9zdmk1y4xa87jcxi8m75hms88ishfvbqg8n2k9ah1h", - "depends": ["data_table", "dplyr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "dplyr"] }, "BNPTSclust": { "name": "BNPTSclust", @@ -2213,19 +2243,19 @@ "name": "BNPmix", "version": "1.0.2", "sha256": "114gn80b7yyl6hi5cdnc0rp2hzy7pp8z6q4is1h29yxlqa6acbq4", - "depends": ["coda", "ggplot2", "ggpubr", "Rcpp", "RcppArmadillo", "RcppDist"] + "depends": ["Rcpp", "RcppArmadillo", "RcppDist", "coda", "ggplot2", "ggpubr"] }, "BNSL": { "name": "BNSL", "version": "0.1.4", "sha256": "0nrlx55364kgvkdpyaimgjxwnzmmdl1gmvyv3wkm8n2jyki92xxp", - "depends": ["bnlearn", "igraph", "Rcpp"] + "depends": ["Rcpp", "bnlearn", "igraph"] }, "BNSP": { "name": "BNSP", "version": "2.2.3", "sha256": "01rrqvgz9655psm7xcysf50y94lkzl2q3davgjzymg73kzbv3s41", - "depends": ["coda", "corrplot", "cubature", "Formula", "ggplot2", "gridExtra", "label_switching", "mgcv", "plot3D", "plyr", "threejs"] + "depends": ["Formula", "coda", "corrplot", "cubature", "ggplot2", "gridExtra", "label_switching", "mgcv", "plot3D", "plyr", "threejs"] }, "BNrich": { "name": "BNrich", @@ -2255,7 +2285,7 @@ "name": "BOSSreg", "version": "0.2.0", "sha256": "0ln4nx0jlvz5kqk9qkcl8a2cyhsdcqqfs5112qcaabjiwjnvla7w", - "depends": ["glmnet", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "glmnet"] }, "BPM": { "name": "BPM", @@ -2267,7 +2297,7 @@ "name": "BPrinStratTTE", "version": "0.0.7", "sha256": "1iqy36am0isiyjjgrf2jr1ywxxl0n33da637r7j3c3n3zc6yyqyg", - "depends": ["BH", "dplyr", "furrr", "magrittr", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "stringr", "tibble"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "furrr", "magrittr", "purrr", "rstan", "rstantools", "stringr", "tibble"] }, "BRACE": { "name": "BRACE", @@ -2283,9 +2313,9 @@ }, "BRBVS": { "name": "BRBVS", - "version": "0.1.1", - "sha256": "0ibbnfgna80xdb7lzmc0jvlkgw4xrgva1s4bnm0cq93412r2lnay", - "depends": ["copent", "ggplot2", "GJRM", "mvtnorm"] + "version": "0.2.1", + "sha256": "0vhwwsdbslr6craaflvllvba7s1b1jzhjqpmmh70f7k0qi61x5qc", + "depends": ["GJRM", "copent", "ggplot2", "mvtnorm"] }, "BRDT": { "name": "BRDT", @@ -2309,13 +2339,13 @@ "name": "BRINDA", "version": "0.1.5", "sha256": "0jxw3jxxp5k3q80pyiwlg4s5z5vbaplvf5bqb092hppgvkk2q2r5", - "depends": ["berryFunctions", "data_table", "dplyr", "Hmisc", "rlang"] + "depends": ["Hmisc", "berryFunctions", "data_table", "dplyr", "rlang"] }, "BRISC": { "name": "BRISC", "version": "1.0.5", "sha256": "06ppm03clgnsqj6r9qq6fmz609sbigz35iw1qp1lijc4yvwlpr49", - "depends": ["matrixStats", "pbapply", "RANN", "rdist"] + "depends": ["RANN", "matrixStats", "pbapply", "rdist"] }, "BRL": { "name": "BRL", @@ -2329,6 +2359,12 @@ "sha256": "0vkx0lbamfkmpcpd7kp85jqzf2fivp898yw0dvkgan8kkfqclra5", "depends": ["dplyr", "fBasics", "formattable", "goftest", "gsheet", "highcharter", "httr", "httr2", "lubridate", "magrittr", "nortest", "rlang", "rvest", "stringr", "tibble", "tidyr", "timeDate", "tseries", "xml2", "xts"] }, + "BRcal": { + "name": "BRcal", + "version": "0.0.4", + "sha256": "0i24bgmj3px40j86yqp9rdx1s2xjbxckfbr8qsclbkzh6xl73ra0", + "depends": ["fields", "ggplot2", "nloptr"] + }, "BRugs": { "name": "BRugs", "version": "0.9-2.1", @@ -2345,13 +2381,13 @@ "name": "BSGW", "version": "0.9.4", "sha256": "05gr0p9fmj5560s083iss8j4gyh5rk0kdi3qhq5dzr9mfzy0n12q", - "depends": ["doParallel", "foreach", "MfUSampler", "survival"] + "depends": ["MfUSampler", "doParallel", "foreach", "survival"] }, "BSL": { "name": "BSL", "version": "3.2.5", "sha256": "12fksih33a4r6dd8flv7s1hidazhfqcbyvvnppp25rn6jb7p6344", - "depends": ["coda", "copula", "doRNG", "foreach", "ggplot2", "glasso", "gridExtra", "MASS", "mvtnorm", "Rcpp", "RcppArmadillo", "Rdpack", "stringr", "whitening"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rdpack", "coda", "copula", "doRNG", "foreach", "ggplot2", "glasso", "gridExtra", "mvtnorm", "stringr", "whitening"] }, "BSPADATA": { "name": "BSPADATA", @@ -2363,25 +2399,25 @@ "name": "BSPBSS", "version": "1.0.5", "sha256": "0ax92x657f8jm731wc1qry19mbi4d3xxcxh5zd07w3705va4k82y", - "depends": ["BayesGPfit", "ggplot2", "glmnet", "gplots", "gridExtra", "gtools", "ica", "movMF", "neurobase", "oro_nifti", "Rcpp", "RcppArmadillo", "rstiefel", "svd"] + "depends": ["BayesGPfit", "Rcpp", "RcppArmadillo", "ggplot2", "glmnet", "gplots", "gridExtra", "gtools", "ica", "movMF", "neurobase", "oro_nifti", "rstiefel", "svd"] }, "BSS": { "name": "BSS", "version": "0.1.0", "sha256": "1lxmrdmr6c0niqz61kc9ybzszprn66jyinfy4dr9r6i161gvs4qg", - "depends": ["hypergeo", "MASS", "phangorn"] + "depends": ["MASS", "hypergeo", "phangorn"] }, "BSSasymp": { "name": "BSSasymp", "version": "1.2-3", "sha256": "1nqj8w8ilyhladjzhjp1rhi3ff7ik1m76pdhgs16ph7pzdw36w6i", - "depends": ["fICA", "JADE"] + "depends": ["JADE", "fICA"] }, "BSSoverSpace": { "name": "BSSoverSpace", "version": "0.1.0", "sha256": "117av0y5bw44z6293fvbxmf1xqhar7c4lf5z09xrs78dn1xdsnbs", - "depends": ["expm", "rSPDE", "SpatialBSS"] + "depends": ["SpatialBSS", "expm", "rSPDE"] }, "BSSprep": { "name": "BSSprep", @@ -2399,7 +2435,7 @@ "name": "BSagri", "version": "0.1-10", "sha256": "096l2ilr4x2fbjxchkksxkbiyaf7wwdmzn4xyjx001w873x9dgf6", - "depends": ["boot", "gamlss", "MCPAN", "mratios", "multcomp", "mvtnorm"] + "depends": ["MCPAN", "boot", "gamlss", "mratios", "multcomp", "mvtnorm"] }, "BT": { "name": "BT", @@ -2411,7 +2447,7 @@ "name": "BTLLasso", "version": "0.1-13", "sha256": "19r45qm1iq3sjb6r5ficgv8q9zwpbilxwrf6rxvqdl333xcnnjy4", - "depends": ["Matrix", "psychotools", "Rcpp", "RcppArmadillo", "stringr"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "psychotools", "stringr"] }, "BTM": { "name": "BTM", @@ -2423,7 +2459,7 @@ "name": "BTSPAS", "version": "2024.5.9", "sha256": "0gc0ik2257zk6bjhwc78z53jg9a34s32wbwdqk25a6m5wvjp2qlj", - "depends": ["actuar", "coda", "data_table", "ggforce", "ggplot2", "gridExtra", "plyr", "R2jags", "reshape2", "scales"] + "depends": ["R2jags", "actuar", "coda", "data_table", "ggforce", "ggplot2", "gridExtra", "plyr", "reshape2", "scales"] }, "BTSR": { "name": "BTSR", @@ -2435,13 +2471,13 @@ "name": "BTYD", "version": "2.4.3", "sha256": "1szkpcmagpig32vbs7klx71avjlmbd0cn123ljpc3i02b55lma7z", - "depends": ["dplyr", "hypergeo", "Matrix", "optimx"] + "depends": ["Matrix", "dplyr", "hypergeo", "optimx"] }, "BTYDplus": { "name": "BTYDplus", "version": "1.2.0", "sha256": "1shai7kij20g3isd6l29i696pkzymr0qq2i9gzfsxmvdb4g4pcm2", - "depends": ["bayesm", "BTYD", "coda", "data_table", "mvtnorm", "Rcpp"] + "depends": ["BTYD", "Rcpp", "bayesm", "coda", "data_table", "mvtnorm"] }, "BTdecayLasso": { "name": "BTdecayLasso", @@ -2451,8 +2487,8 @@ }, "BTtest": { "name": "BTtest", - "version": "0.10.1", - "sha256": "0qx8brb6196jny10vh2licwv9c5w8mcs1ajx377xpyn6p9fryc46", + "version": "0.10.2", + "sha256": "1p32i8fynjh3dkp1jk92v8wa3x9hw4hr9rjvsj6gz7cp79596fb3", "depends": ["Rcpp", "RcppArmadillo"] }, "BUCSS": { @@ -2477,7 +2513,7 @@ "name": "BVSNLP", "version": "1.1.9", "sha256": "1k2sr9wq0q7lq2hmgp75hzxy6v688lw5npwvpma88975yqi6ghiw", - "depends": ["doParallel", "foreach", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppNumerical"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "RcppNumerical", "doParallel", "foreach"] }, "BWGS": { "name": "BWGS", @@ -2489,7 +2525,7 @@ "name": "BWStest", "version": "0.2.3", "sha256": "1chlszmshda84000jj4q5j2swflj512vfj3h97361aphzhkwri2b", - "depends": ["memoise", "Rcpp"] + "depends": ["Rcpp", "memoise"] }, "BaM": { "name": "BaM", @@ -2497,6 +2533,12 @@ "sha256": "1mfbz8hp6cd170d5y6iva2dbd31rlg6z2dgnfvjp9myqa4cjy40y", "depends": ["MASS", "mice"] }, + "BaSTA": { + "name": "BaSTA", + "version": "2.0.0", + "sha256": "1db4qyg6dmcq2mzmf55n3lxxqk4i7jfz9s32560754h9n0y1l92p", + "depends": ["snowfall"] + }, "BaSkePro": { "name": "BaSkePro", "version": "1.1.1", @@ -2561,37 +2603,37 @@ "name": "BasketballAnalyzeR", "version": "0.5.0", "sha256": "1bad287llg89smqg43lgz2hdkjg3l39mh4k82avgb52xwqp5gjxc", - "depends": ["circlize", "corrplot", "dendextend", "directlabels", "dplyr", "GGally", "ggnetwork", "ggplot2", "ggplotify", "ggrepel", "gridExtra", "hexbin", "magrittr", "MASS", "network", "operators", "PBSmapping", "plyr", "readr", "rlang", "scales", "sna", "sp", "statnet_common", "stringr", "tidyr"] + "depends": ["GGally", "MASS", "PBSmapping", "circlize", "corrplot", "dendextend", "directlabels", "dplyr", "ggnetwork", "ggplot2", "ggplotify", "ggrepel", "gridExtra", "hexbin", "magrittr", "network", "operators", "plyr", "readr", "rlang", "scales", "sna", "sp", "statnet_common", "stringr", "tidyr"] }, "BatchExperiments": { "name": "BatchExperiments", "version": "1.4.3", "sha256": "0g3vr2g4v968rwzja1nngji58960p2r494km8wia7x5w3y69p063", - "depends": ["backports", "BatchJobs", "BBmisc", "checkmate", "data_table", "DBI", "RSQLite"] + "depends": ["BBmisc", "BatchJobs", "DBI", "RSQLite", "backports", "checkmate", "data_table"] }, "BatchGetSymbols": { "name": "BatchGetSymbols", "version": "2.6.4", "sha256": "1sv4p0f8l79wy3q6jwsi3iy7zljc33z9mnyf8ijb23l64w7fvy9i", - "depends": ["cli", "crayon", "curl", "dplyr", "furrr", "future", "lifecycle", "lubridate", "purrr", "quantmod", "rvest", "scales", "stringr", "tibble", "tidyr", "XML", "zoo"] + "depends": ["XML", "cli", "crayon", "curl", "dplyr", "furrr", "future", "lifecycle", "lubridate", "purrr", "quantmod", "rvest", "scales", "stringr", "tibble", "tidyr", "zoo"] }, "BatchJobs": { "name": "BatchJobs", "version": "1.9", "sha256": "0xsw25j2ks9bqgz189qdcyj8hzz93snknlik83nj04s6vy0w7aax", - "depends": ["backports", "BBmisc", "brew", "checkmate", "data_table", "DBI", "digest", "RSQLite", "sendmailR", "stringi"] + "depends": ["BBmisc", "DBI", "RSQLite", "backports", "brew", "checkmate", "data_table", "digest", "sendmailR", "stringi"] }, "BayLum": { "name": "BayLum", "version": "0.3.2", "sha256": "1vkykrwjmm810m29i2l3yps8snysc8s2qqfbgprr4a0a1qyj4nrg", - "depends": ["cli", "coda", "hexbin", "KernSmooth", "Luminescence", "rjags", "runjags", "yaml"] + "depends": ["KernSmooth", "Luminescence", "cli", "coda", "hexbin", "rjags", "runjags", "yaml"] }, "Bayenet": { "name": "Bayenet", "version": "0.2", "sha256": "0h0b6m3lpwjax5vwbmqmfqx55hx3sgbb87jby2lwn3d2v138bpks", - "depends": ["gsl", "hbmem", "MASS", "MCMCpack", "Rcpp", "RcppArmadillo", "SuppDists", "VGAM"] + "depends": ["MASS", "MCMCpack", "Rcpp", "RcppArmadillo", "SuppDists", "VGAM", "gsl", "hbmem"] }, "BayesARIMAX": { "name": "BayesARIMAX", @@ -2603,7 +2645,7 @@ "name": "BayesBEKK", "version": "0.1.1", "sha256": "1vlljv7xdfvbrbxqdi91xrz1aga04aa1pb23kvnmahm2s261map1", - "depends": ["coda", "MTS", "mvtnorm"] + "depends": ["MTS", "coda", "mvtnorm"] }, "BayesBP": { "name": "BayesBP", @@ -2621,7 +2663,7 @@ "name": "BayesCACE", "version": "1.2.3", "sha256": "12vw401d692x2692sykhngi5fk8l6z5724lym97zz9z2wyj29zyk", - "depends": ["coda", "forestplot", "lme4", "metafor", "Rdpack", "rjags"] + "depends": ["Rdpack", "coda", "forestplot", "lme4", "metafor", "rjags"] }, "BayesCR": { "name": "BayesCR", @@ -2639,7 +2681,7 @@ "name": "BayesCVI", "version": "1.0.0", "sha256": "1vm3nkgq7nc3d8zpxhb6p62yf4bhk2xdqkivdw94ml0npd4xsppb", - "depends": ["e1071", "ggplot2", "mclust", "UniversalCVI"] + "depends": ["UniversalCVI", "e1071", "ggplot2", "mclust"] }, "BayesCombo": { "name": "BayesCombo", @@ -2651,7 +2693,7 @@ "name": "BayesComm", "version": "0.1-2", "sha256": "1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk", - "depends": ["abind", "coda", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "abind", "coda", "mvtnorm"] }, "BayesDA": { "name": "BayesDA", @@ -2669,7 +2711,7 @@ "name": "BayesDLMfMRI", "version": "0.0.3", "sha256": "06806wckw629gl6p8jbxpg8lh6wsy8nhs2017qcfc3wwxb6dd3jc", - "depends": ["abind", "mathjaxr", "neurobase", "oro_nifti", "pbapply", "Rcpp", "RcppArmadillo", "RcppDist", "Rdpack"] + "depends": ["Rcpp", "RcppArmadillo", "RcppDist", "Rdpack", "abind", "mathjaxr", "neurobase", "oro_nifti", "pbapply"] }, "BayesDesign": { "name": "BayesDesign", @@ -2681,18 +2723,18 @@ "name": "BayesDissolution", "version": "0.2.1", "sha256": "1x3jn4mdp7csxm6h8rk33h9hlflhkjssqnfzcl3hbkwv4pb97ifl", - "depends": ["coda", "geoR", "MCMCpack", "mnormt", "pscl", "shiny"] + "depends": ["MCMCpack", "coda", "geoR", "mnormt", "pscl", "shiny"] }, "BayesESS": { "name": "BayesESS", "version": "0.1.19", "sha256": "023r5pxqa2ll3vyfmchdlcg6ay0qixphz24078g1immqp43mlrxm", - "depends": ["dfcrm", "LaplacesDemon", "MASS", "MatrixModels", "MCMCpack", "Rcpp", "RcppArmadillo", "RcppEigen"] + "depends": ["LaplacesDemon", "MASS", "MCMCpack", "MatrixModels", "Rcpp", "RcppArmadillo", "RcppEigen", "dfcrm"] }, "BayesFBHborrow": { "name": "BayesFBHborrow", - "version": "1.0.1", - "sha256": "1mkz9viwjf9syfgb5dnzknc96qypsjdkwijky4ybyankzg8nwwrs", + "version": "2.0.1", + "sha256": "1s291ins320iqfbrqixxaxvizc8ili27xqp0syy21cjc8y6yl2nn", "depends": ["checkmate", "dplyr", "ggplot2", "invgamma", "magrittr", "mvtnorm", "survival"] }, "BayesFM": { @@ -2705,7 +2747,7 @@ "name": "BayesFactor", "version": "0.9.12-4.7", "sha256": "0z9p9vdcmcdwqmixaiqnhli2b06whbap6y4pqx4a5gcdgxlj09zr", - "depends": ["coda", "hypergeo", "Matrix", "MatrixModels", "mvtnorm", "pbapply", "Rcpp", "RcppEigen", "stringr"] + "depends": ["Matrix", "MatrixModels", "Rcpp", "RcppEigen", "coda", "hypergeo", "mvtnorm", "pbapply", "stringr"] }, "BayesFluxR": { "name": "BayesFluxR", @@ -2717,7 +2759,7 @@ "name": "BayesGOF", "version": "5.2", "sha256": "17wm0228xq3db431abyi9jr0q1q86nnajsn7hmy4dwzgvrlz5s0i", - "depends": ["Bolstad2", "nleqslv", "orthopolynom", "VGAM"] + "depends": ["Bolstad2", "VGAM", "nleqslv", "orthopolynom"] }, "BayesGPfit": { "name": "BayesGPfit", @@ -2735,25 +2777,25 @@ "name": "BayesGmed", "version": "0.0.3", "sha256": "1bfrvrpf0qiwy720hjrmp007z7xd7ylpl68v9gr2g0i4mjz3szdi", - "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools"] }, "BayesGrowth": { "name": "BayesGrowth", "version": "1.0.0", "sha256": "0snjl40x8h8v8y6wm8lby4h4wm78qgbaq2jx45s96lz9cmfhdz2c", - "depends": ["AquaticLifeHistory", "bayesplot", "BH", "dplyr", "ggplot2", "loo", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "tibble", "tidybayes"] + "depends": ["AquaticLifeHistory", "BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "dplyr", "ggplot2", "loo", "rstan", "rstantools", "tibble", "tidybayes"] }, "BayesLCA": { "name": "BayesLCA", "version": "1.9", "sha256": "11ji5s1njip57zkr4bxwp3agx1ddv7yagm5prn9ckcbasan4rbx1", - "depends": ["coda", "e1071", "fields", "MCMCpack", "nlme"] + "depends": ["MCMCpack", "coda", "e1071", "fields", "nlme"] }, "BayesLN": { "name": "BayesLN", "version": "0.2.10", "sha256": "0p8g0h4zqz5njr7lkkv2hhq9qas9lvrxamg8xb9hkqrxfxd0d3nn", - "depends": ["coda", "data_table", "GeneralizedHyperbolic", "gsl", "lme4", "MASS", "Matrix", "optimx", "Rcpp", "RcppEigen"] + "depends": ["GeneralizedHyperbolic", "MASS", "Matrix", "Rcpp", "RcppEigen", "coda", "data_table", "gsl", "lme4", "optimx"] }, "BayesLogit": { "name": "BayesLogit", @@ -2765,19 +2807,19 @@ "name": "BayesMFSurv", "version": "0.1.0", "sha256": "1yxxzwjh1fgfh7qkzf9dfm3x0vbgb0v4p6bf6b5w14kvm06rzhkg", - "depends": ["coda", "FastGP", "MCMCpack", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["FastGP", "MCMCpack", "Rcpp", "RcppArmadillo", "coda", "mvtnorm"] }, "BayesMallows": { "name": "BayesMallows", - "version": "2.2.1", - "sha256": "0i922b8qapm1k4wvy3f6xbf138ihgyv8l2ixsbfl73z3mrm6nyr4", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "Rdpack", "relations", "rlang", "sets", "testthat"] + "version": "2.2.2", + "sha256": "1jgv654k0qkspardlma2z7a854zw7zxk4fflc027wf7mlvs29b4h", + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "ggplot2", "relations", "rlang", "sets", "testthat"] }, "BayesMassBal": { "name": "BayesMassBal", "version": "1.1.0", "sha256": "1cgcx8kvn0bmn8kmq8ri3k98yx085d2qndislbwhn833ws6vkl88", - "depends": ["coda", "HDInterval", "LaplacesDemon", "Matrix", "pracma", "Rdpack", "tmvtnorm"] + "depends": ["HDInterval", "LaplacesDemon", "Matrix", "Rdpack", "coda", "pracma", "tmvtnorm"] }, "BayesMixSurv": { "name": "BayesMixSurv", @@ -2789,37 +2831,37 @@ "name": "BayesMortalityPlus", "version": "0.2.4", "sha256": "15g87wpaj7rsm8dnz7w57vw9bpkj0aj5f6hi8v7m8kamki8m7chm", - "depends": ["dplyr", "ggplot2", "magrittr", "MASS", "mvtnorm", "progress", "scales", "tidyr"] + "depends": ["MASS", "dplyr", "ggplot2", "magrittr", "mvtnorm", "progress", "scales", "tidyr"] }, "BayesMultMeta": { "name": "BayesMultMeta", "version": "0.1.1", "sha256": "09x41r5lhr2dq56b05f0aj8v4s7084d4z90qjqwdkv8zgk664ki0", - "depends": ["assertthat", "Rdpack"] + "depends": ["Rdpack", "assertthat"] }, "BayesMultiMode": { "name": "BayesMultiMode", "version": "0.7.1", "sha256": "0ij1igdnbk3wy01mdimk9k5ajxmx2plla0ykvsmijzz5mcmqyrii", - "depends": ["assertthat", "bayesplot", "dplyr", "ggplot2", "ggpubr", "gtools", "magrittr", "MCMCglmm", "mvtnorm", "posterior", "Rdpack", "sn", "stringr", "tidyr"] + "depends": ["MCMCglmm", "Rdpack", "assertthat", "bayesplot", "dplyr", "ggplot2", "ggpubr", "gtools", "magrittr", "mvtnorm", "posterior", "sn", "stringr", "tidyr"] }, "BayesNSGP": { "name": "BayesNSGP", "version": "0.1.2", "sha256": "0va4gvyfwfdk3yvhdyxc49qlmzxfblwlmwqh79b93zkv8239kkk1", - "depends": ["FNN", "Matrix", "nimble", "StatMatch"] + "depends": ["FNN", "Matrix", "StatMatch", "nimble"] }, "BayesNetBP": { "name": "BayesNetBP", "version": "1.6.1", "sha256": "1c6a82qlcrpbb2c4zp3gk24wcgw6x62lm8hm6n2l1r307dxm2rpb", - "depends": ["bnlearn", "doBy", "fields", "graph", "igraph", "RColorBrewer"] + "depends": ["RColorBrewer", "bnlearn", "doBy", "fields", "graph", "igraph"] }, "BayesOrdDesign": { "name": "BayesOrdDesign", "version": "0.1.2", "sha256": "1417zd1n5sip999n6q6bgs85c0000ksl73a4p94y0lmdn27i8pmj", - "depends": ["coda", "ggplot2", "gsDesign", "madness", "ordinal", "R2jags", "rjags", "rjmcmc", "schoolmath", "superdiag"] + "depends": ["R2jags", "coda", "ggplot2", "gsDesign", "madness", "ordinal", "rjags", "rjmcmc", "schoolmath", "superdiag"] }, "BayesPPD": { "name": "BayesPPD", @@ -2831,7 +2873,7 @@ "name": "BayesPPDSurv", "version": "1.0.3", "sha256": "1n954qsld509hf47hz7m0998lb1pc8mj0r8i67v0qx9qvr39jmm2", - "depends": ["dplyr", "Rcpp", "RcppArmadillo", "RcppDist", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "RcppDist", "dplyr", "tidyr"] }, "BayesPieceHazSelect": { "name": "BayesPieceHazSelect", @@ -2843,7 +2885,7 @@ "name": "BayesPostEst", "version": "0.3.2", "sha256": "0r05by4w80j6hb22v3ibj686ixxbj7lkxq499fciz5lqs4lxzf3h", - "depends": ["brms", "carData", "caTools", "coda", "dplyr", "ggplot2", "ggridges", "HDInterval", "MCMCpack", "R2jags", "R2WinBUGS", "reshape2", "rjags", "rlang", "ROCR", "rstanarm", "runjags", "texreg", "tidyr"] + "depends": ["HDInterval", "MCMCpack", "R2WinBUGS", "R2jags", "ROCR", "brms", "caTools", "carData", "coda", "dplyr", "ggplot2", "ggridges", "reshape2", "rjags", "rlang", "rstanarm", "runjags", "texreg", "tidyr"] }, "BayesProject": { "name": "BayesProject", @@ -2855,7 +2897,7 @@ "name": "BayesRGMM", "version": "2.2", "sha256": "0yvjl5kzmh2c7c00jk38cs5g6g0yhrc86p5jn8zf10349md3dpcv", - "depends": ["abind", "batchmeans", "MASS", "msm", "mvtnorm", "plyr", "Rcpp", "RcppArmadillo", "RcppDist", "Rdpack", "reshape"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "RcppDist", "Rdpack", "abind", "batchmeans", "msm", "mvtnorm", "plyr", "reshape"] }, "BayesRS": { "name": "BayesRS", @@ -2885,13 +2927,13 @@ "name": "BayesS5", "version": "1.41", "sha256": "0vs6s50h4gpxda9lbxfgn76k9kp81l62a6bv22r7ixsjlnd4baql", - "depends": ["abind", "Matrix", "snowfall", "splines2"] + "depends": ["Matrix", "abind", "snowfall", "splines2"] }, "BayesSUR": { "name": "BayesSUR", - "version": "2.2-0", - "sha256": "1v5m4m1dqvn1scg27ll4bfq656zxx26jbvgk47p83vlll9k6msn3", - "depends": ["igraph", "Matrix", "Rcpp", "RcppArmadillo", "tikzDevice", "xml2"] + "version": "2.2-1", + "sha256": "0zm1591y4iwz006p6a6vjv1q0vl8jdzr5v1cfqixqvi8wd3rs1s4", + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "igraph", "tikzDevice", "xml2"] }, "BayesSampling": { "name": "BayesSampling", @@ -2903,7 +2945,7 @@ "name": "BayesSenMC", "version": "0.1.5", "sha256": "16949bcakx4a77md1rm6364mzsjxr7gpmz2rxnslhz2szx4cnnaj", - "depends": ["BH", "dplyr", "ggplot2", "lme4", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "ggplot2", "lme4", "rstan", "rstantools"] }, "BayesSurvival": { "name": "BayesSurvival", @@ -2915,13 +2957,13 @@ "name": "BayesSurvive", "version": "0.0.2", "sha256": "1m7acw40hvjpgjzyz8fpqzvkz1dadq829klba0343g8h0hmfcd65", - "depends": ["GGally", "ggplot2", "mvtnorm", "Rcpp", "RcppArmadillo", "riskRegression", "survival"] + "depends": ["GGally", "Rcpp", "RcppArmadillo", "ggplot2", "mvtnorm", "riskRegression", "survival"] }, "BayesTools": { "name": "BayesTools", "version": "0.2.17", "sha256": "1vwc64s1a10d2haw7bi5896hhipbb1y7aks4mzjpfrp4zavbzlpn", - "depends": ["bridgesampling", "coda", "extraDistr", "ggplot2", "mvtnorm", "Rdpack", "rlang"] + "depends": ["Rdpack", "bridgesampling", "coda", "extraDistr", "ggplot2", "mvtnorm", "rlang"] }, "BayesTree": { "name": "BayesTree", @@ -2963,13 +3005,13 @@ "name": "BayesfMRI", "version": "0.3.11", "sha256": "19yn8d3jbh1fpxdmqvz3yflnml4fdxb966w44yqha4wjhzfp6hym", - "depends": ["ciftiTools", "excursions", "fMRItools", "foreach", "MASS", "Matrix", "matrixStats", "Rcpp", "RcppEigen", "sp"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppEigen", "ciftiTools", "excursions", "fMRItools", "foreach", "matrixStats", "sp"] }, "BayesianFactorZoo": { "name": "BayesianFactorZoo", "version": "0.0.0.2", "sha256": "1w06hizaj4vxrhxv4jgr0s5ak1w0rr3j2zcdz7cf0mnrbg600dfd", - "depends": ["coda", "ggplot2", "MASS", "Matrix", "matrixcalc", "MCMCpack", "mvtnorm", "nse", "Rdpack", "reshape2", "timeSeries"] + "depends": ["MASS", "MCMCpack", "Matrix", "Rdpack", "coda", "ggplot2", "matrixcalc", "mvtnorm", "nse", "reshape2", "timeSeries"] }, "BayesianGLasso": { "name": "BayesianGLasso", @@ -2981,31 +3023,31 @@ "name": "BayesianLaterality", "version": "0.1.2", "sha256": "1dy00xgz9cc65aj39nf76crhfxfyackpcniwadrh38mk8zpbka42", - "depends": ["dplyr", "purrr", "Rdpack", "rlang", "tidyr", "tmvtnorm"] + "depends": ["Rdpack", "dplyr", "purrr", "rlang", "tidyr", "tmvtnorm"] }, "BayesianMCPMod": { "name": "BayesianMCPMod", "version": "1.0.1", "sha256": "1767rjyd5vl73lqknpxkgcv38rhxdm837zr7c3d5d6f9rdh8rgyw", - "depends": ["checkmate", "DoseFinding", "ggplot2", "nloptr", "RBesT"] + "depends": ["DoseFinding", "RBesT", "checkmate", "ggplot2", "nloptr"] }, "BayesianMediationA": { "name": "BayesianMediationA", "version": "1.0.1", "sha256": "1ygc0xhk7mk7pkqn0v9n23j1m75rr1r2ar30r386c1av3jh7krnw", - "depends": ["car", "gplots", "lattice", "R2jags", "survival"] + "depends": ["R2jags", "car", "gplots", "lattice", "survival"] }, "BayesianNetwork": { "name": "BayesianNetwork", - "version": "0.3", - "sha256": "0nyv2maqssayd79fs0zhpblscd7nsvw7k4fmqzpfz2xgivnx2i5p", - "depends": ["bnlearn", "heatmaply", "lattice", "networkD3", "plotly", "rintrojs", "shiny", "shinyAce", "shinydashboard", "shinyWidgets"] + "version": "0.3.2", + "sha256": "1j0mgjib2v60sfjic8kli69lcbdkakp0fcgx2dhh7p1rq4xx88j1", + "depends": ["bnlearn", "heatmaply", "lattice", "networkD3", "plotly", "rintrojs", "shiny", "shinyAce", "shinyWidgets", "shinydashboard"] }, "BayesianPlatformDesignTimeTrend": { "name": "BayesianPlatformDesignTimeTrend", "version": "1.2.3", "sha256": "1v06airw3zzkvb5qmn0abyhkdp51wjmax101ljj9ibx01nj01zdv", - "depends": ["BH", "BiocManager", "boot", "doParallel", "foreach", "ggplot2", "ggpubr", "iterators", "laGP", "lhs", "matrixStats", "RColorBrewer", "Rcpp", "RcppEigen", "RcppParallel", "reshape", "rstan", "rstantools", "StanHeaders", "stringr"] + "depends": ["BH", "BiocManager", "RColorBrewer", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "boot", "doParallel", "foreach", "ggplot2", "ggpubr", "iterators", "laGP", "lhs", "matrixStats", "reshape", "rstan", "rstantools", "stringr"] }, "BayesianPower": { "name": "BayesianPower", @@ -3023,7 +3065,7 @@ "name": "BayesianTools", "version": "0.1.8", "sha256": "1ldx75g4ws2yrnq4xyj3j83xjhakhgbhn174lwqzviqynvbbshzm", - "depends": ["bridgesampling", "coda", "DHARMa", "ellipse", "emulator", "gap", "IDPmisc", "MASS", "Matrix", "msm", "mvtnorm", "numDeriv", "Rcpp", "tmvtnorm"] + "depends": ["DHARMa", "IDPmisc", "MASS", "Matrix", "Rcpp", "bridgesampling", "coda", "ellipse", "emulator", "gap", "msm", "mvtnorm", "numDeriv", "tmvtnorm"] }, "Bayesiangammareg": { "name": "Bayesiangammareg", @@ -3041,7 +3083,7 @@ "name": "Bayesrel", "version": "0.7.7", "sha256": "0c6vpkljhisdznxw1g204gyfvpy2zs8yqymdbp35zxddygfdchgd", - "depends": ["coda", "LaplacesDemon", "lavaan", "MASS", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["LaplacesDemon", "MASS", "Rcpp", "RcppArmadillo", "Rdpack", "coda", "lavaan"] }, "BcDiag": { "name": "BcDiag", @@ -3053,19 +3095,19 @@ "name": "Bchron", "version": "4.7.6", "sha256": "1s8bx9a5rpcrw0msnjf565crz3d2fykvy5fj1chbqxzjh7qm865w", - "depends": ["checkmate", "coda", "dplyr", "ggforce", "ggplot2", "ggridges", "magrittr", "MASS", "mclust", "purrr", "scales", "stringr"] + "depends": ["MASS", "checkmate", "coda", "dplyr", "ggforce", "ggplot2", "ggridges", "magrittr", "mclust", "purrr", "scales", "stringr"] }, "BeQut": { "name": "BeQut", "version": "0.1.0", "sha256": "065hjpz4162j2ykcwnri25j4mkqf7yl5bf9ja3xn7yvszif0pjh9", - "depends": ["jagsUI", "lqmm", "MASS", "survival"] + "depends": ["MASS", "jagsUI", "lqmm", "survival"] }, "BeSS": { "name": "BeSS", "version": "2.0.4", "sha256": "1y45lqw6b0qzzg9j3cs18fvzd4q7l6njhjkzpcrik2lgwkzamc8a", - "depends": ["glmnet", "Matrix", "Rcpp", "RcppEigen", "survival"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "glmnet", "survival"] }, "BeastJar": { "name": "BeastJar", @@ -3075,21 +3117,21 @@ }, "BeeBDC": { "name": "BeeBDC", - "version": "1.1.1", - "sha256": "05c215m8zd6wcyjgvpkdmzghb2sp8677mj4shnjzqknbvmgqm9hh", - "depends": ["circlize", "CoordinateCleaner", "cowplot", "dplyr", "forcats", "ggplot2", "ggspatial", "here", "igraph", "lubridate", "mgsub", "openxlsx", "paletteer", "readr", "rnaturalearth", "sf", "stringr", "tidyselect"] + "version": "1.2.0", + "sha256": "1x2inx2rvlskzpjgivw0wndihsbbbw85nm0avg2csfk8388qwx9c", + "depends": ["CoordinateCleaner", "circlize", "cowplot", "dplyr", "forcats", "ggplot2", "ggspatial", "here", "igraph", "lubridate", "mgsub", "openxlsx", "paletteer", "readr", "rnaturalearth", "sf", "stringr", "tidyselect"] }, "BeeGUTS": { "name": "BeeGUTS", "version": "1.1.3", "sha256": "1880bsgwal06i7q3la1f8alrhj43mnsim6n8inrnaqcbqgi69v3n", - "depends": ["BH", "cowplot", "data_table", "dplyr", "ggplot2", "gridExtra", "magrittr", "odeGUTS", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cowplot", "data_table", "dplyr", "ggplot2", "gridExtra", "magrittr", "odeGUTS", "rstan", "rstantools", "tidyr"] }, "Benchmarking": { "name": "Benchmarking", "version": "0.32", "sha256": "0fv0i4cpsisk5wa6hgvp75r170ir1zyr2wqbkzfz3qhr43z0jayx", - "depends": ["lpSolveAPI", "quadprog", "Rcpp", "ucminf"] + "depends": ["Rcpp", "lpSolveAPI", "quadprog", "ucminf"] }, "BenfordTests": { "name": "BenfordTests", @@ -3101,25 +3143,25 @@ "name": "Bergm", "version": "5.0.7", "sha256": "13wdkbjnqj3dk8fpk8vblkf4z79j87gdszjdzwysq9i10l6yl6ir", - "depends": ["coda", "ergm", "Matrix", "matrixcalc", "MCMCpack", "mvtnorm", "network", "Rglpk", "statnet_common"] + "depends": ["MCMCpack", "Matrix", "Rglpk", "coda", "ergm", "matrixcalc", "mvtnorm", "network", "statnet_common"] }, "Bernadette": { "name": "Bernadette", "version": "1.1.5", "sha256": "08q0jarv737p4mis7kql1ny9hrm86w49kdn47r94id4895l052ck", - "depends": ["BH", "ggplot2", "gridExtra", "magrittr", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "scales", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "gridExtra", "magrittr", "rstan", "rstantools", "scales"] }, "Bessel": { "name": "Bessel", - "version": "0.6-0", - "sha256": "0iwm08nhlivi4zwcqdi296a1l4n4lfanfxhaysh9vcsyk1kpiacf", + "version": "0.6-1", + "sha256": "0n2k33n4r1hx20qr2hh5i6a2rcyikd6iwihhknzz8nvx8f2ms9yh", "depends": ["Rmpfr"] }, "Bestie": { "name": "Bestie", "version": "0.1.5", "sha256": "1j3xnwq9faim8cjb6cz54mix7ly8dzxa5qsdglcgl2gfbvzbb9s1", - "depends": ["BiDAG", "mvtnorm", "Rcpp"] + "depends": ["BiDAG", "Rcpp", "mvtnorm"] }, "BetaBit": { "name": "BetaBit", @@ -3173,7 +3215,7 @@ "name": "BiDAG", "version": "2.1.4", "sha256": "0gncxn558mdasr63jvqyavd6nhg6762rk0g0a2b7hfvcivjb6bd5", - "depends": ["coda", "graph", "Matrix", "pcalg", "RBGL", "Rcpp", "Rgraphviz"] + "depends": ["Matrix", "RBGL", "Rcpp", "Rgraphviz", "coda", "graph", "pcalg"] }, "BiDimRegression": { "name": "BiDimRegression", @@ -3191,7 +3233,7 @@ "name": "BiSEp", "version": "2.3", "sha256": "1xg2m8rvxwpj47nb20kyd5hpa1lshg58bi0alf1v476yhcwqgrhx", - "depends": ["AnnotationDbi", "GO_db", "GOSemSim", "mclust", "org_Hs_eg_db"] + "depends": ["AnnotationDbi", "GOSemSim", "GO_db", "mclust", "org_Hs_eg_db"] }, "BiTrinA": { "name": "BiTrinA", @@ -3203,7 +3245,7 @@ "name": "BiasCorrector", "version": "0.2.2", "sha256": "0a6iiy4iw8w8s4kbjf6r0gji6izf1zdb99r8vfbvgzzwg2pxx4h4", - "depends": ["data_table", "DT", "magrittr", "rBiasCorrection", "shiny", "shinydashboard", "shinyjs"] + "depends": ["DT", "data_table", "magrittr", "rBiasCorrection", "shiny", "shinydashboard", "shinyjs"] }, "BiasedUrn": { "name": "BiasedUrn", @@ -3221,7 +3263,7 @@ "name": "BifactorIndicesCalculator", "version": "0.2.2", "sha256": "1vnwksw0j4lc2knlcmm5748pf4d7r44sn34s1mrv9p50hlnkk85p", - "depends": ["lavaan", "mirt", "mnormt", "MplusAutomation", "tidyr"] + "depends": ["MplusAutomation", "lavaan", "mirt", "mnormt", "tidyr"] }, "BigQuic": { "name": "BigQuic", @@ -3233,7 +3275,7 @@ "name": "BigVAR", "version": "1.1.2", "sha256": "1f67gk54gzdlil79gqqws0i6j0rvjqk4k0bhdb9adcvcsdxfkwwy", - "depends": ["abind", "lattice", "MASS", "Rcpp", "RcppArmadillo", "RcppEigen", "zoo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "RcppEigen", "abind", "lattice", "zoo"] }, "BimodalIndex": { "name": "BimodalIndex", @@ -3251,25 +3293,25 @@ "name": "BinMat", "version": "0.1.5", "sha256": "1brgv0zmprvwx6x670mmxxlk50nh4ds63bip48mlh0p1qv8pm9db", - "depends": ["ggpubr", "MASS", "pvclust", "tibble"] + "depends": ["MASS", "ggpubr", "pvclust", "tibble"] }, "BinNonNor": { "name": "BinNonNor", "version": "1.5.3", "sha256": "0ijjv2w4bx0i3mks7s4vii21hc9iq69p3jld1qg68a6115njsm24", - "depends": ["BB", "corpcor", "Matrix", "mvtnorm"] + "depends": ["BB", "Matrix", "corpcor", "mvtnorm"] }, "BinNor": { "name": "BinNor", "version": "2.3.3", "sha256": "07r7nf4ygilp470z93x9dc5zddc96m2dkw6d2s4an8fbr4pljc1y", - "depends": ["corpcor", "Matrix", "mvtnorm", "psych"] + "depends": ["Matrix", "corpcor", "mvtnorm", "psych"] }, "BinOrdNonNor": { "name": "BinOrdNonNor", "version": "1.5.2", "sha256": "17981jfjjgsfzjwbv9cjgqdha846rf03nfd8kgj4wiljgz855mz9", - "depends": ["BB", "corpcor", "GenOrd", "Matrix", "mvtnorm", "OrdNor"] + "depends": ["BB", "GenOrd", "Matrix", "OrdNor", "corpcor", "mvtnorm"] }, "BinSegBstrap": { "name": "BinSegBstrap", @@ -3287,7 +3329,7 @@ "name": "BinaryDosage", "version": "1.0.0", "sha256": "10nf11c57j0ls4znm137w831s7zmihg7bybrfg666hx7c9amspjw", - "depends": ["digest", "prodlim", "Rcpp"] + "depends": ["Rcpp", "digest", "prodlim"] }, "BinaryEMVS": { "name": "BinaryEMVS", @@ -3299,7 +3341,7 @@ "name": "BinaryEPPM", "version": "3.0", "sha256": "1sjwh423vap4gd44mkpdhsmp90y9rzr3zkzzakbfczawxz3mbcrp", - "depends": ["expm", "Formula", "lmtest", "numDeriv"] + "depends": ["Formula", "expm", "lmtest", "numDeriv"] }, "BinarybalancedCut": { "name": "BinarybalancedCut", @@ -3311,7 +3353,7 @@ "name": "BioCircos", "version": "0.3.4", "sha256": "1gl57r47p5z1wzs94xzc26j2r8z5hpqr4163b01x6jwzvbrlfwhz", - "depends": ["htmlwidgets", "jsonlite", "plyr", "RColorBrewer"] + "depends": ["RColorBrewer", "htmlwidgets", "jsonlite", "plyr"] }, "BioCro": { "name": "BioCro", @@ -3323,25 +3365,25 @@ "name": "BioInsight", "version": "0.3.1", "sha256": "129w9643l01y316hm0qcsmxzh5lsdmq6xmiz4rhmdh0dcnw2s93n", - "depends": ["edgeR", "knitr", "limma", "RColorBrewer", "wordcloud"] + "depends": ["RColorBrewer", "edgeR", "knitr", "limma", "wordcloud"] }, "BioM2": { "name": "BioM2", - "version": "1.0.7", - "sha256": "1nr8vb5vw5r91vp700c2p4bqx99gp9xb9ch00fwad8rhv0h1yy4x", - "depends": ["caret", "CMplot", "ggforce", "ggnetwork", "ggplot2", "ggpubr", "ggsci", "ggstatsplot", "ggthemes", "htmlwidgets", "igraph", "jiebaR", "mlr3", "mlr3verse", "ROCR", "uwot", "viridis", "webshot", "WGCNA", "wordcloud2"] + "version": "1.0.9", + "sha256": "1x2d0y6jbwvdb8ixpi918g4apcmf018rk18s0h81qzbfp61l9yl3", + "depends": ["CMplot", "ROCR", "WGCNA", "caret", "ggforce", "ggnetwork", "ggplot2", "ggpubr", "ggsci", "ggstatsplot", "ggthemes", "htmlwidgets", "igraph", "jiebaR", "mlr3", "mlr3verse", "uwot", "viridis", "webshot", "wordcloud2"] }, "BioMark": { "name": "BioMark", "version": "0.4.5", "sha256": "1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m", - "depends": ["glmnet", "MASS", "pls", "st"] + "depends": ["MASS", "glmnet", "pls", "st"] }, "BioPET": { "name": "BioPET", "version": "0.2.2", "sha256": "0zgq7i37d0rnjhlkcrl44x62vhz0njsv2fldm64j9r4wc02z1q9n", - "depends": ["ggplot2", "gridExtra", "pROC", "VGAM"] + "depends": ["VGAM", "ggplot2", "gridExtra", "pROC"] }, "BioPETsurv": { "name": "BioPETsurv", @@ -3353,7 +3395,7 @@ "name": "BioPred", "version": "1.0.1", "sha256": "04v38zsg5n5pzg817pkz2jg8sgg1ckd909ckrapbdncyh3wsawan", - "depends": ["car", "ggplot2", "mgcv", "onewaytests", "pROC", "PropCIs", "survival", "survminer", "xgboost"] + "depends": ["PropCIs", "car", "ggplot2", "mgcv", "onewaytests", "pROC", "survival", "survminer", "xgboost"] }, "BioProbability": { "name": "BioProbability", @@ -3373,6 +3415,12 @@ "sha256": "0w8ly4pk0zv6rnmbzfq3i8sd4h4gjsxlnhj5nlyfr72687jjx5cm", "depends": ["ggplot2"] }, + "BioTIMEr": { + "name": "BioTIMEr", + "version": "0.2.3", + "sha256": "027kx7244j575wn3yxhsmhbg2yaf1w611jvjnzaxivpns56rvg33", + "depends": ["checkmate", "dggridR", "dplyr", "ggplot2", "tidyr", "vegan"] + }, "BioVenn": { "name": "BioVenn", "version": "1.1.3", @@ -3395,13 +3443,13 @@ "name": "BiodiversityR", "version": "2.16-1", "sha256": "059kj0cnb3fpqngww6560mqg6c4dsh5w6484v23wnmng064rf1fi", - "depends": ["ggplot2", "Rcmdr", "vegan"] + "depends": ["Rcmdr", "ggplot2", "vegan"] }, "Bioi": { "name": "Bioi", "version": "0.2.10", "sha256": "1ay8889490nfhxhh72fvk9z4h58xknm2b145xhbx2wbzj65zf9ib", - "depends": ["assertthat", "dplyr", "igraph", "Rcpp"] + "depends": ["Rcpp", "assertthat", "dplyr", "igraph"] }, "Biostatistics": { "name": "Biostatistics", @@ -3413,7 +3461,7 @@ "name": "BiostatsUHNplus", "version": "0.0.10", "sha256": "0wrppamh4m47zczci3csqfijf2hyz4lb5ks2z8h2ybn8lcnbjxgp", - "depends": ["afex", "coda", "cowplot", "dplyr", "forcats", "ggh4x", "ggplot2", "lifecycle", "MCMCglmm", "modeest", "openxlsx", "plyr", "purrr", "reportRmd", "rlang", "rstatix", "stringi", "stringr", "tibble"] + "depends": ["MCMCglmm", "afex", "coda", "cowplot", "dplyr", "forcats", "ggh4x", "ggplot2", "lifecycle", "modeest", "openxlsx", "plyr", "purrr", "reportRmd", "rlang", "rstatix", "stringi", "stringr", "tibble"] }, "BipartiteModularityMaximization": { "name": "BipartiteModularityMaximization", @@ -3443,7 +3491,7 @@ "name": "BivRec", "version": "1.2.1", "sha256": "0qqjp9m360db3vz15zpbpqbm8v112n9mchcvsc3iiv60ayfimbg4", - "depends": ["dplyr", "MASS", "Rcpp", "stringr", "survival"] + "depends": ["MASS", "Rcpp", "dplyr", "stringr", "survival"] }, "BivRegBLS": { "name": "BivRegBLS", @@ -3477,27 +3525,27 @@ }, "Blendstat": { "name": "Blendstat", - "version": "1.0.4", - "sha256": "0nh5nq8g009vbb4mmjcrhg46yi77dk1gza4si21m58b26qf5riy5", - "depends": ["lattice", "MASS"] + "version": "1.0.5", + "sha256": "1nz5gwsjlvk6lajiyf0j2max6q5ifsj1arsbn1l4x6z8m7psm9wp", + "depends": ["MASS", "lattice"] }, "BlockCov": { "name": "BlockCov", "version": "0.1.1", "sha256": "1ilqd8kvhlq0nc1n4y7g0aiwran3kyqs8i143j6dv2wy3myn5x0l", - "depends": ["BBmisc", "dplyr", "magrittr", "Matrix", "Rdpack", "rlang", "tibble"] + "depends": ["BBmisc", "Matrix", "Rdpack", "dplyr", "magrittr", "rlang", "tibble"] }, "BlockMissingData": { "name": "BlockMissingData", "version": "0.1.0", "sha256": "12jgf58k3dgbyb7x4skcdc10m8pvyx8kzqq6fi4wn5x1g5595nxy", - "depends": ["doParallel", "foreach", "glmnet", "glmnetcr", "MASS", "Matrix", "pryr"] + "depends": ["MASS", "Matrix", "doParallel", "foreach", "glmnet", "glmnetcr", "pryr"] }, "BlockmodelingGUI": { "name": "BlockmodelingGUI", "version": "1.8.4", "sha256": "09sbxwzvnnzjv5gy0zyd1lvm1z44ywqvanj99i15l0lp66l54572", - "depends": ["blockmodeling", "DT", "htmlwidgets", "igraph", "intergraph", "network", "shiny", "shinybusy", "shinyjs", "shinythemes", "visNetwork"] + "depends": ["DT", "blockmodeling", "htmlwidgets", "igraph", "intergraph", "network", "shiny", "shinybusy", "shinyjs", "shinythemes", "visNetwork"] }, "BlythStillCasellaCI": { "name": "BlythStillCasellaCI", @@ -3509,7 +3557,7 @@ "name": "BoSSA", "version": "3.7", "sha256": "0qhcar3grp6l6islbjc27jqvgh37kkdi0nql6plsqwilldv3kis6", - "depends": ["ape", "jsonlite", "phangorn", "plotrix", "RSQLite"] + "depends": ["RSQLite", "ape", "jsonlite", "phangorn", "plotrix"] }, "BoardGames": { "name": "BoardGames", @@ -3569,7 +3617,7 @@ "name": "BoolNet", "version": "2.1.9", "sha256": "19xnmz5dq8lvk1va8zi931xkawkwfcfjf4vh0dsg5n8zhy4p321f", - "depends": ["igraph", "XML"] + "depends": ["XML", "igraph"] }, "Boom": { "name": "Boom", @@ -3587,7 +3635,7 @@ "name": "BoostMLR", "version": "1.0.3", "sha256": "0gk8jf04qda1qsc6987d8nfa453v9cqkjsvvrrg68yx3fd96m8aj", - "depends": ["nlme", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "nlme"] }, "BootMRMR": { "name": "BootMRMR", @@ -3611,13 +3659,13 @@ "name": "BootstrapQTL", "version": "1.0.5", "sha256": "04lyr9x6lz4q5y70p92ffdil2i9f1fsykw5wh6wsv0qcqypdmawy", - "depends": ["data_table", "foreach", "MatrixEQTL"] + "depends": ["MatrixEQTL", "data_table", "foreach"] }, "Boptbd": { "name": "Boptbd", "version": "1.0.5", "sha256": "1p786avc37yq5g01zh6sqx7b1rvbxrh6gbxsad4bdvr12cjdsss6", - "depends": ["igraph", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "igraph"] }, "Boruta": { "name": "Boruta", @@ -3647,7 +3695,7 @@ "name": "BoutrosLab.plotting.general", "version": "7.1.0", "sha256": "1rmd050sla0d3m2q4cadw84v7p9v05v0ifcbzind771sibr3vcji", - "depends": ["cluster", "e1071", "gridExtra", "gtable", "hexbin", "lattice", "latticeExtra", "MASS"] + "depends": ["MASS", "cluster", "e1071", "gridExtra", "gtable", "hexbin", "lattice", "latticeExtra"] }, "BradleyTerry2": { "name": "BradleyTerry2", @@ -3659,13 +3707,13 @@ "name": "BrailleR", "version": "1.0.2", "sha256": "1gh4n9zl7yczmhy85xmsx1mh9qmc99xvhmm5cdnjcb644i2n214k", - "depends": ["devtools", "dplyr", "extrafont", "ggplot2", "gridGraphics", "gridSVG", "hunspell", "knitr", "mathjaxr", "moments", "quarto", "Rdpack", "rmarkdown", "roloc", "rolocISCCNBS", "tidyr", "whisker", "XML", "xtable"] + "depends": ["Rdpack", "XML", "devtools", "dplyr", "extrafont", "ggplot2", "gridGraphics", "gridSVG", "hunspell", "knitr", "mathjaxr", "moments", "quarto", "rmarkdown", "roloc", "rolocISCCNBS", "tidyr", "whisker", "xtable"] }, "BrainCon": { "name": "BrainCon", "version": "0.3.0", "sha256": "137pagkjb4xzk3skmsf5vlp8q0k79zl9xjz8wwda1mdrknkdnbj6", - "depends": ["glmnet", "MASS"] + "depends": ["MASS", "glmnet"] }, "BranchGLM": { "name": "BranchGLM", @@ -3679,6 +3727,12 @@ "sha256": "15znbxpv0kcl8qqihl9f5irvcsyanfhszcz0xq6r7g8gsay4s760", "depends": [] }, + "BrazilCrime": { + "name": "BrazilCrime", + "version": "0.2", + "sha256": "17p8fgv7pqdx19fpgjax95bl90918w34qxfnhw6xy2wsmp28y6fn", + "depends": ["dplyr", "geobr", "janitor", "openxlsx", "tidyr"] + }, "BrazilMet": { "name": "BrazilMet", "version": "0.2.0", @@ -3701,13 +3755,13 @@ "name": "BrokenAdaptiveRidge", "version": "1.0.0", "sha256": "0f46wwyfcqslk25cbm63pbnp8bwamqhr4g4wdlrqn666yiwn1sc2", - "depends": ["bit64", "Cyclops", "futile_logger"] + "depends": ["Cyclops", "bit64", "futile_logger"] }, "BrownDog": { "name": "BrownDog", "version": "0.2.1", "sha256": "0wnf1jcf4cakbvj9j1l7jk9mq7gd4j1il1ha2vglghqn04f27938", - "depends": ["httpuv", "jsonlite", "RCurl"] + "depends": ["RCurl", "httpuv", "jsonlite"] }, "Brq": { "name": "Brq", @@ -3725,7 +3779,7 @@ "name": "Buddle", "version": "2.0.1", "sha256": "0hi516cbl93z00jpdgyp3j5hz0xf594vn65p6ahpffwzh1l8s1cf", - "depends": ["plyr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "plyr"] }, "BuildSys": { "name": "BuildSys", @@ -3753,9 +3807,9 @@ }, "BuyseTest": { "name": "BuyseTest", - "version": "3.0.2", - "sha256": "04na2yiykcnbscg5ibrkynjhp0ywdlc11fpz2p68bzz928bp9zyx", - "depends": ["data_table", "doSNOW", "foreach", "ggplot2", "lava", "prodlim", "Rcpp", "RcppArmadillo", "riskRegression", "rlang", "scales"] + "version": "3.0.4", + "sha256": "17nf1wy5dyxigr7w2bfj34kx94y7qdh60ra2j6f4kkpy7q0awl3y", + "depends": ["Rcpp", "RcppArmadillo", "data_table", "doSNOW", "foreach", "ggplot2", "lava", "prodlim", "riskRegression", "rlang", "scales"] }, "Bvalue": { "name": "Bvalue", @@ -3779,7 +3833,7 @@ "name": "C443", "version": "3.4.0", "sha256": "021i36gmayvc1qqxjy59b2m7z299yaj0wxcaqhb0j2kbaj439p8w", - "depends": ["cluster", "doParallel", "foreach", "ggplot2", "gridExtra", "igraph", "MASS", "partykit", "plyr", "randomForest", "ranger", "RColorBrewer", "rpart"] + "depends": ["MASS", "RColorBrewer", "cluster", "doParallel", "foreach", "ggplot2", "gridExtra", "igraph", "partykit", "plyr", "randomForest", "ranger", "rpart"] }, "C50": { "name": "C50", @@ -3797,7 +3851,7 @@ "name": "CACIMAR", "version": "1.0.0", "sha256": "0fdi2ls0j10fky3jygqx93h8m1957cdbn1vxdi69bq08xf2c5n5h", - "depends": ["dplyr", "pbapply", "pheatmap", "psych", "reshape2", "ROCR", "Seurat", "viridisLite"] + "depends": ["ROCR", "Seurat", "dplyr", "pbapply", "pheatmap", "psych", "reshape2", "viridisLite"] }, "CADFtest": { "name": "CADFtest", @@ -3821,7 +3875,7 @@ "name": "CALANGO", "version": "1.0.16", "sha256": "1rs992i6xmisx180yyc6z7qlig9a4kj7r3vr5ysf6kcgycj72nj1", - "depends": ["ape", "assertthat", "BiocManager", "dendextend", "DT", "ggplot2", "heatmaply", "htmltools", "htmlwidgets", "knitr", "nlme", "pbmcapply", "pkgdown", "plotly", "rmarkdown", "taxize"] + "depends": ["BiocManager", "DT", "ape", "assertthat", "dendextend", "ggplot2", "heatmaply", "htmltools", "htmlwidgets", "knitr", "nlme", "pbmcapply", "pkgdown", "plotly", "rmarkdown", "taxize"] }, "CALF": { "name": "CALF", @@ -3845,25 +3899,25 @@ "name": "CAMML", "version": "1.0.0", "sha256": "0h2wfbafgcci1rrdq6qc634nf0d1h47ccajziifg1fhk7m8s56i7", - "depends": ["AnnotationDbi", "BiocManager", "edgeR", "MASS", "Matrix", "org_Dr_eg_db", "org_Hs_eg_db", "org_Mm_eg_db", "Seurat", "SeuratObject", "VAM"] + "depends": ["AnnotationDbi", "BiocManager", "MASS", "Matrix", "Seurat", "SeuratObject", "VAM", "edgeR", "org_Dr_eg_db", "org_Hs_eg_db", "org_Mm_eg_db"] }, "CANSIM2R": { "name": "CANSIM2R", "version": "1.14.1", "sha256": "1dnzbd9lyqj3w80lx12qxcsbmv8wy6hxknyi5ijp99cfv7kaq1kc", - "depends": ["downloader", "Hmisc", "reshape2"] + "depends": ["Hmisc", "downloader", "reshape2"] }, "CARBayes": { "name": "CARBayes", "version": "6.1.1", "sha256": "10dqplygp74mphf0mwv4c6d6c1lbi3k41djqrv2yglq799lkm7mi", - "depends": ["CARBayesdata", "coda", "dplyr", "GGally", "glmnet", "igraph", "mapview", "MASS", "MCMCpack", "RColorBrewer", "Rcpp", "sf", "spam", "spdep", "truncnorm"] + "depends": ["CARBayesdata", "GGally", "MASS", "MCMCpack", "RColorBrewer", "Rcpp", "coda", "dplyr", "glmnet", "igraph", "mapview", "sf", "spam", "spdep", "truncnorm"] }, "CARBayesST": { "name": "CARBayesST", "version": "4.0", "sha256": "0wrxpx4zrlndyp74iwrr6bny2l31a333a6nmk3dzi7j3skaj7zf5", - "depends": ["CARBayesdata", "coda", "dplyr", "GGally", "ggplot2", "gridExtra", "gtools", "leaflet", "MASS", "matrixStats", "MCMCpack", "Rcpp", "sf", "spam", "spdep", "truncdist", "truncnorm"] + "depends": ["CARBayesdata", "GGally", "MASS", "MCMCpack", "Rcpp", "coda", "dplyr", "ggplot2", "gridExtra", "gtools", "leaflet", "matrixStats", "sf", "spam", "spdep", "truncdist", "truncnorm"] }, "CARBayesdata": { "name": "CARBayesdata", @@ -3875,31 +3929,25 @@ "name": "CARM", "version": "1.1.0", "sha256": "068rpz7bjc767yw4vcrf63ckyvdk2f1kskmfcc7955qf9ki5c49c", - "depends": ["arrangements", "dplyr", "MASS"] + "depends": ["MASS", "arrangements", "dplyr"] }, "CARME": { "name": "CARME", "version": "0.1.1", "sha256": "0nam14g052swb44sw07as4agk0z47f7mc1kqlj0z9m1ywsbisnpl", - "depends": ["BH", "expm", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "expm", "rstan", "rstantools"] }, "CARMS": { "name": "CARMS", "version": "1.0.1", "sha256": "0w7xhvwvn5vsc0w9fn3mh750lfqh5183ads1ihv7ypdhdywb5c0p", - "depends": ["diagram", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "diagram"] }, "CARRoT": { "name": "CARRoT", "version": "3.0.2", "sha256": "1himmzsshhr2f5hljr60p7w3wq5ybdsb0f9kiga56hpppg352l3f", - "depends": ["doParallel", "foreach", "nnet", "Rdpack"] - }, - "CARlasso": { - "name": "CARlasso", - "version": "0.1.2", - "sha256": "05r5n5bh0fpwfigr6czh9pg29zyrw73idfvs9qm8vr3dvcmvc42r", - "depends": ["coda", "ggplot2", "ggraph", "igraph", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress"] + "depends": ["Rdpack", "doParallel", "foreach", "nnet"] }, "CASCORE": { "name": "CASCORE", @@ -3917,13 +3965,13 @@ "name": "CASMI", "version": "1.2.2", "sha256": "1xj2d2p75hf6ypz57vbkrlcmf1gk52pv1fadyv9d40lzy8rc3667", - "depends": ["entropy", "EntropyEstimation"] + "depends": ["EntropyEstimation", "entropy"] }, "CAST": { "name": "CAST", "version": "1.0.2", "sha256": "1ga9j2c17gp14hgjd5wa8liak1m0qnhp27hl0r1iqk3gkxq3z5c9", - "depends": ["caret", "data_table", "FNN", "forcats", "ggplot2", "plyr", "sf", "sp", "terra", "twosamples", "zoo"] + "depends": ["FNN", "caret", "data_table", "forcats", "ggplot2", "plyr", "sf", "sp", "terra", "twosamples", "zoo"] }, "CATT": { "name": "CATT", @@ -3941,7 +3989,7 @@ "name": "CAinterprTools", "version": "1.1.0", "sha256": "07rvi91ysqyfwagmip0cnqjahv1n8slicd5hznqf5v3l841xh7p7", - "depends": ["ca", "classInt", "cluster", "FactoMineR", "ggplot2", "ggrepel", "Hmisc", "RcmdrMisc", "reshape2"] + "depends": ["FactoMineR", "Hmisc", "RcmdrMisc", "ca", "classInt", "cluster", "ggplot2", "ggrepel", "reshape2"] }, "CAvariants": { "name": "CAvariants", @@ -3953,7 +4001,7 @@ "name": "CB2", "version": "1.3.4", "sha256": "0431bd956hmkrhs9x845vjwbzzwzd7n9nfx9y95mv6qv84zd4wv2", - "depends": ["dplyr", "ggplot2", "glue", "magrittr", "metap", "pheatmap", "R_utils", "Rcpp", "RcppArmadillo", "readr", "stringr", "tibble", "tidyr"] + "depends": ["R_utils", "Rcpp", "RcppArmadillo", "dplyr", "ggplot2", "glue", "magrittr", "metap", "pheatmap", "readr", "stringr", "tibble", "tidyr"] }, "CBCgrps": { "name": "CBCgrps", @@ -3961,11 +4009,17 @@ "sha256": "0z34vcdq5lp1l15l3a67lpvfla0g0qsb5ijbc9h575h7fpf28jqf", "depends": ["nortest"] }, + "CBPE": { + "name": "CBPE", + "version": "0.1.0", + "sha256": "1l6vs2dq0ckspy9ksdwkds5jyr7a14c34bd9lpx1hnfw3savhhcp", + "depends": [] + }, "CBPS": { "name": "CBPS", "version": "0.23", "sha256": "0bdkx7phi58200jgijqmv5d7v2kiksj07sxx2sjmkd1dcjdy13zd", - "depends": ["glmnet", "MASS", "MatchIt", "nnet", "numDeriv"] + "depends": ["MASS", "MatchIt", "glmnet", "nnet", "numDeriv"] }, "CBSr": { "name": "CBSr", @@ -4013,7 +4067,7 @@ "name": "CCMMR", "version": "0.2", "sha256": "0y1lfjicyw0gs2r5nrqhkzyzkdbs6brdrzgc98k5fam79nj7kcbv", - "depends": ["r2r", "RANN", "Rcpp", "RcppEigen"] + "depends": ["RANN", "Rcpp", "RcppEigen", "r2r"] }, "CCP": { "name": "CCP", @@ -4025,19 +4079,19 @@ "name": "CCTpack", "version": "1.5.2", "sha256": "1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig", - "depends": ["MASS", "mvtnorm", "polycor", "psych", "R2jags", "rjags"] + "depends": ["MASS", "R2jags", "mvtnorm", "polycor", "psych", "rjags"] }, "CCWeights": { "name": "CCWeights", "version": "0.1.6", "sha256": "0in3pl1n48jal6f7kiyw60by11vbga8vr45x0wywghd7dz60ppfv", - "depends": ["bs4Dash", "dplyr", "DT", "fresh", "magrittr", "plotly", "readr", "readxl", "rmarkdown", "shiny"] + "depends": ["DT", "bs4Dash", "dplyr", "fresh", "magrittr", "plotly", "readr", "readxl", "rmarkdown", "shiny"] }, "CDCPLACES": { "name": "CDCPLACES", - "version": "1.1.5", - "sha256": "0q785ryilzqab730vg1ba2q738xxrasyzdq3ckc69dsxjp0cpn3s", - "depends": ["curl", "dplyr", "httr", "httr2", "jsonlite", "sf", "tidyr", "tigris", "usa"] + "version": "1.1.6", + "sha256": "0dhdh5k9wy62285mz2g02rl38r5nzpdhrbsa3l05z30ca459rh08", + "depends": ["curl", "dplyr", "httr", "httr2", "sf", "tidyr", "tigris", "usa", "yyjsonr", "zctaCrosswalk"] }, "CDFt": { "name": "CDFt", @@ -4049,19 +4103,19 @@ "name": "CDGHMM", "version": "0.1.0", "sha256": "18gf8p5h006h125dfygghxbkdbg26p77k632l2plhrpcgd3iszbw", - "depends": ["cluster", "MASS", "mvtnorm", "ramify"] + "depends": ["MASS", "cluster", "mvtnorm", "ramify"] }, "CDM": { "name": "CDM", "version": "8.2-6", "sha256": "1lcq3i5rlyqkc12c26kj0x4fm2gh1jsisp6kbf59y3hjdkiqajhl", - "depends": ["mvtnorm", "polycor", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "mvtnorm", "polycor"] }, "CDMConnector": { "name": "CDMConnector", - "version": "1.4.0", - "sha256": "1b129mm7qpfl57bf2spcr6wkq3ha2mxmacx17lnaln47a0n2nm5y", - "depends": ["checkmate", "cli", "DBI", "dbplyr", "dplyr", "fs", "generics", "glue", "jsonlite", "lifecycle", "omopgenerics", "purrr", "readr", "rlang", "stringi", "stringr", "tidyr", "tidyselect", "waldo", "withr"] + "version": "1.5.0", + "sha256": "1ma5hjldcnsw6h007s1yyzv5iix8z8vz5yfxx5g3z74kwlpa4jjy", + "depends": ["DBI", "checkmate", "cli", "dbplyr", "dplyr", "fs", "generics", "glue", "jsonlite", "lifecycle", "omopgenerics", "purrr", "readr", "rlang", "stringi", "stringr", "tidyr", "tidyselect", "waldo", "withr"] }, "CDSE": { "name": "CDSE", @@ -4085,13 +4139,13 @@ "name": "CDVineCopulaConditional", "version": "0.1.1", "sha256": "1wyy324vrwipdsq0p021bj1gdhyxg09g3dkw8wv5v6rfrrs84m9k", - "depends": ["combinat", "VineCopula"] + "depends": ["VineCopula", "combinat"] }, "CDatanet": { "name": "CDatanet", "version": "2.2.0", "sha256": "1qzfxz72zpxi48djqhypqlmajk6rx91m0i997vsr0zry0dp2zrzb", - "depends": ["ddpcr", "doParallel", "doRNG", "foreach", "Formula", "formula_tools", "Matrix", "matrixcalc", "Rcpp", "RcppArmadillo", "RcppDist", "RcppEigen", "RcppNumerical", "RcppProgress"] + "depends": ["Formula", "Matrix", "Rcpp", "RcppArmadillo", "RcppDist", "RcppEigen", "RcppNumerical", "RcppProgress", "ddpcr", "doParallel", "doRNG", "foreach", "formula_tools", "matrixcalc"] }, "CEC": { "name": "CEC", @@ -4109,13 +4163,13 @@ "name": "CEEMDANML", "version": "0.1.0", "sha256": "0hc5sx1zvxj3j5psgcgzhw6l9zrvbbsnpw6qr7ww82bjjr3wbi3c", - "depends": ["aTSA", "caret", "e1071", "earth", "fGarch", "FinTS", "forecast", "LSTS", "neuralnet", "pso", "Rlibeemd", "tseries"] + "depends": ["FinTS", "LSTS", "Rlibeemd", "aTSA", "caret", "e1071", "earth", "fGarch", "forecast", "neuralnet", "pso", "tseries"] }, "CEGO": { "name": "CEGO", "version": "2.4.3", "sha256": "0pr3mkygnwcaslf0z8np7vhf7y70l9xqbx61bp98my5gq8gfzcxg", - "depends": ["anticlust", "DEoptim", "fastmatch", "MASS", "Matrix", "ParamHelpers", "quadprog"] + "depends": ["DEoptim", "MASS", "Matrix", "ParamHelpers", "anticlust", "fastmatch", "quadprog"] }, "CEOdata": { "name": "CEOdata", @@ -4127,7 +4181,7 @@ "name": "CERFIT", "version": "0.1.0", "sha256": "1mhyn5iyvnqqx881jfvacyxaldvn5q9h1jpsfy14sgkdjf75274s", - "depends": ["CBPS", "glmnet", "partykit", "randomForest", "Rcpp", "RcppArmadillo", "twang"] + "depends": ["CBPS", "Rcpp", "RcppArmadillo", "glmnet", "partykit", "randomForest", "twang"] }, "CEoptim": { "name": "CEoptim", @@ -4145,7 +4199,7 @@ "name": "CFC", "version": "1.2.0", "sha256": "16abn3ydixb819qyyrs351d8v6qaaaz1gif0yfd8gdh7xnr2qzpy", - "depends": ["abind", "doParallel", "foreach", "Rcpp", "RcppArmadillo", "RcppProgress", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "abind", "doParallel", "foreach", "survival"] }, "CFF": { "name": "CFF", @@ -4155,9 +4209,9 @@ }, "CFO": { "name": "CFO", - "version": "1.2.1", - "sha256": "17qjjcyhfn2n9fkbc4dciscr35dnnvv15csh7yw738kzfvybvrvp", - "depends": ["dplyr", "ggplot2", "Iso", "survival"] + "version": "1.3.1", + "sha256": "0zm55sdj8z1lq5aar891pxrvww6dk42sz21i5ij2gk0gis820773", + "depends": ["Iso", "dplyr", "ggplot2", "pbapply", "survival"] }, "CFilt": { "name": "CFilt", @@ -4193,7 +4247,7 @@ "name": "CGNM", "version": "0.9.0", "sha256": "1m2cqwb8q2lirf09d5pmqjan4r1w8m9pkg2wzyr8jp7sg1dqaaw7", - "depends": ["ggplot2", "MASS", "shiny"] + "depends": ["MASS", "ggplot2", "shiny"] }, "CGP": { "name": "CGP", @@ -4263,9 +4317,9 @@ }, "CICA": { "name": "CICA", - "version": "1.0.2", - "sha256": "1z584rdmr5m8sqvymb12fv7i7gc6b9kj3ddl38j2qvjf668zw1dc", - "depends": ["htmltools", "ica", "magrittr", "mclust", "multiway", "neurobase", "oro_nifti", "plotly", "RNifti", "servr"] + "version": "1.1.1", + "sha256": "0kl6hg2vn8w6imvrimwscj2qpgjg3fbvcjv06ax17ilci87zahx6", + "depends": ["RNifti", "Rfast", "htmltools", "ica", "magrittr", "mclust", "multiway", "neurobase", "oro_nifti", "plotly", "servr"] }, "CICI": { "name": "CICI", @@ -4289,7 +4343,7 @@ "name": "CIMTx", "version": "1.2.0", "sha256": "1jx99vh620zqwp7p4bjcxa3n0kg6w6q88kklv9f9x44894mrd56a", - "depends": ["arm", "BART", "cowplot", "doParallel", "dplyr", "foreach", "ggplot2", "magrittr", "Matching", "metR", "mgcv", "nnet", "stringr", "SuperLearner", "tidyr", "tmle", "twang", "WeightIt"] + "depends": ["BART", "Matching", "SuperLearner", "WeightIt", "arm", "cowplot", "doParallel", "dplyr", "foreach", "ggplot2", "magrittr", "metR", "mgcv", "nnet", "stringr", "tidyr", "tmle", "twang"] }, "CINE": { "name": "CINE", @@ -4307,7 +4361,7 @@ "name": "CINNA", "version": "1.2.2", "sha256": "18dyv8llqjjc679l815ahhsq552n5vkcfj9vkv47y9v3zx1g52yl", - "depends": ["centiserve", "circlize", "corrplot", "dendextend", "factoextra", "FactoMineR", "GGally", "ggplot2", "igraph", "intergraph", "network", "pheatmap", "plyr", "Rtsne", "sna", "viridis"] + "depends": ["FactoMineR", "GGally", "Rtsne", "centiserve", "circlize", "corrplot", "dendextend", "factoextra", "ggplot2", "igraph", "intergraph", "network", "pheatmap", "plyr", "sna", "viridis"] }, "CINmetrics": { "name": "CINmetrics", @@ -4325,13 +4379,13 @@ "name": "CIS.DGLM", "version": "0.1.0", "sha256": "0c7jxfb8gaklf6p83152wb2nszm2p806p3n523xajf4ha368d3kq", - "depends": ["dglm", "dplyr", "ggplot2", "RColorBrewer"] + "depends": ["RColorBrewer", "dglm", "dplyr", "ggplot2"] }, "CITAN": { "name": "CITAN", "version": "2022.1.1", "sha256": "09m9f6s9y7ygbixcymg93vsrqz5jsjp968cjhxnj1v73hzalk168", - "depends": ["agop", "DBI", "RSQLite", "stringi"] + "depends": ["DBI", "RSQLite", "agop", "stringi"] }, "CITMIC": { "name": "CITMIC", @@ -4343,7 +4397,7 @@ "name": "CIfinder", "version": "2.0.0", "sha256": "1kgcf82ixv2pic31msxzzaapnas88skk033pifa0sip8pya1by4q", - "depends": ["boot", "kableExtra", "ratesci", "Rdpack"] + "depends": ["Rdpack", "boot", "kableExtra", "ratesci"] }, "CIplot": { "name": "CIplot", @@ -4373,18 +4427,18 @@ "name": "CKLRT", "version": "0.2.3", "sha256": "1d8sg3ncns3fpjaghz1h1z9nfrl31v09xijrzzsias8xjrpi191b", - "depends": ["MASS", "mgcv", "nlme", "Rcpp", "RcppEigen"] + "depends": ["MASS", "Rcpp", "RcppEigen", "mgcv", "nlme"] }, "CKMRpop": { "name": "CKMRpop", "version": "0.1.3", "sha256": "0d4sai2h2cfzh4hbg8yh7wqb459j948j3s0m218d3gcippm22jpb", - "depends": ["dplyr", "ggforce", "ggplot2", "ggraph", "igraph", "magrittr", "purrr", "Rcpp", "readr", "stringr", "tibble", "tidygraph", "tidyr", "vroom"] + "depends": ["Rcpp", "dplyr", "ggforce", "ggplot2", "ggraph", "igraph", "magrittr", "purrr", "readr", "stringr", "tibble", "tidygraph", "tidyr", "vroom"] }, "CLA": { "name": "CLA", - "version": "0.96-2", - "sha256": "0cfa7zm13bin8hx8ki20kaz8fvkwdaiyl0pjghhld8vr5d3289kq", + "version": "0.96-3", + "sha256": "1jrk6zr5x5kypa4zgwdhbnihxgi9bl34xmgqg7rlpsl2v53013mi", "depends": [] }, "CLAST": { @@ -4397,7 +4451,7 @@ "name": "CLME", "version": "2.0-12", "sha256": "161maq22r8wbd6c2dc8b47mh6991vc4iqmjr8g6yqb5gcwca8zhg", - "depends": ["isotone", "lme4", "MASS", "nlme", "openxlsx", "prettyR", "shiny", "stringr"] + "depends": ["MASS", "isotone", "lme4", "nlme", "openxlsx", "prettyR", "shiny", "stringr"] }, "CLONETv2": { "name": "CLONETv2", @@ -4415,13 +4469,13 @@ "name": "CLUSTShiny", "version": "0.1.0", "sha256": "19mh5g1ylvlab4xjxw7girxk9zkpxxczhbfijf11b592hbw0qxqk", - "depends": ["cluster", "dplyr", "klaR", "MASS", "psycho", "rmarkdown", "shiny"] + "depends": ["MASS", "cluster", "dplyr", "klaR", "psycho", "rmarkdown", "shiny"] }, "CLVTools": { "name": "CLVTools", - "version": "0.10.0", - "sha256": "0l6jp6h2c0gcav3mnw9rz1wba7va2261pjjw5r3hqjjg8jrhfp0r", - "depends": ["data_table", "Formula", "ggplot2", "lubridate", "MASS", "Matrix", "optimx", "Rcpp", "RcppArmadillo", "RcppGSL", "testthat"] + "version": "0.11.0", + "sha256": "102r2p8y9pr03gj3s7pn0chy56300gxffmnadm0qfklwl0mlv63g", + "depends": ["Formula", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppGSL", "data_table", "digest", "ggplot2", "lubridate", "numDeriv", "optimx", "testthat"] }, "CLimd": { "name": "CLimd", @@ -4447,11 +4501,17 @@ "sha256": "1n0kf6mby71zccymdl75yw8rafkl9y7kn9j2pipqf15zvbqdl33j", "depends": ["MASS"] }, + "CMGFM": { + "name": "CMGFM", + "version": "1.1", + "sha256": "0km485aajgwb0jyp7fvgz82dw22la659js4d4hg2zbkn562pz4m3", + "depends": ["GFM", "MASS", "Rcpp", "RcppArmadillo", "irlba"] + }, "CMHNPA": { "name": "CMHNPA", "version": "1.1.1", "sha256": "08pjnc2l2ip8x9hbgsp74alrk520an5kq0lxwqh33smfw1frw4ql", - "depends": ["car", "MASS"] + "depends": ["MASS", "car"] }, "CMLS": { "name": "CMLS", @@ -4469,7 +4529,7 @@ "name": "CMShiny", "version": "0.1.0", "sha256": "0ciis3930yhn4dmazsg2yp7wi9hdfj5slr032x8qfllxis7m4k0w", - "depends": ["caret", "e1071", "epitools", "Matrix", "rmarkdown", "shiny", "shinyMatrix"] + "depends": ["Matrix", "caret", "e1071", "epitools", "rmarkdown", "shiny", "shinyMatrix"] }, "CMapViz": { "name": "CMapViz", @@ -4505,7 +4565,7 @@ "name": "CNLTtsa", "version": "0.1-2", "sha256": "1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r", - "depends": ["adlift", "CNLTreg", "fields", "nlt"] + "depends": ["CNLTreg", "adlift", "fields", "nlt"] }, "CNPS": { "name": "CNPS", @@ -4517,13 +4577,13 @@ "name": "CNVRG", "version": "1.0.0", "sha256": "0xr2c5yc9g8hqw5dy5k2y0pm54sdrrbafsc3cpafpwaf803vdrbk", - "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "tibble", "vegan"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools", "tibble", "vegan"] }, "CNVScope": { "name": "CNVScope", "version": "3.7.2", "sha256": "03jkivg9jr2dpkf739cba3dsjf56gwvcpq3nqhp42kmmgn50rpiq", - "depends": ["biomaRt", "data_table", "doParallel", "dplyr", "foreach", "GenomicInteractions", "ggplot2", "Hmisc", "jointseg", "magrittr", "Matrix", "matrixStats", "OpenImageR", "plyr", "RCurl", "reshape2", "rtracklayer", "shiny", "stringr", "tidyr"] + "depends": ["GenomicInteractions", "Hmisc", "Matrix", "OpenImageR", "RCurl", "biomaRt", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "jointseg", "magrittr", "matrixStats", "plyr", "reshape2", "rtracklayer", "shiny", "stringr", "tidyr"] }, "CNprep": { "name": "CNprep", @@ -4535,7 +4595,7 @@ "name": "COAP", "version": "1.2", "sha256": "1772aiy9ywvgb1k9qn41l00qhsmhxkx53mdl16ggcwq0c3gdm8ly", - "depends": ["irlba", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "irlba"] }, "COCONUT": { "name": "COCONUT", @@ -4553,7 +4613,7 @@ "name": "COLP", "version": "1.0.0", "sha256": "0259s058rn7fyprma5frx7sdjv4qk9hxijpi9xh7qyz5jzzsi660", - "depends": ["combinat", "MASS"] + "depends": ["MASS", "combinat"] }, "COMBAT": { "name": "COMBAT", @@ -4563,21 +4623,27 @@ }, "COMBO": { "name": "COMBO", - "version": "1.0.0", - "sha256": "12k5lchxdxql3q7si05404f8dc26xjxqf95mq5jykgp9chgl6i5w", - "depends": ["dplyr", "Matrix", "rjags", "SAMBA", "tidyr", "turboEM"] + "version": "1.1.0", + "sha256": "0073cwbggmqgm13nmg8b6lq3gb5qid73nhh0jb0ldmabwn1bw3hk", + "depends": ["Matrix", "SAMBA", "dplyr", "rjags", "tidyr", "turboEM"] }, "COMIX": { "name": "COMIX", "version": "1.0.0", "sha256": "0dhc3zb8jkfq8b9vj8m2a9jbd9fc7xxvhz16l8xhz9v5iffgk6hh", - "depends": ["coda", "dplyr", "ggplot2", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppNumerical", "rlang", "stringr", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "RcppNumerical", "coda", "dplyr", "ggplot2", "rlang", "stringr", "tidyr"] + }, + "COMMA": { + "name": "COMMA", + "version": "1.0.0", + "sha256": "1yaac6kgx3912l8iac4ybhm9drs7hy5x4wxiyc4w35clkg6r76vc", + "depends": ["Matrix", "turboEM"] }, "COMPoissonReg": { "name": "COMPoissonReg", "version": "0.8.1", "sha256": "0a03v9b3mv214y2ky94z8y363x6b97a68kvypvan56m0mg0zzq3d", - "depends": ["numDeriv", "Rcpp"] + "depends": ["Rcpp", "numDeriv"] }, "CONCUR": { "name": "CONCUR", @@ -4619,13 +4685,13 @@ "name": "COVID19", "version": "3.0.3", "sha256": "0idvqsqdsjm2dn7iipr0mh0xlgxfwavajxbz08wigngcaic192iy", - "depends": ["data_table", "R_utils"] + "depends": ["R_utils", "data_table"] }, "COVIDIBGE": { "name": "COVIDIBGE", "version": "0.2.2", "sha256": "1clbqpaz9awkhsglwbv84j277hh92141sla67dlzrs6j5iv4zkcs", - "depends": ["dplyr", "httr", "magrittr", "projmgr", "RCurl", "readr", "readxl", "survey", "tibble", "timeDate"] + "depends": ["RCurl", "dplyr", "httr", "magrittr", "projmgr", "readr", "readxl", "survey", "tibble", "timeDate"] }, "CP": { "name": "CP", @@ -4637,19 +4703,25 @@ "name": "CPAT", "version": "0.1.0", "sha256": "0zygncwww3cazwmx06bhzq0g41xcqfpw307azdhygc8jmcy6qj71", - "depends": ["purrr", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "purrr"] }, "CPBayes": { "name": "CPBayes", "version": "1.1.0", "sha256": "1kw0r8spqm0s7cb3w5gplw67mhfmcbbf3ligngbary77ghkzirnb", - "depends": ["forestplot", "MASS", "mvtnorm", "purrr"] + "depends": ["MASS", "forestplot", "mvtnorm", "purrr"] }, "CPC": { "name": "CPC", "version": "2.6.0", "sha256": "0n1vsn7b1rllbsad2bshhi0c6pz7zqz6bmcc176qh50hm4hgp99r", - "depends": ["cluster", "dbscan", "Rfast"] + "depends": ["Rfast", "cluster", "dbscan"] + }, + "CPCAT": { + "name": "CPCAT", + "version": "1.0.0", + "sha256": "0vi98pxpmrrkz15rn1b4kcs7x1fbkili10qw2p4ins7lrjvqjvdp", + "depends": [] }, "CPE": { "name": "CPE", @@ -4681,6 +4753,12 @@ "sha256": "1kdf43pnavjbmxkvrj78fiwl0ykln9x9ck8pcivhj9q5rsfbhbh4", "depends": ["ineq", "kappalab", "mc2d"] }, + "CPoptim": { + "name": "CPoptim", + "version": "0.1.0", + "sha256": "1i0rlv7k6mhh71hya5nc2xbk7061jghgcnlgdwiqb3zag709pf8c", + "depends": [] + }, "CPsurv": { "name": "CPsurv", "version": "1.0.0", @@ -4691,7 +4769,7 @@ "name": "CR2", "version": "0.2.1", "sha256": "1j9wkpfr6bk07sj1swcjih12qz0cin811k69ihizsi4190m5f49k", - "depends": ["broom", "dplyr", "generics", "lme4", "magrittr", "Matrix", "nlme", "performance", "tibble"] + "depends": ["Matrix", "broom", "dplyr", "generics", "lme4", "magrittr", "nlme", "performance", "tibble"] }, "CRABS": { "name": "CRABS", @@ -4703,13 +4781,13 @@ "name": "CRANsearcher", "version": "1.0.0", "sha256": "09gw1s28gb0l2cn4w3asl6zlr7wfacxwafbdrayajwckyfkjl5dl", - "depends": ["curl", "dplyr", "DT", "lubridate", "miniUI", "shiny", "shinyjs", "stringr"] + "depends": ["DT", "curl", "dplyr", "lubridate", "miniUI", "shiny", "shinyjs", "stringr"] }, "CRE": { "name": "CRE", "version": "0.2.6", "sha256": "19clbz7x4sf8jxj0s77ym9k1k5hgd64myvvn5f3m6pxpnx7hskhl", - "depends": ["arules", "bartCause", "data_table", "gbm", "ggplot2", "glmnet", "logger", "magrittr", "MASS", "randomForest", "RRF", "stabs", "stringr", "SuperLearner", "xgboost", "xtable"] + "depends": ["MASS", "RRF", "SuperLearner", "arules", "bartCause", "data_table", "gbm", "ggplot2", "glmnet", "logger", "magrittr", "randomForest", "stabs", "stringr", "xgboost", "xtable"] }, "CREAM": { "name": "CREAM", @@ -4739,13 +4817,13 @@ "name": "CRMetrics", "version": "0.3.0", "sha256": "1abrbkhhn5s3h4dam2pgmvqpqw0bpqzhj0521p7v48gsyfg224bw", - "depends": ["cowplot", "dplyr", "ggbeeswarm", "ggplot2", "ggpmisc", "ggpubr", "ggrepel", "magrittr", "Matrix", "R6", "scales", "sccore", "sparseMatrixStats", "tibble", "tidyr"] + "depends": ["Matrix", "R6", "cowplot", "dplyr", "ggbeeswarm", "ggplot2", "ggpmisc", "ggpubr", "ggrepel", "magrittr", "scales", "sccore", "sparseMatrixStats", "tibble", "tidyr"] }, "CRTConjoint": { "name": "CRTConjoint", "version": "0.1.0", "sha256": "1lp3rxjd8pilin6kvl49vm11bjd6dzhalmwf99j3jsiiavxc6baq", - "depends": ["doSNOW", "foreach", "Rcpp", "snow"] + "depends": ["Rcpp", "doSNOW", "foreach", "snow"] }, "CRTSize": { "name": "CRTSize", @@ -4757,13 +4835,13 @@ "name": "CRTgeeDR", "version": "2.0.1", "sha256": "0sqsgs8qbc6gvzr3l2r8y83nbhz12q3jf2cjlb2xgif15r7sbnxx", - "depends": ["ggplot2", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "ggplot2"] }, "CRTspat": { "name": "CRTspat", - "version": "1.2.0", - "sha256": "1qhb4kzdq588hvd05dz9np4zhdbbp77d6ihjkkn1x1niz61n5bmp", - "depends": ["dplyr", "geepack", "ggplot2", "jagsUI", "lme4", "magrittr", "MASS", "Matrix", "OOR", "sf", "spatstat_geom", "spatstat_random", "tidyr", "TSP"] + "version": "1.3.0", + "sha256": "0n60i8fx28mfgmzb33jz7nngrdhx8sj5lv3jl49h0xd80x7d9csb", + "depends": ["MASS", "Matrix", "OOR", "TSP", "dplyr", "geepack", "ggplot2", "jagsUI", "lme4", "magrittr", "sf", "spatstat_geom", "spatstat_random", "tidyr"] }, "CRWRM": { "name": "CRWRM", @@ -4797,27 +4875,27 @@ }, "CSHShydRology": { "name": "CSHShydRology", - "version": "1.4.0", - "sha256": "06hdqdzvfpfn4r6x1d2m24lz2w5sj20fr7d791zqzd16mp767qcc", - "depends": ["circular", "dplyr", "fields", "ggplot2", "ggspatial", "httr", "Kendall", "lubridate", "magrittr", "OpenStreetMap", "plotrix", "raster", "rnaturalearth", "sf", "stringr", "tidyhydat", "timeDate", "whitebox"] + "version": "1.4.2", + "sha256": "0f90k32ngfkb7cp9s79h50qmxxxggkkm8a72diz9981wz6n3zjaa", + "depends": ["Kendall", "circular", "dplyr", "fields", "ggplot2", "ggspatial", "httr", "lubridate", "magrittr", "plotrix", "raster", "sf", "stringr", "tidyhydat", "timeDate", "whitebox"] }, "CSIndicators": { "name": "CSIndicators", "version": "1.1.1", "sha256": "062v23vm2yz0dr2s0d6p7iwccdkgywn8k9gfp4jc8kr56ff3hvvr", - "depends": ["ClimProjDiags", "CSTools", "lmom", "lmomco", "multiApply", "s2dv", "SPEI", "zoo"] + "depends": ["CSTools", "ClimProjDiags", "SPEI", "lmom", "lmomco", "multiApply", "s2dv", "zoo"] }, "CSMES": { "name": "CSMES", "version": "1.0.1", "sha256": "1p8wsl9h1f44a7kkj660h1k1v26pp6q1h13rw9l6pikniwdks84c", - "depends": ["caTools", "data_table", "mco", "ROCR", "rpart", "zoo"] + "depends": ["ROCR", "caTools", "data_table", "mco", "rpart", "zoo"] }, "CSTools": { "name": "CSTools", "version": "5.2.0", "sha256": "0yyzc76x45pf3r84jdpxj2zplibf6zb1q3gb8jv5ncpcw3s9i3c9", - "depends": ["abind", "ClimProjDiags", "data_table", "easyNCDF", "easyVerification", "ggplot2", "lubridate", "maps", "multiApply", "ncdf4", "plyr", "qmap", "rainfarmr", "RColorBrewer", "reshape2", "s2dv", "scales", "startR", "verification"] + "depends": ["ClimProjDiags", "RColorBrewer", "abind", "data_table", "easyNCDF", "easyVerification", "ggplot2", "lubridate", "maps", "multiApply", "ncdf4", "plyr", "qmap", "rainfarmr", "reshape2", "s2dv", "scales", "startR", "verification"] }, "CSclone": { "name": "CSclone", @@ -4839,8 +4917,8 @@ }, "CTD": { "name": "CTD", - "version": "1.2", - "sha256": "1zigym3cy5p3wgw2b2rji72qgy4fmpcscc9281x5m5qndsl5gyy5", + "version": "1.3", + "sha256": "0wvz1b7dyypamaxr1zp836sxj2a9xi8yp8lnbbsjp8djpzvcv7gm", "depends": ["igraph"] }, "CTM": { @@ -4895,7 +4973,7 @@ "name": "CUFF", "version": "1.9", "sha256": "1fhxqnymcam845h8jlwp4al68rm9ajllmpnmarbh48c0vhcziaj8", - "depends": ["clipr", "dplyr", "DT", "haven", "lmerTest", "nlme", "openxlsx", "xtable"] + "depends": ["DT", "clipr", "dplyr", "haven", "lmerTest", "nlme", "openxlsx", "xtable"] }, "CUMP": { "name": "CUMP", @@ -4925,7 +5003,7 @@ "name": "CVST", "version": "0.2-3", "sha256": "0bgk0d6w3dyhb5s30idnp6jpb3m8wf3b79wqlg127wwm0cird8pg", - "depends": ["kernlab", "Matrix"] + "depends": ["Matrix", "kernlab"] }, "CVThresh": { "name": "CVThresh", @@ -4935,9 +5013,9 @@ }, "CVXR": { "name": "CVXR", - "version": "1.0-13", - "sha256": "0nl7hc7scc6grn7c3mbnn0r65pd2yd27gvs0d2xh8ban19smr2c1", - "depends": ["bit64", "ECOSolveR", "gmp", "Matrix", "osqp", "R6", "Rcpp", "RcppEigen", "Rmpfr", "scs"] + "version": "1.0-14", + "sha256": "1nvwym5fwkyqkw8dpar571kr5695w7yrih6w9vnhswikp717q0jd", + "depends": ["ECOSolveR", "Matrix", "R6", "Rcpp", "RcppEigen", "Rmpfr", "bit64", "clarabel", "gmp", "osqp", "scs"] }, "CVglasso": { "name": "CVglasso", @@ -4953,9 +5031,9 @@ }, "CWT": { "name": "CWT", - "version": "0.1.1", - "sha256": "1afa94694fyqm947ncp96sxf7wyn095a66hyw8xharb30jf1b6q7", - "depends": ["data_table", "Rcpp", "RcppArmadillo"] + "version": "0.2.1", + "sha256": "0xwvzbz81j5mqkzhb0qc1srm5k9ygnl81nbq5xp9rc4yfa4yw2wq", + "depends": ["Rcpp", "RcppArmadillo", "data_table"] }, "CaDENCE": { "name": "CaDENCE", @@ -4965,9 +5043,9 @@ }, "CaPO4Sim": { "name": "CaPO4Sim", - "version": "0.2.0", - "sha256": "0s4mqlas41ll656hj1imzqydgwgw002d469z01fjdcs4d6daljw6", - "depends": ["DT", "htmltools", "magrittr", "plotly", "purrr", "rintrojs", "shiny", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyjqui", "shinyjs", "shinyWidgets", "visNetwork"] + "version": "0.2.1", + "sha256": "1dnaskasjzhsvnxqfgww2nwy8ccciilgn1kd7jjj3mx9ksc2wnhr", + "depends": ["DT", "magrittr", "plotly", "purrr", "rintrojs", "shiny", "shinyWidgets", "shinycssloaders", "shinyjqui", "shinyjs", "visNetwork"] }, "Cairo": { "name": "Cairo", @@ -4985,7 +5063,7 @@ "name": "CalcThemAll.PRM", "version": "1.1.1", "sha256": "1jm2b4sy1vhzsr2hhl219h65yzx30n7pl0h3w1v3fmfd0hamd1s8", - "depends": ["dplyr", "DT", "lubridate", "magrittr", "MASS", "plotly", "VGAM", "zoo"] + "depends": ["DT", "MASS", "VGAM", "dplyr", "lubridate", "magrittr", "plotly", "zoo"] }, "Calculator_LR_FNs": { "name": "Calculator.LR.FNs", @@ -5007,15 +5085,15 @@ }, "CalibrationCurves": { "name": "CalibrationCurves", - "version": "2.0.1", - "sha256": "0clpmvkh77sjg7f66fgsc3crrimqslw1b8ymv6bq66yc5yp6kqfh", - "depends": ["bookdown", "ggplot2", "Hmisc", "rms", "survival"] + "version": "2.0.3", + "sha256": "102kpgjfasyyrfpxrv1mzrl40fhh6blml6lbiha4s6p0fav7dj8n", + "depends": ["Hmisc", "bookdown", "ggplot2", "rms", "rstudioapi", "survival"] }, "CamelUp": { "name": "CamelUp", "version": "2.0.3", "sha256": "1d3ywb4bxnn149api6lqry8q9lasng79hzka9ndr5cv38pkbvva9", - "depends": ["data_table", "dplyr", "ggplot2", "magrittr", "Rcpp", "shiny"] + "depends": ["Rcpp", "data_table", "dplyr", "ggplot2", "magrittr", "shiny"] }, "CancerEvolutionVisualization": { "name": "CancerEvolutionVisualization", @@ -5033,7 +5111,7 @@ "name": "Canek", "version": "0.2.5", "sha256": "1irzdhqgzn6kz79f80ri1iv8zlg8ik95bqcllj14ycma1c1mwzsy", - "depends": ["bluster", "FNN", "fpc", "igraph", "irlba", "matrixStats", "numbers"] + "depends": ["FNN", "bluster", "fpc", "igraph", "irlba", "matrixStats", "numbers"] }, "Canopy": { "name": "Canopy", @@ -5057,7 +5135,7 @@ "name": "Cascade", "version": "2.1", "sha256": "1hfbv9129rnrjqspjd8wnhw0qrp1m142bixlwddzr6j2sg7r8s20", - "depends": ["abind", "animation", "cluster", "igraph", "lars", "lattice", "limma", "magic", "nnls", "survival", "tnet", "VGAM"] + "depends": ["VGAM", "abind", "animation", "cluster", "igraph", "lars", "lattice", "limma", "magic", "nnls", "survival", "tnet"] }, "CascadeData": { "name": "CascadeData", @@ -5069,7 +5147,7 @@ "name": "CaseBasedReasoning", "version": "0.3", "sha256": "0ayckjq53lmdm429bvb4fjsbyy7cp3jgds30swmzq9qf75bnaa55", - "depends": ["cowplot", "dplyr", "ggplot2", "pryr", "purrr", "R6", "ranger", "Rcpp", "RcppArmadillo", "RcppParallel", "rms", "survival", "tidyr"] + "depends": ["R6", "Rcpp", "RcppArmadillo", "RcppParallel", "cowplot", "dplyr", "ggplot2", "pryr", "purrr", "ranger", "rms", "survival", "tidyr"] }, "CaseCohortCoxSurvival": { "name": "CaseCohortCoxSurvival", @@ -5093,7 +5171,7 @@ "name": "CatEncoders", "version": "0.1.1", "sha256": "1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl", - "depends": ["data_table", "Matrix"] + "depends": ["Matrix", "data_table"] }, "CatPredi": { "name": "CatPredi", @@ -5123,7 +5201,7 @@ "name": "CausCor", "version": "0.1.3", "sha256": "0hqzzy6wmxws90q4p7d2k0781zmkqq344l352zj9lcqh23ci4p8i", - "depends": ["cowplot", "dplyr", "ggplot2", "magrittr", "WriteXLS"] + "depends": ["WriteXLS", "cowplot", "dplyr", "ggplot2", "magrittr"] }, "CausalGAM": { "name": "CausalGAM", @@ -5133,27 +5211,27 @@ }, "CausalGPS": { "name": "CausalGPS", - "version": "0.4.2", - "sha256": "146nszscdlm59ba7j90bbhj689x2hba7w2ywr2kpd5x5bhw8jagp", - "depends": ["cowplot", "data_table", "Ecume", "gam", "ggplot2", "gnm", "KernSmooth", "locpol", "logger", "MASS", "polycor", "Rcpp", "rlang", "SuperLearner", "wCorr", "xgboost"] + "version": "0.5.0", + "sha256": "0hb010hsqn3ahsp3kqmn4r1qa3y3znz7kc7j8pv9zdx2cpyrnmi4", + "depends": ["Ecume", "KernSmooth", "MASS", "Rcpp", "SuperLearner", "cowplot", "data_table", "gam", "ggplot2", "gnm", "locpol", "logger", "polycor", "rlang", "wCorr", "xgboost"] }, "CausalImpact": { "name": "CausalImpact", "version": "1.3.0", "sha256": "0h3sh35962vdph72svfdvk6b1gl7wnj2kfkkpcjldbiszlfxp7wx", - "depends": ["assertthat", "Boom", "bsts", "ggplot2", "zoo"] + "depends": ["Boom", "assertthat", "bsts", "ggplot2", "zoo"] }, "CausalMBSTS": { "name": "CausalMBSTS", "version": "0.1.1", "sha256": "1mjw2zyddkci6vkbyz3d94l5z1aj3rc2w6lag5igbfv4q0n5qcrp", - "depends": ["CholWishart", "forecast", "KFAS", "MASS", "Matrix", "MixMatrix"] + "depends": ["CholWishart", "KFAS", "MASS", "Matrix", "MixMatrix", "forecast"] }, "CausalMetaR": { "name": "CausalMetaR", "version": "0.1.2", "sha256": "03y973ph52qxh9kyiybrvgrk5b1kd6i1lynkmmmv40vbnx59fs7y", - "depends": ["glmnet", "metafor", "nnet", "progress", "SuperLearner"] + "depends": ["SuperLearner", "glmnet", "metafor", "nnet", "progress"] }, "CausalModels": { "name": "CausalModels", @@ -5165,7 +5243,7 @@ "name": "CausalQueries", "version": "1.1.1", "sha256": "0bivanhgimfnw1dn16ggyj6yjjq1j3jv05xwixqcg96zdnw5va4z", - "depends": ["BH", "dagitty", "dirmult", "dplyr", "ggdag", "ggplot2", "knitr", "latex2exp", "lifecycle", "Rcpp", "RcppArmadillo", "RcppEigen", "rlang", "rstan", "rstantools", "StanHeaders", "stringr"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "RcppEigen", "StanHeaders", "dagitty", "dirmult", "dplyr", "ggdag", "ggplot2", "knitr", "latex2exp", "lifecycle", "rlang", "rstan", "rstantools", "stringr"] }, "CautiousLearning": { "name": "CautiousLearning", @@ -5177,7 +5255,7 @@ "name": "CePa", "version": "0.8.0", "sha256": "1wjm6nyjaz3z0g2dxk1k82va86qxx2xsgx02y9ipyzf1ldxclm1s", - "depends": ["graph", "igraph", "Rgraphviz"] + "depends": ["Rgraphviz", "graph", "igraph"] }, "CeRNASeek": { "name": "CeRNASeek", @@ -5189,19 +5267,19 @@ "name": "CenBAR", "version": "0.1.1", "sha256": "1k8ycm2rzwadr5bg6m0ay81c5v4wjg04yigch6a1w7g75gw01q50", - "depends": ["cvTools", "foreach", "glmnet", "MASS", "mvtnorm", "survival"] + "depends": ["MASS", "cvTools", "foreach", "glmnet", "mvtnorm", "survival"] }, "CensMFM": { "name": "CensMFM", "version": "3.1", "sha256": "00z425r6ijs8zgmw0srcia9v90m57y2aq8zrlspgc5qf8kzxq1iv", - "depends": ["ggplot2", "gridExtra", "MomTrunc", "mvtnorm", "tlrmvnmvt"] + "depends": ["MomTrunc", "ggplot2", "gridExtra", "mvtnorm", "tlrmvnmvt"] }, "CensSpatial": { "name": "CensSpatial", "version": "3.6", "sha256": "10jgr9zvdvm8fgh0llfsxjkd5f565i1qh00zrqxz55is7p4r3h35", - "depends": ["geoR", "lattice", "moments", "msm", "mvtnorm", "numDeriv", "optimx", "psych", "raster", "Rcpp", "tlrmvnmvt", "tmvtnorm"] + "depends": ["Rcpp", "geoR", "lattice", "moments", "msm", "mvtnorm", "numDeriv", "optimx", "psych", "raster", "tlrmvnmvt", "tmvtnorm"] }, "Census2016": { "name": "Census2016", @@ -5211,8 +5289,8 @@ }, "CerioliOutlierDetection": { "name": "CerioliOutlierDetection", - "version": "1.1.13", - "sha256": "1m1mj5cf0sfdfci05ayc86wfx3cj12dfn98pi7cqxcf5nbn3h3n5", + "version": "1.1.15", + "sha256": "1ngwq99q5xi3n06df36dhbgdpjdldfzsi70vhplwlha9cihd71k2", "depends": ["robustbase"] }, "Certara_NLME8": { @@ -5225,13 +5303,19 @@ "name": "Certara.R", "version": "1.1.0", "sha256": "07k7dj37zywkfbrx85gnl6cvc0a0n1xyvmac0lg74nzqb6qb3i1z", - "depends": ["batchtools", "data_table", "dplyr", "DT", "ggplot2", "htmltools", "jsonlite", "magrittr", "plotly", "remotes", "reshape", "rlang", "shiny", "shinyjqui", "shinyjs", "shinymaterial", "shinyWidgets", "sortable", "ssh", "xml2"] + "depends": ["DT", "batchtools", "data_table", "dplyr", "ggplot2", "htmltools", "jsonlite", "magrittr", "plotly", "remotes", "reshape", "rlang", "shiny", "shinyWidgets", "shinyjqui", "shinyjs", "shinymaterial", "sortable", "ssh", "xml2"] }, "ChainLadder": { "name": "ChainLadder", - "version": "0.2.18", - "sha256": "0q0ycwswi1hxcv1apq40kzb91sgzbwb84nynd84750r449hbwrif", - "depends": ["actuar", "cplm", "ggplot2", "lattice", "MASS", "Matrix", "statmod", "systemfit", "tweedie"] + "version": "0.2.19", + "sha256": "0i5mif26m4kdii7rx7dvsk98d53qyrzdd2x7x9idqsrs7cl5srm9", + "depends": ["MASS", "Matrix", "actuar", "cplm", "ggplot2", "lattice", "statmod", "systemfit", "tweedie"] + }, + "ChangePointTaylor": { + "name": "ChangePointTaylor", + "version": "0.3", + "sha256": "17gyiwvg41zc31kmhv55037dm416vwlkrmrwswilbqksqq1fzk06", + "depends": ["Rcpp", "dplyr", "magrittr", "purrr", "rlang", "tidyr"] }, "ChangepointTesting": { "name": "ChangepointTesting", @@ -5261,7 +5345,7 @@ "name": "ChaosGame", "version": "1.4", "sha256": "06d2jm8b3l242yqgbfsr1cclph0l8xdxqfq7xvbghsavzk3lf367", - "depends": ["colorRamps", "ggplot2", "gridExtra", "plot3D", "RColorBrewer", "rgl"] + "depends": ["RColorBrewer", "colorRamps", "ggplot2", "gridExtra", "plot3D", "rgl"] }, "CheckDigit": { "name": "CheckDigit", @@ -5351,19 +5435,19 @@ "name": "CircSpaceTime", "version": "0.9.0", "sha256": "0dplgm5x4c1xxnv6062n643mn5zh0najw3f41pv2qafc1lil4wx8", - "depends": ["circular", "coda", "ggplot2", "Rcpp", "RcppArmadillo", "RInside"] + "depends": ["RInside", "Rcpp", "RcppArmadillo", "circular", "coda", "ggplot2"] }, "CircStats": { "name": "CircStats", "version": "0.2-6", "sha256": "07bg4zrs2iqh0pmi44pybi8hlvnxwcaa5zpg85rmf55kflxxkzlf", - "depends": ["boot", "MASS"] + "depends": ["MASS", "boot"] }, "CirceR": { "name": "CirceR", "version": "1.3.3", "sha256": "19pkj9qg6sfyxqvlwssfyr91024arbg74pl332g19917538n346q", - "depends": ["rJava", "RJSONIO"] + "depends": ["RJSONIO", "rJava"] }, "CirclesIntersections": { "name": "CirclesIntersections", @@ -5409,8 +5493,8 @@ }, "ClassComparison": { "name": "ClassComparison", - "version": "3.1.8", - "sha256": "0fd5s4697pvj295fzvvn5mislf42wfzrcvks17v98388rph586gl", + "version": "3.3.2", + "sha256": "0lyc437cmf5yv6ikfcvqdi21z8f2pa60z0czf0cig1w1n65x3lw1", "depends": ["Biobase", "oompaBase"] }, "ClassDiscovery": { @@ -5447,7 +5531,7 @@ "name": "ClickHouseHTTP", "version": "0.3.3", "sha256": "0k8rl7vf4dd2jp8xk03v007mrmjz5w4lbgagmsylv73lm35485zh", - "depends": ["arrow", "data_table", "DBI", "httr", "jsonlite"] + "depends": ["DBI", "arrow", "data_table", "httr", "jsonlite"] }, "CliftLRD": { "name": "CliftLRD", @@ -5465,24 +5549,24 @@ "name": "ClimInd", "version": "0.1-3", "sha256": "0n5kd001nkpks16c3msvn2qvzyrjawa2rqwh8zph2qr5hgpwcpg7", - "depends": ["chron", "SPEI", "weathermetrics"] + "depends": ["SPEI", "chron", "weathermetrics"] }, "ClimMobTools": { "name": "ClimMobTools", "version": "1.2", "sha256": "1kx1hkyn96bhw237hvzrkr1hc8nf02p90lz9gg0rzcjx0zhks4s7", - "depends": ["httr", "jsonlite", "lpSolve", "Matrix", "RSpectra"] + "depends": ["Matrix", "RSpectra", "httr", "jsonlite", "lpSolve"] }, "ClimProjDiags": { "name": "ClimProjDiags", "version": "0.3.3", "sha256": "039rnjpsbq90x6h9snz9iy37bwhapcmw9v98ngh82bsh19h8hwb1", - "depends": ["multiApply", "PCICt"] + "depends": ["PCICt", "multiApply"] }, "ClinSigMeasures": { "name": "ClinSigMeasures", - "version": "1.1", - "sha256": "0dm2shknf83d6wmmjqly1493g30qm68sizj2n5jcc8gwi3xfcs9z", + "version": "1.2", + "sha256": "0vyn1j4qfxgh65jrq7wmm8nfw78vqllmrsdbzspl7hgf5zh477k1", "depends": [] }, "ClinicalTrialSummary": { @@ -5501,7 +5585,7 @@ "name": "CliquePercolation", "version": "0.4.0", "sha256": "17m8pj8wg2ngzip1ag3jm5fqi083ilrsi0rvpcg5jmqflwlka8h3", - "depends": ["colorspace", "igraph", "lessR", "magrittr", "Matrix", "ohenery", "pbapply", "Polychrome", "qgraph"] + "depends": ["Matrix", "Polychrome", "colorspace", "igraph", "lessR", "magrittr", "ohenery", "pbapply", "qgraph"] }, "CloneSeeker": { "name": "CloneSeeker", @@ -5513,7 +5597,7 @@ "name": "CluMP", "version": "0.8.1", "sha256": "1vpxl2rcknqx32b94b48iirkh7r7cdri9mcljrw29gsbvhrfc46k", - "depends": ["amap", "data_table", "dplyr", "ggplot2", "MASS", "NbClust", "rlang", "tableone"] + "depends": ["MASS", "NbClust", "amap", "data_table", "dplyr", "ggplot2", "rlang", "tableone"] }, "ClueR": { "name": "ClueR", @@ -5523,27 +5607,27 @@ }, "ClusBoot": { "name": "ClusBoot", - "version": "1.2.1", - "sha256": "03xch4s8xlvl17vbpm3jk0a6faa57hq0amyg91d9kjr4d6bb4km1", + "version": "1.2.2", + "sha256": "08b3mw4r20z6d6d7w0rmzsz3f11icpzmca5fv7p1mk1m0l1nckfw", "depends": [] }, "ClusPred": { "name": "ClusPred", "version": "1.1.0", "sha256": "12pm5vkfxpaincv9ajid0p07l0mjc2kfqqfg0ls2pcxmmkh8wwb4", - "depends": ["ald", "ALDqr", "quantreg", "Rcpp", "RcppArmadillo", "VGAM"] + "depends": ["ALDqr", "Rcpp", "RcppArmadillo", "VGAM", "ald", "quantreg"] }, "ClusROC": { "name": "ClusROC", "version": "1.0.2", "sha256": "055ppcnzwkapnyf9xvld4bvkccwf494gqcb2qq0vnsa8n6bz5k46", - "depends": ["doParallel", "ellipse", "foreach", "ggplot2", "ggpubr", "iterators", "nlme", "numDeriv", "Rcpp", "RcppArmadillo", "rgl"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "ellipse", "foreach", "ggplot2", "ggpubr", "iterators", "nlme", "numDeriv", "rgl"] }, "ClusTCR2": { "name": "ClusTCR2", "version": "1.7.3.01", "sha256": "1l54x7b9pkkmrdhry41qikyhhnsr2s669jdqmviskjljk9wyyyqi", - "depends": ["DescTools", "ggplot2", "ggseqlogo", "network", "plyr", "RColorBrewer", "scales", "sna", "stringr", "VLF"] + "depends": ["DescTools", "RColorBrewer", "VLF", "ggplot2", "ggseqlogo", "network", "plyr", "scales", "sna", "stringr"] }, "ClusTorus": { "name": "ClusTorus", @@ -5555,19 +5639,19 @@ "name": "ClusVis", "version": "1.2.0", "sha256": "06yckdl3gxjia1gjjqpc29lvy4f7qf47fncslng9ggjnks6il145", - "depends": ["MASS", "mgcv", "mvtnorm", "Rcpp", "RcppArmadillo", "Rmixmod", "VarSelLCM"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rmixmod", "VarSelLCM", "mgcv", "mvtnorm"] }, "ClussCluster": { "name": "ClussCluster", "version": "0.1.0", "sha256": "1436849m2mnm8j7lf653zv8lcvvg2ch8kkks4bvr39kx21wxy8ss", - "depends": ["ggplot2", "reshape2", "rlang", "scales", "VennDiagram"] + "depends": ["VennDiagram", "ggplot2", "reshape2", "rlang", "scales"] }, "ClustAssess": { "name": "ClustAssess", "version": "0.3.0", "sha256": "0b8p5dpb843rv8q1hsc74zhxyn9wjgdxwpwrbq2yx4jmy8v65gzq", - "depends": ["doParallel", "dplyr", "fastcluster", "foreach", "ggplot2", "igraph", "irlba", "magrittr", "Matrix", "progress", "Rcpp", "reshape2", "rlang", "stringr", "uwot"] + "depends": ["Matrix", "Rcpp", "doParallel", "dplyr", "fastcluster", "foreach", "ggplot2", "igraph", "irlba", "magrittr", "progress", "reshape2", "rlang", "stringr", "uwot"] }, "ClustBlock": { "name": "ClustBlock", @@ -5597,13 +5681,13 @@ "name": "ClustVarLV", "version": "2.1.1", "sha256": "0maylgf6czlll5zn3xj68acmllxi4x2r4ri6bdx8vl9apzax1rgy", - "depends": ["doParallel", "foreach", "iterators", "plyr", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "doParallel", "foreach", "iterators", "plyr"] }, "Cluster_OBeu": { "name": "Cluster.OBeu", "version": "1.2.3", "sha256": "10i7mnaq968my1c5hi8bdsj05m64wlmrf4n4m118is5h1q7zss8r", - "depends": ["car", "cluster", "clValid", "data_tree", "dendextend", "jsonlite", "mclust", "RCurl", "reshape", "reshape2", "stringr"] + "depends": ["RCurl", "car", "clValid", "cluster", "data_tree", "dendextend", "jsonlite", "mclust", "reshape", "reshape2", "stringr"] }, "ClusterBootstrap": { "name": "ClusterBootstrap", @@ -5613,9 +5697,9 @@ }, "ClusterR": { "name": "ClusterR", - "version": "1.3.2", - "sha256": "1bs1sl3yy90zx4ni0lhvdivzfas6i4v9203m59njvk5df9x82ffp", - "depends": ["ggplot2", "gmp", "lifecycle", "Rcpp", "RcppArmadillo"] + "version": "1.3.3", + "sha256": "0vmj0q6sjh8adr22mhm6hyfnzsw09dk1qn75rz5i3mmhrd7y7mr6", + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "gmp", "lifecycle"] }, "ClusterRankTest": { "name": "ClusterRankTest", @@ -5627,13 +5711,13 @@ "name": "ClusterStability", "version": "1.0.4", "sha256": "1y88dv7n2cxm5w9pbg36dvx55nzvsnq4vbmx401147xr5p03yk9w", - "depends": ["cluster", "copula", "Rcpp", "WeightedCluster"] + "depends": ["Rcpp", "WeightedCluster", "cluster", "copula"] }, "ClusterVAR": { "name": "ClusterVAR", - "version": "0.0.6", - "sha256": "03iwwy8ijz4rxsainlriy6g5mkn4wl7hwgk9mm0cwfxvai3r1n28", - "depends": ["doParallel", "fastDummies", "foreach", "iterators", "MASS", "mvtnorm", "parabar", "scales"] + "version": "0.0.7", + "sha256": "1596imfnk0kfygw3p7pcn3wkcppkq15rqvm1sdn3kfykwcb794jr", + "depends": ["MASS", "doParallel", "fastDummies", "foreach", "iterators", "mvtnorm", "parabar", "scales"] }, "ClusteredMutations": { "name": "ClusteredMutations", @@ -5645,7 +5729,7 @@ "name": "Clustering", "version": "1.7.10", "sha256": "051x3140xr8g0grlmsff4m8gfc613hrfgldy0a7nm0f9w90ragsx", - "depends": ["amap", "apcluster", "cluster", "ClusterR", "data_table", "dplyr", "foreach", "future", "ggplot2", "gmp", "pracma", "pvclust", "shiny", "sqldf", "toOrdinal", "xtable"] + "depends": ["ClusterR", "amap", "apcluster", "cluster", "data_table", "dplyr", "foreach", "future", "ggplot2", "gmp", "pracma", "pvclust", "shiny", "sqldf", "toOrdinal", "xtable"] }, "CoClust": { "name": "CoClust", @@ -5681,19 +5765,19 @@ "name": "CoMiRe", "version": "0.8", "sha256": "0wq1li1snn4c01vw1zqv6s9sqjrmiw04pkkmx2zdy5wg6bzfz363", - "depends": ["ggplot2", "gtools", "KernSmooth", "mvtnorm", "Rcpp", "RcppArmadillo", "rlang", "splines2", "truncnorm"] + "depends": ["KernSmooth", "Rcpp", "RcppArmadillo", "ggplot2", "gtools", "mvtnorm", "rlang", "splines2", "truncnorm"] }, "CoNI": { "name": "CoNI", "version": "0.1.0", "sha256": "19nyn4gh4bnrvbbh2df8459015fkb2bgwwmq17vqq7r2j4gkgxzh", - "depends": ["cocor", "data_table", "doParallel", "dplyr", "forcats", "foreach", "genefilter", "ggplot2", "ggrepel", "gplots", "gridExtra", "Hmisc", "igraph", "plyr", "ppcor", "rlang", "tibble", "tidyr", "tidyselect"] + "depends": ["Hmisc", "cocor", "data_table", "doParallel", "dplyr", "forcats", "foreach", "genefilter", "ggplot2", "ggrepel", "gplots", "gridExtra", "igraph", "plyr", "ppcor", "rlang", "tibble", "tidyr", "tidyselect"] }, "CoOL": { "name": "CoOL", "version": "1.1.2", "sha256": "18z7s8bvnym4xj0hh5m6bwm86ddmsgivqv4g5zbd9m87l7khl9pn", - "depends": ["ClustGeo", "data_table", "ggplot2", "mltools", "plyr", "pROC", "Rcpp", "RcppArmadillo", "wesanderson"] + "depends": ["ClustGeo", "Rcpp", "RcppArmadillo", "data_table", "ggplot2", "mltools", "pROC", "plyr", "wesanderson"] }, "CoRpower": { "name": "CoRpower", @@ -5705,13 +5789,13 @@ "name": "CoSMoS", "version": "2.1.0", "sha256": "149mybfxaqssawp8fqhjiv3xljzflc02y4pfvavz7rklfplidqkb", - "depends": ["animation", "cowplot", "data_table", "directlabels", "ggplot2", "ggquiver", "mAr", "Matrix", "matrixcalc", "MBA", "mvtnorm", "nloptr", "plot3D", "pracma"] + "depends": ["MBA", "Matrix", "animation", "cowplot", "data_table", "directlabels", "ggplot2", "ggquiver", "mAr", "matrixcalc", "mvtnorm", "nloptr", "plot3D", "pracma"] }, "CoTiMA": { "name": "CoTiMA", "version": "0.8.0", "sha256": "15kc15jax3z4bfwq0mf7dahwv68nq4njj5a0gwzbr1ww4rrwg1r1", - "depends": ["abind", "crayon", "ctsem", "doParallel", "foreach", "lavaan", "MASS", "MBESS", "OpenMx", "openxlsx", "psych", "rootSolve", "RPushbullet", "scholar", "stringi", "zcurve"] + "depends": ["MASS", "MBESS", "OpenMx", "RPushbullet", "abind", "crayon", "ctsem", "doParallel", "foreach", "lavaan", "openxlsx", "psych", "rootSolve", "scholar", "stringi", "zcurve"] }, "CoastlineFD": { "name": "CoastlineFD", @@ -5729,13 +5813,13 @@ "name": "CodeDepends", "version": "0.6.6", "sha256": "0msq5ksjqp2pjzl6f1vizw53gdf5lz520bpdr5dbjwz5mc1mp0bz", - "depends": ["codetools", "graph", "XML"] + "depends": ["XML", "codetools", "graph"] }, "CodelistGenerator": { "name": "CodelistGenerator", - "version": "3.0", - "sha256": "1fg9xbznd5zmn35rfg52899yx0di7hqx6sznvd8a9gnc2xrp4723", - "depends": ["checkmate", "cli", "DBI", "dplyr", "glue", "lifecycle", "lubridate", "magrittr", "omopgenerics", "PatientProfiles", "purrr", "RJSONIO", "rlang", "stringr", "tidyr", "tidyselect", "vctrs", "visOmopResults"] + "version": "3.1.0", + "sha256": "045jkffcyawk72w7x1gxh6i0y8aigj59g2cn6qflr0x8jpxwg4x9", + "depends": ["DBI", "PatientProfiles", "RJSONIO", "checkmate", "cli", "dplyr", "glue", "lifecycle", "lubridate", "magrittr", "omopgenerics", "purrr", "rlang", "stringr", "tidyr", "tidyselect", "vctrs", "visOmopResults"] }, "CohensdpLibrary": { "name": "CohensdpLibrary", @@ -5747,25 +5831,25 @@ "name": "CohortAlgebra", "version": "0.3.0", "sha256": "05sn073sfmngjbq2g198nckxw2zwk2jj69xf3pddlrka05v3a1b9", - "depends": ["checkmate", "DatabaseConnector", "dplyr", "lifecycle", "rlang", "SqlRender"] + "depends": ["DatabaseConnector", "SqlRender", "checkmate", "dplyr", "lifecycle", "rlang"] }, "CohortCharacteristics": { "name": "CohortCharacteristics", - "version": "0.2.1", - "sha256": "1hyd0pl3aq7ww3szr7p0zb4cnvk9x1a6kpg04qdv9x72wkl6mscq", - "depends": ["CDMConnector", "checkmate", "cli", "DiagrammeR", "dplyr", "ggpubr", "magrittr", "omopgenerics", "PatientProfiles", "rlang", "snakecase", "stringr", "tidyr", "visOmopResults"] + "version": "0.2.2", + "sha256": "11cg3shf62njzpqh6wahgpg2c1ymqf4xkn6ip6ymab7dvq2w12wh", + "depends": ["CDMConnector", "PatientProfiles", "checkmate", "cli", "dplyr", "magrittr", "omopgenerics", "rlang", "snakecase", "stringr", "tidyr", "visOmopResults"] }, "CohortConstructor": { "name": "CohortConstructor", - "version": "0.2.1", - "sha256": "0wa02j80zy4sq7p7hyx97yvfbgfgb1zr0qa9vlhv6xy7m0wggqlz", - "depends": ["CDMConnector", "checkmate", "cli", "dbplyr", "dplyr", "glue", "magrittr", "omopgenerics", "PatientProfiles", "purrr", "rlang", "tidyr"] + "version": "0.2.2", + "sha256": "0wpfawsvdbllbr7vm83agyzcw64fjn4pwl1hzqm966iim118ch7n", + "depends": ["CDMConnector", "PatientProfiles", "checkmate", "cli", "dbplyr", "dplyr", "glue", "magrittr", "omopgenerics", "purrr", "rlang", "tidyr"] }, "CohortExplorer": { "name": "CohortExplorer", "version": "0.1.0", "sha256": "1jskxg72g7n5n3zg2kmkhykcrbf30q0h919273n6lm6nw0pzn44d", - "depends": ["checkmate", "DatabaseConnector", "dplyr", "lifecycle", "ParallelLogger", "rlang"] + "depends": ["DatabaseConnector", "ParallelLogger", "checkmate", "dplyr", "lifecycle", "rlang"] }, "CohortPlat": { "name": "CohortPlat", @@ -5775,21 +5859,21 @@ }, "CohortSurvival": { "name": "CohortSurvival", - "version": "0.5.1", - "sha256": "03pca2isc7gq9nkkghwqcjf35fn23iacdxsx04v3yacapl8975cn", - "depends": ["broom", "CDMConnector", "checkmate", "cli", "DBI", "dbplyr", "dplyr", "lubridate", "magrittr", "omopgenerics", "PatientProfiles", "rlang", "scales", "stringr", "survival", "tibble", "tidyr", "visOmopResults"] + "version": "0.5.2", + "sha256": "02p0n7nhwa50z3w3q20nx2pp6sdkbyqwmk7ix7s2cc8i7qxxhlfl", + "depends": ["CDMConnector", "DBI", "PatientProfiles", "broom", "checkmate", "cli", "dbplyr", "dplyr", "lubridate", "magrittr", "omopgenerics", "purrr", "rlang", "scales", "stringr", "survival", "tibble", "tidyr", "visOmopResults"] }, "CohortSymmetry": { "name": "CohortSymmetry", - "version": "0.1.0", - "sha256": "1vbk701yz7wcfv906a12h26m2hq787x91lz2c8qn62vxlb794q1h", - "depends": ["CDMConnector", "dplyr", "ggplot2", "magrittr", "omock", "omopgenerics", "PatientProfiles", "rlang", "stringr", "tibble", "tidyr", "visOmopResults"] + "version": "0.1.2", + "sha256": "13qv4fa673lnq3jyp97bbrcax0sw0lk2w2xxy8vyb8jnf5ajlydr", + "depends": ["CDMConnector", "CodelistGenerator", "DrugUtilisation", "PatientProfiles", "dplyr", "duckdb", "flextable", "ggplot2", "gt", "here", "magrittr", "omock", "omopgenerics", "rlang", "stringr", "tibble", "tidyr", "visOmopResults"] }, "Coinprofile": { "name": "Coinprofile", "version": "0.1.9", "sha256": "1bcip62gm34cx5m8a1mx9px2rhgvdmsgnn6q9q40k8p5hw4cx9g0", - "depends": ["coin", "exactRankTests", "ggplot2", "plyr", "Rdpack", "zoo"] + "depends": ["Rdpack", "coin", "exactRankTests", "ggplot2", "plyr", "zoo"] }, "CollapseLevels": { "name": "CollapseLevels", @@ -5801,7 +5885,7 @@ "name": "CollocInfer", "version": "1.0.4", "sha256": "1iwf5g2y7i0j8dc19hdhya4m6g47jj968glnclj7a2yaq2yx37cj", - "depends": ["deSolve", "fda", "MASS", "Matrix", "spam"] + "depends": ["MASS", "Matrix", "deSolve", "fda", "spam"] }, "ColorNameR": { "name": "ColorNameR", @@ -5813,7 +5897,7 @@ "name": "Colossus", "version": "1.1.1", "sha256": "01mra2ai88p10qwmsc1ph4kpgyvd4f3crk2gl5w782qggfgfabv8", - "depends": ["callr", "data_table", "processx", "Rcpp", "RcppEigen", "rlang", "stringr", "testthat"] + "depends": ["Rcpp", "RcppEigen", "callr", "data_table", "processx", "rlang", "stringr", "testthat"] }, "ComICS": { "name": "ComICS", @@ -5839,17 +5923,23 @@ "sha256": "0kj96i2ahq7ax1nx66jac8bbdiiyviwnzr4cr4gn0b8y580rdcwi", "depends": [] }, + "CommEcol": { + "name": "CommEcol", + "version": "1.8.1", + "sha256": "11pzb6m4ywkdrpckqahq1fddhgb9z6148vhaawyawyi7n3p7sggp", + "depends": ["adespatial", "ape", "betapart", "gmp", "picante", "rncl", "vegan"] + }, "CommKern": { "name": "CommKern", "version": "1.0.1", "sha256": "1nr1mfc8nigwp8y6f4hiw7irbmyicdk5vjvlcndcywd1lzmlwi4b", - "depends": ["ggnewscale", "ggplot2", "gridExtra", "Matrix", "RColorBrewer", "reshape2"] + "depends": ["Matrix", "RColorBrewer", "ggnewscale", "ggplot2", "gridExtra", "reshape2"] }, "CommonDataModel": { "name": "CommonDataModel", "version": "0.2.0", "sha256": "1yxksxv9dma2f6l3asg165f6hn9f6w4ws04xfprnb100sm0zq1z0", - "depends": ["DatabaseConnector", "DBI", "dplyr", "readr", "rJava", "rmarkdown", "SqlRender", "stringr"] + "depends": ["DBI", "DatabaseConnector", "SqlRender", "dplyr", "rJava", "readr", "rmarkdown", "stringr"] }, "CommonJavaJars": { "name": "CommonJavaJars", @@ -5867,7 +5957,7 @@ "name": "Comp2ROC", "version": "1.1.4", "sha256": "06hpbid9z1pzg7k4gqp2zn8l7sm375z32fsn54i27qbl3inp7m2d", - "depends": ["boot", "ROCR"] + "depends": ["ROCR", "boot"] }, "CompAREdesign": { "name": "CompAREdesign", @@ -5879,12 +5969,12 @@ "name": "CompDist", "version": "1.0", "sha256": "02c18ksk6clv674yh79bzg3mh9hymzhal51j6g0rnvqd5ra8g66c", - "depends": ["actuar", "fExtremes", "numDeriv", "PearsonDS", "rmutil", "VGAM"] + "depends": ["PearsonDS", "VGAM", "actuar", "fExtremes", "numDeriv", "rmutil"] }, "CompExpDes": { "name": "CompExpDes", - "version": "1.0.0", - "sha256": "17ib9ln5rwy0jmadciqiynfqxyx57hfjyvp46pr9alix3sgh140q", + "version": "1.0.1", + "sha256": "1nx2ndv42vxaxv3g2cfd7n0xsdb0kdcaa2b43rf2yazyc8a5hdw1", "depends": [] }, "CompGR": { @@ -5897,7 +5987,7 @@ "name": "CompMix", "version": "0.1.0", "sha256": "1b7vmkyqh8m2p72wr469anwqwghiw6m9f1p8q3mr6l1pgx7nqhsn", - "depends": ["bkmr", "devtools", "gglasso", "glmnet", "gWQS", "hierNet", "higlasso", "Matrix", "mvtnorm", "pROC", "qgcomp", "randomForest", "SuperLearner"] + "depends": ["Matrix", "SuperLearner", "bkmr", "devtools", "gWQS", "gglasso", "glmnet", "hierNet", "higlasso", "mvtnorm", "pROC", "qgcomp", "randomForest"] }, "CompModels": { "name": "CompModels", @@ -5927,7 +6017,7 @@ "name": "CompareCausalNetworks", "version": "0.2.6.2", "sha256": "0r8gdr834jqqwiq9h4yz19gcg92rbdd4fr3fwi083vfjml82f0v0", - "depends": ["data_table", "expm", "Matrix"] + "depends": ["Matrix", "data_table", "expm"] }, "CompareMultipleModels": { "name": "CompareMultipleModels", @@ -5945,13 +6035,13 @@ "name": "ComparisonSurv", "version": "1.1.1", "sha256": "0lidakxb1ab6bpb7sf2arjl1xpym1lzxbh63g0x4c2dm7h0kzkwi", - "depends": ["muhaz", "survival", "survRM2", "TSHRC"] + "depends": ["TSHRC", "muhaz", "survRM2", "survival"] }, "Compind": { "name": "Compind", "version": "3.1", "sha256": "0k45gazca94dscqhy05p68k755al4gd1gilz5svq5h6cv5fijhxk", - "depends": ["Benchmarking", "boot", "FactoMineR", "GPArotation", "GWmodel", "Hmisc", "lpSolve", "MASS", "nonparaeff", "np", "psych", "Rcompadre", "smaa", "sp", "spdep"] + "depends": ["Benchmarking", "FactoMineR", "GPArotation", "GWmodel", "Hmisc", "MASS", "Rcompadre", "boot", "lpSolve", "nonparaeff", "np", "psych", "smaa", "sp", "spdep"] }, "ComplexUpset": { "name": "ComplexUpset", @@ -5963,19 +6053,19 @@ "name": "CompositeReliability", "version": "1.0.3", "sha256": "04qpwqrz1x1hdjfin77fb4kywv9sspzdq7kn4f7jxaaz3ykhrhkc", - "depends": ["dplyr", "ggplot2", "lme4", "magrittr", "plyr", "psych", "reshape2", "Rsolnp", "tidyr"] + "depends": ["Rsolnp", "dplyr", "ggplot2", "lme4", "magrittr", "plyr", "psych", "reshape2", "tidyr"] }, "Compositional": { "name": "Compositional", - "version": "6.8", - "sha256": "066fn6qndxgz6lp15wznjq1jhbiq917iiidkx5py3ixdk3gbbg7c", - "depends": ["cluster", "Directional", "doParallel", "emplik", "energy", "FlexDir", "foreach", "glmnet", "MASS", "Matrix", "mda", "mixture", "mvhtests", "nnet", "pchc", "quadprog", "regda", "Rfast", "Rfast2", "Rnanoflann", "sn"] + "version": "6.9", + "sha256": "09xv3r9g5bkn2ra11zswvly1x9bj7xq1z39fd2kl0w3vxg9mjih1", + "depends": ["MASS", "Matrix", "Rfast", "Rfast2", "Rnanoflann", "cluster", "doParallel", "emplik", "energy", "foreach", "glmnet", "mda", "minpack_lm", "mixture", "mvhtests", "nnet", "quadprog", "quantreg", "regda", "sn"] }, "CompositionalML": { "name": "CompositionalML", "version": "1.0", "sha256": "1gnr8iqgwx461gm0ff1gvi6j8rw19a1lhz560hcq7sgymzp66l5r", - "depends": ["Boruta", "Compositional", "doParallel", "e1071", "foreach", "ranger", "Rfast", "Rfast2"] + "depends": ["Boruta", "Compositional", "Rfast", "Rfast2", "doParallel", "e1071", "foreach", "ranger"] }, "CompoundEvents": { "name": "CompoundEvents", @@ -6011,7 +6101,7 @@ "name": "ConconiAnaerobicThresholdTest", "version": "1.0.0", "sha256": "0lx1pz40l4qc755lxxvrvkjv6297q61m5vqdix8pw9j4h0wzyxll", - "depends": ["dplyr", "ggplot2", "SiZer", "trackeR"] + "depends": ["SiZer", "dplyr", "ggplot2", "trackeR"] }, "ConcordanceTest": { "name": "ConcordanceTest", @@ -6023,13 +6113,13 @@ "name": "CondCopulas", "version": "0.1.3", "sha256": "0yfph755iwdmkf453jkcf71i25z1v604swh7ggbbdv2awsb4isd9", - "depends": ["data_tree", "glmnet", "nnet", "ordinalNet", "pbapply", "statmod", "tree", "VineCopula", "wdm"] + "depends": ["VineCopula", "data_tree", "glmnet", "nnet", "ordinalNet", "pbapply", "statmod", "tree", "wdm"] }, "CondIndTests": { "name": "CondIndTests", "version": "0.1.5", "sha256": "0km4z8wnj5msg1pmphk2fccbw1cidsxv174817lwcyii9nf5iwsm", - "depends": ["caTools", "kernlab", "lawstat", "MASS", "mgcv", "mize", "pracma", "quantregForest", "randomForest", "RPtests"] + "depends": ["MASS", "RPtests", "caTools", "kernlab", "lawstat", "mgcv", "mize", "pracma", "quantregForest", "randomForest"] }, "CondMVT": { "name": "CondMVT", @@ -6053,7 +6143,7 @@ "name": "ConfZIC", "version": "1.0.1", "sha256": "0x9933zirfdkg2ljm3kk1nalk9ri0rrqi11q07dkyh78p4w9lmsp", - "depends": ["cmna", "ltsa", "MuMIn", "mvtnorm", "psych", "tidytable"] + "depends": ["MuMIn", "cmna", "ltsa", "mvtnorm", "psych", "tidytable"] }, "ConfidenceEllipse": { "name": "ConfidenceEllipse", @@ -6065,13 +6155,13 @@ "name": "ConfigParser", "version": "1.0.0", "sha256": "0jjh6gz5qcqhirzkmg7a4lnf8n3mjly15x2mvbvdpjkk7iv3w9m3", - "depends": ["ini", "R6"] + "depends": ["R6", "ini"] }, "ConformalSmallest": { "name": "ConformalSmallest", "version": "1.0", "sha256": "0r74hbz0dmz69zsw2vdl858vj27p6f2xcpv1l1il4r52cmshg1h8", - "depends": ["glmnet", "MASS", "mvtnorm", "quantregForest"] + "depends": ["MASS", "glmnet", "mvtnorm", "quantregForest"] }, "ConfusionTableR": { "name": "ConfusionTableR", @@ -6101,7 +6191,7 @@ "name": "ConnectednessApproach", "version": "1.0.3", "sha256": "1vbnj2r4x8pfzdagky33xz9kpb23d7vz5ddgms8fp15zjilsz2nw", - "depends": ["car", "frequencyConnectedness", "glmnet", "igraph", "L1pack", "MASS", "moments", "PerformanceAnalytics", "progress", "quantreg", "riskParityPortfolio", "rmgarch", "rugarch", "urca", "xts", "zoo"] + "depends": ["L1pack", "MASS", "PerformanceAnalytics", "car", "frequencyConnectedness", "glmnet", "igraph", "moments", "progress", "quantreg", "riskParityPortfolio", "rmgarch", "rugarch", "urca", "xts", "zoo"] }, "ConsRank": { "name": "ConsRank", @@ -6119,14 +6209,20 @@ "name": "ConsReg", "version": "0.1.0", "sha256": "0ck188ahzprzvqdh2q05bcg9b68dw3xiqqb1xirbm4rp5chyr419", - "depends": ["adaptMCMC", "data_table", "DEoptim", "dfoptim", "FME", "forecast", "GA", "GenSA", "ggplot2", "MCMCpack", "Metrics", "nloptr", "Rcpp", "rlang", "Rsolnp"] + "depends": ["DEoptim", "FME", "GA", "GenSA", "MCMCpack", "Metrics", "Rcpp", "Rsolnp", "adaptMCMC", "data_table", "dfoptim", "forecast", "ggplot2", "nloptr", "rlang"] }, "ConsensusClustering": { "name": "ConsensusClustering", - "version": "1.2.0", - "sha256": "1la9pp8jk5mcn1y80h3wfxw30pnys6p573iv7r3b8lgf233cnjar", + "version": "1.5.0", + "sha256": "0l9xc39zbxqiq5z9n8qxgwq19hx5n72vq1vyz98dy79p7wrl10nv", "depends": ["assertthat", "cluster", "dplyr", "igraph", "mvtnorm"] }, + "ConsensusOPLS": { + "name": "ConsensusOPLS", + "version": "1.0.0", + "sha256": "1fv0a3hjqylrbqsfv7gfn33ni7cc8351shianwsp1caqjza85yr2", + "depends": ["reshape2"] + }, "ContRespPP": { "name": "ContRespPP", "version": "0.4.2", @@ -6161,7 +6257,7 @@ "name": "ConvertPar", "version": "0.1", "sha256": "1czw97ya73dinad0n664045s9918a21kv97bpkal40kg029vnw59", - "depends": ["mirt", "neuralnet", "RWeka"] + "depends": ["RWeka", "mirt", "neuralnet"] }, "Convolutioner": { "name": "Convolutioner", @@ -6173,7 +6269,7 @@ "name": "CooRTweet", "version": "2.0.2", "sha256": "0gziybfp640p2gskbz80kx9ikmg3mpk0m937iq44k1906lrvp9p2", - "depends": ["data_table", "igraph", "lubridate", "RcppSimdJson", "stringi", "tidytable"] + "depends": ["RcppSimdJson", "data_table", "igraph", "lubridate", "stringi", "tidytable"] }, "CooccurrenceAffinity": { "name": "CooccurrenceAffinity", @@ -6203,12 +6299,12 @@ "name": "CopSens", "version": "0.1.0", "sha256": "0ljp2c25zmyiv88mdari08z9845y9niyg90a8vlq75im5w825w8a", - "depends": ["CVXR", "dplyr", "ggplot2", "MASS", "pcaMethods", "tidyr", "tidyverse"] + "depends": ["CVXR", "MASS", "dplyr", "ggplot2", "pcaMethods", "tidyr", "tidyverse"] }, "CopernicusDEM": { "name": "CopernicusDEM", - "version": "1.0.3", - "sha256": "073glifdcrg11ffnz1gim36800jn0saqdamqlda81q4a4lla7il5", + "version": "1.0.4", + "sha256": "00rpdfspyd94jr2ahw7dc661wdgxnxzcxgg40yn48c1v6hxjhfhp", "depends": ["doParallel", "foreach", "glue", "sf"] }, "CopernicusMarine": { @@ -6239,7 +6335,7 @@ "name": "CopulaCenR", "version": "1.2.3", "sha256": "1z1a9hrb5v784j46yc2dsbizbis8pb5zdbc4cky8yws7swiax5m1", - "depends": ["boot", "caret", "copBasic", "copula", "corpcor", "flexsurv", "foreach", "icenReg", "magrittr", "plotly", "pracma", "survival", "VineCopula"] + "depends": ["VineCopula", "boot", "caret", "copBasic", "copula", "corpcor", "flexsurv", "foreach", "icenReg", "magrittr", "plotly", "pracma", "survival"] }, "CopulaGAMM": { "name": "CopulaGAMM", @@ -6251,7 +6347,7 @@ "name": "CopulaInference", "version": "0.5.0", "sha256": "10r2ni62fh6zl0im1n7apjf6kx2fprifn71rnaf7dh7xypdkqyw1", - "depends": ["doParallel", "foreach", "Matrix", "rvinecopulib"] + "depends": ["Matrix", "doParallel", "foreach", "rvinecopulib"] }, "CopulaREMADA": { "name": "CopulaREMADA", @@ -6269,31 +6365,31 @@ "name": "CorMID", "version": "0.1.9", "sha256": "08dr6c3pvich7arbq0ak9s356s29ynw4v6s1mz5bw9kddrrlswlq", - "depends": ["plyr", "Rdisop"] + "depends": ["Rdisop", "plyr"] }, "Corbi": { "name": "Corbi", "version": "0.6-2", "sha256": "13lbh6fcfrpgz459mjdnfkd8kys2350s8j0vv9ps18092264gh42", - "depends": ["CRF", "igraph", "MASS", "Matrix"] + "depends": ["CRF", "MASS", "Matrix", "igraph"] }, "CoreMicrobiomeR": { "name": "CoreMicrobiomeR", "version": "0.1.0", "sha256": "18zqs14j014qsmqqgn2yyf1djvr92spj46aq474jh6f8sdqvbqqz", - "depends": ["edgeR", "fastmatch", "ggplot2", "ggrepel", "plotly", "reshape2", "SRS", "vegan"] + "depends": ["SRS", "edgeR", "fastmatch", "ggplot2", "ggrepel", "plotly", "reshape2", "vegan"] }, "CornerstoneR": { "name": "CornerstoneR", "version": "2.0.2", "sha256": "04dvryhcyi7f6bmm4067cn5vmy7kdqi3bys7ln8nnsc0kkdjxhi5", - "depends": ["checkmate", "data_table", "minpack_lm", "ranger", "SpatialTools", "vcd"] + "depends": ["SpatialTools", "checkmate", "data_table", "minpack_lm", "ranger", "vcd"] }, "CoronaNetR": { "name": "CoronaNetR", "version": "0.3.0", "sha256": "1qqlkcbwmr9g8rnsgb7dd1npd09sva11y6fy1g7l4wdvmpw07ymh", - "depends": ["httr", "R_utils", "readr"] + "depends": ["R_utils", "httr", "readr"] }, "CorrBin": { "name": "CorrBin", @@ -6329,13 +6425,13 @@ "name": "Correlplot", "version": "1.1.0", "sha256": "1kpan2ifpqhw6nzkx1ww6k5xwr624jysz6l6i9xg35np4xfcgrwz", - "depends": ["calibrate", "corrplot", "ggplot2", "lsei", "MASS", "xtable"] + "depends": ["MASS", "calibrate", "corrplot", "ggplot2", "lsei", "xtable"] }, "Counterfactual": { "name": "Counterfactual", "version": "1.2", "sha256": "1spryxvnkdz728rl4nb7zlqhynnh0b4m7lnhq4i1n13gfsz1m5j4", - "depends": ["doParallel", "doRNG", "foreach", "Hmisc", "quantreg", "survival"] + "depends": ["Hmisc", "doParallel", "doRNG", "foreach", "quantreg", "survival"] }, "Counternull": { "name": "Counternull", @@ -6347,13 +6443,13 @@ "name": "Countr", "version": "3.5.8", "sha256": "1bv19ni79f94lrn4656hsxi6nnhrn136mx5y757a4r39avsgbl06", - "depends": ["boot", "car", "dplyr", "flexsurv", "Formula", "lattice", "lmtest", "MASS", "Matrix", "numDeriv", "optimx", "RColorBrewer", "Rcpp", "RcppArmadillo", "Rdpack", "standardize", "VGAM", "xtable"] + "depends": ["Formula", "MASS", "Matrix", "RColorBrewer", "Rcpp", "RcppArmadillo", "Rdpack", "VGAM", "boot", "car", "dplyr", "flexsurv", "lattice", "lmtest", "numDeriv", "optimx", "standardize", "xtable"] }, "CountsEPPM": { "name": "CountsEPPM", "version": "3.1", "sha256": "19lb8m36s3ilvh9jia4b291a8wmfwvh2sb8jbpwxg7ksvj5bvcz6", - "depends": ["expm", "Formula", "lmtest", "numDeriv"] + "depends": ["Formula", "expm", "lmtest", "numDeriv"] }, "CovCombR": { "name": "CovCombR", @@ -6363,27 +6459,27 @@ }, "CovRegRF": { "name": "CovRegRF", - "version": "2.0.0", - "sha256": "17wr2k6ws1l8lf4gfq59l7c2p95181sk5r2acay21pnh7q39x8wd", - "depends": ["data_table", "data_tree", "DiagrammeR"] + "version": "2.0.1", + "sha256": "0pzcdbwj1an8fls04g7znhbfaybqdp4rsjgnsvrh8rcmphnh48c9", + "depends": ["DiagrammeR", "data_table", "data_tree"] }, "CovSel": { "name": "CovSel", "version": "1.2.1", "sha256": "02fsiykbg96ynqw25vfyrams7fs39xjmfhvb23zjbqb7ql6d0xdk", - "depends": ["dr", "MASS", "np"] + "depends": ["MASS", "dr", "np"] }, "CovTools": { "name": "CovTools", "version": "0.5.4", "sha256": "1bkqg3kzy2ahjqldcf6x55wkrmb4s6y72y9cj0jwb1fph0a1p3sm", - "depends": ["doParallel", "expm", "foreach", "geigen", "Matrix", "mvtnorm", "pracma", "Rcpp", "RcppArmadillo", "Rdpack", "shapes", "SHT"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "Rdpack", "SHT", "doParallel", "expm", "foreach", "geigen", "mvtnorm", "pracma", "shapes"] }, "CovidMutations": { "name": "CovidMutations", "version": "0.1.3", "sha256": "03bl9frjfj8i7ydgi245113yzyg8rkgqxasicmqcjdd68zbz00kn", - "depends": ["cowplot", "dplyr", "ggplot2", "ggpubr", "seqinr", "stringr", "VennDiagram"] + "depends": ["VennDiagram", "cowplot", "dplyr", "ggplot2", "ggpubr", "seqinr", "stringr"] }, "CoxAIPW": { "name": "CoxAIPW", @@ -6419,7 +6515,7 @@ "name": "Coxmos", "version": "1.0.2", "sha256": "052af5hx820wmvflvz4pv3jlmmwap9d0lzx9k7v1ps6cidarz0wm", - "depends": ["caret", "cowplot", "furrr", "future", "ggplot2", "ggpubr", "ggrepel", "glmnet", "MASS", "mixOmics", "progress", "purrr", "Rdpack", "scattermore", "survcomp", "survival", "survminer", "svglite", "tidyr"] + "depends": ["MASS", "Rdpack", "caret", "cowplot", "furrr", "future", "ggplot2", "ggpubr", "ggrepel", "glmnet", "mixOmics", "progress", "purrr", "scattermore", "survcomp", "survival", "survminer", "svglite", "tidyr"] }, "CpGFilter": { "name": "CpGFilter", @@ -6429,8 +6525,8 @@ }, "CpGassoc": { "name": "CpGassoc", - "version": "2.60", - "sha256": "1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny", + "version": "2.70", + "sha256": "0y3jwy4kpqw6r4w93bm1c7yjxpv5jyhpmgbbkagb7qjvbsg935qx", "depends": ["nlme"] }, "CpmERCCutoff": { @@ -6443,7 +6539,7 @@ "name": "CptNonPar", "version": "0.2.1", "sha256": "1mpjxy5wivadbska51g30594rqgdx3g0m4jr90lnnri2yb8a78kw", - "depends": ["doParallel", "foreach", "iterators", "parallelly", "Rcpp", "Rfast"] + "depends": ["Rcpp", "Rfast", "doParallel", "foreach", "iterators", "parallelly"] }, "CreditRisk": { "name": "CreditRisk", @@ -6461,18 +6557,18 @@ "name": "CropScapeR", "version": "1.1.5", "sha256": "0dhziq4fybb987jv10g0wd4n765c4d87h86g96qg8wg6cx11vi6m", - "depends": ["data_table", "dplyr", "httr", "magrittr", "raster", "RJSONIO", "sf"] + "depends": ["RJSONIO", "data_table", "dplyr", "httr", "magrittr", "raster", "sf"] }, "CropWaterBalance": { "name": "CropWaterBalance", "version": "0.2.0", "sha256": "0hfy1y26v2cy1pi014zxrmp91ypnlb4jk1sa4zb0mhlmlxjmdijh", - "depends": ["lubridate", "PowerSDI"] + "depends": ["PowerSDI", "lubridate"] }, "CrossCarry": { "name": "CrossCarry", - "version": "0.1.0", - "sha256": "1iglwsx5b29zjl7ikngyb3kf0kfacqxlg01p6vn84dblwgh2gmak", + "version": "0.2.0", + "sha256": "0l65mxajhzdxwwx31mlfx38fsgkwd9iziyn8a6cca9pjhkf7qldg", "depends": ["dplyr", "gee", "geepack", "ggplot2"] }, "CrossClustering": { @@ -6497,7 +6593,7 @@ "name": "Crossover", "version": "0.1-22", "sha256": "05fsl22h2q6l0g9hscs4f0w4d3skd9anr570ddmnqicxzdfpap5r", - "depends": ["CommonJavaJars", "crossdes", "digest", "ggplot2", "JavaGD", "MASS", "Matrix", "multcomp", "Rcpp", "RcppArmadillo", "rJava", "xtable"] + "depends": ["CommonJavaJars", "JavaGD", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "crossdes", "digest", "ggplot2", "multcomp", "rJava", "xtable"] }, "Crosstabs_Loglinear": { "name": "Crosstabs.Loglinear", @@ -6507,39 +6603,39 @@ }, "CruzPlot": { "name": "CruzPlot", - "version": "1.4.8", - "sha256": "19dza13mdd67g7710bzzg1bi32nhgr3c5vcyh98igw3q8hfk7ac8", - "depends": ["dplyr", "DT", "geosphere", "mapdata", "maps", "marmap", "shiny", "shinydashboard", "shinyjs", "stringr", "swfscDAS"] + "version": "1.4.9", + "sha256": "1x9cm4773xps2q1z8vpgb8fkdrrfcrvrz6qk2m734zz9c1v39733", + "depends": ["DT", "dplyr", "geosphere", "mapdata", "maps", "marmap", "shiny", "shinydashboard", "shinyjs", "stringr", "swfscDAS"] }, "CryptRndTest": { "name": "CryptRndTest", "version": "1.2.7", "sha256": "0skk0mgnkfknlbdidfh2jca1wa8rzgd29ypwpa8kdh83l9jhdi5g", - "depends": ["gmp", "kSamples", "LambertW", "Rmpfr", "sfsmisc", "tseries"] + "depends": ["LambertW", "Rmpfr", "gmp", "kSamples", "sfsmisc", "tseries"] }, "CsChange": { "name": "CsChange", "version": "0.1.7", "sha256": "1qggfi7g34iw0737azn4l9cn0chsiq4wa18v8i5znlaimzmifylr", - "depends": ["boot", "Hmisc", "rms", "survival"] + "depends": ["Hmisc", "boot", "rms", "survival"] }, "Cubist": { "name": "Cubist", - "version": "0.4.2.1", - "sha256": "0mwis0qjjj7wz4lxb8a0168l4az4523ybhxc0jygx8qrj3azwyph", + "version": "0.4.4", + "sha256": "140m4if4g4v74dwhzdp4bgdgy4zzcyplxqd311gfg7dn0kqzzmai", "depends": ["lattice", "reshape2"] }, "CureAuxSP": { "name": "CureAuxSP", "version": "0.0.1", "sha256": "1aay2hhciq6f79dz5cnqsfrvw6hlfidw4gvy7hyrnbqqlnqjwyr2", - "depends": ["lars", "MASS", "mvtnorm", "survival", "TCGAbiolinks"] + "depends": ["MASS", "TCGAbiolinks", "lars", "mvtnorm", "survival"] }, "CureDepCens": { "name": "CureDepCens", "version": "0.1.0", "sha256": "1i11yvh19zvv220d3jhnidjxq494wc3jg5054zq1pr09sxh2jnqn", - "depends": ["dlm", "Formula", "matrixStats", "rootSolve", "survival"] + "depends": ["Formula", "dlm", "matrixStats", "rootSolve", "survival"] }, "CurricularAnalytics": { "name": "CurricularAnalytics", @@ -6573,27 +6669,27 @@ }, "CvmortalityMult": { "name": "CvmortalityMult", - "version": "1.0.2", - "sha256": "0m11pzmhw7g25x4dmjakc5i66x5vvn086j6vj3r0bvyxiyyvi3gj", - "depends": ["forecast", "gnm", "sf", "StMoMo", "tmap"] + "version": "1.0.3", + "sha256": "04ad10sgmhy4n3c76l46sn5j1k62yfh4ipldln1kfkygl3zis1xf", + "depends": ["StMoMo", "forecast", "gnm", "sf", "tmap"] }, "Cyclops": { "name": "Cyclops", "version": "3.4.1", "sha256": "1zz6jgzsjswzafya43fabqcgfhwn65sk8lx023hhn33vw844sv5p", - "depends": ["Andromeda", "bit64", "dplyr", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "survival"] + "depends": ["Andromeda", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "bit64", "dplyr", "rlang", "survival"] }, "CytOpT": { "name": "CytOpT", "version": "0.9.4", "sha256": "008qm2kzclp0sy4ys7y0dsc894qrn7mazz9216w97rs2sn7kcrzx", - "depends": ["ggplot2", "MetBrewer", "patchwork", "reshape2", "reticulate", "testthat"] + "depends": ["MetBrewer", "ggplot2", "patchwork", "reshape2", "reticulate", "testthat"] }, "CytoSimplex": { "name": "CytoSimplex", "version": "0.1.1", "sha256": "0zknsizsh860hyij5zxpm3izfsiwnp7mshrrnk4fmxsjv9fcxahr", - "depends": ["ggplot2", "Matrix", "plot3D", "Rcpp", "RcppArmadillo", "rlang"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "ggplot2", "plot3D", "rlang"] }, "CytobankAPI": { "name": "CytobankAPI", @@ -6605,25 +6701,25 @@ "name": "D2MCS", "version": "1.0.1", "sha256": "0rjfjnh8gcbm83cwqk1yjrjv6jsrarr53c629bkg9zw7s5sm35nz", - "depends": ["caret", "devtools", "dplyr", "FSelector", "ggplot2", "ggrepel", "gridExtra", "infotheo", "mccr", "mltools", "ModelMetrics", "questionr", "R6", "recipes", "tictoc", "varhandle"] + "depends": ["FSelector", "ModelMetrics", "R6", "caret", "devtools", "dplyr", "ggplot2", "ggrepel", "gridExtra", "infotheo", "mccr", "mltools", "questionr", "recipes", "tictoc", "varhandle"] }, "D3GB": { "name": "D3GB", "version": "2.0", "sha256": "0g86nyfrhqbnlvls2l5ppi2zlij2wpg6zq83qrllzzrh28qx0rjk", - "depends": ["base64enc", "DBI", "RSQLite"] + "depends": ["DBI", "RSQLite", "base64enc"] }, "D3mirt": { "name": "D3mirt", - "version": "1.1.0", - "sha256": "1a7c2q1rm8yhdsszh4lg6nca8sfyyvba3v4gchdjll7660grpyr7", + "version": "2.0.4", + "sha256": "0mdiirc0k8hlqyj9fq62bpgin6nk2jl604qdrcfh2ympwkm54iz6", "depends": ["mirt", "rgl"] }, "D3partitionR": { "name": "D3partitionR", "version": "0.5.0", "sha256": "10067rdgbpjzgw2wiq75kdd0gd7bl41hp16sxc0k2p72ybqfpw03", - "depends": ["data_table", "functional", "htmlwidgets", "magrittr", "RColorBrewer", "titanic"] + "depends": ["RColorBrewer", "data_table", "functional", "htmlwidgets", "magrittr", "titanic"] }, "D4TAlink_light": { "name": "D4TAlink.light", @@ -6635,13 +6731,13 @@ "name": "DA", "version": "1.2.0", "sha256": "0bcx6lh93yl1cawrbrkqx7dypypvfnf27nlxf9vkz16n1hy50xnl", - "depends": ["adegenet", "kernlab", "klaR", "lfda", "MASS", "plotly", "rARPACK"] + "depends": ["MASS", "adegenet", "kernlab", "klaR", "lfda", "plotly", "rARPACK"] }, "DAAG": { "name": "DAAG", "version": "1.25.6", "sha256": "0vm4r1ds2xxxf4vml6mrb5alnkr72a08nby88h3qk7xalny28xkf", - "depends": ["lattice", "latticeExtra", "Rdpack"] + "depends": ["Rdpack", "lattice", "latticeExtra"] }, "DAAGbio": { "name": "DAAGbio", @@ -6665,13 +6761,13 @@ "name": "DAISIE", "version": "4.4.1", "sha256": "0f1ym3k49m2wdilsg7vwsb7m4ccdg87pnaksmbqv9smcxn5v8rn2", - "depends": ["BH", "DDD", "deSolve", "doParallel", "foreach", "magrittr", "Matrix", "pracma", "Rcpp", "RcppEigen", "subplex", "tensor", "testit"] + "depends": ["BH", "DDD", "Matrix", "Rcpp", "RcppEigen", "deSolve", "doParallel", "foreach", "magrittr", "pracma", "subplex", "tensor", "testit"] }, "DAISIEprep": { "name": "DAISIEprep", "version": "0.4.0", "sha256": "0ch3mc725lip67fpbk405rv3bai44w13vvjlspv8y6jzmb5jg6bp", - "depends": ["ape", "castor", "DAISIE", "ggplot2", "ggtree", "phylobase", "rlang", "scales", "tibble"] + "depends": ["DAISIE", "ape", "castor", "ggplot2", "ggtree", "phylobase", "rlang", "scales", "tibble"] }, "DAKS": { "name": "DAKS", @@ -6695,7 +6791,7 @@ "name": "DALSM", "version": "0.9.1", "sha256": "00v3h9np8nfhiyiz6r4bs5gzqqw3qfx275ab1byvjsr42zx11qpr", - "depends": ["cubicBsplines", "MASS", "plyr"] + "depends": ["MASS", "cubicBsplines", "plyr"] }, "DALY": { "name": "DALY", @@ -6707,7 +6803,7 @@ "name": "DAMOCLES", "version": "2.3", "sha256": "0pk9gq82qa18fl7zp74d47bgy8lhj9rkvfq23w8844nz9kn58s1f", - "depends": ["ape", "caper", "DDD", "deSolve", "expm", "Hmisc", "Matrix", "matrixStats", "picante"] + "depends": ["DDD", "Hmisc", "Matrix", "ape", "caper", "deSolve", "expm", "matrixStats", "picante"] }, "DATAstudio": { "name": "DATAstudio", @@ -6731,7 +6827,7 @@ "name": "DBHC", "version": "0.0.3", "sha256": "0r9c2vjnrahi3kbg7gz3z9k1i8vdqc44rc6nq7xk1j2xs1s6wsxp", - "depends": ["ggplot2", "reshape2", "seqHMM", "TraMineR"] + "depends": ["TraMineR", "ggplot2", "reshape2", "seqHMM"] }, "DBI": { "name": "DBI", @@ -6743,7 +6839,7 @@ "name": "DBItest", "version": "1.8.1", "sha256": "0vj7989s9qip3mxjzffrm7prh0xxpp467y9m4ls7dz7m3b7inpxl", - "depends": ["blob", "callr", "DBI", "desc", "hms", "lubridate", "magrittr", "nanoarrow", "palmerpenguins", "rlang", "testthat", "withr"] + "depends": ["DBI", "blob", "callr", "desc", "hms", "lubridate", "magrittr", "nanoarrow", "palmerpenguins", "rlang", "testthat", "withr"] }, "DBModelSelect": { "name": "DBModelSelect", @@ -6761,19 +6857,19 @@ "name": "DBR", "version": "1.4.1", "sha256": "1gs9d1qmv4mcmryzzvmwbz6ycinhnxnkiv56l31mbqy50qjn9bi4", - "depends": ["coda", "MfUSampler"] + "depends": ["MfUSampler", "coda"] }, "DBTC": { "name": "DBTC", "version": "0.1.0", "sha256": "1w4sm78nvzmc7hjdpjxsj4qncwnymdqni5jkllircglsjimps75y", - "depends": ["dada2", "ggplot2", "pbapply", "plyr", "ShortRead", "taxonomizr"] + "depends": ["ShortRead", "dada2", "ggplot2", "pbapply", "plyr", "taxonomizr"] }, "DBTCShiny": { "name": "DBTCShiny", "version": "0.1.2", "sha256": "0rk9f4wbpmibydbmq17bjfgdznpl67xfd5f1srkpnai459c5ni6y", - "depends": ["DBTC", "DT", "ggplot2", "leaflet", "leaflet_extras", "magrittr", "shiny", "shinycssloaders", "shinydashboard", "shinyFiles", "shinyjs", "shinyWidgets"] + "depends": ["DBTC", "DT", "ggplot2", "leaflet", "leaflet_extras", "magrittr", "shiny", "shinyFiles", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyjs"] }, "DBfit": { "name": "DBfit", @@ -6785,7 +6881,7 @@ "name": "DBpower", "version": "0.1.0", "sha256": "04wwhzlc9g6il478ax5yvh74bbb6hs29jyslkiz3k1hi25hlpkrn", - "depends": ["combinat", "dplyr", "GBJ", "kit", "magrittr", "mvtnorm"] + "depends": ["GBJ", "combinat", "dplyr", "kit", "magrittr", "mvtnorm"] }, "DCCA": { "name": "DCCA", @@ -6797,7 +6893,7 @@ "name": "DCEM", "version": "2.0.5", "sha256": "04z0lya1dbkdzjbgn8g6p16969kc6s4zrk87wy0i42h2hx0yx1zv", - "depends": ["MASS", "matrixcalc", "mvtnorm", "Rcpp"] + "depends": ["MASS", "Rcpp", "matrixcalc", "mvtnorm"] }, "DCEmgmt": { "name": "DCEmgmt", @@ -6809,7 +6905,7 @@ "name": "DCEtool", "version": "1.1.0", "sha256": "18x0fk71is77cc5ldm890asqrm1dz45m14z2ic9df89fm0wpwrvg", - "depends": ["adjustedcranlogs", "dfidx", "DT", "ggplot2", "htmltools", "idefix", "knitr", "magrittr", "MASS", "mlogit", "mvtnorm", "readxl", "remotes", "rlist", "shiny", "shinyBS", "shinycssloaders", "shinyWidgets", "survival", "tidyr", "writexl"] + "depends": ["DT", "MASS", "adjustedcranlogs", "dfidx", "ggplot2", "htmltools", "idefix", "knitr", "magrittr", "mlogit", "mvtnorm", "readxl", "remotes", "rlist", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "survival", "tidyr", "writexl"] }, "DCG": { "name": "DCG", @@ -6827,7 +6923,7 @@ "name": "DCLEAR", "version": "1.0.13", "sha256": "0f8q0avzl3jpjly1jsg02lz8h38208j25nfdf1v79qcp4ia7m3pp", - "depends": ["ape", "BiocGenerics", "BiocParallel", "dplyr", "igraph", "Matrix", "matrixStats", "phangorn", "purrr", "rBayesianOptimization", "Rcpp", "RcppArmadillo", "rlang", "stringr", "tensorflow", "tidyr"] + "depends": ["BiocGenerics", "BiocParallel", "Matrix", "Rcpp", "RcppArmadillo", "ape", "dplyr", "igraph", "matrixStats", "phangorn", "purrr", "rBayesianOptimization", "rlang", "stringr", "tensorflow", "tidyr"] }, "DCODE": { "name": "DCODE", @@ -6839,19 +6935,19 @@ "name": "DCPO", "version": "0.5.3", "sha256": "1h14xnii6kv6sc7pfxalif3bj0mifnxg46x4lwbixx9vzxxz96sq", - "depends": ["beepr", "BH", "dplyr", "forcats", "janitor", "purrr", "Rcpp", "RcppEigen", "rstan", "rstantools", "StanHeaders", "tibble", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "beepr", "dplyr", "forcats", "janitor", "purrr", "rstan", "rstantools", "tibble", "tidyr"] }, "DCSmooth": { "name": "DCSmooth", "version": "1.1.2", "sha256": "19pkj8z9wm4g8kxz1j3jw2n0bwldsyakipxvqpwnmlg2g5j8f5b1", - "depends": ["doParallel", "foreach", "fracdiff", "plotly", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "fracdiff", "plotly"] }, "DCchoice": { "name": "DCchoice", "version": "0.2.0", "sha256": "0mkssdybfychg0jpx7542sdbhxv275lz82qhnag5r8qn0zsj7mx9", - "depends": ["Formula", "interval", "MASS"] + "depends": ["Formula", "MASS", "interval"] }, "DChaos": { "name": "DChaos", @@ -6863,7 +6959,7 @@ "name": "DCluster", "version": "0.2-10", "sha256": "01m41vaw26nlsisbwp627hmfxs823wcnzrmchxnp3rx4n40j82di", - "depends": ["boot", "MASS", "spdep"] + "depends": ["MASS", "boot", "spdep"] }, "DClusterm": { "name": "DClusterm", @@ -6875,7 +6971,7 @@ "name": "DDD", "version": "5.2.2", "sha256": "178b4j67vvn3g22s45gx9aqch24fij34yywbpvign2dkhzahnqkn", - "depends": ["ape", "BH", "DEoptim", "deSolve", "expm", "Matrix", "phytools", "Rcpp", "RcppEigen", "SparseM", "subplex"] + "depends": ["BH", "DEoptim", "Matrix", "Rcpp", "RcppEigen", "SparseM", "ape", "deSolve", "expm", "phytools", "subplex"] }, "DDHFm": { "name": "DDHFm", @@ -6893,7 +6989,7 @@ "name": "DDL", "version": "1.0.2", "sha256": "1scgg90njn8ahxdzbz1dyhr508hlipgaawk2pll0hk093abnqrlc", - "depends": ["glmnet", "Matrix"] + "depends": ["Matrix", "glmnet"] }, "DDM": { "name": "DDM", @@ -6911,13 +7007,13 @@ "name": "DDPNA", "version": "0.3.3", "sha256": "10asskc757c2xmp2xc4v6gzp43jj4db93xjdq8hqqfvr0vyvmffy", - "depends": ["ggalt", "ggplot2", "Hmisc", "igraph", "MEGENA", "plyr", "scales", "VennDiagram"] + "depends": ["Hmisc", "MEGENA", "VennDiagram", "ggalt", "ggplot2", "igraph", "plyr", "scales"] }, "DDRTree": { "name": "DDRTree", "version": "0.1.5", "sha256": "16s5fjw7kwlxhrkzdny62sx32fvmg3rxjc3wrh6krd31jh1fqlfk", - "depends": ["BH", "irlba", "Rcpp", "RcppEigen"] + "depends": ["BH", "Rcpp", "RcppEigen", "irlba"] }, "DDoutlier": { "name": "DDoutlier", @@ -6939,8 +7035,8 @@ }, "DEET": { "name": "DEET", - "version": "1.0.11", - "sha256": "1jb7mp84h6s26abn3ra0pjqra5ha1m4j4yvfvdi074wvd2zzkns5", + "version": "1.0.12", + "sha256": "19y9s2v65z7g36akpyr0ljzch4csq9la0cafkh5xb4d18xpr2h0h", "depends": ["ActivePathways", "downloader", "dplyr", "ggplot2", "ggrepel", "glmnet", "pbapply"] }, "DEEVD": { @@ -6975,8 +7071,8 @@ }, "DEPONS2R": { "name": "DEPONS2R", - "version": "1.2.2", - "sha256": "0izcmi194pd96gafma5hnnqgavwm51q7l9wnmbpl9siyxb7xfij6", + "version": "1.2.3", + "sha256": "1l09nl6dvm0h005m7wpic95d710qv0v7q4ac67cr5zsr2l0prj1z", "depends": ["jsonlite", "raster", "sf", "sp", "terra", "xml2"] }, "DES": { @@ -7029,8 +7125,8 @@ }, "DGEAR": { "name": "DGEAR", - "version": "0.1.3", - "sha256": "0pnfaamrqban478vxcr4cjklxqxh9kmxzd724jwq8a1xfgscs8pw", + "version": "0.1.4", + "sha256": "0knai1098ayp2z1s2x4zkk5npmakw30qk8qdp4hsmvwh21rijnzw", "depends": ["DescTools"] }, "DGEobj": { @@ -7043,7 +7139,7 @@ "name": "DGEobj.utils", "version": "1.0.6", "sha256": "01pbyz62vayism9bk6scx97yxwfmsss2af39grq46rilrcgrck3k", - "depends": ["assertthat", "DGEobj", "dplyr", "stringr"] + "depends": ["DGEobj", "assertthat", "dplyr", "stringr"] }, "DGLMExtPois": { "name": "DGLMExtPois", @@ -7055,19 +7151,19 @@ "name": "DGM", "version": "1.7.4", "sha256": "1f59spd4bwx4d1gbjaizjxccaslw1fvf8pxa9nrxi07j6kq9mg0h", - "depends": ["coin", "data_table", "ggplot2", "Rcpp", "RcppArmadillo", "reshape2"] + "depends": ["Rcpp", "RcppArmadillo", "coin", "data_table", "ggplot2", "reshape2"] }, "DGP4LCF": { "name": "DGP4LCF", "version": "1.0.0", "sha256": "1v8wh52wcxs4adp1h9xplj5vych867scjrw32pqdczmiawi3q9d5", - "depends": ["coda", "combinat", "corrplot", "factor_switching", "GPFDA", "mvtnorm", "pheatmap", "Rcpp", "RcppArmadillo"] + "depends": ["GPFDA", "Rcpp", "RcppArmadillo", "coda", "combinat", "corrplot", "factor_switching", "mvtnorm", "pheatmap"] }, "DHARMa": { "name": "DHARMa", "version": "0.4.6", "sha256": "0wsb59w6z8mwag2wfiqs8237sk5rf2w7z7araxa6pzslsdf3vz9j", - "depends": ["ape", "gap", "lme4", "lmtest", "Matrix", "qgam"] + "depends": ["Matrix", "ape", "gap", "lme4", "lmtest", "qgam"] }, "DHBins": { "name": "DHBins", @@ -7087,23 +7183,29 @@ "sha256": "1wrgx5b9w476g8s3jmccc027xdqbmcmnlhwf02g6j213rgy87p73", "depends": ["matlabr"] }, + "DIDHAD": { + "name": "DIDHAD", + "version": "1.0.1", + "sha256": "1cmzsa1yn19gw5mc5lyrsnf1ghil7a3mgh2a1ana6rfzb5bpq4fq", + "depends": ["MASS", "YatchewTest", "dplyr", "ggplot2", "haven", "nprobust", "plm", "rlang", "rnames"] + }, "DIDmultiplegt": { "name": "DIDmultiplegt", - "version": "0.1.4", - "sha256": "07rky436q6bq9ag6ix5r4k7i4ahbifx89c2dv9isag634kva6pvm", - "depends": ["assertthat", "dplyr", "fixest", "plotrix", "sampling", "stringr", "wooldridge"] + "version": "2.0.0", + "sha256": "14fa7zmhyz815z6h1ycvhcvq072g09jfjkcpyllxim4dl5430hdc", + "depends": ["DIDHAD", "DIDmultiplegtDYN", "dplyr", "fixest", "magrittr", "plotrix", "sampling", "stringr"] }, "DIDmultiplegtDYN": { "name": "DIDmultiplegtDYN", - "version": "1.0.11", - "sha256": "0i19i65hacrpfr8zn644a0viparig4np07fs91f7xs6gh7z1yv4c", + "version": "1.0.15", + "sha256": "050cjc66ydidqc633kyw5l7s7jlcpjj8nyaqkcwkgcxx349rag5m", "depends": ["car", "cowplot", "data_table", "dplyr", "ggplot2", "haven", "lmtest", "magrittr", "matlib", "plm", "rlang", "rnames", "sandwich", "xlsx"] }, "DIFM": { "name": "DIFM", "version": "1.0", "sha256": "126yn0kj6znpigxg7hsmpn67149mgl1nzv6zp772cwd8pdwpyklw", - "depends": ["gridExtra", "LaplacesDemon", "Matrix", "Rcpp", "RcppArmadillo", "sp", "spdep"] + "depends": ["LaplacesDemon", "Matrix", "Rcpp", "RcppArmadillo", "gridExtra", "sp", "spdep"] }, "DIFboost": { "name": "DIFboost", @@ -7121,7 +7223,7 @@ "name": "DIFplus", "version": "1.1", "sha256": "1k03lr437gx5y762z3h40hz9kcl4m8xgrndxvbyvsgmn2h6pbwsd", - "depends": ["plyr", "TestDataImputation"] + "depends": ["TestDataImputation", "plyr"] }, "DIFshiny": { "name": "DIFshiny", @@ -7133,7 +7235,7 @@ "name": "DIFtree", "version": "3.1.6", "sha256": "1ps3nb1a5dgxs187bcjsys4fpi0z4z6d84qlxg8rf1rvcfgg21r5", - "depends": ["gridBase", "penalized", "plotrix", "VGAM"] + "depends": ["VGAM", "gridBase", "penalized", "plotrix"] }, "DIGSS": { "name": "DIGSS", @@ -7169,13 +7271,13 @@ "name": "DIZtools", "version": "1.0.1", "sha256": "0i42k7h82x9g0mha8ppk17h3srgfjgwb9ysnib80pkjnp59kmpa5", - "depends": ["cleaR", "config", "data_table", "logger", "magrittr", "parsedate", "R_utils"] + "depends": ["R_utils", "cleaR", "config", "data_table", "logger", "magrittr", "parsedate"] }, "DIZutils": { "name": "DIZutils", "version": "0.1.2", "sha256": "1kra2b1qbbs6yf5aqlianszqbybni4iqzks0gxg5hdmdzphzb0hb", - "depends": ["data_table", "DBI", "DIZtools", "Hmisc", "psych", "RJDBC", "RJSONIO", "RPostgres", "xml2"] + "depends": ["DBI", "DIZtools", "Hmisc", "RJDBC", "RJSONIO", "RPostgres", "data_table", "psych", "xml2"] }, "DIconvex": { "name": "DIconvex", @@ -7193,19 +7295,19 @@ "name": "DImodelsMulti", "version": "1.1.1", "sha256": "1av5kfvshy05xqipp4qa5fhj4yd55wfpznx91l2fgdklxbnjr0v4", - "depends": ["DImodels", "dplyr", "knitr", "Matrix", "nlme", "plyr", "reshape2"] + "depends": ["DImodels", "Matrix", "dplyr", "knitr", "nlme", "plyr", "reshape2"] }, "DImodelsVis": { "name": "DImodelsVis", "version": "1.0.1", "sha256": "1j224j3xj1scf1smy2zk0dwv3calkx3jzpn989w9hjck96x657n5", - "depends": ["cli", "DImodels", "dplyr", "forcats", "ggfortify", "ggplot2", "ggtext", "glue", "insight", "metR", "PieGlyph", "plotwidgets", "rlang", "scales", "tidyr"] + "depends": ["DImodels", "PieGlyph", "cli", "dplyr", "forcats", "ggfortify", "ggplot2", "ggtext", "glue", "insight", "metR", "plotwidgets", "rlang", "scales", "tidyr"] }, "DIscBIO": { "name": "DIscBIO", "version": "1.2.2", "sha256": "0zr1lpfqn8q3xhh27aa59j5xq70fxhzkwqaqfi34zfsiqzb7cy6a", - "depends": ["AnnotationDbi", "cluster", "fpc", "ggplot2", "httr", "igraph", "impute", "mclust", "NetIndices", "org_Hs_eg_db", "png", "RColorBrewer", "rpart", "rpart_plot", "RWeka", "SingleCellExperiment", "statmod", "TSCAN", "tsne", "vegan", "withr"] + "depends": ["AnnotationDbi", "NetIndices", "RColorBrewer", "RWeka", "SingleCellExperiment", "TSCAN", "cluster", "fpc", "ggplot2", "httr", "igraph", "impute", "mclust", "org_Hs_eg_db", "png", "rpart", "rpart_plot", "statmod", "tsne", "vegan", "withr"] }, "DJL": { "name": "DJL", @@ -7229,13 +7331,13 @@ "name": "DLL", "version": "1.0.0", "sha256": "00xj6r1i4qhv0lq9ky88pw26nkc3ywhl23j9rsh2z5jn4dqpwpcg", - "depends": ["glmnet", "locpol", "MASS", "SAM"] + "depends": ["MASS", "SAM", "glmnet", "locpol"] }, "DLMtool": { "name": "DLMtool", "version": "6.0.6", "sha256": "1lhskk4022vzvmwki08jkwpz3scirbdr0imkpzb9dqfhvmsdyafx", - "depends": ["dplyr", "ggplot2", "MSEtool", "Rcpp", "RcppEigen", "TMB"] + "depends": ["MSEtool", "Rcpp", "RcppEigen", "TMB", "dplyr", "ggplot2"] }, "DLPCA": { "name": "DLPCA", @@ -7243,12 +7345,6 @@ "sha256": "1fjpkn32rx8m18k6pr2cf180wqr01f9kviqibwsghnkrhbzcgpiy", "depends": [] }, - "DMCfun": { - "name": "DMCfun", - "version": "3.5.4", - "sha256": "0kw0hzg5hwj76yz02ws62dmji7ggjm5isnh4blfhw55fsn7b6aic", - "depends": ["BH", "DEoptim", "dplyr", "pbapply", "Rcpp", "tidyr"] - }, "DMMF": { "name": "DMMF", "version": "0.5.2.0", @@ -7283,13 +7379,13 @@ "name": "DMwR2", "version": "0.0.2", "sha256": "1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9", - "depends": ["class", "DBI", "dplyr", "quantmod", "readr", "rpart", "xts", "zoo"] + "depends": ["DBI", "class", "dplyr", "quantmod", "readr", "rpart", "xts", "zoo"] }, "DNAmixturesLite": { "name": "DNAmixturesLite", "version": "0.0-1", "sha256": "14f373an89ra7v2q3mlc4s7svriydzs7jp8zp3arsbg4ali1g037", - "depends": ["gRaven", "gRbase", "Matrix", "numDeriv", "Rsolnp"] + "depends": ["Matrix", "Rsolnp", "gRaven", "gRbase", "numDeriv"] }, "DNAmotif": { "name": "DNAmotif", @@ -7307,7 +7403,7 @@ "name": "DNAtools", "version": "0.2-4", "sha256": "1xcpp5jw5xq6a6ccq8jsd4d7ailv3iv8k7b1bbz531vhy9im2dzs", - "depends": ["multicool", "Rcpp", "RcppParallel", "RcppProgress", "Rsolnp"] + "depends": ["Rcpp", "RcppParallel", "RcppProgress", "Rsolnp", "multicool"] }, "DNH4": { "name": "DNH4", @@ -7319,13 +7415,13 @@ "name": "DNLC", "version": "1.0.0", "sha256": "05410xgpfjsydjmnzry454qcjpws9vhh252q2xq7l0scdj87ly00", - "depends": ["caTools", "fdrtool", "GOstats", "igraph", "locfdr", "mvtnorm", "spdep"] + "depends": ["GOstats", "caTools", "fdrtool", "igraph", "locfdr", "mvtnorm", "spdep"] }, "DNMF": { "name": "DNMF", "version": "1.4.2", "sha256": "10zzbi0jywlnq4hxqb0dh7xrn8gj75asd4yc1mcl2dbjpi68sn56", - "depends": ["doParallel", "foreach", "gplots", "Matrix"] + "depends": ["Matrix", "doParallel", "foreach", "gplots"] }, "DNetFinder": { "name": "DNetFinder", @@ -7391,13 +7487,13 @@ "name": "DPBBM", "version": "0.2.5", "sha256": "1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2", - "depends": ["CEoptim", "gplots", "tmvtnorm", "VGAM"] + "depends": ["CEoptim", "VGAM", "gplots", "tmvtnorm"] }, "DPP": { "name": "DPP", "version": "0.1.2", "sha256": "1qalcm4gwh03qpy07d0p323ccq8xmk04v6z30g7wg6ic613bqg7m", - "depends": ["coda", "Rcpp"] + "depends": ["Rcpp", "coda"] }, "DPQ": { "name": "DPQ", @@ -7409,55 +7505,55 @@ "name": "DPQmpfr", "version": "0.3-2", "sha256": "0inj9i876bx2d9pvbazl0q1x2anc4raknay4y9iqkqskm72pwkvp", - "depends": ["DPQ", "gmp", "Rmpfr", "sfsmisc"] + "depends": ["DPQ", "Rmpfr", "gmp", "sfsmisc"] }, "DPTM": { "name": "DPTM", - "version": "1.3.8", - "sha256": "01zc74g7pyh9xbb11gisrszzdhxx1902970ka30ivzcwvi81243s", - "depends": ["BayesianTools", "coda", "MASS", "parabar", "purrr", "Rcpp", "RcppEigen"] + "version": "1.5.0", + "sha256": "1qjk6q4kx7mlzmp15gz468ky6jia3pf16jxyzjhf857z4yi5szl6", + "depends": ["BayesianTools", "MASS", "Rcpp", "RcppEigen", "coda", "parabar", "purrr"] }, "DPpack": { "name": "DPpack", "version": "0.1.0", "sha256": "1kip6n4pxpk5byjdn5m6l8s5l49dvkh78wn6n85dri0c2snkvs17", - "depends": ["dplyr", "e1071", "ggplot2", "MASS", "nloptr", "R6", "Rdpack", "rmutil"] + "depends": ["MASS", "R6", "Rdpack", "dplyr", "e1071", "ggplot2", "nloptr", "rmutil"] }, "DPtree": { "name": "DPtree", "version": "1.0.1", "sha256": "0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7", - "depends": ["MASS", "MCMCpack", "plyr", "Rdpack"] + "depends": ["MASS", "MCMCpack", "Rdpack", "plyr"] }, "DQAgui": { "name": "DQAgui", "version": "0.2.4", "sha256": "05qik0zm7ghrn75msrkfi20lxdk9bqjvwwf765ajpfaph5wmmxk5", - "depends": ["data_table", "daterangepicker", "DIZtools", "DIZutils", "DQAstats", "DT", "jsonlite", "knitr", "lubridate", "magrittr", "parsedate", "shiny", "shinyalert", "shinydashboard", "shinyFiles", "shinyjs", "shinyWidgets", "waiter"] + "depends": ["DIZtools", "DIZutils", "DQAstats", "DT", "data_table", "daterangepicker", "jsonlite", "knitr", "lubridate", "magrittr", "parsedate", "shiny", "shinyFiles", "shinyWidgets", "shinyalert", "shinydashboard", "shinyjs", "waiter"] }, "DQAstats": { "name": "DQAstats", "version": "0.3.5", "sha256": "0slp3kq2g4djdfxqx40afxcycyncmdxw757pyrm8anfnpxx4rdvz", - "depends": ["data_table", "DIZtools", "DIZutils", "future", "future_apply", "jsonlite", "kableExtra", "knitr", "magrittr", "parsedate", "quarto", "tinytex"] + "depends": ["DIZtools", "DIZutils", "data_table", "future", "future_apply", "jsonlite", "kableExtra", "knitr", "magrittr", "parsedate", "quarto", "tinytex"] }, "DR_SC": { "name": "DR.SC", "version": "3.4", "sha256": "076halm823dlrj95hqq3ibdb645vd2w68mixi36wdnh7ngr7ih1f", - "depends": ["CompQuadForm", "cowplot", "ggplot2", "GiRaF", "irlba", "MASS", "Matrix", "mclust", "purrr", "RColorBrewer", "Rcpp", "RcppArmadillo", "S4Vectors", "Seurat", "spatstat_geom"] + "depends": ["CompQuadForm", "GiRaF", "MASS", "Matrix", "RColorBrewer", "Rcpp", "RcppArmadillo", "S4Vectors", "Seurat", "cowplot", "ggplot2", "irlba", "mclust", "purrr", "spatstat_geom"] }, "DRAYL": { "name": "DRAYL", "version": "1.0", "sha256": "0cf5pyx6nwh8srdylpnmymv3dr67fm6qqpwd1hvj1wmyfc8fznpp", - "depends": ["cubature", "pracma", "RConics", "rmutil"] + "depends": ["RConics", "cubature", "pracma", "rmutil"] }, "DRDID": { "name": "DRDID", - "version": "1.0.6", - "sha256": "1grhnk0b6v5c31497mfr9b4n2fn3flkw40r3lznhxgn2psphpjz7", - "depends": ["BMisc", "trust"] + "version": "1.0.7", + "sha256": "0a4hp5ngwjgdfphphdpp09g08wrfx130wdqngaza468kv8zp7prf", + "depends": ["BMisc", "Rcpp", "trust"] }, "DRDRtest": { "name": "DRDRtest", @@ -7487,7 +7583,7 @@ "name": "DRR", "version": "0.0.4", "sha256": "1y70si1gig4l7jx5jiqsqliyywfsvimkx53x3zh1lc3yj2j6bqwk", - "depends": ["CVST", "kernlab", "Matrix"] + "depends": ["CVST", "Matrix", "kernlab"] }, "DRaWR": { "name": "DRaWR", @@ -7499,7 +7595,7 @@ "name": "DRomics", "version": "2.5-2", "sha256": "0nzxrsgid7w63ybya389nqn8bqkbp29fiz2g6v3nhk5l2hr001p6", - "depends": ["DESeq2", "ggfortify", "ggplot2", "limma", "rlang", "SummarizedExperiment"] + "depends": ["DESeq2", "SummarizedExperiment", "ggfortify", "ggplot2", "limma", "rlang"] }, "DRquality": { "name": "DRquality", @@ -7511,25 +7607,25 @@ "name": "DRviaSPCN", "version": "0.1.4", "sha256": "1m111n2ycr5z3dy3mhkyxfw0fq74lny0kajk91d0klcpixfv7y2g", - "depends": ["ChemmineR", "clusterProfiler", "GSVA", "igraph", "pheatmap", "sp"] + "depends": ["ChemmineR", "GSVA", "clusterProfiler", "igraph", "pheatmap", "sp"] }, "DSAIDE": { "name": "DSAIDE", "version": "0.9.6", "sha256": "01yljprcwkq0n7w9yr1xlkajyzyd0n8kmxkj80wcldp5mvqjmyxd", - "depends": ["adaptivetau", "deSolve", "dplyr", "ggplot2", "gridExtra", "lhs", "nloptr", "plotly", "rlang", "shiny", "XML"] + "depends": ["XML", "adaptivetau", "deSolve", "dplyr", "ggplot2", "gridExtra", "lhs", "nloptr", "plotly", "rlang", "shiny"] }, "DSAIRM": { "name": "DSAIRM", "version": "0.9.6", "sha256": "0zp5dcfdzrywp252d1dcyvaxn8lygqs7hzxk0v9yzgahrbxnlvw9", - "depends": ["adaptivetau", "boot", "deSolve", "dplyr", "ggplot2", "gridExtra", "lhs", "nloptr", "plotly", "rlang", "shiny", "XML"] + "depends": ["XML", "adaptivetau", "boot", "deSolve", "dplyr", "ggplot2", "gridExtra", "lhs", "nloptr", "plotly", "rlang", "shiny"] }, "DSAM": { "name": "DSAM", "version": "1.0.2", "sha256": "1bm7wicpq372xnwlib18434cid90vy575zc4f4xgsy2vsm8f87ym", - "depends": ["caret", "kohonen", "Matrix", "pROC", "xgboost"] + "depends": ["Matrix", "caret", "kohonen", "pROC", "xgboost"] }, "DSBayes": { "name": "DSBayes", @@ -7541,7 +7637,7 @@ "name": "DSI", "version": "1.6.0", "sha256": "0i8035zw2a8d8l9qm4zcm73102k89sifma3pdk3q6mdm1iqgxjxg", - "depends": ["progress", "R6"] + "depends": ["R6", "progress"] }, "DSL": { "name": "DSL", @@ -7557,9 +7653,9 @@ }, "DSMolgenisArmadillo": { "name": "DSMolgenisArmadillo", - "version": "2.0.5", - "sha256": "0bz0gkymd49sswwkj9hq9b6d0dcny74r70fsbpr2s189j5kx98ns", - "depends": ["base64enc", "DSI", "httr", "MolgenisAuth", "stringr", "urltools"] + "version": "2.0.9", + "sha256": "0myhpkblj8dl1csqd91wk7xr4zvnk400ygqbwbajayjn6l7dvqmd", + "depends": ["DSI", "MolgenisAuth", "base64enc", "dplyr", "httr", "jsonlite", "stringr", "urltools"] }, "DSOpal": { "name": "DSOpal", @@ -7577,13 +7673,13 @@ "name": "DSSP", "version": "0.1.1", "sha256": "1z4sfqlgqwhxhm8aryv5c3vlzamn9nx2c49dyi1axq4qpy7dg3pr", - "depends": ["mcmcse", "posterior", "Rcpp", "RcppArmadillo", "rust", "sp"] + "depends": ["Rcpp", "RcppArmadillo", "mcmcse", "posterior", "rust", "sp"] }, "DSWE": { "name": "DSWE", "version": "1.8.2", "sha256": "0xbhbiiq0mhqspxlgzlnrq2zm3gnb8n4rj285rdgq4cbpmfrly6l", - "depends": ["dplyr", "e1071", "FNN", "gss", "KernSmooth", "matrixStats", "mixtools", "Rcpp", "RcppArmadillo", "xgboost"] + "depends": ["FNN", "KernSmooth", "Rcpp", "RcppArmadillo", "dplyr", "e1071", "gss", "matrixStats", "mixtools", "xgboost"] }, "DSjobtracker": { "name": "DSjobtracker", @@ -7607,7 +7703,7 @@ "name": "DTAT", "version": "0.3-7", "sha256": "0rh09bdygqwzdlx0girs2ir5dy3jd3r2m4xia46njxvh3jld5vsg", - "depends": ["data_table", "dplyr", "Hmisc", "jsonlite", "km_ci", "pomp", "r2d3", "shiny", "survival"] + "depends": ["Hmisc", "data_table", "dplyr", "jsonlite", "km_ci", "pomp", "r2d3", "shiny", "survival"] }, "DTAXG": { "name": "DTAXG", @@ -7625,7 +7721,7 @@ "name": "DTComPair", "version": "1.2.4", "sha256": "1p1s0fslylykhmvwc962jcifkbb77ah0lxah596akvxlyrqkjpqk", - "depends": ["ellipse", "gee", "PropCIs"] + "depends": ["PropCIs", "ellipse", "gee"] }, "DTDA": { "name": "DTDA", @@ -7637,7 +7733,7 @@ "name": "DTDA.cif", "version": "1.0.2", "sha256": "12vkhqxdhir06s35kr76dwns9m02wyicz3mv4r56fqglsfyw77xr", - "depends": ["doParallel", "foreach", "Rcpp"] + "depends": ["Rcpp", "doParallel", "foreach"] }, "DTDA_ni": { "name": "DTDA.ni", @@ -7661,13 +7757,13 @@ "name": "DTRlearn2", "version": "1.1", "sha256": "0l756zb1wkpa1z5zjkc8jndmh2630gckxxfqslabzjmgsjf7fjgm", - "depends": ["foreach", "glmnet", "kernlab", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "foreach", "glmnet", "kernlab"] }, "DTRreg": { "name": "DTRreg", "version": "2.2", "sha256": "1irgkrar8m0xy97y19j48s8ab9y4cjzbbnhk3mhqbbs2qgam92cw", - "depends": ["nnet", "R6"] + "depends": ["R6", "nnet"] }, "DTSEA": { "name": "DTSEA", @@ -7679,7 +7775,7 @@ "name": "DTSg", "version": "1.1.3", "sha256": "0gln3zliljhs7rmqbyi7nbrzknc4g7psk9rwnd5xh020fa2k2cm1", - "depends": ["checkmate", "data_table", "R6"] + "depends": ["R6", "checkmate", "data_table"] }, "DTWBI": { "name": "DTWBI", @@ -7691,7 +7787,7 @@ "name": "DTWUMI", "version": "1.0", "sha256": "0pybgbfs2yp2ljbs0kra5z70x3llkiwdngp6cadgs3j9rar4vq4q", - "depends": ["dtw", "DTWBI", "e1071", "entropy", "lsa", "rlist"] + "depends": ["DTWBI", "dtw", "e1071", "entropy", "lsa", "rlist"] }, "DTwrappers": { "name": "DTwrappers", @@ -7703,13 +7799,13 @@ "name": "DTwrappers2", "version": "0.0.3", "sha256": "06dz7i5hddqwj307fmkp93v7c4r0nvbi3bi9j4hqx77z7bdy2m8j", - "depends": ["data_table", "DTwrappers"] + "depends": ["DTwrappers", "data_table"] }, "DVHmetrics": { "name": "DVHmetrics", "version": "0.4.2", "sha256": "0dxbjqiqhzjrv867qhxmqavzklq0j3qjv4qwdacyrq8faz82vhv7", - "depends": ["DT", "ggplot2", "KernSmooth", "reshape2", "shiny"] + "depends": ["DT", "KernSmooth", "ggplot2", "reshape2", "shiny"] }, "DWDLargeR": { "name": "DWDLargeR", @@ -7721,13 +7817,13 @@ "name": "DWLS", "version": "0.1.0", "sha256": "02fd5q91shwjzc6bxqv4m8al7q1vl0mah6niymij37p69wlixy42", - "depends": ["dplyr", "e1071", "MAST", "quadprog", "reshape", "ROCR", "Seurat", "SummarizedExperiment", "varhandle"] + "depends": ["MAST", "ROCR", "Seurat", "SummarizedExperiment", "dplyr", "e1071", "quadprog", "reshape", "varhandle"] }, "DWLasso": { "name": "DWLasso", "version": "1.1", "sha256": "1i8j8wjfvg69ldr8ahz1zv3m2wgxd701iph94ad22zs9qwqfg16z", - "depends": ["glmnet", "hglasso", "Matrix"] + "depends": ["Matrix", "glmnet", "hglasso"] }, "DWreg": { "name": "DWreg", @@ -7745,7 +7841,7 @@ "name": "DYNATE", "version": "0.1", "sha256": "172lm5k0hz774a0d2s1hs86q7q50s6n4i4ba8jddy3l5a1gqkpd4", - "depends": ["data_table", "dplyr", "Matrix", "reshape2", "tibble", "tidyverse"] + "depends": ["Matrix", "data_table", "dplyr", "reshape2", "tibble", "tidyverse"] }, "DamiaNN": { "name": "DamiaNN", @@ -7793,7 +7889,7 @@ "name": "DataClean", "version": "1.0", "sha256": "0wkafjyp6c2mx7g1bpz2pbxyl5nm2wba2hly8miizv0fdc762za5", - "depends": ["xlsx", "XML"] + "depends": ["XML", "xlsx"] }, "DataCombine": { "name": "DataCombine", @@ -7817,7 +7913,7 @@ "name": "DataFakeR", "version": "0.1.3", "sha256": "1a25qp627n76qi4xzj62ipiy3qs2qvajcy9inzibwymryizlr0ia", - "depends": ["dplyr", "glue", "magrittr", "purrr", "R6", "tibble", "tidygraph", "yaml"] + "depends": ["R6", "dplyr", "glue", "magrittr", "purrr", "tibble", "tidygraph", "yaml"] }, "DataGraph": { "name": "DataGraph", @@ -7833,9 +7929,9 @@ }, "DataMetProcess": { "name": "DataMetProcess", - "version": "1.0.1", - "sha256": "1dfi96l3cj1pmj747pznrp5glpibkngzwwcs8y3ihk8p1vqjj7sp", - "depends": ["dplyr", "lubridate", "rlang", "tidyr"] + "version": "1.0.2", + "sha256": "1hkp0gldpqrfjnw6cwvrmgs034kdk7igy170640zkwhcsvd6hr4a", + "depends": ["dplyr", "lubridate", "rlang", "shiny", "tidyr"] }, "DataPackageR": { "name": "DataPackageR", @@ -7853,13 +7949,13 @@ "name": "DataSpaceR", "version": "0.7.6", "sha256": "1asrslqmk4sjj99x8pb01yfrw57p64zc6klrk2ghz4g44fr9d0pq", - "depends": ["assertthat", "curl", "data_table", "digest", "httr", "jsonlite", "R6", "Rlabkey"] + "depends": ["R6", "Rlabkey", "assertthat", "curl", "data_table", "digest", "httr", "jsonlite"] }, "DataVisualizations": { "name": "DataVisualizations", "version": "1.3.2", "sha256": "0y8mwgnh3cjapb97a0i4f16nrdhmkd80f6j7z0ivykgfka7jlbqr", - "depends": ["ggplot2", "pracma", "Rcpp", "RcppArmadillo", "reshape2", "sp"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "pracma", "reshape2", "sp"] }, "DataViz": { "name": "DataViz", @@ -7871,7 +7967,7 @@ "name": "DatabaseConnector", "version": "6.3.2", "sha256": "1wl78a2jlyqdbdkq1bhw2ymv6d0dn6d38vym80khhclial76rnzp", - "depends": ["bit64", "checkmate", "DBI", "dbplyr", "digest", "readr", "rJava", "rlang", "SqlRender", "stringr", "urltools"] + "depends": ["DBI", "SqlRender", "bit64", "checkmate", "dbplyr", "digest", "rJava", "readr", "rlang", "stringr", "urltools"] }, "DatabaseConnectorJars": { "name": "DatabaseConnectorJars", @@ -7881,9 +7977,9 @@ }, "DatabionicSwarm": { "name": "DatabionicSwarm", - "version": "1.2.1", - "sha256": "1qdm4na1s4wc8s7j9vp8g8l9lmhqlpzyafkjmm9jzl7wqlgz5ibr", - "depends": ["deldir", "GeneralizedUmatrix", "Rcpp", "RcppArmadillo", "RcppParallel"] + "version": "2.0.0", + "sha256": "1z5amn9b5pgnp58chlqcmz82sdvkmv1682vfy965kh53187gfn20", + "depends": ["ABCanalysis", "GeneralizedUmatrix", "Rcpp", "RcppArmadillo", "RcppParallel", "deldir", "ggplot2"] }, "DatastreamDSWS2R": { "name": "DatastreamDSWS2R", @@ -7913,13 +8009,13 @@ "name": "DeBoinR", "version": "1.0", "sha256": "0brwk24q2wgmn38y1w1rish8dfdbv10xdzmm2k1drdwgsn72hxis", - "depends": ["dplyr", "ggplot2", "gridExtra", "KernSmooth", "pracma"] + "depends": ["KernSmooth", "dplyr", "ggplot2", "gridExtra", "pracma"] }, "DeCAFS": { "name": "DeCAFS", "version": "3.3.3", "sha256": "0dj32rck6ssyv82d8b75qgsqw319q02iqd3xxazy6251wcjn321i", - "depends": ["ggplot2", "Rcpp", "robustbase"] + "depends": ["Rcpp", "ggplot2", "robustbase"] }, "DeRezende_Ferreira": { "name": "DeRezende.Ferreira", @@ -7931,7 +8027,7 @@ "name": "DebiasInfer", "version": "0.2", "sha256": "02r1pc5s1vwnvz6cxb2gkc3x4x9vw8nb2zw1z8hyyxp5n8n8d2mf", - "depends": ["caret", "CVXR"] + "depends": ["CVXR", "caret"] }, "DeclareDesign": { "name": "DeclareDesign", @@ -7943,19 +8039,19 @@ "name": "DecomposeR", "version": "1.0.6", "sha256": "0f5bagmn0s15qhw0c7fiv96r2ih365fak1rz3pxfnaqmm20l2j8i", - "depends": ["colorRamps", "dplyr", "hexbin", "StratigrapheR", "tictoc", "usethis"] + "depends": ["StratigrapheR", "colorRamps", "dplyr", "hexbin", "tictoc", "usethis"] }, "DecorateR": { "name": "DecorateR", "version": "0.1.2", "sha256": "1za2qvdq96f75rmnm421xmq8s01ny4666ghv14i72iy3s4ml2hq9", - "depends": ["rJava", "RWeka", "RWekajars"] + "depends": ["RWeka", "RWekajars", "rJava"] }, "Deducer": { "name": "Deducer", "version": "0.7-9", "sha256": "14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6", - "depends": ["car", "e1071", "effects", "foreign", "ggplot2", "JGR", "MASS", "multcomp", "plyr", "rJava", "scales"] + "depends": ["JGR", "MASS", "car", "e1071", "effects", "foreign", "ggplot2", "multcomp", "plyr", "rJava", "scales"] }, "DeductiveR": { "name": "DeductiveR", @@ -7963,10 +8059,16 @@ "sha256": "0bx1ad2gw0pf03z0im31mzaa26jxwws6fkbcj319kd8b4s4wp92y", "depends": ["dplyr", "ggplot2", "moments", "reshape2"] }, + "DeepLearningCausal": { + "name": "DeepLearningCausal", + "version": "0.0.104", + "sha256": "02n0prw6g0sslxwr3p5msbcqr2bny702pbf22vs6f0f9xc5gqkd6", + "depends": ["Hmisc", "ROCR", "SuperLearner", "caret", "class", "e1071", "gam", "gbm", "glmnet", "neuralnet", "randomForest", "weights", "xgboost"] + }, "Delaporte": { "name": "Delaporte", - "version": "8.4.0", - "sha256": "1jqz2qxig35rhmwvazmsl3a081dylfq2jfz3bjpj61y4c55mnwar", + "version": "8.4.1", + "sha256": "1gv0js21x5sh54vjkvyh41ph1ixk1nw7ajm111fwz95prd9wx04v", "depends": [] }, "DelayedEffect_Design": { @@ -7997,7 +8099,7 @@ "name": "DemoKin", "version": "1.0.3", "sha256": "0ph60ifffg29a88f9qxkx6zvcv8rxl1q5wd39j5zz2fqm3ggz47v", - "depends": ["data_table", "dplyr", "igraph", "lifecycle", "magrittr", "MASS", "Matrix", "matrixcalc", "progress", "purrr", "tidyr"] + "depends": ["MASS", "Matrix", "data_table", "dplyr", "igraph", "lifecycle", "magrittr", "matrixcalc", "progress", "purrr", "tidyr"] }, "DemografixeR": { "name": "DemografixeR", @@ -8033,7 +8135,7 @@ "name": "DepCens", "version": "0.2.3", "sha256": "0sz7bj6pqwj6appyymajav0q5g1hrpaa8m75rx4drfjdp0lv7ihq", - "depends": ["dlm", "Formula", "matrixStats", "rootSolve", "survival"] + "depends": ["Formula", "dlm", "matrixStats", "rootSolve", "survival"] }, "DepLogo": { "name": "DepLogo", @@ -8045,7 +8147,7 @@ "name": "DepthProc", "version": "2.1.5", "sha256": "0i7fks5hglf3xj8cj3sghjf0xcldhiqwf0jlpyk2a3mj9gaszc76", - "depends": ["colorspace", "geometry", "ggplot2", "lattice", "MASS", "np", "Rcpp", "RcppArmadillo", "rrcov", "sm", "zoo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "colorspace", "geometry", "ggplot2", "lattice", "np", "rrcov", "sm", "zoo"] }, "Deriv": { "name": "Deriv", @@ -8055,21 +8157,21 @@ }, "DescTools": { "name": "DescTools", - "version": "0.99.54", - "sha256": "16qbm1l1281yj1cg6fp8xgd8xdshpz9a09f0b9cyimsjbm01c2j7", - "depends": ["boot", "cli", "data_table", "Exact", "expm", "gld", "httr", "MASS", "mvtnorm", "Rcpp", "readxl", "rstudioapi", "withr"] + "version": "0.99.55", + "sha256": "07dgif06kl2p2qzcg827y05al1k1qy21a5gkz24jbd6xds161mg5", + "depends": ["Exact", "MASS", "Rcpp", "boot", "cli", "data_table", "expm", "gld", "httr", "mvtnorm", "readxl", "rstudioapi", "withr"] }, "DescToolsAddIns": { "name": "DescToolsAddIns", - "version": "1.10", - "sha256": "0wgcfrxf2vygr7rylkbfzlgldg6llg4k4bzwrq8c73miwac158js", + "version": "1.11", + "sha256": "160xd95njj1pk11grdrs2mzx1h98q8fin46yg8jiyi16rlyvxm4l", "depends": ["DescTools", "foreign", "manipulate", "rstudioapi", "writexl"] }, "DescrTab2": { "name": "DescrTab2", "version": "2.1.16", "sha256": "07921k8h50wycj0sijy8428p3c8ach90swgzz0s06b6z1yl2mnyg", - "depends": ["cli", "DescTools", "dplyr", "exact2x2", "flextable", "forcats", "haven", "Hmisc", "kableExtra", "knitr", "magrittr", "nlme", "officer", "rlang", "rmarkdown", "scales", "stringr", "tibble"] + "depends": ["DescTools", "Hmisc", "cli", "dplyr", "exact2x2", "flextable", "forcats", "haven", "kableExtra", "knitr", "magrittr", "nlme", "officer", "rlang", "rmarkdown", "scales", "stringr", "tibble"] }, "DescribeDF": { "name": "DescribeDF", @@ -8093,7 +8195,7 @@ "name": "DescriptiveStats.OBeu", "version": "1.3.2", "sha256": "0f2inlfkwl2q9ll5lh0ynpsbf6zci149s5nj0s0x0g98z72z8mly", - "depends": ["dplyr", "jsonlite", "magrittr", "RCurl", "reshape"] + "depends": ["RCurl", "dplyr", "jsonlite", "magrittr", "reshape"] }, "DescriptiveWH": { "name": "DescriptiveWH", @@ -8129,13 +8231,13 @@ "name": "DetMCD", "version": "0.0.5", "sha256": "034wb5hwpikli6h2rwiqr19qvzxrr4qwi4q436y7c5a5wgkfzgl5", - "depends": ["pcaPP", "Rcpp", "RcppEigen", "robustbase"] + "depends": ["Rcpp", "RcppEigen", "pcaPP", "robustbase"] }, "DetR": { "name": "DetR", "version": "0.0.5", "sha256": "1dd4nzkgj5pl9397aa0z3q5fpl27xbdf7q0pqbs821dyynylxzn9", - "depends": ["MASS", "pcaPP", "Rcpp", "RcppEigen", "robustbase"] + "depends": ["MASS", "Rcpp", "RcppEigen", "pcaPP", "robustbase"] }, "DevTreatRules": { "name": "DevTreatRules", @@ -8147,7 +8249,7 @@ "name": "Devore7", "version": "0.7.6", "sha256": "1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw", - "depends": ["lattice", "MASS"] + "depends": ["MASS", "lattice"] }, "Dforest": { "name": "Dforest", @@ -8171,7 +8273,7 @@ "name": "DiPALM", "version": "1.2", "sha256": "0y6nzf7lkf0znp88r7k0myf5k1c7cqcc2gh5kgzj5q8savhr90ax", - "depends": ["ggplot2", "limma", "WGCNA"] + "depends": ["WGCNA", "ggplot2", "limma"] }, "DiPhiSeq": { "name": "DiPhiSeq", @@ -8187,9 +8289,9 @@ }, "DiSCos": { "name": "DiSCos", - "version": "0.1.0", - "sha256": "0n74v8r14ny1njbvlbbm4i275x7x923aw2v2wqag6d4q38w5237g", - "depends": ["CVXR", "data_table", "evmix", "extremeStat", "ggplot2", "MASS", "pracma", "Rdpack"] + "version": "0.1.1", + "sha256": "0xwbiaqmlp7bpnkagadc87ay7shp9gls7d6vhi7ksws9r03134sm", + "depends": ["CVXR", "MASS", "Rdpack", "data_table", "evmix", "extremeStat", "ggplot2", "pracma"] }, "DiSSMod": { "name": "DiSSMod", @@ -8201,7 +8303,7 @@ "name": "DiagrammeR", "version": "1.0.11", "sha256": "1py4yii88lsyj8y71d2v0rb9lk5hvhfh0q8n2q4288wqw7bf6wz8", - "depends": ["cli", "dplyr", "glue", "htmltools", "htmlwidgets", "igraph", "magrittr", "purrr", "RColorBrewer", "readr", "rlang", "rstudioapi", "scales", "stringr", "tibble", "tidyr", "viridisLite", "visNetwork"] + "depends": ["RColorBrewer", "cli", "dplyr", "glue", "htmltools", "htmlwidgets", "igraph", "magrittr", "purrr", "readr", "rlang", "rstudioapi", "scales", "stringr", "tibble", "tidyr", "viridisLite", "visNetwork"] }, "DiagrammeRsvg": { "name": "DiagrammeRsvg", @@ -8243,13 +8345,13 @@ "name": "DiceView", "version": "2.2-0", "sha256": "1a7jlj7nmj41zfmpb54iwi8c9g44d376cc353ybr8dq8vkyq0vss", - "depends": ["DiceDesign", "foreach", "geometry", "R_cache", "scatterplot3d"] + "depends": ["DiceDesign", "R_cache", "foreach", "geometry", "scatterplot3d"] }, "Dict": { "name": "Dict", "version": "0.1.0", "sha256": "1v8yp03gajg9i82qyfww14jx93l4jbfq8mh6jqyf6calgrsj06jc", - "depends": ["dplyr", "magrittr", "purrr", "R6", "rlang"] + "depends": ["R6", "dplyr", "magrittr", "purrr", "rlang"] }, "DidacticBoost": { "name": "DidacticBoost", @@ -8261,7 +8363,7 @@ "name": "Diderot", "version": "0.13", "sha256": "04d1drxn99r0fqq3zym7yyip9c8rfqhghq20q4zyb42l3hfgv9ai", - "depends": ["data_table", "doParallel", "foreach", "igraph", "RCurl", "splitstackshape", "stringi"] + "depends": ["RCurl", "data_table", "doParallel", "foreach", "igraph", "splitstackshape", "stringi"] }, "DiffCorr": { "name": "DiffCorr", @@ -8273,13 +8375,13 @@ "name": "DiffNet", "version": "1.0.2", "sha256": "1hil8p896vckgwmlr8vqkrwswclwh1hs8gxvk648gpahi1na1ssc", - "depends": ["assertthat", "igraph", "MASS"] + "depends": ["MASS", "assertthat", "igraph"] }, "DiffXTables": { "name": "DiffXTables", "version": "0.1.3", "sha256": "0a0q1fz80jlcrk4rw70yjb8djxgsm5axih45vi4dqpg6n8xlrzw2", - "depends": ["pander", "Rdpack"] + "depends": ["Rdpack", "pander"] }, "DirStats": { "name": "DirStats", @@ -8291,7 +8393,7 @@ "name": "Dire", "version": "2.2.0", "sha256": "140qqpp0vhqw0vmzff58sx51nj21x61z063j4j23nrdrl3ylamcv", - "depends": ["foreach", "haven", "iterators", "lbfgs", "MASS", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "foreach", "haven", "iterators", "lbfgs"] }, "DirectEffects": { "name": "DirectEffects", @@ -8313,9 +8415,9 @@ }, "Directional": { "name": "Directional", - "version": "6.6", - "sha256": "0fgwhah78psgd7fhjgk9rw1hyhfx9qbj93bznsjs6dhjkp9wyn4q", - "depends": ["bigstatsr", "doParallel", "foreach", "ggplot2", "magrittr", "Rfast", "Rfast2", "rgl", "Rnanoflann", "rnaturalearth", "sf"] + "version": "6.7", + "sha256": "1i9dwk1r44b47insw5iz5vgk7g9zi78wlix2cv2g02phcrz5wqa2", + "depends": ["Rfast", "Rfast2", "Rnanoflann", "bigstatsr", "doParallel", "foreach", "ggplot2", "magrittr", "rgl", "rnaturalearth", "sf"] }, "DirichletReg": { "name": "DirichletReg", @@ -8333,13 +8435,13 @@ "name": "DisImpact", "version": "0.0.21", "sha256": "1vc2kwcb3cvcdbdg0s5qnjdzn8qa7lv6f86milhxdf609k2zwdkx", - "depends": ["collapse", "data_table", "DBI", "dplyr", "duckdb", "fst", "glue", "purrr", "rlang", "sets", "stringr", "tidyr", "tidyselect"] + "depends": ["DBI", "collapse", "data_table", "dplyr", "duckdb", "fst", "glue", "purrr", "rlang", "sets", "stringr", "tidyr", "tidyselect"] }, "DisaggregateTS": { "name": "DisaggregateTS", "version": "2.0.0", "sha256": "17d9mvznxysyybmnl5yz0sx15dxxry4vxpafp35s3sdlarg5jv39", - "depends": ["lars", "Matrix", "Rdpack", "withr", "zoo"] + "depends": ["Matrix", "Rdpack", "lars", "withr", "zoo"] }, "DiscreteDatasets": { "name": "DiscreteDatasets", @@ -8349,9 +8451,9 @@ }, "DiscreteFDR": { "name": "DiscreteFDR", - "version": "1.3.7", - "sha256": "0yph01q0aw7dfv3cmhv6mjb0vcphifzj1z9iddpw9zhkryadj7gg", - "depends": ["lifecycle", "Rcpp"] + "version": "2.0.0", + "sha256": "02yj9pfxh1f4fgij4gq29aijd42im9b6npyhw4jirdpl7zkh0j8i", + "depends": ["DiscreteDatasets", "DiscreteTests", "Rcpp", "RcppArmadillo", "checkmate", "lifecycle"] }, "DiscreteInverseWeibull": { "name": "DiscreteInverseWeibull", @@ -8373,9 +8475,9 @@ }, "DiscreteTests": { "name": "DiscreteTests", - "version": "0.1.2", - "sha256": "1f487mx818qz8bp36lnb1lpcfcia7pzmvcxhh6zh0ak0d6xllc2g", - "depends": ["checkmate", "R6"] + "version": "0.2.0", + "sha256": "18257srwfz99531wks60isi1dg95yv1xvpb4hhxh9qw9wijw08sp", + "depends": ["R6", "checkmate", "lifecycle"] }, "DiscreteWeibull": { "name": "DiscreteWeibull", @@ -8393,7 +8495,7 @@ "name": "DistPlotter", "version": "0.0.2", "sha256": "0aws4qs6802y42m07ca9m4i0lza282g6kfzx64q652y52md862gk", - "depends": ["colourpicker", "dplyr", "DT", "extraDistr", "ggplot2", "rio", "scales", "shiny", "shinyalert", "shinyBS", "shinyjs", "shinyWidgets", "stringi", "stringr"] + "depends": ["DT", "colourpicker", "dplyr", "extraDistr", "ggplot2", "rio", "scales", "shiny", "shinyBS", "shinyWidgets", "shinyalert", "shinyjs", "stringi", "stringr"] }, "Distance": { "name": "Distance", @@ -8435,7 +8537,7 @@ "name": "DivE", "version": "1.3", "sha256": "1nab00wkq2986sxi8z5hmhadxyzhy181akhzj8vc6bfznrcrnbig", - "depends": ["deSolve", "FME", "sp"] + "depends": ["FME", "deSolve", "sp"] }, "DiversificationR": { "name": "DiversificationR", @@ -8447,13 +8549,13 @@ "name": "DoE.MIParray", "version": "1.0-1", "sha256": "0ginm4wqax2azcns4c17rgdfpclbmn058nq0lmpx90s4q7jfppax", - "depends": ["combinat", "DoE_base"] + "depends": ["DoE_base", "combinat"] }, "DoE_base": { "name": "DoE.base", "version": "1.2-4", "sha256": "0lz0ilz145lhymb42b9yk4ysvm5zlbigc7ba600736cwnlgc0wn0", - "depends": ["combinat", "conf_design", "lattice", "MASS", "numbers", "partitions", "vcd"] + "depends": ["MASS", "combinat", "conf_design", "lattice", "numbers", "partitions", "vcd"] }, "DoE_wrapper": { "name": "DoE.wrapper", @@ -8483,7 +8585,7 @@ "name": "DominoDataR", "version": "0.2.3", "sha256": "1awiy32sm0n2v1z48v4agqm89jnkgqazbjh9zixmj7yd0db78a9v", - "depends": ["arrow", "ConfigParser", "httr", "reticulate"] + "depends": ["ConfigParser", "arrow", "httr", "reticulate"] }, "DoseFinding": { "name": "DoseFinding", @@ -8495,7 +8597,7 @@ "name": "DoubleCone", "version": "1.1", "sha256": "1kbvsj93nn2306s6pgqiiznmlcn2nqsgcxinihl613ivczxhzpqg", - "depends": ["coneproj", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "coneproj"] }, "DoubleExpSeq": { "name": "DoubleExpSeq", @@ -8507,31 +8609,31 @@ "name": "DoubleML", "version": "1.0.1", "sha256": "0qk7zjpzz0dpzvczssfbp4gbqxazyxn0dsc8h9jnqb3syzdscc27", - "depends": ["checkmate", "clusterGeneration", "data_table", "mlr3", "mlr3learners", "mlr3misc", "mlr3tuning", "mvtnorm", "R6", "readstata13"] + "depends": ["R6", "checkmate", "clusterGeneration", "data_table", "mlr3", "mlr3learners", "mlr3misc", "mlr3tuning", "mvtnorm", "readstata13"] }, "Dowd": { "name": "Dowd", "version": "0.12", "sha256": "1fgaq22n7gm8pqxdfkiayqgjfqjn7knjjjr1x12jgv77cv08xyjk", - "depends": ["bootstrap", "forecast", "MASS"] + "depends": ["MASS", "bootstrap", "forecast"] }, "Dpit": { "name": "Dpit", "version": "1.0", "sha256": "02pnc00sk3bwxmxrg27638x0q62r7nsx2nr14zjjc5q880prdisv", - "depends": ["fitdistrplus", "gsl", "moments", "VGAM"] + "depends": ["VGAM", "fitdistrplus", "gsl", "moments"] }, "DrBats": { "name": "DrBats", "version": "0.1.6", "sha256": "1623h8s6y4klq8xmj480ga2wl6n4c2f26v1dwysyvcrk6lnaghdm", - "depends": ["ade4", "coda", "MASS", "Matrix", "rstan", "sde"] + "depends": ["MASS", "Matrix", "ade4", "coda", "rstan", "sde"] }, "DrDimont": { "name": "DrDimont", "version": "0.1.4", "sha256": "1ax70932zn0q21drbp8wr5xy5xjnaqvkqd2cp4cb7bl9f6bcsz9p", - "depends": ["dplyr", "igraph", "magrittr", "readr", "reticulate", "Rfast", "rlang", "stringr", "tibble", "tidyr", "WGCNA"] + "depends": ["Rfast", "WGCNA", "dplyr", "igraph", "magrittr", "readr", "reticulate", "rlang", "stringr", "tibble", "tidyr"] }, "DrImpute": { "name": "DrImpute", @@ -8559,9 +8661,9 @@ }, "DrugExposureDiagnostics": { "name": "DrugExposureDiagnostics", - "version": "1.0.5", - "sha256": "1yy8wqprvqc0sa7nxw044g5j18vy395zkbfsr8ibdnbd4hzxvgkf", - "depends": ["CDMConnector", "checkmate", "dplyr", "DrugUtilisation", "glue", "magrittr", "omopgenerics", "rlang", "tidyr", "tidyselect"] + "version": "1.0.7", + "sha256": "0m3mfnavqnx53i8p723j4mc0r20b3c21i1svrg7dclx0f2c8np8n", + "depends": ["CDMConnector", "DrugUtilisation", "checkmate", "dplyr", "glue", "magrittr", "omopgenerics", "rlang", "tidyr", "tidyselect"] }, "DrugSim2DR": { "name": "DrugSim2DR", @@ -8571,21 +8673,21 @@ }, "DrugUtilisation": { "name": "DrugUtilisation", - "version": "0.6.1", - "sha256": "1b89g84xzdq8sc9nf8vc13x97cgbz0764j21gwkzasn693rn38ym", - "depends": ["CDMConnector", "checkmate", "cli", "DBI", "dbplyr", "dplyr", "glue", "lifecycle", "lubridate", "magrittr", "omopgenerics", "PatientProfiles", "purrr", "RJSONIO", "rlang", "tictoc", "tidyr", "visOmopResults"] + "version": "0.7.0", + "sha256": "09wvw1cv0l3vcsarwiwsiyyakd2i9iw3kj13f2w4lwgw5d225cdc", + "depends": ["CDMConnector", "CodelistGenerator", "PatientProfiles", "checkmate", "cli", "clock", "dbplyr", "dplyr", "glue", "lifecycle", "omopgenerics", "purrr", "rlang", "stringr", "tidyr", "visOmopResults"] }, "DstarM": { "name": "DstarM", "version": "0.4.0", "sha256": "0wm5kr2pkgbvh9svjq8zq46zn50hwf58rs3y1ybnwcfjc2q75h1s", - "depends": ["DEoptim", "ggplot2", "Rcpp", "RcppArmadillo", "rtdists", "RWiener"] + "depends": ["DEoptim", "RWiener", "Rcpp", "RcppArmadillo", "ggplot2", "rtdists"] }, "DtD": { "name": "DtD", "version": "0.2.2", "sha256": "1czspjdxjhbfk2df7wk0x3d1ilwrjqw4s4gdc4hq0gjcjqyx0c39", - "depends": ["checkmate", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "checkmate"] }, "Dtableone": { "name": "Dtableone", @@ -8597,7 +8699,7 @@ "name": "Durga", "version": "2.0", "sha256": "0iq29ga1cn5fnnj1b90pprqcldygmy695si0vq4pr8d59q029ah9", - "depends": ["boot", "RColorBrewer", "vipor"] + "depends": ["RColorBrewer", "boot", "vipor"] }, "DyMEP": { "name": "DyMEP", @@ -8609,7 +8711,7 @@ "name": "DySS", "version": "1.0", "sha256": "1aa67m224bhzzg089rhxwqgbmwwq5py8ikix8khwraz5cnjz2f83", - "depends": ["ggplot2", "gridExtra", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "gridExtra"] }, "Dykstra": { "name": "Dykstra", @@ -8627,7 +8729,7 @@ "name": "DynForest", "version": "1.1.3", "sha256": "0x78gbgzl4dad5g6w27cdfpngsykanv3lz3xffpqndd971wkzhiy", - "depends": ["cmprsk", "DescTools", "doParallel", "doRNG", "foreach", "ggplot2", "lcmm", "pbapply", "pec", "prodlim", "stringr", "survival", "zoo"] + "depends": ["DescTools", "cmprsk", "doParallel", "doRNG", "foreach", "ggplot2", "lcmm", "pbapply", "pec", "prodlim", "stringr", "survival", "zoo"] }, "DynNom": { "name": "DynNom", @@ -8663,7 +8765,7 @@ "name": "DysPIA", "version": "1.3", "sha256": "0ih8sl89h6xbmmjjsbxcvgp6wqk7f1wqzwkc43k3i5w7fgb0hlpc", - "depends": ["BiocParallel", "data_table", "DysPIAData", "fastmatch", "parmigene", "Rcpp"] + "depends": ["BiocParallel", "DysPIAData", "Rcpp", "data_table", "fastmatch", "parmigene"] }, "DysPIAData": { "name": "DysPIAData", @@ -8675,7 +8777,7 @@ "name": "E4tools", "version": "0.1.1", "sha256": "1kmj1fddybjia9ninhcy75kdmq152zjw7s24chpqr5wsblffr3yx", - "depends": ["accelerometry", "anytime", "BBmisc", "chron", "data_table", "DataCombine", "doParallel", "doSNOW", "foreach", "ggplot2", "hms", "scales", "signal"] + "depends": ["BBmisc", "DataCombine", "accelerometry", "anytime", "chron", "data_table", "doParallel", "doSNOW", "foreach", "ggplot2", "hms", "scales", "signal"] }, "EATME": { "name": "EATME", @@ -8687,13 +8789,13 @@ "name": "EAinference", "version": "0.2.3", "sha256": "1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4", - "depends": ["hdi", "limSolve", "MASS", "msm", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "hdi", "limSolve", "msm", "mvtnorm"] }, "EBASE": { "name": "EBASE", "version": "1.0.2", "sha256": "0y36xsh639chsrzb3r6kla6mi34klrqb4x05ixhk4kh4jx2rb63i", - "depends": ["dplyr", "foreach", "ggplot2", "lubridate", "R2jags", "rjags", "tidyr", "truncnorm", "zoo"] + "depends": ["R2jags", "dplyr", "foreach", "ggplot2", "lubridate", "rjags", "tidyr", "truncnorm", "zoo"] }, "EBCHS": { "name": "EBCHS", @@ -8711,13 +8813,13 @@ "name": "EBMAforecast", "version": "1.0.32", "sha256": "01pv873d0sl0qzlgmqw4ahg5ym9gdjzbmzqlg593g5l935r3dgi4", - "depends": ["abind", "glue", "gtools", "Hmisc", "plyr", "Rcpp", "separationplot"] + "depends": ["Hmisc", "Rcpp", "abind", "glue", "gtools", "plyr", "separationplot"] }, "EBPRS": { "name": "EBPRS", "version": "2.1.0", "sha256": "14wal81cai08xr26fpc2w4ramr5jyv7vwfyqb5hzw3kqxx76y9xx", - "depends": ["BEDMatrix", "data_table", "ROCR"] + "depends": ["BEDMatrix", "ROCR", "data_table"] }, "EBglmnet": { "name": "EBglmnet", @@ -8753,13 +8855,13 @@ "name": "ECOTOXr", "version": "1.0.9", "sha256": "0n5vfzg2drffw7yrbvi1rkhkydsmyd8v0scqqrx0cdx84y21l5fl", - "depends": ["crayon", "dbplyr", "dplyr", "httr2", "jsonlite", "lifecycle", "purrr", "rappdirs", "readr", "readxl", "rlang", "RSQLite", "rvest", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["RSQLite", "crayon", "dbplyr", "dplyr", "httr2", "jsonlite", "lifecycle", "purrr", "rappdirs", "readr", "readxl", "rlang", "rvest", "stringr", "tibble", "tidyr", "tidyselect"] }, "ECTSVR": { "name": "ECTSVR", "version": "0.1.0", "sha256": "1l4j1a25cssf2pindkqpzgr7a67brg5qxqk9ysy96vvbc74n8i6l", - "depends": ["urca", "vars", "WeightSVM"] + "depends": ["WeightSVM", "urca", "vars"] }, "ECTTDNN": { "name": "ECTTDNN", @@ -8777,7 +8879,7 @@ "name": "ECoL", "version": "0.3.0", "sha256": "02j4yl6hi83f6m529r6n0gaz8wsy2pi0ncy2g95fjhs8ib0kfn4f", - "depends": ["cluster", "e1071", "FNN", "igraph", "MASS"] + "depends": ["FNN", "MASS", "cluster", "e1071", "igraph"] }, "EDA": { "name": "EDA", @@ -8801,7 +8903,7 @@ "name": "EDISON", "version": "1.1.1", "sha256": "12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7", - "depends": ["corpcor", "MASS"] + "depends": ["MASS", "corpcor"] }, "EDIutils": { "name": "EDIutils", @@ -8843,25 +8945,31 @@ "name": "EEM", "version": "1.1.1", "sha256": "0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj", - "depends": ["colorRamps", "ggplot2", "R_utils", "reshape2", "sp"] + "depends": ["R_utils", "colorRamps", "ggplot2", "reshape2", "sp"] }, "EEMDSVR": { "name": "EEMDSVR", "version": "0.1.0", "sha256": "0m28rrw7lg3sx2aviqphsid2rsp7zksd3fcvk7pxfw16z90y7ifd", - "depends": ["e1071", "Rlibeemd"] + "depends": ["Rlibeemd", "e1071"] }, "EEMDelm": { "name": "EEMDelm", "version": "0.1.1", "sha256": "0riz6s53daqbhy3xif0z8brb0n4swfjxxvvdnx2wwaiwl098rmwa", - "depends": ["forecast", "nnfor", "Rlibeemd"] + "depends": ["Rlibeemd", "forecast", "nnfor"] }, "EEMDlstm": { "name": "EEMDlstm", "version": "0.1.0", "sha256": "0cilmbk100gym5kaa7fq8bx0cdqa07xk82kxgxjf4k6gyzs39nlh", - "depends": ["BiocGenerics", "keras", "magrittr", "reticulate", "Rlibeemd", "tensorflow", "TSdeeplearning", "tsutils"] + "depends": ["BiocGenerics", "Rlibeemd", "TSdeeplearning", "keras", "magrittr", "reticulate", "tensorflow", "tsutils"] + }, + "EEML": { + "name": "EEML", + "version": "0.1.1", + "sha256": "1cwl5qyhxf4d51f0awx8ks355pi5mj6rhl6md5763bnrlakfrbpq", + "depends": ["MCS", "WeightedEnsemble", "topsis"] }, "EESPCA": { "name": "EESPCA", @@ -8873,7 +8981,7 @@ "name": "EFA.MRFA", "version": "1.1.2", "sha256": "0p1zkfwjch9y39r7hjccjk7vfbnfwpdak6jfjs1sdpqkjqiw3r86", - "depends": ["ggplot2", "PCovR", "psych", "reshape2", "scales"] + "depends": ["PCovR", "ggplot2", "psych", "reshape2", "scales"] }, "EFA_dimensions": { "name": "EFA.dimensions", @@ -8885,7 +8993,7 @@ "name": "EFAtools", "version": "0.4.4", "sha256": "1fzkmvadkcd88d81420lw9mhpmxbjymp4jada2c79bxq1h6b3mw2", - "depends": ["checkmate", "cli", "crayon", "dplyr", "future", "future_apply", "ggplot2", "GPArotation", "lavaan", "magrittr", "progress", "progressr", "psych", "Rcpp", "RcppArmadillo", "rlang", "stringr", "tibble", "tidyr", "viridisLite"] + "depends": ["GPArotation", "Rcpp", "RcppArmadillo", "checkmate", "cli", "crayon", "dplyr", "future", "future_apply", "ggplot2", "lavaan", "magrittr", "progress", "progressr", "psych", "rlang", "stringr", "tibble", "tidyr", "viridisLite"] }, "EFAutilities": { "name": "EFAutilities", @@ -8897,19 +9005,19 @@ "name": "EFDR", "version": "1.3", "sha256": "0mjf2r1aa5iyf4b9f50mb50h1rmhwdi3qyh235mihy3pj68195yn", - "depends": ["copula", "doParallel", "dplyr", "foreach", "gstat", "Matrix", "sp", "tidyr", "waveslim"] + "depends": ["Matrix", "copula", "doParallel", "dplyr", "foreach", "gstat", "sp", "tidyr", "waveslim"] }, "EFS": { "name": "EFS", "version": "1.0.3", "sha256": "1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54", - "depends": ["party", "pROC", "randomForest", "ROCR"] + "depends": ["ROCR", "pROC", "party", "randomForest"] }, "EGAnet": { "name": "EGAnet", "version": "2.0.6", "sha256": "1mdnbxmpghk95wm3vy3m1yb0w39ym5v15cjznnyg17w7fy48mk3y", - "depends": ["dendextend", "fungible", "future", "future_apply", "GGally", "ggplot2", "ggpubr", "glasso", "GPArotation", "igraph", "lavaan", "Matrix", "network", "progressr", "qgraph", "semPlot", "sna"] + "depends": ["GGally", "GPArotation", "Matrix", "dendextend", "fungible", "future", "future_apply", "ggplot2", "ggpubr", "glasso", "igraph", "lavaan", "network", "progressr", "qgraph", "semPlot", "sna"] }, "EGM": { "name": "EGM", @@ -8921,19 +9029,19 @@ "name": "EGRET", "version": "3.0.9", "sha256": "1if22yq5wyfd0sx5b38xw3fbj8qlmbnkikjq77ihxd3pzfjpdl14", - "depends": ["dataRetrieval", "fields", "foreach", "MASS", "survival", "truncnorm"] + "depends": ["MASS", "dataRetrieval", "fields", "foreach", "survival", "truncnorm"] }, "EGRETci": { "name": "EGRETci", "version": "2.0.4", "sha256": "1g01a03smn5yp261cyk3x310m1mcv4bqyh8y123wam9gpa7dxrp6", - "depends": ["binom", "EGRET"] + "depends": ["EGRET", "binom"] }, "EGRNi": { "name": "EGRNi", "version": "0.1.6", "sha256": "0wgdhlmnch6gpypqlwd5z56ia03lbbimr4ci9gcfs8f881dh92dy", - "depends": ["fdrtool", "gdata", "MASS", "readr"] + "depends": ["MASS", "fdrtool", "gdata", "readr"] }, "EHR": { "name": "EHR", @@ -8945,7 +9053,7 @@ "name": "EHRtemporalVariability", "version": "1.2.1", "sha256": "12d1dzmcrp81dh54zkg9zwv11fnc4f8qzc2gngihmlrp1bzq76fi", - "depends": ["dplyr", "lubridate", "MASS", "plotly", "RColorBrewer", "scales", "viridis", "xts", "zoo"] + "depends": ["MASS", "RColorBrewer", "dplyr", "lubridate", "plotly", "scales", "viridis", "xts", "zoo"] }, "EIAapi": { "name": "EIAapi", @@ -8953,11 +9061,17 @@ "sha256": "1vyl7zm8vwqcs57b8sw9vkwc1p123kcz2d2xldg6p2vfkgi91jw1", "depends": ["data_table", "dplyr", "jsonlite", "lubridate"] }, + "EIEntropy": { + "name": "EIEntropy", + "version": "0.0.1.1", + "sha256": "1vw7y3i3qpxaj4m7s8yxi0c4bzipm5ggp2b1f0251xzlhffiisb7", + "depends": ["dplyr", "magrittr"] + }, "EIX": { "name": "EIX", "version": "1.2.0", "sha256": "02ry0aqqnd0zh6zbvx1dbq3sdahyqcgabhkvbbw4ig0qk70w62aj", - "depends": ["DALEX", "data_table", "ggiraphExtra", "ggplot2", "ggrepel", "iBreakDown", "MASS", "purrr", "scales", "tidyr", "xgboost"] + "depends": ["DALEX", "MASS", "data_table", "ggiraphExtra", "ggplot2", "ggrepel", "iBreakDown", "purrr", "scales", "tidyr", "xgboost"] }, "EKMCMC": { "name": "EKMCMC", @@ -8981,7 +9095,7 @@ "name": "ELISAtools", "version": "0.1.5", "sha256": "18f2adhw85f0hsz5gb6xhi0w2phcq364xy9y1jri6ckzs8g0pny7", - "depends": ["minpack_lm", "R2HTML", "stringi"] + "depends": ["R2HTML", "minpack_lm", "stringi"] }, "ELMR": { "name": "ELMR", @@ -9023,7 +9137,7 @@ "name": "EMAS", "version": "0.2.2", "sha256": "07y15nbym69iwdy9c5gcdalign7g8qw8hkcy1v29z6j2di6qzn84", - "depends": ["ggplot2", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "lavaan", "mediation", "minfi", "multilevel", "qqman"] + "depends": ["IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "ggplot2", "lavaan", "mediation", "minfi", "multilevel", "qqman"] }, "EMCluster": { "name": "EMCluster", @@ -9047,7 +9161,7 @@ "name": "EMDSVRhybrid", "version": "0.2.0", "sha256": "1vjr7aslvykbyz8aw2z5aqlqx1v3nv63hym6knygflkkpr9zsr30", - "depends": ["e1071", "EMD"] + "depends": ["EMD", "e1071"] }, "EMJMCMC": { "name": "EMJMCMC", @@ -9071,7 +9185,7 @@ "name": "EMMAgeo", "version": "0.9.7", "sha256": "1wz4zw45xfqbk589cpd188j7619h2ar2czfkisil9x8ksijfixls", - "depends": ["caTools", "GPArotation", "limSolve", "matrixStats", "shiny"] + "depends": ["GPArotation", "caTools", "limSolve", "matrixStats", "shiny"] }, "EMMIXSSL": { "name": "EMMIXSSL", @@ -9083,7 +9197,7 @@ "name": "EMMIXgene", "version": "0.1.4", "sha256": "1k82r5ly0rnivvw803jibgsdjmk5nfzqqzcx0yv41i3f60pflv8x", - "depends": ["BH", "ggplot2", "mclust", "Rcpp", "RcppArmadillo", "reshape", "scales"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "ggplot2", "mclust", "reshape", "scales"] }, "EMMIXmfa": { "name": "EMMIXmfa", @@ -9143,13 +9257,13 @@ "name": "EMbC", "version": "2.0.4", "sha256": "03vsyzq4zgv64yzazplj1sm3kgw0pdildcvi8w88b3d0rkjnhn5m", - "depends": ["mnormt", "RColorBrewer", "Rcpp", "RcppArmadillo", "sp", "suntools"] + "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "mnormt", "sp", "suntools"] }, "EMgaussian": { "name": "EMgaussian", "version": "0.2.1", "sha256": "0gl3lfww7chwsvg16m5x6agbza4xx482b56wqccb9zqin0j89dfb", - "depends": ["caret", "glasso", "glassoFast", "lavaan", "Matrix", "matrixcalc", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "caret", "glasso", "glassoFast", "lavaan", "matrixcalc"] }, "EMpeaksR": { "name": "EMpeaksR", @@ -9161,7 +9275,7 @@ "name": "ENMTools", "version": "1.1.2", "sha256": "0xz0v378mfy36yc001zr8j8s2dv6jpq2w2da7n3lsxarr8slqp8m", - "depends": ["dismo", "ENMeval", "forcats", "ggplot2", "ggpubr", "gridExtra", "knitr", "lhs", "magrittr", "raster", "spatstat_geom", "spatstat_random", "terra"] + "depends": ["ENMeval", "dismo", "forcats", "ggplot2", "ggpubr", "gridExtra", "knitr", "lhs", "magrittr", "raster", "spatstat_geom", "spatstat_random", "terra"] }, "ENMeval": { "name": "ENMeval", @@ -9173,7 +9287,7 @@ "name": "EPLSIM", "version": "0.1.0", "sha256": "0x495638nh0n0k3i80vs7bcbdrgvw5fkib8dvwwgzgdgb419hakm", - "depends": ["ciTools", "ggplot2", "MASS"] + "depends": ["MASS", "ciTools", "ggplot2"] }, "EPT": { "name": "EPT", @@ -9221,19 +9335,19 @@ "name": "ERPM", "version": "0.2.0", "sha256": "1c2w61m7qp6ma4kfhgg0bxn4mkvcss340yq2vr7y5s1cbd082ndh", - "depends": ["igraph", "numbers", "RColorBrewer", "snowfall"] + "depends": ["RColorBrewer", "igraph", "numbers", "snowfall"] }, "ERPeq": { "name": "ERPeq", "version": "0.1.0", "sha256": "1619j6fgsg594fdbv9qk64rw2yqsy7wyj8qnwmpnmv66gxc5mqaq", - "depends": ["invgamma", "pracma", "rmutil", "VGAM"] + "depends": ["VGAM", "invgamma", "pracma", "rmutil"] }, "ERSA": { "name": "ERSA", "version": "0.1.4", "sha256": "1ri2v6qxdi9if10vxxhgj0jwk4whfi45aqqdqri918djg0dk75p1", - "depends": ["broom", "car", "combinat", "dplyr", "ggplot2", "leaps", "miniUI", "purrr", "RColorBrewer", "rlang", "shiny", "tidyr"] + "depends": ["RColorBrewer", "broom", "car", "combinat", "dplyr", "ggplot2", "leaps", "miniUI", "purrr", "rlang", "shiny", "tidyr"] }, "ESG": { "name": "ESG", @@ -9251,13 +9365,13 @@ "name": "EScvtmle", "version": "0.0.2", "sha256": "0bp5ykqczj6zyb9g5rg9zwwdyvd3l530km927wwxdi862sh5ri5g", - "depends": ["dplyr", "ggplot2", "gridExtra", "MASS", "origami", "stringr", "SuperLearner", "tidyselect"] + "depends": ["MASS", "SuperLearner", "dplyr", "ggplot2", "gridExtra", "origami", "stringr", "tidyselect"] }, "ETAS": { "name": "ETAS", "version": "0.6.1", "sha256": "1ivnv05cfbrrmglz319202nssghaq15h6l35k1pbal9gg7izd7xm", - "depends": ["fields", "goftest", "lattice", "maps", "Rcpp", "spatstat_explore", "spatstat_geom", "spatstat_random"] + "depends": ["Rcpp", "fields", "goftest", "lattice", "maps", "spatstat_explore", "spatstat_geom", "spatstat_random"] }, "ETASbootstrap": { "name": "ETASbootstrap", @@ -9293,7 +9407,7 @@ "name": "EValue", "version": "4.1.3", "sha256": "0ip4cyipbs6g0znrdh5zs4xizmqgdznq8riggkgyv06wipgx9a2j", - "depends": ["boot", "dplyr", "ggplot2", "metadat", "metafor", "MetaUtility"] + "depends": ["MetaUtility", "boot", "dplyr", "ggplot2", "metadat", "metafor"] }, "EVchargcost": { "name": "EVchargcost", @@ -9307,6 +9421,12 @@ "sha256": "19gd9grjjdv6hilqj41g5qhz7m0ga40q88clwggbp5f0f1yd5sym", "depends": ["Rcpp"] }, + "EWOC_Comb": { + "name": "EWOC.Comb", + "version": "1.0", + "sha256": "0ck8sqy729qsry290fgrn829vsv7snxjlwbn725q6adg8239v4z8", + "depends": ["MASS", "rjags"] + }, "EWS": { "name": "EWS", "version": "0.2.0", @@ -9341,13 +9461,13 @@ "name": "EZtune", "version": "3.1.1", "sha256": "0scslbgbbwma7sr0w9awg58ly5jwn877xsk6q1gq0ss3rd17pmfk", - "depends": ["ada", "BiocStyle", "e1071", "GA", "gbm", "glmnet", "optimx", "ROCR", "rpart"] + "depends": ["BiocStyle", "GA", "ROCR", "ada", "e1071", "gbm", "glmnet", "optimx", "rpart"] }, "Eagle": { "name": "Eagle", "version": "2.5", "sha256": "18y0hc5461gh7kp095xfpwpfnl7k3v545r8w6nrhabrhwsflrrij", - "depends": ["data_table", "fontawesome", "ggplot2", "ggthemes", "mmap", "plotly", "R_utils", "Rcpp", "RcppEigen", "shiny", "shinyBS", "shinyFiles", "shinyjs", "shinythemes"] + "depends": ["R_utils", "Rcpp", "RcppEigen", "data_table", "fontawesome", "ggplot2", "ggthemes", "mmap", "plotly", "shiny", "shinyBS", "shinyFiles", "shinyjs", "shinythemes"] }, "Ease": { "name": "Ease", @@ -9359,13 +9479,13 @@ "name": "EasyABC", "version": "1.5.2", "sha256": "173830655knpmc9qb7i2n4332rn3d3qp6566kmr2hrw60gh94v1j", - "depends": ["abc", "lhs", "MASS", "mnormt", "pls", "tensorA"] + "depends": ["MASS", "abc", "lhs", "mnormt", "pls", "tensorA"] }, "EasyDescribe": { "name": "EasyDescribe", "version": "0.1.2", "sha256": "1kjh45ndscwz1wdkf0rvnjw4qs73v9h1g45wagdqhsckywnhfksh", - "depends": ["car", "CATT", "clinfun", "fitdistrplus", "FSA", "gmodels", "multiCA", "nortest", "psych", "rcompanion"] + "depends": ["CATT", "FSA", "car", "clinfun", "fitdistrplus", "gmodels", "multiCA", "nortest", "psych", "rcompanion"] }, "EasyMx": { "name": "EasyMx", @@ -9389,7 +9509,7 @@ "name": "Ecfun", "version": "0.3-2", "sha256": "1q0mx70hy18rabpabxghaixkb3r1432cxln844cac4dqxhvzcqgy", - "depends": ["BMA", "fda", "jpeg", "MASS", "mvtnorm", "rvest", "stringi", "TeachingDemos", "tis", "xml2"] + "depends": ["BMA", "MASS", "TeachingDemos", "fda", "jpeg", "mvtnorm", "rvest", "stringi", "tis", "xml2"] }, "EcoDiet": { "name": "EcoDiet", @@ -9401,13 +9521,13 @@ "name": "EcoEnsemble", "version": "1.0.5", "sha256": "0d5kha5i49p7fd8g4f1i999sag4jz8if6yashshr9hp6jr6mibpc", - "depends": ["BH", "cowplot", "dplyr", "ggplot2", "matrixcalc", "Rcpp", "RcppEigen", "RcppParallel", "reshape2", "rstan", "rstantools", "StanHeaders", "tibble"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cowplot", "dplyr", "ggplot2", "matrixcalc", "reshape2", "rstan", "rstantools", "tibble"] }, "EcoIndR": { "name": "EcoIndR", "version": "2.0", "sha256": "0wsr3lmmg6rph6mlq6mrwlal4ph65ps5vyqkglbzb67xz7kc1hz5", - "depends": ["FD", "picante", "Rarity", "splancs", "vegan"] + "depends": ["FD", "Rarity", "picante", "splancs", "vegan"] }, "EcoNetGen": { "name": "EcoNetGen", @@ -9455,7 +9575,7 @@ "name": "EcotoneFinder", "version": "0.2.3", "sha256": "1liqjakzg4c5kgjiir8i4fp4ax0737lfwriz277crh9p3jn3dgmh", - "depends": ["cluster", "colorspace", "corrplot", "e1071", "ggplot2", "igraph", "philentropy", "plyr", "purrr", "qgraph", "reshape", "rlang", "Rmisc", "vegan", "vegclust", "withr"] + "depends": ["Rmisc", "cluster", "colorspace", "corrplot", "e1071", "ggplot2", "igraph", "philentropy", "plyr", "purrr", "qgraph", "reshape", "rlang", "vegan", "vegclust", "withr"] }, "Ecume": { "name": "Ecume", @@ -9465,9 +9585,9 @@ }, "EdSurvey": { "name": "EdSurvey", - "version": "4.0.6", - "sha256": "1f26cmbfqb660335wzi0lx48q8dp0dbypykyskv7njf7rf0mg1cr", - "depends": ["car", "data_table", "Dire", "Formula", "glm2", "haven", "LaF", "lfactors", "lifecycle", "lme4", "MASS", "Matrix", "NAEPirtparams", "NAEPprimer", "quantreg", "readxl", "tibble", "wCorr", "WeMix", "xml2", "xtable"] + "version": "4.0.7", + "sha256": "1bdnwhdqk3m6134wibsbzkvy1fys2n4yf02i1wq9hzwh2g9alpp4", + "depends": ["Dire", "Formula", "LaF", "MASS", "Matrix", "NAEPirtparams", "NAEPprimer", "WeMix", "car", "data_table", "glm2", "haven", "lfactors", "lifecycle", "lme4", "quantreg", "readxl", "tibble", "wCorr", "xml2", "xtable"] }, "EffectLiteR": { "name": "EffectLiteR", @@ -9485,7 +9605,7 @@ "name": "EffectStars2", "version": "0.1-3", "sha256": "0yh4krqjh1jb7gjxb9z4f5bzarps0g9jfqbbva782a881dhcdl1x", - "depends": ["miscTools", "VGAM"] + "depends": ["VGAM", "miscTools"] }, "EffectTreat": { "name": "EffectTreat", @@ -9503,7 +9623,7 @@ "name": "EgoCor", "version": "1.2.0", "sha256": "135k9yccmzbkzhf8dlzm00pawaav01bzw4r2y45mcb1fdfwf5fg2", - "depends": ["gstat", "Rdpack", "shiny", "sp", "SpatialTools"] + "depends": ["Rdpack", "SpatialTools", "gstat", "shiny", "sp"] }, "EigenR": { "name": "EigenR", @@ -9517,29 +9637,35 @@ "sha256": "1wr2lkaf56qxsnqi7mgbgzy72lhkr0xlr1w1l9hy1dpmmqcqw7l3", "depends": ["ggplot2"] }, + "ElectDecomp": { + "name": "ElectDecomp", + "version": "0.0.1-1", + "sha256": "1wqcmrbmhi6fpmbb40yy59s6il02k9bxmw1nfk21m4rgb65ssggk", + "depends": [] + }, "ElevDistr": { "name": "ElevDistr", "version": "1.0.8", "sha256": "119r06ijd72z2f9asydlcy6i7sqgzfapy02wn13x5zf1cp459n8a", - "depends": ["ggmap", "ggplot2", "RANN", "terra"] + "depends": ["RANN", "ggmap", "ggplot2", "terra"] }, "Elja": { "name": "Elja", "version": "1.0.0", "sha256": "0znq40ccr828j9xwa3xixdp0i2fyj0x02lh5vxb61bf96y9njsvy", - "depends": ["devtools", "dplyr", "ggplot2", "MASS"] + "depends": ["MASS", "devtools", "dplyr", "ggplot2"] }, "ElliptCopulas": { "name": "ElliptCopulas", "version": "0.1.3", "sha256": "1hnkhd9hw2550kzjyycl1hzm9pk9j11n96hka59z8x74vrz980qp", - "depends": ["Matrix", "pbapply", "Rmpfr", "Runuran", "wdm"] + "depends": ["Matrix", "Rmpfr", "Runuran", "pbapply", "wdm"] }, "EloChoice": { "name": "EloChoice", "version": "0.29.4", "sha256": "1g8ivvnv16c2gniwd9xa9z89bm4rac0nrg3mcg1risgf9yk4rgm5", - "depends": ["psychotools", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "psychotools"] }, "EloOptimized": { "name": "EloOptimized", @@ -9549,27 +9675,27 @@ }, "EloRating": { "name": "EloRating", - "version": "0.46.11", - "sha256": "09nh3ia4s3c9yjhw0f0haqb26fryfc4lf9rgfcbqqzzwgdr1invj", - "depends": ["network", "Rcpp", "RcppArmadillo", "Rdpack", "sna", "zoo"] + "version": "0.46.18", + "sha256": "10j60fj4kxsm2rps3f3khvp91cb8srgnbxqna4yn0gsbdr0l138d", + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "network", "sna", "zoo"] }, "EloSteepness": { "name": "EloSteepness", "version": "0.5.0", "sha256": "1fqqvwbvhlr5h30mav5nch4gqjr61yvpydmbd1zq4a19hwb8rivd", - "depends": ["aniDom", "BH", "EloRating", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "EloRating", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "aniDom", "rstan", "rstantools"] }, "EmbedSOM": { "name": "EmbedSOM", "version": "2.1.2", "sha256": "0k4hja5y7qd0n3gfaxzxrz4wpxc1w9d4d4xbb63rq2nfk3lj7a42", - "depends": ["FNN", "ggplot2", "igraph", "Matrix", "Rtsne", "umap", "uwot"] + "depends": ["FNN", "Matrix", "Rtsne", "ggplot2", "igraph", "umap", "uwot"] }, "EmiR": { "name": "EmiR", "version": "1.0.4", "sha256": "1xhsf9n5af6z7v62vpnqjlp20s6fp7jf1wmgxgv77hxm4g5cm0q7", - "depends": ["data_table", "dplyr", "gganimate", "ggplot2", "mathjaxr", "plot3D", "Rcpp", "RcppProgress", "Rdpack", "tibble", "tictoc", "tidyr"] + "depends": ["Rcpp", "RcppProgress", "Rdpack", "data_table", "dplyr", "gganimate", "ggplot2", "mathjaxr", "plot3D", "tibble", "tictoc", "tidyr"] }, "EmiStatR": { "name": "EmiStatR", @@ -9587,7 +9713,7 @@ "name": "EmpiricalCalibration", "version": "3.1.2", "sha256": "013k43mwsjr5sgrvcp9dqcpylls0qm3ppn7xbgw7l46w22yik5hi", - "depends": ["ggplot2", "gridExtra", "Rcpp", "rlang"] + "depends": ["Rcpp", "ggplot2", "gridExtra", "rlang"] }, "EncDNA": { "name": "EncDNA", @@ -9605,7 +9731,7 @@ "name": "EnergyOnlineCPM", "version": "1.0", "sha256": "1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8", - "depends": ["energy", "MASS"] + "depends": ["MASS", "energy"] }, "EngrEcon": { "name": "EngrEcon", @@ -9671,13 +9797,13 @@ "name": "EntropyMCMC", "version": "1.0.4", "sha256": "065djml9dmn5ahbgaljnshvhziwg61xciq6fzh76449x3wy6bg65", - "depends": ["mixtools", "RANN"] + "depends": ["RANN", "mixtools"] }, "EnvCpt": { "name": "EnvCpt", "version": "1.1.3", "sha256": "1zv2x3svlqrfchr9j4bk2w2sx75zl4886pqk1c1sx5glqrkdbfki", - "depends": ["changepoint", "MASS", "zoo"] + "depends": ["MASS", "changepoint", "zoo"] }, "EnvNJ": { "name": "EnvNJ", @@ -9695,19 +9821,19 @@ "name": "EnvStats", "version": "2.8.1", "sha256": "19nnab201yalxbgpvpp5lkgqs0m17b5plsswmaxbvdv4mag2p58j", - "depends": ["ggplot2", "MASS", "nortest"] + "depends": ["MASS", "ggplot2", "nortest"] }, "EnviroPRA2": { "name": "EnviroPRA2", "version": "1.0.1", "sha256": "0r73l4f221ryyh2nfp0whcmhq06rzim447lqa56rmv00hcsmda52", - "depends": ["fitdistrplus", "kSamples", "MASS", "truncdist"] + "depends": ["MASS", "fitdistrplus", "kSamples", "truncdist"] }, "Epi": { "name": "Epi", - "version": "2.51", - "sha256": "0m9rvh21l9lqdlv71jrbix10g97wy2ryjv4zdjykfldhzzn4siik", - "depends": ["cmprsk", "data_table", "dplyr", "etm", "magrittr", "MASS", "Matrix", "mgcv", "numDeriv", "plyr", "survival", "zoo"] + "version": "2.53", + "sha256": "1ndyvj24j7b85l5rdldnb6ngkyv7x08jnc11nbjsbh5mn7swg4qi", + "depends": ["MASS", "Matrix", "cmprsk", "data_table", "dplyr", "etm", "magrittr", "mgcv", "numDeriv", "plyr", "survival", "zoo"] }, "EpiContactTrace": { "name": "EpiContactTrace", @@ -9719,7 +9845,7 @@ "name": "EpiCurve", "version": "2.4-2", "sha256": "1z81zrg96hmgj2j37vwwg0bd84bq80ck3f704w9j6v0drckzh03j", - "depends": ["dplyr", "ggplot2", "ISOweek", "RColorBrewer", "scales", "tibble", "timeDate"] + "depends": ["ISOweek", "RColorBrewer", "dplyr", "ggplot2", "scales", "tibble", "timeDate"] }, "EpiDynamics": { "name": "EpiDynamics", @@ -9737,13 +9863,13 @@ "name": "EpiForsk", "version": "0.1.1", "sha256": "0p8znwcx11sa5rqljsa38iwqwd91pvkw01g674grw2705cagjdnj", - "depends": ["broom", "cowplot", "data_table", "dplyr", "forcats", "ggplot2", "glue", "grf", "gridExtra", "Hmisc", "MatchIt", "nnet", "patchwork", "policytree", "progressr", "purrr", "rlang", "stringr", "survey", "survival", "svyVGAM", "tidyr", "VGAM"] + "depends": ["Hmisc", "MatchIt", "VGAM", "broom", "cowplot", "data_table", "dplyr", "forcats", "ggplot2", "glue", "grf", "gridExtra", "nnet", "patchwork", "policytree", "progressr", "purrr", "rlang", "stringr", "survey", "survival", "svyVGAM", "tidyr"] }, "EpiILM": { "name": "EpiILM", "version": "1.5.2", "sha256": "0drs4qywx9axs7k5qk7sp5r3g8pykn4lqqbm0hxyl24r6b5l3d6b", - "depends": ["adaptMCMC", "coda", "LaplacesDemon"] + "depends": ["LaplacesDemon", "adaptMCMC", "coda"] }, "EpiILMCT": { "name": "EpiILMCT", @@ -9761,19 +9887,19 @@ "name": "EpiLPS", "version": "1.3.0", "sha256": "0wdmkwcyqhjyyxrg7669sfrfqarvg5qrdm5zrchv9hnzjfxm4k9p", - "depends": ["coda", "EpiEstim", "ggplot2", "gridExtra", "Rcpp", "RcppArmadillo"] + "depends": ["EpiEstim", "Rcpp", "RcppArmadillo", "coda", "ggplot2", "gridExtra"] }, "EpiModel": { "name": "EpiModel", "version": "2.4.0", "sha256": "0bwi7rkiv2cg1srmzbyly89w6p9xppk90vjmbw6h5k9481gn097h", - "depends": ["ape", "coda", "deSolve", "doParallel", "dplyr", "egor", "ergm", "ergm_ego", "foreach", "ggplot2", "lazyeval", "network", "networkDynamic", "networkLite", "RColorBrewer", "Rcpp", "rlang", "statnet_common", "tergm", "tibble"] + "depends": ["RColorBrewer", "Rcpp", "ape", "coda", "deSolve", "doParallel", "dplyr", "egor", "ergm", "ergm_ego", "foreach", "ggplot2", "lazyeval", "network", "networkDynamic", "networkLite", "rlang", "statnet_common", "tergm", "tibble"] }, "EpiNow2": { "name": "EpiNow2", "version": "1.5.2", "sha256": "0nqa7dvp04ysqgdd5cjzfcd5vshk7jca251ljn8j55va186frmn5", - "depends": ["BH", "checkmate", "data_table", "futile_logger", "future", "future_apply", "ggplot2", "lifecycle", "lubridate", "patchwork", "posterior", "progressr", "purrr", "R_utils", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "runner", "scales", "StanHeaders", "truncnorm"] + "depends": ["BH", "R_utils", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "checkmate", "data_table", "futile_logger", "future", "future_apply", "ggplot2", "lifecycle", "lubridate", "patchwork", "posterior", "progressr", "purrr", "rlang", "rstan", "rstantools", "runner", "scales", "truncnorm"] }, "EpiReport": { "name": "EpiReport", @@ -9791,7 +9917,7 @@ "name": "EpiSignalDetection", "version": "0.1.2", "sha256": "17mawnx3c87kgfa7aj42a7db9c1ciyxdfgka9sgx6lc0yw5249as", - "depends": ["dplyr", "ISOweek", "rmarkdown", "shiny", "surveillance"] + "depends": ["ISOweek", "dplyr", "rmarkdown", "shiny", "surveillance"] }, "EpiStats": { "name": "EpiStats", @@ -9803,7 +9929,7 @@ "name": "EpiTest", "version": "1.0.0", "sha256": "0fr6lkn1782x9q91y12idbzsh40xz5vzqfag259g6p8m3gyjiq25", - "depends": ["dplyr", "ggplot2", "ggrepel", "magrittr", "MM4LMM", "purrr", "stringr"] + "depends": ["MM4LMM", "dplyr", "ggplot2", "ggrepel", "magrittr", "purrr", "stringr"] }, "EpistemicGameTheory": { "name": "EpistemicGameTheory", @@ -9851,13 +9977,13 @@ "name": "EstimationTools", "version": "4.0.0", "sha256": "1hwlrsxl42n4i25f1izhccj755aydl2r98w1jn12z9a62wk9nnzy", - "depends": ["autoimage", "BBmisc", "boot", "DEoptim", "GA", "gaussquad", "numDeriv", "Rdpack", "stringr", "survival"] + "depends": ["BBmisc", "DEoptim", "GA", "Rdpack", "autoimage", "boot", "gaussquad", "numDeriv", "stringr", "survival"] }, "EthSEQ": { "name": "EthSEQ", "version": "3.0.2", "sha256": "0wrqdvcfag83qidrfg2b6q86xmb3f03mda4kwx0f4a53wl5fjdrx", - "depends": ["data_table", "gdsfmt", "geometry", "MASS", "plot3D", "Rcpp", "SNPRelate"] + "depends": ["MASS", "Rcpp", "SNPRelate", "data_table", "gdsfmt", "geometry", "plot3D"] }, "EuclideanSD": { "name": "EuclideanSD", @@ -9869,19 +9995,19 @@ "name": "Euclimatch", "version": "1.0.1", "sha256": "09nydlqdxpfcvfaznpjchw3zlz05a03n7picn419ivvjmf6hrx8x", - "depends": ["doParallel", "foreach", "RColorBrewer", "Rcpp", "RcppParallel", "terra"] + "depends": ["RColorBrewer", "Rcpp", "RcppParallel", "doParallel", "foreach", "terra"] }, "Eunomia": { "name": "Eunomia", "version": "2.0.0", "sha256": "1ma5xsfyj6f1dd6n7k4fqxil3xbgj2d79vb7b4zjqf7cb14vljlg", - "depends": ["arrow", "CommonDataModel", "DBI", "readr", "rlang", "RSQLite"] + "depends": ["CommonDataModel", "DBI", "RSQLite", "arrow", "readr", "rlang"] }, "EurosarcBayes": { "name": "EurosarcBayes", "version": "1.1", "sha256": "12311s6ibw9q6kykhh689r93r7mwjhwrhkzdpc75grvw6ilgjmpm", - "depends": ["clinfun", "data_table", "plyr", "shiny", "VGAM"] + "depends": ["VGAM", "clinfun", "data_table", "plyr", "shiny"] }, "EvCombR": { "name": "EvCombR", @@ -9899,7 +10025,7 @@ "name": "EvaluateCore", "version": "0.1.3", "sha256": "1cmway61p2cfl9101x30hvvvmzvg2asnf6378dkinr7dr5ymnkxm", - "depends": ["agricolae", "boot", "car", "cluster", "dplyr", "entropy", "ggcorrplot", "ggplot2", "gridExtra", "kSamples", "mathjaxr", "psych", "Rdpack", "reshape2", "vegan"] + "depends": ["Rdpack", "agricolae", "boot", "car", "cluster", "dplyr", "entropy", "ggcorrplot", "ggplot2", "gridExtra", "kSamples", "mathjaxr", "psych", "reshape2", "vegan"] }, "EvaluationMeasures": { "name": "EvaluationMeasures", @@ -9917,7 +10043,7 @@ "name": "EventDetectGUI", "version": "0.3.0", "sha256": "02gwgbp692cfmf933jg1f7h4gghhc1v2cswz7rpcazm8h39mc4wh", - "depends": ["DT", "EventDetectR", "ggplot2", "plotly", "shiny", "shinyBS", "shinydashboard", "shinyjs", "XML"] + "depends": ["DT", "EventDetectR", "XML", "ggplot2", "plotly", "shiny", "shinyBS", "shinydashboard", "shinyjs"] }, "EventDetectR": { "name": "EventDetectR", @@ -9929,7 +10055,7 @@ "name": "EventPredInCure", "version": "1.0", "sha256": "1i11v671l5x31nhx0vz2zmjv3g3xr2yszd9vkhg71xnxmr1156cy", - "depends": ["dplyr", "erify", "flexsurv", "KMsurv", "lubridate", "MASS", "Matrix", "MLEcens", "msm", "mvtnorm", "numDeriv", "perm", "plotly", "rlang", "rstpm2", "survival", "tmvtnsim"] + "depends": ["KMsurv", "MASS", "MLEcens", "Matrix", "dplyr", "erify", "flexsurv", "lubridate", "msm", "mvtnorm", "numDeriv", "perm", "plotly", "rlang", "rstpm2", "survival", "tmvtnsim"] }, "EventWinRatios": { "name": "EventWinRatios", @@ -9941,7 +10067,7 @@ "name": "EvidenceSynthesis", "version": "0.5.0", "sha256": "0zyah27p1j7sxpcgpr05ws1whw7dd876nzygcvh5pyiikkahfmcm", - "depends": ["BeastJar", "coda", "Cyclops", "dplyr", "EmpiricalCalibration", "ggdist", "ggplot2", "gridExtra", "HDInterval", "meta", "rJava", "rlang", "survival"] + "depends": ["BeastJar", "Cyclops", "EmpiricalCalibration", "HDInterval", "coda", "dplyr", "ggdist", "ggplot2", "gridExtra", "meta", "rJava", "rlang", "survival"] }, "EviewsR": { "name": "EviewsR", @@ -9953,13 +10079,13 @@ "name": "EvoPhylo", "version": "0.3.2", "sha256": "1jgvvi355dxrjqniwcga7gzfj0jw3hgwbii2cv055rq9z5f442mr", - "depends": ["ape", "cluster", "deeptime", "devtools", "dplyr", "ggplot2", "ggrepel", "ggtree", "patchwork", "Rtsne", "treeio", "unglue"] + "depends": ["Rtsne", "ape", "cluster", "deeptime", "devtools", "dplyr", "ggplot2", "ggrepel", "ggtree", "patchwork", "treeio", "unglue"] }, "EvolutionaryGames": { "name": "EvolutionaryGames", "version": "0.1.2", "sha256": "0aaqd4q8imm2wgkgdpwwdl6nxgr3apgb3l24f2lwxgv2y045309d", - "depends": ["deSolve", "geometry", "ggplot2", "interp", "MASS", "reshape2"] + "depends": ["MASS", "deSolve", "geometry", "ggplot2", "interp", "reshape2"] }, "Evomorph": { "name": "Evomorph", @@ -9989,7 +10115,7 @@ "name": "ExPanDaR", "version": "0.5.3", "sha256": "1y4ccyvlvdx9lcgpyns6k2npc0rzwk8db4bmbi3pq9xmv7ycgmcz", - "depends": ["corrplot", "dplyr", "DT", "ggplot2", "kableExtra", "lmtest", "multiwayvcov", "openssl", "plm", "rio", "rlang", "scales", "shiny", "shinycssloaders", "stargazer", "tictoc", "tidyr", "zip"] + "depends": ["DT", "corrplot", "dplyr", "ggplot2", "kableExtra", "lmtest", "multiwayvcov", "openssl", "plm", "rio", "rlang", "scales", "shiny", "shinycssloaders", "stargazer", "tictoc", "tidyr", "zip"] }, "ExPosition": { "name": "ExPosition", @@ -9999,8 +10125,8 @@ }, "Exact": { "name": "Exact", - "version": "3.2", - "sha256": "0a33gbhzd580i31xxsjxigg0nl8ag1x4xz3jqmq5jqappc6f5d2k", + "version": "3.3", + "sha256": "0hikz8f19blywxs66xj6zf4krwyivsy3w165qvrnb0m2l6dx1l7v", "depends": ["rootSolve"] }, "ExactCIdiff": { @@ -10015,6 +10141,12 @@ "sha256": "049fh70aidsl60f355jkx93brkvaadpvlk7wxc196s51fddz2lwa", "depends": [] }, + "ExactCox": { + "name": "ExactCox", + "version": "0.1.0", + "sha256": "050d4g2jyp8qncy5biim45xvl8kkjg3rwwdcakmwjgs9c88zvls5", + "depends": ["BiasedUrn"] + }, "ExactMed": { "name": "ExactMed", "version": "0.3.0", @@ -10037,7 +10169,7 @@ "name": "ExceedanceTools", "version": "1.3.6", "sha256": "1yp4dl2sb7j41nbqhx0dsag9b3qg3l82snvjxnb57z4p63zsb2r5", - "depends": ["matrixStats", "SpatialTools", "splancs"] + "depends": ["SpatialTools", "matrixStats", "splancs"] }, "ExcelFunctionsR": { "name": "ExcelFunctionsR", @@ -10091,7 +10223,7 @@ "name": "ExpGenetic", "version": "0.1.0", "sha256": "096cxaqbc9y0bnj70fxk94585c880020pqqcx0dwwj839qkry4ha", - "depends": ["DESeq2", "futile_logger", "ggplot2", "ggsci", "plyr", "VennDiagram"] + "depends": ["DESeq2", "VennDiagram", "futile_logger", "ggplot2", "ggsci", "plyr"] }, "ExpImage": { "name": "ExpImage", @@ -10145,7 +10277,7 @@ "name": "ExtrPatt", "version": "0.1-4", "sha256": "0azmr5j1icac4apc4w5s2rx1ngzr634hm9n2gjyb6xx2ikwc7sy8", - "depends": ["doParallel", "foreach", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "doParallel", "foreach"] }, "ExtractTrainData": { "name": "ExtractTrainData", @@ -10187,7 +10319,7 @@ "name": "FACT", "version": "0.1.1", "sha256": "0klks2r2jf5v5z2n3gvqbssrpdd6nccbk7izvdl1cknisq8z5w4b", - "depends": ["checkmate", "data_table", "ggplot2", "gridExtra", "iml", "R6"] + "depends": ["R6", "checkmate", "data_table", "ggplot2", "gridExtra", "iml"] }, "FACTMLE": { "name": "FACTMLE", @@ -10199,19 +10331,19 @@ "name": "FADA", "version": "1.3.5", "sha256": "0srv3rghbkgyxbcjc1v68c5qgcir1d618skpc8imfmdaz9pnxchn", - "depends": ["corpcor", "crossval", "elasticnet", "glmnet", "MASS", "matrixStats", "mnormt", "sda", "sparseLDA"] + "depends": ["MASS", "corpcor", "crossval", "elasticnet", "glmnet", "matrixStats", "mnormt", "sda", "sparseLDA"] }, "FADPclust": { "name": "FADPclust", "version": "1.1.1", "sha256": "111lpq5hdrpyj8wdscjswk5p4akxhj3jbj5xk6ias2s5gfprla14", - "depends": ["cluster", "fda", "fda_usc", "fpc", "funData", "MFPCA"] + "depends": ["MFPCA", "cluster", "fda", "fda_usc", "fpc", "funData"] }, "FAIRmaterials": { "name": "FAIRmaterials", - "version": "0.4.1", - "sha256": "0434spa644g44qy7k0kapxxj34ch5vns8j27slx6j8i14ffxmzqq", - "depends": ["dplyr", "igraph", "jsonld", "jsonlite", "RColorBrewer", "stringr", "svDialogs", "tidyjson"] + "version": "0.4.2.1", + "sha256": "1hps94zc1pla3nhqayxhqnhws7sqhdg2xwyfw192v9zq7hincd8n", + "depends": ["DiagrammeR", "DiagrammeRsvg", "dplyr", "httr", "jsonld", "rdflib", "readr", "stringr", "tidyr", "xml2"] }, "FAMT": { "name": "FAMT", @@ -10223,13 +10355,13 @@ "name": "FAMetA", "version": "0.1.6", "sha256": "0hn4g0qqiy15jg42g27v0rmplm8gh84fr0kpp7q56c21mcs5w4h3", - "depends": ["accucor", "gplots", "gtools", "knitr", "LipidMS", "minpack_lm", "plyr", "rmarkdown", "scales", "tidyr"] + "depends": ["LipidMS", "accucor", "gplots", "gtools", "knitr", "minpack_lm", "plyr", "rmarkdown", "scales", "tidyr"] }, "FAMoS": { "name": "FAMoS", "version": "0.3.0", "sha256": "14gr9wv9bpibk0rrzzwijvdncx1fgnpbv55nqzbb4jhq7fdckmsa", - "depends": ["future", "R_utils"] + "depends": ["R_utils", "future"] }, "FAO56": { "name": "FAO56", @@ -10241,7 +10373,7 @@ "name": "FAOSTAT", "version": "2.4.0", "sha256": "0fyd9ypssax6pm3fzw7g864kaamfh8r3hi4ljd972g13n82b1jag", - "depends": ["classInt", "data_table", "httr", "labeling", "MASS", "plyr", "RJSONIO"] + "depends": ["MASS", "RJSONIO", "classInt", "data_table", "httr", "labeling", "plyr"] }, "FARDEEP": { "name": "FARDEEP", @@ -10259,7 +10391,7 @@ "name": "FAST.R", "version": "0.2.1", "sha256": "178v16f6f5manifv15r44mkl1zqspc9p4vwah3yvnqgd0zwq92x7", - "depends": ["caret", "dplyr", "DT", "ggplot2", "magrittr", "plater", "purrr", "RColorBrewer", "readxl", "scales", "shiny", "shinyFeedback", "shinyjs", "stringr", "tibble", "tidyr", "waiter", "zip"] + "depends": ["DT", "RColorBrewer", "caret", "dplyr", "ggplot2", "magrittr", "plater", "purrr", "readxl", "scales", "shiny", "shinyFeedback", "shinyjs", "stringr", "tibble", "tidyr", "waiter", "zip"] }, "FASeg": { "name": "FASeg", @@ -10271,7 +10403,7 @@ "name": "FAVAR", "version": "0.1.3", "sha256": "0nnljqhrji7c317rlrmx8xscyp6bx2s9zddjsq48c6x45mmsqpfx", - "depends": ["bvartools", "coda", "doParallel", "dplyr", "foreach", "ggplot2", "magrittr", "Matrix", "MCMCpack"] + "depends": ["MCMCpack", "Matrix", "bvartools", "coda", "doParallel", "dplyr", "foreach", "ggplot2", "magrittr"] }, "FAdist": { "name": "FAdist", @@ -10279,6 +10411,12 @@ "sha256": "166w9i8fgklx12jiq4n7l081znmdi6yvazhlxny4rgqif0z2kr9q", "depends": [] }, + "FAfA": { + "name": "FAfA", + "version": "0.2", + "sha256": "1cqfbd49pqn132l6nhp9v8jqj2vjkbsrzcph593n15vvgw3xbl2v", + "depends": ["dplyr", "golem", "lavaan", "magrittr", "psych", "shiny", "shinycssloaders", "shinydashboard"] + }, "FAmle": { "name": "FAmle", "version": "1.3.7", @@ -10289,7 +10427,7 @@ "name": "FAwR", "version": "1.1.2", "sha256": "1x90wvp0w7fhid7i5160b4fiv4xn5mpvy33zjzy0mvqvp0yp8xf0", - "depends": ["glpkAPI", "lattice", "MASS"] + "depends": ["MASS", "glpkAPI", "lattice"] }, "FBCRM": { "name": "FBCRM", @@ -10307,7 +10445,7 @@ "name": "FBMS", "version": "1.0", "sha256": "01zj6alrqis2kclghr4zyz04vgfip3fxxb54f26aczmjhpg71vyd", - "depends": ["fastglm", "GenSA", "Rcpp"] + "depends": ["GenSA", "Rcpp", "fastglm"] }, "FBN": { "name": "FBN", @@ -10333,12 +10471,6 @@ "sha256": "15xsqwnn5liqjbwg8qpj7prqdiykfxczdw9fyllya7x801ky1rfi", "depends": ["DataVisualizations", "ggplot2", "mclust"] }, - "FCSlib": { - "name": "FCSlib", - "version": "1.3.0", - "sha256": "1191ba6dwpakcdnbcq61zm5xq24isxjnn98nmvk67fpf1ycw70w9", - "depends": ["bitops", "fields", "stringr", "tiff"] - }, "FCVAR": { "name": "FCVAR", "version": "0.1.4", @@ -10373,25 +10505,25 @@ "name": "FDX", "version": "1.0.6", "sha256": "16d2gwdiqv3i37ad33mvad8hsni0i7zf3y85z9sgxvabhs5igva1", - "depends": ["DiscreteFDR", "PoissonBinomial", "pracma", "Rcpp"] + "depends": ["DiscreteFDR", "PoissonBinomial", "Rcpp", "pracma"] }, "FDboost": { "name": "FDboost", "version": "1.1-2", "sha256": "0fmcwjrcj4axdajavlyg7d200yb6wkxkd7fidmcsxpvpnbbb7wgj", - "depends": ["gamboostLSS", "MASS", "Matrix", "mboost", "mgcv", "stabs", "zoo"] + "depends": ["MASS", "Matrix", "gamboostLSS", "mboost", "mgcv", "stabs", "zoo"] }, "FEA": { "name": "FEA", "version": "0.0.2", "sha256": "1p2lsfhxih25i6rdwh64p4i5z72ds4a3x8a5p8db1jmx1qi07kq5", - "depends": ["geometry", "geosphere", "MASS", "ptinpoly", "sp"] + "depends": ["MASS", "geometry", "geosphere", "ptinpoly", "sp"] }, "FENmlm": { "name": "FENmlm", "version": "2.4.4", "sha256": "0s1i7kklh5vzfv6xi1j9dxp21cncs5gsxf7rn25rsg8b5srllsxl", - "depends": ["Formula", "MASS", "numDeriv", "Rcpp"] + "depends": ["Formula", "MASS", "Rcpp", "numDeriv"] }, "FER": { "name": "FER", @@ -10409,7 +10541,7 @@ "name": "FEprovideR", "version": "1.1", "sha256": "02hfdk9qhaq4y19p700w2i7qsdp4z2kyww0pr0pijfivkqks0vpi", - "depends": ["ggplot2", "Matrix", "poibin"] + "depends": ["Matrix", "ggplot2", "poibin"] }, "FFD": { "name": "FFD", @@ -10433,7 +10565,7 @@ "name": "FGLMtrunc", "version": "0.1.0", "sha256": "15pj2dmgbjbx4xi585rqggnp05xzpg9pn2iy76ibgkdvjqknkwii", - "depends": ["foreach", "glmnet", "Rcpp", "RcppArmadillo", "splines2"] + "depends": ["Rcpp", "RcppArmadillo", "foreach", "glmnet", "splines2"] }, "FGalgorithm": { "name": "FGalgorithm", @@ -10451,7 +10583,7 @@ "name": "FHtest", "version": "1.5.1", "sha256": "0x7lr88w0b09ng7nps490kgj8aqdjzmp9skv9iwqgn871pnpydms", - "depends": ["interval", "KMsurv", "MASS", "perm", "survival"] + "depends": ["KMsurv", "MASS", "interval", "perm", "survival"] }, "FI": { "name": "FI", @@ -10463,13 +10595,13 @@ "name": "FIESTA", "version": "3.6.4", "sha256": "1k7a58807mr32vgs8xgv1ni1ip0kfkd5b3vaxzzyf0jv85dfc8q0", - "depends": ["data_table", "DBI", "FIESTAutils", "gdalraster", "RSQLite", "sf", "sqldf"] + "depends": ["DBI", "FIESTAutils", "RSQLite", "data_table", "gdalraster", "sf", "sqldf"] }, "FIESTAutils": { "name": "FIESTAutils", "version": "1.2.3", "sha256": "11ny9cpgbw3lz98hxxsvsjfjxq0y1h8wlv53afwaxwrayckiv981", - "depends": ["data_table", "DBI", "gdalraster", "hbsae", "JoSAE", "mase", "nlme", "RColorBrewer", "Rcpp", "RPostgres", "RSQLite", "sae", "sf", "sqldf", "terra", "units"] + "depends": ["DBI", "JoSAE", "RColorBrewer", "RPostgres", "RSQLite", "Rcpp", "data_table", "gdalraster", "hbsae", "mase", "nlme", "sae", "sf", "sqldf", "terra", "units"] }, "FILEST": { "name": "FILEST", @@ -10481,7 +10613,7 @@ "name": "FIT", "version": "0.0.6", "sha256": "1nkjms9cvigc9sjha1krzhd3nmwsfh8pi0f1plf5k8zpb773zzb2", - "depends": ["gglasso", "MASS", "Rcpp", "RcppEigen", "XML"] + "depends": ["MASS", "Rcpp", "RcppEigen", "XML", "gglasso"] }, "FITSio": { "name": "FITSio", @@ -10505,7 +10637,7 @@ "name": "FKSUM", "version": "1.0.1", "sha256": "0ag8mzbjf2paslqspb18dk0ndqbp5rhmlmz9p2q2gxljfrdkzqkd", - "depends": ["MASS", "Matrix", "rARPACK", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "rARPACK"] }, "FLAME": { "name": "FLAME", @@ -10521,15 +10653,15 @@ }, "FLOPART": { "name": "FLOPART", - "version": "2023.8.31", - "sha256": "1adidd9fsgibiia6wgdnv3xf5gwvk7awk28ahdlr053nzdwr767r", - "depends": ["data_table", "Rcpp"] + "version": "2024.6.19", + "sha256": "1yifv9nzb9f6k6npr162rjakaam6k1r6ylw0knjnkp3q66znrsa9", + "depends": ["Rcpp", "data_table"] }, "FLORAL": { "name": "FLORAL", "version": "0.2.0", "sha256": "1a1jnvbfk2fyqs5jw3y04wxln4hxsahv4yiwrhdgdbk4az3yxp9p", - "depends": ["caret", "doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "glmnet", "mvtnorm", "Rcpp", "RcppArmadillo", "RcppProgress", "reshape", "survcomp", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "caret", "doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "glmnet", "mvtnorm", "reshape", "survcomp", "survival"] }, "FLR": { "name": "FLR", @@ -10537,23 +10669,23 @@ "sha256": "0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n", "depends": ["combinat"] }, - "FLSSS": { - "name": "FLSSS", - "version": "9.1.3", - "sha256": "1mjjnasc5f3l44dch7wjxl0b6jbcyjkk6m5b3xgjrir5qyy7fmdk", - "depends": ["Rcpp", "RcppParallel"] + "FLightR": { + "name": "FLightR", + "version": "0.5.5", + "sha256": "0sw6qls30gr2hp7mwvjyh9h7cqga0ahkzg61d8pgdrc1fgbvsx0x", + "depends": ["CircStats", "RcppArmadillo", "bit", "circular", "fields", "geosphere", "ggmap", "ggplot2", "maps", "mgcv", "nlme", "sf", "suntools", "truncnorm"] }, "FMAT": { "name": "FMAT", - "version": "2024.6", - "sha256": "082i5hzw41vmdg1q7c42jpnisn0mip3mgs0z440dckv7dk2pnr2i", + "version": "2024.7", + "sha256": "1cijvrp9rzznjn8lvclzvjv2kqi412n512mwnkddr617vdxy4gn5", "depends": ["cli", "crayon", "data_table", "dplyr", "forcats", "glue", "irr", "plyr", "psych", "purrr", "reticulate", "stringr", "tidyr"] }, "FMAdist": { "name": "FMAdist", "version": "0.1.2", "sha256": "09lv6zk36qrrrjs0wkda5rr4pjm7q317gc5dr197w7ggsqibp4b6", - "depends": ["actuar", "EnvStats", "extraDistr", "fitdistrplus", "MASS", "quadprog"] + "depends": ["EnvStats", "MASS", "actuar", "extraDistr", "fitdistrplus", "quadprog"] }, "FMC": { "name": "FMC", @@ -10565,13 +10697,13 @@ "name": "FMCCSD", "version": "1.0", "sha256": "0c50km5ba6biq9p3mycxhy00ij2gr6y5zf3q8ycq0g1mbk8ybfb7", - "depends": ["numDeriv", "orthopolynom", "Rcpp", "RcppArmadillo", "splines2"] + "depends": ["Rcpp", "RcppArmadillo", "numDeriv", "orthopolynom", "splines2"] }, "FME": { "name": "FME", "version": "1.3.6.3", "sha256": "189n3svhlfp86svn8p88wi38lhsz0bqndys0pq87c6grsj5c5i43", - "depends": ["coda", "deSolve", "MASS", "minpack_lm", "minqa", "rootSolve"] + "depends": ["MASS", "coda", "deSolve", "minpack_lm", "minqa", "rootSolve"] }, "FMM": { "name": "FMM", @@ -10595,7 +10727,7 @@ "name": "FMradio", "version": "1.1.1", "sha256": "02d5imhagkr2cwgs6r77mbd2jg8k5ga17xp3rwaryykg2k4glacs", - "depends": ["Biobase", "expm", "ggplot2", "MASS", "reshape"] + "depends": ["Biobase", "MASS", "expm", "ggplot2", "reshape"] }, "FMsmsnReg": { "name": "FMsmsnReg", @@ -10613,13 +10745,13 @@ "name": "FOCI", "version": "0.1.3", "sha256": "0iax5569a0v18j2l52mw26yimx11fqqbxj5q7jgba9jf7ylp410w", - "depends": ["data_table", "gmp", "proxy", "RANN"] + "depends": ["RANN", "data_table", "gmp", "proxy"] }, "FORTLS": { "name": "FORTLS", "version": "1.4.0", "sha256": "0h5ninw5hkrkbri8yazy5wfv4yslp303iq6fyiwv7nd3wda8wln5", - "depends": ["data_table", "dbscan", "Distance", "htmlwidgets", "lidR", "moments", "plotly", "progress", "raster", "Rcpp", "RcppEigen", "RCSF", "reticulate", "scales", "sf", "tidyr", "VoxR", "vroom"] + "depends": ["Distance", "RCSF", "Rcpp", "RcppEigen", "VoxR", "data_table", "dbscan", "htmlwidgets", "lidR", "moments", "plotly", "progress", "raster", "reticulate", "scales", "sf", "tidyr", "vroom"] }, "FPCA3D": { "name": "FPCA3D", @@ -10631,13 +10763,13 @@ "name": "FPCdpca", "version": "0.1.0", "sha256": "0hrciisfnr3b0gs3szjy46fjl8mxpyclmv6ids5mq71spqzaxccp", - "depends": ["matrixcalc", "Rdimtools", "rsvd"] + "depends": ["Rdimtools", "matrixcalc", "rsvd"] }, "FPDclustering": { "name": "FPDclustering", "version": "2.3.1", "sha256": "04m75z320x9bxa3qi3yi60pl6b8fb1lxvx83q81iv42qw4998kd0", - "depends": ["cluster", "ExPosition", "GGally", "ggeasy", "ggplot2", "klaR", "MASS", "mvtnorm", "rootSolve", "ThreeWay"] + "depends": ["ExPosition", "GGally", "MASS", "ThreeWay", "cluster", "ggeasy", "ggplot2", "klaR", "mvtnorm", "rootSolve"] }, "FPLdata": { "name": "FPLdata", @@ -10661,19 +10793,19 @@ "name": "FRAPO", "version": "0.4-1", "sha256": "0mjcrplxr0cyybp5hzzwbq5j03w0f3iiiv1yk7mdqr5gb368dchq", - "depends": ["cccp", "Rglpk", "timeSeries"] + "depends": ["Rglpk", "cccp", "timeSeries"] }, "FRCC": { "name": "FRCC", "version": "1.1.0", "sha256": "18i2lrx2qkwj8j1c3q2vx901hx1f68bnjyrzyhkfmnswyy358368", - "depends": ["calibrate", "CCP", "corpcor", "MASS"] + "depends": ["CCP", "MASS", "calibrate", "corpcor"] }, "FREEtree": { "name": "FREEtree", "version": "0.1.0", "sha256": "1i2liqbcg993snj5vq341mmafzhn1yrwljvx4f3kyzy0pa59k6rn", - "depends": ["glmertree", "MASS", "pre", "WGCNA"] + "depends": ["MASS", "WGCNA", "glmertree", "pre"] }, "FREQ": { "name": "FREQ", @@ -10683,27 +10815,27 @@ }, "FRESA_CAD": { "name": "FRESA.CAD", - "version": "3.4.7", - "sha256": "1lczys1pcs15w8bz3i6kxglfhi4gih5ayrs51kg7d3c4la4di57a", - "depends": ["Hmisc", "miscTools", "pROC", "Rcpp", "RcppArmadillo", "stringr"] + "version": "3.4.8", + "sha256": "1jxbdn3acz6xwka1mkdwlamm00rj7vga4rnypz9qljjngk3vlzkp", + "depends": ["Hmisc", "Rcpp", "RcppArmadillo", "miscTools", "pROC", "stringr"] }, "FRESHD": { "name": "FRESHD", "version": "1.0", "sha256": "0lpggf59dd3kwp2y9p4acvhdmc6i47bwa5lk6d6cp8q0g7sr44rm", - "depends": ["glamlasso", "Rcpp", "RcppArmadillo", "RcppEigen"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "glamlasso"] }, "FRI": { "name": "FRI", "version": "1.0", "sha256": "17ddbr0hndpr5627n67467787rq8hidi1jn1c3xf7f7qz800jjf5", - "depends": ["forcats", "ggplot2", "neuralnet", "RSNNS"] + "depends": ["RSNNS", "forcats", "ggplot2", "neuralnet"] }, "FRK": { "name": "FRK", - "version": "2.2.3", - "sha256": "0wlx58il39qnl9wi92mkdhjarqvrp5i2hw4cyzaijrsfal1i0v42", - "depends": ["digest", "dplyr", "ggplot2", "ggpubr", "Hmisc", "Matrix", "plyr", "Rcpp", "RcppEigen", "reshape2", "scales", "sp", "spacetime", "sparseinv", "statmod", "TMB"] + "version": "2.3.1", + "sha256": "1zlghqkljvajsab3xdq564r289cd9b85h4002rnyg23jj32ga6dl", + "depends": ["Hmisc", "Matrix", "Rcpp", "RcppEigen", "TMB", "digest", "dplyr", "fmesher", "ggplot2", "ggpubr", "plyr", "reshape2", "scales", "sp", "spacetime", "sparseinv", "statmod"] }, "FSA": { "name": "FSA", @@ -10719,8 +10851,8 @@ }, "FSDAM": { "name": "FSDAM", - "version": "2024.1-30", - "sha256": "1jikdfhqb985a1g0r1z70n9wwnlw1ag32jdc74938ny65gqnp5sb", + "version": "2024.7-30", + "sha256": "0fv64dls0z8fb7pfgmqxnzmdqdf4dwr8z9xq18pswf14r7b425bc", "depends": ["kyotil", "reticulate"] }, "FSInteract": { @@ -10733,7 +10865,7 @@ "name": "FSK2R", "version": "0.1.3", "sha256": "0hsrg49q42by4i3dywi59wwy5h56fnfdr10s6rk1y9dyliksmj43", - "depends": ["dplyr", "purrr", "R_utils", "readtext", "readxl", "rjson", "rlang", "shiny", "tibble", "tidyr", "XML", "xml2", "zip"] + "depends": ["R_utils", "XML", "dplyr", "purrr", "readtext", "readxl", "rjson", "rlang", "shiny", "tibble", "tidyr", "xml2", "zip"] }, "FSM": { "name": "FSM", @@ -10751,19 +10883,19 @@ "name": "FSTpackage", "version": "0.1", "sha256": "1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb", - "depends": ["CompQuadForm", "MASS", "Matrix", "mvtnorm", "SKAT"] + "depends": ["CompQuadForm", "MASS", "Matrix", "SKAT", "mvtnorm"] }, "FSelector": { "name": "FSelector", "version": "0.34", "sha256": "07nvfykr6zls7ip5nz9j3062nlna2va3dyldck292v96rd56xl99", - "depends": ["digest", "entropy", "randomForest", "RWeka"] + "depends": ["RWeka", "digest", "entropy", "randomForest"] }, "FSelectorRcpp": { "name": "FSelectorRcpp", "version": "0.3.11", "sha256": "008zc270injmjhr2zqs0jw21f7vrmmclzjnin9xsx8drfk8bhdvn", - "depends": ["BH", "foreach", "iterators", "Rcpp", "RcppArmadillo", "testthat"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "foreach", "iterators", "testthat"] }, "FUNTA": { "name": "FUNTA", @@ -10771,6 +10903,12 @@ "sha256": "02yxz95s2hs26mfmgwhv5d54yyjz0aczjpnay8b4gpzbpd6aci61", "depends": [] }, + "FVDDPpkg": { + "name": "FVDDPpkg", + "version": "0.1.2", + "sha256": "0277cdllqdvkzs888hbn4ygppni09ky64n3pl8gnm244px36fqy5", + "depends": ["Rcpp", "Rdpack"] + }, "FWDselect": { "name": "FWDselect", "version": "2.1.0", @@ -10793,7 +10931,7 @@ "name": "FactoClass", "version": "1.2.9", "sha256": "1i42mwmkh7lip01x5qkw03xrcqqbsfsa7qs2xrpr9hzfp61f1xcm", - "depends": ["ade4", "ggplot2", "ggrepel", "KernSmooth", "scatterplot3d", "xtable"] + "depends": ["KernSmooth", "ade4", "ggplot2", "ggrepel", "scatterplot3d", "xtable"] }, "FactoInvestigate": { "name": "FactoInvestigate", @@ -10805,7 +10943,7 @@ "name": "FactoMineR", "version": "2.11", "sha256": "0qzhfjcz0kahqf214g4xs7gfpqx05xbfiwa5r2ldgn2drd16phij", - "depends": ["car", "cluster", "DT", "ellipse", "emmeans", "flashClust", "ggplot2", "ggrepel", "lattice", "leaps", "MASS", "multcompView", "scatterplot3d"] + "depends": ["DT", "MASS", "car", "cluster", "ellipse", "emmeans", "flashClust", "ggplot2", "ggrepel", "lattice", "leaps", "multcompView", "scatterplot3d"] }, "FactorAssumptions": { "name": "FactorAssumptions", @@ -10817,13 +10955,13 @@ "name": "FactorCopula", "version": "0.9.3", "sha256": "1lvqa62v9rvz7pmrx06riqndh4jyw60an04hpg6if523jsxpa5nz", - "depends": ["abind", "igraph", "matlab", "polycor", "statmod", "VineCopula"] + "depends": ["VineCopula", "abind", "igraph", "matlab", "polycor", "statmod"] }, "Factoshiny": { "name": "Factoshiny", "version": "2.6", "sha256": "14ija58kscww8bf4p1lcbwvd7yxmp4h8jnk8898q9qh08rbahram", - "depends": ["colourpicker", "DT", "FactoInvestigate", "FactoMineR", "ggplot2", "ggrepel", "missMDA", "shiny", "shinydashboard", "shinyjqui"] + "depends": ["DT", "FactoInvestigate", "FactoMineR", "colourpicker", "ggplot2", "ggrepel", "missMDA", "shiny", "shinydashboard", "shinyjqui"] }, "Fahrmeir": { "name": "Fahrmeir", @@ -10839,15 +10977,15 @@ }, "FamEvent": { "name": "FamEvent", - "version": "3.1", - "sha256": "1b2dh0kcvarczp3666by66sx6v1p2xbj1k43nji7cks1mmmln3qn", - "depends": ["cmprsk", "eha", "kinship2", "MASS", "matrixcalc", "pracma", "survival", "truncnorm"] + "version": "3.2", + "sha256": "05p8k1kqqbsc4n1gbfcmsq9s7hrp3q7460rb8nw5ms7w06wvkvpp", + "depends": ["MASS", "cmprsk", "eha", "kinship2", "matrixcalc", "pracma", "survival", "truncnorm"] }, "Familias": { "name": "Familias", "version": "2.6.1", "sha256": "1hx35xj5yjpbkpf4hz8kx7i4q3s2m5dvwb0mcnz1svibim04hll0", - "depends": ["kinship2", "Rsolnp"] + "depends": ["Rsolnp", "kinship2"] }, "Families": { "name": "Families", @@ -10859,13 +10997,13 @@ "name": "FamilyRank", "version": "1.0", "sha256": "0v1b3a6rxbbl7xdy977j02x1ni66879x98vg6ngbaqvh7v9vl82x", - "depends": ["plyr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "plyr"] }, "FarmSelect": { "name": "FarmSelect", "version": "1.0.2", "sha256": "174rzv9k0hdcfdkv7bisy70rip2iy0bnj3qa54i00wqwjdglgjdn", - "depends": ["fBasics", "ncvreg", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "fBasics", "ncvreg"] }, "FarmTest": { "name": "FarmTest", @@ -10889,7 +11027,7 @@ "name": "FastGP", "version": "1.2", "sha256": "120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv", - "depends": ["MASS", "mvtnorm", "rbenchmark", "Rcpp", "RcppEigen"] + "depends": ["MASS", "Rcpp", "RcppEigen", "mvtnorm", "rbenchmark"] }, "FastGaSP": { "name": "FastGaSP", @@ -10907,7 +11045,7 @@ "name": "FastJM", "version": "1.4.2", "sha256": "0h5kywvbwxd13ghgvfgx1sr7k4ywgk4c51xfpr8dvqig9nnvrav8", - "depends": ["caret", "dplyr", "MASS", "nlme", "Rcpp", "RcppEigen", "statmod", "survival", "timeROC"] + "depends": ["MASS", "Rcpp", "RcppEigen", "caret", "dplyr", "nlme", "statmod", "survival", "timeROC"] }, "FastKM": { "name": "FastKM", @@ -10925,31 +11063,37 @@ "name": "FastPCS", "version": "0.1.4", "sha256": "0azd8j9b85qmvmy335anlgchsjz1qp0xhc18jq7hniz04f6gva7q", - "depends": ["matrixStats", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "matrixStats"] }, "FastRCS": { "name": "FastRCS", "version": "0.0.9", "sha256": "12xavg273hd08cb2azd61birfdgsn3mls7m7jw6hjpvhb37ds69j", - "depends": ["matrixStats", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "matrixStats"] }, "FastRWeb": { "name": "FastRWeb", "version": "1.2-1", "sha256": "1kpj38b08xd2zyas1ac5jj1vfyb2b5q2kai55h5plcjlz3h627lp", - "depends": ["base64enc", "Cairo"] + "depends": ["Cairo", "base64enc"] }, "FastSF": { "name": "FastSF", "version": "0.1.1", "sha256": "1xajav45h57hchzkvl2pb4mz9xy433lq74jnry0icid8dai5xhwb", - "depends": ["limSolve", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "limSolve"] }, "FastStepGraph": { "name": "FastStepGraph", "version": "0.1.1", "sha256": "0f05cyhdz1530vhwv6r76lpcj7lqq5xrvhmpjfv716v0c4j2i72s", - "depends": ["doParallel", "foreach", "MASS"] + "depends": ["MASS", "doParallel", "foreach"] + }, + "FastUtils": { + "name": "FastUtils", + "version": "0.2.1", + "sha256": "0nscg4kjgi5s8fpr8ni2d4rf4s362gkamvlz3nc3lp7mdniaxkyj", + "depends": ["BiocManager", "Rcpp", "assertthat", "cli", "devtools", "dplyr", "ggplot2", "hash", "lifecycle", "rlang", "testthat", "usethis"] }, "FatTailsR": { "name": "FatTailsR", @@ -10961,7 +11105,7 @@ "name": "FateID", "version": "0.2.2", "sha256": "0sgvaqhqkmmkcsl53bm1jlfpzrvzfb5cz8k513nizfsi638vydlm", - "depends": ["locfit", "matrixStats", "pheatmap", "princurve", "randomForest", "RColorBrewer", "Rtsne", "som", "umap"] + "depends": ["RColorBrewer", "Rtsne", "locfit", "matrixStats", "pheatmap", "princurve", "randomForest", "som", "umap"] }, "FaultTree": { "name": "FaultTree", @@ -10977,15 +11121,15 @@ }, "FeatureExtraction": { "name": "FeatureExtraction", - "version": "3.5.2", - "sha256": "0gl2j3kiap00yc8krs9ki9v91qfa082yprnzgr9nyp9c15gggmmx", - "depends": ["Andromeda", "checkmate", "cli", "DatabaseConnector", "DBI", "dplyr", "jsonlite", "ParallelLogger", "pillar", "readr", "rJava", "rlang", "RSQLite", "SqlRender"] + "version": "3.6.0", + "sha256": "0d4r65aacxz9pzsxlzavl95j7v6qc2i86bc89439fdh2iwc4lyz9", + "depends": ["Andromeda", "DBI", "DatabaseConnector", "ParallelLogger", "RSQLite", "SqlRender", "checkmate", "cli", "dplyr", "jsonlite", "pillar", "rJava", "readr", "rlang"] }, "FeatureHashing": { "name": "FeatureHashing", "version": "0.9.2", "sha256": "05cap6251dk3x7802ii33zv41pahng68h7fvx5z8y6ii4vzlgd57", - "depends": ["BH", "digest", "magrittr", "Matrix", "Rcpp"] + "depends": ["BH", "Matrix", "Rcpp", "digest", "magrittr"] }, "FeatureImpCluster": { "name": "FeatureImpCluster", @@ -11009,7 +11153,7 @@ "name": "FedIRT", "version": "0.1.0", "sha256": "0qihs2m1qdp9kfw8f7a76r6cppfi9bxlj2mk4670v4ds2mqyq7xw", - "depends": ["callr", "DT", "ggplot2", "httr", "pracma", "purrr", "shiny", "shinyjs"] + "depends": ["DT", "callr", "ggplot2", "httr", "pracma", "purrr", "shiny", "shinyjs"] }, "FeedbackTS": { "name": "FeedbackTS", @@ -11045,13 +11189,13 @@ "name": "FiSh", "version": "1.1", "sha256": "1fcs2y3diszypv7sr4vl75wizcxv0na0pqflmlrizs2w7kyw51p6", - "depends": ["fda_usc", "KernSmooth"] + "depends": ["KernSmooth", "fda_usc"] }, "FielDHub": { "name": "FielDHub", - "version": "1.3.7", - "sha256": "1w0hwqah5h41423sc6ggcwcsxczwy0bs7mc2zy98g1fhsnk3ipfj", - "depends": ["blocksdesign", "config", "desplot", "dplyr", "DT", "ggplot2", "golem", "htmltools", "numbers", "plotly", "shiny", "shinyalert", "shinycssloaders", "shinyjs", "shinythemes", "viridis"] + "version": "1.4.2", + "sha256": "1sfrhz6b3pzrcjp3jdg35yxj3j2m7mvzhwwv49f7nvfmrs3fx936", + "depends": ["DT", "blocksdesign", "config", "desplot", "dplyr", "ggplot2", "golem", "htmltools", "numbers", "plotly", "shiny", "shinyalert", "shinycssloaders", "shinyjs", "shinythemes", "viridis"] }, "FieldSimR": { "name": "FieldSimR", @@ -11059,6 +11203,12 @@ "sha256": "1yhys0zb6rzd3xx8lwxg6n9dak15nlhyg8a0bkgjfad8ljihlkyj", "depends": ["cluster", "ggplot2", "interp", "lattice", "mbend"] }, + "FilmsGmooG": { + "name": "FilmsGmooG", + "version": "0.1.0", + "sha256": "0572vnjp8ycgpkdm4h4rws9rjhhc9iqyc65zzin9bfawa4ic81rd", + "depends": [] + }, "FinAna": { "name": "FinAna", "version": "0.1.2", @@ -11069,7 +11219,7 @@ "name": "FinCal", "version": "0.6.3", "sha256": "1clvnvhpf2krrf8flhmdxmys6ym3xw3v4v07kk1if4xb0dfk9wgy", - "depends": ["ggplot2", "RCurl", "reshape2"] + "depends": ["RCurl", "ggplot2", "reshape2"] }, "FinCovRegularization": { "name": "FinCovRegularization", @@ -11093,7 +11243,7 @@ "name": "FinancialInstrument", "version": "1.3.1", "sha256": "0f1zaclrcmpkdhcfc8a09f7lsf2b7gfyd7js3173qckn84a01f3w", - "depends": ["quantmod", "TTR", "xts", "zoo"] + "depends": ["TTR", "quantmod", "xts", "zoo"] }, "FinancialMath": { "name": "FinancialMath", @@ -11105,7 +11255,7 @@ "name": "FindIt", "version": "1.2.0", "sha256": "0zrvkvj907fw86jnzzlwk4d90hi42nq45jprp16xryxb7xxii6i8", - "depends": ["arm", "glinternet", "glmnet", "igraph", "lars", "limSolve", "lmtest", "Matrix", "quadprog", "sandwich"] + "depends": ["Matrix", "arm", "glinternet", "glmnet", "igraph", "lars", "limSolve", "lmtest", "quadprog", "sandwich"] }, "FinePop": { "name": "FinePop", @@ -11135,25 +11285,25 @@ "name": "FishResp", "version": "1.1.1", "sha256": "16my9pyzxyz3l087hq2r60fm08rgah3pg4arlqrwk1nn423cbr5v", - "depends": ["chron", "lattice", "mclust", "respirometry", "rMR"] + "depends": ["chron", "lattice", "mclust", "rMR", "respirometry"] }, "FisherEM": { "name": "FisherEM", "version": "1.6", "sha256": "18xn0hnj5diq7falrjl04abqyyrvyzaikb9l6wh7hfhflhsd382c", - "depends": ["elasticnet", "ellipse", "ggplot2", "MASS", "plyr"] + "depends": ["MASS", "elasticnet", "ellipse", "ggplot2", "plyr"] }, "FitDynMix": { "name": "FitDynMix", "version": "1.0.0", "sha256": "1miwqdlgvyqyql67mjclx1fiild59p37zani9hxa0lzs2bbhrz43", - "depends": ["evir", "ks", "MASS", "pracma", "Rdpack"] + "depends": ["MASS", "Rdpack", "evir", "ks", "pracma"] }, "FitUltD": { "name": "FitUltD", "version": "3.1.0", "sha256": "17fj211riybq71k63wjfv2ndc2h46ay5svrac2v5i3b92cb9hkbv", - "depends": ["ADGofTest", "assertthat", "cowplot", "fitdistrplus", "ggplot2", "MASS", "mclust", "purrr"] + "depends": ["ADGofTest", "MASS", "assertthat", "cowplot", "fitdistrplus", "ggplot2", "mclust", "purrr"] }, "FixSeqMTP": { "name": "FixSeqMTP", @@ -11169,8 +11319,8 @@ }, "FjordLight": { "name": "FjordLight", - "version": "0.8", - "sha256": "031wpxvdbwkj6ay18l594hs0w45amdxd2lppwpa8sx4jyycfwbn9", + "version": "1.0.0", + "sha256": "07rb1x5b6wywla4jg6vb5s50c7a0m4bwgchxj4bnbcx53swrh2sf", "depends": ["curl", "ncdf4", "raster"] }, "FlexDir": { @@ -11195,7 +11345,7 @@ "name": "FlexReg", "version": "1.3.0", "sha256": "15vl2wfvplydjgdgcb4gla02n6hx9lljnw20r5rvhw4ll6ahr110", - "depends": ["bayesplot", "BH", "Formula", "ggplot2", "loo", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Formula", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "ggplot2", "loo", "rstan", "rstantools"] }, "FlexScan": { "name": "FlexScan", @@ -11207,7 +11357,7 @@ "name": "FlexVarJM", "version": "0.1.0", "sha256": "1gq832bhwjs59blhblj5l3c92sa6mid57r5dkk4lv2pfdbagfj5a", - "depends": ["ggplot2", "lcmm", "marqLevAlg", "mvtnorm", "randtoolbox", "Rcpp", "RcppArmadillo", "survival", "survminer"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "lcmm", "marqLevAlg", "mvtnorm", "randtoolbox", "survival", "survminer"] }, "FlickrAPI": { "name": "FlickrAPI", @@ -11233,6 +11383,12 @@ "sha256": "1s9xyrvfsgrl2zxm2an5qj3rs1qx7v7j8wc83jzl28pkwa5xr351", "depends": ["changepoint", "evir", "zyp"] }, + "FlowerMate": { + "name": "FlowerMate", + "version": "1.0", + "sha256": "0hl91lz1ikhqransinn0zqa2gmx0fyl7yqxnjjj4h8ssff63hwrc", + "depends": [] + }, "FluMoDL": { "name": "FluMoDL", "version": "0.0.3", @@ -11249,7 +11405,7 @@ "name": "FlyingR", "version": "0.2.2", "sha256": "08jyp4hfb9pydicx4i6vgi94p6pykyi545w8svhar2fwmn1ik955", - "depends": ["kableExtra", "knitr", "Rcpp", "rmarkdown"] + "depends": ["Rcpp", "kableExtra", "knitr", "rmarkdown"] }, "FnR": { "name": "FnR", @@ -11261,13 +11417,13 @@ "name": "FoReco", "version": "0.2.6", "sha256": "07ivfjs836g3k13kfv188lxv300n43vczmkcapxnwiii643y1kw8", - "depends": ["cli", "corpcor", "mathjaxr", "Matrix", "osqp"] + "depends": ["Matrix", "cli", "corpcor", "mathjaxr", "osqp"] }, "ForIT": { "name": "ForIT", "version": "2.4.0", "sha256": "0kc15b05dp3cybjln49d0ly962s4gayidi0qpb6mcy0qdxvb17lv", - "depends": ["dplyr", "ggplot2", "magrittr", "metR", "purrr", "RColorBrewer", "rlang", "tibble", "tidyr"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "magrittr", "metR", "purrr", "rlang", "tibble", "tidyr"] }, "ForagingOrg": { "name": "ForagingOrg", @@ -11279,7 +11435,7 @@ "name": "ForeCA", "version": "0.2.7", "sha256": "1falhz9v0z76h60gz66rh9wvk3jsjv8fvbkhkx9jmzbrkla397cd", - "depends": ["astsa", "MASS", "reshape2"] + "depends": ["MASS", "astsa", "reshape2"] }, "ForeComp": { "name": "ForeComp", @@ -11291,7 +11447,7 @@ "name": "ForecastComb", "version": "1.3.1", "sha256": "07cbiv172mpkwvg6svhwgavlfy2144ir3y1l7w37wbd0ygs514id", - "depends": ["forecast", "ggplot2", "Matrix", "mtsdi", "psych", "quadprog", "quantreg"] + "depends": ["Matrix", "forecast", "ggplot2", "mtsdi", "psych", "quadprog", "quantreg"] }, "ForecastCombinations": { "name": "ForecastCombinations", @@ -11303,7 +11459,7 @@ "name": "ForecastTB", "version": "1.0.1", "sha256": "1wqgw4i65ajwj8la8mgv2qqm4ydgk90i6chdkd8h33rlwh8yddc6", - "depends": ["circlize", "decomposedPSF", "forecast", "ggplot2", "gridExtra", "imputeTestbench", "PSF", "RColorBrewer", "reshape2"] + "depends": ["PSF", "RColorBrewer", "circlize", "decomposedPSF", "forecast", "ggplot2", "gridExtra", "imputeTestbench", "reshape2"] }, "ForestDisc": { "name": "ForestDisc", @@ -11321,19 +11477,19 @@ "name": "ForestGapR", "version": "0.1.7", "sha256": "0pj1rq2gqhigrv5v734hj0gmjb6qnipy9crd14qdvzbjhprg4i4z", - "depends": ["igraph", "poweRlaw", "raster", "sp", "spatstat_explore", "spatstat_geom", "VGAM", "viridis"] + "depends": ["VGAM", "igraph", "poweRlaw", "raster", "sp", "spatstat_explore", "spatstat_geom", "viridis"] }, "ForestTools": { "name": "ForestTools", "version": "1.0.2", "sha256": "1c5p4j9kva63hi54zj76vxfydrgkfvszwzzlpn0ippijgrwmcf6j", - "depends": ["GLCMTextures", "imager", "Matrix", "sf", "terra"] + "depends": ["GLCMTextures", "Matrix", "imager", "sf", "terra"] }, "FormShare": { "name": "FormShare", "version": "1.0.1", "sha256": "17wdqjymc33r7r17h3fwi0ixlbpl77k1fm9a6r3gjwxixz8kicx3", - "depends": ["httr", "jsonlite", "R6"] + "depends": ["R6", "httr", "jsonlite"] }, "FormulR": { "name": "FormulR", @@ -11357,7 +11513,7 @@ "name": "FossilSimShiny", "version": "1.1.2", "sha256": "1i9ni95qynw96d7v7b1a1wrixl3wm73rz4fzj07kcwb3ypps2b77", - "depends": ["FossilSim", "shiny", "shinyjs", "TreeSim"] + "depends": ["FossilSim", "TreeSim", "shiny", "shinyjs"] }, "FourScores": { "name": "FourScores", @@ -11369,7 +11525,7 @@ "name": "FourWayHMM", "version": "1.0.0", "sha256": "0zi42d214dq70ypgj8g57fwjbqfih4z0956njpj2739aqsnjq5v4", - "depends": ["data_table", "doSNOW", "foreach", "LaplacesDemon", "mclust", "snow", "tensor", "tidyr", "withr"] + "depends": ["LaplacesDemon", "data_table", "doSNOW", "foreach", "mclust", "snow", "tensor", "tidyr", "withr"] }, "FourgameteP": { "name": "FourgameteP", @@ -11435,25 +11591,25 @@ "name": "FunCC", "version": "1.0", "sha256": "0n8fnrq3grsxxcz1841d3d643nyrwc7y15na1205zxq6rmdjx7wa", - "depends": ["biclust", "ggplot2", "narray", "RColorBrewer", "reshape"] + "depends": ["RColorBrewer", "biclust", "ggplot2", "narray", "reshape"] }, "FunChisq": { "name": "FunChisq", "version": "2.5.4", "sha256": "0y5minhjas4rihg8c4lvy2f323makza28p20c303rpzh4k50diji", - "depends": ["BH", "dqrng", "Rcpp", "Rdpack"] + "depends": ["BH", "Rcpp", "Rdpack", "dqrng"] }, "FunWithNumbers": { "name": "FunWithNumbers", "version": "1.2", "sha256": "0p3czcc6v1wwdbdfmar1q0z4b7r75p39zd2bw0dl14wcn7fn59sq", - "depends": ["bigBits", "gmp", "Rmpfr"] + "depends": ["Rmpfr", "bigBits", "gmp"] }, "FuncDiv": { "name": "FuncDiv", "version": "1.0.0", "sha256": "19jfxy9mhhsfr2mf3l9d125swy20qcyxfqd2fk9m6cly9ajzggza", - "depends": ["ape", "collapse", "data_table", "parallelDist", "Rcpp", "RcppArmadillo", "RcppParallel", "RcppXPtrUtils"] + "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "RcppXPtrUtils", "ape", "collapse", "data_table", "parallelDist"] }, "FuncMap": { "name": "FuncMap", @@ -11465,13 +11621,13 @@ "name": "FuncNN", "version": "1.0", "sha256": "0kcr7c54igzi0imp8w9a0mnrqaa2qcls9777scsjz5sbcxdy3if3", - "depends": ["caret", "doParallel", "fda", "fda_usc", "flux", "foreach", "ggplot2", "ggpubr", "keras", "Matrix", "pbapply", "reshape2", "tensorflow"] + "depends": ["Matrix", "caret", "doParallel", "fda", "fda_usc", "flux", "foreach", "ggplot2", "ggpubr", "keras", "pbapply", "reshape2", "tensorflow"] }, "FunctanSNP": { "name": "FunctanSNP", "version": "0.1.0", "sha256": "1f1zdwr9pmpscb8va9gd7yl0vyxmv0hy6swfrh7074whvs0dkbn7", - "depends": ["caret", "fda", "funData", "glmnet", "lava", "MASS"] + "depends": ["MASS", "caret", "fda", "funData", "glmnet", "lava"] }, "FunnelPlotR": { "name": "FunnelPlotR", @@ -11501,13 +11657,13 @@ "name": "FuzzyClass", "version": "0.1.6", "sha256": "1ld40qaiig743x21iwzpiabc1ky72hqrdnh855wfgvkmln9jc9by", - "depends": ["caTools", "doParallel", "e1071", "EnvStats", "foreach", "MASS", "mvtnorm", "purrr", "Rdpack", "rootSolve", "trapezoid"] + "depends": ["EnvStats", "MASS", "Rdpack", "caTools", "doParallel", "e1071", "foreach", "mvtnorm", "purrr", "rootSolve", "trapezoid"] }, "FuzzyDBScan": { "name": "FuzzyDBScan", "version": "0.0.3", "sha256": "1a974s5j03caifcypk1c7la96754gh6n20xak7qaf9hrbm5i7vr9", - "depends": ["checkmate", "data_table", "dbscan", "ggplot2", "R6"] + "depends": ["R6", "checkmate", "data_table", "dbscan", "ggplot2"] }, "FuzzyLP": { "name": "FuzzyLP", @@ -11559,8 +11715,8 @@ }, "FuzzySTs": { "name": "FuzzySTs", - "version": "0.2", - "sha256": "0zs1pyn9apysspxa0glqc96h6npmvvhiqvqpcm0brslz0b6xnilp", + "version": "0.3", + "sha256": "01bzkq9aj2afj87vz6vn6i8cs2368ppb5z9fpwlpkyjpp2a0cxsv", "depends": ["FuzzyNumbers", "polynom"] }, "FuzzySimRes": { @@ -11591,19 +11747,19 @@ "name": "G2Sd", "version": "2.1.5", "sha256": "165i6x2k56vwhk5p2p5m9vjmp9flblsapjdlz7nw9b719l6xz5zk", - "depends": ["ggplot2", "reshape2", "rJava", "shiny", "xlsx", "xlsxjars"] + "depends": ["ggplot2", "rJava", "reshape2", "shiny", "xlsx", "xlsxjars"] }, "GA": { "name": "GA", "version": "3.2.4", "sha256": "1gc1n2xdzrkc9cvrm6a50c9xpwvf0isdgvs1qpm8x1afacw6d7z5", - "depends": ["cli", "crayon", "foreach", "iterators", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "cli", "crayon", "foreach", "iterators"] }, "GABB": { "name": "GABB", "version": "0.3.8", "sha256": "16gdg5yvzlvic3qc9ya68xkbx55jg7lvlnqjry9x4c5hvggywzvl", - "depends": ["dplyr", "egg", "ggforce", "ggplot2", "ggplotify", "ggpubr", "ggrepel", "Hotelling", "pheatmap", "tidyr", "vegan"] + "depends": ["Hotelling", "dplyr", "egg", "ggforce", "ggplot2", "ggplotify", "ggpubr", "ggrepel", "pheatmap", "tidyr", "vegan"] }, "GACFF": { "name": "GACFF", @@ -11621,7 +11777,7 @@ "name": "GADAG", "version": "0.99.0", "sha256": "1ycg48idrq2yrk1fxs16yl5wwg3kbfki8xppmh311rrzf75c6z4g", - "depends": ["igraph", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "igraph"] }, "GAGAs": { "name": "GAGAs", @@ -11633,7 +11789,7 @@ "name": "GAGBLUP", "version": "1.0", "sha256": "192r4fr3idl78g9vllb7hdvlrfkghh1airblb94c1mjyrjkj2hxa", - "depends": ["doParallel", "foreach", "GA"] + "depends": ["GA", "doParallel", "foreach"] }, "GAIPE": { "name": "GAIPE", @@ -11645,7 +11801,7 @@ "name": "GALLO", "version": "1.5", "sha256": "0idzzkgxfr5im9p7xk7f4iph445rp8y2dzdzddm4x9i4fnh5hkwn", - "depends": ["circlize", "CompQuadForm", "data_table", "doParallel", "dplyr", "DT", "foreach", "ggplot2", "igraph", "lattice", "Matrix", "RColorBrewer", "rtracklayer", "stringr", "unbalhaar", "visNetwork", "webshot"] + "depends": ["CompQuadForm", "DT", "Matrix", "RColorBrewer", "circlize", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "igraph", "lattice", "rtracklayer", "stringr", "unbalhaar", "visNetwork", "webshot"] }, "GAMens": { "name": "GAMens", @@ -11687,7 +11843,7 @@ "name": "GAS", "version": "0.3.4", "sha256": "014b2y9qrv44j5v559bnw7yiacs9aarsgpbrj3clxm4n0srhv843", - "depends": ["cubature", "MASS", "numDeriv", "Rcpp", "RcppArmadillo", "Rsolnp", "xts", "zoo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rsolnp", "cubature", "numDeriv", "xts", "zoo"] }, "GAparsimony": { "name": "GAparsimony", @@ -11717,7 +11873,7 @@ "name": "GBJ", "version": "0.5.4", "sha256": "0vi4zv59g4fjq28gq6b8mn5gmddwvq9sijjilcd6wr7jl67c0fbs", - "depends": ["BH", "mvtnorm", "Rcpp", "SKAT"] + "depends": ["BH", "Rcpp", "SKAT", "mvtnorm"] }, "GCCfactor": { "name": "GCCfactor", @@ -11735,7 +11891,7 @@ "name": "GCPBayes", "version": "4.2.0", "sha256": "134rqclfix1p91nb1sn3js3l8pbgsl0i22ygz2gl73jjhckk0j75", - "depends": ["gdata", "invgamma", "MASS", "mvtnorm", "postpack", "Rcpp", "RcppArmadillo", "truncnorm", "wiqid"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "gdata", "invgamma", "mvtnorm", "postpack", "truncnorm", "wiqid"] }, "GCPM": { "name": "GCPM", @@ -11757,8 +11913,8 @@ }, "GCalignR": { "name": "GCalignR", - "version": "1.0.6", - "sha256": "1cgsmz1793yw9v4wwcd1a9igsjjhpzv0inikj2q2p98pzshhkwcb", + "version": "1.0.7", + "sha256": "1c8vsklvkggwarh38rd1k88n0jaqcy7r23gyy5khsfkglzgkg2ns", "depends": ["ggplot2", "pbapply", "readr", "reshape2", "stringr", "tibble"] }, "GD": { @@ -11777,7 +11933,7 @@ "name": "GDAtools", "version": "2.1", "sha256": "1561zzw177kc7x3hiqzi7qm1yvczx8lzjb2j7d45zgwgz96v9vf8", - "depends": ["descriptio", "FactoMineR", "ggplot2", "ggrepel", "rlang"] + "depends": ["FactoMineR", "descriptio", "ggplot2", "ggrepel", "rlang"] }, "GDELTtools": { "name": "GDELTtools", @@ -11785,6 +11941,12 @@ "sha256": "0v368chcgqnrfy2isy8z7gl0xizafhxlcd29gr89iblhrzwmssid", "depends": ["datetimeutils", "dplyr", "plyr", "stringr"] }, + "GDILM_ME": { + "name": "GDILM.ME", + "version": "1.2.1", + "sha256": "1gq2snfbmzfddh3bnga26p37ywahqxq5mnnmr3in8an3x5fdpw2v", + "depends": ["MASS", "corpcor", "mvtnorm", "ngspatial", "numDeriv", "psych"] + }, "GDILM_SIR": { "name": "GDILM.SIR", "version": "1.2.1", @@ -11795,7 +11957,7 @@ "name": "GDINA", "version": "2.9.4", "sha256": "10bbwr4q6cp36dnwhddviqg7f00h92gdmvblw0lxn72v4869vhn1", - "depends": ["alabama", "ggplot2", "MASS", "nloptr", "numDeriv", "Rcpp", "RcppArmadillo", "Rsolnp", "shiny", "shinydashboard"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rsolnp", "alabama", "ggplot2", "nloptr", "numDeriv", "shiny", "shinydashboard"] }, "GDPuc": { "name": "GDPuc", @@ -11813,7 +11975,7 @@ "name": "GE", "version": "0.4.5", "sha256": "0fnf6z08989g132p0prif49zqa3a399wq0wzz7n964cqvz5g3j5f", - "depends": ["CGE", "data_tree", "DiagrammeR"] + "depends": ["CGE", "DiagrammeR", "data_tree"] }, "GEC": { "name": "GEC", @@ -11825,7 +11987,7 @@ "name": "GEEaSPU", "version": "1.0.2", "sha256": "02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg", - "depends": ["gee", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "gee"] }, "GEEmediate": { "name": "GEEmediate", @@ -11837,19 +11999,19 @@ "name": "GEInfo", "version": "1.0", "sha256": "08ha9w3c64x9ib2fbh4djbhg7y6lykibx93mbm7i3gdvpajqk0jx", - "depends": ["dplyr", "glmnet", "MASS", "pheatmap", "rvest"] + "depends": ["MASS", "dplyr", "glmnet", "pheatmap", "rvest"] }, "GEInter": { "name": "GEInter", "version": "0.3.2", "sha256": "15nrnidbih5fw7i7g6d8rjllw2jbmligz2kzj2fqg30llck9ivl5", - "depends": ["ggplot2", "Hmisc", "MASS", "pcaPP", "quantreg", "reshape2", "survival"] + "depends": ["Hmisc", "MASS", "ggplot2", "pcaPP", "quantreg", "reshape2", "survival"] }, "GENEAclassify": { "name": "GENEAclassify", "version": "1.5.5", "sha256": "0iy75m31i0wb27kvknx3ln9crbllpgdc6j2qsx6hwn4gxddl9lv0", - "depends": ["changepoint", "GENEAread", "MASS", "rpart", "signal"] + "depends": ["GENEAread", "MASS", "changepoint", "rpart", "signal"] }, "GENEAread": { "name": "GENEAread", @@ -11861,19 +12023,19 @@ "name": "GENLIB", "version": "1.1.10", "sha256": "1h0digaa1szgwq0qzf3114id7bx7q6zmgar591jlxgyihihk4x9j", - "depends": ["BH", "bootstrap", "doParallel", "foreach", "kinship2", "lattice", "Matrix", "quadprog", "Rcpp"] + "depends": ["BH", "Matrix", "Rcpp", "bootstrap", "doParallel", "foreach", "kinship2", "lattice", "quadprog"] }, "GENMETA": { "name": "GENMETA", "version": "0.2.0", "sha256": "11wlcnj919jws62ngf29gr2p0shdlm917hkz5iwfss1m8gcbfjnl", - "depends": ["magic", "MASS", "Matrix", "pracma"] + "depends": ["MASS", "Matrix", "magic", "pracma"] }, "GEOmap": { "name": "GEOmap", - "version": "2.5-5", - "sha256": "0gs8zd8rcdxgz0pm3nlynf4qy8axfsv7syagb22zi8yd4s4sf5wa", - "depends": ["fields", "MBA", "RPMG", "sf"] + "version": "2.5-11", + "sha256": "1h6f8wyf3p5a0mr5mvm7cv9v67gjfyzip1fw4rsqx6zkc9nyaswp", + "depends": ["MBA", "RPMG", "fields", "sf"] }, "GESE": { "name": "GESE", @@ -11897,7 +12059,7 @@ "name": "GEVACO", "version": "1.0.1", "sha256": "0zkan4w96g3qc1hgla90mh32b55bk58gax095p4nxrfi46f8w3rf", - "depends": ["nlme", "RLRsim"] + "depends": ["RLRsim", "nlme"] }, "GEVcdn": { "name": "GEVcdn", @@ -11921,31 +12083,31 @@ "name": "GFD", "version": "0.3.3", "sha256": "1d40fwk367ww544z25jwlx2kdm1gv7y6ijl8vnpi198n7k1hdgpl", - "depends": ["magic", "MASS", "Matrix", "plotrix", "plyr", "shiny", "shinyjs", "shinythemes", "shinyWidgets", "tippy"] + "depends": ["MASS", "Matrix", "magic", "plotrix", "plyr", "shiny", "shinyWidgets", "shinyjs", "shinythemes", "tippy"] }, "GFDmcv": { "name": "GFDmcv", "version": "0.1.0", "sha256": "094b41sx3czz9sjqhvxggkmrdcwfwv8ww9k4286vzd055jbvk5hh", - "depends": ["doParallel", "foreach", "HSAUR", "MASS", "Matrix", "mvtnorm", "Rcpp", "RcppArmadillo", "stringr"] + "depends": ["HSAUR", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "mvtnorm", "stringr"] }, "GFDrmst": { "name": "GFDrmst", "version": "0.1.0", "sha256": "1qas9dj65mqjfzslxxljy17370vc0v6fwypgv971kvk9wx1a2a00", - "depends": ["GFDmcv", "lpSolve", "MASS", "mvtnorm", "plyr", "shiny", "shinyjs", "shinyMatrix", "shinythemes", "shinyWidgets", "tippy"] + "depends": ["GFDmcv", "MASS", "lpSolve", "mvtnorm", "plyr", "shiny", "shinyMatrix", "shinyWidgets", "shinyjs", "shinythemes", "tippy"] }, "GFDsurv": { "name": "GFDsurv", "version": "0.1.1", "sha256": "0qq66f8ddw92m9k9raid89rggla9691xi2sn1w3r7lmwqf6ajsl4", - "depends": ["gridExtra", "magic", "MASS", "plyr", "shiny", "shinyjs", "shinythemes", "survival", "survminer", "tippy"] + "depends": ["MASS", "gridExtra", "magic", "plyr", "shiny", "shinyjs", "shinythemes", "survival", "survminer", "tippy"] }, "GFE": { "name": "GFE", "version": "0.1.1", "sha256": "1mhlvp7i8g4b3mj4qwfnk0vl7af9sflgi6zgsjjp16kdsv42zkwn", - "depends": ["data_table", "dplyr", "TeachingSampling"] + "depends": ["TeachingSampling", "data_table", "dplyr"] }, "GFGM_copula": { "name": "GFGM.copula", @@ -11957,7 +12119,7 @@ "name": "GFM", "version": "1.2.1", "sha256": "13v8gsn1zsxcji52n3mv1bik5xjqzg8n01rak1bvffm9qwakg571", - "depends": ["doSNOW", "irlba", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "doSNOW", "irlba"] }, "GFisher": { "name": "GFisher", @@ -11979,27 +12141,27 @@ }, "GGIR": { "name": "GGIR", - "version": "3.1-1", - "sha256": "1vmx4bmjsk0sdxpafmpsiiiv0z4pyi6lfsxbb9mrqmhkqdhp2yrf", - "depends": ["ActCR", "data_table", "doParallel", "foreach", "GGIRread", "ineq", "irr", "lubridate", "psych", "read_gt3x", "signal", "unisensR", "zoo"] + "version": "3.1-2", + "sha256": "1vy57qbnav1kl71wwznb0kl3s06csqm0sx5k90hzwqjignxnc223", + "depends": ["ActCR", "GGIRread", "data_table", "doParallel", "foreach", "ineq", "irr", "lubridate", "psych", "read_gt3x", "signal", "unisensR", "zoo"] }, "GGIRread": { "name": "GGIRread", "version": "1.0.1", "sha256": "0kad21xqwb2c4phg4mq7480qvki5frn2c2slfbcfj9paxxl4ha16", - "depends": ["bitops", "matlab", "Rcpp"] + "depends": ["Rcpp", "bitops", "matlab"] }, "GGMncv": { "name": "GGMncv", "version": "2.1.1", "sha256": "0lih9dyb5aqrawhiy2vhv63b132hhzq6zq0x6rbrhy8kbkldhigr", - "depends": ["GGally", "ggplot2", "glassoFast", "MASS", "mathjaxr", "network", "numDeriv", "pbapply", "Rcpp", "RcppArmadillo", "Rdpack", "reshape", "sna"] + "depends": ["GGally", "MASS", "Rcpp", "RcppArmadillo", "Rdpack", "ggplot2", "glassoFast", "mathjaxr", "network", "numDeriv", "pbapply", "reshape", "sna"] }, "GGMnonreg": { "name": "GGMnonreg", "version": "1.0.0", "sha256": "1bhqk172ddc7xq1hqj1i6q8np6jvmf2xypvd8kp3w1bcsafsbms8", - "depends": ["bestglm", "corpcor", "doParallel", "foreach", "GGally", "GGMncv", "ggplot2", "MASS", "Matrix", "network", "poibin", "psych", "Rdpack", "sna"] + "depends": ["GGMncv", "GGally", "MASS", "Matrix", "Rdpack", "bestglm", "corpcor", "doParallel", "foreach", "ggplot2", "network", "poibin", "psych", "sna"] }, "GGMridge": { "name": "GGMridge", @@ -12017,25 +12179,25 @@ "name": "GGRidge", "version": "1.1.0", "sha256": "08gj61ahk7ilvsz93xcdv7yknkmfz2spbym6c2c62gq8cva9zg86", - "depends": ["CVglasso", "gRbase", "MASS"] + "depends": ["CVglasso", "MASS", "gRbase"] }, "GGUM": { "name": "GGUM", "version": "0.5", "sha256": "1xbbapam5whnsa0f2fpvj2v56c7g5wm4jcs0xwzrcjlp9g293vqj", - "depends": ["abind", "psych", "Rdpack", "viridis", "xlsx"] + "depends": ["Rdpack", "abind", "psych", "viridis", "xlsx"] }, "GGally": { "name": "GGally", "version": "2.2.1", "sha256": "1il6yphqxcyj1039imi8pn6ygyni24daz8ljxxp3z9inb5k2dcwb", - "depends": ["dplyr", "ggplot2", "ggstats", "gtable", "lifecycle", "magrittr", "plyr", "progress", "RColorBrewer", "rlang", "scales", "tidyr"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "ggstats", "gtable", "lifecycle", "magrittr", "plyr", "progress", "rlang", "scales", "tidyr"] }, "GGoutlieR": { "name": "GGoutlieR", "version": "1.0.2", "sha256": "18ass4fxdsvcn9j103dixar0grrh5w3nh6icydh1w5myrd455z9l", - "depends": ["cowplot", "doParallel", "FastKNN", "foreach", "ggforce", "ggplot2", "RColorBrewer", "rlang", "rnaturalearth", "scales", "sf", "tidyr"] + "depends": ["FastKNN", "RColorBrewer", "cowplot", "doParallel", "foreach", "ggforce", "ggplot2", "rlang", "rnaturalearth", "scales", "sf", "tidyr"] }, "GHS": { "name": "GHS", @@ -12047,7 +12209,7 @@ "name": "GHap", "version": "3.0.0", "sha256": "1fyxgnn6b474rx8cqg9lgdybq5j4nriq2axwgmhx7m8f7mysrqny", - "depends": ["class", "data_table", "e1071", "Matrix", "pedigreemm", "sparseinv", "stringi"] + "depends": ["Matrix", "class", "data_table", "e1071", "pedigreemm", "sparseinv", "stringi"] }, "GIC": { "name": "GIC", @@ -12089,7 +12251,7 @@ "name": "GISSB", "version": "1.1", "sha256": "0clhch4xvklrmk7h6b7vz83zzlj5r1lzrszy73agmpdbs5cax5sy", - "depends": ["cppRouting", "dplyr", "here", "httr", "igraph", "leaflet", "magrittr", "nabor", "purrr", "RCurl", "reshape2", "rlang", "sf", "stringr", "tibble", "tidygraph", "tidyselect"] + "depends": ["RCurl", "cppRouting", "dplyr", "here", "httr", "igraph", "leaflet", "magrittr", "nabor", "purrr", "reshape2", "rlang", "sf", "stringr", "tibble", "tidygraph", "tidyselect"] }, "GInSARCorW": { "name": "GInSARCorW", @@ -12107,7 +12269,7 @@ "name": "GJRM", "version": "0.2-6.5", "sha256": "0j69lh8hbdcmgj6bwg67s1mlgffcmc045z6sm6p3jifcg8ri18sw", - "depends": ["copula", "evd", "gamlss_dist", "ggplot2", "ismev", "magic", "matrixStats", "mgcv", "mnormt", "numDeriv", "psych", "Rmpfr", "scam", "survey", "survival", "trust", "VGAM", "VineCopula"] + "depends": ["Rmpfr", "VGAM", "VineCopula", "copula", "evd", "gamlss_dist", "ggplot2", "ismev", "magic", "matrixStats", "mgcv", "mnormt", "numDeriv", "psych", "scam", "survey", "survival", "trust"] }, "GK2011": { "name": "GK2011", @@ -12119,7 +12281,7 @@ "name": "GLCMTextures", "version": "0.4.1", "sha256": "1bh5kw46fpgawxgfif3m6vsr2zcngb7n1ass9cdx0cdkb525n7xi", - "depends": ["raster", "Rcpp", "RcppArmadillo", "terra"] + "depends": ["Rcpp", "RcppArmadillo", "raster", "terra"] }, "GLDEX": { "name": "GLDEX", @@ -12131,19 +12293,19 @@ "name": "GLDreg", "version": "1.1.1", "sha256": "1cp5mgbvq0g9ss2cv5yincfjvs8jmciz0h3g5jrr8gda1gvf357i", - "depends": ["ddst", "GLDEX"] + "depends": ["GLDEX", "ddst"] }, "GLIDE": { "name": "GLIDE", "version": "1.0.5", "sha256": "01164gh0j4g0hambiq92bxrd3j3z2psg19faj32mvhmn4c3k2m8i", - "depends": ["doParallel", "foreach", "MASS"] + "depends": ["MASS", "doParallel", "foreach"] }, "GLMMRR": { "name": "GLMMRR", "version": "0.5.0", "sha256": "072zwi1rs6d84iszn09v5g19bkpla19nfqk4pq40ad8368zkbhcm", - "depends": ["lattice", "lme4", "RColorBrewer"] + "depends": ["RColorBrewer", "lattice", "lme4"] }, "GLMMadaptive": { "name": "GLMMadaptive", @@ -12167,19 +12329,19 @@ "name": "GLMaSPU", "version": "1.0", "sha256": "0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g", - "depends": ["MASS", "mnormt", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "mnormt", "mvtnorm"] }, "GLMcat": { "name": "GLMcat", "version": "0.2.6", "sha256": "0izxa3ifwpqyyzy69hhhzf379ns1hswfa36ky2izawpyqk5h15ci", - "depends": ["BH", "ordinal", "Rcpp", "RcppEigen", "stringr"] + "depends": ["BH", "Rcpp", "RcppEigen", "ordinal", "stringr"] }, "GLMpack": { "name": "GLMpack", "version": "0.1.0", "sha256": "15bpw42y999ljdw8ka2ysrrm0y73xz37wwi3j67i01wafipq82xy", - "depends": ["AER", "censReg", "effects", "foreign", "lme4", "lmtest", "MASS", "Matrix", "nnet", "pBrackets", "plm", "pscl", "sandwich"] + "depends": ["AER", "MASS", "Matrix", "censReg", "effects", "foreign", "lme4", "lmtest", "nnet", "pBrackets", "plm", "pscl", "sandwich"] }, "GLMsData": { "name": "GLMsData", @@ -12203,7 +12365,7 @@ "name": "GMCM", "version": "1.4", "sha256": "13ds8da7lqkvm1mz75440hmn9smi9pznb8bknmckg8vd3fc70f6x", - "depends": ["ellipse", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "ellipse"] }, "GMDH": { "name": "GMDH", @@ -12215,7 +12377,7 @@ "name": "GMDH2", "version": "1.8", "sha256": "1cqpwnncxir9gc6vwzclm0av9hzd2a74xvl3w73dpzafvzkg4x67", - "depends": ["e1071", "glmnet", "magrittr", "MASS", "nnet", "plotly", "randomForest", "xtable"] + "depends": ["MASS", "e1071", "glmnet", "magrittr", "nnet", "plotly", "randomForest", "xtable"] }, "GMDHreg": { "name": "GMDHreg", @@ -12233,7 +12395,7 @@ "name": "GMMAT", "version": "1.4.2", "sha256": "151bc1mn69kmswkn6i5czmadsnymkw4yvgph8s7z3i6xc66r8s5y", - "depends": ["CompQuadForm", "data_table", "foreach", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["CompQuadForm", "Matrix", "Rcpp", "RcppArmadillo", "data_table", "foreach"] }, "GMMBoost": { "name": "GMMBoost", @@ -12269,13 +12431,13 @@ "name": "GNE", "version": "0.99-5", "sha256": "0a796zppqvjgymh03xh7wdb26m0ir2gsavm37278liaj3nzk2jkz", - "depends": ["alabama", "BB", "nleqslv", "SQUAREM"] + "depends": ["BB", "SQUAREM", "alabama", "nleqslv"] }, "GNRS": { "name": "GNRS", "version": "0.3.4", "sha256": "0aq6rq5b3jq9yj8hhyxjin38f2008qsix4zm20nyhqx0k0hizql1", - "depends": ["httr", "jsonlite", "RCurl"] + "depends": ["RCurl", "httr", "jsonlite"] }, "GNSSseg": { "name": "GNSSseg", @@ -12305,13 +12467,13 @@ "name": "GOplot", "version": "1.0.2", "sha256": "1y8dv0kbzpr9za91njw0x233vx5d13vqml9hmpddcyi9s6va5nix", - "depends": ["ggdendro", "ggplot2", "gridExtra", "RColorBrewer"] + "depends": ["RColorBrewer", "ggdendro", "ggplot2", "gridExtra"] }, "GOxploreR": { "name": "GOxploreR", "version": "1.2.7", "sha256": "0878czn9fyjh52a8qwmffl47x1jy8pw4m35wzicxj7k7ck58ws9k", - "depends": ["annotate", "biomaRt", "dplyr", "ggplot2", "ggraph", "GO_db", "gontr", "igraph", "network"] + "depends": ["GO_db", "annotate", "biomaRt", "dplyr", "ggplot2", "ggraph", "gontr", "igraph", "network"] }, "GPArotateDF": { "name": "GPArotateDF", @@ -12335,25 +12497,25 @@ "name": "GPCERF", "version": "0.2.4", "sha256": "0nzfd0sz73sb4903vpgix9m767np1prcmi3m1y3pq6dzmxmqzh6a", - "depends": ["cowplot", "ggplot2", "logger", "MASS", "Rcpp", "RcppArmadillo", "Rfast", "rlang", "spatstat_geom", "SuperLearner", "wCorr", "xgboost"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rfast", "SuperLearner", "cowplot", "ggplot2", "logger", "rlang", "spatstat_geom", "wCorr", "xgboost"] }, "GPCMlasso": { "name": "GPCMlasso", "version": "0.1-7", "sha256": "0hlhm780xyila4idk5r87pw046xi3lxhhpr0a22smhf4klvnlfgc", - "depends": ["caret", "cubature", "ltm", "mirt", "mvtnorm", "Rcpp", "RcppArmadillo", "statmod", "TeachingDemos"] + "depends": ["Rcpp", "RcppArmadillo", "TeachingDemos", "caret", "cubature", "ltm", "mirt", "mvtnorm", "statmod"] }, "GPFDA": { "name": "GPFDA", "version": "3.1.3", "sha256": "0s5jq2vmz02yr1wd79s6h5c8rvpbkdlnhdy5yfckk5nxddabcymb", - "depends": ["fda", "fda_usc", "fields", "interp", "mgcv", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "fda", "fda_usc", "fields", "interp", "mgcv"] }, "GPGame": { "name": "GPGame", "version": "1.2.0", "sha256": "1xxilr1ify9ip3vs000jawxplcbf1vqli40frhnwwjqf01kj8jq5", - "depends": ["DiceDesign", "DiceKriging", "GPareto", "KrigInv", "MASS", "matrixStats", "mnormt", "mvtnorm", "Rcpp"] + "depends": ["DiceDesign", "DiceKriging", "GPareto", "KrigInv", "MASS", "Rcpp", "matrixStats", "mnormt", "mvtnorm"] }, "GPIC": { "name": "GPIC", @@ -12377,7 +12539,7 @@ "name": "GPM", "version": "3.0.1", "sha256": "01vd68w5pnwhng83x5i0k9c5fhsn9siyzzndkvkmpis4mjm42sgv", - "depends": ["doParallel", "foreach", "iterators", "lattice", "lhs", "pracma", "randtoolbox", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "iterators", "lattice", "lhs", "pracma", "randtoolbox"] }, "GPP": { "name": "GPP", @@ -12395,7 +12557,7 @@ "name": "GPSCDF", "version": "0.1.1", "sha256": "1l50a6p81lykiqlqiwb6kix5s6wzwdi8vddqhl418dlwlsh83ybf", - "depends": ["dplyr", "MASS", "nbpMatching", "nnet", "survival"] + "depends": ["MASS", "dplyr", "nbpMatching", "nnet", "survival"] }, "GPSeqClus": { "name": "GPSeqClus", @@ -12413,7 +12575,7 @@ "name": "GPareto", "version": "1.1.8", "sha256": "1grs7pxxl9nymmg1qx8a7ln25c2bz47bv06pahq7ackhsh6zlvk9", - "depends": ["DiceDesign", "DiceKriging", "emoa", "KrigInv", "ks", "MASS", "pbivnorm", "pso", "randtoolbox", "Rcpp", "rgenoud", "rgl"] + "depends": ["DiceDesign", "DiceKriging", "KrigInv", "MASS", "Rcpp", "emoa", "ks", "pbivnorm", "pso", "randtoolbox", "rgenoud", "rgl"] }, "GPfit": { "name": "GPfit", @@ -12431,13 +12593,13 @@ "name": "GPvam", "version": "3.1-0", "sha256": "0mmwg5m85rzaaj8wdxsdn1yqpl08pr3ydmxpfwmm2f7xw0k2k29g", - "depends": ["Matrix", "numDeriv", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "numDeriv"] }, "GPvecchia": { "name": "GPvecchia", "version": "0.1.7", "sha256": "1dvixffrn3vz98n8p7vqqr9l77m8n1gij5za8z2hfpg78pipa0mi", - "depends": ["BH", "fields", "FNN", "GpGp", "Matrix", "Rcpp", "RcppArmadillo", "sparseinv"] + "depends": ["BH", "FNN", "GpGp", "Matrix", "Rcpp", "RcppArmadillo", "fields", "sparseinv"] }, "GRAPE": { "name": "GRAPE", @@ -12467,19 +12629,19 @@ "name": "GREENeR", "version": "1.0.0", "sha256": "18li2xs12gi4c1wsjxdqbjfyw81xsmgnljdrlgj9fdw91w3f9bzw", - "depends": ["classInt", "data_table", "dplyr", "FME", "ggplot2", "gridExtra", "magrittr", "networkD3", "parallelly", "reshape2", "sf", "tidyselect", "tmap"] + "depends": ["FME", "classInt", "data_table", "dplyr", "ggplot2", "gridExtra", "magrittr", "networkD3", "parallelly", "reshape2", "sf", "tidyselect", "tmap"] }, "GREMLINS": { "name": "GREMLINS", "version": "0.2.1", "sha256": "16l2mzd6xm2yk1hs5333w9lfz7iymkwmi3k80yxal9dxqh5hajkb", - "depends": ["aricode", "blockmodels", "igraph", "pbmcapply", "R6"] + "depends": ["R6", "aricode", "blockmodels", "igraph", "pbmcapply"] }, "GRIDCOPULA": { "name": "GRIDCOPULA", "version": "1.0.1", "sha256": "0d8zibd27z0krn564ba906zlvnb1fx4mfvhpii7pxr0pzjir2a9c", - "depends": ["evmix", "fields", "ggplot2", "limSolve", "pracma", "reshape2", "Rsolnp"] + "depends": ["Rsolnp", "evmix", "fields", "ggplot2", "limSolve", "pracma", "reshape2"] }, "GRNNs": { "name": "GRNNs", @@ -12503,7 +12665,7 @@ "name": "GRShiny", "version": "1.0.0", "sha256": "0i8qcqk97lm2pwjl2s6lfa4p6c69p8xl3q88bpn706ib687f5j3x", - "depends": ["bslib", "data_table", "dplyr", "DT", "flextable", "ggplot2", "gt", "lavaan", "magrittr", "MASS", "mirt", "officer", "openxlsx", "purrr", "readr", "sass", "shiny", "shinyWidgets", "sirt", "stringr", "tidyr"] + "depends": ["DT", "MASS", "bslib", "data_table", "dplyr", "flextable", "ggplot2", "gt", "lavaan", "magrittr", "mirt", "officer", "openxlsx", "purrr", "readr", "sass", "shiny", "shinyWidgets", "sirt", "stringr", "tidyr"] }, "GRSxE": { "name": "GRSxE", @@ -12551,7 +12713,7 @@ "name": "GSD", "version": "1.0.0", "sha256": "0qfn797wllkv44d55nhvm9mf4mxnxihckfbcd6l15irildnj9llg", - "depends": ["EbayesThresh", "ggplot2", "igraph", "Matrix"] + "depends": ["EbayesThresh", "Matrix", "ggplot2", "igraph"] }, "GSDA": { "name": "GSDA", @@ -12563,13 +12725,13 @@ "name": "GSE", "version": "4.2-1", "sha256": "0hxz2m8fn7zkxchvpn0kdw77mxgczff9mk1k0xy2ml50b9vzssm2", - "depends": ["cellWise", "ggplot2", "MASS", "Rcpp", "RcppArmadillo", "robustbase", "rrcov"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "cellWise", "ggplot2", "robustbase", "rrcov"] }, "GSED": { "name": "GSED", "version": "2.6", "sha256": "1k8axyzk55d8idn65qj3gxqjsk27n2r0q78v7524mg8n3fhxs0wj", - "depends": ["memoise", "R_utils", "rootSolve", "survival"] + "depends": ["R_utils", "memoise", "rootSolve", "survival"] }, "GSM": { "name": "GSM", @@ -12585,9 +12747,9 @@ }, "GSODR": { "name": "GSODR", - "version": "4.0.0", - "sha256": "1c8hsan8jsqz303pwd8bm4xy98qwfdj1nf96dybq0c6yg101fhvf", - "depends": ["countrycode", "curl", "data_table", "R_utils"] + "version": "4.1.1", + "sha256": "1q4jpv38x4z7bdqy49iaxgsfvy0iiicfvc4w8mpj0qjm9cj81gym", + "depends": ["R_utils", "countrycode", "curl", "data_table"] }, "GSSE": { "name": "GSSE", @@ -12599,19 +12761,19 @@ "name": "GSSTDA", "version": "1.0.0", "sha256": "0ah19qf6lfzlw52w43b5qszsxh2yvpz7vnspgvj4qidysbxkxd3q", - "depends": ["circlize", "cluster", "ComplexHeatmap", "devtools", "survival", "visNetwork"] + "depends": ["ComplexHeatmap", "circlize", "cluster", "devtools", "survival", "visNetwork"] }, "GSelection": { "name": "GSelection", "version": "0.1.0", "sha256": "052vh1haxlzbh3c5i24nrwphapik1y8ribmh6q4axd447ggc0ff9", - "depends": ["gdata", "penalized", "SAM"] + "depends": ["SAM", "gdata", "penalized"] }, "GSparO": { "name": "GSparO", "version": "1.0", "sha256": "0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0", - "depends": ["ggplot2", "ThreeWay"] + "depends": ["ThreeWay", "ggplot2"] }, "GTDL": { "name": "GTDL", @@ -12621,15 +12783,15 @@ }, "GUD": { "name": "GUD", - "version": "0.0.5", - "sha256": "0h8ihaph1lwnzzayn3ks09xvjxg2c57048az29zmc2paxbz0mwq3", - "depends": ["BH", "MASS", "posterior", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "version": "1.0.2", + "sha256": "0sbimcsclibjgilwy3p7h5lcz9dcvvfi36pcx9zkbdk765w5d5zg", + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "posterior", "rstan", "rstantools"] }, "GUEST": { "name": "GUEST", - "version": "0.1.0", - "sha256": "1fbad8kf0l69mzagiagf7i5dk7sq8a8qazfxywzppz7xy15acy42", - "depends": ["GGally", "network", "XICOR"] + "version": "0.2.0", + "sha256": "045cb9k99mrnx8c6xrshsca6dlyw3wqj57i5j34cjz39g4bmwxl6", + "depends": ["GGally", "XICOR", "network"] }, "GUIDE": { "name": "GUIDE", @@ -12641,13 +12803,13 @@ "name": "GUILDS", "version": "1.4.6", "sha256": "0rjlx13shzmamxzqng0qjl5kwzg111lq245y9z6axb3al3ly59ij", - "depends": ["nloptr", "pracma", "Rcpp"] + "depends": ["Rcpp", "nloptr", "pracma"] }, "GUIProfiler": { "name": "GUIProfiler", "version": "2.0.1", "sha256": "10m4d7f2rhw6cmkrnw3jh4iqlkfphf4v7mpfwzw17laq0ncmsx5r", - "depends": ["graph", "MASS", "Nozzle_R1", "proftools", "Rgraphviz", "rstudioapi"] + "depends": ["MASS", "Nozzle_R1", "Rgraphviz", "graph", "proftools", "rstudioapi"] }, "GUTS": { "name": "GUTS", @@ -12659,7 +12821,7 @@ "name": "GUniFrac", "version": "1.8", "sha256": "1yw0d8hb7s662xy0dny9ygvx9gwh7yj8dxw4897zy7zyjhzim95f", - "depends": ["ape", "dirmult", "foreach", "ggplot2", "ggrepel", "inline", "MASS", "Matrix", "matrixStats", "modeest", "Rcpp", "rmutil", "statmod", "vegan"] + "depends": ["MASS", "Matrix", "Rcpp", "ape", "dirmult", "foreach", "ggplot2", "ggrepel", "inline", "matrixStats", "modeest", "rmutil", "statmod", "vegan"] }, "GVARX": { "name": "GVARX", @@ -12683,19 +12845,19 @@ "name": "GWASinlps", "version": "2.2", "sha256": "1q5gaam554r2wxwsdgxjx6hngs2q850hbrkz8y5248i46pz16pcc", - "depends": ["fastglm", "horseshoe", "mombf", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "fastglm", "horseshoe", "mombf", "survival"] }, "GWASinspector": { "name": "GWASinspector", "version": "1.7.1", "sha256": "16q5r3fzli7vml481fl56mzhl0w8bp0bp70rlsw20a6vzhnk5xf2", - "depends": ["data_table", "futile_logger", "ggplot2", "gridExtra", "hash", "ini", "kableExtra", "knitr", "openxlsx", "R_utils", "rmarkdown", "RSQLite"] + "depends": ["RSQLite", "R_utils", "data_table", "futile_logger", "ggplot2", "gridExtra", "hash", "ini", "kableExtra", "knitr", "openxlsx", "rmarkdown"] }, "GWEX": { "name": "GWEX", "version": "1.1.3", "sha256": "17yd7c8qiqkfhzllrcrrf1az0rq1g6xkggp35zyd04idcjz4c6hf", - "depends": ["abind", "doParallel", "EnvStats", "fGarch", "foreach", "lmomco", "MASS", "mvtnorm", "nleqslv", "Rcpp", "RcppArmadillo", "Renext"] + "depends": ["EnvStats", "MASS", "Rcpp", "RcppArmadillo", "Renext", "abind", "doParallel", "fGarch", "foreach", "lmomco", "mvtnorm", "nleqslv"] }, "GWI": { "name": "GWI", @@ -12713,7 +12875,7 @@ "name": "GWRLASSO", "version": "0.1.0", "sha256": "172gjp4f3i2na53l04ddsz588qmhfs4fwdnbnvpjvkrc8xsp9yf2", - "depends": ["glmnet", "Matrix", "numbers", "qpdf"] + "depends": ["Matrix", "glmnet", "numbers", "qpdf"] }, "GWRM": { "name": "GWRM", @@ -12725,7 +12887,7 @@ "name": "GWSDAT", "version": "3.2.1", "sha256": "0zqln2wnmid2cq5727pkk9lyqs4pb5nml12b5cza1xg0yzp38b6h", - "depends": ["deldir", "digest", "geometry", "Kendall", "lattice", "lubridate", "MASS", "Matrix", "officer", "raster", "readxl", "rhandsontable", "sf", "shiny", "shinycssloaders", "shinydashboard", "shinyjs", "sm", "sp", "splancs", "zoo"] + "depends": ["Kendall", "MASS", "Matrix", "deldir", "digest", "geometry", "lattice", "lubridate", "officer", "raster", "readxl", "rhandsontable", "sf", "shiny", "shinycssloaders", "shinydashboard", "shinyjs", "sm", "sp", "splancs", "zoo"] }, "GWalkR": { "name": "GWalkR", @@ -12735,9 +12897,9 @@ }, "GWmodel": { "name": "GWmodel", - "version": "2.3-2", - "sha256": "16brnvq9r5qcyk5rxrak85hsp76z6l6q0vwg40pyd6444n6qkxhx", - "depends": ["FNN", "Rcpp", "RcppArmadillo", "robustbase", "sf", "sp", "spacetime", "spatialreg", "spdep"] + "version": "2.3-3", + "sha256": "0g6kd8yic2dlm192429ii2rbvjsz1gndbfmg3lglkfpzsw0d0saz", + "depends": ["FNN", "Rcpp", "RcppArmadillo", "RcppEigen", "robustbase", "sf", "sp", "spacetime", "spatialreg", "spdep"] }, "GWnnegPCA": { "name": "GWnnegPCA", @@ -12761,12 +12923,12 @@ "name": "GaMaBioMD", "version": "0.2.0", "sha256": "15rx6xycnxldaxyjhcgysfz7zj6cjwlfkjjm6jyhxxvw4h2nw75m", - "depends": ["ape", "Biostrings", "dendextend", "dplyr", "ggplot2", "heatmaply", "magrittr", "reshape2", "traits"] + "depends": ["Biostrings", "ape", "dendextend", "dplyr", "ggplot2", "heatmaply", "magrittr", "reshape2", "traits"] }, "GaSP": { "name": "GaSP", - "version": "1.0.5", - "sha256": "1xwh8wmvwsqf0d0zra65gadvbra229daiimz0zqnmlrlga2hdfqp", + "version": "1.0.6", + "sha256": "0hyalvx7j434g4z7imkwn6anl7sp8pp076v6a2bbsy054vh5l59z", "depends": [] }, "GameTheory": { @@ -12791,12 +12953,12 @@ "name": "GauPro", "version": "0.2.12", "sha256": "03v4bhm5c32gql2s0ysxd4r12yjv28ar7nmap55rc38kj66pgzwx", - "depends": ["lbfgs", "R6", "Rcpp", "RcppArmadillo"] + "depends": ["R6", "Rcpp", "RcppArmadillo", "lbfgs"] }, "GaussSuppression": { "name": "GaussSuppression", - "version": "0.8.5", - "sha256": "0f6kq34z7p2qws94lwm0c1bnnys7hq0xzjpnhgnbxski4hc3wxqw", + "version": "0.8.8", + "sha256": "0alfkb9bbixs1h7i2b0vdmkx8g8ncv9wsdkfb6hx9yl4vj9033ra", "depends": ["Matrix", "RegSDC", "SSBtools"] }, "GaussianHMM1d": { @@ -12807,9 +12969,9 @@ }, "GeDS": { "name": "GeDS", - "version": "0.2.2", - "sha256": "09aimlk72x82yxnikb75vj9qpz1qg8a6623i61db0g88csashf8c", - "depends": ["doFuture", "doParallel", "doRNG", "foreach", "future", "MASS", "Matrix", "mboost", "plot3D", "Rcpp", "Rmpfr", "TH_data"] + "version": "0.2.3", + "sha256": "01zi5q78chcd6a3v3506nhnm5nlnpgglaazsf2cr1zdi7xrxgnyr", + "depends": ["MASS", "Matrix", "Rcpp", "Rmpfr", "TH_data", "doFuture", "doParallel", "doRNG", "foreach", "future", "mboost", "plot3D"] }, "GeNetIt": { "name": "GeNetIt", @@ -12821,7 +12983,7 @@ "name": "GenAI", "version": "0.2.0", "sha256": "0qwls17p5nv24wx17yyq42sg903119s5z4hi91czas0l4wh9lnif", - "depends": ["base64enc", "ggplotify", "httr", "jsonlite", "listenv", "magick", "magrittr", "R6"] + "depends": ["R6", "base64enc", "ggplotify", "httr", "jsonlite", "listenv", "magick", "magrittr"] }, "GenAlgo": { "name": "GenAlgo", @@ -12839,13 +13001,13 @@ "name": "GenEst", "version": "1.4.9", "sha256": "0ifqzpqrc9bgg6sp8zx30lvcz9kcbzivw5sf8f3axnwzfia9x376", - "depends": ["DT", "gsl", "gtools", "hellno", "htmltools", "lubridate", "MASS", "matrixStats", "mvtnorm", "Rcpp", "shiny", "shinyjs", "survival"] + "depends": ["DT", "MASS", "Rcpp", "gsl", "gtools", "hellno", "htmltools", "lubridate", "matrixStats", "mvtnorm", "shiny", "shinyjs", "survival"] }, "GenMarkov": { "name": "GenMarkov", "version": "0.2.0", "sha256": "1dqs8wapdpmgqnrf4xgvdmaz74gck23sbnpjxzj2g03gl8k9lq5w", - "depends": ["alabama", "fastDummies", "Hmisc", "matrixcalc", "maxLik", "nnet"] + "depends": ["Hmisc", "alabama", "fastDummies", "matrixcalc", "maxLik", "nnet"] }, "GenOrd": { "name": "GenOrd", @@ -12869,7 +13031,7 @@ "name": "GenTwoArmsTrialSize", "version": "0.0.5", "sha256": "0qf3a19hv860ll28pmx6skphwbn65ia8k0pvb3gzkdz3wlzmd1zw", - "depends": ["dplyr", "Hmisc", "TrialSize"] + "depends": ["Hmisc", "TrialSize", "dplyr"] }, "GenWin": { "name": "GenWin", @@ -12887,7 +13049,7 @@ "name": "GeneCycle", "version": "1.1.5", "sha256": "08pr8xgcznm04c4lhvzv2qnzij5vj7pjzyj9pr1pqpmc977h8dvg", - "depends": ["fdrtool", "longitudinal", "MASS"] + "depends": ["MASS", "fdrtool", "longitudinal"] }, "GeneF": { "name": "GeneF", @@ -12897,9 +13059,9 @@ }, "GeneNMF": { "name": "GeneNMF", - "version": "0.4.0", - "sha256": "0bfqxy7zxd1vdpxnn6sj8xzpmmsn2rcvnac0prqxbd0byj1shfra", - "depends": ["cluster", "NMF", "pheatmap", "RcppML", "Seurat", "viridis"] + "version": "0.6.0", + "sha256": "1szmkfijy84dl0zbr08cw7likqmziwm85dhvhzqvhybd17g9ahlj", + "depends": ["Matrix", "RcppML", "Seurat", "cluster", "irlba", "lsa", "pheatmap", "viridis"] }, "GeneNet": { "name": "GeneNet", @@ -12911,13 +13073,13 @@ "name": "GeneScape", "version": "1.0", "sha256": "1yjz9bc5qy46z6ha9c7khx6mgzyqqbx3aq5w7nqw5zfym1zkfiaq", - "depends": ["corpcor", "MASS"] + "depends": ["MASS", "corpcor"] }, "GeneSelectR": { "name": "GeneSelectR", "version": "1.0.1", "sha256": "0hxdnfhah3a29f00ycanf7ssxm2z7inp9sf72l61ilcrg9bx22hq", - "depends": ["cowplot", "dplyr", "ggplot2", "glue", "magrittr", "RColorBrewer", "reshape2", "reticulate", "rlang", "testthat", "tibble", "tidyr", "tmod"] + "depends": ["RColorBrewer", "cowplot", "dplyr", "ggplot2", "glue", "magrittr", "reshape2", "reticulate", "rlang", "testthat", "tibble", "tidyr", "tmod"] }, "GeneralOaxaca": { "name": "GeneralOaxaca", @@ -12941,13 +13103,13 @@ "name": "GeneralizedUmatrix", "version": "1.2.6", "sha256": "1mzxszsk2mzswndrq0j125l1b5qdmjryg2swb7f2mnipa5k3mqbm", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "RcppParallel"] + "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "ggplot2"] }, "GeneralizedWendland": { "name": "GeneralizedWendland", "version": "0.6.0", "sha256": "1mwinkjnf7wvsa077nzq641fkrj9y44gzmihhkkfgkjddcjnk4s4", - "depends": ["BH", "fields", "Matrix", "optimParallel", "Rcpp", "RcppEigen", "spam", "spam64"] + "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "fields", "optimParallel", "spam", "spam64"] }, "GenericML": { "name": "GenericML", @@ -12965,19 +13127,19 @@ "name": "GenoScan", "version": "0.1", "sha256": "0p98imfvvz7l94kim3pxypyjs2pbxng4a2nagbafbady82ylr2vi", - "depends": ["data_table", "MASS", "Matrix", "seqminer", "SKAT"] + "depends": ["MASS", "Matrix", "SKAT", "data_table", "seqminer"] }, "GenoTriplo": { "name": "GenoTriplo", - "version": "1.0.4", - "sha256": "0pfq3k4szmkk3swzkcxm99qnmnw1ikknjg21pghgnr3g7437vlmp", - "depends": ["cowplot", "doParallel", "dplyr", "DT", "foreach", "ggplot2", "htmltools", "processx", "rlang", "Rmixmod", "shiny", "shinyBS", "shinythemes", "tidyr"] + "version": "1.1.0", + "sha256": "04v1llw3ppzx9s9cm8wp78n5hpm65bpmkmsliczlp33l91cbspp8", + "depends": ["DT", "Rmixmod", "cowplot", "doParallel", "dplyr", "foreach", "ggplot2", "htmltools", "processx", "rlang", "shiny", "shinyBS", "shinythemes", "tidyr"] }, "GenomeAdmixR": { "name": "GenomeAdmixR", "version": "2.1.7", "sha256": "14qnabg1pj8sg2bvd3k4m467bh1q2zfjr0ljxn1ny031sqwis4cy", - "depends": ["ggplot2", "ggridges", "hierfstat", "Rcpp", "RcppArmadillo", "RcppParallel", "rlang", "stringr", "tibble", "vcfR"] + "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "ggplot2", "ggridges", "hierfstat", "rlang", "stringr", "tibble", "vcfR"] }, "GenomicTools_fileHandler": { "name": "GenomicTools.fileHandler", @@ -12989,19 +13151,19 @@ "name": "GeoAdjust", "version": "2.0.0", "sha256": "0251672j2vl9jck31zfcqzsyw8pphzs934j8ljjmnw9qqd3gzd2p", - "depends": ["fields", "fmesher", "ggplot2", "Matrix", "RcppEigen", "sf", "SUMMER", "terra", "TMB"] + "depends": ["Matrix", "RcppEigen", "SUMMER", "TMB", "fields", "fmesher", "ggplot2", "sf", "terra"] }, "GeoModels": { "name": "GeoModels", - "version": "2.0.3", - "sha256": "0v3mwngmsqqbjbg1hwl993263r98hb60b5slaa3mhcsbchyfhcwf", - "depends": ["codetools", "data_table", "doFuture", "dotCall64", "FastGP", "fields", "foreach", "future", "hypergeo", "lamW", "mapproj", "nabor", "pbivnorm", "plotrix", "pracma", "progressr", "scatterplot3d", "shape", "sn", "sp", "spam", "VGAM", "zipfR"] + "version": "2.0.4", + "sha256": "0hqj4ddil9qf15vi65lrs6qk4y9v4mdj70iajm734skm95pi1l0l", + "depends": ["FastGP", "VGAM", "codetools", "data_table", "doFuture", "dotCall64", "fields", "foreach", "future", "hypergeo", "lamW", "mapproj", "nabor", "pbivnorm", "plotrix", "pracma", "progressr", "scatterplot3d", "shape", "sn", "sp", "spam", "zipfR"] }, "GeoMongo": { "name": "GeoMongo", "version": "1.0.3", "sha256": "0m5nz5q81jz2v2bl2dbgdbdprrkckxr2c67qn0cg9vms0pi3fawr", - "depends": ["data_table", "geojsonR", "R6", "reticulate"] + "depends": ["R6", "data_table", "geojsonR", "reticulate"] }, "GeoRange": { "name": "GeoRange", @@ -13013,7 +13175,7 @@ "name": "GeoWeightedModel", "version": "1.0.3", "sha256": "1ylfggfqylqi76z3ac95cnxmmw3gzddq2r5qx5w0gjyjvrxr8wsv", - "depends": ["beepr", "cartography", "dplyr", "DT", "GWmodel", "raster", "readxl", "shiny", "shinyalert", "shinyBS", "shinybusy", "shinydashboard", "shinyjs", "shinyWidgets", "sp", "spdep"] + "depends": ["DT", "GWmodel", "beepr", "cartography", "dplyr", "raster", "readxl", "shiny", "shinyBS", "shinyWidgets", "shinyalert", "shinybusy", "shinydashboard", "shinyjs", "sp", "spdep"] }, "GeodRegr": { "name": "GeodRegr", @@ -13023,21 +13185,21 @@ }, "GeomArchetypal": { "name": "GeomArchetypal", - "version": "1.0.1", - "sha256": "112drwxh4khcplrf3krf97v2wxf5qvfgm58mjaswjcdk1zkjdfi0", - "depends": ["abind", "archetypal", "distances", "doParallel", "dplyr", "geometry", "magrittr", "Matrix", "mirai", "plot3D", "rlang", "scales"] + "version": "1.0.2", + "sha256": "072llxc2chj5acbpyg5h9hyi9mrwr0s7xg508bs2sxjx4s77kf5l", + "depends": ["Matrix", "abind", "archetypal", "distances", "doParallel", "dplyr", "geometry", "magrittr", "mirai", "plot3D", "rlang", "scales"] }, "GeomComb": { "name": "GeomComb", "version": "1.0", "sha256": "05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r", - "depends": ["forecast", "ForecastCombinations", "ggplot2", "Matrix", "mtsdi", "psych"] + "depends": ["ForecastCombinations", "Matrix", "forecast", "ggplot2", "mtsdi", "psych"] }, "GerminaR": { "name": "GerminaR", "version": "2.1.4", "sha256": "0f2dbq1adbd5p30kf9bi8qqk2s8da0p65i9a0igm16ckwpam7lkk", - "depends": ["agricolae", "dplyr", "DT", "ggplot2", "purrr", "shiny", "tibble", "tidyr"] + "depends": ["DT", "agricolae", "dplyr", "ggplot2", "purrr", "shiny", "tibble", "tidyr"] }, "GetBCBData": { "name": "GetBCBData", @@ -13049,25 +13211,25 @@ "name": "GetDFPData", "version": "1.6", "sha256": "1yxf1i5bipz16pbydl6qxlalh2zpdiigbxd1qczbjc1z78bl5727", - "depends": ["crayon", "curl", "dplyr", "lubridate", "readr", "reshape2", "stringr", "tibble", "xlsx", "XML"] + "depends": ["XML", "crayon", "curl", "dplyr", "lubridate", "readr", "reshape2", "stringr", "tibble", "xlsx"] }, "GetDFPData2": { "name": "GetDFPData2", "version": "0.6.3", "sha256": "1dc1ks9mrwc8sjmp6fh47hlhhfwvfign6jmf4cxik28q3253al01", - "depends": ["dplyr", "lubridate", "magrittr", "memoise", "purrr", "RCurl", "readr", "rvest", "shiny", "stringr", "tidyr", "writexl", "xml2"] + "depends": ["RCurl", "dplyr", "lubridate", "magrittr", "memoise", "purrr", "readr", "rvest", "shiny", "stringr", "tidyr", "writexl", "xml2"] }, "GetFREData": { "name": "GetFREData", "version": "0.8.1", "sha256": "15rca6pfsx5hcl1lnz49904b2ps0312mwjv8d4f0g76jhkvqfvss", - "depends": ["dplyr", "GetDFPData2", "lubridate", "magrittr", "purrr", "readr", "rvest", "stringr", "XML", "xml2"] + "depends": ["GetDFPData2", "XML", "dplyr", "lubridate", "magrittr", "purrr", "readr", "rvest", "stringr", "xml2"] }, "GetLattesData": { "name": "GetLattesData", "version": "1.5", "sha256": "0gfjqvzn03qxlyf4hj5kzfy8pqbphrw421bqbkb2pksa6gyvnfnq", - "depends": ["curl", "dplyr", "lubridate", "readr", "stringdist", "stringr", "XML"] + "depends": ["XML", "curl", "dplyr", "lubridate", "readr", "stringdist", "stringr"] }, "GetQuandlData": { "name": "GetQuandlData", @@ -13085,7 +13247,7 @@ "name": "GetoptLong", "version": "1.0.5", "sha256": "00fpm6nd3kqa2ikasxa62jzywi46fvvmx1mdavcp5yrxxn37j8wc", - "depends": ["crayon", "GlobalOptions", "rjson"] + "depends": ["GlobalOptions", "crayon", "rjson"] }, "Ghat": { "name": "Ghat", @@ -13103,13 +13265,13 @@ "name": "GhostKnockoff", "version": "0.1.0", "sha256": "0vp9f8k31yclxvmcjgzkg6xl3rdv49anjmwdhcrhcxv8x9f3bdrj", - "depends": ["corpcor", "CVXR", "gtools", "Matrix", "Rdsdp", "RSpectra", "seqminer"] + "depends": ["CVXR", "Matrix", "RSpectra", "Rdsdp", "corpcor", "gtools", "seqminer"] }, "GiNA": { "name": "GiNA", "version": "1.0.1", "sha256": "0his7wsgnggyv9526blxzxa1ni8hwq2ws64wkmha45nvvnm3dsiw", - "depends": ["doParallel", "EBImage", "foreach", "png"] + "depends": ["EBImage", "doParallel", "foreach", "png"] }, "GiRaF": { "name": "GiRaF", @@ -13133,13 +13295,13 @@ "name": "GillespieSSA2", "version": "0.3.0", "sha256": "0wjz0fh9cwvaw6n7hs2lkh818jzbjl11ps5gxnjqizz8gfp9fr10", - "depends": ["assertthat", "dplyr", "dynutils", "Matrix", "purrr", "Rcpp", "RcppXPtrUtils", "readr", "rlang", "stringr", "tidyr"] + "depends": ["Matrix", "Rcpp", "RcppXPtrUtils", "assertthat", "dplyr", "dynutils", "purrr", "readr", "rlang", "stringr", "tidyr"] }, "GimmeMyPlot": { "name": "GimmeMyPlot", "version": "0.1.0", "sha256": "18k3z6ynzpmdg029sspl8as0bkifqf8ff6hf9l2yblls7sb64id0", - "depends": ["dplyr", "ggforce", "ggplot2", "ggpubr", "magrittr", "RColorBrewer", "rstatix", "scales", "stringr", "tidyr"] + "depends": ["RColorBrewer", "dplyr", "ggforce", "ggplot2", "ggpubr", "magrittr", "rstatix", "scales", "stringr", "tidyr"] }, "Gini": { "name": "Gini", @@ -13157,13 +13319,13 @@ "name": "GiniDistance", "version": "0.1.1", "sha256": "1x9a59x60a2jdnql3wn4za510rv9qp84j6b9m6la81j3mmy92vzz", - "depends": ["energy", "randomForest", "Rcpp", "RcppArmadillo", "readxl"] + "depends": ["Rcpp", "RcppArmadillo", "energy", "randomForest", "readxl"] }, "GlarmaVarSel": { "name": "GlarmaVarSel", "version": "1.0", "sha256": "080v2qckihhacclxi2zscslbwbc6179pc7g02lyqaicf9wrsr8ff", - "depends": ["ggplot2", "glmnet", "Matrix"] + "depends": ["Matrix", "ggplot2", "glmnet"] }, "Glarmadillo": { "name": "Glarmadillo", @@ -13175,7 +13337,7 @@ "name": "GlmSimulatoR", "version": "1.0.0", "sha256": "1xfbmxsdlgpwlss5bfb4arlnblj4s6pzyn9npy04v5aara1m04na", - "depends": ["assertthat", "cplm", "dplyr", "ggplot2", "magrittr", "MASS", "statmod", "stringr", "tweedie"] + "depends": ["MASS", "assertthat", "cplm", "dplyr", "ggplot2", "magrittr", "statmod", "stringr", "tweedie"] }, "GlobalOptions": { "name": "GlobalOptions", @@ -13187,13 +13349,13 @@ "name": "Gmedian", "version": "1.2.7", "sha256": "0m9fp54y4m1xxjqphpnxhw2hspzdca9qc9l60znpnynyj5m6cy2k", - "depends": ["Rcpp", "RcppArmadillo", "robustbase", "RSpectra"] + "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "robustbase"] }, "Gmisc": { "name": "Gmisc", "version": "3.0.3", "sha256": "1s8gkqg54622xhsmhl7n5pff2b6xfij111m7h3i4inzfjfmziq43", - "depends": ["abind", "checkmate", "forestplot", "glue", "Hmisc", "htmlTable", "knitr", "lattice", "lubridate", "magrittr", "Rcpp", "rlang", "rmarkdown", "stringr", "XML", "yaml"] + "depends": ["Hmisc", "Rcpp", "XML", "abind", "checkmate", "forestplot", "glue", "htmlTable", "knitr", "lattice", "lubridate", "magrittr", "rlang", "rmarkdown", "stringr", "yaml"] }, "GmptzCurve": { "name": "GmptzCurve", @@ -13209,15 +13371,15 @@ }, "GofCens": { "name": "GofCens", - "version": "1.0", - "sha256": "1kflcbydh2p78fqdfz35gp0jsp6xl2823mvsqq0yany9294bdqmr", + "version": "1.1", + "sha256": "1xixv05wlwlyga5br9jzrg68rhc71ibhfbyjkmiy0dh9xwyrygsy", "depends": ["actuar", "boot", "fitdistrplus", "ggplot2", "gridExtra", "survival", "survminer"] }, "GofKmt": { "name": "GofKmt", "version": "2.2.0", "sha256": "1v9n1hfracincgaip7pym2l9h54azajw4fmsld0ff2rsd5np362z", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "Rsolnp"] + "depends": ["Rcpp", "RcppArmadillo", "Rsolnp", "ggplot2"] }, "GomoGomonoMi": { "name": "GomoGomonoMi", @@ -13271,13 +13433,13 @@ "name": "GrabSVG", "version": "0.0.2", "sha256": "0w53wwaaap90shm17jjkyvcx55cpvpmd9cp9f7cbf36v73n74wjm", - "depends": ["fitdistrplus", "Matrix", "RANN", "spam", "sparseMatrixStats"] + "depends": ["Matrix", "RANN", "fitdistrplus", "spam", "sparseMatrixStats"] }, "Grace": { "name": "Grace", "version": "0.5.3", "sha256": "0r41zvgdd5rqm15axqqssik6plwy7snpgw8m32labkfn3f0pp7n0", - "depends": ["glmnet", "MASS", "scalreg"] + "depends": ["MASS", "glmnet", "scalreg"] }, "GramQuad": { "name": "GramQuad", @@ -13301,7 +13463,7 @@ "name": "GreedyExperimentalDesign", "version": "1.5.6.1", "sha256": "057wpfg5kfgcvfgry12agn7arg917jwgvxhjz6q1na13y8pmqnrv", - "depends": ["checkmate", "kernlab", "nbpMatching", "Rcpp", "rJava", "rlist", "stringi", "stringr", "survey"] + "depends": ["Rcpp", "checkmate", "kernlab", "nbpMatching", "rJava", "rlist", "stringi", "stringr", "survey"] }, "GreedyExperimentalDesignJARs": { "name": "GreedyExperimentalDesignJARs", @@ -13313,7 +13475,7 @@ "name": "Greg", "version": "2.0.2", "sha256": "13rsah8vf9s8wpkr5hlayyqa8v728cz80bvpg8vmlvnam8isb30s", - "depends": ["broom", "dplyr", "Epi", "forestplot", "glue", "Gmisc", "Hmisc", "htmlTable", "knitr", "nlme", "purrr", "rlang", "rms", "sandwich", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["Epi", "Gmisc", "Hmisc", "broom", "dplyr", "forestplot", "glue", "htmlTable", "knitr", "nlme", "purrr", "rlang", "rms", "sandwich", "stringr", "tibble", "tidyr", "tidyselect"] }, "GregoryQuadrature": { "name": "GregoryQuadrature", @@ -13331,13 +13493,13 @@ "name": "Greymodels", "version": "2.0.1", "sha256": "0gv4kqgn10l3pknx7w26yas1h70gsb2h8a82w2ykxs134xl4vpll", - "depends": ["cmna", "dplyr", "expm", "ggplot2", "Metrics", "particle_swarm_optimisation", "plotly", "readxl", "scales", "shiny", "shinydashboard", "shinyWidgets"] + "depends": ["Metrics", "cmna", "dplyr", "expm", "ggplot2", "particle_swarm_optimisation", "plotly", "readxl", "scales", "shiny", "shinyWidgets", "shinydashboard"] }, "GridOnClusters": { "name": "GridOnClusters", "version": "0.1.0.1", "sha256": "1zanz8p5ghy7q7dsazv6wfkf5gl2dnbmchw88drbrip1h85gxyid", - "depends": ["Ckmeans_1d_dp", "cluster", "dqrng", "fossil", "mclust", "plotrix", "Rcpp", "Rdpack"] + "depends": ["Ckmeans_1d_dp", "Rcpp", "Rdpack", "cluster", "dqrng", "fossil", "mclust", "plotrix"] }, "GrimR": { "name": "GrimR", @@ -13349,7 +13511,7 @@ "name": "GroupBN", "version": "1.2.0", "sha256": "0x41x7npaawnh6nxh4d4vmv2zwzc6c5ijrhh6fdpwzl4p75qlh1x", - "depends": ["arules", "bnlearn", "ClustOfVar", "magrittr", "MLmetrics", "PCAmixdata", "plyr", "PRROC", "rlist", "stringr", "visNetwork", "zoo"] + "depends": ["ClustOfVar", "MLmetrics", "PCAmixdata", "PRROC", "arules", "bnlearn", "magrittr", "plyr", "rlist", "stringr", "visNetwork", "zoo"] }, "GroupComparisons": { "name": "GroupComparisons", @@ -13379,13 +13541,13 @@ "name": "GrpString", "version": "0.3.2", "sha256": "14ss6assqk6s9kv4bvzlydm8qrbnslm4vj876q5dn2dw4k50dai1", - "depends": ["cluster", "plyr", "Rcpp"] + "depends": ["Rcpp", "cluster", "plyr"] }, "GseaVis": { "name": "GseaVis", "version": "0.0.5", "sha256": "01c5rl05lf9abmasw9w8rxlgl55jr3faiwi1ndx993r3j8xvbcqj", - "depends": ["aplot", "DOSE", "dplyr", "ggplot2", "ggpp", "ggrepel", "ggsci", "magrittr", "purrr", "RColorBrewer", "reshape2", "stringr", "tibble"] + "depends": ["DOSE", "RColorBrewer", "aplot", "dplyr", "ggplot2", "ggpp", "ggrepel", "ggsci", "magrittr", "purrr", "reshape2", "stringr", "tibble"] }, "GsymPoint": { "name": "GsymPoint", @@ -13403,7 +13565,7 @@ "name": "GxEScanR", "version": "2.0.2", "sha256": "0k3avad4b2x4sqv8iilx5a8gkybjlipx50mj0la4kl9xv0azshkd", - "depends": ["prodlim", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "prodlim"] }, "GxEprs": { "name": "GxEprs", @@ -13427,13 +13589,13 @@ "name": "HACSim", "version": "1.0.6-1", "sha256": "0hdczpn1x6zcxya8qlp82fzzpli3z2kfvynk5sqk97h1d55d27i4", - "depends": ["ape", "data_table", "matrixStats", "pegas", "Rcpp", "RcppArmadillo", "shiny"] + "depends": ["Rcpp", "RcppArmadillo", "ape", "data_table", "matrixStats", "pegas", "shiny"] }, "HBSTM": { "name": "HBSTM", "version": "1.0.2", "sha256": "1rw0sav1xrw5sraah3yhw5ypyf99pi9h323nf02qidqfzr9xb214", - "depends": ["fBasics", "maps", "MASS"] + "depends": ["MASS", "fBasics", "maps"] }, "HBV_IANIGLA": { "name": "HBV.IANIGLA", @@ -13445,7 +13607,7 @@ "name": "HCD", "version": "1.0", "sha256": "0f0kn2n1g25akwdbysy5xpxfcnpfdxgjzyd7ji6f58cs40q6gl28", - "depends": ["data_table", "data_tree", "dendextend", "irlba", "Matrix", "randnet", "RSpectra", "stringr"] + "depends": ["Matrix", "RSpectra", "data_table", "data_tree", "dendextend", "irlba", "randnet", "stringr"] }, "HCR": { "name": "HCR", @@ -13463,13 +13625,13 @@ "name": "HCTDesign", "version": "0.7.2", "sha256": "1nncyyw1dlbdl9f1pncwa9xdqrd7w2aw4ghnf01vwyq0m7pj90l1", - "depends": ["crayon", "diversitree", "flexsurv", "mvtnorm", "Rdpack", "survival"] + "depends": ["Rdpack", "crayon", "diversitree", "flexsurv", "mvtnorm", "survival"] }, "HCTR": { "name": "HCTR", "version": "0.1.1", "sha256": "1hg8mpallwxpmamk6q8x87w5hlqqwvbahfw5zmr9pisiagbwcsay", - "depends": ["glmnet", "harmonicmeanp", "MASS", "ncvreg", "Rdpack"] + "depends": ["MASS", "Rdpack", "glmnet", "harmonicmeanp", "ncvreg"] }, "HCmodelSets": { "name": "HCmodelSets", @@ -13481,19 +13643,19 @@ "name": "HDBRR", "version": "1.1.4", "sha256": "03jl1m099z6gj2ipi7rnjnrd2rmk4zs54332rwlqyf40dv7ndbz1", - "depends": ["bigstatsr", "MASS", "numDeriv"] + "depends": ["MASS", "bigstatsr", "numDeriv"] }, "HDCD": { "name": "HDCD", "version": "1.1", "sha256": "01fxai59mi5hrjv0yx8f4cd6c5pin87n2sry2lk3w041c7df21gs", - "depends": ["mclust", "Rdpack"] + "depends": ["Rdpack", "mclust"] }, "HDCI": { "name": "HDCI", "version": "1.0-2", "sha256": "0wxbv54kbygymhh4r7052vnbj603c1kya01ykvmqzzkjyyfzidkz", - "depends": ["doParallel", "foreach", "glmnet", "iterators", "lattice", "Matrix", "mvtnorm", "slam"] + "depends": ["Matrix", "doParallel", "foreach", "glmnet", "iterators", "lattice", "mvtnorm", "slam"] }, "HDCurves": { "name": "HDCurves", @@ -13535,7 +13697,7 @@ "name": "HDMAADMM", "version": "0.0.1", "sha256": "0whcd0315cxn45ilsrh11baylrxvk0w4vcsqk6sps6fcpg4m2ak5", - "depends": ["dqrng", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "dqrng"] }, "HDMFA": { "name": "HDMFA", @@ -13553,7 +13715,7 @@ "name": "HDNRA", "version": "1.0.0", "sha256": "17c2bck5s68kn7b67g5pgxd14n13313899waynn79vnkl319czq9", - "depends": ["expm", "Rcpp", "RcppArmadillo", "Rdpack", "readr"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "expm", "readr"] }, "HDOMDesign": { "name": "HDOMDesign", @@ -13563,15 +13725,15 @@ }, "HDRFA": { "name": "HDRFA", - "version": "0.1.4", - "sha256": "1dwys28vj5icv33x9zy4r62dslvwr1ajv29gs9lkalrc2wjh2qx2", + "version": "0.1.5", + "sha256": "00rggyq5sz73jnv4s8zfjw6hx08fw0qaadw0rng695ri17m0czxg", "depends": ["pracma", "quantreg"] }, "HDShOP": { "name": "HDShOP", "version": "0.1.5", "sha256": "129j1dr3vjdg23dy45wws470v05j5azq8nq88b670kdgfw1586qm", - "depends": ["lattice", "Rdpack"] + "depends": ["Rdpack", "lattice"] }, "HDSinRdata": { "name": "HDSinRdata", @@ -13583,7 +13745,7 @@ "name": "HDSpatialScan", "version": "1.0.4", "sha256": "1hwqdwr4jl887sgnjwq3gmxjhk6zz45nasvy3x7i7rmrqylxig60", - "depends": ["DT", "fmsb", "matrixStats", "pbapply", "plotrix", "purrr", "raster", "Rcpp", "RcppArmadillo", "sf", "sp", "SpatialNP", "swfscMisc", "TeachingDemos"] + "depends": ["DT", "Rcpp", "RcppArmadillo", "SpatialNP", "TeachingDemos", "fmsb", "matrixStats", "pbapply", "plotrix", "purrr", "raster", "sf", "sp", "swfscMisc"] }, "HDStIM": { "name": "HDStIM", @@ -13595,13 +13757,13 @@ "name": "HDTSA", "version": "1.0.3", "sha256": "1syrqygfdr12sd32wq2ab0gibwbljlbrwzzkfnmhgh8js9dxv6j8", - "depends": ["clime", "geigen", "jointDiag", "MASS", "Rcpp", "RcppEigen", "sandwich"] + "depends": ["MASS", "Rcpp", "RcppEigen", "clime", "geigen", "jointDiag", "sandwich"] }, "HDXBoxeR": { "name": "HDXBoxeR", "version": "0.0.1", "sha256": "10p41sawddrdpj5sji1jzp63hr6v6hvihb4n3yzci5wvh2a2lx9c", - "depends": ["dplyr", "RColorBrewer", "stringr", "tidyr", "wrapr"] + "depends": ["RColorBrewer", "dplyr", "stringr", "tidyr", "wrapr"] }, "HDclassif": { "name": "HDclassif", @@ -13625,13 +13787,13 @@ "name": "HDiR", "version": "1.1.3", "sha256": "1qwd3y9645m8v2gdrb4xjpq86ixs9rgrw7iv3m5lm7nnf87qm350", - "depends": ["circular", "Directional", "movMF", "NPCirc", "rgl"] + "depends": ["Directional", "NPCirc", "circular", "movMF", "rgl"] }, "HDoutliers": { "name": "HDoutliers", "version": "1.0.4", "sha256": "0vc3g36cghs2ln8a3pb344b3vw1jpz9r8ld77ldd898vg9rhkq2m", - "depends": ["FactoMineR", "FNN", "mclust"] + "depends": ["FNN", "FactoMineR", "mclust"] }, "HDtweedie": { "name": "HDtweedie", @@ -13649,7 +13811,7 @@ "name": "HEMDAG", "version": "2.7.4", "sha256": "1dmfy5bbnjmjb4d7430i38z9hvpcrwafj6hw46118hwzcl4b6ldv", - "depends": ["doParallel", "foreach", "graph", "plyr", "precrec", "preprocessCore", "RBGL"] + "depends": ["RBGL", "doParallel", "foreach", "graph", "plyr", "precrec", "preprocessCore"] }, "HETOP": { "name": "HETOP", @@ -13691,13 +13853,13 @@ "name": "HH", "version": "3.1-52", "sha256": "10q3im2y5r9f5d80c35r2mmp89xclaf74hywkcyn3pk5vwc5wjfm", - "depends": ["abind", "colorspace", "gridExtra", "Hmisc", "lattice", "latticeExtra", "leaps", "multcomp", "RColorBrewer", "reshape2", "Rmpfr", "shiny", "vcd"] + "depends": ["Hmisc", "RColorBrewer", "Rmpfr", "abind", "colorspace", "gridExtra", "lattice", "latticeExtra", "leaps", "multcomp", "reshape2", "shiny", "vcd"] }, "HIMA": { "name": "HIMA", "version": "2.2.1", "sha256": "0r9dr3dvav8m8sxk84fm6m8y7fvsbd6dfblma17vizvslxpi5vwm", - "depends": ["conquer", "doParallel", "foreach", "glmnet", "hdi", "HDMT", "hommel", "iterators", "MASS", "ncvreg", "quantreg", "survival"] + "depends": ["HDMT", "MASS", "conquer", "doParallel", "foreach", "glmnet", "hdi", "hommel", "iterators", "ncvreg", "quantreg", "survival"] }, "HK80": { "name": "HK80", @@ -13709,19 +13871,25 @@ "name": "HKRbook", "version": "0.1.3", "sha256": "1bhyhv72c8afyzwx7h6p33mgfvhgqfh5c5f85gj803p6ai60h544", - "depends": ["DT", "formatR", "highlight", "MASS", "scatterplot3d", "shiny", "shinydashboard", "shinydashboardPlus", "shinyWidgets"] + "depends": ["DT", "MASS", "formatR", "highlight", "scatterplot3d", "shiny", "shinyWidgets", "shinydashboard", "shinydashboardPlus"] }, "HKprocess": { "name": "HKprocess", "version": "0.1-1", "sha256": "0kn84ccaypknxymynp6lnr8asd85rlzbk073z7511rriyz96hyj7", - "depends": ["gtools", "MCMCpack"] + "depends": ["MCMCpack", "gtools"] + }, + "HLAtools": { + "name": "HLAtools", + "version": "1.1.1", + "sha256": "0nx2vd2xa5bz5b5pl6vx798ma0109rxyl6gjx5iw12ylh02k9bgq", + "depends": ["DescTools", "dplyr", "fmsb", "stringr", "tibble", "xfun"] }, "HLMdiag": { "name": "HLMdiag", "version": "0.5.0", "sha256": "0yy0qf9iw5gr40vlmm697rvvvgp077f08fialx3ijn0vfpsjbl2v", - "depends": ["diagonals", "dplyr", "ggplot2", "ggrepel", "janitor", "magrittr", "MASS", "Matrix", "mgcv", "plyr", "purrr", "Rcpp", "RcppArmadillo", "reshape2", "rlang", "stringr", "tibble", "tidyselect"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "diagonals", "dplyr", "ggplot2", "ggrepel", "janitor", "magrittr", "mgcv", "plyr", "purrr", "reshape2", "rlang", "stringr", "tibble", "tidyselect"] }, "HMB": { "name": "HMB", @@ -13731,9 +13899,9 @@ }, "HMC": { "name": "HMC", - "version": "1.0", - "sha256": "1zmppanwfdhpvi5pxw067287zy5xw2ipw8p7q7c7b3gq7n3xm4hx", - "depends": ["glmnet", "irlba", "MASS", "PMA"] + "version": "1.1", + "sha256": "0xsf9ry019r21yjfrm1bxkr60dzvmy7lj4is0l5qfr7g0bskg1lc", + "depends": ["MASS", "PMA", "glmnet", "irlba"] }, "HMDHFDplus": { "name": "HMDHFDplus", @@ -13763,7 +13931,7 @@ "name": "HMMmlselect", "version": "0.1.6", "sha256": "0kvw9nihbmvp19hbz5h8sz9jps5ik2di969jxdbp4ymj735c0fc9", - "depends": ["HiddenMarkov", "mclust", "MCMCpack", "mvtnorm", "Rcpp"] + "depends": ["HiddenMarkov", "MCMCpack", "Rcpp", "mclust", "mvtnorm"] }, "HMMpa": { "name": "HMMpa", @@ -13775,18 +13943,18 @@ "name": "HMP", "version": "2.0.1", "sha256": "0233p7gajr2aic0c5snni4g9v1bwn4zd5i3kagxhqxa3mvy5c7wc", - "depends": ["dirmult", "doParallel", "foreach", "ggplot2", "gplots", "lattice", "MASS", "rpart", "rpart_plot", "vegan"] + "depends": ["MASS", "dirmult", "doParallel", "foreach", "ggplot2", "gplots", "lattice", "rpart", "rpart_plot", "vegan"] }, "HMPTrees": { "name": "HMPTrees", "version": "1.4", "sha256": "1jha64iyb0816rdg2i3z7i31z02r72k6acmvw0ibw3sli8zcvphb", - "depends": ["ape", "dirmult", "doParallel", "foreach", "HMP"] + "depends": ["HMP", "ape", "dirmult", "doParallel", "foreach"] }, "HMR": { "name": "HMR", - "version": "1.0.3", - "sha256": "1r0aw3x26a0w1pa02m449bpg6xrp1ikxv44f403snb8k48la9brc", + "version": "1.0.4", + "sha256": "14hhdk8l3kx0388ixa2facrw8h5blry1sxch6sci60g4iwwcwi8v", "depends": [] }, "HMTL": { @@ -13799,7 +13967,7 @@ "name": "HOasso", "version": "1.0.1", "sha256": "07xihcjj3gfxl1fd5x1dvfmfg8m19rfjzq110ay3vrj38sxxvkiw", - "depends": ["igraph", "Rdpack"] + "depends": ["Rdpack", "igraph"] }, "HPLB": { "name": "HPLB", @@ -13839,15 +14007,15 @@ }, "HSAUR3": { "name": "HSAUR3", - "version": "1.0-14", - "sha256": "1fsil4n4s71ff8np9w65h8n8b1b2rh017ja8vjd4wq07xi3prbwp", + "version": "1.0-15", + "sha256": "17yg6ql9c88pg5higmrvhnavx6hcbr4nm5r65d8q3iqfkgnc6ym1", "depends": [] }, "HSDiC": { "name": "HSDiC", "version": "0.1", "sha256": "0wiixb1ylx0l8qfgh5ark6alkdq87xaak1jlxizw1m589vghvqfp", - "depends": ["glmnet", "Matrix", "ncvreg", "quadprog"] + "depends": ["Matrix", "glmnet", "ncvreg", "quadprog"] }, "HSEtest": { "name": "HSEtest", @@ -13865,7 +14033,7 @@ "name": "HTLR", "version": "0.4-4", "sha256": "0mi03r9izipvmla5pm0s42vm85ishr3bb8pjdw906s4q7lkxjivz", - "depends": ["BCBCSF", "glmnet", "magrittr", "Rcpp", "RcppArmadillo"] + "depends": ["BCBCSF", "Rcpp", "RcppArmadillo", "glmnet", "magrittr"] }, "HTMLUtils": { "name": "HTMLUtils", @@ -13889,7 +14057,7 @@ "name": "HTSSIP", "version": "1.4.1", "sha256": "1j2f6f3i4di4bvsk44gxz0narg45ld2rahfn23wpgni5bszy0vb3", - "depends": ["ape", "coenocliner", "DESeq2", "dplyr", "ggplot2", "igraph", "lazyeval", "magrittr", "phyloseq", "plyr", "stringr", "tidyr", "vegan"] + "depends": ["DESeq2", "ape", "coenocliner", "dplyr", "ggplot2", "igraph", "lazyeval", "magrittr", "phyloseq", "plyr", "stringr", "tidyr", "vegan"] }, "HTSeed": { "name": "HTSeed", @@ -13901,19 +14069,19 @@ "name": "HTT", "version": "0.1.2", "sha256": "0345ydb3rjdkj4zm6xr5y4kf6plvxfgbpwkjs81pls99mr208qwz", - "depends": ["ggplot2", "ggraph", "igraph", "Rcpp"] + "depends": ["Rcpp", "ggplot2", "ggraph", "igraph"] }, "HUM": { "name": "HUM", "version": "2.0", "sha256": "06jx3f2zb52gjp05bq3zmgjkyiaa2j9v0biq23gg88gplpign6jw", - "depends": ["gtools", "Rcpp", "rgl"] + "depends": ["Rcpp", "gtools", "rgl"] }, "HVT": { "name": "HVT", "version": "24.5.2", "sha256": "18a4gr2v2qn2n9z9w89pjq1plzdggzlyprh249srf3sbqw1pn1qq", - "depends": ["cluster", "conf_design", "data_table", "deldir", "dplyr", "gganimate", "ggforce", "ggplot2", "gifski", "magrittr", "markovchain", "MASS", "plyr", "polyclip", "purrr", "reshape2", "rlang", "scales", "splancs", "tidyr"] + "depends": ["MASS", "cluster", "conf_design", "data_table", "deldir", "dplyr", "gganimate", "ggforce", "ggplot2", "gifski", "magrittr", "markovchain", "plyr", "polyclip", "purrr", "reshape2", "rlang", "scales", "splancs", "tidyr"] }, "HWEintrinsic": { "name": "HWEintrinsic", @@ -13937,7 +14105,7 @@ "name": "HaDeX", "version": "1.2.2", "sha256": "1qj6n03pd5kd5ff5h4v8wmnqxxylsxx1p6i88nahqkah2mzg9jdr", - "depends": ["data_table", "dplyr", "DT", "ggplot2", "gsubfn", "latex2exp", "readr", "readxl", "reshape2", "shiny", "stringr", "tidyr"] + "depends": ["DT", "data_table", "dplyr", "ggplot2", "gsubfn", "latex2exp", "readr", "readxl", "reshape2", "shiny", "stringr", "tidyr"] }, "HadIBDs": { "name": "HadIBDs", @@ -13967,13 +14135,13 @@ "name": "Hapi", "version": "0.0.3", "sha256": "0jqjhfq38k161kqff5cx0vxpsmjm2y5ca7049mvqiwqwvi4fp08m", - "depends": ["ggplot2", "HMM"] + "depends": ["HMM", "ggplot2"] }, "Haplin": { "name": "Haplin", "version": "7.3.1", "sha256": "0vyykbq2f5w4h7nai8w8krpax8q6v2hx76rr6xqy938rza5rfm79", - "depends": ["ff", "MASS", "mgcv", "rlang"] + "depends": ["MASS", "ff", "mgcv", "rlang"] }, "HaploCatcher": { "name": "HaploCatcher", @@ -13991,7 +14159,7 @@ "name": "HardyWeinberg", "version": "1.7.8", "sha256": "1wddy32zljyya37isqb54sqhpp07s2kizjl36i08pj37bbza7yac", - "depends": ["mice", "nnet", "Rcpp", "Rsolnp", "shape"] + "depends": ["Rcpp", "Rsolnp", "mice", "nnet", "shape"] }, "Harvest_Tree": { "name": "Harvest.Tree", @@ -14015,7 +14183,7 @@ "name": "HazardDiff", "version": "0.1.0", "sha256": "048lvhb4545a487kyknf5b5v8q3a9nsipbh0ii2k3pcc5vfql1h4", - "depends": ["ahaz", "Rdpack", "rootSolve", "survival"] + "depends": ["Rdpack", "ahaz", "rootSolve", "survival"] }, "HealthCal": { "name": "HealthCal", @@ -14027,25 +14195,25 @@ "name": "HeckmanEM", "version": "0.2-1", "sha256": "0rx9lbi5l0h95sg5lhjyrv31qmp4ziam84b98l2a05q56avck9jj", - "depends": ["ggplot2", "MomTrunc", "mvtnorm", "PerformanceAnalytics", "sampleSelection"] + "depends": ["MomTrunc", "PerformanceAnalytics", "ggplot2", "mvtnorm", "sampleSelection"] }, "HellCor": { "name": "HellCor", "version": "1.3", "sha256": "1bzc2ipm7vw7s849d43lcs0xrk2rs67h223dn9kahqg152mmknza", - "depends": ["energy", "FNN", "orthopolynom"] + "depends": ["FNN", "energy", "orthopolynom"] }, "HelpersMG": { "name": "HelpersMG", "version": "6.1", "sha256": "1cggzna2gdl8pxdj2s0swlbwxs9qzz276x43inr87i9yxfqwv5q8", - "depends": ["coda", "ggplot2", "MASS", "Matrix", "rlang"] + "depends": ["MASS", "Matrix", "coda", "ggplot2", "rlang"] }, "HeritSeq": { "name": "HeritSeq", "version": "1.0.2", "sha256": "0jzf3pq43lllxvvmf0rqzxz9fx6931mgb0ipminlw1iakz8wa6w3", - "depends": ["cplm", "DESeq2", "lme4", "MASS", "pbapply", "SummarizedExperiment", "tweedie"] + "depends": ["DESeq2", "MASS", "SummarizedExperiment", "cplm", "lme4", "pbapply", "tweedie"] }, "HeterFunctionalData": { "name": "HeterFunctionalData", @@ -14057,7 +14225,7 @@ "name": "HeteroGGM", "version": "1.0.1", "sha256": "1yz4rwlfhq0lk9zpc1p7yc35d1n1gr0pfdfhlm57kcsi5a8pzlk1", - "depends": ["huge", "igraph", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "huge", "igraph"] }, "HextractoR": { "name": "HextractoR", @@ -14069,7 +14237,7 @@ "name": "HhP", "version": "1.0.0", "sha256": "0rmvw52a7a75gcwsyv30wvxrb9ykhg4ji3pj2jhgbzjqdc4s9xzw", - "depends": ["fmrs", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "fmrs"] }, "HiClimR": { "name": "HiClimR", @@ -14087,7 +14255,7 @@ "name": "HiResTEC", "version": "0.62.3", "sha256": "1wswcd68zy03qcajkywgrgi7c06v1kyj2rmvdxj1s4yc0pcw657q", - "depends": ["beeswarm", "CorMID", "InterpretMSSpectrum", "openxlsx", "plyr"] + "depends": ["CorMID", "InterpretMSSpectrum", "beeswarm", "openxlsx", "plyr"] }, "HiddenMarkov": { "name": "HiddenMarkov", @@ -14097,8 +14265,8 @@ }, "HierPortfolios": { "name": "HierPortfolios", - "version": "1.0.0", - "sha256": "1l0ac3sx7q0xgqv6w0c7rahgjqpy045whih7r88wnj8qqwl1x1bp", + "version": "1.0.1", + "sha256": "0hpr8rxpzgbr1v6fh4wxx140nh2017cvrk8anaczv1rnq75j2bdp", "depends": ["cluster", "fastcluster"] }, "HighestMedianRules": { @@ -14111,7 +14279,7 @@ "name": "HistDAWass", "version": "1.0.8", "sha256": "001ranvb4lfjh9lmh5d031g0k6r3yxzwaxvyacxh07hlf9fh7kvn", - "depends": ["class", "FactoMineR", "ggplot2", "ggridges", "histogram", "Rcpp", "RcppArmadillo"] + "depends": ["FactoMineR", "Rcpp", "RcppArmadillo", "class", "ggplot2", "ggridges", "histogram"] }, "HistDat": { "name": "HistDat", @@ -14127,39 +14295,39 @@ }, "HiveR": { "name": "HiveR", - "version": "0.3.63", - "sha256": "1vi24k23a017czfy9kihmq4s1dywzm274dyhyp1imx94afsnmhc3", - "depends": ["jpeg", "plyr", "png", "RColorBrewer", "rgl"] + "version": "0.4.0", + "sha256": "1fddyqx781vw2k9kxnsxzf5j2i9340a5ljpr1ddrcl1h88qnqpjs", + "depends": ["RColorBrewer", "jpeg", "plyr", "png", "rgl", "xtable"] }, "Hmisc": { "name": "Hmisc", "version": "5.1-3", "sha256": "1sq5qvlr9swhdvf3l420y9fxq5s1qw8aiyl9a62sb357ywppfq9w", - "depends": ["base64enc", "cluster", "colorspace", "data_table", "foreign", "Formula", "ggplot2", "gridExtra", "gtable", "htmlTable", "htmltools", "knitr", "nnet", "rmarkdown", "rpart", "viridis"] + "depends": ["Formula", "base64enc", "cluster", "colorspace", "data_table", "foreign", "ggplot2", "gridExtra", "gtable", "htmlTable", "htmltools", "knitr", "nnet", "rmarkdown", "rpart", "viridis"] }, "Hmsc": { "name": "Hmsc", "version": "3.0-13", "sha256": "13gqwjniwxc5lgsj044qjq6ic0ibwvj3mviw4hq31s89m834gvyb", - "depends": ["abind", "ape", "BayesLogit", "coda", "fields", "FNN", "ggplot2", "MASS", "Matrix", "matrixStats", "MCMCpack", "nnet", "pracma", "pROC", "rlang", "sp", "statmod", "truncnorm"] + "depends": ["BayesLogit", "FNN", "MASS", "MCMCpack", "Matrix", "abind", "ape", "coda", "fields", "ggplot2", "matrixStats", "nnet", "pROC", "pracma", "rlang", "sp", "statmod", "truncnorm"] }, "HoRM": { "name": "HoRM", "version": "0.1.3", "sha256": "09dkpzlwkkdn0z8g9fbb7hzxbrrq70x9v1zx254svck2jyk0hx58", - "depends": ["ggplot2", "MASS", "orthopolynom", "quantmod", "rsm"] + "depends": ["MASS", "ggplot2", "orthopolynom", "quantmod", "rsm"] }, "HodgesTools": { "name": "HodgesTools", "version": "1.0.0", "sha256": "02i87pd5ah3mmf03878354p8nqh3bgn9cnrl1pnnrb3qw7afj19q", - "depends": ["data_table", "dplyr", "ggplot2", "ini", "magrittr", "qqman", "RColorBrewer", "readr", "RecordLinkage"] + "depends": ["RColorBrewer", "RecordLinkage", "data_table", "dplyr", "ggplot2", "ini", "magrittr", "qqman", "readr"] }, "Holomics": { "name": "Holomics", "version": "1.1.1", "sha256": "1d2ypgsaq1y4q9q8yis2549m2vaxg4fas6x9zagsw4jx97vi61kh", - "depends": ["BiocParallel", "bs4Dash", "config", "dplyr", "DT", "ggplot2", "ggrepel", "golem", "igraph", "markdown", "matrixStats", "mixOmics", "openxlsx", "readxl", "reshape2", "RSpectra", "shiny", "shinyalert", "shinybusy", "shinyjs", "shinyvalidate", "shinyWidgets", "stringr", "tidyr", "tippy", "uuid", "visNetwork"] + "depends": ["BiocParallel", "DT", "RSpectra", "bs4Dash", "config", "dplyr", "ggplot2", "ggrepel", "golem", "igraph", "markdown", "matrixStats", "mixOmics", "openxlsx", "readxl", "reshape2", "shiny", "shinyWidgets", "shinyalert", "shinybusy", "shinyjs", "shinyvalidate", "stringr", "tidyr", "tippy", "uuid", "visNetwork"] }, "Homeric": { "name": "Homeric", @@ -14173,11 +14341,17 @@ "sha256": "0ynxn1mcr76yvqjpmi8mxl35i9r1fy7rwshpv8qx68nabk67rh61", "depends": ["HEtools", "polynom"] }, + "HonestDiD": { + "name": "HonestDiD", + "version": "0.2.6", + "sha256": "1ywq7a4lz9w2k4yzqlljrb0qa623lgn3wngx00vapdx6a14vfaam", + "depends": ["CVXR", "Matrix", "Rglpk", "TruncatedNormal", "dplyr", "foreach", "ggplot2", "latex2exp", "lpSolveAPI", "matrixStats", "mvtnorm", "pracma", "purrr", "rlang", "tibble"] + }, "HospitalNetwork": { "name": "HospitalNetwork", "version": "0.9.3", "sha256": "183nb9h9b1z1ifpnzcxa8wh3xm2id6fnq9vqd4vkbxzw7wlyd86b", - "depends": ["checkmate", "data_table", "ggplot2", "ggraph", "igraph", "lubridate", "R6"] + "depends": ["R6", "checkmate", "data_table", "ggplot2", "ggraph", "igraph", "lubridate"] }, "Hotelling": { "name": "Hotelling", @@ -14187,15 +14361,15 @@ }, "HotellingEllipse": { "name": "HotellingEllipse", - "version": "1.1.0", - "sha256": "1xvm54iqgdnqjpkmgi4ssgpdz2pap60y9z9whrv2ky3q16mjqycz", - "depends": ["dplyr", "FactoMineR", "ggforce", "ggplot2", "lifecycle", "magrittr", "purrr", "tibble"] + "version": "1.2.0", + "sha256": "1d7af7wdjkp2r5x49p76si5jwj7jxd5mngkip7x91rbjj0v0wagp", + "depends": ["FactoMineR", "dplyr", "ggforce", "ggplot2", "lifecycle", "magrittr", "purrr", "rgl", "tibble"] }, "HuraultMisc": { "name": "HuraultMisc", "version": "1.1.1", "sha256": "0bi1y7icrg0f4n9ah9dsrijnfr39bqg3799rz4hccd1b061f0rvj", - "depends": ["cowplot", "dplyr", "ggplot2", "HDInterval", "Hmisc", "magrittr", "reshape2", "rstan", "tidyr"] + "depends": ["HDInterval", "Hmisc", "cowplot", "dplyr", "ggplot2", "magrittr", "reshape2", "rstan", "tidyr"] }, "HurreconR": { "name": "HurreconR", @@ -14207,13 +14381,13 @@ "name": "HyMETT", "version": "1.1.2", "sha256": "0f1gismhkwi8ynnxlbsvpal15ab2d2j4arrvah25bchybwffhqqg", - "depends": ["checkmate", "dplyr", "EnvStats", "lmomco", "lubridate", "plyr", "rlang", "tibble", "zoo"] + "depends": ["EnvStats", "checkmate", "dplyr", "lmomco", "lubridate", "plyr", "rlang", "tibble", "zoo"] }, "HyRiM": { "name": "HyRiM", "version": "2.0.2", "sha256": "02hb8kl02872xvyhg0k19xavcmhqmf0ddfnxx5nxlpzgzb432csd", - "depends": ["compare", "grImport2", "polynom", "purrr", "Rglpk"] + "depends": ["Rglpk", "compare", "grImport2", "polynom", "purrr"] }, "HybridDesign": { "name": "HybridDesign", @@ -14225,7 +14399,7 @@ "name": "HybridMicrobiomes", "version": "0.1.1", "sha256": "05y3hcw18q9v3fpv0i0msmr9v4hnfgk0ni55wk3k786h96m2swsv", - "depends": ["ape", "compositions", "geometry", "ks", "PERMANOVA", "phyloseq", "rgl", "rlang", "StereoMorph", "vegan"] + "depends": ["PERMANOVA", "StereoMorph", "ape", "compositions", "geometry", "ks", "phyloseq", "rgl", "rlang", "vegan"] }, "HydroCode": { "name": "HydroCode", @@ -14249,7 +14423,7 @@ "name": "HyperG", "version": "1.0.0", "sha256": "0w84ph0vd03i22s8g52jf2w96yd80ynbh6x0p88apg92jdsapcrc", - "depends": ["gtools", "igraph", "Matrix", "mclust", "proxy", "RSpectra"] + "depends": ["Matrix", "RSpectra", "gtools", "igraph", "mclust", "proxy"] }, "HyperbolicDist": { "name": "HyperbolicDist", @@ -14257,23 +14431,29 @@ "sha256": "10bcqychdc3rrdyqng5sxjbr8a6wljwnqa4gff99dmx8774sdw16", "depends": [] }, + "HypergeoMat": { + "name": "HypergeoMat", + "version": "4.0.3", + "sha256": "0yc9kvi8y5ikf9db5r1wx3a00ykhv4ngl1jq0q1bzn4zl5y5y7pf", + "depends": ["EigenR", "JuliaConnectoR", "Rcpp", "RcppEigen", "gsl"] + }, "IADT": { "name": "IADT", "version": "1.2.1", "sha256": "053ymsn7ibjkzdz1znlfz1y6j78bl2fv81dbiihksw09wzx2aa3c", - "depends": ["mgcv", "mvnfast", "Rdpack", "Rmpfr"] + "depends": ["Rdpack", "Rmpfr", "mgcv", "mvnfast"] }, "IALS": { "name": "IALS", "version": "0.1.3", "sha256": "1gmsn428r923clq4zphl24wxbrhrn2mpbdkw38kaklxhwwf8lzki", - "depends": ["HDMFA", "pracma", "RSpectra"] + "depends": ["HDMFA", "RSpectra", "pracma"] }, "IAPWS95": { "name": "IAPWS95", "version": "1.2.4", "sha256": "0jccq1pj0b8xpa7zs20ikkwlyj0f2q5qzdz8kllm0qiwlrrj7jsn", - "depends": ["ggplot2", "pander", "Rcpp"] + "depends": ["Rcpp", "ggplot2", "pander"] }, "IASD": { "name": "IASD", @@ -14309,7 +14489,7 @@ "name": "IAcsSPCR", "version": "1.2.1", "sha256": "0x0h1vicw0jlm9p10cw7g75g2x0d73rjpdwh1j7lxq6cnbpkbxf9", - "depends": ["abind", "FrF2", "lattice", "stringi"] + "depends": ["FrF2", "abind", "lattice", "stringi"] }, "IBCF_MTME": { "name": "IBCF.MTME", @@ -14333,7 +14513,7 @@ "name": "IBMPopSim", "version": "1.0.0", "sha256": "0dxw3ibvfnqva3f0nk5w9q8y2sx0hla619f6yq6b31apxnbxp72p", - "depends": ["checkmate", "dplyr", "ggplot2", "Rcpp", "readr", "rlang"] + "depends": ["Rcpp", "checkmate", "dplyr", "ggplot2", "readr", "rlang"] }, "IBRtools": { "name": "IBRtools", @@ -14351,19 +14531,19 @@ "name": "ICAMS", "version": "2.3.12", "sha256": "0nnmnbh02d5miyk6fr07jrrnv3h7ws72xkwr92apvcx9m5ql6ll0", - "depends": ["Biostrings", "BSgenome", "data_table", "dplyr", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "stringi", "zip"] + "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "data_table", "dplyr", "stringi", "zip"] }, "ICAOD": { "name": "ICAOD", "version": "1.0.1", "sha256": "07fxh60vsndlvjijjsh1a9l2qkp78sb9nkg5x5mslh209lpjjhw1", - "depends": ["cubature", "mnormt", "mvQuad", "nloptr", "Rcpp", "RcppEigen", "sn"] + "depends": ["Rcpp", "RcppEigen", "cubature", "mnormt", "mvQuad", "nloptr", "sn"] }, "ICBioMark": { "name": "ICBioMark", "version": "0.1.4", "sha256": "1bvlbczlkjdql98ds5wgmg3j2dxbfm5i4yzq98pdkzaiccg8sx2v", - "depends": ["dplyr", "gglasso", "ggplot2", "glmnet", "latex2exp", "Matrix", "matrixStats", "PRROC", "purrr"] + "depends": ["Matrix", "PRROC", "dplyr", "gglasso", "ggplot2", "glmnet", "latex2exp", "matrixStats", "purrr"] }, "ICC": { "name": "ICC", @@ -14391,15 +14571,15 @@ }, "ICDS": { "name": "ICDS", - "version": "0.1.2", - "sha256": "1bnj2ngh2n2yhgx8z9kawnpgkfgqw3b8xw9wkhimws4f2ir4k1zl", + "version": "0.1.3", + "sha256": "12zg6bixwqn6m25pnmyqh7fpy5rlkp5warfw5nlmmay0hjydm03q", "depends": ["graphite", "igraph", "metap", "org_Hs_eg_db"] }, "ICED": { "name": "ICED", "version": "0.0.1", "sha256": "0l23xvkkzak1s87bzc4fhy2cy0mvzqv8hs9qc8lk2nminnfxg03p", - "depends": ["boot", "knitr", "lavaan", "MASS", "stringr"] + "depends": ["MASS", "boot", "knitr", "lavaan", "stringr"] }, "ICEbox": { "name": "ICEbox", @@ -14417,7 +14597,7 @@ "name": "ICGE", "version": "0.4.2", "sha256": "13p9v0g5qda8bpj3sj9p277l7idv4jscrsszg2kn080dapp3cppp", - "depends": ["cluster", "fastcluster", "MASS"] + "depends": ["MASS", "cluster", "fastcluster"] }, "ICGOR": { "name": "ICGOR", @@ -14435,7 +14615,7 @@ "name": "ICRanks", "version": "3.1", "sha256": "1vwzqkjg7i5hm96s8frp72n6xqadlsawzr1wby1fhsxl2m5f1797", - "depends": ["gmp", "multcomp", "Rcpp"] + "depends": ["Rcpp", "gmp", "multcomp"] }, "ICS": { "name": "ICS", @@ -14447,13 +14627,13 @@ "name": "ICSClust", "version": "0.1.0", "sha256": "0sw8ck9384xc0rfj7q7yd0fjacilp64fx8b0l0cw5k920rnzskbj", - "depends": ["cluster", "fpc", "GGally", "ggplot2", "heplots", "ICS", "mclust", "moments", "mvtnorm", "otrimle", "Rcpp", "RcppArmadillo", "RcppRoll", "rrcov", "scales", "tclust"] + "depends": ["GGally", "ICS", "Rcpp", "RcppArmadillo", "RcppRoll", "cluster", "fpc", "ggplot2", "heplots", "mclust", "moments", "mvtnorm", "otrimle", "rrcov", "scales", "tclust"] }, "ICSKAT": { "name": "ICSKAT", "version": "0.2.0", "sha256": "13cx2480kyzcwxp9b57p3rq4fs6x1fd4wpwm7iwiqjh17v4vb54l", - "depends": ["CompQuadForm", "dplyr", "magrittr", "Rcpp", "RcppEigen", "rje", "survival", "zoo"] + "depends": ["CompQuadForm", "Rcpp", "RcppEigen", "dplyr", "magrittr", "rje", "survival", "zoo"] }, "ICSNP": { "name": "ICSNP", @@ -14495,7 +14675,7 @@ "name": "ICcalib", "version": "1.0.8", "sha256": "1y2w12ka0qxh9dg6dlcrnndz1xrv8gkppan64qkyk5vjrh18ajz4", - "depends": ["fitdistrplus", "icenReg", "ICsurv", "MASS", "msm", "numDeriv", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["ICsurv", "MASS", "Rcpp", "RcppArmadillo", "fitdistrplus", "icenReg", "msm", "numDeriv", "survival"] }, "ICcforest": { "name": "ICcforest", @@ -14525,13 +14705,13 @@ "name": "ICtest", "version": "0.3-5", "sha256": "13i7zsjy4dqx48vzn9294k7xb93m6r2ab3d546rymfqdzdjszpnp", - "depends": ["GGally", "ggplot2", "ICS", "ICSNP", "JADE", "mvtnorm", "png", "Rcpp", "RcppArmadillo", "RcppRoll", "survey", "xts", "zoo"] + "depends": ["GGally", "ICS", "ICSNP", "JADE", "Rcpp", "RcppArmadillo", "RcppRoll", "ggplot2", "mvtnorm", "png", "survey", "xts", "zoo"] }, "ICvectorfields": { "name": "ICvectorfields", "version": "0.1.2", "sha256": "0h10ijh00ahk2aawg090sspdyxzln8cwzvrfqyi45p19sbx93503", - "depends": ["fftwtools", "Rcpp", "terra"] + "depends": ["Rcpp", "fftwtools", "terra"] }, "IDCard": { "name": "IDCard", @@ -14543,13 +14723,13 @@ "name": "IDE", "version": "0.3.1", "sha256": "1pbfxhcbnmn0mh7a96ff58p4dpkb0di7l0v40nqyjk4jbkpd8rfl", - "depends": ["DEoptim", "dplyr", "FRK", "ggplot2", "Matrix", "sp", "spacetime", "sparseinv", "tidyr"] + "depends": ["DEoptim", "FRK", "Matrix", "dplyr", "ggplot2", "sp", "spacetime", "sparseinv", "tidyr"] }, "IDEAFilter": { "name": "IDEAFilter", "version": "0.2.0", "sha256": "0clr5jkrmwp6nd491rm67i794kh0dcjlhf6z56a8pvjhhia29hpy", - "depends": ["crayon", "ggplot2", "pillar", "purrr", "RColorBrewer", "shiny", "shinyTime"] + "depends": ["RColorBrewer", "crayon", "ggplot2", "pillar", "purrr", "shiny", "shinyTime"] }, "IDEATools": { "name": "IDEATools", @@ -14561,7 +14741,7 @@ "name": "IDF", "version": "2.1.2", "sha256": "19mg7a83badb3wqnrmx5ric0nlfdb33wcxfmq9457s8019ghvpvv", - "depends": ["evd", "fastmatch", "ismev", "pbapply", "RcppRoll"] + "depends": ["RcppRoll", "evd", "fastmatch", "ismev", "pbapply"] }, "IDMIR": { "name": "IDMIR", @@ -14573,7 +14753,7 @@ "name": "IDPSurvival", "version": "1.2", "sha256": "0hifs8vw3rxlb5vlxs1433pcv2dh7p0mxpgb2n03d98f20vkdwfw", - "depends": ["gtools", "Rsolnp", "survival"] + "depends": ["Rsolnp", "gtools", "survival"] }, "IDPmisc": { "name": "IDPmisc", @@ -14635,6 +14815,12 @@ "sha256": "0zdz5s2fa7bgqmscxlf9ppvkpnxidy9fhkxn3qf94bc7y4h5xzh7", "depends": ["IDSL_IPA", "IDSL_UFA", "RcppAlgos", "readxl"] }, + "IDSpatialStats": { + "name": "IDSpatialStats", + "version": "0.4.0", + "sha256": "0skvyh6p31afdqsvqn6k9k18js4zx8dh95v3zswln1ym46v8rs8f", + "depends": ["doParallel", "foreach", "igraph", "spatstat_explore", "spatstat_geom"] + }, "IDetect": { "name": "IDetect", "version": "0.1.0", @@ -14645,7 +14831,7 @@ "name": "IDmeasurer", "version": "1.0.0", "sha256": "0n7rziaaxm9dqixmw6rxgq9dwnwdl3dsdnpd9s59k5skdlaxnl5m", - "depends": ["infotheo", "lme4", "MASS"] + "depends": ["MASS", "infotheo", "lme4"] }, "IDmining": { "name": "IDmining", @@ -14657,13 +14843,13 @@ "name": "IETD", "version": "1.0.0", "sha256": "0avhyw0zcb8vj0nqfy41yq5kcd8yf9rmaawdvfcy5rqwxmi1mw9l", - "depends": ["doParallel", "dplyr", "foreach", "ggplot2", "lubridate", "Rdpack"] + "depends": ["Rdpack", "doParallel", "dplyr", "foreach", "ggplot2", "lubridate"] }, "IFC": { "name": "IFC", "version": "0.2.1", "sha256": "0b0kda1wh9li6x2avjw3ayj882r69v06sjmwc31dkf59b8r67l9k", - "depends": ["DT", "gridExtra", "gridGraphics", "KernSmooth", "lattice", "latticeExtra", "Rcpp", "visNetwork", "xml2"] + "depends": ["DT", "KernSmooth", "Rcpp", "gridExtra", "gridGraphics", "lattice", "latticeExtra", "visNetwork", "xml2"] }, "IFMCDM": { "name": "IFMCDM", @@ -14693,13 +14879,13 @@ "name": "IGoRRR", "version": "0.3.4", "sha256": "1p3dakv9xv835pkixa4smp3bhnrydrfskh8b92kkp8vb8sahjyzd", - "depends": ["arrow", "clipr", "dplyr", "feather", "fst", "fuzzyjoin", "ggformula", "glue", "haven", "Hmisc", "htmltools", "jsonlite", "lubridate", "magrittr", "mapsf", "purrr", "readODS", "readxl", "rhandsontable", "rio", "shiny", "shinydashboard", "shinyFiles", "shinyWidgets", "skimr", "sortable", "stringr", "tables", "tibble", "tidyr", "zoo"] + "depends": ["Hmisc", "arrow", "clipr", "dplyr", "feather", "fst", "fuzzyjoin", "ggformula", "glue", "haven", "htmltools", "jsonlite", "lubridate", "magrittr", "mapsf", "purrr", "readODS", "readxl", "rhandsontable", "rio", "shiny", "shinyFiles", "shinyWidgets", "shinydashboard", "skimr", "sortable", "stringr", "tables", "tibble", "tidyr", "zoo"] }, "IHSEP": { "name": "IHSEP", "version": "0.3.1", "sha256": "18zkqg9vinc8a37i86k516jyjrn3gqbyzb86lq9dix4kskvlvpfd", - "depends": ["lpint", "Rcpp"] + "depends": ["Rcpp", "lpint"] }, "IIProductionUnknown": { "name": "IIProductionUnknown", @@ -14711,25 +14897,25 @@ "name": "IIVpredictor", "version": "0.1.0", "sha256": "15361j8b60jj3bh8cjxs39d9bir1aywy9bd254s5w94cakhy0ld5", - "depends": ["lavaan", "R2jags"] + "depends": ["R2jags", "lavaan"] }, "ILS": { "name": "ILS", "version": "0.3", "sha256": "0l4rrl1j72lqg87nzw4xap054gl2h3m90g8sl5bzg3jc7c290rd7", - "depends": ["depthTools", "fda_usc", "lattice", "MASS", "multcomp"] + "depends": ["MASS", "depthTools", "fda_usc", "lattice", "multcomp"] }, "ILSE": { "name": "ILSE", "version": "1.1.7", "sha256": "0jx0f7lk18k0wsypi4ynq1zqbb9hsmcmf0chxyrpqkadfqb6mgwr", - "depends": ["pbapply", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "pbapply"] }, "ILSM": { "name": "ILSM", - "version": "1.0.2", - "sha256": "079szirz5a1rcza756bjjdlz0wwdg8jifnz5kiw1wlkmc3x2m7sz", - "depends": ["igraph", "Matrix"] + "version": "1.0.3.1", + "sha256": "0x9khrli414qg4i5kqcspz44w9vjcl13qadgf90rgmkcwqqmw3dn", + "depends": ["Matrix", "igraph"] }, "IMD": { "name": "IMD", @@ -14741,19 +14927,19 @@ "name": "IMEC", "version": "0.2.0", "sha256": "1k85pr6s6lysn53n59i8rcdhyg7r3il5avbckvvz43p6lh0fgxpy", - "depends": ["igraph", "IsingSampler", "qgraph"] + "depends": ["IsingSampler", "igraph", "qgraph"] }, "IMIFA": { "name": "IMIFA", "version": "2.2.0", "sha256": "08h53w1axvmvnd4z1nf5bsps5sr6g8a77q6pvg39ss7jcfqm800v", - "depends": ["matrixStats", "mclust", "mvnfast", "Rfast", "slam", "viridisLite"] + "depends": ["Rfast", "matrixStats", "mclust", "mvnfast", "slam", "viridisLite"] }, "IMIX": { "name": "IMIX", "version": "1.1.5", "sha256": "0j5wh4j039xmwxb75msgfvh4f7p5xafvn2z47vyn12hd4dznwndq", - "depends": ["crayon", "ggplot2", "MASS", "mclust", "mixtools", "mvtnorm"] + "depends": ["MASS", "crayon", "ggplot2", "mclust", "mixtools", "mvtnorm"] }, "IMP": { "name": "IMP", @@ -14771,7 +14957,7 @@ "name": "IMTest", "version": "1.0.0", "sha256": "0n0swbi051cr7mrjmszqg79hxa38ccyq69ws8c37ixwb0lpxmx48", - "depends": ["lme4", "ltm", "MASS", "reshape2"] + "depends": ["MASS", "lme4", "ltm", "reshape2"] }, "IMak": { "name": "IMak", @@ -14789,7 +14975,7 @@ "name": "INCATome", "version": "1.0", "sha256": "1gbmcirs49ydmk5rg2vl5gdy39dfx9psw5mijibzjszcfjar3kqs", - "depends": ["genefilter", "limma", "multtest", "RankProd", "siggenes"] + "depends": ["RankProd", "genefilter", "limma", "multtest", "siggenes"] }, "INLABMA": { "name": "INLABMA", @@ -14801,13 +14987,13 @@ "name": "INLAjoint", "version": "24.3.25", "sha256": "03hd29x8arww3fkyzgj8wv1b0sm5nl994bmg6m2sb4xg00slhp05", - "depends": ["ggplot2", "lme4", "Matrix", "mvtnorm", "nlme", "numDeriv"] + "depends": ["Matrix", "ggplot2", "lme4", "mvtnorm", "nlme", "numDeriv"] }, "INLAspacetime": { "name": "INLAspacetime", "version": "0.1.8", "sha256": "0yyhcizaj90qqvirrk74whynxf7zvv09w79k4j61i4n84hm0njdm", - "depends": ["fmesher", "Matrix", "sf", "sp", "terra"] + "depends": ["Matrix", "fmesher", "sf", "sp", "terra"] }, "INQC": { "name": "INQC", @@ -14819,7 +15005,7 @@ "name": "INSPECTumours", "version": "0.1.0", "sha256": "1jh6p3bgnrjixqzvjl0z3nv6lh01fx3x925h3na2pi3scqx5gx0s", - "depends": ["brms", "dplyr", "DT", "ggeffects", "ggplot2", "knitr", "lme4", "modelr", "pander", "plotly", "purrr", "readxl", "rlang", "rmarkdown", "shiny", "shinyalert", "shinyFeedback", "shinyjs", "shinytoastr", "shinyvalidate", "tidybayes", "tidyr", "tippy", "vroom", "waiter"] + "depends": ["DT", "brms", "dplyr", "ggeffects", "ggplot2", "knitr", "lme4", "modelr", "pander", "plotly", "purrr", "readxl", "rlang", "rmarkdown", "shiny", "shinyFeedback", "shinyalert", "shinyjs", "shinytoastr", "shinyvalidate", "tidybayes", "tidyr", "tippy", "vroom", "waiter"] }, "INSPIRE": { "name": "INSPIRE", @@ -14831,19 +15017,19 @@ "name": "INTRIGUE", "version": "0.1.0", "sha256": "1l1vfl0m4iqniwp4bp1bfjpqhwahg341fpyxhryr0j8lypqaw7si", - "depends": ["dplyr", "rlist", "SQUAREM"] + "depends": ["SQUAREM", "dplyr", "rlist"] }, "IOHanalyzer": { "name": "IOHanalyzer", "version": "0.1.8.10", "sha256": "1a92lzq2m9yrgaajlybpib6awnf2p7qzbfanlzg86x9z4hcdiyzr", - "depends": ["colorspace", "data_table", "dplyr", "eaf", "ggplot2", "httr", "knitr", "magrittr", "plotly", "RColorBrewer", "Rcpp", "reshape2", "rjson", "shiny", "stringi", "viridis"] + "depends": ["RColorBrewer", "Rcpp", "colorspace", "data_table", "dplyr", "eaf", "ggplot2", "httr", "knitr", "magrittr", "plotly", "reshape2", "rjson", "shiny", "stringi", "viridis"] }, "IOHexperimenter": { "name": "IOHexperimenter", "version": "0.1.4", "sha256": "0aacliznncl488rjsnx02pfj1mchhcyb36v816g959ll38pvc6bk", - "depends": ["assertthat", "BH", "magrittr", "Rcpp"] + "depends": ["BH", "Rcpp", "assertthat", "magrittr"] }, "IOLS": { "name": "IOLS", @@ -14861,7 +15047,7 @@ "name": "IPCAPS", "version": "1.1.8", "sha256": "17ifkgjjnvvcc8dp065ng4ad9lr85lcdcb401vi84yy8m2llbypw", - "depends": ["apcluster", "expm", "fpc", "KRIS", "LPCM", "MASS", "Matrix", "Rmixmod"] + "depends": ["KRIS", "LPCM", "MASS", "Matrix", "Rmixmod", "apcluster", "expm", "fpc"] }, "IPCWK": { "name": "IPCWK", @@ -14901,8 +15087,8 @@ }, "IPLGP": { "name": "IPLGP", - "version": "2.0.4", - "sha256": "0sv4zl6kn72ajnp32k9xg011y0bjxsq3a0vcj3s0w4wwkcr1h2w5", + "version": "2.0.5", + "sha256": "1c8xqdgs5jq01fnppy2r4wx8y6avzmqaq1id5jxq1ds96dpr72cf", "depends": ["ggplot2", "sommer"] }, "IPMbook": { @@ -14921,7 +15107,7 @@ "name": "IPV", "version": "1.0.0", "sha256": "0h1x2scmwgzl7i0kk4pf7kfq55yiqn065s5r944rrfk09y9g2vgy", - "depends": ["ggforce", "ggplot2", "lavaan", "Matrix", "reshape2", "stringr"] + "depends": ["Matrix", "ggforce", "ggplot2", "lavaan", "reshape2", "stringr"] }, "IPWboxplot": { "name": "IPWboxplot", @@ -14939,19 +15125,19 @@ "name": "IRCcheck", "version": "1.0.0", "sha256": "035sx36qf5hdnc51h8251qwxfm30r8h2v2qs2x161ip4cqghw019", - "depends": ["corpcor", "GGMncv", "glmnet", "MASS", "Rdpack"] + "depends": ["GGMncv", "MASS", "Rdpack", "corpcor", "glmnet"] }, "IRISMustangMetrics": { "name": "IRISMustangMetrics", "version": "2.4.6", "sha256": "08p1xg4mqi36647nzmlmmmvdgzc9xgz4sf4lh2lrlma99f7y8kzd", - "depends": ["dplyr", "IRISSeismic", "pracma", "RCurl", "seismicRoll", "signal", "stringr", "XML"] + "depends": ["IRISSeismic", "RCurl", "XML", "dplyr", "pracma", "seismicRoll", "signal", "stringr"] }, "IRISSeismic": { "name": "IRISSeismic", "version": "1.6.6", "sha256": "0da4bh5kvlp3dchsz0dyddwpwdvss7aij2xsi2kkppi3hrfwja7j", - "depends": ["pracma", "RCurl", "seismicRoll", "signal", "stringr", "XML"] + "depends": ["RCurl", "XML", "pracma", "seismicRoll", "signal", "stringr"] }, "IRR2FPR": { "name": "IRR2FPR", @@ -14969,7 +15155,7 @@ "name": "IRTShiny", "version": "1.2", "sha256": "094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v", - "depends": ["beeswarm", "CTT", "ltm", "psych", "shiny", "shinyAce"] + "depends": ["CTT", "beeswarm", "ltm", "psych", "shiny", "shinyAce"] }, "IRTest": { "name": "IRTest", @@ -14987,19 +15173,19 @@ "name": "IRexamples", "version": "0.0.4", "sha256": "0x44gq6ik73r8zy5cjsdjr3k9xdf47lyrwldbgnfllja7kzxclfm", - "depends": ["DisImpact", "dplyr", "forcats", "geodist", "ggplot2", "ggthemes", "maps", "RSelenium", "rstanarm", "rvest", "sf", "survey", "tidycensus", "tidygeocoder", "tigris", "twang"] + "depends": ["DisImpact", "RSelenium", "dplyr", "forcats", "geodist", "ggplot2", "ggthemes", "maps", "rstanarm", "rvest", "sf", "survey", "tidycensus", "tidygeocoder", "tigris", "twang"] }, "IRkernel": { "name": "IRkernel", "version": "1.3.2", "sha256": "19i4wj5cb62n6j83nxgv500dcdzrf6rzwdy5v6fh7r93vjyxiip1", - "depends": ["crayon", "digest", "evaluate", "IRdisplay", "jsonlite", "pbdZMQ", "repr", "uuid"] + "depends": ["IRdisplay", "crayon", "digest", "evaluate", "jsonlite", "pbdZMQ", "repr", "uuid"] }, "IRon": { "name": "IRon", "version": "0.1.4", "sha256": "1yl9i6gxzwy5f4qva3a14flzlk1xk7v2m02n0mg8ddchc5n6j3bc", - "depends": ["ggplot2", "ggpubr", "gridExtra", "Rcpp", "robustbase", "scam"] + "depends": ["Rcpp", "ggplot2", "ggpubr", "gridExtra", "robustbase", "scam"] }, "ISAR": { "name": "ISAR", @@ -15059,7 +15245,7 @@ "name": "ISOpureR", "version": "1.1.3", "sha256": "1ydhsh3v6n7prrg0dm7hsg8wx1244g791xnz1sjyhljhm31hgwc0", - "depends": ["futile_logger", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "futile_logger"] }, "ISOweek": { "name": "ISOweek", @@ -15077,7 +15263,7 @@ "name": "ISRaD", "version": "2.5.5", "sha256": "02h64lqqkc7a9n4f0hkz29bvyzjzwc024qr22iqg4m429i41kc3r", - "depends": ["dplyr", "ggplot2", "httr", "maps", "RCurl", "readxl", "rio", "rnaturalearth", "sf", "terra", "tidyr", "writexl"] + "depends": ["RCurl", "dplyr", "ggplot2", "httr", "maps", "readxl", "rio", "rnaturalearth", "sf", "terra", "tidyr", "writexl"] }, "ISS": { "name": "ISS", @@ -15095,7 +15281,7 @@ "name": "ITNr", "version": "0.7.0", "sha256": "0zpyrg4vcn17k75x1i1dp2hw8n2fp34qf4skywx3wrchjpxmsra8", - "depends": ["blockmodeling", "circlize", "cowplot", "dplyr", "fastmatch", "GGally", "ggplot2", "igraph", "intergraph", "maps", "network", "networkDynamic", "plyr", "RColorBrewer", "reshape2", "sna", "tnet", "WDI", "xergm_common"] + "depends": ["GGally", "RColorBrewer", "WDI", "blockmodeling", "circlize", "cowplot", "dplyr", "fastmatch", "ggplot2", "igraph", "intergraph", "maps", "network", "networkDynamic", "plyr", "reshape2", "sna", "tnet", "xergm_common"] }, "IVYplot": { "name": "IVYplot", @@ -15105,9 +15291,9 @@ }, "IceSat2R": { "name": "IceSat2R", - "version": "1.0.4", - "sha256": "1jwy1fwnc2rq3c643maa2h7hrwzq0sm6iv35kil95n3pw7pkgdy3", - "depends": ["data_table", "doParallel", "foreach", "glue", "httr", "leafgl", "leaflet", "leaflet_extras", "leafsync", "lubridate", "lwgeom", "magrittr", "miniUI", "rnaturalearth", "rvest", "sf", "shiny", "units"] + "version": "1.0.6", + "sha256": "1l4lafbnlll3x9dyzb1mz4dw7dk2bdc22wq1vydwg22gd113wxxl", + "depends": ["data_table", "doParallel", "foreach", "glue", "httr", "leafgl", "leaflet", "leaflet_extras", "leafsync", "lubridate", "lwgeom", "magrittr", "miniUI", "rnaturalearth", "rvest", "sf", "shiny", "units", "withr"] }, "IgAScores": { "name": "IgAScores", @@ -15125,7 +15311,7 @@ "name": "ImFoR", "version": "0.1.0", "sha256": "10wm0wkcz85g94m4824fm6xy1mqk9syqr3rj5fx6bbs2mkh4wxca", - "depends": ["caret", "ggplot2", "ggpubr", "Metrics", "minpack_lm", "nlme", "tidyverse"] + "depends": ["Metrics", "caret", "ggplot2", "ggpubr", "minpack_lm", "nlme", "tidyverse"] }, "ImHD": { "name": "ImHD", @@ -15143,7 +15329,7 @@ "name": "ImNN", "version": "0.1.0", "sha256": "1xs5pfq4wfd26d8vdhl0zjynrjkzjmnyqx3gprn7dxk1i41r3bg1", - "depends": ["ggplot2", "MLmetrics", "neuralnet"] + "depends": ["MLmetrics", "ggplot2", "neuralnet"] }, "ImVol": { "name": "ImVol", @@ -15155,7 +15341,13 @@ "name": "Immigrate", "version": "0.2.1", "sha256": "0pnnvv63kkg7pgyblb1vlx54c6169n40fn58aypdy5xcnknabvxn", - "depends": ["pROC", "Rcpp"] + "depends": ["Rcpp", "pROC"] + }, + "Imneuron": { + "name": "Imneuron", + "version": "0.1.0", + "sha256": "0d6d7v4n38hkclrwqavbnwr75phw4h07jk5a8qs0kham6nhcifm9", + "depends": ["MLmetrics", "ggplot2", "neuralnet"] }, "ImpShrinkage": { "name": "ImpShrinkage", @@ -15167,13 +15359,13 @@ "name": "ImpactEffectsize", "version": "0.7", "sha256": "1g62p81x6i9gs562m3pdixw27d2cbzhz8drmcfslgs6f48zlir0j", - "depends": ["caTools", "matrixStats", "parallelDist", "Rcpp"] + "depends": ["Rcpp", "caTools", "matrixStats", "parallelDist"] }, "ImportExport": { "name": "ImportExport", "version": "1.3", "sha256": "07i7p9xha1f23r07lw87ak13hd4wavdvwh8vb8sg2gyvnpa5njwp", - "depends": ["chron", "gdata", "haven", "Hmisc", "readxl", "RODBC", "writexl"] + "depends": ["Hmisc", "RODBC", "chron", "gdata", "haven", "readxl", "writexl"] }, "ImportanceIndice": { "name": "ImportanceIndice", @@ -15209,19 +15401,19 @@ "name": "InSilicoVA", "version": "1.4.0", "sha256": "15x6d928rk9in2swbaal6hcw2nikj153fgqyd7nhdkcbs1agrsl1", - "depends": ["coda", "ggplot2", "InterVA5", "rJava"] + "depends": ["InterVA5", "coda", "ggplot2", "rJava"] }, "IncDTW": { "name": "IncDTW", "version": "1.1.4.4", "sha256": "0q8ssv86gbp3v6gznzm5vkc8qhny6ycbh85jg5z4izldpx8a4fq6", - "depends": ["data_table", "ggplot2", "Rcpp", "RcppArmadillo", "RcppParallel", "scales"] + "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "data_table", "ggplot2", "scales"] }, "IncidencePrevalence": { "name": "IncidencePrevalence", - "version": "0.7.3", - "sha256": "0cw2075z492sav1nqlvq8s6xm6835s07g1zkwjmg81mb95a060f0", - "depends": ["CDMConnector", "checkmate", "cli", "clock", "DBI", "dbplyr", "dplyr", "ggplot2", "glue", "lifecycle", "lubridate", "magrittr", "omopgenerics", "PatientProfiles", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect", "zip"] + "version": "0.7.4", + "sha256": "172difb7qikd8390zyn5cgl6m598wyn1bh8wpra9gih3f3kg40j7", + "depends": ["CDMConnector", "PatientProfiles", "checkmate", "cli", "clock", "dbplyr", "dplyr", "glue", "lifecycle", "lubridate", "magrittr", "omopgenerics", "purrr", "rlang", "stringr", "tidyr", "visOmopResults"] }, "IncomPair": { "name": "IncomPair", @@ -15245,13 +15437,13 @@ "name": "IndepTest", "version": "0.2.0", "sha256": "017jasqsxm5m13rhfy9gxvd8nfib5k5y5c8520p3hcffqrxr683p", - "depends": ["FNN", "mvtnorm", "Rdpack"] + "depends": ["FNN", "Rdpack", "mvtnorm"] }, "IndexConstruction": { "name": "IndexConstruction", "version": "0.1-3", "sha256": "08bi3x7a9plxshgj6hq58mzkf1117a7p0fd1akqjh7k8mgywifwf", - "depends": ["fGarch", "KernSmooth", "lubridate", "RcppBDT", "xts", "zoo"] + "depends": ["KernSmooth", "RcppBDT", "fGarch", "lubridate", "xts", "zoo"] }, "IndexNumR": { "name": "IndexNumR", @@ -15299,7 +15491,7 @@ "name": "InflectSSP", "version": "1.6", "sha256": "14i53bsy693yh28y1akg4xd6srz077v9a8i7hx07qf73w2m84v1z", - "depends": ["data_table", "GGally", "ggplot2", "httr", "jsonlite", "network", "plotrix", "RColorBrewer", "readxl", "svglite", "tidyr", "xlsx"] + "depends": ["GGally", "RColorBrewer", "data_table", "ggplot2", "httr", "jsonlite", "network", "plotrix", "readxl", "svglite", "tidyr", "xlsx"] }, "InfoTrad": { "name": "InfoTrad", @@ -15359,13 +15551,13 @@ "name": "IntNMF", "version": "1.2.0", "sha256": "09qzyvv7d4wr68qrlhcd4ivr65is3mypv1vaxpswwcjmcmyr4gzp", - "depends": ["cluster", "InterSIM", "MASS", "mclust", "NMF"] + "depends": ["InterSIM", "MASS", "NMF", "cluster", "mclust"] }, "InteRD": { "name": "InteRD", "version": "0.1.1", "sha256": "18grg2pyn0p3dwqhm2251d47sd97wcjr858y64lf5chkhvcz09nk", - "depends": ["Biobase", "cowplot", "DescTools", "ggplot2", "limSolve", "mgcv", "pheatmap", "Rcpp", "reshape2"] + "depends": ["Biobase", "DescTools", "Rcpp", "cowplot", "ggplot2", "limSolve", "mgcv", "pheatmap", "reshape2"] }, "IntegrateBs": { "name": "IntegrateBs", @@ -15383,13 +15575,13 @@ "name": "IntegratedMRF", "version": "1.1.9", "sha256": "0kklgc48cib4bjfs9qbw13nkp8xyjdazrg6z15x69jylnxyakic7", - "depends": ["bootstrap", "ggplot2", "limSolve", "MultivariateRandomForest", "Rcpp"] + "depends": ["MultivariateRandomForest", "Rcpp", "bootstrap", "ggplot2", "limSolve"] }, "InterNL": { "name": "InterNL", "version": "0.1.0", "sha256": "0qc6s21pjbw40jdavs5cap5m3kcjs2blyr9s80vf499j7cikkzqc", - "depends": ["forecast", "MLmetrics"] + "depends": ["MLmetrics", "forecast"] }, "InterSIM": { "name": "InterSIM", @@ -15411,9 +15603,9 @@ }, "InteractionPoweR": { "name": "InteractionPoweR", - "version": "0.2.1", - "sha256": "1mff2kasdrkk56xqvw66m8sn6186dk0nbv8bx0izpr5qf9dz308q", - "depends": ["chngpt", "doParallel", "dplyr", "foreach", "ggbeeswarm", "ggplot2", "MASS", "Matrix", "polynom", "rlang", "tidyr"] + "version": "0.2.2", + "sha256": "12bnmsx9xf5124vfnbpmfwsswaifaywbg26prsmmsmkjiarplfvl", + "depends": ["Matrix", "chngpt", "doParallel", "dplyr", "foreach", "ggbeeswarm", "ggplot2", "polynom", "rlang", "tidyr"] }, "Interatrix": { "name": "Interatrix", @@ -15467,13 +15659,13 @@ "name": "Inventorymodel", "version": "1.1.0.1", "sha256": "0x36pkr2f038cwdfqi03pljhg6xwhp7v97ymyqddb5lw5a0isw87", - "depends": ["e1071", "GameTheoryAllocation"] + "depends": ["GameTheoryAllocation", "e1071"] }, "Irescale": { "name": "Irescale", "version": "2.3.0", "sha256": "037bzli0zwlfbf5xmllqg2pi0shs33ggrnw69kzyw2sf780y3hs2", - "depends": ["e1071", "fBasics", "ggplot2", "imager", "Rdpack", "reshape2", "sp"] + "depends": ["Rdpack", "e1071", "fBasics", "ggplot2", "imager", "reshape2", "sp"] }, "IrishDirectorates": { "name": "IrishDirectorates", @@ -15497,13 +15689,13 @@ "name": "IsingFit", "version": "0.4", "sha256": "1pxpa3ji447csg1dp17x1y1071djjydl21c3zz2d3j3g6s6nmaqq", - "depends": ["glmnet", "Matrix", "qgraph"] + "depends": ["Matrix", "glmnet", "qgraph"] }, "IsingSampler": { "name": "IsingSampler", "version": "0.2.3", "sha256": "195xl9ivdhpqbl291x3cji343lgg8wsy20yz71iv7cg6g5ni8vvx", - "depends": ["dplyr", "magrittr", "nnet", "plyr", "Rcpp"] + "depends": ["Rcpp", "dplyr", "magrittr", "nnet", "plyr"] }, "Isinglandr": { "name": "Isinglandr", @@ -15527,7 +15719,7 @@ "name": "IsoCor", "version": "0.1.40", "sha256": "191y51mg6kii4x99c7437888kkacml0ch53qh1gbwv10gl2c4w8z", - "depends": ["bsplus", "DT", "golem", "htmltools", "MALDIquant", "markdown", "plyr", "rmarkdown", "shiny", "shinyalert", "shinyjs"] + "depends": ["DT", "MALDIquant", "bsplus", "golem", "htmltools", "markdown", "plyr", "rmarkdown", "shiny", "shinyalert", "shinyjs"] }, "IsoMemo": { "name": "IsoMemo", @@ -15617,7 +15809,7 @@ "name": "JFM", "version": "1.0", "sha256": "08655vgfb2ll8hwjsj5lsw4849rahn3blisdqn8bwfhclrwd24xn", - "depends": ["MASS", "randomcoloR", "Rcpp", "RcppArmadillo", "rgl", "RockFab", "Rvcg"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "RockFab", "Rvcg", "randomcoloR", "rgl"] }, "JGL": { "name": "JGL", @@ -15653,7 +15845,7 @@ "name": "JMH", "version": "1.0.3", "sha256": "1n41vhr07ylqb393bsw8lrv1h77a10qshwfxrkyx2y1hsq1bh3iy", - "depends": ["caret", "dplyr", "MASS", "nlme", "Rcpp", "RcppEigen", "statmod", "survival", "timeROC"] + "depends": ["MASS", "Rcpp", "RcppEigen", "caret", "dplyr", "nlme", "statmod", "survival", "timeROC"] }, "JMI": { "name": "JMI", @@ -15665,13 +15857,13 @@ "name": "JMbayes", "version": "0.8-85", "sha256": "0s11jpzflc2zg60g4ffcw23c2f4zz3mzddrc2cl5y43xl2v304lb", - "depends": ["doParallel", "foreach", "Hmisc", "jagsUI", "MASS", "nlme", "Rcpp", "RcppArmadillo", "rstan", "shiny", "survival", "xtable"] + "depends": ["Hmisc", "MASS", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "jagsUI", "nlme", "rstan", "shiny", "survival", "xtable"] }, "JMbayes2": { "name": "JMbayes2", "version": "0.5-0", "sha256": "13p848ix1581p9yd6dgkifqj7bha8w2m7drkcz718bwmjlm83z61", - "depends": ["coda", "ggplot2", "GLMMadaptive", "gridExtra", "matrixStats", "nlme", "parallelly", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["GLMMadaptive", "Rcpp", "RcppArmadillo", "coda", "ggplot2", "gridExtra", "matrixStats", "nlme", "parallelly", "survival"] }, "JMdesign": { "name": "JMdesign", @@ -15689,13 +15881,13 @@ "name": "JOPS", "version": "0.1.19", "sha256": "0qnycf7yd1sas0v6jclmc1y0jq9bslqlf66mqyirpxcs2lsk0327", - "depends": ["boot", "colorspace", "fds", "fields", "ggplot2", "MASS", "rpart", "SemiPar", "spam", "SpATS"] + "depends": ["MASS", "SemiPar", "SpATS", "boot", "colorspace", "fds", "fields", "ggplot2", "rpart", "spam"] }, "JOUSBoost": { "name": "JOUSBoost", "version": "2.1.0", "sha256": "0f3rr7aw20nvmlpqrq3wzgmr55lqdqhk3wphpqq7msgvaf1zrcl7", - "depends": ["doParallel", "foreach", "Rcpp", "rpart"] + "depends": ["Rcpp", "doParallel", "foreach", "rpart"] }, "JPEN": { "name": "JPEN", @@ -15711,15 +15903,15 @@ }, "JSDNE": { "name": "JSDNE", - "version": "4.3.2", - "sha256": "1j3ish1kfhx8in37l8ljd22qmaqi6wlsjchzwhfi21rhjrynqzkz", - "depends": ["dplyr", "MASS", "molaR", "nnet", "Rvcg"] + "version": "4.3.4", + "sha256": "04vaalcwixzi1si814zmh6w9rfircj9rd5y3gx64d5l4f5illsn5", + "depends": ["MASS", "Rvcg", "dplyr", "molaR", "nnet"] }, "JSM": { "name": "JSM", "version": "1.0.1", "sha256": "0vcsay1jpjlfdwykad4hp319swr9lv1ajlcyhmiizwr1ph3f1az9", - "depends": ["nlme", "Rcpp", "RcppEigen", "statmod", "survival"] + "depends": ["Rcpp", "RcppEigen", "nlme", "statmod", "survival"] }, "JSUparameters": { "name": "JSUparameters", @@ -15731,13 +15923,13 @@ "name": "JSconsole", "version": "0.1.0", "sha256": "1jpa48xb7hh4ap25sqrl67rzqra53qhcfwpfgs6hmpjnrld8n3ha", - "depends": ["rstudioapi", "V8"] + "depends": ["V8", "rstudioapi"] }, "JSmediation": { "name": "JSmediation", "version": "0.2.2", "sha256": "0lgd00gvg4g6sbsnaaqzqa8c3wjf2h8mkijghx926p3591b19nv8", - "depends": ["broom", "data_table", "dplyr", "glue", "knitr", "magrittr", "MASS", "purrr", "rlang", "tibble", "tidyselect"] + "depends": ["MASS", "broom", "data_table", "dplyr", "glue", "knitr", "magrittr", "purrr", "rlang", "tibble", "tidyselect"] }, "JSparO": { "name": "JSparO", @@ -15755,7 +15947,7 @@ "name": "JWileymisc", "version": "1.4.1", "sha256": "0anchmlgp4nwgr59k5ryi05fcq63d5b2aqs3nmnvr3p3rma16xq7", - "depends": ["data_table", "digest", "emmeans", "extraoperators", "fst", "ggplot2", "ggpubr", "ggthemes", "lavaan", "lme4", "MASS", "mgcv", "mice", "multcompView", "psych", "quantreg", "rlang", "rms", "robustbase", "VGAM"] + "depends": ["MASS", "VGAM", "data_table", "digest", "emmeans", "extraoperators", "fst", "ggplot2", "ggpubr", "ggthemes", "lavaan", "lme4", "mgcv", "mice", "multcompView", "psych", "quantreg", "rlang", "rms", "robustbase"] }, "JacobiEigen": { "name": "JacobiEigen", @@ -15809,12 +16001,12 @@ "name": "JointAI", "version": "1.0.6", "sha256": "1vckbn4y27bdc6176nnjpwa2wm6kyzxkvndf128jw4871964szp5", - "depends": ["coda", "future", "MASS", "mathjaxr", "mcmcse", "rjags", "rlang", "survival"] + "depends": ["MASS", "coda", "future", "mathjaxr", "mcmcse", "rjags", "rlang", "survival"] }, "JointFPM": { "name": "JointFPM", - "version": "1.2.0", - "sha256": "1g6b35i4lvwizg6ji7kg9m7lmi81zz1rrd0qsvssphmbh7i5p58s", + "version": "1.2.1", + "sha256": "04wswyp9pibhkmjksn9ndzymgj1sjmdj6wscpw1wj6hwsi6vrdmw", "depends": ["cli", "data_table", "lifecycle", "matrixStats", "rlang", "rmutil", "rstpm2", "statmod", "survival"] }, "Julia": { @@ -15827,7 +16019,7 @@ "name": "JuliaCall", "version": "0.17.5", "sha256": "036rxp2lygvpxpykpxx2lqyyzidzzi95lv6g30n70hzy0agjym4j", - "depends": ["knitr", "Rcpp", "rjson"] + "depends": ["Rcpp", "knitr", "rjson"] }, "JuliaConnectoR": { "name": "JuliaConnectoR", @@ -15835,17 +16027,23 @@ "sha256": "005l0i06whz6q7vx79pr9p6xbc01h9mngdr01gkkwrz78vi9xns9", "depends": [] }, + "JuliaFormulae": { + "name": "JuliaFormulae", + "version": "0.1.0", + "sha256": "0m1rn9ix66p5qgzhvlw1a7j91k21pc6kmfjr3p1c62fq6jdrzgip", + "depends": ["rrapply"] + }, "JustifyAlpha": { "name": "JustifyAlpha", "version": "0.1.1", "sha256": "0bd7sn4sn95kal5q2x1q78fsk1mhakr5fax3z6ny2yda2h266af9", - "depends": ["BayesFactor", "ggplot2", "pwr", "qpdf", "shiny", "shinydashboard", "stringr", "Superpower"] + "depends": ["BayesFactor", "Superpower", "ggplot2", "pwr", "qpdf", "shiny", "shinydashboard", "stringr"] }, "KCSKNNShiny": { "name": "KCSKNNShiny", "version": "0.1.0", "sha256": "13gzqf3g7vj8cc0xm5902q7lad2way8d0ri1fs01dnv97wmwbxvn", - "depends": ["caret", "dplyr", "FNN", "rhandsontable", "shiny"] + "depends": ["FNN", "caret", "dplyr", "rhandsontable", "shiny"] }, "KCSNBShiny": { "name": "KCSNBShiny", @@ -15887,7 +16085,7 @@ "name": "KGode", "version": "1.0.4", "sha256": "0q39x34rwya3pqhvly1g0n2ykzvwrwdpdnp3y3ya9cyai63l2sgn", - "depends": ["mvtnorm", "pracma", "pspline", "R6"] + "depends": ["R6", "mvtnorm", "pracma", "pspline"] }, "KHQ": { "name": "KHQ", @@ -15903,9 +16101,9 @@ }, "KLINK": { "name": "KLINK", - "version": "0.7.3", - "sha256": "1q2znry97rly1nj7crqqfm5c41sxcia6i4b080ccdwzap26pm17i", - "depends": ["forrel", "gt", "openxlsx", "pedFamilias", "pedmut", "pedprobr", "pedtools", "shiny", "shinydashboard", "verbalisr", "zip"] + "version": "1.0.0", + "sha256": "0gx8kvpyv149g1vk17ym8zfyv0wg4qgmp314vsfv140a9mj2f051", + "depends": ["forrel", "gt", "openxlsx", "pedFamilias", "pedmut", "pedprobr", "pedtools", "shiny", "shinydashboard", "shinyjs", "verbalisr", "xml2"] }, "KLexp": { "name": "KLexp", @@ -15917,7 +16115,7 @@ "name": "KMD", "version": "0.1.0", "sha256": "0sgcfh5b4dl1gy3dxsdsqgmyfrd6kqrzvxv9g4slskwyrjsirsp5", - "depends": ["boot", "data_table", "igraph", "mlpack", "proxy", "RANN"] + "depends": ["RANN", "boot", "data_table", "igraph", "mlpack", "proxy"] }, "KMEANS_KNN": { "name": "KMEANS.KNN", @@ -15947,13 +16145,13 @@ "name": "KNNShiny", "version": "0.1.0", "sha256": "16zm8bhdivaap3mvhdx2qn1b1j2iqyarclb0y2qd1n4viwcfm9c1", - "depends": ["caret", "dplyr", "e1071", "FNN", "psycho", "rhandsontable", "rmarkdown", "shiny"] + "depends": ["FNN", "caret", "dplyr", "e1071", "psycho", "rhandsontable", "rmarkdown", "shiny"] }, "KODAMA": { "name": "KODAMA", "version": "2.4", "sha256": "1rw5xjv5sblhj5mr31hgv472gial5bl4f288db07ysgkjqsymwkq", - "depends": ["minerva", "Rcpp", "RcppArmadillo", "Rtsne", "umap"] + "depends": ["Rcpp", "RcppArmadillo", "Rtsne", "minerva", "umap"] }, "KOGMWU": { "name": "KOGMWU", @@ -15977,7 +16175,7 @@ "name": "KPC", "version": "0.1.2", "sha256": "1i9kpr0pib6a8qn7ibmhbay4vxr96ca4kcp5aswmlvcv4ycmw6lx", - "depends": ["data_table", "kernlab", "mlpack", "proxy", "RANN"] + "depends": ["RANN", "data_table", "kernlab", "mlpack", "proxy"] }, "KRIS": { "name": "KRIS", @@ -15995,7 +16193,7 @@ "name": "KRMM", "version": "1.0", "sha256": "0wxzhrrc4lx20nxjny7rcfw3bya7drn88zbrlzx9f531298xwbrk", - "depends": ["cvTools", "kernlab", "MASS", "robustbase"] + "depends": ["MASS", "cvTools", "kernlab", "robustbase"] }, "KSA": { "name": "KSA", @@ -16025,13 +16223,13 @@ "name": "KScorrect", "version": "1.4.0", "sha256": "1khvwc610yp3fd4fn0wcgqpzxg9g7sicjjmwvfcahs8qxn3m5vfa", - "depends": ["doParallel", "foreach", "iterators", "MASS", "mclust"] + "depends": ["MASS", "doParallel", "foreach", "iterators", "mclust"] }, "KSgeneral": { "name": "KSgeneral", - "version": "2.0.0", - "sha256": "0m3qr65366vqb8pbjidmvlcz5prwmrzcrcs0scsnqcyvwrlwyf0l", - "depends": ["dgof", "MASS", "Rcpp"] + "version": "2.0.2", + "sha256": "155fr49pvsbjkjh96aidw3fs6gb4q1i9c9v7qmk7nnfh6gnx0q3c", + "depends": ["MASS", "Rcpp", "dgof"] }, "KTensorGraphs": { "name": "KTensorGraphs", @@ -16055,13 +16253,13 @@ "name": "Karen", "version": "1.0", "sha256": "1yy80j15lra1zmak3klvqspy9ikhr0v7csl88l9cpbdpp73972by", - "depends": ["abind", "expm", "gaussquad", "igraph", "MASS", "Matrix", "mvtnorm", "scales", "stringr", "tmvtnorm", "xtable"] + "depends": ["MASS", "Matrix", "abind", "expm", "gaussquad", "igraph", "mvtnorm", "scales", "stringr", "tmvtnorm", "xtable"] }, "KarsTS": { "name": "KarsTS", "version": "2.4.1", "sha256": "1km8321a8vzff26g3x2hvdv5ciyk3fdpcn7g1xqbsx96fzxyd22n", - "depends": ["circular", "forecast", "infotheo", "mgcv", "missForest", "MVN", "nonlinearTseries", "plot3D", "rgl", "stinepack", "stlplus", "tcltk2", "tseries", "tseriesChaos", "zoo"] + "depends": ["MVN", "circular", "forecast", "infotheo", "mgcv", "missForest", "nonlinearTseries", "plot3D", "rgl", "stinepack", "stlplus", "tcltk2", "tseries", "tseriesChaos", "zoo"] }, "KbMvtSkew": { "name": "KbMvtSkew", @@ -16097,7 +16295,7 @@ "name": "KernSmoothIRT", "version": "6.4", "sha256": "0qqlmcd04m89pmhrbmxxx4lzzb6sksgrm0j8x7fs5r0sxdqy6rcp", - "depends": ["plotrix", "Rcpp", "rgl"] + "depends": ["Rcpp", "plotrix", "rgl"] }, "KernelKnn": { "name": "KernelKnn", @@ -16109,19 +16307,19 @@ "name": "Kernelheaping", "version": "2.3.0", "sha256": "0nd8kbprpm2jrpnqr4xb4z8wklv5js2y3kdpjc2q0ay229hf85j8", - "depends": ["dplyr", "fastmatch", "fitdistrplus", "GB2", "ks", "magrittr", "MASS", "mvtnorm", "plyr", "sp", "sparr"] + "depends": ["GB2", "MASS", "dplyr", "fastmatch", "fitdistrplus", "ks", "magrittr", "mvtnorm", "plyr", "sp", "sparr"] }, "Keyboard": { "name": "Keyboard", "version": "0.1.3", "sha256": "1yfcn1r0zngc1nlj5axqps8an66p1q1qmxwagxq2q15d9qipb5wh", - "depends": ["ggplot2", "Iso", "Rcpp"] + "depends": ["Iso", "Rcpp", "ggplot2"] }, "KinMixLite": { "name": "KinMixLite", "version": "2.1.0", "sha256": "17kjb12r35b42ghkv6mp0jk115gn2dlwc8cdf92cm9jjn4k9am9a", - "depends": ["DNAmixturesLite", "gRaven", "gRbase", "Matrix", "numDeriv", "pedtools", "ribd", "Rsolnp", "statnet_common"] + "depends": ["DNAmixturesLite", "Matrix", "Rsolnp", "gRaven", "gRbase", "numDeriv", "pedtools", "ribd", "statnet_common"] }, "KingCountyHouses": { "name": "KingCountyHouses", @@ -16131,15 +16329,15 @@ }, "Kira": { "name": "Kira", - "version": "1.0.3", - "sha256": "02h80rmrkggmavbvz1d6p3q7gllf8m6g7vx2k01hxy1c8l237i2b", + "version": "1.0.5", + "sha256": "1ynf31wy93agwn5apaskyj3whdzgb83r4j4h0b455f2j7h5yac49", "depends": ["MASS"] }, "Kmedians": { "name": "Kmedians", "version": "2.2.0", "sha256": "0bsbwxv0a9b6g89h7v876hm5p97viwbczz851ngjv5li5qzvlpxs", - "depends": ["capushe", "doParallel", "foreach", "genieclust", "ggplot2", "Gmedian", "mvtnorm", "reshape2"] + "depends": ["Gmedian", "capushe", "doParallel", "foreach", "genieclust", "ggplot2", "mvtnorm", "reshape2"] }, "KnapsackSampling": { "name": "KnapsackSampling", @@ -16157,13 +16355,13 @@ "name": "KnockoffHybrid", "version": "1.0.1", "sha256": "0ziqnhs2ipnzrh4ndjppcf2w3s13mwsza7w2s5dgfd70i0f6nk7v", - "depends": ["glmnet", "SPAtest"] + "depends": ["SPAtest", "glmnet"] }, "KnockoffScreen": { "name": "KnockoffScreen", "version": "0.3.0", "sha256": "01r04d9ha9l5pkz3lwdcb5x5qqwk8vil9avnbnfn76wg63mdfhbk", - "depends": ["bigmemory", "CompQuadForm", "data_table", "irlba", "Matrix", "seqminer", "SPAtest"] + "depends": ["CompQuadForm", "Matrix", "SPAtest", "bigmemory", "data_table", "irlba", "seqminer"] }, "KnockoffTrio": { "name": "KnockoffTrio", @@ -16181,13 +16379,13 @@ "name": "KoboconnectR", "version": "1.2.2", "sha256": "09cg03hd8wp458d487qbx6giqqw6lc0gavx8isn067wqyfsscg16", - "depends": ["curl", "dplyr", "httr", "jsonlite", "mime", "openssl", "purrr", "R6", "readxl", "rlang"] + "depends": ["R6", "curl", "dplyr", "httr", "jsonlite", "mime", "openssl", "purrr", "readxl", "rlang"] }, "KoulMde": { "name": "KoulMde", "version": "3.2.1", "sha256": "0yx04my2vwjpi4l35h1i5xwqckca8b72divww39y1frcvia33g08", - "depends": ["expm", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "expm"] }, "Kpart": { "name": "Kpart", @@ -16205,7 +16403,7 @@ "name": "KrigInv", "version": "1.4.2", "sha256": "01i953b0xrqrwbgzv8giz4dmcbc18jni9whhkmpg8sxvhqac59ns", - "depends": ["anMC", "DiceKriging", "mvtnorm", "pbivnorm", "randtoolbox", "rgenoud"] + "depends": ["DiceKriging", "anMC", "mvtnorm", "pbivnorm", "randtoolbox", "rgenoud"] }, "Kurt": { "name": "Kurt", @@ -16217,13 +16415,13 @@ "name": "L0Learn", "version": "2.1.0", "sha256": "050r2rqmqgwmal53d82vi0nhnzzrm4q8mqz0pbpj77blflbqy740", - "depends": ["ggplot2", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "reshape2"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "ggplot2", "reshape2"] }, "L1centrality": { "name": "L1centrality", "version": "0.1.1", "sha256": "1qjvyplkc957mhcyd4fly6il93mm5bj2v6azmr4vqc31lpx7j295", - "depends": ["igraph", "Rcpp", "withr"] + "depends": ["Rcpp", "igraph", "withr"] }, "L1pack": { "name": "L1pack", @@ -16241,7 +16439,7 @@ "name": "L2E", "version": "2.0", "sha256": "1ar8jmi7nddp6f5rfh8zvh8w8zkigdf1zjzdr5fz8zqj2ny5hy30", - "depends": ["cobs", "isotone", "Matrix", "ncvreg", "osqp", "robustbase", "signal"] + "depends": ["Matrix", "cobs", "isotone", "ncvreg", "osqp", "robustbase", "signal"] }, "L2hdchange": { "name": "L2hdchange", @@ -16275,8 +16473,8 @@ }, "LAM": { "name": "LAM", - "version": "0.6-19", - "sha256": "1bns8m48rlkv1d87wvhlvkplr8kpm2rda5wb9xcvjqr7bf65nk8b", + "version": "0.7-22", + "sha256": "02kssj47nmps5yf4hqa2g9mwbml52gckj19w7mpqahzlnzib9xi3", "depends": ["CDM", "Rcpp", "RcppArmadillo", "sirt"] }, "LARF": { @@ -16289,7 +16487,7 @@ "name": "LARisk", "version": "1.0.0", "sha256": "13d008v8aypqlx35bf16y7rcfcv5qnbsi8q0zpfcl03rzxmqpb8b", - "depends": ["dplyr", "Rcpp"] + "depends": ["Rcpp", "dplyr"] }, "LATERmodel": { "name": "LATERmodel", @@ -16301,12 +16499,12 @@ "name": "LAWBL", "version": "1.5.0", "sha256": "0vqjp00nviyl6ghbjn2ayj3k0x2a7hihff0w0x7xwqv3z8x0mh8g", - "depends": ["coda", "MASS"] + "depends": ["MASS", "coda"] }, "LBI": { "name": "LBI", - "version": "0.1.2", - "sha256": "18hnvhgl2lji5jawxir1fw7qcmky48qnh8xb5gmnxff8mplwjk0c", + "version": "0.1.3", + "sha256": "1fh121dl4d3i67blgibq087zs5li8zg7j284xgcgk5i789a80ksh", "depends": [] }, "LBPG": { @@ -16319,7 +16517,7 @@ "name": "LBSPR", "version": "0.1.6", "sha256": "075wcjhvp90fj37ihrplnrc0vy8wpav5qivkw1rgv00fa8xj7pw0", - "depends": ["dplyr", "ggplot2", "gridExtra", "plotrix", "RColorBrewer", "Rcpp", "shiny", "tidyr"] + "depends": ["RColorBrewer", "Rcpp", "dplyr", "ggplot2", "gridExtra", "plotrix", "shiny", "tidyr"] }, "LCA": { "name": "LCA", @@ -16337,7 +16535,7 @@ "name": "LCAvarsel", "version": "1.1", "sha256": "0aqc9rbrc8n6s9xllmamby219qsnxd4ajvffjr21qlkhkaklirb1", - "depends": ["doParallel", "foreach", "GA", "MASS", "memoise", "nnet", "poLCA"] + "depends": ["GA", "MASS", "doParallel", "foreach", "memoise", "nnet", "poLCA"] }, "LCCR": { "name": "LCCR", @@ -16367,19 +16565,19 @@ "name": "LCMSQA", "version": "1.0.2", "sha256": "07lgqn8m2aqblm6539d5vrq9hklrjbpxi21zn93nf4akm57lvdxh", - "depends": ["bsplus", "data_table", "DT", "ggplot2", "plotly", "shiny", "shinycssloaders", "shinyjs", "shinyWidgets"] + "depends": ["DT", "bsplus", "data_table", "ggplot2", "plotly", "shiny", "shinyWidgets", "shinycssloaders", "shinyjs"] }, "LDABiplots": { "name": "LDABiplots", "version": "0.1.2", "sha256": "0vcc2s0qyib9l7sdflxbfanraxw5hqjlp24v8yg3z9i65y5gzbaw", - "depends": ["chinese_misc", "dplyr", "DT", "factoextra", "ggplot2", "ggrepel", "glasso", "highcharter", "htmlwidgets", "ldatuning", "Matrix", "qgraph", "quanteda", "rvest", "shiny", "shinyalert", "shinyBS", "shinybusy", "shinycssloaders", "shinydashboard", "shinyjs", "shinyWidgets", "SnowballC", "stringr", "textmineR", "textplot", "tidyr", "topicmodels"] + "depends": ["DT", "Matrix", "SnowballC", "chinese_misc", "dplyr", "factoextra", "ggplot2", "ggrepel", "glasso", "highcharter", "htmlwidgets", "ldatuning", "qgraph", "quanteda", "rvest", "shiny", "shinyBS", "shinyWidgets", "shinyalert", "shinybusy", "shinycssloaders", "shinydashboard", "shinyjs", "stringr", "textmineR", "textplot", "tidyr", "topicmodels"] }, "LDAShiny": { "name": "LDAShiny", "version": "0.9.3", "sha256": "0iql2fcg7fkyggdwmb6mhn54vhki6v206mkc5km41fjiqss2b4ni", - "depends": ["beepr", "broom", "chinese_misc", "dplyr", "DT", "highcharter", "htmlwidgets", "ldatuning", "plotly", "purrr", "quanteda", "shiny", "shinyalert", "shinyBS", "shinycssloaders", "shinydashboard", "shinyjs", "shinyWidgets", "SnowballC", "stringr", "textmineR", "tidyr", "tidytext", "tm", "topicmodels"] + "depends": ["DT", "SnowballC", "beepr", "broom", "chinese_misc", "dplyr", "highcharter", "htmlwidgets", "ldatuning", "plotly", "purrr", "quanteda", "shiny", "shinyBS", "shinyWidgets", "shinyalert", "shinycssloaders", "shinydashboard", "shinyjs", "stringr", "textmineR", "tidyr", "tidytext", "tm", "topicmodels"] }, "LDATS": { "name": "LDATS", @@ -16401,27 +16599,27 @@ }, "LDAcoop": { "name": "LDAcoop", - "version": "0.1.1", - "sha256": "1a2935kqd7pxdpgc1v6inx9z963dd33scc9viwdfbd0s6vlj8lq8", + "version": "0.1.2", + "sha256": "0nvf4j0akpbh03b2rldfzrvzkyxgjq0i375qxbxi96lm4h8yayfh", "depends": ["Hmisc"] }, "LDAvis": { "name": "LDAvis", "version": "0.3.2", "sha256": "1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg", - "depends": ["proxy", "RJSONIO"] + "depends": ["RJSONIO", "proxy"] }, "LDLcalc": { "name": "LDLcalc", "version": "2.1", "sha256": "0bw0a7dh8j215y09n17w1zvnx72s9i5pv509wayl46wl2v6zz4rx", - "depends": ["caret", "caretEnsemble", "corrplot", "data_table", "ggplot2", "janitor", "lares", "lattice", "moments", "philentropy", "RColorBrewer", "resample"] + "depends": ["RColorBrewer", "caret", "caretEnsemble", "corrplot", "data_table", "ggplot2", "janitor", "lares", "lattice", "moments", "philentropy", "resample"] }, "LDM": { "name": "LDM", "version": "6.0.1", "sha256": "1943kw0aznjv82wps952wcab8jh7wh3hkav59q6xgk9zmf4day1d", - "depends": ["BiocParallel", "castor", "GUniFrac", "matrixStats", "modeest", "permute", "phangorn", "vegan"] + "depends": ["BiocParallel", "GUniFrac", "castor", "matrixStats", "modeest", "permute", "phangorn", "vegan"] }, "LDNN": { "name": "LDNN", @@ -16451,13 +16649,13 @@ "name": "LEGIT", "version": "1.4.1", "sha256": "0rwcbckkpmm849yl4rrk97ai31wb89sizbp7974rrfrjb707xl4i", - "depends": ["boot", "doSNOW", "foreach", "formula_tools", "glmnet", "Hmisc", "iterators", "lme4", "pROC", "RColorBrewer", "snow"] + "depends": ["Hmisc", "RColorBrewer", "boot", "doSNOW", "foreach", "formula_tools", "glmnet", "iterators", "lme4", "pROC", "snow"] }, "LFApp": { "name": "LFApp", "version": "1.4.1", "sha256": "1gdapv0nxwxpg1sfc759lh9x8d4whp7h3102xb95sxi3h9xjaqin", - "depends": ["DT", "EBImage", "fs", "ggplot2", "mgcv", "shiny", "shinyFiles", "shinyjs", "shinyMobile", "shinythemes"] + "depends": ["DT", "EBImage", "fs", "ggplot2", "mgcv", "shiny", "shinyFiles", "shinyMobile", "shinyjs", "shinythemes"] }, "LFDR_MLE": { "name": "LFDR.MLE", @@ -16475,7 +16673,7 @@ "name": "LFDREmpiricalBayes", "version": "1.0", "sha256": "1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b", - "depends": ["matrixStats", "R6"] + "depends": ["R6", "matrixStats"] }, "LGDtoolkit": { "name": "LGDtoolkit", @@ -16487,13 +16685,13 @@ "name": "LGEWIS", "version": "1.1", "sha256": "1i52vp0ghjzmyh4r8h6jpyij7x4skw99xvw017b56m8fg64zy70r", - "depends": ["CompQuadForm", "geeM", "mvtnorm", "SKAT"] + "depends": ["CompQuadForm", "SKAT", "geeM", "mvtnorm"] }, "LGRF": { "name": "LGRF", "version": "1.0", "sha256": "1kdx6y55aa9n6v43zfz6jk8amvvxbx79sqm1jx4ihgkpgcdglan7", - "depends": ["CompQuadForm", "geepack", "SKAT"] + "depends": ["CompQuadForm", "SKAT", "geepack"] }, "LHD": { "name": "LHD", @@ -16517,7 +16715,7 @@ "name": "LINselect", "version": "1.1.5", "sha256": "0sd2b0wqmf51x7hxpx2mgymsgn1abzwdiaxp66708pg5nskg48ah", - "depends": ["elasticnet", "gtools", "MASS", "mvtnorm", "pls", "randomForest"] + "depends": ["MASS", "elasticnet", "gtools", "mvtnorm", "pls", "randomForest"] }, "LIStest": { "name": "LIStest", @@ -16527,15 +16725,15 @@ }, "LKT": { "name": "LKT", - "version": "1.6.0", - "sha256": "0a57817ddni9hl916dvs3spsvqpjfnla8dyrl2v8q5y0faqhagml", - "depends": ["cluster", "crayon", "data_table", "glmnet", "glmnetUtils", "HDInterval", "LiblineaR", "lme4", "Matrix", "pROC", "SparseM"] + "version": "1.7.0", + "sha256": "163vg974x7bav5fc6sd8pnnrkwcwy6kqdd66k8zg89m8jmy9iffp", + "depends": ["HDInterval", "LiblineaR", "Matrix", "SparseM", "cluster", "crayon", "data_table", "glmnet", "glmnetUtils", "lme4", "pROC"] }, "LLM": { "name": "LLM", "version": "1.1.0", "sha256": "0kxppzaim7cmjawg5rjih4dsz8adq0asairgq3vx5lyjppb2cybx", - "depends": ["partykit", "reghelper", "RWeka", "scales", "stringr", "survey"] + "depends": ["RWeka", "partykit", "reghelper", "scales", "stringr", "survey"] }, "LLSR": { "name": "LLSR", @@ -16553,25 +16751,25 @@ "name": "LMERConvenienceFunctions", "version": "3.0", "sha256": "0jg889qh5a9wdi01yiw6z7kivs9dzh5dcq39f4zifdpqzglhshzb", - "depends": ["fields", "LCFdata", "lme4", "Matrix", "mgcv"] + "depends": ["LCFdata", "Matrix", "fields", "lme4", "mgcv"] }, "LMMELSM": { "name": "LMMELSM", "version": "0.2.0", "sha256": "0m57hsfpgxch5lmpdxqp720jv18as12drpx1p5x3y4w0navslslz", - "depends": ["BH", "Formula", "loo", "MASS", "nlme", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Formula", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "loo", "nlme", "rstan", "rstantools"] }, "LMMsolver": { "name": "LMMsolver", "version": "1.0.7", "sha256": "0vzgbq2hpj65c7y1gkxz80smrl693basffkvv9gb7l29ifp10gs5", - "depends": ["agridat", "ggplot2", "maps", "Matrix", "Rcpp", "sf", "spam"] + "depends": ["Matrix", "Rcpp", "agridat", "ggplot2", "maps", "sf", "spam"] }, "LMMstar": { "name": "LMMstar", "version": "1.1.0", "sha256": "1hfj69iq9ina23kyz4xvp1xfvg4klzhi6kvfqng4amazlh1vncb1", - "depends": ["copula", "doParallel", "foreach", "ggplot2", "lava", "Matrix", "multcomp", "nlme", "numDeriv", "rlang"] + "depends": ["Matrix", "copula", "doParallel", "foreach", "ggplot2", "lava", "multcomp", "nlme", "numDeriv", "rlang"] }, "LMN": { "name": "LMN", @@ -16579,11 +16777,17 @@ "sha256": "0qnc74m2g4fl1cb39xmanvv1hwcnk0169xn4h4phlhxgr0313m63", "depends": ["Rcpp", "RcppEigen", "SuperGauss"] }, + "LMPdata": { + "name": "LMPdata", + "version": "0.1.0", + "sha256": "0k92ps7rjj2s2n2sa9v840nf6h87sws5fimijz1kpmjj5i96qkik", + "depends": ["data_table", "magrittr"] + }, "LMest": { "name": "LMest", "version": "3.1.2", "sha256": "0a9lch9bylhy5r4v865lwzzz9qqi98na8bfnr5ga8kzy7akbnza0", - "depends": ["diagram", "Formula", "MASS", "mclust", "mix", "MultiLCIRT", "mvtnorm", "scatterplot3d"] + "depends": ["Formula", "MASS", "MultiLCIRT", "diagram", "mclust", "mix", "mvtnorm", "scatterplot3d"] }, "LMfilteR": { "name": "LMfilteR", @@ -16613,7 +16817,7 @@ "name": "LOCUS", "version": "1.0", "sha256": "16hfgj7ilwqlywy3xhfag4fwrbbfqvlmwi55chskc8s2km997pdb", - "depends": ["far", "ica", "MASS"] + "depends": ["MASS", "far", "ica"] }, "LOGAN": { "name": "LOGAN", @@ -16625,25 +16829,25 @@ "name": "LOGANTree", "version": "0.1.1", "sha256": "0zbll6bb9c3zrmnw8ccknfi6my4pkv0pq4hq742w393nni3dlahq", - "depends": ["caret", "caretEnsemble", "dplyr", "gbm", "ggplot2", "ROCR", "rpart_plot", "tibble"] + "depends": ["ROCR", "caret", "caretEnsemble", "dplyr", "gbm", "ggplot2", "rpart_plot", "tibble"] }, "LOMAR": { "name": "LOMAR", "version": "0.4.0", "sha256": "148n4fmz3j0i042kc6jmf839ylsgxapfx9zx8999mlg77scwmdzi", - "depends": ["alphashape3d", "aws", "BH", "data_table", "dbscan", "doParallel", "EBImage", "ff", "FNN", "foreach", "mclust", "pracma", "proxy", "RANN", "Rcpp", "reshape2", "rhdf5", "transport"] + "depends": ["BH", "EBImage", "FNN", "RANN", "Rcpp", "alphashape3d", "aws", "data_table", "dbscan", "doParallel", "ff", "foreach", "mclust", "pracma", "proxy", "reshape2", "rhdf5", "transport"] }, "LOPART": { "name": "LOPART", - "version": "2020.6.29", - "sha256": "1zxaag5pj3l9rzxhlrkx8q4adlap7wsdysb4y6ijvsmxvv63j22k", - "depends": ["data_table", "Rcpp"] + "version": "2024.6.19", + "sha256": "1y3jvg97n15iwp7v71jm5l765k3lz3c7jp0y2apz0is9wc02q5la", + "depends": ["Rcpp", "data_table"] }, "LOST": { "name": "LOST", - "version": "2.0.2", - "sha256": "15ggmvjy2k4j692y9h3anfzmb0hgnx66cbr76grwvcfysdx87ick", - "depends": ["e1071", "gdata", "geomorph", "MASS", "miscTools", "pcaMethods", "rgl", "shapes"] + "version": "2.1.1", + "sha256": "1zcs8vq4nkn059lfyw0nlb4wnn1rq2s1qiw1ggsr3mb847wka6ry", + "depends": ["MASS", "e1071", "gdata", "geomorph", "miscTools", "pcaMethods", "rgl", "shapes"] }, "LPBkg": { "name": "LPBkg", @@ -16661,25 +16865,25 @@ "name": "LPGraph", "version": "2.1", "sha256": "1d2kslravi3v9kf6sdabwfpa9s9xxqj3s3d7f7qfcrpfydqixq1q", - "depends": ["car", "PMA"] + "depends": ["PMA", "car"] }, "LPKsample": { "name": "LPKsample", "version": "2.1", "sha256": "0ifhx8w9f6sacmnck2g7i7r742i8bwwzf0rgajw3klw2wni9ikqx", - "depends": ["apcluster", "igraph", "LPGraph", "mclust"] + "depends": ["LPGraph", "apcluster", "igraph", "mclust"] }, "LPM": { "name": "LPM", "version": "3.2", "sha256": "0xyyfvaa65wi3vz252y59hv4018bw6xwa24rs9d6w53b3slr7pnn", - "depends": ["fracdiff", "MASS", "powdist"] + "depends": ["MASS", "fracdiff", "powdist"] }, "LPRelevance": { "name": "LPRelevance", "version": "3.3", "sha256": "1harwhgqd9swyljijj7bfir176an92kdy8mik1q0nbc061jdgx0i", - "depends": ["BayesGOF", "Bolstad2", "caret", "ggplot2", "glmnet", "leaps", "locfdr", "MASS", "polynom", "reshape2"] + "depends": ["BayesGOF", "Bolstad2", "MASS", "caret", "ggplot2", "glmnet", "leaps", "locfdr", "polynom", "reshape2"] }, "LPS": { "name": "LPS", @@ -16721,7 +16925,7 @@ "name": "LRMF3", "version": "0.1.0", "sha256": "0j9hnin3yic118766if6gysq0g4mkqw40b0873g4ggjkgxndxrqn", - "depends": ["glue", "Matrix"] + "depends": ["Matrix", "glue"] }, "LRTesteR": { "name": "LRTesteR", @@ -16767,9 +16971,9 @@ }, "LSDinterface": { "name": "LSDinterface", - "version": "1.2.1", - "sha256": "0zp7bgdbcah6hsfqbz7lq6f7g8xcqhjsr7pjpwjf9brnmy0l7xki", - "depends": ["abind", "boot", "TSdist"] + "version": "1.2.2", + "sha256": "10g7hlqg99hjachjsfa7bx1s7h4f7avf3jway7zdmagv0kh54rxs", + "depends": ["TSdist", "abind", "boot"] }, "LSDirf": { "name": "LSDirf", @@ -16781,7 +16985,7 @@ "name": "LSDsensitivity", "version": "1.2.3", "sha256": "1qq19f7k6klq7xpa1iq6spm8kbiy229r2wbwkng6rkn7jj2kcd70", - "depends": ["abind", "car", "DiceKriging", "diptest", "kSamples", "lawstat", "LSDinterface", "randtoolbox", "rgenoud", "sensitivity", "tseries"] + "depends": ["DiceKriging", "LSDinterface", "abind", "car", "diptest", "kSamples", "lawstat", "randtoolbox", "rgenoud", "sensitivity", "tseries"] }, "LSE": { "name": "LSE", @@ -16789,6 +16993,12 @@ "sha256": "01qj0zasv7dbwg0qxryz1d5jp4rapvnm9i6a4jd7c4pxqdm11j7y", "depends": ["MASS", "pracma"] }, + "LSEbootLS": { + "name": "LSEbootLS", + "version": "0.1.0", + "sha256": "11ckfrlhz4zgz5bzbvbrx5j8dcxs2ka4xv8f2b2mlpv6jr9f5h1y", + "depends": ["LSTS", "doParallel", "doRNG", "foreach", "iterators", "rlecuyer", "tibble"] + }, "LSMRealOptions": { "name": "LSMRealOptions", "version": "0.2.1", @@ -16805,7 +17015,7 @@ "name": "LSPFP", "version": "1.0.3", "sha256": "0wxqpwfyyhk9dig9ji5na7czk19jx14lr9iqb2rllggz4cji9y65", - "depends": ["bit64", "data_table", "R_utils", "RCurl", "seqinr"] + "depends": ["RCurl", "R_utils", "bit64", "data_table", "seqinr"] }, "LSRS": { "name": "LSRS", @@ -16823,13 +17033,13 @@ "name": "LSTS", "version": "2.1", "sha256": "0pxcw5awm6fr6v1n8gd7yap0y1mba9khwgq27qlv9h2kmrzbr3hp", - "depends": ["ggplot2", "patchwork", "Rdpack", "scales"] + "depends": ["Rdpack", "ggplot2", "patchwork", "scales"] }, "LSTbook": { "name": "LSTbook", "version": "0.5.0", "sha256": "140b0zd8zqlx5qqyq39nq0dhnamvh92lgix0zx4x57x46bzp5rs9", - "depends": ["broom", "dplyr", "ggplot2", "glue", "MASS", "rlang", "stringi", "tibble"] + "depends": ["MASS", "broom", "dplyr", "ggplot2", "glue", "rlang", "stringi", "tibble"] }, "LSVAR": { "name": "LSVAR", @@ -16847,7 +17057,7 @@ "name": "LSX", "version": "1.4.0", "sha256": "1qch23k8qs9v19npsh90nxv8wznp1lqga8k995117vsjj8h7i7s3", - "depends": ["digest", "ggplot2", "ggrepel", "irlba", "locfit", "Matrix", "proxyC", "quanteda", "quanteda_textstats", "reshape2", "rsparse", "RSpectra", "rsvd", "stringi"] + "depends": ["Matrix", "RSpectra", "digest", "ggplot2", "ggrepel", "irlba", "locfit", "proxyC", "quanteda", "quanteda_textstats", "reshape2", "rsparse", "rsvd", "stringi"] }, "LTAR": { "name": "LTAR", @@ -16859,7 +17069,7 @@ "name": "LTASR", "version": "0.1.3", "sha256": "1dab18np0jkb9s8lkrmsk52h0f714ry851kvbnqs2kdl3zrsrl2f", - "depends": ["dplyr", "knitr", "lubridate", "magrittr", "purrr", "readr", "rlang", "stringr", "tidyr", "XML", "zoo"] + "depends": ["XML", "dplyr", "knitr", "lubridate", "magrittr", "purrr", "readr", "rlang", "stringr", "tidyr", "zoo"] }, "LTCDM": { "name": "LTCDM", @@ -16871,7 +17081,7 @@ "name": "LTFHPlus", "version": "2.1.1", "sha256": "0f8xww6n2r54c26idi6ixfk89dff7c14dljvpaa71yxm0rb0isff", - "depends": ["batchmeans", "dplyr", "future", "future_apply", "igraph", "purrr", "Rcpp", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "tmvtnorm", "xgboost"] + "depends": ["Rcpp", "batchmeans", "dplyr", "future", "future_apply", "igraph", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "tmvtnorm", "xgboost"] }, "LTPDvar": { "name": "LTPDvar", @@ -16889,12 +17099,12 @@ "name": "LTRCtrees", "version": "1.1.1", "sha256": "1k16m2fpwn8m4dvm1b82srf3bgkvkwf6kcjpwjgkdappifc7p5m8", - "depends": ["icenReg", "Icens", "interval", "inum", "partykit", "rpart", "survival"] + "depends": ["Icens", "icenReg", "interval", "inum", "partykit", "rpart", "survival"] }, "LUCIDus": { "name": "LUCIDus", - "version": "3.0.1", - "sha256": "0y8l82q5qzc9k88cc7afqnlixrnfamm58j2fxz22x37yxaad20j1", + "version": "3.0.2", + "sha256": "0wy35s0cnnx04ic8gpf4ikm4mpxm72x4k3hrp2h6gz8fmb6iw1qm", "depends": ["boot", "glasso", "glmnet", "jsonlite", "mclust", "networkD3", "nnet", "progress"] }, "LVGP": { @@ -16931,7 +17141,7 @@ "name": "LaMa", "version": "1.0.0", "sha256": "02s13hpkw9h123wmcgawypqrskd0ivciwabv9djw9l66yk79rjix", - "depends": ["mgcv", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "mgcv"] }, "LabApplStat": { "name": "LabApplStat", @@ -16953,8 +17163,8 @@ }, "LadderFuelsR": { "name": "LadderFuelsR", - "version": "0.0.4", - "sha256": "16x3f6hl5qby05z2yd319454rwss77kmy2xq549z7hhypw1mxqmq", + "version": "0.0.6", + "sha256": "0amdnn0n8rb5dmm9cmj7bw9kidal3agd6m3655xal2ay62rxq6mn", "depends": ["dplyr", "gdata", "ggplot2", "magrittr", "segmented", "stringr", "tibble", "tidyr", "tidyselect"] }, "LagSequential": { @@ -16979,7 +17189,7 @@ "name": "LambertW", "version": "0.6.9-1", "sha256": "19j6vjhywyzmrf7rsrx5kf0hg8cpk1gn8al24q813jzp0vsv9ljj", - "depends": ["ggplot2", "lamW", "MASS", "RColorBrewer", "Rcpp", "reshape2"] + "depends": ["MASS", "RColorBrewer", "Rcpp", "ggplot2", "lamW", "reshape2"] }, "LandComp": { "name": "LandComp", @@ -16995,8 +17205,8 @@ }, "Langevin": { "name": "Langevin", - "version": "1.3.1", - "sha256": "0sg3way9hlk875dfwbby59qm5dxwq7d763a0xjgjwaygpwqc83kz", + "version": "1.3.2", + "sha256": "18pri14f9x4svcdq100lmzjjqahnkw83z3a62r48pqrs14zap7hw", "depends": ["Rcpp", "RcppArmadillo"] }, "LaplacesDemon": { @@ -17015,7 +17225,7 @@ "name": "LassoGEE", "version": "1.0", "sha256": "1zascnl9hihw0gx2ssmdiv8gcp2672kz9vmsp5vrc2wr9cdcdjz3", - "depends": ["caret", "MASS", "mvtnorm", "PGEE", "Rcpp", "RcppArmadillo", "SimCorMultRes"] + "depends": ["MASS", "PGEE", "Rcpp", "RcppArmadillo", "SimCorMultRes", "caret", "mvtnorm"] }, "LassoNet": { "name": "LassoNet", @@ -17029,10 +17239,16 @@ "sha256": "0ap8335ms12nsc7jvd48244zya54w05wj91qkhb0i63730r508c3", "depends": ["glmnet"] }, + "LatentBMA": { + "name": "LatentBMA", + "version": "0.1.1", + "sha256": "0gkcmc87ikq4n3zhga9pi2s3gdcf9h450xm8z4i855kf2h8ib2ky", + "depends": ["ggplot2", "knitr", "mnormt", "progress", "reshape2"] + }, "Laterality": { "name": "Laterality", - "version": "0.9.4", - "sha256": "1p91xnqmiy232i18masqgly5wcp8zzx8kl8y5v0ra6548np31qmf", + "version": "0.9.5", + "sha256": "0n6qr6xbz79acjv2r1gic0cknpnm2cig37nzs7sb6x6hna39yscc", "depends": ["ade4"] }, "LatticeDesign": { @@ -17057,7 +17273,7 @@ "name": "Lavash", "version": "1.0", "sha256": "0cjl8crk0rdkyzp069fk4k0sapcjmqm3q40z5mgl0i1n59kn4s07", - "depends": ["glmnet", "MASS", "pracma"] + "depends": ["MASS", "glmnet", "pracma"] }, "LeArEst": { "name": "LeArEst", @@ -17069,7 +17285,7 @@ "name": "LeMaRns", "version": "0.1.2", "sha256": "0k7mpl2dgy2qvs068mzgfagvlk116p80cxj4dfzjkrr8wzrmwyni", - "depends": ["abind", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "abind"] }, "LeafArea": { "name": "LeafArea", @@ -17171,7 +17387,7 @@ "name": "LifeInsureR", "version": "1.0.0", "sha256": "120pf97hp9rp9ncykpk93xxkrmilz74hksjrylh9vdnmmk1dgwbv", - "depends": ["abind", "dplyr", "kableExtra", "lubridate", "MortalityTables", "objectProperties", "openxlsx", "pander", "R6", "rlang", "rmarkdown", "scales", "stringr", "tidyr"] + "depends": ["MortalityTables", "R6", "abind", "dplyr", "kableExtra", "lubridate", "objectProperties", "openxlsx", "pander", "rlang", "rmarkdown", "scales", "stringr", "tidyr"] }, "LifeTables": { "name": "LifeTables", @@ -17181,9 +17397,9 @@ }, "LifemapR": { "name": "LifemapR", - "version": "1.1.1", - "sha256": "0wwszxbwxncvzcv81jchk9qcd14g0ncsb17lwjcz6vnv6dn1vdlv", - "depends": ["dplyr", "fastmatch", "htmltools", "jsonlite", "leaflet", "leaflet_minicharts", "RCurl", "rlang", "shiny", "tidyr"] + "version": "1.1.4", + "sha256": "0f09lgpsmg45f072901v59niakx65wvmcz67zjzz4lsy35k74q9k", + "depends": ["RCurl", "dplyr", "fastmatch", "htmltools", "jsonlite", "leaflet", "leaflet_minicharts", "rlang", "shiny", "tidyr"] }, "Lifertable": { "name": "Lifertable", @@ -17197,23 +17413,29 @@ "sha256": "097aj0b8gxly3gqvckcl9xcvv60yd06ydagdqzy80zhv4aqgxm5p", "depends": [] }, + "LightLogR": { + "name": "LightLogR", + "version": "0.3.8", + "sha256": "124kd9ai0xxqzdyqj1npa711nkia520glca6a9jqsrsk6ld30765", + "depends": ["cowplot", "dplyr", "flextable", "ggplot2", "ggsci", "ggtext", "hms", "lubridate", "magrittr", "pkgload", "plotly", "purrr", "readr", "rlang", "rsconnect", "scales", "slider", "stringr", "tibble", "tidyr"] + }, "LightningR": { "name": "LightningR", "version": "1.0.2", "sha256": "1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq", - "depends": ["httr", "R6", "RCurl", "RJSONIO"] + "depends": ["R6", "RCurl", "RJSONIO", "httr"] }, "LikertMakeR": { "name": "LikertMakeR", "version": "0.3.0", "sha256": "0hxyrgm88wvaa6b1cggm45f851sg7rzsbcz7745lcl9zmmkw5w1d", - "depends": ["dplyr", "gtools", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "gtools"] }, "LilRhino": { "name": "LilRhino", "version": "1.2.2", "sha256": "1b3wbnzqakjxh3c3s4cxf14nnb1vrbvslqcyn9bh0zbw1arf5ixl", - "depends": ["beepr", "data_table", "dplyr", "e1071", "fastmatch", "FNN", "ggplot2", "keras", "neuralnet", "readr", "SnowballC", "stringi", "tm"] + "depends": ["FNN", "SnowballC", "beepr", "data_table", "dplyr", "e1071", "fastmatch", "ggplot2", "keras", "neuralnet", "readr", "stringi", "tm"] }, "LimnoPalettes": { "name": "LimnoPalettes", @@ -17255,13 +17477,13 @@ "name": "Linkage", "version": "0.9", "sha256": "1qiz163qrmg0zp8kah6hrpa7wm6k6bm8a1xgmd7nhfnyvq67l8zs", - "depends": ["httr", "jsonlite", "network", "RColorBrewer", "sna"] + "depends": ["RColorBrewer", "httr", "jsonlite", "network", "sna"] }, "LinkageMapView": { "name": "LinkageMapView", "version": "2.1.2", "sha256": "101g4djzkxgxbn87an2vz4s9nwn8gwz7a3p3wg0y4zpdd1pdp716", - "depends": ["plotrix", "qtl", "RColorBrewer"] + "depends": ["RColorBrewer", "plotrix", "qtl"] }, "LinkedGASP": { "name": "LinkedGASP", @@ -17285,7 +17507,7 @@ "name": "LipidomicsR", "version": "0.3.6", "sha256": "1mg0lwmhb4rak6gzyypn6nbd8fdgkpxpksgf0vcagh3zlrynshp7", - "depends": ["broom", "car", "cowplot", "dplyr", "fmsb", "ggforce", "ggiraph", "ggplot2", "ggplotify", "ggrepel", "ggsci", "pheatmap", "RColorBrewer", "rcompanion", "reshape2", "scales", "stringr", "tidyr", "tidyselect", "tidyverse"] + "depends": ["RColorBrewer", "broom", "car", "cowplot", "dplyr", "fmsb", "ggforce", "ggiraph", "ggplot2", "ggplotify", "ggrepel", "ggsci", "pheatmap", "rcompanion", "reshape2", "scales", "stringr", "tidyr", "tidyselect", "tidyverse"] }, "LipinskiFilters": { "name": "LipinskiFilters", @@ -17315,7 +17537,7 @@ "name": "LoBrA", "version": "1.0", "sha256": "0rsxkli6xhjwy058skgij2cf3n1lcjsaw3pd51i55l2bpwlrmci6", - "depends": ["lawstat", "nlme", "qpdf", "RColorBrewer"] + "depends": ["RColorBrewer", "lawstat", "nlme", "qpdf"] }, "LobsterCatch": { "name": "LobsterCatch", @@ -17327,7 +17549,7 @@ "name": "LocKer", "version": "1.1", "sha256": "034r6215aigb5hdm2a7cs8qw3nikjdjqnqpn1g27p3lxwfp0n3pr", - "depends": ["fda", "Matrix", "psych"] + "depends": ["Matrix", "fda", "psych"] }, "LocaTT": { "name": "LocaTT", @@ -17339,7 +17561,7 @@ "name": "LocalControl", "version": "1.1.3", "sha256": "0pi5z3i5hmb8nrqg6nyqrd4hx80xjgc5m3ra1z5r8rvjhw4mz0ik", - "depends": ["cluster", "gss", "lattice", "Rcpp"] + "depends": ["Rcpp", "cluster", "gss", "lattice"] }, "LocalCop": { "name": "LocalCop", @@ -17377,6 +17599,12 @@ "sha256": "18xzszw2g4sx08imjwglab0midrchg8z5lr91w0my7ld7vwaxmll", "depends": ["survival"] }, + "LogisticCopula": { + "name": "LogisticCopula", + "version": "0.1.0", + "sha256": "1ld8s3swxx93xh14agpk4ygq3majc52pkdkzp4ma24hxjcasn367", + "depends": ["VineCopula", "brglm2", "igraph", "numDeriv", "rvinecopulib", "stringr"] + }, "LogisticCurveFitting": { "name": "LogisticCurveFitting", "version": "0.1.0", @@ -17399,13 +17627,13 @@ "name": "LongDat", "version": "1.1.2", "sha256": "1rzkb7byd32jqvhf75zyvy0dlkq79aicz8j0x7lk821qiq4dfv6l", - "depends": ["bestNormalize", "car", "dplyr", "effsize", "emmeans", "ggplot2", "glmmTMB", "lme4", "magrittr", "MASS", "patchwork", "reshape2", "rlang", "rstatix", "stringr", "tibble", "tidyr"] + "depends": ["MASS", "bestNormalize", "car", "dplyr", "effsize", "emmeans", "ggplot2", "glmmTMB", "lme4", "magrittr", "patchwork", "reshape2", "rlang", "rstatix", "stringr", "tibble", "tidyr"] }, "LongMemoryTS": { "name": "LongMemoryTS", "version": "0.1.0", "sha256": "0n378sad8i283vs7q63spdhwpwjly2d5zj15d4v2085j7sc7z8vi", - "depends": ["fracdiff", "longmemo", "mvtnorm", "partitions", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "fracdiff", "longmemo", "mvtnorm", "partitions"] }, "LongituRF": { "name": "LongituRF", @@ -17435,7 +17663,7 @@ "name": "LorenzRegression", "version": "1.0.0", "sha256": "1jxz753bcq8b16ncjk6v8c8ylv8brlqd90fdzn9lappm1k4y0r46", - "depends": ["doParallel", "foreach", "GA", "ggplot2", "knitr", "locpol", "MASS", "Rcpp", "RcppArmadillo", "Rearrangement"] + "depends": ["GA", "MASS", "Rcpp", "RcppArmadillo", "Rearrangement", "doParallel", "foreach", "ggplot2", "knitr", "locpol"] }, "LowRankQP": { "name": "LowRankQP", @@ -17447,13 +17675,13 @@ "name": "LowWAFOMNX", "version": "1.1.1", "sha256": "0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x", - "depends": ["Rcpp", "RSQLite"] + "depends": ["RSQLite", "Rcpp"] }, "LowWAFOMSobol": { "name": "LowWAFOMSobol", "version": "1.1.1", "sha256": "1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4", - "depends": ["Rcpp", "RSQLite"] + "depends": ["RSQLite", "Rcpp"] }, "LqG": { "name": "LqG", @@ -17465,19 +17693,19 @@ "name": "Luminescence", "version": "0.9.24", "sha256": "0i4z0pyykvp0kxv5xg2id9p3829wxivvn5lgqickb2xql4rrggp6", - "depends": ["bbmle", "data_table", "DEoptim", "httr", "interp", "lamW", "matrixStats", "mclust", "minpack_lm", "Rcpp", "RcppArmadillo", "readxl", "shape", "XML", "zoo"] + "depends": ["DEoptim", "Rcpp", "RcppArmadillo", "XML", "bbmle", "data_table", "httr", "interp", "lamW", "matrixStats", "mclust", "minpack_lm", "readxl", "shape", "zoo"] }, "M2SMF": { "name": "M2SMF", "version": "2.0", "sha256": "160qjrb3mxybvr4z6zra6rzf6scyrb9mplw36gqlfxj418ndnmm1", - "depends": ["dplyr", "MASS"] + "depends": ["MASS", "dplyr"] }, "M2SMJF": { "name": "M2SMJF", "version": "1.0", "sha256": "0v4sg5h3h2pjp996jspv206c8cymjpn1fg38ivaw12s7bmx8j409", - "depends": ["dplyr", "MASS"] + "depends": ["MASS", "dplyr"] }, "M3": { "name": "M3", @@ -17489,7 +17717,7 @@ "name": "M3JF", "version": "0.1.0", "sha256": "0sz02cis8xh11fyng44j6al2fkz6ybcabdgg25bbwb3vidf1y197", - "depends": ["dplyr", "InterSIM", "MASS", "SNFtool"] + "depends": ["InterSIM", "MASS", "SNFtool", "dplyr"] }, "MAAPER": { "name": "MAAPER", @@ -17513,13 +17741,13 @@ "name": "MADPop", "version": "1.1.7", "sha256": "0qmn6spp6vfn60h32s58yxngv8gmp1hpl8xni55v6ari0kczw90x", - "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools"] }, "MAGEE": { "name": "MAGEE", - "version": "1.4.1", - "sha256": "0xkabvj222xrm62fvaaj0fhdybankz2a01rlxn84n0xvv4hlap7s", - "depends": ["CompQuadForm", "data_table", "foreach", "GMMAT", "MASS", "Matrix", "Rcpp", "RcppArmadillo"] + "version": "1.4.2", + "sha256": "1gwm82iwji0wviy2d3brws9d3iqwgxlkcf4b24b9hcvfl1kgglb6", + "depends": ["CompQuadForm", "GMMAT", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "data_table", "foreach"] }, "MAGMA_R": { "name": "MAGMA.R", @@ -17537,7 +17765,7 @@ "name": "MAINT.Data", "version": "2.7.1", "sha256": "0hjrz25jg4a6kcap01rjjgfvvmg1padd57wgjxihaxpsm7pb0fq9", - "depends": ["GGally", "ggplot2", "MASS", "mclust", "miscTools", "pcaPP", "Rcpp", "RcppArmadillo", "robustbase", "rrcov", "sn", "withr"] + "depends": ["GGally", "MASS", "Rcpp", "RcppArmadillo", "ggplot2", "mclust", "miscTools", "pcaPP", "robustbase", "rrcov", "sn", "withr"] }, "MAKL": { "name": "MAKL", @@ -17555,13 +17783,13 @@ "name": "MALDIquantForeign", "version": "0.14.1", "sha256": "0504a755mccz174g5zcldblwbyg3y11hpxxwpj9bhw937h55zxng", - "depends": ["base64enc", "digest", "MALDIquant", "readBrukerFlexData", "readMzXmlData", "XML"] + "depends": ["MALDIquant", "XML", "base64enc", "digest", "readBrukerFlexData", "readMzXmlData"] }, "MALDIrppa": { "name": "MALDIrppa", "version": "1.1.0-2", "sha256": "1afwkc8dyq51z610z7wnhm95f5j04yj90pxxa33mhdnm2dwsc963", - "depends": ["lattice", "MALDIquant", "robustbase", "signal", "waveslim"] + "depends": ["MALDIquant", "lattice", "robustbase", "signal", "waveslim"] }, "MAMS": { "name": "MAMS", @@ -17579,25 +17807,25 @@ "name": "MANOVA.RM", "version": "0.5.4", "sha256": "03y6qzbh696h282pq8as2zy16y7j95d04qvn3labivd5qygfwfhp", - "depends": ["data_table", "ellipse", "magic", "MASS", "Matrix", "multcomp", "plotrix", "plyr"] + "depends": ["MASS", "Matrix", "data_table", "ellipse", "magic", "multcomp", "plotrix", "plyr"] }, "MAP": { "name": "MAP", "version": "0.1.3", "sha256": "19d0m30jh50ibbdgvcvq1vsz5i1vf8qvl0d0nbqklvnndch61jhk", - "depends": ["flexmix", "Matrix"] + "depends": ["Matrix", "flexmix"] }, "MAPA": { "name": "MAPA", "version": "2.0.7", "sha256": "1f50fkxsdisndxh03ylzqipwh2kr51dai6z8xjhiv28h9ymgz9br", - "depends": ["forecast", "RColorBrewer", "smooth"] + "depends": ["RColorBrewer", "forecast", "smooth"] }, "MAPITR": { "name": "MAPITR", "version": "1.1.2", "sha256": "0vmsdspja4qfs2z14p835g78zggk8h54v25cn268z1hg2p6zxish", - "depends": ["CompQuadForm", "doParallel", "Rcpp", "RcppArmadillo"] + "depends": ["CompQuadForm", "Rcpp", "RcppArmadillo", "doParallel"] }, "MARMoT": { "name": "MARMoT", @@ -17621,7 +17849,7 @@ "name": "MARSS", "version": "3.11.9", "sha256": "0iipvlf6franhvbpg5c7wdnyzl9wl27xhnl1k66mi9m8ihjcczrm", - "depends": ["generics", "KFAS", "mvtnorm", "nlme"] + "depends": ["KFAS", "generics", "mvtnorm", "nlme"] }, "MARSSVRhybrid": { "name": "MARSSVRhybrid", @@ -17633,7 +17861,7 @@ "name": "MARVEL", "version": "1.4.0", "sha256": "1zsgj3dbqpfjv2x6xpp75n9jxf04svqffiy9gxlbxkns3clwqz5i", - "depends": ["ggplot2", "Matrix", "plyr", "scales"] + "depends": ["Matrix", "ggplot2", "plyr", "scales"] }, "MASS": { "name": "MASS", @@ -17645,7 +17873,7 @@ "name": "MASSExtra", "version": "1.2.2", "sha256": "0agr8kf7hh7mjpa98y486bql9wxjwif9f03wz468srzz8jjin39h", - "depends": ["demoKde", "MASS"] + "depends": ["MASS", "demoKde"] }, "MASSTIMATE": { "name": "MASSTIMATE", @@ -17669,13 +17897,13 @@ "name": "MAVE", "version": "1.3.11", "sha256": "01n204bxabbm8pcpayy2s0jvhg73r5cv0026lb3vbk0m40z02kcz", - "depends": ["mda", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "mda"] }, "MAZE": { "name": "MAZE", "version": "0.0.2", "sha256": "01vxglgfn82m8avsq6s144gmwclw08arzfrb8lwlcynr62ifzaim", - "depends": ["doParallel", "flexmix", "foreach", "MASS", "numDeriv", "pracma", "Rcpp"] + "depends": ["MASS", "Rcpp", "doParallel", "flexmix", "foreach", "numDeriv", "pracma"] }, "MAd": { "name": "MAd", @@ -17709,27 +17937,27 @@ }, "MBBEFDLite": { "name": "MBBEFDLite", - "version": "0.0.2", - "sha256": "0bq7h2jfnqiylmy9ji5k4r3v76qbxpd5wdjck18fs4vjfxapwplp", + "version": "0.0.4", + "sha256": "1cczc45gw0ksisagjhyjf7zck00qqpdpa02w2wkbdx8bhvllkl62", "depends": [] }, "MBC": { "name": "MBC", "version": "0.10-6", "sha256": "1680lnzga21qk5yddrciiaifxkkb9kk744m9fbj0hg5xw6v9dxic", - "depends": ["energy", "FNN", "Matrix"] + "depends": ["FNN", "Matrix", "energy"] }, "MBCbook": { "name": "MBCbook", "version": "0.1.2", "sha256": "0av7mswr1l02jkjpmh780phjgwjazqzyl07hkb282ba2h95dwlwx", - "depends": ["MASS", "mclust", "mvtnorm", "Rmixmod"] + "depends": ["MASS", "Rmixmod", "mclust", "mvtnorm"] }, "MBESS": { "name": "MBESS", "version": "4.9.3", "sha256": "05ph8dwigwn0c4qg8smqhsjijvsvfawbzvm74mqpasi8qifz8nd3", - "depends": ["boot", "lavaan", "MASS", "mnormt", "nlme", "OpenMx", "sem", "semTools"] + "depends": ["MASS", "OpenMx", "boot", "lavaan", "mnormt", "nlme", "sem", "semTools"] }, "MBHdesign": { "name": "MBHdesign", @@ -17741,19 +17969,19 @@ "name": "MBMethPred", "version": "0.1.4.2", "sha256": "0qpflcydkf2k8a7kqklvp7mskppviqkffkr98rfsklk8iqf8x9c9", - "depends": ["caret", "caTools", "class", "dplyr", "e1071", "ggplot2", "keras", "MASS", "pROC", "randomForest", "readr", "reshape2", "reticulate", "rgl", "Rtsne", "SNFtool", "stringr", "tensorflow", "xgboost"] + "depends": ["MASS", "Rtsne", "SNFtool", "caTools", "caret", "class", "dplyr", "e1071", "ggplot2", "keras", "pROC", "randomForest", "readr", "reshape2", "reticulate", "rgl", "stringr", "tensorflow", "xgboost"] }, "MBNMAdose": { "name": "MBNMAdose", "version": "0.4.3", "sha256": "1dqh7z6wpnryl9djfsacbdm4b4my08kh4l63vd31xs742sywv6i0", - "depends": ["checkmate", "dplyr", "igraph", "magrittr", "R2jags", "Rdpack", "reshape2", "rjags", "scales"] + "depends": ["R2jags", "Rdpack", "checkmate", "dplyr", "igraph", "magrittr", "reshape2", "rjags", "scales"] }, "MBNMAtime": { "name": "MBNMAtime", "version": "0.2.4", "sha256": "1ny438dy62zrafyf7nng2hq5v311l1zc5xd39452fgq6ij0rnrni", - "depends": ["checkmate", "dplyr", "gridExtra", "knitr", "magrittr", "R2jags", "Rdpack", "reshape2", "rjags"] + "depends": ["R2jags", "Rdpack", "checkmate", "dplyr", "gridExtra", "knitr", "magrittr", "reshape2", "rjags"] }, "MBSGS": { "name": "MBSGS", @@ -17777,7 +18005,7 @@ "name": "MCARtest", "version": "1.2.1", "sha256": "0vcw8ysxkv2ajiv44cf6pf8dgn6bmjzs01fsdijs29ky9467alw5", - "depends": ["copula", "Epi", "gtools", "highs", "lpSolve", "MASS", "Matrix", "missMethods", "misty", "norm", "pracma", "rcdd", "Rcpp", "Rcsdp", "Rdpack"] + "depends": ["Epi", "MASS", "Matrix", "Rcpp", "Rcsdp", "Rdpack", "copula", "gtools", "highs", "lpSolve", "missMethods", "misty", "norm", "pracma", "rcdd"] }, "MCAvariants": { "name": "MCAvariants", @@ -17795,13 +18023,13 @@ "name": "MCCM", "version": "0.1.0", "sha256": "1iyd81smamxxy97gzb7jzxkys94ql9nchik3aszkd91zicixd12k", - "depends": ["lavaan", "MASS", "mvtnorm", "polycor"] + "depends": ["MASS", "lavaan", "mvtnorm", "polycor"] }, "MCDA": { "name": "MCDA", "version": "0.1.0", "sha256": "060mqk1cyxh2v68dr8533zr4k3wkz2f4k22400xgj40rwgj9a355", - "depends": ["combinat", "ggplot2", "glpkAPI", "plyr", "RColorBrewer", "Rglpk", "triangle"] + "depends": ["RColorBrewer", "Rglpk", "combinat", "ggplot2", "glpkAPI", "plyr", "triangle"] }, "MCI": { "name": "MCI", @@ -17831,13 +18059,13 @@ "name": "MCMC.OTU", "version": "1.0.10", "sha256": "1h1b0lw7d96q47sgq3px8j6rbkyhxhykm1c891px89khgg6hnszc", - "depends": ["coda", "ggplot2", "MCMCglmm"] + "depends": ["MCMCglmm", "coda", "ggplot2"] }, "MCMC_qpcr": { "name": "MCMC.qpcr", "version": "1.2.4", "sha256": "0v0d43wnq3swbrcsbg9qmwkmk4s50grd6cik4ng5baj2i6i4hd2n", - "depends": ["coda", "ggplot2", "MCMCglmm"] + "depends": ["MCMCglmm", "coda", "ggplot2"] }, "MCMC4Extremes": { "name": "MCMC4Extremes", @@ -17849,19 +18077,19 @@ "name": "MCMCglmm", "version": "2.36", "sha256": "1wca9x5c9x88cryj1pkhl73chmnbc1653j08faz7lp03z2mdkzv6", - "depends": ["ape", "coda", "corpcor", "cubature", "Matrix", "tensorA"] + "depends": ["Matrix", "ape", "coda", "corpcor", "cubature", "tensorA"] }, "MCMCpack": { "name": "MCMCpack", "version": "1.7-0", "sha256": "1vsx0hs8v0928lhkf2jhwc2cwq7bdb5iciibkbfc2zh123bp6q44", - "depends": ["coda", "lattice", "MASS", "mcmc", "quantreg"] + "depends": ["MASS", "coda", "lattice", "mcmc", "quantreg"] }, "MCMCprecision": { "name": "MCMCprecision", "version": "0.4.0", "sha256": "0r0qchiv61sk3drrb0rhwsk55gci4w343hd2gsvclrlyb8r9qhaf", - "depends": ["combinat", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress", "combinat"] }, "MCMCtreeR": { "name": "MCMCtreeR", @@ -17885,7 +18113,7 @@ "name": "MCPAN", "version": "1.1-21", "sha256": "0q1m0xg8825q9zjwxcz2h2n0dyr21q5bk29qbqpdhirlwm6f1a51", - "depends": ["magic", "MCMCpack", "multcomp", "mvtnorm", "plyr"] + "depends": ["MCMCpack", "magic", "multcomp", "mvtnorm", "plyr"] }, "MCPMod": { "name": "MCPMod", @@ -17897,7 +18125,7 @@ "name": "MCPModBC", "version": "1.1", "sha256": "0gzcxn3pf86k32ccvbsh4g5awcxcnsr5c48lkyrpqgwr0k3g0sjs", - "depends": ["doParallel", "doRNG", "DoseFinding", "dplyr", "foreach", "nleqslv", "rlang", "survival"] + "depends": ["DoseFinding", "doParallel", "doRNG", "dplyr", "foreach", "nleqslv", "rlang", "survival"] }, "MCPModGeneral": { "name": "MCPModGeneral", @@ -17909,13 +18137,13 @@ "name": "MCPModPack", "version": "0.5", "sha256": "00s5jx0affbphrl61i9x7vpccjbgnwskc4ly7kg7xff58i96fkri", - "depends": ["devEMF", "flextable", "mvtnorm", "officer", "Rcpp", "RcppEigen", "RcppNumerical", "shiny", "shinydashboard"] + "depends": ["Rcpp", "RcppEigen", "RcppNumerical", "devEMF", "flextable", "mvtnorm", "officer", "shiny", "shinydashboard"] }, "MCPtests": { "name": "MCPtests", "version": "1.0.1", "sha256": "1lzlvzw60fb0mllbl0dx8s30zigzbl9shjas629syb9yw55ypxa2", - "depends": ["doParallel", "foreach", "SMR", "writexl", "xtable"] + "depends": ["SMR", "doParallel", "foreach", "writexl", "xtable"] }, "MCS": { "name": "MCS", @@ -17945,13 +18173,13 @@ "name": "MDBED", "version": "1.0.0", "sha256": "1r3sizb2mqd4pqjy25krwmsjfkr6cl7lkd8db5jn3hgxx3qh6sgc", - "depends": ["doParallel", "foreach", "ggplot2", "lattice", "orthopolynom", "psych", "Rdpack"] + "depends": ["Rdpack", "doParallel", "foreach", "ggplot2", "lattice", "orthopolynom", "psych"] }, "MDEI": { "name": "MDEI", "version": "1.0", "sha256": "1bj9cp73lyj2dzcycf5a196a3d8swblhxs4qwsyc7vmy4pwpxq43", - "depends": ["MASS", "ranger", "Rcpp", "RcppArmadillo", "splines2"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "ranger", "splines2"] }, "MDFS": { "name": "MDFS", @@ -17963,19 +18191,19 @@ "name": "MDMA", "version": "1.1.0", "sha256": "0lfn44p18jm6q1ci7m9r79jhfdd3x07489b7nadksn59xsianvaw", - "depends": ["car", "MASS"] + "depends": ["MASS", "car"] }, "MDMAPR": { "name": "MDMAPR", "version": "0.2.3", "sha256": "0w2n6qrjvyzf2wc1yw8a8k027g3y3w2k0z6wkwnj1p8q5zg24c66", - "depends": ["berryFunctions", "bslib", "DBI", "dplyr", "DT", "ggplot2", "htmltools", "htmlwidgets", "leaflet", "leaflet_extras", "plotly", "reactable", "readxl", "RMySQL", "shiny", "shinydashboard", "shinyjs", "shinyWidgets", "writexl", "xfun"] + "depends": ["DBI", "DT", "RMySQL", "berryFunctions", "bslib", "dplyr", "ggplot2", "htmltools", "htmlwidgets", "leaflet", "leaflet_extras", "plotly", "reactable", "readxl", "shiny", "shinyWidgets", "shinydashboard", "shinyjs", "writexl", "xfun"] }, "MDMR": { "name": "MDMR", "version": "0.5.1", "sha256": "1pv57xl7pjsqxz1j8mnfmjaa36mlr749yb4c44ppdrx6khvw662x", - "depends": ["car", "CompQuadForm", "lme4"] + "depends": ["CompQuadForm", "car", "lme4"] }, "MDOLS": { "name": "MDOLS", @@ -17987,7 +18215,7 @@ "name": "MDPtoolbox", "version": "4.0.3", "sha256": "0aaw787fvcyhw6mbl42icgqfdzvfr618vg179984xqifafr40dyc", - "depends": ["linprog", "Matrix"] + "depends": ["Matrix", "linprog"] }, "MDSMap": { "name": "MDSMap", @@ -17999,7 +18227,7 @@ "name": "MDSPCAShiny", "version": "0.1.0", "sha256": "0qsjx4v9j5p5a7h1g0xk4j5ib1mdrjsy84bglnjdxr9rpqg2m7n5", - "depends": ["dplyr", "MASS", "psych", "rmarkdown", "shiny"] + "depends": ["MASS", "dplyr", "psych", "rmarkdown", "shiny"] }, "MDSS": { "name": "MDSS", @@ -18017,7 +18245,7 @@ "name": "MDplot", "version": "1.0.1", "sha256": "1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9", - "depends": ["gplots", "gtools", "MASS", "RColorBrewer"] + "depends": ["MASS", "RColorBrewer", "gplots", "gtools"] }, "MED": { "name": "MED", @@ -18029,7 +18257,7 @@ "name": "MEDseq", "version": "1.4.1", "sha256": "1w4jgy3fxwmk87r8kc4a6rx20salsk06qxxgx2jd3d22rvrj8crd", - "depends": ["cluster", "matrixStats", "nnet", "seriation", "stringdist", "TraMineR", "WeightedCluster"] + "depends": ["TraMineR", "WeightedCluster", "cluster", "matrixStats", "nnet", "seriation", "stringdist"] }, "MEFM": { "name": "MEFM", @@ -18041,7 +18269,7 @@ "name": "MEGENA", "version": "1.3.7", "sha256": "0cr10pmj1n831scz5kgaq3nkglr3imwgc62cxng2dvdxr9991g21", - "depends": ["BH", "cluster", "doParallel", "foreach", "fpc", "ggplot2", "ggraph", "ggrepel", "igraph", "Matrix", "Rcpp", "reshape"] + "depends": ["BH", "Matrix", "Rcpp", "cluster", "doParallel", "foreach", "fpc", "ggplot2", "ggraph", "ggrepel", "igraph", "reshape"] }, "MEMSS": { "name": "MEMSS", @@ -18065,13 +18293,13 @@ "name": "MESS", "version": "0.5.12", "sha256": "1xyw04glhpgdcc3p96yvm346l62lsq37ml6lv59ap2ksws9pkq21", - "depends": ["clipr", "geeM", "geepack", "ggformula", "ggplot2", "glmnet", "kinship2", "MASS", "Matrix", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "clipr", "geeM", "geepack", "ggformula", "ggplot2", "glmnet", "kinship2", "mvtnorm"] }, "MEclustnet": { "name": "MEclustnet", "version": "1.2.2", "sha256": "0rs58dafxngk2lkq14cy14ayjwgnz1gmi12jmi4z74sdj0b3h0gw", - "depends": ["e1071", "ellipse", "latentnet", "MASS", "mvtnorm", "nnet", "vegan"] + "depends": ["MASS", "e1071", "ellipse", "latentnet", "mvtnorm", "nnet", "vegan"] }, "MF_beta4": { "name": "MF.beta4", @@ -18081,8 +18309,8 @@ }, "MFAg": { "name": "MFAg", - "version": "1.9", - "sha256": "008krza4lhbv641sn0wlf9gl66n8x6c9d8404m76dsgdsr118c1a", + "version": "2.0", + "sha256": "1lciq1drbd2p71k1svn4a4q7p0j3am9nsd4nmvmwikpihyqswgfv", "depends": [] }, "MFDFA": { @@ -18101,13 +18329,13 @@ "name": "MFPCA", "version": "1.3-10", "sha256": "0qpmy9cxskz4ii3qa5kvrdka4gbvlnch2blis6jjr4vic86a5mgi", - "depends": ["abind", "foreach", "funData", "irlba", "Matrix", "mgcv", "plyr"] + "depends": ["Matrix", "abind", "foreach", "funData", "irlba", "mgcv", "plyr"] }, "MFSIS": { "name": "MFSIS", "version": "0.2.1", "sha256": "02bwnsyy5jrjmh50rd2cql8k9djkw6r0vi9rakfp86n853ir73fj", - "depends": ["Ball", "cli", "crayon", "doParallel", "dr", "foreach", "MASS", "reticulate", "survival"] + "depends": ["Ball", "MASS", "cli", "crayon", "doParallel", "dr", "foreach", "reticulate", "survival"] }, "MFT": { "name": "MFT", @@ -18137,7 +18365,7 @@ "name": "MGDrivE2", "version": "2.1.0", "sha256": "1n7kmn65v6fb372jyqcsqnn01xvwyascqn881avd2iclrajr6h7p", - "depends": ["deSolve", "Matrix", "statmod"] + "depends": ["Matrix", "deSolve", "statmod"] }, "MGL": { "name": "MGL", @@ -18155,7 +18383,7 @@ "name": "MGMM", "version": "1.0.1.1", "sha256": "090qzgy8fdi3asri8kyin52whf3w02yi9713gawbrl8gdiqp4l0b", - "depends": ["cluster", "mvnfast", "plyr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "cluster", "mvnfast", "plyr"] }, "MGMS2": { "name": "MGMS2", @@ -18185,7 +18413,7 @@ "name": "MHD", "version": "0.1.2", "sha256": "0ghl1ah8b1k1czj01dfqms2k2gvzp09mn3qrl8qv3q3mwa8xs4i8", - "depends": ["distory", "manifold", "nloptr", "plyr", "Rcpp"] + "depends": ["Rcpp", "distory", "manifold", "nloptr", "plyr"] }, "MHDA": { "name": "MHDA", @@ -18213,9 +18441,9 @@ }, "MIAmaxent": { "name": "MIAmaxent", - "version": "1.2.0", - "sha256": "0r4q1735f7apfj0jz4f52ra7sisbkkkk2n6i0kii3q64sx2h3xbj", - "depends": ["dplyr", "e1071", "raster", "rlang"] + "version": "1.3.0", + "sha256": "0xnl21d1jybrff711ndij71ihfarjq5lwpw26frfsni2k4wlbwfy", + "depends": ["dplyr", "e1071", "rlang", "terra"] }, "MICsplines": { "name": "MICsplines", @@ -18245,7 +18473,7 @@ "name": "MIIVsem", "version": "0.5.8", "sha256": "1qb1xrxhgj6b0l24spbp80f0rm8v41bqsdachqjhsacq2lgga259", - "depends": ["boot", "car", "lavaan", "Matrix", "numDeriv"] + "depends": ["Matrix", "boot", "car", "lavaan", "numDeriv"] }, "MIMER": { "name": "MIMER", @@ -18257,7 +18485,7 @@ "name": "MIMSunit", "version": "0.11.2", "sha256": "1i0sadm4gh8yynnihhyp0lm37dq7qm7dmkl28jzdb5knls8nhcpz", - "depends": ["caTools", "dplyr", "dygraphs", "ggplot2", "lubridate", "magrittr", "plyr", "R_utils", "RColorBrewer", "readr", "shiny", "signal", "stringr", "tibble", "xts"] + "depends": ["RColorBrewer", "R_utils", "caTools", "dplyr", "dygraphs", "ggplot2", "lubridate", "magrittr", "plyr", "readr", "shiny", "signal", "stringr", "tibble", "xts"] }, "MINTplates": { "name": "MINTplates", @@ -18269,7 +18497,7 @@ "name": "MIRES", "version": "0.1.0", "sha256": "17k6f73qx85klhhn247nr6h7sinpabq9crlc5ag7qm6z7k6mr370", - "depends": ["BH", "cubature", "dirichletprocess", "Formula", "HDInterval", "logspline", "mvtnorm", "nlme", "pracma", "Rcpp", "RcppEigen", "rstan", "rstantools", "StanHeaders", "truncnorm"] + "depends": ["BH", "Formula", "HDInterval", "Rcpp", "RcppEigen", "StanHeaders", "cubature", "dirichletprocess", "logspline", "mvtnorm", "nlme", "pracma", "rstan", "rstantools", "truncnorm"] }, "MIXFIM": { "name": "MIXFIM", @@ -18281,7 +18509,7 @@ "name": "MJMbamlss", "version": "0.1.0", "sha256": "03alz38375lks1597646cp5xcfc9vivz3bbz7gwniljn2vznrcfq", - "depends": ["bamlss", "coda", "fdapace", "foreach", "funData", "gamm4", "Matrix", "MFPCA", "mgcv", "mvtnorm", "Rcpp", "RcppEigen", "refund", "sparseFLMM", "statmod", "zoo"] + "depends": ["MFPCA", "Matrix", "Rcpp", "RcppEigen", "bamlss", "coda", "fdapace", "foreach", "funData", "gamm4", "mgcv", "mvtnorm", "refund", "sparseFLMM", "statmod", "zoo"] }, "MKLE": { "name": "MKLE", @@ -18317,25 +18545,25 @@ "name": "MKinfer", "version": "1.2", "sha256": "10fy49b5bprbc30zrgz1y74pp480x3avrk9pig6mj9gg6fci207p", - "depends": ["arrangements", "boot", "exactRankTests", "ggplot2", "miceadds", "MKdescr", "nlme"] + "depends": ["MKdescr", "arrangements", "boot", "exactRankTests", "ggplot2", "miceadds", "nlme"] }, "MKmisc": { "name": "MKmisc", "version": "1.9", "sha256": "09kdwsfx5w3q88jbnxbaxzbzyx9fhhphqqaxn5qghhh1z2vpmy93", - "depends": ["ggplot2", "limma", "RColorBrewer", "robustbase", "scales"] + "depends": ["RColorBrewer", "ggplot2", "limma", "robustbase", "scales"] }, "MKomics": { "name": "MKomics", "version": "0.7", "sha256": "0ck8i7ip12bb6wilmwhdrbdmf56ymm3rp6973lr1p4bc2m2kvhif", - "depends": ["circlize", "ComplexHeatmap", "limma", "RColorBrewer", "robustbase"] + "depends": ["ComplexHeatmap", "RColorBrewer", "circlize", "limma", "robustbase"] }, "MKpower": { "name": "MKpower", "version": "0.9", "sha256": "1q04cs2qrjivyiig8nz3s8fl9b4g0smj390vb8jy67p9rq4nhjjz", - "depends": ["coin", "ggplot2", "matrixTests", "MKdescr", "MKinfer", "mvtnorm", "qqplotr"] + "depends": ["MKdescr", "MKinfer", "coin", "ggplot2", "matrixTests", "mvtnorm", "qqplotr"] }, "ML_MSBD": { "name": "ML.MSBD", @@ -18353,7 +18581,7 @@ "name": "MLCIRTwithin", "version": "2.1.1", "sha256": "1x0xmka7kkbjnh3yv4zxxyl17cpmf0rb9hxmdl1srb6ijld4np1b", - "depends": ["limSolve", "MASS", "MultiLCIRT"] + "depends": ["MASS", "MultiLCIRT", "limSolve"] }, "MLCM": { "name": "MLCM", @@ -18365,7 +18593,7 @@ "name": "MLCOPULA", "version": "1.0.0", "sha256": "1addgypksr3hrhzrj9ypaa2w7vgscrqlrfkgx7n0rc7drm827wix", - "depends": ["copula", "GRIDCOPULA", "igraph", "kde1d", "pracma", "TSP"] + "depends": ["GRIDCOPULA", "TSP", "copula", "igraph", "kde1d", "pracma"] }, "MLDS": { "name": "MLDS", @@ -18377,13 +18605,19 @@ "name": "MLDataR", "version": "1.0.1", "sha256": "0sbm79hpgxiqnqjyr5n88rhs29lkp17czz9jmhd2d5x97ncpqw9f", - "depends": ["caret", "ConfusionTableR", "dplyr", "ggplot2", "OddsPlotty", "parsnip", "ranger", "recipes", "rsample", "varhandle", "workflows"] + "depends": ["ConfusionTableR", "OddsPlotty", "caret", "dplyr", "ggplot2", "parsnip", "ranger", "recipes", "rsample", "varhandle", "workflows"] + }, + "MLE": { + "name": "MLE", + "version": "1.0", + "sha256": "0z5ny5lcng03rrpd6mjynxgvi3rx6pc6cm6kpv2dn89lzysv3r4r", + "depends": ["BGFD", "Compositional", "Directional", "MN", "Rfast", "Rfast2", "bivpois", "geppe", "gp", "skellam"] }, "MLEce": { "name": "MLEce", "version": "2.1.0", "sha256": "190i2if8hgwqlznhls780vpkwprfmnsr9jm6zdsa8av0gh6kldzh", - "depends": ["ggplot2", "LaplacesDemon", "mvtnorm", "nleqslv", "reshape", "sirt"] + "depends": ["LaplacesDemon", "ggplot2", "mvtnorm", "nleqslv", "reshape", "sirt"] }, "MLEcens": { "name": "MLEcens", @@ -18401,7 +18635,7 @@ "name": "MLGL", "version": "1.0.0", "sha256": "1vn9r867mj6g407ca2ncd1f2c3x83jcdllyxfalm3962xgwrg08m", - "depends": ["FactoMineR", "fastcluster", "gglasso", "MASS", "Matrix", "parallelDist"] + "depends": ["FactoMineR", "MASS", "Matrix", "fastcluster", "gglasso", "parallelDist"] }, "MLGdata": { "name": "MLGdata", @@ -18425,7 +18659,7 @@ "name": "MLMOI", "version": "0.1.2", "sha256": "1j85syszcsv0v30dvsq5rsdkaz1yj71hsrk53cw5k3m89229wzk1", - "depends": ["openxlsx", "Rdpack", "Rmpfr"] + "depends": ["Rdpack", "Rmpfr", "openxlsx"] }, "MLModelSelection": { "name": "MLModelSelection", @@ -18437,7 +18671,7 @@ "name": "MLMusingR", "version": "0.3.2", "sha256": "0ra3r9qrjv6pl36c0imvwzkkm12jk0xpm60n08siys3pj57ljh8z", - "depends": ["broom", "dplyr", "generics", "lme4", "magrittr", "Matrix", "nlme", "performance", "tibble"] + "depends": ["Matrix", "broom", "dplyr", "generics", "lme4", "magrittr", "nlme", "performance", "tibble"] }, "MLPUGS": { "name": "MLPUGS", @@ -18449,13 +18683,13 @@ "name": "MLVSBM", "version": "0.2.4", "sha256": "1jsaas7crdc3df790c279a5qr8iw63whmkijs86s1y6gyz4qk9vf", - "depends": ["ape", "blockmodels", "cluster", "magrittr", "R6"] + "depends": ["R6", "ape", "blockmodels", "cluster", "magrittr"] }, "MLZ": { "name": "MLZ", "version": "0.1.4", "sha256": "0kvwv13gklilpmqrc939lm1npyvmg8hrxy8m8vfpvrc5jgli49mx", - "depends": ["dplyr", "ggplot2", "gplots", "RcppEigen", "reshape2", "TMB"] + "depends": ["RcppEigen", "TMB", "dplyr", "ggplot2", "gplots", "reshape2"] }, "MLeval": { "name": "MLeval", @@ -18479,7 +18713,7 @@ "name": "MM", "version": "1.6-8", "sha256": "04fr8vxjc7kgpxrlk7q5ibad00ff8fafl14l36snhbszv0zv4n8k", - "depends": ["abind", "magic", "mathjaxr", "Oarray", "partitions", "quadform"] + "depends": ["Oarray", "abind", "magic", "mathjaxr", "partitions", "quadform"] }, "MM2Sdata": { "name": "MM2Sdata", @@ -18491,7 +18725,7 @@ "name": "MM4LMM", "version": "3.0.2", "sha256": "02a553pncv7q0zczy6rvj4avjpryv01n2mhr9cr0ir7607k1jllx", - "depends": ["corpcor", "dplyr", "MASS", "Matrix", "purrr", "Rcpp", "RcppEigen"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppEigen", "corpcor", "dplyr", "purrr"] }, "MMAC": { "name": "MMAC", @@ -18515,7 +18749,7 @@ "name": "MMDCopula", "version": "0.2.1", "sha256": "10326dnhmscb0dvgyrgz5l1z1wdf9g5xb6s4rlivy7b3zkgq3ii1", - "depends": ["cubature", "pbapply", "randtoolbox", "VineCopula", "wdm"] + "depends": ["VineCopula", "cubature", "pbapply", "randtoolbox", "wdm"] }, "MMDai": { "name": "MMDai", @@ -18527,13 +18761,13 @@ "name": "MMDvariance", "version": "0.0.9", "sha256": "1yiqabifym7gdknqrhfnql6qc8p163npzrrckbyqjry3yvkqr5wi", - "depends": ["Biobase", "lawstat", "MASS"] + "depends": ["Biobase", "MASS", "lawstat"] }, "MMINP": { "name": "MMINP", "version": "0.1.0", "sha256": "0qf5b59b878k7kf5iz6zxg1291pbbq8a1jrsax5bxfrdpq7ili0l", - "depends": ["magrittr", "OmicsPLS"] + "depends": ["OmicsPLS", "magrittr"] }, "MMLR": { "name": "MMLR", @@ -18545,7 +18779,7 @@ "name": "MMOC", "version": "0.1.1.0", "sha256": "1vk2rrngv891g8gcqqn8yyca8rkqfz786amx6g900ph410smyy1s", - "depends": ["igraph", "MASS", "Spectrum"] + "depends": ["MASS", "Spectrum", "igraph"] }, "MMRcaseselection": { "name": "MMRcaseselection", @@ -18557,7 +18791,7 @@ "name": "MMVBVS", "version": "0.8.0", "sha256": "08nkhrf62yywpm0nw22pqzlcm72sf4zq44640a7pf57bbzm38ccy", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "reshape", "reshape2", "rlang"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "reshape", "reshape2", "rlang"] }, "MMWRweek": { "name": "MMWRweek", @@ -18569,7 +18803,7 @@ "name": "MMeM", "version": "0.1.1", "sha256": "1cig085h2jvrpb904wglwvhvds3sn58wpbl081wcwvzipfa8y37s", - "depends": ["jointDiag", "lme4", "MASS", "Matrix", "matrixcalc", "psych", "stringr"] + "depends": ["MASS", "Matrix", "jointDiag", "lme4", "matrixcalc", "psych", "stringr"] }, "MN": { "name": "MN", @@ -18605,19 +18839,19 @@ "name": "MNM", "version": "1.0-4", "sha256": "1s5fn1h10swl003pq0sb08i38zh951n4hpw2szf8akw1lawrzxak", - "depends": ["ellipse", "ICS", "ICSNP", "SpatialNP"] + "depends": ["ICS", "ICSNP", "SpatialNP", "ellipse"] }, "MNP": { "name": "MNP", - "version": "3.1-4", - "sha256": "1mxfw9b3cxs5bjnzdwc7da8fn00iwf9brzdl938d47pdi074a4s9", + "version": "3.1-5", + "sha256": "1rvkhx90hac6spcgzmrs62wvcci08accjlngw9jj4snawc7zyxvs", "depends": [] }, "MNS": { "name": "MNS", "version": "1.0", "sha256": "0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb", - "depends": ["doParallel", "glmnet", "igraph", "MASS", "mvtnorm"] + "depends": ["MASS", "doParallel", "glmnet", "igraph", "mvtnorm"] }, "MOCCA": { "name": "MOCCA", @@ -18629,7 +18863,7 @@ "name": "MOCHA", "version": "1.1.0", "sha256": "1v0pvpzc635bz63ywzpb39h7f6qrk3yvxf21i13y5abhmyjppdmi", - "depends": ["AnnotationDbi", "assertthat", "BiocGenerics", "BSgenome", "data_table", "dplyr", "ensembldb", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggbio", "ggplot2", "ggrepel", "ggridges", "IRanges", "lifecycle", "magrittr", "matrixStats", "MultiAssayExperiment", "pbapply", "plyranges", "qvalue", "RaggedExperiment", "rlang", "S4Vectors", "scales", "stringr", "SummarizedExperiment", "tidyr", "tidyselect", "wCorr"] + "depends": ["AnnotationDbi", "BSgenome", "BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "MultiAssayExperiment", "RaggedExperiment", "S4Vectors", "SummarizedExperiment", "assertthat", "data_table", "dplyr", "ensembldb", "ggbio", "ggplot2", "ggrepel", "ggridges", "lifecycle", "magrittr", "matrixStats", "pbapply", "plyranges", "qvalue", "rlang", "scales", "stringr", "tidyr", "tidyselect", "wCorr"] }, "MODISTools": { "name": "MODISTools", @@ -18641,7 +18875,7 @@ "name": "MOEADr", "version": "1.1.3", "sha256": "19x7km2bpq0srm2lyafg3jcc4khwv077kjsqhhbgkv7r4c7xl6id", - "depends": ["assertthat", "FNN"] + "depends": ["FNN", "assertthat"] }, "MOFAT": { "name": "MOFAT", @@ -18665,7 +18899,7 @@ "name": "MOSS", "version": "0.2.2", "sha256": "0gjsyv74hhjknlnplc8157mmypnfy1yjrs400pz0p4744k5c8c7s", - "depends": ["cluster", "dbscan", "Rtsne"] + "depends": ["Rtsne", "cluster", "dbscan"] }, "MOST": { "name": "MOST", @@ -18677,7 +18911,7 @@ "name": "MOTE", "version": "1.0.2", "sha256": "17y2l2rmw7fhvknyh5z09i7hd8nhamx12g00rcymp75gqkz9lzc7", - "depends": ["ez", "MBESS", "reshape"] + "depends": ["MBESS", "ez", "reshape"] }, "MPBoost": { "name": "MPBoost", @@ -18691,12 +18925,6 @@ "sha256": "1l55q09lliv0y4q1hc0jgzls47wkmsfag6b4iq5y6wrllr5wq7sa", "depends": [] }, - "MPCR": { - "name": "MPCR", - "version": "1.1.2", - "sha256": "0hq6df8rz7hi1s4kpcxlx21kppn70fjki8wfy6gi8kna8bmayyf7", - "depends": ["Rcpp"] - }, "MPDiR": { "name": "MPDiR", "version": "0.2", @@ -18731,24 +18959,24 @@ "name": "MPSEM", "version": "0.4-1", "sha256": "0cq7vyyif7gxywrj420msscjf1aq427g88x8yvxf3a5a6mqapkr8", - "depends": ["ape", "MASS"] + "depends": ["MASS", "ape"] }, "MPTinR": { "name": "MPTinR", "version": "1.14.1", "sha256": "0jywv5kim3vdfq0dfaxjksq8l2i6ny45rn5ibmb7ximwfjm3syp0", - "depends": ["Brobdingnag", "numDeriv", "Rcpp", "RcppEigen"] + "depends": ["Brobdingnag", "Rcpp", "RcppEigen", "numDeriv"] }, "MPTmultiverse": { "name": "MPTmultiverse", "version": "0.4-2", "sha256": "0fjfj8jk0dk1s3jc9rl9kza6gm5pm6dgsqyk0aq7pir2hrsr3qwy", - "depends": ["coda", "dplyr", "ggplot2", "limSolve", "magrittr", "MPTinR", "purrr", "readr", "reshape2", "rlang", "runjags", "tibble", "tidyr", "TreeBUGS"] + "depends": ["MPTinR", "TreeBUGS", "coda", "dplyr", "ggplot2", "limSolve", "magrittr", "purrr", "readr", "reshape2", "rlang", "runjags", "tibble", "tidyr"] }, "MPV": { "name": "MPV", - "version": "1.63", - "sha256": "0nylp38fxk3nabg8apcnb1f45q1z8667vswdzds6nzm2v8a94p5j", + "version": "1.64", + "sha256": "0alvs1jm1qqnswhm62a0ky070dskk6syjsa5bkcssg1zin8xcyhv", "depends": ["KernSmooth", "lattice", "randomForest"] }, "MPsychoR": { @@ -18785,7 +19013,7 @@ "name": "MRFcov", "version": "1.0.39", "sha256": "0vgmm9lwkpfahzlhcyaixh2x9d85rrpxipzsc0wy66j43vgn4jhp", - "depends": ["caret", "dplyr", "ggplot2", "glmnet", "gridExtra", "igraph", "magrittr", "MASS", "Matrix", "mgcv", "pbapply", "plyr", "purrr", "reshape2", "sfsmisc"] + "depends": ["MASS", "Matrix", "caret", "dplyr", "ggplot2", "glmnet", "gridExtra", "igraph", "magrittr", "mgcv", "pbapply", "plyr", "purrr", "reshape2", "sfsmisc"] }, "MRHawkes": { "name": "MRHawkes", @@ -18809,7 +19037,7 @@ "name": "MRPC", "version": "3.1.0", "sha256": "1hsrcqp4yygz2psxj9m2n1z7pivdf82b3rnqc34ripyql5apmikn", - "depends": ["bnlearn", "compositions", "dynamicTreeCut", "fastcluster", "GGally", "graph", "gtools", "Hmisc", "mice", "network", "pcalg", "plyr", "psych", "Rgraphviz", "sna", "WGCNA"] + "depends": ["GGally", "Hmisc", "Rgraphviz", "WGCNA", "bnlearn", "compositions", "dynamicTreeCut", "fastcluster", "graph", "gtools", "mice", "network", "pcalg", "plyr", "psych", "sna"] }, "MRQoL": { "name": "MRQoL", @@ -18827,7 +19055,7 @@ "name": "MRS", "version": "1.2.6", "sha256": "0rw3gmjn35118f1v1i8wa56zmz0cz2qbjahic87ylbyamnfsxz3l", - "depends": ["igraph", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "igraph"] }, "MRTAnalysis": { "name": "MRTAnalysis", @@ -18845,7 +19073,7 @@ "name": "MRTSampleSizeBinary", "version": "0.1.2", "sha256": "1kb88sdhb8pp4mmvz8fy08drslzxj58fh1ycqaa3da6j7s9x65bn", - "depends": ["ggplot2", "Matrix"] + "depends": ["Matrix", "ggplot2"] }, "MRZero": { "name": "MRZero", @@ -18857,7 +19085,7 @@ "name": "MRmediation", "version": "1.0.1", "sha256": "0v0kn6x4fwj35imj1fb2f2024ifb7081z4cwlhjmdxhabcy6xbx7", - "depends": ["fda", "MASS"] + "depends": ["MASS", "fda"] }, "MSBStatsData": { "name": "MSBStatsData", @@ -18869,25 +19097,25 @@ "name": "MSCMT", "version": "1.4.0", "sha256": "1mjm85pxxww6m7mfk8xfwhx65c64k4v6pjpvbasv5jhy49kfjgw4", - "depends": ["ggplot2", "lpSolve", "lpSolveAPI", "Rdpack", "Rglpk"] + "depends": ["Rdpack", "Rglpk", "ggplot2", "lpSolve", "lpSolveAPI"] }, "MSCquartets": { "name": "MSCquartets", - "version": "2.0", - "sha256": "0ahmg7f5ikkihpanl0jbxd4sqmw85m88r789z53iqr4rbp23gdb8", - "depends": ["ape", "doParallel", "foreach", "igraph", "phangorn", "Rcpp", "RcppProgress", "Rdpack", "zipfR"] + "version": "2.0.1", + "sha256": "1d1bgvwz88q2sipqzhiybwflixb45nc1fw9isf7xbhq18msr9vmh", + "depends": ["Rcpp", "RcppProgress", "Rdpack", "ape", "doParallel", "foreach", "igraph", "phangorn", "zipfR"] }, "MSCsimtester": { "name": "MSCsimtester", "version": "1.0.0", "sha256": "0k04fdprwa56vm6n372lipybgq1plhmjbxvp58wqmpgzpnhcxkvd", - "depends": ["ape", "kSamples", "Rdpack"] + "depends": ["Rdpack", "ape", "kSamples"] }, "MSEtool": { "name": "MSEtool", "version": "3.7.1", "sha256": "16m8q5h9ciydlg6gqpvwaxam2q7d327v7z40h7cwc0chh43wjysz", - "depends": ["abind", "dplyr", "ggplot2", "ggrepel", "gridExtra", "Rcpp", "RcppArmadillo", "snowfall"] + "depends": ["Rcpp", "RcppArmadillo", "abind", "dplyr", "ggplot2", "ggrepel", "gridExtra", "snowfall"] }, "MSG": { "name": "MSG", @@ -18899,19 +19127,19 @@ "name": "MSGARCH", "version": "2.51", "sha256": "1n8v9017p8iw9mai3yqh294v7kyj458a6vj9ma20gzd94nhyhlxh", - "depends": ["coda", "expm", "fanplot", "MASS", "numDeriv", "Rcpp", "RcppArmadillo", "zoo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "coda", "expm", "fanplot", "numDeriv", "zoo"] }, "MSGARCHelm": { "name": "MSGARCHelm", "version": "0.1.0", "sha256": "172xpvs98b9ay44ffb8bp9k4zsjzhy92pp7bv3d1j186pqhl13ib", - "depends": ["forecast", "MSGARCH", "nnfor"] + "depends": ["MSGARCH", "forecast", "nnfor"] }, "MSML": { "name": "MSML", "version": "1.0.0.1", "sha256": "0nzn3zys6cbqvzjncdgvlxw00zvg7c2wcnf59yky66chz42c31wd", - "depends": ["r2redux", "R2ROC"] + "depends": ["R2ROC", "r2redux"] }, "MSMwRA": { "name": "MSMwRA", @@ -18947,7 +19175,7 @@ "name": "MSTest", "version": "0.1.2", "sha256": "0ad28aj9pmy9vn6z9fhzvap4cbxafbk09amhgp178hvw9rdp48zf", - "depends": ["foreach", "GA", "GenSA", "nloptr", "numDeriv", "pracma", "pso", "Rcpp", "RcppArmadillo", "rlang"] + "depends": ["GA", "GenSA", "Rcpp", "RcppArmadillo", "foreach", "nloptr", "numDeriv", "pracma", "pso", "rlang"] }, "MSbox": { "name": "MSbox", @@ -18959,13 +19187,13 @@ "name": "MSclassifR", "version": "0.3.3", "sha256": "1qn79awr6yiywiz9k1wx6bqml1ssjijg1k2rm4blvlbd26yk5lbr", - "depends": ["car", "caret", "cp4p", "dplyr", "e1071", "fuzzyjoin", "ggplot2", "glmnet", "limma", "MALDIquant", "MALDIquantForeign", "MALDIrppa", "mclust", "metap", "mixOmics", "mltools", "nnet", "performanceEstimation", "randomForest", "reshape2", "statmod", "UBL", "vita", "VSURF", "xgboost"] + "depends": ["MALDIquant", "MALDIquantForeign", "MALDIrppa", "UBL", "VSURF", "car", "caret", "cp4p", "dplyr", "e1071", "fuzzyjoin", "ggplot2", "glmnet", "limma", "mclust", "metap", "mixOmics", "mltools", "nnet", "performanceEstimation", "randomForest", "reshape2", "statmod", "vita", "xgboost"] }, "MSclust": { "name": "MSclust", "version": "1.0.4", "sha256": "1ra9y9njcz21s2p63gisi3vgjjqzdnn9vvp0qfszkvpm0kkl0487", - "depends": ["cluster", "GGally", "ggplot2", "gtools", "Matrix", "mclust", "mnormt", "mvtnorm", "psych"] + "depends": ["GGally", "Matrix", "cluster", "ggplot2", "gtools", "mclust", "mnormt", "mvtnorm", "psych"] }, "MScombine": { "name": "MScombine", @@ -18977,19 +19205,19 @@ "name": "MSiP", "version": "1.3.7", "sha256": "1n8yl5icd3qkpmx2knxsp4g6jvkbg6hl82jxg9apxkx4nmsvkawz", - "depends": ["caret", "dplyr", "e1071", "magrittr", "mice", "plyr", "pROC", "PRROC", "ranger", "tibble", "tidyr"] + "depends": ["PRROC", "caret", "dplyr", "e1071", "magrittr", "mice", "pROC", "plyr", "ranger", "tibble", "tidyr"] }, "MSigSeg": { "name": "MSigSeg", "version": "0.2.0", "sha256": "0675nkv5lqw3y19i6bcqhc1jc9qjmyf0x01224d098kfwl74lxiw", - "depends": ["ggplot2", "ggpubr", "MASS"] + "depends": ["MASS", "ggplot2", "ggpubr"] }, "MSmix": { "name": "MSmix", "version": "1.0.2", "sha256": "10bdzgx21y8xqggj98lv17mb2dv39ay6k0l5mz3dsn44967mv7rm", - "depends": ["BayesMallows", "bmixture", "data_table", "dplyr", "factoextra", "fields", "foreach", "ggbump", "ggplot2", "gmp", "gridExtra", "magrittr", "Rankcluster", "RColorBrewer", "Rcpp", "reshape", "rlang", "scales", "spsUtil"] + "depends": ["BayesMallows", "RColorBrewer", "Rankcluster", "Rcpp", "bmixture", "data_table", "dplyr", "factoextra", "fields", "foreach", "ggbump", "ggplot2", "gmp", "gridExtra", "magrittr", "reshape", "rlang", "scales", "spsUtil"] }, "MSoutcomes": { "name": "MSoutcomes", @@ -19043,13 +19271,13 @@ "name": "MTPS", "version": "1.0.2", "sha256": "0bv81vwswhrs0p3mvsiv5njyq1j5p16y14m3sysnyg8rr98gqy38", - "depends": ["class", "e1071", "glmnet", "MASS", "rpart"] + "depends": ["MASS", "class", "e1071", "glmnet", "rpart"] }, "MTS": { "name": "MTS", "version": "1.2.1", "sha256": "0nc1g5dbg42j0h5xg9psg5kqldp5w87in8ggzliixpsz3cilvry3", - "depends": ["fBasics", "fGarch", "mvtnorm", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "fBasics", "fGarch", "mvtnorm"] }, "MTSYS": { "name": "MTSYS", @@ -19097,7 +19325,7 @@ "name": "MVN", "version": "5.9", "sha256": "014s07nxq014j5hkbd6iwwqykcw8si5sah57gi3n0wb51sv8ip1k", - "depends": ["boot", "car", "energy", "MASS", "moments", "nortest", "plyr", "psych"] + "depends": ["MASS", "boot", "car", "energy", "moments", "nortest", "plyr", "psych"] }, "MVNBayesian": { "name": "MVNBayesian", @@ -19109,13 +19337,13 @@ "name": "MVNtestchar", "version": "1.1.3", "sha256": "0w5008zknrl5r7l4dmj2fbm7vvg2f1wynzf38kabns4j7hb1nmxw", - "depends": ["ggplot2", "Hmisc", "knitr"] + "depends": ["Hmisc", "ggplot2", "knitr"] }, "MVPBT": { "name": "MVPBT", "version": "1.2-1", "sha256": "19i8sgmdndvxiars2za605f3lcxw7cy2ff22n2llkpl5196r3mzl", - "depends": ["mada", "MASS", "metafor", "mvmeta"] + "depends": ["MASS", "mada", "metafor", "mvmeta"] }, "MVQuickGraphs": { "name": "MVQuickGraphs", @@ -19143,14 +19371,14 @@ }, "MVar": { "name": "MVar", - "version": "2.2.1", - "sha256": "0jmbgiw1mvdlkc41mxxk4cjknwh161ahai4gdavdcx66x87l754y", + "version": "2.2.2", + "sha256": "1d1gh8wxwy3pddamhfgiy1l89swi8i9mi5i782cwd3gi2q6w6jf3", "depends": ["MASS"] }, "MVar_pt": { "name": "MVar.pt", - "version": "2.2.1", - "sha256": "00p6n91d28bibf24j3rkql1hp85dy9qag9spi98m6a2v5isp10p3", + "version": "2.2.2", + "sha256": "0095jhb5zfl4nix9n26mb1xdrc4fgi8mvn1l3z4m90mzrk39vsk2", "depends": ["MASS"] }, "MVisAGe": { @@ -19169,25 +19397,25 @@ "name": "MXM", "version": "1.5.5", "sha256": "15r4jnf1l2nrf67xkpvzg2h7yxxhjlkr454n691ssss9z0zpsgcl", - "depends": ["bigmemory", "coxme", "doParallel", "dplyr", "energy", "foreach", "geepack", "Hmisc", "knitr", "lme4", "MASS", "nnet", "ordinal", "quantreg", "relations", "Rfast", "Rfast2", "survival", "visNetwork"] + "depends": ["Hmisc", "MASS", "Rfast", "Rfast2", "bigmemory", "coxme", "doParallel", "dplyr", "energy", "foreach", "geepack", "knitr", "lme4", "nnet", "ordinal", "quantreg", "relations", "survival", "visNetwork"] }, "MaOEA": { "name": "MaOEA", "version": "0.6.2", "sha256": "0s8jvp7821mb6xff8xwnh78mhz4qfrbk4g7sp4dfnm2ii7ah9c6b", - "depends": ["e1071", "gtools", "lhs", "MASS", "nnet", "nsga2R", "pracma", "randtoolbox", "reticulate", "stringr"] + "depends": ["MASS", "e1071", "gtools", "lhs", "nnet", "nsga2R", "pracma", "randtoolbox", "reticulate", "stringr"] }, "MacBehaviour": { "name": "MacBehaviour", - "version": "1.2.2", - "sha256": "0z4d1g4b3fv63r1c4b64aj0lg0dyzyhvjgmj59gpcizl65jg6dw6", - "depends": ["httr", "openxlsx", "rjson"] + "version": "1.2.4", + "sha256": "16jcksyy8wira7i5gpl27fmbq3wzfsyp4v4xqq7r78qi2rv16wgg", + "depends": ["dplyr", "httr", "openxlsx", "rjson"] }, "MachineShop": { "name": "MachineShop", "version": "3.7.0", "sha256": "073v778c7zkpxhhdvqc4hiqlgj5ws9490cqpz22bk659f8f63bav", - "depends": ["abind", "cli", "dials", "foreach", "ggplot2", "kernlab", "magrittr", "Matrix", "nnet", "party", "polspline", "progress", "recipes", "rlang", "rsample", "Rsolnp", "survival", "tibble"] + "depends": ["Matrix", "Rsolnp", "abind", "cli", "dials", "foreach", "ggplot2", "kernlab", "magrittr", "nnet", "party", "polspline", "progress", "recipes", "rlang", "rsample", "survival", "tibble"] }, "MacroZooBenthosWaterA": { "name": "MacroZooBenthosWaterA", @@ -19199,13 +19427,13 @@ "name": "MadanText", "version": "0.1.0", "sha256": "1sz3mwb74yvj5ijmpm7zdwsgyvhs6rs8fpy1mpw538r5jx4xbzg8", - "depends": ["dplyr", "hwordcloud", "lattice", "PersianStemmer", "shiny", "shinythemes", "stopwords", "stringi", "stringr", "textmineR", "tidyr", "tidytext", "tm", "topicmodels", "udpipe", "xlsx"] + "depends": ["PersianStemmer", "dplyr", "hwordcloud", "lattice", "shiny", "shinythemes", "stopwords", "stringi", "stringr", "textmineR", "tidyr", "tidytext", "tm", "topicmodels", "udpipe", "xlsx"] }, "MadanTextNetwork": { "name": "MadanTextNetwork", "version": "0.1.0", "sha256": "0691pwsgbmy2fmvcf6adqgasrdf70n5g0cgy6663wfavkdx5nni2", - "depends": ["dplyr", "glue", "hwordcloud", "igraph", "lattice", "ngram", "PersianStemmer", "shiny", "shinythemes", "stopwords", "stringi", "stringr", "textmineR", "tidyr", "tidytext", "tm", "topicmodels", "udpipe", "visNetwork", "xlsx"] + "depends": ["PersianStemmer", "dplyr", "glue", "hwordcloud", "igraph", "lattice", "ngram", "shiny", "shinythemes", "stopwords", "stringi", "stringr", "textmineR", "tidyr", "tidytext", "tm", "topicmodels", "udpipe", "visNetwork", "xlsx"] }, "Maeswrap": { "name": "Maeswrap", @@ -19215,15 +19443,15 @@ }, "MagmaClustR": { "name": "MagmaClustR", - "version": "1.2.0", - "sha256": "1hbdppqymi4qsacp0f1lpq3042zs5gbpdshmmg3mb2v26badss4h", - "depends": ["broom", "dplyr", "ggplot2", "magrittr", "mvtnorm", "plyr", "purrr", "Rcpp", "rlang", "tibble", "tidyr", "tidyselect"] + "version": "1.2.1", + "sha256": "0gwfb5p5garycnvqsd4l80yqna7y09xs9ffgr2ah6150s9w3r0q0", + "depends": ["Rcpp", "broom", "dplyr", "ggplot2", "magrittr", "mvtnorm", "plyr", "purrr", "rlang", "tibble", "tidyr", "tidyselect"] }, "MainExistingDatasets": { "name": "MainExistingDatasets", "version": "1.0.2", "sha256": "16g741hzckla6amhwa54bhg3l3700sp43p6mijbb5065qnviw5y9", - "depends": ["config", "dplyr", "DT", "glue", "golem", "htmltools", "htmlwidgets", "magrittr", "openxlsx", "pkgload", "processx", "rlang", "sf", "shiny", "spData", "tidyr", "tmap", "tmaptools"] + "depends": ["DT", "config", "dplyr", "glue", "golem", "htmltools", "htmlwidgets", "magrittr", "openxlsx", "pkgload", "processx", "rlang", "sf", "shiny", "spData", "tidyr", "tmap", "tmaptools"] }, "MajKMeans": { "name": "MajKMeans", @@ -19247,7 +19475,7 @@ "name": "ManagedCloudProvider", "version": "1.0.0", "sha256": "0glhx9ylpx2s8mi711gblapw6qnv80nd4wahph65g6ddngvmgv73", - "depends": ["adagio", "DockerParallel", "jsonlite"] + "depends": ["DockerParallel", "adagio", "jsonlite"] }, "MandalaR": { "name": "MandalaR", @@ -19273,12 +19501,6 @@ "sha256": "10knb2gzzsq5dkm7h70qvcw2cx7m7ra00vlkqbs36y6vw2gcjwmn", "depends": [] }, - "MantaID": { - "name": "MantaID", - "version": "1.0.2", - "sha256": "01rc9p4ydq7s2iwqc017ijdbw8w8n0s82f0j69gsl6m5fbqm9a4k", - "depends": ["biomaRt", "caret", "data_table", "dplyr", "ggcorrplot", "ggplot2", "keras", "magrittr", "mlr3", "mlr3tuning", "paradox", "purrr", "RColorBrewer", "reshape2", "scutr", "stringr", "tibble", "tidyr", "tidyselect"] - }, "ManyTests": { "name": "ManyTests", "version": "1.2", @@ -19295,7 +19517,7 @@ "name": "MapGAM", "version": "1.3", "sha256": "09y06fzw8ari3c06fiz8cl067c9frvfnc0zi484brb9nqlaq24rw", - "depends": ["colorspace", "gam", "PBSmapping", "sf", "sp", "survival"] + "depends": ["PBSmapping", "colorspace", "gam", "sf", "sp", "survival"] }, "Mapinguari": { "name": "Mapinguari", @@ -19307,7 +19529,7 @@ "name": "MarZIC", "version": "1.0.0", "sha256": "16f09s5f95jsafd3s8w01vc9i98nlwm3abrwfdhymaallq4kcban", - "depends": ["betareg", "dirmult", "doParallel", "foreach", "mathjaxr", "NlcOptim", "pracma", "Rcpp", "RcppArmadillo"] + "depends": ["NlcOptim", "Rcpp", "RcppArmadillo", "betareg", "dirmult", "doParallel", "foreach", "mathjaxr", "pracma"] }, "MareyMap": { "name": "MareyMap", @@ -19319,7 +19541,7 @@ "name": "MargCond", "version": "1.0.0", "sha256": "07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8", - "depends": ["gee", "lme4", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "gee", "lme4"] }, "MarginalMediation": { "name": "MarginalMediation", @@ -19331,7 +19553,7 @@ "name": "MarketMatching", "version": "1.2.1", "sha256": "0ggs8b4zi1q0sqicjp8dzhhbwmdfypbmadajw6wjq0vi1ilylfb0", - "depends": ["Boom", "bsts", "CausalImpact", "doParallel", "dplyr", "dtw", "foreach", "ggplot2", "iterators", "reshape2", "scales", "tidyr", "utf8", "zoo"] + "depends": ["Boom", "CausalImpact", "bsts", "doParallel", "dplyr", "dtw", "foreach", "ggplot2", "iterators", "reshape2", "scales", "tidyr", "utf8", "zoo"] }, "Markovchart": { "name": "Markovchart", @@ -19349,7 +19571,7 @@ "name": "MassWateR", "version": "2.1.4", "sha256": "0hfjddm19r53hig48sfxkkjqib4ip651q2asfgp3639w4akn8pzx", - "depends": ["curl", "dplyr", "flextable", "ggplot2", "ggrepel", "ggspatial", "httr", "lubridate", "prettymapr", "raster", "RColorBrewer", "readxl", "rmarkdown", "sf", "tibble", "tidyr", "units", "writexl"] + "depends": ["RColorBrewer", "curl", "dplyr", "flextable", "ggplot2", "ggrepel", "ggspatial", "httr", "lubridate", "prettymapr", "raster", "readxl", "rmarkdown", "sf", "tibble", "tidyr", "units", "writexl"] }, "Massign": { "name": "Massign", @@ -19373,7 +19595,7 @@ "name": "MatchIt", "version": "4.5.5", "sha256": "17l5b6i4bmg3gjjhzagy451zcv2i5xj4j6zzxgiqf955sgywlfdf", - "depends": ["backports", "chk", "Rcpp", "RcppProgress", "rlang"] + "depends": ["Rcpp", "RcppProgress", "backports", "chk", "rlang"] }, "MatchLinReg": { "name": "MatchLinReg", @@ -19385,7 +19607,7 @@ "name": "MatchThem", "version": "1.2.1", "sha256": "12kaaji3nhqggdfhb3hkydsg66p9qpxh95g5z5sf4wym9ks0qhi3", - "depends": ["MatchIt", "mice", "rlang", "survey", "WeightIt"] + "depends": ["MatchIt", "WeightIt", "mice", "rlang", "survey"] }, "Matching": { "name": "Matching", @@ -19403,7 +19625,7 @@ "name": "MatrixCorrelation", "version": "0.10.0", "sha256": "1na3y1crlj57c1xq9ja3v94cx2dr0myrlx9bxvhhwss3q3r1lgby", - "depends": ["plotrix", "pracma", "progress", "Rcpp", "RcppArmadillo", "RSpectra"] + "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "plotrix", "pracma", "progress"] }, "MatrixEQTL": { "name": "MatrixEQTL", @@ -19415,13 +19637,13 @@ "name": "MatrixExtra", "version": "0.1.15", "sha256": "0mp0si5923kfakwxcc08288zyx1nrrrpn9srcwax28vrz46l33z9", - "depends": ["float", "Matrix", "Rcpp", "RhpcBLASctl"] + "depends": ["Matrix", "Rcpp", "RhpcBLASctl", "float"] }, "MatrixLDA": { "name": "MatrixLDA", "version": "0.2", "sha256": "0fixq35gp0fzmin75sfld2ln0zvnjgzrhk3b5yi7wdqzp99200yy", - "depends": ["glasso", "plyr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "glasso", "plyr"] }, "MatrixMixtures": { "name": "MatrixMixtures", @@ -19457,7 +19679,7 @@ "name": "MaximinInfer", "version": "2.0.0", "sha256": "0l4sglb3f7f1na6dbb4rd73sb4kqzlz78sj09f84rbqghjrzbxl0", - "depends": ["CVXR", "glmnet", "intervals", "MASS", "SIHR"] + "depends": ["CVXR", "MASS", "SIHR", "glmnet", "intervals"] }, "MazamaCoreUtils": { "name": "MazamaCoreUtils", @@ -19469,7 +19691,7 @@ "name": "MazamaLocationUtils", "version": "0.4.3", "sha256": "0adzwzykp410d63dxn3izkf7nmpvlxabzzw80d0205gbs3624yrd", - "depends": ["cluster", "dplyr", "geodist", "httr", "jsonlite", "leaflet", "lubridate", "magrittr", "MazamaCoreUtils", "MazamaSpatialUtils", "readr", "rlang", "stringr", "tidygeocoder"] + "depends": ["MazamaCoreUtils", "MazamaSpatialUtils", "cluster", "dplyr", "geodist", "httr", "jsonlite", "leaflet", "lubridate", "magrittr", "readr", "rlang", "stringr", "tidygeocoder"] }, "MazamaRollUtils": { "name": "MazamaRollUtils", @@ -19481,19 +19703,19 @@ "name": "MazamaSpatialPlots", "version": "0.2.0", "sha256": "1i8gqywl2w7zjl1m5qw8vmy7wn44cp8fkiw4m2iwvf4s9q43xjnc", - "depends": ["dplyr", "magrittr", "MazamaCoreUtils", "MazamaSpatialUtils", "rlang", "sf", "tmap"] + "depends": ["MazamaCoreUtils", "MazamaSpatialUtils", "dplyr", "magrittr", "rlang", "sf", "tmap"] }, "MazamaSpatialUtils": { "name": "MazamaSpatialUtils", "version": "0.8.6", "sha256": "18dpnal2rkj2lkrlnr6wn4rc4n2xb7w6g6kywppc9d1qd29b0njk", - "depends": ["countrycode", "dplyr", "magrittr", "MazamaCoreUtils", "rlang", "rmapshaper", "sf", "stringr"] + "depends": ["MazamaCoreUtils", "countrycode", "dplyr", "magrittr", "rlang", "rmapshaper", "sf", "stringr"] }, "MazamaTimeSeries": { "name": "MazamaTimeSeries", "version": "0.3.0", "sha256": "10w8nffv9rls32bj3rfa48l6nyly0238ywqbqwfkvr16i7g63dsb", - "depends": ["dplyr", "geodist", "lubridate", "magrittr", "MazamaCoreUtils", "MazamaRollUtils", "rlang", "stringr"] + "depends": ["MazamaCoreUtils", "MazamaRollUtils", "dplyr", "geodist", "lubridate", "magrittr", "rlang", "stringr"] }, "Mcomp": { "name": "Mcomp", @@ -19529,31 +19751,31 @@ "name": "Mediana", "version": "1.0.8", "sha256": "0j1ikc2iaxl70134v0gijj2i2g0xgjafvn8rc108r9fhm8rpw564", - "depends": ["doParallel", "doRNG", "foreach", "MASS", "mvtnorm", "survival"] + "depends": ["MASS", "doParallel", "doRNG", "foreach", "mvtnorm", "survival"] }, "MedianaDesigner": { "name": "MedianaDesigner", "version": "0.13", "sha256": "07vzfm583gqk0ars4gamyn21lpcsdxx86nkp227i9yk7lyj0r6kp", - "depends": ["devEMF", "doParallel", "flextable", "foreach", "lme4", "lmerTest", "MASS", "mvtnorm", "officer", "pbkrtest", "Rcpp", "RcppEigen", "RcppNumerical", "rootSolve", "shiny", "shinydashboard", "shinyMatrix"] + "depends": ["MASS", "Rcpp", "RcppEigen", "RcppNumerical", "devEMF", "doParallel", "flextable", "foreach", "lme4", "lmerTest", "mvtnorm", "officer", "pbkrtest", "rootSolve", "shiny", "shinyMatrix", "shinydashboard"] }, "Mega2R": { "name": "Mega2R", "version": "1.1.0", "sha256": "05g0r7z6kiy0pgl7cbcc3c0wbf4wbc7fxdbha8sc77m3hqya882l", - "depends": ["AnnotationDbi", "DBI", "famSKATRC", "gdsfmt", "GenomeInfoDb", "kinship2", "pedgene", "Rcpp", "RSQLite", "SKAT"] + "depends": ["AnnotationDbi", "DBI", "GenomeInfoDb", "RSQLite", "Rcpp", "SKAT", "famSKATRC", "gdsfmt", "kinship2", "pedgene"] }, "MendelianRandomization": { "name": "MendelianRandomization", "version": "0.10.0", "sha256": "0g71h1hwvm0ldrklvlliq2ylglb1w7zli0x5sh7z4934h8gyjl88", - "depends": ["ggplot2", "glmnet", "iterpc", "knitr", "Matrix", "numDeriv", "plotly", "quantreg", "Rcpp", "RcppArmadillo", "rjson", "rmarkdown", "robustbase"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "ggplot2", "glmnet", "iterpc", "knitr", "numDeriv", "plotly", "quantreg", "rjson", "rmarkdown", "robustbase"] }, "Mercator": { "name": "Mercator", "version": "1.1.4", "sha256": "0wj8bsrj2v4icj0byllaxyqnph3zpx98gvbxhdzy0zamyrfk57ss", - "depends": ["ClassDiscovery", "cluster", "dendextend", "flexmix", "igraph", "KernSmooth", "kohonen", "Polychrome", "Rtsne", "Thresher", "umap"] + "depends": ["ClassDiscovery", "KernSmooth", "Polychrome", "Rtsne", "Thresher", "cluster", "dendextend", "flexmix", "igraph", "kohonen", "umap"] }, "Mestim": { "name": "Mestim", @@ -19565,7 +19787,7 @@ "name": "MetAlyzer", "version": "1.0.0", "sha256": "0b5kznmqq7kda5qan5jyxy5s41y367dmq2fxk7mihjnmn9fp282n", - "depends": ["agricolae", "data_table", "dplyr", "ggplot2", "ggrepel", "openxlsx", "qvalue", "rlang", "S4Vectors", "stringr", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["S4Vectors", "SummarizedExperiment", "agricolae", "data_table", "dplyr", "ggplot2", "ggrepel", "openxlsx", "qvalue", "rlang", "stringr", "tibble", "tidyr"] }, "MetBrewer": { "name": "MetBrewer", @@ -19577,13 +19799,13 @@ "name": "MetChem", "version": "0.4", "sha256": "179634a8chsqfrq44il4dpyxrvadwdn1a7zm2h4ywim63w1dj02b", - "depends": ["fingerprint", "httr", "KODAMA", "rcdk", "XML"] + "depends": ["KODAMA", "XML", "fingerprint", "httr", "rcdk"] }, "MetGen": { "name": "MetGen", "version": "0.5", "sha256": "00yzaicrpwfnxi5mdzwx1ai721vczkkf2yl50q9wwpxhmfx0xbbh", - "depends": ["chron", "glmnet", "MASS"] + "depends": ["MASS", "chron", "glmnet"] }, "MetProc": { "name": "MetProc", @@ -19595,7 +19817,7 @@ "name": "MetSizeR", "version": "2.0.0", "sha256": "0blfdcd8z6qbaz47q08arb94wh3cp689w7vsc3jvn3cqq7r35byl", - "depends": ["dplyr", "ggplot2", "MetabolAnalyze", "Rfast", "shiny", "shinythemes", "vroom"] + "depends": ["MetabolAnalyze", "Rfast", "dplyr", "ggplot2", "shiny", "shinythemes", "vroom"] }, "MetaAnalyser": { "name": "MetaAnalyser", @@ -19617,21 +19839,21 @@ }, "MetaHD": { "name": "MetaHD", - "version": "0.1.0", - "sha256": "0qgzipw3gfhm22x70z83zinp7zr5xbyyw502j6p3r31r4k2glkp9", - "depends": ["corpcor", "Matrix", "matrixcalc", "Rcpp", "RcppArmadillo"] + "version": "0.1.2", + "sha256": "1fciy4zarl9gx1zdvrsgzq8y7jl59z8ljl2s2faqigsyd3nw3mbk", + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "corpcor", "dplyr", "matrixcalc", "metafor", "tidyr"] }, "MetaIntegration": { "name": "MetaIntegration", "version": "0.1.2", "sha256": "0dbmpls6gipd81c79lvxqgyhzl3nmi0ma4szv8fcrh50jbwfvsql", - "depends": ["corpcor", "knitr", "MASS", "Rsolnp"] + "depends": ["MASS", "Rsolnp", "corpcor", "knitr"] }, "MetaIntegrator": { "name": "MetaIntegrator", "version": "2.1.3", "sha256": "1763in7zcfr4abhwc0sy27c1qbzbhkyjsasrhwdjjmsc645sqxlx", - "depends": ["AnnotationDbi", "Biobase", "BiocManager", "boot", "COCONUT", "data_table", "DBI", "dplyr", "DT", "GEOmetadb", "GEOquery", "ggplot2", "ggpubr", "gplots", "HGNChelper", "httpuv", "magrittr", "manhattanly", "Metrics", "multtest", "pheatmap", "plotly", "plyr", "pracma", "preprocessCore", "readr", "reshape2", "rmarkdown", "rmeta", "Rmisc", "RMySQL", "ROCR", "RSQLite", "stringr", "zoo"] + "depends": ["AnnotationDbi", "Biobase", "BiocManager", "COCONUT", "DBI", "DT", "GEOmetadb", "GEOquery", "HGNChelper", "Metrics", "RMySQL", "ROCR", "RSQLite", "Rmisc", "boot", "data_table", "dplyr", "ggplot2", "ggpubr", "gplots", "httpuv", "magrittr", "manhattanly", "multtest", "pheatmap", "plotly", "plyr", "pracma", "preprocessCore", "readr", "reshape2", "rmarkdown", "rmeta", "stringr", "zoo"] }, "MetaLandSim": { "name": "MetaLandSim", @@ -19655,7 +19877,7 @@ "name": "MetaNet", "version": "0.1.2", "sha256": "0r3id0ap91g948a10yka1lz82jib3ww91n24vlk4pbik7flxbqpk", - "depends": ["dplyr", "ggnewscale", "ggplot2", "ggrepel", "igraph", "magrittr", "pcutils", "RColorBrewer", "reshape2", "rlang", "tibble"] + "depends": ["RColorBrewer", "dplyr", "ggnewscale", "ggplot2", "ggrepel", "igraph", "magrittr", "pcutils", "reshape2", "rlang", "tibble"] }, "MetaSKAT": { "name": "MetaSKAT", @@ -19667,7 +19889,7 @@ "name": "MetaStan", "version": "1.0.0", "sha256": "00rj11q20apw7f5s6vw8fh7qxgfksndyiks1w907zzjlxhy9b4pj", - "depends": ["BH", "coda", "forestplot", "HDInterval", "loo", "metafor", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "HDInterval", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "coda", "forestplot", "loo", "metafor", "rstan", "rstantools"] }, "MetaSubtract": { "name": "MetaSubtract", @@ -19697,7 +19919,7 @@ "name": "MetabolicSurv", "version": "1.1.2", "sha256": "1c8i3a3gnbvlkjh0vqmz1igzaf8q87cb55l3kijwi0z23ywrbqch", - "depends": ["dplyr", "ggplot2", "glmnet", "matrixStats", "pls", "Rdpack", "rms", "superpc", "survival", "survminer", "tidyr"] + "depends": ["Rdpack", "dplyr", "ggplot2", "glmnet", "matrixStats", "pls", "rms", "superpc", "survival", "survminer", "tidyr"] }, "MetabolicSyndrome": { "name": "MetabolicSyndrome", @@ -19709,13 +19931,7 @@ "name": "MetabolomicsBasics", "version": "1.4.5", "sha256": "09yfakahah88sqranw56mr56jkqx6bgq52rcaj2bablr7bxswwvh", - "depends": ["C50", "caret", "e1071", "InterpretMSSpectrum", "pcaMethods", "plyr", "rlang", "rpart", "webchem"] - }, - "MetaculR": { - "name": "MetaculR", - "version": "0.4.1", - "sha256": "130ic9q221lmnr5wzmw7bbskqzi5gmw8ark5zpw3y8wy9zbv2m98", - "depends": ["assertthat", "clipr", "cowplot", "dplyr", "ggplot2", "ggrepel", "httr", "jsonlite", "magrittr", "progress", "spatstat_geom", "tidyr", "verification"] + "depends": ["C50", "InterpretMSSpectrum", "caret", "e1071", "pcaMethods", "plyr", "rlang", "rpart", "webchem"] }, "MethComp": { "name": "MethComp", @@ -19725,21 +19941,21 @@ }, "MethEvolSIM": { "name": "MethEvolSIM", - "version": "0.1.2", - "sha256": "03ncpy01dvmxrr43jyl8am9hkzp872rdph5padiy9ih4nzxdncmq", + "version": "0.1.5", + "sha256": "14lnj2jgxi4y5q26bzblc7f0ljlgj8c9gnh32jbyikyych28fb1k", "depends": ["R6"] }, "MethodCompare": { "name": "MethodCompare", - "version": "0.1.2", - "sha256": "1nxr2fgmfixjkdparavi156qqqchjwaxpjk9i2xgc1yhp1p01pll", - "depends": ["nlme"] + "version": "1.0.0", + "sha256": "10i9bxjsd7gdcdmrlyl1qymrhaikcb9jpzqi2hnnwcjaf0p1hfkr", + "depends": ["Matrix", "estimatr", "lme4", "mfp", "rockchalk"] }, "MetricGraph": { "name": "MetricGraph", "version": "1.3.0", "sha256": "1pd10pxqvdvqh1jml6rpn2j5w6j0hw87wd9f272yfwd4q9d2c29r", - "depends": ["broom", "dplyr", "ggnewscale", "ggplot2", "igraph", "lifecycle", "magrittr", "Matrix", "R6", "Rcpp", "RcppEigen", "rSPDE", "sf", "sp", "tidyr", "zoo"] + "depends": ["Matrix", "R6", "Rcpp", "RcppEigen", "broom", "dplyr", "ggnewscale", "ggplot2", "igraph", "lifecycle", "magrittr", "rSPDE", "sf", "sp", "tidyr", "zoo"] }, "Metrics": { "name": "Metrics", @@ -19767,27 +19983,27 @@ }, "Mhorseshoe": { "name": "Mhorseshoe", - "version": "0.1.2", - "sha256": "0ra7mswvqjm8vma4d1r3piz0wpsm1d4qwf39h99migri4mn2080y", + "version": "0.1.3", + "sha256": "064wyih65sqy66v5yr5cvvdm2crgbfkq8pzzcxvbp74vr8gxljdp", "depends": ["Rcpp"] }, "MiDA": { "name": "MiDA", "version": "0.1.2", "sha256": "144gxsxqljzskxsw5k0y69ix0pxlfvyyznxkjpf2ng4l47pg11z5", - "depends": ["caret", "gbm", "genefilter", "limma", "preprocessCore", "pROC", "SQN"] + "depends": ["SQN", "caret", "gbm", "genefilter", "limma", "pROC", "preprocessCore"] }, "MiMIR": { "name": "MiMIR", "version": "1.5", "sha256": "18z825r866yj9jadhdc5rlp8ykxrfbkdz5bpgpazm8r9w1ypk6hx", - "depends": ["caret", "dplyr", "DT", "foreach", "fs", "ggplot2", "heatmaply", "matrixStats", "plotly", "pROC", "purrr", "shiny", "shinycssloaders", "shinydashboard", "shinyFiles", "shinyjs", "shinyWidgets", "survival", "survminer"] + "depends": ["DT", "caret", "dplyr", "foreach", "fs", "ggplot2", "heatmaply", "matrixStats", "pROC", "plotly", "purrr", "shiny", "shinyFiles", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyjs", "survival", "survminer"] }, "MiRKAT": { "name": "MiRKAT", "version": "1.2.3", "sha256": "0y9j2dmw69a1n63mnbz8qg4pk69dzzhg42l3cq9i0s0yg8pp4pj6", - "depends": ["CompQuadForm", "GUniFrac", "lme4", "MASS", "Matrix", "mixtools", "PearsonDS", "permute", "quantreg", "survival"] + "depends": ["CompQuadForm", "GUniFrac", "MASS", "Matrix", "PearsonDS", "lme4", "mixtools", "permute", "quantreg", "survival"] }, "MiRNAQCD": { "name": "MiRNAQCD", @@ -19805,7 +20021,7 @@ "name": "MiSPU", "version": "1.0", "sha256": "1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply", - "depends": ["ape", "aSPU", "cluster", "Rcpp", "RcppArmadillo", "vegan"] + "depends": ["Rcpp", "RcppArmadillo", "aSPU", "ape", "cluster", "vegan"] }, "MicSim": { "name": "MicSim", @@ -19837,11 +20053,17 @@ "sha256": "166ci4crkwnnh05rhs5hyrljgm4cdf7gp0ff8kjxjmd60byw80mz", "depends": ["ggplot2", "reshape2"] }, + "MicroSEC": { + "name": "MicroSEC", + "version": "2.1.3", + "sha256": "1n9j955yy613qhs9zhy2mhy9mg95fp1q8jxxxgsy3n2kjim33pgv", + "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "Rsamtools", "dplyr", "stringr"] + }, "MicrobiomeStat": { "name": "MicrobiomeStat", "version": "1.2", "sha256": "1kpc68sl63k104xy7r6f3gxan0yx0rs7ksn8ldbq8xla00ddflgq", - "depends": ["foreach", "ggplot2", "ggrepel", "lmerTest", "MASS", "Matrix", "matrixStats", "modeest", "statmod"] + "depends": ["MASS", "Matrix", "foreach", "ggplot2", "ggrepel", "lmerTest", "matrixStats", "modeest", "statmod"] }, "MicrobiomeSurv": { "name": "MicrobiomeSurv", @@ -19853,13 +20075,13 @@ "name": "Microsoft365R", "version": "2.4.0", "sha256": "0vcp8nhphl9yp4rp53nvkm82zqmn1jsc9m6agxmmsqby8795p7h1", - "depends": ["AzureAuth", "AzureGraph", "curl", "httr", "jsonlite", "mime", "R6", "vctrs"] + "depends": ["AzureAuth", "AzureGraph", "R6", "curl", "httr", "jsonlite", "mime", "vctrs"] }, "MigConnectivity": { "name": "MigConnectivity", "version": "0.4.7", "sha256": "08bzis7rkczymvr2bqiih59yn94l0fjhkn0p9lpv875pwbvhmw1j", - "depends": ["coda", "geodist", "gplots", "MASS", "ncf", "R2jags", "RMark", "sf", "shape", "terra", "VGAM"] + "depends": ["MASS", "R2jags", "RMark", "VGAM", "coda", "geodist", "gplots", "ncf", "sf", "shape", "terra"] }, "MigrationDetectR": { "name": "MigrationDetectR", @@ -19871,7 +20093,7 @@ "name": "MinEDfind", "version": "0.1.3", "sha256": "1y0iv92mp7hf14vrj54qd0yvmjrv52jv3vg25kc5q7pml63njkqa", - "depends": ["ggplot2", "gridExtra", "Iso"] + "depends": ["Iso", "ggplot2", "gridExtra"] }, "MindOnStats": { "name": "MindOnStats", @@ -19901,7 +20123,7 @@ "name": "MissCP", "version": "0.1.0", "sha256": "0xmfkxwlkci11wwxdazs25k6z8apcl2vffkbpv8zic5lx1r9g2k4", - "depends": ["factoextra", "ggplot2", "glmnet", "mvtnorm", "Rcpp", "RcppArmadillo", "sparsevar"] + "depends": ["Rcpp", "RcppArmadillo", "factoextra", "ggplot2", "glmnet", "mvtnorm", "sparsevar"] }, "MissMech": { "name": "MissMech", @@ -19937,7 +20159,7 @@ "name": "MitoHEAR", "version": "0.1.0", "sha256": "1lb36w374wjp6f9ydkas21rwc2shlav1xq2rfzig1k034fkva8bj", - "depends": ["Biostrings", "circlize", "ComplexHeatmap", "dynamicTreeCut", "GenomicRanges", "ggplot2", "gridExtra", "IRanges", "magrittr", "mcclust", "rdist", "reshape2", "rlist", "Rsamtools"] + "depends": ["Biostrings", "ComplexHeatmap", "GenomicRanges", "IRanges", "Rsamtools", "circlize", "dynamicTreeCut", "ggplot2", "gridExtra", "magrittr", "mcclust", "rdist", "reshape2", "rlist"] }, "MittagLeffleR": { "name": "MittagLeffleR", @@ -19955,7 +20177,7 @@ "name": "MixGHD", "version": "2.3.7", "sha256": "0l1qivl9a5b8rayg9srxlgkk4wilv2m9yw4lsca29s5wd3wpyksv", - "depends": ["Bessel", "cluster", "e1071", "ghyp", "MASS", "mixture", "mvtnorm", "numDeriv"] + "depends": ["Bessel", "MASS", "cluster", "e1071", "ghyp", "mixture", "mvtnorm", "numDeriv"] }, "MixMatrix": { "name": "MixMatrix", @@ -19985,25 +20207,25 @@ "name": "MixSIAR", "version": "3.1.12", "sha256": "07wiv7x2c9mhqk37zndxvdb76m9shizc48qz2bp2f4g5z9hciid7", - "depends": ["bayesplot", "coda", "ggmcmc", "ggplot2", "lattice", "loo", "MASS", "MCMCpack", "R2jags", "RColorBrewer", "reshape", "reshape2", "splancs"] + "depends": ["MASS", "MCMCpack", "R2jags", "RColorBrewer", "bayesplot", "coda", "ggmcmc", "ggplot2", "lattice", "loo", "reshape", "reshape2", "splancs"] }, "MixSemiRob": { "name": "MixSemiRob", "version": "1.1.0", "sha256": "0rvpwb4skd5s0f7qnm2mjrhfz4ppa6inqyfz970mpycihig3vilc", - "depends": ["GoFKernel", "MASS", "mixtools", "mvtnorm", "pracma", "quadprog", "Rlab", "robustbase", "ucminf"] + "depends": ["GoFKernel", "MASS", "Rlab", "mixtools", "mvtnorm", "pracma", "quadprog", "robustbase", "ucminf"] }, "MixSim": { "name": "MixSim", - "version": "1.1-7", - "sha256": "1n6c3q78hbnjmwqxwr7i4lsv10mqkcwzf1jnlp6l9fxayhfz7jg7", + "version": "1.1-8", + "sha256": "0zfk3qkwap6p014jfdkl1ng5w4mqdm4klij7cnkx8zsgigs938lk", "depends": ["MASS"] }, "MixTwice": { "name": "MixTwice", "version": "2.0", "sha256": "11j591z1pnql84sfczvry7mg4hs0jghgp170y5j5wwhs7l5kc7r7", - "depends": ["alabama", "ashr", "fdrtool", "Iso"] + "depends": ["Iso", "alabama", "ashr", "fdrtool"] }, "MixedIndTests": { "name": "MixedIndTests", @@ -20021,13 +20243,13 @@ "name": "MixedPoisson", "version": "2.0", "sha256": "0g5mpzj0wda6g46q3cg5mm3x4dvpz9gdclzn2m17l62lzny2i10p", - "depends": ["gaussquad", "MASS", "Rmpfr"] + "depends": ["MASS", "Rmpfr", "gaussquad"] }, "MixedPsy": { "name": "MixedPsy", "version": "1.1.0", "sha256": "1iz3cl19xlznzbqxvichbjhyhams4v9611p9094r6q5fpmf71p88", - "depends": ["beepr", "boot", "brglm", "ggplot2", "lme4", "Matrix", "mnormt"] + "depends": ["Matrix", "beepr", "boot", "brglm", "ggplot2", "lme4", "mnormt"] }, "MixedTS": { "name": "MixedTS", @@ -20039,19 +20261,19 @@ "name": "MixfMRI", "version": "0.1-3", "sha256": "1cpkqvjkhr3l4y522xgjx2mwsvpzivf2h9wxslhgsqwds52ij0ad", - "depends": ["EMCluster", "fftw", "MASS", "Matrix", "MixSim", "RColorBrewer"] + "depends": ["EMCluster", "MASS", "Matrix", "MixSim", "RColorBrewer", "fftw"] }, "MixtureMissing": { "name": "MixtureMissing", "version": "3.0.2", "sha256": "15pz1rhbsaz5ml9swxqm6aifzb88qjpx0z5h2z229ddb0v9hxh29", - "depends": ["Bessel", "cluster", "MASS", "mclust", "mice", "mnormt", "mvtnorm", "numDeriv"] + "depends": ["Bessel", "MASS", "cluster", "mclust", "mice", "mnormt", "mvtnorm", "numDeriv"] }, "MixviR": { "name": "MixviR", "version": "3.5.0", "sha256": "0npwwpb96id4zkrp4qzpiv5sgw6y4aqhhwx7v8vbg54029p6jj6w", - "depends": ["Biostrings", "dplyr", "DT", "ggplot2", "glue", "httr", "lubridate", "magrittr", "plotly", "readr", "shiny", "stringr", "tidyr", "vcfR"] + "depends": ["Biostrings", "DT", "dplyr", "ggplot2", "glue", "httr", "lubridate", "magrittr", "plotly", "readr", "shiny", "stringr", "tidyr", "vcfR"] }, "Mmcsd": { "name": "Mmcsd", @@ -20087,13 +20309,7 @@ "name": "MoTBFs", "version": "1.4.1", "sha256": "03c1k5vvswlhbsivw6yznw1v0cdl8avs514iaa2v2994j2yk40j6", - "depends": ["bnlearn", "ggm", "lpSolve", "Matrix", "quadprog"] - }, - "MobileTrigger": { - "name": "MobileTrigger", - "version": "0.0.31", - "sha256": "1zbnxdxh6gr4sgpi10i0pnd85f7i842105jgjswacziqamby6mcy", - "depends": ["caret", "ggplot2", "kableExtra", "knitr", "mailR", "plyr", "XML", "yaml"] + "depends": ["Matrix", "bnlearn", "ggm", "lpSolve", "quadprog"] }, "ModEstM": { "name": "ModEstM", @@ -20109,9 +20325,9 @@ }, "ModTools": { "name": "ModTools", - "version": "0.9.6", - "sha256": "0f5afik98wg1yv722k3aycm35h3lv0pbd6zlsy4nvrnd51pdda4c", - "depends": ["AER", "C50", "car", "class", "DescTools", "e1071", "lattice", "lmtest", "MASS", "naivebayes", "NeuralNetTools", "nnet", "pROC", "randomForest", "relaimpo", "robustbase", "rpart", "rpart_plot", "sandwich", "survival"] + "version": "0.9.12", + "sha256": "09ag46i8a2lk99qxyf3jzsssv5k5jix8vvvdq2s89im20n8pk2q6", + "depends": ["AER", "C50", "DescTools", "MASS", "NeuralNetTools", "boot", "car", "class", "e1071", "lattice", "lmtest", "naivebayes", "nnet", "pROC", "randomForest", "relaimpo", "robustbase", "rpart", "rpart_plot", "sandwich", "survival"] }, "Modalclust": { "name": "Modalclust", @@ -20123,7 +20339,7 @@ "name": "ModelMap", "version": "3.4.0.4", "sha256": "022isqdfvrfblmw5lh0wqmyknzm11sdg011brdkwv3rc8xym3gaa", - "depends": ["corrplot", "fields", "HandTill2001", "mgcv", "PresenceAbsence", "randomForest", "raster"] + "depends": ["HandTill2001", "PresenceAbsence", "corrplot", "fields", "mgcv", "randomForest", "raster"] }, "ModelMatrixModel": { "name": "ModelMatrixModel", @@ -20135,7 +20351,7 @@ "name": "ModelMetrics", "version": "1.2.2.2", "sha256": "0mrlsw4c5y1vdsqynxr2dcvmhh5h37pnd71jw5a5djpbda9g21jy", - "depends": ["data_table", "Rcpp"] + "depends": ["Rcpp", "data_table"] }, "Modelcharts": { "name": "Modelcharts", @@ -20147,13 +20363,13 @@ "name": "Modeler", "version": "3.4.5", "sha256": "15gbg5568qj81wp6yy31amb2b7wl1wvlmgpmdp29lvz1p33jx2y1", - "depends": ["class", "ClassComparison", "ClassDiscovery", "e1071", "neuralnet", "nnet", "oompaBase", "randomForest", "rpart", "TailRank"] + "depends": ["ClassComparison", "ClassDiscovery", "TailRank", "class", "e1071", "neuralnet", "nnet", "oompaBase", "randomForest", "rpart"] }, "MolgenisArmadillo": { "name": "MolgenisArmadillo", "version": "2.6.3", "sha256": "11xy9cwnhacrxnyxhr8zs25yr20f27vqnh9nfm7x1180g1b2b4fr", - "depends": ["arrow", "base64enc", "cli", "dplyr", "httr", "httr2", "MolgenisAuth", "purrr", "readr", "rlist", "stringr", "tibble", "tidyr", "urltools"] + "depends": ["MolgenisAuth", "arrow", "base64enc", "cli", "dplyr", "httr", "httr2", "purrr", "readr", "rlist", "stringr", "tibble", "tidyr", "urltools"] }, "MolgenisAuth": { "name": "MolgenisAuth", @@ -20165,13 +20381,13 @@ "name": "MomTrunc", "version": "6.0", "sha256": "0nfvq6ry1c5g1xjvf2qyr5pzpnsy420m6xgj0n3aj00wi0ifdyiz", - "depends": ["hypergeo", "mvtnorm", "Rcpp", "RcppArmadillo", "tlrmvnmvt"] + "depends": ["Rcpp", "RcppArmadillo", "hypergeo", "mvtnorm", "tlrmvnmvt"] }, "Momocs": { "name": "Momocs", "version": "1.4.1", "sha256": "0g8mxk62pdif47p96pzqzfjdjarqwyk71zw9avsgy160mz8mpd81", - "depends": ["cluster", "dendextend", "dplyr", "geometry", "geomorph", "ggplot2", "jpeg", "magrittr", "MASS", "progress", "RColorBrewer", "sf", "sp", "tibble", "vegan"] + "depends": ["MASS", "RColorBrewer", "cluster", "dendextend", "dplyr", "geometry", "geomorph", "ggplot2", "jpeg", "magrittr", "progress", "sf", "sp", "tibble", "vegan"] }, "Mondrian": { "name": "Mondrian", @@ -20183,7 +20399,7 @@ "name": "MonetDB.R", "version": "2.0.0", "sha256": "0b5flc9l4nshy2fmwxbzcsn7pdivwy3x6kic94ppyyiqzz41h0b1", - "depends": ["codetools", "DBI", "digest", "testthat"] + "depends": ["DBI", "codetools", "digest", "testthat"] }, "MonoInc": { "name": "MonoInc", @@ -20195,7 +20411,7 @@ "name": "MonoPhy", "version": "1.3.1", "sha256": "120vpz40iil4j6rdhnnhss4rmpfcyh3h0dpw3qkmzadb7mywr7dr", - "depends": ["ape", "phangorn", "phytools", "RColorBrewer", "taxize"] + "depends": ["RColorBrewer", "ape", "phangorn", "phytools", "taxize"] }, "MonoPoly": { "name": "MonoPoly", @@ -20219,19 +20435,19 @@ "name": "MonteCarloSEM", "version": "0.0.8", "sha256": "0l9c6a8yxjd2n1fvsswx3csgz18g7d33ybbmpxlx6csl5f299ljd", - "depends": ["lavaan", "Matrix"] + "depends": ["Matrix", "lavaan"] }, "Morpho": { "name": "Morpho", "version": "2.12", "sha256": "1hg1jr0y11v93mqg2kn8n841nbsiffhyyr2kswj7kk664vlpril0", - "depends": ["bezier", "colorRamps", "doParallel", "foreach", "jsonlite", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "rgl", "Rvcg", "sf"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "Rvcg", "bezier", "colorRamps", "doParallel", "foreach", "jsonlite", "rgl", "sf"] }, "MorphoTools2": { "name": "MorphoTools2", "version": "1.0.1.1", "sha256": "08n9l905pfls50p278sypf8xxq6bs56f5a5b5wlxwy11flccpyia", - "depends": ["ade4", "candisc", "car", "class", "ellipse", "heplots", "MASS", "plot3D", "StatMatch", "vegan"] + "depends": ["MASS", "StatMatch", "ade4", "candisc", "car", "class", "ellipse", "heplots", "plot3D", "vegan"] }, "Morphoscape": { "name": "Morphoscape", @@ -20249,13 +20465,13 @@ "name": "MortalityGaps", "version": "1.0.0", "sha256": "0nfm8xa7gnshrl8hsvmvr3za8nbppp7f7i5h4ni204w7xwvh8jxc", - "depends": ["crch", "forecast", "MASS", "pbapply"] + "depends": ["MASS", "crch", "forecast", "pbapply"] }, "MortalityLaws": { "name": "MortalityLaws", "version": "2.1.0", "sha256": "1jczy0brmma71cn2xhhnl1g2k9nr6l3zf5zw6bvwn10l1gid4908", - "depends": ["httr", "minpack_lm", "pbapply", "RCurl", "rvest", "tidyr"] + "depends": ["RCurl", "httr", "minpack_lm", "pbapply", "rvest", "tidyr"] }, "MortalityTables": { "name": "MortalityTables", @@ -20285,25 +20501,25 @@ "name": "MtreeRing", "version": "1.4.5", "sha256": "1i6ljz950n9fpgci9b5777dg3b88ihhz8jvyw621hg218imswhxz", - "depends": ["bmp", "dplR", "dplyr", "imager", "jpeg", "magick", "magrittr", "measuRing", "png", "shiny", "shinydashboard", "shinyWidgets", "spatstat_geom", "tiff"] + "depends": ["bmp", "dplR", "dplyr", "imager", "jpeg", "magick", "magrittr", "measuRing", "png", "shiny", "shinyWidgets", "shinydashboard", "spatstat_geom", "tiff"] }, "MuChPoint": { "name": "MuChPoint", "version": "0.6.3", "sha256": "0mixy2rcr23rk823r1r3s2bhr22dhsx56xvkk0djvfdb60pq0kfh", - "depends": ["capushe", "Matrix", "Rcpp", "shiny"] + "depends": ["Matrix", "Rcpp", "capushe", "shiny"] }, "MuMIn": { "name": "MuMIn", - "version": "1.47.5", - "sha256": "0xqasb79lmdhff25zalzrpjwv6qs9qnxr54ypnqjjgshi96mbwvg", - "depends": ["insight", "Matrix", "nlme"] + "version": "1.48.4", + "sha256": "04zn63snv218c44nllfh8bqh5xg0gamd9fcpwxisvi9gwb3f20i0", + "depends": ["Matrix", "insight", "nlme"] }, "MuViCP": { "name": "MuViCP", "version": "1.3.2", "sha256": "1wkiwdz4bblxf1zr57khljqkga9ks9aj1lnidvmhib94q6b8fnf4", - "depends": ["gtools", "MASS", "sm"] + "depends": ["MASS", "gtools", "sm"] }, "MullerPlot": { "name": "MullerPlot", @@ -20321,7 +20537,7 @@ "name": "MultBiplotR", "version": "23.11.0", "sha256": "0qcf97r9f5l572dckfvi9pjl2gvc6zw36z34pbbfwxha8bnqiyqc", - "depends": ["car", "dae", "deldir", "dunn_test", "geometry", "GPArotation", "gplots", "Hmisc", "knitr", "lattice", "MASS", "mirt", "mvtnorm", "polycor", "psych", "scales", "ThreeWay", "xtable"] + "depends": ["GPArotation", "Hmisc", "MASS", "ThreeWay", "car", "dae", "deldir", "dunn_test", "geometry", "gplots", "knitr", "lattice", "mirt", "mvtnorm", "polycor", "psych", "scales", "xtable"] }, "MultEq": { "name": "MultEq", @@ -20333,7 +20549,7 @@ "name": "MultIS", "version": "0.6.2", "sha256": "02ca1r8qfsl1b8rfawdn4xrlwhg5yab260rrsx8ckyv3v75knk8f", - "depends": ["cluster", "clv", "clValid", "dplyr", "foreach", "ggplot2", "igraph", "ltm", "plyr", "poweRlaw", "RColorBrewer", "reshape2", "rlang", "rmutil"] + "depends": ["RColorBrewer", "clValid", "cluster", "clv", "dplyr", "foreach", "ggplot2", "igraph", "ltm", "plyr", "poweRlaw", "reshape2", "rlang", "rmutil"] }, "MultNonParam": { "name": "MultNonParam", @@ -20347,6 +20563,12 @@ "sha256": "1f23im0m77y8aqdnmkcgdgfx77z84wlwih1wv74by15m4ysj4l2h", "depends": ["Rcpp", "RcppArmadillo", "statmod"] }, + "MultRegCMP": { + "name": "MultRegCMP", + "version": "0.1.0", + "sha256": "01gb6a5kj8gdf57g9c9xzxid5h437g9y625w2d8wfjil97c012x4", + "depends": ["bayesplot", "cowplot", "ggplot2", "mvnfast", "progress", "purrr"] + }, "MultSurvTests": { "name": "MultSurvTests", "version": "0.2", @@ -20369,7 +20591,7 @@ "name": "MultiCOAP", "version": "1.1", "sha256": "1209pv52lgshfk67nfkp4fq4fm7k9g5ly2yilrzwihywsym8yxmp", - "depends": ["irlba", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "irlba"] }, "MultiClassROC": { "name": "MultiClassROC", @@ -20381,25 +20603,25 @@ "name": "MultiFit", "version": "1.1.1", "sha256": "086bnqp61mfanrhi7dqaq5j2ddg3rfiyms0f5wj34svcjal9wjvc", - "depends": ["data_table", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "data_table"] }, "MultiGlarmaVarSel": { "name": "MultiGlarmaVarSel", "version": "1.0", "sha256": "1cpxy716ca7xa6y7sjrrssx6r4wc1fr2p0i5im5s745xlc66qi06", - "depends": ["ggplot2", "glmnet", "Matrix"] + "depends": ["Matrix", "ggplot2", "glmnet"] }, "MultiGroupO": { "name": "MultiGroupO", - "version": "0.3.0", - "sha256": "0vyq1xzxh6zjzdsvp0gib32xxz1c3672kj3ifn5fv0bf8yjjc2gk", + "version": "0.4.0", + "sha256": "0yiia0zf54hwr9gd2jisasmg996w1ajnak1i1ls5dl2bpfic31gn", "depends": ["cowplot", "expm", "ggplot2", "ggrepel", "gplots", "gridExtra", "lemon", "mgm", "mvtnorm", "plsgenomics", "qgraph", "rlist"] }, "MultiGroupSequential": { "name": "MultiGroupSequential", "version": "1.1.0", "sha256": "0mx0a10260ks77njxf7yhxwhw66b7rjlqkjxmidvxbl6r0jfgr5b", - "depends": ["hommel", "OpenMx"] + "depends": ["OpenMx", "hommel"] }, "MultiJoin": { "name": "MultiJoin", @@ -20411,31 +20633,31 @@ "name": "MultiKink", "version": "0.2.0", "sha256": "14npzvidqiy25ldg2g4vyj6bbrmi9vbpswbm9ah9hc4sdjdq344h", - "depends": ["gam", "Matrix", "pracma", "quantreg"] + "depends": ["Matrix", "gam", "pracma", "quantreg"] }, "MultiLCIRT": { "name": "MultiLCIRT", "version": "2.11", "sha256": "1qls0qp5fz377h50lvpzq3vkw49i3nvizli98gss50nqci8ssqm4", - "depends": ["limSolve", "MASS"] + "depends": ["MASS", "limSolve"] }, "MultiObjMatch": { "name": "MultiObjMatch", - "version": "0.1.3", - "sha256": "1a20ca8k7plgdz084hrjrlx7p1nm1cl74v3vlk3jk1dwbgq04833", - "depends": ["cobalt", "dplyr", "fields", "gtools", "MASS", "matchMulti", "optmatch", "plyr", "rcbalance", "RCurl", "rlemon"] + "version": "1.0.0", + "sha256": "0pgmhwydxi741ys8j1ba00rp6gbssjzgamqrywhvpc0jddaqdmrc", + "depends": ["MASS", "RCurl", "cobalt", "dplyr", "fields", "ggplot2", "gtools", "matchMulti", "optmatch", "plyr", "rcbalance", "rlang", "rlemon"] }, "MultiOrd": { "name": "MultiOrd", "version": "2.4.3", "sha256": "1fmp8979ibxrx43vhi6dncljpbc1388y915d4g0gnl6a7z8g1dnh", - "depends": ["corpcor", "Matrix", "mvtnorm", "psych"] + "depends": ["Matrix", "corpcor", "mvtnorm", "psych"] }, "MultiPhen": { "name": "MultiPhen", "version": "2.0.3", "sha256": "0razswg4wqsz4q0dvpxp3swmxk82ig8gkyi4vcmxh11nlhb258w3", - "depends": ["abind", "epitools", "HardyWeinberg", "MASS", "meta", "RColorBrewer"] + "depends": ["HardyWeinberg", "MASS", "RColorBrewer", "abind", "epitools", "meta"] }, "MultiRNG": { "name": "MultiRNG", @@ -20447,7 +20669,7 @@ "name": "MultiRR", "version": "1.1", "sha256": "1jrhx3nlqwsv3i6r8fs142llw88qad41rsh0sj1pv1gb928zpvl3", - "depends": ["lme4", "MASS"] + "depends": ["MASS", "lme4"] }, "MultiRobust": { "name": "MultiRobust", @@ -20463,27 +20685,21 @@ }, "MultiStatM": { "name": "MultiStatM", - "version": "1.2.1", - "sha256": "0b0wk2zz8p0zqhv6f5030jpl4wxlnx3yya5i1jh7bm0rxyyx6d18", - "depends": ["arrangements", "MASS", "Matrix", "mvtnorm"] + "version": "2.0.0", + "sha256": "1d2dzchg6xmaazr6sajxq7f5bkx24m70w593wbmn49xxq8fbf1hp", + "depends": ["MASS", "Matrix", "arrangements", "mvtnorm"] }, "MultiVarMI": { "name": "MultiVarMI", "version": "1.0", "sha256": "1mlaprg3cfmfwrq7wh64fmyv1wpdnil7wpcrcg3921qydk65py6z", - "depends": ["BinOrdNonNor", "corpcor", "CorrToolBox", "Matrix", "moments", "norm", "PoisNonNor"] + "depends": ["BinOrdNonNor", "CorrToolBox", "Matrix", "PoisNonNor", "corpcor", "moments", "norm"] }, "MultiVarSel": { "name": "MultiVarSel", "version": "1.1.3", "sha256": "18wcw80m5knv6hbzczjsx3lf7sn9n84z12zz844agp6234im163p", - "depends": ["glmnet", "Matrix"] - }, - "Multiaovbay": { - "name": "Multiaovbay", - "version": "0.1.0", - "sha256": "0c5563h9v2xnxbxf9qkd567v154lnjnlyvc5aqbv4vd7awi8mn71", - "depends": ["BayesFactor", "broom", "car", "dplyr", "DT", "ggplot2", "ggstatsplot", "highcharter", "htmltools", "moments", "nortest", "PMCMRplus", "purrr", "reshape", "shiny", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "stringr", "tibble", "waiter"] + "depends": ["Matrix", "glmnet"] }, "MultinomialCI": { "name": "MultinomialCI", @@ -20501,7 +20717,7 @@ "name": "MultipleBubbles", "version": "0.2.0", "sha256": "047a1pql3jf500gwlap6ws5z7mx0sqmdq6jbql24nl5iypi9jqpf", - "depends": ["foreach", "MASS"] + "depends": ["MASS", "foreach"] }, "MultipleRegression": { "name": "MultipleRegression", @@ -20513,31 +20729,31 @@ "name": "MultiplierDEA", "version": "0.1.19", "sha256": "0ns74496grklacpij2cvbv116kc77wa8kv3jdy9fjzxk8yd6kv4d", - "depends": ["dplyr", "lpSolveAPI", "ompr", "ompr_roi", "ROI", "ROI_plugin_glpk"] + "depends": ["ROI", "ROI_plugin_glpk", "dplyr", "lpSolveAPI", "ompr", "ompr_roi"] }, "MultiscaleDTM": { "name": "MultiscaleDTM", "version": "0.8.3", "sha256": "13kslxxbyil5y4ci5s9r0n0ymsrh8c65wvsdzhcgafh9ldr6l1ww", - "depends": ["dplyr", "raster", "Rcpp", "RcppArmadillo", "rgl", "shiny", "terra"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "raster", "rgl", "shiny", "terra"] }, "MultisiteMediation": { "name": "MultisiteMediation", "version": "0.0.4", "sha256": "0kkw6zxw29qmgd9nlgqjlyh99icxzkkqnpzzanxx8pn7m2ww0wkf", - "depends": ["ggplot2", "lme4", "MASS", "psych", "statmod"] + "depends": ["MASS", "ggplot2", "lme4", "psych", "statmod"] }, "MultivariateAnalysis": { "name": "MultivariateAnalysis", "version": "0.5.0", "sha256": "1hphl6swqkfjqbybkcpvf0bda6jf434v7l6pqzlviqzlnww94riv", - "depends": ["biotools", "candisc", "corrplot", "crayon", "ecodist", "factoextra", "ggdendro", "ggplot2", "gridExtra", "magrittr", "NbClust", "PCAmixdata", "plotly", "rstudioapi"] + "depends": ["NbClust", "PCAmixdata", "biotools", "candisc", "corrplot", "crayon", "ecodist", "factoextra", "ggdendro", "ggplot2", "gridExtra", "magrittr", "plotly", "rstudioapi"] }, "MultivariateRandomForest": { "name": "MultivariateRandomForest", "version": "1.1.5", "sha256": "0mww4x1hqraiyvmw2f9s6h180kplmj36hb7zfg7xlkmgdf4apk8d", - "depends": ["bootstrap", "Rcpp"] + "depends": ["Rcpp", "bootstrap"] }, "MultiwayRegression": { "name": "MultiwayRegression", @@ -20603,13 +20819,7 @@ "name": "NADA2", "version": "1.1.6", "sha256": "1kz1rvzjp18avm2jbsswnzz9jsdmk20h0vj9gs5bvjl56llih48q", - "depends": ["cenGAM", "coin", "EnvStats", "fitdistrplus", "Kendall", "mgcv", "multcomp", "NADA", "perm", "survival", "survminer", "vegan"] - }, - "NADIA": { - "name": "NADIA", - "version": "0.4.2", - "sha256": "19545sc75a82smjvvyd353wjlh3wwzhwapcrk9fkg3ffjv9p4a3n", - "depends": ["Amelia", "data_table", "doParallel", "foreach", "glmnet", "mice", "missForest", "missMDA", "missRanger", "mlr3", "mlr3learners", "mlr3pipelines", "paradox", "rpart", "softImpute", "testthat", "VIM"] + "depends": ["EnvStats", "Kendall", "NADA", "cenGAM", "coin", "fitdistrplus", "mgcv", "multcomp", "perm", "survival", "survminer", "vegan"] }, "NAEPirtparams": { "name": "NAEPirtparams", @@ -20627,7 +20837,7 @@ "name": "NAIR", "version": "1.0.4", "sha256": "0xxps6ri53i6fw0wd58v593jqcsiwr36lgqnx7bnf1b47pqnqc64", - "depends": ["dplyr", "ggplot2", "ggraph", "igraph", "lifecycle", "Matrix", "Rcpp", "RcppArmadillo", "rlang"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "dplyr", "ggplot2", "ggraph", "igraph", "lifecycle", "rlang"] }, "NAM": { "name": "NAM", @@ -20711,19 +20921,19 @@ "name": "NBtsVarSel", "version": "1.0", "sha256": "0dwmi69ahyrq54nx1xi591i3g87r4aiv9l5k81lhqwa2aniv6snh", - "depends": ["ggplot2", "glmnet", "MASS", "Matrix", "mpath"] + "depends": ["MASS", "Matrix", "ggplot2", "glmnet", "mpath"] }, "NCA": { "name": "NCA", "version": "4.0.1", "sha256": "0r7m6aklidi6dplv42xmaq38ifxs8zj495rs7pfidwx7z5iw0n84", - "depends": ["doParallel", "foreach", "ggplot2", "gplots", "iterators", "KernSmooth", "lpSolve", "plotly", "quantreg", "truncnorm"] + "depends": ["KernSmooth", "doParallel", "foreach", "ggplot2", "gplots", "iterators", "lpSolve", "plotly", "quantreg", "truncnorm"] }, "NCC": { "name": "NCC", "version": "1.0", "sha256": "0zp854m5ig8w5xag4a1s56b33kfjds3wqydjxacvj5fkpr1y586d", - "depends": ["doParallel", "foreach", "ggplot2", "iterators", "lmerTest", "magick", "mgcv", "parallelly", "RBesT", "rjags", "rlang", "spaMM"] + "depends": ["RBesT", "doParallel", "foreach", "ggplot2", "iterators", "lmerTest", "magick", "mgcv", "parallelly", "rjags", "rlang", "spaMM"] }, "NCSCopula": { "name": "NCSCopula", @@ -20747,7 +20957,7 @@ "name": "NCutYX", "version": "0.1.0", "sha256": "0r2ghnvrbya3p1d8rb5bsnz5v852vvc6rq65yafn2xzr7886wrg2", - "depends": ["fields", "glmnet", "MASS", "mvtnorm", "Rcpp", "RcppEigen"] + "depends": ["MASS", "Rcpp", "RcppEigen", "fields", "glmnet", "mvtnorm"] }, "NDP": { "name": "NDP", @@ -20759,19 +20969,19 @@ "name": "NEONiso", "version": "0.7.0", "sha256": "1nkwymy6zyyk8g6lxk45srqf285329x60plhkbkm0wif6kx777s0", - "depends": ["caret", "data_table", "dplyr", "ggplot2", "gridExtra", "httr", "lubridate", "magrittr", "neonUtilities", "R_utils", "rhdf5", "rlang", "tidyselect", "zoo"] + "depends": ["R_utils", "caret", "data_table", "dplyr", "ggplot2", "gridExtra", "httr", "lubridate", "magrittr", "neonUtilities", "rhdf5", "rlang", "tidyselect", "zoo"] }, "NEpiC": { "name": "NEpiC", "version": "1.0.1", "sha256": "11zf112xcsg3k93vks2fnsflw2v2d56a0bsjpd460d21k3gipfz8", - "depends": ["igraph", "PairedData"] + "depends": ["PairedData", "igraph"] }, "NFCP": { "name": "NFCP", "version": "1.2.1", "sha256": "16dvk8jiyzd94lfif0nkwc0ix05is8bhyykaaa6p1irwgzk8cia4", - "depends": ["curl", "FKF_SP", "LSMRealOptions", "MASS", "mathjaxr", "numDeriv", "Rdpack", "rgenoud"] + "depends": ["FKF_SP", "LSMRealOptions", "MASS", "Rdpack", "curl", "mathjaxr", "numDeriv", "rgenoud"] }, "NFLSimulatoR": { "name": "NFLSimulatoR", @@ -20837,13 +21047,13 @@ "name": "NHSRplotthedots", "version": "0.1.0", "sha256": "1rqryqaxyb3d6kws8mznsnzv19h8nhn1323vkh9zq59la9r3kiai", - "depends": ["assertthat", "crayon", "dplyr", "ggplot2", "NHSRdatasets", "rlang", "scales"] + "depends": ["NHSRdatasets", "assertthat", "crayon", "dplyr", "ggplot2", "rlang", "scales"] }, "NIMAA": { "name": "NIMAA", "version": "0.2.1", "sha256": "1lnxh9mak25mji38bifrif6qg0rjg3fj0lacjdgpk8iqjallvq7y", - "depends": ["bipartite", "bnstruct", "crayon", "dplyr", "fpc", "ggplot2", "igraph", "mice", "missMDA", "networkD3", "plotly", "purrr", "RColorBrewer", "scales", "skimr", "softImpute", "tibble", "tidyr", "tidytext", "visNetwork"] + "depends": ["RColorBrewer", "bipartite", "bnstruct", "crayon", "dplyr", "fpc", "ggplot2", "igraph", "mice", "missMDA", "networkD3", "plotly", "purrr", "scales", "skimr", "softImpute", "tibble", "tidyr", "tidytext", "visNetwork"] }, "NIPTeR": { "name": "NIPTeR", @@ -20871,21 +21081,21 @@ }, "NLP": { "name": "NLP", - "version": "0.2-1", - "sha256": "1dpj04fmld2lnhg072ahgjbhmciqqy9h1lrz0wf32mr7mm9s9sh5", + "version": "0.3-0", + "sha256": "1v5kszwj56hdyd07ya9p0caxrd4ckpa1x6d0y6d1xrsi074638n0", "depends": [] }, "NLPclient": { "name": "NLPclient", "version": "1.0", "sha256": "0jhlz9mqziyk5574vl8qjjs4g75x27rlk90wvzm3q9kjrjyvad35", - "depends": ["curl", "NLP", "xml2"] + "depends": ["NLP", "curl", "xml2"] }, "NLPutils": { "name": "NLPutils", "version": "0.0-5.1", "sha256": "1ca7cqfjzrhn0idgw8viqlr2w4lkzng64bqk8hvd08qm7bgg5vjl", - "depends": ["NLP", "qdap", "SnowballC"] + "depends": ["NLP", "SnowballC", "qdap"] }, "NLRoot": { "name": "NLRoot", @@ -20897,25 +21107,25 @@ "name": "NMA", "version": "1.4-3", "sha256": "09y3arzw08054xb1y3nmnnzxybgjm2yyvkc530avpqkl1yrb1ap2", - "depends": ["forestplot", "ggplot2", "MASS", "metafor", "stringr"] + "depends": ["MASS", "forestplot", "ggplot2", "metafor", "stringr"] }, "NMADiagT": { "name": "NMADiagT", "version": "0.1.2", "sha256": "0fskc3ldfdl17gazpfr2hixy79n7db4c1f5yl1jalhwxiabnxjwp", - "depends": ["coda", "ggplot2", "imguR", "ks", "MASS", "MCMCpack", "plotrix", "Rdpack", "reshape2", "rjags"] + "depends": ["MASS", "MCMCpack", "Rdpack", "coda", "ggplot2", "imguR", "ks", "plotrix", "reshape2", "rjags"] }, "NMAoutlier": { "name": "NMAoutlier", "version": "0.1.18", "sha256": "0h0pxjg6ppz9zv7wcv1dka5g0f9wxk3bnwicfpsv1advcam4vmmn", - "depends": ["ggplot2", "gridExtra", "MASS", "meta", "netmeta", "reshape2"] + "depends": ["MASS", "ggplot2", "gridExtra", "meta", "netmeta", "reshape2"] }, "NMF": { "name": "NMF", "version": "0.27", "sha256": "1y9y7xpfd9y8j5b8s2x5g61455ilpgqpdhrirpz58xjarbph4hxg", - "depends": ["Biobase", "BiocManager", "cluster", "codetools", "colorspace", "digest", "doParallel", "foreach", "ggplot2", "gridBase", "RColorBrewer", "registry", "reshape2", "rngtools", "stringr"] + "depends": ["Biobase", "BiocManager", "RColorBrewer", "cluster", "codetools", "colorspace", "digest", "doParallel", "foreach", "ggplot2", "gridBase", "registry", "reshape2", "rngtools", "stringr"] }, "NMFN": { "name": "NMFN", @@ -20945,13 +21155,13 @@ "name": "NMRphasing", "version": "1.0.4", "sha256": "0rg2y26bnksp2hjbjn3xplnpi2hgc4ghlw796rqhjkmnrq9h1hrs", - "depends": ["baseline", "MassSpecWavelet"] + "depends": ["MassSpecWavelet", "baseline"] }, "NMTox": { "name": "NMTox", "version": "0.1.0", "sha256": "1slz6bq57l3f2wqd2nhm3b7dag6vg7wy9zi5rpl7ld1yyqfb0wfp", - "depends": ["dplyr", "forcats", "ggplot2", "gridExtra", "Iso", "tidyr"] + "depends": ["Iso", "dplyr", "forcats", "ggplot2", "gridExtra", "tidyr"] }, "NMVANOVA": { "name": "NMVANOVA", @@ -20973,9 +21183,9 @@ }, "NMsim": { "name": "NMsim", - "version": "0.1.0", - "sha256": "1lmfb6h78vj6r6n6br9awkxrq445f9cgzhsz06rzkydnb10xldrk", - "depends": ["data_table", "fst", "MASS", "NMdata", "R_utils", "xfun"] + "version": "0.1.2", + "sha256": "14n4zr32vjsdjafx7rc9x8x9hjdmvw86lh9hy66lavp3005xznia", + "depends": ["MASS", "NMdata", "R_utils", "data_table", "fst", "xfun"] }, "NNMIS": { "name": "NNMIS", @@ -20987,7 +21197,7 @@ "name": "NNS", "version": "10.8.2", "sha256": "11jacanqf7c7kaarwc6micmhzg47sna1lfj5fkpvpa9396xpbrjd", - "depends": ["data_table", "doParallel", "foreach", "plyr", "quantmod", "Rcpp", "RcppParallel", "Rfast", "rgl", "xts", "zoo"] + "depends": ["Rcpp", "RcppParallel", "Rfast", "data_table", "doParallel", "foreach", "plyr", "quantmod", "rgl", "xts", "zoo"] }, "NNTbiomarker": { "name": "NNTbiomarker", @@ -20999,7 +21209,7 @@ "name": "NNbenchmark", "version": "3.2.0", "sha256": "086smk3xy6p6ianw41h3gx806q7h28v1dg9d3khsrwyyf9gn8xyp", - "depends": ["pkgload", "R6"] + "depends": ["R6", "pkgload"] }, "NO_PING_PONG": { "name": "NO.PING.PONG", @@ -21017,7 +21227,7 @@ "name": "NPBayesImputeCat", "version": "0.5", "sha256": "05zwa7hhf8p1icgdvvla0r70fgvjm7s38gp69h7wgsq8yl6vd876", - "depends": ["bayesplot", "dplyr", "ggplot2", "Rcpp", "reshape2", "rlang"] + "depends": ["Rcpp", "bayesplot", "dplyr", "ggplot2", "reshape2", "rlang"] }, "NPCD": { "name": "NPCD", @@ -21029,7 +21239,7 @@ "name": "NPCirc", "version": "3.1.1", "sha256": "0qcam9n9llsblrpa2w0yj0axh79qwinz4wwbf4gvyrajfv935i8i", - "depends": ["Bolstad2", "circular", "misc3d", "movMF", "plotrix", "Rcpp", "RcppArmadillo", "rgl", "shape"] + "depends": ["Bolstad2", "Rcpp", "RcppArmadillo", "circular", "misc3d", "movMF", "plotrix", "rgl", "shape"] }, "NPCox": { "name": "NPCox", @@ -21067,29 +21277,35 @@ "sha256": "1jyxnblr8ibzlwb78k98idf856m5gnaba3b53qz0pfgxf2k8wdhv", "depends": [] }, + "NPRED": { + "name": "NPRED", + "version": "1.1.0", + "sha256": "1gn70lcmkqn686a486b7h8f98kb17y358l1kbxpn4m7mjyy5l862", + "depends": [] + }, "NPflow": { "name": "NPflow", "version": "0.13.5", "sha256": "14i5pfvpjj25frvxrfvch5a8ja8y4mnsk9h2ikcwh949br6mjq52", - "depends": ["ellipse", "fastcluster", "GGally", "ggplot2", "pheatmap", "Rcpp", "RcppArmadillo", "reshape2", "truncnorm"] + "depends": ["GGally", "Rcpp", "RcppArmadillo", "ellipse", "fastcluster", "ggplot2", "pheatmap", "reshape2", "truncnorm"] }, "NRejections": { "name": "NRejections", "version": "1.2.0", "sha256": "0lzj7kyn4s8l306a6xwkgkv1z4dlfsr61i902lvdxv4ln4m6a5kq", - "depends": ["doParallel", "foreach", "matrixcalc", "mvtnorm", "StepwiseTest"] + "depends": ["StepwiseTest", "doParallel", "foreach", "matrixcalc", "mvtnorm"] }, "NSAE": { "name": "NSAE", "version": "0.4.0", "sha256": "1pig0b2g6z1pc6is3nw7m88zwvwpg3pwvifvyc6p38kbin57m1pb", - "depends": ["cluster", "lattice", "MASS", "Matrix", "nlme", "numDeriv", "rlist", "SemiPar", "spgwr"] + "depends": ["MASS", "Matrix", "SemiPar", "cluster", "lattice", "nlme", "numDeriv", "rlist", "spgwr"] }, "NSM3": { "name": "NSM3", "version": "1.18", "sha256": "0m0ijafjlw9pili0hxfrv5blj9ysxhhwj6c4hpnp5ry97a4gkib9", - "depends": ["agricolae", "ash", "binom", "BSDA", "coin", "combinat", "fANCOVA", "gtools", "Hmisc", "km_ci", "MASS", "metafor", "nortest", "np", "partitions", "quantreg", "Rfit", "SuppDists", "survival", "waveslim"] + "depends": ["BSDA", "Hmisc", "MASS", "Rfit", "SuppDists", "agricolae", "ash", "binom", "coin", "combinat", "fANCOVA", "gtools", "km_ci", "metafor", "nortest", "np", "partitions", "quantreg", "survival", "waveslim"] }, "NSO1212": { "name": "NSO1212", @@ -21101,7 +21317,7 @@ "name": "NST", "version": "3.1.10", "sha256": "1ycpccg7hcg84ygjzksbi0fcrkisvis5165bbnj64h52gjifgxh7", - "depends": ["ape", "bigmemory", "DirichletReg", "iCAMP", "permute", "vegan"] + "depends": ["DirichletReg", "ape", "bigmemory", "iCAMP", "permute", "vegan"] }, "NScluster": { "name": "NScluster", @@ -21119,13 +21335,13 @@ "name": "NTS", "version": "1.1.3", "sha256": "0scj05h2r3sg34n0lmarbrgavz6q2n23gvs2v4w5q249q2cx6iis", - "depends": ["dlm", "MASS", "MSwM", "Rdpack", "tensor"] + "depends": ["MASS", "MSwM", "Rdpack", "dlm", "tensor"] }, "NTSS": { "name": "NTSS", "version": "0.1.3", "sha256": "18j7q5976ij0sn05j7s1k6rz7m8vi5lq7qx72cz9m8lj2f5l8apc", - "depends": ["geoR", "GET", "ks", "spatstat", "spatstat_explore", "spatstat_geom", "spatstat_model", "spatstat_random", "spatstat_univar"] + "depends": ["GET", "geoR", "ks", "spatstat", "spatstat_explore", "spatstat_geom", "spatstat_model", "spatstat_random", "spatstat_univar"] }, "NU_Learning": { "name": "NU.Learning", @@ -21155,7 +21371,13 @@ "name": "NVCSSL", "version": "2.0", "sha256": "1nsdhmay2blfa07ri1kfb204di8s5i7zk7qwwlbkhdjjl0qa3vd7", - "depends": ["dae", "GIGrvg", "grpreg", "MASS", "Matrix", "MCMCpack", "mvtnorm", "plyr"] + "depends": ["GIGrvg", "MASS", "MCMCpack", "Matrix", "dae", "grpreg", "mvtnorm", "plyr"] + }, + "NaileR": { + "name": "NaileR", + "version": "1.1.0", + "sha256": "03vrsv2mx4k3hp3wiscsvmg7kgscaikrx5a1qyybawl7vy92j0p4", + "depends": ["FactoMineR", "dplyr", "glue", "magrittr", "ollamar", "stringr"] }, "NameNeedle": { "name": "NameNeedle", @@ -21197,7 +21419,7 @@ "name": "NegBinBetaBinreg", "version": "1.0", "sha256": "0ryi9gdf4sis77c0qxm6r86mfkk1nq9djs297y64nr6ng3rv9p9d", - "depends": ["boot", "Matrix", "mvtnorm"] + "depends": ["Matrix", "boot", "mvtnorm"] }, "NegativeControlOutcomeAdjustment": { "name": "NegativeControlOutcomeAdjustment", @@ -21209,19 +21431,19 @@ "name": "Neighboot", "version": "1.0.1", "sha256": "18r6cww9g4fchf6hlwkw1lajh0lg4ch6msvx54zqgkrnhpixchnc", - "depends": ["dplyr", "igraph", "RDS", "RDStreeboot"] + "depends": ["RDS", "RDStreeboot", "dplyr", "igraph"] }, "NestMRMC": { "name": "NestMRMC", "version": "1.0", "sha256": "08zk9g3mkwyli94ry1s762ddniwzjlf89plh86sgxfrcrhx1m908", - "depends": ["dplyr", "iMRMC", "magrittr", "mvtnorm", "Rcpp"] + "depends": ["Rcpp", "dplyr", "iMRMC", "magrittr", "mvtnorm"] }, "NestedCategBayesImpute": { "name": "NestedCategBayesImpute", "version": "1.2.1", "sha256": "15j54whvhqy26v1iikpk8ys75d7m5b188ggdzrlgzhjg0f9j45fl", - "depends": ["coda", "dplyr", "Rcpp", "RcppParallel"] + "depends": ["Rcpp", "RcppParallel", "coda", "dplyr"] }, "NestedMenu": { "name": "NestedMenu", @@ -21257,7 +21479,7 @@ "name": "NetFACS", "version": "0.5.0", "sha256": "05lqfawirdw4fh0hawm815hjdpyli7025dz3a5fsm6jh3l906z9i", - "depends": ["arrangements", "doParallel", "dplyr", "ggplot2", "ggraph", "igraph", "magrittr", "patchwork", "picante", "Rfast", "rlang", "tibble", "tidygraph", "tidyr", "vctrs"] + "depends": ["Rfast", "arrangements", "doParallel", "dplyr", "ggplot2", "ggraph", "igraph", "magrittr", "patchwork", "picante", "rlang", "tibble", "tidygraph", "tidyr", "vctrs"] }, "NetIndices": { "name": "NetIndices", @@ -21281,13 +21503,13 @@ "name": "NetMix", "version": "0.2.0.2", "sha256": "1j45zxlirlsph411k76vzawd2zg9bldfp2r9z4pi5zdk129fprb5", - "depends": ["clue", "gtools", "igraph", "lda", "MASS", "Matrix", "poisbinom", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "clue", "gtools", "igraph", "lda", "poisbinom"] }, "NetOrigin": { "name": "NetOrigin", "version": "1.1-6", "sha256": "0brjg6w79r6bkga9dpqph9l7k6wq5hvsjfhrwx7dnyr437f7z4hk", - "depends": ["colorspace", "corpcor", "dplyr", "Hmisc", "igraph", "mvtnorm", "plyr", "tibble"] + "depends": ["Hmisc", "colorspace", "corpcor", "dplyr", "igraph", "mvtnorm", "plyr", "tibble"] }, "NetPreProc": { "name": "NetPreProc", @@ -21299,13 +21521,13 @@ "name": "NetRep", "version": "1.2.7", "sha256": "02ss45giv30pi31b5rysa36bn5c4fs5x58g4vb0arz9cnicznv97", - "depends": ["abind", "BH", "foreach", "RColorBrewer", "Rcpp", "RcppArmadillo", "RhpcBLASctl", "statmod"] + "depends": ["BH", "RColorBrewer", "Rcpp", "RcppArmadillo", "RhpcBLASctl", "abind", "foreach", "statmod"] }, "NetSimR": { "name": "NetSimR", "version": "0.1.5", "sha256": "1ipxr7wqlxa6qk5hhhbkr274v7f0hb1zjndcjgsk4gmv7cl7w21j", - "depends": ["DBI", "fitdistrplus", "future", "future_apply", "MASS", "Pareto", "plotly", "rmarkdown", "RMySQL", "RODBC", "RPostgreSQL", "RSQLite", "scales", "shiny", "shinybusy", "shinyjs", "shinyWidgets"] + "depends": ["DBI", "MASS", "Pareto", "RMySQL", "RODBC", "RPostgreSQL", "RSQLite", "fitdistrplus", "future", "future_apply", "plotly", "rmarkdown", "scales", "shiny", "shinyWidgets", "shinybusy", "shinyjs"] }, "NetSwan": { "name": "NetSwan", @@ -21323,7 +21545,7 @@ "name": "NetworkChange", "version": "0.8", "sha256": "03rzyfiwbqpr4jj3wdg3s1gnfizz39j07yk0q2fkq3a8pfx4w306", - "depends": ["abind", "GGally", "ggplot2", "ggrepel", "ggvis", "gridExtra", "igraph", "MASS", "MCMCpack", "mvtnorm", "network", "qgraph", "RColorBrewer", "reshape", "rlang", "Rmpfr", "tidyr"] + "depends": ["GGally", "MASS", "MCMCpack", "RColorBrewer", "Rmpfr", "abind", "ggplot2", "ggrepel", "ggvis", "gridExtra", "igraph", "mvtnorm", "network", "qgraph", "reshape", "rlang", "tidyr"] }, "NetworkComparisonTest": { "name": "NetworkComparisonTest", @@ -21341,37 +21563,37 @@ "name": "NetworkDistance", "version": "0.3.4", "sha256": "0z3q15aq5jqwbyxr4464nq74ib7644f185h8wfzvfi491xkrl4cr", - "depends": ["doParallel", "foreach", "graphon", "igraph", "Matrix", "network", "pracma", "Rcpp", "RcppArmadillo", "Rdpack", "RSpectra"] + "depends": ["Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "Rdpack", "doParallel", "foreach", "graphon", "igraph", "network", "pracma"] }, "NetworkExtinction": { "name": "NetworkExtinction", "version": "1.0.3", "sha256": "1y2f715y077bwj8ymamrskwhbc7adg7q9ijkks2yr2gwj8i47xy4", - "depends": ["broom", "doParallel", "doSNOW", "dplyr", "foreach", "ggplot2", "igraph", "magrittr", "MASS", "network", "patchwork", "purrr", "rlang", "scales", "sna", "tidyr"] + "depends": ["MASS", "broom", "doParallel", "doSNOW", "dplyr", "foreach", "ggplot2", "igraph", "magrittr", "network", "patchwork", "purrr", "rlang", "scales", "sna", "tidyr"] }, "NetworkInference": { "name": "NetworkInference", "version": "1.2.4", "sha256": "1x63szbns8wf3k89ibk2p66prngw4fr2ckfn1568mnxdwnzvhrb4", - "depends": ["assertthat", "checkmate", "ggplot2", "ggrepel", "Rcpp", "RcppProgress"] + "depends": ["Rcpp", "RcppProgress", "assertthat", "checkmate", "ggplot2", "ggrepel"] }, "NetworkReg": { "name": "NetworkReg", "version": "1.1", "sha256": "19z5m5hn2frqrfv3lymjwfy6b2vp6mfyanynzbb6g3xkafh6mnad", - "depends": ["Matrix", "randnet", "RSpectra"] + "depends": ["Matrix", "RSpectra", "randnet"] }, "NetworkRiskMeasures": { "name": "NetworkRiskMeasures", "version": "0.1.4", "sha256": "1121ma43jxc4p9rw0sc8w32shf9xrmn5qd1xsqgzr8diymc49zhg", - "depends": ["dplyr", "expm", "ggplot2", "Matrix"] + "depends": ["Matrix", "dplyr", "expm", "ggplot2"] }, "NetworkToolbox": { "name": "NetworkToolbox", "version": "1.4.2", "sha256": "026gizms1xsmlpzgssgqi2y5lfhvvbqkwy5q3a0d4xvzbmyan3y7", - "depends": ["corrplot", "doParallel", "fdrtool", "foreach", "igraph", "IsingFit", "MASS", "pbapply", "ppcor", "psych", "pwr", "qgraph", "R_matlab"] + "depends": ["IsingFit", "MASS", "R_matlab", "corrplot", "doParallel", "fdrtool", "foreach", "igraph", "pbapply", "ppcor", "psych", "pwr", "qgraph"] }, "NeuralNetTools": { "name": "NeuralNetTools", @@ -21383,13 +21605,13 @@ "name": "NeuralSens", "version": "1.1.3", "sha256": "0wd70qykzgsfz5pr05hjq5kcixz94787wm5qmh4nj7l8a5r01m76", - "depends": ["caret", "dplyr", "fastDummies", "ggbreak", "ggforce", "ggnewscale", "ggplot2", "ggrepel", "gridExtra", "Hmisc", "magrittr", "NeuralNetTools", "reshape2", "scales", "stringr"] + "depends": ["Hmisc", "NeuralNetTools", "caret", "dplyr", "fastDummies", "ggbreak", "ggforce", "ggnewscale", "ggplot2", "ggrepel", "gridExtra", "magrittr", "reshape2", "scales", "stringr"] }, "NeuroDecodeR": { "name": "NeuroDecodeR", "version": "0.2.0", "sha256": "1jylaw35q8c72j7r9mk2a03r0k46csm9qav00dd1axxifc9y7wyf", - "depends": ["doSNOW", "dplyr", "e1071", "forcats", "foreach", "ggplot2", "gridExtra", "magrittr", "purrr", "R_matlab", "scales", "stringr", "tibble", "tictoc", "tidyr"] + "depends": ["R_matlab", "doSNOW", "dplyr", "e1071", "forcats", "foreach", "ggplot2", "gridExtra", "magrittr", "purrr", "scales", "stringr", "tibble", "tictoc", "tidyr"] }, "Newdistns": { "name": "Newdistns", @@ -21413,7 +21635,7 @@ "name": "NicheBarcoding", "version": "1.0", "sha256": "16jkznc4624ww7vwid6f3m90wm2ds2c7zf1j1sw16dyrqmlyk9w3", - "depends": ["ape", "dismo", "e1071", "maps", "pROC", "randomForest", "raster", "rJava", "spider", "vegan"] + "depends": ["ape", "dismo", "e1071", "maps", "pROC", "rJava", "randomForest", "raster", "spider", "vegan"] }, "NightDay": { "name": "NightDay", @@ -21431,7 +21653,7 @@ "name": "NitrogenUptake2016", "version": "0.2.3", "sha256": "13mh63z3x8yqd31v5a4d10bhzk4y67ac38flwk2msv7qcx37sny6", - "depends": ["car", "MASS", "zoo"] + "depends": ["MASS", "car", "zoo"] }, "NlcOptim": { "name": "NlcOptim", @@ -21491,7 +21713,7 @@ "name": "NonProbEst", "version": "0.2.4", "sha256": "1w2ihnwwdnxlnphyd26261lsxaknpi51c15rmn9m183djz9gsvdv", - "depends": ["caret", "e1071", "glmnet", "Matrix", "sampling"] + "depends": ["Matrix", "caret", "e1071", "glmnet", "sampling"] }, "NonlinearTSA": { "name": "NonlinearTSA", @@ -21501,15 +21723,15 @@ }, "Nonpareil": { "name": "Nonpareil", - "version": "3.4.0", - "sha256": "130aags0pgry0d34mj1n4lavc8q43hls7c3jhmkr8k6vyg3ij372", + "version": "3.5.3", + "sha256": "1ih284darcb7y657xfm1zp1hzh3h8dj78n9q12gc0xpmwwffvp17", "depends": [] }, "NormData": { "name": "NormData", "version": "1.1", "sha256": "0v502sv5jpk644czq1d96qc4dw40j5hlvxy52ikjzhm89ri5gq9r", - "depends": ["car", "doBy", "dplyr", "lmtest", "MASS", "openxlsx", "sandwich"] + "depends": ["MASS", "car", "doBy", "dplyr", "lmtest", "openxlsx", "sandwich"] }, "NormExpression": { "name": "NormExpression", @@ -21533,7 +21755,7 @@ "name": "NormalityAssessment", "version": "0.1.0", "sha256": "0r9a51z614si3b45g01lfgapmgc4smjf2hylgy5kvq8w0yh0w5y6", - "depends": ["dplyr", "DT", "ggplot2", "rio", "rmatio", "shiny", "shinyalert", "shinyBS", "stringi", "stringr"] + "depends": ["DT", "dplyr", "ggplot2", "rio", "rmatio", "shiny", "shinyBS", "shinyalert", "stringi", "stringr"] }, "NostalgiR": { "name": "NostalgiR", @@ -21587,7 +21809,7 @@ "name": "OBASpatial", "version": "1.9", "sha256": "13jx5f5piii9cys7xyhfwilyg87zsi632fscy8902mlhbgg7abkp", - "depends": ["cubature", "HDInterval", "invgamma", "LaplacesDemon", "modeest", "mvtnorm", "truncdist"] + "depends": ["HDInterval", "LaplacesDemon", "cubature", "invgamma", "modeest", "mvtnorm", "truncdist"] }, "OBIC": { "name": "OBIC", @@ -21623,7 +21845,7 @@ "name": "OCNet", "version": "1.2.2", "sha256": "1ryb5jbz1dd4b9v45za6li1szdz8n9mmf3n3wx4ivqmcrnp2zqdh", - "depends": ["adespatial", "fields", "igraph", "Rcpp", "rgl", "spam", "spdep", "terra"] + "depends": ["Rcpp", "adespatial", "fields", "igraph", "rgl", "spam", "spdep", "terra"] }, "OCSdata": { "name": "OCSdata", @@ -21647,7 +21869,7 @@ "name": "ODEsensitivity", "version": "1.1.2", "sha256": "0yddv5h3y0xfviqjgrbixawd00jc1rh9ngckfqka5j855vhchh66", - "depends": ["checkmate", "deSolve", "ODEnetwork", "sensitivity"] + "depends": ["ODEnetwork", "checkmate", "deSolve", "sensitivity"] }, "ODMeans": { "name": "ODMeans", @@ -21659,7 +21881,7 @@ "name": "ODRF", "version": "0.0.4", "sha256": "017z7yr4r864cxvqyn14fxgmc2rgq01c95sbcmp6qg8dj03bcz53", - "depends": ["doParallel", "foreach", "glue", "lifecycle", "magrittr", "nnet", "partykit", "Pursuit", "Rcpp", "RcppArmadillo", "rlang"] + "depends": ["Pursuit", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "glue", "lifecycle", "magrittr", "nnet", "partykit", "rlang"] }, "ODS": { "name": "ODS", @@ -21671,7 +21893,7 @@ "name": "ODataQuery", "version": "0.5.3", "sha256": "058j3rc5kh134ndsxn5gck2xh6llrs73cyxpa5z8zkmsw9am22qj", - "depends": ["httr", "jsonlite", "R6", "rlang"] + "depends": ["R6", "httr", "jsonlite", "rlang"] }, "OECD": { "name": "OECD", @@ -21683,7 +21905,7 @@ "name": "OEFPIL", "version": "0.1.1", "sha256": "0gnbbz2spaqlqqn7978l15jv7xiqpfrh8k9girrpdqih02x95rfw", - "depends": ["Deriv", "ggplot2", "MASS", "matrixcalc", "minpack_lm", "plyr"] + "depends": ["Deriv", "MASS", "ggplot2", "matrixcalc", "minpack_lm", "plyr"] }, "OGI": { "name": "OGI", @@ -21699,8 +21921,8 @@ }, "OHPL": { "name": "OHPL", - "version": "1.4", - "sha256": "0svim112khdymdj1bsj8vri6r0zph5312y148mlh5h98rah40i08", + "version": "1.4.1", + "sha256": "1bcg97lgjs00xka2k5k8kdnc42vz10g78cb9mh5jz2g58iamjzbk", "depends": ["glmnet", "mvtnorm", "pls"] }, "OLCPM": { @@ -21753,21 +21975,21 @@ }, "OPI": { "name": "OPI", - "version": "2.11.2", - "sha256": "0r1v1l04y39w5p99szwhrh1n0vjvk99pdnrc4c72rvlzcaq11zzx", - "depends": ["abind", "openssl", "Rfast"] + "version": "3.0.2", + "sha256": "19fgfkd8zf8r7cqmkqvhzkv8lwnbg33cvm8kapqp7sb6g4i3qk1x", + "depends": ["Rfast", "abind", "jsonlite", "openssl"] }, "OPTS": { "name": "OPTS", "version": "0.1", "sha256": "0h382gcjq2f4qm63xnqvhjvxyn9w01dzx8964fk6cm2izhw04bk2", - "depends": ["changepoint", "cvTools", "MASS"] + "depends": ["MASS", "changepoint", "cvTools"] }, "OPTtesting": { "name": "OPTtesting", "version": "1.0.0", "sha256": "1d5pkvrzz5hvr764kyliyba5mgix9y340gdcvc0d0si41rz12r91", - "depends": ["quantreg", "rootSolve", "RSpectra"] + "depends": ["RSpectra", "quantreg", "rootSolve"] }, "ORCME": { "name": "ORCME", @@ -21791,7 +22013,13 @@ "name": "ORION", "version": "1.0.3", "sha256": "0zzlvx1yd3hy8dy7nbmkj7d2k6609ys91s894qcgx5n7jirqviy3", - "depends": ["doParallel", "e1071", "foreach", "igraph", "knitr", "randomForest", "rmarkdown", "TunePareto"] + "depends": ["TunePareto", "doParallel", "e1071", "foreach", "igraph", "knitr", "randomForest", "rmarkdown"] + }, + "ORIONZ_G": { + "name": "ORIONZ.G", + "version": "1.0.1", + "sha256": "05223qkvqpr1nr7jxznin11jcyapzp76p47xqhl1jr1hif3akvrb", + "depends": [] }, "ORKM": { "name": "ORKM", @@ -21821,25 +22049,25 @@ "name": "OSFD", "version": "1.0", "sha256": "1xw76hi34vgq1r6r22z4bqp114nzg4h85mvz6pya724vyf110vhg", - "depends": ["dplyr", "lhs", "Rcpp", "RcppArmadillo", "twinning"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "lhs", "twinning"] }, "OSLdecomposition": { "name": "OSLdecomposition", "version": "1.0.0", "sha256": "0xz27p4wd1a5y8x24sqgpyvgdwi2dzk4qh2s50xrdr82prb2znkv", - "depends": ["DEoptim", "ggplot2", "ggpubr", "gridExtra", "Luminescence", "minpack_lm", "rmarkdown", "scales"] + "depends": ["DEoptim", "Luminescence", "ggplot2", "ggpubr", "gridExtra", "minpack_lm", "rmarkdown", "scales"] }, "OSMscale": { "name": "OSMscale", "version": "0.5.20", "sha256": "14n5574j083xllj0xs87cl8szc0favb8wp3v10bbdljbk35qvmbm", - "depends": ["berryFunctions", "OpenStreetMap", "pbapply", "sf"] + "depends": ["OpenStreetMap", "berryFunctions", "pbapply", "sf"] }, "OSNMTF": { "name": "OSNMTF", "version": "0.1.0", "sha256": "0g83wqh97iz3g4ganj2dy3biyn8cmb0v8zz6rydald1hfszj8aa2", - "depends": ["dplyr", "MASS"] + "depends": ["MASS", "dplyr"] }, "OSTE": { "name": "OSTE", @@ -21875,19 +22103,19 @@ "name": "OTclust", "version": "1.0.6", "sha256": "00609z2fp3ijqid7yjgh045xz038h5jl7i1k2kww3kfpcf40mhzs", - "depends": ["class", "ggplot2", "magrittr", "RColorBrewer", "Rcpp"] + "depends": ["RColorBrewer", "Rcpp", "class", "ggplot2", "magrittr"] }, "OTrecod": { "name": "OTrecod", "version": "0.1.2", "sha256": "1w3w6vsp5v2sccpn0zzjiwcnwmgcindh7wnsnf90qprvjwlys7mw", - "depends": ["dplyr", "FactoMineR", "mice", "missMDA", "ompr", "ompr_roi", "party", "plyr", "proxy", "rdist", "ROI", "ROI_plugin_glpk", "StatMatch", "vcd"] + "depends": ["FactoMineR", "ROI", "ROI_plugin_glpk", "StatMatch", "dplyr", "mice", "missMDA", "ompr", "ompr_roi", "party", "plyr", "proxy", "rdist", "vcd"] }, "OUwie": { "name": "OUwie", "version": "2.10", "sha256": "19bh0vb7azxpzrjw2829gcjcq91fnzb5ybhkp3fsvg9xccmjq9dg", - "depends": ["ape", "corpcor", "geiger", "igraph", "interp", "lhs", "nloptr", "numDeriv", "paleotree", "phangorn", "phylolm", "phytools", "RColorBrewer"] + "depends": ["RColorBrewer", "ape", "corpcor", "geiger", "igraph", "interp", "lhs", "nloptr", "numDeriv", "paleotree", "phangorn", "phylolm", "phytools"] }, "OVL_CI": { "name": "OVL.CI", @@ -21899,13 +22127,13 @@ "name": "OVtool", "version": "1.0.3", "sha256": "1ghfbvnfl092g0kikgjghgf0l1y7ihqykssfvvfi6q6pgzl8kz4y", - "depends": ["Amelia", "devtools", "dplyr", "EnvStats", "ggplot2", "ggrepel", "glue", "magrittr", "metR", "progress", "purrr", "rlang", "survey", "tibble", "tidyselect", "twang", "varhandle"] + "depends": ["Amelia", "EnvStats", "devtools", "dplyr", "ggplot2", "ggrepel", "glue", "magrittr", "metR", "progress", "purrr", "rlang", "survey", "tibble", "tidyselect", "twang", "varhandle"] }, "OWEA": { "name": "OWEA", "version": "0.1.2", "sha256": "05h3aj074manlwnlzqp023zkql6gmsm9p1nfs6zki7ifdd83wj7m", - "depends": ["gtools", "MASS", "shiny"] + "depends": ["MASS", "gtools", "shiny"] }, "Oarray": { "name": "Oarray", @@ -21951,8 +22179,8 @@ }, "OlinkAnalyze": { "name": "OlinkAnalyze", - "version": "3.7.0", - "sha256": "0rj57ipm2lk11ysscgqaa38hgysyxr9nb5zvp17kxf5cla17dskc", + "version": "3.8.2", + "sha256": "0i8bpx3baq6x2hkk2zf45yxjk4mzhrw6wbksw1z1w11hghyld6vs", "depends": ["broom", "car", "dplyr", "emmeans", "forcats", "generics", "ggplot2", "ggpubr", "ggrepel", "lme4", "lmerTest", "magrittr", "readxl", "rlang", "rstatix", "stringr", "tibble", "tidyr", "tidyselect", "zip"] }, "OlympicRshiny": { @@ -21971,7 +22199,7 @@ "name": "OmicKriging", "version": "1.4.0", "sha256": "08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig", - "depends": ["doParallel", "foreach", "irlba", "ROCR"] + "depends": ["ROCR", "doParallel", "foreach", "irlba"] }, "OmicNavigator": { "name": "OmicNavigator", @@ -22001,7 +22229,7 @@ "name": "Omisc", "version": "0.1.5", "sha256": "0p0iraascyx16y05rpc2c9k25s4crc0wrxy58dpj7jd47g2360ar", - "depends": ["copula", "MASS", "psych"] + "depends": ["MASS", "copula", "psych"] }, "OmnibusFisher": { "name": "OmnibusFisher", @@ -22025,13 +22253,13 @@ "name": "OncoBayes2", "version": "0.8-9", "sha256": "06k0lbriyx6b1nlvpyjhf5g8dp8wa37wi1pmlpfqq7ryivp39v38", - "depends": ["abind", "assertthat", "bayesplot", "BH", "checkmate", "dplyr", "Formula", "ggplot2", "matrixStats", "posterior", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "scales", "StanHeaders", "tibble", "tidyr", "tidyselect"] + "depends": ["BH", "Formula", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "abind", "assertthat", "bayesplot", "checkmate", "dplyr", "ggplot2", "matrixStats", "posterior", "rlang", "rstan", "rstantools", "scales", "tibble", "tidyr", "tidyselect"] }, "OncoSubtype": { "name": "OncoSubtype", "version": "1.0.0", "sha256": "12d32i8q4j0hlkxlk6s8r5ycib6lx5jdsp8g404zmjrsd96aadr2", - "depends": ["caret", "dplyr", "e1071", "limma", "pheatmap", "randomForest", "Rdpack", "rlang", "SummarizedExperiment", "tibble"] + "depends": ["Rdpack", "SummarizedExperiment", "caret", "dplyr", "e1071", "limma", "pheatmap", "randomForest", "rlang", "tibble"] }, "Oncofilterfast": { "name": "Oncofilterfast", @@ -22047,15 +22275,15 @@ }, "One4All": { "name": "One4All", - "version": "0.4", - "sha256": "1f0gymlpdyz9dm71mj99cyp58c1nwxr8d4g9c976mf5mimz2rhyn", + "version": "0.5", + "sha256": "081d40n8whvhykzdpm2crwmpr3mlczd6svhcpr48nxdhh56pyhjf", "depends": ["aws_s3", "ckanr", "data_table", "digest", "dplyr", "httr", "jsonlite", "lexicon", "mongolite", "openxlsx", "readr", "readxl", "rlang", "shiny", "tibble", "validate"] }, "OneArm2stage": { "name": "OneArm2stage", "version": "1.2.1", "sha256": "040yv2bl6s7b1bgma7z1hgrsj8iynzayjc77ncp401nd1ng5wmw5", - "depends": ["flexsurv", "IPDfromKM", "survival"] + "depends": ["IPDfromKM", "flexsurv", "survival"] }, "OneArmTTE": { "name": "OneArmTTE", @@ -22077,9 +22305,9 @@ }, "OneSampleMR": { "name": "OneSampleMR", - "version": "0.1.4", - "sha256": "11wcrmhibr02wbkdw77imcjancfdfzcqkz6wfjiiydx3hsksymck", - "depends": ["ellipsis", "Formula", "gmm", "ivreg", "lmtest", "msm"] + "version": "0.1.5", + "sha256": "1swjc1gsddihdcx9c219vzh9xn379fp8jlvvs5jhikixkk1frqdq", + "depends": ["Formula", "gmm", "ivreg", "lmtest", "msm", "rlang"] }, "OneStep": { "name": "OneStep", @@ -22103,7 +22331,7 @@ "name": "OpEnHiMR", "version": "0.1.1", "sha256": "0wgjihdfjvsf3p97ll496ixwv2xzlgsr138pzgalw5hq0p1kmld6", - "depends": ["Biostrings", "caret", "devtools", "dplyr", "e1071", "entropy", "ftrCOOL", "gbm", "party", "randomForest", "RCurl", "seqinr", "splitstackshape", "stringr", "tidyverse"] + "depends": ["Biostrings", "RCurl", "caret", "devtools", "dplyr", "e1071", "entropy", "ftrCOOL", "gbm", "party", "randomForest", "seqinr", "splitstackshape", "stringr", "tidyverse"] }, "OpenCL": { "name": "OpenCL", @@ -22115,7 +22343,7 @@ "name": "OpenImageR", "version": "1.3.0", "sha256": "0j15kwhjazr35yqs9lhw0pfqmrd9rm75gs160dn3xcyc3nw2is56", - "depends": ["jpeg", "lifecycle", "png", "R6", "Rcpp", "RcppArmadillo", "shiny", "tiff"] + "depends": ["R6", "Rcpp", "RcppArmadillo", "jpeg", "lifecycle", "png", "shiny", "tiff"] }, "OpenLand": { "name": "OpenLand", @@ -22127,7 +22355,7 @@ "name": "OpenML", "version": "1.12", "sha256": "0ij4mnbfkckidv9f414fclyhrbbkgmpz5zsjiqa3zlckr3pfaxg7", - "depends": ["backports", "BBmisc", "checkmate", "curl", "data_table", "digest", "httr", "jsonlite", "memoise", "stringi", "XML"] + "depends": ["BBmisc", "XML", "backports", "checkmate", "curl", "data_table", "digest", "httr", "jsonlite", "memoise", "stringi"] }, "OpenMindat": { "name": "OpenMindat", @@ -22137,21 +22365,21 @@ }, "OpenMx": { "name": "OpenMx", - "version": "2.21.11", - "sha256": "1k3i82higil43w4pryg1ghpswa8vxmc28dcv60gvkmmjrnwp098m", - "depends": ["BH", "digest", "lifecycle", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "rpf", "StanHeaders"] + "version": "2.21.12", + "sha256": "13jgm9ps4ak30ri61az8c5w4j36k77dq4gsbc0v66ydx3ciyf1n7", + "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "digest", "lifecycle", "rpf"] }, "OpenRepGrid": { "name": "OpenRepGrid", - "version": "0.1.14", - "sha256": "1gy06cyjb50673jb9548c9v37im4hsm245r7rwhx280q9fsn17ws", - "depends": ["abind", "colorspace", "crayon", "dplyr", "igraph", "openxlsx", "plyr", "psych", "pvclust", "rgl", "scales", "stringr", "tidyr", "XML"] + "version": "0.1.15", + "sha256": "0sdqz9bhwfqcpggd2yw4inlfzn4qkzv1vxnri6mxqmjpkb7arysw", + "depends": ["XML", "abind", "colorspace", "crayon", "dplyr", "igraph", "openxlsx", "plyr", "psych", "pvclust", "scales", "stringr", "tidyr"] }, "OpenRepGrid_ic": { "name": "OpenRepGrid.ic", "version": "0.6.2", "sha256": "1v8sqlid97xnp0nddn4yr6im8zah1pclirvmz1n7qmc91656plx6", - "depends": ["dplyr", "DT", "formattable", "igraph", "magrittr", "openxlsx", "RColorBrewer", "reshape2", "rintrojs", "scales", "shiny", "shinyBS", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyFeedback", "shinyjs", "shinythemes", "shinyWidgets", "stringr", "tidyr", "tidyverse", "withr"] + "depends": ["DT", "RColorBrewer", "dplyr", "formattable", "igraph", "magrittr", "openxlsx", "reshape2", "rintrojs", "scales", "shiny", "shinyBS", "shinyFeedback", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyjs", "shinythemes", "stringr", "tidyr", "tidyverse", "withr"] }, "OpenSpecy": { "name": "OpenSpecy", @@ -22163,7 +22391,7 @@ "name": "OpenStreetMap", "version": "0.4.0", "sha256": "0iq3y3331rjppc8nfx9krrrfybyn1spwfp15hf3vz8mnmcg86dkf", - "depends": ["ggplot2", "raster", "rJava", "sp"] + "depends": ["ggplot2", "rJava", "raster", "sp"] }, "OpenTreeChronograms": { "name": "OpenTreeChronograms", @@ -22181,13 +22409,13 @@ "name": "Opt5PL", "version": "0.1.1", "sha256": "0v3ibfzmkfnkhxylhaqcd3yqygsk7027ga12vb6gj4h4zcccf17f", - "depends": ["matrixcalc", "Rcpp"] + "depends": ["Rcpp", "matrixcalc"] }, "OptCirClust": { "name": "OptCirClust", "version": "0.0.4", "sha256": "0g34kn2gmvy9r4ph0vbssc9gl8bcpw6d72b8zpf38iml4zh52b0n", - "depends": ["Ckmeans_1d_dp", "plotrix", "Rcpp", "Rdpack", "reshape2"] + "depends": ["Ckmeans_1d_dp", "Rcpp", "Rdpack", "plotrix", "reshape2"] }, "OptGS": { "name": "OptGS", @@ -22219,12 +22447,6 @@ "sha256": "0fdszrblayi2hlmkgvwqxw1fh5nh2jad6sxlc788jrzjrd8nkldj", "depends": ["pwr"] }, - "OptiSembleForecasting": { - "name": "OptiSembleForecasting", - "version": "0.1.0", - "sha256": "0j1xjh59iyb99p73wjvqr8yrsj6yplsl2rrx50bds9ksjbq1qmym", - "depends": ["caretForecast", "dplyr", "factoextra", "FactoMineR", "forecast", "keras", "kknn", "MCS", "metaheuristicOpt", "Metrics", "neuralnet", "readxl", "tensorflow", "tibble", "tsutils"] - }, "OptimModel": { "name": "OptimModel", "version": "2.0-1", @@ -22235,7 +22457,7 @@ "name": "OptimaRegion", "version": "1.2", "sha256": "01nbisv45amv5pfnl0hmbc751qjkjvw8xsva50q8ypm02p2jw07f", - "depends": ["boot", "DepthProc", "fields", "magrittr", "nloptr", "Rdpack", "Rdsdp", "rsm", "spam", "stringr"] + "depends": ["DepthProc", "Rdpack", "Rdsdp", "boot", "fields", "magrittr", "nloptr", "rsm", "spam", "stringr"] }, "OptimalCutpoints": { "name": "OptimalCutpoints", @@ -22247,19 +22469,19 @@ "name": "OptimalDesign", "version": "1.0.1", "sha256": "02vxxb25q7fl73y7zq0a89ra0s88wji4mrql7p88014p073lj2as", - "depends": ["lpSolve", "Matrix", "matrixcalc", "matrixStats", "plyr", "quadprog", "rgl"] + "depends": ["Matrix", "lpSolve", "matrixStats", "matrixcalc", "plyr", "quadprog", "rgl"] }, "OptimalGoldstandardDesigns": { "name": "OptimalGoldstandardDesigns", "version": "1.0.1", "sha256": "1rw3syj5wb1v8ryqc9vkchi62pf02460f5i5zapq2azgfg99l66y", - "depends": ["cli", "dplyr", "mvtnorm", "nloptr", "Rdpack", "tibble"] + "depends": ["Rdpack", "cli", "dplyr", "mvtnorm", "nloptr", "tibble"] }, "OptimalRerandExpDesigns": { "name": "OptimalRerandExpDesigns", "version": "1.1", "sha256": "033qwzglpzjk302dr19yak34j2k19k6vihd3vlj9c8xsiikmrfmj", - "depends": ["ggplot2", "GreedyExperimentalDesign", "momentchi2"] + "depends": ["GreedyExperimentalDesign", "ggplot2", "momentchi2"] }, "OptimalSurrogate": { "name": "OptimalSurrogate", @@ -22289,19 +22511,19 @@ "name": "Orcs", "version": "1.2.3", "sha256": "0b2h0vyvp6hnp9i03c8yxfhrlbdq0akdlw2ik0k5c09wfiq7amq6", - "depends": ["bookdown", "knitr", "lattice", "latticeExtra", "plotrix", "Rcpp", "remotes", "sf", "sp", "terra"] + "depends": ["Rcpp", "bookdown", "knitr", "lattice", "latticeExtra", "plotrix", "remotes", "sf", "sp", "terra"] }, "OrdCD": { "name": "OrdCD", "version": "1.1.2", "sha256": "1wg4sxirzp8r91qzzvrx4yashg1f574ayaxbviy8hdca3iydfl1j", - "depends": ["bnlearn", "gRbase", "igraph", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "bnlearn", "gRbase", "igraph"] }, "OrdFacReg": { "name": "OrdFacReg", "version": "1.0.6", "sha256": "16mavsmp6d8rfmimmp5ynwyzir0gycpg8rhd8cwanlrndyclqlpv", - "depends": ["eha", "MASS", "survival"] + "depends": ["MASS", "eha", "survival"] }, "OrdMonReg": { "name": "OrdMonReg", @@ -22313,7 +22535,7 @@ "name": "OrdNor", "version": "2.2.3", "sha256": "0yjvylp8z24w6nbwy9rjyk0y7gpzsxzsqm8x4q4fn8g87cb3314v", - "depends": ["corpcor", "GenOrd", "Matrix", "mvtnorm"] + "depends": ["GenOrd", "Matrix", "corpcor", "mvtnorm"] }, "OrgMassSpecR": { "name": "OrgMassSpecR", @@ -22321,6 +22543,12 @@ "sha256": "1dx9d8rb1dfqyhyc26zhfnxiv3rz2ikvs2mwqnsrq3lsjs9dvyc8", "depends": [] }, + "OrigamiPlot": { + "name": "OrigamiPlot", + "version": "0.1.0", + "sha256": "1p2fzv8bx3pxhskf1h9b6mk72b15g0l0ribp4da1vq58xn9cjgil", + "depends": ["fmsb", "plotrix"] + }, "OrthoPanels": { "name": "OrthoPanels", "version": "1.2-4", @@ -22349,7 +22577,7 @@ "name": "Ostats", "version": "0.2.0", "sha256": "0d2qk76issb2k5f2ghfvpq0k8ra7d7nj9hp4ja1s0817zwr0g3zz", - "depends": ["circular", "ggplot2", "gridExtra", "hypervolume", "MASS", "matrixStats", "sfsmisc", "viridis"] + "depends": ["MASS", "circular", "ggplot2", "gridExtra", "hypervolume", "matrixStats", "sfsmisc", "viridis"] }, "OutliersLearn": { "name": "OutliersLearn", @@ -22361,7 +22589,7 @@ "name": "OutliersO3", "version": "0.6.3", "sha256": "165v572w9bnvay9f0xyxzbhgj1i86ndia4rzqy98i48dfdbdb990", - "depends": ["cellWise", "dplyr", "FastPCS", "forcats", "GGally", "ggplot2", "HDoutliers", "memisc", "rlist", "robustbase", "robustX", "tidyr"] + "depends": ["FastPCS", "GGally", "HDoutliers", "cellWise", "dplyr", "forcats", "ggplot2", "memisc", "rlist", "robustX", "robustbase", "tidyr"] }, "OwenQ": { "name": "OwenQ", @@ -22379,31 +22607,31 @@ "name": "PAC", "version": "1.1.4", "sha256": "0h7381mr3jgzl7fi6v7amgmkf5agpkgy068c6ysgh3adlwsh6gs6", - "depends": ["dplyr", "ggplot2", "ggrepel", "igraph", "infotheo", "parmigene", "Rcpp", "Rtsne"] + "depends": ["Rcpp", "Rtsne", "dplyr", "ggplot2", "ggrepel", "igraph", "infotheo", "parmigene"] }, "PACLasso": { "name": "PACLasso", "version": "1.0.0", "sha256": "1qzzymhfsjy8mk0r0xpd5h4wrx4wk8gq3vi6fnawkq5xkrg26rld", - "depends": ["lars", "limSolve", "MASS", "penalized", "quadprog"] + "depends": ["MASS", "lars", "limSolve", "penalized", "quadprog"] }, "PACVr": { "name": "PACVr", "version": "1.0.11", "sha256": "0wj32rghf040539z6lld4zspyalz3c4ag1syr940arvilvyv5wav", - "depends": ["Biostrings", "dplyr", "GenomicAlignments", "GenomicRanges", "IRanges", "logger", "R6", "RCircos", "read_gb", "tidyr"] + "depends": ["Biostrings", "GenomicAlignments", "GenomicRanges", "IRanges", "R6", "RCircos", "dplyr", "logger", "read_gb", "tidyr"] }, "PAFit": { "name": "PAFit", "version": "1.2.10", "sha256": "10p2q90jbjyzbvn8kgx1i8if144gq2zylqh8h3x4sg2ajqbcv8kg", - "depends": ["ggplot2", "igraph", "knitr", "magicaxis", "mapproj", "MASS", "network", "networkDynamic", "plyr", "RColorBrewer", "Rcpp", "VGAM"] + "depends": ["MASS", "RColorBrewer", "Rcpp", "VGAM", "ggplot2", "igraph", "knitr", "magicaxis", "mapproj", "network", "networkDynamic", "plyr"] }, "PAGFL": { "name": "PAGFL", - "version": "1.1.0", - "sha256": "1dh3hdrr5dhs7azvcn1r6lgyy2sqkr0nfzkcf2sh0vm6zxz85ssy", - "depends": ["ggplot2", "lifecycle", "Rcpp", "RcppArmadillo", "RcppParallel"] + "version": "1.1.1", + "sha256": "0as4azrg4hmh5slljjasvq248r0qylvgyqcz1myfxgja9lpzd604", + "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "ggplot2", "lifecycle"] }, "PAGWAS": { "name": "PAGWAS", @@ -22413,33 +22641,33 @@ }, "PAICE": { "name": "PAICE", - "version": "1.0.1", - "sha256": "1qnyg5p62xryifjnbc2z5yxy4s5fszxf713cgaisds96wjqvzx8a", + "version": "1.0.2", + "sha256": "04zqyi5zvigg21pa4mqz948gxiqixc8j12n47c1ndjsd2ras98wb", "depends": [] }, "PAMhm": { "name": "PAMhm", "version": "0.1.2", "sha256": "0k0n3ni0ypcizri39v76x1vv7hlxlmbpfi7w81yxy9inz7zz4zfw", - "depends": ["cluster", "heatmapFlex", "plyr", "R_utils", "RColorBrewer", "readmoRe", "readxl", "robustHD"] + "depends": ["RColorBrewer", "R_utils", "cluster", "heatmapFlex", "plyr", "readmoRe", "readxl", "robustHD"] }, "PAMmisc": { "name": "PAMmisc", "version": "1.12.1", "sha256": "0xv4bm1gzvhybgaww24nikwcbn8wq8299gbr1n831gscnzablzp3", - "depends": ["dplyr", "fftw", "geosphere", "ggplot2", "httr", "lubridate", "magrittr", "ncdf4", "PamBinaries", "purrr", "RcppRoll", "rerddap", "rjson", "RSQLite", "scales", "seewave", "signal", "suncalc", "tuneR", "xml2"] + "depends": ["PamBinaries", "RSQLite", "RcppRoll", "dplyr", "fftw", "geosphere", "ggplot2", "httr", "lubridate", "magrittr", "ncdf4", "purrr", "rerddap", "rjson", "scales", "seewave", "signal", "suncalc", "tuneR", "xml2"] }, "PAMpal": { "name": "PAMpal", - "version": "1.0.0", - "sha256": "0mr4c7ckw05mh5lmr0qhpas98122yn257gip6w2hwrcyziy5sc4v", - "depends": ["data_table", "dplyr", "gam", "geosphere", "ggplot2", "knitr", "lubridate", "manipulate", "PamBinaries", "PAMmisc", "purrr", "reticulate", "rlang", "RSQLite", "seewave", "signal", "stringr", "tidyr", "tuneR", "xml2"] + "version": "1.2.1", + "sha256": "1jb89rl1apb1nb1yfhq0knqkw7n6jcb2l4aqq61qy28iwl7vanr5", + "depends": ["PAMmisc", "PamBinaries", "RSQLite", "data_table", "dplyr", "gam", "geosphere", "ggplot2", "knitr", "lubridate", "purrr", "reticulate", "rlang", "seewave", "shiny", "signal", "tidyr", "tuneR", "xml2"] }, "PAMscapes": { "name": "PAMscapes", - "version": "0.5.8", - "sha256": "094084w6zamchzh6fwcgy839brq28vqkji2p335bpni9dfkz3cd5", - "depends": ["data_table", "dplyr", "geosphere", "ggplot2", "httr", "lubridate", "magrittr", "ncdf4", "PAMmisc", "purrr", "readr", "rlang", "scales", "sf", "tdigest", "tidyr"] + "version": "0.6.0", + "sha256": "0w8jrlr4j6fagzgqksbcrxn7zjqkwh4f5vaf958r48k8y6nfqpih", + "depends": ["PAMmisc", "data_table", "dplyr", "geosphere", "ggplot2", "httr", "lubridate", "magrittr", "ncdf4", "purrr", "readr", "rlang", "scales", "sf", "tdigest", "tidyr"] }, "PANACEA": { "name": "PANACEA", @@ -22451,7 +22679,7 @@ "name": "PANPRSnext", "version": "1.2.0", "sha256": "1s9kv58af7hj65qxcnrsfjrh8xfqhm5m4kpg279li5b4g4cpnqx9", - "depends": ["gtools", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "gtools"] }, "PAS": { "name": "PAS", @@ -22469,7 +22697,7 @@ "name": "PASWR", "version": "1.3", "sha256": "1p4896r4k6c0aaag4mwds2azp41amf726c4v62zca92cpsay4nml", - "depends": ["e1071", "lattice", "MASS"] + "depends": ["MASS", "e1071", "lattice"] }, "PASWR2": { "name": "PASWR2", @@ -22493,13 +22721,13 @@ "name": "PAsso", "version": "0.1.10", "sha256": "1qfwwgcra86x4469bqrv3jdm3vyvdiialfgfy184d1l5294pwv4x", - "depends": ["copBasic", "copula", "dplyr", "foreach", "GGally", "ggplot2", "gridExtra", "MASS", "pcaPP", "plotly", "progress", "Rcpp", "VGAM"] + "depends": ["GGally", "MASS", "Rcpp", "VGAM", "copBasic", "copula", "dplyr", "foreach", "ggplot2", "gridExtra", "pcaPP", "plotly", "progress"] }, "PBD": { "name": "PBD", "version": "1.4", "sha256": "1n8gq8ms6gszr469hblipbgalc5m7gfiknpsbqywxml62sr4wbsb", - "depends": ["ade4", "ape", "DDD", "deSolve", "phytools"] + "depends": ["DDD", "ade4", "ape", "deSolve", "phytools"] }, "PBIBD": { "name": "PBIBD", @@ -22517,7 +22745,7 @@ "name": "PBImisc", "version": "1.0", "sha256": "18gjp66q6l0w6vsgm6d5sjgpa906z1gyyp6yf58lq5vyg1bnfmcl", - "depends": ["lme4", "Matrix"] + "depends": ["Matrix", "lme4"] }, "PBNPA": { "name": "PBNPA", @@ -22559,7 +22787,13 @@ "name": "PCADSC", "version": "0.8.0", "sha256": "0pwkmmnsw3c6ch2k5wdc8ig71994pdp79v3a5aa9n9aq55a8c2ir", - "depends": ["ggplot2", "Matrix", "pander", "reshape2"] + "depends": ["Matrix", "ggplot2", "pander", "reshape2"] + }, + "PCAPAM50": { + "name": "PCAPAM50", + "version": "1.0.1", + "sha256": "09jmpw38q3j0yk27r54d3y6fbgh69a6712zklv8qrfyq59kkshnc", + "depends": ["Biobase", "ComplexHeatmap", "impute", "lattice"] }, "PCAmatchR": { "name": "PCAmatchR", @@ -22583,7 +22817,7 @@ "name": "PCDimension", "version": "1.1.13", "sha256": "0mpf7m4daqaip18yfsyanrmbjq4ib9fw1b65ajdazicm400bw6gb", - "depends": ["changepoint", "ClassDiscovery", "cpm", "kernlab", "oompaBase"] + "depends": ["ClassDiscovery", "changepoint", "cpm", "kernlab", "oompaBase"] }, "PCFAM": { "name": "PCFAM", @@ -22595,7 +22829,7 @@ "name": "PCGII", "version": "1.1.2", "sha256": "0bh37354qk2hj90f9l2908466bvwzjmxr70nyivhqkx2ffp5j42n", - "depends": ["corpcor", "dplyr", "glmnet", "igraph", "Matrix"] + "depends": ["Matrix", "corpcor", "dplyr", "glmnet", "igraph"] }, "PCGSE": { "name": "PCGSE", @@ -22631,13 +22865,13 @@ "name": "PCMBaseCpp", "version": "0.1.9", "sha256": "0k40mxs8w1vk7qwpkv8gnq6cq3kpj7wvf0i6f1qn1wmm2vvz1kfy", - "depends": ["abind", "data_table", "PCMBase", "Rcpp", "RcppArmadillo"] + "depends": ["PCMBase", "Rcpp", "RcppArmadillo", "abind", "data_table"] }, "PCMRS": { "name": "PCMRS", "version": "0.1-4", "sha256": "0bf85zv3nl13gsdi96cd2qg7mfppsccs0ci7l204hws8nmbvri83", - "depends": ["cubature", "ltm", "mvtnorm", "Rcpp", "RcppArmadillo", "statmod"] + "depends": ["Rcpp", "RcppArmadillo", "cubature", "ltm", "mvtnorm", "statmod"] }, "PCObw": { "name": "PCObw", @@ -22649,13 +22883,13 @@ "name": "PCPS", "version": "1.0.7", "sha256": "0gxymz0yws1q1bxkpxi0lmbv57xx62h3dl7z3i2cnbagswkax3zh", - "depends": ["ape", "nlme", "phylobase", "picante", "RcppArmadillo", "SYNCSA", "vegan"] + "depends": ["RcppArmadillo", "SYNCSA", "ape", "nlme", "phylobase", "picante", "vegan"] }, "PCRA": { "name": "PCRA", "version": "1.2", "sha256": "0nc7pfvy43drjhfgql7bxf93xlkaqg083hc5cvirya1blrx2m48j", - "depends": ["boot", "corpcor", "data_table", "lattice", "PerformanceAnalytics", "PortfolioAnalytics", "quadprog", "R_cache", "RobStatTM", "robustbase", "xts", "zoo"] + "depends": ["PerformanceAnalytics", "PortfolioAnalytics", "R_cache", "RobStatTM", "boot", "corpcor", "data_table", "lattice", "quadprog", "robustbase", "xts", "zoo"] }, "PCS": { "name": "PCS", @@ -22723,6 +22957,12 @@ "sha256": "0s09sywvy83dj06rkxzyi06wfymwnfpgf3lpgjbb8ps8q3byd4vs", "depends": ["shiny"] }, + "PDXpower": { + "name": "PDXpower", + "version": "1.0.3", + "sha256": "0dpwc3wpsqm844lzlymanfi4pj7ajhqsqf025vx64j815j3q1122", + "depends": ["frailtypack", "ggplot2", "ggpubr", "nlme", "survival"] + }, "PDtoolkit": { "name": "PDtoolkit", "version": "1.2.0", @@ -22751,13 +22991,13 @@ "name": "PEIP", "version": "2.2-5", "sha256": "1xvwpsnyxnf3qi1hq5r7dx4bi4s03v53r0m979hyyzcc7w9fr5r5", - "depends": ["bvls", "fields", "geigen", "Matrix", "pracma", "RSEIS"] + "depends": ["Matrix", "RSEIS", "bvls", "fields", "geigen", "pracma"] }, "PELVIS": { "name": "PELVIS", "version": "2.0.4", "sha256": "0bn8zxw0lrc5bxm7iq216jnw35vr7zj2ajw0wn2rv7nx3zyd0r6z", - "depends": ["DT", "htmlwidgets", "MASS", "shiny"] + "depends": ["DT", "MASS", "htmlwidgets", "shiny"] }, "PEPBVS": { "name": "PEPBVS", @@ -22769,13 +23009,13 @@ "name": "PERK", "version": "0.0.9.2", "sha256": "0x62cmfl71s0mlhd22wifhfvhdvnz4ab6hzwinj549rvvrl8sw3j", - "depends": ["bs4Dash", "colourpicker", "config", "dplyr", "DT", "forcats", "ggplot2", "golem", "magrittr", "plotly", "readr", "shiny", "shinyjs", "shinyWidgets", "tibble", "tidyr", "viridis", "zoo"] + "depends": ["DT", "bs4Dash", "colourpicker", "config", "dplyr", "forcats", "ggplot2", "golem", "magrittr", "plotly", "readr", "shiny", "shinyWidgets", "shinyjs", "tibble", "tidyr", "viridis", "zoo"] }, "PERMANOVA": { "name": "PERMANOVA", "version": "0.2.0", "sha256": "1lmnp1g1i1kqa30cvakkl8g2m2h5jl73qx8dy37kv62mv0knlg5m", - "depends": ["deldir", "MASS", "Matrix", "scales", "xtable"] + "depends": ["MASS", "Matrix", "deldir", "scales", "xtable"] }, "PEkit": { "name": "PEkit", @@ -22793,7 +23033,13 @@ "name": "PFIM", "version": "6.0.3", "sha256": "0kp213ig73vj34qgwpc1zsnvz2hf8j0mjcqnsbb541s92zv2x4y7", - "depends": ["Deriv", "deSolve", "devtools", "ggplot2", "inline", "kableExtra", "knitr", "Matrix", "pracma", "Rcpp", "rmarkdown", "scales", "stringr"] + "depends": ["Deriv", "Matrix", "Rcpp", "deSolve", "devtools", "ggplot2", "inline", "kableExtra", "knitr", "pracma", "rmarkdown", "scales", "stringr"] + }, + "PFLR": { + "name": "PFLR", + "version": "1.0.0", + "sha256": "1iplycif2c9kaaxbibk1skbdnmsn0mxgbdj78lg8bgkf25gvzzii", + "depends": ["MASS", "fda", "flare", "glmnet", "psych"] }, "PGEE": { "name": "PGEE", @@ -22823,7 +23069,7 @@ "name": "PHENIX", "version": "1.3.1", "sha256": "1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4", - "depends": ["ppcor", "SuppDists"] + "depends": ["SuppDists", "ppcor"] }, "PHENTHAUproc": { "name": "PHENTHAUproc", @@ -22841,7 +23087,7 @@ "name": "PHInfiniteEstimates", "version": "2.9.5", "sha256": "1j00bb0jk912bkv6yhwnx1f2nr2bw72z9c5y4xby1mphljz059b7", - "depends": ["coxphf", "lpSolve", "nph", "Rdpack", "survival"] + "depends": ["Rdpack", "coxphf", "lpSolve", "nph", "survival"] }, "PHSMM": { "name": "PHSMM", @@ -22871,7 +23117,7 @@ "name": "PICBayes", "version": "1.0", "sha256": "1js6zrnyc8v345cds3pypb2g9dd3vvj3bjq159qc113m9ll2xk0b", - "depends": ["coda", "MCMCpack", "survival"] + "depends": ["MCMCpack", "coda", "survival"] }, "PINMA": { "name": "PINMA", @@ -22883,13 +23129,13 @@ "name": "PINSPlus", "version": "2.0.7", "sha256": "1r4fw3hm0bp3spxkcrwwcmirkp4a8myqwpw8d6cxmz7ns6202860", - "depends": ["cluster", "doParallel", "entropy", "FNN", "foreach", "impute", "irlba", "matrixStats", "mclust", "Rcpp", "RcppArmadillo", "RcppParallel"] + "depends": ["FNN", "Rcpp", "RcppArmadillo", "RcppParallel", "cluster", "doParallel", "entropy", "foreach", "impute", "irlba", "matrixStats", "mclust"] }, "PINstimation": { "name": "PINstimation", "version": "0.1.2", "sha256": "0vys27ws0nk0bqf6pxgr689q3rnyx14ar560004g6pi0ii59mbyk", - "depends": ["coda", "dplyr", "furrr", "future", "knitr", "nloptr", "Rdpack", "rmarkdown", "skellam"] + "depends": ["Rdpack", "coda", "dplyr", "furrr", "future", "knitr", "nloptr", "rmarkdown", "skellam"] }, "PK": { "name": "PK", @@ -22911,15 +23157,15 @@ }, "PKNCA": { "name": "PKNCA", - "version": "0.10.2", - "sha256": "1imaj6a8y53hllhfxvmci4qh04pviw0zpwmxm12sqi1nl2kdb5y4", - "depends": ["checkmate", "digest", "dplyr", "nlme", "purrr", "rlang", "tibble", "tidyr"] + "version": "0.11.0", + "sha256": "1az62z5w9fydzbhzdlr0h1wzwby144vc7z0w907q3i43v3ziilb0", + "depends": ["checkmate", "digest", "dplyr", "lifecycle", "nlme", "purrr", "rlang", "tibble", "tidyr"] }, "PKPDsim": { "name": "PKPDsim", "version": "1.3.0", "sha256": "1n86zl8gka78anny7fj7l95bamckwkv5ijjiihpcfyj7fmac3y72", - "depends": ["BH", "data_table", "jsonlite", "magrittr", "MASS", "randtoolbox", "Rcpp", "stringr"] + "depends": ["BH", "MASS", "Rcpp", "data_table", "jsonlite", "magrittr", "randtoolbox", "stringr"] }, "PKconverter": { "name": "PKconverter", @@ -22943,7 +23189,7 @@ "name": "PLFD", "version": "0.2.0", "sha256": "0w6d3sy4cnn7sj5d2fbn510gc3y6hipd006jnyvkariaqwlh3fa0", - "depends": ["mathjaxr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "mathjaxr"] }, "PLIS": { "name": "PLIS", @@ -22955,13 +23201,13 @@ "name": "PLMIX", "version": "2.1.1", "sha256": "05mnzsi7y71cvg50qx8hp4m31gqslldl34k41r1f8npyb6ldpdca", - "depends": ["abind", "coda", "foreach", "ggmcmc", "ggplot2", "gridExtra", "gtools", "label_switching", "MCMCpack", "PlackettLuce", "pmr", "prefmod", "radarchart", "rankdist", "rcdd", "Rcpp", "reshape2", "StatRank"] + "depends": ["MCMCpack", "PlackettLuce", "Rcpp", "StatRank", "abind", "coda", "foreach", "ggmcmc", "ggplot2", "gridExtra", "gtools", "label_switching", "pmr", "prefmod", "radarchart", "rankdist", "rcdd", "reshape2"] }, "PLNmodels": { "name": "PLNmodels", "version": "1.2.0", "sha256": "1fqfy3pipj8w3mma8ca33ppxpvam4hnzcklpma188s06vy75h1i9", - "depends": ["corrplot", "dplyr", "future", "future_apply", "ggplot2", "glassoFast", "gridExtra", "igraph", "magrittr", "MASS", "Matrix", "nloptr", "pscl", "purrr", "R6", "Rcpp", "RcppArmadillo", "rlang", "tidyr", "torch"] + "depends": ["MASS", "Matrix", "R6", "Rcpp", "RcppArmadillo", "corrplot", "dplyr", "future", "future_apply", "ggplot2", "glassoFast", "gridExtra", "igraph", "magrittr", "nloptr", "pscl", "purrr", "rlang", "tidyr", "torch"] }, "PLORN": { "name": "PLORN", @@ -22979,7 +23225,7 @@ "name": "PLSiMCpp", "version": "1.0.4", "sha256": "05pldxlszz4kcdqmzli31jgjd9v6sb3r89yaijc1i83c36ximarx", - "depends": ["crayon", "purrr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "crayon", "purrr"] }, "PLindleyROC": { "name": "PLindleyROC", @@ -22991,7 +23237,7 @@ "name": "PLmixed", "version": "0.1.7", "sha256": "1kn9w8xr9y1lnxa5hv95q3hipr7shs8pnhr6nr88v4rskgvvhffm", - "depends": ["lme4", "Matrix", "numDeriv", "optimx"] + "depends": ["Matrix", "lme4", "numDeriv", "optimx"] }, "PLordprob": { "name": "PLordprob", @@ -23003,7 +23249,7 @@ "name": "PLreg", "version": "0.4.1", "sha256": "1fa8h0igxqgdfapiz0z80ll2m3nqvxw4qjcrw4knrg7ladjdicwl", - "depends": ["BBmisc", "EnvStats", "Formula", "gamlss_dist", "GeneralizedHyperbolic", "nleqslv", "VGAM", "zipfR"] + "depends": ["BBmisc", "EnvStats", "Formula", "GeneralizedHyperbolic", "VGAM", "gamlss_dist", "nleqslv", "zipfR"] }, "PMA": { "name": "PMA", @@ -23027,7 +23273,7 @@ "name": "PMCMRplus", "version": "1.9.10", "sha256": "0w0zxlq80n673zlrfw46qzidwshc6rxsqka6pahbr816zabzi0yq", - "depends": ["BWStest", "gmp", "kSamples", "MASS", "multcompView", "mvtnorm", "Rmpfr", "SuppDists"] + "depends": ["BWStest", "MASS", "Rmpfr", "SuppDists", "gmp", "kSamples", "multcompView", "mvtnorm"] }, "PMEvapotranspiration": { "name": "PMEvapotranspiration", @@ -23037,33 +23283,33 @@ }, "PMwR": { "name": "PMwR", - "version": "0.19-3", - "sha256": "11pmhhyk39wc9qcgy16gavyqrrh5wkzvnk85jb9mnr9g673ljgfi", - "depends": ["datetimeutils", "fastmatch", "NMOF", "orgutils", "textutils", "zoo"] + "version": "0.19-5", + "sha256": "1yhqbp5f6a7rkxxljqw5xsl1v0yysxjlx2r99w3h2hka44mksm21", + "depends": ["NMOF", "datetimeutils", "fastmatch", "orgutils", "textutils", "zoo"] }, "PNADcIBGE": { "name": "PNADcIBGE", "version": "0.7.5", "sha256": "1pj482lanhkw389f9dwdh5h24icdcrqhnsadbbbidcaij02yraym", - "depends": ["dplyr", "httr", "magrittr", "projmgr", "RCurl", "readr", "readxl", "survey", "tibble", "timeDate"] + "depends": ["RCurl", "dplyr", "httr", "magrittr", "projmgr", "readr", "readxl", "survey", "tibble", "timeDate"] }, "PNAR": { "name": "PNAR", "version": "1.6", "sha256": "18nq5g2vsc8xy4l1km710l2v8frw3wwpn4yx23s3xczqd8hj9wfw", - "depends": ["doParallel", "foreach", "igraph", "nloptr", "Rfast", "Rfast2"] + "depends": ["Rfast", "Rfast2", "doParallel", "foreach", "igraph", "nloptr"] }, "PNDSIBGE": { "name": "PNDSIBGE", "version": "0.1.1", "sha256": "16shzhxp9vmlimp3r94ff652ca0ap7skb7iga6saynhnlk2fbm6b", - "depends": ["dplyr", "httr", "magrittr", "projmgr", "RCurl", "readr", "readxl", "survey", "tibble", "timeDate"] + "depends": ["RCurl", "dplyr", "httr", "magrittr", "projmgr", "readr", "readxl", "survey", "tibble", "timeDate"] }, "PNSIBGE": { "name": "PNSIBGE", "version": "0.2.1", "sha256": "19p8gky9ilcz8bw4hk16bprykghjvl0vhlhy37kq01lsz3hxvpaj", - "depends": ["dplyr", "httr", "magrittr", "projmgr", "RCurl", "readr", "readxl", "survey", "tibble", "timeDate"] + "depends": ["RCurl", "dplyr", "httr", "magrittr", "projmgr", "readr", "readxl", "survey", "tibble", "timeDate"] }, "PNWColors": { "name": "PNWColors", @@ -23105,13 +23351,13 @@ "name": "POMS", "version": "1.0.1", "sha256": "1ndry1csq7zsccdwd8nq9x4b9zq5j2ffykmhm38ari8n0zxxyrwy", - "depends": ["ape", "data_table", "MASS", "phangorn", "phylolm", "XNomial"] + "depends": ["MASS", "XNomial", "ape", "data_table", "phangorn", "phylolm"] }, "POMaSPU": { "name": "POMaSPU", "version": "1.0.0", "sha256": "0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya", - "depends": ["MASS", "matrixStats", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "matrixStats"] }, "POPInf": { "name": "POPInf", @@ -23129,13 +23375,13 @@ "name": "POSTm", "version": "1.4", "sha256": "0gd6nqm66lms7yscf53qn6ny6rqhqa6c5l256867q52xlgcnjx35", - "depends": ["ape", "CompQuadForm"] + "depends": ["CompQuadForm", "ape"] }, "POSetR": { "name": "POSetR", "version": "1.1.4", "sha256": "00qz9z9mwbgvxh7775il2avrxdn116l8v31z3bksifvy81krw95a", - "depends": ["igraph", "Rcpp", "Rdpack"] + "depends": ["Rcpp", "Rdpack", "igraph"] }, "POT": { "name": "POT", @@ -23147,7 +23393,7 @@ "name": "POUMM", "version": "2.1.7", "sha256": "0pwa97sffb571nfqnbc35dj9lr8z07wjsjnwibj9dhj2dr5b2cfp", - "depends": ["adaptMCMC", "ape", "coda", "data_table", "foreach", "ggplot2", "lamW", "Rcpp"] + "depends": ["Rcpp", "adaptMCMC", "ape", "coda", "data_table", "foreach", "ggplot2", "lamW"] }, "POV": { "name": "POV", @@ -23163,8 +23409,8 @@ }, "PPCDT": { "name": "PPCDT", - "version": "0.1.0", - "sha256": "0i3j959i7rd5k1qkj1lknvsbksl15ir06avcffai4pbnpx7bl8dm", + "version": "0.2.0", + "sha256": "06984x73pb37vw8wjgpwd27j6h5j30p0idppmbbap0zz4vprgmpm", "depends": ["MASS"] }, "PPCI": { @@ -23177,7 +23423,7 @@ "name": "PPLasso", "version": "2.0", "sha256": "11xqpq7s8j1vrsf0x31pvk861wz4d3yg7a4gcwv43s3w5dxbljls", - "depends": ["cvCovEst", "genlasso", "ggplot2", "glmnet", "MASS"] + "depends": ["MASS", "cvCovEst", "genlasso", "ggplot2", "glmnet"] }, "PPMR": { "name": "PPMR", @@ -23207,7 +23453,7 @@ "name": "PPSFS", "version": "0.1.0", "sha256": "180brwqcs2qjh01a1qwdy2a8g19scn4mxzc3s6pw8gyl2r3fzxi7", - "depends": ["brglm2", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "brglm2"] }, "PPTcirc": { "name": "PPTcirc", @@ -23219,43 +23465,55 @@ "name": "PPbigdata", "version": "1.0.0", "sha256": "0v9p3mrxivq4ragi6039zgyxp9ksx3g3f6bksy9z08f8vyp1m1a8", - "depends": ["datanugget", "dplyr", "gtools", "magrittr", "MASS", "mclust", "rstiefel", "tourr", "weights"] + "depends": ["MASS", "datanugget", "dplyr", "gtools", "magrittr", "mclust", "rstiefel", "tourr", "weights"] }, "PPforest": { "name": "PPforest", "version": "0.1.3", "sha256": "1byn2l91nws91xgjjal610vv4yns12z861rq3iks4kv4giwgdfq1", - "depends": ["doParallel", "dplyr", "magrittr", "plyr", "Rcpp", "RcppArmadillo", "tibble", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "dplyr", "magrittr", "plyr", "tibble", "tidyr"] }, "PPtreeViz": { "name": "PPtreeViz", "version": "2.0.4", "sha256": "008hlgi56p9wydpsb2f1dxi4slml7p417c34lw00hivbl53d6x97", - "depends": ["ggplot2", "gridExtra", "partykit", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "gridExtra", "partykit"] }, "PPtreeregViz": { "name": "PPtreeregViz", "version": "2.0.5", "sha256": "0yg67fg4rjvpwp1xvznsbv635wmf6jvhp38irffccx915qvj7r51", - "depends": ["DALEX", "data_table", "dplyr", "ggplot2", "magrittr", "PPtreeViz", "Rcpp", "RcppArmadillo", "reshape2", "shapr", "tibble", "tidyr"] + "depends": ["DALEX", "PPtreeViz", "Rcpp", "RcppArmadillo", "data_table", "dplyr", "ggplot2", "magrittr", "reshape2", "shapr", "tibble", "tidyr"] }, "PQLseq": { "name": "PQLseq", "version": "1.2.1", "sha256": "0lyynzvv7n1igzfrw52021bnxprqcm2hjxmlrsxkx4898ca46g60", - "depends": ["doParallel", "foreach", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "doParallel", "foreach"] + }, + "PRA": { + "name": "PRA", + "version": "0.2.0", + "sha256": "1lpafrpzw43k29vk2y52wixdzgli9z8c3bvv2liypmlxmqmjfxly", + "depends": ["mc2d", "minpack_lm"] + }, + "PRANA": { + "name": "PRANA", + "version": "1.0.5", + "sha256": "0y7hrb1lx6mbkpayic20sr08x410cgwfvmx2a5nrssfzvxqbk5y1", + "depends": ["dplyr", "minet", "robustbase"] }, "PRDA": { "name": "PRDA", "version": "1.0.0", "sha256": "1lklwfakd54ylm5gizq36ng6498c2izapsz9yz2a95cjf860rr23", - "depends": ["MASS", "pbapply", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "pbapply"] }, "PRECAST": { "name": "PRECAST", "version": "1.6.5", "sha256": "17qk40j2by7bjc0r2wnyfca4drpzbrxp0m5r10a7494avqknjjk0", - "depends": ["colorspace", "cowplot", "dplyr", "DR_SC", "ggplot2", "ggpubr", "ggthemes", "GiRaF", "gtools", "MASS", "Matrix", "mclust", "patchwork", "pbapply", "purrr", "Rcpp", "RcppArmadillo", "scales", "scater", "Seurat"] + "depends": ["DR_SC", "GiRaF", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "Seurat", "colorspace", "cowplot", "dplyr", "ggplot2", "ggpubr", "ggthemes", "gtools", "mclust", "patchwork", "pbapply", "purrr", "scales", "scater"] }, "PREPShiny": { "name": "PREPShiny", @@ -23291,13 +23549,13 @@ "name": "PRISMA", "version": "0.2-7", "sha256": "0sk2d07m8rhipa0kdbaf8ngryda6f1ihp5akpnyw2llajf0x8as5", - "depends": ["ggplot2", "gplots", "Matrix"] + "depends": ["Matrix", "ggplot2", "gplots"] }, "PRISMA2020": { "name": "PRISMA2020", "version": "1.1.1", "sha256": "0jhf1kgcc29b8gsb42b3d5hyfzsa13lz9qgs104ynrzld94kqqwf", - "depends": ["DiagrammeR", "DiagrammeRsvg", "DT", "htmltools", "htmlwidgets", "rio", "rsvg", "scales", "shiny", "shinyjs", "stringr", "webp", "xml2", "zip"] + "depends": ["DT", "DiagrammeR", "DiagrammeRsvg", "htmltools", "htmlwidgets", "rio", "rsvg", "scales", "shiny", "shinyjs", "stringr", "webp", "xml2", "zip"] }, "PRISMAstatement": { "name": "PRISMAstatement", @@ -23307,15 +23565,15 @@ }, "PRNG": { "name": "PRNG", - "version": "0.0.2", - "sha256": "1x1nv5pfz521jkwsnafc55d4mlkp5yfy3ywya7y8p1qjsj0bisfx", + "version": "0.0.2.1", + "sha256": "0lsr0jf08mwi4ip3hcmk8y2jxk89366skqcx85yr8j2wzqwyds15", "depends": [] }, "PROBShiny": { "name": "PROBShiny", "version": "0.1.0", "sha256": "17p6pb8nwq36ha697f2lf8nwzj5cylmh8rdzyag49ks5hi9painb", - "depends": ["epitools", "LaplacesDemon", "rmarkdown", "rpivotTable", "shiny", "shinyMatrix"] + "depends": ["LaplacesDemon", "epitools", "rmarkdown", "rpivotTable", "shiny", "shinyMatrix"] }, "PROJ": { "name": "PROJ", @@ -23339,7 +23597,7 @@ "name": "PROreg", "version": "1.3", "sha256": "0x3gaadd9nd5mcs6l2jv0874afps13qgq81bqwcg1hhgjzy2k4mm", - "depends": ["car", "fmsb", "Matrix", "matrixcalc", "numDeriv", "RColorBrewer", "rootSolve"] + "depends": ["Matrix", "RColorBrewer", "car", "fmsb", "matrixcalc", "numDeriv", "rootSolve"] }, "PROscorer": { "name": "PROscorer", @@ -23357,7 +23615,7 @@ "name": "PROsetta", "version": "0.4.1", "sha256": "1b013cwng8k17yfm4zrwjg7vc4papr2wmqq3a5kawl7bfy4ibaqw", - "depends": ["equate", "lavaan", "mirt", "mvnfast", "plink", "psych", "Rcpp", "RcppArmadillo", "TestDesign"] + "depends": ["Rcpp", "RcppArmadillo", "TestDesign", "equate", "lavaan", "mirt", "mvnfast", "plink", "psych"] }, "PRP": { "name": "PRP", @@ -23375,7 +23633,7 @@ "name": "PRSPGx", "version": "0.3.0", "sha256": "1vvclrp6h63l471qvgwkdhs52lrkapz0v90gwld89zwim6pnh7av", - "depends": ["bdsmatrix", "bigparallelr", "bigsnpr", "bigsparser", "bigstatsr", "gglasso", "GIGrvg", "glmnet", "lmtest", "Matrix", "matrixcalc", "MCMCpack", "mvtnorm", "propagate", "Rfast", "SGL"] + "depends": ["GIGrvg", "MCMCpack", "Matrix", "Rfast", "SGL", "bdsmatrix", "bigparallelr", "bigsnpr", "bigsparser", "bigstatsr", "gglasso", "glmnet", "lmtest", "matrixcalc", "mvtnorm", "propagate"] }, "PRSim": { "name": "PRSim", @@ -23393,13 +23651,13 @@ "name": "PReMiuM", "version": "3.2.13", "sha256": "1qamq7glc0dag1ps0dr4f931ij9jk91lj5h1k2g0yd0h3kqamawn", - "depends": ["BH", "cluster", "data_table", "gamlss_dist", "ggplot2", "plotrix", "Rcpp", "RcppEigen", "sf", "spdep"] + "depends": ["BH", "Rcpp", "RcppEigen", "cluster", "data_table", "gamlss_dist", "ggplot2", "plotrix", "sf", "spdep"] }, "PResiduals": { "name": "PResiduals", "version": "1.0-1", "sha256": "0mq16cs07hw5c9jj08vpgbb15xvjvz9h0npsbqphiibsb6ca5fwb", - "depends": ["Formula", "MASS", "rms", "SparseM"] + "depends": ["Formula", "MASS", "SparseM", "rms"] }, "PSAWR": { "name": "PSAWR", @@ -23411,7 +23669,7 @@ "name": "PSAboot", "version": "1.3.8", "sha256": "1y0d5gglmzcnd0yvq33k1canjzhl62df9abgw1w08azm94arfh1q", - "depends": ["ggplot2", "ggthemes", "Matching", "MatchIt", "modeltools", "party", "PSAgraphics", "psych", "reshape2", "rpart", "TriMatch"] + "depends": ["MatchIt", "Matching", "PSAgraphics", "TriMatch", "ggplot2", "ggthemes", "modeltools", "party", "psych", "reshape2", "rpart"] }, "PSAgraphics": { "name": "PSAgraphics", @@ -23423,7 +23681,7 @@ "name": "PSCBS", "version": "0.67.0", "sha256": "1gnd2nkh587dqpnbk5fsai7hx261vm405550rhlxffvs366x3596", - "depends": ["aroma_light", "DNAcopy", "future", "listenv", "matrixStats", "R_cache", "R_methodsS3", "R_oo", "R_utils"] + "depends": ["DNAcopy", "R_cache", "R_methodsS3", "R_oo", "R_utils", "aroma_light", "future", "listenv", "matrixStats"] }, "PSDistr": { "name": "PSDistr", @@ -23471,7 +23729,7 @@ "name": "PSS.Health", "version": "1.0.2", "sha256": "0vkg727rhh267vvcf8zkf5k6wm0k54vqysrsm4zc3sin3w1chnaf", - "depends": ["dplyr", "DT", "easypower", "EnvStats", "epiR", "ggplot2", "ICC_Sample_Size", "kappaSize", "longpower", "plotly", "powerMediation", "powerSurvEpi", "presize", "pROC", "pwr", "pwr2", "shiny", "shinycssloaders", "shinyFeedback", "shinyhelper", "writexl"] + "depends": ["DT", "EnvStats", "ICC_Sample_Size", "dplyr", "easypower", "epiR", "ggplot2", "kappaSize", "longpower", "pROC", "plotly", "powerMediation", "powerSurvEpi", "presize", "pwr", "pwr2", "shiny", "shinyFeedback", "shinycssloaders", "shinyhelper", "writexl"] }, "PSSIM": { "name": "PSSIM", @@ -23495,13 +23753,13 @@ "name": "PSW", "version": "1.1-3", "sha256": "0ahm7rp795d7j88n15b3q0gl573p3g0krc7jd1zv87g4bsdc9b5x", - "depends": ["gtools", "Hmisc"] + "depends": ["Hmisc", "gtools"] }, "PScr": { "name": "PScr", "version": "1.1", "sha256": "0cbmb1z4iwxw82m3f3y5iyr2hd1mgqsrvn7ip4rmsqy3zakyh06s", - "depends": ["pracma", "survival", "VGAM"] + "depends": ["VGAM", "pracma", "survival"] }, "PSinference": { "name": "PSinference", @@ -23519,7 +23777,7 @@ "name": "PSweight", "version": "1.2.0", "sha256": "1p0iq95jwhh6j3gw3zd8m58rryy8j33k2lrzypb5qzhwrgx2i41v", - "depends": ["gbm", "ggplot2", "lme4", "MASS", "nnet", "numDeriv", "SuperLearner"] + "depends": ["MASS", "SuperLearner", "gbm", "ggplot2", "lme4", "nnet", "numDeriv"] }, "PTAk": { "name": "PTAk", @@ -23543,13 +23801,13 @@ "name": "PTSR", "version": "0.1.2", "sha256": "0zwqw8zdp0p05nm64yg658iqfbj26n3v2py8r5m6g1sjispm5whf", - "depends": ["actuar", "extraDistr", "numDeriv", "SuppDists"] + "depends": ["SuppDists", "actuar", "extraDistr", "numDeriv"] }, "PTXQC": { "name": "PTXQC", "version": "1.1.1", "sha256": "0855xir9b604lhhymxf3rhin2sikxvg25zbgd5gvwgc5n3114d3m", - "depends": ["data_table", "ggdendro", "ggplot2", "gridExtra", "gtable", "htmlTable", "knitr", "magrittr", "plyr", "R6", "R6P", "RColorBrewer", "reshape2", "rmarkdown", "rmzqc", "seqinr", "UpSetR", "xml2", "yaml"] + "depends": ["R6", "R6P", "RColorBrewer", "UpSetR", "data_table", "ggdendro", "ggplot2", "gridExtra", "gtable", "htmlTable", "knitr", "magrittr", "plyr", "reshape2", "rmarkdown", "rmzqc", "seqinr", "xml2", "yaml"] }, "PTwins": { "name": "PTwins", @@ -23561,7 +23819,7 @@ "name": "PUGMM", "version": "0.1.0", "sha256": "03bwg4mb0kc708plqzym0xw5giai45nk601fs53gfnad57y70wdp", - "depends": ["ClusterR", "doParallel", "foreach", "igraph", "MASS", "Matrix", "mclust", "mcompanion", "ppclust"] + "depends": ["ClusterR", "MASS", "Matrix", "doParallel", "foreach", "igraph", "mclust", "mcompanion", "ppclust"] }, "PUMP": { "name": "PUMP", @@ -23573,13 +23831,13 @@ "name": "PUPAIM", "version": "0.3.1", "sha256": "1sypmlpjsdn2rm6pci64xv6ibixz43zhjaw0k8q9jp3cajbb11qh", - "depends": ["ggplot2", "Metrics", "nls2"] + "depends": ["Metrics", "ggplot2", "nls2"] }, "PUPAK": { "name": "PUPAK", "version": "0.1.1", "sha256": "1274z53qclddww90qgnl9vwdnxv2p66lclmq9fixchnpgm9xc6qw", - "depends": ["ggplot2", "Metrics", "nls2", "segmented"] + "depends": ["Metrics", "ggplot2", "nls2", "segmented"] }, "PUPMCR": { "name": "PUPMCR", @@ -23591,13 +23849,13 @@ "name": "PUPMSI", "version": "0.1.0", "sha256": "04w2c783bbkfdqkxvwvrf3fk09hzswbkq7najcn456cz22241w9l", - "depends": ["ggplot2", "Metrics", "minpack_lm", "nls2"] + "depends": ["Metrics", "ggplot2", "minpack_lm", "nls2"] }, "PUlasso": { "name": "PUlasso", "version": "3.2.5", "sha256": "1lyf7x4sixpl74alns3kmr2iz10qmjz444gyqxgj5k4xqswgaz15", - "depends": ["doParallel", "foreach", "ggplot2", "Matrix", "Rcpp", "RcppEigen"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "doParallel", "foreach", "ggplot2"] }, "PVAClone": { "name": "PVAClone", @@ -23609,7 +23867,7 @@ "name": "PVR", "version": "0.3", "sha256": "0pcnazkiwmicr3k6k70r8skqk0pd46fcqhhxghawxjs4slgnygkj", - "depends": ["ape", "MASS", "splancs"] + "depends": ["MASS", "ape", "splancs"] }, "PVplr": { "name": "PVplr", @@ -23627,7 +23885,7 @@ "name": "PWEV", "version": "0.1.0", "sha256": "1jl63wp6nl2zyznc63zcb97yi1fvzj4mic4ri0ni515s0nb5jd5b", - "depends": ["Metrics", "rugarch", "rumidas", "WeightedEnsemble", "xts", "zoo"] + "depends": ["Metrics", "WeightedEnsemble", "rugarch", "rumidas", "xts", "zoo"] }, "PWEXP": { "name": "PWEXP", @@ -23651,25 +23909,25 @@ "name": "PaRe", "version": "0.1.13", "sha256": "1p65p3anwyk1zg82lir7wqvl9zxi7p4hjb70kvfhj06p1n8f653c", - "depends": ["checkmate", "cli", "cyclocomp", "desc", "DiagrammeR", "DiagrammeRsvg", "dplyr", "git2r", "glue", "igraph", "lintr", "magrittr", "pak", "R6", "rmarkdown", "rsvg", "stringr"] + "depends": ["DiagrammeR", "DiagrammeRsvg", "R6", "checkmate", "cli", "cyclocomp", "desc", "dplyr", "git2r", "glue", "igraph", "lintr", "magrittr", "pak", "rmarkdown", "rsvg", "stringr"] }, "Pade": { "name": "Pade", - "version": "1.0.6", - "sha256": "0bjkr3yh1kxymyrfzi9amjznxgqc2xx69zhs2immn4sk1w3xzvzp", + "version": "1.0.7", + "sha256": "1rs3wap5rx4kq1vabhcfj2qbzfq2b78nvs4bc5h0jg3z32g99220", "depends": [] }, "PairViz": { "name": "PairViz", "version": "1.3.6", "sha256": "12rg1ml401c9zz1q6qy2ghs18x9vdb8smrkb2bcp34afbg5dvdd3", - "depends": ["graph", "gtools", "TSP"] + "depends": ["TSP", "graph", "gtools"] }, "PairedData": { "name": "PairedData", "version": "1.1.1", "sha256": "07y5fd4fkwfp0lbacf41ya8cn7x4n1haxl0cln9iibjffc1mbr5q", - "depends": ["ggplot2", "gld", "lattice", "MASS", "mvtnorm"] + "depends": ["MASS", "ggplot2", "gld", "lattice", "mvtnorm"] }, "PakPC2017": { "name": "PakPC2017", @@ -23777,7 +24035,7 @@ "name": "PanelMatch", "version": "2.2.0", "sha256": "14y6msvs4h3xdpi83yi6q4a58xqbf1nxs5m0wbbzszzj7jdjiq79", - "depends": ["CBPS", "data_table", "doParallel", "foreach", "ggplot2", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen"] + "depends": ["CBPS", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "data_table", "doParallel", "foreach", "ggplot2"] }, "PanelTM": { "name": "PanelTM", @@ -23795,7 +24053,7 @@ "name": "ParBayesianOptimization", "version": "1.2.6", "sha256": "0g5i4908fl2j1a4jfsg1xs4q92mc29zp8dyf52a370ki2512w6h1", - "depends": ["crayon", "data_table", "dbscan", "DiceKriging", "foreach", "ggplot2", "ggpubr", "lhs"] + "depends": ["DiceKriging", "crayon", "data_table", "dbscan", "foreach", "ggplot2", "ggpubr", "lhs"] }, "ParDNAcopy": { "name": "ParDNAcopy", @@ -23819,7 +24077,7 @@ "name": "ParamHelpers", "version": "1.14.1", "sha256": "088sl3az4ysq8cyw82brdn9xm5yy7rqskxih462d1m5hi62gyl04", - "depends": ["backports", "BBmisc", "checkmate", "fastmatch"] + "depends": ["BBmisc", "backports", "checkmate", "fastmatch"] }, "Pareto": { "name": "Pareto", @@ -23835,9 +24093,9 @@ }, "Paris2024Colours": { "name": "Paris2024Colours", - "version": "0.1.2", - "sha256": "12xycmqc9hr12db7w9499l89gmww5j0vs6nhyzsirkbg8vvq8qql", - "depends": [] + "version": "0.2.0", + "sha256": "10qf6rrk4lsw6qx5lsr8331fnvdli7cc24phg7asal2w2mg0h07v", + "depends": ["ggplot2"] }, "PartCensReg": { "name": "PartCensReg", @@ -23849,7 +24107,7 @@ "name": "PartialNetwork", "version": "1.0.4", "sha256": "010q3d0r40kszdsyc6bish7vrzl98zxi47ppbnv5n86p0n3dckjn", - "depends": ["abind", "doParallel", "doRNG", "foreach", "Formula", "formula_tools", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppNumerical", "RcppProgress"] + "depends": ["Formula", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppNumerical", "RcppProgress", "abind", "doParallel", "doRNG", "foreach", "formula_tools"] }, "Partiallyoverlapping": { "name": "Partiallyoverlapping", @@ -23859,15 +24117,15 @@ }, "PatientProfiles": { "name": "PatientProfiles", - "version": "1.1.0", - "sha256": "0f2qnf150h47ld5n2718r6iyxkb5hi2r6z3m7krdbr1i4fd2h5w2", + "version": "1.1.1", + "sha256": "0h9d4qm83qkfdvdmz0vm29yhn50vrbf9qxp2mbgmxx067yynncz6", "depends": ["CDMConnector", "checkmate", "cli", "dplyr", "lifecycle", "magrittr", "omopgenerics", "purrr", "rlang", "stringr", "tidyr", "visOmopResults"] }, "Patterns": { "name": "Patterns", "version": "1.5", "sha256": "1b4krl9gcwrxrslqyc0hhc6kqc7q34i70pyx9yb7xkdixs6dkr95", - "depends": ["abind", "cluster", "e1071", "gplots", "igraph", "jetset", "lars", "lattice", "limma", "Mfuzz", "movMF", "nnls", "plotrix", "repmis", "SelectBoost", "tnet", "VGAM", "WGCNA"] + "depends": ["Mfuzz", "SelectBoost", "VGAM", "WGCNA", "abind", "cluster", "e1071", "gplots", "igraph", "jetset", "lars", "lattice", "limma", "movMF", "nnls", "plotrix", "repmis", "tnet"] }, "PdPDB": { "name": "PdPDB", @@ -23901,8 +24159,8 @@ }, "PeakSegJoint": { "name": "PeakSegJoint", - "version": "2024.1.24", - "sha256": "0jq6ch623vgxmg8z6jwgprk6szqp8qbjzy743yl7qgj906pdg79v", + "version": "2024.6.27", + "sha256": "0rlm9adjrnbh58j7vb6lvqam13crgcrdcfs7rl7cbarfj3k9d8nr", "depends": ["PeakError", "penaltyLearning"] }, "PeakSegOptimal": { @@ -23931,9 +24189,9 @@ }, "PenCoxFrail": { "name": "PenCoxFrail", - "version": "1.0.1", - "sha256": "0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7", - "depends": ["Matrix", "Rcpp", "RcppArmadillo", "survival"] + "version": "2.0.0", + "sha256": "1g5qggazvfj38436kj144q46aa59s4idnqnr5yv9c3svjikmw1r7", + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "coxme", "survival"] }, "PenIC": { "name": "PenIC", @@ -23957,7 +24215,7 @@ "name": "PerFit", "version": "1.4.6", "sha256": "13917nvxii8pg69h1wcpmlv45sdrdldd3zxdrypr4mn456ff74k4", - "depends": ["fda", "Hmisc", "irtoys", "ltm", "MASS", "Matrix", "mirt"] + "depends": ["Hmisc", "MASS", "Matrix", "fda", "irtoys", "ltm", "mirt"] }, "PerMat": { "name": "PerMat", @@ -23975,7 +24233,7 @@ "name": "PerfMeas", "version": "1.2.5", "sha256": "13yjk0kwpbsqwl056hzf0zj2br1mk4faqcn1whdfxmq348c14hjb", - "depends": ["graph", "limma", "RBGL"] + "depends": ["RBGL", "graph", "limma"] }, "PerformanceAnalytics": { "name": "PerformanceAnalytics", @@ -24005,7 +24263,7 @@ "name": "PerseusR", "version": "0.3.4", "sha256": "1k03flbnjndx5mm26hysk64z89858m50kjs8gyldm4s5f09iny6p", - "depends": ["Biobase", "plyr", "stringr", "XML"] + "depends": ["Biobase", "XML", "plyr", "stringr"] }, "PersianStemmer": { "name": "PersianStemmer", @@ -24029,7 +24287,7 @@ "name": "Petersen", "version": "2024.6.1", "sha256": "03xhsmlgqgp037ccy2q2a65cspcy1qxm1vzb6yljhv61r60zfqjz", - "depends": ["AICcmodavg", "bbmle", "BTSPAS", "formula_tools", "ggplot2", "MASS", "Matrix", "msm", "numDeriv", "plyr", "reshape2", "rlang", "SPAS", "stringr", "tidyr"] + "depends": ["AICcmodavg", "BTSPAS", "MASS", "Matrix", "SPAS", "bbmle", "formula_tools", "ggplot2", "msm", "numDeriv", "plyr", "reshape2", "rlang", "stringr", "tidyr"] }, "PetfindeR": { "name": "PetfindeR", @@ -24041,7 +24299,7 @@ "name": "PhageCocktail", "version": "1.0.3", "sha256": "0lr1gnwpaqrf8ny5ssx2cjv8hi6q2ilmr7qif3jl9agh4w0nkp89", - "depends": ["bipartite", "factoextra", "readxl", "RJSONIO", "smerc", "stringr"] + "depends": ["RJSONIO", "bipartite", "factoextra", "readxl", "smerc", "stringr"] }, "Phase123": { "name": "Phase123", @@ -24053,7 +24311,7 @@ "name": "Phase12Compare", "version": "1.5", "sha256": "0n9rjgdllpnj451a8d4p8x3mjf23czcmk7cn1c9v3l7mg4jn18h2", - "depends": ["mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "mvtnorm"] }, "PhaseType": { "name": "PhaseType", @@ -24071,7 +24329,7 @@ "name": "PheCAP", "version": "1.2.1", "sha256": "00dfy0iby21kqfxz2npz4dn1klxcdlll8xrk2hsmc56fjfidbdhz", - "depends": ["glmnet", "RMySQL"] + "depends": ["RMySQL", "glmnet"] }, "PheNorm": { "name": "PheNorm", @@ -24083,7 +24341,7 @@ "name": "PheVis", "version": "1.0.4", "sha256": "1anj079vdpfbkilbvk0b2b78qk87gc7lmivzl8syq6lb3dxkja2l", - "depends": ["dplyr", "ggplot2", "glmnet", "knitr", "lme4", "purrr", "randomForest", "Rcpp", "tidyr", "viridis", "zoo"] + "depends": ["Rcpp", "dplyr", "ggplot2", "glmnet", "knitr", "lme4", "purrr", "randomForest", "tidyr", "viridis", "zoo"] }, "Phenotype": { "name": "Phenotype", @@ -24095,7 +24353,7 @@ "name": "PhenotypeSimulator", "version": "0.3.4", "sha256": "19c79kls6i1qpsk41lp8whva5in47m2wlr0v3ggw5bblp4fkd43m", - "depends": ["cowplot", "data_table", "dplyr", "ggplot2", "Hmisc", "mvtnorm", "optparse", "R_utils", "Rcpp", "reshape2", "snpStats", "zoo"] + "depends": ["Hmisc", "R_utils", "Rcpp", "cowplot", "data_table", "dplyr", "ggplot2", "mvtnorm", "optparse", "reshape2", "snpStats", "zoo"] }, "Phi2rho": { "name": "Phi2rho", @@ -24131,7 +24389,7 @@ "name": "PhylogeneticEM", "version": "1.7.0", "sha256": "1yxg13jm6jhciip76wh9936d10hxhjqdvlj15f249jzn7vfs6pyx", - "depends": ["ape", "capushe", "foreach", "gglasso", "glmnet", "LINselect", "MASS", "Matrix", "plyr", "Rcpp", "RcppArmadillo", "robustbase"] + "depends": ["LINselect", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "ape", "capushe", "foreach", "gglasso", "glmnet", "plyr", "robustbase"] }, "PhysActBedRest": { "name": "PhysActBedRest", @@ -24153,9 +24411,9 @@ }, "PieGlyph": { "name": "PieGlyph", - "version": "0.1.0", - "sha256": "1wg8b0zsgcsgrmx5yz0sj6bifk76zr085lac3xlkrxqnxwxvlk0n", - "depends": ["cli", "dplyr", "forcats", "ggforce", "ggplot2", "plyr", "rlang", "scales", "tidyr"] + "version": "1.0.0", + "sha256": "1fjcxap6af2h9j2v26r3f4f1gyhgkar06p2y8p7j862i1fpgrrcd", + "depends": ["cli", "dplyr", "forcats", "ggforce", "ggiraph", "ggplot2", "plyr", "purrr", "rlang", "scales", "tidyr"] }, "PieceExpIntensity": { "name": "PieceExpIntensity", @@ -24173,13 +24431,13 @@ "name": "PlackettLuce", "version": "0.4.3", "sha256": "04pid91wsf3m3mg45zis17xa251491011ihbmfsdy7m914l9wcyd", - "depends": ["CVXR", "igraph", "Matrix", "matrixStats", "partykit", "psychotools", "psychotree", "qvcalc", "R6", "RSpectra", "sandwich"] + "depends": ["CVXR", "Matrix", "R6", "RSpectra", "igraph", "matrixStats", "partykit", "psychotools", "psychotree", "qvcalc", "sandwich"] }, "PlaneGeometry": { "name": "PlaneGeometry", "version": "1.6.0", "sha256": "0v4484kh8aqni0n6nfd9c1wiw62fj439647xb583pbmxi5ja58hq", - "depends": ["Carlson", "CVXR", "fitConic", "R6", "rcdd", "sdpt3r", "stringr", "uniformly"] + "depends": ["CVXR", "Carlson", "R6", "fitConic", "rcdd", "sdpt3r", "stringr", "uniformly"] }, "Planesmuestra": { "name": "Planesmuestra", @@ -24197,19 +24455,19 @@ "name": "PlasmaMutationDetector", "version": "1.7.2", "sha256": "0qra7q2pzw212qylyrfhv6zjcsldfw84b93cari0qjqnw4gyfph2", - "depends": ["GenomicRanges", "ggplot2", "robustbase", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["GenomicRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "ggplot2", "robustbase", "rtracklayer"] }, "PlasmaMutationDetector2": { "name": "PlasmaMutationDetector2", "version": "1.1.11", "sha256": "1dcmw6i488gxqqn52r0n9aclnz41ba2gc99vf6ac1wx5flcfm3l9", - "depends": ["GenomicRanges", "ggplot2", "robustbase", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment", "VariantAnnotation"] + "depends": ["GenomicRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "ggplot2", "robustbase", "rtracklayer"] }, "Plasmidprofiler": { "name": "Plasmidprofiler", "version": "0.1.6", "sha256": "10m3knmz0596rm30ncyfprar6l42bjm7r34n4pjz1biqmiz6yz6k", - "depends": ["ape", "dplyr", "gdata", "ggdendro", "ggplot2", "gridExtra", "gtable", "htmlwidgets", "magrittr", "plotly", "plyr", "RColorBrewer", "reshape2", "stringr"] + "depends": ["RColorBrewer", "ape", "dplyr", "gdata", "ggdendro", "ggplot2", "gridExtra", "gtable", "htmlwidgets", "magrittr", "plotly", "plyr", "reshape2", "stringr"] }, "PlatformDesign": { "name": "PlatformDesign", @@ -24263,12 +24521,12 @@ "name": "PoDBAY", "version": "1.4.3", "sha256": "1c1dmggcc8k4h56063r97gjavd44llc51j54qs1wck9zir414i8w", - "depends": ["dplyr", "ggplot2", "Rcpp"] + "depends": ["Rcpp", "dplyr", "ggplot2"] }, "PoPdesign": { "name": "PoPdesign", - "version": "1.0.4", - "sha256": "03nskqhc4xc40lww0q2gfd76rs8d5ypc571s9qhaibq7zslmy2h2", + "version": "1.1.0", + "sha256": "14vgxjzq9wlg3fgh1vy84v04ij51bgy97pl9yi61ysa84pgac6cb", "depends": ["Iso", "knitr", "magick"] }, "PoSI": { @@ -24281,7 +24539,7 @@ "name": "PogromcyDanych", "version": "1.7.1", "sha256": "0601n76nybvahd5xsghwbydc7gfcvj1qbpqhw06d4mzy97am7yl0", - "depends": ["dplyr", "SmarterPoland"] + "depends": ["SmarterPoland", "dplyr"] }, "PoiClaClu": { "name": "PoiClaClu", @@ -24293,49 +24551,49 @@ "name": "PointFore", "version": "0.2.0", "sha256": "0ml6xcdl4ygr01q0cjwd11ql7wal91jnf3hs1rfhfr4mh8jpgivx", - "depends": ["boot", "car", "ggplot2", "gmm", "lubridate", "MASS", "sandwich"] + "depends": ["MASS", "boot", "car", "ggplot2", "gmm", "lubridate", "sandwich"] }, "PointedSDMs": { "name": "PointedSDMs", - "version": "1.3.2", - "sha256": "1279zjjzxfyqaqwz9qji58rr4gjniplfb9hyg7kfqx062nlac49a", - "depends": ["blockCV", "ggplot2", "inlabru", "R_devices", "R6", "raster", "sf", "sp", "terra"] + "version": "2.1.0", + "sha256": "17z51hcpr2a3z49yjp4nn532assi6nws0adcs204jnr2i0zwb8a5", + "depends": ["R6", "R_devices", "blockCV", "ggplot2", "inlabru", "raster", "sf", "sp", "terra"] }, "PoisBinNonNor": { "name": "PoisBinNonNor", "version": "1.3.3", "sha256": "0m8ajizij9kvp057rqmd10zadmvr4a1ka664jc9rdjh2xqgd5s2i", - "depends": ["BB", "corpcor", "Matrix", "mvtnorm"] + "depends": ["BB", "Matrix", "corpcor", "mvtnorm"] }, "PoisBinOrd": { "name": "PoisBinOrd", "version": "1.4.3", "sha256": "0s6v0minnwqx025nfn3kkkhbh8pzx6wgxars92kh6x9gdzf9i6ka", - "depends": ["corpcor", "GenOrd", "Matrix", "mvtnorm"] + "depends": ["GenOrd", "Matrix", "corpcor", "mvtnorm"] }, "PoisBinOrdNonNor": { "name": "PoisBinOrdNonNor", "version": "1.5.3", "sha256": "16c0z3974lvvr7xvrv8frzn9m5sg2jicjan52xgg7dxlm3rsij1s", - "depends": ["BB", "corpcor", "GenOrd", "MASS", "Matrix"] + "depends": ["BB", "GenOrd", "MASS", "Matrix", "corpcor"] }, "PoisBinOrdNor": { "name": "PoisBinOrdNor", "version": "1.6.3", "sha256": "02v9p82z85vkbhap2xn1rz8ibvvavsq8mgxxzicl749j4j9hcrmf", - "depends": ["corpcor", "GenOrd", "Matrix", "mvtnorm", "psych"] + "depends": ["GenOrd", "Matrix", "corpcor", "mvtnorm", "psych"] }, "PoisNonNor": { "name": "PoisNonNor", "version": "1.6.3", "sha256": "1572ma1vk17gp2j9fvmbiaxmnmb773mw15z6mlcf1slgpayp1ldb", - "depends": ["BB", "corpcor", "MASS", "Matrix"] + "depends": ["BB", "MASS", "Matrix", "corpcor"] }, "PoisNor": { "name": "PoisNor", "version": "1.3.3", "sha256": "1qi54fg2b1qc305kaihfwr2dkh3b3dd6l67yp9gi61n29kfxaqmf", - "depends": ["corpcor", "Matrix", "mvtnorm"] + "depends": ["Matrix", "corpcor", "mvtnorm"] }, "PoissonBinomial": { "name": "PoissonBinomial", @@ -24347,7 +24605,7 @@ "name": "PoissonMultinomial", "version": "1.1", "sha256": "0xbbs37i23f2swd15rxrw780q7cck9qz5yc4218knxgbj9p5pn8h", - "depends": ["mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "mvtnorm"] }, "PoissonPCA": { "name": "PoissonPCA", @@ -24431,7 +24689,7 @@ "name": "PoolTestR", "version": "0.1.3", "sha256": "0n9fihb2yc6jnxs1v0yq872pg7b1jd7lx7bwa9d1r8yv36haxzvr", - "depends": ["BH", "brms", "dplyr", "lme4", "progress", "Rcpp", "RcppEigen", "rstan", "rstantools", "StanHeaders", "stringr"] + "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "brms", "dplyr", "lme4", "progress", "rstan", "rstantools", "stringr"] }, "PooledCohort": { "name": "PooledCohort", @@ -24449,19 +24707,19 @@ "name": "PopED", "version": "0.6.0", "sha256": "0s8lr17s6w8isjig4z8jzgpnpsb1kg98d32y7kslbwzl08cbnza0", - "depends": ["boot", "codetools", "dplyr", "ggplot2", "gtools", "magrittr", "MASS", "mvtnorm", "purrr", "stringr", "tibble"] + "depends": ["MASS", "boot", "codetools", "dplyr", "ggplot2", "gtools", "magrittr", "mvtnorm", "purrr", "stringr", "tibble"] }, "PopGenHelpR": { "name": "PopGenHelpR", - "version": "1.3.0", - "sha256": "0s7grqzh3dy6rn7ricq79sr936q3prnj9zq2c5474pyl0pypv85p", - "depends": ["adegenet", "dartR", "dplyr", "ggplot2", "gstat", "hierfstat", "magrittr", "poppr", "raster", "reshape2", "rlang", "scatterpie", "sp", "spData", "spdep", "StAMPP", "vcfR"] + "version": "1.3.2", + "sha256": "0qkfrv5qshzb06q0y6vp9f01xcs9zqc7zb8nmpyl1sb18a6bvv2r", + "depends": ["dplyr", "ggplot2", "magrittr", "reshape2", "rlang", "scatterpie", "spData", "spdep", "vcfR"] }, "PopGenReport": { "name": "PopGenReport", "version": "3.1", "sha256": "19df1178kznrrzfkhaaf0lkmfk6kasl0x39k3zv3b5w6k7697igs", - "depends": ["ade4", "adegenet", "calibrate", "dismo", "gap", "gdistance", "genetics", "GGally", "ggplot2", "knitr", "lattice", "mmod", "pegas", "plyr", "R_utils", "raster", "reshape2", "RgoogleMaps", "sp", "vegan", "xtable"] + "depends": ["GGally", "R_utils", "RgoogleMaps", "ade4", "adegenet", "calibrate", "dismo", "gap", "gdistance", "genetics", "ggplot2", "knitr", "lattice", "mmod", "pegas", "plyr", "raster", "reshape2", "sp", "vegan", "xtable"] }, "PopVar": { "name": "PopVar", @@ -24479,7 +24737,7 @@ "name": "PortRisk", "version": "1.1.0", "sha256": "05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc", - "depends": ["copula", "MASS", "MCMCpack", "tseries", "zoo"] + "depends": ["MASS", "MCMCpack", "copula", "tseries", "zoo"] }, "PortalHacienda": { "name": "PortalHacienda", @@ -24489,9 +24747,9 @@ }, "PortfolioAnalytics": { "name": "PortfolioAnalytics", - "version": "1.1.0", - "sha256": "1jy89brrdw8ilbi9pjxxq5yhqw85ik4kzdd2sa60crjlhvipx0ff", - "depends": ["foreach", "PerformanceAnalytics", "xts", "zoo"] + "version": "2.0.0", + "sha256": "0rncchlc3n5kyfw7hfbxivi45gr64i89ylzr20mh9lqrqi0rif6a", + "depends": ["GenSA", "PerformanceAnalytics", "ROI_plugin_symphony", "foreach", "mco", "pso", "xts", "zoo"] }, "PortfolioOptim": { "name": "PortfolioOptim", @@ -24515,7 +24773,7 @@ "name": "PosteriorBootstrap", "version": "0.1.2", "sha256": "078b287brz4nlbdzbbvf5avy4qjv5hnz2wy61bwkk8l2kbg1j6as", - "depends": ["e1071", "MASS"] + "depends": ["MASS", "e1071"] }, "PottsUtils": { "name": "PottsUtils", @@ -24527,7 +24785,7 @@ "name": "Power2Stage", "version": "0.5-4", "sha256": "1g4zrprbd5q1dn4jfq5c9ayss4p0ljhbsfr3h8h9sjbmcg62rsal", - "depends": ["cubature", "mvtnorm", "PowerTOST"] + "depends": ["PowerTOST", "cubature", "mvtnorm"] }, "PowerNormal": { "name": "PowerNormal", @@ -24561,21 +24819,21 @@ }, "PracTools": { "name": "PracTools", - "version": "1.4.3", - "sha256": "14bgwmly49ba0xrvlns9dfn3q5yz38q3kvc3g6swryzhfb5wjb4r", + "version": "1.5", + "sha256": "1ridvpj9zgf987ysg86620r7daxh6r48gfjnyd6amsb8i6rdvp31", "depends": ["dplyr", "geosphere", "ggplot2", "usmap"] }, "PracticalEquiDesign": { "name": "PracticalEquiDesign", "version": "0.0.3", "sha256": "0jms5j9vg5g1llwkzjglj6k26wgj16jxdigllra4gjzk0azbgn9q", - "depends": ["dplyr", "ggplot2", "numDeriv", "Temporal", "tidyr"] + "depends": ["Temporal", "dplyr", "ggplot2", "numDeriv", "tidyr"] }, "PreKnitPostHTMLRender": { "name": "PreKnitPostHTMLRender", "version": "0.1.0", "sha256": "1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1", - "depends": ["knitr", "rmarkdown", "XML"] + "depends": ["XML", "knitr", "rmarkdown"] }, "PreProcess": { "name": "PreProcess", @@ -24587,7 +24845,7 @@ "name": "PreProcessRecordLinkage", "version": "1.0.1", "sha256": "05j3nbilkw8iqhdazkjz58sgnnwan2nh28b2sqi0gphzdbwks7mi", - "depends": ["data_table", "RecordLinkage", "stringr", "syn", "tm"] + "depends": ["RecordLinkage", "data_table", "stringr", "syn", "tm"] }, "PreProcessing": { "name": "PreProcessing", @@ -24605,25 +24863,25 @@ "name": "PredCRG", "version": "1.0.2", "sha256": "0z84p8l2q66rapb9lhx8m8iadz3q989q5qkvcp8ylv80cz6qkibx", - "depends": ["Biostrings", "e1071", "kernlab", "Peptides", "protr"] + "depends": ["Biostrings", "Peptides", "e1071", "kernlab", "protr"] }, "PredPsych": { "name": "PredPsych", "version": "0.4", "sha256": "00h4p1szqzh4a2kjvlriyinh330cfwxsrvs6fi089mr207q890vj", - "depends": ["caret", "e1071", "ggplot2", "MASS", "mclust", "party", "plyr", "randomForest", "rpart", "statmod"] + "depends": ["MASS", "caret", "e1071", "ggplot2", "mclust", "party", "plyr", "randomForest", "rpart", "statmod"] }, "PredictABEL": { "name": "PredictABEL", "version": "1.2-4", "sha256": "144xmfsp62ssmg501f4y173jrqyv8vps36j4yrwg6ghcmyc01wf8", - "depends": ["Hmisc", "lazyeval", "PBSmodelling", "ROCR"] + "depends": ["Hmisc", "PBSmodelling", "ROCR", "lazyeval"] }, "PredictionR": { "name": "PredictionR", "version": "1.0-12", "sha256": "0kgc8rjdqskasdaxsbir9gwvm55rw5cpdg3y9nsj7ccg9fc1ji19", - "depends": ["fitdistrplus", "Renext"] + "depends": ["Renext", "fitdistrplus"] }, "PredictorSelect": { "name": "PredictorSelect", @@ -24645,20 +24903,20 @@ }, "PrettyCols": { "name": "PrettyCols", - "version": "1.0.1", - "sha256": "1q4l9138kdbk8m35k3am4qksi14rcfd793lplm3s1d17dh7zqb5f", - "depends": ["ggplot2", "purrr"] + "version": "1.1.0", + "sha256": "16r3bjrhdqpfbwlmiqp474wyj2pg6fnhql05carz1ayqga08pgwb", + "depends": ["ggplot2", "lifecycle"] }, "PrevMap": { "name": "PrevMap", "version": "1.5.4", "sha256": "12cw4dmbsnx9c4y5l5k0paqn1wwbxy9ciw46r254n5rd275fhksh", - "depends": ["lme4", "Matrix", "maxLik", "numDeriv", "pdist", "raster", "splancs", "truncnorm"] + "depends": ["Matrix", "lme4", "maxLik", "numDeriv", "pdist", "raster", "splancs", "truncnorm"] }, "PriceIndices": { "name": "PriceIndices", - "version": "0.1.9", - "sha256": "06mm2zn8j7jvqfmgw07q4rhpbp56y4w3jb03fwzkks9qavaimy4l", + "version": "0.2.0", + "sha256": "01r2pcq26kbz861gw2dg2crvc1dla8h7aknz7ym9ndk10v3gyl6r", "depends": ["caret", "dplyr", "ggplot2", "lubridate", "reclin2", "reshape", "strex", "stringr", "xgboost"] }, "PriorGen": { @@ -24675,9 +24933,9 @@ }, "ProAE": { "name": "ProAE", - "version": "0.2.15", - "sha256": "02k8ndqhmqixqprj8jsc41lj4hrgjm13m6nc310057kdrpvi8lhv", - "depends": ["DescTools", "dplyr", "ggnewscale", "ggpattern", "ggplot2", "ggtext", "gridExtra", "Hmisc", "magrittr"] + "version": "1.0.1", + "sha256": "1sgd5ws1jpnjsnx1daywsn3ygl6lmg048fgvc7i4nkkryq7zls6b", + "depends": ["DescTools", "Hmisc", "dplyr", "ggnewscale", "ggpattern", "ggplot2", "ggtext", "gridExtra", "kableExtra", "magrittr"] }, "ProDenICA": { "name": "ProDenICA", @@ -24689,7 +24947,7 @@ "name": "ProFAST", "version": "1.4", "sha256": "06643m0rr54v42sg16vp3dlfkvkjflqlmv2kv87c2n668gifxaw7", - "depends": ["AnnotationDbi", "biomaRt", "DR_SC", "furrr", "future", "ggplot2", "gtools", "harmony", "irlba", "Matrix", "mclust", "org_Hs_eg_db", "org_Mm_eg_db", "pbapply", "PRECAST", "Rcpp", "RcppArmadillo", "Seurat"] + "depends": ["AnnotationDbi", "DR_SC", "Matrix", "PRECAST", "Rcpp", "RcppArmadillo", "Seurat", "biomaRt", "furrr", "future", "ggplot2", "gtools", "harmony", "irlba", "mclust", "org_Hs_eg_db", "org_Mm_eg_db", "pbapply"] }, "ProPublicaR": { "name": "ProPublicaR", @@ -24701,25 +24959,25 @@ "name": "ProSGPV", "version": "1.0.0", "sha256": "1837p4vg1g4225rv55gaphma429j6pnfh078cxpv5ha2n0h1sfz3", - "depends": ["brglm2", "glmnet", "MASS", "survival"] + "depends": ["MASS", "brglm2", "glmnet", "survival"] }, "ProTrackR": { "name": "ProTrackR", "version": "0.4.3", "sha256": "08c53ndrfgaw8hxvrw13ypcbm62nlxgfnip7p9pivvlrjpiiryvj", - "depends": ["audio", "lattice", "signal", "tuneR", "XML"] + "depends": ["XML", "audio", "lattice", "signal", "tuneR"] }, "ProbBayes": { "name": "ProbBayes", "version": "1.1", "sha256": "0bkbqyrmpy9swaxsl91w6iiw81znjf1lk4b0vqgn6wdnrir6gkmn", - "depends": ["ggplot2", "gridExtra", "LearnBayes", "shiny"] + "depends": ["LearnBayes", "ggplot2", "gridExtra", "shiny"] }, "ProbBreed": { "name": "ProbBreed", - "version": "1.0.3.2", - "sha256": "150kbj6mkabgswxjg9adihz7i4paaknni49j2x9i7jyaw79iym78", - "depends": ["ggplot2", "lifecycle", "rlang", "rstan"] + "version": "1.0.4.1", + "sha256": "1m224wxzighadp8gdch4fg8pc5df4xphf75ixq6r99x7klp4mcah", + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "lifecycle", "rlang", "rstan", "rstantools"] }, "ProbMarg": { "name": "ProbMarg", @@ -24749,19 +25007,19 @@ "name": "ProbitSpatial", "version": "1.1", "sha256": "1wa020hb02zjf4shzb345nyjkxm38wf67knvnl9iyh6n2sc34975", - "depends": ["Matrix", "numDeriv", "RANN", "Rcpp", "RcppEigen"] + "depends": ["Matrix", "RANN", "Rcpp", "RcppEigen", "numDeriv"] }, "ProcData": { "name": "ProcData", "version": "0.3.2", "sha256": "1a0rbj57rbxf5axfyd1j9j1mh7ara3rlq31lysaprwaymig94mml", - "depends": ["keras", "Rcpp"] + "depends": ["Rcpp", "keras"] }, "ProcMod": { "name": "ProcMod", "version": "1.0.8", "sha256": "0rxh135gs9gq9sag1cmvywdgnax7n989gmffbxil71fy49kxpwdg", - "depends": ["foreach", "MASS", "Matrix", "permute", "Rdpack"] + "depends": ["MASS", "Matrix", "Rdpack", "foreach", "permute"] }, "ProfessR": { "name": "ProfessR", @@ -24795,15 +25053,15 @@ }, "ProjectTemplate": { "name": "ProjectTemplate", - "version": "0.10.4", - "sha256": "08idly6fdxhv2rx5s4309snvzpd9rhd5bq9vq4rw13hnvnbdzyya", + "version": "0.11.0", + "sha256": "1898dfrfrilpa9gackifgnyf5m5j6r9359c7m8avcxn0qsygiviz", "depends": ["digest", "tibble"] }, "ProjectionBasedClustering": { "name": "ProjectionBasedClustering", "version": "1.2.2", "sha256": "0v3w5bfmvc36bf19p1lp13p574xlbjq0gg43mwm598cnyqsw12xq", - "depends": ["deldir", "GeneralizedUmatrix", "geometry", "ggplot2", "plotly", "Rcpp", "shiny", "shinyjs", "shinythemes", "vegan"] + "depends": ["GeneralizedUmatrix", "Rcpp", "deldir", "geometry", "ggplot2", "plotly", "shiny", "shinyjs", "shinythemes", "vegan"] }, "ProliferativeIndex": { "name": "ProliferativeIndex", @@ -24863,7 +25121,7 @@ "name": "PsychWordVec", "version": "2023.9", "sha256": "04dp4k0x2nmcfiqbyzirhr595lgishxh0qbymy210g96sghbrpf3", - "depends": ["bruceR", "cli", "corrplot", "data_table", "dplyr", "fastTextR", "ggplot2", "ggrepel", "psych", "purrr", "qgraph", "reticulate", "rgl", "rsparse", "Rtsne", "stringr", "text", "text2vec", "vroom", "word2vec"] + "depends": ["Rtsne", "bruceR", "cli", "corrplot", "data_table", "dplyr", "fastTextR", "ggplot2", "ggrepel", "psych", "purrr", "qgraph", "reticulate", "rgl", "rsparse", "stringr", "text", "text2vec", "vroom", "word2vec"] }, "PtProcess": { "name": "PtProcess", @@ -24873,9 +25131,9 @@ }, "PubChemR": { "name": "PubChemR", - "version": "1.2", - "sha256": "00x9hm6mibla8ngwqx29n2v7zy4ichbymm4ahsg4r96c3hpp331z", - "depends": ["dplyr", "httr", "magick", "magrittr", "png", "RCurl", "RJSONIO", "rsvg", "stringr", "tibble", "tidyr", "XML", "xml2"] + "version": "2.0", + "sha256": "0c8n77r0yxjcb217xgalrvfwhajzkk7h0kfsg6k8jhvlvfrj7n00", + "depends": ["RCurl", "RJSONIO", "dplyr", "httr", "magick", "magrittr", "png", "rsvg", "stringr", "testthat", "tibble", "tidyr"] }, "PubMedMining": { "name": "PubMedMining", @@ -24887,7 +25145,7 @@ "name": "PubMedWordcloud", "version": "0.3.6", "sha256": "1wfp1fpr4an7psrwidx38brvhvghmvfsgjy4gdx81p1bdsdn2kw2", - "depends": ["RColorBrewer", "RCurl", "stringr", "tm", "wordcloud", "XML"] + "depends": ["RColorBrewer", "RCurl", "XML", "stringr", "tm", "wordcloud"] }, "PublicWorksFinanceIT": { "name": "PublicWorksFinanceIT", @@ -24899,7 +25157,7 @@ "name": "PublicationBias", "version": "2.4.0", "sha256": "1nwkp5czv31v57qzaahj18lkw557a48qcnwrz6lmz9hw74b52qm6", - "depends": ["dplyr", "ggplot2", "glue", "lifecycle", "metabias", "metafor", "Rdpack", "rlang", "robumeta"] + "depends": ["Rdpack", "dplyr", "ggplot2", "glue", "lifecycle", "metabias", "metafor", "rlang", "robumeta"] }, "Publish": { "name": "Publish", @@ -24911,7 +25169,7 @@ "name": "PupilPre", "version": "0.6.2", "sha256": "123m1zqld0jl26vqz41iic7vxzyfs1aw8zi5ki2cy6wzw9ss87m6", - "depends": ["dplyr", "ggplot2", "mgcv", "rlang", "robustbase", "shiny", "signal", "tidyr", "VWPre", "zoo"] + "depends": ["VWPre", "dplyr", "ggplot2", "mgcv", "rlang", "robustbase", "shiny", "signal", "tidyr", "zoo"] }, "PupillometryR": { "name": "PupillometryR", @@ -24919,16 +25177,22 @@ "sha256": "0jqpx5g0fjdxxp7wlgv4jm5vrhchm6r21qd7i825fi5552c46awv", "depends": ["dplyr", "fda", "ggplot2", "itsadug", "mgcv", "rlang", "signal", "stringr", "tidyr", "zoo"] }, + "PurpleAir": { + "name": "PurpleAir", + "version": "1.0.0", + "sha256": "0xsqd839x55m7wmr2knznqyrmvpa5kcxi16izxl5h2539diqssjx", + "depends": ["cli", "dplyr", "glue", "httr2", "purrr", "rlang", "tibble"] + }, "Pursuit": { "name": "Pursuit", - "version": "1.0.4", - "sha256": "0pgx2vfvfgf0gndgnawk91hd13q39f0855hj1ivq30id91ym421r", + "version": "1.0.5", + "sha256": "1wg1ix466zcbcgr2qqa6sbh9blx5g8hjqmagf9z3ig06qgxf1zrr", "depends": ["MASS"] }, "PwrGSD": { "name": "PwrGSD", - "version": "2.3.6", - "sha256": "1sxm4g4hrnn7rqxgx4pi98jlh15a8hm8jnrnmcyi2yj86x5l35r0", + "version": "2.3.7", + "sha256": "0gxyx2z4yjqvivwslb31ai2vpg664p6pvyhz23s9n43wlqahvjg1", "depends": ["survival"] }, "PxWebApiData": { @@ -24959,7 +25223,7 @@ "name": "QBMS", "version": "1.0.0", "sha256": "0kxhww5vvl4giap8fyymmk873j73waixa1dzg9cb6hqk3816vwqm", - "depends": ["DBI", "httr", "jsonlite", "RNetCDF", "RSQLite", "terra"] + "depends": ["DBI", "RNetCDF", "RSQLite", "httr", "jsonlite", "terra"] }, "QCA": { "name": "QCA", @@ -24971,7 +25235,7 @@ "name": "QCAcluster", "version": "0.1.0", "sha256": "094p11c9arry793zibr8x3xhpbrym9bfky95nds53g3yliprdd63", - "depends": ["data_table", "magrittr", "plyr", "purrr", "QCA", "rlist", "stringi", "testit", "UpSetR"] + "depends": ["QCA", "UpSetR", "data_table", "magrittr", "plyr", "purrr", "rlist", "stringi", "testit"] }, "QCApro": { "name": "QCApro", @@ -24983,7 +25247,7 @@ "name": "QCAtools", "version": "0.2.3", "sha256": "1q49l2mf02hqvz2ahqjdx7i3yxniy7dn2s74xjl9l6zdq8bypfw2", - "depends": ["directlabels", "ggplot2", "QCA", "stringr"] + "depends": ["QCA", "directlabels", "ggplot2", "stringr"] }, "QCEWAS": { "name": "QCEWAS", @@ -25031,7 +25295,7 @@ "name": "QFASA", "version": "1.2.0", "sha256": "1dhnfr4f5ij3irkragyllfjqisgm27phk40c9i539vm6046sc2w2", - "depends": ["boot", "bootstrap", "Compositional", "compositions", "dplyr", "futile_logger", "gamlss", "gamlss_dist", "MASS", "mvtnorm", "Rcpp", "RcppEigen", "Rsolnp", "TMB", "vegan"] + "depends": ["Compositional", "MASS", "Rcpp", "RcppEigen", "Rsolnp", "TMB", "boot", "bootstrap", "compositions", "dplyr", "futile_logger", "gamlss", "gamlss_dist", "mvtnorm", "vegan"] }, "QFRM": { "name": "QFRM", @@ -25049,7 +25313,7 @@ "name": "QGameTheory", "version": "0.1.2", "sha256": "0h3qkb0zg6km3s89bjnv9503hgcng4wfywfy1x5dsbj5azs9hs5w", - "depends": ["dplyr", "R_utils", "RColorBrewer"] + "depends": ["RColorBrewer", "R_utils", "dplyr"] }, "QGglmm": { "name": "QGglmm", @@ -25067,7 +25331,7 @@ "name": "QHScrnomo", "version": "3.0.1", "sha256": "1axl0scvk5q127rcffdfv8k9ikvq0wamrbnqaimm3smcyfbcyyqm", - "depends": ["cmprsk", "Hmisc", "rms"] + "depends": ["Hmisc", "cmprsk", "rms"] }, "QI": { "name": "QI", @@ -25109,7 +25373,7 @@ "name": "QRM", "version": "0.4-31", "sha256": "15dyk3zfy92vj4xny04dh5mqcyb8qh61566m313qs17mxwibvn2a", - "depends": ["gsl", "Matrix", "mgcv", "mvtnorm", "numDeriv", "Rcpp", "timeDate", "timeSeries"] + "depends": ["Matrix", "Rcpp", "gsl", "mgcv", "mvtnorm", "numDeriv", "timeDate", "timeSeries"] }, "QRank": { "name": "QRank", @@ -25121,7 +25385,7 @@ "name": "QRegVCM", "version": "1.2", "sha256": "0fcydkf6r2qxd59ylr8vn76bkxks91v58gfzvq3rjd5mqf9vsaaq", - "depends": ["quantreg", "SparseM", "truncSP"] + "depends": ["SparseM", "quantreg", "truncSP"] }, "QSARdata": { "name": "QSARdata", @@ -25139,18 +25403,18 @@ "name": "QTL.gCIMapping", "version": "3.4", "sha256": "17f2xmgklbi8kicv7v951zm3bf1q4bdx9lcfbxpac3i7xm985fgr", - "depends": ["data_table", "doParallel", "foreach", "glmnet", "lars", "MASS", "openxlsx", "qtl", "Rcpp", "readxl", "stringr"] + "depends": ["MASS", "Rcpp", "data_table", "doParallel", "foreach", "glmnet", "lars", "openxlsx", "qtl", "readxl", "stringr"] }, "QTL_gCIMapping_GUI": { "name": "QTL.gCIMapping.GUI", "version": "2.1.1", "sha256": "0a155vl869i3li2i67b89p056x50ycqp9yk0ll5g3fp3xcdl80zs", - "depends": ["data_table", "doParallel", "foreach", "glmnet", "MASS", "openxlsx", "qtl", "QTL_gCIMapping", "Rcpp", "shiny", "stringr"] + "depends": ["MASS", "QTL_gCIMapping", "Rcpp", "data_table", "doParallel", "foreach", "glmnet", "openxlsx", "qtl", "shiny", "stringr"] }, "QTLEMM": { "name": "QTLEMM", - "version": "1.5.4", - "sha256": "0ha8ivwpjvymg143fdmg0w5kp2yf18alk00iq7y5i4qxdyyhyjpw", + "version": "2.1.0", + "sha256": "1w2h094ihvfybaq7gr9l0x6b1d81yvf921rki1bz263jbc9x57h3", "depends": ["gtools", "mvtnorm"] }, "QTLRel": { @@ -25163,19 +25427,19 @@ "name": "QTOCen", "version": "0.1.1", "sha256": "0wlbxk1rd56k02jf3pfzbx6xx5mmf6sb7gvds0067cvb7m42ghcr", - "depends": ["MatrixModels", "quantreg", "Rdpack", "rgenoud", "survival"] + "depends": ["MatrixModels", "Rdpack", "quantreg", "rgenoud", "survival"] }, "QUALYPSO": { "name": "QUALYPSO", "version": "2.3", "sha256": "1nbkbc5lcglrpp4k3jphdzqr9xl5kgdv6sg05ibdcwidn6bk3y5l", - "depends": ["expm", "MASS", "Rfast"] + "depends": ["MASS", "Rfast", "expm"] }, "QWDAP": { "name": "QWDAP", "version": "1.1.18", "sha256": "1i1g83k2fr0c7kchwpsyxxfhi6kvbdqg8caff9ly0crdzar5xrc4", - "depends": ["CORElearn", "pls", "Rcpp", "RcppEigen"] + "depends": ["CORElearn", "Rcpp", "RcppEigen", "pls"] }, "QZ": { "name": "QZ", @@ -25223,7 +25487,7 @@ "name": "Qtools", "version": "1.5.9", "sha256": "167c8mfj0if4j9m3rjbi1gnhwypq5ky297zyb437p42b3856qagi", - "depends": ["boot", "conquer", "glmx", "gtools", "MASS", "Matrix", "np", "numDeriv", "quantdr", "quantreg", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "boot", "conquer", "glmx", "gtools", "np", "numDeriv", "quantdr", "quantreg"] }, "QuClu": { "name": "QuClu", @@ -25247,7 +25511,7 @@ "name": "QuadratiK", "version": "1.1.1", "sha256": "0pjg0j0hb5v6gxlg4lv1ddrwbrvp91ah3rxm6y7mjclg3ff47g16", - "depends": ["cluster", "clusterRepro", "doParallel", "foreach", "ggplot2", "ggpp", "ggpubr", "mclust", "moments", "movMF", "mvtnorm", "Rcpp", "RcppEigen", "rgl", "rlecuyer", "rrcov", "sn", "Tinflex"] + "depends": ["Rcpp", "RcppEigen", "Tinflex", "cluster", "clusterRepro", "doParallel", "foreach", "ggplot2", "ggpp", "ggpubr", "mclust", "moments", "movMF", "mvtnorm", "rgl", "rlecuyer", "rrcov", "sn"] }, "Quandl": { "name": "Quandl", @@ -25259,7 +25523,7 @@ "name": "QuantBondCurves", "version": "0.3.0", "sha256": "1w6zlf8wvfh4568aa0l9l3p502hjmj8lhnkagv6dqg332jz0ikhr", - "depends": ["lubridate", "quantdates", "Rsolnp"] + "depends": ["Rsolnp", "lubridate", "quantdates"] }, "QuantNorm": { "name": "QuantNorm", @@ -25271,19 +25535,19 @@ "name": "QuantPsyc", "version": "1.6", "sha256": "1dbj830p5837fiwa800nzsaf19lf95vc3n7jmds2q9v06mrz6syq", - "depends": ["boot", "dplyr", "MASS", "purrr"] + "depends": ["MASS", "boot", "dplyr", "purrr"] }, "QuantRegGLasso": { "name": "QuantRegGLasso", "version": "1.0.0", "sha256": "0jjjrkj45148s2rymvgzkqpbg2bw7nvf3851153qpl8kp13mxgr1", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2"] }, "QuantileGH": { "name": "QuantileGH", "version": "0.1.7", "sha256": "0zsdvvx567dq17b5n9rdx2qmnm0ph9qnvffmgh7n4csz0c1ca4xg", - "depends": ["fmx", "mixtools", "tclust", "TukeyGH77"] + "depends": ["TukeyGH77", "fmx", "mixtools", "tclust"] }, "QuantileGradeR": { "name": "QuantileGradeR", @@ -25307,43 +25571,43 @@ "name": "Quartet", "version": "1.2.6", "sha256": "1qrhjxqg3899kw58irnqs7sj6n9ixyx71gaf1whld8xpj89dsz7f", - "depends": ["ape", "Rcpp", "Rdpack", "Ternary", "TreeTools", "viridisLite"] + "depends": ["Rcpp", "Rdpack", "Ternary", "TreeTools", "ape", "viridisLite"] }, "QuickJSR": { "name": "QuickJSR", - "version": "1.2.2", - "sha256": "1vb8b591imq737zin77sh3icld87pqk5mssmn7ddzj45cn22z12i", + "version": "1.3.1", + "sha256": "1lcg437b93yvbk4q63m2sh8ih4p2b6505invmjbyqf58hip9sm8h", "depends": [] }, "QurvE": { "name": "QurvE", "version": "1.1.1", "sha256": "0md97jgyl7lkq46zsl6svgdhyg95is92f8yn5szkaylfdb2cglg3", - "depends": ["doParallel", "dplyr", "drc", "DT", "foreach", "ggh4x", "ggnewscale", "ggplot2", "ggpubr", "kableExtra", "knitr", "labeling", "magrittr", "minpack_lm", "plyr", "purrr", "RColorBrewer", "readxl", "rmarkdown", "scales", "shiny", "stringr", "tidyr"] + "depends": ["DT", "RColorBrewer", "doParallel", "dplyr", "drc", "foreach", "ggh4x", "ggnewscale", "ggplot2", "ggpubr", "kableExtra", "knitr", "labeling", "magrittr", "minpack_lm", "plyr", "purrr", "readxl", "rmarkdown", "scales", "shiny", "stringr", "tidyr"] }, "Qval": { "name": "Qval", - "version": "0.1.6", - "sha256": "134cahaarly5qbdycm0s52fkxfk0pylg5g3k9sq5y6law8yb5q7v", - "depends": ["GDINA", "glmnet", "Matrix", "nloptr", "plyr"] + "version": "0.1.7", + "sha256": "02wvj7n3zbn13mn48gxd57kfkcbx9740ca2nl0yl15nfj45c21zh", + "depends": ["GDINA", "Matrix", "glmnet", "nloptr", "plyr"] }, "R_cache": { "name": "R.cache", "version": "0.16.0", "sha256": "14cja0d78mzipb94cwgdl00k5r7awjclzxl30c77j6jpc68l0lvq", - "depends": ["digest", "R_methodsS3", "R_oo", "R_utils"] + "depends": ["R_methodsS3", "R_oo", "R_utils", "digest"] }, "R_devices": { "name": "R.devices", "version": "2.17.2", "sha256": "15gcvhmqwqyl3n299l9znwcjri8d8vixwwv915162sfxabsylgj0", - "depends": ["base64enc", "R_methodsS3", "R_oo", "R_utils"] + "depends": ["R_methodsS3", "R_oo", "R_utils", "base64enc"] }, "R_filesets": { "name": "R.filesets", "version": "2.15.1", "sha256": "1qwxk3p56yq06nsdl0jwbw6j8r6qjakznsd3z63gnpsgkckfkx88", - "depends": ["digest", "R_cache", "R_methodsS3", "R_oo", "R_utils"] + "depends": ["R_cache", "R_methodsS3", "R_oo", "R_utils", "digest"] }, "R_huge": { "name": "R.huge", @@ -25373,13 +25637,13 @@ "name": "R.rsp", "version": "0.46.0", "sha256": "1frkgjc2mzvjnay8g5nky1bvxv60wvsypmmdj6mbsfjnzq7ni7qs", - "depends": ["digest", "R_cache", "R_methodsS3", "R_oo", "R_utils"] + "depends": ["R_cache", "R_methodsS3", "R_oo", "R_utils", "digest"] }, "R_temis": { "name": "R.temis", "version": "0.1.3", "sha256": "1qa381fv1hxd1fv9d22772aibiia6m2ycm69znjy3ah2w986hjfh", - "depends": ["crayon", "explor", "FactoMineR", "igraph", "NLP", "slam", "SnowballC", "stringi", "testthat", "tm", "tm_plugin_alceste", "tm_plugin_europresse", "tm_plugin_factiva", "tm_plugin_lexisnexis", "wordcloud"] + "depends": ["FactoMineR", "NLP", "SnowballC", "crayon", "explor", "igraph", "slam", "stringi", "testthat", "tm", "tm_plugin_alceste", "tm_plugin_europresse", "tm_plugin_factiva", "tm_plugin_lexisnexis", "wordcloud"] }, "R_utils": { "name": "R.utils", @@ -25403,7 +25667,7 @@ "name": "R2Addhaz", "version": "0.1.0", "sha256": "1xaqbzq2chsgkg1gc163fq8qcgzq9wwn2bm4mwvc31ay0gg4f3xi", - "depends": ["ahaz", "caTools", "pracma", "Rdpack", "survival", "zoo"] + "depends": ["Rdpack", "ahaz", "caTools", "pracma", "survival", "zoo"] }, "R2BEAT": { "name": "R2BEAT", @@ -25433,7 +25697,7 @@ "name": "R2MLwiN", "version": "0.8-9", "sha256": "0zzvpsmcfvnr6v0dg5dbfz8sx2h2m6krkb0q8bxxlj552nn2qvgr", - "depends": ["broom", "coda", "digest", "doParallel", "foreach", "foreign", "lattice", "Matrix", "memisc", "R2WinBUGS", "texreg", "tibble"] + "depends": ["Matrix", "R2WinBUGS", "broom", "coda", "digest", "doParallel", "foreach", "foreign", "lattice", "memisc", "texreg", "tibble"] }, "R2OpenBUGS": { "name": "R2OpenBUGS", @@ -25469,13 +25733,13 @@ "name": "R2jags", "version": "0.8-5", "sha256": "1k895xmlrq8k34s0yc06mjkay8gj2r80sfn4rpqql09j6vr1za3i", - "depends": ["abind", "coda", "R2WinBUGS", "rjags", "stringr"] + "depends": ["R2WinBUGS", "abind", "coda", "rjags", "stringr"] }, "R2sample": { "name": "R2sample", "version": "1.1.0", "sha256": "18v7i0h4jbnyd08c24sr8fydk209fp76hc2k7yivva616m5c4s2d", - "depends": ["ggplot2", "microbenchmark", "Rcpp", "shiny"] + "depends": ["Rcpp", "ggplot2", "microbenchmark", "shiny"] }, "R2ucare": { "name": "R2ucare", @@ -25493,7 +25757,7 @@ "name": "R4CouchDB", "version": "0.7.5", "sha256": "1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz", - "depends": ["bitops", "RCurl", "RJSONIO"] + "depends": ["RCurl", "RJSONIO", "bitops"] }, "R6": { "name": "R6", @@ -25517,13 +25781,13 @@ "name": "R6P", "version": "0.3.0", "sha256": "18qy69zwyzp27fiqlplcjh0034d2pn9dhnfkraarh4jxnbi7masm", - "depends": ["collections", "dplyr", "purrr", "R6", "stringr", "tibble", "tidyr"] + "depends": ["R6", "collections", "dplyr", "purrr", "stringr", "tibble", "tidyr"] }, "R6causal": { "name": "R6causal", "version": "0.8.3", "sha256": "0qi569gsjhslg7xk2xjcglnighlfpdr5yzfb4hajq57w49p310zf", - "depends": ["causaleffect", "cfid", "data_table", "dosearch", "glue", "igraph", "MASS", "R6"] + "depends": ["MASS", "R6", "causaleffect", "cfid", "data_table", "dosearch", "glue", "igraph"] }, "RABR": { "name": "RABR", @@ -25547,19 +25811,19 @@ "name": "RAFS", "version": "0.2.4", "sha256": "02s4p7hsjm2znj5rcfrd2cqwynd03p8zbby8qxnfxr3hp5ggq7hr", - "depends": ["fastcluster", "MDFS", "splitTools"] + "depends": ["MDFS", "fastcluster", "splitTools"] }, "RAINBOWR": { "name": "RAINBOWR", "version": "0.1.35", "sha256": "0cpjjnjfv53q0cwgia5fbay4n02z0q26jjr2p7c7rpykd382lr7c", - "depends": ["ape", "cluster", "expm", "gaston", "here", "htmlwidgets", "MASS", "Matrix", "MM4LMM", "optimx", "pbmcapply", "pegas", "R_utils", "Rcpp", "RcppEigen", "Rfast", "rrBLUP", "stringr"] + "depends": ["MASS", "MM4LMM", "Matrix", "R_utils", "Rcpp", "RcppEigen", "Rfast", "ape", "cluster", "expm", "gaston", "here", "htmlwidgets", "optimx", "pbmcapply", "pegas", "rrBLUP", "stringr"] }, "RALSA": { "name": "RALSA", - "version": "1.4.5", - "sha256": "1bg2s12803q2rayjmwbksm7ncpb6lbhhx9b6zj8gd12n8dxn0syy", - "depends": ["data_table", "DT", "foreign", "ggplot2", "haven", "Hmisc", "openxlsx", "r_import", "rclipboard", "readr", "rstudioapi", "shiny", "shinydashboard", "shinyFiles", "shinyjs", "shinyWidgets", "stringi", "stringr"] + "version": "1.4.7", + "sha256": "1m9fp1y5fgyngm5n6kgwfdpr8pnczs250hy63dd3ld3n50qdmc4l", + "depends": ["DT", "Hmisc", "data_table", "foreign", "ggplot2", "haven", "openxlsx", "r_import", "rclipboard", "readr", "rstudioapi", "shiny", "shinyFiles", "shinyWidgets", "shinydashboard", "shinyjs", "stringi", "stringr"] }, "RAMClustR": { "name": "RAMClustR", @@ -25577,13 +25841,13 @@ "name": "RAMpath", "version": "0.5.1", "sha256": "0dp5illypz3qdj2qmn47wy208mcjhkkwvw8yq2spzcsn55l8f0nx", - "depends": ["ellipse", "lavaan", "MASS"] + "depends": ["MASS", "ellipse", "lavaan"] }, "RANKS": { "name": "RANKS", "version": "1.1", "sha256": "1c7khw2rxf88cycy81kqxyg7rzb9f8ns8n5x24zzjdvsws77fshq", - "depends": ["graph", "limma", "NetPreProc", "PerfMeas", "RBGL"] + "depends": ["NetPreProc", "PerfMeas", "RBGL", "graph", "limma"] }, "RANN": { "name": "RANN", @@ -25607,13 +25871,13 @@ "name": "RARfreq", "version": "0.1.5", "sha256": "05yb1hkhqq5x4q34z6kvdd6s8iy90528zypbc2pjhhb264v5k8qd", - "depends": ["data_table", "dplyr", "ggplot2", "latex2exp", "magrittr", "patchwork", "Rdpack", "reshape2", "tidyr"] + "depends": ["Rdpack", "data_table", "dplyr", "ggplot2", "latex2exp", "magrittr", "patchwork", "reshape2", "tidyr"] }, "RARtrials": { "name": "RARtrials", "version": "0.0.1", "sha256": "03hfbr08f4wbb8apfdqg32118615zzyaihvriqsfr7q2qxy4byla", - "depends": ["pins", "Rdpack"] + "depends": ["Rdpack", "pins"] }, "RAT": { "name": "RAT", @@ -25655,7 +25919,7 @@ "name": "RAthena", "version": "2.6.1", "sha256": "1zncmkx93c28z0xf4n5rdc7fzlrdqw3x9ab2ci07f00gjf9gwkf1", - "depends": ["data_table", "DBI", "reticulate", "uuid"] + "depends": ["DBI", "data_table", "reticulate", "uuid"] }, "RBE3": { "name": "RBE3", @@ -25679,19 +25943,19 @@ "name": "RBPcurve", "version": "1.2", "sha256": "0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782", - "depends": ["BBmisc", "checkmate", "mlr", "shape", "TeachingDemos"] + "depends": ["BBmisc", "TeachingDemos", "checkmate", "mlr", "shape"] }, "RBaseX": { "name": "RBaseX", "version": "1.1.2", "sha256": "1f7lgfsxwqjplv8kk81sw3zmwqi9kxc8g328ylb2c2hiyq4fg49k", - "depends": ["data_table", "dplyr", "httr", "magrittr", "openssl", "pingr", "R6", "RCurl", "rex", "stringr", "tibble"] + "depends": ["R6", "RCurl", "data_table", "dplyr", "httr", "magrittr", "openssl", "pingr", "rex", "stringr", "tibble"] }, "RBesT": { "name": "RBesT", "version": "1.7-3", "sha256": "19bhn1j03qsmc20xndyls0ynhqbwb3kis6mxm7wh9k87zcm1lvla", - "depends": ["abind", "assertthat", "bayesplot", "BH", "checkmate", "dplyr", "Formula", "ggplot2", "matrixStats", "mvtnorm", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Formula", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "abind", "assertthat", "bayesplot", "checkmate", "dplyr", "ggplot2", "matrixStats", "mvtnorm", "rlang", "rstan", "rstantools"] }, "RBtest": { "name": "RBtest", @@ -25721,7 +25985,7 @@ "name": "RCBR", "version": "0.6.2", "sha256": "08rcnvdbavcww2cpl052ca93lbzkza7q6jlr4namdpzmf22z7bma", - "depends": ["Formula", "Matrix", "mvtnorm", "orthopolynom", "REBayes", "Rmosek"] + "depends": ["Formula", "Matrix", "REBayes", "Rmosek", "mvtnorm", "orthopolynom"] }, "RCCPCA": { "name": "RCCPCA", @@ -25733,7 +25997,7 @@ "name": "RCDT", "version": "1.3.0", "sha256": "1k27kydqzxqdhjbygq5a8mdhwlvbc32j1hg4vr223rwwc94864w6", - "depends": ["BH", "colorsGen", "gplots", "Polychrome", "Rcpp", "RcppArmadillo", "rgl", "Rvcg"] + "depends": ["BH", "Polychrome", "Rcpp", "RcppArmadillo", "Rvcg", "colorsGen", "gplots", "rgl"] }, "RCEIM": { "name": "RCEIM", @@ -25745,13 +26009,13 @@ "name": "RCGLS", "version": "1.0.3", "sha256": "12mmfs91fmhdxdxr7q16hnjlg7bz2bbkf8chld4cyf8clnflzvsj", - "depends": ["ncdf4", "raster", "RCurl", "sp"] + "depends": ["RCurl", "ncdf4", "raster", "sp"] }, "RCLabels": { "name": "RCLabels", "version": "0.1.10", "sha256": "0nb1032mlqbs9aslq4hsmahfn3bp1qvg26pfbgk784rj64ibd6gz", - "depends": ["assertthat", "Hmisc", "magrittr", "purrr"] + "depends": ["Hmisc", "assertthat", "magrittr", "purrr"] }, "RCMinification": { "name": "RCMinification", @@ -25761,15 +26025,15 @@ }, "RCPA": { "name": "RCPA", - "version": "0.2.2", - "sha256": "116qb2zqlw6jsxz5mn7s35nv3d27kzpfjmnqk3whh9r91dkdhfyk", - "depends": ["AnnotationDbi", "Biobase", "BiocManager", "DESeq2", "dplyr", "edgeR", "GEOquery", "ggnewscale", "ggpattern", "ggplot2", "ggrepel", "graph", "httr", "IRdisplay", "jsonlite", "limma", "rlang", "RobustRankAggreg", "scales", "stringr", "SummarizedExperiment", "tidyr"] + "version": "0.2.3", + "sha256": "0jk53sqcjy6a2ydv4b2ai57lbpjpva1ssmfqgzb3nl7j8iqk2ggl", + "depends": ["AnnotationDbi", "Biobase", "BiocManager", "DESeq2", "GEOquery", "IRdisplay", "RobustRankAggreg", "SummarizedExperiment", "dplyr", "edgeR", "ggnewscale", "ggpattern", "ggplot2", "ggrepel", "graph", "httr", "jsonlite", "limma", "rlang", "scales", "stringr", "tidyr"] }, "RCPA3": { "name": "RCPA3", "version": "1.2.1", "sha256": "1xcrlnd41r9f7p4ql258hjh81alzah1p19pk9kady0ardp0xq1zz", - "depends": ["beepr", "car", "descr", "haven", "Hmisc", "knitr", "lmtest", "survey", "weights"] + "depends": ["Hmisc", "beepr", "car", "descr", "haven", "knitr", "lmtest", "survey", "weights"] }, "RCRnorm": { "name": "RCRnorm", @@ -25787,7 +26051,7 @@ "name": "RCT", "version": "1.2", "sha256": "0yq0jiavkplfm1swa1zd83rwl34h5p33cj3lsmj5aplpg1pbbvvh", - "depends": ["broom", "dplyr", "estimatr", "forcats", "ggplot2", "glue", "magrittr", "MASS", "pracma", "purrr", "rlang", "stringr", "tidyr", "tidyselect"] + "depends": ["MASS", "broom", "dplyr", "estimatr", "forcats", "ggplot2", "glue", "magrittr", "pracma", "purrr", "rlang", "stringr", "tidyr", "tidyselect"] }, "RCT2": { "name": "RCT2", @@ -25799,13 +26063,13 @@ "name": "RCTS", "version": "0.2.4", "sha256": "0wx0c9sk8y1frjwifgszzp38yx5lmwndhvixbak1kcjw5n02rkyj", - "depends": ["cellWise", "dplyr", "ggplot2", "magrittr", "ncvreg", "purrr", "Rdpack", "rlang", "robustbase", "stringr", "tibble", "tidyr"] + "depends": ["Rdpack", "cellWise", "dplyr", "ggplot2", "magrittr", "ncvreg", "purrr", "rlang", "robustbase", "stringr", "tibble", "tidyr"] }, "RCTrep": { "name": "RCTrep", "version": "1.2.0", "sha256": "1miqidpn8a3wv6pd4xqsnk9gzdsvdwdzsm656ass67jgyzzh2c9h", - "depends": ["BART", "caret", "copula", "dplyr", "fastDummies", "geex", "ggplot2", "ggpubr", "glue", "MatchIt", "mvtnorm", "numDeriv", "PSweight", "R6", "shiny", "shinydashboard", "tidyr"] + "depends": ["BART", "MatchIt", "PSweight", "R6", "caret", "copula", "dplyr", "fastDummies", "geex", "ggplot2", "ggpubr", "glue", "mvtnorm", "numDeriv", "shiny", "shinydashboard", "tidyr"] }, "RCarb": { "name": "RCarb", @@ -25835,7 +26099,7 @@ "name": "RClickhouse", "version": "0.6.9", "sha256": "06r3xn3xjhr2adpmh4cpykbx1ly5i7aw4izcg2xci7cm5xbg2vzl", - "depends": ["bit64", "cli", "DBI", "dbplyr", "dplyr", "Rcpp"] + "depends": ["DBI", "Rcpp", "bit64", "cli", "dbplyr", "dplyr"] }, "RClimacell": { "name": "RClimacell", @@ -25877,12 +26141,12 @@ "name": "RCriteo", "version": "1.0.2", "sha256": "1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy", - "depends": ["httr", "plyr", "RCurl", "XML"] + "depends": ["RCurl", "XML", "httr", "plyr"] }, "RCurl": { "name": "RCurl", - "version": "1.98-1.14", - "sha256": "1kq3ydvm7hvy8pxk9iy13pkq5mxyxqlx4mpjsadzl7a7jj32gbgf", + "version": "1.98-1.16", + "sha256": "19qddkyasfwa61mj0r0m4wk2xhpsqxf2dikih0s1fdjr207c938s", "depends": ["bitops"] }, "RCytoGPS": { @@ -25893,8 +26157,8 @@ }, "RCzechia": { "name": "RCzechia", - "version": "1.12.0", - "sha256": "1yvwnxab3h1ai2nr8aaw5hbp13a4ayq4cq2f5sbzx1x8szq97sni", + "version": "1.12.2", + "sha256": "0qkg307cik7bvhgi8rm8h27pv1247559ndk39r4mjf6wql7bylwb", "depends": ["curl", "httr", "jsonlite", "magrittr", "sf"] }, "RDHonest": { @@ -25913,7 +26177,7 @@ "name": "RDML", "version": "1.0", "sha256": "13ly1p42njbcygwvkyii8sjqbsywjy5w5g1kd7m8kswi5dsk3qqv", - "depends": ["checkmate", "data_table", "lubridate", "pipeR", "R6", "readxl", "rlist", "stringr", "xml2"] + "depends": ["R6", "checkmate", "data_table", "lubridate", "pipeR", "readxl", "rlist", "stringr", "xml2"] }, "RDP": { "name": "RDP", @@ -25925,7 +26189,7 @@ "name": "RDS", "version": "0.9-9", "sha256": "02gd6jara1hi6h9rqcxb0an9dvnvajdi1x10cf3kqfvaa0i64igf", - "depends": ["anytime", "ergm", "ggplot2", "gridExtra", "Hmisc", "igraph", "isotone", "network", "reshape2", "scales", "statnet_common"] + "depends": ["Hmisc", "anytime", "ergm", "ggplot2", "gridExtra", "igraph", "isotone", "network", "reshape2", "scales", "statnet_common"] }, "RDSsamplesize": { "name": "RDSsamplesize", @@ -25949,7 +26213,7 @@ "name": "RDnp", "version": "1.3", "sha256": "1a10afwn41c0sd35i2hywg79gyf55nd212rfq5pv5inqdrr7kxym", - "depends": ["cellWise", "MASS"] + "depends": ["MASS", "cellWise"] }, "RDota2": { "name": "RDota2", @@ -25965,9 +26229,9 @@ }, "REBayes": { "name": "REBayes", - "version": "2.54", - "sha256": "1kg105jnc7hjxihvrjcfklz6i29kznz9aqh6303v9v6hfmy6a094", - "depends": ["lattice", "Matrix"] + "version": "2.56", + "sha256": "0wfqibyzj3kcydsv2jr8x5pmcrig9y7183r7raqnqkss9iy60qyj", + "depends": ["Matrix", "lattice"] }, "RECA": { "name": "RECA", @@ -25979,13 +26243,13 @@ "name": "REDCapCAST", "version": "24.6.1", "sha256": "18s85ryg5mr7cv1j4938ax7v3b8fsrbaaa5lv191h0ixwkyz5cp9", - "depends": ["assertthat", "dplyr", "haven", "keyring", "openxlsx2", "purrr", "readODS", "readr", "REDCapR", "shiny", "tidyr", "tidyselect", "zip"] + "depends": ["REDCapR", "assertthat", "dplyr", "haven", "keyring", "openxlsx2", "purrr", "readODS", "readr", "shiny", "tidyr", "tidyselect", "zip"] }, "REDCapDM": { "name": "REDCapDM", "version": "0.9.9", "sha256": "1xpl5n046cj7r8rlkffmsfdffs0q0av2c13zw5v6agr265y3d33j", - "depends": ["cli", "dplyr", "forcats", "janitor", "labelled", "magrittr", "openxlsx", "purrr", "REDCapR", "rlang", "stringi", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["REDCapR", "cli", "dplyr", "forcats", "janitor", "labelled", "magrittr", "openxlsx", "purrr", "rlang", "stringi", "stringr", "tibble", "tidyr", "tidyselect"] }, "REDCapExporter": { "name": "REDCapExporter", @@ -26003,7 +26267,7 @@ "name": "REDCapTidieR", "version": "1.1.1", "sha256": "0a7q2mfnjfyfkdafvvl7y69c52qh8wsqrygv77wnrjl4kjf80gwv", - "depends": ["checkmate", "cli", "dplyr", "formattable", "lobstr", "lubridate", "pillar", "purrr", "readr", "REDCapR", "rlang", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] + "depends": ["REDCapR", "checkmate", "cli", "dplyr", "formattable", "lobstr", "lubridate", "pillar", "purrr", "readr", "rlang", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] }, "REDI": { "name": "REDI", @@ -26033,7 +26297,7 @@ "name": "REMLA", "version": "1.1", "sha256": "1j094h38047vlbql8vvlbbdnwxqpw7vnvc08qa2c95jqw8kvhwa6", - "depends": ["geex", "GPArotation"] + "depends": ["GPArotation", "geex"] }, "REPLesentR": { "name": "REPLesentR", @@ -26045,7 +26309,7 @@ "name": "REPPlab", "version": "0.9.6", "sha256": "1hiv6fz2s7dwjixnlqckvpa4dns8wannpinjjpxs3fcskgxmkgrz", - "depends": ["lattice", "LDRTools", "rJava"] + "depends": ["LDRTools", "lattice", "rJava"] }, "REPPlabShiny": { "name": "REPPlabShiny", @@ -26099,7 +26363,7 @@ "name": "REddyProc", "version": "1.3.3", "sha256": "0ss8zyvvhkkw42vk3v4qx21i9navb74kjlgj3dikz0a19z93nrrz", - "depends": ["bigleaf", "dplyr", "magrittr", "mlegp", "purrr", "Rcpp", "readr", "rlang", "solartime", "tibble"] + "depends": ["Rcpp", "bigleaf", "dplyr", "magrittr", "mlegp", "purrr", "readr", "rlang", "solartime", "tibble"] }, "REddyProcNCDF": { "name": "REddyProcNCDF", @@ -26115,9 +26379,9 @@ }, "REndo": { "name": "REndo", - "version": "2.4.9", - "sha256": "08am92h1j2zx7pannnd6z9h4xr14awdp4rzv4sdmgf3x7sfjcp5g", - "depends": ["AER", "corpcor", "data_table", "Formula", "lme4", "lmtest", "Matrix", "mvtnorm", "optimx", "Rcpp", "RcppEigen"] + "version": "2.4.10", + "sha256": "08wxk8s4bwxbvk4d49dd3nb5nhngd0rvh8nfnncsm0agrly82k78", + "depends": ["AER", "Formula", "Matrix", "Rcpp", "RcppEigen", "corpcor", "data_table", "lme4", "lmtest", "mvtnorm", "optimx"] }, "RFCCA": { "name": "RFCCA", @@ -26135,7 +26399,7 @@ "name": "RFOC", "version": "3.4-10", "sha256": "0011irdbvflqz9r1l6c8d801y6jx0xmwhcv2a6xjwj0bjsw1s8di", - "depends": ["fields", "GEOmap", "MASS", "RPMG", "RSEIS"] + "depends": ["GEOmap", "MASS", "RPMG", "RSEIS", "fields"] }, "RFPM": { "name": "RFPM", @@ -26159,7 +26423,7 @@ "name": "RFlocalfdr", "version": "0.8.5", "sha256": "0vp2zblx5419jhs1l6wg18k3wdf4kaslmrys4xml8432pkqmnja0", - "depends": ["fitdistrplus", "minpack_lm", "randomForest", "ranger", "RFlocalfdr_data", "sn", "vita"] + "depends": ["RFlocalfdr_data", "fitdistrplus", "minpack_lm", "randomForest", "ranger", "sn", "vita"] }, "RFlocalfdr_data": { "name": "RFlocalfdr.data", @@ -26177,7 +26441,7 @@ "name": "RFpredInterval", "version": "1.0.8", "sha256": "08nr4a5nzwb4wdzi87jangv4yfl8dh3bhbwksipal3dhmmiwgzbf", - "depends": ["data_table", "data_tree", "DiagrammeR", "hdrcde", "ranger"] + "depends": ["DiagrammeR", "data_table", "data_tree", "hdrcde", "ranger"] }, "RGAN": { "name": "RGAN", @@ -26189,7 +26453,7 @@ "name": "RGAP", "version": "0.1.1", "sha256": "1gskz1zsr9v30f7w67a7d3fm66cnlafj329zq110ddgbp3agd2ll", - "depends": ["dlm", "ggplot2", "gridExtra", "KFAS", "openxlsx", "zoo"] + "depends": ["KFAS", "dlm", "ggplot2", "gridExtra", "openxlsx", "zoo"] }, "RGBM": { "name": "RGBM", @@ -26201,31 +26465,31 @@ "name": "RGCCA", "version": "3.0.3", "sha256": "00ap665i3vg4nnrs7wasyd05rgvk1mr1gcihrc50awdfkgwjghs8", - "depends": ["caret", "Deriv", "ggplot2", "ggrepel", "gridExtra", "MASS", "matrixStats", "pbapply", "rlang"] + "depends": ["Deriv", "MASS", "caret", "ggplot2", "ggrepel", "gridExtra", "matrixStats", "pbapply", "rlang"] }, "RGCxGC": { "name": "RGCxGC", "version": "1.2.0", "sha256": "1hz363pqlx0l3wi4di69fmrv4awl37lz8fzl4g070zchwzbffcpc", - "depends": ["colorRamps", "ptw", "Rdpack", "RNetCDF"] + "depends": ["RNetCDF", "Rdpack", "colorRamps", "ptw"] }, "RGE": { "name": "RGE", "version": "1.0", "sha256": "1ild1if10xicfapfcmydz1cgvn5fyydrik8qclb90i95bl9bs4ia", - "depends": ["coda", "Matrix", "MatrixModels"] + "depends": ["Matrix", "MatrixModels", "coda"] }, "RGENERATE": { "name": "RGENERATE", "version": "1.3.7", "sha256": "0w6hqrf2lr6qz79skml2vjpfwfv5vxj94rghxxa3rp9dqzhi7rc0", - "depends": ["magrittr", "RMAWGEN"] + "depends": ["RMAWGEN", "magrittr"] }, "RGENERATEPREC": { "name": "RGENERATEPREC", "version": "1.2.9", "sha256": "0bnw77vny61pkhp9pb3v3ckz6immm4pp9f7qzyhc97646fci9ysl", - "depends": ["blockmatrix", "copula", "Matrix", "RGENERATE", "RMAWGEN", "stringr"] + "depends": ["Matrix", "RGENERATE", "RMAWGEN", "blockmatrix", "copula", "stringr"] }, "RGF": { "name": "RGF", @@ -26243,7 +26507,7 @@ "name": "RGMM", "version": "2.1.0", "sha256": "1b0r1scxd40d93s96xa1cc9ls1f7vs2g5g8sjnm0kd562mwj4pxp", - "depends": ["DescTools", "doParallel", "foreach", "genieclust", "ggplot2", "LaplacesDemon", "mclust", "mvtnorm", "Rcpp", "RcppArmadillo", "reshape2", "RSpectra"] + "depends": ["DescTools", "LaplacesDemon", "RSpectra", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "genieclust", "ggplot2", "mclust", "mvtnorm", "reshape2"] }, "RGN": { "name": "RGN", @@ -26279,19 +26543,19 @@ "name": "RGoogleFit", "version": "0.4.0", "sha256": "0k1vvl4l6pq37llpbq996rbghdfld7mz7bhzbpw393fmrkd45vyi", - "depends": ["bit64", "httr", "jsonlite", "RCurl"] + "depends": ["RCurl", "bit64", "httr", "jsonlite"] }, "RGraphSpace": { "name": "RGraphSpace", - "version": "1.0.5", - "sha256": "1w1dflh35j44ypdy8nd6l9i9la49hjvwkrlk74mch5knafgb8xzw", + "version": "1.0.6", + "sha256": "1rdq9gnmc2znlpq60n3sn8zpir3wfa2k2ds63pcw1v4w921dmz55", "depends": ["ggplot2", "igraph", "scales"] }, "RGraphics": { "name": "RGraphics", "version": "3.0-2", "sha256": "02gp2lqc5qzid81d28cqb7x88zr0ivxppy55a9q649whcd027071", - "depends": ["ggplot2", "gridBase", "gridGraphics", "gridSVG", "grImport", "grImport2", "lattice"] + "depends": ["ggplot2", "grImport", "grImport2", "gridBase", "gridGraphics", "gridSVG", "lattice"] }, "RGreenplum": { "name": "RGreenplum", @@ -26309,19 +26573,19 @@ "name": "RH2", "version": "0.2.4", "sha256": "14590l3a2znd56nrq1zfbfv7fgii4672qy1xfwiynrh3mjad217k", - "depends": ["chron", "rJava", "RJDBC"] + "depends": ["RJDBC", "chron", "rJava"] }, "RHMS": { "name": "RHMS", "version": "1.7", "sha256": "1fld5y39a4xq40wh23944ngcrkqk2pw8w9raxir9wn2z2nysr7zg", - "depends": ["GGally", "ggplot2", "Hmisc", "network", "pso"] + "depends": ["GGally", "Hmisc", "ggplot2", "network", "pso"] }, "RHPCBenchmark": { "name": "RHPCBenchmark", "version": "0.1.0", "sha256": "1f94d8z15ybqgc2pccsi1m6563xf26ygri6f4pwxkqjmxkxnk34y", - "depends": ["cluster", "Matrix", "mvtnorm"] + "depends": ["Matrix", "cluster", "mvtnorm"] }, "RHRT": { "name": "RHRT", @@ -26363,7 +26627,7 @@ "name": "RI2by2", "version": "1.4", "sha256": "1kaphphc21jxizm3h6kfh0ky17pyq3ykh30v7b582d7km00hivg8", - "depends": ["gtools", "Rcpp"] + "depends": ["Rcpp", "gtools"] }, "RIA": { "name": "RIA", @@ -26381,7 +26645,7 @@ "name": "RISCA", "version": "1.0.5", "sha256": "1ysd3al4bai3nrzqxrs4bq9613h77d4wm54pchp6g89cgnrgzn3v", - "depends": ["caret", "cubature", "date", "doParallel", "foreach", "glmnet", "kernlab", "MASS", "mosaic", "mvtnorm", "nlme", "nnet", "relsurv", "reticulate", "rpart", "statmod", "SuperLearner", "survival", "tune"] + "depends": ["MASS", "SuperLearner", "caret", "cubature", "date", "doParallel", "foreach", "glmnet", "kernlab", "mosaic", "mvtnorm", "nlme", "nnet", "relsurv", "reticulate", "rpart", "statmod", "survival", "tune"] }, "RISmed": { "name": "RISmed", @@ -26393,13 +26657,13 @@ "name": "RITCH", "version": "0.1.26", "sha256": "0n8vd7jdw5hb4vx3nspg64m52j2n2pmjh649nr87444dkfnaf4wc", - "depends": ["bit64", "data_table", "nanotime", "Rcpp"] + "depends": ["Rcpp", "bit64", "data_table", "nanotime"] }, "RIbench": { "name": "RIbench", "version": "1.0.2", "sha256": "0dfxwcm3q8bgwprv0vn440w3186g04a4rm4i33pnpvg2c0qph0sp", - "depends": ["data_table", "digest", "optparse", "RColorBrewer"] + "depends": ["RColorBrewer", "data_table", "digest", "optparse"] }, "RIdeogram": { "name": "RIdeogram", @@ -26409,9 +26673,9 @@ }, "RImageJROI": { "name": "RImageJROI", - "version": "0.1.2", - "sha256": "1rsc8iv80zyjzpj80yyyhndxvskdbldsfc2gskrr1r8yh5gmhn23", - "depends": ["spatstat", "spatstat_geom"] + "version": "0.1.3", + "sha256": "058l1lgxjw70cn1dmmxd9ap7lrnj98kl495v3j6zn91afwshic4w", + "depends": ["spatstat_geom"] }, "RImagePalette": { "name": "RImagePalette", @@ -26441,7 +26705,7 @@ "name": "RItools", "version": "0.3-4", "sha256": "1msjxrlil82sa8xm705zi5kqy74nq8jndgm7aq0skn9ms6w88xh4", - "depends": ["abind", "dplyr", "ggplot2", "SparseM", "survival", "svd", "tibble", "tidyr", "xtable"] + "depends": ["SparseM", "abind", "dplyr", "ggplot2", "survival", "svd", "tibble", "tidyr", "xtable"] }, "RJDBC": { "name": "RJDBC", @@ -26477,19 +26741,19 @@ "name": "RJafroc", "version": "2.1.2", "sha256": "1immjb2313ss7pc61m3y59h6m3i0257lhvrkkvhrprl9jsyanfca", - "depends": ["bbmle", "binom", "dplyr", "ggplot2", "mvtnorm", "numDeriv", "openxlsx", "Rcpp", "readxl", "stringr"] + "depends": ["Rcpp", "bbmle", "binom", "dplyr", "ggplot2", "mvtnorm", "numDeriv", "openxlsx", "readxl", "stringr"] }, "RJcluster": { "name": "RJcluster", "version": "3.2.4", "sha256": "157dmi5gksq7s16ip4n9j5bj9s9bawl078rh13s1xxyr6f51yp09", - "depends": ["foreach", "infotheo", "matrixStats", "mclust", "profvis", "Rcpp", "RcppArmadillo", "rlang"] + "depends": ["Rcpp", "RcppArmadillo", "foreach", "infotheo", "matrixStats", "mclust", "profvis", "rlang"] }, "RKEA": { "name": "RKEA", "version": "0.0-6", "sha256": "1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp", - "depends": ["rJava", "RKEAjars", "tm"] + "depends": ["RKEAjars", "rJava", "tm"] }, "RKEAjars": { "name": "RKEAjars", @@ -26501,7 +26765,7 @@ "name": "RKEEL", "version": "1.3.4", "sha256": "05fwzpa4dixc7lp89x122w07gzblxyyaf5l74gds0zgib9ik5cab", - "depends": ["arules", "doParallel", "downloader", "foreach", "gdata", "Matrix", "openssl", "pmml", "R6", "rJava", "RKEELdata", "XML"] + "depends": ["Matrix", "R6", "RKEELdata", "XML", "arules", "doParallel", "downloader", "foreach", "gdata", "openssl", "pmml", "rJava"] }, "RKEELdata": { "name": "RKEELdata", @@ -26531,13 +26795,13 @@ "name": "RKorAPClient", "version": "0.8.1", "sha256": "1p3i2h5lw288vgqj6z5xiv0y0f73pwzvi7wlmbvf6i7adr3qcdg6", - "depends": ["broom", "curl", "dplyr", "ggplot2", "highcharter", "httr", "jsonlite", "keyring", "lubridate", "magrittr", "PTXQC", "purrr", "R_cache", "stringr", "tibble", "tidyr", "urltools"] + "depends": ["PTXQC", "R_cache", "broom", "curl", "dplyr", "ggplot2", "highcharter", "httr", "jsonlite", "keyring", "lubridate", "magrittr", "purrr", "stringr", "tibble", "tidyr", "urltools"] }, "RLRsim": { "name": "RLRsim", "version": "3.1-8", "sha256": "06i4slc7fj8xifq20i1vqfadfw2p81b0kfzga60139hnryz1zpva", - "depends": ["lme4", "mgcv", "nlme", "Rcpp"] + "depends": ["Rcpp", "lme4", "mgcv", "nlme"] }, "RLT": { "name": "RLT", @@ -26561,19 +26825,19 @@ "name": "RLumCarlo", "version": "0.1.9", "sha256": "1a57nrhnq2q68yi0djh40kk1ms075kpwnmiq33vvy5pl57axnqpr", - "depends": ["abind", "doParallel", "foreach", "khroma", "magrittr", "Rcpp", "RcppArmadillo", "scatterplot3d"] + "depends": ["Rcpp", "RcppArmadillo", "abind", "doParallel", "foreach", "khroma", "magrittr", "scatterplot3d"] }, "RLumModel": { "name": "RLumModel", "version": "0.2.10", "sha256": "1klb7zvxksij517bi8xi68bia6y7jlp3ils659mmwdm2w0ljmwa6", - "depends": ["deSolve", "khroma", "Luminescence", "Rcpp", "RcppArmadillo"] + "depends": ["Luminescence", "Rcpp", "RcppArmadillo", "deSolve", "khroma"] }, "RLumShiny": { "name": "RLumShiny", "version": "0.2.3", "sha256": "12dc30q41b1vha52mn9rr1m86ykp3yfsyxcxxwklavd60g76b8vd", - "depends": ["data_table", "DT", "googleVis", "knitr", "Luminescence", "markdown", "RCarb", "readxl", "rhandsontable", "shiny", "shinydashboard"] + "depends": ["DT", "Luminescence", "RCarb", "data_table", "googleVis", "knitr", "markdown", "readxl", "rhandsontable", "shiny", "shinydashboard"] }, "RM_weights": { "name": "RM.weights", @@ -26603,12 +26867,12 @@ "name": "RMBC", "version": "0.1.0", "sha256": "1fqbr28d09j01rmr9gylzkpvrd6bc9rnjbyzv06hmlx5mmjmzkb4", - "depends": ["ktaucenters", "MASS", "mvtnorm"] + "depends": ["MASS", "ktaucenters", "mvtnorm"] }, "RMCC": { "name": "RMCC", - "version": "0.1.0", - "sha256": "12ksv4yms1pgk7yj40yjmbc5rz1ai1mn8xd3a4w2pdx0mwjin6sz", + "version": "0.1.1", + "sha256": "0nzbjnayp85541pnibal517dhc0s7mhlllshx36m44lv2x3figpl", "depends": ["BH", "Rcpp"] }, "RMKdiscrete": { @@ -26621,19 +26885,19 @@ "name": "RMLPCA", "version": "0.0.1", "sha256": "1xzh6fwl71dzdpbqgpkqnmdzdk8rblg6n1ddic5yxxfvzg3bh13x", - "depends": ["Matrix", "pracma", "RSpectra"] + "depends": ["Matrix", "RSpectra", "pracma"] }, "RMM": { "name": "RMM", "version": "0.1.0", "sha256": "01qkcsybjgwx6gkww3hjmd4gqv20zkxbnwygn6wnim3clxrxphil", - "depends": ["dplyr", "magrittr", "numDeriv", "Rcpp", "rlang", "tibble"] + "depends": ["Rcpp", "dplyr", "magrittr", "numDeriv", "rlang", "tibble"] }, "RMOA": { "name": "RMOA", "version": "1.1.0", "sha256": "1yiv8xd9a8vgqgrnf68kkcr2hnr0q16pisi50pplr6z4mn07w8ba", - "depends": ["rJava", "RMOAjars"] + "depends": ["RMOAjars", "rJava"] }, "RMOAjars": { "name": "RMOAjars", @@ -26645,7 +26909,7 @@ "name": "RMOPI", "version": "1.1", "sha256": "0jjli73b1xinrkq0fndfaan1mgf6yb29skqvva4lib0zgd8p1v21", - "depends": ["fPortfolio", "ggplot2", "lubridate", "MASS", "PerformanceAnalytics", "rugarch", "tibble", "timeDate", "timeSeries", "TTR", "xts"] + "depends": ["MASS", "PerformanceAnalytics", "TTR", "fPortfolio", "ggplot2", "lubridate", "rugarch", "tibble", "timeDate", "timeSeries", "xts"] }, "RMPSH": { "name": "RMPSH", @@ -26675,19 +26939,19 @@ "name": "RMSS", "version": "1.1.1", "sha256": "18hm626yr3xrsi9spzr42y9pf547xdx7byqq15bvh9f04qaalck3", - "depends": ["cellWise", "Rcpp", "RcppArmadillo", "robStepSplitReg", "robustbase", "srlars"] + "depends": ["Rcpp", "RcppArmadillo", "cellWise", "robStepSplitReg", "robustbase", "srlars"] }, "RMT4DS": { "name": "RMT4DS", "version": "0.0.1", "sha256": "05fwhd36lvi21gr5nz8mgxk5qzw4vxkrgw499p11aa9qhcn8xq4g", - "depends": ["lpSolve", "MASS", "mpoly", "nleqslv", "pracma", "quadprog", "rARPACK", "RMTstat", "rootSolve"] + "depends": ["MASS", "RMTstat", "lpSolve", "mpoly", "nleqslv", "pracma", "quadprog", "rARPACK", "rootSolve"] }, "RMTL": { "name": "RMTL", "version": "0.9.9", "sha256": "1wyv9l1xgdm4s8ibjw3kwfsr77hxkxj80cgvkfv4mdir0bxm84b4", - "depends": ["corpcor", "doParallel", "foreach", "MASS", "psych"] + "depends": ["MASS", "corpcor", "doParallel", "foreach", "psych"] }, "RMThreshold": { "name": "RMThreshold", @@ -26709,9 +26973,9 @@ }, "RMaCzek": { "name": "RMaCzek", - "version": "1.5.1", - "sha256": "1zbpwhfa9mb55yglf4kgvch3hg7pvsfga4kpq45lz1cbs9454mzw", - "depends": ["e1071", "ecp", "GA", "RColorBrewer", "seriation"] + "version": "1.6.0", + "sha256": "17vnan5c4yxzbx95x4mk9j7ff0nz26rzdpxydv7dnsqygpcf58a5", + "depends": ["FuzzyDBScan", "GA", "RColorBrewer", "e1071", "ecp", "seriation"] }, "RMallow": { "name": "RMallow", @@ -26723,7 +26987,7 @@ "name": "RMariaDB", "version": "1.3.2", "sha256": "0a38hbc9nc25x9a8z91wc24h4llmyhjim6vavmwrx2r14c3fz1vw", - "depends": ["bit64", "blob", "cpp11", "DBI", "hms", "lubridate", "plogr", "rlang"] + "depends": ["DBI", "bit64", "blob", "cpp11", "hms", "lubridate", "plogr", "rlang"] }, "RMark": { "name": "RMark", @@ -26735,25 +26999,25 @@ "name": "RMediation", "version": "1.2.2", "sha256": "16zw8ic8h2q1qg627ddaxmr9dvj7ckdljbzfgwq557nxc2fgk1v2", - "depends": ["doParallel", "e1071", "foreach", "iterators", "lavaan", "MASS", "modelr", "OpenMx", "stringr"] + "depends": ["MASS", "OpenMx", "doParallel", "e1071", "foreach", "iterators", "lavaan", "modelr", "stringr"] }, "RMixpanel": { "name": "RMixpanel", "version": "0.7-1", "sha256": "1xwmmfvky49n1l0w3kwcyaf2h4rhzz4k5icjwvpc90fqk8sxib6a", - "depends": ["base64enc", "jsonlite", "RCurl", "uuid"] + "depends": ["RCurl", "base64enc", "jsonlite", "uuid"] }, "RMixtComp": { "name": "RMixtComp", "version": "4.1.4", "sha256": "1jybw5yhcahvixpyb551mzifi6kw914g80g1g4pdbgpkg4f9sfk4", - "depends": ["ggplot2", "plotly", "RMixtCompIO", "RMixtCompUtilities", "scales"] + "depends": ["RMixtCompIO", "RMixtCompUtilities", "ggplot2", "plotly", "scales"] }, "RMixtCompIO": { "name": "RMixtCompIO", "version": "4.0.11", "sha256": "1y2m5fb8a2xc0ydrjl2l1a6vfabndvrighwz5yi288wqgih70gqz", - "depends": ["BH", "doParallel", "foreach", "Rcpp", "RcppEigen"] + "depends": ["BH", "Rcpp", "RcppEigen", "doParallel", "foreach"] }, "RMixtCompUtilities": { "name": "RMixtCompUtilities", @@ -26769,21 +27033,21 @@ }, "RNAmf": { "name": "RNAmf", - "version": "0.1.2", - "sha256": "0hshkb5dhfpvgwpcp7a1rlp27a78lp48v7zsciw1lmga2igq5x42", + "version": "1.0.0", + "sha256": "13c00l660f6yl5hhbv99h95q0nvzrfv0svm40bzfaz88q54pv9q1", "depends": ["doParallel", "foreach", "lhs", "plgp"] }, "RNAseqNet": { "name": "RNAseqNet", "version": "0.1.5", "sha256": "09jqgj1wwwxhk6xkfhkwzkbj0byk3441wa4kj4nzgwzv0qw6inds", - "depends": ["ggplot2", "glmnet", "hot_deck", "igraph", "PoiClaClu"] + "depends": ["PoiClaClu", "ggplot2", "glmnet", "hot_deck", "igraph"] }, "RNAseqQC": { "name": "RNAseqQC", - "version": "0.1.4", - "sha256": "0f9k3ba2w75sjywngmvp7g10837wx65v112inpag3rplk9ljahvp", - "depends": ["AnnotationFilter", "AnnotationHub", "circlize", "ComplexHeatmap", "cowplot", "DESeq2", "dplyr", "ensembldb", "gghighlight", "ggplot2", "ggpointdensity", "ggrepel", "ggsci", "magrittr", "matrixStats", "patchwork", "purrr", "RColorBrewer", "stringr", "SummarizedExperiment", "tibble", "tidyr", "tidyselect", "vsn"] + "version": "0.2.1", + "sha256": "1041whycnph2bdmphy9k27b39g541lxa210jbnfxc5r9617rcavh", + "depends": ["AnnotationFilter", "AnnotationHub", "BiocGenerics", "ComplexHeatmap", "DESeq2", "SummarizedExperiment", "circlize", "cowplot", "dplyr", "ensembldb", "ggplot2", "ggpointdensity", "ggrepel", "magrittr", "matrixStats", "patchwork", "purrr", "stringr", "tibble", "tidyr", "tidyselect"] }, "RNCBIEUtilsLibs": { "name": "RNCBIEUtilsLibs", @@ -26795,7 +27059,7 @@ "name": "RNCEP", "version": "1.0.10", "sha256": "19ja7pcp7ajwhqhqw92pdmvxzyjc4kw3943pllpx47s1zvi6dmci", - "depends": ["abind", "fields", "maps", "RColorBrewer", "sp", "tgp"] + "depends": ["RColorBrewer", "abind", "fields", "maps", "sp", "tgp"] }, "RND": { "name": "RND", @@ -26807,7 +27071,7 @@ "name": "RNGforGPD", "version": "1.1.0", "sha256": "0zriv0pd86ciwrms95bbb9wh40xvxv20vla2hxbmaynfy1s1vd4j", - "depends": ["corpcor", "Matrix", "mvtnorm"] + "depends": ["Matrix", "corpcor", "mvtnorm"] }, "RNHANES": { "name": "RNHANES", @@ -26819,13 +27083,13 @@ "name": "RNOmni", "version": "1.0.1.2", "sha256": "1ap6rf59sr9v28s1a484bfz1c7jizrivlf1r4xvnp8dvb1hj1k9n", - "depends": ["plyr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "plyr"] }, "RNeXML": { "name": "RNeXML", "version": "2.4.11", "sha256": "0ipxdhfzccpqmnfrqdy8bizm80k2chhdlzg3p0dl05p8n35i6s94", - "depends": ["ape", "dplyr", "httr", "plyr", "reshape2", "rlang", "stringi", "stringr", "tidyr", "uuid", "XML", "xml2"] + "depends": ["XML", "ape", "dplyr", "httr", "plyr", "reshape2", "rlang", "stringi", "stringr", "tidyr", "uuid", "xml2"] }, "RNentropy": { "name": "RNentropy", @@ -26849,25 +27113,25 @@ "name": "RNewsflow", "version": "1.2.8", "sha256": "08qb0vh2j1v13wqsrmklh6d4ln7ipsy962cwnlr86j0r2bscrqgy", - "depends": ["data_table", "igraph", "Matrix", "quanteda", "Rcpp", "RcppEigen", "RcppProgress", "scales", "stringi", "wordcloud"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "RcppProgress", "data_table", "igraph", "quanteda", "scales", "stringi", "wordcloud"] }, "RNifti": { "name": "RNifti", - "version": "1.6.1", - "sha256": "0wn06fnq5c7f0vwakryb75vzkjh03dqz2z57lgmn68hwgssnpalc", + "version": "1.7.0", + "sha256": "1s0q1vs6hzg1xadk43rxqxi55swkl7pgsnw45im5vgsz1wxgg375", "depends": ["Rcpp"] }, "RNiftyReg": { "name": "RNiftyReg", - "version": "2.8.2", - "sha256": "0jrb1j8hl25lby2ikpvmmrxq39plx3r6qmrn0bnzbmyvbb5x1vfq", - "depends": ["ore", "Rcpp", "RcppEigen", "RNifti"] + "version": "2.8.3", + "sha256": "0vbzjybn0431r7brh53azzw5n6nii5j4mcd9j8s7ifps6apd3s3f", + "depends": ["RNifti", "Rcpp", "RcppEigen", "ore"] }, "ROAuth": { "name": "ROAuth", "version": "0.9.6", "sha256": "0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m", - "depends": ["digest", "RCurl"] + "depends": ["RCurl", "digest"] }, "ROCFTP_MMS": { "name": "ROCFTP.MMS", @@ -26885,7 +27149,7 @@ "name": "ROCSI", "version": "0.1.0", "sha256": "0bj1f62j2b39whm0grl1xvzkwi3jlrzpgzm77vskgyhaqrk17j9z", - "depends": ["glmnet", "MASS"] + "depends": ["MASS", "glmnet"] }, "ROCaggregator": { "name": "ROCaggregator", @@ -26909,7 +27173,7 @@ "name": "ROCnReg", "version": "1.0-9", "sha256": "149iq8i67qmdy6a65b4zw03f1sha8dbnirqw24in1kar3m5zg9hn", - "depends": ["lattice", "MASS", "Matrix", "moments", "nor1mix", "np", "pbivnorm", "spatstat_univar"] + "depends": ["MASS", "Matrix", "lattice", "moments", "nor1mix", "np", "pbivnorm", "spatstat_univar"] }, "ROCpsych": { "name": "ROCpsych", @@ -26917,6 +27181,12 @@ "sha256": "0fcrhhxmvrrchbswb94liahbgz5pfhs86fbj0vby7vnakrhngh7v", "depends": ["pROC", "reportROC"] }, + "ROCsurf": { + "name": "ROCsurf", + "version": "0.1.1", + "sha256": "0xp1v95kfwkizm194hrcypc0lvaq111v7c3lqai6vkbz444al4dp", + "depends": ["plotly", "pracma"] + }, "RODBC": { "name": "RODBC", "version": "1.3-23", @@ -26939,13 +27209,13 @@ "name": "ROI.models.globalOptTests", "version": "1.1-1", "sha256": "1zj636cmjhhqbn6hh6760bi5y8lf6y7qqkz72yijq7dj2y1za2ph", - "depends": ["globalOptTests", "ROI"] + "depends": ["ROI", "globalOptTests"] }, "ROI_models_miplib": { "name": "ROI.models.miplib", "version": "1.0-0", "sha256": "12yxra45s9f14dn12wibxrz598g3s39lm3af4dxmw9jnlfb8z84b", - "depends": ["R_utils", "Rglpk", "ROI"] + "depends": ["ROI", "R_utils", "Rglpk"] }, "ROI_models_netlib": { "name": "ROI.models.netlib", @@ -26957,19 +27227,19 @@ "name": "ROI.plugin.alabama", "version": "1.0-2", "sha256": "0if6994xcc0w9dy3ph8g9lhnx0lpndgf0yzcgn558i00d21csqz7", - "depends": ["alabama", "ROI"] + "depends": ["ROI", "alabama"] }, "ROI_plugin_clarabel": { "name": "ROI.plugin.clarabel", "version": "0.3", "sha256": "0icaqbgh435drd00104rpy0xwvkdadh697nfp22kjnlz9mcwzfp1", - "depends": ["clarabel", "ROI", "slam"] + "depends": ["ROI", "clarabel", "slam"] }, "ROI_plugin_cplex": { "name": "ROI.plugin.cplex", "version": "0.3-0", "sha256": "1ipwvclrxws7nvirvns58gpakg23ldiphyl6g0akxk5hczr0lazf", - "depends": ["Rcplex", "ROI", "slam"] + "depends": ["ROI", "Rcplex", "slam"] }, "ROI_plugin_deoptim": { "name": "ROI.plugin.deoptim", @@ -26987,25 +27257,25 @@ "name": "ROI.plugin.glpk", "version": "1.0-0", "sha256": "0i5l0k5mk2xp2gdvpmlgxjycvzmgc83rkind68ab4x1d4bab0qdk", - "depends": ["Rglpk", "ROI"] + "depends": ["ROI", "Rglpk"] }, "ROI_plugin_highs": { "name": "ROI.plugin.highs", "version": "1.0-3", "sha256": "0ldfm4y66wj4marwzvm6f7dgq31q3bdr2cwqw4hlc0nc379anmrv", - "depends": ["highs", "ROI"] + "depends": ["ROI", "highs"] }, "ROI_plugin_ipop": { "name": "ROI.plugin.ipop", "version": "1.0-0", "sha256": "00xjariraga2j4zk6vyzwl5g4a65ki1jmky556hizma78ksjrikv", - "depends": ["kernlab", "ROI", "slam"] + "depends": ["ROI", "kernlab", "slam"] }, "ROI_plugin_lpsolve": { "name": "ROI.plugin.lpsolve", "version": "1.0-2", "sha256": "0xgg1fzq5sba3yvvrci3iw97p31walpnhv4zwnd39gw8v5z6f9dj", - "depends": ["lpSolveAPI", "ROI"] + "depends": ["ROI", "lpSolveAPI"] }, "ROI_plugin_msbinlp": { "name": "ROI.plugin.msbinlp", @@ -27023,31 +27293,31 @@ "name": "ROI.plugin.nloptr", "version": "1.0-1", "sha256": "05517zgk5p548criz6211hqc11r745bbj4fxjvkbcrh03ijhxyhx", - "depends": ["nloptr", "ROI"] + "depends": ["ROI", "nloptr"] }, "ROI_plugin_optimx": { "name": "ROI.plugin.optimx", "version": "1.0-1", "sha256": "1d2kwzgs9pf56fm90n0wxldgm3n7ybk31avklcspa40bki9lr6af", - "depends": ["optimx", "ROI"] + "depends": ["ROI", "optimx"] }, "ROI_plugin_osqp": { "name": "ROI.plugin.osqp", - "version": "1.0-1", - "sha256": "1b62jwj946mxlq7n2ilk2v7bknkjhifxy15yaqvbfxvkyk0r8jfi", - "depends": ["Matrix", "osqp", "ROI", "slam"] + "version": "1.0-2", + "sha256": "0jz8yzq6p50s3ggm1dkmfw1a14l5yz5ag2fdknf62xljhzwgv62a", + "depends": ["Matrix", "ROI", "osqp", "slam"] }, "ROI_plugin_qpoases": { "name": "ROI.plugin.qpoases", "version": "1.0-3", "sha256": "1hbb71y4pcp6ia1qc0gg87ynxv82awjpsfl2pc6qlrlb9plx355c", - "depends": ["checkmate", "Rcpp", "ROI", "slam"] + "depends": ["ROI", "Rcpp", "checkmate", "slam"] }, "ROI_plugin_quadprog": { "name": "ROI.plugin.quadprog", "version": "1.0-1", "sha256": "11r0f5lx9jkiqaj48lzvz21rrh2imka04pl8rf7nif0w8n57g4g8", - "depends": ["quadprog", "ROI", "slam"] + "depends": ["ROI", "quadprog", "slam"] }, "ROI_plugin_scs": { "name": "ROI.plugin.scs", @@ -27065,13 +27335,13 @@ "name": "ROMDB", "version": "0.1.0", "sha256": "14jijcqd2zmps8sacx5nwfclj5yvqf4nx72y8pfvr0nswqqb895i", - "depends": ["dplyr", "httr", "magick", "purrr", "RODBC", "stringr"] + "depends": ["RODBC", "dplyr", "httr", "magick", "purrr", "stringr"] }, "ROOPSD": { "name": "ROOPSD", "version": "0.3.9", "sha256": "0xc7fgg376wld4g61k7pfi1fwkxzzl69njn6p4v8ia4mnvp1p892", - "depends": ["Lmoments", "numDeriv", "R6"] + "depends": ["Lmoments", "R6", "numDeriv"] }, "ROSE": { "name": "ROSE", @@ -27087,15 +27357,15 @@ }, "ROpenCVLite": { "name": "ROpenCVLite", - "version": "4.90.1", - "sha256": "0kmz4vfpwpjhbx12qvpwz9vhz3ab61kf6sz4mmpzcr54r5v8l71r", - "depends": ["pkgbuild"] + "version": "4.90.2", + "sha256": "0iiyajrc9njx41f1mm4jhdj2a8ljzasn8lmbnrpv2bvppclsqc8q", + "depends": [] }, "ROpenDota": { "name": "ROpenDota", "version": "0.1.2", "sha256": "17s73yj2w5hlpy09ad83m4s2d9shg5h4zg64wvbp1ivyvpp7l308", - "depends": ["jsonlite", "RCurl"] + "depends": ["RCurl", "jsonlite"] }, "ROpenFIGI": { "name": "ROpenFIGI", @@ -27107,13 +27377,13 @@ "name": "ROpenWeatherMap", "version": "1.1", "sha256": "0h1yw93v06bx8svhghh1fsrf837qax9896klh64b06djpgg9ngb9", - "depends": ["httr", "jsonlite", "RCurl"] + "depends": ["RCurl", "httr", "jsonlite"] }, "ROptEst": { "name": "ROptEst", "version": "1.3.3", "sha256": "0mid70i7mjic6s5vswbggpln9iv78sm9h8lrqqg2a0g379n9brbp", - "depends": ["distr", "distrEx", "distrMod", "MASS", "RandVar", "RobAStBase", "startupmsg"] + "depends": ["MASS", "RandVar", "RobAStBase", "distr", "distrEx", "distrMod", "startupmsg"] }, "ROptSpace": { "name": "ROptSpace", @@ -27137,7 +27407,7 @@ "name": "RPANDA", "version": "2.3", "sha256": "12cah5vw9jcpnprnfhqwdh11fkn68djzgvdv2hr23yppa8nfn9zc", - "depends": ["ape", "BB", "bipartite", "cluster", "coda", "deSolve", "fields", "fpc", "geiger", "glassoFast", "GUniFrac", "igraph", "Matrix", "mvMORPH", "mvtnorm", "ParallelLogger", "phangorn", "phytools", "picante", "pracma", "pspline", "pvclust", "R_utils", "raster", "RColorBrewer", "Rmpfr", "TESS", "vegan"] + "depends": ["BB", "GUniFrac", "Matrix", "ParallelLogger", "RColorBrewer", "R_utils", "Rmpfr", "TESS", "ape", "bipartite", "cluster", "coda", "deSolve", "fields", "fpc", "geiger", "glassoFast", "igraph", "mvMORPH", "mvtnorm", "phangorn", "phytools", "picante", "pracma", "pspline", "pvclust", "raster", "vegan"] }, "RPDTest": { "name": "RPDTest", @@ -27149,7 +27419,7 @@ "name": "RPEGLMEN", "version": "1.1.2", "sha256": "0rbwxdh252vfx6qnplqqgmawpfk3naksi4wx11g1h7aj68cv8xjw", - "depends": ["Rcpp", "RcppEigen", "RPEIF"] + "depends": ["RPEIF", "Rcpp", "RcppEigen"] }, "RPEIF": { "name": "RPEIF", @@ -27161,7 +27431,7 @@ "name": "RPESE", "version": "1.2.5", "sha256": "157xvfa6m4vii92fac8xbhnah7np3jvd1y1y7ryw5c80yfbdhf0y", - "depends": ["boot", "RobStatTM", "RPEGLMEN", "RPEIF", "xts", "zoo"] + "depends": ["RPEGLMEN", "RPEIF", "RobStatTM", "boot", "xts", "zoo"] }, "RPEXE_RPEXT": { "name": "RPEXE.RPEXT", @@ -27173,7 +27443,7 @@ "name": "RPEnsemble", "version": "0.5", "sha256": "013dka8f8x9z84j3956l4h6c3afqs0ml14pzpzlsgh5ikby3jhbx", - "depends": ["class", "MASS"] + "depends": ["MASS", "class"] }, "RPMG": { "name": "RPMG", @@ -27191,7 +27461,7 @@ "name": "RPPASPACE", "version": "1.0.10", "sha256": "0k9z02qpzxqqcdq5kqrrlc9k9bqcrl69ik6l30fa0rd7ywaqwsbc", - "depends": ["bmp", "cobs", "doParallel", "foreach", "imager", "iterators", "jpeg", "mgcv", "nlme", "png", "quantreg", "robustbase", "SparseM", "tiff", "timeDate"] + "depends": ["SparseM", "bmp", "cobs", "doParallel", "foreach", "imager", "iterators", "jpeg", "mgcv", "nlme", "png", "quantreg", "robustbase", "tiff", "timeDate"] }, "RPPairwiseDesign": { "name": "RPPairwiseDesign", @@ -27203,13 +27473,19 @@ "name": "RPPanalyzer", "version": "1.4.9", "sha256": "1lw28cfi397klxxhs97dwzsfk7ykggbh4p82yg73sq6yq3liha1a", - "depends": ["Biobase", "gam", "ggplot2", "gplots", "Hmisc", "lattice", "limma", "quantreg"] + "depends": ["Biobase", "Hmisc", "gam", "ggplot2", "gplots", "lattice", "limma", "quantreg"] }, "RPhosFate": { "name": "RPhosFate", "version": "1.0.4", "sha256": "1gmnnvihxg6j83w4qgrrx61fz4p9r145qxs2qcscrs1q8bzlvw9k", - "depends": ["checkmate", "raster", "Rcpp", "RcppArmadillo", "spatstat_geom", "yaml"] + "depends": ["Rcpp", "RcppArmadillo", "checkmate", "raster", "spatstat_geom", "yaml"] + }, + "RPointCloud": { + "name": "RPointCloud", + "version": "0.6.2", + "sha256": "1n2rlw7zpmwsk95glgfa1wcr1k4hpyknd6xcc4996305k0s0lim2", + "depends": ["ClassDiscovery", "Mercator", "TDA", "circlize", "rgl"] }, "RPostgreSQL": { "name": "RPostgreSQL", @@ -27221,7 +27497,7 @@ "name": "RPostgres", "version": "1.4.7", "sha256": "0939ysl9m35aknnh3xk92xxymk1g0xqnjb2khq55m8nq7gcg3l9x", - "depends": ["bit64", "blob", "cpp11", "DBI", "hms", "lubridate", "plogr", "withr"] + "depends": ["DBI", "bit64", "blob", "cpp11", "hms", "lubridate", "plogr", "withr"] }, "RPregression": { "name": "RPregression", @@ -27233,7 +27509,7 @@ "name": "RPresto", "version": "1.4.6", "sha256": "1q8c3h328iwscnayxj8qc71s2hkqdqwnpf38kn3zz3ks66qzjf8c", - "depends": ["bit64", "DBI", "dbplyr", "dplyr", "httr", "jsonlite", "lifecycle", "lubridate", "openssl", "progress", "purrr", "rlang", "stringi", "tibble", "vctrs"] + "depends": ["DBI", "bit64", "dbplyr", "dplyr", "httr", "jsonlite", "lifecycle", "lubridate", "openssl", "progress", "purrr", "rlang", "stringi", "tibble", "vctrs"] }, "RProbSup": { "name": "RProbSup", @@ -27257,7 +27533,7 @@ "name": "RPtests", "version": "0.1.5", "sha256": "04j4nqy2qxn1pa8ar0j0wgzkpd624983wwhd73l1ax7fnskx0yhh", - "depends": ["glmnet", "randomForest", "Rcpp"] + "depends": ["Rcpp", "glmnet", "randomForest"] }, "RPublica": { "name": "RPublica", @@ -27287,12 +27563,12 @@ "name": "RQdeltaCT", "version": "1.3.0", "sha256": "1zwajwyiwhl12v1119w9xlyw07a9iigj3yy27nm65ninqjbfrn8j", - "depends": ["coin", "corrplot", "ctrlGene", "dplyr", "GGally", "ggplot2", "ggpmisc", "ggsignif", "Hmisc", "magrittr", "oddsratio", "pheatmap", "pROC", "tidyr", "tidyselect", "tidyverse"] + "depends": ["GGally", "Hmisc", "coin", "corrplot", "ctrlGene", "dplyr", "ggplot2", "ggpmisc", "ggsignif", "magrittr", "oddsratio", "pROC", "pheatmap", "tidyr", "tidyselect", "tidyverse"] }, "RQuantLib": { "name": "RQuantLib", - "version": "0.4.22", - "sha256": "0zs8ldaf1h8hr6czlvj457rr0w4z0rjgj290r3krg4a9ilb1iink", + "version": "0.4.24", + "sha256": "1wcc93vmkzycq19cc6byp66svwcv4za27izzywszqyd9a93a99rg", "depends": ["Rcpp", "zoo"] }, "RRBoost": { @@ -27321,15 +27597,15 @@ }, "RRNA": { "name": "RRNA", - "version": "1.1", - "sha256": "0bgsakpz1wr3wr6c5xa7wx2xmzs3xzkscrgwn6dc7f93kpq1j17p", + "version": "1.2", + "sha256": "05ijsnxxylfan4c4hnl20655qjzix2l43i5qmdzm19wqcf4ipylp", "depends": [] }, "RRPP": { "name": "RRPP", - "version": "2.0.2", - "sha256": "10hd5mp4a39gh6d13lw8xnn4qvziacywls33dngvjxaq9ccxc05p", - "depends": ["ape", "ggplot2", "Matrix"] + "version": "2.0.3", + "sha256": "1dd2v1zsi1hgb73a4fjd54k2mg43sb26h9l45nq9phsn8rnrfw7z", + "depends": ["Matrix", "ape", "ggplot2"] }, "RRRR": { "name": "RRRR", @@ -27371,7 +27647,7 @@ "name": "RSA", "version": "0.10.6", "sha256": "137izjrvicf02bnc6q00wn187754f25dh22swpb46vid18cf1q9h", - "depends": ["aplpack", "ggplot2", "lattice", "lavaan", "plyr", "RColorBrewer"] + "depends": ["RColorBrewer", "aplpack", "ggplot2", "lattice", "lavaan", "plyr"] }, "RSADBE": { "name": "RSADBE", @@ -27385,6 +27661,12 @@ "sha256": "0mdirx7d3z4l0k54wa6rb1c5gma470ypifd3flj2287m8y2wjqq5", "depends": ["gstat", "magrittr", "plyr", "shapefiles", "stringr"] }, + "RSAtools": { + "name": "RSAtools", + "version": "0.1.1", + "sha256": "0bri0hnq689vlxhi4vjya0hy529ksild62dlz40wybzywpaqa46g", + "depends": ["RColorBrewer", "RSA", "aplpack", "ggplot2", "lattice", "lavaan", "plyr", "semTools"] + }, "RSBJson": { "name": "RSBJson", "version": "1.1.2", @@ -27395,19 +27677,19 @@ "name": "RSC", "version": "2.0.4", "sha256": "106pvrg10f8w0aqbnahqjdii49ijp2659l7kkj5y46pbr90lbpzs", - "depends": ["doParallel", "foreach", "Matrix"] + "depends": ["Matrix", "doParallel", "foreach"] }, "RSCAT": { "name": "RSCAT", "version": "1.1.3", "sha256": "08p4gywh1g13mwcmvp046ybz410jyrzi505rdqr8yirjpk59bw1p", - "depends": ["ggplot2", "gridExtra", "Metrics", "rJava", "shiny", "shinycssloaders", "shinyjs"] + "depends": ["Metrics", "ggplot2", "gridExtra", "rJava", "shiny", "shinycssloaders", "shinyjs"] }, "RSDA": { "name": "RSDA", "version": "3.2.1", "sha256": "10dx9ds7i738wydljkfw5jvggixsysbg2674hrw4z4lccgijjmrc", - "depends": ["dplyr", "e1071", "FactoMineR", "forcats", "gbm", "ggplot2", "ggpolypath", "ggrepel", "glmnet", "kknn", "magrittr", "neuralnet", "nloptr", "plotly", "princurve", "purrr", "randomcoloR", "randomForest", "reshape", "RJSONIO", "rlang", "rpart", "scales", "sqldf", "stringr", "tibble", "tidyselect", "umap", "vctrs", "XML", "xtable"] + "depends": ["FactoMineR", "RJSONIO", "XML", "dplyr", "e1071", "forcats", "gbm", "ggplot2", "ggpolypath", "ggrepel", "glmnet", "kknn", "magrittr", "neuralnet", "nloptr", "plotly", "princurve", "purrr", "randomForest", "randomcoloR", "reshape", "rlang", "rpart", "scales", "sqldf", "stringr", "tibble", "tidyselect", "umap", "vctrs", "xtable"] }, "RSDK": { "name": "RSDK", @@ -27449,25 +27731,25 @@ "name": "RSP", "version": "0.4", "sha256": "126lag0i2k4fwlr7gnc9jfn63pyi6d6gzzmypyr6jk666pwsk5f6", - "depends": ["catR", "DT", "foreign", "ggplot2", "GPArotation", "gt", "hornpa", "igraph", "lavaan", "ltm", "Metrics", "mirt", "MVN", "plyr", "polycor", "psych", "rJava", "rstudioapi", "scales", "semPlot", "shiny", "shinyBS", "shinycustomloader", "ShinyItemAnalysis", "shinyjs", "shinythemes", "shinyWidgets", "xlsx"] + "depends": ["DT", "GPArotation", "MVN", "Metrics", "ShinyItemAnalysis", "catR", "foreign", "ggplot2", "gt", "hornpa", "igraph", "lavaan", "ltm", "mirt", "plyr", "polycor", "psych", "rJava", "rstudioapi", "scales", "semPlot", "shiny", "shinyBS", "shinyWidgets", "shinycustomloader", "shinyjs", "shinythemes", "xlsx"] }, "RSQL": { "name": "RSQL", "version": "0.2.2", "sha256": "1k0s32lcfr2ari7jrkspmzf9ygpz4h737yigz3lkwj5k2r9ls2ax", - "depends": ["DBI", "lgr", "R6"] + "depends": ["DBI", "R6", "lgr"] }, "RSQLite": { "name": "RSQLite", "version": "2.3.7", "sha256": "1kllna6hfnyy3rizr8wkpfn7p5sxv3sra12x9vz68hp6i4jmgq15", - "depends": ["bit64", "blob", "cpp11", "DBI", "memoise", "pkgconfig", "plogr", "rlang"] + "depends": ["DBI", "bit64", "blob", "cpp11", "memoise", "pkgconfig", "plogr", "rlang"] }, "RSSL": { "name": "RSSL", "version": "0.9.7", "sha256": "1am8xv0v5b2z87y8i7m1s41aq55fx30pdnhna5dj87fql5faydqx", - "depends": ["cluster", "dplyr", "ggplot2", "kernlab", "MASS", "Matrix", "quadprog", "Rcpp", "RcppArmadillo", "reshape2", "scales", "tidyr"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "cluster", "dplyr", "ggplot2", "kernlab", "quadprog", "reshape2", "scales", "tidyr"] }, "RSSOP": { "name": "RSSOP", @@ -27527,7 +27809,7 @@ "name": "RSiena", "version": "1.4.7", "sha256": "0hvjd0f80p5icrzd4qa01349pkc5884l2p00m580aqiigri49d1q", - "depends": ["lattice", "MASS", "Matrix", "xtable"] + "depends": ["MASS", "Matrix", "lattice", "xtable"] }, "RSizeBiased": { "name": "RSizeBiased", @@ -27555,8 +27837,8 @@ }, "RSpectra": { "name": "RSpectra", - "version": "0.16-1", - "sha256": "16ij84wgpsmqmnxqiii8dgihy3bfxazry9znmckhwzba7m0d79fb", + "version": "0.16-2", + "sha256": "0zma49ah0sycjdx95m8mac21daa7p3gp9cg1mffygzhrjpblkwd2", "depends": ["Matrix", "Rcpp", "RcppEigen"] }, "RSpincalc": { @@ -27581,7 +27863,7 @@ "name": "RStoolbox", "version": "1.0.0", "sha256": "1haf2pi1jzlzh077gfanby5g4lp1djz01qcdinxiq0dgs98anrl8", - "depends": ["caret", "dplyr", "exactextractr", "ggplot2", "lifecycle", "magrittr", "Rcpp", "RcppArmadillo", "reshape2", "sf", "terra", "tidyr", "XML"] + "depends": ["Rcpp", "RcppArmadillo", "XML", "caret", "dplyr", "exactextractr", "ggplot2", "lifecycle", "magrittr", "reshape2", "sf", "terra", "tidyr"] }, "RSurveillance": { "name": "RSurveillance", @@ -27593,13 +27875,13 @@ "name": "RTCC", "version": "0.1.1", "sha256": "0bnm0qwikbbpq3i5q5fwmsgi8fn7w0xk993ngpiqbrf5my3h93kc", - "depends": ["matrixStats", "Rcpp", "testthat", "vegan"] + "depends": ["Rcpp", "matrixStats", "testthat", "vegan"] }, "RTD": { "name": "RTD", "version": "0.4.1", "sha256": "0zsv62hx1y9q5a6rd8ri91ff64671b84jr3f88h0q4yni2mribhr", - "depends": ["dplyr", "httr", "jsonlite", "purrr", "RcppMsgPack", "readr", "urltools", "uuid"] + "depends": ["RcppMsgPack", "dplyr", "httr", "jsonlite", "purrr", "readr", "urltools", "uuid"] }, "RTDE": { "name": "RTDE", @@ -27617,13 +27899,13 @@ "name": "RTIGER", "version": "2.1.0", "sha256": "08gs26wv6jnd4rzdhb87as26aslgqs128x1ip8h9nmr3l9mwg5fq", - "depends": ["e1071", "extraDistr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "JuliaCall", "qpdf", "reshape2", "TailRank"] + "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "JuliaCall", "TailRank", "e1071", "extraDistr", "ggplot2", "qpdf", "reshape2"] }, "RTL": { "name": "RTL", "version": "1.3.5", "sha256": "0ajdrwg8g68imwj21l9mh8q9n1xc00d8lxw60p6vnb39m730d8vg", - "depends": ["dplyr", "ggplot2", "glue", "httr", "jsonlite", "lifecycle", "lubridate", "magrittr", "PerformanceAnalytics", "plotly", "purrr", "Rcpp", "readr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "timetk", "tsibble", "TTR", "xts", "zoo"] + "depends": ["PerformanceAnalytics", "Rcpp", "TTR", "dplyr", "ggplot2", "glue", "httr", "jsonlite", "lifecycle", "lubridate", "magrittr", "plotly", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "timetk", "tsibble", "xts", "zoo"] }, "RTLknitr": { "name": "RTLknitr", @@ -27641,7 +27923,7 @@ "name": "RTSA", "version": "0.2.2", "sha256": "1fkr374y7pjv99g2b0cdcr5qhfjnjwl52p39w4fvw7iv4ahvvxs1", - "depends": ["ggplot2", "metafor", "Rcpp", "scales"] + "depends": ["Rcpp", "ggplot2", "metafor", "scales"] }, "RTTWebClient": { "name": "RTTWebClient", @@ -27659,13 +27941,13 @@ "name": "RTextTools", "version": "1.4.3", "sha256": "0fxjviqc36k06rn8xzbi8ylzzj9zgf3zsp6xv0kssakss1a45lzz", - "depends": ["caTools", "e1071", "glmnet", "ipred", "nnet", "randomForest", "SparseM", "tau", "tm", "tree"] + "depends": ["SparseM", "caTools", "e1071", "glmnet", "ipred", "nnet", "randomForest", "tau", "tm", "tree"] }, "RTransferEntropy": { "name": "RTransferEntropy", "version": "0.2.21", "sha256": "05n97mwaxjika81bwwbx6vrsshdcd8h0n28iji2q7qwkk0746imd", - "depends": ["future", "future_apply", "Rcpp"] + "depends": ["Rcpp", "future", "future_apply"] }, "RTriangle": { "name": "RTriangle", @@ -27683,19 +27965,19 @@ "name": "RVA", "version": "0.0.5", "sha256": "1a0av2vhqnkc4w76q5dhds0p12icmkkxyr1d04rsd83srwkwh4fb", - "depends": ["circlize", "clusterProfiler", "ComplexHeatmap", "data_table", "dplyr", "edgeR", "ggplot2", "ggpubr", "gridExtra", "GSEABase", "GSVAdata", "haven", "msigdbr", "org_Hs_eg_db", "plotly", "purrr", "rlang", "rWikiPathways", "stringr", "tibble", "tidyr", "XML"] + "depends": ["ComplexHeatmap", "GSEABase", "GSVAdata", "XML", "circlize", "clusterProfiler", "data_table", "dplyr", "edgeR", "ggplot2", "ggpubr", "gridExtra", "haven", "msigdbr", "org_Hs_eg_db", "plotly", "purrr", "rWikiPathways", "rlang", "stringr", "tibble", "tidyr"] }, "RVAideMemoire": { "name": "RVAideMemoire", "version": "0.9-83-7", "sha256": "1ix6v1m4h1wffvgmzhrzdgj5268z54bnd02wqivrjf32pi7s9vn5", - "depends": ["ade4", "boot", "car", "FactoMineR", "lme4", "MASS", "nnet", "pls", "pspearman", "vegan"] + "depends": ["FactoMineR", "MASS", "ade4", "boot", "car", "lme4", "nnet", "pls", "pspearman", "vegan"] }, "RVCompare": { "name": "RVCompare", "version": "0.1.8", "sha256": "0dqz0c3idy9nzb9mlmlnyq05zql0nca1na7qxbgk136g4spbr1n3", - "depends": ["ggplot2", "pracma", "Rcpp"] + "depends": ["Rcpp", "ggplot2", "pracma"] }, "RVIpkg": { "name": "RVIpkg", @@ -27725,13 +28007,13 @@ "name": "RWDataPlyr", "version": "0.6.4", "sha256": "1jjra885339n6kpqz28rn9byy4md4s0k47m6ll4a6srd4hsf3ni3", - "depends": ["data_table", "dplyr", "feather", "Rcpp", "tibble", "tidyr", "xts", "zoo"] + "depends": ["Rcpp", "data_table", "dplyr", "feather", "tibble", "tidyr", "xts", "zoo"] }, "RWeka": { "name": "RWeka", "version": "0.4-46", "sha256": "0rsbz7ck7z4bjk9qrwrr4nq30b1iv3kwkkwx9jcrph832xw5a1b6", - "depends": ["rJava", "RWekajars"] + "depends": ["RWekajars", "rJava"] }, "RWekajars": { "name": "RWekajars", @@ -27767,13 +28049,13 @@ "name": "RWsearch", "version": "5.1.4", "sha256": "09rkq84ppy6f6ak229wim5y0zd295saabh3q4lmv23zi6z3a9ngh", - "depends": ["brew", "latexpdf", "networkD3", "sig", "sos", "XML"] + "depends": ["XML", "brew", "latexpdf", "networkD3", "sig", "sos"] }, "RXKCD": { "name": "RXKCD", "version": "1.9.2", "sha256": "1yk12ic6kdbwc44ppag2yfnga7xjmifkglhvcw93vc3qg469mm15", - "depends": ["jpeg", "plyr", "png", "RJSONIO"] + "depends": ["RJSONIO", "jpeg", "plyr", "png"] }, "RXshrink": { "name": "RXshrink", @@ -27785,7 +28067,7 @@ "name": "RYandexTranslate", "version": "1.0", "sha256": "0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s", - "depends": ["httr", "jsonlite", "RCurl"] + "depends": ["RCurl", "httr", "jsonlite"] }, "RZabbix": { "name": "RZabbix", @@ -27803,7 +28085,7 @@ "name": "RZooRoH", "version": "0.3.2.1", "sha256": "02sz2hgddgws4qwwvqgcd470r7ffyzs88r90mnhjl3889a5ixkml", - "depends": ["data_table", "doParallel", "foreach", "iterators", "RColorBrewer"] + "depends": ["RColorBrewer", "data_table", "doParallel", "foreach", "iterators"] }, "RaJIVE": { "name": "RaJIVE", @@ -27821,19 +28103,19 @@ "name": "RaSEn", "version": "3.0.0", "sha256": "1a7jvyvvhzn4aifnhjldn5jr6sxh16b67x335p8wh8g24yvvglvw", - "depends": ["caret", "class", "doParallel", "e1071", "FNN", "foreach", "formatR", "ggplot2", "glmnet", "gridExtra", "KernelKnn", "MASS", "ModelMetrics", "nnet", "randomForest", "ranger", "rpart"] + "depends": ["FNN", "KernelKnn", "MASS", "ModelMetrics", "caret", "class", "doParallel", "e1071", "foreach", "formatR", "ggplot2", "glmnet", "gridExtra", "nnet", "randomForest", "ranger", "rpart"] }, "RaceID": { "name": "RaceID", "version": "0.3.5", "sha256": "0jmgc2nf65ymhk88mzlmh96wwygr0gs3ca1mc0all0a5c6vxyj8b", - "depends": ["cluster", "coop", "FateID", "FNN", "fpc", "ggplot2", "harmony", "ica", "igraph", "irlba", "leiden", "locfit", "MASS", "Matrix", "matrixStats", "pheatmap", "princurve", "quadprog", "randomForest", "RColorBrewer", "Rcpp", "Rtsne", "runner", "umap", "vegan"] + "depends": ["FNN", "FateID", "MASS", "Matrix", "RColorBrewer", "Rcpp", "Rtsne", "cluster", "coop", "fpc", "ggplot2", "harmony", "ica", "igraph", "irlba", "leiden", "locfit", "matrixStats", "pheatmap", "princurve", "quadprog", "randomForest", "runner", "umap", "vegan"] }, "Racmacs": { "name": "Racmacs", "version": "1.2.9", "sha256": "0csrbmri44ykrrx25a21hnqca74w6hvsiza43k7jix26bchysynl", - "depends": ["brotli", "dplyr", "ellipsis", "ggplot2", "htmltools", "htmlwidgets", "igraph", "jsonlite", "ks", "magrittr", "MASS", "rapidjsonr", "Rcpp", "RcppArmadillo", "RcppEnsmallen", "RcppProgress", "rlang", "rmarchingcubes", "shape", "shiny", "shinyFiles", "shinyjs", "vctrs"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "RcppEnsmallen", "RcppProgress", "brotli", "dplyr", "ellipsis", "ggplot2", "htmltools", "htmlwidgets", "igraph", "jsonlite", "ks", "magrittr", "rapidjsonr", "rlang", "rmarchingcubes", "shape", "shiny", "shinyFiles", "shinyjs", "vctrs"] }, "RadData": { "name": "RadData", @@ -27863,7 +28145,7 @@ "name": "Radviz", "version": "0.9.3", "sha256": "0ayrkax1g7x9jvkl8lni08ydm1lhcwpcbvy1xj9zk3bpd5zpll86", - "depends": ["dplyr", "ggplot2", "hexbin", "igraph", "pracma", "Rcpp", "RcppArmadillo", "rlang"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "ggplot2", "hexbin", "igraph", "pracma", "rlang"] }, "RagGrid": { "name": "RagGrid", @@ -27875,7 +28157,7 @@ "name": "Rage", "version": "1.6.0", "sha256": "0scpig0glh1ajc5fp7xrdb0b5f11x1f5ls43wb6b9kjif4fi25cl", - "depends": ["DiagrammeR", "expm", "MASS", "popdemo"] + "depends": ["DiagrammeR", "MASS", "expm", "popdemo"] }, "RainfallErosivityFactor": { "name": "RainfallErosivityFactor", @@ -27923,7 +28205,7 @@ "name": "RandomProjectionTest", "version": "0.1.4", "sha256": "1pg88q7k89s33yfnqkn5d03mc3ix8ihh4q3l6064p44d98wdsw4f", - "depends": ["glue", "MASS"] + "depends": ["MASS", "glue"] }, "Randomuseragent": { "name": "Randomuseragent", @@ -27941,7 +28223,7 @@ "name": "RankAggSIgFUR", "version": "1.0.0", "sha256": "0wsmd9p3dfjs650q3b81k91fbl3bpjc8grm4233m8f941cabap8p", - "depends": ["combinat", "data_table", "plyr", "Rfast"] + "depends": ["Rfast", "combinat", "data_table", "plyr"] }, "RankAggreg": { "name": "RankAggreg", @@ -27983,7 +28265,7 @@ "name": "Rapi", "version": "1.0.5", "sha256": "044c3qs6vyijl8j21rs351jvmz2f6i864bzzy8vrh4p58j7zhq0d", - "depends": ["crayon", "digest", "dplyr", "glue", "httr", "httr2", "jsonlite", "lubridate", "magrittr", "purrr", "Rcpp", "rlang", "rlist", "stringr", "tibble"] + "depends": ["Rcpp", "crayon", "digest", "dplyr", "glue", "httr", "httr2", "jsonlite", "lubridate", "magrittr", "purrr", "rlang", "rlist", "stringr", "tibble"] }, "RapidPolygonLookup": { "name": "RapidPolygonLookup", @@ -27995,19 +28277,19 @@ "name": "RapidoPGS", "version": "2.3.0", "sha256": "0jks5v9822gk4gip7027m2l26gccrm81iazn1006n1a0871caf98", - "depends": ["bigreadr", "bigsnpr", "coloc", "curl", "data_table", "dplyr", "GenomicRanges", "IRanges", "magrittr", "RCurl"] + "depends": ["GenomicRanges", "IRanges", "RCurl", "bigreadr", "bigsnpr", "coloc", "curl", "data_table", "dplyr", "magrittr"] }, "Rapp": { "name": "Rapp", - "version": "0.1.0", - "sha256": "06rixyz2r4w82dbpr0d3z74hv0kxgd677d9c690jjnm9hrskwfbn", + "version": "0.2.0", + "sha256": "18d62wn808673qx3qclvi119i29r8pzm634x2zyy4mx59ixka9l4", "depends": ["yaml"] }, "Raquifer": { "name": "Raquifer", "version": "0.1.0", "sha256": "148inkn6yiyvicw0b4kw99n172xsvhrrdx1khghqs966smjw54wy", - "depends": ["dplyr", "gsl", "magrittr", "pracma", "Rdpack"] + "depends": ["Rdpack", "dplyr", "gsl", "magrittr", "pracma"] }, "RareComb": { "name": "RareComb", @@ -28031,7 +28313,7 @@ "name": "Rata", "version": "0.0.2", "sha256": "1s7am08691lil5hbd8jpa5wnbvr0qqf0gkxczpm6yvizbjpx16qx", - "depends": ["ggplot2", "glpkAPI", "lpSolveAPI", "reshape2", "Rirt"] + "depends": ["Rirt", "ggplot2", "glpkAPI", "lpSolveAPI", "reshape2"] }, "RatingScaleReduction": { "name": "RatingScaleReduction", @@ -28049,25 +28331,25 @@ "name": "RationalMatrix", "version": "1.0.0", "sha256": "1nzhfmvckb9hp53lyw6gyv5r492n4xii8l1xkr38p5i07r52zq2c", - "depends": ["BH", "gmp", "Rcpp", "RcppEigen"] + "depends": ["BH", "Rcpp", "RcppEigen", "gmp"] }, "Ravages": { "name": "Ravages", "version": "1.1.3", "sha256": "0scfxzfisqcj9zn50pvhy9xrl3k5bgglp11gqxf885yskdiwrkik", - "depends": ["bedr", "BH", "curl", "data_table", "dfidx", "Formula", "gaston", "mlogit", "Rcpp", "RcppEigen", "RcppParallel"] + "depends": ["BH", "Formula", "Rcpp", "RcppEigen", "RcppParallel", "bedr", "curl", "data_table", "dfidx", "gaston", "mlogit"] }, "RavenR": { "name": "RavenR", "version": "2.2.2", "sha256": "0z1gp1jvh0b80f5bkfg1gg7x116axfgix13hpviyh0c3mfi5yw37", - "depends": ["colorspace", "cowplot", "crayon", "DiagrammeR", "dplyr", "dygraphs", "gdata", "ggplot2", "igraph", "lubridate", "magrittr", "purrr", "Rcpp", "RCurl", "scales", "stringr", "tidyr", "visNetwork", "xts", "zoo"] + "depends": ["DiagrammeR", "RCurl", "Rcpp", "colorspace", "cowplot", "crayon", "dplyr", "dygraphs", "gdata", "ggplot2", "igraph", "lubridate", "magrittr", "purrr", "scales", "stringr", "tidyr", "visNetwork", "xts", "zoo"] }, "RawHummus": { "name": "RawHummus", "version": "0.3.3", "sha256": "0m88cywxwwiyvr2i7ipi9yf5znzdjfsmgz2x0ry4d6mm5469rws4", - "depends": ["config", "data_table", "dplyr", "ggplot2", "golem", "kableExtra", "markdown", "plotly", "purrr", "RaMS", "RColorBrewer", "rmarkdown", "shiny", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyMatrix"] + "depends": ["RColorBrewer", "RaMS", "config", "data_table", "dplyr", "ggplot2", "golem", "kableExtra", "markdown", "plotly", "purrr", "rmarkdown", "shiny", "shinyMatrix", "shinycustomloader", "shinydashboard", "shinydashboardPlus"] }, "Rbeast": { "name": "Rbeast", @@ -28097,7 +28379,7 @@ "name": "Rborist", "version": "0.3-7", "sha256": "15i5aj7p3lwp7r84kv7i9jfhwbs8r1yn44shpm9gf17kwvwzw7h1", - "depends": ["data_table", "digest", "Rcpp"] + "depends": ["Rcpp", "data_table", "digest"] }, "RbyExample": { "name": "RbyExample", @@ -28157,25 +28439,25 @@ "name": "RclusTool", "version": "0.91.6", "sha256": "03qz4k6h0z1sj2gyyq5sk7hilmynvqvvj35mrml629rxhgjyyhgs", - "depends": ["class", "cluster", "conclust", "corrplot", "e1071", "factoextra", "FactoMineR", "ggplot2", "jpeg", "knitr", "MASS", "mclust", "mda", "mmand", "nnet", "png", "randomForest", "reshape", "rlang", "SearchTrees", "sp", "stringi", "stringr", "tcltk2", "tkrplot"] + "depends": ["FactoMineR", "MASS", "SearchTrees", "class", "cluster", "conclust", "corrplot", "e1071", "factoextra", "ggplot2", "jpeg", "knitr", "mclust", "mda", "mmand", "nnet", "png", "randomForest", "reshape", "rlang", "sp", "stringi", "stringr", "tcltk2", "tkrplot"] }, "Rcmdr": { "name": "Rcmdr", "version": "2.9-2", "sha256": "175c5iqgp2j7x5vjijnklc35nbnyz0s83rzmf7qq8kxv8fv2jmw8", - "depends": ["abind", "car", "effects", "lme4", "RcmdrMisc", "relimp", "tcltk2"] + "depends": ["RcmdrMisc", "abind", "car", "effects", "lme4", "relimp", "tcltk2"] }, "RcmdrMisc": { "name": "RcmdrMisc", "version": "2.9-1", "sha256": "0khp8dw1b3v5jqbhnqxjcyyjz9hj9pb98niacn17cf9iln9rr7mc", - "depends": ["abind", "car", "colorspace", "e1071", "foreign", "haven", "Hmisc", "lattice", "MASS", "nortest", "readstata13", "readxl", "sandwich"] + "depends": ["Hmisc", "MASS", "abind", "car", "colorspace", "e1071", "foreign", "haven", "lattice", "nortest", "readstata13", "readxl", "sandwich"] }, "RcmdrPlugin_BWS1": { "name": "RcmdrPlugin.BWS1", "version": "0.2-2", "sha256": "0as8nnyfk2fjsc92rxywi36bp41zppwcx9207zywqxb0b3awdn08", - "depends": ["crossdes", "Rcmdr", "support_BWS", "support_CEs", "survival"] + "depends": ["Rcmdr", "crossdes", "support_BWS", "support_CEs", "survival"] }, "RcmdrPlugin_BWS2": { "name": "RcmdrPlugin.BWS2", @@ -28193,7 +28475,7 @@ "name": "RcmdrPlugin.BiclustGUI", "version": "1.1.3.1", "sha256": "1wb1pbwghq1xxpwlihfixx42yf1f1py3hdwh8sfpqklh63ymwifk", - "depends": ["BcDiag", "BiBitR", "BicARE", "biclust", "fabia", "gplots", "iBBiG", "Rcmdr", "s4vd", "superbiclust", "viridis"] + "depends": ["BcDiag", "BiBitR", "BicARE", "Rcmdr", "biclust", "fabia", "gplots", "iBBiG", "s4vd", "superbiclust", "viridis"] }, "RcmdrPlugin_DCCV": { "name": "RcmdrPlugin.DCCV", @@ -28217,18 +28499,18 @@ "name": "RcmdrPlugin.EACSPIR", "version": "0.2-3", "sha256": "0v7pw0m8cxpnkdm47b8jb3z94p1igi98s4r8i0gm7x7ad4fzccww", - "depends": ["abind", "ez", "nortest", "R2HTML", "Rcmdr", "RcmdrMisc", "reshape"] + "depends": ["R2HTML", "Rcmdr", "RcmdrMisc", "abind", "ez", "nortest", "reshape"] }, "RcmdrPlugin_EBM": { "name": "RcmdrPlugin.EBM", "version": "1.0-10", "sha256": "02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw", - "depends": ["abind", "epiR", "Rcmdr"] + "depends": ["Rcmdr", "abind", "epiR"] }, "RcmdrPlugin_EZR": { "name": "RcmdrPlugin.EZR", - "version": "1.67", - "sha256": "035a1ch36ygwknk2hwjxs6ir1izwbqn0iq3y0qxv8iw4qa668ar8", + "version": "1.68", + "sha256": "0ppdn3fz8y3ckhhzhn0bhis4i2wd0r2ll8xmvvp6vnx42q9vnh0z", "depends": ["Rcmdr", "readstata13"] }, "RcmdrPlugin_EcoVirtual": { @@ -28259,31 +28541,31 @@ "name": "RcmdrPlugin.HH", "version": "1.1-51", "sha256": "1kfx74nlkdyzh73cwab8gflrpw99pvjgr3ch8ikkg39h8yyi83qh", - "depends": ["HH", "lattice", "mgcv", "Rcmdr"] + "depends": ["HH", "Rcmdr", "lattice", "mgcv"] }, "RcmdrPlugin_KMggplot2": { "name": "RcmdrPlugin.KMggplot2", "version": "0.2-6", "sha256": "0xh0lfgmr5sc15f3v5avwy1zl0gk1krlw3jb1prjyk9prp8albz9", - "depends": ["ggplot2", "ggthemes", "plyr", "Rcmdr", "RColorBrewer", "scales", "survival", "tcltk2"] + "depends": ["RColorBrewer", "Rcmdr", "ggplot2", "ggthemes", "plyr", "scales", "survival", "tcltk2"] }, "RcmdrPlugin_MA": { "name": "RcmdrPlugin.MA", "version": "0.0-2", "sha256": "1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p", - "depends": ["MAd", "metafor", "Rcmdr"] + "depends": ["MAd", "Rcmdr", "metafor"] }, "RcmdrPlugin_MPAStats": { "name": "RcmdrPlugin.MPAStats", "version": "1.2.2", "sha256": "1ynj42p12ncgrbghd8w7mkyys2cq9r9dpbir57rj3k5l46yzj7d5", - "depends": ["ordinal", "Rcmdr"] + "depends": ["Rcmdr", "ordinal"] }, "RcmdrPlugin_NMBU": { "name": "RcmdrPlugin.NMBU", "version": "1.8.15", "sha256": "0y5pwwfvqdc2a6wbkjnvgrlh7251s60l74cmfi7k9n2gkzx5d34y", - "depends": ["car", "MASS", "mixlm", "phia", "pls", "Rcmdr", "xtable"] + "depends": ["MASS", "Rcmdr", "car", "mixlm", "phia", "pls", "xtable"] }, "RcmdrPlugin_PcaRobust": { "name": "RcmdrPlugin.PcaRobust", @@ -28295,25 +28577,25 @@ "name": "RcmdrPlugin.RMTCJags", "version": "1.0-2", "sha256": "04g5a1dpch54k5ckfkrg4vsap1nc3af1i0i559qigv3hy8n7pm80", - "depends": ["coda", "igraph", "Rcmdr", "rjags", "rmeta", "runjags"] + "depends": ["Rcmdr", "coda", "igraph", "rjags", "rmeta", "runjags"] }, "RcmdrPlugin_ROC": { "name": "RcmdrPlugin.ROC", "version": "1.0-19", "sha256": "1m5k8y2xy78bpyvi2cdnvmicr5dkjxb8v65blcmgrhf7i0zhhj5p", - "depends": ["pROC", "Rcmdr", "ResourceSelection"] + "depends": ["Rcmdr", "ResourceSelection", "pROC"] }, "RcmdrPlugin_RiskDemo": { "name": "RcmdrPlugin.RiskDemo", "version": "3.2", "sha256": "07v15wnmqqa69gy2kl2jkdgn9nzjj2fz5yy56gkhxczw7j6516ij", - "depends": ["data_table", "demography", "dplyr", "forecast", "ftsa", "ggplot2", "Rcmdr", "scales", "zoo"] + "depends": ["Rcmdr", "data_table", "demography", "dplyr", "forecast", "ftsa", "ggplot2", "scales", "zoo"] }, "RcmdrPlugin_TeachStat": { "name": "RcmdrPlugin.TeachStat", "version": "1.1.3", "sha256": "1l73zpy94av30x31rskzggaf6bmj7wfx1k6mksmpjmy47hk07qlg", - "depends": ["distr", "distrEx", "Hmisc", "IndexNumR", "lme4", "Rcmdr", "tcltk2", "tseries"] + "depends": ["Hmisc", "IndexNumR", "Rcmdr", "distr", "distrEx", "lme4", "tcltk2", "tseries"] }, "RcmdrPlugin_TeachingDemos": { "name": "RcmdrPlugin.TeachingDemos", @@ -28325,7 +28607,7 @@ "name": "RcmdrPlugin.UCA", "version": "5.1-1", "sha256": "15z2pyi92vznkbfqycc33b39dl2wx0kf2l5w1wv8pr85i5449dzq", - "depends": ["IQCC", "qcc", "qicharts2", "randtests", "Rcmdr", "rmarkdown", "TeachingDemos", "tseries"] + "depends": ["IQCC", "Rcmdr", "TeachingDemos", "qcc", "qicharts2", "randtests", "rmarkdown", "tseries"] }, "RcmdrPlugin_WorldFlora": { "name": "RcmdrPlugin.WorldFlora", @@ -28343,19 +28625,19 @@ "name": "RcmdrPlugin.cpd", "version": "0.2.0", "sha256": "1s0y40nh91fi6i91zvn7q106d4nnshflfnzs8m63skklsdxk3by0", - "depends": ["cpd", "Rcmdr", "RcmdrMisc"] + "depends": ["Rcmdr", "RcmdrMisc", "cpd"] }, "RcmdrPlugin_depthTools": { "name": "RcmdrPlugin.depthTools", "version": "1.4", "sha256": "16y60yymx97nh587939lahsh0mk53yy25zy6i90l9vad0r7ih23v", - "depends": ["depthTools", "Rcmdr"] + "depends": ["Rcmdr", "depthTools"] }, "RcmdrPlugin_orloca": { "name": "RcmdrPlugin.orloca", "version": "4.8.2", "sha256": "0nkszrbcprd08p0i9r6k2syg44kyqpdakmwmjf480pwydq3sz69n", - "depends": ["orloca", "orloca_es", "Rcmdr"] + "depends": ["Rcmdr", "orloca", "orloca_es"] }, "RcmdrPlugin_sos": { "name": "RcmdrPlugin.sos", @@ -28367,13 +28649,13 @@ "name": "RcmdrPlugin.survival", "version": "1.3-2", "sha256": "1kyqrpqi1gbc7vbdy524a7ifpnsx42rkz34p72cdi7qjyq8x7vs7", - "depends": ["car", "date", "Rcmdr", "survival"] + "depends": ["Rcmdr", "car", "date", "survival"] }, "RcmdrPlugin_temis": { "name": "RcmdrPlugin.temis", "version": "0.7.10", "sha256": "02rs5xdj6g57frndc87fly0ans16584j4d0rfpy1h72655cz66ab", - "depends": ["ca", "lattice", "latticeExtra", "NLP", "R2HTML", "Rcmdr", "RColorBrewer", "slam", "stringi", "tcltk2", "tm", "zoo"] + "depends": ["NLP", "R2HTML", "RColorBrewer", "Rcmdr", "ca", "lattice", "latticeExtra", "slam", "stringi", "tcltk2", "tm", "zoo"] }, "Rcompadre": { "name": "Rcompadre", @@ -28389,8 +28671,8 @@ }, "Rcpp": { "name": "Rcpp", - "version": "1.0.12", - "sha256": "1l1b0q2r6q2bjr4wvj98kp9844fyrsn2ppx339v05vmy8g65jwqc", + "version": "1.0.13", + "sha256": "1ki2vdfavwxvpw1y47kc0fpg248836zd3iw6zlspkr8kq58cdzi1", "depends": [] }, "Rcpp11": { @@ -28419,8 +28701,8 @@ }, "RcppArmadillo": { "name": "RcppArmadillo", - "version": "0.12.8.4.0", - "sha256": "0iihy2pbmc56s5s6x7ac1c1biqda60gyqkddvn2c211j0xjnigya", + "version": "14.0.0-1", + "sha256": "145sci5fkwzrngqx2ykpxvvy3wn5wjfjfl7wmw92gn9yvkxd9i40", "depends": ["Rcpp"] }, "RcppArray": { @@ -28455,8 +28737,8 @@ }, "RcppCGAL": { "name": "RcppCGAL", - "version": "5.6.3", - "sha256": "0jb410wcf9djlii2ry27xbykkanld6vngl141b6i68v40y1c2n73", + "version": "5.6.4", + "sha256": "0dll6s8asylvghdzjjj1sxckyczkdjw111bfdiz0rb0ylc27yf7x", "depends": ["Rcpp"] }, "RcppCNPy": { @@ -28469,13 +28751,13 @@ "name": "RcppCWB", "version": "0.6.4", "sha256": "17w4jz6rngwm3kqwz0v547s43xvjlxc86y9yy4hnc7blkqcp4w2g", - "depends": ["fs", "Rcpp"] + "depends": ["Rcpp", "fs"] }, "RcppCensSpatial": { "name": "RcppCensSpatial", "version": "0.3.0", "sha256": "0ghywbg2zrhd72y3hf99niqlw04gvfzfa02pa581lvvd67z19gjp", - "depends": ["ggplot2", "gridExtra", "MomTrunc", "mvtnorm", "Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "relliptical", "roptim", "StempCens"] + "depends": ["MomTrunc", "Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "StempCens", "ggplot2", "gridExtra", "mvtnorm", "relliptical", "roptim"] }, "RcppClassic": { "name": "RcppClassic", @@ -28493,7 +28775,7 @@ "name": "RcppClock", "version": "1.1", "sha256": "0h59s6f9ib6d2n1fi94bcbqw0gcpbd5zvnc3pk4kb9lm7ih4dw7b", - "depends": ["ggplot2", "Rcpp"] + "depends": ["Rcpp", "ggplot2"] }, "RcppColors": { "name": "RcppColors", @@ -28527,8 +28809,8 @@ }, "RcppEigen": { "name": "RcppEigen", - "version": "0.3.4.0.0", - "sha256": "0djiyimgka7g3kfakb6mfaq7cxna9kn6kgib59x9p7qj24ha1m18", + "version": "0.3.4.0.1", + "sha256": "09jf5bvz77qsx4m6draarm7an07yxvip6bbmjbfsl2mm93qliv95", "depends": ["Rcpp"] }, "RcppEnsmallen": { @@ -28577,7 +28859,7 @@ "name": "RcppGreedySetCover", "version": "0.1.0", "sha256": "1v84i9gsmvpkmgd4niqnzp58nhrgn2j4rggsrnlh391ikdfrl51x", - "depends": ["BH", "data_table", "Rcpp"] + "depends": ["BH", "Rcpp", "data_table"] }, "RcppHMM": { "name": "RcppHMM", @@ -28607,7 +28889,7 @@ "name": "RcppJagger", "version": "0.0.2", "sha256": "1zzc7vkwylwwgrbak2z32629gbl5jq2gdfc9qq0a8fk7c7rvk988", - "depends": ["cli", "purrr", "Rcpp", "rlang"] + "depends": ["Rcpp", "cli", "purrr", "rlang"] }, "RcppLbfgsBlaze": { "name": "RcppLbfgsBlaze", @@ -28637,7 +28919,7 @@ "name": "RcppNLoptExample", "version": "0.0.1", "sha256": "1fml6hpa12q0lgg5fg6fi9lz6mckwh345pbh95mld2qagzvmg01n", - "depends": ["nloptr", "Rcpp"] + "depends": ["Rcpp", "nloptr"] }, "RcppNumerical": { "name": "RcppNumerical", @@ -28647,8 +28929,8 @@ }, "RcppParallel": { "name": "RcppParallel", - "version": "5.1.7", - "sha256": "175j0plh9gzy45sxsck0wdqfkjwdsbb17m9511czrgqsrswhxhzr", + "version": "5.1.8", + "sha256": "09m1pfblmcqh02simzvnal5qqv5swx35ls8kjggy6manv25b2mfn", "depends": [] }, "RcppProgress": { @@ -28671,8 +28953,8 @@ }, "RcppRoll": { "name": "RcppRoll", - "version": "0.3.0", - "sha256": "0srzfhzkk42kzrdjnhbb37946jp1p688rgysy6k3i2is8jb21zyb", + "version": "0.3.1", + "sha256": "1prnc3svhc2v1w97vbdzfyxh545zx2h0p9d1q4753f7ynrwdkxfj", "depends": ["Rcpp"] }, "RcppSMC": { @@ -28683,8 +28965,8 @@ }, "RcppSimdJson": { "name": "RcppSimdJson", - "version": "0.1.11", - "sha256": "1q5gqa1pp71f952wvl1fpw9r2qm92112x5irw1splf3y6k6m4r6h", + "version": "0.1.12", + "sha256": "0fvmcn56d8p0wf3ax9w7l8s72zfmxkq0pf8z5lm4v6l6vj7wrfgz", "depends": ["Rcpp"] }, "RcppSpdlog": { @@ -28775,12 +29057,12 @@ "name": "Rcurvep", "version": "1.3.1", "sha256": "1l29z50ka9n2qma1pk8gw00xhxvzxkrd07dwrd8k5b36kiql2q3y", - "depends": ["boot", "dplyr", "furrr", "ggplot2", "magrittr", "purrr", "Rdpack", "rJava", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["Rdpack", "boot", "dplyr", "furrr", "ggplot2", "magrittr", "purrr", "rJava", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] }, "Rd2md": { "name": "Rd2md", - "version": "1.0.0", - "sha256": "130y2s16404jrl6xprra9wnscbpk3adhd29br6w9y0m8ngw2wxj0", + "version": "1.0.1", + "sha256": "1xidp50s90m9kl3c0lbakzhmzlf9v9b2ikka18vsamhc6w0kk0sw", "depends": [] }, "Rd2roxygen": { @@ -28805,7 +29087,7 @@ "name": "Rdimtools", "version": "1.1.2", "sha256": "0bl8ffyy9jb6xp1jb350fj5pw3zvc1dnrdhl4vi25kl84pp30xl6", - "depends": ["ADMM", "CVXR", "maotai", "MASS", "mclustcomp", "RANN", "Rcpp", "RcppArmadillo", "RcppDE", "RcppDist", "Rdpack", "RSpectra"] + "depends": ["ADMM", "CVXR", "MASS", "RANN", "RSpectra", "Rcpp", "RcppArmadillo", "RcppDE", "RcppDist", "Rdpack", "maotai", "mclustcomp"] }, "Rdistance": { "name": "Rdistance", @@ -28815,8 +29097,8 @@ }, "Rdpack": { "name": "Rdpack", - "version": "2.6", - "sha256": "02i21i85pb5aim529byjwhmyyz9jd82mi4j26a3kay0pcn6djxba", + "version": "2.6.1", + "sha256": "0igrmi0v17jsbfa770d6rcfnkjx6l2x3shskvjzhc5xbqjbn6qir", "depends": ["rbibutils"] }, "Rdrw": { @@ -28835,7 +29117,7 @@ "name": "Rdta", "version": "1.0.1", "sha256": "0a9n78kn6vf6nkv83v2vn5hha0l7d8sdvpl7320kgs29vd2nrwzm", - "depends": ["MCMCpack", "mvtnorm", "Rdpack"] + "depends": ["MCMCpack", "Rdpack", "mvtnorm"] }, "Rduino": { "name": "Rduino", @@ -28849,35 +29131,41 @@ "sha256": "1vrmj2cmf1yz453875d234f53636a3bfr5k5ymy00f4wsjkr9pqj", "depends": ["cli", "httr", "jsonlite", "purrr", "tibble"] }, + "Rdune": { + "name": "Rdune", + "version": "1.1.1", + "sha256": "1q4jql23h4yk970dr6mk8ykjisdyn5lwrlhgjxgzwxrdkmrs92pj", + "depends": ["ggplot2"] + }, "ReAD": { "name": "ReAD", "version": "1.0.1", "sha256": "0wn8ka8mjx216py26h1fcswgv061wrcdfzdj55sryvykfxaggiir", - "depends": ["qvalue", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "qvalue"] }, "ReDaMoR": { "name": "ReDaMoR", - "version": "0.7.4", - "sha256": "14msbr297haj1v8aq61m0zbj98sphcx0q8g3883lnrabjsshkws2", - "depends": ["colourpicker", "crayon", "dplyr", "DT", "jsonlite", "magrittr", "markdown", "Matrix", "readr", "rintrojs", "rstudioapi", "shiny", "shinyjs", "visNetwork"] + "version": "0.7.6", + "sha256": "1pl5yg7dxlg719zhbsywg4y9yqn8fyk5h6kqjl37gs7czb8s6ak1", + "depends": ["DT", "Matrix", "colourpicker", "crayon", "dplyr", "jsonlite", "magrittr", "markdown", "readr", "rintrojs", "rstudioapi", "shiny", "shinyjs", "visNetwork"] }, "ReDirection": { "name": "ReDirection", "version": "1.0.1", "sha256": "0hcl09drgr93yjssw2mpdpvr084ifzylsi6140hafjpm9f9pmvkm", - "depends": ["gtools", "MASS", "pracma"] + "depends": ["MASS", "gtools", "pracma"] }, "ReIns": { "name": "ReIns", "version": "1.0.14", "sha256": "1qqgphlc7wl541nx7qrkbc66414gy0l2pi164h03ndw0s7x7k4g7", - "depends": ["doParallel", "foreach", "Rcpp", "survival"] + "depends": ["Rcpp", "doParallel", "foreach", "survival"] }, "ReMFPCA": { "name": "ReMFPCA", "version": "1.0.0", "sha256": "0q7jzya5is4ik8cjirnhixcpgda5s9a450pyksyzc05fmn7rw3rc", - "depends": ["expm", "fda", "Matrix", "R6"] + "depends": ["Matrix", "R6", "expm", "fda"] }, "ReacTran": { "name": "ReacTran", @@ -28895,7 +29183,7 @@ "name": "RealVAMS", "version": "0.4-6", "sha256": "1945vxqj4y6fci3pwrq5jr91ikx2yn91jm33fm0x1x1bzv7krcgh", - "depends": ["Matrix", "numDeriv", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "numDeriv"] }, "Rearrangement": { "name": "Rearrangement", @@ -28913,7 +29201,7 @@ "name": "Recocrop", "version": "0.4-1", "sha256": "1drh1qssnb42p1zl45phpggxhx6is435k9f1vzga0q0dddr5q770", - "depends": ["meteor", "Rcpp", "terra"] + "depends": ["Rcpp", "meteor", "terra"] }, "Recon": { "name": "Recon", @@ -28925,7 +29213,7 @@ "name": "RecordLinkage", "version": "0.4-12.4", "sha256": "0jfissk9gcf1w78dhly01dpjlb8nyk32iz1s2n38ggk8ywd4zgbk", - "depends": ["ada", "data_table", "DBI", "e1071", "evd", "ff", "ipred", "nnet", "rpart", "RSQLite", "xtable"] + "depends": ["DBI", "RSQLite", "ada", "data_table", "e1071", "evd", "ff", "ipred", "nnet", "rpart", "xtable"] }, "RecordTest": { "name": "RecordTest", @@ -28955,7 +29243,7 @@ "name": "Rediscover", "version": "0.3.2", "sha256": "0g36j5xdc86422jc1njlab4kvlsq3z6bxigxgzsl31bf1k7kc1ra", - "depends": ["data_table", "maftools", "Matrix", "matrixStats", "PoissonBinomial", "RColorBrewer", "ShiftConvolvePoibin"] + "depends": ["Matrix", "PoissonBinomial", "RColorBrewer", "ShiftConvolvePoibin", "data_table", "maftools", "matrixStats"] }, "Redmonder": { "name": "Redmonder", @@ -28979,7 +29267,7 @@ "name": "RegCombin", "version": "0.4.1", "sha256": "14vb46d8m5w5vik7kfhsj97yil3sc6qnmyp3c6myadlsw9k3x4lj", - "depends": ["dplyr", "geometry", "Hmisc", "kableExtra", "pracma", "RationalExp", "snowfall"] + "depends": ["Hmisc", "RationalExp", "dplyr", "geometry", "kableExtra", "pracma", "snowfall"] }, "RegKink": { "name": "RegKink", @@ -29009,7 +29297,7 @@ "name": "RelDists", "version": "1.0.0", "sha256": "1dxgn8gs80cvk0i8q1j4fpayazv01hly16jawf32m03irml6kl6c", - "depends": ["BBmisc", "EstimationTools", "gamlss", "gamlss_dist", "lamW", "Rdpack", "survival", "VGAM", "zipfR"] + "depends": ["BBmisc", "EstimationTools", "Rdpack", "VGAM", "gamlss", "gamlss_dist", "lamW", "survival", "zipfR"] }, "Relatedness": { "name": "Relatedness", @@ -29027,13 +29315,13 @@ "name": "ReliabilityTheory", "version": "0.3.0", "sha256": "1vj09a2gc36cp98kai4m0wyjg6h9yldawhjimjqr5nrf70i60bg5", - "depends": ["actuar", "combinat", "FRACTION", "igraph", "mcmc", "PhaseType", "sfsmisc"] + "depends": ["FRACTION", "PhaseType", "actuar", "combinat", "igraph", "mcmc", "sfsmisc"] }, "RelimpPCR": { "name": "RelimpPCR", "version": "0.3.0", "sha256": "04ab20clx9hdk1mi3rvkkaqaxypyb27w5d90y3qpnxhgy1bjqs6r", - "depends": ["caret", "ggplot2", "logger", "relaimpo", "reshape2", "Rmisc"] + "depends": ["Rmisc", "caret", "ggplot2", "logger", "relaimpo", "reshape2"] }, "Renext": { "name": "Renext", @@ -29051,7 +29339,7 @@ "name": "Renvlp", "version": "3.4.5", "sha256": "1af1hjv66kxjljrx1ryr4c8w969jjvdd284nxsh1b7rms80iw16r", - "depends": ["Matrix", "matrixcalc", "orthogonalsplinebasis", "pls", "Rsolnp"] + "depends": ["Matrix", "Rsolnp", "matrixcalc", "orthogonalsplinebasis", "pls"] }, "RepaymentPlan": { "name": "RepaymentPlan", @@ -29063,7 +29351,7 @@ "name": "RepeatedHighDim", "version": "2.3.0", "sha256": "17zgmw78lz6ymz8371g03kasfnrj5z9dhhfpgjpfq4ba3g0mvxlx", - "depends": ["ddalpha", "geometry", "MASS", "mvtnorm", "netmeta", "nlme", "progress", "rgl"] + "depends": ["MASS", "ddalpha", "geometry", "mvtnorm", "netmeta", "nlme", "progress", "rgl"] }, "RepertoiR": { "name": "RepertoiR", @@ -29097,21 +29385,21 @@ }, "ReporterScore": { "name": "ReporterScore", - "version": "0.1.5", - "sha256": "0dcxaf8yvcvzxwfk3y8knkk03qr9wa5g382k0cllxjwq8ly0nxcw", + "version": "0.1.6", + "sha256": "13ha7xncl1slmvhi2pb6l4qwzmgrmj1fp2m6vmwxbig7fvcw0rkg", "depends": ["dplyr", "foreach", "ggnewscale", "ggplot2", "ggrepel", "magrittr", "pcutils", "reshape2", "scales", "stringr"] }, "Require": { "name": "Require", - "version": "0.3.1", - "sha256": "1d87vzxix2lwqjkl5h5kcpvjyd794li5z8vxf1r5dyd7nzmkm1qq", - "depends": ["data_table"] + "version": "1.0.1", + "sha256": "0038rr91hfx7q0rcbkl76sjjykx2wnxr5fc6zdgfqy31p0j6c9aj", + "depends": ["data_table", "sys"] }, "ResIN": { "name": "ResIN", "version": "1.1.0", "sha256": "0m40s7qsxpphja4cw8d6f7aq5vphqzkqzy61jpa17bnyfq0v9v2d", - "depends": ["DirectedClustering", "dplyr", "fastDummies", "ggplot2", "igraph", "Matrix", "qgraph", "wCorr"] + "depends": ["DirectedClustering", "Matrix", "dplyr", "fastDummies", "ggplot2", "igraph", "qgraph", "wCorr"] }, "ResPBIBD": { "name": "ResPBIBD", @@ -29123,7 +29411,7 @@ "name": "ResearchAssociate", "version": "1.0.1", "sha256": "00j339ngc72gn2gyn1irjmazrv6l5nbsy3z25r6j1zrjwsbay15p", - "depends": ["ggplot2", "plyr", "rentrez", "XML"] + "depends": ["XML", "ggplot2", "plyr", "rentrez"] }, "ResidentialEnergyConsumption": { "name": "ResidentialEnergyConsumption", @@ -29147,25 +29435,37 @@ "name": "RespirAnalyzer", "version": "1.0.2", "sha256": "00qyylmnjlw7hd56bgf48p2za4dqmm7nk7j17g9n219hz11yx0pi", - "depends": ["pracma", "Rcpp", "signal"] + "depends": ["Rcpp", "pracma", "signal"] }, "RestRserve": { "name": "RestRserve", "version": "1.2.3", "sha256": "0d5ppgasaqpgvdi1spxlhp4ywpafbphlhkqfcfvgxrdm6y9igl2c", - "depends": ["checkmate", "digest", "jsonlite", "mime", "R6", "Rcpp", "Rserve", "uuid"] + "depends": ["R6", "Rcpp", "Rserve", "checkmate", "digest", "jsonlite", "mime", "uuid"] }, "RestoreNet": { "name": "RestoreNet", "version": "1.0.1", "sha256": "1lgdx6kqd5hqrj36p3vhgy42haj74dwb75gdjka61ms4j7l514hf", - "depends": ["ggplot2", "Matrix", "RColorBrewer", "scales", "scatterpie", "stringr", "xtable"] + "depends": ["Matrix", "RColorBrewer", "ggplot2", "scales", "scatterpie", "stringr", "xtable"] + }, + "ResultModelManager": { + "name": "ResultModelManager", + "version": "0.5.9", + "sha256": "0adjf9b9j4qmn55zlh6sq55vdvpkdbfkbbwvjy0d2y8bw0yfscxs", + "depends": ["DBI", "DatabaseConnector", "ParallelLogger", "R6", "SqlRender", "checkmate", "dbplyr", "dplyr", "fastmap", "lubridate", "pool", "readr", "rlang", "withr", "zip"] + }, + "ReturnCurves": { + "name": "ReturnCurves", + "version": "1.0", + "sha256": "0bcj8qcky9hqgnm2b1m7c207bx6ybzmd9v6v7ri20mddmxbpkz15", + "depends": ["DT", "Rdpack", "evd", "ggplot2", "gridExtra", "ismev", "mathjaxr", "openair", "shiny", "shinydashboard"] }, "RevEcoR": { "name": "RevEcoR", "version": "0.99.3", "sha256": "1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj", - "depends": ["gtools", "igraph", "magrittr", "Matrix", "plyr", "purrr", "stringr", "XML"] + "depends": ["Matrix", "XML", "gtools", "igraph", "magrittr", "plyr", "purrr", "stringr"] }, "RevGadgets": { "name": "RevGadgets", @@ -29183,7 +29483,7 @@ "name": "ReviewR", "version": "2.3.10", "sha256": "1h5vgqxvx5cjcwgrj7ayc7b1xzkgyndif46pjfmaz4pw1sz8990h", - "depends": ["bigrquery", "config", "DBI", "dbplyr", "dplyr", "DT", "gargle", "glue", "golem", "httr", "jsonlite", "magrittr", "purrr", "redcapAPI", "REDCapR", "rlang", "RPostgres", "RSQLite", "shiny", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyjs", "shinyWidgets", "snakecase", "stringr", "tibble", "tidyr"] + "depends": ["DBI", "DT", "REDCapR", "RPostgres", "RSQLite", "bigrquery", "config", "dbplyr", "dplyr", "gargle", "glue", "golem", "httr", "jsonlite", "magrittr", "purrr", "redcapAPI", "rlang", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyjs", "snakecase", "stringr", "tibble", "tidyr"] }, "Revticulate": { "name": "Revticulate", @@ -29195,7 +29495,7 @@ "name": "Rexperigen", "version": "0.2.1", "sha256": "158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw", - "depends": ["digest", "jsonlite", "RCurl"] + "depends": ["RCurl", "digest", "jsonlite"] }, "RfEmpImp": { "name": "RfEmpImp", @@ -29243,7 +29543,7 @@ "name": "Rforestry", "version": "0.10.0", "sha256": "1h5bnaakpig7b2041s43kfljywdbdq6kkvv3agld2953nn8kcbw3", - "depends": ["glmnet", "onehot", "pROC", "Rcpp", "RcppArmadillo", "RcppThread", "visNetwork"] + "depends": ["Rcpp", "RcppArmadillo", "RcppThread", "glmnet", "onehot", "pROC", "visNetwork"] }, "Rfractran": { "name": "Rfractran", @@ -29255,7 +29555,7 @@ "name": "Rfssa", "version": "3.1.0", "sha256": "0knz199h29ph6qxbasrjqdyhgsqnrmp83syz3d3mblqnlz3ar1mi", - "depends": ["dplyr", "fda", "ftsa", "ggplot2", "lattice", "markdown", "plotly", "rainbow", "Rcpp", "RcppArmadillo", "RcppEigen", "RSpectra", "Rssa", "shiny", "tibble"] + "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "RcppEigen", "Rssa", "dplyr", "fda", "ftsa", "ggplot2", "lattice", "markdown", "plotly", "rainbow", "shiny", "tibble"] }, "Rgb": { "name": "Rgb", @@ -29273,7 +29573,7 @@ "name": "Rgff", "version": "0.1.6", "sha256": "1prcjnr4zvp8ksrnzrvz7zmwbsximhg3aifa1wsz6h9aa3pcl2gl", - "depends": ["data_tree", "dplyr", "magrittr", "RJSONIO", "rlang", "stringi", "tibble", "tidyr", "withr"] + "depends": ["RJSONIO", "data_tree", "dplyr", "magrittr", "rlang", "stringi", "tibble", "tidyr", "withr"] }, "Rglpk": { "name": "Rglpk", @@ -29285,7 +29585,7 @@ "name": "Rgof", "version": "1.2.2", "sha256": "0csya8lkjj3w1pwr6g0avs17na07rfnfpx5z9s01vcql92v8aii0", - "depends": ["ggplot2", "Rcpp"] + "depends": ["Rcpp", "ggplot2"] }, "RgoogleMaps": { "name": "RgoogleMaps", @@ -29303,25 +29603,25 @@ "name": "Ricrt", "version": "0.1.0", "sha256": "12fj6q5disl5vmpcwfvf64zqxjw2srrvbvpy10gy81k5lidzznqc", - "depends": ["dplyr", "glmnet", "randomForest", "Rdpack", "rlang", "SuperLearner", "tidyverse"] + "depends": ["Rdpack", "SuperLearner", "dplyr", "glmnet", "randomForest", "rlang", "tidyverse"] }, "RiemBase": { "name": "RiemBase", "version": "0.2.5", "sha256": "1ikv7n8hp23a5dbmnfypdkx74vxwjd9br0hvysnhhpg1ffvr5vhi", - "depends": ["pracma", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "pracma"] }, "Riemann": { "name": "Riemann", "version": "0.1.4", "sha256": "1a3mlfgnzdvl5x1nqnmm4v3xb2nkdq87c21m6xyxbm7zh5vx5b6m", - "depends": ["CVXR", "DEoptim", "lpSolve", "maotai", "Matrix", "Rcpp", "RcppArmadillo", "Rdimtools", "Rdpack", "RiemBase", "T4cluster"] + "depends": ["CVXR", "DEoptim", "Matrix", "Rcpp", "RcppArmadillo", "Rdimtools", "Rdpack", "RiemBase", "T4cluster", "lpSolve", "maotai"] }, "Riex": { "name": "Riex", "version": "1.0.2", "sha256": "03627dik6dd9d2kwv757zanh0i4invmcwg162m9ayhv41ygj5z1l", - "depends": ["dplyr", "ggplot2", "httr", "purrr", "quantmod", "rjson", "stringr", "tibble", "tidyr", "TTR", "urltools", "xts", "zoo"] + "depends": ["TTR", "dplyr", "ggplot2", "httr", "purrr", "quantmod", "rjson", "stringr", "tibble", "tidyr", "urltools", "xts", "zoo"] }, "Rigma": { "name": "Rigma", @@ -29339,7 +29639,7 @@ "name": "Rirt", "version": "0.0.2", "sha256": "0npd2g3a4dh5hlj6l06k1pf0j4731ybqqd4mpi4id16nf81cg104", - "depends": ["ggplot2", "Rcpp", "reshape2"] + "depends": ["Rcpp", "ggplot2", "reshape2"] }, "Risk": { "name": "Risk", @@ -29347,6 +29647,12 @@ "sha256": "1i42xcc699syj108mvgklwb30wkf9c9jrg5rmd2ypnqk9mnyg2fg", "depends": [] }, + "RiskMap": { + "name": "RiskMap", + "version": "0.1.0", + "sha256": "17najil5lddwbzwd1ja44jpiwp2iva2y27p6lw0s0qhnlyr8vz4y", + "depends": ["Matrix", "ggplot2", "maxLik", "sf", "terra", "xtable"] + }, "RiskPortfolios": { "name": "RiskPortfolios", "version": "2.1.7", @@ -29355,9 +29661,9 @@ }, "RiskScorescvd": { "name": "RiskScorescvd", - "version": "0.1.0", - "sha256": "1lh0ag5k72msvj2pg3v2ajvwysjd638hxbifqklvsv5qjv7hzwfy", - "depends": ["dplyr", "PooledCohort"] + "version": "0.2.0", + "sha256": "0mv4xk98l8pq7s6bx246h5w8k49yhv4x5m5gajrg5kxq1mgcjfh4", + "depends": ["PooledCohort", "dplyr"] }, "Rita": { "name": "Rita", @@ -29375,7 +29681,7 @@ "name": "RivRetrieve", "version": "0.1.5", "sha256": "1lrm5rmnn9wk5r1xfmlnhgfwjz1s0kyck9iy71fc01d2b37lh6wz", - "depends": ["BBmisc", "dataRetrieval", "devtools", "dplyr", "httr", "jsonlite", "lubridate", "readr", "rlang", "rlist", "RSelenium", "rvest", "stringr", "tibble", "tidyhydat", "tidyr"] + "depends": ["BBmisc", "RSelenium", "dataRetrieval", "devtools", "dplyr", "httr", "jsonlite", "lubridate", "readr", "rlang", "rlist", "rvest", "stringr", "tibble", "tidyhydat", "tidyr"] }, "RiverBuilder": { "name": "RiverBuilder", @@ -29403,15 +29709,15 @@ }, "Rlabkey": { "name": "Rlabkey", - "version": "3.2.2", - "sha256": "1s7j9vcy0mb358wk0rdc73g94i1xpi3cwxw33gsw0cvga4pmhk6s", - "depends": ["httr", "jsonlite", "Rcpp"] + "version": "3.2.3", + "sha256": "17z9fk89wj81z3cfs1g545im87191jbkh4ka849nra51dpdq4zmi", + "depends": ["Rcpp", "httr", "jsonlite"] }, "Rlgt": { "name": "Rlgt", - "version": "0.2-1", - "sha256": "0hrqishf056d8nivm2rya2xxpdzmn69ajnxdp9w39fhdfjhzv90p", - "depends": ["BH", "forecast", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "sn", "StanHeaders", "truncnorm"] + "version": "0.2-2", + "sha256": "1c23flwrw2b361dgjms3h5407w3ll98gsbsy0nmi3000wza5xdzz", + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "forecast", "rstan", "rstantools", "sn", "truncnorm"] }, "Rlibeemd": { "name": "Rlibeemd", @@ -29423,13 +29729,13 @@ "name": "Rlibkdv", "version": "1.1", "sha256": "1lcmnc50bfnrnw03bs3lsxdsj2n3qylfw51w6kvnz9x1qmr9p54p", - "depends": ["leaflet", "magrittr", "raster", "Rcpp", "sf"] + "depends": ["Rcpp", "leaflet", "magrittr", "raster", "sf"] }, "Rlinkedin": { "name": "Rlinkedin", "version": "0.2", "sha256": "15sbiis1d0s466nqk1adjhflb01sb9kn25f4y6sagkdggvyz6b56", - "depends": ["httpuv", "httr", "XML"] + "depends": ["XML", "httpuv", "httr"] }, "Rlinsolve": { "name": "Rlinsolve", @@ -29519,7 +29825,7 @@ "name": "Rmst", "version": "0.0.3", "sha256": "1fykpii17k460qlsjhhh5vag02lhkyk5l3zjmg8hifqp0cjhz2fl", - "depends": ["ggplot2", "Rata", "reshape2", "Rirt"] + "depends": ["Rata", "Rirt", "ggplot2", "reshape2"] }, "Rnanoflann": { "name": "Rnanoflann", @@ -29537,7 +29843,7 @@ "name": "Rnest", "version": "0.0.0.1", "sha256": "0fj1a1qsc8v238nv1dsrdw1398ah3qpf5dgimdgipkznb5dnjjc7", - "depends": ["crayon", "EFA_MRFA", "fungible", "ggplot2", "MASS", "scales"] + "depends": ["EFA_MRFA", "MASS", "crayon", "fungible", "ggplot2", "scales"] }, "Rnightly": { "name": "Rnightly", @@ -29549,7 +29855,7 @@ "name": "Rnmr1D", "version": "1.3.2", "sha256": "0apkwrsxcp2frq9lmfn70dn2ajaiswnbvfjmqc7lbrimya3pwznb", - "depends": ["base64enc", "doParallel", "foreach", "ggplot2", "igraph", "impute", "MASS", "MassSpecWavelet", "Matrix", "minqa", "plotly", "plyr", "ptw", "Rcpp", "scales", "signal", "XML"] + "depends": ["MASS", "MassSpecWavelet", "Matrix", "Rcpp", "XML", "base64enc", "doParallel", "foreach", "ggplot2", "igraph", "impute", "minqa", "plotly", "plyr", "ptw", "scales", "signal"] }, "Rnumerai": { "name": "Rnumerai", @@ -29567,25 +29873,25 @@ "name": "RoBMA", "version": "3.1.0", "sha256": "0cq1hjm49sj4lnzvninf6wlpm0p0rbw3mk6sa36167b6snr6rra2", - "depends": ["BayesTools", "ggplot2", "mvtnorm", "Rdpack", "rjags", "rlang", "runjags", "scales"] + "depends": ["BayesTools", "Rdpack", "ggplot2", "mvtnorm", "rjags", "rlang", "runjags", "scales"] }, "RoBSA": { "name": "RoBSA", "version": "1.0.2", "sha256": "1hk4pdkgqjqhn7wxzzgw1f1rz4kk3gri7wispzz0m3nxk7bksw6b", - "depends": ["BayesTools", "coda", "Rdpack", "rjags", "rlang", "runjags", "scales", "survival"] + "depends": ["BayesTools", "Rdpack", "coda", "rjags", "rlang", "runjags", "scales", "survival"] }, "RoBTT": { "name": "RoBTT", "version": "1.3.0", "sha256": "00yrl6l6pz1y8j5qwhvwg84lcxvisp578i9fsd3iv9f3hfhsw9nh", - "depends": ["BayesTools", "BH", "bridgesampling", "ggplot2", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "BayesTools", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "bridgesampling", "ggplot2", "rstan", "rstantools"] }, "RobAStBase": { "name": "RobAStBase", "version": "1.2.5", "sha256": "16sl3nlb1cl3xyski05l0qhrl23w615sbdmvnnzxnkva6sppxqcx", - "depends": ["distr", "distrEx", "distrMod", "RandVar", "rrcov", "startupmsg"] + "depends": ["RandVar", "distr", "distrEx", "distrMod", "rrcov", "startupmsg"] }, "RobAStRDA": { "name": "RobAStRDA", @@ -29597,37 +29903,37 @@ "name": "RobExtremes", "version": "1.3.0", "sha256": "0dziaykrnhy8ijbq0pxwl5p9xjlbz3kxkmwl3s21kmjnv7nm8sx4", - "depends": ["actuar", "distr", "distrEx", "distrMod", "evd", "RandVar", "RobAStBase", "RobAStRDA", "robustbase", "ROptEst", "startupmsg"] + "depends": ["ROptEst", "RandVar", "RobAStBase", "RobAStRDA", "actuar", "distr", "distrEx", "distrMod", "evd", "robustbase", "startupmsg"] }, "RobGARCHBoot": { "name": "RobGARCHBoot", "version": "1.2.0", "sha256": "142r6cmzwhg4xfbpbgrvngncm2wczly2arg6p8612ypjsk4yinrf", - "depends": ["doParallel", "doRNG", "foreach", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "doRNG", "foreach"] }, "RobKF": { "name": "RobKF", "version": "1.0.2", "sha256": "0jmc11s9gl4fin4p6wwd79m3zqbr65p1x8h69qcxmx4cy9af54kq", - "depends": ["ggplot2", "Matrix", "Rcpp", "RcppEigen", "Rdpack", "reshape2"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "Rdpack", "ggplot2", "reshape2"] }, "RobLox": { "name": "RobLox", "version": "1.2.1", "sha256": "0dc1hrzx63wv85djzivzimzkjj4ywilm3xm5kmqlmrkfpzsm9qs2", - "depends": ["Biobase", "distr", "distrMod", "lattice", "RandVar", "RColorBrewer", "RobAStBase"] + "depends": ["Biobase", "RColorBrewer", "RandVar", "RobAStBase", "distr", "distrMod", "lattice"] }, "RobLoxBioC": { "name": "RobLoxBioC", "version": "1.2.2", "sha256": "1fhf5svfb1sf792aj9xydaj8r9d99ia68b9n5g4nha1ia8jcixwl", - "depends": ["affy", "AnnotationDbi", "beadarray", "Biobase", "BiocGenerics", "distr", "distrMod", "lattice", "RColorBrewer", "RobLox"] + "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "RColorBrewer", "RobLox", "affy", "beadarray", "distr", "distrMod", "lattice"] }, "RobMixReg": { "name": "RobMixReg", "version": "1.1.0", "sha256": "13w6zvncwh561wzzqy548x0w25rnzf0pfvi5cc6mzn71x5l7cmh2", - "depends": ["dplyr", "flexmix", "glmnet", "gplots", "gtools", "lars", "MASS", "RColorBrewer", "rlang", "robust", "robustbase", "scales"] + "depends": ["MASS", "RColorBrewer", "dplyr", "flexmix", "glmnet", "gplots", "gtools", "lars", "rlang", "robust", "robustbase", "scales"] }, "RobPer": { "name": "RobPer", @@ -29639,7 +29945,7 @@ "name": "RobRegression", "version": "0.1.0", "sha256": "11mlxqvrlf8wlmwa44jcp3rxac7yykwa1n0fsmn861zl9b4969y8", - "depends": ["capushe", "DescTools", "doParallel", "fastmatrix", "foreach", "KneeArrower", "mvtnorm", "Rcpp", "RcppArmadillo", "RSpectra"] + "depends": ["DescTools", "KneeArrower", "RSpectra", "Rcpp", "RcppArmadillo", "capushe", "doParallel", "fastmatrix", "foreach", "mvtnorm"] }, "RobStatTM": { "name": "RobStatTM", @@ -29651,7 +29957,7 @@ "name": "RobinCar", "version": "0.3.0", "sha256": "0pyp73fk871ka85ci2il7cmb2g7cqrj7c53k73x5yr1kp51srxb0", - "depends": ["AIPW", "broom", "data_table", "dplyr", "emulator", "fastDummies", "magrittr", "MASS", "numDeriv", "rlang", "SuperLearner", "survival", "tidyr", "tidyverse"] + "depends": ["AIPW", "MASS", "SuperLearner", "broom", "data_table", "dplyr", "emulator", "fastDummies", "magrittr", "numDeriv", "rlang", "survival", "tidyr", "tidyverse"] }, "RobinHood": { "name": "RobinHood", @@ -29669,7 +29975,7 @@ "name": "RobustANOVA", "version": "0.3.0", "sha256": "1kpvahxipcmsqk6mv2zagcvw0glmsj0xkpf6f3gjnckin6mxnjyv", - "depends": ["optimbase", "PEIP"] + "depends": ["PEIP", "optimbase"] }, "RobustBF": { "name": "RobustBF", @@ -29687,19 +29993,19 @@ "name": "RobustCalibration", "version": "0.5.5", "sha256": "0ilbj88bgjymyyn7jh7dnxhhba7xrmpsnhkwr1cr53zd9rpywfdf", - "depends": ["nloptr", "Rcpp", "RcppEigen", "RobustGaSP"] + "depends": ["Rcpp", "RcppEigen", "RobustGaSP", "nloptr"] }, "RobustGaSP": { "name": "RobustGaSP", "version": "0.6.6", "sha256": "1pcy0n4krshjw9c4g41m7487qydrjbh45yqg77i74s5bvwd47fnp", - "depends": ["nloptr", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "nloptr"] }, "RobustIV": { "name": "RobustIV", "version": "0.2.5", "sha256": "1iz5g0ynkx38vdsf7rm8haai7a8igw3rdqrgxllahnbykwhm4d51", - "depends": ["CVXR", "glmnet", "igraph", "intervals", "MASS", "Matrix"] + "depends": ["CVXR", "MASS", "Matrix", "glmnet", "igraph", "intervals"] }, "RobustLinearReg": { "name": "RobustLinearReg", @@ -29715,8 +30021,8 @@ }, "Robyn": { "name": "Robyn", - "version": "3.10.3", - "sha256": "1nsicscgdp85mhvwb3i6liqhvkszj5x3z6rhm6v3vq7mfxwfn7rf", + "version": "3.11.1", + "sha256": "0bcam3ki00s4rn1jyny7n9azandpl72b4w6gm1s50iivx17w6km2", "depends": ["doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "ggridges", "glmnet", "jsonlite", "lares", "lubridate", "minpack_lm", "nloptr", "patchwork", "prophet", "reticulate", "stringr", "tidyr"] }, "RockFab": { @@ -29729,7 +30035,7 @@ "name": "Rogue", "version": "2.1.6", "sha256": "0wbgl9dj2lr5ffn27q6q06n45vj9lm9qxx07dvd37jniqjxz71v4", - "depends": ["ape", "cli", "fastmatch", "matrixStats", "Rdpack", "Rfast", "TreeDist", "TreeTools"] + "depends": ["Rdpack", "Rfast", "TreeDist", "TreeTools", "ape", "cli", "fastmatch", "matrixStats"] }, "RolWinMulCor": { "name": "RolWinMulCor", @@ -29747,7 +30053,7 @@ "name": "RonFHIR", "version": "0.4.0", "sha256": "1ajpgpp300m0zzqzzwsn8sfy8x751hrr8py9n9xvzjmkgyrh4hhw", - "depends": ["httr", "jsonlite", "R6", "stringr"] + "depends": ["R6", "httr", "jsonlite", "stringr"] }, "Rook": { "name": "Rook", @@ -29789,7 +30095,7 @@ "name": "Routliers", "version": "0.0.0.3", "sha256": "1yrzl3gqh7xkclqdqjwy4yn7qawixpb9mzw31a6wxnrr09hzv989", - "depends": ["ggplot2", "MASS"] + "depends": ["MASS", "ggplot2"] }, "Rpadrino": { "name": "Rpadrino", @@ -29813,7 +30119,7 @@ "name": "Rphylopars", "version": "0.3.10", "sha256": "081sirrrqs42hvap4scwba3g8ciyqss11g8xipzqk96a9wfqcdf6", - "depends": ["ape", "doBy", "MASS", "Matrix", "numDeriv", "phylolm", "phytools", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "ape", "doBy", "numDeriv", "phylolm", "phytools"] }, "Rpoet": { "name": "Rpoet", @@ -29825,37 +30131,37 @@ "name": "Rpolyhedra", "version": "0.5.4", "sha256": "00wmxk8j89lyzbb7fws4g8znnqbw5dh64vqhxjg5rxjdpr3vibl8", - "depends": ["digest", "geometry", "git2r", "lgr", "R6", "rgl", "stringr", "XML"] + "depends": ["R6", "XML", "digest", "geometry", "git2r", "lgr", "rgl", "stringr"] }, "Rpoppler": { "name": "Rpoppler", - "version": "0.1-2", - "sha256": "11m3vw1an91567nf72vz2cbm520vbh6h4dmfzbrxbw24qy3y58x3", + "version": "0.1-3", + "sha256": "1nyl3zcn5664hbzcqi4r86d9imbviwis9amj1kxb2fcx70n0pr9s", "depends": [] }, "RprobitB": { "name": "RprobitB", "version": "1.1.4", "sha256": "0345cq3kjkhlbykwqzdjagixjdlw6a0ipckchky1hfm8kb4nkyzy", - "depends": ["checkmate", "cli", "crayon", "doSNOW", "foreach", "ggplot2", "gridExtra", "MASS", "mixtools", "mvtnorm", "oeli", "plotROC", "progress", "Rcpp", "RcppArmadillo", "Rdpack", "rlang", "viridis"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rdpack", "checkmate", "cli", "crayon", "doSNOW", "foreach", "ggplot2", "gridExtra", "mixtools", "mvtnorm", "oeli", "plotROC", "progress", "rlang", "viridis"] }, "Rprofet": { "name": "Rprofet", "version": "3.1.1", "sha256": "1czz920hw18afvyjm8fm9r4dzmini1qniyhsvx949qr74aj1gmal", - "depends": ["binr", "ClustOfVar", "corrplot", "dplyr", "ggplot2", "gridExtra", "kableExtra", "plyr", "purrr", "reshape2", "ROCit", "sqldf", "stringr"] + "depends": ["ClustOfVar", "ROCit", "binr", "corrplot", "dplyr", "ggplot2", "gridExtra", "kableExtra", "plyr", "purrr", "reshape2", "sqldf", "stringr"] }, "Rquake": { "name": "Rquake", "version": "2.5-1", "sha256": "0kd8ghclfz81c5lgj4fc06lgkniksch7xi6fmj1ydn2i35k0ji6l", - "depends": ["GEOmap", "MBA", "minpack_lm", "RPMG", "RSEIS"] + "depends": ["GEOmap", "MBA", "RPMG", "RSEIS", "minpack_lm"] }, "Rquefts": { "name": "Rquefts", "version": "1.2-3", "sha256": "14p9g0bqkaslr3164a58crhj024xphp9ig24mvs2ad8vxvf1gsf0", - "depends": ["meteor", "Rcpp"] + "depends": ["Rcpp", "meteor"] }, "Rramas": { "name": "Rramas", @@ -29863,12 +30169,6 @@ "sha256": "16aapvz9j81lvi5ryj41bvn3wf51b0gynnzs0jpvva4m3mvzw6an", "depends": ["diagram"] }, - "Rraven": { - "name": "Rraven", - "version": "1.0.13", - "sha256": "0nlqr1hzbzbz4rb3hjy01iw8czhaqvwmy9hh728fgl5vajwqwn8g", - "depends": ["NatureSounds", "pbapply", "seewave", "tuneR", "warbleR"] - }, "Rrdap": { "name": "Rrdap", "version": "1.0.7", @@ -29927,13 +30227,13 @@ "name": "RsimMosaic", "version": "1.0.3", "sha256": "0jlzrs9xxlpazvq3iw8znk0bd00bzlry7bgxsxq7xl23akizj0ji", - "depends": ["fields", "jpeg", "RANN"] + "depends": ["RANN", "fields", "jpeg"] }, "Rsmlx": { "name": "Rsmlx", "version": "2024.1.0", "sha256": "1y4pgyk0njvlgbxm0hncxjjkrfb1b10c5k7hdy4zmryz3421677j", - "depends": ["dplyr", "ggplot2", "gridExtra", "MASS", "tidyr"] + "depends": ["MASS", "dplyr", "ggplot2", "gridExtra", "tidyr"] }, "Rsolnp": { "name": "Rsolnp", @@ -29945,7 +30245,7 @@ "name": "Rsomoclu", "version": "1.7.6", "sha256": "1jbi4nib0a749k7vkqzhdb5l2jipxq9k8vi5x7i06qns8sb3ajil", - "depends": ["kohonen", "Rcpp"] + "depends": ["Rcpp", "kohonen"] }, "Rspc": { "name": "Rspc", @@ -30017,13 +30317,19 @@ "name": "Rtrack", "version": "2.0.3", "sha256": "0aq4487vj0c9hcq1vgqcyjr3pzyjx4w008x8lrhimjvsqxd5vngd", - "depends": ["crayon", "Hmisc", "KernSmooth", "openxlsx", "pbapply", "randomForest", "RCurl", "readxl", "rjson", "scales", "stringi", "terra", "zip"] + "depends": ["Hmisc", "KernSmooth", "RCurl", "crayon", "openxlsx", "pbapply", "randomForest", "readxl", "rjson", "scales", "stringi", "terra", "zip"] }, "Rtropical": { "name": "Rtropical", "version": "1.2.1", "sha256": "1r4585z1fna9s8whaq1w0drndg9cpqmrmqylj3m2ahfppb0xr3ic", - "depends": ["ape", "caret", "lpSolve", "lpSolveAPI", "RcppAlgos", "Rfast"] + "depends": ["RcppAlgos", "Rfast", "ape", "caret", "lpSolve", "lpSolveAPI"] + }, + "RtsEva": { + "name": "RtsEva", + "version": "1.0.0", + "sha256": "0bnpplsyc4k4gs5gh2hxr4597xqsfpd9kvkfhp7s802xby4hqnia", + "depends": ["POT", "changepoint", "dplyr", "evd", "ggplot2", "lubridate", "moments", "pracma", "rlang", "scales", "texmex", "tsibble", "xts"] }, "Rtsne": { "name": "Rtsne", @@ -30063,14 +30369,14 @@ }, "Rvcg": { "name": "Rvcg", - "version": "0.22.2", - "sha256": "077p4c16nqi6ayxv1i31cr6sw9fwnxpmfkmrrhzh02khpi2c2jg5", + "version": "0.23", + "sha256": "0jdhl769r99g0x9kaf1cymzjd96z2pdnha7wyy221q3w3iy81whz", "depends": ["Rcpp", "RcppArmadillo", "RcppEigen"] }, "Rveg": { "name": "Rveg", - "version": "0.1.4", - "sha256": "1a4cb19gvq1lm2v918pskpfpxl4xqb06hm08wacv7gj4wyvj7adi", + "version": "0.1.5", + "sha256": "0avnsbddsls55q9c2cbfy103yxrkay7812a2wfij27y9s7p66v3x", "depends": ["dplyr"] }, "Rwave": { @@ -30083,7 +30389,7 @@ "name": "Rwclust", "version": "0.1.0", "sha256": "0c7q2i9n22sqj3wq9m0j49y5h14848myjbixrdkic8lvv91dm438", - "depends": ["checkmate", "Matrix"] + "depends": ["Matrix", "checkmate"] }, "RweaveExtra": { "name": "RweaveExtra", @@ -30101,7 +30407,7 @@ "name": "Rwofost", "version": "0.8-3", "sha256": "1x6ia49xrdqcxilq12g47gd00smm5jdrq7xavndd3dcnvl1nqk1y", - "depends": ["meteor", "Rcpp"] + "depends": ["Rcpp", "meteor"] }, "Rwtss": { "name": "Rwtss", @@ -30113,13 +30419,13 @@ "name": "RxnSim", "version": "1.0.4", "sha256": "1cpbrqr5gx84ny0kk7y5h5awynf5mvwsavyfmg5gg539xh55pnkk", - "depends": ["data_table", "fingerprint", "rcdk", "rJava"] + "depends": ["data_table", "fingerprint", "rJava", "rcdk"] }, "Ryacas": { "name": "Ryacas", "version": "1.1.5", "sha256": "1g43rm492is2rkhjn7dv40qdmx70321sp2z7cigqfh6ffwcgbz9y", - "depends": ["magrittr", "Rcpp"] + "depends": ["Rcpp", "magrittr"] }, "Ryacas0": { "name": "Ryacas0", @@ -30137,7 +30443,7 @@ "name": "SACCR", "version": "3.2", "sha256": "1sp8hjpwzyczj85saps6a6yw30yh5098ig2xmlf79jvzv86nqgn1", - "depends": ["data_tree", "jsonlite", "Trading"] + "depends": ["Trading", "data_tree", "jsonlite"] }, "SADEG": { "name": "SADEG", @@ -30161,7 +30467,7 @@ "name": "SAFARI", "version": "0.1.0", "sha256": "10fmav9dbq5kbgy8gjsp3561vi46bjvkh2wqjs39vx5z8x1ml7i3", - "depends": ["caTools", "EBImage", "lattice", "png"] + "depends": ["EBImage", "caTools", "lattice", "png"] }, "SAFD": { "name": "SAFD", @@ -30173,13 +30479,13 @@ "name": "SAGM", "version": "1.0.0", "sha256": "10hxj5ic7mq6wzpqizkxyqc165dmpc2wqc9naf6b9r560pk52hv6", - "depends": ["fastmatrix", "GIGrvg", "mvtnorm"] + "depends": ["GIGrvg", "fastmatrix", "mvtnorm"] }, "SAGMM": { "name": "SAGMM", "version": "0.2.4", "sha256": "18ig7ncmrfs5cyc28xpbqk9zjhwqfp7gwix7y2v1j4j2wbdc2hzs", - "depends": ["lowmemtkmeans", "mclust", "MixSim", "Rcpp", "RcppArmadillo"] + "depends": ["MixSim", "Rcpp", "RcppArmadillo", "lowmemtkmeans", "mclust"] }, "SALES": { "name": "SALES", @@ -30215,7 +30521,7 @@ "name": "SAMGEP", "version": "0.1.0-1", "sha256": "01f460vk60sl3f9cg2pqcpi5r2rayjhgsp73w1ik1g4rhrs4bl9s", - "depends": ["abind", "doParallel", "foreach", "mvtnorm", "nlme", "nloptr", "pROC", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "abind", "doParallel", "foreach", "mvtnorm", "nlme", "nloptr", "pROC"] }, "SAMTx": { "name": "SAMTx", @@ -30233,13 +30539,13 @@ "name": "SAMprior", "version": "1.1.1", "sha256": "1xp3wvgjp9252l8w42fsr61bh6ggs3b21df182rw3irh2ijn1mc0", - "depends": ["assertthat", "checkmate", "ggplot2", "Metrics", "RBesT"] + "depends": ["Metrics", "RBesT", "assertthat", "checkmate", "ggplot2"] }, "SAMtool": { "name": "SAMtool", "version": "1.6.4", "sha256": "187j6i0giq45mgg1bb33ssiryipdk7ahc8jpimij3icxy9v73d4b", - "depends": ["abind", "dplyr", "gplots", "MSEtool", "pbapply", "RcppEigen", "rmarkdown", "snowfall", "TMB", "vars"] + "depends": ["MSEtool", "RcppEigen", "TMB", "abind", "dplyr", "gplots", "pbapply", "rmarkdown", "snowfall", "vars"] }, "SANple": { "name": "SANple", @@ -30251,7 +30557,7 @@ "name": "SANvi", "version": "0.1.1", "sha256": "17sb8gq4nnjn0zqgdi7xs749i8f46gswkmj0skh89hlq5m3kvrv4", - "depends": ["matrixStats", "RColorBrewer", "Rcpp", "RcppArmadillo", "scales"] + "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "matrixStats", "scales"] }, "SAP": { "name": "SAP", @@ -30269,7 +30575,7 @@ "name": "SAR", "version": "1.0.3", "sha256": "1cnf0hsq82lzssvz5xs2abvnrjxda0g6mjx70a1j223zdwjqmw64", - "depends": ["AzureRMR", "AzureStor", "dplyr", "httr", "jsonlite", "Matrix", "R6", "Rcpp", "RcppArmadillo", "RcppParallel"] + "depends": ["AzureRMR", "AzureStor", "Matrix", "R6", "Rcpp", "RcppArmadillo", "RcppParallel", "dplyr", "httr", "jsonlite"] }, "SARP_compo": { "name": "SARP.compo", @@ -30311,13 +30617,13 @@ "name": "SAVER", "version": "1.1.2", "sha256": "1s1kw8idkaj7j90fw4qn9k0wd4vz0sblsk06ry6lm4afcar0p158", - "depends": ["doParallel", "foreach", "glmnet", "iterators", "Matrix"] + "depends": ["Matrix", "doParallel", "foreach", "glmnet", "iterators"] }, "SAiVE": { "name": "SAiVE", "version": "1.0.6", "sha256": "08f6icmr4x6kn0d7r98v9cmjqbfqgp1hzya68bl8p9fzfkjnmg4k", - "depends": ["caret", "crayon", "doParallel", "proxy", "rlang", "terra", "VSURF"] + "depends": ["VSURF", "caret", "crayon", "doParallel", "proxy", "rlang", "terra"] }, "SAutomata": { "name": "SAutomata", @@ -30329,13 +30635,13 @@ "name": "SBAGM", "version": "0.1.0", "sha256": "0vb1679016b0bhz2xlka9wgr2fxwa0447ymfncm1n5fks60rrnnf", - "depends": ["forecast", "MSGARCH", "rugarch"] + "depends": ["MSGARCH", "forecast", "rugarch"] }, "SBCK": { "name": "SBCK", "version": "1.0.0", "sha256": "1z5svxa639245jmv3bsikmbch8j4j51d7rjwhj62zcaxhb3ykhcs", - "depends": ["R6", "Rcpp", "RcppEigen", "ROOPSD", "transport"] + "depends": ["R6", "ROOPSD", "Rcpp", "RcppEigen", "transport"] }, "SBI": { "name": "SBI", @@ -30347,7 +30653,7 @@ "name": "SBICgraph", "version": "1.0.0", "sha256": "04c9xb9fdxz62qdsfkdkckvfpccrc7n5j3j5v1lgjywxq6l78wsm", - "depends": ["glmnet", "MASS", "network"] + "depends": ["MASS", "glmnet", "network"] }, "SBMSplitMerge": { "name": "SBMSplitMerge", @@ -30377,13 +30683,13 @@ "name": "SBmedian", "version": "0.1.1", "sha256": "1pxwsp6z1qvhmzprhr8f8i1id5zy4ppq7dxbd6ny2h1r1zvy16xm", - "depends": ["expm", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "expm"] }, "SC_MEB": { "name": "SC.MEB", "version": "1.1", "sha256": "04vv1ckirfmjvb3hfk3ldma96j4c6ykjgf77f13n550cvp2bhp3w", - "depends": ["BiocSingular", "ggplot2", "Matrix", "mclust", "purrr", "Rcpp", "RcppArmadillo", "S4Vectors", "scater", "scran", "SingleCellExperiment", "SummarizedExperiment"] + "depends": ["BiocSingular", "Matrix", "Rcpp", "RcppArmadillo", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "mclust", "purrr", "scater", "scran"] }, "SC2API": { "name": "SC2API", @@ -30401,7 +30707,7 @@ "name": "SCBmeanfd", "version": "1.2.2", "sha256": "045498q71zqgcg8p3665vwd99a8ybf21y0sa7y8316zw66wb1caz", - "depends": ["boot", "KernSmooth"] + "depends": ["KernSmooth", "boot"] }, "SCCI": { "name": "SCCI", @@ -30413,13 +30719,13 @@ "name": "SCCS", "version": "1.7", "sha256": "0cx7xw15pwkk2nza8ng4ic6mq07vgf5idcclkwdyp3ry5j3rqnvl", - "depends": ["corpcor", "fda", "gnm", "R_methodsS3", "survival"] + "depends": ["R_methodsS3", "corpcor", "fda", "gnm", "survival"] }, "SCDB": { "name": "SCDB", "version": "0.4.0", "sha256": "0n6vmn7jjl8lp5yf53kxh2d3660sbwjnl7chiv4x7dkidi81lfnr", - "depends": ["checkmate", "DBI", "dbplyr", "dplyr", "glue", "lifecycle", "openssl", "parallelly", "purrr", "R6", "rlang", "stringr", "tidyr", "tidyselect"] + "depends": ["DBI", "R6", "checkmate", "dbplyr", "dplyr", "glue", "lifecycle", "openssl", "parallelly", "purrr", "rlang", "stringr", "tidyr", "tidyselect"] }, "SCEM": { "name": "SCEM", @@ -30449,7 +30755,7 @@ "name": "SCGLR", "version": "3.0", "sha256": "10hsvcjgsycap6wkp06snp2zab1ppsp78kyncpbjnm3vp84qm0nz", - "depends": ["ade4", "expm", "Formula", "ggplot2", "Matrix", "pROC"] + "depends": ["Formula", "Matrix", "ade4", "expm", "ggplot2", "pROC"] }, "SCI": { "name": "SCI", @@ -30467,7 +30773,13 @@ "name": "SCINA", "version": "1.2.0", "sha256": "1gv9widjwvk5j535r1zx6f41ylpa2r4168ya580llgblx85z402d", - "depends": ["gplots", "MASS"] + "depends": ["MASS", "gplots"] + }, + "SCIntRuler": { + "name": "SCIntRuler", + "version": "0.99.6", + "sha256": "1ap23iighbx1x3blfh0b9srgk5mzinl3gy0addfwd6i40a160brp", + "depends": ["Matrix", "MatrixGenerics", "Rcpp", "Seurat", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "batchelor", "coin", "cowplot", "dplyr", "ggplot2", "gridExtra", "harmony", "magrittr"] }, "SCMA": { "name": "SCMA", @@ -30491,19 +30803,19 @@ "name": "SCORNET", "version": "0.1.1", "sha256": "13aibikvrc3ril4gqki4fk4y7ha85bniqabmaifzbr1dw5xy2wxm", - "depends": ["doParallel", "foreach", "Matrix", "pracma", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "pracma", "survival"] }, "SCORPION": { "name": "SCORPION", "version": "1.0.2", "sha256": "0bkhg3y7irbigy14l9a747032ljhssvgcj1gdqs07p76k0x6fv5y", - "depends": ["cli", "igraph", "irlba", "Matrix", "pbapply", "RANN", "RhpcBLASctl"] + "depends": ["Matrix", "RANN", "RhpcBLASctl", "cli", "igraph", "irlba", "pbapply"] }, "SCORPIUS": { "name": "SCORPIUS", "version": "1.0.9", "sha256": "0i464i6fbxxcrvc48ajmz7i75sqfwizjypbbmc0mmj0dgmnxgby9", - "depends": ["dplyr", "dynutils", "dynwrap", "ggplot2", "lmds", "MASS", "Matrix", "mclust", "pbapply", "pheatmap", "princurve", "purrr", "ranger", "RANN", "RColorBrewer", "reshape2", "tidyr", "TSP"] + "depends": ["MASS", "Matrix", "RANN", "RColorBrewer", "TSP", "dplyr", "dynutils", "dynwrap", "ggplot2", "lmds", "mclust", "pbapply", "pheatmap", "princurve", "purrr", "ranger", "reshape2", "tidyr"] }, "SCOUTer": { "name": "SCOUTer", @@ -30515,7 +30827,7 @@ "name": "SCRIP", "version": "1.0.0", "sha256": "1cv8443y2s67q3krsyj7r2d1vqv01w8xr0iz8dz4kijmhksyg7ng", - "depends": ["BiocGenerics", "BiocManager", "checkmate", "crayon", "edgeR", "fitdistrplus", "knitr", "mgcv", "S4Vectors", "Seurat", "SingleCellExperiment", "splatter", "SummarizedExperiment"] + "depends": ["BiocGenerics", "BiocManager", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "checkmate", "crayon", "edgeR", "fitdistrplus", "knitr", "mgcv", "splatter"] }, "SCRT": { "name": "SCRT", @@ -30533,7 +30845,7 @@ "name": "SCdeconR", "version": "1.0.0", "sha256": "0wp7l226hw75jgi9j7n4c2f0nxlrmi3z3iv5wi5vhflvndgr95ym", - "depends": ["Biobase", "data_table", "dplyr", "edgeR", "foreach", "ggplot2", "glmGamPoi", "gtools", "harmony", "MASS", "Matrix", "mgcv", "NMF", "reshape2", "Seurat"] + "depends": ["Biobase", "MASS", "Matrix", "NMF", "Seurat", "data_table", "dplyr", "edgeR", "foreach", "ggplot2", "glmGamPoi", "gtools", "harmony", "mgcv", "reshape2"] }, "SCperf": { "name": "SCperf", @@ -30551,7 +30863,7 @@ "name": "SCtools", "version": "0.3.3", "sha256": "0mwpia145swzqgxfh0h6fzmd1v5jxwigbw2rqm4rmla60yapn5hz", - "depends": ["cvTools", "dplyr", "furrr", "future", "ggplot2", "magrittr", "purrr", "stringr", "Synth", "tidyr"] + "depends": ["Synth", "cvTools", "dplyr", "furrr", "future", "ggplot2", "magrittr", "purrr", "stringr", "tidyr"] }, "SDAR": { "name": "SDAR", @@ -30569,7 +30881,7 @@ "name": "SDCNway", "version": "1.0.1", "sha256": "0zmjc3xh4qvwyrq4ma2k6q08f4ny4iqnl5a640pj17jk8awzwbg0", - "depends": ["dplyr", "ggplot2", "MASS", "plyr", "Rdpack"] + "depends": ["MASS", "Rdpack", "dplyr", "ggplot2", "plyr"] }, "SDEFSR": { "name": "SDEFSR", @@ -30593,13 +30905,13 @@ "name": "SDMtune", "version": "1.3.1", "sha256": "0zzra0vig3gyz3b0h66fdlkpl2ii939d7k6p7ym5mzhz1vqdaljz", - "depends": ["cli", "dismo", "gbm", "ggplot2", "jsonlite", "maxnet", "nnet", "randomForest", "Rcpp", "rlang", "rstudioapi", "stringr", "terra", "whisker"] + "depends": ["Rcpp", "cli", "dismo", "gbm", "ggplot2", "jsonlite", "maxnet", "nnet", "randomForest", "rlang", "rstudioapi", "stringr", "terra", "whisker"] }, "SDPDmod": { "name": "SDPDmod", "version": "0.0.5", "sha256": "1f136nb32y3lnnhyri03y8p5akc2c06g9rynx53w702fyi72bgy6", - "depends": ["Matrix", "plm", "RSpectra", "sf", "sp", "spdep"] + "depends": ["Matrix", "RSpectra", "plm", "sf", "sp", "spdep"] }, "SDPrism2D": { "name": "SDPrism2D", @@ -30629,7 +30941,7 @@ "name": "SEA", "version": "2.0.1", "sha256": "03iqvs95v2q252dl62z39i0nwg8n44g1p9ljbmb1nx6zq98fd7bw", - "depends": ["data_table", "doParallel", "foreach", "KScorrect", "MASS", "shiny"] + "depends": ["KScorrect", "MASS", "data_table", "doParallel", "foreach", "shiny"] }, "SEAGLE": { "name": "SEAGLE", @@ -30641,7 +30953,7 @@ "name": "SEAHORS", "version": "1.8.0", "sha256": "172wqna58sfmdaparvy14nva8lsflvsz55ndkd2ficfmp28qqp6n", - "depends": ["dplyr", "DT", "ggplot2", "gridExtra", "htmlwidgets", "MASS", "plotly", "raster", "readxl", "rmarkdown", "shiny", "shinyjs", "shinythemes", "shinyWidgets", "stringr", "viridis"] + "depends": ["DT", "MASS", "dplyr", "ggplot2", "gridExtra", "htmlwidgets", "plotly", "raster", "readxl", "rmarkdown", "shiny", "shinyWidgets", "shinyjs", "shinythemes", "stringr", "viridis"] }, "SEARS": { "name": "SEARS", @@ -30653,7 +30965,7 @@ "name": "SECFISH", "version": "0.1.7", "sha256": "0yd9k6anz9g4psg5kh1bhp0lr1i4y7in1m0mxk4qp14nl1zqy4fy", - "depends": ["ggplot2", "Hmisc", "optimization"] + "depends": ["Hmisc", "ggplot2", "optimization"] }, "SECP": { "name": "SECP", @@ -30665,7 +30977,7 @@ "name": "SEERaBomb", "version": "2019.2", "sha256": "0rlah68jbaw4qbqq5rnlrm6m9ckz7igbsay6iq1yvk4gy24p9bfh", - "depends": ["DBI", "demography", "dplyr", "forcats", "ggplot2", "labelled", "LaF", "mgcv", "openxlsx", "plyr", "purrr", "Rcpp", "readr", "reshape2", "rgl", "RSQLite", "scales", "stringr", "survival", "tibble", "tidyr", "WriteXLS"] + "depends": ["DBI", "LaF", "RSQLite", "Rcpp", "WriteXLS", "demography", "dplyr", "forcats", "ggplot2", "labelled", "mgcv", "openxlsx", "plyr", "purrr", "readr", "reshape2", "rgl", "scales", "stringr", "survival", "tibble", "tidyr"] }, "SEI": { "name": "SEI", @@ -30677,7 +30989,7 @@ "name": "SEIRfansy", "version": "1.1.1", "sha256": "0xnyrsv04n22s71v1wajwpccwk78q27fgry9dhxxzw8a6yd082x8", - "depends": ["arm", "DescTools", "dplyr", "ggplot2", "ggpubr", "knitr", "magrittr", "patchwork", "pbapply", "rlang", "scales"] + "depends": ["DescTools", "arm", "dplyr", "ggplot2", "ggpubr", "knitr", "magrittr", "patchwork", "pbapply", "rlang", "scales"] }, "SEL": { "name": "SEL", @@ -30689,19 +31001,19 @@ "name": "SELF", "version": "0.1.1", "sha256": "1yafjhxwsanr33dqy7w9x61ghldr29s8k6h68idq6nnfb77ghjyx", - "depends": ["bnlearn", "CompareCausalNetworks", "data_table", "Rcpp", "xgboost"] + "depends": ["CompareCausalNetworks", "Rcpp", "bnlearn", "data_table", "xgboost"] }, "SEMID": { "name": "SEMID", "version": "0.4.1", "sha256": "14x2vir17fp9wm9hzsrc1sw0qgavkpfdvcsfnnklhznl0h526xrr", - "depends": ["igraph", "R_methodsS3", "R_oo", "R_utils"] + "depends": ["R_methodsS3", "R_oo", "R_utils", "igraph"] }, "SEMgraph": { "name": "SEMgraph", - "version": "1.2.1", - "sha256": "1ch82mqhmjyk7lz8hxzl17w342bcviyhsja50gm0j99bh6a8gwz7", - "depends": ["aspect", "boot", "corpcor", "dagitty", "flip", "gdata", "ggm", "glasso", "glmnet", "graph", "igraph", "lavaan", "mgcv", "mvtnorm", "pbapply", "protoclust", "RBGL", "Rgraphviz"] + "version": "1.2.2", + "sha256": "08lka7zv3w8m4l855whcjwijqyhv7x45m6bcqaivbw5clxhidmgw", + "depends": ["RBGL", "Rgraphviz", "aspect", "boot", "corpcor", "dagitty", "flip", "gdata", "ggm", "glasso", "glmnet", "graph", "igraph", "lavaan", "mgcv", "mvtnorm", "pbapply", "protoclust"] }, "SEMsens": { "name": "SEMsens", @@ -30731,7 +31043,13 @@ "name": "SEset", "version": "1.0.1", "sha256": "127z85m95xn46s7lk3sdzrs73mi7pa2smx9r80fnl678f2kyz6lm", - "depends": ["combinat", "Matrix", "Rdpack"] + "depends": ["Matrix", "Rdpack", "combinat"] + }, + "SFPL": { + "name": "SFPL", + "version": "1.0.0", + "sha256": "03axwipil1k1dcjc2zsc62a464qqrncyl2z828w7dqkhp2mfyz2s", + "depends": ["gtools", "pracma"] }, "SFS": { "name": "SFS", @@ -30739,6 +31057,12 @@ "sha256": "1pig64pj30yyfzyv97f74gshw4lnklrx0npp4da3absk6anb3iv7", "depends": ["Rcpp", "RcppArmadillo"] }, + "SFSI": { + "name": "SFSI", + "version": "1.4", + "sha256": "1ikw1mksgzbznhraa15ckhrbygidvwjl5h2psvzv81j9547f7zbq", + "depends": ["ggplot2", "igraph", "reshape2", "scales", "stringr", "tensorEVD", "viridis"] + }, "SFtools": { "name": "SFtools", "version": "0.1.0", @@ -30749,7 +31073,7 @@ "name": "SGB", "version": "1.0.1.1", "sha256": "0lhb0rqih154lxzczdk8i613my3zwym9479n3r4h9xym9bjq80lr", - "depends": ["alabama", "Formula", "MASS", "numDeriv"] + "depends": ["Formula", "MASS", "alabama", "numDeriv"] }, "SGDinference": { "name": "SGDinference", @@ -30767,7 +31091,7 @@ "name": "SGP", "version": "2.1-0.0", "sha256": "1msz3ccgmmwwla70gwwichgzjhzym942wa6hw0imr5cgkm4hk0kq", - "depends": ["Cairo", "callr", "colorspace", "crayon", "data_table", "digest", "doParallel", "equate", "foreach", "gridBase", "gtools", "iterators", "jsonlite", "matrixStats", "plotly", "quantreg", "randomNames", "rngtools", "RSQLite", "sn", "svglite", "toOrdinal"] + "depends": ["Cairo", "RSQLite", "callr", "colorspace", "crayon", "data_table", "digest", "doParallel", "equate", "foreach", "gridBase", "gtools", "iterators", "jsonlite", "matrixStats", "plotly", "quantreg", "randomNames", "rngtools", "sn", "svglite", "toOrdinal"] }, "SGPR": { "name": "SGPR", @@ -30777,27 +31101,27 @@ }, "SGPdata": { "name": "SGPdata", - "version": "27.0-0.0", - "sha256": "0d6lwxqp9ajzinfg258gaqr2k537v32f1gfn7565vsdrlp9miki3", + "version": "28.0-0.0", + "sha256": "03x4ihxhwisrq6bwqclxh56n88b7z0b4yfcrfxxfrgc7zqs9adv2", "depends": ["crayon", "data_table"] }, "SHAPforxgboost": { "name": "SHAPforxgboost", "version": "0.1.3", "sha256": "0b3h6py80a0dmb8f8j4h7a7d0k6ld8l0qr24r8pxxy7dbqbyxh5x", - "depends": ["BBmisc", "data_table", "ggExtra", "ggforce", "ggplot2", "ggpubr", "RColorBrewer", "xgboost"] + "depends": ["BBmisc", "RColorBrewer", "data_table", "ggExtra", "ggforce", "ggplot2", "ggpubr", "xgboost"] }, "SHELF": { "name": "SHELF", "version": "1.10.0", "sha256": "0867d66iak8kb4mkbj16k5b5dm58xsk5djm7r1xha3m2f73yalvd", - "depends": ["ggExtra", "ggplot2", "ggridges", "Hmisc", "rmarkdown", "scales", "shiny", "shinyMatrix", "sn", "tidyr"] + "depends": ["Hmisc", "ggExtra", "ggplot2", "ggridges", "rmarkdown", "scales", "shiny", "shinyMatrix", "sn", "tidyr"] }, "SHT": { "name": "SHT", "version": "0.1.8", "sha256": "03mzjm0hx1i8jz7gam19zyr5w6whwk7a3gfid68h5hj8x60p04wx", - "depends": ["flare", "pracma", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "flare", "pracma"] }, "SI": { "name": "SI", @@ -30809,12 +31133,12 @@ "name": "SIAmodules", "version": "0.1.1", "sha256": "1x6a1apscxdrqlh0dnz9slrfiz4vhxx32rp32lfg27sc1awlx6xy", - "depends": ["cli", "difNLR", "dplyr", "DT", "forcats", "ggplot2", "glue", "lme4", "magrittr", "mirt", "mirtCAT", "plotly", "purrr", "rlang", "scales", "shiny", "ShinyItemAnalysis", "shinyjs", "stringr", "tibble", "tidyr", "yaml"] + "depends": ["DT", "ShinyItemAnalysis", "cli", "difNLR", "dplyr", "forcats", "ggplot2", "glue", "lme4", "magrittr", "mirt", "mirtCAT", "plotly", "purrr", "rlang", "scales", "shiny", "shinyjs", "stringr", "tibble", "tidyr", "yaml"] }, "SIAtools": { "name": "SIAtools", - "version": "0.1.0", - "sha256": "07vl7c0fkpxyk970h35prxks1prd6827bvglq2iqy0micmr6g7qr", + "version": "0.1.1", + "sha256": "17gw4qz9k6m7wys9ik37b72x554ig240cb3ppbbihwryy3wzygw3", "depends": ["cli", "desc", "fs", "magrittr", "purrr", "rlang", "shiny", "usethis", "yaml"] }, "SIBER": { @@ -30833,13 +31157,13 @@ "name": "SID", "version": "1.1", "sha256": "0wqbv9mlrcf0kjdd8n43vf7fjlhp2nialaaid5dfjsxnlzbf1sl6", - "depends": ["igraph", "Matrix", "pcalg", "RBGL"] + "depends": ["Matrix", "RBGL", "igraph", "pcalg"] }, "SIDES": { "name": "SIDES", "version": "1.18", "sha256": "12a87kdbdhqqjjs0k99c1fv0mxi0gjhvq71rm9wvx3wkf0s5p5sv", - "depends": ["doParallel", "foreach", "MASS", "memoise", "multicool", "nnet", "survival"] + "depends": ["MASS", "doParallel", "foreach", "memoise", "multicool", "nnet", "survival"] }, "SIGN": { "name": "SIGN", @@ -30853,17 +31177,23 @@ "sha256": "03i78kpp5gnq9v4b8rq6v0ndlsjfj2rr1m9gnl10v7z8j021qw1q", "depends": ["CVXR", "glmnet"] }, + "SILFS": { + "name": "SILFS", + "version": "0.1.0", + "sha256": "0rr27bmmjw2hb6w3d6jw1kpk3y212n652qlglnlpryhp7gcckq26", + "depends": ["Ckmeans_1d_dp", "MASS", "glmnet"] + }, "SILGGM": { "name": "SILGGM", "version": "1.0.0", "sha256": "1lhmisgg2zbfksl7czz0fqag3732gkjc44n615ipxbdi2pvnc7m0", - "depends": ["glasso", "MASS", "Rcpp", "reshape"] + "depends": ["MASS", "Rcpp", "glasso", "reshape"] }, "SILM": { "name": "SILM", "version": "1.0.0", "sha256": "1iaivpdx18djfm5dqak0q9kfl1xfrnx3gk5x9a4y53h1d7jhl9p6", - "depends": ["glmnet", "hdi", "scalreg", "SIS"] + "depends": ["SIS", "glmnet", "hdi", "scalreg"] }, "SIMEXBoost": { "name": "SIMEXBoost", @@ -30875,31 +31205,31 @@ "name": "SIMICO", "version": "0.2.0", "sha256": "0inyiv2ccz6amdwy94liln0lfs9f12nwq6l0wcqvj42idyjas4ky", - "depends": ["bindata", "CompQuadForm", "fastGHQuad", "ICSKAT"] + "depends": ["CompQuadForm", "ICSKAT", "bindata", "fastGHQuad"] }, "SIMMS": { "name": "SIMMS", "version": "1.3.2", "sha256": "1pdbgqndnhgyfcwgr5ijnnmn64cwlalwbanb2grkm7h80bpql3lw", - "depends": ["doParallel", "foreach", "glmnet", "MASS", "randomForestSRC", "survival"] + "depends": ["MASS", "doParallel", "foreach", "glmnet", "randomForestSRC", "survival"] }, "SIMPLE_REGRESSION": { "name": "SIMPLE.REGRESSION", - "version": "0.1.6", - "sha256": "06kqmvj8pbfgnlib0d6dzg1bh41l6jgwx6b02lgvc6z3nqnpm08w", - "depends": ["nlme"] + "version": "0.1.9", + "sha256": "0drcf4f1ypg667rkbfd4gcmnijbzx9j9qirvja0w2cqhv48mzj9g", + "depends": ["MASS", "nlme"] }, "SIMle": { "name": "SIMle", "version": "0.1.0", "sha256": "1lwi9dxv93f6fnc3j0lkl7kvf806z5f5s8flxzm2km3j5fl0bp2j", - "depends": ["ggplot2", "Matrix", "plotly", "RCurl", "Sie2nts", "stringr"] + "depends": ["Matrix", "RCurl", "Sie2nts", "ggplot2", "plotly", "stringr"] }, "SIMplyBee": { "name": "SIMplyBee", "version": "0.3.0", "sha256": "0013sdgyq29w9yah1yafkd0vj9sgw5lkhi5g5fcb59w386nlfhm5", - "depends": ["AlphaSimR", "extraDistr", "R6"] + "depends": ["AlphaSimR", "R6", "extraDistr"] }, "SINRELEF_LD": { "name": "SINRELEF.LD", @@ -30911,7 +31241,7 @@ "name": "SIPDIBGE", "version": "0.2.1", "sha256": "1scrr08fpyv2qk8yqccwbvzslxp0cjv3939kkcs3v577l6ywb414", - "depends": ["cli", "COVIDIBGE", "PNADcIBGE", "PNDSIBGE", "png", "PNSIBGE", "purrr", "rstudioapi", "tibble"] + "depends": ["COVIDIBGE", "PNADcIBGE", "PNDSIBGE", "PNSIBGE", "cli", "png", "purrr", "rstudioapi", "tibble"] }, "SIPETool": { "name": "SIPETool", @@ -30923,13 +31253,13 @@ "name": "SIPmg", "version": "1.4.1", "sha256": "1f3jirfnxxbrkala5kk0hkkm8gn2zciva6xy459vc80y058hr7z1", - "depends": ["data_table", "DESeq2", "dplyr", "ggplot2", "ggpubr", "HTSSIP", "lazyeval", "magrittr", "MASS", "phyloseq", "plyr", "purrr", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["DESeq2", "HTSSIP", "MASS", "data_table", "dplyr", "ggplot2", "ggpubr", "lazyeval", "magrittr", "phyloseq", "plyr", "purrr", "rlang", "stringr", "tibble", "tidyr"] }, "SIRE": { "name": "SIRE", "version": "1.1.0", "sha256": "0f624j087k7krg73bqn2qxdgzq66jyhvzz8n024vz3h4hwagxs5n", - "depends": ["dplyr", "igraph", "magrittr", "MASS", "Matrix", "matrixcalc", "numDeriv", "psych", "Rsolnp", "stringr", "systemfit"] + "depends": ["MASS", "Matrix", "Rsolnp", "dplyr", "igraph", "magrittr", "matrixcalc", "numDeriv", "psych", "stringr", "systemfit"] }, "SIRmcmc": { "name": "SIRmcmc", @@ -30951,9 +31281,9 @@ }, "SISIR": { "name": "SISIR", - "version": "0.2.2", - "sha256": "0lmhwi8cm1gq761wzjmsgmqb6p62asr881yjwvyc4hxm2sybfqyz", - "depends": ["adjclust", "aricode", "Boruta", "CORElearn", "dendextend", "doParallel", "dplyr", "expm", "foreach", "ggplot2", "glmnet", "magrittr", "Matrix", "mixOmics", "purrr", "ranger", "RColorBrewer", "reshape2", "rlang", "RSpectra", "tidyr", "tidyselect"] + "version": "0.2.3", + "sha256": "01kgvk2m7wqn74nnihkqi7kps1fj7s6glx1why36jylllck3vbvb", + "depends": ["Boruta", "CORElearn", "Matrix", "RColorBrewer", "RSpectra", "adjclust", "aricode", "dendextend", "doParallel", "dplyr", "expm", "foreach", "ggplot2", "glmnet", "magrittr", "mixOmics", "purrr", "ranger", "reshape2", "rlang", "tidyr", "tidyselect"] }, "SIT": { "name": "SIT", @@ -30983,7 +31313,7 @@ "name": "SKFCPD", "version": "0.2.4", "sha256": "115afbld15c8av179c023mvhzb9cmwc0mgv2s86vv3ldy6l2s39d", - "depends": ["FastGaSP", "ggplot2", "ggpubr", "Rcpp", "RcppEigen", "reshape2", "rlang"] + "depends": ["FastGaSP", "Rcpp", "RcppEigen", "ggplot2", "ggpubr", "reshape2", "rlang"] }, "SKNN": { "name": "SKNN", @@ -30995,13 +31325,13 @@ "name": "SLBDD", "version": "0.0.4", "sha256": "06v2id6rqdn9gcjmnpixdfxgh7wvqx9xpna6lnciqz974k8lblsb", - "depends": ["cluster", "corpcor", "fGarch", "forecast", "glmnet", "gsarima", "imputeTS", "MASS", "Matrix", "matrixcalc", "MTS", "rnn", "TSclust", "tsoutliers"] + "depends": ["MASS", "MTS", "Matrix", "TSclust", "cluster", "corpcor", "fGarch", "forecast", "glmnet", "gsarima", "imputeTS", "matrixcalc", "rnn", "tsoutliers"] }, "SLCARE": { "name": "SLCARE", - "version": "1.1.0", - "sha256": "0l2r7rqyvrisjdl721n6jbbv8y579l3m3i1c3xsn4r2fnry125yx", - "depends": ["dplyr", "ggplot2", "magrittr", "nnet", "reda", "reReg", "rlang", "tidyr"] + "version": "1.2.0", + "sha256": "0ci04i231dgnknqaw2wwv9q7q6psazd537c2x3330kk6zydgass8", + "depends": ["dplyr", "ggplot2", "magrittr", "nnet", "reReg", "reda", "rlang", "tidyr"] }, "SLDAssay": { "name": "SLDAssay", @@ -31013,7 +31343,7 @@ "name": "SLEMI", "version": "1.0.2", "sha256": "0fpnnzzflgahmiy1hypss215qbmq2wf35ps34r1izhvww5cj8f4r", - "depends": ["caret", "corrplot", "doParallel", "e1071", "foreach", "ggplot2", "gridExtra", "Hmisc", "nnet", "reshape2", "stringr"] + "depends": ["Hmisc", "caret", "corrplot", "doParallel", "e1071", "foreach", "ggplot2", "gridExtra", "nnet", "reshape2", "stringr"] }, "SLFPCA": { "name": "SLFPCA", @@ -31041,9 +31371,9 @@ }, "SLOPE": { "name": "SLOPE", - "version": "0.5.0", - "sha256": "0v176w2zj32j8988xf0d7myfcr0ahh49gckfav4v73z6ilfmbchy", - "depends": ["checkmate", "foreach", "ggplot2", "glmnet", "Matrix", "mice", "Rcpp", "RcppArmadillo"] + "version": "0.5.1", + "sha256": "1fwfk6caj3hhb1nc3msky3faakfkvilxqna8564zki5hnmbjny69", + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "foreach", "ggplot2"] }, "SLPresElection": { "name": "SLPresElection", @@ -31061,7 +31391,7 @@ "name": "SLTCA", "version": "0.1.0", "sha256": "0pq87fbi79srgjblv40yyj3w1dzf115kfidp8gi564l8xf0qilqg", - "depends": ["geepack", "Matrix", "mvtnorm", "VGAM"] + "depends": ["Matrix", "VGAM", "geepack", "mvtnorm"] }, "SMARTbayesR": { "name": "SMARTbayesR", @@ -31085,7 +31415,7 @@ "name": "SMDIC", "version": "0.1.5", "sha256": "1dx6k67cbk863l9vvp870syn23l7vwxylgs980mp418nfj3d1s23", - "depends": ["backports", "e1071", "GSVA", "maftools", "MASS", "pheatmap", "pracma", "preprocessCore", "RColorBrewer", "samr", "survival", "survminer"] + "depends": ["GSVA", "MASS", "RColorBrewer", "backports", "e1071", "maftools", "pheatmap", "pracma", "preprocessCore", "samr", "survival", "survminer"] }, "SMFilter": { "name": "SMFilter", @@ -31103,7 +31433,7 @@ "name": "SMITIDvisu", "version": "0.0.9", "sha256": "143zz49rx7106v0a46dn1jssqxp60djf5rycfy38167zz7f9wx3y", - "depends": ["htmlwidgets", "jsonlite", "magrittr", "Rcpp", "yaml"] + "depends": ["Rcpp", "htmlwidgets", "jsonlite", "magrittr", "yaml"] }, "SMLE": { "name": "SMLE", @@ -31139,7 +31469,7 @@ "name": "SMMT", "version": "1.2.0", "sha256": "02mm2f4cg8dbzdmpmdv8pf2jskk5kv0w99qzdjri00zwrcd6ckm9", - "depends": ["curl", "dplyr", "rvest", "tibble", "XML", "xml2"] + "depends": ["XML", "curl", "dplyr", "rvest", "tibble", "xml2"] }, "SMNCensReg": { "name": "SMNCensReg", @@ -31157,7 +31487,7 @@ "name": "SMPracticals", "version": "1.4-3.1", "sha256": "1xplp7ihy9ish7fqhc27bhvij9lk9w9mrs7lpdca38ppi4iiafi2", - "depends": ["ellipse", "MASS", "nlme", "survival"] + "depends": ["MASS", "ellipse", "nlme", "survival"] }, "SMR": { "name": "SMR", @@ -31187,7 +31517,7 @@ "name": "SNFtool", "version": "2.3.1", "sha256": "05hz230aq5wbzhknxzr4iqv3nqjhbpf66n6bp1rc5h2jgz2yfbwq", - "depends": ["alluvial", "ExPosition"] + "depends": ["ExPosition", "alluvial"] }, "SNPannotator": { "name": "SNPannotator", @@ -31205,7 +31535,7 @@ "name": "SNPfiltR", "version": "1.0.1", "sha256": "01bm848v0jvf8v568ls8iglz7cjcikriaa7vpavz1smkkm1bs71d", - "depends": ["adegenet", "cluster", "ggplot2", "ggridges", "gridExtra", "Rtsne", "vcfR"] + "depends": ["Rtsne", "adegenet", "cluster", "ggplot2", "ggridges", "gridExtra", "vcfR"] }, "SNPknock": { "name": "SNPknock", @@ -31229,7 +31559,7 @@ "name": "SNSeg", "version": "1.0.3", "sha256": "0p2a8ilxg17a2idnbiaqlmlpbafadl8w1np4bxzbgkkjs0s0qijc", - "depends": ["mvtnorm", "Rcpp"] + "depends": ["Rcpp", "mvtnorm"] }, "SNSequate": { "name": "SNSequate", @@ -31253,7 +31583,7 @@ "name": "SOAs", "version": "1.4", "sha256": "1a3gwqyhw9fzb06xmyapxw0xyff1arb4sfsg3id7blkgxsmahd75", - "depends": ["combinat", "conf_design", "DoE_base", "FrF2", "igraph", "lhs", "partitions", "sfsmisc"] + "depends": ["DoE_base", "FrF2", "combinat", "conf_design", "igraph", "lhs", "partitions", "sfsmisc"] }, "SOFIA": { "name": "SOFIA", @@ -31271,7 +31601,7 @@ "name": "SOIL", "version": "1.1", "sha256": "0dvfh84xjzald51kmdb546par2rbjdn3nys9y9w7cvafv2lc5yj9", - "depends": ["brglm2", "glmnet", "MASS", "ncvreg"] + "depends": ["MASS", "brglm2", "glmnet", "ncvreg"] }, "SOMEnv": { "name": "SOMEnv", @@ -31285,6 +31615,12 @@ "sha256": "15bwdw3awwqq6d4b8ja8lsvcyr2v37l5jc3ja3df3y0ziazdllpn", "depends": ["ggplot2", "ggwordcloud", "igraph", "interp", "markdown", "metR", "rlang", "scatterplot3d", "shiny"] }, + "SOMnmR": { + "name": "SOMnmR", + "version": "0.3.0", + "sha256": "16vd41x4sazjlqwp5fdxcxs8n8rkgjdg819yrbnjlhp54938laj3", + "depends": ["IntervalSurgeon", "data_table", "dplyr", "ggplot2", "minpack_lm", "pracma", "quadprog", "rlang"] + }, "SOP": { "name": "SOP", "version": "1.0-1", @@ -31313,13 +31649,13 @@ "name": "SP2000", "version": "0.2.0", "sha256": "01wrc7p36js20jv04zhphj2vq7qqfgxmrzic066wij0c0mnh0xn5", - "depends": ["DT", "jsonlite", "pbmcapply", "purrr", "rlist", "tibble", "urltools", "XML", "xml2"] + "depends": ["DT", "XML", "jsonlite", "pbmcapply", "purrr", "rlist", "tibble", "urltools", "xml2"] }, "SPADAR": { "name": "SPADAR", "version": "1.0", "sha256": "0xzhcy5nglwx9j2jkm3i9xj1iw1y9wbf6rwfjyhpiwwq6qn8mn5r", - "depends": ["mapproj", "RCEIM"] + "depends": ["RCEIM", "mapproj"] }, "SPARRAfairness": { "name": "SPARRAfairness", @@ -31331,19 +31667,19 @@ "name": "SPARSEMODr", "version": "1.2.0", "sha256": "0nshy1ppwsik7x1n0xp3wknm7fsl7c6y5523qnr41ijh18j165bq", - "depends": ["data_table", "future", "future_apply", "geosphere", "lubridate", "Rcpp", "tidyverse", "viridis"] + "depends": ["Rcpp", "data_table", "future", "future_apply", "geosphere", "lubridate", "tidyverse", "viridis"] }, "SPARTAAS": { "name": "SPARTAAS", - "version": "1.2.1", - "sha256": "1syk48pz3f9dcz03104k9g8l48fjzx3raz3zzggbpbkdbw7hvc9f", - "depends": ["ade4", "ape", "cluster", "colorspace", "crayon", "dplyr", "explor", "FactoMineR", "fastcluster", "foreign", "fpc", "ggdendro", "ggplot2", "htmltools", "htmlwidgets", "ks", "leaflet", "lmtest", "mapview", "MASS", "nor1mix", "plotly", "rstudioapi", "scales", "scatterD3", "shiny", "shinycssloaders", "shinydashboard", "shinyjqui", "shinyjs", "shinythemes", "shinyWidgets", "sp", "stringr", "tidyr"] + "version": "1.2.4", + "sha256": "0795n9z8z4mr0fc4mrdq8xgnn3jaqcqsdpfq0iyyl7zn3nl3bgca", + "depends": ["FactoMineR", "MASS", "ade4", "ape", "cluster", "colorspace", "dplyr", "explor", "fastcluster", "foreign", "fpc", "ggdendro", "ggplot2", "htmltools", "htmlwidgets", "ks", "leaflet", "lmtest", "nor1mix", "plotly", "rstudioapi", "scales", "scatterD3", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyjqui", "shinyjs", "shinythemes", "stringr", "tidyr"] }, "SPAS": { "name": "SPAS", "version": "2024.1.31", "sha256": "06axnkq22jyc208ndvmiyp13vfr9sxg85rsdzdi6mm70rzgwba6c", - "depends": ["MASS", "Matrix", "msm", "numDeriv", "plyr", "RcppEigen", "reshape2", "TMB"] + "depends": ["MASS", "Matrix", "RcppEigen", "TMB", "msm", "numDeriv", "plyr", "reshape2"] }, "SPAtest": { "name": "SPAtest", @@ -31391,7 +31727,7 @@ "name": "SPECK", "version": "1.0.0", "sha256": "0n67gqwd01klk8x3ds5ik11nwiga0138vdw3yhnrj1pp3pnpnq7k", - "depends": ["Ckmeans_1d_dp", "magrittr", "Matrix", "rsvd", "Seurat"] + "depends": ["Ckmeans_1d_dp", "Matrix", "Seurat", "magrittr", "rsvd"] }, "SPEDInstabR": { "name": "SPEDInstabR", @@ -31403,7 +31739,7 @@ "name": "SPEI", "version": "1.8.1", "sha256": "1xn7hdj5h68mvkb81pmwha665c6k57pa7k59bb84zhvxgdnczksn", - "depends": ["checkmate", "ggplot2", "lmom", "lmomco", "lubridate", "reshape", "TLMoments", "zoo"] + "depends": ["TLMoments", "checkmate", "ggplot2", "lmom", "lmomco", "lubridate", "reshape", "zoo"] }, "SPEV": { "name": "SPEV", @@ -31427,7 +31763,7 @@ "name": "SPLICE", "version": "1.1.2", "sha256": "1vzacbgb2z6b7cbcn6l5zjminl8gr5irzva0l8shq7g8cqggrvwm", - "depends": ["lifecycle", "SynthETIC", "zoo"] + "depends": ["SynthETIC", "lifecycle", "zoo"] }, "SPORTSCausal": { "name": "SPORTSCausal", @@ -31463,7 +31799,7 @@ "name": "SPSP", "version": "0.2.0", "sha256": "0gf5cw2fnssl198ccpvnma4bcqi33whl6ihc1s9i2lw6xg4qvb33", - "depends": ["glmnet", "lars", "Matrix", "ncvreg", "Rcpp"] + "depends": ["Matrix", "Rcpp", "glmnet", "lars", "ncvreg"] }, "SPUTNIK": { "name": "SPUTNIK", @@ -31499,19 +31835,19 @@ "name": "SQI", "version": "0.1.0", "sha256": "1mb1vzc8r52zr1rp4dakmsdayv47pqsbissljskl9c0nkhlah1kq", - "depends": ["dplyr", "FactoMineR", "matrixStats", "olsrr", "readxl"] + "depends": ["FactoMineR", "dplyr", "matrixStats", "olsrr", "readxl"] }, "SQL": { "name": "SQL", "version": "0.1.1", "sha256": "1l949crb4fz13yxbr9gag7lfqs9ak3ab3i25g20mjrz6iix99hrd", - "depends": ["arrow", "DBI", "duckdb", "stringr"] + "depends": ["DBI", "arrow", "duckdb", "stringr"] }, "SQLove": { "name": "SQLove", "version": "0.0.4", "sha256": "0k746spnhi07rdw8lbblsxgabqlzr3h368svxhs7987r333wlsyh", - "depends": ["DBI", "readr", "RJDBC"] + "depends": ["DBI", "RJDBC", "readr"] }, "SQMtools": { "name": "SQMtools", @@ -31553,7 +31889,7 @@ "name": "SRTsim", "version": "0.99.6", "sha256": "1436lhpjbciln8xmr9sd7d0akh5kap8a9f0az7209c1zqc46i576", - "depends": ["concaveman", "dashboardthemes", "dplyr", "FNN", "ggplot2", "ggpubr", "magrittr", "MASS", "Matrix", "matrixStats", "Morpho", "pdist", "plotly", "S4Vectors", "sf", "shiny", "shinyBS", "shinydashboard", "sp", "spatstat_geom", "spatstat_random", "viridis"] + "depends": ["FNN", "MASS", "Matrix", "Morpho", "S4Vectors", "concaveman", "dashboardthemes", "dplyr", "ggplot2", "ggpubr", "magrittr", "matrixStats", "pdist", "plotly", "sf", "shiny", "shinyBS", "shinydashboard", "sp", "spatstat_geom", "spatstat_random", "viridis"] }, "SRTtools": { "name": "SRTtools", @@ -31577,25 +31913,25 @@ "name": "SSDforR", "version": "1.5.34", "sha256": "12lrvh9231cix5lkc53cf4fk11sfa89011kj2qddk3lkmcyvcwfz", - "depends": ["Kendall", "MAd", "MASS", "metafor", "modifiedmk", "psych", "SingleCaseES", "TTR"] + "depends": ["Kendall", "MASS", "MAd", "SingleCaseES", "TTR", "metafor", "modifiedmk", "psych"] }, "SSEparser": { "name": "SSEparser", "version": "0.1.0", "sha256": "1qjvrs8cv2m4g2rjcdylwss641z4cchzsdymn0lmmdpfcnfys1vy", - "depends": ["magrittr", "purrr", "R6", "rlang", "stringr"] + "depends": ["R6", "magrittr", "purrr", "rlang", "stringr"] }, "SSGL": { "name": "SSGL", "version": "1.0", "sha256": "1f65sc713bzi6nq7ay9jnz92bxh7lrzj6aj77dczkafac2vgmba2", - "depends": ["grpreg", "MASS", "pracma"] + "depends": ["MASS", "grpreg", "pracma"] }, "SSHAARP": { "name": "SSHAARP", "version": "1.1.0", "sha256": "0x8dinhhfk4q1cck7ms78f4k23430c4wyvlh2qclq0c83acjj4y9", - "depends": ["BIGDAWG", "data_table", "DescTools", "dplyr", "filesstrings", "gmt", "gtools", "stringr"] + "depends": ["BIGDAWG", "DescTools", "data_table", "dplyr", "filesstrings", "gmt", "gtools", "stringr"] }, "SSIMmap": { "name": "SSIMmap", @@ -31613,7 +31949,7 @@ "name": "SSLR", "version": "0.9.3.3", "sha256": "0fv1jqri3gpzcfs429pgx4hjqmjrglb4g7nfqdihd2hjmq9k4sql", - "depends": ["conclust", "dplyr", "foreach", "generics", "magrittr", "parsnip", "plyr", "proxy", "purrr", "RANN", "Rcpp", "RcppArmadillo", "rlang", "RSSL"] + "depends": ["RANN", "RSSL", "Rcpp", "RcppArmadillo", "conclust", "dplyr", "foreach", "generics", "magrittr", "parsnip", "plyr", "proxy", "purrr", "rlang"] }, "SSM": { "name": "SSM", @@ -31623,21 +31959,21 @@ }, "SSN2": { "name": "SSN2", - "version": "0.1.1", - "sha256": "0j3523fc5ilh5z3dmml5fqxgnjykm7qqlfvzb0ay8p60l43aybss", - "depends": ["generics", "Matrix", "RSQLite", "sf", "spmodel", "tibble"] + "version": "0.2.0", + "sha256": "05q6vhpf305jqq9spkiwkyam6l9rjj4vhdvq1lf1a1dmync7i4x7", + "depends": ["Matrix", "RSQLite", "generics", "sf", "spmodel", "tibble", "withr"] }, "SSNbayes": { "name": "SSNbayes", "version": "0.0.3", "sha256": "1smfd7mas19y8n4jpywphck54crxn15lnc8dpi9s5il50icr2hls", - "depends": ["dplyr", "plyr", "rstan", "sf", "SSN2"] + "depends": ["SSN2", "dplyr", "plyr", "rstan", "sf"] }, "SSOSVM": { "name": "SSOSVM", "version": "0.2.1", "sha256": "11wlalpw6yhvv95xr8vvgxgl4jafc2ghzsk5wqyv71ahxarmrlss", - "depends": ["MASS", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "mvtnorm"] }, "SSP": { "name": "SSP", @@ -31655,7 +31991,7 @@ "name": "SSRMST", "version": "0.1.1", "sha256": "15s6vcmk8a27yw3rlfkajby6qkizp4sfiyi63m7hc86svd15x4wg", - "depends": ["survival", "survRM2"] + "depends": ["survRM2", "survival"] }, "SSRTcalc": { "name": "SSRTcalc", @@ -31667,7 +32003,7 @@ "name": "SSVS", "version": "2.0.0", "sha256": "002k10b3s4f84jiq7yjazmf7jz02z5l4g9ma0cyrdglbhhn3pbrd", - "depends": ["bayestestR", "BoomSpikeSlab", "checkmate", "ggplot2", "rlang"] + "depends": ["BoomSpikeSlab", "bayestestR", "checkmate", "ggplot2", "rlang"] }, "SSplots": { "name": "SSplots", @@ -31697,7 +32033,7 @@ "name": "STAREG", "version": "1.0.3", "sha256": "1skxwk817p4r7svnfrgv8bmkaz06ndqfxnypp9wdmndrgivrmg54", - "depends": ["qvalue", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "qvalue"] }, "STARTS": { "name": "STARTS", @@ -31715,13 +32051,13 @@ "name": "STAT", "version": "0.1.0", "sha256": "0x0qpnlcb52k3x8jwiljsamx81hdcjagfpapv63z054bvig0jvgv", - "depends": ["corrgram", "dplyr", "Hmisc", "psych", "psycho", "rmarkdown", "rpivotTable", "shiny"] + "depends": ["Hmisc", "corrgram", "dplyr", "psych", "psycho", "rmarkdown", "rpivotTable", "shiny"] }, "STAT2": { "name": "STAT2", "version": "0.1.0", "sha256": "09i6vzp5zmi84kdwafb5cbqvja32mdpj8bnp8gnc2wyqwy3a8cqv", - "depends": ["corrgram", "dplyr", "Hmisc", "psych", "psycho", "rmarkdown", "rpivotTable", "shiny"] + "depends": ["Hmisc", "corrgram", "dplyr", "psych", "psycho", "rmarkdown", "rpivotTable", "shiny"] }, "STB": { "name": "STB", @@ -31733,7 +32069,7 @@ "name": "STEPCAM", "version": "1.2", "sha256": "03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf", - "depends": ["ade4", "ape", "FD", "geometry", "gtools", "MASS", "vcd"] + "depends": ["FD", "MASS", "ade4", "ape", "geometry", "gtools", "vcd"] }, "STFTS": { "name": "STFTS", @@ -31751,7 +32087,7 @@ "name": "STMotif", "version": "2.0.2", "sha256": "04cmghys37abxjkcj6hm4nxq5mjiwy93v8xhl6gacmahjr4fj0dl", - "depends": ["ggplot2", "RColorBrewer", "reshape2", "scales"] + "depends": ["RColorBrewer", "ggplot2", "reshape2", "scales"] }, "STMr": { "name": "STMr", @@ -31763,7 +32099,7 @@ "name": "STOPES", "version": "0.2", "sha256": "0dlr9hasily74wlwb44qadql9qdii326xhdnam1anszsvijzs4dk", - "depends": ["changepoint", "cvTools", "glmnet", "MASS"] + "depends": ["MASS", "changepoint", "cvTools", "glmnet"] }, "STPGA": { "name": "STPGA", @@ -31775,13 +32111,13 @@ "name": "STREAK", "version": "1.0.0", "sha256": "1gi228y3rn187pkr74abiydlkdwaahd9b9nn5dn5433y69kwnkw5", - "depends": ["Ckmeans_1d_dp", "Matrix", "Seurat", "SPECK", "VAM"] + "depends": ["Ckmeans_1d_dp", "Matrix", "SPECK", "Seurat", "VAM"] }, "STRMPS": { "name": "STRMPS", "version": "0.5.8", "sha256": "0vlmhrna0laqzjpbg4sgnscrli3cly2lc5d69n6iqfl213zsfz78", - "depends": ["Biostrings", "dplyr", "IRanges", "purrr", "ShortRead", "stringr", "tibble", "tidyr"] + "depends": ["Biostrings", "IRanges", "ShortRead", "dplyr", "purrr", "stringr", "tibble", "tidyr"] }, "STV": { "name": "STV", @@ -31793,19 +32129,19 @@ "name": "STraTUS", "version": "1.1.2", "sha256": "0n3i7gbycp1f10058h9xlh3yk21w2izdb3xgs793mmh1i1sjy394", - "depends": ["ape", "ggplot2", "ggtree", "gmp", "igraph", "phangorn", "RcppAlgos"] + "depends": ["RcppAlgos", "ape", "ggplot2", "ggtree", "gmp", "igraph", "phangorn"] }, "SUMMER": { "name": "SUMMER", "version": "1.4.0", "sha256": "0x93mppdaah7sznzk1rrw76ia07fnjmb676q1rrya6bzkv5fbf5z", - "depends": ["data_table", "fields", "ggplot2", "ggridges", "haven", "Matrix", "RColorBrewer", "reshape2", "scales", "sf", "shadowtext", "sp", "spdep", "survey", "survival", "terra", "viridis"] + "depends": ["Matrix", "RColorBrewer", "data_table", "fields", "ggplot2", "ggridges", "haven", "reshape2", "scales", "sf", "shadowtext", "sp", "spdep", "survey", "survival", "terra", "viridis"] }, "SUNGEO": { "name": "SUNGEO", "version": "1.3.0", "sha256": "0ydwsrgqknngx7567xwfhwj1jdmi4ip1jxkb5jdy41f7ysy1myd0", - "depends": ["automap", "cartogram", "data_table", "dplyr", "httr", "jsonlite", "measurements", "packcircles", "purrr", "RANN", "raster", "Rcpp", "RCurl", "rlang", "rmapshaper", "sf", "spdep", "stringr", "terra"] + "depends": ["RANN", "RCurl", "Rcpp", "automap", "cartogram", "data_table", "dplyr", "httr", "jsonlite", "measurements", "packcircles", "purrr", "raster", "rlang", "rmapshaper", "sf", "spdep", "stringr", "terra"] }, "SUSY": { "name": "SUSY", @@ -31829,19 +32165,19 @@ "name": "SWIM", "version": "1.0.0", "sha256": "1pfrwxn4rha7a68b82lq18x6acyhjy9d8nn2hdwd9hhf576vkvhg", - "depends": ["ggplot2", "Hmisc", "nleqslv", "plyr", "Rdpack", "reshape2"] + "depends": ["Hmisc", "Rdpack", "ggplot2", "nleqslv", "plyr", "reshape2"] }, "SWMPr": { "name": "SWMPr", - "version": "2.5.0", - "sha256": "1p7gzyzdm3fiam76dwl2sb3drphifakx2mj5jz1v3gp57xyhihiz", - "depends": ["data_table", "dplyr", "ggplot2", "gridExtra", "httr", "lattice", "oce", "openair", "RColorBrewer", "reshape2", "suncalc", "tictoc", "tidyr", "XML", "zoo"] + "version": "2.5.1", + "sha256": "15193hv4hvr46l42qvpi5pd187bjjcmrs7akm13vm3nr6nlvzpkx", + "depends": ["RColorBrewer", "XML", "data_table", "dplyr", "ggplot2", "gridExtra", "httr", "lattice", "oce", "openair", "reshape2", "suncalc", "tictoc", "tidyr", "zoo"] }, "SWMPrExtension": { "name": "SWMPrExtension", "version": "2.2.5.1", "sha256": "107v5fh3h03dk9ma67hj8988hfmswrl9lfijhjv5b4ww73n2v6x7", - "depends": ["broom", "curl", "dplyr", "EnvStats", "flextable", "ggimage", "ggplot2", "ggthemes", "lubridate", "magrittr", "officer", "purrr", "RColorBrewer", "rlang", "scales", "sf", "SWMPr", "tidyr", "tidyselect"] + "depends": ["EnvStats", "RColorBrewer", "SWMPr", "broom", "curl", "dplyr", "flextable", "ggimage", "ggplot2", "ggthemes", "lubridate", "magrittr", "officer", "purrr", "rlang", "scales", "sf", "tidyr", "tidyselect"] }, "SWTools": { "name": "SWTools", @@ -31853,7 +32189,7 @@ "name": "SYNCSA", "version": "1.3.4", "sha256": "0n9za302x638s666xs86zy94qch9wn0rln8xy6x9jymhhq9zn0kj", - "depends": ["FD", "permute", "RcppArmadillo", "vegan"] + "depends": ["FD", "RcppArmadillo", "permute", "vegan"] }, "SafeVote": { "name": "SafeVote", @@ -31873,6 +32209,12 @@ "sha256": "0s8svsgwh79rcwnskz0my2xqasyp370hn7aixqm9m6zqlvf42zc2", "depends": [] }, + "SampleSizeDiagnostics": { + "name": "SampleSizeDiagnostics", + "version": "0.1.0", + "sha256": "1h4scywysya36sc6qvfn5csdghb38wicr96xgwhba289zrd9j2az", + "depends": [] + }, "SampleSizeMeans": { "name": "SampleSizeMeans", "version": "1.2.3", @@ -31895,7 +32237,7 @@ "name": "SamplingStrata", "version": "1.5-4", "sha256": "093x9rfilxhgf75p0rfsvglz0sg3imhdm15azxnjiblamyxbhfjm", - "depends": ["doParallel", "glue", "memoise", "pbapply", "SamplingBigData"] + "depends": ["SamplingBigData", "doParallel", "glue", "memoise", "pbapply"] }, "SanFranBeachWater": { "name": "SanFranBeachWater", @@ -31931,13 +32273,13 @@ "name": "ScatterDensity", "version": "0.0.4", "sha256": "126jvjgfja6vyjadl3a7ahpb8z99hazijai4ymvnr1g1wcnx1z19", - "depends": ["pracma", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "pracma"] }, "SchoolDataIT": { "name": "SchoolDataIT", - "version": "0.1.2", - "sha256": "1mhjlll6vplg7alnrl359bb5gvf5b54f2pf4lpazsv29hqiavhqg", - "depends": ["curl", "dplyr", "ggplot2", "httr", "leafpop", "magrittr", "mapview", "readr", "readxl", "rlang", "rvest", "sf", "stringr", "tidyr", "xml2"] + "version": "0.2.0", + "sha256": "1yi65xzi4h0aviisswrn78zgqzp17y4vvjnfcvphlgyr67nh3g6k", + "depends": ["curl", "dplyr", "ggplot2", "httr", "leafpop", "magrittr", "mapview", "readr", "rlang", "rvest", "sf", "stringr", "tidyr", "xml2"] }, "SciViews": { "name": "SciViews", @@ -31955,7 +32297,7 @@ "name": "ScorePlus", "version": "0.1", "sha256": "07hmrx1k256i4cs605j5bpg6brzypryxlcnjkzqak8cw4f26k24q", - "depends": ["combinat", "igraph", "igraphdata", "limSolve", "RSpectra"] + "depends": ["RSpectra", "combinat", "igraph", "igraphdata", "limSolve"] }, "ScottKnott": { "name": "ScottKnott", @@ -31985,19 +32327,19 @@ "name": "ScriptMapR", "version": "0.0.3", "sha256": "18pd23yqn3ai1yfl149081n42hbh0d57hm71s2lhm1z7a5ccjkmf", - "depends": ["dplyr", "formatR", "RCy3", "stringr"] + "depends": ["RCy3", "dplyr", "formatR", "stringr"] }, "SeBR": { "name": "SeBR", "version": "1.0.0", "sha256": "0xk002y4nim5f3mcfbl3zk484cf2s5mvg1paj2jg4f5v60vr4pwp", - "depends": ["fields", "GpGp", "MASS", "quantreg", "spikeSlabGAM", "statmod"] + "depends": ["GpGp", "MASS", "fields", "quantreg", "spikeSlabGAM", "statmod"] }, "SeaVal": { "name": "SeaVal", "version": "1.2.0", "sha256": "1j4y96pqh6h791hiz07f6c4bhacm8n5v720bkwpkmbkky39yi2bf", - "depends": ["data_table", "ggnewscale", "ggplot2", "ggplotify", "lifecycle", "maps", "ncdf4", "patchwork", "RColorBrewer", "scales", "stringr"] + "depends": ["RColorBrewer", "data_table", "ggnewscale", "ggplot2", "ggplotify", "lifecycle", "maps", "ncdf4", "patchwork", "scales", "stringr"] }, "SearchTrees": { "name": "SearchTrees", @@ -32009,7 +32351,7 @@ "name": "SecDim", "version": "3.2", "sha256": "04l4qpw409dj5i494vmf7vmksis6910599gh259nbyv0pdfw5svr", - "depends": ["geosphere", "RcppArmadillo"] + "depends": ["RcppArmadillo", "geosphere"] }, "SeedCalc": { "name": "SeedCalc", @@ -32027,7 +32369,7 @@ "name": "SeedMatchR", "version": "1.1.1", "sha256": "138chb0z1gyhvl56g3a7zf4nash1v3v5l3qfxiqai2kxvladmz9y", - "depends": ["AnnotationHub", "Biostrings", "cowplot", "dplyr", "GenomeInfoDb", "GenomicFeatures", "ggmsa", "ggplot2", "lifecycle", "msa", "stringr", "testit"] + "depends": ["AnnotationHub", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "cowplot", "dplyr", "ggmsa", "ggplot2", "lifecycle", "msa", "stringr", "testit"] }, "SeedVigorIndex": { "name": "SeedVigorIndex", @@ -32057,13 +32399,13 @@ "name": "Select", "version": "1.4", "sha256": "1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2", - "depends": ["ade4", "FD", "lattice", "latticeExtra", "Rsolnp"] + "depends": ["FD", "Rsolnp", "ade4", "lattice", "latticeExtra"] }, "SelectBoost": { "name": "SelectBoost", "version": "2.2.2", "sha256": "189hdr50sikg6pr9x9amjmgg9z0c95j65bddmifsy7zvjhllzjiy", - "depends": ["abind", "Cascade", "glmnet", "igraph", "lars", "msgps", "Rfast", "spls", "varbvs"] + "depends": ["Cascade", "Rfast", "abind", "glmnet", "igraph", "lars", "msgps", "spls", "varbvs"] }, "SelectionBias": { "name": "SelectionBias", @@ -32081,7 +32423,7 @@ "name": "SemNetCleaner", "version": "1.3.4", "sha256": "1fll6i4bz2z07h23z5m3x8hqw5rkianh0w6v8gnnkjqlrnacpfp9", - "depends": ["easycsv", "editData", "foreign", "miniUI", "R_matlab", "readxl", "rstudioapi", "searcher", "SemNetDictionaries", "shiny", "stringdist", "stringi"] + "depends": ["R_matlab", "SemNetDictionaries", "easycsv", "editData", "foreign", "miniUI", "readxl", "rstudioapi", "searcher", "shiny", "stringdist", "stringi"] }, "SemNetDictionaries": { "name": "SemNetDictionaries", @@ -32093,7 +32435,7 @@ "name": "Semblance", "version": "1.1.0", "sha256": "1kzrg5z3244nx9y37p092wpangni3fxpx04i5fb4dhrmav4rvgab", - "depends": ["DescTools", "fields", "msos", "PerformanceAnalytics"] + "depends": ["DescTools", "PerformanceAnalytics", "fields", "msos"] }, "SemiCompRisks": { "name": "SemiCompRisks", @@ -32111,13 +32453,13 @@ "name": "SemiMarkov", "version": "1.4.6", "sha256": "0nga790kcrvmbrx5asp4062711x0kjsccc246l4syiiw30b769ig", - "depends": ["MASS", "numDeriv", "Rsolnp"] + "depends": ["MASS", "Rsolnp", "numDeriv"] }, "SemiPar": { "name": "SemiPar", "version": "1.0-4.2", "sha256": "0pa3drpvclkw81ji5m1h5arj5c2rh03dnlff97cnnr1v5kvg1i4w", - "depends": ["cluster", "MASS", "nlme"] + "depends": ["MASS", "cluster", "nlme"] }, "SemiPar_depCens": { "name": "SemiPar.depCens", @@ -32141,13 +32483,13 @@ "name": "SenTinMixt", "version": "1.0.0", "sha256": "1yja63087nhb5c0wlql7yynjkhkrjw69amvz4w55xqvp605rh46f", - "depends": ["data_table", "doSNOW", "expint", "foreach", "mclust", "rlist", "snow", "tidyr", "TSdist", "withr", "zipfR"] + "depends": ["TSdist", "data_table", "doSNOW", "expint", "foreach", "mclust", "rlist", "snow", "tidyr", "withr", "zipfR"] }, "SensMap": { "name": "SensMap", "version": "0.7", "sha256": "1aac3mr7jq6fl0r230igdwcmpivpd9by5sx1vbrz3rpircgy28nz", - "depends": ["doBy", "factoextra", "FactoMineR", "fields", "ggdendro", "ggplot2", "glmulti", "lattice", "MCMCpack", "mgcv", "plotly", "reshape2", "shiny"] + "depends": ["FactoMineR", "MCMCpack", "doBy", "factoextra", "fields", "ggdendro", "ggplot2", "glmulti", "lattice", "mgcv", "plotly", "reshape2", "shiny"] }, "SensitivityCaseControl": { "name": "SensitivityCaseControl", @@ -32159,13 +32501,13 @@ "name": "SensoMineR", "version": "1.27", "sha256": "0si7zklv94li8payg4zxcac1a7ivk90q4ckcyak536sqfinihpb3", - "depends": ["AlgDesign", "cluster", "FactoMineR", "ggplot2", "ggrepel", "gtools", "KernSmooth", "reshape2"] + "depends": ["AlgDesign", "FactoMineR", "KernSmooth", "cluster", "ggplot2", "ggrepel", "gtools", "reshape2"] }, "SensusR": { "name": "SensusR", "version": "2.3.1", "sha256": "1x1a8vnpn6h7905wa4lvf7vibkl2dsa4yyg2sg4bbi719lcki2q0", - "depends": ["ggmap", "ggplot2", "jsonlite", "lubridate", "openssl", "plyr", "R_utils"] + "depends": ["R_utils", "ggmap", "ggplot2", "jsonlite", "lubridate", "openssl", "plyr"] }, "SentimentAnalysis": { "name": "SentimentAnalysis", @@ -32189,25 +32531,25 @@ "name": "SeqDetect", "version": "1.0.7", "sha256": "054b5v0jzk9pj9hrxk31kvcdm789lx8gzh70ivskixz57kajmiss", - "depends": ["dplyr", "eventdataR", "igraph", "Rcpp"] + "depends": ["Rcpp", "dplyr", "eventdataR", "igraph"] }, "SeqExpMatch": { "name": "SeqExpMatch", "version": "0.1.0", "sha256": "0i4hsmkapsavhqx99zk9d2qajaqh8kchdf8qy3rbdwgchiiwzybv", - "depends": ["checkmate", "doParallel", "R6"] + "depends": ["R6", "checkmate", "doParallel"] }, "SeqFeatR": { "name": "SeqFeatR", "version": "0.3.1", "sha256": "1dvl65n60j7wl0jdb0myi9hprlr9grq6nf9m68gzxm9sz3h8lpvh", - "depends": ["ape", "Biostrings", "calibrate", "coda", "ggplot2", "phangorn", "plotrix", "plyr", "qvalue", "R2jags", "scales", "tcltk2", "widgetTools"] + "depends": ["Biostrings", "R2jags", "ape", "calibrate", "coda", "ggplot2", "phangorn", "plotrix", "plyr", "qvalue", "scales", "tcltk2", "widgetTools"] }, "SeqKat": { "name": "SeqKat", "version": "0.0.8", "sha256": "09b5zrp41241ha5q8bxll9n12sn11hsbv46g2ld1lqsy2razivr4", - "depends": ["doParallel", "foreach", "Rcpp"] + "depends": ["Rcpp", "doParallel", "foreach"] }, "SeqMADE": { "name": "SeqMADE", @@ -32219,7 +32561,7 @@ "name": "SeqNet", "version": "1.1.3", "sha256": "1ix3c249q758si6670hqa56g1snqqwqdrwshfwajvynl7k2zqzmv", - "depends": ["fitdistrplus", "ggplot2", "igraph", "mvtnorm", "purrr", "Rcpp", "Rdpack", "rlang", "tibble"] + "depends": ["Rcpp", "Rdpack", "fitdistrplus", "ggplot2", "igraph", "mvtnorm", "purrr", "rlang", "tibble"] }, "SequenceSpikeSlab": { "name": "SequenceSpikeSlab", @@ -32243,25 +32585,25 @@ "name": "SetMethods", "version": "4.0", "sha256": "0pzxcqbc7jnsxhv902qw2q9rcqskib11z36d5nav9wny6bj2z658", - "depends": ["admisc", "betareg", "fmsb", "ggplot2", "ggrepel", "QCA", "scatterplot3d", "stargazer"] + "depends": ["QCA", "admisc", "betareg", "fmsb", "ggplot2", "ggrepel", "scatterplot3d", "stargazer"] }, "SetTest": { "name": "SetTest", - "version": "0.2.0", - "sha256": "08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0", + "version": "0.3.0", + "sha256": "12w297xmq76afiwj1h8ygk24rjhhd7a77fj12dsksw20y1g0f30d", "depends": [] }, "Seurat": { "name": "Seurat", "version": "5.1.0", "sha256": "0nad49g13v5zg4rr2099m1cl1qcmmj1a0m09gam5xiccg8yv9kxd", - "depends": ["cluster", "cowplot", "fastDummies", "fitdistrplus", "future", "future_apply", "generics", "ggplot2", "ggrepel", "ggridges", "httr", "ica", "igraph", "irlba", "jsonlite", "KernSmooth", "leiden", "lifecycle", "lmtest", "MASS", "Matrix", "matrixStats", "miniUI", "patchwork", "pbapply", "plotly", "png", "progressr", "purrr", "RANN", "RColorBrewer", "Rcpp", "RcppAnnoy", "RcppEigen", "RcppHNSW", "RcppProgress", "reticulate", "rlang", "ROCR", "RSpectra", "Rtsne", "scales", "scattermore", "sctransform", "SeuratObject", "shiny", "spatstat_explore", "spatstat_geom", "tibble", "uwot"] + "depends": ["KernSmooth", "MASS", "Matrix", "RANN", "RColorBrewer", "ROCR", "RSpectra", "Rcpp", "RcppAnnoy", "RcppEigen", "RcppHNSW", "RcppProgress", "Rtsne", "SeuratObject", "cluster", "cowplot", "fastDummies", "fitdistrplus", "future", "future_apply", "generics", "ggplot2", "ggrepel", "ggridges", "httr", "ica", "igraph", "irlba", "jsonlite", "leiden", "lifecycle", "lmtest", "matrixStats", "miniUI", "patchwork", "pbapply", "plotly", "png", "progressr", "purrr", "reticulate", "rlang", "scales", "scattermore", "sctransform", "shiny", "spatstat_explore", "spatstat_geom", "tibble", "uwot"] }, "SeuratObject": { "name": "SeuratObject", "version": "5.0.2", "sha256": "1kx0icqzjck7vynxj5962sz9zlassia4j32azr9y7ds5yhhhvlyy", - "depends": ["future", "future_apply", "generics", "lifecycle", "Matrix", "progressr", "Rcpp", "RcppEigen", "rlang", "sp", "spam"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "future", "future_apply", "generics", "lifecycle", "progressr", "rlang", "sp", "spam"] }, "ShapDoE": { "name": "ShapDoE", @@ -32281,12 +32623,6 @@ "sha256": "1vlzvfns6grxc2g0d4slsckg6lzzr0k38brncf2akb41jkczbyak", "depends": ["igraph", "landscapemetrics", "raster", "sp", "terra"] }, - "ShapeRotator": { - "name": "ShapeRotator", - "version": "0.1.0", - "sha256": "1pg2m1wh7fbchm8gp3mngfnf5g2rbhvzim1bpzqyvxqpx6ynicsa", - "depends": ["plot3D"] - }, "ShapeSelectForest": { "name": "ShapeSelectForest", "version": "1.7", @@ -32297,19 +32633,19 @@ "name": "ShapleyOutlier", "version": "0.1.1", "sha256": "1qdb872cppq1dh33l75pxw4l7isp8nlsinbipygm989f1sf24xkh", - "depends": ["dplyr", "egg", "forcats", "ggplot2", "gridExtra", "magrittr", "RColorBrewer", "Rdpack", "robustbase", "tibble", "tidyr"] + "depends": ["RColorBrewer", "Rdpack", "dplyr", "egg", "forcats", "ggplot2", "gridExtra", "magrittr", "robustbase", "tibble", "tidyr"] }, "ShapleyValue": { "name": "ShapleyValue", "version": "0.2.0", "sha256": "05ziyvvd81l0lx572in9snndnjdq8y4wkd8bxqs0y979l49yr6fd", - "depends": ["kableExtra", "MASS", "tidyverse"] + "depends": ["MASS", "kableExtra", "tidyverse"] }, "SharkDemography": { "name": "SharkDemography", "version": "1.1.0", "sha256": "188qzbixz44qvi1jqr76hmmamkxn43lc9sayrpsvwi3bhkj9ablw", - "depends": ["doFuture", "doParallel", "dplyr", "foreach", "interp", "iterators", "magrittr", "MASS", "popbio", "readr", "tidyr"] + "depends": ["MASS", "doFuture", "doParallel", "dplyr", "foreach", "interp", "iterators", "magrittr", "popbio", "readr", "tidyr"] }, "SharpeR": { "name": "SharpeR", @@ -32357,13 +32693,13 @@ "name": "ShinyLink", "version": "0.2.2", "sha256": "1idb95hdjllrhzm4fx1lrx3d2palbwjshm6ppjw916p7wg7y7wqn", - "depends": ["config", "DT", "fastLink", "gender", "ggplot2", "ggvenn", "golem", "haven", "htmlwidgets", "jsonlite", "lubridate", "magrittr", "readxl", "shiny", "shinydashboard", "shinydashboardPlus", "shinyWidgets", "tidyr", "tidyselect", "vroom"] + "depends": ["DT", "config", "fastLink", "gender", "ggplot2", "ggvenn", "golem", "haven", "htmlwidgets", "jsonlite", "lubridate", "magrittr", "readxl", "shiny", "shinyWidgets", "shinydashboard", "shinydashboardPlus", "tidyr", "tidyselect", "vroom"] }, "ShinyQuickStarter": { "name": "ShinyQuickStarter", "version": "2.0.1", "sha256": "19k46hwcab33l6dc43dp4hvvr366qh3z2jjw3b79x7f824wampnn", - "depends": ["colourpicker", "data_table", "dplyr", "fs", "ggplot2", "miniUI", "plotly", "reshape2", "shiny", "shinyalert", "shinydashboard", "shinyFiles", "shinyjs", "shinyWidgets", "stringi", "stringr", "styler"] + "depends": ["colourpicker", "data_table", "dplyr", "fs", "ggplot2", "miniUI", "plotly", "reshape2", "shiny", "shinyFiles", "shinyWidgets", "shinyalert", "shinydashboard", "shinyjs", "stringi", "stringr", "styler"] }, "ShinyTester": { "name": "ShinyTester", @@ -32399,7 +32735,7 @@ "name": "SiPhyNetwork", "version": "1.1.0", "sha256": "11p50ysznrrjjsiba1ivsbfpqg3zd5dqmkvj9p574acwhqj3dflp", - "depends": ["ape", "lifecycle", "Rcpp", "rstackdeque"] + "depends": ["Rcpp", "ape", "lifecycle", "rstackdeque"] }, "SiZer": { "name": "SiZer", @@ -32411,13 +32747,13 @@ "name": "Sie2nts", "version": "0.1.0", "sha256": "14s13v5y33kjgd779wrdzy985sp9qg0a0rh5qx66qs9gmff6r663", - "depends": ["ggplot2", "Matrix", "plotly", "RCurl", "stringr"] + "depends": ["Matrix", "RCurl", "ggplot2", "plotly", "stringr"] }, "Sieve": { "name": "Sieve", "version": "2.1", "sha256": "1smsr073zl91jxdrawy12rn2ygs2zhj79npb20c98zs7npp5yrj6", - "depends": ["combinat", "glmnet", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "combinat", "glmnet"] }, "SigOptR": { "name": "SigOptR", @@ -32429,25 +32765,25 @@ "name": "SigTree", "version": "1.10.6", "sha256": "18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w", - "depends": ["ape", "MASS", "phyext2", "phylobase", "phyloseq", "RColorBrewer", "vegan"] + "depends": ["MASS", "RColorBrewer", "ape", "phyext2", "phylobase", "phyloseq", "vegan"] }, "SightabilityModel": { "name": "SightabilityModel", "version": "1.5.5", "sha256": "1fj871q0mav3dffm3sjg4zsci0lm8z74nfgbbrv6jzab155vfrmc", - "depends": ["formula_tools", "Matrix", "msm", "mvtnorm", "plyr", "survey"] + "depends": ["Matrix", "formula_tools", "msm", "mvtnorm", "plyr", "survey"] }, "Signac": { "name": "Signac", "version": "1.13.0", "sha256": "0ahv4j1jbhbclvidyw6h15p6n64zhawamqnrn8s1hf9pchy11d6r", - "depends": ["BiocGenerics", "data_table", "dplyr", "fastmatch", "future", "future_apply", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "irlba", "lifecycle", "Matrix", "patchwork", "pbapply", "Rcpp", "RcppRoll", "rlang", "Rsamtools", "S4Vectors", "scales", "SeuratObject", "stringi", "tidyr", "tidyselect", "vctrs"] + "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "RcppRoll", "Rsamtools", "S4Vectors", "SeuratObject", "data_table", "dplyr", "fastmatch", "future", "future_apply", "ggplot2", "irlba", "lifecycle", "patchwork", "pbapply", "rlang", "scales", "stringi", "tidyr", "tidyselect", "vctrs"] }, "SignacX": { "name": "SignacX", "version": "2.2.5", "sha256": "0b38k3lxca985mqwvbbdczkjnn2x79kga05yw995gb6d20cjh96v", - "depends": ["igraph", "jsonlite", "lme4", "Matrix", "neuralnet", "pbmcapply", "RColorBrewer", "RJSONIO", "Seurat"] + "depends": ["Matrix", "RColorBrewer", "RJSONIO", "Seurat", "igraph", "jsonlite", "lme4", "neuralnet", "pbmcapply"] }, "SignifReg": { "name": "SignifReg", @@ -32459,7 +32795,7 @@ "name": "SillyPutty", "version": "0.4.1", "sha256": "18qc7dwd29zghx9klsslvr2pianbf3av0pvc0wc09781hiv3xksg", - "depends": ["cluster", "oompaBase", "Polychrome", "Thresher"] + "depends": ["Polychrome", "Thresher", "cluster", "oompaBase"] }, "Sim_DiffProc": { "name": "Sim.DiffProc", @@ -32477,7 +32813,7 @@ "name": "SimBIID", "version": "0.2.1", "sha256": "01gkkgxx5x9pkwsmpmf1rg4i0ls7fl6yv6pcg8gscr51bnxsrwpp", - "depends": ["coda", "dplyr", "ggplot2", "mvtnorm", "purrr", "RColorBrewer", "Rcpp", "RcppArmadillo", "RcppXPtrUtils", "tibble", "tidyr"] + "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "RcppXPtrUtils", "coda", "dplyr", "ggplot2", "mvtnorm", "purrr", "tibble", "tidyr"] }, "SimComp": { "name": "SimComp", @@ -32501,13 +32837,13 @@ "name": "SimCorrMix", "version": "0.1.1", "sha256": "1mx8xkg1nbh4x4xr6m672zyg00s3lky2sy5mz7dfkw40vz2bwi53", - "depends": ["BB", "ggplot2", "MASS", "Matrix", "mvtnorm", "nleqslv", "SimMultiCorrData", "triangle", "VGAM"] + "depends": ["BB", "MASS", "Matrix", "SimMultiCorrData", "VGAM", "ggplot2", "mvtnorm", "nleqslv", "triangle"] }, "SimDesign": { "name": "SimDesign", - "version": "2.15.1", - "sha256": "045bw9zjwhpfgvcl7vfgszxlb6h6wxp83fjh79rm2spnq96vzwk2", - "depends": ["beepr", "dplyr", "foreach", "future", "future_apply", "pbapply", "progressr", "R_utils", "RPushbullet", "sessioninfo"] + "version": "2.17.1", + "sha256": "0anmnzxxw7mv9kykjf2kmgv6qwxkrg48g91q32r2ia4dw8n17782", + "depends": ["RPushbullet", "R_utils", "beepr", "dplyr", "future", "future_apply", "parallelly", "pbapply", "progressr", "sessioninfo", "snow", "testthat"] }, "SimDissolution": { "name": "SimDissolution", @@ -32525,7 +32861,7 @@ "name": "SimEngine", "version": "1.4.0", "sha256": "0rcggzaz6vjf4vrnl9ashyl2lyn0zydypaj9bjhar5bq652xrwz5", - "depends": ["data_table", "dplyr", "magrittr", "MASS", "pbapply", "rlang"] + "depends": ["MASS", "data_table", "dplyr", "magrittr", "pbapply", "rlang"] }, "SimHaz": { "name": "SimHaz", @@ -32535,9 +32871,9 @@ }, "SimInf": { "name": "SimInf", - "version": "9.7.0", - "sha256": "1pkr4x3qmv1b75b2s38nck08lsj8k81rp3md4biachvw56ym74s9", - "depends": ["digest", "MASS", "Matrix"] + "version": "9.8.1", + "sha256": "1lpx7749ld6h5gdlyrlxwp2zx7g9fxxb6s7r8p2pxpyvgrss2pqr", + "depends": ["MASS", "Matrix", "digest"] }, "SimJoint": { "name": "SimJoint", @@ -32549,25 +32885,25 @@ "name": "SimMultiCorrData", "version": "0.2.2", "sha256": "0brszbqxf40y65xp96c5hp7hhvz3gv0xlg93r5ik8qdh0bn0y1sw", - "depends": ["BB", "GenOrd", "ggplot2", "Matrix", "nleqslv", "psych", "triangle", "VGAM"] + "depends": ["BB", "GenOrd", "Matrix", "VGAM", "ggplot2", "nleqslv", "psych", "triangle"] }, "SimNPH": { "name": "SimNPH", "version": "0.5.5", "sha256": "05qp6cnih319p88vrppwvxh595a7vawkc7508xzmzhvrjbn3p7jn", - "depends": ["car", "dplyr", "miniPCH", "nph", "nphRCT", "purrr", "rlang", "SimDesign", "stringr", "survival", "tibble", "tidyr"] + "depends": ["SimDesign", "car", "dplyr", "miniPCH", "nph", "nphRCT", "purrr", "rlang", "stringr", "survival", "tibble", "tidyr"] }, "SimReg": { "name": "SimReg", "version": "3.4", "sha256": "07wkrfv65mbddbnsv0cbdn7m1ahfk2z11dv6r6ia97vz9yz0k03j", - "depends": ["ontologyIndex", "ontologyPlot", "ontologySimilarity", "Rcpp"] + "depends": ["Rcpp", "ontologyIndex", "ontologyPlot", "ontologySimilarity"] }, "SimSST": { "name": "SimSST", "version": "0.0.5.2", "sha256": "1c3bkcvq4767yabw7ifv3akhlavscgxwx5rp18c23icjd3pk9avx", - "depends": ["dplyr", "gamlss_dist", "MASS"] + "depends": ["MASS", "dplyr", "gamlss_dist"] }, "SimSeq": { "name": "SimSeq", @@ -32591,7 +32927,7 @@ "name": "SimTimeVar", "version": "1.0.0", "sha256": "1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8", - "depends": ["car", "corpcor", "ICC", "metafor", "miscTools", "mvtnorm", "plyr", "psych"] + "depends": ["ICC", "car", "corpcor", "metafor", "miscTools", "mvtnorm", "plyr", "psych"] }, "SimVitD": { "name": "SimVitD", @@ -32621,7 +32957,7 @@ "name": "SimplyAgree", "version": "0.2.0", "sha256": "10n63rn7kl4k1q7k3jz4f3macmn8y662jy41vdspgdwf0iqvf5in", - "depends": ["boot", "dplyr", "emmeans", "ggplot2", "insight", "jmvcore", "lifecycle", "lme4", "magrittr", "MASS", "Matrix", "nlme", "patchwork", "purrr", "quantreg", "stringr", "tidyr", "tidyselect"] + "depends": ["MASS", "Matrix", "boot", "dplyr", "emmeans", "ggplot2", "insight", "jmvcore", "lifecycle", "lme4", "magrittr", "nlme", "patchwork", "purrr", "quantreg", "stringr", "tidyr", "tidyselect"] }, "SingleCaseES": { "name": "SingleCaseES", @@ -32687,13 +33023,13 @@ "name": "SlidingWindows", "version": "0.2.0", "sha256": "0hvxg4hrk3rb1wxhi71rgamxd8wcwys569137znfs0y8j6yvf0jj", - "depends": ["DCCA", "nonlinearTseries", "PerformanceAnalytics", "TSEntropies"] + "depends": ["DCCA", "PerformanceAnalytics", "TSEntropies", "nonlinearTseries"] }, "SmCCNet": { "name": "SmCCNet", "version": "2.0.3", "sha256": "16kw1nk0y8v2dg4akv5biwznx6a0pv754453r3ymfxw7qjrknyqc", - "depends": ["EnvStats", "furrr", "future", "igraph", "magrittr", "Matrix", "pbapply", "pracma", "pROC", "purrr", "rlist", "spls"] + "depends": ["EnvStats", "Matrix", "furrr", "future", "igraph", "magrittr", "pROC", "pbapply", "pracma", "purrr", "rlist", "spls"] }, "SmallCountRounding": { "name": "SmallCountRounding", @@ -32705,7 +33041,7 @@ "name": "SmartEDA", "version": "0.3.10", "sha256": "05m96kp1ylbxslf9y9n063r807wz3wxf6whqmysb7bgyjpsnbzlb", - "depends": ["data_table", "GGally", "ggplot2", "gridExtra", "ISLR", "qpdf", "rmarkdown", "sampling", "scales"] + "depends": ["GGally", "ISLR", "data_table", "ggplot2", "gridExtra", "qpdf", "rmarkdown", "sampling", "scales"] }, "SmartMeterAnalytics": { "name": "SmartMeterAnalytics", @@ -32717,7 +33053,7 @@ "name": "SmartSVA", "version": "0.1.3", "sha256": "10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np", - "depends": ["isva", "Rcpp", "RcppEigen", "RSpectra", "sva"] + "depends": ["RSpectra", "Rcpp", "RcppEigen", "isva", "sva"] }, "SmarterPoland": { "name": "SmarterPoland", @@ -32725,6 +33061,12 @@ "sha256": "07nag50mzj7a4f5lprvvs6k7mppyzcwvkc3dj8b1il2k06q5ffh5", "depends": ["ggplot2", "htmltools", "httr", "jsonlite", "rjson"] }, + "SmithWilsonYieldCurve": { + "name": "SmithWilsonYieldCurve", + "version": "1.1.1", + "sha256": "0p24ay1y874qi4yvfa6b3xkf0m2gjwl8sl2dp59k0g20v0qzynzb", + "depends": [] + }, "SmoothHazard": { "name": "SmoothHazard", "version": "2024.04.10", @@ -32741,7 +33083,7 @@ "name": "SmoothWin", "version": "3.0.0", "sha256": "0zq2sq0w4rs3hrra24wgbbzv88d1hx6m8q8gmc5h6nbs1172hs66", - "depends": ["nlme", "Rfast"] + "depends": ["Rfast", "nlme"] }, "Snake": { "name": "Snake", @@ -32777,7 +33119,7 @@ "name": "SoftBart", "version": "1.0.1", "sha256": "0s7d2gxh6qnpwzagfrwhacgd7w3hxx3xkxrhk6kqjykpckdwy091", - "depends": ["caret", "glmnet", "MASS", "progress", "Rcpp", "RcppArmadillo", "scales", "truncnorm"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "caret", "glmnet", "progress", "scales", "truncnorm"] }, "SoftClustering": { "name": "SoftClustering", @@ -32867,7 +33209,7 @@ "name": "SortedEffects", "version": "1.7.0", "sha256": "188qlgg3m8f07hbjim65yw3qy6200y0b54imkdqm8mq0f14nmi0f", - "depends": ["boot", "Hmisc", "pbapply", "quantreg", "SparseM"] + "depends": ["Hmisc", "SparseM", "boot", "pbapply", "quantreg"] }, "SoundShape": { "name": "SoundShape", @@ -32885,7 +33227,7 @@ "name": "SoupX", "version": "1.6.2", "sha256": "19g3gqgiqllpafc9ihlm083d47zqiygh4p2dhy54k486gk6jcqlv", - "depends": ["ggplot2", "Matrix", "Seurat"] + "depends": ["Matrix", "Seurat", "ggplot2"] }, "SouthParkRshiny": { "name": "SouthParkRshiny", @@ -32897,7 +33239,7 @@ "name": "SoyNAM", "version": "1.6.2", "sha256": "1ajsk51bd9aajlyv9q6yjmdm9xs9jf07j5m189m00mhl21xpzn0b", - "depends": ["lme4", "NAM", "Rcpp", "RcppEigen", "reshape2"] + "depends": ["NAM", "Rcpp", "RcppEigen", "lme4", "reshape2"] }, "SoyURT": { "name": "SoyURT", @@ -32927,37 +33269,37 @@ "name": "SpTe2M", "version": "1.0.3", "sha256": "1xykmbgwwnvl7c9mf0aam3s55xmq2pxdy5wkkz9nzj1c74m0bxqf", - "depends": ["ggplot2", "glmnet", "knitr", "mapproj", "maps", "MASS", "rmarkdown"] + "depends": ["MASS", "ggplot2", "glmnet", "knitr", "mapproj", "maps", "rmarkdown"] }, "SpaCOAP": { "name": "SpaCOAP", "version": "1.2", "sha256": "1cj5avfsfzlb9jbyckpb2zjqkx9ny1msxcdcrcz7kr5njswyw55a", - "depends": ["irlba", "LaplacesDemon", "MASS", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["LaplacesDemon", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "irlba"] }, "SpaDES": { "name": "SpaDES", "version": "2.0.11", "sha256": "0clanr9cwyjhpjv5wsfhm34rmpf5gjh1hq0pzh6p1yp63wnj13m8", - "depends": ["quickPlot", "reproducible", "SpaDES_core", "SpaDES_tools"] + "depends": ["SpaDES_core", "SpaDES_tools", "quickPlot", "reproducible"] }, "SpaDES_core": { "name": "SpaDES.core", "version": "2.1.0", "sha256": "0avn2fvabwq8hfvpwkvrpmdq9692a8nx3km7343j217y7l4s7qdf", - "depends": ["cli", "data_table", "fs", "igraph", "lobstr", "qs", "quickPlot", "reproducible", "Require", "terra", "whisker"] + "depends": ["Require", "cli", "data_table", "fs", "igraph", "lobstr", "qs", "quickPlot", "reproducible", "terra", "whisker"] }, "SpaDES_tools": { "name": "SpaDES.tools", "version": "2.0.7", "sha256": "1kxjwxjr8ncjygj94wpp8z2q58hrb0fyhnz3ajp1jlgpdz3jripi", - "depends": ["backports", "checkmate", "data_table", "fpCompare", "Rcpp", "reproducible", "terra"] + "depends": ["Rcpp", "backports", "checkmate", "data_table", "fpCompare", "reproducible", "terra"] }, "SpaTopic": { "name": "SpaTopic", "version": "1.1.0", "sha256": "19jyxav7mbhpfi85b99wk6lah81ra81r5vbj4l6xm75fli4g3qzm", - "depends": ["foreach", "iterators", "RANN", "Rcpp", "RcppArmadillo", "RcppProgress", "sf"] + "depends": ["RANN", "Rcpp", "RcppArmadillo", "RcppProgress", "foreach", "iterators", "sf"] }, "SpaceTimeBSS": { "name": "SpaceTimeBSS", @@ -33005,12 +33347,12 @@ "name": "SparseLPM", "version": "1.0", "sha256": "1mpjf7yk2haa8hch315davb6nrhxhy0w2vgw2x4111rn4bskhd8m", - "depends": ["gtools", "Rcpp", "RcppArmadillo", "vegan"] + "depends": ["Rcpp", "RcppArmadillo", "gtools", "vegan"] }, "SparseM": { "name": "SparseM", - "version": "1.83", - "sha256": "0nh9nwp4k0mvvp8rawsxvbl4bk5pgzbpnx2xia3mrzw1y5f5szph", + "version": "1.84-2", + "sha256": "0rc6x466jhalb6baxxhffmmcpi03nndvvighp696rrvrhsxzv015", "depends": [] }, "SparseMDC": { @@ -33023,13 +33365,13 @@ "name": "SparseMSE", "version": "2.0.1", "sha256": "1alpvj0ya3r64wwfdzz2aaxgaf6512glzl65p97606c2fwrm6db7", - "depends": ["lpSolve", "Rcapture"] + "depends": ["Rcapture", "lpSolve"] }, "SparseTSCGM": { "name": "SparseTSCGM", "version": "4.0", "sha256": "01lfb3j907244hgapb85kba7zdmgzhw452gri208qgrjzfv2x9yh", - "depends": ["abind", "glasso", "huge", "longitudinal", "MASS", "mvtnorm", "network"] + "depends": ["MASS", "abind", "glasso", "huge", "longitudinal", "mvtnorm", "network"] }, "SparseVFC": { "name": "SparseVFC", @@ -33043,6 +33385,12 @@ "sha256": "0krcyymvwdcckiji1dlm9pyc2x82k5dfkvglfchv8w5kf6y2qmbh", "depends": ["spatstat", "spatstat_geom", "spatstat_random"] }, + "SpatFD": { + "name": "SpatFD", + "version": "0.0.1", + "sha256": "1v7j0fkd031kfgx2xvkd02kvzn3k5dp6s82jvcm7rdrd18z4hzkv", + "depends": ["MASS", "dplyr", "fda", "fda_usc", "geoR", "ggplot2", "gstat", "plotly", "proxy", "reshape", "sf", "sp", "tidyr"] + }, "SpatGC": { "name": "SpatGC", "version": "0.1.0", @@ -33059,13 +33407,13 @@ "name": "SpatMCA", "version": "1.0.4", "sha256": "051c6mdij04n7xc256qx0119gsg337w2xly3ykiy47nrd3svdvc3", - "depends": ["ggplot2", "MASS", "Rcpp", "RcppArmadillo", "RcppParallel", "scales"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "RcppParallel", "ggplot2", "scales"] }, "SpatPCA": { "name": "SpatPCA", "version": "1.3.5", "sha256": "1lx429glr6273ssy1in192jx4iynqidkfmj9iibwiij3fk9y0sa5", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "RcppParallel"] + "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "ggplot2"] }, "SpatialAcc": { "name": "SpatialAcc", @@ -33077,13 +33425,13 @@ "name": "SpatialBSS", "version": "0.14-0", "sha256": "0z8k4wd5rlx3bmp4zmfvblkf4nrkkqqfcpv5wzncyhi2ffgnybvm", - "depends": ["distances", "JADE", "Rcpp", "RcppArmadillo", "robustbase", "sp", "SpatialNP"] + "depends": ["JADE", "Rcpp", "RcppArmadillo", "SpatialNP", "distances", "robustbase", "sp"] }, "SpatialDDLS": { "name": "SpatialDDLS", "version": "1.0.2", "sha256": "1wnyy7wi7bqlm2wjmjw18b7fxyi0ngfry4rzdb4q0fl6x0lkl0hj", - "depends": ["dplyr", "FNN", "ggplot2", "ggpubr", "grr", "gtools", "keras", "Matrix", "pbapply", "reshape2", "reticulate", "rlang", "S4Vectors", "scran", "scuttle", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "tensorflow", "zinbwave"] + "depends": ["FNN", "Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "ggpubr", "grr", "gtools", "keras", "pbapply", "reshape2", "reticulate", "rlang", "scran", "scuttle", "tensorflow", "zinbwave"] }, "SpatialEpi": { "name": "SpatialEpi", @@ -33101,7 +33449,7 @@ "name": "SpatialGEV", "version": "1.0.1", "sha256": "1wk55vllcsqclzb9cb81pf28gkwxpql8kycyxry6b2ic6c32xgp4", - "depends": ["evd", "Matrix", "mvtnorm", "RcppEigen", "TMB"] + "depends": ["Matrix", "RcppEigen", "TMB", "evd", "mvtnorm"] }, "SpatialGraph": { "name": "SpatialGraph", @@ -33179,13 +33527,13 @@ "name": "SpatialVS", "version": "1.1", "sha256": "1xghfiz9wmmx11ssms7zjy3ggkjmc6kkbdwp3v5wjwpwapafzdk3", - "depends": ["fields", "MASS", "nlme"] + "depends": ["MASS", "fields", "nlme"] }, "SpatialVx": { "name": "SpatialVx", "version": "1.0-2", "sha256": "108mpxpk03gmak69fkd7snhls11hh31fwmva9kqh71rh5g3a47fw", - "depends": ["boot", "CircStats", "distillery", "fastcluster", "fields", "maps", "smatr", "smoothie", "spatstat", "spatstat_geom", "spatstat_linnet", "spatstat_model", "turboEM", "waveslim"] + "depends": ["CircStats", "boot", "distillery", "fastcluster", "fields", "maps", "smatr", "smoothie", "spatstat", "spatstat_geom", "spatstat_linnet", "spatstat_model", "turboEM", "waveslim"] }, "SpatialfdaR": { "name": "SpatialfdaR", @@ -33227,7 +33575,7 @@ "name": "SpectralClMixed", "version": "1.0.1", "sha256": "10nx03kr35irvvink8kfx6gbv90wnlsx514r7921hrjvcjiqn82s", - "depends": ["cluster", "GGally", "ggplot2", "RSpectra"] + "depends": ["GGally", "RSpectra", "cluster", "ggplot2"] }, "SpectralMap": { "name": "SpectralMap", @@ -33237,15 +33585,15 @@ }, "Spectran": { "name": "Spectran", - "version": "1.0.3", - "sha256": "1ylw4klxvklrgpanp4lz4q6kvrg0n51xrnxz0nw1s782ag1c5ndg", - "depends": ["chromote", "colorSpec", "cowplot", "dplyr", "gghighlight", "ggplot2", "ggrepel", "ggridges", "ggtext", "gt", "htmltools", "magrittr", "openxlsx", "pagedown", "patchwork", "png", "purrr", "readr", "rlang", "scales", "shiny", "shinyalert", "shinydashboard", "shinyFeedback", "shinyjs", "shinyWidgets", "spacesXYZ", "spsComps", "stringr", "tibble", "tidyr", "tidyselect", "waiter", "webshot2", "withr"] + "version": "1.0.6", + "sha256": "03nqfsg0hia8v1i7npzxjin3zm4x7sihk389h7cky46vfd95g627", + "depends": ["chromote", "colorSpec", "cowplot", "dplyr", "gghighlight", "ggplot2", "ggrepel", "ggridges", "ggtext", "gt", "htmltools", "magrittr", "openxlsx", "pagedown", "patchwork", "png", "purrr", "readr", "rlang", "scales", "shiny", "shinyFeedback", "shinyWidgets", "shinyalert", "shinydashboard", "shinyjs", "spacesXYZ", "spsComps", "stringr", "tibble", "tidyr", "tidyselect", "waiter", "webshot2", "withr"] }, "Spectrum": { "name": "Spectrum", "version": "1.1", "sha256": "0n38d360azkck6vvhr771zsh0gbvd9qsf9ygg5r18vhz0pb1xcfw", - "depends": ["ClusterR", "diptest", "ggplot2", "Rfast"] + "depends": ["ClusterR", "Rfast", "diptest", "ggplot2"] }, "SphereOptimize": { "name": "SphereOptimize", @@ -33257,13 +33605,13 @@ "name": "SphericalCubature", "version": "1.5", "sha256": "03j9f9v3zrykrd4lc74i19s3xyc0z3l2kg3056qg591sxw64h7vh", - "depends": ["abind", "cubature", "mvmesh", "SimplicialCubature"] + "depends": ["SimplicialCubature", "abind", "cubature", "mvmesh"] }, "SpiceFP": { "name": "SpiceFP", "version": "0.1.2", "sha256": "1vhsi9g925jc95589wp3cjlj8psvggkf1cws2awy94zi0z6lkiri", - "depends": ["doParallel", "foreach", "genlasso", "Matrix", "purrr", "stringr", "tidyr"] + "depends": ["Matrix", "doParallel", "foreach", "genlasso", "purrr", "stringr", "tidyr"] }, "Spillover": { "name": "Spillover", @@ -33287,7 +33635,7 @@ "name": "SplitKnockoff", "version": "1.2", "sha256": "1ywh86gkkcc2dddqfgs5w8w9wyjfqmvcr31jga41ddvj5rb8zkhx", - "depends": ["ggplot2", "glmnet", "latex2exp", "MASS", "Matrix", "mvtnorm", "RSpectra"] + "depends": ["MASS", "Matrix", "RSpectra", "ggplot2", "glmnet", "latex2exp", "mvtnorm"] }, "SplitReg": { "name": "SplitReg", @@ -33323,7 +33671,7 @@ "name": "SqueakR", "version": "1.3.0", "sha256": "09l6dj1xq2zxxy6jnh1dl4rlcbx06fvf0jp2nypv3497dn97jsrh", - "depends": ["dplyr", "ggcorrplot", "ggeasy", "gghighlight", "ggplot2", "ggpubr", "googlesheets4", "MASS", "plotly", "RColorBrewer", "readxl", "report", "rlist", "rstatix", "shiny", "shinydashboard"] + "depends": ["MASS", "RColorBrewer", "dplyr", "ggcorrplot", "ggeasy", "gghighlight", "ggplot2", "ggpubr", "googlesheets4", "plotly", "readxl", "report", "rlist", "rstatix", "shiny", "shinydashboard"] }, "Sshaped": { "name": "Sshaped", @@ -33347,7 +33695,7 @@ "name": "StMoMo", "version": "0.4.1", "sha256": "1c4v2gjipq1y4crc6bqvz2x5c02bl10mh9jacg8dqb2dffsh5y44", - "depends": ["fanplot", "fields", "forecast", "gnm", "MASS", "RColorBrewer", "reshape2", "rootSolve"] + "depends": ["MASS", "RColorBrewer", "fanplot", "fields", "forecast", "gnm", "reshape2", "rootSolve"] }, "StMoSim": { "name": "StMoSim", @@ -33359,25 +33707,25 @@ "name": "StReg", "version": "1.1", "sha256": "0cwrizyk4l82alfwijpljwhcjhgcimrf1vv8wsz7azwwiqzb0cns", - "depends": ["ADGofTest", "matlab", "MCMCpack", "numDeriv", "tseries"] + "depends": ["ADGofTest", "MCMCpack", "matlab", "numDeriv", "tseries"] }, "StabilizedRegression": { "name": "StabilizedRegression", "version": "1.1", "sha256": "02snfdx34k086craacfss1rnhldd81pdql4rf02w96jb1xadrq87", - "depends": ["corpcor", "ggplot2", "ggrepel", "glmnet", "MASS", "R6"] + "depends": ["MASS", "R6", "corpcor", "ggplot2", "ggrepel", "glmnet"] }, "StableEstim": { "name": "StableEstim", "version": "2.2", "sha256": "0z8ia3zqkidnpg2zl055msc0dmhbsq73h8c43y0vfmhdzqszcx9d", - "depends": ["fBasics", "MASS", "Matrix", "numDeriv", "Rdpack", "stabledist", "testthat", "xtable"] + "depends": ["MASS", "Matrix", "Rdpack", "fBasics", "numDeriv", "stabledist", "testthat", "xtable"] }, "StackImpute": { "name": "StackImpute", "version": "0.1.0", "sha256": "07b83bql9ch3arxzv94mllb61d4sv20lvpixlpzi7k8cjdddqizd", - "depends": ["boot", "dplyr", "magrittr", "MASS", "mice", "sandwich", "zoo"] + "depends": ["MASS", "boot", "dplyr", "magrittr", "mice", "sandwich", "zoo"] }, "StakeholderAnalysis": { "name": "StakeholderAnalysis", @@ -33387,15 +33735,15 @@ }, "StanHeaders": { "name": "StanHeaders", - "version": "2.32.9", - "sha256": "0cqb5q9pi02vahr4fif07p4r3p2sik953a9i78z1j00j9srzxc17", + "version": "2.32.10", + "sha256": "10l523sckx3jis5x1zw99iqy9hihjmngmcjq484bgin4gn6mn4n3", "depends": ["RcppEigen", "RcppParallel"] }, "StanMoMo": { "name": "StanMoMo", "version": "1.2.0", "sha256": "0hdh5c5zigmqs3v3ryk1h91w1a2mlqqjwbq51528w159frnd9mrl", - "depends": ["BH", "bridgesampling", "dplyr", "ggplot2", "httr", "latex2exp", "loo", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "tibble", "tidyr", "tidyselect", "tidyverse"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bridgesampling", "dplyr", "ggplot2", "httr", "latex2exp", "loo", "rstan", "rstantools", "tibble", "tidyr", "tidyselect", "tidyverse"] }, "Stat2Data": { "name": "Stat2Data", @@ -33407,7 +33755,7 @@ "name": "StatDA", "version": "1.7.11", "sha256": "0jp0qd96z2z2w7lqkyy0csz45fk0774wjf57idqbla3n21jbn4q9", - "depends": ["cluster", "e1071", "geoR", "MASS", "MBA", "mgcv", "rgl", "robustbase", "sgeostat", "sp", "xtable"] + "depends": ["MASS", "MBA", "cluster", "e1071", "geoR", "mgcv", "rgl", "robustbase", "sgeostat", "sp", "xtable"] }, "StatDataML": { "name": "StatDataML", @@ -33449,7 +33797,7 @@ "name": "Statsomat", "version": "1.1.0", "sha256": "1lfgbbf1pcfbih5nfb6rbiq2h0hlxg1fzmcf4330yc48r998q4x6", - "depends": ["car", "corrplot", "data_table", "DDoutlier", "energy", "ggplot2", "gridExtra", "kableExtra", "knitr", "readr", "reshape2", "rmarkdown", "shiny", "shinydisconnect"] + "depends": ["DDoutlier", "car", "corrplot", "data_table", "energy", "ggplot2", "gridExtra", "kableExtra", "knitr", "readr", "reshape2", "rmarkdown", "shiny", "shinydisconnect"] }, "SteinIV": { "name": "SteinIV", @@ -33467,13 +33815,13 @@ "name": "StempCens", "version": "1.1.0", "sha256": "0jphyikfggx0yj5f5k3fykf3fdv9msppymzpyin1m7xfmfi5cwia", - "depends": ["distances", "ggplot2", "MCMCglmm", "mvtnorm", "Rcpp", "RcppArmadillo", "Rdpack", "tmvtnorm"] + "depends": ["MCMCglmm", "Rcpp", "RcppArmadillo", "Rdpack", "distances", "ggplot2", "mvtnorm", "tmvtnorm"] }, "StepBeta": { "name": "StepBeta", "version": "2.1.0", "sha256": "1wr0f4c64hkhq8kjv6vf8laz5pmlyc0ajgd8007q8jris4jydzs6", - "depends": ["aod", "betareg", "combinat", "glue", "MASS"] + "depends": ["MASS", "aod", "betareg", "combinat", "glue"] }, "StepGWR": { "name": "StepGWR", @@ -33483,9 +33831,9 @@ }, "StepReg": { "name": "StepReg", - "version": "1.5.1", - "sha256": "0a7ywq6sfvny4mnknr15vqi2466vmv00qh6hwzdbr0lk873gq000", - "depends": ["cowplot", "dplyr", "DT", "flextable", "ggcorrplot", "ggplot2", "ggrepel", "MASS", "purrr", "rmarkdown", "shiny", "shinycssloaders", "shinyjs", "shinythemes", "stringr", "summarytools", "survival", "tidyr"] + "version": "1.5.2", + "sha256": "1v7inw48dg5mhhlmqvlj7s97w93sjha0djgrl1ninhgp08fl2njh", + "depends": ["DT", "MASS", "cowplot", "dplyr", "flextable", "ggcorrplot", "ggplot2", "ggrepel", "purrr", "rmarkdown", "shiny", "shinycssloaders", "shinyjs", "shinythemes", "stringr", "summarytools", "survival", "tidyr"] }, "StepSignalMargiLike": { "name": "StepSignalMargiLike", @@ -33497,7 +33845,7 @@ "name": "SteppedPower", "version": "0.3.5", "sha256": "0dxl88gfwi6wb9k4qmqhb9hqgvjpzbvwfpiqadzjwg1h6yg487y5", - "depends": ["Matrix", "plotly", "Rfast"] + "depends": ["Matrix", "Rfast", "plotly"] }, "StepwiseTest": { "name": "StepwiseTest", @@ -33509,19 +33857,19 @@ "name": "StereoMorph", "version": "1.6.7", "sha256": "0qrbl86ba83j4r6j2phap5n6ryi729gbypn95h0vbgrv752nayqp", - "depends": ["bezier", "jpeg", "MASS", "png", "Rcpp", "rjson", "shiny", "svgViewR", "tiff"] + "depends": ["MASS", "Rcpp", "bezier", "jpeg", "png", "rjson", "shiny", "svgViewR", "tiff"] }, "SticsRFiles": { "name": "SticsRFiles", - "version": "1.3.0", - "sha256": "0ldc0rl5www8bz9qc80198h0yiz10kqr9zmlhd7b510bhms0i1wp", - "depends": ["cli", "crayon", "curl", "data_table", "dplyr", "lifecycle", "lubridate", "rlang", "rstudioapi", "stringr", "tibble", "tidyr", "tidyselect", "XML", "xml2", "xslt"] + "version": "1.4.0", + "sha256": "1afn65z2pz99k3a1fq8w9jjy05bvsdy7p8f829iap1jaahnbz14m", + "depends": ["XML", "cli", "crayon", "curl", "data_table", "dplyr", "lifecycle", "lubridate", "rlang", "rstudioapi", "stringr", "tibble", "tidyr", "tidyselect", "xml2", "xslt"] }, "StochBlock": { "name": "StochBlock", "version": "0.1.2", "sha256": "0g0l36imgw3bvqj5g45abwicswcyqprzbkas9pzgha8dsc5s12w3", - "depends": ["blockmodeling", "doParallel", "doRNG", "foreach", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "blockmodeling", "doParallel", "doRNG", "foreach"] }, "StockDistFit": { "name": "StockDistFit", @@ -33537,9 +33885,9 @@ }, "StormR": { "name": "StormR", - "version": "0.1.1", - "sha256": "02pxdalkls5qyhms0micjx3w4vvqisv4rc4h7dmyszmacki4kn49", - "depends": ["maps", "ncdf4", "rworldmap", "sf", "stringr", "terra", "zoo"] + "version": "0.2.1", + "sha256": "0b425783y36lqlydxmm95lwcxb6xf893sfpa9wjfn976bqa6kpvv", + "depends": ["leaflet", "maps", "ncdf4", "rworldmap", "sf", "stringr", "terra", "zoo"] }, "StrainRanking": { "name": "StrainRanking", @@ -33563,7 +33911,7 @@ "name": "StrathE2E2", "version": "3.3.0", "sha256": "10y6bagqg1h57c8g7m837qidrf7wdf8r0jcgqwrcgkr1kbxywfg9", - "depends": ["deSolve", "NetIndices"] + "depends": ["NetIndices", "deSolve"] }, "StratifiedBalancing": { "name": "StratifiedBalancing", @@ -33587,7 +33935,7 @@ "name": "StratigrapheR", "version": "1.3.1", "sha256": "10cyv9cddi6lsy1ah3dhvf93gd5mal4frcdwy2zqq50apmmrx5l9", - "depends": ["diagram", "dplyr", "reshape", "shiny", "stringr", "XML"] + "depends": ["XML", "diagram", "dplyr", "reshape", "shiny", "stringr"] }, "StreamMetabolism": { "name": "StreamMetabolism", @@ -33611,13 +33959,13 @@ "name": "StroupGLMM", "version": "0.1.0", "sha256": "1w0xizdmwqflfhqwygyq7fw5ci7pdzmr8dfv3j0g3ljbj84kndzd", - "depends": ["aod", "broom", "car", "ggplot2", "lme4", "lmerTest", "lsmeans", "MASS", "mutoss", "nlme", "pbkrtest", "phia", "survey"] + "depends": ["MASS", "aod", "broom", "car", "ggplot2", "lme4", "lmerTest", "lsmeans", "mutoss", "nlme", "pbkrtest", "phia", "survey"] }, "StrucDiv": { "name": "StrucDiv", "version": "0.2.1", "sha256": "1mzkcij7mrmjj5ccmy0l3xbb75w0bi7vc2cxap3qkycqm1ajk1dr", - "depends": ["doParallel", "foreach", "glue", "raster", "Rcpp", "RcppProgress"] + "depends": ["Rcpp", "RcppProgress", "doParallel", "foreach", "glue", "raster"] }, "StructuralDecompose": { "name": "StructuralDecompose", @@ -33631,6 +33979,12 @@ "sha256": "1pj3inznw6flvmk22dzjcfjnwjhx7r98ngckz0axf6ipp3hb85jn", "depends": ["MASS", "matrixcalc"] }, + "StuteTest": { + "name": "StuteTest", + "version": "1.0.2", + "sha256": "1gkhs3f3pa96a80pipndlxbrwfn9x1l6xzkqmbd6781d90nnk939", + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "plm", "rnames"] + }, "SuRF_vs": { "name": "SuRF.vs", "version": "1.1.0.1", @@ -33659,13 +34013,13 @@ "name": "SubgrpID", "version": "0.12", "sha256": "0x25n5gm1fl5s157g5a7jszy1rj16151r0jpf61vvsw0c9c58707", - "depends": ["ggplot2", "glmnet", "MASS", "Matrix", "rpart", "survival"] + "depends": ["MASS", "Matrix", "ggplot2", "glmnet", "rpart", "survival"] }, "SubpathwayLNCE": { "name": "SubpathwayLNCE", "version": "1.0", "sha256": "051csjavr9549y54yirfdn266i7swsvpbcakhziyz4sl4afwx5kl", - "depends": ["BiasedUrn", "graph", "igraph", "RBGL"] + "depends": ["BiasedUrn", "RBGL", "graph", "igraph"] }, "SubtypeDrug": { "name": "SubtypeDrug", @@ -33679,6 +34033,12 @@ "sha256": "1rh792x7dyfnhnw6g0f6hb5wqw58j6j11k9xib11ba256qrnvwgc", "depends": [] }, + "SumcaVer1": { + "name": "SumcaVer1", + "version": "0.1.0", + "sha256": "0czswr99s0i2q942yld0qqyhaxyxjv5wa8lqv8nk59y9phwss904", + "depends": ["lme4", "psych"] + }, "SummaryLasso": { "name": "SummaryLasso", "version": "1.2.1", @@ -33713,7 +34073,7 @@ "name": "SuperGauss", "version": "2.0.3", "sha256": "174gicpk2jwbzg39m44sxp7506cja9cnn95r287sq7049lrj302a", - "depends": ["fftw", "R6", "Rcpp", "RcppEigen"] + "depends": ["R6", "Rcpp", "RcppEigen", "fftw"] }, "SuperLearner": { "name": "SuperLearner", @@ -33725,19 +34085,19 @@ "name": "SuperRanker", "version": "1.2.1", "sha256": "02yvx1lg2drhb111jcq90hq0vnycwp3mssclvazgcfyw9z7rnzwg", - "depends": ["prodlim", "Rcpp"] + "depends": ["Rcpp", "prodlim"] }, "SuperpixelImageSegmentation": { "name": "SuperpixelImageSegmentation", "version": "1.0.5", "sha256": "01j8p1vfnswy41b7nzmwml4aq8s00xwdk3zjcc1b6n9bqv0cgnaz", - "depends": ["ClusterR", "lattice", "OpenImageR", "R6", "Rcpp", "RcppArmadillo"] + "depends": ["ClusterR", "OpenImageR", "R6", "Rcpp", "RcppArmadillo", "lattice"] }, "Superpower": { "name": "Superpower", "version": "0.2.0", "sha256": "0bv2jx3hadp5d9c3q790in3m728c8jc1nkp9wqvzcdip1d29hyin", - "depends": ["afex", "dplyr", "emmeans", "ggplot2", "gridExtra", "magrittr", "MASS", "mvtnorm", "reshape2", "tidyr", "tidyselect"] + "depends": ["MASS", "afex", "dplyr", "emmeans", "ggplot2", "gridExtra", "magrittr", "mvtnorm", "reshape2", "tidyr", "tidyselect"] }, "SuppDists": { "name": "SuppDists", @@ -33755,13 +34115,13 @@ "name": "Surrogate", "version": "3.3.0", "sha256": "1r4i12f6kmbszrm8v17gp2396ybwv913ngr3mnhqmvsl91fnpwi6", - "depends": ["dplyr", "extraDistr", "flexsurv", "ks", "lattice", "latticeExtra", "lme4", "logistf", "MASS", "maxLik", "MBESS", "msm", "nlme", "numDeriv", "optimx", "pbapply", "purrr", "rms", "rvinecopulib", "survival", "tibble", "tidyr"] + "depends": ["MASS", "MBESS", "dplyr", "extraDistr", "flexsurv", "ks", "lattice", "latticeExtra", "lme4", "logistf", "maxLik", "msm", "nlme", "numDeriv", "optimx", "pbapply", "purrr", "rms", "rvinecopulib", "survival", "tibble", "tidyr"] }, "SurrogateBMA": { "name": "SurrogateBMA", "version": "1.0", "sha256": "19q63rdrm4y03xmjmjqvsq8s1fx48jalxshzrdyzms9dacbshr0z", - "depends": ["MCMCpack", "mvtnorm", "Rcpp", "RcppEigen", "RcppNumerical", "Rsurrogate"] + "depends": ["MCMCpack", "Rcpp", "RcppEigen", "RcppNumerical", "Rsurrogate", "mvtnorm"] }, "SurrogateOutcome": { "name": "SurrogateOutcome", @@ -33803,7 +34163,7 @@ "name": "SurvDisc", "version": "0.1.1", "sha256": "0ajvnm0a4krbm0m584bg58hd7dzl0f2rz5as1zsajx8agywb5qmv", - "depends": ["cubature", "MASS", "mvtnorm", "nlme", "simex", "survival"] + "depends": ["MASS", "cubature", "mvtnorm", "nlme", "simex", "survival"] }, "SurvEval": { "name": "SurvEval", @@ -33815,7 +34175,7 @@ "name": "SurvHiDim", "version": "0.1.1", "sha256": "1kix00zfrbx11pwx2dfag8vz5nvf8siw2kbxi8g4fb7xib9wh2na", - "depends": ["factoextra", "glmnet", "igraph", "Rdpack", "readr", "survival", "tidyverse", "useful"] + "depends": ["Rdpack", "factoextra", "glmnet", "igraph", "readr", "survival", "tidyverse", "useful"] }, "SurvLong": { "name": "SurvLong", @@ -33845,7 +34205,7 @@ "name": "SurvSparse", "version": "0.1", "sha256": "14v0319w2k6b5cmpfrcxc2h3558lrpf101mhbpkqy0k4ahsb0sax", - "depends": ["dplyr", "foreach", "gaussquad", "MASS", "nleqslv", "nloptr", "purrr", "tibble", "tidyr"] + "depends": ["MASS", "dplyr", "foreach", "gaussquad", "nleqslv", "nloptr", "purrr", "tibble", "tidyr"] }, "SurvTrunc": { "name": "SurvTrunc", @@ -33855,8 +34215,8 @@ }, "SurveyCC": { "name": "SurveyCC", - "version": "0.1.1", - "sha256": "1jhgc6alrpib0qhnh2l9zp9nvy8vfgi2y4dy26vh92rqhdym19ss", + "version": "0.2.1", + "sha256": "04p0g3dffk4khb2f2i9zzcqk8y1d13vyaf2vbn37zpc1c4zd9pvn", "depends": ["candisc", "survey"] }, "SurveyDefense": { @@ -33869,13 +34229,13 @@ "name": "SurviMChd", "version": "0.1.2", "sha256": "1lwbs9b8kc6lhlfjziphmdhm7h8p6d4fbhihsmjdi8lwngvpgxx8", - "depends": ["dplyr", "R2jags", "rjags"] + "depends": ["R2jags", "dplyr", "rjags"] }, "SurvivalClusteringTree": { "name": "SurvivalClusteringTree", "version": "1.1.1", "sha256": "1wxyk0b22igv319dpidm0b1wjp675k9z1araqzdd140lxan8nndf", - "depends": ["dplyr", "formula_tools", "gridtext", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "formula_tools", "gridtext", "survival"] }, "SurvivalTests": { "name": "SurvivalTests", @@ -33929,7 +34289,7 @@ "name": "SynDI", "version": "0.1.0", "sha256": "15vrp4qhgf0689h0jqygrdl1nl0xipwmy29dpfa8lx1vd1pb7dnn", - "depends": ["arm", "boot", "broom", "dplyr", "knitr", "magrittr", "MASS", "mice", "mvtnorm", "randomForest", "StackImpute"] + "depends": ["MASS", "StackImpute", "arm", "boot", "broom", "dplyr", "knitr", "magrittr", "mice", "mvtnorm", "randomForest"] }, "SyncMove": { "name": "SyncMove", @@ -33965,19 +34325,19 @@ "name": "SynthTools", "version": "1.0.1", "sha256": "19vasz3nnm5vgwqs6g2a5bibmk44br1bxga5zavsx938x3jw9gnd", - "depends": ["dplyr", "magrittr", "Rdpack"] + "depends": ["Rdpack", "dplyr", "magrittr"] }, "Sysrecon": { "name": "Sysrecon", "version": "0.1.3", "sha256": "01vbkv707m31bf69j3vxfiwgvaz56v2yr6da0j0796rcmca1d4b8", - "depends": ["ape", "dplyr", "ggplot2", "ggtree", "magrittr", "patchwork", "plyr", "RColorBrewer", "rlang", "SnowballC", "stringr", "tm"] + "depends": ["RColorBrewer", "SnowballC", "ape", "dplyr", "ggplot2", "ggtree", "magrittr", "patchwork", "plyr", "rlang", "stringr", "tm"] }, "SystemicR": { "name": "SystemicR", "version": "0.1.0", "sha256": "1vk08w734zxvrwzd81iy0azwcj53k6wvgc1qlaxw96hirdwdg6zr", - "depends": ["igraph", "Matrix", "quantreg", "xts"] + "depends": ["Matrix", "igraph", "quantreg", "xts"] }, "T2DFitTailor": { "name": "T2DFitTailor", @@ -34001,13 +34361,13 @@ "name": "T4cluster", "version": "0.1.2", "sha256": "0wai4qgpkwc1p5wwpvi0z6zrcj9ha1wiy27qjpcfvfa2bhaid2w5", - "depends": ["ADMM", "fda", "ggplot2", "lpSolve", "maotai", "MASS", "mclustcomp", "Rcpp", "RcppArmadillo", "Rdimtools", "Rdpack", "rstiefel", "scatterplot3d"] + "depends": ["ADMM", "MASS", "Rcpp", "RcppArmadillo", "Rdimtools", "Rdpack", "fda", "ggplot2", "lpSolve", "maotai", "mclustcomp", "rstiefel", "scatterplot3d"] }, "T4transport": { "name": "T4transport", "version": "0.1.2", "sha256": "091mq0f2cawkfmaql9gqgv2sbs5fwyv4i2sdw14p1r01wznfrqzf", - "depends": ["CVXR", "lpSolve", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["CVXR", "Rcpp", "RcppArmadillo", "Rdpack", "lpSolve"] }, "TAF": { "name": "TAF", @@ -34019,7 +34379,7 @@ "name": "TAG", "version": "0.5.1", "sha256": "1hni3ay1pg4gy3gm3sn3bcr8m3z2vlc5ivg7bmkzpxqdkl0w01h2", - "depends": ["DiceKriging", "FastGP", "foreach", "Matrix", "mgcv", "mlegp", "randtoolbox", "Rcpp", "RcppArmadillo"] + "depends": ["DiceKriging", "FastGP", "Matrix", "Rcpp", "RcppArmadillo", "foreach", "mgcv", "mlegp", "randtoolbox"] }, "TAM": { "name": "TAM", @@ -34031,7 +34391,7 @@ "name": "TANDEM", "version": "1.0.3", "sha256": "151rm95q2naw9y58df1lr2qiadnkgfb5j9v47v41bw4iipsmlp4p", - "depends": ["glmnet", "Matrix"] + "depends": ["Matrix", "glmnet"] }, "TAQMNGR": { "name": "TAQMNGR", @@ -34049,7 +34409,7 @@ "name": "TAShiny", "version": "0.1.0", "sha256": "1h8k8py7myrj7c18cbp4q7bmgmck64jagw9s9j1jaqzl9qf8cbgq", - "depends": ["dplyr", "igraph", "shiny", "SnowballC", "tm", "wordcloud2"] + "depends": ["SnowballC", "dplyr", "igraph", "shiny", "tm", "wordcloud2"] }, "TBEST": { "name": "TBEST", @@ -34061,13 +34421,13 @@ "name": "TBFmultinomial", "version": "0.1.3", "sha256": "0cd0dr8vkf0sfriaafp2x63dilxmirm0fljxm82zw77c9j5ly3kv", - "depends": ["nnet", "plotrix", "stringr", "VGAM"] + "depends": ["VGAM", "nnet", "plotrix", "stringr"] }, "TBRDist": { "name": "TBRDist", "version": "1.0.2", "sha256": "0xwr91fyx3x27szkafmcs5sffgs64svky7mddrrgcfnbdl5c4iia", - "depends": ["ape", "BH", "Rcpp", "Rdpack", "TreeDist", "TreeTools"] + "depends": ["BH", "Rcpp", "Rdpack", "TreeDist", "TreeTools", "ape"] }, "TBox": { "name": "TBox", @@ -34079,7 +34439,7 @@ "name": "TCA", "version": "1.2.1", "sha256": "1gyps0m7r44vcbzpbrs3xy2kyb2xsvmfzk1c0aq04s4ndcksplwb", - "depends": ["config", "data_table", "futile_logger", "gmodels", "Matrix", "matrixcalc", "matrixStats", "nloptr", "pbapply", "pracma", "quadprog", "rsvd"] + "depends": ["Matrix", "config", "data_table", "futile_logger", "gmodels", "matrixStats", "matrixcalc", "nloptr", "pbapply", "pracma", "quadprog", "rsvd"] }, "TCGAretriever": { "name": "TCGAretriever", @@ -34089,9 +34449,9 @@ }, "TCHazaRds": { "name": "TCHazaRds", - "version": "1.0", - "sha256": "00x6iyf61igagcjyrl5623yymcrplm35k8j7326vx13g4lzsmnln", - "depends": ["geosphere", "latticeExtra", "ncdf4", "raster", "rasterVis", "Rcpp", "sp", "terra"] + "version": "1.1.0", + "sha256": "0v9zabnvm196053srcbfrg5aml8rrcbx5v9byq60gv8p588yfmf8", + "depends": ["Rcpp", "geosphere", "latticeExtra", "ncdf4", "raster", "rasterVis", "sp", "terra"] }, "TCIApathfinder": { "name": "TCIApathfinder", @@ -34103,7 +34463,7 @@ "name": "TCIU", "version": "1.2.6", "sha256": "0gbzpd0yadxrlsmnwk4kzf6bvm504k18i0sf2bq6zjaczdhc0vkp", - "depends": ["cubature", "doParallel", "dplyr", "DT", "extraDistr", "fancycut", "fmri", "foreach", "forecast", "geometry", "ggplot2", "ggpubr", "gridExtra", "ICSNP", "interp", "MultiwayRegression", "plotly", "pracma", "RColorBrewer", "reshape2", "rrcov", "scales", "spatstat_explore", "spatstat_geom", "tidyr", "zoo"] + "depends": ["DT", "ICSNP", "MultiwayRegression", "RColorBrewer", "cubature", "doParallel", "dplyr", "extraDistr", "fancycut", "fmri", "foreach", "forecast", "geometry", "ggplot2", "ggpubr", "gridExtra", "interp", "plotly", "pracma", "reshape2", "rrcov", "scales", "spatstat_explore", "spatstat_geom", "tidyr", "zoo"] }, "TCPMOR": { "name": "TCPMOR", @@ -34115,31 +34475,31 @@ "name": "TDA", "version": "1.9.1", "sha256": "1zf01dlc95mi59yrwz98w6qridmixgm399r0dq4g02xinz7dnar3", - "depends": ["BH", "FNN", "igraph", "Rcpp", "RcppEigen", "scales"] + "depends": ["BH", "FNN", "Rcpp", "RcppEigen", "igraph", "scales"] }, "TDAkit": { "name": "TDAkit", "version": "0.1.2", "sha256": "1gvcv3016kjk98qm07i972fi66bcljj1avmagyc8qxs29cq3ngg3", - "depends": ["energy", "ggplot2", "maotai", "Rcpp", "RcppArmadillo", "Rdpack", "T4cluster", "TDAstats"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "T4cluster", "TDAstats", "energy", "ggplot2", "maotai"] }, "TDApplied": { "name": "TDApplied", "version": "3.0.3", "sha256": "112zkkmi2677kyxkrk2669xdcr7g3f7saqa4iy2qi8k36all87l7", - "depends": ["clue", "doParallel", "foreach", "iterators", "kernlab", "parallelly", "Rcpp", "rdist"] + "depends": ["Rcpp", "clue", "doParallel", "foreach", "iterators", "kernlab", "parallelly", "rdist"] }, "TDAstats": { "name": "TDAstats", "version": "0.4.1", "sha256": "1zmickqk60vm9rzy67hib835v3c45aqjk441p31vpbvhbiy58nq5", - "depends": ["ggplot2", "Rcpp"] + "depends": ["Rcpp", "ggplot2"] }, "TDAvec": { "name": "TDAvec", "version": "0.1.3", "sha256": "0g449p1y16sl35md9c4qnj3n7i5nx9appqx22d7ijjhr7zpv0p1s", - "depends": ["microbenchmark", "Rcpp", "TDA"] + "depends": ["Rcpp", "TDA", "microbenchmark"] }, "TDCM": { "name": "TDCM", @@ -34157,7 +34517,7 @@ "name": "TDLM", "version": "1.0.0", "sha256": "05gjbmhnamm94facg590sd1m7l3x51crd7x21ly6gmwyq5rjlffm", - "depends": ["Ecume", "mathjaxr", "Rdpack", "readr", "rmarkdown", "sf"] + "depends": ["Ecume", "Rdpack", "mathjaxr", "readr", "rmarkdown", "sf"] }, "TDPanalysis": { "name": "TDPanalysis", @@ -34199,7 +34559,7 @@ "name": "TELP", "version": "1.0.2", "sha256": "0abdbhp898lgv7jmgg82vzdx6ibyi053xw8b3p3kx49yfbiyynny", - "depends": ["arules", "arulesViz", "ggplot2", "gridExtra", "RColorBrewer", "tcltk2", "tm", "wordcloud"] + "depends": ["RColorBrewer", "arules", "arulesViz", "ggplot2", "gridExtra", "tcltk2", "tm", "wordcloud"] }, "TEQR": { "name": "TEQR", @@ -34211,7 +34571,7 @@ "name": "TESS", "version": "2.1.2", "sha256": "0qhzxppgk4ihkg00d08abb7xjl82n87mm3319iv0g7n6rky2qxy8", - "depends": ["ape", "coda", "deSolve", "Rcpp"] + "depends": ["Rcpp", "ape", "coda", "deSolve"] }, "TExPosition": { "name": "TExPosition", @@ -34247,7 +34607,7 @@ "name": "TFunHDDC", "version": "1.0.1", "sha256": "13j0bb2j2qrgbc8l3v1pg4c8frbi8cjfv09n2682z3zn90dz6z6d", - "depends": ["fda", "fda_usc", "MASS", "stringr", "tclust"] + "depends": ["MASS", "fda", "fda_usc", "stringr", "tclust"] }, "TGS": { "name": "TGS", @@ -34271,7 +34631,7 @@ "name": "THREC", "version": "1.0.0", "sha256": "0pdwjjsfqqbkfl21qiikcgl9psb9x2fh5qg7wi6x1kq906zzify7", - "depends": ["Deriv", "dplyr", "magic", "Matrix", "tidyr"] + "depends": ["Deriv", "Matrix", "dplyr", "magic", "tidyr"] }, "TIGERr": { "name": "TIGERr", @@ -34299,9 +34659,9 @@ }, "TKCat": { "name": "TKCat", - "version": "1.1.8", - "sha256": "0a2jfgg8rcgx4nckzmxk9a9jm4250a78pzcfaxj08d2gbkxairwz", - "depends": ["base64enc", "ClickHouseHTTP", "crayon", "DBI", "dplyr", "DT", "future", "getPass", "htmltools", "jsonlite", "jsonvalidate", "magrittr", "markdown", "Matrix", "promises", "readr", "ReDaMoR", "rlang", "roxygen2", "shiny", "shinydashboard", "tidyselect", "uuid", "visNetwork", "xml2"] + "version": "1.1.11", + "sha256": "1vwv7z669i7m0dq8jn24mia7y2pnbjvyprias8hnzh9gpwsv2b3w", + "depends": ["ClickHouseHTTP", "DBI", "DT", "Matrix", "ReDaMoR", "base64enc", "crayon", "dplyr", "future", "getPass", "htmltools", "jsonlite", "jsonvalidate", "magrittr", "markdown", "promises", "readr", "rlang", "roxygen2", "shiny", "shinydashboard", "tidyselect", "uuid", "visNetwork", "xml2"] }, "TLCAR": { "name": "TLCAR", @@ -34313,12 +34673,12 @@ "name": "TLMoments", "version": "0.7.5.3", "sha256": "096sr0j4vhlfsaxc565zgw0mjk4sxkl03i7ip3hzcfph1c05yj6h", - "depends": ["ggplot2", "hypergeo", "lmomco", "Rcpp"] + "depends": ["Rcpp", "ggplot2", "hypergeo", "lmomco"] }, "TMB": { "name": "TMB", - "version": "1.9.11", - "sha256": "07z9565rn64k3ysvcgq6s792qg1v102gd9in5ifigm140zc4l45j", + "version": "1.9.14", + "sha256": "1lvbjz9w8m6awww1vkzaw1qc4mmhlmdlk9s4qd5i0568zb15m72d", "depends": ["Matrix", "RcppEigen"] }, "TMDb": { @@ -34329,9 +34689,9 @@ }, "TML": { "name": "TML", - "version": "1.2.0", - "sha256": "0krnh14mi3vi4msiz84f56kmzq12b1qc246jny37isl1b2wz2zrp", - "depends": ["ape", "cluster", "combinat", "gtools", "lpSolve", "lpSolveAPI", "magick", "maps", "MASS", "Matrix", "miscTools", "phangorn", "phytools", "rcdd", "RcppAlgos", "Rfast", "rgl", "ROCR", "stringr"] + "version": "2.3.0", + "sha256": "1157saqs5wczzz45pk966pi5wswlcm2fa22f0q9kdsg92rfgxja7", + "depends": ["MASS", "Matrix", "ROCR", "RcppAlgos", "Rfast", "ape", "cluster", "combinat", "gtools", "lpSolve", "lpSolveAPI", "maps", "miscTools", "phangorn", "phytools", "rcdd", "rgl"] }, "TNC": { "name": "TNC", @@ -34355,7 +34715,7 @@ "name": "TOHM", "version": "1.4", "sha256": "15i9hrvxlnwbs9vrsyrfhnm4xwmi97hss2da0xqs1xj5nmzwymqh", - "depends": ["EQL", "igraph", "Matrix", "nloptr", "Rmpfr"] + "depends": ["EQL", "Matrix", "Rmpfr", "igraph", "nloptr"] }, "TORDs": { "name": "TORDs", @@ -34367,25 +34727,25 @@ "name": "TOSI", "version": "0.3.0", "sha256": "00v0cjyz22akar7jrpg5alnnbh2nhxjh5cmq053i65xl0wlbzdpg", - "depends": ["glmnet", "hdi", "MASS", "scalreg"] + "depends": ["MASS", "glmnet", "hdi", "scalreg"] }, "TOSTER": { "name": "TOSTER", "version": "0.8.3", "sha256": "1xp3hcx4nhxqw9mdqhk9h11wy3zpwci0z0hc38pryq7y6rx8908f", - "depends": ["cowplot", "distributional", "ggdist", "ggplot2", "jmvcore", "lifecycle", "R6", "tidyr"] + "depends": ["R6", "cowplot", "distributional", "ggdist", "ggplot2", "jmvcore", "lifecycle", "tidyr"] }, "TOU": { "name": "TOU", "version": "0.1.0", "sha256": "0wia39yj7abnicx4xhaq1g69qx5fmzh6gywyl5yqfmw03azmyl55", - "depends": ["DEoptim", "ggplot2", "Rdpack"] + "depends": ["DEoptim", "Rdpack", "ggplot2"] }, "TOmicsVis": { "name": "TOmicsVis", "version": "2.0.0", "sha256": "0s46i8wnvvs15xwb0g62rpn864b27hbx0lrjpcv2wb1s27iz1wv3", - "depends": ["Biobase", "circlize", "clusterProfiler", "ComplexHeatmap", "cowplot", "dplyr", "e1071", "EnhancedVolcano", "enrichplot", "factoextra", "GGally", "ggcorrplot", "ggforce", "ggnewscale", "ggplot2", "ggplotify", "ggpolypath", "ggpubr", "ggrepel", "ggsci", "igraph", "Mfuzz", "pheatmap", "plotrix", "randomcoloR", "RColorBrewer", "reshape2", "Rtsne", "shiny", "stringr", "survival", "survminer", "tidyr", "umap", "UpSetR", "vegan", "venn", "WGCNA"] + "depends": ["Biobase", "ComplexHeatmap", "EnhancedVolcano", "GGally", "Mfuzz", "RColorBrewer", "Rtsne", "UpSetR", "WGCNA", "circlize", "clusterProfiler", "cowplot", "dplyr", "e1071", "enrichplot", "factoextra", "ggcorrplot", "ggforce", "ggnewscale", "ggplot2", "ggplotify", "ggpolypath", "ggpubr", "ggrepel", "ggsci", "igraph", "pheatmap", "plotrix", "randomcoloR", "reshape2", "shiny", "stringr", "survival", "survminer", "tidyr", "umap", "vegan", "venn"] }, "TP_idm": { "name": "TP.idm", @@ -34397,7 +34757,7 @@ "name": "TPAC", "version": "0.2.0", "sha256": "1k3nd3yrv1kxidjwaff4q9aqf7yqqwa6946a154y2h3k21kfmwcc", - "depends": ["data_table", "MASS", "TPACData"] + "depends": ["MASS", "TPACData", "data_table"] }, "TPACData": { "name": "TPACData", @@ -34409,7 +34769,7 @@ "name": "TPCselect", "version": "0.8.3", "sha256": "1x3db852zp3c12aihwbaak4i0dwjyl4sfv5snn7ap3gj3lydlznp", - "depends": ["corpcor", "KernSmooth", "MASS", "psych"] + "depends": ["KernSmooth", "MASS", "corpcor", "psych"] }, "TPD": { "name": "TPD", @@ -34421,7 +34781,7 @@ "name": "TPEA", "version": "3.1.0", "sha256": "1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy", - "depends": ["foreach", "igraph", "Matrix", "MESS", "RCurl", "XML"] + "depends": ["MESS", "Matrix", "RCurl", "XML", "foreach", "igraph"] }, "TPES": { "name": "TPES", @@ -34439,7 +34799,7 @@ "name": "TPMplt", "version": "0.1.4", "sha256": "0zy6y9k7cqyflzma5567sn2jkvbmvl86zlrxiqlnga03hvsvw8a0", - "depends": ["dlm", "e1071", "ggplot2", "metR", "RColorBrewer", "rgl", "VBTree"] + "depends": ["RColorBrewer", "VBTree", "dlm", "e1071", "ggplot2", "metR", "rgl"] }, "TPmsm": { "name": "TPmsm", @@ -34451,7 +34811,7 @@ "name": "TR8", "version": "0.9.22", "sha256": "12miq65yl39pngpsa30qjcwp21vn93a4wvid03pmbf6x6hq0v4k7", - "depends": ["dplyr", "plyr", "rappdirs", "RCurl", "readxl", "reshape", "shiny", "taxize", "XML"] + "depends": ["RCurl", "XML", "dplyr", "plyr", "rappdirs", "readxl", "reshape", "shiny", "taxize"] }, "TRADER": { "name": "TRADER", @@ -34475,19 +34835,19 @@ "name": "TRES", "version": "1.1.5", "sha256": "0hrlqr6va7f17i4zizc2val2jxl151h8dbp4f97g0ixlqnv39qjl", - "depends": ["ManifoldOptim", "MASS", "pracma", "rTensor"] + "depends": ["MASS", "ManifoldOptim", "pracma", "rTensor"] }, "TRMF": { "name": "TRMF", "version": "0.2.1", "sha256": "1ar4shr2r58ksk7lzi3dwinp06d7inffrfmnvyb1s289swxg9a1w", - "depends": ["generics", "limSolve", "Matrix"] + "depends": ["Matrix", "generics", "limSolve"] }, "TRexSelector": { "name": "TRexSelector", "version": "1.0.0", "sha256": "1jxf4zxlhyinfa7w5h5zby7wy3bxbpcran5jy9byysgq5k8bqb5w", - "depends": ["boot", "doParallel", "doRNG", "foreach", "glmnet", "MASS", "tlars"] + "depends": ["MASS", "boot", "doParallel", "doRNG", "foreach", "glmnet", "tlars"] }, "TSA": { "name": "TSA", @@ -34505,7 +34865,7 @@ "name": "TSCI", "version": "3.0.4", "sha256": "01r09q1bvy8q28xmk28rmd3cx2y1kv9wgvrdmn3l08arjs83qv9g", - "depends": ["fastDummies", "ranger", "Rfast", "xgboost"] + "depends": ["Rfast", "fastDummies", "ranger", "xgboost"] }, "TSCS": { "name": "TSCS", @@ -34517,13 +34877,13 @@ "name": "TSDFGS", "version": "2.0", "sha256": "02p4caby7w1hgvizhm4cy0jr9mwwnh7gcq1snvz0cbd4mzpjcqgc", - "depends": ["dplyr", "ggplot2", "latex2exp", "lifecycle", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "dplyr", "ggplot2", "latex2exp", "lifecycle"] }, "TSDT": { "name": "TSDT", "version": "1.0.7", "sha256": "0h2nwlzq6p11735nhkkqz6r7lpmw98bwy9dpdmvj4wqb7c64p90p", - "depends": ["hash", "mlbench", "modeltools", "party", "rpart", "survival", "survRM2"] + "depends": ["hash", "mlbench", "modeltools", "party", "rpart", "survRM2", "survival"] }, "TSE": { "name": "TSE", @@ -34533,9 +34893,9 @@ }, "TSEAL": { "name": "TSEAL", - "version": "0.1.2", - "sha256": "1z1912mmmzyn4nh6cnkpddm5v25n87q1pqhd2q8k136xzncf9h57", - "depends": ["bigmemory", "caret", "checkmate", "magrittr", "MASS", "parallelly", "pryr", "statcomp", "synchronicity", "waveslim", "wdm"] + "version": "0.1.3", + "sha256": "1h0h5m19sp3g8nyj1hd7k4wbgal0ydvfw7f1kn6isfpk031bz5yb", + "depends": ["MASS", "bigmemory", "caret", "checkmate", "magrittr", "parallelly", "pryr", "statcomp", "synchronicity", "waveslim", "wdm"] }, "TSEind": { "name": "TSEind", @@ -34577,7 +34937,7 @@ "name": "TSGSIS", "version": "0.1", "sha256": "0zrlin6xi6sv5qb18a0wi8lzldqlwa9lbwnra44w3jza3kakff7n", - "depends": ["glmnet", "MASS"] + "depends": ["MASS", "glmnet"] }, "TSHRC": { "name": "TSHRC", @@ -34619,13 +34979,13 @@ "name": "TSPred", "version": "5.1", "sha256": "14dzpm5i5iml9kb49rnw7kq1ga03l4c6m485b1p8p3ya0n6mivkl", - "depends": ["dplyr", "e1071", "elmNNRcpp", "EMD", "forecast", "keras", "KFAS", "magrittr", "ModelMetrics", "MuMIn", "nnet", "plyr", "randomForest", "Rlibeemd", "RSNNS", "tfdatasets", "vars", "wavelets"] + "depends": ["EMD", "KFAS", "ModelMetrics", "MuMIn", "RSNNS", "Rlibeemd", "dplyr", "e1071", "elmNNRcpp", "forecast", "keras", "magrittr", "nnet", "plyr", "randomForest", "tfdatasets", "vars", "wavelets"] }, "TSS_RESTREND": { "name": "TSS.RESTREND", "version": "0.3.1", "sha256": "1la1ff9ajcabdsz5f2761647304fpwp779gv0gjds4mg25rf6n2f", - "depends": ["bfast", "broom", "ggplot2", "mblm", "RcppRoll", "strucchange"] + "depends": ["RcppRoll", "bfast", "broom", "ggplot2", "mblm", "strucchange"] }, "TSSS": { "name": "TSSS", @@ -34655,7 +35015,7 @@ "name": "TSclust", "version": "1.3.1", "sha256": "1pj984sf7z0bakr55jqcrxr4mh4gihdv197m2k05phpp5hsplsjh", - "depends": ["cluster", "dtw", "forecast", "KernSmooth", "locpol", "longitudinalData", "pdc"] + "depends": ["KernSmooth", "cluster", "dtw", "forecast", "locpol", "longitudinalData", "pdc"] }, "TSdeeplearning": { "name": "TSdeeplearning", @@ -34667,13 +35027,13 @@ "name": "TSdisaggregation", "version": "2.0.0", "sha256": "1c1xsjhmm76hxin0hzr5bl94k5y3vwaprdrarpfil142cm8qnvnj", - "depends": ["lars", "Matrix", "Rdpack", "withr", "zoo"] + "depends": ["Matrix", "Rdpack", "lars", "withr", "zoo"] }, "TSdist": { "name": "TSdist", "version": "3.7.1", "sha256": "0qbsmaifwx4279w0rg111l8jdid12ljcy25ailn2d8gk47r4pv9z", - "depends": ["cluster", "dtw", "KernSmooth", "locpol", "longitudinalData", "pdc", "proxy", "TSclust", "xts", "zoo"] + "depends": ["KernSmooth", "TSclust", "cluster", "dtw", "locpol", "longitudinalData", "pdc", "proxy", "xts", "zoo"] }, "TSeriesMMA": { "name": "TSeriesMMA", @@ -34685,25 +35045,25 @@ "name": "TSrepr", "version": "1.1.0", "sha256": "1bplh808byfi86rz2bs1ikiggg0a1k0z282vidhygvl927hz2fa4", - "depends": ["dtt", "MASS", "mgcv", "quantreg", "Rcpp", "wavelets"] + "depends": ["MASS", "Rcpp", "dtt", "mgcv", "quantreg", "wavelets"] }, "TSsmoothing": { "name": "TSsmoothing", "version": "0.1.0", "sha256": "1m4y6hfw5ghqmvbnha05w6k0abbr08xdcahmh897g68b06vcrjsl", - "depends": ["ggplot2", "gridExtra", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "ggplot2", "gridExtra"] }, "TSstudio": { "name": "TSstudio", "version": "0.1.7", "sha256": "1r901773xpnly9rrzzvz41w9jzdjwcj8ssf37n8qsnpy40kz4wc0", - "depends": ["data_table", "dplyr", "forecast", "forecastHybrid", "lubridate", "magrittr", "plotly", "purrr", "RColorBrewer", "reshape2", "scales", "tidyr", "tsibble", "viridis", "xts", "zoo"] + "depends": ["RColorBrewer", "data_table", "dplyr", "forecast", "forecastHybrid", "lubridate", "magrittr", "plotly", "purrr", "reshape2", "scales", "tidyr", "tsibble", "viridis", "xts", "zoo"] }, "TT": { "name": "TT", "version": "0.98", "sha256": "0vnj2lmhn8qk3p8m8kvamp1af71iw3l75ds0mm9c8vinw2z4fzg3", - "depends": ["data_tree", "dplyr", "DT", "htmlwidgets", "magrittr", "purrr"] + "depends": ["DT", "data_tree", "dplyr", "htmlwidgets", "magrittr", "purrr"] }, "TTAinterfaceTrendAnalysis": { "name": "TTAinterfaceTrendAnalysis", @@ -34715,7 +35075,7 @@ "name": "TTCA", "version": "0.1.1", "sha256": "16slr4c2nwbchsg6fk5prq22p2v4cjxzk93wd3xggav2lzrf8a5h", - "depends": ["MASS", "Matrix", "quantreg", "RISmed", "tcltk2", "VennDiagram"] + "depends": ["MASS", "Matrix", "RISmed", "VennDiagram", "quantreg", "tcltk2"] }, "TTR": { "name": "TTR", @@ -34739,7 +35099,7 @@ "name": "TULIP", "version": "1.0.2", "sha256": "16jf6ybwrhc4ckajdzpswilzn09agqz7mxg9a93gxkqvc2rwh5br", - "depends": ["glmnet", "MASS", "Matrix", "tensr"] + "depends": ["MASS", "Matrix", "glmnet", "tensr"] }, "TUWmodel": { "name": "TUWmodel", @@ -34751,7 +35111,7 @@ "name": "TVMM", "version": "3.2.1", "sha256": "0z2gdcci9pbpgnmr6dch5v0rsn34q18rwb14x9gyxdcvh3bch8z0", - "depends": ["DescToolsAddIns", "ggplot2", "gridExtra", "MASS", "robustbase", "tcltk2"] + "depends": ["DescToolsAddIns", "MASS", "ggplot2", "gridExtra", "robustbase", "tcltk2"] }, "Taba": { "name": "Taba", @@ -34805,7 +35165,7 @@ "name": "TangledFeatures", "version": "0.1.1", "sha256": "1jkhnl6y9jwxcj8njx2m8lax2z15ma6rk0bci871n4y6bp4bk4zn", - "depends": ["correlation", "data_table", "dplyr", "fastDummies", "ggplot2", "igraph", "janitor", "Matrix", "purrr", "ranger"] + "depends": ["Matrix", "correlation", "data_table", "dplyr", "fastDummies", "ggplot2", "igraph", "janitor", "purrr", "ranger"] }, "TapeR": { "name": "TapeR", @@ -34829,7 +35189,7 @@ "name": "TaxaNorm", "version": "2.4", "sha256": "1qlzmq8p90igns5bcl8ll20gbaid8aavzk7rhilzq7069i349idc", - "depends": ["BiocGenerics", "future", "future_apply", "ggplot2", "MASS", "matrixStats", "microbiome", "parallelly", "phyloseq", "pscl", "S4Vectors", "vegan"] + "depends": ["BiocGenerics", "MASS", "S4Vectors", "future", "future_apply", "ggplot2", "matrixStats", "microbiome", "parallelly", "phyloseq", "pscl", "vegan"] }, "TaxicabCA": { "name": "TaxicabCA", @@ -34847,13 +35207,13 @@ "name": "TcGSA", "version": "0.12.10", "sha256": "1bdffzq3zwvr0qsp71mp0fqf9dgx9n3f08c53adwavycwr6zg1l7", - "depends": ["cluster", "cowplot", "ggplot2", "GSA", "gtools", "lme4", "multtest", "reshape2", "stringr"] + "depends": ["GSA", "cluster", "cowplot", "ggplot2", "gtools", "lme4", "multtest", "reshape2", "stringr"] }, "Tcomp": { "name": "Tcomp", "version": "1.0.1", "sha256": "1k0gsf3yr5n9zc2yi6szxm6s7bf61lz4fx8m3v48jlp5w900prwb", - "depends": ["forecast", "Mcomp"] + "depends": ["Mcomp", "forecast"] }, "TeXCheckR": { "name": "TeXCheckR", @@ -34901,7 +35261,7 @@ "name": "TempStable", "version": "0.2.2", "sha256": "0z432kpblx6v2krsxi92bpa4k19yqja09idqbka4nghcj7sgrsjr", - "depends": ["copula", "doParallel", "foreach", "gsl", "hypergeo", "moments", "numDeriv", "rootSolve", "stabledist", "StableEstim", "VGAM"] + "depends": ["StableEstim", "VGAM", "copula", "doParallel", "foreach", "gsl", "hypergeo", "moments", "numDeriv", "rootSolve", "stabledist"] }, "Temporal": { "name": "Temporal", @@ -34925,7 +35285,7 @@ "name": "TensorClustering", "version": "1.0.2", "sha256": "094pk4v78d97sanrkirk0dyhy6w2i43imcw21q2r76w11d62w7k7", - "depends": ["abind", "combinat", "MASS", "mvtnorm", "pracma", "Rcpp", "rTensor", "tensr", "TRES"] + "depends": ["MASS", "Rcpp", "TRES", "abind", "combinat", "mvtnorm", "pracma", "rTensor", "tensr"] }, "TensorComplete": { "name": "TensorComplete", @@ -34941,14 +35301,14 @@ }, "TensorTest2D": { "name": "TensorTest2D", - "version": "1.1.1", - "sha256": "1yx1ggsbximbsrwimyg7jblbqr0f75z278f38hg61qjxzf9m4ndk", + "version": "1.1.2", + "sha256": "18q4a155cxgzlbq5d4nfqvj88m5hc5ysdshkpcbih98axc6zm071", "depends": [] }, "Ternary": { "name": "Ternary", - "version": "2.3.1", - "sha256": "0amdyg41mhny74zdl8xm9f4ljii4w6lncq57xgw7qlq946dfp8zg", + "version": "2.3.2", + "sha256": "0jsb67zcp2q3mmkx6c1ns34i0x98xkzvbpmvpwn5mjssc6ir3q3m", "depends": ["PlotTools", "RcppHungarian", "shiny", "sp", "viridisLite"] }, "TesiproV": { @@ -34961,7 +35321,7 @@ "name": "TestAnaAPP", "version": "1.0.1", "sha256": "0550i7d4bpbd9bvs7sbjd5aaqpqjpd2fzfbplxfcvz2q9dwbcp49", - "depends": ["bruceR", "cowplot", "difR", "dplyr", "DT", "EstCRM", "flextable", "ggplot2", "golem", "latticeExtra", "mirt", "officedown", "officer", "openxlsx", "plotrix", "rmarkdown", "shiny", "shinycssloaders", "shinydashboard", "stringr", "tidyr", "tidySEM"] + "depends": ["DT", "EstCRM", "bruceR", "cowplot", "difR", "dplyr", "flextable", "ggplot2", "golem", "latticeExtra", "mirt", "officedown", "officer", "openxlsx", "plotrix", "rmarkdown", "shiny", "shinycssloaders", "shinydashboard", "stringr", "tidySEM", "tidyr"] }, "TestCor": { "name": "TestCor", @@ -34979,13 +35339,13 @@ "name": "TestDesign", "version": "1.6.1", "sha256": "0f13d6j9x9knsd7ynz025x4pv61n49jk5m9ih09cm8xz9g1ypb4n", - "depends": ["crayon", "foreach", "logitnorm", "lpSolve", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "crayon", "foreach", "logitnorm", "lpSolve"] }, "TestDimorph": { "name": "TestDimorph", "version": "0.5.8", "sha256": "1gnjgglb2mnaidlhjhqyg4jk6cvw0n0rzzpxamq55n8yyqd2kkh3", - "depends": ["corrplot", "dplyr", "ggplot2", "Morpho", "multcompView", "tidyr", "tmvtnorm", "truncnorm"] + "depends": ["Morpho", "corrplot", "dplyr", "ggplot2", "multcompView", "tidyr", "tmvtnorm", "truncnorm"] }, "TestFunctions": { "name": "TestFunctions", @@ -35003,7 +35363,7 @@ "name": "TestGenerator", "version": "0.3.1", "sha256": "15jgcknxdc1nh3325rzlax3q69dgfxb2a3xm2bzpi7fb7ryv5grz", - "depends": ["CDMConnector", "checkmate", "cli", "DBI", "dplyr", "duckdb", "ggplot2", "glue", "jsonlite", "readr", "readxl", "rlang", "testthat", "tibble", "withr"] + "depends": ["CDMConnector", "DBI", "checkmate", "cli", "dplyr", "duckdb", "ggplot2", "glue", "jsonlite", "readr", "readxl", "rlang", "testthat", "tibble", "withr"] }, "TestIndVars": { "name": "TestIndVars", @@ -35021,13 +35381,13 @@ "name": "TestingSimilarity", "version": "1.1", "sha256": "1iq0wh13rl6rby44ql4d286r1akzwmbpsvnq9p8lkl8709z0d34w", - "depends": ["alabama", "DoseFinding", "lattice"] + "depends": ["DoseFinding", "alabama", "lattice"] }, "TestsSymmetry": { "name": "TestsSymmetry", "version": "1.0.0", "sha256": "0dbgw14m4nk1x9y186v3ynqrv14z8irr7yyq4087sqmpj6y79sb5", - "depends": ["e1071", "MASS", "Rcpp", "rpart"] + "depends": ["MASS", "Rcpp", "e1071", "rpart"] }, "Tex4exams": { "name": "Tex4exams", @@ -35039,19 +35399,19 @@ "name": "TexExamRandomizer", "version": "1.2.7", "sha256": "0anvlss8j4nlc9n8hswm5ljfpmbxfcl4rm5y53k0q04apx3q3gg8", - "depends": ["assertthat", "jsonlite", "Rcpp", "stringr"] + "depends": ["Rcpp", "assertthat", "jsonlite", "stringr"] }, "TextForecast": { "name": "TextForecast", "version": "0.1.3", "sha256": "0fjywwifkxpfyqhq6yrjy0ipnfr3lfgb179w993qj8f9nmdclrw1", - "depends": ["doParallel", "dplyr", "forcats", "forecast", "ggplot2", "glmnet", "Matrix", "pdftools", "plyr", "pracma", "RColorBrewer", "tidyr", "tidytext", "tm", "udpipe", "wordcloud"] + "depends": ["Matrix", "RColorBrewer", "doParallel", "dplyr", "forcats", "forecast", "ggplot2", "glmnet", "pdftools", "plyr", "pracma", "tidyr", "tidytext", "tm", "udpipe", "wordcloud"] }, "TextMiningGUI": { "name": "TextMiningGUI", "version": "0.3", "sha256": "0hl4rswc3icwf11idk9ydrbd3ghz6mb1vnabknal0fxffpdi37dd", - "depends": ["dplyr", "ggplot2", "ggwordcloud", "RColorBrewer", "slam", "syuzhet", "tibble", "tidyr", "tidytext", "tm"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "ggwordcloud", "slam", "syuzhet", "tibble", "tidyr", "tidytext", "tm"] }, "ThankYouStars": { "name": "ThankYouStars", @@ -35063,7 +35423,7 @@ "name": "TheOpenAIR", "version": "0.1.0", "sha256": "0ygv8hj3cnac8w8ppddnia03gw4cwi49gv9jddcc1132fkg6nbyr", - "depends": ["cli", "data_table", "httr", "magrittr", "R_utils", "reticulate", "rstudioapi", "stringi", "stringr", "tibble", "xml2"] + "depends": ["R_utils", "cli", "data_table", "httr", "magrittr", "reticulate", "rstudioapi", "stringi", "stringr", "tibble", "xml2"] }, "TheSFACE": { "name": "TheSFACE", @@ -35081,7 +35441,7 @@ "name": "ThermalSampleR", "version": "0.1.2", "sha256": "1s1hxfssh7d0c4v4phvqpkr4asfrflg84hznz2qgjrn9k0dbkljj", - "depends": ["cowplot", "dplyr", "EnvStats", "ggplot2", "janitor", "magrittr", "MASS", "purrr", "rlang", "sn", "testthat", "tidyr"] + "depends": ["EnvStats", "MASS", "cowplot", "dplyr", "ggplot2", "janitor", "magrittr", "purrr", "rlang", "sn", "testthat", "tidyr"] }, "Thermimage": { "name": "Thermimage", @@ -35097,9 +35457,9 @@ }, "ThomasJeffersonUniv": { "name": "ThomasJeffersonUniv", - "version": "0.1.2", - "sha256": "1flj8jrkaj7l3a6lq2ir365rfnyd883kbd90lbfal44nsb7y3j43", - "depends": ["lubridate", "stringdist", "survival", "timeDate", "writexl", "zoo"] + "version": "0.1.3", + "sha256": "1bf5dch0z077is7zz49hhwf3l2y4qpg47gdhvbp2968pb35mn35j", + "depends": ["lubridate", "stringdist", "stringi", "survival", "timeDate", "writexl", "zoo"] }, "ThreeGroups": { "name": "ThreeGroups", @@ -35123,31 +35483,31 @@ "name": "Thresher", "version": "1.1.4", "sha256": "01rjm3j1zxx7gc0m8cr5jgcbr6pz11mqxr5sw0bgh6kdc5n0by0n", - "depends": ["ade4", "ClassDiscovery", "colorspace", "MASS", "movMF", "oompaBase", "PCDimension"] + "depends": ["ClassDiscovery", "MASS", "PCDimension", "ade4", "colorspace", "movMF", "oompaBase"] }, "ThresholdROC": { "name": "ThresholdROC", "version": "2.9.4", "sha256": "1vh4fx8vbk5w6nrgkldnhxbhcdcrdc7sxhvm0gsn1gh7w5cgndq7", - "depends": ["ks", "MASS", "numDeriv", "pROC"] + "depends": ["MASS", "ks", "numDeriv", "pROC"] }, "ThresholdROCsurvival": { "name": "ThresholdROCsurvival", "version": "1.2.1", "sha256": "13njr43fb8jnjcy1n32q8rbrgqag9cdcwx4rpx16rx7kvjr23gcw", - "depends": ["boot", "InformativeCensoring", "pROC", "psych", "survival", "ThresholdROC"] + "depends": ["InformativeCensoring", "ThresholdROC", "boot", "pROC", "psych", "survival"] }, "ThurMod": { "name": "ThurMod", "version": "1.1.11", "sha256": "01ay1w3h300day5aljha93xyk0n8a98c7g5binvchgsa019mg9dd", - "depends": ["lavaan", "MASS", "matrixStats", "mvtnorm"] + "depends": ["MASS", "lavaan", "matrixStats", "mvtnorm"] }, "TiPS": { "name": "TiPS", "version": "1.2.3", "sha256": "061lyai1kjm5glm69wxpnqvgp1xzj8j893pa73x5fl228dqm526f", - "depends": ["gtools", "inline", "Rcpp", "stringr"] + "depends": ["Rcpp", "gtools", "inline", "stringr"] }, "TideCurves": { "name": "TideCurves", @@ -35177,7 +35537,7 @@ "name": "TidyConsultant", "version": "0.1.1", "sha256": "00gw5h3n04nnrkrqx981rksi4liydmljj4nnnjnnh2a7ra98pcln", - "depends": ["autostats", "badger", "Ckmeans_1d_dp", "framecleaner", "pacman", "presenter", "tidybins", "validata"] + "depends": ["Ckmeans_1d_dp", "autostats", "badger", "framecleaner", "pacman", "presenter", "tidybins", "validata"] }, "TidyDensity": { "name": "TidyDensity", @@ -35219,7 +35579,7 @@ "name": "TipDatingBeast", "version": "1.1-0", "sha256": "07lw6jnr76qrxwrwv90hi5ih2xf6g4sz4hfapk5vf1y3ayfskkl0", - "depends": ["DescTools", "mclust", "TeachingDemos"] + "depends": ["DescTools", "TeachingDemos", "mclust"] }, "Tlasso": { "name": "Tlasso", @@ -35243,19 +35603,19 @@ "name": "TooManyCellsR", "version": "0.1.1.0", "sha256": "0cypjf4a9q2kw4gwxlr59nbwn25wrrhrcmpksxi2yhd3qhk71q8n", - "depends": ["cowplot", "ggplot2", "imager", "jsonlite", "Matrix"] + "depends": ["Matrix", "cowplot", "ggplot2", "imager", "jsonlite"] }, "ToolsForCoDa": { "name": "ToolsForCoDa", "version": "1.0.6", "sha256": "1c37xv8h4jycnn9cnxlvby3p8hl3gfp4bdsbxm06bb323qj774pd", - "depends": ["calibrate", "HardyWeinberg", "MASS"] + "depends": ["HardyWeinberg", "MASS", "calibrate"] }, "Toothnroll": { "name": "Toothnroll", "version": "1.11", "sha256": "1xd6p1yxfp6x48cg81r8bgd8v19rpymbsnlzczylkzh6w7khaafl", - "depends": ["alphashape3d", "Arothron", "colorRamps", "compositions", "DescTools", "geometry", "lattice", "mgcv", "Morpho", "morphomap", "oce", "rgl", "Rvcg", "stringr", "vegan"] + "depends": ["Arothron", "DescTools", "Morpho", "Rvcg", "alphashape3d", "colorRamps", "compositions", "geometry", "lattice", "mgcv", "morphomap", "oce", "rgl", "stringr", "vegan"] }, "TopDom": { "name": "TopDom", @@ -35267,13 +35627,13 @@ "name": "TopKLists", "version": "1.0.8", "sha256": "1l2fshf4w2ykhxb1bhrblcknxppy4l4w5w0pm16zcvkhrsas06cs", - "depends": ["gplots", "Hmisc"] + "depends": ["Hmisc", "gplots"] }, "TopKSignal": { "name": "TopKSignal", "version": "1.0", "sha256": "1767v8njdi736im8fhf9yihrbxjrnyhs7xpmdzphsm55qm8rda1x", - "depends": ["doParallel", "foreach", "ggplot2", "Matrix", "nloptr", "reshape2"] + "depends": ["Matrix", "doParallel", "foreach", "ggplot2", "nloptr", "reshape2"] }, "TopSisWM": { "name": "TopSisWM", @@ -35285,7 +35645,7 @@ "name": "TopicScore", "version": "0.0.1", "sha256": "1x6s3yn25rj8mbd25yi7f2rz0nwg8n0l1vs6r250kyjb17d2javm", - "depends": ["combinat", "Matrix", "quadprog", "RSpectra", "slam"] + "depends": ["Matrix", "RSpectra", "combinat", "quadprog", "slam"] }, "TotalCopheneticIndex": { "name": "TotalCopheneticIndex", @@ -35309,43 +35669,43 @@ "name": "TraMineR", "version": "2.2-10", "sha256": "19l51vjn4ljyfghsl93amh94zqsvf290ahvb7r4z6kqgdbz8j5lb", - "depends": ["boot", "cluster", "colorspace", "RColorBrewer", "vegan"] + "depends": ["RColorBrewer", "boot", "cluster", "colorspace", "vegan"] }, "TraMineRextras": { "name": "TraMineRextras", - "version": "0.6.7", - "sha256": "06kl8xxszwdra3dyapnk76frnz416lbkqfvxc115pnwxlf8ad8v5", - "depends": ["cluster", "colorspace", "doParallel", "foreach", "RColorBrewer", "survival", "TraMineR"] + "version": "0.6.8", + "sha256": "1nwhy0l9af9k320bwzd0klrz3n7kad95j2pr813x4b5jb7nxrr92", + "depends": ["RColorBrewer", "TraMineR", "cluster", "colorspace", "doParallel", "foreach", "survival"] }, "TraceAssist": { "name": "TraceAssist", "version": "0.1.0", "sha256": "03x071nsfgz1z2qp1zn1y3hfx8ydpj0z4rcfk2i588ad53z86w4c", - "depends": ["glmnet", "keras", "Matrix", "quadprog"] + "depends": ["Matrix", "glmnet", "keras", "quadprog"] }, "TrackReconstruction": { "name": "TrackReconstruction", "version": "1.3", "sha256": "0x2wydp9qj2r2rsv0kmwlq4y7mr391ya13rpnj3mdgl0pjdp445s", - "depends": ["fields", "RColorBrewer"] + "depends": ["RColorBrewer", "fields"] }, "Trading": { "name": "Trading", "version": "3.0", "sha256": "1xf3qr6g8vxdwrx57pazr79k86d3mdhqaps0vj8iz4dr172gms8k", - "depends": ["data_table", "ggplot2", "PerformanceAnalytics", "RcppAlgos", "readxl", "reticulate"] + "depends": ["PerformanceAnalytics", "RcppAlgos", "data_table", "ggplot2", "readxl", "reticulate"] }, "TrafficBDE": { "name": "TrafficBDE", "version": "0.1.2", "sha256": "1xjvh0y1fw6j3psjm61wmggaf61qx13mirjyrli4cf7z1k7r0fzw", - "depends": ["caret", "data_table", "DescriptiveStats_OBeu", "dplyr", "lubridate", "RCurl", "zoo"] + "depends": ["DescriptiveStats_OBeu", "RCurl", "caret", "data_table", "dplyr", "lubridate", "zoo"] }, "TransGraph": { "name": "TransGraph", "version": "1.0.1", "sha256": "0fr038zd4gg3cjlsjl6jz6a73bp0rfbxmgphnbv0ambbm62i9w3h", - "depends": ["clime", "dcov", "doParallel", "EvaluationMeasures", "expm", "glasso", "HeteroGGM", "huge", "MASS", "rTensor", "Tlasso"] + "depends": ["EvaluationMeasures", "HeteroGGM", "MASS", "Tlasso", "clime", "dcov", "doParallel", "expm", "glasso", "huge", "rTensor"] }, "TransModel": { "name": "TransModel", @@ -35363,13 +35723,13 @@ "name": "TransPhylo", "version": "1.4.5", "sha256": "0g92kwi1nlmpc8m4pc9kv9xhczryr2kn9icfr3js7da7vy8g50xy", - "depends": ["ape", "Rcpp"] + "depends": ["Rcpp", "ape"] }, "TransTGGM": { "name": "TransTGGM", "version": "1.0.0", "sha256": "0c815qp0nb4c8ymq9gm9yr37vkzlb6fja9j0czl6ww7rvr8fplrn", - "depends": ["doParallel", "expm", "glasso", "MASS", "Matrix", "rTensor", "Tlasso"] + "depends": ["MASS", "Matrix", "Tlasso", "doParallel", "expm", "glasso", "rTensor"] }, "Transform": { "name": "Transform", @@ -35387,7 +35747,7 @@ "name": "TreatmentPatterns", "version": "2.6.7", "sha256": "1s6rvsqa4q6nr9vlfmcysn58qw88df05fp638y8yxc791bw120gm", - "depends": ["Andromeda", "checkmate", "dplyr", "htmlwidgets", "networkD3", "R6", "shiny", "shinydashboard", "stringr", "sunburstR", "tidyr"] + "depends": ["Andromeda", "R6", "checkmate", "dplyr", "htmlwidgets", "networkD3", "shiny", "shinydashboard", "stringr", "sunburstR", "tidyr"] }, "TreatmentSelection": { "name": "TreatmentSelection", @@ -35399,7 +35759,7 @@ "name": "TreeBUGS", "version": "1.5.0", "sha256": "0nxv2hh7flmyfm2pap97hwjyz29hfzybfv3b1v0ygqffgmh1j7mb", - "depends": ["coda", "hypergeo", "logspline", "MASS", "Rcpp", "RcppArmadillo", "rjags", "runjags"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "coda", "hypergeo", "logspline", "rjags", "runjags"] }, "TreeDep": { "name": "TreeDep", @@ -35417,13 +35777,13 @@ "name": "TreeDimensionTest", "version": "0.0.2", "sha256": "1bwvspjvc1cragbsrc05vhwk0zmfj36r9piqbj0vgahpjb4cswn9", - "depends": ["fitdistrplus", "igraph", "mlpack", "nFactors", "RColorBrewer", "Rcpp", "Rdpack"] + "depends": ["RColorBrewer", "Rcpp", "Rdpack", "fitdistrplus", "igraph", "mlpack", "nFactors"] }, "TreeDist": { "name": "TreeDist", - "version": "2.7.0", - "sha256": "1x92z0ipk3rk94hxc3al76y51pzha2csry3vrflll7sgshkbr5rj", - "depends": ["ape", "cli", "colorspace", "memoise", "phangorn", "Rcpp", "Rdpack", "shiny", "shinyjs", "TreeTools"] + "version": "2.8.0", + "sha256": "1l8clk5b4fivinxjr0amd0kcwa2bg4mb4cjk8f9cxhbp2kk78kr0", + "depends": ["Rcpp", "Rdpack", "TreeTools", "ape", "cli", "colorspace", "memoise", "shiny", "shinyjs"] }, "TreeMineR": { "name": "TreeMineR", @@ -35441,7 +35801,7 @@ "name": "TreeSearch", "version": "1.5.1", "sha256": "0nxzjv4q052nsfrib3i95b92alxipds5bll1aldh88dabhn3c0v5", - "depends": ["ape", "cli", "cluster", "fastmatch", "fs", "future", "PlotTools", "promises", "protoclust", "Rcpp", "Rdpack", "Rogue", "shiny", "shinyjs", "TreeDist", "TreeTools"] + "depends": ["PlotTools", "Rcpp", "Rdpack", "Rogue", "TreeDist", "TreeTools", "ape", "cli", "cluster", "fastmatch", "fs", "future", "promises", "protoclust", "shiny", "shinyjs"] }, "TreeSim": { "name": "TreeSim", @@ -35453,25 +35813,25 @@ "name": "TreeSimGM", "version": "2.5", "sha256": "125c9rim272h0dfyygmmijz8dcnch3g9wy1ngki77dyrmdl77yfx", - "depends": ["ape", "TreeSim"] + "depends": ["TreeSim", "ape"] }, "TreeTools": { "name": "TreeTools", - "version": "1.11.1", - "sha256": "067cxg655bkbcp5ngj3r1i6hs49j8ql1dh1dafzv3gjalx735iav", - "depends": ["ape", "bit64", "colorspace", "fastmatch", "lifecycle", "PlotTools", "R_cache", "Rcpp", "RCurl", "Rdpack"] + "version": "1.12.0", + "sha256": "1pqz5nnrwp4v7h0kz21ny3mdlw9qdqf69hh2mrc92piivx1w3ck5", + "depends": ["PlotTools", "RCurl", "R_cache", "Rcpp", "Rdpack", "ape", "bit64", "colorspace", "fastmatch", "lifecycle"] }, "TrenchR": { "name": "TrenchR", "version": "1.1.1", "sha256": "0724dgm9yl906lk2vxffd465gy9kv7fdb0yymbnbq9flwxr4nfig", - "depends": ["deSolve", "msm", "Rdpack", "zoo"] + "depends": ["Rdpack", "deSolve", "msm", "zoo"] }, "TrendInTrend": { "name": "TrendInTrend", "version": "1.1.3", "sha256": "0ijkijyhxhjc7202qssa9wnrmwgv4miv5n8jbml4qqj80kcsbdwp", - "depends": ["nleqslv", "pracma", "pROC", "rms"] + "depends": ["nleqslv", "pROC", "pracma", "rms"] }, "TrendLSW": { "name": "TrendLSW", @@ -35483,7 +35843,7 @@ "name": "TrendSLR", "version": "1.0", "sha256": "1x8j2dg3m7b22gva33y4s318a41wl60sz93y868z4j65hp13jb5k", - "depends": ["changepoint", "forecast", "imputeTS", "plyr", "Rssa", "tseries", "zoo"] + "depends": ["Rssa", "changepoint", "forecast", "imputeTS", "plyr", "tseries", "zoo"] }, "TrendTM": { "name": "TrendTM", @@ -35507,13 +35867,13 @@ "name": "TriDimRegression", "version": "1.0.2", "sha256": "1p6dncx53bk7vca193c46idsw6hvn0z5px3p3zh0qky1jan2rycl", - "depends": ["bayesplot", "BH", "dplyr", "Formula", "future", "glue", "loo", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "StanHeaders", "tidyr"] + "depends": ["BH", "Formula", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "dplyr", "future", "glue", "loo", "purrr", "rstan", "tidyr"] }, "TriMatch": { "name": "TriMatch", "version": "0.9.9", "sha256": "17v8hdm594i9qs5hvrzb1k94wrzvx07479rmvbk4314fim27mabg", - "depends": ["ez", "ggplot2", "gridExtra", "PSAgraphics", "psych", "randomForest", "reshape2", "scales"] + "depends": ["PSAgraphics", "ez", "ggplot2", "gridExtra", "psych", "randomForest", "reshape2", "scales"] }, "TriadSim": { "name": "TriadSim", @@ -35525,7 +35885,7 @@ "name": "TrialEmulation", "version": "0.0.3.8", "sha256": "05gm3fpwdam3cnm0x6s4mzpjvb98yfi4alxgdanmscvx44c5ry8i", - "depends": ["broom", "checkmate", "data_table", "formula_tools", "mvtnorm", "parglm", "Rcpp", "sandwich"] + "depends": ["Rcpp", "broom", "checkmate", "data_table", "formula_tools", "mvtnorm", "parglm", "sandwich"] }, "TrialSize": { "name": "TrialSize", @@ -35549,7 +35909,7 @@ "name": "TropFishR", "version": "1.6.4", "sha256": "0y4bqy27f5ngpz9z24fbl209gg9mlrj8gryn8774abvhvv62z6k0", - "depends": ["doParallel", "GA", "GenSA", "MASS", "Matrix", "msm", "propagate", "reshape2"] + "depends": ["GA", "GenSA", "MASS", "Matrix", "doParallel", "msm", "propagate", "reshape2"] }, "TroublemakeR": { "name": "TroublemakeR", @@ -35583,9 +35943,9 @@ }, "TruncatedNormal": { "name": "TruncatedNormal", - "version": "2.2.2", - "sha256": "05cfn7mdq0hgw97bbb227in9ccjz727sp67xpnpx2r1ajvl6gxdf", - "depends": ["alabama", "nleqslv", "randtoolbox", "Rcpp", "RcppArmadillo"] + "version": "2.3", + "sha256": "0r40l1nc7k4q0mfzs5iv2jvj565qrzk8qrblkliwqqyjwab7kdzg", + "depends": ["Rcpp", "RcppArmadillo", "alabama", "nleqslv", "qrng", "spacefillr"] }, "TukeyC": { "name": "TukeyC", @@ -35603,7 +35963,7 @@ "name": "TukeyRegion", "version": "0.1.6.3", "sha256": "02w84bha6niyval71a06ibk42crvv2259302ckdzmb61ik9sg44d", - "depends": ["bfp", "BH", "ddalpha", "MASS", "Rcpp", "rgl", "Rglpk"] + "depends": ["BH", "MASS", "Rcpp", "Rglpk", "bfp", "ddalpha", "rgl"] }, "TunePareto": { "name": "TunePareto", @@ -35627,7 +35987,7 @@ "name": "Twitmo", "version": "0.1.2", "sha256": "0hr2gndrcsd4r4jxyzg1jbjbn1zslv8z5ny3xh42hda93866909d", - "depends": ["dplyr", "jsonlite", "ldatuning", "LDAvis", "leaflet", "magrittr", "maps", "plyr", "quanteda", "quanteda_textstats", "readr", "rlang", "rtweet", "stm", "stopwords", "stringi", "stringr", "tidyr", "tm", "topicmodels"] + "depends": ["LDAvis", "dplyr", "jsonlite", "ldatuning", "leaflet", "magrittr", "maps", "plyr", "quanteda", "quanteda_textstats", "readr", "rlang", "rtweet", "stm", "stopwords", "stringi", "stringr", "tidyr", "tm", "topicmodels"] }, "TwitterAutomatedTrading": { "name": "TwitterAutomatedTrading", @@ -35661,8 +36021,8 @@ }, "TwoWayFEWeights": { "name": "TwoWayFEWeights", - "version": "2.0.3", - "sha256": "0glwykcbnp65nc345b6k8dc74dvn7bghr045mvqk3jqmmrha0pd8", + "version": "2.0.4", + "sha256": "0jx12g2igyir50mq1wm2nl76lw02wf5gw837wvl19ffsji19mn4p", "depends": ["cli", "dplyr", "fixest", "haven", "magrittr", "rlang"] }, "UBCRM": { @@ -35675,13 +36035,13 @@ "name": "UBL", "version": "0.0.9", "sha256": "1jpm41la5210a9shak01fsgq2yw8l1cz5zbb5zlas2nc2jg7hslh", - "depends": ["automap", "gstat", "MBA", "randomForest", "sp"] + "depends": ["MBA", "automap", "gstat", "randomForest", "sp"] }, "UBayFS": { "name": "UBayFS", "version": "1.0", "sha256": "1aj627f8w30wfnf313adza85jffnp1yq34ri8cfaz5v0jzs1bfib", - "depends": ["DirichletReg", "GA", "ggplot2", "gridExtra", "hyper2", "matrixStats", "mRMRe", "Rdimtools", "shiny"] + "depends": ["DirichletReg", "GA", "Rdimtools", "ggplot2", "gridExtra", "hyper2", "mRMRe", "matrixStats", "shiny"] }, "UCR_ColumnNames": { "name": "UCR.ColumnNames", @@ -35693,7 +36053,7 @@ "name": "UCSCXenaShiny", "version": "2.1.0", "sha256": "080a3p3cb818hns7f72c411bh13clfn3b6xl7wlx41z69swphb5m", - "depends": ["digest", "dplyr", "ezcox", "forcats", "ggplot2", "ggpubr", "httr", "magrittr", "ppcor", "psych", "purrr", "rlang", "shiny", "stringr", "tibble", "tidyr", "UCSCXenaTools"] + "depends": ["UCSCXenaTools", "digest", "dplyr", "ezcox", "forcats", "ggplot2", "ggpubr", "httr", "magrittr", "ppcor", "psych", "purrr", "rlang", "shiny", "stringr", "tibble", "tidyr"] }, "UCSCXenaTools": { "name": "UCSCXenaTools", @@ -35703,9 +36063,15 @@ }, "UComp": { "name": "UComp", - "version": "4.0.2", - "sha256": "0k89palrdifgrz45ar3dcnrwpxwb01nqsg9k1qkwrilhyj9c254k", - "depends": ["ggforce", "ggplot2", "gridExtra", "Rcpp", "RcppArmadillo", "tsibble", "tsoutliers"] + "version": "5.0.4", + "sha256": "0wvam2fg9adpz53jbyc5ksfldg0kllvij0968acz0y3qkgm06a5x", + "depends": ["Rcpp", "RcppArmadillo", "ggforce", "ggplot2", "gridExtra", "tsibble", "tsoutliers"] + }, + "UEI": { + "name": "UEI", + "version": "0.1.0", + "sha256": "0q72avm90x518dcnl60jvg1rpxnizz0hr02mc8wlfr9cinz7r841", + "depends": ["FactoMineR", "Metrics", "factoextra"] }, "UHM": { "name": "UHM", @@ -35715,8 +36081,8 @@ }, "UKB_COVID19": { "name": "UKB.COVID19", - "version": "0.1.4", - "sha256": "0f684nkyrk9dl7hz9mzbb3x8gza5prd8zrg8ajfyjiqif7c6hkbg", + "version": "0.1.6", + "sha256": "02crz9spzl7xpa1csrwrrja9a6z8937rghfkm1awwwv4nrx1cwr6", "depends": ["data_table", "dplyr", "here", "magrittr", "questionr", "tidyverse"] }, "UKFE": { @@ -35735,19 +36101,19 @@ "name": "UNCOVER", "version": "1.1.0", "sha256": "0x5ggwnzca6wz3ikpsa3aq8b715w8drkpchqp3jsg0g9imiw5y3m", - "depends": ["cachem", "crayon", "GGally", "ggnewscale", "ggplot2", "ggpubr", "igraph", "memoise", "mvnfast", "scales"] + "depends": ["GGally", "cachem", "crayon", "ggnewscale", "ggplot2", "ggpubr", "igraph", "memoise", "mvnfast", "scales"] }, "UNPaC": { "name": "UNPaC", "version": "1.1.1", "sha256": "1dqli7fanh0gk2bfbcykrrswyjrl9g4rbplxjxgjri7kkmf03cd0", - "depends": ["huge", "PDSCE"] + "depends": ["PDSCE", "huge"] }, "UPCM": { "name": "UPCM", "version": "0.0-3", "sha256": "1apah04qdgvxxf6q6xr53716pcrmds86sn8f7ykxj93ggg8k0bvl", - "depends": ["cubature", "ltm", "mvtnorm", "numDeriv", "Rcpp", "RcppArmadillo", "statmod"] + "depends": ["Rcpp", "RcppArmadillo", "cubature", "ltm", "mvtnorm", "numDeriv", "statmod"] }, "UPG": { "name": "UPG", @@ -35823,9 +36189,9 @@ }, "Umatrix": { "name": "Umatrix", - "version": "4.0", - "sha256": "0mpn61hiqx5ql23qwi299ifmpgcyx2px1hj70kq1ybqwxi9kyc1w", - "depends": ["abind", "AdaptGauss", "DataVisualizations", "deldir", "fields", "geometry", "ggplot2", "pdist", "plyr", "png", "Rcpp", "reshape2", "shiny", "shinyjs"] + "version": "4.0.1", + "sha256": "03ci20nz0vfaw36miq1gvyg0spmmg2bd229xkrnbv6za1q18y08l", + "depends": ["AdaptGauss", "DataVisualizations", "Rcpp", "abind", "deldir", "fields", "geometry", "ggplot2", "pdist", "plyr", "png", "reshape2", "shiny", "shinyjs"] }, "Umoments": { "name": "Umoments", @@ -35843,7 +36209,7 @@ "name": "UnalR", "version": "1.0.0", "sha256": "1zw68ss0jlyg9mm5qy0k7dqbag8qz08yc96kfmib028d72jsh41d", - "depends": ["cli", "d3r", "data_tree", "dplyr", "DT", "dygraphs", "echarts4r", "fmsb", "forcats", "ggplot2", "ggrepel", "ggspatial", "gridSVG", "gt", "gtExtras", "highcharter", "htmltools", "htmlwidgets", "jsonlite", "leaflet", "leaflet_extras", "lifecycle", "magrittr", "maps", "plotly", "png", "rlang", "scales", "sf", "sp", "stringr", "sunburstR", "tidyr", "treemap", "webshot", "XML", "xts", "zoo"] + "depends": ["DT", "XML", "cli", "d3r", "data_tree", "dplyr", "dygraphs", "echarts4r", "fmsb", "forcats", "ggplot2", "ggrepel", "ggspatial", "gridSVG", "gt", "gtExtras", "highcharter", "htmltools", "htmlwidgets", "jsonlite", "leaflet", "leaflet_extras", "lifecycle", "magrittr", "maps", "plotly", "png", "rlang", "scales", "sf", "sp", "stringr", "sunburstR", "tidyr", "treemap", "webshot", "xts", "zoo"] }, "UncDecomp": { "name": "UncDecomp", @@ -35867,7 +36233,7 @@ "name": "Unico", "version": "0.1.0", "sha256": "16zp9fdd1a0w3zisqyiklhhn2y84f3aq63wzzqkfg0hsf2sdcvya", - "depends": ["compositions", "config", "data_table", "futile_logger", "MASS", "matrixcalc", "matrixStats", "mgcv", "nloptr", "pbapply", "pracma", "testit"] + "depends": ["MASS", "compositions", "config", "data_table", "futile_logger", "matrixStats", "matrixcalc", "mgcv", "nloptr", "pbapply", "pracma", "testit"] }, "Unicode": { "name": "Unicode", @@ -35945,25 +36311,19 @@ "name": "UtilityFrailtyPH12", "version": "1.0", "sha256": "06f5gmwwk1r14ab6v5jcxz0pmdph7ffi4y57mjg9byn7pjnibflk", - "depends": ["bindata", "mvtnorm", "Phase123", "Rcpp", "RcppArmadillo"] + "depends": ["Phase123", "Rcpp", "RcppArmadillo", "bindata", "mvtnorm"] }, "V8": { "name": "V8", - "version": "4.4.2", - "sha256": "0w4n794l4f7hwwjr83112zf3cjx72q6ak0fn45qm6pqg8brkbg77", - "depends": ["curl", "jsonlite", "Rcpp"] - }, - "VAJointSurv": { - "name": "VAJointSurv", - "version": "0.1.0", - "sha256": "19ib4b1kf1zg4l571f2asxkwbab44pzs954agj0wx1p6kb2v608q", - "depends": ["lme4", "Matrix", "psqn", "Rcpp", "RcppArmadillo", "RcppEigen", "SimSurvNMarker", "survival", "testthat"] + "version": "5.0.0", + "sha256": "06mjjrwg9bgyfxn4gcj3bf4xc9ijx08xf8dfd8g6w0bkz5cvg3v6", + "depends": ["Rcpp", "curl", "jsonlite"] }, "VALERIE": { "name": "VALERIE", "version": "1.1.0", "sha256": "15z8234jhh7hv3gijrvy8hap6gdgvm6qll9b00qbji7vyc3dg4pg", - "depends": ["GenomicAlignments", "GenomicRanges", "ggplot2", "ggplotify", "ggpubr", "IRanges", "pheatmap", "plyr", "Rsamtools", "scales"] + "depends": ["GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "ggplot2", "ggplotify", "ggpubr", "pheatmap", "plyr", "scales"] }, "VALIDICLUST": { "name": "VALIDICLUST", @@ -35993,7 +36353,7 @@ "name": "VARDetect", "version": "0.1.8", "sha256": "1g28rcmlm16yiz156rmdslvhy173pazij0lw7b5gxqv3dgl4mcd0", - "depends": ["igraph", "lattice", "MTS", "mvtnorm", "pracma", "Rcpp", "RcppArmadillo", "sparsevar"] + "depends": ["MTS", "Rcpp", "RcppArmadillo", "igraph", "lattice", "mvtnorm", "pracma", "sparsevar"] }, "VARSELECTEXPOSURE": { "name": "VARSELECTEXPOSURE", @@ -36005,13 +36365,13 @@ "name": "VARshrink", "version": "0.3.1", "sha256": "09hysmxxawcbyfx6bia546aqydryl2r5p3ai7bvl6ghdckw5mnpl", - "depends": ["ars", "corpcor", "MASS", "mvtnorm", "strucchange", "vars"] + "depends": ["MASS", "ars", "corpcor", "mvtnorm", "strucchange", "vars"] }, "VBJM": { "name": "VBJM", "version": "0.1.0", "sha256": "0g7mmjba8pyfz92p7fgp9shpm9pclymacm45y3h6hlmsbpc7sh3p", - "depends": ["Matrix", "pracma", "Rcpp", "RcppArmadillo", "RcppEnsmallen", "statmod", "survival"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppEnsmallen", "pracma", "statmod", "survival"] }, "VBLPCM": { "name": "VBLPCM", @@ -36047,13 +36407,13 @@ "name": "VC2copula", "version": "0.1.5", "sha256": "1kadz36cw12qipf25dqykm58hh775wk3aq793ckphl7y9vqpvl36", - "depends": ["copula", "VineCopula"] + "depends": ["VineCopula", "copula"] }, "VCA": { "name": "VCA", "version": "1.5.1", "sha256": "0bw951rkbxg6ccy1iqmaamx5fwa41c3pp8zyzk2njkcgi4w5b90m", - "depends": ["lme4", "Matrix", "numDeriv"] + "depends": ["Matrix", "lme4", "numDeriv"] }, "VDAP": { "name": "VDAP", @@ -36089,13 +36449,13 @@ "name": "VEwaningVariant", "version": "1.4", "sha256": "1fg44cy2i138b21y610bj64xjwwp96wilngy3rq89vsvkj40rird", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "survival"] }, "VFP": { "name": "VFP", "version": "1.4.1", "sha256": "14idww1vy695mp9v2h0nxqi6flmm41cr30i0yd2nwjsnriwqgzak", - "depends": ["gnm", "MASS", "VCA"] + "depends": ["MASS", "VCA", "gnm"] }, "VFS": { "name": "VFS", @@ -36125,7 +36485,7 @@ "name": "VIC5", "version": "0.2.6", "sha256": "1zkvzkras94gyc43b9j4bq4mpyg9l1idx2pdd8a728gmq1daky0k", - "depends": ["foreach", "lubridate", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "foreach", "lubridate"] }, "VIGoR": { "name": "VIGoR", @@ -36137,13 +36497,13 @@ "name": "VIM", "version": "6.2.2", "sha256": "1r0myxcx8y1a3fkf9ssk882f09snn2j6zilsygpld32hahn4k9xg", - "depends": ["car", "colorspace", "data_table", "e1071", "laeken", "magrittr", "MASS", "nnet", "ranger", "Rcpp", "robustbase", "sp", "vcd"] + "depends": ["MASS", "Rcpp", "car", "colorspace", "data_table", "e1071", "laeken", "magrittr", "nnet", "ranger", "robustbase", "sp", "vcd"] }, "VIMPS": { "name": "VIMPS", "version": "1.0", "sha256": "13r8g9k216fjsnw4ymqdsrx08z6rr2i3cwafrv1j93lgl0d3lnj4", - "depends": ["caret", "ggplot2", "knockoff", "ranger", "ROCR"] + "depends": ["ROCR", "caret", "ggplot2", "knockoff", "ranger"] }, "VIMean": { "name": "VIMean", @@ -36179,25 +36539,25 @@ "name": "VLTimeCausality", "version": "0.1.5", "sha256": "0pfgpl9xkwi0v0z1l58gb8s4gzz7r4k38270x8ifyk41l5vq8iwd", - "depends": ["dtw", "ggplot2", "RTransferEntropy", "tseries"] + "depends": ["RTransferEntropy", "dtw", "ggplot2", "tseries"] }, "VMDML": { "name": "VMDML", "version": "0.1.1", "sha256": "12n32wx3hcvw55rrcwkv501cjl4zrpgh4d7y4m1irgrpjfqk77x2", - "depends": ["e1071", "forecast", "nnfor", "randomForest", "VMDecomp"] + "depends": ["VMDecomp", "e1071", "forecast", "nnfor", "randomForest"] }, "VMDecomp": { "name": "VMDecomp", "version": "1.0.1", "sha256": "0iq2lj7n77qmryf95cjl2y869bhy6i0mx44qls7xc07g0qplwqx3", - "depends": ["data_table", "glue", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "glue"] }, "VOSONDash": { "name": "VOSONDash", "version": "0.5.7", "sha256": "1qivx5ddl9jsn6q6ic2w8jrczxlx23z087k5arfz2rixgj7rndyg", - "depends": ["data_table", "httpuv", "httr", "igraph", "lattice", "magrittr", "RColorBrewer", "shiny", "SnowballC", "systemfonts", "syuzhet", "textutils", "tm", "vosonSML", "wordcloud"] + "depends": ["RColorBrewer", "SnowballC", "data_table", "httpuv", "httr", "igraph", "lattice", "magrittr", "shiny", "systemfonts", "syuzhet", "textutils", "tm", "vosonSML", "wordcloud"] }, "VPdtw": { "name": "VPdtw", @@ -36209,7 +36569,7 @@ "name": "VSOLassoBag", "version": "0.99.1", "sha256": "1jmnm435x36jlhbzl7kgjiby7kb7yjhh013zdnnvf9pcjaallqn9", - "depends": ["ggplot2", "glmnet", "pbapply", "POT", "SummarizedExperiment", "survival"] + "depends": ["POT", "SummarizedExperiment", "ggplot2", "glmnet", "pbapply", "survival"] }, "VSURF": { "name": "VSURF", @@ -36227,7 +36587,7 @@ "name": "VUROCS", "version": "1.0", "sha256": "1r4hq7az50v7lbyx5w6b4zs2kwi5cypqn9k6ac4kr8jr3jlyanr3", - "depends": ["doParallel", "foreach", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach"] }, "VWPre": { "name": "VWPre", @@ -36269,13 +36629,13 @@ "name": "VarSelLCM", "version": "2.1.3.1", "sha256": "03rg7zh1cq55vfc0ak6j7crs4n7fnbsxz8nllmplklx8wm47krf5", - "depends": ["ggplot2", "mgcv", "Rcpp", "RcppArmadillo", "shiny"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "mgcv", "shiny"] }, "VariableScreening": { "name": "VariableScreening", "version": "0.2.1", "sha256": "0djfpv46fhc3x4jvmjr93lyh4fxfzzvyrs3wjncx3h0z0s9n6w45", - "depends": ["energy", "expm", "gee", "MASS"] + "depends": ["MASS", "energy", "expm", "gee"] }, "VarianceGamma": { "name": "VarianceGamma", @@ -36291,9 +36651,9 @@ }, "VeccTMVN": { "name": "VeccTMVN", - "version": "1.0.0", - "sha256": "1kyq2wgdc3gdg2c3j8j578yhkhiw9r7c6q1z4k2r2vhbakr4fg7f", - "depends": ["GpGp", "GPvecchia", "Matrix", "Rcpp", "RcppArmadillo", "TruncatedNormal", "truncnorm"] + "version": "1.1.0", + "sha256": "008r2fkp16l8sdyn6is0n0v7m8lvx0zn7c3jscd1gfdzkf82zb2a", + "depends": ["GPvecchia", "GpGp", "Matrix", "Rcpp", "RcppArmadillo", "TruncatedNormal", "nleqslv", "truncnorm"] }, "VectorCodeR": { "name": "VectorCodeR", @@ -36347,13 +36707,13 @@ "name": "ViSiElse", "version": "1.2.2", "sha256": "1ay09dahlqnfrgf4gl4s45a4ahrk2xliagxqz5h826w2vzsawqcc", - "depends": ["chron", "colorspace", "ggplot2", "Matrix", "reshape2", "stringr"] + "depends": ["Matrix", "chron", "colorspace", "ggplot2", "reshape2", "stringr"] }, "VicmapR": { "name": "VicmapR", "version": "0.2.3", "sha256": "0djv95l32nz6wwslwgn0v037fjbl3fz15vybn39c6g1iw9a2a46s", - "depends": ["cli", "curl", "DBI", "dbplyr", "dplyr", "glue", "httr", "kableExtra", "knitr", "leaflet", "lubridate", "magrittr", "mapview", "purrr", "rlang", "rvest", "sf", "stringr", "xml2"] + "depends": ["DBI", "cli", "curl", "dbplyr", "dplyr", "glue", "httr", "kableExtra", "knitr", "leaflet", "lubridate", "magrittr", "mapview", "purrr", "rlang", "rvest", "sf", "stringr", "xml2"] }, "Vicus": { "name": "Vicus", @@ -36371,7 +36731,7 @@ "name": "VineCopula", "version": "2.5.0", "sha256": "0s2v27i5cljvxzh3awpf3bcfbbghch0lphhghqnc7x51w1prxfai", - "depends": ["ADGofTest", "lattice", "MASS", "mvtnorm"] + "depends": ["ADGofTest", "MASS", "lattice", "mvtnorm"] }, "VirtualPop": { "name": "VirtualPop", @@ -36387,9 +36747,9 @@ }, "VisitorCounts": { "name": "VisitorCounts", - "version": "2.0.0", - "sha256": "1i43g2k3n3c1baxj8q86v33mvvmcg16vv2a46y4ji5nqnqay7183", - "depends": ["ggplot2", "Rssa"] + "version": "2.0.2", + "sha256": "0iaik54zcq0vxfzfdgq90lxrr1b1824q5zicbpbczm4dxlc17q2q", + "depends": ["Rssa", "ggplot2", "zoo"] }, "VisualDom": { "name": "VisualDom", @@ -36425,13 +36785,19 @@ "name": "VoxR", "version": "1.0.0", "sha256": "16r9ggc5x889g8rjqvp1q2kgf5asjzhykd1ldjy3ny9m48p501ad", - "depends": ["circular", "data_table", "dplyr", "fastcluster", "FNN", "geometry", "raster", "Rfast", "rgl"] + "depends": ["FNN", "Rfast", "circular", "data_table", "dplyr", "fastcluster", "geometry", "raster", "rgl"] + }, + "VsusP": { + "name": "VsusP", + "version": "1.0.0", + "sha256": "1nrs94gyxc2ldihnn28wijigfs13ipigcvkycnxnzd60hg5j8c7i", + "depends": ["bayesreg"] }, "VulnToolkit": { "name": "VulnToolkit", "version": "1.1.4", "sha256": "01m8spmd4na7mxgnplnnq3n4pab9349z2dk44b455vcadll0fsdi", - "depends": ["plyr", "XML"] + "depends": ["XML", "plyr"] }, "W2CWM2C": { "name": "W2CWM2C", @@ -36465,8 +36831,8 @@ }, "WALS": { "name": "WALS", - "version": "0.2.4", - "sha256": "0pqvmdvgxrf05avkgynx2hwqp6k3a3vhhiis5vwijz9ccjgac0kz", + "version": "0.2.5", + "sha256": "0z3863ml85065w23m6wr4hd5a0vdaiavpmrbal8kz4igj6j34ff6", "depends": ["Formula", "MASS", "Rdpack"] }, "WARN": { @@ -36477,9 +36843,9 @@ }, "WASP": { "name": "WASP", - "version": "1.4.3", - "sha256": "1w822wl8zp94a60y9jsryc1r1m025pl2100fx5i8np46mm3pmn58", - "depends": ["ggplot2", "rlang", "sp", "tidyr", "waveslim"] + "version": "1.4.4", + "sha256": "1jjas0qklb3dyax4x26c327l59biyym5m2x6mv8z7dnkyfrw3vfq", + "depends": ["fitdistrplus", "ggplot2", "readr", "sp", "tidyr", "waveslim", "zoo"] }, "WCE": { "name": "WCE", @@ -36511,17 +36877,23 @@ "sha256": "17g4cgx0ajgj7lgxzi467cjbmbc47skyarcm88vqjc3i1j55dw12", "depends": ["raster", "sf", "sp"] }, + "WES": { + "name": "WES", + "version": "1.0.0", + "sha256": "11dsn0dkc0z313x8md6qhkafk9cnbp4v64a895d54b27329ryzis", + "depends": ["HDInterval", "RCurl", "XML", "chirps", "data_table", "dplyr", "elevatr", "exactextractr", "foreach", "glue", "httr", "jsonlite", "openmeteo", "raster", "rworldmap", "sf", "sp", "stars", "whitebox", "zoo"] + }, "WGCNA": { "name": "WGCNA", "version": "1.72-5", "sha256": "17g7lan1rpy6y4nmqksrf9ddp3gs58vdczfavgq1fp13zx1r2hq3", - "depends": ["AnnotationDbi", "doParallel", "dynamicTreeCut", "fastcluster", "foreach", "GO_db", "Hmisc", "impute", "matrixStats", "preprocessCore", "Rcpp", "survival"] + "depends": ["AnnotationDbi", "GO_db", "Hmisc", "Rcpp", "doParallel", "dynamicTreeCut", "fastcluster", "foreach", "impute", "matrixStats", "preprocessCore", "survival"] }, "WGScan": { "name": "WGScan", "version": "0.1", "sha256": "0jma6di9hbdimswdfm58568vahcjy46hbhb78idjsdz4bl9apvq3", - "depends": ["data_table", "MASS", "Matrix", "seqminer", "SKAT"] + "depends": ["MASS", "Matrix", "SKAT", "data_table", "seqminer"] }, "WH": { "name": "WH", @@ -36539,7 +36911,7 @@ "name": "WLogit", "version": "2.1", "sha256": "06mhc6n9mszqrj9hi61z5yfyny5aqsvv11a5n7l0wwhpirgi3i8m", - "depends": ["corpcor", "cvCovEst", "genlasso", "ggplot2", "glmnet", "MASS", "Matrix", "tibble"] + "depends": ["MASS", "Matrix", "corpcor", "cvCovEst", "genlasso", "ggplot2", "glmnet", "tibble"] }, "WLreg": { "name": "WLreg", @@ -36575,7 +36947,7 @@ "name": "WRI", "version": "0.2.0", "sha256": "1hm23p0b4k03dxrbia9kq6r3n2c57glllraglxrj2vgnvwn6sl2c", - "depends": ["CVXR", "expm", "fdadensity", "fdapace", "ggplot2", "gridExtra", "locfit", "locpol", "modeest", "mvtnorm", "polynom", "Rcpp", "RcppArmadillo", "Rfast", "rlang"] + "depends": ["CVXR", "Rcpp", "RcppArmadillo", "Rfast", "expm", "fdadensity", "fdapace", "ggplot2", "gridExtra", "locfit", "locpol", "modeest", "mvtnorm", "polynom", "rlang"] }, "WRS2": { "name": "WRS2", @@ -36587,13 +36959,13 @@ "name": "WRSS", "version": "3.1", "sha256": "0fhmdnkk94m1bqm1i69szv3ycbkzr08xy30mwpqvbij9nh2sqj0w", - "depends": ["GGally", "ggplot2", "Hmisc", "network", "nloptr"] + "depends": ["GGally", "Hmisc", "ggplot2", "network", "nloptr"] }, "WRTDStidal": { "name": "WRTDStidal", "version": "1.1.4", "sha256": "1clv6gd0qlkykllki5jkmhd1znrccyg1mv6w69wz8fj65b2466zd", - "depends": ["caret", "dplyr", "fields", "foreach", "forecast", "ggplot2", "gridExtra", "lubridate", "purrr", "quantreg", "RColorBrewer", "survival", "tidyr"] + "depends": ["RColorBrewer", "caret", "dplyr", "fields", "foreach", "forecast", "ggplot2", "gridExtra", "lubridate", "purrr", "quantreg", "survival", "tidyr"] }, "WRestimates": { "name": "WRestimates", @@ -36629,7 +37001,7 @@ "name": "Wats", "version": "1.0.1", "sha256": "0xld5163srlyqd9rbmi618drkrimys7ifgzrq05ky22ns2qa4qfv", - "depends": ["colorspace", "dplyr", "ggplot2", "lubridate", "RColorBrewer", "rlang", "testit", "tibble", "zoo"] + "depends": ["RColorBrewer", "colorspace", "dplyr", "ggplot2", "lubridate", "rlang", "testit", "tibble", "zoo"] }, "WaveSampling": { "name": "WaveSampling", @@ -36641,7 +37013,7 @@ "name": "WaveletANN", "version": "0.1.2", "sha256": "1j16jsnz9j735348a5ybgrl7p6bg45gwwp863y4pg85h4mwg37c9", - "depends": ["forecast", "fracdiff", "Metrics", "wavelets"] + "depends": ["Metrics", "forecast", "fracdiff", "wavelets"] }, "WaveletArima": { "name": "WaveletArima", @@ -36659,7 +37031,7 @@ "name": "WaveletETS", "version": "0.1.0", "sha256": "1cxzhmyhvq7ip32csqlxzfxx6gxnwn49vvm8xx3idal4nkdlids1", - "depends": ["caretForecast", "dplyr", "forecast", "Metrics", "tseries", "wavelets"] + "depends": ["Metrics", "caretForecast", "dplyr", "forecast", "tseries", "wavelets"] }, "WaveletGARCH": { "name": "WaveletGARCH", @@ -36671,25 +37043,25 @@ "name": "WaveletGBM", "version": "0.1.0", "sha256": "0jilj6mgq6wb6a5zb4j9backfgyf38w687ppbyfsz40263srj081", - "depends": ["caret", "caretForecast", "dplyr", "gbm", "Metrics", "tseries", "wavelets"] + "depends": ["Metrics", "caret", "caretForecast", "dplyr", "gbm", "tseries", "wavelets"] }, "WaveletKNN": { "name": "WaveletKNN", "version": "0.1.0", "sha256": "1pr2w74r9qrbwdhacqa4xbyk5xd33sk208slgaq4dydbx3ndh5wp", - "depends": ["caret", "caretForecast", "dplyr", "Metrics", "tseries", "wavelets"] + "depends": ["Metrics", "caret", "caretForecast", "dplyr", "tseries", "wavelets"] }, "WaveletLSTM": { "name": "WaveletLSTM", "version": "0.1.0", "sha256": "1imf51ihwhzga6xscqh5lawyrx3smk6czxpmyahxgd696xg70c1q", - "depends": ["caret", "caretForecast", "dplyr", "tseries", "TSLSTM", "wavelets"] + "depends": ["TSLSTM", "caret", "caretForecast", "dplyr", "tseries", "wavelets"] }, "WaveletML": { "name": "WaveletML", "version": "0.1.0", "sha256": "0y3aclnrjk3zhw3ls00iwjif1ghdnfjhhglf37kr7f7alqbqg0ax", - "depends": ["aTSA", "caret", "e1071", "earth", "fGarch", "FinTS", "forecast", "LSTS", "neuralnet", "pso", "tseries", "wavelets"] + "depends": ["FinTS", "LSTS", "aTSA", "caret", "e1071", "earth", "fGarch", "forecast", "neuralnet", "pso", "tseries", "wavelets"] }, "WaveletMLbestFL": { "name": "WaveletMLbestFL", @@ -36713,19 +37085,19 @@ "name": "WaverR", "version": "1.0", "sha256": "084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a", - "depends": ["kimisc", "MASS"] + "depends": ["MASS", "kimisc"] }, "WaverideR": { "name": "WaverideR", "version": "0.3.2", "sha256": "1lm7xq443vninrph21xq6dikpd42xl9ilwfb22lfba2b7j7j5z6g", - "depends": ["astrochron", "biwavelet", "colorednoise", "colorRamps", "DecomposeR", "DescTools", "doSNOW", "fANCOVA", "foreach", "Hmisc", "magick", "Matrix", "matrixStats", "RColorBrewer", "reshape2", "rlist", "truncnorm", "viridis", "WaveletComp"] + "depends": ["DecomposeR", "DescTools", "Hmisc", "Matrix", "RColorBrewer", "WaveletComp", "astrochron", "biwavelet", "colorRamps", "colorednoise", "doSNOW", "fANCOVA", "foreach", "magick", "matrixStats", "reshape2", "rlist", "truncnorm", "viridis"] }, "WayFindR": { "name": "WayFindR", "version": "0.1.2", "sha256": "1j54374vk8y2f28lka03qwz5hyvpb0fyrbfn20pj1hbbnvymsxrm", - "depends": ["igraph", "XML"] + "depends": ["XML", "igraph"] }, "Wcompo": { "name": "Wcompo", @@ -36737,7 +37109,7 @@ "name": "WeMix", "version": "4.0.3", "sha256": "1ykg7sphnm15a3dlkkhv18ycsclaw363yldfsyc83hf01vlghf77", - "depends": ["lme4", "Matrix", "matrixStats", "minqa", "numDeriv"] + "depends": ["Matrix", "lme4", "matrixStats", "minqa", "numDeriv"] }, "WebAnalytics": { "name": "WebAnalytics", @@ -36749,19 +37121,19 @@ "name": "WebGestaltR", "version": "0.4.6", "sha256": "1xwadw9maj3n9yxm4bv63hx4x1lh6krqhfcnwn2ay6jgwh7y6zxw", - "depends": ["apcluster", "doParallel", "doRNG", "dplyr", "foreach", "httr", "igraph", "jsonlite", "Rcpp", "readr", "rlang", "svglite", "whisker"] + "depends": ["Rcpp", "apcluster", "doParallel", "doRNG", "dplyr", "foreach", "httr", "igraph", "jsonlite", "readr", "rlang", "svglite", "whisker"] }, "WebPower": { "name": "WebPower", "version": "0.9.4", "sha256": "0idfm9mr4sffyzyihggy5kmsklx178g8c5ikp34kxz74jkz0rzn5", - "depends": ["dplyr", "lavaan", "lme4", "MASS", "PearsonDS"] + "depends": ["MASS", "PearsonDS", "dplyr", "lavaan", "lme4"] }, "WeibullFit": { "name": "WeibullFit", "version": "0.1.0", "sha256": "1a80gcqbmvb1rz2dr2syy16wn6ixjn6l40gayys9zy8302hky9ir", - "depends": ["e1071", "FAdist", "glue", "kSamples", "mixdist", "optimx", "R_methodsS3", "R_oo", "sqldf", "xtable"] + "depends": ["FAdist", "R_methodsS3", "R_oo", "e1071", "glue", "kSamples", "mixdist", "optimx", "sqldf", "xtable"] }, "WeibullR": { "name": "WeibullR", @@ -36777,27 +37149,27 @@ }, "WeibullR_learnr": { "name": "WeibullR.learnr", - "version": "0.1.1", - "sha256": "0m3dajyxr6m2w8s1qlwfr1iq2x2s5khs9x1qj4r4fr6zqhp53pbx", - "depends": ["learnr", "WeibullR"] + "version": "0.1.3", + "sha256": "14v64jr4z8j9gv4qqpwk013d6rjc5g3yisqn8lkibccgb78ifdxn", + "depends": ["WeibullR", "learnr"] }, "WeibullR_plotly": { "name": "WeibullR.plotly", - "version": "0.2.0", - "sha256": "1ymggxqhn2bc6r25vzp4vlr18pcw9vnn24ylwspk8vq8j00pn197", - "depends": ["plotly", "WeibullR"] + "version": "0.2.1", + "sha256": "1hhcr31kn3bcaj562x8hdh5gg7nkmwcbish8yq4faj9bhrm0lg6h", + "depends": ["WeibullR", "plotly"] }, "WeibullR_shiny": { "name": "WeibullR.shiny", - "version": "0.2.0", - "sha256": "0qzwn967p54j03h9nmzljx547iqgnyq3xzfri5k0i5lpvxsdp7hs", - "depends": ["shiny", "shinydashboard", "WeibullR", "WeibullR_plotly"] + "version": "0.2.1", + "sha256": "0p4vsc153x96w73bg9s0bcnfnk70qmfi9n2d57vcw0z4ppm1gdr4", + "depends": ["WeibullR", "WeibullR_plotly", "shiny", "shinydashboard"] }, "WeightIt": { "name": "WeightIt", - "version": "1.1.0", - "sha256": "00p5ylc0jahb8dqc2z7x5kvx40rlbvrrpfpfhg0dxyrd6qas71w5", - "depends": ["chk", "cobalt", "crayon", "ggplot2", "rlang"] + "version": "1.2.0", + "sha256": "0mgwjl2d17m80pwj0n2mmnrqcymg9lgc9kz0sh9bwsq7icjdslyv", + "depends": ["chk", "cobalt", "crayon", "generics", "ggplot2", "rlang"] }, "WeightSVM": { "name": "WeightSVM", @@ -36815,7 +37187,7 @@ "name": "WeightedCluster", "version": "1.6-4", "sha256": "1ayi50wjy7grzapfnyvmbi6rz7amfhdd1nxh56h1s4anv7rf20c4", - "depends": ["cluster", "doFuture", "foreach", "future", "nnet", "progressr", "RColorBrewer", "TraMineR"] + "depends": ["RColorBrewer", "TraMineR", "cluster", "doFuture", "foreach", "future", "nnet", "progressr"] }, "WeightedEnsemble": { "name": "WeightedEnsemble", @@ -36839,7 +37211,7 @@ "name": "WeightedTreemaps", "version": "0.1.2", "sha256": "1jbbf915jny6lpbhv4m0grkadgjmw7vh1izql4kdbn3w5p5j8m1x", - "depends": ["BH", "colorspace", "dplyr", "lattice", "Rcpp", "RcppCGAL", "scales", "sf", "sp", "tibble"] + "depends": ["BH", "Rcpp", "RcppCGAL", "colorspace", "dplyr", "lattice", "scales", "sf", "sp", "tibble"] }, "WgtEff": { "name": "WgtEff", @@ -36859,6 +37231,12 @@ "sha256": "0i6mhc3cm7m885v5sznci7bqr6h2bfgnv466v5jwdwidisnzrhgx", "depends": ["anytime", "checkmate", "data_table", "dplyr", "ggmap", "ggplot2", "ggwordcloud", "lubridate", "mgsub", "qdap", "qdapRegex", "ragg", "readr", "stringi", "tokenizers", "visNetwork"] }, + "WhiteLabRt": { + "name": "WhiteLabRt", + "version": "1.0.1", + "sha256": "05vdk83xxyphhhyfcb01kscr0gwxrd01yjwlpr4afxh6ppbgvx6v", + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools"] + }, "WhiteStripe": { "name": "WhiteStripe", "version": "2.4.3", @@ -36875,13 +37253,13 @@ "name": "WikidataQueryServiceR", "version": "1.0.0", "sha256": "1bl1nbhbmss8cj9ni7plsjs996n4rwqv6h8bh1zj4whs8z4fw50f", - "depends": ["dplyr", "httr", "jsonlite", "purrr", "ratelimitr", "readr", "rex", "WikipediR"] + "depends": ["WikipediR", "dplyr", "httr", "jsonlite", "purrr", "ratelimitr", "readr", "rex"] }, "WikidataR": { "name": "WikidataR", "version": "2.3.3", "sha256": "120833b7zyq1rhmn9c8iv0j6br60af7gbn5lc4dil55qhh2lp9rx", - "depends": ["crayon", "dplyr", "Hmisc", "httr", "jsonlite", "pbapply", "progress", "readr", "stringr", "tibble", "WikidataQueryServiceR", "WikipediR"] + "depends": ["Hmisc", "WikidataQueryServiceR", "WikipediR", "crayon", "dplyr", "httr", "jsonlite", "pbapply", "progress", "readr", "stringr", "tibble"] }, "WikipediR": { "name": "WikipediR", @@ -36893,7 +37271,7 @@ "name": "WinRatio", "version": "1.0", "sha256": "0d064qq9zad9bdacldhicj3xhyrvp0fcqrxfj594yzra2qwgkx90", - "depends": ["dplyr", "magrittr", "Rcpp", "tidyselect", "tidyverse"] + "depends": ["Rcpp", "dplyr", "magrittr", "tidyselect", "tidyverse"] }, "WindCurves": { "name": "WindCurves", @@ -36915,8 +37293,8 @@ }, "WordListsAnalytics": { "name": "WordListsAnalytics", - "version": "0.2.2", - "sha256": "1q4plzw4akm7dw59qbwwnd0dxzjiqfbpiqa9h967kvdqdalwkjzz", + "version": "0.2.3", + "sha256": "0vw354gldqawxa1xw6abf76yh8r6jgfsc8vrppl5arj4kw72zrya", "depends": ["dplyr", "ggplot2", "readr", "reshape2", "shiny"] }, "WordOfMouth": { @@ -36951,15 +37329,15 @@ }, "WormTensor": { "name": "WormTensor", - "version": "0.1.0", - "sha256": "0l55dbcf65cpw03b26va4ssvk3wc0i6hnchb9jyw44369y5xfniy", - "depends": ["aricode", "cluster", "clusterSim", "clValid", "cowplot", "dtwclust", "factoextra", "ggplot2", "ggrepel", "rTensor", "Rtsne", "usedist", "uwot"] + "version": "0.1.1", + "sha256": "1xnjp6m3h0q6phmn2c2wkbjzyl8lpx07jsryz0i8rxr6ny591ja2", + "depends": ["Rtsne", "aricode", "clValid", "cluster", "clusterSim", "cowplot", "dtwclust", "factoextra", "ggplot2", "ggrepel", "rTensor", "usedist", "uwot"] }, "WpProj": { "name": "WpProj", "version": "0.2.1", "sha256": "17vczldqgqc8wl6yyz06zc3jdkgcxdf2s28bh83vzj98i1521ls2", - "depends": ["BH", "doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "ggridges", "ggsci", "glmnet", "lifecycle", "magrittr", "Matrix", "oem", "quantreg", "Rcpp", "RcppCGAL", "RcppEigen", "RcppProgress", "rlang", "ROI", "ROI_plugin_ecos", "ROI_plugin_lpsolve", "rqPen", "RSpectra", "slam"] + "depends": ["BH", "Matrix", "ROI", "ROI_plugin_ecos", "ROI_plugin_lpsolve", "RSpectra", "Rcpp", "RcppCGAL", "RcppEigen", "RcppProgress", "doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "ggridges", "ggsci", "glmnet", "lifecycle", "magrittr", "oem", "quantreg", "rlang", "rqPen", "slam"] }, "WrensBookshelf": { "name": "WrensBookshelf", @@ -36975,8 +37353,8 @@ }, "WriteXLS": { "name": "WriteXLS", - "version": "6.6.0", - "sha256": "0adpwd80hhw6i965wp1w74s85vzq2gv5pf98zcvjwaqvpkrs25xw", + "version": "6.7.0", + "sha256": "0vr6h7jycwiic02krgz0ignzqhpi3vc9gsa5cykvg8wxdsfyyb6k", "depends": [] }, "WtTopsis": { @@ -37023,15 +37401,15 @@ }, "XML": { "name": "XML", - "version": "3.99-0.16.1", - "sha256": "1i7fs9i2f6bdkxb45w2bck7sshlwxy2s32hi9fwa4nfmw2iy62m3", + "version": "3.99-0.17", + "sha256": "1n52k06jrgyjmz96mv4sv6kczqkhmz2spr3gymcjzzv9zxjk48vf", "depends": [] }, "XML2R": { "name": "XML2R", "version": "0.0.8", "sha256": "1vssxy5bn46likkba8ycajkni14s7js31255swflr8007mc3pwmz", - "depends": ["httr", "plyr", "XML"] + "depends": ["XML", "httr", "plyr"] }, "XNomial": { "name": "XNomial", @@ -37055,7 +37433,7 @@ "name": "XRPython", "version": "0.8", "sha256": "0alg33spiaqf3jwg1qn543nxvbfaqv8gvf5px3grhbgrcmi5mcmj", - "depends": ["reticulate", "XR"] + "depends": ["XR", "reticulate"] }, "XRSCC": { "name": "XRSCC", @@ -37065,21 +37443,21 @@ }, "XiMpLe": { "name": "XiMpLe", - "version": "0.11-2", - "sha256": "0pa06jm9g308pbh8bal7mjaiwbsjbdsxiyvm0f01405j3wkf64m3", + "version": "0.11-3", + "sha256": "1hpy1yls4hhlbf2hjyfjqrxcrcpbakk4irqzl795rarzm790hgfq", "depends": [] }, "Xplortext": { "name": "Xplortext", "version": "1.5.3", "sha256": "1pmynw9zxfflzhw3iqf1gfv0c3fz2nj308hxzwjgpcds7fm2sqzm", - "depends": ["FactoMineR", "flashClust", "flexclust", "ggdendro", "ggforce", "ggplot2", "ggrepel", "gridExtra", "MASS", "plotly", "slam", "stringi", "stringr", "tm", "vegan"] + "depends": ["FactoMineR", "MASS", "flashClust", "flexclust", "ggdendro", "ggforce", "ggplot2", "ggrepel", "gridExtra", "plotly", "slam", "stringi", "stringr", "tm", "vegan"] }, "YPBP": { "name": "YPBP", "version": "0.0.1", "sha256": "1slc7glr4hb0my5zkssprngb6si98npjj33nsbsm0nbm61hnb9n8", - "depends": ["BH", "Formula", "MASS", "Rcpp", "RcppEigen", "rstan", "rstantools", "StanHeaders", "survival"] + "depends": ["BH", "Formula", "MASS", "Rcpp", "RcppEigen", "StanHeaders", "rstan", "rstantools", "survival"] }, "YPInterimTesting": { "name": "YPInterimTesting", @@ -37091,7 +37469,7 @@ "name": "YPPE", "version": "1.0.1", "sha256": "01q0l22nwfpld2wcygk5x28c2c6cv35hxy2fm1azn8bqsv7xy5il", - "depends": ["BH", "Formula", "MASS", "Rcpp", "RcppEigen", "rstan", "rstantools", "StanHeaders", "survival"] + "depends": ["BH", "Formula", "MASS", "Rcpp", "RcppEigen", "StanHeaders", "rstan", "rstantools", "survival"] }, "YPmodel": { "name": "YPmodel", @@ -37125,9 +37503,9 @@ }, "YatchewTest": { "name": "YatchewTest", - "version": "1.1.0", - "sha256": "13ni502538l76cxyjh3q35id117i64m8bg9zp7g1199ln2csms7h", - "depends": ["ggplot2", "Rcpp"] + "version": "1.1.1", + "sha256": "1m951cin2wlxrmg5k7b6zjmfyc5frxgzr4aibyj4lh9vbr9hlqk8", + "depends": ["Rcpp", "ggplot2"] }, "YatesAlgo_FactorialExp_SR": { "name": "YatesAlgo.FactorialExp.SR", @@ -37169,7 +37547,7 @@ "name": "ZINAR1", "version": "0.1.0", "sha256": "1didfjb4215k9q82n1vaqln6f7fszsycsflydak2zl7xwficwhy6", - "depends": ["gamlss_dist", "gtools", "MASS", "scales", "statmod", "VGAM"] + "depends": ["MASS", "VGAM", "gamlss_dist", "gtools", "scales", "statmod"] }, "ZINARp": { "name": "ZINARp", @@ -37187,7 +37565,7 @@ "name": "ZIPFA", "version": "0.8.1", "sha256": "134pkdn4slhiv27rdkkmh2z7xch30ns0jhzxgd7r05bky0z1iri1", - "depends": ["doParallel", "foreach", "Matrix", "optimx", "trustOptim"] + "depends": ["Matrix", "doParallel", "foreach", "optimx", "trustOptim"] }, "ZIPG": { "name": "ZIPG", @@ -37217,7 +37595,7 @@ "name": "ZVCV", "version": "2.1.2", "sha256": "0ws0v7i6r7skb8lv6j718k29v5qsy1b007jxidv81iv0jcz9zfpy", - "depends": ["abind", "BH", "dplyr", "glmnet", "magrittr", "mvtnorm", "Rcpp", "RcppArmadillo", "Rlinsolve"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "Rlinsolve", "abind", "dplyr", "glmnet", "magrittr", "mvtnorm"] }, "ZeBook": { "name": "ZeBook", @@ -37229,7 +37607,7 @@ "name": "ZetaSuite", "version": "1.0.1", "sha256": "10b0acz88vc80x49wwv581abym75wswi4z92mnl4xn0vw62vjpqa", - "depends": ["dplyr", "e1071", "ggplot2", "gridExtra", "mixtools", "RColorBrewer", "reshape2", "Rtsne"] + "depends": ["RColorBrewer", "Rtsne", "dplyr", "e1071", "ggplot2", "gridExtra", "mixtools", "reshape2"] }, "ZillowR": { "name": "ZillowR", @@ -37255,17 +37633,23 @@ "sha256": "1w2rvw1kc4a9b2mi3bh10siv3j89xb3qrx7nydw4kqrgi5c4v3i4", "depends": ["ALDEx2", "edgeR", "matrixcalc", "shiny", "vegan", "zCompositions"] }, + "aLBI": { + "name": "aLBI", + "version": "0.1.5", + "sha256": "03xh0m6nn81sig20p3k24zx131fmi9q5wqx2d4qjlx0wzrmf36px", + "depends": [] + }, "aLFQ": { "name": "aLFQ", "version": "1.3.6", "sha256": "0kphpvhz36859f5l0k8mbf59g9871mynbs4ybdi0h5nm2cdjy9vx", - "depends": ["bio3d", "caret", "data_table", "lattice", "plyr", "randomForest", "reshape2", "ROCR", "seqinr"] + "depends": ["ROCR", "bio3d", "caret", "data_table", "lattice", "plyr", "randomForest", "reshape2", "seqinr"] }, "aMNLFA": { "name": "aMNLFA", "version": "1.1.2", "sha256": "1bks7g6zc8817gr4j1mxzmyhw23mwafb6816a26vylk8d9k9d315", - "depends": ["devtools", "dplyr", "ggplot2", "gridExtra", "MplusAutomation", "plyr", "reshape2", "stringi", "stringr"] + "depends": ["MplusAutomation", "devtools", "dplyr", "ggplot2", "gridExtra", "plyr", "reshape2", "stringi", "stringr"] }, "aPCoA": { "name": "aPCoA", @@ -37277,7 +37661,7 @@ "name": "aPEAR", "version": "1.0.0", "sha256": "08rlfcwwrdy8zz102p67zk4zazjjs7wb08y3kyljn2ps82hmwi19", - "depends": ["arules", "bayesbio", "data_table", "dplyr", "ggforce", "ggplot2", "ggrepel", "igraph", "lsa", "MCL", "reshape2", "tibble"] + "depends": ["MCL", "arules", "bayesbio", "data_table", "dplyr", "ggforce", "ggplot2", "ggrepel", "igraph", "lsa", "reshape2", "tibble"] }, "aRpsDCA": { "name": "aRpsDCA", @@ -37289,19 +37673,19 @@ "name": "aRtsy", "version": "0.2.4", "sha256": "08982646gd7m0f7zcj31jq7wmjh0lrl2gys5ma6v6ikqq06piy0c", - "depends": ["ambient", "e1071", "ggplot2", "kknn", "randomForest", "Rcpp", "RcppArmadillo", "scales"] + "depends": ["Rcpp", "RcppArmadillo", "ambient", "e1071", "ggplot2", "kknn", "randomForest", "scales"] }, "aRxiv": { "name": "aRxiv", "version": "0.10", "sha256": "0fm22lcifq2lmbv2il0jkkp7b426924vwph7yrcqprvlvb3g33id", - "depends": ["httr", "XML"] + "depends": ["XML", "httr"] }, "aSPU": { "name": "aSPU", "version": "1.50", "sha256": "0rh21dj5913nxhdndqfhxvm6mvwnacraf7l3bac09awm7cfhk511", - "depends": ["fields", "gee", "MASS", "matrixStats", "mvtnorm"] + "depends": ["MASS", "fields", "gee", "matrixStats", "mvtnorm"] }, "aTSA": { "name": "aTSA", @@ -37331,7 +37715,7 @@ "name": "abc", "version": "2.2.1", "sha256": "16753lyzk2dfwgdjfyanwacqw3bvrwby52inq4709804labs6lnv", - "depends": ["abc_data", "locfit", "MASS", "nnet", "quantreg"] + "depends": ["MASS", "abc_data", "locfit", "nnet", "quantreg"] }, "abc_data": { "name": "abc.data", @@ -37349,7 +37733,7 @@ "name": "abcrf", "version": "1.9", "sha256": "08mh1a6gxp0mfx6qnp1qzcrfx7xp64qj9kad4ziyswfx22ykdsxi", - "depends": ["doParallel", "foreach", "MASS", "matrixStats", "ranger", "Rcpp", "RcppArmadillo", "readr", "stringr"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "matrixStats", "ranger", "readr", "stringr"] }, "abcrlda": { "name": "abcrlda", @@ -37361,7 +37745,7 @@ "name": "abctools", "version": "1.1.7", "sha256": "16gn5hk25glbjml7bclxqkybi90gqjijz6hl6ak8aig5wm08pgx2", - "depends": ["abc", "abind", "Hmisc", "plyr"] + "depends": ["Hmisc", "abc", "abind", "plyr"] }, "abd": { "name": "abd", @@ -37383,8 +37767,8 @@ }, "aberrance": { "name": "aberrance", - "version": "0.1.0", - "sha256": "0wjckww2dc3q17ln4r0sjgbvi5zxbsh5cz383x02xkkq5va7lrb3", + "version": "0.1.1", + "sha256": "0rpmapx5ji69hfszbhrhvjmn5i6a4jdgy0g11w59xdsrpzc40sv8", "depends": ["MASS"] }, "abess": { @@ -37433,7 +37817,7 @@ "name": "abn", "version": "3.1.1", "sha256": "1sixgahjcy82yiiixgxiqbm8jcajqz0m3h0hwwm202iwzi3vyhiv", - "depends": ["doParallel", "foreach", "graph", "lme4", "mclogit", "nnet", "Rcpp", "RcppArmadillo", "Rgraphviz", "rjags", "stringi"] + "depends": ["Rcpp", "RcppArmadillo", "Rgraphviz", "doParallel", "foreach", "graph", "lme4", "mclogit", "nnet", "rjags", "stringi"] }, "abnormality": { "name": "abnormality", @@ -37457,7 +37841,7 @@ "name": "absorber", "version": "1.0", "sha256": "1s8dn0y0igxaxa1q6cakc28fb1dvf0zljmw7gbn68pdimyrvdh0g", - "depends": ["fda", "ggplot2", "irlba", "MASS", "Matrix", "sparsegl"] + "depends": ["MASS", "Matrix", "fda", "ggplot2", "irlba", "sparsegl"] }, "abstr": { "name": "abstr", @@ -37475,7 +37859,7 @@ "name": "abtest", "version": "1.0.1", "sha256": "0jz2ry5364p8h8xlk5a5sycn8xlpxd1iasfg99bcr4jqzd92jfqg", - "depends": ["Matrix", "mvtnorm", "plotrix", "qgam", "RColorBrewer", "Rcpp", "sn", "truncnorm"] + "depends": ["Matrix", "RColorBrewer", "Rcpp", "mvtnorm", "plotrix", "qgam", "sn", "truncnorm"] }, "abundant": { "name": "abundant", @@ -37493,13 +37877,13 @@ "name": "acc", "version": "1.3.3", "sha256": "1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m", - "depends": ["circlize", "DBI", "ggplot2", "iterators", "mhsmm", "nleqslv", "PhysicalActivity", "plyr", "R_utils", "Rcpp", "RcppArmadillo", "RSQLite", "zoo"] + "depends": ["DBI", "PhysicalActivity", "RSQLite", "R_utils", "Rcpp", "RcppArmadillo", "circlize", "ggplot2", "iterators", "mhsmm", "nleqslv", "plyr", "zoo"] }, "accSDA": { "name": "accSDA", "version": "1.1.3", "sha256": "1s0c4wy4bzrc2fkka7kl519z1yckp6s4ggzy1ik992ygyprdcs1q", - "depends": ["ggplot2", "gridExtra", "MASS"] + "depends": ["MASS", "ggplot2", "gridExtra"] }, "acca": { "name": "acca", @@ -37511,7 +37895,7 @@ "name": "accelerometry", "version": "3.1.2", "sha256": "13xzrwhr4i1nj9c8vrmfdg2rmrc8n446iihcyxmy99sm99hpzyip", - "depends": ["dvmisc", "Rcpp"] + "depends": ["Rcpp", "dvmisc"] }, "accelmissing": { "name": "accelmissing", @@ -37529,7 +37913,7 @@ "name": "accessibility", "version": "1.4.0", "sha256": "0c130kbh3h42pj0iw4zb9kv1i8zmy12znyhxbb5cvr8lwgkzdc4n", - "depends": ["checkmate", "data_table", "Hmisc", "Rdpack"] + "depends": ["Hmisc", "Rdpack", "checkmate", "data_table"] }, "accessr": { "name": "accessr", @@ -37541,13 +37925,13 @@ "name": "accessrmd", "version": "1.0.0", "sha256": "1jdbbsi8nzvr8hnrpw5sr8zf55irnwwrnkwx4vd0zx84bxvw3bqy", - "depends": ["ggplot2", "htmltools", "knitr", "RCurl", "rlist", "stringr"] + "depends": ["RCurl", "ggplot2", "htmltools", "knitr", "rlist", "stringr"] }, "accrual": { "name": "accrual", "version": "1.4", "sha256": "0dygp8xar6dqx822ghjqvi8c597xjb7bqn57475fs4nw5zz709lk", - "depends": ["fgui", "SMPracticals", "tcltk2"] + "depends": ["SMPracticals", "fgui", "tcltk2"] }, "accrualPlot": { "name": "accrualPlot", @@ -37595,7 +37979,7 @@ "name": "acebayes", "version": "1.10", "sha256": "11bffz430gdfdaxjx3simig66vhynmx6l1ylac4q2shcmj52nx73", - "depends": ["compare", "lhs", "randtoolbox", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "compare", "lhs", "randtoolbox"] }, "acepack": { "name": "acepack", @@ -37613,7 +37997,7 @@ "name": "acid", "version": "1.1", "sha256": "030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd", - "depends": ["gamlss", "gamlss_dist", "Hmisc"] + "depends": ["Hmisc", "gamlss", "gamlss_dist"] }, "acled_api": { "name": "acled.api", @@ -37649,13 +38033,13 @@ "name": "acroname", "version": "0.1.0", "sha256": "0fff7z3i8h30v7bsyq240h8ws5ld04n6c5r2iizd2icp8dk9xs9x", - "depends": ["dplyr", "hunspell", "magrittr", "purrr", "R_utils", "readr", "stringr"] + "depends": ["R_utils", "dplyr", "hunspell", "magrittr", "purrr", "readr", "stringr"] }, "acs": { "name": "acs", "version": "2.1.4", "sha256": "0ajw9rf8l8akcvgqvbxjvryc6wjx74521xyxswz2b0bky3m6kah5", - "depends": ["httr", "plyr", "stringr", "XML"] + "depends": ["XML", "httr", "plyr", "stringr"] }, "acss": { "name": "acss", @@ -37673,7 +38057,7 @@ "name": "act", "version": "1.3.1", "sha256": "0c5515mxw2ghdwmnqz1www84v3dn7wlvij47wankb4ak285ak30i", - "depends": ["openxlsx", "progress", "stringi", "stringr", "textutils", "XML", "xml2"] + "depends": ["XML", "openxlsx", "progress", "stringi", "stringr", "textutils", "xml2"] }, "actLifer": { "name": "actLifer", @@ -37685,7 +38069,7 @@ "name": "actel", "version": "1.3.0", "sha256": "0hd1mkshywszswnllcx1lvlghnfk92438r57v6r7w8p5i9m04z9x", - "depends": ["circular", "data_table", "DiagrammeR", "DiagrammeRsvg", "fasttime", "ggplot2", "knitr", "readr", "reshape2", "rmarkdown", "rsvg", "scales", "stringi", "stringr", "svglite"] + "depends": ["DiagrammeR", "DiagrammeRsvg", "circular", "data_table", "fasttime", "ggplot2", "knitr", "readr", "reshape2", "rmarkdown", "rsvg", "scales", "stringi", "stringr", "svglite"] }, "actilifecounts": { "name": "actilifecounts", @@ -37697,7 +38081,7 @@ "name": "activAnalyzer", "version": "2.1.1", "sha256": "0jbzbn9y9lwhy4003ym4w680glj9mdq3gwkk64hfsh94c52xihk3", - "depends": ["assertthat", "dbplyr", "dplyr", "flextable", "forcats", "ggplot2", "golem", "hms", "lubridate", "magrittr", "modelr", "patchwork", "PhysicalActivity", "plyr", "reactable", "rmarkdown", "RSQLite", "shiny", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyFeedback", "shinyjs", "stringr", "tidyr", "zoo"] + "depends": ["PhysicalActivity", "RSQLite", "assertthat", "dbplyr", "dplyr", "flextable", "forcats", "ggplot2", "golem", "hms", "lubridate", "magrittr", "modelr", "patchwork", "plyr", "reactable", "rmarkdown", "shiny", "shinyFeedback", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyjs", "stringr", "tidyr", "zoo"] }, "activPAL": { "name": "activPAL", @@ -37707,15 +38091,15 @@ }, "activatr": { "name": "activatr", - "version": "0.2.0", - "sha256": "0d3r9xp7nrva84az3p211f3g995g8p0lz49f6fjlmzd9pc3jzxg9", + "version": "0.2.1", + "sha256": "1lga186jfymbs9padvv3zb25ccrfqhriszql3bbh0pb5ilqf3qdy", "depends": ["dplyr", "geosphere", "ggmap", "glue", "httr", "lubridate", "rlang", "slider", "tibble", "xml2"] }, "activegp": { "name": "activegp", "version": "1.1.1", "sha256": "1b64k0k6l9dgvyqhd6j9plabaibjayfm5maa4bpwxxgwkp122r3c", - "depends": ["hetGP", "lhs", "MASS", "numDeriv", "Rcpp", "RcppArmadillo", "RcppProgress"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "RcppProgress", "hetGP", "lhs", "numDeriv"] }, "activity": { "name": "activity", @@ -37749,15 +38133,15 @@ }, "actxps": { "name": "actxps", - "version": "1.4.0", - "sha256": "0c0n93zl4ag5mkaw37y2zyg75x9ga4fb5pxz71iidlfj1xblaywa", - "depends": ["dplyr", "generics", "ggplot2", "glue", "gt", "lubridate", "paletteer", "purrr", "readr", "recipes", "rlang", "scales", "tibble", "tidyr", "vctrs"] + "version": "1.5.0", + "sha256": "1mabhbv5mg4afcxwv4fn2f7847scmddmyfqzzhypypj4pll61nr3", + "depends": ["clock", "dplyr", "generics", "ggplot2", "glue", "gt", "paletteer", "purrr", "readr", "recipes", "rlang", "scales", "tibble", "tidyr", "vctrs"] }, "acumos": { "name": "acumos", "version": "0.4-4", "sha256": "15i4xbcdk5vxjrgac32zh4439v0vmabnw3jvsmxiipap5frp7rpi", - "depends": ["httr", "jsonlite", "RestRserve", "RProtoBuf", "Rserve", "yaml"] + "depends": ["RProtoBuf", "RestRserve", "Rserve", "httr", "jsonlite", "yaml"] }, "ada": { "name": "ada", @@ -37773,15 +38157,15 @@ }, "adaR": { "name": "adaR", - "version": "0.3.2", - "sha256": "0ficdvfpb6lhhbyifvy9r9z6lvxp4ric2aiarfij7r38a8m83j06", + "version": "0.3.3", + "sha256": "0vd79id211n1w8hqr3jpncdf3x8rg80gkdwfg4618hkadzdf2a2h", "depends": ["Rcpp", "triebeard"] }, "adabag": { "name": "adabag", "version": "5.0", "sha256": "03nnqgia61pavic9l6av0hh81wilxlkrx3g244ypar1fv9ppan7c", - "depends": ["caret", "ConsRank", "doParallel", "dplyr", "foreach", "rpart", "tidyr"] + "depends": ["ConsRank", "caret", "doParallel", "dplyr", "foreach", "rpart", "tidyr"] }, "adace": { "name": "adace", @@ -37799,19 +38183,19 @@ "name": "adamethods", "version": "1.2.1", "sha256": "150awbd3skb1mqca18bqjykhyycqw8crviw66s6qrcnmcsbk77pj", - "depends": ["Anthropometry", "archetypes", "FNN", "foreach", "nnls", "tolerance", "univOutl"] + "depends": ["Anthropometry", "FNN", "archetypes", "foreach", "nnls", "tolerance", "univOutl"] }, "adana": { "name": "adana", "version": "1.1.0", "sha256": "0zi3a17rapc1z074k3yzgjv2b6ba6c9d54b1hm0ivvgfd335981f", - "depends": ["optimx", "ROI", "ROI_plugin_optimx"] + "depends": ["ROI", "ROI_plugin_optimx", "optimx"] }, "adapt4pv": { "name": "adapt4pv", "version": "0.2-3", "sha256": "05z3dwcx7pyysf0ghz8m6ij3lj53qkqll50b0gd2yi7ffp9m9601", - "depends": ["doParallel", "foreach", "glmnet", "Matrix", "speedglm", "xgboost"] + "depends": ["Matrix", "doParallel", "foreach", "glmnet", "speedglm", "xgboost"] }, "adaptDiag": { "name": "adaptDiag", @@ -37829,7 +38213,7 @@ "name": "adaptMCMC", "version": "1.5", "sha256": "1inw339n2rb1g2n9zkmv8gp43lifil3plv82x9sxrq468ihzng4f", - "depends": ["coda", "Matrix", "ramcmc"] + "depends": ["Matrix", "coda", "ramcmc"] }, "adaptMT": { "name": "adaptMT", @@ -37871,31 +38255,37 @@ "name": "adaptsmoFMRI", "version": "1.2", "sha256": "00npcl2js9vj5r3l66cp5d2l807klia581pig1gsyjjq4rvmfa7v", - "depends": ["coda", "Matrix", "MCMCpack", "mvtnorm", "spatstat", "spatstat_geom"] + "depends": ["MCMCpack", "Matrix", "coda", "mvtnorm", "spatstat", "spatstat_geom"] + }, + "adass": { + "name": "adass", + "version": "1.0.1", + "sha256": "1shp1yja5zqikl29j2xi4jlwsbkrlg593isnclhy7bwaqyn3qm14", + "depends": ["Rfast", "SparseM", "fda", "matrixcalc", "mvtnorm", "plot3D"] }, "adbcdrivermanager": { "name": "adbcdrivermanager", - "version": "0.12.0", - "sha256": "0kvn6agx5vscdl77zzkz8lhlr2i7p9qda6q52ligwvjyrh5zyi48", + "version": "0.13.0", + "sha256": "0d0fcjqcmbfbpln3s6n3aas9pz3ich43vnm6qnl8sf6dil3fxnsg", "depends": ["nanoarrow"] }, "adbcpostgresql": { "name": "adbcpostgresql", - "version": "0.12.0", - "sha256": "031qv19rx389br9dv3nxpghy580g1aywv265la03s9g6d5jw9j4r", + "version": "0.13.0", + "sha256": "0lspgnimsgpkyf6q0qk5gjf9kij5w2x6xjcp6cy8hpwbp6xci8yr", "depends": ["adbcdrivermanager"] }, "adbcsqlite": { "name": "adbcsqlite", - "version": "0.12.0", - "sha256": "085djnpafh4gdklai3x54bjbkqkiyjlz9nygddmid3x3x4xg01vj", + "version": "0.13.0", + "sha256": "1vqabya705454lsxis73j2nflqp6jydk1hhcjnc79kjxf332nq5z", "depends": ["adbcdrivermanager"] }, "adbi": { "name": "adbi", "version": "0.1.1", "sha256": "17w74ggng77yvpqn0vw1s1gylmchrv2dq6s19fl56dl6nqp6bfpa", - "depends": ["adbcdrivermanager", "DBI", "nanoarrow"] + "depends": ["DBI", "adbcdrivermanager", "nanoarrow"] }, "adc": { "name": "adc", @@ -37907,7 +38297,7 @@ "name": "add2ggplot", "version": "0.3.0", "sha256": "0c94i1cfp2pvplvxmfvvz2fyj026r1jnax05mrzrc7ppnqzy25y0", - "depends": ["ggplot2", "magick", "magrittr", "RColorBrewer", "zeallot"] + "depends": ["RColorBrewer", "ggplot2", "magick", "magrittr", "zeallot"] }, "addScales": { "name": "addScales", @@ -37919,7 +38309,7 @@ "name": "addhaz", "version": "0.5", "sha256": "1709jq9rp5lhqk0qpk8zkdwzhcv1bcach8mm7yiz7hzcc1mgxb12", - "depends": ["boot", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "boot"] }, "addhazard": { "name": "addhazard", @@ -37937,13 +38327,13 @@ "name": "addinsOutline", "version": "0.1.6", "sha256": "125qfqbpv5xflw8qlyh8m3iyd6biyp3arls3z7y8bqkbghifl730", - "depends": ["dplyr", "DT", "fs", "miniUI", "rmarkdown", "rstudioapi", "shiny", "shinyFiles", "stringr", "tibble", "yaml"] + "depends": ["DT", "dplyr", "fs", "miniUI", "rmarkdown", "rstudioapi", "shiny", "shinyFiles", "stringr", "tibble", "yaml"] }, "addinslist": { "name": "addinslist", "version": "0.5.0", "sha256": "0gis7485m7gz3xz5wfxxm3136cg2j9i6f6zq8gbv206w261y1nfb", - "depends": ["curl", "DT", "miniUI", "rappdirs", "remotes", "rmarkdown", "rvest", "shiny", "shinyjs", "xml2"] + "depends": ["DT", "curl", "miniUI", "rappdirs", "remotes", "rmarkdown", "rvest", "shiny", "shinyjs", "xml2"] }, "additive": { "name": "additive", @@ -37973,7 +38363,7 @@ "name": "ade4", "version": "1.7-22", "sha256": "1d4knc1c1hha4gwcakbllzmff4g0mh56y058dn6wp9m2hd7gaz80", - "depends": ["MASS", "pixmap", "Rcpp", "RcppArmadillo", "sp"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "pixmap", "sp"] }, "ade4TkGUI": { "name": "ade4TkGUI", @@ -37985,19 +38375,19 @@ "name": "adea", "version": "1.5.1", "sha256": "0wjklmd1r5vhp32syn9dpn5j05y9nfb0c8cnrdc2xcdsi8dzdkap", - "depends": ["combinat", "knitr", "lpSolveAPI", "parallelly", "rmarkdown", "ROI", "ROI_plugin_glpk", "ROI_plugin_lpsolve", "ROI_plugin_symphony", "slam"] + "depends": ["ROI", "ROI_plugin_glpk", "ROI_plugin_lpsolve", "ROI_plugin_symphony", "combinat", "knitr", "lpSolveAPI", "parallelly", "rmarkdown", "slam"] }, "adegenet": { "name": "adegenet", "version": "2.1.10", "sha256": "0qxig2jyj1q0a8pwpv5f5v5b4x4af8s9p1p0yc0msmyxq457hqmb", - "depends": ["ade4", "ape", "boot", "dplyr", "ggplot2", "igraph", "MASS", "reshape2", "seqinr", "shiny", "vegan"] + "depends": ["MASS", "ade4", "ape", "boot", "dplyr", "ggplot2", "igraph", "reshape2", "seqinr", "shiny", "vegan"] }, "adegraphics": { "name": "adegraphics", "version": "1.0-21", "sha256": "1a7bz9j06sc09kvynzss71dxffp40vsl35azj0gzs81jl2rr4ap0", - "depends": ["ade4", "KernSmooth", "lattice", "latticeExtra", "RColorBrewer", "sp"] + "depends": ["KernSmooth", "RColorBrewer", "ade4", "lattice", "latticeExtra", "sp"] }, "adehabitatHR": { "name": "adehabitatHR", @@ -38015,7 +38405,7 @@ "name": "adehabitatLT", "version": "0.3.27", "sha256": "0siaj9h9gyar6pmnv9bp4k7lcpfcvhykl3jj80pzdb6yyybgj2zx", - "depends": ["ade4", "adehabitatMA", "CircStats", "sp"] + "depends": ["CircStats", "ade4", "adehabitatMA", "sp"] }, "adehabitatMA": { "name": "adehabitatMA", @@ -38023,6 +38413,12 @@ "sha256": "1jmmi6rh3rnv5b3qy1xhy0rs4dnkysf4rxjfs0im1i5n4rd437h8", "depends": ["sp"] }, + "adelie": { + "name": "adelie", + "version": "1.0.1", + "sha256": "1h6i2swda173mfilib8cg535w4ba1yciliy071brazhh4r9zcm8m", + "depends": ["Matrix", "Rcpp", "RcppEigen", "r2r"] + }, "adephylo": { "name": "adephylo", "version": "1.1-16", @@ -38033,7 +38429,7 @@ "name": "adepro", "version": "4.1.0", "sha256": "06zj8vq7py41g0bjpnd4fczwxcr4k1lb1cxjxfc92fhj0wk51k36", - "depends": ["audio", "Cairo", "dplyr", "forcats", "haven", "here", "MASS", "readr", "rlang", "seriation", "shape", "shiny", "shinyBS", "shinyjs", "shinyWidgets", "tidyr", "V8"] + "depends": ["Cairo", "MASS", "V8", "audio", "dplyr", "forcats", "haven", "here", "readr", "rlang", "seriation", "shape", "shiny", "shinyBS", "shinyWidgets", "shinyjs", "tidyr"] }, "adept": { "name": "adept", @@ -38051,13 +38447,13 @@ "name": "adespatial", "version": "0.3-23", "sha256": "0cszq382vpd8alc98hnrzqj1wyp8bcfbvqpi1d2rqbr12f5qgq3h", - "depends": ["ade4", "adegraphics", "adephylo", "lattice", "MASS", "shiny", "sp", "spdep", "vegan"] + "depends": ["MASS", "ade4", "adegraphics", "adephylo", "lattice", "shiny", "sp", "spdep", "vegan"] }, "adestr": { "name": "adestr", - "version": "0.5.0", - "sha256": "0gwkmj0fg732ci02cgyr95s245vfakjzqacsa7g5k258w8wyxwip", - "depends": ["cubature", "forcats", "future_apply", "ggplot2", "ggpubr", "latex2exp", "pracma", "progressr", "Rdpack", "scales"] + "version": "1.0.0", + "sha256": "1inzp6ar5mg08cq2mmh7f0m87yvmf2cihv2zysn9v00x1g5zcb48", + "depends": ["Rdpack", "adoptr", "cubature", "forcats", "future_apply", "ggplot2", "ggpubr", "latex2exp", "progressr", "scales"] }, "adfExplorer": { "name": "adfExplorer", @@ -38075,12 +38471,12 @@ "name": "adheRenceRX", "version": "1.0.0", "sha256": "19kimj88dmcc8mq3s4l7pph9jz8p57gbjyn0pn5zkrcjdrwncslm", - "depends": ["anytime", "dplyr", "lubridate", "purrr", "Rcpp", "rlang", "tidyr"] + "depends": ["Rcpp", "anytime", "dplyr", "lubridate", "purrr", "rlang", "tidyr"] }, "adimpro": { "name": "adimpro", - "version": "0.9.6", - "sha256": "0d5viz9ayywpp1pas1yzmhllzn9rjrl8a3k7bj7h46f95l5x1586", + "version": "0.9.7", + "sha256": "1p34q78w1ib5xjvxg4c1bal680a55l5dqhiry367x9nzwq8a352c", "depends": ["awsMethods"] }, "adiv": { @@ -38093,7 +38489,7 @@ "name": "adjROC", "version": "0.3", "sha256": "0bf7vvhllpl8irqw1ahfhbhqq67v6jxblapv91ddkgpk2dl0sp03", - "depends": ["boot", "ggplot2", "ROCit", "yardstick"] + "depends": ["ROCit", "boot", "ggplot2", "yardstick"] }, "adjSURVCI": { "name": "adjSURVCI", @@ -38105,13 +38501,13 @@ "name": "adjclust", "version": "0.6.9", "sha256": "1iq0pfw0kdi792iigpj4vq8phbcs9bid09bdvpxwwxcq65djni41", - "depends": ["capushe", "dendextend", "ggplot2", "Matrix", "Rcpp", "RcppArmadillo", "rlang", "sparseMatrixStats"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "capushe", "dendextend", "ggplot2", "rlang", "sparseMatrixStats"] }, "adjustedCurves": { "name": "adjustedCurves", - "version": "0.11.1", - "sha256": "047r9fi9ilcfnb6shkqsnrz4c4gs6x1nbff00wfamncjv19s74yh", - "depends": ["doParallel", "doRNG", "dplyr", "foreach", "R_utils", "rlang", "survival"] + "version": "0.11.2", + "sha256": "11bc2hrxr65i1rk2zv7r7daqm7m5v9xhhgk1fwr0jbs6c4dk2niw", + "depends": ["R_utils", "doParallel", "doRNG", "dplyr", "foreach", "rlang", "survival"] }, "adjustedcranlogs": { "name": "adjustedcranlogs", @@ -38133,8 +38529,8 @@ }, "admiral": { "name": "admiral", - "version": "1.1.0", - "sha256": "1ynqmpswhcy4qlaf8yvhhlax6j9xii5m7bwvrxrjzqnpdcif4hrb", + "version": "1.1.1", + "sha256": "0g669is6kj6hqpi2i6ik6c0c5mrx3750dd8dsnjmv25aiy60hnzp", "depends": ["admiraldev", "cli", "dplyr", "hms", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tidyr", "tidyselect"] }, "admiral_test": { @@ -38151,14 +38547,14 @@ }, "admiralonco": { "name": "admiralonco", - "version": "1.0.0", - "sha256": "03q02l4abrcgpg17cyfq2vhzinlywm0ir6wqx2ch43d3agzyypzy", + "version": "1.1.0", + "sha256": "022cjygxyq40fg66bdky0pdffyv6dafq77s6g7skxmyqrp6wqhqd", "depends": ["admiral", "admiraldev", "dplyr", "lifecycle", "lubridate", "magrittr", "rlang", "tidyselect"] }, "admiralophtha": { "name": "admiralophtha", - "version": "1.0.0", - "sha256": "0ip69mishnx8yllfp2vm2qsa5917hwi974lr8qwil9xx6d2hgbkz", + "version": "1.1.0", + "sha256": "1690id6s5633r47av68wivg436h5s13a5qlg9a1dyfghd6wfa79f", "depends": ["admiral", "admiraldev", "dplyr", "hms", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tidyr", "tidyselect"] }, "admiralvaccine": { @@ -38177,7 +38573,7 @@ "name": "admix", "version": "2.1-3", "sha256": "0h6saazz2p8pliznn2ggbi6zj5ib00ylghfxj5i9nk21p4y0s59s", - "depends": ["cubature", "fdrtool", "Iso", "MASS", "orthopolynom", "pracma", "Rcpp"] + "depends": ["Iso", "MASS", "Rcpp", "cubature", "fdrtool", "orthopolynom", "pracma"] }, "admixr": { "name": "admixr", @@ -38193,21 +38589,21 @@ }, "admtools": { "name": "admtools", - "version": "0.2.0", - "sha256": "11xp0zcv0qj0l4nq1c5wc4w6zc569qfhd4ir6knwynq68n89p8c2", + "version": "0.3.0", + "sha256": "01vawhabsj09zf8126wfyawp3likf2i0k7micwjdmll33ykl8254", "depends": ["ape"] }, "adnuts": { "name": "adnuts", "version": "1.1.2", "sha256": "0nkciv5sfj3bws6kpgrnaq4ziasibaz44w64mb86zmr8420nyc1q", - "depends": ["ellipse", "ggplot2", "R2admb", "rlang", "rstan", "snowfall"] + "depends": ["R2admb", "ellipse", "ggplot2", "rlang", "rstan", "snowfall"] }, "adobeanalyticsr": { "name": "adobeanalyticsr", "version": "0.4.0", "sha256": "1cbr86ssnd0bl6pvqziz16nvh3gzmd170pkk8wr2rkhm0rryh2l4", - "depends": ["assertthat", "dplyr", "ggplot2", "glue", "httr", "jose", "jsonlite", "lifecycle", "lubridate", "memoise", "openssl", "progress", "purrr", "R6", "rlang", "scales", "stringr", "tidyr", "vctrs"] + "depends": ["R6", "assertthat", "dplyr", "ggplot2", "glue", "httr", "jose", "jsonlite", "lifecycle", "lubridate", "memoise", "openssl", "progress", "purrr", "rlang", "scales", "stringr", "tidyr", "vctrs"] }, "adoptr": { "name": "adoptr", @@ -38217,9 +38613,9 @@ }, "adproclus": { "name": "adproclus", - "version": "1.0.2", - "sha256": "1aj9bb86fmgq6ln39pmkws0bp07wf02k3fahgsv3hq86yflgac8q", - "depends": ["checkmate", "corrplot", "gtools", "igraph", "NMFN", "qgraph", "withr"] + "version": "2.0.0", + "sha256": "00n7nc11c47vcjz8zlx855dw9lq9d12qghx42hz1xy0ah0iqjh3q", + "depends": ["NMFN", "checkmate", "corrplot", "ggplot2", "ggrepel", "gtools", "igraph", "matrixStats", "multichull", "qgraph", "readr", "rlang", "scales", "tidyr", "withr"] }, "adpss": { "name": "adpss", @@ -38243,7 +38639,7 @@ "name": "adventr", "version": "0.1.8", "sha256": "0nja1a2xhaimz1fg2bb838x9a37sswjqjc68mp59gbdwkfpdii37", - "depends": ["BayesFactor", "boot", "car", "dplyr", "effects", "effsize", "forcats", "GGally", "ggplot2", "Hmisc", "learnr", "lm_beta", "nlme", "readr", "robust", "sandwich", "sjstats", "tidyr", "WRS2"] + "depends": ["BayesFactor", "GGally", "Hmisc", "WRS2", "boot", "car", "dplyr", "effects", "effsize", "forcats", "ggplot2", "learnr", "lm_beta", "nlme", "readr", "robust", "sandwich", "sjstats", "tidyr"] }, "adw": { "name": "adw", @@ -38275,6 +38671,12 @@ "sha256": "1sy3j78lawa10rf22fa3wsbal2mv64hs1k5v7yqf9hx11jib26sz", "depends": ["dplyr", "ggplot2", "lifecycle", "magrittr", "purrr", "rlang", "tibble"] }, + "aelab": { + "name": "aelab", + "version": "0.4.0", + "sha256": "0v4mm9nq5l7hm3mh421xw5rnc0ibhc9jy5pqfqhcw3brygffdhbf", + "depends": ["dplyr", "ggplot2", "lubridate", "openxlsx", "readr", "readxl", "tibble", "tidyr"] + }, "afc": { "name": "afc", "version": "1.4.0", @@ -38309,19 +38711,13 @@ "name": "affinitymatrix", "version": "0.1.0", "sha256": "10i7wzl4xiphj5f466ga7c4ha3mkyqn63x1z0jyx50m0b84sggq1", - "depends": ["expm", "ggplot2", "ggrepel", "Hmisc", "MASS"] - }, - "affluenceIndex": { - "name": "affluenceIndex", - "version": "2.1", - "sha256": "0vcg4gphs0yxdxsgw7kj9r3hvjpfs2z8sjvllvfw9ki3y7jy5jb8", - "depends": ["spatstat", "spatstat_geom"] + "depends": ["Hmisc", "MASS", "expm", "ggplot2", "ggrepel"] }, "afmToolkit": { "name": "afmToolkit", "version": "0.0.1", "sha256": "1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl", - "depends": ["assertthat", "DBI", "dplyr", "ggplot2", "gridExtra", "minpack_lm", "scales", "tibble"] + "depends": ["DBI", "assertthat", "dplyr", "ggplot2", "gridExtra", "minpack_lm", "scales", "tibble"] }, "afpt": { "name": "afpt", @@ -38333,7 +38729,7 @@ "name": "africamonitor", "version": "0.2.4", "sha256": "0nqxvyv6hipadyfzc6mvr2pns3m7n7h3i87lzvgx8fj2rlcigqkq", - "depends": ["collapse", "data_table", "DBI", "RMySQL"] + "depends": ["DBI", "RMySQL", "collapse", "data_table"] }, "aftR2": { "name": "aftR2", @@ -38345,19 +38741,19 @@ "name": "aftgee", "version": "1.2.0", "sha256": "01mjgahs6wfd47imnw0zni57ilcy76gh5lpsihxyd3grwd9jkki7", - "depends": ["BB", "geepack", "MASS", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["BB", "MASS", "Rcpp", "RcppArmadillo", "geepack", "survival"] }, "afthd": { "name": "afthd", "version": "1.1.0", "sha256": "0gg2cp3sj28f3pi5rqh737hna3imwarwas01jacm0m2h27587k7y", - "depends": ["glmnet", "photobiology", "R2jags", "rstpm2", "survival"] + "depends": ["R2jags", "glmnet", "photobiology", "rstpm2", "survival"] }, "afttest": { "name": "afttest", "version": "4.3.2.3", "sha256": "1jk8xs4mcayaij5rjl891mzg3dq9qs0lyi5gfzi6sjar6apmwsfb", - "depends": ["aftgee", "ggplot2", "gridExtra", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "aftgee", "ggplot2", "gridExtra", "survival"] }, "ag5Tools": { "name": "ag5Tools", @@ -38369,13 +38765,13 @@ "name": "agRee", "version": "0.5-3", "sha256": "1wi8jn14kpsj5z49my6fz8j6zxysddxm8svw86cnzsmnbj6mzq7x", - "depends": ["coda", "lme4", "miscF", "R2jags"] + "depends": ["R2jags", "coda", "lme4", "miscF"] }, "agcounts": { "name": "agcounts", "version": "0.6.6", "sha256": "1q993a7m639zn5cl8lv300qbqgh8wycqckaynvv9lc6a6j60ygjv", - "depends": ["bslib", "data_table", "DBI", "dplyr", "GGIR", "ggplot2", "gsignal", "lubridate", "magrittr", "Rcpp", "RcppArmadillo", "reactable", "read_gt3x", "reticulate", "RSQLite", "shiny", "stringr", "zoo"] + "depends": ["DBI", "GGIR", "RSQLite", "Rcpp", "RcppArmadillo", "bslib", "data_table", "dplyr", "ggplot2", "gsignal", "lubridate", "magrittr", "reactable", "read_gt3x", "reticulate", "shiny", "stringr", "zoo"] }, "ageg": { "name": "ageg", @@ -38387,12 +38783,12 @@ "name": "agena.ai", "version": "1.1.1", "sha256": "1nn2634r93gg3nwqnlg8c44zajl5jadx0cszah8nq502qby5y36j", - "depends": ["httr", "openxlsx", "Rgraphviz", "rjson"] + "depends": ["Rgraphviz", "httr", "openxlsx", "rjson"] }, "ageutils": { "name": "ageutils", - "version": "0.0.3", - "sha256": "1rrn0ag70bix45kkzpvkyz5hqnh86p0pw902is19gxf3qb8nj2bd", + "version": "0.0.4", + "sha256": "1l25f0qq5lqc5jpcwvvnl6qysrgyz1g8wgqqw10d8z38jks2mrg3", "depends": [] }, "agfh": { @@ -38411,7 +38807,7 @@ "name": "agghoo", "version": "0.1-0", "sha256": "0vaqmydww494ql6xbhhjkpap3lqkhf8hkbcrr1pk81qpszs0pndm", - "depends": ["class", "FNN", "R6", "rpart"] + "depends": ["FNN", "R6", "class", "rpart"] }, "aggregation": { "name": "aggregation", @@ -38453,13 +38849,13 @@ "name": "agricolae", "version": "1.3-7", "sha256": "0zaanfhvlx7c0s9y550hqn9bsffbykchcd7940fxx69jw87fkbf5", - "depends": ["AlgDesign", "cluster", "MASS", "nlme"] + "depends": ["AlgDesign", "MASS", "cluster", "nlme"] }, "agricolaeplotr": { "name": "agricolaeplotr", "version": "0.5.0", "sha256": "0fy9h4r55dn7yxnjlxhy74sf9lcg22mllcg6nwaivp92w03vkccy", - "depends": ["agricolae", "dplyr", "FielDHub", "ggplot2", "ggspatial", "raster", "sf", "sp", "stplanr", "tibble", "tidyr"] + "depends": ["FielDHub", "agricolae", "dplyr", "ggplot2", "ggspatial", "raster", "sf", "sp", "stplanr", "tibble", "tidyr"] }, "agridat": { "name": "agridat", @@ -38477,7 +38873,7 @@ "name": "agriutilities", "version": "1.2.0", "sha256": "17707cdhrzpxcr0xm6kavy3p762yzrjxg4anwgfrhdmrhvygpirf", - "depends": ["data_table", "dplyr", "emmeans", "ggplot2", "ggpubr", "ggrepel", "lme4", "lmerTest", "magrittr", "Matrix", "psych", "rlang", "SpATS", "statgenSTA", "tibble", "tidyr"] + "depends": ["Matrix", "SpATS", "data_table", "dplyr", "emmeans", "ggplot2", "ggpubr", "ggrepel", "lme4", "lmerTest", "magrittr", "psych", "rlang", "statgenSTA", "tibble", "tidyr"] }, "agriwater": { "name": "agriwater", @@ -38525,7 +38921,7 @@ "name": "ahMLE", "version": "1.20.1", "sha256": "1phfzl0kynrq1if12h736jdxrfqc3i4kd32hp7sy2k2z7hkj1dkm", - "depends": ["invGauss", "Matrix", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "invGauss", "survival"] }, "ahaz": { "name": "ahaz", @@ -38543,7 +38939,7 @@ "name": "ahpsurvey", "version": "0.4.1", "sha256": "1r7x4c318nzbx0ppm9272kfpz2bln1cafkv9irnj85nsdcravr33", - "depends": ["dplyr", "knitr", "magrittr", "randomNames", "Rdpack", "tidyr"] + "depends": ["Rdpack", "dplyr", "knitr", "magrittr", "randomNames", "tidyr"] }, "ahptopsis2n": { "name": "ahptopsis2n", @@ -38585,13 +38981,13 @@ "name": "aifeducation", "version": "0.3.3", "sha256": "0lnxbvmsalis942nxgf0c3j602wcdzpvdm9r194c2ci0xpybc6ls", - "depends": ["abind", "doParallel", "foreach", "iotarelr", "irr", "irrCAC", "Rcpp", "RcppArmadillo", "reshape2", "reticulate", "rlang", "smotefamily", "stringr"] + "depends": ["Rcpp", "RcppArmadillo", "abind", "doParallel", "foreach", "iotarelr", "irr", "irrCAC", "reshape2", "reticulate", "rlang", "smotefamily", "stringr"] }, "aihuman": { "name": "aihuman", "version": "0.1.0", "sha256": "0isd6j3qfhl9dfcknzsfyipvvni7bw6cpdkk4v5azpi3mcixbq4n", - "depends": ["abind", "coda", "doParallel", "dplyr", "foreach", "ggplot2", "lme4", "magrittr", "MASS", "metR", "purrr", "Rcpp", "RcppArmadillo", "RcppEigen", "tidyr"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "RcppEigen", "abind", "coda", "doParallel", "dplyr", "foreach", "ggplot2", "lme4", "magrittr", "metR", "purrr", "tidyr"] }, "aimPlot": { "name": "aimPlot", @@ -38607,8 +39003,8 @@ }, "aion": { "name": "aion", - "version": "1.0.2", - "sha256": "01h7w39gz03wydxsk2ikikbhi9nw46qq2wl3nksvi91zydyls5zf", + "version": "1.0.4", + "sha256": "0acm2nffrpqbli358cbpl0sd7bq9m5qbnnrk01xd7h9l63xzs67c", "depends": ["arkhe"] }, "air": { @@ -38639,18 +39035,18 @@ "name": "airGRiwrm", "version": "0.6.2", "sha256": "09hcs5qhs3mykdarznqwiqd2vjdc5fqmp8lvfpmf4s2b3yqvydax", - "depends": ["airGR", "DiagrammeR", "dplyr"] + "depends": ["DiagrammeR", "airGR", "dplyr"] }, "airGRteaching": { "name": "airGRteaching", - "version": "0.3.2", - "sha256": "1lhzvhhrylp1c2znrz9b1vni9mqc6kkl7bjc6p3kjwph1vw9ka72", + "version": "0.3.3", + "sha256": "0dsxj20g63a4y4a865qsqdk8w1w0ybcam6x4f10bmppallkalagz", "depends": ["airGR", "dygraphs", "markdown", "plotrix", "shiny", "shinyjs", "xts"] }, "aire_zmvm": { "name": "aire.zmvm", - "version": "0.9.0", - "sha256": "1jb86dkqj8vbbg7iq4852bjdlc4i9mn0x6rc7lhl81nf6rfi9wql", + "version": "1.0.0", + "sha256": "10x22n9cjr2zcjm84j6l3i9lywfw744giww4h2ki3iq3v4qli09y", "depends": ["dplyr", "httr", "lubridate", "progress", "readr", "readxl", "rvest", "sp", "stringr", "tidyr", "xml2"] }, "airnow": { @@ -38687,7 +39083,7 @@ "name": "airt", "version": "0.2.2", "sha256": "1x2p172k7lffcn3cfs7pgdi3iq2fpys8rsrx1spq7gy14xcq9w63", - "depends": ["dplyr", "EstCRM", "ggplot2", "magrittr", "mirt", "pracma", "RColorBrewer", "rlang", "tibble", "tidyr"] + "depends": ["EstCRM", "RColorBrewer", "dplyr", "ggplot2", "magrittr", "mirt", "pracma", "rlang", "tibble", "tidyr"] }, "aisoph": { "name": "aisoph", @@ -38701,6 +39097,12 @@ "sha256": "1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm", "depends": ["RJSONIO", "V8", "yaml"] }, + "aka": { + "name": "aka", + "version": "0.1.0", + "sha256": "0370rs9kz43azgclc11x8185sr5hq507mvk2pmwprwwj86j65vpk", + "depends": [] + }, "akc": { "name": "akc", "version": "0.9.9", @@ -38735,7 +39137,7 @@ "name": "alakazam", "version": "1.3.0", "sha256": "01alngdynigvycmpqa71ccndw6v91hmrs3c2ah0r148rxdgbw58v", - "depends": ["airr", "ape", "Biostrings", "dplyr", "GenomicAlignments", "ggplot2", "igraph", "IRanges", "Matrix", "progress", "Rcpp", "readr", "rlang", "scales", "seqinr", "stringi", "tibble", "tidyr"] + "depends": ["Biostrings", "GenomicAlignments", "IRanges", "Matrix", "Rcpp", "airr", "ape", "dplyr", "ggplot2", "igraph", "progress", "readr", "rlang", "scales", "seqinr", "stringi", "tibble", "tidyr"] }, "alarmdata": { "name": "alarmdata", @@ -38747,7 +39149,7 @@ "name": "albatross", "version": "0.3-8", "sha256": "1cayp4025h14p66alagpvnwm5f05l7gv132x3a2d40cf77nrrpky", - "depends": ["CMLS", "lattice", "Matrix", "multiway", "pracma"] + "depends": ["CMLS", "Matrix", "lattice", "multiway", "pracma"] }, "albopictus": { "name": "albopictus", @@ -38755,6 +39157,12 @@ "sha256": "0kw1agm9jqi9wl5zbx8bryngy751g3sih36rgbrx0m2170cy42d9", "depends": [] }, + "alcyon": { + "name": "alcyon", + "version": "0.4.0", + "sha256": "1l3z7bsspxbhfxldq4pbh7lmwfmmfqry99xhk125ja19h1xfyxl4", + "depends": ["Rcpp", "igraph", "sf", "stars"] + }, "ald": { "name": "ald", "version": "1.3.1", @@ -38765,7 +39173,7 @@ "name": "aldvmm", "version": "0.8.8", "sha256": "1qqfhfrhqlzlmfdf84sq9v17d6jrnn4w7yilskbrg74zvbcbc3k8", - "depends": ["checkmate", "Formula", "lmtest", "numDeriv", "optimx", "sandwich"] + "depends": ["Formula", "checkmate", "lmtest", "numDeriv", "optimx", "sandwich"] }, "ale": { "name": "ale", @@ -38789,7 +39197,7 @@ "name": "algaeClassify", "version": "2.0.2", "sha256": "08jg210aas3bxjqgsapba8fzc133nh9afl0lzy784ywdx96lfmm0", - "depends": ["curl", "jsonlite", "lubridate", "RCurl", "ritis", "taxize"] + "depends": ["RCurl", "curl", "jsonlite", "lubridate", "ritis", "taxize"] }, "algo": { "name": "algo", @@ -38807,13 +39215,13 @@ "name": "aliases2entrez", "version": "0.1.2", "sha256": "11myzwvmagnj35qrrxr35hklzv76c0c4h2zl64y3lzzn5rfii0n6", - "depends": ["AnnotationDbi", "doParallel", "foreach", "limma", "org_Hs_eg_db", "RCurl", "readr"] + "depends": ["AnnotationDbi", "RCurl", "doParallel", "foreach", "limma", "org_Hs_eg_db", "readr"] }, "alien": { "name": "alien", - "version": "1.0.1", - "sha256": "0856csdvz5wz699n7g8bj1azzyw2mfznhcwmabzp740bijy6x6qi", - "depends": ["cli", "dplyr", "ggplot2", "HelpersMG", "rlang", "tidyr"] + "version": "1.0.2", + "sha256": "191prlklg153a7inbbjq3fjz0yr6pyyqcxl4syy8p6a64a92clyn", + "depends": ["HelpersMG", "cli", "dplyr", "ggplot2", "rlang", "tidyr"] }, "align": { "name": "align", @@ -38823,8 +39231,8 @@ }, "alkahest": { "name": "alkahest", - "version": "1.1.1", - "sha256": "1wbdhvak4984rdglsx2h7wwazxkvz2wv93lnizw7b4dm8aqrnapg", + "version": "1.2.0", + "sha256": "18gfj0g1ccisvls4czh24bp3bcakyjfhddkl92fsmy9wpq2i3qhx", "depends": [] }, "allMT": { @@ -38861,7 +39269,7 @@ "name": "allofus", "version": "1.1.0", "sha256": "0lxds215ar26z28jv5kxp61vhg0yy73q7xj0dbdkiqnqhq7z8dhd", - "depends": ["bigrquery", "bit64", "cli", "DBI", "dbplyr", "dplyr", "glue", "lifecycle", "magrittr", "purrr", "rlang", "sessioninfo", "stringr", "tidyr"] + "depends": ["DBI", "bigrquery", "bit64", "cli", "dbplyr", "dplyr", "glue", "lifecycle", "magrittr", "purrr", "rlang", "sessioninfo", "stringr", "tidyr"] }, "allomr": { "name": "allomr", @@ -38879,7 +39287,7 @@ "name": "almanac", "version": "1.0.0", "sha256": "03954ylzqj34kkkz74ffa3i1kbby2vy0gxmbqd4gcw6qa646fq79", - "depends": ["cli", "glue", "lifecycle", "lubridate", "magrittr", "R6", "rlang", "V8", "vctrs"] + "depends": ["R6", "V8", "cli", "glue", "lifecycle", "lubridate", "magrittr", "rlang", "vctrs"] }, "alone": { "name": "alone", @@ -38891,7 +39299,7 @@ "name": "alookr", "version": "0.3.9", "sha256": "13lvbfgqb6ivrik1jcbfz3zn6p41aqwq68bk9ric3xnyjnczc5wg", - "depends": ["caTools", "cli", "dlookr", "dplyr", "future", "ggmosaic", "ggplot2", "glmnet", "MASS", "MLmetrics", "parallelly", "party", "purrr", "randomForest", "ranger", "rlang", "ROCR", "rpart", "tibble", "tidyr", "tidyselect", "xgboost"] + "depends": ["MASS", "MLmetrics", "ROCR", "caTools", "cli", "dlookr", "dplyr", "future", "ggmosaic", "ggplot2", "glmnet", "parallelly", "party", "purrr", "randomForest", "ranger", "rlang", "rpart", "tibble", "tidyr", "tidyselect", "xgboost"] }, "aloom": { "name": "aloom", @@ -38903,7 +39311,7 @@ "name": "alpaca", "version": "0.3.4", "sha256": "1fqw8fcahpgdkj25pd6pq4isd0yrdpiypl3q9ir79a56pvjcn8a4", - "depends": ["data_table", "Formula", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["Formula", "MASS", "Rcpp", "RcppArmadillo", "data_table"] }, "alpha_correction_bh": { "name": "alpha.correction.bh", @@ -38921,13 +39329,13 @@ "name": "alphaOutlier", "version": "1.2.0", "sha256": "09yrbv7jsiymw5gzp8p92ki70v1fys2k75x4sb9s7wy3c58wn1cd", - "depends": ["nleqslv", "quantreg", "Rsolnp"] + "depends": ["Rsolnp", "nleqslv", "quantreg"] }, "alphabetr": { "name": "alphabetr", "version": "0.2.2", "sha256": "1pmp6zwhgycb38y5jbvrbv2nza7gyjh508vy09ml483c2cysvc1r", - "depends": ["clue", "dplyr", "multicool", "Rcpp"] + "depends": ["Rcpp", "clue", "dplyr", "multicool"] }, "alphaci": { "name": "alphaci", @@ -38939,13 +39347,13 @@ "name": "alphahull", "version": "2.5", "sha256": "04l078vr3cbf1pjm05p9ny566xwsg3zj059gnssn4nwlkc24n442", - "depends": ["ggplot2", "interp", "R_utils", "sgeostat", "spatstat_geom", "spatstat_random", "splancs"] + "depends": ["R_utils", "ggplot2", "interp", "sgeostat", "spatstat_geom", "spatstat_random", "splancs"] }, "alphashape3d": { "name": "alphashape3d", "version": "1.3.2", "sha256": "15903pl63p5l3kmqskq1y4hb75wwq0sz6k88zysx65xyd83wcmh3", - "depends": ["geometry", "RANN", "rgl"] + "depends": ["RANN", "geometry", "rgl"] }, "alphastable": { "name": "alphastable", @@ -38991,9 +39399,9 @@ }, "altdoc": { "name": "altdoc", - "version": "0.3.0", - "sha256": "1d5p61ffnldprlk87mvhx81byv7p5502pahlval2g3y8g3byya4w", - "depends": ["cli", "desc", "fs", "quarto"] + "version": "0.4.0", + "sha256": "0qp2k7mmpklh484ci2p9g4n7iyjy8ibzmh9w4a2h4sabvlm6v3f0", + "depends": ["cli", "desc", "evaluate", "fs", "quarto"] }, "altfuelr": { "name": "altfuelr", @@ -39005,7 +39413,13 @@ "name": "altmeta", "version": "4.1", "sha256": "01v308389wqzp35icrp9ssb4y4gxwjzl600qw47c6rmm6s2mxzjh", - "depends": ["coda", "lme4", "Matrix", "metafor", "rjags"] + "depends": ["Matrix", "coda", "lme4", "metafor", "rjags"] + }, + "amVennDiagram5": { + "name": "amVennDiagram5", + "version": "1.0.0", + "sha256": "0f4w66pqb95bk5h0xi35lxq4535rjpbgkl6j9r3wx7rl8g6lpl7q", + "depends": ["htmlwidgets", "partitions", "venn"] }, "amanida": { "name": "amanida", @@ -39057,8 +39471,8 @@ }, "amberr": { "name": "amberr", - "version": "1.0.0", - "sha256": "1m9mjxah9kk5d7rw7xanqwyjlwp924f6vw7glbj26n2f8k27ja7g", + "version": "1.1.0", + "sha256": "0fqn79lw4zf2yip6qbn3wkcdz44zrf9awq3kjw8smhbv84dcddll", "depends": ["dplyr", "httr", "jsonlite"] }, "ambient": { @@ -39071,7 +39485,7 @@ "name": "ambit", "version": "0.1.2", "sha256": "1zjsbza5gzr0sfprfxrxrxy3f75r64bi5szk519n2wf5vr4qr7si", - "depends": ["fBasics", "Rcpp"] + "depends": ["Rcpp", "fBasics"] }, "amelie": { "name": "amelie", @@ -39089,7 +39503,7 @@ "name": "amerifluxr", "version": "1.0.0", "sha256": "099vv1axgp4jfi9ic4rqsdcv8a5dz1z0zdmdx8r8h474p3jdqm7c", - "depends": ["heatmaply", "httr", "jsonlite", "memoise", "RCurl", "readxl"] + "depends": ["RCurl", "heatmaply", "httr", "jsonlite", "memoise", "readxl"] }, "amerika": { "name": "amerika", @@ -39107,19 +39521,19 @@ "name": "ammiBayes", "version": "1.0-2", "sha256": "0mj14n882jcg7p7rldb0d7yndp1dv3vma9g7f7f0vabhwm6d1jkd", - "depends": ["bayesplot", "coda", "distfree_cr", "Hmisc", "lattice", "latticeExtra", "movMF", "msm", "spam"] + "depends": ["Hmisc", "bayesplot", "coda", "distfree_cr", "lattice", "latticeExtra", "movMF", "msm", "spam"] }, "ammistability": { "name": "ammistability", "version": "0.1.4", "sha256": "06hlbpwa0d1grs7k1vfhchrfi9zml76hkn41vnrayv35fx0sl1pz", - "depends": ["agricolae", "ggcorrplot", "ggplot2", "mathjaxr", "Rdpack", "reshape2"] + "depends": ["Rdpack", "agricolae", "ggcorrplot", "ggplot2", "mathjaxr", "reshape2"] }, "amp": { "name": "amp", "version": "1.0.0", "sha256": "11132s3bdjcldvpws7yc1w4nifvq0iaavdda2zj0wwmi4rw5xx5c", - "depends": ["dplyr", "ggplot2", "glmnet", "MASS", "rlang", "SuperLearner", "tidyr"] + "depends": ["MASS", "SuperLearner", "dplyr", "ggplot2", "glmnet", "rlang", "tidyr"] }, "ampd": { "name": "ampd", @@ -39131,7 +39545,7 @@ "name": "ampir", "version": "1.1.0", "sha256": "0nnsxrnq3m1frrjp3i8bhm67x6xnl0scyb67wxgm5x7b187svhfj", - "depends": ["caret", "kernlab", "Peptides", "Rcpp"] + "depends": ["Peptides", "Rcpp", "caret", "kernlab"] }, "amregtest": { "name": "amregtest", @@ -39139,17 +39553,23 @@ "sha256": "0c5x95iiqr0fa2ph6zily6qp542yc08vwzgrvfhclmkrn9zjcjap", "depends": ["allelematch", "digest", "remotes", "testthat", "withr"] }, + "amscorer": { + "name": "amscorer", + "version": "0.1.0", + "sha256": "15c9crj52m93122yp2fvx75vgm73lq3f3hc9jkg2f122mz6ml65x", + "depends": [] + }, "amt": { "name": "amt", "version": "0.2.2.0", "sha256": "1yx5rvc18ppk37z1m72a1j80ai4b84zc8fh5py2zipvc7phwqfsw", - "depends": ["checkmate", "circular", "ctmm", "data_table", "dplyr", "fitdistrplus", "FNN", "KernSmooth", "lubridate", "MASS", "purrr", "Rdpack", "rlang", "sf", "sfheaders", "survival", "terra", "tibble", "tidyr"] + "depends": ["FNN", "KernSmooth", "MASS", "Rdpack", "checkmate", "circular", "ctmm", "data_table", "dplyr", "fitdistrplus", "lubridate", "purrr", "rlang", "sf", "sfheaders", "survival", "terra", "tibble", "tidyr"] }, "anMC": { "name": "anMC", "version": "0.2.5", "sha256": "0xrby8qyfd3dgi64kllspvalz9yrxjdj5qd1fqjdl6qwb3h6rkga", - "depends": ["mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "mvtnorm"] }, "anabel": { "name": "anabel", @@ -39173,7 +39593,7 @@ "name": "analogue", "version": "0.17-6", "sha256": "0c5h8nnbflydv35ja1pfhyx7ifwlriwgcnrmxj5il5lvcr70y1vi", - "depends": ["brglm", "lattice", "MASS", "mgcv", "princurve", "vegan"] + "depends": ["MASS", "brglm", "lattice", "mgcv", "princurve", "vegan"] }, "analyzer": { "name": "analyzer", @@ -39205,6 +39625,12 @@ "sha256": "1p2g51w80jiadlf4asbnsw46asarzlzr5c1yfhdb31ymqxd7p76q", "depends": ["Hmisc", "weights"] }, + "angstromATE": { + "name": "angstromATE", + "version": "0.1.2", + "sha256": "0chmzliwd9ygcjvvd20vfp1immmrnhxwdc83la11l8v0ind10syl", + "depends": ["XML"] + }, "angstroms": { "name": "angstroms", "version": "0.0.1", @@ -39221,7 +39647,7 @@ "name": "aniSNA", "version": "1.1.1", "sha256": "1rvrpcw1j5xwz8ns7njvf8blal8nh6c45avy5rpzb5kifiv8yxgy", - "depends": ["dplyr", "ggplot2", "igraph", "lubridate", "magrittr", "plotrix", "Rcpp", "reshape", "rlang", "stringr"] + "depends": ["Rcpp", "dplyr", "ggplot2", "igraph", "lubridate", "magrittr", "plotrix", "reshape", "rlang", "stringr"] }, "anim_plots": { "name": "anim.plots", @@ -39233,13 +39659,13 @@ "name": "animalEKF", "version": "1.2", "sha256": "1qhmgwmg9nw8hcsd8gkvk0h8rmk82zkqjyd94a1d79cwmryxls9b", - "depends": ["bezier", "colorspace", "deldir", "ellipse", "ggplot2", "HDInterval", "MASS", "Matrix", "MCMCpack", "mvtnorm", "plyr", "png", "rlang", "sf", "shiny", "sp"] + "depends": ["HDInterval", "MASS", "MCMCpack", "Matrix", "bezier", "colorspace", "deldir", "ellipse", "ggplot2", "mvtnorm", "plyr", "png", "rlang", "sf", "shiny", "sp"] }, "animate": { "name": "animate", "version": "0.3.9.4", "sha256": "1pzgxz3xdp7c1swd5sxzlpyvvqv3shw8dxnbjwv1cr5g406p8970", - "depends": ["base64enc", "glue", "httpuv", "jsonlite", "R_utils", "R6"] + "depends": ["R6", "R_utils", "base64enc", "glue", "httpuv", "jsonlite"] }, "animation": { "name": "animation", @@ -39251,13 +39677,13 @@ "name": "animbook", "version": "1.0.0", "sha256": "0wbzpcqmr1ysk2xcwmjl1dldz7bpaqsdyq36512lipq60hzq1v81", - "depends": ["dplyr", "gganimate", "ggplot2", "plotly", "purrr", "RColorBrewer", "rlang", "tibble", "tidyr", "tidyselect"] + "depends": ["RColorBrewer", "dplyr", "gganimate", "ggplot2", "plotly", "purrr", "rlang", "tibble", "tidyr", "tidyselect"] }, "animint2": { "name": "animint2", "version": "2024.1.24", "sha256": "03zff0c7iz819js5iknx33kbfnqisfqbdji16bzd047y0s767rck", - "depends": ["data_table", "digest", "gtable", "knitr", "MASS", "plyr", "reshape2", "RJSONIO", "scales", "servr"] + "depends": ["MASS", "RJSONIO", "data_table", "digest", "gtable", "knitr", "plyr", "reshape2", "scales", "servr"] }, "animl": { "name": "animl", @@ -39269,7 +39695,7 @@ "name": "anipaths", "version": "0.10.3", "sha256": "03vhxva67b0nr75dr8ddz661jr1ha3kryibqy2nhqk851jx5vywx", - "depends": ["animation", "crawl", "dplyr", "ellipse", "ggmap", "ggplot2", "igraph", "lubridate", "magrittr", "mgcv", "mvtnorm", "RColorBrewer", "sf", "stringr", "tidyr", "tidyselect"] + "depends": ["RColorBrewer", "animation", "crawl", "dplyr", "ellipse", "ggmap", "ggplot2", "igraph", "lubridate", "magrittr", "mgcv", "mvtnorm", "sf", "stringr", "tidyr", "tidyselect"] }, "aniview": { "name": "aniview", @@ -39281,7 +39707,7 @@ "name": "anndata", "version": "0.7.5.6", "sha256": "1q1ii43wfj68qdlzhqj9msxqsfzpidhhlfrisax4p943v7yh75mi", - "depends": ["assertthat", "Matrix", "R6", "reticulate"] + "depends": ["Matrix", "R6", "assertthat", "reticulate"] }, "annmatrix": { "name": "annmatrix", @@ -39317,7 +39743,7 @@ "name": "anomaly", "version": "4.3.2", "sha256": "1w0bc5147rqsakiz3cs37xcd27i2b5ni1dva2kxv8l17ma0519v3", - "depends": ["BH", "cowplot", "dplyr", "ggplot2", "Rcpp", "Rdpack", "tidyr", "xts", "zoo"] + "depends": ["BH", "Rcpp", "Rdpack", "cowplot", "dplyr", "ggplot2", "tidyr", "xts", "zoo"] }, "anovir": { "name": "anovir", @@ -39331,30 +39757,6 @@ "sha256": "1hakvxgc50zshi5kplg90r0499mihhwvhhz7bshndjxxci1ashkl", "depends": [] }, - "antaresEditObject": { - "name": "antaresEditObject", - "version": "0.7.0", - "sha256": "1v9lhaw2cs4ggfpwi1zdlganks3xrnlsycziv0h3zi5zg45mar7v", - "depends": ["antaresRead", "assertthat", "cli", "data_table", "doFuture", "doParallel", "future", "httr", "jsonlite", "lifecycle", "memuse", "pbapply", "plyr", "progressr", "whisker", "yaml"] - }, - "antaresProcessing": { - "name": "antaresProcessing", - "version": "0.18.1", - "sha256": "1dlq850xqh9534ws88ma3vv5r79cbabn6r6a2jmicxx116s7wjrz", - "depends": ["antaresRead", "data_table"] - }, - "antaresRead": { - "name": "antaresRead", - "version": "2.7.0", - "sha256": "0rgb2glphf6f4vw1hrjxm1f2lhdsx1zag6r0bqgvmzkqipvp97zk", - "depends": ["bit64", "data_table", "doParallel", "httr", "jsonlite", "lifecycle", "lubridate", "memuse", "pbapply", "plyr", "purrr", "shiny", "stringi", "stringr"] - }, - "antaresViz": { - "name": "antaresViz", - "version": "0.18.0", - "sha256": "1lffsxv8fy3yq6rx6520rizp9f74d8bd78by5n209yr9yhw1629r", - "depends": ["antaresProcessing", "antaresRead", "assertthat", "data_table", "dygraphs", "geojsonio", "htmltools", "htmlwidgets", "leaflet", "leaflet_minicharts", "lubridate", "manipulateWidget", "plotly", "rAmCharts", "sf", "shiny", "sp", "spMaps", "webshot"] - }, "anthro": { "name": "anthro", "version": "1.0.1", @@ -39395,7 +39797,7 @@ "name": "anybadger", "version": "0.1.0", "sha256": "1aa09v5k5nlvhlir8saa5gnrq7cb1djbdc8y85cjgb3skay94hzv", - "depends": ["config", "glue", "magrittr", "purrr", "R6"] + "depends": ["R6", "config", "glue", "magrittr", "purrr"] }, "anyflights": { "name": "anyflights", @@ -39411,9 +39813,9 @@ }, "ao": { "name": "ao", - "version": "0.3.3", - "sha256": "0jh5kw7z13bx6mbsnsc5ac1mscazril7m357lc25nlb2s0nvxisd", - "depends": ["checkmate", "cli", "oeli", "optimizeR"] + "version": "1.1.0", + "sha256": "0d7c7g4s0m46qhjrbpd4cfq61z5y3s9f5k69ramn16sc4l0ybsqw", + "depends": ["R6", "checkmate", "cli", "future_apply", "oeli", "optimizeR", "progressr"] }, "aod": { "name": "aod", @@ -39449,7 +39851,7 @@ "name": "aorsf", "version": "0.1.5", "sha256": "1a69kiji309c2anp0nqdb7n77zlbsl0aibiiazjw6zflwf8fff4l", - "depends": ["collapse", "data_table", "lifecycle", "R6", "Rcpp", "RcppArmadillo"] + "depends": ["R6", "Rcpp", "RcppArmadillo", "collapse", "data_table", "lifecycle"] }, "aos": { "name": "aos", @@ -39461,13 +39863,13 @@ "name": "apa", "version": "0.3.4", "sha256": "0w4cqb9fviz6k4b9cj31sgizqmrkxjr9hjdb8ap32ylzr9dw6gy0", - "depends": ["dplyr", "magrittr", "MBESS", "purrr", "rmarkdown", "stringr", "tibble"] + "depends": ["MBESS", "dplyr", "magrittr", "purrr", "rmarkdown", "stringr", "tibble"] }, "apaTables": { "name": "apaTables", "version": "2.0.8", "sha256": "0jy6x0z9ivqqkjihqhyg3fxyghqa9gs6q2bpxzjdnbcb3kq151vd", - "depends": ["boot", "broom", "car", "dplyr", "MBESS", "tibble"] + "depends": ["MBESS", "boot", "broom", "car", "dplyr", "tibble"] }, "apaText": { "name": "apaText", @@ -39485,7 +39887,7 @@ "name": "apc", "version": "2.0.0", "sha256": "0vh6iyxm46k8sfa1xgz0y6m619snnm8s072kml5qgiiw5s7bqnpq", - "depends": ["AER", "car", "ChainLadder", "ggplot2", "ISLR", "lattice", "lmtest", "plm", "plyr", "reshape", "survey"] + "depends": ["AER", "ChainLadder", "ISLR", "car", "ggplot2", "lattice", "lmtest", "plm", "plyr", "reshape", "survey"] }, "apcf": { "name": "apcf", @@ -39509,7 +39911,7 @@ "name": "ape", "version": "5.8", "sha256": "092dx0x763r6ch6pp4c4fkmnq5alrq0527p72w1wdg71g6cp5ki4", - "depends": ["digest", "lattice", "nlme", "Rcpp"] + "depends": ["Rcpp", "digest", "lattice", "nlme"] }, "apercu": { "name": "apercu", @@ -39533,13 +39935,13 @@ "name": "aphid", "version": "1.3.5", "sha256": "1pwr1i3wxh0l24cqp59q6n59p21v81fmgxkb4jmf50a3ggb1lcdj", - "depends": ["kmer", "openssl", "Rcpp"] + "depends": ["Rcpp", "kmer", "openssl"] }, "aphylo": { "name": "aphylo", "version": "0.3-3", "sha256": "1blvj2mz1pdsypxak78pmck097ryzaz24y4flzs5k5djqxgpjwnm", - "depends": ["ape", "coda", "fmcmc", "MASS", "Matrix", "Rcpp", "xml2"] + "depends": ["MASS", "Matrix", "Rcpp", "ape", "coda", "fmcmc", "xml2"] }, "api2lm": { "name": "api2lm", @@ -39593,19 +39995,19 @@ "name": "apollo", "version": "0.3.3", "sha256": "0mlvizr7kf308y431vkdf04p64srkgd7hwbypkw68yz37r1k13za", - "depends": ["bgw", "cli", "coda", "Deriv", "matrixStats", "maxLik", "mnormt", "mvtnorm", "numDeriv", "randtoolbox", "Rcpp", "RcppArmadillo", "RcppEigen", "RSGHB", "Rsolnp", "stringr", "tibble"] + "depends": ["Deriv", "RSGHB", "Rcpp", "RcppArmadillo", "RcppEigen", "Rsolnp", "bgw", "cli", "coda", "matrixStats", "maxLik", "mnormt", "mvtnorm", "numDeriv", "randtoolbox", "stringr", "tibble"] }, "appRiori": { "name": "appRiori", "version": "0.0.5", "sha256": "1phy2v2dxk4gdzx1m2a3gghcwyb7iaj0csybpvpk3vl99difkfxd", - "depends": ["dplyr", "DT", "hypr", "markdown", "MASS", "pracma", "rhandsontable", "shiny", "shinythemes", "sortable", "stringr"] + "depends": ["DT", "MASS", "dplyr", "hypr", "markdown", "pracma", "rhandsontable", "shiny", "shinythemes", "sortable", "stringr"] }, "appeears": { "name": "appeears", "version": "1.1", "sha256": "1igrbp6mgflgxn9f63d738zzhgsdsvlgwbgidlbqy82v4i4q326p", - "depends": ["geojsonio", "getPass", "httr", "jsonlite", "keyring", "memoise", "R6", "rstudioapi", "sf"] + "depends": ["R6", "geojsonio", "getPass", "httr", "jsonlite", "keyring", "memoise", "rstudioapi", "sf"] }, "appleadsR": { "name": "appleadsR", @@ -39613,17 +40015,11 @@ "sha256": "19xkzykk6zdbswdkfix9nqnfgab4r9c21rqwpma1r6fjapsp81jf", "depends": ["jsonlite"] }, - "appler": { - "name": "appler", - "version": "0.2.1", - "sha256": "0y0nj8ac6cm1qvbzy2w93j638s0f4mj2b1b9g2rw046rrf7maiz4", - "depends": ["httr", "jsonlite", "rvest"] - }, "applicable": { "name": "applicable", "version": "0.1.1", "sha256": "0n459qg3lv088f9yjym33nqi6ahq8whdbc2f0p5m1srvzbqka3mq", - "depends": ["dplyr", "ggplot2", "glue", "hardhat", "Matrix", "proxyC", "purrr", "rlang", "tibble", "tidyr", "tidyselect"] + "depends": ["Matrix", "dplyr", "ggplot2", "glue", "hardhat", "proxyC", "purrr", "rlang", "tibble", "tidyr", "tidyselect"] }, "appnn": { "name": "appnn", @@ -39683,13 +40079,7 @@ "name": "apsimx", "version": "2.7.7", "sha256": "18q9lynfy0y7abp2zlclp75xcixd022m9hqqaqjh6z7wy9z3rxbs", - "depends": ["DBI", "jsonlite", "knitr", "RSQLite", "xml2"] - }, - "apt": { - "name": "apt", - "version": "3.0", - "sha256": "14njvpf6q34nffm3r9gqcszlabzbydsxqj0ln9nk4mv59izp8sqm", - "depends": ["car", "erer", "urca"] + "depends": ["DBI", "RSQLite", "jsonlite", "knitr", "xml2"] }, "apyramid": { "name": "apyramid", @@ -39697,10 +40087,16 @@ "sha256": "0i1wkqnf1n5x7y7i116gr7y215aibklcnhb7rm76g8wm7241y3vk", "depends": ["dplyr", "forcats", "ggplot2", "glue", "rlang", "scales", "tidyselect"] }, + "aqfig": { + "name": "aqfig", + "version": "0.9", + "sha256": "0pqg54bch6xjd1ybqciil1w52b7bi6d3q41dqafi830zvmq0hb11", + "depends": ["geoR"] + }, "aqp": { "name": "aqp", - "version": "2.0.3", - "sha256": "1rpa1zhcl5j8zl3hj8pb68vzyggdmbgnl9ss3vz3z7z57hsrngc2", + "version": "2.0.4", + "sha256": "0p43q6xvvks0f424h1rgzwx3ykpb4wrh5xd24khpkxwwigmm5jc4", "depends": ["cluster", "data_table", "farver", "lattice", "sp", "stringr"] }, "aquodom": { @@ -39737,7 +40133,7 @@ "name": "arc", "version": "1.4", "sha256": "0wlp6c2mbsa5fygc4iy0ixgqz49zzcz2mr66sapy1nm0wri1dvdr", - "depends": ["arules", "discretization", "Matrix", "R_utils"] + "depends": ["Matrix", "R_utils", "arules", "discretization"] }, "arcgeocoder": { "name": "arcgeocoder", @@ -39747,21 +40143,21 @@ }, "arcgis": { "name": "arcgis", - "version": "0.1.0", - "sha256": "0vgixd9pv312h9c2afrslrmzh2jcx4r17iki15x8i9zhhgq5dw7y", - "depends": ["arcgislayers", "arcgisutils", "cli", "httr2"] + "version": "0.1.1", + "sha256": "04k22569xsdl8bsi3r1bfwcdrjcdypm4b6sbjyf7yrglyyyqlpq3", + "depends": ["arcgisgeocode", "arcgislayers", "arcgisplaces", "arcgisutils", "cli", "httr2"] }, "arcgisgeocode": { "name": "arcgisgeocode", - "version": "0.1.0", - "sha256": "0fz4gk6yml6scycrdw1fyhvrs63hp0k8li2yjym037kb91qc8b0p", - "depends": ["arcgisutils", "cli", "curl", "httr2", "jsonify", "RcppSimdJson", "rlang", "sf"] + "version": "0.2.1", + "sha256": "0mnkp50k02p10nk4wbwyilldzwdhcfkiqv2w85spir5kip670j8m", + "depends": ["RcppSimdJson", "arcgisutils", "cli", "curl", "httr2", "jsonify", "rlang", "sf"] }, "arcgislayers": { "name": "arcgislayers", - "version": "0.2.0", - "sha256": "0micx725r6ln7i0xnrw4543qfrynvjqhg8081vi4falj2zbniz48", - "depends": ["arcgisutils", "cli", "httr2", "jsonify", "lifecycle", "RcppSimdJson", "rlang", "sf", "terra"] + "version": "0.3.0", + "sha256": "02zx66iszhw2kik0yg4djzlig6rc505igp3ginxhfcnb04blbz53", + "depends": ["RcppSimdJson", "arcgisutils", "arcpbf", "cli", "httr2", "jsonify", "lifecycle", "rlang", "sf", "terra"] }, "arcgisplaces": { "name": "arcgisplaces", @@ -39773,7 +40169,7 @@ "name": "arcgisutils", "version": "0.3.0", "sha256": "0553xmamgcaswnjyq0ayyfgvwl1kijrq0jan80m23kgydgi46hkv", - "depends": ["cli", "dbplyr", "httr2", "RcppSimdJson", "rlang", "sf"] + "depends": ["RcppSimdJson", "cli", "dbplyr", "httr2", "rlang", "sf"] }, "archdata": { "name": "archdata", @@ -39783,8 +40179,8 @@ }, "archeoViz": { "name": "archeoViz", - "version": "1.3.4", - "sha256": "12hrj059gavzydzywdn6knzyh75d5q34mi16a9jmbf2i3bm4fj5s", + "version": "1.3.5", + "sha256": "1xx6ai74ps70ljx9pcaa5qjvqayvdjw79pk200jgjcxd3ykqiwhz", "depends": ["cxhull", "ggplot2", "htmlwidgets", "knitr", "mgcv", "plotly", "reshape2", "shiny", "shinythemes", "svglite"] }, "archeofrag": { @@ -39797,7 +40193,7 @@ "name": "archetypal", "version": "1.3.1", "sha256": "1acz5fz5azhz3kq8zsxpp8k04jh2jmvlx0phcwlvvzhr0xs8lln3", - "depends": ["doParallel", "entropy", "geometry", "inflection", "lpSolve", "Matrix", "plot3D"] + "depends": ["Matrix", "doParallel", "entropy", "geometry", "inflection", "lpSolve", "plot3D"] }, "archetyper": { "name": "archetyper", @@ -39815,7 +40211,7 @@ "name": "archiDART", "version": "3.4", "sha256": "1wvjlg2rwy39czf3qqh9igk9rmk9i7pxa9yl5x9yqmsagwd1av3n", - "depends": ["geometry", "gtools", "sp", "XML"] + "depends": ["XML", "geometry", "gtools", "sp"] }, "archive": { "name": "archive", @@ -39833,7 +40229,7 @@ "name": "archivist", "version": "2.3.6", "sha256": "0q1qysack30xzxdbvvi56rk7r85hsj4ghls9r70ki7bl3rqwr4c9", - "depends": ["DBI", "digest", "flock", "httr", "lubridate", "magrittr", "RCurl", "RSQLite"] + "depends": ["DBI", "RCurl", "RSQLite", "digest", "flock", "httr", "lubridate", "magrittr"] }, "archivist_github": { "name": "archivist.github", @@ -39843,15 +40239,15 @@ }, "arcpbf": { "name": "arcpbf", - "version": "0.1.0", - "sha256": "0mmr5q5j4i9qq8m7ybgjz6m40g0qq0z24cznygrsi01kas11s8qd", - "depends": ["rlang"] + "version": "0.1.4", + "sha256": "1bbkcvi982xkjwjadfxc73rmip9hwlh3x0iyqms3pzfs1p32ansr", + "depends": ["arcgisutils", "rlang"] }, "arcpullr": { "name": "arcpullr", "version": "0.2.9", "sha256": "1kkfksv7d9firyiwsyaxg1radzvcrxi26krx63hd9p52697ajxm8", - "depends": ["dplyr", "DT", "ggplot2", "httr", "jsonlite", "raster", "rlang", "sf", "tidyr"] + "depends": ["DT", "dplyr", "ggplot2", "httr", "jsonlite", "raster", "rlang", "sf", "tidyr"] }, "arcpy": { "name": "arcpy", @@ -39917,7 +40313,7 @@ "name": "arenar", "version": "0.2.0", "sha256": "08b865v7ringqzm5m4ib4nrmlyqywir6bjj7alzmg06dy7mrl9s7", - "depends": ["auditor", "DALEX", "fairmodels", "gistr", "iBreakDown", "ingredients", "jsonlite", "plumber"] + "depends": ["DALEX", "auditor", "fairmodels", "gistr", "iBreakDown", "ingredients", "jsonlite", "plumber"] }, "arf": { "name": "arf", @@ -39935,7 +40331,7 @@ "name": "argo", "version": "3.0.2", "sha256": "17ys6v2n84fp38zkc43whfgbc8qq1qx41q14899qgglz7xv4axzn", - "depends": ["boot", "glmnet", "Matrix", "XML", "xtable", "xts", "zoo"] + "depends": ["Matrix", "XML", "boot", "glmnet", "xtable", "xts", "zoo"] }, "argoFloats": { "name": "argoFloats", @@ -39965,7 +40361,7 @@ "name": "argparse", "version": "2.2.3", "sha256": "0x16zp6jh9asyval1kwkxzavwjhx3a47xzlc593kw1hz4bhw8355", - "depends": ["findpython", "jsonlite", "R6"] + "depends": ["R6", "findpython", "jsonlite"] }, "argparser": { "name": "argparser", @@ -40005,15 +40401,15 @@ }, "arkhe": { "name": "arkhe", - "version": "1.6.0", - "sha256": "0d6di3a17zjr468prj2bpi1ls0cqg46gks10irn2qdjifwiy6r4z", + "version": "1.7.0", + "sha256": "1ray8scf2w9bgxkrkwi11iashphg4xbbgb7crbxcw7zf1pk03zi8", "depends": [] }, "arm": { "name": "arm", "version": "1.14-4", "sha256": "1g8732naydqyv5pq1fkyb1i6qddv62jdmn2ys5lbdvx2zq5cnns2", - "depends": ["abind", "coda", "lme4", "MASS", "Matrix", "nlme"] + "depends": ["MASS", "Matrix", "abind", "coda", "lme4", "nlme"] }, "armspp": { "name": "armspp", @@ -40031,7 +40427,7 @@ "name": "aroma.affymetrix", "version": "3.2.2", "sha256": "0h4w7i7hrkfvlkphxz9c0hbaxz455pzx0sb7y3zvsh9ykr3wkq8q", - "depends": ["aroma_apd", "aroma_core", "future", "listenv", "MASS", "matrixStats", "R_cache", "R_devices", "R_filesets", "R_methodsS3", "R_oo", "R_utils"] + "depends": ["MASS", "R_cache", "R_devices", "R_filesets", "R_methodsS3", "R_oo", "R_utils", "aroma_apd", "aroma_core", "future", "listenv", "matrixStats"] }, "aroma_apd": { "name": "aroma.apd", @@ -40043,13 +40439,13 @@ "name": "aroma.cn", "version": "1.7.1", "sha256": "0mfdwq4qsca80vcak56vnwgkhmjvdgj8dvpmv2a83z7ishk52kk4", - "depends": ["aroma_core", "future_apply", "matrixStats", "PSCBS", "R_cache", "R_filesets", "R_methodsS3", "R_oo", "R_utils"] + "depends": ["PSCBS", "R_cache", "R_filesets", "R_methodsS3", "R_oo", "R_utils", "aroma_core", "future_apply", "matrixStats"] }, "aroma_core": { "name": "aroma.core", "version": "3.3.1", "sha256": "0i2yh0w7hjljgsbn00vy9wyh03470f5xgqnahm7b83km16jvq9ps", - "depends": ["BiocManager", "future", "listenv", "matrixStats", "PSCBS", "R_cache", "R_devices", "R_filesets", "R_methodsS3", "R_oo", "R_rsp", "R_utils", "RColorBrewer"] + "depends": ["BiocManager", "PSCBS", "RColorBrewer", "R_cache", "R_devices", "R_filesets", "R_methodsS3", "R_oo", "R_rsp", "R_utils", "future", "listenv", "matrixStats"] }, "arpr": { "name": "arpr", @@ -40067,7 +40463,7 @@ "name": "arrangements", "version": "1.1.9", "sha256": "0nrlyxgn6667l2rb1q5rvps1anld9aq88qqr3ch2i6zchnqxrdg9", - "depends": ["gmp", "R6"] + "depends": ["R6", "gmp"] }, "arrayhelpers": { "name": "arrayhelpers", @@ -40077,9 +40473,9 @@ }, "arrow": { "name": "arrow", - "version": "16.1.0", - "sha256": "1vz7vjm8j1k1ng2za3y1qdsrzhbx2p6zy48vsas6bkdywxp5ihb6", - "depends": ["assertthat", "bit64", "cpp11", "glue", "purrr", "R6", "rlang", "tidyselect", "vctrs"] + "version": "17.0.0", + "sha256": "10nagwqbz3f04r5yl2zqjwfc9ynyi2784gp10i5fflwagp0fcgkf", + "depends": ["R6", "assertthat", "bit64", "cpp11", "glue", "purrr", "rlang", "tidyselect", "vctrs"] }, "arrowheadr": { "name": "arrowheadr", @@ -40127,13 +40523,13 @@ "name": "arules", "version": "1.7-7", "sha256": "183isw4sy5gv5fxajiy4pm5p3nfd1pffa4h8sisl2nrw2rig9na2", - "depends": ["generics", "Matrix"] + "depends": ["Matrix", "generics"] }, "arulesCBA": { "name": "arulesCBA", "version": "1.2.7", "sha256": "0d8nfqbk3y4vw5n3xnns2gy9jwj07a1zbaag9n0hmxrcs8m5ml83", - "depends": ["arules", "discretization", "glmnet", "Matrix"] + "depends": ["Matrix", "arules", "discretization", "glmnet"] }, "arulesNBMiner": { "name": "arulesNBMiner", @@ -40151,7 +40547,7 @@ "name": "arulesViz", "version": "1.5.3", "sha256": "1alma9fk92y55zrxr1a5ri2gpkn8kp2wbc3i2vqkmwj48za1a29j", - "depends": ["arules", "dplyr", "DT", "ggplot2", "ggraph", "igraph", "plotly", "scatterplot3d", "seriation", "tibble", "tidyr", "vcd", "visNetwork"] + "depends": ["DT", "arules", "dplyr", "ggplot2", "ggraph", "igraph", "plotly", "scatterplot3d", "seriation", "tibble", "tidyr", "vcd", "visNetwork"] }, "asaur": { "name": "asaur", @@ -40179,15 +40575,15 @@ }, "asciiSetupReader": { "name": "asciiSetupReader", - "version": "2.5.1", - "sha256": "1g21yycql1ik02gp37d0m5fxsn9d7sibxn5vm1ngmynx2a8a8jq7", + "version": "2.5.2", + "sha256": "116xj2d4hbvf0hgac0nqja758chgyf3ycivj0h3pmb0y75dlcbl9", "depends": ["data_table", "haven", "miniUI", "readr", "rstudioapi", "shiny", "stringr", "vroom", "zoo"] }, "asciicast": { "name": "asciicast", "version": "2.3.1", "sha256": "0gvdl2yc2fdfl2r5304c6f13qzzcgjaac7gic0pas8j7abrji1ss", - "depends": ["cli", "curl", "jsonlite", "magick", "processx", "tibble", "V8", "withr"] + "depends": ["V8", "cli", "curl", "jsonlite", "magick", "processx", "tibble", "withr"] }, "asciichartr": { "name": "asciichartr", @@ -40229,13 +40625,13 @@ "name": "ashapesampler", "version": "1.0.0", "sha256": "03x0vffik7k0cccr4m70ap4nl1zw2zp5iy3nr260dgivxlj49kxk", - "depends": ["alphahull", "alphashape3d", "doParallel", "dplyr", "foreach", "pracma", "Rvcg", "TDA", "truncnorm"] + "depends": ["Rvcg", "TDA", "alphahull", "alphashape3d", "doParallel", "dplyr", "foreach", "pracma", "truncnorm"] }, "ashr": { "name": "ashr", "version": "2.2-63", "sha256": "1japskxfdsg91jwgf5knlwy9iaq4ziqvyvlvjch1y3ygsdz9b8bz", - "depends": ["etrunct", "invgamma", "Matrix", "mixsqp", "Rcpp", "SQUAREM", "truncnorm"] + "depends": ["Matrix", "Rcpp", "SQUAREM", "etrunct", "invgamma", "mixsqp", "truncnorm"] }, "asht": { "name": "asht", @@ -40259,19 +40655,19 @@ "name": "aslib", "version": "0.1.2", "sha256": "1hy0ncanc3mb20yrby8s9hd8v2fg3x41vkj0jwl2b8znzl5n5b2n", - "depends": ["batchtools", "BBmisc", "checkmate", "corrplot", "data_table", "ggplot2", "llama", "mlr", "parallelMap", "ParamHelpers", "plyr", "reshape2", "RWeka", "stringr", "yaml"] + "depends": ["BBmisc", "ParamHelpers", "RWeka", "batchtools", "checkmate", "corrplot", "data_table", "ggplot2", "llama", "mlr", "parallelMap", "plyr", "reshape2", "stringr", "yaml"] }, "asm": { "name": "asm", "version": "0.2.0", "sha256": "0irxfkhd344jk31lwp6zgvwpgi6v72y6xbpp5q20zj8220ck4ms8", - "depends": ["fdrtool", "Iso", "MASS", "pracma", "quantreg"] + "depends": ["Iso", "MASS", "fdrtool", "pracma", "quantreg"] }, "asmbPLS": { "name": "asmbPLS", "version": "1.0.0", "sha256": "08f4128abvy9pdkbdgiqnhm2v7f79lqbzp1132h52zq2n9wzxzmy", - "depends": ["ggplot2", "ggpubr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "ggpubr"] }, "asnipe": { "name": "asnipe", @@ -40301,13 +40697,13 @@ "name": "aspline", "version": "0.2.0", "sha256": "1a68x6jvsaxviy2w361f19iqzsdsaf9kcqw5cknf4yz9fvkqhjny", - "depends": ["dplyr", "ggplot2", "magrittr", "mgcv", "Rcpp", "rlang", "splines2", "tidyr"] + "depends": ["Rcpp", "dplyr", "ggplot2", "magrittr", "mgcv", "rlang", "splines2", "tidyr"] }, "asremlPlus": { "name": "asremlPlus", - "version": "4.4.32", - "sha256": "0javb5hlg007jb30sdv48hqa2yfdjmjr8vpynm6x02npz8kn528d", - "depends": ["dae", "devtools", "doParallel", "dplyr", "foreach", "ggplot2", "nloptr", "qqplotr", "RColorBrewer", "reshape2", "rlang", "sticky", "stringr", "tryCatchLog"] + "version": "4.4.35", + "sha256": "016xxl928pdwpglmm3gg0rq4y04nlzbla46k7a6nmfsfygyz8gxv", + "depends": ["RColorBrewer", "dae", "devtools", "doParallel", "dplyr", "foreach", "ggplot2", "nloptr", "qqplotr", "reshape2", "rlang", "sticky", "stringr", "tryCatchLog"] }, "r_assert": { "name": "assert", @@ -40331,7 +40727,7 @@ "name": "assertr", "version": "3.0.1", "sha256": "0g7h88kkls6v1nfzbar40y56yv3lkqb7vrcy63xqgc99zcf8k4bc", - "depends": ["dplyr", "MASS", "rlang"] + "depends": ["MASS", "dplyr", "rlang"] }, "assertthat": { "name": "assertthat", @@ -40343,13 +40739,13 @@ "name": "assessor", "version": "1.1.0", "sha256": "1qpa2fd1ajk395x4chmarj6l50m4jaf5951qy1a79ncaa8f8g3x9", - "depends": ["MASS", "np", "tweedie", "VGAM"] + "depends": ["MASS", "VGAM", "np", "tweedie"] }, "assignPOP": { "name": "assignPOP", "version": "1.3.0", "sha256": "0p282yyszjamvzfsrjhy5c4jbfixvf4fafj6k47k2dgpx6wsdrqx", - "depends": ["caret", "doParallel", "e1071", "foreach", "ggplot2", "MASS", "randomForest", "reshape2", "rlang", "stringr", "tree"] + "depends": ["MASS", "caret", "doParallel", "e1071", "foreach", "ggplot2", "randomForest", "reshape2", "rlang", "stringr", "tree"] }, "assignR": { "name": "assignR", @@ -40379,13 +40775,13 @@ "name": "ast2ast", "version": "0.3.2", "sha256": "1vsnd7w0z0wr4185wg6k7xjd4xc8qsm08f4wfgcnyd79x56wczky", - "depends": ["dfdr", "purrr", "R6", "Rcpp", "RcppArmadillo", "rlang"] + "depends": ["R6", "Rcpp", "RcppArmadillo", "dfdr", "purrr", "rlang"] }, "asteRisk": { "name": "asteRisk", "version": "1.4.3", "sha256": "0rfbm5c2lgs921ncajsjyyxzfiqls40xlxqp2pwp7c0rxhiz2rd6", - "depends": ["deSolve", "nanotime", "onion", "Rcpp", "RcppParallel"] + "depends": ["Rcpp", "RcppParallel", "deSolve", "nanotime", "onion"] }, "aster": { "name": "aster", @@ -40409,7 +40805,7 @@ "name": "astrochron", "version": "1.3", "sha256": "1vviz16yfqnqkvrb0sb7348a7xqvqi3cfdyxhlksm08g4rr3w8ar", - "depends": ["doParallel", "fields", "foreach", "IDPmisc", "iterators", "multitaper", "palinsol", "viridisLite"] + "depends": ["IDPmisc", "doParallel", "fields", "foreach", "iterators", "multitaper", "palinsol", "viridisLite"] }, "astrodatR": { "name": "astrodatR", @@ -40465,12 +40861,6 @@ "sha256": "0g8z0nqjp4a9lxvdmzhyx1sqvdrkd9vd0b3i3qjbm4a542jf0aga", "depends": [] }, - "async": { - "name": "async", - "version": "0.3.2", - "sha256": "0xf3c6gr04drv7xxzpshycd13h5lm7r529f5q4ajrsl0m3hp9xpv", - "depends": ["iterors", "later", "nseval", "promises", "stringr", "testthat"] - }, "atRisk": { "name": "atRisk", "version": "0.1.0", @@ -40487,13 +40877,13 @@ "name": "atable", "version": "0.1.14", "sha256": "1dyg7zc19518dp3yxgyhcfklkmard9iwjkbnsl6sx5wkyk3s0vin", - "depends": ["DescTools", "doBy", "effsize", "Hmisc", "plyr", "reshape2", "settings"] + "depends": ["DescTools", "Hmisc", "doBy", "effsize", "plyr", "reshape2", "settings"] }, "atakrig": { "name": "atakrig", "version": "0.9.8.1", "sha256": "0dzqghs2358hqyklvfblil5ww9d5nmx406invlx5fgqy4k0zcyzf", - "depends": ["doSNOW", "FNN", "foreach", "gstat", "MASS", "Rcpp", "sf", "snow", "terra"] + "depends": ["FNN", "MASS", "Rcpp", "doSNOW", "foreach", "gstat", "sf", "snow", "terra"] }, "atime": { "name": "atime", @@ -40517,7 +40907,7 @@ "name": "atom4R", "version": "0.3-3", "sha256": "08n9apmliwri1vyqwfvyqi7m8b9nj7zpi1vg8gcqlg17skxndm2m", - "depends": ["httr", "jsonlite", "keyring", "R6", "rdflib", "readr", "XML", "zip"] + "depends": ["R6", "XML", "httr", "jsonlite", "keyring", "rdflib", "readr", "zip"] }, "atpolR": { "name": "atpolR", @@ -40533,8 +40923,8 @@ }, "attachment": { "name": "attachment", - "version": "0.4.1", - "sha256": "1ba5116193psx8yzfw00v4l441a5wdwsxi03wkizqccmc2j62b6g", + "version": "0.4.2", + "sha256": "1plc7mplqky5als8gzp01g55378smikxx6l42b2xyp9knxxprysg", "depends": ["cli", "desc", "glue", "knitr", "magrittr", "rmarkdown", "roxygen2", "stringr", "withr", "yaml"] }, "attempt": { @@ -40565,7 +40955,7 @@ "name": "auRoc", "version": "0.2-1", "sha256": "152jdvzigcplii5amj0mnral3g2jyy3rfsc745mx36sspw1396yx", - "depends": ["coda", "MBESS", "ProbYX", "rjags"] + "depends": ["MBESS", "ProbYX", "coda", "rjags"] }, "auctestr": { "name": "auctestr", @@ -40607,25 +40997,25 @@ "name": "audrex", "version": "2.0.1", "sha256": "1ifijkbqvdjp1si14p80mbqhq7sby8qgzr181agm3da1nkmic3vp", - "depends": ["fANCOVA", "ggplot2", "imputeTS", "lubridate", "Metrics", "modeest", "moments", "narray", "purrr", "rBayesianOptimization", "readr", "scales", "stringr", "tictoc", "xgboost"] + "depends": ["Metrics", "fANCOVA", "ggplot2", "imputeTS", "lubridate", "modeest", "moments", "narray", "purrr", "rBayesianOptimization", "readr", "scales", "stringr", "tictoc", "xgboost"] }, "audubon": { "name": "audubon", "version": "0.5.2", "sha256": "1j6v05qal9f6ci1awb5c1vdl59sdp0472kdm5azvjsibic6bi2m8", - "depends": ["dplyr", "magrittr", "Matrix", "memoise", "purrr", "readr", "rlang", "stringi", "V8"] + "depends": ["Matrix", "V8", "dplyr", "magrittr", "memoise", "purrr", "readr", "rlang", "stringi"] }, "augSIMEX": { "name": "augSIMEX", "version": "3.7.4", "sha256": "0620yxqi160ar91shl5macn890zpc60c9nqy4w8i6m7sskv6gl3z", - "depends": ["Formula", "MASS", "nleqslv", "Rcpp"] + "depends": ["Formula", "MASS", "Rcpp", "nleqslv"] }, "augmentedRCBD": { "name": "augmentedRCBD", "version": "0.1.7", "sha256": "1gnl6i81m5w7hxi147ycr963sm661xscw0xb6wm9vcr043ddvx3p", - "depends": ["cli", "dplyr", "emmeans", "flextable", "ggplot2", "mathjaxr", "moments", "multcomp", "multcompView", "numform", "officer", "openxlsx", "Rdpack", "reshape2", "stringi"] + "depends": ["Rdpack", "cli", "dplyr", "emmeans", "flextable", "ggplot2", "mathjaxr", "moments", "multcomp", "multcompView", "numform", "officer", "openxlsx", "reshape2", "stringi"] }, "auk": { "name": "auk", @@ -40635,15 +41025,15 @@ }, "aum": { "name": "aum", - "version": "2023.6.14", - "sha256": "1y6wn8ycl4vvmzyjkyprxah7q5afa56bpj8xvgmvi6dahnfp52cq", - "depends": ["data_table", "Rcpp"] + "version": "2024.6.19", + "sha256": "0ybvjp7mwwji1ybf4br7y3l20fccg6sl70wjgc5ii8qa4sgr9hq4", + "depends": ["Rcpp", "data_table"] }, "ausplotsR": { "name": "ausplotsR", "version": "2.0.5", "sha256": "0zxzxzhhdmzcvn2kvvmkgrizyx73h4wc7daysjsp54zv8krlh4x9", - "depends": ["betapart", "curl", "ggplot2", "gtools", "httr", "jose", "jsonlite", "mapdata", "plyr", "progress", "R_utils", "r2r", "stringr", "vegan"] + "depends": ["R_utils", "betapart", "curl", "ggplot2", "gtools", "httr", "jose", "jsonlite", "mapdata", "plyr", "progress", "r2r", "stringr", "vegan"] }, "auth0": { "name": "auth0", @@ -40661,7 +41051,7 @@ "name": "autoBagging", "version": "0.1.0", "sha256": "01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy", - "depends": ["abind", "caret", "cluster", "CORElearn", "e1071", "entropy", "infotheo", "lsr", "MASS", "minerva", "party", "rpart", "xgboost"] + "depends": ["CORElearn", "MASS", "abind", "caret", "cluster", "e1071", "entropy", "infotheo", "lsr", "minerva", "party", "rpart", "xgboost"] }, "autoCovariateSelection": { "name": "autoCovariateSelection", @@ -40679,37 +41069,37 @@ "name": "autoFC", "version": "0.2.0.1001", "sha256": "08q3d2gcjwg36wy7lk8bkhv9i8cayckayslx30zbkypbhabh8bqm", - "depends": ["dplyr", "glue", "irrCAC", "lavaan", "MASS", "MplusAutomation", "SimDesign", "thurstonianIRT", "tidyr"] + "depends": ["MASS", "MplusAutomation", "SimDesign", "dplyr", "glue", "irrCAC", "lavaan", "thurstonianIRT", "tidyr"] }, "autoFRK": { "name": "autoFRK", "version": "1.4.3", "sha256": "1k3h2gsck06dnvrifg9rhxi6b3fwfjrkvg0q2wzb9kdnnzgiwcln", - "depends": ["fields", "filehash", "filehashSQLite", "filematrix", "FNN", "LatticeKrig", "MASS", "mgcv", "Rcpp", "RcppEigen", "RcppParallel", "RSpectra", "spam"] + "depends": ["FNN", "LatticeKrig", "MASS", "RSpectra", "Rcpp", "RcppEigen", "RcppParallel", "fields", "filehash", "filehashSQLite", "filematrix", "mgcv", "spam"] }, "autoGO": { "name": "autoGO", "version": "0.9.1", "sha256": "19gy5gk214vqnil2wky2fpia1dlhcc4vwnws4fl2f0xq9as2nrq9", - "depends": ["ape", "ComplexHeatmap", "DESeq2", "dichromat", "dplyr", "enrichR", "ggplot2", "ggrepel", "GSVA", "imguR", "openxlsx", "purrr", "RColorBrewer", "readr", "reshape2", "stringr", "SummarizedExperiment", "textshape", "tidyr", "tidyselect"] + "depends": ["ComplexHeatmap", "DESeq2", "GSVA", "RColorBrewer", "SummarizedExperiment", "ape", "dichromat", "dplyr", "enrichR", "ggplot2", "ggrepel", "imguR", "openxlsx", "purrr", "readr", "reshape2", "stringr", "textshape", "tidyr", "tidyselect"] }, "autoMFA": { "name": "autoMFA", "version": "1.0.0", "sha256": "1sbcl38cq7y7hln1qffk5s71xgg9hs7dlwyvynqf96z2z2421pw4", - "depends": ["abind", "expm", "MASS", "Matrix", "pracma", "Rdpack", "Rfast", "usethis"] + "depends": ["MASS", "Matrix", "Rdpack", "Rfast", "abind", "expm", "pracma", "usethis"] }, "autoMrP": { "name": "autoMrP", "version": "1.0.6", "sha256": "00shy2yjkhys59nvxwd0smr5bzkfrg55xq6rcmc5z7f6c07wygci", - "depends": ["doParallel", "doRNG", "dplyr", "e1071", "EBMAforecast", "forcats", "foreach", "gbm", "ggplot2", "glmmLasso", "knitr", "lme4", "purrr", "rlang", "stringr", "tibble", "tidyr", "vglmer"] + "depends": ["EBMAforecast", "doParallel", "doRNG", "dplyr", "e1071", "forcats", "foreach", "gbm", "ggplot2", "glmmLasso", "knitr", "lme4", "purrr", "rlang", "stringr", "tibble", "tidyr", "vglmer"] }, "autoRasch": { "name": "autoRasch", "version": "0.2.2", "sha256": "15vgmpvcw7hi1i5kaqj9q126qmfa54h8ay9w6wa7yxjbginp9v7c", - "depends": ["doParallel", "foreach", "lavaan", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "lavaan"] }, "autoReg": { "name": "autoReg", @@ -40721,25 +41111,19 @@ "name": "autoScorecard", "version": "0.3.0", "sha256": "03zq23x7gha02zvmb5vwmv1pz54ghcfr0sk75krh59cgprx5ysl5", - "depends": ["corrplot", "discretization", "ggplot2", "infotheo", "ROCR", "rpart"] + "depends": ["ROCR", "corrplot", "discretization", "ggplot2", "infotheo", "rpart"] }, "autoTS": { "name": "autoTS", "version": "0.9.11", "sha256": "1mwpazynp5hdc2ccnhvddkajfcd4qam23pvjl9accq1rnxzxkiyv", - "depends": ["dplyr", "forecast", "ggplot2", "lubridate", "magrittr", "plotly", "prophet", "RcppRoll", "rlang", "shiny", "shinycssloaders", "tidyr"] - }, - "autocart": { - "name": "autocart", - "version": "1.4.5", - "sha256": "1zgcmrm4dkdnr130hwwka2nwdczgvc3jc9hxrb6nfs8ijb24gl36", - "depends": ["fields", "mgcv", "Rcpp", "RcppArmadillo", "RcppParallel"] + "depends": ["RcppRoll", "dplyr", "forecast", "ggplot2", "lubridate", "magrittr", "plotly", "prophet", "rlang", "shiny", "shinycssloaders", "tidyr"] }, "autocogs": { "name": "autocogs", "version": "0.1.4", "sha256": "0v27l9a0ysj7x9wjka1jl1bq9rmxmzldclcp1w59a6807wjlszhx", - "depends": ["broom", "checkmate", "diptest", "dplyr", "ggplot2", "hexbin", "MASS", "mclust", "moments", "progress", "tibble"] + "depends": ["MASS", "broom", "checkmate", "diptest", "dplyr", "ggplot2", "hexbin", "mclust", "moments", "progress", "tibble"] }, "autoharp": { "name": "autoharp", @@ -40751,13 +41135,13 @@ "name": "autohrf", "version": "1.1.3", "sha256": "1p65rl3bm5ka2pfjni3bil9linhvr50c99sg8d5240nj9nqdylj0", - "depends": ["cowplot", "doParallel", "dplyr", "foreach", "ggplot2", "gtools", "lubridate", "magrittr", "RColorBrewer"] + "depends": ["RColorBrewer", "cowplot", "doParallel", "dplyr", "foreach", "ggplot2", "gtools", "lubridate", "magrittr"] }, "autoimage": { "name": "autoimage", "version": "2.2.3", "sha256": "1jhkd7mbig6wpyc69iynfrj5i62lrwcwqbgjkmq8b9p5raglm1g2", - "depends": ["colorspace", "fields", "ggplot2", "mapproj", "maps", "MBA"] + "depends": ["MBA", "colorspace", "fields", "ggplot2", "mapproj", "maps"] }, "autokeras": { "name": "autokeras", @@ -40787,7 +41171,7 @@ "name": "autonewsmd", "version": "0.0.8", "sha256": "1wax4npyzkxjl1avgg6m275744nnpbv3qk8sbjg0dkqp58cb33lx", - "depends": ["data_table", "git2r", "magrittr", "quarto", "R6"] + "depends": ["R6", "data_table", "git2r", "magrittr", "quarto"] }, "autoplotly": { "name": "autoplotly", @@ -40805,7 +41189,7 @@ "name": "autostats", "version": "0.4.1", "sha256": "1283m1b5bllzfsilsjkk0sj8l1wsjpvnq1vk7r20gnd8nf6kybmn", - "depends": ["broom", "broom_mixed", "Ckmeans_1d_dp", "data_table", "dials", "dplyr", "framecleaner", "ggeasy", "ggplot2", "ggthemes", "gtools", "igraph", "janitor", "jtools", "magrittr", "nnet", "parsnip", "party", "patchwork", "presenter", "purrr", "recipes", "recosystem", "rlang", "rlist", "rsample", "stringr", "tibble", "tidyr", "tidyselect", "tune", "workflows", "xgboost", "yardstick"] + "depends": ["Ckmeans_1d_dp", "broom", "broom_mixed", "data_table", "dials", "dplyr", "framecleaner", "ggeasy", "ggplot2", "ggthemes", "gtools", "igraph", "janitor", "jtools", "magrittr", "nnet", "parsnip", "party", "patchwork", "presenter", "purrr", "recipes", "recosystem", "rlang", "rlist", "rsample", "stringr", "tibble", "tidyr", "tidyselect", "tune", "workflows", "xgboost", "yardstick"] }, "autostsm": { "name": "autostsm", @@ -40817,19 +41201,25 @@ "name": "autothresholdr", "version": "1.4.2", "sha256": "1fkny4i1fpy5fkya52cw4bzpdi236smq4qq23q1zdba3srmpyzsl", - "depends": ["checkmate", "ijtiff", "magrittr", "purrr", "Rcpp", "rlang", "strex", "stringr"] + "depends": ["Rcpp", "checkmate", "ijtiff", "magrittr", "purrr", "rlang", "strex", "stringr"] + }, + "autovi": { + "name": "autovi", + "version": "0.4.0", + "sha256": "1f0pmcqjzb4w10693khakva84dn32k01a655c5r4xf1n86vvq2jv", + "depends": ["bandicoot", "cassowaryr", "cli", "ggplot2", "reticulate", "tibble"] }, "av": { "name": "av", - "version": "0.9.0", - "sha256": "0zyp6dh4kl717w68i417byya5j43h44rql11ihi88x47c9dxbirp", + "version": "0.9.1", + "sha256": "0j2ajlkncdw181i2psmpahgmpxjkcg4ph2zp6iqb3nx5cyj441a3", "depends": [] }, "available": { "name": "available", "version": "1.1.0", "sha256": "1j6z0zwd7xjk6j6wk74fjq3nhx9gk7ys09i543gakcskmdm59dw4", - "depends": ["cli", "clisymbols", "crayon", "desc", "glue", "jsonlite", "memoise", "SnowballC", "stringdist", "tibble", "tidytext", "yesno"] + "depends": ["SnowballC", "cli", "clisymbols", "crayon", "desc", "glue", "jsonlite", "memoise", "stringdist", "tibble", "tidytext", "yesno"] }, "avar": { "name": "avar", @@ -40851,9 +41241,9 @@ }, "avidaR": { "name": "avidaR", - "version": "1.2.0", - "sha256": "12z2cs5cayj72c6nx5y086m823grcmhq5m24aaqx4qn36lb6cdbb", - "depends": ["base64enc", "circlize", "curl", "dplyr", "httr", "R6", "RColorBrewer", "readr", "tibble", "tidyr", "xml2"] + "version": "1.2.1", + "sha256": "1rm37lsmi5cyrkdpb55hr5m1pklwv5czzk4m1dzqzdvn4qp95ms7", + "depends": ["R6", "RColorBrewer", "base64enc", "circlize", "curl", "dplyr", "httr", "readr", "tibble", "tidyr", "xml2"] }, "avocado": { "name": "avocado", @@ -40863,15 +41253,15 @@ }, "avotrex": { "name": "avotrex", - "version": "1.2.0", - "sha256": "013j4av3hwxfh68myfpvxhzs2zsr470x81j90hh8bqmjs3a1wmlf", - "depends": ["ape", "doParallel", "doSNOW", "dplyr", "foreach", "phytools", "snow", "stringr", "tidytree", "TreeTools"] + "version": "1.3.0", + "sha256": "1qr9yhwrllpk0drg3s1r4f5hsx78yfys6nyj2vdk70n8na102243", + "depends": ["TreeTools", "ape", "doParallel", "doSNOW", "dplyr", "foreach", "phytools", "snow", "stringr", "tidytree"] }, "aweSOM": { "name": "aweSOM", "version": "1.3", "sha256": "0nfbn7rgazvc5nljf8i7bwpxy5j0w404bnrvi02k97jvmrra1dyb", - "depends": ["bslib", "cluster", "data_table", "DT", "e1071", "fields", "foreign", "ggplot2", "haven", "htmltools", "htmlwidgets", "kernlab", "kohonen", "rclipboard", "RColorBrewer", "readODS", "readxl", "rmarkdown", "shiny", "viridis"] + "depends": ["DT", "RColorBrewer", "bslib", "cluster", "data_table", "e1071", "fields", "foreign", "ggplot2", "haven", "htmltools", "htmlwidgets", "kernlab", "kohonen", "rclipboard", "readODS", "readxl", "rmarkdown", "shiny", "viridis"] }, "aweek": { "name": "aweek", @@ -40995,9 +41385,9 @@ }, "b64": { "name": "b64", - "version": "0.1.0", - "sha256": "1zj5zfd5dpzmzzkh2x51qpdfl1dzbimsd83fp8fsr6yh66c66xzq", - "depends": ["blob", "cli", "rlang"] + "version": "0.1.2", + "sha256": "0r4g2xikfczfhhv74jz8pp0q7rxzi789s3qqrfrq2rvi6pm9lnna", + "depends": [] }, "bRacatus": { "name": "bRacatus", @@ -41021,7 +41411,7 @@ "name": "bSims", "version": "0.3-2", "sha256": "1aflarz69rk4dlrp5gmgi6hs6mx0m8xhpp7ppv6m5gsjf8g18iaf", - "depends": ["deldir", "intrval", "MASS", "mefa4", "pbapply"] + "depends": ["MASS", "deldir", "intrval", "mefa4", "pbapply"] }, "bWGR": { "name": "bWGR", @@ -41051,7 +41441,7 @@ "name": "babelmixr2", "version": "0.1.2", "sha256": "0b6xa7hwx9h5n7z8xw4q7shwpzjf7kf9cfrsy68qvm8mhns0j9x1", - "depends": ["checkmate", "cli", "digest", "lotri", "nlmixr2", "nlmixr2est", "nonmem2rx", "qs", "Rcpp", "RcppArmadillo", "RcppEigen", "rex", "rxode2", "rxode2parse"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "checkmate", "cli", "digest", "lotri", "nlmixr2", "nlmixr2est", "nonmem2rx", "qs", "rex", "rxode2", "rxode2parse"] }, "babelwhale": { "name": "babelwhale", @@ -41059,6 +41449,12 @@ "sha256": "0m5q83ykz5w1fsjsk2vyrnv21cg4n075kbvfvw4k22c61p78shdl", "depends": ["crayon", "digest", "dplyr", "dynutils", "fs", "glue", "processx", "purrr"] }, + "babette": { + "name": "babette", + "version": "2.3.4", + "sha256": "1hir478scnfm87j2r6f48sr9sxwv2n9b6vcmwjvq58m6s0j8mzfi", + "depends": ["beastier", "beautier", "mauricer", "phangorn", "rlang", "stringr", "tracerer", "xml2"] + }, "babynames": { "name": "babynames", "version": "1.0.1", @@ -41081,13 +41477,13 @@ "name": "backShift", "version": "0.1.4.3", "sha256": "1dhmq51w07vcqlngsb04ip0wqbgqq2xdfdm1w82r082f07ywqb16", - "depends": ["clue", "ggplot2", "igraph", "MASS", "matrixcalc", "reshape2"] + "depends": ["MASS", "clue", "ggplot2", "igraph", "matrixcalc", "reshape2"] }, "backbone": { "name": "backbone", "version": "2.1.4", "sha256": "05b493cfzi85hnczl56d81sc7j5xfwybsmnc4i4q984sw0gpgvll", - "depends": ["igraph", "Matrix", "Rcpp"] + "depends": ["Matrix", "Rcpp", "igraph"] }, "backpipe": { "name": "backpipe", @@ -41123,7 +41519,7 @@ "name": "badgen", "version": "1.0.0", "sha256": "0gbafiah9bsxjq2av25003d752w5s9bh7syphl58rsr34l57qkja", - "depends": ["jsonlite", "V8"] + "depends": ["V8", "jsonlite"] }, "badger": { "name": "badger", @@ -41149,17 +41545,23 @@ "sha256": "0fcd54j6vci2yvlb609dck4pwbn54irkdk472cjc965rcw6dz9z7", "depends": ["data_table", "doSNOW", "dplyr", "foreach", "outliertree", "rlist"] }, + "baggingbwsel": { + "name": "baggingbwsel", + "version": "1.1", + "sha256": "0za7a7l4dzg0djzdrrz9axry61h8m41qkgay37ymy4lfkdwawjcx", + "depends": ["Rcpp", "doParallel", "foreach", "kedd", "mclust", "misc3d", "nor1mix", "sm"] + }, "baggr": { "name": "baggr", "version": "0.7.8", "sha256": "18faz6b8llzxsrm60bnsanplc8d7knb8cmcz34nyai7i7022061k", - "depends": ["bayesplot", "BH", "crayon", "forestplot", "ggplot2", "ggplotify", "ggrepel", "gridExtra", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "testthat"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "crayon", "forestplot", "ggplot2", "ggplotify", "ggrepel", "gridExtra", "rstan", "rstantools", "testthat"] }, "baguette": { "name": "baguette", "version": "1.0.2", "sha256": "01pxk9angq2yrw3j5c748qhcdq92axpml5lr9cpf74a8hpg6ddjb", - "depends": ["butcher", "C50", "dials", "dplyr", "furrr", "generics", "hardhat", "magrittr", "parsnip", "purrr", "rlang", "rpart", "rsample", "tibble", "tidyr", "withr"] + "depends": ["C50", "butcher", "dials", "dplyr", "furrr", "generics", "hardhat", "magrittr", "parsnip", "purrr", "rlang", "rpart", "rsample", "tibble", "tidyr", "withr"] }, "bagyo": { "name": "bagyo", @@ -41189,7 +41591,7 @@ "name": "bakR", "version": "1.0.1", "sha256": "070gv5s78381cq8pagggicxx065hab99v2vgvii996b5svs6rjic", - "depends": ["BH", "data_table", "dplyr", "ggplot2", "Hmisc", "magrittr", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "tidyr"] + "depends": ["BH", "Hmisc", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "data_table", "dplyr", "ggplot2", "magrittr", "purrr", "rstan", "rstantools", "tidyr"] }, "bakeoff": { "name": "bakeoff", @@ -41201,13 +41603,13 @@ "name": "baker", "version": "1.0.3", "sha256": "0k564q7v6pvf6w3qs5cmdbhxjjqg2kqm9yr7ckvd23wbl0gm5rdv", - "depends": ["abind", "binom", "coda", "ggplot2", "ggpubr", "gridExtra", "lubridate", "mgcv", "mvbutils", "R2jags", "reshape2", "rjags", "robCompositions", "shinydashboard", "shinyFiles"] + "depends": ["R2jags", "abind", "binom", "coda", "ggplot2", "ggpubr", "gridExtra", "lubridate", "mgcv", "mvbutils", "reshape2", "rjags", "robCompositions", "shinyFiles", "shinydashboard"] }, "baldur": { "name": "baldur", "version": "0.0.3", "sha256": "13nl5apdmb1pm32d58qq04vc2xngc35n6cv4sivf2s34yk4k0n4c", - "depends": ["BH", "dplyr", "ggplot2", "lifecycle", "magrittr", "multidplyr", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "rlang", "rstan", "rstantools", "StanHeaders", "stringr", "tibble", "tidyr", "viridisLite"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "dplyr", "ggplot2", "lifecycle", "magrittr", "multidplyr", "purrr", "rlang", "rstan", "rstantools", "stringr", "tibble", "tidyr", "viridisLite"] }, "bama": { "name": "bama", @@ -41223,21 +41625,21 @@ }, "bamdit": { "name": "bamdit", - "version": "3.4.0", - "sha256": "0x7dl2f8qg8df07g4k692501rqn3q5zf12npx9zbbbvv7zb23rlf", - "depends": ["ggExtra", "ggplot2", "gridExtra", "MASS", "R2jags", "rjags"] + "version": "3.4.1", + "sha256": "01530avwkhhvpdwr0kc50y67klqlzr6zxc2njfwy8imgy3yvg842", + "depends": ["MASS", "R2jags", "ggExtra", "ggplot2", "gridExtra", "rjags"] }, "bamlss": { "name": "bamlss", "version": "1.2-4", "sha256": "1prx8mw3n9a66s1fk616g12s0wwbxf3239256skys66csd9wzmh8", - "depends": ["coda", "colorspace", "distributions3", "Formula", "Matrix", "MBA", "mgcv", "mvtnorm", "sp", "survival"] + "depends": ["Formula", "MBA", "Matrix", "coda", "colorspace", "distributions3", "mgcv", "mvtnorm", "sp", "survival"] }, "bamm": { "name": "bamm", - "version": "0.4.3", - "sha256": "1dda2inq8afcp09qwqjfkg572glkw9rpf6c477wcrslkcnlpkc9x", - "depends": ["animation", "dplyr", "furrr", "future", "igraph", "leaflet", "magrittr", "Matrix", "purrr", "raster", "Rcpp", "RcppArmadillo", "Rdpack", "RSpectra", "sp"] + "version": "0.5.0", + "sha256": "1m48bszhqhzsjnr70pv5lmx19x13gm9nfg1idcr2jrn87xcm8mlb", + "depends": ["Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "Rdpack", "animation", "crosstalk", "dplyr", "furrr", "future", "igraph", "leaflet", "magrittr", "plotly", "purrr", "raster", "sp"] }, "bamp": { "name": "bamp", @@ -41277,8 +41679,8 @@ }, "bang": { "name": "bang", - "version": "1.0.3", - "sha256": "1zgxgpiqszgnmbqb1dd1d3na11bam56fw9qlz1kfxkr0n8pxic0w", + "version": "1.0.4", + "sha256": "0v2iwy52knvsnr2ldcdqm1z99ag047fxbch56nvs6mki6zbn1vwf", "depends": ["bayesplot", "rust"] }, "bangladesh": { @@ -41307,15 +41709,15 @@ }, "baorista": { "name": "baorista", - "version": "0.1.4", - "sha256": "1ljqkplhnfxcs0jvmg589x7j00pciqk829vg5gi4c2i69yxd7mc1", + "version": "0.2.0", + "sha256": "044p2r5wmpm8l8q1z1g3a7x15bclcbgjb2a3qvl0438div8y5llz", "depends": ["coda", "nimble"] }, "bapred": { "name": "bapred", "version": "1.1", "sha256": "1pnhq1li0c4pvgvwsaxxzsgbdyjnb96s1hciqanzgbd1d4577lvp", - "depends": ["affy", "affyPLM", "Biobase", "FNN", "fuzzyRankTests", "glmnet", "lme4", "MASS", "mnormt", "sva"] + "depends": ["Biobase", "FNN", "MASS", "affy", "affyPLM", "fuzzyRankTests", "glmnet", "lme4", "mnormt", "sva"] }, "barcode": { "name": "barcode", @@ -41345,7 +41747,7 @@ "name": "bartMachine", "version": "1.3.4.1", "sha256": "12abi19nd07lvclxpa73ba21sbrll67bbp0a8vz8wnj2ym8542iv", - "depends": ["bartMachineJARs", "missForest", "randomForest", "rJava"] + "depends": ["bartMachineJARs", "missForest", "rJava", "randomForest"] }, "bartMachineJARs": { "name": "bartMachineJARs", @@ -41355,15 +41757,15 @@ }, "bartMan": { "name": "bartMan", - "version": "0.1.0", - "sha256": "09pmkqbvgw9l95c36izdmi3h8pjx7vmzmfak2hll4q6npl5fr27x", - "depends": ["BART", "bartMachine", "cli", "colorspace", "cowplot", "dbarts", "DendSer", "dplyr", "ggiraph", "ggnewscale", "ggplot2", "ggraph", "gtable", "igraph", "patchwork", "purrr", "rJava", "rlang", "rrapply", "scales", "tibble", "tidybayes", "tidygraph", "tidyr", "tidytreatment"] + "version": "0.1.1", + "sha256": "10g9ymfjnjzykrxkws4iayzz69mi4a5vjba49js740ds6i1r3zq5", + "depends": ["BART", "DendSer", "bartMachine", "cli", "colorspace", "cowplot", "dbarts", "dplyr", "ggiraph", "ggnewscale", "ggplot2", "ggraph", "gtable", "igraph", "patchwork", "purrr", "rJava", "rlang", "rrapply", "scales", "tibble", "tidybayes", "tidygraph", "tidyr", "tidytreatment"] }, "bartcs": { "name": "bartcs", "version": "1.2.2", "sha256": "0kajw5phkymvkilwb7bf3qdc24h369yvb1zmc49kk6k7bdpbxcrr", - "depends": ["coda", "ggcharts", "ggplot2", "invgamma", "MCMCpack", "Rcpp", "rlang", "rootSolve"] + "depends": ["MCMCpack", "Rcpp", "coda", "ggcharts", "ggplot2", "invgamma", "rlang", "rootSolve"] }, "basad": { "name": "basad", @@ -41399,19 +41801,19 @@ "name": "baseballr", "version": "1.6.0", "sha256": "0qsr6di5y1a3z28rxpzk6k8b5rbnh08pdcjv65qa0fci3yx1i15y", - "depends": ["cli", "data_table", "dplyr", "ggplot2", "glue", "httr", "janitor", "jsonlite", "lubridate", "magrittr", "purrr", "Rcpp", "RcppParallel", "rlang", "rvest", "stringr", "tibble", "tidyr"] + "depends": ["Rcpp", "RcppParallel", "cli", "data_table", "dplyr", "ggplot2", "glue", "httr", "janitor", "jsonlite", "lubridate", "magrittr", "purrr", "rlang", "rvest", "stringr", "tibble", "tidyr"] }, "basecamb": { "name": "basecamb", "version": "1.1.5", "sha256": "0jxlh04f3pqxb0ihp8241z91fka4hi3d3g41ya927japps5dpvhr", - "depends": ["assertthat", "dplyr", "Hmisc", "MASS", "mice", "purrr", "sae", "survival"] + "depends": ["Hmisc", "MASS", "assertthat", "dplyr", "mice", "purrr", "sae", "survival"] }, "basedosdados": { "name": "basedosdados", "version": "0.2.2", "sha256": "18gfk7hivp68mgbgx60qbpcy28ysj4llzwdji5a57rrczwffr6p0", - "depends": ["bigrquery", "cli", "DBI", "dbplyr", "dotenv", "dplyr", "fs", "glue", "httr", "magrittr", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "typed", "writexl"] + "depends": ["DBI", "bigrquery", "cli", "dbplyr", "dotenv", "dplyr", "fs", "glue", "httr", "magrittr", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "typed", "writexl"] }, "basefun": { "name": "basefun", @@ -41423,7 +41825,7 @@ "name": "baseline", "version": "1.3-5", "sha256": "0l0llb3pi89ixkpvfg5vbvwwv3gzldf0g98rrd3vkm7q26rqmmd2", - "depends": ["limSolve", "SparseM"] + "depends": ["SparseM", "limSolve"] }, "basemaps": { "name": "basemaps", @@ -41471,31 +41873,31 @@ "name": "basictabler", "version": "1.0.2", "sha256": "0d5gpvf3la0fky786z74i8q7il1mmb2prg8y9wslg2gbngnkvkvm", - "depends": ["dplyr", "htmltools", "htmlwidgets", "R6"] + "depends": ["R6", "dplyr", "htmltools", "htmlwidgets"] }, "basifoR": { "name": "basifoR", "version": "0.4", "sha256": "1clnmb57g7aclgw8ibj92pfixaism0af85w4kn0208nbm75c1kvf", - "depends": ["curl", "foreign", "Hmisc", "httr", "measurements", "RODBC"] + "depends": ["Hmisc", "RODBC", "curl", "foreign", "httr", "measurements"] }, "basket": { "name": "basket", "version": "0.10.11", "sha256": "1kmz53v8k1wyjg33dsf05p57ym2zq3d0f373wp85bnrwx00nfr10", - "depends": ["cli", "crayon", "dplyr", "foreach", "GenSA", "ggplot2", "ggraph", "gridExtra", "igraph", "itertools", "RColorBrewer", "tibble", "tidygraph", "tidyr"] + "depends": ["GenSA", "RColorBrewer", "cli", "crayon", "dplyr", "foreach", "ggplot2", "ggraph", "gridExtra", "igraph", "itertools", "tibble", "tidygraph", "tidyr"] }, "baskexact": { "name": "baskexact", "version": "1.0.1", "sha256": "1825avqbbf8zkk9fps0i450zwl3j0armbnblndl9q954g2wzdhs4", - "depends": ["arrangements", "doFuture", "extraDistr", "foreach", "ggplot2", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "arrangements", "doFuture", "extraDistr", "foreach", "ggplot2"] }, "basksim": { "name": "basksim", "version": "1.0.0", "sha256": "1vrav84fqkilmk0ww0gjr6hldxp7fpzgca2062jvrkzbyff05bx9", - "depends": ["arrangements", "bhmbasket", "bmabasket", "doFuture", "extraDistr", "foreach", "HDInterval", "progressr"] + "depends": ["HDInterval", "arrangements", "bhmbasket", "bmabasket", "doFuture", "extraDistr", "foreach", "progressr"] }, "batata": { "name": "batata", @@ -41519,7 +41921,7 @@ "name": "batchmix", "version": "2.2.1", "sha256": "1vsr4p3a03dx3kr2clzcnyvf6xfzyisfk87famfvssjb4g58bzrv", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "salso", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "salso", "tidyr"] }, "batchscr": { "name": "batchscr", @@ -41537,7 +41939,7 @@ "name": "batchtools", "version": "0.9.17", "sha256": "1rlvfk0279saf930z48g230p9z30dd7qil9aiprjn35px1advqdn", - "depends": ["backports", "base64url", "brew", "checkmate", "data_table", "digest", "fs", "progress", "R6", "rappdirs", "stringi", "withr"] + "depends": ["R6", "backports", "base64url", "brew", "checkmate", "data_table", "digest", "fs", "progress", "rappdirs", "stringi", "withr"] }, "bate": { "name": "bate", @@ -41567,19 +41969,19 @@ "name": "bayMDS", "version": "2.0", "sha256": "1l5srpaichn598a3a9pj7pwp35jvbwb65d37l9ngvdq3rja8xm0s", - "depends": ["ggplot2", "ggpubr", "progress", "Rcpp", "RcppArmadillo", "shiny", "shinythemes"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "ggpubr", "progress", "shiny", "shinythemes"] }, "bayclumpr": { "name": "bayclumpr", "version": "0.1.0", "sha256": "17yppw6m27d1smdbwrl9mja84y3p56s4sjw4c6hklxadcf4na8im", - "depends": ["deming", "IsoplotR", "loo", "rstan"] + "depends": ["IsoplotR", "deming", "loo", "rstan"] }, "baycn": { "name": "baycn", "version": "1.2.0", "sha256": "1ykz1brs3mz94n86d5qaq25vf24j5adyzpddxqmn7qklbxxr6fh5", - "depends": ["egg", "ggplot2", "gtools", "igraph", "MASS"] + "depends": ["MASS", "egg", "ggplot2", "gtools", "igraph"] }, "bayefdr": { "name": "bayefdr", @@ -41591,13 +41993,13 @@ "name": "bayes4psy", "version": "1.2.12", "sha256": "1i6yc871bbygj6sw2v2l0diiz03n3n4mw46n905fsjkpdrx8rfhj", - "depends": ["BH", "circular", "cowplot", "dplyr", "emg", "ggplot2", "mcmcse", "metRology", "Rcpp", "RcppEigen", "RcppParallel", "reshape", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "circular", "cowplot", "dplyr", "emg", "ggplot2", "mcmcse", "metRology", "reshape", "rstan", "rstantools"] }, "bayesAB": { "name": "bayesAB", "version": "1.1.3", "sha256": "1mwwbkd8mqm22mkbgrp5mq7i52qqjr9if09fnhb3ybdpqq3sdg73", - "depends": ["ggplot2", "Rcpp", "rlang"] + "depends": ["Rcpp", "ggplot2", "rlang"] }, "bayesCT": { "name": "bayesCT", @@ -41605,11 +42007,17 @@ "sha256": "0ragig1x34syhsnbnd58l2s7g23j7fb0cl9wkasvxq8cicw5hqgn", "depends": ["bayesDP", "dplyr", "magrittr", "purrr", "survival"] }, + "bayesCureRateModel": { + "name": "bayesCureRateModel", + "version": "1.1", + "sha256": "0klmlrglkisf82q050vnf8hpgj2yfnrpag43lff8z1yiqa4hzngi", + "depends": ["HDInterval", "Rcpp", "RcppArmadillo", "VGAM", "calculus", "coda", "doParallel", "flexsurv", "foreach", "mclust"] + }, "bayesDP": { "name": "bayesDP", "version": "1.3.6", "sha256": "0li063187icw96shrbawfa00vkb42m5y38a4j2aahryajjlsva57", - "depends": ["ggplot2", "MCMCpack", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["MCMCpack", "Rcpp", "RcppArmadillo", "ggplot2", "survival"] }, "bayesDccGarch": { "name": "bayesDccGarch", @@ -41621,13 +42029,13 @@ "name": "bayesEO", "version": "0.2.1", "sha256": "0zs4qqf8881x01wblzmnw7m3zmh4ifrim3a8ws454r2lxf4y7mj5", - "depends": ["dplyr", "ggplot2", "purrr", "Rcpp", "RcppArmadillo", "stars", "terra", "tibble", "tidyr", "tmap", "yaml"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "ggplot2", "purrr", "stars", "terra", "tibble", "tidyr", "tmap", "yaml"] }, "bayesGAM": { "name": "bayesGAM", "version": "0.0.2", "sha256": "13zs68d26c66hkm8mfhcygk8rw6sdg4rf4a4az254lf2xvypbh5d", - "depends": ["bayesplot", "BH", "boot", "cluster", "corrplot", "geometry", "ggplot2", "gridExtra", "loo", "MASS", "mlbench", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "SemiPar", "StanHeaders"] + "depends": ["BH", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "SemiPar", "StanHeaders", "bayesplot", "boot", "cluster", "corrplot", "geometry", "ggplot2", "gridExtra", "loo", "mlbench", "rstan", "rstantools"] }, "bayesGARCH": { "name": "bayesGARCH", @@ -41669,13 +42077,13 @@ "name": "bayesPO", "version": "0.5.0", "sha256": "0dav6kjasb7p0ks8fwd3r8pb7q8il39rmvpbgdb80c7k49azirhd", - "depends": ["coda", "Rcpp", "RcppEigen", "RcppProgress"] + "depends": ["Rcpp", "RcppEigen", "RcppProgress", "coda"] }, "bayesPop": { "name": "bayesPop", "version": "10.0-1", "sha256": "0jzxsqnrzvhz85wravjxbjwf6panwmylqgz99b0zknvgbf0vx6zh", - "depends": ["abind", "bayesLife", "bayesTFR", "data_table", "fields", "googleVis", "MortCast", "plyr", "reshape2", "rworldmap", "wpp2012", "wpp2019"] + "depends": ["MortCast", "abind", "bayesLife", "bayesTFR", "data_table", "fields", "googleVis", "plyr", "reshape2", "rworldmap", "wpp2012", "wpp2019"] }, "bayesQR": { "name": "bayesQR", @@ -41705,25 +42113,25 @@ "name": "bayesTFR", "version": "7.4-2", "sha256": "09fbyc4656dil6mqfzx7nlxxp0b95fmc73ibci60jbbzggafb51s", - "depends": ["coda", "data_table", "lifecycle", "MASS", "mvtnorm", "wpp2019"] + "depends": ["MASS", "coda", "data_table", "lifecycle", "mvtnorm", "wpp2019"] }, "bayesWatch": { "name": "bayesWatch", "version": "0.1.3", "sha256": "04kfx68cq5cjg1ykzl8i55prnw2mvqgnmgbjav5nv2rmh9psny61", - "depends": ["BDgraph", "BH", "CholWishart", "ess", "ggplot2", "gridExtra", "Hotelling", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen"] + "depends": ["BDgraph", "BH", "CholWishart", "Hotelling", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "ess", "ggplot2", "gridExtra"] }, "bayesZIB": { "name": "bayesZIB", "version": "0.0.5", "sha256": "1265vnwmxxgahdccw81sirjb782z5pl3finf5gvmky3zgvj2p8kc", - "depends": ["BH", "ggplot2", "Rcpp", "RcppEigen", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "ggplot2", "rstan", "rstantools"] }, "bayesammi": { "name": "bayesammi", "version": "0.1.0", "sha256": "1vfcmk47x71c5akj3ppxzb74293pikspknkkv08f8p15v0chk7fs", - "depends": ["dplyr", "ggplot2", "lme4", "magrittr", "MASS", "mvtnorm", "rlang", "rstiefel", "scales", "tibble", "tidyr", "tmvtnorm"] + "depends": ["MASS", "dplyr", "ggplot2", "lme4", "magrittr", "mvtnorm", "rlang", "rstiefel", "scales", "tibble", "tidyr", "tmvtnorm"] }, "bayesanova": { "name": "bayesanova", @@ -41735,7 +42143,7 @@ "name": "bayesassurance", "version": "0.1.0", "sha256": "0y62q0340j3781f0l9azxdn6k4isj1zds6y50fg38a73pi7mbfbm", - "depends": ["dplyr", "ggplot2", "MASS", "mathjaxr", "pbapply", "plot3D", "plotly", "rlang"] + "depends": ["MASS", "dplyr", "ggplot2", "mathjaxr", "pbapply", "plot3D", "plotly", "rlang"] }, "bayesbio": { "name": "bayesbio", @@ -41753,7 +42161,7 @@ "name": "bayescopulareg", "version": "0.1.3", "sha256": "0jzj1iwd8g1kpypg6dl3anhay7kjvznfkyzri3sdf538s6vr88m5", - "depends": ["mvtnorm", "Rcpp", "RcppArmadillo", "RcppDist"] + "depends": ["Rcpp", "RcppArmadillo", "RcppDist", "mvtnorm"] }, "bayescount": { "name": "bayescount", @@ -41765,7 +42173,7 @@ "name": "bayesdfa", "version": "1.3.3", "sha256": "1xmvpkg30nk4sldzy3rp12ivnj4phzdw08hmk5nh5b70mqapvkra", - "depends": ["BH", "dplyr", "ggplot2", "loo", "mgcv", "Rcpp", "RcppEigen", "RcppParallel", "reshape2", "rlang", "rstan", "rstantools", "StanHeaders", "viridisLite"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "ggplot2", "loo", "mgcv", "reshape2", "rlang", "rstan", "rstantools", "viridisLite"] }, "bayesdistreg": { "name": "bayesdistreg", @@ -41777,7 +42185,7 @@ "name": "bayesforecast", "version": "1.0.1", "sha256": "0wnz6qblm3ib7lpj860s4lhrs4gvmyrmk779r38rybfvxw4xssii", - "depends": ["astsa", "bayesplot", "BH", "bridgesampling", "forecast", "ggplot2", "gridExtra", "loo", "lubridate", "MASS", "prophet", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "zoo"] + "depends": ["BH", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "astsa", "bayesplot", "bridgesampling", "forecast", "ggplot2", "gridExtra", "loo", "lubridate", "prophet", "rstan", "rstantools", "zoo"] }, "bayesian": { "name": "bayesian", @@ -41793,15 +42201,15 @@ }, "bayesianVARs": { "name": "bayesianVARs", - "version": "0.1.2", - "sha256": "05vx1v7znj12b1h1wks7azi2xrwhdzxjljjsshp3x5zmjm5kg169", - "depends": ["colorspace", "factorstochvol", "GIGrvg", "MASS", "mvtnorm", "Rcpp", "RcppArmadillo", "RcppProgress", "scales", "stochvol"] + "version": "0.1.3", + "sha256": "04q140gpwk8wsybg4jcqdhxln6f4gbg5pca369rfi7yp3xffrbyp", + "depends": ["GIGrvg", "MASS", "Rcpp", "RcppArmadillo", "RcppProgress", "colorspace", "factorstochvol", "mvtnorm", "scales", "stochvol"] }, "bayeslm": { "name": "bayeslm", "version": "1.0.1", "sha256": "0mnzxzdz456qxfszl8vhnvb1875hxn8b57wi6dhr9g668da2zdin", - "depends": ["coda", "Rcpp", "RcppArmadillo", "RcppParallel"] + "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "coda"] }, "bayeslongitudinal": { "name": "bayeslongitudinal", @@ -41837,7 +42245,7 @@ "name": "bayesmove", "version": "0.2.1", "sha256": "1l6i8qh7l53x0133gjc5jvri4vnnfviq9y3mcr1kfa5j84gfnmsf", - "depends": ["dplyr", "dygraphs", "furrr", "future", "ggplot2", "leaflet", "lubridate", "magrittr", "MCMCpack", "progress", "progressr", "purrr", "Rcpp", "RcppArmadillo", "rlang", "sf", "shiny", "tictoc", "tidyr"] + "depends": ["MCMCpack", "Rcpp", "RcppArmadillo", "dplyr", "dygraphs", "furrr", "future", "ggplot2", "leaflet", "lubridate", "magrittr", "progress", "progressr", "purrr", "rlang", "sf", "shiny", "tictoc", "tidyr"] }, "bayesnec": { "name": "bayesnec", @@ -41889,15 +42297,15 @@ }, "bayestestR": { "name": "bayestestR", - "version": "0.13.2", - "sha256": "15xnmjay0s9kgaj25z43cxky4qcjn3gv8yd1x548jzbxzxxma07n", + "version": "0.14.0", + "sha256": "10280l86a2wrlqjj8zh55pznvgjzpdzv6h3krxgg0ka19ch983zs", "depends": ["datawizard", "insight"] }, "bayesvl": { "name": "bayesvl", "version": "0.8.5", "sha256": "1gb2in8hjiqb3daqz6phn1639i6p2w641kxrm3zh4rm3d6hg6hzr", - "depends": ["bayesplot", "bnlearn", "coda", "dplyr", "ggplot2", "reshape2", "rstan", "StanHeaders", "viridis"] + "depends": ["StanHeaders", "bayesplot", "bnlearn", "coda", "dplyr", "ggplot2", "reshape2", "rstan", "viridis"] }, "bayfoxr": { "name": "bayfoxr", @@ -41921,12 +42329,12 @@ "name": "baystability", "version": "0.1.0", "sha256": "1zv4bf5a4p21w2qpr6lcsgsxb0xv15v8p33031rsypmnbs9i80dp", - "depends": ["dplyr", "ggfortify", "ggplot2", "lme4", "magrittr", "MASS", "matrixStats", "reshape2", "rlang", "rstiefel", "scales", "tibble", "tidyr", "tidyverse"] + "depends": ["MASS", "dplyr", "ggfortify", "ggplot2", "lme4", "magrittr", "matrixStats", "reshape2", "rlang", "rstiefel", "scales", "tibble", "tidyr", "tidyverse"] }, "baytrends": { "name": "baytrends", - "version": "2.0.11", - "sha256": "1kvp17a6q6d59lhpxs702403rp7hsl77l69vs6injrffzpz9si79", + "version": "2.0.12", + "sha256": "05gd8i6y5fvkx12v55drff0fqpkg7bs3qjcaqmmcid9sl4168ms8", "depends": ["dataRetrieval", "digest", "dplyr", "fitdistrplus", "knitr", "lubridate", "memoise", "mgcv", "pander", "plyr", "readxl", "sessioninfo", "survival"] }, "bazar": { @@ -41939,37 +42347,37 @@ "name": "bbdetection", "version": "1.0", "sha256": "1j6xcbfsrg3wcr1rpddj7ia33szn5bs0wk4mzq42d761clsr5qq8", - "depends": ["ggplot2", "Rcpp", "xtable", "zoo"] + "depends": ["Rcpp", "ggplot2", "xtable", "zoo"] }, "bbk": { "name": "bbk", - "version": "0.3.0", - "sha256": "0dhbpc051xs1mz778a56h269ykwnlgh33k4cj88c2mb2rifmw9fa", + "version": "0.4.0", + "sha256": "1dnr024app4xp7qj777vzia72jjc8ak128dcd27879cqfzixail5", "depends": ["httr2", "xml2"] }, "bbknnR": { "name": "bbknnR", "version": "1.1.1", "sha256": "0zwsk491pgfr0dxbpkw1zqa4fi4d8j1bdfiridxq6f07aypx8nmg", - "depends": ["future", "glmnet", "magrittr", "Matrix", "Rcpp", "RcppAnnoy", "reticulate", "rlang", "Rtsne", "Seurat", "SeuratObject", "tidytable", "uwot"] + "depends": ["Matrix", "Rcpp", "RcppAnnoy", "Rtsne", "Seurat", "SeuratObject", "future", "glmnet", "magrittr", "reticulate", "rlang", "tidytable", "uwot"] }, "bbl": { "name": "bbl", "version": "1.0.0", "sha256": "135i619lliy93dvgb7ymrcdh20y2b1j7s0y6awzcs3w0hbyd8j5z", - "depends": ["pROC", "RColorBrewer", "Rcpp"] + "depends": ["RColorBrewer", "Rcpp", "pROC"] }, "bbmix": { "name": "bbmix", "version": "1.0.0", "sha256": "088878222dvqmqrg5d4ny3rrpbvjw7npzrk0fmagvhj3z5dvd6la", - "depends": ["BH", "data_table", "R_utils", "Rcpp", "RcppEigen", "rmutil", "rstan", "StanHeaders"] + "depends": ["BH", "R_utils", "Rcpp", "RcppEigen", "StanHeaders", "data_table", "rmutil", "rstan"] }, "bbmle": { "name": "bbmle", "version": "1.0.25.1", "sha256": "02xnfmjr5ax5pc69jkxmygkwvb68flrf1x8pxfw0hk7y37w0qanr", - "depends": ["bdsmatrix", "lattice", "MASS", "Matrix", "mvtnorm", "numDeriv"] + "depends": ["MASS", "Matrix", "bdsmatrix", "lattice", "mvtnorm", "numDeriv"] }, "bbnet": { "name": "bbnet", @@ -41979,15 +42387,15 @@ }, "bbotk": { "name": "bbotk", - "version": "0.8.0", - "sha256": "1ggfl1lhvjnnkxib4svqd82agrvjcg1101cbf4g2c0kzgzm1jaj6", - "depends": ["checkmate", "data_table", "lgr", "mlr3misc", "paradox", "R6"] + "version": "1.0.1", + "sha256": "13kvqazlp3inxqzdm67q7hgjss8wib1hi3fbyx1zlm653zfc0sii", + "depends": ["R6", "checkmate", "data_table", "lgr", "mlr3misc", "paradox"] }, "bbreg": { "name": "bbreg", "version": "2.0.2", "sha256": "0mi2834v4cvrhvpnzkb4lgkqq993c3c1yzsxdnmny4p6yxw1q547", - "depends": ["expint", "Formula", "pbapply", "statmod"] + "depends": ["Formula", "expint", "pbapply", "statmod"] }, "bbw": { "name": "bbw", @@ -41999,13 +42407,13 @@ "name": "bc3net", "version": "1.0.4", "sha256": "15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h", - "depends": ["c3net", "igraph", "infotheo", "lattice", "Matrix"] + "depends": ["Matrix", "c3net", "igraph", "infotheo", "lattice"] }, "bcROCsurface": { "name": "bcROCsurface", "version": "1.0-6", "sha256": "0g0z4z3dw4mjp4dpa0d6bz46700jibixhlh2jj62z2l7qz5140cy", - "depends": ["boot", "nnet", "Rcpp", "RcppArmadillo", "rgl"] + "depends": ["Rcpp", "RcppArmadillo", "boot", "nnet", "rgl"] }, "bcaboot": { "name": "bcaboot", @@ -42029,13 +42437,13 @@ "name": "bcdata", "version": "0.4.1", "sha256": "05izx4bpk60icwnsy4698cm4dyxmmffss59dca8zrrh4i4pql72f", - "depends": ["cli", "crul", "DBI", "dbplyr", "dplyr", "glue", "jsonlite", "leaflet", "leaflet_extras", "purrr", "readr", "readxl", "rlang", "sf", "tibble", "tidyselect", "xml2"] + "depends": ["DBI", "cli", "crul", "dbplyr", "dplyr", "glue", "jsonlite", "leaflet", "leaflet_extras", "purrr", "readr", "readxl", "rlang", "sf", "tibble", "tidyselect", "xml2"] }, "bcf": { "name": "bcf", "version": "2.0.2", "sha256": "0a7279h7f3v23zbzqkpaxl9s2q1igfc3c5wcjpins8d7nk5hgfj4", - "depends": ["coda", "doParallel", "foreach", "Hmisc", "matrixStats", "Rcpp", "RcppArmadillo", "RcppParallel"] + "depends": ["Hmisc", "Rcpp", "RcppArmadillo", "RcppParallel", "coda", "doParallel", "foreach", "matrixStats"] }, "bcfrailph": { "name": "bcfrailph", @@ -42071,7 +42479,7 @@ "name": "bcpa", "version": "1.3.2", "sha256": "09n4grdz3vvm3744bggxv9qvnjbifh1hj31sc6s7a3189d1zhl4v", - "depends": ["plyr", "Rcpp"] + "depends": ["Rcpp", "plyr"] }, "bcputility": { "name": "bcputility", @@ -42101,7 +42509,7 @@ "name": "bdDwC", "version": "0.1.15", "sha256": "0yraq8a0wgz12rzi2dx0gdcz5rx99qd2pzw972wjqyq3rs41pwx0", - "depends": ["shiny", "shinyBS", "shinydashboard", "shinyFiles", "shinyjs"] + "depends": ["shiny", "shinyBS", "shinyFiles", "shinydashboard", "shinyjs"] }, "bda": { "name": "bda", @@ -42113,7 +42521,7 @@ "name": "bdc", "version": "1.1.4", "sha256": "1z79bsg0jz5ffl47sjgxj2bigyhbn76m0kz9sqbzkph7srcc6vpr", - "depends": ["CoordinateCleaner", "dplyr", "DT", "foreach", "fs", "ggplot2", "here", "magrittr", "purrr", "qs", "readr", "rgnparser", "rnaturalearth", "sf", "stringdist", "stringi", "stringr", "taxadb", "tibble", "tidyselect"] + "depends": ["CoordinateCleaner", "DT", "dplyr", "foreach", "fs", "ggplot2", "here", "magrittr", "purrr", "qs", "readr", "rgnparser", "rnaturalearth", "sf", "stringdist", "stringi", "stringr", "taxadb", "tibble", "tidyselect"] }, "bde": { "name": "bde", @@ -42131,13 +42539,13 @@ "name": "bdlim", "version": "0.4.2", "sha256": "04qgmanb198abrkqfv4n0fk0zib3nad14s7pz85n4ws0252vk10r", - "depends": ["BayesLogit", "dplyr", "ggplot2", "LaplacesDemon", "tidyr"] + "depends": ["BayesLogit", "LaplacesDemon", "dplyr", "ggplot2", "tidyr"] }, "bdlp": { "name": "bdlp", "version": "0.9-2", "sha256": "14fxwgcn3g6k1cdimgfp6zmsgqi4s7sh6kapnls229qiin2nijjl", - "depends": ["DBI", "GenOrd", "MASS", "MultiOrd", "rgl", "RSQLite", "stringdist"] + "depends": ["DBI", "GenOrd", "MASS", "MultiOrd", "RSQLite", "rgl", "stringdist"] }, "bdots": { "name": "bdots", @@ -42149,7 +42557,7 @@ "name": "bdpar", "version": "3.1.0", "sha256": "063b4wwc476gx1gsb028b0fr5agf1n9ciagl5h28zx7ap3jnxmph", - "depends": ["digest", "R6", "rlist"] + "depends": ["R6", "digest", "rlist"] }, "bdpv": { "name": "bdpv", @@ -42183,8 +42591,8 @@ }, "bdsvd": { "name": "bdsvd", - "version": "0.1-0", - "sha256": "0jpli8mdrjbgcvgvj2rwac49147l7h91n2mbsi89pw7m5ydimvvp", + "version": "0.2.0", + "sha256": "02fhhwlnq31yzf0m3qyk14w1f9d4xn0ygnjcwx7m28z34l18547m", "depends": ["irlba"] }, "bdvis": { @@ -42197,7 +42605,7 @@ "name": "bea.R", "version": "1.0.6", "sha256": "15pdbwz7av8862bl144n998qk0w9rqwip9m2brdm5hj7id5xdlif", - "depends": ["chron", "colorspace", "data_table", "DT", "ggplot2", "googleVis", "gtable", "htmltools", "htmlwidgets", "httpuv", "httr", "jsonlite", "magrittr", "munsell", "plyr", "Rcpp", "scales", "shiny", "shinydashboard", "stringi", "stringr", "xtable", "yaml"] + "depends": ["DT", "Rcpp", "chron", "colorspace", "data_table", "ggplot2", "googleVis", "gtable", "htmltools", "htmlwidgets", "httpuv", "httr", "jsonlite", "magrittr", "munsell", "plyr", "scales", "shiny", "shinydashboard", "stringi", "stringr", "xtable", "yaml"] }, "beadplexr": { "name": "beadplexr", @@ -42209,7 +42617,7 @@ "name": "beakr", "version": "0.4.3", "sha256": "0l6475l5d58g5ahz4b3vrdlvl656p2rasni17gz4y1l2rd0pvvh4", - "depends": ["base64enc", "httpuv", "jsonlite", "magrittr", "mime", "R6", "stringr", "webutils"] + "depends": ["R6", "base64enc", "httpuv", "jsonlite", "magrittr", "mime", "stringr", "webutils"] }, "beanplot": { "name": "beanplot", @@ -42227,7 +42635,7 @@ "name": "beanz", "version": "3.1", "sha256": "1rv4pil8hfykp35impw980riijwgrqxv9v528w1mmq1gyy25wjhl", - "depends": ["BH", "loo", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "survival"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "loo", "rstan", "rstantools", "survival"] }, "bearishTrader": { "name": "bearishTrader", @@ -42245,7 +42653,13 @@ "name": "beastier", "version": "2.5.1", "sha256": "1crdi1pmz7gf75089czvvfi31i67i6z0zak9vdppc9bwyrcj1j7f", - "depends": ["ape", "beautier", "phangorn", "rappdirs", "readr", "rJava", "rlang", "sessioninfo", "stringr", "tibble", "xml2"] + "depends": ["ape", "beautier", "phangorn", "rJava", "rappdirs", "readr", "rlang", "sessioninfo", "stringr", "tibble", "xml2"] + }, + "beastt": { + "name": "beastt", + "version": "0.0.1", + "sha256": "0xgz9xjanybnc2fi0fqc9i0zq80y87rnll62q98nk08f919h7xs1", + "depends": ["cli", "cobalt", "distributional", "dplyr", "generics", "ggdist", "ggplot2", "mixtools", "purrr", "rlang", "stringr", "tidyr"] }, "beautier": { "name": "beautier", @@ -42263,13 +42677,19 @@ "name": "bedr", "version": "1.0.7", "sha256": "0zpqvyjgwyqawxm8qrhcv8zq2b3yxgcqkkc87br29yrl7sjb8h6j", - "depends": ["data_table", "R_utils", "testthat", "VennDiagram", "yaml"] + "depends": ["R_utils", "VennDiagram", "data_table", "testthat", "yaml"] + }, + "beeca": { + "name": "beeca", + "version": "0.1.3", + "sha256": "1q20chw6l690fjpyaagl8h12dzna2kjyfq3l676s3w65sba7gyh0", + "depends": ["dplyr", "lifecycle", "sandwich"] }, "beepr": { "name": "beepr", - "version": "1.3", - "sha256": "061sfld23b516jws4llml0a4jsdk4z74rll4z58l2rvahkqsdrfp", - "depends": ["audio", "stringr"] + "version": "2.0", + "sha256": "0xq4qs06f61m1q6gb157n4c3j7pf7wanh27nr2lr228s7k4mw3k2", + "depends": ["audio"] }, "beeswarm": { "name": "beeswarm", @@ -42299,7 +42719,7 @@ "name": "behaviorchange", "version": "0.5.5", "sha256": "1nvmrl5nif10kw1risfsmvdlc4q6bkcfxpw26vwanm6ks3lamdc3", - "depends": ["BiasedUrn", "data_tree", "DiagrammeR", "DiagrammeRsvg", "ggplot2", "googlesheets4", "gridExtra", "gtable", "knitr", "rmdpartials", "ufs", "viridis", "yum"] + "depends": ["BiasedUrn", "DiagrammeR", "DiagrammeRsvg", "data_tree", "ggplot2", "googlesheets4", "gridExtra", "gtable", "knitr", "rmdpartials", "ufs", "viridis", "yum"] }, "behavr": { "name": "behavr", @@ -42321,9 +42741,9 @@ }, "bellreg": { "name": "bellreg", - "version": "0.0.2", - "sha256": "11h65f7g9amndx6z5qbws97nm4ng6bjazh29mj01qhqcfvgngvrr", - "depends": ["BH", "dplyr", "extraDistr", "Formula", "LambertW", "loo", "magic", "MASS", "numbers", "purrr", "Rcpp", "RcppEigen", "Rdpack", "rstan", "rstantools", "StanHeaders"] + "version": "0.0.2.1", + "sha256": "0576yipaj3a7j159nvp5hmlarvrkxm8pa990iasymg5s4vjfi3n7", + "depends": ["BH", "Formula", "LambertW", "MASS", "Rcpp", "RcppEigen", "Rdpack", "StanHeaders", "dplyr", "extraDistr", "loo", "magic", "numbers", "purrr", "rstan", "rstantools"] }, "bench": { "name": "bench", @@ -42341,7 +42761,7 @@ "name": "benchmarkme", "version": "1.0.8", "sha256": "0qaz8wy3n08k9lr8qljk5i8z8db18scbdc8m734aymd307h00w8x", - "depends": ["benchmarkmeData", "doParallel", "dplyr", "foreach", "httr", "Matrix", "stringr", "tibble"] + "depends": ["Matrix", "benchmarkmeData", "doParallel", "dplyr", "foreach", "httr", "stringr", "tibble"] }, "benchmarkmeData": { "name": "benchmarkmeData", @@ -42359,7 +42779,7 @@ "name": "bender", "version": "0.1.1", "sha256": "07npksrj094h884lli0fjvwjc1lhcwzlsk9wx82761mka5xajv4v", - "depends": ["httr", "jsonlite", "R6"] + "depends": ["R6", "httr", "jsonlite"] }, "benford": { "name": "benford", @@ -42377,7 +42797,7 @@ "name": "bennu", "version": "0.3.0", "sha256": "04vgpk549fr5wwg11f5979iqd40yqamdch46vwxb57wxhraphcxy", - "depends": ["BH", "dplyr", "ggplot2", "glue", "lifecycle", "magrittr", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "scales", "StanHeaders", "tidybayes", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "ggplot2", "glue", "lifecycle", "magrittr", "rlang", "rstan", "rstantools", "scales", "tidybayes", "tidyr"] }, "bentcableAR": { "name": "bentcableAR", @@ -42401,19 +42821,19 @@ "name": "bespatial", "version": "0.1.2", "sha256": "1sbgi4dcddjwgs4dzwn3zf91kx07kr5vc9dblvijgfasqhpfjv5m", - "depends": ["belg", "comat", "landscapemetrics", "Rcpp", "RcppArmadillo", "terra", "tibble"] + "depends": ["Rcpp", "RcppArmadillo", "belg", "comat", "landscapemetrics", "terra", "tibble"] }, "bestNormalize": { "name": "bestNormalize", "version": "1.9.1", "sha256": "1lryl23jvf51n7ka58ncwhjglk0zzm18wik962h403j4mph1jjly", - "depends": ["butcher", "doParallel", "doRNG", "dplyr", "foreach", "generics", "LambertW", "nortest", "purrr", "recipes", "tibble"] + "depends": ["LambertW", "butcher", "doParallel", "doRNG", "dplyr", "foreach", "generics", "nortest", "purrr", "recipes", "tibble"] }, "bestSDP": { "name": "bestSDP", "version": "0.1.2", "sha256": "1rff6jij9wmlpalzilvid8jvj2pczrchx0yrg0vhy00j64zg6jzs", - "depends": ["dplyr", "DT", "ggplot2", "readxl", "rlist", "shiny", "shinyBS", "shinydashboard", "shinyjs", "shinythemes", "shinyWidgets", "stringr", "tidyr"] + "depends": ["DT", "dplyr", "ggplot2", "readxl", "rlist", "shiny", "shinyBS", "shinyWidgets", "shinydashboard", "shinyjs", "shinythemes", "stringr", "tidyr"] }, "bestglm": { "name": "bestglm", @@ -42431,13 +42851,13 @@ "name": "bestridge", "version": "1.0.7", "sha256": "10nlk1vrzmgxfia9b3skmg5594ab5s3d64k2awyxybkz2pzz7gb1", - "depends": ["MASS", "Matrix", "pheatmap", "Rcpp", "RcppEigen", "survival"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppEigen", "pheatmap", "survival"] }, "betaBayes": { "name": "betaBayes", "version": "1.0.1", "sha256": "1a7ng6ym47scgj47frrhs76r6ipq6mhgf3ivbg2npqpg7hjcz2ci", - "depends": ["betareg", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "betareg"] }, "betaDelta": { "name": "betaDelta", @@ -42473,7 +42893,7 @@ "name": "betaclust", "version": "1.0.3", "sha256": "1w76c7yxgnc98p6lwh5mxrrgv1kk5dgjgp12g0vs25l4fb7advqp", - "depends": ["doParallel", "foreach", "ggplot2", "plotly", "pROC", "scales"] + "depends": ["doParallel", "foreach", "ggplot2", "pROC", "plotly", "scales"] }, "betafunctions": { "name": "betafunctions", @@ -42495,9 +42915,9 @@ }, "betareg": { "name": "betareg", - "version": "3.1-4", - "sha256": "00c1l5ah74vf7ljpja4iwyf9cwcvb1c835hmc98jp2x6jrh9h1ji", - "depends": ["flexmix", "Formula", "lmtest", "modeltools", "sandwich"] + "version": "3.2-0", + "sha256": "1r5k0y6lyrygbwzjf5y882rdwf1dr17cppj1vy8fiyysn6zrxd0h", + "depends": ["Formula", "flexmix", "lmtest", "modeltools", "sandwich"] }, "betategarch": { "name": "betategarch", @@ -42527,7 +42947,7 @@ "name": "beyondWhittle", "version": "1.2.1", "sha256": "0lh496w6hsdcdkn51zlnm5vw0wx1a6d60h24zqzmsl1zr4y6667z", - "depends": ["BH", "forecast", "ltsa", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "MASS", "Rcpp", "RcppArmadillo", "forecast", "ltsa"] }, "bezier": { "name": "bezier", @@ -42539,7 +42959,7 @@ "name": "bfast", "version": "1.6.1", "sha256": "1vjklk7d9b0q7j348aqvspm7rn80bh06hz66r2z1qs9436ppkx5a", - "depends": ["forecast", "Rcpp", "Rdpack", "strucchangeRcpp", "zoo"] + "depends": ["Rcpp", "Rdpack", "forecast", "strucchangeRcpp", "zoo"] }, "bfp": { "name": "bfp", @@ -42563,7 +42983,7 @@ "name": "bfw", "version": "0.4.2", "sha256": "0qgq47axa0r9653d1sjm00fvfx49v28id5sngwyrgkppcngmbg9p", - "depends": ["circlize", "coda", "data_table", "dplyr", "ggplot2", "magrittr", "MASS", "officer", "plyr", "png", "runjags", "rvg", "scales"] + "depends": ["MASS", "circlize", "coda", "data_table", "dplyr", "ggplot2", "magrittr", "officer", "plyr", "png", "runjags", "rvg", "scales"] }, "bgev": { "name": "bgev", @@ -42581,7 +43001,7 @@ "name": "bggAnalytics", "version": "0.2.1", "sha256": "0c761f04vr63zsavj3vzxxab30zn4p5zpi5gyfkqplm96brpkg3m", - "depends": ["checkmate", "data_table", "pryr", "R6", "stringr", "xml2"] + "depends": ["R6", "checkmate", "data_table", "pryr", "stringr", "xml2"] }, "bggum": { "name": "bggum", @@ -42611,13 +43031,13 @@ "name": "bgsmtr", "version": "0.7", "sha256": "17706qims9637ppwg0vszkcm6kmvhzyrdihkgigpiv5lknhk2q3m", - "depends": ["CholWishart", "coda", "EDISON", "glmnet", "inline", "LaplacesDemon", "Matrix", "matrixcalc", "miscTools", "mnormt", "mvtnorm", "Rcpp", "sparseMVN", "statmod"] + "depends": ["CholWishart", "EDISON", "LaplacesDemon", "Matrix", "Rcpp", "coda", "glmnet", "inline", "matrixcalc", "miscTools", "mnormt", "mvtnorm", "sparseMVN", "statmod"] }, "bgumbel": { "name": "bgumbel", "version": "0.0.3", "sha256": "18k8dy44x49hr4s37hjrq60c3cbw0slc9gjmd8gwcbz4slix2ydk", - "depends": ["coda", "MASS", "MCMCpack", "quantreg", "SparseM"] + "depends": ["MASS", "MCMCpack", "SparseM", "coda", "quantreg"] }, "bgw": { "name": "bgw", @@ -42629,13 +43049,13 @@ "name": "bhm", "version": "1.18", "sha256": "05gr5qmd6dzfylay60wazi0iyvj9r0xhzdk7jm7wrsrag7i43z1p", - "depends": ["coda", "ggplot2", "MASS", "survival"] + "depends": ["MASS", "coda", "ggplot2", "survival"] }, "bhmbasket": { "name": "bhmbasket", "version": "0.9.5", "sha256": "1mcgbvlnrmxlxqcjmc7ij7qn3zqfwsmbx2r2facbqrf043hmiipc", - "depends": ["doRNG", "foreach", "R2jags"] + "depends": ["R2jags", "doRNG", "foreach"] }, "bhpm": { "name": "bhpm", @@ -42647,7 +43067,7 @@ "name": "biClassify", "version": "1.3", "sha256": "14z3kmpmlvnkjwpjspajdfx5951cmck4binszzdd7nqbai5f1dwv", - "depends": ["DAAG", "expm", "fields", "MASS", "Matrix", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["DAAG", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "expm", "fields", "mvtnorm"] }, "bib2df": { "name": "bib2df", @@ -42663,9 +43083,9 @@ }, "bibliometrix": { "name": "bibliometrix", - "version": "4.2.3", - "sha256": "0amlqzc3ngh4r0gzk4y110kjl79gd4h5b4i6bid19v8q5qi3g3gm", - "depends": ["bibliometrixData", "ca", "dimensionsR", "dplyr", "DT", "forcats", "ggplot2", "ggrepel", "igraph", "Matrix", "openalexR", "openxlsx", "plotly", "pubmedR", "readr", "readxl", "rscopus", "shiny", "SnowballC", "stringdist", "stringi", "tidyr", "tidytext"] + "version": "4.3.0", + "sha256": "1cas914ach2d2r8pjybyx2lvhydlsx89y2bgkqn40vhg8d40zc5d", + "depends": ["DT", "Matrix", "SnowballC", "bibliometrixData", "ca", "dimensionsR", "dplyr", "forcats", "ggplot2", "ggrepel", "igraph", "openalexR", "openxlsx", "plotly", "pubmedR", "readr", "readxl", "rscopus", "shiny", "stringdist", "stringi", "tidyr", "tidytext"] }, "bibliometrixData": { "name": "bibliometrixData", @@ -42677,7 +43097,7 @@ "name": "biblionetwork", "version": "0.1.0", "sha256": "0nhx9bk7r5l0bvj98clnmwf53ihghf48zai4nj6pcgr2rb69fvjj", - "depends": ["data_table", "Rdpack"] + "depends": ["Rdpack", "data_table"] }, "bibliorefer": { "name": "bibliorefer", @@ -42689,7 +43109,7 @@ "name": "biblioverlap", "version": "1.0.2", "sha256": "03mpw4h7z33dnmf7ain085xnlb6wjzj8vsrlr2jhm0h6fpx9880y", - "depends": ["dplyr", "ggplot2", "ggVennDiagram", "magrittr", "Matrix", "rlang", "shiny", "stringdist", "UpSetR", "uuid"] + "depends": ["Matrix", "UpSetR", "dplyr", "ggVennDiagram", "ggplot2", "magrittr", "rlang", "shiny", "stringdist", "uuid"] }, "bibs": { "name": "bibs", @@ -42707,7 +43127,7 @@ "name": "biclust", "version": "2.0.3.1", "sha256": "11fcb6z5lzz6yl8hsa8ppr53i8yn8k4m19k55ynznhkw780184c7", - "depends": ["additivityTests", "colorspace", "flexclust", "ggplot2", "lattice", "MASS", "tidyr"] + "depends": ["MASS", "additivityTests", "colorspace", "flexclust", "ggplot2", "lattice", "tidyr"] }, "biclustermd": { "name": "biclustermd", @@ -42717,15 +43137,15 @@ }, "bidask": { "name": "bidask", - "version": "2.0.4", - "sha256": "1sdzn2src3m4w6mjn9v67qyn0g0pzmgbkwqqphnq7pwwy94qd6i3", + "version": "2.0.6", + "sha256": "1kavjvllp1vf01xj9mnngd6k1r5zx48zp5kvsv5c8qsa53l5gzxl", "depends": ["xts", "zoo"] }, "bife": { "name": "bife", "version": "0.7.2", "sha256": "0xikxniwzcv6jc64rgx39hddqchxk6c43h45algssbz2vaxvc4zg", - "depends": ["data_table", "Formula", "Rcpp", "RcppArmadillo"] + "depends": ["Formula", "Rcpp", "RcppArmadillo", "data_table"] }, "bifurcatingr": { "name": "bifurcatingr", @@ -42735,9 +43155,9 @@ }, "bigBits": { "name": "bigBits", - "version": "1.2", - "sha256": "0qrbm4d3rihy7dvc3lvailmarq1n2hs7qv6wqrgjd0pxnz62j7p7", - "depends": ["gmp", "Rmpfr"] + "version": "1.3", + "sha256": "1aajx0cg3ljjmvc50qx3v2halqksj54i2krcm7ib33cnqaxzbfbb", + "depends": ["Rmpfr", "gmp"] }, "bigD": { "name": "bigD", @@ -42749,7 +43169,7 @@ "name": "bigDM", "version": "0.5.4", "sha256": "0m1q8b4d20iqamypmalh66gkp0rba8ir2m48k5y9j05wfmshkqc4", - "depends": ["crayon", "doParallel", "fastDummies", "foreach", "future", "future_apply", "geos", "MASS", "Matrix", "RColorBrewer", "Rdpack", "rlist", "sf", "spatialreg", "spdep"] + "depends": ["MASS", "Matrix", "RColorBrewer", "Rdpack", "crayon", "doParallel", "fastDummies", "foreach", "future", "future_apply", "geos", "rlist", "sf", "spatialreg", "spdep"] }, "bigGP": { "name": "bigGP", @@ -42761,13 +43181,13 @@ "name": "bigMap", "version": "2.3.1", "sha256": "08c9s5sk672j70d6pnva7z52i4s3knkby06lva9al9n8a3jiwsvz", - "depends": ["BH", "bigmemory", "colorspace", "RColorBrewer", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "RColorBrewer", "Rcpp", "RcppArmadillo", "bigmemory", "colorspace"] }, "bigQF": { "name": "bigQF", "version": "1.6", "sha256": "01qr1cw5v330kkddmgwk4fdlm6msnqcbx1kfzw390yfwq5pr84sy", - "depends": ["CompQuadForm", "coxme", "Matrix", "svd"] + "depends": ["CompQuadForm", "Matrix", "coxme", "svd"] }, "bigReg": { "name": "bigReg", @@ -42779,19 +43199,19 @@ "name": "bigSurvSGD", "version": "0.0.1", "sha256": "08i6hwfr4rpvmxfa0vx8bi2dsa63iasj049ndwfn6zgvai6qaz0s", - "depends": ["bigmemory", "doParallel", "foreach", "Rcpp", "survival"] + "depends": ["Rcpp", "bigmemory", "doParallel", "foreach", "survival"] }, "bigalgebra": { "name": "bigalgebra", "version": "1.1.1", "sha256": "07xzgddnqxn8l41p79qqsvvg4rj03qdqlr3jhfpnra6c82wlhspw", - "depends": ["BH", "bigmemory", "Rcpp"] + "depends": ["BH", "Rcpp", "bigmemory"] }, "biganalytics": { "name": "biganalytics", "version": "1.1.22", "sha256": "0y9zr4gr31l4q2j78nqyh4svlgsd7f5x8jkhgsflfr6agia77gyh", - "depends": ["BH", "biglm", "bigmemory", "foreach", "Rcpp"] + "depends": ["BH", "Rcpp", "biglm", "bigmemory", "foreach"] }, "bigassertr": { "name": "bigassertr", @@ -42815,13 +43235,13 @@ "name": "bigergm", "version": "1.2.1", "sha256": "0x8y7aijidpka117zjc80yvjlxv8cdiwxhqzy0mw33halavm10k8", - "depends": ["cachem", "dplyr", "ergm", "ergm_multi", "foreach", "glue", "igraph", "intergraph", "magrittr", "Matrix", "memoise", "network", "purrr", "Rcpp", "RcppArmadillo", "readr", "reticulate", "rlang", "statnet_common", "stringr", "tidyr"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "cachem", "dplyr", "ergm", "ergm_multi", "foreach", "glue", "igraph", "intergraph", "magrittr", "memoise", "network", "purrr", "readr", "reticulate", "rlang", "statnet_common", "stringr", "tidyr"] }, "biglasso": { "name": "biglasso", "version": "1.6.0", "sha256": "165bc1y5byma872yld5y5nxkhyhkfn6h4gfiqv5bkfw5hn77ijlc", - "depends": ["BH", "bigmemory", "Matrix", "ncvreg", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "Matrix", "Rcpp", "RcppArmadillo", "bigmemory", "ncvreg"] }, "bigleaf": { "name": "bigleaf", @@ -42851,7 +43271,7 @@ "name": "bigmemory", "version": "4.6.4", "sha256": "0b80c2nsgphgr3cnvf75a0z3bzqx4q1a4dplq0h2izc71mn5fgzy", - "depends": ["BH", "bigmemory_sri", "Rcpp", "uuid"] + "depends": ["BH", "Rcpp", "bigmemory_sri", "uuid"] }, "bigmemory_sri": { "name": "bigmemory.sri", @@ -42869,25 +43289,25 @@ "name": "bigparallelr", "version": "0.3.2", "sha256": "14rkcig4j93c231sfm43331ykmvxjx2fiz5nhblj2rfzkxli4css", - "depends": ["bigassertr", "doParallel", "flock", "foreach", "parallelly", "RhpcBLASctl"] + "depends": ["RhpcBLASctl", "bigassertr", "doParallel", "flock", "foreach", "parallelly"] }, "bigreadr": { "name": "bigreadr", "version": "0.2.5", "sha256": "15wy5rphk2l59k8fk68a15xsvy8nxj1srnc2c86i7y5ym04a856k", - "depends": ["bigassertr", "data_table", "parallelly", "Rcpp"] + "depends": ["Rcpp", "bigassertr", "data_table", "parallelly"] }, "bigrquery": { "name": "bigrquery", "version": "1.5.1", "sha256": "0wkm9xka83skq1cnv830q4jnqvwm8rlmns2mj8n692h2y5qxlmna", - "depends": ["bit64", "brio", "cli", "clock", "cpp11", "curl", "DBI", "gargle", "httr", "jsonlite", "lifecycle", "prettyunits", "rapidjsonr", "rlang", "tibble"] + "depends": ["DBI", "bit64", "brio", "cli", "clock", "cpp11", "curl", "gargle", "httr", "jsonlite", "lifecycle", "prettyunits", "rapidjsonr", "rlang", "tibble"] }, "bigrquerystorage": { "name": "bigrquerystorage", "version": "1.1.0", "sha256": "1idhaf6i7sbrdmzzc0ks76yr47lpl63lcjprsnjzwkyc124nx606", - "depends": ["arrow", "assertthat", "bigrquery", "bit64", "DBI", "lifecycle", "Rcpp", "rlang", "tibble"] + "depends": ["DBI", "Rcpp", "arrow", "assertthat", "bigrquery", "bit64", "lifecycle", "rlang", "tibble"] }, "bigsimr": { "name": "bigsimr", @@ -42899,13 +43319,13 @@ "name": "bigsnpr", "version": "1.12.2", "sha256": "1xl7456xnid6pvvcppm4297vmgln7f4n15ziz0yfp5i5mqlmafj4", - "depends": ["bigassertr", "bigparallelr", "bigreadr", "bigsparser", "bigstatsr", "bigutilsr", "data_table", "doRNG", "foreach", "ggplot2", "magrittr", "Matrix", "Rcpp", "RcppArmadillo", "rmio", "roptim", "runonce", "vctrs"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "bigassertr", "bigparallelr", "bigreadr", "bigsparser", "bigstatsr", "bigutilsr", "data_table", "doRNG", "foreach", "ggplot2", "magrittr", "rmio", "roptim", "runonce", "vctrs"] }, "bigsparser": { "name": "bigsparser", "version": "0.7.1", "sha256": "0ppmv09n5ypm8jhsd580flk4k6p255k7az9k96fzjwjfrn0vmm74", - "depends": ["bigassertr", "Matrix", "Rcpp", "RcppEigen", "rmio"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "bigassertr", "rmio"] }, "bigsplines": { "name": "bigsplines", @@ -42917,19 +43337,19 @@ "name": "bigstatsr", "version": "1.5.12", "sha256": "1wj169j91yjlb12dzy80q7rvi102l7fhlzfvc93rxifq2w3px9x8", - "depends": ["bigassertr", "bigparallelr", "cowplot", "foreach", "ggplot2", "ps", "Rcpp", "RcppArmadillo", "rmio", "RSpectra", "tibble"] + "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "bigassertr", "bigparallelr", "cowplot", "foreach", "ggplot2", "ps", "rmio", "tibble"] }, "bigstep": { "name": "bigstep", "version": "1.1.1", "sha256": "1bppvib57p6m91c2v9w9lgb1k3jg8mk3w2kkbjvwgsdwy4m8fhap", - "depends": ["bigmemory", "magrittr", "matrixStats", "R_utils", "RcppEigen", "speedglm"] + "depends": ["R_utils", "RcppEigen", "bigmemory", "magrittr", "matrixStats", "speedglm"] }, "bigtabulate": { "name": "bigtabulate", "version": "1.1.9", "sha256": "0ws73fasmwsjbv5l63iln164ai7n3dy6wwpm8vqkpys7wl1i3xxy", - "depends": ["BH", "biganalytics", "bigmemory", "Rcpp"] + "depends": ["BH", "Rcpp", "biganalytics", "bigmemory"] }, "bigtcr": { "name": "bigtcr", @@ -42941,13 +43361,13 @@ "name": "bigtime", "version": "0.2.3", "sha256": "1lnq8zjhvnm5q90y2aak11l8a726p1w4wgjwdvdn9pzlwgm8xia5", - "depends": ["corrplot", "dplyr", "ggplot2", "magrittr", "Rcpp", "RcppArmadillo", "RcppEigen", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "corrplot", "dplyr", "ggplot2", "magrittr", "tidyr"] }, "bigutilsr": { "name": "bigutilsr", "version": "0.3.4", "sha256": "096h0v277n39bvipfbfd730lz3qkplfnv58zmzsyy3al9f7lajxl", - "depends": ["bigassertr", "bigparallelr", "nabor", "Rcpp", "robustbase", "RSpectra"] + "depends": ["RSpectra", "Rcpp", "bigassertr", "bigparallelr", "nabor", "robustbase"] }, "bikeshare14": { "name": "bikeshare14", @@ -42981,21 +43401,21 @@ }, "bimets": { "name": "bimets", - "version": "3.0.2", - "sha256": "0cnpx2c2ik9ih5hvgl91abn9xpq1xdvv2dfxsiz77dmhwk9xrpv9", + "version": "4.0.2", + "sha256": "155radkxpjqkpdyg52qck8yiffp29nk1bplalwqkvy50lz97wrai", "depends": ["xts", "zoo"] }, "binGroup": { "name": "binGroup", "version": "2.2-1", "sha256": "0cb7j6b0s3y56mv1967awwri0kv0rf3sr3vwf9gc2zbjggxi9ffp", - "depends": ["partitions", "Rdpack"] + "depends": ["Rdpack", "partitions"] }, "binGroup2": { "name": "binGroup2", "version": "1.3.1", "sha256": "000a8vci2sfxgbw412i0wajmnwgpx54zalcv4xhvyckh69i1z1db", - "depends": ["ggplot2", "partitions", "rBeta2009", "Rcpp", "RcppArmadillo", "Rdpack", "scales"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "ggplot2", "partitions", "rBeta2009", "scales"] }, "binMto": { "name": "binMto", @@ -43013,19 +43433,19 @@ "name": "binaryGP", "version": "0.2", "sha256": "0i4xi0gxk0lamjdygyx0azdp3kfqmva1g20nl3p65w4yx77m88d6", - "depends": ["GPfit", "lhs", "logitnorm", "nloptr", "Rcpp", "RcppArmadillo"] + "depends": ["GPfit", "Rcpp", "RcppArmadillo", "lhs", "logitnorm", "nloptr"] }, "binaryMM": { "name": "binaryMM", "version": "0.1.1", "sha256": "0vjs3in8rih5iinlfcrilpqwqjxkdf01h6giv993zy8l3s28r9yd", - "depends": ["fastGHQuad", "MASS", "Rcpp"] + "depends": ["MASS", "Rcpp", "fastGHQuad"] }, "binb": { "name": "binb", - "version": "0.0.6", - "sha256": "0j9iyawkn1mqvf52q1abp0k00r5239rkvvmvl3cmp4jlffxd4xd7", - "depends": ["knitr", "rmarkdown"] + "version": "0.0.7", + "sha256": "18f4l7fa3b0h1r91xy9nvplllgnsx3r765qibbbz1rz5zq6cnjpg", + "depends": ["codetools", "knitr", "rmarkdown"] }, "binda": { "name": "binda", @@ -43049,7 +43469,7 @@ "name": "bindrcpp", "version": "0.2.3", "sha256": "1yn9is89r76ay314s216whr0igych4r78kjz85amhwgfb9wawbb6", - "depends": ["bindr", "plogr", "Rcpp"] + "depends": ["Rcpp", "bindr", "plogr"] }, "binequality": { "name": "binequality", @@ -43085,7 +43505,7 @@ "name": "binhf", "version": "1.0-3", "sha256": "1vdw2s8zddp7gad8l3c4jpmnjcc0f5wpqbrp6gp9lgp1c3qa505y", - "depends": ["adlift", "EbayesThresh", "wavethresh"] + "depends": ["EbayesThresh", "adlift", "wavethresh"] }, "binman": { "name": "binman", @@ -43139,7 +43559,7 @@ "name": "binsegRcpp", "version": "2023.8.31", "sha256": "1rx8rxgzjf4bjbx6gpf70pnma05g51lg6l1z0kdswj8m3pmqnk93", - "depends": ["data_table", "Rcpp"] + "depends": ["Rcpp", "data_table"] }, "binseqtest": { "name": "binseqtest", @@ -43157,12 +43577,12 @@ "name": "binspp", "version": "0.1.26", "sha256": "0ah002lvimniwmwgn2syw9saxgzpdhs5vins0f3kb98p5k3gdxqk", - "depends": ["cluster", "mvtnorm", "Rcpp", "RcppArmadillo", "RcppEigen", "spatstat", "spatstat_geom", "spatstat_model", "spatstat_random", "VGAM"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "VGAM", "cluster", "mvtnorm", "spatstat", "spatstat_geom", "spatstat_model", "spatstat_random"] }, "binsreg": { "name": "binsreg", - "version": "1.0", - "sha256": "1lsfh45psa85vxr8ll2297syjszfasgay946n7pzfw1nizfc29b9", + "version": "1.1", + "sha256": "04afp5sixn51kf519sgrra50knmkz1a1gsz28xbdjph9vx5bv6jl", "depends": ["ggplot2", "matrixStats", "quantreg", "sandwich"] }, "binst": { @@ -43197,9 +43617,9 @@ }, "bioRad": { "name": "bioRad", - "version": "0.7.3", - "sha256": "0gschmraqc76yiqdn48cg1qnd0p7b6x7h2gr54a84pb4ivbn6vyy", - "depends": ["assertthat", "curl", "dplyr", "fields", "frictionless", "ggplot2", "glue", "jsonlite", "lubridate", "lutz", "raster", "readr", "rhdf5", "rlang", "sp", "suntools", "tidyr", "viridis", "viridisLite"] + "version": "0.8.1", + "sha256": "1c7wl1wk1lh31dr7a7lwbjib4v1mfvvyi8iwfc9svj07y4wpzj58", + "depends": ["assertthat", "curl", "dplyr", "fields", "ggplot2", "glue", "jsonlite", "lubridate", "lutz", "raster", "readr", "rhdf5", "rlang", "sf", "sp", "stringr", "suntools", "tidyr", "tidyselect", "viridis", "viridisLite"] }, "bioSNR": { "name": "bioSNR", @@ -43211,7 +43631,7 @@ "name": "bioacoustics", "version": "0.2.8", "sha256": "08qhxx7xgswjamrgg82pkg1f7w50dx9ln67d50n1p3rvrxab4061", - "depends": ["htmltools", "moments", "Rcpp", "stringr", "tuneR"] + "depends": ["Rcpp", "htmltools", "moments", "stringr", "tuneR"] }, "biobricks": { "name": "biobricks", @@ -43235,7 +43655,7 @@ "name": "biodosetools", "version": "3.6.1", "sha256": "013nqdqrv5h3swzqss2kazsp06wrs57zri3aaidy92wrd6v24bsh", - "depends": ["bsplus", "cli", "config", "dplyr", "ggplot2", "golem", "magrittr", "MASS", "maxLik", "mixtools", "msm", "rhandsontable", "rlang", "rmarkdown", "shiny", "shinydashboard", "shinyWidgets", "tidyr"] + "depends": ["MASS", "bsplus", "cli", "config", "dplyr", "ggplot2", "golem", "magrittr", "maxLik", "mixtools", "msm", "rhandsontable", "rlang", "rmarkdown", "shiny", "shinyWidgets", "shinydashboard", "tidyr"] }, "biogas": { "name": "biogas", @@ -43259,7 +43679,7 @@ "name": "biogrowth", "version": "1.0.4", "sha256": "19czyp7n4ip01psl8hbiihfhj52vdp6nsq0h7cnl7p9h0ax9wcj5", - "depends": ["cowplot", "deSolve", "dplyr", "FME", "formula_tools", "ggplot2", "lamW", "lifecycle", "MASS", "purrr", "rlang", "tibble", "tidyr"] + "depends": ["FME", "MASS", "cowplot", "deSolve", "dplyr", "formula_tools", "ggplot2", "lamW", "lifecycle", "purrr", "rlang", "tibble", "tidyr"] }, "bioimagetools": { "name": "bioimagetools", @@ -43271,13 +43691,13 @@ "name": "bioinactivation", "version": "1.2.3", "sha256": "0gz1bbakf6b23jsbvrr8314yxajxcr1akm5srgm883lrf1p5ax13", - "depends": ["deSolve", "dplyr", "FME", "ggplot2", "lazyeval", "MASS", "purrr", "rlang"] + "depends": ["FME", "MASS", "deSolve", "dplyr", "ggplot2", "lazyeval", "purrr", "rlang"] }, "biolink": { "name": "biolink", "version": "0.1.8", "sha256": "03jsvzy6fqbx3w6gs7v1mnznkqwsad3ywdb4wxp0mbaq4vrsandm", - "depends": ["DBI", "glue", "memoise", "rentrez", "RMySQL", "xml2"] + "depends": ["DBI", "RMySQL", "glue", "memoise", "rentrez", "xml2"] }, "biologicalActivityIndices": { "name": "biologicalActivityIndices", @@ -43289,7 +43709,7 @@ "name": "biomartr", "version": "1.0.7", "sha256": "0ic6qbk2xmgrcc0xhxyhjafp1xbf2c5dpbqqrbkprrhynr8mq7cx", - "depends": ["biomaRt", "Biostrings", "curl", "data_table", "downloader", "dplyr", "fs", "httr", "jsonlite", "philentropy", "purrr", "R_utils", "RCurl", "readr", "stringr", "tibble", "withr", "XML"] + "depends": ["Biostrings", "RCurl", "R_utils", "XML", "biomaRt", "curl", "data_table", "downloader", "dplyr", "fs", "httr", "jsonlite", "philentropy", "purrr", "readr", "stringr", "tibble", "withr"] }, "biometryassist": { "name": "biometryassist", @@ -43301,7 +43721,7 @@ "name": "biomod2", "version": "4.2-5-2", "sha256": "1rdlkspi0hkgnrc4qs7vgbmcpsf74nzdq8w0akg59bynp0ks8k0w", - "depends": ["abind", "dplyr", "foreach", "gbm", "ggplot2", "MASS", "PresenceAbsence", "pROC", "reshape", "reshape2", "rpart", "sp", "terra"] + "depends": ["MASS", "PresenceAbsence", "abind", "dplyr", "foreach", "gbm", "ggplot2", "pROC", "reshape", "reshape2", "rpart", "sp", "terra"] }, "bionetdata": { "name": "bionetdata", @@ -43311,15 +43731,15 @@ }, "biopixR": { "name": "biopixR", - "version": "1.0.0", - "sha256": "1ab5sqik4pnkq4f3dhf27z5c74jqrj8r95pwz2rdhaagm5ac8iyy", + "version": "1.1.0", + "sha256": "0avdpg73s9hqkyfgrfmprhcc5hpxf4in6s3221n5gf3pcii8jw0c", "depends": ["cluster", "data_table", "imager", "magick"] }, "bioregion": { "name": "bioregion", "version": "1.1.1", "sha256": "03qjyaw1kiqn9q4wc49rzy6vp83pf5567y07ih4rgp1r3pamnif0", - "depends": ["ape", "bipartite", "cluster", "data_table", "dbscan", "dynamicTreeCut", "fastcluster", "fastkmedoids", "ggplot2", "igraph", "mathjaxr", "Matrix", "Rcpp", "Rdpack", "rlang", "rmarkdown", "segmented", "sf", "tidyr"] + "depends": ["Matrix", "Rcpp", "Rdpack", "ape", "bipartite", "cluster", "data_table", "dbscan", "dynamicTreeCut", "fastcluster", "fastkmedoids", "ggplot2", "igraph", "mathjaxr", "rlang", "rmarkdown", "segmented", "sf", "tidyr"] }, "bios2mds": { "name": "bios2mds", @@ -43337,7 +43757,7 @@ "name": "biosensors.usc", "version": "1.0", "sha256": "076isyk7dfjpi5db7ghk0hmz2kkdgmrnj3g9ffdnim5gxq3zsf1h", - "depends": ["energy", "fda_usc", "osqp", "parallelDist", "Rcpp", "RcppArmadillo", "truncnorm"] + "depends": ["Rcpp", "RcppArmadillo", "energy", "fda_usc", "osqp", "parallelDist", "truncnorm"] }, "bioseq": { "name": "bioseq", @@ -43355,7 +43775,7 @@ "name": "biospear", "version": "1.0.2", "sha256": "10y4hbncwiqpxzqvzjrmfgp804zczdgvwpjcj0dzaa0sx1njdzja", - "depends": ["cobs", "corpcor", "devtools", "glmnet", "grplasso", "MASS", "Matrix", "mboost", "pkgconfig", "plsRcox", "pROC", "PRROC", "RCurl", "survAUC", "survival"] + "depends": ["MASS", "Matrix", "PRROC", "RCurl", "cobs", "corpcor", "devtools", "glmnet", "grplasso", "mboost", "pROC", "pkgconfig", "plsRcox", "survAUC", "survival"] }, "biostat3": { "name": "biostat3", @@ -43373,19 +43793,19 @@ "name": "biotools", "version": "4.2", "sha256": "1dyy9mk2afjbc8g1qygy6h1aksbhndm53c4sb5mfzriydl03ibxv", - "depends": ["boot", "MASS"] + "depends": ["MASS", "boot"] }, "bipartite": { "name": "bipartite", "version": "2.20", "sha256": "0wgx695r5knlrzg0wv5h2sivh3xzjsb50lafmb08j1fvg3hnrxl6", - "depends": ["fields", "igraph", "MASS", "permute", "sna", "vegan"] + "depends": ["MASS", "fields", "igraph", "permute", "sna", "vegan"] }, "bipartiteD3": { "name": "bipartiteD3", "version": "0.3.1", "sha256": "0w2bnlaga8nxdidrhgz34hqbxb5882jbz31a7g4n283gbz5w1b9g", - "depends": ["downloader", "dplyr", "purrr", "r2d3", "RColorBrewer", "stringr", "tibble", "tidyr"] + "depends": ["RColorBrewer", "downloader", "dplyr", "purrr", "r2d3", "stringr", "tibble", "tidyr"] }, "bipd": { "name": "bipd", @@ -43401,27 +43821,27 @@ }, "biplotEZ": { "name": "biplotEZ", - "version": "1.2.0", - "sha256": "0fhafa00x1vj8lvhjm10daw8an62jsycsiq31skm547ig09fccym", - "depends": ["ggplot2", "ggrepel", "withr"] + "version": "2.0", + "sha256": "0wdsxipgfjdfa09zilqzzhpa36wg48z4alf3p7a8vgg9458igblb", + "depends": ["plotrix", "withr"] }, "biplotbootGUI": { "name": "biplotbootGUI", "version": "1.3", "sha256": "1z2mlfya6c4lh970p6hpf8sqhxz7wjl16d1lx2djv4cr8sj7nhdh", - "depends": ["cluster", "dendroextras", "MASS", "matlib", "rgl", "shapes", "tcltk2", "tkrplot"] + "depends": ["MASS", "cluster", "dendroextras", "matlib", "rgl", "shapes", "tcltk2", "tkrplot"] }, "birankr": { "name": "birankr", "version": "1.0.1", "sha256": "1azgrzgw5bnfac8p287ir5zl6kxc6jij20p6cfc3lbbl03f8sa1k", - "depends": ["data_table", "Matrix"] + "depends": ["Matrix", "data_table"] }, "birdie": { "name": "birdie", "version": "0.6.1", "sha256": "1xh3ga5f16p46jrw7xj2mwv41mnib0mijin2005q9wrfr5pr54yc", - "depends": ["BH", "cli", "dplyr", "generics", "Rcpp", "RcppEigen", "RcppParallel", "RcppThread", "rlang", "SQUAREM", "StanHeaders", "stringi", "stringr", "vctrs"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "RcppThread", "SQUAREM", "StanHeaders", "cli", "dplyr", "generics", "rlang", "stringi", "stringr", "vctrs"] }, "birdring": { "name": "birdring", @@ -43431,9 +43851,9 @@ }, "birdscanR": { "name": "birdscanR", - "version": "0.2.0", - "sha256": "0vbvf9512214sgah3jsn7cdy8abkyr9pvaqaivqjrhyfpv9fvbr1", - "depends": ["DBI", "dplyr", "ggplot2", "magrittr", "modi", "reshape2", "RODBC", "RPostgreSQL", "rstudioapi", "sp", "suntools", "tibble", "tidyr"] + "version": "0.3.0", + "sha256": "1brgz6x8ljgy9y87znx93d6d68vsr7a75i1p86rxnxvka0s91r15", + "depends": ["DBI", "RODBC", "RPostgreSQL", "dplyr", "ggplot2", "magrittr", "modi", "reshape2", "rlang", "rstudioapi", "sp", "suntools", "tibble", "tidyr"] }, "birk": { "name": "birk", @@ -43463,19 +43883,19 @@ "name": "bispdep", "version": "1.0-0", "sha256": "18rbzfp5ql0qhglmibzvdj1lbq48cvkzz4rpjgam43xkknhyivra", - "depends": ["boot", "combinat", "ggplot2", "RColorBrewer", "sf", "sp", "spatialreg", "spData", "spdep"] + "depends": ["RColorBrewer", "boot", "combinat", "ggplot2", "sf", "sp", "spData", "spatialreg", "spdep"] }, "bisque": { "name": "bisque", "version": "1.0.2", "sha256": "0zp2r1vg29q2ds34hhyjv9pz761mi0qncx9p4ilwnfd5yj9pmzwq", - "depends": ["foreach", "itertools", "mvQuad", "Rcpp", "RcppArmadillo", "RcppEigen"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "foreach", "itertools", "mvQuad"] }, "bistablehistory": { "name": "bistablehistory", "version": "1.1.2", "sha256": "114m7banr0h4l7lzq2bsjz9l3qb7xgg297ix9aj62rmz02p7x5hf", - "depends": ["BH", "boot", "dplyr", "future", "glue", "loo", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders", "tibble", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "boot", "dplyr", "future", "glue", "loo", "purrr", "rlang", "rstan", "rstantools", "tibble", "tidyr"] }, "bit": { "name": "bit", @@ -43493,7 +43913,7 @@ "name": "bite", "version": "0.3", "sha256": "00sph3pdbb9p21s3263ni4by2ivvya1sbjm9wvwx1rwjr4f31jps", - "depends": ["ape", "coda", "MASS", "phytools", "sm", "vioplot", "xml2"] + "depends": ["MASS", "ape", "coda", "phytools", "sm", "vioplot", "xml2"] }, "bitmexr": { "name": "bitmexr", @@ -43503,15 +43923,15 @@ }, "bitops": { "name": "bitops", - "version": "1.0-7", - "sha256": "1i0phmq5yynla5x0frqll1gbf5ww59p3sgz1s06a354zqf9grdg9", + "version": "1.0-8", + "sha256": "0f1744pi3qb1av41man6xp2xalwcjslz3qbk35gccpb4d6glp8bq", "depends": [] }, "bittermelon": { "name": "bittermelon", - "version": "1.1.2", - "sha256": "0v1i7pmblin55vz94i68fwih9djp40wqqyibl361dwyz345j3in5", - "depends": ["findpython", "png", "rappdirs", "Unicode"] + "version": "2.0.2", + "sha256": "0nd0jn28rfkqzvji54i4b53qjzl4xjbwnhsw55vyb3209hk84q1w", + "depends": ["Unicode", "cli", "png"] }, "bivariatemaps": { "name": "bivariatemaps", @@ -43539,9 +43959,9 @@ }, "biwavelet": { "name": "biwavelet", - "version": "0.20.21", - "sha256": "0v7arwmng2i22svj836i57q8by9x5pghjv7d35g7r35wakrm8jyx", - "depends": ["fields", "foreach", "Rcpp"] + "version": "0.20.22", + "sha256": "0j9y81rg9rmri39fjvy9s0wckxcdylbwm1ak62rxy65p397ppgcr", + "depends": ["Rcpp", "fields", "foreach"] }, "biwt": { "name": "biwt", @@ -43565,7 +43985,7 @@ "name": "bkmr", "version": "0.2.2", "sha256": "1bzr39a53p1xkq2fi2fphv2rpsml2z25xb1ycs63p3y7qis9zlky", - "depends": ["dplyr", "fields", "magrittr", "MASS", "nlme", "tibble", "tidyr", "tmvtnorm", "truncnorm"] + "depends": ["MASS", "dplyr", "fields", "magrittr", "nlme", "tibble", "tidyr", "tmvtnorm", "truncnorm"] }, "bkmrhat": { "name": "bkmrhat", @@ -43577,7 +43997,7 @@ "name": "blackbox", "version": "1.1.46", "sha256": "03m93v5nk5zg039axkf02drdj2q165k73xk6waaiyi0b8w0sbl8l", - "depends": ["foreach", "geometry", "lattice", "MASS", "matrixStats", "nloptr", "numDeriv", "pbapply", "proxy", "rcdd", "Rcpp", "RcppEigen", "spaMM"] + "depends": ["MASS", "Rcpp", "RcppEigen", "foreach", "geometry", "lattice", "matrixStats", "nloptr", "numDeriv", "pbapply", "proxy", "rcdd", "spaMM"] }, "blackmarbler": { "name": "blackmarbler", @@ -43601,7 +44021,7 @@ "name": "blapsr", "version": "0.6.1", "sha256": "1vycwglrpb0d041xj3dza25am16ac80r93si8x45b5ry0aq38c46", - "depends": ["coda", "MASS", "Matrix", "RSpectra", "sn", "survival"] + "depends": ["MASS", "Matrix", "RSpectra", "coda", "sn", "survival"] }, "blaster": { "name": "blaster", @@ -43619,13 +44039,13 @@ "name": "blatent", "version": "0.1.2", "sha256": "0vmybbb5xwmlmzgzyaxiiargi4fd2f661sap2wfmjw9rav89zhmv", - "depends": ["coda", "Matrix", "mnormt", "R6", "Rcpp", "RcppArmadillo", "truncnorm"] + "depends": ["Matrix", "R6", "Rcpp", "RcppArmadillo", "coda", "mnormt", "truncnorm"] }, "blavaan": { "name": "blavaan", "version": "0.5-5", "sha256": "0v8b6dax5wk3y3hnih0yfsg7cvdwqv9pxs2hd54yi8hmkmgbrlx8", - "depends": ["bayesplot", "BH", "coda", "future_apply", "lavaan", "loo", "Matrix", "mnormt", "nonnest2", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "tmvnsim"] + "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "coda", "future_apply", "lavaan", "loo", "mnormt", "nonnest2", "rstan", "rstantools", "tmvnsim"] }, "blender": { "name": "blender", @@ -43653,9 +44073,9 @@ }, "bliss": { "name": "bliss", - "version": "1.1.0", - "sha256": "0s5xbk78ygyk8nc3b2279hr3cp4f0nk7nr0cam4n5h5s77cxi3fw", - "depends": ["ggplot2", "MASS", "Rcpp", "RcppArmadillo", "RcppProgress"] + "version": "1.1.1", + "sha256": "0ayqzkwq897nx02clw1qb413m1a6bzfdgxw8vmmpbqld8y6ajyk9", + "depends": ["MASS", "Rcpp", "RcppArmadillo", "RcppProgress", "ggplot2"] }, "blm": { "name": "blm", @@ -43673,7 +44093,7 @@ "name": "blmeco", "version": "1.4", "sha256": "1370djpy87816bfr0g8730x7q4d4xx9aa41iqm622q5b5zm2jzmp", - "depends": ["arm", "lme4", "MASS"] + "depends": ["MASS", "arm", "lme4"] }, "blob": { "name": "blob", @@ -43697,7 +44117,7 @@ "name": "blockTools", "version": "0.6.4", "sha256": "0372ca7mgzz6j0gp2yn2mjpj0kq01jg3pyhd33s65srap2n0wg0d", - "depends": ["dplyr", "MASS", "tibble"] + "depends": ["MASS", "dplyr", "tibble"] }, "blockcluster": { "name": "blockcluster", @@ -43727,7 +44147,7 @@ "name": "blockmodels", "version": "1.1.5", "sha256": "1h2g13yp8xhkw9icl5bi1nkc0qfqkqhlhdqbcsp0246g9amssci9", - "depends": ["digest", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "digest"] }, "blockrand": { "name": "blockrand", @@ -43739,7 +44159,7 @@ "name": "blocksdesign", "version": "4.9", "sha256": "1kr3fxs8vgc96clhx5ml11jkwll1rg9gf16xg93q14jpg4hg0j9h", - "depends": ["plyr", "PolynomF"] + "depends": ["PolynomF", "plyr"] }, "blocs": { "name": "blocs", @@ -43757,7 +44177,7 @@ "name": "blorr", "version": "0.3.0", "sha256": "1ynvg6ar7c7p01225q9czy4gxks0p1vw3sx207l7vzqxw20wb1bn", - "depends": ["car", "data_table", "ggplot2", "gridExtra", "lest", "Rcpp"] + "depends": ["Rcpp", "car", "data_table", "ggplot2", "gridExtra", "lest"] }, "blrm": { "name": "blrm", @@ -43769,7 +44189,7 @@ "name": "blsBandit", "version": "0.1", "sha256": "08dppd0qym4lac5glifwaraddics8np522sfw4x8xg00vm335r25", - "depends": ["DBI", "jsonlite", "plotly", "RSQLite", "shiny", "zoo"] + "depends": ["DBI", "RSQLite", "jsonlite", "plotly", "shiny", "zoo"] }, "blsR": { "name": "blsR", @@ -43787,7 +44207,7 @@ "name": "bltm", "version": "0.1.0", "sha256": "1sx4ii65ddvdw45za8j320v1s9d1pz5k2gx979yymhyxi8fmq69z", - "depends": ["mvnfast", "Rfast"] + "depends": ["Rfast", "mvnfast"] }, "bluebike": { "name": "bluebike", @@ -43799,7 +44219,7 @@ "name": "bmabasket", "version": "0.1.2", "sha256": "0w8y992ylyg0cyz1lfqll96fivng13lvxp0mhyb48flfnkg8rcdd", - "depends": ["partitions", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "partitions"] }, "bmass": { "name": "bmass", @@ -43811,13 +44231,13 @@ "name": "bmem", "version": "2.1", "sha256": "0acw1xwswf5yi1a0j8pv996qcma3br0xw7a9w9mh7bx5xavlivvl", - "depends": ["Amelia", "lavaan", "MASS", "sem", "snowfall"] + "depends": ["Amelia", "MASS", "lavaan", "sem", "snowfall"] }, "bmemLavaan": { "name": "bmemLavaan", "version": "0.5", "sha256": "0axwc7y7ncvmpnmdlxjdaw2kfhqklxd0zb7n22m6aw67hkqqqcg5", - "depends": ["Amelia", "lavaan", "MASS", "rsem", "sem", "snowfall"] + "depends": ["Amelia", "MASS", "lavaan", "rsem", "sem", "snowfall"] }, "bmet": { "name": "bmet", @@ -43829,13 +44249,13 @@ "name": "bmgarch", "version": "2.0.0", "sha256": "0a0svnb7wxm9v8mzk0ld28scp51sp4rsgspxccqpkbmj31njc4d0", - "depends": ["BH", "forecast", "ggplot2", "loo", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "forecast", "ggplot2", "loo", "rstan", "rstantools"] }, "bmggum": { "name": "bmggum", "version": "0.1.0", "sha256": "1r0j5gklmknyan68nc3vfn96ck414v75547486ic70v2pdr3xnpf", - "depends": ["BH", "edstan", "ggplot2", "GGUM", "loo", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "GGUM", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "edstan", "ggplot2", "loo", "rstan", "rstantools"] }, "bmixture": { "name": "bmixture", @@ -43847,7 +44267,7 @@ "name": "bmlm", "version": "1.3.15", "sha256": "1iig406z8whdjpbvajks2vzp1s1ay1f99r1n6qhs9xyi1z6yff2l", - "depends": ["BH", "ggplot2", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "rstan", "rstantools"] }, "bmm": { "name": "bmm", @@ -43865,36 +44285,36 @@ "name": "bmscstan", "version": "1.2.1.0", "sha256": "05w6pz0mwqighhdl36f2ya1b4dw0xdhpfcbq6saw73ag5hvl57i9", - "depends": ["bayesplot", "ggplot2", "LaplacesDemon", "logspline", "loo", "rstan"] + "depends": ["LaplacesDemon", "bayesplot", "ggplot2", "logspline", "loo", "rstan"] }, "bmstdr": { "name": "bmstdr", "version": "0.7.9", "sha256": "0myv2mj5kp97dzvbf4sw63fzjxzpv2d82vxwiqxaqd1pllcgrzz1", - "depends": ["BH", "CARBayes", "CARBayesST", "ggplot2", "ggpubr", "inlabru", "MCMCpack", "mnormt", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "rstan", "rstantools", "spBayes", "spTDyn", "spTimer", "StanHeaders"] + "depends": ["BH", "CARBayes", "CARBayesST", "MCMCpack", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "ggplot2", "ggpubr", "inlabru", "mnormt", "rstan", "rstantools", "spBayes", "spTDyn", "spTimer"] }, "bnclassify": { "name": "bnclassify", "version": "0.4.8", "sha256": "0sqyqw3jlzjhsmcblzxcc3nak4z63pvg3paniysnjzyi139fjyam", - "depends": ["assertthat", "BH", "entropy", "matrixStats", "Rcpp", "rpart"] + "depends": ["BH", "Rcpp", "assertthat", "entropy", "matrixStats", "rpart"] }, "bndesr": { "name": "bndesr", "version": "1.0.3", "sha256": "0yx5grnaginmdxdi9philz24qvncr6gva01zrasl098p49dx0zpv", - "depends": ["curl", "dplyr", "janitor", "lubridate", "RCurl", "readr", "readxl", "stringr"] + "depends": ["RCurl", "curl", "dplyr", "janitor", "lubridate", "readr", "readxl", "stringr"] }, "bndovb": { "name": "bndovb", "version": "1.1", "sha256": "16mvkvwnx61jrvraagvxf56pvmf5klm8lnkqq4s5y2z92kd0clgp", - "depends": ["dplyr", "factormodel", "MASS", "nnet", "np", "pracma"] + "depends": ["MASS", "dplyr", "factormodel", "nnet", "np", "pracma"] }, "bnlearn": { "name": "bnlearn", - "version": "4.9.4", - "sha256": "1spf8q1bhxc1mdx5hd8z7yqwlyn15fq3ph3rz1vr5v8z8n4qsgff", + "version": "5.0", + "sha256": "18br08n7dbykdhx8adwvizm9m3r1pin76qqy7v1p42cq44qj11p7", "depends": [] }, "bnma": { @@ -43905,21 +44325,21 @@ }, "bnmonitor": { "name": "bnmonitor", - "version": "0.1.4", - "sha256": "0sbpfgm7yibh84m1zmn7b1ixzc2x1m2nlms7zpxp4c6fkv2c225r", - "depends": ["bnlearn", "dplyr", "ggplot2", "gRain", "gRbase", "purrr", "qgraph", "RColorBrewer", "reshape2", "rlang", "tidyr"] + "version": "0.2.0", + "sha256": "0ygsk817x5m474kk1vfnzkr23gj3cbsj69jxbsbvzwwimmhz0094", + "depends": ["RColorBrewer", "bnlearn", "dplyr", "gRain", "gRbase", "ggplot2", "igraph", "purrr", "qgraph", "reshape2", "rlang", "tidyr"] }, "bnnSurvival": { "name": "bnnSurvival", "version": "0.1.5", "sha256": "1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4", - "depends": ["pec", "prodlim", "Rcpp"] + "depends": ["Rcpp", "pec", "prodlim"] }, "bnpa": { "name": "bnpa", "version": "0.3.0", "sha256": "0qsxk47i7q4d8hbs2xj5k5sf8bqyzhq7rbj4y7w8ljprznlydgl9", - "depends": ["bnlearn", "fastDummies", "lavaan", "Rgraphviz", "semPlot", "xlsx"] + "depends": ["Rgraphviz", "bnlearn", "fastDummies", "lavaan", "semPlot", "xlsx"] }, "bnpsd": { "name": "bnpsd", @@ -43963,6 +44383,12 @@ "sha256": "1hi3x2chs87ba5nh7ka6xjrl5yvwqqcdyj1dg87rpaiipyl8396n", "depends": [] }, + "bodycompref": { + "name": "bodycompref", + "version": "2.0.1", + "sha256": "1nsgn3x2w8ri059iwpj9rhg4abxrk6ryq1lbbrwihrxdq9xqvg4v", + "depends": ["assertthat", "gamlss", "sae"] + }, "boggy": { "name": "boggy", "version": "0.0.1", @@ -43979,19 +44405,19 @@ "name": "boinet", "version": "1.0.0", "sha256": "1i023h1kzf5xk92dp9iyllw2b1lprs0xz2hp23lqq9vx36cpird3", - "depends": ["copula", "Iso", "mfp"] + "depends": ["Iso", "copula", "mfp"] }, "boiwsa": { "name": "boiwsa", "version": "1.1.1", "sha256": "1xyxx6xf9az62zxczybl6iizswq7h4i55v4apll8kh0xh6nqlzr7", - "depends": ["dplyr", "ggplot2", "Hmisc", "lubridate", "rlang", "tidyr"] + "depends": ["Hmisc", "dplyr", "ggplot2", "lubridate", "rlang", "tidyr"] }, "bolasso": { "name": "bolasso", "version": "0.2.0", "sha256": "1fbd39jyxq0zfbybrzzwnyql2w8hf2b9133jj0nl99d1326wr7dh", - "depends": ["future_apply", "gamlr", "ggplot2", "glmnet", "Matrix", "progressr", "Rdpack", "tibble"] + "depends": ["Matrix", "Rdpack", "future_apply", "gamlr", "ggplot2", "glmnet", "progressr", "tibble"] }, "bold": { "name": "bold", @@ -44019,10 +44445,16 @@ }, "bonsai": { "name": "bonsai", - "version": "0.2.1", - "sha256": "048nfgnzsi0zz0nsxl30nsjg63nszy44881s49g9hgs3vng2vmp2", + "version": "0.3.1", + "sha256": "01k4b1d0rl6fry1y5594fca7rsp7i55d0wadm7ibydn9jf1hmsiv", "depends": ["cli", "dials", "dplyr", "glue", "parsnip", "purrr", "rlang", "tibble"] }, + "bonsaiforest": { + "name": "bonsaiforest", + "version": "0.1.0", + "sha256": "1k8k2vnn3cxl1nlkls5w1yvvr1qk28j8gak7m2p85gr6nlxfy4p4", + "depends": ["MASS", "Rcpp", "RcppArmadillo", "brms", "broom", "checkmate", "dplyr", "forcats", "gbm", "ggplot2", "glmnet", "splines2", "survival", "tibble", "tidyr", "tidyselect", "vdiffr"] + }, "boodist": { "name": "boodist", "version": "1.0.0", @@ -44031,15 +44463,21 @@ }, "bookdown": { "name": "bookdown", - "version": "0.39", - "sha256": "1brfv50lq92m7d4d18n92ywhfr28lrbq02naf0bwdsmd0ngasxrm", + "version": "0.40", + "sha256": "0fdciqazvsmc34hqfiqlmldigxn8gw546kkz74mc9dh48w24mpsq", "depends": ["htmltools", "jquerylib", "knitr", "rmarkdown", "tinytex", "xfun", "yaml"] }, + "boomer": { + "name": "boomer", + "version": "0.2.0", + "sha256": "1v3fiif0xrrpvl9m7mbqn3c3nv04r0xxsa0fji6grzk6prqw9zqd", + "depends": ["crayon", "pryr", "rlang", "rstudioapi", "styler", "withr"] + }, "boostingDEA": { "name": "boostingDEA", "version": "0.1.0", "sha256": "0df19q44fsv0hvda4dwq302wsh6vlalwszyh0ir66r5ryrrmhas4", - "depends": ["dplyr", "lpSolveAPI", "MLmetrics", "Rglpk"] + "depends": ["MLmetrics", "Rglpk", "dplyr", "lpSolveAPI"] }, "boostmtree": { "name": "boostmtree", @@ -44069,13 +44507,13 @@ "name": "boot.pval", "version": "0.5", "sha256": "0572n82402i609q0jl6p2ar1gq5jlqqssv28xs3rxsr3nza49dxv", - "depends": ["boot", "car", "flextable", "gt", "lme4", "Rdpack", "rms", "survival"] + "depends": ["Rdpack", "boot", "car", "flextable", "gt", "lme4", "rms", "survival"] }, "bootCT": { "name": "bootCT", "version": "2.1.0", "sha256": "1025n0rxvjsyqwba3y4frjhpfqila70p43pk4p4rf9fhxcs4xg6m", - "depends": ["aod", "ARDL", "dplyr", "dynamac", "gtools", "magrittr", "pracma", "Rcpp", "RcppArmadillo", "stringr", "urca", "usethis", "vars"] + "depends": ["ARDL", "Rcpp", "RcppArmadillo", "aod", "dplyr", "dynamac", "gtools", "magrittr", "pracma", "stringr", "urca", "usethis", "vars"] }, "bootComb": { "name": "bootComb", @@ -44093,7 +44531,7 @@ "name": "bootGOF", "version": "0.1.0", "sha256": "11nn4lc9wdx1z35mfpc3zkk1xr0pvvjyvjzpjlq3z4gm0hmniifz", - "depends": ["checkmate", "R6"] + "depends": ["R6", "checkmate"] }, "bootImpute": { "name": "bootImpute", @@ -44129,25 +44567,25 @@ "name": "bootUR", "version": "1.0.4", "sha256": "19sjh9hwx9hcqyrjx5kc2id1ml1sfd6c37g412vzfgk931bm0lbs", - "depends": ["parallelly", "Rcpp", "RcppArmadillo", "RcppParallel", "RcppThread", "urca"] + "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "RcppThread", "parallelly", "urca"] }, "bootcluster": { "name": "bootcluster", "version": "0.3.2", "sha256": "0wkc9li0hqgns7pz72fby187q81yzrgl62qs8w5llayghf8lhaml", - "depends": ["cluster", "doParallel", "dplyr", "flexclust", "foreach", "fpc", "GGally", "ggplot2", "gridExtra", "igraph", "intergraph", "mclust", "network", "plyr", "sna"] + "depends": ["GGally", "cluster", "doParallel", "dplyr", "flexclust", "foreach", "fpc", "ggplot2", "gridExtra", "igraph", "intergraph", "mclust", "network", "plyr", "sna"] }, "bootf2": { "name": "bootf2", "version": "0.4.1", "sha256": "17wrl678x9mb5pny2vwrr6sdl2hsqr1nbjzsizp2q6l3w5m6s152", - "depends": ["ggplot2", "MASS", "minpack_lm", "readxl"] + "depends": ["MASS", "ggplot2", "minpack_lm", "readxl"] }, "bootnet": { "name": "bootnet", "version": "1.6", "sha256": "0r7ad6ybzr3jm5s2791sv402293wi4wy59n7dv5q5ss1vykpsk6h", - "depends": ["abind", "corpcor", "dplyr", "ggplot2", "gtools", "igraph", "IsingFit", "IsingSampler", "Matrix", "mgm", "mvtnorm", "NetworkToolbox", "networktools", "pbapply", "qgraph", "rlang", "snow", "tibble", "tidyr", "tidyselect"] + "depends": ["IsingFit", "IsingSampler", "Matrix", "NetworkToolbox", "abind", "corpcor", "dplyr", "ggplot2", "gtools", "igraph", "mgm", "mvtnorm", "networktools", "pbapply", "qgraph", "rlang", "snow", "tibble", "tidyr", "tidyselect"] }, "bootruin": { "name": "bootruin", @@ -44189,13 +44627,13 @@ "name": "boral", "version": "2.0.2", "sha256": "1x53g3y283i92624rkp36lwfmz0p8rkkqsndn5h35sapjga6wmy3", - "depends": ["abind", "coda", "corpcor", "fishMod", "lifecycle", "MASS", "mvtnorm", "R2jags", "reshape2"] + "depends": ["MASS", "R2jags", "abind", "coda", "corpcor", "fishMod", "lifecycle", "mvtnorm", "reshape2"] }, "borrowr": { "name": "borrowr", "version": "0.2.0", "sha256": "0hq9rplb22dm8nikapxnvzq10y4xzi1y7k61ghw9x1fq4fdfyy2f", - "depends": ["BART", "mvtnorm", "Rcpp"] + "depends": ["BART", "Rcpp", "mvtnorm"] }, "bossR": { "name": "bossR", @@ -44235,9 +44673,9 @@ }, "box_linters": { "name": "box.linters", - "version": "0.9.1", - "sha256": "1v0czkz09gp58ap7n847pcwqsd1n11i44wz6cppnlxhl1wcw8vzn", - "depends": ["cli", "fs", "glue", "lintr", "rlang", "stringr", "xml2", "xmlparsedata"] + "version": "0.10.0", + "sha256": "0m31r5bs49bw9660hsxsmnk131hf6vrzqxank39hvlnid70z9l18", + "depends": ["cli", "fs", "glue", "lintr", "purrr", "rlang", "stringr", "treesitter", "treesitter_r", "withr", "xfun", "xml2", "xmlparsedata"] }, "boxcoxmix": { "name": "boxcoxmix", @@ -44255,7 +44693,7 @@ "name": "boxly", "version": "0.1.1", "sha256": "0fvk95f2nn06aaxn2qq7jxr2yvsnc40806xkamryhrnmrwiphia9", - "depends": ["brew", "crosstalk", "DT", "ggplot2", "htmltools", "htmlwidgets", "metalite", "plotly", "rlang", "uuid"] + "depends": ["DT", "brew", "crosstalk", "ggplot2", "htmltools", "htmlwidgets", "metalite", "plotly", "rlang", "uuid"] }, "boxplotcluster": { "name": "boxplotcluster", @@ -44291,7 +44729,7 @@ "name": "bpDir", "version": "0.1.2", "sha256": "1wkj25srsbidpcvgm6c74584ahybjy39r86dxir1vd13kbi8l120", - "depends": ["circular", "MASS", "plotrix"] + "depends": ["MASS", "circular", "plotrix"] }, "bpa": { "name": "bpa", @@ -44321,13 +44759,13 @@ "name": "bpgmm", "version": "1.0.9", "sha256": "0wrdh4c8yws7z5zd1yl23wbja88x57x651kqbnqj70k9a1195rwc", - "depends": ["fabMix", "gtools", "label_switching", "MASS", "mclust", "mcmcse", "mvtnorm", "pgmm", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "fabMix", "gtools", "label_switching", "mclust", "mcmcse", "mvtnorm", "pgmm"] }, "bpmnR": { "name": "bpmnR", "version": "0.1.1", "sha256": "0cskqfib5fw34zfqms4dp53cwb7z0cricr452a4cjfw563kjhmqf", - "depends": ["DiagrammeR", "DiagrammeRsvg", "dplyr", "DT", "glue", "htmltools", "htmlwidgets", "huxtable", "knitr", "purrr", "readr", "rlang", "rvest", "stringr", "tidyr", "uuid", "xml2"] + "depends": ["DT", "DiagrammeR", "DiagrammeRsvg", "dplyr", "glue", "htmltools", "htmlwidgets", "huxtable", "knitr", "purrr", "readr", "rlang", "rvest", "stringr", "tidyr", "uuid", "xml2"] }, "bpmnVisualizationR": { "name": "bpmnVisualizationR", @@ -44339,7 +44777,7 @@ "name": "bpnreg", "version": "2.0.3", "sha256": "1yy1rbbnqjrz0dkpvwi49432ddpjbql0vrpwvhzv9qzpv8ydvlw4", - "depends": ["BH", "haven", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "haven"] }, "bpp": { "name": "bpp", @@ -44351,13 +44789,13 @@ "name": "bpr", "version": "1.0.8", "sha256": "1hiwz1s8gc6skl0zg7mjh29bxazka9wgrbbldqhy6f9vzrddl4pn", - "depends": ["BH", "coda", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "MASS", "Rcpp", "RcppArmadillo", "coda"] }, "bqror": { "name": "bqror", "version": "1.7.0", "sha256": "1pisp3p3w5r9bfv5m5yykk410z5qvwsqdblmv7vsj1sc1nwf5y2v", - "depends": ["GIGrvg", "invgamma", "MASS", "NPflow", "pracma", "progress", "truncnorm"] + "depends": ["GIGrvg", "MASS", "NPflow", "invgamma", "pracma", "progress", "truncnorm"] }, "bqtl": { "name": "bqtl", @@ -44369,7 +44807,7 @@ "name": "braQCA", "version": "1.2.1.29", "sha256": "0w1mg8lzl64mp5clinq3zai733iz3628zp4pw6vr51z24s56jg6i", - "depends": ["bootstrap", "dplyr", "QCA"] + "depends": ["QCA", "bootstrap", "dplyr"] }, "bracer": { "name": "bracer", @@ -44411,13 +44849,13 @@ "name": "brainGraph", "version": "3.1.0", "sha256": "009m3297bn1jl1aacypajkdawgjp3pwx7krz3bxifb0bmrdi0n7b", - "depends": ["abind", "data_table", "doParallel", "foreach", "igraph", "lattice", "MASS", "Matrix", "permute"] + "depends": ["MASS", "Matrix", "abind", "data_table", "doParallel", "foreach", "igraph", "lattice", "permute"] }, "brainKCCA": { "name": "brainKCCA", "version": "0.1.0", "sha256": "1ag3qahlba4h4126873hg2bbi6sr729mhiw22gjgr4g4jg6lhh09", - "depends": ["brainR", "CCA", "elasticnet", "kernlab", "knitr", "misc3d", "oro_nifti", "rgl"] + "depends": ["CCA", "brainR", "elasticnet", "kernlab", "knitr", "misc3d", "oro_nifti", "rgl"] }, "brainR": { "name": "brainR", @@ -44459,12 +44897,12 @@ "name": "brclimr", "version": "0.2.0", "sha256": "11870q60spq4pi7d6yvly48x8n9is15cj957aq8h7bw2lgcyzb1z", - "depends": ["checkmate", "DBI", "duckdb", "glue", "lobstr", "magrittr", "rlang"] + "depends": ["DBI", "checkmate", "duckdb", "glue", "lobstr", "magrittr", "rlang"] }, "brea": { "name": "brea", - "version": "0.2.0", - "sha256": "0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04", + "version": "0.3.1", + "sha256": "1sh0m4hfik0kzc19ygqcbrxn67n52zz9l90gs494iqqwj1fzs8f7", "depends": [] }, "bread": { @@ -44483,31 +44921,31 @@ "name": "breakaway", "version": "4.8.4", "sha256": "08mxp41d79iaqbz96bpzw7halasijghv0557ccz5p563y5lk3n3m", - "depends": ["ggplot2", "lme4", "magrittr", "MASS", "phyloseq", "tibble"] + "depends": ["MASS", "ggplot2", "lme4", "magrittr", "phyloseq", "tibble"] }, "breakfast": { "name": "breakfast", "version": "2.4", "sha256": "0sxila1l2pk1z8lmskqppd8qm7wg08vvyyqxfyxcffvwhzqaf3rj", - "depends": ["ggplot2", "plyr", "Rcpp"] + "depends": ["Rcpp", "ggplot2", "plyr"] }, "breakpoint": { "name": "breakpoint", "version": "1.2", "sha256": "004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9", - "depends": ["doParallel", "foreach", "ggplot2", "MASS", "msm"] + "depends": ["MASS", "doParallel", "foreach", "ggplot2", "msm"] }, "breathtestcore": { "name": "breathtestcore", "version": "0.8.7", "sha256": "0i5mih2v6397g0glgdhn5lrz3j0l6yv3pmlvs9pkg2vbjppif2sc", - "depends": ["assertthat", "broom", "dplyr", "ggfittext", "ggplot2", "MASS", "multcomp", "nlme", "purrr", "readr", "readxl", "signal", "stringr", "tibble", "tidyr", "xml2"] + "depends": ["MASS", "assertthat", "broom", "dplyr", "ggfittext", "ggplot2", "multcomp", "nlme", "purrr", "readr", "readxl", "signal", "stringr", "tibble", "tidyr", "xml2"] }, "breathteststan": { "name": "breathteststan", "version": "0.8.5", "sha256": "1b495qb0r8wdh4rnv3namnhrd1d6mba55ayj7h9s0076h8aw04hk", - "depends": ["BH", "breathtestcore", "dplyr", "purrr", "Rcpp", "RcppEigen", "rstan", "rstantools", "StanHeaders", "stringr", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "breathtestcore", "dplyr", "purrr", "rstan", "rstantools", "stringr", "tidyr"] }, "brew": { "name": "brew", @@ -44525,7 +44963,7 @@ "name": "brglm2", "version": "0.9.2", "sha256": "0islmx4kdy22qn2cq7lpzqq6lc6mci5qly645nfdhad9001jmhsa", - "depends": ["enrichwith", "MASS", "Matrix", "nnet", "numDeriv"] + "depends": ["MASS", "Matrix", "enrichwith", "nnet", "numDeriv"] }, "briKmeans": { "name": "briKmeans", @@ -44561,7 +44999,7 @@ "name": "bridgesampling", "version": "1.1-2", "sha256": "0sry1xwiv4y52k44hq6z8y2kysp5kxgl4dix3m94svg3ladd7v2l", - "depends": ["Brobdingnag", "coda", "Matrix", "mvtnorm", "scales", "stringr"] + "depends": ["Brobdingnag", "Matrix", "coda", "mvtnorm", "scales", "stringr"] }, "brif": { "name": "brif", @@ -44573,7 +45011,7 @@ "name": "brinton", "version": "0.2.7", "sha256": "1z2d7a1wq5ms5j0mn2hgqvvp9x3mfvxw4llia8d0bs0mpm0jkjvn", - "depends": ["forcats", "GGally", "ggplot2", "glue", "gridExtra", "lubridate", "pander", "patchwork", "RColorBrewer", "rmarkdown", "scales", "sm", "tibble"] + "depends": ["GGally", "RColorBrewer", "forcats", "ggplot2", "glue", "gridExtra", "lubridate", "pander", "patchwork", "rmarkdown", "scales", "sm", "tibble"] }, "brio": { "name": "brio", @@ -44597,7 +45035,7 @@ "name": "brlrmr", "version": "0.1.7", "sha256": "0s47qz8y416x0gz91pzdpr97pmlvddwkvll454vnlafxxk9p5lds", - "depends": ["boot", "brglm", "MASS", "profileModel", "Rcpp"] + "depends": ["MASS", "Rcpp", "boot", "brglm", "profileModel"] }, "brm": { "name": "brm", @@ -44609,19 +45047,19 @@ "name": "brms", "version": "2.21.0", "sha256": "0n2xxiibypfazcbx8rx4h5c4pl9zlmm0mkpyny23bf54q8rzz2bj", - "depends": ["abind", "backports", "bayesplot", "bridgesampling", "coda", "future", "future_apply", "ggplot2", "glue", "loo", "Matrix", "matrixStats", "mgcv", "nleqslv", "nlme", "posterior", "Rcpp", "rlang", "rstan", "rstantools"] + "depends": ["Matrix", "Rcpp", "abind", "backports", "bayesplot", "bridgesampling", "coda", "future", "future_apply", "ggplot2", "glue", "loo", "matrixStats", "mgcv", "nleqslv", "nlme", "posterior", "rlang", "rstan", "rstantools"] }, "brms_mmrm": { "name": "brms.mmrm", - "version": "1.0.0", - "sha256": "12srwi69mkhnj2m711r9pag89jlmxxsjksr1fhb5w5cbn0lyk9in", - "depends": ["brms", "dplyr", "ggplot2", "ggridges", "MASS", "posterior", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "trialr", "zoo"] + "version": "1.1.0", + "sha256": "1v64wx6nylzrfzby8p7l3s1dn6naqnjw7vamlwm12xvq303xgap1", + "depends": ["MASS", "brms", "dplyr", "ggplot2", "ggridges", "posterior", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "trialr", "zoo"] }, "brmsmargins": { "name": "brmsmargins", "version": "0.2.0", "sha256": "1qdfig1cy5cf3csky995m0jybb2hyp7yq7ka67wircrln919c1nm", - "depends": ["bayestestR", "brms", "data_table", "extraoperators", "posterior", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "bayestestR", "brms", "data_table", "extraoperators", "posterior"] }, "brnn": { "name": "brnn", @@ -44681,7 +45119,7 @@ "name": "brsim", "version": "0.3", "sha256": "15clv6gfvvfclj9wmb6hr4ljfvs28spamq9rqj12nwzz5fihyhi9", - "depends": ["cluster", "corrplot", "RcmdrMisc"] + "depends": ["RcmdrMisc", "cluster", "corrplot"] }, "bruceR": { "name": "bruceR", @@ -44705,7 +45143,7 @@ "name": "brxx", "version": "0.1.2", "sha256": "08qlfnf84k3yjcvr1wm6gd96mk26xf2gz59ychb3m981228hbbs6", - "depends": ["blavaan", "blme", "GPArotation", "MASS", "MCMCpack", "rstan", "TeachingDemos"] + "depends": ["GPArotation", "MASS", "MCMCpack", "TeachingDemos", "blavaan", "blme", "rstan"] }, "bs4Dash": { "name": "bs4Dash", @@ -44735,7 +45173,7 @@ "name": "bsamGP", "version": "1.2.5", "sha256": "1792kksvpzinap83asyz6iz7mp7xyi0a7lppxx1m8as7jwnk2nsk", - "depends": ["ggplot2", "gridExtra", "MASS"] + "depends": ["MASS", "ggplot2", "gridExtra"] }, "bscui": { "name": "bscui", @@ -44771,7 +45209,7 @@ "name": "bsitar", "version": "0.2.1", "sha256": "1h18hk5qr3lcxy0iqhz2wfxhvyjl1bs45y78skx070qbxrgwai5z", - "depends": ["brms", "dplyr", "insight", "loo", "magrittr", "marginaleffects", "Rdpack", "rlang", "rstan", "sitar"] + "depends": ["Rdpack", "brms", "dplyr", "insight", "loo", "magrittr", "marginaleffects", "rlang", "rstan", "sitar"] }, "bskyr": { "name": "bskyr", @@ -44781,8 +45219,8 @@ }, "bslib": { "name": "bslib", - "version": "0.7.0", - "sha256": "181cfmdvi64j978q8x69bl7wxwpjpx54a52sh4xng0pk3a2djd91", + "version": "0.8.0", + "sha256": "00sbskl5f4mif2x54h5z3m2kv8ij2wv84a61n39931hj3gdjs67x", "depends": ["base64enc", "cachem", "fastmap", "htmltools", "jquerylib", "jsonlite", "lifecycle", "memoise", "mime", "rlang", "sass"] }, "bsnsing": { @@ -44795,7 +45233,7 @@ "name": "bspcov", "version": "1.0.0", "sha256": "1zxdcqydhzisfp2bkvw585z3qfcpy0yjra91qyxwdf0lvdvqwbqx", - "depends": ["BayesFactor", "caret", "CholWishart", "coda", "dplyr", "FinCovRegularization", "furrr", "future", "ggmcmc", "ggplot2", "GIGrvg", "ks", "magrittr", "MASS", "Matrix", "matrixcalc", "matrixStats", "mvnfast", "mvtnorm", "plyr", "progress", "purrr", "RSpectra"] + "depends": ["BayesFactor", "CholWishart", "FinCovRegularization", "GIGrvg", "MASS", "Matrix", "RSpectra", "caret", "coda", "dplyr", "furrr", "future", "ggmcmc", "ggplot2", "ks", "magrittr", "matrixStats", "matrixcalc", "mvnfast", "mvtnorm", "plyr", "progress", "purrr"] }, "bspec": { "name": "bspec", @@ -44805,9 +45243,9 @@ }, "bspline": { "name": "bspline", - "version": "2.2", - "sha256": "0v7kbg7h0d0s2ywvjpahk2y2ncbv8kmacdznaixxakccqbl8piip", - "depends": ["arrApply", "nlsic", "Rcpp", "RcppArmadillo"] + "version": "2.2.2", + "sha256": "1m214gp6kjpl56vd7w8h1lwgwrh46pds5i77ilvgiv64nrccqih7", + "depends": ["Rcpp", "RcppArmadillo", "arrApply", "nlsic"] }, "bsplinePsd": { "name": "bsplinePsd", @@ -44843,7 +45281,7 @@ "name": "bssm", "version": "2.0.2", "sha256": "121fb12n5z3w97xpj5ga1985drv3h4g7b0xy5yk9sfqfaqf92yyn", - "depends": ["bayesplot", "checkmate", "coda", "diagis", "dplyr", "posterior", "ramcmc", "Rcpp", "RcppArmadillo", "rlang", "sitmo", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "bayesplot", "checkmate", "coda", "diagis", "dplyr", "posterior", "ramcmc", "rlang", "sitmo", "tidyr"] }, "bssn": { "name": "bssn", @@ -44873,25 +45311,37 @@ "name": "bsub", "version": "1.1.0", "sha256": "112hlvg15jlzg3drfzkslaly42vnvsycn9vif0w3iaw5fzsaa954", - "depends": ["clisymbols", "crayon", "digest", "GetoptLong", "GlobalOptions"] + "depends": ["GetoptLong", "GlobalOptions", "clisymbols", "crayon", "digest"] + }, + "bsvarSIGNs": { + "name": "bsvarSIGNs", + "version": "1.0.1", + "sha256": "15kjmjzrn5vp9r35mjyh009v174jlz670kqchz6jhp7yqlxhnbqc", + "depends": ["R6", "Rcpp", "RcppArmadillo", "RcppProgress", "bsvars"] }, "bsvars": { "name": "bsvars", - "version": "2.1.0", - "sha256": "1gnjl27ik6p8zsis8fdqhwdzp2jp0kyqnidil4jgy02fiwdww6c5", + "version": "3.1", + "sha256": "138810300y0lfmzbch5syp3sd2cfcvqvgnnvvy4xlbys9p6aif5a", "depends": ["GIGrvg", "R6", "Rcpp", "RcppArmadillo", "RcppProgress", "RcppTN", "stochvol"] }, + "bsynth": { + "name": "bsynth", + "version": "1.0", + "sha256": "1hgq999pkk54cnw21xgpmksr1x4lr2y23c3ma8fyn4637mqa0z7r", + "depends": ["BH", "R6", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cubelyr", "dplyr", "ggplot2", "glue", "magrittr", "purrr", "rlang", "rstan", "rstantools", "scales", "tibble", "tidyr", "vizdraws"] + }, "btb": { "name": "btb", "version": "0.2.0", "sha256": "1gm03md6ky134nzmnnp054mi2w8kl4bgcgg4k65zf2cyniz4arxq", - "depends": ["BH", "dplyr", "magrittr", "mapsf", "Rcpp", "RcppArmadillo", "RcppParallel", "sf"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "RcppParallel", "dplyr", "magrittr", "mapsf", "sf"] }, "btergm": { "name": "btergm", "version": "1.10.12", "sha256": "1xcn24m6ldmi5wh44169vg13f7a7apbk45iwsl88clbnf2l9wpb8", - "depends": ["boot", "coda", "ergm", "igraph", "Matrix", "network", "ROCR", "sna", "statnet_common"] + "depends": ["Matrix", "ROCR", "boot", "coda", "ergm", "igraph", "network", "sna", "statnet_common"] }, "bubbleHeatmap": { "name": "bubbleHeatmap", @@ -44927,7 +45377,7 @@ "name": "bulkAnalyseR", "version": "1.1.0", "sha256": "008vnkcaa26d8620i1l49mbcr7px5x16s5x2wlq1vm0jkxya4c3z", - "depends": ["circlize", "ComplexHeatmap", "DESeq2", "dplyr", "DT", "edgeR", "GENIE3", "ggforce", "ggnewscale", "ggplot2", "ggrastr", "ggrepel", "ggVennDiagram", "glue", "gprofiler2", "magrittr", "matrixStats", "noisyr", "preprocessCore", "RColorBrewer", "rlang", "scales", "shiny", "shinyjqui", "shinyjs", "shinyLP", "shinyWidgets", "stringr", "tibble", "tidyr", "UpSetR", "visNetwork"] + "depends": ["ComplexHeatmap", "DESeq2", "DT", "GENIE3", "RColorBrewer", "UpSetR", "circlize", "dplyr", "edgeR", "ggVennDiagram", "ggforce", "ggnewscale", "ggplot2", "ggrastr", "ggrepel", "glue", "gprofiler2", "magrittr", "matrixStats", "noisyr", "preprocessCore", "rlang", "scales", "shiny", "shinyLP", "shinyWidgets", "shinyjqui", "shinyjs", "stringr", "tibble", "tidyr", "visNetwork"] }, "bulkQC": { "name": "bulkQC", @@ -44945,7 +45395,7 @@ "name": "bulletcp", "version": "1.0.0", "sha256": "1k7lw8gflih47ncz8hgsj0sxbajnkhz1k7yb7rwbdnzcki3n3jln", - "depends": ["assertthat", "dplyr", "mvtnorm", "Rdpack"] + "depends": ["Rdpack", "assertthat", "dplyr", "mvtnorm"] }, "bulletr": { "name": "bulletr", @@ -44969,13 +45419,13 @@ "name": "bumbl", "version": "1.0.3", "sha256": "16fpd62wkvjd25wv80rlp01q57sacx1jjww5j1v6hifc8097wj0i", - "depends": ["broom", "dplyr", "ggplot2", "glue", "lifecycle", "MASS", "purrr", "rlang", "tidyr"] + "depends": ["MASS", "broom", "dplyr", "ggplot2", "glue", "lifecycle", "purrr", "rlang", "tidyr"] }, "bumblebee": { "name": "bumblebee", "version": "0.1.0", "sha256": "055plkcswq7qsy3flkjjq5kqampj9s8dbc3ahzinps6s0jkcv2ad", - "depends": ["dplyr", "gtools", "Hmisc", "magrittr", "rmarkdown"] + "depends": ["Hmisc", "dplyr", "gtools", "magrittr", "rmarkdown"] }, "bunching": { "name": "bunching", @@ -45021,15 +45471,15 @@ }, "burgle": { "name": "burgle", - "version": "0.1.0", - "sha256": "11696f86vh2iflc6fignvip206kfsh3hh17x764jgng587v59zz2", + "version": "0.1.1", + "sha256": "05i5n3a9l087wcyvgdf638961i19d939zfv3d58h3cxhxsnyn4c4", "depends": ["MASS", "riskRegression", "survival"] }, "burnr": { "name": "burnr", "version": "0.6.1", "sha256": "0pgki4inyql8h10i78yzqm73jy2h7rdp9ywsk65virxaadpngy9c", - "depends": ["forcats", "ggplot2", "MASS", "plyr", "reshape2", "rlang", "stringr", "tidyr"] + "depends": ["MASS", "forcats", "ggplot2", "plyr", "reshape2", "rlang", "stringr", "tidyr"] }, "bursa": { "name": "bursa", @@ -45077,13 +45527,13 @@ "name": "bvartools", "version": "0.2.4", "sha256": "0klbzxqypqm5v549k56fvl67yri7bwaazf02ypsg6xyriz2a9ck4", - "depends": ["coda", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "coda"] }, "bvhar": { "name": "bvhar", "version": "2.0.1", "sha256": "1qbws3xa93ladgwfqdyk3qzmijhdam3lhdzwpbb5q5397mqkyfbp", - "depends": ["bayesplot", "BH", "dplyr", "foreach", "ggplot2", "lifecycle", "magrittr", "optimParallel", "posterior", "purrr", "Rcpp", "RcppEigen", "tibble", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "bayesplot", "dplyr", "foreach", "ggplot2", "lifecycle", "magrittr", "optimParallel", "posterior", "purrr", "tibble", "tidyr"] }, "bvls": { "name": "bvls", @@ -45113,7 +45563,7 @@ "name": "bws", "version": "0.1.0", "sha256": "11gci4z434n68agc71ab16br8yp8fd1lylgnaqz7p7w676yrygn8", - "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools"] }, "bwsTools": { "name": "bwsTools", @@ -45179,7 +45629,7 @@ "name": "cAIC4", "version": "1.0", "sha256": "1qg73g0g029wkzpmp0fgvyfz8p1k3x38yqx0404cpb3dxj4n4hcg", - "depends": ["lme4", "Matrix", "mgcv", "mvtnorm", "nlme", "RLRsim"] + "depends": ["Matrix", "RLRsim", "lme4", "mgcv", "mvtnorm", "nlme"] }, "cIRT": { "name": "cIRT", @@ -45189,9 +45639,9 @@ }, "cNORM": { "name": "cNORM", - "version": "3.0.4", - "sha256": "1qhp59hz9k2yq7rb60v9zv0bfnrfz99dk74v5fbip1wadzcbyrnp", - "depends": ["lattice", "latticeExtra", "leaps"] + "version": "3.2.0", + "sha256": "038192srvmfasa9vg5d79imh9nr3pllf2lcn5q5gwgas38c4mmli", + "depends": ["ggplot2", "leaps"] }, "cOde": { "name": "cOde", @@ -45215,13 +45665,13 @@ "name": "cSEM", "version": "0.5.0", "sha256": "0a0pv01ynlac53rdwjhw20alx72ip23izvcxv8bdkdxa41ai3bi5", - "depends": ["alabama", "cli", "crayon", "expm", "future", "future_apply", "lavaan", "lifecycle", "magrittr", "MASS", "Matrix", "matrixcalc", "matrixStats", "polycor", "progressr", "psych", "purrr", "Rdpack", "rlang", "symmoments", "TruncatedNormal"] + "depends": ["MASS", "Matrix", "Rdpack", "TruncatedNormal", "alabama", "cli", "crayon", "expm", "future", "future_apply", "lavaan", "lifecycle", "magrittr", "matrixStats", "matrixcalc", "polycor", "progressr", "psych", "purrr", "rlang", "symmoments"] }, "cTOST": { "name": "cTOST", "version": "1.0.0", "sha256": "15vynxc2zyqv0wly4paa4b2j5z0yw0qqkm2adsj9cm5x7cfv1k4p", - "depends": ["cli", "knitr", "OwenQ", "PowerTOST", "rmarkdown"] + "depends": ["OwenQ", "PowerTOST", "cli", "knitr", "rmarkdown"] }, "ca": { "name": "ca", @@ -45233,12 +45683,12 @@ "name": "caROC", "version": "0.1.5", "sha256": "0cklvzfg95yyr37hdfmrna2z6lnhf9f6rrqcjsba1wjmqs8abgsh", - "depends": ["quantreg", "RColorBrewer"] + "depends": ["RColorBrewer", "quantreg"] }, "caRamel": { "name": "caRamel", - "version": "1.3", - "sha256": "0l83z74q1as4w33vqsbybyz2vkdqgw7y56jkw0s6f36mph8fdpf9", + "version": "1.4", + "sha256": "17g1y634a02819kw19kbvifzpsacifvgw2gifjmw99vf1mijyj9h", "depends": ["geometry"] }, "caRecall": { @@ -45257,7 +45707,7 @@ "name": "cabinets", "version": "0.6.0", "sha256": "1pypn29v91zqncv5kxinfz0f633qmic7n87rf4amjrq83iiid6md", - "depends": ["cli", "crayon", "fs", "git2r", "glue", "R6", "renv", "rstudioapi", "stringr"] + "depends": ["R6", "cli", "crayon", "fs", "git2r", "glue", "renv", "rstudioapi", "stringr"] }, "cabootcrs": { "name": "cabootcrs", @@ -45341,13 +45791,13 @@ "name": "calibmsm", "version": "1.1.1", "sha256": "1yg5m2zsiw005fdihlilk43h27c7yyzlnbsb32qr9k67q010rk00", - "depends": ["boot", "dplyr", "ggExtra", "ggplot2", "ggpubr", "gridExtra", "Hmisc", "mstate", "rms", "survival", "tidyr", "VGAM"] + "depends": ["Hmisc", "VGAM", "boot", "dplyr", "ggExtra", "ggplot2", "ggpubr", "gridExtra", "mstate", "rms", "survival", "tidyr"] }, "calibrar": { "name": "calibrar", "version": "0.9.0", "sha256": "10ig891vbxc9wqpmf5pmqyz9pi7mp4nicipmwgjbsygrqkqy0m0v", - "depends": ["BB", "cmaes", "DEoptim", "dfoptim", "foreach", "GenSA", "lbfgsb3c", "minqa", "optimx", "pso", "rgenoud", "soma", "stringr"] + "depends": ["BB", "DEoptim", "GenSA", "cmaes", "dfoptim", "foreach", "lbfgsb3c", "minqa", "optimx", "pso", "rgenoud", "soma", "stringr"] }, "calibrate": { "name": "calibrate", @@ -45359,13 +45809,13 @@ "name": "calibrateBinary", "version": "0.1", "sha256": "1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb", - "depends": ["gelnet", "GPfit", "kernlab", "randtoolbox"] + "depends": ["GPfit", "gelnet", "kernlab", "randtoolbox"] }, "calibrationband": { "name": "calibrationband", "version": "0.2.1", "sha256": "1m3dp7h9dy1ipji3vinknqyhbw1gbv48473rbhpykps8hzrqg206", - "depends": ["dplyr", "ggplot2", "magrittr", "Rcpp", "rlang", "sp", "tibble", "tidyr", "tidyselect"] + "depends": ["Rcpp", "dplyr", "ggplot2", "magrittr", "rlang", "sp", "tibble", "tidyr", "tidyselect"] }, "calibrator": { "name": "calibrator", @@ -45381,15 +45831,21 @@ }, "callback": { "name": "callback", - "version": "0.1.0", - "sha256": "069dqihw5ll9n5n35vya5jqy9rc9r46g4jyw6b2dbz4s4sblimsq", + "version": "0.1.1", + "sha256": "04j00c8i14i3ic3ccdglj8fyaa9924dsgmichidk8jh2qj7c22ny", + "depends": ["ggplot2"] + }, + "callme": { + "name": "callme", + "version": "0.1.10", + "sha256": "1agyflf9ch5xyxmfdcv6shxz8h7ibp6rd3d6x1g7gk1cblvshlar", "depends": [] }, "callr": { "name": "callr", "version": "3.7.6", "sha256": "1y2ildc0ni01lkcircbr648f5knq6ch6smh5xap2xr39x1ky7g74", - "depends": ["processx", "R6"] + "depends": ["R6", "processx"] }, "callsync": { "name": "callsync", @@ -45401,13 +45857,13 @@ "name": "calmate", "version": "0.13.0", "sha256": "17gfk3am8frj9pqx31pmjswm5nvca9nqbanl0qj4ypsr8wymix7w", - "depends": ["aroma_core", "MASS", "matrixStats", "R_filesets", "R_methodsS3", "R_oo", "R_utils"] + "depends": ["MASS", "R_filesets", "R_methodsS3", "R_oo", "R_utils", "aroma_core", "matrixStats"] }, "calmr": { "name": "calmr", "version": "0.6.1", "sha256": "11hb2d9a5vzda94qb3pg440vgch2pfn8jhkw71hj6xzw8aqylhs3", - "depends": ["data_table", "future", "future_apply", "GA", "ggnetwork", "ggplot2", "network", "patchwork", "progressr", "rlang"] + "depends": ["GA", "data_table", "future", "future_apply", "ggnetwork", "ggplot2", "network", "patchwork", "progressr", "rlang"] }, "calpassapi": { "name": "calpassapi", @@ -45441,9 +45897,9 @@ }, "campsis": { "name": "campsis", - "version": "1.5.2", - "sha256": "01ylxdvl0wi313r5mj8s6xz596b7an08hslrym2y69c9qv8a62cg", - "depends": ["assertthat", "campsismod", "digest", "dplyr", "furrr", "future", "ggplot2", "MASS", "plyr", "progressr", "purrr", "rlang", "tibble", "tidyr"] + "version": "1.5.3", + "sha256": "0xjwx33y383a8ax9vwd30zsb3k7l0g95llnrgjpmmj4inrarb5a7", + "depends": ["MASS", "assertthat", "campsismod", "digest", "dplyr", "furrr", "future", "ggplot2", "plyr", "progressr", "purrr", "rlang", "tibble", "tidyr"] }, "campsismod": { "name": "campsismod", @@ -45465,8 +45921,8 @@ }, "camtrapdp": { "name": "camtrapdp", - "version": "0.2.1", - "sha256": "0nx9w5h8py8cjqynlknh8klvzy2mhacv96vybkv7hcyhpdsnmfs7", + "version": "0.3.1", + "sha256": "0aspfqjiv5xq8p7rchg4aqsnl0s7692pgq1bvgiq3i0vhlwizcd5", "depends": ["cli", "dplyr", "frictionless", "memoise", "purrr", "readr"] }, "canadamaps": { @@ -45479,7 +45935,7 @@ "name": "canadianmaps", "version": "2.0.0", "sha256": "08kf6jxvqh6kyfb639kdqpq33qlrpaz94ayknbj13hm4asgsn3w5", - "depends": ["dplyr", "ggplot2", "ggrepel", "RColorBrewer", "sf", "sp"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "ggrepel", "sf", "sp"] }, "canaper": { "name": "canaper", @@ -45521,12 +45977,12 @@ "name": "cansim", "version": "0.3.16", "sha256": "144p7zc44xb0szslsrxg1q1lhn5rizlgc0rvsinwzglnkzl478p2", - "depends": ["DBI", "digest", "dplyr", "httr", "jsonlite", "purrr", "readr", "rlang", "RSQLite", "rvest", "stringr", "tibble", "xml2"] + "depends": ["DBI", "RSQLite", "digest", "dplyr", "httr", "jsonlite", "purrr", "readr", "rlang", "rvest", "stringr", "tibble", "xml2"] }, "canvasXpress": { "name": "canvasXpress", - "version": "1.46.9-1", - "sha256": "0zb6cgpxzd9245jzabvw9x09ziihkfjc3gx1qclpqkvdbyq85qx6", + "version": "1.50.5", + "sha256": "04ibr6ksqcn7kngxy65gqx8cc2p1a5acpwg2m800csnn0x7yk05x", "depends": ["htmltools", "htmlwidgets", "httr", "jsonlite"] }, "canvasXpress_data": { @@ -45539,13 +45995,13 @@ "name": "cape", "version": "3.1.2", "sha256": "01bxyhn0kk07yx4012px6cys0csqgrsf2n5abdg22vr7ky7phqja", - "depends": ["abind", "caTools", "corpcor", "doParallel", "evd", "foreach", "here", "igraph", "Matrix", "pheatmap", "pracma", "propagate", "qtl", "qtl2", "qtl2convert", "R6", "RColorBrewer", "regress", "shape", "yaml"] + "depends": ["Matrix", "R6", "RColorBrewer", "abind", "caTools", "corpcor", "doParallel", "evd", "foreach", "here", "igraph", "pheatmap", "pracma", "propagate", "qtl", "qtl2", "qtl2convert", "regress", "shape", "yaml"] }, "caper": { "name": "caper", "version": "1.0.3", "sha256": "1f1mw54gv1r40wrrsznhgffdj8ggrwihiwdd8wyqccyvqm49fxjg", - "depends": ["ape", "MASS", "mvtnorm"] + "depends": ["MASS", "ape", "mvtnorm"] }, "capitalR": { "name": "capitalR", @@ -45569,7 +46025,7 @@ "name": "capm", "version": "0.14.0", "sha256": "0c3rnc1qd9c4v0jj8ihg6bdhpqvfnpafkqyqkar6fwnlvgw48z83", - "depends": ["circlize", "deSolve", "dplyr", "FME", "ggplot2", "magrittr", "sf", "survey", "tidyr"] + "depends": ["FME", "circlize", "deSolve", "dplyr", "ggplot2", "magrittr", "sf", "survey", "tidyr"] }, "capn": { "name": "capn", @@ -45593,7 +46049,7 @@ "name": "car", "version": "3.1-2", "sha256": "1j3l8r3j05769gdfrqz0n38xviq6pww1cjrgdd0fkj3sjy8k89l9", - "depends": ["abind", "carData", "lme4", "MASS", "mgcv", "nlme", "nnet", "pbkrtest", "quantreg", "scales"] + "depends": ["MASS", "abind", "carData", "lme4", "mgcv", "nlme", "nnet", "pbkrtest", "quantreg", "scales"] }, "carData": { "name": "carData", @@ -45605,25 +46061,25 @@ "name": "carSurv", "version": "1.0.0", "sha256": "0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j", - "depends": ["corpcor", "fdrtool", "mboost", "Rcpp", "survival"] + "depends": ["Rcpp", "corpcor", "fdrtool", "mboost", "survival"] }, "caracas": { "name": "caracas", "version": "2.1.1", "sha256": "0q967hv6hr62sqhqk8vk313g16hg75igwb7idmd8w0zsqaqvac9v", - "depends": ["doBy", "magrittr", "Matrix", "reticulate"] + "depends": ["Matrix", "doBy", "magrittr", "reticulate"] }, "carat": { "name": "carat", "version": "2.2.1", "sha256": "0h7l448b9vxmfdvi3zq3xgzprh0nrwvm1c2bg9d4yfbz92y2ndfc", - "depends": ["ggplot2", "gridExtra", "Rcpp", "RcppArmadillo", "stringr"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "gridExtra", "stringr"] }, "carbonate": { "name": "carbonate", "version": "0.1.4", "sha256": "01k8c49v8ybgcwdr9ipw319lxw4p14w9bzl54j1ljbajdzgzcgwk", - "depends": ["clipr", "details", "httpuv", "httr", "jsonlite", "magick", "R6", "RSelenium", "rtweet", "wdman", "yaml"] + "depends": ["R6", "RSelenium", "clipr", "details", "httpuv", "httr", "jsonlite", "magick", "rtweet", "wdman", "yaml"] }, "carbondate": { "name": "carbondate", @@ -45635,13 +46091,13 @@ "name": "carcass", "version": "1.7", "sha256": "09l9yk7knfjhrcpwfwmgla9ghnpg1b10aljmdl70j5kxdiafkfn7", - "depends": ["arm", "expm", "lme4", "MASS", "survival"] + "depends": ["MASS", "arm", "expm", "lme4", "survival"] }, "card": { "name": "card", "version": "0.1.0", "sha256": "1api0j06fp5av5a48vnnm1wvwdcskynf0xsj9pb41njxdh9v8daf", - "depends": ["broom", "data_table", "dplyr", "generics", "ggplot2", "ggrepel", "hardhat", "Hmisc", "lubridate", "lutz", "magrittr", "purrr", "readr", "recipes", "rlang", "sf", "stringr", "survival", "tibble", "tidyr"] + "depends": ["Hmisc", "broom", "data_table", "dplyr", "generics", "ggplot2", "ggrepel", "hardhat", "lubridate", "lutz", "magrittr", "purrr", "readr", "recipes", "rlang", "sf", "stringr", "survival", "tibble", "tidyr"] }, "cardidates": { "name": "cardidates", @@ -45657,14 +46113,14 @@ }, "cards": { "name": "cards", - "version": "0.1.0", - "sha256": "1a7khr8jzzvhb3lxb088d3akpq0jd7mjnb2y3z445mxl55wqgk2c", + "version": "0.2.1", + "sha256": "1hikcd696f6i74nlqgkfi7nip99xw25pkqxxn78c5bawmxxfq15v", "depends": ["cli", "dplyr", "glue", "rlang", "tidyr", "tidyselect"] }, "cardx": { "name": "cardx", - "version": "0.1.0", - "sha256": "1zw9l8w1jv7hs55jc7c5m2vxmsxv9lfzsvm23zwfpcks4ich26gb", + "version": "0.2.0", + "sha256": "1286hv6d1l6k0rsh996risdzbmby3z2szswvpl0vca5gb8a319ir", "depends": ["cards", "cli", "dplyr", "glue", "rlang", "tidyr"] }, "care": { @@ -45677,7 +46133,7 @@ "name": "care4cmodel", "version": "1.0.2", "sha256": "0526z49v4mxfxjlpzjnqyzc8j2lvj1aw47f3izsk1vrs193vxnvw", - "depends": ["deSolve", "dplyr", "ggplot2", "purrr", "Rdpack", "rlang", "tibble", "tidyr", "tidyselect"] + "depends": ["Rdpack", "deSolve", "dplyr", "ggplot2", "purrr", "rlang", "tibble", "tidyr", "tidyselect"] }, "careless": { "name": "careless", @@ -45695,13 +46151,13 @@ "name": "caret", "version": "6.0-94", "sha256": "1a191n9qswvf8ri6id8picqgdqx15l6mp996v6f77fv0l8yfh597", - "depends": ["e1071", "foreach", "ggplot2", "lattice", "ModelMetrics", "nlme", "plyr", "pROC", "recipes", "reshape2", "withr"] + "depends": ["ModelMetrics", "e1071", "foreach", "ggplot2", "lattice", "nlme", "pROC", "plyr", "recipes", "reshape2", "withr"] }, "caretEnsemble": { "name": "caretEnsemble", - "version": "2.0.3", - "sha256": "14d318czpqpalf18ggd9mx6f4nz3r4zilljvgxzy2a8v450y96ch", - "depends": ["caret", "data_table", "digest", "ggplot2", "gridExtra", "lattice", "pbapply", "plyr"] + "version": "4.0.0", + "sha256": "0hwgr7n2sahs3zlvrnhnk6yfmqpmphkl4xii8aa2x1yjgx3ssxwi", + "depends": ["caret", "data_table", "ggplot2", "lattice", "patchwork", "pbapply", "rlang"] }, "caretForecast": { "name": "caretForecast", @@ -45759,8 +46215,8 @@ }, "cartogramR": { "name": "cartogramR", - "version": "1.0-10", - "sha256": "1yviplg837pzlyzhalqybd3pjda6rr2947a766g4wvbpj4qf4b64", + "version": "1.1-0", + "sha256": "1zyrfxknm6acrgc7k8yanqkbznp5nq41y0gdd99b5wrhp7w01qr8", "depends": ["data_table", "sf"] }, "cartographer": { @@ -45769,17 +46225,23 @@ "sha256": "0jdnwrzxrvwcjf80dn0alhgz3713vfhwd4cs7k386x188y38l8ia", "depends": ["cli", "dplyr", "rlang", "sf"] }, + "cartographr": { + "name": "cartographr", + "version": "0.2.2", + "sha256": "0difm4rnsbjr103fhabvg4g41qwa9klpp65k2yzn25x02caypg4v", + "depends": ["cli", "crayon", "ggplot2", "osmdata", "sf", "showtext", "sysfonts"] + }, "cartography": { "name": "cartography", "version": "3.1.4", "sha256": "1sww3n7glkzrpf1ki31z8309qr5496m1rm5gj3cprwif8fxfyjx5", - "depends": ["classInt", "curl", "png", "raster", "Rcpp", "sf", "sp"] + "depends": ["Rcpp", "classInt", "curl", "png", "raster", "sf", "sp"] }, "casabourse": { "name": "casabourse", "version": "2.0.0", "sha256": "1s7zp44cmfnq4l9rzydqpnv9s2z4v7bvng8diz3bhzkg2zhpglnq", - "depends": ["gsheet", "R_utils", "RJSONIO", "rvest"] + "depends": ["RJSONIO", "R_utils", "gsheet", "rvest"] }, "cascadeSelect": { "name": "cascadeSelect", @@ -45791,7 +46253,7 @@ "name": "cascsim", "version": "0.4", "sha256": "0n6frnbby1pjpx1z9lzxflmja2mg0dy99c5f7biakpaqi82x5xjb", - "depends": ["copula", "fitdistrplus", "moments", "R2HTML", "scatterplot3d"] + "depends": ["R2HTML", "copula", "fitdistrplus", "moments", "scatterplot3d"] }, "caseMatch": { "name": "caseMatch", @@ -45801,21 +46263,21 @@ }, "casebase": { "name": "casebase", - "version": "0.10.5", - "sha256": "0i9x0z6b3s2qzdyjsaj4bafk20yhbgggljxdwhmm52b4qm7rrgzz", - "depends": ["data_table", "ggplot2", "mgcv", "survival", "VGAM"] + "version": "0.10.6", + "sha256": "0p2dixiww3l1lwbr512is6prjm606kx8y0wlq90mwfkxbzzq59d9", + "depends": ["VGAM", "data_table", "ggplot2", "mgcv", "survival"] }, "cases": { "name": "cases", "version": "0.1.1", "sha256": "16yfypaqjnl3b99a55mri2j55xaj7dixw76wbpbfa3s4y0zylwpz", - "depends": ["bindata", "boot", "copula", "corrplot", "dplyr", "extraDistr", "ggplot2", "magrittr", "Matrix", "multcomp", "mvtnorm"] + "depends": ["Matrix", "bindata", "boot", "copula", "corrplot", "dplyr", "extraDistr", "ggplot2", "magrittr", "multcomp", "mvtnorm"] }, "casino": { "name": "casino", "version": "0.1.0", "sha256": "07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka", - "depends": ["crayon", "dplyr", "ggplot2", "magrittr", "purrr", "R6", "tibble", "tidyr"] + "depends": ["R6", "crayon", "dplyr", "ggplot2", "magrittr", "purrr", "tibble", "tidyr"] }, "cassandRa": { "name": "cassandRa", @@ -45831,9 +46293,9 @@ }, "castor": { "name": "castor", - "version": "1.8.0", - "sha256": "0caw206hndfzypj33w6npvppdc5hhq1q71wriqd0ck9f238rfi3c", - "depends": ["jsonlite", "Matrix", "naturalsort", "Rcpp", "RSpectra"] + "version": "1.8.2", + "sha256": "1850i35qsxw7dkkblixnp4h5zhwg0ysx8rzns5h0kr9lwmil6biw", + "depends": ["Matrix", "RSpectra", "Rcpp", "jsonlite", "naturalsort"] }, "cat": { "name": "cat", @@ -45863,7 +46325,7 @@ "name": "catSurv", "version": "1.5.0", "sha256": "0jw7jlam7d44g9sbwmxckm4mywhky2a6h1w5w849g47p7mvi32dc", - "depends": ["BH", "jsonlite", "ltm", "plyr", "Rcpp", "RcppArmadillo", "RcppGSL", "RcppParallel"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "RcppGSL", "RcppParallel", "jsonlite", "ltm", "plyr"] }, "cata": { "name": "cata", @@ -45911,19 +46373,19 @@ "name": "catfun", "version": "0.1.4", "sha256": "1482rll333fvy4h58f15flfs7qrck3vk9bzpdn3hayhnmc7svmma", - "depends": ["broom", "cli", "DescTools", "epitools", "Hmisc", "magrittr", "rlang"] + "depends": ["DescTools", "Hmisc", "broom", "cli", "epitools", "magrittr", "rlang"] }, "cati": { "name": "cati", "version": "0.99.4", "sha256": "02g33kkp97kswiyjsd378zpa3fc9rjk2d9f4l1gdh7pzglabsmgl", - "depends": ["ade4", "ape", "e1071", "FD", "geometry", "hypervolume", "nlme", "rasterVis", "vegan"] + "depends": ["FD", "ade4", "ape", "e1071", "geometry", "hypervolume", "nlme", "rasterVis", "vegan"] }, "catlearn": { "name": "catlearn", "version": "1.0", "sha256": "1bzzzqprgyskkf1dnb5k4pqkdn5m67a3pxbnk1cnhscagcjndvy6", - "depends": ["doParallel", "dplyr", "foreach", "Rcpp", "RcppArmadillo", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "dplyr", "foreach", "tidyr"] }, "catmap": { "name": "catmap", @@ -45939,8 +46401,8 @@ }, "catregs": { "name": "catregs", - "version": "0.2.0", - "sha256": "1d5a8mwwyxx6rmm4ngjkgy787x23l9a0crhvn594vhl90r92jpbi", + "version": "0.2.1", + "sha256": "1i94pcfcda0pgvgvfgajmyjg91ia4qi8abjydh3ljywnsjc3bm3p", "depends": [] }, "cats": { @@ -45965,31 +46427,31 @@ "name": "cauchypca", "version": "1.3", "sha256": "157ydm2vizv7cwvxi7id7wws7v0h3iymgwsbvk13q4jlk8ygnnqn", - "depends": ["doParallel", "foreach", "Rfast", "Rfast2"] + "depends": ["Rfast", "Rfast2", "doParallel", "foreach"] }, "cauphy": { "name": "cauphy", "version": "1.0.2", "sha256": "1jyw6pq17fzpkp6c68cbc7y5bs1y1xhnvd49j7kkypn7ziglpm9s", - "depends": ["ape", "doParallel", "foreach", "HDInterval", "nloptr", "phylolm", "pracma", "robustbase"] + "depends": ["HDInterval", "ape", "doParallel", "foreach", "nloptr", "phylolm", "pracma", "robustbase"] }, "causact": { "name": "causact", "version": "0.5.5", "sha256": "0sf32v47n18sf3x5f08pzl7mc66g95fw6nym02vvyr6a30zv1b5b", - "depends": ["cowplot", "DiagrammeR", "dplyr", "forcats", "ggplot2", "igraph", "lifecycle", "magrittr", "purrr", "reticulate", "rlang", "rstudioapi", "stringr", "tidyr"] + "depends": ["DiagrammeR", "cowplot", "dplyr", "forcats", "ggplot2", "igraph", "lifecycle", "magrittr", "purrr", "reticulate", "rlang", "rstudioapi", "stringr", "tidyr"] }, "causal_decomp": { "name": "causal.decomp", "version": "0.1.0", "sha256": "12iy64dnb91l47vai9qawlwvg17x5amqg0kdj8npk1mgzm2zfz4j", - "depends": ["CBPS", "MASS", "nnet", "PSweight", "spelling", "SuppDists"] + "depends": ["CBPS", "MASS", "PSweight", "SuppDists", "nnet", "spelling"] }, "causalBatch": { "name": "causalBatch", "version": "1.2.0", "sha256": "0jq5a6ch12v55x8fwz6as43wb4q5nc56hqb97jcsgksvsy9cn2g3", - "depends": ["cdcsis", "dplyr", "magrittr", "MatchIt", "nnet", "sva"] + "depends": ["MatchIt", "cdcsis", "dplyr", "magrittr", "nnet", "sva"] }, "causalCmprsk": { "name": "causalCmprsk", @@ -46001,25 +46463,25 @@ "name": "causalDisco", "version": "0.9.1", "sha256": "1lni0y76prhvw60m0awwgmfadwlv1ciywlr85sr8ig2vaxf1smh9", - "depends": ["clipr", "gtools", "igraph", "pcalg", "RColorBrewer", "scales"] + "depends": ["RColorBrewer", "clipr", "gtools", "igraph", "pcalg", "scales"] }, "causalHyperGraph": { "name": "causalHyperGraph", "version": "0.1.0", "sha256": "096ggvryh580lcx4mhzsgbfifc6fqldw30a9ss6cxjvzf00prgkf", - "depends": ["cna", "DiagrammeR", "DiagrammeRsvg", "stringr", "useful"] + "depends": ["DiagrammeR", "DiagrammeRsvg", "cna", "stringr", "useful"] }, "causalOT": { "name": "causalOT", "version": "1.0.2", "sha256": "10fvmhv4g791xhrxdfhyjn02fk0b80z4n9y73l1hhc3fr4vzphz3", - "depends": ["BH", "CBPS", "ggplot2", "lbfgsb3c", "loo", "Matrix", "matrixStats", "osqp", "R6", "Rcpp", "RcppEigen", "rlang", "sandwich", "torch"] + "depends": ["BH", "CBPS", "Matrix", "R6", "Rcpp", "RcppEigen", "ggplot2", "lbfgsb3c", "loo", "matrixStats", "osqp", "rlang", "sandwich", "torch"] }, "causalPAF": { "name": "causalPAF", "version": "1.2.5", "sha256": "1hgixasanddxs9y1l45qmx5chhq0ri6npvzqwazjkk61byl2wj6c", - "depends": ["checkmate", "dagitty", "dplyr", "forestplot", "ggdag", "ggplot2", "gridExtra", "magrittr", "MASS", "reshape2", "rlist"] + "depends": ["MASS", "checkmate", "dagitty", "dplyr", "forestplot", "ggdag", "ggplot2", "gridExtra", "magrittr", "reshape2", "rlist"] }, "causalSLSE": { "name": "causalSLSE", @@ -46049,7 +46511,7 @@ "name": "causaloptim", "version": "0.9.8", "sha256": "0daghglhk4jngv242s1vdi8l1dwcp23gn47vacrs55in5mmpqraj", - "depends": ["igraph", "rcdd", "Rcpp", "shiny"] + "depends": ["Rcpp", "igraph", "rcdd", "shiny"] }, "causalsens": { "name": "causalsens", @@ -46059,9 +46521,9 @@ }, "causalweight": { "name": "causalweight", - "version": "1.1.0", - "sha256": "1i01909zfvrxyjpl1zl58s2y3b27xd1rbi3yhmzqlw9q0yxlbnn8", - "depends": ["checkmate", "e1071", "fastDummies", "glmnet", "grf", "hdm", "LARF", "mvtnorm", "np", "ranger", "SuperLearner", "xgboost"] + "version": "1.1.1", + "sha256": "0412ald8wq2fnam4bb2dc1yrx21vk2c6vbn76lf46c5apb9sw3ij", + "depends": ["LARF", "SuperLearner", "checkmate", "e1071", "fastDummies", "glmnet", "grf", "hdm", "mvtnorm", "np", "ranger", "sandwich", "xgboost"] }, "caviarpd": { "name": "caviarpd", @@ -46071,8 +46533,8 @@ }, "cba": { "name": "cba", - "version": "0.2-24", - "sha256": "0lhx813wpb544p9akaj89hmfx95ka46h6xykxly0dpf7ck00brsh", + "version": "0.2-25", + "sha256": "0a05nfmi9a1gj1r2ms310360wxdw5zgvgb9rc0awf684i5cibjy7", "depends": ["proxy"] }, "cbanalysis": { @@ -46091,7 +46553,7 @@ "name": "cbcTools", "version": "0.5.0", "sha256": "07has80n7n23y2y3shalps1hkw1r8f4fld1r48g42fdrwkhhf6jw", - "depends": ["AlgDesign", "DoE_base", "fastDummies", "ggplot2", "idefix", "logitr", "MASS", "randtoolbox", "rlang"] + "depends": ["AlgDesign", "DoE_base", "MASS", "fastDummies", "ggplot2", "idefix", "logitr", "randtoolbox", "rlang"] }, "cbinom": { "name": "cbinom", @@ -46115,7 +46577,7 @@ "name": "cbq", "version": "0.2.0.3", "sha256": "12ix60mvs4rlh3376m6qcq5zslng1925hrsz5byddfdjx5wilyv7", - "depends": ["BH", "Formula", "Rcpp", "RcppEigen", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Formula", "Rcpp", "RcppEigen", "StanHeaders", "rstan", "rstantools"] }, "cbsodataR": { "name": "cbsodataR", @@ -46133,19 +46595,19 @@ "name": "ccTensor", "version": "1.0.2", "sha256": "1r1cqx5kn12xkczpw7f8ij16csnnfy3gjf3kcgr95f070lhd1qna", - "depends": ["fields", "igraph", "MASS", "rTensor"] + "depends": ["MASS", "fields", "igraph", "rTensor"] }, "ccaPP": { "name": "ccaPP", "version": "0.3.3", "sha256": "1p08gih67950khfkzhiksa8qw2f9mrmyqiiapsjpv6zc5g0lchhk", - "depends": ["pcaPP", "Rcpp", "RcppArmadillo", "robustbase"] + "depends": ["Rcpp", "RcppArmadillo", "pcaPP", "robustbase"] }, "cccd": { "name": "cccd", "version": "1.6", "sha256": "0cxh19jqappc6zq9nz3m40ybdmsp12mf7yvflsz96wks3ly2ld4y", - "depends": ["deldir", "FNN", "igraph", "proxy"] + "depends": ["FNN", "deldir", "igraph", "proxy"] }, "cccm": { "name": "cccm", @@ -46167,8 +46629,8 @@ }, "ccdR": { "name": "ccdR", - "version": "1.0.0", - "sha256": "04g8i39p11yyrrgs3lpwj095hnyncdljyz4mxsl9pcql4hwp4v39", + "version": "1.1.0", + "sha256": "1fy6fici3f2p7v0ys2jabahd3phqpf9z0rvrydqdr19srllzspgm", "depends": ["cli", "data_table", "httr", "jsonlite", "purrr", "rlang", "stringr", "tibble", "tidyr", "urltools"] }, "ccda": { @@ -46193,7 +46655,7 @@ "name": "ccid", "version": "1.2.0", "sha256": "0cmkkllcny53dayl74wqhphjznwj7nw7hvaj1fn6mlp6338h3rp8", - "depends": ["gdata", "GeneNet", "hdbinseg", "IDetect"] + "depends": ["GeneNet", "IDetect", "gdata", "hdbinseg"] }, "cclust": { "name": "cclust", @@ -46217,7 +46679,7 @@ "name": "ccml", "version": "1.4.0", "sha256": "1njd8fi5n7zi0a7cadxqqlc7cpmqjqqp42ig6q13n8d7a542dacl", - "depends": ["ConsensusClusterPlus", "diceR", "ggplot2", "plyr", "SNFtool", "tidyr"] + "depends": ["ConsensusClusterPlus", "SNFtool", "diceR", "ggplot2", "plyr", "tidyr"] }, "ccmm": { "name": "ccmm", @@ -46235,13 +46697,13 @@ "name": "ccostr", "version": "0.1.0", "sha256": "0yfmj8v7ip595v87w9dmlzl5rih2j0lsapswh9b9vvc20wnk48ld", - "depends": ["data_table", "dplyr", "forcats", "ggplot2", "knitr", "msm", "Rdpack", "rlang", "survival", "tibble"] + "depends": ["Rdpack", "data_table", "dplyr", "forcats", "ggplot2", "knitr", "msm", "rlang", "survival", "tibble"] }, "ccpsyc": { "name": "ccpsyc", "version": "0.2.6", "sha256": "131ngns5nfkfp0wwf3hl0mhil7n040ss9ppshz4607rrk1ar9isf", - "depends": ["dplyr", "lavaan", "magrittr", "MCMCpack", "psych", "RcppAlgos", "readr", "rlang", "tibble", "tidyr", "ufs", "xlsx"] + "depends": ["MCMCpack", "RcppAlgos", "dplyr", "lavaan", "magrittr", "psych", "readr", "rlang", "tibble", "tidyr", "ufs", "xlsx"] }, "ccrs": { "name": "ccrs", @@ -46253,7 +46715,7 @@ "name": "ccrtm", "version": "0.1.6", "sha256": "1r2jmqb8wwmxr13xgzi5qfig96pclm0nmxm0glvwg0i72hvvqlbv", - "depends": ["expint", "pracma", "Rcpp", "testthat"] + "depends": ["Rcpp", "expint", "pracma", "testthat"] }, "ccss": { "name": "ccss", @@ -46265,7 +46727,7 @@ "name": "cctools", "version": "0.1.2", "sha256": "03lp9pa9qr2hi584ivvmswxmwjw1c3a6xqladpqldjhzvzpxvcwi", - "depends": ["qrng", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "qrng"] }, "cd": { "name": "cd", @@ -46283,13 +46745,13 @@ "name": "cdcatR", "version": "1.0.6", "sha256": "168gs1v1a6pcz63q3hb1dc4mlllr38j91m91phb75np8hxfz2k2v", - "depends": ["cdmTools", "cowplot", "doSNOW", "foreach", "GDINA", "ggplot2", "NPCD"] + "depends": ["GDINA", "NPCD", "cdmTools", "cowplot", "doSNOW", "foreach", "ggplot2"] }, "cdcsis": { "name": "cdcsis", - "version": "2.0.3", - "sha256": "0hv52valyig3zzywm3058c5nxb2n7y3j2vfibxdbfg8414wwapd9", - "depends": ["ks", "mvtnorm", "Rcpp"] + "version": "2.0.4", + "sha256": "0p3nlp3pqblgw753lrh4xfm3lbx8j9bqwm6gnvdibcsrszzr0zw7", + "depends": ["Rcpp", "ks", "mvtnorm"] }, "cder": { "name": "cder", @@ -46325,7 +46787,7 @@ "name": "cdmTools", "version": "1.0.5", "sha256": "0nd15lr8hdin8qnxykway70irvfi239rm4jx3ck253l7igswiz7s", - "depends": ["combinat", "doSNOW", "foreach", "fungible", "GDINA", "ggplot2", "GPArotation", "psych", "sirt"] + "depends": ["GDINA", "GPArotation", "combinat", "doSNOW", "foreach", "fungible", "ggplot2", "psych", "sirt"] }, "cdom": { "name": "cdom", @@ -46349,13 +46811,13 @@ "name": "cds", "version": "1.0.3", "sha256": "1h34k96h7ajkaqsw4dlqri63hrbnshaqwrdl74wlgycdlbvrqj05", - "depends": ["clue", "colorspace", "copula", "limSolve", "MASS"] + "depends": ["MASS", "clue", "colorspace", "copula", "limSolve"] }, "ceRtainty": { "name": "ceRtainty", "version": "1.0.0", "sha256": "01wgvjpxqwhgh6vx9vbmiv4d88bps790l6ij3gw5w69hbrrd9ixi", - "depends": ["dplyr", "RColorBrewer", "tidyr"] + "depends": ["RColorBrewer", "dplyr", "tidyr"] }, "ceas": { "name": "ceas", @@ -46367,13 +46829,13 @@ "name": "ceg", "version": "0.1.0", "sha256": "01la7kv0a3inc9vy5x010ysicfiv404bqfgs8csvqixviap9rd74", - "depends": ["graph", "Rgraphviz"] + "depends": ["Rgraphviz", "graph"] }, "celestial": { "name": "celestial", "version": "1.4.6", "sha256": "1gls0qvr8mxz79lsmk76v253f747g0cqys8p8wjmpijs8r0pyr4z", - "depends": ["NISTunits", "pracma", "RANN"] + "depends": ["NISTunits", "RANN", "pracma"] }, "cellKey": { "name": "cellKey", @@ -46397,13 +46859,13 @@ "name": "cellWise", "version": "2.5.3", "sha256": "0asimy253lxm9yf47pynhxc7sfd3v5rkvnyf1sby7s4qkz06bh49", - "depends": ["ggplot2", "gridExtra", "matrixStats", "Rcpp", "RcppArmadillo", "reshape2", "robustbase", "rrcov", "scales", "shape", "svd"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "gridExtra", "matrixStats", "reshape2", "robustbase", "rrcov", "scales", "shape", "svd"] }, "cellpypes": { "name": "cellpypes", "version": "0.3.0", "sha256": "1px7p1xly71p48w72m5fcs2krxba72slnh638wpd98a52clbgz6l", - "depends": ["cowplot", "dplyr", "ggplot2", "Matrix", "rlang", "scales", "scattermore", "scUtils", "viridis"] + "depends": ["Matrix", "cowplot", "dplyr", "ggplot2", "rlang", "scUtils", "scales", "scattermore", "viridis"] }, "cellranger": { "name": "cellranger", @@ -46421,13 +46883,13 @@ "name": "cem", "version": "1.1.31", "sha256": "1ylzsx2km9lf3x1rchwgs3nd8dzrac81f2jnd4qri35zvlilh1c6", - "depends": ["combinat", "lattice", "MatchIt", "nlme", "randomForest"] + "depends": ["MatchIt", "combinat", "lattice", "nlme", "randomForest"] }, "cemco": { "name": "cemco", "version": "0.2", "sha256": "172raa62i34d1vzsgy84h3b7mmdzvg9h657fcmgrlhlkwqzx0gyl", - "depends": ["doParallel", "foreach", "MASS", "mclust", "mvtnorm", "nnet", "rootSolve"] + "depends": ["MASS", "doParallel", "foreach", "mclust", "mvtnorm", "nnet", "rootSolve"] }, "cenGAM": { "name": "cenGAM", @@ -46439,7 +46901,7 @@ "name": "cenROC", "version": "2.0.0", "sha256": "1rgs1h32jm7ls830f62gi5wdaqx3q2h4m4qirxqmv0pi8y5y2a9v", - "depends": ["condSURV", "icenReg", "Rcpp", "RcppEigen", "survival"] + "depends": ["Rcpp", "RcppEigen", "condSURV", "icenReg", "survival"] }, "cencrne": { "name": "cencrne", @@ -46469,7 +46931,7 @@ "name": "censo2017", "version": "0.6.2", "sha256": "0rj3a9i6faqsrx641p1nacdprfnzp8q45khpdrakmfnc7l40xh87", - "depends": ["cli", "crayon", "DBI", "duckdb", "httr", "purrr", "rstudioapi", "tibble"] + "depends": ["DBI", "cli", "crayon", "duckdb", "httr", "purrr", "rstudioapi", "tibble"] }, "censobr": { "name": "censobr", @@ -46505,7 +46967,13 @@ "name": "centiserve", "version": "1.0.0", "sha256": "1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c", - "depends": ["igraph", "Matrix"] + "depends": ["Matrix", "igraph"] + }, + "centr": { + "name": "centr", + "version": "0.1.0", + "sha256": "12kf4j75q6jyyypa3cqj5pn9gn7z2nj0mp35j9dqq42qn6mwpgv7", + "depends": ["sf"] }, "centrifugeR": { "name": "centrifugeR", @@ -46611,8 +47079,8 @@ }, "cffr": { "name": "cffr", - "version": "1.0.1", - "sha256": "1h8kk2zjp5c86a2r64ad88zs1w80gc5x8dlr4a16h9w6r98zjxpd", + "version": "1.1.1", + "sha256": "1aja12kn1f6h3zydfichiq2l2qd0qd7fl794v6ypp433hh54yvxg", "depends": ["cli", "desc", "jsonlite", "jsonvalidate", "yaml"] }, "cfid": { @@ -46655,7 +47123,7 @@ "name": "cg", "version": "1.0-3", "sha256": "1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3", - "depends": ["Hmisc", "lattice", "MASS", "multcomp", "nlme", "rms", "survival", "VGAM"] + "depends": ["Hmisc", "MASS", "VGAM", "lattice", "multcomp", "nlme", "rms", "survival"] }, "cgAUC": { "name": "cgAUC", @@ -46667,7 +47135,7 @@ "name": "cgaim", "version": "1.0.1", "sha256": "1krs61rbnz7v4pncbjlil4728x5xyz5vzbyj487njbmqgymq10wl", - "depends": ["cgam", "coneproj", "doParallel", "foreach", "gratia", "limSolve", "MASS", "Matrix", "mgcv", "osqp", "quadprog", "scam", "scar", "TruncatedNormal"] + "depends": ["MASS", "Matrix", "TruncatedNormal", "cgam", "coneproj", "doParallel", "foreach", "gratia", "limSolve", "mgcv", "osqp", "quadprog", "scam", "scar"] }, "cgal4h": { "name": "cgal4h", @@ -46679,25 +47147,25 @@ "name": "cgam", "version": "1.21", "sha256": "0dsiwam9fgvri14hznnplxcjj0f8ibi8vf64wryq3pcvi41di082", - "depends": ["coneproj", "lme4", "Matrix", "statmod", "svDialogs"] + "depends": ["Matrix", "coneproj", "lme4", "statmod", "svDialogs"] }, "cglasso": { "name": "cglasso", "version": "2.0.7", "sha256": "18j50f6ghk7vjr3xfw8j1nh42l6rm8kd5c6jcvll2rjbvq5vn571", - "depends": ["igraph", "MASS"] + "depends": ["MASS", "igraph"] }, "cglm": { "name": "cglm", "version": "1.1", "sha256": "1r3wrds5lbirzzqsi12prwykxa5361jb95pq7j95nlp6y8kcb94j", - "depends": ["data_table", "nleqslv", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "nleqslv"] }, "cgmanalysis": { "name": "cgmanalysis", "version": "2.7.7", "sha256": "19kvxbg4vs7bfs3y1bfvhklwr22kba46aiwsns58g7h9b88m4kw7", - "depends": ["ggplot2", "lubridate", "parsedate", "pastecs", "pracma", "readr", "readxl", "XML", "zoo"] + "depends": ["XML", "ggplot2", "lubridate", "parsedate", "pastecs", "pracma", "readr", "readxl", "zoo"] }, "cgmquantify": { "name": "cgmquantify", @@ -46715,7 +47183,7 @@ "name": "ch", "version": "0.1.0.2", "sha256": "1ryh2xr1ix4qznq1svi4gdr4qy6v6rg597z2zl6zw32s2xq6ssx6", - "depends": ["clipr", "crayon", "ggplot2", "magrittr", "MASS", "polynom", "pracma", "Ryacas"] + "depends": ["MASS", "Ryacas", "clipr", "crayon", "ggplot2", "magrittr", "polynom", "pracma"] }, "chainbinomial": { "name": "chainbinomial", @@ -46735,12 +47203,6 @@ "sha256": "03qcqw9xx8mw7hymjl3ym6l1adgw5ssv0pmcmdv2hk230mx2fsld", "depends": ["numDeriv"] }, - "changeRangeR": { - "name": "changeRangeR", - "version": "1.1.0", - "sha256": "0y13wwz62wsh29flb7v094gb47gd6xwjq6fvmkzmlhz8x71f5g1v", - "depends": ["dplyr", "phylobase", "rangeModelMetadata", "raster", "sf", "sp"] - }, "changeS": { "name": "changeS", "version": "1.0.1", @@ -46757,7 +47219,7 @@ "name": "changepoint.geo", "version": "1.0.2", "sha256": "0zwj4wwwh99diz0vn5f06ygs93afahnn5glvab2k7wgk2qyf5jgq", - "depends": ["changepoint", "changepoint_np", "ggplot2", "Rdpack"] + "depends": ["Rdpack", "changepoint", "changepoint_np", "ggplot2"] }, "changepoint_influence": { "name": "changepoint.influence", @@ -46769,7 +47231,7 @@ "name": "changepoint.np", "version": "1.0.5", "sha256": "1kyj1z0mmbk1i71d5xxw8h3468afvwlqma659yjck3y5dszb1vn9", - "depends": ["changepoint", "Rdpack", "zoo"] + "depends": ["Rdpack", "changepoint", "zoo"] }, "changepointTests": { "name": "changepointTests", @@ -46781,13 +47243,13 @@ "name": "changepoints", "version": "1.1.0", "sha256": "1wckqnwvjl56ajz09niiyb4v61gnh1xzasdkxj8hsnfmv24y7dvk", - "depends": ["data_tree", "gglasso", "glmnet", "ks", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "data_tree", "gglasso", "glmnet", "ks"] }, "changepointsVar": { "name": "changepointsVar", "version": "0.1.1", "sha256": "0a5g0bafvb1rbw31y8b8plwhxw5svlh4qfjwvdzafbcrp3rn1cs4", - "depends": ["lars", "MASS"] + "depends": ["MASS", "lars"] }, "changer": { "name": "changer", @@ -46807,6 +47269,12 @@ "sha256": "1f83yrvc0qnxlvcpl41718vv3c26x131q285c1mgys1xwk3s97s7", "depends": ["R6", "tibble", "whisker"] }, + "charlesschwabapi": { + "name": "charlesschwabapi", + "version": "1.0.2", + "sha256": "0pmf25d6vvfyxxwh7g29iwd5di3b82vw128n15amakxfjibb8rjs", + "depends": ["anytime", "dplyr", "httr", "lubridate", "openssl", "purrr", "stringr", "tidyr"] + }, "chartql": { "name": "chartql", "version": "0.1.0", @@ -46827,14 +47295,14 @@ }, "chattr": { "name": "chattr", - "version": "0.1.0", - "sha256": "0sgaanmvnmcqn57ks7xdc3bvdzifrkqkz6bpjq8978jrpysxm2cw", + "version": "0.2.0", + "sha256": "1jvzk62h5dgshqadin3n55600yy965xgssb6akywixyik8qipscl", "depends": ["bslib", "callr", "cli", "clipr", "config", "fs", "glue", "httr2", "jsonlite", "lifecycle", "processx", "purrr", "rlang", "rstudioapi", "shiny", "yaml"] }, "cheapr": { "name": "cheapr", - "version": "0.9.2", - "sha256": "06slf0b5qv8ypmcyw6r7ip3sgx6x44bvwy0zgfwhm8kawkjxir24", + "version": "0.9.3", + "sha256": "1zf9jnwcvpw9zlh7dyrmw4wwjc3fxll0q3mkivd5q5vikmzvy0y7", "depends": ["collapse", "cpp11"] }, "cheatsheet": { @@ -46861,6 +47329,12 @@ "sha256": "0yn7casmsqcrc31b9g06sjdrwxjyw5cbg3pwwdn5s7gaal881rh1", "depends": ["glue", "htmltools", "markdown"] }, + "checked": { + "name": "checked", + "version": "0.2.0", + "sha256": "0yzg8y236w72694raz0x7ic70a0fzn9c3pl2x868rfyvq3ivsv7d", + "depends": ["R6", "callr", "cli", "igraph", "jsonlite", "rcmdcheck"] + }, "checker": { "name": "checker", "version": "0.1.3", @@ -46881,8 +47355,8 @@ }, "checkmate": { "name": "checkmate", - "version": "2.3.1", - "sha256": "1xl4313kav3fy32ff9mdlm03za1mrwlym6d5abrkf0a0r86bmrp7", + "version": "2.3.2", + "sha256": "1qw81bs3lhwr1m6wlbs0l0j669051n60x4ca2821599ddhnp6mbj", "depends": ["backports"] }, "checkpoint": { @@ -46899,15 +47373,15 @@ }, "cheddar": { "name": "cheddar", - "version": "0.1-638", - "sha256": "0y1kmm14f7fkxxyjvxiavzcy2bfflwp98yx7z98ib0v7dnn86vmx", + "version": "0.1-639", + "sha256": "0fiq03irgi1niqlc45vkqvn8dlqg6354i6f4gv70pzjn6l74a7nf", "depends": [] }, "cheem": { "name": "cheem", "version": "0.4.0.0", "sha256": "1b6gf2ax30rhpkmawvpar4cria4gkrcrzgyrvlrhcaialx40sjlz", - "depends": ["conflicted", "DT", "ggplot2", "magrittr", "plotly", "shiny", "shinycssloaders", "shinythemes", "spinifex"] + "depends": ["DT", "conflicted", "ggplot2", "magrittr", "plotly", "shiny", "shinycssloaders", "shinythemes", "spinifex"] }, "cheese": { "name": "cheese", @@ -46923,9 +47397,9 @@ }, "chem16S": { "name": "chem16S", - "version": "1.0.0", - "sha256": "0a4r1sca2fsadaz3bmkrkylbdabwjw2ja6p9s9hgkgg4k6h3vslr", - "depends": ["ggplot2", "phyloseq", "plyr", "reshape2", "rlang"] + "version": "1.1.0", + "sha256": "0jjxirnjg966rbjv1lv889xpzjlspp0a3d41f90x8hqys6bbkln7", + "depends": ["canprot", "ggplot2", "phyloseq", "plyr", "reshape2", "rlang"] }, "chemCal": { "name": "chemCal", @@ -46935,21 +47409,21 @@ }, "chemdeg": { "name": "chemdeg", - "version": "0.1.2", - "sha256": "0ipj7988bwrcz489wa5mx789aw9dij6003rbdndbl3m2r3hi9pnv", + "version": "0.1.4", + "sha256": "092d3nfkhgwy1wg5aqp6p1kd36q2s82vw6ymz0h10rqxsj84mx3f", "depends": ["MASS"] }, "chemodiv": { "name": "chemodiv", "version": "0.3.0", "sha256": "07y8wvi5vh5apvg57pd2q5rqvpxm0h3v899n12r76gwvj8z1a28s", - "depends": ["ape", "ChemmineR", "curl", "fmcsR", "ggdendro", "ggplot2", "ggraph", "gridExtra", "GUniFrac", "hillR", "httr", "igraph", "jsonlite", "rlang", "tidygraph", "tidyr", "vegan", "webchem"] + "depends": ["ChemmineR", "GUniFrac", "ape", "curl", "fmcsR", "ggdendro", "ggplot2", "ggraph", "gridExtra", "hillR", "httr", "igraph", "jsonlite", "rlang", "tidygraph", "tidyr", "vegan", "webchem"] }, "chemometrics": { "name": "chemometrics", "version": "1.4.4", "sha256": "10d8g8sgck6v2cgkv988yiawv9vrziyqsrhagmkzf7rjpqgdn3px", - "depends": ["class", "e1071", "lars", "MASS", "mclust", "nnet", "pcaPP", "pls", "robustbase", "rpart", "som"] + "depends": ["MASS", "class", "e1071", "lars", "mclust", "nnet", "pcaPP", "pls", "robustbase", "rpart", "som"] }, "cherry": { "name": "cherry", @@ -46979,7 +47453,7 @@ "name": "chest", "version": "0.3.7", "sha256": "0905xl1vqn8icvf44vydhd00wvz5cdnl2igr7m0jmrsv564zdj5a", - "depends": ["broom", "dplyr", "forestplot", "ggplot2", "MASS", "survival", "tibble"] + "depends": ["MASS", "broom", "dplyr", "forestplot", "ggplot2", "survival", "tibble"] }, "chevron": { "name": "chevron", @@ -46997,7 +47471,7 @@ "name": "chicane", "version": "0.1.8", "sha256": "0963r5jzyjihidh18ny9nqkim00bys3psdgrxhbah43bbl0kx43r", - "depends": ["bedr", "data_table", "doParallel", "foreach", "gamlss", "gamlss_tr", "iterators", "knitr", "MASS", "rmarkdown"] + "depends": ["MASS", "bedr", "data_table", "doParallel", "foreach", "gamlss", "gamlss_tr", "iterators", "knitr", "rmarkdown"] }, "childdevdata": { "name": "childdevdata", @@ -47009,19 +47483,19 @@ "name": "childesr", "version": "0.2.3", "sha256": "1a58s0zph4mfmh9sdfbv7yaa20lx5gi0mca0ikzarfwxjl5knp39", - "depends": ["DBI", "dbplyr", "dplyr", "jsonlite", "magrittr", "purrr", "RMySQL"] + "depends": ["DBI", "RMySQL", "dbplyr", "dplyr", "jsonlite", "magrittr", "purrr"] }, "childfree": { "name": "childfree", - "version": "0.0.1", - "sha256": "0p1b1bi6shkg2lzl0q07al80sc5gw3yrz3cj8sp5rfpnrfa12ard", + "version": "0.0.2", + "sha256": "1hss91cls38zj4dibcr9whjlmbs4w2b7xfpgfqkkd6xa6xmcxd6v", "depends": ["rio"] }, "childsds": { "name": "childsds", "version": "0.8.0", "sha256": "1vv02kbw17b8zva2yc1qgi750z9yhyfv5xbig29dhyzvj8k00yvb", - "depends": ["boot", "class", "dplyr", "gamlss", "gamlss_dist", "magrittr", "purrr", "purrrlyr", "reshape2", "tibble", "tidyr", "VGAM"] + "depends": ["VGAM", "boot", "class", "dplyr", "gamlss", "gamlss_dist", "magrittr", "purrr", "purrrlyr", "reshape2", "tibble", "tidyr"] }, "chilemapas": { "name": "chilemapas", @@ -47033,19 +47507,19 @@ "name": "chillR", "version": "0.75", "sha256": "0b8r8s7vqgpb6jjbqaf24yig2adagfl6rnnppx15mdhz8bmjc5aq", - "depends": ["assertthat", "dplyr", "ecmwfr", "fields", "GenSA", "ggplot2", "httr", "jsonlite", "Kendall", "lubridate", "magrittr", "metR", "patchwork", "pls", "plyr", "progress", "purrr", "R_utils", "raster", "Rcpp", "RCurl", "readxl", "reshape2", "rlang", "RMAWGEN", "scales", "stringr", "tidyr", "XML"] + "depends": ["GenSA", "Kendall", "RCurl", "RMAWGEN", "R_utils", "Rcpp", "XML", "assertthat", "dplyr", "ecmwfr", "fields", "ggplot2", "httr", "jsonlite", "lubridate", "magrittr", "metR", "patchwork", "pls", "plyr", "progress", "purrr", "raster", "readxl", "reshape2", "rlang", "scales", "stringr", "tidyr"] }, "chinese_misc": { "name": "chinese.misc", "version": "0.2.3", "sha256": "0hlna52g00nh3908wgpb9ldgghff3gfjx24vmk5gikkazdqk9zrh", - "depends": ["jiebaR", "Matrix", "NLP", "purrr", "slam", "stringi", "tm"] + "depends": ["Matrix", "NLP", "jiebaR", "purrr", "slam", "stringi", "tm"] }, "chipPCR": { "name": "chipPCR", "version": "1.0-2", "sha256": "0q30ncnvbipvqbpxrx2yb68i2ybdfl1fbzj3f12dd2wmjjl72q1x", - "depends": ["lmtest", "MASS", "outliers", "ptw", "quantreg", "Rfit", "robustbase", "shiny", "signal"] + "depends": ["MASS", "Rfit", "lmtest", "outliers", "ptw", "quantreg", "robustbase", "shiny", "signal"] }, "chirps": { "name": "chirps", @@ -47061,21 +47535,21 @@ }, "chisquare": { "name": "chisquare", - "version": "0.9", - "sha256": "11pypv6nmqqwrjvrzakn8x4ap0jw23dk3ij4i2kxx340j0gqk8qh", + "version": "1.0", + "sha256": "1vjhsi520p9m46xay9dh0la5ypyhi19gyg5i568d2ywka4g2ssac", "depends": ["gt"] }, "chk": { "name": "chk", - "version": "0.9.1", - "sha256": "19q5ylkgrkdmnzg2df1lnrp2arbfzwfz4rbrr16j9ih2237kvd7r", + "version": "0.9.2", + "sha256": "0f6ilq9pbb6mgvclp6ksbaw8353wf114p1xqhlmkwgsfh2bg63xg", "depends": ["lifecycle", "rlang"] }, "chkptstanr": { "name": "chkptstanr", "version": "0.1.1", "sha256": "0p0pzpzyg3sw4gnvzdx34f96yxidpykq49v5xlhnrsnpjzajjfs3", - "depends": ["abind", "brms", "Rdpack", "rstan"] + "depends": ["Rdpack", "abind", "brms", "rstan"] }, "chlorpromazineR": { "name": "chlorpromazineR", @@ -47087,7 +47561,7 @@ "name": "chngpt", "version": "2023.11-29", "sha256": "1zz0wgard6a1y36r78pfp5gqfjm12xlvh5cmdq3297m4d7jvrn34", - "depends": ["boot", "kyotil", "lme4", "MASS", "RhpcBLASctl", "survival"] + "depends": ["MASS", "RhpcBLASctl", "boot", "kyotil", "lme4", "survival"] }, "choiceDes": { "name": "choiceDes", @@ -47099,7 +47573,7 @@ "name": "cholera", "version": "0.8.0", "sha256": "0qfy7xqkihn8jfxnhg0l5y0mii52lbfwmg663bqsjapylqc9bjcd", - "depends": ["deldir", "elevatr", "geosphere", "ggplot2", "HistData", "igraph", "KernSmooth", "pracma", "RColorBrewer", "sp", "tanaka", "terra", "threejs", "TSP", "viridisLite"] + "depends": ["HistData", "KernSmooth", "RColorBrewer", "TSP", "deldir", "elevatr", "geosphere", "ggplot2", "igraph", "pracma", "sp", "tanaka", "terra", "threejs", "viridisLite"] }, "choosepc": { "name": "choosepc", @@ -47129,7 +47603,7 @@ "name": "choroplethr", "version": "3.7.3", "sha256": "053zs3bxr38izdkm1mhwqnrg7j5mb1dwjdx0dvsbv9l3nrb39par", - "depends": ["acs", "dplyr", "ggmap", "ggplot2", "gridExtra", "Hmisc", "R6", "RgoogleMaps", "rvest", "stringr", "tidycensus", "tidyr", "tigris", "WDI", "xml2"] + "depends": ["Hmisc", "R6", "RgoogleMaps", "WDI", "acs", "dplyr", "ggmap", "ggplot2", "gridExtra", "rvest", "stringr", "tidycensus", "tidyr", "tigris", "xml2"] }, "choroplethrAdmin1": { "name": "choroplethrAdmin1", @@ -47147,7 +47621,7 @@ "name": "chouca", "version": "0.1.99", "sha256": "1gnilv8ww106mz5wnry826gysgsaq7mvd83ms0j5jhkkqmsqy2dd", - "depends": ["digest", "plyr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "digest", "plyr"] }, "christmas": { "name": "christmas", @@ -47177,7 +47651,7 @@ "name": "chromote", "version": "0.2.0", "sha256": "0x888796760gglxqzd0i5mqim3j878dkyip64m26irprl9ksyxm3", - "depends": ["curl", "fastmap", "jsonlite", "later", "magrittr", "processx", "promises", "R6", "rlang", "websocket"] + "depends": ["R6", "curl", "fastmap", "jsonlite", "later", "magrittr", "processx", "promises", "rlang", "websocket"] }, "chromseq": { "name": "chromseq", @@ -47195,7 +47669,7 @@ "name": "chronicle", "version": "0.3", "sha256": "0yfrxr93fbxgpxjs1gb56pdx1kk4nn9xvy2csgl1rhzrgbl343m3", - "depends": ["data_table", "dplyr", "DT", "dygraphs", "ggplot2", "glue", "knitr", "magrittr", "plotly", "prettydoc", "purrr", "readr", "rlang", "rmarkdown", "rmdformats", "scales", "skimr", "viridis", "zoo"] + "depends": ["DT", "data_table", "dplyr", "dygraphs", "ggplot2", "glue", "knitr", "magrittr", "plotly", "prettydoc", "purrr", "readr", "rlang", "rmarkdown", "rmdformats", "scales", "skimr", "viridis", "zoo"] }, "chronicler": { "name": "chronicler", @@ -47225,7 +47699,7 @@ "name": "chunked", "version": "0.6.0", "sha256": "1j16am4nzwy2ckisksl5mk8h05ala6lpdd5qrb1gwyrhli4lx45a", - "depends": ["DBI", "dplyr", "LaF", "progress", "rlang"] + "depends": ["DBI", "LaF", "dplyr", "progress", "rlang"] }, "chunkhooks": { "name": "chunkhooks", @@ -47249,7 +47723,7 @@ "name": "ciTools", "version": "0.6.1", "sha256": "0d6aq4wcxi1q59g4kfx49x1li41rfwx2z2v4xzz2xkldn6h1794z", - "depends": ["arm", "boot", "dplyr", "lme4", "MASS", "survival"] + "depends": ["MASS", "arm", "boot", "dplyr", "lme4", "survival"] }, "ciccr": { "name": "ciccr", @@ -47261,7 +47735,7 @@ "name": "cicerone", "version": "1.0.4", "sha256": "1z3i720970kmczg01wxwbyqwd9zby69lchw3pgqwpn2bjr66jimh", - "depends": ["assertthat", "R6", "shiny"] + "depends": ["R6", "assertthat", "shiny"] }, "cif": { "name": "cif", @@ -47273,13 +47747,13 @@ "name": "cifti", "version": "0.4.5", "sha256": "092334lcpkzv52bg53hzx64dnrwq67f3p9fzwchmafx1l46xrqx9", - "depends": ["gifti", "oro_nifti", "R_utils", "xml2"] + "depends": ["R_utils", "gifti", "oro_nifti", "xml2"] }, "ciftiTools": { "name": "ciftiTools", - "version": "0.14.0", - "sha256": "0any2442p9jmlzmhh5blclp7w07ff1m266sbjqx5yjw92hvxc311", - "depends": ["fields", "gifti", "oro_nifti", "RColorBrewer", "rgl", "RNifti", "viridisLite", "xml2"] + "version": "0.15.1", + "sha256": "0wf2yqpdccriww942lyic13rsxylx4zcl670gyd81d41lj0xf5rc", + "depends": ["RColorBrewer", "RNifti", "fields", "gifti", "oro_nifti", "rgl", "viridisLite", "xml2"] }, "cimir": { "name": "cimir", @@ -47291,7 +47765,7 @@ "name": "cinaR", "version": "0.2.3", "sha256": "0kdf3xbhg7yhpr67fqbbwqm16fvv3dj9f7bvfqliy3xhpxpg23qi", - "depends": ["ChIPseeker", "DESeq2", "dplyr", "edgeR", "fgsea", "GenomicRanges", "ggplot2", "ggrepel", "limma", "pheatmap", "preprocessCore", "RColorBrewer", "sva", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "writexl"] + "depends": ["ChIPseeker", "DESeq2", "GenomicRanges", "RColorBrewer", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "dplyr", "edgeR", "fgsea", "ggplot2", "ggrepel", "limma", "pheatmap", "preprocessCore", "sva", "writexl"] }, "cinaRgenesets": { "name": "cinaRgenesets", @@ -47323,11 +47797,17 @@ "sha256": "1j4zaivkxkd3kv7cgy17xwn4mrwx7mhhxf48ziz4bk5z0zykrb5w", "depends": ["ggplot2", "withr"] }, + "circhelp": { + "name": "circhelp", + "version": "1.1", + "sha256": "1w8m4dawq6hd9pjgmqydhf4c3f7gllzlwmxmbxirg61psk38x4wk", + "depends": ["MASS", "data_table", "gamlss", "ggplot2", "mathjaxr", "patchwork"] + }, "circle": { "name": "circle", - "version": "0.7.2", - "sha256": "0nn14ky8df8ra03sh9ds7lkcksf9lysc1981dh19pca7iqbdydkx", - "depends": ["cli", "httr", "jsonlite"] + "version": "0.7.3", + "sha256": "1179gh3psicj5pcaqdhn4cfvj9dwwflwk0jz3lwd9yvgmbhcp2zs", + "depends": ["cli", "gh", "httr", "jsonlite"] }, "circlesplot": { "name": "circlesplot", @@ -47345,7 +47825,7 @@ "name": "circlize", "version": "0.4.16", "sha256": "0rqbcmmp4h1jjl0y59bzn6k8kywjdqwvp0ajkqxd21j9f33k5p0n", - "depends": ["colorspace", "GlobalOptions", "shape"] + "depends": ["GlobalOptions", "colorspace", "shape"] }, "circular": { "name": "circular", @@ -47357,18 +47837,18 @@ "name": "circularEV", "version": "0.1.1", "sha256": "0g499mn8knkfspk3wdgn8r9v4hpr6gy8wjwf0zrgf0j05xap6g7a", - "depends": ["circular", "doParallel", "foreach", "ggplot2", "mgcv", "NPCirc"] + "depends": ["NPCirc", "circular", "doParallel", "foreach", "ggplot2", "mgcv"] }, "circumplex": { "name": "circumplex", "version": "0.3.10", "sha256": "1g0r004c7y51mcv7iiymgzhdy9v8y9bk814bzaam4d8fxp7qzqlr", - "depends": ["assertthat", "boot", "dplyr", "ggforce", "ggplot2", "htmlTable", "magrittr", "purrr", "Rcpp", "RcppArmadillo", "rlang", "scales", "tibble", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "assertthat", "boot", "dplyr", "ggforce", "ggplot2", "htmlTable", "magrittr", "purrr", "rlang", "scales", "tibble", "tidyr"] }, "cit": { "name": "cit", - "version": "2.3.1", - "sha256": "1i1179d0rjnmrlwh031dxmvwp2w6k1c9fj5g3cfmzjk4xxb2bjha", + "version": "2.3.2", + "sha256": "0dipl9d96f59zdc5bpw5xpls78mm614ljz95k898q35qzsz8g5lf", "depends": [] }, "citation": { @@ -47381,7 +47861,7 @@ "name": "citationchaser", "version": "0.0.4", "sha256": "11ilh8fpqvljzriwwkzmw5idxff82spyv4b36lsl1s0lfbgjis69", - "depends": ["data_table", "dplyr", "httr", "jsonlite", "maditr", "MESS", "networkD3", "scales", "tibble"] + "depends": ["MESS", "data_table", "dplyr", "httr", "jsonlite", "maditr", "networkD3", "scales", "tibble"] }, "citecorp": { "name": "citecorp", @@ -47411,19 +47891,25 @@ "name": "citrus", "version": "1.0.2", "sha256": "1pzzyppqfh3qvc1xi2947lnshv7z2c21r8fribhc1avj76j26q5y", - "depends": ["clustMixType", "dplyr", "GGally", "ggplot2", "RColorBrewer", "rlang", "rpart", "rpart_plot", "stringr", "tibble", "treeClust"] + "depends": ["GGally", "RColorBrewer", "clustMixType", "dplyr", "ggplot2", "rlang", "rpart", "rpart_plot", "stringr", "tibble", "treeClust"] }, "ciu": { "name": "ciu", "version": "0.6.0", "sha256": "0pqs8ivbybbrjar978bl05awgaks33nqfm7l9z68iv2sj4a9hv21", - "depends": ["crayon", "ggplot2", "Rcpp"] + "depends": ["Rcpp", "crayon", "ggplot2"] + }, + "ciuupi": { + "name": "ciuupi", + "version": "1.2.3", + "sha256": "0nxci8x9v78l4plcd6p1b827xjd40ncda9cqqhawfm059z8j73n8", + "depends": ["functional", "nloptr", "pracma", "statmod"] }, "ciuupi2": { "name": "ciuupi2", "version": "1.0.1", "sha256": "04x02qmqqyrc4h4z4mpl4zn5vr9y28k6j6n30fbr9q238zd543db", - "depends": ["functional", "nloptr", "pracma", "PreciseSums", "statmod"] + "depends": ["PreciseSums", "functional", "nloptr", "pracma", "statmod"] }, "civ": { "name": "civ", @@ -47441,31 +47927,31 @@ "name": "ciw", "version": "0.0.2", "sha256": "1znn3prdyw3jdamjk3d7b4f0z4bj1i5d08zl8vp9qzdmf46msnh1", - "depends": ["curl", "data_table", "XML"] + "depends": ["XML", "curl", "data_table"] }, "cjar": { "name": "cjar", "version": "0.1.2", "sha256": "0rq9ryhp2h3p927227chzwbjn7x22h9ckkha2kclhx0jh7swf5y7", - "depends": ["assertthat", "dplyr", "glue", "httr", "jose", "jsonlite", "lubridate", "magrittr", "memoise", "openssl", "progress", "purrr", "R6", "rlang", "stringr", "tibble", "tidyr", "vctrs"] + "depends": ["R6", "assertthat", "dplyr", "glue", "httr", "jose", "jsonlite", "lubridate", "magrittr", "memoise", "openssl", "progress", "purrr", "rlang", "stringr", "tibble", "tidyr", "vctrs"] }, "cjbart": { "name": "cjbart", "version": "0.3.2", "sha256": "1d6jg6m86i2vx1yq66flj22x061s2x8rxsasqnn688kaaqrya657", - "depends": ["BART", "ggplot2", "randomForestSRC", "Rdpack", "rlang", "tidyr"] + "depends": ["BART", "Rdpack", "ggplot2", "randomForestSRC", "rlang", "tidyr"] }, "cjoint": { "name": "cjoint", "version": "2.1.1", "sha256": "1byahl2x3mdz66cicyjbi5qrcbq9xqcyyny5rzxkg5m5nfgxprqk", - "depends": ["DT", "ggplot2", "lmtest", "Matrix", "sandwich", "shiny", "shinyjs", "survey"] + "depends": ["DT", "Matrix", "ggplot2", "lmtest", "sandwich", "shiny", "shinyjs", "survey"] }, "ckanr": { "name": "ckanr", "version": "0.7.0", "sha256": "10bxlvx70wik3rih5ms8jb9nb111qca4ydz8rj2raywm8bd3rpcj", - "depends": ["crul", "DBI", "dbplyr", "dplyr", "jsonlite", "magrittr"] + "depends": ["DBI", "crul", "dbplyr", "dplyr", "jsonlite", "magrittr"] }, "clValid": { "name": "clValid", @@ -47485,10 +47971,16 @@ "sha256": "16yq457a2c8d47szimad7rx0q31h0g7iirmb75xxjicvkxqprmaz", "depends": ["rintcal"] }, + "clap": { + "name": "clap", + "version": "0.1.0", + "sha256": "1mc2aqvf4l4dp39if2m60vn01nww3pikpsmw2m42iw5rzzxgswpq", + "depends": ["FNN", "dplyr", "mclust", "rlang"] + }, "clarabel": { "name": "clarabel", - "version": "0.5.1", - "sha256": "12kds0pwvs2wrv23pjs6bbh49gymak7as46qjz65is4ssd12fbs8", + "version": "0.9.0", + "sha256": "1g66y8s4v7qzm92dhnsmng28sm4lf6wggb4kc6arvp75z0i315jh", "depends": [] }, "clarifai": { @@ -47519,19 +48011,19 @@ "name": "classGraph", "version": "0.7-6", "sha256": "10nyrs5xh70ajhi1q6pvx4s5lkl2r46ddxanhiyn9vv9swr2hzsw", - "depends": ["graph", "Rgraphviz"] + "depends": ["Rgraphviz", "graph"] }, "classInt": { "name": "classInt", "version": "0.4-10", "sha256": "12rbwh7g0a6abvy423xjiv53gx1f9lg4y78r80lc0fj9pjpiwmn3", - "depends": ["class", "e1071", "KernSmooth"] + "depends": ["KernSmooth", "class", "e1071"] }, "classifierplots": { "name": "classifierplots", "version": "1.4.0", "sha256": "0agxm3vrbs8lqhk1xvfc3wzf0q0hxhgyp23j5qi5mi1drgnw1jj1", - "depends": ["caret", "data_table", "ggplot2", "gridExtra", "png", "Rcpp", "ROCR"] + "depends": ["ROCR", "Rcpp", "caret", "data_table", "ggplot2", "gridExtra", "png"] }, "classifly": { "name": "classifly", @@ -47585,7 +48077,7 @@ "name": "cleanTS", "version": "0.1.2", "sha256": "04k84989a0jvdd015yrd6wqnfk19yq0a4qpdnm3l0137h7s2xq8k", - "depends": ["data_table", "gganimate", "ggplot2", "ggtext", "glue", "imputeTestbench", "imputeTS", "lubridate", "shiny", "stringr", "tibble", "transformr"] + "depends": ["data_table", "gganimate", "ggplot2", "ggtext", "glue", "imputeTS", "imputeTestbench", "lubridate", "shiny", "stringr", "tibble", "transformr"] }, "cleancall": { "name": "cleancall", @@ -47599,6 +48091,12 @@ "sha256": "1lm7k25j16p888xvd7rzzd3sb3namzjlpjn22xmmpzlzyl0h7dhk", "depends": [] }, + "cleanepi": { + "name": "cleanepi", + "version": "1.0.2", + "sha256": "10vpdynil63gnx9rdzzdcaprn6639qgc415wg615izykz7c0g42l", + "depends": ["arsenal", "checkmate", "dplyr", "janitor", "linelist", "lubridate", "magrittr", "matchmaker", "numberize", "readr", "rlang", "snakecase", "withr"] + }, "cleaner": { "name": "cleaner", "version": "1.5.4", @@ -47627,7 +48125,7 @@ "name": "clespr", "version": "1.1.2", "sha256": "1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g", - "depends": ["AER", "clordr", "doParallel", "foreach", "magic", "MASS", "pbivnorm", "survival"] + "depends": ["AER", "MASS", "clordr", "doParallel", "foreach", "magic", "pbivnorm", "survival"] }, "clevr": { "name": "clevr", @@ -47639,19 +48137,19 @@ "name": "clhs", "version": "0.9.0", "sha256": "04hd0p51j15294fv1a9qx61p5yfmh8hcx784v3x1s0kx7km34saz", - "depends": ["cluster", "ggplot2", "plyr", "raster", "Rcpp", "RcppArmadillo", "reshape2", "sf", "sp"] + "depends": ["Rcpp", "RcppArmadillo", "cluster", "ggplot2", "plyr", "raster", "reshape2", "sf", "sp"] }, "cli": { "name": "cli", - "version": "3.6.2", - "sha256": "0lg131q9l8wpnggc3jlrjl1ri3dw0d1pi4nr1zlnlaqvf7ilj1sc", + "version": "3.6.3", + "sha256": "0ha8mijnzlz1cxsjk502j2gzspd8fnk3j79bvnqm871225ghi5a2", "depends": [] }, "cliapp": { "name": "cliapp", "version": "0.1.2", "sha256": "0yaahalirm89s5snhqpz11s36fp5ri5af9w6ljqlvfd94y6ckvfb", - "depends": ["cli", "crayon", "fansi", "glue", "prettycode", "progress", "R6", "selectr", "withr", "xml2"] + "depends": ["R6", "cli", "crayon", "fansi", "glue", "prettycode", "progress", "selectr", "withr", "xml2"] }, "clickR": { "name": "clickR", @@ -47669,18 +48167,18 @@ "name": "clickb", "version": "0.1", "sha256": "0cbhwvxb7xa34wf10saq65wiwlmw1cgnbiqgv6mfyd8dcdv25rwg", - "depends": ["DiscreteWeibull", "mclust", "MCMCpack"] + "depends": ["DiscreteWeibull", "MCMCpack", "mclust"] }, "clickstream": { "name": "clickstream", "version": "1.3.3", "sha256": "1pbw74kd1ig6xc9llv8idizx0rya2454kpd9z62ybwvy68vyargs", - "depends": ["arules", "ClickClust", "data_table", "ggplot2", "igraph", "linprog", "MASS", "plyr", "reshape2", "Rsolnp"] + "depends": ["ClickClust", "MASS", "Rsolnp", "arules", "data_table", "ggplot2", "igraph", "linprog", "plyr", "reshape2"] }, "clidamonger": { "name": "clidamonger", - "version": "1.1.0", - "sha256": "1kpfldyadrk7ayg9kjbs1kswdvzsy3qb5qr5mqrprx7mm8plsz6s", + "version": "1.2.0", + "sha256": "1rcfa6d3vfx6bbjjggrqfz10lppql7hjiy06jsrgybw2j0x73hmk", "depends": [] }, "clidatajp": { @@ -47699,13 +48197,13 @@ "name": "clifford", "version": "1.0-8", "sha256": "0gi4jajng1v0a45dl5qv8v279bm4lzfbkdsqp0bd1vil2ns1934j", - "depends": ["BH", "disordR", "magrittr", "mathjaxr", "partitions", "Rcpp"] + "depends": ["BH", "Rcpp", "disordR", "magrittr", "mathjaxr", "partitions"] }, "clifro": { "name": "clifro", "version": "3.2-5", "sha256": "1p2xy5r9axkj8yk6ywaq0w5i00bdfm15drjz227nx8p4vd3q6si8", - "depends": ["ggplot2", "httr", "lubridate", "magrittr", "RColorBrewer", "reshape2", "rvest", "scales", "stringr", "xml2"] + "depends": ["RColorBrewer", "ggplot2", "httr", "lubridate", "magrittr", "reshape2", "rvest", "scales", "stringr", "xml2"] }, "clikcorr": { "name": "clikcorr", @@ -47715,9 +48213,9 @@ }, "climaemet": { "name": "climaemet", - "version": "1.2.1", - "sha256": "1h3j8w6m568swa6qkfg107wvfdfg816p92y8ayss6acrrmrvax89", - "depends": ["dplyr", "ggplot2", "httr", "jsonlite", "rappdirs", "readr", "rlang", "tibble", "tidyr"] + "version": "1.3.0", + "sha256": "1ccf7639zk56m60cqd6z8h4s6nsvhv76d8ndbk832d9lak13b7wb", + "depends": ["cli", "dplyr", "ggplot2", "httr2", "jsonlite", "rappdirs", "readr", "rlang", "tibble", "tidyr"] }, "climateStability": { "name": "climateStability", @@ -47759,18 +48257,18 @@ "name": "climwin", "version": "1.2.3", "sha256": "1r2x5941k8l9z3517389y120sfhrskdpchc0pkibznza8aa95r85", - "depends": ["evd", "ggplot2", "gridExtra", "lme4", "lubridate", "Matrix", "MuMIn", "nlme", "numDeriv", "RcppRoll", "reshape"] + "depends": ["Matrix", "MuMIn", "RcppRoll", "evd", "ggplot2", "gridExtra", "lme4", "lubridate", "nlme", "numDeriv", "reshape"] }, "clinDR": { "name": "clinDR", "version": "2.4.1", "sha256": "06q8ajfa0gj8ddr6vb456vra4id7la50aidx3j2bnyaysbavd108", - "depends": ["doParallel", "DoseFinding", "dplyr", "foreach", "ggplot2", "glue", "mvtnorm", "purrr", "rstan", "shiny", "tibble", "tidyr", "waiter"] + "depends": ["DoseFinding", "doParallel", "dplyr", "foreach", "ggplot2", "glue", "mvtnorm", "purrr", "rstan", "shiny", "tibble", "tidyr", "waiter"] }, "clinDataReview": { "name": "clinDataReview", - "version": "1.6.0", - "sha256": "1xfv7r7rbr8fjkhrwxbpnvbf4khwcvd5pyam9fbbp6b65zr752c2", + "version": "1.6.1", + "sha256": "146cibny0w7g75cvzrdnd5i2fx6bilp93wqfrjgzap17h97lhj1r", "depends": ["base64enc", "bookdown", "clinUtils", "crosstalk", "data_table", "ggplot2", "haven", "htmltools", "htmlwidgets", "jsonlite", "jsonvalidate", "knitr", "plotly", "plyr", "rmarkdown", "stringr", "xfun", "xml2", "yaml"] }, "clinPK": { @@ -47783,7 +48281,7 @@ "name": "clinUtils", "version": "0.2.0", "sha256": "1i8bbfj9hbhjq7ppr3s3wxmnlis0j9xapdz88x44gcsmvxmr57dr", - "depends": ["crosstalk", "data_table", "DT", "haven", "htmlwidgets", "knitr", "plyr", "viridisLite"] + "depends": ["DT", "crosstalk", "data_table", "haven", "htmlwidgets", "knitr", "plyr", "viridisLite"] }, "clinfun": { "name": "clinfun", @@ -47791,6 +48289,12 @@ "sha256": "0dsbgj29s7c9pv6p2j3nvksnckym0gyb8hwqvks53mvy2pg9j1ni", "depends": ["mvtnorm"] }, + "clinicalomicsdbR": { + "name": "clinicalomicsdbR", + "version": "1.0.5", + "sha256": "1al919bdvmxfs8kxgi4hxwgsc9gjml6d00b7h813jhc4fi7ncq3p", + "depends": ["R6", "dplyr", "httr2", "jsonlite"] + }, "clinicalsignificance": { "name": "clinicalsignificance", "version": "2.0.0", @@ -47819,7 +48323,7 @@ "name": "clintools", "version": "0.9.10.1", "sha256": "0f8y1l3mqij6y87xf07gq7r2frigswcff5p3v119l6rldmkhp4fl", - "depends": ["dplyr", "ggplot2", "irr", "lme4", "nlme", "pander", "parameters", "pROC", "scales", "signal", "stringi", "survival", "xml2"] + "depends": ["dplyr", "ggplot2", "irr", "lme4", "nlme", "pROC", "pander", "parameters", "scales", "signal", "stringi", "survival", "xml2"] }, "cliot": { "name": "cliot", @@ -47849,12 +48353,12 @@ "name": "clmplus", "version": "1.0.0", "sha256": "024w8a4qj9sr0vqpfv5sm5gmcy4crin90sfx0z1y13iiznk7kvch", - "depends": ["ChainLadder", "forecast", "ggplot2", "gridExtra", "reshape2", "StMoMo"] + "depends": ["ChainLadder", "StMoMo", "forecast", "ggplot2", "gridExtra", "reshape2"] }, "clock": { "name": "clock", - "version": "0.7.0", - "sha256": "0x58xhngpd2rj7da9gr1x1zwz4rliza7aakfadkqsc4c7wxpmral", + "version": "0.7.1", + "sha256": "1n7hl5mbywfshk8jid5shnsqsn1al0v636wsy14f681zkp1jyba3", "depends": ["cli", "cpp11", "lifecycle", "rlang", "tzdb", "vctrs"] }, "clockify": { @@ -47885,13 +48389,19 @@ "name": "cloneRate", "version": "0.2.3", "sha256": "0ii1jbwk60dvqqrxr4z06xnajyf73ywhb06i42szcs6mjm1jxwsa", - "depends": ["ape", "BH", "Rcpp", "RcppEigen", "RcppParallel", "Rmpfr", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "Rmpfr", "StanHeaders", "ape", "rstan", "rstantools"] }, "clordr": { "name": "clordr", "version": "1.7.0", "sha256": "0lrws22aijsfdr595g2dfxsvnvbq6bs18glbdc07qkb27kcpvv1p", - "depends": ["doParallel", "foreach", "MASS", "pbivnorm", "rootSolve", "tmvmixnorm"] + "depends": ["MASS", "doParallel", "foreach", "pbivnorm", "rootSolve", "tmvmixnorm"] + }, + "closeloop": { + "name": "closeloop", + "version": "0.1.0", + "sha256": "1imwd16im4wvnha24gk453xrqq0bhhhbnn21pimfq0v02lj0248w", + "depends": ["combinat"] }, "cloudUtil": { "name": "cloudUtil", @@ -47921,7 +48431,7 @@ "name": "cloudstoR", "version": "0.2.0", "sha256": "0x9pl9x5sjs5vwcz5i1r5ymyv3rlv9adjc5y9kvxljdxgvnv6i08", - "depends": ["cli", "curl", "getPass", "httr", "keyring", "rio", "XML"] + "depends": ["XML", "cli", "curl", "getPass", "httr", "keyring", "rio"] }, "clptheory": { "name": "clptheory", @@ -47935,6 +48445,12 @@ "sha256": "088ks9lrhlyvg3yvlfmb0091yp6qp5bzg9h5r6ryv3bk6y56sajx", "depends": ["dplyr", "lubridate", "magrittr"] }, + "clrng": { + "name": "clrng", + "version": "0.0.5", + "sha256": "18brzhpivgzmvvjqkbkmrzw52ylz3d9l02l88020rb18pgr78clp", + "depends": ["RViennaCL", "Rcpp", "RcppEigen", "gpuR"] + }, "clttools": { "name": "clttools", "version": "1.3", @@ -47943,15 +48459,15 @@ }, "clubSandwich": { "name": "clubSandwich", - "version": "0.5.10", - "sha256": "0qx4qq0k01q06hrs348n417pf338dyfbcy2vsi0y3ap6y1rb7w6s", - "depends": ["sandwich"] + "version": "0.5.11", + "sha256": "1y9iy86w2440y22279is7vgi9m9v876p5954nhq5lg9ghpzbwzdq", + "depends": ["lifecycle", "sandwich"] }, "clubpro": { "name": "clubpro", "version": "0.6.2", "sha256": "0p407zd2gr4yxxpa97c37yxrvdkid00qf1ird58yl44wrwszh90w", - "depends": ["lattice", "Rcpp", "RcppArmadillo", "RcppProgress"] + "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "lattice"] }, "clue": { "name": "clue", @@ -47999,7 +48515,7 @@ "name": "clustAnalytics", "version": "0.5.5", "sha256": "063n6s1q2kc7a42fajd2z0rd0v6dxs443hv1vlaq6xhli8l8cylk", - "depends": ["aricode", "boot", "dplyr", "fossil", "igraph", "mcclust", "mclust", "Rcpp", "Rdpack", "truncnorm"] + "depends": ["Rcpp", "Rdpack", "aricode", "boot", "dplyr", "fossil", "igraph", "mcclust", "mclust", "truncnorm"] }, "clustEff": { "name": "clustEff", @@ -48011,19 +48527,19 @@ "name": "clustMD", "version": "1.2.1", "sha256": "0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny", - "depends": ["ggplot2", "MASS", "mclust", "msm", "mvtnorm", "reshape2", "truncnorm", "viridis"] + "depends": ["MASS", "ggplot2", "mclust", "msm", "mvtnorm", "reshape2", "truncnorm", "viridis"] }, "clustMixType": { "name": "clustMixType", - "version": "0.3-14", - "sha256": "0i3wlnwa075rlwgv5b2kzgnswv6r7hha7biq84jqsa61hhysjxxw", - "depends": ["combinat", "dplyr", "RColorBrewer", "rlang", "tibble"] + "version": "0.4-2", + "sha256": "1clby7x9jz0jpzmzni6g8zicysnf7ccxliglxr6ljigvkf747bg1", + "depends": ["RColorBrewer", "combinat", "dplyr", "rlang", "tibble"] }, "clustNet": { "name": "clustNet", "version": "1.2.0", "sha256": "05yphmjjkc42k945b8qhdrlws5bzr3f0wbancyibn8xh5697wqsx", - "depends": ["BiDAG", "clue", "graph", "igraph", "pcalg", "RBGL"] + "depends": ["BiDAG", "RBGL", "clue", "graph", "igraph", "pcalg"] }, "cluster": { "name": "cluster", @@ -48041,7 +48557,7 @@ "name": "clusterCons", "version": "1.2", "sha256": "1k1y6cqpb5fyi2mbx2i4jbiwz0fni44lnq0xnv3pl0x3dpscwh6q", - "depends": ["apcluster", "cluster", "lattice", "RColorBrewer"] + "depends": ["RColorBrewer", "apcluster", "cluster", "lattice"] }, "clusterCrit": { "name": "clusterCrit", @@ -48059,13 +48575,13 @@ "name": "clusterHD", "version": "1.0.2", "sha256": "16mk0bgvahxpjfawxkpjlfh9j1n5dldl6lhi7d1ssf5zaha35jkm", - "depends": ["Ckmeans_1d_dp", "cluster", "mclust", "Rcpp", "RcppArmadillo"] + "depends": ["Ckmeans_1d_dp", "Rcpp", "RcppArmadillo", "cluster", "mclust"] }, "clusterMI": { "name": "clusterMI", - "version": "1.1.1", - "sha256": "0zrwan1myq2lw15ga0xfxkwszq09bp25qj8dn9z9zrmb9s3lfsj7", - "depends": ["cat", "cluster", "ClusterR", "diceR", "e1071", "FactoMineR", "fpc", "glmnet", "knockoff", "lattice", "mclust", "mice", "micemd", "mix", "NPBayesImputeCat", "Rcpp", "RcppArmadillo", "reshape2", "Rfast", "usedist", "withr"] + "version": "1.2.1", + "sha256": "0irc1fcsvwkyv1g9zyjk9l6hmr1mj78rlndkd2ggg44r22mc1p0m", + "depends": ["ClusterR", "FactoMineR", "NPBayesImputeCat", "Rcpp", "RcppArmadillo", "Rfast", "cat", "diceR", "e1071", "fpc", "ggplot2", "glmnet", "gridExtra", "knockoff", "mclust", "mice", "micemd", "mix", "reshape2", "withr"] }, "clusterRepro": { "name": "clusterRepro", @@ -48077,13 +48593,13 @@ "name": "clusterSEs", "version": "2.6.5", "sha256": "0d8b79mg0wxfpmx3xq22p9apa2cs2ylbml7lf37w386s6kdgz7ns", - "depends": ["AER", "dfidx", "Formula", "lmtest", "mlogit", "plm", "sandwich"] + "depends": ["AER", "Formula", "dfidx", "lmtest", "mlogit", "plm", "sandwich"] }, "clusterSim": { "name": "clusterSim", - "version": "0.51-3", - "sha256": "0wlsr9700f3j9wcjzpiaqwj09i5v8n9bvwxvj4vmq1sqvz97v681", - "depends": ["ade4", "cluster", "e1071", "MASS", "R2HTML"] + "version": "0.51-4", + "sha256": "1bvjhbwxxn7mxdspjyly36d258p8js9l1zxsm15kj7nplj4pnkkn", + "depends": ["MASS", "ade4", "cluster", "e1071"] }, "clusterability": { "name": "clusterability", @@ -48091,12 +48607,6 @@ "sha256": "15gimcs6wrasafg1ys7id0mkg9fvacxbwpgg9d4b5avk4gff39bs", "depends": ["diptest"] }, - "clusteredinterference": { - "name": "clusteredinterference", - "version": "1.0.1", - "sha256": "01w7i9pmvwmrlf5q6y2d48ib0bm16j16xiw4pqnrvbndx4d6wf6n", - "depends": ["cubature", "Formula", "lme4", "numDeriv", "rootSolve"] - }, "clusterhap": { "name": "clusterhap", "version": "0.1", @@ -48113,19 +48623,19 @@ "name": "clustermole", "version": "1.1.1", "sha256": "1wfnv93b5rrdpad64gc3sv919yis92xa03ja29lsvcmkiqpbjsq9", - "depends": ["dplyr", "GSEABase", "GSVA", "magrittr", "rlang", "singscore", "tibble", "tidyr"] + "depends": ["GSEABase", "GSVA", "dplyr", "magrittr", "rlang", "singscore", "tibble", "tidyr"] }, "clustermq": { "name": "clustermq", "version": "0.9.4", "sha256": "1wrbkimckskldb77cyicqklrhyzp5d58hjgnzp2gwj73cysiw5zx", - "depends": ["globals", "narray", "progress", "R6", "Rcpp"] + "depends": ["R6", "Rcpp", "globals", "narray", "progress"] }, "clusternomics": { "name": "clusternomics", "version": "0.1.1", "sha256": "05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b", - "depends": ["magrittr", "MASS", "plyr"] + "depends": ["MASS", "magrittr", "plyr"] }, "clustertend": { "name": "clustertend", @@ -48143,13 +48653,13 @@ "name": "clustra", "version": "0.2.1", "sha256": "115rf9n5cc07yprminw3hh25zlmrv9v0jv63s29mx43iq28wvbnw", - "depends": ["data_table", "mgcv", "MixSim"] + "depends": ["MixSim", "data_table", "mgcv"] }, "clustrd": { "name": "clustrd", "version": "1.4.0", "sha256": "1pgl5yb37nsm0b1iniy7hadcxcbhlp5xwg77av74f568qp1pgx2c", - "depends": ["ca", "cluster", "corpcor", "dplyr", "fpc", "GGally", "ggplot2", "ggrepel", "plyr", "rARPACK", "tibble"] + "depends": ["GGally", "ca", "cluster", "corpcor", "dplyr", "fpc", "ggplot2", "ggrepel", "plyr", "rARPACK", "tibble"] }, "clustree": { "name": "clustree", @@ -48167,7 +48677,7 @@ "name": "clustvarsel", "version": "2.3.4", "sha256": "0hzvfcjs1k13j695jx6m0fgmcxy284gp4d59b7zmnvqib153x89x", - "depends": ["BMA", "foreach", "iterators", "Matrix", "mclust"] + "depends": ["BMA", "Matrix", "foreach", "iterators", "mclust"] }, "clv": { "name": "clv", @@ -48179,13 +48689,13 @@ "name": "cmR", "version": "1.1", "sha256": "1wism1czh94wfjgb1p4y0bvkb2ljkmkr4qkandbdjlgn013kjgv0", - "depends": ["fields", "Matrix", "plotrix"] + "depends": ["Matrix", "fields", "plotrix"] }, "cmaRs": { "name": "cmaRs", "version": "0.1.3", "sha256": "028z0x6a6aq3n0kplqg4pwqa7xilpi4s919xrqvd2lqnabhbjy8l", - "depends": ["AUC", "earth", "Matrix", "MPV", "Rmosek", "ROCR", "Ryacas0", "stringr"] + "depends": ["AUC", "MPV", "Matrix", "ROCR", "Rmosek", "Ryacas0", "earth", "stringr"] }, "cmaes": { "name": "cmaes", @@ -48197,7 +48707,7 @@ "name": "cmaesr", "version": "1.0.3", "sha256": "03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9", - "depends": ["BBmisc", "checkmate", "ggplot2", "ParamHelpers", "smoof"] + "depends": ["BBmisc", "ParamHelpers", "checkmate", "ggplot2", "smoof"] }, "cmahalanobis": { "name": "cmahalanobis", @@ -48227,13 +48737,13 @@ "name": "cmdfun", "version": "1.0.2", "sha256": "1pbcq7hi2lcmqnghmy3q2fsk0c9fy5m0637acyzmc096fxbx723j", - "depends": ["magrittr", "purrr", "R_utils", "rlang", "testthat", "usethis"] + "depends": ["R_utils", "magrittr", "purrr", "rlang", "testthat", "usethis"] }, "cmenet": { "name": "cmenet", "version": "0.1.2", "sha256": "0v3fassl21wdyx7s4shsib936fr41qr9hxjgcjc2f8az0ljd1p70", - "depends": ["glmnet", "hierNet", "MASS", "Rcpp", "RcppArmadillo", "sparsenet"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "glmnet", "hierNet", "sparsenet"] }, "cmfrec": { "name": "cmfrec", @@ -48243,8 +48753,8 @@ }, "cmhc": { "name": "cmhc", - "version": "0.2.7", - "sha256": "1iy7qslr1an5q1dpdx02p9734ghnmwql1cf5jcnl2a8cjhcgyxxn", + "version": "0.2.8", + "sha256": "1rjwc58f43iv3ri7z42z3gzfxcpkrzbd20r07rm6m14d7d5wqw0w", "depends": ["aws_s3", "digest", "dplyr", "httr", "readr", "rlang", "stringr", "tibble"] }, "cml": { @@ -48263,7 +48773,7 @@ "name": "cmmr", "version": "0.1.2", "sha256": "0nik1pzd1rckalvn7xh6s699kkdjnra3q3bn5x16c1lmpz5bp2s4", - "depends": ["httr", "progress", "RJSONIO"] + "depends": ["RJSONIO", "httr", "progress"] }, "cmna": { "name": "cmna", @@ -48317,31 +48827,31 @@ "name": "cmsaf", "version": "3.5.1", "sha256": "1h4h30k72nclpi8siha050kp8i0va2r1kvwhh3nczb3lhx11zmwl", - "depends": ["cmsafops", "cmsafvis", "colorspace", "colourpicker", "data_table", "FNN", "maps", "ncdf4", "R_utils", "raster", "SearchTrees", "shiny", "shinyFiles", "shinyjs", "shinythemes", "shinyWidgets", "xml2"] + "depends": ["FNN", "R_utils", "SearchTrees", "cmsafops", "cmsafvis", "colorspace", "colourpicker", "data_table", "maps", "ncdf4", "raster", "shiny", "shinyFiles", "shinyWidgets", "shinyjs", "shinythemes", "xml2"] }, "cmsafops": { "name": "cmsafops", "version": "1.4.0", "sha256": "118msgfysvbg08nvzrx5nmffvszn1cfx91lzd2hkd6la8sivk10h", - "depends": ["assertthat", "fields", "FNN", "ncdf4", "progress", "rainfarmr", "raster", "SearchTrees", "trend"] + "depends": ["FNN", "SearchTrees", "assertthat", "fields", "ncdf4", "progress", "rainfarmr", "raster", "trend"] }, "cmsafvis": { "name": "cmsafvis", - "version": "1.2.7", - "sha256": "18mdzvm0sxsr9fqrpd65kld8mnpjlmi0z6mn6dfgdbbx0qs85rgl", - "depends": ["assertthat", "cmsafops", "colorspace", "countrycode", "fields", "gridExtra", "mapproj", "maps", "ncdf4", "png", "progress", "raster", "rasterVis", "RColorBrewer", "sf", "terra"] + "version": "1.2.8", + "sha256": "1l1gsbadwgvxvbv37kzsnns4xvhzpmhfrqnzcgd97l7fqwr3yng4", + "depends": ["RColorBrewer", "assertthat", "cmsafops", "colorspace", "countrycode", "fields", "gridExtra", "mapproj", "maps", "ncdf4", "png", "progress", "raster", "rasterVis", "sf", "sp"] }, "cmstatr": { "name": "cmstatr", "version": "0.9.3", "sha256": "1hi3zyw73jxrl2spfbbfk5xnyg31jqlslz1342p5s45k4ydvqikm", - "depends": ["dplyr", "generics", "ggplot2", "kSamples", "MASS", "purrr", "rlang", "tibble"] + "depends": ["MASS", "dplyr", "generics", "ggplot2", "kSamples", "purrr", "rlang", "tibble"] }, "cmstatrExt": { "name": "cmstatrExt", "version": "0.4.0", "sha256": "06py81q7viz2mh58qn16wvw9xw95vw06cg465qhdrh80j07mygzg", - "depends": ["dplyr", "generics", "Rcpp", "rlang", "testthat"] + "depends": ["Rcpp", "dplyr", "generics", "rlang", "testthat"] }, "cmtest": { "name": "cmtest", @@ -48357,15 +48867,15 @@ }, "cna": { "name": "cna", - "version": "3.6.0", - "sha256": "1g0h4c8xba7i0fv5azdhx0c403w9ccs3hyarsr2qxnw64f05yazh", - "depends": ["car", "Matrix", "matrixStats", "Rcpp"] + "version": "3.6.2", + "sha256": "1jjq77a2zzzkzv6sgl7274c8chznwc59cv8gnph3xya2ysmybspq", + "depends": ["Matrix", "Rcpp", "car", "matrixStats"] }, "cnaOpt": { "name": "cnaOpt", "version": "0.5.2", "sha256": "1ciqh0d88270hizlsks7d05kggaszzl6add2n143z7cswkgfvkyr", - "depends": ["cna", "dplyr", "ggplot2", "matrixStats", "Rcpp"] + "depends": ["Rcpp", "cna", "dplyr", "ggplot2", "matrixStats"] }, "cnbdistr": { "name": "cnbdistr", @@ -48401,13 +48911,13 @@ "name": "coala", "version": "0.7.2", "sha256": "1y736gagr1nkyxvsgkn411si6xv6w4sp8m7p20za07y4m71z900i", - "depends": ["assertthat", "digest", "R6", "Rcpp", "RcppArmadillo", "rehh", "scrm"] + "depends": ["R6", "Rcpp", "RcppArmadillo", "assertthat", "digest", "rehh", "scrm"] }, "coalescentMCMC": { "name": "coalescentMCMC", "version": "0.4-4", "sha256": "09abhcp6y98378kf018inhxpkkirch5636nskywn0p6shp2q278x", - "depends": ["ape", "coda", "lattice", "Matrix", "phangorn"] + "depends": ["Matrix", "ape", "coda", "lattice", "phangorn"] }, "coarseDataTools": { "name": "coarseDataTools", @@ -48437,25 +48947,31 @@ "name": "cobs", "version": "1.3-8", "sha256": "08cqpiylbfy5j5xxajpngqaycmmciwhyf3sk3972x2l6rg3lj81c", - "depends": ["quantreg", "SparseM"] + "depends": ["SparseM", "quantreg"] }, "coca": { "name": "coca", "version": "1.1.0", "sha256": "1lh7q3ip1jaz5zj5zcnd5whwpjw6zcrxs6j0j8mnmjsnw2kr4m5n", - "depends": ["caret", "cluster", "fpc", "glmnet", "Matrix", "nnet", "pheatmap", "RColorBrewer", "sparcl"] + "depends": ["Matrix", "RColorBrewer", "caret", "cluster", "fpc", "glmnet", "nnet", "pheatmap", "sparcl"] }, "cocktailApp": { "name": "cocktailApp", "version": "0.2.3", "sha256": "134y64z297r6fqiakqa42f15i5sxlaczc9adxrkicq9275kjf2fn", - "depends": ["dplyr", "DT", "forcats", "ggplot2", "ggtern", "magrittr", "shiny", "shinythemes", "tibble", "tidyr"] + "depends": ["DT", "dplyr", "forcats", "ggplot2", "ggtern", "magrittr", "shiny", "shinythemes", "tibble", "tidyr"] }, "coconots": { "name": "coconots", "version": "1.1.3", "sha256": "1mymq7rsmawnh6m3m7c39kg8mp829f7kyjnj3hll4jsw6q1sz2fi", - "depends": ["forecast", "ggplot2", "HMMpa", "JuliaConnectoR", "matrixStats", "numDeriv", "Rcpp", "RcppParallel", "StanHeaders"] + "depends": ["HMMpa", "JuliaConnectoR", "Rcpp", "RcppParallel", "StanHeaders", "forecast", "ggplot2", "matrixStats", "numDeriv"] + }, + "cocons": { + "name": "cocons", + "version": "0.1.1", + "sha256": "1kcnbhvh42v5rgm730j8qy3xz5bwq265dvj2690p1b2add10v4ml", + "depends": ["BH", "Rcpp", "fields", "knitr", "optimParallel", "spam"] }, "cocor": { "name": "cocor", @@ -48501,21 +49017,21 @@ }, "coda4microbiome": { "name": "coda4microbiome", - "version": "0.2.3", - "sha256": "1nr2xq7pal90dnc76y9hj3qfy5anxjihrlb8sfxnvx5pz590m2wb", - "depends": ["circlize", "ComplexHeatmap", "corrplot", "ggplot2", "ggpubr", "glmnet", "plyr", "pROC", "survival", "survminer"] + "version": "0.2.4", + "sha256": "1gslvlhnps5ibrcgm6b487ii9z4blk92mnp26z4xb7m23l7349c1", + "depends": ["ComplexHeatmap", "circlize", "corrplot", "ggplot2", "ggpubr", "glmnet", "pROC", "plyr", "survival", "survminer"] }, "codacore": { "name": "codacore", "version": "0.0.4", "sha256": "047klw705a4x0b93xvwd6839j30gg9jl1dgwdnkcqjiwn9jx8fb3", - "depends": ["gtools", "keras", "pROC", "R6", "tensorflow"] + "depends": ["R6", "gtools", "keras", "pROC", "tensorflow"] }, "codalm": { "name": "codalm", "version": "0.1.2", "sha256": "09q7i96wga55xl8wwkb4i2sisn97wd21zqpmasykpi1aamzysqki", - "depends": ["future", "future_apply", "SQUAREM"] + "depends": ["SQUAREM", "future", "future_apply"] }, "codaredistlm": { "name": "codaredistlm", @@ -48617,7 +49133,7 @@ "name": "codingMatrices", "version": "0.4.0", "sha256": "0554jbwy2hzdqy4vf4y26jniw8pp8j7a7ybq9s7120zfkxihccag", - "depends": ["fractional", "Matrix"] + "depends": ["Matrix", "fractional"] }, "codyn": { "name": "codyn", @@ -48657,9 +49173,9 @@ }, "cofad": { "name": "cofad", - "version": "0.1.1", - "sha256": "0c27wfdk98mq0531avlgfxf2wmxcjyg39pgl9i37im7ri2s7kpnr", - "depends": [] + "version": "0.3.0", + "sha256": "00m32r1rbc5f2b7viks68ff3sv7p4qvc1i8qag0z75l2jxi839f0", + "depends": ["Hmisc", "dplyr", "magrittr", "readr", "rhandsontable", "rlang", "shiny", "shinydashboard", "shinyjs", "stringr", "tibble"] }, "cofeatureR": { "name": "cofeatureR", @@ -48683,7 +49199,7 @@ "name": "coga", "version": "1.2.2", "sha256": "0h4qps0k973ia2aw19smlh84p34nnwdrfgk9nm4pgcs3qx3pn102", - "depends": ["cubature", "Rcpp", "RcppGSL"] + "depends": ["Rcpp", "RcppGSL", "cubature"] }, "coglasso": { "name": "coglasso", @@ -48695,7 +49211,7 @@ "name": "cogmapr", "version": "0.9.3", "sha256": "0aqlk6248m3pad0fwarvxvxfn4qfazhdbdplg8haw3aj165szq43", - "depends": ["dplyr", "ggplot2", "graph", "magrittr", "Rgraphviz", "tidyr"] + "depends": ["Rgraphviz", "dplyr", "ggplot2", "graph", "magrittr", "tidyr"] }, "cognitoR": { "name": "cognitoR", @@ -48707,7 +49223,7 @@ "name": "cohortBuilder", "version": "0.2.0", "sha256": "117gdqga61h24xa1h534837pz34ym5hnfz6731rrm3lnlzd171w6", - "depends": ["dplyr", "formatR", "ggplot2", "glue", "jsonlite", "magrittr", "purrr", "R6", "rlang", "tibble", "tidyr"] + "depends": ["R6", "dplyr", "formatR", "ggplot2", "glue", "jsonlite", "magrittr", "purrr", "rlang", "tibble", "tidyr"] }, "cohorts": { "name": "cohorts", @@ -48719,7 +49235,7 @@ "name": "cohorttools", "version": "0.1.6", "sha256": "17gz4887vhkk0qr5mcv0vcfaxiws1pk1fdd4y8wqbl57ikn5i9vs", - "depends": ["cmprsk", "DiagrammeR", "DiagrammeRsvg", "Epi", "ggplot2", "mgcv", "rsvg", "survival"] + "depends": ["DiagrammeR", "DiagrammeRsvg", "Epi", "cmprsk", "ggplot2", "mgcv", "rsvg", "survival"] }, "coil": { "name": "coil", @@ -48743,7 +49259,7 @@ "name": "cointReg", "version": "0.2.0", "sha256": "0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4", - "depends": ["checkmate", "MASS", "matrixStats"] + "depends": ["MASS", "checkmate", "matrixStats"] }, "cointmonitoR": { "name": "cointmonitoR", @@ -48755,7 +49271,7 @@ "name": "cold", "version": "2.0-3", "sha256": "1y2l1v7s1v3m4nhlnl72n075h53vm93vxmfn4b6269n690wl9s6d", - "depends": ["cubature", "MASS"] + "depends": ["MASS", "cubature"] }, "colf": { "name": "colf", @@ -48771,8 +49287,8 @@ }, "collapse": { "name": "collapse", - "version": "2.0.14", - "sha256": "0njmis9a0jc8xmdxgxhpydsj2ygb89hg402gpqaw1h5bcwwpf0m8", + "version": "2.0.15", + "sha256": "19pa35yhdkas3kyrj4g3p794lckmrmhgy6gcqfqkcbqzzqiq6b2s", "depends": ["Rcpp"] }, "collapsibleTree": { @@ -48799,6 +49315,12 @@ "sha256": "003zlp5s2ilq3pq0imlp7p46jkfihwzg1hkkgk7378ikcbwnz17z", "depends": [] }, + "collegeScorecard": { + "name": "collegeScorecard", + "version": "0.1.0", + "sha256": "06v8r8ldlx1n4wp5mhzizh92pyysj7zjvcn6vrh5n4w28f719i8q", + "depends": [] + }, "collidr": { "name": "collidr", "version": "0.1.3", @@ -48809,7 +49331,7 @@ "name": "collin", "version": "0.0.4", "sha256": "0dh3k9rh1ykrd5nvp5nh4q7zvv835hx8ydpyml88d90ksy8za90p", - "depends": ["dlnm", "MASS", "mgcv", "nlme", "VGAM"] + "depends": ["MASS", "VGAM", "dlnm", "mgcv", "nlme"] }, "collinear": { "name": "collinear", @@ -48905,7 +49427,7 @@ "name": "colorednoise", "version": "1.1.2", "sha256": "1wyqliwy64hxbhhij8m5f9s4ranjpqc3qzlkr9m37c9z70lgjril", - "depends": ["data_table", "purrr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "purrr"] }, "colorfindr": { "name": "colorfindr", @@ -48935,13 +49457,13 @@ "name": "colormap", "version": "0.1.4", "sha256": "0032ji9n8pivl70jppq989fgg781wil8zag7pfl1hs9xrpin8asy", - "depends": ["ggplot2", "stringr", "V8"] + "depends": ["V8", "ggplot2", "stringr"] }, "colorpatch": { "name": "colorpatch", "version": "0.1.2", "sha256": "18p9hgccp37pbdf437xffkv6z500896v08fsw2jm8zcl9ladygaf", - "depends": ["colorspace", "ggplot2", "gridExtra", "TSP"] + "depends": ["TSP", "colorspace", "ggplot2", "gridExtra"] }, "colorplane": { "name": "colorplane", @@ -48959,7 +49481,7 @@ "name": "colors3d", "version": "1.0.1", "sha256": "0d78y5v329fhaqhw0a0cgkpiajmqb91vl9809fiwnvl2b4x3j51r", - "depends": ["combinat", "FNN", "plyr", "scales"] + "depends": ["FNN", "combinat", "plyr", "scales"] }, "colorsGen": { "name": "colorsGen", @@ -48975,8 +49497,8 @@ }, "colorspace": { "name": "colorspace", - "version": "2.1-0", - "sha256": "0k31hazd2rq5lyg3y89y2v5jqadz2qlxd1bhvj89q4aldfxql1q4", + "version": "2.1-1", + "sha256": "02ydb0vncck0l9shfbz07gymdy5l2vinb0miivyb1r6nykjww8g7", "depends": [] }, "colouR": { @@ -48989,7 +49511,7 @@ "name": "colourlovers", "version": "0.3.6", "sha256": "13fqn6hbqjk3d8krpqb3hmsq06qrbks8a9ia5441hd6m7m8wjjkc", - "depends": ["httr", "jsonlite", "png", "XML"] + "depends": ["XML", "httr", "jsonlite", "png"] }, "colourpicker": { "name": "colourpicker", @@ -49013,7 +49535,7 @@ "name": "cols", "version": "1.1", "sha256": "1rf27b1xqxqyd99574hj1nv65r08z5ap8rai64baw1skzr5aznkk", - "depends": ["quadprog", "Rfast2"] + "depends": ["Rfast2", "quadprog"] }, "cols4all": { "name": "cols4all", @@ -49043,7 +49565,7 @@ "name": "comato", "version": "1.1", "sha256": "0lidwr5vw10655p7q0iqzq3phq5y1i86w3bjdv87cwx3m6333bz6", - "depends": ["cluster", "clusterSim", "gdata", "igraph", "lattice", "Matrix", "XML"] + "depends": ["Matrix", "XML", "cluster", "clusterSim", "gdata", "igraph", "lattice"] }, "combat_enigma": { "name": "combat.enigma", @@ -49055,7 +49577,7 @@ "name": "combinIT", "version": "2.0.0", "sha256": "1l2ypnrm2qi1z10c2qyyaqqcjgk3mgsh80b3j9zrjwq9zdakrhi5", - "depends": ["mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "mvtnorm"] }, "combinat": { "name": "combinat", @@ -49091,7 +49613,7 @@ "name": "combiter", "version": "1.0.3", "sha256": "11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6", - "depends": ["iterators", "itertools", "Rcpp"] + "depends": ["Rcpp", "iterators", "itertools"] }, "comclim": { "name": "comclim", @@ -49109,13 +49631,13 @@ "name": "cometr", "version": "0.4.0", "sha256": "022fz7b94xl56ss1773n3g9zwfjm8mqfqds68ngvfq5498npd9z5", - "depends": ["callr", "digest", "httr", "jsonlite", "R_utils", "R6", "yaml"] + "depends": ["R6", "R_utils", "callr", "digest", "httr", "jsonlite", "yaml"] }, "comets": { "name": "comets", - "version": "0.0-1", - "sha256": "1qxy0cdp8cjkwlgii00lq5qzcimlrb8fqlg2xrw8rn6ik1nrmhs0", - "depends": ["Formula", "glmnet", "ranger"] + "version": "0.0-2", + "sha256": "13ni4c0szfizgad56ydxz8i5w25vr76h18jspc260z2mzcns084z", + "depends": ["Formula", "coin", "glmnet", "ranger", "survival"] }, "comf": { "name": "comf", @@ -49151,18 +49673,18 @@ "name": "communication", "version": "0.1", "sha256": "08fkllwwcw2llpg5ivxhqghc88qfg1vdy0ciif3xazhhymb8wavb", - "depends": ["abind", "diagram", "GGally", "ggplot2", "gtable", "gtools", "igraph", "magrittr", "plyr", "purrr", "RColorBrewer", "Rcpp", "RcppArmadillo", "reshape2", "scales", "signal", "tuneR", "useful", "wrassp"] + "depends": ["GGally", "RColorBrewer", "Rcpp", "RcppArmadillo", "abind", "diagram", "ggplot2", "gtable", "gtools", "igraph", "magrittr", "plyr", "purrr", "reshape2", "scales", "signal", "tuneR", "useful", "wrassp"] }, "comorbidPGS": { "name": "comorbidPGS", "version": "0.3.4", "sha256": "1dy8yfyy88vw2x8mk6n3nx2dbkf17m4ibvbkxhrywralvll0wspa", - "depends": ["ggplot2", "MASS", "nnet"] + "depends": ["MASS", "ggplot2", "nnet"] }, "comorbidity": { "name": "comorbidity", - "version": "1.0.7", - "sha256": "189z23a66mz10rzqzgljkygyrgishm4mzzrqhqs1ba335dzvzm3d", + "version": "1.1.0", + "sha256": "1j86631kyh774hs6a4ivmhkbj6kc733vy0pn1sa86yh0s6iqbmdb", "depends": ["checkmate", "data_table", "stringi"] }, "comorosmaps": { @@ -49181,7 +49703,7 @@ "name": "comparator", "version": "0.1.2", "sha256": "1mygip50mc3jni1zc6jhjg2mx61sjgdq5w7snqdvv1rycp3fdpb1", - "depends": ["clue", "proxy", "Rcpp"] + "depends": ["Rcpp", "clue", "proxy"] }, "compare": { "name": "compare", @@ -49205,13 +49727,13 @@ "name": "compareGroups", "version": "4.8.0", "sha256": "0v747rxg864gml937zizp80sf15jw2v4svcafdysna62shp4rypv", - "depends": ["chron", "flextable", "HardyWeinberg", "kableExtra", "knitr", "officer", "rmarkdown", "survival", "writexl"] + "depends": ["HardyWeinberg", "chron", "flextable", "kableExtra", "knitr", "officer", "rmarkdown", "survival", "writexl"] }, "compareMCMCs": { "name": "compareMCMCs", "version": "0.5.0", "sha256": "0g3fzazfs6f8ni251ilzk0q65hvgfhglly7v4rmkl4jwhzvsz1yr", - "depends": ["coda", "ggplot2", "nimble", "R6", "reshape2", "xtable"] + "depends": ["R6", "coda", "ggplot2", "nimble", "reshape2", "xtable"] }, "comparer": { "name": "comparer", @@ -49229,13 +49751,13 @@ "name": "compas", "version": "0.1.1", "sha256": "0hhqg2xsifnh1v931mmfij6s5idy9s984hdnrkp9n3f3azgwvcz4", - "depends": ["bio3d", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "bio3d"] }, "comperank": { "name": "comperank", "version": "0.1.1", "sha256": "0wz46rkpx1cjjng3i03pms2x27cik9wbx7al5r289ym3664zb83m", - "depends": ["comperes", "dplyr", "Rcpp", "rlang", "tibble"] + "depends": ["Rcpp", "comperes", "dplyr", "rlang", "tibble"] }, "comperes": { "name": "comperes", @@ -49259,7 +49781,7 @@ "name": "compindexR", "version": "0.1.3", "sha256": "1glc1y6wa1g7zxj1xwj0fgcfsy118xhd637gi8zsz7l9vxj614cp", - "depends": ["car", "dplyr", "NlcOptim", "pracma"] + "depends": ["NlcOptim", "car", "dplyr", "pracma"] }, "completejourney": { "name": "completejourney", @@ -49271,7 +49793,7 @@ "name": "complex", "version": "1.0.0", "sha256": "1f1xyvapswfsd7gbw8279m1pdjrry68hkci69d9h3gwav2v3fi4l", - "depends": ["greybox", "legion", "mvtnorm", "nloptr", "pracma", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "greybox", "legion", "mvtnorm", "nloptr", "pracma"] }, "complexNet": { "name": "complexNet", @@ -49295,7 +49817,7 @@ "name": "complexplus", "version": "2.1", "sha256": "16w9v7d1ckavqmr86l34frr37pkvdn0iqnb17ssb8xaggns5lgqx", - "depends": ["expm", "Matrix"] + "depends": ["Matrix", "expm"] }, "complmrob": { "name": "complmrob", @@ -49307,7 +49829,7 @@ "name": "compositions", "version": "2.0-8", "sha256": "147j3sbqcy3hfja1zs8s8p9zzp9a68vk52s545c2p6anyj4381n5", - "depends": ["bayesm", "MASS", "robustbase", "tensorA"] + "depends": ["MASS", "bayesm", "robustbase", "tensorA"] }, "compound_Cox": { "name": "compound.Cox", @@ -49361,13 +49883,13 @@ "name": "conStruct", "version": "1.0.6", "sha256": "00mmlmqk3wixjycmn2wybq4vkq91jmvhjab6pyvfzk1nh3nq428i", - "depends": ["BH", "caroline", "doParallel", "foreach", "gtools", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "caroline", "doParallel", "foreach", "gtools", "rstan", "rstantools"] }, "conText": { "name": "conText", "version": "1.4.3", "sha256": "0ahnbmpphzi2xshmsybphkc9vkj2lr2bi1jssdx97288awwcgayb", - "depends": ["dplyr", "fastDummies", "ggplot2", "Matrix", "quanteda", "reshape2", "stringr", "text2vec", "tidyr"] + "depends": ["Matrix", "dplyr", "fastDummies", "ggplot2", "quanteda", "reshape2", "stringr", "text2vec", "tidyr"] }, "conTree": { "name": "conTree", @@ -49391,7 +49913,7 @@ "name": "concaveman", "version": "1.1.0", "sha256": "0b3fx3y60ibb73pqx5591jq1n86242qajfxbz3vzz6rxxspddlcz", - "depends": ["dplyr", "jsonlite", "magrittr", "sf", "V8"] + "depends": ["V8", "dplyr", "jsonlite", "magrittr", "sf"] }, "conclust": { "name": "conclust", @@ -49403,7 +49925,7 @@ "name": "concom", "version": "1.0.0", "sha256": "1rqb04kv4ygx1rpnj4dqa3jnx3iy9a3c9d8x3bci969zd9lk7kzb", - "depends": ["BH", "english", "Rcpp", "rgl", "Rvcg"] + "depends": ["BH", "Rcpp", "Rvcg", "english", "rgl"] }, "concorR": { "name": "concorR", @@ -49445,7 +49967,7 @@ "name": "condSURV", "version": "2.0.4", "sha256": "11ji8q8qhmpyc1zcdckjsq40bg2gbhbp0222fsrdkfglq3h4dg5x", - "depends": ["doParallel", "doRNG", "foreach", "KernSmooth", "np", "survival"] + "depends": ["KernSmooth", "doParallel", "doRNG", "foreach", "np", "survival"] }, "condTruncMVN": { "name": "condTruncMVN", @@ -49493,13 +50015,13 @@ "name": "conductor", "version": "0.1.1", "sha256": "1kjnjpaiya5ym20y1vry53dshna14dvcjfzgbfizg4g1izsg1czy", - "depends": ["htmltools", "R6", "shiny"] + "depends": ["R6", "htmltools", "shiny"] }, "condusco": { "name": "condusco", "version": "0.1.0", "sha256": "0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s", - "depends": ["assertthat", "bigrquery", "DBI", "jsonlite"] + "depends": ["DBI", "assertthat", "bigrquery", "jsonlite"] }, "condvis": { "name": "condvis", @@ -49511,7 +50033,7 @@ "name": "condvis2", "version": "0.1.2", "sha256": "0zxr0m50gyg5b1ghdx5ysq8f389gg00zx719zqb47ign83xlbn63", - "depends": ["cluster", "colorspace", "DendSer", "ggplot2", "gower", "plyr", "RColorBrewer", "scales", "shiny"] + "depends": ["DendSer", "RColorBrewer", "cluster", "colorspace", "ggplot2", "gower", "plyr", "scales", "shiny"] }, "coneproj": { "name": "coneproj", @@ -49559,7 +50081,7 @@ "name": "configr", "version": "0.3.5", "sha256": "1qlfza9fwqdhw37gxhgxgp4x2dg1qlvdw0rf9fn6a8hgjaj9z8a3", - "depends": ["glue", "ini", "jsonlite", "RcppTOML", "stringr", "yaml"] + "depends": ["RcppTOML", "glue", "ini", "jsonlite", "stringr", "yaml"] }, "configural": { "name": "configural", @@ -49571,7 +50093,7 @@ "name": "confintROB", "version": "1.0-1", "sha256": "13fbq4zxs90sy49c55b9i2i8yq3g3p4p45cx30rs7yrb3610zkfb", - "depends": ["foreach", "lme4", "MASS", "mvtnorm", "tidyr"] + "depends": ["MASS", "foreach", "lme4", "mvtnorm", "tidyr"] }, "confinterpret": { "name": "confinterpret", @@ -49595,7 +50117,7 @@ "name": "conflr", "version": "0.1.1", "sha256": "1bjdmvi0n8746g7dxwgzh3fi33sq4bgfr0nd3nqd2caj8ryi2gv9", - "depends": ["askpass", "commonmark", "curl", "glue", "httr", "knitr", "miniUI", "purrr", "R6", "rlang", "rmarkdown", "rstudioapi", "shiny", "stringi", "xml2"] + "depends": ["R6", "askpass", "commonmark", "curl", "glue", "httr", "knitr", "miniUI", "purrr", "rlang", "rmarkdown", "rstudioapi", "shiny", "stringi", "xml2"] }, "conformalClassification": { "name": "conformalClassification", @@ -49661,19 +50183,19 @@ "name": "conleyreg", "version": "0.1.7", "sha256": "1mvbzqd83vd54ig4kbi1v3h4v0j6pyj8a5ja1f3w2n7k8aszy748", - "depends": ["data_table", "doParallel", "fixest", "foreach", "lmtest", "lwgeom", "Matrix", "Rcpp", "RcppArmadillo", "Rdpack", "s2", "sf"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "Rdpack", "data_table", "doParallel", "fixest", "foreach", "lmtest", "lwgeom", "s2", "sf"] }, "conmet": { "name": "conmet", "version": "0.1.0", "sha256": "0iwr8mmh9lk0psqxkgnd7ldhg57ivbkv0b3a18gli06983mhzjdc", - "depends": ["dplyr", "DT", "foreign", "Hmisc", "lavaan", "openxlsx", "purrr", "semTools", "shiny", "shinydashboard", "shinyWidgets", "stringr", "summarytools", "waiter"] + "depends": ["DT", "Hmisc", "dplyr", "foreign", "lavaan", "openxlsx", "purrr", "semTools", "shiny", "shinyWidgets", "shinydashboard", "stringr", "summarytools", "waiter"] }, "connectapi": { "name": "connectapi", "version": "0.2.0", "sha256": "0k3z30kgz8yl07kxfbqy1w8bdr0viyglibxv6y36f46q6nf1mf6a", - "depends": ["bit64", "fs", "glue", "httr", "jsonlite", "lifecycle", "magrittr", "purrr", "R6", "rlang", "tibble", "uuid", "vctrs"] + "depends": ["R6", "bit64", "fs", "glue", "httr", "jsonlite", "lifecycle", "magrittr", "purrr", "rlang", "tibble", "uuid", "vctrs"] }, "connections": { "name": "connections", @@ -49691,7 +50213,7 @@ "name": "connectwidgets", "version": "0.2.1", "sha256": "0lgr36699hnjwkjx56akwwnzkl5qm587yhqamxr6a53nh1j3h11y", - "depends": ["bslib", "crosstalk", "digest", "dplyr", "glue", "htmltools", "htmlwidgets", "httr", "jsonlite", "magrittr", "purrr", "R6", "reactable", "reactR", "rlang", "sass", "tibble"] + "depends": ["R6", "bslib", "crosstalk", "digest", "dplyr", "glue", "htmltools", "htmlwidgets", "httr", "jsonlite", "magrittr", "purrr", "reactR", "reactable", "rlang", "sass", "tibble"] }, "conogive": { "name": "conogive", @@ -49703,7 +50225,7 @@ "name": "conos", "version": "1.5.2", "sha256": "0p66gb308w2zfsppm0k1vsvgr33kzzhql0vh7l39vlsgayi00skk", - "depends": ["abind", "ComplexHeatmap", "cowplot", "dendextend", "dplyr", "ggplot2", "ggrepel", "gridExtra", "igraph", "irlba", "leidenAlg", "magrittr", "Matrix", "N2R", "R6", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress", "reshape2", "rlang", "Rtsne", "sccore"] + "depends": ["ComplexHeatmap", "Matrix", "N2R", "R6", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress", "Rtsne", "abind", "cowplot", "dendextend", "dplyr", "ggplot2", "ggrepel", "gridExtra", "igraph", "irlba", "leidenAlg", "magrittr", "reshape2", "rlang", "sccore"] }, "conover_test": { "name": "conover.test", @@ -49715,13 +50237,13 @@ "name": "conquer", "version": "1.3.3", "sha256": "1fnyjym21i9hw2d1c9da0wvjzbi9abn46n0lg6if5w2asxg1bim2", - "depends": ["Matrix", "matrixStats", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "matrixStats"] }, "conquestr": { "name": "conquestr", - "version": "1.3.0", - "sha256": "0f7mrx9ss9ja0maci2ydffz90i7v6p9x8wsgbz78dlw8zv2vc630", - "depends": ["dplyr", "ggplot2", "ggrepel", "kableExtra", "magrittr", "Rcpp", "rlang", "stringr", "tidyr", "tidyselect", "zlib"] + "version": "1.3.4", + "sha256": "12l311bggayxkab5ljkw35qm02m3gzlvrn88a7ka1gs7if4q0d7v", + "depends": ["Rcpp", "dplyr", "ggplot2", "ggrepel", "kableExtra", "magrittr", "rlang", "stringr", "tidyr", "tidyselect", "zlib"] }, "conrad": { "name": "conrad", @@ -49733,7 +50255,13 @@ "name": "conserveR", "version": "1.0.4", "sha256": "05b1pqgbd9sh4lyg9zqjfg4019dqp8xj3k1w31qqdld8m3g5lrd6", - "depends": ["cowplot", "GGally", "ggplot2", "ggrepel", "magrittr", "network", "rlang", "scales", "sna"] + "depends": ["GGally", "cowplot", "ggplot2", "ggrepel", "magrittr", "network", "rlang", "scales", "sna"] + }, + "consibiocloudclient": { + "name": "consibiocloudclient", + "version": "1.0.0", + "sha256": "09miin2w37lgga8r31yd1gk7h5gmmz0mmlvz4skr2ppnfkp9nli6", + "depends": ["httr2", "magrittr"] }, "consolechoice": { "name": "consolechoice", @@ -49751,7 +50279,7 @@ "name": "consortr", "version": "0.9.1", "sha256": "1c71wvr7sckrv4k65l71l160z6d9amzyydbi6mf2b79zh9zv8g1g", - "depends": ["data_table", "DiagrammeR", "dplyr", "magrittr", "purrr", "rlang", "shiny", "shinydashboard", "tibble"] + "depends": ["DiagrammeR", "data_table", "dplyr", "magrittr", "purrr", "rlang", "shiny", "shinydashboard", "tibble"] }, "constants": { "name": "constants", @@ -49773,15 +50301,15 @@ }, "constructive": { "name": "constructive", - "version": "0.3.0", - "sha256": "065ajq3ah3gk2chpd62bwnz72z0xy5kcmwm7mcxkaxq1xps3wfd9", + "version": "1.0.1", + "sha256": "1w75ydhpm49a4prkb9kys1866jn552i85p71y446qj7cj46m8yih", "depends": ["cli", "diffobj", "rlang", "waldo"] }, "contFracR": { "name": "contFracR", "version": "1.2.1", "sha256": "0yigrrs36q9wl8bla65ks1ykf233j33jwcqbhdhygryfhxp5cxab", - "depends": ["gmp", "go2bigq", "Rmpfr"] + "depends": ["Rmpfr", "gmp", "go2bigq"] }, "contTimeCausal": { "name": "contTimeCausal", @@ -49799,7 +50327,7 @@ "name": "container", "version": "1.0.4", "sha256": "0vpha9s5d8mxqdzmbfy92qz78b6gfibwgp1ijq70c5vqs2clkzb1", - "depends": ["data_table", "R6"] + "depends": ["R6", "data_table"] }, "contentid": { "name": "contentid", @@ -49823,19 +50351,19 @@ "name": "contingencytables", "version": "3.0.0", "sha256": "1cp5cmvcxqzsagkmy4h612zrfxvaiv0ililvnzbcpxlxva3xmyba", - "depends": ["boot", "MASS"] + "depends": ["MASS", "boot"] }, "contourPlot": { "name": "contourPlot", "version": "0.2.0", "sha256": "0bjwq3p57d6hadln8vwjkh7c9sbb466h3zcq9kpx7kd31z6x8gnz", - "depends": ["interp", "RColorBrewer"] + "depends": ["RColorBrewer", "interp"] }, "contoureR": { "name": "contoureR", "version": "1.0.5", "sha256": "1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn", - "depends": ["geometry", "plyr", "Rcpp", "reshape"] + "depends": ["Rcpp", "geometry", "plyr", "reshape"] }, "contrast": { "name": "contrast", @@ -49853,7 +50381,7 @@ "name": "control", "version": "0.2.5", "sha256": "02s8h5kwpzfrivx3ign84gwlybkcs03ibawyxdny9zz5yhb7x3bs", - "depends": ["expm", "Matrix", "pracma", "signal"] + "depends": ["Matrix", "expm", "pracma", "signal"] }, "controlTest": { "name": "controlTest", @@ -49865,7 +50393,7 @@ "name": "controlfunctionIV", "version": "0.1.1", "sha256": "0g0nakc1mss7837xhs8bymy4cncljjkj7k0n4dvw44gxbc2l8j15", - "depends": ["AER", "dr", "Formula", "orthoDr"] + "depends": ["AER", "Formula", "dr", "orthoDr"] }, "contsurvplot": { "name": "contsurvplot", @@ -49877,7 +50405,7 @@ "name": "convdistr", "version": "1.6.2", "sha256": "1mi5sa9lyn9pdmdlrah8fvxdzm1gqblh3r50y1g40902cryf5yds", - "depends": ["dplyr", "extraDistr", "ggplot2", "MASS", "pryr", "RColorBrewer", "SHELF", "shiny", "tidyr"] + "depends": ["MASS", "RColorBrewer", "SHELF", "dplyr", "extraDistr", "ggplot2", "pryr", "shiny", "tidyr"] }, "convergEU": { "name": "convergEU", @@ -49885,6 +50413,12 @@ "sha256": "01ajzjj0ahlbv0q708hj7cw98b0dahnhkxrd79nrs1wb06rr2j9x", "depends": ["broom", "caTools", "dplyr", "eurostat", "ggplot2", "ggpubr", "leaflet", "purrr", "rlang", "rmarkdown", "stringr", "tibble", "tidyr", "tidyselect"] }, + "convertBCD": { + "name": "convertBCD", + "version": "1.0", + "sha256": "1lk87kppzr8wzbjx04grhc29srv22199c17nvch3c7pf1lw5v1nr", + "depends": ["Rmpfr", "gmp"] + }, "convertbonds": { "name": "convertbonds", "version": "0.1.0", @@ -49895,7 +50429,7 @@ "name": "convertid", "version": "0.1.8", "sha256": "0mprymgh5wbh9x6kn98q4r6c6rp2l108ddmp2g7lh9m635ys6v8m", - "depends": ["AnnotationDbi", "assertthat", "BiocFileCache", "biomaRt", "httr", "org_Hs_eg_db", "org_Mm_eg_db", "plyr", "rappdirs", "stringr", "xml2"] + "depends": ["AnnotationDbi", "BiocFileCache", "assertthat", "biomaRt", "httr", "org_Hs_eg_db", "org_Mm_eg_db", "plyr", "rappdirs", "stringr", "xml2"] }, "convertr": { "name": "convertr", @@ -49905,9 +50439,9 @@ }, "convevol": { "name": "convevol", - "version": "2.0.1", - "sha256": "12i8hgyf2d8fgzblcnrqdpz8wlb8fvczp8aqz23pndp6l7isvgyj", - "depends": ["ape", "cluster", "geiger", "MASS", "phytools"] + "version": "2.2.1", + "sha256": "0j4vbas5lhgbyia15if2hcvjldgln2017n62bs17h7z66n3ps6cv", + "depends": ["ape", "cluster", "geiger", "magick", "phytools"] }, "convey": { "name": "convey", @@ -49919,7 +50453,7 @@ "name": "convoSPAT", "version": "1.2.7", "sha256": "1pmiirigjdkrb3pzqcw6qlh6418z384mvaxqw5mrcm1gxzrqp649", - "depends": ["ellipse", "fields", "MASS", "plotrix", "StatMatch"] + "depends": ["MASS", "StatMatch", "ellipse", "fields", "plotrix"] }, "cooccur": { "name": "cooccur", @@ -49945,6 +50479,12 @@ "sha256": "1dpil57grnqn34b682fakzsrh2xghc566nhqdgnrjd7ly59v0z3x", "depends": ["cli", "clock", "glue", "htmltools", "httpuv", "jsonlite", "purrr", "rlang", "shiny", "vctrs"] }, + "cooltools": { + "name": "cooltools", + "version": "2.4", + "sha256": "1ammi354y2cbaarf29s9kjks8k0zdimcxif6crakn9p3vi30h0nk", + "depends": ["FNN", "MASS", "Rcpp", "bit64", "celestial", "cubature", "data_table", "jpeg", "plotrix", "png", "pracma", "randtoolbox", "raster", "sp"] + }, "coop": { "name": "coop", "version": "0.6-3", @@ -49961,19 +50501,19 @@ "name": "copCAR", "version": "2.0-4", "sha256": "1wvp7khp0f0x6skiq1d6npndb09ak6d6ijmx907gfrd6b0ydaklb", - "depends": ["mcmcse", "numDeriv", "Rcpp", "RcppArmadillo", "spam"] + "depends": ["Rcpp", "RcppArmadillo", "mcmcse", "numDeriv", "spam"] }, "copcor": { "name": "copcor", - "version": "2023.8-27", - "sha256": "0fs6zaxjv7ww2f35hwbdgb810cb4mcqxg260fxk3pfcfq3rwdw9a", + "version": "2024.7-31", + "sha256": "1m9a831m290q6ihxriknpbysp1694lcbb7j7knkcgnnqfkh08y5n", "depends": ["kyotil"] }, "cope": { "name": "cope", "version": "0.2.3", "sha256": "1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy", - "depends": ["abind", "fields", "maps", "MASS", "Matrix", "mvtnorm", "nlme"] + "depends": ["MASS", "Matrix", "abind", "fields", "maps", "mvtnorm", "nlme"] }, "copent": { "name": "copent", @@ -49985,7 +50525,7 @@ "name": "cophescan", "version": "1.4.1", "sha256": "0lnc20f1xaijibza4px9m47fy70jz9y9y5m7wk5h50kb4dh6ywxh", - "depends": ["coloc", "data_table", "dplyr", "ggplot2", "ggrepel", "magrittr", "matrixStats", "pheatmap", "Rcpp", "RcppArmadillo", "viridis"] + "depends": ["Rcpp", "RcppArmadillo", "coloc", "data_table", "dplyr", "ggplot2", "ggrepel", "magrittr", "matrixStats", "pheatmap", "viridis"] }, "coppeCosenzaR": { "name": "coppeCosenzaR", @@ -49997,19 +50537,19 @@ "name": "copre", "version": "0.2.1", "sha256": "1lgps3wmjp3ja13xd33q41xb3kc56vmyidjpsmm5c2y263pm1m8i", - "depends": ["abind", "BH", "dirichletprocess", "pracma", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "abind", "dirichletprocess", "pracma"] }, "cops": { "name": "cops", - "version": "1.3-1", - "sha256": "17lq7ag0bwg3i7jvzca4qyzg8ixhdikrcgpgskkm26i83886zid2", - "depends": ["cmaes", "cordillera", "crs", "dfoptim", "GenSA", "MASS", "minqa", "NlcOptim", "nloptr", "pso", "rgenoud", "Rsolnp", "scatterplot3d", "smacof", "subplex"] + "version": "1.11-3", + "sha256": "04rmi45yjzll52dsdf4qci0a06v5a9kslr36c16ginkf3w64s48y", + "depends": ["GenSA", "NlcOptim", "Rsolnp", "analogue", "cmaes", "cordillera", "crs", "dfoptim", "minqa", "nloptr", "pso", "rgenoud", "smacof", "smacofx", "subplex"] }, "copula": { "name": "copula", - "version": "1.1-3", - "sha256": "19kp6q052jp0wsn2zh6wz6m9hk04nhwlc2pqwrma9ynny6s6q6cv", - "depends": ["ADGofTest", "colorspace", "gsl", "lattice", "Matrix", "mvtnorm", "numDeriv", "pcaPP", "pspline", "stabledist"] + "version": "1.1-4", + "sha256": "0kshyr77qiidcmi51dyapbdv46dkxv5n4p71vwh7cyb091zqpmzl", + "depends": ["ADGofTest", "Matrix", "colorspace", "gsl", "lattice", "mvtnorm", "numDeriv", "pcaPP", "pspline", "stabledist"] }, "copulaData": { "name": "copulaData", @@ -50045,13 +50585,13 @@ "name": "copyseparator", "version": "1.2.0", "sha256": "0dywnrqjb6x7v8icx117vsjb6zzb0brmmz1xwdc8a26lgcqmbvgv", - "depends": ["ape", "beepr", "Biostrings", "DECIPHER", "doParallel", "foreach", "kmer", "seqinr", "stringr"] + "depends": ["Biostrings", "DECIPHER", "ape", "beepr", "doParallel", "foreach", "kmer", "seqinr", "stringr"] }, "corHMM": { "name": "corHMM", "version": "2.8", "sha256": "1pxn5vx5pxrys5ql393bibfij1922pbm2v5vr0h5gcdjym0ndr6n", - "depends": ["ape", "corpcor", "expm", "GenSA", "igraph", "MASS", "nloptr", "nnet", "numDeriv", "phangorn", "phytools", "Rmpfr", "viridis"] + "depends": ["GenSA", "MASS", "Rmpfr", "ape", "corpcor", "expm", "igraph", "nloptr", "nnet", "numDeriv", "phangorn", "phytools", "viridis"] }, "corTESTsrd": { "name": "corTESTsrd", @@ -50063,7 +50603,7 @@ "name": "corTest", "version": "1.0.7", "sha256": "1gip8rxvbhrckwmjwmxbmycndg4jrl75x8qda9l35znfv9r7p0nq", - "depends": ["Biobase", "clusterGeneration", "ggplot2", "igraph", "MASS", "Matrix"] + "depends": ["Biobase", "MASS", "Matrix", "clusterGeneration", "ggplot2", "igraph"] }, "cora": { "name": "cora", @@ -50111,13 +50651,13 @@ "name": "coreNLP", "version": "0.4-3", "sha256": "0i08hrkp5slwhwnz34ndl9y37km2zmmysmm9swvvzmisihjrmb2d", - "depends": ["rJava", "XML"] + "depends": ["XML", "rJava"] }, "coreSim": { "name": "coreSim", "version": "0.2.4", "sha256": "1fhlss420rhs21l9i2ag5g3j0vnrkpqdh13ca4rwfan6h35qr3sm", - "depends": ["dplyr", "MASS"] + "depends": ["MASS", "dplyr"] }, "corehunter": { "name": "corehunter", @@ -50135,7 +50675,7 @@ "name": "corkscrew", "version": "1.1", "sha256": "1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s", - "depends": ["ggplot2", "gplots", "igraph", "RColorBrewer"] + "depends": ["RColorBrewer", "ggplot2", "gplots", "igraph"] }, "corlink": { "name": "corlink", @@ -50147,7 +50687,7 @@ "name": "corncob", "version": "0.4.1", "sha256": "12ah9z9f68cw40c0hw7i53263qy0yzrpvrr4kqi7xva3d18ywn4n", - "depends": ["detectseparation", "dplyr", "ggplot2", "magrittr", "numDeriv", "rlang", "scales", "trust", "VGAM"] + "depends": ["VGAM", "detectseparation", "dplyr", "ggplot2", "magrittr", "numDeriv", "rlang", "scales", "trust"] }, "cornet": { "name": "cornet", @@ -50195,13 +50735,13 @@ "name": "corporaexplorer", "version": "0.8.6", "sha256": "1d3a1dfch9fsgq0d3am3j4ygab9k1n7px3crwwr33f8n9r3vdwmp", - "depends": ["data_table", "dplyr", "ggplot2", "lubridate", "magrittr", "padr", "plyr", "RColorBrewer", "re2", "rlang", "rmarkdown", "scales", "shiny", "shinydashboard", "shinyjs", "shinyWidgets", "stringi", "stringr", "tibble", "tidyr"] + "depends": ["RColorBrewer", "data_table", "dplyr", "ggplot2", "lubridate", "magrittr", "padr", "plyr", "re2", "rlang", "rmarkdown", "scales", "shiny", "shinyWidgets", "shinydashboard", "shinyjs", "stringi", "stringr", "tibble", "tidyr"] }, "corpustools": { "name": "corpustools", "version": "0.5.1", "sha256": "154n9gxzg9cx10sxbb05df9wsr378k2qhkprqr9cyh1q5ll1pki7", - "depends": ["data_table", "digest", "igraph", "Matrix", "pbapply", "quanteda", "R6", "Rcpp", "RcppProgress", "RNewsflow", "rsyntax", "stringi", "tokenbrowser", "udpipe", "wordcloud"] + "depends": ["Matrix", "R6", "RNewsflow", "Rcpp", "RcppProgress", "data_table", "digest", "igraph", "pbapply", "quanteda", "rsyntax", "stringi", "tokenbrowser", "udpipe", "wordcloud"] }, "corr2D": { "name": "corr2D", @@ -50215,11 +50755,17 @@ "sha256": "1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k", "depends": ["mvtnorm"] }, + "corrMCT": { + "name": "corrMCT", + "version": "0.2.0", + "sha256": "03qhvw2gcxxbv8smphd8dx5gg0zj3b50p5x5gqs3rnns1c2lqbc1", + "depends": ["Matrix", "dplyr", "glue", "magrittr", "tibble"] + }, "corrViz": { "name": "corrViz", "version": "0.1.0", "sha256": "1blwngvvh316ndfrz2gmi6gq2w08sdckqvdsn4xpzhd4q4nbff5q", - "depends": ["circlize", "DendSer", "GGally", "gganimate", "ggplot2", "ggraph", "igraph", "plotly", "purrr", "shiny", "visNetwork"] + "depends": ["DendSer", "GGally", "circlize", "gganimate", "ggplot2", "ggraph", "igraph", "plotly", "purrr", "shiny", "visNetwork"] }, "corrarray": { "name": "corrarray", @@ -50231,7 +50777,7 @@ "name": "corrcoverage", "version": "1.2.1", "sha256": "0r5n2g341jlinwrxxwxkav9i6qsf097pmfi07aiq663b13r3864x", - "depends": ["data_table", "magrittr", "matrixStats", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "magrittr", "matrixStats"] }, "correctR": { "name": "correctR", @@ -50295,8 +50841,8 @@ }, "corrplot": { "name": "corrplot", - "version": "0.92", - "sha256": "1g98jk6xsl08z4n6sy5vriif99m31zhbz7j3dh1kfj4w7yb9zh78", + "version": "0.94", + "sha256": "1x2mgq5fnws6imywwrkshcq41qh1dmdq98kxmf6yrpwjffpmv1cf", "depends": [] }, "corrr": { @@ -50345,7 +50891,7 @@ "name": "cosimmr", "version": "1.0.12", "sha256": "1gvkzp0l8zkana78llp4r734cs12dibysh5hylafmi81byibyxyp", - "depends": ["bayesplot", "checkmate", "ggnewscale", "ggplot2", "R2jags", "Rcpp", "RcppArmadillo", "RcppDist", "reshape2", "viridis"] + "depends": ["R2jags", "Rcpp", "RcppArmadillo", "RcppDist", "bayesplot", "checkmate", "ggnewscale", "ggplot2", "reshape2", "viridis"] }, "cosinor": { "name": "cosinor", @@ -50357,7 +50903,7 @@ "name": "cosinor2", "version": "0.2.1", "sha256": "1pp0z86fflqkkllfrzx3vj98kzxjwnawr4a2d8z5q6zhq6v5qrvf", - "depends": ["cosinor", "cowplot", "ggplot2", "Hmisc", "magrittr", "matrixStats", "purrr", "scales", "stringr"] + "depends": ["Hmisc", "cosinor", "cowplot", "ggplot2", "magrittr", "matrixStats", "purrr", "scales", "stringr"] }, "cosmicsig": { "name": "cosmicsig", @@ -50375,7 +50921,7 @@ "name": "cosso", "version": "2.1-2", "sha256": "0r0gil5fk4zp33syww40va8h964zn38v0ismw0k4xsh7c8nrr8lm", - "depends": ["glmnet", "quadprog", "Rglpk"] + "depends": ["Rglpk", "glmnet", "quadprog"] }, "costat": { "name": "costat", @@ -50391,9 +50937,9 @@ }, "cotram": { "name": "cotram", - "version": "0.4-4", - "sha256": "152jxkfwcqs1k7xcr1dlqbf0jpc9423g48dxwgjy3bvqnwgi6k21", - "depends": ["alabama", "basefun", "Matrix", "mlt", "survival", "tram", "variables"] + "version": "0.5-1", + "sha256": "0ckbkhgg7026nf9xkqq3lnfi8gzb78vj4crpxms8ljxxbgv6zai1", + "depends": ["Matrix", "alabama", "basefun", "mlt", "qrng", "survival", "tram", "variables"] }, "cotrend": { "name": "cotrend", @@ -50417,19 +50963,19 @@ "name": "countSTAR", "version": "1.0.2", "sha256": "054y59r7g4g33ix020m90v8g0c09db59bd9vb7461j0il3amcs99", - "depends": ["coda", "dbarts", "FastGP", "gbm", "KFAS", "Matrix", "randomForest", "Rcpp", "RcppArmadillo", "spikeSlabGAM", "splines2", "TruncatedNormal", "truncdist"] + "depends": ["FastGP", "KFAS", "Matrix", "Rcpp", "RcppArmadillo", "TruncatedNormal", "coda", "dbarts", "gbm", "randomForest", "spikeSlabGAM", "splines2", "truncdist"] }, "countToFPKM": { "name": "countToFPKM", "version": "1.0", "sha256": "0h89knii8zkbq0lw7yn3qzak30s7bifq53ga4vy6za6hqwc53x2j", - "depends": ["circlize", "ComplexHeatmap"] + "depends": ["ComplexHeatmap", "circlize"] }, "countTransformers": { "name": "countTransformers", "version": "0.0.6", "sha256": "14n2sv7wqzslrzg0ag473ljj9mvha94161p5yh2h9l1vx7xliimf", - "depends": ["Biobase", "limma", "MASS"] + "depends": ["Biobase", "MASS", "limma"] }, "countcolors": { "name": "countcolors", @@ -50453,13 +50999,13 @@ "name": "counterfactuals", "version": "0.1.4", "sha256": "1sv7gswhwnhci07lvgvcnfvb7zav76r3576ymp704l6llhs44ybm", - "depends": ["bbotk", "checkmate", "data_table", "iml", "miesmuschel", "paradox", "R6", "StatMatch"] + "depends": ["R6", "StatMatch", "bbotk", "checkmate", "data_table", "iml", "miesmuschel", "paradox"] }, "countfitteR": { "name": "countfitteR", "version": "1.4", "sha256": "1aq7v2fy24pf3r6fkmcwvs18r2xc2l1bqablp53xfc7b6kxq3vqn", - "depends": ["ggplot2", "MASS", "pscl", "shiny"] + "depends": ["MASS", "ggplot2", "pscl", "shiny"] }, "countgmifs": { "name": "countgmifs", @@ -50471,7 +51017,7 @@ "name": "countland", "version": "0.1.2", "sha256": "1nlnri7l8v2h35r7ps8byv8mmwnir1pyimaa937wr73f1mk9m0l9", - "depends": ["ggplot2", "Matrix", "rlang"] + "depends": ["Matrix", "ggplot2", "rlang"] }, "countprop": { "name": "countprop", @@ -50501,13 +51047,13 @@ "name": "countts", "version": "0.1.0", "sha256": "11pyj5s2vyw209inapiw9pvk0s1aq3r2c1xq0dnc83sz82bxx6c4", - "depends": ["fastDummies", "ggplot2", "MASS", "matrixStats"] + "depends": ["MASS", "fastDummies", "ggplot2", "matrixStats"] }, "coursekata": { "name": "coursekata", - "version": "0.17.0", - "sha256": "0g0hz4zbqmz7rxhvnd67hx0mfqx997k27p1382j0qwqa26bv943h", - "depends": ["cli", "dslabs", "ggformula", "ggplot2", "glue", "lsr", "Metrics", "mosaic", "pak", "palmerpenguins", "purrr", "rlang", "supernova", "vctrs", "viridisLite"] + "version": "0.18.0", + "sha256": "05rqbi8sxr2fgaldg8fppil43a7pdw86wxpsgizln1bgncjpyywf", + "depends": ["Metrics", "cli", "dslabs", "ggformula", "ggplot2", "glue", "lsr", "mosaic", "palmerpenguins", "purrr", "remotes", "rlang", "supernova", "vctrs", "viridisLite"] }, "covBM": { "name": "covBM", @@ -50531,7 +51077,7 @@ "name": "covTestR", "version": "0.1.4", "sha256": "0j9kay8lwkhpdyg0fbfars1m58v0i58v1v5sm7m72s7kz8qh2yfs", - "depends": ["purrr", "Rcpp", "RcppArmadillo", "rlang"] + "depends": ["Rcpp", "RcppArmadillo", "purrr", "rlang"] }, "covadap": { "name": "covadap", @@ -50549,13 +51095,13 @@ "name": "covatest", "version": "1.2.3", "sha256": "04pycgxiq3h2j70vzqac5li0iqsyg005zpqfjr9iw17y0p51jv0a", - "depends": ["gstat", "lubridate", "mathjaxr", "sp", "spacetime", "V8", "zoo"] + "depends": ["V8", "gstat", "lubridate", "mathjaxr", "sp", "spacetime", "zoo"] }, "covdepGE": { "name": "covdepGE", "version": "1.0.1", "sha256": "0xlz01h6lnp7g9vi9s84l8cmgqvr4pql1fs0c1n51gsx4pkaz5l1", - "depends": ["doParallel", "foreach", "ggplot2", "glmnet", "latex2exp", "MASS", "Rcpp", "RcppArmadillo", "reshape2"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "ggplot2", "glmnet", "latex2exp", "reshape2"] }, "coveR2": { "name": "coveR2", @@ -50573,7 +51119,7 @@ "name": "covequal", "version": "0.1.0", "sha256": "1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c", - "depends": ["corpcor", "RMTstat"] + "depends": ["RMTstat", "corpcor"] }, "covfefe": { "name": "covfefe", @@ -50591,7 +51137,7 @@ "name": "covid19.analytics", "version": "2.1.3.3", "sha256": "009cqf1xnhkw11vi1z0c0zm8ld3ifgricn0rlik5gycvz8ygwprn", - "depends": ["ape", "collapsibleTree", "curl", "deSolve", "dplyr", "DT", "gplots", "htmlwidgets", "pheatmap", "plotly", "readxl", "rentrez", "shiny", "shinycssloaders", "shinydashboard"] + "depends": ["DT", "ape", "collapsibleTree", "curl", "deSolve", "dplyr", "gplots", "htmlwidgets", "pheatmap", "plotly", "readxl", "rentrez", "shiny", "shinycssloaders", "shinydashboard"] }, "covid19br": { "name": "covid19br", @@ -50621,7 +51167,7 @@ "name": "covid19india", "version": "0.1.4", "sha256": "18xjgal49rhwif07irb1ad0qvi6c2p1ya52knx0wspb56fv849z1", - "depends": ["cli", "data_table", "EpiEstim", "glue", "gt", "httr", "janitor", "magrittr", "scales", "stringr"] + "depends": ["EpiEstim", "cli", "data_table", "glue", "gt", "httr", "janitor", "magrittr", "scales", "stringr"] }, "covid19italy": { "name": "covid19italy", @@ -50663,13 +51209,13 @@ "name": "covidcast", "version": "0.5.2", "sha256": "0d4x3cydjng0f0gzn8fly44hf2viypym6ag7mzwips7791rhcm6k", - "depends": ["dplyr", "ggplot2", "httr", "MMWRweek", "purrr", "rlang", "sf", "tidyr", "xml2"] + "depends": ["MMWRweek", "dplyr", "ggplot2", "httr", "purrr", "rlang", "sf", "tidyr", "xml2"] }, "covidmx": { "name": "covidmx", "version": "0.7.7", "sha256": "1m73pxpn080w7sby88spz2pfjw1v479m9fa74ag25mkdymfbh02d", - "depends": ["cli", "DBI", "dplyr", "duckdb", "fs", "pins", "RCurl", "readr", "readxl", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["DBI", "RCurl", "cli", "dplyr", "duckdb", "fs", "pins", "readr", "readxl", "rlang", "stringr", "tibble", "tidyr"] }, "covidnor": { "name": "covidnor", @@ -50705,7 +51251,13 @@ "name": "covsim", "version": "1.1.0", "sha256": "0pk6jfh7bcpqm63zdlrkz1cqdgwwkkdjlflw8yb8fq6p25bmppih", - "depends": ["lavaan", "MASS", "Matrix", "nleqslv", "PearsonDS", "rvinecopulib", "tmvtnorm"] + "depends": ["MASS", "Matrix", "PearsonDS", "lavaan", "nleqslv", "rvinecopulib", "tmvtnorm"] + }, + "covtracer": { + "name": "covtracer", + "version": "0.0.1", + "sha256": "1ndps8hmj8qpd4wl9p14ahr8n62rlgb2psvncfjmxs26p8dx90r3", + "depends": [] }, "cowbell": { "name": "cowbell", @@ -50729,7 +51281,7 @@ "name": "coxed", "version": "0.3.3", "sha256": "09jnqza8wp2palayb0vsz43qmh8470gxil1l7g3b65lmxa7wpmnh", - "depends": ["dplyr", "ggplot2", "gridExtra", "mediation", "mgcv", "PermAlgo", "rms", "survival", "tidyr"] + "depends": ["PermAlgo", "dplyr", "ggplot2", "gridExtra", "mediation", "mgcv", "rms", "survival", "tidyr"] }, "coxerr": { "name": "coxerr", @@ -50741,7 +51293,7 @@ "name": "coxme", "version": "2.2-20", "sha256": "0qnbhywav7xhs6r3f6m4lb1pvw8gfylnrll0zss5h578mgdfmvm0", - "depends": ["bdsmatrix", "Matrix", "nlme", "survival"] + "depends": ["Matrix", "bdsmatrix", "nlme", "survival"] }, "coxphSGD": { "name": "coxphSGD", @@ -50771,7 +51323,7 @@ "name": "coxrt", "version": "1.0.3", "sha256": "1xggczjx5psl4m4m83vh4y6swnh3pf9rngnzx3268iznfz1g43h2", - "depends": ["BB", "ggplot2", "gss", "inline", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["BB", "Rcpp", "RcppArmadillo", "ggplot2", "gss", "inline", "survival"] }, "coxsei": { "name": "coxsei", @@ -50783,7 +51335,7 @@ "name": "cp4p", "version": "0.3.6", "sha256": "1zddkkj0ynvfck3kw1682wffbxw0d3dc4flmxxp03lclq70fc8bd", - "depends": ["limma", "MESS", "multtest", "qvalue"] + "depends": ["MESS", "limma", "multtest", "qvalue"] }, "cpa": { "name": "cpa", @@ -50795,7 +51347,7 @@ "name": "cpd", "version": "0.3.2", "sha256": "049df4ip3x7v9zviw7b4m1hp2w4gpfi6cq066mqal41frgvfmwdb", - "depends": ["dgof", "hypergeo", "Rdpack"] + "depends": ["Rdpack", "dgof", "hypergeo"] }, "cpfa": { "name": "cpfa", @@ -50813,7 +51365,7 @@ "name": "cplm", "version": "0.7-12", "sha256": "1m0b0jksl1y90q4sdhjspby4hafxxdgra8sbicd5rsrwq4hzwyxc", - "depends": ["biglm", "coda", "ggplot2", "Matrix", "minqa", "nlme", "reshape2", "statmod", "tweedie"] + "depends": ["Matrix", "biglm", "coda", "ggplot2", "minqa", "nlme", "reshape2", "statmod", "tweedie"] }, "cplots": { "name": "cplots", @@ -50831,7 +51383,7 @@ "name": "cpmBigData", "version": "0.0.1", "sha256": "0fdch6hj6l620gj0pk8ffrl9j2rmd9jlin7yx7myfy46qij1cxpi", - "depends": ["benchmarkme", "doParallel", "foreach", "Hmisc", "iterators", "rms", "SparseM"] + "depends": ["Hmisc", "SparseM", "benchmarkme", "doParallel", "foreach", "iterators", "rms"] }, "cpmr": { "name": "cpmr", @@ -50843,7 +51395,7 @@ "name": "cpop", "version": "1.0.7", "sha256": "082ny87ph3wz5kbp2i4yzf9g6r3bihbgfynv060fy6sv0xb9hxc1", - "depends": ["crops", "ggplot2", "mathjaxr", "pacman", "pracma", "Rcpp", "Rdpack"] + "depends": ["Rcpp", "Rdpack", "crops", "ggplot2", "mathjaxr", "pacman", "pracma"] }, "cpp11": { "name": "cpp11", @@ -50853,21 +51405,21 @@ }, "cpp11armadillo": { "name": "cpp11armadillo", - "version": "0.2.5", - "sha256": "1bn72wwlj6k9lg36ah4r69jgpqsvlcmkzn6czwz10dgi341ca5sx", + "version": "0.2.8", + "sha256": "1hn7yksy6rhb9kmykf2w677555zbxdwxpzasi1g3mp3riqssabib", "depends": [] }, "cppRouting": { "name": "cppRouting", "version": "3.1", "sha256": "1mhp6k2kwlhyrswlxi9f0f6ndvm5968ljp3k97c2m2sfbxaablxy", - "depends": ["data_table", "Rcpp", "RcppParallel", "RcppProgress"] + "depends": ["Rcpp", "RcppParallel", "RcppProgress", "data_table"] }, "cppcheckR": { "name": "cppcheckR", "version": "1.0.0", "sha256": "1f3b8gadpiyxwxp34pd3i7s715dkm23427fp86vvnqvy9schg3ga", - "depends": ["htmlwidgets", "rmarkdown", "rstudioapi", "shiny", "V8", "xml2"] + "depends": ["V8", "htmlwidgets", "rmarkdown", "rstudioapi", "shiny", "xml2"] }, "cppdoubles": { "name": "cppdoubles", @@ -50879,7 +51431,7 @@ "name": "cpr", "version": "0.4.0", "sha256": "1vv7cmjf08accdpp5qjw9rad8yb9izc6bw440366ckh4q87306q4", - "depends": ["ggplot2", "lme4", "plot3D", "Rcpp", "RcppArmadillo", "rgl", "scales"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "lme4", "plot3D", "rgl", "scales"] }, "cprobit": { "name": "cprobit", @@ -50903,7 +51455,7 @@ "name": "cpss", "version": "0.0.3", "sha256": "1j8hyhfkjwyq6nmfynlzl8q7n5irlzrqdqh83v7pfpizzjdhhfxq", - "depends": ["dplyr", "ggplot2", "gridExtra", "magrittr", "mvtnorm", "Rcpp", "RcppArmadillo", "Rfast", "rlang", "tibble", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "Rfast", "dplyr", "ggplot2", "gridExtra", "magrittr", "mvtnorm", "rlang", "tibble", "tidyr"] }, "cpsurvsim": { "name": "cpsurvsim", @@ -50921,7 +51473,7 @@ "name": "cpt", "version": "1.0.2", "sha256": "0j9ns8qhcvwxnzl9rc59vmh5jdahnni5dxpmi38gxvvj5k9hd8p7", - "depends": ["glmnet", "MASS", "nnet", "randomForest"] + "depends": ["MASS", "glmnet", "nnet", "randomForest"] }, "cptcity": { "name": "cptcity", @@ -50933,7 +51485,7 @@ "name": "cqrReg", "version": "1.2.1", "sha256": "1788hnm1qd5mv5bcizz2h170jg6954sfggjnfqcwfwg167px0df2", - "depends": ["quantreg", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "quantreg"] }, "cquad": { "name": "cquad", @@ -50951,13 +51503,13 @@ "name": "cramer", "version": "0.9-4", "sha256": "0i5qg912rp8m1br00kd3iidy1v1yrmzj21xmy2wbjyyqrzakykc3", - "depends": ["boot", "Rcpp"] + "depends": ["Rcpp", "boot"] }, "crandep": { "name": "crandep", - "version": "0.3.9", - "sha256": "0g807ph2fnpg6ll4li0pgw7gd61wzyibjnl74dzl1jaq7n1ymh2h", - "depends": ["dplyr", "gsl", "igraph", "pracma", "Rcpp", "RcppArmadillo", "rvest", "stringr", "xml2"] + "version": "0.3.10", + "sha256": "07y5gkxdr12v715zy9skgjhw3sjsjlscpfril4hcdz0qwhr5cy5d", + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "gsl", "igraph", "pracma", "stringr"] }, "crank": { "name": "crank", @@ -50969,7 +51521,7 @@ "name": "cranlike", "version": "1.0.3", "sha256": "022kya5p0f92szpw751czjka7bzq297af4i2l33892yfxkapfqfg", - "depends": ["DBI", "debugme", "desc", "RSQLite"] + "depends": ["DBI", "RSQLite", "debugme", "desc"] }, "cranlogs": { "name": "cranlogs", @@ -50993,12 +51545,12 @@ "name": "crawl", "version": "2.3.0", "sha256": "0qn64n54lsj56r5xj7xk8irns95724zmdv0nscsm3jd06fqybgj4", - "depends": ["dplyr", "lubridate", "magrittr", "mvtnorm", "purrr", "Rcpp", "RcppArmadillo", "rlang", "sf", "sp", "tibble"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "lubridate", "magrittr", "mvtnorm", "purrr", "rlang", "sf", "sp", "tibble"] }, "crayon": { "name": "crayon", - "version": "1.5.2", - "sha256": "0yjsnhifr3nipaid0q11jjglvqmp51g9d2xdh9kfxh5knl2sbabh", + "version": "1.5.3", + "sha256": "0sfsx4k77fsx1dx9c186dg273psrr3awz4ivfvmbbvs1amla0x1y", "depends": [] }, "crayons": { @@ -51023,7 +51575,7 @@ "name": "crctStepdown", "version": "0.5.2", "sha256": "0jjskjr3nwxsg6fz317nyb0r6vj1m82adlc06pyhazyhb7hh1gzl", - "depends": ["fastglm", "ggplot2", "ggpubr", "lme4", "Rcpp", "RcppEigen", "RcppParallel", "reshape2", "stringr"] + "depends": ["Rcpp", "RcppEigen", "RcppParallel", "fastglm", "ggplot2", "ggpubr", "lme4", "reshape2", "stringr"] }, "createLogicalPCM": { "name": "createLogicalPCM", @@ -51063,27 +51615,27 @@ }, "crew": { "name": "crew", - "version": "0.9.3", - "sha256": "0ap2yf86ng8wp8n2cm0br4q81pknswsynb4a1qprsshwr8l5xvl1", - "depends": ["cli", "data_table", "getip", "later", "mirai", "nanonext", "processx", "promises", "ps", "R6", "rlang", "tibble", "tidyselect"] + "version": "0.9.5", + "sha256": "1js1znvvp650v8zpsh0vy58m5plylhq5h4x26pijk3vr6w3bl7q2", + "depends": ["R6", "cli", "data_table", "getip", "later", "mirai", "nanonext", "processx", "promises", "ps", "rlang", "tibble", "tidyselect"] }, "crew_aws_batch": { "name": "crew.aws.batch", - "version": "0.0.5", - "sha256": "1gssnvmszq89cfprwrgiq1gajf9q2s8kdj03gbza194p4646lj6p", - "depends": ["cli", "crew", "paws_common", "paws_compute", "paws_management", "R6", "rlang", "tibble"] + "version": "0.0.6", + "sha256": "06q06jc53w0yh91vs45r8g9q13avcfi6s30h2bwqbdsqsx6rk54r", + "depends": ["R6", "cli", "crew", "paws_common", "paws_compute", "paws_management", "rlang", "tibble"] }, "crew_cluster": { "name": "crew.cluster", - "version": "0.3.1", - "sha256": "1qn3pxyhfyb47cgyzmw2l07dhpvbf0yicxxbxh82scmlj5pqbkhf", - "depends": ["crew", "lifecycle", "ps", "R6", "rlang", "vctrs", "xml2", "yaml"] + "version": "0.3.2", + "sha256": "1n40rl1z64ig7jp637xrydnvzmpjad76xsd2avhb8nkbcima89f8", + "depends": ["R6", "crew", "lifecycle", "ps", "rlang", "vctrs", "xml2", "yaml"] }, "crfsuite": { "name": "crfsuite", "version": "0.4.2", "sha256": "15ldbx8g9xa6sql6is2gcqryzqb9dad1hiarvrgmizdp5fd3gxnm", - "depends": ["data_table", "Rcpp"] + "depends": ["Rcpp", "data_table"] }, "cricketdata": { "name": "cricketdata", @@ -51095,7 +51647,7 @@ "name": "cricketr", "version": "0.0.26", "sha256": "1y1zf9f59v95knggq5nna5rp7fqpv1swwvkajwqbpicc12g2azq4", - "depends": ["dplyr", "forecast", "ggplot2", "httr", "lubridate", "plotrix", "scatterplot3d", "XML"] + "depends": ["XML", "dplyr", "forecast", "ggplot2", "httr", "lubridate", "plotrix", "scatterplot3d"] }, "crimCV": { "name": "crimCV", @@ -51125,7 +51677,7 @@ "name": "crispRdesignR", "version": "1.1.7", "sha256": "0z0sc0plq6x68b70pprzr7p7wpv8zsvg9ygi0gv1djh5j4wiaiz1", - "depends": ["BiocGenerics", "Biostrings", "DT", "gbm", "GenomeInfoDb", "GenomicRanges", "IRanges", "rtracklayer", "S4Vectors", "shiny", "stringr", "vtreat"] + "depends": ["BiocGenerics", "Biostrings", "DT", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "gbm", "rtracklayer", "shiny", "stringr", "vtreat"] }, "criticality": { "name": "criticality", @@ -51137,7 +51689,7 @@ "name": "criticalpath", "version": "0.2.1", "sha256": "1b8iwvdlq5czd7p7yy6il3irrcarc23cy26vprycnyjll38lcfjz", - "depends": ["dplyr", "igraph", "magrittr", "R6", "stringr", "tibble"] + "depends": ["R6", "dplyr", "igraph", "magrittr", "stringr", "tibble"] }, "critpath": { "name": "critpath", @@ -51153,9 +51705,9 @@ }, "crmPack": { "name": "crmPack", - "version": "1.0.5", - "sha256": "086r12vfp1am7aavmq5yvbgg4w7vjdabjvzlnd5la92y01dcs32h", - "depends": ["GenSA", "ggplot2", "gridExtra", "MASS", "mvtnorm", "rjags"] + "version": "1.0.6", + "sha256": "1wdar6i0h184ynddvl2w6ipbdappncl0grsw7g4hnfiz1hw9x9p4", + "depends": ["GenSA", "MASS", "ggplot2", "gridExtra", "mvtnorm", "rjags"] }, "crmReg": { "name": "crmReg", @@ -51179,7 +51731,7 @@ "name": "cromwellDashboard", "version": "0.5.1", "sha256": "0d57c1wdd1ds9fr7p256la63qbv8mirljgrvl1k8fp5gcnkps5wb", - "depends": ["dplyr", "DT", "httr", "shiny", "shinydashboard", "stringr"] + "depends": ["DT", "dplyr", "httr", "shiny", "shinydashboard", "stringr"] }, "cronR": { "name": "cronR", @@ -51239,7 +51791,7 @@ "name": "crops", "version": "1.0.3", "sha256": "0c1xvfnr4dh720x0i3f6nvmzgv8zbs7cvp8vfa341yb92pz4d6s0", - "depends": ["cowplot", "ggplot2", "magrittr", "memoise", "Rdpack", "reshape", "sets", "tibble", "tidyverse"] + "depends": ["Rdpack", "cowplot", "ggplot2", "magrittr", "memoise", "reshape", "sets", "tibble", "tidyverse"] }, "crossdes": { "name": "crossdes", @@ -51265,6 +51817,12 @@ "sha256": "079ibxhm6877nfdqf88fhg9fjdn3vbs44jprrbhxmmbbd30nma4v", "depends": ["backports", "cli", "dplyr", "generics", "lifecycle", "purrr", "rlang", "vctrs"] }, + "crossmatch": { + "name": "crossmatch", + "version": "1.4-0", + "sha256": "104qbc8p9ip446035xilgswhqfdvrqxqh5sirp6sc2rvy6lr1xng", + "depends": ["nbpMatching"] + }, "crossnma": { "name": "crossnma", "version": "1.2.0", @@ -51287,19 +51845,19 @@ "name": "crosstalk", "version": "1.2.1", "sha256": "1w8lc3hcd1nlw541880vs3agk2i6bilyapnq9lcs3mfn2s2g0338", - "depends": ["htmltools", "jsonlite", "lazyeval", "R6"] + "depends": ["R6", "htmltools", "jsonlite", "lazyeval"] }, "crosstalkr": { "name": "crosstalkr", "version": "1.0.5", "sha256": "1p4grkh6kripkpirs2hrqwv4bz61bcr6pqzj88j75311kjiphnl0", - "depends": ["doParallel", "dplyr", "ensembldb", "foreach", "ggplot2", "igraph", "iterators", "magrittr", "Matrix", "Rcpp", "readr", "rlang", "STRINGdb", "stringr", "tibble", "tidyr", "withr"] + "depends": ["Matrix", "Rcpp", "STRINGdb", "doParallel", "dplyr", "ensembldb", "foreach", "ggplot2", "igraph", "iterators", "magrittr", "readr", "rlang", "stringr", "tibble", "tidyr", "withr"] }, "crossurr": { "name": "crossurr", "version": "1.1.1", "sha256": "1g4nr9x93ykq6qy5236vydkcbjyfzdz81kwgjv7mph3m0b862rdw", - "depends": ["dplyr", "gbm", "glmnet", "glue", "pbapply", "purrr", "ranger", "RCAL", "rlang", "SIS", "SuperLearner", "tibble", "tidyr"] + "depends": ["RCAL", "SIS", "SuperLearner", "dplyr", "gbm", "glmnet", "glue", "pbapply", "purrr", "ranger", "rlang", "tibble", "tidyr"] }, "crossval": { "name": "crossval", @@ -51323,13 +51881,13 @@ "name": "crossword.r", "version": "0.3.6", "sha256": "1s31613s4qxxspka9bhgq3rq8xraf48mwfv6phvz6v06gijh64lr", - "depends": ["dplyr", "jsonlite", "magrittr", "R6", "r6extended", "stringr"] + "depends": ["R6", "dplyr", "jsonlite", "magrittr", "r6extended", "stringr"] }, "crov": { "name": "crov", "version": "0.3.0", "sha256": "1vnhnw6rw8qyhahy6d67cq5m9sxr6yic21qi16vic1q5115fwx01", - "depends": ["gtools", "VGAM"] + "depends": ["VGAM", "gtools"] }, "crplyr": { "name": "crplyr", @@ -51341,7 +51899,7 @@ "name": "crqa", "version": "2.0.6", "sha256": "117sxxil4yzqss7b8d5r7y2grpc6nzcli9mrjaarsk10k95c4bwp", - "depends": ["dplyr", "ggplot2", "gplots", "Matrix", "pracma", "rdist", "tseriesChaos"] + "depends": ["Matrix", "dplyr", "ggplot2", "gplots", "pracma", "rdist", "tseriesChaos"] }, "crrSC": { "name": "crrSC", @@ -51403,11 +51961,17 @@ "sha256": "044llamxlrva5va39yzpvsmdjqn56ij7jjll73mmjg7ka0rqc5dj", "depends": ["dplyr", "mapview", "purrr", "sf", "units"] }, + "crt2power": { + "name": "crt2power", + "version": "1.0.0", + "sha256": "00clnxyf381qhjpv8r7z0ff9jmid027izvmkpzijmx2d31mm3cr1", + "depends": ["devtools", "dplyr", "foreach", "knitr", "mvtnorm", "rootSolve", "tableone", "tibble", "tidyr", "tidyverse"] + }, "crul": { "name": "crul", - "version": "1.4.2", - "sha256": "0is164bbdk5zy1gxrliiqzlmj47nvzsjym05ijzzs3zkj7qpfp20", - "depends": ["curl", "httpcode", "jsonlite", "mime", "R6", "urltools"] + "version": "1.5.0", + "sha256": "17dx3qhdssk0zanp73g0d7h3imhwh9ydzs009fbrspw1s9w3fwyv", + "depends": ["R6", "curl", "httpcode", "jsonlite", "mime", "urltools"] }, "crunch": { "name": "crunch", @@ -51431,7 +51995,7 @@ "name": "crwbmetareg", "version": "1.0", "sha256": "0faksz2hp1ya4j9hlpc091b1mgwz6396fc15f4f20fixcidv1jg8", - "depends": ["lmtest", "Rfast2", "sandwich"] + "depends": ["Rfast2", "lmtest", "sandwich"] }, "cry": { "name": "cry", @@ -51441,15 +52005,15 @@ }, "crypto2": { "name": "crypto2", - "version": "2.0.0", - "sha256": "0jj6ld4xy1dxc7g317dfjd46vrpbiayskcnvhmapr0rnga60c78r", + "version": "2.0.1", + "sha256": "00ab8hnmfpw6r1q4ifylyga51ilij33p6g56xv5kh74w9g5slplw", "depends": ["base64enc", "cli", "dplyr", "janitor", "jsonlite", "lubridate", "plyr", "progress", "purrr", "tibble", "tidyr"] }, "cryptoQuotes": { "name": "cryptoQuotes", "version": "1.3.1", "sha256": "0fyhnba1h3vf802rab96hch6gdkggz040yvfry9ya2i74xl972pi", - "depends": ["cli", "curl", "jsonlite", "lifecycle", "plotly", "TTR", "xts", "zoo"] + "depends": ["TTR", "cli", "curl", "jsonlite", "lifecycle", "plotly", "xts", "zoo"] }, "cryptography": { "name": "cryptography", @@ -51491,13 +52055,13 @@ "name": "csa", "version": "0.7.1", "sha256": "1mjvyl1l80xxyj1nafjgl6jhclyahybi47zxcrkpb78ldiwsf1hl", - "depends": ["data_table", "doParallel", "foreach", "ggplot2", "ggpubr", "Lmoments", "moments", "raster", "reshape2", "scales"] + "depends": ["Lmoments", "data_table", "doParallel", "foreach", "ggplot2", "ggpubr", "moments", "raster", "reshape2", "scales"] }, "csalert": { "name": "csalert", - "version": "2023.6.17", - "sha256": "004rsqf912f9ladp9kvx26fhmkna61cxlgjfzmlxzirm1h2iw1vs", - "depends": ["cstidy", "cstime", "data_table", "ggplot2", "glm2", "magrittr", "stringr"] + "version": "2024.6.24", + "sha256": "0ahafz39x8zh4yrwhjkbv2fwvz1vpckksj935k9g18ympdg4nnyz", + "depends": ["cstidy", "cstime", "data_table", "ggplot2", "glm2", "lubridate", "magrittr", "stringr", "surveillance"] }, "csampling": { "name": "csampling", @@ -51533,7 +52097,7 @@ "name": "csmpv", "version": "1.0.3", "sha256": "13b7i4ri0a3cjnhn14m72rff4gxxda556h38gjwp900mnjaqrwbj", - "depends": ["forestmodel", "ggplot2", "ggpubr", "glmnet", "Hmisc", "Matrix", "rms", "scales", "survival", "survminer", "xgboost"] + "depends": ["Hmisc", "Matrix", "forestmodel", "ggplot2", "ggpubr", "glmnet", "rms", "scales", "survival", "survminer", "xgboost"] }, "csn": { "name": "csn", @@ -51545,7 +52109,7 @@ "name": "csodata", "version": "1.5.0", "sha256": "11sgkf6xy3wh73yqhcjcpif9w73026rmiwm5vcgm21fg9fl4hyfk", - "depends": ["dplyr", "httr", "jsonlite", "lifecycle", "lubridate", "R_cache", "reshape2", "rjstat", "sf", "tidyr"] + "depends": ["R_cache", "dplyr", "httr", "jsonlite", "lifecycle", "lubridate", "reshape2", "rjstat", "sf", "tidyr"] }, "cspec": { "name": "cspec", @@ -51565,11 +52129,17 @@ "sha256": "1q9a11v512dc96lrrd03w06s8x6c1a0j4z5x8qvq48f4q7k30l1r", "depends": [] }, + "csquares": { + "name": "csquares", + "version": "0.0.7", + "sha256": "0ah6w153vawv4047196rcwpd1vrs8czya8pl1pmxdqm2kn0g7f9x", + "depends": ["dplyr", "purrr", "rlang", "sf", "stars", "stringr", "tidyr", "tidyselect", "vctrs"] + }, "csranks": { "name": "csranks", "version": "1.2.2", "sha256": "0rnwgi7446cz54lsgpnl6j6qdd4hfcwhcvvbks2hxyq5a0hr3gh3", - "depends": ["cli", "ggplot2", "lifecycle", "MASS", "scales"] + "depends": ["MASS", "cli", "ggplot2", "lifecycle", "scales"] }, "cssTools": { "name": "cssTools", @@ -51581,7 +52151,7 @@ "name": "cstab", "version": "0.2-2", "sha256": "1lr401fvi88f4jv8jh4brx95ymncfw8clripz1r6a46inj80nj4j", - "depends": ["cluster", "fastcluster", "Rcpp"] + "depends": ["Rcpp", "cluster", "fastcluster"] }, "cstidy": { "name": "cstidy", @@ -51599,7 +52169,7 @@ "name": "csurvey", "version": "1.9", "sha256": "0g41mh332imf03xwxpa3ghmi8dmdpva8wb1z794as3gp5hjddsh5", - "depends": ["cgam", "coneproj", "igraph", "MASS", "Matrix", "purrr", "survey"] + "depends": ["MASS", "Matrix", "cgam", "coneproj", "igraph", "purrr", "survey"] }, "csutil": { "name": "csutil", @@ -51663,9 +52233,9 @@ }, "cthist": { "name": "cthist", - "version": "2.1.9", - "sha256": "0gdni6jfqq4k4w5b42va0hm7fc1k8v8b3imlip6fn9kni388a2xl", - "depends": ["assertthat", "dplyr", "httr", "jsonlite", "magrittr", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr"] + "version": "2.1.11", + "sha256": "01d5fkc15k96bp3ymvxlf27789d4wl1913w0vlshq0sdaknsq1xy", + "depends": ["assertthat", "dplyr", "httr", "jsonlite", "lubridate", "magrittr", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr"] }, "cthreshER": { "name": "cthreshER", @@ -51683,25 +52253,25 @@ "name": "ctmcd", "version": "1.4.4", "sha256": "0w0dhxw9qdh7p59d4xkm3h5zhmvawgy9lsw84nh9vphrqrzbfghm", - "depends": ["coda", "expm", "numDeriv", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "coda", "expm", "numDeriv"] }, "ctmcmove": { "name": "ctmcmove", "version": "1.2.9", "sha256": "1pxyxbbhfa8arqfb7qw10ya1b8hy9ylqbqqzys6d9dsixvdk98h0", - "depends": ["fda", "gdistance", "Matrix", "raster", "sp"] + "depends": ["Matrix", "fda", "gdistance", "raster", "sp"] }, "ctmle": { "name": "ctmle", "version": "0.1.2", "sha256": "0qc1ji8fjpr88dn6mrpijfcx1ij4zkrxsbcw405hxal7rli0gyp3", - "depends": ["glmnet", "SuperLearner", "tmle"] + "depends": ["SuperLearner", "glmnet", "tmle"] }, "ctmm": { "name": "ctmm", "version": "1.2.0", "sha256": "0fmihi6ihk4jgg0abyhlfhg4wx91sq06xr11dc0vbhcyaq2090r4", - "depends": ["Bessel", "data_table", "digest", "expm", "fasttime", "Gmedian", "gsl", "manipulate", "MASS", "numDeriv", "parsedate", "pbivnorm", "pracma", "raster", "sf", "shape", "sp", "statmod", "terra"] + "depends": ["Bessel", "Gmedian", "MASS", "data_table", "digest", "expm", "fasttime", "gsl", "manipulate", "numDeriv", "parsedate", "pbivnorm", "pracma", "raster", "sf", "shape", "sp", "statmod", "terra"] }, "ctmva": { "name": "ctmva", @@ -51713,7 +52283,7 @@ "name": "ctpm", "version": "1.0.1", "sha256": "1bycdh3mbimmfvv3yb50c8rwcmkbjj0jwnfiynsp2h56y3dmzc1r", - "depends": ["ape", "ClusterR", "ctmm", "slouch"] + "depends": ["ClusterR", "ape", "ctmm", "slouch"] }, "ctqr": { "name": "ctqr", @@ -51723,15 +52293,15 @@ }, "ctrdata": { "name": "ctrdata", - "version": "1.18.0", - "sha256": "01y4cf4cwnsaykdbakq68bfrargn9ai492jcbq023d0w9hv78r0b", - "depends": ["clipr", "curl", "digest", "dplyr", "httr", "jqr", "jsonlite", "lubridate", "nodbi", "readr", "stringi", "tibble", "V8", "xml2", "zip"] + "version": "1.19.1", + "sha256": "0w0bl39lgkb7fqvm3mg3b45kak1kjfjy2ghq31gwymyx41vh220v", + "depends": ["V8", "clipr", "countrycode", "curl", "digest", "dplyr", "httr", "jqr", "jsonlite", "lubridate", "nodbi", "readr", "stringi", "tibble", "xml2", "zip"] }, "ctrialsgov": { "name": "ctrialsgov", "version": "0.2.5", "sha256": "0hdh1fdfaja8amf7fkvk1c6yif703132bvacq0j9pk5jr97czgpw", - "depends": ["DBI", "dplyr", "ggplot2", "htmlwidgets", "lubridate", "Matrix", "plotly", "purrr", "rlang", "stringi", "tibble"] + "depends": ["DBI", "Matrix", "dplyr", "ggplot2", "htmlwidgets", "lubridate", "plotly", "purrr", "rlang", "stringi", "tibble"] }, "ctrlGene": { "name": "ctrlGene", @@ -51743,19 +52313,19 @@ "name": "ctsem", "version": "3.10.0", "sha256": "10ip34y03jiidwcmqlvhb4sw0f0972l3pkx694whr1dlnlb57yjr", - "depends": ["BH", "cOde", "data_table", "Deriv", "expm", "ggplot2", "MASS", "Matrix", "mize", "mvtnorm", "plyr", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "statmod", "tibble"] + "depends": ["BH", "Deriv", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cOde", "data_table", "expm", "ggplot2", "mize", "mvtnorm", "plyr", "rstan", "rstantools", "statmod", "tibble"] }, "ctsemOMX": { "name": "ctsemOMX", "version": "1.0.6", "sha256": "1vr7zpxfhwzj8v54dzgk42hvjb4433y9r8al9069prkrvlv74gx8", - "depends": ["ctsem", "Matrix", "OpenMx", "plyr"] + "depends": ["Matrix", "OpenMx", "ctsem", "plyr"] }, "ctsfeatures": { "name": "ctsfeatures", "version": "1.2.2", "sha256": "0nmqx56mbmanq6y3msdkii144srgxvyl0lzwhixm719xhjii39w3", - "depends": ["astsa", "Bolstad2", "ggplot2", "latex2exp", "Rdpack", "tsibble"] + "depends": ["Bolstad2", "Rdpack", "astsa", "ggplot2", "latex2exp", "tsibble"] }, "ctv": { "name": "ctv", @@ -51763,6 +52333,12 @@ "sha256": "1mr37p7mdv2p8rswz9clwj25ipm16pc4a7flwg3a4bgyj1n5mz55", "depends": [] }, + "ctxR": { + "name": "ctxR", + "version": "1.0.0", + "sha256": "1m3hj5cwghm7nx9s5z3j6yby2i04ykich213x6j0gps4n4c8zanr", + "depends": ["cli", "data_table", "httr", "jsonlite", "purrr", "rlang", "stringr", "tibble", "tidyr", "urltools"] + }, "cuRe": { "name": "cuRe", "version": "1.1.1", @@ -51771,20 +52347,20 @@ }, "cubar": { "name": "cubar", - "version": "0.5.0", - "sha256": "12rqg50v7f0akd5d698lmf0vg1gg84lx9wjv7wvfikbyhpqk9wq6", - "depends": ["Biostrings", "data_table", "ggplot2", "IRanges", "rlang"] + "version": "1.0.0", + "sha256": "1hggjq1p6xcffvr13pxjc4345gzrbaxppryn6ijf2b56ffzy7xgx", + "depends": ["Biostrings", "IRanges", "data_table", "ggplot2", "rlang"] }, "cubature": { "name": "cubature", - "version": "2.1.0", - "sha256": "0r9n4xpm3ssjn3vywzlgh3naynzp1cxvjsd0pvah04k115b7i0jx", + "version": "2.1.1", + "sha256": "1156gv8ca3k034f34h50g0a4dg65dpv9d676i7h11rpl6gkj0wmk", "depends": ["Rcpp"] }, "cubble": { "name": "cubble", - "version": "0.3.0", - "sha256": "0jjdz7yi58h2rvwbanzq4nq9lrbx4dcb03l1qlfkbqamn4s4hz5v", + "version": "0.3.2", + "sha256": "1nbamkzzlzabgq41szc4kp1q58sirq0gp0x95wv1idax37p4gh9i", "depends": ["cli", "dplyr", "ggplot2", "glue", "lubridate", "ncdf4", "rlang", "sf", "stringr", "tibble", "tidyr", "tidyselect", "tsibble", "vctrs"] }, "cubelyr": { @@ -51819,21 +52395,21 @@ }, "cucumber": { "name": "cucumber", - "version": "1.0.3", - "sha256": "1drdx59pzm8fwmp1hjliq21ba16jahlx5f0ban5qgig0xni3vz8y", + "version": "1.0.4", + "sha256": "0wgj0pb0h4f1n6gaml0hgbxs5pdwq6dhlmc40nk80zh95shfbhj6", "depends": ["checkmate", "dplyr", "fs", "glue", "purrr", "rlang", "stringr", "testthat", "tibble", "withr"] }, "cuda_ml": { "name": "cuda.ml", "version": "0.3.2", "sha256": "0vqmy8qs3234gllpymvnf2x4a5g9rcmn9ja8cvccksvx6bh10mgz", - "depends": ["ellipsis", "hardhat", "parsnip", "Rcpp", "rlang"] + "depends": ["Rcpp", "ellipsis", "hardhat", "parsnip", "rlang"] }, "cultevo": { "name": "cultevo", "version": "1.0.2", "sha256": "0rmncp4mrdpf3izhhqn9406i36j3d3d7i8cglip04lkfbypl9jvy", - "depends": ["combinat", "Hmisc", "pspearman", "stringi"] + "depends": ["Hmisc", "combinat", "pspearman", "stringi"] }, "cumSeg": { "name": "cumSeg", @@ -51935,13 +52511,13 @@ "name": "curvHDR", "version": "1.2-2", "sha256": "05i4q6lrzm23nvs5wkxxpa9c4ldz3khgsk5sw3cgzdzn3cm6a0xf", - "depends": ["feature", "geometry", "hdrcde", "KernSmooth", "ks", "misc3d", "ptinpoly", "rgl"] + "depends": ["KernSmooth", "feature", "geometry", "hdrcde", "ks", "misc3d", "ptinpoly", "rgl"] }, "curveDepth": { "name": "curveDepth", "version": "0.1.0.9", "sha256": "10mhy2nyll4d1q71qnlsal0raccz3awd0j0vi5w58di9wlv1c241", - "depends": ["ddalpha", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "ddalpha"] }, "curvecomp": { "name": "curvecomp", @@ -51953,12 +52529,12 @@ "name": "curvir", "version": "0.1.1", "sha256": "132cqsya612k8mhrhwl0133nhj30p0fa43q819s7cq0rnwhnna64", - "depends": ["abind", "cvTools", "mgcv", "pbapply", "pso", "qgam", "quantregForest", "randomForest", "RColorBrewer"] + "depends": ["RColorBrewer", "abind", "cvTools", "mgcv", "pbapply", "pso", "qgam", "quantregForest", "randomForest"] }, "cusp": { "name": "cusp", - "version": "2.3.6", - "sha256": "0rpljddawrbq2q04fc426s57wbl3adp6mfkdv8bpjkfcyq2swbdh", + "version": "2.3.8", + "sha256": "010qb3asn3nml44xyn7ch2vm8fhjh3a28hqivvr1q7mdzqjq6v3x", "depends": [] }, "custom_gauss_quad": { @@ -51967,6 +52543,12 @@ "sha256": "1rpg3wrpvmn24a8kmm3mwyqmrcx2pxhhrf40wp31nv8jfy7cfm7c", "depends": ["Rmpfr"] }, + "customiser": { + "name": "customiser", + "version": "0.1.1", + "sha256": "0rwky3nrg6xhxb07v24d9j4359rmsn78xfxnv57kay8n5pmmh1s0", + "depends": ["fs", "knitr", "rlang", "rmarkdown", "withr"] + }, "customizedTraining": { "name": "customizedTraining", "version": "1.2", @@ -51977,7 +52559,7 @@ "name": "cusum", "version": "0.4.1", "sha256": "0vjq3slkjdgls41xm637xkrg8jhv6y75xiyfcgpwrp32ixmakpcd", - "depends": ["checkmate", "data_table", "Rcpp"] + "depends": ["Rcpp", "checkmate", "data_table"] }, "cusumcharter": { "name": "cusumcharter", @@ -51989,31 +52571,31 @@ "name": "cutoff", "version": "1.3", "sha256": "0anrvmlvcxah620il3fkq6ldp7hx4nwdnzcpmfc5mhlsry0lp178", - "depends": ["do", "ROCit", "set", "survival"] + "depends": ["ROCit", "do", "set", "survival"] }, "cutpointr": { "name": "cutpointr", "version": "1.1.2", "sha256": "1qxnh20hs3bh9v04ls7gwwl7lfc6bwl8c88dn8lkcdqyp3nyr01j", - "depends": ["dplyr", "foreach", "ggplot2", "gridExtra", "purrr", "Rcpp", "rlang", "tibble", "tidyr", "tidyselect"] + "depends": ["Rcpp", "dplyr", "foreach", "ggplot2", "gridExtra", "purrr", "rlang", "tibble", "tidyr", "tidyselect"] }, "cv": { "name": "cv", "version": "2.0.0", "sha256": "1jhvi0bf8r66q2kqjylg0fdnzxpsaxq1ivm82akhczivjn39wvv8", - "depends": ["car", "doParallel", "foreach", "glmmTMB", "gtools", "insight", "lme4", "MASS", "nlme"] + "depends": ["MASS", "car", "doParallel", "foreach", "glmmTMB", "gtools", "insight", "lme4", "nlme"] }, "cvAUC": { "name": "cvAUC", "version": "1.1.4", "sha256": "1m2y50a1yapf1c74km9a4r47ds2z2bfp4wwwkqin7swv9v1s7d28", - "depends": ["data_table", "ROCR"] + "depends": ["ROCR", "data_table"] }, "cvCovEst": { "name": "cvCovEst", "version": "1.2.2", "sha256": "148qb2995h9an2zp6rn0lvy8c6x1iiqx4cdfhzx6jdixra3593im", - "depends": ["assertthat", "coop", "dplyr", "ggplot2", "ggpubr", "Matrix", "matrixStats", "origami", "purrr", "RColorBrewer", "Rdpack", "rlang", "RMTstat", "RSpectra", "stringr", "tibble"] + "depends": ["Matrix", "RColorBrewer", "RMTstat", "RSpectra", "Rdpack", "assertthat", "coop", "dplyr", "ggplot2", "ggpubr", "matrixStats", "origami", "purrr", "rlang", "stringr", "tibble"] }, "cvGEE": { "name": "cvGEE", @@ -52021,6 +52603,12 @@ "sha256": "085qjm520l2441nakfxy851s6bfy5832b5fy54z5fp4xr1jn6snm", "depends": [] }, + "cvLM": { + "name": "cvLM", + "version": "1.0.4", + "sha256": "1mbafa75l1y757nvcqlamr98vd5qnaxakx3bsvjwrknyq29z27fs", + "depends": ["Rcpp", "RcppEigen", "RcppParallel"] + }, "cvTools": { "name": "cvTools", "version": "0.3.3", @@ -52037,12 +52625,12 @@ "name": "cvar", "version": "0.5", "sha256": "066vn8flw9j0idmpi9wzvybgihdhwg3fjslx2isbrb11ldl1lwky", - "depends": ["gbutils", "Rdpack"] + "depends": ["Rdpack", "gbutils"] }, "cvasi": { "name": "cvasi", - "version": "1.1.0", - "sha256": "17w13b1h8nri74j5s94klwmrzjcd88llz2n84v54nc6nza77yk9g", + "version": "1.1.3", + "sha256": "0915nxf2g2v2z8mdah2cshba2ji00v3m3mbj4djfnqjcvnj8p829", "depends": ["attempt", "cli", "deSolve", "dplyr", "furrr", "ggplot2", "glue", "lemna", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "units"] }, "cvcrand": { @@ -52061,7 +52649,7 @@ "name": "cvmaPLFAM", "version": "0.1.0", "sha256": "1qmd4zbh70z1vgc6mxfr9scvqw923y9qdxjf80i826bdh7sc4wq3", - "depends": ["fda", "MASS", "mgcv", "quadprog"] + "depends": ["MASS", "fda", "mgcv", "quadprog"] }, "cvmdisc": { "name": "cvmdisc", @@ -52077,15 +52665,15 @@ }, "cvms": { "name": "cvms", - "version": "1.6.1", - "sha256": "0iwg6biy700lgn038ws0dk0qqfl7nws1nxcgkhdd4wm6ki4qb1pq", - "depends": ["checkmate", "data_table", "dplyr", "ggplot2", "groupdata2", "lifecycle", "lme4", "MuMIn", "parameters", "plyr", "pROC", "purrr", "rearrr", "recipes", "rlang", "stringr", "tibble", "tidyr"] + "version": "1.6.2", + "sha256": "08l33vianqd7kdxy5mys54cqahnp10sdzs2pmpd3iq97cs1qx4qb", + "depends": ["MuMIn", "checkmate", "data_table", "dplyr", "ggplot2", "groupdata2", "lifecycle", "lme4", "pROC", "parameters", "plyr", "purrr", "rearrr", "recipes", "rlang", "stringr", "tibble", "tidyr"] }, "cvsem": { "name": "cvsem", "version": "1.0.0", "sha256": "148v8axwxfr328l709b6q1fmqnzmiw9g7589zgwha4d6lrx4ak4i", - "depends": ["lavaan", "Rdpack"] + "depends": ["Rdpack", "lavaan"] }, "cvwrapr": { "name": "cvwrapr", @@ -52097,19 +52685,19 @@ "name": "cwbtools", "version": "0.4.2", "sha256": "1aanda6rj60rkkbkxijj4r4bx0caiyr9ifw0pg6nabv4fwfnlb4x", - "depends": ["cli", "curl", "data_table", "fs", "httr", "jsonlite", "lifecycle", "pbapply", "R6", "RcppCWB", "rstudioapi", "stringi", "xml2", "zen4R"] + "depends": ["R6", "RcppCWB", "cli", "curl", "data_table", "fs", "httr", "jsonlite", "lifecycle", "pbapply", "rstudioapi", "stringi", "xml2", "zen4R"] }, "cwot": { "name": "cwot", "version": "0.1.0", "sha256": "1qg9aizkz40sfm65b8sxcmj1232zb3ds8gds45lv0prf8alc7az3", - "depends": ["mvtnorm", "SPAtest"] + "depends": ["SPAtest", "mvtnorm"] }, "cxhull": { "name": "cxhull", "version": "0.7.4", "sha256": "0jxr1fz7cyarcq50jkkc2f3f1zwmbljpdpl56hfcilb43z2rkzkj", - "depends": ["data_table", "rgl", "Rvcg"] + "depends": ["Rvcg", "data_table", "rgl"] }, "cxr": { "name": "cxr", @@ -52133,7 +52721,7 @@ "name": "cyclestreets", "version": "1.0.1", "sha256": "0xrgwhlq670m109j27ln93zzq0wm8cfbkivd45v2rldxgvd50348", - "depends": ["checkmate", "curl", "data_table", "dplyr", "geojsonsf", "httr", "jsonlite", "magrittr", "progressr", "RcppSimdJson", "readr", "sf", "stringi", "stringr"] + "depends": ["RcppSimdJson", "checkmate", "curl", "data_table", "dplyr", "geojsonsf", "httr", "jsonlite", "magrittr", "progressr", "readr", "sf", "stringi", "stringr"] }, "cyclocomp": { "name": "cyclocomp", @@ -52157,7 +52745,7 @@ "name": "cyclotomic", "version": "1.3.0", "sha256": "1r2z21d2fylifw39ascx73k4rlfa3b1zg2pdbm2j7hg7g7rsr8w5", - "depends": ["gmp", "intmap", "maybe", "memoise", "numbers", "VeryLargeIntegers"] + "depends": ["VeryLargeIntegers", "gmp", "intmap", "maybe", "memoise", "numbers"] }, "cyjShiny": { "name": "cyjShiny", @@ -52169,7 +52757,7 @@ "name": "cylcop", "version": "0.2.0", "sha256": "1kh1h7zmk2d2p81ih1xyf3rv1g9gpjrdwyj3j812kp0krz71km4n", - "depends": ["circular", "copula", "cowplot", "data_table", "dplyr", "ggplot2", "GoFKernel", "infotheo", "MASS", "mixR", "movMF", "plotly", "purrr", "Rdpack", "rgl", "rlang", "stringr", "transport", "viridis"] + "depends": ["GoFKernel", "MASS", "Rdpack", "circular", "copula", "cowplot", "data_table", "dplyr", "ggplot2", "infotheo", "mixR", "movMF", "plotly", "purrr", "rgl", "rlang", "stringr", "transport", "viridis"] }, "cymruservices": { "name": "cymruservices", @@ -52193,19 +52781,19 @@ "name": "cytofan", "version": "0.1.0", "sha256": "0gqs98mnwiawnyfb9hs5nlin8d1fj64bszn4b40gs8ajyh36r9pp", - "depends": ["ggplot2", "RColorBrewer"] + "depends": ["RColorBrewer", "ggplot2"] }, "cytometree": { "name": "cytometree", "version": "2.0.2", "sha256": "18g7av73lmnyga1kk24bf8jy599zn9n6qhr13mxsqgi0zdinicfa", - "depends": ["cowplot", "ggplot2", "GoFKernel", "igraph", "mclust", "Rcpp", "RcppArmadillo"] + "depends": ["GoFKernel", "Rcpp", "RcppArmadillo", "cowplot", "ggplot2", "igraph", "mclust"] }, "cytominer": { "name": "cytominer", "version": "0.2.2", "sha256": "1n9yimjhdziv1vzjyni6ssi38nxcnfr5jpmzgxcn6vysffh5s9pz", - "depends": ["caret", "doParallel", "dplyr", "foreach", "futile_logger", "magrittr", "Matrix", "purrr", "rlang", "tibble", "tidyr"] + "depends": ["Matrix", "caret", "doParallel", "dplyr", "foreach", "futile_logger", "magrittr", "purrr", "rlang", "tibble", "tidyr"] }, "czechrates": { "name": "czechrates", @@ -52215,8 +52803,8 @@ }, "czso": { "name": "czso", - "version": "0.3.12", - "sha256": "0zg1sqka0m1cc5cwdkb0b12fb27mj4skz2vbvn6xqjbww1yjxrpd", + "version": "0.4.1", + "sha256": "0hsml601swdig8ky210c8w3n2zfgn3f14ai9l43ni1iplkcpcdxi", "depends": ["cli", "curl", "dplyr", "httr", "jsonlite", "lifecycle", "magrittr", "readr", "rlang", "stringi", "tibble"] }, "d3Network": { @@ -52253,7 +52841,7 @@ "name": "d4storagehub4R", "version": "0.4-4", "sha256": "0ixv8wypcvcrn3xig8sg54mizsll4v2665l8hqd1q15d0ln2p789", - "depends": ["httr", "jsonlite", "keyring", "R6", "XML", "xml2"] + "depends": ["R6", "XML", "httr", "jsonlite", "keyring", "xml2"] }, "dBlockmodeling": { "name": "dBlockmodeling", @@ -52265,7 +52853,7 @@ "name": "dCUR", "version": "1.0.1", "sha256": "1blrxgf911b1y2pcp3hsv6cigpnclscjadlf5656kldblzj5w5m1", - "depends": ["dplyr", "ggplot2", "magrittr", "MASS", "mclust", "ppcor", "Rdpack"] + "depends": ["MASS", "Rdpack", "dplyr", "ggplot2", "magrittr", "mclust", "ppcor"] }, "dChipIO": { "name": "dChipIO", @@ -52277,13 +52865,13 @@ "name": "dCovTS", "version": "1.4", "sha256": "0rwbs1z9pf8f6hpp3df584c0k5g4frbzcwr288inh1cg51maphq4", - "depends": ["dcov", "doParallel", "foreach", "Rfast", "Rfast2"] + "depends": ["Rfast", "Rfast2", "dcov", "doParallel", "foreach"] }, "dGAselID": { "name": "dGAselID", "version": "1.2", "sha256": "0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6", - "depends": ["ALL", "Biobase", "genefilter", "MLInterfaces"] + "depends": ["ALL", "Biobase", "MLInterfaces", "genefilter"] }, "dHSIC": { "name": "dHSIC", @@ -52295,7 +52883,7 @@ "name": "dLagM", "version": "1.1.13", "sha256": "0wn09qdmnahn0imi17yq4flcnr69cms832si1z03l9xwcjkfjxfm", - "depends": ["AER", "dynlm", "formula_tools", "lmtest", "MASS", "nardl", "plyr", "roll", "sandwich", "strucchange", "wavethresh"] + "depends": ["AER", "MASS", "dynlm", "formula_tools", "lmtest", "nardl", "plyr", "roll", "sandwich", "strucchange", "wavethresh"] }, "dMod": { "name": "dMod", @@ -52349,13 +52937,13 @@ "name": "dabr", "version": "0.0.4", "sha256": "14q8frsg8qk46yldawh58cjm4v10im4ar5r5f4yfdxf6jdaadfih", - "depends": ["knitr", "magrittr", "RMariaDB", "tibble"] + "depends": ["RMariaDB", "knitr", "magrittr", "tibble"] }, "dacc": { "name": "dacc", - "version": "0.0-3", - "sha256": "1hd6n6411pb3r9s69b0b9b5a94cnbq6b098yj681bn737ldraj52", - "depends": ["Iso", "janitor", "magrittr", "MASS", "pracma"] + "version": "0.0-4", + "sha256": "09mnmlh3b0xlh3qcf7k0cfaszybj9dgpxczlllwjyymx7zmi1pmk", + "depends": ["CFtime", "Iso", "MASS", "janitor", "magrittr", "ncdf4", "pracma", "sp"] }, "dad": { "name": "dad", @@ -52379,7 +52967,7 @@ "name": "dados", "version": "0.1.0", "sha256": "1jdna8s10qz50zrsrm36y1jx489sznd86akx2lwdmriiiz3abn65", - "depends": ["AmesHousing", "babynames", "dplyr", "forcats", "fueleconomy", "gapminder", "ggplot2", "Lahman", "nasaweather", "nycflights13", "palmerpenguins", "pixarfilms", "rlang", "tibble", "tidyr", "yaml"] + "depends": ["AmesHousing", "Lahman", "babynames", "dplyr", "forcats", "fueleconomy", "gapminder", "ggplot2", "nasaweather", "nycflights13", "palmerpenguins", "pixarfilms", "rlang", "tibble", "tidyr", "yaml"] }, "dae": { "name": "dae", @@ -52397,12 +52985,12 @@ "name": "daff", "version": "1.1.1", "sha256": "0zbh3p7d2r04j9kzfk32j2zw9f745dk7yl2dx8lflrm0zidwbxc4", - "depends": ["jsonlite", "V8"] + "depends": ["V8", "jsonlite"] }, "dafishr": { "name": "dafishr", - "version": "1.0.0", - "sha256": "1n6b1r1awwxvdhn4znwp1p4jp3gvrjz017darjagx4cix0iisw1p", + "version": "1.0.1", + "sha256": "1pdw0qrsln6cf7k1r0a09j7va5nzyz7a484nz5fjccxs0lwgxhjx", "depends": ["dplyr", "fst", "ggplot2", "lubridate", "magrittr", "mixtools", "readr", "readxl", "rlang", "sf", "stringr", "tibble", "tidyr", "tidyselect", "vroom"] }, "dafs": { @@ -52421,13 +53009,13 @@ "name": "dagirlite", "version": "0.1.0", "sha256": "12j5mfxcv32qgx1yklcq8yl2kx4lkxap4biywjrj0sjx6zj60f8l", - "depends": ["knitr", "Rdpack"] + "depends": ["Rdpack", "knitr"] }, "dagitty": { "name": "dagitty", "version": "0.3-4", "sha256": "10iw5ldra7ih3jpp1iaac6cbfgpl62bq09zl30c0z03mzhj18vvr", - "depends": ["boot", "jsonlite", "MASS", "V8"] + "depends": ["MASS", "V8", "boot", "jsonlite"] }, "dagwood": { "name": "dagwood", @@ -52445,7 +53033,7 @@ "name": "dail", "version": "1.5.2", "sha256": "0a82ch0l7ci9vjrwyy38qhw8zrp9d4h2bmk963llm9aqf4j7lkhf", - "depends": ["deflateBR", "dplyr", "janitor", "lubridate", "magrittr", "RCurl", "readr", "stopwords", "stringr", "tidytext"] + "depends": ["RCurl", "deflateBR", "dplyr", "janitor", "lubridate", "magrittr", "readr", "stopwords", "stringr", "tidytext"] }, "daiquiri": { "name": "daiquiri", @@ -52457,13 +53045,13 @@ "name": "daltoolbox", "version": "1.0.767", "sha256": "02rhbcgjwlx45y0641yjlamzgl2swm60hmvwppr4nk24hb0hjczs", - "depends": ["caret", "class", "cluster", "dbscan", "dplyr", "e1071", "elmNNRcpp", "FNN", "forecast", "ggplot2", "MLmetrics", "nnet", "randomForest", "reshape", "reticulate", "tree"] + "depends": ["FNN", "MLmetrics", "caret", "class", "cluster", "dbscan", "dplyr", "e1071", "elmNNRcpp", "forecast", "ggplot2", "nnet", "randomForest", "reshape", "reticulate", "tree"] }, "daltoolboxdp": { "name": "daltoolboxdp", "version": "1.0.767", "sha256": "1l34wb2vl9wmf0vrhis29w4hz1m9jx9qdfi494rfnwals054j3ah", - "depends": ["daltoolbox", "doBy", "FSelector", "glmnet", "leaps", "smotefamily"] + "depends": ["FSelector", "daltoolbox", "doBy", "glmnet", "leaps", "smotefamily"] }, "dam": { "name": "dam", @@ -52473,9 +53061,9 @@ }, "damAOI": { "name": "damAOI", - "version": "0.0", - "sha256": "1vfc1nwzr76djmwriln9dh8hj6iq5ji9vxfnpzydl34niqckscf0", - "depends": ["dplyr", "FNN", "leaflet", "magrittr", "sf", "shiny", "shinydashboard", "smoothr", "terra", "tibble", "tidyr", "units"] + "version": "0.1", + "sha256": "14cfixlc50ml9l2b8m397b292ddq1l36bp8yqw8jw93c3d1q3zpp", + "depends": ["FNN", "dplyr", "leaflet", "magrittr", "sf", "shiny", "shinydashboard", "smoothr", "terra", "tibble", "tidyr", "units"] }, "damr": { "name": "damr", @@ -52505,7 +53093,7 @@ "name": "dann", "version": "1.0.0", "sha256": "0hmmkzv3cq0yl8kgcj08557zx086ablh6ngmyxhb1chig7kmmb4x", - "depends": ["ellipsis", "fpc", "ggplot2", "hardhat", "MASS", "purrr", "Rcpp", "RcppArmadillo", "rlang", "stringr", "tibble"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "ellipsis", "fpc", "ggplot2", "hardhat", "purrr", "rlang", "stringr", "tibble"] }, "danstat": { "name": "danstat", @@ -52513,6 +53101,12 @@ "sha256": "16b0dl41g56s6iyxndpl403wgqqj1l3g9k78y3ciq5djq3a25m97", "depends": ["httr", "jsonlite", "readr"] }, + "dapper": { + "name": "dapper", + "version": "1.0.0", + "sha256": "06s78b80215lxsi68isaha6kfrr0490s4bg0y9yf5v5ns9a6x0wv", + "depends": ["bayesplot", "checkmate", "furrr", "memoise", "posterior", "progressr"] + }, "daqapo": { "name": "daqapo", "version": "0.3.2", @@ -52529,13 +53123,13 @@ "name": "dartR", "version": "2.9.7", "sha256": "1wwm2gq743l90jsa1hsgxknqxqp0ga8vf3xv652m3ifpyrkp93vx", - "depends": ["adegenet", "ape", "crayon", "dartR_data", "data_table", "dplyr", "fields", "foreach", "ggplot2", "gridExtra", "MASS", "patchwork", "plyr", "PopGenReport", "raster", "reshape2", "shiny", "SNPRelate", "sp", "StAMPP", "stringr", "tidyr", "vegan"] + "depends": ["MASS", "PopGenReport", "SNPRelate", "StAMPP", "adegenet", "ape", "crayon", "dartR_data", "data_table", "dplyr", "fields", "foreach", "ggplot2", "gridExtra", "patchwork", "plyr", "raster", "reshape2", "shiny", "sp", "stringr", "tidyr", "vegan"] }, "dartR_base": { "name": "dartR.base", "version": "0.65", "sha256": "1887ksyszlp65i4z6zhh6j1pihfkkimiwrv6bqav5z7gmw2i0pi7", - "depends": ["adegenet", "ape", "crayon", "dartR_data", "data_table", "dplyr", "foreach", "ggplot2", "gridExtra", "MASS", "patchwork", "plyr", "reshape2", "SNPRelate", "StAMPP", "stringr", "tidyr"] + "depends": ["MASS", "SNPRelate", "StAMPP", "adegenet", "ape", "crayon", "dartR_data", "data_table", "dplyr", "foreach", "ggplot2", "gridExtra", "patchwork", "plyr", "reshape2", "stringr", "tidyr"] }, "dartR_captive": { "name": "dartR.captive", @@ -52551,21 +53145,27 @@ }, "dartR_popgen": { "name": "dartR.popgen", - "version": "0.32", - "sha256": "1sr9dd6nyspcv0lvj42qa1wpnichjxq1nqp6rl0i6f6jz00fm5mv", - "depends": ["adegenet", "crayon", "dartR_base", "dartR_data", "data_table", "dplyr", "ggplot2", "MASS", "patchwork", "stringr"] + "version": "1.0.0", + "sha256": "0wi2pkd3c2f05m0g3mhr3j6nq0wgn656c6z8h4vlphfinnz0knja", + "depends": ["MASS", "adegenet", "crayon", "dartR_base", "dartR_data", "data_table", "dplyr", "furrr", "future", "ggdendro", "ggplot2", "patchwork", "stringr"] + }, + "dartR_sexlinked": { + "name": "dartR.sexlinked", + "version": "1.0.5", + "sha256": "07x9zly2vwzd9riw0hfwl8nqq4chs9rgwjj7b39whz25an6aqvvw", + "depends": ["adegenet", "dartR_base", "dartR_data", "doParallel", "foreach", "ggplot2", "patchwork"] }, "dartR_sim": { "name": "dartR.sim", "version": "0.70", "sha256": "02l18hvdd1hr9l15frvaw7nikjmr7iyq3wvg5xz8drma4v9r9lwb", - "depends": ["adegenet", "dartR_base", "dartR_data", "data_table", "fields", "ggplot2", "hierfstat", "Rcpp", "reshape2", "shiny", "shinyBS", "shinyjs", "shinythemes", "shinyWidgets", "stringi", "stringr"] + "depends": ["Rcpp", "adegenet", "dartR_base", "dartR_data", "data_table", "fields", "ggplot2", "hierfstat", "reshape2", "shiny", "shinyBS", "shinyWidgets", "shinyjs", "shinythemes", "stringi", "stringr"] }, "dartR_spatial": { "name": "dartR.spatial", "version": "0.78", "sha256": "1fjajinsc2ikvhz4igjyldvfd5skdqhnay5209dzx4xjpnkik5vv", - "depends": ["adegenet", "crayon", "dartR_base", "dartR_data", "data_table", "ggplot2", "MASS", "raster", "sp", "StAMPP", "tidyr", "vegan"] + "depends": ["MASS", "StAMPP", "adegenet", "crayon", "dartR_base", "dartR_data", "data_table", "ggplot2", "raster", "sp", "tidyr", "vegan"] }, "dartRverse": { "name": "dartRverse", @@ -52583,7 +53183,7 @@ "name": "dat", "version": "0.5.0", "sha256": "1d3q4bang6pm06rfzh6h947xy3wwqn3l6ri0h4hzklg5pzwpsajd", - "depends": ["aoos", "data_table", "Formula", "magrittr", "progress"] + "depends": ["Formula", "aoos", "data_table", "magrittr", "progress"] }, "data_table": { "name": "data.table", @@ -52601,7 +53201,7 @@ "name": "data.validator", "version": "0.2.1", "sha256": "118crpyyp2szj0l3rsqmzi1cpcv45lwlvczp25f28z1lgcx6mgcx", - "depends": ["assertr", "dplyr", "htmltools", "htmlwidgets", "knitr", "purrr", "R6", "rlang", "rmarkdown", "shiny_semantic", "tibble", "tidyr"] + "depends": ["R6", "assertr", "dplyr", "htmltools", "htmlwidgets", "knitr", "purrr", "rlang", "rmarkdown", "shiny_semantic", "tibble", "tidyr"] }, "data360r": { "name": "data360r", @@ -52637,7 +53237,7 @@ "name": "dataPreparation", "version": "1.1.1", "sha256": "0ck3g9hymj6i1a9nr58srm8jxbaghh5w5jg9cqbx5zp18fc0w81v", - "depends": ["data_table", "lubridate", "Matrix", "progress", "stringr"] + "depends": ["Matrix", "data_table", "lubridate", "progress", "stringr"] }, "dataReporter": { "name": "dataReporter", @@ -52647,8 +53247,8 @@ }, "dataRetrieval": { "name": "dataRetrieval", - "version": "2.7.15", - "sha256": "0h5k68541nqg03hmfzfg4bqwjggl95yk9s2hlmfjxx3gxg4g5719", + "version": "2.7.16", + "sha256": "11hwk81vyzn6jx0z3flhh7gfwmfr1irysxghsbb2sgdqdffs6vh1", "depends": ["curl", "httr", "jsonlite", "lubridate", "readr", "xml2"] }, "dataSDA": { @@ -52659,9 +53259,9 @@ }, "databraryr": { "name": "databraryr", - "version": "0.6.4", - "sha256": "0ycpkdz3ln9a1yvcl142agk7cfzz0qh8yzx6y7ihy7zkl646m99m", - "depends": ["assertthat", "dplyr", "getPass", "httr", "httr2", "jsonlite", "keyring", "lifecycle", "magick", "magrittr", "plyr", "purrr", "rvest", "stringr", "tibble", "xfun"] + "version": "0.6.6", + "sha256": "0mws4jw81l91cml8fh4n244nzjrfznsg05vsqfbyc75ciqlmw8hk", + "depends": ["assertthat", "dplyr", "getPass", "httr2", "keyring", "lifecycle", "magick", "magrittr", "options", "purrr", "stringr", "tibble", "xfun"] }, "dataclass": { "name": "dataclass", @@ -52673,7 +53273,7 @@ "name": "datacleanr", "version": "1.0.3", "sha256": "0mrfqm3lgb6sl2j35sfd00gb5121j9wmlff8k0vczr3sgmqz4dg8", - "depends": ["bslib", "clipr", "dplyr", "DT", "formatR", "fs", "glue", "htmltools", "htmlwidgets", "lubridate", "magrittr", "plotly", "purrr", "RColorBrewer", "rlang", "rstudioapi", "shiny", "shinyFiles", "shinyWidgets", "summarytools"] + "depends": ["DT", "RColorBrewer", "bslib", "clipr", "dplyr", "formatR", "fs", "glue", "htmltools", "htmlwidgets", "lubridate", "magrittr", "plotly", "purrr", "rlang", "rstudioapi", "shiny", "shinyFiles", "shinyWidgets", "summarytools"] }, "datacutr": { "name": "datacutr", @@ -52709,19 +53309,19 @@ "name": "datafsm", "version": "0.2.4", "sha256": "0klhkbwpaqxk2mnxha8b03mpgfxk107ff9d2nx6cky59il3c1825", - "depends": ["caret", "GA", "Rcpp"] + "depends": ["GA", "Rcpp", "caret"] }, "datagovsgR": { "name": "datagovsgR", - "version": "1.0.0", - "sha256": "1vi3pql1k563ggvqr0d673z2aspvqi1w384lslinnsq85cwcfcly", + "version": "1.0.1", + "sha256": "1z3zrvz9dc9a06kp8agrgvx1l6g5hq2cmmn6xpabp68pkw4jdpc6", "depends": ["data_table", "dplyr", "httr", "purrr", "stringr"] }, "datamods": { "name": "datamods", "version": "1.5.1", "sha256": "0bxfa001j9vib0sj9d32qyzrqjvdzm5zxcpg1mm3jw31546jl46p", - "depends": ["classInt", "data_table", "htmltools", "phosphoricons", "reactable", "readxl", "rio", "rlang", "shiny", "shinybusy", "shinyWidgets", "tibble", "toastui", "writexl"] + "depends": ["classInt", "data_table", "htmltools", "phosphoricons", "reactable", "readxl", "rio", "rlang", "shiny", "shinyWidgets", "shinybusy", "tibble", "toastui", "writexl"] }, "datana": { "name": "datana", @@ -52731,9 +53331,9 @@ }, "datanugget": { "name": "datanugget", - "version": "1.2.4", - "sha256": "0r75vc6fzafv2kwq228w9iw0ryhwmly839dhcgf8bqgxyzd9gs16", - "depends": ["doSNOW", "foreach", "Rfast"] + "version": "1.3.0", + "sha256": "0l39yxvbxnzmxq1zjrm30a34ipwhjh5vnn7bqmsivbjci4z7mbyi", + "depends": ["Rfast", "doSNOW", "foreach"] }, "dataonderivatives": { "name": "dataonderivatives", @@ -52745,13 +53345,13 @@ "name": "dataone", "version": "2.2.2", "sha256": "0509dmvf3kgk15cjbz3m9fzanbdpa5r0rz921m776a4bsjsilv4i", - "depends": ["base64enc", "datapack", "httr", "jsonlite", "parsedate", "plyr", "stringi", "stringr", "uuid", "XML"] + "depends": ["XML", "base64enc", "datapack", "httr", "jsonlite", "parsedate", "plyr", "stringi", "stringr", "uuid"] }, "datapack": { "name": "datapack", "version": "1.4.1", "sha256": "14vlcgk5sckzkc15cjvrbs113y65rqlwm1az7nsvnsqfx4x76jb1", - "depends": ["digest", "fs", "redland", "uuid", "XML", "zip"] + "depends": ["XML", "digest", "fs", "redland", "uuid", "zip"] }, "datapasta": { "name": "datapasta", @@ -52769,7 +53369,7 @@ "name": "dataquieR", "version": "2.1.0", "sha256": "1y8s6igz7ckvqamz26lrks62fnh51w1gz18gv7saxkmiwcacfjh4", - "depends": ["dplyr", "emmeans", "ggplot2", "lifecycle", "lme4", "lubridate", "MASS", "MultinomialCI", "parallelMap", "patchwork", "qmrparser", "R_devices", "readr", "rio", "rlang", "robustbase", "scales", "units", "withr"] + "depends": ["MASS", "MultinomialCI", "R_devices", "dplyr", "emmeans", "ggplot2", "lifecycle", "lme4", "lubridate", "parallelMap", "patchwork", "qmrparser", "readr", "rio", "rlang", "robustbase", "scales", "units", "withr"] }, "datardis": { "name": "datardis", @@ -52835,13 +53435,13 @@ "name": "dataspice", "version": "1.1.0", "sha256": "1pnmb7kdx9wdvi2873rw1a7hc7spsvx4lfvfhfcqwgll46j0f1wm", - "depends": ["dplyr", "EML", "fs", "ggplot2", "jsonlite", "magrittr", "purrr", "readr", "rhandsontable", "shiny", "stringr", "tibble", "tidyr", "whisker"] + "depends": ["EML", "dplyr", "fs", "ggplot2", "jsonlite", "magrittr", "purrr", "readr", "rhandsontable", "shiny", "stringr", "tibble", "tidyr", "whisker"] }, "datastepr": { "name": "datastepr", "version": "0.0.2", "sha256": "039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2", - "depends": ["dplyr", "lazyeval", "magrittr", "R6", "tibble"] + "depends": ["R6", "dplyr", "lazyeval", "magrittr", "tibble"] }, "dataverifyr": { "name": "dataverifyr", @@ -52857,15 +53457,15 @@ }, "datawizard": { "name": "datawizard", - "version": "0.11.0", - "sha256": "0cghk6flxxsz079sw8l4aw1h4girg7mwl61237a7ymmhvny70d4k", + "version": "0.12.2", + "sha256": "10g05f6jm7q59ihsb8wpg5fyy2an56gv33l7jiimjc818hh6bqzy", "depends": ["insight"] }, "datazoom_amazonia": { "name": "datazoom.amazonia", "version": "1.1.0", "sha256": "1c2l42rwj67lr2910i1wdb04sqqwkdv5ycav6bz3snw349j8mycm", - "depends": ["data_table", "dplyr", "Hmisc", "janitor", "magrittr", "purrr", "Rcpp", "readr", "readxl", "sf", "sidrar", "stringi", "stringr", "tibble", "tidyr", "XML"] + "depends": ["Hmisc", "Rcpp", "XML", "data_table", "dplyr", "janitor", "magrittr", "purrr", "readr", "readxl", "sf", "sidrar", "stringi", "stringr", "tibble", "tidyr"] }, "date": { "name": "date", @@ -52883,13 +53483,13 @@ "name": "datefixR", "version": "1.6.1", "sha256": "1xmrx8djxc05r9yvgfgkvmp19m2pj6n2g1r4siikwkzlssh2x8fz", - "depends": ["lifecycle", "Rcpp", "rlang", "stringr"] + "depends": ["Rcpp", "lifecycle", "rlang", "stringr"] }, "datelife": { "name": "datelife", "version": "0.6.8", "sha256": "154nmpvslnizd03jaxbhkc7vjzjx7j18zlwmrpx2qidqk424k1i9", - "depends": ["abind", "ape", "BiocManager", "bold", "cluster", "compare", "curl", "data_table", "geiger", "httr", "ips", "knitcitations", "paleotree", "phangorn", "phylobase", "phylocomr", "phytools", "plyr", "rotl", "stringr", "taxize", "treebase"] + "depends": ["BiocManager", "abind", "ape", "bold", "cluster", "compare", "curl", "data_table", "geiger", "httr", "ips", "knitcitations", "paleotree", "phangorn", "phylobase", "phylocomr", "phytools", "plyr", "rotl", "stringr", "taxize", "treebase"] }, "daterangepicker": { "name": "daterangepicker", @@ -52925,7 +53525,7 @@ "name": "dateutils", "version": "0.1.5", "sha256": "03xch5wcvv15fy9x70smrki6374lddhf0sfp0inymdsq4g8wp4bc", - "depends": ["data_table", "Rcpp", "RcppArmadillo", "seasonal"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "seasonal"] }, "datoramar": { "name": "datoramar", @@ -52937,7 +53537,7 @@ "name": "datos", "version": "0.5.1", "sha256": "0358fshhxyws5i1bblhnhf7k42mrjn76ppy2qrvhj27kkc6i5npn", - "depends": ["babynames", "dplyr", "forcats", "fueleconomy", "gapminder", "ggplot2", "Lahman", "modeldata", "nasaweather", "nycflights13", "palmerpenguins", "rlang", "tibble", "tidyr", "yaml"] + "depends": ["Lahman", "babynames", "dplyr", "forcats", "fueleconomy", "gapminder", "ggplot2", "modeldata", "nasaweather", "nycflights13", "palmerpenguins", "rlang", "tibble", "tidyr", "yaml"] }, "datplot": { "name": "datplot", @@ -52955,12 +53555,12 @@ "name": "datrProfile", "version": "0.1.0", "sha256": "1bhyk3xjgwf92i765z3bkdnzkxg8fshriz9r6m371q1c75xysfil", - "depends": ["dplyr", "odbc", "RSQLite"] + "depends": ["RSQLite", "dplyr", "odbc"] }, "dauphin": { "name": "dauphin", - "version": "0.3.1", - "sha256": "0p84hnvipi5pvyzwrgl7a1xv7lmq2vm96l6dfbpd2r9vb4mhbrn7", + "version": "0.3.2", + "sha256": "1cl0jipwnarkx26bhv9s1bk9q9y6ni2568xqy2w7x5nh5v38rvfx", "depends": [] }, "dawai": { @@ -52997,7 +53597,7 @@ "name": "dbWebForms", "version": "0.1.0", "sha256": "0diz5mh4fhwrwqa7jr70vzj2jks7h2n91v2hr1mvvlbc7rzd9yki", - "depends": ["data_table", "DBI", "html5", "stringi"] + "depends": ["DBI", "data_table", "html5", "stringi"] }, "dbacf": { "name": "dbacf", @@ -53015,7 +53615,7 @@ "name": "dbcsp", "version": "0.0.2.1", "sha256": "0faq63aqj4ddlfc5dpi8g3ngqidca6czicgvkzdyg4bj87s0kism", - "depends": ["caret", "geigen", "ggplot2", "MASS", "Matrix", "parallelDist", "plyr", "TSdist", "zoo"] + "depends": ["MASS", "Matrix", "TSdist", "caret", "geigen", "ggplot2", "parallelDist", "plyr", "zoo"] }, "dbd": { "name": "dbd", @@ -53027,7 +53627,7 @@ "name": "dbflobr", "version": "0.2.2", "sha256": "04gh0xfdp077f3ppf8i101q17n2r711y47qnxb9nq5ksnf37s5jp", - "depends": ["blob", "chk", "clisymbols", "crayon", "DBI", "flobr", "glue", "rlang", "RSQLite"] + "depends": ["DBI", "RSQLite", "blob", "chk", "clisymbols", "crayon", "flobr", "glue", "rlang"] }, "dbglm": { "name": "dbglm", @@ -53039,7 +53639,7 @@ "name": "dbhydroR", "version": "0.2-8", "sha256": "1gd3n6i47qbxp6d3y5sjvgmxc5p3afy2lhkg9020ws1xm0bk9q7d", - "depends": ["httr", "reshape2", "XML"] + "depends": ["XML", "httr", "reshape2"] }, "dblcens": { "name": "dblcens", @@ -53051,19 +53651,19 @@ "name": "dblr", "version": "0.1.0", "sha256": "0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw", - "depends": ["CatEncoders", "data_table", "Metrics", "xgboost"] + "depends": ["CatEncoders", "Metrics", "data_table", "xgboost"] }, "dbmss": { "name": "dbmss", "version": "2.9-0", "sha256": "16bmaq8wd7v6vqnycr670sajcyaplkw1g5w5m2ri7ch16ccpqk6j", - "depends": ["cubature", "ggplot2", "Rcpp", "RcppParallel", "reshape2", "rlang", "spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_utils", "tibble"] + "depends": ["Rcpp", "RcppParallel", "cubature", "ggplot2", "reshape2", "rlang", "spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_utils", "tibble"] }, "dbnR": { "name": "dbnR", - "version": "0.7.8", - "sha256": "10lw8ax33l0q52pm07fi66fhm06n3yg48plgvz5cg14l98v7g7s5", - "depends": ["bnlearn", "data_table", "magrittr", "MASS", "R6", "Rcpp"] + "version": "0.7.9", + "sha256": "14jdmld8d1laj7xcad5694inxb8qglhnzghab64h3n0r2x35z6lw", + "depends": ["MASS", "R6", "Rcpp", "bnlearn", "data_table", "magrittr"] }, "dbnlearn": { "name": "dbnlearn", @@ -53075,7 +53675,7 @@ "name": "dbparser", "version": "2.0.3", "sha256": "1v0yp81bgq9ihgjrx336zyscrhk84sc8rpmbj35sphyc0c0isncs", - "depends": ["dplyr", "progress", "purrr", "tibble", "XML"] + "depends": ["XML", "dplyr", "progress", "purrr", "tibble"] }, "dbplot": { "name": "dbplot", @@ -53087,13 +53687,13 @@ "name": "dbplyr", "version": "2.5.0", "sha256": "1zxw4ignzm2fzixsf6n80f44b9q7434vamy2xj4v31wlx3dmnixv", - "depends": ["blob", "cli", "DBI", "dplyr", "glue", "lifecycle", "magrittr", "pillar", "purrr", "R6", "rlang", "tibble", "tidyr", "tidyselect", "vctrs", "withr"] + "depends": ["DBI", "R6", "blob", "cli", "dplyr", "glue", "lifecycle", "magrittr", "pillar", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "vctrs", "withr"] }, "dbscan": { "name": "dbscan", - "version": "1.1-12", - "sha256": "1snfcf5jy3chh5nmvn7ashhlyv35nkajlfrlk9kzpy4jnfyv3y2n", - "depends": ["Rcpp"] + "version": "1.2-0", + "sha256": "0rv2h5i539ivkgwblfapjpfl09hgxvidkk6x1wmgc6hp30nbl2bj", + "depends": ["Rcpp", "generics"] }, "dbstats": { "name": "dbstats", @@ -53111,19 +53711,19 @@ "name": "dc3net", "version": "1.2.0", "sha256": "19ibsvbnq6y88vqvgkm31zrqwjhpml59d792bz0zkk50r1q5bnyr", - "depends": ["c3net", "igraph", "RedeR"] + "depends": ["RedeR", "c3net", "igraph"] }, "dcTensor": { "name": "dcTensor", "version": "1.3.0", "sha256": "1z62kz9558fj5nwp2nq6vh7ikbxbg8nm0w08y5p5dc0nzhcd4kxn", - "depends": ["fields", "MASS", "nnTensor", "rTensor"] + "depends": ["MASS", "fields", "nnTensor", "rTensor"] }, "dccmidas": { "name": "dccmidas", "version": "0.1.2", "sha256": "0ws853yb669hki7wrfwnj7bd75xvcb63njn1iza8q58sa6bmg6vc", - "depends": ["maxLik", "Rcpp", "RcppArmadillo", "Rdpack", "roll", "rugarch", "rumidas", "xts", "zoo"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "maxLik", "roll", "rugarch", "rumidas", "xts", "zoo"] }, "dccpp": { "name": "dccpp", @@ -53141,7 +53741,7 @@ "name": "dclone", "version": "2.3-2", "sha256": "1x0fx24fxb7zp9g9lrdb1hbljgmi9szrsh751jidm52fin863qz0", - "depends": ["coda", "Matrix", "R2OpenBUGS", "rjags", "rstan"] + "depends": ["Matrix", "R2OpenBUGS", "coda", "rjags", "rstan"] }, "dclust": { "name": "dclust", @@ -53153,7 +53753,7 @@ "name": "dcm2", "version": "1.0.2", "sha256": "1dxymql66sy0nfxqfh106cvz5r93ajpjr1w8amn03w0ciz4v5nqs", - "depends": ["dplyr", "glue", "magrittr", "modelr", "purrr", "Rcpp", "RcppArmadillo", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "glue", "magrittr", "modelr", "purrr", "rlang", "stringr", "tibble", "tidyr"] }, "dcmle": { "name": "dcmle", @@ -53171,13 +53771,13 @@ "name": "dcorVS", "version": "1.0", "sha256": "1gawk22mv5ppbiqqm4k2pjjknsp7zxnnr0lk24l6phrvnszfaxlw", - "depends": ["dcov", "Rfast"] + "depends": ["Rfast", "dcov"] }, "dcortools": { "name": "dcortools", "version": "0.1.6", "sha256": "1qcblwcv2rwrl502hiv0l0r137sa4k0kx892k2w1chm40y5vri3b", - "depends": ["ggplot2", "Hmisc", "pheatmap", "Rcpp", "RcppArmadillo", "RcppEigen", "Rdpack", "Rfast"] + "depends": ["Hmisc", "Rcpp", "RcppArmadillo", "RcppEigen", "Rdpack", "Rfast", "ggplot2", "pheatmap"] }, "dcov": { "name": "dcov", @@ -53193,15 +53793,15 @@ }, "dcurves": { "name": "dcurves", - "version": "0.4.0", - "sha256": "1hlpii7ba19g4gg3cj071hy3mhp80rya079118xmrcxzhn68102c", + "version": "0.5.0", + "sha256": "01w20d7j9f667spmg28pp6mj5f4sxdx9z6waz2yaijgyif14drak", "depends": ["broom", "dplyr", "ggplot2", "glue", "purrr", "rlang", "scales", "survival", "tibble"] }, "ddalpha": { "name": "ddalpha", "version": "1.3.15", "sha256": "1vgyg1c2ir93nsbh4xlm774b6rhx14pyr069dpcl9vwcx2j989qc", - "depends": ["BH", "class", "geometry", "MASS", "Rcpp", "robustbase", "sfsmisc"] + "depends": ["BH", "MASS", "Rcpp", "class", "geometry", "robustbase", "sfsmisc"] }, "ddc": { "name": "ddc", @@ -53219,7 +53819,7 @@ "name": "ddecompose", "version": "1.0.0", "sha256": "1n0s2q6qb09jnhxismaabn00pzjjjy0dwdhz8hyacmby468y266z", - "depends": ["fastglm", "Formula", "ggplot2", "Hmisc", "pbapply", "ranger", "rifreg", "sandwich"] + "depends": ["Formula", "Hmisc", "fastglm", "ggplot2", "pbapply", "ranger", "rifreg", "sandwich"] }, "ddi": { "name": "ddi", @@ -53235,9 +53835,9 @@ }, "ddml": { "name": "ddml", - "version": "0.2.1", - "sha256": "17v3yhgs440flyqvfhjapc03xvwnvg7c0kr8cphvnhx6nmwjsq53", - "depends": ["AER", "glmnet", "MASS", "Matrix", "nnls", "quadprog", "ranger", "xgboost"] + "version": "0.2.2", + "sha256": "0362sr8ivx3jcf0l28a6d1kb0zrcb0jqm2dcy9s9qq5d843r79xz", + "depends": ["AER", "MASS", "Matrix", "glmnet", "nnls", "quadprog", "ranger", "xgboost"] }, "ddp": { "name": "ddp", @@ -53249,13 +53849,13 @@ "name": "ddpca", "version": "1.1", "sha256": "1qsanid7sr2nc9pwzyz4cbjc1vg0rj255d3rnh1rb22agrgj2bc1", - "depends": ["MASS", "Matrix", "quantreg", "RSpectra"] + "depends": ["MASS", "Matrix", "RSpectra", "quantreg"] }, "ddpcr": { "name": "ddpcr", "version": "1.15.2", "sha256": "1as25yc23n6jj87nccp7g2jrpvz6yxa7f6ba65g6ynvkzk57531b", - "depends": ["dplyr", "DT", "ggplot2", "lazyeval", "magrittr", "mixtools", "plyr", "readr", "shiny", "shinydisconnect", "shinyjs", "tibble"] + "depends": ["DT", "dplyr", "ggplot2", "lazyeval", "magrittr", "mixtools", "plyr", "readr", "shiny", "shinydisconnect", "shinyjs", "tibble"] }, "ddplot": { "name": "ddplot", @@ -53267,7 +53867,7 @@ "name": "ddsPLS", "version": "1.2.1", "sha256": "0l5dcpqs57bp6b6b718annnhilkv6n4imynylg0wimik27ipmfwl", - "depends": ["doParallel", "foreach", "RColorBrewer", "Rcpp", "RcppEigen", "shiny"] + "depends": ["RColorBrewer", "Rcpp", "RcppEigen", "doParallel", "foreach", "shiny"] }, "ddst": { "name": "ddst", @@ -53279,13 +53879,13 @@ "name": "ddtlcm", "version": "0.2.1", "sha256": "1xjpw5qx2wjq8y4ayg1d3scclsrn2bkmjk9gkff57gq2n0qlwnh0", - "depends": ["ape", "BayesLogit", "data_table", "extraDistr", "ggplot2", "ggpubr", "ggtext", "ggtree", "label_switching", "Matrix", "matrixStats", "phylobase", "poLCA", "R_utils", "Rdpack", "testthat", "truncnorm"] + "depends": ["BayesLogit", "Matrix", "R_utils", "Rdpack", "ape", "data_table", "extraDistr", "ggplot2", "ggpubr", "ggtext", "ggtree", "label_switching", "matrixStats", "phylobase", "poLCA", "testthat", "truncnorm"] }, "deBInfer": { "name": "deBInfer", "version": "0.4.4", "sha256": "1l4wim82n5q51c1f7193d3i22qrn9kfcsddyrn8izhlwsjb9q3kp", - "depends": ["coda", "deSolve", "MASS", "mvtnorm", "PBSddesolve", "plyr", "RColorBrewer", "truncdist"] + "depends": ["MASS", "PBSddesolve", "RColorBrewer", "coda", "deSolve", "mvtnorm", "plyr", "truncdist"] }, "deBif": { "name": "deBif", @@ -53297,7 +53897,7 @@ "name": "deFit", "version": "0.2.1", "sha256": "0z4lc9s3wb7gab7cg1xr9gkggd2dxy8qbqqvbz1yxvnm86n2ai79", - "depends": ["deSolve", "ggplot2", "R6"] + "depends": ["R6", "deSolve", "ggplot2"] }, "deSolve": { "name": "deSolve", @@ -53309,7 +53909,7 @@ "name": "deTS", "version": "1.0", "sha256": "08yq7vfcd8fv8qw2w0f1rnj3rzys9kslmkqspmiz6prmzqvj1zf1", - "depends": ["pheatmap", "RColorBrewer"] + "depends": ["RColorBrewer", "pheatmap"] }, "deaR": { "name": "deaR", @@ -53405,13 +54005,13 @@ "name": "decompDL", "version": "0.1.0", "sha256": "11xbxv2j8m1w4lz933jvwy20wsazqiffnn0awgv7fz6q3ma5cqkh", - "depends": ["BiocGenerics", "keras", "magrittr", "reticulate", "Rlibeemd", "tensorflow", "TSdeeplearning", "tsutils", "VMDecomp"] + "depends": ["BiocGenerics", "Rlibeemd", "TSdeeplearning", "VMDecomp", "keras", "magrittr", "reticulate", "tensorflow", "tsutils"] }, "decomposedPSF": { "name": "decomposedPSF", "version": "0.2", "sha256": "12sb4zzvc29hvhlay97g84pn4saqyp16wckjrdgg4qqpc0rzrfz5", - "depends": ["forecast", "PSF", "Rlibeemd", "tseries"] + "depends": ["PSF", "Rlibeemd", "forecast", "tseries"] }, "decompr": { "name": "decompr", @@ -53419,12 +54019,6 @@ "sha256": "0bsin2hlb8sacmkzsv4b2fqdh5b55b67lkm41icacqnvxrisnxqp", "depends": ["matrixStats"] }, - "decon": { - "name": "decon", - "version": "1.3-4", - "sha256": "036cv56wf42q2p3d5h15hbrp5rc29xxy20qwv4k1qzhkq6hmw0qs", - "depends": [] - }, "deconvolveR": { "name": "deconvolveR", "version": "1.2-1", @@ -53443,6 +54037,12 @@ "sha256": "1y47ggfsfrbsm8z78j5ibxbm4lhp90h3qwhyh4qw5dhsd6jspsbd", "depends": ["purrr"] }, + "decp": { + "name": "decp", + "version": "0.1.0", + "sha256": "1ydp2czgbfarhn6d6g34q7dvfkj3b97ql6jn5cp7gnxycj53c0k6", + "depends": ["geigen", "ggplot2", "magrittr", "matrixcalc", "purrr", "rlang"] + }, "deducorrect": { "name": "deducorrect", "version": "1.3.7", @@ -53477,7 +54077,7 @@ "name": "deepMOU", "version": "0.1.1", "sha256": "1r05wg01nighmhs2r8z91w091fz2r1ryb1j0mi96knqqdjgcbh4i", - "depends": ["dplyr", "entropy", "extraDistr", "ggplot2", "MASS", "Rfast", "skmeans"] + "depends": ["MASS", "Rfast", "dplyr", "entropy", "extraDistr", "ggplot2", "skmeans"] }, "deepNN": { "name": "deepNN", @@ -53513,7 +54113,7 @@ "name": "deepgp", "version": "1.1.2", "sha256": "0anrc209bvi061y0f7ms5hyb2k6rgfp627w0800aw8gxhl4mli4b", - "depends": ["doParallel", "FNN", "foreach", "GpGp", "Matrix", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["FNN", "GpGp", "Matrix", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "mvtnorm"] }, "deeplr": { "name": "deeplr", @@ -53537,7 +54137,7 @@ "name": "deepregression", "version": "1.0.0", "sha256": "15d33dsdhmw7n172rlsg70921d3z3bkn088qj565iclzmxknyfzj", - "depends": ["dplyr", "keras", "magrittr", "Matrix", "mgcv", "R6", "reticulate", "tensorflow", "tfprobability", "tfruns"] + "depends": ["Matrix", "R6", "dplyr", "keras", "magrittr", "mgcv", "reticulate", "tensorflow", "tfprobability", "tfruns"] }, "deeptime": { "name": "deeptime", @@ -53549,7 +54149,7 @@ "name": "deeptrafo", "version": "0.1-1", "sha256": "16lxxd75j9bwapfx716b9fmqfz6ms4x5g98wc1yykiahjpbj8156", - "depends": ["deepregression", "Formula", "keras", "mlt", "purrr", "R6", "reticulate", "survival", "tensorflow", "tfprobability", "variables"] + "depends": ["Formula", "R6", "deepregression", "keras", "mlt", "purrr", "reticulate", "survival", "tensorflow", "tfprobability", "variables"] }, "default": { "name": "default", @@ -53585,7 +54185,7 @@ "name": "deforestable", "version": "3.1.1", "sha256": "0p8psbsjxmc456flypdw2kh8kjsy2hw13nfcdilg527iy1dpif6i", - "depends": ["jpeg", "plyr", "Rcpp", "RcppArmadillo", "StableEstim", "terra"] + "depends": ["Rcpp", "RcppArmadillo", "StableEstim", "jpeg", "plyr", "terra"] }, "deform": { "name": "deform", @@ -53597,7 +54197,7 @@ "name": "deformula", "version": "0.1.2", "sha256": "18jrznpw2vqb658wv88yq4x7z44ilkjg0xb5v2lww87wxbv4m0gj", - "depends": ["cpp11", "Rcpp"] + "depends": ["Rcpp", "cpp11"] }, "degday": { "name": "degday", @@ -53619,15 +54219,15 @@ }, "dejaVu": { "name": "dejaVu", - "version": "0.3.0", - "sha256": "0l30m707zrp05d7hywlx443n02mflxqsampmcblj3fvcbyywc1fd", + "version": "0.3.1", + "sha256": "102jg8bfhxbynk6v8ly73pkkhbqvgx4x1gmr7kxkdc648zspg48d", "depends": ["MASS"] }, "delayed": { "name": "delayed", "version": "0.5.0", "sha256": "17v9gis82yn0fvp4apv906sz8j77cr5rlj4xxxa3vkfvh196a40l", - "depends": ["BBmisc", "data_table", "future", "igraph", "progress", "R_oo", "R_utils", "R6", "rlang", "rstackdeque", "uuid", "visNetwork"] + "depends": ["BBmisc", "R6", "R_oo", "R_utils", "data_table", "future", "igraph", "progress", "rlang", "rstackdeque", "uuid", "visNetwork"] }, "deldir": { "name": "deldir", @@ -53657,19 +54257,19 @@ "name": "demic", "version": "2.0.0", "sha256": "1vxh8rlmq3jnrv0gzaywilqhn60vq8b56skbqgzghzk5qg95gi0k", - "depends": ["lme4", "Matrix", "reshape2"] + "depends": ["Matrix", "lme4", "reshape2"] }, "deming": { "name": "deming", - "version": "1.4", - "sha256": "1yx3qrbik6jpqgsi0gqgc7y2cra13qlisg2gq8rvnv57nvcvb421", + "version": "1.4-1", + "sha256": "1jipary7wqb9gmj4mfrz4ym5ir44q2rhknxx6ah1f5lpkcsjm6c6", "depends": ["boot"] }, "demoGraphic": { "name": "demoGraphic", "version": "0.1.0", "sha256": "0b2fqa0z875wwd7qdqh2qfvkzh2cpbmck4smf9c0p31wv5yin0sq", - "depends": ["magrittr", "MASS", "officer"] + "depends": ["MASS", "magrittr", "officer"] }, "demoKde": { "name": "demoKde", @@ -53687,7 +54287,7 @@ "name": "demodelr", "version": "1.0.1", "sha256": "1jldvlw8xl5hbyw4m443r41nw9ck7dmkd4rmag4wqw4scra7qj46", - "depends": ["dplyr", "formula_tools", "GGally", "ggplot2", "purrr", "rlang", "tibble", "tidyr"] + "depends": ["GGally", "dplyr", "formula_tools", "ggplot2", "purrr", "rlang", "tibble", "tidyr"] }, "demogR": { "name": "demogR", @@ -53699,13 +54299,13 @@ "name": "demography", "version": "2.0", "sha256": "0smkfivhhpa5cz5kh33dh3vl4zb102mjazxsxd382z7cwfqldffd", - "depends": ["cobs", "forecast", "ftsa", "HMDHFDplus", "mgcv", "rainbow", "strucchange"] + "depends": ["HMDHFDplus", "cobs", "forecast", "ftsa", "mgcv", "rainbow", "strucchange"] }, "demu": { "name": "demu", "version": "0.3.0", "sha256": "1mp5iz8mg0d6cyqi3f6fdhk6x5xxvng5bi13b7jnlp60wpjrq0il", - "depends": ["ClusterR", "fields", "Matrix", "Rcpp", "RcppArmadillo", "spam"] + "depends": ["ClusterR", "Matrix", "Rcpp", "RcppArmadillo", "fields", "spam"] }, "dendRoAnalyst": { "name": "dendRoAnalyst", @@ -53723,13 +54323,13 @@ "name": "dendroNetwork", "version": "0.5.4", "sha256": "0jns6nfihb9wqz4sh8pbsy01kp0ml2x16jls4vqhixkbfpns4vkf", - "depends": ["doParallel", "dplR", "dplyr", "foreach", "igraph", "lifecycle", "RColorBrewer", "RCy3", "reshape2", "stringr", "tidyr"] + "depends": ["RColorBrewer", "RCy3", "doParallel", "dplR", "dplyr", "foreach", "igraph", "lifecycle", "reshape2", "stringr", "tidyr"] }, "dendroTools": { "name": "dendroTools", "version": "1.2.13", "sha256": "1dvisplghjyh607ns5xnwv1v8bg7i05sp4w96g6bmkwpgshaa6b0", - "depends": ["boot", "brnn", "Cubist", "dplR", "dplyr", "ggplot2", "knitr", "lubridate", "magrittr", "MLmetrics", "oce", "plotly", "psych", "randomForest", "reshape2", "scales", "viridis"] + "depends": ["Cubist", "MLmetrics", "boot", "brnn", "dplR", "dplyr", "ggplot2", "knitr", "lubridate", "magrittr", "oce", "plotly", "psych", "randomForest", "reshape2", "scales", "viridis"] }, "dendroextras": { "name": "dendroextras", @@ -53771,7 +54371,7 @@ "name": "denoiseR", "version": "1.0.2", "sha256": "1q5kxiwfkrf2k0gpidzhl4hyzyjcm33rwlw4dan9nkx1181naw9l", - "depends": ["FactoMineR", "irlba", "Matrix"] + "depends": ["FactoMineR", "Matrix", "irlba"] }, "denovolyzeR": { "name": "denovolyzeR", @@ -53783,7 +54383,7 @@ "name": "densEstBayes", "version": "1.0-2.2", "sha256": "0ydnjyprv8fz037nkfvjd8w6hg4a19lbnq4kl7yankxksjfdyqc3", - "depends": ["BH", "MASS", "nlme", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "MASS", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "StanHeaders", "nlme", "rstan", "rstantools"] }, "denseFLMM": { "name": "denseFLMM", @@ -53801,7 +54401,7 @@ "name": "densityClust", "version": "0.3.3", "sha256": "0iiq2zal792741z1a23h7cy9jp4hsc7513dxain132526f1yrzsl", - "depends": ["cpp11", "FNN", "ggplot2", "ggrepel", "gridExtra", "RColorBrewer", "Rtsne"] + "depends": ["FNN", "RColorBrewer", "Rtsne", "cpp11", "ggplot2", "ggrepel", "gridExtra"] }, "densityarea": { "name": "densityarea", @@ -53837,7 +54437,7 @@ "name": "depcoeff", "version": "0.0.1", "sha256": "08vs0yzfvd4ahcs5rz4i4spp8l6fg45bm0m22gn5rzxc4759mzac", - "depends": ["copula", "Rcpp"] + "depends": ["Rcpp", "copula"] }, "depend_truncation": { "name": "depend.truncation", @@ -53849,7 +54449,7 @@ "name": "depigner", "version": "0.9.1", "sha256": "0vzrdw4rhrwiyc4g4ancfd43h56b72lkvabqdwdsg54hjm35c1ky", - "depends": ["desc", "dplyr", "fs", "ggplot2", "Hmisc", "magrittr", "progress", "purrr", "readr", "rlang", "rms", "rprojroot", "stringr", "telegram_bot", "tibble", "tidyr", "usethis"] + "depends": ["Hmisc", "desc", "dplyr", "fs", "ggplot2", "magrittr", "progress", "purrr", "readr", "rlang", "rms", "rprojroot", "stringr", "telegram_bot", "tibble", "tidyr", "usethis"] }, "depmix": { "name": "depmix", @@ -53861,12 +54461,12 @@ "name": "depmixS4", "version": "1.5-0", "sha256": "1pacvhw5m4fsk3ysbal50fdqbvlaz8ywyqp6bn1wh42wipqbb2i8", - "depends": ["MASS", "nlme", "nnet", "Rsolnp"] + "depends": ["MASS", "Rsolnp", "nlme", "nnet"] }, "deps": { "name": "deps", - "version": "0.3.0", - "sha256": "1v274l8gs5by7vzgcsdsf8m3m9gkwdmw6dqvrmjx2q9j40i7wf69", + "version": "0.4.0", + "sha256": "147lb9dibn8ayj6znld64sk1qn6lzpp5pamxkagmqcbxl78r1g6h", "depends": ["jsonlite", "remotes", "renv"] }, "depth_plot": { @@ -53891,7 +54491,7 @@ "name": "desc", "version": "1.4.3", "sha256": "09ig14bm68cps6d1mrmj6hhjr01i6gz1ri35qpkwk3yp7nkqsijl", - "depends": ["cli", "R6"] + "depends": ["R6", "cli"] }, "descomponer": { "name": "descomponer", @@ -53921,7 +54521,7 @@ "name": "descriptio", "version": "1.3", "sha256": "0ic44blsi7ys6075zsawf4rxqgjsv1d7hr8y2j3psk6pjchlgx18", - "depends": ["ggplot2", "MASS", "rlang"] + "depends": ["MASS", "ggplot2", "rlang"] }, "descriptr": { "name": "descriptr", @@ -53945,13 +54545,13 @@ "name": "desctable", "version": "0.3.0", "sha256": "1i0124lnmzdbx468lyqmzbd6disxjifqjy8ss10fl8cin4f868lb", - "depends": ["dplyr", "DT", "htmltools", "pander", "rlang", "tidyr"] + "depends": ["DT", "dplyr", "htmltools", "pander", "rlang", "tidyr"] }, "deseats": { "name": "deseats", - "version": "1.0.0", - "sha256": "144906bjb4hxv5m3cf8cjpp35548icnjfzxlqj17g2sc62wx6ngl", - "depends": ["animation", "furrr", "future", "future_apply", "ggplot2", "progressr", "purrr", "Rcpp", "RcppArmadillo", "rlang", "shiny", "zoo"] + "version": "1.1.0", + "sha256": "11qhsiqq0f1s6b7x7fmvgwwhirhilf9x37pk90pwgg3h4khjl1j5", + "depends": ["Rcpp", "RcppArmadillo", "animation", "furrr", "future", "future_apply", "ggplot2", "progressr", "purrr", "rlang", "shiny", "tidyr", "zoo"] }, "desiR": { "name": "desiR", @@ -53969,19 +54569,19 @@ "name": "designit", "version": "0.5.0", "sha256": "0h1slgxxz92zk1m6gk67s1ir95jyqzvr6mys9c9lakpffiwwn4b2", - "depends": ["assertthat", "data_table", "dplyr", "ggplot2", "purrr", "R6", "rlang", "scales", "stringr", "tibble", "tidyr"] + "depends": ["R6", "assertthat", "data_table", "dplyr", "ggplot2", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr"] }, "designmatch": { "name": "designmatch", "version": "0.5.4", "sha256": "1x3pcwml6pa56ij2bc9jymfp066v7fd2avjl6awgpy3503qr56q1", - "depends": ["highs", "lattice", "MASS", "slam"] + "depends": ["MASS", "highs", "lattice", "slam"] }, "designr": { "name": "designr", "version": "0.1.13", "sha256": "13rj2xxxxj35zl7q570c3i4p2wjpxf79dza0sg9bhbq3yal6j6r2", - "depends": ["crossdes", "dplyr", "lme4", "MASS", "tibble"] + "depends": ["MASS", "crossdes", "dplyr", "lme4", "tibble"] }, "designsize": { "name": "designsize", @@ -54011,7 +54611,7 @@ "name": "desla", "version": "0.3.0", "sha256": "18q1rw8p69p5jcqxb4hryyn2bak6pjmx91g203xrilx7k1za4p23", - "depends": ["parallelly", "Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "sitmo"] + "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "parallelly", "sitmo"] }, "desplot": { "name": "desplot", @@ -54035,19 +54635,19 @@ "name": "detectR", "version": "0.3.0", "sha256": "002wv6krzmpikfmcn5bw12y7acbwvbf057i31jhsqj081spdicb0", - "depends": ["doParallel", "foreach", "glasso", "lavaan", "LogConcDEAD", "signal"] + "depends": ["LogConcDEAD", "doParallel", "foreach", "glasso", "lavaan", "signal"] }, "detectRUNS": { "name": "detectRUNS", "version": "0.9.6", "sha256": "0yl1x0jz66hingbl094picsiyrxzxvnz0grq63rva6nwn7pv1c0b", - "depends": ["data_table", "ggplot2", "gridExtra", "iterators", "itertools", "plyr", "Rcpp", "reshape2"] + "depends": ["Rcpp", "data_table", "ggplot2", "gridExtra", "iterators", "itertools", "plyr", "reshape2"] }, "detectnorm": { "name": "detectnorm", "version": "1.0.0", "sha256": "1cr5i73iigmsg0ywlm61iv1yw91vafbbf4dhvcd448qnv05cjlaw", - "depends": ["ggplot2", "nleqslv", "psych", "Rdpack", "truncnorm"] + "depends": ["Rdpack", "ggplot2", "nleqslv", "psych", "truncnorm"] }, "detector": { "name": "detector", @@ -54065,7 +54665,7 @@ "name": "detectseparation", "version": "0.3", "sha256": "05z3p1z5mhmdj5qdknz1b8f6fwbghzckl88pv79v59cfwpbvgmz8", - "depends": ["lpSolveAPI", "pkgload", "ROI", "ROI_plugin_lpsolve"] + "depends": ["ROI", "ROI_plugin_lpsolve", "lpSolveAPI", "pkgload"] }, "detourr": { "name": "detourr", @@ -54089,18 +54689,18 @@ "name": "detrendr", "version": "0.6.15", "sha256": "00j35i45a55srvdlhv0b9vcrsp44fmdv49giqm03ha015pgmsbdd", - "depends": ["arrayhelpers", "autothresholdr", "checkmate", "doParallel", "dplyr", "filesstrings", "foreach", "ijtiff", "iterators", "magrittr", "plyr", "purrr", "Rcpp", "RcppParallel", "rlang", "stringr", "withr"] + "depends": ["Rcpp", "RcppParallel", "arrayhelpers", "autothresholdr", "checkmate", "doParallel", "dplyr", "filesstrings", "foreach", "ijtiff", "iterators", "magrittr", "plyr", "purrr", "rlang", "stringr", "withr"] }, "detzrcr": { "name": "detzrcr", "version": "0.3.1", "sha256": "0afi1ir8il5xmzkpmbc2m5mvmgzlqw8qdn04gbnwl74a03yaxxmj", - "depends": ["DT", "ggplot2", "MASS", "shiny"] + "depends": ["DT", "MASS", "ggplot2", "shiny"] }, "devEMF": { "name": "devEMF", - "version": "4.4-2", - "sha256": "10gk60irfpflshzshl4vad1dynfj1hnyjycsnfa8bn0gq20ipj5x", + "version": "4.5", + "sha256": "03iwl6h6f158qc2i5b0ac9g1nnspqr958cvprjm4rgs1pcywplga", "depends": [] }, "devFunc": { @@ -54129,21 +54729,21 @@ }, "dexter": { "name": "dexter", - "version": "1.4.2", - "sha256": "196c12kmp5xjhgywr26p7k78p9mvpzz74rckfq88xgx9j012rwl7", - "depends": ["BH", "DBI", "dplyr", "dqrng", "MASS", "Rcpp", "RcppArmadillo", "rlang", "RSQLite", "sitmo", "tidyr"] + "version": "1.5.0", + "sha256": "1sppaqnv9nkxww0bw0x2sp51fl4v7845npvmhwwdh4yrnrmzbd07", + "depends": ["BH", "DBI", "MASS", "RSQLite", "Rcpp", "RcppArmadillo", "dplyr", "dqrng", "rlang", "sitmo", "tidyr"] }, "dexterMST": { "name": "dexterMST", "version": "0.9.6", "sha256": "073xx30gavig6nhi6ppll7jdgf7yvci8nv6pyxcy9vl177l1k62b", - "depends": ["crayon", "DBI", "dexter", "dplyr", "igraph", "Rcpp", "RcppArmadillo", "rlang", "RSQLite", "tidyr"] + "depends": ["DBI", "RSQLite", "Rcpp", "RcppArmadillo", "crayon", "dexter", "dplyr", "igraph", "rlang", "tidyr"] }, "dextergui": { "name": "dextergui", "version": "0.2.6", "sha256": "10v3djwani0zd27cjlf7lch7rfipnmb2p5wa7n2y5qxjqxli9z3x", - "depends": ["Cairo", "DBI", "dexter", "dplyr", "DT", "ggExtra", "ggplot2", "ggridges", "htmltools", "htmlwidgets", "jsonlite", "networkD3", "RCurl", "readODS", "readxl", "rlang", "shiny", "shinyBS", "shinyFiles", "shinyjs", "tibble", "tidyr", "writexl"] + "depends": ["Cairo", "DBI", "DT", "RCurl", "dexter", "dplyr", "ggExtra", "ggplot2", "ggridges", "htmltools", "htmlwidgets", "jsonlite", "networkD3", "readODS", "readxl", "rlang", "shiny", "shinyBS", "shinyFiles", "shinyjs", "tibble", "tidyr", "writexl"] }, "df2yaml": { "name": "df2yaml", @@ -54179,7 +54779,7 @@ "name": "dfdr", "version": "0.2.0", "sha256": "1s7i11sl6m80hryggxby4c0knzk6nxqnlwfpzgg4a2bnqnwygfya", - "depends": ["pryr", "purrr", "R6", "rlang"] + "depends": ["R6", "pryr", "purrr", "rlang"] }, "dfexpand": { "name": "dfexpand", @@ -54191,7 +54791,7 @@ "name": "dfidx", "version": "0.0-5", "sha256": "02ka119nxn9258hz51m603s0gwmdi8a98z0j9lx7fqjxnd01jlip", - "depends": ["dplyr", "Formula"] + "depends": ["Formula", "dplyr"] }, "dfmeta": { "name": "dfmeta", @@ -54203,13 +54803,13 @@ "name": "dfmirroR", "version": "2.1.0", "sha256": "0npd9yllsjbb49mqdwaw75lbgx4lr8qgga70yybd6c16wdfkg396", - "depends": ["e1071", "fitdistrplus", "MASS"] + "depends": ["MASS", "e1071", "fitdistrplus"] }, "dfms": { "name": "dfms", "version": "0.2.2", "sha256": "0p3fbvmrdrsiz3dy23i5fjldc7l5hwfh7v73sg8dkhvxxnn1ciw4", - "depends": ["collapse", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "collapse"] }, "dfmta": { "name": "dfmta", @@ -54245,13 +54845,13 @@ "name": "dfphase1", "version": "1.2.0", "sha256": "0a9cxdc81rib84sgg5mpf28nhcv1g83kvnr7rin3djyv60ccrq8x", - "depends": ["lattice", "Rcpp", "robustbase"] + "depends": ["Rcpp", "lattice", "robustbase"] }, "dfrr": { "name": "dfrr", "version": "0.1.5", "sha256": "0kgsi2jysv0hpdvmv1fng41ar7p3pgzgf1vv0dcm954jdrl2dz6d", - "depends": ["fda", "ggplot2", "MASS", "plotly", "tmvtnorm"] + "depends": ["MASS", "fda", "ggplot2", "plotly", "tmvtnorm"] }, "dfsaneacc": { "name": "dfsaneacc", @@ -54269,13 +54869,13 @@ "name": "dga", "version": "2.0.1", "sha256": "1q860hzxrbkpmnphdysx4wk1b46wjll8sw7xjsy1lxcaz9hwcnjk", - "depends": ["chron", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "chron"] }, "dggridR": { "name": "dggridR", - "version": "3.0.0", - "sha256": "1915lc81yw6ns02fi37xjqd2zbdzhdsvqqb6c9w4b6i0665yb9ja", - "depends": ["dplyr", "Rcpp", "rlang", "sf", "sp"] + "version": "3.1.0", + "sha256": "1vwmf5m1k40kk68vil280gnzh028y04wi5q3xjacyhaw8di0w9d5", + "depends": ["Rcpp", "collapse", "s2", "sf"] }, "dglars": { "name": "dglars", @@ -54317,7 +54917,7 @@ "name": "dhglm", "version": "2.0", "sha256": "1918wkylldcdxjggly3a4yh4cv2nkig5bjfx0j79av633hahlg92", - "depends": ["boot", "car", "MASS", "Matrix", "sandwich"] + "depends": ["MASS", "Matrix", "boot", "car", "sandwich"] }, "dhh": { "name": "dhh", @@ -54327,8 +54927,8 @@ }, "dhlabR": { "name": "dhlabR", - "version": "1.0.2", - "sha256": "1hqs31ddh82mx8zw8lyzcdl3x5dgpx88shjk8frzib6i4cgq48s8", + "version": "1.0.6", + "sha256": "185gp7bgaw0rhl29f2gijsqx3da3mzzp06hmi187ywv8i6lsi750", "depends": ["dplyr", "httr", "jsonlite", "purrr", "tibble", "zoo"] }, "dhsage": { @@ -54347,13 +54947,13 @@ "name": "diagL1", "version": "1.0.0", "sha256": "1rl51a5gjzf41la0rbigz4n8brn1prji6hp862hlxwscdni9w2f9", - "depends": ["conquer", "cubature", "doParallel", "foreach", "greekLetters", "lawstat", "MASS", "Matrix", "MatrixModels", "quantreg"] + "depends": ["MASS", "Matrix", "MatrixModels", "conquer", "cubature", "doParallel", "foreach", "greekLetters", "lawstat", "quantreg"] }, "diagis": { "name": "diagis", "version": "0.2.3", "sha256": "1gl720d1rrmqingsskkc86kl3n10c7cwvmx19yyxiprwzfkrjh95", - "depends": ["coda", "ggplot2", "gridExtra", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "coda", "ggplot2", "gridExtra"] }, "diagmeta": { "name": "diagmeta", @@ -54387,9 +54987,9 @@ }, "dials": { "name": "dials", - "version": "1.2.1", - "sha256": "0xrvvz4pkzmjsizjqfcvpn6f1cl9yp56lyc2iw8vcvwa18gb6szf", - "depends": ["cli", "DiceDesign", "dplyr", "glue", "hardhat", "lifecycle", "pillar", "purrr", "rlang", "scales", "tibble", "vctrs", "withr"] + "version": "1.3.0", + "sha256": "08q18cl187n98q72hnx3ildd0jk7qmrcdpcrmz7z1l0rb5iyjjj2", + "depends": ["DiceDesign", "cli", "dplyr", "glue", "hardhat", "lifecycle", "pillar", "purrr", "rlang", "scales", "sfd", "tibble", "vctrs", "withr"] }, "diaplt": { "name": "diaplt", @@ -54405,8 +55005,8 @@ }, "dibble": { "name": "dibble", - "version": "0.2.2", - "sha256": "02sf7d50a8w14xjwzdc5fq2xprlzl03yc4xs8qr4p8ycwvmlwwb1", + "version": "0.3.0", + "sha256": "1s845ii2hd0d2aam3wp3rb7r7i60plzqdmgdgix1pwbam02cfymn", "depends": ["dplyr", "memoise", "pillar", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "vctrs"] }, "dice": { @@ -54419,7 +55019,7 @@ "name": "diceR", "version": "2.2.0", "sha256": "1pfb1wxwh9li3z06hrx1zy5vwqmlmq4rjqjh1pi8i6jkbshf702m", - "depends": ["abind", "assertthat", "class", "clue", "clusterSim", "clv", "clValid", "dplyr", "ggplot2", "infotheo", "klaR", "magrittr", "mclust", "NMF", "purrr", "RankAggreg", "Rcpp", "stringr", "tidyr", "yardstick"] + "depends": ["NMF", "RankAggreg", "Rcpp", "abind", "assertthat", "clValid", "class", "clue", "clusterSim", "clv", "dplyr", "ggplot2", "infotheo", "klaR", "magrittr", "mclust", "purrr", "stringr", "tidyr", "yardstick"] }, "dichromat": { "name": "dichromat", @@ -54437,25 +55037,25 @@ "name": "dictionar6", "version": "0.1.3", "sha256": "1rg958py4pqghkid3830hla7vibvwsjhk75x55lxry5d8dp04m9f", - "depends": ["ooplah", "R6"] + "depends": ["R6", "ooplah"] }, "did": { "name": "did", "version": "2.1.2", "sha256": "07r4m326n2gmgmf5ym5y72xg1xin771172rcpk0xkz6v344lwf9j", - "depends": ["BMisc", "DRDID", "generics", "ggplot2", "ggpubr", "Matrix", "pbapply", "tidyr"] + "depends": ["BMisc", "DRDID", "Matrix", "generics", "ggplot2", "ggpubr", "pbapply", "tidyr"] }, "did2s": { "name": "did2s", "version": "1.0.2", "sha256": "0iyz6z4w2im22rvbpabql2w1cncv0pnrh0hp7agf0pazcpzk2jh6", - "depends": ["boot", "broom", "data_table", "did", "didimputation", "fixest", "ggplot2", "Matrix", "MatrixExtra", "rlang", "SparseM", "staggered"] + "depends": ["Matrix", "MatrixExtra", "SparseM", "boot", "broom", "data_table", "did", "didimputation", "fixest", "ggplot2", "rlang", "staggered"] }, "didimputation": { "name": "didimputation", "version": "0.3.0", "sha256": "122z473jkf5jb66s2g7vdqi0q56v8chz2dpl61qkcgqhv4hbh1q3", - "depends": ["broom", "data_table", "dplyr", "fixest", "glue", "magrittr", "Matrix", "purrr", "Rcpp", "RcppArmadillo", "stringr", "tidyr"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "broom", "data_table", "dplyr", "fixest", "glue", "magrittr", "purrr", "stringr", "tidyr"] }, "didrooRFM": { "name": "didrooRFM", @@ -54465,8 +55065,8 @@ }, "diemr": { "name": "diemr", - "version": "1.3", - "sha256": "1abvk6hk3vnfdd4yif0n1ngw68h32r001a0v6xi4n9qi72g82p9j", + "version": "1.4", + "sha256": "1s7ljcgrffb11cd0w2amrdyp75a8m9cv3g8zwizk2gll6p0yqpgg", "depends": ["vcfR", "zoo"] }, "dietr": { @@ -54485,7 +55085,7 @@ "name": "difNLR", "version": "1.4.2-1", "sha256": "1wrvsjbvvqwpv7cwc445n7l4ly8gvj8hyd66k02ib8r5854zn192", - "depends": ["calculus", "ggplot2", "msm", "nnet", "plyr", "VGAM"] + "depends": ["VGAM", "calculus", "ggplot2", "msm", "nnet", "plyr"] }, "difR": { "name": "difR", @@ -54557,7 +55157,7 @@ "name": "diffmatchpatch", "version": "0.1.0", "sha256": "064p2xzv0x890pw24lm9fmafp0x93f3yv77ms2zabzlclfylzzb7", - "depends": ["cli", "Rcpp"] + "depends": ["Rcpp", "cli"] }, "diffobj": { "name": "diffobj", @@ -54581,7 +55181,7 @@ "name": "diffudist", "version": "1.0.1", "sha256": "0s8k949l7fvdy0c1zlrk4zr5dnxksq67spwg8mpdsyc2xchh7b5c", - "depends": ["expm", "ggdendro", "ggplot2", "igraph", "Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "reshape2", "rlang", "viridis"] + "depends": ["Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "expm", "ggdendro", "ggplot2", "igraph", "reshape2", "rlang", "viridis"] }, "diffusion": { "name": "diffusion", @@ -54593,7 +55193,7 @@ "name": "diffusionMap", "version": "1.2.0", "sha256": "1rvk7069brlm1s9kqj4c31mwwr3mw4hmhay95cjjjfmw5xclff2j", - "depends": ["igraph", "Matrix", "scatterplot3d"] + "depends": ["Matrix", "igraph", "scatterplot3d"] }, "diffval": { "name": "diffval", @@ -54609,14 +55209,14 @@ }, "digest": { "name": "digest", - "version": "0.6.35", - "sha256": "07vqv2mnf8ppan2a3gydh4yr84n8489hypfas1rlk7050nxkycyc", + "version": "0.6.36", + "sha256": "0dz6gbfd9qnhn1jjfc4ni3w440183dygla4lszwkz2rmn9j76xyi", "depends": [] }, "digiRhythm": { "name": "digiRhythm", - "version": "1.2", - "sha256": "0bchk3vqdvn6hnw6cglsr7i7nvcdk5c4kyw4jainq08i7zc4jwsv", + "version": "2.2", + "sha256": "1z8arjp4pk8iq7jwigyh7bxfd33dhdxc9blmy1j8kssml152ilhn", "depends": ["crayon", "dplyr", "ggplot2", "lubridate", "magrittr", "pracma", "readr", "stringr", "tidyr", "xts", "zoo"] }, "digitTests": { @@ -54629,7 +55229,7 @@ "name": "digitalDLSorteR", "version": "1.0.1", "sha256": "05wcvv68p55hxf9babr19528khky1pmgfbvm502qhk7ba1arzivf", - "depends": ["dplyr", "ggplot2", "ggpubr", "grr", "gtools", "keras", "Matrix", "pbapply", "reshape2", "reticulate", "rlang", "S4Vectors", "scran", "scuttle", "SingleCellExperiment", "SummarizedExperiment", "tensorflow", "tidyr", "zinbwave"] + "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "ggpubr", "grr", "gtools", "keras", "pbapply", "reshape2", "reticulate", "rlang", "scran", "scuttle", "tensorflow", "tidyr", "zinbwave"] }, "digitalPCR": { "name": "digitalPCR", @@ -54657,9 +55257,9 @@ }, "dimensio": { "name": "dimensio", - "version": "0.8.0", - "sha256": "0xrlik2f08j76q542dgzwi597qavync7qnv2nzlk2blgcgd9i8g0", - "depends": ["arkhe"] + "version": "0.8.1", + "sha256": "1vk3maraqipmdk8jv22nxmkj6ab7lr2z4if49398irdmvyk8g7l8", + "depends": ["arkhe", "khroma"] }, "dimensionsR": { "name": "dimensionsR", @@ -54689,7 +55289,7 @@ "name": "dineq", "version": "0.1.0", "sha256": "1xrhrdc970f7hm9xng9z7xmshnmmz89cn3gmnyabzprx44ccr9sl", - "depends": ["boot", "Hmisc"] + "depends": ["Hmisc", "boot"] }, "dint": { "name": "dint", @@ -54707,13 +55307,13 @@ "name": "diproperm", "version": "0.2.0", "sha256": "0qh8zzpbsjfwh8q833n5pchb6dakqdza77ab7vmsidfbzndka11m", - "depends": ["dplyr", "DWDLargeR", "e1071", "ggplot2", "gridExtra", "lemon", "Matrix", "sampling", "SparseM", "usethis"] + "depends": ["DWDLargeR", "Matrix", "SparseM", "dplyr", "e1071", "ggplot2", "gridExtra", "lemon", "sampling", "usethis"] }, "dipsaus": { "name": "dipsaus", - "version": "0.2.8", - "sha256": "1gmb5jlvxwhj2ryqgvw8mfq30h414cgsa9jf6psz4qrr5dssh98l", - "depends": ["base64enc", "cli", "digest", "fastmap", "future", "future_apply", "jsonlite", "progressr", "R6", "Rcpp", "rlang", "rstudioapi", "shiny", "stringr"] + "version": "0.2.9", + "sha256": "12bhxys313iqrfkd0cpr2ibv94v14vjj3sxkhvhxqhclf1d19qc6", + "depends": ["R6", "Rcpp", "base64enc", "cli", "digest", "fastmap", "future", "future_apply", "jsonlite", "progressr", "rlang", "rstudioapi", "shiny", "stringr"] }, "diptest": { "name": "diptest", @@ -54725,7 +55325,7 @@ "name": "dipw", "version": "0.1.0", "sha256": "0nxjwiffi1ivafzha3c35kjk36ai7na0nbfl6x3gpsi2km7b84nd", - "depends": ["glmnet", "Matrix", "Rmosek"] + "depends": ["Matrix", "Rmosek", "glmnet"] }, "directPA": { "name": "directPA", @@ -54767,19 +55367,19 @@ "name": "dirttee", "version": "1.0.2", "sha256": "1kmchjvm5x3gsvq2dqxr4di2l607j1ivsm75zwggaiwi8yjz9s4c", - "depends": ["expectreg", "formula_tools", "MASS", "Matrix", "mgcv", "nloptr", "provenance", "rlang", "survival"] + "depends": ["MASS", "Matrix", "expectreg", "formula_tools", "mgcv", "nloptr", "provenance", "rlang", "survival"] }, "disaggR": { "name": "disaggR", - "version": "1.0.5.2", - "sha256": "11lj0x7mq3lmsg03anyk3jnkl0calgipyar2d76rb2x13b33v3kd", + "version": "1.0.5.3", + "sha256": "1i2in27gygmh1l05371hzbf8zssgsjl6jyljsr964gk02l0ghkpn", "depends": ["RColorBrewer"] }, "disaggregation": { "name": "disaggregation", "version": "0.3.0", "sha256": "052l1bky89a9cb6bh22lcksijbri9wdv3pw4wh51c7a8ah9zdqbr", - "depends": ["cowplot", "dplyr", "fmesher", "ggplot2", "Matrix", "RcppEigen", "sf", "sparseMVN", "splancs", "terra", "tidyterra", "TMB"] + "depends": ["Matrix", "RcppEigen", "TMB", "cowplot", "dplyr", "fmesher", "ggplot2", "sf", "sparseMVN", "splancs", "terra", "tidyterra"] }, "disastr_api": { "name": "disastr.api", @@ -54791,7 +55391,7 @@ "name": "disbayes", "version": "1.1.0", "sha256": "0dzgs048pwpl59fpnvqdra001xkwllxpkaxanwdbmzc8l1xmrwb2", - "depends": ["BH", "dplyr", "generics", "ggplot2", "loo", "magrittr", "matrixStats", "mgcv", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "SHELF", "StanHeaders", "tibble", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "SHELF", "StanHeaders", "dplyr", "generics", "ggplot2", "loo", "magrittr", "matrixStats", "mgcv", "rstan", "tibble", "tidyr"] }, "discAUC": { "name": "discAUC", @@ -54809,7 +55409,7 @@ "name": "discSurv", "version": "2.0.0", "sha256": "0k585cyz02vqk4w7w20rhn6g9rspmmlbdpv7k837021iyhwwb838", - "depends": ["data_table", "functional", "geepack", "mgcv", "mvnfast", "mvtnorm", "ranger", "Rdpack", "rpart", "treeClust", "VGAM"] + "depends": ["Rdpack", "VGAM", "data_table", "functional", "geepack", "mgcv", "mvnfast", "mvtnorm", "ranger", "rpart", "treeClust"] }, "discfrail": { "name": "discfrail", @@ -54821,7 +55421,7 @@ "name": "discharge", "version": "1.0.0", "sha256": "1hwsdrbajmpfdc9arb1pjhx2w45dy3zrba9ibcrnpyqhhr4i1c5m", - "depends": ["boot", "checkmate", "CircStats", "ggplot2", "lmom"] + "depends": ["CircStats", "boot", "checkmate", "ggplot2", "lmom"] }, "disclap": { "name": "disclap", @@ -54833,25 +55433,25 @@ "name": "disclapmix", "version": "1.7.4", "sha256": "1rc5kv4abx1hxgkp3vb3f247nv887vrh9l2y189blq0p6k258575", - "depends": ["cluster", "disclap", "MASS", "Rcpp", "RcppProgress"] + "depends": ["MASS", "Rcpp", "RcppProgress", "cluster", "disclap"] }, "disclapmix2": { "name": "disclapmix2", "version": "0.6.1", "sha256": "0lqg4wvx7jf4an2x3lq9486m5741djkw8q506vbn8xlh4gxwmp3s", - "depends": ["cluster", "Rcpp"] + "depends": ["Rcpp", "cluster"] }, "disclosuR": { "name": "disclosuR", "version": "0.6.0", "sha256": "0s1j8j2jyvdr15wysi9y7yin5rz06hgd5rlqxpxz5zc8nyvar69r", - "depends": ["dplyr", "lubridate", "pdftools", "qdap", "rlang", "SentimentAnalysis", "SnowballC", "stringi", "stringr", "syuzhet", "tm", "zoo"] + "depends": ["SentimentAnalysis", "SnowballC", "dplyr", "lubridate", "pdftools", "qdap", "rlang", "stringi", "stringr", "syuzhet", "tm", "zoo"] }, "discnorm": { "name": "discnorm", "version": "0.2.1", "sha256": "05pzrrv2pwd3m15f8qxy0m2gsam3qw71bvapf061rbw1lzmr62b6", - "depends": ["arules", "copula", "cubature", "GoFKernel", "lavaan", "MASS", "mnormt", "pbivnorm", "sirt"] + "depends": ["GoFKernel", "MASS", "arules", "copula", "cubature", "lavaan", "mnormt", "pbivnorm", "sirt"] }, "discord": { "name": "discord", @@ -54863,13 +55463,13 @@ "name": "discourseGT", "version": "1.2.0", "sha256": "00s7bcwc5mdra5wwf3wac6s0bj2n6ryqfx7bv2zji6fp0h4ya4wc", - "depends": ["dplyr", "GGally", "ggplot2", "ggrepel", "igraph", "network"] + "depends": ["GGally", "dplyr", "ggplot2", "ggrepel", "igraph", "network"] }, "discoveR": { "name": "discoveR", "version": "3.1.2", "sha256": "1smy2bzzqc4nvrd4qj2sq4d1f0pvbm4nixxh8xpy22lwwa8pkd24", - "depends": ["cluster", "colourpicker", "config", "DT", "echarts4r", "FactoMineR", "ggdendro", "ggplot2", "golem", "htmltools", "htmlwidgets", "loadeR", "plotly", "rlang", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs"] + "depends": ["DT", "FactoMineR", "cluster", "colourpicker", "config", "echarts4r", "ggdendro", "ggplot2", "golem", "htmltools", "htmlwidgets", "loadeR", "plotly", "rlang", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs"] }, "discoverableresearch": { "name": "discoverableresearch", @@ -54921,33 +55521,33 @@ }, "diseasystore": { "name": "diseasystore", - "version": "0.2.1", - "sha256": "17ypayb3bnan6ar6yv3n1l56yb3wzxpj7vc1fzbkxg1pgqrm43jg", - "depends": ["checkmate", "DBI", "dbplyr", "dplyr", "glue", "ISOweek", "jsonlite", "lubridate", "purrr", "R6", "readr", "rlang", "SCDB", "stringr", "tidyr", "tidyselect", "zoo"] + "version": "0.2.2", + "sha256": "1024r1p4wawcg1346vk91xk7x5hxasliiyjp2y0nk085s4lb7s96", + "depends": ["DBI", "ISOweek", "R6", "SCDB", "checkmate", "dbplyr", "dplyr", "glue", "jsonlite", "lubridate", "purrr", "readr", "rlang", "stringr", "tidyr", "tidyselect", "zoo"] }, "disk_frame": { "name": "disk.frame", "version": "0.8.3", "sha256": "0mkzvxbjr9iw2bmnw4s5s7glly1nnf4j83y6yzw5vg1gwqghynky", - "depends": ["arrow", "benchmarkme", "bigreadr", "bit64", "crayon", "data_table", "dplyr", "fs", "fst", "future", "future_apply", "globals", "glue", "jsonlite", "pryr", "purrr", "Rcpp", "rlang", "stringr"] + "depends": ["Rcpp", "arrow", "benchmarkme", "bigreadr", "bit64", "crayon", "data_table", "dplyr", "fs", "fst", "future", "future_apply", "globals", "glue", "jsonlite", "pryr", "purrr", "rlang", "stringr"] }, "dismo": { "name": "dismo", "version": "1.3-14", "sha256": "1msc75xnc9lbnn8pivd5j4jvb1b9p3xgybfm2ak2mpb2aplz5837", - "depends": ["raster", "Rcpp", "sp", "terra"] + "depends": ["Rcpp", "raster", "sp", "terra"] }, "disordR": { "name": "disordR", "version": "0.9-8.2", "sha256": "07ydnyifqdsan0kp74mlxaviwj4ccnsh77z36gsh2cpyhda2la8d", - "depends": ["digest", "Matrix"] + "depends": ["Matrix", "digest"] }, "dispRity": { "name": "dispRity", "version": "1.8", "sha256": "0hng3g5mq75b7rvdypnz816xahbfa4fgyi2n6drxma258qskyd68", - "depends": ["ade4", "ape", "castor", "Claddis", "ellipse", "geometry", "GET", "MASS", "mnormt", "phangorn", "phyclust", "phylolm", "scales", "vegan", "zoo"] + "depends": ["Claddis", "GET", "MASS", "ade4", "ape", "castor", "ellipse", "geometry", "mnormt", "phangorn", "phyclust", "phylolm", "scales", "vegan", "zoo"] }, "disparityfilter": { "name": "disparityfilter", @@ -55007,12 +55607,12 @@ "name": "distTails", "version": "0.1.2", "sha256": "10p7rfqfkhcwq10lhz3cq9i4k1jdccks4y3791lajljsxz5jrca4", - "depends": ["ercv", "gsl", "MASS"] + "depends": ["MASS", "ercv", "gsl"] }, "distances": { "name": "distances", - "version": "0.1.10", - "sha256": "0rni8naaryvhmldk8zflwlb4kdrvjfcmfb0j5nxfm4yndqad557b", + "version": "0.1.11", + "sha256": "0v2i1q16kcxr1v988zcgpqgrwvagzfcafzxjkkz06x72j8s63jrd", "depends": [] }, "distanceto": { @@ -55025,13 +55625,13 @@ "name": "distantia", "version": "1.0.2", "sha256": "12d6xzhcxs3xxyj82ih6chrr638siy45gna1s22vhnqvjd5jixc6", - "depends": ["arrangements", "data_table", "doParallel", "fields", "foreach", "iterators", "plyr", "RColorBrewer", "viridis"] + "depends": ["RColorBrewer", "arrangements", "data_table", "doParallel", "fields", "foreach", "iterators", "plyr", "viridis"] }, "distcomp": { "name": "distcomp", "version": "1.3-3", "sha256": "01h8cczkb0vb6560rh4czvajwa7gbgp41pl2b5xw7a68cbjizv8n", - "depends": ["digest", "dplyr", "gmp", "homomorpheR", "httr", "jsonlite", "magrittr", "R6", "rlang", "shiny", "stringr", "survival"] + "depends": ["R6", "digest", "dplyr", "gmp", "homomorpheR", "httr", "jsonlite", "magrittr", "rlang", "shiny", "stringr", "survival"] }, "distcrete": { "name": "distcrete", @@ -55061,7 +55661,7 @@ "name": "distillML", "version": "0.1.0.13", "sha256": "05pk6g3bjaw0ghb673yxfvnijqkvjy4bfxk2vpiwccm7hjszl62s", - "depends": ["checkmate", "data_table", "dplyr", "ggplot2", "glmnet", "gridExtra", "mltools", "purrr", "R6", "Rforestry", "tidyr"] + "depends": ["R6", "Rforestry", "checkmate", "data_table", "dplyr", "ggplot2", "glmnet", "gridExtra", "mltools", "purrr", "tidyr"] }, "distillery": { "name": "distillery", @@ -55085,7 +55685,7 @@ "name": "distops", "version": "0.1.0", "sha256": "02r6zf4jmk29879gvlxg7mh0lf9r8d340vb48md2swis25nidgx1", - "depends": ["cli", "desc", "fs", "glue", "Rcpp", "RcppParallel", "usethis"] + "depends": ["Rcpp", "RcppParallel", "cli", "desc", "fs", "glue", "usethis"] }, "distory": { "name": "distory", @@ -55103,7 +55703,7 @@ "name": "distrDoc", "version": "2.8.2", "sha256": "0acbmh2lxf82527gm4i3vvh8gqfdnycsmdnf0s5pwz29zs6ql12z", - "depends": ["distr", "distrEx", "distrMod", "distrSim", "distrTeach", "distrTEst", "MASS", "RandVar", "startupmsg"] + "depends": ["MASS", "RandVar", "distr", "distrEx", "distrMod", "distrSim", "distrTEst", "distrTeach", "startupmsg"] }, "distrEllipse": { "name": "distrEllipse", @@ -55121,7 +55721,7 @@ "name": "distrMod", "version": "2.9.1", "sha256": "0gpa19xdw4gl8impn9lq8xxc8qwzs1wygfglzfn7hjin8l588avj", - "depends": ["distr", "distrEx", "MASS", "RandVar", "sfsmisc", "startupmsg"] + "depends": ["MASS", "RandVar", "distr", "distrEx", "sfsmisc", "startupmsg"] }, "distrRmetrics": { "name": "distrRmetrics", @@ -55169,7 +55769,7 @@ "name": "distributionsrd", "version": "0.0.6", "sha256": "0ykzxcxh5l9l5z3546iqlllryw2xyixz1hiynx19k8bsn8k7dxyp", - "depends": ["flexmix", "modeltools", "Rdpack"] + "depends": ["Rdpack", "flexmix", "modeltools"] }, "distro": { "name": "distro", @@ -55181,7 +55781,7 @@ "name": "distrom", "version": "1.0.1", "sha256": "1j8k8cgh5r8av8jf8miq858j66hmkkcdjqhia77iivx97fg9pcjk", - "depends": ["gamlr", "Matrix"] + "depends": ["Matrix", "gamlr"] }, "distrr": { "name": "distrr", @@ -55223,7 +55823,7 @@ "name": "diveMove", "version": "1.6.2", "sha256": "04naajbri3jrdcggh7ja1niyqb4l2afawpcw5nay0bx7823i5nhq", - "depends": ["geosphere", "KernSmooth", "plotly", "quantreg", "uniReg"] + "depends": ["KernSmooth", "geosphere", "plotly", "quantreg", "uniReg"] }, "diveR": { "name": "diveR", @@ -55247,19 +55847,19 @@ "name": "diversitree", "version": "0.10-0", "sha256": "1xl2swbmgpni2y2divl29xh702b88kxgcswa47g62ny59gh2fdn1", - "depends": ["ape", "deSolve", "Rcpp", "subplex"] + "depends": ["Rcpp", "ape", "deSolve", "subplex"] }, "diversityForest": { "name": "diversityForest", "version": "0.4.0", "sha256": "1yp9lwr5sj8mv1sxrrjsx00m2aq02xcs3q06v51h29g686rdij0f", - "depends": ["gam", "ggplot2", "ggpubr", "MapGAM", "Matrix", "nnet", "RColorBrewer", "Rcpp", "RcppEigen", "rlang", "rms", "scales", "sgeostat", "survival"] + "depends": ["MapGAM", "Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "gam", "ggplot2", "ggpubr", "nnet", "rlang", "rms", "scales", "sgeostat", "survival"] }, "divest": { "name": "divest", "version": "1.0.0", "sha256": "1qm2m4dxh1rlxbr9y1vpyhngxyawi2ll72s5ayiaik6rgr5jd2cp", - "depends": ["Rcpp", "RNifti"] + "depends": ["RNifti", "Rcpp"] }, "divo": { "name": "divo", @@ -55283,7 +55883,7 @@ "name": "divvy", "version": "1.0.0", "sha256": "03s76pkywxcx6kkdq7dpa0l2rvhwibzp48sb9mqbbhf713a621pi", - "depends": ["iNEXT", "Rdpack", "sf", "terra", "units", "vegan"] + "depends": ["Rdpack", "iNEXT", "sf", "terra", "units", "vegan"] }, "dixon": { "name": "dixon", @@ -55313,7 +55913,7 @@ "name": "dlbayes", "version": "0.1.0", "sha256": "058kkh67npai2ffrjdpjn4pzj8f233znl16nj6yx8wz8lkb17cb0", - "depends": ["expm", "GIGrvg", "glmnet", "LaplacesDemon", "MASS"] + "depends": ["GIGrvg", "LaplacesDemon", "MASS", "expm", "glmnet"] }, "dlib": { "name": "dlib", @@ -55337,7 +55937,7 @@ "name": "dlmtree", "version": "1.0.0", "sha256": "01nzhi1ysbvfl8f3asba9l2n72aidk632njv5m50k9xjfcjhayqb", - "depends": ["dplyr", "ggplot2", "mgcv", "Rcpp", "RcppArmadillo", "RcppEigen", "shiny", "shinythemes", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "dplyr", "ggplot2", "mgcv", "shiny", "shinythemes", "tidyr"] }, "dlnm": { "name": "dlnm", @@ -55361,13 +55961,13 @@ "name": "dlsem", "version": "2.4.6", "sha256": "1h3bwqqpfjkl41b2mbfhsj0pi9kri0h0i28wiid6arjrmm87nsf8", - "depends": ["graph", "Rgraphviz"] + "depends": ["Rgraphviz", "graph"] }, "dlstats": { "name": "dlstats", "version": "0.1.7", "sha256": "1qc7gp2glkbhnblqckz3l7jmlsarf3jlsp6cqm4wm0s87z038r9a", - "depends": ["ggplot2", "jsonlite", "magrittr", "RColorBrewer", "scales"] + "depends": ["RColorBrewer", "ggplot2", "jsonlite", "magrittr", "scales"] }, "dm": { "name": "dm", @@ -55391,19 +55991,19 @@ "name": "dmbc", "version": "1.0.2", "sha256": "0crwmprmn4k565zwvwwqkf70j6f166rvhssx0pwrmch935ascpsf", - "depends": ["abind", "bayesplot", "coda", "ggplot2", "ggrepel", "modeltools", "Rcpp", "RcppArmadillo", "RcppProgress", "robustbase", "robustX"] + "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "abind", "bayesplot", "coda", "ggplot2", "ggrepel", "modeltools", "robustX", "robustbase"] }, "dmetatools": { "name": "dmetatools", "version": "1.1.1", "sha256": "0n62lfga8br3p3vn10rs56mbrbsrr7b6m8cb15za52nm2qn9m3a5", - "depends": ["mada", "MASS"] + "depends": ["MASS", "mada"] }, "dml": { "name": "dml", "version": "1.1.0", "sha256": "0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l", - "depends": ["lfda", "MASS"] + "depends": ["MASS", "lfda"] }, "dmlalg": { "name": "dmlalg", @@ -55433,7 +56033,7 @@ "name": "dmutate", "version": "0.1.3", "sha256": "1dxx4v9fg0cd2m5lwk3j6n9g6n9zqr7rs75yiz3m3q8cpw1pjqpk", - "depends": ["dplyr", "MASS"] + "depends": ["MASS", "dplyr"] }, "dndR": { "name": "dndR", @@ -55451,7 +56051,7 @@ "name": "dnn", "version": "0.0.6", "sha256": "0mij6d69hhzrcp3yvqwmajhn4bm2bnc3lk9hrkh5ly2a21g46yg4", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "survival"] }, "dnr": { "name": "dnr", @@ -55467,9 +56067,9 @@ }, "doBy": { "name": "doBy", - "version": "4.6.21", - "sha256": "01s9kls9j1nvygh0cc2bfd6n5sjccaalvfw3zx8sv7r2p4clgsij", - "depends": ["boot", "broom", "cowplot", "Deriv", "dplyr", "ggplot2", "MASS", "Matrix", "microbenchmark", "modelr", "pbkrtest", "rlang", "tibble", "tidyr"] + "version": "4.6.22", + "sha256": "038b1gs039br4xzv6axij2fzdzahmk718qm4akg77bwqvqvf59ra", + "depends": ["Deriv", "MASS", "Matrix", "boot", "broom", "cowplot", "dplyr", "ggplot2", "microbenchmark", "modelr", "rlang", "tibble", "tidyr"] }, "doFuture": { "name": "doFuture", @@ -55487,7 +56087,7 @@ "name": "doMPI", "version": "0.2.2", "sha256": "0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938", - "depends": ["foreach", "iterators", "Rmpi"] + "depends": ["Rmpi", "foreach", "iterators"] }, "doParallel": { "name": "doParallel", @@ -55529,7 +56129,7 @@ "name": "doc2concrete", "version": "0.6.0", "sha256": "13rgh3s13bbjgw3svh4sxz3kpv08p9gwxi9g55lb377nxachdzxr", - "depends": ["english", "glmnet", "quanteda", "SnowballC", "stringi", "stringr", "textstem", "tm"] + "depends": ["SnowballC", "english", "glmnet", "quanteda", "stringi", "stringr", "textstem", "tm"] }, "doc2vec": { "name": "doc2vec", @@ -55539,9 +56139,15 @@ }, "dockerfiler": { "name": "dockerfiler", - "version": "0.2.2", - "sha256": "0j5j93hbqgc9qscadldk8j2knx87q2l91fwsjhh792jflvwxgfzi", - "depends": ["attempt", "cli", "desc", "fs", "glue", "jsonlite", "memoise", "pak", "pkgbuild", "R6", "remotes", "usethis"] + "version": "0.2.3", + "sha256": "1fy9mdq24v48vv3fkglwv1rqhlm4chlgli6d7arw0wa9s4h9bh2z", + "depends": ["R6", "attempt", "cli", "desc", "fs", "glue", "jsonlite", "memoise", "pak", "pkgbuild", "purrr", "remotes", "usethis"] + }, + "docket": { + "name": "docket", + "version": "1.33", + "sha256": "0hwmnclknik9pkzncbnqabvln276lcyb3rh5dy1wxibq85qax84f", + "depends": ["XML", "stringr", "xml2", "zip"] }, "docknitr": { "name": "docknitr", @@ -55611,9 +56217,9 @@ }, "dodgr": { "name": "dodgr", - "version": "0.4.0", - "sha256": "0r1p2zj6f2y6v2mk59apas8hcxcfxg6b2mniz5d6nnq074a57s9m", - "depends": ["callr", "digest", "fs", "magrittr", "memoise", "osmdata", "Rcpp", "RcppParallel", "RcppThread"] + "version": "0.4.1", + "sha256": "12vsw3yi99jalhz41fiq67fhb4jk0rrcfwb06gfkrifalp2p9jws", + "depends": ["Rcpp", "RcppParallel", "RcppThread", "callr", "digest", "fs", "magrittr", "memoise", "osmdata"] }, "doebioresearch": { "name": "doebioresearch", @@ -55631,7 +56237,7 @@ "name": "dogesr", "version": "0.5.0", "sha256": "0w5qps781c406br5rba6mv127yrlgq7rzchk55j7mndrm7hwia63", - "depends": ["dplyr", "ggplot2", "ggthemes", "igraph", "knitr", "qpdf", "Rdpack", "rmarkdown"] + "depends": ["Rdpack", "dplyr", "ggplot2", "ggthemes", "igraph", "knitr", "qpdf", "rmarkdown"] }, "dominanceanalysis": { "name": "dominanceanalysis", @@ -55673,7 +56279,7 @@ "name": "doolkit", "version": "1.42.2", "sha256": "0hyqbpnhzjsx7ml0z6n9z60yhp5c0dyicm3jfc841aykvb1ifqbp", - "depends": ["concaveman", "ggplot2", "igraph", "MASS", "Morpho", "rgl", "Rvcg", "sp", "tis", "usethis"] + "depends": ["MASS", "Morpho", "Rvcg", "concaveman", "ggplot2", "igraph", "rgl", "sp", "tis", "usethis"] }, "doremi": { "name": "doremi", @@ -55689,15 +56295,15 @@ }, "dosearch": { "name": "dosearch", - "version": "1.0.8", - "sha256": "1jymk03snrfmr9da7h7l9823mzlcn6y4z6ay6nzi82n08d9xmp06", + "version": "1.0.11", + "sha256": "0ghwk0h9rrfg4i6xdiybirqvrpzm3rv0w41jqqlhm43jf7796pmj", "depends": ["Rcpp"] }, "dosedesignR": { "name": "dosedesignR", "version": "0.3.0", "sha256": "0s25nv3vdbnl1sn8gdhr45l7paiby452b2986xfkc3cvrdlsrhjw", - "depends": ["DoseFinding", "DT", "ggplot2", "kableExtra", "knitr", "latticeExtra", "purrr", "readxl", "Rsolnp", "shiny", "shinyBS", "shinyjs", "shinyWidgets", "stringr"] + "depends": ["DT", "DoseFinding", "Rsolnp", "ggplot2", "kableExtra", "knitr", "latticeExtra", "purrr", "readxl", "shiny", "shinyBS", "shinyWidgets", "shinyjs", "stringr"] }, "doseminer": { "name": "doseminer", @@ -55739,7 +56345,7 @@ "name": "dotprofile", "version": "0.0.1", "sha256": "10vm8s1sk4i2930zzswgwy1y873x8byfr7xfb8xq6cdk9ci7l741", - "depends": ["cli", "R6"] + "depends": ["R6", "cli"] }, "dots": { "name": "dots", @@ -55767,9 +56373,9 @@ }, "doublIn": { "name": "doublIn", - "version": "0.1.0", - "sha256": "04y1kq6f39kjp7i8hr52a93103nf2dpvkj34w4s0fvaqmw1h44b3", - "depends": ["coda", "dplyr", "DT", "epicontacts", "flexsurv", "ggplot2", "lubridate", "magrittr", "mStats", "plotly", "rjags", "shiny", "shinydashboard", "shinythemes", "shinyWidgets", "tidyverse", "visNetwork", "xtable"] + "version": "0.2.0", + "sha256": "0x22q6i07f49cjyhy9i2b9h818sgadxbhb6zwym2qilgf3mxj57g", + "depends": ["DT", "coda", "dplyr", "epicontacts", "flexsurv", "ggplot2", "lubridate", "mStats", "magrittr", "plotly", "rjags", "shiny", "shinyWidgets", "shinydashboard", "shinythemes", "tidyverse", "visNetwork", "xtable"] }, "double_truncation": { "name": "double.truncation", @@ -55803,27 +56409,27 @@ }, "downloadthis": { "name": "downloadthis", - "version": "0.3.3", - "sha256": "14c85cradmm187jzwf3njgshmzq53xr4dla39dkxmhnw07mgdw4l", - "depends": ["base64enc", "bsplus", "fs", "ggplot2", "htmltools", "magrittr", "mime", "readr", "writexl", "zip"] + "version": "0.4.0", + "sha256": "0hl0xgvlami8q265kyc9nfi916qyr5wh3422rzz3pl5razv09pdp", + "depends": ["b64", "bsplus", "fs", "ggplot2", "htmltools", "magrittr", "mime", "readr", "writexl", "zip"] }, "downscale": { "name": "downscale", "version": "5.0.0", "sha256": "1rcmn5f30l004rp8a7pmn0w5izsy31n9lwsk3sgj01fjzk0333wc", - "depends": ["cubature", "minpack_lm", "Rmpfr", "sf", "terra"] + "depends": ["Rmpfr", "cubature", "minpack_lm", "sf", "terra"] }, "downsize": { "name": "downsize", "version": "0.2.3", "sha256": "0yx62nx5ga835ng9gwrkwivxjhjrkygdldnd1hswc6wnvfs1qz8s", - "depends": ["magrittr", "R_utils"] + "depends": ["R_utils", "magrittr"] }, "dowser": { "name": "dowser", "version": "2.2.0", "sha256": "05fjca2zfa66fq360swywmncjxz7pvjp0d5h7a0axinvy9wiccg6", - "depends": ["alakazam", "ape", "Biostrings", "dplyr", "ggplot2", "ggtree", "gridExtra", "markdown", "phangorn", "phylotate", "RColorBrewer", "rlang", "shazam", "stringr", "tidyr", "tidyselect"] + "depends": ["Biostrings", "RColorBrewer", "alakazam", "ape", "dplyr", "ggplot2", "ggtree", "gridExtra", "markdown", "phangorn", "phylotate", "rlang", "shazam", "stringr", "tidyr", "tidyselect"] }, "dparser": { "name": "dparser", @@ -55841,13 +56447,13 @@ "name": "dplR", "version": "1.7.7", "sha256": "1gdjrpa0x6clafiybqcc7119i350k2hx34j5ksgljwr7lb9a8d8f", - "depends": ["boot", "digest", "lattice", "Matrix", "matrixStats", "png", "R_utils", "signal", "stringi", "stringr", "XML"] + "depends": ["Matrix", "R_utils", "XML", "boot", "digest", "lattice", "matrixStats", "png", "signal", "stringi", "stringr"] }, "dplyr": { "name": "dplyr", "version": "1.1.4", "sha256": "1jsq8pj12bngy66xms486j8a65wxvyqs944q9rxkiaylsla08wyg", - "depends": ["cli", "generics", "glue", "lifecycle", "magrittr", "pillar", "R6", "rlang", "tibble", "tidyselect", "vctrs"] + "depends": ["R6", "cli", "generics", "glue", "lifecycle", "magrittr", "pillar", "rlang", "tibble", "tidyselect", "vctrs"] }, "dplyrAssist": { "name": "dplyrAssist", @@ -55859,7 +56465,7 @@ "name": "dpm", "version": "1.2.0", "sha256": "1wg492r19rd1hplq6ccngwr0z615m4yx5jln0v01gbz4pm47dpmi", - "depends": ["crayon", "dplyr", "Formula", "jtools", "lavaan", "panelr", "rlang", "stringr"] + "depends": ["Formula", "crayon", "dplyr", "jtools", "lavaan", "panelr", "rlang", "stringr"] }, "dpmr": { "name": "dpmr", @@ -55877,7 +56483,7 @@ "name": "dprop", "version": "0.1.0", "sha256": "0fvghjblm6giq72qqn20qwlw4ki9lrxagsy0jjbiinf51rdrhc8y", - "depends": ["extraDistr", "VaRES"] + "depends": ["VaRES", "extraDistr"] }, "dpseg": { "name": "dpseg", @@ -55901,7 +56507,7 @@ "name": "dr4pl", "version": "2.0.0", "sha256": "1nmy8mxxrmwzw826wvnn4rrm64xal9jr160yqiqj41zmb241q4b6", - "depends": ["generics", "ggplot2", "glue", "Matrix", "Rdpack", "rlang", "tensor"] + "depends": ["Matrix", "Rdpack", "generics", "ggplot2", "glue", "rlang", "tensor"] }, "dracor": { "name": "dracor", @@ -55967,7 +56573,7 @@ "name": "drc", "version": "3.0-1", "sha256": "0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y", - "depends": ["car", "gtools", "MASS", "multcomp", "plotrix", "scales"] + "depends": ["MASS", "car", "gtools", "multcomp", "plotrix", "scales"] }, "drcSeedGerm": { "name": "drcSeedGerm", @@ -55979,19 +56585,19 @@ "name": "drcarlate", "version": "1.2.0", "sha256": "05yfyjkxrayz9cmlk7qnbcqgjfxnbkmc2wkbarr9l8m47zzhda8n", - "depends": ["glmnet", "MASS", "pracma", "purrr", "splus2R", "stringr"] + "depends": ["MASS", "glmnet", "pracma", "purrr", "splus2R", "stringr"] }, "drclust": { "name": "drclust", "version": "0.1", "sha256": "04qi123vdj33dfhgxmwc0c2viwa74lr4x1kj85rgbvvsqhwnp1kz", - "depends": ["cluster", "factoextra", "fpc", "pheatmap", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "cluster", "factoextra", "fpc", "pheatmap"] }, "drcte": { "name": "drcte", "version": "1.0.30", "sha256": "0gpzpmk5v1lr03gl710kp4d4ldfskjr5s66wcl00abg3kz8jpixn", - "depends": ["dplyr", "drc", "lmtest", "MASS", "mclust", "multcomp", "nor1mix", "plyr", "sandwich", "survival", "tidyr"] + "depends": ["MASS", "dplyr", "drc", "lmtest", "mclust", "multcomp", "nor1mix", "plyr", "sandwich", "survival", "tidyr"] }, "drda": { "name": "drda", @@ -56015,13 +56621,19 @@ "name": "drf", "version": "1.1.0", "sha256": "13b31rynknzirnvgygs1ar5968xdh8dhg60ibn0g359gnzadn7ad", - "depends": ["fastDummies", "Matrix", "Rcpp", "RcppEigen", "transport"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "fastDummies", "transport"] }, "drgee": { "name": "drgee", "version": "1.1.10", "sha256": "0hy7887mvlxh73zk2yzp46bqakq924n940j21lw25jgygmzz1176", - "depends": ["data_table", "nleqslv", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "nleqslv", "survival"] + }, + "drglm": { + "name": "drglm", + "version": "1.1", + "sha256": "1v3n546ivvh5hfwlz7m1wn6jdgcd9yjnricah1y7v6r15zy3jyds", + "depends": ["nnet", "speedglm"] }, "drhur": { "name": "drhur", @@ -56039,13 +56651,13 @@ "name": "drimmR", "version": "1.0.1", "sha256": "0fi0ifb9y2jfb347684fd9pjfgn4b693yb5sqbcfpf2z7jvknsi1", - "depends": ["doParallel", "dplyr", "foreach", "future", "ggplot2", "Rdpack", "reshape2", "seqinr", "tidyverse"] + "depends": ["Rdpack", "doParallel", "dplyr", "foreach", "future", "ggplot2", "reshape2", "seqinr", "tidyverse"] }, "driveR": { "name": "driveR", "version": "0.4.1", "sha256": "00cwzy097wbl1k3sw3nfn0kzb6af7hyzwaznvlckf77g7kw86bmi", - "depends": ["caret", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "org_Hs_eg_db", "randomForest", "rlang", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene"] + "depends": ["GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "caret", "org_Hs_eg_db", "randomForest", "rlang"] }, "droll": { "name": "droll", @@ -56053,11 +56665,17 @@ "sha256": "0gd1vnvkjdsw7gz4czi4g9zq5080awfr4dy2srgksh4ah4ki4vm3", "depends": ["Ryacas"] }, + "dropR": { + "name": "dropR", + "version": "1.0.3", + "sha256": "159kw9wxglc7rbb5bvvg1ixi0j1y22179wn7g40k9ahpfvfmbqy4", + "depends": ["data_table", "ggplot2", "lifecycle", "shiny", "survival"] + }, "dropout": { "name": "dropout", "version": "2.1.1", "sha256": "11clanskb3w0v1ahx6q8d7nxqfsck4zbcyrkb8db1ykbdakdq1xs", - "depends": ["dplyr", "Rcpp", "tibble"] + "depends": ["Rcpp", "dplyr", "tibble"] }, "droptest": { "name": "droptest", @@ -56069,7 +56687,7 @@ "name": "drord", "version": "1.0.1", "sha256": "0xi85s6y78d54qv3cw7q72dz5kcs8cc8nyjyaxr5h6pfpzi2l8i9", - "depends": ["ggplot2", "MASS", "ordinal", "VGAM"] + "depends": ["MASS", "VGAM", "ggplot2", "ordinal"] }, "drought": { "name": "drought", @@ -56081,25 +56699,25 @@ "name": "drpop", "version": "0.0.3", "sha256": "1gh0w1a59070g9mmck4fp9591vfw23c5nlj3jrkxwarp4vfy1dqp", - "depends": ["dplyr", "gam", "ggplot2", "janitor", "nnet", "nnls", "ranger", "reshape2", "stringr", "SuperLearner", "tidyr"] + "depends": ["SuperLearner", "dplyr", "gam", "ggplot2", "janitor", "nnet", "nnls", "ranger", "reshape2", "stringr", "tidyr"] }, "drtmle": { "name": "drtmle", "version": "1.1.2", "sha256": "0qvdxzvpi7a66gx61v6fj31zy4y5cid18g4qgv5lir7qc74rbbx0", - "depends": ["future_apply", "np", "SuperLearner"] + "depends": ["SuperLearner", "future_apply", "np"] }, "drugDemand": { "name": "drugDemand", "version": "0.1.3", "sha256": "1gmpvcrcs1j2m98dxppa0jss781dpscw89ffh8d6yamm385p0951", - "depends": ["doParallel", "doRNG", "dplyr", "erify", "eventPred", "foreach", "L1pack", "MASS", "mvtnorm", "nlme", "plotly", "purrr", "Rcpp", "rlang", "stringr", "survival"] + "depends": ["L1pack", "MASS", "Rcpp", "doParallel", "doRNG", "dplyr", "erify", "eventPred", "foreach", "mvtnorm", "nlme", "plotly", "purrr", "rlang", "stringr", "survival"] }, "drugdevelopR": { "name": "drugdevelopR", "version": "1.0.1", "sha256": "0mbr0s826wmknw4n50qbg5i9b5x969s9h7w21nni17i074iqjhpb", - "depends": ["cubature", "doParallel", "foreach", "iterators", "MASS", "msm", "mvtnorm", "progressr"] + "depends": ["MASS", "cubature", "doParallel", "foreach", "iterators", "msm", "mvtnorm", "progressr"] }, "drugprepr": { "name": "drugprepr", @@ -56129,7 +56747,7 @@ "name": "dsa", "version": "1.0.12", "sha256": "16lqqm0lcgpkzkj7d0akamzap85aj4dyj5rs5fkb5b9bjqa5r4c5", - "depends": ["dygraphs", "forecast", "ggplot2", "gridExtra", "htmlwidgets", "R2HTML", "reshape2", "rJava", "seastests", "timeDate", "tsoutliers", "xts", "zoo"] + "depends": ["R2HTML", "dygraphs", "forecast", "ggplot2", "gridExtra", "htmlwidgets", "rJava", "reshape2", "seastests", "timeDate", "tsoutliers", "xts", "zoo"] }, "dsample": { "name": "dsample", @@ -56147,7 +56765,7 @@ "name": "dscore", "version": "1.9.0", "sha256": "1skcmd2fh8s5d5qdj661niwa3cfd01i22kxxcf84awad0p1p8g57", - "depends": ["dplyr", "Rcpp", "RcppArmadillo", "stringi", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "stringi", "tidyr"] }, "dsdp": { "name": "dsdp", @@ -56157,9 +56775,9 @@ }, "dsem": { "name": "dsem", - "version": "1.2.1", - "sha256": "08k4h81zm3clzxr0lff7kxbfgnn66jzh0x5bm1jv9ag08p67392i", - "depends": ["igraph", "Matrix", "RcppEigen", "sem", "TMB"] + "version": "1.3.0", + "sha256": "1zqywsa2ip48vpzbk1xml1glrihgfwf37z25pzs07xzj0ij1lwjy", + "depends": ["Matrix", "RcppEigen", "TMB", "igraph", "sem"] }, "dsims": { "name": "dsims", @@ -56177,7 +56795,7 @@ "name": "dslice", "version": "1.2.2", "sha256": "0h34bnji7ll2zh79d1yilj908mjgf27yify2kl2gapj9k499zc2v", - "depends": ["ggplot2", "Rcpp", "scales"] + "depends": ["Rcpp", "ggplot2", "scales"] }, "dsm": { "name": "dsm", @@ -56199,8 +56817,8 @@ }, "dsmmR": { "name": "dsmmR", - "version": "1.0.2", - "sha256": "05hbwdycbz58mn01xl6958w03z4adjb00bgl1f9sqbhgy4x23397", + "version": "1.0.5", + "sha256": "0pdhpshdhpd1cvgnx3cnbkczwychxv49w90sc4lvgviknl7wd4c1", "depends": ["DiscreteWeibull"] }, "dsos": { @@ -56225,7 +56843,7 @@ "name": "dst", "version": "1.7.0", "sha256": "1l3bc2pn092wawf11dmjyv67c280c4p9j3maillc10mpaxav5k99", - "depends": ["dplyr", "ggplot2", "Matrix", "rlang", "tidyr"] + "depends": ["Matrix", "dplyr", "ggplot2", "rlang", "tidyr"] }, "dstabledist": { "name": "dstabledist", @@ -56249,7 +56867,7 @@ "name": "dtComb", "version": "1.0.2", "sha256": "1ww0lw7j77ww1scd99ddasnxp7icbwbadiv3sl4zm8i1bb2mqmyr", - "depends": ["caret", "epiR", "gam", "ggplot2", "ggpubr", "glmnet", "OptimalCutpoints", "pROC"] + "depends": ["OptimalCutpoints", "caret", "epiR", "gam", "ggplot2", "ggpubr", "glmnet", "pROC"] }, "dtangle": { "name": "dtangle", @@ -56297,7 +56915,7 @@ "name": "dtrackr", "version": "0.4.4", "sha256": "0biwciv8f8rd6psydiriyylklw7q954dsr3rrax5a2fc3gn9adbz", - "depends": ["base64enc", "dplyr", "fs", "glue", "htmltools", "magrittr", "pdftools", "png", "purrr", "rlang", "rsvg", "stringr", "tibble", "tidyr", "V8"] + "depends": ["V8", "base64enc", "dplyr", "fs", "glue", "htmltools", "magrittr", "pdftools", "png", "purrr", "rlang", "rsvg", "stringr", "tibble", "tidyr"] }, "dtt": { "name": "dtt", @@ -56313,9 +56931,9 @@ }, "dtts": { "name": "dtts", - "version": "0.1.2", - "sha256": "1qlk2rk43nwgr2z1dkv6fi0llq0wvzb59a5m5n79fqnf7hv2fp8k", - "depends": ["bit64", "data_table", "nanotime", "Rcpp", "RcppCCTZ", "RcppDate"] + "version": "0.1.3", + "sha256": "0n13q14a4vhfx6jvjg4zbch0874agfm8z5mlwzvpvh4vc5rcc4bk", + "depends": ["Rcpp", "RcppCCTZ", "RcppDate", "bit64", "data_table", "nanotime"] }, "dtw": { "name": "dtw", @@ -56325,9 +56943,9 @@ }, "dtwclust": { "name": "dtwclust", - "version": "5.5.12", - "sha256": "19dmy9jalwp2vcfkzm58g5wf4nmp3290rrsa51prw8xrjj0hk1g3", - "depends": ["clue", "cluster", "dplyr", "dtw", "flexclust", "foreach", "ggplot2", "ggrepel", "Matrix", "proxy", "Rcpp", "RcppArmadillo", "RcppParallel", "RcppThread", "reshape2", "RSpectra", "shiny", "shinyjs"] + "version": "6.0.0", + "sha256": "0by01x4qpf1pin5l61wmm600bmsnlnns9knwb0qmjlj72pmwfkqh", + "depends": ["Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "RcppParallel", "RcppThread", "clue", "cluster", "dplyr", "dtw", "flexclust", "foreach", "ggplot2", "ggrepel", "proxy", "reshape2", "rlang", "shiny", "shinyjs"] }, "dual": { "name": "dual", @@ -56339,7 +56957,7 @@ "name": "dualScale", "version": "1.0.0", "sha256": "0dw8vknkvb9qzmxw2xmwnpa1dlrqhx70j32q6dm5j1sxjyw2zx37", - "depends": ["eba", "ff", "ggplot2", "ggrepel", "glue", "Matrix", "matrixcalc", "RColorBrewer"] + "depends": ["Matrix", "RColorBrewer", "eba", "ff", "ggplot2", "ggrepel", "glue", "matrixcalc"] }, "dualtrees": { "name": "dualtrees", @@ -56361,14 +56979,14 @@ }, "duckdb": { "name": "duckdb", - "version": "1.0.0", - "sha256": "08hcrbfcf76d7dbgngzz48l07ahzkf9vkb236h06mw9k820dlzm5", + "version": "1.0.0-2", + "sha256": "00dzrjwpd94k11gqvdafxkd8pqlwav6l4haim88p8ann48gxad9p", "depends": ["DBI"] }, "duckdbfs": { "name": "duckdbfs", - "version": "0.0.4", - "sha256": "0d23ji2pwg5xmqj584174194yh4sn74skqjmz2s1vzzgpprazclh", + "version": "0.0.5", + "sha256": "1vj3ay4lr0whzvkljha1sk4cqjsngj7k1zykjfmj67drljvy7m64", "depends": ["DBI", "dbplyr", "dplyr", "duckdb", "fs", "glue"] }, "duckduckr": { @@ -56379,9 +56997,9 @@ }, "duckplyr": { "name": "duckplyr", - "version": "0.4.0", - "sha256": "00fdpf9kgzcic0wf43xzh56mdscf0vds91s1anayqjaq9b8g58dn", - "depends": ["cli", "collections", "DBI", "dplyr", "duckdb", "glue", "jsonlite", "lifecycle", "rlang", "tibble", "tidyselect", "vctrs"] + "version": "0.4.1", + "sha256": "1lrg5prs6gy1iv6i5n970miafvz1jqnv6bzvw2lciszrj5d2a8ry", + "depends": ["DBI", "cli", "collections", "dplyr", "duckdb", "glue", "jsonlite", "lifecycle", "rlang", "tibble", "tidyselect", "vctrs"] }, "duke": { "name": "duke", @@ -56423,7 +57041,7 @@ "name": "dupNodes", "version": "0.3.0", "sha256": "1697pcr27lix8vf1krq6vdby8dk53h0s14gcng1y5rdngrxav9nk", - "depends": ["igraph", "Rdpack"] + "depends": ["Rdpack", "igraph"] }, "dupiR": { "name": "dupiR", @@ -56447,7 +57065,7 @@ "name": "dvmisc", "version": "1.1.4", "sha256": "01v6sixx0f3nrn6ymfifb3pvd2msfrwm21kmdv38laxq29vc4rsi", - "depends": ["cubature", "data_table", "dplyr", "ggplot2", "MASS", "mvtnorm", "pracma", "rbenchmark", "Rcpp", "survey", "tab"] + "depends": ["MASS", "Rcpp", "cubature", "data_table", "dplyr", "ggplot2", "mvtnorm", "pracma", "rbenchmark", "survey", "tab"] }, "dvqcc": { "name": "dvqcc", @@ -56477,7 +57095,7 @@ "name": "dwp", "version": "1.1", "sha256": "1a70lxw4ck3pbklyibn8x6qpgj16zvawi76qqc9rnc26q2n5zp6j", - "depends": ["boot", "expint", "GenEst", "gtools", "invgamma", "magrittr", "MASS", "matrixStats", "mvtnorm", "numDeriv", "plotrix", "pracma", "sf", "statmod", "VGAM"] + "depends": ["GenEst", "MASS", "VGAM", "boot", "expint", "gtools", "invgamma", "magrittr", "matrixStats", "mvtnorm", "numDeriv", "plotrix", "pracma", "sf", "statmod"] }, "dySEM": { "name": "dySEM", @@ -56489,7 +57107,7 @@ "name": "dyads", "version": "1.2.1", "sha256": "0nx4gx51p0qz1565yn7xg0ijrkqvn9ql9hrmp5lwl4lxvsjnwki1", - "depends": ["CholWishart", "MASS", "mvtnorm", "RcppZiggurat", "Rfast"] + "depends": ["CholWishart", "MASS", "RcppZiggurat", "Rfast", "mvtnorm"] }, "dydea": { "name": "dydea", @@ -56507,7 +57125,7 @@ "name": "dymo", "version": "1.1.0", "sha256": "0s1gpi5qiafkf91awyx52qw15qs7m18bql51jibgh1lqnqgv1757", - "depends": ["fANCOVA", "ggplot2", "greybox", "imputeTS", "lubridate", "MASS", "matlib", "modeest", "moments", "narray", "purrr", "readr", "scales", "tictoc"] + "depends": ["MASS", "fANCOVA", "ggplot2", "greybox", "imputeTS", "lubridate", "matlib", "modeest", "moments", "narray", "purrr", "readr", "scales", "tictoc"] }, "dyn": { "name": "dyn", @@ -56519,7 +57137,7 @@ "name": "dyn.log", "version": "0.4.0", "sha256": "0vlzv6zy29qhygm77kww65wpnp77a93ja13vr4p2yyychrjspqx3", - "depends": ["crayon", "glue", "R6", "rlang", "stringr", "yaml"] + "depends": ["R6", "crayon", "glue", "rlang", "stringr", "yaml"] }, "dynBiplotGUI": { "name": "dynBiplotGUI", @@ -56531,7 +57149,7 @@ "name": "dynConfiR", "version": "0.0.4", "sha256": "1ql8c712g7jx0j1aw7qrfsp81abiajigzvwwlq6v96ar5ag5jrgy", - "depends": ["dplyr", "magrittr", "minqa", "progress", "Rcpp", "rlang"] + "depends": ["Rcpp", "dplyr", "magrittr", "minqa", "progress", "rlang"] }, "dynCorr": { "name": "dynCorr", @@ -56543,13 +57161,13 @@ "name": "dynRB", "version": "0.18", "sha256": "0sz0a1g6z48f0s7ch86y9mvazwk4gdswjj179a13d0yjhy9rgpk0", - "depends": ["corrplot", "dplyr", "foreign", "ggplot2", "RColorBrewer", "reshape2", "vegan"] + "depends": ["RColorBrewer", "corrplot", "dplyr", "foreign", "ggplot2", "reshape2", "vegan"] }, "dynaSpec": { "name": "dynaSpec", "version": "1.0.1", "sha256": "0wzfy50602wlsh4sbfjadsr01f3az2lvk5c4px3qmcvv5gybd6w0", - "depends": ["ari", "av", "gganimate", "ggplot2", "magrittr", "NatureSounds", "pbapply", "png", "scales", "seewave", "tuneR", "viridis"] + "depends": ["NatureSounds", "ari", "av", "gganimate", "ggplot2", "magrittr", "pbapply", "png", "scales", "seewave", "tuneR", "viridis"] }, "dynaTree": { "name": "dynaTree", @@ -56567,7 +57185,7 @@ "name": "dynamac", "version": "0.1.12", "sha256": "0gggzhidn5z4g7pzqx1bg56prnh9krph65k3yj677qrff12abbx9", - "depends": ["lmtest", "MASS"] + "depends": ["MASS", "lmtest"] }, "dynamic": { "name": "dynamic", @@ -56577,8 +57195,8 @@ }, "dynamicSDM": { "name": "dynamicSDM", - "version": "1.3.3", - "sha256": "08kv5bp8yqlrxxlr4fz4zzzcgh3sc6y9dg934gh97p5vxmwjravq", + "version": "1.3.4", + "sha256": "0126yj2qafg93jipkbszlwjcy20yxnd4adn8r5b7cwf5ipkp92mc", "depends": ["dplyr", "googledrive", "lubridate", "magrittr", "readr", "reticulate", "rgee", "sf", "terra", "tidyr"] }, "dynamicTreeCut": { @@ -56603,7 +57221,7 @@ "name": "dynatopGIS", "version": "0.2.5", "sha256": "1sv519dc7fs6zrwnyggkzrcy866a6pgag0shk6rr6cd3xa1blwpv", - "depends": ["jsonlite", "R6", "terra"] + "depends": ["R6", "jsonlite", "terra"] }, "dyncomp": { "name": "dyncomp", @@ -56627,7 +57245,7 @@ "name": "dyngen", "version": "1.0.5", "sha256": "095jqn1rd83qm3ayca9hmv6bhlaa2c338020l46vniq8n38kbnra", - "depends": ["assertthat", "dplyr", "dynutils", "ggplot2", "ggraph", "ggrepel", "GillespieSSA2", "igraph", "lmds", "Matrix", "patchwork", "pbapply", "purrr", "rlang", "tibble", "tidygraph", "tidyr", "viridis"] + "depends": ["GillespieSSA2", "Matrix", "assertthat", "dplyr", "dynutils", "ggplot2", "ggraph", "ggrepel", "igraph", "lmds", "patchwork", "pbapply", "purrr", "rlang", "tibble", "tidygraph", "tidyr", "viridis"] }, "dynlm": { "name": "dynlm", @@ -56669,18 +57287,18 @@ "name": "dynr", "version": "0.1.16-105", "sha256": "0s9n62k9cghvqgcpgingcvni3fzq2d9lrnj48i92kb25165446wm", - "depends": ["car", "deSolve", "fda", "ggplot2", "latex2exp", "magrittr", "MASS", "Matrix", "mice", "numDeriv", "plyr", "Rdpack", "reshape2", "stringi", "tibble", "xtable"] + "depends": ["MASS", "Matrix", "Rdpack", "car", "deSolve", "fda", "ggplot2", "latex2exp", "magrittr", "mice", "numDeriv", "plyr", "reshape2", "stringi", "tibble", "xtable"] }, "dynsim": { "name": "dynsim", "version": "1.2.3", "sha256": "1fk23cp2hvkn7msxrdc9cnm4pmcmhcdf3q6rwm507bniigrswnx4", - "depends": ["ggplot2", "gridExtra", "MASS"] + "depends": ["MASS", "ggplot2", "gridExtra"] }, "dynsurv": { "name": "dynsurv", - "version": "0.4-6", - "sha256": "0nxksy8q1r82qak77sb99kpwhq011d4jh4iicc7c0iin04r5nym4", + "version": "0.4-7", + "sha256": "0rp51kr6rsfqdcl4gswqz56ppnxa81ak023x3gdxsdf4p9jjhdcy", "depends": ["BH", "data_table", "ggplot2", "nleqslv", "splines2", "survival"] }, "dyntaper": { @@ -56693,13 +57311,13 @@ "name": "dynutils", "version": "1.0.11", "sha256": "06an2bm1d131v28m240vii2wisbz3zs32wbamm2w7r8rl3yrxkh9", - "depends": ["assertthat", "crayon", "desc", "dplyr", "magrittr", "Matrix", "proxyC", "purrr", "Rcpp", "remotes", "stringr", "tibble"] + "depends": ["Matrix", "Rcpp", "assertthat", "crayon", "desc", "dplyr", "magrittr", "proxyC", "purrr", "remotes", "stringr", "tibble"] }, "dynwrap": { "name": "dynwrap", "version": "1.2.4", "sha256": "1jls01flvr91vyipilaqv2n3irniq678bm6f1jlxr2apr7w0rlyx", - "depends": ["assertthat", "babelwhale", "crayon", "dplyr", "dynparam", "dynutils", "glue", "igraph", "magrittr", "Matrix", "processx", "purrr", "readr", "reshape2", "stringr", "tibble", "tidyr", "yaml"] + "depends": ["Matrix", "assertthat", "babelwhale", "crayon", "dplyr", "dynparam", "dynutils", "glue", "igraph", "magrittr", "processx", "purrr", "readr", "reshape2", "stringr", "tibble", "tidyr", "yaml"] }, "e1071": { "name": "e1071", @@ -56711,13 +57329,13 @@ "name": "eAnalytics", "version": "0.3", "sha256": "0kh2mnn4piy30ya0z9hrk10x14pz4li5l0gs8c2by9vkq54cq53i", - "depends": ["dplyr", "DT", "energyr", "googleVis", "leaflet", "plotly", "shiny", "shinydashboard", "shinyWidgets"] + "depends": ["DT", "dplyr", "energyr", "googleVis", "leaflet", "plotly", "shiny", "shinyWidgets", "shinydashboard"] }, "eBsc": { "name": "eBsc", "version": "4.17", "sha256": "18k622687qvp6q8m2ycn9ppwvv2jh76dj92vfkl0b99jng2hv1zl", - "depends": ["Brobdingnag", "MASS", "Matrix", "mvtnorm", "nlme", "Rcpp", "RcppArmadillo"] + "depends": ["Brobdingnag", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "mvtnorm", "nlme"] }, "eCAR": { "name": "eCAR", @@ -56741,7 +57359,7 @@ "name": "eDITH", "version": "1.0.0", "sha256": "0bsy0mpacwjglyp7vfqz32lpyd43yj346yvxqrf32fhwqlpfwimc", - "depends": ["BayesianTools", "DHARMa", "fields", "LaplacesDemon", "OCNet", "Rcpp", "rivnet", "terra"] + "depends": ["BayesianTools", "DHARMa", "LaplacesDemon", "OCNet", "Rcpp", "fields", "rivnet", "terra"] }, "eDMA": { "name": "eDMA", @@ -56777,7 +57395,7 @@ "name": "eLNNpairedCov", "version": "0.3.2", "sha256": "1rr8zd8l71am7sx8glv73lvn0w1wyyzkgn0j7hybi7ibcwg4hz5l", - "depends": ["Biobase", "limma", "MASS"] + "depends": ["Biobase", "MASS", "limma"] }, "eList": { "name": "eList", @@ -56789,7 +57407,7 @@ "name": "eNchange", "version": "1.0", "sha256": "07vdi05fr6mynb86haas21izdcjiagw14p1h8n0qr1hb3klvs8n5", - "depends": ["ACDm", "doParallel", "foreach", "hawkes", "iterators", "Rcpp"] + "depends": ["ACDm", "Rcpp", "doParallel", "foreach", "hawkes", "iterators"] }, "ePCR": { "name": "ePCR", @@ -56807,13 +57425,13 @@ "name": "eRm", "version": "1.0-6", "sha256": "059xny2jl81is1qyxgpbf4qi5zqpvdc64322kjz1i011kq9apwmw", - "depends": ["colorspace", "lattice", "MASS", "Matrix", "psych"] + "depends": ["MASS", "Matrix", "colorspace", "lattice", "psych"] }, "eSDM": { "name": "eSDM", - "version": "0.4.1", - "sha256": "0xlqgsk6anpan996q9lxh8c3i6n6vg070g9z9j3z66mh6riyn9rq", - "depends": ["dplyr", "magrittr", "purrr", "rlang", "ROCR", "sf", "shiny", "units"] + "version": "0.4.2", + "sha256": "14h353kw32lb3ik8fqqsb7bb1sxf445js8mw07almq9hpl3srcbn", + "depends": ["ROCR", "dplyr", "magrittr", "purrr", "rlang", "sf", "shiny", "units"] }, "eSIR": { "name": "eSIR", @@ -56831,13 +57449,13 @@ "name": "eaf", "version": "2.5", "sha256": "0krvl6gk44yy9r30sck7mn0k37mi8j7nw90b56klww1zqh0ihs8p", - "depends": ["matrixStats", "modeltools", "Rdpack"] + "depends": ["Rdpack", "matrixStats", "modeltools"] }, "earlyR": { "name": "earlyR", "version": "0.0.5", "sha256": "0978vv48sj1hs61rdb3xv02s8qz03jcm1c8q1mbb3d033x1q7k22", - "depends": ["distcrete", "EpiEstim", "epitrix", "ggplot2"] + "depends": ["EpiEstim", "distcrete", "epitrix", "ggplot2"] }, "earlygating": { "name": "earlygating", @@ -56849,7 +57467,7 @@ "name": "earlywarnings", "version": "1.1.29", "sha256": "1xa9rijqqxa5l253dg8dn1jjhdakf8krl5rflq5v9gybfyrq1885", - "depends": ["fields", "ggplot2", "Kendall", "KernSmooth", "knitr", "lmtest", "moments", "nortest", "quadprog", "som", "spam", "tgp", "tseries"] + "depends": ["Kendall", "KernSmooth", "fields", "ggplot2", "knitr", "lmtest", "moments", "nortest", "quadprog", "som", "spam", "tgp", "tseries"] }, "earth": { "name": "earth", @@ -56865,8 +57483,8 @@ }, "earthtide": { "name": "earthtide", - "version": "0.1.2", - "sha256": "02l84019zpnpdb3j94dx6hq8c2is1819skmfrwa5vg9dvwzbqii4", + "version": "0.1.5", + "sha256": "1skcn33357vnqq4f485cf7w865jsr7bj0kwsl2b78y069qxp7dvr", "depends": ["R6", "Rcpp", "RcppEigen", "RcppThread"] }, "earthtones": { @@ -56879,7 +57497,7 @@ "name": "easy.utils", "version": "0.0.4", "sha256": "1rhdpqnhr1nv5jm3dcs8ikn35d911pi46sfsflk4f73m9fzyj9s1", - "depends": ["dplyr", "fastmatch", "Polychrome", "rlang", "scales"] + "depends": ["Polychrome", "dplyr", "fastmatch", "rlang", "scales"] }, "easyAHP": { "name": "easyAHP", @@ -56897,13 +57515,13 @@ "name": "easyDes", "version": "6.0", "sha256": "12p7ls0q9srrz5h0f0996mmw33shrfbya481s0d5d509vbw8ik6d", - "depends": ["multcomp", "PMCMRplus"] + "depends": ["PMCMRplus", "multcomp"] }, "easyDifferentialGeneCoexpression": { "name": "easyDifferentialGeneCoexpression", "version": "1.4", "sha256": "1isln1bbav2zxqbia8616f1ywnpywcx3772bxws5hphx64x6bqfh", - "depends": ["annotate", "Biobase", "diffcoexp", "geneExpressionFromGEO", "GEOquery", "jetset", "limma", "magrittr", "xml2"] + "depends": ["Biobase", "GEOquery", "annotate", "diffcoexp", "geneExpressionFromGEO", "jetset", "limma", "magrittr", "xml2"] }, "easyNCDF": { "name": "easyNCDF", @@ -56911,11 +57529,17 @@ "sha256": "0kh38iafgwf9rxd8ccwv2pvzxsnk5pwp02nqnksgy7l8s526i5cc", "depends": ["abind", "ncdf4"] }, + "easyORtables": { + "name": "easyORtables", + "version": "0.0.1", + "sha256": "1k9g4gfc8s6c93ba2clb4vyaafs7wbxw34d8nrkbnkzxy2frmkwn", + "depends": ["MASS", "kableExtra", "knitr"] + }, "easyPSID": { "name": "easyPSID", "version": "0.1.2", "sha256": "0npih5xpf2a5xw2iz68z9ckm8d4cpradzzdn50rdpg4gqvaq7azp", - "depends": ["foreign", "LaF", "stringr"] + "depends": ["LaF", "foreign", "stringr"] }, "easyPubMed": { "name": "easyPubMed", @@ -56933,19 +57557,19 @@ "name": "easySdcTable", "version": "1.0.7", "sha256": "0wvnyhjq94cqjx9dw2nc5v66a11qbi972g0shvzz7q4llkgm21if", - "depends": ["Matrix", "sdcTable", "shiny", "SSBtools"] + "depends": ["Matrix", "SSBtools", "sdcTable", "shiny"] }, "easyVerification": { "name": "easyVerification", "version": "0.4.5", "sha256": "1k62dfhnc0g07jf82gm1m3747z8zchmj4mi5qap4dgc7pxdp2ikc", - "depends": ["pbapply", "Rcpp", "SpecsVerification"] + "depends": ["Rcpp", "SpecsVerification", "pbapply"] }, "easyalluvial": { "name": "easyalluvial", "version": "0.3.2", "sha256": "1jn65b4rfzw3hn6n1bmdaqfv2fb7wq0b8rgbflj230k79kravsxm", - "depends": ["dplyr", "forcats", "ggalluvial", "ggplot2", "ggridges", "gridExtra", "magrittr", "progress", "progressr", "purrr", "randomForest", "RColorBrewer", "recipes", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["RColorBrewer", "dplyr", "forcats", "ggalluvial", "ggplot2", "ggridges", "gridExtra", "magrittr", "progress", "progressr", "purrr", "randomForest", "recipes", "rlang", "stringr", "tibble", "tidyr"] }, "easyanova": { "name": "easyanova", @@ -56957,7 +57581,7 @@ "name": "easybgm", "version": "0.1.2", "sha256": "10z8p9bslpnz3cp7lq7qadrpj6jm8k7rwakvak73qppvmpza7rfr", - "depends": ["BDgraph", "BGGM", "bgms", "dplyr", "ggplot2", "HDInterval", "igraph", "qgraph"] + "depends": ["BDgraph", "BGGM", "HDInterval", "bgms", "dplyr", "ggplot2", "igraph", "qgraph"] }, "easycensus": { "name": "easycensus", @@ -56969,7 +57593,7 @@ "name": "easyclimate", "version": "0.2.1", "sha256": "19gfajf4bhlz0mpq70xjy87xc3qi9kqs3869zm2jy4x0i3cingk6", - "depends": ["R_utils", "RCurl", "terra"] + "depends": ["RCurl", "R_utils", "terra"] }, "easycsv": { "name": "easycsv", @@ -56981,13 +57605,13 @@ "name": "easydb", "version": "1.1.0", "sha256": "1xmhg5320ilc1138x23sb8s2wr7d753h0dv9i1az3zicx0858zbd", - "depends": ["askpass", "assertthat", "cli", "DBI", "keyring", "rlang", "yaml"] + "depends": ["DBI", "askpass", "assertthat", "cli", "keyring", "rlang", "yaml"] }, "easylabel": { "name": "easylabel", "version": "0.2.8", "sha256": "0rl17iccmczd380yzcdkw6943x8pxyb4sqg6q6jj5jqqzalvqshb", - "depends": ["DT", "ggplot2", "gtools", "plotly", "RColorBrewer", "rlang", "shiny", "shinybusy", "shinycssloaders"] + "depends": ["DT", "RColorBrewer", "ggplot2", "gtools", "plotly", "rlang", "shiny", "shinybusy", "shinycssloaders"] }, "easynls": { "name": "easynls", @@ -57011,7 +57635,7 @@ "name": "easyr", "version": "0.5-11", "sha256": "1wzc21n2f7i7idd2hs5s0sh46gpgl6sf4wmrmhi0wc6jcc4sb5rk", - "depends": ["data_table", "digest", "dplyr", "foreign", "glue", "Hmisc", "lubridate", "readxl", "rlang", "rprojroot", "stringr", "XML"] + "depends": ["Hmisc", "XML", "data_table", "digest", "dplyr", "foreign", "glue", "lubridate", "readxl", "rlang", "rprojroot", "stringr"] }, "easyreg": { "name": "easyreg", @@ -57021,21 +57645,27 @@ }, "easystats": { "name": "easystats", - "version": "0.7.2", - "sha256": "0rfqzi5s0xxz30nii2ahr4hrymmkcx4spla7sdklkidvvrsrmsvc", + "version": "0.7.3", + "sha256": "1mxkqm977wgnqd54paifyy5drl7zyb39lm2icps6vls4702zjzis", "depends": ["bayestestR", "correlation", "datawizard", "effectsize", "insight", "modelbased", "parameters", "performance", "report", "see"] }, + "easysurv": { + "name": "easysurv", + "version": "2.0.1", + "sha256": "065h9wkd930k81jwdj48955nkv2z2q1xky15rg5nh0ig1r10d37p", + "depends": ["bshazard", "censored", "cli", "data_table", "dplyr", "flexsurv", "flexsurvcure", "ggplot2", "ggsurvfit", "openxlsx", "parsnip", "plotly", "purrr", "rlang", "scales", "survival", "tibble", "tidyr", "usethis"] + }, "eat": { "name": "eat", "version": "0.1.4", "sha256": "1s286b6wx0d59n2v3hf6s1zy1f15mwf6ssrpwciard3giccnf556", - "depends": ["conflicted", "dplyr", "ggparty", "ggplot2", "ggrepel", "lpSolveAPI", "partykit", "Rdpack", "reshape2"] + "depends": ["Rdpack", "conflicted", "dplyr", "ggparty", "ggplot2", "ggrepel", "lpSolveAPI", "partykit", "reshape2"] }, "eatATA": { "name": "eatATA", "version": "1.1.2", "sha256": "0ak9722mgy9fgpk43wppgisfxj6v4fzc8qwk4cmd760sq5gw3j88", - "depends": ["lpSolve", "mathjaxr", "Matrix", "Rglpk"] + "depends": ["Matrix", "Rglpk", "lpSolve", "mathjaxr"] }, "eatDB": { "name": "eatDB", @@ -57053,7 +57683,7 @@ "name": "eatRep", "version": "0.14.7", "sha256": "11yz0g83ngzab8gqi2mq4s28j7yvl06jf4clwb8vfjqa7lwpfcgq", - "depends": ["BIFIEsurvey", "boot", "car", "combinat", "eatGADS", "eatTools", "EffectLiteR", "estimatr", "fmsb", "Hmisc", "janitor", "lavaan", "lme4", "mice", "miceadds", "msm", "plyr", "progress", "reshape2", "survey", "tidyr"] + "depends": ["BIFIEsurvey", "EffectLiteR", "Hmisc", "boot", "car", "combinat", "eatGADS", "eatTools", "estimatr", "fmsb", "janitor", "lavaan", "lme4", "mice", "miceadds", "msm", "plyr", "progress", "reshape2", "survey", "tidyr"] }, "eatTools": { "name": "eatTools", @@ -57101,7 +57731,7 @@ "name": "ebirdst", "version": "3.2022.3", "sha256": "0d2qblxdm3sk6rsl155ik303pcphw2dp6li4chizc8anpxwf175r", - "depends": ["arrow", "dplyr", "jsonlite", "magrittr", "RColorBrewer", "rlang", "sf", "stringr", "terra", "viridisLite"] + "depends": ["RColorBrewer", "arrow", "dplyr", "jsonlite", "magrittr", "rlang", "sf", "stringr", "terra", "viridisLite"] }, "ebmc": { "name": "ebmc", @@ -57113,7 +57743,7 @@ "name": "ebmstate", "version": "0.1.4", "sha256": "1jbkzf7zn844jg10cy9kv3v569n82718iqaz7id4jfbcq31p7l8v", - "depends": ["HDInterval", "mstate", "Rcpp", "survival"] + "depends": ["HDInterval", "Rcpp", "mstate", "survival"] }, "ebnm": { "name": "ebnm", @@ -57125,13 +57755,13 @@ "name": "ebreg", "version": "0.1.3", "sha256": "1xrs9afjd5hkdmhglj3md5i5hm7awlcdlccz3y2lw4c73lx31ywz", - "depends": ["lars", "Rdpack"] + "depends": ["Rdpack", "lars"] }, "ebvcube": { "name": "ebvcube", - "version": "0.2.1", - "sha256": "1dx75sf60ifg1cld7n65imzs0lm2w4f5613qzrr76pf5zfpxq61p", - "depends": ["checkmate", "curl", "DelayedArray", "ggplot2", "HDF5Array", "httr", "jsonlite", "memuse", "ncdf4", "ncmeta", "reshape2", "rhdf5", "stringr", "terra", "tidyterra", "withr"] + "version": "0.2.3", + "sha256": "0637q8795n7k2mnwdvnamnkdrz4akh458ijry7x3068kfzgr778y", + "depends": ["DelayedArray", "HDF5Array", "checkmate", "curl", "ggplot2", "httr", "jsonlite", "memuse", "ncdf4", "ncmeta", "reshape2", "rhdf5", "stringr", "terra", "tidyterra", "withr"] }, "ec50estimator": { "name": "ec50estimator", @@ -57143,7 +57773,7 @@ "name": "ecan", "version": "0.2.1", "sha256": "12bkgmbm6mbqcjhmanlg7zk0nlgqf8m1b4m7f2wcxsl8nbks8ymd", - "depends": ["cluster", "dendextend", "dplyr", "ggplot2", "jsonlite", "labdsv", "magrittr", "MASS", "purrr", "rlang", "stringr", "tibble", "tidyr", "vegan"] + "depends": ["MASS", "cluster", "dendextend", "dplyr", "ggplot2", "jsonlite", "labdsv", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "vegan"] }, "ecb": { "name": "ecb", @@ -57153,8 +57783,8 @@ }, "ecce": { "name": "ecce", - "version": "3.0.1", - "sha256": "09zyrjld16byc8fs76b46hh6p2saybq00y28gfmflhzb5fhc34a2", + "version": "3.0.2", + "sha256": "1rxvcix414w9hmv9snmndq1ivg27njvvqh9zk7xjxlnf0d8ffc81", "depends": ["curl", "digest", "httr", "jsonlite", "uuid"] }, "ecdfHT": { @@ -57215,7 +57845,7 @@ "name": "echoice2", "version": "0.2.4", "sha256": "0dsyr2fk94nvcd1749amk8mvvli5aalapb2mlhr25mj6d2iyrc30", - "depends": ["dplyr", "forcats", "ggplot2", "magrittr", "purrr", "Rcpp", "RcppArmadillo", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "forcats", "ggplot2", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] }, "echor": { "name": "echor", @@ -57239,7 +57869,7 @@ "name": "eclust", "version": "0.1.0", "sha256": "01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428", - "depends": ["caret", "data_table", "dynamicTreeCut", "magrittr", "pacman", "pander", "stringr", "WGCNA"] + "depends": ["WGCNA", "caret", "data_table", "dynamicTreeCut", "magrittr", "pacman", "pander", "stringr"] }, "ecm": { "name": "ecm", @@ -57251,13 +57881,13 @@ "name": "ecmwfr", "version": "1.5.0", "sha256": "0bicldir8cmfd25wzmqhcawv94q2xmqwbzsqbk08w9y8x6yhxhic", - "depends": ["curl", "getPass", "httr", "keyring", "memoise", "R6", "uuid"] + "depends": ["R6", "curl", "getPass", "httr", "keyring", "memoise", "uuid"] }, "ecoCopula": { "name": "ecoCopula", "version": "1.0.2", "sha256": "1j3n9h7rm66r8vmzzhy5mjh36gs1qnsh7rq33ymjpkkfy698gbpm", - "depends": ["betareg", "doParallel", "foreach", "glasso", "glm2", "igraph", "MASS", "mgcv", "mvabund", "ordinal", "plyr", "sna", "tweedie"] + "depends": ["MASS", "betareg", "doParallel", "foreach", "glasso", "glm2", "igraph", "mgcv", "mvabund", "ordinal", "plyr", "sna", "tweedie"] }, "ecocbo": { "name": "ecocbo", @@ -57273,9 +57903,15 @@ }, "ecocomDP": { "name": "ecocomDP", - "version": "1.3.1", - "sha256": "0gvqrcan27hsykwshvs76v5gh79bmlbmsmfhxk0yrpnwh2qrbl03", - "depends": ["data_table", "dplyr", "EML", "emld", "geosphere", "ggplot2", "httr", "lubridate", "magrittr", "neonOS", "neonUtilities", "RColorBrewer", "rlang", "rmarkdown", "stringr", "tidyr", "uuid", "xml2"] + "version": "1.3.2", + "sha256": "0l7f4fisk5hsvfpsvnpr3s6pb7x9daq6wklws3damdgljml95c3n", + "depends": ["EML", "RColorBrewer", "data_table", "dplyr", "emld", "geosphere", "ggplot2", "httr", "lubridate", "magrittr", "neonOS", "neonUtilities", "rlang", "rmarkdown", "stringr", "tidyr", "uuid", "xml2"] + }, + "ecode": { + "name": "ecode", + "version": "0.1.0", + "sha256": "138gs67z35nxa9a1y0v327qs0c695dy5la68ld17m9xrsg2rjz85", + "depends": ["cowplot", "ggplot2", "rlang", "stringr"] }, "ecodist": { "name": "ecodist", @@ -57309,21 +57945,21 @@ }, "econet": { "name": "econet", - "version": "1.0.0", - "sha256": "1igcyhn0gzv82rm5ki59ivmr3q9ryrimyfwybnppcpvg38wdpvwj", - "depends": ["bbmle", "doParallel", "dplyr", "foreach", "formula_tools", "igraph", "intergraph", "MASS", "Matrix", "minpack_lm", "plyr", "progressr", "sna", "spatstat_utils"] + "version": "1.0.0.1", + "sha256": "13kvx8ikfljxa21r1rjz3xj7liwllfp73nn57cmlhaqgxgw5wpzx", + "depends": ["MASS", "Matrix", "bbmle", "doParallel", "dplyr", "foreach", "formula_tools", "igraph", "intergraph", "minpack_lm", "plyr", "progressr", "sna", "spatstat_utils"] }, "econetwork": { "name": "econetwork", "version": "0.7.0", "sha256": "1pn7bx3rch09ddllq9sfzm5ynz6a1mgbsy3rq0qyg19xan9xgmi6", - "depends": ["bipartite", "blockmodels", "igraph", "Rcpp", "RcppEigen", "RcppGSL", "rdiversity"] + "depends": ["Rcpp", "RcppEigen", "RcppGSL", "bipartite", "blockmodels", "igraph", "rdiversity"] }, "economiccomplexity": { "name": "economiccomplexity", "version": "1.5.0", "sha256": "1xx4fpf2rjizwhicb6sfrgl5xjfin9b9zi0q4kq47gjp8kzahkg3", - "depends": ["igraph", "Matrix", "Rdpack"] + "depends": ["Matrix", "Rdpack", "igraph"] }, "econullnetr": { "name": "econullnetr", @@ -57339,8 +57975,8 @@ }, "ecoreg": { "name": "ecoreg", - "version": "0.2.4", - "sha256": "09iyzl4d68angcrqifpl62y4y4flhib34g8wgq2xxaggmbhvyzwa", + "version": "0.2.5", + "sha256": "09nfi0l06swa1xgziyqznydrv3irv1irpqpxab0f6pbw4fqj7nh8", "depends": [] }, "ecoregime": { @@ -57359,7 +57995,7 @@ "name": "ecos", "version": "0.1.6", "sha256": "1syqh2ivznz5swify1gc34m1iqgnp10rhk7b8giil7fwdzifalfj", - "depends": ["httr", "jsonlite", "stringr", "XML"] + "depends": ["XML", "httr", "jsonlite", "stringr"] }, "ecosim": { "name": "ecosim", @@ -57375,15 +58011,15 @@ }, "ecospat": { "name": "ecospat", - "version": "4.1.0", - "sha256": "1sxvbzdrdr5dda1ds7i669rkaxngp93dpdzqkip07dv28yvjhp02", - "depends": ["ade4", "adehabitatHR", "adehabitatMA", "biomod2", "classInt", "dismo", "ecodist", "foreach", "gbm", "gtools", "Hmisc", "ks", "matrixStats", "nabor", "poibin", "PresenceAbsence", "terra", "vegan"] + "version": "4.1.1", + "sha256": "097cr6qwf2hqm8v3afabnm7lmmv2awih2kz26vd28jr179af8p65", + "depends": ["Hmisc", "PresenceAbsence", "ade4", "adehabitatHR", "adehabitatMA", "biomod2", "classInt", "dismo", "ecodist", "foreach", "gbm", "gtools", "ks", "matrixStats", "nabor", "poibin", "terra", "vegan"] }, "ecostats": { "name": "ecostats", - "version": "1.1.11", - "sha256": "11h5s196aap64jch1123srbwy3907cvc4vgh0lvn5wkxbszrzypc", - "depends": ["ecoCopula", "GET", "MASS", "mgcv", "mvabund", "mvtnorm"] + "version": "1.2.1", + "sha256": "0zf3kw0kbwg759ixzwxilagx7h1xhdjsfvp8gb86b9m6pnwsiqr7", + "depends": ["GET", "MASS", "ecoCopula", "mgcv", "mvabund", "mvtnorm"] }, "ecostatscale": { "name": "ecostatscale", @@ -57425,13 +58061,13 @@ "name": "ecpc", "version": "3.1.1", "sha256": "0vi9k3p1xicx53rmccmx1ykdidqb22hkwgr7l5hc0bjzsv7h2w38", - "depends": ["checkmate", "CVXR", "gglasso", "glmnet", "JOPS", "Matrix", "mgcv", "multiridge", "mvtnorm", "pracma", "pROC", "quadprog", "survival"] + "depends": ["CVXR", "JOPS", "Matrix", "checkmate", "gglasso", "glmnet", "mgcv", "multiridge", "mvtnorm", "pROC", "pracma", "quadprog", "survival"] }, "ecr": { "name": "ecr", "version": "2.1.1", "sha256": "0abj88libbjimb512mvz7fa4ib7q84hn72digs5p3cd3pbx6zv0v", - "depends": ["BBmisc", "checkmate", "dplyr", "ggplot2", "kableExtra", "knitr", "lazyeval", "parallelMap", "ParamHelpers", "plot3D", "plot3Drgl", "plotly", "Rcpp", "reshape2", "scatterplot3d", "smoof", "viridis"] + "depends": ["BBmisc", "ParamHelpers", "Rcpp", "checkmate", "dplyr", "ggplot2", "kableExtra", "knitr", "lazyeval", "parallelMap", "plot3D", "plot3Drgl", "plotly", "reshape2", "scatterplot3d", "smoof", "viridis"] }, "ectotemp": { "name": "ectotemp", @@ -57471,9 +58107,9 @@ }, "eddington": { "name": "eddington", - "version": "4.1.3", - "sha256": "1i04ldq8p7a8wx3l4ln47q07djhcg60560d1j9xg0ridsdi5qjaf", - "depends": ["R6", "Rcpp", "XML"] + "version": "4.2.0", + "sha256": "0nr9mv6vjd0m0n23p9ydamf23rfb9xhy6h8q27qic327avsa3a7g", + "depends": ["R6", "Rcpp", "xml2"] }, "edeaR": { "name": "edeaR", @@ -57509,7 +58145,7 @@ "name": "edgar", "version": "2.0.7", "sha256": "1lzcs78cncz4ira1nnzyip1ap1iva75kfx8ynqqv79pmj8g4nms3", - "depends": ["httr", "qdapRegex", "R_utils", "stringi", "stringr", "tm", "XML"] + "depends": ["R_utils", "XML", "httr", "qdapRegex", "stringi", "stringr", "tm"] }, "edgarWebR": { "name": "edgarWebR", @@ -57527,7 +58163,7 @@ "name": "edgebundle", "version": "0.4.2", "sha256": "138cdhk3p95vh5siwwp05kir6kkrvqjlgbz97dgi149i6jmq656k", - "depends": ["igraph", "interp", "Rcpp", "reticulate"] + "depends": ["Rcpp", "igraph", "interp", "reticulate"] }, "edgebundleR": { "name": "edgebundleR", @@ -57545,7 +58181,7 @@ "name": "edibble", "version": "1.1.1", "sha256": "1c2ifx4yilrq8ivdhl30cq8wix539wfg9l71m4bdz4isq2gg3hw4", - "depends": ["AlgDesign", "cli", "dae", "dplyr", "lifecycle", "magrittr", "nestr", "pillar", "R6", "rlang", "tibble", "tidyselect", "vctrs"] + "depends": ["AlgDesign", "R6", "cli", "dae", "dplyr", "lifecycle", "magrittr", "nestr", "pillar", "rlang", "tibble", "tidyselect", "vctrs"] }, "ediblecity": { "name": "ediblecity", @@ -57557,19 +58193,19 @@ "name": "edina", "version": "0.1.1", "sha256": "1lpmidyxi54byrsnwwadkh5rr454635xrwa4v2wz8mqr2hngxis3", - "depends": ["ggplot2", "jjb", "Rcpp", "RcppArmadillo", "reshape2", "rgen"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "jjb", "reshape2", "rgen"] }, "editData": { "name": "editData", "version": "0.1.8", "sha256": "170i8p264zj716h58bb6pvgh2lnz1w5vplnrcv8vizppi0n1js6l", - "depends": ["dplyr", "DT", "magrittr", "miniUI", "openxlsx", "rio", "rstudioapi", "shiny", "shinyWidgets", "tibble"] + "depends": ["DT", "dplyr", "magrittr", "miniUI", "openxlsx", "rio", "rstudioapi", "shiny", "shinyWidgets", "tibble"] }, "editbl": { "name": "editbl", "version": "1.0.5", "sha256": "07nf808xlj3vh7nfv5rpx3d6jk7pdsygc31z25gi504mmda1y1hd", - "depends": ["dplyr", "DT", "fontawesome", "shiny", "shinyjs", "tibble", "uuid"] + "depends": ["DT", "dplyr", "fontawesome", "shiny", "shinyjs", "tibble", "uuid"] }, "editrules": { "name": "editrules", @@ -57593,7 +58229,7 @@ "name": "edmcr", "version": "0.2.0", "sha256": "06ms8zyygkgq3divall8paiiw5blqxfgml8iy339zfyiwfxabw5a", - "depends": ["igraph", "lbfgs", "MASS", "Matrix", "nloptr", "sdpt3r", "truncnorm", "vegan"] + "depends": ["MASS", "Matrix", "igraph", "lbfgs", "nloptr", "sdpt3r", "truncnorm", "vegan"] }, "edmdata": { "name": "edmdata", @@ -57647,19 +58283,19 @@ "name": "eemR", "version": "1.0.1", "sha256": "1w3nwlrbxm7z4c3acx991zk5drgs67qys7kgl0qakh5vrdsrxw3v", - "depends": ["assertthat", "dplyr", "pracma", "purrr", "R_matlab", "rlist", "stringr", "viridis"] + "depends": ["R_matlab", "assertthat", "dplyr", "pracma", "purrr", "rlist", "stringr", "viridis"] }, "eemdARIMA": { "name": "eemdARIMA", "version": "0.1.0", "sha256": "0ma9h9vi19qy9a70vpdpik64r3q9hxqqcfiswczxwajncw5nvmv0", - "depends": ["forecast", "Rlibeemd"] + "depends": ["Rlibeemd", "forecast"] }, "eemdTDNN": { "name": "eemdTDNN", "version": "0.1.0", "sha256": "1i2xyc26644pgr45s78g44mzln3km9r5cw22niz3cd6q8ik2iva0", - "depends": ["forecast", "Rlibeemd"] + "depends": ["Rlibeemd", "forecast"] }, "eeptools": { "name": "eeptools", @@ -57677,7 +58313,7 @@ "name": "ef", "version": "1.2.0", "sha256": "1ic26mwjv221yyjj16v9xcdxsg3pl6wsp82iaprihdcndswccvzi", - "depends": ["dplyr", "Matrix", "mgcv", "RcppEigen", "TMB"] + "depends": ["Matrix", "RcppEigen", "TMB", "dplyr", "mgcv"] }, "efdm": { "name": "efdm", @@ -57689,7 +58325,7 @@ "name": "eff2", "version": "1.0.2", "sha256": "19mq2klxyy9xjyz5zmfqjhh2cdbhf5s6ylm36x3cjx6f28f2y1fd", - "depends": ["igraph", "pcalg", "RBGL"] + "depends": ["RBGL", "igraph", "pcalg"] }, "effClust": { "name": "effClust", @@ -57711,8 +58347,8 @@ }, "effectsize": { "name": "effectsize", - "version": "0.8.8", - "sha256": "1dx83xv98iny4pzphrr64fv277k70cgmia1s18bh7fix2h3md45k", + "version": "0.8.9", + "sha256": "12qzz3zl5yn28ybmmryhmi29zwzwrfgqhb6wm7aqg78id463bjz9", "depends": ["bayestestR", "datawizard", "insight", "parameters", "performance"] }, "effectsizescr": { @@ -57743,7 +58379,7 @@ "name": "egcm", "version": "1.0.13", "sha256": "16mzhf7x19v9z600n29q4481dmsjfcn55365zbb9d0wrclc3053l", - "depends": ["ggplot2", "MASS", "pracma", "quantmod", "tseries", "urca", "xts", "zoo"] + "depends": ["MASS", "ggplot2", "pracma", "quantmod", "tseries", "urca", "xts", "zoo"] }, "egg": { "name": "egg", @@ -57755,7 +58391,7 @@ "name": "eggCounts", "version": "2.4", "sha256": "089psh98w8kcy52h8vv3z8n0sigp46far0a0w4wfsyv2ijzc2l2p", - "depends": ["BH", "boot", "coda", "lattice", "numbers", "Rcpp", "RcppEigen", "RcppParallel", "rootSolve", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "boot", "coda", "lattice", "numbers", "rootSolve", "rstan", "rstantools"] }, "eglhmm": { "name": "eglhmm", @@ -57797,7 +58433,7 @@ "name": "ei", "version": "1.3-3", "sha256": "0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11", - "depends": ["cubature", "eiPack", "ellipse", "foreach", "MASS", "mnormt", "msm", "mvtnorm", "plotrix", "sp", "tmvtnorm", "ucminf"] + "depends": ["MASS", "cubature", "eiPack", "ellipse", "foreach", "mnormt", "msm", "mvtnorm", "plotrix", "sp", "tmvtnorm", "ucminf"] }, "ei_Datasets": { "name": "ei.Datasets", @@ -57821,7 +58457,7 @@ "name": "eiPack", "version": "0.2-2", "sha256": "1jb7nxk71cyvrmapzwz4fgjv7ca5m17i22acyhx27krl168ss0r2", - "depends": ["coda", "MASS", "msm"] + "depends": ["MASS", "coda", "msm"] }, "eia": { "name": "eia", @@ -57833,7 +58469,7 @@ "name": "eicm", "version": "1.0.3", "sha256": "0439ngwr8m7inljn8303g2a9v3izw81jz1jqxgbp6xdnvlwwpsyx", - "depends": ["doSNOW", "foreach", "GA", "iterators", "optimParallel", "pso", "snow", "ucminf"] + "depends": ["GA", "doSNOW", "foreach", "iterators", "optimParallel", "pso", "snow", "ucminf"] }, "eider": { "name": "eider", @@ -57855,8 +58491,8 @@ }, "eimpute": { "name": "eimpute", - "version": "0.2.3", - "sha256": "02zsz7hrcfypvpkvjyzfmwxpbr03chj2qcqmxkn3dr3zffwp93fq", + "version": "0.2.4", + "sha256": "1yx2ck74g3229n159z7p453dfdsy6hrjfkgsi4wcnxg3hi214wff", "depends": ["Rcpp", "RcppEigen"] }, "einet": { @@ -57869,7 +58505,7 @@ "name": "einsum", "version": "0.1.2", "sha256": "06q9kmzgxkpvm3krn1w1nfy8h2xrbmxc9cd5b4mm7yx829r2jf09", - "depends": ["glue", "mathjaxr", "Rcpp"] + "depends": ["Rcpp", "glue", "mathjaxr"] }, "eiopaR": { "name": "eiopaR", @@ -57917,7 +58553,7 @@ "name": "elasso", "version": "1.1", "sha256": "0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2", - "depends": ["glmnet", "SiZer"] + "depends": ["SiZer", "glmnet"] }, "elastes": { "name": "elastes", @@ -57929,7 +58565,7 @@ "name": "elastic", "version": "1.2.0", "sha256": "0k98ziacyxl1pyhyynmswcncqwl0a05sawypncdpdd9xr77nvgi6", - "depends": ["crul", "curl", "jsonlite", "R6"] + "depends": ["R6", "crul", "curl", "jsonlite"] }, "elasticnet": { "name": "elasticnet", @@ -57959,7 +58595,7 @@ "name": "elections.dtree", "version": "2.0.0", "sha256": "199ms891xgr8jgb5w0lrp8z1aj8faqrfsx60bcgv152v7y12mjx0", - "depends": ["prefio", "R6", "Rcpp", "RcppThread", "Rdpack", "testthat"] + "depends": ["R6", "Rcpp", "RcppThread", "Rdpack", "prefio", "testthat"] }, "electionsBR": { "name": "electionsBR", @@ -58007,7 +58643,7 @@ "name": "elhmc", "version": "1.1.0", "sha256": "0ngva7rnfj75fq93ycsv929m9ykijp48r7cvd6sfmi0sqsjinax5", - "depends": ["emplik", "MASS", "plyr"] + "depends": ["MASS", "emplik", "plyr"] }, "elisr": { "name": "elisr", @@ -58049,7 +58685,7 @@ "name": "ellipticalsymmetry", "version": "0.1.2", "sha256": "035q6zjf0lnx704q5g51bhv1xp7y0yn31ph57zydk92gfpgn468l", - "depends": ["doParallel", "doRNG", "foreach", "ICSNP"] + "depends": ["ICSNP", "doParallel", "doRNG", "foreach"] }, "elmNNRcpp": { "name": "elmNNRcpp", @@ -58061,7 +58697,7 @@ "name": "elo", "version": "3.0.2", "sha256": "1phyg8by1pz3kvrb0x3w1a9f46ccadgzzznr6r8azfbqv46xyknf", - "depends": ["pROC", "Rcpp"] + "depends": ["Rcpp", "pROC"] }, "elrm": { "name": "elrm", @@ -58085,13 +58721,19 @@ "name": "em", "version": "1.0.0", "sha256": "16xmksz1zdr61gxycsbia28kj16nrrcdvjcdd3nk6n6zjiy3ca3v", - "depends": ["dplyr", "magrittr", "mclust", "nnet", "numDeriv", "plm", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "magrittr", "mclust", "nnet", "numDeriv", "plm", "survival"] }, "emBayes": { "name": "emBayes", "version": "0.1.5", "sha256": "1ycr91r0zh75whpf4l9hxrm07rks589bmy994nby88r5yrv34wwg", - "depends": ["glmnet", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "glmnet"] + }, + "emIRT": { + "name": "emIRT", + "version": "0.0.14", + "sha256": "1vdmrad9f0ywrlb3xqwysm8vps5dz9xc3xq6jl82gr6xl3rr54zi", + "depends": ["Rcpp", "RcppArmadillo", "pscl"] }, "emailjsr": { "name": "emailjsr", @@ -58107,8 +58749,8 @@ }, "emayili": { "name": "emayili", - "version": "0.8.0", - "sha256": "0cpg77w8z1j05mqkkji7hqpan8p1kq6l1r07iwpsany0y5di0mlf", + "version": "0.9.1", + "sha256": "04dlya7fki6gq98rws5b3577lrs0cd213ml3w8qcsyzn7bbpz7np", "depends": ["base64enc", "commonmark", "curl", "digest", "dplyr", "glue", "htmltools", "httr", "logger", "magrittr", "mime", "purrr", "rmarkdown", "rvest", "stringi", "stringr", "tidyr", "urltools", "xfun", "xml2"] }, "embed": { @@ -58121,19 +58763,19 @@ "name": "embryogrowth", "version": "9.1", "sha256": "0c7ggpa2i9j17zzknx9h5w6sibk5pdy81484gl6sb5s88wmn16qm", - "depends": ["deSolve", "HelpersMG", "numDeriv", "optimx"] + "depends": ["HelpersMG", "deSolve", "numDeriv", "optimx"] }, "emdbook": { "name": "emdbook", "version": "1.3.13", "sha256": "069w10i1590bcyzv4kfsg7wsr1yl9nlsyj6yvys088xll5z4n116", - "depends": ["bbmle", "coda", "lattice", "MASS", "plyr"] + "depends": ["MASS", "bbmle", "coda", "lattice", "plyr"] }, "emdi": { "name": "emdi", "version": "2.2.2", "sha256": "1zdb2bg8gdpjlg104f5cpnrrdnpdqdcp95gxlbnadq6rds94ipcx", - "depends": ["boot", "formula_tools", "ggplot2", "gridExtra", "HLMdiag", "MASS", "moments", "nlme", "openxlsx", "parallelMap", "readODS", "reshape2", "rlang", "saeRobust", "spdep", "stringr"] + "depends": ["HLMdiag", "MASS", "boot", "formula_tools", "ggplot2", "gridExtra", "moments", "nlme", "openxlsx", "parallelMap", "readODS", "reshape2", "rlang", "saeRobust", "spdep", "stringr"] }, "emdist": { "name": "emdist", @@ -58145,7 +58787,7 @@ "name": "emery", "version": "0.5.1", "sha256": "1x0x1f2i0yxkq8xl6vm2w2nb8blpa6dkns07d1n9qj43rnwljv5s", - "depends": ["dplyr", "ggplot2", "mvtnorm", "purrr", "Rdpack", "stringr", "tibble", "tidyr"] + "depends": ["Rdpack", "dplyr", "ggplot2", "mvtnorm", "purrr", "stringr", "tibble", "tidyr"] }, "emg": { "name": "emg", @@ -58167,8 +58809,8 @@ }, "emmeans": { "name": "emmeans", - "version": "1.10.2", - "sha256": "08l57dp6ivqqc86m31vabr0n707vr70n4iqidavn05lxgb169gk0", + "version": "1.10.3", + "sha256": "01c2d0kb36lrff5l49kyfl2j3byzblmhw2jkz215hhl8jmyk0akv", "depends": ["estimability", "mvtnorm", "numDeriv"] }, "emoa": { @@ -58247,7 +58889,7 @@ "name": "emuR", "version": "2.5.0", "sha256": "0mlcqi9lwqrjilc2nynrl7aqkbqixbdcwzw3rn7mgc8m7cb7s8pq", - "depends": ["base64enc", "cli", "DBI", "dplyr", "httpuv", "httr", "jsonlite", "mime", "purrr", "readr", "rlang", "RSQLite", "rstudioapi", "shiny", "stringr", "tibble", "tidyr", "uuid", "V8", "wrassp"] + "depends": ["DBI", "RSQLite", "V8", "base64enc", "cli", "dplyr", "httpuv", "httr", "jsonlite", "mime", "purrr", "readr", "rlang", "rstudioapi", "shiny", "stringr", "tibble", "tidyr", "uuid", "wrassp"] }, "emulator": { "name": "emulator", @@ -58283,7 +58925,7 @@ "name": "endogeneity", "version": "2.1.3", "sha256": "19hhs46sz7m7qsnwrz81740iq6g8n0z3rnw2shv6sakc5z0z7jga", - "depends": ["data_table", "MASS", "maxLik", "pbivnorm", "Rcpp", "RcppArmadillo", "statmod"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "data_table", "maxLik", "pbivnorm", "statmod"] }, "endogenous": { "name": "endogenous", @@ -58307,13 +58949,13 @@ "name": "energy", "version": "1.7-11", "sha256": "04b55ckmaqbnlpifg4w7smvly03kqycklvbg9x8d4yf902q8z7y2", - "depends": ["boot", "gsl", "Rcpp"] + "depends": ["Rcpp", "boot", "gsl"] }, "energyr": { "name": "energyr", - "version": "0.1.2", - "sha256": "0gjw2cvpvhyywxlx3vfkhlh7zjwig46z1zwdc01zxwflvdx3z40n", - "depends": ["RgoogleMaps"] + "version": "0.1.3", + "sha256": "0g4zsnpbsgyvkcvsrpwwi17zbkj51zavsps53lsny4wrlwr3fg4v", + "depends": [] }, "enerscape": { "name": "enerscape", @@ -58325,7 +58967,7 @@ "name": "enetLTS", "version": "1.1.0", "sha256": "1lah9ai9skshz0rq3r1smvy69j443m22h1dihl42gy2568998q4v", - "depends": ["cvTools", "ggplot2", "glmnet", "reshape", "robustbase", "robustHD"] + "depends": ["cvTools", "ggplot2", "glmnet", "reshape", "robustHD", "robustbase"] }, "english": { "name": "english", @@ -58343,13 +58985,13 @@ "name": "enmSdmX", "version": "1.1.6", "sha256": "0hwj7xa19inifajqbgzyxcjgi0gz49yqyfbdvgdwmh8f81i99hip", - "depends": ["AICcmodavg", "boot", "data_table", "doParallel", "DT", "foreach", "gbm", "ks", "maxnet", "mgcv", "omnibus", "predicts", "ranger", "rJava", "scales", "sf", "shiny", "sp", "statisfactory", "terra"] + "depends": ["AICcmodavg", "DT", "boot", "data_table", "doParallel", "foreach", "gbm", "ks", "maxnet", "mgcv", "omnibus", "predicts", "rJava", "ranger", "scales", "sf", "shiny", "sp", "statisfactory", "terra"] }, "enmpa": { "name": "enmpa", - "version": "0.1.5", - "sha256": "0r7zr3xgx1w9570965bm13rw24647y47kab313lqb01nwd9vn2vn", - "depends": ["doSNOW", "ellipse", "foreach", "mgcv", "Rcpp", "snow", "terra", "vegan"] + "version": "0.1.8", + "sha256": "07v4jqmppmvarqc8a4z2zhl52z16w2biq7mga3fd6gz5z43c9yb8", + "depends": ["Rcpp", "doSNOW", "ellipse", "foreach", "mgcv", "snow", "terra", "vegan"] }, "enpls": { "name": "enpls", @@ -58361,7 +59003,7 @@ "name": "enrichR", "version": "3.2", "sha256": "1g97q6vqwvb2l02y61343sblarqi433gjl3qmlyxjxq2lnjrnak1", - "depends": ["curl", "ggplot2", "httr", "rjson", "WriteXLS"] + "depends": ["WriteXLS", "curl", "ggplot2", "httr", "rjson"] }, "enrichwith": { "name": "enrichwith", @@ -58409,7 +59051,7 @@ "name": "entropart", "version": "1.6-13", "sha256": "1y2gdfnqz52w03g9zij07fkjhh3yf3qflk75j0bvfk7n727rz2jp", - "depends": ["ape", "EntropyEstimation", "ggplot2", "ggpubr", "reshape2", "rlang", "tibble", "vegan"] + "depends": ["EntropyEstimation", "ape", "ggplot2", "ggpubr", "reshape2", "rlang", "tibble", "vegan"] }, "entropy": { "name": "entropy", @@ -58445,13 +59087,13 @@ "name": "envi", "version": "0.1.19", "sha256": "04hh4fgkaw8zzsjf2bzwwy3iyknfaipqd7p5icysx6il5i8hd79y", - "depends": ["concaveman", "cvAUC", "doFuture", "doRNG", "fields", "foreach", "future", "iterators", "pls", "ROCR", "sf", "sparr", "spatstat_geom", "terra"] + "depends": ["ROCR", "concaveman", "cvAUC", "doFuture", "doRNG", "fields", "foreach", "future", "iterators", "pls", "sf", "sparr", "spatstat_geom", "terra"] }, "enviGCMS": { "name": "enviGCMS", "version": "0.7.1", "sha256": "1rk7y24lld16zk7f3aak3zf9i3xd27l8mffcvlxwqi7cpl1pqa9b", - "depends": ["animation", "BiocParallel", "data_table", "igraph", "mixtools", "RColorBrewer", "Rdisop"] + "depends": ["BiocParallel", "RColorBrewer", "Rdisop", "animation", "data_table", "igraph", "mixtools"] }, "enviPat": { "name": "enviPat", @@ -58481,7 +59123,7 @@ "name": "envoutliers", "version": "1.1.0", "sha256": "1wgrrkkpkmf300qb56mq6nxigwnpq551sjxlk05lk3ckawx66srf", - "depends": ["car", "changepoint", "ecp", "ismev", "lokern", "MASS", "robustbase"] + "depends": ["MASS", "car", "changepoint", "ecp", "ismev", "lokern", "robustbase"] }, "envstat": { "name": "envstat", @@ -58491,8 +59133,8 @@ }, "envvar": { "name": "envvar", - "version": "0.1.1", - "sha256": "161ncksw9l0fjf54i9yv8gfq5vggiv50sphfdc7ik7m3avdw1hqs", + "version": "0.1.2", + "sha256": "1nrcnipxljpwavfmm5m107zihvm2dj07wgrgkpzx3ph2mzjbzx81", "depends": ["cli", "fs", "lubridate", "rlang"] }, "eoR": { @@ -58505,7 +59147,7 @@ "name": "eoa3", "version": "1.0.0.1", "sha256": "1qqdkxg4jsnqn6j0pa73g3as3hv9y2xh2jg2axj0i11jr5x68ars", - "depends": ["actuar", "GenEst", "MASS", "rjags", "survival", "VGAM"] + "depends": ["GenEst", "MASS", "VGAM", "actuar", "rjags", "survival"] }, "eodhd": { "name": "eodhd", @@ -58517,7 +59159,7 @@ "name": "eoffice", "version": "0.2.2", "sha256": "0nxyllragxn5bq28x37vkx16vi4y9af5nly1pslqrvvarl21ics4", - "depends": ["broom", "devEMF", "dplyr", "flextable", "ggplot2", "ggplotify", "htmlwidgets", "magick", "magrittr", "officer", "plotly", "R_devices", "rvg"] + "depends": ["R_devices", "broom", "devEMF", "dplyr", "flextable", "ggplot2", "ggplotify", "htmlwidgets", "magick", "magrittr", "officer", "plotly", "rvg"] }, "epade": { "name": "epade", @@ -58547,7 +59189,7 @@ "name": "epca", "version": "1.1.0", "sha256": "0ikncmrvcdixa209lrjb84rdsl78isi815a461i7lfmmln9myqk2", - "depends": ["clue", "GPArotation", "irlba", "Matrix"] + "depends": ["GPArotation", "Matrix", "clue", "irlba"] }, "epe4md": { "name": "epe4md", @@ -58557,9 +59199,9 @@ }, "eph": { "name": "eph", - "version": "1.0.0", - "sha256": "1gr0j5xxdmi10d4n742r9764134fsh0xxqdfz5jk5df1z16wh7g2", - "depends": ["attempt", "cli", "curl", "dplyr", "expss", "htmltools", "httr", "leaflet", "purrr", "readxl", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "zoo"] + "version": "1.0.2", + "sha256": "02yl12chvqz02dk7f1asb21axr4g6yyd91dzpjcggdv6zrjpfbvx", + "depends": ["cli", "curl", "dplyr", "expss", "htmltools", "httr", "leaflet", "purrr", "readxl", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "zoo"] }, "epiCleanr": { "name": "epiCleanr", @@ -58567,11 +59209,17 @@ "sha256": "1m5qz7qkly9waj1w8x0hrz28cc4vzn6psqs4q39x1fhxlgip0rih", "depends": ["countrycode", "crayon", "dplyr", "ggplot2", "glue", "janitor", "purrr", "rio", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "withr"] }, + "epiCo": { + "name": "epiCo", + "version": "1.0.0", + "sha256": "1x7icsihh7yk0l13xr5l2jsx2hwxdww8gi8pl9xil5hjclpiasbi", + "depends": ["RColorBrewer", "dplyr", "ggplot2", "ggraph", "igraph", "incidence", "leaflet", "lubridate", "magrittr", "rlang", "scales", "spdep", "treemapify"] + }, "epiDisplay": { "name": "epiDisplay", "version": "3.5.0.2", "sha256": "0430mwnaa0qamdyvmwkh37ic0kp4hq8mr5nxkc97mhhl7djw0y92", - "depends": ["foreign", "MASS", "nnet", "survival"] + "depends": ["MASS", "foreign", "nnet", "survival"] }, "epiR": { "name": "epiR", @@ -58589,7 +59237,7 @@ "name": "epicasting", "version": "0.1.0", "sha256": "191kxjrr8h44i7a7dpxziqhbcnbmhgcc5b7ddn9cnvvjqmbwmvl2", - "depends": ["forecast", "Metrics", "wavelets"] + "depends": ["Metrics", "forecast", "wavelets"] }, "epicontacts": { "name": "epicontacts", @@ -58605,15 +59253,15 @@ }, "epidatr": { "name": "epidatr", - "version": "1.1.1", - "sha256": "1qiidg3fq2ccm6l8r080fg9mwdvcnksl338z2navv9w4jq7kjwr8", - "depends": ["cachem", "checkmate", "cli", "glue", "httr", "jsonlite", "magrittr", "MMWRweek", "openssl", "purrr", "rappdirs", "readr", "tibble", "usethis", "xml2"] + "version": "1.2.0", + "sha256": "0x7hx5cc6w62clbpkpr6nwmzhb4nwb5kb8x324ci8llza2gdi9lk", + "depends": ["MMWRweek", "cachem", "checkmate", "cli", "glue", "httr", "jsonlite", "magrittr", "openssl", "purrr", "rappdirs", "readr", "tibble", "usethis", "xml2"] }, "epidm": { "name": "epidm", "version": "1.0.4", "sha256": "0ncjfhq45gs1w0kpkpdwfs43iccl6pq8yrc2999g3r5dsiw06lyq", - "depends": ["data_table", "DBI", "odbc", "phonics", "purrr", "readr", "stringi", "stringr"] + "depends": ["DBI", "data_table", "odbc", "phonics", "purrr", "readr", "stringi", "stringr"] }, "epifitter": { "name": "epifitter", @@ -58635,9 +59283,9 @@ }, "epigrowthfit": { "name": "epigrowthfit", - "version": "0.15.2", - "sha256": "1wzb92baz3aw3y15fdc3r8nanjzkgshhbi57hq7x8ybdzrwn6rz8", - "depends": ["Matrix", "nlme", "RcppEigen", "TMB"] + "version": "0.15.3", + "sha256": "0j5gml3glnfsmc76qy554bmqx2g80y3kdrnbabzx0hqaz8sz8fgl", + "depends": ["Matrix", "RcppEigen", "TMB", "nlme"] }, "epikit": { "name": "epikit", @@ -58673,7 +59321,7 @@ "name": "epinetr", "version": "0.96", "sha256": "0jg8pwbxlgrk7mqawsrifk724pi5qn0amh6x2fq54a0hmqdpdjns", - "depends": ["GA", "ggplot2", "igraph", "Rcpp", "RcppAlgos", "reshape2", "vcfR"] + "depends": ["GA", "Rcpp", "RcppAlgos", "ggplot2", "igraph", "reshape2", "vcfR"] }, "epiomics": { "name": "epiomics", @@ -58685,7 +59333,7 @@ "name": "epiphy", "version": "0.5.0", "sha256": "08jvbmj6l90102cpf00h5dzq7a700zwvy31wz7d5lxfn91x83gb9", - "depends": ["ggplot2", "msm", "pbapply", "Rcpp", "transport"] + "depends": ["Rcpp", "ggplot2", "msm", "pbapply", "transport"] }, "episcan": { "name": "episcan", @@ -58703,7 +59351,7 @@ "name": "epitab", "version": "0.2.2", "sha256": "0yi65bblsikwsa9i7wys1mqf6pp6j01kyc8xkyrhs5n62y1k68nc", - "depends": ["kableExtra", "knitr", "MASS", "survival", "xml2"] + "depends": ["MASS", "kableExtra", "knitr", "survival", "xml2"] }, "epitools": { "name": "epitools", @@ -58721,7 +59369,7 @@ "name": "epitweetr", "version": "2.2.16", "sha256": "0xniwd6r1jyn2ifw8y4d9c3dl4maik6p4lw0nghb9z9q9xigjlak", - "depends": ["bit64", "crul", "curl", "dplyr", "DT", "emayili", "future", "ggplot2", "htmltools", "httpuv", "httr", "janitor", "jsonlite", "keyring", "knitr", "lifecycle", "magrittr", "openxlsx", "plotly", "plyr", "processx", "readxl", "rlang", "rmarkdown", "rnaturalearthdata", "rtweet", "shiny", "sp", "stringr", "tibble", "tidytext", "tidyverse", "xml2", "xtable"] + "depends": ["DT", "bit64", "crul", "curl", "dplyr", "emayili", "future", "ggplot2", "htmltools", "httpuv", "httr", "janitor", "jsonlite", "keyring", "knitr", "lifecycle", "magrittr", "openxlsx", "plotly", "plyr", "processx", "readxl", "rlang", "rmarkdown", "rnaturalearthdata", "rtweet", "shiny", "sp", "stringr", "tibble", "tidytext", "tidyverse", "xml2", "xtable"] }, "epiworldR": { "name": "epiworldR", @@ -58739,7 +59387,7 @@ "name": "eplusr", "version": "0.16.2", "sha256": "1b9kqrma6ayzsj146fdb2w2pwzmz1r6yy9g0abhx745gll8g9gqr", - "depends": ["callr", "checkmate", "cli", "data_table", "lubridate", "processx", "R6", "RSQLite", "stringi", "units"] + "depends": ["R6", "RSQLite", "callr", "checkmate", "cli", "data_table", "lubridate", "processx", "stringi", "units"] }, "eply": { "name": "eply", @@ -58751,7 +59399,7 @@ "name": "epm", "version": "1.1.2", "sha256": "1zziy07ydrxma5qhnxha5g2zm02yi6bvw2vv3w6sanrj9p4kakav", - "depends": ["ape", "pbapply", "Rcpp", "RcppProgress", "sf", "terra", "viridisLite"] + "depends": ["Rcpp", "RcppProgress", "ape", "pbapply", "sf", "terra", "viridisLite"] }, "epmrob": { "name": "epmrob", @@ -58769,7 +59417,7 @@ "name": "epoc", "version": "0.2.6-1.1", "sha256": "1qlj4cl7mh5k52v2ippfs3cish5iadnix5w46p25hjqiriksclna", - "depends": ["elasticnet", "irr", "lassoshooting", "Matrix", "survival"] + "depends": ["Matrix", "elasticnet", "irr", "lassoshooting", "survival"] }, "epocakir": { "name": "epocakir", @@ -58787,7 +59435,7 @@ "name": "epos", "version": "1.1", "sha256": "13ajaiin7n9z9rhmczlxbrpma5d3wa1wh7gcnw7xa39wsinvmn9s", - "depends": ["cowplot", "ggplot2", "gridExtra", "hash", "mongolite", "stringr", "testthat", "TopKLists", "VennDiagram", "xtable"] + "depends": ["TopKLists", "VennDiagram", "cowplot", "ggplot2", "gridExtra", "hash", "mongolite", "stringr", "testthat", "xtable"] }, "epoxy": { "name": "epoxy", @@ -58817,13 +59465,13 @@ "name": "epwshiftr", "version": "0.1.4", "sha256": "075yvrxyjswkx03fwns2pa7plz5hjlpjyp5xq48s7i0ya3x9x55w", - "depends": ["checkmate", "cli", "data_table", "eplusr", "fst", "future_apply", "jsonlite", "PCICt", "progressr", "psychrolib", "R6", "rappdirs", "RNetCDF", "units"] + "depends": ["PCICt", "R6", "RNetCDF", "checkmate", "cli", "data_table", "eplusr", "fst", "future_apply", "jsonlite", "progressr", "psychrolib", "rappdirs", "units"] }, "epxToR": { "name": "epxToR", "version": "0.4-1", "sha256": "00m64ham9fd9dsw37ic2m62fy4pvmwfwmjx8cg6n4rwbgq9q49sg", - "depends": ["httr", "XML"] + "depends": ["XML", "httr"] }, "eq5d": { "name": "eq5d", @@ -58835,7 +59483,7 @@ "name": "eq5dsuite", "version": "1.0.0", "sha256": "1dy52swx5mq9xs2c0c4xa01dkpzffbyydfk6h83wh7hy27ml4zr8", - "depends": ["dplyr", "ggplot2", "moments", "rappdirs", "RColorBrewer", "rlang", "scales", "stringr", "tidyr"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "moments", "rappdirs", "rlang", "scales", "stringr", "tidyr"] }, "equalCovs": { "name": "equalCovs", @@ -58863,15 +59511,15 @@ }, "equateIRT": { "name": "equateIRT", - "version": "2.4.0", - "sha256": "0i3bvldalqrlz9qalpylybn896nkdpm5xk4m62sxhm1bfrd0nm98", + "version": "2.5.0", + "sha256": "09g4wk41fi6sav71cnkj1gy43cb1jc8yz408kxhccyb22z8ib4z0", "depends": ["mirt", "statmod"] }, "equateMultiple": { "name": "equateMultiple", "version": "0.1.2", "sha256": "150srrf8msr6jzyri6632xws0g2lnj34kvj7hqrvbiwkad1aqq7m", - "depends": ["equateIRT", "numDeriv", "Rcpp", "RcppArmadillo", "statmod"] + "depends": ["Rcpp", "RcppArmadillo", "equateIRT", "numDeriv", "statmod"] }, "equatiomatic": { "name": "equatiomatic", @@ -58895,13 +59543,13 @@ "name": "equivalence", "version": "0.7.2", "sha256": "170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79", - "depends": ["boot", "lattice", "PairedData"] + "depends": ["PairedData", "boot", "lattice"] }, "equivalenceTest": { "name": "equivalenceTest", "version": "0.0.1.1", "sha256": "1lr1qc4mv8f9hwqidj1rwhxqm1fb8cf1hnb1k32xpdqwzsxbfa47", - "depends": ["cubature", "polynom", "Rdpack", "rootSolve"] + "depends": ["Rdpack", "cubature", "polynom", "rootSolve"] }, "era": { "name": "era", @@ -58913,7 +59561,7 @@ "name": "erah", "version": "2.0.1", "sha256": "136wh0gaygc7mkj507bjmgzv79jcap0whngd501gg47zf7b8jzxx", - "depends": ["furrr", "future", "HiClimR", "igraph", "osd", "progress", "quantreg", "signal", "tibble"] + "depends": ["HiClimR", "furrr", "future", "igraph", "osd", "progress", "quantreg", "signal", "tibble"] }, "erboost": { "name": "erboost", @@ -58927,12 +59575,6 @@ "sha256": "0rs4yhm9sjnqkrgqqy6b8wj9fgk910hxc8d7zi4qwql0v1gid27l", "depends": [] }, - "erer": { - "name": "erer", - "version": "3.1", - "sha256": "03pdq3p5c5f20959hgk5q2cx5x10bpgf0qg4z1nvsf31vc5ni77v", - "depends": ["lmtest", "systemfit", "tseries", "urca"] - }, "erfe": { "name": "erfe", "version": "0.0.1", @@ -58943,37 +59585,37 @@ "name": "ergMargins", "version": "1.3", "sha256": "0mr01ckxn8l8fjxlld05ag18d04h17wbnrgpry46hz38axl41zzj", - "depends": ["btergm", "dplyr", "ergm", "Matrix", "network", "numDeriv", "sampling", "sna"] + "depends": ["Matrix", "btergm", "dplyr", "ergm", "network", "numDeriv", "sampling", "sna"] }, "ergm": { "name": "ergm", "version": "4.6.0", "sha256": "1xx767l4z38wkxlxwq62y4khjjsz10fsy36x0s74fnzb746acwdl", - "depends": ["coda", "knitr", "lpSolveAPI", "magrittr", "MASS", "Matrix", "memoise", "network", "purrr", "Rdpack", "rlang", "rle", "robustbase", "statnet_common", "stringr", "tibble", "trust"] + "depends": ["MASS", "Matrix", "Rdpack", "coda", "knitr", "lpSolveAPI", "magrittr", "memoise", "network", "purrr", "rlang", "rle", "robustbase", "statnet_common", "stringr", "tibble", "trust"] }, "ergm_count": { "name": "ergm.count", "version": "4.1.2", "sha256": "085h2dn9dz9i05kjdm3ysgp7lzqdniq16xrvc11b4q1g9av71klv", - "depends": ["ergm", "network", "Rdpack", "statnet_common"] + "depends": ["Rdpack", "ergm", "network", "statnet_common"] }, "ergm_ego": { "name": "ergm.ego", "version": "1.1.0", "sha256": "1wflvj946xkiy0xzq53x13v9iqj64hc7wcqzqazkvlngigibh5gl", - "depends": ["dplyr", "egor", "ergm", "network", "purrr", "RColorBrewer", "statnet_common", "survey", "tibble"] + "depends": ["RColorBrewer", "dplyr", "egor", "ergm", "network", "purrr", "statnet_common", "survey", "tibble"] }, "ergm_multi": { "name": "ergm.multi", "version": "0.2.1", "sha256": "00hrl0cz81kjfp49sc3ma4jxxxgnjc6aald2drs190ks43bx17g0", - "depends": ["ergm", "glue", "Matrix", "network", "purrr", "Rdpack", "rlang", "rle", "statnet_common", "tibble"] + "depends": ["Matrix", "Rdpack", "ergm", "glue", "network", "purrr", "rlang", "rle", "statnet_common", "tibble"] }, "ergm_rank": { "name": "ergm.rank", "version": "4.1.1", "sha256": "059s4zdb5fm8wl130nnxww1ry57d3p6rd5zmn9pf94iisjpkxxij", - "depends": ["ergm", "network", "Rdpack", "statnet_common"] + "depends": ["Rdpack", "ergm", "network", "statnet_common"] }, "ergmgp": { "name": "ergmgp", @@ -58991,19 +59633,19 @@ "name": "ergmito", "version": "0.3-1", "sha256": "0djcfwxr4diwfjvim6mbz1g28bzsd94s78xw5kvn5vahiwjpdd61", - "depends": ["ergm", "MASS", "network", "Rcpp", "RcppArmadillo", "texreg"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "ergm", "network", "texreg"] }, "erify": { "name": "erify", - "version": "0.4.0", - "sha256": "014q4crfa92i4fb4mrbl68ai0l8asjwwnv3l2m11gfnny41p4bks", + "version": "0.6.0", + "sha256": "0qgv1lsg30gpris1q5wh258sspxiyccs18mzvsgs0kdynhf0aj0p", "depends": ["glue"] }, "ern": { "name": "ern", "version": "2.0.0", "sha256": "13hw1ji3d8dqr8al4rykg75a392w4306gmr3m2mlrwdy7rzi9pyi", - "depends": ["assertthat", "coda", "dplyr", "EpiEstim", "ggplot2", "lubridate", "patchwork", "rjags", "runjags", "stringr", "tibble", "tidyr", "zoo"] + "depends": ["EpiEstim", "assertthat", "coda", "dplyr", "ggplot2", "lubridate", "patchwork", "rjags", "runjags", "stringr", "tibble", "tidyr", "zoo"] }, "erp_easy": { "name": "erp.easy", @@ -59011,12 +59653,6 @@ "sha256": "193n45w0rq3cy0nmxvv0h6s3yr8kfjlg90nd4dnqlsq85zlsizij", "depends": ["gtools", "plyr", "signal"] }, - "err": { - "name": "err", - "version": "0.2.0", - "sha256": "1915b0vmqdd8whwdrqjphld1jaxawh5b7di6wf7q3sx779lblsrs", - "depends": [] - }, "errorist": { "name": "errorist", "version": "0.1.2", @@ -59031,8 +59667,8 @@ }, "errors": { "name": "errors", - "version": "0.4.1", - "sha256": "0pyp1adhyp5kak4x9niyj3ncmda1xydsx2sfa7gjbm2fzazyslbh", + "version": "0.4.2", + "sha256": "17almk09rl6q0g88kwkdcf30280s56ay6vx3sancnn9qfsp9zzrg", "depends": [] }, "errum": { @@ -59057,7 +59693,7 @@ "name": "esaddle", "version": "0.0.7", "sha256": "1r79qcirlx7g9w523nz81f5f22paid5dhag2lqj7jf33w0ggaknn", - "depends": ["doParallel", "mvnfast", "plyr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "mvnfast", "plyr"] }, "esaps": { "name": "esaps", @@ -59079,21 +59715,21 @@ }, "escalation": { "name": "escalation", - "version": "0.1.9", - "sha256": "1y25xmwf4gb5d5n6z8n06ignjkcrgffak5ca4gjw89pr05284q5q", - "depends": ["binom", "BOIN", "dfcrm", "DiagrammeR", "dplyr", "ggplot2", "gtools", "magrittr", "mvtnorm", "purrr", "R6", "RColorBrewer", "stringr", "testthat", "tibble", "tidyr", "tidyselect", "trialr", "viridis"] + "version": "0.1.10", + "sha256": "0qsr58jcw48lypddbyfpkx51riasxzq2c6098zhcypj8kf98rfvw", + "depends": ["BOIN", "DiagrammeR", "R6", "RColorBrewer", "binom", "dfcrm", "dplyr", "ggplot2", "gtools", "magrittr", "mvtnorm", "purrr", "stringr", "testthat", "tibble", "tidyr", "tidyselect", "trialr", "viridis"] }, "esci": { "name": "esci", - "version": "1.0.2", - "sha256": "0rc43xwkn1l5qxkki88d51yp3qbdw2r369f6i04r5yxa042a5kqj", - "depends": ["ggbeeswarm", "ggdist", "ggh4x", "ggplot2", "ggtext", "glue", "jmvcore", "mathjaxr", "metafor", "multcomp", "R6", "Rdpack", "rlang", "sadists", "statpsych", "stringr"] + "version": "1.0.3", + "sha256": "1mb23j6yhlakzmz2ph6w3wbasjl5wv2l3i8qjg8knkm2h1yg3kgc", + "depends": ["R6", "Rdpack", "ggbeeswarm", "ggdist", "ggh4x", "ggplot2", "ggtext", "glue", "jmvcore", "mathjaxr", "metafor", "multcomp", "rlang", "sadists", "statpsych", "stringr"] }, "eseis": { "name": "eseis", "version": "0.7.3", "sha256": "0fn55mb6yklwjh0ihczjchxrxvnblzbifq59158zfmz407rrfk5g", - "depends": ["caTools", "colorspace", "extraDistr", "fftw", "IRISSeismic", "matrixStats", "minpack_lm", "Rcpp", "reticulate", "rmarkdown", "shiny", "signal", "terra", "XML"] + "depends": ["IRISSeismic", "Rcpp", "XML", "caTools", "colorspace", "extraDistr", "fftw", "matrixStats", "minpack_lm", "reticulate", "rmarkdown", "shiny", "signal", "terra"] }, "eselect": { "name": "eselect", @@ -59105,19 +59741,19 @@ "name": "esem", "version": "2.0.0", "sha256": "035f864na44lqdya6zbivyg1advan9mrfz5c61hxkvlv63b3v8ay", - "depends": ["dplyr", "GPArotation", "lavaan", "magrittr", "psych", "rlang", "tibble", "tidyr"] + "depends": ["GPArotation", "dplyr", "lavaan", "magrittr", "psych", "rlang", "tibble", "tidyr"] }, "esemifar": { "name": "esemifar", "version": "2.0.1", "sha256": "1ypylcyyq516d9w1s920m92h7a6c6yb837720hbmx37vjjz6l4dm", - "depends": ["fracdiff", "furrr", "future", "ggplot2", "Rcpp", "RcppArmadillo", "smoots"] + "depends": ["Rcpp", "RcppArmadillo", "fracdiff", "furrr", "future", "ggplot2", "smoots"] }, "eshrink": { "name": "eshrink", "version": "0.1.2", "sha256": "0min4j1dyd08i0fyn9a4iasjlhq08bn74bjz8vj1gq9l114v795k", - "depends": ["glmnet", "MASS"] + "depends": ["MASS", "glmnet"] }, "esmisc": { "name": "esmisc", @@ -59135,31 +59771,31 @@ "name": "esmtools", "version": "1.0.1", "sha256": "0jrq3ccz6zv1ic7a5sqvk8h3vgrq1lkkckadsik8x1a9bnsv0qii", - "depends": ["base64enc", "dplyr", "DT", "fs", "ggplot2", "ggpubr", "htmltools", "jsonlite", "kableExtra", "knitr", "lubridate", "stringr", "tidyr"] + "depends": ["DT", "base64enc", "dplyr", "fs", "ggplot2", "ggpubr", "htmltools", "jsonlite", "kableExtra", "knitr", "lubridate", "stringr", "tidyr"] }, "espadon": { "name": "espadon", - "version": "1.7.2", - "sha256": "08pjzi992apgkxiwv88m0gq7i156lqz5vmlkm5lfcx8w3bjj0j3d", - "depends": ["colorspace", "DT", "igraph", "js", "mathjaxr", "Matrix", "misc3d", "Morpho", "openxlsx", "progress", "qs", "Rcpp", "Rdpack", "rgl", "Rvcg", "shiny", "shinyWidgets", "sodium"] + "version": "1.7.4", + "sha256": "057c321ww1fiwpsybrgyn9rs18j28xq3smv5bbxk370zz7fn9mch", + "depends": ["DT", "Matrix", "Morpho", "Rcpp", "Rdpack", "Rvcg", "colorspace", "igraph", "js", "mathjaxr", "misc3d", "openxlsx", "progress", "qs", "rgl", "shiny", "shinyWidgets", "sodium"] }, "esquisse": { "name": "esquisse", "version": "2.0.0", "sha256": "0w37x5w6kvscwbr6d157ahmaigafj3ccn3zjasqazrzzlwjns3lm", - "depends": ["bslib", "datamods", "downlit", "ggplot2", "htmltools", "jsonlite", "phosphoricons", "rlang", "rstudioapi", "scales", "shiny", "shinybusy", "shinyWidgets"] + "depends": ["bslib", "datamods", "downlit", "ggplot2", "htmltools", "jsonlite", "phosphoricons", "rlang", "rstudioapi", "scales", "shiny", "shinyWidgets", "shinybusy"] }, "esreg": { "name": "esreg", "version": "0.6.2", "sha256": "1djyx8cc1pfza5n5ipg990jwwc1fjlsiz817iifwv9iw8g9vkda4", - "depends": ["Formula", "quantreg", "Rcpp", "RcppArmadillo"] + "depends": ["Formula", "Rcpp", "RcppArmadillo", "quantreg"] }, "ess": { "name": "ess", "version": "1.1.2", "sha256": "1cmw20nn39ssyqiyn50w0ws28mq4cd26yhzr7mv97haaqjjjkv5h", - "depends": ["igraph", "Rcpp"] + "depends": ["Rcpp", "igraph"] }, "essHist": { "name": "essHist", @@ -59201,19 +59837,19 @@ "name": "estimateW", "version": "0.0.1", "sha256": "0fgbyfnxxs6kp9p17ljvj72q5vd4xn7kwh4zbmzjx45cdq101bjv", - "depends": ["Matrix", "matrixcalc", "plot_matrix", "R6"] + "depends": ["Matrix", "R6", "matrixcalc", "plot_matrix"] }, "estimators": { "name": "estimators", "version": "0.8.5", "sha256": "16zpgscxn3f3alfi44yinacrf9222wbdg7ac1bs91bax7zn3k0zd", - "depends": ["extraDistr", "ggh4x", "ggplot2", "Matrix", "progress"] + "depends": ["Matrix", "extraDistr", "ggh4x", "ggplot2", "progress"] }, "estimatr": { "name": "estimatr", "version": "1.0.4", "sha256": "1v9fzqp7h48lb70d2kln4wq9fl36dsxhv7871hnmggkykzax3pvc", - "depends": ["Formula", "generics", "Rcpp", "RcppEigen", "rlang"] + "depends": ["Formula", "Rcpp", "RcppEigen", "generics", "rlang"] }, "estimraw": { "name": "estimraw", @@ -59231,13 +59867,13 @@ "name": "estprod", "version": "1.2", "sha256": "0pnpg8w6i1dmkcn6afj2jsm5mzvbxka80np1bldcxgmylrp5s35p", - "depends": ["boot", "Formula", "gmm", "lazyeval", "minpack_lm"] + "depends": ["Formula", "boot", "gmm", "lazyeval", "minpack_lm"] }, "esvis": { "name": "esvis", "version": "0.3.1", "sha256": "0bb91khnrn8v3d6hbbin72032w7w8p0jchbr0bzwyfq5f6l4hwka", - "depends": ["dplyr", "ggplot2", "Hmisc", "magrittr", "purrr", "rlang", "sfsmisc", "tibble", "tidyr"] + "depends": ["Hmisc", "dplyr", "ggplot2", "magrittr", "purrr", "rlang", "sfsmisc", "tibble", "tidyr"] }, "et_nwfva": { "name": "et.nwfva", @@ -59273,7 +59909,7 @@ "name": "etm", "version": "1.1.1", "sha256": "1hvrplmdpjjpjji663rw0vjbbrzj2nvr04d1nkc8bf46p4ixyxgy", - "depends": ["data_table", "lattice", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "lattice", "survival"] }, "etrader": { "name": "etrader", @@ -59285,7 +59921,7 @@ "name": "etree", "version": "0.1.0", "sha256": "1qnky9jqcfbq60s4h3igyq77r7f559i714i5g7ss14zcx86zkpdi", - "depends": ["brainGraph", "cluster", "energy", "fda_usc", "igraph", "NetworkDistance", "partykit", "survival", "TDA", "usedist"] + "depends": ["NetworkDistance", "TDA", "brainGraph", "cluster", "energy", "fda_usc", "igraph", "partykit", "survival", "usedist"] }, "etrm": { "name": "etrm", @@ -59303,7 +59939,7 @@ "name": "etwfe", "version": "0.4.0", "sha256": "06y9xw8fdfijxv4kh0fxin6dgj6vavnjnyh9a75m14i0i69hd8bd", - "depends": ["data_table", "fixest", "Formula", "marginaleffects"] + "depends": ["Formula", "data_table", "fixest", "marginaleffects"] }, "eudract": { "name": "eudract", @@ -59315,7 +59951,7 @@ "name": "eufmdis.adapt", "version": "0.1.0", "sha256": "0n8qj5dhc32ckbjiwvcfc904j9jilyb87x325a2vbgb35gfhf7sn", - "depends": ["dplyr", "DT", "ggplot2", "htmltools", "magrittr", "rlang", "shiny", "shinydashboard", "shinyWidgets", "tibble", "tidyselect"] + "depends": ["DT", "dplyr", "ggplot2", "htmltools", "magrittr", "rlang", "shiny", "shinyWidgets", "shinydashboard", "tibble", "tidyselect"] }, "eulerian": { "name": "eulerian", @@ -59327,7 +59963,7 @@ "name": "eulerr", "version": "7.0.2", "sha256": "0aw4l338nymrmna7q01vxn2cc7wyzz3lhf1bwazy55qa4hmww3af", - "depends": ["GenSA", "polyclip", "polylabelr", "Rcpp", "RcppArmadillo"] + "depends": ["GenSA", "Rcpp", "RcppArmadillo", "polyclip", "polylabelr"] }, "eummd": { "name": "eummd", @@ -59343,21 +59979,21 @@ }, "eurlex": { "name": "eurlex", - "version": "0.4.7", - "sha256": "1arpixy6hcqdfn83rkb23s5zgvhkw1nv2hjv09k2k0g8s642y6yf", - "depends": ["antiword", "curl", "dplyr", "httr", "magrittr", "pdftools", "readr", "rlang", "rvest", "stringr", "tidyr", "xml2"] + "version": "0.4.8", + "sha256": "13f8bfkcda0n6fnh8hp398prx6nb18wfzxy7bklvj91s0y158j8s", + "depends": ["antiword", "curl", "dplyr", "httr", "magrittr", "pdftools", "rlang", "rvest", "stringr", "tidyr", "xml2"] }, "eurocordexr": { "name": "eurocordexr", "version": "0.2.4", "sha256": "1srn0n1imp975b3sfaz27yz1fxm8gs7h34wa6mf5xw551gm6kwwv", - "depends": ["data_table", "fs", "lubridate", "magrittr", "ncdf4", "ncdf4_helpers", "PCICt"] + "depends": ["PCICt", "data_table", "fs", "lubridate", "magrittr", "ncdf4", "ncdf4_helpers"] }, "eurodata": { "name": "eurodata", "version": "1.7.0", "sha256": "0xw6b178jpg4dlgx6af1bh6z2m6apd12lbz03yzp7ay93ghf7zsi", - "depends": ["data_table", "magrittr", "memoise", "R_utils", "Rcpp", "stringr", "xml2", "xtable"] + "depends": ["R_utils", "Rcpp", "data_table", "magrittr", "memoise", "stringr", "xml2", "xtable"] }, "euroleaguer": { "name": "euroleaguer", @@ -59369,7 +60005,7 @@ "name": "europeanaR", "version": "0.1.0", "sha256": "11cr8n64yv50zwib9wkvk1j43p9a1cmxmzznxykczv43l193kjg7", - "depends": ["data_table", "httr", "jsonlite", "magrittr", "Rdpack"] + "depends": ["Rdpack", "data_table", "httr", "jsonlite", "magrittr"] }, "europepmc": { "name": "europepmc", @@ -59387,7 +60023,7 @@ "name": "eurostat", "version": "4.0.0", "sha256": "13na6hdwz67f27vd3kvh6brxwxdf76sii0gf2r73ncs6db16q4pm", - "depends": ["classInt", "countrycode", "curl", "data_table", "digest", "dplyr", "httr2", "ISOweek", "jsonlite", "lubridate", "rappdirs", "readr", "RefManageR", "regions", "rlang", "stringi", "stringr", "tibble", "tidyr", "xml2"] + "depends": ["ISOweek", "RefManageR", "classInt", "countrycode", "curl", "data_table", "digest", "dplyr", "httr2", "jsonlite", "lubridate", "rappdirs", "readr", "regions", "rlang", "stringi", "stringr", "tibble", "tidyr", "xml2"] }, "eva": { "name": "eva", @@ -59405,7 +60041,7 @@ "name": "evalITR", "version": "1.0.0", "sha256": "0szrqcvi9x0wqxlyi1qyzpkj4y93qym8295nddip9ncl67kh2w09", - "depends": ["bartCause", "caret", "cli", "dplyr", "e1071", "forcats", "gbm", "ggdist", "ggplot2", "ggthemes", "glmnet", "grf", "haven", "MASS", "Matrix", "purrr", "quadprog", "rlang", "rpart", "rqPen", "scales", "SuperLearner"] + "depends": ["MASS", "Matrix", "SuperLearner", "bartCause", "caret", "cli", "dplyr", "e1071", "forcats", "gbm", "ggdist", "ggplot2", "ggthemes", "glmnet", "grf", "haven", "purrr", "quadprog", "rlang", "rpart", "rqPen", "scales"] }, "evalR": { "name": "evalR", @@ -59429,13 +60065,13 @@ "name": "evclass", "version": "2.0.2", "sha256": "0khiifgfag8a6nsznnjr7h1vj5v2nzidv0qrkxlg12i42bg3xqpj", - "depends": ["FNN", "ibelief", "R_utils"] + "depends": ["FNN", "R_utils", "ibelief"] }, "evclust": { "name": "evclust", "version": "2.0.3", "sha256": "0z707x770rp7y3sii4w0xk61is2ib79mix14x48n942vb11mc91b", - "depends": ["FNN", "limSolve", "Matrix", "mclust", "plyr", "quadprog", "R_utils"] + "depends": ["FNN", "Matrix", "R_utils", "limSolve", "mclust", "plyr", "quadprog"] }, "evd": { "name": "evd", @@ -59465,7 +60101,7 @@ "name": "eventPred", "version": "0.2.5", "sha256": "1zpl609aka3pnxvam2l94ja4j5mskml7p7gbx7s6zpj49aggkvcf", - "depends": ["dplyr", "erify", "flexsurv", "Matrix", "mvtnorm", "numDeriv", "plotly", "purrr", "rlang", "rstpm2", "shiny", "survival"] + "depends": ["Matrix", "dplyr", "erify", "flexsurv", "mvtnorm", "numDeriv", "plotly", "purrr", "rlang", "rstpm2", "shiny", "survival"] }, "eventTrack": { "name": "eventTrack", @@ -59489,31 +60125,31 @@ "name": "eventstream", "version": "0.1.1", "sha256": "10dngj6xzf072gyz8wcs3g30ihqvxdmg9h3q8m3d3lf17v3a75d6", - "depends": ["abind", "changepoint", "dbscan", "dplyr", "glmnet", "MASS", "tensorA"] + "depends": ["MASS", "abind", "changepoint", "dbscan", "dplyr", "glmnet", "tensorA"] }, "eventstudyr": { "name": "eventstudyr", "version": "1.1.3", "sha256": "0l7sv8kb459sb69rp2y61g7a19i8xhanjd6paajlrha44bxyl1kv", - "depends": ["car", "data_table", "dplyr", "estimatr", "ggplot2", "MASS", "pracma", "rlang", "stringr"] + "depends": ["MASS", "car", "data_table", "dplyr", "estimatr", "ggplot2", "pracma", "rlang", "stringr"] }, "evgam": { "name": "evgam", "version": "1.0.0", "sha256": "0f8a29c2qxlzqadq694j6gwrj8rdq7x1kqwn79di7ycxfi7ifdbq", - "depends": ["mgcv", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "mgcv"] }, "evian": { "name": "evian", "version": "2.1.0", "sha256": "1slnzq55gg3p16fs22v69mafiggiy5f70sj8fh65lc0hphybh6w2", - "depends": ["doParallel", "foreach", "ProfileLikelihood", "sandwich"] + "depends": ["ProfileLikelihood", "doParallel", "foreach", "sandwich"] }, "evidence": { "name": "evidence", "version": "0.8.10", "sha256": "02kqk95kx4nv13fg6z55a5rv6sq6lv8azg0jjxbkg1j6hg15p7ai", - "depends": ["LaplacesDemon", "lattice", "LearnBayes", "loo", "rstan", "rstanarm"] + "depends": ["LaplacesDemon", "LearnBayes", "lattice", "loo", "rstan", "rstanarm"] }, "evidenceFactors": { "name": "evidenceFactors", @@ -59537,7 +60173,7 @@ "name": "evinf", "version": "0.8.10", "sha256": "142rg6d3ziq5y2qscnfiasg2f27va44gjc4qh8db3z4n1nw076a5", - "depends": ["doParallel", "doRNG", "dplyr", "foreach", "generics", "magrittr", "MASS", "mistr", "MLmetrics", "pscl", "purrr", "Rcpp", "RcppArmadillo", "Rdpack", "rlang", "stringi", "stringr", "tibble", "tidyr"] + "depends": ["MASS", "MLmetrics", "Rcpp", "RcppArmadillo", "Rdpack", "doParallel", "doRNG", "dplyr", "foreach", "generics", "magrittr", "mistr", "pscl", "purrr", "rlang", "stringi", "stringr", "tibble", "tidyr"] }, "evir": { "name": "evir", @@ -59545,16 +60181,22 @@ "sha256": "1h7a7z7v5k33y5hsdfczsri3vpbwspfgazhv4saknv2h11rgfpki", "depends": [] }, + "evitaicossa": { + "name": "evitaicossa", + "version": "0.0-1", + "sha256": "13vxbf3cf0bbdbqj2dw9f5ckih42c5wikdn6mh106yyq27rxw7kb", + "depends": ["Rcpp", "Rdpack", "disordR"] + }, "evmix": { "name": "evmix", "version": "2.12", "sha256": "02rabc9snci00s1x7h0svfr66lmw1wjcdg0149wc52mnccsdaivf", - "depends": ["gsl", "MASS", "SparseM"] + "depends": ["MASS", "SparseM", "gsl"] }, "evoTS": { "name": "evoTS", - "version": "1.0.2", - "sha256": "104lb598rkm17n1as1g32va5aa285b86j4ac3wg4dxp8ckzl738d", + "version": "1.0.3", + "sha256": "0lwv8j4z88xr2x7k7gay42g9dig0vgv0h62br9d1flqlzf1hppd9", "depends": ["MASS", "mvtnorm", "paleoTS", "plotly", "pracma"] }, "evobiR": { @@ -59573,25 +60215,25 @@ "name": "evolqg", "version": "0.3-4", "sha256": "1h4k2sxp67f3qn1cnmy290rgbmpvvj2zlw7gz5lbcgzbf53lb1bd", - "depends": ["ape", "coda", "expm", "ggplot2", "igraph", "Matrix", "MCMCpack", "Morpho", "mvtnorm", "numDeriv", "plyr", "Rcpp", "RcppArmadillo", "reshape2", "vegan"] + "depends": ["MCMCpack", "Matrix", "Morpho", "Rcpp", "RcppArmadillo", "ape", "coda", "expm", "ggplot2", "igraph", "mvtnorm", "numDeriv", "plyr", "reshape2", "vegan"] }, "evolvability": { "name": "evolvability", "version": "2.0.0", "sha256": "0l81d48zvvnbxlx1mj4qwga1kdzk05pzdvsp4ghi93pzzynfqn9s", - "depends": ["ape", "coda", "lme4", "Matrix"] + "depends": ["Matrix", "ape", "coda", "lme4"] }, "evoper": { "name": "evoper", "version": "0.5.0", "sha256": "064fcpd04ws8v6sl0bakiw34jmmfpg1w5pkq94y2gh1c576x4vwz", - "depends": ["boot", "data_table", "deSolve", "futile_logger", "ggplot2", "plot3D", "plyr", "reshape", "RNetLogo", "rrepast"] + "depends": ["RNetLogo", "boot", "data_table", "deSolve", "futile_logger", "ggplot2", "plot3D", "plyr", "reshape", "rrepast"] }, "evprof": { "name": "evprof", "version": "1.1.2", "sha256": "1nkgvx76cvy78pcnrfh8md2j3b9vmsissmq2s2nbb2rral272gnr", - "depends": ["cowplot", "dbscan", "dplyr", "ggplot2", "jsonlite", "lubridate", "MASS", "mclust", "plotly", "purrr", "rlang", "tibble", "tidyr"] + "depends": ["MASS", "cowplot", "dbscan", "dplyr", "ggplot2", "jsonlite", "lubridate", "mclust", "plotly", "purrr", "rlang", "tibble", "tidyr"] }, "evreg": { "name": "evreg", @@ -59603,19 +60245,19 @@ "name": "evsim", "version": "1.5.0", "sha256": "0v057l0qb3x16kw5xdjmw724kg9zlflagkkdvhwgc39z1by1ahbd", - "depends": ["dplyr", "dygraphs", "ggplot2", "jsonlite", "lubridate", "MASS", "purrr", "rlang", "tidyr"] + "depends": ["MASS", "dplyr", "dygraphs", "ggplot2", "jsonlite", "lubridate", "purrr", "rlang", "tidyr"] }, "evt0": { "name": "evt0", - "version": "1.1-4", - "sha256": "0hqsv72wswnmgirhwb671snmg65qb1j77pfvzaqw9mi8lmvqalpq", + "version": "1.1.5", + "sha256": "08a34p0jbphhwiyxnk0yy830w1xr4dxzqj8bij828kxrhzc30pbb", "depends": ["evd"] }, "evtclass": { "name": "evtclass", "version": "1.0", "sha256": "1ny43sry257cxlg56f0lj1szv9ci3ymskj6l5sn43l5a2pq62g4l", - "depends": ["evd", "fitdistrplus", "RANN"] + "depends": ["RANN", "evd", "fitdistrplus"] }, "evtree": { "name": "evtree", @@ -59627,7 +60269,13 @@ "name": "ewoc", "version": "0.3.0", "sha256": "0r8b5vq0qzp3f0dasxmrngldqlymca90sj019rzs1a0qf28wlgbr", - "depends": ["coda", "doParallel", "doRNG", "foreach", "Formula", "ggplot2", "rjags"] + "depends": ["Formula", "coda", "doParallel", "doRNG", "foreach", "ggplot2", "rjags"] + }, + "ewp": { + "name": "ewp", + "version": "0.1.1", + "sha256": "18qcndxr5x6z5m91r9q8lzq0fmwli1w03x91z0rr03n3dw5c3kdx", + "depends": ["BH", "Rcpp"] }, "exCon": { "name": "exCon", @@ -59675,20 +60323,26 @@ "name": "exactextractr", "version": "0.10.0", "sha256": "1pj3145c20r4hnyyrynzmps96a4fpgn408lrl6b9bs79y33c6zwv", - "depends": ["raster", "Rcpp", "sf"] + "depends": ["Rcpp", "raster", "sf"] }, "exampletestr": { "name": "exampletestr", - "version": "1.7.1", - "sha256": "06vyrb6zhzmiwbiwgzjfgzzf04fznjqv5fpfgf06ir1p0wjgrnk6", + "version": "1.7.2", + "sha256": "1npsvx9ibg0v4v1pw89jk46sg1rqj58yxjgramz3rjf9d9dp9x61", "depends": ["checkmate", "fs", "magrittr", "purrr", "readr", "rlang", "roxygen2", "rstudioapi", "strex", "stringr", "styler", "usethis", "withr"] }, "exams": { "name": "exams", - "version": "2.4-0", - "sha256": "0g2m51i7lf62hy4v9ns3l7bv3jh367fwi6hgz94iw7n8pjhkh47v", + "version": "2.4-1", + "sha256": "1ld2j22kxgbx3d9nmhzb0cnmb5a1pz1skx6y87i6ifmjhm1ib78q", "depends": ["base64enc", "knitr", "rmarkdown"] }, + "exams_forge": { + "name": "exams.forge", + "version": "1.0.10", + "sha256": "0kj6c26nhzvwqdfc61hfssq8mwm665ay0p4ycn1161d3ixm7p9j9", + "depends": ["MASS", "base64enc", "exams", "extraDistr", "knitr", "magrittr", "polynom", "psych", "rjson", "rstudioapi", "spelling", "stranslate", "stringdist", "stringr", "tinytex", "xml2", "xtable", "yaml"] + }, "exams_mylearn": { "name": "exams.mylearn", "version": "1.4", @@ -59747,19 +60401,19 @@ "name": "excursions", "version": "2.5.8", "sha256": "0mirg44xhrb7h30blnb4hdfl5h96k5v28ll1awajrjmnrgwssx6a", - "depends": ["fmesher", "Matrix", "sp", "withr"] + "depends": ["Matrix", "fmesher", "sp", "withr"] }, "exdex": { "name": "exdex", "version": "1.2.3", "sha256": "1vmbk52gxay0604jqmiqgm5zffnx1x5f5x3k0dajyxn3qlvqqrp6", - "depends": ["chandwich", "Rcpp", "RcppArmadillo", "RcppRoll"] + "depends": ["Rcpp", "RcppArmadillo", "RcppRoll", "chandwich"] }, "exdqlm": { "name": "exdqlm", "version": "0.1.3", "sha256": "1mflapsbi67jabimqbysr0rcgi8bvn05sgmf5ykr9hmvhs16pf0x", - "depends": ["brms", "coda", "crch", "dlm", "FNN", "GeneralizedHyperbolic", "HyperbolicDist", "LaplacesDemon", "magic", "tictoc", "truncnorm"] + "depends": ["FNN", "GeneralizedHyperbolic", "HyperbolicDist", "LaplacesDemon", "brms", "coda", "crch", "dlm", "magic", "tictoc", "truncnorm"] }, "executablePackeR": { "name": "executablePackeR", @@ -59781,21 +60435,21 @@ }, "exiftoolr": { "name": "exiftoolr", - "version": "0.2.4", - "sha256": "0ybxz6dw7kmd1638kp5qllfczdcpz9r06da1jqww4gfz4rw7q821", + "version": "0.2.6", + "sha256": "05gdmyn01br93smw5gxc0jvfhrr9x2ly0jbfrcfvf3r2bw3kjwnr", "depends": ["backports", "curl", "data_table", "jsonlite", "zip"] }, "expDB": { "name": "expDB", "version": "0.1.0", "sha256": "0h7f9127vrd45lg7k0bkgq3cghxwv2z11p4pak20pakk13g82hj4", - "depends": ["DBI", "dplyr", "lubridate", "magrittr", "png", "readxl", "reshape2", "rlang", "RSQLite", "stringr", "tibble", "tidyr", "tidyverse", "weaana"] + "depends": ["DBI", "RSQLite", "dplyr", "lubridate", "magrittr", "png", "readxl", "reshape2", "rlang", "stringr", "tibble", "tidyr", "tidyverse", "weaana"] }, "expSBM": { "name": "expSBM", "version": "1.3.5", "sha256": "0k8nkwqrcmmhv0x8a2np1rm5cyc9glyvndwdbnp03v0wrg8121sw", - "depends": ["blockmodels", "gtools", "mclust", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "blockmodels", "gtools", "mclust"] }, "expandFunctions": { "name": "expandFunctions", @@ -59807,7 +60461,7 @@ "name": "expectreg", "version": "0.53", "sha256": "0g5py2096dyrcnvgmmba6g796ky150xk63ny6h6ylmajqfcypm1a", - "depends": ["BayesX", "colorspace", "fields", "Matrix", "mboost", "quadprog", "Rcpp", "RcppEigen"] + "depends": ["BayesX", "Matrix", "Rcpp", "RcppEigen", "colorspace", "fields", "mboost", "quadprog"] }, "experDesign": { "name": "experDesign", @@ -59825,7 +60479,7 @@ "name": "experiment", "version": "1.2.1", "sha256": "0lzxwpcz7m4wngfw0wyazkhh4icn9zjd8jmgf6ym2zzk3xc4dji1", - "depends": ["boot", "MASS"] + "depends": ["MASS", "boot"] }, "experimentr": { "name": "experimentr", @@ -59855,19 +60509,19 @@ "name": "explor", "version": "0.3.10", "sha256": "102rjnllk5xxsik42dd8m1rryz5y2h2dwmidy2jy3zlylgc4dhdr", - "depends": ["dplyr", "DT", "formatR", "ggplot2", "highr", "RColorBrewer", "scatterD3", "shiny", "tidyr"] + "depends": ["DT", "RColorBrewer", "dplyr", "formatR", "ggplot2", "highr", "scatterD3", "shiny", "tidyr"] }, "exploratory": { "name": "exploratory", "version": "0.3.31", "sha256": "0m8visp57v2bgfbi3n6ywz2z7djd6bnd19hcz0jl2fjw9w5sw3hy", - "depends": ["data_table", "DT", "ggplot2", "ggridges", "lemon", "lm_beta", "mediation", "remotes", "shiny", "shinydashboard", "weights"] + "depends": ["DT", "data_table", "ggplot2", "ggridges", "lemon", "lm_beta", "mediation", "remotes", "shiny", "shinydashboard", "weights"] }, "explore": { "name": "explore", "version": "1.3.1", "sha256": "0ays8gj7ba5rdih2hszgfz0asxsmx2jxna1cxv2ahni8rjr3h632", - "depends": ["cli", "dplyr", "DT", "forcats", "ggplot2", "gridExtra", "magrittr", "palmerpenguins", "plotly", "rlang", "rmarkdown", "rpart", "rpart_plot", "shiny", "stringr", "tibble"] + "depends": ["DT", "cli", "dplyr", "forcats", "ggplot2", "gridExtra", "magrittr", "palmerpenguins", "plotly", "rlang", "rmarkdown", "rpart", "rpart_plot", "shiny", "stringr", "tibble"] }, "exploreR": { "name": "exploreR", @@ -59891,7 +60545,7 @@ "name": "expowo", "version": "2.0", "sha256": "08w64l73vc83dk7himn7sr487ivjhn5cgql8vqw30vdksxz3nyi5", - "depends": ["cowplot", "data_table", "dplyr", "flora", "ggplot2", "magrittr", "plyr", "PupillometryR", "R_utils", "RColorBrewer", "rnaturalearth", "scales", "sf", "sp", "tibble", "viridisLite"] + "depends": ["PupillometryR", "RColorBrewer", "R_utils", "cowplot", "data_table", "dplyr", "flora", "ggplot2", "magrittr", "plyr", "rnaturalearth", "scales", "sf", "sp", "tibble", "viridisLite"] }, "expperm": { "name": "expperm", @@ -59927,7 +60581,7 @@ "name": "extBatchMarking", "version": "1.0.1", "sha256": "0ls0h5zfnd5k4r90adzpq39l5lmb6k1nb90d58c4mfzfnms2zhji", - "depends": ["doParallel", "foreach", "optimbase", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "optimbase"] }, "extRC": { "name": "extRC", @@ -59945,7 +60599,7 @@ "name": "extRemes", "version": "2.1-4", "sha256": "12mphdq9zi0r07x3gpj5dg4687hwnjx42d9a392rjbbsgvv2r96f", - "depends": ["distillery", "Lmoments"] + "depends": ["Lmoments", "distillery"] }, "extendedFamily": { "name": "extendedFamily", @@ -59975,7 +60629,7 @@ "name": "extrafont", "version": "0.19", "sha256": "13dbrlf54nbyfz3z2snz7x4m6rfnnhk2l8kkwpgcagzi5lar13sf", - "depends": ["extrafontdb", "Rttf2pt1"] + "depends": ["Rttf2pt1", "extrafontdb"] }, "extrafontdb": { "name": "extrafontdb", @@ -60017,7 +60671,7 @@ "name": "extremeStat", "version": "1.5.9", "sha256": "19ayk8nx6yb14mhgglhy3mq606mm17r3is0x6apxqic7vadvmiqg", - "depends": ["berryFunctions", "evd", "evir", "extRemes", "fExtremes", "ismev", "lmomco", "pbapply", "RColorBrewer", "Renext"] + "depends": ["RColorBrewer", "Renext", "berryFunctions", "evd", "evir", "extRemes", "fExtremes", "ismev", "lmomco", "pbapply"] }, "extremefit": { "name": "extremefit", @@ -60035,19 +60689,19 @@ "name": "extremis", "version": "1.2.1", "sha256": "11y3cb5z6vsrpdffdr44afz3is0ikxvpb81a8pwc7p8q63rxq4a2", - "depends": ["emplik", "evd", "MASS"] + "depends": ["MASS", "emplik", "evd"] }, "extremogram": { "name": "extremogram", "version": "1.0.2", "sha256": "13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358", - "depends": ["boot", "MASS"] + "depends": ["MASS", "boot"] }, "exuber": { "name": "exuber", "version": "1.0.2", "sha256": "1r3hb4nlaph1a2s0dmd1n22ax9xgmdrg75w2xlbf8v1j3ifamvl9", - "depends": ["cli", "doRNG", "doSNOW", "dplyr", "foreach", "generics", "ggplot2", "glue", "lubridate", "progress", "purrr", "Rcpp", "RcppArmadillo", "rlang", "tibble", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "cli", "doRNG", "doSNOW", "dplyr", "foreach", "generics", "ggplot2", "glue", "lubridate", "progress", "purrr", "rlang", "tibble", "tidyr"] }, "exvatools": { "name": "exvatools", @@ -60083,7 +60737,7 @@ "name": "eyelinkReader", "version": "1.0.1", "sha256": "0gbppd017dc93g3z3b9l885rr1r470jh7gvi89hd7nn5asba5zgz", - "depends": ["dplyr", "fs", "ggplot2", "Rcpp", "RcppProgress", "rlang", "stringr", "tidyr"] + "depends": ["Rcpp", "RcppProgress", "dplyr", "fs", "ggplot2", "rlang", "stringr", "tidyr"] }, "eyelinker": { "name": "eyelinker", @@ -60101,7 +60755,7 @@ "name": "ez", "version": "4.4-0", "sha256": "0a58s94x576dfz7wcbivrr2hmdh5x1vy16zwkqp9fmdzqx38pagq", - "depends": ["car", "ggplot2", "lme4", "MASS", "Matrix", "mgcv", "plyr", "reshape2", "scales", "stringr"] + "depends": ["MASS", "Matrix", "car", "ggplot2", "lme4", "mgcv", "plyr", "reshape2", "scales", "stringr"] }, "ez_combat": { "name": "ez.combat", @@ -60119,7 +60773,7 @@ "name": "ezEDA", "version": "0.1.1", "sha256": "1qcgvcjksdajn2rhv52bgqz3n0lnxynjdx4gwhkgsy29ffa0sq2c", - "depends": ["dplyr", "GGally", "ggplot2", "magrittr", "purrr", "rlang", "scales", "tidyr"] + "depends": ["GGally", "dplyr", "ggplot2", "magrittr", "purrr", "rlang", "scales", "tidyr"] }, "ezcox": { "name": "ezcox", @@ -60137,7 +60791,7 @@ "name": "ezknitr", "version": "0.6.3", "sha256": "07cznigqndqly24lh3jdk3zq1r4xflivgdfhrh7mmhr83lqy1cha", - "depends": ["knitr", "markdown", "R_utils"] + "depends": ["R_utils", "knitr", "markdown"] }, "ezmmek": { "name": "ezmmek", @@ -60155,7 +60809,7 @@ "name": "ezr", "version": "0.1.5", "sha256": "0r4zq0864xpnmczg1zpaasi348j1fllrn0rqfa5fmjh245chcpd4", - "depends": ["data_table", "DT", "ggplot2", "ggridges", "moments", "shiny", "shinydashboard", "weights"] + "depends": ["DT", "data_table", "ggplot2", "ggridges", "moments", "shiny", "shinydashboard", "weights"] }, "f1dataR": { "name": "f1dataR", @@ -60173,13 +60827,13 @@ "name": "fAssets", "version": "4023.85", "sha256": "1yrs3mfq8ym5pdmf6236xwnc8176z7j36f2bzrrwdfp7kz2gq0id", - "depends": ["ecodist", "energy", "fBasics", "fMultivar", "MASS", "mvnormtest", "robustbase", "sn", "timeDate", "timeSeries"] + "depends": ["MASS", "ecodist", "energy", "fBasics", "fMultivar", "mvnormtest", "robustbase", "sn", "timeDate", "timeSeries"] }, "fBasics": { "name": "fBasics", "version": "4032.96", "sha256": "14461d6ac8hcn1x3srh45a4s5imafqb0xy8bn5l6d0qwhw4njmg1", - "depends": ["gss", "MASS", "spatial", "stabledist", "timeDate", "timeSeries"] + "depends": ["MASS", "gss", "spatial", "stabledist", "timeDate", "timeSeries"] }, "fBonds": { "name": "fBonds", @@ -60197,7 +60851,7 @@ "name": "fDMA", "version": "2.2.7", "sha256": "02710ynd3y13pkbypmqh7lid9g3xn282kxf59yr5p3d76384z0gg", - "depends": ["doParallel", "foreach", "forecast", "gplots", "iterators", "itertools", "png", "psych", "Rcpp", "RcppArmadillo", "tseries", "xts", "zoo"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "forecast", "gplots", "iterators", "itertools", "png", "psych", "tseries", "xts", "zoo"] }, "fExtremes": { "name": "fExtremes", @@ -60209,13 +60863,13 @@ "name": "fGarch", "version": "4033.92", "sha256": "038lcx1sxkldqvmy9y14gmmbkqn4gqzlnff80s11fny004h6hdf8", - "depends": ["cvar", "fastICA", "fBasics", "Matrix", "timeDate", "timeSeries"] + "depends": ["Matrix", "cvar", "fBasics", "fastICA", "timeDate", "timeSeries"] }, "fHMM": { "name": "fHMM", "version": "1.3.1", "sha256": "1ha935ibhz4iicyx3azlk867pkrmj4lrjs1rsyqljf46zd63nfan", - "depends": ["checkmate", "cli", "foreach", "MASS", "oeli", "padr", "pracma", "progress", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "checkmate", "cli", "foreach", "oeli", "padr", "pracma", "progress"] }, "fICA": { "name": "fICA", @@ -60233,7 +60887,7 @@ "name": "fMRIscrub", "version": "0.14.5", "sha256": "1k0ixg82sgngmpbpl2b57lhamm19bfgcxszrwpf5qkvrh83ab3gs", - "depends": ["cellWise", "e1071", "expm", "fMRItools", "gamlss", "MASS", "pesel", "robustbase"] + "depends": ["MASS", "cellWise", "e1071", "expm", "fMRItools", "gamlss", "pesel", "robustbase"] }, "fMRItools": { "name": "fMRItools", @@ -60257,13 +60911,13 @@ "name": "fPASS", "version": "1.0.0", "sha256": "0xrvkcgbzd0xkrxc5p18bhfb5hlf5kxrqyjpy4482bjhr3rr714f", - "depends": ["dplyr", "expm", "face", "gamm4", "gss", "lifecycle", "magrittr", "MASS", "Matrix", "mgcv", "nlme", "purrr", "rlang", "stringr", "testthat"] + "depends": ["MASS", "Matrix", "dplyr", "expm", "face", "gamm4", "gss", "lifecycle", "magrittr", "mgcv", "nlme", "purrr", "rlang", "stringr", "testthat"] }, "fPortfolio": { "name": "fPortfolio", "version": "4023.84", "sha256": "0vk9j8yk2nkz28gb2nh1jrfrqk6n77jm0qfa3j1y65l2rbya0rvg", - "depends": ["fAssets", "fBasics", "fCopulae", "kernlab", "MASS", "quadprog", "Rglpk", "rneos", "robustbase", "Rsolnp", "slam", "timeDate", "timeSeries"] + "depends": ["MASS", "Rglpk", "Rsolnp", "fAssets", "fBasics", "fCopulae", "kernlab", "quadprog", "rneos", "robustbase", "slam", "timeDate", "timeSeries"] }, "fRLR": { "name": "fRLR", @@ -60275,7 +60929,7 @@ "name": "fRegression", "version": "4021.83", "sha256": "12xwq90rch8s8jk3m4ckk6bxjf5phwx8hjwxjdsk2r07afvfc2zi", - "depends": ["fBasics", "lmtest", "MASS", "mgcv", "nnet", "polspline", "timeDate", "timeSeries"] + "depends": ["MASS", "fBasics", "lmtest", "mgcv", "nnet", "polspline", "timeDate", "timeSeries"] }, "fSRM": { "name": "fSRM", @@ -60305,7 +60959,7 @@ "name": "fabMix", "version": "5.1", "sha256": "12d19qjjrdpihprqjd5x2iirn33rmfkl6i9zcyani7vv6b8cpaxp", - "depends": ["coda", "corrplot", "doParallel", "foreach", "ggplot2", "label_switching", "MASS", "mclust", "mvtnorm", "RColorBrewer", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "RColorBrewer", "Rcpp", "RcppArmadillo", "coda", "corrplot", "doParallel", "foreach", "ggplot2", "label_switching", "mclust", "mvtnorm"] }, "fabPrediction": { "name": "fabPrediction", @@ -60323,13 +60977,13 @@ "name": "fabisearch", "version": "0.0.4.5", "sha256": "0yxmw7d7j3llcfs4d0dn2vv4ajalwz0qxrg7bqgql8dvwrb9jgkh", - "depends": ["doParallel", "doRNG", "foreach", "NMF", "reshape2", "rgl"] + "depends": ["NMF", "doParallel", "doRNG", "foreach", "reshape2", "rgl"] }, "fable": { "name": "fable", "version": "0.3.4", "sha256": "0bzw9c68dpx048ihff9sy40d7aiqdqrspfrfyj9pd1pj3brn3blv", - "depends": ["distributional", "dplyr", "fabletools", "Rcpp", "rlang", "tibble", "tidyr", "tsibble"] + "depends": ["Rcpp", "distributional", "dplyr", "fabletools", "rlang", "tibble", "tidyr", "tsibble"] }, "fable_ata": { "name": "fable.ata", @@ -60341,7 +60995,7 @@ "name": "fable.prophet", "version": "0.1.0", "sha256": "12y2k05plg6d6lgqk6617q6z5m6xz33zdsjh56k86h230qqw68rp", - "depends": ["distributional", "dplyr", "fabletools", "lubridate", "prophet", "Rcpp", "rlang", "tsibble"] + "depends": ["Rcpp", "distributional", "dplyr", "fabletools", "lubridate", "prophet", "rlang", "tsibble"] }, "fableCount": { "name": "fableCount", @@ -60353,7 +61007,7 @@ "name": "fabletools", "version": "0.4.2", "sha256": "12s6x32m9nn6jriy7biqkzp62njbmih6h2hybx5jmcy17pccw5rr", - "depends": ["distributional", "dplyr", "generics", "ggdist", "ggplot2", "lifecycle", "progressr", "R6", "rlang", "scales", "tibble", "tidyr", "tidyselect", "tsibble", "vctrs"] + "depends": ["R6", "distributional", "dplyr", "generics", "ggdist", "ggplot2", "lifecycle", "progressr", "rlang", "scales", "tibble", "tidyr", "tidyselect", "tsibble", "vctrs"] }, "fabricatr": { "name": "fabricatr", @@ -60401,19 +61055,19 @@ "name": "facmodCS", "version": "1.0", "sha256": "1xav9lcjb5wd5h9cqyqn2ra3nxd60kq54g1vgmgfbvpmdj7hvrks", - "depends": ["data_table", "lattice", "PerformanceAnalytics", "RobStatTM", "robustbase", "sn", "tseries", "xts", "zoo"] + "depends": ["PerformanceAnalytics", "RobStatTM", "data_table", "lattice", "robustbase", "sn", "tseries", "xts", "zoo"] }, "facmodTS": { "name": "facmodTS", "version": "1.0", "sha256": "1c58w3my7zxcx04h8b284999r3jkd6l0sgwdzkjrkzm42lzw0dhm", - "depends": ["boot", "corpcor", "data_table", "lars", "lattice", "leaps", "PerformanceAnalytics", "PortfolioAnalytics", "quadprog", "R_cache", "RobStatTM", "robustbase", "sandwich", "sn", "xts", "zoo"] + "depends": ["PerformanceAnalytics", "PortfolioAnalytics", "R_cache", "RobStatTM", "boot", "corpcor", "data_table", "lars", "lattice", "leaps", "quadprog", "robustbase", "sandwich", "sn", "xts", "zoo"] }, "factReg": { "name": "factReg", "version": "1.0.0", "sha256": "06m3ir145342lyqdp25fbcg8s4cdbg2xh4dl1291hfx2pd6zxgsz", - "depends": ["glmnet", "mathjaxr", "Matrix", "rrBLUP"] + "depends": ["Matrix", "glmnet", "mathjaxr", "rrBLUP"] }, "factiv": { "name": "factiv", @@ -60425,7 +61079,7 @@ "name": "factoextra", "version": "1.0.7", "sha256": "1allvdjhd3pq8xz30b1cymwcik5iaahghrjrlnn54cwkfhfg0kv2", - "depends": ["abind", "cluster", "dendextend", "FactoMineR", "ggplot2", "ggpubr", "ggrepel", "reshape2", "tidyr"] + "depends": ["FactoMineR", "abind", "cluster", "dendextend", "ggplot2", "ggpubr", "ggrepel", "reshape2", "tidyr"] }, "factoptd": { "name": "factoptd", @@ -60437,7 +61091,7 @@ "name": "factor.switching", "version": "1.4", "sha256": "1w1diks1ar4nncfz8in7h9vdndsadnanqamxahsbx3d2fjga5vh2", - "depends": ["coda", "HDInterval", "lpSolve", "MCMCpack"] + "depends": ["HDInterval", "MCMCpack", "coda", "lpSolve"] }, "factor256": { "name": "factor256", @@ -60467,7 +61121,7 @@ "name": "factorstochvol", "version": "1.1.0", "sha256": "15ki0kaqam97zlm0mgl8pf2swrcqw46d5816aavwmn6jw2banksm", - "depends": ["corrplot", "GIGrvg", "Rcpp", "RcppArmadillo", "stochvol"] + "depends": ["GIGrvg", "Rcpp", "RcppArmadillo", "corrplot", "stochvol"] }, "factory": { "name": "factory", @@ -60479,7 +61133,7 @@ "name": "factset.analyticsapi.engines", "version": "3.0.1", "sha256": "0v96z837dii1q7mbpd48zwpl2qjzqnhignb80g0xkc4iygsnrrms", - "depends": ["caTools", "httr", "jsonlite", "R6", "rlang"] + "depends": ["R6", "caTools", "httr", "jsonlite", "rlang"] }, "factset_protobuf_stach_v2": { "name": "factset.protobuf.stach.v2", @@ -60491,18 +61145,18 @@ "name": "factset.protobuf.stachextensions", "version": "1.0.4", "sha256": "1bs39wylva1zpa8m3b0sdrdszqqxszl1rlwyli400a9zcm7xpwvq", - "depends": ["jsonlite", "R6", "stringr"] + "depends": ["R6", "jsonlite", "stringr"] }, "fad": { "name": "fad", "version": "0.9-1", "sha256": "19j8n13r50sc1srpi4vj58h15yp89im2x7ga5323rmwklx1yj6zg", - "depends": ["Matrix", "Rcpp", "RcppEigen", "RSpectra"] + "depends": ["Matrix", "RSpectra", "Rcpp", "RcppEigen"] }, "faersquarterlydata": { "name": "faersquarterlydata", - "version": "1.1.0", - "sha256": "0qld9d56qwcs6xh1248b7ssarwfqk8rvipiflzhpcy5fb4gzh43i", + "version": "1.2.0", + "sha256": "1qh96k0jkx75707jx7r6cqfj8xskp5vqgqkki3riarz31m6fhznf", "depends": ["data_table", "dplyr", "stringr", "tableone", "tibble", "tidyr", "xml2"] }, "fail": { @@ -60545,13 +61199,13 @@ "name": "fake", "version": "1.4.0", "sha256": "1w852a5ywybsdyvlll2dvrj17isjmiwjwhi43vml7j1k0lv9m86v", - "depends": ["huge", "igraph", "MASS", "Rdpack", "withr"] + "depends": ["MASS", "Rdpack", "huge", "igraph", "withr"] }, "fakemake": { "name": "fakemake", "version": "1.11.1", "sha256": "1ykav6z3pm54zrp7afkxlfidx9bgdjslzsnjzbx6vl7r479z6ql7", - "depends": ["fritools", "igraph", "MakefileR"] + "depends": ["MakefileR", "fritools", "igraph"] }, "fakir": { "name": "fakir", @@ -60587,7 +61241,7 @@ "name": "famSKATRC", "version": "1.1.0", "sha256": "1xbh0by4sjxrmy00v1svcj3lb98p9krpncbhpjbli1jd2p47yk60", - "depends": ["bdsmatrix", "CompQuadForm", "coxme", "kinship2"] + "depends": ["CompQuadForm", "bdsmatrix", "coxme", "kinship2"] }, "familial": { "name": "familial", @@ -60605,7 +61259,7 @@ "name": "fanc", "version": "2.3.11", "sha256": "0lvzp18r5facwbbvjf00zgrlzhr4dp8f6f87fmy04dgqwj7pzwhh", - "depends": ["ellipse", "Matrix"] + "depends": ["Matrix", "ellipse"] }, "fancycut": { "name": "fancycut", @@ -60641,13 +61295,13 @@ "name": "fanyi", "version": "0.0.7", "sha256": "1wl5sgnk154ivmnwdmp7bqm3q30rplc1c2gqfj3w3g3wlnzalvaa", - "depends": ["digest", "ggfun", "httr2", "jsonlite", "openssl", "purrr", "rentrez", "rlang", "SSEparser", "uuid", "yulab_utils"] + "depends": ["SSEparser", "digest", "ggfun", "httr2", "jsonlite", "openssl", "purrr", "rentrez", "rlang", "uuid", "yulab_utils"] }, "faoutlier": { "name": "faoutlier", "version": "0.7.6", "sha256": "0dd8k5s0yv047p10jisqz13nflby4y0dg97r0nbjygzcq1ryx2bs", - "depends": ["lattice", "lavaan", "MASS", "mirt", "mvtnorm", "pbapply", "sem"] + "depends": ["MASS", "lattice", "lavaan", "mirt", "mvtnorm", "pbapply", "sem"] }, "faq": { "name": "faq", @@ -60683,7 +61337,7 @@ "name": "farrell", "version": "0.2.1", "sha256": "0i546w5p40j9wqiq7qvbxw0426msavbdpnh258jcg6bagc6bywh8", - "depends": ["Benchmarking", "data_table", "dplyr", "DT", "magrittr", "miniUI", "readr", "rlang", "shiny", "shinycssloaders", "shinyWidgets", "tibble"] + "depends": ["Benchmarking", "DT", "data_table", "dplyr", "magrittr", "miniUI", "readr", "rlang", "shiny", "shinyWidgets", "shinycssloaders", "tibble"] }, "farver": { "name": "farver", @@ -60713,7 +61367,7 @@ "name": "fasstr", "version": "0.5.2", "sha256": "1r2xgxzzjc78d5grlpapc52b11qw0d01c1fahcvfccxjby51dywx", - "depends": ["dplyr", "e1071", "fitdistrplus", "ggplot2", "lubridate", "openxlsx", "PearsonDS", "plyr", "purrr", "RcppRoll", "scales", "tidyhydat", "tidyr", "zyp"] + "depends": ["PearsonDS", "RcppRoll", "dplyr", "e1071", "fitdistrplus", "ggplot2", "lubridate", "openxlsx", "plyr", "purrr", "scales", "tidyhydat", "tidyr", "zyp"] }, "fastAFT": { "name": "fastAFT", @@ -60723,15 +61377,15 @@ }, "fastDummies": { "name": "fastDummies", - "version": "1.7.3", - "sha256": "0sm02pxbabckxpi3mn36h5bz2wx5pyx7a1dhc2abc4c7fwpihsng", + "version": "1.7.4", + "sha256": "026xc1wrzgwyhs1h1bdn7yy56mnpr5rr9bkwljpzmhzgcx5lv44m", "depends": ["data_table", "stringr", "tibble"] }, "fastFMM": { "name": "fastFMM", "version": "0.2.0", "sha256": "1crgl5961c0k1bq4d3xsl38hrwi3cayf1lj7pprbvdd1y3nyvz8b", - "depends": ["cAIC4", "dplyr", "ggplot2", "gridExtra", "lme4", "lmeresampler", "lsei", "magrittr", "MASS", "Matrix", "mgcv", "mvtnorm", "progress", "refund", "Rfast", "stringr"] + "depends": ["MASS", "Matrix", "Rfast", "cAIC4", "dplyr", "ggplot2", "gridExtra", "lme4", "lmeresampler", "lsei", "magrittr", "mgcv", "mvtnorm", "progress", "refund", "stringr"] }, "fastGHQuad": { "name": "fastGHQuad", @@ -60763,23 +61417,17 @@ "sha256": "1vw9x00gslqgjfz55a60kizz8y02jifgf3fw7dv9lxm207vd2wxq", "depends": ["Rcpp"] }, - "fastLaplace": { - "name": "fastLaplace", - "version": "0.0.2", - "sha256": "172irl97sxkc5m1rk2kxxl8hkb1yf0029k9szkw9qyz0ki8d657w", - "depends": ["bbmle", "fields", "RSpectra"] - }, "fastLink": { "name": "fastLink", "version": "0.6.1", "sha256": "1fjf47c0bpfmrg428p3qgd4m91dpf8500sp758mrp241v5n0lfx9", - "depends": ["adagio", "data_table", "doParallel", "dplyr", "foreach", "gtools", "Matrix", "plotrix", "Rcpp", "RcppArmadillo", "RcppEigen", "stringdist", "stringi", "stringr"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "adagio", "data_table", "doParallel", "dplyr", "foreach", "gtools", "plotrix", "stringdist", "stringi", "stringr"] }, "fastLogisticRegressionWrap": { "name": "fastLogisticRegressionWrap", "version": "1.2.0", "sha256": "0vyb43632xhm9g52025ic8b8fmznpidsdwnaraj9vzysrim2v1r6", - "depends": ["checkmate", "MASS", "Rcpp", "RcppEigen", "RcppNumerical"] + "depends": ["MASS", "Rcpp", "RcppEigen", "RcppNumerical", "checkmate"] }, "fastM": { "name": "fastM", @@ -60815,13 +61463,13 @@ "name": "fastRG", "version": "0.3.2", "sha256": "1ig6z8azl2vsl79nfs3s4f9v1f6f27vzc0kxb9zmvkpx3hfnlm7k", - "depends": ["dplyr", "ellipsis", "ggplot2", "glue", "igraph", "Matrix", "RSpectra", "tibble", "tidygraph", "tidyr"] + "depends": ["Matrix", "RSpectra", "dplyr", "ellipsis", "ggplot2", "glue", "igraph", "tibble", "tidygraph", "tidyr"] }, "fastRhockey": { "name": "fastRhockey", "version": "0.4.0", "sha256": "1xw4ylrsf9wylym79svazrmw2c9fmqk8n0sz1vypsm29dsic879k", - "depends": ["cli", "data_table", "dplyr", "glue", "httr", "janitor", "jsonlite", "lubridate", "magrittr", "progressr", "purrr", "Rcpp", "RcppParallel", "rlang", "rvest", "stringr", "tibble", "tidyr"] + "depends": ["Rcpp", "RcppParallel", "cli", "data_table", "dplyr", "glue", "httr", "janitor", "jsonlite", "lubridate", "magrittr", "progressr", "purrr", "rlang", "rvest", "stringr", "tibble", "tidyr"] }, "fastSOM": { "name": "fastSOM", @@ -60833,13 +61481,13 @@ "name": "fastTS", "version": "1.0.1", "sha256": "16icpdhrqx34q189iqkdpbxd95lhvsb39z4xz2b3lq80pbcri0i0", - "depends": ["dplyr", "ncvreg", "RcppRoll", "rlang", "yardstick"] + "depends": ["RcppRoll", "dplyr", "ncvreg", "rlang", "yardstick"] }, "fastText": { "name": "fastText", "version": "1.0.4", "sha256": "1mrdiqj8pplyygsga1plx8b731i915lzjxhzslkbz6qk2jrj7632", - "depends": ["data_table", "ggplot2", "glue", "Rcpp"] + "depends": ["Rcpp", "data_table", "ggplot2", "glue"] }, "fastTextR": { "name": "fastTextR", @@ -60849,9 +61497,9 @@ }, "fastTopics": { "name": "fastTopics", - "version": "0.6-163", - "sha256": "1nir53ich0xkpclrw34ry4mwih9s4vr7qv8xy6511ny43awznikm", - "depends": ["ashr", "cowplot", "dplyr", "ggplot2", "ggrepel", "gtools", "htmlwidgets", "irlba", "Matrix", "pbapply", "plotly", "progress", "quadprog", "Rcpp", "RcppArmadillo", "RcppParallel", "Rtsne", "uwot"] + "version": "0.6-192", + "sha256": "17dydlgwzdd4n0d4xjz64z8w4vrmrfn3lqx128840x7zvgg0kg38", + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "RhpcBLASctl", "Rtsne", "ashr", "cowplot", "dplyr", "ggplot2", "ggrepel", "gtools", "htmlwidgets", "irlba", "pbapply", "plotly", "progress", "quadprog", "uwot"] }, "fastWavelets": { "name": "fastWavelets", @@ -60869,7 +61517,7 @@ "name": "fastadi", "version": "0.1.1", "sha256": "1hvi430ws1yzw10fp4z177wc1bnj11pxmvjsbmx0p54bcbb3a32a", - "depends": ["ellipsis", "glue", "logger", "LRMF3", "Matrix", "Rcpp", "RcppArmadillo", "RSpectra"] + "depends": ["LRMF3", "Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "ellipsis", "glue", "logger"] }, "fastai": { "name": "fastai", @@ -60899,13 +61547,13 @@ "name": "fastcmh", "version": "0.2.7", "sha256": "0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl", - "depends": ["bindata", "Rcpp"] + "depends": ["Rcpp", "bindata"] }, "fastcmprsk": { "name": "fastcmprsk", "version": "1.24.5", "sha256": "1ymg79y913h4s55h1pbmbx0hx40khc0mq6348awzqjy8pjhz1mdl", - "depends": ["dynpred", "foreach", "Matrix", "survival"] + "depends": ["Matrix", "dynpred", "foreach", "survival"] }, "fastcox": { "name": "fastcox", @@ -60917,7 +61565,7 @@ "name": "fastcpd", "version": "0.14.3", "sha256": "0b5xlx80nlbmkp8h4rnz0367zxn2hlwpcb4zid5jq3q32rv8r6sz", - "depends": ["fastglm", "forecast", "glmnet", "Matrix", "progress", "Rcpp", "RcppArmadillo", "RcppClock", "testthat", "tseries"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppClock", "fastglm", "forecast", "glmnet", "progress", "testthat", "tseries"] }, "fastdigest": { "name": "fastdigest", @@ -60935,19 +61583,19 @@ "name": "fasterize", "version": "1.0.5", "sha256": "1d63q77hfbn2ly8cwsik4gaavdhidpi7idf7qj2y5bi9xhd10kyl", - "depends": ["raster", "Rcpp", "RcppArmadillo", "wk"] + "depends": ["Rcpp", "RcppArmadillo", "raster", "wk"] }, "fastglm": { "name": "fastglm", "version": "0.0.3", "sha256": "0283kgk81cxbii7ljmp1rzqg5mzkvf7cj7lflhhhkgj5ljqina2i", - "depends": ["BH", "bigmemory", "Rcpp", "RcppEigen"] + "depends": ["BH", "Rcpp", "RcppEigen", "bigmemory"] }, "fastglmpca": { "name": "fastglmpca", "version": "0.1-103", "sha256": "1yzk91g9aszazfm4gp70wfs21dbdi9dxlh95ylh839pivs78cvrc", - "depends": ["daarem", "distr", "Matrix", "MatrixExtra", "Rcpp", "RcppArmadillo", "RcppParallel"] + "depends": ["Matrix", "MatrixExtra", "Rcpp", "RcppArmadillo", "RcppParallel", "daarem", "distr"] }, "fastkmedoids": { "name": "fastkmedoids", @@ -60959,7 +61607,7 @@ "name": "fastkqr", "version": "1.0.0", "sha256": "18zawflm5fam28y8f5ygf26nmi5if3h765grb5skkzibxnmpxdff", - "depends": ["dotCall64", "MASS", "Matrix", "rlang"] + "depends": ["MASS", "Matrix", "dotCall64", "rlang"] }, "fastliu": { "name": "fastliu", @@ -61007,7 +61655,7 @@ "name": "fastpos", "version": "0.5.1", "sha256": "0a55fydlcn2h27vizv4w3gma26v2a32li81x09hvk519yfy8ph1k", - "depends": ["lifecycle", "MASS", "pbmcapply", "plyr", "Rcpp", "RcppArmadillo", "RcppProgress", "tibble"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "RcppProgress", "lifecycle", "pbmcapply", "plyr", "tibble"] }, "fastqcr": { "name": "fastqcr", @@ -61037,7 +61685,7 @@ "name": "fastshap", "version": "0.1.1", "sha256": "1j6bnkv4q8n85xlvzm5p6p4yg8wdp6an6skbvdif5g9c376hzqb2", - "depends": ["foreach", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "foreach"] }, "fasttime": { "name": "fasttime", @@ -61073,7 +61721,7 @@ "name": "fauxpas", "version": "0.5.2", "sha256": "1xhyws6nr9ayir4sykvhyaf1aprx9rjm2xyb3p5ikd26l5hp7l44", - "depends": ["httpcode", "R6", "whisker"] + "depends": ["R6", "httpcode", "whisker"] }, "faviconPlease": { "name": "faviconPlease", @@ -61091,13 +61739,13 @@ "name": "fbRads", "version": "17.0.0", "sha256": "0kfbd0dc0k72qj5vd1bm11lqi6p61z7fmr8507fsc6ggcr97vw76", - "depends": ["bit64", "data_table", "digest", "jsonlite", "logger", "plyr", "RCurl"] + "depends": ["RCurl", "bit64", "data_table", "digest", "jsonlite", "logger", "plyr"] }, "fbar": { "name": "fbar", "version": "0.6.0", "sha256": "005725xiz6k868hrj12ryq3xlyin2r94n0yychimjzhfsppx2zba", - "depends": ["assertthat", "dplyr", "magrittr", "Matrix", "purrr", "rlang", "ROI", "ROI_plugin_ecos", "stringr", "tibble", "tidyr"] + "depends": ["Matrix", "ROI", "ROI_plugin_ecos", "assertthat", "dplyr", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"] }, "fbati": { "name": "fbati", @@ -61109,13 +61757,13 @@ "name": "fbnet", "version": "1.0.3", "sha256": "0jz3jbd2qna4mnas0mjs32wvlk6vzlw61qb9fql65al40401b23x", - "depends": ["assertthat", "igraph", "paramlink", "Rsolnp"] + "depends": ["Rsolnp", "assertthat", "igraph", "paramlink"] }, "fbroc": { "name": "fbroc", "version": "0.4.1", "sha256": "1v73wl3yckcqx43fz1lzcsy6v08vmbmi7yi623yhgqywixxv2bx3", - "depends": ["ggplot2", "Rcpp"] + "depends": ["Rcpp", "ggplot2"] }, "fbst": { "name": "fbst", @@ -61139,31 +61787,25 @@ "name": "fcaR", "version": "1.2.2", "sha256": "1vrysvdjqs62hx14kq31jmi2r093k5pcjjbrzvvpdmnllcv1s673", - "depends": ["dplyr", "forcats", "fractional", "ggplot2", "glue", "magrittr", "Matrix", "POSetR", "purrr", "R6", "Rcpp", "registry", "rlang", "settings", "stringr", "tibble", "tidyr", "tikzDevice"] + "depends": ["Matrix", "POSetR", "R6", "Rcpp", "dplyr", "forcats", "fractional", "ggplot2", "glue", "magrittr", "purrr", "registry", "rlang", "settings", "stringr", "tibble", "tidyr", "tikzDevice"] }, "fcci": { "name": "fcci", "version": "1.0.1", "sha256": "02q6q0q7fqdbp20fdf33jbkh0aj9nzl6dwysr0nn146ciz3vqgin", - "depends": ["assertthat", "Rcpp", "rlang"] + "depends": ["Rcpp", "assertthat", "rlang"] }, "fcfdr": { "name": "fcfdr", "version": "1.0.0", "sha256": "16mnpr64x00qwbgq9pw69k941yb0i7mx7ncsilahicprxqyfpfww", - "depends": ["bigsplines", "cowplot", "data_table", "dplyr", "fields", "ggplot2", "hexbin", "Hmisc", "locfdr", "MASS", "polyCub", "spatstat_geom"] + "depends": ["Hmisc", "MASS", "bigsplines", "cowplot", "data_table", "dplyr", "fields", "ggplot2", "hexbin", "locfdr", "polyCub", "spatstat_geom"] }, "fcirt": { "name": "fcirt", "version": "0.1.0", "sha256": "1wiyiz51mkm5kd95xmpvlwng51awpp4y133dd5q88mnafrxyij1h", - "depends": ["BH", "numDeriv", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] - }, - "fcl": { - "name": "fcl", - "version": "0.1.0", - "sha256": "0rskl9q7z5k5q17m3c5w4pdc96m6fdag7nkkjmyyh43wbm4bjb0a", - "depends": ["xts", "ymd"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "numDeriv", "rstan", "rstantools"] }, "fclust": { "name": "fclust", @@ -61211,7 +61853,7 @@ "name": "fdANOVA", "version": "0.1.2", "sha256": "1pycq5a4czqzi8wcfmlc9ncg827j7n0qxyj90wcv39nbcrnl3da1", - "depends": ["doBy", "doParallel", "fda", "foreach", "ggplot2", "magic", "MASS"] + "depends": ["MASS", "doBy", "doParallel", "fda", "foreach", "ggplot2", "magic"] }, "fdWasserstein": { "name": "fdWasserstein", @@ -61229,7 +61871,7 @@ "name": "fda.usc", "version": "2.1.0", "sha256": "1s13zssm7x3hg1k928r5jkjz35bflb1nzz4c7b4xr0x1j8qg3d60", - "depends": ["doParallel", "fda", "foreach", "iterators", "kSamples", "MASS", "mgcv", "nlme"] + "depends": ["MASS", "doParallel", "fda", "foreach", "iterators", "kSamples", "mgcv", "nlme"] }, "fdaACF": { "name": "fdaACF", @@ -61247,43 +61889,43 @@ "name": "fdaMocca", "version": "0.1-1", "sha256": "0y54d8a38d5hjnh8iw2r4zl2d2xz72hjddhxbar91jk6zf3kzpsy", - "depends": ["doParallel", "fda", "foreach", "Matrix", "mvtnorm"] + "depends": ["Matrix", "doParallel", "fda", "foreach", "mvtnorm"] }, "fdaPDE": { "name": "fdaPDE", - "version": "1.1-18", - "sha256": "0l5kv7vwwjbnfq13l74ij860fpp45hgvwqpxfnpqbxdkq2lfymcn", - "depends": ["Matrix", "plot3D", "Rcpp", "RcppEigen", "rgl"] + "version": "1.1-19", + "sha256": "0vd1rhh2ks6s738g4d687v3ndpjvb8lypzfpfqpwbkjzx29g60wn", + "depends": ["Matrix", "Rcpp", "RcppEigen", "plot3D", "rgl"] }, "fdaPOIFD": { "name": "fdaPOIFD", "version": "1.0.3", "sha256": "0c773hidrg69gs9lzdcwf4hzzmid3kwf73pw6c807y1b4lgiai20", - "depends": ["FastGP", "fdapace", "ggplot2", "magrittr", "MASS", "patchwork", "reshape2", "tibble"] + "depends": ["FastGP", "MASS", "fdapace", "ggplot2", "magrittr", "patchwork", "reshape2", "tibble"] }, "fdaSP": { "name": "fdaSP", "version": "1.1.1", "sha256": "1vhnrw2shxnpd2vnqkjq8lqx344p3z488x8wzpkb8hxnxzmfp08w", - "depends": ["doParallel", "foreach", "ks", "pracma", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "doParallel", "foreach", "ks", "pracma"] }, "fdacluster": { "name": "fdacluster", "version": "0.3.0", "sha256": "0mpnhd6qp4hif1sbxv52dyg3yfff8icn8xz7sximcjn00g81p343", - "depends": ["cli", "cluster", "dbscan", "dplyr", "fdasrvf", "forcats", "furrr", "ggplot2", "lpSolve", "nloptr", "progressr", "purrr", "Rcpp", "RcppArmadillo", "rlang", "tibble", "tidyr", "withr"] + "depends": ["Rcpp", "RcppArmadillo", "cli", "cluster", "dbscan", "dplyr", "fdasrvf", "forcats", "furrr", "ggplot2", "lpSolve", "nloptr", "progressr", "purrr", "rlang", "tibble", "tidyr", "withr"] }, "fdaconcur": { "name": "fdaconcur", - "version": "0.1.2", - "sha256": "1ajmm8lrd9lnl8smkjrnnsnfjmb0dnbhrglg1gdcajvr937rhjsa", - "depends": ["fdapace"] + "version": "0.1.3", + "sha256": "1aflg0fc5x0brkz87jhz27xcx8fkimx7g9nsd99j3w9ck2sqrdki", + "depends": ["Rcpp", "RcppEigen", "fdapace"] }, "fdadensity": { "name": "fdadensity", "version": "0.1.2", "sha256": "1i2xzchlsixgjzyfmbv547sy6mq90xrnyc2kpd11wwfgfrpj1ix3", - "depends": ["fdapace", "Rcpp"] + "depends": ["Rcpp", "fdapace"] }, "fdaoutlier": { "name": "fdaoutlier", @@ -61293,27 +61935,27 @@ }, "fdapace": { "name": "fdapace", - "version": "0.5.9", - "sha256": "16j731d7y290xk5qvld59pb78mrch5i61szcf3j79kkirmz6hh8f", - "depends": ["Hmisc", "MASS", "Matrix", "numDeriv", "pracma", "Rcpp", "RcppEigen"] + "version": "0.6.0", + "sha256": "1jrvbln0dcyiagdym60g0dwdhfh43vzyvxwrb8dhk2mbhpc80ghx", + "depends": ["Hmisc", "MASS", "Matrix", "Rcpp", "RcppEigen", "numDeriv", "pracma"] }, "fdapaceShiny": { "name": "fdapaceShiny", "version": "1.0.5", "sha256": "1cy1rcmsyr78q3wqkaw3lvqzlr07n7djrqqpwm3y8xz60fybs8p6", - "depends": ["bs4Dash", "config", "dplyr", "DT", "fdapace", "ggplot2", "golem", "htmltools", "magrittr", "plotly", "purrr", "reshape2", "shiny", "shinyjs", "shinyWidgets", "stringr", "tidyr"] + "depends": ["DT", "bs4Dash", "config", "dplyr", "fdapace", "ggplot2", "golem", "htmltools", "magrittr", "plotly", "purrr", "reshape2", "shiny", "shinyWidgets", "shinyjs", "stringr", "tidyr"] }, "fdarep": { "name": "fdarep", "version": "0.1.1", "sha256": "1y3nj3l4ymaikvjk9jhy0hxhlrv7sjr1vvhf70v38bkwzkxbcwxy", - "depends": ["fdapace", "Hmisc", "MASS", "Matrix", "numDeriv", "pracma", "Rcpp", "RcppEigen"] + "depends": ["Hmisc", "MASS", "Matrix", "Rcpp", "RcppEigen", "fdapace", "numDeriv", "pracma"] }, "fdasrvf": { "name": "fdasrvf", - "version": "2.2.0", - "sha256": "1dkwhb5in9dqw5wh2zx05s8ijk351ln2nr05bfkbymx9rdfrqbg5", - "depends": ["cli", "coda", "doParallel", "fields", "foreach", "lpSolve", "Matrix", "mvtnorm", "Rcpp", "RcppArmadillo", "rlang", "tolerance", "viridisLite"] + "version": "2.3.1", + "sha256": "0n6r0j07dhzffa0phnmjwdiqq76m37a8w6aqaa5lvbws5lilvh4n", + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "cli", "coda", "doParallel", "fields", "foreach", "lpSolve", "mvtnorm", "rlang", "tolerance", "viridisLite"] }, "fdatest": { "name": "fdatest", @@ -61323,9 +61965,9 @@ }, "fddm": { "name": "fddm", - "version": "0.5-2", - "sha256": "0sh3qnsakl02wpzwhxyqdikn7xx5crh401w3d149ww2jxvagjmsf", - "depends": ["Rcpp"] + "version": "1.0-2", + "sha256": "1nlnn409frlhhc47z33bgxdcix20csl4bk85x4ybhknvdfffyh1a", + "depends": ["Formula", "Rcpp", "RcppEigen"] }, "fdicdata": { "name": "fdicdata", @@ -61337,13 +61979,13 @@ "name": "fdm2id", "version": "0.9.9", "sha256": "09qxjr2svqv1r49s4q5wk1pzm95lxfm1w0pr4a60zv2p9qrljsxk", - "depends": ["arules", "arulesViz", "FactoMineR", "mclust", "nnet", "pls"] + "depends": ["FactoMineR", "arules", "arulesViz", "mclust", "nnet", "pls"] }, "fdq": { "name": "fdq", "version": "0.12", "sha256": "198nsyzv0ni2mjx12wik58c7z5vrc1mfk80k3iv94dz1iq9fprqf", - "depends": ["data_table", "Fgmutils", "ggplot2", "randomcoloR", "sqldf"] + "depends": ["Fgmutils", "data_table", "ggplot2", "randomcoloR", "sqldf"] }, "fdrDiscreteNull": { "name": "fdrDiscreteNull", @@ -61367,7 +62009,7 @@ "name": "fds", "version": "1.8", "sha256": "1284vncixrzrz9x6b52gslrbrbia07sd0xac7nwdqhp5f5v5wfi0", - "depends": ["rainbow", "RCurl"] + "depends": ["RCurl", "rainbow"] }, "fdth": { "name": "fdth", @@ -61385,7 +62027,7 @@ "name": "feather", "version": "0.3.5", "sha256": "1gxd0h2m56sjjlzn4dry6s13nddxc4l5i11gsvavaf2dwbahdzsh", - "depends": ["hms", "Rcpp", "tibble"] + "depends": ["Rcpp", "hms", "tibble"] }, "feature": { "name": "feature", @@ -61439,7 +62081,7 @@ "name": "fect", "version": "1.0.0", "sha256": "1m2ap1ispc2z1qdj341vx1knsjkqfzi6ys4z3hd9bp4g7bi0xsyx", - "depends": ["abind", "doParallel", "doRNG", "fixest", "foreach", "future", "GGally", "ggplot2", "gridExtra", "MASS", "mvtnorm", "panelView", "Rcpp", "RcppArmadillo"] + "depends": ["GGally", "MASS", "Rcpp", "RcppArmadillo", "abind", "doParallel", "doRNG", "fixest", "foreach", "future", "ggplot2", "gridExtra", "mvtnorm", "panelView"] }, "federalregister": { "name": "federalregister", @@ -61451,7 +62093,7 @@ "name": "fedmatch", "version": "2.0.6", "sha256": "06clj31qk6ama56jmd9vpq5h1v7250aixgvaywh5j8fsrp1l7qg2", - "depends": ["BH", "data_table", "forcats", "magrittr", "purrr", "Rcpp", "scales", "SnowballC", "stringdist", "stringr"] + "depends": ["BH", "Rcpp", "SnowballC", "data_table", "forcats", "magrittr", "purrr", "scales", "stringdist", "stringr"] }, "fedregs": { "name": "fedregs", @@ -61475,7 +62117,7 @@ "name": "feisr", "version": "1.3.0", "sha256": "1i89w3n365k4fwgiifb2f68ag11f96rrxqxradrjvbmi7r80md99", - "depends": ["dplyr", "Formula", "plm", "Rdpack"] + "depends": ["Formula", "Rdpack", "dplyr", "plm"] }, "felp": { "name": "felp", @@ -61493,7 +62135,7 @@ "name": "fence", "version": "1.0", "sha256": "18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q", - "depends": ["fields", "ggplot2", "lme4", "MASS", "sae", "snow", "snowfall"] + "depends": ["MASS", "fields", "ggplot2", "lme4", "sae", "snow", "snowfall"] }, "fergm": { "name": "fergm", @@ -61509,9 +62151,9 @@ }, "ferrn": { "name": "ferrn", - "version": "0.0.2", - "sha256": "0yxw18yzj5j2fpj4rf9flmmng4s2ldgx4yaywa2hrclbnl43c578", - "depends": ["dplyr", "geozoo", "gganimate", "ggforce", "ggplot2", "ggrepel", "magrittr", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "tourr"] + "version": "0.1.0", + "sha256": "1x3vislwcjlcvgd4dinzi6skqgp4ic1mq4srqkwrk1xr90l2wywn", + "depends": ["GpGp", "cli", "dplyr", "gganimate", "ggforce", "ggplot2", "ggrepel", "glue", "magrittr", "progress", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "tourr"] }, "fertilmodel": { "name": "fertilmodel", @@ -61553,7 +62195,7 @@ "name": "ffp", "version": "0.2.2", "sha256": "05mzhg2hj51x8588nvwqamvrgd24haxw4mq7qn62zaznvxnwsr3m", - "depends": ["assertthat", "crayon", "dplyr", "forcats", "ggdist", "ggplot2", "lubridate", "magrittr", "mvtnorm", "NlcOptim", "nloptr", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "vctrs"] + "depends": ["NlcOptim", "assertthat", "crayon", "dplyr", "forcats", "ggdist", "ggplot2", "lubridate", "magrittr", "mvtnorm", "nloptr", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "vctrs"] }, "ffscrapr": { "name": "ffscrapr", @@ -61589,7 +62231,7 @@ "name": "fgeo.analyze", "version": "1.1.14", "sha256": "0pnmvq6imnffvr4qlmygmmw18g33s81f5jrrs7n4ahwi0qmf5qaj", - "depends": ["dplyr", "fgeo_tool", "glue", "lubridate", "magrittr", "MASS", "purrr", "rlang", "tibble", "tidyr", "withr"] + "depends": ["MASS", "dplyr", "fgeo_tool", "glue", "lubridate", "magrittr", "purrr", "rlang", "tibble", "tidyr", "withr"] }, "fgeo_plot": { "name": "fgeo.plot", @@ -61619,13 +62261,13 @@ "name": "fglsnet", "version": "1.0", "sha256": "00qn4k4xm1zfkz77lys468c1mfx3vyfjkf19wdbcvgssrmf6w0xd", - "depends": ["lmtest", "MASS", "Matrix", "matrixcalc", "network", "sandwich", "sna"] + "depends": ["MASS", "Matrix", "lmtest", "matrixcalc", "network", "sandwich", "sna"] }, "fgm": { "name": "fgm", "version": "1.0", "sha256": "0i6lbqxxjq78dql14qwqs7slnn0kyls2g3a9biabny2narwf6n3m", - "depends": ["fdapace", "JGL"] + "depends": ["JGL", "fdapace"] }, "fgui": { "name": "fgui", @@ -61643,7 +62285,7 @@ "name": "fiberLD", "version": "0.1-8", "sha256": "03f6gx8scpvb06im6m1vd5nakr16925504w4n44fwrbkbmmx48kx", - "depends": ["BH", "doParallel", "foreach", "Matrix", "Rcpp", "RcppArmadillo", "VGAM"] + "depends": ["BH", "Matrix", "Rcpp", "RcppArmadillo", "VGAM", "doParallel", "foreach"] }, "fic": { "name": "fic", @@ -61661,19 +62303,19 @@ "name": "fido", "version": "1.1.1", "sha256": "1q46m55y8ni51b96ckc70ap11w6vjq13wivsm8q37aj464845yy4", - "depends": ["BH", "dplyr", "ggplot2", "purrr", "Rcpp", "RcppEigen", "RcppNumerical", "RcppZiggurat", "rlang", "tidybayes", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppNumerical", "RcppZiggurat", "dplyr", "ggplot2", "purrr", "rlang", "tidybayes", "tidyr"] }, "fields": { "name": "fields", - "version": "15.2", - "sha256": "0gdddigzbzlhrbp6h2ma5b05m68pmggrkcd80hzgjbjj64ihy9qz", + "version": "16.2", + "sha256": "1r5kld45dgigbaavcx3c88ci0jd66zxan3fh2wypwvj7sl69a41r", "depends": ["maps", "spam", "viridisLite"] }, "fiery": { "name": "fiery", "version": "1.2.1", "sha256": "127ighz937rgqbg0kiq7wrms7z3r5pf77ixcfa7if35mcv7yrg8s", - "depends": ["cli", "crayon", "future", "glue", "httpuv", "later", "parallelly", "R6", "reqres", "rlang", "stringi", "uuid"] + "depends": ["R6", "cli", "crayon", "future", "glue", "httpuv", "later", "parallelly", "reqres", "rlang", "stringi", "uuid"] }, "fig": { "name": "fig", @@ -61707,15 +62349,15 @@ }, "file2meco": { "name": "file2meco", - "version": "0.7.1", - "sha256": "0ksk7clcya24l3ji4p5k4876d1pg8dwihs7vmlwf8hkp3vqg048b", - "depends": ["ape", "dplyr", "magrittr", "Matrix", "microeco", "rhdf5", "tidyr", "yaml"] + "version": "0.8.0", + "sha256": "15k3yg7kx63bwfj21xa8raca06bcc6sa2n1c0qkw5wz07apqmyvk", + "depends": ["Matrix", "ape", "dplyr", "magrittr", "microeco", "rhdf5", "tidyr", "yaml"] }, "filearray": { "name": "filearray", - "version": "0.1.6", - "sha256": "1xf48fgf70s9h5gjls8625m553lkdbinnz89nxn05l9wakhf5qgv", - "depends": ["BH", "digest", "fastmap", "Rcpp", "uuid"] + "version": "0.1.7", + "sha256": "06f209qvmhpj36xdxiqds5kpvxhac2mr7lci80i4bqik1brxpv17", + "depends": ["BH", "Rcpp", "digest", "fastmap", "uuid"] }, "filebin": { "name": "filebin", @@ -61731,15 +62373,15 @@ }, "filehash": { "name": "filehash", - "version": "2.4-5", - "sha256": "0b52bnsqp65s3r4aw9mvfwfnjmsrqq8ndcadwig547nn9mwy47iv", + "version": "2.4-6", + "sha256": "1cc1xq6vpk5cmsr4w5i6nvkx36grd38dds4lys4gmijlldml92sm", "depends": ["digest"] }, "filehashSQLite": { "name": "filehashSQLite", - "version": "0.2-6", - "sha256": "1758wpzq2h7biwpdlrqhi84k35fbpfpxnji6j79zisr825fqjkpq", - "depends": ["DBI", "filehash", "RSQLite"] + "version": "0.2-7", + "sha256": "1j1n9bsans8zi8fa5shri4k4ra1dmspxd5k9lxr8qjli24na0hhx", + "depends": ["DBI", "RSQLite", "filehash"] }, "filelock": { "name": "filelock", @@ -61771,22 +62413,16 @@ "sha256": "0p5vgrzbvipja9lgarygqphnr1z8vy9kl9n83jnfyvf0gp4ansl2", "depends": ["checkmate", "magrittr", "purrr", "rlang", "strex", "stringi", "stringr", "withr"] }, - "filibustr": { - "name": "filibustr", - "version": "0.2.1", - "sha256": "1q7307fwwrvpgf0ypkhs4ayg4m27vpf3kazsvnf73jk3gi33i0ki", - "depends": ["crul", "dplyr", "haven", "httr2", "lifecycle", "R_utils", "readr", "rlang", "rvest", "stringr", "tidyr", "tidyselect"] - }, "filling": { "name": "filling", "version": "0.2.3", "sha256": "17vk0pndsc8xhgp4zy5dfyc36pzk2hm5zk6xijdy4xaf7k5j4wls", - "depends": ["CVXR", "nabor", "Rcpp", "RcppArmadillo", "Rdpack", "ROptSpace", "RSpectra"] + "depends": ["CVXR", "ROptSpace", "RSpectra", "Rcpp", "RcppArmadillo", "Rdpack", "nabor"] }, "fillpattern": { "name": "fillpattern", - "version": "1.0.1", - "sha256": "0xysrb3yzvlag9zpsq7hhqqyrhwapnzc66d636wvxpsi4r50lp0w", + "version": "1.0.2", + "sha256": "0qwrzxjw4br9sbh0zxry72j6rgvb1s8cwvwqigf7dg1zi4hk4i74", "depends": ["ggplot2"] }, "fillr": { @@ -61799,7 +62435,7 @@ "name": "filterNHP", "version": "0.1.2", "sha256": "0kk6548nr5786ywa83v8by4c1n7ljh9sy4fshpfqizp49fv9zv22", - "depends": ["data_tree", "rclipboard", "shiny", "shinyBS", "shinyjs", "shinyWidgets"] + "depends": ["data_tree", "rclipboard", "shiny", "shinyBS", "shinyWidgets", "shinyjs"] }, "filters": { "name": "filters", @@ -61809,20 +62445,20 @@ }, "finalfit": { "name": "finalfit", - "version": "1.0.7", - "sha256": "04nskvkqd999wjxy7lkanrd4iyfn8xljagyafw1ai7mfiqxgmfag", - "depends": ["bdsmatrix", "boot", "broom", "dplyr", "forcats", "GGally", "ggplot2", "gridExtra", "lme4", "magrittr", "mice", "pillar", "pROC", "purrr", "scales", "stringr", "survival", "tidyr", "tidyselect"] + "version": "1.0.8", + "sha256": "0g0vrzdr0f591q0sh0an0rvbvss05cp5hghbh9jmcprlr018wbm4", + "depends": ["GGally", "bdsmatrix", "boot", "broom", "dplyr", "forcats", "ggplot2", "gridExtra", "lme4", "magrittr", "mice", "pROC", "pillar", "purrr", "scales", "stringr", "survival", "tidyr"] }, "finalsize": { "name": "finalsize", "version": "0.2.1", "sha256": "0sv174v36clz4blvk4d33rkg7w6ylf4a5j4q057z81kkdd0jr042", - "depends": ["checkmate", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "checkmate"] }, "finbif": { "name": "finbif", - "version": "0.9.6", - "sha256": "08vbs7s0d873033sw5nc3x6hmi21yvz0lvg4zcbv2ii40napwjsx", + "version": "0.9.7", + "sha256": "15bys4amh2hw6sz3bby61lrw6m1nb8jwrnz0m47cmlcz770acsaz", "depends": ["digest", "httr", "lutz"] }, "finbipartite": { @@ -61835,13 +62471,13 @@ "name": "finch", "version": "0.4.0", "sha256": "0q7riaxms460c6z2gb8i0q4pb348bnvry46bjd7pb9mh8fnl1i8b", - "depends": ["data_table", "digest", "EML", "hoardr", "xml2"] + "depends": ["EML", "data_table", "digest", "hoardr", "xml2"] }, "findGSEP": { "name": "findGSEP", "version": "1.2.0", "sha256": "0j1m54y46ls3s4097028lf7nj4i8xbfpbxhprqy88j886xwfq56x", - "depends": ["dplyr", "ggplot2", "pracma", "RColorBrewer", "scales"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "pracma", "scales"] }, "findInFiles": { "name": "findInFiles", @@ -61895,7 +62531,7 @@ "name": "fingerPro", "version": "1.1", "sha256": "1a1lj8gyrbgcg8hr03cj2bjzlaafddspri7abc83ys1raqwd4j68", - "depends": ["car", "GGally", "ggplot2", "gridExtra", "klaR", "MASS", "plyr", "Rcmdr", "Rcpp", "RcppGSL", "RcppProgress", "reshape", "rgl", "scales"] + "depends": ["GGally", "MASS", "Rcmdr", "Rcpp", "RcppGSL", "RcppProgress", "car", "ggplot2", "gridExtra", "klaR", "plyr", "reshape", "rgl", "scales"] }, "fingerprint": { "name": "fingerprint", @@ -61931,19 +62567,19 @@ "name": "finnsurveytext", "version": "1.0.0", "sha256": "0hi0b6i37lpfs2xhb0k1qdlm91mils1kl2dl9gz3qx5hz8f9342s", - "depends": ["dplyr", "ggplot2", "ggpubr", "ggraph", "gridExtra", "igraph", "magrittr", "RColorBrewer", "stopwords", "stringr", "textrank", "tibble", "tidyr", "udpipe", "wordcloud"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "ggpubr", "ggraph", "gridExtra", "igraph", "magrittr", "stopwords", "stringr", "textrank", "tibble", "tidyr", "udpipe", "wordcloud"] }, "finnts": { "name": "finnts", "version": "0.4.0", "sha256": "1cx9kl6dzkmrxb4i7vlkligx5p1q2jxinybmi1367hlpgafhv6js", - "depends": ["cli", "Cubist", "dials", "digest", "doParallel", "dplyr", "earth", "feasts", "foreach", "fs", "generics", "glmnet", "glue", "gtools", "hts", "kernlab", "lubridate", "magrittr", "modeltime", "parsnip", "plyr", "purrr", "recipes", "rsample", "rules", "snakecase", "stringr", "tibble", "tidyr", "tidyselect", "timetk", "tune", "vroom", "workflows"] + "depends": ["Cubist", "cli", "dials", "digest", "doParallel", "dplyr", "earth", "feasts", "foreach", "fs", "generics", "glmnet", "glue", "gtools", "hts", "kernlab", "lubridate", "magrittr", "modeltime", "parsnip", "plyr", "purrr", "recipes", "rsample", "rules", "snakecase", "stringr", "tibble", "tidyr", "tidyselect", "timetk", "tune", "vroom", "workflows"] }, "finreportr": { "name": "finreportr", "version": "1.0.4", "sha256": "145idg2c6qmqp29afalnhxxzky08j21dmm05mp3zf63aq9mq41d4", - "depends": ["curl", "dplyr", "httr", "rvest", "XBRL", "xml2"] + "depends": ["XBRL", "curl", "dplyr", "httr", "rvest", "xml2"] }, "fipio": { "name": "fipio", @@ -61955,7 +62591,7 @@ "name": "fipp", "version": "1.0.0", "sha256": "0wr3czwsqwa1bpdcjk0r1739vjanxc0fv0vnl3r5lgykrbhw9v3r", - "depends": ["matrixStats", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "matrixStats"] }, "firebase": { "name": "firebase", @@ -61985,7 +62621,7 @@ "name": "fishRman", "version": "1.2.3", "sha256": "1pyryc6pilyy68z7443gi6ixi8b0hy338l9zfw74isrxywbygy8n", - "depends": ["config", "countrycode", "dplyr", "ggplot2", "golem", "httr", "jsonlite", "maps", "sf", "shiny", "shinyBS", "shinyjs", "shinyWidgets", "viridis"] + "depends": ["config", "countrycode", "dplyr", "ggplot2", "golem", "httr", "jsonlite", "maps", "sf", "shiny", "shinyBS", "shinyWidgets", "shinyjs", "viridis"] }, "fishbc": { "name": "fishbc", @@ -62015,7 +62651,7 @@ "name": "fishmethods", "version": "1.12-1", "sha256": "0ladr3rl55v10kh0556725gygiw338mj3ncpifaij80rph99y66v", - "depends": ["boot", "bootstrap", "data_table", "lme4", "MASS", "numDeriv", "TMB"] + "depends": ["MASS", "TMB", "boot", "bootstrap", "data_table", "lme4", "numDeriv"] }, "fishtree": { "name": "fishtree", @@ -62045,13 +62681,13 @@ "name": "fitHeavyTail", "version": "0.2.0", "sha256": "18iqqn33sznw4c77rl6ryk57grary350ygr58vg062jg1hyxybrg", - "depends": ["ghyp", "ICSNP", "mvtnorm", "numDeriv"] + "depends": ["ICSNP", "ghyp", "mvtnorm", "numDeriv"] }, "fitODBOD": { "name": "fitODBOD", - "version": "1.5.1", - "sha256": "001lc33w3s6liyq558l44kd877bz6js1rkafbz1blgp8csb8ljxy", - "depends": ["bbmle", "hypergeo", "MASS", "mvtnorm"] + "version": "1.5.2", + "sha256": "1gmpdg07vadc0f17l7g9p5gda347bd183d26dlzi4pnx6ywjl4k8", + "depends": ["MASS", "Rdpack", "bbmle", "hypergeo", "mvtnorm"] }, "fitODBODRshiny": { "name": "fitODBODRshiny", @@ -62063,7 +62699,7 @@ "name": "fitPS", "version": "1.0.1", "sha256": "12qqr3d1fzypk0xsjnswhfp52phnhhqzwvj5grfgacjs5h41bz11", - "depends": ["doParallel", "dplyr", "foreach", "Hmisc", "iterators", "knitr", "ks", "pbapply", "Rdpack", "readxl", "VGAM"] + "depends": ["Hmisc", "Rdpack", "VGAM", "doParallel", "dplyr", "foreach", "iterators", "knitr", "ks", "pbapply", "readxl"] }, "fitPoly": { "name": "fitPoly", @@ -62081,7 +62717,7 @@ "name": "fitbitViz", "version": "1.0.6", "sha256": "021ggcfgcwr3l6ppjwfm3q489k9rni20f00mqpfsbh1xjvlrg0rz", - "depends": ["base64enc", "data_table", "ggplot2", "ggthemes", "glue", "hms", "httr", "jsonlite", "leafgl", "leaflet", "lifecycle", "lubridate", "magrittr", "paletteer", "patchwork", "raster", "rayshader", "reshape2", "rstudioapi", "scales", "sf", "terra", "varian", "viridis", "XML"] + "depends": ["XML", "base64enc", "data_table", "ggplot2", "ggthemes", "glue", "hms", "httr", "jsonlite", "leafgl", "leaflet", "lifecycle", "lubridate", "magrittr", "paletteer", "patchwork", "raster", "rayshader", "reshape2", "rstudioapi", "scales", "sf", "terra", "varian", "viridis"] }, "fitbitr": { "name": "fitbitr", @@ -62091,15 +62727,15 @@ }, "fitdistrplus": { "name": "fitdistrplus", - "version": "1.1-11", - "sha256": "0gdm06anjmihfj1d0yiqy36d887kmc0d8553pjl1f90bf4mly9r6", - "depends": ["MASS", "survival"] + "version": "1.2-1", + "sha256": "0n25b3f92pghkavk4j9l25v1k6wjwkmpyvxslf05ixpzkmd23d38", + "depends": ["MASS", "rlang", "survival"] }, "fitlandr": { "name": "fitlandr", "version": "0.1.0", "sha256": "077b97gwlzxmd4i4rsxrgqzlnwn7zf0y0wgcbihck1wvh7gjiara", - "depends": ["cli", "dplyr", "furrr", "future_apply", "ggplot2", "glue", "magrittr", "MASS", "numDeriv", "plotly", "R_utils", "Rfast", "rlang", "rootSolve", "simlandr", "SparseVFC", "tidyr"] + "depends": ["MASS", "R_utils", "Rfast", "SparseVFC", "cli", "dplyr", "furrr", "future_apply", "ggplot2", "glue", "magrittr", "numDeriv", "plotly", "rlang", "rootSolve", "simlandr", "tidyr"] }, "fitmix": { "name": "fitmix", @@ -62111,7 +62747,7 @@ "name": "fitode", "version": "0.1.1", "sha256": "18c5sgvkv9w370zli2kc2gdcbpnb3f5s3ivp0zyd6rqlwdy0c6cg", - "depends": ["bbmle", "coda", "Deriv", "deSolve", "MASS", "mvtnorm", "numDeriv"] + "depends": ["Deriv", "MASS", "bbmle", "coda", "deSolve", "mvtnorm", "numDeriv"] }, "fitplc": { "name": "fitplc", @@ -62129,19 +62765,19 @@ "name": "fitteR", "version": "0.2.0", "sha256": "0l33j69fdfpsp77a1vwqg07b65qaxs875r7lhy2bfi6mxgcklby9", - "depends": ["dplyr", "DT", "maxLik", "R_utils", "shiny"] + "depends": ["DT", "R_utils", "dplyr", "maxLik", "shiny"] }, "fitur": { "name": "fitur", "version": "0.6.2", "sha256": "0bx1w1bpz3i2ybwl386s8y8nxyqwk6w33aqyyw94aq6ink3bw2aw", - "depends": ["actuar", "DT", "e1071", "fitdistrplus", "ggplot2", "goftest", "miniUI", "rstudioapi", "shiny"] + "depends": ["DT", "actuar", "e1071", "fitdistrplus", "ggplot2", "goftest", "miniUI", "rstudioapi", "shiny"] }, "fitzRoy": { "name": "fitzRoy", - "version": "1.4.0", - "sha256": "07qk0kgbsrpjkfm9jqd5zsyg1lj96fj31a413qn7y66vpyljd3p3", - "depends": ["cli", "dplyr", "glue", "httr", "httr2", "jsonlite", "lifecycle", "lubridate", "magrittr", "purrr", "readr", "rlang", "rvest", "stringr", "tibble", "tidyr", "tidyselect", "xml2"] + "version": "1.5.0", + "sha256": "0fw0prfl6iivbsprv0qw13dg5ff80621ziwz5gcy012v6hsbpk25", + "depends": ["cli", "dplyr", "glue", "httr", "httr2", "janitor", "jsonlite", "lifecycle", "lubridate", "magrittr", "purrr", "readr", "rlang", "rvest", "stringr", "tibble", "tidyr", "tidyselect", "xml2"] }, "fivethirtyeight": { "name": "fivethirtyeight", @@ -62177,19 +62813,19 @@ "name": "fixest", "version": "0.12.1", "sha256": "1pqkwzcv8mjh00k0cl0na7izwhwsp6qpimbxmq5005vbhnwimrvw", - "depends": ["dreamerr", "nlme", "numDeriv", "Rcpp", "sandwich", "stringmagic"] + "depends": ["Rcpp", "dreamerr", "nlme", "numDeriv", "sandwich", "stringmagic"] }, "fixr": { "name": "fixr", "version": "0.1.0", "sha256": "074dr1l3bw8v1lrih1mc51dmx02kambis04r9jpx64vnpajjfv8p", - "depends": ["httr", "RCurl", "xml2"] + "depends": ["RCurl", "httr", "xml2"] }, "fixtuRes": { "name": "fixtuRes", "version": "0.1.3", "sha256": "1vmdbx1pfk4kcxq5q5hj4v6rz403xw66gpg6zpvrxkpcgkx2dwyz", - "depends": ["checkmate", "dplyr", "glue", "lubridate", "purrr", "R6", "rlang", "stringi", "yaml"] + "depends": ["R6", "checkmate", "dplyr", "glue", "lubridate", "purrr", "rlang", "stringi", "yaml"] }, "fizzbuzzR": { "name": "fizzbuzzR", @@ -62235,15 +62871,15 @@ }, "flap": { "name": "flap", - "version": "0.1.0", - "sha256": "0aa1ylzq6a5nbkzlyyydw213qfmd3nc8xk8acsrhjg6nxhw8lc5b", + "version": "0.2.0", + "sha256": "18afc26a5iyzcbaynqnvypls2nb24km7h5vlmal5njh3bkv8ypi7", "depends": ["corpcor"] }, "flare": { "name": "flare", "version": "1.7.0.1", "sha256": "1xvrbvq2y7zfp98ijal3z8y1w2xbzfcdykzw4pqc3mnh0qrhq2d5", - "depends": ["igraph", "lattice", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "igraph", "lattice"] }, "flashCard": { "name": "flashCard", @@ -62261,13 +62897,13 @@ "name": "flashier", "version": "1.0.7", "sha256": "08m5nmfzxg8ikswqz3w4fmiw0qixjy5hdwkxkm8nxflf4nkfgx06", - "depends": ["dplyr", "ebnm", "ggplot2", "irlba", "magrittr", "Matrix", "softImpute", "stringr", "tibble", "tidyr"] + "depends": ["Matrix", "dplyr", "ebnm", "ggplot2", "irlba", "magrittr", "softImpute", "stringr", "tibble", "tidyr"] }, "flashlight": { "name": "flashlight", "version": "0.9.0", "sha256": "0nyxx7zrqw8fgy1n81n30m80z7xwkydnhmxj6c22mq83md08rd8c", - "depends": ["cowplot", "dplyr", "ggplot2", "MetricsWeighted", "rlang", "rpart", "rpart_plot", "tibble", "tidyr", "tidyselect", "withr"] + "depends": ["MetricsWeighted", "cowplot", "dplyr", "ggplot2", "rlang", "rpart", "rpart_plot", "tibble", "tidyr", "tidyselect", "withr"] }, "flashr": { "name": "flashr", @@ -62291,7 +62927,7 @@ "name": "flatxml", "version": "0.1.1", "sha256": "1qsiqi8aszk9djlhysf6lcm41dq4pcw5jv6mdvb1mgxni7g3sgfv", - "depends": ["crayon", "httr", "RCurl", "xml2"] + "depends": ["RCurl", "crayon", "httr", "xml2"] }, "fledge": { "name": "fledge", @@ -62303,7 +62939,7 @@ "name": "flevr", "version": "0.0.4", "sha256": "1h1wnqd1fv6z4mfrchm5rv9x9s48vp67csf3a8gyj7gm3lppgnfm", - "depends": ["caret", "dplyr", "kernlab", "magrittr", "mvtnorm", "ranger", "rlang", "SuperLearner", "tibble"] + "depends": ["SuperLearner", "caret", "dplyr", "kernlab", "magrittr", "mvtnorm", "ranger", "rlang", "tibble"] }, "flexCWM": { "name": "flexCWM", @@ -62361,9 +62997,9 @@ }, "flexmsm": { "name": "flexmsm", - "version": "0.1.1", - "sha256": "07m2dsc1a4qschprcqljzv8kpqjl1bw0bkhqbcr821xrf1id0xxr", - "depends": ["GJRM", "matrixStats", "mgcv", "msm", "trust"] + "version": "0.1.2", + "sha256": "1kgbnic93b58xp5hirwpxv5x50y69fczqm023kah3g1jx2fw8i7g", + "depends": ["GJRM", "matrixStats", "mgcv", "trust"] }, "flexpolyline": { "name": "flexpolyline", @@ -62375,7 +63011,7 @@ "name": "flexrsurv", "version": "2.0.18", "sha256": "10l1xh43c7lkgxjpxis5zy66dji2ifxhc41vzqhpj8h6hqw052bv", - "depends": ["Epi", "Formula", "formula_tools", "Matrix", "numDeriv", "orthogonalsplinebasis", "R_utils", "statmod", "survival"] + "depends": ["Epi", "Formula", "Matrix", "R_utils", "formula_tools", "numDeriv", "orthogonalsplinebasis", "statmod", "survival"] }, "flexsiteboard": { "name": "flexsiteboard", @@ -62385,9 +63021,9 @@ }, "flexsurv": { "name": "flexsurv", - "version": "2.3", - "sha256": "1y31ghfn02fcpss3aliy5r7kk0a7h0h2krnj665h13y8jgqkc6j7", - "depends": ["assertthat", "deSolve", "dplyr", "generics", "ggplot2", "magrittr", "Matrix", "mstate", "muhaz", "mvtnorm", "numDeriv", "purrr", "quadprog", "Rcpp", "rlang", "rstpm2", "statmod", "survival", "tibble", "tidyr", "tidyselect"] + "version": "2.3.2", + "sha256": "1171m8rx98bdkij0vp1w87msfjvbqsrh4jkzpm39yz0vg8charsv", + "depends": ["Matrix", "Rcpp", "assertthat", "deSolve", "dplyr", "generics", "ggplot2", "magrittr", "mstate", "muhaz", "mvtnorm", "numDeriv", "purrr", "quadprog", "rlang", "rstpm2", "statmod", "survival", "tibble", "tidyr", "tidyselect"] }, "flexsurvcure": { "name": "flexsurvcure", @@ -62423,13 +63059,13 @@ "name": "flimo", "version": "0.1.5", "sha256": "00l0w9z1j2yy4sl1fly7lw4rrdwcwnb26va2d5vsvjldwcmsx5pd", - "depends": ["ggplot2", "JuliaConnectoR"] + "depends": ["JuliaConnectoR", "ggplot2"] }, "flintyR": { "name": "flintyR", "version": "0.1.0", "sha256": "1md0p3i9lny5sn1jjh8ss6bw4w7q8ydi6kh5smjbbgbn86qlcvwy", - "depends": ["assertthat", "doParallel", "foreach", "Rcpp", "RcppArmadillo", "testthat"] + "depends": ["Rcpp", "RcppArmadillo", "assertthat", "doParallel", "foreach", "testthat"] }, "flip": { "name": "flip", @@ -62465,7 +63101,7 @@ "name": "flipr", "version": "0.3.3", "sha256": "188kdgk390rh8wpfsvqbwpwa3dmwzlzv8sdgvfxl9f0ddbxasghb", - "depends": ["cli", "dials", "ggplot2", "magrittr", "optimParallel", "pbapply", "purrr", "R6", "Rcpp", "rgenoud", "rlang", "tibble", "usethis", "viridisLite", "withr"] + "depends": ["R6", "Rcpp", "cli", "dials", "ggplot2", "magrittr", "optimParallel", "pbapply", "purrr", "rgenoud", "rlang", "tibble", "usethis", "viridisLite", "withr"] }, "flipscores": { "name": "flipscores", @@ -62495,13 +63131,13 @@ "name": "flocker", "version": "1.0-0", "sha256": "19029by01jgwdlc0m4d05cfia8v0zfxf6k4aqm6wpvlbi7ap6hi6", - "depends": ["abind", "assertthat", "boot", "brms", "loo", "MASS", "matrixStats", "withr"] + "depends": ["MASS", "abind", "assertthat", "boot", "brms", "loo", "matrixStats", "withr"] }, "flood": { "name": "flood", "version": "0.1.1", "sha256": "0nlmjh2l7dij1aqd70hhj0m550knlin3am14azqkx4pacs1kir3p", - "depends": ["copula", "evd", "magrittr", "TLMoments"] + "depends": ["TLMoments", "copula", "evd", "magrittr"] }, "flora": { "name": "flora", @@ -62513,7 +63149,7 @@ "name": "florabr", "version": "1.2.0", "sha256": "0rfzvrsv4aai3ynwxvnqiki58gbjp4lwrr36kfnkn59bpicvxmzg", - "depends": ["data_table", "httr", "terra", "XML"] + "depends": ["XML", "data_table", "httr", "terra"] }, "flow": { "name": "flow", @@ -62531,13 +63167,13 @@ "name": "flowchart", "version": "0.4.0", "sha256": "1h34phpgx139v28rxgiyjl696k08lp7frh3sxizj97pix29j5yds", - "depends": ["dplyr", "Gmisc", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["Gmisc", "dplyr", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] }, "flowml": { "name": "flowml", "version": "0.1.3", "sha256": "1v26lncq6qqx7x2wnvaxwb88s7hgdwj9cv16kkzn4fnybwsmkw5g", - "depends": ["ABCanalysis", "caret", "data_table", "dplyr", "fastshap", "furrr", "future", "magrittr", "optparse", "purrr", "R6", "readr", "rjson", "rlang", "rsample", "stringr", "tibble", "tidyr", "vip"] + "depends": ["ABCanalysis", "R6", "caret", "data_table", "dplyr", "fastshap", "furrr", "future", "magrittr", "optparse", "purrr", "readr", "rjson", "rlang", "rsample", "stringr", "tibble", "tidyr", "vip"] }, "flowr": { "name": "flowr", @@ -62549,7 +63185,7 @@ "name": "flps", "version": "1.1.0", "sha256": "0pdf4czw5rdf5bcsbq7ncx0m5iz9dl0m5l8z3x799zs1svdlclfp", - "depends": ["ggplot2", "glue", "MASS", "mirt", "mvtnorm", "Rcpp", "rstan"] + "depends": ["MASS", "Rcpp", "ggplot2", "glue", "mirt", "mvtnorm", "rstan"] }, "flsa": { "name": "flsa", @@ -62559,8 +63195,8 @@ }, "fluidsynth": { "name": "fluidsynth", - "version": "1.0.0", - "sha256": "04jn17rxafrw47gc98c5k4jzsbdsml0brq85zr7xvijirnd15yxn", + "version": "1.0.1", + "sha256": "1vqi9p69wjsh9shhjg0rk025hf4rawj0piw5037y97ml3n858k2l", "depends": ["av", "rappdirs"] }, "fluoSurv": { @@ -62591,7 +63227,7 @@ "name": "flying", "version": "0.1.3", "sha256": "04wfcsbq8icvk1nnczvic5cp4nb40hxj3g6lasyb1dvhsh0svg0q", - "depends": ["kableExtra", "knitr", "Rcpp", "rmarkdown"] + "depends": ["Rcpp", "kableExtra", "knitr", "rmarkdown"] }, "fma": { "name": "fma", @@ -62609,7 +63245,7 @@ "name": "fmcmc", "version": "0.5-2", "sha256": "0swlghwsir1gjw5n2c8kfi5zh6bbqjhk7nnjds2b6656s8xdpr9a", - "depends": ["coda", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "coda"] }, "fmdates": { "name": "fmdates", @@ -62627,25 +63263,25 @@ "name": "fmeffects", "version": "0.1.3", "sha256": "0hw3jsq4s4rh66n9j3sll9sarnnbxp90ma6sqs9q4gjkm1qi1d1p", - "depends": ["checkmate", "cli", "cowplot", "data_table", "ggparty", "ggplot2", "partykit", "R6", "testthat"] + "depends": ["R6", "checkmate", "cli", "cowplot", "data_table", "ggparty", "ggplot2", "partykit", "testthat"] }, "fmerPack": { "name": "fmerPack", "version": "0.0-1", "sha256": "0p9jfgkzs97r6ya1x8ax7bza17b03grqxa22ja13s12vj0cdkv78", - "depends": ["abind", "flexmix", "glmnet", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "abind", "flexmix", "glmnet"] }, "fmesher": { "name": "fmesher", - "version": "0.1.6", - "sha256": "0dszz7a6asyjwwgq8ggqll48ndyfn14lndf77arl60ns3h7v3ygn", - "depends": ["dplyr", "lifecycle", "Matrix", "Rcpp", "rlang", "sf", "sp", "tibble", "withr"] + "version": "0.1.7", + "sha256": "1kwy04qs8pkjyd9ad55x8dr006z2nv0dyvgvhx15s3p3qhxgg6mm", + "depends": ["Matrix", "Rcpp", "dplyr", "lifecycle", "rlang", "sf", "sp", "tibble", "withr"] }, "fmf": { "name": "fmf", "version": "1.1.1", "sha256": "0b26040a39jys1z3h9mq9k7rjr0iyiialq442ir8vgzvmrh383cs", - "depends": ["C50", "caret", "dplyr", "e1071", "factoextra", "FactoMineR", "ggplot2", "kernlab", "Rcpp", "RcppArmadillo", "solitude"] + "depends": ["C50", "FactoMineR", "Rcpp", "RcppArmadillo", "caret", "dplyr", "e1071", "factoextra", "ggplot2", "kernlab", "solitude"] }, "fmpcloudr": { "name": "fmpcloudr", @@ -62655,15 +63291,15 @@ }, "fmri": { "name": "fmri", - "version": "1.9.12", - "sha256": "1cv5mxcdpyf05n5pcjdawl59j7f4k40386r4m38qf15vcy45zdfq", + "version": "1.9.12.1", + "sha256": "0fyvnc39la5wgd9232nw6lp6yi1v3nkjwzn0sbhm4rckknibb5s4", "depends": ["aws", "metafor", "nlme", "oro_nifti"] }, "fmriqa": { "name": "fmriqa", "version": "0.3.0", "sha256": "1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv", - "depends": ["ggplot2", "gridExtra", "imager", "optparse", "pracma", "RcppEigen", "reshape2", "RNifti", "tidyr", "viridisLite"] + "depends": ["RNifti", "RcppEigen", "ggplot2", "gridExtra", "imager", "optparse", "pracma", "reshape2", "tidyr", "viridisLite"] }, "fmsb": { "name": "fmsb", @@ -62681,19 +63317,19 @@ "name": "fmtr", "version": "1.6.5", "sha256": "1q565knjq8hzazli5skjvfd02jsh2c220hsrvc1h4dly666qvxvl", - "depends": ["common", "crayon", "Rcpp", "tibble"] + "depends": ["Rcpp", "common", "crayon", "tibble"] }, "fmx": { "name": "fmx", "version": "0.1.2", "sha256": "02f4b9vmnp2gr47ql6smxiv7x9as6p44fi4kvg6lcn1xd386hx6z", - "depends": ["goftest", "param2moment", "sn", "TukeyGH77", "VGAM"] + "depends": ["TukeyGH77", "VGAM", "goftest", "param2moment", "sn"] }, "fnets": { "name": "fnets", "version": "0.1.6", "sha256": "138r081mpgw1csm93xcrci3djd7mrcl6drsdr6cpjz1fdzv1whjy", - "depends": ["doParallel", "fields", "foreach", "igraph", "lpSolve", "MASS", "RColorBrewer"] + "depends": ["MASS", "RColorBrewer", "doParallel", "fields", "foreach", "igraph", "lpSolve"] }, "focusedMDS": { "name": "focusedMDS", @@ -62703,9 +63339,9 @@ }, "foghorn": { "name": "foghorn", - "version": "1.5.2", - "sha256": "1xmyl4m2chv2z6adfyzmv93zqjl0pxk364zy0jfym8vgnzrmcb26", - "depends": ["clisymbols", "crayon", "curl", "httr2", "rlang", "rvest", "tibble", "xml2"] + "version": "1.6.0", + "sha256": "1x3zgjy1pnjv0a2dra5a36fwg3lgq8yfqdm731r28kdwy6d1az85", + "depends": ["cli", "curl", "httr2", "rlang", "rvest", "tibble", "xml2"] }, "folders": { "name": "folders", @@ -62771,7 +63407,7 @@ "name": "foodwebWrapper", "version": "1.1.0", "sha256": "1gh1xs60bnm2g1d7dg67q683bzkh5ih1gz3psvv3dmygm5f1j1bc", - "depends": ["dplyr", "magrittr", "mvbutils", "R2HTML", "stringr", "textshaping", "tibble", "tidyverse"] + "depends": ["R2HTML", "dplyr", "magrittr", "mvbutils", "stringr", "textshaping", "tibble", "tidyverse"] }, "foolbox": { "name": "foolbox", @@ -62837,7 +63473,7 @@ "name": "foreSIGHT", "version": "1.2.0", "sha256": "1nw93xs10qfj489i9xlamjrk8rf73b7511gdsg49vvbgjp4945mr", - "depends": ["cmaes", "cowplot", "dfoptim", "directlabels", "fields", "GA", "ggplot2", "jsonlite", "lattice", "Matrix", "moments", "mvtnorm", "progress", "rcorpora", "Rcpp", "RGN", "rlang", "scales", "SoilHyP", "viridisLite"] + "depends": ["GA", "Matrix", "RGN", "Rcpp", "SoilHyP", "cmaes", "cowplot", "dfoptim", "directlabels", "fields", "ggplot2", "jsonlite", "lattice", "moments", "mvtnorm", "progress", "rcorpora", "rlang", "scales", "viridisLite"] }, "foreach": { "name": "foreach", @@ -62853,9 +63489,9 @@ }, "forecast": { "name": "forecast", - "version": "8.22.0", - "sha256": "09s5fdyzc6f5l8dy7ynjmd6l5fk3wvz59q0kfv2fd9da5c1mqd8w", - "depends": ["colorspace", "fracdiff", "generics", "ggplot2", "lmtest", "magrittr", "nnet", "Rcpp", "RcppArmadillo", "timeDate", "tseries", "urca", "zoo"] + "version": "8.23.0", + "sha256": "100qi8cgr5dz3qskrgrsjn77m7szs5rfpgqfdwlgp67l708x9hzz", + "depends": ["Rcpp", "RcppArmadillo", "colorspace", "fracdiff", "generics", "ggplot2", "lmtest", "magrittr", "nnet", "timeDate", "tseries", "urca", "withr", "zoo"] }, "forecastHybrid": { "name": "forecastHybrid", @@ -62885,12 +63521,12 @@ "name": "forecasteR", "version": "2.0.2", "sha256": "0pwgkkzyfzjjp9qrx4xx3b68617a18i3an3gcpprkg4mwpsvcj0x", - "depends": ["colourpicker", "config", "DT", "echarts4r", "forecast", "golem", "htmltools", "htmlwidgets", "keras", "lubridate", "rlang", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "stringr", "zoo"] + "depends": ["DT", "colourpicker", "config", "echarts4r", "forecast", "golem", "htmltools", "htmlwidgets", "keras", "lubridate", "rlang", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "stringr", "zoo"] }, "foreign": { "name": "foreign", - "version": "0.8-86", - "sha256": "1qf3x1vacc4sdcmw4mbh0251ii4xd8z1xmmd9isak75j100i4ad7", + "version": "0.8-87", + "sha256": "0mi8vf3bsvrn2nh9kxjlgsmvxrc8icw51scr0mscqyp8r3saq90s", "depends": [] }, "forensIT": { @@ -62909,7 +63545,7 @@ "name": "forestControl", "version": "0.2.2", "sha256": "0g81ml12xhq2a868vlpsybpsqz7p4hn9jnxh3dvq6g4k1hc1292x", - "depends": ["dplyr", "magrittr", "purrr", "Rcpp", "tibble"] + "depends": ["Rcpp", "dplyr", "magrittr", "purrr", "tibble"] }, "forestError": { "name": "forestError", @@ -62941,6 +63577,12 @@ "sha256": "0pvh50sdiscgkshlmyngz7pkmpaz03c8x3gfjp5ir52f8710ngb7", "depends": ["blockCV", "dplyr", "forcats", "ggplot2", "ggridges", "glue", "magrittr", "mvnfast", "patchwork", "purrr", "rlang", "sf", "sfheaders", "snakecase", "stringr", "tibble", "tidyr", "yardstick"] }, + "forested": { + "name": "forested", + "version": "0.1.0", + "sha256": "0aaikr5n2x1ap78diyvn56hnshdqk65x7ykrrx4mjb3w4c66jw9b", + "depends": [] + }, "forestinventory": { "name": "forestinventory", "version": "1.0.0", @@ -62949,15 +63591,15 @@ }, "forestly": { "name": "forestly", - "version": "0.1.0", - "sha256": "1pbq60agq62aiqgg48r92zpk89y74x80hwidqivjrmjkpjx92sgj", - "depends": ["brew", "crosstalk", "glue", "htmltools", "metalite", "metalite_ae", "reactable", "reactR", "rlang"] + "version": "0.1.1", + "sha256": "0ihn48bmnlhjqwvaxzinfdbnzjz9cqn3amw0gnyqzdlai81md3dx", + "depends": ["brew", "crosstalk", "ggplot2", "glue", "htmltools", "metalite", "metalite_ae", "reactR", "reactable", "rlang", "uuid"] }, "forestmangr": { "name": "forestmangr", "version": "0.9.6", "sha256": "0l8av1vg8dyrb15m08gby13qfalwcfizfn3jc2avvga8inyag0c5", - "depends": ["broom", "car", "dplyr", "FinCal", "ggdendro", "ggplot2", "ggpmisc", "ggthemes", "gridExtra", "magrittr", "miniUI", "minpack_lm", "plyr", "purrr", "rlang", "scales", "shiny", "systemfit", "tibble", "tidyr"] + "depends": ["FinCal", "broom", "car", "dplyr", "ggdendro", "ggplot2", "ggpmisc", "ggthemes", "gridExtra", "magrittr", "miniUI", "minpack_lm", "plyr", "purrr", "rlang", "scales", "shiny", "systemfit", "tibble", "tidyr"] }, "forestmodel": { "name": "forestmodel", @@ -63027,9 +63669,9 @@ }, "formatters": { "name": "formatters", - "version": "0.5.6", - "sha256": "1mq84hj9la0m0007l9l1bzc7abrk5mg5hv4jbv5kp8nwwax5dx5g", - "depends": ["checkmate", "htmltools"] + "version": "0.5.8", + "sha256": "0skfmizlr028j2cy2f03vgs1gdsvlk5r67cj1pmm9zky5nymdh1k", + "depends": ["checkmate", "htmltools", "lifecycle"] }, "formods": { "name": "formods", @@ -63069,9 +63711,9 @@ }, "forsearch": { "name": "forsearch", - "version": "6.0.0", - "sha256": "1x2q13wmdczyn9lwrmrissc2cp001ca3gyyvy32vjg3844arxckk", - "depends": ["Cairo", "formula_tools", "ggplot2", "Hmisc", "nlme", "survival", "tibble"] + "version": "6.2.0", + "sha256": "02k3k9pv55aymym8p60xl071161zigr7m8m3vpna68rril8laq8i", + "depends": ["Cairo", "Hmisc", "formula_tools", "ggplot2", "nlme", "survival", "tibble"] }, "forstringr": { "name": "forstringr", @@ -63105,9 +63747,9 @@ }, "fossilbrush": { "name": "fossilbrush", - "version": "1.0.3", - "sha256": "0h5grarpk6ml07gxb3bmb93fys55f6pp4qr60fqq97zx1lg9hns4", - "depends": ["curl", "data_table", "igraph", "Matrix", "pbapply", "stringdist", "stringr"] + "version": "1.0.5", + "sha256": "056krpxsx0gz47py6v2ldik74gsnhbc1d0v144i7v4f4qcm14hs1", + "depends": ["Matrix", "data_table", "igraph", "pbapply", "stringdist", "stringr"] }, "foto": { "name": "foto", @@ -63119,7 +63761,7 @@ "name": "foundry", "version": "0.13.0", "sha256": "06mmqiaakha1xw2l5zib5nmwijjv4rjbpsx52ck7xihm6w192lss", - "depends": ["arrow", "httr", "jsonlite", "R6", "yaml"] + "depends": ["R6", "arrow", "httr", "jsonlite", "yaml"] }, "fourPNO": { "name": "fourPNO", @@ -63149,7 +63791,7 @@ "name": "fpc", "version": "2.2-12", "sha256": "11s7211mnb9c72061mrcdfdwfph6nmbwcnpjgl32i2p7qys9cnam", - "depends": ["class", "cluster", "diptest", "flexmix", "kernlab", "MASS", "mclust", "prabclus", "robustbase"] + "depends": ["MASS", "class", "cluster", "diptest", "flexmix", "kernlab", "mclust", "prabclus", "robustbase"] }, "fpcb": { "name": "fpcb", @@ -63173,7 +63815,7 @@ "name": "fplot", "version": "1.1.0", "sha256": "0rjdjv67yh6nbxi3l8ds0dr26s9cxsrfqc47rkfwh82g1iga2fqi", - "depends": ["data_table", "dreamerr", "Formula", "Rcpp"] + "depends": ["Formula", "Rcpp", "data_table", "dreamerr"] }, "fplyr": { "name": "fplyr", @@ -63213,9 +63855,9 @@ }, "fpp3": { "name": "fpp3", - "version": "0.5", - "sha256": "1yg2wv1mdqrmpxbz9kdsxw84q5hg12rsmz1k3i4dq1nymqbkkfq2", - "depends": ["cli", "crayon", "dplyr", "fable", "fabletools", "feasts", "ggplot2", "lubridate", "magrittr", "purrr", "rstudioapi", "tibble", "tidyr", "tsibble", "tsibbledata"] + "version": "1.0.0", + "sha256": "15kgllix1syi7974d5mrfa20zgx8s0hj2wq6wz1mlpzkaa6w2i9j", + "depends": ["cli", "crayon", "dplyr", "fable", "fabletools", "feasts", "ggplot2", "lubridate", "purrr", "rstudioapi", "tibble", "tidyr", "tsibble", "tsibbledata"] }, "fptdApprox": { "name": "fptdApprox", @@ -63245,13 +63887,13 @@ "name": "fr", "version": "0.5.1", "sha256": "0kj7qjv6jdrp8wm7ynpi4mjm4sx9b2aqnhqb0pn1xnpbsj9x7557", - "depends": ["cli", "dplyr", "purrr", "rlang", "S7", "tibble", "tidyselect", "vroom", "yaml"] + "depends": ["S7", "cli", "dplyr", "purrr", "rlang", "tibble", "tidyselect", "vroom", "yaml"] }, "frab": { "name": "frab", - "version": "0.0-3", - "sha256": "08nlhshg3bz8b830vl877xyyjgngxk7sf5vp5d0np3bfhrylh0wv", - "depends": ["disordR", "mathjaxr", "Rcpp"] + "version": "0.0-6", + "sha256": "1w57icar18xfgk4jx5v5b69xn0msjndw13j6kplgvk1q50hryx5c", + "depends": ["Rcpp", "disordR"] }, "fracdiff": { "name": "fracdiff", @@ -63277,12 +63919,6 @@ "sha256": "1cnp8qrc6jpdj0grwkvn5jkdymjfhg5ybbhqvknxirc4g981q8bj", "depends": ["imager", "plyr"] }, - "fractalRegression": { - "name": "fractalRegression", - "version": "1.2", - "sha256": "1d79bv3lpg1p6zvjsnf8qwm5ajpsklm8gpqm241jv1cgjyfsi64x", - "depends": ["colorRamps", "Rcpp", "RcppArmadillo", "RcppEigen"] - }, "fractaldim": { "name": "fractaldim", "version": "0.8-5", @@ -63303,33 +63939,39 @@ }, "fragility": { "name": "fragility", - "version": "1.4", - "sha256": "1izb3mkqxkhayfszlspqpjhai3wif6clv5yyc22pacc207p19542", + "version": "1.5", + "sha256": "0das343cjixmlsdbx9i897yf3fcaj55f2dxh0wd6jsqypf67lk0q", "depends": ["metafor", "netmeta", "plotrix"] }, "frailtyEM": { "name": "frailtyEM", "version": "1.0.1", "sha256": "0ajqmn8353va8k3idsl90xsrhpdqarfmvg84d4kwayxlqy6dmbb0", - "depends": ["expint", "ggplot2", "magrittr", "Matrix", "msm", "numDeriv", "Rcpp", "survival", "tibble"] + "depends": ["Matrix", "Rcpp", "expint", "ggplot2", "magrittr", "msm", "numDeriv", "survival", "tibble"] }, "frailtyHL": { "name": "frailtyHL", "version": "2.3", "sha256": "115iv1d2c9mvviick8b24bn6kdbsvnf21nvfjm9a8dk0x07hrv5g", - "depends": ["cmprsk", "Matrix", "survival"] + "depends": ["Matrix", "cmprsk", "survival"] }, "frailtyMMpen": { "name": "frailtyMMpen", "version": "1.2.1", "sha256": "03d3mlbwvpqjgxgw4cqy2502lx4gh8fvf7sbcq06w8yjljffn0a0", - "depends": ["mgcv", "numDeriv", "Rcpp", "RcppGSL", "survival"] + "depends": ["Rcpp", "RcppGSL", "mgcv", "numDeriv", "survival"] }, "frailtySurv": { "name": "frailtySurv", "version": "1.3.8", "sha256": "1k1pxn47gglkcjzix3h1vn9z631ms6icgv5df6pb90008qmilck7", - "depends": ["ggplot2", "nleqslv", "numDeriv", "Rcpp", "reshape2", "survival"] + "depends": ["Rcpp", "ggplot2", "nleqslv", "numDeriv", "reshape2", "survival"] + }, + "frailtypack": { + "name": "frailtypack", + "version": "3.6.2", + "sha256": "06nwm4dvhszg2843d75rf42wrrglmlqg61baz7zpymxq4717chj4", + "depends": ["MASS", "boot", "doBy", "nlme", "rootSolve", "shiny", "statmod", "survC1", "survival"] }, "frair": { "name": "frair", @@ -63371,7 +64013,7 @@ "name": "frechet", "version": "0.3.0", "sha256": "0lxzhkimyhnisbvfgv8l9vv4pzjj6igcy8fyx25is43g2cz35ymq", - "depends": ["boot", "corrplot", "e1071", "fdadensity", "fdapace", "Matrix", "osqp", "pracma", "quadprog", "trust"] + "depends": ["Matrix", "boot", "corrplot", "e1071", "fdadensity", "fdapace", "osqp", "pracma", "quadprog", "trust"] }, "fredr": { "name": "fredr", @@ -63389,7 +64031,7 @@ "name": "freealg", "version": "1.1-1", "sha256": "0jx9r40hql8fkpjr005snavj8fw5ykqa4ya7cy59jhxr31byma3j", - "depends": ["disordR", "mathjaxr", "partitions", "Rcpp"] + "depends": ["Rcpp", "disordR", "mathjaxr", "partitions"] }, "freebird": { "name": "freebird", @@ -63419,7 +64061,7 @@ "name": "freesurfer", "version": "1.6.10", "sha256": "1i687yj76gbassyldpgal33cxd2hixzl0779ql9fjsaibh5m1dc4", - "depends": ["neurobase", "R_utils", "reshape2"] + "depends": ["R_utils", "neurobase", "reshape2"] }, "freesurferformats": { "name": "freesurferformats", @@ -63511,11 +64153,17 @@ "sha256": "1d54zr87795gm4qc6aw3nv9i83rhnhv14rcpkrivdxhxv8rnhnn9", "depends": ["survival"] }, + "frequentistSSDBinary": { + "name": "frequentistSSDBinary", + "version": "0.1.0", + "sha256": "05lcspm6a6rmsvgki5japmfzfa53dpa7z65n4my42xbjzyr3hnfx", + "depends": ["clinfun", "mvtnorm", "ph2mult"] + }, "fresh": { "name": "fresh", - "version": "0.2.0", - "sha256": "1787mm6w2s5x9scxy7r9cb77rgpmy4ngwkn4z8g3gs48mrab4bd9", - "depends": ["htmltools", "rstudioapi", "sass", "shiny"] + "version": "0.2.1", + "sha256": "19ki4hxlqzshdmy981gcvbn8wxqa893p5rs55l0q7iipkcmhf9jq", + "depends": ["bslib", "htmltools", "rstudioapi", "sass", "shiny"] }, "freshr": { "name": "freshr", @@ -63581,7 +64229,7 @@ "name": "frscore", "version": "0.4.1", "sha256": "1phmy313xl1x3v1smf6f19aa1sd0cypfn5hpg715k9p9z9sh58qq", - "depends": ["cna", "dplyr", "lifecycle", "magrittr", "Rfast", "rlang", "withr"] + "depends": ["Rfast", "cna", "dplyr", "lifecycle", "magrittr", "rlang", "withr"] }, "fruclimadapt": { "name": "fruclimadapt", @@ -63605,7 +64253,7 @@ "name": "fscache", "version": "1.0.5", "sha256": "0815z6a677ygiv4hlslmvbnd1pdnh2xz3sw0nzgrcr2vzj83h25x", - "depends": ["chk", "lgr", "lifecycle", "R_utils", "R6", "stringi"] + "depends": ["R6", "R_utils", "chk", "lgr", "lifecycle", "stringi"] }, "fscaret": { "name": "fscaret", @@ -63635,7 +64283,7 @@ "name": "fslr", "version": "2.25.3", "sha256": "0pp1hn80qknxg7w24qqgjq0y96i22qixsdgs2bkjylwh9zhxbg9x", - "depends": ["neurobase", "oro_nifti", "R_utils"] + "depends": ["R_utils", "neurobase", "oro_nifti"] }, "fsn": { "name": "fsn", @@ -63665,13 +64313,13 @@ "name": "fssemR", "version": "0.1.8", "sha256": "1rja69b6x5vc302nksh5m6ssp2lx8drv9gjnkv6j9xr3hd2407xi", - "depends": ["glmnet", "igraph", "MASS", "Matrix", "mvtnorm", "qpdf", "qtl", "Rcpp", "RcppEigen", "stringr"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppEigen", "glmnet", "igraph", "mvtnorm", "qpdf", "qtl", "stringr"] }, "fst": { "name": "fst", "version": "0.9.8", "sha256": "0r96inwrr960m7wmc80603bw2vvvwab225bh9dq3lalwhy4yiis4", - "depends": ["fstcore", "Rcpp"] + "depends": ["Rcpp", "fstcore"] }, "fst4pg": { "name": "fst4pg", @@ -63719,7 +64367,7 @@ "name": "ftsa", "version": "6.4", "sha256": "14s3qr8czycqgn6a462bmy575mn77lrhrb4ahpaa67m2xlcqpw4v", - "depends": ["boot", "colorspace", "e1071", "ecp", "evgam", "fda", "fdapace", "fGarch", "forecast", "glue", "KernSmooth", "LaplacesDemon", "MASS", "pcaPP", "pdfCluster", "psych", "rainbow", "ROOPSD", "sde", "strucchange", "vars"] + "depends": ["KernSmooth", "LaplacesDemon", "MASS", "ROOPSD", "boot", "colorspace", "e1071", "ecp", "evgam", "fGarch", "fda", "fdapace", "forecast", "glue", "pcaPP", "pdfCluster", "psych", "rainbow", "sde", "strucchange", "vars"] }, "ftsspec": { "name": "ftsspec", @@ -63763,6 +64411,12 @@ "sha256": "0pn4lh59snfcyyi28350lm4n9xh6y25hpjr38dc33bic4cfbqiyr", "depends": [] }, + "fullRankMatrix": { + "name": "fullRankMatrix", + "version": "0.1.0", + "sha256": "1jlrifgy4fk07a4qfym3ywqnjb1x7grcdc42cncbj2n87w7p6yy4", + "depends": [] + }, "fullfact": { "name": "fullfact", "version": "1.5.2", @@ -63785,7 +64439,7 @@ "name": "funFEM", "version": "1.2", "sha256": "17pw743qnljwasj4cg8m8sg9j6piy7g69jr57aqmbizlfdqvvl05", - "depends": ["elasticnet", "fda", "MASS"] + "depends": ["MASS", "elasticnet", "fda"] }, "funGp": { "name": "funGp", @@ -63803,13 +64457,13 @@ "name": "funModeling", "version": "1.9.5", "sha256": "0wrcfqn0sj2shs2105glhm4ll5avbh8aq0yc6q72cjixjck9hn6h", - "depends": ["cli", "dplyr", "entropy", "ggplot2", "gridExtra", "Hmisc", "lazyeval", "moments", "pander", "RColorBrewer", "reshape2", "ROCR", "scales", "stringr"] + "depends": ["Hmisc", "RColorBrewer", "ROCR", "cli", "dplyr", "entropy", "ggplot2", "gridExtra", "lazyeval", "moments", "pander", "reshape2", "scales", "stringr"] }, "funStatTest": { "name": "funStatTest", "version": "1.0.3", "sha256": "162wm4j63bg7l1cyqjb23cn68pm1zg1nc25zxhy3mb12pipnqq2x", - "depends": ["checkmate", "distr", "dplyr", "ggplot2", "magrittr", "Matrix", "pbapply", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["Matrix", "checkmate", "distr", "dplyr", "ggplot2", "magrittr", "pbapply", "stringr", "tibble", "tidyr", "tidyselect"] }, "func2vis": { "name": "func2vis", @@ -63819,9 +64473,9 @@ }, "funcharts": { "name": "funcharts", - "version": "1.4.1", - "sha256": "0rxj7cpvl0ng1drqp5iyg7j39pn3pss2zg3zk8kf0vc6ajzfvr5g", - "depends": ["dplyr", "fda", "fda_usc", "ggplot2", "MASS", "Matrix", "matrixStats", "mvtnorm", "patchwork", "rlang", "roahd", "robustbase", "rofanova", "rrcov", "RSpectra", "stringr", "tidyr"] + "version": "1.5.0", + "sha256": "1klw181lmxr0hph9hq87ka9c85jhyjgdkb8mkpbp6arkx57vh0gz", + "depends": ["MASS", "Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "Rfast", "dplyr", "fda", "fda_usc", "ggplot2", "matrixStats", "mvtnorm", "patchwork", "rlang", "roahd", "robustbase", "rofanova", "rrcov", "stringr", "tidyr"] }, "funchir": { "name": "funchir", @@ -63845,13 +64499,13 @@ "name": "fundiversity", "version": "1.1.1", "sha256": "1wp2v7bd1vc8gs9g41s77pazkrv3mdw2m3pgjr7k6wdch0a9qhx2", - "depends": ["future_apply", "geometry", "Matrix", "vegan"] + "depends": ["Matrix", "future_apply", "geometry", "vegan"] }, "fungible": { "name": "fungible", "version": "2.4.4", "sha256": "18h4n7q130z2i86zd7gwrh3wv9h4pd4niands1p94rialrdg9vda", - "depends": ["clue", "crayon", "CVXR", "DEoptim", "GA", "GPArotation", "lattice", "MASS", "MBESS", "MCMCpack", "mvtnorm", "nleqslv", "pbmcapply", "Rcsdp", "RSpectra", "sem"] + "depends": ["CVXR", "DEoptim", "GA", "GPArotation", "MASS", "MBESS", "MCMCpack", "RSpectra", "Rcsdp", "clue", "crayon", "lattice", "mvtnorm", "nleqslv", "pbmcapply", "sem"] }, "funique": { "name": "funique", @@ -63869,7 +64523,7 @@ "name": "funkyheatmap", "version": "0.5.0", "sha256": "1rgb49pzhz91qlw75zp0bi231nc9frf1wrp1xd22hpydccklvq6r", - "depends": ["assertthat", "cli", "cowplot", "dplyr", "ggforce", "ggplot2", "jsonlite", "patchwork", "purrr", "RColorBrewer", "Rdpack", "stringr", "tibble", "tidyr"] + "depends": ["RColorBrewer", "Rdpack", "assertthat", "cli", "cowplot", "dplyr", "ggforce", "ggplot2", "jsonlite", "patchwork", "purrr", "stringr", "tibble", "tidyr"] }, "funmediation": { "name": "funmediation", @@ -63893,7 +64547,7 @@ "name": "funpca", "version": "9.0", "sha256": "09xdqlma9ywjj8zbj7jjjfbh0vydvni65xgdjymchl0zfhfw8ihl", - "depends": ["Brobdingnag", "fda", "MASS", "nlme"] + "depends": ["Brobdingnag", "MASS", "fda", "nlme"] }, "funprog": { "name": "funprog", @@ -63911,7 +64565,7 @@ "name": "funrar", "version": "1.5.0", "sha256": "1c9mjbl8g0w7bk7kkms14dyq7yi4c8id4ln29khfabim61dapmqd", - "depends": ["cluster", "Matrix"] + "depends": ["Matrix", "cluster"] }, "funreg": { "name": "funreg", @@ -63923,7 +64577,7 @@ "name": "funspace", "version": "0.2.2", "sha256": "036hx837rlarvms79jjg3lg77h6k94p3n8n1hpw70v8hcrz6dr54", - "depends": ["ade4", "ape", "ks", "MASS", "mgcv", "missForest", "paran", "phytools", "vegan", "viridis"] + "depends": ["MASS", "ade4", "ape", "ks", "mgcv", "missForest", "paran", "phytools", "vegan", "viridis"] }, "funspotr": { "name": "funspotr", @@ -63935,7 +64589,7 @@ "name": "funtimes", "version": "9.1", "sha256": "0gz26djl534d42wxspg9hl0ndhzzhkr9d4vp87afqqg9401qcgcz", - "depends": ["dbscan", "Kendall", "lmtest", "mlVAR", "Rdpack", "sandwich", "vars"] + "depends": ["Kendall", "Rdpack", "dbscan", "lmtest", "mlVAR", "sandwich", "vars"] }, "furniture": { "name": "furniture", @@ -63965,7 +64619,7 @@ "name": "fuser", "version": "1.0.1", "sha256": "17lsfpd9hdichj3wflac896zyjbq7a8w2gmlgj8nbgg80f646fgr", - "depends": ["glmnet", "irlba", "Matrix", "Rcpp", "RcppEigen", "RSpectra"] + "depends": ["Matrix", "RSpectra", "Rcpp", "RcppEigen", "glmnet", "irlba"] }, "fusionchartsR": { "name": "fusionchartsR", @@ -63999,8 +64653,8 @@ }, "future": { "name": "future", - "version": "1.33.2", - "sha256": "0rma4h9rjy28n7csn748v9b83m2v5hyh0hgwwckfpbnd5331m9xm", + "version": "1.34.0", + "sha256": "0pgs5n5pqqr3jg71nswjrl5did9bxg0m0z3sn8c1pswb3zyx8faq", "depends": ["digest", "globals", "listenv", "parallelly"] }, "future_apply": { @@ -64023,8 +64677,8 @@ }, "future_mirai": { "name": "future.mirai", - "version": "0.2.1", - "sha256": "1ihi9n9wgxq43cx7cxzzay4j8g19jxhyww1h40rr84qzqdj6nk62", + "version": "0.2.2", + "sha256": "0fq01gzcby7sy51vhq2jdrrvfa14i94jjdf80jwvm9lwmc3p20d8", "depends": ["future", "mirai", "parallelly"] }, "future_tests": { @@ -64089,9 +64743,9 @@ }, "fwlplot": { "name": "fwlplot", - "version": "0.2.0", - "sha256": "1fi2ijfkpxfbwxfcyc5mk2c7mpj6z7lrwm8wlilk2g04y6jmw84l", - "depends": ["data_table", "fixest", "ggplot2"] + "version": "0.3.0", + "sha256": "1pklfvf68lz6wais9zr770kcr2v3cfhc4di2vadr3dinqjl1gzlw", + "depends": ["data_table", "fixest", "tinyplot"] }, "fwsim": { "name": "fwsim", @@ -64101,9 +64755,9 @@ }, "fxTWAPLS": { "name": "fxTWAPLS", - "version": "0.1.2", - "sha256": "1bxrwkf65qw3k6mqvp27lqw6i2r7bdbilnl9406k1nva353gcxxm", - "depends": ["doFuture", "foreach", "future", "geosphere", "ggplot2", "JOPS", "MASS", "progressr"] + "version": "0.1.3", + "sha256": "1i1wv6vpnkfxn6vw2hdi5bh1b1dvq572c7mka4z8rxi2xj52whiy", + "depends": ["JOPS", "MASS", "doFuture", "foreach", "future", "geosphere", "ggplot2", "progressr"] }, "fxl": { "name": "fxl", @@ -64157,13 +64811,13 @@ "name": "gJLS2", "version": "0.2.0", "sha256": "112fyy76ry6g0xinhy09s5vdcd11jw7sivadlx05ali89lm5nigg", - "depends": ["ggplot2", "MASS", "MCMCpack", "moments", "nlme", "plyr", "quantreg"] + "depends": ["MASS", "MCMCpack", "ggplot2", "moments", "nlme", "plyr", "quantreg"] }, "gKRLS": { "name": "gKRLS", "version": "1.0.2", "sha256": "0kkk463mgrypc5vihv9hvj7dsdwv6yvmhxp6iy6ip1k7nqi8xdvf", - "depends": ["Matrix", "mgcv", "mlr3", "R6", "Rcpp", "RcppEigen", "sandwich"] + "depends": ["Matrix", "R6", "Rcpp", "RcppEigen", "mgcv", "mlr3", "sandwich"] }, "gLRTH": { "name": "gLRTH", @@ -64175,37 +64829,37 @@ "name": "gMCP", "version": "0.8-17", "sha256": "0w5qxjyn5z7mygsvrmqk5ab827abhp7v4d8ha8279gjjkfswq5fi", - "depends": ["CommonJavaJars", "JavaGD", "MASS", "Matrix", "multcomp", "mvtnorm", "PolynomF", "rJava", "xlsxjars"] + "depends": ["CommonJavaJars", "JavaGD", "MASS", "Matrix", "PolynomF", "multcomp", "mvtnorm", "rJava", "xlsxjars"] }, "gMCPLite": { "name": "gMCPLite", "version": "0.1.5", "sha256": "1qykizcq42hj6v9fb9hyi59zi1m4hpk10il7why9s9cwyii1m69z", - "depends": ["ggplot2", "MASS", "mvtnorm"] + "depends": ["MASS", "ggplot2", "mvtnorm"] }, "gMOIP": { "name": "gMOIP", "version": "1.5.2", "sha256": "159rqd65g17m2mh93jpkapk4r6n8gmf43vrxhv8aqyggwl0ifdkx", - "depends": ["dplyr", "eaf", "geometry", "ggplot2", "ggrepel", "MASS", "Matrix", "plyr", "png", "purrr", "Rfast", "rgl", "rlang", "sp", "tibble", "tidyr", "tidyselect"] + "depends": ["MASS", "Matrix", "Rfast", "dplyr", "eaf", "geometry", "ggplot2", "ggrepel", "plyr", "png", "purrr", "rgl", "rlang", "sp", "tibble", "tidyr", "tidyselect"] }, "gMWT": { "name": "gMWT", "version": "1.4", "sha256": "1iv7dav6l9gx6vhghcyasdizjsz2f8yzcgkj2i50kpgw74ljg5ia", - "depends": ["clinfun", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "clinfun"] }, "gProfileR": { "name": "gProfileR", "version": "0.7.0", "sha256": "1h1v0kgpsn04ald2izznh7fr2riwisj5hcgz4k7h3qc931rf0r4k", - "depends": ["plyr", "RCurl"] + "depends": ["RCurl", "plyr"] }, "gRain": { "name": "gRain", "version": "1.4.1", "sha256": "11b40ngfzqqx9pgfbgx7qr63ikccxh1hg9snw55anw32hym2dyfr", - "depends": ["broom", "gRbase", "igraph", "magrittr", "Rcpp", "RcppArmadillo", "RcppEigen"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "broom", "gRbase", "igraph", "magrittr"] }, "gRaven": { "name": "gRaven", @@ -64217,19 +64871,19 @@ "name": "gRbase", "version": "2.0.2", "sha256": "15rfl3wib8gq90fy1rr1p7cvdbiqg3qkp6vc71k02difp14hwwin", - "depends": ["igraph", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "igraph"] }, "gRc": { "name": "gRc", "version": "0.5.0", "sha256": "12fz7aiddzc3pxvglin265z30ihcmy18nsw02zg7vb27bz5ldvqp", - "depends": ["gRbase", "igraph", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "gRbase", "igraph"] }, "gRim": { "name": "gRim", - "version": "0.3.2", - "sha256": "1injdhl0xgx9702k4jxdy0wpkf2d4k31m9fi5g9sf572i288lrns", - "depends": ["doBy", "glue", "gRain", "gRbase", "igraph", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen"] + "version": "0.3.3", + "sha256": "126ip5bvqipfrclmclv0gskf2a1d0z7m5965c477q831s3a1wbb8", + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "doBy", "gRain", "gRbase", "glue", "igraph"] }, "gSeg": { "name": "gSeg", @@ -64259,7 +64913,7 @@ "name": "gWQS", "version": "3.0.5", "sha256": "11qs7vxal3br7rg379b5v2w06nvsipk7465c9l5lpifr8g0g561r", - "depends": ["bookdown", "broom", "car", "cowplot", "future", "future_apply", "ggplot2", "ggrepel", "kableExtra", "knitr", "MASS", "Matrix", "nnet", "plotROC", "pscl", "reshape2", "rlist"] + "depends": ["MASS", "Matrix", "bookdown", "broom", "car", "cowplot", "future", "future_apply", "ggplot2", "ggrepel", "kableExtra", "knitr", "nnet", "plotROC", "pscl", "reshape2", "rlist"] }, "gWidgets2": { "name": "gWidgets2", @@ -64281,9 +64935,9 @@ }, "gadget3": { "name": "gadget3", - "version": "0.11-1", - "sha256": "0infyxg05y865k41kk47ylzp0skdr4ypv7x6zg67v8lrwwyx77kh", - "depends": ["digest", "rlang", "TMB"] + "version": "0.12-1", + "sha256": "1jw834v98mwlx7pf78xcqvpqnlrdwl03qm1m4fd5x7yxkn5nhk92", + "depends": ["TMB", "digest", "rlang"] }, "gafit": { "name": "gafit", @@ -64301,7 +64955,7 @@ "name": "gainML", "version": "0.1.0", "sha256": "1mqhrdjdmc2n7dxilxkqn6xq7z0qnxpigw5bbffnjvvsmdamah0n", - "depends": ["fields", "FNN"] + "depends": ["FNN", "fields"] }, "gains": { "name": "gains", @@ -64317,9 +64971,9 @@ }, "galamm": { "name": "galamm", - "version": "0.2.0", - "sha256": "1pyckh5yb9asgk47za9a1791hzkr0w978bf5b7qjca2gw1yymarw", - "depends": ["lme4", "Matrix", "memoise", "mgcv", "nlme", "Rcpp", "RcppEigen", "Rdpack"] + "version": "0.2.1", + "sha256": "1gjz1hmfimld6drildhmlf8xgh6s3p7l6064bsjvp58ggvlmwawk", + "depends": ["Matrix", "Rcpp", "RcppEigen", "Rdpack", "lme4", "memoise", "mgcv", "nlme"] }, "galigor": { "name": "galigor", @@ -64341,21 +64995,21 @@ }, "gam": { "name": "gam", - "version": "1.22-3", - "sha256": "153ig136i3dpy87f8v9f5055x94sl74fnrf5ivpa9fc67f76ikb6", + "version": "1.22-4", + "sha256": "0wy0ia8z9mah8lr4lsbv9sn5z31zbqhrhmk6a74nzfzfyl478hbq", "depends": ["foreach"] }, "gam_hp": { "name": "gam.hp", - "version": "0.0-1", - "sha256": "038ngqjnk7n71s4900qx4nszvf55qrn282psv2bs3lg2jrvzk8cd", + "version": "0.0-2", + "sha256": "0zhnwl533vb094vbn5bxggav3fqh0ahrdrhjliwrgwh2h3bwqpp7", "depends": ["ggplot2", "mgcv"] }, "gamCopula": { "name": "gamCopula", "version": "0.0-7", "sha256": "0zi9g2vxkn1hxc2qyyr1x8p1f9w7fc1j5dmm2mmm333gixkkz9nb", - "depends": ["copula", "doParallel", "foreach", "gsl", "igraph", "MASS", "mgcv", "numDeriv", "VineCopula"] + "depends": ["MASS", "VineCopula", "copula", "doParallel", "foreach", "gsl", "igraph", "mgcv", "numDeriv"] }, "gamRR": { "name": "gamRR", @@ -64421,7 +65075,7 @@ "name": "gamlss", "version": "5.4-22", "sha256": "0bgya6jb462ggqnmlpwdymxqvqbkah15i3aai1xi9496z66r1rh1", - "depends": ["gamlss_data", "gamlss_dist", "MASS", "nlme", "survival"] + "depends": ["MASS", "gamlss_data", "gamlss_dist", "nlme", "survival"] }, "gamlss_add": { "name": "gamlss.add", @@ -64481,7 +65135,7 @@ "name": "gamlss.lasso", "version": "1.0-1", "sha256": "03c8k6hl23ag98dihznfz1h0qc3pwxbnpv58pvmx3xbb3lipfjfb", - "depends": ["gamlss", "glmnet", "lars", "Matrix"] + "depends": ["Matrix", "gamlss", "glmnet", "lars"] }, "gamlss_mx": { "name": "gamlss.mx", @@ -64505,13 +65159,19 @@ "name": "gamlssbssn", "version": "0.1.0", "sha256": "1l8d4qwmq9dklm9imb3cvlncwa6jygf8kg2j1599h1nfhyyhj2vv", - "depends": ["gamlss", "gamlss_dist", "MASS"] + "depends": ["MASS", "gamlss", "gamlss_dist"] + }, + "gamlssx": { + "name": "gamlssx", + "version": "1.0.1", + "sha256": "0lhn0rif1k6978j50cvb3krknn09dzvdln1dh4amz3h2jqsh6434", + "depends": ["gamlss", "gamlss_dist", "nieve"] }, "gamm4": { "name": "gamm4", "version": "0.2-6", "sha256": "128c725y9s07c1m9cvd9hgi9hldrymcs5divd8pw7bdjh9jvdiap", - "depends": ["lme4", "Matrix", "mgcv"] + "depends": ["Matrix", "lme4", "mgcv"] }, "gammSlice": { "name": "gammSlice", @@ -64523,18 +65183,18 @@ "name": "gamma", "version": "1.0.5", "sha256": "1n4jd0xvn6ld5adhhanqxhl7nndj4cqf17jp18s6jmrx7jbc3k5f", - "depends": ["ggplot2", "IsoplotR", "rlang", "rxylib"] + "depends": ["IsoplotR", "ggplot2", "rlang", "rxylib"] }, "gamreg": { "name": "gamreg", "version": "0.3", "sha256": "1svrgbb8qdy2hzpq1g38v2lzmlbrn7qljix827biqzwgiajy69gg", - "depends": ["doParallel", "foreach", "glmnet", "Rcpp", "RcppArmadillo", "robustHD"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "glmnet", "robustHD"] }, "gamsel": { "name": "gamsel", - "version": "1.8-2", - "sha256": "1w1z2g0njsfv1ah6w3zw4lcgnaxask5mgykb204jzp6hpnc1a6cb", + "version": "1.8-4", + "sha256": "1w6s19fwrqldacw4qlx3xcq33v0vx332hcyfg2qdcni6yi80fdkg", "depends": ["foreach", "mda"] }, "gamselBayes": { @@ -64547,25 +65207,25 @@ "name": "gamstransfer", "version": "3.0.3", "sha256": "0ashdicnkrvbsddqajhnqrwrpw8y3ikzibm4y3gn5ywg7y3dbp2k", - "depends": ["collections", "R_utils", "R6", "Rcpp"] + "depends": ["R6", "R_utils", "Rcpp", "collections"] }, "ganDataModel": { "name": "ganDataModel", - "version": "1.1.6", - "sha256": "1fff76zh6bn94y57qnxbya3xrshp99pxk5ks2p9i7i4p1f8xvhvd", + "version": "1.1.7", + "sha256": "0zp6nx43qza572nl7wibxamw5ca56b3955z6zfjxq77kwlc8jcl7", "depends": ["Rcpp", "tensorflow"] }, "ganGenerativeData": { "name": "ganGenerativeData", - "version": "2.0.1", - "sha256": "0bs557cv74wcizw7j1xswx8lf3rl6vc3ybdn71854mjrab0sjz85", - "depends": ["httr", "Rcpp", "tensorflow"] + "version": "2.0.2", + "sha256": "0bwka0i9afc9vdw94mbjvqz54w4bfywm84c7mchazr4jwc5p309g", + "depends": ["Rcpp", "httr", "tensorflow"] }, "gap": { "name": "gap", "version": "1.5-3", "sha256": "1kjjnh0s9aicwkd7wsisi4c75y701irigsbzp7y6f2264bcgj6bf", - "depends": ["dplyr", "gap_datasets", "ggplot2", "plotly", "Rdpack"] + "depends": ["Rdpack", "dplyr", "gap_datasets", "ggplot2", "plotly"] }, "gap_datasets": { "name": "gap.datasets", @@ -64583,7 +65243,7 @@ "name": "gapfill", "version": "0.9.6-1", "sha256": "15mrn44v5l4sgxwlyp1rik5mdg7m2s6xxcdigc3sjd1yhxalgw12", - "depends": ["fields", "foreach", "ggplot2", "quantreg", "Rcpp"] + "depends": ["Rcpp", "fields", "foreach", "ggplot2", "quantreg"] }, "gapmap": { "name": "gapmap", @@ -64619,7 +65279,7 @@ "name": "garma", "version": "0.9.13", "sha256": "0h61f29x2261vky4cwmcfwlix7x1yg8qkhgkhiw1aryqmzvwf0lc", - "depends": ["BB", "crayon", "dfoptim", "FKF", "forecast", "GA", "ggplot2", "hypergeo", "ltsa", "lubridate", "nloptr", "pracma", "pso", "Rsolnp", "signal", "tswge", "zoo"] + "depends": ["BB", "FKF", "GA", "Rsolnp", "crayon", "dfoptim", "forecast", "ggplot2", "hypergeo", "ltsa", "lubridate", "nloptr", "pracma", "pso", "signal", "tswge", "zoo"] }, "garray": { "name": "garray", @@ -64629,8 +65289,8 @@ }, "gasanalyzer": { "name": "gasanalyzer", - "version": "0.4.0", - "sha256": "1j46w7ikpzll40yk3vwlq1zysgsnlrf5p01hllp8a9qshxdhl5a6", + "version": "0.4.1", + "sha256": "0cb6xkzfrnxd28dm17r6b57i8l48psqcgx1yaw37csjll35ngxap", "depends": ["jsonify", "stringi", "tibble", "tidyxl", "units", "vctrs", "xml2"] }, "gaselect": { @@ -64641,27 +65301,27 @@ }, "gasfluxes": { "name": "gasfluxes", - "version": "0.6-2", - "sha256": "18yr3331wriddxbnxag3ms6lmx709mhrngv8sxfg0zcm271pkl1r", - "depends": ["data_table", "MASS", "sfsmisc"] + "version": "0.7", + "sha256": "1n2cfm3fa22nbirgkv91qapw5mipsw59m8kwvmb4ljgcslpzjrzp", + "depends": ["MASS", "data_table", "sfsmisc"] }, "gasmodel": { "name": "gasmodel", "version": "0.6.0", "sha256": "16wxv0fkaayxvd5h436wyp9is8y47k7ivim5f9md4g4acy3ca3cb", - "depends": ["abind", "arrangements", "CircStats", "copula", "dplyr", "ggplot2", "Matrix", "mvnfast", "nloptr", "numDeriv", "pracma", "tidyr"] + "depends": ["CircStats", "Matrix", "abind", "arrangements", "copula", "dplyr", "ggplot2", "mvnfast", "nloptr", "numDeriv", "pracma", "tidyr"] }, "gasper": { "name": "gasper", "version": "1.1.6", "sha256": "1ksvgccl4kqnsgrmaxj8daww5f2r9a4p6p2hsnsg3c5iqwnj6i35", - "depends": ["curl", "ggplot2", "httr", "Matrix", "Rcpp", "RcppArmadillo", "RSpectra"] + "depends": ["Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "curl", "ggplot2", "httr"] }, "gastempt": { "name": "gastempt", "version": "0.5.5", "sha256": "0pz580nhr9hnpzdi59l00jv34jmy5iyh5skbwslq6gzjdw3jgsf4", - "depends": ["assertthat", "BH", "dplyr", "ggplot2", "nlme", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "shiny", "StanHeaders", "stringr", "tibble", "utf8"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "assertthat", "dplyr", "ggplot2", "nlme", "rstan", "shiny", "stringr", "tibble", "utf8"] }, "gaston": { "name": "gaston", @@ -64673,7 +65333,7 @@ "name": "gateR", "version": "0.1.15", "sha256": "1a818bypdiingv6kmrfmx7ivxybs8k7261vfqlmb4gdl87n71rb2", - "depends": ["fields", "lifecycle", "rlang", "sparr", "SpatialPack", "spatstat_geom", "terra", "tibble"] + "depends": ["SpatialPack", "fields", "lifecycle", "rlang", "sparr", "spatstat_geom", "terra", "tibble"] }, "gatepoints": { "name": "gatepoints", @@ -64685,7 +65345,7 @@ "name": "gatoRs", "version": "1.0.2", "sha256": "0a1z3rjgkz5wxccb5lzmwmskvjlgab3zmznwvjgk2bslda6yzqil", - "depends": ["CoordinateCleaner", "dplyr", "leaflet", "magrittr", "parsedate", "rgbif", "ridigbio", "spatstat_geom", "spThin", "stringr", "terra"] + "depends": ["CoordinateCleaner", "dplyr", "leaflet", "magrittr", "parsedate", "rgbif", "ridigbio", "spThin", "spatstat_geom", "stringr", "terra"] }, "gauseR": { "name": "gauseR", @@ -64733,7 +65393,7 @@ "name": "gb", "version": "2.3.3", "sha256": "0gkdkbwr168vi7lgccla49l43rkmjcfrwlqdr65mg5syzcxrh7nh", - "depends": ["boot", "KernSmooth"] + "depends": ["KernSmooth", "boot"] }, "gbRd": { "name": "gbRd", @@ -64745,7 +65405,7 @@ "name": "gbeta", "version": "0.1.0", "sha256": "0611rynyybmiq6pj5jvwijdgx3hnr6mscv20lrqzlfplbmvmz0bj", - "depends": ["gsl", "Rcpp", "RcppEigen", "RcppNumerical", "Runuran"] + "depends": ["Rcpp", "RcppEigen", "RcppNumerical", "Runuran", "gsl"] }, "gbfs": { "name": "gbfs", @@ -64761,15 +65421,15 @@ }, "gbm": { "name": "gbm", - "version": "2.1.9", - "sha256": "1r5d8mkg4z14l3743h39r35r0qqjx5p40ixdkcc5iyjab0fzm24x", + "version": "2.2.2", + "sha256": "1x64a0cq9ys49i3z4df0grk506n55i7yj1ljysf9g60cq6xd56h2", "depends": ["lattice", "survival"] }, "gbm_auto": { "name": "gbm.auto", "version": "2023.08.31", "sha256": "14gahb13p9wpsf8a8mb6a7ikas9jcd4hwh4jn4rg1mray4pgj7in", - "depends": ["beepr", "dismo", "dplyr", "gbm", "ggmap", "ggplot2", "ggspatial", "lifecycle", "lubridate", "mapplots", "Metrics", "readr", "sf", "stars", "starsExtra", "stringi", "tidyselect", "viridis"] + "depends": ["Metrics", "beepr", "dismo", "dplyr", "gbm", "ggmap", "ggplot2", "ggspatial", "lifecycle", "lubridate", "mapplots", "readr", "sf", "stars", "starsExtra", "stringi", "tidyselect", "viridis"] }, "gbm2sas": { "name": "gbm2sas", @@ -64787,7 +65447,7 @@ "name": "gbp", "version": "0.1.0.4", "sha256": "0awg724gsfwlb0fjcvw0450qdsk4m8x8is16pj5c8fx6nc8rn8bv", - "depends": ["data_table", "magrittr", "Rcpp", "RcppArmadillo", "rgl"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "magrittr", "rgl"] }, "gbs2ploidy": { "name": "gbs2ploidy", @@ -64823,7 +65483,7 @@ "name": "gcbd", "version": "0.2.6", "sha256": "1dvnly0aljv2c4x7sn3q55ncvfdfjfgp7w0k2900p77h4w8nixia", - "depends": ["DBI", "lattice", "Matrix", "plyr", "reshape", "RSQLite"] + "depends": ["DBI", "Matrix", "RSQLite", "lattice", "plyr", "reshape"] }, "gcdnet": { "name": "gcdnet", @@ -64859,13 +65519,13 @@ "name": "gcmr", "version": "1.0.3", "sha256": "0m4px1w41226clczzmnzal3hs0qwrvlhhdnkcxj1i7qp358ksxvm", - "depends": ["betareg", "car", "Formula", "lmtest", "nlme", "sandwich", "sp"] + "depends": ["Formula", "betareg", "car", "lmtest", "nlme", "sandwich", "sp"] }, "gconsensus": { "name": "gconsensus", "version": "0.3.2", "sha256": "065i587611nh3fiaxlp88qzd12cjxpbdvxn8pvd99fmk88d809zs", - "depends": ["coda", "MASS", "rjags"] + "depends": ["MASS", "coda", "rjags"] }, "gcookbook": { "name": "gcookbook", @@ -64875,15 +65535,15 @@ }, "gcplyr": { "name": "gcplyr", - "version": "1.9.0", - "sha256": "0j584jh0kqwazgfk12gfbvivqhfgi3gb9hbw55fgv36an4x7q22h", + "version": "1.10.0", + "sha256": "04g8p92aw8ihndlrlxlhvhrqgqv9x6izykpfs8rfn1jc3bisbyyd", "depends": ["dplyr", "rlang", "tidyr"] }, "gcxgclab": { "name": "gcxgclab", "version": "1.0.1", "sha256": "0w6l9d23wbcvj5qzxc1yz20ic58hjkswk7scyjldiv6cbzm89wr1", - "depends": ["dplyr", "ggplot2", "ncdf4", "nilde", "nls_multstart", "ptw", "Rdpack", "zoo"] + "depends": ["Rdpack", "dplyr", "ggplot2", "ncdf4", "nilde", "nls_multstart", "ptw", "zoo"] }, "gdalUtilities": { "name": "gdalUtilities", @@ -64895,13 +65555,13 @@ "name": "gdalcubes", "version": "0.7.0", "sha256": "1bpskiv7pc09pwmh3ghf5l6wswbwlbmwx6sjqlqx7vs8d7gk6972", - "depends": ["BH", "jsonlite", "ncdf4", "Rcpp"] + "depends": ["BH", "Rcpp", "jsonlite", "ncdf4"] }, "gdalraster": { "name": "gdalraster", "version": "1.11.1", "sha256": "0vf28id5yq4f491b25fbmap1yzpzxxkkqmzfln1qc4hxfhbirv1p", - "depends": ["bit64", "Rcpp", "RcppInt64", "xml2"] + "depends": ["Rcpp", "RcppInt64", "bit64", "xml2"] }, "gdata": { "name": "gdata", @@ -64913,7 +65573,7 @@ "name": "gde", "version": "0.2.1", "sha256": "05paf15dn2l7mfzhy3p3k7a2831fj9fwvwgljhcv7wpdj7djdccs", - "depends": ["data_table", "dplyr", "DT", "ggplot2", "httr", "jsonlite", "leaflet", "progress", "R_utils", "readr", "RSQLite", "shiny", "shinycssloaders", "shinyWidgets", "stringr", "XML"] + "depends": ["DT", "RSQLite", "R_utils", "XML", "data_table", "dplyr", "ggplot2", "httr", "jsonlite", "leaflet", "progress", "readr", "shiny", "shinyWidgets", "shinycssloaders", "stringr"] }, "gdi": { "name": "gdi", @@ -64931,13 +65591,13 @@ "name": "gdim", "version": "0.1.0", "sha256": "02q5ynd22yisl3as9hyrg18p9j74lw6p1z3szm1k2ax0r3k04r27", - "depends": ["dplyr", "ggplot2", "irlba", "magrittr", "Matrix", "progress", "rlang", "tibble"] + "depends": ["Matrix", "dplyr", "ggplot2", "irlba", "magrittr", "progress", "rlang", "tibble"] }, "gdistance": { "name": "gdistance", "version": "1.6.4", "sha256": "0awrv10adi31inrgxbb83p73fq05i2xifj2xf16z6mp2lwzgvxba", - "depends": ["igraph", "Matrix", "raster", "sp", "terra"] + "depends": ["Matrix", "igraph", "raster", "sp", "terra"] }, "gdldata": { "name": "gdldata", @@ -64949,13 +65609,13 @@ "name": "gdm", "version": "1.5.0-9.1", "sha256": "10c4fk6pbd946is8h8cr8qblrq6cch5zhlhrxqd8ix5wknm8cqn8", - "depends": ["doParallel", "foreach", "pbapply", "raster", "Rcpp", "reshape2", "vegan"] + "depends": ["Rcpp", "doParallel", "foreach", "pbapply", "raster", "reshape2", "vegan"] }, "gdpc": { "name": "gdpc", "version": "1.1.4", "sha256": "1m54nm5ikarrmlpjnvl70v2xirk5xaqnv3i3pcwy96796ymk5ars", - "depends": ["doParallel", "foreach", "Rcpp", "RcppArmadillo", "xts", "zoo"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "xts", "zoo"] }, "gds": { "name": "gds", @@ -64967,7 +65627,7 @@ "name": "gdtools", "version": "0.3.7", "sha256": "155ky9fdi023b5fjk1gh3607xlgm3hymq232fq03ip2aaywc74nj", - "depends": ["curl", "fontquiver", "gfonts", "htmltools", "Rcpp", "systemfonts"] + "depends": ["Rcpp", "curl", "fontquiver", "gfonts", "htmltools", "systemfonts"] }, "gdxdt": { "name": "gdxdt", @@ -64979,7 +65639,7 @@ "name": "gear", "version": "0.3.4", "sha256": "0ibn2kr0rjj546cbcqhr6x69s25xh7si5fri59055j42g62mdnxy", - "depends": ["autoimage", "optimx", "Rcpp"] + "depends": ["Rcpp", "autoimage", "optimx"] }, "geboes_score": { "name": "geboes.score", @@ -65013,33 +65673,33 @@ }, "geeVerse": { "name": "geeVerse", - "version": "0.1.0", - "sha256": "14yy7qfjql2p6hhm2h5v2j29528085chp84s7q5i9x5x84zpmqvi", - "depends": ["doParallel", "foreach", "mvtnorm", "quantreg", "Rcpp", "RcppEigen"] + "version": "0.2.1", + "sha256": "04hfw7y3bfgngiv5cahx3hckfl1i83x2vjc5vabqqk2nq400c4x5", + "depends": ["Rcpp", "RcppEigen", "doParallel", "foreach", "mvtnorm", "quantreg"] }, "geeasy": { "name": "geeasy", "version": "0.1.2", "sha256": "0hfxryqn5dxpyl0s16ibbg1n8w19wl5ldxa8g437akb760pmsmvl", - "depends": ["geeM", "geepack", "ggplot2", "lme4", "Matrix", "MESS"] + "depends": ["MESS", "Matrix", "geeM", "geepack", "ggplot2", "lme4"] }, "geecure": { "name": "geecure", "version": "1.0-6", "sha256": "0nmnrkfgblv38qvk66bdk8933icr59mayqwljkvmpy59sm6br2k5", - "depends": ["geepack", "MASS", "Matrix", "survival"] + "depends": ["MASS", "Matrix", "geepack", "survival"] }, "geepack": { "name": "geepack", "version": "1.3.11", "sha256": "0y74allpn9bcc5hlqlr97qb9siig52qvaf1lyd4ffpg72k9z1qi9", - "depends": ["broom", "magrittr", "MASS"] + "depends": ["MASS", "broom", "magrittr"] }, "geesmv": { "name": "geesmv", "version": "1.3", "sha256": "0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w", - "depends": ["gee", "MASS", "matrixcalc", "nlme"] + "depends": ["MASS", "gee", "matrixcalc", "nlme"] }, "geessbin": { "name": "geessbin", @@ -65051,7 +65711,7 @@ "name": "geex", "version": "1.1.1", "sha256": "0hs17vmwgpvv85za32rmnlylp0fbbirb1irxxqkgx3dsffgvpbm1", - "depends": ["lme4", "Matrix", "numDeriv", "rootSolve"] + "depends": ["Matrix", "lme4", "numDeriv", "rootSolve"] }, "geigen": { "name": "geigen", @@ -65063,7 +65723,7 @@ "name": "geiger", "version": "2.0.11", "sha256": "0s9zvqgn30spwggwpr02gzdjg3h4kgqamq37i03i14a3i2ls1ifw", - "depends": ["ape", "coda", "colorspace", "deSolve", "digest", "MASS", "mvtnorm", "ncbit", "phytools", "Rcpp", "subplex"] + "depends": ["MASS", "Rcpp", "ape", "coda", "colorspace", "deSolve", "digest", "mvtnorm", "ncbit", "phytools", "subplex"] }, "gellipsoid": { "name": "gellipsoid", @@ -65087,13 +65747,13 @@ "name": "gems", "version": "1.1.1", "sha256": "174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx", - "depends": ["data_table", "MASS", "msm", "plyr"] + "depends": ["MASS", "data_table", "msm", "plyr"] }, "gemtc": { "name": "gemtc", "version": "1.0-2", "sha256": "01sas647d3s5adkqg96z0hhr9pig275fz896ghnp313p5k3fz90l", - "depends": ["coda", "forcats", "igraph", "meta", "plyr", "Rglpk", "rjags", "truncnorm"] + "depends": ["Rglpk", "coda", "forcats", "igraph", "meta", "plyr", "rjags", "truncnorm"] }, "gen2stage": { "name": "gen2stage", @@ -65105,7 +65765,7 @@ "name": "gen3sis", "version": "1.5.11", "sha256": "07r2x0mwrs1ghsfd0a2zj7m2khwq4pg64xiv3n89zy9w9b6vcyw9", - "depends": ["BH", "gdistance", "Matrix", "raster", "Rcpp", "stringr"] + "depends": ["BH", "Matrix", "Rcpp", "gdistance", "raster", "stringr"] }, "gen5helper": { "name": "gen5helper", @@ -65117,7 +65777,7 @@ "name": "genBaRcode", "version": "1.2.7", "sha256": "1rgx0b3bpqfc75y5x4i714m8xbrgckvg4m9gkqxq0464386s53dd", - "depends": ["ape", "Biostrings", "dplyr", "futile_logger", "future", "future_apply", "ggnetwork", "ggplot2", "ggraph", "ggtree", "igraph", "network", "phangorn", "RColorBrewer", "reshape2", "S4Vectors", "shiny", "ShortRead", "stringdist", "VennDiagram", "visNetwork"] + "depends": ["Biostrings", "RColorBrewer", "S4Vectors", "ShortRead", "VennDiagram", "ape", "dplyr", "futile_logger", "future", "future_apply", "ggnetwork", "ggplot2", "ggraph", "ggtree", "igraph", "network", "phangorn", "reshape2", "shiny", "stringdist", "visNetwork"] }, "genCountR": { "name": "genCountR", @@ -65127,8 +65787,8 @@ }, "genMCMCDiag": { "name": "genMCMCDiag", - "version": "0.2.1", - "sha256": "03vxmsf3vh125a87pchdpnkp5n3sqg44nkrlf8l91jicxa6p6rrx", + "version": "0.2.2", + "sha256": "0vf9r9qc477mdjvi54sh0m67lscb8j6lfc7ikqpd4xnzsd4aklb6", "depends": ["coda", "ggplot2", "knitr", "lifecycle", "mcmcse"] }, "genSEIR": { @@ -65187,9 +65847,9 @@ }, "genderstat": { "name": "genderstat", - "version": "0.1.3", - "sha256": "02g9hhy17m3fdvg6hkl8l2njzys6z3xssdwb094q31kffl987bqx", - "depends": ["dplyr", "ggplot2", "reshape2"] + "version": "0.1.5", + "sha256": "05i89xn1r94q53rnw5njj19nmix2ldywkadvinfc47nn60h6zfgx", + "depends": [] }, "gendist": { "name": "gendist", @@ -65201,13 +65861,13 @@ "name": "geneExpressionFromGEO", "version": "0.9", "sha256": "15dvx2f4nsmw1mgjfpcdcfnx8335fd043xb4hdnqcbjzf9h228bp", - "depends": ["annotate", "Biobase", "BiocManager", "GEOquery", "markdown", "R_utils", "xml2"] + "depends": ["Biobase", "BiocManager", "GEOquery", "R_utils", "annotate", "markdown", "xml2"] }, "geneHapR": { "name": "geneHapR", "version": "1.2.4", "sha256": "1yairrndrggvkiwwamqv3qwjs8sci4jc6k53rqs766n752vsbisz", - "depends": ["ape", "Biostrings", "genetics", "GenomicRanges", "ggplot2", "ggpubr", "IRanges", "lolliplot", "maps", "pegas", "reshape2", "rlang", "rtracklayer", "sf", "shiny", "shinyjs", "stringdist", "stringr", "tibble", "tidyr", "vcfR"] + "depends": ["Biostrings", "GenomicRanges", "IRanges", "ape", "genetics", "ggplot2", "ggpubr", "lolliplot", "maps", "pegas", "reshape2", "rlang", "rtracklayer", "sf", "shiny", "shinyjs", "stringdist", "stringr", "tibble", "tidyr", "vcfR"] }, "geneHummus": { "name": "geneHummus", @@ -65219,7 +65879,7 @@ "name": "geneSLOPE", "version": "0.38.2", "sha256": "08fbrssj03ak6xqm9fmb9v6ir7229qds891088wznvg58k81yslv", - "depends": ["bigmemory", "ggplot2", "SLOPE"] + "depends": ["SLOPE", "bigmemory", "ggplot2"] }, "genekitr": { "name": "genekitr", @@ -65279,7 +65939,7 @@ "name": "geneset", "version": "0.2.7", "sha256": "1fiyrlsy5zqmxdj71w5m0h70ln5b84y7mlhv2j8lad623gpng3l6", - "depends": ["dplyr", "fst", "RCurl", "stringi", "stringr"] + "depends": ["RCurl", "dplyr", "fst", "stringi", "stringr"] }, "genesysr": { "name": "genesysr", @@ -65291,13 +65951,13 @@ "name": "geneticae", "version": "0.4.0", "sha256": "0ka0m4dq8a9bzdk3gi7gj6dnc2a7c4chrzixw2g4qd7md31z33vx", - "depends": ["calibrate", "dplyr", "GGEBiplots", "ggforce", "ggplot2", "MASS", "matrixStats", "missMDA", "pcaMethods", "prettydoc", "reshape2", "rlang", "rrcov", "scales", "tidyr"] + "depends": ["GGEBiplots", "MASS", "calibrate", "dplyr", "ggforce", "ggplot2", "matrixStats", "missMDA", "pcaMethods", "prettydoc", "reshape2", "rlang", "rrcov", "scales", "tidyr"] }, "genetics": { "name": "genetics", "version": "1.3.8.1.3", "sha256": "0lljxvz7nc6y2z303icphar2niir0i407w5cyhy2pwspd9gwkwpy", - "depends": ["combinat", "gdata", "gtools", "MASS", "mvtnorm"] + "depends": ["MASS", "combinat", "gdata", "gtools", "mvtnorm"] }, "genfrn": { "name": "genfrn", @@ -65309,12 +65969,12 @@ "name": "genie", "version": "1.0.5", "sha256": "07w6rf4a3d34j7dwz9zcxshg2sk1cd5v59xs3jxph17c9gga0nlq", - "depends": ["genieclust", "Rcpp"] + "depends": ["Rcpp", "genieclust"] }, "genieBPC": { "name": "genieBPC", - "version": "1.1.1", - "sha256": "1s8qi5i10a3qkpgls2589m6aiyda2k7gbfjmbpkbjw73girkh5ln", + "version": "2.0.1", + "sha256": "02jfa24qjpdn6z25312hs9vgasr6pkfab5apmmsh3yqhq6l4g7jg", "depends": ["cli", "dplyr", "dtplyr", "httr", "jsonlite", "purrr", "rlang", "stringr", "sunburstR", "tibble", "tidyr"] }, "genieclust": { @@ -65327,7 +65987,7 @@ "name": "genio", "version": "1.1.2", "sha256": "0izx8yv8mvnfxdqnqpnp2ldw1hzs6ggxi7jgmjlgxkgmm4vngbgl", - "depends": ["dplyr", "Rcpp", "readr", "tibble"] + "depends": ["Rcpp", "dplyr", "readr", "tibble"] }, "geniusr": { "name": "geniusr", @@ -65339,7 +65999,7 @@ "name": "genlasso", "version": "1.6.1", "sha256": "0bhpsz4qcvnmf09l1j6r94ljrdfxidjrsmggb3q4xvyf2xxnnbfx", - "depends": ["igraph", "Matrix"] + "depends": ["Matrix", "igraph"] }, "genlogis": { "name": "genlogis", @@ -65351,7 +66011,7 @@ "name": "geno2proteo", "version": "0.0.6", "sha256": "1gq8lqwwqvmxqqxwf4kms7dhd1zzz33z37m67q53p4a1j5z5n12s", - "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "R_utils", "RUnit", "S4Vectors"] + "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "RUnit", "R_utils", "S4Vectors"] }, "genoPlotR": { "name": "genoPlotR", @@ -65369,7 +66029,7 @@ "name": "genogeographer", "version": "0.1.19", "sha256": "0q56ysv5333i27iv1gmd9ilbgn3rw8sb9yq7z76gmn1fak5aqci8", - "depends": ["dplyr", "DT", "forcats", "ggplot2", "knitr", "leaflet", "magrittr", "maps", "purrr", "readr", "rio", "rlang", "rmarkdown", "shiny", "shinycssloaders", "shinyjs", "shinyWidgets", "tibble", "tidyr"] + "depends": ["DT", "dplyr", "forcats", "ggplot2", "knitr", "leaflet", "magrittr", "maps", "purrr", "readr", "rio", "rlang", "rmarkdown", "shiny", "shinyWidgets", "shinycssloaders", "shinyjs", "tibble", "tidyr"] }, "genomic_autocorr": { "name": "genomic.autocorr", @@ -65393,7 +66053,7 @@ "name": "genpwr", "version": "1.0.4", "sha256": "0cys4zmfq07g99xywqampvmn8g0a6bjjj368d62q5xki2mi9z649", - "depends": ["ggplot2", "MASS", "nleqslv"] + "depends": ["MASS", "ggplot2", "nleqslv"] }, "genridge": { "name": "genridge", @@ -65405,7 +66065,7 @@ "name": "genscore", "version": "1.0.2.2", "sha256": "1ffwnxh1c2wlad4wh9lkvixly0a19l8fcgpp0vxxby6iwsd2vshf", - "depends": ["mvtnorm", "Rdpack", "stringr", "tmvtnorm"] + "depends": ["Rdpack", "mvtnorm", "stringr", "tmvtnorm"] }, "genset": { "name": "genset", @@ -65417,7 +66077,7 @@ "name": "gensphere", "version": "1.3", "sha256": "0cf1xmwi32x3ga9m5k7a93vdwix84ny7wxb74mddmfvb3m1v4c7g", - "depends": ["geometry", "mvmesh", "rgl", "SimplicialCubature", "SphericalCubature"] + "depends": ["SimplicialCubature", "SphericalCubature", "geometry", "mvmesh", "rgl"] }, "genstab": { "name": "genstab", @@ -65447,19 +66107,19 @@ "name": "geoFKF", "version": "0.1.1", "sha256": "1fwzc32dq3ip0crxlmnqfxqky1jbadvdyfaprsbcxpmyrcs4f3qj", - "depends": ["numDeriv", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "numDeriv"] }, "geoFourierFDA": { "name": "geoFourierFDA", "version": "0.1.0", "sha256": "1a5ggjyfj5ic9h7fqvy3r7s0i6bmbwk95bf7y3vrmmmj0sxdm1mf", - "depends": ["magrittr", "orthopolynom", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "magrittr", "orthopolynom"] }, "geoGAM": { "name": "geoGAM", "version": "0.1-3", "sha256": "080rls4rbac809hd4ddjsj2ndb2hv6fvwdnh4yl7j1hnfm1xwv64", - "depends": ["grpreg", "MASS", "mboost", "mgcv"] + "depends": ["MASS", "grpreg", "mboost", "mgcv"] }, "geoR": { "name": "geoR", @@ -65499,15 +66159,15 @@ }, "geocausal": { "name": "geocausal", - "version": "0.3.0", - "sha256": "0kbjyk9al54y2k9w96rpchv2gwk5f96g6a536fp4sfbhqlmpc0f3", - "depends": ["data_table", "dplyr", "furrr", "ggplot2", "ggpubr", "latex2exp", "mclust", "progressr", "purrr", "sf", "spatstat_explore", "spatstat_geom", "spatstat_model", "terra", "tidyr", "tidyselect", "tidyterra"] + "version": "0.3.2", + "sha256": "0cz1pzfyygiriwagqlhcwibmr2zakkdcnz9jnkghyw7s9xqvnnd6", + "depends": ["data_table", "dplyr", "furrr", "ggplot2", "ggpubr", "latex2exp", "mclust", "progressr", "purrr", "sf", "spatstat_explore", "spatstat_geom", "spatstat_model", "spatstat_univar", "terra", "tidyr", "tidyselect", "tidyterra"] }, "geocmeans": { "name": "geocmeans", "version": "0.3.4", "sha256": "02h171flg295ixpgl2glav2ij0wbvy7kclazdlldw40461aar5nk", - "depends": ["dplyr", "fclust", "fmsb", "future_apply", "ggplot2", "leaflet", "matrixStats", "plotly", "progressr", "Rcpp", "RcppArmadillo", "Rdpack", "reldist", "reshape2", "sf", "shiny", "spdep", "terra", "tmap"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "dplyr", "fclust", "fmsb", "future_apply", "ggplot2", "leaflet", "matrixStats", "plotly", "progressr", "reldist", "reshape2", "sf", "shiny", "spdep", "terra", "tmap"] }, "geodaData": { "name": "geodaData", @@ -65537,7 +66197,7 @@ "name": "geodiv", "version": "1.1.0", "sha256": "0580q71m71xd0kn9z8l536ypl31gx4fyw6cn1nc03sazrdilkz8r", - "depends": ["dplyr", "e1071", "pracma", "Rcpp", "RcppArmadillo", "rlang", "sf", "spatial", "terra", "zoo"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "e1071", "pracma", "rlang", "sf", "spatial", "terra", "zoo"] }, "geodrawr": { "name": "geodrawr", @@ -65575,6 +66235,12 @@ "sha256": "0jqqv5agnw071ysrmwz5r2z76f80rzm5bfl5g23gq1mbw85x8z8m", "depends": ["Rcpp", "RcppArmadillo", "sf", "sp"] }, + "geohabnet": { + "name": "geohabnet", + "version": "2.1.3", + "sha256": "16a1qvmlynsvws3kl1l1apds8gxgf4yx1c7z92qcp73kilbmgp3x", + "depends": ["beepr", "config", "easycsv", "future", "future_apply", "geodata", "geosphere", "ggplot2", "igraph", "magrittr", "memoise", "patchwork", "rlang", "rnaturalearth", "stringr", "terra", "viridisLite", "yaml"] + }, "geohashTools": { "name": "geohashTools", "version": "0.3.3", @@ -65597,19 +66263,19 @@ "name": "geojsonio", "version": "0.11.3", "sha256": "0as0lcypj05j1vxkf3f13z4x6crjvgwmy06xrgq7j124f4syns3i", - "depends": ["crul", "geojson", "geojsonsf", "jqr", "jsonlite", "magrittr", "readr", "sf", "sp", "V8"] + "depends": ["V8", "crul", "geojson", "geojsonsf", "jqr", "jsonlite", "magrittr", "readr", "sf", "sp"] }, "geojsonsf": { "name": "geojsonsf", "version": "2.0.3", "sha256": "1la6zfzv14ascwds0bp67d7x3am0v14mylc4b2lyd0nrf93a2p17", - "depends": ["geometries", "jsonify", "rapidjsonr", "Rcpp", "sfheaders"] + "depends": ["Rcpp", "geometries", "jsonify", "rapidjsonr", "sfheaders"] }, "geomander": { "name": "geomander", "version": "2.3.0", "sha256": "1w47ln4vxxlp45rqmr6diglwmyadhrq7n6smbgipznwkfkr975jm", - "depends": ["censable", "cli", "dataverse", "dplyr", "geos", "ggplot2", "magrittr", "Rcpp", "readr", "rlang", "sf", "stringr", "tibble", "tidyr", "tinytiger"] + "depends": ["Rcpp", "censable", "cli", "dataverse", "dplyr", "geos", "ggplot2", "magrittr", "readr", "rlang", "sf", "stringr", "tibble", "tidyr", "tinytiger"] }, "geomapdata": { "name": "geomapdata", @@ -65633,7 +66299,7 @@ "name": "geometa", "version": "0.8-0", "sha256": "14f1g5ijm2hv0cncrddfr8fca9517g0dyrkfgc0k1v301nhlvcn4", - "depends": ["crayon", "httr", "jsonlite", "keyring", "R6", "readr", "XML"] + "depends": ["R6", "XML", "crayon", "httr", "jsonlite", "keyring", "readr"] }, "geometries": { "name": "geometries", @@ -65645,19 +66311,25 @@ "name": "geometry", "version": "0.4.7", "sha256": "0fq1sbjlc02idfsnvily7hgi6zgjvrjh7c57wz166k8vyl2l484n", - "depends": ["linprog", "lpSolve", "magic", "Rcpp", "RcppProgress"] + "depends": ["Rcpp", "RcppProgress", "linprog", "lpSolve", "magic"] + }, + "geommc": { + "name": "geommc", + "version": "0.0.1", + "sha256": "0jc5fm2qrbhdk2dnh00yffjr07j8bg20h5dm0vj6qy1xkq7mrpx0", + "depends": ["Matrix", "Rcpp", "cubature", "magrittr", "matrixcalc", "mcmc"] }, "geomod": { "name": "geomod", "version": "0.1.0", "sha256": "06a211cyhcicy5arpjxiglami56plkm6ybxbzbmjd0z6yn9yyd38", - "depends": ["arm", "caret", "Cubist", "e1071", "kernlab", "nnet", "qrnn", "quantregForest", "randomForest", "ranger", "raster", "rasterVis", "rpart", "sp"] + "depends": ["Cubist", "arm", "caret", "e1071", "kernlab", "nnet", "qrnn", "quantregForest", "randomForest", "ranger", "raster", "rasterVis", "rpart", "sp"] }, "geomorph": { "name": "geomorph", - "version": "4.0.7", - "sha256": "16rqf1g5g3gvzjvjjahs06h00gl3n1vbmk8xzyh0c3rjmgdiz2x3", - "depends": ["ape", "ggplot2", "jpeg", "Matrix", "rgl", "RRPP"] + "version": "4.0.8", + "sha256": "0m8c1y3mi794k7b8zrnkvs098gjmaq3lvp1ds3kxjn7v0ddavd0l", + "depends": ["Matrix", "RRPP", "ape", "ggplot2", "jpeg", "rgl"] }, "geomtextpath": { "name": "geomtextpath", @@ -65667,9 +66339,9 @@ }, "geomultistar": { "name": "geomultistar", - "version": "1.2.1", - "sha256": "00fkrbsi4gw7jkvfwwxnxxq9fbbkl6i2n5wmpzglwiy21y74y6pn", - "depends": ["dplyr", "generics", "purrr", "rlang", "RSQLite", "sf", "tibble", "tidyr", "tidyselect"] + "version": "1.2.2", + "sha256": "0vvk48na7130d8j3gm0c5vgi1riqwkjk314pd03i7b4mw00pcm92", + "depends": ["RSQLite", "dplyr", "generics", "purrr", "rlang", "sf", "tibble", "tidyr", "tidyselect"] }, "geonames": { "name": "geonames", @@ -65681,7 +66353,7 @@ "name": "geonapi", "version": "0.7-2", "sha256": "0n6s9gvg9z8hn3sih0gj35x8zxspqa8h8bml50bhsl5y4gcfihgd", - "depends": ["geometa", "httr", "keyring", "openssl", "plyr", "R6", "XML"] + "depends": ["R6", "XML", "geometa", "httr", "keyring", "openssl", "plyr"] }, "geonetwork": { "name": "geonetwork", @@ -65693,7 +66365,7 @@ "name": "geonode4R", "version": "0.1-1", "sha256": "1pyyknkg9dv58vq8w4pmxd36j8l352zb2jv99skvyg0vn07m6bax", - "depends": ["httr", "keyring", "openssl", "R6", "readr"] + "depends": ["R6", "httr", "keyring", "openssl", "readr"] }, "geoperu": { "name": "geoperu", @@ -65723,7 +66395,7 @@ "name": "geosapi", "version": "0.7-1", "sha256": "0zq02xnzqszmkdj99686g2x91gyc8x16yhkixhpd7frap7zy6h23", - "depends": ["cli", "httr", "keyring", "magrittr", "openssl", "R6", "readr", "xml2"] + "depends": ["R6", "cli", "httr", "keyring", "magrittr", "openssl", "readr", "xml2"] }, "geoscale": { "name": "geoscale", @@ -65741,7 +66413,7 @@ "name": "geosimilarity", "version": "2.2", "sha256": "1mkab3377r04zybqsswakcgqwgby9iwb8bhxkr8s27blxha44jcp", - "depends": ["DescTools", "dplyr", "ggplot2", "ggrepel", "SecDim"] + "depends": ["DescTools", "SecDim", "dplyr", "ggplot2", "ggrepel"] }, "geospark": { "name": "geospark", @@ -65759,19 +66431,19 @@ "name": "geospt", "version": "1.0-4", "sha256": "1fmvrsmh4nfc4g8z9ca5k4c4pm7wy218crhigp58n6i6avvf9scz", - "depends": ["fields", "genalg", "gsl", "gstat", "limSolve", "MASS", "minqa", "plyr", "sgeostat", "sp", "TeachingDemos"] + "depends": ["MASS", "TeachingDemos", "fields", "genalg", "gsl", "gstat", "limSolve", "minqa", "plyr", "sgeostat", "sp"] }, "geosptdb": { "name": "geosptdb", "version": "1.0-1", "sha256": "1n1jvigavcxlbc5wki74lnhax3060i44m1cvkcr664wsjqhx3kl2", - "depends": ["FD", "fields", "geospt", "gsl", "limSolve", "minqa", "sp", "StatMatch"] + "depends": ["FD", "StatMatch", "fields", "geospt", "gsl", "limSolve", "minqa", "sp"] }, "geostan": { "name": "geostan", "version": "0.6.2", "sha256": "078lk4c9igkm3il0yfcv2i64rj1fr3b5qz3d3szly2jh2ba5zdgh", - "depends": ["BH", "ggplot2", "gridExtra", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "sf", "signs", "spdep", "StanHeaders", "truncnorm"] + "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "gridExtra", "rstan", "rstantools", "sf", "signs", "spdep", "truncnorm"] }, "geostats": { "name": "geostats", @@ -65783,7 +66455,7 @@ "name": "geostatsp", "version": "2.0.6", "sha256": "10xmdgmmd4f67778g02hyqzkk9zj9c0cdfs9cw8py1b413vfclyv", - "depends": ["abind", "Matrix", "numDeriv", "terra"] + "depends": ["Matrix", "abind", "numDeriv", "terra"] }, "geotools": { "name": "geotools", @@ -65791,6 +66463,12 @@ "sha256": "0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd", "depends": [] }, + "geotoolsR": { + "name": "geotoolsR", + "version": "1.2.1", + "sha256": "0chiyvc3f3y45v4ja1jhj4pag54ir18d42qnfd3q8dnyisk8cags", + "depends": ["dplyr", "geoR", "ggplot2", "tidyr"] + }, "geotopbricks": { "name": "geotopbricks", "version": "1.5.8.2", @@ -65821,29 +66499,35 @@ "sha256": "0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm", "depends": ["bitops"] }, + "geppe": { + "name": "geppe", + "version": "1.0", + "sha256": "08d50sg80dj3jazznszs7b0jpb21jp9khjvplx1qgdlpnlljwq4h", + "depends": ["Rfast2"] + }, "gerbil": { "name": "gerbil", "version": "0.1.9", "sha256": "1ra1piza922sigxk61v55dbpkmzha716drmb6m1qxn892vykmm8w", - "depends": ["DescTools", "lattice", "MASS", "mvtnorm", "openxlsx", "pbapply", "truncnorm"] + "depends": ["DescTools", "MASS", "lattice", "mvtnorm", "openxlsx", "pbapply", "truncnorm"] }, "germinationmetrics": { "name": "germinationmetrics", "version": "0.1.8", "sha256": "1lssjs9rp09l9draylrkslb74apizbanacgp00yyxhgxa39dk2g6", - "depends": ["broom", "data_table", "ggplot2", "ggrepel", "gslnls", "mathjaxr", "plyr", "Rdpack"] + "depends": ["Rdpack", "broom", "data_table", "ggplot2", "ggrepel", "gslnls", "mathjaxr", "plyr"] }, "gert": { "name": "gert", - "version": "2.0.1", - "sha256": "14nh7j0xz1s4ngsd5n3hixr534z843a38y57grwqkkh9g21q9mqf", + "version": "2.1.1", + "sha256": "0r59xn1c7axicl137a1l2mq74gzw5m7pi2x69ppyfji83c27q0s2", "depends": ["askpass", "credentials", "openssl", "rstudioapi", "sys", "zip"] }, "gesisdata": { "name": "gesisdata", "version": "0.1.2", "sha256": "1cabgmprwlwn09hd1jd9hvj50bqaarxyajz251l0vv2qb3d5l11a", - "depends": ["dplyr", "foreign", "magrittr", "netstat", "rio", "RSelenium", "stringr"] + "depends": ["RSelenium", "dplyr", "foreign", "magrittr", "netstat", "rio", "stringr"] }, "geslaR": { "name": "geslaR", @@ -65855,7 +66539,7 @@ "name": "gesso", "version": "1.0.2", "sha256": "0i7a927mbll8mlisxb0ic62fvq1wp5v0m69n7zkhcjabkxr7gbn3", - "depends": ["BH", "bigmemory", "dplyr", "Matrix", "Rcpp", "RcppEigen", "RcppThread"] + "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "RcppThread", "bigmemory", "dplyr"] }, "gestalt": { "name": "gestalt", @@ -65925,21 +66609,21 @@ }, "gets": { "name": "gets", - "version": "0.37", - "sha256": "1h7hn8n08sqnygbzyiq9zg11b5i9g6islc72c0qypx4j4wba5z55", + "version": "0.38", + "sha256": "0jwjwlg8r4mgk12iszxyy2nfnmqy75ajal3nzdgb8rn2xa3q35vc", "depends": ["zoo"] }, "getspanel": { "name": "getspanel", "version": "0.2.0", "sha256": "0xccla4w7vc82gqxfm927xzynchn9zi37smnq03rkamn4pf7v4gz", - "depends": ["fastDummies", "gets", "ggplot2", "Matrix", "mvtnorm"] + "depends": ["Matrix", "fastDummies", "gets", "ggplot2", "mvtnorm"] }, "getspres": { "name": "getspres", "version": "0.2.0", "sha256": "190y4qrm1wawp0787zhw3g8h9s2smacvvxbs70pxbhysq4bkzcdd", - "depends": ["colorRamps", "colorspace", "dplyr", "metafor", "plotrix", "RColorBrewer"] + "depends": ["RColorBrewer", "colorRamps", "colorspace", "dplyr", "metafor", "plotrix"] }, "gettz": { "name": "gettz", @@ -65975,37 +66659,25 @@ "name": "gfcanalysis", "version": "1.8.0", "sha256": "0j13y90nyd3qczrkzxwi1wpf5xlh7c0nlsyn8p7z1b4y93v63byc", - "depends": ["animation", "geosphere", "ggplot2", "plyr", "raster", "rasterVis", "RCurl", "sf", "stringr", "terra"] + "depends": ["RCurl", "animation", "geosphere", "ggplot2", "plyr", "raster", "rasterVis", "sf", "stringr", "terra"] }, "gfer": { "name": "gfer", "version": "0.1.12", "sha256": "19iarppqaz05352f3ng01yi7na9p612nxwwwagm2nxy1gxrjz5rh", - "depends": ["circlize", "data_table", "ggplot2", "ggrepel", "googlesheets4", "gsheet", "httr", "jsonlite", "rvest", "scatterpie", "stringi", "tidyr", "V8", "xml2"] + "depends": ["V8", "circlize", "data_table", "ggplot2", "ggrepel", "googlesheets4", "gsheet", "httr", "jsonlite", "rvest", "scatterpie", "stringi", "tidyr", "xml2"] }, "gfiExtremes": { "name": "gfiExtremes", "version": "1.0.1", "sha256": "0iljf63pwwxzj0syvj7p13m6q82y7nf1kq5xpgyczkbrrbb59p7n", - "depends": ["BH", "coda", "doParallel", "foreach", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "coda", "doParallel", "foreach"] }, "gfiUltra": { "name": "gfiUltra", "version": "1.0.0", "sha256": "1n6sp7h0ys92mqixznrs2j8kmban3mx8swrwdpxgxc6vxycky8d8", - "depends": ["lazyeval", "mvtnorm", "SIS"] - }, - "gfilmm": { - "name": "gfilmm", - "version": "2.0.5", - "sha256": "0mn2z4aihz0anpm6d0cpyabhbd88x1cp0wgwxl5hgvkw547818pb", - "depends": ["forcats", "lazyeval", "Matrix", "Rcpp", "RcppEigen", "spatstat", "spatstat_geom"] - }, - "gfilogisreg": { - "name": "gfilogisreg", - "version": "1.0.3", - "sha256": "1x9j2ac7lk2gkcwxkvyc3bj23z5bibhx64lj4nwsgdjq14677502", - "depends": ["BH", "EigenR", "lazyeval", "rcdd", "Rcpp", "RcppArmadillo", "roptim", "spatstat", "spatstat_geom"] + "depends": ["SIS", "lazyeval", "mvtnorm"] }, "gfoRmula": { "name": "gfoRmula", @@ -66059,19 +66731,19 @@ "name": "ggESDA", "version": "0.2.0", "sha256": "0abjjs1syk9w5fqs778njkz3f92kil1617239hzdcjy67hbbf3c0", - "depends": ["dplyr", "ggforce", "ggplot2", "ggpubr", "ggthemes", "gridExtra", "gtools", "magrittr", "prodlim", "R6", "rlang", "RSDA", "stringr", "tibble", "tidyr", "tidyverse", "vctrs"] + "depends": ["R6", "RSDA", "dplyr", "ggforce", "ggplot2", "ggpubr", "ggthemes", "gridExtra", "gtools", "magrittr", "prodlim", "rlang", "stringr", "tibble", "tidyr", "tidyverse", "vctrs"] }, "ggExtra": { "name": "ggExtra", "version": "0.10.1", "sha256": "0b78bnkhjlfa2h3f5iib0hqas8r289vqglfbk71a419rivzfsyb8", - "depends": ["colourpicker", "ggplot2", "gtable", "miniUI", "R6", "scales", "shiny", "shinyjs"] + "depends": ["R6", "colourpicker", "ggplot2", "gtable", "miniUI", "scales", "shiny", "shinyjs"] }, "ggFishPlots": { "name": "ggFishPlots", - "version": "0.2.2", - "sha256": "1zp4g29p15ac0g8cywhsagsxkagvah4xwfhv8j9djkbi7ijdx8fq", - "depends": ["broom", "dplyr", "fishmethods", "ggplot2", "ggrepel", "ggridges", "magrittr", "rlang", "tibble", "tidyr", "tidyselect"] + "version": "0.3.0", + "sha256": "12p3ldbfxp51sqswms9zk6chmi8qy0ncv3l2bh9i6b1xhjcx86b2", + "depends": ["broom", "dplyr", "fishmethods", "ggplot2", "ggrepel", "ggridges", "magrittr", "purrr", "rlang", "scales", "tibble", "tidyr", "tidyselect"] }, "ggHoriPlot": { "name": "ggHoriPlot", @@ -66089,7 +66761,7 @@ "name": "ggPMX", "version": "1.2.11", "sha256": "04381iaa52ljpkbi4sy5xgyiv0vznd2k7vnwvsdyk4qkggxxyqw9", - "depends": ["assertthat", "checkmate", "data_table", "dplyr", "GGally", "ggforce", "ggplot2", "gtable", "knitr", "magrittr", "purrr", "R6", "readr", "rlang", "rmarkdown", "scales", "stringr", "tidyr", "yaml", "zoo"] + "depends": ["GGally", "R6", "assertthat", "checkmate", "data_table", "dplyr", "ggforce", "ggplot2", "gtable", "knitr", "magrittr", "purrr", "readr", "rlang", "rmarkdown", "scales", "stringr", "tidyr", "yaml", "zoo"] }, "ggQC": { "name": "ggQC", @@ -66113,7 +66785,7 @@ "name": "ggResidpanel", "version": "0.3.0", "sha256": "1vsjw229pd36100ix1sgfmk5lb9b0fx3l6pxg1irsfhm2ypbg1ig", - "depends": ["cowplot", "ggplot2", "MASS", "plotly", "qqplotr", "stringr"] + "depends": ["MASS", "cowplot", "ggplot2", "plotly", "qqplotr", "stringr"] }, "ggRtsy": { "name": "ggRtsy", @@ -66173,7 +66845,7 @@ "name": "ggalt", "version": "0.4.0", "sha256": "0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc", - "depends": ["ash", "dplyr", "extrafont", "ggplot2", "gtable", "KernSmooth", "maps", "MASS", "plotly", "proj4", "RColorBrewer", "scales", "tibble"] + "depends": ["KernSmooth", "MASS", "RColorBrewer", "ash", "dplyr", "extrafont", "ggplot2", "gtable", "maps", "plotly", "proj4", "scales", "tibble"] }, "ggamma": { "name": "ggamma", @@ -66219,8 +66891,8 @@ }, "ggblanket": { "name": "ggblanket", - "version": "9.1.1", - "sha256": "1nnb6kx6yl4rdfjib9xp406wb533zwl3wcfv0d8nljq094n8j7hy", + "version": "10.0.0", + "sha256": "1ym4sv692ly1r16hf1cxkm6mjz6djik3hwsw2gj2ydchypkdsq3q", "depends": ["colorspace", "dplyr", "farver", "forcats", "ggplot2", "hms", "labelled", "lubridate", "magrittr", "purrr", "rlang", "scales", "snakecase", "stringr", "tidyr", "tidyselect", "viridisLite"] }, "ggblend": { @@ -66245,7 +66917,7 @@ "name": "ggbrain", "version": "0.8.1", "sha256": "1nicqirp69k0ish7j3mr7zz82w2lj5jcvmn7cbx764r62s5pscvd", - "depends": ["checkmate", "data_table", "dplyr", "ggnewscale", "ggplot2", "ggrepel", "glue", "imager", "Matrix", "patchwork", "Rcpp", "RcppArmadillo", "rlang", "RNifti", "tibble", "tidyr", "tidyselect"] + "depends": ["Matrix", "RNifti", "Rcpp", "RcppArmadillo", "checkmate", "data_table", "dplyr", "ggnewscale", "ggplot2", "ggrepel", "glue", "imager", "patchwork", "rlang", "tibble", "tidyr", "tidyselect"] }, "ggbreak": { "name": "ggbreak", @@ -66275,7 +66947,7 @@ "name": "ggchangepoint", "version": "0.1.0", "sha256": "0brd9z8wj563j2kcx12bz4kyg2ynppxx5cz8k23xli1qijlib98p", - "depends": ["changepoint", "changepoint_np", "dplyr", "ecp", "ggplot2", "Rdpack", "tibble"] + "depends": ["Rdpack", "changepoint", "changepoint_np", "dplyr", "ecp", "ggplot2", "tibble"] }, "ggcharts": { "name": "ggcharts", @@ -66303,8 +66975,8 @@ }, "ggdag": { "name": "ggdag", - "version": "0.2.12", - "sha256": "0q5iwafrhq77wxdc9dj9jl5a0rsj3rz3bjz8qb2yjd5j1qlj2mlx", + "version": "0.2.13", + "sha256": "074n9w1vgzmx677nppjfp4k3wf7rp0yfh9fbyhb3man4gl2w17df", "depends": ["dagitty", "dplyr", "forcats", "ggplot2", "ggraph", "ggrepel", "igraph", "magrittr", "pillar", "purrr", "rlang", "stringr", "tibble", "tidygraph"] }, "ggdark": { @@ -66323,31 +66995,31 @@ "name": "ggdemetra", "version": "0.2.8", "sha256": "18i96jkbc0zm9xgn5250v2316kccr5vcxag2gii7lag7bhj6fq51", - "depends": ["ggplot2", "ggrepel", "gridExtra", "RJDemetra"] + "depends": ["RJDemetra", "ggplot2", "ggrepel", "gridExtra"] }, "ggdendro": { "name": "ggdendro", "version": "0.2.0", "sha256": "0sdayyzvhkbli0ha68mc0f7cgp36njv9ign37d63l21hvd6w6h0r", - "depends": ["ggplot2", "MASS"] + "depends": ["MASS", "ggplot2"] }, "ggdensity": { "name": "ggdensity", "version": "1.0.0", "sha256": "01ym1af6w39zg6xh5mls8kwl4mg0lpjd94j0hm2xrgl39llpwx6r", - "depends": ["ggplot2", "isoband", "MASS", "scales", "tibble", "vctrs"] + "depends": ["MASS", "ggplot2", "isoband", "scales", "tibble", "vctrs"] }, "ggdist": { "name": "ggdist", "version": "3.3.2", "sha256": "1wc3pqnf2r0324jm0vv1872smriv25h0lx0mni7qp93wrf8k0mpn", - "depends": ["cli", "distributional", "ggplot2", "glue", "gtable", "numDeriv", "quadprog", "Rcpp", "rlang", "scales", "tibble", "vctrs", "withr"] + "depends": ["Rcpp", "cli", "distributional", "ggplot2", "glue", "gtable", "numDeriv", "quadprog", "rlang", "scales", "tibble", "vctrs", "withr"] }, "ggdmc": { "name": "ggdmc", "version": "0.2.6.0", "sha256": "1gncv7npl548k3zd41x2gwg5qywn5rp6zb4i7ga78sy77mvi3x92", - "depends": ["coda", "data_table", "ggplot2", "matrixStats", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "coda", "data_table", "ggplot2", "matrixStats"] }, "gge": { "name": "gge", @@ -66369,8 +67041,8 @@ }, "ggeffects": { "name": "ggeffects", - "version": "1.6.0", - "sha256": "02cpiadigrxbw2qnajc1pkqvkl3hzw0yqidsb8lp67vcsx3czh7z", + "version": "1.7.0", + "sha256": "1pbg6iwnbh7cwdzhb44knnbv70lkcgjzrzwyhdzv28vmyc7qy9cj", "depends": ["insight"] }, "ggenealogy": { @@ -66389,7 +67061,7 @@ "name": "ggfacto", "version": "0.3.0", "sha256": "069qzz2192vq6zsqpq2wqxhj6a26g4mpdbng7ing4ha9xfnp9h7g", - "depends": ["data_table", "dplyr", "FactoMineR", "forcats", "ggforce", "ggiraph", "ggplot2", "ggrepel", "gridExtra", "magrittr", "purrr", "rlang", "stringr", "tabxplor", "tibble", "tidyr", "tidyselect", "vctrs", "withr"] + "depends": ["FactoMineR", "data_table", "dplyr", "forcats", "ggforce", "ggiraph", "ggplot2", "ggrepel", "gridExtra", "magrittr", "purrr", "rlang", "stringr", "tabxplor", "tibble", "tidyr", "tidyselect", "vctrs", "withr"] }, "ggfields": { "name": "ggfields", @@ -66419,13 +67091,13 @@ "name": "ggfocus", "version": "1.0.0", "sha256": "03q0rz7flm8sc8hrlkcm5fz66qiyxb8z8q4bh9dglhw0jc8q1fvb", - "depends": ["dplyr", "ggplot2", "magrittr", "RColorBrewer", "rlang"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "magrittr", "rlang"] }, "ggforce": { "name": "ggforce", "version": "0.4.2", "sha256": "1a2i1rl27yqh8kxjpphwcv05p19l2aw07q9gxl4x8iv8xpkb0if1", - "depends": ["cli", "ggplot2", "gtable", "lifecycle", "MASS", "polyclip", "Rcpp", "RcppEigen", "rlang", "scales", "systemfonts", "tidyselect", "tweenr", "vctrs", "withr"] + "depends": ["MASS", "Rcpp", "RcppEigen", "cli", "ggplot2", "gtable", "lifecycle", "polyclip", "rlang", "scales", "systemfonts", "tidyselect", "tweenr", "vctrs", "withr"] }, "ggformula": { "name": "ggformula", @@ -66441,9 +67113,9 @@ }, "ggfoundry": { "name": "ggfoundry", - "version": "0.2.0", - "sha256": "06nc6866lzb417z2bdcjy2qv799bfgkbkalgrsvx5nc1ggq2vpxf", - "depends": ["ggplot2", "grImport2", "lifecycle", "rlang"] + "version": "0.3.1", + "sha256": "0m7r1845vx3snxadqbg3vxyxsh115h7bi5h3q3x1n4c1nd5y45r7", + "depends": ["cli", "ggplot2", "grImport2", "lifecycle", "rlang"] }, "ggfun": { "name": "ggfun", @@ -66469,6 +67141,12 @@ "sha256": "08s0fhk2kz3ks64nfmdbd8p3swkn62cbw7dpbqgk9ydpmh5gpjbj", "depends": ["ggfittext", "ggplot2", "rlang"] }, + "gggenomes": { + "name": "gggenomes", + "version": "1.0.0", + "sha256": "0f3mkwbxmbszahfwr11big9cwlgp7nwbhfsxxfrhqshmr56ydpiw", + "depends": ["colorspace", "dplyr", "ellipsis", "ggplot2", "jsonlite", "magrittr", "purrr", "readr", "rlang", "scales", "snakecase", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] + }, "ggghost": { "name": "ggghost", "version": "0.2.1", @@ -66527,7 +67205,7 @@ "name": "gghilbertstrings", "version": "0.3.3", "sha256": "0b3xp1w6fkkmjh7gihhfkp4npx553a75bvsal3w4j57xa34l8rap", - "depends": ["dplyr", "ggplot2", "lifecycle", "magrittr", "Rcpp", "rlang", "tibble"] + "depends": ["Rcpp", "dplyr", "ggplot2", "lifecycle", "magrittr", "rlang", "tibble"] }, "gghist": { "name": "gghist", @@ -66563,19 +67241,19 @@ "name": "ggip", "version": "0.3.2", "sha256": "0mg3p3lq3afw96ddk89v62jjd8ii7nhdcwlmdnmdxrw6awcmvyhk", - "depends": ["cli", "dplyr", "ggplot2", "ipaddress", "Rcpp", "rlang", "tidyr", "vctrs"] + "depends": ["Rcpp", "cli", "dplyr", "ggplot2", "ipaddress", "rlang", "tidyr", "vctrs"] }, "ggiraph": { "name": "ggiraph", "version": "0.8.10", "sha256": "17vdw9xaizcdf6fcbyhz9l514kk4w4dz9yvikbz9bvfx93a9z5ps", - "depends": ["cli", "ggplot2", "htmltools", "htmlwidgets", "purrr", "Rcpp", "rlang", "systemfonts", "uuid", "vctrs"] + "depends": ["Rcpp", "cli", "ggplot2", "htmltools", "htmlwidgets", "purrr", "rlang", "systemfonts", "uuid", "vctrs"] }, "ggiraphExtra": { "name": "ggiraphExtra", "version": "0.3.0", "sha256": "0q8ppixw5i1hpphmswpw6lvq7gx8rx4gfs2b8d31wbn32ziiv2rk", - "depends": ["dplyr", "ggiraph", "ggplot2", "magrittr", "mgcv", "mycor", "plyr", "ppcor", "purrr", "RColorBrewer", "reshape2", "scales", "sjlabelled", "sjmisc", "stringr", "tidyr"] + "depends": ["RColorBrewer", "dplyr", "ggiraph", "ggplot2", "magrittr", "mgcv", "mycor", "plyr", "ppcor", "purrr", "reshape2", "scales", "sjlabelled", "sjmisc", "stringr", "tidyr"] }, "ggisotonic": { "name": "ggisotonic", @@ -66597,9 +67275,9 @@ }, "gglgbtq": { "name": "gglgbtq", - "version": "0.1.1", - "sha256": "0z03rckalci6g9cd69mz3b7mz8q5z8313ci0q0qcfpkvfxmrz2py", - "depends": ["ggplot2"] + "version": "0.2.0", + "sha256": "1971cjn3xyn5wf2g9a8in05w3wjpvyql7928nkm3gxw23caczpd1", + "depends": ["ggplot2", "rlang", "tibble"] }, "gglm": { "name": "gglm", @@ -66641,7 +67319,7 @@ "name": "ggmcmc", "version": "1.5.1.1", "sha256": "1y6ya2qihm8h6ds84akhmsxn9c8jriw03wakaqzsmi21agz87n21", - "depends": ["dplyr", "GGally", "ggplot2", "tidyr"] + "depends": ["GGally", "dplyr", "ggplot2", "tidyr"] }, "ggmice": { "name": "ggmice", @@ -66653,7 +67331,7 @@ "name": "ggmix", "version": "0.0.2", "sha256": "158pzmr4vmy2qxmp3nrabjgkg11mrdvl1skzxgwida2is900f7gf", - "depends": ["glmnet", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "glmnet"] }, "ggmosaic": { "name": "ggmosaic", @@ -66693,8 +67371,8 @@ }, "ggnewscale": { "name": "ggnewscale", - "version": "0.4.10", - "sha256": "1j8d512qhdlhfp3hb36d1dqlqlxs0i303mnn31xnq1adcwwibmlz", + "version": "0.5.0", + "sha256": "0bfzqjaxg5r9qzi6hav0m6rcw1cr90h8pwwjklbv930finrxrw5p", "depends": ["ggplot2"] }, "ggnormalviolin": { @@ -66773,18 +67451,18 @@ "name": "ggpicrust2", "version": "1.7.3", "sha256": "0zjlsvzl2f74fvqw4ijnai23qwhlcpgd5p8z9dclnwnsgdbm6hcq", - "depends": ["ALDEx2", "aplot", "circlize", "DESeq2", "dplyr", "edgeR", "GGally", "ggh4x", "ggplot2", "ggprism", "lefser", "limma", "Maaslin2", "metagenomeSeq", "MicrobiomeStat", "patchwork", "readr", "SummarizedExperiment", "tibble", "tidyr"] + "depends": ["ALDEx2", "DESeq2", "GGally", "Maaslin2", "MicrobiomeStat", "SummarizedExperiment", "aplot", "circlize", "dplyr", "edgeR", "ggh4x", "ggplot2", "ggprism", "lefser", "limma", "metagenomeSeq", "patchwork", "readr", "tibble", "tidyr"] }, "ggpie": { "name": "ggpie", "version": "0.2.5", "sha256": "11c431ggrhyxiql1v9qajp568jri6hlp1kgl334j4f7sgyh73ng5", - "depends": ["dplyr", "ggnewscale", "ggplot2", "ggrepel", "magrittr", "RColorBrewer", "rlang", "scales", "stringr", "tibble"] + "depends": ["RColorBrewer", "dplyr", "ggnewscale", "ggplot2", "ggrepel", "magrittr", "rlang", "scales", "stringr", "tibble"] }, "ggplate": { "name": "ggplate", - "version": "0.1.3", - "sha256": "18ibiizxbzyshaxgw2ff639nn36mha5bv6yxa6960wjyx3z78772", + "version": "0.1.4", + "sha256": "0n2c9g6rl5vn5gki43xcc22p8hv2gyj7qr6jdbmllx22ld7zsz43", "depends": ["dplyr", "farver", "forcats", "ggplot2", "purrr", "rlang", "scales", "stringr", "tidyr"] }, "ggplot_multistats": { @@ -66797,13 +67475,13 @@ "name": "ggplot2", "version": "3.5.1", "sha256": "08a72kizg42mdm35170fnpn8l6r4n3j1yvbgiq1k8dlvz4jb8n3w", - "depends": ["cli", "glue", "gtable", "isoband", "lifecycle", "MASS", "mgcv", "rlang", "scales", "tibble", "vctrs", "withr"] + "depends": ["MASS", "cli", "glue", "gtable", "isoband", "lifecycle", "mgcv", "rlang", "scales", "tibble", "vctrs", "withr"] }, "ggplot2_utils": { "name": "ggplot2.utils", - "version": "0.3.1", - "sha256": "0fsardsv77rfm2idynqi5zb3wrqcjyckxxchvj894kgb1qfpa27v", - "depends": ["checkmate", "EnvStats", "ggplot2", "ggpp", "ggstats", "survival"] + "version": "0.3.2", + "sha256": "07svk16j9mc3d1fgkd5zpilnr82f7r40y9nachkp32s2bsg1a29g", + "depends": ["EnvStats", "checkmate", "ggplot2", "ggpp", "ggstats", "survival"] }, "ggplot2movies": { "name": "ggplot2movies", @@ -66821,7 +67499,7 @@ "name": "ggplotgui", "version": "1.0.0", "sha256": "1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0", - "depends": ["ggplot2", "haven", "plotly", "RColorBrewer", "readr", "readxl", "shiny", "stringr"] + "depends": ["RColorBrewer", "ggplot2", "haven", "plotly", "readr", "readxl", "shiny", "stringr"] }, "ggplotify": { "name": "ggplotify", @@ -66837,9 +67515,9 @@ }, "ggpmisc": { "name": "ggpmisc", - "version": "0.5.6", - "sha256": "0w514js5q6xchbbw2x3085d7parwa8nqaj4fvjplhpfah6rya2dv", - "depends": ["confintr", "dplyr", "generics", "ggplot2", "ggpp", "lmodel2", "lubridate", "MASS", "multcomp", "multcompView", "plyr", "polynom", "quantreg", "rlang", "scales", "splus2R", "tibble"] + "version": "0.6.0", + "sha256": "145w1pbwjdahgs06v8lms3ynpqryrrr4v0h8bgsmaqqkq1hjixmi", + "depends": ["MASS", "confintr", "dplyr", "generics", "ggplot2", "ggpp", "lmodel2", "lubridate", "multcomp", "multcompView", "plyr", "polynom", "quantreg", "rlang", "scales", "splus2R", "tibble"] }, "ggpointdensity": { "name": "ggpointdensity", @@ -66873,9 +67551,9 @@ }, "ggpp": { "name": "ggpp", - "version": "0.5.7", - "sha256": "0gd8dbcja4qjwjh414mp2xf8hnjlrp4zm4ac8j59kqxzpwxv8n04", - "depends": ["dplyr", "ggplot2", "glue", "gridExtra", "lubridate", "magrittr", "MASS", "polynom", "rlang", "scales", "stringr", "tibble", "vctrs", "xts", "zoo"] + "version": "0.5.8-1", + "sha256": "1jk3x679rvkj3if14cai99w5sk0nj07rhppwwd7i7a1daal0grh5", + "depends": ["MASS", "dplyr", "ggplot2", "glue", "gridExtra", "lubridate", "magrittr", "polynom", "rlang", "scales", "stringr", "tibble", "vctrs", "xts", "zoo"] }, "ggprism": { "name": "ggprism", @@ -66899,7 +67577,7 @@ "name": "ggquickeda", "version": "0.3.1", "sha256": "00m4qf51q40aknb20mj08n8s2fpym3qfcbcb37mpm2pdbsqgrzan", - "depends": ["colourpicker", "data_table", "dplyr", "DT", "forcats", "Formula", "GGally", "ggbeeswarm", "ggh4x", "ggplot2", "ggpmisc", "ggpubr", "ggrepel", "ggridges", "ggstance", "glue", "gridExtra", "Hmisc", "markdown", "patchwork", "plotly", "quantreg", "rlang", "rms", "RPostgres", "scales", "shiny", "shinyFiles", "shinyjqui", "shinyjs", "stringr", "survival", "survminer", "table1", "tibble", "tidyr", "zoo"] + "depends": ["DT", "Formula", "GGally", "Hmisc", "RPostgres", "colourpicker", "data_table", "dplyr", "forcats", "ggbeeswarm", "ggh4x", "ggplot2", "ggpmisc", "ggpubr", "ggrepel", "ggridges", "ggstance", "glue", "gridExtra", "markdown", "patchwork", "plotly", "quantreg", "rlang", "rms", "scales", "shiny", "shinyFiles", "shinyjqui", "shinyjs", "stringr", "survival", "survminer", "table1", "tibble", "tidyr", "zoo"] }, "ggquiver": { "name": "ggquiver", @@ -66923,7 +67601,7 @@ "name": "ggraph", "version": "2.2.1", "sha256": "1w9snb43wpa2rv16fx5vmh7nqpgkr05iz6flnmlfx3xd0ylzh1a4", - "depends": ["cli", "cpp11", "dplyr", "ggforce", "ggplot2", "ggrepel", "graphlayouts", "igraph", "lifecycle", "MASS", "memoise", "rlang", "scales", "tidygraph", "vctrs", "viridis", "withr"] + "depends": ["MASS", "cli", "cpp11", "dplyr", "ggforce", "ggplot2", "ggrepel", "graphlayouts", "igraph", "lifecycle", "memoise", "rlang", "scales", "tidygraph", "vctrs", "viridis", "withr"] }, "ggraptR": { "name": "ggraptR", @@ -66945,8 +67623,8 @@ }, "ggrcs": { "name": "ggrcs", - "version": "0.3.8", - "sha256": "02zvg802wq7nr4ksm0kngi3ka7jv8rc0xsc6d3wgvkk33vvr2902", + "version": "0.4.0", + "sha256": "0zb97wnhlwvi5kd7q20ah5hk3775c7lx7avp32gq5kj0xx7ck647", "depends": ["cowplot", "ggplot2", "rms", "scales"] }, "ggredist": { @@ -66959,7 +67637,7 @@ "name": "ggrepel", "version": "0.9.5", "sha256": "1alcrw304bn6c2i64rxxjkzk3il19gq30gyj3sb4blradkjh1rni", - "depends": ["ggplot2", "Rcpp", "rlang", "scales", "withr"] + "depends": ["Rcpp", "ggplot2", "rlang", "scales", "withr"] }, "ggridges": { "name": "ggridges", @@ -66993,8 +67671,8 @@ }, "ggsci": { "name": "ggsci", - "version": "3.1.0", - "sha256": "1adybzfkmha5xi85yqnz8cbbr6r3qj86z6yvsfcz8g44wqrb4d2r", + "version": "3.2.0", + "sha256": "0jiwkk2ij1qnsaqr6354wihj057ia1arrfpjpll00x63056fvn21", "depends": ["ggplot2", "scales"] }, "ggscidca": { @@ -67013,7 +67691,7 @@ "name": "ggsector", "version": "1.6.6", "sha256": "0qaf8wl1mmwl3razyif08sh329p9j1jgqc0ls5szqirq3db4315i", - "depends": ["dplyr", "ggplot2", "magrittr", "Matrix", "prettydoc", "rlang", "Seurat", "tibble", "tidyr"] + "depends": ["Matrix", "Seurat", "dplyr", "ggplot2", "magrittr", "prettydoc", "rlang", "tibble", "tidyr"] }, "ggseg": { "name": "ggseg", @@ -67037,7 +67715,7 @@ "name": "ggseqplot", "version": "0.8.4", "sha256": "0h4v5lxwr8rflxmxrv324axz6m1girib6gdh4p3k5hk48ilglwj0", - "depends": ["cli", "colorspace", "dplyr", "forcats", "ggh4x", "ggplot2", "ggrepel", "ggtext", "glue", "haven", "patchwork", "purrr", "Rdpack", "rlang", "tidyr", "TraMineR", "usethis"] + "depends": ["Rdpack", "TraMineR", "cli", "colorspace", "dplyr", "forcats", "ggh4x", "ggplot2", "ggrepel", "ggtext", "glue", "haven", "patchwork", "purrr", "rlang", "tidyr", "usethis"] }, "ggshadow": { "name": "ggshadow", @@ -67057,6 +67735,12 @@ "sha256": "02mjailzyqkdnzky60dgampw2sq6mnn7s66fk0lhy32s8apm280i", "depends": ["ggplot2"] }, + "ggsmc": { + "name": "ggsmc", + "version": "0.1.2.0", + "sha256": "1wgb5ml1bgfi6rddbvm3rfk6di9imyx17iflg8h42hhbvbvm93iy", + "depends": ["gganimate", "ggplot2", "poorman"] + }, "ggsoccer": { "name": "ggsoccer", "version": "0.1.7", @@ -67113,8 +67797,8 @@ }, "ggstatsplot": { "name": "ggstatsplot", - "version": "0.12.3", - "sha256": "0lm48b664nin8f32a3xpqvc95cizi27sls5m4vrymfz3aarcwrxr", + "version": "0.12.4", + "sha256": "07xv8d5yv08wcrmz6abjcfq9vv8h78axsnhgxgz08iswhb7a377a", "depends": ["correlation", "datawizard", "dplyr", "ggcorrplot", "ggplot2", "ggrepel", "ggside", "ggsignif", "glue", "insight", "paletteer", "parameters", "patchwork", "performance", "purrr", "rlang", "statsExpressions", "tidyr"] }, "ggstream": { @@ -67157,7 +67841,7 @@ "name": "ggtern", "version": "3.5.0", "sha256": "0ymly9vdzk7rd4p27m1262bm7fvim989yswgw3mr9y0422dn8awa", - "depends": ["compositions", "ggplot2", "gridExtra", "gtable", "hexbin", "latex2exp", "lattice", "MASS", "plyr", "proto", "rlang", "scales"] + "depends": ["MASS", "compositions", "ggplot2", "gridExtra", "gtable", "hexbin", "latex2exp", "lattice", "plyr", "proto", "rlang", "scales"] }, "ggtext": { "name": "ggtext", @@ -67179,8 +67863,8 @@ }, "ggtibble": { "name": "ggtibble", - "version": "1.0.0", - "sha256": "0mqwcy5gyb2dwnpkjzkyg9b3jy6jh9ck1h8z9ghvfssr2mkd17zz", + "version": "1.0.1", + "sha256": "1f9i81vmdkcahxsxqzwgkrjfqchk3jr14h2w8i5gsyhink271kxj", "depends": ["dplyr", "ggplot2", "glue", "knitr", "purrr", "rlang", "tibble", "tidyr", "vctrs"] }, "ggtikz": { @@ -67209,8 +67893,8 @@ }, "ggupset": { "name": "ggupset", - "version": "0.3.0", - "sha256": "079a1fghhbxhkx42ac0n5chmh07i60m2pkdk76frqbbmwrw7inx4", + "version": "0.4.0", + "sha256": "0cycnnycn1qazy35s4w746zlfraayf109bq40fglklmick6kfwsz", "depends": ["ggplot2", "gtable", "rlang", "scales", "tibble"] }, "ggvenn": { @@ -67235,7 +67919,7 @@ "name": "ggwordcloud", "version": "0.6.2", "sha256": "0zl50rksfxiw3ab1j26w27rypygrr28yysflg507djamnc2371gj", - "depends": ["colorspace", "ggplot2", "gridtext", "png", "Rcpp", "scales"] + "depends": ["Rcpp", "colorspace", "ggplot2", "gridtext", "png", "scales"] }, "ggx": { "name": "ggx", @@ -67251,8 +67935,8 @@ }, "ghapps": { "name": "ghapps", - "version": "1.0.0", - "sha256": "12z234lc7iy8svnm37ybj9ym0zd3jq5q9fng9h7dxdw2p9id7y30", + "version": "1.1.0", + "sha256": "0dv48rd7yw4l927p25x26whh2x2g30b0g4afcx6hzj6mghgg0xyn", "depends": ["gh", "jose", "openssl"] }, "ghclass": { @@ -67277,7 +67961,7 @@ "name": "ghql", "version": "0.1.0", "sha256": "19awg98r2hwwwwrwh0166y8ij1clf58vrf02i8fhhfzddx3an6bz", - "depends": ["crul", "graphql", "jsonlite", "R6"] + "depends": ["R6", "crul", "graphql", "jsonlite"] }, "ghyp": { "name": "ghyp", @@ -67295,13 +67979,13 @@ "name": "giacR", "version": "1.0.1", "sha256": "0y7vcca2im6q70jxsjnf4a7jg66y66g941ad0d7iykw3c2cwx6g4", - "depends": ["chromote", "jsonlite", "pingr", "processx", "R6"] + "depends": ["R6", "chromote", "jsonlite", "pingr", "processx"] }, "gibasa": { "name": "gibasa", - "version": "1.1.0", - "sha256": "1biy8vqvbc3mbf2p8kffpifdagyv7k5p28kdwyp9hgp996lj5pqk", - "depends": ["dplyr", "Matrix", "purrr", "Rcpp", "RcppParallel", "readr", "rlang", "stringi"] + "version": "1.1.1", + "sha256": "1j6k11vq9n9bh8f1sdc14maj88nd5vacl3xq9v54nb2phi55rp72", + "depends": ["Matrix", "Rcpp", "RcppParallel", "dplyr", "purrr", "readr", "rlang", "stringi"] }, "gibble": { "name": "gibble", @@ -67331,7 +68015,7 @@ "name": "gifti", "version": "0.8.0", "sha256": "1gb3x4rln9vayjd9fgzb434mm3dwcqgrvlv6rmh4b39mjfm73sly", - "depends": ["base64enc", "R_utils", "xml2"] + "depends": ["R_utils", "base64enc", "xml2"] }, "gigg": { "name": "gigg", @@ -67347,21 +68031,21 @@ }, "gimme": { "name": "gimme", - "version": "0.7-17", - "sha256": "0pa0mag0w7gxx4ikqs3c3k8g3ppi1fz3qkxmq2vmd48k7fyy7n0x", - "depends": ["data_tree", "igraph", "imputeTS", "lavaan", "MASS", "MIIVsem", "nloptr", "qgraph", "tseries"] + "version": "0.7-18", + "sha256": "16xb0182nh2p2cbr1iw74q1biif240jcyckal3mf6zdq703vgy4j", + "depends": ["MASS", "MIIVsem", "data_tree", "igraph", "imputeTS", "lavaan", "nloptr", "qgraph", "tseries"] }, "gimmeTools": { "name": "gimmeTools", "version": "0.1", "sha256": "1g170rz3c3qx27yy67f7xab4gkm0pbbvwlwkcsczfxphad609ryl", - "depends": ["easycsv", "magrittr", "miniUI", "rhandsontable", "rintrojs", "rstudioapi", "shiny", "shinyjs", "shinyWidgets"] + "depends": ["easycsv", "magrittr", "miniUI", "rhandsontable", "rintrojs", "rstudioapi", "shiny", "shinyWidgets", "shinyjs"] }, "gimms": { "name": "gimms", "version": "1.2.2", "sha256": "0dhvi05mpwyx6cpcyk2nzvgd6c8byd7cmrd9crx83lvfa03smpng", - "depends": ["curl", "Kendall", "ncdf4", "raster", "zyp"] + "depends": ["Kendall", "curl", "ncdf4", "raster", "zyp"] }, "giniVarCI": { "name": "giniVarCI", @@ -67383,8 +68067,8 @@ }, "giscoR": { "name": "giscoR", - "version": "0.5.0", - "sha256": "1cqc2mn4f6g18vb8cng0l11w1glyxk3k6sqsdzla0vbwlxs9d5z0", + "version": "0.5.1", + "sha256": "0j2nqv3l25j39jn6bndj5hafr2k88324jap4zwcx22mxkamb6m8g", "depends": ["countrycode", "geojsonsf", "jsonlite", "rappdirs", "sf"] }, "gistr": { @@ -67433,7 +68117,7 @@ "name": "gitear", "version": "1.0.0", "sha256": "139h19yyi7bpkps2vskdnga43ggpgb9fg8jdr7n8vgadxjamv98p", - "depends": ["dplyr", "httr", "jsonlite", "magrittr", "mockery", "Rcpp", "stringr", "tibble", "tidyr"] + "depends": ["Rcpp", "dplyr", "httr", "jsonlite", "magrittr", "mockery", "stringr", "tibble", "tidyr"] }, "gitgadget": { "name": "gitgadget", @@ -67455,9 +68139,9 @@ }, "gitignore": { "name": "gitignore", - "version": "0.1.6", - "sha256": "1cjfqbch614w75lxc8pw44aryxgcswbhydd48q10ch128x2gvw5a", - "depends": ["clipr", "clisymbols", "crayon", "curl", "glue", "here", "jsonlite", "purrr", "xfun"] + "version": "0.1.7", + "sha256": "047626a31rksyqcxfkvn1rpyv6gbls0b72blaifmy37nhrmwgykz", + "depends": ["cli", "clipr", "curl", "glue", "here", "jsonlite", "purrr", "xfun"] }, "gitlabr": { "name": "gitlabr", @@ -67505,13 +68189,19 @@ "name": "gkgraphR", "version": "1.0.2", "sha256": "1sb52hhpwm3bq7rn2xdq5vly6z1c5yab9a26xzgj3c5s47vk02pa", - "depends": ["httr", "ISOcodes", "jsonlite"] + "depends": ["ISOcodes", "httr", "jsonlite"] }, "gkmSVM": { "name": "gkmSVM", "version": "0.83.0", "sha256": "1bg9jw4ra76j132lkr0p5m2xlr952fdij1hn6f1v7g687l55m0k5", - "depends": ["kernlab", "Rcpp", "ROCR", "seqinr"] + "depends": ["ROCR", "Rcpp", "kernlab", "seqinr"] + }, + "glam": { + "name": "glam", + "version": "1.0.2", + "sha256": "0fwh6x1y1d7fi0d4qh0vdmlr324zqil91zmi79w2mxs9q1w9a2ws", + "depends": ["gam"] }, "glamlasso": { "name": "glamlasso", @@ -67559,7 +68249,7 @@ "name": "glcm", "version": "1.6.5", "sha256": "13my6y9jqd86cg5n74p4b8mqbdgwnanxx4qf1rrhm5jxf6sa31qm", - "depends": ["raster", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "raster"] }, "gld": { "name": "gld", @@ -67583,7 +68273,7 @@ "name": "glinvci", "version": "1.2.4", "sha256": "050rpdyp3xawkyjxcimjpbvn24677whlfhfmkyxijz7zqnvl7i8p", - "depends": ["ape", "BB", "generics", "lbfgsb3c", "numDeriv", "optimx", "plyr", "rlang"] + "depends": ["BB", "ape", "generics", "lbfgsb3c", "numDeriv", "optimx", "plyr", "rlang"] }, "gllm": { "name": "gllm", @@ -67595,7 +68285,7 @@ "name": "gllvm", "version": "1.4.3", "sha256": "1k3yw1flqzj151kqx8wyh54a7crh62ya700x5n4989ngx5071dv3", - "depends": ["alabama", "fishMod", "MASS", "Matrix", "mgcv", "mvabund", "nloptr", "RcppEigen", "statmod", "TMB"] + "depends": ["MASS", "Matrix", "RcppEigen", "TMB", "alabama", "fishMod", "mgcv", "mvabund", "nloptr", "statmod"] }, "glm_deploy": { "name": "glm.deploy", @@ -67607,7 +68297,7 @@ "name": "glm.predict", "version": "4.3-0", "sha256": "18cs6z6573vq8sdjb4kgz8kahizs9njdbip4cm1dk63ldjjrl0kf", - "depends": ["AER", "dfidx", "lme4", "MASS", "mlogit", "nnet", "survey", "survival", "VGAM"] + "depends": ["AER", "MASS", "VGAM", "dfidx", "lme4", "mlogit", "nnet", "survey", "survival"] }, "glm2": { "name": "glm2", @@ -67641,8 +68331,8 @@ }, "glmertree": { "name": "glmertree", - "version": "0.2-4", - "sha256": "0d7wjn9bqja05d0g8rqy1d5c53h00dcyr08589cwflkbx3yxxg6s", + "version": "0.2-5", + "sha256": "0qwfracqrxs471fmz2rcnaw6kc0b2csldm2n4vfc5jlq1k46fljk", "depends": ["Formula", "lme4", "partykit"] }, "glmglrt": { @@ -67661,13 +68351,13 @@ "name": "glmm", "version": "1.4.4", "sha256": "0v8iill3503piyx3wjxd602hs6hgz9818ipqlvg34963hh4b4ixi", - "depends": ["doParallel", "foreach", "itertools", "Matrix", "mvtnorm", "trust"] + "depends": ["Matrix", "doParallel", "foreach", "itertools", "mvtnorm", "trust"] }, "glmm_hp": { "name": "glmm.hp", "version": "0.1-3", "sha256": "07pqwgqdr2a1mxzh7sca6n0cklic4mmyp3vr6yk0485780ysh0wy", - "depends": ["ggplot2", "lme4", "MuMIn", "vegan"] + "depends": ["MuMIn", "ggplot2", "lme4", "vegan"] }, "glmmEP": { "name": "glmmEP", @@ -67679,7 +68369,7 @@ "name": "glmmLasso", "version": "1.6.3", "sha256": "1b2wkmsmnhmkql0kin56faf64abc6hijrs6dlz8qvwcbqpgbpcig", - "depends": ["Matrix", "minqa", "Rcpp", "RcppEigen"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "minqa"] }, "glmmML": { "name": "glmmML", @@ -67691,43 +68381,43 @@ "name": "glmmPen", "version": "1.5.4.4", "sha256": "0vmgzmdrhkvlm6z80ia7b195zhspi75ks3ha7jnrayxnrrzfvqxb", - "depends": ["BH", "bigmemory", "ggplot2", "lme4", "MASS", "Matrix", "mvtnorm", "ncvreg", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "reshape2", "rstan", "rstantools", "StanHeaders", "stringr", "survival"] + "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "StanHeaders", "bigmemory", "ggplot2", "lme4", "mvtnorm", "ncvreg", "reshape2", "rstan", "rstantools", "stringr", "survival"] }, "glmmSeq": { "name": "glmmSeq", "version": "0.5.5", "sha256": "182pgwqqbgpkcvapkps7ahxa4ppic44j10081q0v9lp2cjdiv4qy", - "depends": ["car", "ggplot2", "ggpubr", "glmmTMB", "lme4", "lmerTest", "MASS", "pbapply", "pbmcapply", "plotly", "qvalue"] + "depends": ["MASS", "car", "ggplot2", "ggpubr", "glmmTMB", "lme4", "lmerTest", "pbapply", "pbmcapply", "plotly", "qvalue"] }, "glmmTMB": { "name": "glmmTMB", "version": "1.1.9", "sha256": "0qw9ww3l506vivs6k8v5cdiv6lf9a32f0d1iq6bizxxh0ywsdmck", - "depends": ["lme4", "Matrix", "mgcv", "nlme", "numDeriv", "RcppEigen", "TMB"] + "depends": ["Matrix", "RcppEigen", "TMB", "lme4", "mgcv", "nlme", "numDeriv"] }, "glmmfields": { "name": "glmmfields", "version": "0.1.8", "sha256": "0nn328dn7fbh3h0wnl4kahwrbq9ddr3hyqq7930raa0abimg8ykq", - "depends": ["assertthat", "BH", "broom", "broom_mixed", "cluster", "dplyr", "forcats", "ggplot2", "loo", "mvtnorm", "nlme", "Rcpp", "RcppEigen", "RcppParallel", "reshape2", "rstan", "rstantools", "StanHeaders", "tibble"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "assertthat", "broom", "broom_mixed", "cluster", "dplyr", "forcats", "ggplot2", "loo", "mvtnorm", "nlme", "reshape2", "rstan", "rstantools", "tibble"] }, "glmmrBase": { "name": "glmmrBase", - "version": "0.8.1", - "sha256": "1dam3dp32s3ybb656sfczba9vlan6bsd9n8x73p4faikfpjgyysb", - "depends": ["BH", "Matrix", "R6", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "SparseChol", "StanHeaders"] + "version": "0.9.2", + "sha256": "162lb0zv5xk25adargc064gd7g13a4k8p6p7npzzmppx5235gnp4", + "depends": ["BH", "Matrix", "R6", "Rcpp", "RcppEigen", "RcppParallel", "SparseChol", "StanHeaders", "rstan", "rstantools"] }, "glmmrOptim": { "name": "glmmrOptim", "version": "0.3.5", "sha256": "0aic2wc1f1qdj2g9g7zsaz4hckrgpy7w293harpjmq9ll3gxpfcz", - "depends": ["BH", "digest", "glmmrBase", "Matrix", "Rcpp", "RcppEigen", "RcppProgress", "rminqa", "SparseChol"] + "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "RcppProgress", "SparseChol", "digest", "glmmrBase", "rminqa"] }, "glmnet": { "name": "glmnet", "version": "4.1-8", "sha256": "1znw1p1mi7nv39l7albcg6sfxj7a1jyjw85hb3ginv870z7fbnqx", - "depends": ["foreach", "Matrix", "Rcpp", "RcppEigen", "shape", "survival"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "foreach", "shape", "survival"] }, "glmnetSE": { "name": "glmnetSE", @@ -67739,7 +68429,7 @@ "name": "glmnetUtils", "version": "1.1.9", "sha256": "0rh07i9j6bxiqcl84d8jnn7dzqdwfdzak7w8bf4j4521r24mwm01", - "depends": ["glmnet", "Matrix"] + "depends": ["Matrix", "glmnet"] }, "glmnetcr": { "name": "glmnetcr", @@ -67749,9 +68439,9 @@ }, "glmnetr": { "name": "glmnetr", - "version": "0.5-1", - "sha256": "03jinkwfz8v7cbp0jj4hhr7sgn71giqin3bxs80hary4vx79vwsy", - "depends": ["aorsf", "DiceKriging", "glmnet", "Matrix", "mlrMBO", "ParamHelpers", "randomForestSRC", "rgenoud", "rpart", "smoof", "survival", "torch", "xgboost"] + "version": "0.5-2", + "sha256": "1iw9xpai55dyz5k80f469i0czcqsa9ws7j13dcdj6m6nlw6fwiac", + "depends": ["DiceKriging", "Matrix", "ParamHelpers", "aorsf", "glmnet", "mlrMBO", "randomForestSRC", "rgenoud", "rpart", "smoof", "survival", "torch", "xgboost"] }, "glmpath": { "name": "glmpath", @@ -67785,9 +68475,9 @@ }, "glmtoolbox": { "name": "glmtoolbox", - "version": "0.1.11", - "sha256": "1d7nc2yr01wp2gjd6jx5i51z3vx5ppc625159l1rxp630d0xxq8f", - "depends": ["Formula", "MASS", "numDeriv", "Rfast", "statmod", "SuppDists"] + "version": "0.1.12", + "sha256": "1nzn5nqicry2687d0nx6dacy0kbl0fzsw2wqwwi07mc12b84m7j9", + "depends": ["Formula", "MASS", "Rfast", "SuppDists", "broom", "numDeriv", "statmod"] }, "glmtrans": { "name": "glmtrans", @@ -67811,13 +68501,13 @@ "name": "glmvsd", "version": "1.5", "sha256": "0im3143xvlsgkknsjnifx9zh7jsdm9bsmgiwrk0r2iil2ns22wgy", - "depends": ["brglm", "glmnet", "MASS", "ncvreg"] + "depends": ["MASS", "brglm", "glmnet", "ncvreg"] }, "glmx": { "name": "glmx", "version": "0.2-0", "sha256": "07fgxyfz0jcp4ks2lpnbifjrnik2vwg1c5wl7m3a290rqsnzv5gx", - "depends": ["Formula", "lmtest", "MASS", "sandwich"] + "depends": ["Formula", "MASS", "lmtest", "sandwich"] }, "glmxdiag": { "name": "glmxdiag", @@ -67827,9 +68517,9 @@ }, "globalKinhom": { "name": "globalKinhom", - "version": "0.1.7", - "sha256": "0xs1s8gp8786w1n69hbxffi7sw9hyhgb8kp3h4q85b1rlrkqsn4p", - "depends": ["spatstat_explore", "spatstat_geom", "spatstat_random"] + "version": "0.1.8", + "sha256": "12y9pc78mw5ry7plb86a4af6lycyn177biqcdrxs1s90qx7fmp4b", + "depends": ["spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_univar"] }, "globalOptTests": { "name": "globalOptTests", @@ -67847,7 +68537,7 @@ "name": "globaltrends", "version": "0.0.14", "sha256": "13alq7vwfa2awg7xk9plna0sygsm65yni0ffkncznfpkhk5ff63q", - "depends": ["DBI", "dbplyr", "dplyr", "forcats", "forecast", "ggplot2", "gtrendsR", "lubridate", "purrr", "rlang", "RSQLite", "stringr", "tibble", "tidyr", "zoo"] + "depends": ["DBI", "RSQLite", "dbplyr", "dplyr", "forcats", "forecast", "ggplot2", "gtrendsR", "lubridate", "purrr", "rlang", "stringr", "tibble", "tidyr", "zoo"] }, "globe": { "name": "globe", @@ -67859,7 +68549,7 @@ "name": "glober", "version": "1.0", "sha256": "05syd93995pcvzvrwd8hchs2dgklv627a7pias806vsbs8xbp2vg", - "depends": ["fda", "genlasso", "ggplot2", "Matrix", "plot3D"] + "depends": ["Matrix", "fda", "genlasso", "ggplot2", "plot3D"] }, "glogis": { "name": "glogis", @@ -67889,7 +68579,7 @@ "name": "glow", "version": "0.11.0", "sha256": "1q8zci8jv71xzcxsg9b0h04mx11ykpsh4lnvkgg74zfsrf3sib0f", - "depends": ["ggplot2", "R6", "Rcpp", "RcppEigen", "RcppParallel"] + "depends": ["R6", "Rcpp", "RcppEigen", "RcppParallel", "ggplot2"] }, "glpkAPI": { "name": "glpkAPI", @@ -67929,27 +68619,27 @@ }, "gm": { "name": "gm", - "version": "1.0.2", - "sha256": "1g0frcfk2ybhhz0sixdmj8h3z61acaxs10ybja60q91mxlyix2zx", - "depends": ["base64enc", "glue", "htmltools", "knitr", "magick", "magrittr", "MASS", "rlang", "rstudioapi", "stringr"] + "version": "2.0.0", + "sha256": "0vjq3nj1wv4jy0rqi4f03kq3bdamfw63vncbhfmih063rpf7i69h", + "depends": ["base64enc", "erify", "htmltools"] }, "gmDatabase": { "name": "gmDatabase", "version": "0.5.0", "sha256": "0prap4a8pvylmvakd2ii87jz9bqf0vvfsxdi4iwa40nx444hqhx2", - "depends": ["DBI", "digest", "foreach", "RMySQL", "shiny"] + "depends": ["DBI", "RMySQL", "digest", "foreach", "shiny"] }, "gmGeostats": { "name": "gmGeostats", "version": "0.11.3", "sha256": "19kf409yhq13689akqz88dj0fq02falbh0j0kkvh0l0vymx4hj7y", - "depends": ["boot", "compositions", "foreach", "gstat", "RColorBrewer", "sp"] + "depends": ["RColorBrewer", "boot", "compositions", "foreach", "gstat", "sp"] }, "gma": { "name": "gma", "version": "1.0", "sha256": "08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi", - "depends": ["car", "MASS", "nlme"] + "depends": ["MASS", "car", "nlme"] }, "gmailr": { "name": "gmailr", @@ -67963,6 +68653,12 @@ "sha256": "0gvpmannzhzxrgihi7fvj2kww637hq3zjvl52f8zp4psjpyd752s", "depends": ["RCurl", "XML"] }, + "gmfamm": { + "name": "gmfamm", + "version": "0.1.0", + "sha256": "0l08x6qajr7ancf1dijayayycbs9p1xir4f78fxgicifszcdak6r", + "depends": ["MASS", "Matrix", "bamlss", "mgcv"] + }, "gmfd": { "name": "gmfd", "version": "1.0.1", @@ -67995,15 +68691,15 @@ }, "gmoTree": { "name": "gmoTree", - "version": "1.0.1", - "sha256": "11fyachzqr4nkf23l5l5f8qdmj7xvlf526p4zf5inc51xdf27dyl", + "version": "1.1.0", + "sha256": "1f8n3j0rzps3pfi4ps71f6jn51mlnvk3chi5khnfqydz4ifhwal5", "depends": ["data_table", "dplyr", "openxlsx", "plyr", "rlang", "rlist", "stringr"] }, "gmodels": { "name": "gmodels", "version": "2.19.1", "sha256": "13c8x7iwyz36qir3ikbvjb5dl6gdh4fh82qdxcpcdinwfhrbhmxv", - "depends": ["gdata", "MASS"] + "depends": ["MASS", "gdata"] }, "gmp": { "name": "gmp", @@ -68019,9 +68715,9 @@ }, "gms": { "name": "gms", - "version": "0.4.0", - "sha256": "1m7bhy4vsz6l09pal9ibjlskmbyjmc29hqwjim1x8yansd5bxpzv", - "depends": ["dplyr", "rlang", "stringr", "yaml"] + "version": "0.31.2", + "sha256": "1mf1pxxi9c62zvz3mnl0s616ps9cjhkm6xm3c2ak25saxmw5kfnv", + "depends": ["dplyr", "filelock", "rlang", "stringr", "withr", "yaml"] }, "gmt": { "name": "gmt", @@ -68033,7 +68729,7 @@ "name": "gmtFD", "version": "0.1.0", "sha256": "0qayzxy2aqikndcmk25m26cjxdqf62d4pdk9aiclhw4acvq9awvz", - "depends": ["doParallel", "fda", "foreach", "GFDmcv", "MASS", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["GFDmcv", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "doParallel", "fda", "foreach"] }, "gmvarkit": { "name": "gmvarkit", @@ -68045,13 +68741,13 @@ "name": "gmvjoint", "version": "0.4.0", "sha256": "1gycj6b51irzkv2rg6vvlanaiar8z54pqwd9qswlrw48wk2q074w", - "depends": ["glmmTMB", "MASS", "mvtnorm", "pracma", "Rcpp", "RcppArmadillo", "statmod", "survival", "xtable"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "glmmTMB", "mvtnorm", "pracma", "statmod", "survival", "xtable"] }, "gmwmx": { "name": "gmwmx", "version": "1.0.3", "sha256": "1jp3jjg0znvqmir83ygvi1nnws6xs29cfccd79vbk8702k4i9y61", - "depends": ["fs", "longmemo", "ltsa", "Matrix", "Rcpp", "RcppArmadillo", "rjson", "stringi", "wv"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "fs", "longmemo", "ltsa", "rjson", "stringi", "wv"] }, "gnFit": { "name": "gnFit", @@ -68075,7 +68771,7 @@ "name": "gnn", "version": "0.0-4", "sha256": "0kwizsqzrb0q6nailnh6k3mzqwxv0d0phrqn7dp97rkgg2qq1kxa", - "depends": ["copula", "keras", "qrng", "R6", "tensorflow"] + "depends": ["R6", "copula", "keras", "qrng", "tensorflow"] }, "gnomonicM": { "name": "gnomonicM", @@ -68111,7 +68807,7 @@ "name": "go2bigq", "version": "2.0.1", "sha256": "0xz6im5gc214m11w70m83mnas09sql9i0lvbgyfy0qvizn6zhyl3", - "depends": ["gmp", "Rmpfr"] + "depends": ["Rmpfr", "gmp"] }, "goalp": { "name": "goalp", @@ -68123,43 +68819,43 @@ "name": "goat", "version": "1.0", "sha256": "154x643dlh614nasx8q77rksp0q9n19a6qnmc5gki0pxv6ysgyj6", - "depends": ["data_table", "dplyr", "ggplot2", "ggraph", "igraph", "Matrix", "MonoPoly", "pheatmap", "Rcpp", "readxl", "tibble", "tidyr", "tidyselect", "treemap", "vctrs", "writexl"] + "depends": ["Matrix", "MonoPoly", "Rcpp", "data_table", "dplyr", "ggplot2", "ggraph", "igraph", "pheatmap", "readxl", "tibble", "tidyr", "tidyselect", "treemap", "vctrs", "writexl"] }, "goeveg": { "name": "goeveg", "version": "0.7.5", "sha256": "1pdbl044xjganm8y7jg3j877bj1rinsr6k22b5b8ngm2gbdmril3", - "depends": ["fields", "Hmisc", "mgcv", "vegan"] + "depends": ["Hmisc", "fields", "mgcv", "vegan"] }, "gofCopula": { "name": "gofCopula", "version": "0.4-1", "sha256": "17bdrn8xsqjz64caa5wdigkv798i18gc2f9jiin1bz840bqn1abg", - "depends": ["copula", "crayon", "doSNOW", "foreach", "MASS", "numDeriv", "progress", "R_utils", "SparseGrid", "VineCopula", "yarrr"] + "depends": ["MASS", "R_utils", "SparseGrid", "VineCopula", "copula", "crayon", "doSNOW", "foreach", "numDeriv", "progress", "yarrr"] }, "gofar": { "name": "gofar", "version": "0.1", "sha256": "10c1qgmkdhzxk9m2sd0xxww453y9lf5vjsrbmrbzbln91i6svy8j", - "depends": ["glmnet", "magrittr", "MASS", "Rcpp", "RcppArmadillo", "rrpack"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "glmnet", "magrittr", "rrpack"] }, "gofcat": { "name": "gofcat", "version": "0.1.2", "sha256": "0jkkavws3p336i3gzlkd24q467zd1clfndcpimwc6scy8zh67q9l", - "depends": ["crayon", "epiR", "Matrix", "reshape", "stringr", "VGAM"] + "depends": ["Matrix", "VGAM", "crayon", "epiR", "reshape", "stringr"] }, "gofedf": { "name": "gofedf", "version": "0.1.0", "sha256": "12y6lhrpldj46adn3a7jz4snx79y9xdrzbgr5qa4gjl00w3nx6cn", - "depends": ["CompQuadForm", "glm2", "MASS", "statmod"] + "depends": ["CompQuadForm", "MASS", "glm2", "statmod"] }, "goffda": { "name": "goffda", "version": "0.1.2", "sha256": "0d4w2rz7024j4vky1nynqfanfgp8rvgivl2p6b8l2ws98brlhy24", - "depends": ["fda_usc", "glmnet", "ks", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "fda_usc", "glmnet", "ks"] }, "gofgamma": { "name": "gofgamma", @@ -68183,13 +68879,13 @@ "name": "gogarch", "version": "0.7-5", "sha256": "01ikd7ngzgyrgkr637cxnj5xqmdmsj6szcr9f8wmrxvly0b3qf1i", - "depends": ["fastICA", "fGarch"] + "depends": ["fGarch", "fastICA"] }, "goldfish": { "name": "goldfish", "version": "1.6.8", "sha256": "1c49xmn29c1qvx2rmhyvwy5ql2b4zsk4chrv8bni6lwiprib5d9q", - "depends": ["changepoint", "generics", "ggplot2", "Rcpp", "RcppArmadillo", "rlang", "tibble"] + "depends": ["Rcpp", "RcppArmadillo", "changepoint", "generics", "ggplot2", "rlang", "tibble"] }, "golem": { "name": "golem", @@ -68229,9 +68925,9 @@ }, "googleAnalyticsR": { "name": "googleAnalyticsR", - "version": "1.1.0", - "sha256": "0js73jwdsk3bgak61na0sqadjmb74b88rfgi0fxbgafz68xg5rgr", - "depends": ["assertthat", "cli", "dplyr", "googleAuthR", "httr", "jsonlite", "magrittr", "measurementProtocol", "memoise", "purrr", "rlang", "tibble", "tidyr", "usethis", "whisker"] + "version": "1.2.0", + "sha256": "0syqlmrq4l8qnqzh6csfyf075fkfv1bmgglrmgynsbs16f4x195v", + "depends": ["assertthat", "cli", "dplyr", "gargle", "googleAuthR", "httr", "jsonlite", "magrittr", "measurementProtocol", "memoise", "purrr", "rlang", "tibble", "tidyr", "usethis", "whisker"] }, "googleAuthR": { "name": "googleAuthR", @@ -68285,7 +68981,7 @@ "name": "googlePublicData", "version": "0.16.1", "sha256": "15hyslpqvncg21q581h061rfyg99y8lavqw1x8hzl7xzd49bn9r5", - "depends": ["readxl", "XML"] + "depends": ["XML", "readxl"] }, "googlePubsubR": { "name": "googlePubsubR", @@ -68363,13 +69059,13 @@ "name": "gorica", "version": "0.1.4", "sha256": "1r8dg9wcqxd53zm27mf0554x2zlsclbfmqqwjbkywa3np6gi358y", - "depends": ["bain", "lavaan", "limSolve", "lme4", "MASS", "mvtnorm", "quadprog"] + "depends": ["MASS", "bain", "lavaan", "limSolve", "lme4", "mvtnorm", "quadprog"] }, "gosset": { "name": "gosset", "version": "1.3", "sha256": "0k50vjfrqqkw9anq012pbq861lnq3ihjh310rp12xyvzbzf6d6c7", - "depends": ["BradleyTerry2", "DescTools", "ggparty", "ggplot2", "ggrepel", "partykit", "patchwork", "PlackettLuce", "psychotools", "qvcalc", "tidyr"] + "depends": ["BradleyTerry2", "DescTools", "PlackettLuce", "ggparty", "ggplot2", "ggrepel", "partykit", "patchwork", "psychotools", "qvcalc", "tidyr"] }, "gotop": { "name": "gotop", @@ -68389,6 +69085,12 @@ "sha256": "00ndpp3v6z2497xlhhc92pa7w93qk9x8m6ibswj9dfh978d07028", "depends": ["rmarkdown"] }, + "governor": { + "name": "governor", + "version": "0.1.2", + "sha256": "0prvpab34jr59n9j3xqkapwrd51cm00w47dkvi5f6w414791ayzw", + "depends": [] + }, "govinfoR": { "name": "govinfoR", "version": "0.0.3", @@ -68417,13 +69119,13 @@ "name": "gp", "version": "1.1", "sha256": "0w5wcjzgjajfx29whqkn3xv3v9bn4q0almmmsb7qw79dnbv5c16s", - "depends": ["Rfast", "RNGforGPD"] + "depends": ["RNGforGPD", "Rfast"] }, "gpairs": { "name": "gpairs", "version": "1.3.3", "sha256": "08m1ydrr239vnhjbl47mng3i2w9bqmd8fijrwsraq5ysvn826n27", - "depends": ["barcode", "colorspace", "lattice", "MASS", "vcd"] + "depends": ["MASS", "barcode", "colorspace", "lattice", "vcd"] }, "gpbStat": { "name": "gpbStat", @@ -68433,9 +69135,9 @@ }, "gpboost": { "name": "gpboost", - "version": "1.5.0", - "sha256": "0wmf0vddb9w3sx2lsy9m80d7c52xz6sdmx3fdal8g8n898z1rk8h", - "depends": ["data_table", "Matrix", "R6", "RJSONIO"] + "version": "1.5.1.1", + "sha256": "1qnw64lmiv8yyd69hyxqg7x90y9nxcdbipvb6kzpb34if8x2hqgq", + "depends": ["Matrix", "R6", "RJSONIO", "data_table"] }, "gpg": { "name": "gpg", @@ -68445,8 +69147,8 @@ }, "gpindex": { "name": "gpindex", - "version": "0.6.1", - "sha256": "1xl2hcw3qpqwlg655ajg8snyp41s5cb9kxridysch7fjmyj7iymy", + "version": "0.6.2", + "sha256": "1hif169xsvfvsnbgmad8v9qwq1d6hxvn74zyqkbmic8v3yxifs56", "depends": [] }, "gpk": { @@ -68477,7 +69179,7 @@ "name": "gplots", "version": "3.1.3.1", "sha256": "1whs45axg1vp2p3jjya4aq68bl6vp11g059saj2av0vmyaadxq8s", - "depends": ["caTools", "gtools", "KernSmooth"] + "depends": ["KernSmooth", "caTools", "gtools"] }, "gplsim": { "name": "gplsim", @@ -68495,7 +69197,7 @@ "name": "gprofiler2", "version": "0.2.3", "sha256": "1klmg0zj5kr663dzgfzpy1yn161znmjcjq8pl3rahjh2lwaahbmh", - "depends": ["crosstalk", "dplyr", "ggplot2", "gridExtra", "jsonlite", "plotly", "RCurl", "tidyr", "viridisLite"] + "depends": ["RCurl", "crosstalk", "dplyr", "ggplot2", "gridExtra", "jsonlite", "plotly", "tidyr", "viridisLite"] }, "gps": { "name": "gps", @@ -68519,13 +69221,13 @@ "name": "gptr", "version": "0.6.0", "sha256": "17kf5azrm8xhc26pkv7fsqlfw1430h6024n3nz01kfmjyjqs348m", - "depends": ["jsonlite", "RCurl"] + "depends": ["RCurl", "jsonlite"] }, "gptstudio": { "name": "gptstudio", "version": "0.4.0", "sha256": "0hlmpysw3wlz2nvixbdz2gd9nk290jpfj5jcjidi6cn3skykvkdv", - "depends": ["assertthat", "bslib", "cli", "colorspace", "curl", "fontawesome", "glue", "htmltools", "htmlwidgets", "httr2", "ids", "jsonlite", "magrittr", "purrr", "R6", "rlang", "rstudioapi", "rvest", "shiny", "shiny_i18n", "SSEparser", "stringr", "waiter", "yaml"] + "depends": ["R6", "SSEparser", "assertthat", "bslib", "cli", "colorspace", "curl", "fontawesome", "glue", "htmltools", "htmlwidgets", "httr2", "ids", "jsonlite", "magrittr", "purrr", "rlang", "rstudioapi", "rvest", "shiny", "shiny_i18n", "stringr", "waiter", "yaml"] }, "gptzeror": { "name": "gptzeror", @@ -68537,7 +69239,7 @@ "name": "gpuR", "version": "2.0.6", "sha256": "1z9s3c4lspbm29bp1l2sixlfps04aif70rv1p1db1f1xwk6vw3bn", - "depends": ["BH", "Rcpp", "RcppEigen", "RViennaCL"] + "depends": ["BH", "RViennaCL", "Rcpp", "RcppEigen"] }, "gpx": { "name": "gpx", @@ -68549,7 +69251,7 @@ "name": "gqlr", "version": "0.0.2", "sha256": "0gzhqyrbnz3qjzkr4slryrlfhlaxm474y9fahlj0sb0hvcx68pxj", - "depends": ["graphql", "jsonlite", "magrittr", "pryr", "R6"] + "depends": ["R6", "graphql", "jsonlite", "magrittr", "pryr"] }, "gquad": { "name": "gquad", @@ -68565,9 +69267,9 @@ }, "grImport2": { "name": "grImport2", - "version": "0.3-1", - "sha256": "1lj58z6yc2p6ns27fkgh11ac90bcihi65hf62gxpsylcn5dilsi1", - "depends": ["base64enc", "jpeg", "png", "XML"] + "version": "0.3-3", + "sha256": "11glz1yi76235x3di9r7nny0nfcisk12acc4xsm4m2d9ingjh4pn", + "depends": ["XML", "base64enc", "jpeg", "png"] }, "grPipe": { "name": "grPipe", @@ -68609,7 +69311,7 @@ "name": "grafify", "version": "4.0.1", "sha256": "0349sz0gykm69gf7n54g8snvjb8fkfx4cgfwp8bpvib4r9dbsllp", - "depends": ["car", "emmeans", "ggplot2", "Hmisc", "lme4", "lmerTest", "magrittr", "mgcv", "patchwork", "purrr", "tidyr"] + "depends": ["Hmisc", "car", "emmeans", "ggplot2", "lme4", "lmerTest", "magrittr", "mgcv", "patchwork", "purrr", "tidyr"] }, "grafzahl": { "name": "grafzahl", @@ -68621,7 +69323,7 @@ "name": "grainscape", "version": "0.4.4", "sha256": "0c9ms97xnz7z5r2hhwbw0qpcmknp2wk327z95x751yjvgbps3lkg", - "depends": ["ggplot2", "igraph", "raster", "Rcpp", "sf", "sp"] + "depends": ["Rcpp", "ggplot2", "igraph", "raster", "sf", "sp"] }, "gramEvol": { "name": "gramEvol", @@ -68639,7 +69341,7 @@ "name": "grandR", "version": "0.2.5", "sha256": "1cb8mkckbwkdi3zy108z3yhq3mssshhx1l9yb1j8rhgfg9abirly", - "depends": ["cowplot", "ggplot2", "labeling", "lfc", "MASS", "Matrix", "minpack_lm", "numDeriv", "patchwork", "plyr", "RCurl", "reshape2", "rlang", "scales"] + "depends": ["MASS", "Matrix", "RCurl", "cowplot", "ggplot2", "labeling", "lfc", "minpack_lm", "numDeriv", "patchwork", "plyr", "reshape2", "rlang", "scales"] }, "grangers": { "name": "grangers", @@ -68657,13 +69359,13 @@ "name": "granovaGG", "version": "1.4.1", "sha256": "1w75d878p6izdr88j836vc7753c0mkjj5k3s04f09938gxda8a8w", - "depends": ["dplyr", "ggplot2", "magrittr", "RColorBrewer", "tibble", "tidyr"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "magrittr", "tibble", "tidyr"] }, "grantham": { "name": "grantham", - "version": "0.1.1", - "sha256": "0c7kw7yh5n6mgbplnbdcviwc3r2b321v7s334b0cljz6i3c3cr76", - "depends": ["dplyr", "magrittr", "rlang", "stringr", "tibble", "tidyr", "vctrs"] + "version": "0.1.2", + "sha256": "1bcycvf1sjzwxsmdbscj1q8i7kigy6gx5r202ihb1ilvdi1nmx7l", + "depends": ["dplyr", "tibble", "vctrs"] }, "grapes": { "name": "grapes", @@ -68675,7 +69377,7 @@ "name": "grapesAgri1", "version": "1.1.0", "sha256": "0bsnxk7fqick6y76z6s1kwrg1y8spvg0awmdg5hk37g0f3wxgyas", - "depends": ["agricolae", "corrplot", "desplot", "dplyr", "ggplot2", "ggpubr", "gridGraphics", "gtools", "Hmisc", "kableExtra", "knitr", "magrittr", "PairedData", "pastecs", "RColorBrewer", "Rdpack", "reshape2", "rmarkdown", "shiny", "shinyWidgets", "summarytools"] + "depends": ["Hmisc", "PairedData", "RColorBrewer", "Rdpack", "agricolae", "corrplot", "desplot", "dplyr", "ggplot2", "ggpubr", "gridGraphics", "gtools", "kableExtra", "knitr", "magrittr", "pastecs", "reshape2", "rmarkdown", "shiny", "shinyWidgets", "summarytools"] }, "graph3d": { "name": "graph3d", @@ -68687,13 +69389,13 @@ "name": "graph4lg", "version": "1.8.0", "sha256": "07a109jjn1s36x1hpb1zvgb2wq41f11l8cv3car1lr6lw5g3rr3x", - "depends": ["adegenet", "ecodist", "foreign", "gdistance", "ggplot2", "hierfstat", "igraph", "MASS", "Matrix", "pegas", "rappdirs", "raster", "Rdpack", "sf", "sp", "spatstat_geom", "spatstat_linnet", "stringr", "tidyr", "vegan"] + "depends": ["MASS", "Matrix", "Rdpack", "adegenet", "ecodist", "foreign", "gdistance", "ggplot2", "hierfstat", "igraph", "pegas", "rappdirs", "raster", "sf", "sp", "spatstat_geom", "spatstat_linnet", "stringr", "tidyr", "vegan"] }, "graphPAF": { "name": "graphPAF", "version": "2.0.0", "sha256": "0m6v796hwxdv7nan3157x7b8xpph605ihj6gnmlh3v1p95dygsy7", - "depends": ["boot", "dplyr", "ggplot2", "ggrepel", "gridExtra", "gtools", "madness", "MASS", "reshape2", "survival"] + "depends": ["MASS", "boot", "dplyr", "ggplot2", "ggrepel", "gridExtra", "gtools", "madness", "reshape2", "survival"] }, "graphTweets": { "name": "graphTweets", @@ -68729,43 +69431,49 @@ "name": "graphicalExtremes", "version": "0.3.2", "sha256": "18gyfynx9rd06168vv1qxa8hg7ibwv0h2mx1ppizrnrl7ciwwis1", - "depends": ["corpcor", "CVXR", "edmcr", "glassoFast", "glmnet", "igraph", "mvtnorm", "osqp", "Rdpack"] + "depends": ["CVXR", "Rdpack", "corpcor", "edmcr", "glassoFast", "glmnet", "igraph", "mvtnorm", "osqp"] + }, + "graphicalMCP": { + "name": "graphicalMCP", + "version": "0.2.5", + "sha256": "0bs4d1fz6l2rwssh8wq5sakkl478lr6vsx6lb1jz8qnryk6cb3wy", + "depends": ["matrixStats", "mvtnorm"] }, "graphicalVAR": { "name": "graphicalVAR", "version": "0.3.4", "sha256": "1p5x77ck3prs8782kv176qq9d5ngw3zz3w6qg7aq5658pwc87gd3", - "depends": ["dplyr", "glasso", "glmnet", "igraph", "Matrix", "mvtnorm", "qgraph", "Rcpp", "RcppArmadillo", "rlang"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "dplyr", "glasso", "glmnet", "igraph", "mvtnorm", "qgraph", "rlang"] }, "graphkernels": { "name": "graphkernels", "version": "1.6.1", "sha256": "1fwl5a13mdmia374zas0vvd4dlfnp4in9gj42c0iq01icy1wq0la", - "depends": ["igraph", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "igraph"] }, "graphlayouts": { "name": "graphlayouts", "version": "1.1.1", "sha256": "009q5y46lbizdabbb6a61xlfa3g5lf3nd9w42709lcxi0ad4bhkv", - "depends": ["igraph", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "igraph"] }, "graphon": { "name": "graphon", "version": "0.3.5", "sha256": "1x61pdsb3s1vi1iiy9pjq0iz0m5j5b6q3rqhwvx9kvmg4r8yifpv", - "depends": ["Rdpack", "ROptSpace"] + "depends": ["ROptSpace", "Rdpack"] }, "graphql": { "name": "graphql", "version": "1.5.1", "sha256": "10zpibqh1vsin60pl5dnk4z2kzrfc3aqrhijcn36zq7f97629wv8", - "depends": ["jsonlite", "Rcpp"] + "depends": ["Rcpp", "jsonlite"] }, "graphsim": { "name": "graphsim", "version": "1.0.3", "sha256": "16djk5zm2pnvfyb2783rdyi6a0gspm23br7xxgb2c8wfd9gf430n", - "depends": ["gplots", "igraph", "Matrix", "matrixcalc", "mvtnorm"] + "depends": ["Matrix", "gplots", "igraph", "matrixcalc", "mvtnorm"] }, "graposas": { "name": "graposas", @@ -68787,8 +69495,8 @@ }, "gratia": { "name": "gratia", - "version": "0.9.0", - "sha256": "1hkfaw2vwm4dw73fn4glkwnhvbf2wc3iyz5979rsfabn5i6g91br", + "version": "0.9.2", + "sha256": "0jjjncs5c3zd3jlxk5ywkg31lhxafdj5b58k664yd29193f2w3m0", "depends": ["cli", "dplyr", "ggokabeito", "ggplot2", "lifecycle", "mgcv", "mvnfast", "nlme", "patchwork", "pillar", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs", "withr"] }, "graticule": { @@ -68801,7 +69509,7 @@ "name": "gratis", "version": "1.0.7", "sha256": "0y9gblkcn145r8kx4447waqwc59iibm6nlmdykf6vrwn1y5vssa3", - "depends": ["doRNG", "dplyr", "feasts", "fGarch", "foreach", "forecast", "GA", "generics", "magrittr", "mvtnorm", "polynom", "purrr", "shiny", "tibble", "tsfeatures", "tsibble"] + "depends": ["GA", "doRNG", "dplyr", "fGarch", "feasts", "foreach", "forecast", "generics", "magrittr", "mvtnorm", "polynom", "purrr", "shiny", "tibble", "tsfeatures", "tsibble"] }, "grattan": { "name": "grattan", @@ -68819,13 +69527,13 @@ "name": "gravitas", "version": "0.1.3", "sha256": "11n85bdmigqasbq8c1amj1k7manfvs3gnax2ihsf2vp56s9c463p", - "depends": ["dplyr", "ggplot2", "ggridges", "ineq", "lubridate", "lvplot", "magrittr", "RColorBrewer", "rlang", "shiny", "stringr", "tibble", "tidyr", "tsibble"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "ggridges", "ineq", "lubridate", "lvplot", "magrittr", "rlang", "shiny", "stringr", "tibble", "tidyr", "tsibble"] }, "gravity": { "name": "gravity", "version": "1.1", "sha256": "05kkprv63x9m715yv9kx2k70bqnkacc72zr0aljcj0ry10nl40c6", - "depends": ["censReg", "dplyr", "glm2", "lmtest", "magrittr", "MASS", "multiwayvcov", "purrr", "Rdpack", "rlang", "sandwich", "survival", "tibble", "tidyr"] + "depends": ["MASS", "Rdpack", "censReg", "dplyr", "glm2", "lmtest", "magrittr", "multiwayvcov", "purrr", "rlang", "sandwich", "survival", "tibble", "tidyr"] }, "gravmagsubs": { "name": "gravmagsubs", @@ -68849,7 +69557,7 @@ "name": "greed", "version": "0.6.1", "sha256": "05p24991s97h0hmvv88s3hca9b50384hm6qm771dqznqs5m4ggrq", - "depends": ["cba", "cli", "future", "ggplot2", "gridExtra", "gtable", "listenv", "Matrix", "Rcpp", "RcppArmadillo", "RSpectra"] + "depends": ["Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "cba", "cli", "future", "ggplot2", "gridExtra", "gtable", "listenv"] }, "greekLetters": { "name": "greekLetters", @@ -68861,7 +69569,7 @@ "name": "greeks", "version": "1.4.2", "sha256": "11ps312r6nhda5a2d7mjxzjnlvfj2kz31hyvnfngfpwdg3ndw1hr", - "depends": ["dqrng", "ggplot2", "magrittr", "plotly", "Rcpp", "shiny", "tibble", "tidyr"] + "depends": ["Rcpp", "dqrng", "ggplot2", "magrittr", "plotly", "shiny", "tibble", "tidyr"] }, "greenclust": { "name": "greenclust", @@ -68873,7 +69581,7 @@ "name": "greencrab.toolkit", "version": "0.2", "sha256": "11lrbjm91m2lbgr0wdy84mal4qxs9x0bmniaijxpw9fdwrkqq0aw", - "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools"] }, "gregRy": { "name": "gregRy", @@ -68891,13 +69599,13 @@ "name": "greport", "version": "0.7-4", "sha256": "1zyvw3npqz20mlfvmlrz742xxsigs21srn2df9yyjap93g7wqzy1", - "depends": ["data_table", "Formula", "ggplot2", "Hmisc", "lattice", "latticeExtra", "rms", "survival"] + "depends": ["Formula", "Hmisc", "data_table", "ggplot2", "lattice", "latticeExtra", "rms", "survival"] }, "greta": { "name": "greta", "version": "0.4.5", "sha256": "0ky2d0i2s768na50940b733rr1fmmbpkdw1a8r21wbr5h43n8xf2", - "depends": ["abind", "callr", "cli", "coda", "future", "glue", "parallelly", "progress", "R6", "reticulate", "tensorflow", "yesno"] + "depends": ["R6", "abind", "callr", "cli", "coda", "future", "glue", "parallelly", "progress", "reticulate", "tensorflow", "yesno"] }, "greta_dynamics": { "name": "greta.dynamics", @@ -68931,15 +69639,15 @@ }, "greybox": { "name": "greybox", - "version": "2.0.0", - "sha256": "14624pgp02ajlhicq29683j34z2ap6xcjy71f3qbm5nq96w975f8", - "depends": ["generics", "nloptr", "pracma", "Rcpp", "statmod", "texreg", "xtable", "zoo"] + "version": "2.0.1", + "sha256": "053id2kd7q4ydxlrg6yi39y72idicp0cjgrhvmnwyv6zh2jd3ahk", + "depends": ["Rcpp", "generics", "nloptr", "pracma", "statmod", "texreg", "xtable", "zoo"] }, "grf": { "name": "grf", "version": "2.3.2", "sha256": "0za2c9hlvp1s2h25vr6f0qlw92r9wp0vbmfdsp38q190drpjnff0", - "depends": ["DiceKriging", "lmtest", "Matrix", "Rcpp", "RcppEigen", "sandwich"] + "depends": ["DiceKriging", "Matrix", "Rcpp", "RcppEigen", "lmtest", "sandwich"] }, "gridBase": { "name": "gridBase", @@ -68981,7 +69689,7 @@ "name": "gridGraphviz", "version": "0.3-1", "sha256": "0yzy7w4bk3rn9yjqy06gzkcs0dla3n49z3v1z0mjikg8cd97d5ni", - "depends": ["graph", "Rgraphviz"] + "depends": ["Rgraphviz", "graph"] }, "gridOT": { "name": "gridOT", @@ -68993,7 +69701,7 @@ "name": "gridSVG", "version": "1.7-5", "sha256": "1p8qnx9q96bni39x44l40rgcdi9r440zbipdfvkbs2paysx6mkr5", - "depends": ["jsonlite", "XML"] + "depends": ["XML", "jsonlite"] }, "gridpattern": { "name": "gridpattern", @@ -69017,7 +69725,7 @@ "name": "gridtext", "version": "0.1.5", "sha256": "0f7i2qb8fawi8agy2iz2c173kfwj7cbb5ikjix64nmzqc5j7363d", - "depends": ["curl", "jpeg", "markdown", "png", "Rcpp", "rlang", "stringr", "xml2"] + "depends": ["Rcpp", "curl", "jpeg", "markdown", "png", "rlang", "stringr", "xml2"] }, "gripp": { "name": "gripp", @@ -69047,7 +69755,7 @@ "name": "grobblR", "version": "0.2.1", "sha256": "1l1msh900kmbbszn1f9vfdix4a6180lvs3gfidp9pgkvi2gv2g01", - "depends": ["dplyr", "ggplot2", "glue", "gridExtra", "magrittr", "png", "purrr", "RCurl", "stringr", "tibble"] + "depends": ["RCurl", "dplyr", "ggplot2", "glue", "gridExtra", "magrittr", "png", "purrr", "stringr", "tibble"] }, "groc": { "name": "groc", @@ -69075,15 +69783,15 @@ }, "groupTesting": { "name": "groupTesting", - "version": "1.1.0", - "sha256": "06cd6w5ysh0bi7mkvra4mzlfdpfqa40im8f5krp4cbd3nkjskdif", - "depends": ["pracma"] + "version": "1.3.0", + "sha256": "10scrwi5g2i4g32wfksfhmmbhiddcnj4khh7ls32kx2m4lhmll53", + "depends": ["binGroup2", "pracma"] }, "groupWQS": { "name": "groupWQS", "version": "0.0.3", "sha256": "1c5yrsfgkhbg1fcjbrilfmf0phjry5z34536yfizc8wbc7mmmj0c", - "depends": ["glm2", "MASS", "rjags", "Rsolnp"] + "depends": ["MASS", "Rsolnp", "glm2", "rjags"] }, "groupdata2": { "name": "groupdata2", @@ -69095,7 +69803,7 @@ "name": "groupedSurv", "version": "1.0.5.1", "sha256": "16qyvd8k7wdg0iafs5gxljx464nd79kwdl7g7g6hvhrhr621mgyq", - "depends": ["BH", "doParallel", "foreach", "qvalue", "Rcpp", "RcppEigen"] + "depends": ["BH", "Rcpp", "RcppEigen", "doParallel", "foreach", "qvalue"] }, "groupr": { "name": "groupr", @@ -69131,7 +69839,7 @@ "name": "growfunctions", "version": "0.16", "sha256": "1v1sawv9fbb6lw4ynjdkj02z8rv5k8pkw55wmg2ws3jisy3xrcm7", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "reshape2", "spam"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "reshape2", "spam"] }, "growth": { "name": "growth", @@ -69141,15 +69849,15 @@ }, "growthPheno": { "name": "growthPheno", - "version": "2.1.24", - "sha256": "0cwdxd47jpgvr9i7xj7hibaa8l8n7gm91i3qv5ikp9p2y93qwbzs", - "depends": ["dae", "GGally", "ggplot2", "Hmisc", "JOPS", "RColorBrewer", "readxl", "reshape", "stringi"] + "version": "2.1.25", + "sha256": "1bz1411ka1pghaa67ad0jkdzykadd64wzn8g37gp7z8zm1ablhzh", + "depends": ["GGally", "Hmisc", "JOPS", "RColorBrewer", "dae", "ggplot2", "readxl", "reshape", "stringi"] }, "growthcleanr": { "name": "growthcleanr", "version": "2.2.0", "sha256": "0wlpaqjw44xa7z95ngiihgvmcrif6d2j7mfzjlzjgc04sjsb6y1v", - "depends": ["data_table", "doParallel", "dplyr", "foreach", "labelled", "magrittr", "plyr", "R_utils", "tidyr"] + "depends": ["R_utils", "data_table", "doParallel", "dplyr", "foreach", "labelled", "magrittr", "plyr", "tidyr"] }, "growthcurver": { "name": "growthcurver", @@ -69167,19 +69875,19 @@ "name": "growthrate", "version": "1.3", "sha256": "1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd", - "depends": ["clime", "Matrix", "mvtnorm"] + "depends": ["Matrix", "clime", "mvtnorm"] }, "growthrates": { "name": "growthrates", "version": "0.8.4", "sha256": "04q8psz4fiibjj0pl6n7wkq83qn1aizzixww8gqdxzzsq6kay81q", - "depends": ["deSolve", "FME", "lattice"] + "depends": ["FME", "deSolve", "lattice"] }, "grpCox": { "name": "grpCox", "version": "1.0.2", "sha256": "02x98zmaa7f73qv62wzr0vyyci7kcx7mmyw7cm3inlyphlkywvlw", - "depends": ["colorspace", "MASS", "Matrix", "Rcpp", "RcppEigen"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppEigen", "colorspace"] }, "grpSLOPE": { "name": "grpSLOPE", @@ -69195,8 +69903,8 @@ }, "grpnet": { "name": "grpnet", - "version": "0.4", - "sha256": "1ka9i7fg9y87rabjdnggclb1f395m1pbmhwics2wayd9q3m5a6mk", + "version": "0.5", + "sha256": "131g08gwvsiaxlsz7ihrhd6n33rjjczh72fh9wfa2ibc247g48w5", "depends": [] }, "grpreg": { @@ -69209,7 +69917,7 @@ "name": "grpsel", "version": "1.3.1", "sha256": "0b901si4xm6306mzfk3nmwg2h8pk9rhvv2m08v3qnbnxaw06my2h", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2"] }, "grpseq": { "name": "grpseq", @@ -69233,25 +69941,25 @@ "name": "grwat", "version": "0.0.4", "sha256": "10sv1kzf9z1c27d99rvxvx1gmhga6rj1mcyfkvyg93gd8i1jwxg9", - "depends": ["cli", "dplyr", "ggplot2", "lubridate", "magrittr", "mblm", "R_utils", "Rcpp", "rlang", "stringr", "tidyr", "trend", "zoo"] + "depends": ["R_utils", "Rcpp", "cli", "dplyr", "ggplot2", "lubridate", "magrittr", "mblm", "rlang", "stringr", "tidyr", "trend", "zoo"] }, "gsDesign": { "name": "gsDesign", - "version": "3.6.2", - "sha256": "171xbfyrnrsncg4znd8m0r1r9kxrdcxrs03ncmchq1qifq5nc4al", + "version": "3.6.4", + "sha256": "1lknw7n2zd9mfr13lyn9ny3d0lgla56hkdvqmgmvkjsv19jpaq5r", "depends": ["dplyr", "ggplot2", "gt", "magrittr", "r2rtf", "rlang", "tibble", "tidyr", "xtable"] }, "gsDesign2": { "name": "gsDesign2", "version": "1.1.2", "sha256": "0kyj5pv5cr8ljbhzsly70115czhgx5wrpcgpd0jvv2djjf21klh2", - "depends": ["corpcor", "data_table", "dplyr", "gsDesign", "gt", "mvtnorm", "npsurvSS", "r2rtf", "Rcpp", "survival", "tibble", "tidyr"] + "depends": ["Rcpp", "corpcor", "data_table", "dplyr", "gsDesign", "gt", "mvtnorm", "npsurvSS", "r2rtf", "survival", "tibble", "tidyr"] }, "gsEasy": { "name": "gsEasy", "version": "1.5", "sha256": "1mvqnyjzi5ik5bqisxpf6a592n9rnkv915kwnis238akwvkspspa", - "depends": ["ontologyIndex", "Rcpp"] + "depends": ["Rcpp", "ontologyIndex"] }, "gsMAMS": { "name": "gsMAMS", @@ -69281,13 +69989,13 @@ "name": "gsbm", "version": "0.2.2", "sha256": "0pvlb2vainsazcyh1713m11q387ykqkj11k8sg0s96ldnzv751lg", - "depends": ["doParallel", "foreach", "Matrix", "RSpectra", "softImpute"] + "depends": ["Matrix", "RSpectra", "doParallel", "foreach", "softImpute"] }, "gscaLCA": { "name": "gscaLCA", "version": "0.0.5", "sha256": "12zksjp0wh95qg7vxh22z652hk35r9sp0qxrms4y1laixa8vr71x", - "depends": ["devtools", "doSNOW", "fastDummies", "fclust", "foreach", "ggplot2", "gridExtra", "MASS", "nnet", "progress", "psych", "stringr"] + "depends": ["MASS", "devtools", "doSNOW", "fastDummies", "fclust", "foreach", "ggplot2", "gridExtra", "nnet", "progress", "psych", "stringr"] }, "gscounts": { "name": "gscounts", @@ -69311,7 +70019,7 @@ "name": "gsignal", "version": "0.3-5", "sha256": "0qyb8p8vg7sfx6kgib03lwidxh9my669asbjwvbpwzxd4sb51gsf", - "depends": ["pracma", "Rcpp"] + "depends": ["Rcpp", "pracma"] }, "gsisdecoder": { "name": "gsisdecoder", @@ -69353,13 +70061,13 @@ "name": "gspcr", "version": "0.9.5", "sha256": "19k07yg3z2p63dgq8hyyqpnq2r23rwbh1wqwna4d4w1bif9vgq8b", - "depends": ["dplyr", "FactoMineR", "ggplot2", "MASS", "MLmetrics", "nnet", "PCAmixdata", "reshape2", "rlang"] + "depends": ["FactoMineR", "MASS", "MLmetrics", "PCAmixdata", "dplyr", "ggplot2", "nnet", "reshape2", "rlang"] }, "gsrs": { "name": "gsrs", "version": "0.1.1", "sha256": "0x5fll59l000dqszy0gmhsfqgpaljc57j1grqg5c7y1p3vji38in", - "depends": ["doParallel", "foreach", "MASS"] + "depends": ["MASS", "doParallel", "foreach"] }, "gsrsb": { "name": "gsrsb", @@ -69407,12 +70115,12 @@ "name": "gsynth", "version": "1.2.1", "sha256": "1a4s8ghxc5zw295ys8hp22nx93gc1vyakn7r1dcq3ghikh02nzaa", - "depends": ["abind", "doParallel", "doRNG", "foreach", "future", "GGally", "ggplot2", "lfe", "MASS", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["GGally", "MASS", "Rcpp", "RcppArmadillo", "abind", "doParallel", "doRNG", "foreach", "future", "ggplot2", "lfe", "mvtnorm"] }, "gt": { "name": "gt", - "version": "0.10.1", - "sha256": "11rkrkj9ic8wl0jbzigyrsb31crqbz1gpmb9qmavg424vpi60ry5", + "version": "0.11.0", + "sha256": "1jg9kg2b1qig1awfgnb5fi54qjmvl2qw1ny0l4vsqh87c2f3yij3", "depends": ["base64enc", "bigD", "bitops", "cli", "commonmark", "dplyr", "fs", "glue", "htmltools", "htmlwidgets", "juicyjuice", "magrittr", "markdown", "reactable", "rlang", "sass", "scales", "tidyselect", "vctrs", "xml2"] }, "gt4ireval": { @@ -69461,7 +70169,7 @@ "name": "gtfs2gps", "version": "2.1-1", "sha256": "0k65iy7armdn13bs31wr6gq7hdxpz5nqqzpdxpm5g1mkxwc9fi1g", - "depends": ["checkmate", "data_table", "furrr", "future", "gtfstools", "lwgeom", "progressr", "Rcpp", "sf", "sfheaders", "terra", "units"] + "depends": ["Rcpp", "checkmate", "data_table", "furrr", "future", "gtfstools", "lwgeom", "progressr", "sf", "sfheaders", "terra", "units"] }, "gtfsio": { "name": "gtfsio", @@ -69473,7 +70181,7 @@ "name": "gtfsrouter", "version": "0.1.2", "sha256": "1v8b3yr7c7yaavy3ivj7ik2hmbdyjasmkxkbrs3f943m9fbkngwi", - "depends": ["cli", "data_table", "geodist", "Rcpp"] + "depends": ["Rcpp", "cli", "data_table", "geodist"] }, "gtfstools": { "name": "gtfstools", @@ -69507,8 +70215,8 @@ }, "gtreg": { "name": "gtreg", - "version": "0.3.0", - "sha256": "1kvzi16ziy37zyal2ibgfpzbr5qf26z94v1381qsqhiwn382xng9", + "version": "0.4.0", + "sha256": "1ldlv43hgxb6dzs4d2ha1rd5qyyia5pyih2v7rfhmjdnz9qdwl6d", "depends": ["broom_helpers", "cli", "dplyr", "forcats", "glue", "gtsummary", "purrr", "rlang", "stringr", "tibble", "tidyr"] }, "gtrendsR": { @@ -69519,9 +70227,9 @@ }, "gtsummary": { "name": "gtsummary", - "version": "1.7.2", - "sha256": "02jbsdv8wwncnrmqmf12pz3ld759s8ll5dl5rrxv8ad6qgqjbhnx", - "depends": ["broom", "broom_helpers", "cli", "dplyr", "forcats", "glue", "gt", "knitr", "lifecycle", "purrr", "rlang", "stringr", "tibble", "tidyr", "vctrs"] + "version": "2.0.1", + "sha256": "13p3ii63whd0vgx5lnvdaqhmi6if492r9x2v769vnck2dzpsrjbp", + "depends": ["cards", "cli", "dplyr", "glue", "gt", "lifecycle", "rlang", "tidyr", "vctrs"] }, "guaguas": { "name": "guaguas", @@ -69563,7 +70271,7 @@ "name": "guiplot", "version": "0.5.0", "sha256": "0w0airy3z9hskpsqsk136ipmj8wn9v9j5n6sicybwm0qvj83fzhj", - "depends": ["DT", "excelR", "ggplot2", "jsonlite", "magrittr", "R6", "rlang", "shiny", "svglite"] + "depends": ["DT", "R6", "excelR", "ggplot2", "jsonlite", "magrittr", "rlang", "shiny", "svglite"] }, "guix_install": { "name": "guix.install", @@ -69629,7 +70337,7 @@ "name": "gwaRs", "version": "0.3.0", "sha256": "1mjwsf1sbrd88psiz6f74zddv1wvhpxk5nxbfjpdrxs74rkc36fs", - "depends": ["data_table", "dplyr", "ggplot2", "ggrepel", "RColorBrewer", "scales", "tidyr"] + "depends": ["RColorBrewer", "data_table", "dplyr", "ggplot2", "ggrepel", "scales", "tidyr"] }, "gwasforest": { "name": "gwasforest", @@ -69659,13 +70367,13 @@ "name": "gwid", "version": "0.2.0", "sha256": "1qkj6773ywm3mxry9d9yzf2m52dcmjg5h5031h48x6gpg4qjf1k2", - "depends": ["data_table", "gdsfmt", "ggplot2", "lattice", "Matrix", "piggyback", "plotly", "RcppRoll", "shiny", "SNPRelate"] + "depends": ["Matrix", "RcppRoll", "SNPRelate", "data_table", "gdsfmt", "ggplot2", "lattice", "piggyback", "plotly", "shiny"] }, "gwpcormapper": { "name": "gwpcormapper", "version": "0.1.3", "sha256": "0d8skx6rxas5qvhg7ykhymrzd6dawj45421vr66r4wi4hbdfjbzx", - "depends": ["attempt", "config", "corpcor", "crosstalk", "dplyr", "DT", "geodist", "glue", "golem", "htmltools", "leaflet", "pkgload", "plotly", "processx", "Rcpp", "sf", "shiny", "shinydashboard", "shinyjs", "viridis"] + "depends": ["DT", "Rcpp", "attempt", "config", "corpcor", "crosstalk", "dplyr", "geodist", "glue", "golem", "htmltools", "leaflet", "pkgload", "plotly", "processx", "sf", "shiny", "shinydashboard", "shinyjs", "viridis"] }, "gwrpvr": { "name": "gwrpvr", @@ -69695,7 +70403,7 @@ "name": "gyro", "version": "1.4.0", "sha256": "0zgzqgfd97bxb4crijlc9byak4dl5zrhp6ynch8yda8m3rx1gz92", - "depends": ["clipr", "colorsGen", "cxhull", "Morpho", "plotrix", "Polychrome", "purrr", "RCDT", "Rcpp", "rgl", "rstudioapi", "Rvcg"] + "depends": ["Morpho", "Polychrome", "RCDT", "Rcpp", "Rvcg", "clipr", "colorsGen", "cxhull", "plotrix", "purrr", "rgl", "rstudioapi"] }, "h0": { "name": "h0", @@ -69707,7 +70415,7 @@ "name": "h2o", "version": "3.44.0.3", "sha256": "10hczpb53s9nvnj21fqp0nlvr9pa8lxgv97q75lfks0m5xn5za31", - "depends": ["jsonlite", "RCurl"] + "depends": ["RCurl", "jsonlite"] }, "h2o4gpu": { "name": "h2o4gpu", @@ -69725,7 +70433,7 @@ "name": "h3jsr", "version": "1.3.1", "sha256": "04h905p3xpaswpx728kp7z6bgqlncgzikfv6njvgvzbhmpfn9fs8", - "depends": ["geojsonsf", "sf", "tidyr", "V8"] + "depends": ["V8", "geojsonsf", "sf", "tidyr"] }, "h3lib": { "name": "h3lib", @@ -69743,13 +70451,13 @@ "name": "hBayesDM", "version": "1.2.1", "sha256": "1vy1kaffviidhil39n7k2fr5rjgzkhkaj1r2nhmp908snq8nhf2m", - "depends": ["BH", "data_table", "ggplot2", "loo", "Rcpp", "RcppEigen", "rstan", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "data_table", "ggplot2", "loo", "rstan"] }, "hIRT": { "name": "hIRT", "version": "0.3.0", "sha256": "0s0i6p9iv0yv0l15dnwkpcmc91751jyjs1y1nz671lz6jpb8rz5c", - "depends": ["ltm", "Matrix", "pryr", "rms"] + "depends": ["Matrix", "ltm", "pryr", "rms"] }, "hJAM": { "name": "hJAM", @@ -69785,7 +70493,7 @@ "name": "habCluster", "version": "1.0.5", "sha256": "1cjmhq8krkv4g1vy70kc3j667djzmq38xlqn568f437f6jaglvkp", - "depends": ["igraph", "raster", "Rcpp", "sf", "stars"] + "depends": ["Rcpp", "igraph", "raster", "sf", "stars"] }, "hablar": { "name": "hablar", @@ -69797,7 +70505,7 @@ "name": "habtools", "version": "1.0.5", "sha256": "1y0pjx16272dknmp2lpc69fmj5h4s4hsl2kchlrcwxpdyfyz7yb2", - "depends": ["concaveman", "dplyr", "geometry", "magrittr", "purrr", "raster", "Rvcg", "sp", "terra"] + "depends": ["Rvcg", "concaveman", "dplyr", "geometry", "magrittr", "purrr", "raster", "sp", "terra"] }, "hackeRnews": { "name": "hackeRnews", @@ -69827,25 +70535,25 @@ "name": "hahmmr", "version": "1.0.0", "sha256": "19bds84pkimr71dy1365b71k7ihn7x86yalgcmagvkxgygpg3409", - "depends": ["data_table", "dplyr", "GenomicRanges", "ggplot2", "glue", "IRanges", "patchwork", "Rcpp", "RcppArmadillo", "roptim", "stringr", "tibble", "zoo"] + "depends": ["GenomicRanges", "IRanges", "Rcpp", "RcppArmadillo", "data_table", "dplyr", "ggplot2", "glue", "patchwork", "roptim", "stringr", "tibble", "zoo"] }, "hakaiApi": { "name": "hakaiApi", "version": "1.0.2", "sha256": "0lxqk4cp1s1sm3nbsp74q1bpklmph620c2f1kii97h6yimnq9bi0", - "depends": ["dplyr", "httr", "R6", "readr", "tibble"] + "depends": ["R6", "dplyr", "httr", "readr", "tibble"] }, "hal9001": { "name": "hal9001", "version": "0.4.6", "sha256": "1p88rpm4alkr56w4cjl8sxj6ylq991dsny11njcdx5rzc25jh8qi", - "depends": ["assertthat", "data_table", "glmnet", "Matrix", "origami", "Rcpp", "RcppEigen", "stringr"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "assertthat", "data_table", "glmnet", "origami", "stringr"] }, "haldensify": { "name": "haldensify", "version": "0.2.3", "sha256": "071lgx6j92n40bjlrp3khmnavvkla371rkm1ssx20ig5pkay23pw", - "depends": ["assertthat", "data_table", "dplyr", "future_apply", "ggplot2", "hal9001", "matrixStats", "origami", "Rdpack", "rlang", "rsample", "scales", "tibble"] + "depends": ["Rdpack", "assertthat", "data_table", "dplyr", "future_apply", "ggplot2", "hal9001", "matrixStats", "origami", "rlang", "rsample", "scales", "tibble"] }, "halfcircle": { "name": "halfcircle", @@ -69887,7 +70595,7 @@ "name": "handwriter", "version": "3.1.1", "sha256": "1gwxp5nsw38f368z586hixk4i7b87vg0fcmxxdl2zldawv1sx0v9", - "depends": ["doParallel", "dplyr", "foreach", "ggplot2", "igraph", "lpSolve", "magick", "mc2d", "png", "purrr", "Rcpp", "RcppArmadillo", "reshape2", "Rfast", "rjags", "stringr", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "Rfast", "doParallel", "dplyr", "foreach", "ggplot2", "igraph", "lpSolve", "magick", "mc2d", "png", "purrr", "reshape2", "rjags", "stringr", "tidyr"] }, "handyFunctions": { "name": "handyFunctions", @@ -69935,7 +70643,7 @@ "name": "haploR", "version": "4.0.7", "sha256": "1s8f556d9x5h76gyl4wggcx01f4qrx0fp5mz46yk2x9qmwiir89v", - "depends": ["DT", "httr", "plyr", "RCurl", "RJSONIO", "RUnit", "tibble", "XML"] + "depends": ["DT", "RCurl", "RJSONIO", "RUnit", "XML", "httr", "plyr", "tibble"] }, "haplotyper": { "name": "haplotyper", @@ -69995,7 +70703,7 @@ "name": "harmony", "version": "1.2.0", "sha256": "1df7bb9ba3m0c44fhmh8cs4hlkh4fffjwm8rz7l87lf5pdy7sg56", - "depends": ["cowplot", "dplyr", "ggplot2", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "RhpcBLASctl", "rlang", "tibble"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "RhpcBLASctl", "cowplot", "dplyr", "ggplot2", "rlang", "tibble"] }, "harmonydata": { "name": "harmonydata", @@ -70037,7 +70745,7 @@ "name": "hasseDiagram", "version": "0.2.0", "sha256": "1ni4wzj8g6qmpgz1xj62vawkcpm3jr4jqqr1xaxlh5nzbj9fn57h", - "depends": ["graph", "Rgraphviz"] + "depends": ["Rgraphviz", "graph"] }, "haven": { "name": "haven", @@ -70055,7 +70763,7 @@ "name": "hawkesbow", "version": "1.0.3", "sha256": "1jbwvzw4j8l7ywrbm4bhxvwp1b3j4ahi6fchmmvfjnx0da1d8163", - "depends": ["BH", "nloptr", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "nloptr"] }, "hazer": { "name": "hazer", @@ -70067,13 +70775,13 @@ "name": "hbal", "version": "1.2.12", "sha256": "1r3wlgvjy33cr0vi0lpckim4cybz67lh44fi6d36hms8pirnl4rl", - "depends": ["estimatr", "generics", "ggplot2", "glmnet", "gridExtra", "gtable", "nloptr", "Rcpp", "RcppEigen", "stringr"] + "depends": ["Rcpp", "RcppEigen", "estimatr", "generics", "ggplot2", "glmnet", "gridExtra", "gtable", "nloptr", "stringr"] }, "hbamr": { "name": "hbamr", "version": "2.3.1", "sha256": "1cch2l4dazny7p5hn16v0fp5mir10fy4qa8ibpgx3j2vi8w05c1x", - "depends": ["BH", "colorspace", "dplyr", "future", "future_apply", "ggplot2", "loo", "matrixStats", "plyr", "progressr", "RColorBrewer", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders", "tidyr"] + "depends": ["BH", "RColorBrewer", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "colorspace", "dplyr", "future", "future_apply", "ggplot2", "loo", "matrixStats", "plyr", "progressr", "rlang", "rstan", "rstantools", "tidyr"] }, "hbbr": { "name": "hbbr", @@ -70135,11 +70843,17 @@ "sha256": "1cari4ms1j5x2i5m9yd50j7alf18k7z053yhqbck0hs2mck9jx86", "depends": ["Rcpp"] }, + "hclusteasy": { + "name": "hclusteasy", + "version": "0.1.0", + "sha256": "0c3w2wmk5a85kxkkg782w2ggy43i2ayrrjfwl91bkxba5n2pk3sa", + "depends": ["clusterSim", "factoextra", "readxl"] + }, "hctrial": { "name": "hctrial", "version": "0.1.0", "sha256": "19li8i8hx0r3b63q80cnj6pr72rdbmykxq0kcfbn4azq3sdd046y", - "depends": ["clinfun", "GenBinomApps"] + "depends": ["GenBinomApps", "clinfun"] }, "hdImpute": { "name": "hdImpute", @@ -70163,7 +70877,7 @@ "name": "hdbinseg", "version": "1.0.2", "sha256": "0q5lfczymrd4ln04lbdysncx6ylcsgrk69mhvm7jjk7pybrpm9wq", - "depends": ["doParallel", "foreach", "iterators", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "iterators"] }, "hdbm": { "name": "hdbm", @@ -70175,13 +70889,13 @@ "name": "hdbma", "version": "1.0", "sha256": "0dj9hh6x5096znl7naga0qrx2fwr4crgjk7fyk5vxn6v1gl3llrh", - "depends": ["gplots", "lattice", "MASS", "R2jags", "survival"] + "depends": ["MASS", "R2jags", "gplots", "lattice", "survival"] }, "hdcate": { "name": "hdcate", "version": "0.1.0", "sha256": "1jv6y38lzvm75s44n1pjvkkf5xcvrvclil318gvx54b16hvgggcg", - "depends": ["caret", "hdm", "KernSmooth", "locpol", "R6"] + "depends": ["KernSmooth", "R6", "caret", "hdm", "locpol"] }, "hdcuremodels": { "name": "hdcuremodels", @@ -70203,21 +70917,21 @@ }, "hdf5r": { "name": "hdf5r", - "version": "1.3.10", - "sha256": "0khj94z6ls6dnc6fpxwf1w93mk6f3z2p39mbihf0lz52jc36wjcj", - "depends": ["bit64", "R6"] + "version": "1.3.11", + "sha256": "1i58andd3k7ghmlv9f2frfa823p6lhdcwghyrszgmb3jpikxd5cp", + "depends": ["R6", "bit64"] }, "hdf5r_Extra": { "name": "hdf5r.Extra", "version": "0.0.6", "sha256": "0k8rvwxr30pbx0svikfar40465ff2daipsf91yp2px7hrgb4y129", - "depends": ["checkmate", "dplyr", "easy_utils", "hdf5r", "Matrix", "MatrixExtra", "rlang"] + "depends": ["Matrix", "MatrixExtra", "checkmate", "dplyr", "easy_utils", "hdf5r", "rlang"] }, "hdflex": { "name": "hdflex", "version": "0.2.1", "sha256": "1f02gkgry8zilrk3sl4dl2jkbnvqn9700lv8k5zlh4cangq5jp9n", - "depends": ["checkmate", "dplyr", "Rcpp", "RcppArmadillo", "roll", "stringr"] + "depends": ["Rcpp", "RcppArmadillo", "checkmate", "dplyr", "roll", "stringr"] }, "hdfqlr": { "name": "hdfqlr", @@ -70229,7 +70943,7 @@ "name": "hdi", "version": "0.1-9", "sha256": "0k35zqz58lcx5p7ijhks4j7kqp553zggvrx4lh6k4s85lp601x22", - "depends": ["glmnet", "linprog", "MASS", "scalreg"] + "depends": ["MASS", "glmnet", "linprog", "scalreg"] }, "hdiVAR": { "name": "hdiVAR", @@ -70241,19 +70955,19 @@ "name": "hdm", "version": "0.3.2", "sha256": "0spy2a23b6hxw6dm6zjqya066ar0224b64lckh6hrapha8kv4m1k", - "depends": ["checkmate", "Formula", "ggplot2", "glmnet", "MASS"] + "depends": ["Formula", "MASS", "checkmate", "ggplot2", "glmnet"] }, "hdme": { "name": "hdme", "version": "0.6.0", "sha256": "04s9r29yjirkzki6drcyglh2hd712habzdgpw0fnf3cy9960wv4v", - "depends": ["ggplot2", "glmnet", "Rcpp", "RcppArmadillo", "Rdpack", "Rglpk", "rlang"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "Rglpk", "ggplot2", "glmnet", "rlang"] }, "hdmed": { "name": "hdmed", "version": "1.0.1", "sha256": "1vmyf9w5dwl8ayxsk7ykd13hl41j4a435771rkgmkmnm5fbcqaai", - "depends": ["bama", "foreach", "freebird", "gcdnet", "genlasso", "hdi", "iterators", "MASS", "mediation", "ncvreg"] + "depends": ["MASS", "bama", "foreach", "freebird", "gcdnet", "genlasso", "hdi", "iterators", "mediation", "ncvreg"] }, "hdnom": { "name": "hdnom", @@ -70265,7 +70979,7 @@ "name": "hdpGLM", "version": "1.0.3", "sha256": "1hh0d0dmnqxzsfar86bd0cqjj5jljyhw073zi59bmjyg4m0rjyyn", - "depends": ["coda", "data_table", "dplyr", "formula_tools", "ggjoy", "ggplot2", "ggpubr", "ggridges", "Hmisc", "isotone", "LaplacesDemon", "magrittr", "MASS", "MCMCpack", "mvtnorm", "png", "purrr", "questionr", "Rcpp", "RcppArmadillo", "rprojroot", "stringr", "tibble", "tidyr", "tidyverse"] + "depends": ["Hmisc", "LaplacesDemon", "MASS", "MCMCpack", "Rcpp", "RcppArmadillo", "coda", "data_table", "dplyr", "formula_tools", "ggjoy", "ggplot2", "ggpubr", "ggridges", "isotone", "magrittr", "mvtnorm", "png", "purrr", "questionr", "rprojroot", "stringr", "tibble", "tidyr", "tidyverse"] }, "hdpca": { "name": "hdpca", @@ -70277,7 +70991,7 @@ "name": "hdrcde", "version": "3.4", "sha256": "16qlk44cjvn2s0vzaf915df65ksdx20dbxhy7fpdqins46hccha3", - "depends": ["ash", "ggplot2", "KernSmooth", "ks", "locfit", "RColorBrewer"] + "depends": ["KernSmooth", "RColorBrewer", "ash", "ggplot2", "ks", "locfit"] }, "hds": { "name": "hds", @@ -70317,14 +71031,14 @@ }, "healthyAddress": { "name": "healthyAddress", - "version": "0.4.2", - "sha256": "1fbqka0gg7l11n6czb2z2480r7v5ispn54a17xjad547ndy12n5v", + "version": "0.4.3", + "sha256": "0rj2cd34dw17bdw3m6dkgyaji72f3sapf9jnvlr8sima6nfiacqd", "depends": ["data_table", "fastmatch", "fst", "hutils", "hutilscpp", "magrittr", "qs"] }, "healthyR": { "name": "healthyR", - "version": "0.2.1", - "sha256": "0wlw6sd187sw5ar58c4a5yz9fw0bc044cik1xsq54ipp4xprlnxp", + "version": "0.2.2", + "sha256": "1fa2w3w2cfn5ak01kls8yxxzyfvmp2v43q0bfr4ylrimd1fvbhbp", "depends": ["cowplot", "dplyr", "ggplot2", "lubridate", "magrittr", "plotly", "purrr", "rlang", "scales", "sqldf", "stringr", "tibble", "timetk", "writexl"] }, "healthyR_ai": { @@ -70335,8 +71049,8 @@ }, "healthyR_data": { "name": "healthyR.data", - "version": "1.1.0", - "sha256": "025pgadi0rgwz0yvkx3mgf6r66sk2phmsmvgpykwd6jxyfwix2yk", + "version": "1.1.1", + "sha256": "1g8fd2s60i6yhfp6z2g0ib6zz4n2xvwswbzacbffbvakf21djwvc", "depends": ["dplyr", "httr2", "janitor", "rlang", "stringr", "tidyr"] }, "healthyR_ts": { @@ -70349,7 +71063,7 @@ "name": "healthyverse", "version": "1.0.4", "sha256": "1h3d8wq6if1nkqc1d3n6y0g7i7xsvx9ci09z3jvhqx62f464ybgm", - "depends": ["cli", "crayon", "dplyr", "healthyR", "healthyR_ai", "healthyR_data", "healthyR_ts", "magrittr", "purrr", "rlang", "rstudioapi", "tibble", "tidyAML", "TidyDensity"] + "depends": ["TidyDensity", "cli", "crayon", "dplyr", "healthyR", "healthyR_ai", "healthyR_data", "healthyR_ts", "magrittr", "purrr", "rlang", "rstudioapi", "tibble", "tidyAML"] }, "heapsofpapers": { "name": "heapsofpapers", @@ -70385,18 +71099,18 @@ "name": "heatmaply", "version": "1.5.0", "sha256": "1crdm7avxv3zx59byz2fqbcw95728crwf9cckjb9gal1065xv95c", - "depends": ["assertthat", "colorspace", "dendextend", "egg", "ggplot2", "htmlwidgets", "magrittr", "plotly", "RColorBrewer", "reshape2", "scales", "seriation", "viridis", "webshot"] + "depends": ["RColorBrewer", "assertthat", "colorspace", "dendextend", "egg", "ggplot2", "htmlwidgets", "magrittr", "plotly", "reshape2", "scales", "seriation", "viridis", "webshot"] }, "heatwaveR": { "name": "heatwaveR", "version": "0.4.6", "sha256": "172qg8dgyn5lbwmyq8dxdccxr4aqaq6iixn5dqb4fy99ahgdbhyv", - "depends": ["data_table", "dplyr", "ggplot2", "lubridate", "plyr", "Rcpp", "RcppArmadillo", "RcppRoll", "tibble"] + "depends": ["Rcpp", "RcppArmadillo", "RcppRoll", "data_table", "dplyr", "ggplot2", "lubridate", "plyr", "tibble"] }, "heck": { "name": "heck", - "version": "0.1.0", - "sha256": "0mpfxkzk171qql9jx8byaiyinyb1ibla11jzljlw9pkdf4gs6m4b", + "version": "0.1.1", + "sha256": "0s4j0cyac3lqk4jjlbwamdk3nkdicq0nxaa579j9k63azcdz49rs", "depends": [] }, "heddlr": { @@ -70405,6 +71119,12 @@ "sha256": "0ixmcgvfbq4hi3wv1fyzpwacmxmixsw5yq6mq5xygk6ji03m1v23", "depends": ["rlang", "utf8", "yaml"] }, + "hedgedrf": { + "name": "hedgedrf", + "version": "0.0.1", + "sha256": "1ka2pp1df00j63g15arcnndzribgkkaimvhxgiia9g409pmyizpc", + "depends": ["CVXR", "ranger"] + }, "hedgehog": { "name": "hedgehog", "version": "0.1", @@ -70419,9 +71139,9 @@ }, "heimdall": { "name": "heimdall", - "version": "1.0.3", - "sha256": "02lpyiphzyirmi6fl0l4k3vm5b3gvw1f8ha5mmsrkcnnvixakb2y", - "depends": ["caret", "daltoolbox", "ggplot2"] + "version": "1.0.717", + "sha256": "0qqr084h30p7aiv7cfz7g39qgswz4d249s90cck6xhbc8la9jbc3", + "depends": ["caret", "daltoolbox", "ggplot2", "reticulate"] }, "heims": { "name": "heims", @@ -70431,9 +71151,9 @@ }, "heiscore": { "name": "heiscore", - "version": "0.0.1", - "sha256": "0bj1li0m4mpd04f4zqh1dj4v593cv5nvv17n2yasjbqrymi15mr5", - "depends": ["dplyr", "fmsb", "ggplot2", "ggpubr", "magrittr", "RColorBrewer", "rlang", "shiny", "shinythemes", "stringr", "tibble", "tidyr"] + "version": "0.1.3", + "sha256": "1yh4khm83aw56f8xkjan0a3v0xcc7idg6agpp2mk39dwzaqmxbk0", + "depends": ["dplyr", "fmsb", "ggplot2", "ggpubr", "magrittr", "rlang", "shiny", "shinyWidgets", "shinythemes", "stringr", "tibble", "tidyr", "viridis"] }, "helixvis": { "name": "helixvis", @@ -70481,7 +71201,7 @@ "name": "heplots", "version": "1.7.0", "sha256": "0hkwfg2xfsmvxnzr2jdfxn93ny325rkhc2cakr4hvddvg65dckfx", - "depends": ["broom", "car", "magrittr", "MASS", "purrr", "rgl", "tibble"] + "depends": ["MASS", "broom", "car", "magrittr", "purrr", "rgl", "tibble"] }, "here": { "name": "here", @@ -70517,13 +71237,13 @@ "name": "hero", "version": "0.6", "sha256": "0az2gva4rdbgsfd31512h8a23bvvbx812ws05rg2qs6r5qhwbj8r", - "depends": ["fields", "Matrix", "optimx", "pbapply", "sf", "sp"] + "depends": ["Matrix", "fields", "optimx", "pbapply", "sf", "sp"] }, "hesim": { "name": "hesim", "version": "0.5.4", "sha256": "1fx55wwzk2w3zxnk96821bxrsklln7r6px19m7iv0f376iaamiq7", - "depends": ["data_table", "flexsurv", "ggplot2", "MASS", "msm", "R6", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["MASS", "R6", "Rcpp", "RcppArmadillo", "data_table", "flexsurv", "ggplot2", "msm", "survival"] }, "hetGP": { "name": "hetGP", @@ -70535,19 +71255,19 @@ "name": "heterogen", "version": "1.2.33", "sha256": "17287n38km02ldwddldw9zh8f8w18f9vi7dcg52a17r9r7v0mshv", - "depends": ["future", "Rcpp", "RcppArmadillo", "RcppEigen", "rio", "scales", "terra"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "future", "rio", "scales", "terra"] }, "heterometa": { "name": "heterometa", - "version": "0.2", - "sha256": "01sahscx2lx9z7l0fpxqbrq34c6zkyyclwdcam27vcwj8189w2n1", - "depends": ["mathjaxr", "Rdpack"] + "version": "0.3", + "sha256": "1z295l3kzz0c3q6qx5qhf0nr73db13vjvn1lnis05509mga9i28w", + "depends": ["Rdpack", "mathjaxr"] }, "heteromixgm": { "name": "heteromixgm", - "version": "1.0.0", - "sha256": "0jhvjalpx7licjjvj8ld4als1jkm22mkbxmz893h91qzacznx8zk", - "depends": ["BDgraph", "glasso", "igraph", "MASS", "Matrix", "tmvtnorm"] + "version": "2.0.1", + "sha256": "111qhf88bjkpraaqabyq8m40yk99jkmd2b6m7d7502gac3a0bf6z", + "depends": ["BDgraph", "MASS", "Matrix", "glasso", "igraph", "tmvtnorm"] }, "hetsurr": { "name": "hetsurr", @@ -70559,7 +71279,7 @@ "name": "hett", "version": "0.3-3", "sha256": "0i7q28nc67m62vi1ipfg035yqjh691fb1mp33dp1b68g5wjysphh", - "depends": ["lattice", "MASS"] + "depends": ["MASS", "lattice"] }, "hettest": { "name": "hettest", @@ -70577,7 +71297,7 @@ "name": "hettx", "version": "0.1.3", "sha256": "15i9n2fcfbkv11qlgh4gsjvfnzzziwbcn8izzxw2d0kbdhhk7h8c", - "depends": ["doParallel", "dplyr", "foreach", "formula_tools", "ggplot2", "MASS", "moments", "mvtnorm", "plyr", "purrr", "quantreg", "tidyr"] + "depends": ["MASS", "doParallel", "dplyr", "foreach", "formula_tools", "ggplot2", "moments", "mvtnorm", "plyr", "purrr", "quantreg", "tidyr"] }, "hetu": { "name": "hetu", @@ -70601,7 +71321,7 @@ "name": "heuristicsmineR", "version": "0.3.0", "sha256": "0w4f7xpz2342k38b5a7fs6fq50045hh2836390zg36nqdapg8vlv", - "depends": ["BH", "bupaR", "data_table", "DiagrammeR", "dplyr", "ggplot2", "ggthemes", "magrittr", "petrinetR", "processmapR", "purrr", "Rcpp", "rlang", "scales", "stringr", "tidyr"] + "depends": ["BH", "DiagrammeR", "Rcpp", "bupaR", "data_table", "dplyr", "ggplot2", "ggthemes", "magrittr", "petrinetR", "processmapR", "purrr", "rlang", "scales", "stringr", "tidyr"] }, "hexSticker": { "name": "hexSticker", @@ -70649,7 +71369,7 @@ "name": "hfr", "version": "0.7.1", "sha256": "0xcmin49sbkl3c9xrvq7spp5qnfdf7v6fscv3a85dhd5b5adhpm7", - "depends": ["corpcor", "dendextend", "quadprog", "RColorBrewer"] + "depends": ["RColorBrewer", "corpcor", "dendextend", "quadprog"] }, "hglasso": { "name": "hglasso", @@ -70661,7 +71381,7 @@ "name": "hglm", "version": "2.2-1", "sha256": "1lyxkvqzfll1qrz5c2km9ikhq0dm63x39by4vc1nmkd24yza93nc", - "depends": ["hglm_data", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "hglm_data"] }, "hglm_data": { "name": "hglm.data", @@ -70689,9 +71409,9 @@ }, "hgwrr": { "name": "hgwrr", - "version": "0.3-0", - "sha256": "0m3h5zwdnj4l7i6nh0mrjj4wprajgazninzffxpy14g7fy907ifn", - "depends": ["Rcpp", "RcppArmadillo"] + "version": "0.5-0", + "sha256": "03ma8g0qz6hpp2m1ys3c6mnkbpjbmpf60pxl0cggaj5d9aymjs1c", + "depends": ["Rcpp", "RcppArmadillo", "sf"] }, "hhh4contacts": { "name": "hhh4contacts", @@ -70709,7 +71429,7 @@ "name": "hhsmm", "version": "0.4.0", "sha256": "15lqb4k8q0c9w2fi03ndrzs5vdnh7r5wa4ifpzqvggw5vrnfmfy8", - "depends": ["CMAPSS", "magic", "MASS", "mice", "mvtnorm", "progress", "Rcpp", "Rdpack", "splines2"] + "depends": ["CMAPSS", "MASS", "Rcpp", "Rdpack", "magic", "mice", "mvtnorm", "progress", "splines2"] }, "hht": { "name": "hht", @@ -70721,12 +71441,12 @@ "name": "hibayes", "version": "3.0.3", "sha256": "04vkvqha82cpmjflxir83208d9mxwip7wlbc3zd12apvrg2c91x6", - "depends": ["BH", "bigmemory", "CMplot", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "stringr"] + "depends": ["BH", "CMplot", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "bigmemory", "stringr"] }, "hicp": { "name": "hicp", - "version": "0.5.1", - "sha256": "1xzjlwbmibzs362k6c9y346scqvx3lf6n3pnq6bhbklwfw8jd3hz", + "version": "0.6.1", + "sha256": "1zb18sn2az5gval4az4n9g9jipmikd08jj7vpmlqmzdsascp75wg", "depends": ["data_table", "restatapi"] }, "hiddenf": { @@ -70741,6 +71461,12 @@ "sha256": "08yhjgmcmrnrm6rm0vlzvizadvywcs1p6mchw1synxvclfaxyi28", "depends": ["dplyr", "ggnewscale", "ggplot2", "ggrepel", "purrr", "shiny", "tibble", "tidyr", "viridis", "vroom"] }, + "hidradenitis": { + "name": "hidradenitis", + "version": "1.0.0", + "sha256": "0dzdllmsj98yl178fg25vny0vaxhra88zd6ifzv06fcjma53svrj", + "depends": ["checkmate"] + }, "hierBipartite": { "name": "hierBipartite", "version": "0.0.2", @@ -70757,13 +71483,13 @@ "name": "hierSDR", "version": "0.1", "sha256": "164l7gw5bkg09mfs0rnqwfsbgr4mppc0skbmqk2d98mcvvmmcwd7", - "depends": ["lbfgs", "locfit", "MASS", "Matrix", "numDeriv", "optimx"] + "depends": ["MASS", "Matrix", "lbfgs", "locfit", "numDeriv", "optimx"] }, "hierarchicalSets": { "name": "hierarchicalSets", "version": "1.0.4", "sha256": "0i0dl2r1gc8ckk2hb498km9bgsqbj7fp8gpp8778rba001nvgwx7", - "depends": ["ggdendro", "ggplot2", "gtable", "MASS", "Matrix", "patchwork", "RColorBrewer", "Rcpp", "scales", "viridis"] + "depends": ["MASS", "Matrix", "RColorBrewer", "Rcpp", "ggdendro", "ggplot2", "gtable", "patchwork", "scales", "viridis"] }, "hierfstat": { "name": "hierfstat", @@ -70781,13 +71507,13 @@ "name": "highMLR", "version": "0.1.1", "sha256": "0jkv6blkzdnn263wxy7p0hspgf5fchl5fbmzpqb5lfvl2f3pi3j9", - "depends": ["coxme", "dplyr", "gtools", "missForest", "mlr3", "mlr3learners", "R6", "survival", "tibble"] + "depends": ["R6", "coxme", "dplyr", "gtools", "missForest", "mlr3", "mlr3learners", "survival", "tibble"] }, "highOrderPortfolios": { "name": "highOrderPortfolios", "version": "0.1.1", "sha256": "0qjmxiv5dcpgyl5c9vbbizwwg4lpppc9z09rf4c4lf0dfrcj4c5i", - "depends": ["ECOSolveR", "fitHeavyTail", "lpSolveAPI", "nloptr", "PerformanceAnalytics", "quadprog"] + "depends": ["ECOSolveR", "PerformanceAnalytics", "fitHeavyTail", "lpSolveAPI", "nloptr", "quadprog"] }, "highTtest": { "name": "highTtest", @@ -70805,7 +71531,7 @@ "name": "highfrequency", "version": "1.0.1", "sha256": "0jxkmgd3sfipz1z37w9flwy8i94q6vxwlxyaflfbprwlskmlnakd", - "depends": ["data_table", "numDeriv", "quantmod", "Rcpp", "RcppArmadillo", "RcppRoll", "robustbase", "Rsolnp", "sandwich", "xts", "zoo"] + "depends": ["Rcpp", "RcppArmadillo", "RcppRoll", "Rsolnp", "data_table", "numDeriv", "quantmod", "robustbase", "sandwich", "xts", "zoo"] }, "highlight": { "name": "highlight", @@ -70825,6 +71551,12 @@ "sha256": "1ksgqx2ryg5lfka93yns5cphnf4xc4v55ncmpisydjbcpzd2105c", "depends": ["cli", "glue", "htmltools", "htmlwidgets", "rlang"] }, + "highlightr": { + "name": "highlightr", + "version": "1.0.0", + "sha256": "14as9gqikswfpwzvq0v9s03r6rwzdsa0k9wad6f6zs416a65v1i4", + "depends": ["dplyr", "fuzzyjoin", "ggplot2", "magrittr", "purrr", "quanteda", "quanteda_textstats", "stringr", "tibble", "tidyr", "tm"] + }, "highmean": { "name": "highmean", "version": "3.0", @@ -70841,13 +71573,13 @@ "name": "highriskzone", "version": "1.4.9", "sha256": "0sg3a99pb2559chalxh66zv9mvwbgfx64vp1209vbhbx3sya48r2", - "depends": ["deldir", "fields", "ks", "maps", "Matrix", "mvtnorm", "polyclip", "spatstat", "spatstat_explore", "spatstat_geom", "spatstat_random", "splancs"] + "depends": ["Matrix", "deldir", "fields", "ks", "maps", "mvtnorm", "polyclip", "spatstat", "spatstat_explore", "spatstat_geom", "spatstat_random", "splancs"] }, "highs": { "name": "highs", "version": "0.1-10", "sha256": "1vjmzbfydlm434fa1mkwwfcdhmn6sq4ppib26nxfa9zakr7h7q2c", - "depends": ["checkmate", "Rcpp"] + "depends": ["Rcpp", "checkmate"] }, "hightR": { "name": "hightR", @@ -70859,7 +71591,7 @@ "name": "higlasso", "version": "0.9.0", "sha256": "09d500jsxlrv658i90xnb2wj1ad89v1iwb6y7vascyvg3cff104h", - "depends": ["gcdnet", "gglasso", "purrr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "gcdnet", "gglasso", "purrr"] }, "higrad": { "name": "higrad", @@ -70877,7 +71609,7 @@ "name": "hilbertSimilarity", "version": "0.4.3", "sha256": "1251df3q7c7c69f8q9y9bxj210bk2dh80c8ca4s58isf0hr2x7zp", - "depends": ["entropy", "Rcpp"] + "depends": ["Rcpp", "entropy"] }, "hildareadR": { "name": "hildareadR", @@ -70889,13 +71621,13 @@ "name": "hillR", "version": "0.5.2", "sha256": "0gc4yirbn2bp38sjdgin7167yvm0kd6nk4yaj66jp0b5qbpc85gc", - "depends": ["ade4", "ape", "FD", "geiger", "plyr", "tibble"] + "depends": ["FD", "ade4", "ape", "geiger", "plyr", "tibble"] }, "hilldiv": { "name": "hilldiv", "version": "1.5.1", "sha256": "1jp4xvrpqd575y2x0i73s0bq708bzi6gdhqgz85bia6d5kf05lq9", - "depends": ["ape", "data_table", "FSA", "geiger", "ggplot2", "ggpubr", "qgraph", "RColorBrewer", "scales", "vegan"] + "depends": ["FSA", "RColorBrewer", "ape", "data_table", "geiger", "ggplot2", "ggpubr", "qgraph", "scales", "vegan"] }, "hillshader": { "name": "hillshader", @@ -70949,7 +71681,7 @@ "name": "hisse", "version": "2.1.11", "sha256": "1mal9x2x882lq3cf74yjrdan3i69x2kq309b154n6lm4gbpk95vw", - "depends": ["ape", "corHMM", "data_table", "deSolve", "diversitree", "geiger", "GenSA", "igraph", "nloptr", "paleotree", "phangorn", "phytools", "plotrix", "subplex", "TreeSim"] + "depends": ["GenSA", "TreeSim", "ape", "corHMM", "data_table", "deSolve", "diversitree", "geiger", "igraph", "nloptr", "paleotree", "phangorn", "phytools", "plotrix", "subplex"] }, "histmdl": { "name": "histmdl", @@ -70967,13 +71699,13 @@ "name": "historicalborrow", "version": "1.0.4", "sha256": "0g7fs6qn957s3zw4ibbqszn2zpncpf6m41r68dw8g6x942mr0fhv", - "depends": ["dplyr", "ggplot2", "Matrix", "posterior", "rjags", "rlang", "tibble", "tidyr", "tidyselect"] + "depends": ["Matrix", "dplyr", "ggplot2", "posterior", "rjags", "rlang", "tibble", "tidyr", "tidyselect"] }, "historicalborrowlong": { "name": "historicalborrowlong", "version": "0.0.8", "sha256": "05kk4m80xvmlra9dlkcq2ww5llyg9r8bqhh8p7i8kzma6c31w4qa", - "depends": ["BH", "clustermq", "dplyr", "ggplot2", "MASS", "Matrix", "posterior", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders", "tibble", "tidyr", "tidyselect", "trialr", "withr", "zoo"] + "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "clustermq", "dplyr", "ggplot2", "posterior", "rlang", "rstan", "rstantools", "tibble", "tidyr", "tidyselect", "trialr", "withr", "zoo"] }, "historydata": { "name": "historydata", @@ -71003,7 +71735,7 @@ "name": "hive", "version": "0.2-2", "sha256": "0ihghpfsk73lndrfrk5907kdsih9s0a7xq23zcyfaa05nk98510n", - "depends": ["rJava", "XML"] + "depends": ["XML", "rJava"] }, "hkdatasets": { "name": "hkdatasets", @@ -71033,19 +71765,19 @@ "name": "hlt", "version": "1.3.1", "sha256": "0wzxymjb70lcgk1hj6ky6ypk9i6s0a5rm7yqlpbs1fddl6mkcln9", - "depends": ["doParallel", "foreach", "ggplot2", "Rcpp", "RcppDist", "RcppProgress", "tidyr", "truncnorm"] + "depends": ["Rcpp", "RcppDist", "RcppProgress", "doParallel", "foreach", "ggplot2", "tidyr", "truncnorm"] }, "hmcdm": { "name": "hmcdm", "version": "2.1.1", "sha256": "0w3ldx8bwcqbc0mv1f8yiby08w4s37jc7gp3p53pmldqk65s7qfb", - "depends": ["bayesplot", "progress", "Rcpp", "RcppArmadillo", "rstantools"] + "depends": ["Rcpp", "RcppArmadillo", "bayesplot", "progress", "rstantools"] }, "hmclearn": { "name": "hmclearn", "version": "0.0.5", "sha256": "0zalvgnibd1kygryqcah5d008y6a0nxpy61yyiqsriw89r01jyjk", - "depends": ["bayesplot", "MASS", "mvtnorm"] + "depends": ["MASS", "bayesplot", "mvtnorm"] }, "hmeasure": { "name": "hmeasure", @@ -71057,7 +71789,7 @@ "name": "hmer", "version": "1.6.0", "sha256": "0536bdrg4cw4kqmx6czzh63b8wia6fhm02fvjv9irlmxqhmy0mxa", - "depends": ["cluster", "dplyr", "GGally", "ggbeeswarm", "ggplot2", "isoband", "lhs", "MASS", "mvtnorm", "pdist", "purrr", "R6", "rlang", "stringr", "viridis"] + "depends": ["GGally", "MASS", "R6", "cluster", "dplyr", "ggbeeswarm", "ggplot2", "isoband", "lhs", "mvtnorm", "pdist", "purrr", "rlang", "stringr", "viridis"] }, "hmm_discnp": { "name": "hmm.discnp", @@ -71069,7 +71801,7 @@ "name": "hmmTMB", "version": "1.0.2", "sha256": "1vrjkq5vv70wjvg588w2q7sd8qhnp4iz3swx8yc3x8w7zpwkf0hn", - "depends": ["CircStats", "ggplot2", "MASS", "Matrix", "mgcv", "optimx", "R6", "RcppEigen", "stringr", "TMB", "tmbstan"] + "depends": ["CircStats", "MASS", "Matrix", "R6", "RcppEigen", "TMB", "ggplot2", "mgcv", "optimx", "stringr", "tmbstan"] }, "hmmm": { "name": "hmmm", @@ -71111,25 +71843,31 @@ "name": "hoardeR", "version": "0.10", "sha256": "0maqypigq2942mqbnr7a11iryv6xhhfrnyarqw3r8z5zimjy1y7p", - "depends": ["bamsignals", "Biostrings", "data_table", "GenomicRanges", "GenomicTools_fileHandler", "httr", "IRanges", "KernSmooth", "knitr", "MASS", "R_utils", "RCurl", "rmarkdown", "Rsamtools", "S4Vectors", "seqinr", "stringr", "XML"] + "depends": ["Biostrings", "GenomicRanges", "GenomicTools_fileHandler", "IRanges", "KernSmooth", "MASS", "RCurl", "R_utils", "Rsamtools", "S4Vectors", "XML", "bamsignals", "data_table", "httr", "knitr", "rmarkdown", "seqinr", "stringr"] }, "hoardr": { "name": "hoardr", "version": "0.5.4", "sha256": "0dws91z1a25ynkdjj3f1lgp6qbgvfgnqi0mw14f4b13m670il0sf", - "depends": ["digest", "R6", "rappdirs"] + "depends": ["R6", "digest", "rappdirs"] }, "hockeystick": { "name": "hockeystick", "version": "0.8.4", "sha256": "0l5sk4x66zalmznksf9c099jn9i2i90bs57h2f44z105hzpdi606", - "depends": ["dplyr", "ggplot2", "jsonlite", "lubridate", "patchwork", "RColorBrewer", "readr", "rvest", "scales", "tibble", "tidyr", "treemapify"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "jsonlite", "lubridate", "patchwork", "readr", "rvest", "scales", "tibble", "tidyr", "treemapify"] + }, + "holi": { + "name": "holi", + "version": "0.1.0", + "sha256": "08q9b4vji3ak75kvkmzx0nb6pmq9bzv6r9rwj1pdk9sj0pswkp3c", + "depends": ["DT", "MASS", "RPostgres", "ggplot2", "likelihoodAsy", "pool", "shiny", "shinythemes", "sn"] }, "holiglm": { "name": "holiglm", "version": "1.0.0", "sha256": "02i6smmwmvbkx351ahjzz247kky377r6ara06c5wk5jrfsfjbbr7", - "depends": ["checkmate", "MASS", "ROI", "ROI_plugin_ecos", "slam", "SuppDists"] + "depends": ["MASS", "ROI", "ROI_plugin_ecos", "SuppDists", "checkmate", "slam"] }, "holland": { "name": "holland", @@ -71141,7 +71879,7 @@ "name": "holodeck", "version": "0.2.2", "sha256": "1phaj4yw01301rgcdv4w44q6y5vxwggmks0xdbvg9i2ak3kjcyfp", - "depends": ["assertthat", "dplyr", "MASS", "purrr", "rlang", "tibble"] + "depends": ["MASS", "assertthat", "dplyr", "purrr", "rlang", "tibble"] }, "homals": { "name": "homals", @@ -71165,19 +71903,19 @@ "name": "homologene", "version": "1.4.68.19.3.27", "sha256": "0d7wxisk0vqk1n165v1i19bc02zv78h5r5d3jqai5y6nkmwn01sh", - "depends": ["dplyr", "magrittr", "purrr", "R_utils", "readr"] + "depends": ["R_utils", "dplyr", "magrittr", "purrr", "readr"] }, "homomorpheR": { "name": "homomorpheR", "version": "0.2-2", "sha256": "1iahq16nswlc3b87598206xdp24bg9v8acyjp1jivybl3fr4k3pq", - "depends": ["gmp", "R6", "sodium"] + "depends": ["R6", "gmp", "sodium"] }, "hoopR": { "name": "hoopR", "version": "2.1.0", "sha256": "1m6ffh7slcqzj28jn9f67n5czidal5nkv6c883sk96w13h3lhyam", - "depends": ["cli", "data_table", "dplyr", "furrr", "future", "glue", "httr", "janitor", "jsonlite", "lubridate", "magrittr", "progressr", "purrr", "Rcpp", "RcppParallel", "rlang", "rvest", "stringr", "tidyr", "usethis"] + "depends": ["Rcpp", "RcppParallel", "cli", "data_table", "dplyr", "furrr", "future", "glue", "httr", "janitor", "jsonlite", "lubridate", "magrittr", "progressr", "purrr", "rlang", "rvest", "stringr", "tidyr", "usethis"] }, "hopbyhop": { "name": "hopbyhop", @@ -71189,13 +71927,13 @@ "name": "hopit", "version": "0.11.6", "sha256": "13hzzjfj26kk5sfwrbi9lv1yczhnv0z0nlvlnp0y4xm3p0vkiyqp", - "depends": ["MASS", "questionr", "Rcpp", "RcppEigen", "Rdpack", "survey"] + "depends": ["MASS", "Rcpp", "RcppEigen", "Rdpack", "questionr", "survey"] }, "hopkins": { "name": "hopkins", "version": "1.1", "sha256": "0wy4d5mmzd9qka5wpkglqy0m2pswypj64wp4hqpk94c6gj46ghwl", - "depends": ["donut", "pdist", "RANN"] + "depends": ["RANN", "donut", "pdist"] }, "hornpa": { "name": "hornpa", @@ -71231,7 +71969,7 @@ "name": "hot.deck", "version": "1.2", "sha256": "1zdrbqkqh3sbc4pkrqgv230h6jm6fvf3wwpb3y6r9l3g8zh4j18r", - "depends": ["data_table", "MASS", "mice", "tidyr"] + "depends": ["MASS", "data_table", "mice", "tidyr"] }, "hotspot": { "name": "hotspot", @@ -71303,7 +72041,7 @@ "name": "hpiR", "version": "0.3.2", "sha256": "0gz9ngnjgys7hzijsma2iyywwiv7vjar5gls28ds11wq8pmsv96n", - "depends": ["dplyr", "forecast", "ggplot2", "gridExtra", "imputeTS", "lubridate", "magrittr", "MASS", "pdp", "plyr", "purrr", "ranger", "rlang", "robustbase", "zoo"] + "depends": ["MASS", "dplyr", "forecast", "ggplot2", "gridExtra", "imputeTS", "lubridate", "magrittr", "pdp", "plyr", "purrr", "ranger", "rlang", "robustbase", "zoo"] }, "hqmisc": { "name": "hqmisc", @@ -71333,7 +72071,7 @@ "name": "hrqglas", "version": "1.1.0", "sha256": "0v3hdjz8755ka4ahdx2dsyw3513hxg1r0ncj9id6gbmqq1l0s9a5", - "depends": ["MASS", "Matrix", "quantreg", "Rcpp"] + "depends": ["MASS", "Matrix", "Rcpp", "quantreg"] }, "hrt": { "name": "hrt", @@ -71345,7 +72083,7 @@ "name": "hscovar", "version": "0.4.2", "sha256": "06bkqcp0vcnkp0jqi0qjvxnw0lk0w4mrf88h1769ak7r49vzlr6f", - "depends": ["foreach", "Matrix", "pwr", "rlist"] + "depends": ["Matrix", "foreach", "pwr", "rlist"] }, "hse": { "name": "hse", @@ -71357,7 +72095,7 @@ "name": "hsem", "version": "1.0", "sha256": "0dgp65isbfmw0q4sn36l5226sf6vrl7mvn7gn50xvgybh0l6y7vk", - "depends": ["boot", "Matrix", "mvtnorm", "numDeriv"] + "depends": ["Matrix", "boot", "mvtnorm", "numDeriv"] }, "hset": { "name": "hset", @@ -71381,31 +72119,31 @@ "name": "hsrecombi", "version": "1.0.1", "sha256": "1f5ks1wvpc0dn5lwyhs479zhkcbcfg2c5gxxlwr9pliv5ncgcmla", - "depends": ["curl", "data_table", "dplyr", "hsphase", "Matrix", "quadprog", "Rcpp", "rlist"] + "depends": ["Matrix", "Rcpp", "curl", "data_table", "dplyr", "hsphase", "quadprog", "rlist"] }, "hsstan": { "name": "hsstan", "version": "0.8.2", "sha256": "0kfdx17vacy43bjg6si4d1nxbmsrzj61bgs6d5pbwny02fq9i9gc", - "depends": ["BH", "ggplot2", "loo", "pROC", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "loo", "pROC", "rstan", "rstantools"] }, "hstats": { "name": "hstats", - "version": "1.1.2", - "sha256": "00rjki2gb1rhmp4hbhdzpygjzq4j3dnilrg6pmnspqwzja5cfbbj", + "version": "1.2.1", + "sha256": "1my1zxwvdzajp75lxyqmwr7z8ci9ldvlmpqxapyqbj0d5ibn2sbn", "depends": ["ggplot2"] }, "htestClust": { "name": "htestClust", "version": "0.2.2", "sha256": "081kxhc7sn070ys94pfzjf3gi2kkqwrqx2sclbgz4ihahqkbnhhr", - "depends": ["bootstrap", "MASS"] + "depends": ["MASS", "bootstrap"] }, "htetree": { "name": "htetree", "version": "0.1.18", "sha256": "144jn5b79xqr4h190c06wwpa5679125xa9qmnaxqh371h45263gd", - "depends": ["data_tree", "dplyr", "grf", "jsonlite", "Matching", "partykit", "Rcpp", "rpart", "rpart_plot", "shiny", "stringr"] + "depends": ["Matching", "Rcpp", "data_tree", "dplyr", "grf", "jsonlite", "partykit", "rpart", "rpart_plot", "shiny", "stringr"] }, "htm2txt": { "name": "htm2txt", @@ -71427,15 +72165,15 @@ }, "htmlTable": { "name": "htmlTable", - "version": "2.4.2", - "sha256": "039nnxnvw5l284n7w8q0hnplm0b58nwhsrpjfi5asg61f9hxv0va", + "version": "2.4.3", + "sha256": "1pgndsyml68d9qd747043m9g0dxhaa10m533dchcsg1izwdx0f9p", "depends": ["checkmate", "htmltools", "htmlwidgets", "knitr", "magrittr", "rstudioapi", "stringr"] }, "htmldf": { "name": "htmldf", "version": "0.6.0", "sha256": "19brwxqnsxzvgsqq3gsjkcyag9ag3xa3mrl5c4s7x48xx2knfh9q", - "depends": ["cld3", "dplyr", "httr", "lubridate", "magrittr", "processx", "progress", "R_utils", "ranger", "rvest", "stringr", "tibble", "tidyr", "urltools", "xml2"] + "depends": ["R_utils", "cld3", "dplyr", "httr", "lubridate", "magrittr", "processx", "progress", "ranger", "rvest", "stringr", "tibble", "tidyr", "urltools", "xml2"] }, "htmltools": { "name": "htmltools", @@ -71451,21 +72189,21 @@ }, "hts": { "name": "hts", - "version": "6.0.2", - "sha256": "06mmxdm7a2fb1r4mb2x12b00rnkaxlrmlkv5yizr3yixmn4is9wb", - "depends": ["forecast", "Matrix", "Rcpp", "RcppEigen", "SparseM"] + "version": "6.0.3", + "sha256": "04s4ndvlxbjz2hamnhakibj92ipbppf1sj1pfc571lkz2c91ggf9", + "depends": ["Matrix", "Rcpp", "RcppEigen", "SparseM", "forecast"] }, "htsr": { "name": "htsr", - "version": "2.1.4", - "sha256": "1z4s3xn82fq3gh2fp7ys0vifmpgxksi0hvjj9whlkjv2dmsnzqyz", - "depends": ["DBI", "dplyr", "fs", "ggplot2", "lubridate", "purrr", "Rcpp", "readr", "readxl", "RSQLite", "shiny", "shinyFiles", "stringr", "tibble", "waiter", "WriteXLS"] + "version": "2.1.6", + "sha256": "0rk11gnwws6fsmbh9zk5cpxavqkrxd4kja3wzhlh4jn5b4ypblps", + "depends": ["DBI", "RSQLite", "Rcpp", "WriteXLS", "dplyr", "fs", "ggplot2", "lubridate", "purrr", "readr", "readxl", "shiny", "shinyFiles", "stringr", "tibble", "waiter"] }, "httk": { "name": "httk", "version": "2.3.1", "sha256": "1ws9bxrl0r59nni6avvr7qgs866p90l88x9xyfw2s90j5q2zzil5", - "depends": ["data_table", "deSolve", "ggplot2", "magrittr", "msm", "mvtnorm", "purrr", "Rdpack", "survey", "truncnorm"] + "depends": ["Rdpack", "data_table", "deSolve", "ggplot2", "magrittr", "msm", "mvtnorm", "purrr", "survey", "truncnorm"] }, "httpRequest": { "name": "httpRequest", @@ -71519,19 +72257,19 @@ "name": "httpuv", "version": "1.6.15", "sha256": "1l2y435i3dvq7fnalpvc7h5wh0sc5clygdvcvghz77d34cvfsvay", - "depends": ["later", "promises", "R6", "Rcpp"] + "depends": ["R6", "Rcpp", "later", "promises"] }, "httr": { "name": "httr", "version": "1.4.7", "sha256": "0fisvq3zydmqagn7lj6x98zxkcl7l95gfydl27zkigb7zg1fcm8m", - "depends": ["curl", "jsonlite", "mime", "openssl", "R6"] + "depends": ["R6", "curl", "jsonlite", "mime", "openssl"] }, "httr2": { "name": "httr2", - "version": "1.0.1", - "sha256": "1cpi2yr66g0nwd5ybz6254ivggvxql0bas2hwpakrcw1161jvs9k", - "depends": ["cli", "curl", "glue", "lifecycle", "magrittr", "openssl", "R6", "rappdirs", "rlang", "vctrs", "withr"] + "version": "1.0.2", + "sha256": "0j0062wx5xzlr36cs2jh3qji9fin6d2myvl87cdlx7x5fizy7y6i", + "depends": ["R6", "cli", "curl", "glue", "lifecycle", "magrittr", "openssl", "rappdirs", "rlang", "vctrs", "withr"] }, "hubeau": { "name": "hubeau", @@ -71555,7 +72293,7 @@ "name": "huge", "version": "1.3.5", "sha256": "1sl457a1lndrx98y2j9a2smanawx2iqlhl82iand0g3p5xp8ch4j", - "depends": ["igraph", "MASS", "Matrix", "Rcpp", "RcppEigen"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppEigen", "igraph"] }, "huito": { "name": "huito", @@ -71597,7 +72335,7 @@ "name": "hunspell", "version": "3.0.3", "sha256": "1ws2hhrn3iw89vs17q9claf0cip5hy6rbgdr4dcjmzrdlrri9apx", - "depends": ["digest", "Rcpp"] + "depends": ["Rcpp", "digest"] }, "hurdlr": { "name": "hurdlr", @@ -71609,7 +72347,7 @@ "name": "hurricaneexposure", "version": "0.1.1", "sha256": "0a8xy71dkq2bzdnc90irxmbcxhi0anh87ic22x7b22c3m5605w6s", - "depends": ["data_table", "dplyr", "ggmap", "ggplot2", "lazyeval", "lubridate", "mapproj", "maps", "purrr", "RColorBrewer", "rlang", "stringr", "tidyr"] + "depends": ["RColorBrewer", "data_table", "dplyr", "ggmap", "ggplot2", "lazyeval", "lubridate", "mapproj", "maps", "purrr", "rlang", "stringr", "tidyr"] }, "hutils": { "name": "hutils", @@ -71619,15 +72357,15 @@ }, "hutilscpp": { "name": "hutilscpp", - "version": "0.10.4", - "sha256": "0gjj2808dc4c1s28d94sc1iwb88n61lsplqvhlhn2yab3qa0ljf9", + "version": "0.10.5", + "sha256": "1f4ywd8ibg2349fvp7ypiqyslb64gdqi64fwhnag7d6qhrhm563b", "depends": ["data_table", "hutils", "magrittr"] }, "huxtable": { "name": "huxtable", "version": "5.5.6", "sha256": "04hbnc8gij28523b6kiyibc05sjn1z4y1r8z9j4f5ghyl8hm0mdx", - "depends": ["assertthat", "commonmark", "fansi", "generics", "glue", "htmltools", "memoise", "R6", "rlang", "stringi", "stringr", "tidyselect", "xml2"] + "depends": ["R6", "assertthat", "commonmark", "fansi", "generics", "glue", "htmltools", "memoise", "rlang", "stringi", "stringr", "tidyselect", "xml2"] }, "hwde": { "name": "hwde", @@ -71639,7 +72377,7 @@ "name": "hwep", "version": "2.0.2", "sha256": "0cvy9s9kwc1jp4klgbjahidpk8gkvfa43vry8i0y77nvfys7x9v9", - "depends": ["BH", "bridgesampling", "doFuture", "doRNG", "foreach", "future", "iterators", "pracma", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "tensr", "updog"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bridgesampling", "doFuture", "doRNG", "foreach", "future", "iterators", "pracma", "rstan", "rstantools", "tensr", "updog"] }, "hwig": { "name": "hwig", @@ -71675,7 +72413,7 @@ "name": "hySAINT", "version": "1.2.1", "sha256": "1mmw0k63rci7w19livfv7mnsrqjwk0cc51wlyn58ksnf9bbqphch", - "depends": ["energy", "Matrix", "pracma", "selectiveInference", "SIS", "VariableScreening"] + "depends": ["Matrix", "SIS", "VariableScreening", "energy", "pracma", "selectiveInference"] }, "hySpc_testthat": { "name": "hySpc.testthat", @@ -71687,7 +72425,7 @@ "name": "hybridModels", "version": "0.3.7", "sha256": "0fj3dvv7s1hlicvlb077pkhbj894brzgdxhp67jck9zpy2qymzxq", - "depends": ["doParallel", "doRNG", "foreach", "ggplot2", "GillespieSSA", "reshape2", "stringr"] + "depends": ["GillespieSSA", "doParallel", "doRNG", "foreach", "ggplot2", "reshape2", "stringr"] }, "hybridogram": { "name": "hybridogram", @@ -71699,19 +72437,13 @@ "name": "hybridts", "version": "0.1.0", "sha256": "1x96g0cjgn3vklczksxdgpd5ayl3rl63k0ig0h8vacm2nxn4c6js", - "depends": ["forecast", "Metrics", "nnfor", "WaveletArima"] + "depends": ["Metrics", "WaveletArima", "forecast", "nnfor"] }, "hyd1d": { "name": "hyd1d", - "version": "0.5.1", - "sha256": "0ixklk8g3d5bayv4jwprknb1f7pzhxqd60lk8v5j1i6zcpjad0mw", - "depends": ["curl", "httr2", "Rdpack"] - }, - "hydflood": { - "name": "hydflood", - "version": "0.5.7", - "sha256": "18gw2jipssaid5q004gyvfk56vgvajv69kd0f6zh2fp7sgq5w33d", - "depends": ["hyd1d", "raster", "Rdpack", "sf", "terra"] + "version": "0.5.2", + "sha256": "0k34blmjyradfbrq5j6lqkhs64q80k9a5pdrc3anyvanadcz32af", + "depends": ["Rdpack", "curl", "httr2"] }, "hydra": { "name": "hydra", @@ -71765,7 +72497,7 @@ "name": "hydroloom", "version": "1.0.2", "sha256": "0hh8j9a3rkg81mp9als41rvvmwfclbwg92jx6rzy5fn2qvlxx36m", - "depends": ["data_table", "dplyr", "fastmap", "pbapply", "RANN", "rlang", "sf", "tidyr", "units"] + "depends": ["RANN", "data_table", "dplyr", "fastmap", "pbapply", "rlang", "sf", "tidyr", "units"] }, "hydropeak": { "name": "hydropeak", @@ -71789,25 +72521,25 @@ "name": "hydrotoolbox", "version": "1.1.2", "sha256": "0m5crm8n8i3fv43am649cdyrbfcfbais8fwrg6c7zy81dbhmy9m9", - "depends": ["ggplot2", "lubridate", "magrittr", "plotly", "Rcpp", "readxl", "reshape2", "tibble", "zoo"] + "depends": ["Rcpp", "ggplot2", "lubridate", "magrittr", "plotly", "readxl", "reshape2", "tibble", "zoo"] }, "hyfo": { "name": "hyfo", "version": "1.4.6", "sha256": "03z36ddq6vpld1v876adp5xrz0hjy46vhs5sn8sgaa57fhmya6cm", - "depends": ["data_table", "ggplot2", "lmom", "maps", "MASS", "moments", "ncdf4", "plyr", "reshape2", "sf", "sp", "zoo"] + "depends": ["MASS", "data_table", "ggplot2", "lmom", "maps", "moments", "ncdf4", "plyr", "reshape2", "sf", "sp", "zoo"] }, "hyper_fit": { "name": "hyper.fit", "version": "1.2.1", "sha256": "1w6ra4sqdvzcyhsiyi3lgzy9m4ca3898qjdssdfgmarkrc13bk3n", - "depends": ["LaplacesDemon", "magicaxis", "MASS", "rgl"] + "depends": ["LaplacesDemon", "MASS", "magicaxis", "rgl"] }, "hyper2": { "name": "hyper2", "version": "3.1-0", "sha256": "11bn7rhadisb46ls6ph9xbixz9zygd4ivjn3hgbv6059l2f2v0i0", - "depends": ["alabama", "calibrator", "cubature", "disordR", "frab", "magrittr", "partitions", "Rcpp", "Rdpack"] + "depends": ["Rcpp", "Rdpack", "alabama", "calibrator", "cubature", "disordR", "frab", "magrittr", "partitions"] }, "hyperSpec": { "name": "hyperSpec", @@ -71843,7 +72575,7 @@ "name": "hyperoverlap", "version": "1.1.1", "sha256": "10kcphn5zl1pl70xg9bn947i9mbnjxk03p6y7xhdlv152cihffw0", - "depends": ["e1071", "ggplot2", "MASS", "matlib", "misc3d", "rgl"] + "depends": ["MASS", "e1071", "ggplot2", "matlib", "misc3d", "rgl"] }, "hypersampleplan": { "name": "hypersampleplan", @@ -71855,7 +72587,7 @@ "name": "hypervolume", "version": "3.1.4", "sha256": "1vw9s85gr1mv7c21x7rk66bz7wg3nfy874ixrhbcksyrxjq82q3c", - "depends": ["caret", "data_table", "doParallel", "dplyr", "e1071", "fastcluster", "foreach", "geometry", "ggplot2", "hitandrun", "ks", "maps", "MASS", "mvtnorm", "palmerpenguins", "pbapply", "pdist", "progress", "purrr", "raster", "Rcpp", "RcppArmadillo", "sp", "terra"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "caret", "data_table", "doParallel", "dplyr", "e1071", "fastcluster", "foreach", "geometry", "ggplot2", "hitandrun", "ks", "maps", "mvtnorm", "palmerpenguins", "pbapply", "pdist", "progress", "purrr", "raster", "sp", "terra"] }, "hypoRF": { "name": "hypoRF", @@ -71879,13 +72611,13 @@ "name": "hypr", "version": "0.2.8", "sha256": "1l5vfjifnnf711wr3n9zprf78jkq7s2pjvw3vz47jr3234glsrjx", - "depends": ["cli", "magrittr", "MASS", "Matrix", "pracma"] + "depends": ["MASS", "Matrix", "cli", "magrittr", "pracma"] }, "hypsoLoop": { "name": "hypsoLoop", "version": "0.2.0", "sha256": "0kwxzw2r406li2pmby92a3jik4k3z1vdgs54m4q45a8r8vz3y1nn", - "depends": ["dplyr", "ggplot2", "PolynomF", "sf", "sjPlot", "stars", "terra"] + "depends": ["PolynomF", "dplyr", "ggplot2", "sf", "sjPlot", "stars", "terra"] }, "hystReet": { "name": "hystReet", @@ -71903,7 +72635,7 @@ "name": "hysteresis", "version": "2.7.2", "sha256": "0jn8glihvnf6l6gf91cisqi4h1iscp7qqvchkbcvz0mv8cvklmg8", - "depends": ["car", "MASS", "msm"] + "depends": ["MASS", "car", "msm"] }, "hytest": { "name": "hytest", @@ -71921,13 +72653,13 @@ "name": "i2extras", "version": "0.2.1", "sha256": "14k9s5ppq3c7ldh6gqi82awmkk34ac0br0qr42gqba9lrssf4bsr", - "depends": ["ciTools", "data_table", "dplyr", "ggplot2", "incidence2", "MASS", "rlang", "tibble", "tidyr", "tidyselect", "vctrs"] + "depends": ["MASS", "ciTools", "data_table", "dplyr", "ggplot2", "incidence2", "rlang", "tibble", "tidyr", "tidyselect", "vctrs"] }, "iAR": { "name": "iAR", "version": "1.2.0", "sha256": "0svxn81a0yq3m51594zrpy99i8p9zcfjzbxsi19yyfcm6iymzv24", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "ggplot2"] }, "iAdapt": { "name": "iAdapt", @@ -71953,29 +72685,35 @@ "sha256": "1qacvfzknchfm27mhl7a357fnb6lzjkj4vh8lch5aljz82sdmdaf", "depends": ["ggplot2"] }, + "iC10": { + "name": "iC10", + "version": "2.0.2", + "sha256": "0chvkh84qmw0c1m8z1ayl03dq43rj4qglkbammm5fx2vfsbp0hcc", + "depends": ["iC10TrainingData", "impute", "pamr"] + }, "iC10TrainingData": { "name": "iC10TrainingData", - "version": "1.3.1", - "sha256": "175ymib3h359296hk36psryksisipx63ybvacz8hys21irzx58j1", + "version": "2.0.1", + "sha256": "0hab5frxrlxxpxxs13h6x39pp7j6438kdqw55kxy29340ihyg32y", "depends": [] }, "iCAMP": { "name": "iCAMP", "version": "1.5.12", "sha256": "0rx0mjkmlqf5awq387h1bzampvkwp67jbkjz29qmw85ma6vlqbpi", - "depends": ["ape", "bigmemory", "data_table", "DirichletReg", "Hmisc", "minpack_lm", "nortest", "permute", "vegan"] + "depends": ["DirichletReg", "Hmisc", "ape", "bigmemory", "data_table", "minpack_lm", "nortest", "permute", "vegan"] }, "iCARH": { "name": "iCARH", "version": "2.0.2.1", "sha256": "1x703ydssmgb7j0hgqn3d5sh9457jgj7s2m8i12x2b9wvkh0fz8j", - "depends": ["abind", "ggplot2", "glue", "igraph", "KEGGgraph", "MASS", "Matrix", "mc2d", "RCurl", "reshape2", "rstan"] + "depends": ["KEGGgraph", "MASS", "Matrix", "RCurl", "abind", "ggplot2", "glue", "igraph", "mc2d", "reshape2", "rstan"] }, "iCellR": { "name": "iCellR", "version": "1.6.7", "sha256": "043ic1ijp9qycap1bh4s07ql1irzpxzyyk68qryjvqsgf8m33rl0", - "depends": ["ape", "data_table", "ggdendro", "ggplot2", "ggpubr", "ggrepel", "gridExtra", "hdf5r", "Hmisc", "htmlwidgets", "igraph", "jsonlite", "knitr", "Matrix", "NbClust", "pheatmap", "plotly", "plyr", "png", "progress", "RANN", "RColorBrewer", "Rcpp", "reshape", "Rtsne", "scatterplot3d", "shiny", "uwot"] + "depends": ["Hmisc", "Matrix", "NbClust", "RANN", "RColorBrewer", "Rcpp", "Rtsne", "ape", "data_table", "ggdendro", "ggplot2", "ggpubr", "ggrepel", "gridExtra", "hdf5r", "htmlwidgets", "igraph", "jsonlite", "knitr", "pheatmap", "plotly", "plyr", "png", "progress", "reshape", "scatterplot3d", "shiny", "uwot"] }, "iClick": { "name": "iClick", @@ -71983,6 +72721,12 @@ "sha256": "0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd", "depends": ["boot", "car", "coefplot", "fBasics", "forecast", "lattice", "lmtest", "lubridate", "openair", "papeR", "rugarch", "sandwich", "timeDate", "timeSeries", "xts", "zoo"] }, + "iClusterVB": { + "name": "iClusterVB", + "version": "0.1.1", + "sha256": "17jwpl1h7khcz6isix88ia95p1fldl2mh4lsjiyfi1adyylqpvdq", + "depends": ["MCMCpack", "R_utils", "Rcpp", "RcppArmadillo", "VarSelLCM", "clustMixType", "cluster", "cowplot", "ggplot2", "inline", "mclust", "mvtnorm", "pheatmap", "poLCA"] + }, "iDINGO": { "name": "iDINGO", "version": "1.0.4", @@ -72017,13 +72761,13 @@ "name": "iGasso", "version": "1.6.1", "sha256": "050jq6b4k8k8hj0cbxz6dzzjp5lgp8bf00aq9jxwb74pmvmsrlwq", - "depends": ["CompQuadForm", "lattice", "MASS", "MBESS"] + "depends": ["CompQuadForm", "MASS", "MBESS", "lattice"] }, "iGraphMatch": { "name": "iGraphMatch", "version": "2.0.5", "sha256": "1cbmcqvw8xk55lv3nxj3xzmkasvaayv04xnzqjdr16yvjznpzkfd", - "depends": ["clue", "igraph", "irlba", "Matrix", "Rcpp"] + "depends": ["Matrix", "Rcpp", "clue", "igraph", "irlba"] }, "iIneq": { "name": "iIneq", @@ -72047,18 +72791,18 @@ "name": "iNEXT", "version": "3.0.1", "sha256": "1nf4jhwqx5im966qzq7si78c5q4jgsa73d74ya8q8aj02n49jcyy", - "depends": ["ggplot2", "Rcpp", "reshape2"] + "depends": ["Rcpp", "ggplot2", "reshape2"] }, "iNEXT_3D": { "name": "iNEXT.3D", "version": "1.0.5", "sha256": "1dpfwf95sin8yn9mn60d9jappsq1spm02x4p0ikjj637qwisgpjs", - "depends": ["ape", "dplyr", "ggplot2", "phyclust", "Rcpp", "reshape2", "tibble", "tidytree"] + "depends": ["Rcpp", "ape", "dplyr", "ggplot2", "phyclust", "reshape2", "tibble", "tidytree"] }, "iNEXT_4steps": { "name": "iNEXT.4steps", - "version": "1.0.0", - "sha256": "0kjzrgwhhzgvwyrcrqfbshscyrx34blfjxr23iay9wby6qpfmb1j", + "version": "1.0.1", + "sha256": "0c5721zj5kcf6cajg57xq3s4gcwa8mib3401mfn2l36ymd5k7vmk", "depends": ["dplyr", "ggplot2", "ggpubr", "iNEXT_3D", "purrr", "reshape2"] }, "iNEXT_beta3D": { @@ -72083,7 +72827,7 @@ "name": "iNZightRegression", "version": "1.3.4", "sha256": "0zqfb25gz4dwf0hqccgq3pb5wv2zmkw3ldkpscwkmc12pz2xm7im", - "depends": ["car", "dplyr", "GGally", "ggplot2", "ggrepel", "ggtext", "iNZightPlots", "multcomp", "patchwork"] + "depends": ["GGally", "car", "dplyr", "ggplot2", "ggrepel", "ggtext", "iNZightPlots", "multcomp", "patchwork"] }, "iNZightTS": { "name": "iNZightTS", @@ -72097,6 +72841,12 @@ "sha256": "0qmpj8hwg4gmbyhp4r1li3rrq2f5743kg04r7s7ii0j9gwsw3y0s", "depends": ["DBI", "dplyr", "forcats", "glue", "magrittr", "purrr", "readr", "rlang", "srvyr", "stringr", "survey", "tibble", "tidyr", "units"] }, + "iPRISM": { + "name": "iPRISM", + "version": "0.1.1", + "sha256": "0zn139a3pfwhsxb1564n7fxw0qv96lhaipl0yjns8by7vc3pv6pi", + "depends": ["Hmisc", "Matrix", "ggplot2", "igraph", "pbapply", "tidyr"] + }, "iRafNet": { "name": "iRafNet", "version": "1.1-1", @@ -72137,19 +72887,19 @@ "name": "iSubGen", "version": "1.0.1", "sha256": "0kfrgh4399x71mwa5j36nfszd65ybp61fwpc7qj3j9ypmgidwbaj", - "depends": ["cluster", "ConsensusClusterPlus", "keras", "philentropy", "tensorflow"] + "depends": ["ConsensusClusterPlus", "cluster", "keras", "philentropy", "tensorflow"] }, "iTOP": { "name": "iTOP", "version": "1.0.2", "sha256": "1n6nlmmx2h63nksycgzr7qsnd1j6bxa629av7cfd3ihriim7dj47", - "depends": ["corpcor", "Matrix"] + "depends": ["Matrix", "corpcor"] }, "iTensor": { "name": "iTensor", "version": "1.0.2", "sha256": "09js2kiw1prrkn03srz4xas37mwbx85zkawfb93wgl292r31j2x9", - "depends": ["einsum", "geigen", "groupICA", "jointDiag", "MASS", "mgcv", "mixOmics", "rTensor"] + "depends": ["MASS", "einsum", "geigen", "groupICA", "jointDiag", "mgcv", "mixOmics", "rTensor"] }, "iWeigReg": { "name": "iWeigReg", @@ -72171,9 +72921,9 @@ }, "iai": { "name": "iai", - "version": "1.10.0", - "sha256": "17ap6zsbcvm8n5y7i6vssc705ra5ll91yvppg08v8252wzxarr31", - "depends": ["cowplot", "ggplot2", "JuliaCall", "lifecycle", "rappdirs", "rjson", "rlang", "stringr"] + "version": "1.10.1", + "sha256": "1fqa3gig417yc72yvw0phaiv799f91yf9c4yvj0biw1midw6fmcb", + "depends": ["JuliaCall", "cowplot", "ggplot2", "lifecycle", "rappdirs", "rjson", "rlang", "stringr"] }, "ialiquor": { "name": "ialiquor", @@ -72191,13 +72941,13 @@ "name": "iarm", "version": "0.4.3", "sha256": "0ib8b37inq1hdzjm9y9bvk8x1qzn08vkvj3y75gg1swsqxh8w106", - "depends": ["eRm", "ggplot2", "gridExtra", "Hmisc", "psychotools", "vcdExtra"] + "depends": ["Hmisc", "eRm", "ggplot2", "gridExtra", "psychotools", "vcdExtra"] }, "ib": { "name": "ib", "version": "0.2.0", "sha256": "10h3b9ncz59rp8j628axnrl7gksjiyg576672dhcyd3ygd4by7p5", - "depends": ["betareg", "Formula", "lme4", "MASS", "Matrix", "Rdpack", "VGAM"] + "depends": ["Formula", "MASS", "Matrix", "Rdpack", "VGAM", "betareg", "lme4"] }, "ibawds": { "name": "ibawds", @@ -72219,9 +72969,9 @@ }, "ibdsim2": { "name": "ibdsim2", - "version": "2.0.0", - "sha256": "0s0mnyhd0xcrr75qhqwgyipn22hlbgjf9nfi7gxbmwns16g3crb8", - "depends": ["ggplot2", "glue", "pedtools", "Rcpp", "ribd"] + "version": "2.1.0", + "sha256": "0bgjhfsplqs4j20x2d1mdhqpdjfnvicgzac62mv4284blzjhnz2d", + "depends": ["Rcpp", "ggplot2", "glue", "pedtools", "ribd"] }, "ibelief": { "name": "ibelief", @@ -72239,7 +72989,7 @@ "name": "ibmAcousticR", "version": "0.2.1", "sha256": "1hrd2273n9fgi3hgjissjn4syw914mxm4wr98ij819yahsi9aj42", - "depends": ["httr", "jsonlite", "XML"] + "depends": ["XML", "httr", "jsonlite"] }, "ibmcraftr": { "name": "ibmcraftr", @@ -72251,7 +73001,7 @@ "name": "ibmdbR", "version": "1.51.0", "sha256": "13wlidv15dn1adx59zx30jnqc9wxl8c2xp1nh3g3dcafsfin9lvj", - "depends": ["arules", "MASS", "Matrix", "RODBC", "rpart", "rpart_plot"] + "depends": ["MASS", "Matrix", "RODBC", "arules", "rpart", "rpart_plot"] }, "ibmsunburst": { "name": "ibmsunburst", @@ -72281,7 +73031,7 @@ "name": "icRSF", "version": "1.2", "sha256": "1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l", - "depends": ["icensmis", "Rcpp"] + "depends": ["Rcpp", "icensmis"] }, "ica": { "name": "ica", @@ -72311,7 +73061,7 @@ "name": "iccCounts", "version": "1.1.2", "sha256": "1g9fb42pdfa4jwwp789v22xzr9y69vf4ff06g2avxcv5s792i84w", - "depends": ["Deriv", "dplyr", "ggplot2", "glmmTMB", "gridExtra", "VGAM"] + "depends": ["Deriv", "VGAM", "dplyr", "ggplot2", "glmmTMB", "gridExtra"] }, "iccTraj": { "name": "iccTraj", @@ -72323,7 +73073,7 @@ "name": "iccbeta", "version": "1.2.0", "sha256": "03ms1c8qpbgxabj3hh4n0gwcazw6cd0cvixck5rz8fkvj04xzjak", - "depends": ["lme4", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "lme4"] }, "iccde": { "name": "iccde", @@ -72359,13 +73109,13 @@ "name": "icenReg", "version": "2.0.16", "sha256": "1wnhxvqh3nc1r6aywbmqq9npbmayb7fx7fghsfspd1ny7mdrhqn1", - "depends": ["coda", "foreach", "MLEcens", "Rcpp", "RcppEigen", "survival"] + "depends": ["MLEcens", "Rcpp", "RcppEigen", "coda", "foreach", "survival"] }, "icensBKL": { "name": "icensBKL", "version": "1.5", "sha256": "1jfms9dih8r5zw9cw32qnvv5ffzqhzm9q6pvwn0nk95531xvbp0a", - "depends": ["gtools", "Icens", "MASS", "mvtnorm", "smoothSurv", "survival", "TeachingDemos"] + "depends": ["Icens", "MASS", "TeachingDemos", "gtools", "mvtnorm", "smoothSurv", "survival"] }, "icensmis": { "name": "icensmis", @@ -72377,7 +73127,7 @@ "name": "icertool", "version": "0.0.3", "sha256": "0wwkqcvjmv2z8a8j597c2fjjcka1jz932i94rmqxcy31brvbi2nl", - "depends": ["digest", "DT", "ggplot2", "ggrepel", "purrr", "readxl", "shiny", "shinyhelper", "shinythemes", "tidyverse"] + "depends": ["DT", "digest", "ggplot2", "ggrepel", "purrr", "readxl", "shiny", "shinyhelper", "shinythemes", "tidyverse"] }, "icesAdvice": { "name": "icesAdvice", @@ -72397,41 +73147,17 @@ "sha256": "0xhv95zs1bwxplvvdh2flx9v97zwvc8pvckwfjxcrff64vxxb0f1", "depends": [] }, - "icesDatsu": { - "name": "icesDatsu", - "version": "1.1.0", - "sha256": "0vprh8y6x28q33b6zx9qhq991q0aqn5rhccf44k8211n5dwa555k", - "depends": ["httr", "icesConnect", "jsonlite"] - }, - "icesDatsuQC": { - "name": "icesDatsuQC", - "version": "1.0.1", - "sha256": "0pspd702vg2k7fza9jvj7hdnpjlg4k41mwiq45k7bsr0cbksggsg", - "depends": ["icesDatsu", "sqldf"] - }, "icesSAG": { "name": "icesSAG", "version": "1.4.1", "sha256": "0dsjsn3qx3k7grjgqsj120valzga7vjlj6jb8mfwmi85gmvlx329", "depends": ["httr", "icesVocab", "openssl", "png", "xml2"] }, - "icesSD": { - "name": "icesSD", - "version": "2.0.0", - "sha256": "1k0i79hh63bmsqw5m6ym2h3dydrjji57lkysp5n9x293lgh04pf2", - "depends": ["httr", "icesConnect"] - }, "icesTAF": { "name": "icesTAF", "version": "4.2.0", "sha256": "0xifza8s24gy09fibqdpkh0zc723jkx09ycx44gqffrx0ch8syds", - "depends": ["data_tree", "purrr", "roxygen2", "TAF"] - }, - "icesVMS": { - "name": "icesVMS", - "version": "1.1.4", - "sha256": "0ppml34s4zz3vav08fjaj71bml8amaslw22zmib0scvw8k70jlir", - "depends": ["glue", "httr", "icesConnect", "icesVocab"] + "depends": ["TAF", "data_tree", "purrr", "roxygen2"] }, "icesVocab": { "name": "icesVocab", @@ -72441,9 +73167,9 @@ }, "ichimoku": { "name": "ichimoku", - "version": "1.5.2", - "sha256": "0ssvsdkzh9mk6jcg88sljgqdcwwbwy55si855mk8ihpcddvsy61x", - "depends": ["ggplot2", "mirai", "nanonext", "RcppSimdJson", "secretbase", "shiny", "xts", "zoo"] + "version": "1.5.4", + "sha256": "09s7x956bx84z9ci017zzf96306wwdy78v1jaknps2rl85xfh0bi", + "depends": ["RcppSimdJson", "ggplot2", "mirai", "nanonext", "secretbase", "shiny", "xts", "zoo"] }, "icmm": { "name": "icmm", @@ -72453,9 +73179,15 @@ }, "icosa": { "name": "icosa", - "version": "0.11.0", - "sha256": "1z1xajdg7q5n3ijjy45klrh4q3i855afl9088f42dwidyban3w3h", - "depends": ["igraph", "Rcpp", "sf", "sp"] + "version": "0.11.1", + "sha256": "07jg847p3x0i8rim10bvj8v6jkms4m547rwy9h8s5n3rc6dxnizp", + "depends": ["Rcpp", "igraph", "sf", "sp"] + }, + "icpack": { + "name": "icpack", + "version": "0.1.0", + "sha256": "07vc910g7xy7drvd3ry4xw4j7gw34hvgnmafwwycc1ff060pjj6k", + "depends": ["checkmate", "dplyr", "ggplot2", "gridExtra", "matrixStats", "reshape2", "rlang", "survival"] }, "icpsrdata": { "name": "icpsrdata", @@ -72485,7 +73217,7 @@ "name": "idar", "version": "1.5", "sha256": "0433kyhwzaicb10jmb6b6b6lbfhd5g2zsdrg6v02lndb2j7dlk5c", - "depends": ["ape", "FD", "picante", "spatstat", "spatstat_explore", "spatstat_geom", "spatstat_random"] + "depends": ["FD", "ape", "picante", "spatstat", "spatstat_explore", "spatstat_geom", "spatstat_random"] }, "idarps": { "name": "idarps", @@ -72503,7 +73235,7 @@ "name": "idcnrba", "version": "1.1.0", "sha256": "0kdsvp263q28fs0qdvrjshp02n6r01zwjj7sj7r24rxppn77xa40", - "depends": ["base64enc", "dplyr", "DT", "flexdashboard", "haven", "htmlwidgets", "markdown", "miniUI", "nrba", "openxlsx", "readr", "rmarkdown", "rstudioapi", "shiny", "shinyjs", "srvyr", "survey", "tibble"] + "depends": ["DT", "base64enc", "dplyr", "flexdashboard", "haven", "htmlwidgets", "markdown", "miniUI", "nrba", "openxlsx", "readr", "rmarkdown", "rstudioapi", "shiny", "shinyjs", "srvyr", "survey", "tibble"] }, "ideamdb": { "name": "ideamdb", @@ -72515,13 +73247,13 @@ "name": "idefix", "version": "1.0.3", "sha256": "0jqjrg0qfzij5bx8r60wpjghsxnszdxgp58ynj10n7q9hc4fhsys", - "depends": ["dfidx", "dplyr", "MASS", "Rcpp", "RcppArmadillo", "Rdpack", "scales", "shiny", "tmvtnorm"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rdpack", "dfidx", "dplyr", "scales", "shiny", "tmvtnorm"] }, "idem": { "name": "idem", "version": "5.2", "sha256": "0vgxrw7rdhnxrrsg46x6nd2zx938j1z41fr4gp9pjmh2q6rnnaxl", - "depends": ["BH", "mice", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "sqldf", "StanHeaders", "survival"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "mice", "rstan", "rstantools", "sqldf", "survival"] }, "idendr0": { "name": "idendr0", @@ -72607,18 +73339,6 @@ "sha256": "0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh", "depends": [] }, - "iemisc": { - "name": "iemisc", - "version": "1.0.5", - "sha256": "0dr9p4y0vdwxsd5dqp5ahqnv1sfckb3xy9i0bbas009g5hnzxp92", - "depends": ["anytime", "assertthat", "berryFunctions", "checkmate", "chem_databases", "data_table", "foreach", "fpCompare", "geosphere", "ggplot2", "ggpubr", "gsubfn", "iemiscdata", "lubridate", "matlab", "matlab2r", "measurements", "mgsub", "pracma", "qdapRegex", "ramify", "rivr", "roperators", "round", "sf", "signal", "sjmisc", "stringi", "units", "USA_state_boundaries", "zoo"] - }, - "iemiscdata": { - "name": "iemiscdata", - "version": "1.0.2", - "sha256": "1wsakabhj9majl4w63bpc95ccdvfg7xz9arj0ikvdj6dh1ardac6", - "depends": [] - }, "iemisctext": { "name": "iemisctext", "version": "1.0.1", @@ -72627,9 +73347,9 @@ }, "ieugwasr": { "name": "ieugwasr", - "version": "1.0.0", - "sha256": "0pgx2ii23rvflvz55hf31956rzp8y4avski27i2xmx3gqydzhgqr", - "depends": ["dplyr", "httr", "jsonlite"] + "version": "1.0.1", + "sha256": "0kicfbjv50d75si4dw9s5528l4pl8v7qhpw6y89sawgbj0fwrprr", + "depends": ["dplyr", "httr", "jsonlite", "magrittr"] }, "ifCNVR": { "name": "ifCNVR", @@ -72641,7 +73361,7 @@ "name": "ifaTools", "version": "0.23", "sha256": "16xf3165gkmh3f9843m0n4wqdwwdfs6rjh64qcpz8srsm2z5y3l2", - "depends": ["ggplot2", "OpenMx", "reshape2", "rpf", "shiny"] + "depends": ["OpenMx", "ggplot2", "reshape2", "rpf", "shiny"] }, "ifctools": { "name": "ifctools", @@ -72689,7 +73409,7 @@ "name": "iglu", "version": "4.1.6", "sha256": "1v73715hjmmyn1264m0q1skirvgfjwx316vlslysr5bvbcwggljf", - "depends": ["caTools", "dplyr", "DT", "ggplot2", "ggpubr", "gridExtra", "gtable", "hms", "lubridate", "magrittr", "patchwork", "pheatmap", "plotly", "scales", "shiny", "tibble", "tidyr", "zoo"] + "depends": ["DT", "caTools", "dplyr", "ggplot2", "ggpubr", "gridExtra", "gtable", "hms", "lubridate", "magrittr", "patchwork", "pheatmap", "plotly", "scales", "shiny", "tibble", "tidyr", "zoo"] }, "igoR": { "name": "igoR", @@ -72697,11 +73417,17 @@ "sha256": "06f9f363zf1k026a0xg5myydzhgl6kgkqp74sz0jwgl44j2zp44s", "depends": [] }, + "igr": { + "name": "igr", + "version": "0.1.1", + "sha256": "0kb3jnh2z1fklbhf00cf8s2l3kd3g3nim4dllyc59ivgj66a5yf8", + "depends": ["sf"] + }, "igraph": { "name": "igraph", "version": "2.0.3", "sha256": "0xlg5lxzr8dc260fii43chsspqvb962i1yrcars988b78lnig2lf", - "depends": ["cli", "cpp11", "lifecycle", "magrittr", "Matrix", "pkgconfig", "rlang", "vctrs"] + "depends": ["Matrix", "cli", "cpp11", "lifecycle", "magrittr", "pkgconfig", "rlang", "vctrs"] }, "igraphdata": { "name": "igraphdata", @@ -72743,7 +73469,7 @@ "name": "iheatmapr", "version": "0.7.1", "sha256": "1c4dvp0mvw3m6x0kdw05yja2rm1mkrjjmjfj67f0vvs5sqyaqwhv", - "depends": ["fastcluster", "ggdendro", "htmlwidgets", "jsonlite", "knitr", "magrittr", "RColorBrewer", "scales"] + "depends": ["RColorBrewer", "fastcluster", "ggdendro", "htmlwidgets", "jsonlite", "knitr", "magrittr", "scales"] }, "iheiddown": { "name": "iheiddown", @@ -72759,9 +73485,9 @@ }, "iimi": { "name": "iimi", - "version": "1.0.2", - "sha256": "1bkxbqxa6i42mvz7j3191pzd2z35pqbzmn2b0kgbijlrfv8rg18z", - "depends": ["Biostrings", "caret", "data_table", "dplyr", "GenomicAlignments", "IRanges", "mltools", "MTPS", "R_utils", "randomForest", "Rsamtools", "stringr", "xgboost"] + "version": "1.1.1", + "sha256": "05v6j1mmygr67jsgv68b506xabpnl912hxyrz02l87xfb69c5cv8", + "depends": ["Biostrings", "GenomicAlignments", "IRanges", "MTPS", "R_utils", "Rdpack", "Rsamtools", "caret", "data_table", "dplyr", "mltools", "randomForest", "stringr", "xgboost"] }, "ijtiff": { "name": "ijtiff", @@ -72779,7 +73505,7 @@ "name": "imabc", "version": "1.0.0", "sha256": "1p420jlvqqcqdjqp7y4mcjkzimw3qiygph5yrvmm75znax3fkg4z", - "depends": ["data_table", "foreach", "lhs", "MASS", "truncnorm"] + "depends": ["MASS", "data_table", "foreach", "lhs", "truncnorm"] }, "image_CannyEdges": { "name": "image.CannyEdges", @@ -72821,7 +73547,7 @@ "name": "image.binarization", "version": "0.1.3", "sha256": "03p06qmv1s5i08hw4616qf7dqyqp3hrcibz1w66bh5dzv6yl9j7c", - "depends": ["magick", "Rcpp"] + "depends": ["Rcpp", "magick"] }, "image_dlib": { "name": "image.dlib", @@ -72839,7 +73565,7 @@ "name": "image.textlinedetector", "version": "0.2.3", "sha256": "0cymn7swlrmqlkjs3cih8l53xqgjhiimnmlnagzzwd72ijikz1ll", - "depends": ["magick", "Rcpp"] + "depends": ["Rcpp", "magick"] }, "image2data": { "name": "image2data", @@ -72851,13 +73577,13 @@ "name": "imageData", "version": "0.1-62", "sha256": "1q5s6zda1vvinp23afxjys3zl17xaidb11a7iibxpz6rla75183d", - "depends": ["dae", "GGally", "ggplot2", "Hmisc", "RColorBrewer", "readxl", "reshape"] + "depends": ["GGally", "Hmisc", "RColorBrewer", "dae", "ggplot2", "readxl", "reshape"] }, "imagefluency": { "name": "imagefluency", "version": "0.2.5", "sha256": "1vvr66a3mr6gyhs0acymics9k6k9lq6kbmpy0k86z91fb34pipfz", - "depends": ["magick", "OpenImageR", "pracma", "R_utils", "readbitmap"] + "depends": ["OpenImageR", "R_utils", "magick", "pracma", "readbitmap"] }, "imagefx": { "name": "imagefx", @@ -72869,13 +73595,13 @@ "name": "imager", "version": "1.0.2", "sha256": "0sjn3ig5p020gml200cy5bdbrbql7qv1fqhhzjpcbmhprf39113w", - "depends": ["downloader", "igraph", "jpeg", "magrittr", "png", "purrr", "Rcpp", "readbitmap", "stringr"] + "depends": ["Rcpp", "downloader", "igraph", "jpeg", "magrittr", "png", "purrr", "readbitmap", "stringr"] }, "imagerExtra": { "name": "imagerExtra", "version": "1.3.2", "sha256": "1f6mxfn7am4ph9acbbx53r4bk4vsm73p7arh8rvrsic9pgma3gqf", - "depends": ["fftwtools", "imager", "magrittr", "Rcpp"] + "depends": ["Rcpp", "fftwtools", "imager", "magrittr"] }, "imageseg": { "name": "imageseg", @@ -72901,29 +73627,35 @@ "sha256": "0kf6fka9zplp8r9rdndd5n7hypf1lp8hbv2djswav1wp95knzqhg", "depends": ["Rcpp", "RcppArmadillo"] }, + "imanr": { + "name": "imanr", + "version": "1.0.2", + "sha256": "1lkgyq4nkyjdz3hgygrx9gjcwhrvcnbwwq5s3a7qrcgl8gn8ls49", + "depends": ["caret", "doParallel", "dplyr", "foreach", "missForest", "ranger"] + }, "imbalance": { "name": "imbalance", "version": "1.0.2.1", "sha256": "14f7p3x8818b1asfynp3w4sxdacsd14dzs7r166s1jdadwwfwi1s", - "depends": ["bnlearn", "C50", "FNN", "ggplot2", "KernelKnn", "mvtnorm", "Rcpp", "RcppArmadillo", "smotefamily"] + "depends": ["C50", "FNN", "KernelKnn", "Rcpp", "RcppArmadillo", "bnlearn", "ggplot2", "mvtnorm", "smotefamily"] }, "imbalanceDatRel": { "name": "imbalanceDatRel", "version": "0.1.5", "sha256": "017z434pshsc2v8w1nlrvlf6dswdjk060flrn951n59vdzvl5rhj", - "depends": ["RANN", "rcccd", "Rfast", "SMOTEWB"] + "depends": ["RANN", "Rfast", "SMOTEWB", "rcccd"] }, "imbibe": { "name": "imbibe", "version": "0.1.1", "sha256": "03vaz5vippnmbgs2l4gxpmsnrkxjw7d156ng13r07zicq43g9gwp", - "depends": ["magrittr", "Rcpp", "RNifti"] + "depends": ["RNifti", "Rcpp", "magrittr"] }, "imcExperiment": { "name": "imcExperiment", "version": "0.99.0", "sha256": "0fagasb94q7gxx49c7n4p2cb9j3n5qnfx86s7nvz4naicy96qbyr", - "depends": ["S4Vectors", "SingleCellExperiment", "spatstat_geom", "SummarizedExperiment"] + "depends": ["S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "spatstat_geom"] }, "imdbapi": { "name": "imdbapi", @@ -72933,8 +73665,8 @@ }, "imf_data": { "name": "imf.data", - "version": "0.1.5", - "sha256": "1p9jk3m4d87ly1h2g14mqfnkry0ydvvb44kicxnn4xy1pi1jqhxq", + "version": "0.1.6", + "sha256": "081p2vv022c3585j9dqalqgk8y1gnx0z7h0mwh57dmk8adbb1zb0", "depends": ["curl", "jsonlite"] }, "imgpalr": { @@ -72945,8 +73677,8 @@ }, "imgrec": { "name": "imgrec", - "version": "0.1.3", - "sha256": "0va04b264v2ywvqdgmvigygsd5f6vdy5cj2ip2nsyi1fzh68hadx", + "version": "0.1.4", + "sha256": "14qn4pvg9g57xmj1dgsdybmc30rj2gfdby52pzvcjzyfsbxw8hch", "depends": ["base64enc", "dplyr", "httr", "jsonlite", "knitr", "rlang"] }, "imguR": { @@ -72959,31 +73691,31 @@ "name": "iml", "version": "0.11.3", "sha256": "1d0p41byqpw7niyyyqcj00y43dmhqrm2csmbarcy8mz7n0i1842b", - "depends": ["checkmate", "data_table", "Formula", "future", "future_apply", "ggplot2", "Metrics", "R6"] + "depends": ["Formula", "Metrics", "R6", "checkmate", "data_table", "future", "future_apply", "ggplot2"] }, "immcp": { "name": "immcp", "version": "1.0.3", "sha256": "0xjk0a1dr45rnf6fzir74805winn1wppci2wk7wr2pwpmba86vzq", - "depends": ["arules", "clusterProfiler", "DOSE", "dplyr", "factoextra", "ggheatmap", "ggplot2", "igraph", "magrittr", "Matrix", "openxlsx", "org_Hs_eg_db", "pbapply", "proxyC", "purrr", "rlang", "visNetwork"] + "depends": ["DOSE", "Matrix", "arules", "clusterProfiler", "dplyr", "factoextra", "ggheatmap", "ggplot2", "igraph", "magrittr", "openxlsx", "org_Hs_eg_db", "pbapply", "proxyC", "purrr", "rlang", "visNetwork"] }, "immer": { "name": "immer", "version": "1.5-13", "sha256": "0fw657vq0rj00kgkwam9wahf8sg9rf4jh0jmy154q6hq9f80v299", - "depends": ["CDM", "coda", "psychotools", "Rcpp", "RcppArmadillo", "sirt", "TAM"] + "depends": ["CDM", "Rcpp", "RcppArmadillo", "TAM", "coda", "psychotools", "sirt"] }, "immunarch": { "name": "immunarch", "version": "0.9.1", "sha256": "0z44z74zvb1ci931n8zxpvs36cpwx5my6qd77c4z50bgn2hr00rf", - "depends": ["airr", "ape", "circlize", "data_table", "doParallel", "dplyr", "dtplyr", "factoextra", "fpc", "ggalluvial", "ggplot2", "ggpubr", "ggraph", "ggrepel", "ggseqlogo", "glue", "igraph", "jsonlite", "magrittr", "MASS", "patchwork", "phangorn", "pheatmap", "plyr", "purrr", "Rcpp", "readr", "readxl", "reshape2", "rlang", "rlist", "Rtsne", "scales", "shiny", "shinythemes", "stringdist", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "UpSetR", "uuid"] + "depends": ["MASS", "Rcpp", "Rtsne", "UpSetR", "airr", "ape", "circlize", "data_table", "doParallel", "dplyr", "dtplyr", "factoextra", "fpc", "ggalluvial", "ggplot2", "ggpubr", "ggraph", "ggrepel", "ggseqlogo", "glue", "igraph", "jsonlite", "magrittr", "patchwork", "phangorn", "pheatmap", "plyr", "purrr", "readr", "readxl", "reshape2", "rlang", "rlist", "scales", "shiny", "shinythemes", "stringdist", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "uuid"] }, "immuneSIM": { "name": "immuneSIM", "version": "0.8.7", "sha256": "0brj12xnkzmn3n91vb39fq3q68wmzmwx9l38dl38yypp0l8pknjl", - "depends": ["Biostrings", "data_table", "ggplot2", "ggthemes", "igraph", "Metrics", "plyr", "poweRlaw", "RColorBrewer", "repmis", "reshape2", "stringdist", "stringr"] + "depends": ["Biostrings", "Metrics", "RColorBrewer", "data_table", "ggplot2", "ggthemes", "igraph", "plyr", "poweRlaw", "repmis", "reshape2", "stringdist", "stringr"] }, "imola": { "name": "imola", @@ -72995,19 +73727,19 @@ "name": "imp4p", "version": "1.2", "sha256": "1ld8bjjrlij9m7xns7izibag9mndrfh21xgq1w7g3bh5ag9p9fs0", - "depends": ["Iso", "missForest", "missMDA", "norm", "Rcpp", "truncnorm"] + "depends": ["Iso", "Rcpp", "missForest", "missMDA", "norm", "truncnorm"] }, "impactflu": { "name": "impactflu", "version": "0.1.0", "sha256": "0wpaq2q61g6hl9fffs5cjbzdz1qc8dxsbknfs0iarwkn08460bn5", - "depends": ["dplyr", "glue", "lubridate", "magrittr", "Rcpp", "rlang", "tibble"] + "depends": ["Rcpp", "dplyr", "glue", "lubridate", "magrittr", "rlang", "tibble"] }, "impactr": { "name": "impactr", "version": "0.4.2", "sha256": "1lqvq3fa4n6nnq1fb4bbq5ql4aph5r8m9y0d87kk2k93fvw06yvx", - "depends": ["glue", "lubridate", "lvmisc", "pillar", "pracma", "purrr", "Rcpp", "rlang", "signal", "stringr", "tibble", "toOrdinal", "vroom"] + "depends": ["Rcpp", "glue", "lubridate", "lvmisc", "pillar", "pracma", "purrr", "rlang", "signal", "stringr", "tibble", "toOrdinal", "vroom"] }, "impimp": { "name": "impimp", @@ -73037,7 +73769,7 @@ "name": "implyr", "version": "0.5.0", "sha256": "0kl4zsa1aw86mgj5kds8xxn3z9hgdb7nf5wrwhzn3wpa4yawx4r8", - "depends": ["assertthat", "DBI", "dbplyr", "dplyr", "rlang", "tidyselect"] + "depends": ["DBI", "assertthat", "dbplyr", "dplyr", "rlang", "tidyselect"] }, "r_import": { "name": "import", @@ -73085,7 +73817,7 @@ "name": "imputeFin", "version": "0.1.2", "sha256": "11qd43zs8gd3fg3f47lrb6b4r0w7kxczain61bxc67ppzflrafmd", - "depends": ["magrittr", "MASS", "mvtnorm", "zoo"] + "depends": ["MASS", "magrittr", "mvtnorm", "zoo"] }, "imputeGeneric": { "name": "imputeGeneric", @@ -73103,7 +73835,7 @@ "name": "imputeMulti", "version": "0.8.4", "sha256": "0192wzmz5114aq0nxlysjjkcylfkgpz3f214wqry5lpz0219lr79", - "depends": ["data_table", "gtools", "Rcpp"] + "depends": ["Rcpp", "data_table", "gtools"] }, "imputeR": { "name": "imputeR", @@ -73121,7 +73853,7 @@ "name": "imputeTS", "version": "3.3", "sha256": "0y5nam1flciw4sbnzbjsjakmvznfvlpxh1y5d48g4pn5173bxzgx", - "depends": ["forecast", "ggplot2", "ggtext", "magrittr", "Rcpp", "stinepack"] + "depends": ["Rcpp", "forecast", "ggplot2", "ggtext", "magrittr", "stinepack"] }, "imputeTestbench": { "name": "imputeTestbench", @@ -73133,7 +73865,7 @@ "name": "imsig", "version": "1.1.3", "sha256": "175is0b39grc609dskv9274czv4iwnmlg81dl4nr01xdp6f7g487", - "depends": ["ggplot2", "gridExtra", "HiClimR", "igraph", "RColorBrewer", "survival"] + "depends": ["HiClimR", "RColorBrewer", "ggplot2", "gridExtra", "igraph", "survival"] }, "in2extRemes": { "name": "in2extRemes", @@ -73151,7 +73883,7 @@ "name": "inTrees", "version": "1.4", "sha256": "18gbw7v4xbsxdifk32qga3h3j17w40ljs1mkk0b4fzwin9z4sh27", - "depends": ["arules", "data_table", "gbm", "RRF", "xgboost", "xtable"] + "depends": ["RRF", "arules", "data_table", "gbm", "xgboost", "xtable"] }, "inaparc": { "name": "inaparc", @@ -73187,7 +73919,7 @@ "name": "incgraph", "version": "1.0.1", "sha256": "0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml", - "depends": ["BH", "dplyr", "orca", "purrr", "Rcpp", "testthat", "tibble"] + "depends": ["BH", "Rcpp", "dplyr", "orca", "purrr", "testthat", "tibble"] }, "incidence": { "name": "incidence", @@ -73205,13 +73937,13 @@ "name": "incidental", "version": "0.1", "sha256": "012pdwrkzlbnrrkvy67l6nvs1lrjgrzhfh3v4rqzk2ypdvfm3wmx", - "depends": ["dlnm", "ggplot2", "MASS", "matrixStats", "numDeriv"] + "depends": ["MASS", "dlnm", "ggplot2", "matrixStats", "numDeriv"] }, "incidentally": { "name": "incidentally", "version": "1.0.2", "sha256": "063m672ym9w5zmzvdhr17smqy1mffkl3vls7nhpsxc4bjswqls2g", - "depends": ["igraph", "Matrix", "xml2"] + "depends": ["Matrix", "igraph", "xml2"] }, "inctools": { "name": "inctools", @@ -73221,15 +73953,15 @@ }, "incubate": { "name": "incubate", - "version": "1.2.1", - "sha256": "1ip5vbk5d3a4sci09azmbqd1s2cm83l65yaq6fxjswizw3kvmscp", - "depends": ["future", "future_apply", "glue", "MASS", "purrr", "rlang", "survival", "tibble"] + "version": "1.3.0", + "sha256": "1vgmdjk355f33kr8fdpzyvpxyl2qiq53hvdl8l0jbsznn6n75786", + "depends": ["MASS", "future", "future_apply", "glue", "purrr", "rlang", "survival", "tibble"] }, "indelmiss": { "name": "indelmiss", "version": "1.0.10", "sha256": "1dqdk6glzm40y4zxc9bfjg5qsvd2i4xm55w8f7671gyjkzjzavv5", - "depends": ["ape", "numDeriv", "phangorn", "Rcpp"] + "depends": ["Rcpp", "ape", "numDeriv", "phangorn"] }, "independenceWeights": { "name": "independenceWeights", @@ -73253,7 +73985,7 @@ "name": "india", "version": "0.1", "sha256": "1xk617s5njwdl6sz2vgprxbikv71azx9d79rmkvbdiraj740jsz5", - "depends": ["fastmatrix", "L1pack"] + "depends": ["L1pack", "fastmatrix"] }, "indicspecies": { "name": "indicspecies", @@ -73271,19 +74003,19 @@ "name": "indirect", "version": "0.2.1", "sha256": "1iaks18xcxqr2afzbzgxj4jr77p6gw2zmgb1398cgqkgdwb1yj13", - "depends": ["gplots", "MASS"] + "depends": ["MASS", "gplots"] }, "industRial": { "name": "industRial", "version": "0.1.0", "sha256": "0zgnykbr71pi3nii178ijmzd8ijwf3g8y8yz6g3jy4c0by7w676s", - "depends": ["dplyr", "ggplot2", "lattice", "magrittr", "rlang", "SixSigma", "tidyr"] + "depends": ["SixSigma", "dplyr", "ggplot2", "lattice", "magrittr", "rlang", "tidyr"] }, "inegiR": { "name": "inegiR", "version": "3.0.0", "sha256": "1rhkdmpz7mxi7ddyygss5rlh3c8hgxhzdk3fnvnlizc1l55cc6c0", - "depends": ["jsonlite", "lubridate", "plyr", "tibbletime", "XML", "zoo"] + "depends": ["XML", "jsonlite", "lubridate", "plyr", "tibbletime", "zoo"] }, "ineq": { "name": "ineq", @@ -73307,7 +74039,7 @@ "name": "inet", "version": "0.1.0", "sha256": "1kjy2kgi5v29yk6pv776gwdqzkscjh96p3iv1j906vh47zp8wrag", - "depends": ["glmnet", "hdi", "MASS"] + "depends": ["MASS", "glmnet", "hdi"] }, "infer": { "name": "infer", @@ -73317,9 +74049,9 @@ }, "inferCSN": { "name": "inferCSN", - "version": "1.0.3", - "sha256": "1c2aaysyjvxxynwp877bhi9w3lrydg96gp2is6a919dgmwi7ilvx", - "depends": ["ComplexHeatmap", "doParallel", "dplyr", "foreach", "ggnetwork", "ggplot2", "ggraph", "Matrix", "patchwork", "progress", "purrr", "Rcpp", "RcppArmadillo"] + "version": "1.0.5", + "sha256": "01wzimr1gjj4993k15w8kyq1rmc5a2a9q68hv19gdkrwsyd2zspa", + "depends": ["ComplexHeatmap", "Matrix", "Rcpp", "RcppArmadillo", "doParallel", "dplyr", "foreach", "ggnetwork", "ggplot2", "ggraph", "patchwork", "pbapply", "purrr"] }, "inferference": { "name": "inferference", @@ -73331,13 +74063,19 @@ "name": "inferr", "version": "0.3.1", "sha256": "1ma90f31jcd65l5v3wqbx4x61gw3iay1a2hwjsd5aln1ivbgmzsv", - "depends": ["data_table", "magrittr", "Rcpp"] + "depends": ["Rcpp", "data_table", "magrittr"] + }, + "infiltrodiscR": { + "name": "infiltrodiscR", + "version": "0.0.5", + "sha256": "1nlkpvkkky1wjsdycxr3m658krpxr706xfjcy2gqlbsx5nl22v5m", + "depends": ["dplyr", "tidyr"] }, "infinitefactor": { "name": "infinitefactor", "version": "1.0", "sha256": "0j6f9q8z81znwakyx4h0l8ypz0y4yv11d7l3rwljmn4rgspyjl5c", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "reshape2"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "reshape2"] }, "infix": { "name": "infix", @@ -73355,7 +74093,7 @@ "name": "influence.ME", "version": "0.9-9", "sha256": "0f6d2hvs9qllyfpsp2cgh7w8yjxafclbk47n8av7j9zpp7s5yg9v", - "depends": ["lattice", "lme4", "Matrix"] + "depends": ["Matrix", "lattice", "lme4"] }, "influence_SEM": { "name": "influence.SEM", @@ -73367,13 +74105,13 @@ "name": "influenceAUC", "version": "0.1.2", "sha256": "0pscwfxs2y780lzd5sxldnnkzzs2lsjdwz71z44kn7884wqmikpm", - "depends": ["dplyr", "geigen", "ggplot2", "ggrepel", "ROCR"] + "depends": ["ROCR", "dplyr", "geigen", "ggplot2", "ggrepel"] }, "influenceR": { "name": "influenceR", "version": "0.1.5", "sha256": "137m40xs9xfqcm88gi7w86b310rysf3a973wp7x3543n1y1f8r41", - "depends": ["igraph", "Matrix"] + "depends": ["Matrix", "igraph"] }, "influential": { "name": "influential", @@ -73385,7 +74123,7 @@ "name": "influxdbclient", "version": "0.1.2", "sha256": "0zyb6ycyw03kwg8f27vhy14i0bh58j040bjbi9vm1m692hcvcqcd", - "depends": ["bit64", "httr", "jsonlite", "nanotime", "plyr", "R6"] + "depends": ["R6", "bit64", "httr", "jsonlite", "nanotime", "plyr"] }, "influxdbr": { "name": "influxdbr", @@ -73405,6 +74143,12 @@ "sha256": "1ni00y4wni9dgpaj6x2p50bgmzfh2ybr350ywqmnwz5q30r9kjsm", "depends": ["dplyr", "httr", "stringr"] }, + "informativeSCI": { + "name": "informativeSCI", + "version": "1.0.3", + "sha256": "1va0lqhranks4kn1al4fwl00f39aylx361xc369vj3q55qbigny0", + "depends": ["gMCP", "mvtnorm"] + }, "informedSen": { "name": "informedSen", "version": "1.0.7", @@ -73449,9 +74193,15 @@ }, "inlabru": { "name": "inlabru", - "version": "2.10.1", - "sha256": "1sazv0jz458lvdslza1d4y53q6ws9rn2g6sfgv3hin30qk6jzizg", - "depends": ["dplyr", "fmesher", "lifecycle", "magrittr", "Matrix", "MatrixModels", "plyr", "rlang", "sf", "sp", "terra", "tibble", "withr"] + "version": "2.11.1", + "sha256": "07iwi0m8wa1hybl5pjsdkq21zbchm6pimjvpxma72lpdcbmijfxy", + "depends": ["Matrix", "MatrixModels", "dplyr", "fmesher", "lifecycle", "magrittr", "plyr", "rlang", "sf", "sp", "terra", "tibble", "withr"] + }, + "inlamemi": { + "name": "inlamemi", + "version": "1.0.0", + "sha256": "0l18skd43kl99xjyw59pil9rmm60jlkgr7iklghrid280p2984zj", + "depends": ["dplyr", "ggplot2", "rlang", "scales"] }, "inlcolor": { "name": "inlcolor", @@ -73459,12 +74209,6 @@ "sha256": "0yhhy7yrycxg58shfwrja2zfdixss2wldi6qg262dfa9w6j68brj", "depends": ["checkmate", "rlang", "scales"] }, - "inldata": { - "name": "inldata", - "version": "1.2.3", - "sha256": "0155mx8nx5g1vp3mcfar0n4qbxqyvs0fzqnmd8skrrygfk1aw0y5", - "depends": ["checkmate", "sf", "stringi", "terra"] - }, "inline": { "name": "inline", "version": "0.3.19", @@ -73479,15 +74223,15 @@ }, "inlpubs": { "name": "inlpubs", - "version": "1.1.1", - "sha256": "0gg39mkid9s57hd9r5y5pa8228m965diz61s94v38qyix8pjdj37", + "version": "1.1.3", + "sha256": "1l9xngsia76yfq3g550nwgj7s2d33jl0s2k7f89majvkaxldbs47", "depends": ["checkmate", "tm"] }, "innsight": { "name": "innsight", "version": "0.3.0", "sha256": "17di0a7jff4rg944h247kjbd76vai2hsg9gif1q871c7lq04fw4s", - "depends": ["checkmate", "cli", "ggplot2", "R6", "torch"] + "depends": ["R6", "checkmate", "cli", "ggplot2", "torch"] }, "inops": { "name": "inops", @@ -73499,7 +74243,7 @@ "name": "inpdfr", "version": "0.1.12", "sha256": "1pargjl2v1kxxbdzf2jjcw3yxyqmxkq30rz3y5xywigq1ab2lpsw", - "depends": ["cluster", "entropart", "metacom", "R_devices", "RColorBrewer", "SnowballC", "stringi", "tm", "wordcloud"] + "depends": ["RColorBrewer", "R_devices", "SnowballC", "cluster", "entropart", "metacom", "stringi", "tm", "wordcloud"] }, "inplace": { "name": "inplace", @@ -73511,13 +74255,13 @@ "name": "insane", "version": "1.0.3", "sha256": "14j11xmfcj5y39qmzi75payilvz5hcdj77l75pfsi8bhv5z97ykb", - "depends": ["broom", "dplyr", "DT", "ggplot2", "ggpubr", "glue", "patchwork", "purrr", "readxl", "shiny", "tidyr"] + "depends": ["DT", "broom", "dplyr", "ggplot2", "ggpubr", "glue", "patchwork", "purrr", "readxl", "shiny", "tidyr"] }, "insect": { "name": "insect", "version": "1.4.2", "sha256": "0pbac9il1jrhii0hxvvqjc3phyr2iamxwzanxx5mrkyjh2wsl3jh", - "depends": ["ape", "aphid", "kmer", "openssl", "phylogram", "RANN", "seqinr", "xml2"] + "depends": ["RANN", "ape", "aphid", "kmer", "openssl", "phylogram", "seqinr", "xml2"] }, "insectDisease": { "name": "insectDisease", @@ -73525,23 +74269,17 @@ "sha256": "1ncj5fgmx19caf8m2p3ij5iamk941m9y725gs0nqpa9m6zfnzgf8", "depends": ["plyr", "taxize"] }, - "insee": { - "name": "insee", - "version": "1.1.5", - "sha256": "1f6y19dysm0mh3fkrwnqcgi5j1lzy08m3ij3wrx26q2vgwv5lkfg", - "depends": ["crayon", "dplyr", "httr", "openssl", "purrr", "rappdirs", "rlang", "stringr", "tibble", "tidyselect", "xml2"] - }, "insight": { "name": "insight", - "version": "0.20.1", - "sha256": "19lg5dipnwlfxzcpq2mj348f8pnzn6i7sj77hf5ppzha370acgy2", + "version": "0.20.3", + "sha256": "1ckb25cbf6xg425fnkz86hxvmyrdkkl7889bkj73cg6d96c1h3mn", "depends": [] }, "inspectdf": { "name": "inspectdf", "version": "0.0.12", "sha256": "1k9dszjfpvpc10qr9nbw5r55mdwslgblhlrgnqjnwx9i89j03mlk", - "depends": ["dplyr", "ggfittext", "ggplot2", "magrittr", "progress", "Rcpp", "rlang", "tibble", "tidyr"] + "depends": ["Rcpp", "dplyr", "ggfittext", "ggplot2", "magrittr", "progress", "rlang", "tibble", "tidyr"] }, "inspector": { "name": "inspector", @@ -73589,7 +74327,7 @@ "name": "insurancerating", "version": "0.7.4", "sha256": "1bfl5khi70cfqg1kx0fa7ym6nxqhvk1rjff91kvxbc8q2nxj6wda", - "depends": ["ciTools", "classInt", "colorspace", "data_table", "DHARMa", "dplyr", "evtree", "fitdistrplus", "ggplot2", "insight", "lubridate", "mgcv", "patchwork", "scales", "stringr"] + "depends": ["DHARMa", "ciTools", "classInt", "colorspace", "data_table", "dplyr", "evtree", "fitdistrplus", "ggplot2", "insight", "lubridate", "mgcv", "patchwork", "scales", "stringr"] }, "intRegGOF": { "name": "intRegGOF", @@ -73601,7 +74339,7 @@ "name": "intRinsic", "version": "1.0.2", "sha256": "07hs1srvdzrqqqzzxkbrc10sns3i7nlp41b3ysaf1j03jgxwdyid", - "depends": ["dplyr", "FNN", "ggplot2", "knitr", "latex2exp", "Rcpp", "RcppArmadillo", "reshape2", "rlang", "salso"] + "depends": ["FNN", "Rcpp", "RcppArmadillo", "dplyr", "ggplot2", "knitr", "latex2exp", "reshape2", "rlang", "salso"] }, "intRvals": { "name": "intRvals", @@ -73613,7 +74351,7 @@ "name": "intamap", "version": "1.5-7", "sha256": "1rvjqv58bfsya6sc9kbqkln3f9zw3cvqhqsdxfsksvjybnmychxq", - "depends": ["automap", "doParallel", "evd", "foreach", "gstat", "MASS", "MBA", "mvtnorm", "sf", "sp"] + "depends": ["MASS", "MBA", "automap", "doParallel", "evd", "foreach", "gstat", "mvtnorm", "sf", "sp"] }, "intamapInteractive": { "name": "intamapInteractive", @@ -73625,19 +74363,19 @@ "name": "intccr", "version": "3.0.4", "sha256": "1bpzsik6yypkxskp7ar8a1j0wmndsx41xn4kaffz0fni988l23hc", - "depends": ["alabama", "doParallel", "foreach", "MASS", "splines2"] + "depends": ["MASS", "alabama", "doParallel", "foreach", "splines2"] }, "intcensROC": { "name": "intcensROC", "version": "0.1.3", "sha256": "1raqjc3g9fgyd01iax7hrmkk3nzzfi34a1ywhjrkwv1n9gsc58ns", - "depends": ["pracma", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "pracma"] }, "integIRTy": { "name": "integIRTy", "version": "1.0.7", "sha256": "15f04p97fvqdq971adyafm3ljirfxz90lv096fdqn2vk0sq5dwyj", - "depends": ["abind", "doParallel", "foreach", "ltm", "MASS", "mclust"] + "depends": ["MASS", "abind", "doParallel", "foreach", "ltm", "mclust"] }, "integr": { "name": "integr", @@ -73661,7 +74399,7 @@ "name": "intensitynet", "version": "1.4.0", "sha256": "0rgm8rj95r269ww7snwv6czqdxabhzwxyaf3587scprhhn7pncy3", - "depends": ["ggplot2", "igraph", "intergraph", "Matrix", "sna", "spatstat_geom", "spdep", "viridis"] + "depends": ["Matrix", "ggplot2", "igraph", "intergraph", "sna", "spatstat_geom", "spdep", "viridis"] }, "interactionR": { "name": "interactionR", @@ -73683,15 +74421,15 @@ }, "interactions": { "name": "interactions", - "version": "1.1.5", - "sha256": "16lrlj0rc9bkxgmackpvcx8wx9pbsnr55vak6zx022ss820h3ljj", - "depends": ["cli", "crayon", "generics", "ggplot2", "jtools", "rlang", "tibble"] + "version": "1.2.0", + "sha256": "1j4bb3xjdw2xs82nv3l1va2gfk5blzqdz6db1zb31yanhrvv7j9y", + "depends": ["broom", "cli", "generics", "ggplot2", "jtools", "rlang", "tibble"] }, "interca": { "name": "interca", "version": "0.1.2", "sha256": "1ddv1rphdpvxbqbmrj3bgsdpksq84yjxdgygms5pw8jdz8yjyirs", - "depends": ["dplyr", "DT", "factoextra", "FactoMineR", "ggplot2", "ggrepel", "magrittr", "openxlsx", "readr", "readxl", "rmarkdown", "shiny", "shinyFeedback", "shinyWidgets", "waiter"] + "depends": ["DT", "FactoMineR", "dplyr", "factoextra", "ggplot2", "ggrepel", "magrittr", "openxlsx", "readr", "readxl", "rmarkdown", "shiny", "shinyFeedback", "shinyWidgets", "waiter"] }, "interep": { "name": "interep", @@ -73699,11 +74437,17 @@ "sha256": "11g33j14493kr03qviv8nr1x7kj7p61fhm8slmab0nzbfcbwfwih", "depends": ["MASS", "Rcpp", "RcppArmadillo"] }, + "interfacer": { + "name": "interfacer", + "version": "0.2.3", + "sha256": "0ymmm5ij5q8jg1la1k7wfdhb8p8c6kzwf6jqcsa86snz3ssmlrvm", + "depends": ["digest", "dplyr", "forcats", "glue", "knitr", "magrittr", "purrr", "rlang", "roxygen2", "stringr", "tibble", "tidyselect"] + }, "interflex": { "name": "interflex", "version": "1.2.6", "sha256": "0crijwb076b3hprjnji52l8qnd5pp3w7pxy214sfqrg2g3y4gcfl", - "depends": ["AER", "doParallel", "foreach", "future", "ggplot2", "ggplotify", "gridExtra", "gtable", "lfe", "Lmoments", "lmtest", "MASS", "mgcv", "ModelMetrics", "mvtnorm", "pcse", "pROC", "RColorBrewer", "Rcpp", "RcppArmadillo", "sandwich"] + "depends": ["AER", "Lmoments", "MASS", "ModelMetrics", "RColorBrewer", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "future", "ggplot2", "ggplotify", "gridExtra", "gtable", "lfe", "lmtest", "mgcv", "mvtnorm", "pROC", "pcse", "sandwich"] }, "interfr": { "name": "interfr", @@ -73733,7 +74477,7 @@ "name": "interleave", "version": "0.1.2", "sha256": "09ba3sk1s34agihwgf06k7kvwrzh1v2mzxsxzj58k0fa0cfljrzs", - "depends": ["geometries", "Rcpp"] + "depends": ["Rcpp", "geometries"] }, "interlineaR": { "name": "interlineaR", @@ -73745,7 +74489,7 @@ "name": "interp", "version": "1.1-6", "sha256": "0d6ddvm94113d9bjhghjsfbhgz44q0lkjc2l809dzv1lad708x1n", - "depends": ["deldir", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "deldir"] }, "interplex": { "name": "interplex", @@ -73781,7 +74525,7 @@ "name": "interpretCI", "version": "0.1.1", "sha256": "1jg2dpfrhb1kij2z0gq4sw1lrb4v2sky13dpfmdnaz2k5xqnih2s", - "depends": ["aplot", "dplyr", "english", "flextable", "ggbeeswarm", "ggplot2", "moonBook", "officer", "patchwork", "purrr", "RColorBrewer", "rlang", "rmarkdown", "rstudioapi", "scales", "tidyr"] + "depends": ["RColorBrewer", "aplot", "dplyr", "english", "flextable", "ggbeeswarm", "ggplot2", "moonBook", "officer", "patchwork", "purrr", "rlang", "rmarkdown", "rstudioapi", "scales", "tidyr"] }, "interpretR": { "name": "interpretR", @@ -73805,7 +74549,7 @@ "name": "intervalaverage", "version": "0.8.0", "sha256": "07p9r358q3jxm8n7nypxmvpfnh61njivcwaplgzzxrlcbway6fq9", - "depends": ["data_table", "Rcpp"] + "depends": ["Rcpp", "data_table"] }, "intervals": { "name": "intervals", @@ -73823,25 +74567,25 @@ "name": "inti", "version": "0.6.5", "sha256": "1zbfxc34613r460mhln3qn4fsx999vi4qamf5c8pkjdwyd8nvvbz", - "depends": ["agricolae", "dplyr", "DT", "emmeans", "FactoMineR", "ggplot2", "googlesheets4", "lme4", "purrr", "shiny", "stringi", "stringr", "tibble", "tidyr"] + "depends": ["DT", "FactoMineR", "agricolae", "dplyr", "emmeans", "ggplot2", "googlesheets4", "lme4", "purrr", "shiny", "stringi", "stringr", "tibble", "tidyr"] }, "intkrige": { "name": "intkrige", "version": "1.0.1", "sha256": "1p3fn5nzn1iliy025187k590qrsw3z3d47p67gzwwd6h050yrl86", - "depends": ["gstat", "raster", "Rcpp", "RcppArmadillo", "Rdpack", "sp"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "gstat", "raster", "sp"] }, "intmap": { "name": "intmap", "version": "1.0.0", "sha256": "1fxq0jkahangv4pwsvnrr4iq2y6qp61l81b28yzwl74b0lmx6hbf", - "depends": ["BH", "maybe", "R6", "Rcpp"] + "depends": ["BH", "R6", "Rcpp", "maybe"] }, "intmed": { "name": "intmed", "version": "0.1.2", "sha256": "0amcqzinj35yvb9nfy808bz098dqmnds13z335lgqm6sykriyjpl", - "depends": ["doParallel", "dplyr", "foreach", "MASS", "mice", "stringr", "tibble"] + "depends": ["MASS", "doParallel", "dplyr", "foreach", "mice", "stringr", "tibble"] }, "intradayModel": { "name": "intradayModel", @@ -73859,7 +74603,7 @@ "name": "intrinsicFRP", "version": "2.1.0", "sha256": "1ji707s5501m6q8b2bgjd8d6avylb441710dkxaj96sznn8jf4ig", - "depends": ["glmnet", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "glmnet"] }, "intrinsicKappa": { "name": "intrinsicKappa", @@ -73883,7 +74627,7 @@ "name": "intsvy", "version": "2.9", "sha256": "0bk8v9ds6jrp7pvw63k777wj4pvg5nx1df4w5jz1hhr0gsv0jw8v", - "depends": ["dplyr", "foreign", "ggplot2", "Hmisc", "memisc", "plyr", "reshape"] + "depends": ["Hmisc", "dplyr", "foreign", "ggplot2", "memisc", "plyr", "reshape"] }, "inum": { "name": "inum", @@ -73925,7 +74669,7 @@ "name": "invertiforms", "version": "0.1.1", "sha256": "0n3ksfdryk0g6f60acxh4i9f5z6gi9bsbal95z9pcd1vgvyhr1xw", - "depends": ["glue", "Matrix", "sparseLRMatrix"] + "depends": ["Matrix", "glue", "sparseLRMatrix"] }, "investr": { "name": "investr", @@ -74003,7 +74747,7 @@ "name": "iotarelr", "version": "0.1.5", "sha256": "0sp3qcd5zbz8q2srfa5a34gv9rj4hcqiggbrmr67p8zfrfm950np", - "depends": ["ggalluvial", "ggplot2", "gridExtra", "Rcpp", "rlang"] + "depends": ["Rcpp", "ggalluvial", "ggplot2", "gridExtra", "rlang"] }, "iotools": { "name": "iotools", @@ -74039,13 +74783,13 @@ "name": "ipaddress", "version": "1.0.2", "sha256": "0dqxyrc2bbqbsxbzdpn9xw76gnqzjqkrzlrc203v6kd4v81npk7w", - "depends": ["AsioHeaders", "cli", "Rcpp", "rlang", "vctrs"] + "depends": ["AsioHeaders", "Rcpp", "cli", "rlang", "vctrs"] }, "ipanema": { "name": "ipanema", "version": "1.1.0", "sha256": "0fs9mddhzr1pq7mv08602w6rqmx2sjnj0lcp56hawcjfszczdzzn", - "depends": ["base64enc", "DBI", "dplyr", "httr", "jsonlite", "magrittr", "RMySQL"] + "depends": ["DBI", "RMySQL", "base64enc", "dplyr", "httr", "jsonlite", "magrittr"] }, "ipbase": { "name": "ipbase", @@ -74111,7 +74855,7 @@ "name": "ipft", "version": "0.7.2", "sha256": "0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps", - "depends": ["apcluster", "cluster", "dplyr", "ggplot2", "Rcpp"] + "depends": ["Rcpp", "apcluster", "cluster", "dplyr", "ggplot2"] }, "ipkg": { "name": "ipkg", @@ -74135,7 +74879,7 @@ "name": "ipmr", "version": "0.0.7", "sha256": "0zpw73bqv9gblyxaprkhb8f9dva0ivv47bjriyb3265vlzyd088c", - "depends": ["magrittr", "purrr", "Rcpp", "rlang"] + "depends": ["Rcpp", "magrittr", "purrr", "rlang"] }, "ipolygrowth": { "name": "ipolygrowth", @@ -74151,33 +74895,33 @@ }, "ipred": { "name": "ipred", - "version": "0.9-14", - "sha256": "0dcgabbqk7lb8pfqs06ix87caf5c9p6kcppi5sskv76h8z43vj41", - "depends": ["class", "MASS", "nnet", "prodlim", "rpart", "survival"] + "version": "0.9-15", + "sha256": "0jzfq06l2vxyjy46sjgqyk6l4pp06kx3w5j39hzjy9i127hjsxd4", + "depends": ["MASS", "class", "nnet", "prodlim", "rpart", "survival"] }, "iprior": { "name": "iprior", "version": "0.7.4", "sha256": "0zhyr19m6yxhn3gskfm14hmag5vjz1008fhxli2cg14z6hsdl1ww", - "depends": ["doSNOW", "foreach", "ggplot2", "mvtnorm", "Rcpp", "RcppEigen", "reshape2", "scales"] + "depends": ["Rcpp", "RcppEigen", "doSNOW", "foreach", "ggplot2", "mvtnorm", "reshape2", "scales"] }, "ips": { "name": "ips", "version": "0.0.12", "sha256": "0vnsalm94vzagksqv4ph6x7vdwhd1lq278sak30pr4m9bc9xxchw", - "depends": ["ape", "data_table", "phangorn", "plyr", "XML"] + "depends": ["XML", "ape", "data_table", "phangorn", "plyr"] }, "ipsRdbs": { "name": "ipsRdbs", "version": "1.0.0", "sha256": "018l91i88scak8mhz2p1a13dds7kyzig6wb8442hmzkwg63xi764", - "depends": ["extraDistr", "ggplot2", "Rdpack"] + "depends": ["Rdpack", "extraDistr", "ggplot2"] }, "ipsecr": { "name": "ipsecr", "version": "1.4.1", "sha256": "10kliwx8rn4xrcrrmmmr0n2f01dynms5l9lk5xzbyr853x4am5bl", - "depends": ["BH", "MASS", "nlme", "Rcpp", "RcppArmadillo", "secr", "stringr"] + "depends": ["BH", "MASS", "Rcpp", "RcppArmadillo", "nlme", "secr", "stringr"] }, "ipsfs": { "name": "ipsfs", @@ -74187,15 +74931,15 @@ }, "ipumsr": { "name": "ipumsr", - "version": "0.7.2", - "sha256": "0zkj33xg6b7aapmp8qd333qc6mmcwhbqx3pd8ibhdlcd1pc89hww", - "depends": ["dplyr", "haven", "hipread", "httr", "jsonlite", "lifecycle", "purrr", "R6", "readr", "rlang", "tibble", "tidyselect", "xml2", "zeallot"] + "version": "0.8.1", + "sha256": "0k1mz9i6xsaq8874m2gkdd9ip7x942sx47xndy8smr094jl5zmfr", + "depends": ["R6", "dplyr", "haven", "hipread", "httr", "jsonlite", "lifecycle", "purrr", "readr", "rlang", "tibble", "tidyselect", "xml2", "zeallot"] }, "ipw": { "name": "ipw", "version": "1.2.1", "sha256": "0xgx9l5s4w71494jfs2jfs1dhch18rb8j7jn68hilh1pzc9hz05k", - "depends": ["geepack", "MASS", "nnet", "survival"] + "depends": ["MASS", "geepack", "nnet", "survival"] }, "ipwCoxCSV": { "name": "ipwCoxCSV", @@ -74219,7 +74963,7 @@ "name": "ir", "version": "0.2.1", "sha256": "1ck5247w5lxffd2x3jrslfx13jigik48xmcnkr7my2kzjmnqiyr1", - "depends": ["baseline", "ChemoSpec", "dplyr", "ggplot2", "hyperSpec", "lifecycle", "magrittr", "purrr", "Rdpack", "rlang", "signal", "stringr", "tibble", "tidyr", "units"] + "depends": ["ChemoSpec", "Rdpack", "baseline", "dplyr", "ggplot2", "hyperSpec", "lifecycle", "magrittr", "purrr", "rlang", "signal", "stringr", "tibble", "tidyr", "units"] }, "irace": { "name": "irace", @@ -74231,7 +74975,7 @@ "name": "iraceplot", "version": "1.3", "sha256": "19scipjkxf08wmsv7vwscx3j120444l5ncin9l8fq1i3jq5w6pjy", - "depends": ["cli", "dplyr", "DT", "forcats", "ggforce", "ggplot2", "gridExtra", "irace", "knitr", "labeling", "matrixStats", "plotly", "rlang", "rmarkdown", "tibble", "tidyr", "truncnorm", "viridisLite", "withr"] + "depends": ["DT", "cli", "dplyr", "forcats", "ggforce", "ggplot2", "gridExtra", "irace", "knitr", "labeling", "matrixStats", "plotly", "rlang", "rmarkdown", "tibble", "tidyr", "truncnorm", "viridisLite", "withr"] }, "irboost": { "name": "irboost", @@ -74249,7 +74993,7 @@ "name": "irg", "version": "0.1.6", "sha256": "1c9v5yk1512ga51356fjyl8zblw61p9m55vx89fy81qi0vcwxrgj", - "depends": ["chk", "data_table", "RcppRoll"] + "depends": ["RcppRoll", "chk", "data_table"] }, "irlba": { "name": "irlba", @@ -74297,19 +75041,19 @@ "name": "irtGUI", "version": "0.2", "sha256": "1hyabm9wvld1b1gvcn02yyd8j1wrpfmpxkcj505az64lqj4p7yj0", - "depends": ["irtoys", "magrittr", "mirt", "psych", "readxl", "shiny", "shinycssloaders", "shinydashboard", "WrightMap", "writexl"] + "depends": ["WrightMap", "irtoys", "magrittr", "mirt", "psych", "readxl", "shiny", "shinycssloaders", "shinydashboard", "writexl"] }, "irtQ": { "name": "irtQ", "version": "0.2.0", "sha256": "1728699zrzpazjs7csvlzlcz7mncxspsq3lykd3i0rrpw6cixwsn", - "depends": ["dplyr", "ggplot2", "gridExtra", "janitor", "Matrix", "mirt", "purrr", "reshape2", "Rfast", "rlang", "statmod", "tibble"] + "depends": ["Matrix", "Rfast", "dplyr", "ggplot2", "gridExtra", "janitor", "mirt", "purrr", "reshape2", "rlang", "statmod", "tibble"] }, "irtawsi": { "name": "irtawsi", - "version": "0.3.4", - "sha256": "1fxz0k9pyf1h0mv64lj8p1n5yhgmrzs5q0vq8l77sg3zd8gv66pf", - "depends": ["bs4Dash", "diagram", "DT", "gt", "mirt", "psych", "readxl", "rmarkdown", "shiny", "shinycssloaders", "shinyWidgets"] + "version": "0.4.1", + "sha256": "0il4v2lilj310nviv2va9g6iddh8dk6wpxiwifk4wnmkxbkjmfv0", + "depends": ["DT", "WrightMap", "bs4Dash", "diagram", "gt", "mirt", "mirtCAT", "psych", "readxl", "rmarkdown", "shiny", "shinyWidgets", "shinycssloaders", "writexl"] }, "irtoys": { "name": "irtoys", @@ -74351,7 +75095,7 @@ "name": "iscoCrosswalks", "version": "1.0.0", "sha256": "00pzz0fy0k7zvi5pf389w4g5z96rbc4gzjvhghcmbq71z319wwcn", - "depends": ["data_table", "labourR", "Rdpack"] + "depends": ["Rdpack", "data_table", "labourR"] }, "isdals": { "name": "isdals", @@ -74381,7 +75125,7 @@ "name": "islasso", "version": "1.5.2", "sha256": "100sb5795xk45cm7zb0zmqy3flz0hy32alqqi1wfv10v06dbdlbd", - "depends": ["glmnet", "Matrix"] + "depends": ["Matrix", "glmnet"] }, "ismev": { "name": "ismev", @@ -74403,8 +75147,8 @@ }, "isnullptr": { "name": "isnullptr", - "version": "1.0.1", - "sha256": "0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9", + "version": "1.0.2", + "sha256": "0p8a290chq01800avvrsljmxvmhhk0hazrd2dry04w7qkxbzyn93", "depends": [] }, "isoSurv": { @@ -74415,9 +75159,9 @@ }, "isoWater": { "name": "isoWater", - "version": "1.1.2", - "sha256": "10rsivlcza28r386a5rs3lv75vb4aancldyswhqql3cxmd12hzqb", - "depends": ["abind", "doParallel", "foreach", "httr", "jsonlite", "R2jags", "R2WinBUGS"] + "version": "1.2.0", + "sha256": "1lmpvcljzsga89ib2avsasfdkgx3658vrp5gik25ymcdyxhsx5mi", + "depends": ["R2WinBUGS", "R2jags", "abind", "doParallel", "foreach", "httr", "jsonlite"] }, "isoband": { "name": "isoband", @@ -74435,7 +75179,7 @@ "name": "isobxr", "version": "2.0.0", "sha256": "1k6zky6v3hjw952jg4l0hnicw11iiqmxh7hcdjcb2nk2f4r4qn4g", - "depends": ["data_table", "deSolve", "dplyr", "fs", "ggplot2", "ggrepel", "gridExtra", "magrittr", "purrr", "qgraph", "R_utils", "readxl", "reshape2", "rlang", "stringr", "tictoc", "tidyr", "writexl"] + "depends": ["R_utils", "data_table", "deSolve", "dplyr", "fs", "ggplot2", "ggrepel", "gridExtra", "magrittr", "purrr", "qgraph", "readxl", "reshape2", "rlang", "stringr", "tictoc", "tidyr", "writexl"] }, "isocalcR": { "name": "isocalcR", @@ -74453,7 +75197,7 @@ "name": "isocir", "version": "2.0-7.1", "sha256": "0jgm0a26frq4fs5d578c44bpn15nshvzmrqfzcbwydf58x7w6sj2", - "depends": ["circular", "combinat", "TSP"] + "depends": ["TSP", "circular", "combinat"] }, "isocountry": { "name": "isocountry", @@ -74465,7 +75209,7 @@ "name": "isodistrreg", "version": "0.1.0", "sha256": "0na7jipwzr16afvz2l6wxh62mv0mrq1ma1qwxnys83zhr0dca099", - "depends": ["Matrix", "osqp", "Rcpp"] + "depends": ["Matrix", "Rcpp", "osqp"] }, "isogeochem": { "name": "isogeochem", @@ -74507,19 +75251,19 @@ "name": "isotonic.pen", "version": "1.0", "sha256": "1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i", - "depends": ["coneproj", "Matrix"] + "depends": ["Matrix", "coneproj"] }, "isotracer": { "name": "isotracer", "version": "1.1.6", "sha256": "0yapaaycakxzq6h3r2zp72zwf514qs64lhygiy3ix0dwxzafnh3b", - "depends": ["BH", "coda", "data_table", "dplyr", "latex2exp", "magrittr", "pillar", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders", "tibble", "tidyr", "tidyselect"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "coda", "data_table", "dplyr", "latex2exp", "magrittr", "pillar", "purrr", "rlang", "rstan", "rstantools", "tibble", "tidyr", "tidyselect"] }, "isotree": { "name": "isotree", "version": "0.6.1-1", "sha256": "0v0lr1aimlvgm6bpnaz1z4707fnrqvzfc3rziz0vcbzgycs0abvd", - "depends": ["jsonlite", "Rcpp"] + "depends": ["Rcpp", "jsonlite"] }, "ispd": { "name": "ispd", @@ -74543,7 +75287,7 @@ "name": "isva", "version": "1.9", "sha256": "05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z", - "depends": ["fastICA", "JADE", "qvalue"] + "depends": ["JADE", "fastICA", "qvalue"] }, "italy": { "name": "italy", @@ -74567,7 +75311,7 @@ "name": "itdr", "version": "2.0.1", "sha256": "1mjqh25bipzmwvs6aq7846vwvrdis3q0nm9p830w0kbq8l5p2555", - "depends": ["energy", "geigen", "magic", "MASS", "tidyr"] + "depends": ["MASS", "energy", "geigen", "magic", "tidyr"] }, "itemanalysis": { "name": "itemanalysis", @@ -74621,7 +75365,7 @@ "name": "itol.toolkit", "version": "1.1.7", "sha256": "0p29p8qk03aqcmxdskrf2mjms1isffwwxgh1kr38fxi43f3kc9q0", - "depends": ["ape", "colourpicker", "data_table", "dplyr", "ggsci", "miniUI", "purrr", "RColorBrewer", "rstudioapi", "seqinr", "shiny", "stringr", "tidyr", "wesanderson"] + "depends": ["RColorBrewer", "ape", "colourpicker", "data_table", "dplyr", "ggsci", "miniUI", "purrr", "rstudioapi", "seqinr", "shiny", "stringr", "tidyr", "wesanderson"] }, "itp": { "name": "itp", @@ -74651,13 +75395,13 @@ "name": "itscalledsoccer", "version": "0.2.4", "sha256": "1xyfs9y60mrmmrpx5rhm2xg3ysgc75wfb62vb63rr7nlv6sfisgl", - "depends": ["clisymbols", "crayon", "data_table", "dplyr", "glue", "httpcache", "httr", "jsonlite", "magrittr", "R6", "rlang", "stringi", "tidyr"] + "depends": ["R6", "clisymbols", "crayon", "data_table", "dplyr", "glue", "httpcache", "httr", "jsonlite", "magrittr", "rlang", "stringi", "tidyr"] }, "itsdm": { "name": "itsdm", "version": "0.2.1", "sha256": "1rd55arrha2xy5d68nymz3awycpk0797d9q55ia42rq9n1gi9w9k", - "depends": ["checkmate", "dplyr", "fastshap", "ggplot2", "isotree", "mgcv", "ncdf4", "outliertree", "patchwork", "raster", "rlang", "ROCit", "sf", "stars", "stringr", "tidyselect"] + "depends": ["ROCit", "checkmate", "dplyr", "fastshap", "ggplot2", "isotree", "mgcv", "ncdf4", "outliertree", "patchwork", "raster", "rlang", "sf", "stars", "stringr", "tidyselect"] }, "itsmr": { "name": "itsmr", @@ -74693,12 +75437,12 @@ "name": "ivdoctr", "version": "1.0.1", "sha256": "0204blq5yxpwz00vf49k678ccnyih0lbglbxhm1c69hx5p4a62qn", - "depends": ["AER", "coda", "data_table", "MASS", "Rcpp", "RcppArmadillo", "rgl", "sandwich"] + "depends": ["AER", "MASS", "Rcpp", "RcppArmadillo", "coda", "data_table", "rgl", "sandwich"] }, "ivgets": { "name": "ivgets", - "version": "0.1.1", - "sha256": "19bqfasrvdqvs2fvxh7h2l16qkm3rmcsv6m83x726i1i6adqj2bq", + "version": "0.1.2", + "sha256": "1nkwg35h0g15rzdjs0hqa8sqwgj8mjllwscqyjdxrzr35ffys5gn", "depends": ["gets", "ivreg", "stringr"] }, "ivitr": { @@ -74711,7 +75455,7 @@ "name": "ivmodel", "version": "1.9.1", "sha256": "1glm4nwlzyzwbv3nbi23qslnnqf47ps7iyd3wbr1bfdln0sr2s0l", - "depends": ["Formula", "ggplot2", "Matrix", "reshape2"] + "depends": ["Formula", "Matrix", "ggplot2", "reshape2"] }, "ivmte": { "name": "ivmte", @@ -74729,7 +75473,7 @@ "name": "ivreg", "version": "0.6-3", "sha256": "1ccxs6bblknss41605vvvb473s936rvgj7ls7sd9ismxgq83ad5k", - "depends": ["car", "Formula", "lmtest", "MASS"] + "depends": ["Formula", "MASS", "car", "lmtest"] }, "ivs": { "name": "ivs", @@ -74747,7 +75491,7 @@ "name": "ivtools", "version": "2.3.0", "sha256": "1wv0r9dy893hafbbrjcjrphb8dgql71ya4zfbkl5dfp7d4ncfxl0", - "depends": ["ahaz", "data_table", "nleqslv", "numDeriv", "Rcpp", "survival"] + "depends": ["Rcpp", "ahaz", "data_table", "nleqslv", "numDeriv", "survival"] }, "ivx": { "name": "ivx", @@ -74765,7 +75509,7 @@ "name": "ixplorer", "version": "0.2.2", "sha256": "0h0kmcaj783kmnlxnzw0gvf7gg4f6lcyn6l4hz8rz216d98qzxwp", - "depends": ["dplyr", "gert", "gitear", "kableExtra", "keyring", "lubridate", "miniUI", "purrr", "RColorBrewer", "shiny", "shiny_i18n", "shinyWidgets", "stringr"] + "depends": ["RColorBrewer", "dplyr", "gert", "gitear", "kableExtra", "keyring", "lubridate", "miniUI", "purrr", "shiny", "shinyWidgets", "shiny_i18n", "stringr"] }, "izmir": { "name": "izmir", @@ -74777,7 +75521,7 @@ "name": "jSDM", "version": "0.2.6", "sha256": "1rqy6xh6qhvmfgjnjlbkq71dr6c0fdwddvs7cbvv1p5qvf12zhx9", - "depends": ["coda", "corrplot", "doParallel", "foreach", "MASS", "Rcpp", "RcppArmadillo", "RcppGSL", "stringi"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "RcppGSL", "coda", "corrplot", "doParallel", "foreach", "stringi"] }, "jScore": { "name": "jScore", @@ -74789,7 +75533,7 @@ "name": "jaatha", "version": "3.2.5", "sha256": "0npqpb6p4ap64mn5x2y424ayz1gy9s2b1ls4f4bs9l9mhr60z4jy", - "depends": ["assertthat", "R6"] + "depends": ["R6", "assertthat"] }, "jab_adverse_reactions": { "name": "jab.adverse.reactions", @@ -74801,19 +75545,19 @@ "name": "jaccard", "version": "0.1.0", "sha256": "1dmla6qc1k8iw2d7zfjqhf13gqd2lpsrj09yh47ljf994fpab936", - "depends": ["dplyr", "magrittr", "qvalue", "Rcpp"] + "depends": ["Rcpp", "dplyr", "magrittr", "qvalue"] }, "jack": { "name": "jack", - "version": "6.0.0", - "sha256": "11clvyv09kfxwwbx1kmxzvc8j6frkx45k8hzcvjigbc8wais7ffi", - "depends": ["BH", "DescTools", "gmp", "multicool", "mvp", "partitions", "qspray", "ratioOfQsprays", "Rcpp", "RcppArmadillo", "RcppCGAL", "spray", "symbolicQspray"] + "version": "6.1.0", + "sha256": "03kfvd43b3skx3x4ky3qxg80m3w1cj2vln018qq7fj7b47ddfiqy", + "depends": ["BH", "DescTools", "RationalMatrix", "Rcpp", "RcppCGAL", "gmp", "multicool", "mvp", "partitions", "qspray", "ratioOfQsprays", "spray", "symbolicQspray", "syt"] }, "jackalope": { "name": "jackalope", "version": "1.1.5", "sha256": "18k130d95k0zd7f88gbh0gnjmc41kyii82phslmrhyigrizhjq82", - "depends": ["ape", "R6", "Rcpp", "RcppArmadillo", "RcppProgress", "Rhtslib", "zlibbioc"] + "depends": ["R6", "Rcpp", "RcppArmadillo", "RcppProgress", "Rhtslib", "ape", "zlibbioc"] }, "jackknifeR": { "name": "jackknifeR", @@ -74831,13 +75575,13 @@ "name": "jackstraw", "version": "1.3.9", "sha256": "0wgqj1n4nvj0jdlm6kzg0r2c93m7ynm49azffd4qhr1wh31rwnba", - "depends": ["cluster", "ClusterR", "corpcor", "irlba", "qvalue", "rsvd"] + "depends": ["ClusterR", "cluster", "corpcor", "irlba", "qvalue", "rsvd"] }, "jacobi": { "name": "jacobi", "version": "3.1.1", "sha256": "1i2v5sgwlbihavrj46g4mkni2b8p6qb7alrnaab30c8lwblsc8g8", - "depends": ["Carlson", "Rcpp", "rgl", "Rvcg"] + "depends": ["Carlson", "Rcpp", "Rvcg", "rgl"] }, "jacpop": { "name": "jacpop", @@ -74871,15 +75615,15 @@ }, "jagshelper": { "name": "jagshelper", - "version": "0.2.3", - "sha256": "1q5y38jzxmvdicjcmck0bmai6xvpi3hzzngrsgdy5bks9mqdgnlj", - "depends": ["jagsUI", "MASS"] + "version": "0.3.1", + "sha256": "105v1clrhr17l78dyi28c21y48sbwbwzjj1irwyrlxinbpxclr2q", + "depends": ["MASS", "jagsUI"] }, "jagstargets": { "name": "jagstargets", "version": "1.2.0", "sha256": "10bx1sy5lcq1k1nliiwqjyq5hrywa97dh5zyyjdxq9rh94xhcc7p", - "depends": ["coda", "fst", "posterior", "purrr", "qs", "R2jags", "rjags", "rlang", "secretbase", "tarchetypes", "targets", "tibble", "tidyselect", "withr"] + "depends": ["R2jags", "coda", "fst", "posterior", "purrr", "qs", "rjags", "rlang", "secretbase", "tarchetypes", "targets", "tibble", "tidyselect", "withr"] }, "jalcal": { "name": "jalcal", @@ -74903,7 +75647,7 @@ "name": "janus", "version": "1.0.0", "sha256": "0dpd24qxwlnrrjyx2gffsmfbsf1schfnq9ck75k9935gmwy2ig04", - "depends": ["dplyr", "forcats", "ggplot2", "hash", "keras", "lubridate", "Metrics", "narray", "purrr", "RcppAlgos", "readr", "reticulate", "Rmpfr", "StatRank", "tensorflow", "tictoc"] + "depends": ["Metrics", "RcppAlgos", "Rmpfr", "StatRank", "dplyr", "forcats", "ggplot2", "hash", "keras", "lubridate", "narray", "purrr", "readr", "reticulate", "tensorflow", "tictoc"] }, "japanstat": { "name": "japanstat", @@ -74915,13 +75659,19 @@ "name": "jarbes", "version": "2.2.1", "sha256": "1gpm7by9wmqgr69876wqd1w3nrzmzsgchh2xlsf37jxz2m5827c0", - "depends": ["bookdown", "GGally", "ggExtra", "ggplot2", "gridExtra", "kableExtra", "MASS", "mcmcplots", "qpdf", "R2jags", "rjags", "tidyr"] + "depends": ["GGally", "MASS", "R2jags", "bookdown", "ggExtra", "ggplot2", "gridExtra", "kableExtra", "mcmcplots", "qpdf", "rjags", "tidyr"] + }, + "jcalendaR": { + "name": "jcalendaR", + "version": "0.1.0", + "sha256": "1b8khcdxz77rd7k87462vwwykr2gi5lv0lzj7nm9famid3q7gh1l", + "depends": [] }, "jcext": { "name": "jcext", "version": "0.1.1", "sha256": "02zppiyq3gy551zi1g00gam1w4y1wgzn5zi9wrcz8yw915dla0ix", - "depends": ["ggplot2", "maps", "RColorBrewer", "rworldmap", "sp", "stringr"] + "depends": ["RColorBrewer", "ggplot2", "maps", "rworldmap", "sp", "stringr"] }, "jcolors": { "name": "jcolors", @@ -74957,7 +75707,7 @@ "name": "jenga", "version": "1.3.0", "sha256": "0yq1nkaakzajjdk3w6hzikl6pwqx0546mcb1ik688b0l55vmwphc", - "depends": ["abind", "dplyr", "entropy", "fANCOVA", "fastDummies", "ggplot2", "greybox", "imputeTS", "lubridate", "modeest", "moments", "narray", "philentropy", "purrr", "readr", "Rfast", "scales", "tictoc"] + "depends": ["Rfast", "abind", "dplyr", "entropy", "fANCOVA", "fastDummies", "ggplot2", "greybox", "imputeTS", "lubridate", "modeest", "moments", "narray", "philentropy", "purrr", "readr", "scales", "tictoc"] }, "jetpack": { "name": "jetpack", @@ -74975,25 +75725,25 @@ "name": "jewel", "version": "2.0.2", "sha256": "100lj4ydw7gx93lmnckxivb65yzjwi0cn5l070ss8532wrm297r3", - "depends": ["igraph", "MASS", "Matrix", "matrixcalc", "purrr", "SMUT"] + "depends": ["MASS", "Matrix", "SMUT", "igraph", "matrixcalc", "purrr"] }, "jfa": { "name": "jfa", "version": "0.7.1", "sha256": "167n554hpmz4iqszlsjzjiphsf857hysfjkd2gx9kwv6r1crmv3k", - "depends": ["bde", "BH", "extraDistr", "ggplot2", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "truncdist"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bde", "extraDistr", "ggplot2", "rstan", "rstantools", "truncdist"] }, "jgsbook": { "name": "jgsbook", - "version": "1.0.5", - "sha256": "0d54cdvx97787vwm9pqcmfx66y0l1crz4w16khpqr2k4nqixnkqk", + "version": "1.0.7", + "sha256": "1k0jcfjxn5qf67533br3p6zj464knnakxvr563lvgvqxjv4j8sh2", "depends": ["curl", "httr", "jsonlite", "statip"] }, "jiebaR": { "name": "jiebaR", "version": "0.11", "sha256": "08v64xwr9jp4vh88x7y935khh4cmj8rwsjaxfd2c67n0445qppmd", - "depends": ["jiebaRD", "Rcpp"] + "depends": ["Rcpp", "jiebaRD"] }, "jiebaRD": { "name": "jiebaRD", @@ -75025,29 +75775,35 @@ "sha256": "0l8piz0m9iv9lbw35yx1ww0db0pv0qhbvkz4l36fwjsgnjlh8f6a", "depends": ["lme4", "rpart", "survival"] }, + "jlme": { + "name": "jlme", + "version": "0.1.0", + "sha256": "06fkxb73mv63v4yhgn66dh8dyk45n3mcrqykhy5mgdbnd3a54vjd", + "depends": ["JuliaConnectoR", "JuliaFormulae", "MASS", "generics"] + }, "jlmerclusterperm": { "name": "jlmerclusterperm", - "version": "1.1.3", - "sha256": "1vkc0hk5ln2vwxsf9pn6bpwn8dbk77s8nz6100scqa1y5kgfjhri", - "depends": ["backports", "cli", "generics", "JuliaConnectoR", "lme4"] + "version": "1.1.4", + "sha256": "16k325cpsnvd4j97r8j2i8fwwd5mabizg7dbqnwxq5j8l2qr8b9w", + "depends": ["JuliaConnectoR", "JuliaFormulae", "backports", "cli", "generics", "lme4"] }, "jmBIG": { "name": "jmBIG", "version": "0.1.2", "sha256": "05923dckm91x7al1fglglqfr0iwra73ky2dg0z67qq4f6ikcrlsd", - "depends": ["dplyr", "FastJM", "ggplot2", "JMbayes2", "joineRML", "nlme", "rstanarm", "survival"] + "depends": ["FastJM", "JMbayes2", "dplyr", "ggplot2", "joineRML", "nlme", "rstanarm", "survival"] }, "jmastats": { "name": "jmastats", - "version": "0.2.1", - "sha256": "1k82iwb8sjhha1r4vzrnncvzjjpnl8css6b2mscp26wg593q9hd3", + "version": "0.2.2", + "sha256": "0cwripcb5j3x893j6v095dzzjr64q9ibp1wj0aq4cc8a51p0gjp8", "depends": ["cli", "crayon", "dplyr", "forcats", "ggplot2", "lifecycle", "lubridate", "purrr", "rappdirs", "readr", "rlang", "rvest", "sf", "stringr", "tibble", "tidyr", "tidyselect", "units", "xml2"] }, "jmatrix": { "name": "jmatrix", - "version": "1.5", - "sha256": "1kcz2zvi044aqp9v057x686jbmirc3p2s995vrb0cym1jvw53crh", - "depends": ["memuse", "Rcpp"] + "version": "1.5.2", + "sha256": "1na1jqm9ck6qwlk09f9ab34sf0kamgcay5a7rxclz5skrxzjffci", + "depends": ["Rcpp", "memuse"] }, "jmcm": { "name": "jmcm", @@ -75059,7 +75815,7 @@ "name": "jmdem", "version": "1.0.1", "sha256": "15zrxgd5fgi4wzp4s963pnwj3vkgxs4ygqrcpncy9b6j2cxrivdc", - "depends": ["statmod", "VGAM"] + "depends": ["VGAM", "statmod"] }, "jmetrik": { "name": "jmetrik", @@ -75081,27 +75837,27 @@ }, "jmv": { "name": "jmv", - "version": "2.5.5", - "sha256": "0d98sk8c6m6zi1p8wycdmk5xh48ji04lrhmqpj5q081llv30y31m", - "depends": ["afex", "BayesFactor", "car", "dplyr", "emmeans", "GGally", "ggplot2", "ggrepel", "ggridges", "GPArotation", "jmvcore", "lavaan", "magrittr", "MASS", "multcomp", "mvnormtest", "nnet", "PMCMR", "psych", "R6", "ROCR", "vcd", "vcdExtra"] + "version": "2.5.6", + "sha256": "070bwzq9i3xznx44vlpxw41ja0ry9w08jdnyxf5i58ndshpf1jbz", + "depends": ["BayesFactor", "GGally", "GPArotation", "MASS", "PMCMR", "R6", "ROCR", "afex", "car", "dplyr", "emmeans", "ggplot2", "ggrepel", "ggridges", "jmvcore", "lavaan", "magrittr", "multcomp", "mvnormtest", "nnet", "psych", "vcd", "vcdExtra"] }, "jmvReadWrite": { "name": "jmvReadWrite", - "version": "0.4.6", - "sha256": "02db03vmj377z5nyc7j8myrcxq48wqspnjf1v1sksdz66jxh4f7k", + "version": "0.4.7", + "sha256": "11dynr6gs4jh2q5s1wqvd8vmld0c1yyylmvy5dskndj2xxvcgx48", "depends": ["jsonlite", "zip"] }, "jmvconnect": { "name": "jmvconnect", - "version": "2.3.13", - "sha256": "0b5klfn4986haw3hhy3aarf88g08s1d46b8xrpxxqnwqw8yd7l88", - "depends": ["BH", "evaluate", "httr", "jmvcore", "rappdirs", "Rcpp"] + "version": "2.5.7", + "sha256": "17zyl1cdkain0l1sl8i1ajysmhm60585w4bjrwjjafz2r0rpydxg", + "depends": ["BH", "Rcpp", "evaluate", "httr", "jmvcore", "rappdirs"] }, "jmvcore": { "name": "jmvcore", "version": "2.4.7", "sha256": "1pzcv5rkkhff73cf9kfp56d5frk5vjjj6ls1cd4bskyrm0754p3a", - "depends": ["base64enc", "jsonlite", "R6", "rlang", "stringi"] + "depends": ["R6", "base64enc", "jsonlite", "rlang", "stringi"] }, "job": { "name": "job", @@ -75113,25 +75869,25 @@ "name": "jocre", "version": "0.3.3", "sha256": "1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6", - "depends": ["boot", "KernSmooth", "plyr", "TSP"] + "depends": ["KernSmooth", "TSP", "boot", "plyr"] }, "joinXL": { "name": "joinXL", "version": "1.0.1", "sha256": "1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i", - "depends": ["data_table", "openxlsx", "R_utils", "rChoiceDialogs", "Rcpp", "readxl", "rJava", "timeDate", "timeSeries"] + "depends": ["R_utils", "Rcpp", "data_table", "openxlsx", "rChoiceDialogs", "rJava", "readxl", "timeDate", "timeSeries"] }, "joineR": { "name": "joineR", "version": "1.2.8", "sha256": "0hf83115g5m0m1wv9yji2wvyzb5j4wrzbzkspdcswk9i4hkmp4h7", - "depends": ["lattice", "MASS", "nlme", "statmod", "survival"] + "depends": ["MASS", "lattice", "nlme", "statmod", "survival"] }, "joineRML": { "name": "joineRML", "version": "0.4.6", "sha256": "07drhpyvsmmsbv4knx4ma91f773f48jf14lnpn8cdl5sslc6f4pp", - "depends": ["cobs", "doParallel", "foreach", "generics", "ggplot2", "lme4", "MASS", "Matrix", "mvtnorm", "nlme", "randtoolbox", "Rcpp", "RcppArmadillo", "survival", "tibble"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "cobs", "doParallel", "foreach", "generics", "ggplot2", "lme4", "mvtnorm", "nlme", "randtoolbox", "survival", "tibble"] }, "joinet": { "name": "joinet", @@ -75149,7 +75905,7 @@ "name": "jointCalib", "version": "0.1.0", "sha256": "0md4rmb7f3k6zy1y8s43p14wwrx2bv3j5j03sn7qh9mhpyssl8hn", - "depends": ["ebal", "laeken", "MASS", "mathjaxr", "sampling", "survey"] + "depends": ["MASS", "ebal", "laeken", "mathjaxr", "sampling", "survey"] }, "jointDiag": { "name": "jointDiag", @@ -75185,19 +75941,19 @@ "name": "jointseg", "version": "1.0.2", "sha256": "0zilkxk30w3l9mwikmsgvpy5misjggs98c3bjrjy1pfc4b0is943", - "depends": ["acnr", "DNAcopy", "matrixStats"] + "depends": ["DNAcopy", "acnr", "matrixStats"] }, "jomo": { "name": "jomo", "version": "2.7-6", "sha256": "1np2sw0kq21kdhkv227pz2rqvpxg06r3mk93ggkrz5nl45ajmyiz", - "depends": ["lme4", "MASS", "ordinal", "survival", "tibble"] + "depends": ["MASS", "lme4", "ordinal", "survival", "tibble"] }, "jordan": { "name": "jordan", - "version": "1.0-5", - "sha256": "10va924f3fjasmqahlrk0k7fmnyjfqmkcgimqpvhfk0vwgr8pv3a", - "depends": ["emulator", "mathjaxr", "Matrix", "onion"] + "version": "1.0-6", + "sha256": "1c5s12s3qbffk5rlmigmy5hhqd6ln43z5scn5vl4cc05ix64zh15", + "depends": ["Matrix", "onion", "quadform"] }, "josaplay": { "name": "josaplay", @@ -75225,8 +75981,8 @@ }, "joyn": { "name": "joyn", - "version": "0.2.0", - "sha256": "0p8s90fkjwlllhk7a60xs6pfvgbhyz5sk3rdvdp5sb4l037rb4m2", + "version": "0.2.2", + "sha256": "1pcg70znihl310aibhd2k8w8nc5960wj7g418f2xb1rx9yxvwn8g", "depends": ["cli", "collapse", "data_table", "lifecycle", "rlang"] }, "jpcity": { @@ -75267,8 +76023,8 @@ }, "jqr": { "name": "jqr", - "version": "1.3.3", - "sha256": "1w6806yx763xb0xaqh8ms20gz4h1y3c2s11lgsq3x8h6bahimn5s", + "version": "1.3.4", + "sha256": "1h7rbqjgc1hilqyzlzfsd3603hfj26cprg7cjmxw08bi6p0w4hwc", "depends": ["lazyeval", "magrittr"] }, "jquerylib": { @@ -75281,13 +76037,13 @@ "name": "jrSiCKLSNMF", "version": "1.2.1", "sha256": "1ai3maxl1gmgr9bvc813xnfz5lk9kgzm6a46p8iidjpnv5p42c4v", - "depends": ["cluster", "clValid", "data_table", "factoextra", "foreach", "ggplot2", "igraph", "irlba", "kknn", "MASS", "Matrix", "pbapply", "Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "rlang", "scran", "umap"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "clValid", "cluster", "data_table", "factoextra", "foreach", "ggplot2", "igraph", "irlba", "kknn", "pbapply", "rlang", "scran", "umap"] }, "jrc": { "name": "jrc", "version": "0.6.0", "sha256": "0zqif6csh4r5vbcw1dl12x2psb27r5lv0k5z0vv8bk3xk5r6vwlq", - "depends": ["httpuv", "jsonlite", "mime", "R_utils", "R6", "stringi", "stringr"] + "depends": ["R6", "R_utils", "httpuv", "jsonlite", "mime", "stringi", "stringr"] }, "jrich": { "name": "jrich", @@ -75323,7 +76079,7 @@ "name": "jsTreeR", "version": "2.6.0", "sha256": "1wck0wnj41qs3cjjmp4b8bnjy7l736k5xqq89al40am0ixnf86bs", - "depends": ["base64enc", "fontawesome", "htmltools", "htmlwidgets", "jquerylib", "miniUI", "R_utils", "rstudioapi", "shiny", "shinyAce"] + "depends": ["R_utils", "base64enc", "fontawesome", "htmltools", "htmlwidgets", "jquerylib", "miniUI", "rstudioapi", "shiny", "shinyAce"] }, "jshintr": { "name": "jshintr", @@ -75333,15 +76089,15 @@ }, "jskm": { "name": "jskm", - "version": "0.5.3", - "sha256": "078aij3n53q1pj5wb32bvmzncw9hhwxxp3s0lg8iqgpcyb4cgbj0", + "version": "0.5.5", + "sha256": "16a1v5vs9hdsyp5x0r237lc4vh7mdvylplb6ad2c9q09xdglrgs6", "depends": ["ggplot2", "ggpubr", "patchwork", "scales", "survey", "survival"] }, "jsmodule": { "name": "jsmodule", - "version": "1.5.5", - "sha256": "1av1c6wza8rrd7klkzhy5y7ncp3xc07bmvm32vskm7nkfglcky4k", - "depends": ["data_table", "DT", "epiDisplay", "flextable", "forestploter", "geepack", "GGally", "ggplot2", "ggpubr", "haven", "Hmisc", "jskm", "jstable", "labelled", "MatchIt", "maxstat", "officer", "pROC", "purrr", "RColorBrewer", "readr", "readxl", "rstudioapi", "rvg", "scales", "see", "shiny", "shinycustomloader", "shinyjs", "shinyWidgets", "survey", "survIDINRI", "survival", "timeROC"] + "version": "1.5.6", + "sha256": "1yyyrl6pgi4hzjcr20p2930iivi1mzyafw6cihny0lr81yv0kyh7", + "depends": ["DT", "GGally", "Hmisc", "MatchIt", "RColorBrewer", "data_table", "epiDisplay", "flextable", "forestploter", "geepack", "ggplot2", "ggpubr", "haven", "jskm", "jstable", "labelled", "maxstat", "officer", "pROC", "purrr", "readr", "readxl", "rstudioapi", "rvg", "scales", "see", "shiny", "shinyWidgets", "shinycustomloader", "shinyjs", "survIDINRI", "survey", "survival", "timeROC"] }, "json2aRgs": { "name": "json2aRgs", @@ -75359,7 +76115,7 @@ "name": "jsonNormalize", "version": "1.0.0", "sha256": "1szvi8c0r75jv7y2y1jsampb783svvx04x4rvyw8v9qkiw0qpfis", - "depends": ["rstudioapi", "V8"] + "depends": ["V8", "rstudioapi"] }, "jsonStrings": { "name": "jsonStrings", @@ -75371,13 +76127,13 @@ "name": "jsonify", "version": "1.2.2", "sha256": "0bxgyj5b1hnijq5315g050giixy4k5mjz2zdx8yil0igb5ifji9p", - "depends": ["rapidjsonr", "Rcpp"] + "depends": ["Rcpp", "rapidjsonr"] }, "jsonld": { "name": "jsonld", "version": "2.2", "sha256": "0bplz2s97wl9yp383jazykh5647iw6kbr1zanqai2s0sxp1xbwn8", - "depends": ["curl", "jsonlite", "V8"] + "depends": ["V8", "curl", "jsonlite"] }, "jsonlite": { "name": "jsonlite", @@ -75399,15 +76155,15 @@ }, "jstable": { "name": "jstable", - "version": "1.2.6", - "sha256": "1g8qfbm8fxjm48dwmwfgckdsynicbmpnj35yjy34nal98qs5andp", + "version": "1.3.0", + "sha256": "0gz2cx1qlgq2ghmlk452clhvzqf18ir3bfc81mfg1jb24l7n2129", "depends": ["coxme", "data_table", "dplyr", "geepack", "labelled", "lme4", "magrittr", "purrr", "survey", "survival", "tableone", "tibble"] }, "jstager": { "name": "jstager", - "version": "0.0.2", - "sha256": "14n4j8imka9rrnxidvsh3rax4qqbg2ccnj6pwcwgqyw897fimjkv", - "depends": ["dplyr", "httr", "openxlsx", "rvest", "tibble", "xml2"] + "version": "0.0.5", + "sha256": "0x6pwpzyls8267f0n62bm9s350wr6770vzh46cz382sri8hx8013", + "depends": ["chromote", "dplyr", "httr", "openxlsx", "rvest", "tibble", "xml2"] }, "jstor": { "name": "jstor", @@ -75425,7 +76181,7 @@ "name": "jti", "version": "0.8.4", "sha256": "0jxqv3xa9yyzizx1rhxjv65c8b253shridy57skrd5kya701n460", - "depends": ["igraph", "Rcpp", "RcppArmadillo", "sparta"] + "depends": ["Rcpp", "RcppArmadillo", "igraph", "sparta"] }, "jtools": { "name": "jtools", @@ -75461,7 +76217,7 @@ "name": "junctions", "version": "2.1.0", "sha256": "1jv8vn826ii1mvpcikg5bhm2arjgr180y0rqy0qkmn4bsm3cbnqx", - "depends": ["nloptr", "Rcpp", "RcppParallel", "tibble"] + "depends": ["Rcpp", "RcppParallel", "nloptr", "tibble"] }, "just_install": { "name": "just.install", @@ -75473,7 +76229,7 @@ "name": "justifier", "version": "0.2.6", "sha256": "0zpmxcgaa0y5qpk82m4jmkljvfrsv8fm8dmzxhvblicyl28d33bs", - "depends": ["data_tree", "DiagrammeR", "DiagrammeRsvg", "purrr", "yaml", "yum"] + "depends": ["DiagrammeR", "DiagrammeRsvg", "data_tree", "purrr", "yaml", "yum"] }, "jvcoords": { "name": "jvcoords", @@ -75497,7 +76253,7 @@ "name": "kDGLM", "version": "1.2.0", "sha256": "10is3f3gcax317gxkbvsv35385q9cjmxb14dfxxmq7y7aw4p6iqb", - "depends": ["extraDistr", "generics", "Rdpack", "Rfast"] + "depends": ["Rdpack", "Rfast", "extraDistr", "generics"] }, "kNNvs": { "name": "kNNvs", @@ -75533,12 +76289,12 @@ "name": "kaigiroku", "version": "0.5", "sha256": "11f9lxk4kx3d65i2xnbpw1ixcc9qgahqdirl42aiyph4hzah1fhh", - "depends": ["dplyr", "jsonlite", "R_utils", "tidyr"] + "depends": ["R_utils", "dplyr", "jsonlite", "tidyr"] }, "kairos": { "name": "kairos", - "version": "2.1.0", - "sha256": "1n59sicqffj7gn3l2726w0dnfxx4j8h16jkjv5lp4h3acpdnx6c9", + "version": "2.1.1", + "sha256": "07vlw4vyrkx1j12z8ik7fl9xqy3zmvx6nhcv8vwmzjbzhr3bv2j6", "depends": ["aion", "arkhe", "dimensio", "extraDistr"] }, "kalmanfilter": { @@ -75551,25 +76307,25 @@ "name": "kamila", "version": "0.1.2", "sha256": "01rwalv2qigxl3j3jyhrdbxlarwf0xdc8xa6c42sgcl6qpna5vn7", - "depends": ["abind", "gtools", "KernSmooth", "plyr", "Rcpp"] + "depends": ["KernSmooth", "Rcpp", "abind", "gtools", "plyr"] }, "kangar00": { "name": "kangar00", "version": "1.4.2", "sha256": "14i4i7m5y02hybllkawwxlc4g0j4lr1pybqip6zpqd612j5q4mfm", - "depends": ["bigmemory", "CompQuadForm", "data_table", "igraph", "lattice", "sqldf"] + "depends": ["CompQuadForm", "bigmemory", "data_table", "igraph", "lattice", "sqldf"] }, "kanjistat": { "name": "kanjistat", "version": "0.14.1", "sha256": "1d6r923xczhr75dmb3vq2pr3l9maigk8zvvk4r5x0jlh8sgrwdr0", - "depends": ["crayon", "dendextend", "gsubfn", "lifecycle", "Matrix", "png", "purrr", "RANN", "Rcpp", "rlang", "ROI", "showtext", "stringi", "stringr", "sysfonts", "transport", "xml2"] + "depends": ["Matrix", "RANN", "ROI", "Rcpp", "crayon", "dendextend", "gsubfn", "lifecycle", "png", "purrr", "rlang", "showtext", "stringi", "stringr", "sysfonts", "transport", "xml2"] }, "kantorovich": { "name": "kantorovich", "version": "3.2.0", "sha256": "1fvf2j518h6mfjrkh7c9swpi8adfd6a5pr7b6pc6al16jbvbw3rf", - "depends": ["CVXR", "gmp", "lpSolve", "ompr", "ompr_roi", "rcdd", "Rglpk", "ROI_plugin_glpk", "slam"] + "depends": ["CVXR", "ROI_plugin_glpk", "Rglpk", "gmp", "lpSolve", "ompr", "ompr_roi", "rcdd", "slam"] }, "kaos": { "name": "kaos", @@ -75617,7 +76373,7 @@ "name": "karyotapR", "version": "1.0.1", "sha256": "01mxsv4ky6d16xjkvi6lc2cfvrdll6whyizxf500m8ds9bdlmqha", - "depends": ["circlize", "cli", "ComplexHeatmap", "dbscan", "dplyr", "fitdistrplus", "GenomicRanges", "ggplot2", "gtools", "IRanges", "magrittr", "purrr", "rhdf5", "rlang", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "tibble", "tidyr", "umap", "viridisLite"] + "depends": ["ComplexHeatmap", "GenomicRanges", "IRanges", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "circlize", "cli", "dbscan", "dplyr", "fitdistrplus", "ggplot2", "gtools", "magrittr", "purrr", "rhdf5", "rlang", "tibble", "tidyr", "umap", "viridisLite"] }, "katex": { "name": "katex", @@ -75627,8 +76383,8 @@ }, "kayadata": { "name": "kayadata", - "version": "1.3.0", - "sha256": "1fq8yaiis38avmnklq2g17sz1aphplraqgw40q5zfs1kdvhr39gp", + "version": "1.4.0", + "sha256": "14fn7ryrssj2c83w23hqm8ai8d5f4lf5raqyvj4qij514jfxrhzq", "depends": ["dplyr", "forcats", "ggplot2", "magrittr", "purrr", "scales", "stringr", "tidyr"] }, "kazaam": { @@ -75647,31 +76403,31 @@ "name": "kcpRS", "version": "1.1.1", "sha256": "0drqw521bi2fnlapjd7hhir6vcy2aqz8jj35qdygnjkj1p3701c7", - "depends": ["doParallel", "foreach", "RColorBrewer", "Rcpp", "roll"] + "depends": ["RColorBrewer", "Rcpp", "doParallel", "foreach", "roll"] }, "kde1d": { "name": "kde1d", "version": "1.0.7", "sha256": "1z6g54qhiry04hx39akz1ll78rw49w7gwkcbjagxyrfq8gswa2yn", - "depends": ["BH", "randtoolbox", "Rcpp", "RcppEigen"] + "depends": ["BH", "Rcpp", "RcppEigen", "randtoolbox"] }, "kdecopula": { "name": "kdecopula", "version": "0.9.2", "sha256": "0g5c12wm3byd4chd8i9mxv599gsf4ip4qghx83j3mmhsmn05zf4y", - "depends": ["lattice", "locfit", "qrng", "quadprog", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "lattice", "locfit", "qrng", "quadprog"] }, "kdensity": { "name": "kdensity", "version": "1.1.0", "sha256": "07d1p3ysdm66a9sf0gih5xjb3wfab44c3sr8aaraz22s2a9q9b55", - "depends": ["assertthat", "EQL", "univariateML"] + "depends": ["EQL", "assertthat", "univariateML"] }, "kdevine": { "name": "kdevine", "version": "0.4.5", "sha256": "0d157kl8x9jq4h8h0r8iia25wwdw1syc4f1iqp5mgn3l4kgark9s", - "depends": ["cctools", "doParallel", "foreach", "kdecopula", "KernSmooth", "MASS", "qrng", "Rcpp", "VineCopula"] + "depends": ["KernSmooth", "MASS", "Rcpp", "VineCopula", "cctools", "doParallel", "foreach", "kdecopula", "qrng"] }, "kdist": { "name": "kdist", @@ -75689,7 +76445,7 @@ "name": "kdry", "version": "0.0.2", "sha256": "0svmm8ycl3gk0z9w2rps4hdqyrc6k3nl024fbmq3dwa3vlv56rs0", - "depends": ["data_table", "doParallel", "foreach", "Hmisc", "magrittr"] + "depends": ["Hmisc", "data_table", "doParallel", "foreach", "magrittr"] }, "kedd": { "name": "kedd", @@ -75749,25 +76505,25 @@ "name": "keras", "version": "2.15.0", "sha256": "0xahkgww3dzp8vjz0456sn6ihz0w0q0dz1gnmx07r2vx81isirvc", - "depends": ["generics", "glue", "magrittr", "R6", "reticulate", "rlang", "tensorflow", "tfruns", "zeallot"] + "depends": ["R6", "generics", "glue", "magrittr", "reticulate", "rlang", "tensorflow", "tfruns", "zeallot"] }, "keras3": { "name": "keras3", - "version": "1.0.0", - "sha256": "173l57wgnbjwmb8cgsmifk22dwiib50mkx0k68v080iavh4x44g6", + "version": "1.1.0", + "sha256": "0dssv7n34lc934z16kpcjiyf30qgnmn5sqyyhbqxbxs23g2mvmjl", "depends": ["cli", "fastmap", "generics", "glue", "magrittr", "reticulate", "rlang", "tensorflow", "tfruns", "zeallot"] }, "kerastuneR": { "name": "kerastuneR", "version": "0.1.0.7", "sha256": "05hyhgbc2533az1yrjj8v8idky0xwn20mxd92dna0is6pddf75hv", - "depends": ["crayon", "data_table", "dplyr", "echarts4r", "magick", "plotly", "reticulate", "rjson", "RJSONIO", "rstudioapi", "tensorflow", "tidyjson"] + "depends": ["RJSONIO", "crayon", "data_table", "dplyr", "echarts4r", "magick", "plotly", "reticulate", "rjson", "rstudioapi", "tensorflow", "tidyjson"] }, "kergp": { "name": "kergp", "version": "0.5.7", "sha256": "0cf6acz09cbzhnl26x2z0s674mvikl9lq31mdl2s10y6ah00cpsk", - "depends": ["doFuture", "doParallel", "lattice", "MASS", "nloptr", "numDeriv", "Rcpp", "testthat"] + "depends": ["MASS", "Rcpp", "doFuture", "doParallel", "lattice", "nloptr", "numDeriv", "testthat"] }, "kerndwd": { "name": "kerndwd", @@ -75785,31 +76541,31 @@ "name": "kernelboot", "version": "0.1.10", "sha256": "1fv00hbm4l5dxcw8hq2wlfxng49bc8k608ny70g3fy0grkh7r8vy", - "depends": ["future", "future_apply", "parallelly", "Rcpp"] + "depends": ["Rcpp", "future", "future_apply", "parallelly"] }, "kernelshap": { "name": "kernelshap", - "version": "0.5.0", - "sha256": "0wxv9b0h5kzikxglmhcirjpa0dv488ibdxd7n1x5ii6wz2bpzn7i", - "depends": ["foreach"] + "version": "0.7.0", + "sha256": "0p0zi0l3b7axcp3r34arwbpbbj8bibgryza7g5f45ngm77nlbc5f", + "depends": ["MASS", "foreach"] }, "kernhaz": { "name": "kernhaz", "version": "0.1.0", "sha256": "1cxwjnfyhxfjdbhs21airycs704jic21pdpsbxsx37wkl11cxpai", - "depends": ["doParallel", "foreach", "GA", "rgl"] + "depends": ["GA", "doParallel", "foreach", "rgl"] }, "kernlab": { "name": "kernlab", - "version": "0.9-32", - "sha256": "1p3gbn9qgc6yqx9irkl8c23khvkx77jl96hk9hn4vsrx6i7g6kk5", + "version": "0.9-33", + "sha256": "0q9hvnams1cjjrx7hny0sjszqqg837pgn642nsdwhqipdmypih3h", "depends": [] }, "kernplus": { "name": "kernplus", "version": "0.1.2", "sha256": "0z5zpj89nw7cdphg6frmjwqjxsl6g95xsa8zgsxmw2q75wwj1saz", - "depends": ["circular", "KernSmooth", "mixtools"] + "depends": ["KernSmooth", "circular", "mixtools"] }, "kernscr": { "name": "kernscr", @@ -75821,13 +76577,13 @@ "name": "kesernetwork", "version": "0.1.0", "sha256": "0q42zry3qgg38aas0cxy7lwpj9mj45crcbs353d1d1is0w1avh09", - "depends": ["config", "data_table", "dplyr", "DT", "ggplot2", "golem", "htmltools", "plotly", "reactable", "rintrojs", "rlang", "shiny", "shinyBS", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyhelper", "shinyWidgets", "stringr", "visNetwork", "yaml"] + "depends": ["DT", "config", "data_table", "dplyr", "ggplot2", "golem", "htmltools", "plotly", "reactable", "rintrojs", "rlang", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyhelper", "stringr", "visNetwork", "yaml"] }, "keyATM": { "name": "keyATM", "version": "0.5.2", "sha256": "1xd5ps0m6ymbdia89n2lr03pjhxhwsjwd648xpq42wkvir8an1nv", - "depends": ["cli", "dplyr", "fastmap", "fs", "future_apply", "ggplot2", "ggrepel", "magrittr", "MASS", "Matrix", "matrixNormal", "pgdraw", "purrr", "quanteda", "Rcpp", "RcppEigen", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppEigen", "cli", "dplyr", "fastmap", "fs", "future_apply", "ggplot2", "ggrepel", "magrittr", "matrixNormal", "pgdraw", "purrr", "quanteda", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] }, "keyToEnglish": { "name": "keyToEnglish", @@ -75863,7 +76619,7 @@ "name": "keyring", "version": "1.3.2", "sha256": "0mps6q7yayx5l78vlq567pndlsjk71izd65znz3lj4dfbh0qq046", - "depends": ["askpass", "assertthat", "filelock", "openssl", "R6", "rappdirs", "sodium", "yaml"] + "depends": ["R6", "askpass", "assertthat", "filelock", "openssl", "rappdirs", "sodium", "yaml"] }, "keyringr": { "name": "keyringr", @@ -75881,13 +76637,13 @@ "name": "kfa", "version": "0.2.2", "sha256": "0niw8b8f56cb8ppfl40mh925a5yrhg89aiac7qynh0ni42ywlw5g", - "depends": ["caret", "doParallel", "flextable", "foreach", "GPArotation", "knitr", "lavaan", "officer", "rmarkdown", "semTools", "simstandard"] + "depends": ["GPArotation", "caret", "doParallel", "flextable", "foreach", "knitr", "lavaan", "officer", "rmarkdown", "semTools", "simstandard"] }, "kfda": { "name": "kfda", "version": "1.0.0", "sha256": "0861hzry55gj8ykdd8cwil1wb7234pkmipp4v1749fpmzggq1xgi", - "depends": ["kernlab", "MASS"] + "depends": ["MASS", "kernlab"] }, "kfigr": { "name": "kfigr", @@ -75933,21 +76689,21 @@ }, "khisr": { "name": "khisr", - "version": "1.0.4", - "sha256": "00myg7anp5c85bnxamwp59q0f2rgj9fqmsnzcj3ijbrqs1fdz1s3", + "version": "1.0.5", + "sha256": "00l4iabxysj1g3fwxvnbi96gafyw6szj4s95kd845rk19198pyjx", "depends": ["cli", "curl", "dplyr", "httr2", "janitor", "jsonlite", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tidyr", "withr"] }, "khroma": { "name": "khroma", - "version": "1.12.0", - "sha256": "1w3rd98m3qk21p8zh3b13x9jbms5zd51il917qxdnxcyc4166n5s", + "version": "1.13.0", + "sha256": "0h84ds9cihd0kacrziq1j562wqcdx06ib6m7a4b786c3ck696l69", "depends": [] }, "kibior": { "name": "kibior", "version": "0.1.1", "sha256": "1acrdlqbklhhd69i1gija8r3nsdgcnfvk5ngz7b2ndy2f58w5ynf", - "depends": ["Biostrings", "data_table", "dplyr", "elastic", "jsonlite", "magrittr", "purrr", "R6", "rio", "Rsamtools", "rtracklayer", "stringr", "tibble", "tidyr"] + "depends": ["Biostrings", "R6", "Rsamtools", "data_table", "dplyr", "elastic", "jsonlite", "magrittr", "purrr", "rio", "rtracklayer", "stringr", "tibble", "tidyr"] }, "kidney_epi": { "name": "kidney.epi", @@ -75959,7 +76715,7 @@ "name": "kidsides", "version": "0.5.0", "sha256": "0iw6mr5yqgj4sn3bvirzcdzzxdxpkyr2ci4flzyjb60p0gfwlr7b", - "depends": ["DBI", "R_utils", "RSQLite"] + "depends": ["DBI", "RSQLite", "R_utils"] }, "kim": { "name": "kim", @@ -75989,7 +76745,7 @@ "name": "kindisperse", "version": "0.10.2", "sha256": "0f2i2j1mwk6bwsc42xkkf18nyffp1983bbarwvscjj7saibhfpyj", - "depends": ["dplyr", "fitdistrplus", "ggplot2", "ggrepel", "here", "LaplacesDemon", "magrittr", "plotly", "readr", "rlang", "shiny", "shinythemes", "stringr", "tibble", "tidyselect"] + "depends": ["LaplacesDemon", "dplyr", "fitdistrplus", "ggplot2", "ggrepel", "here", "magrittr", "plotly", "readr", "rlang", "shiny", "shinythemes", "stringr", "tibble", "tidyselect"] }, "kinematics": { "name": "kinematics", @@ -76001,7 +76757,7 @@ "name": "kinship2", "version": "1.9.6.1", "sha256": "0bggc78b3xyz6vczbbqhibn6zxgsw122nzymsndk5nd19yb76nv9", - "depends": ["knitr", "Matrix", "quadprog"] + "depends": ["Matrix", "knitr", "quadprog"] }, "kirby21_base": { "name": "kirby21.base", @@ -76029,9 +76785,9 @@ }, "kissmig": { "name": "kissmig", - "version": "1.0-4", - "sha256": "0qm9psbi42xv69y2095j6nk51w15x6gl71qjhmfk9jq0r9llfbax", - "depends": ["raster", "Rcpp"] + "version": "1.0-5", + "sha256": "0q2kn394kzziywb1a0h1s0845q8b83fqv4s5qk1vx03kppd93smv", + "depends": ["Rcpp", "raster"] }, "kit": { "name": "kit", @@ -76055,24 +76811,24 @@ "name": "kknn", "version": "1.3.1", "sha256": "1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112", - "depends": ["igraph", "Matrix"] + "depends": ["Matrix", "igraph"] }, "kko": { "name": "kko", "version": "1.0.1", "sha256": "08mgi7j1kirfnjsj3xi2wgr32cnqb88vxs15gfm6f1gq853xvhch", - "depends": ["doParallel", "ExtDist", "foreach", "grpreg", "knockoff"] + "depends": ["ExtDist", "doParallel", "foreach", "grpreg", "knockoff"] }, "klaR": { "name": "klaR", "version": "1.7-3", "sha256": "1rg3p3y984s7k7y14agbh3kxh21rrvan3yzpvfimpnvw04f08v6k", - "depends": ["combinat", "MASS", "questionr"] + "depends": ["MASS", "combinat", "questionr"] }, "klassR": { "name": "klassR", - "version": "0.2.3", - "sha256": "0qq290c2n8diy3sgldw64bvsqsddfqpkb2cmqgdn9m6a0m3cg6s0", + "version": "0.2.4", + "sha256": "1n0nwg5r6cqksps621ff40dy447mbaqvd3zfjlhnlkywjx7iay60", "depends": ["httr", "jsonlite", "tm"] }, "klausuR": { @@ -76103,19 +76859,19 @@ "name": "klic", "version": "1.0.4", "sha256": "1ggsdq8xcg6hi12rq356myhngx3j475gpwlvpynm1581r4z0lkbk", - "depends": ["cluster", "coca", "Matrix", "pheatmap", "RColorBrewer"] + "depends": ["Matrix", "RColorBrewer", "cluster", "coca", "pheatmap"] }, "klovan": { "name": "klovan", "version": "0.1.0", "sha256": "0fd1p6dhvaa00h8ij3bj1brqbc21yqni3bfg265yqf7paqbmxnkv", - "depends": ["dplyr", "fields", "GGally", "ggforce", "ggplot2", "ggrepel", "gstat", "magrittr", "MASS", "metR", "pracma", "sp", "tibble", "tidyselect"] + "depends": ["GGally", "MASS", "dplyr", "fields", "ggforce", "ggplot2", "ggrepel", "gstat", "magrittr", "metR", "pracma", "sp", "tibble", "tidyselect"] }, "klsh": { "name": "klsh", "version": "0.1.0", "sha256": "1r354fd5da6mp7v3048ii09hnghhfwdg6pvmx2ib0cr88ql431sy", - "depends": ["blink", "plyr", "Rcpp", "SnowballC", "stringi"] + "depends": ["Rcpp", "SnowballC", "blink", "plyr", "stringi"] }, "klustR": { "name": "klustR", @@ -76133,13 +76889,19 @@ "name": "kmBlock", "version": "0.1.2", "sha256": "07y1gadn5givrx4ww9vzgcqdkchgd1ndjq65v6ssrbcxsx1lbgxl", - "depends": ["blockmodeling", "doParallel", "doRNG", "foreach", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "blockmodeling", "doParallel", "doRNG", "foreach"] }, "kmc": { "name": "kmc", "version": "0.4-2", "sha256": "0rnrwqsmxcmf4sjd9p2xz7w12lv58wmy2p349s0x4b34b5arf75d", - "depends": ["emplik", "Rcpp", "rootSolve"] + "depends": ["Rcpp", "emplik", "rootSolve"] + }, + "kmeRs": { + "name": "kmeRs", + "version": "2.1.0", + "sha256": "0wybkzf3l5adgchdxklipkmd063x5nsdqrnhjz0kghc27v7h5zdg", + "depends": ["BiocGenerics", "Biostrings", "pwalign"] }, "kmed": { "name": "kmed", @@ -76151,7 +76913,7 @@ "name": "kmer", "version": "1.1.2", "sha256": "0jimn9r0abglwxdl1zqz0lxa99cmj6haydkxjzqfbpx9by80wnww", - "depends": ["openssl", "phylogram", "Rcpp"] + "depends": ["Rcpp", "openssl", "phylogram"] }, "kmi": { "name": "kmi", @@ -76187,12 +76949,12 @@ "name": "knitcitations", "version": "1.0.12", "sha256": "1c7pl8jh61pv0brqanmyfy6s0ipxn312b2hjypcsjaph6b8mhj2q", - "depends": ["digest", "httr", "RefManageR"] + "depends": ["RefManageR", "digest", "httr"] }, "knitr": { "name": "knitr", - "version": "1.47", - "sha256": "1kx6g8ddbigwx3bmq771gwi3din3fxjn59l801904kjaz6dq9pgs", + "version": "1.48", + "sha256": "15zipywk2ayrmy0p7q4d18512c2cgr9kk1lmc7gyi8bxv8k5j6sh", "depends": ["evaluate", "highr", "xfun", "yaml"] }, "knitrBootstrap": { @@ -76203,9 +76965,9 @@ }, "knitrProgressBar": { "name": "knitrProgressBar", - "version": "1.1.0", - "sha256": "18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v", - "depends": ["R_oo", "R6"] + "version": "1.1.1", + "sha256": "09jw75m39vxkwwy05if3z280kww3qzyw5d1jplwy76dxgsf3cmz1", + "depends": ["R6", "R_oo"] }, "knitrdata": { "name": "knitrdata", @@ -76217,7 +76979,7 @@ "name": "knitxl", "version": "0.1.0", "sha256": "1l0qq9mqfwkxkkms8xrmf7wzrgg27syrndng7vrrymda67pcxnl4", - "depends": ["commonmark", "glue", "knitr", "magrittr", "openxlsx", "purrr", "R6", "readbitmap", "readr", "stringr", "xml2", "yaml"] + "depends": ["R6", "commonmark", "glue", "knitr", "magrittr", "openxlsx", "purrr", "readbitmap", "readr", "stringr", "xml2", "yaml"] }, "knn_covertree": { "name": "knn.covertree", @@ -76247,7 +77009,7 @@ "name": "knockoff", "version": "0.3.6", "sha256": "1fj6n39i8wfkc16pmkl8jli81nny8sjjfdgklys4mbcavcmlrv5g", - "depends": ["corpcor", "glmnet", "gtools", "Matrix", "Rdsdp", "RSpectra"] + "depends": ["Matrix", "RSpectra", "Rdsdp", "corpcor", "glmnet", "gtools"] }, "knotR": { "name": "knotR", @@ -76265,7 +77027,7 @@ "name": "koRpus", "version": "0.13-8", "sha256": "0r9a2fzi3w53kixcjzbij8qmmkjl2p53dazys34s0czb5qrlm6hf", - "depends": ["data_table", "Matrix", "sylly"] + "depends": ["Matrix", "data_table", "sylly"] }, "koRpus_lang_en": { "name": "koRpus.lang.en", @@ -76321,11 +77083,17 @@ "sha256": "0nxrv1a48smgp36zcny38yfcz5dkx1dic4zicqkpvm93vf7jqn5i", "depends": ["data_table", "httr", "jsonlite", "tibble"] }, + "kpcaIG": { + "name": "kpcaIG", + "version": "1.0", + "sha256": "1jnlldr721c2an8npv1w6q4sk6fkamff8a5c3p9kcb575wrk4kqz", + "depends": ["WallomicsData", "ggplot2", "kernlab", "progress", "rgl", "viridis"] + }, "kpcalg": { "name": "kpcalg", "version": "1.0.1", "sha256": "1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52", - "depends": ["energy", "graph", "kernlab", "mgcv", "pcalg", "RSpectra"] + "depends": ["RSpectra", "energy", "graph", "kernlab", "mgcv", "pcalg"] }, "kpeaks": { "name": "kpeaks", @@ -76355,7 +77123,7 @@ "name": "krige", "version": "0.6.2", "sha256": "03xqj8aqlxxxpxadrl64rxxz79k062bx953z958wg3adjip776q4", - "depends": ["coda", "Rcpp"] + "depends": ["Rcpp", "coda"] }, "kriging": { "name": "kriging", @@ -76385,7 +77153,7 @@ "name": "ks", "version": "1.14.2", "sha256": "1jrzh1syq6jdqpp5xmb25hqsk07bpbn6caqhp9mw5zpsdi3k14gi", - "depends": ["FNN", "kernlab", "KernSmooth", "Matrix", "mclust", "mgcv", "multicool", "mvtnorm", "pracma"] + "depends": ["FNN", "KernSmooth", "Matrix", "kernlab", "mclust", "mgcv", "multicool", "mvtnorm", "pracma"] }, "ksNN": { "name": "ksNN", @@ -76415,7 +77183,7 @@ "name": "kssa", "version": "0.0.1", "sha256": "1vrd7zlwigg7ipfq2pjnndp5mwkc0yglvrdiirv3kqm5lq0f14qa", - "depends": ["dplyr", "forecast", "ggplot2", "imputeTS", "magrittr", "Metrics", "missMethods", "rlang", "zoo"] + "depends": ["Metrics", "dplyr", "forecast", "ggplot2", "imputeTS", "magrittr", "missMethods", "rlang", "zoo"] }, "kst": { "name": "kst", @@ -76427,7 +77195,7 @@ "name": "kstIO", "version": "0.4-0", "sha256": "1qv4mg9hi62imk6xsldqprm6aca33qkh13jjihmvddaam7xxcm1z", - "depends": ["kstMatrix", "MASS", "pks", "relations", "sets", "stringr"] + "depends": ["MASS", "kstMatrix", "pks", "relations", "sets", "stringr"] }, "kstMatrix": { "name": "kstMatrix", @@ -76463,7 +77231,7 @@ "name": "kutils", "version": "1.73", "sha256": "0xqg1s48afpn2w0mlqfwz3sj1gdjf05cpxq4z9r01k1476lvh6c9", - "depends": ["foreign", "openxlsx", "plyr", "RUnit", "xtable"] + "depends": ["RUnit", "foreign", "openxlsx", "plyr", "xtable"] }, "kvh": { "name": "kvh", @@ -76473,8 +77241,8 @@ }, "kyotil": { "name": "kyotil", - "version": "2024.5-8", - "sha256": "1jcnk7bx12hjb8ycm1v93bsksgmcwb6m8kn7l4ipc00qwkzhs6r2", + "version": "2024.7-31", + "sha256": "0m0ivjf8masizgljq9l913r0qakwdc38p146nw2p8d4kzzkisx2k", "depends": [] }, "kza": { @@ -76511,7 +77279,7 @@ "name": "l1spectral", "version": "0.99.6", "sha256": "19q30g67pf2gx2h6s3il87n910f011lih3lh9321pkh4idl4awnb", - "depends": ["aricode", "caret", "cvTools", "dplyr", "ggplot2", "glmnet", "igraph", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "aricode", "caret", "cvTools", "dplyr", "ggplot2", "glmnet", "igraph"] }, "l2boost": { "name": "l2boost", @@ -76535,7 +77303,7 @@ "name": "labdsv", "version": "2.1-0", "sha256": "1lawc8fm766p7z6kk0c3lda71i8lywg30znzyfkrx94sbr8r5nlr", - "depends": ["cluster", "MASS", "mgcv", "Rtsne"] + "depends": ["MASS", "Rtsne", "cluster", "mgcv"] }, "label_switching": { "name": "label.switching", @@ -76575,8 +77343,8 @@ }, "labelr": { "name": "labelr", - "version": "0.1.6", - "sha256": "1nf1gr876zr0l9nxisvy1h7k0f3a9f49g257lh967n9iin6vrj4q", + "version": "0.1.7", + "sha256": "0gp0y2jqdjyw3z6zxwrqk690vvgysgrkif4vjpia0szwbh8lw9x0", "depends": [] }, "lablaster": { @@ -76643,13 +77411,13 @@ "name": "lacunr", "version": "1.0.1", "sha256": "132k5vis9k3snhfy3zl0py039pm1b12k70qijdkq11knhlng7b1b", - "depends": ["abind", "data_table", "ggplot2", "Rcpp", "RcppArmadillo", "RcppThread", "rlang"] + "depends": ["Rcpp", "RcppArmadillo", "RcppThread", "abind", "data_table", "ggplot2", "rlang"] }, "laeken": { "name": "laeken", "version": "0.5.3", "sha256": "02z8jyya6xv0pyfqaalbry174fw44h13s7p1jk5b4h9a9x4myjb0", - "depends": ["boot", "MASS"] + "depends": ["MASS", "boot"] }, "lagged": { "name": "lagged", @@ -76679,12 +77447,12 @@ "name": "lakhesis", "version": "0.0.1", "sha256": "0jbzzpvqid3samq90m3d8p0ac2cfh1qaqiglr19xpzlif63sl34y", - "depends": ["bslib", "ca", "ggplot2", "Rdpack", "readr", "shiny", "shinydashboard"] + "depends": ["Rdpack", "bslib", "ca", "ggplot2", "readr", "shiny", "shinydashboard"] }, "lamW": { "name": "lamW", - "version": "2.2.3", - "sha256": "0jq3xq2ll4lpj8f5aqwazqlb978nzyk7hln4iwlzrlkkcqc35qm1", + "version": "2.2.4", + "sha256": "1h1plx9d6kzgdv20sx7pjfkz54jw11pkqrspgw4hh1kgk6hpbgsz", "depends": ["Rcpp", "RcppParallel"] }, "lambda_r": { @@ -76709,7 +77477,7 @@ "name": "lamle", "version": "0.3.1", "sha256": "08fsylhqpk8hqm9kbqc4vlhmpaddr9cpgjjxvlfc9xqhnyhg7p3d", - "depends": ["fastGHQuad", "mvtnorm", "numDeriv", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "fastGHQuad", "mvtnorm", "numDeriv"] }, "lamme": { "name": "lamme", @@ -76745,7 +77513,7 @@ "name": "landmulti", "version": "0.5.0", "sha256": "1wqkrx4pxi1zzllm802y6wfhfpam7g3nbzgwj71ragk2psxa351a", - "depends": ["emdbook", "landpred", "NMOF", "snow", "survival"] + "depends": ["NMOF", "emdbook", "landpred", "snow", "survival"] }, "landpred": { "name": "landpred", @@ -76763,31 +77531,31 @@ "name": "landscapeR", "version": "1.2", "sha256": "1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy", - "depends": ["raster", "Rcpp"] + "depends": ["Rcpp", "raster"] }, "landscapemetrics": { "name": "landscapemetrics", - "version": "2.1.2", - "sha256": "0inzgd76wm63d35hwxz6if0y5glyl7v3zyl26z0c3sxxpnpq14bm", - "depends": ["cli", "ggplot2", "Rcpp", "RcppArmadillo", "terra", "tibble"] + "version": "2.1.4", + "sha256": "0yq04y8gchwssmaj0xg02jxixx9q7ffdfl91l31q6hkibh4lz8pl", + "depends": ["Rcpp", "RcppArmadillo", "cli", "ggplot2", "terra", "tibble"] }, "landscapetools": { "name": "landscapetools", "version": "0.5.0", "sha256": "11zp6r414nkj8vhsbryzhkxmpal2bva8msaxf1v69xax70ilxyf1", - "depends": ["ggplot2", "raster", "Rcpp", "tibble"] + "depends": ["Rcpp", "ggplot2", "raster", "tibble"] }, "landsepi": { "name": "landsepi", "version": "1.4.0", "sha256": "0hd4cvik5bfw2yjls4wxnzxq7ylcg69yz34ncj7c3zrg4agka1nm", - "depends": ["DBI", "deSolve", "doParallel", "fields", "foreach", "Matrix", "mvtnorm", "Rcpp", "RSQLite", "sf", "sp", "splancs", "testthat"] + "depends": ["DBI", "Matrix", "RSQLite", "Rcpp", "deSolve", "doParallel", "fields", "foreach", "mvtnorm", "sf", "sp", "splancs", "testthat"] }, "langevitour": { "name": "langevitour", "version": "0.7", "sha256": "1q1g2rz5z7wpk5fb0d2rcxw8hi8frs9360n2z6zv8d376r9i1lfr", - "depends": ["assertthat", "crosstalk", "htmlwidgets", "RANN"] + "depends": ["RANN", "assertthat", "crosstalk", "htmlwidgets"] }, "languageR": { "name": "languageR", @@ -76805,7 +77573,7 @@ "name": "languageserver", "version": "0.3.16", "sha256": "1rbjnw30fc58rk2qrhff3wx7in7spllr4kj8mfsfwvl43id54yb0", - "depends": ["callr", "collections", "fs", "jsonlite", "lintr", "R6", "roxygen2", "stringi", "styler", "xml2", "xmlparsedata"] + "depends": ["R6", "callr", "collections", "fs", "jsonlite", "lintr", "roxygen2", "stringi", "styler", "xml2", "xmlparsedata"] }, "languageserversetup": { "name": "languageserversetup", @@ -76817,7 +77585,7 @@ "name": "lans2r", "version": "1.2.0", "sha256": "0hk7rklkic4frp5w6k9kn5xi8hf3s87bgbjm58ca79sh3iyl0cnv", - "depends": ["dplyr", "ggplot2", "R_matlab", "reshape2", "rlang", "tidyr"] + "depends": ["R_matlab", "dplyr", "ggplot2", "reshape2", "rlang", "tidyr"] }, "lar": { "name": "lar", @@ -76829,13 +77597,13 @@ "name": "lares", "version": "5.2.8", "sha256": "1859nwb7ymdamk7akwrmq011var821cww0bg6k89d5sjhs529jd7", - "depends": ["dplyr", "ggplot2", "httr", "jsonlite", "lubridate", "openxlsx", "patchwork", "pROC", "rlang", "rpart", "rpart_plot", "rvest", "stringr", "tidyr", "yaml"] + "depends": ["dplyr", "ggplot2", "httr", "jsonlite", "lubridate", "openxlsx", "pROC", "patchwork", "rlang", "rpart", "rpart_plot", "rvest", "stringr", "tidyr", "yaml"] }, "lareshiny": { "name": "lareshiny", "version": "0.0.3", "sha256": "00pmlq3gz06p1g6xzx5y6n7ybljrhhmjnhi25chv3ii13r3nlfvf", - "depends": ["dplyr", "DT", "htmltools", "miniUI", "shiny", "shinydashboard", "shinyWidgets"] + "depends": ["DT", "dplyr", "htmltools", "miniUI", "shiny", "shinyWidgets", "shinydashboard"] }, "lars": { "name": "lars", @@ -76857,8 +77625,8 @@ }, "latcontrol": { "name": "latcontrol", - "version": "0.1.0", - "sha256": "0y5amp5w8faw69lsi55akqfzgr8bwacvyi0whkxz2ik9dlxcwv3b", + "version": "0.1.1", + "sha256": "1rkzc1kc5x5ndjl4p1jgzqc393cgb0sqm3x3pg5a5ci14j4jf8sf", "depends": ["lavaan"] }, "latdiag": { @@ -76873,29 +77641,35 @@ "sha256": "0isqjsivywv51h1lf4fwvscib8sfgnpvvdq6gj9zzz7nrjpgf7k1", "depends": ["igraph", "statip"] }, + "latent2likert": { + "name": "latent2likert", + "version": "1.2.1", + "sha256": "1fph5jfvmaw3js1gzv8vys5dck0kca9mysnqpyspsh53dwrji40p", + "depends": ["mvtnorm", "sn"] + }, "latentFactoR": { "name": "latentFactoR", "version": "0.0.6", "sha256": "0zcvy7dafigv2zwjyyiwrs7zjn2j933ynfbwsk6qgzfbw1khh9bk", - "depends": ["BBmisc", "EGAnet", "fspe", "googledrive", "ineq", "lavaan", "Matrix", "mlr", "mvtnorm", "psych", "rstudioapi", "xgboost"] + "depends": ["BBmisc", "EGAnet", "Matrix", "fspe", "googledrive", "ineq", "lavaan", "mlr", "mvtnorm", "psych", "rstudioapi", "xgboost"] }, "latentcor": { "name": "latentcor", "version": "2.0.1", "sha256": "0c8ygjdqxb9zs6b42ncqh5va80vxamdphja18x8dazygynmcgjr0", - "depends": ["doFuture", "doRNG", "fMultivar", "foreach", "future", "geometry", "ggplot2", "heatmaply", "MASS", "Matrix", "microbenchmark", "mnormt", "pcaPP", "plotly"] + "depends": ["MASS", "Matrix", "doFuture", "doRNG", "fMultivar", "foreach", "future", "geometry", "ggplot2", "heatmaply", "microbenchmark", "mnormt", "pcaPP", "plotly"] }, "latentgraph": { "name": "latentgraph", "version": "1.1", "sha256": "11h7nrd81licvdikiwwfkz4x9i7drz09w5ns672b7fw0pj4qqgsr", - "depends": ["glmnet", "MASS", "pracma", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "glmnet", "pracma"] }, "latentnet": { "name": "latentnet", "version": "2.11.0", "sha256": "1vd004bqcgjip2wrs5znk15yy45ay07cv4pa94x93kyri64v1g2g", - "depends": ["abind", "coda", "ergm", "MASS", "mvtnorm", "network", "sna", "statnet_common"] + "depends": ["MASS", "abind", "coda", "ergm", "mvtnorm", "network", "sna", "statnet_common"] }, "later": { "name": "later", @@ -76925,7 +77699,7 @@ "name": "latrend", "version": "1.6.1", "sha256": "1g5hhl8himv1g3v70vs42jsxn1h04knh73m6yhzkgc2bnj16hr2r", - "depends": ["assertthat", "data_table", "foreach", "magrittr", "matrixStats", "R_utils", "Rdpack", "rlang", "rmarkdown"] + "depends": ["R_utils", "Rdpack", "assertthat", "data_table", "foreach", "magrittr", "matrixStats", "rlang", "rmarkdown"] }, "latte": { "name": "latte", @@ -76943,19 +77717,19 @@ "name": "latticeExtra", "version": "0.6-30", "sha256": "1vcy4xr6c53nbvnxikjnlf5kd3n5hf4d8dzj5d41hj322dlsfl65", - "depends": ["interp", "jpeg", "lattice", "MASS", "png", "RColorBrewer"] + "depends": ["MASS", "RColorBrewer", "interp", "jpeg", "lattice", "png"] }, "lava": { "name": "lava", "version": "1.8.0", "sha256": "0zz8hzmqd4qa14y52c8gw9hr6gn0d7srffrddxrmhb01rbp9dfcd", - "depends": ["cli", "future_apply", "numDeriv", "progressr", "SQUAREM", "survival"] + "depends": ["SQUAREM", "cli", "future_apply", "numDeriv", "progressr", "survival"] }, "lavaSearch2": { "name": "lavaSearch2", "version": "2.0.3", "sha256": "1z5aaajlgmn6i9jvziz2blrxkrnqfsyfgpflblxac5ljwmnw7yvn", - "depends": ["abind", "doParallel", "ggplot2", "lava", "MASS", "Matrix", "multcomp", "mvtnorm", "nlme", "Rcpp", "RcppArmadillo", "reshape2", "sandwich"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "abind", "doParallel", "ggplot2", "lava", "multcomp", "mvtnorm", "nlme", "reshape2", "sandwich"] }, "lavaan": { "name": "lavaan", @@ -76971,8 +77745,8 @@ }, "lavaanExtra": { "name": "lavaanExtra", - "version": "0.2.0", - "sha256": "0q443wx983vy2i4bn39psw2nwaqzjncdpm7lpwsj7bifjnsic5sb", + "version": "0.2.1", + "sha256": "1h83a7mxyqqlnjk2vddy6ngshinl0sih3m21hl7qbc84spx1g96b", "depends": ["insight", "lavaan"] }, "lavaanPlot": { @@ -76985,13 +77759,13 @@ "name": "lavacreg", "version": "0.2-2", "sha256": "0jbqf52j5iva39lf9w34aabg6wh5i8rczln3l7pbdyz9lmvmgycc", - "depends": ["fastGHQuad", "pracma", "Rcpp", "RcppArmadillo", "SparseGrid"] + "depends": ["Rcpp", "RcppArmadillo", "SparseGrid", "fastGHQuad", "pracma"] }, "lawstat": { "name": "lawstat", "version": "3.6", "sha256": "1bmv3aw4z07ypsb1z65kwdybg6c268vdy46q9nri8xsmrby3fw8b", - "depends": ["Kendall", "mvtnorm", "Rdpack"] + "depends": ["Kendall", "Rdpack", "mvtnorm"] }, "lax": { "name": "lax", @@ -77027,7 +77801,7 @@ "name": "lazyarray", "version": "1.1.0", "sha256": "1bj1a8ab2479cl3d15h9f1fr1hh5d1p3sxpq8y84yzw0rrsxcldd", - "depends": ["fstcore", "R6", "Rcpp", "yaml"] + "depends": ["R6", "Rcpp", "fstcore", "yaml"] }, "lazybar": { "name": "lazybar", @@ -77055,15 +77829,15 @@ }, "lazytrade": { "name": "lazytrade", - "version": "0.5.3", - "sha256": "055wyaf36f5g27wly24i0sbf2k0rriga8xcgn241gszlzagrnh55", - "depends": ["cluster", "dplyr", "ggplot2", "h2o", "lifecycle", "lubridate", "openssl", "readr", "ReinforcementLearning", "stringr", "tibble"] + "version": "0.5.4", + "sha256": "0yl3hndvzavag397071mkr8z7v7hb9b2dzcls5llqjpi7ayvbi8b", + "depends": ["ReinforcementLearning", "cluster", "dplyr", "ggplot2", "h2o", "lifecycle", "lubridate", "openssl", "readr", "stringr", "tibble"] }, "lba": { "name": "lba", "version": "2.4.52", "sha256": "04w275da78naxz1imbw78kpd0rns4ipmjgfs4f23h1q8zp5711fw", - "depends": ["alabama", "MASS", "plotrix", "rgl", "scatterplot3d"] + "depends": ["MASS", "alabama", "plotrix", "rgl", "scatterplot3d"] }, "lbfgs": { "name": "lbfgs", @@ -77075,7 +77849,7 @@ "name": "lbfgsb3c", "version": "2024-3.4", "sha256": "1dsacah7srkg0i9anl283244mvi8chkjkfplzj00dfzcj8nv2cgm", - "depends": ["numDeriv", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "numDeriv"] }, "lbm": { "name": "lbm", @@ -77087,7 +77861,7 @@ "name": "lboxcox", "version": "1.2", "sha256": "0jklfgw7dwslafsivb9z2q1vgv367kk9gbgjabz04y0kracxaa8q", - "depends": ["doParallel", "dplyr", "foreach", "MASS", "maxLik", "R_utils", "survey"] + "depends": ["MASS", "R_utils", "doParallel", "dplyr", "foreach", "maxLik", "survey"] }, "lbreg": { "name": "lbreg", @@ -77129,13 +77903,13 @@ "name": "lconnect", "version": "0.1.2", "sha256": "097dsq8d5jpvygd1kpdkcdl0pa7clgdyjka03pw9glnamvqpg8a7", - "depends": ["igraph", "Rcpp", "scales", "sf"] + "depends": ["Rcpp", "igraph", "scales", "sf"] }, "lcopula": { "name": "lcopula", "version": "1.0.7", "sha256": "1lzk4lvdlqvnacmak75r4fn1mn2fxfzzlyh94k5r8iqgrpq5zsss", - "depends": ["copula", "Rcpp"] + "depends": ["Rcpp", "copula"] }, "lcpm": { "name": "lcpm", @@ -77165,7 +77939,7 @@ "name": "lcyanalysis", "version": "1.0.4", "sha256": "0pwr6r8nbvmppqwd9gxap6v49l7iaq5syaq11spxp5yc2h3pa2rg", - "depends": ["quantmod", "TTR", "xts", "zoo"] + "depends": ["TTR", "quantmod", "xts", "zoo"] }, "lda": { "name": "lda", @@ -77183,19 +77957,19 @@ "name": "ldamatch", "version": "1.0.3", "sha256": "1vksgild5j7g1skx28jki9kjknc08h2xf715azyfqgbmvbkkljgc", - "depends": ["car", "data_table", "entropy", "foreach", "gmp", "iterators", "iterpc", "kSamples", "RUnit"] + "depends": ["RUnit", "car", "data_table", "entropy", "foreach", "gmp", "iterators", "iterpc", "kSamples"] }, "ldatuning": { "name": "ldatuning", "version": "1.0.2", "sha256": "0367y6k5i4sccwfcm89xyc62qblrlwnm6hsa2jf346rnrfz9hkkc", - "depends": ["ggplot2", "reshape2", "Rmpfr", "scales", "slam", "topicmodels"] + "depends": ["Rmpfr", "ggplot2", "reshape2", "scales", "slam", "topicmodels"] }, "ldbod": { "name": "ldbod", "version": "0.1.2", "sha256": "1ylzkswnhf4jnjx2ijasy49pj78ffx333za0bx2fnf3g85kicqiv", - "depends": ["mnormt", "RANN"] + "depends": ["RANN", "mnormt"] }, "ldbounds": { "name": "ldbounds", @@ -77207,7 +77981,7 @@ "name": "lddmm", "version": "0.4.2", "sha256": "1xnqmhhv9yqkjbwbpz5s25bvzjy99zs6hmy1grbx6f324k3bapq7", - "depends": ["dplyr", "ggplot2", "gtools", "LaplacesDemon", "latex2exp", "plyr", "RColorBrewer", "Rcpp", "RcppArmadillo", "RcppProgress", "reshape2", "rgen", "tidyr"] + "depends": ["LaplacesDemon", "RColorBrewer", "Rcpp", "RcppArmadillo", "RcppProgress", "dplyr", "ggplot2", "gtools", "latex2exp", "plyr", "reshape2", "rgen", "tidyr"] }, "ldhmm": { "name": "ldhmm", @@ -77219,25 +77993,25 @@ "name": "ldsep", "version": "2.1.5", "sha256": "1abjb4ybxqipq5383r82ngy19p84331sfpi817wv7jsv6q99igrb", - "depends": ["abind", "ashr", "corrplot", "doParallel", "foreach", "lpSolve", "matrixStats", "modeest", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "abind", "ashr", "corrplot", "doParallel", "foreach", "lpSolve", "matrixStats", "modeest"] }, "ldsr": { "name": "ldsr", "version": "0.0.2", "sha256": "0wmxpglad1mk2c1gi9kxmh149r8ad0l8i2xlfs1hdjb6a4wxsklr", - "depends": ["data_table", "foreach", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "data_table", "foreach"] }, "ldt": { "name": "ldt", - "version": "0.5.2", - "sha256": "0dl9fy83a00rrslg3lp9fa64ps0d3mgll31w1n2m7bn1sq4y75s0", + "version": "0.5.3", + "sha256": "1l6q5rx8iqcsk8475vv0pxnzgxlf4lklpb1pdy3vmrgyffm644i3", "depends": ["BH", "MASS", "Rcpp", "Rdpack", "tdata"] }, "leabRa": { "name": "leabRa", "version": "0.1.0", "sha256": "08yiwyfg9bp4i9w5yyw9p63wyvgj39kd64y3h21j2jmpw8zxncdq", - "depends": ["plyr", "R6"] + "depends": ["R6", "plyr"] }, "leaderCluster": { "name": "leaderCluster", @@ -77261,7 +78035,7 @@ "name": "leafdown", "version": "1.2.0", "sha256": "0gpb37yjsjirglndld84bky83yyhy16qfk1wawkfpjv8j9pdfnqf", - "depends": ["checkmate", "leaflet", "magrittr", "R6", "shiny", "shinyjs"] + "depends": ["R6", "checkmate", "leaflet", "magrittr", "shiny", "shinyjs"] }, "leafem": { "name": "leafem", @@ -77285,7 +78059,7 @@ "name": "leaflet", "version": "2.2.2", "sha256": "1sxq38dcjhn1bkav7fxglzk8nwi5p32jia2nhijcq5j1766pp1yj", - "depends": ["crosstalk", "htmltools", "htmlwidgets", "jquerylib", "leaflet_providers", "magrittr", "png", "raster", "RColorBrewer", "scales", "sp", "viridisLite", "xfun"] + "depends": ["RColorBrewer", "crosstalk", "htmltools", "htmlwidgets", "jquerylib", "leaflet_providers", "magrittr", "png", "raster", "scales", "sp", "viridisLite", "xfun"] }, "leaflet_esri": { "name": "leaflet.esri", @@ -77345,7 +78119,7 @@ "name": "leakyIV", "version": "0.0.1", "sha256": "1pdxyw9sd78nwy70xlrckdjvdgrhcdjywrnbmilrffpzhb6hgky0", - "depends": ["corpcor", "data_table", "foreach", "glasso", "Matrix", "mvnfast"] + "depends": ["Matrix", "corpcor", "data_table", "foreach", "glasso", "mvnfast"] }, "leanpubr": { "name": "leanpubr", @@ -77353,11 +78127,17 @@ "sha256": "0c8pmzn25cwv0wccf30zrrqrs5amlk8iqyyva9vp9976wzwgbxrx", "depends": ["httr", "jsonlite", "xml2"] }, + "leapgp": { + "name": "leapgp", + "version": "1.0.0", + "sha256": "1nvi0r2iipiznjwfvdw34bm071z1j15rj600964grgz88qip0018", + "depends": ["RANN", "cluster", "laGP"] + }, "leapp": { "name": "leapp", "version": "1.3", "sha256": "0w6pi527s4fig50zlwhqsp6zfdgqyyislm01vvp5rvxg7kskr5xr", - "depends": ["corpcor", "MASS", "sva"] + "depends": ["MASS", "corpcor", "sva"] }, "leaps": { "name": "leaps", @@ -77399,7 +78179,7 @@ "name": "leastcostpath", "version": "2.0.12", "sha256": "0nkahghj9vvhcsq8h39y8kvcpgglwhnb0wcdhvkqzwnsparl58kd", - "depends": ["doParallel", "foreach", "gstat", "igraph", "Matrix", "sf", "terra"] + "depends": ["Matrix", "doParallel", "foreach", "gstat", "igraph", "sf", "terra"] }, "ledger": { "name": "ledger", @@ -77417,13 +78197,13 @@ "name": "lefko3", "version": "6.2.1", "sha256": "027x9k6wl59mbwfi1pd8jjhj60sbxi4gw27xb47rksbwkqbp0q4d", - "depends": ["BH", "glmmTMB", "lme4", "MASS", "Matrix", "MuMIn", "pscl", "Rcpp", "RcppArmadillo", "VGAM"] + "depends": ["BH", "MASS", "Matrix", "MuMIn", "Rcpp", "RcppArmadillo", "VGAM", "glmmTMB", "lme4", "pscl"] }, "legion": { "name": "legion", "version": "0.1.2", "sha256": "0463a743n6k21v6nyacmp2li9dngaaww9lh83150621s7pdycw3s", - "depends": ["generics", "greybox", "nloptr", "Rcpp", "RcppArmadillo", "smooth", "zoo"] + "depends": ["Rcpp", "RcppArmadillo", "generics", "greybox", "nloptr", "smooth", "zoo"] }, "legislatoR": { "name": "legislatoR", @@ -77453,18 +78233,18 @@ "name": "leiden", "version": "0.4.3.1", "sha256": "1qihzjrwcb09aga27frcdrdv4dp0g295dbrk07fqykbjlb7vpv59", - "depends": ["igraph", "Matrix", "reticulate"] + "depends": ["Matrix", "igraph", "reticulate"] }, "leidenAlg": { "name": "leidenAlg", "version": "1.1.3", "sha256": "0g4gs6rrz3wn97ag7wsfr6qa4zgb75i0k9jc1siii4pf6h689d1x", - "depends": ["igraph", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "sccore"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "igraph", "sccore"] }, "leidenbase": { "name": "leidenbase", - "version": "0.1.27", - "sha256": "09vvkn8czf6w4vib5jf3np2q9w3i8xdl2fbcikvzrb4ah9l8l5n3", + "version": "0.1.30", + "sha256": "1jz2272wvbsgn098wvl0dd9hmvasznwanacw8gf07zk5fslaa5al", "depends": ["igraph"] }, "leiv": { @@ -77525,19 +78305,19 @@ "name": "less", "version": "0.1.0", "sha256": "1pgixa04rjngfg0yhxyg4qhd6g0pj8zyb3q8mfa3fjxzpywdy70a", - "depends": ["caret", "e1071", "FNN", "MLmetrics", "pracma", "R6", "randomForest", "RANN", "rpart", "wordspace"] + "depends": ["FNN", "MLmetrics", "R6", "RANN", "caret", "e1071", "pracma", "randomForest", "rpart", "wordspace"] }, "lessR": { "name": "lessR", - "version": "4.3.3", - "sha256": "0yg9galvwnjzgkfj8hrmrscsdd7qh0g9fqxdqh444wkfarw55n0k", + "version": "4.3.6", + "sha256": "1d0k41fg66g0x6apd6yvc74gnl3mgs16kmykz53qhnd4zi5rj99k", "depends": ["colorspace", "ellipse", "knitr", "lattice", "latticeExtra", "leaps", "openxlsx", "robustbase", "shiny"] }, "lessSEM": { "name": "lessSEM", "version": "1.5.5", "sha256": "10wh8rx3rbr3gprmd5x633k68hxc1afqm6m5l3cinib4acdp0r22", - "depends": ["ggplot2", "lavaan", "mvtnorm", "numDeriv", "Rcpp", "RcppArmadillo", "RcppParallel", "rlang", "stringr", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "ggplot2", "lavaan", "mvtnorm", "numDeriv", "rlang", "stringr", "tidyr"] }, "lest": { "name": "lest", @@ -77573,7 +78353,7 @@ "name": "lexRankr", "version": "0.5.2", "sha256": "0vb4m4g88k05yhjla1gwp8ck08356r9dzwal6cq7lb6xm6pl5gvi", - "depends": ["igraph", "Rcpp", "SnowballC"] + "depends": ["Rcpp", "SnowballC", "igraph"] }, "lexicon": { "name": "lexicon", @@ -77615,19 +78395,19 @@ "name": "lfl", "version": "2.2.0", "sha256": "02kd7fz12v6xl1f3lv7kkxccln4fm8dmvbn7m9prbiawrbmy16dx", - "depends": ["e1071", "foreach", "forecast", "plyr", "Rcpp", "tseries", "zoo"] + "depends": ["Rcpp", "e1071", "foreach", "forecast", "plyr", "tseries", "zoo"] }, "lfmm": { "name": "lfmm", "version": "1.1", "sha256": "1v2sb2qghwcln3b5rpzhakg562izlzyxzvz49nz74y0rh2gx7g9i", - "depends": ["foreach", "ggplot2", "knitr", "MASS", "purrr", "Rcpp", "RcppEigen", "readr", "rmarkdown", "RSpectra"] + "depends": ["MASS", "RSpectra", "Rcpp", "RcppEigen", "foreach", "ggplot2", "knitr", "purrr", "readr", "rmarkdown"] }, "lfproQC": { "name": "lfproQC", "version": "0.1.0", "sha256": "0cs6x5nqwm1n11i287f26x4lclpmd5vwj9wwnzlr7cr95riwrqxk", - "depends": ["dplyr", "ggplot2", "Hmisc", "laeken", "limma", "magrittr", "MASS", "matrixStats", "pcaMethods", "plotly", "reshape", "reshape2", "tidyr", "tidyselect", "VIM", "vsn"] + "depends": ["Hmisc", "MASS", "VIM", "dplyr", "ggplot2", "laeken", "limma", "magrittr", "matrixStats", "pcaMethods", "plotly", "reshape", "reshape2", "tidyr", "tidyselect", "vsn"] }, "lfstat": { "name": "lfstat", @@ -77651,7 +78431,7 @@ "name": "lgcp", "version": "2.0", "sha256": "0f7s53sypj5l6ry437albypf1j2g3vxh137vfjfx3n84r0bmp5mw", - "depends": ["fields", "iterators", "Matrix", "ncdf4", "raster", "rpanel", "sf", "sp", "spatstat_explore", "spatstat_geom", "spatstat_utils"] + "depends": ["Matrix", "fields", "iterators", "ncdf4", "raster", "rpanel", "sf", "sp", "spatstat_explore", "spatstat_geom", "spatstat_utils"] }, "lglasso": { "name": "lglasso", @@ -77663,7 +78443,7 @@ "name": "lgpr", "version": "1.2.4", "sha256": "1xhkkykig3d2adh7nhvsjg75fxk8h9jdqdsadc9fwbdda354xvg7", - "depends": ["bayesplot", "BH", "ggplot2", "gridExtra", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "RCurl", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "MASS", "RCurl", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "ggplot2", "gridExtra", "rstan", "rstantools"] }, "lgr": { "name": "lgr", @@ -77675,7 +78455,7 @@ "name": "lgrExtra", "version": "0.0.8", "sha256": "19qg67mjq0n5zbrcfhjhxfwl1jlq11iblhczl3m22n2nplpi70q8", - "depends": ["data_table", "lgr", "R6"] + "depends": ["R6", "data_table", "lgr"] }, "lgrdata": { "name": "lgrdata", @@ -77697,8 +78477,8 @@ }, "lhs": { "name": "lhs", - "version": "1.1.6", - "sha256": "0gyjdic714pqvq2jv1v0vh7hl9s83sg2zxx2gdkp38z6xx2cwzz3", + "version": "1.2.0", + "sha256": "0907icg9bl7h8a7wr8a60f59b8y89qj9rx1f7vxiybrjdcy7fjvb", "depends": ["Rcpp"] }, "libbib": { @@ -77721,9 +78501,9 @@ }, "libr": { "name": "libr", - "version": "1.3.3", - "sha256": "0xx4wpkwnraw3w0mf6k3p1l3y27dd1h94wvi3nbalyb8vm6igjiz", - "depends": ["common", "crayon", "data_table", "dplyr", "haven", "openxlsx", "Rcpp", "readr", "readxl", "tibble"] + "version": "1.3.4", + "sha256": "16q65f1slbzlysqcn5mzj7ws8cm59qk3yxgippwhcjmrswrfk5y2", + "depends": ["Rcpp", "common", "crayon", "data_table", "dplyr", "haven", "openxlsx", "readr", "readxl", "tibble"] }, "librarian": { "name": "librarian", @@ -77745,9 +78525,9 @@ }, "lidR": { "name": "lidR", - "version": "4.1.1", - "sha256": "0n0w5qv5mjfnxk7wixwivm68y8pb67sqyfkqinq85rnybhgzshmd", - "depends": ["BH", "classInt", "data_table", "glue", "lazyeval", "Rcpp", "RcppArmadillo", "rgl", "rlas", "sf", "stars", "terra"] + "version": "4.1.2", + "sha256": "1sx903krq6hn9gdz3k7kq88yxzm6hh8wpcjkvgzbrf4z31fc6lp4", + "depends": ["BH", "Rcpp", "RcppArmadillo", "classInt", "data_table", "glue", "lazyeval", "rgl", "rlas", "sf", "stars", "terra"] }, "lidaRtRee": { "name": "lidaRtRee", @@ -77771,7 +78551,7 @@ "name": "lifecontingencies", "version": "1.3.11", "sha256": "1wz0v7abl3g3kgbp613rx5rw2ryxahk1h8bk8d3p5v7wyfwqignh", - "depends": ["markovchain", "Rcpp"] + "depends": ["Rcpp", "markovchain"] }, "lifecourse": { "name": "lifecourse", @@ -77789,7 +78569,7 @@ "name": "lifelogr", "version": "0.1.0", "sha256": "1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav", - "depends": ["dplyr", "fitbitScraper", "ggplot2", "lazyeval", "lubridate", "modelr", "plyr", "R6", "shiny", "stringr", "tibble", "tidyr"] + "depends": ["R6", "dplyr", "fitbitScraper", "ggplot2", "lazyeval", "lubridate", "modelr", "plyr", "shiny", "stringr", "tibble", "tidyr"] }, "liftLRD": { "name": "liftLRD", @@ -77811,9 +78591,9 @@ }, "lightgbm": { "name": "lightgbm", - "version": "4.4.0", - "sha256": "082xmr33ki16i52a3z6lv9niv46pi4dbp0j3qn421sxml4115sf1", - "depends": ["data_table", "jsonlite", "Matrix", "R6"] + "version": "4.5.0", + "sha256": "1bnyhwmmsacl0g1hhgjzdfh2kdxjqfm0r7cs5nz8vk1nrwyck02r", + "depends": ["Matrix", "R6", "data_table", "jsonlite"] }, "lightparser": { "name": "lightparser", @@ -77843,7 +78623,7 @@ "name": "likelihoodAsy", "version": "0.51", "sha256": "0qxwdf6npyj926zd2pbfscgz1z01hwgm6099h882d2l1sim2j9g7", - "depends": ["alabama", "cond", "digest", "nleqslv", "pracma", "Rsolnp"] + "depends": ["Rsolnp", "alabama", "cond", "digest", "nleqslv", "pracma"] }, "likelihoodExplore": { "name": "likelihoodExplore", @@ -77867,7 +78647,7 @@ "name": "lilikoi", "version": "2.1.1", "sha256": "14bz7a1wcgr5fsf6mpsibxa7ks302a1lwnjdjzwh72z490fz8gaw", - "depends": ["car", "caret", "dplyr", "gbm", "ggplot2", "glmnet", "h2o", "impute", "infotheo", "limma", "M3C", "Metrics", "MLmetrics", "pathview", "plyr", "preprocessCore", "princurve", "pROC", "RCy3", "reshape", "reticulate", "RWeka", "scales", "stringr", "survival", "survminer"] + "depends": ["M3C", "MLmetrics", "Metrics", "RCy3", "RWeka", "car", "caret", "dplyr", "gbm", "ggplot2", "glmnet", "h2o", "impute", "infotheo", "limma", "pROC", "pathview", "plyr", "preprocessCore", "princurve", "reshape", "reticulate", "scales", "stringr", "survival", "survminer"] }, "lillies": { "name": "lillies", @@ -77879,13 +78659,13 @@ "name": "limSolve", "version": "1.5.7.1", "sha256": "14jvx0sjjdsm6fxvdck648h12sl4cmy8sgw8jx1744pmpcbm5555", - "depends": ["lpSolve", "MASS", "quadprog"] + "depends": ["MASS", "lpSolve", "quadprog"] }, "lime": { "name": "lime", "version": "0.5.3", "sha256": "157ph4a1h3025nx5v8lw63bbrzk4skw2rnnw1g7h4d3qggcmlhf9", - "depends": ["assertthat", "ggplot2", "glmnet", "gower", "Matrix", "Rcpp", "RcppEigen", "stringi"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "assertthat", "ggplot2", "glmnet", "gower", "stringi"] }, "limexhub": { "name": "limexhub", @@ -77903,7 +78683,7 @@ "name": "limonaid", "version": "0.1.5", "sha256": "04w9g0gv1cihljvmh1y40ygckhhv4jrg970913npvk5nc3id3bqd", - "depends": ["httr", "jsonlite", "R6"] + "depends": ["R6", "httr", "jsonlite"] }, "limorhyde": { "name": "limorhyde", @@ -77915,7 +78695,7 @@ "name": "limorhyde2", "version": "0.1.0", "sha256": "0icwh7vvid7xxlk5jmqqkl6507b4vc0fmpp0wm10lsh0wxibmvwf", - "depends": ["abind", "ashr", "checkmate", "data_table", "DESeq2", "foreach", "HDInterval", "iterators", "limma", "mashr", "pbs", "zeallot"] + "depends": ["DESeq2", "HDInterval", "abind", "ashr", "checkmate", "data_table", "foreach", "iterators", "limma", "mashr", "pbs", "zeallot"] }, "lin_eval": { "name": "lin.eval", @@ -77937,9 +78717,9 @@ }, "lincom": { "name": "lincom", - "version": "1.1", - "sha256": "1krvpk8m2bnkxm3z10sgbx4fcj54kb1sc9n63zjq33ygl4bhnm6d", - "depends": ["Matrix", "Rmosek", "SparseM"] + "version": "1.2", + "sha256": "076pnzdr4h62h4grlk5vcbwl0aikl87ks0my86mbjzg7isyngyja", + "depends": ["Rmosek", "SparseM"] }, "linconGaussR": { "name": "linconGaussR", @@ -77951,7 +78731,7 @@ "name": "lindia", "version": "0.10", "sha256": "0i4mi19pcbpiqbwzj5ga9jhzi0z1qsf779kndyz9sdd9wgxdz8zg", - "depends": ["ggplot2", "gridExtra", "MASS"] + "depends": ["MASS", "ggplot2", "gridExtra"] }, "linearModel": { "name": "linearModel", @@ -77963,19 +78743,19 @@ "name": "lineartestr", "version": "1.0.0", "sha256": "0bzsywk97j2mmsi7pj9267za1q2601crynh9kszwj6xjbg08nvsm", - "depends": ["dplyr", "forecast", "ggplot2", "Matrix", "readr", "sandwich", "tidyr", "viridis"] + "depends": ["Matrix", "dplyr", "forecast", "ggplot2", "readr", "sandwich", "tidyr", "viridis"] }, "linelist": { "name": "linelist", - "version": "1.1.3", - "sha256": "0bpsz61pdx3vl88g006iy5gzl1f2lwsfws6gjm1aki9rsih8fx0x", + "version": "1.1.4", + "sha256": "08rw58pl8l1pdn5mpv0awgjcb0gbsg48ihqk48vydfyjx6683qrv", "depends": ["checkmate", "dplyr", "lifecycle", "rlang", "tidyselect"] }, "linelistBayes": { "name": "linelistBayes", "version": "1.0", "sha256": "08xgqp1ldb76063k4dgyjjdzk50l4x0ddz1q3y4zzf4jfisp9720", - "depends": ["coda", "dplyr", "lubridate", "magrittr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "coda", "dplyr", "lubridate", "magrittr"] }, "linemap": { "name": "linemap", @@ -77985,8 +78765,8 @@ }, "lineup": { "name": "lineup", - "version": "0.42", - "sha256": "1k6l3vl9g6cz3jl1fz6r1dm3lfpmis6yylra69c3s8l8l4fz0gzy", + "version": "0.44", + "sha256": "1km5mafaww12pck0n3lgpx7sp0hpzi5h173m4apv8bbiy7cdn6x6", "depends": ["class", "qtl"] }, "lineup2": { @@ -78021,8 +78801,8 @@ }, "lingtypology": { "name": "lingtypology", - "version": "1.1.17", - "sha256": "07r9p41jhrx7hgy5h3bfhnry5b88chbim6nnvisw5v39b2mm1p9n", + "version": "1.1.18", + "sha256": "041l20dsp2jdnpvdlawb0xn6hawym5wkxyhhvbl5y8mfxibdq37h", "depends": ["jsonlite", "leaflet", "leaflet_minicharts", "stringdist"] }, "linguisticsdown": { @@ -78041,13 +78821,13 @@ "name": "link2GI", "version": "0.6-1", "sha256": "0ivzbmvwxx2v0pk7f1y84jxad5pvpl4m6czmjkga52wnk0y5dnn1", - "depends": ["brew", "devtools", "git2r", "R_utils", "renv", "roxygen2", "rstudioapi", "sf", "terra", "xfun", "xml2", "yaml"] + "depends": ["R_utils", "brew", "devtools", "git2r", "renv", "roxygen2", "rstudioapi", "sf", "terra", "xfun", "xml2", "yaml"] }, "linkcomm": { "name": "linkcomm", "version": "1.0-14", "sha256": "15xm4c7sqpid1vjra250dnvdx98qgzbzmvaycf3zqqnqcmy5bw9n", - "depends": ["dynamicTreeCut", "igraph", "RColorBrewer"] + "depends": ["RColorBrewer", "dynamicTreeCut", "igraph"] }, "linkedInadsR": { "name": "linkedInadsR", @@ -78077,7 +78857,7 @@ "name": "linne", "version": "0.0.2", "sha256": "19x13hf3skvxihlpa8wy05vlc94yv7nfs8b1pr8br76wk1xdkjvx", - "depends": ["cli", "magrittr", "purrr", "R6", "rlang", "shiny"] + "depends": ["R6", "cli", "magrittr", "purrr", "rlang", "shiny"] }, "linpk": { "name": "linpk", @@ -78107,7 +78887,7 @@ "name": "lipidmapsR", "version": "1.0.4", "sha256": "19yrqd28z5dvpvi0igarmz9fpv08yx78221nzrwc8yxp6m1agkgc", - "depends": ["httr", "RJSONIO"] + "depends": ["RJSONIO", "httr"] }, "lipidomeR": { "name": "lipidomeR", @@ -78143,7 +78923,7 @@ "name": "list", "version": "9.2.6", "sha256": "1r1j4jk54mcvsgxm2gxpjh66h13frdiq9cszc0wxg1zfrpcisava", - "depends": ["arm", "coda", "corpcor", "gamlss_dist", "magic", "MASS", "mvtnorm", "quadprog", "sandwich", "VGAM"] + "depends": ["MASS", "VGAM", "arm", "coda", "corpcor", "gamlss_dist", "magic", "mvtnorm", "quadprog", "sandwich"] }, "listArray": { "name": "listArray", @@ -78203,7 +78983,7 @@ "name": "lit", "version": "1.0.0", "sha256": "1n5avz33d041bl8b9khqbiyprjdrd5nj1n19134sfpqs7h0wcjzp", - "depends": ["CompQuadForm", "genio", "Rcpp", "RcppArmadillo", "RcppEigen"] + "depends": ["CompQuadForm", "Rcpp", "RcppArmadillo", "RcppEigen", "genio"] }, "litRiddle": { "name": "litRiddle", @@ -78213,15 +78993,15 @@ }, "lite": { "name": "lite", - "version": "1.1.0", - "sha256": "0gfbffh4511c7hwy6js0bip69j340f7qmrjaslnjgyx1nvmi7dxd", + "version": "1.1.1", + "sha256": "005lagzgyc05ssy4bvj6vlfjypqpacqh60bfj8yhj75b81m321a9", "depends": ["chandwich", "exdex", "revdbayes", "rust", "sandwich"] }, "liteq": { "name": "liteq", "version": "1.1.0", "sha256": "0w3w9f6374qwvlrqknavqh9b38n5q1r6aw5zmz5lahvadalwdbwi", - "depends": ["assertthat", "DBI", "rappdirs", "RSQLite"] + "depends": ["DBI", "RSQLite", "assertthat", "rappdirs"] }, "literanger": { "name": "literanger", @@ -78257,7 +79037,7 @@ "name": "live", "version": "1.5.13", "sha256": "1s6yrbwlc4wqszl2yvy1x6d93my18ba8sm8pwfy547cd1x055vig", - "depends": ["breakDown", "data_table", "dplyr", "e1071", "forestmodel", "ggplot2", "gower", "MASS", "mlr", "shiny"] + "depends": ["MASS", "breakDown", "data_table", "dplyr", "e1071", "forestmodel", "ggplot2", "gower", "mlr", "shiny"] }, "liver": { "name": "liver", @@ -78281,7 +79061,7 @@ "name": "llbayesireg", "version": "1.0.0", "sha256": "0jhkmrjkqfm1flwsbpv6060j6g7cj4ngm0drvrlvsiqpni0k96mh", - "depends": ["coda", "ggplot2", "llogistic", "MASS", "MCMCpack", "Rcpp", "rstan", "StanHeaders"] + "depends": ["MASS", "MCMCpack", "Rcpp", "StanHeaders", "coda", "ggplot2", "llogistic", "rstan"] }, "llogistic": { "name": "llogistic", @@ -78335,7 +79115,7 @@ "name": "lmap", "version": "0.1.2", "sha256": "08bdznssicrl493zv5qa1vyjh38zhb83rwnipq83zi4qfp2s8n5p", - "depends": ["dplyr", "fmdu", "ggforce", "ggplot2", "ggrepel", "magrittr", "MASS", "nnet", "Rfast"] + "depends": ["MASS", "Rfast", "dplyr", "fmdu", "ggforce", "ggplot2", "ggrepel", "magrittr", "nnet"] }, "lmboot": { "name": "lmboot", @@ -78347,19 +79127,19 @@ "name": "lmds", "version": "0.1.0", "sha256": "130azb0nc2wwxv0qi8v5s4rd02p9lc92zwn634pv7b8awbw81i65", - "depends": ["assertthat", "dynutils", "irlba", "Matrix"] + "depends": ["Matrix", "assertthat", "dynutils", "irlba"] }, "lme4": { "name": "lme4", - "version": "1.1-35.3", - "sha256": "0ij37wly0d28x143xdkjry5jsj4chlbli2fl9zbp8fkcgh95r1xl", - "depends": ["boot", "lattice", "MASS", "Matrix", "minqa", "nlme", "nloptr", "Rcpp", "RcppEigen"] + "version": "1.1-35.5", + "sha256": "0w2i2d3q19kbx3scd7p7dyfpfpcqb3d5h47y5rb2jr59gvdn8rkx", + "depends": ["MASS", "Matrix", "Rcpp", "RcppEigen", "boot", "lattice", "minqa", "nlme", "nloptr"] }, "lme4breeding": { "name": "lme4breeding", - "version": "1.0.1", - "sha256": "12156nll73lwmf0si6pm46gvkc3pdgqwg6yc9bqdvgdggf7pnjqc", - "depends": ["crayon", "lme4", "Matrix"] + "version": "1.0.30", + "sha256": "1zwbb4f2r0gmdvcnf4sh38ispqb7gifxi7gl04rfyxabbsanmvbb", + "depends": ["Matrix", "crayon", "lme4"] }, "lmeInfo": { "name": "lmeInfo", @@ -78383,13 +79163,13 @@ "name": "lmerTest", "version": "3.1-3", "sha256": "1zd8gqjkazhxgpnnr484xwsq30p62fq8592nzyc171zjyplpbaim", - "depends": ["ggplot2", "lme4", "MASS", "numDeriv"] + "depends": ["MASS", "ggplot2", "lme4", "numDeriv"] }, "lmeresampler": { "name": "lmeresampler", "version": "0.2.4", "sha256": "0y9bawakxyqxdmx74jsyrg3mgiwb22h8pskp4wzv99fl2dp3bfhs", - "depends": ["dplyr", "forcats", "ggdist", "ggplot2", "HLMdiag", "magrittr", "Matrix", "nlmeU", "purrr", "statmod", "tibble", "tidyr"] + "depends": ["HLMdiag", "Matrix", "dplyr", "forcats", "ggdist", "ggplot2", "magrittr", "nlmeU", "purrr", "statmod", "tibble", "tidyr"] }, "lmf": { "name": "lmf", @@ -78401,7 +79181,7 @@ "name": "lmfor", "version": "1.6", "sha256": "0zhahfzphyywdnwkj8c94pxm86v296bvvszzcxp37xi4gayaknm6", - "depends": ["magic", "MASS", "Matrix", "nlme", "spatstat", "spatstat_geom"] + "depends": ["MASS", "Matrix", "magic", "nlme", "spatstat", "spatstat_geom"] }, "lmhelprs": { "name": "lmhelprs", @@ -78431,7 +79211,7 @@ "name": "lmmpar", "version": "0.1.0", "sha256": "1l3zjmlfjfn2wv4yayqzv6qrwaxk2sgx3hjx371b5fs54zspdj20", - "depends": ["bigmemory", "doParallel", "MASS", "matrixcalc", "mnormt", "plyr"] + "depends": ["MASS", "bigmemory", "doParallel", "matrixcalc", "mnormt", "plyr"] }, "lmodel2": { "name": "lmodel2", @@ -78461,7 +79241,7 @@ "name": "lmomco", "version": "2.5.1", "sha256": "0jkqm5cavixb1wfcw00k0pa6y8j252h6mhq5ldcz1qakp07rhzb4", - "depends": ["goftest", "Lmoments", "MASS"] + "depends": ["Lmoments", "MASS", "goftest"] }, "lmreg": { "name": "lmreg", @@ -78489,15 +79269,15 @@ }, "lmtp": { "name": "lmtp", - "version": "1.3.3", - "sha256": "12vq5rail8xdw84ms6nv4ncmdygk485vffyzqc9kcc7wxlbr127i", - "depends": ["checkmate", "cli", "data_table", "future", "generics", "nnls", "origami", "progressr", "R6", "SuperLearner"] + "version": "1.4.0", + "sha256": "10gy8nb64vp36q6yy0kp0g2dvv514gvq4vfc5az4ydlx29qyc6bn", + "depends": ["R6", "SuperLearner", "checkmate", "cli", "data_table", "future", "generics", "nnls", "origami", "progressr", "schoolmath"] }, "lmviz": { "name": "lmviz", "version": "0.2.0", "sha256": "0sl2k02m5bxkb4jg8y666ln0xxhr4dhsfz9hlp55p9smlhycl5s2", - "depends": ["car", "lmtest", "MASS", "mgcv", "rgl", "scatterplot3d", "shiny", "shinyjs"] + "depends": ["MASS", "car", "lmtest", "mgcv", "rgl", "scatterplot3d", "shiny", "shinyjs"] }, "lmw": { "name": "lmw", @@ -78515,19 +79295,19 @@ "name": "lnmCluster", "version": "0.3.1", "sha256": "1y5zf2m4kgysm15xnbd1zc21svif2mxpm1zla4nhg68hljl41j8s", - "depends": ["foreach", "gtools", "MASS", "mclust", "pgmm", "Rcpp", "stringr"] + "depends": ["MASS", "Rcpp", "foreach", "gtools", "mclust", "pgmm", "stringr"] }, "loa": { "name": "loa", "version": "0.2.48.3", "sha256": "1fa1yxpsydx2kjbnj00vn9zv4dw9awng4lxrcllcgzkir9bikgq0", - "depends": ["lattice", "MASS", "mgcv", "OpenStreetMap", "plyr", "png", "RColorBrewer", "RgoogleMaps", "sp"] + "depends": ["MASS", "OpenStreetMap", "RColorBrewer", "RgoogleMaps", "lattice", "mgcv", "plyr", "png", "sp"] }, "loadeR": { "name": "loadeR", "version": "1.2.0", "sha256": "0hxvmhl0xyyxjiinbh55clwdzihpxyw61k1gm6wcvj8hs21y8sl0", - "depends": ["caret", "colourpicker", "config", "data_table", "DT", "echarts4r", "golem", "htmltools", "htmlwidgets", "readxl", "rlang", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "writexl"] + "depends": ["DT", "caret", "colourpicker", "config", "data_table", "echarts4r", "golem", "htmltools", "htmlwidgets", "readxl", "rlang", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "writexl"] }, "loadings": { "name": "loadings", @@ -78551,13 +79331,13 @@ "name": "locStra", "version": "1.9", "sha256": "0vblsxdlngpa0mzyay9w23nx85riq0dwjc04z20vyha0vdsnkfk6", - "depends": ["bigsnpr", "Matrix", "Rcpp", "RcppEigen", "Rdpack", "RSpectra"] + "depends": ["Matrix", "RSpectra", "Rcpp", "RcppEigen", "Rdpack", "bigsnpr"] }, "locaR": { "name": "locaR", "version": "0.1.2", "sha256": "1qjbf6g2sb5bpgg3fvqbp3xbyrk31lnxwp3c3pfbrnm5llh4w5qd", - "depends": ["matrixStats", "oce", "seewave", "signal", "SynchWave", "tuneR"] + "depends": ["SynchWave", "matrixStats", "oce", "seewave", "signal", "tuneR"] }, "localFDA": { "name": "localFDA", @@ -78599,7 +79379,7 @@ "name": "localgauss", "version": "0.41", "sha256": "0cy8xawkph364828wpivhjikmlvaxhyrr3lv8a8xn21qxjri9mdy", - "depends": ["foreach", "ggplot2", "MASS", "matrixStats"] + "depends": ["MASS", "foreach", "ggplot2", "matrixStats"] }, "localsolver": { "name": "localsolver", @@ -78633,8 +79413,8 @@ }, "locfit": { "name": "locfit", - "version": "1.5-9.9", - "sha256": "1m7ji1ykvffqvs9ly1pzadiwhwxcyv4xivziikmahp0w0sv45lck", + "version": "1.5-9.10", + "sha256": "01mcfsqqqwdf9iggabyckid7rf5c9f0v0hjz8g58fflr2hc6c82c", "depends": ["lattice"] }, "locits": { @@ -78657,9 +79437,9 @@ }, "locuszoomr": { "name": "locuszoomr", - "version": "0.3.0", - "sha256": "1bah3sr0srnvafm69h62hfw5gajsnrasqwzzsk391ga73mqbi8mz", - "depends": ["AnnotationFilter", "BiocGenerics", "cowplot", "dplyr", "ensembldb", "GenomeInfoDb", "GenomicRanges", "gggrid", "ggplot2", "ggrepel", "IRanges", "LDlinkR", "memoise", "plotly", "rlang", "rtracklayer", "zoo"] + "version": "0.3.1", + "sha256": "1rp8gv846jfi688xkl0mbspbj9rzs0bqddl5fmp13vb1kslys8w5", + "depends": ["AnnotationFilter", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "LDlinkR", "cowplot", "dplyr", "ensembldb", "gggrid", "ggplot2", "ggrepel", "memoise", "plotly", "rlang", "rtracklayer", "zoo"] }, "lodGWAS": { "name": "lodGWAS", @@ -78701,7 +79481,7 @@ "name": "log", "version": "1.1.1", "sha256": "1vzssrg2qqxd27b9d36v3mmkhgkx8n724ql9yhl5p8dy28zgsdxd", - "depends": ["cli", "crayon", "R6"] + "depends": ["R6", "cli", "crayon"] }, "log4r": { "name": "log4r", @@ -78713,7 +79493,7 @@ "name": "logKDE", "version": "0.3.2", "sha256": "09gachibj0klqa9ijw572lwphbh9qj6zqray5byq1dh7zsiq516q", - "depends": ["pracma", "Rcpp"] + "depends": ["Rcpp", "pracma"] }, "logNormReg": { "name": "logNormReg", @@ -78731,7 +79511,7 @@ "name": "logbin", "version": "2.0.5", "sha256": "1v8bzhh8bm8704sv68k7dmbs0m7f656s91jhc0p7a6w7vqlmv803", - "depends": ["glm2", "iterators", "itertools2", "Matrix", "turboEM"] + "depends": ["Matrix", "glm2", "iterators", "itertools2", "turboEM"] }, "logconcens": { "name": "logconcens", @@ -78749,7 +79529,7 @@ "name": "logcondiscr", "version": "1.0.6", "sha256": "08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd", - "depends": ["cobs", "Matrix", "mvtnorm"] + "depends": ["Matrix", "cobs", "mvtnorm"] }, "logger": { "name": "logger", @@ -78771,8 +79551,8 @@ }, "loggit2": { "name": "loggit2", - "version": "2.3.0", - "sha256": "06gvfh3jhgfiyxi950648ha123np77xqd2n2rh41pf1ipnhaxpca", + "version": "2.3.1", + "sha256": "1y971pb8v5s57hnvbrz11m2jwfxbid5dwlj4asazd5vf9xq04adx", "depends": [] }, "logiBin": { @@ -78803,13 +79583,13 @@ "name": "login", "version": "0.9.3", "sha256": "0sar30sy0g9pa3qsw68a3mfqwq1c2c5kqs8am8dljvf419pdbyrp", - "depends": ["cookies", "DBI", "digest", "emayili", "htmltools", "shiny", "shinybusy", "shinyjs", "stringr"] + "depends": ["DBI", "cookies", "digest", "emayili", "htmltools", "shiny", "shinybusy", "shinyjs", "stringr"] }, "logistf": { "name": "logistf", "version": "1.26.0", "sha256": "02qrh07c13khlpz3z3f6qq827h37j91i88n7jn3c8ky6r1lfa5pr", - "depends": ["formula_tools", "Matrix", "mgcv", "mice"] + "depends": ["Matrix", "formula_tools", "mgcv", "mice"] }, "logistic4p": { "name": "logistic4p", @@ -78843,9 +79623,9 @@ }, "logitr": { "name": "logitr", - "version": "1.1.1", - "sha256": "0w12rpvyxvmqdlbp8j7394x4c0m0yhv0li7rr4jliygzp4xnh8lz", - "depends": ["generics", "MASS", "nloptr", "randtoolbox", "tibble"] + "version": "1.1.2", + "sha256": "0ns7z0g2r0ypisb924mkzzpd0p9x0zrhnc0slk55g90d4kbi51gv", + "depends": ["MASS", "generics", "nloptr", "randtoolbox", "tibble"] }, "loglognorm": { "name": "loglognorm", @@ -78885,27 +79665,27 @@ }, "lokern": { "name": "lokern", - "version": "1.1-11", - "sha256": "1psv3c59lxn7nrb04v7kydlk4q1cg3v8hb1s1v2al19f0p2jhyhz", + "version": "1.1-12", + "sha256": "0xymmkq5pnqiv5ipakx5w8nl0qhxix0lz8xvn88801r5zygyywbc", "depends": ["sfsmisc"] }, "lolR": { "name": "lolR", "version": "2.1", "sha256": "0lrmn9lzyyfr1y0i7qp6xfpdxyisbkajwg0jkrqkiw687psnh2rc", - "depends": ["abind", "ggplot2", "irlba", "MASS", "pls", "robust", "robustbase"] + "depends": ["MASS", "abind", "ggplot2", "irlba", "pls", "robust", "robustbase"] }, "lolliplot": { "name": "lolliplot", "version": "0.2.2", "sha256": "1rr0j0y298dmmllck11jq36glxczcsz6z7kw9290k77z75fi3vzi", - "depends": ["GenomicRanges", "grImport", "IRanges", "scales"] + "depends": ["GenomicRanges", "IRanges", "grImport", "scales"] }, "lolog": { "name": "lolog", "version": "1.3.1", "sha256": "0hc95ff1radpc8q0xnrvhsgbhf902fhhhkjmj51sxds4mn5wdaj3", - "depends": ["BH", "ggplot2", "intergraph", "Matrix", "network", "Rcpp", "reshape2"] + "depends": ["BH", "Matrix", "Rcpp", "ggplot2", "intergraph", "network", "reshape2"] }, "lomb": { "name": "lomb", @@ -78929,7 +79709,7 @@ "name": "longRPart2", "version": "0.2.3", "sha256": "1vqcsxi6c4hqrpk3ns7yhghfryin1psxl38qkz2xz8cvyn58f685", - "depends": ["formula_tools", "ggplot2", "MASS", "nlme", "rpart"] + "depends": ["MASS", "formula_tools", "ggplot2", "nlme", "rpart"] }, "longclust": { "name": "longclust", @@ -78939,15 +79719,15 @@ }, "longevity": { "name": "longevity", - "version": "1.0.0", - "sha256": "01apxwslkyk8v6zqwaf0hl391mcgqi7nmkw3wal757d8dawvdnaj", - "depends": ["numDeriv", "Rcpp", "RcppArmadillo", "rlang", "Rsolnp"] + "version": "1.1.1", + "sha256": "1p1sd4ahfbbj1fhgnw914yw06z6q0hbswiwb1gvmc2ks8i2ngi1r", + "depends": ["Rcpp", "RcppArmadillo", "Rsolnp", "numDeriv", "rlang"] }, "longit": { "name": "longit", "version": "0.1.0", "sha256": "08d7pfwd2anx6cdgpyzrn5na3s75z6plbxb11774zcxyzg81rz69", - "depends": ["AICcmodavg", "missForest", "R2jags", "rjags"] + "depends": ["AICcmodavg", "R2jags", "missForest", "rjags"] }, "longitudinal": { "name": "longitudinal", @@ -78959,7 +79739,7 @@ "name": "longitudinalANAL", "version": "0.2", "sha256": "1mvagvjmycnmk3bp02194k7qpwgj94lxzvv30dm0c8jmrhznyh4c", - "depends": ["dlm", "dplyr", "MASS", "tibble"] + "depends": ["MASS", "dlm", "dplyr", "tibble"] }, "longitudinalData": { "name": "longitudinalData", @@ -78981,15 +79761,15 @@ }, "longmemo": { "name": "longmemo", - "version": "1.1-2", - "sha256": "01rj5x9cgscsrakbx9155mbvs35fd3j484cfz5cds9vl521fjr3r", + "version": "1.1-3", + "sha256": "0c4ahci4bf630pcm9zfjwipbq2rb7yi55w91yi6qy39fzdj4v568", "depends": [] }, "longmixr": { "name": "longmixr", "version": "1.0.0", "sha256": "03hh1zrpxqnal4j7rmlllzdhhmrvbdnvdr7rd955hlnkr9946p6c", - "depends": ["checkmate", "ConsensusClusterPlus", "flexmix", "StatMatch"] + "depends": ["ConsensusClusterPlus", "StatMatch", "checkmate", "flexmix"] }, "longpower": { "name": "longpower", @@ -79001,13 +79781,13 @@ "name": "longreadvqs", "version": "0.1.2", "sha256": "07pdnipq4nl7v8sgbfrcz7slz36gnfj3zj6i6pcvq6zh4fy1bw3g", - "depends": ["ape", "Biostrings", "cowplot", "dplyr", "ggplot2", "ggpubr", "magrittr", "plyr", "purrr", "QSutils", "RColorBrewer", "reshape2", "scales", "seqinr", "stringdist", "stringr", "tibble", "tidyr"] + "depends": ["Biostrings", "QSutils", "RColorBrewer", "ape", "cowplot", "dplyr", "ggplot2", "ggpubr", "magrittr", "plyr", "purrr", "reshape2", "scales", "seqinr", "stringdist", "stringr", "tibble", "tidyr"] }, "longsurr": { "name": "longsurr", "version": "1.0", "sha256": "0hlsgf7cfqg3f9m3hmqhsfa8a5xqwb3k0z22dzkrcmxynikc416s", - "depends": ["dplyr", "fda", "fda_usc", "fdapace", "fs", "glue", "grf", "here", "KernSmooth", "lme4", "magrittr", "mgcv", "mvnfast", "plyr", "purrr", "readr", "refund", "Rsurrogate", "stringr", "tibble", "tidyr"] + "depends": ["KernSmooth", "Rsurrogate", "dplyr", "fda", "fda_usc", "fdapace", "fs", "glue", "grf", "here", "lme4", "magrittr", "mgcv", "mvnfast", "plyr", "purrr", "readr", "refund", "stringr", "tibble", "tidyr"] }, "longurl": { "name": "longurl", @@ -79017,15 +79797,15 @@ }, "loo": { "name": "loo", - "version": "2.7.0", - "sha256": "0dnbbflglm7b29vr11rfrawnys9s3rl4h00h6xh9smjyalqz6r3n", + "version": "2.8.0", + "sha256": "0k14cf4mmviwslq931n5l1glalmsdsm7v3hq0m80w71fbaljgdxa", "depends": ["checkmate", "matrixStats", "posterior"] }, "lookout": { "name": "lookout", "version": "0.1.4", "sha256": "0d08804h61dal80sd6z34ls1g5i0qly1zdxankw8gfrb60b41lnx", - "depends": ["evd", "ggplot2", "RANN", "TDAstats", "tidyr"] + "depends": ["RANN", "TDAstats", "evd", "ggplot2", "tidyr"] }, "lookup": { "name": "lookup", @@ -79067,7 +79847,7 @@ "name": "loon.tourr", "version": "0.1.4", "sha256": "1ggy3kkz86lk332pnlihc1i2bki3nks7r2bvl6bprcmds9lg689i", - "depends": ["loon", "loon_ggplot", "MASS", "tibble", "tourr"] + "depends": ["MASS", "loon", "loon_ggplot", "tibble", "tourr"] }, "lorad": { "name": "lorad", @@ -79143,8 +79923,8 @@ }, "lpSolveAPI": { "name": "lpSolveAPI", - "version": "5.5.2.0-17.11", - "sha256": "191zjgyap3kcsvh8fygqqyr9p0agbzm160fzynnpaxf19yp6r3dh", + "version": "5.5.2.0-17.12", + "sha256": "1vvhbgd54k0ynzh1zsrcdy8ry6w642vjk9dhlkig7pamf39aj02g", "depends": [] }, "lpacf": { @@ -79163,7 +79943,7 @@ "name": "lpcde", "version": "0.1.4", "sha256": "0gb130x8177bcw3snrndm87p21na6v3zayqcn9z16rviiyy1nscg", - "depends": ["combinat", "ggplot2", "MASS", "Matrix", "mvtnorm", "purrr", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "Rdpack", "combinat", "ggplot2", "mvtnorm", "purrr"] }, "lpda": { "name": "lpda", @@ -79175,7 +79955,7 @@ "name": "lpdensity", "version": "2.4", "sha256": "1vbbvg2wb2jggqls185bwpm8c8ky6693kai3lr5xz4r8f6ivdm29", - "depends": ["ggplot2", "MASS"] + "depends": ["MASS", "ggplot2"] }, "lphom": { "name": "lphom", @@ -79193,7 +79973,7 @@ "name": "lpirfs", "version": "0.2.3", "sha256": "1ncg341xv8bf6jl8m6aqhd2ds8lmi4wf0gxj9fnbi5gbxpbqk50y", - "depends": ["doParallel", "dplyr", "foreach", "ggplot2", "gridExtra", "lmtest", "plm", "Rcpp", "RcppArmadillo", "sandwich"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "dplyr", "foreach", "ggplot2", "gridExtra", "lmtest", "plm", "sandwich"] }, "lpl": { "name": "lpl", @@ -79201,12 +79981,6 @@ "sha256": "11w2cr5n72p4wds5dm039rdinhvxjfqvrmisksfpf47jddjxhm42", "depends": ["MASS", "survival"] }, - "lpme": { - "name": "lpme", - "version": "1.1.3", - "sha256": "1ch11cwjci98m7952p9wdsh9fj5y1mjya6ayq0q4wmbm824qfpzb", - "depends": ["decon", "flexmix", "locpol", "Rcpp", "RcppArmadillo"] - }, "lpridge": { "name": "lpridge", "version": "1.1-0", @@ -79217,19 +79991,19 @@ "name": "lqmix", "version": "1.0", "sha256": "1pk156gckprp3nvqbhxbbr77njj2gcfmkd8fh8jmzb3bhkf0nlj2", - "depends": ["diagram", "doParallel", "foreach", "quantreg", "Rdpack"] + "depends": ["Rdpack", "diagram", "doParallel", "foreach", "quantreg"] }, "lqmm": { "name": "lqmm", "version": "1.5.8", "sha256": "1ywiyq6k8fb1ffild1r0rglwc6a5sv1kqfqam28337bbxppdxv8i", - "depends": ["nlme", "SparseGrid"] + "depends": ["SparseGrid", "nlme"] }, "lqr": { "name": "lqr", - "version": "5.0", - "sha256": "1qhzsr6sls9f49aa6m72qhffzxqvsvzqlx47h29z8mm37bd74v8b", - "depends": ["MASS", "MomTrunc", "numDeriv", "quantreg", "spatstat_geom"] + "version": "5.2", + "sha256": "073n59niqy27zchmwp0y7a5p8dnkn5libzs5lbbwfnp0j2mkc7n1", + "depends": ["MASS", "MomTrunc", "numDeriv", "quantreg", "spatstat_univar"] }, "lrd": { "name": "lrd", @@ -79257,9 +80031,9 @@ }, "lrstat": { "name": "lrstat", - "version": "0.2.7", - "sha256": "1r25716gq78imyy0f2cja2vh1ldjn5766iaa65x4z5rdcz3gcd80", - "depends": ["lpSolve", "mvtnorm", "Rcpp", "shiny"] + "version": "0.2.9", + "sha256": "046j8v4faj4hfap7hn1bdin7zwxbck8732c3ay8ncxilh46bpgs9", + "depends": ["Rcpp", "lpSolve", "mvtnorm", "shiny"] }, "lsa": { "name": "lsa", @@ -79277,13 +80051,13 @@ "name": "lsbclust", "version": "1.1", "sha256": "1pbai58pfvhfcrd0nj13d54vrn9wrx2xapqhgqa1pkrjwbk5amj7", - "depends": ["clue", "doParallel", "foreach", "ggplot2", "gridExtra", "mvtnorm", "plyr", "Rcpp", "reshape2"] + "depends": ["Rcpp", "clue", "doParallel", "foreach", "ggplot2", "gridExtra", "mvtnorm", "plyr", "reshape2"] }, "lsbs": { "name": "lsbs", "version": "0.1", "sha256": "14aq80zg89lq7hffv1v1m4n7hbzqzxkazcga4y2fq40ij3v7kv6n", - "depends": ["ks", "Matrix", "numDeriv"] + "depends": ["Matrix", "ks", "numDeriv"] }, "lsdbc": { "name": "lsdbc", @@ -79299,9 +80073,9 @@ }, "lsirm12pl": { "name": "lsirm12pl", - "version": "1.3.1", - "sha256": "0w26zq4lylg9x2qyxx4d46phlkih2cdcgjar45k9x7fav8gw6cry", - "depends": ["coda", "dplyr", "fpc", "ggplot2", "GPArotation", "gridExtra", "kernlab", "MCMCpack", "plotly", "pROC", "Rcpp", "RcppArmadillo", "rlang", "spatstat", "spatstat_geom", "spatstat_random"] + "version": "1.3.2", + "sha256": "0fsn1p9jdh3v64b473g1jz0nv0vr1psza9s4lijflyc2rmgnx9cd", + "depends": ["GPArotation", "MCMCpack", "Rcpp", "RcppArmadillo", "coda", "dplyr", "fpc", "ggplot2", "gridExtra", "kernlab", "pROC", "plotly", "plyr", "purrr", "rlang", "spatstat", "spatstat_geom", "spatstat_random", "tidyr"] }, "lsl": { "name": "lsl", @@ -79313,7 +80087,7 @@ "name": "lslx", "version": "0.6.11", "sha256": "1mjkz3zgcajrrkq1igqq0a1rpxwvv41ankr5mj6mcjqpg4ggng1p", - "depends": ["ggplot2", "R6", "Rcpp", "RcppEigen"] + "depends": ["R6", "Rcpp", "RcppEigen", "ggplot2"] }, "lsm": { "name": "lsm", @@ -79337,7 +80111,7 @@ "name": "lspartition", "version": "0.4", "sha256": "1n0pag5l4kx211dl5z9xbqijp7l04jcm0i6jgvkk2b0x9v32q4r5", - "depends": ["combinat", "dplyr", "ggplot2", "MASS", "matrixStats", "mgcv", "pracma"] + "depends": ["MASS", "combinat", "dplyr", "ggplot2", "matrixStats", "mgcv", "pracma"] }, "lspline": { "name": "lspline", @@ -79365,9 +80139,9 @@ }, "ltable": { "name": "ltable", - "version": "2.0.3", - "sha256": "09njp8xmfm1ci94ma8vm89994kkz7p7ka6z3gjc9va8jgpl0r5r3", - "depends": ["clipr"] + "version": "2.0.4", + "sha256": "1z3wbmxmjjwkb7f8qcpyn7a8wnh6q7592j39l4r92gq9gcg39n8x", + "depends": ["MASS", "clipr", "nloptr"] }, "lterdatasampler": { "name": "lterdatasampler", @@ -79413,15 +80187,15 @@ }, "ltsk": { "name": "ltsk", - "version": "1.1.1", - "sha256": "01f0jvm4fihssgfhb062wlqqvrfdikixycxfz93dkqahjmrjz5dl", + "version": "1.1.2", + "sha256": "1l599dc52l5sq9avrb6ij6apxwba3qqa4vgcngmwsn9y76h3wal7", "depends": [] }, "ltsspca": { "name": "ltsspca", "version": "0.1.0", "sha256": "0hgl2zd8y01z8mhnqg1hlv1l7klpwhwk7q8b99pw9vgnh1f2gnfs", - "depends": ["pracma", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "pracma"] }, "ltxsparklines": { "name": "ltxsparklines", @@ -79431,8 +80205,8 @@ }, "luajr": { "name": "luajr", - "version": "0.1.7", - "sha256": "123zvkq57n787l1aqnyddxzd1d45899hlbgb5ikzk1xy85851zsr", + "version": "0.1.8", + "sha256": "0f4p7f6qcpib1gqnsm08lqpcawafk7r5n10yjqf5hw4dpsfz934g", "depends": [] }, "lubridate": { @@ -79451,7 +80225,7 @@ "name": "lucas", "version": "1.0", "sha256": "1ws35f2pq2y7nnik40nj4qpz1d499gfc5isr1409pwy6r5knb78q", - "depends": ["DBI", "plyr", "rpostgis", "RPostgreSQL"] + "depends": ["DBI", "RPostgreSQL", "plyr", "rpostgis"] }, "lucid": { "name": "lucid", @@ -79463,7 +80237,7 @@ "name": "ludic", "version": "0.2.0", "sha256": "08j6y65dxalyrcp14mry7a393if42lfh8smkq1q70dsdk6645j7d", - "depends": ["fGarch", "landpred", "Matrix", "Rcpp", "RcppArmadillo", "rootSolve"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "fGarch", "landpred", "rootSolve"] }, "lue": { "name": "lue", @@ -79475,7 +80249,7 @@ "name": "lulcc", "version": "1.0.4", "sha256": "00ymbp20kbjyzrsrxa262y0y7fj4jgsbqf56aapb657xvafxvy5q", - "depends": ["lattice", "raster", "rasterVis", "ROCR"] + "depends": ["ROCR", "lattice", "raster", "rasterVis"] }, "lumberjack": { "name": "lumberjack", @@ -79493,13 +80267,13 @@ "name": "lutz", "version": "0.3.2", "sha256": "19p41pz2q5abqi6ba4l6fzww90g11lscjz2223ml0gkcryxn3447", - "depends": ["lubridate", "Rcpp"] + "depends": ["Rcpp", "lubridate"] }, "luz": { "name": "luz", "version": "0.4.0", "sha256": "02p1h6rhjvdkw10az1zzz0fd4l8nhn04bwkr71l73a94fbwm6dpz", - "depends": ["cli", "coro", "ellipsis", "fs", "generics", "glue", "magrittr", "prettyunits", "progress", "purrr", "R6", "rlang", "torch", "zeallot"] + "depends": ["R6", "cli", "coro", "ellipsis", "fs", "generics", "glue", "magrittr", "prettyunits", "progress", "purrr", "rlang", "torch", "zeallot"] }, "luzlogr": { "name": "luzlogr", @@ -79511,7 +80285,7 @@ "name": "lvmcomp", "version": "1.2", "sha256": "08hs97bdz4n0bdhvqqq5xywfy140s69c750rn38criq4cw4gm3z7", - "depends": ["coda", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "coda"] }, "lvmisc": { "name": "lvmisc", @@ -79523,13 +80297,13 @@ "name": "lvnet", "version": "0.3.5", "sha256": "1wqqxavs2s0hmlifyaa1jrlc8hj4z72fkgjckkmh9m2r4jp9zy0g", - "depends": ["corpcor", "dplyr", "glasso", "lavaan", "Matrix", "mvtnorm", "OpenMx", "psych", "qgraph", "semPlot"] + "depends": ["Matrix", "OpenMx", "corpcor", "dplyr", "glasso", "lavaan", "mvtnorm", "psych", "qgraph", "semPlot"] }, "lvplot": { "name": "lvplot", "version": "0.2.1", "sha256": "0zby40866kvqxdz4hk6r0f4rfh7rzmy0n899cjjg5rqzcap7s5di", - "depends": ["ggplot2", "RColorBrewer", "tibble"] + "depends": ["RColorBrewer", "ggplot2", "tibble"] }, "lwgeom": { "name": "lwgeom", @@ -79541,7 +80315,7 @@ "name": "lwqs", "version": "0.5.0", "sha256": "11hkz3b3sgm6v30gwaq463klljjf6c4qx26a5ccc1wl6r439gxqp", - "depends": ["data_table", "gamm4", "ggplot2", "gridExtra", "gWQS", "plyr"] + "depends": ["data_table", "gWQS", "gamm4", "ggplot2", "gridExtra", "plyr"] }, "lzstring": { "name": "lzstring", @@ -79553,13 +80327,13 @@ "name": "m2b", "version": "1.0", "sha256": "0agzw67mmwrw1f61yn24z5w1pgjssdapg3li0a53i3ylnij45mzr", - "depends": ["caret", "caTools", "e1071", "geosphere", "ggplot2", "randomForest"] + "depends": ["caTools", "caret", "e1071", "geosphere", "ggplot2", "randomForest"] }, "m2r": { "name": "m2r", "version": "1.0.2", "sha256": "0vwvpalap4z5x2004c92n0ka7i4l64ry5n8pmxs4vjpd8fyx91gc", - "depends": ["gmp", "memoise", "mpoly", "Rcpp", "stringr", "usethis"] + "depends": ["Rcpp", "gmp", "memoise", "mpoly", "stringr", "usethis"] }, "m5": { "name": "m5", @@ -79589,7 +80363,7 @@ "name": "mDAG", "version": "1.2.2", "sha256": "0k85sl0jmpcpiz92cz6x3kd8jc6yyfv9z4wm1kyaikcf5q4qlad4", - "depends": ["bnlearn", "logistf", "mgm", "nnet", "pcalg", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "bnlearn", "logistf", "mgm", "nnet", "pcalg"] }, "mExplorer": { "name": "mExplorer", @@ -79601,7 +80375,7 @@ "name": "mFD", "version": "1.0.7", "sha256": "1jr5d5669mz4ifacaghnj7109ypfrikagjgxi2a33iqj0g63x3hp", - "depends": ["ade4", "ape", "betapart", "cluster", "dendextend", "FactoMineR", "gawdis", "geometry", "ggplot2", "ggrepel", "Hmisc", "patchwork", "reshape2", "rstatix", "vegan"] + "depends": ["FactoMineR", "Hmisc", "ade4", "ape", "betapart", "cluster", "dendextend", "gawdis", "geometry", "ggplot2", "ggrepel", "patchwork", "reshape2", "rstatix", "vegan"] }, "mFDP": { "name": "mFDP", @@ -79631,13 +80405,13 @@ "name": "mHMMbayes", "version": "1.1.0", "sha256": "1z13zzim90akaz82dbp8s81zyhcd3xmx3wmqvkcaq5wqh2p64s7a", - "depends": ["MCMCpack", "mvtnorm", "Rcpp", "Rdpack"] + "depends": ["MCMCpack", "Rcpp", "Rdpack", "mvtnorm"] }, "mMARCH_AC": { "name": "mMARCH.AC", "version": "2.9.2.0", "sha256": "0lp32m6cfplbm72g0j1cm1c7rcpmy5jrsd3p577p9a4bwqf5ynxc", - "depends": ["abind", "accelerometry", "ActCR", "ActFrag", "cosinor", "cosinor2", "denseFLMM", "dplyr", "GGIR", "ineq", "kableExtra", "minpack_lm", "refund", "survival", "tidyr", "xlsx", "zoo"] + "depends": ["ActCR", "ActFrag", "GGIR", "abind", "accelerometry", "cosinor", "cosinor2", "denseFLMM", "dplyr", "ineq", "kableExtra", "minpack_lm", "refund", "survival", "tidyr", "xlsx", "zoo"] }, "mMPA": { "name": "mMPA", @@ -79661,7 +80435,7 @@ "name": "mRpostman", "version": "1.1.2", "sha256": "0ss00mxk0s3lpxrhy3hszx6hmf7qiycl8vdif1fdzxz5yglki4xa", - "depends": ["assertthat", "base64enc", "curl", "magrittr", "R6", "rvest", "stringi", "stringr", "xml2"] + "depends": ["R6", "assertthat", "base64enc", "curl", "magrittr", "rvest", "stringi", "stringr", "xml2"] }, "mSTEM": { "name": "mSTEM", @@ -79703,7 +80477,7 @@ "name": "maat", "version": "1.1.0", "sha256": "0slyigq90bn2dn09s2ipc13glsywwzs7y5d80zyazwwr51i23xsq", - "depends": ["diagram", "MASS", "readxl", "TestDesign"] + "depends": ["MASS", "TestDesign", "diagram", "readxl"] }, "mable": { "name": "mable", @@ -79715,7 +80489,7 @@ "name": "macc", "version": "1.0.1", "sha256": "1qj4mlikbqrxa6m46527xmxdbk7b3l95z6jdgpmi0ifywjiv52a4", - "depends": ["car", "lme4", "MASS", "nlme", "optimx"] + "depends": ["MASS", "car", "lme4", "nlme", "optimx"] }, "macleish": { "name": "macleish", @@ -79739,7 +80513,7 @@ "name": "macrocol", "version": "0.1.0", "sha256": "1qz5hsxg4ga4blbrakn4bia2l4lh6h5kh4ix7vnm7rl2f7yk4r5a", - "depends": ["httr", "lubridate", "openxlsx", "R_utils", "readxl"] + "depends": ["R_utils", "httr", "lubridate", "openxlsx", "readxl"] }, "macrosyntR": { "name": "macrosyntR", @@ -79757,7 +80531,7 @@ "name": "maczic", "version": "1.0.0", "sha256": "02papbs1pw470cxzwcgvn8px5hvvg1p8zpmcrk5zqmlpzgjsdx2l", - "depends": ["BB", "emplik", "MASS", "mathjaxr", "mediation", "pscl", "sandwich", "survival"] + "depends": ["BB", "MASS", "emplik", "mathjaxr", "mediation", "pscl", "sandwich", "survival"] }, "mada": { "name": "mada", @@ -79787,7 +80561,7 @@ "name": "madness", "version": "0.2.8", "sha256": "1a0jcvy7xq654hcjv0nsjfhwh9fgxzhk7grjy209mgzmkivdinpq", - "depends": ["expm", "Matrix", "matrixcalc"] + "depends": ["Matrix", "expm", "matrixcalc"] }, "madr": { "name": "madr", @@ -79799,13 +80573,13 @@ "name": "madrat", "version": "3.6.4", "sha256": "03wkzpr0nx50li0g69fn2fznfh6nbg4sdpymsilx3387v50vc9vs", - "depends": ["callr", "digest", "igraph", "magclass", "Matrix", "pkgload", "renv", "stringi", "withr", "yaml"] + "depends": ["Matrix", "callr", "digest", "igraph", "magclass", "pkgload", "renv", "stringi", "withr", "yaml"] }, "madshapR": { "name": "madshapR", "version": "1.1.0", "sha256": "035hxkkhxi68id1f3q9qyl82kzphq9als60x7wv03gmzi6fn85zy", - "depends": ["bookdown", "crayon", "dplyr", "DT", "fabR", "forcats", "fs", "ggplot2", "haven", "janitor", "knitr", "lifecycle", "lubridate", "readr", "rlang", "stringr", "tidyr", "tidytext"] + "depends": ["DT", "bookdown", "crayon", "dplyr", "fabR", "forcats", "fs", "ggplot2", "haven", "janitor", "knitr", "lifecycle", "lubridate", "readr", "rlang", "stringr", "tidyr", "tidytext"] }, "madsim": { "name": "madsim", @@ -79813,6 +80587,12 @@ "sha256": "11gfyimbz363p5xy1x6rsz5fcgzcr55myc5aaz5lazjkcnfn17aq", "depends": [] }, + "maestro": { + "name": "maestro", + "version": "0.1.2", + "sha256": "0mdrphwsr4wywgndi90hif688sah7brx45g62q8hjbyqpvx272ly", + "depends": ["R_utils", "cli", "dplyr", "glue", "logger", "lubridate", "purrr", "rlang", "roxygen2", "tictoc", "timechange"] + }, "magclass": { "name": "magclass", "version": "6.13.2", @@ -79821,9 +80601,9 @@ }, "magi": { "name": "magi", - "version": "1.2.3", - "sha256": "047wzhqkdpjlhz7r6cks7pwvjc4bwv8hsd41zqm5gcvfhwjrnyxm", - "depends": ["BH", "deSolve", "gridBase", "gridExtra", "Rcpp", "RcppArmadillo", "roptim"] + "version": "1.2.4", + "sha256": "0xri39mjq9x8gdj1a69h1sby2i6vcx4vx86zv483128wb0qwgfww", + "depends": ["BH", "Rcpp", "RcppArmadillo", "deSolve", "gridBase", "gridExtra", "roptim"] }, "magic": { "name": "magic", @@ -79841,7 +80621,7 @@ "name": "magicaxis", "version": "2.4.5", "sha256": "04wj0g345mlndd1s7v7klxldxlp293xdgjyrnfpzxckg59804j3d", - "depends": ["celestial", "mapproj", "MASS", "plotrix", "RANN", "sm"] + "depends": ["MASS", "RANN", "celestial", "mapproj", "plotrix", "sm"] }, "magicfor": { "name": "magicfor", @@ -79851,9 +80631,9 @@ }, "magick": { "name": "magick", - "version": "2.8.3", - "sha256": "0yf08ns5qgqi2bzvxvawip521ji2rgvvfrhj747zb6ci5qnm4awk", - "depends": ["curl", "magrittr", "Rcpp"] + "version": "2.8.4", + "sha256": "02pa6kkymj4idawnffqk2fn6zgkw33ib6541vclvg5hd1wvh7j25", + "depends": ["Rcpp", "curl", "magrittr"] }, "magickGUI": { "name": "magickGUI", @@ -79895,7 +80675,7 @@ "name": "mailR", "version": "0.8", "sha256": "0p6vxzpyms1pxdb0j07izzxinw8xfmmbsj35nkypxyjv92qi802k", - "depends": ["assertthat", "R_utils", "rJava", "stringr"] + "depends": ["R_utils", "assertthat", "rJava", "stringr"] }, "mailchimpR": { "name": "mailchimpR", @@ -79919,7 +80699,7 @@ "name": "makeFlow", "version": "1.0.2", "sha256": "0r7a0klgx144rnks0fhjflnf8vfyyx2544n86nnxkp6cdvw0b4pw", - "depends": ["dplyr", "RColorBrewer"] + "depends": ["RColorBrewer", "dplyr"] }, "makePalette": { "name": "makePalette", @@ -79949,13 +80729,13 @@ "name": "makemyprior", "version": "1.2.1", "sha256": "02zhgskkfr964g813rly0lym4j0msgmyggfgz6l00vcpnffqy9fq", - "depends": ["ggplot2", "MASS", "Matrix", "rlang", "shiny", "shinyBS", "shinyjs", "visNetwork"] + "depends": ["MASS", "Matrix", "ggplot2", "rlang", "shiny", "shinyBS", "shinyjs", "visNetwork"] }, "makepipe": { "name": "makepipe", "version": "0.2.1", "sha256": "0mhabnmpvjamgam63nrjdimn94azn8crafr9jcwsr08lzlbv9kmv", - "depends": ["cli", "nomnoml", "R6", "roxygen2"] + "depends": ["R6", "cli", "nomnoml", "roxygen2"] }, "maketools": { "name": "maketools", @@ -79973,7 +80753,7 @@ "name": "malan", "version": "1.0.3", "sha256": "1m11rxzmvkdvpkcnhjwwgrhkmbylwjpqnn47zyy5wna66c3zzvr6", - "depends": ["dplyr", "igraph", "magrittr", "Rcpp", "RcppArmadillo", "RcppProgress", "tibble", "tidygraph"] + "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "dplyr", "igraph", "magrittr", "tibble", "tidygraph"] }, "malani": { "name": "malani", @@ -79983,9 +80763,9 @@ }, "malariaAtlas": { "name": "malariaAtlas", - "version": "1.5.1", - "sha256": "1fr1dwlv6q8fb0m0jccd2hymi4m62kgjxbkras07zmsk8sci5zmn", - "depends": ["dplyr", "future_apply", "ggplot2", "gridExtra", "httr", "jsonlite", "lifecycle", "lubridate", "ows4R", "rlang", "sf", "stringr", "terra", "tidyr", "tidyterra", "xml2"] + "version": "1.6.1", + "sha256": "05d62m4w93bfx868sk8w6navw8w5z0jx30w2wnzma27gjydyc0z1", + "depends": ["dplyr", "future_apply", "ggnewscale", "ggplot2", "gridExtra", "httr", "jsonlite", "lifecycle", "lubridate", "ows4R", "rlang", "sf", "stringr", "terra", "tidyr", "tidyterra", "xml2"] }, "malaytextr": { "name": "malaytextr", @@ -79997,7 +80777,7 @@ "name": "maldipickr", "version": "1.3.0", "sha256": "1k534c8x3ygf44r7q1nybd8b6gl3pw0h0r6ddwc35jxq1vmxx6qi", - "depends": ["dplyr", "lifecycle", "magrittr", "MALDIquant", "readBrukerFlexData", "rlang", "tibble", "tidyr", "tidyselect"] + "depends": ["MALDIquant", "dplyr", "lifecycle", "magrittr", "readBrukerFlexData", "rlang", "tibble", "tidyr", "tidyselect"] }, "mallet": { "name": "mallet", @@ -80033,7 +80813,7 @@ "name": "manet", "version": "2.0", "sha256": "1dnacgkdjmn7yiqk71qx5jgfipbpvqfdnrdd8wm0b9p8kgw4x7n4", - "depends": ["combinat", "igraph", "mclust", "MCMCpack"] + "depends": ["MCMCpack", "combinat", "igraph", "mclust"] }, "manhattanly": { "name": "manhattanly", @@ -80051,7 +80831,7 @@ "name": "manifestoR", "version": "1.6.0", "sha256": "1ghzhsd7apib775h2nmv33mvwg5yqwp5w9bn7alppgfa16yznf31", - "depends": ["base64enc", "dplyr", "DT", "functional", "htmltools", "htmlwidgets", "httr", "jsonlite", "magrittr", "NLP", "psych", "purrr", "readr", "tibble", "tidyselect", "tm", "zoo"] + "depends": ["DT", "NLP", "base64enc", "dplyr", "functional", "htmltools", "htmlwidgets", "httr", "jsonlite", "magrittr", "psych", "purrr", "readr", "tibble", "tidyselect", "tm", "zoo"] }, "manifold": { "name": "manifold", @@ -80087,13 +80867,13 @@ "name": "manymodelr", "version": "0.3.7", "sha256": "0kc4y9i21qkcg0pkwlas2mm06s54s70w5ybw4215qjwiy6xax268", - "depends": ["caret", "dplyr", "e1071", "ggplot2", "lme4", "Metrics"] + "depends": ["Metrics", "caret", "dplyr", "e1071", "ggplot2", "lme4"] }, "manymome": { "name": "manymome", "version": "0.2.2", "sha256": "1j7rvk3xdxxji7l1jqi0fgv9x9vwrymdmfpj7plg8vc53apnfy5f", - "depends": ["boot", "ggplot2", "igraph", "lavaan", "MASS", "pbapply"] + "depends": ["MASS", "boot", "ggplot2", "igraph", "lavaan", "pbapply"] }, "manymome_table": { "name": "manymome.table", @@ -80103,15 +80883,15 @@ }, "manynet": { "name": "manynet", - "version": "0.4.4", - "sha256": "1k17yikr7p6pvx5sm3k4xr0954r0a9sllrwywbkwz11w5703sk3y", - "depends": ["dplyr", "ggplot2", "ggraph", "igraph", "network", "pillar", "tidygraph"] + "version": "1.0.2", + "sha256": "0bqd46n30rsy87nc5ylwp7k0wzfmddkq3in38420c4rds3gf1m51", + "depends": ["dplyr", "ggplot2", "ggraph", "igraph", "minMSE", "network", "pillar", "tidygraph"] }, "maotai": { "name": "maotai", "version": "0.2.5", "sha256": "1axr16xs366011vkx3j8mljq98923kscz8wrl9m1zprw3pqif6jr", - "depends": ["cluster", "dbscan", "fastcluster", "labdsv", "Matrix", "pracma", "RANN", "Rcpp", "RcppArmadillo", "RcppDist", "Rdpack", "RSpectra", "Rtsne", "shapes"] + "depends": ["Matrix", "RANN", "RSpectra", "Rcpp", "RcppArmadillo", "RcppDist", "Rdpack", "Rtsne", "cluster", "dbscan", "fastcluster", "labdsv", "pracma", "shapes"] }, "mapSpain": { "name": "mapSpain", @@ -80123,7 +80903,7 @@ "name": "mapStats", "version": "3.1", "sha256": "1jf5dgf9i9339xzk9fbipy9b2fkwdv6sy1ciif921snwj176zck9", - "depends": ["classInt", "colorspace", "Hmisc", "lattice", "RColorBrewer", "reshape2", "sf", "sp", "survey", "ttutils"] + "depends": ["Hmisc", "RColorBrewer", "classInt", "colorspace", "lattice", "reshape2", "sf", "sp", "survey", "ttutils"] }, "mapaccuracy": { "name": "mapaccuracy", @@ -80171,7 +80951,7 @@ "name": "mapdeck", "version": "0.3.5", "sha256": "17z3fd0k5qlmy7yzdlbi105kadak86nwmb6zw39rd10in6j3vfc2", - "depends": ["BH", "colourvalues", "geojsonsf", "geometries", "googlePolylines", "htmlwidgets", "interleave", "jsonify", "magrittr", "rapidjsonr", "Rcpp", "sfheaders", "shiny", "spatialwidget"] + "depends": ["BH", "Rcpp", "colourvalues", "geojsonsf", "geometries", "googlePolylines", "htmlwidgets", "interleave", "jsonify", "magrittr", "rapidjsonr", "sfheaders", "shiny", "spatialwidget"] }, "mapedit": { "name": "mapedit", @@ -80183,13 +80963,19 @@ "name": "mapfit", "version": "1.0.0", "sha256": "0xdkc325y75mcx082b6ncp1n2mfq0yq67j2mkfdcpavnz6s8jdqg", - "depends": ["deformula", "Matrix", "R6", "Rcpp"] + "depends": ["Matrix", "R6", "Rcpp", "deformula"] + }, + "mapgl": { + "name": "mapgl", + "version": "0.1.2", + "sha256": "0azjdkywmyn9njddy1kish69as8dg9yp18qly6fqljbh50c2rlkj", + "depends": ["base64enc", "classInt", "geojsonsf", "htmltools", "htmlwidgets", "rlang", "sf", "terra"] }, "mapi": { "name": "mapi", "version": "1.0.5", "sha256": "1yljvapzkb43i2sbqsmn5aqp95hm8gjkz8m41x1chwyfddrzjsbw", - "depends": ["data_table", "pbapply", "Rcpp", "sf"] + "depends": ["Rcpp", "data_table", "pbapply", "sf"] }, "mapiso": { "name": "mapiso", @@ -80205,9 +80991,9 @@ }, "mapme_biodiversity": { "name": "mapme.biodiversity", - "version": "0.7.0", - "sha256": "093ffdmnfgfjs4ja07xp9knalnqx9il08vbkiq8i0y21g3q11k62", - "depends": ["dplyr", "furrr", "httr", "magrittr", "purrr", "R_utils", "sf", "terra", "tibble", "tidyr"] + "version": "0.8.0", + "sha256": "1fx8779vp4a1k5qy4csqhj5wmhd7aamkzl9mlwk6v4rx667szdzj", + "depends": ["dplyr", "furrr", "httr", "jsonlite", "magrittr", "purrr", "sf", "terra", "tibble", "tidyr"] }, "mapmisc": { "name": "mapmisc", @@ -80219,7 +81005,7 @@ "name": "mapmixture", "version": "1.1.3", "sha256": "0ndr0ds8fjlrx54042ch9ks07b6983fnqj84zih57aa4xk8y8sng", - "depends": ["bslib", "colourpicker", "dplyr", "ggplot2", "ggspatial", "htmltools", "purrr", "rlang", "rnaturalearthdata", "sf", "shiny", "shinyFeedback", "shinyjs", "shinyWidgets", "stringr", "tidyr", "waiter"] + "depends": ["bslib", "colourpicker", "dplyr", "ggplot2", "ggspatial", "htmltools", "purrr", "rlang", "rnaturalearthdata", "sf", "shiny", "shinyFeedback", "shinyWidgets", "shinyjs", "stringr", "tidyr", "waiter"] }, "mapping": { "name": "mapping", @@ -80243,7 +81029,7 @@ "name": "mappoly", "version": "0.4.1", "sha256": "13wifh29i3g8m3gvw058nh3ma7fici2qijnpzb9ph27y67a3b6s9", - "depends": ["cli", "crayon", "dendextend", "dplyr", "fields", "ggplot2", "ggpubr", "ggsci", "magrittr", "plot3D", "plotly", "princurve", "Rcpp", "RcppParallel", "RCurl", "reshape2", "rstudioapi", "smacof", "vcfR", "zoo"] + "depends": ["RCurl", "Rcpp", "RcppParallel", "cli", "crayon", "dendextend", "dplyr", "fields", "ggplot2", "ggpubr", "ggsci", "magrittr", "plot3D", "plotly", "princurve", "reshape2", "rstudioapi", "smacof", "vcfR", "zoo"] }, "mappp": { "name": "mappp", @@ -80285,18 +81071,18 @@ "name": "mapsapi", "version": "0.5.4", "sha256": "0gk5k0zf3yzq7rzw17j7ph3fzpf6q6j777ri242wmi75xzkamrsc", - "depends": ["bitops", "httr", "RgoogleMaps", "sf", "stars", "xml2"] + "depends": ["RgoogleMaps", "bitops", "httr", "sf", "stars", "xml2"] }, "mapscanner": { "name": "mapscanner", - "version": "0.0.6", - "sha256": "017m33v2523rjmspfbzq1xnb3clzmbn4p1qqzp480j71wy5c1dry", - "depends": ["cli", "curl", "fs", "glue", "magick", "magrittr", "memoise", "pdftools", "png", "purrr", "raster", "Rcpp", "reproj", "RNiftyReg", "sf", "slippymath", "tibble"] + "version": "0.1.1", + "sha256": "1fi8zsaylspbwxlh0sw82mhq8m4szl6sggvl3r1c2fwkpckn9qkn", + "depends": ["RNiftyReg", "Rcpp", "cli", "curl", "fs", "glue", "magick", "magrittr", "memoise", "pdftools", "png", "purrr", "raster", "reproj", "sf", "slippymath", "tibble"] }, "mapsf": { "name": "mapsf", - "version": "0.10.1", - "sha256": "134hmnlbc7pmazkfm3jmisklgpnxvjhdwfandxclxy4pfrp92ixq", + "version": "0.11.0", + "sha256": "0vyy88fflkz5iaanbp77dxznw528ikr06q4q4srxcp0ylg71fq4m", "depends": ["classInt", "maplegend", "s2", "sf"] }, "maptiles": { @@ -80357,7 +81143,7 @@ "name": "marcher", "version": "0.0-2", "sha256": "0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q", - "depends": ["magrittr", "Matrix", "minpack_lm", "mvtnorm", "numDeriv", "plyr", "RColorBrewer", "scales", "zoo"] + "depends": ["Matrix", "RColorBrewer", "magrittr", "minpack_lm", "mvtnorm", "numDeriv", "plyr", "scales", "zoo"] }, "marelac": { "name": "marelac", @@ -80381,7 +81167,7 @@ "name": "marginaleffects", "version": "0.21.0", "sha256": "1zq9xkaacgy3d3rsbhdjaprd352mcpbfwn9jazijx6csjs5pxqmp", - "depends": ["checkmate", "data_table", "generics", "insight", "Rcpp", "RcppEigen", "rlang"] + "depends": ["Rcpp", "RcppEigen", "checkmate", "data_table", "generics", "insight", "rlang"] }, "marginalizedRisk": { "name": "marginalizedRisk", @@ -80391,9 +81177,9 @@ }, "margins": { "name": "margins", - "version": "0.3.27", - "sha256": "1jlxg8pwmyd4nzmczp2909rjd68nz7vl8m2g35jywh05b85b0slk", - "depends": ["data_table", "MASS", "prediction"] + "version": "0.3.28", + "sha256": "01wlx5f2kjc4n9md0zr9m73li6iwlngk1rdwifhhwc22hf4jijc9", + "depends": ["MASS", "data_table", "prediction"] }, "marima": { "name": "marima", @@ -80423,13 +81209,13 @@ "name": "marked", "version": "1.2.8", "sha256": "1i5vay60g6ddqnnqdj89yhsqxdcw9yzqpwq9gv7qc1psb8f77052", - "depends": ["bookdown", "coda", "data_table", "expm", "kableExtra", "knitr", "lme4", "Matrix", "numDeriv", "optimx", "R2admb", "Rcpp", "TMB", "truncnorm"] + "depends": ["Matrix", "R2admb", "Rcpp", "TMB", "bookdown", "coda", "data_table", "expm", "kableExtra", "knitr", "lme4", "numDeriv", "optimx", "truncnorm"] }, "markerpen": { "name": "markerpen", "version": "0.1.1", "sha256": "0i9md9vbqkxibjkn37givxzq8mq0232cvv2fyz6g8cj6flxm6vzr", - "depends": ["Rcpp", "RcppEigen", "RSpectra"] + "depends": ["RSpectra", "Rcpp", "RcppEigen"] }, "marketr": { "name": "marketr", @@ -80441,7 +81227,7 @@ "name": "markets", "version": "1.1.5", "sha256": "1by2cm3hlw6jgdd5l30frjm5q83llizp09z6v1ajmb51lkrdnqf5", - "depends": ["dplyr", "Formula", "MASS", "Rcpp", "RcppGSL", "RcppParallel", "rlang"] + "depends": ["Formula", "MASS", "Rcpp", "RcppGSL", "RcppParallel", "dplyr", "rlang"] }, "markmyassignment": { "name": "markmyassignment", @@ -80453,7 +81239,7 @@ "name": "markophylo", "version": "1.0.9", "sha256": "0w6csdvlybfx8azjsrz40mykafgqkl0w23bf2mm2ff5jh6cym66a", - "depends": ["ape", "geiger", "numDeriv", "phangorn", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "ape", "geiger", "numDeriv", "phangorn"] }, "markovMSM": { "name": "markovMSM", @@ -80465,25 +81251,25 @@ "name": "markovchain", "version": "0.9.5", "sha256": "0z67i4j676gwvxyf1gw73x7jib7jm5jgyzqvami47mfvc3b2dygf", - "depends": ["expm", "igraph", "Matrix", "Rcpp", "RcppArmadillo", "RcppParallel"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "expm", "igraph"] }, "markovmix": { "name": "markovmix", "version": "0.1.3", "sha256": "07fzyg7szs4662jww6xpdlvki5wc60g2aw16884ghd8h9ch625yi", - "depends": ["dplyr", "forcats", "pillar", "purrr", "Rcpp", "rlang", "tibble", "tidyr"] + "depends": ["Rcpp", "dplyr", "forcats", "pillar", "purrr", "rlang", "tibble", "tidyr"] }, "marmap": { "name": "marmap", "version": "1.0.10", "sha256": "0zmik6hpc44syknn7k9pbmy01jpnlp4sc9n3rhslrpnks39l0hvq", - "depends": ["adehabitatMA", "DBI", "gdistance", "geosphere", "ggplot2", "ncdf4", "plotrix", "raster", "reshape2", "RSQLite", "shape", "sp"] + "depends": ["DBI", "RSQLite", "adehabitatMA", "gdistance", "geosphere", "ggplot2", "ncdf4", "plotrix", "raster", "reshape2", "shape", "sp"] }, "marp": { "name": "marp", "version": "0.1.0", "sha256": "0vywqsvmhghldrpnh2dpkgz41r7q463whfhgrn38pg8jnyhliiwi", - "depends": ["gtools", "statmod", "VGAM"] + "depends": ["VGAM", "gtools", "statmod"] }, "marqLevAlg": { "name": "marqLevAlg", @@ -80513,13 +81299,13 @@ "name": "mase", "version": "0.1.5.2", "sha256": "0fvbsw6y5whysm70wr74pzj5knnw91gzpihi9snq69q1axg7yc17", - "depends": ["boot", "dplyr", "ellipsis", "glmnet", "Rcpp", "RcppEigen", "Rdpack", "rpms", "survey", "tidyr"] + "depends": ["Rcpp", "RcppEigen", "Rdpack", "boot", "dplyr", "ellipsis", "glmnet", "rpms", "survey", "tidyr"] }, "mashr": { "name": "mashr", "version": "0.2.79", "sha256": "11pqhnzp1svhs565hm0v15ip1pgnl609ssm4d0qzl8vm4xq3d2qm", - "depends": ["abind", "ashr", "assertthat", "mvtnorm", "plyr", "Rcpp", "RcppArmadillo", "RcppGSL", "rmeta", "softImpute"] + "depends": ["Rcpp", "RcppArmadillo", "RcppGSL", "abind", "ashr", "assertthat", "mvtnorm", "plyr", "rmeta", "softImpute"] }, "maskRangeR": { "name": "maskRangeR", @@ -80537,13 +81323,13 @@ "name": "massiveGST", "version": "1.2.3", "sha256": "13qhn15gr4fvri1p843zz7y1q6701qmkxq5lysydfmdaxp5hsaxd", - "depends": ["formattable", "igraph", "msigdbr", "visNetwork", "WriteXLS"] + "depends": ["WriteXLS", "formattable", "igraph", "msigdbr", "visNetwork"] }, "mastif": { "name": "mastif", "version": "2.3", "sha256": "04m2cpcq1n27zmckj6hz6yvzcs6ray53z4nwab3vza9pjaa0m6ab", - "depends": ["cluster", "corrplot", "RANN", "Rcpp", "RcppArmadillo", "repmis", "robustbase", "stringi", "stringr", "xtable"] + "depends": ["RANN", "Rcpp", "RcppArmadillo", "cluster", "corrplot", "repmis", "robustbase", "stringi", "stringr", "xtable"] }, "matRiks": { "name": "matRiks", @@ -80565,15 +81351,15 @@ }, "matchMulti": { "name": "matchMulti", - "version": "1.1.12", - "sha256": "1mkp4pkqhfrv3a0js8yc25gd2ifk8wwyrsskwggyxpqv6pnmpapw", - "depends": ["coin", "dplyr", "magrittr", "MASS", "mvtnorm", "plyr", "rcbsubset", "rlang", "sandwich", "weights"] + "version": "1.1.12.1", + "sha256": "07c02dwim46f511fswbkr7s25inli7nblvf11gb5npz7p7yjc9bw", + "depends": ["MASS", "coin", "dplyr", "magrittr", "mvtnorm", "plyr", "rcbsubset", "rlang", "sandwich", "weights"] }, "matchingMarkets": { "name": "matchingMarkets", "version": "1.0-4", "sha256": "0rrwzbzb8nmqriw0kvk07ypmvbxg429xfv79a60s79qqffc1vryd", - "depends": ["lattice", "lpSolve", "partitions", "Rcpp", "RcppArmadillo", "RcppProgress", "rJava"] + "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "lattice", "lpSolve", "partitions", "rJava"] }, "matchingR": { "name": "matchingR", @@ -80631,8 +81417,8 @@ }, "matlab": { "name": "matlab", - "version": "1.0.4", - "sha256": "1shnq9z7n8yp3l457swrhm3p3nm0j2q4xb9bbxblli030wia520r", + "version": "1.0.4.1", + "sha256": "0l7xqim6sziz3wlxzxc0rjfjrbwidj2l0wri9w5bzabk1dbblgzw", "depends": [] }, "matlab2r": { @@ -80649,15 +81435,15 @@ }, "matlib": { "name": "matlib", - "version": "0.9.6", - "sha256": "0sm1mm5m242j472hddj9nzfyf235i7w8qxhcbgqwxf35fvdmah2h", - "depends": ["car", "MASS", "rgl", "xtable"] + "version": "0.9.8", + "sha256": "0nknc17wxdf7svp91ak6y1h83yyacqfz528lwyqg9zdfcnax08nm", + "depends": ["MASS", "car", "dplyr", "rgl", "xtable"] }, "matman": { "name": "matman", "version": "1.1.3", "sha256": "0mwxxqqlg6yydc06hrjqk5ly686s21w5i5z40axxwkmpzyz84sqv", - "depends": ["data_table", "dplyr", "DT", "forecast", "lubridate", "parsedate", "plotly", "shiny", "shinydashboard", "shinyWidgets", "tidyr", "tidyselect"] + "depends": ["DT", "data_table", "dplyr", "forecast", "lubridate", "parsedate", "plotly", "shiny", "shinyWidgets", "shinydashboard", "tidyr", "tidyselect"] }, "matpow": { "name": "matpow", @@ -80669,13 +81455,13 @@ "name": "matrans", "version": "0.1.0", "sha256": "0j9a82wccdrgd3jqhwqv8bjf2c5w55hk9cl74ylzqrgnv45xr1cd", - "depends": ["caret", "formatR", "MASS", "quadprog"] + "depends": ["MASS", "caret", "formatR", "quadprog"] }, "matricks": { "name": "matricks", "version": "0.8.2", "sha256": "0ik61jxd4hpw149dbbmis3wsfsim60mw9d0qjwh047qfg6sm1vsc", - "depends": ["ggplot2", "Rcpp", "reshape2", "rlang"] + "depends": ["Rcpp", "ggplot2", "reshape2", "rlang"] }, "matrisk": { "name": "matrisk", @@ -80699,7 +81485,7 @@ "name": "matrixProfile", "version": "0.5.0", "sha256": "0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g", - "depends": ["fftw", "signal", "TTR", "zoo"] + "depends": ["TTR", "fftw", "signal", "zoo"] }, "matrixStats": { "name": "matrixStats", @@ -80735,13 +81521,19 @@ "name": "matrixdist", "version": "1.1.9", "sha256": "1lf4ar7fl3agcydcv01q0zqlnwdd501fk132nlbwb03ng6dmd2im", - "depends": ["nnet", "Rcpp", "RcppArmadillo", "reshape2"] + "depends": ["Rcpp", "RcppArmadillo", "nnet", "reshape2"] + }, + "matrixmodp": { + "name": "matrixmodp", + "version": "0.2.0", + "sha256": "0axl3nvzsalxdmislw1vm9fg7dw39xqs7yr5jfl49h4l7h6ljzix", + "depends": [] }, "matrixprofiler": { "name": "matrixprofiler", "version": "0.1.9", "sha256": "1kqpxg0mvyc494nr2whrcwjaa51jm5n2mxjwhdcr87jqp5y3hma6", - "depends": ["checkmate", "Rcpp", "RcppParallel", "RcppProgress", "RcppThread"] + "depends": ["Rcpp", "RcppParallel", "RcppProgress", "RcppThread", "checkmate"] }, "matrixsampling": { "name": "matrixsampling", @@ -80753,13 +81545,13 @@ "name": "matrixset", "version": "0.3.0", "sha256": "0ijh8nlg86f31az7x82px1m0805mrfal5xdpwzlalgzbq0irg69v", - "depends": ["cli", "crayon", "dplyr", "Matrix", "pillar", "purrr", "R6", "Rcpp", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] + "depends": ["Matrix", "R6", "Rcpp", "cli", "crayon", "dplyr", "pillar", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] }, "matsbyname": { "name": "matsbyname", "version": "0.6.10", "sha256": "1444a6gl24ra64p5zldia0kyn4hq01g5r49rc2mv0zq0gygxv67d", - "depends": ["assertthat", "dplyr", "lifecycle", "magrittr", "Matrix", "matrixcalc", "purrr", "RCLabels", "rlang", "tibble"] + "depends": ["Matrix", "RCLabels", "assertthat", "dplyr", "lifecycle", "magrittr", "matrixcalc", "purrr", "rlang", "tibble"] }, "matsindf": { "name": "matsindf", @@ -80777,7 +81569,7 @@ "name": "mau", "version": "0.1.2", "sha256": "1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5", - "depends": ["data_table", "ggplot2", "gtools", "igraph", "RColorBrewer", "Rdpack", "stringr"] + "depends": ["RColorBrewer", "Rdpack", "data_table", "ggplot2", "gtools", "igraph", "stringr"] }, "mauricer": { "name": "mauricer", @@ -80795,7 +81587,7 @@ "name": "maxcombo", "version": "1.0", "sha256": "1hwv38a07ry5fv53r2vizifj83xf98znix8nx4zshqyk38vblgp5", - "depends": ["dplyr", "magrittr", "MCMCpack", "mstate", "mvtnorm", "purrr", "rlang", "survival"] + "depends": ["MCMCpack", "dplyr", "magrittr", "mstate", "mvtnorm", "purrr", "rlang", "survival"] }, "maximin": { "name": "maximin", @@ -80821,12 +81613,6 @@ "sha256": "05l24dksdgb43dpi4py4qkh8j9ynrnsglydy3gph1b61ygnfa8gx", "depends": ["glmnet"] }, - "maxnodf": { - "name": "maxnodf", - "version": "1.0.0", - "sha256": "1czhy3177bb4a5rxi2s4j3c9xn9f0b2pbkdka1dzw6ga389wdwb3", - "depends": ["Rcpp"] - }, "maxstat": { "name": "maxstat", "version": "0.7-25", @@ -80873,13 +81659,13 @@ "name": "mbbe", "version": "0.1.0", "sha256": "0m6nn4vv7lxr5y3bbpqjab8ahal9qbl7v6fxr848s1ida3zvkkxm", - "depends": ["dplyr", "emmeans", "furrr", "future", "ggplot2", "jsonlite", "magrittr", "nlme", "PKNCA", "processx", "ps", "stringr", "tictoc", "xml2"] + "depends": ["PKNCA", "dplyr", "emmeans", "furrr", "future", "ggplot2", "jsonlite", "magrittr", "nlme", "processx", "ps", "stringr", "tictoc", "xml2"] }, "mbbefd": { "name": "mbbefd", "version": "0.8.11", "sha256": "0yhrbyydbxibxxffk5y35yv7k0i8aq8qdkkzgpvzfmyipl1lgbnv", - "depends": ["actuar", "alabama", "fitdistrplus", "gsl", "MASS", "Rcpp"] + "depends": ["MASS", "Rcpp", "actuar", "alabama", "fitdistrplus", "gsl"] }, "mbend": { "name": "mbend", @@ -80915,13 +81701,13 @@ "name": "mboost", "version": "2.9-10", "sha256": "13dhs3q9gf5n6kwf6j3b29gvwxnkycfkpsw5fr4lnhllm9zs84z7", - "depends": ["lattice", "Matrix", "nnls", "partykit", "quadprog", "stabs", "survival"] + "depends": ["Matrix", "lattice", "nnls", "partykit", "quadprog", "stabs", "survival"] }, "mbr": { "name": "mbr", "version": "0.0.1", "sha256": "08534d0ssj5zli7880a2wzl46ydf87gn5xlv6xp0iph71wlpc52y", - "depends": ["data_table", "dplR", "MASS", "Matrix", "Rfast"] + "depends": ["MASS", "Matrix", "Rfast", "data_table", "dplR"] }, "mbrdr": { "name": "mbrdr", @@ -80945,7 +81731,7 @@ "name": "mbsts", "version": "3.0", "sha256": "0qgb74ah1jq6rla2qkid1i75xjp2l9qxkpbbqilhzqg64rkcn9ha", - "depends": ["BBmisc", "ggplot2", "KFAS", "MASS", "Matrix", "matrixStats", "MCMCpack", "pscl", "reshape2"] + "depends": ["BBmisc", "KFAS", "MASS", "MCMCpack", "Matrix", "ggplot2", "matrixStats", "pscl", "reshape2"] }, "mc_heterogeneity": { "name": "mc.heterogeneity", @@ -80965,6 +81751,12 @@ "sha256": "058da7hhcizh902pj99wmf5mhfd6fhpjvf6cprbsl0fx19x9l14w", "depends": ["BBmisc", "checkmate", "ecr", "ggplot2", "grapherator", "gtools", "igraph", "qgraph", "vegan", "viridis"] }, + "mcODE": { + "name": "mcODE", + "version": "1.1", + "sha256": "1rnh9hqw97gxxs3ai5nnaszmyzyvv558p2b25i5h4218a2pkf8h3", + "depends": [] + }, "mcStats": { "name": "mcStats", "version": "0.1.2", @@ -80973,15 +81765,15 @@ }, "mcauchyd": { "name": "mcauchyd", - "version": "1.2.0", - "sha256": "18615ac3z8vgkqr0xslaama9sbvn7m4p116vv8l2wz65f623l0d4", - "depends": ["lifecycle", "MASS", "rgl"] + "version": "1.3.2", + "sha256": "1n0vgp526wlyf553n2cvxkawzxdvvzqhgar5sqnhiidas7iri3zc", + "depends": ["MASS", "data_table", "lifecycle", "rgl"] }, "mcb": { "name": "mcb", "version": "0.1.15", "sha256": "0k986m2vyvfqxw3jmlyvf6r5bq68y92fymy03lffq5lmiqhypixj", - "depends": ["ggplot2", "glmnet", "lars", "leaps", "MASS", "ncvreg", "reshape2", "smoothmest"] + "depends": ["MASS", "ggplot2", "glmnet", "lars", "leaps", "ncvreg", "reshape2", "smoothmest"] }, "mcbiopi": { "name": "mcbiopi", @@ -80993,25 +81785,25 @@ "name": "mcboost", "version": "0.4.3", "sha256": "17zflvafz6w91lxbr8saasxp9bn18bla1jqg53fka2k8fnziz4g8", - "depends": ["backports", "checkmate", "data_table", "glmnet", "mlr3", "mlr3misc", "mlr3pipelines", "R6", "rmarkdown", "rpart"] + "depends": ["R6", "backports", "checkmate", "data_table", "glmnet", "mlr3", "mlr3misc", "mlr3pipelines", "rmarkdown", "rpart"] }, "mcca": { "name": "mcca", "version": "0.7.0", "sha256": "01nm0plgkik241qhd06v1vs84lf7agc0vkxa27cpr5qlfl4cm4zb", - "depends": ["caret", "e1071", "MASS", "nnet", "pROC", "rgl", "rpart"] + "depends": ["MASS", "caret", "e1071", "nnet", "pROC", "rgl", "rpart"] }, "mccca": { "name": "mccca", "version": "1.1.0.1", "sha256": "1bmcncm53pbmc9dv61rwmp8xk9zf70ihw2gg6d0lmd1sgmf5i4hz", - "depends": ["ggplot2", "magic", "RColorBrewer", "Rcpp", "RcppArmadillo", "stringr", "wordcloud"] + "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "ggplot2", "magic", "stringr", "wordcloud"] }, "mccf1": { "name": "mccf1", "version": "1.1", "sha256": "023pvjfc1iv7hac3gz5rakg6ljs92j0qfm4givad5iiwv5n4k3zr", - "depends": ["ggplot2", "ROCR"] + "depends": ["ROCR", "ggplot2"] }, "mcclust": { "name": "mcclust", @@ -81041,7 +81833,7 @@ "name": "mcen", "version": "1.2.1", "sha256": "16f7860h6hbpnv1drk793mz3vwm9q4ar6xkag05z0p22p69mm4qy", - "depends": ["faraway", "flexclust", "glmnet", "Matrix"] + "depends": ["Matrix", "faraway", "flexclust", "glmnet"] }, "mcga": { "name": "mcga", @@ -81051,8 +81843,8 @@ }, "mcgf": { "name": "mcgf", - "version": "1.1.0", - "sha256": "0lgvd9ibyg2rbccz9q5mmh0d85bli8qi7jwwh5kh5bbp754vss1f", + "version": "1.1.1", + "sha256": "1xgrswmz4ra18qh3m46l4xkj13bq0lx15flhnx97j16y5dq3rl1k", "depends": ["MASS", "sp"] }, "mcgibbsit": { @@ -81065,7 +81857,7 @@ "name": "mclm", "version": "0.2.7", "sha256": "1vpg6xsa8im60ld5mlm6yhf2prs6kmwn0sn12b9g8v27dgw3h0iq", - "depends": ["ca", "crayon", "dplyr", "Rcpp", "readr", "stringi", "stringr", "tibble", "tm", "xml2", "yaml"] + "depends": ["Rcpp", "ca", "crayon", "dplyr", "readr", "stringi", "stringr", "tibble", "tm", "xml2", "yaml"] }, "mclogit": { "name": "mclogit", @@ -81083,7 +81875,7 @@ "name": "mclustAddons", "version": "0.8", "sha256": "12wlj1rl5d384fydk27rpm62ghmwv3iax4nfsrcpczxrfk8zshc9", - "depends": ["foreach", "iterators", "mclust", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "foreach", "iterators", "mclust"] }, "mclustcomp": { "name": "mclustcomp", @@ -81101,7 +81893,7 @@ "name": "mcmcOutput", "version": "0.1.3", "sha256": "1jw4wyppzlnxaa3iahbwx4gxs3zvppy980rc92dvy18y2sr5138v", - "depends": ["coda", "HDInterval", "MASS"] + "depends": ["HDInterval", "MASS", "coda"] }, "mcmcderive": { "name": "mcmcderive", @@ -81131,19 +81923,19 @@ "name": "mcmcsae", "version": "0.7.7", "sha256": "0q3rw6xbx5wqpa0hf0jldplcs9ry80bck95bn9g6bhzj0128ysm4", - "depends": ["GIGrvg", "loo", "Matrix", "matrixStats", "Rcpp", "RcppEigen"] + "depends": ["GIGrvg", "Matrix", "Rcpp", "RcppEigen", "loo", "matrixStats"] }, "mcmcse": { "name": "mcmcse", "version": "1.5-0", "sha256": "0qvlkv7j35h2lxdzhbsbsrf1cgsbgf4in7lxgwmx7vs85k10v0ja", - "depends": ["ellipse", "fftwtools", "Rcpp", "RcppArmadillo", "testthat"] + "depends": ["Rcpp", "RcppArmadillo", "ellipse", "fftwtools", "testthat"] }, "mcmsupply": { "name": "mcmsupply", "version": "1.1.1", "sha256": "1130nl2qz36gyw9d6nqrq2zpa9p4171n45mqmjqzx8jbrp9za7y3", - "depends": ["abind", "dplyr", "foreach", "ggplot2", "magrittr", "plyr", "R2jags", "readxl", "rlang", "runjags", "stringr", "tibble", "tidybayes", "tidyr", "tidyverse"] + "depends": ["R2jags", "abind", "dplyr", "foreach", "ggplot2", "magrittr", "plyr", "readxl", "rlang", "runjags", "stringr", "tibble", "tidybayes", "tidyr", "tidyverse"] }, "mco": { "name": "mco", @@ -81155,7 +81947,7 @@ "name": "mcompanion", "version": "0.6", "sha256": "0d4q4rc8qscjw7d9xhpc6lr9v14vy0jxzzpn68lxaxi4qr31jwrg", - "depends": ["gbutils", "MASS", "Matrix", "Rdpack"] + "depends": ["MASS", "Matrix", "Rdpack", "gbutils"] }, "mcount": { "name": "mcount", @@ -81173,7 +81965,7 @@ "name": "mcparallelDo", "version": "1.1.0", "sha256": "1ivh0d4f7ks6xwcjywk62h1zhr7h5bbhzpisky7973wi4g8vipbn", - "depends": ["checkmate", "R_utils", "R6"] + "depends": ["R6", "R_utils", "checkmate"] }, "mcprofile": { "name": "mcprofile", @@ -81197,7 +81989,7 @@ "name": "mcradds", "version": "1.1.0", "sha256": "11pa8y6q20rqsflxlsnyjq79l6xbfqy1739zvnvdl024mv0jvrw7", - "depends": ["boot", "checkmate", "DescTools", "dplyr", "formatters", "ggplot2", "lifecycle", "magrittr", "mcr", "pROC", "purrr", "rlang", "tibble", "tidyr", "VCA"] + "depends": ["DescTools", "VCA", "boot", "checkmate", "dplyr", "formatters", "ggplot2", "lifecycle", "magrittr", "mcr", "pROC", "purrr", "rlang", "tibble", "tidyr"] }, "mcreplicate": { "name": "mcreplicate", @@ -81207,9 +81999,9 @@ }, "mcstatsim": { "name": "mcstatsim", - "version": "0.1.0", - "sha256": "13ifkqx2c9v0pvkjg0r0sy07s2q7rp7wfx4q27vx4d7f7yk6va6r", - "depends": [] + "version": "0.5.0", + "sha256": "0v1nxn4jbk941x6vskpiqrgdzfijlhlwzhavwzyy19x2f3wc91iy", + "depends": ["pbapply"] }, "mctest": { "name": "mctest", @@ -81257,7 +82049,7 @@ "name": "md4r", "version": "0.5.2.0", "sha256": "1kdy6izd4gxqf4bdrb3hav3mhn1gw9bjgmdk4r6j9qhm7mmkkkps", - "depends": ["checkmate", "cli", "glue", "purrr", "Rcpp", "stringr", "textutils", "tibble"] + "depends": ["Rcpp", "checkmate", "cli", "glue", "purrr", "stringr", "textutils", "tibble"] }, "mda": { "name": "mda", @@ -81311,13 +82103,13 @@ "name": "mdgc", "version": "0.1.7", "sha256": "0p2dfvngyv9rwbcjfw7s3diim9k2gbjn7qsmh7ybxhd529y4w0yl", - "depends": ["BH", "psqn", "Rcpp", "RcppArmadillo", "testthat"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "psqn", "testthat"] }, "mdhglm": { "name": "mdhglm", "version": "1.8", "sha256": "1myky8d2ilwdliqrzd2i5qvja82iz7w6qbigl7h4znpk8pdgrjb3", - "depends": ["boot", "Matrix", "mvtnorm"] + "depends": ["Matrix", "boot", "mvtnorm"] }, "mdir_logrank": { "name": "mdir.logrank", @@ -81327,9 +82119,9 @@ }, "mdmb": { "name": "mdmb", - "version": "1.8-7", - "sha256": "0qx1ipq8ra2c3f4hnnlj0h1viky5ld694ga6rkp53196s2yn0vhy", - "depends": ["CDM", "coda", "miceadds", "Rcpp", "RcppArmadillo", "sirt"] + "version": "1.9-22", + "sha256": "09lsp0niazw0v9pqnw5inw65j7p0irwwnxrr09iqbpjd7gqnlkrz", + "depends": ["CDM", "Rcpp", "RcppArmadillo", "coda", "miceadds", "sirt"] }, "mdpeer": { "name": "mdpeer", @@ -81359,13 +82151,13 @@ "name": "mdsr", "version": "0.2.7", "sha256": "0b1z1ng6zzqwrn0a5i17jcqwh5yyv7nqyghp8w9r6ik1q46hmvz1", - "depends": ["babynames", "DBI", "dbplyr", "downloader", "dplyr", "fs", "ggplot2", "htmlwidgets", "kableExtra", "RMariaDB", "skimr", "stringr", "tibble", "webshot2"] + "depends": ["DBI", "RMariaDB", "babynames", "dbplyr", "downloader", "dplyr", "fs", "ggplot2", "htmlwidgets", "kableExtra", "skimr", "stringr", "tibble", "webshot2"] }, "mdw": { "name": "mdw", - "version": "2020.6-17", - "sha256": "0jjajgb1w3vx7vqn2z90xq39hvbcrrd2ky8p31g5absqwwm7lwpa", - "depends": ["kyotil", "MASS", "Matrix"] + "version": "2024.8-1", + "sha256": "1qvz84qrsm904ia8vr0n07magkj1ydgiw1hgmncchmq8l1a2fw6f", + "depends": ["MASS", "Matrix", "kyotil"] }, "meanShiftR": { "name": "meanShiftR", @@ -81389,7 +82181,7 @@ "name": "measr", "version": "1.0.0", "sha256": "1w2b1g7zivilc4pip09yi5fyx052g835vax5ja6bl36725h8giwk", - "depends": ["BH", "dcm2", "dplyr", "fs", "glue", "loo", "magrittr", "posterior", "psych", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders", "tibble", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dcm2", "dplyr", "fs", "glue", "loo", "magrittr", "posterior", "psych", "rlang", "rstan", "rstantools", "tibble", "tidyr"] }, "measuRing": { "name": "measuRing", @@ -81423,9 +82215,9 @@ }, "meconetcomp": { "name": "meconetcomp", - "version": "0.5.0", - "sha256": "0fxgm8bhjs1vn1l0vb7jx7gvg3w4k0bwng66sfp87l5b0z2j082q", - "depends": ["dplyr", "ggplot2", "ggpubr", "igraph", "magrittr", "microeco", "R6", "reshape2"] + "version": "0.5.1", + "sha256": "00k9n3sbr6216zld4prl0v6mig472mhwca4ah8hr2s8q24v6ridx", + "depends": ["R6", "dplyr", "ggplot2", "ggpubr", "igraph", "magrittr", "microeco", "reshape2"] }, "mecor": { "name": "mecor", @@ -81437,7 +82229,7 @@ "name": "mecoturn", "version": "0.3.0", "sha256": "1qr7p50wplg3nwvaz595nxfrf5b1dc8l4y13jx65r8kvksqrl07g", - "depends": ["betareg", "ggplot2", "ggpubr", "glmmTMB", "GUniFrac", "lmerTest", "magrittr", "microeco", "R6"] + "depends": ["GUniFrac", "R6", "betareg", "ggplot2", "ggpubr", "glmmTMB", "lmerTest", "magrittr", "microeco"] }, "medExtractR": { "name": "medExtractR", @@ -81449,7 +82241,7 @@ "name": "medScan", "version": "1.0.2", "sha256": "17h97fnklci6prj62nzg49dcczns7s1yzi410jrdypsfhpz912kv", - "depends": ["fdrtool", "HDMT", "locfdr", "qqman", "qvalue"] + "depends": ["HDMT", "fdrtool", "locfdr", "qqman", "qvalue"] }, "mederrRank": { "name": "mederrRank", @@ -81459,21 +82251,21 @@ }, "medfate": { "name": "medfate", - "version": "4.3.1", - "sha256": "0gs47ms58s86nclz1p1b12xi34b4p3q5py7f5kda4pffpbd9msh0", - "depends": ["ggplot2", "meteoland", "Rcpp", "shiny"] + "version": "4.4.0", + "sha256": "19ljklfvzxvf3pxpx88r0im9f8kw261d6drhyj3njiv0ykxy19qq", + "depends": ["Rcpp", "ggplot2", "meteoland", "shiny"] }, "medfateland": { "name": "medfateland", - "version": "2.4.3", - "sha256": "0h24s5sg2nl83jqarb6m6sw5gi0d5x9284ysgl2p38637qrim55w", - "depends": ["cli", "dplyr", "ggplot2", "httr", "jsonlite", "lifecycle", "medfate", "meteoland", "Rcpp", "rlang", "sf", "shiny", "stars", "terra", "tibble", "tidyr", "tidyterra"] + "version": "2.4.5", + "sha256": "0rklmkq53c1xi8i89422c0jvfvhppr1a52f5xc87xzfh5z3jnhmk", + "depends": ["Rcpp", "cli", "dplyr", "ggplot2", "httr", "jsonlite", "lifecycle", "medfate", "meteoland", "rlang", "sf", "shiny", "stars", "terra", "tibble", "tidyr", "tidyterra"] }, "medflex": { "name": "medflex", "version": "0.6-10", "sha256": "0cybshbk2qvh38n9sc6qf9jwjhzs4zz31awx3bbyqfwzjgzai2dx", - "depends": ["boot", "car", "Matrix", "multcomp", "sandwich"] + "depends": ["Matrix", "boot", "car", "multcomp", "sandwich"] }, "mediacloudr": { "name": "mediacloudr", @@ -81491,7 +82283,7 @@ "name": "mediation", "version": "4.5.0", "sha256": "0i88wvqqw8cmxmh9i78rqzp4s16zhf12dgl9fsk9bhw7hxhhc0i1", - "depends": ["boot", "Hmisc", "lme4", "lpSolve", "MASS", "Matrix", "mvtnorm", "sandwich"] + "depends": ["Hmisc", "MASS", "Matrix", "boot", "lme4", "lpSolve", "mvtnorm", "sandwich"] }, "mediationsens": { "name": "mediationsens", @@ -81563,7 +82355,7 @@ "name": "meifly", "version": "0.3.1", "sha256": "0pgmxa4g16zhx3jx5g56h2s1f4cr4bkz3bp7404dm2729083rvjx", - "depends": ["leaps", "MASS", "plyr"] + "depends": ["MASS", "leaps", "plyr"] }, "mekko": { "name": "mekko", @@ -81575,31 +82367,31 @@ "name": "melt", "version": "1.11.4", "sha256": "19g5cd8fnvvqlvrvim47ra53svjk07cr4dmgn3h6x13wkv0grg46", - "depends": ["BH", "checkmate", "dqrng", "Rcpp", "RcppEigen"] + "depends": ["BH", "Rcpp", "RcppEigen", "checkmate", "dqrng"] }, "meltr": { "name": "meltr", "version": "1.0.2", "sha256": "1h2a09n0az9s81m9n4a0h3dckxxgb9vpj03kal29ms0zwn525xpx", - "depends": ["cli", "cpp11", "R6", "rlang", "tibble"] + "depends": ["R6", "cli", "cpp11", "rlang", "tibble"] }, "meltt": { "name": "meltt", "version": "0.4.3", "sha256": "1j2iz05xr9ddj9pk2yw7j7kjfr9rxmxkk123c6336fqdm14wvd21", - "depends": ["dplyr", "ggplot2", "leaflet", "plyr", "Rcpp", "RcppArmadillo", "reticulate", "shiny", "shinyjs", "tibble", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "ggplot2", "leaflet", "plyr", "reticulate", "shiny", "shinyjs", "tibble", "tidyr"] }, "mem": { "name": "mem", "version": "2.18", "sha256": "1jz2zadwm9gvlgfr1dvi8m6p3zm3bjz4n4apkbpj8g594ghcbrpx", - "depends": ["boot", "dplyr", "EnvStats", "ggplot2", "mclust", "purrr", "RColorBrewer", "RcppRoll", "sm", "tidyr"] + "depends": ["EnvStats", "RColorBrewer", "RcppRoll", "boot", "dplyr", "ggplot2", "mclust", "purrr", "sm", "tidyr"] }, "memapp": { "name": "memapp", "version": "2.16", "sha256": "0gjphzq2lr2qn7adjm6vvm50wqg6fhv0p28mcw2yjwiq8yrr0f3b", - "depends": ["dplyr", "DT", "formattable", "ggplot2", "mem", "plotly", "RColorBrewer", "shiny", "shinyBS", "shinydashboard", "shinyjs", "shinyWidgets", "stringi", "stringr", "tidyr"] + "depends": ["DT", "RColorBrewer", "dplyr", "formattable", "ggplot2", "mem", "plotly", "shiny", "shinyBS", "shinyWidgets", "shinydashboard", "shinyjs", "stringi", "stringr", "tidyr"] }, "meme": { "name": "meme", @@ -81629,7 +82421,7 @@ "name": "memisc", "version": "0.99.31.7", "sha256": "0drn923y8bwwwk2csa7l9b3fd06zfrfgi3b0pn7b23aja1c1h0xl", - "depends": ["data_table", "jsonlite", "lattice", "MASS", "yaml"] + "depends": ["MASS", "data_table", "jsonlite", "lattice", "yaml"] }, "memo": { "name": "memo", @@ -81641,7 +82433,7 @@ "name": "memochange", "version": "1.1.1", "sha256": "144134kpchb7ps8b2g7pyga5add0iqphzcwygf11aybmbzmp90x7", - "depends": ["forecast", "fracdiff", "longmemo", "LongMemoryTS", "sandwich", "strucchange", "urca"] + "depends": ["LongMemoryTS", "forecast", "fracdiff", "longmemo", "sandwich", "strucchange", "urca"] }, "memofunc": { "name": "memofunc", @@ -81671,7 +82463,7 @@ "name": "memoria", "version": "1.0.0", "sha256": "05nx6xkgf1mkn1ajjizwp66xhn7ddbvgdnmkdbcl4s7sq456vczw", - "depends": ["cowplot", "ggplot2", "HH", "ranger", "stringr", "tidyr", "viridis", "viridisLite", "zoo"] + "depends": ["HH", "cowplot", "ggplot2", "ranger", "stringr", "tidyr", "viridis", "viridisLite", "zoo"] }, "memuse": { "name": "memuse", @@ -81683,13 +82475,13 @@ "name": "merDeriv", "version": "0.2-4", "sha256": "1piswi4l7ri3251shmanhygipmsw8zg701jqd0am1s76kj16l9cc", - "depends": ["lavaan", "lme4", "Matrix", "nonnest2", "numDeriv", "sandwich"] + "depends": ["Matrix", "lavaan", "lme4", "nonnest2", "numDeriv", "sandwich"] }, "merTools": { "name": "merTools", "version": "0.6.2", "sha256": "0wxiflkqhl40rr6ibzk4c362m8jxd97jkskdxghqa45lc5vgn1qh", - "depends": ["abind", "arm", "blme", "broom_mixed", "dplyr", "foreach", "ggplot2", "lme4", "Matrix", "mvtnorm", "shiny"] + "depends": ["Matrix", "abind", "arm", "blme", "broom_mixed", "dplyr", "foreach", "ggplot2", "lme4", "mvtnorm", "shiny"] }, "mergeTrees": { "name": "mergeTrees", @@ -81699,15 +82491,21 @@ }, "mergen": { "name": "mergen", - "version": "0.1.0", - "sha256": "0nzgqsmbgk4472c64pr1qhmbhdk69qmicb5qni744crxlar92g5x", - "depends": ["assertthat", "BiocManager", "httr", "jsonlite", "openai", "rmarkdown"] + "version": "0.2.1", + "sha256": "0mrrqxjj0w2yw5q0g23wq4knpvv2hi4lhc9z7289id4n3xhw37xz", + "depends": ["BiocManager", "assertthat", "httr", "jsonlite", "openai", "rmarkdown"] + }, + "mergenstudio": { + "name": "mergenstudio", + "version": "1.0", + "sha256": "1s83h2xglmf21sg6brb67lcw3kch097vykmr3bpc6h8ljmr0qi27", + "depends": ["assertthat", "bslib", "cli", "colorspace", "fontawesome", "fs", "glue", "htmltools", "htmlwidgets", "httr2", "ids", "jsonlite", "magrittr", "mergen", "purrr", "rlang", "rmarkdown", "rstudioapi", "rvest", "shiny", "shinyFiles", "shiny_i18n", "shinyjs", "stringr", "waiter", "yaml"] }, "mergingTools": { "name": "mergingTools", "version": "1.0.1", "sha256": "04ryamfb19js6dq4iv2j0p2dlgrayl3zis2r1kic1wfvh4a46ihg", - "depends": ["dplyr", "MASS", "purrr", "rlang", "stringr", "tidyr"] + "depends": ["MASS", "dplyr", "purrr", "rlang", "stringr", "tidyr"] }, "merlin": { "name": "merlin", @@ -81725,7 +82523,7 @@ "name": "meshed", "version": "0.2.3", "sha256": "061q6b8603jbvlqkl6ddcmw1rgy53sqbxbsxhv218f7px392b1vf", - "depends": ["dplyr", "FNN", "glue", "magrittr", "Rcpp", "RcppArmadillo", "rlang"] + "depends": ["FNN", "Rcpp", "RcppArmadillo", "dplyr", "glue", "magrittr", "rlang"] }, "messaging": { "name": "messaging", @@ -81737,7 +82535,7 @@ "name": "messi", "version": "0.1.1", "sha256": "1z3fjxfmvxc9zr98zmkd84rj27iabjmw71hwqgnbjwcw5mnw2b5h", - "depends": ["ggplot2", "MASS", "patchwork", "progress"] + "depends": ["MASS", "ggplot2", "patchwork", "progress"] }, "messy_cats": { "name": "messy.cats", @@ -81755,7 +82553,7 @@ "name": "metR", "version": "0.15.0", "sha256": "17qhx6jx8h9dxfzxgg4nx3nx4xjnjpz9r0cix0qqbgngri55lap0", - "depends": ["checkmate", "data_table", "digest", "Formula", "formula_tools", "ggplot2", "gtable", "isoband", "lubridate", "memoise", "plyr", "purrr", "scales", "sf", "stringr"] + "depends": ["Formula", "checkmate", "data_table", "digest", "formula_tools", "ggplot2", "gtable", "isoband", "lubridate", "memoise", "plyr", "purrr", "scales", "sf", "stringr"] }, "metRology": { "name": "metRology", @@ -81791,12 +82589,12 @@ "name": "metaBMA", "version": "0.6.9", "sha256": "1y05c8mgim7v2991r1hr3ahx0mjji6gmp9mz25f0csl69kf3zr61", - "depends": ["BH", "bridgesampling", "coda", "LaplacesDemon", "logspline", "mvtnorm", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "LaplacesDemon", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bridgesampling", "coda", "logspline", "mvtnorm", "rstan", "rstantools"] }, "metaCluster": { "name": "metaCluster", - "version": "0.1.0", - "sha256": "1n69vlxzfx937p587jb3q2hn6b59wzx20p09hsbbjwb4nj83hda7", + "version": "0.1.1", + "sha256": "0mirhkj37cmjy82yppx097ivy2lsvhyagirdbvdmr9mx4clmva9g", "depends": ["Biostrings", "cluster", "dbscan", "dplyr", "factoextra", "seqinr"] }, "metaConvert": { @@ -81819,9 +82617,15 @@ }, "metaGE": { "name": "metaGE", - "version": "1.0.3", - "sha256": "0w639hxildzcd2kwjs9r3iykccd8qhxpiarj95zpd89fzkkqzknx", - "depends": ["corrplot", "data_table", "dplyr", "emdbook", "future", "ggplot2", "ggrepel", "gplots", "ks", "purrr", "qqman", "Rfast", "stringr", "tibble", "tidyr", "viridis"] + "version": "1.1.0", + "sha256": "01507d85fpiqrbir1rjy5vczrv9cjfscwbl3746rr8x1x8danz7w", + "depends": ["Rfast", "corrplot", "data_table", "dplyr", "emdbook", "future", "ggplot2", "ggrepel", "gplots", "ks", "purrr", "qqman", "stringr", "tibble", "tidyr", "viridis", "yarrr"] + }, + "metaHelper": { + "name": "metaHelper", + "version": "1.0.0", + "sha256": "0nsrsaklxbr4clg3ka8rrpp162bl9qcxkffqkmdz5ha4dfs028vm", + "depends": ["confintr", "magrittr"] }, "metaLik": { "name": "metaLik", @@ -81833,7 +82637,7 @@ "name": "metaMA", "version": "3.1.3", "sha256": "13imp5d1ggw4qc7win4d2nvwvl92s9visb6bjm09h69lp18h631s", - "depends": ["limma", "SMVar"] + "depends": ["SMVar", "limma"] }, "metaRNASeq": { "name": "metaRNASeq", @@ -81845,7 +82649,7 @@ "name": "metaRange", "version": "1.1.4", "sha256": "05x7rs4ah42326xmpm4spm2ysmlw2c6cs1fxgngy9ndz6k2dmb64", - "depends": ["checkmate", "R6", "Rcpp", "RcppArmadillo", "terra"] + "depends": ["R6", "Rcpp", "RcppArmadillo", "checkmate", "terra"] }, "metaSDTreg": { "name": "metaSDTreg", @@ -81857,7 +82661,7 @@ "name": "metaSEM", "version": "1.4.0", "sha256": "1gkgcczdm14cz2z4ys9qxy068g1ma6sik5ycas3z6m5rgwbd2amy", - "depends": ["ellipse", "lavaan", "MASS", "Matrix", "mvtnorm", "numDeriv", "OpenMx"] + "depends": ["MASS", "Matrix", "OpenMx", "ellipse", "lavaan", "mvtnorm", "numDeriv"] }, "metaSurvival": { "name": "metaSurvival", @@ -81893,13 +82697,13 @@ "name": "metacart", "version": "2.0-3", "sha256": "1wim72fvhx6cyc16c9gl8cwzbhlpzilk7q8gi4jnzzazqmc1kb5n", - "depends": ["ggplot2", "gridExtra", "Rcpp", "rpart"] + "depends": ["Rcpp", "ggplot2", "gridExtra", "rpart"] }, "metacoder": { "name": "metacoder", "version": "0.3.7", "sha256": "0f7y7yzkqblqal71lp2kip8lzismdzlj3cpw0mb15hvca9dz12x4", - "depends": ["ape", "cowplot", "crayon", "dplyr", "GA", "ggfittext", "ggplot2", "igraph", "lazyeval", "magrittr", "R6", "Rcpp", "RCurl", "readr", "rlang", "seqinr", "stringr", "taxize", "tibble", "vegan"] + "depends": ["GA", "R6", "RCurl", "Rcpp", "ape", "cowplot", "crayon", "dplyr", "ggfittext", "ggplot2", "igraph", "lazyeval", "magrittr", "readr", "rlang", "seqinr", "stringr", "taxize", "tibble", "vegan"] }, "metacom": { "name": "metacom", @@ -81917,7 +82721,7 @@ "name": "metacore", "version": "0.1.3", "sha256": "06ba9p1by6hfagj0s43b6dwwfci5fczl2fr7kw3cchqsr90y3vfr", - "depends": ["dplyr", "magrittr", "purrr", "R6", "readxl", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "xml2"] + "depends": ["R6", "dplyr", "magrittr", "purrr", "readxl", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "xml2"] }, "metadat": { "name": "metadat", @@ -81925,6 +82729,12 @@ "sha256": "1f7mb3pw5d0akr09jjva06ay223izhpzbr21bapnw99x1kiybk7h", "depends": ["mathjaxr"] }, + "metadeconfoundR": { + "name": "metadeconfoundR", + "version": "1.0.2", + "sha256": "0n6vcr7yv7hlwfl4rijg0287n43qch24hdb9fzz1x2a6x1hm019d", + "depends": ["detectseparation", "doParallel", "foreach", "futile_logger", "ggplot2", "lme4", "lmtest", "reshape2", "rlang"] + }, "metadynminer": { "name": "metadynminer", "version": "0.1.7", @@ -81935,19 +82745,19 @@ "name": "metadynminer3d", "version": "0.0.2", "sha256": "1y1csfp57qrv394hj96yr5v3brxw7v0a07k2pg7ypw08gshvgqjm", - "depends": ["metadynminer", "misc3d", "Rcpp", "rgl"] + "depends": ["Rcpp", "metadynminer", "misc3d", "rgl"] }, "metafolio": { "name": "metafolio", "version": "0.1.2", "sha256": "11y2igvwwkr4dj7v8ip66w1psi9wzb8q3sy018lhaxb42s1lspbh", - "depends": ["colorspace", "MASS", "plyr", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "colorspace", "plyr"] }, "metafor": { "name": "metafor", "version": "4.6-0", "sha256": "0rl6w4j1fqvr7vn0dbzmir28xbi2wdn9m3lrxwjvvf47pp1lqd07", - "depends": ["mathjaxr", "Matrix", "metadat", "nlme", "numDeriv", "pbapply"] + "depends": ["Matrix", "mathjaxr", "metadat", "nlme", "numDeriv", "pbapply"] }, "metaforest": { "name": "metaforest", @@ -81959,7 +82769,7 @@ "name": "metafuse", "version": "2.0-1", "sha256": "1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j", - "depends": ["evd", "glmnet", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "evd", "glmnet"] }, "metagam": { "name": "metagam", @@ -81993,9 +82803,9 @@ }, "metajam": { "name": "metajam", - "version": "0.2.3", - "sha256": "0ryzsnwfhapsyz40ckjj6gn2chf37m62z3l7xv703878bghpdqwc", - "depends": ["dataone", "dplyr", "EML", "emld", "lubridate", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr"] + "version": "0.3.1", + "sha256": "1sqxybxzi198a6b1za33xyb42ii3v8d5p5bx6i393r9qkniry69s", + "depends": ["EML", "XML", "dataone", "dplyr", "emld", "lubridate", "purrr", "readr", "stringr", "tibble", "tidyr"] }, "metalite": { "name": "metalite", @@ -82019,7 +82829,7 @@ "name": "metamedian", "version": "1.1.1", "sha256": "17p8npnaddsdikii9c8zhvbwhkpwgncksipzsslrs7d4pz6wlfvf", - "depends": ["estmeansd", "Hmisc", "metaBLUE", "metafor"] + "depends": ["Hmisc", "estmeansd", "metaBLUE", "metafor"] }, "metamer": { "name": "metamer", @@ -82037,19 +82847,19 @@ "name": "metamisc", "version": "0.4.0", "sha256": "12ydvkpni7a7v0x8lfknsy4c6hmgjqri3l33m4fwsai3rhnq6hsa", - "depends": ["dplyr", "ggplot2", "lme4", "metafor", "mvtnorm", "plyr", "pROC"] + "depends": ["dplyr", "ggplot2", "lme4", "metafor", "mvtnorm", "pROC", "plyr"] }, "metan": { "name": "metan", "version": "1.18.0", "sha256": "0m7czvd7djv80c6kly8ckgs9m5ld0rqnd92y76n181d2xk9l6ypc", - "depends": ["dplyr", "GGally", "ggforce", "ggplot2", "ggrepel", "lme4", "lmerTest", "magrittr", "mathjaxr", "patchwork", "purrr", "rlang", "tibble", "tidyr", "tidyselect"] + "depends": ["GGally", "dplyr", "ggforce", "ggplot2", "ggrepel", "lme4", "lmerTest", "magrittr", "mathjaxr", "patchwork", "purrr", "rlang", "tibble", "tidyr", "tidyselect"] }, "metanetwork": { "name": "metanetwork", "version": "0.7.0", "sha256": "0rlnalmfmiih154zq6rk4sq12y7nr8fn1ws8mrlryy04gznz6igw", - "depends": ["dplyr", "GGally", "ggimage", "ggplot2", "igraph", "intergraph", "magrittr", "Matrix", "network", "RColorBrewer", "rlang", "sna", "visNetwork"] + "depends": ["GGally", "Matrix", "RColorBrewer", "dplyr", "ggimage", "ggplot2", "igraph", "intergraph", "magrittr", "network", "rlang", "sna", "visNetwork"] }, "metansue": { "name": "metansue", @@ -82059,15 +82869,15 @@ }, "metap": { "name": "metap", - "version": "1.10", - "sha256": "18l86026g5g0pdihw41h7yck1ad5k43bb7as5qih2k5xkr680mzx", - "depends": ["lattice", "mathjaxr", "mutoss", "qqconf", "Rdpack", "TFisher"] + "version": "1.11", + "sha256": "1dwk402kbxigz5llh223z0b98cq2vs3ij049fgsj7bna7kycks1l", + "depends": ["Rdpack", "TFisher", "lattice", "mathjaxr", "mutoss", "qqconf"] }, "metapack": { "name": "metapack", "version": "0.3", "sha256": "17j3xivpyq17is5vzmca9zck6dryzfnrzddvppik4ml3xq122br9", - "depends": ["BH", "Formula", "ggplot2", "gridExtra", "Rcpp", "RcppArmadillo", "RcppProgress"] + "depends": ["BH", "Formula", "Rcpp", "RcppArmadillo", "RcppProgress", "ggplot2", "gridExtra"] }, "metaplot": { "name": "metaplot", @@ -82077,9 +82887,9 @@ }, "metaplus": { "name": "metaplus", - "version": "1.0-4", - "sha256": "1lrlw5h3fgcrp0cdawxala36m8mpljbmp20fhf4sc0qj51h2ccs4", - "depends": ["bbmle", "boot", "doParallel", "doRNG", "fastGHQuad", "foreach", "lme4", "MASS", "metafor", "numDeriv", "Rfast"] + "version": "1.0-5", + "sha256": "0cknvgnkvqdw00600akpxrrdbg7h0sdyv15vmhs9dsfdf1ag6z51", + "depends": ["MASS", "Rfast", "bbmle", "boot", "doParallel", "doRNG", "fastGHQuad", "foreach", "lme4", "metafor", "numDeriv"] }, "metapost": { "name": "metapost", @@ -82131,8 +82941,8 @@ }, "metatools": { "name": "metatools", - "version": "0.1.5", - "sha256": "0lcpq0k73kcr7fr8i7dyi785mapvyd6slz93r4spd7z8bg71nm25", + "version": "0.1.6", + "sha256": "09rr7hfzkwk2ddc9cs9x8yvqbizk0bxfflkn9vdlf1b9kvrpknh9", "depends": ["dplyr", "magrittr", "metacore", "purrr", "rlang", "stringr", "tibble", "tidyr"] }, "metaumbrella": { @@ -82151,7 +82961,7 @@ "name": "metaviz", "version": "0.3.1", "sha256": "0jvv49rw66v7saj2y1q88rp6fyzq7473af5d3k77ymvjbpqyrbyz", - "depends": ["dplyr", "ggplot2", "ggpubr", "gridExtra", "metafor", "nullabor", "RColorBrewer"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "ggpubr", "gridExtra", "metafor", "nullabor"] }, "metawho": { "name": "metawho", @@ -82169,7 +82979,7 @@ "name": "meteo", "version": "2.0-3", "sha256": "1l3656yh0ggjd7kyvkknn6a6ad1z45qpxrndgkp52cph2607n324", - "depends": ["caret", "CAST", "data_table", "DescTools", "doParallel", "dplyr", "foreach", "gstat", "jsonlite", "nabor", "plyr", "ranger", "raster", "sf", "sftime", "snowfall", "sp", "spacetime", "terra", "units"] + "depends": ["CAST", "DescTools", "caret", "data_table", "doParallel", "dplyr", "foreach", "gstat", "jsonlite", "nabor", "plyr", "ranger", "raster", "sf", "sftime", "snowfall", "sp", "spacetime", "terra", "units"] }, "meteoEVT": { "name": "meteoEVT", @@ -82181,13 +82991,13 @@ "name": "meteoForecast", "version": "0.56", "sha256": "0nbjl4x06ni6jk8ji6n3cgd07iszw87lwg52rp8avvsz3kh19p5c", - "depends": ["ncdf4", "raster", "sp", "XML", "zoo"] + "depends": ["XML", "ncdf4", "raster", "sp", "zoo"] }, "meteoland": { "name": "meteoland", "version": "2.2.1", "sha256": "1543ka7yd7v1yca7my1114mb5j6wmn7dsj3kcr7gj8z99v8mxadk", - "depends": ["assertthat", "cli", "cubelyr", "dplyr", "lifecycle", "lubridate", "ncdfgeom", "ncmeta", "purrr", "Rcpp", "rlang", "sf", "stars", "tidyr", "units"] + "depends": ["Rcpp", "assertthat", "cli", "cubelyr", "dplyr", "lifecycle", "lubridate", "ncdfgeom", "ncmeta", "purrr", "rlang", "sf", "stars", "tidyr", "units"] }, "meteor": { "name": "meteor", @@ -82199,7 +83009,7 @@ "name": "meteorits", "version": "0.1.1", "sha256": "1vk8pbhfc5mbkbpw7ml81gx9i8187xp3vx36pbyyhjbrpy6gqabx", - "depends": ["MASS", "pracma", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "pracma"] }, "meteospain": { "name": "meteospain", @@ -82227,9 +83037,9 @@ }, "metrica": { "name": "metrica", - "version": "2.0.3", - "sha256": "10pkd29vcrm74fxf4i5bmkrj6528vfzipf53nfdpic9bavk2s2i7", - "depends": ["DBI", "dplyr", "energy", "ggplot2", "ggpp", "minerva", "rlang", "RSQLite", "tidyr"] + "version": "2.1.0", + "sha256": "1hb7m0adz3a31c0rqjfpz8lincsclcpn02jhn0idpbppp86h6pck", + "depends": ["DBI", "RSQLite", "dplyr", "energy", "ggplot2", "ggpp", "minerva", "rlang", "tidyr"] }, "metricminer": { "name": "metricminer", @@ -82259,7 +83069,7 @@ "name": "mets", "version": "1.3.4", "sha256": "0yisa6v0apxxw5ycjhc3hcghlmvzzaq431z8nzsrw5jc2g13c0ca", - "depends": ["lava", "mvtnorm", "numDeriv", "Rcpp", "RcppArmadillo", "survival", "timereg"] + "depends": ["Rcpp", "RcppArmadillo", "lava", "mvtnorm", "numDeriv", "survival", "timereg"] }, "metsyn": { "name": "metsyn", @@ -82269,15 +83079,15 @@ }, "mev": { "name": "mev", - "version": "1.16", - "sha256": "0kavj6mzzsjxkac2q0fxyhnzwy51pwld4r77fg024ggliiswjmms", - "depends": ["alabama", "nleqslv", "Rcpp", "RcppArmadillo", "Rsolnp"] + "version": "1.17", + "sha256": "0gzi48kwp6hb9p28km43kf76r55cbqgmjkfn8nylhkah7zx1gvxc", + "depends": ["Rcpp", "RcppArmadillo", "Rsolnp", "alabama", "nleqslv"] }, "mevr": { "name": "mevr", - "version": "1.0.0", - "sha256": "0klhmlhn2v4ncsrwvpzhxxn8bbrjn5qjzi6rlxrxmp9yfk5wnxhy", - "depends": ["bamlss", "doParallel", "dplyr", "EnvStats", "foreach", "mgcv", "rlang"] + "version": "1.1.1", + "sha256": "107gp0lbgy4hfi38x07h4z8sf1phkywqk58hfr2d97dil4mnwlz0", + "depends": ["EnvStats", "bamlss", "doParallel", "dplyr", "foreach", "mgcv", "rlang"] }, "mewAvg": { "name": "mewAvg", @@ -82287,9 +83097,9 @@ }, "mexhaz": { "name": "mexhaz", - "version": "2.5", - "sha256": "0lpymgfknr8szpxf7g7qmvdklsclfsmvjjws7cdpxsiv6hv8y3p2", - "depends": ["lamW", "MASS", "numDeriv", "statmod", "survival"] + "version": "2.6", + "sha256": "160ilpb6zydjpj82nhbh0wha71cmmvyw7wmhqfvj3jbli22vyn8q", + "depends": ["MASS", "lamW", "numDeriv", "statmod", "survival"] }, "mexicolors": { "name": "mexicolors", @@ -82301,19 +83111,19 @@ "name": "mfGARCH", "version": "0.2.1", "sha256": "1pcabijwhdxhdlrdjvi2zl8la939igsdy3j1yv0ic8wvkpw1sh4x", - "depends": ["maxLik", "numDeriv", "Rcpp", "zoo"] + "depends": ["Rcpp", "maxLik", "numDeriv", "zoo"] }, "mfaces": { "name": "mfaces", "version": "0.1-4", "sha256": "0svvnpka2y1p21gvdyc7csw6m0g3kziszw2ll9bq5gpcnl69qk4n", - "depends": ["face", "Matrix", "matrixcalc", "mgcv"] + "depends": ["Matrix", "face", "matrixcalc", "mgcv"] }, "mfdb": { "name": "mfdb", "version": "7.3-1", "sha256": "1l7bvacmvh53rq91jqdb6zqjn3974sy838zfvgfb6nam54r080y4", - "depends": ["DBI", "duckdb", "getPass", "logging", "rlang", "RPostgres", "RSQLite"] + "depends": ["DBI", "RPostgres", "RSQLite", "duckdb", "getPass", "logging", "rlang"] }, "mfp": { "name": "mfp", @@ -82331,13 +83141,13 @@ "name": "mfpp", "version": "0.0.7", "sha256": "1z250grk06cmclyz4v3qnxdy43dm5vcrcq1rglpps3cfrg09i2g1", - "depends": ["genalg", "ggplot2", "igraph", "nsga2R", "pracma", "reshape2", "Rfast"] + "depends": ["Rfast", "genalg", "ggplot2", "igraph", "nsga2R", "pracma", "reshape2"] }, "mfx": { "name": "mfx", "version": "1.2-2", "sha256": "04pwp67i4sn4rf497pgy6qifwvrcmwyxn8x5sn96fy8qyrdzjfhj", - "depends": ["betareg", "lmtest", "MASS", "sandwich"] + "depends": ["MASS", "betareg", "lmtest", "sandwich"] }, "mgarchBEKK": { "name": "mgarchBEKK", @@ -82349,13 +83159,13 @@ "name": "mgc", "version": "2.0.2", "sha256": "1l9qs4nz1rn56qp569nh26yz3c7i4zh3r43c209zh7kvizpagx0i", - "depends": ["abind", "boot", "energy", "MASS", "raster"] + "depends": ["MASS", "abind", "boot", "energy", "raster"] }, "mgcViz": { "name": "mgcViz", "version": "0.1.11", "sha256": "14n9l10rcr9nar71lyw1qmk9xar2zixcx4s9rdnz5dr4jr7330y3", - "depends": ["gamm4", "GGally", "ggplot2", "gridExtra", "KernSmooth", "matrixStats", "mgcv", "miniUI", "plyr", "qgam", "shiny", "viridis"] + "depends": ["GGally", "KernSmooth", "gamm4", "ggplot2", "gridExtra", "matrixStats", "mgcv", "miniUI", "plyr", "qgam", "shiny", "viridis"] }, "mgcv": { "name": "mgcv", @@ -82367,19 +83177,25 @@ "name": "mgee2", "version": "0.5", "sha256": "0p4601z2dyg2yjyjdcl0ry7fda89rjl6kilk8977z8p4n7d1kynj", - "depends": ["ggplot2", "MASS"] + "depends": ["MASS", "ggplot2"] }, "mggd": { "name": "mggd", - "version": "1.2.3", - "sha256": "0zh3af2qqlz59nkqip2kwn51zcfy7kk45cyz6952vg276cv0a5hd", - "depends": ["lifecycle", "MASS", "rgl"] + "version": "1.3.1", + "sha256": "07ajrhbsxr608688qppg6p2q7i3bh67fr6q9hvl9cs12av4bdznq", + "depends": ["MASS", "data_table", "lifecycle", "rgl"] + }, + "mgi_report_reader": { + "name": "mgi.report.reader", + "version": "0.1.3", + "sha256": "0r0s8ji2mdi9hkls7ly645sa06hmcl903v9ys6cxzadbiprwnbnv", + "depends": ["data_table", "dplyr", "httr2", "memoise", "rlang", "stringr", "tibble", "vroom"] }, "mglasso": { "name": "mglasso", "version": "0.1.2", "sha256": "1896fg1gdgah8vmikz2br6v0rslhhh2frffkjiy6fnw4qxa5zsv9", - "depends": ["corpcor", "ggplot2", "ggrepel", "gridExtra", "Matrix", "R_utils", "reticulate", "rstudioapi"] + "depends": ["Matrix", "R_utils", "corpcor", "ggplot2", "ggrepel", "gridExtra", "reticulate", "rstudioapi"] }, "mglmn": { "name": "mglmn", @@ -82391,7 +83207,7 @@ "name": "mgm", "version": "1.2-14", "sha256": "1j5hvf168vzanhc5ck5rxz5arjq3b0gs552kf3l1f8kqdmd8kpzw", - "depends": ["glmnet", "gtools", "Hmisc", "qgraph", "stringr"] + "depends": ["Hmisc", "glmnet", "gtools", "qgraph", "stringr"] }, "mgpStreamingSDK": { "name": "mgpStreamingSDK", @@ -82403,7 +83219,7 @@ "name": "mgss", "version": "1.2", "sha256": "0czzr5hc9sr8yc362q9xag3vphwk1gfahczpya2mh1l6fsa74fbn", - "depends": ["combinat", "Matrix", "Rcpp", "statmod"] + "depends": ["Matrix", "Rcpp", "combinat", "statmod"] }, "mgsub": { "name": "mgsub", @@ -82427,13 +83243,13 @@ "name": "mgwrsar", "version": "1.0.5", "sha256": "0xhxx1x625igm54n5wpl4aavcqg9dx9nmazr330538p334df3z8h", - "depends": ["caret", "doParallel", "dplyr", "foreach", "ggplot2", "gridExtra", "htmltools", "knitr", "leaflet", "mapview", "Matrix", "mboost", "mgcv", "microbenchmark", "nabor", "Rcpp", "RcppEigen", "rlang", "sf", "sp", "spgwr"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "caret", "doParallel", "dplyr", "foreach", "ggplot2", "gridExtra", "htmltools", "knitr", "leaflet", "mapview", "mboost", "mgcv", "microbenchmark", "nabor", "rlang", "sf", "sp", "spgwr"] }, "mhazard": { "name": "mhazard", "version": "0.2.3", "sha256": "030r0l11qplmypwfk45mj31gba96xda7nxzgiyjsgrb20jmcsja5", - "depends": ["boot", "plot3D", "Rcpp", "RcppArmadillo", "rootSolve", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "boot", "plot3D", "rootSolve", "survival"] }, "mhcnuggetsr": { "name": "mhcnuggetsr", @@ -82453,11 +83269,17 @@ "sha256": "1z0p8ny9lpnrshgas7cad2lv7j0blw0n6ihiimw600n70h73jwrn", "depends": ["ggplot2", "reshape2"] }, + "mhurdle": { + "name": "mhurdle", + "version": "1.3-1", + "sha256": "0dlajmfwd0bz3npa7zy66pa5hxs08l89axnc77mp8q67mp6xwa7y", + "depends": ["CompQuadForm", "Formula", "Rdpack", "generics", "margins", "maxLik", "nonnest2", "numDeriv", "prediction", "sandwich", "survival", "truncreg"] + }, "mi": { "name": "mi", "version": "1.1", "sha256": "11f75ivnax6p48mp2pasprws488cm2daym87sw2mcrywvf89fyjd", - "depends": ["arm", "Matrix"] + "depends": ["Matrix", "arm"] }, "mi4p": { "name": "mi4p", @@ -82469,7 +83291,7 @@ "name": "miCoPTCM", "version": "1.1", "sha256": "0bmb06rb53fq8ylcvz693akmz7nkjj50c6ypxsjbfp4crllpi5v9", - "depends": ["distr", "MASS", "nleqslv", "survival"] + "depends": ["MASS", "distr", "nleqslv", "survival"] }, "miLAG": { "name": "miLAG", @@ -82481,13 +83303,13 @@ "name": "miLineage", "version": "2.1", "sha256": "0660vk44ywmj0q2cw7pa2z1r039ncw693dnz7zlgc0ipwak3b0ry", - "depends": ["data_table", "geepack", "MASS"] + "depends": ["MASS", "data_table", "geepack"] }, "miRNAss": { "name": "miRNAss", "version": "1.5", "sha256": "0j4yvd0j7r98m2msllszlzkzrx67a2z4xpx00zpq90hbr5jykxc4", - "depends": ["CORElearn", "Matrix", "Rcpp", "RSpectra"] + "depends": ["CORElearn", "Matrix", "RSpectra", "Rcpp"] }, "miRecSurv": { "name": "miRecSurv", @@ -82505,13 +83327,13 @@ "name": "miRtest", "version": "2.1", "sha256": "1qgyldf3yhny8dmix6drisrrn64s5h58yvmk5pch6irdddq3i053", - "depends": ["corpcor", "GlobalAncova", "globaltest", "limma", "MASS"] + "depends": ["GlobalAncova", "MASS", "corpcor", "globaltest", "limma"] }, "miWQS": { "name": "miWQS", "version": "0.4.4", "sha256": "0fmcc86hiz89kdynkzppp9z0srgh4gl8327szivjxadxip4zm21i", - "depends": ["coda", "condMVNorm", "ggplot2", "glm2", "Hmisc", "invgamma", "MASS", "matrixNormal", "MCMCpack", "mvtnorm", "purrr", "rlist", "Rsolnp", "survival", "tidyr", "tmvmixnorm", "tmvtnorm", "truncnorm"] + "depends": ["Hmisc", "MASS", "MCMCpack", "Rsolnp", "coda", "condMVNorm", "ggplot2", "glm2", "invgamma", "matrixNormal", "mvtnorm", "purrr", "rlist", "survival", "tidyr", "tmvmixnorm", "tmvtnorm", "truncnorm"] }, "micEcon": { "name": "micEcon", @@ -82529,7 +83351,7 @@ "name": "micEconCES", "version": "1.0-2", "sha256": "039hv274xbs3syw0nxgkvxgfyn594fpcrlgmfwd2mfv6y78hc796", - "depends": ["car", "DEoptim", "micEcon", "minpack_lm", "miscTools", "systemfit"] + "depends": ["DEoptim", "car", "micEcon", "minpack_lm", "miscTools", "systemfit"] }, "micEconDistRay": { "name": "micEconDistRay", @@ -82559,31 +83381,31 @@ "name": "micd", "version": "1.1.1", "sha256": "0scihw884m8cj3c8kg2g83w36wks44s3s7nfbhifqc89nv5q0p8a", - "depends": ["mice", "pcalg", "RBGL", "Rfast"] + "depends": ["RBGL", "Rfast", "mice", "pcalg"] }, "mice": { "name": "mice", "version": "3.16.0", "sha256": "0h20lirk2257y3i1ww5y2pqp9lc21ilmf8yykmz36h55hm8jiw19", - "depends": ["broom", "cpp11", "dplyr", "generics", "glmnet", "lattice", "mitml", "nnet", "Rcpp", "rlang", "rpart", "tidyr"] + "depends": ["Rcpp", "broom", "cpp11", "dplyr", "generics", "glmnet", "lattice", "mitml", "nnet", "rlang", "rpart", "tidyr"] }, "miceFast": { "name": "miceFast", "version": "0.8.2", "sha256": "0n4hi9f28mzc9h41g7y3nnkr5lq7npafk6ias17xsqw28agc95ir", - "depends": ["data_table", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "data_table"] }, "miceRanger": { "name": "miceRanger", "version": "1.5.0", "sha256": "0xm8fcvjf6pcfyyk1gnwfdac44q6b33i5byja9lqxy7vygbxmgxd", - "depends": ["corrplot", "crayon", "data_table", "DescTools", "FNN", "foreach", "ggplot2", "ggpubr", "ranger"] + "depends": ["DescTools", "FNN", "corrplot", "crayon", "data_table", "foreach", "ggplot2", "ggpubr", "ranger"] }, "miceadds": { "name": "miceadds", "version": "3.17-44", "sha256": "0r91rjl44sxdwfdb0z10hnjq7yfiqlcwfm6aa0a7lm1vmk8rvxkf", - "depends": ["mice", "mitools", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "mice", "mitools"] }, "miceafter": { "name": "miceafter", @@ -82595,7 +83417,7 @@ "name": "micemd", "version": "1.10.0", "sha256": "1rzn4iiv9zml6c0d5j36c4z1kdn03j05m4q03wca7z0k35icsis6", - "depends": ["abind", "digest", "GJRM", "jomo", "lme4", "MASS", "Matrix", "mgcv", "mice", "mixmeta", "mvmeta", "mvtnorm", "nlme", "pbivnorm"] + "depends": ["GJRM", "MASS", "Matrix", "abind", "digest", "jomo", "lme4", "mgcv", "mice", "mixmeta", "mvmeta", "mvtnorm", "nlme", "pbivnorm"] }, "michelRodange": { "name": "michelRodange", @@ -82643,13 +83465,13 @@ "name": "microbial", "version": "0.0.21", "sha256": "1d2sr4wwjlxcaxqr57gzf8m2pydgx4kp3h8mgyxzcm4s00i8m5bc", - "depends": ["broom", "DESeq2", "dplyr", "edgeR", "ggplot2", "ggpubr", "magrittr", "phangorn", "phyloseq", "plyr", "randomForest", "rlang", "rstatix", "S4Vectors", "SummarizedExperiment", "tidyr", "vegan"] + "depends": ["DESeq2", "S4Vectors", "SummarizedExperiment", "broom", "dplyr", "edgeR", "ggplot2", "ggpubr", "magrittr", "phangorn", "phyloseq", "plyr", "randomForest", "rlang", "rstatix", "tidyr", "vegan"] }, "microclass": { "name": "microclass", "version": "1.2", "sha256": "0q6mn1hbi6nk29x2x5a1wcdqp06mjggbrpglk5i8pp4gkqlzhl8q", - "depends": ["dplyr", "microcontax", "microseq", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "stringr", "tibble"] + "depends": ["Rcpp", "RcppEigen", "RcppParallel", "dplyr", "microcontax", "microseq", "rlang", "stringr", "tibble"] }, "microcontax": { "name": "microcontax", @@ -82665,27 +83487,27 @@ }, "microeco": { "name": "microeco", - "version": "1.7.1", - "sha256": "1w01k7vd1s5w3xkjxkz5gwbql92k3r2nvxzhxhbpkj9amz1rb5wl", - "depends": ["ape", "data_table", "dplyr", "ggplot2", "igraph", "magrittr", "R6", "RColorBrewer", "reshape2", "rlang", "scales", "tibble", "vegan"] + "version": "1.9.0", + "sha256": "0hk1mria8r0jqq8q0qxhpq42j9cna64ip4z056jda8n7l9jympsf", + "depends": ["R6", "RColorBrewer", "ape", "data_table", "dplyr", "ggplot2", "igraph", "magrittr", "reshape2", "rlang", "scales", "tibble", "vegan"] }, "microhaplot": { "name": "microhaplot", "version": "1.0.1", "sha256": "0g15g7d19yz11nn2g0h8h2m8k1cvmpryz72pnalgv5yi58md5l5i", - "depends": ["dplyr", "DT", "ggiraph", "ggplot2", "gtools", "magrittr", "scales", "shiny", "shinyBS", "shinyWidgets", "tidyr"] + "depends": ["DT", "dplyr", "ggiraph", "ggplot2", "gtools", "magrittr", "scales", "shiny", "shinyBS", "shinyWidgets", "tidyr"] }, "micromap": { "name": "micromap", "version": "1.9.8", "sha256": "129q0a6jywxmhgddyacjl150zfxr04qdv17pqngp4xl0rd9r5zcz", - "depends": ["ggplot2", "RColorBrewer", "sf", "sp"] + "depends": ["RColorBrewer", "ggplot2", "sf", "sp"] }, "micromapST": { "name": "micromapST", "version": "3.0.3", "sha256": "0zg0wgqlk9z9k3qhcnd8y8swa7p3g8q30fvw3g0n71dd4vqxzdcl", - "depends": ["labeling", "RColorBrewer", "readxl", "rmapshaper", "sf", "spdep", "stringr", "writexl"] + "depends": ["RColorBrewer", "labeling", "readxl", "rmapshaper", "sf", "spdep", "stringr", "writexl"] }, "micromodal": { "name": "micromodal", @@ -82709,19 +83531,19 @@ "name": "microplot", "version": "1.0-45", "sha256": "0qprvn5zv9ai30lhd8qykffc5f8va886kc5qka34940lin63v389", - "depends": ["cowplot", "flextable", "ggplot2", "HH", "Hmisc", "htmltools", "lattice", "officer"] + "depends": ["HH", "Hmisc", "cowplot", "flextable", "ggplot2", "htmltools", "lattice", "officer"] }, "microseq": { "name": "microseq", "version": "2.1.6", "sha256": "1xa8r908jic06kv1qjmdidh3zzslbimjyhsy6v27xqzrh45svq4c", - "depends": ["data_table", "dplyr", "Rcpp", "rlang", "stringr", "tibble"] + "depends": ["Rcpp", "data_table", "dplyr", "rlang", "stringr", "tibble"] }, "microsimulation": { "name": "microsimulation", "version": "1.4.3", "sha256": "0vn7lx6qa0dqd7h208s36jwcxswmnhdp4kazkavagd61sqr2gah2", - "depends": ["ascii", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "ascii", "survival"] }, "microsynth": { "name": "microsynth", @@ -82733,7 +83555,7 @@ "name": "micsr", "version": "0.1-1", "sha256": "1rjny19h7h2zj2c186dws557h4yy0pcsr14dsbg25nmxplsbz0ml", - "depends": ["dplyr", "Formula", "generics", "ggplot2", "knitr", "magrittr", "purrr", "Rdpack", "rlang", "sandwich", "tibble", "tidyr", "tidyselect"] + "depends": ["Formula", "Rdpack", "dplyr", "generics", "ggplot2", "knitr", "magrittr", "purrr", "rlang", "sandwich", "tibble", "tidyr", "tidyselect"] }, "micss": { "name": "micss", @@ -82751,19 +83573,19 @@ "name": "midas2", "version": "1.1.0", "sha256": "0in4z1ijj9ymr27c9l5a9jripzb9k0nxk231bmk3sk3b3s7755vb", - "depends": ["coda", "MCMCpack", "R2jags"] + "depends": ["MCMCpack", "R2jags", "coda"] }, "midasml": { "name": "midasml", "version": "0.1.10", "sha256": "0jhrifvqcis2lj59vybgkzgmdmxwfqmsbxijwcz8hsprshr69xl9", - "depends": ["doParallel", "doRNG", "foreach", "lubridate", "Matrix", "randtoolbox", "snow"] + "depends": ["Matrix", "doParallel", "doRNG", "foreach", "lubridate", "randtoolbox", "snow"] }, "midasr": { "name": "midasr", "version": "0.8", "sha256": "0mzyxf8q2wmbsiczkhhgigy7jmi8zr4w4a83f97va35vfhxi217k", - "depends": ["forecast", "Formula", "MASS", "Matrix", "numDeriv", "optimx", "quantreg", "sandwich", "texreg", "zoo"] + "depends": ["Formula", "MASS", "Matrix", "forecast", "numDeriv", "optimx", "quantreg", "sandwich", "texreg", "zoo"] }, "midastouch": { "name": "midastouch", @@ -82781,7 +83603,7 @@ "name": "midi", "version": "0.1.0", "sha256": "06dc0lazi7pkdm66isaqa9igfrl8dq4klpg06aggmilgay09fi5s", - "depends": ["cli", "ggplot2", "plotly", "purrr", "R6", "rlang", "withr"] + "depends": ["R6", "cli", "ggplot2", "plotly", "purrr", "rlang", "withr"] }, "midrangeMCP": { "name": "midrangeMCP", @@ -82791,9 +83613,9 @@ }, "miesmuschel": { "name": "miesmuschel", - "version": "0.0.4-1", - "sha256": "1n2svgi926m8i8d1yzj4dyy1nhxr8m46qp3fpi2kjnprxs303rnd", - "depends": ["bbotk", "checkmate", "data_table", "lgr", "matrixStats", "mlr3misc", "paradox", "R6"] + "version": "0.0.4-2", + "sha256": "0pqp9rpk0jmbkfxi5vq8ij7s3y9ykk9kn0bsz9y4qw8z8j8grmv1", + "depends": ["R6", "bbotk", "checkmate", "data_table", "lgr", "matrixStats", "mlr3misc", "paradox"] }, "mifa": { "name": "mifa", @@ -82801,6 +83623,12 @@ "sha256": "1rj3ba746f8759gird0vpvyb4fl0z2ihccpiv3qkr3sc64wgplln", "depends": ["checkmate", "dplyr", "mice"] }, + "mig": { + "name": "mig", + "version": "1.0", + "sha256": "1l7p2bbcz888s3m339p63i6490savjqvv5g4awznzpfbllp0zi4i", + "depends": ["Rcpp", "RcppArmadillo", "TruncatedNormal", "statmod"] + }, "migest": { "name": "migest", "version": "2.0.4", @@ -82809,15 +83637,15 @@ }, "migraph": { "name": "migraph", - "version": "1.3.4", - "sha256": "1j43apygc7m5gff07zabv3plm3hhhnv091fdxkvzlms9w0f2j1zy", - "depends": ["dplyr", "furrr", "future", "generics", "ggplot2", "igraph", "manynet", "network", "pillar", "purrr", "rlang", "sna", "tidygraph", "tidyr"] + "version": "1.4.1", + "sha256": "0nr5y9yxwny8k4z5jm742k7n9r4s00xlkqbynfdf4apd5y6q8snm", + "depends": ["dplyr", "furrr", "future", "generics", "ggplot2", "manynet", "purrr"] }, "migrate": { "name": "migrate", - "version": "0.4.0", - "sha256": "0yf0c7gcn2q8sx0havhqaxk6z69bagfd58drpbqkkpsp62bnq875", - "depends": ["dplyr", "magrittr", "rlang", "tibble", "tidyr"] + "version": "0.5.0", + "sha256": "04whq58zm83s9y66bzb390q6cwj006gv4abv0b63fx1rkvfh9drw", + "depends": ["cli", "dplyr", "glue", "rlang", "tibble", "tidyr"] }, "migration_indices": { "name": "migration.indices", @@ -82835,25 +83663,37 @@ "name": "miic", "version": "1.5.3", "sha256": "1wrvgzi91jirn5n5fvvbhhpcga7l75h149sz1g1r1wbci181l3bg", - "depends": ["ppcor", "Rcpp", "scales"] + "depends": ["Rcpp", "ppcor", "scales"] }, "mikropml": { "name": "mikropml", "version": "1.6.1", "sha256": "13dlzrwyl4sqklypva35qq5194yc95fcpsyclvisdrky040xgxsy", - "depends": ["caret", "dplyr", "e1071", "glmnet", "kernlab", "MLmetrics", "randomForest", "rlang", "rpart", "xgboost"] + "depends": ["MLmetrics", "caret", "dplyr", "e1071", "glmnet", "kernlab", "randomForest", "rlang", "rpart", "xgboost"] }, "mildsvm": { "name": "mildsvm", "version": "0.4.0", "sha256": "02n93ck8458xliqwp226v5b7691a9jx5i7b1q9n0nqc74xkm8h1i", - "depends": ["dplyr", "e1071", "kernlab", "magrittr", "mvtnorm", "pillar", "pROC", "purrr", "rlang", "tibble", "tidyr"] + "depends": ["dplyr", "e1071", "kernlab", "magrittr", "mvtnorm", "pROC", "pillar", "purrr", "rlang", "tibble", "tidyr"] + }, + "milorGWAS": { + "name": "milorGWAS", + "version": "0.7", + "sha256": "052bavj7wmkjcnm6vjswpg1zkawqjn5yy3z6zi4gklxci53a1z1i", + "depends": ["Rcpp", "RcppEigen", "gaston"] }, "milr": { "name": "milr", "version": "0.3.1", "sha256": "03hihr1w5j0mlvi5vm9m5vb9i6nyb6lsji3xmv0chpczabd85mzy", - "depends": ["glmnet", "numDeriv", "pipeR", "Rcpp", "RcppArmadillo", "RcppParallel"] + "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "glmnet", "numDeriv", "pipeR"] + }, + "mimdo": { + "name": "mimdo", + "version": "0.1.0", + "sha256": "1p0qz2z421pw2yaglg745ccs6yyn5ww4rzspsfikdpr1js7lx4a4", + "depends": [] }, "mime": { "name": "mime", @@ -82865,7 +83705,7 @@ "name": "mimi", "version": "0.2.0", "sha256": "1ig34qd37my74nmlv3jcfrj7cnd55alxpf2flf2sssk2ws1y56xh", - "depends": ["data_table", "doParallel", "FactoMineR", "foreach", "glmnet", "rARPACK", "softImpute"] + "depends": ["FactoMineR", "data_table", "doParallel", "foreach", "glmnet", "rARPACK", "softImpute"] }, "mimiSBM": { "name": "mimiSBM", @@ -82875,8 +83715,8 @@ }, "mimsy": { "name": "mimsy", - "version": "0.6.4", - "sha256": "1hbgjrgm4d4bvdkr8wvirvvv87f1wcnasd0909x38zjivr57dgda", + "version": "0.6.5", + "sha256": "1cxr3pcm32cbl3nqblh8s8lx6pn72sgnp63ib0gvcysr8rdx1gza", "depends": ["dplyr", "lubridate", "magrittr", "openxlsx"] }, "minMSE": { @@ -82901,7 +83741,7 @@ "name": "mind", "version": "1.1.0", "sha256": "01ncwc1kkfa0gfmrnvl93lvzlcjl6r30a3fs65lq15b132rncgwq", - "depends": ["data_table", "dplyr", "JWileymisc", "MASS", "Matrix", "tm"] + "depends": ["JWileymisc", "MASS", "Matrix", "data_table", "dplyr", "tm"] }, "mineCitrus": { "name": "mineCitrus", @@ -82913,7 +83753,7 @@ "name": "mineSweepR", "version": "0.1.1", "sha256": "0bnaa0652pspsd80v66b83np58429g8044941bsmr3apgf8660gj", - "depends": ["ComplexHeatmap", "dplyr", "gsignal", "hms", "InteractiveComplexHeatmap", "mgc", "mmand", "pals", "rlang"] + "depends": ["ComplexHeatmap", "InteractiveComplexHeatmap", "dplyr", "gsignal", "hms", "mgc", "mmand", "pals", "rlang"] }, "mined": { "name": "mined", @@ -82941,15 +83781,15 @@ }, "miniMeta": { "name": "miniMeta", - "version": "0.3.1", - "sha256": "0qd55a0a03a3q62hjpmi0815x4jff6zhrxavm1wb46c09y1hm62j", - "depends": ["colourpicker", "jsonlite", "markdown", "meta", "metafor", "readxl", "rhandsontable", "shiny", "shinyjs", "shinyWidgets", "WriteXLS"] + "version": "0.3.2", + "sha256": "1v0nfmk034xz6nn0pnas0g11bbg0k86c99qykqadqr9kr9iwjrki", + "depends": ["WriteXLS", "colourpicker", "jsonlite", "markdown", "meta", "metafor", "readxl", "rhandsontable", "shiny", "shinyWidgets", "shinyjs"] }, "miniPCH": { "name": "miniPCH", "version": "0.3.2", "sha256": "1z8zsagas50ndwygkxfdi933x5vq3dmq5kwmi3lg28hqdaf2hcnm", - "depends": ["checkmate", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "checkmate"] }, "miniUI": { "name": "miniUI", @@ -82957,6 +83797,12 @@ "sha256": "1h5h2sc57h95d6bsgs95l26911g38hvjc1v50bc31xl9689l2as5", "depends": ["htmltools", "shiny"] }, + "minic": { + "name": "minic", + "version": "1.0", + "sha256": "1n7xhgwlfyy18y1d0rjnkrvfdblkd4n55c673fyrkdc1q8lpmngw", + "depends": ["Rcpp", "RcppEigen"] + }, "minidown": { "name": "minidown", "version": "0.4.0", @@ -82975,6 +83821,12 @@ "sha256": "0y5yzic9pwpzs01gnl82syankijcjp85n22jn5zda0bp3y01r53r", "depends": [] }, + "minimapR": { + "name": "minimapR", + "version": "0.0.1.0", + "sha256": "1cf0mp0mc3zalsi4fa2khz139hky0vjzj0cfay70prh5cll7dm3b", + "depends": ["Rsamtools", "git2r", "pafr"] + }, "minimax": { "name": "minimax", "version": "1.1.1", @@ -82983,8 +83835,8 @@ }, "minimaxApprox": { "name": "minimaxApprox", - "version": "0.4.2", - "sha256": "069r2wcjlkv91vqvs7s089hmclngcrvawycr5vkfp65l7rlrg1qp", + "version": "0.4.3", + "sha256": "1gk7rh17g3xdsr42a1f6lp23ny9vkzig8srfwscd0v5hxx2cbqr9", "depends": [] }, "minioclient": { @@ -83001,8 +83853,8 @@ }, "minqa": { "name": "minqa", - "version": "1.2.7", - "sha256": "1qigwpcj8mz1fgq4ikq64pkqfwgw50bd928xbc4xaq6q3sflbwvn", + "version": "1.2.8", + "sha256": "0rslvg4imaijzb5z6vzsx4zqhrna1jk6qkp2kxnzqy0rn2wy8har", "depends": ["Rcpp"] }, "minque": { @@ -83033,31 +83885,31 @@ "name": "mipfp", "version": "3.2.1", "sha256": "1gxazpg81vj5dywpb6jb29188jw28qil6pfygawa7znnjn3k5ca6", - "depends": ["cmm", "numDeriv", "Rsolnp"] + "depends": ["Rsolnp", "cmm", "numDeriv"] }, "mipplot": { "name": "mipplot", "version": "0.3.1", "sha256": "126arvxq6gmaiwk3n3p0slnb1mhs3qf993m4lx95nlmnv612ag66", - "depends": ["data_table", "dplyr", "ggplot2", "readr", "readxl", "reshape", "reshape2", "rlang", "shiny", "shiny_i18n", "shinyalert", "shinyWidgets", "showtext", "showtextdb", "stringr", "tidyr"] + "depends": ["data_table", "dplyr", "ggplot2", "readr", "readxl", "reshape", "reshape2", "rlang", "shiny", "shinyWidgets", "shiny_i18n", "shinyalert", "showtext", "showtextdb", "stringr", "tidyr"] }, "mirai": { "name": "mirai", - "version": "1.1.0", - "sha256": "0nq3wrgizlii8a17i033glbl5ixgdwjxzpyi5yzf0icxbqaylm5w", + "version": "1.2.0", + "sha256": "18x7imacq8gj44afjh77pq4cvnqnjfcnvqdp7hkmh19qbl708cpk", "depends": ["nanonext"] }, "mirt": { "name": "mirt", - "version": "1.41", - "sha256": "0qx8qr4zd5jliamsmpr0c321g3k9ks1ki4fvy5lia3xgihp2s6yh", - "depends": ["dcurver", "Deriv", "GPArotation", "gridExtra", "lattice", "Matrix", "mgcv", "pbapply", "Rcpp", "RcppArmadillo", "vegan"] + "version": "1.42", + "sha256": "15yzgph7957wvrfnxwc9p27hckamkkxmi0c02x6p5i505ya16lly", + "depends": ["Deriv", "GPArotation", "Matrix", "Rcpp", "RcppArmadillo", "SimDesign", "dcurver", "gridExtra", "lattice", "mgcv", "pbapply", "vegan"] }, "mirtCAT": { "name": "mirtCAT", - "version": "1.13", - "sha256": "1vlv93wjwj3ajf0mqjz38bi9fdk1sl0wqyqr7kjhhdj4znhrprbs", - "depends": ["lattice", "lpSolve", "markdown", "mirt", "pbapply", "Rcpp", "RcppArmadillo", "shiny"] + "version": "1.14", + "sha256": "02774rxl1rpk7j60bhib77yygj80c0c0s3fzzwjzdpsz91hg29z1", + "depends": ["Rcpp", "RcppArmadillo", "lattice", "lpSolve", "markdown", "mirt", "pbapply", "shiny"] }, "mirtjml": { "name": "mirtjml", @@ -83093,7 +83945,7 @@ "name": "miscF", "version": "0.1-5", "sha256": "0g6wk2zxqq6j949hnbvwmfd72y25zjfbrfrfxsj21q84w41fgjkb", - "depends": ["MASS", "MCMCpack", "mvtnorm", "R2jags"] + "depends": ["MASS", "MCMCpack", "R2jags", "mvtnorm"] }, "miscFuncs": { "name": "miscFuncs", @@ -83117,13 +83969,13 @@ "name": "misclassGLM", "version": "0.3.5", "sha256": "0iph5nz4hnfgx32xwc8z201ap18b543x8by6hcpkbk8jcbxswhjq", - "depends": ["foreach", "MASS", "Matrix", "mlogit", "numDeriv", "ucminf"] + "depends": ["MASS", "Matrix", "foreach", "mlogit", "numDeriv", "ucminf"] }, "miscset": { "name": "miscset", "version": "1.1.0", "sha256": "1gwi7jnqdf2fa8yk8gmcc7dcv72bbdl7yj3yccj3r5jjk41vdp91", - "depends": ["data_table", "devtools", "ggplot2", "gridExtra", "Rcpp", "xtable"] + "depends": ["Rcpp", "data_table", "devtools", "ggplot2", "gridExtra", "xtable"] }, "miselect": { "name": "miselect", @@ -83133,15 +83985,15 @@ }, "mispitools": { "name": "mispitools", - "version": "1.0.0", - "sha256": "1s54dm6c48ahib2p5firx3l0fxqxrcvfpk02smisbxna85vbfwd5", - "depends": ["DirichletReg", "dplyr", "forrel", "ggplot2", "highcharter", "patchwork", "pedtools", "plotly", "purrr", "reshape2", "shiny", "tidyr", "tidyverse"] + "version": "1.2.0", + "sha256": "09sgs6s005s8lqxb7v21k4vjwkw5kz0dg4b44k11fvgvb8l1i3ba", + "depends": ["DirichletReg", "dplyr", "forrel", "ggplot2", "patchwork", "pedtools", "purrr", "reshape2", "shiny", "tidyr", "tidyverse"] }, "mispr": { "name": "mispr", "version": "1.0.0", "sha256": "166piax3f7di8h0i07fbdx45lxz1p47j378v6yl6zdc3525adpjx", - "depends": ["e1071", "MASS", "penalized"] + "depends": ["MASS", "e1071", "penalized"] }, "missCforest": { "name": "missCforest", @@ -83153,19 +84005,19 @@ "name": "missCompare", "version": "1.0.3", "sha256": "03j69xw54d076znx19dplw4xznvgky90hxh3wgypg0g5pjg63y53", - "depends": ["Amelia", "data_table", "dplyr", "ggdendro", "ggplot2", "Hmisc", "ltm", "magrittr", "MASS", "Matrix", "mi", "mice", "missForest", "missMDA", "pcaMethods", "plyr", "rlang", "tidyr", "VIM"] + "depends": ["Amelia", "Hmisc", "MASS", "Matrix", "VIM", "data_table", "dplyr", "ggdendro", "ggplot2", "ltm", "magrittr", "mi", "mice", "missForest", "missMDA", "pcaMethods", "plyr", "rlang", "tidyr"] }, "missDeaths": { "name": "missDeaths", "version": "2.7", "sha256": "1c8vbc7r1g4dkngmal6iqg7piw656h1vc6cmpkv16vjn4j0w2n2c", - "depends": ["cmprsk", "MASS", "mitools", "Rcpp", "relsurv", "rms", "survival"] + "depends": ["MASS", "Rcpp", "cmprsk", "mitools", "relsurv", "rms", "survival"] }, "missDiag": { "name": "missDiag", "version": "1.0.1", "sha256": "04zd3nds44sy7nz73kdq9wjis3r9zyp0kda54mfqps1sh9jnizlq", - "depends": ["cobalt", "Formula"] + "depends": ["Formula", "cobalt"] }, "missForest": { "name": "missForest", @@ -83183,7 +84035,7 @@ "name": "missMDA", "version": "1.19", "sha256": "0p76jlzqayhwqwinaxhf69s3c5hxk4hmncvw4dsyybwvha25hrzr", - "depends": ["doParallel", "FactoMineR", "foreach", "ggplot2", "mice", "mvtnorm"] + "depends": ["FactoMineR", "doParallel", "foreach", "ggplot2", "mice", "mvtnorm"] }, "missMethods": { "name": "missMethods", @@ -83193,39 +84045,39 @@ }, "missRanger": { "name": "missRanger", - "version": "2.4.0", - "sha256": "1zycbpxqc04f65nqfv0zdi0q5kp9kmaw7s868v959198a4r23lc1", + "version": "2.6.0", + "sha256": "1qwjimdzb88pmqscpkl35y2lawrybps5wn3dnrpkh2zj2zxjf1md", "depends": ["FNN", "ranger"] }, "missSBM": { "name": "missSBM", "version": "1.0.4", "sha256": "1gw485bn7mddj5i555clp3saxas77r9r4970ahf1y3vpk43wjj02", - "depends": ["future_apply", "ggplot2", "igraph", "magrittr", "Matrix", "nloptr", "R6", "Rcpp", "RcppArmadillo", "rlang", "RSpectra", "sbm"] + "depends": ["Matrix", "R6", "RSpectra", "Rcpp", "RcppArmadillo", "future_apply", "ggplot2", "igraph", "magrittr", "nloptr", "rlang", "sbm"] }, "missSOM": { "name": "missSOM", "version": "1.0.1", "sha256": "15cqqz6f2npsz78yhj3ialzmlx7a8jsf27gfmmj4h68r01czyhs1", - "depends": ["kpodclustr", "Rcpp"] + "depends": ["Rcpp", "kpodclustr"] }, "missingHE": { "name": "missingHE", "version": "1.5.0", "sha256": "0my6a768w7lixh6cw453bl2nrb5aqdiri309p5kp4psp17pzllak", - "depends": ["bayesplot", "BCEA", "coda", "ggmcmc", "ggplot2", "ggpubr", "ggthemes", "gridExtra", "loo", "mcmcplots", "mcmcr", "R2jags"] + "depends": ["BCEA", "R2jags", "bayesplot", "coda", "ggmcmc", "ggplot2", "ggpubr", "ggthemes", "gridExtra", "loo", "mcmcplots", "mcmcr"] }, "missoNet": { "name": "missoNet", "version": "1.2.0", "sha256": "1k7959wjxxpzgrnwil7n51zf76zyri8c2m4m5h2w9az5pil2qmf0", - "depends": ["circlize", "ComplexHeatmap", "glasso", "mvtnorm", "pbapply", "Rcpp", "RcppArmadillo", "scatterplot3d"] + "depends": ["ComplexHeatmap", "Rcpp", "RcppArmadillo", "circlize", "glasso", "mvtnorm", "pbapply", "scatterplot3d"] }, "misspi": { "name": "misspi", "version": "0.1.0", "sha256": "0rbkwfq3b7gvq3qwn3acbrdv4npvm5ixz6y7877alraqd0qjg1c8", - "depends": ["doParallel", "doSNOW", "foreach", "ggplot2", "glmnet", "lightgbm", "plotly", "SIS"] + "depends": ["SIS", "doParallel", "doSNOW", "foreach", "ggplot2", "glmnet", "lightgbm", "plotly"] }, "mistr": { "name": "mistr", @@ -83237,12 +84089,12 @@ "name": "mistral", "version": "2.2.2", "sha256": "1ssgglw2y1bkhlwcrmw8bv8ic6vl5nj4l482hlq8kv1dgyrnbsas", - "depends": ["DiceKriging", "doParallel", "e1071", "foreach", "ggplot2", "iterators", "Matrix", "mvtnorm", "quadprog", "Rcpp"] + "depends": ["DiceKriging", "Matrix", "Rcpp", "doParallel", "e1071", "foreach", "ggplot2", "iterators", "mvtnorm", "quadprog"] }, "misty": { "name": "misty", - "version": "0.6.3", - "sha256": "1s0vkxxh13r62rdq2xlwkw93chi862ynr7lznp29g5iz3r3dz103", + "version": "0.6.5", + "sha256": "1gj244gywajfp7gzcn4rdcy88n1qp2gj9jn9aswhhhiha4fp620k", "depends": ["ggplot2", "haven", "lavaan", "lme4", "nlme", "norm", "readxl", "rstudioapi", "writexl"] }, "misuvi": { @@ -83267,7 +84119,7 @@ "name": "mitre", "version": "1.0.0", "sha256": "0r5phzxiibwwhx3qh623grfy070c3vzm4q07rzhsp5q5ycb5jhn5", - "depends": ["dplyr", "igraph", "jsonlite", "plyr", "RJSONIO", "rlang", "stringr", "tidyr"] + "depends": ["RJSONIO", "dplyr", "igraph", "jsonlite", "plyr", "rlang", "stringr", "tidyr"] }, "mix": { "name": "mix", @@ -83285,7 +84137,7 @@ "name": "mixAR", "version": "0.22.8", "sha256": "1fr3i54yvxqvh78pgn8y5hdwp1sf00gl9shg5bc7nnmmm84ki78q", - "depends": ["BB", "combinat", "e1071", "fGarch", "gbutils", "MCMCpack", "mvtnorm", "permute", "Rdpack", "timeDate"] + "depends": ["BB", "MCMCpack", "Rdpack", "combinat", "e1071", "fGarch", "gbutils", "mvtnorm", "permute", "timeDate"] }, "mixIndependR": { "name": "mixIndependR", @@ -83297,7 +84149,13 @@ "name": "mixKernel", "version": "0.9-1", "sha256": "0vak6qfhva666mjqwn16ivcdjsw31qic36g62g4p3ng2jvv57f32", - "depends": ["corrplot", "ggplot2", "LDRTools", "markdown", "Matrix", "mixOmics", "phyloseq", "psych", "quadprog", "reticulate", "vegan"] + "depends": ["LDRTools", "Matrix", "corrplot", "ggplot2", "markdown", "mixOmics", "phyloseq", "psych", "quadprog", "reticulate", "vegan"] + }, + "mixOofA": { + "name": "mixOofA", + "version": "1.0", + "sha256": "1npa4hbs9xgirb4smsbjpwvk8jk8nh4y6i644lwdsr3zf34rxr7d", + "depends": ["Rsolnp", "combinat", "crossdes", "doofa", "mixexp"] }, "mixPHM": { "name": "mixPHM", @@ -83309,7 +84167,7 @@ "name": "mixR", "version": "0.2.0", "sha256": "1iarsys7jyi3zck01y7415xwyd1knnh1fkc8z4ipfd63nnlm2pqc", - "depends": ["ggplot2", "Rcpp"] + "depends": ["Rcpp", "ggplot2"] }, "mixRaschTools": { "name": "mixRaschTools", @@ -83327,7 +84185,7 @@ "name": "mixSSG", "version": "2.1.1", "sha256": "0aqzyfpq568vgk2rjh7i93azfa990mvapddcdjwh3xyyb3flsas4", - "depends": ["ars", "MASS", "rootSolve"] + "depends": ["MASS", "ars", "rootSolve"] }, "mixbox": { "name": "mixbox", @@ -83357,7 +84215,7 @@ "name": "mixdir", "version": "0.3.0", "sha256": "1vgxxzsrl660agk4cjw4q4gx28fv5mkzpjy4qanq5c9mqpcxbxkc", - "depends": ["extraDistr", "Rcpp"] + "depends": ["Rcpp", "extraDistr"] }, "mixdist": { "name": "mixdist", @@ -83375,19 +84233,19 @@ "name": "mixedCCA", "version": "1.6.2", "sha256": "07apl37kwj47w14jxsvwdiacnwd517zs3ff2c70fhb6ncbgp8adv", - "depends": ["fMultivar", "irlba", "latentcor", "MASS", "Matrix", "mnormt", "pcaPP", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "fMultivar", "irlba", "latentcor", "mnormt", "pcaPP"] }, "mixedLSR": { "name": "mixedLSR", "version": "0.1.0", "sha256": "0a514w88k1lwcdmq7ginn4qmf0mdj747lhgxzx15nh0hp0xq26lc", - "depends": ["ggplot2", "grpreg", "MASS", "purrr"] + "depends": ["MASS", "ggplot2", "grpreg", "purrr"] }, "mixedMem": { "name": "mixedMem", "version": "1.1.2", "sha256": "1p0gplfcn663xp40dk0yg70qffn1fwa9gxv7bppflgm9wkn8g3l5", - "depends": ["BH", "gtools", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "gtools"] }, "mixedsde": { "name": "mixedsde", @@ -83405,19 +84263,19 @@ "name": "mixgb", "version": "1.0.2", "sha256": "1i6sckdbgckp84wvmsbay20vfqqzzphif2r7v3fc158gfw1vvkr4", - "depends": ["data_table", "ggplot2", "Matrix", "mice", "Rfast", "rlang", "scales", "tidyr", "xgboost"] + "depends": ["Matrix", "Rfast", "data_table", "ggplot2", "mice", "rlang", "scales", "tidyr", "xgboost"] }, "mixhvg": { "name": "mixhvg", "version": "0.1.1", "sha256": "1vwn4wdxs81r08x4f8zlpdqr1hvf6dk59qqrbxyj9xdk35hw9il4", - "depends": ["Matrix", "scran", "scuttle", "Seurat", "SingleCellExperiment"] + "depends": ["Matrix", "Seurat", "SingleCellExperiment", "scran", "scuttle"] }, "mixl": { "name": "mixl", "version": "1.3.4", "sha256": "1j3mqbrjgib57cyirmqgsx6livm63bx9xzps2j4fa6wgivwbk5xr", - "depends": ["maxLik", "numDeriv", "randtoolbox", "Rcpp", "readr", "sandwich", "stringr"] + "depends": ["Rcpp", "maxLik", "numDeriv", "randtoolbox", "readr", "sandwich", "stringr"] }, "mixlm": { "name": "mixlm", @@ -83441,7 +84299,7 @@ "name": "mixpoissonreg", "version": "1.0.0", "sha256": "1pk45p96kwl3gvi5523vm824s1bb5aqpn9qqpqy8kjy2pd2a4k32", - "depends": ["dplyr", "Formula", "gamlss", "gamlss_dist", "generics", "ggplot2", "ggrepel", "gridExtra", "lmtest", "magrittr", "pbapply", "Rfast", "rlang", "statmod", "tibble"] + "depends": ["Formula", "Rfast", "dplyr", "gamlss", "gamlss_dist", "generics", "ggplot2", "ggrepel", "gridExtra", "lmtest", "magrittr", "pbapply", "rlang", "statmod", "tibble"] }, "mixsmsn": { "name": "mixsmsn", @@ -83453,13 +84311,13 @@ "name": "mixsqp", "version": "0.3-54", "sha256": "13pv3mmz514kl4svxqwyk5b241dy1q52khwdc6rmh712ia8xxl7p", - "depends": ["irlba", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "irlba"] }, "mixtools": { "name": "mixtools", "version": "2.0.0", "sha256": "03by64xi7yka0hzc1qyz1jdqzah6isvr3cdsc7g5v6hb4f178kl5", - "depends": ["kernlab", "MASS", "plotly", "scales", "segmented", "survival"] + "depends": ["MASS", "kernlab", "plotly", "scales", "segmented", "survival"] }, "mixtox": { "name": "mixtox", @@ -83477,13 +84335,13 @@ "name": "mixture", "version": "2.1.1", "sha256": "0a7dy6p5lhs4sff5w1p6fha9w2vwd39fav34b0zsmyw0k4fjg2ah", - "depends": ["BH", "lattice", "Rcpp", "RcppArmadillo", "RcppGSL"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "RcppGSL", "lattice"] }, "mixvlmc": { "name": "mixvlmc", "version": "0.2.1", "sha256": "1bx9qvdi5fq69bwa25l9sqcdyihswjhmqrsslmnqfq7wzfxy3d3q", - "depends": ["assertthat", "butcher", "ggplot2", "nnet", "pROC", "Rcpp", "rlang", "stringr", "VGAM", "withr"] + "depends": ["Rcpp", "VGAM", "assertthat", "butcher", "ggplot2", "nnet", "pROC", "rlang", "stringr", "withr"] }, "mize": { "name": "mize", @@ -83495,19 +84353,19 @@ "name": "mizer", "version": "2.5.1", "sha256": "0s6vjvik0qcnrsb7f976cx623xg9jspkiskpzly2w9wbs6bbmnbg", - "depends": ["assertthat", "deSolve", "dplyr", "ggplot2", "ggrepel", "lifecycle", "lubridate", "plotly", "plyr", "progress", "Rcpp", "reshape2", "rlang"] + "depends": ["Rcpp", "assertthat", "deSolve", "dplyr", "ggplot2", "ggrepel", "lifecycle", "lubridate", "plotly", "plyr", "progress", "reshape2", "rlang"] }, "mkde": { "name": "mkde", - "version": "0.2", - "sha256": "0ihf3ahlppriba9j29zs7gfjxl49nsrrinnjzcxgca1yc5fikqcf", - "depends": ["raster", "Rcpp", "sp"] + "version": "0.3", + "sha256": "1g6g8zh0inza6lak4l6az2czqz22c8sf1pbcakibbhc5f1h2b8g9", + "depends": ["Rcpp", "sf", "stars", "terra"] }, "mkin": { "name": "mkin", "version": "1.2.6", "sha256": "1k90z1kqk57rib0f7rm23qmcvk942b0rggbjfyc7jzrba3v65qpb", - "depends": ["deSolve", "inline", "lmtest", "nlme", "numDeriv", "pkgbuild", "R6", "rlang", "saemix", "vctrs"] + "depends": ["R6", "deSolve", "inline", "lmtest", "nlme", "numDeriv", "pkgbuild", "rlang", "saemix", "vctrs"] }, "mknapsack": { "name": "mknapsack", @@ -83525,7 +84383,7 @@ "name": "mlVAR", "version": "0.5.2", "sha256": "0xvkhbjkzrvg9x5rd1yn9kzk27f4khwil1837l83jyd33hlyfsj3", - "depends": ["abind", "arm", "clusterGeneration", "corpcor", "dplyr", "graphicalVAR", "lme4", "MplusAutomation", "mvtnorm", "plyr", "qgraph", "rlang"] + "depends": ["MplusAutomation", "abind", "arm", "clusterGeneration", "corpcor", "dplyr", "graphicalVAR", "lme4", "mvtnorm", "plyr", "qgraph", "rlang"] }, "mlapi": { "name": "mlapi", @@ -83555,7 +84413,7 @@ "name": "mldr", "version": "0.4.3", "sha256": "07lbxpydz78fya11bl3l1ckhbps3nx43ddh3z09ygg70jjbdhxwq", - "depends": ["circlize", "shiny", "XML"] + "depends": ["XML", "circlize", "shiny"] }, "mldr_datasets": { "name": "mldr.datasets", @@ -83579,7 +84437,7 @@ "name": "mlearning", "version": "1.2.1", "sha256": "0fh28i36smpybhzd2kni435m7wf20i3yib6h7jy173r1v5adzkba", - "depends": ["class", "e1071", "ipred", "MASS", "nnet", "randomForest", "rpart"] + "depends": ["MASS", "class", "e1071", "ipred", "nnet", "randomForest", "rpart"] }, "mlegp": { "name": "mlegp", @@ -83597,13 +84455,13 @@ "name": "mlergm", "version": "0.8", "sha256": "0bpdljmbn4lfm263jcsp0hrknixn49m7hqsx0jjk3pfwhgjlajh8", - "depends": ["cowplot", "ergm", "GGally", "ggplot2", "lpSolve", "Matrix", "network", "plyr", "reshape2", "sna", "stringr"] + "depends": ["GGally", "Matrix", "cowplot", "ergm", "ggplot2", "lpSolve", "network", "plyr", "reshape2", "sna", "stringr"] }, "mlexperiments": { "name": "mlexperiments", - "version": "0.0.3", - "sha256": "0xkrppicb8h9ccnk25bl957ip6di19vk6fnc25r8q4ckpsyw2kz1", - "depends": ["data_table", "kdry", "progress", "R6", "splitTools"] + "version": "0.0.4", + "sha256": "1l2zrlar8wv4hi1w76kcbrhx8fbnbh03wq0jj5y0sbmy9x3aza76", + "depends": ["R6", "data_table", "kdry", "progress", "splitTools"] }, "mlf": { "name": "mlf", @@ -83615,12 +84473,12 @@ "name": "mlfit", "version": "0.5.3", "sha256": "0nyk5vmy2gkpz022djacy80gibskv96z0rsmjz2rw14zhc5kizsh", - "depends": ["BB", "dplyr", "forcats", "hms", "kimisc", "lifecycle", "Matrix", "plyr", "rlang", "tibble", "wrswoR"] + "depends": ["BB", "Matrix", "dplyr", "forcats", "hms", "kimisc", "lifecycle", "plyr", "rlang", "tibble", "wrswoR"] }, "mlflow": { "name": "mlflow", - "version": "2.13.1", - "sha256": "0jzqqdwychrandbcsih3g1gcpj0hg7lw53c6c762akll14g7yd5k", + "version": "2.14.1", + "sha256": "17rdg8admwih6dhmci089l8kwidbbjni98fl2al5480abhm63n74", "depends": ["base64enc", "forge", "fs", "git2r", "glue", "httpuv", "httr", "ini", "jsonlite", "openssl", "processx", "purrr", "rlang", "swagger", "tibble", "withr", "yaml", "zeallot"] }, "mlim": { @@ -83631,9 +84489,9 @@ }, "mllrnrs": { "name": "mllrnrs", - "version": "0.0.3", - "sha256": "08xrinkbl4bws7hbid6907b618mqays4zimkwdni9s2amah3ja4b", - "depends": ["data_table", "kdry", "mlexperiments", "R6"] + "version": "0.0.4", + "sha256": "0yrsab0m3p8fjxhbvb58k7lz3l2vvnf339gfb1wfc68wjmpczk5z", + "depends": ["R6", "data_table", "kdry", "mlexperiments"] }, "mlmRev": { "name": "mlmRev", @@ -83651,19 +84509,19 @@ "name": "mlmhelpr", "version": "0.1.1", "sha256": "16p94w6lh6k5dlfmi1kfdnm7q05c0d30gf08qcm9z9mm9yyilp0d", - "depends": ["lme4", "mathjaxr", "Rdpack"] + "depends": ["Rdpack", "lme4", "mathjaxr"] }, "mlmi": { "name": "mlmi", "version": "1.1.2", "sha256": "1nkg7h0r716yv9y6xnx8qcpvrqr6cxlhqrcyiihkwgwbmkgkp5sz", - "depends": ["cat", "gsl", "MASS", "Matrix", "mix", "nlme", "norm"] + "depends": ["MASS", "Matrix", "cat", "gsl", "mix", "nlme", "norm"] }, "mlmm_gwas": { "name": "mlmm.gwas", "version": "1.0.6", "sha256": "14xp8k7sww1skyw5l2006gpaw2c6yrri5nmfx4yav4vqdlhcj2k1", - "depends": ["coxme", "Matrix", "multcomp", "multcompView", "sommer"] + "depends": ["Matrix", "coxme", "multcomp", "multcompView", "sommer"] }, "mlmpower": { "name": "mlmpower", @@ -83679,21 +84537,21 @@ }, "mlmts": { "name": "mlmts", - "version": "1.1.1", - "sha256": "10xy4qzdik1rjs11ql798ig7y5cm3hjc61n5dhxfzpi1w0wk3smi", - "depends": ["AID", "caret", "ClusterR", "complexplus", "DescTools", "dtw", "e1071", "fda_usc", "forecast", "freqdom", "geigen", "ggplot2", "igraph", "MASS", "Matrix", "MTS", "multiwave", "pracma", "pspline", "psych", "quantspec", "randomForest", "ranger", "Rdpack", "Rfast", "TSA", "TSclust", "TSdist", "tseries", "tseriesChaos", "tsfeatures", "waveslim"] + "version": "1.1.2", + "sha256": "0268zypg99yhizh5ashdwivckaqzfw60fb01f2lryz8c9hpa21mr", + "depends": ["AID", "ClusterR", "DescTools", "MASS", "MTS", "Matrix", "Rdpack", "Rfast", "TSA", "TSclust", "TSdist", "caret", "complexplus", "dtw", "e1071", "fda_usc", "forecast", "freqdom", "geigen", "ggplot2", "igraph", "multiwave", "pracma", "pspline", "psych", "quantspec", "randomForest", "ranger", "tseries", "tseriesChaos", "tsfeatures", "waveslim"] }, "mlogit": { "name": "mlogit", "version": "1.1-1", "sha256": "0hyi6gi03n895iydrfr1ba2ifbsd6lyjyhkq62d95ghhniysjgkg", - "depends": ["dfidx", "Formula", "lmtest", "MASS", "Rdpack", "statmod", "zoo"] + "depends": ["Formula", "MASS", "Rdpack", "dfidx", "lmtest", "statmod", "zoo"] }, "mlogitBMA": { "name": "mlogitBMA", "version": "0.1-7", "sha256": "0q8c5897z8f519nf6p55ksc610a9dbpnah2rr4srij4gs9a4clx1", - "depends": ["abind", "BMA", "maxLik"] + "depends": ["BMA", "abind", "maxLik"] }, "mlpack": { "name": "mlpack", @@ -83705,25 +84563,25 @@ "name": "mlpwr", "version": "1.1.0", "sha256": "18w0vklxy61v0r33xi57j3s76iwsb2cs2cjhg1gjyxzl07byj89j", - "depends": ["DiceKriging", "digest", "ggplot2", "randtoolbox", "rgenoud", "rlist", "WeightSVM"] + "depends": ["DiceKriging", "WeightSVM", "digest", "ggplot2", "randtoolbox", "rgenoud", "rlist"] }, "mlquantify": { "name": "mlquantify", "version": "0.2.0", "sha256": "1fpwvix0f4bmqb1y1b6wryndqp6j24dwsspbfx1zrnhzwj1v4i9i", - "depends": ["caret", "FNN", "randomForest"] + "depends": ["FNN", "caret", "randomForest"] }, "mlr": { "name": "mlr", "version": "2.19.2", "sha256": "1icpa3xa0f7l40i52l3pl43m98j69r75qnqf1yp7wyh6y54p1rl5", - "depends": ["backports", "BBmisc", "checkmate", "data_table", "ggplot2", "parallelMap", "ParamHelpers", "stringi", "survival", "XML"] + "depends": ["BBmisc", "ParamHelpers", "XML", "backports", "checkmate", "data_table", "ggplot2", "parallelMap", "stringi", "survival"] }, "mlr3": { "name": "mlr3", - "version": "0.19.0", - "sha256": "0dgik4lfrw5m2sqxp33kzkdp7ihlcm27y5p5g5b9wah7h7ramiqs", - "depends": ["backports", "checkmate", "data_table", "evaluate", "future", "future_apply", "lgr", "mlbench", "mlr3measures", "mlr3misc", "palmerpenguins", "paradox", "parallelly", "R6", "RhpcBLASctl", "uuid"] + "version": "0.20.2", + "sha256": "0k3qyc2jyffdpnykn5ays5slgxzij803186xgwpjg38l9r13w9r1", + "depends": ["R6", "backports", "checkmate", "data_table", "evaluate", "future", "future_apply", "lgr", "mlbench", "mlr3measures", "mlr3misc", "palmerpenguins", "paradox", "parallelly", "uuid"] }, "mlr3batchmark": { "name": "mlr3batchmark", @@ -83735,13 +84593,13 @@ "name": "mlr3benchmark", "version": "0.1.6", "sha256": "1bhn0lm0k9dm9mbji6cwgqkwsa1qg928fbjs8chra9s3d3bzcb0x", - "depends": ["checkmate", "data_table", "ggplot2", "mlr3misc", "R6"] + "depends": ["R6", "checkmate", "data_table", "ggplot2", "mlr3misc"] }, "mlr3cluster": { "name": "mlr3cluster", "version": "0.1.9", "sha256": "09fsw2b43f9m7clv1qwylimyz622snhn9ykq3xwbiric7zr4ca91", - "depends": ["backports", "checkmate", "clue", "cluster", "data_table", "fpc", "mlr3", "mlr3misc", "paradox", "R6"] + "depends": ["R6", "backports", "checkmate", "clue", "cluster", "data_table", "fpc", "mlr3", "mlr3misc", "paradox"] }, "mlr3data": { "name": "mlr3data", @@ -83753,97 +84611,97 @@ "name": "mlr3db", "version": "0.5.2", "sha256": "1cq22h9yj27ighh4clyak1xwx2wb5v4803hd7lrhnlgzs85dmhj2", - "depends": ["backports", "checkmate", "data_table", "mlr3", "mlr3misc", "R6"] + "depends": ["R6", "backports", "checkmate", "data_table", "mlr3", "mlr3misc"] }, "mlr3fairness": { "name": "mlr3fairness", "version": "0.3.2", "sha256": "0rm6l50prwjjy55p14zs9mkdrczbyl7f63fqsmh7r5xjahcsnfi7", - "depends": ["checkmate", "data_table", "ggplot2", "mlr3", "mlr3learners", "mlr3measures", "mlr3misc", "mlr3pipelines", "paradox", "R6", "rlang"] + "depends": ["R6", "checkmate", "data_table", "ggplot2", "mlr3", "mlr3learners", "mlr3measures", "mlr3misc", "mlr3pipelines", "paradox", "rlang"] }, "mlr3fda": { "name": "mlr3fda", - "version": "0.1.2", - "sha256": "1r1dqhh9s09vz3fsxwss7af7wb4nmm7lynh9wl67mjs52yf5d4k2", - "depends": ["checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "mlr3pipelines", "paradox", "R6", "tf"] + "version": "0.2.0", + "sha256": "0y086z58zbazcxcdqk82rvfs1yifah6y4ps3vd679n09z08wg3mm", + "depends": ["R6", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "mlr3pipelines", "paradox", "tf"] }, "mlr3filters": { "name": "mlr3filters", "version": "0.8.0", "sha256": "16z359bc2li7f35xk4g08np3r2a3127avv0ak6bn9bywcs13z6bl", - "depends": ["backports", "checkmate", "data_table", "mlr3", "mlr3misc", "paradox", "R6"] + "depends": ["R6", "backports", "checkmate", "data_table", "mlr3", "mlr3misc", "paradox"] }, "mlr3fselect": { "name": "mlr3fselect", - "version": "0.12.0", - "sha256": "1f18y4ahnjzlwk9pfs87i80kb6z84hgyc5cdlj3mafawq790hg1h", - "depends": ["bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "paradox", "R6"] + "version": "1.0.0", + "sha256": "0bw5gxcxydvh14j6zy9q1k32b84v76lm6ksa4dh1l6pck14a76pj", + "depends": ["R6", "bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "paradox", "stabm"] }, "mlr3hyperband": { "name": "mlr3hyperband", - "version": "0.5.0", - "sha256": "1x6vfhadxlb4c9q61d5qv957mkyfwdwchzbg3flfd0j28b4bck1p", - "depends": ["bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "mlr3tuning", "paradox", "R6"] + "version": "0.6.0", + "sha256": "1sr9bccy1zmbj83i6nlwkfmi98b40bl1l9q4lzl8n0knnavnzcj7", + "depends": ["R6", "bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "mlr3tuning", "paradox"] }, "mlr3learners": { "name": "mlr3learners", - "version": "0.6.0", - "sha256": "06gz6h19cnb62js1b35nddy453dyj64mr788p8ww56kgfk6yzxr8", - "depends": ["checkmate", "data_table", "mlr3", "mlr3misc", "paradox", "R6"] + "version": "0.7.0", + "sha256": "0skfxmmqxfxxm0m9r46pvixnlpqfjqb3hmg2ggvgjnk47klha8v2", + "depends": ["R6", "checkmate", "data_table", "mlr3", "mlr3misc", "paradox"] }, "mlr3mbo": { "name": "mlr3mbo", - "version": "0.2.2", - "sha256": "0jdj5dx6jb7n0g950h0j8jhafdj5mcalv5vxfiyf07myr6mjipri", - "depends": ["bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "mlr3tuning", "paradox", "R6", "spacefillr"] + "version": "0.2.4", + "sha256": "1i97mqsxgdipl2gklp2h7d7s3jm977jzm6arxn6hvshw6a2ikzgm", + "depends": ["R6", "bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "mlr3tuning", "paradox", "spacefillr"] }, "mlr3measures": { "name": "mlr3measures", - "version": "0.5.0", - "sha256": "0k0i1xx63lds1870p2ljy1dlp2i376gdd0sq9s4xiqljqjb8va57", - "depends": ["checkmate", "PRROC"] + "version": "0.6.0", + "sha256": "0vhqcfn3fijj2lwjrly2lyb9bs5msqvlwdv1asfkr9shkw61piik", + "depends": ["PRROC", "checkmate"] }, "mlr3misc": { "name": "mlr3misc", - "version": "0.15.0", - "sha256": "1l40l0sx1dgs2rdblx7pd9nk93flad6y1mvppzg7qf4cyn8gfc3x", - "depends": ["backports", "checkmate", "data_table", "digest", "R6"] + "version": "0.15.1", + "sha256": "1yakq3ir3i46h1a1vnqqdlp4qznnwwk7zmjv7v831jmah9fzf5m3", + "depends": ["R6", "backports", "checkmate", "data_table", "digest"] }, "mlr3oml": { "name": "mlr3oml", "version": "0.10.0", "sha256": "0qlgqq22zy5kdgp6l6fg3yx8ywxpy4yaa2567j9z1pg5ij9yd49h", - "depends": ["backports", "bit64", "checkmate", "curl", "data_table", "jsonlite", "lgr", "mlr3", "mlr3misc", "paradox", "R6", "stringi", "uuid", "withr"] + "depends": ["R6", "backports", "bit64", "checkmate", "curl", "data_table", "jsonlite", "lgr", "mlr3", "mlr3misc", "paradox", "stringi", "uuid", "withr"] }, "mlr3pipelines": { "name": "mlr3pipelines", - "version": "0.5.2", - "sha256": "1glp4z5wnvcsil37gzvbvazn73088vilks9c5limnwhz8f454147", - "depends": ["backports", "checkmate", "data_table", "digest", "lgr", "mlr3", "mlr3misc", "paradox", "R6", "withr"] + "version": "0.6.0", + "sha256": "09wivgnj3jj39ngrxjip6ss0138fvjsmn4dmi5v0a78ppvsr96sp", + "depends": ["R6", "backports", "checkmate", "data_table", "digest", "lgr", "mlr3", "mlr3misc", "paradox", "withr"] }, "mlr3resampling": { "name": "mlr3resampling", - "version": "2024.4.14", - "sha256": "0fgn46vh8m9i2vb3ppkghl54a4rrp2mw8fm54l2kzj53y6hsjbvd", - "depends": ["checkmate", "data_table", "mlr3", "mlr3misc", "paradox", "R6"] + "version": "2024.7.7", + "sha256": "114vcxrmkr37yzlc14454phgl7mr49j482pcwa6c700k6d5l00ja", + "depends": ["R6", "checkmate", "data_table", "mlr3", "mlr3misc", "paradox"] }, "mlr3shiny": { "name": "mlr3shiny", "version": "0.3.0", "sha256": "0rv5ybg6l1n7j6gq8wmvl1gd1mdmqd52vl91hkpv9k1l1w8m8mph", - "depends": ["data_table", "dplyr", "DT", "Metrics", "mlr3", "mlr3learners", "mlr3measures", "mlr3pipelines", "patchwork", "plyr", "purrr", "shiny", "shinyalert", "shinydashboard", "shinyjs", "shinyWidgets", "stringr"] + "depends": ["DT", "Metrics", "data_table", "dplyr", "mlr3", "mlr3learners", "mlr3measures", "mlr3pipelines", "patchwork", "plyr", "purrr", "shiny", "shinyWidgets", "shinyalert", "shinydashboard", "shinyjs", "stringr"] }, "mlr3spatial": { "name": "mlr3spatial", "version": "0.5.0", "sha256": "105wscgkrlgckrmisr1b5xf8wlj9w2w7ir8w1280isyg2zp1gva8", - "depends": ["checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "R6", "sf", "terra"] + "depends": ["R6", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "sf", "terra"] }, "mlr3spatiotempcv": { "name": "mlr3spatiotempcv", "version": "2.3.1", "sha256": "04n5bzppkj9fmdhd54qk8738id0sfd3ij7p31l3hxmjbak5inh83", - "depends": ["checkmate", "data_table", "ggplot2", "mlr3", "mlr3misc", "paradox", "R6"] + "depends": ["R6", "checkmate", "data_table", "ggplot2", "mlr3", "mlr3misc", "paradox"] }, "mlr3summary": { "name": "mlr3summary", @@ -83851,59 +84709,65 @@ "sha256": "16r9sjjjy3f3aqjw1npibqk0pwhdajh6r3rkrypjfl80mhk9fpi4", "depends": ["backports", "checkmate", "cli", "data_table", "future_apply", "mlr3", "mlr3misc"] }, + "mlr3torch": { + "name": "mlr3torch", + "version": "0.1.0", + "sha256": "100fwy1qg14z4wxv8gvq3aib4a59r2hviij9mkdd3vamkbjbf827", + "depends": ["R6", "backports", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "mlr3pipelines", "paradox", "torch", "withr"] + }, "mlr3tuning": { "name": "mlr3tuning", - "version": "0.20.0", - "sha256": "1y1cqfqdx9v0lfb4619y2hw6clhhjzi7hjwrpwzdpd7ymcx3dgi3", - "depends": ["bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "paradox", "R6"] + "version": "1.0.0", + "sha256": "0lmczwydnd2fbvb43vqxvy58clygipwpqrnydhc8hlmnjy9vbzc6", + "depends": ["R6", "bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "paradox"] }, "mlr3tuningspaces": { "name": "mlr3tuningspaces", - "version": "0.5.0", - "sha256": "1snrd7xq388mvqh0ydaxvx8k9iwp40g06c3irp0m718jw3wsz5vm", - "depends": ["checkmate", "data_table", "mlr3", "mlr3misc", "mlr3tuning", "paradox", "R6"] + "version": "0.5.1", + "sha256": "0zcmhzrr9b3blg49dx3zmxnm5qh87k0rlka0vk2jp59ifd2yggrr", + "depends": ["R6", "checkmate", "data_table", "mlr3", "mlr3misc", "mlr3tuning", "paradox"] }, "mlr3verse": { "name": "mlr3verse", - "version": "0.2.8", - "sha256": "0ld4vch1qdq3gh8vhj38s2wz7acn5z7f8hxmnwnrq22g44gckd8s", + "version": "0.3.0", + "sha256": "1azkpmkki8c02vpz98ixsx17civk86dq7c8wwnvm9jlg3spr8hhd", "depends": ["bbotk", "data_table", "mlr3", "mlr3cluster", "mlr3data", "mlr3filters", "mlr3fselect", "mlr3hyperband", "mlr3learners", "mlr3mbo", "mlr3misc", "mlr3pipelines", "mlr3tuning", "mlr3tuningspaces", "mlr3viz", "paradox"] }, "mlr3viz": { "name": "mlr3viz", - "version": "0.8.0", - "sha256": "1m2f54yqhk1bd4c30vd1z509yblz6y4i8qkwhg73aa1sflnsycvf", + "version": "0.9.0", + "sha256": "1dm0xkrmd4c9hs22rxpxvvd4xxki4nxh2x7s06s2d7n3dhr4l3xh", "depends": ["checkmate", "data_table", "ggplot2", "mlr3misc", "scales", "viridis"] }, "mlrCPO": { "name": "mlrCPO", "version": "0.3.7-7", "sha256": "0nia2f8j5vgiradlcqi618mlv7146ml2pvbzh4p89p1pk75p6v0l", - "depends": ["backports", "BBmisc", "checkmate", "mlr", "ParamHelpers", "stringi"] + "depends": ["BBmisc", "ParamHelpers", "backports", "checkmate", "mlr", "stringi"] }, "mlrMBO": { "name": "mlrMBO", "version": "1.1.5.1", "sha256": "16fwj7m28g4km7yalqppxmh3lw2jln0z072l6awia38qkdg6xwhc", - "depends": ["backports", "BBmisc", "checkmate", "data_table", "lhs", "mlr", "parallelMap", "ParamHelpers", "smoof"] + "depends": ["BBmisc", "ParamHelpers", "backports", "checkmate", "data_table", "lhs", "mlr", "parallelMap", "smoof"] }, "mlrintermbo": { "name": "mlrintermbo", "version": "0.5.1-1", "sha256": "0hghnpsh6jm3vghn03v483cmqin2wxsvcahhzjg6x0wdszhmskhv", - "depends": ["backports", "bbotk", "callr", "checkmate", "data_table", "lhs", "mlr3misc", "mlr3tuning", "paradox", "R6"] + "depends": ["R6", "backports", "bbotk", "callr", "checkmate", "data_table", "lhs", "mlr3misc", "mlr3tuning", "paradox"] }, "mlrpro": { "name": "mlrpro", "version": "0.1.2", "sha256": "1j8w8ji1n6cahcbyi1q4zq8gmhpcl15pb97f7bl1km29f4x4f272", - "depends": ["car", "dplyr", "MASS"] + "depends": ["MASS", "car", "dplyr"] }, "mlrv": { "name": "mlrv", - "version": "0.1.1", - "sha256": "1r6q8wakvyz0d1fjc0xpl66yxj0c9jr721yx3h3986x6gi6s0k81", - "depends": ["doParallel", "foreach", "magrittr", "mathjaxr", "numDeriv", "Rcpp", "RcppArmadillo", "xtable"] + "version": "0.1.2", + "sha256": "1q3xjbdl729q5l2iljyj4m7k04lg1i0vg0vm8s3qlkpjidazxd5r", + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "magrittr", "mathjaxr", "numDeriv", "xtable"] }, "mlsbm": { "name": "mlsbm", @@ -83925,15 +84789,15 @@ }, "mlsurvlrnrs": { "name": "mlsurvlrnrs", - "version": "0.0.3", - "sha256": "0x4spjcgbqz13fxnyabd1vypbdg6r94zmh7h5h65rhnb5j8fgsm3", - "depends": ["data_table", "kdry", "mlexperiments", "mllrnrs", "R6"] + "version": "0.0.4", + "sha256": "11yp41fvmr2ij3sqky5hjzblqsdwsywyn3r62cdld5b5fiv487hg", + "depends": ["R6", "data_table", "kdry", "mlexperiments", "mllrnrs"] }, "mlt": { "name": "mlt", "version": "1.5-1", "sha256": "1bhcw5b2mwvr9qsssxd9qd9qn5k0v8g925dqfm1ziycniaprm9g6", - "depends": ["alabama", "basefun", "BB", "coneproj", "Matrix", "nloptr", "numDeriv", "sandwich", "survival", "variables"] + "depends": ["BB", "Matrix", "alabama", "basefun", "coneproj", "nloptr", "numDeriv", "sandwich", "survival", "variables"] }, "mlt_docreg": { "name": "mlt.docreg", @@ -83951,7 +84815,13 @@ "name": "mltools", "version": "0.3.5", "sha256": "045v28w7vz1zjxim8vfc6ncvg2mavr1q332x0hzlqpfzrk7gz4vh", - "depends": ["data_table", "Matrix"] + "depends": ["Matrix", "data_table"] + }, + "mlts": { + "name": "mlts", + "version": "1.0.0", + "sha256": "017kl04f70iglrpzxc24kl4v65rf3lqi3fy0wdhnaffr0bf7qyri", + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cowplot", "dplyr", "ggplot2", "mvtnorm", "pdftools", "rlang", "rmarkdown", "rstan", "rstantools"] }, "mlxR": { "name": "mlxR", @@ -83993,13 +84863,13 @@ "name": "mmaqshiny", "version": "1.0.0", "sha256": "0v44hd7h9d8hdd2avwwwwc0a8rzm5ij3yhryxkrw7bwvr12zsp17", - "depends": ["Cairo", "caTools", "data_table", "dplyr", "DT", "ggplot2", "htmltools", "leaflet", "lubridate", "plotly", "shiny", "shinyjs", "stringr", "XML", "xts", "zoo"] + "depends": ["Cairo", "DT", "XML", "caTools", "data_table", "dplyr", "ggplot2", "htmltools", "leaflet", "lubridate", "plotly", "shiny", "shinyjs", "stringr", "xts", "zoo"] }, "mmb": { "name": "mmb", "version": "0.13.3", "sha256": "07nni04fb0gprma368axzz303db12hp22fz1a0xwh3bbh6n7zb9g", - "depends": ["doParallel", "foreach", "Rdpack"] + "depends": ["Rdpack", "doParallel", "foreach"] }, "mmc": { "name": "mmc", @@ -84017,7 +84887,7 @@ "name": "mmcif", "version": "0.1.1", "sha256": "14kp0n24nxcfnfq8drxfhsvd4apg4f7iwdamzw005rlhi5srmw3r", - "depends": ["alabama", "psqn", "Rcpp", "RcppArmadillo", "testthat"] + "depends": ["Rcpp", "RcppArmadillo", "alabama", "psqn", "testthat"] }, "mmcm": { "name": "mmcm", @@ -84047,19 +84917,19 @@ "name": "mmiCATs", "version": "0.1.1", "sha256": "1dnh77ac2m8sbv3ly1wny2nn86f13bs90f91gzzy83x2r4a3bvfj", - "depends": ["broom", "broom_mixed", "clusterSEs", "DT", "lmerTest", "MASS", "mmcards", "robust", "robustbase", "shiny", "shinythemes"] + "depends": ["DT", "MASS", "broom", "broom_mixed", "clusterSEs", "lmerTest", "mmcards", "robust", "robustbase", "shiny", "shinythemes"] }, "mmibain": { "name": "mmibain", "version": "0.2.0", "sha256": "1ii2lfsbmp0n85a3y76zp87fpj5nm5ndigjyl09sl0cl2g8q7ql7", - "depends": ["bain", "broom", "car", "DT", "e1071", "ggplot2", "igraph", "lavaan", "mmcards", "psych", "shiny", "shinythemes"] + "depends": ["DT", "bain", "broom", "car", "e1071", "ggplot2", "igraph", "lavaan", "mmcards", "psych", "shiny", "shinythemes"] }, "mmirestriktor": { "name": "mmirestriktor", - "version": "0.2.1", - "sha256": "1qgj3rrri87dj3h3v6r7f5kjyy8b85qn0s7i62qll0lf8fnj334d", - "depends": ["DT", "MASS", "mmcards", "restriktor", "shiny", "shinythemes"] + "version": "0.3.1", + "sha256": "008x9bypp34aq59v6dqns5qjnh94lrng6yjiiaybi5acdyrvipbr", + "depends": ["DT", "MASS", "RPostgres", "mmcards", "pool", "restriktor", "shiny", "shinythemes"] }, "mmmgee": { "name": "mmmgee", @@ -84083,7 +84953,7 @@ "name": "mmpca", "version": "2.0.3", "sha256": "1kzjwl0sn8cdgw3jw95lg90vgh47iw293ffn7c0fb9kgxisd6dma", - "depends": ["digest", "Rcpp", "RcppEigen", "RcppGSL"] + "depends": ["Rcpp", "RcppEigen", "RcppGSL", "digest"] }, "mmpp": { "name": "mmpp", @@ -84099,9 +84969,9 @@ }, "mmrm": { "name": "mmrm", - "version": "0.3.11", - "sha256": "1w7kpjsa59zri2jqaxlr4b7lg57xrnnwlak9wb6midlb3n8pw5f1", - "depends": ["checkmate", "generics", "lifecycle", "Matrix", "nlme", "Rcpp", "RcppEigen", "Rdpack", "stringr", "testthat", "tibble", "TMB"] + "version": "0.3.12", + "sha256": "0bgvh7bjijsfv6rb8syhmiqd600pdc3kg9z1dx2iskghxjwiww93", + "depends": ["Matrix", "Rcpp", "RcppEigen", "Rdpack", "TMB", "checkmate", "generics", "lifecycle", "nlme", "stringr", "testthat", "tibble"] }, "mmsample": { "name": "mmsample", @@ -84125,7 +84995,7 @@ "name": "mnda", "version": "1.0.9", "sha256": "1lmkxdfym1jfq05vpjky1b6nz1xwzsdh9mz3017v23qyg7dmbzyi", - "depends": ["aggregation", "assertthat", "ggplot2", "ggraph", "igraph", "keras", "magrittr", "MASS", "Matrix", "reticulate", "tensorflow", "usethis"] + "depends": ["MASS", "Matrix", "aggregation", "assertthat", "ggplot2", "ggraph", "igraph", "keras", "magrittr", "reticulate", "tensorflow", "usethis"] }, "mnet": { "name": "mnet", @@ -84137,7 +85007,7 @@ "name": "mnis", "version": "0.3.1", "sha256": "03ss2sp4gjjxlfip95p2vcc0nz8q7khm3iiyh1362n2xb6yp78k0", - "depends": ["dplyr", "httr", "janitor", "jsonlite", "purrr", "Rcpp", "stringi", "tibble"] + "depends": ["Rcpp", "dplyr", "httr", "janitor", "jsonlite", "purrr", "stringi", "tibble"] }, "mniw": { "name": "mniw", @@ -84161,7 +85031,7 @@ "name": "mnorm", "version": "1.2.2", "sha256": "1ivd40cmcp66h4yccbll90fgqmq03pgy3hgklz8wxj0j479r21z0", - "depends": ["hpa", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "hpa"] }, "mnormt": { "name": "mnormt", @@ -84185,7 +85055,7 @@ "name": "mob", "version": "0.4.2", "sha256": "1mv0bsik3bdkmnggy2fv0482fqv2yck1ycw49wd45p2dyfzzwcsd", - "depends": ["gbm", "Rborist"] + "depends": ["Rborist", "gbm"] }, "mobilityIndexR": { "name": "mobilityIndexR", @@ -84195,9 +85065,9 @@ }, "mobr": { "name": "mobr", - "version": "2.0.2", - "sha256": "0dvsarxkjcjn3f40qkx5pdjpvq7hr6l5nvdz6adxlr1sdbadfcws", - "depends": ["dplyr", "egg", "geosphere", "ggplot2", "pbapply", "plotrix", "purrr", "rlang", "scales", "tibble", "tidyr", "vctrs"] + "version": "3.0.0", + "sha256": "02bxacq7m1ln4abd0kdzqndwj3384kfbfxcn13qqmix0i6q1i4y6", + "depends": ["dplyr", "egg", "geosphere", "ggplot2", "pbapply", "plotrix", "purrr", "rlang", "scales", "scam", "sf", "tibble", "tidyr", "vctrs"] }, "mobsim": { "name": "mobsim", @@ -84205,6 +85075,12 @@ "sha256": "0ny924lsj12fqfagjwd2pq8prk0xgm89ray5b07dw7yfdcisx90i", "depends": ["Rcpp", "sads", "vegan"] }, + "moc_gapbk": { + "name": "moc.gapbk", + "version": "0.1.1", + "sha256": "1d29aiks5qpn983b5yamsw8h0gh9hh4lgjdx0sgi6aj79sg0lfa8", + "depends": ["amap", "doMPI", "doParallel", "doSNOW", "foreach", "nsga2R"] + }, "mockery": { "name": "mockery", "version": "0.4.4", @@ -84275,7 +85151,7 @@ "name": "modeLLtest", "version": "1.0.4", "sha256": "0m9djx3d2k0y38h0wyscwvzj0pvlfjqz2ar7j1rb29mhm7y8np70", - "depends": ["coxrobust", "MASS", "quantreg", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "coxrobust", "quantreg", "survival"] }, "modeest": { "name": "modeest", @@ -84299,7 +85175,7 @@ "name": "modelDown", "version": "1.1", "sha256": "1l0aggkh0ykpqrp59bdz1cyl1ai397cw4hya80b7fm7s49imwczg", - "depends": ["archivist", "auditor", "breakDown", "DALEX", "devtools", "drifter", "DT", "ggplot2", "kableExtra", "psych", "svglite", "whisker"] + "depends": ["DALEX", "DT", "archivist", "auditor", "breakDown", "devtools", "drifter", "ggplot2", "kableExtra", "psych", "svglite", "whisker"] }, "modelObj": { "name": "modelObj", @@ -84339,9 +85215,9 @@ }, "modeldata": { "name": "modeldata", - "version": "1.3.0", - "sha256": "035gyxgs9byij9d5vpw35a96f7xlhfj3k6c140mql4yfplm5rk23", - "depends": ["dplyr", "MASS", "purrr", "rlang", "tibble"] + "version": "1.4.0", + "sha256": "15cfvvhf1c8zaanxdrrh934kz8250j0r5k6df0qkl5dz8cqv8sgb", + "depends": ["MASS", "dplyr", "purrr", "rlang", "tibble"] }, "modeldatatoo": { "name": "modeldatatoo", @@ -84365,7 +85241,7 @@ "name": "modelfactory", "version": "1.0.0", "sha256": "1bdcfcbd1lnx683npvwbxigqg3mbgnm2ji46nfywbay6disrc15h", - "depends": ["dplyr", "MASS", "tibble"] + "depends": ["MASS", "dplyr", "tibble"] }, "modelfree": { "name": "modelfree", @@ -84405,9 +85281,15 @@ }, "modeltime": { "name": "modeltime", - "version": "1.2.8", - "sha256": "1wvmz4wr972msfrld26ygahn1sky3p10x18975kbaksrw8qgz4ag", - "depends": ["cli", "dials", "doParallel", "dplyr", "forcats", "foreach", "forecast", "ggplot2", "glue", "gt", "hardhat", "janitor", "magrittr", "parallelly", "parsnip", "plotly", "prophet", "purrr", "reactable", "rlang", "scales", "StanHeaders", "stringr", "tibble", "tidymodels", "tidyr", "tidyverse", "timetk", "workflows", "xgboost", "yardstick"] + "version": "1.3.0", + "sha256": "035y6qcz4jkgf1k297ykyglp82303a69iswymx8c0qmcvw4x66nc", + "depends": ["StanHeaders", "cli", "dials", "doParallel", "dplyr", "forcats", "foreach", "forecast", "ggplot2", "glue", "gt", "hardhat", "janitor", "magrittr", "parallelly", "parsnip", "plotly", "prophet", "purrr", "reactable", "rlang", "scales", "stringr", "tibble", "tidymodels", "tidyr", "timetk", "workflows", "xgboost", "yardstick"] + }, + "modeltime_ensemble": { + "name": "modeltime.ensemble", + "version": "1.0.4", + "sha256": "1262p4lp4vr3d6s5x5cwrbib5vfr9apl4fvyhxzpvvc1vck5a94p", + "depends": ["cli", "doParallel", "dplyr", "foreach", "generics", "glmnet", "magrittr", "modeltime", "modeltime_resample", "purrr", "recipes", "rlang", "rsample", "stringr", "tibble", "tictoc", "tidyr", "timetk", "tune", "workflows", "yardstick"] }, "modeltime_resample": { "name": "modeltime.resample", @@ -84447,8 +85329,8 @@ }, "moderndive": { "name": "moderndive", - "version": "0.5.5", - "sha256": "0bgq6wsyyi6nsxqqh2k3zsmk64pfvb57z8pzk8ych3xih491hzlm", + "version": "0.6.1", + "sha256": "1gd4mb8i2bl5h9q0ahcpqjqw1ji120q9p305q9rfkfpv5nzwbwyr", "depends": ["broom", "dplyr", "formula_tools", "ggplot2", "glue", "infer", "janitor", "knitr", "magrittr", "rlang", "stringr", "tibble"] }, "modest": { @@ -84461,7 +85343,7 @@ "name": "modesto", "version": "0.1.4", "sha256": "12p5azbbng1hnvs5b86g85871dn5534iv7r6fw5v1iv1h1rcypcr", - "depends": ["markovchain", "Rcpp"] + "depends": ["Rcpp", "markovchain"] }, "modgetxl": { "name": "modgetxl", @@ -84481,6 +85363,12 @@ "sha256": "1m1c36vyzyl0v0gfy9fqlprvs3pvanj20dn56kxpniykdylscn3w", "depends": ["boot"] }, + "modisfast": { + "name": "modisfast", + "version": "0.9.1", + "sha256": "1h3r5iwqrjzvfavsmvr6i5x2gvl76g44d712gnir9jl8sdhk0ynr", + "depends": ["curl", "dplyr", "httr", "lubridate", "magrittr", "purrr", "rvest", "sf", "stringr", "terra", "xml2"] + }, "modmarg": { "name": "modmarg", "version": "0.9.6", @@ -84491,7 +85379,7 @@ "name": "modnets", "version": "0.9.0", "sha256": "01mh7sbgq3796h6ciih5xww8hm0xn8975jv0784yw15hxhzfchci", - "depends": ["abind", "corpcor", "ggplot2", "glinternet", "glmnet", "gridExtra", "gtools", "igraph", "interactionTest", "leaps", "lme4", "lmerTest", "Matrix", "mvtnorm", "pbapply", "plyr", "psych", "qgraph", "reshape2", "systemfit"] + "depends": ["Matrix", "abind", "corpcor", "ggplot2", "glinternet", "glmnet", "gridExtra", "gtools", "igraph", "interactionTest", "leaps", "lme4", "lmerTest", "mvtnorm", "pbapply", "plyr", "psych", "qgraph", "reshape2", "systemfit"] }, "modopt_matlab": { "name": "modopt.matlab", @@ -84501,9 +85389,9 @@ }, "modsem": { "name": "modsem", - "version": "0.1.4", - "sha256": "06abbk34blacwf7w38fxjh88l26v7wcpg8svmj76ll2pssybxv8r", - "depends": ["dplyr", "gaussquad", "ggplot2", "lavaan", "MplusAutomation", "mvnfast", "mvtnorm", "nlme", "purrr", "R6", "Rcpp", "RcppArmadillo", "rlang", "stringr"] + "version": "1.0.2", + "sha256": "1qab2lqj6p3lkfnyf72a2sk18lclnlisl3ky59998nylx3raanan", + "depends": ["MplusAutomation", "R6", "Rcpp", "RcppArmadillo", "dplyr", "fastGHQuad", "ggplot2", "lavaan", "mvnfast", "mvtnorm", "nlme", "purrr", "rlang", "stringr"] }, "moduleColor": { "name": "moduleColor", @@ -84533,25 +85421,25 @@ "name": "mojson", "version": "0.1", "sha256": "077c92jhizpvg5gdwq1zb0d74m743l5qylj6df8hhgyvahswnhnq", - "depends": ["compareDF", "iterators", "magrittr", "RJSONIO", "stringr", "tidyr"] + "depends": ["RJSONIO", "compareDF", "iterators", "magrittr", "stringr", "tidyr"] }, "mokken": { "name": "mokken", - "version": "3.1.1", - "sha256": "0jnc3gsa4qfl4f6pg42m3mqncz0dgmdlx5jwhr0ck4gy02rpjv59", - "depends": ["poLCA", "Rcpp"] + "version": "3.1.2", + "sha256": "0wfm4yg9pzl5ng3mlng7p9qzvql51sxbs4gv006xanif5pkrn9dd", + "depends": ["Rcpp", "poLCA"] }, "molaR": { "name": "molaR", "version": "5.3", "sha256": "01l68a4jsp0dlylnp9ij1db0q4510l38jlql787bi6ah07xwf8zq", - "depends": ["alphahull", "pracma", "rgl", "Rvcg"] + "depends": ["Rvcg", "alphahull", "pracma", "rgl"] }, "mombf": { "name": "mombf", "version": "3.5.4", "sha256": "0pyq8jlx36075b77p5kalq5fn0y8f3s7l8crn3gvpjmp9shqv22y", - "depends": ["dplyr", "glasso", "glmnet", "intervals", "Matrix", "mclust", "mgcv", "mvtnorm", "ncvreg", "pracma", "Rcpp", "RcppArmadillo", "sparseMatrixStats", "survival"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "dplyr", "glasso", "glmnet", "intervals", "mclust", "mgcv", "mvtnorm", "ncvreg", "pracma", "sparseMatrixStats", "survival"] }, "momentchi2": { "name": "momentchi2", @@ -84575,7 +85463,7 @@ "name": "momentuHMM", "version": "1.5.5", "sha256": "0isd18b0fdf75gk6lbm34hgrhwj1fnl7airpv56xffsdvhvj6xjq", - "depends": ["Brobdingnag", "CircStats", "crawl", "doParallel", "doRNG", "foreach", "MASS", "mvtnorm", "numDeriv", "raster", "Rcpp", "RcppArmadillo", "rlang", "sp"] + "depends": ["Brobdingnag", "CircStats", "MASS", "Rcpp", "RcppArmadillo", "crawl", "doParallel", "doRNG", "foreach", "mvtnorm", "numDeriv", "raster", "rlang", "sp"] }, "monaco": { "name": "monaco", @@ -84635,13 +85523,13 @@ "name": "monobin", "version": "0.2.4", "sha256": "1060c7g2dz4cnvlfp2dnrl5fblvifmcskrgykqbfswpyfna1lw4a", - "depends": ["dplyr", "Hmisc"] + "depends": ["Hmisc", "dplyr"] }, "monobinShiny": { "name": "monobinShiny", "version": "0.1.0", "sha256": "1ix376j39fby5571irf8i5bmz8i7nnvfzbvs5cv0k42dcgq93m0g", - "depends": ["dplyr", "DT", "monobin", "shiny", "shinydashboard", "shinyjs"] + "depends": ["DT", "dplyr", "monobin", "shiny", "shinydashboard", "shinyjs"] }, "monochromeR": { "name": "monochromeR", @@ -84653,13 +85541,13 @@ "name": "monographaR", "version": "1.3.1", "sha256": "0sqhz3zpbk57s2sm56csqr198fclk9x8zq3bfamzardpax8r2cjr", - "depends": ["circular", "png", "raster", "rmarkdown", "rnaturalearth", "rpart", "sf", "shiny", "shinydashboard", "shinythemes", "shinyWidgets", "sp", "terra"] + "depends": ["circular", "png", "raster", "rmarkdown", "rnaturalearth", "rpart", "sf", "shiny", "shinyWidgets", "shinydashboard", "shinythemes", "sp", "terra"] }, "monomvn": { "name": "monomvn", "version": "1.9-20", "sha256": "0if2b13yak9x0sfcwghhih901hk8n762w59r53k0949vf5f336yd", - "depends": ["lars", "MASS", "mvtnorm", "pls", "quadprog"] + "depends": ["MASS", "lars", "mvtnorm", "pls", "quadprog"] }, "monoreg": { "name": "monoreg", @@ -84677,7 +85565,7 @@ "name": "monotonicity", "version": "1.3.1", "sha256": "0bb6sl8yykry25a86qfggi36ggr1xrxcqsnzp6rb6na228hbwa2z", - "depends": ["lmtest", "MASS", "sandwich"] + "depends": ["MASS", "lmtest", "sandwich"] }, "monreg": { "name": "monreg", @@ -84685,6 +85573,12 @@ "sha256": "1i0dxv6azb6x2i7yd9w0254b50qgiidccrn5jn6rqvb5y3dj2rn1", "depends": [] }, + "moocore": { + "name": "moocore", + "version": "0.1.0", + "sha256": "0xnix4izfl7hs8an1w8jvdsd6gcw61njqhzh2wy9mxkvl7kjw7jg", + "depends": ["Rdpack", "matrixStats"] + }, "moodef": { "name": "moodef", "version": "1.1.0", @@ -84695,13 +85589,13 @@ "name": "moodleR", "version": "1.0.1", "sha256": "0wbrnbs03i6xzyhq82d75yjryfqfl11k55sj9h0j9f7z46dq7glp", - "depends": ["anytime", "cli", "config", "DBI", "dplyr", "ggplot2", "ggwordcloud", "glue", "lifecycle", "rlang", "RMariaDB", "RPostgres", "RSQLite", "scales", "stringr", "tidytext", "usethis"] + "depends": ["DBI", "RMariaDB", "RPostgres", "RSQLite", "anytime", "cli", "config", "dplyr", "ggplot2", "ggwordcloud", "glue", "lifecycle", "rlang", "scales", "stringr", "tidytext", "usethis"] }, "moodlequizR": { "name": "moodlequizR", "version": "2.1.1", "sha256": "1bigckdga0jqn0qx5y2x0g74g1ln2hmsdyrjvfmp0cvmscr9w271", - "depends": ["base64", "mvtnorm", "NMcalc", "shiny"] + "depends": ["NMcalc", "base64", "mvtnorm", "shiny"] }, "moonBook": { "name": "moonBook", @@ -84719,7 +85613,7 @@ "name": "mop", "version": "0.1.2", "sha256": "1x17mnh2lrgkqr1nzhk5dxmwpv9812i3ryvlspqhbrfadj3s76l7", - "depends": ["doSNOW", "foreach", "Rcpp", "snow", "terra"] + "depends": ["Rcpp", "doSNOW", "foreach", "snow", "terra"] }, "mopac": { "name": "mopac", @@ -84727,11 +85621,17 @@ "sha256": "07ljy6rwicyrv20l7zyxq2lb7qqfpl5mpv834m2n5c4air7sy23m", "depends": [] }, + "moranajp": { + "name": "moranajp", + "version": "0.9.7", + "sha256": "1vzid1j09s7v20y8bpfrl7xcz8lf8f5dg5npw3iz2ibvp2w5vjl7", + "depends": ["dplyr", "ggplot2", "ggraph", "igraph", "purrr", "rlang", "rvest", "stringi", "stringr", "tibble", "tidyr"] + }, "moreparty": { "name": "moreparty", "version": "0.4", "sha256": "0zny9bffj8dfl6i76ylrcgrbfbawk6aksdfkn4vf57zg7qfv0yqh", - "depends": ["datamods", "DT", "foreach", "ggplot2", "iml", "MASS", "measures", "party", "partykit", "pdp", "phosphoricons", "plyr", "rclipboard", "rlang", "shiny", "shinyWidgets", "varImp", "vip"] + "depends": ["DT", "MASS", "datamods", "foreach", "ggplot2", "iml", "measures", "party", "partykit", "pdp", "phosphoricons", "plyr", "rclipboard", "rlang", "shiny", "shinyWidgets", "varImp", "vip"] }, "morepls": { "name": "morepls", @@ -84767,13 +85667,13 @@ "name": "morpheus", "version": "1.0-4", "sha256": "0y9immrs87yghp0j1h0vp1fhiah5wddfj6pj2hgcqch1imxprhy7", - "depends": ["jointDiag", "MASS", "pracma"] + "depends": ["MASS", "jointDiag", "pracma"] }, "morphomap": { "name": "morphomap", "version": "1.5", "sha256": "0kin6jvg3vlsbga0zr34nnq1zixicw7vsphiw45aifyfbnwiw0av", - "depends": ["Arothron", "colorRamps", "DescTools", "geometry", "lattice", "mgcv", "Morpho", "oce", "rgl", "Rvcg", "sp"] + "depends": ["Arothron", "DescTools", "Morpho", "Rvcg", "colorRamps", "geometry", "lattice", "mgcv", "oce", "rgl", "sp"] }, "morrowplots": { "name": "morrowplots", @@ -84781,12 +85681,6 @@ "sha256": "09kpsarbv32cylr0qp067m184lnj95p50ayi49w7sgwrs70xdanb", "depends": [] }, - "morse": { - "name": "morse", - "version": "3.3.2", - "sha256": "0534k96fhfdkfr3dh6q85fmsqqld7xv1zxvikwcb6z6by3nr9cpp", - "depends": ["coda", "deSolve", "dplyr", "epitools", "ggplot2", "gridExtra", "magrittr", "reshape2", "rjags", "tibble", "tidyr", "zoo"] - }, "mort": { "name": "mort", "version": "0.0.1", @@ -84797,25 +85691,25 @@ "name": "mortAAR", "version": "1.1.6", "sha256": "1n3s704k2lqpcbzk8rqa28jcqz37g2bdjkj6x1bygcbfdic2z0dc", - "depends": ["magrittr", "Rdpack", "reshape2", "rlang", "tibble"] + "depends": ["Rdpack", "magrittr", "reshape2", "rlang", "tibble"] }, "mosaic": { "name": "mosaic", "version": "1.9.1", "sha256": "0l7h3zg5izr5xxqy1sngz6fzbwdffzljnjmfbshzzbl4x80f5lwl", - "depends": ["dplyr", "ggformula", "ggplot2", "lattice", "MASS", "Matrix", "mosaicCore", "mosaicData", "purrr", "rlang", "tibble", "tidyr"] + "depends": ["MASS", "Matrix", "dplyr", "ggformula", "ggplot2", "lattice", "mosaicCore", "mosaicData", "purrr", "rlang", "tibble", "tidyr"] }, "mosaicCalc": { "name": "mosaicCalc", - "version": "0.6.1", - "sha256": "1538g36cfg3hlig8fcclri5cfqs94s8qxaqw4pa85c8s14k59dda", - "depends": ["cubature", "Deriv", "dplyr", "ggformula", "ggplot2", "glue", "MASS", "Matrix", "metR", "mosaic", "mosaicCore", "orthopolynom", "plotly", "rlang", "Ryacas", "sp", "tibble"] + "version": "0.6.4", + "sha256": "1fq3fjsj7jwai5hg36bi1d3plf98mywyn08yrcwrphnh4h42i71r", + "depends": ["Deriv", "MASS", "Matrix", "Ryacas", "calculus", "dplyr", "ggformula", "ggplot2", "glue", "metR", "mosaic", "mosaicCore", "orthopolynom", "rlang", "sp", "tibble"] }, "mosaicCore": { "name": "mosaicCore", "version": "0.9.4.0", "sha256": "0v3xhv6yfk1hc6a40jjgp6vvq102qa1l4n787pfywx6jhzbhamp2", - "depends": ["dplyr", "MASS", "rlang", "tidyr"] + "depends": ["MASS", "dplyr", "rlang", "tidyr"] }, "mosaicData": { "name": "mosaicData", @@ -84827,43 +85721,43 @@ "name": "mosaicModel", "version": "0.3.0", "sha256": "1gx4rzh0h922gyb50vz6q5vqqp5ry5hf2mq95948q2gcady91k5w", - "depends": ["caret", "dplyr", "ggformula", "ggplot2", "knitr", "lazyeval", "MASS", "mosaicCore", "testthat", "tibble", "tidyr", "tidyverse"] + "depends": ["MASS", "caret", "dplyr", "ggformula", "ggplot2", "knitr", "lazyeval", "mosaicCore", "testthat", "tibble", "tidyr", "tidyverse"] }, "mosqcontrol": { "name": "mosqcontrol", "version": "0.1.0", "sha256": "199rkfisagr4kfx358f8yrbls00fng0kq8siyrbfwwf8qrba9fla", - "depends": ["assertthat", "magrittr", "NlcOptim", "nloptr", "pracma", "sfsmisc"] + "depends": ["NlcOptim", "assertthat", "magrittr", "nloptr", "pracma", "sfsmisc"] }, "mosum": { "name": "mosum", "version": "1.2.7", "sha256": "1zixjf3s381d44s63qzz4hpx4cd2d3rgzvzgg75gpzfkvxnf5f8c", - "depends": ["plot3D", "RColorBrewer", "Rcpp"] + "depends": ["RColorBrewer", "Rcpp", "plot3D"] }, "motif": { "name": "motif", "version": "0.6.4", "sha256": "0khvplcnw868cspzvn3mimvsvygxaw7ay6py2da9pjzmcbij9g36", - "depends": ["comat", "philentropy", "Rcpp", "RcppArmadillo", "sf", "stars", "tibble"] + "depends": ["Rcpp", "RcppArmadillo", "comat", "philentropy", "sf", "stars", "tibble"] }, "motifcluster": { "name": "motifcluster", "version": "0.2.3", "sha256": "1ynfjz9di1f1cm6bmx81a8mzkjkhclk21mx8b6css953dih06ngb", - "depends": ["igraph", "Matrix", "RSpectra"] + "depends": ["Matrix", "RSpectra", "igraph"] }, "motifr": { "name": "motifr", "version": "1.0.0", "sha256": "01synariq39mzhx12jbcpwn982piakakl97sgs33xa8xrbwzcxgm", - "depends": ["dplyr", "ggplot2", "ggraph", "igraph", "intergraph", "network", "purrr", "RColorBrewer", "reshape2", "reticulate", "rlang", "scales", "tibble", "tidygraph"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "ggraph", "igraph", "intergraph", "network", "purrr", "reshape2", "reticulate", "rlang", "scales", "tibble", "tidygraph"] }, "motmot": { "name": "motmot", "version": "2.1.3", "sha256": "09qsyc4ifdl316kjqqkarmflpjcd0ivkhx5fzi3502anj6dxpjnq", - "depends": ["ape", "caper", "coda", "ks", "mvtnorm", "Rcpp"] + "depends": ["Rcpp", "ape", "caper", "coda", "ks", "mvtnorm"] }, "motoRneuron": { "name": "motoRneuron", @@ -84893,7 +85787,7 @@ "name": "mousetrap", "version": "3.2.3", "sha256": "05dxbzwghm8gj6jwwy9wyz0xwyrj614x7db00zlb3gwz1kkyd9sz", - "depends": ["cstab", "diptest", "dplyr", "fastcluster", "fields", "ggplot2", "lifecycle", "magrittr", "pracma", "psych", "RColorBrewer", "Rcpp", "rlang", "scales", "tidyr"] + "depends": ["RColorBrewer", "Rcpp", "cstab", "diptest", "dplyr", "fastcluster", "fields", "ggplot2", "lifecycle", "magrittr", "pracma", "psych", "rlang", "scales", "tidyr"] }, "movMF": { "name": "movMF", @@ -84905,7 +85799,7 @@ "name": "move", "version": "4.2.4", "sha256": "1i6qyx4i8vb2g7i8c2hwjia81m2wd3pyvp6hf6f64j4lcrnafqz7", - "depends": ["geosphere", "httr", "memoise", "raster", "Rcpp", "sp", "terra", "xml2"] + "depends": ["Rcpp", "geosphere", "httr", "memoise", "raster", "sp", "terra", "xml2"] }, "move2": { "name": "move2", @@ -84917,19 +85811,19 @@ "name": "moveHMM", "version": "1.9", "sha256": "0dq6p13rfv0dryl323zqc0ix12vzn0qaykb9qnxiipwvj0j3qmz2", - "depends": ["boot", "CircStats", "geosphere", "ggmap", "ggplot2", "MASS", "numDeriv", "Rcpp", "RcppArmadillo", "sp"] + "depends": ["CircStats", "MASS", "Rcpp", "RcppArmadillo", "boot", "geosphere", "ggmap", "ggplot2", "numDeriv", "sp"] }, "moveWindSpeed": { "name": "moveWindSpeed", "version": "0.2.4", "sha256": "0gj8qivwgxh9xzyfldb5hqmd8qi2q9xcazdl9iz39fxvwdshravz", - "depends": ["move", "Rcpp"] + "depends": ["Rcpp", "move"] }, "movecost": { "name": "movecost", "version": "2.1", "sha256": "1rq0q8myszcssdxn77lrf7z6yisc5318k32qxaj98rpggr7pfs93", - "depends": ["chron", "elevatr", "gdistance", "Matrix", "raster", "sf", "sp", "terra"] + "depends": ["Matrix", "chron", "elevatr", "gdistance", "raster", "sf", "sp", "terra"] }, "movegroup": { "name": "movegroup", @@ -84941,13 +85835,13 @@ "name": "movementsync", "version": "0.1.4", "sha256": "132m7df76hj96xpbh1k9s1p8j8jy51mv9v6xrlm35kgwxgk912zk", - "depends": ["circular", "dplyr", "ggplot2", "gridExtra", "hms", "igraph", "lmtest", "osfr", "rlang", "scales", "signal", "tidyr", "WaveletComp", "zoo"] + "depends": ["WaveletComp", "circular", "dplyr", "ggplot2", "gridExtra", "hms", "igraph", "lmtest", "osfr", "rlang", "scales", "signal", "tidyr", "zoo"] }, "movieROC": { "name": "movieROC", - "version": "0.1.0", - "sha256": "1afdb2hb3cmbfgx70xnm1xzjsk855847824qrfaa4ldh9hg403yb", - "depends": ["animation", "e1071", "gtools", "intrval", "ks", "rms", "robustbase", "Rsolnp", "zoo"] + "version": "0.1.1", + "sha256": "0znqdqdl7hszg0q9a5sbaj5m9h0lglk33jrxbvfhyw1dfkg29v93", + "depends": ["Rsolnp", "animation", "e1071", "gtools", "intrval", "ks", "rms", "robustbase", "zoo"] }, "mp": { "name": "mp", @@ -84959,19 +85853,19 @@ "name": "mpae", "version": "0.1.2", "sha256": "0a6fbnqvp0fhbni0qivnrcdmbvlzy6biv5qgk9d13ydqaz15vbms", - "depends": ["caret", "RcmdrMisc"] + "depends": ["RcmdrMisc", "caret"] }, "mpath": { "name": "mpath", - "version": "0.4-2.25", - "sha256": "1131bmp0jqz846snjbg57pd8kmn2jynz4xsck119qxspclw476ab", - "depends": ["bst", "doParallel", "foreach", "glmnet", "MASS", "numDeriv", "pamr", "pscl", "WeightSVM"] + "version": "0.4-2.26", + "sha256": "1pzmcp3kznkfi0bh7pcpgciwla3wgzbb2h1mrngfd1pmm3406pvr", + "depends": ["MASS", "WeightSVM", "bst", "doParallel", "foreach", "glmnet", "numDeriv", "pscl"] }, "mpathsenser": { "name": "mpathsenser", "version": "1.2.3", "sha256": "12hhcw76gn7mfd3xjsb7an7bwz95any8l89pglrk0bmj8iwhsns2", - "depends": ["DBI", "dbplyr", "dplyr", "furrr", "jsonlite", "lifecycle", "lubridate", "purrr", "rlang", "RSQLite", "tibble", "tidyr"] + "depends": ["DBI", "RSQLite", "dbplyr", "dplyr", "furrr", "jsonlite", "lifecycle", "lubridate", "purrr", "rlang", "tibble", "tidyr"] }, "mpindex": { "name": "mpindex", @@ -84995,7 +85889,7 @@ "name": "mplusParallel.automation", "version": "0.0.1.1", "sha256": "012zbd09vqln1xb8lj6akiv1nyhiayiwiwbk8q70yv1mfpj5jgpm", - "depends": ["dplyr", "furrr", "future", "MplusAutomation"] + "depends": ["MplusAutomation", "dplyr", "furrr", "future"] }, "mpm": { "name": "mpm", @@ -85017,9 +85911,9 @@ }, "mpmsim": { "name": "mpmsim", - "version": "2.0.0", - "sha256": "040zbjp95yvl3zwiixjd93yzqgzny8qyy8dyrjfp8rqcr9i8g3q1", - "depends": ["dplyr", "ggplot2", "popbio", "popdemo", "Rcompadre", "reshape"] + "version": "3.0.0", + "sha256": "1bbbprdx2z7sm6m6419vcd4kz194p98n3xrk1y918jas5mi75i95", + "depends": ["Rage", "Rcompadre", "dplyr", "ggplot2", "popbio", "popdemo", "reshape"] }, "mpoly": { "name": "mpoly", @@ -85031,13 +85925,13 @@ "name": "mpower", "version": "0.1.0", "sha256": "0bg2q6dgnh17v5rwa50qj6yivn902p34nmpkbvqhn7qsf45vadmf", - "depends": ["abind", "boot", "doSNOW", "dplyr", "foreach", "ggplot2", "magrittr", "MASS", "purrr", "reshape2", "rlang", "sbgcop", "snow", "tibble", "tidyr", "tidyselect"] + "depends": ["MASS", "abind", "boot", "doSNOW", "dplyr", "foreach", "ggplot2", "magrittr", "purrr", "reshape2", "rlang", "sbgcop", "snow", "tibble", "tidyr", "tidyselect"] }, "mppR": { "name": "mppR", "version": "1.5.0", "sha256": "0ghpsckphrhnjdsxjvbq9v5c3mdpkq14wp9m7g7w9gf5izpa989s", - "depends": ["dplyr", "ggplot2", "igraph", "Matrix", "nlme", "qtl"] + "depends": ["Matrix", "dplyr", "ggplot2", "igraph", "nlme", "qtl"] }, "mpr": { "name": "mpr", @@ -85061,7 +85955,7 @@ "name": "mpwR", "version": "0.1.5", "sha256": "16j81a4minl8710fl32k05g4xcpii7r3jqzypkmvxyhrb1mdvc1q", - "depends": ["comprehenr", "data_table", "dplyr", "flowTraceR", "forcats", "ggplot2", "magrittr", "plotly", "purrr", "stringr", "tibble", "tidyr", "UpSetR"] + "depends": ["UpSetR", "comprehenr", "data_table", "dplyr", "flowTraceR", "forcats", "ggplot2", "magrittr", "plotly", "purrr", "stringr", "tibble", "tidyr"] }, "mr_pivw": { "name": "mr.pivw", @@ -85079,13 +85973,13 @@ "name": "mrMLM", "version": "5.0.1", "sha256": "0z2vwvpc7yrxza3jy3x3mj7d3n10bfbq72rcsnrjrz2jkcbkwb8g", - "depends": ["BEDMatrix", "coin", "data_table", "doParallel", "foreach", "lars", "ncvreg", "Rcpp", "RcppEigen", "sampling", "sbl"] + "depends": ["BEDMatrix", "Rcpp", "RcppEigen", "coin", "data_table", "doParallel", "foreach", "lars", "ncvreg", "sampling", "sbl"] }, "mrMLM_GUI": { "name": "mrMLM.GUI", "version": "4.0.2", "sha256": "0ywxaw164czfgbnqfkh5zw06006clisbc780w2h4z71wfvj56dsi", - "depends": ["bigmemory", "coin", "data_table", "doParallel", "foreach", "lars", "mrMLM", "ncvreg", "Rcpp", "RcppEigen", "sampling", "sbl", "shiny", "shinyjs"] + "depends": ["Rcpp", "RcppEigen", "bigmemory", "coin", "data_table", "doParallel", "foreach", "lars", "mrMLM", "ncvreg", "sampling", "sbl", "shiny", "shinyjs"] }, "mra": { "name": "mra", @@ -85097,13 +85991,13 @@ "name": "mratios", "version": "1.4.2", "sha256": "18pi0dks0qmw0gv76yqm4gvxdqrcvr25j1vb8k4mkp5p35kzkzff", - "depends": ["multcomp", "mvtnorm", "survival", "survPresmooth"] + "depends": ["multcomp", "mvtnorm", "survPresmooth", "survival"] }, "mrbayes": { "name": "mrbayes", "version": "0.5.1", "sha256": "11n3d18di01vmwqs5a0i1h8839aammzbcavi1jk58bmrwb3l771j", - "depends": ["BH", "plyr", "Rcpp", "RcppEigen", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "plyr", "rstan", "rstantools"] }, "mrbin": { "name": "mrbin", @@ -85115,19 +86009,19 @@ "name": "mrbsizeR", "version": "1.3", "sha256": "150ipzlkfzl3dpl4pkjdnrcxr82x9pb2rzhmgl3f02xd35x6am5z", - "depends": ["fields", "maps", "Rcpp"] + "depends": ["Rcpp", "fields", "maps"] }, "mrct": { "name": "mrct", "version": "0.0.1.0", "sha256": "0sgdkkg7x3zly7s35gz7mz79wrwlvnrp8mm7rabqs2lw7lc93lza", - "depends": ["fda", "fdapace", "ggplot2", "Rdpack", "reshape2", "robustbase"] + "depends": ["Rdpack", "fda", "fdapace", "ggplot2", "reshape2", "robustbase"] }, "mrds": { "name": "mrds", "version": "2.3.0", "sha256": "1arp1nk393wbbvasvsp3mb08lbvl3y38bw06sxyk148za3lnhkhq", - "depends": ["mgcv", "numDeriv", "optimx", "Rsolnp"] + "depends": ["Rsolnp", "mgcv", "numDeriv", "optimx"] }, "mreg": { "name": "mreg", @@ -85145,19 +86039,19 @@ "name": "mrf2d", "version": "1.0", "sha256": "0fmxn178bkw77iz51bnjxala9xmhs44km57m8msvlw0k69sddyif", - "depends": ["dplyr", "ggplot2", "Rcpp", "RcppArmadillo", "Rdpack", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "dplyr", "ggplot2", "tidyr"] }, "mrfDepth": { "name": "mrfDepth", "version": "1.0.17", "sha256": "05k7pzjry3dd7api52wlybl7k83jq0v6a306sdl9wcsqv95lw0mc", - "depends": ["abind", "geometry", "ggplot2", "matrixStats", "Rcpp", "RcppArmadillo", "RcppEigen", "reshape2"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "abind", "geometry", "ggplot2", "matrixStats", "reshape2"] }, "mrfse": { "name": "mrfse", "version": "0.4.1", "sha256": "1kk6j7x4z4vaiwnd2mv2brzd1z7g4kyxxylxf31971i6klnsn4zb", - "depends": ["gtools", "Rcpp", "Rfast"] + "depends": ["Rcpp", "Rfast", "gtools"] }, "mrgsim_parallel": { "name": "mrgsim.parallel", @@ -85173,9 +86067,9 @@ }, "mrgsolve": { "name": "mrgsolve", - "version": "1.4.1", - "sha256": "035k5qlpkxyn2fj5kc9i0kfbmdan33mjw9ig8rg5mibsgw5r0iry", - "depends": ["BH", "dplyr", "glue", "lifecycle", "magrittr", "Rcpp", "RcppArmadillo", "rlang", "tibble", "tidyselect"] + "version": "1.5.1", + "sha256": "0bzvzj346ssys7wl7pb0mddg8k0la2sw0q2dxapwvlmasbj4x81g", + "depends": ["BH", "Rcpp", "RcppArmadillo", "dplyr", "glue", "lifecycle", "magrittr", "rlang", "tibble", "tidyselect"] }, "mri": { "name": "mri", @@ -85199,7 +86093,7 @@ "name": "mrregression", "version": "1.0.0", "sha256": "1yy2sjs0b67bqyggzypp2g7x4fdmi86jx2nbcp2n7hcf9cdacysi", - "depends": ["data_table", "Rcpp"] + "depends": ["Rcpp", "data_table"] }, "msBP": { "name": "msBP", @@ -85241,7 +86135,7 @@ "name": "msaenet", "version": "3.1.2", "sha256": "1gs5mcwdkc3wwaa49liywsrl8454801i6jiylfksyw1rlqlcnz9p", - "depends": ["foreach", "glmnet", "Matrix", "mvtnorm", "ncvreg", "survival"] + "depends": ["Matrix", "foreach", "glmnet", "mvtnorm", "ncvreg", "survival"] }, "msamp": { "name": "msamp", @@ -85307,7 +86201,7 @@ "name": "mseapca", "version": "2.0.3", "sha256": "0kmli8dmkv7dacb52dz84plhr4ncagch2kzh61amhga4chwqhwzq", - "depends": ["loadings", "XML"] + "depends": ["XML", "loadings"] }, "msentropy": { "name": "msentropy", @@ -85367,7 +86261,7 @@ "name": "msltrend", "version": "1.0", "sha256": "1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx", - "depends": ["changepoint", "forecast", "plyr", "Rssa", "tseries", "zoo"] + "depends": ["Rssa", "changepoint", "forecast", "plyr", "tseries", "zoo"] }, "msm": { "name": "msm", @@ -85385,7 +86279,7 @@ "name": "msme", "version": "0.5.3", "sha256": "0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh", - "depends": ["lattice", "MASS"] + "depends": ["MASS", "lattice"] }, "msmtools": { "name": "msmtools", @@ -85399,11 +86293,17 @@ "sha256": "1fg9q6269cckn4g6isv22k22mzglxhjxjg5npqsikmisribmr9kb", "depends": ["mclust", "tree"] }, + "mssearchr": { + "name": "mssearchr", + "version": "0.1.1", + "sha256": "0w5i2vcnargw8z80sgmh0qrb5sdv5s3fi3b05qvyc0mx0k6b77lh", + "depends": ["Rcpp"] + }, "mstDIF": { "name": "mstDIF", "version": "0.1.7", "sha256": "0krb3g1njm97cnjjhc2p5r8djgnzarn5gm65x76h1k43qxfb5iw1", - "depends": ["eRm", "expm", "Matrix", "mirt", "PP", "scDIFtest"] + "depends": ["Matrix", "PP", "eRm", "expm", "mirt", "scDIFtest"] }, "mstR": { "name": "mstR", @@ -85413,9 +86313,9 @@ }, "mstate": { "name": "mstate", - "version": "0.3.2", - "sha256": "054dzrd5b0xjjjl7862q3aq1jwgrxbkqz7zpvbdirqsld3zksirw", - "depends": ["data_table", "lattice", "RColorBrewer", "rlang", "survival", "viridisLite"] + "version": "0.3.3", + "sha256": "0vxfayp9d21hgihrb3bfn04y76qgvqx0mcwbw5w6izpbqcwxlcw5", + "depends": ["RColorBrewer", "data_table", "lattice", "rlang", "survival", "viridisLite"] }, "mstclustering": { "name": "mstclustering", @@ -85427,7 +86327,7 @@ "name": "mstherm", "version": "0.4.7", "sha256": "04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip", - "depends": ["doParallel", "foreach", "nls2", "plotrix", "RColorBrewer"] + "depends": ["RColorBrewer", "doParallel", "foreach", "nls2", "plotrix"] }, "mstknnclust": { "name": "mstknnclust", @@ -85439,13 +86339,13 @@ "name": "mstrio", "version": "11.3.5.101", "sha256": "103xpkcahp3rzw01yb1qmymavl40xzydmn0z6ya2mcxihzfdf2k3", - "depends": ["crul", "data_table", "httr", "jsonlite", "markdown", "openssl", "R6", "rstudioapi", "shiny", "shinyjs", "vctrs"] + "depends": ["R6", "crul", "data_table", "httr", "jsonlite", "markdown", "openssl", "rstudioapi", "shiny", "shinyjs", "vctrs"] }, "mstudentd": { "name": "mstudentd", - "version": "1.0.0", - "sha256": "03css731hv96nj8y07y4ngzv97fypiqcfynscxw5fx0s05c51331", - "depends": ["MASS", "rgl"] + "version": "1.1.1", + "sha256": "0s5kidcz6sv9gaa0mdx2lawn79qd1y5j3vpr76bpv91fibfpzpa6", + "depends": ["MASS", "data_table", "rgl"] }, "msu": { "name": "msu", @@ -85457,7 +86357,7 @@ "name": "mt", "version": "2.0-1.20", "sha256": "12r7hs83ijn7vw1qqgfrmd5ff7x6p3hxmaxnr3bjr5h2gd6sj42l", - "depends": ["class", "e1071", "ellipse", "lattice", "latticeExtra", "MASS", "pls", "randomForest"] + "depends": ["MASS", "class", "e1071", "ellipse", "lattice", "latticeExtra", "pls", "randomForest"] }, "mtanan": { "name": "mtanan", @@ -85467,9 +86367,9 @@ }, "mtarm": { "name": "mtarm", - "version": "0.1.1", - "sha256": "1zmqpaw7yirs62xg20vfp6m481089651z5qhr52lqsqy537z2vby", - "depends": ["coda", "Formula", "GIGrvg"] + "version": "0.1.2", + "sha256": "19830spz9r1bj520vkafiq3inb45ydzwx6fjaa2vadr6mxr7b2l0", + "depends": ["Formula", "GIGrvg", "coda"] }, "mtb": { "name": "mtb", @@ -85481,7 +86381,7 @@ "name": "mtdesign", "version": "0.1.0", "sha256": "0fnyw6zcls12b6mmr9pxj3b9vs8pv1ik3h671kmxfgv1k6dwn6b9", - "depends": ["BH", "dplyr", "ggplot2", "logger", "magrittr", "Rcpp", "rlang", "tibble", "tidyr"] + "depends": ["BH", "Rcpp", "dplyr", "ggplot2", "logger", "magrittr", "rlang", "tibble", "tidyr"] }, "mthapower": { "name": "mthapower", @@ -85569,9 +86469,9 @@ }, "mulea": { "name": "mulea", - "version": "1.0.0", - "sha256": "07rhgf0qiwjxr0ckyizyry0vk33jfl2zh3lqipg0rc6s083shgv3", - "depends": ["data_table", "dplyr", "fgsea", "ggplot2", "ggraph", "magrittr", "plyr", "Rcpp", "readr", "rlang", "scales", "stringi", "tibble", "tidygraph", "tidyverse"] + "version": "1.0.1", + "sha256": "0mgwhf24raycj01cyw835a843pgfi7nkhzjj73ln3xhkk42np3km", + "depends": ["Rcpp", "data_table", "dplyr", "fgsea", "ggplot2", "ggraph", "magrittr", "plyr", "readr", "rlang", "scales", "stringi", "tibble", "tidygraph", "tidyverse"] }, "mulgar": { "name": "mulgar", @@ -85611,15 +86511,15 @@ }, "multbxxc": { "name": "multbxxc", - "version": "1.0.2", - "sha256": "1g8m3mgqfvqf097rd3v78575gci77gphygjv66n0nlnv06hqrhr1", + "version": "1.0.3", + "sha256": "0pb8pf66jribf1riyzsv9snmhvf3vivzklkmfhzadgrs72sxlgw4", "depends": ["Rcpp", "RcppArmadillo", "rmumps"] }, "multcomp": { "name": "multcomp", - "version": "1.4-25", - "sha256": "10njzzxdi3jw5f419s7chcynxkzyqmmvzf7jk7ybdrwrlqhpiylx", - "depends": ["codetools", "mvtnorm", "sandwich", "survival", "TH_data"] + "version": "1.4-26", + "sha256": "1v3979my2yzpqc5lrx7fy72765j2cw1giv4xlpwrr2zvmzgvn051", + "depends": ["TH_data", "codetools", "mvtnorm", "sandwich", "survival"] }, "multcompView": { "name": "multcompView", @@ -85629,8 +86529,8 @@ }, "multe": { "name": "multe", - "version": "1.0.0", - "sha256": "05hp59lsf0zdbp6lkyf9yq1i0isi68zgqwxxkssgw4r6w5yfh84g", + "version": "1.1.0", + "sha256": "1827787d3prv94asyqw4h91z7w9k5yzp0d79afxrnp3b9q9vp5v3", "depends": ["nnet"] }, "multfisher": { @@ -85643,7 +86543,7 @@ "name": "multgee", "version": "1.9.0", "sha256": "0hjlnmnn18cf2blcr23y8vc2l6zaqfi8223nfwm2bx3arslj41xn", - "depends": ["gnm", "Rcpp", "RcppArmadillo", "VGAM"] + "depends": ["Rcpp", "RcppArmadillo", "VGAM", "gnm"] }, "multiActionButton": { "name": "multiActionButton", @@ -85679,13 +86579,13 @@ "name": "multiDimBio", "version": "1.2.2", "sha256": "0xadpvnyghpqh2q1gp1fqwv591sm3icmx60x4g8gn1vybi51k5rx", - "depends": ["ggplot2", "gridGraphics", "lme4", "MASS", "misc3d", "pcaMethods", "RColorBrewer"] + "depends": ["MASS", "RColorBrewer", "ggplot2", "gridGraphics", "lme4", "misc3d", "pcaMethods"] }, "multiFANOVA": { "name": "multiFANOVA", "version": "0.1.0", "sha256": "03dx08rpp2h6mwbdcsgsmyjmbslva3578yif298zc9r7v5j6d0rr", - "depends": ["doParallel", "fda", "foreach", "GFDmcv", "MASS", "Matrix"] + "depends": ["GFDmcv", "MASS", "Matrix", "doParallel", "fda", "foreach"] }, "multiMarker": { "name": "multiMarker", @@ -85709,31 +86609,31 @@ "name": "multiUS", "version": "1.2.3", "sha256": "0wdvrkl6xvk8xpkm9n0hd5pjks3350ms09jrfqnnxyf3dsbs68dc", - "depends": ["gplots", "MASS"] + "depends": ["MASS", "gplots"] }, "multibias": { "name": "multibias", - "version": "1.5.0", - "sha256": "171fag2qx8vbydcajai2dq50l9hrhsrlifrni87b07pzsm6bv7nc", + "version": "1.5.1", + "sha256": "16fbrc2phljrvmlraii31g16z41lid9x9s5sw1d03v6vzgca09aj", "depends": ["dplyr", "magrittr", "rlang"] }, "multibiasmeta": { "name": "multibiasmeta", "version": "0.2.2", "sha256": "04qnb3l2y86xy8f1j754g8fy6hc1a26rwdznaka789k3dkkckk93", - "depends": ["dplyr", "EValue", "metabias", "metafor", "purrr", "Rdpack", "rlang", "robumeta"] + "depends": ["EValue", "Rdpack", "dplyr", "metabias", "metafor", "purrr", "rlang", "robumeta"] }, "multibiplotGUI": { "name": "multibiplotGUI", "version": "1.1", "sha256": "08vmdhrn6qqq57q818cqnmsw7qaa4gnw3m5myzp4dc85njgzzi02", - "depends": ["cluster", "dendroextras", "MASS", "Matrix", "plotrix", "rgl", "shapes", "tcltk2", "tkrplot"] + "depends": ["MASS", "Matrix", "cluster", "dendroextras", "plotrix", "rgl", "shapes", "tcltk2", "tkrplot"] }, "multiblock": { "name": "multiblock", "version": "0.8.8.1", "sha256": "0b4xk6pr4ffs44iras74mswligfyrx52fgm5yvcs5f4y94bsd6pp", - "depends": ["ade4", "car", "lme4", "MASS", "mixlm", "plotrix", "pls", "plsVarSel", "pracma", "progress", "Rcpp", "RcppEigen", "RSpectra", "SSBtools"] + "depends": ["MASS", "RSpectra", "Rcpp", "RcppEigen", "SSBtools", "ade4", "car", "lme4", "mixlm", "plotrix", "pls", "plsVarSel", "pracma", "progress"] }, "multibreakeR": { "name": "multibreakeR", @@ -85745,7 +86645,7 @@ "name": "multibridge", "version": "1.2.0", "sha256": "0akl9i3fhgd0pqsvgp7cv2l2l84cqc3cc4lambnjmwdyh7x4qcvd", - "depends": ["Brobdingnag", "coda", "magrittr", "mvtnorm", "progress", "purrr", "Rcpp", "Rdpack", "stringr"] + "depends": ["Brobdingnag", "Rcpp", "Rdpack", "coda", "magrittr", "mvtnorm", "progress", "purrr", "stringr"] }, "multicastR": { "name": "multicastR", @@ -85755,9 +86655,9 @@ }, "multichull": { "name": "multichull", - "version": "1.0.1", - "sha256": "1ghkyypp7pij62iz33di6af27hkvy5rfrh6hpms21v4a43z2ljb7", - "depends": ["igraph", "plotly", "shiny", "shinythemes"] + "version": "3.0.0", + "sha256": "17c2hwgnlw67s2209ran6gz0mdg66kzxzp6d484dp53gggnpdw0l", + "depends": ["DT", "igraph", "plotly", "shiny", "shinythemes"] }, "multiclassPairs": { "name": "multiclassPairs", @@ -85787,13 +86687,13 @@ "name": "multidplyr", "version": "0.1.3", "sha256": "18yl24s1g8wf3xi6f0k7jhs99ka4dslxf5p9ax9m5l1rbva5xdwj", - "depends": ["callr", "cli", "crayon", "dplyr", "magrittr", "qs", "R6", "rlang", "tibble", "tidyselect", "vctrs"] + "depends": ["R6", "callr", "cli", "crayon", "dplyr", "magrittr", "qs", "rlang", "tibble", "tidyselect", "vctrs"] }, "multifamm": { "name": "multifamm", "version": "0.1.1", "sha256": "09s6hnyi5x48yp97499zai7b959ylkk17zbbc6d8a71ynvfas8ir", - "depends": ["data_table", "funData", "MFPCA", "mgcv", "sparseFLMM", "zoo"] + "depends": ["MFPCA", "data_table", "funData", "mgcv", "sparseFLMM", "zoo"] }, "multifear": { "name": "multifear", @@ -85805,7 +86705,7 @@ "name": "multifunc", "version": "0.9.4", "sha256": "0gxgxfh8vmczc7dc4awfmmmwds98kk9d5c9rk1lz1himp19mqsj4", - "depends": ["broom", "dplyr", "magrittr", "MASS", "purrr"] + "depends": ["MASS", "broom", "dplyr", "magrittr", "purrr"] }, "multifwf": { "name": "multifwf", @@ -85835,7 +86735,7 @@ "name": "multilevLCA", "version": "1.5.1", "sha256": "0cf51abcypl3a3xl0lhvb614ja83s6nkcc0glws9x112wwm2dgs4", - "depends": ["dplyr", "foreach", "klaR", "magrittr", "MASS", "Rcpp", "RcppArmadillo", "tidyr"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "dplyr", "foreach", "klaR", "magrittr", "tidyr"] }, "multilevel": { "name": "multilevel", @@ -85847,25 +86747,25 @@ "name": "multilevelPSA", "version": "1.2.5", "sha256": "0926jaicdxk846vyfphb2hyg3zan3wal44x1bwamws0zf4flc4hj", - "depends": ["ggplot2", "MASS", "party", "plyr", "PSAgraphics", "psych", "reshape", "xtable"] + "depends": ["MASS", "PSAgraphics", "ggplot2", "party", "plyr", "psych", "reshape", "xtable"] }, "multilevelTools": { "name": "multilevelTools", "version": "0.1.1", "sha256": "01fzx7j0mkb4fr7axv34184w6w5nfsdcr51nscci1mi5b2805x1s", - "depends": ["cowplot", "data_table", "extraoperators", "ggplot2", "JWileymisc", "lavaan", "lme4", "lmerTest", "nlme", "zoo"] + "depends": ["JWileymisc", "cowplot", "data_table", "extraoperators", "ggplot2", "lavaan", "lme4", "lmerTest", "nlme", "zoo"] }, "multilevelcoda": { "name": "multilevelcoda", - "version": "1.3.0", - "sha256": "1hmnapmcaa1m56afvx3ylikii462fhq8qy64xs0a8gpkg9d5ir0v", - "depends": ["abind", "bayesplot", "bayestestR", "brms", "bslib", "compositions", "data_table", "doFuture", "DT", "extraoperators", "foreach", "future", "ggplot2", "hrbrthemes", "insight", "loo", "plotly", "shiny", "shinystan"] + "version": "1.3.0.2", + "sha256": "0dd31bs1wfwfmi65aj8ycmipyszpl79cik5z2w7rkii4pl1zc6ja", + "depends": ["DT", "abind", "bayesplot", "bayestestR", "brms", "bslib", "compositions", "data_table", "doFuture", "emmeans", "extraoperators", "foreach", "future", "ggplot2", "hrbrthemes", "insight", "loo", "plotly", "shiny", "shinystan"] }, "multilevelmediation": { "name": "multilevelmediation", "version": "0.3.1", "sha256": "0aq38qz4i05sn3qa1f0lwpf57r4aya30i028gfdj66w0nh766pg0", - "depends": ["brms", "furrr", "future", "matrixcalc", "MCMCpack", "nlme", "parallelly", "posterior", "tidyr"] + "depends": ["MCMCpack", "brms", "furrr", "future", "matrixcalc", "nlme", "parallelly", "posterior", "tidyr"] }, "multilevelmod": { "name": "multilevelmod", @@ -85883,13 +86783,13 @@ "name": "multilink", "version": "0.1.1", "sha256": "0bjsmr8ca8c3vhq8p8sadn5l4xns5isssmsvi47i3l96j51g7das", - "depends": ["geosphere", "igraph", "mcclust", "Rcpp", "RcppArmadillo", "RecordLinkage", "stringr"] + "depends": ["Rcpp", "RcppArmadillo", "RecordLinkage", "geosphere", "igraph", "mcclust", "stringr"] }, "multimark": { "name": "multimark", "version": "2.1.6", "sha256": "14zgp3pqxmfjxf78rfr92qd3gjyzfrx5sbid3gcg14bsnpyhkns4", - "depends": ["Brobdingnag", "coda", "Matrix", "mvtnorm", "prodlim", "raster", "RMark", "sp", "statmod"] + "depends": ["Brobdingnag", "Matrix", "RMark", "coda", "mvtnorm", "prodlim", "raster", "sp", "statmod"] }, "multimix": { "name": "multimix", @@ -85913,43 +86813,43 @@ "name": "multiness", "version": "1.0.2", "sha256": "08bgjs2mrmsdvha10dr74262yk5ghyflvs8pqbl7bc8aws7lv8f5", - "depends": ["glmnet", "Matrix", "RSpectra"] + "depends": ["Matrix", "RSpectra", "glmnet"] }, "multinet": { "name": "multinet", - "version": "4.1.2", - "sha256": "0i87r6k6pzr7gbspcq9d101gwnnlwqpr0y4s1dgqsa2abivk0p55", - "depends": ["igraph", "RColorBrewer", "Rcpp"] + "version": "4.2", + "sha256": "1rrb03nl658r28sjn4d1g7hdwz5jsg8hgwhygy79xfsqf1pykmy8", + "depends": ["RColorBrewer", "Rcpp", "igraph"] }, "multinets": { "name": "multinets", "version": "0.2.2", "sha256": "1i5jsq1xy0g0l5d1z3hz4gj6inj4rhd6lf2s5xzd5k8ccp5aba8c", - "depends": ["igraph", "Rcpp"] + "depends": ["Rcpp", "igraph"] }, "multinma": { "name": "multinma", "version": "0.7.1", "sha256": "0p0bw7kz1i7bnmwzyzn7gbblpq05rf2axcklppj9h072ysh1x7mn", - "depends": ["bayesplot", "BH", "copula", "dplyr", "forcats", "ggdist", "ggplot2", "ggraph", "glue", "igraph", "Matrix", "purrr", "randtoolbox", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "rlang", "rstan", "rstantools", "StanHeaders", "stringr", "survival", "tibble", "tidyr", "truncdist"] + "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "bayesplot", "copula", "dplyr", "forcats", "ggdist", "ggplot2", "ggraph", "glue", "igraph", "purrr", "randtoolbox", "rlang", "rstan", "rstantools", "stringr", "survival", "tibble", "tidyr", "truncdist"] }, "multinomialLogitMix": { "name": "multinomialLogitMix", "version": "1.1", "sha256": "11mv9xsixcjqv3cq5ay1id3736gzdk192cw2z9khlv1j9bf1x4xh", - "depends": ["coda", "doParallel", "foreach", "ggplot2", "label_switching", "MASS", "matrixStats", "mvtnorm", "RColorBrewer", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "RColorBrewer", "Rcpp", "RcppArmadillo", "coda", "doParallel", "foreach", "ggplot2", "label_switching", "matrixStats", "mvtnorm"] }, "multinomineq": { "name": "multinomineq", "version": "0.2.6", "sha256": "0ip5ax1s7bk98hq9yqvhx0hiawxbac901zw41v0issq302dhvylk", - "depends": ["coda", "quadprog", "Rcpp", "RcppArmadillo", "RcppProgress", "RcppXPtrUtils", "Rglpk"] + "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "RcppXPtrUtils", "Rglpk", "coda", "quadprog"] }, "multiocc": { "name": "multiocc", "version": "0.2.1", "sha256": "1ndwky6rjyb7x0mg2xx5lsxr5yyhg7a9jrwmwryjg6jsw23965qx", - "depends": ["coda", "interp", "MASS", "tmvtnorm", "truncnorm"] + "depends": ["MASS", "coda", "interp", "tmvtnorm", "truncnorm"] }, "multipanelfigure": { "name": "multipanelfigure", @@ -85961,7 +86861,7 @@ "name": "multipleDL", "version": "1.0.0", "sha256": "0b8858w0g45xkhschg742kxicd1cp4xhfacn0q3yh17k2fcif7r3", - "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "SparseM", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "SparseM", "StanHeaders", "rstan", "rstantools"] }, "multipleNCC": { "name": "multipleNCC", @@ -85983,8 +86883,8 @@ }, "multiplex": { "name": "multiplex", - "version": "3.1.1", - "sha256": "0y7bcqdma20ca4a7f20kwrhji7mc1rris31kqfb3ps7zwj9bkp3h", + "version": "3.4", + "sha256": "00dxlign3l34vjjpzasj6jiyzr53lppq7hw5xb5rm9zqiw31cd2w", "depends": [] }, "multipol": { @@ -86019,9 +86919,9 @@ }, "multisite_accuracy": { "name": "multisite.accuracy", - "version": "1.2", - "sha256": "1hj1gjc8833np9cahpw1f1p2yg95xx32rbzj6l9sc65dv5ncq5jf", - "depends": ["AROC", "coxme", "lme4", "lmerTest", "logistf", "metafor", "pROC", "survival"] + "version": "1.3", + "sha256": "0d2i34pphvilzmjvqpxnp76d2dzy4ncg6xvxdg7752gcnp5j1mvl", + "depends": ["coxme", "lme4", "lmerTest", "logistf", "metafor", "pROC", "survival"] }, "multisom": { "name": "multisom", @@ -86045,25 +86945,25 @@ "name": "multitool", "version": "0.1.4", "sha256": "1z8yby5prfmp0p9gia8pmr54sw017rqbpblhxk6qxz3w9vnl4zp8", - "depends": ["clipr", "correlation", "DiagrammeR", "dplyr", "flextable", "furrr", "future", "ggdist", "ggplot2", "glue", "lme4", "moments", "parameters", "performance", "purrr", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["DiagrammeR", "clipr", "correlation", "dplyr", "flextable", "furrr", "future", "ggdist", "ggplot2", "glue", "lme4", "moments", "parameters", "performance", "purrr", "rlang", "stringr", "tibble", "tidyr"] }, "multivar": { "name": "multivar", "version": "1.1.0", "sha256": "1jyz921m16g24gjmscsz2mi78ng3c5hzhbcankdq9x1i7kdcqawi", - "depends": ["ggplot2", "glmnet", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "reshape2", "vars"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "ggplot2", "glmnet", "reshape2", "vars"] }, "multivariance": { "name": "multivariance", "version": "2.4.1", "sha256": "1jbv1rhdy6jgvyhwz25hry3xmnxfsl8pwf0j4rj9r8rg6ik8rv1w", - "depends": ["igraph", "microbenchmark", "Rcpp"] + "depends": ["Rcpp", "igraph", "microbenchmark"] }, "multivarious": { "name": "multivarious", "version": "0.2.0", "sha256": "1lgb7agfdq4fiwg2c2f6an2bx7krl84n79d7744rc514rgl0klp0", - "depends": ["chk", "corpcor", "fitdistrplus", "glmnet", "irlba", "Matrix", "matrixStats", "pls", "proxy", "purrr", "rlang", "RSpectra", "rsvd", "svd"] + "depends": ["Matrix", "RSpectra", "chk", "corpcor", "fitdistrplus", "glmnet", "irlba", "matrixStats", "pls", "proxy", "purrr", "rlang", "rsvd", "svd"] }, "multivator": { "name": "multivator", @@ -86075,13 +86975,13 @@ "name": "multiverse", "version": "0.6.1", "sha256": "0l3h4pg450brw27n0jhc3k5fsl57kczxsmzzs3ffj9lwrpnvvn7z", - "depends": ["berryFunctions", "collections", "dplyr", "evaluate", "formatR", "future_apply", "knitr", "magrittr", "purrr", "R6", "rlang", "rstudioapi", "tibble", "tidyr", "tidyselect"] + "depends": ["R6", "berryFunctions", "collections", "dplyr", "evaluate", "formatR", "future_apply", "knitr", "magrittr", "purrr", "rlang", "rstudioapi", "tibble", "tidyr", "tidyselect"] }, "multiview": { "name": "multiview", "version": "0.8", "sha256": "1kf16w4wbj84383hvqxhrqlvghyra22p7k9vs03axqxqkhl8krhz", - "depends": ["glmnet", "Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "survival"] + "depends": ["Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "glmnet", "survival"] }, "multiwave": { "name": "multiwave", @@ -86177,7 +87077,7 @@ "name": "mutossGUI", "version": "0.1-12", "sha256": "13mq7yjbvnfgmiss95wxys3scmrb6b036g8rcxs1rn1q5wy3sg7b", - "depends": ["CommonJavaJars", "JavaGD", "JGR", "multcomp", "mutoss", "plotrix", "rJava"] + "depends": ["CommonJavaJars", "JGR", "JavaGD", "multcomp", "mutoss", "plotrix", "rJava"] }, "mutualinf": { "name": "mutualinf", @@ -86189,13 +87089,13 @@ "name": "mvDFA", "version": "0.0.4", "sha256": "118m08j6d8vwpk04g6prqmcxc899v2a8mbs59j53cs612aipk0vp", - "depends": ["deSolve", "longmemo", "mvtnorm", "pbapply", "pracma", "RobPer"] + "depends": ["RobPer", "deSolve", "longmemo", "mvtnorm", "pbapply", "pracma"] }, "mvGPS": { "name": "mvGPS", "version": "1.2.2", "sha256": "1aanrv84c012ijyqql0pw2qlckrpv3wmfv16yhr465xb3rkzz4vj", - "depends": ["CBPS", "cobalt", "gbm", "geometry", "MASS", "matrixNormal", "Rdpack", "sp", "WeightIt"] + "depends": ["CBPS", "MASS", "Rdpack", "WeightIt", "cobalt", "gbm", "geometry", "matrixNormal", "sp"] }, "mvLSW": { "name": "mvLSW", @@ -86213,13 +87113,13 @@ "name": "mvMAPIT", "version": "2.0.3", "sha256": "1ab4snxbw9p80cs7d6fnxl7cv20l1h2b243q2nj50yh6xirx2a0h", - "depends": ["checkmate", "CompQuadForm", "dplyr", "foreach", "harmonicmeanp", "logging", "mvtnorm", "Rcpp", "RcppArmadillo", "RcppParallel", "RcppProgress", "RcppSpdlog", "testthat", "tidyr"] + "depends": ["CompQuadForm", "Rcpp", "RcppArmadillo", "RcppParallel", "RcppProgress", "RcppSpdlog", "checkmate", "dplyr", "foreach", "harmonicmeanp", "logging", "mvtnorm", "testthat", "tidyr"] }, "mvMISE": { "name": "mvMISE", "version": "1.0", "sha256": "0lnc5g3ksl5cvwylh8p8baxyvq3z32a2i337q7lhg00j031ccy5c", - "depends": ["lme4", "MASS"] + "depends": ["MASS", "lme4"] }, "mvMORPH": { "name": "mvMORPH", @@ -86237,7 +87137,7 @@ "name": "mvPot", "version": "0.1.6", "sha256": "18cx02wg6nkgmh2ba2gp37z838xr70w354wbkfgl5jnyirl5g9xz", - "depends": ["evd", "gmp", "MASS", "numbers"] + "depends": ["MASS", "evd", "gmp", "numbers"] }, "mvProbit": { "name": "mvProbit", @@ -86255,13 +87155,13 @@ "name": "mvSLOUCH", "version": "2.7.6", "sha256": "1l11dza28m5l6iam90z2vvmpabp91s3rmnb7b1x78c77ss1r7gig", - "depends": ["abind", "ape", "Matrix", "matrixcalc", "mvtnorm", "ouch", "PCMBase"] + "depends": ["Matrix", "PCMBase", "abind", "ape", "matrixcalc", "mvtnorm", "ouch"] }, "mvSUSY": { "name": "mvSUSY", "version": "0.1.0", "sha256": "1yvgx439m37ifdviaiykhpxrfw7k43dnvpxc56532w7vwxbvpcd7", - "depends": ["data_table", "ggplot2", "ggsci", "RcppAlgos"] + "depends": ["RcppAlgos", "data_table", "ggplot2", "ggsci"] }, "mvShapiroTest": { "name": "mvShapiroTest", @@ -86291,13 +87191,13 @@ "name": "mvctm", "version": "1.2", "sha256": "0810bmk748cvbls4djspqvkk65j605djqicqg4rkwy2a799l3rgc", - "depends": ["Formula", "MNM", "nlme", "quantreg", "Rfit", "SpatialNP"] + "depends": ["Formula", "MNM", "Rfit", "SpatialNP", "nlme", "quantreg"] }, "mvdalab": { "name": "mvdalab", "version": "1.7", "sha256": "0iblpg5yi9ig4hi6ff84m9pfgyrpkyfc9m9m98dpngpbhxfqnvhq", - "depends": ["car", "ggplot2", "MASS", "moments", "penalized", "plyr", "reshape2", "sn"] + "depends": ["MASS", "car", "ggplot2", "moments", "penalized", "plyr", "reshape2", "sn"] }, "mverse": { "name": "mverse", @@ -86307,9 +87207,9 @@ }, "mvgam": { "name": "mvgam", - "version": "1.1.1", - "sha256": "1hgrhly2wsrmsgbd888sx38hyl44bgicw54z8bgf4i54n4mmw8ph", - "depends": ["bayesplot", "brms", "dplyr", "ggplot2", "insight", "loo", "magrittr", "marginaleffects", "Matrix", "matrixStats", "mgcv", "mvnfast", "pbapply", "posterior", "purrr", "Rcpp", "RcppArmadillo", "rlang", "rstan", "rstantools", "scoringRules", "smooth", "zoo"] + "version": "1.1.2", + "sha256": "1cbqz680844zjd0girpivig11infzn417cra3r87yg0iai7cz5zd", + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "bayesplot", "brms", "dplyr", "ggplot2", "insight", "loo", "magrittr", "marginaleffects", "mgcv", "mvnfast", "pbapply", "posterior", "purrr", "rlang", "rstan", "rstantools", "smooth", "zoo"] }, "mvgb": { "name": "mvgb", @@ -86327,13 +87227,13 @@ "name": "mvhist", "version": "1.1", "sha256": "057yhkivcfjm9yazx0x8rn2xysgyc6y7nlcxpjl00yfi7wcjpmlh", - "depends": ["mvmesh", "rcdd", "rgl", "SimplicialCubature"] + "depends": ["SimplicialCubature", "mvmesh", "rcdd", "rgl"] }, "mvhtests": { "name": "mvhtests", "version": "1.0", "sha256": "1820d8gd2rmszqp3kd5d01c5v2znxm1l6dm7cjr4mn51v1rxzhhk", - "depends": ["doParallel", "emplik", "foreach", "Rfast", "Rfast2"] + "depends": ["Rfast", "Rfast2", "doParallel", "emplik", "foreach"] }, "mvinfluence": { "name": "mvinfluence", @@ -86345,7 +87245,7 @@ "name": "mvmesh", "version": "1.6", "sha256": "1y6p7xp9fv0xswjdc6py1xqlx1ys1iyr559s9wkyja4hzcpya2my", - "depends": ["abind", "geometry", "rcdd", "rgl", "SimplicialCubature"] + "depends": ["SimplicialCubature", "abind", "geometry", "rcdd", "rgl"] }, "mvmeta": { "name": "mvmeta", @@ -86381,7 +87281,7 @@ "name": "mvnimpute", "version": "1.0.1", "sha256": "0131dm8ma7qrzqsfdkdcp1vh0jcz3am3mry6x96m8fm3npi4dldz", - "depends": ["ggplot2", "LaplacesDemon", "MASS", "Rcpp", "RcppArmadillo", "RcppDist", "reshape2", "rlang", "truncnorm"] + "depends": ["LaplacesDemon", "MASS", "Rcpp", "RcppArmadillo", "RcppDist", "ggplot2", "reshape2", "rlang", "truncnorm"] }, "mvnmle": { "name": "mvnmle", @@ -86409,9 +87309,9 @@ }, "mvord": { "name": "mvord", - "version": "1.2.2", - "sha256": "15ln55a1lxpfka4lva84nsznbl8wgi95hvbr8wisqh05c5940s3x", - "depends": ["BB", "dfoptim", "MASS", "Matrix", "minqa", "mnormt", "mvtnorm", "numDeriv", "optimx", "pbivnorm", "ucminf"] + "version": "1.2.4", + "sha256": "0hxgz5gjrvapfdjyf5w9wcankbwkd32ii291nzmlh8n8gb7pr067", + "depends": ["BB", "MASS", "Matrix", "dfoptim", "minqa", "mnormt", "mvtnorm", "numDeriv", "optimx", "pbivnorm", "ucminf"] }, "mvoutlier": { "name": "mvoutlier", @@ -86423,13 +87323,13 @@ "name": "mvp", "version": "1.0-14", "sha256": "0dzf5h5ng0vx6nw8j8q9ydksicyxy940p363n367gbs56c8x47dk", - "depends": ["digest", "disordR", "magic", "magrittr", "mpoly", "numbers", "partitions", "Rcpp"] + "depends": ["Rcpp", "digest", "disordR", "magic", "magrittr", "mpoly", "numbers", "partitions"] }, "mvpd": { "name": "mvpd", "version": "0.0.4", "sha256": "10k82g2izv72k99j99mjljg2hxb66pzhgfqal2j5z3cj3gmkjabg", - "depends": ["cubature", "libstable4u", "Matrix", "matrixStats", "mvtnorm", "stabledist"] + "depends": ["Matrix", "cubature", "libstable4u", "matrixStats", "mvtnorm", "stabledist"] }, "mvrsquared": { "name": "mvrsquared", @@ -86457,27 +87357,27 @@ }, "mvtnorm": { "name": "mvtnorm", - "version": "1.2-5", - "sha256": "19pdwdkhc7bv6r9xkzpxmpgmz7mvsrzxfvj6jy02hpjdlaiq4y4y", + "version": "1.2-6", + "sha256": "0cfdd8l58yn48vc4zf4n5vfs3g02wdnvmkdf5zyybn3f54ydrpn4", "depends": [] }, "mvtsplot": { "name": "mvtsplot", - "version": "1.0-4", - "sha256": "1391m4r58hbaqbq46isi15jx6vhx7frdspbs1ippbpw7rsanch9w", + "version": "1.0-5", + "sha256": "0n7lfxr3hq32fpg0vv9v0426k4dlgadfcjrjg7kj3abahykx7zl9", "depends": ["RColorBrewer"] }, "mwTensor": { "name": "mwTensor", "version": "1.1.0", "sha256": "113asdl3hm1kk31x29x89bz3zxccrhbh64xl2fcgds1mkw0gr3mn", - "depends": ["ccTensor", "igraph", "iTensor", "MASS", "nnTensor", "rTensor"] + "depends": ["MASS", "ccTensor", "iTensor", "igraph", "nnTensor", "rTensor"] }, "mwa": { "name": "mwa", "version": "0.4.4", "sha256": "0f994xpylqhhwwr3rv0y5y68989ssy7q4pb3hawq0ww0l3wj9lmd", - "depends": ["cem", "MASS", "rJava"] + "depends": ["MASS", "cem", "rJava"] }, "mwlaxeref": { "name": "mwlaxeref", @@ -86495,7 +87395,7 @@ "name": "mxfda", "version": "0.2.1", "sha256": "0msfkyxdyy8p3rwxqyzqy9jmsjnv3ra7qspm1cfql3azpmhs8k4s", - "depends": ["dplyr", "ggplot2", "lifecycle", "magrittr", "mgcv", "purrr", "refund", "reshape2", "rlang", "SimDesign", "SpatEntropy", "spatstat_explore", "spatstat_geom", "tidyr"] + "depends": ["SimDesign", "SpatEntropy", "dplyr", "ggplot2", "lifecycle", "magrittr", "mgcv", "purrr", "refund", "reshape2", "rlang", "spatstat_explore", "spatstat_geom", "tidyr"] }, "mxkssd": { "name": "mxkssd", @@ -86513,13 +87413,13 @@ "name": "mxnorm", "version": "1.0.3", "sha256": "01845m5h4rd38n0fll2k2d9hw6j9dbjgs7kmwy30g9lkffvv73s8", - "depends": ["caret", "data_table", "dplyr", "e1071", "fda", "fossil", "ggplot2", "glue", "KernSmooth", "kSamples", "lme4", "magrittr", "psych", "reticulate", "rlang", "stringr", "tidyr", "uwot"] + "depends": ["KernSmooth", "caret", "data_table", "dplyr", "e1071", "fda", "fossil", "ggplot2", "glue", "kSamples", "lme4", "magrittr", "psych", "reticulate", "rlang", "stringr", "tidyr", "uwot"] }, "mxsem": { "name": "mxsem", - "version": "0.0.9", - "sha256": "1n8dwb41gr2z8sjrkf0f75mcrvigr5p9p399s5bbi74kf9dsw0hr", - "depends": ["dplyr", "OpenMx", "Rcpp"] + "version": "0.1.0", + "sha256": "0mhy8nbg9xagsdacyy1q0ri0j6jdsidsmcx12k736axi0805x0m1", + "depends": ["OpenMx", "Rcpp", "dplyr"] }, "myCRAN": { "name": "myCRAN", @@ -86537,7 +87437,7 @@ "name": "myTAI", "version": "0.9.3", "sha256": "0fd6srvwzqir8zif56cnyi02c952fgc67xzc17wn7xvmvljfvh4x", - "depends": ["cpp11", "doParallel", "dplyr", "edgeR", "fitdistrplus", "foreach", "ggplot2", "gridExtra", "nortest", "RColorBrewer", "Rcpp", "RcppArmadillo", "readr", "reshape2", "scales", "taxize", "tibble"] + "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "cpp11", "doParallel", "dplyr", "edgeR", "fitdistrplus", "foreach", "ggplot2", "gridExtra", "nortest", "readr", "reshape2", "scales", "taxize", "tibble"] }, "mycobacrvR": { "name": "mycobacrvR", @@ -86567,7 +87467,7 @@ "name": "nFactors", "version": "2.4.1.1", "sha256": "08gydk231zijw3inp6d3hnc5mz0zywi4vzlvqb4jmibhv0hncdxv", - "depends": ["lattice", "MASS", "psych"] + "depends": ["MASS", "lattice", "psych"] }, "nFunNN": { "name": "nFunNN", @@ -86603,7 +87503,7 @@ "name": "naaccr", "version": "2.0.2", "sha256": "1j30fb7qvxzpx0y7hq8sbqvszwjfnc4r2g0j8885fmn2wxvcgzdx", - "depends": ["data_table", "stringi", "XML"] + "depends": ["XML", "data_table", "stringi"] }, "nabor": { "name": "nabor", @@ -86627,13 +87527,13 @@ "name": "naijR", "version": "0.6.0", "sha256": "1108fz4rhckmb2d9s63rjb44dpfazhvhsqprgx82akbssr7xf9br", - "depends": ["cli", "lifecycle", "mapdata", "maps", "RColorBrewer", "rlang", "sf", "stringi"] + "depends": ["RColorBrewer", "cli", "lifecycle", "mapdata", "maps", "rlang", "sf", "stringi"] }, "naive": { "name": "naive", "version": "1.2.3", "sha256": "0ha54lc6g6yvh5g3kw5hdp2l7y2xi85b3ills3w1x092gma1q2cy", - "depends": ["entropy", "fANCOVA", "fastDummies", "ggplot2", "greybox", "imputeTS", "lubridate", "modeest", "moments", "philentropy", "purrr", "readr", "Rfast", "scales", "tictoc"] + "depends": ["Rfast", "entropy", "fANCOVA", "fastDummies", "ggplot2", "greybox", "imputeTS", "lubridate", "modeest", "moments", "philentropy", "purrr", "readr", "scales", "tictoc"] }, "naivebayes": { "name": "naivebayes", @@ -86663,7 +87563,7 @@ "name": "namedropR", "version": "2.4.1", "sha256": "06lg381imi8xnm6jlsxfffjyhzban6z29zwkw8bamglnk0frvzza", - "depends": ["bib2df", "dplyr", "htmltools", "lubridate", "qrcode", "R_utils", "readr", "stringr", "webshot"] + "depends": ["R_utils", "bib2df", "dplyr", "htmltools", "lubridate", "qrcode", "readr", "stringr", "webshot"] }, "namer": { "name": "namer", @@ -86681,13 +87581,13 @@ "name": "nandb", "version": "2.1.0", "sha256": "1rbn4nibjzvwpccpmqn84w9a167f1avyl18kjlapy5dhafvixgbz", - "depends": ["assertthat", "autothresholdr", "BBmisc", "checkmate", "detrendr", "dplyr", "filesstrings", "ggplot2", "glue", "ijtiff", "magrittr", "purrr", "Rcpp", "reshape2", "rlang", "stringr", "viridis", "withr"] + "depends": ["BBmisc", "Rcpp", "assertthat", "autothresholdr", "checkmate", "detrendr", "dplyr", "filesstrings", "ggplot2", "glue", "ijtiff", "magrittr", "purrr", "reshape2", "rlang", "stringr", "viridis", "withr"] }, "naniar": { "name": "naniar", "version": "1.1.0", "sha256": "0i3gijr1l7hbcp75cyj26pxmm493lnvasl8aba9vv4w8lz1lck59", - "depends": ["cli", "dplyr", "forcats", "ggplot2", "glue", "lifecycle", "magrittr", "norm", "purrr", "rlang", "tibble", "tidyr", "UpSetR", "vctrs", "viridis", "visdat"] + "depends": ["UpSetR", "cli", "dplyr", "forcats", "ggplot2", "glue", "lifecycle", "magrittr", "norm", "purrr", "rlang", "tibble", "tidyr", "vctrs", "viridis", "visdat"] }, "nanoarrow": { "name": "nanoarrow", @@ -86697,14 +87597,14 @@ }, "nanonext": { "name": "nanonext", - "version": "1.1.0", - "sha256": "1j0xiww92kasy3ks3mrwxqk8gbfwqzyqnmanbcjswa4xiycqzsgv", - "depends": ["later"] + "version": "1.2.0", + "sha256": "1gqgrkl3px5s25qfqzd39x442nlls6s0hqwr5q6l92c95yfz14xx", + "depends": [] }, "nanoparquet": { "name": "nanoparquet", - "version": "0.3.0", - "sha256": "1q7msg1jc6mggggzm3sfcq7s6n8x0llmb7qbggqci4zai45dpj6b", + "version": "0.3.1", + "sha256": "179bl9pzhklnlp0mnid2166mswznh702rshbp2m6vaacr4ky4w9i", "depends": [] }, "nanostringr": { @@ -86715,9 +87615,9 @@ }, "nanotime": { "name": "nanotime", - "version": "0.3.7", - "sha256": "05fbdhbax6k1glidmgl0zjc7y7v1ppbpz4422q3jmxmfack7hwd7", - "depends": ["bit64", "Rcpp", "RcppCCTZ", "RcppDate", "zoo"] + "version": "0.3.9", + "sha256": "1n3rz8zvrq5kxkfiv4gc64lmn72fm2jjgb9f2j23my38zpnnaafc", + "depends": ["Rcpp", "RcppCCTZ", "RcppDate", "bit64", "zoo"] }, "naptanr": { "name": "naptanr", @@ -86735,13 +87635,13 @@ "name": "nardl", "version": "0.1.6", "sha256": "1vf8im4zs4j0v3k617aaskq9n2fg8sn3j5bllcbz2ircrpijr21m", - "depends": ["car", "Formula", "gtools", "MASS", "strucchange", "tseries"] + "depends": ["Formula", "MASS", "car", "gtools", "strucchange", "tseries"] }, "narray": { "name": "narray", "version": "0.5.1", "sha256": "0vpx1fl24ba1c5x3bw0n8bx5yp77gsqybaxgbq6mj6by29ggq73l", - "depends": ["progress", "Rcpp", "stringr"] + "depends": ["Rcpp", "progress", "stringr"] }, "naryn": { "name": "naryn", @@ -86767,11 +87667,17 @@ "sha256": "05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb", "depends": [] }, + "nascaR_data": { + "name": "nascaR.data", + "version": "1.0.0", + "sha256": "0hipjm9xxskmb8qvipvsiry5qmfpw7blnyip9ldx3xnjik7lx87c", + "depends": [] + }, "naspaclust": { "name": "naspaclust", "version": "0.2.1", "sha256": "1p4ilv2z5140h4kdix2w1v32vz1n8v33wq0fhc8n8mi7baknhd1i", - "depends": ["beepr", "rdist", "Rdpack", "stabledist"] + "depends": ["Rdpack", "beepr", "rdist", "stabledist"] }, "nat": { "name": "nat", @@ -86789,7 +87695,7 @@ "name": "nat.templatebrains", "version": "1.1", "sha256": "13fwh9lqd7yz3j8ndhx650a6mf5hn2f0w3lqfha24vb2zrv0crsg", - "depends": ["digest", "igraph", "memoise", "Morpho", "nat", "rappdirs", "rgl"] + "depends": ["Morpho", "digest", "igraph", "memoise", "nat", "rappdirs", "rgl"] }, "nat_utils": { "name": "nat.utils", @@ -86819,19 +87725,19 @@ "name": "natstrat", "version": "2.0.0", "sha256": "1i3qjd787clbafpkjd0mkp6i540061q9xl9kxlgh9f517ksg8zpz", - "depends": ["caret", "ggplot2", "plyr", "pps", "ramify", "Rglpk", "rlang", "sampling", "slam"] + "depends": ["Rglpk", "caret", "ggplot2", "plyr", "pps", "ramify", "rlang", "sampling", "slam"] }, "naturaList": { "name": "naturaList", "version": "0.5.2", "sha256": "0fh4cx7zh0kr0flvlfafxwxr9j74d9h74vpfa8mbn2ibgz63j65p", - "depends": ["dplyr", "fasterize", "htmltools", "leaflet", "leaflet_extras", "magrittr", "raster", "rlang", "sf", "shiny", "shinydashboard", "shinyWidgets", "sp", "stringi", "stringr", "tidytext", "tm", "vegan"] + "depends": ["dplyr", "fasterize", "htmltools", "leaflet", "leaflet_extras", "magrittr", "raster", "rlang", "sf", "shiny", "shinyWidgets", "shinydashboard", "sp", "stringi", "stringr", "tidytext", "tm", "vegan"] }, "natural": { "name": "natural", "version": "0.9.0", "sha256": "0zxwbf3gg2h0bhl2w0md3rd162vlsgg0dv3187hc0ax7333cc4cx", - "depends": ["glmnet", "Matrix"] + "depends": ["Matrix", "glmnet"] }, "naturalsort": { "name": "naturalsort", @@ -86843,7 +87749,7 @@ "name": "navigation", "version": "0.0.1", "sha256": "129f2snh2mjp9mcifcxzh37zjhny8wlqhq00225pakl79kfzyyim", - "depends": ["expm", "leaflet", "magrittr", "MASS", "pbmcapply", "plotly", "rbenchmark", "Rcpp", "RcppArmadillo", "simts"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "expm", "leaflet", "magrittr", "pbmcapply", "plotly", "rbenchmark", "simts"] }, "navigatr": { "name": "navigatr", @@ -86897,7 +87803,7 @@ "name": "nbfar", "version": "0.1", "sha256": "1gr9q83ff950x2lcyv9apsnjah4kpi8805mci9m0s3gvr7llpjq4", - "depends": ["glmnet", "magrittr", "MASS", "mpath", "Rcpp", "RcppArmadillo", "RcppParallel", "rrpack"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "RcppParallel", "glmnet", "magrittr", "mpath", "rrpack"] }, "nblR": { "name": "nblR", @@ -86921,7 +87827,7 @@ "name": "ncappc", "version": "0.3.0", "sha256": "0bf00iskrd3x43839bwn957mi3qvm2dhcmqa7hl1ib0gp2r1cnzx", - "depends": ["bookdown", "Cairo", "dplyr", "ggplot2", "gridExtra", "gtable", "knitr", "lazyeval", "magrittr", "PopED", "purrr", "readr", "reshape2", "rlang", "rmarkdown", "scales", "tibble", "tidyr", "xtable"] + "depends": ["Cairo", "PopED", "bookdown", "dplyr", "ggplot2", "gridExtra", "gtable", "knitr", "lazyeval", "magrittr", "purrr", "readr", "reshape2", "rlang", "rmarkdown", "scales", "tibble", "tidyr", "xtable"] }, "ncar": { "name": "ncar", @@ -86937,15 +87843,15 @@ }, "ncdf4": { "name": "ncdf4", - "version": "1.22", - "sha256": "040jpcgsb98s6knch0z3f3f5fpmlwks1grpvb9k8s02c9w0a5adr", + "version": "1.23", + "sha256": "12fsjjc769hw7fc08yglr3gaxp67s8qx1mbx91g61h4xyzlzw1cb", "depends": [] }, "ncdf4_helpers": { "name": "ncdf4.helpers", "version": "0.3-6", "sha256": "0qnm41rbxb6v7aqh1mdkjhcc2rhs4wg6wmrllldzd99mzz8slv1r", - "depends": ["abind", "ncdf4", "PCICt"] + "depends": ["PCICt", "abind", "ncdf4"] }, "ncdfCF": { "name": "ncdfCF", @@ -86957,7 +87863,7 @@ "name": "ncdfgeom", "version": "1.1.6", "sha256": "1scbcysklqi761xbjxkdb54m3k31hps58lyg2l01m9pk117ywkz5", - "depends": ["areal", "dplyr", "ncmeta", "RNetCDF", "sf", "stars"] + "depends": ["RNetCDF", "areal", "dplyr", "ncmeta", "sf", "stars"] }, "ncdump": { "name": "ncdump", @@ -86975,13 +87881,13 @@ "name": "ncmeta", "version": "0.4.0", "sha256": "1aamxs3yza1hsgvkp6740lv1dc21a87mzl06n6w3zxkjshri020w", - "depends": ["CFtime", "dplyr", "rlang", "RNetCDF", "tibble", "tidyr"] + "depends": ["CFtime", "RNetCDF", "dplyr", "rlang", "tibble", "tidyr"] }, "ncodeR": { "name": "ncodeR", "version": "0.2.0.1", "sha256": "1pxiqxhq2rxs8rxxhw1hbds7z2qkf7ws26a8wsbw815yn6jm10n8", - "depends": ["cli", "R6", "rhoR"] + "depends": ["R6", "cli", "rhoR"] }, "ncpen": { "name": "ncpen", @@ -86999,19 +87905,19 @@ "name": "nda", "version": "0.1.13", "sha256": "1v3nfjq0v0vjv3871qsx7sxl5b6p74187cvacj3jfjyxbzghb8pc", - "depends": ["energy", "igraph", "MASS", "Matrix", "ppcor", "psych", "visNetwork"] + "depends": ["MASS", "Matrix", "energy", "igraph", "ppcor", "psych", "visNetwork"] }, "ndi": { "name": "ndi", "version": "0.1.5", "sha256": "0gfjh6wsdcbjw6xyyr863gc7rxridm84d6x05b0yk105yxhi5vpk", - "depends": ["car", "dplyr", "MASS", "Matrix", "psych", "sf", "stringr", "tidycensus", "tidyr"] + "depends": ["MASS", "Matrix", "car", "dplyr", "psych", "sf", "stringr", "tidycensus", "tidyr"] }, "ndjson": { "name": "ndjson", "version": "0.9.0", "sha256": "18j5bibranvbv84hvbsg6glmvhfancdsf2w6j99n3nw53bcgb12d", - "depends": ["data_table", "Rcpp", "tibble"] + "depends": ["Rcpp", "data_table", "tibble"] }, "ndl": { "name": "ndl", @@ -87021,15 +87927,15 @@ }, "ndtv": { "name": "ndtv", - "version": "0.13.3", - "sha256": "05kaqd7p77rfls0s1gqv74j3svh5xdvqni0jin5vxl8y900yc56j", - "depends": ["animation", "base64", "jsonlite", "MASS", "network", "networkDynamic", "sna", "statnet_common"] + "version": "0.13.4", + "sha256": "0s7c5gskndqqy1m1n6a66dpr5krdk1prsgankgkwdbrpraqvi9cr", + "depends": ["MASS", "animation", "base64", "htmlwidgets", "jsonlite", "network", "networkDynamic", "scatterplot3d", "sna", "statnet_common", "tsna"] }, "nearfar": { "name": "nearfar", "version": "1.3", "sha256": "0lzh68dxp7v47j1kk32adcgj9wrvggc6ww9bjizh386y778x290s", - "depends": ["car", "GenSA", "MASS", "nbpMatching"] + "depends": ["GenSA", "MASS", "car", "nbpMatching"] }, "neat": { "name": "neat", @@ -87047,13 +87953,13 @@ "name": "neatRanges", "version": "0.1.4", "sha256": "0673lg8mihz8xwh12q12wfn19w8vvnjb7pnz4x3cn2xhkyzwhxq5", - "depends": ["data_table", "Rcpp"] + "depends": ["Rcpp", "data_table"] }, "neatStats": { "name": "neatStats", "version": "1.13.3", "sha256": "1fj042mwmmjza8giv0f2m7y11j8rnzrcmifyxrv4z9rfqddcvh2s", - "depends": ["BayesFactor", "bayestestR", "car", "data_table", "Exact", "ez", "fBasics", "ggplot2", "ggpubr", "logspline", "MBESS", "pROC", "viridis"] + "depends": ["BayesFactor", "Exact", "MBESS", "bayestestR", "car", "data_table", "ez", "fBasics", "ggplot2", "ggpubr", "logspline", "pROC", "viridis"] }, "neatmaps": { "name": "neatmaps", @@ -87065,13 +87971,13 @@ "name": "nebula", "version": "1.5.3", "sha256": "1al5cw4s2gsjfmrq0pgzz2y3xnvmibma01q8k6923k2wfwgnlkkn", - "depends": ["doFuture", "doRNG", "foreach", "future", "Matrix", "nloptr", "parallelly", "Rcpp", "RcppEigen", "Rfast", "Seurat", "SingleCellExperiment", "trust"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "Rfast", "Seurat", "SingleCellExperiment", "doFuture", "doRNG", "foreach", "future", "nloptr", "parallelly", "trust"] }, "needmining": { "name": "needmining", "version": "0.1.1", "sha256": "0qsj0ihjchrnl4s44rpsizbcz033z00dmzvic2y1msv0bnfawl6p", - "depends": ["randomForest", "rtweet", "SnowballC", "SparseM", "stringr", "tau", "tm"] + "depends": ["SnowballC", "SparseM", "randomForest", "rtweet", "stringr", "tau", "tm"] }, "needs": { "name": "needs", @@ -87089,7 +87995,7 @@ "name": "negligible", "version": "0.1.8", "sha256": "0ammn1zfzy2q4vd20bj40ix58lz5rkjl7csyp98hq6mq2h091gmv", - "depends": ["DescTools", "dplyr", "e1071", "ez", "fungible", "ggplot2", "lavaan", "MBESS", "nptest", "rockchalk", "WRS2"] + "depends": ["DescTools", "MBESS", "WRS2", "dplyr", "e1071", "ez", "fungible", "ggplot2", "lavaan", "nptest", "rockchalk"] }, "neighbours": { "name": "neighbours", @@ -87131,13 +88037,19 @@ "name": "neo4jshell", "version": "0.1.2", "sha256": "0dkdg8ljyv7pi6zkpsq5akkl35vrhkr78xvc2ky99gwjsr0z77hf", - "depends": ["fs", "magrittr", "R_utils", "ssh", "sys"] + "depends": ["R_utils", "fs", "magrittr", "ssh", "sys"] }, "neo4r": { "name": "neo4r", "version": "0.1.1", "sha256": "0s4rjhn2mc8ca4p8p474a83dc277vrf7l968xwxkiac0d4fgbra7", - "depends": ["attempt", "data_table", "glue", "httr", "igraph", "jsonlite", "magrittr", "purrr", "R6", "rlang", "rstudioapi", "shiny", "tibble", "tidyr", "tidyselect"] + "depends": ["R6", "attempt", "data_table", "glue", "httr", "igraph", "jsonlite", "magrittr", "purrr", "rlang", "rstudioapi", "shiny", "tibble", "tidyr", "tidyselect"] + }, + "neodistr": { + "name": "neodistr", + "version": "0.1.1", + "sha256": "1g27z8qnk98fgblpprvb55lfly79dcfa9kcfz7rhx1hnarbzf85p", + "depends": ["Rmpfr", "brms", "ggplot2", "plotly", "rstan", "shiny", "shinythemes"] }, "neojags": { "name": "neojags", @@ -87167,13 +88079,19 @@ "name": "neonUtilities", "version": "2.4.2", "sha256": "0mx0pj6zxi0kqn2bqhyrn4bwg9jl151lv3fhk7llswivxp8fzd1p", - "depends": ["curl", "data_table", "downloader", "httr", "jsonlite", "pbapply", "R_utils", "stringr", "tidyr"] + "depends": ["R_utils", "curl", "data_table", "downloader", "httr", "jsonlite", "pbapply", "stringr", "tidyr"] }, "neonstore": { "name": "neonstore", "version": "0.5.1", "sha256": "16xbvqk02ihqv2lilgsmp777v93m2m6px9wcmpg8lm8xhrbyj4gr", - "depends": ["cachem", "DBI", "duckdb", "duckdbfs", "glue", "httr", "memoise", "progress", "R_utils", "thor", "vroom", "zip"] + "depends": ["DBI", "R_utils", "cachem", "duckdb", "duckdbfs", "glue", "httr", "memoise", "progress", "thor", "vroom", "zip"] + }, + "neotoma2": { + "name": "neotoma2", + "version": "1.0.4", + "sha256": "0dhbb7hhbw508mc4zwa2hr5kx5gaz4fj2vp2mrgjqww3dr55c1kp", + "depends": ["assertthat", "dplyr", "geojsonsf", "gtools", "httr", "jsonlite", "leaflet", "lubridate", "magrittr", "progress", "purrr", "rlang", "sf", "stringr", "tidyr", "uuid", "wk"] }, "nephro": { "name": "nephro", @@ -87207,9 +88125,9 @@ }, "nestedcv": { "name": "nestedcv", - "version": "0.7.8", - "sha256": "1pdky7kzqs1rhl0f4hba3sggifplfgbp339imxym4dvvdb81b589", - "depends": ["caret", "data_table", "doParallel", "foreach", "ggplot2", "glmnet", "matrixStats", "matrixTests", "pROC", "Rfast", "RhpcBLASctl", "rlang", "ROCR"] + "version": "0.7.10", + "sha256": "1cfxw9pblrn2f0bw448sxdnj7pb04l1pkfdajzcmg9yn95k1v95b", + "depends": ["ROCR", "Rfast", "RhpcBLASctl", "caret", "data_table", "doParallel", "foreach", "ggplot2", "glmnet", "matrixStats", "matrixTests", "pROC", "rlang"] }, "nestedmodels": { "name": "nestedmodels", @@ -87239,7 +88157,7 @@ "name": "net4pg", "version": "0.1.1", "sha256": "1a00bqskgl053wcwgmg7xsccybrq76bqaipdnf5zbm1dslir0jdv", - "depends": ["data_table", "graph", "magrittr", "Matrix"] + "depends": ["Matrix", "data_table", "graph", "magrittr"] }, "netClust": { "name": "netClust", @@ -87251,25 +88169,25 @@ "name": "netCoin", "version": "2.0.48", "sha256": "03rmi75rjjy03jy0cv6qzz46q06027zvbwy4vp13748vq49aql1s", - "depends": ["GPArotation", "haven", "igraph", "MASS", "Matrix", "rD3plot"] + "depends": ["GPArotation", "MASS", "Matrix", "haven", "igraph", "rD3plot"] }, "netSEM": { "name": "netSEM", "version": "0.6.2", "sha256": "1znb3r8jc1ms4ajzb3ryr89wjx6f3rw1f410msh46d5h08wsjn9n", - "depends": ["DiagrammeR", "DiagrammeRsvg", "gtools", "htmlwidgets", "knitr", "magrittr", "MASS", "png", "rsvg", "segmented", "svglite"] + "depends": ["DiagrammeR", "DiagrammeRsvg", "MASS", "gtools", "htmlwidgets", "knitr", "magrittr", "png", "rsvg", "segmented", "svglite"] }, "netShiny": { "name": "netShiny", "version": "1.0", "sha256": "1k6dmhkjf29ww31c15jms0yxwyiqq1z7a9115zwbg620cjd3m6fm", - "depends": ["colourpicker", "DT", "future", "future_callr", "ggplot2", "ggVennDiagram", "igraph", "ipc", "magrittr", "Matrix", "netgwas", "plotly", "promises", "readxl", "shiny", "shinyBS", "shinycssloaders", "shinydashboard", "shinyjs", "shinyscreenshot", "shinyWidgets", "visNetwork"] + "depends": ["DT", "Matrix", "colourpicker", "future", "future_callr", "ggVennDiagram", "ggplot2", "igraph", "ipc", "magrittr", "netgwas", "plotly", "promises", "readxl", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyjs", "shinyscreenshot", "visNetwork"] }, "netUtils": { "name": "netUtils", "version": "0.8.2", "sha256": "0laha093wxkvs06wh2hsmyxypn89n7vlh183zw6k26d67vl15a6j", - "depends": ["igraph", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "igraph"] }, "netassoc": { "name": "netassoc", @@ -87281,43 +88199,37 @@ "name": "netcmc", "version": "1.0.2", "sha256": "0w5xnnfglg0nm59wwqh2dpwkz0zlly3r2997wncf5whz5j4vcy88", - "depends": ["coda", "ggplot2", "MASS", "MCMCpack", "mvtnorm", "Rcpp", "RcppArmadillo", "RcppProgress"] + "depends": ["MASS", "MCMCpack", "Rcpp", "RcppArmadillo", "RcppProgress", "coda", "ggplot2", "mvtnorm"] }, "netcom": { "name": "netcom", "version": "2.1.7", "sha256": "1zbpr0bm9g0890isd4x6gfpk6lg5z823q5lym6mhww9gk7b4xl9q", - "depends": ["clue", "doParallel", "dplyr", "expm", "foreach", "GenSA", "ggfortify", "ggplot2", "ggraph", "igraph", "magrittr", "Matrix", "optimx", "pdist", "pracma", "reshape2", "rlang", "tibble", "vegan"] + "depends": ["GenSA", "Matrix", "clue", "doParallel", "dplyr", "expm", "foreach", "ggfortify", "ggplot2", "ggraph", "igraph", "magrittr", "optimx", "pdist", "pracma", "reshape2", "rlang", "tibble", "vegan"] }, "netcontrol": { "name": "netcontrol", "version": "0.1", "sha256": "1gskb728ycnhz9a9g9ghm0dz3ajf3dzgyv23bsk9i01wj9hrxhc0", - "depends": ["expm", "MASS", "Matrix", "pracma", "Rcpp", "RcppArmadillo", "Rdpack"] - }, - "netcox": { - "name": "netcox", - "version": "1.0.1", - "sha256": "04biaynmvqrilp0kdxw55b990j7iqnvn8gr07dhzm9f7r9sr7xk6", - "depends": ["glmnet", "Rcpp", "survival"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "Rdpack", "expm", "pracma"] }, "netdiffuseR": { "name": "netdiffuseR", "version": "1.22.6", "sha256": "0f4d0x03970iqxkbr0r9jm8gf28r79rimfnfr1djcajzihxaj7l6", - "depends": ["boot", "igraph", "MASS", "MatchIt", "Matrix", "network", "networkDynamic", "Rcpp", "RcppArmadillo", "sna", "SparseM", "viridisLite"] + "depends": ["MASS", "MatchIt", "Matrix", "Rcpp", "RcppArmadillo", "SparseM", "boot", "igraph", "network", "networkDynamic", "sna", "viridisLite"] }, "netgsa": { "name": "netgsa", "version": "4.0.5", "sha256": "1m9myxsbvbljr038azxzakpbh20a21qhiy20d0ipvjc5asq3kfla", - "depends": ["AnnotationDbi", "corpcor", "data_table", "dplyr", "genefilter", "glassoFast", "glmnet", "graph", "graphite", "httr", "igraph", "magrittr", "Matrix", "msigdbr", "org_Hs_eg_db", "quadprog", "Rcpp", "RcppEigen", "RCy3", "reshape2", "rlang"] + "depends": ["AnnotationDbi", "Matrix", "RCy3", "Rcpp", "RcppEigen", "corpcor", "data_table", "dplyr", "genefilter", "glassoFast", "glmnet", "graph", "graphite", "httr", "igraph", "magrittr", "msigdbr", "org_Hs_eg_db", "quadprog", "reshape2", "rlang"] }, "netgwas": { "name": "netgwas", "version": "1.14.3", "sha256": "1id90w27h6z458ibkndnp7hp6wx0yffq9ywj4b2lkf5g4nwcwz23", - "depends": ["glasso", "huge", "igraph", "MASS", "Matrix", "qtl", "tmvtnorm"] + "depends": ["MASS", "Matrix", "glasso", "huge", "igraph", "qtl", "tmvtnorm"] }, "netie": { "name": "netie", @@ -87333,15 +88245,15 @@ }, "netmediate": { "name": "netmediate", - "version": "0.1.4", - "sha256": "17h2nc9ixfi7ngybinnpm05s41iiwncz53jj90kbvp55qk1a3s2k", - "depends": ["btergm", "ergm", "ergMargins", "gam", "intergraph", "lme4", "MASS", "network", "plm", "plyr", "RSiena", "sna", "VGAM"] + "version": "1.0.1", + "sha256": "1ja5kgnnk6y6c8wav4h29jahpx5p7bsy36qccy2fmn7i5xn7hs7k", + "depends": ["MASS", "RSiena", "VGAM", "btergm", "ergMargins", "ergm", "gam", "intergraph", "lme4", "network", "plm", "plyr", "sna"] }, "netmeta": { "name": "netmeta", "version": "2.9-0", "sha256": "1d7grw2dp4ghh5aapnd1j1w84nixm0vgaca0pchjwjjmg7rdgvad", - "depends": ["ggplot2", "magic", "MASS", "meta", "metafor"] + "depends": ["MASS", "ggplot2", "magic", "meta", "metafor"] }, "netmhc2pan": { "name": "netmhc2pan", @@ -87351,15 +88263,15 @@ }, "netplot": { "name": "netplot", - "version": "0.2-0", - "sha256": "0l4sy8wn2fd04fpkrh853r923dajpqldc78ws4kmh6ixn1l43c21", + "version": "0.3-0", + "sha256": "0bka77jls97xlwmcmzg0rw3y5r9ff6g4ag082vwjc3yrh0nmm29c", "depends": ["igraph", "network", "sna"] }, "netrankr": { "name": "netrankr", "version": "1.2.3", "sha256": "0amvdgj0n32c9f46k0yqkahq2dzicc0522ivh76740l9n1hzbm4v", - "depends": ["igraph", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "igraph"] }, "netregR": { "name": "netregR", @@ -87383,7 +88295,7 @@ "name": "netseer", "version": "0.1.0", "sha256": "0bqwiv7n396myk73rqycx1d4i0nak9gsrda5pxqzr0j82k62vkqx", - "depends": ["dplyr", "fable", "fabletools", "igraph", "lpSolve", "Matrix", "rlang", "tibble", "tidyr", "tsibble"] + "depends": ["Matrix", "dplyr", "fable", "fabletools", "igraph", "lpSolve", "rlang", "tibble", "tidyr", "tsibble"] }, "netseg": { "name": "netseg", @@ -87401,7 +88313,7 @@ "name": "nett", "version": "1.0.0", "sha256": "1prb1zskhc50jzqmh1cdk4lljr4xqp4aaaaw1r66hmpy0d9ghhph", - "depends": ["foreach", "magrittr", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "foreach", "magrittr"] }, "nettskjemar": { "name": "nettskjemar", @@ -87419,7 +88331,7 @@ "name": "networkABC", "version": "0.8-1", "sha256": "0754770z3db7faadh8bxk0h70frjk6v8zjklkhclxnach1vag2k6", - "depends": ["network", "RColorBrewer", "sna"] + "depends": ["RColorBrewer", "network", "sna"] }, "networkD3": { "name": "networkD3", @@ -87455,25 +88367,25 @@ "name": "networkR", "version": "0.1.2", "sha256": "07dq3syk0hr1kc2mqd70g0ih09hamd7rxxms60dyvnpm8978c1wz", - "depends": ["data_table", "fastmatch", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "data_table", "fastmatch"] }, "networkscaleup": { "name": "networkscaleup", "version": "0.1-2", "sha256": "0fvh65750iq2wsjypr35axfdb85ncflc0nmmzl7n5jcyqkfgl5j0", - "depends": ["BH", "LaplacesDemon", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "LaplacesDemon", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools"] }, "networktools": { "name": "networktools", "version": "1.5.2", "sha256": "0w2q5ncni5nv7lg9vm3bpxj64pg0f6w0rxknli0dy1q0asq4aw47", - "depends": ["cocor", "eigenmodel", "ggplot2", "gridExtra", "igraph", "psych", "qgraph", "R_utils", "RColorBrewer", "reshape2", "smacof", "wordcloud"] + "depends": ["RColorBrewer", "R_utils", "cocor", "eigenmodel", "ggplot2", "gridExtra", "igraph", "psych", "qgraph", "reshape2", "smacof", "wordcloud"] }, "networktree": { "name": "networktree", "version": "1.0.1", "sha256": "0hkrqpx7b6sxalw1qyrncck70mx6p5gr57mf558l5mlqi52v7hg0", - "depends": ["Formula", "gridBase", "Matrix", "mvtnorm", "partykit", "qgraph", "reshape2"] + "depends": ["Formula", "Matrix", "gridBase", "mvtnorm", "partykit", "qgraph", "reshape2"] }, "neuRosim": { "name": "neuRosim", @@ -87497,7 +88409,7 @@ "name": "neurobase", "version": "1.32.4", "sha256": "0jgf7zv4j2r09is0r8fkizgy0mz3c0iyldhw8f1fgys4gwzia7cc", - "depends": ["abind", "matrixStats", "oro_nifti", "R_utils", "RNifti"] + "depends": ["RNifti", "R_utils", "abind", "matrixStats", "oro_nifti"] }, "neuroblastoma": { "name": "neuroblastoma", @@ -87521,7 +88433,13 @@ "name": "neuroim", "version": "0.0.6", "sha256": "00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p", - "depends": ["abind", "assertthat", "hash", "iterators", "Matrix", "Rcpp", "readr", "rgl", "stringr", "yaImpute"] + "depends": ["Matrix", "Rcpp", "abind", "assertthat", "hash", "iterators", "readr", "rgl", "stringr", "yaImpute"] + }, + "neuroimaGene": { + "name": "neuroimaGene", + "version": "0.1.0", + "sha256": "1axdb20zv7y1rkazm6ppmkf09czff2bp2ylcl1ahn5sw5fi7adcc", + "depends": ["DBI", "RSQLite", "data_table", "ggplot2", "ggseg", "stringr"] }, "neuromplex": { "name": "neuromplex", @@ -87545,7 +88463,7 @@ "name": "nevada", "version": "0.2.0", "sha256": "0ba5wbjsgd77f20flp9zqiasmypbxsmqg2yfw0qqwzjrkp3rvfqi", - "depends": ["cli", "dplyr", "flipr", "forcats", "furrr", "ggplot2", "igraph", "magrittr", "purrr", "Rcpp", "RcppArmadillo", "rgeomstats", "rlang", "tibble", "tidyr", "tsne", "umap", "withr"] + "depends": ["Rcpp", "RcppArmadillo", "cli", "dplyr", "flipr", "forcats", "furrr", "ggplot2", "igraph", "magrittr", "purrr", "rgeomstats", "rlang", "tibble", "tidyr", "tsne", "umap", "withr"] }, "neverhpfilter": { "name": "neverhpfilter", @@ -87557,7 +88475,7 @@ "name": "new.dist", "version": "0.1.1", "sha256": "1zkmwqhamrw7g4d1hffsyhcsjf0z0nmmgnixc7wny0qqpmyqlb2n", - "depends": ["expint", "pracma", "VGAM"] + "depends": ["VGAM", "expint", "pracma"] }, "newFocus": { "name": "newFocus", @@ -87569,7 +88487,7 @@ "name": "newIMVC", "version": "0.1.0", "sha256": "1zxdrrc4w93a3r2zibip7s8h75mjf0ir3wpy310s83cas2nywqvx", - "depends": ["CompQuadForm", "expm", "GGMridge", "limma", "quantreg"] + "depends": ["CompQuadForm", "GGMridge", "expm", "limma", "quantreg"] }, "newTestSurvRec": { "name": "newTestSurvRec", @@ -87603,15 +88521,15 @@ }, "nextGenShinyApps": { "name": "nextGenShinyApps", - "version": "2.0", - "sha256": "0994y5qnhxp23c6m08mgr9pp44jcm277qwxzq4fnsdy0gndcjrcw", + "version": "2.1", + "sha256": "1q10qpqwxddq7qi7wjczny3hfkrf0vxvmkb9wxxvsk6k9pn6p5mx", "depends": ["htmltools", "quickcode", "shiny"] }, "nexus": { "name": "nexus", "version": "0.2.0", "sha256": "0dyhgd18kz7yfdziycxkmqb58zx99fr99wxp3dfjfxip537sx1sn", - "depends": ["arkhe", "dimensio", "isopleuros", "MASS"] + "depends": ["MASS", "arkhe", "dimensio", "isopleuros"] }, "nfer": { "name": "nfer", @@ -87639,8 +88557,8 @@ }, "nflreadr": { "name": "nflreadr", - "version": "1.4.0", - "sha256": "1437nzvqj0w5p3wxb0zfwjkn34ssd4q9zbsw0lmrbs0afifaf6dd", + "version": "1.4.1", + "sha256": "0c5vbyh56m8mqlwriw0fzcv1bankg4hb81j98j1wsdg886wiab1m", "depends": ["cachem", "cli", "curl", "data_table", "glue", "memoise", "rappdirs", "rlang"] }, "nflseedR": { @@ -87659,13 +88577,13 @@ "name": "nftbart", "version": "2.1", "sha256": "1vxmjk5bbxyqmrb3mndafcnpx9n8q9rlxm3d1i6fncs78mqqjsnm", - "depends": ["nnet", "Rcpp", "survival"] + "depends": ["Rcpp", "nnet", "survival"] }, "ngboostForecast": { "name": "ngboostForecast", "version": "0.1.1", "sha256": "019l9w7m6lkbf0m9mlsd24agjasbzi7dmy72faq1s4xg49a5xa9a", - "depends": ["dplyr", "forecast", "magrittr", "R6", "reticulate"] + "depends": ["R6", "dplyr", "forecast", "magrittr", "reticulate"] }, "ngram": { "name": "ngram", @@ -87689,7 +88607,7 @@ "name": "ngspatial", "version": "1.2-2", "sha256": "09hdvmbna4m62zv18k5kj9718wzw7p43wnal2j6aa0m5sd2rx9rz", - "depends": ["batchmeans", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "batchmeans"] }, "nhanesA": { "name": "nhanesA", @@ -87707,7 +88625,7 @@ "name": "nhdplusTools", "version": "1.2.1", "sha256": "13jms0cfccydcc5jz2mv6ych8zwsvxf2g6qzspa9vqxyjdq1wzqn", - "depends": ["arrow", "dataRetrieval", "digest", "dplyr", "fst", "httr", "hydroloom", "jsonlite", "magrittr", "mapsf", "maptiles", "memoise", "pbapply", "R_utils", "sf", "tidyr", "units", "xml2", "zip"] + "depends": ["R_utils", "arrow", "dataRetrieval", "digest", "dplyr", "fst", "httr", "hydroloom", "jsonlite", "magrittr", "mapsf", "maptiles", "memoise", "pbapply", "sf", "tidyr", "units", "xml2", "zip"] }, "nhlapi": { "name": "nhlapi", @@ -87725,7 +88643,7 @@ "name": "nhppp", "version": "0.1.4", "sha256": "0822xcv2yq6f12naphh6d29q0215nwamf342fji6nffj6flfhh8d", - "depends": ["lifecycle", "Rcpp", "rstream"] + "depends": ["Rcpp", "lifecycle", "rstream"] }, "nhs_predict": { "name": "nhs.predict", @@ -87799,6 +88717,12 @@ "sha256": "03p0gn6id5bkn0qxf7v3splykpi9wpbasrhf2937gp25bsynrpjm", "depends": [] }, + "nifti_pbcor": { + "name": "nifti.pbcor", + "version": "1.0", + "sha256": "1wlqyxflf7nibx5kik359vn37rf46liklpjmb7sd0972i1dpiaqi", + "depends": [] + }, "nilde": { "name": "nilde", "version": "1.1-7", @@ -87813,9 +88737,9 @@ }, "nimble": { "name": "nimble", - "version": "1.2.0", - "sha256": "16mq49fynkq3ki7g4dv5cxc493gi1sh728jaslzxzh1124n645f4", - "depends": ["coda", "igraph", "numDeriv", "pracma", "R6"] + "version": "1.2.1", + "sha256": "11r5h2v8q4n50i843va2lm5is8cfq5268dyvhkp56xav7vkp319f", + "depends": ["R6", "coda", "igraph", "numDeriv", "pracma"] }, "nimbleAPT": { "name": "nimbleAPT", @@ -87831,14 +88755,14 @@ }, "nimbleEcology": { "name": "nimbleEcology", - "version": "0.4.1", - "sha256": "1z4byxsana1fa2y7qhmiqbb8ana6zbas0cmbgcc703mqh1642jb2", + "version": "0.5.0", + "sha256": "0xnrbkd7q4r6q33vl03i5jzangq05w4q24wrc32f5njlsk10qdbc", "depends": ["nimble"] }, "nimbleHMC": { "name": "nimbleHMC", - "version": "0.2.1", - "sha256": "1id9pqs1phc2vf8mwz2gdgirhmki4shw8h77828nbj10b3zik3zj", + "version": "0.2.2", + "sha256": "0xy8rhpskfb41pa2gsx2qy1bza3rqh5ihiaipc8xpsd2d22c1xnc", "depends": ["nimble"] }, "nimbleNoBounds": { @@ -87917,7 +88841,7 @@ "name": "nlcv", "version": "0.3.5", "sha256": "1ywnm8a13ifqa1bxnf659h1j6mg9iy02vaszyh9p966ps9c1pjab", - "depends": ["a4Core", "Biobase", "e1071", "ipred", "kernlab", "limma", "MASS", "MLInterfaces", "multtest", "pamr", "randomForest", "RColorBrewer", "ROCR", "xtable"] + "depends": ["Biobase", "MASS", "MLInterfaces", "RColorBrewer", "ROCR", "a4Core", "e1071", "ipred", "kernlab", "limma", "multtest", "pamr", "randomForest", "xtable"] }, "nleqslv": { "name": "nleqslv", @@ -87929,7 +88853,7 @@ "name": "nlgm", "version": "1.0", "sha256": "03byqqj8ayq7hbaab4cfrk0nbxmiiq2c2i98szfydzkimhrw922a", - "depends": ["ggplot2", "Rfast", "Rfast2"] + "depends": ["Rfast", "Rfast2", "ggplot2"] }, "nlist": { "name": "nlist", @@ -87941,12 +88865,12 @@ "name": "nlive", "version": "0.6.0", "sha256": "07an5ds2v7hv15062dcbggdl04b2jqx7mil8a50n6jzdr2x0rb54", - "depends": ["dplyr", "fastDummies", "ggplot2", "knitr", "lcmm", "nlraa", "Rmisc", "saemix", "sitar", "sqldf"] + "depends": ["Rmisc", "dplyr", "fastDummies", "ggplot2", "knitr", "lcmm", "nlraa", "saemix", "sitar", "sqldf"] }, "nlme": { "name": "nlme", - "version": "3.1-165", - "sha256": "16clxh0b8sr2k3vddfip3awimn17ffkd5kwgygi8n4y2jfjbndzw", + "version": "3.1-166", + "sha256": "0qlpj3hjnlvd7x3ayjhvvpxlc2z4bfwk9qpglw8mnxbqipp18yi3", "depends": ["lattice"] }, "nlmeU": { @@ -87959,7 +88883,7 @@ "name": "nlmeVPC", "version": "2.6", "sha256": "0ymiif377c6rjplzvs3s4bgc62ymw2l3cigx8rh779blb0w90qf8", - "depends": ["ggplot2", "Hmisc", "optimx", "quantreg", "Rcpp", "RcppArmadillo", "timeDate"] + "depends": ["Hmisc", "Rcpp", "RcppArmadillo", "ggplot2", "optimx", "quantreg", "timeDate"] }, "nlmixr2": { "name": "nlmixr2", @@ -87977,13 +88901,13 @@ "name": "nlmixr2est", "version": "2.2.2", "sha256": "1g25cqh3yybq9lxbxma3fd11jw1wgpnadxjx78sqqbzwx54xiawf", - "depends": ["backports", "BH", "checkmate", "cli", "knitr", "lbfgsb3c", "lotri", "magrittr", "Matrix", "minqa", "n1qn1", "nlme", "nlmixr2data", "Rcpp", "RcppArmadillo", "rex", "rxode2", "rxode2parse", "rxode2random", "symengine"] + "depends": ["BH", "Matrix", "Rcpp", "RcppArmadillo", "backports", "checkmate", "cli", "knitr", "lbfgsb3c", "lotri", "magrittr", "minqa", "n1qn1", "nlme", "nlmixr2data", "rex", "rxode2", "rxode2parse", "rxode2random", "symengine"] }, "nlmixr2extra": { "name": "nlmixr2extra", "version": "2.0.10", "sha256": "03k8f6v6qqgbl8ngga0n6xyx2kz98xfv6kvi7rad9n90fpdqiaxl", - "depends": ["checkmate", "cli", "crayon", "data_table", "digest", "ggplot2", "ggtext", "knitr", "lotri", "nlme", "nlmixr2est", "Rcpp", "RcppArmadillo", "rxode2", "symengine"] + "depends": ["Rcpp", "RcppArmadillo", "checkmate", "cli", "crayon", "data_table", "digest", "ggplot2", "ggtext", "knitr", "lotri", "nlme", "nlmixr2est", "rxode2", "symengine"] }, "nlmixr2lib": { "name": "nlmixr2lib", @@ -88007,7 +88931,7 @@ "name": "nlmm", "version": "1.1.0", "sha256": "0mi9nsdzsvaxfb3n3z3rijd8saw4l7x3g2gq8ivzxyilyav5anxb", - "depends": ["BH", "gsl", "lqmm", "MASS", "Matrix", "mvtnorm", "nlme", "numDeriv", "Qtools", "Rcpp", "RcppArmadillo", "statmod"] + "depends": ["BH", "MASS", "Matrix", "Qtools", "Rcpp", "RcppArmadillo", "gsl", "lqmm", "mvtnorm", "nlme", "numDeriv", "statmod"] }, "nlmrt": { "name": "nlmrt", @@ -88019,7 +88943,7 @@ "name": "nlnet", "version": "1.4", "sha256": "13lv4b6chsjrhimny3wc1y9ljgbxmm1byj4j04n4vj8icn87gyfd", - "depends": ["coin", "e1071", "earth", "fdrtool", "igraph", "randomForest", "ROCR", "TSP"] + "depends": ["ROCR", "TSP", "coin", "e1071", "earth", "fdrtool", "igraph", "randomForest"] }, "nlopt": { "name": "nlopt", @@ -88029,27 +88953,27 @@ }, "nloptr": { "name": "nloptr", - "version": "2.0.3", - "sha256": "1mqnjswm0dl6vqc8b2s5k3n1mhanaha3l33vh68dh6zx8q9aq9kv", - "depends": ["testthat"] + "version": "2.1.1", + "sha256": "1snqvav2pxjhssn1nld49mjj89cn2zv7gjn2y8ch22gbzmfzbnjc", + "depends": [] }, "nlpred": { "name": "nlpred", "version": "1.0.1", "sha256": "05jna8hzd5v36a0dwag6zr8ms1pkryas3qarwb946bkxlslffp27", - "depends": ["assertthat", "bde", "cvAUC", "data_table", "np", "Rdpack", "ROCR", "SuperLearner"] + "depends": ["ROCR", "Rdpack", "SuperLearner", "assertthat", "bde", "cvAUC", "data_table", "np"] }, "nlpsem": { "name": "nlpsem", "version": "0.3", "sha256": "0i6skpmnbi99dkcdam61rq5rfk6wv41q0r1q357qm66wbqyj30fr", - "depends": ["dplyr", "ggplot2", "Matrix", "nnet", "OpenMx", "readr", "stringr", "tidyr"] + "depends": ["Matrix", "OpenMx", "dplyr", "ggplot2", "nnet", "readr", "stringr", "tidyr"] }, "nlraa": { "name": "nlraa", "version": "1.9.7", "sha256": "0xl2vinwj6pclmq1lcyibff0fwr3jnmi96ddgj42vvki19n9c84c", - "depends": ["boot", "knitr", "MASS", "Matrix", "mgcv", "nlme"] + "depends": ["MASS", "Matrix", "boot", "knitr", "mgcv", "nlme"] }, "nlreg": { "name": "nlreg", @@ -88067,7 +88991,7 @@ "name": "nlrx", "version": "0.4.5", "sha256": "046ivv90h0dsk5g2l7mal1cf64ff2y3wmc9h5ql3hffziqs0hd27", - "depends": ["crayon", "dplyr", "EasyABC", "furrr", "genalg", "GenSA", "igraph", "lhs", "magrittr", "progressr", "purrr", "raster", "readr", "rstudioapi", "sensitivity", "sf", "stringr", "tibble", "tidyr", "XML"] + "depends": ["EasyABC", "GenSA", "XML", "crayon", "dplyr", "furrr", "genalg", "igraph", "lhs", "magrittr", "progressr", "purrr", "raster", "readr", "rstudioapi", "sensitivity", "sf", "stringr", "tibble", "tidyr"] }, "nls_multstart": { "name": "nls.multstart", @@ -88077,8 +89001,8 @@ }, "nls2": { "name": "nls2", - "version": "0.3-3", - "sha256": "05miqxfpg29jpf1p3bi347w5565bd3cih8dpvnc3p0i0hcbzmlkl", + "version": "0.3-4", + "sha256": "15wj76sa292i33275g7a32m5kamawx6zjrdmnbpac2mm2byzg9n8", "depends": ["proto"] }, "nlsMicrobio": { @@ -88133,7 +89057,7 @@ "name": "nlt", "version": "2.2-1", "sha256": "10wf00qzf28dxjfvv12wsqxlfn6xz15wk8njrzgsgm9px1g6s21f", - "depends": ["adlift", "EbayesThresh"] + "depends": ["EbayesThresh", "adlift"] }, "nltm": { "name": "nltm", @@ -88157,7 +89081,7 @@ "name": "nmadb", "version": "1.2.0", "sha256": "17r5vc57ilhy6cfcqpfyp9nzzjaa5gc8qkgfn3y8sppqh1g1mi40", - "depends": ["devtools", "jsonlite", "RCurl", "readxl"] + "depends": ["RCurl", "devtools", "jsonlite", "readxl"] }, "nmaplateplot": { "name": "nmaplateplot", @@ -88169,13 +89093,13 @@ "name": "nmarank", "version": "0.3-0", "sha256": "1i2vagjq96q2vhr2lxbm3hqspddfq9qkqjcr8smni6ikmw32akil", - "depends": ["data_tree", "dplyr", "MASS", "meta", "mvtnorm", "netmeta", "rlang", "tibble", "tidyr"] + "depends": ["MASS", "data_tree", "dplyr", "meta", "mvtnorm", "netmeta", "rlang", "tibble", "tidyr"] }, "nmathresh": { "name": "nmathresh", "version": "0.1.6", "sha256": "1jrf7k7an5y867k40aj28ib7vrjyqky2cslwzmfx28snp8ns1vd3", - "depends": ["ggplot2", "gridExtra", "gtable", "Matrix", "nnls"] + "depends": ["Matrix", "ggplot2", "gridExtra", "gtable", "nnls"] }, "nmfbin": { "name": "nmfbin", @@ -88199,7 +89123,7 @@ "name": "nmslibR", "version": "1.0.7", "sha256": "0658j1rir16s84aw7xw698pr8j2xp7j70rd306w04f3dxynsrrqm", - "depends": ["KernelKnn", "lifecycle", "Matrix", "R6", "Rcpp", "RcppArmadillo", "reticulate"] + "depends": ["KernelKnn", "Matrix", "R6", "Rcpp", "RcppArmadillo", "lifecycle", "reticulate"] }, "nmw": { "name": "nmw", @@ -88211,7 +89135,7 @@ "name": "nn2poly", "version": "0.1.1", "sha256": "03p3asvx1913lkmi6f1bq71wxm83qc0lbniv4s9s9fcv13md3xml", - "depends": ["generics", "matrixStats", "pracma", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "generics", "matrixStats", "pracma"] }, "nnGarrote": { "name": "nnGarrote", @@ -88229,7 +89153,7 @@ "name": "nnTensor", "version": "1.3.0", "sha256": "1kkv3788qh3ls49d2ixvpyky96qz0qij8mbxaczqgrdmxpyfnc8k", - "depends": ["fields", "ggplot2", "MASS", "plot3D", "rTensor", "tagcloud"] + "depends": ["MASS", "fields", "ggplot2", "plot3D", "rTensor", "tagcloud"] }, "nna": { "name": "nna", @@ -88259,7 +89183,7 @@ "name": "nnfor", "version": "0.9.9", "sha256": "0jrp840vr5jyk76808l0d1r46hhvz0l0vimwdc82wilfh8sb5sz5", - "depends": ["forecast", "generics", "glmnet", "MASS", "neuralnet", "plotrix", "tsutils", "uroot"] + "depends": ["MASS", "forecast", "generics", "glmnet", "neuralnet", "plotrix", "tsutils", "uroot"] }, "nngeo": { "name": "nngeo", @@ -88277,7 +89201,7 @@ "name": "nnlib2Rcpp", "version": "0.2.8", "sha256": "06fb4wh39gdlywpyj86hnys87mrwrx2m6dw16zkrs1kawg4z5gvm", - "depends": ["class", "Rcpp"] + "depends": ["Rcpp", "class"] }, "nnls": { "name": "nnls", @@ -88289,13 +89213,19 @@ "name": "nnspat", "version": "0.1.2", "sha256": "1svqdb20x5d4wsbi97lhjwkhl623ksawf4w4w1f0hwsx0f3xjzvi", - "depends": ["MASS", "pcds", "Rdpack"] + "depends": ["MASS", "Rdpack", "pcds"] }, "nnt": { "name": "nnt", "version": "0.1.4", "sha256": "1rrqq8m3plsq13hsh53h948wbx37gl87hplj4ms2pxxf1zwqsmnj", - "depends": ["survival", "survRM2"] + "depends": ["survRM2", "survival"] + }, + "nntmvn": { + "name": "nntmvn", + "version": "1.0.0", + "sha256": "0anv6vl9md127y59k6sqvpx7sacfwz62amgc4x0yb0rj7xwvzjnd", + "depends": ["GpGp", "TruncatedNormal"] }, "noaaoceans": { "name": "noaaoceans", @@ -88307,25 +89237,25 @@ "name": "noaastormevents", "version": "0.2.0", "sha256": "1d93h8av0bbv7a56g6m000qpsnzqpfdla0fmcj5y8fbbqkipxnfr", - "depends": ["choroplethr", "choroplethrMaps", "data_table", "dplyr", "forcats", "ggplot2", "hurricaneexposure", "lubridate", "magrittr", "maps", "plyr", "RColorBrewer", "RCurl", "rlang", "stringr", "tibble", "tidyr", "viridis", "XML"] + "depends": ["RColorBrewer", "RCurl", "XML", "choroplethr", "choroplethrMaps", "data_table", "dplyr", "forcats", "ggplot2", "hurricaneexposure", "lubridate", "magrittr", "maps", "plyr", "rlang", "stringr", "tibble", "tidyr", "viridis"] }, "noah": { "name": "noah", "version": "0.1.0", "sha256": "1ln23lp4c70fin9sjjhm4ngy47f8sk2mcljp5q449b7hq8gqi12c", - "depends": ["assertthat", "crayon", "digest", "dplyr", "hash", "magrittr", "purrr", "R6", "rlang", "stringr"] + "depends": ["R6", "assertthat", "crayon", "digest", "dplyr", "hash", "magrittr", "purrr", "rlang", "stringr"] }, "noctua": { "name": "noctua", "version": "2.6.2", "sha256": "1j7ikcviapdddyi71zwybcjyj6f1kyszb44vmbcq7jmvm7iazvmx", - "depends": ["data_table", "DBI", "paws", "uuid"] + "depends": ["DBI", "data_table", "paws", "uuid"] }, "nodbi": { "name": "nodbi", - "version": "0.10.4", - "sha256": "0q4nsxic1jlraipdc6zi711c3316n9wgq1cgbywhjlxb52qhkmd7", - "depends": ["DBI", "jqr", "jsonlite", "R_utils", "stringi", "uuid", "V8"] + "version": "0.10.6", + "sha256": "1kgn6c0s0gac38ip5z5sm56psg912b9hg3klsymazam9r76ddaqx", + "depends": ["DBI", "R_utils", "V8", "jqr", "jsonlite", "stringi", "uuid"] }, "node2vec": { "name": "node2vec", @@ -88337,7 +89267,7 @@ "name": "nodeSub", "version": "1.2.8", "sha256": "1ks9bx2kswbhcw2sbnx3zx2pbx0n30b5f6awr5haviw29zv24izw", - "depends": ["ape", "beastier", "beautier", "DDD", "geiger", "lifecycle", "pbapply", "phangorn", "phylobase", "rappdirs", "Rcpp", "Rmpfr", "stringr", "testit", "tibble", "tracerer"] + "depends": ["DDD", "Rcpp", "Rmpfr", "ape", "beastier", "beautier", "geiger", "lifecycle", "pbapply", "phangorn", "phylobase", "rappdirs", "stringr", "testit", "tibble", "tracerer"] }, "nodiv": { "name": "nodiv", @@ -88367,7 +89297,7 @@ "name": "noisemodel", "version": "1.0.2", "sha256": "1p5rripvpcgxikgy84jaxbx0spyrclidv17i2pkf3i6712ap3m81", - "depends": ["C50", "caret", "classInt", "e1071", "ExtDist", "FNN", "ggplot2", "lsr", "nnet", "RColorBrewer", "RSNNS", "stringr"] + "depends": ["C50", "ExtDist", "FNN", "RColorBrewer", "RSNNS", "caret", "classInt", "e1071", "ggplot2", "lsr", "nnet", "stringr"] }, "noisyCE2": { "name": "noisyCE2", @@ -88379,25 +89309,25 @@ "name": "noisySBM", "version": "0.1.4", "sha256": "1zdkxr48kvpqs49figxxznq3d45nalja92lyal71m066s1blc6dg", - "depends": ["ggplot2", "gtools", "RColorBrewer"] + "depends": ["RColorBrewer", "ggplot2", "gtools"] }, "noisyr": { "name": "noisyr", "version": "1.0.0", "sha256": "05nvxz5qa4lsi62va74yq4m68nlacjkl8xj5nsq7dik3357y53dr", - "depends": ["doParallel", "dplyr", "foreach", "GenomicRanges", "ggplot2", "IRanges", "magrittr", "philentropy", "preprocessCore", "Rsamtools", "tibble"] + "depends": ["GenomicRanges", "IRanges", "Rsamtools", "doParallel", "dplyr", "foreach", "ggplot2", "magrittr", "philentropy", "preprocessCore", "tibble"] }, "noisysbmGGM": { "name": "noisysbmGGM", "version": "0.1.2.3", "sha256": "0mq0rczxkrmfax8i08f60ymia3i6f7q1y96bwk6igf3sismdnx3j", - "depends": ["huge", "igraph", "MASS", "ppcor", "RColorBrewer", "Rcpp", "RcppArmadillo", "SILGGM"] + "depends": ["MASS", "RColorBrewer", "Rcpp", "RcppArmadillo", "SILGGM", "huge", "igraph", "ppcor"] }, "nolock": { "name": "nolock", "version": "1.1.0", "sha256": "1d909qq6091rbsmnls2lc8l64iy7cam281s4854v4iar8l4dxh77", - "depends": ["crayon", "NCmisc", "rstudioapi", "stringr"] + "depends": ["NCmisc", "crayon", "rstudioapi", "stringr"] }, "nombre": { "name": "nombre", @@ -88409,12 +89339,12 @@ "name": "nomclust", "version": "2.8.0", "sha256": "1bl92zaf4iidm48xjxj0v812lx7gk3i3frvb59xr71y91ranwjpv", - "depends": ["cluster", "clValid", "Rcpp"] + "depends": ["Rcpp", "clValid", "cluster"] }, "nominatimlite": { "name": "nominatimlite", - "version": "0.4.0", - "sha256": "1qvbg4dpy65xjmh7i96xhm7cw07w375hm119540gqmc9z1zdh4g3", + "version": "0.4.1", + "sha256": "0vnpd21ybwmkkafsd65zg9bdcnmffxwqxrdfhgwdv82sclnd8xa8", "depends": ["dplyr", "jsonlite", "sf"] }, "nomisr": { @@ -88439,7 +89369,7 @@ "name": "nomogramFormula", "version": "1.2.0.0", "sha256": "1j6g5kndl0n2g8acwq8pn09sk0bjcsphbcd77ha1j5dnwdmy73c0", - "depends": ["do", "Hmisc", "rms"] + "depends": ["Hmisc", "do", "rms"] }, "nonLinearDotPlot": { "name": "nonLinearDotPlot", @@ -88451,7 +89381,7 @@ "name": "noncompliance", "version": "0.2.2", "sha256": "1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6", - "depends": ["data_table", "Rcpp"] + "depends": ["Rcpp", "data_table"] }, "noncomplyR": { "name": "noncomplyR", @@ -88469,25 +89399,25 @@ "name": "nonlinearICP", "version": "0.1.2.1", "sha256": "1m9a1f0yrbjl0nx2l7r76pyi78b2bxj8v4jx92yga91f975mw6np", - "depends": ["caTools", "CondIndTests", "data_tree", "randomForest"] + "depends": ["CondIndTests", "caTools", "data_tree", "randomForest"] }, "nonlinearTseries": { "name": "nonlinearTseries", "version": "0.3.0", "sha256": "1qzg5azydivxp04bs1s3m21bigacyrv6cak3cx7xpgq2w4fnb3br", - "depends": ["lifecycle", "Matrix", "Rcpp", "RcppArmadillo", "tseries", "zoo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "lifecycle", "tseries", "zoo"] }, "nonmem2R": { "name": "nonmem2R", "version": "0.2.5", "sha256": "0py0nn8sn9p4lcdbjsfmz3z0ch3i3qbvfjifmjzdhdjgd9vvi19r", - "depends": ["ggplot2", "gridExtra", "lattice", "latticeExtra", "MASS", "mvtnorm", "reshape2", "splines2"] + "depends": ["MASS", "ggplot2", "gridExtra", "lattice", "latticeExtra", "mvtnorm", "reshape2", "splines2"] }, "nonmem2rx": { "name": "nonmem2rx", "version": "0.1.4", "sha256": "08yyh7jwlqfxprwrs2f3pgjzlii66p98ixnd5r2jliqdzxbx1ciy", - "depends": ["checkmate", "cli", "crayon", "data_table", "digest", "dparser", "ggforce", "ggplot2", "lotri", "magrittr", "qs", "Rcpp", "rxode2", "rxode2parse", "xml2"] + "depends": ["Rcpp", "checkmate", "cli", "crayon", "data_table", "digest", "dparser", "ggforce", "ggplot2", "lotri", "magrittr", "qs", "rxode2", "rxode2parse", "xml2"] }, "nonmemica": { "name": "nonmemica", @@ -88517,7 +89447,7 @@ "name": "nonparaeff", "version": "0.5-13", "sha256": "04ya0b4nwfcyw7asby8j5npa59p8w8ri3cifpigvqmdg47v9kzmc", - "depends": ["geometry", "Hmisc", "lpSolve"] + "depends": ["Hmisc", "geometry", "lpSolve"] }, "nonparametric_bayes": { "name": "nonparametric.bayes", @@ -88529,7 +89459,13 @@ "name": "nonprobsvy", "version": "0.1.0", "sha256": "0p5x88dgas0hy3xydn5803pybf5ryxc85gzn9fb2c5kdrv2v0pcr", - "depends": ["doParallel", "foreach", "MASS", "mathjaxr", "Matrix", "maxLik", "ncvreg", "nleqslv", "RANN", "Rcpp", "RcppArmadillo", "survey"] + "depends": ["MASS", "Matrix", "RANN", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "mathjaxr", "maxLik", "ncvreg", "nleqslv", "survey"] + }, + "nonsmooth": { + "name": "nonsmooth", + "version": "1.0.0", + "sha256": "02hb9fwz3gc2kgvnvxrwsjacxj1p76qz7ss9504w9fm1pdxly837", + "depends": ["np", "reshape2"] }, "nopaco": { "name": "nopaco", @@ -88553,7 +89489,7 @@ "name": "norMmix", "version": "0.1-1", "sha256": "1nkgidzbqp83bqvkpalxs58s2blpx9s1j9dm2i13plfx3kv0d6x3", - "depends": ["cluster", "MASS", "mclust", "mvtnorm", "sfsmisc"] + "depends": ["MASS", "cluster", "mclust", "mvtnorm", "sfsmisc"] }, "nord": { "name": "nord", @@ -88601,7 +89537,7 @@ "name": "normalr", "version": "1.0.0", "sha256": "1ahrg188vbhnrnwag0zi6lcb3g0y1mbz06sl3j1wyllq5l918cc7", - "depends": ["magrittr", "MASS", "purrr", "rlang", "shiny"] + "depends": ["MASS", "magrittr", "purrr", "rlang", "shiny"] }, "normfluodbf": { "name": "normfluodbf", @@ -88625,7 +89561,7 @@ "name": "nortsTest", "version": "1.1.2", "sha256": "0z3ganmaz3p0s957g123gcmcf6x01gvsmrl6ddi3n588hysscqsy", - "depends": ["cowplot", "forecast", "ggplot2", "gridExtra", "MASS", "nortest", "tseries", "uroot", "zoo"] + "depends": ["MASS", "cowplot", "forecast", "ggplot2", "gridExtra", "nortest", "tseries", "uroot", "zoo"] }, "nos": { "name": "nos", @@ -88721,7 +89657,7 @@ "name": "nparMD", "version": "0.2.1", "sha256": "0wfmw1d4w8frbimq62749siy28bzci3h3lhsl5jx7zl7mxpl0q9a", - "depends": ["Formula", "gtools", "MASS", "matrixcalc", "matrixStats"] + "depends": ["Formula", "MASS", "gtools", "matrixStats", "matrixcalc"] }, "nparcomp": { "name": "nparcomp", @@ -88733,13 +89669,13 @@ "name": "nparsurv", "version": "0.1.0", "sha256": "1qy9qkkpqrk49vjxbyvl25i4kfk0py6v64izd8lmaw38dynybpy2", - "depends": ["survival", "TH_data"] + "depends": ["TH_data", "survival"] }, "npboottprm": { "name": "npboottprm", - "version": "0.2.1", - "sha256": "1g139xrry2j14jcs36hqa3y72y5vlnmn8vxkv7yh0jcgj0czl7d0", - "depends": ["DT", "fGarch", "ggplot2", "lmPerm", "MASS", "MKinfer", "shiny", "shinythemes", "sn"] + "version": "0.3.1", + "sha256": "0ipicpy1hfxbj7mw18slykxwyyav8r2z8rsnqhhvxw3f9w656nhd", + "depends": ["DT", "MASS", "MKinfer", "RPostgres", "fGarch", "ggplot2", "lmPerm", "pool", "shiny", "shinythemes", "sn"] }, "npboottprmFBar": { "name": "npboottprmFBar", @@ -88751,13 +89687,13 @@ "name": "npbr", "version": "1.8", "sha256": "1mvl16z4s517a87ljl1ksr1ixrz3c6v22hv36s6x60f9rcs96jj8", - "depends": ["Benchmarking", "np", "quadprog", "Rglpk"] + "depends": ["Benchmarking", "Rglpk", "np", "quadprog"] }, "npclust": { "name": "npclust", "version": "0.1.0", "sha256": "0a1las0vxm4mhwvds66lvq87kb140sjrnjq5sihbrrh7wpbq31zg", - "depends": ["ggplot2", "MASS"] + "depends": ["MASS", "ggplot2"] }, "npcopTest": { "name": "npcopTest", @@ -88787,7 +89723,7 @@ "name": "npcurePK", "version": "1.0-2", "sha256": "1p1vl9w8z8xq6bfsn1kgq5cnzyf4aiax8iis0vb4xcxrb2wl0mav", - "depends": ["data_table", "DescTools", "doParallel", "foreach", "npcure"] + "depends": ["DescTools", "data_table", "doParallel", "foreach", "npcure"] }, "npde": { "name": "npde", @@ -88809,8 +89745,8 @@ }, "nphRCT": { "name": "nphRCT", - "version": "0.1.0", - "sha256": "0b29izx3rz17g0jx72s33jj8ps0z3kq8fj2v0035hcjacnswz9ya", + "version": "0.1.1", + "sha256": "0znc5z9yfan6m2yy96x661xnklgqdws0zar4jl1p5jjj8azwg9sb", "depends": ["ggplot2", "purrr", "survival"] }, "npi": { @@ -88901,13 +89837,13 @@ "name": "nprobust", "version": "0.4.0", "sha256": "1vry64r3xms6xls6bqq918prjyhs5svhl2yjvq0jxycaaqw2sgyp", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2"] }, "nproc": { "name": "nproc", "version": "2.1.5", "sha256": "1p5wjz0rafg27fsl48l9pmki3px1k0pav3ignz4swik5i1nhnc8w", - "depends": ["ada", "e1071", "glmnet", "MASS", "naivebayes", "randomForest", "ROCR", "tree"] + "depends": ["MASS", "ROCR", "ada", "e1071", "glmnet", "naivebayes", "randomForest", "tree"] }, "nprotreg": { "name": "nprotreg", @@ -88925,7 +89861,7 @@ "name": "npsm", "version": "2.0.0", "sha256": "0d2pa55jcxrphmsnv0wcv3xsdidjcr8b8s9krbal27rjrvqqh27s", - "depends": ["class", "plyr", "Rfit"] + "depends": ["Rfit", "class", "plyr"] }, "npsp": { "name": "npsp", @@ -88997,7 +89933,7 @@ "name": "nse", "version": "1.21", "sha256": "0mw2ijc6z0l8sa7z5fbcapp1rl87zhh5v32iw1mcjw4khwc93bk7", - "depends": ["coda", "mcmc", "mcmcse", "np", "Rcpp", "sandwich"] + "depends": ["Rcpp", "coda", "mcmc", "mcmcse", "np", "sandwich"] }, "nseq": { "name": "nseq", @@ -89007,15 +89943,9 @@ }, "nser": { "name": "nser", - "version": "1.5.2", - "sha256": "0p7yz561m85962l0cfld7aa932rkiypjg8lc46zf43wzk2idlgxi", - "depends": ["curl", "dplyr", "googleVis", "lubridate", "magrittr", "purrr", "readr", "reticulate", "rvest", "stringr", "xml2"] - }, - "nseval": { - "name": "nseval", - "version": "0.5.1", - "sha256": "10b9kvvnlgc0jpbjnpkjmrkbl8plbkbggckwzy41kv41ha7rgda2", - "depends": [] + "version": "1.5.3", + "sha256": "0v88gbcak22wpqanp5b4j1fdsp3s4jdhwq4a399msmjd1kxzf5f6", + "depends": ["curl", "dplyr", "googleVis", "httr", "lubridate", "magrittr", "purrr", "readr", "reticulate", "rvest", "stringr", "xml2"] }, "nsga2R": { "name": "nsga2R", @@ -89077,6 +90007,12 @@ "sha256": "0is9avgam63irzrah6s8yfkh9amwq9rsfhlpfx9s375ih8d3pzww", "depends": [] }, + "ntsDatasets": { + "name": "ntsDatasets", + "version": "0.2.0", + "sha256": "0nya8zhm4lf7d4n2c4wgq144s1lxjb3qc7572gl9ppmgcaa3a9ig", + "depends": [] + }, "ntsDists": { "name": "ntsDists", "version": "2.1.1", @@ -89087,19 +90023,19 @@ "name": "nucim", "version": "1.0.11", "sha256": "12qfs4xd8lnkjhb0gkvxym07rndrwh5idvppj16v78amrk96rj5z", - "depends": ["bioimagetools", "EBImage", "fields", "stringr"] + "depends": ["EBImage", "bioimagetools", "fields", "stringr"] }, "nuggets": { "name": "nuggets", "version": "1.0.2", "sha256": "1ijlzcp42bhb2qpnnv9gi3nm87pprgs54m8s6vl7lgqv2njdasdg", - "depends": ["cli", "Rcpp", "rlang", "testthat", "tibble", "tidyr", "tidyselect"] + "depends": ["Rcpp", "cli", "rlang", "testthat", "tibble", "tidyr", "tidyselect"] }, "nullabor": { "name": "nullabor", - "version": "0.3.9", - "sha256": "19nfmsnzndg9pdjg7m9w4vm4c3209ny52cpjdhmmhggvf7dxaiyg", - "depends": ["dplyr", "forecast", "fpc", "ggplot2", "magrittr", "MASS", "moments", "purrr", "rlang", "tibble", "tidyr", "tsibble", "viridis"] + "version": "0.3.12", + "sha256": "0ymdw07x6xh204nzcd05d40zmxgnk7ny73qwbvy1gz5qh9617v96", + "depends": ["MASS", "dplyr", "fpc", "ggplot2", "magrittr", "moments", "purrr", "tibble", "tidyr"] }, "numDeriv": { "name": "numDeriv", @@ -89129,7 +90065,7 @@ "name": "numbat", "version": "1.4.0", "sha256": "1a9rcna5m7lyh56d8dwwzq32svgad8vwidikna1j2j63i4frjms4", - "depends": ["ape", "caTools", "data_table", "dendextend", "dplyr", "GenomicRanges", "ggplot2", "ggraph", "ggtree", "glue", "hahmmr", "igraph", "IRanges", "logger", "magrittr", "Matrix", "optparse", "parallelDist", "patchwork", "pryr", "purrr", "R_utils", "Rcpp", "RcppArmadillo", "RhpcBLASctl", "roptim", "scales", "scistreer", "stringr", "tibble", "tidygraph", "tidyr", "vcfR", "zoo"] + "depends": ["GenomicRanges", "IRanges", "Matrix", "R_utils", "Rcpp", "RcppArmadillo", "RhpcBLASctl", "ape", "caTools", "data_table", "dendextend", "dplyr", "ggplot2", "ggraph", "ggtree", "glue", "hahmmr", "igraph", "logger", "magrittr", "optparse", "parallelDist", "patchwork", "pryr", "purrr", "roptim", "scales", "scistreer", "stringr", "tibble", "tidygraph", "tidyr", "vcfR", "zoo"] }, "numberize": { "name": "numberize", @@ -89141,7 +90077,7 @@ "name": "numberofalleles", "version": "1.0.1", "sha256": "0rjl21844yqp2503gy71c6vg8xywc4lcx7qr9vwvkjw5wiwxls11", - "depends": ["partitions", "pedtools", "Rcpp", "ribd"] + "depends": ["Rcpp", "partitions", "pedtools", "ribd"] }, "numbers": { "name": "numbers", @@ -89165,7 +90101,7 @@ "name": "nutriNetwork", "version": "0.1.2", "sha256": "0wmprgibx9jzaav93m3kqx1h8cflvx287yjfi3b8pvmgna7q8fsy", - "depends": ["glasso", "huge", "igraph", "Matrix", "tmvtnorm"] + "depends": ["Matrix", "glasso", "huge", "igraph", "tmvtnorm"] }, "nutrition": { "name": "nutrition", @@ -89175,8 +90111,8 @@ }, "nuts": { "name": "nuts", - "version": "1.0.0", - "sha256": "0g2gxpaqg56c0s34prcmy3das4yspjc71zawnqhp4am6v4bgbq5v", + "version": "1.1.0", + "sha256": "028n53zancc8ca0l0lis9zbj5hbqk780adjvx5ifz90c5my4brjv", "depends": ["cli", "dplyr", "glue", "lifecycle", "rlang"] }, "nvctr": { @@ -89189,7 +90125,7 @@ "name": "nvmix", "version": "0.1-1", "sha256": "055f99v3l9zzd2r23l7101y0sy5p45zrsh3yblmbmyq8b11bx4rj", - "depends": ["ADGofTest", "copula", "Matrix", "mnormt", "pcaPP", "pracma", "qrng"] + "depends": ["ADGofTest", "Matrix", "copula", "mnormt", "pcaPP", "pracma", "qrng"] }, "nycflights13": { "name": "nycflights13", @@ -89229,15 +90165,15 @@ }, "o2geosocial": { "name": "o2geosocial", - "version": "1.1.2", - "sha256": "0myzr25jjjvlszr0j5ay2nha1nrccwhgh0qd01p52xrlggfjhz1g", - "depends": ["data_table", "geosphere", "ggplot2", "outbreaker2", "Rcpp", "visNetwork"] + "version": "1.1.3", + "sha256": "044m21116zwbkh55z84pns5l3agvdw50pcza669blmf3za7m2bby", + "depends": ["Rcpp", "data_table", "geosphere", "ggplot2", "outbreaker2", "visNetwork"] }, "o2plsda": { "name": "o2plsda", - "version": "0.0.18", - "sha256": "17dmb82q4g7lspvrvrz9324qinkr07vlhxsr2vd5ikj7cqxivgmv", - "depends": ["dplyr", "ggplot2", "ggrepel", "magrittr", "Rcpp", "RcppArmadillo"] + "version": "0.0.25", + "sha256": "1lsww2g9inpaw7mhg49ia517am14sjvy9i92h2xsfv4qygqkl1wq", + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "ggplot2", "ggrepel", "magrittr"] }, "oHMMed": { "name": "oHMMed", @@ -89303,7 +90239,7 @@ "name": "obfuscatoR", "version": "0.2.2", "sha256": "1scd63giywfbvpynbxbk0kq01rwhx62416dibs5gky15dxfcsvmk", - "depends": ["crayon", "matrixStats", "readr", "Rfast", "stringr", "tibble"] + "depends": ["Rfast", "crayon", "matrixStats", "readr", "stringr", "tibble"] }, "objectProperties": { "name": "objectProperties", @@ -89333,7 +90269,7 @@ "name": "obliqueRSF", "version": "0.1.2", "sha256": "1y9bkhwlb9aabfvnz62cg128c242hd1qdrwmmf6i76yfg0b0w10k", - "depends": ["data_table", "dplyr", "ggplot2", "ggthemes", "glmnet", "missForest", "pec", "prodlim", "purrr", "Rcpp", "RcppArmadillo", "rlang", "scales", "survival", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "dplyr", "ggplot2", "ggthemes", "glmnet", "missForest", "pec", "prodlim", "purrr", "rlang", "scales", "survival", "tidyr"] }, "obsSens": { "name": "obsSens", @@ -89361,9 +90297,9 @@ }, "occCite": { "name": "occCite", - "version": "0.5.6", - "sha256": "08bc0pi2i2fmc9fcmir150b7g8jnd58q3qaakw2gk25yjy14rp7j", - "depends": ["bib2df", "BIEN", "curl", "DBI", "dplyr", "ggplot2", "htmltools", "httr", "leaflet", "lubridate", "RColorBrewer", "rgbif", "rlang", "RPostgreSQL", "stringr", "taxize", "tidyr", "viridis", "waffle"] + "version": "0.5.7", + "sha256": "130fk8m1dcid4kiswr4fpq6da84b2gfjwa20gmcsp1r75yzi95nx", + "depends": ["BIEN", "DBI", "RColorBrewer", "RPostgreSQL", "bib2df", "curl", "dplyr", "ggplot2", "htmltools", "leaflet", "lubridate", "rgbif", "rlang", "stringr", "taxize", "tidyr", "viridis", "waffle"] }, "occumb": { "name": "occumb", @@ -89391,9 +90327,9 @@ }, "oce": { "name": "oce", - "version": "1.8-2", - "sha256": "1a9zld3q009v9bvqpkn4fy0qfrsjmcz9j1f0jva75ygi8hdywpyg", - "depends": ["gsw", "Rcpp"] + "version": "1.8-3", + "sha256": "13vg1g3pn1bmmjb5sb34qmwy2czxigin02nz4vkwlw9z4vpjkwgi", + "depends": ["Rcpp", "gsw"] }, "oceCens": { "name": "oceCens", @@ -89405,7 +90341,7 @@ "name": "oceanexplorer", "version": "0.1.0", "sha256": "07l2la7nrqj8bsyv0flyjs08wishlvq6v2hx5n1g9kag4bcfl6vz", - "depends": ["bslib", "dplyr", "DT", "fs", "ggplot2", "glue", "maps", "miniUI", "ncmeta", "purrr", "rlang", "RNetCDF", "rstudioapi", "sf", "shiny", "shinyFeedback", "shinyjs", "stars", "thematic", "waiter"] + "depends": ["DT", "RNetCDF", "bslib", "dplyr", "fs", "ggplot2", "glue", "maps", "miniUI", "ncmeta", "purrr", "rlang", "rstudioapi", "sf", "shiny", "shinyFeedback", "shinyjs", "stars", "thematic", "waiter"] }, "oceanic": { "name": "oceanic", @@ -89417,7 +90353,7 @@ "name": "oceanis", "version": "1.8.5", "sha256": "13zdzqjlf5pihji6np9a3m2j5ycy4jvfl75knzry2ir78zr9ngj7", - "depends": ["classInt", "dplyr", "DT", "ggplot2", "htmlwidgets", "leaflet", "leaflet_extras", "lwgeom", "sf", "shiny", "shinyBS", "shinyjs", "shinythemes", "stringr", "webshot", "zip"] + "depends": ["DT", "classInt", "dplyr", "ggplot2", "htmlwidgets", "leaflet", "leaflet_extras", "lwgeom", "sf", "shiny", "shinyBS", "shinyjs", "shinythemes", "stringr", "webshot", "zip"] }, "oceanmap": { "name": "oceanmap", @@ -89441,7 +90377,7 @@ "name": "ocf", "version": "1.0.0", "sha256": "04d0j863a2zqj3v9s9iwlc4v7fxpp6cydpphxcfr6n22f8ciq5bd", - "depends": ["glmnet", "Matrix", "orf", "ranger", "Rcpp", "RcppEigen", "stringr"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "glmnet", "orf", "ranger", "stringr"] }, "ockc": { "name": "ockc", @@ -89453,7 +90389,7 @@ "name": "oclust", "version": "0.2.0", "sha256": "08247vcjs7hhzbj69f2x39n5y5ycns0qd7pdlvpwyn4j7yd1ji31", - "depends": ["dbscan", "entropy", "MASS", "mclust", "mixture", "mvtnorm"] + "depends": ["MASS", "dbscan", "entropy", "mclust", "mixture", "mvtnorm"] }, "ocp": { "name": "ocp", @@ -89465,13 +90401,19 @@ "name": "ocs4R", "version": "0.2-3", "sha256": "09zl9jl1kzvyq0wccp41j32pr3as93qh250iaawhwkpcswjpyl89", - "depends": ["curl", "httr", "jsonlite", "keyring", "openssl", "R6", "XML"] + "depends": ["R6", "XML", "curl", "httr", "jsonlite", "keyring", "openssl"] + }, + "octopucs": { + "name": "octopucs", + "version": "0.1.1", + "sha256": "0l9km2q9yjv43bis32gmw6sc7y5c425plgs0vi9sjx17pgsyvqdw", + "depends": ["progress", "stringr", "vegan"] }, "octopus": { "name": "octopus", "version": "0.4.2", "sha256": "0a24czpsvq5xpr3g9m6d2bsd3dv5jcr2m724gz4z3c56f4xbxd8b", - "depends": ["bslib", "data_table", "DBI", "dplyr", "DT", "glue", "httr", "janitor", "rio", "shiny", "shinyAce", "shinyjs"] + "depends": ["DBI", "DT", "bslib", "data_table", "dplyr", "glue", "httr", "janitor", "rio", "shiny", "shinyAce", "shinyjs"] }, "octopusR": { "name": "octopusR", @@ -89489,13 +90431,13 @@ "name": "odbc", "version": "1.5.0", "sha256": "1c49209bf1swsk5mhwb4zxymlg5dha9rg500nq83kbgib6ikkk9f", - "depends": ["bit64", "blob", "cli", "DBI", "hms", "lifecycle", "Rcpp", "rlang"] + "depends": ["DBI", "Rcpp", "bit64", "blob", "cli", "hms", "lifecycle", "rlang"] }, "odbr": { "name": "odbr", "version": "0.1.0", "sha256": "03bdhmya86whrzijc8h6gvd4yzmivdskm42a80n4ryqn4szfyrpd", - "depends": ["data_table", "fs", "haven", "piggyback", "R_utils", "sf", "usethis"] + "depends": ["R_utils", "data_table", "fs", "haven", "piggyback", "sf", "usethis"] }, "oddnet": { "name": "oddnet", @@ -89531,7 +90473,7 @@ "name": "oddstream", "version": "0.5.0", "sha256": "1nwjw7fq6b4jdq4m2w0a7xgmzjg5a6pbma1d3r9msiz8rnhb0c54", - "depends": ["dplyr", "ggplot2", "kernlab", "ks", "magrittr", "MASS", "mgcv", "moments", "mvtsplot", "pcaPP", "RColorBrewer", "RcppRoll", "reshape", "tibble", "tidyr"] + "depends": ["MASS", "RColorBrewer", "RcppRoll", "dplyr", "ggplot2", "kernlab", "ks", "magrittr", "mgcv", "moments", "mvtsplot", "pcaPP", "reshape", "tibble", "tidyr"] }, "odeGUTS": { "name": "odeGUTS", @@ -89549,7 +90491,7 @@ "name": "odin", "version": "1.2.5", "sha256": "1fczgf3x35inlyhkw1h4mf8j9alrv4w98b9jfmbc2a9q29gi161p", - "depends": ["cinterpolate", "deSolve", "digest", "glue", "jsonlite", "R6", "ring", "withr"] + "depends": ["R6", "cinterpolate", "deSolve", "digest", "glue", "jsonlite", "ring", "withr"] }, "odk": { "name": "odk", @@ -89565,21 +90507,21 @@ }, "oeli": { "name": "oeli", - "version": "0.5.0", - "sha256": "0v6pk49arigm9v979in9h06pqhz3gz56a1d7vcbd1pxqa8y4ypaz", - "depends": ["benchmarkme", "checkmate", "cli", "ggplot2", "hexSticker", "latex2exp", "Rcpp", "RcppArmadillo", "rprojroot", "showtext", "sysfonts", "testthat", "usethis"] + "version": "0.5.2", + "sha256": "0a9bk8dch6852nkddxwjyrs24knpx09sb5dyfakb9fpmksrv4f3p", + "depends": ["Rcpp", "RcppArmadillo", "benchmarkme", "checkmate", "cli", "ggplot2", "hexSticker", "latex2exp", "rprojroot", "showtext", "sysfonts", "testthat", "usethis"] }, "oem": { "name": "oem", - "version": "2.0.11", - "sha256": "0p9s68zgma9mcjnz0xg6h07yp38rqj209asg18hji8528iazbv8g", - "depends": ["BH", "bigmemory", "foreach", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen"] + "version": "2.0.12", + "sha256": "1a12d4fnrkrawb5f7rfidjixjl1v5qznqdyv8a5s1bp37pf1gh89", + "depends": ["BH", "Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "RcppEigen", "bigmemory", "foreach"] }, "oenb": { "name": "oenb", "version": "0.0.2", "sha256": "1jgxw7ycx2lcdzglg9nix8k08fs4r6i5jdsjzrd6w1dg6smsinl5", - "depends": ["dplyr", "XML"] + "depends": ["XML", "dplyr"] }, "oesr": { "name": "oesr", @@ -89603,19 +90545,19 @@ "name": "ofGEM", "version": "1.0", "sha256": "0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k", - "depends": ["CompQuadForm", "forestplot", "MASS"] + "depends": ["CompQuadForm", "MASS", "forestplot"] }, "officedown": { "name": "officedown", - "version": "0.3.1", - "sha256": "0ymidhrnbk8z7ni4y0ngizyc7d3f35nmhmhpfqw8jg9faizich8z", + "version": "0.3.3", + "sha256": "0mxg46jg4vb6bxxqayvf84g8bllwsf11ybkfinrsdzdlkw89s3vk", "depends": ["knitr", "memoise", "officer", "rlang", "rmarkdown", "rvg", "uuid", "xml2", "yaml"] }, "officer": { "name": "officer", "version": "0.6.6", "sha256": "04mlmq64gjdicdlai78iy28n8z64p3k4mnk4k381znlrj9x3zz7i", - "depends": ["openssl", "R6", "ragg", "uuid", "xml2", "zip"] + "depends": ["R6", "openssl", "ragg", "uuid", "xml2", "zip"] }, "offlineChange": { "name": "offlineChange", @@ -89645,13 +90587,13 @@ "name": "ogrdbstats", "version": "0.5.0", "sha256": "140i4wippqr1260a1c4syg6lfspkf9q8rifnalf6iaaqx2bz4yfq", - "depends": ["alakazam", "argparser", "Biostrings", "bookdown", "ComplexHeatmap", "data_table", "dplyr", "ggplot2", "gridExtra", "magrittr", "RColorBrewer", "scales", "stringdist", "stringr", "tidyr", "tigger"] + "depends": ["Biostrings", "ComplexHeatmap", "RColorBrewer", "alakazam", "argparser", "bookdown", "data_table", "dplyr", "ggplot2", "gridExtra", "magrittr", "scales", "stringdist", "stringr", "tidyr", "tigger"] }, "ohenery": { "name": "ohenery", "version": "0.1.1", "sha256": "0i7cc110c30y7dm86srh2xkikkmlr28mvy0kkjxywxmiwnrsmzjq", - "depends": ["dplyr", "magrittr", "maxLik", "Rcpp"] + "depends": ["Rcpp", "dplyr", "magrittr", "maxLik"] }, "ohoegdm": { "name": "ohoegdm", @@ -89671,12 +90613,6 @@ "sha256": "0hkjs322vii1dsminlkwpwi12sc9pd88jag7p4dmy6nfw2hh2d69", "depends": ["lattice"] }, - "ohun": { - "name": "ohun", - "version": "1.0.1", - "sha256": "103s9sv70p9hw6q55j98wri5bxqazfn9hxpk1mm39x7navx3qzvp", - "depends": ["checkmate", "cli", "fftw", "ggplot2", "igraph", "rlang", "seewave", "sf", "tuneR", "warbleR"] - }, "oii": { "name": "oii", "version": "1.0.2.1", @@ -89693,7 +90629,7 @@ "name": "okxAPI", "version": "0.1.1", "sha256": "0wysfpkij9l265clw6qi4zpr1c860idxfp82xz2nmy1l5b2n8ri0", - "depends": ["base64enc", "data_table", "digest", "httr", "jsonlite", "R6", "websocket"] + "depends": ["R6", "base64enc", "data_table", "digest", "httr", "jsonlite", "websocket"] }, "olctools": { "name": "olctools", @@ -89703,9 +90639,9 @@ }, "ollamar": { "name": "ollamar", - "version": "1.1.1", - "sha256": "0zw71221fyjczkfj47hbs2ddl7p8h8igzp9zijfb5c6m4qg03gbl", - "depends": ["glue", "httr2", "jsonlite", "tibble"] + "version": "1.2.0", + "sha256": "1cs12w5rcm2v7bnzbmqpycm5r2n8c7iw6g6jzzw272hbsjjqkm8a", + "depends": ["base64enc", "crayon", "glue", "httr2", "jsonlite", "tibble"] }, "ollg": { "name": "ollg", @@ -89741,13 +90677,13 @@ "name": "omicsTools", "version": "1.0.5", "sha256": "0k6cpdxafz6x5360m97x8mvvi09mb36yx42slkq6nr4axpm089pf", - "depends": ["bs4Dash", "config", "dplyr", "DT", "golem", "magrittr", "readr", "shiny", "tibble"] + "depends": ["DT", "bs4Dash", "config", "dplyr", "golem", "magrittr", "readr", "shiny", "tibble"] }, "omicwas": { "name": "omicwas", "version": "0.8.0", "sha256": "03l53vbsard0hpaffcaa9l1aa3nh3w16j00k2jz2jqrrg02z0d7h", - "depends": ["broom", "data_table", "dplyr", "ff", "glmnet", "magrittr", "MASS", "matrixStats", "purrr", "rlang", "tidyr"] + "depends": ["MASS", "broom", "data_table", "dplyr", "ff", "glmnet", "magrittr", "matrixStats", "purrr", "rlang", "tidyr"] }, "omnibus": { "name": "omnibus", @@ -89763,21 +90699,21 @@ }, "omopgenerics": { "name": "omopgenerics", - "version": "0.2.1", - "sha256": "15vqym797spa9fcxq25is2fjc5q6id4h731vh720wjg857aja4h0", - "depends": ["cli", "dbplyr", "dplyr", "glue", "rlang", "snakecase", "stringr", "tidyr"] + "version": "0.3.0", + "sha256": "07w2k4hp33ll0adlcnpi7pbv3zqq806dish1vghigcx4wzvpsfgi", + "depends": ["cli", "dbplyr", "dplyr", "glue", "lifecycle", "purrr", "rlang", "snakecase", "stringr", "tidyr", "vctrs"] }, "ompr": { "name": "ompr", "version": "1.0.4", "sha256": "02glc09yrdvwls0i8ik1wh6fp3qa9ry55xd3yy3xk0rav8r3hcj3", - "depends": ["data_table", "fastmap", "lazyeval", "listcomp", "Matrix", "rlang"] + "depends": ["Matrix", "data_table", "fastmap", "lazyeval", "listcomp", "rlang"] }, "ompr_roi": { "name": "ompr.roi", "version": "1.0.2", "sha256": "1w0cyw5ixkri8523vdcfrlaf49farhgdf1bxiizwk5gppb3w5ibl", - "depends": ["Matrix", "ompr", "ROI", "slam"] + "depends": ["Matrix", "ROI", "ompr", "slam"] }, "omsvg": { "name": "omsvg", @@ -89789,7 +90725,7 @@ "name": "omu", "version": "1.1.2", "sha256": "19kfk5pcwdkdb41irw9dz34gibhnc8r1amm0mnvk4kbk7y3c1809", - "depends": ["broom", "caret", "dplyr", "FSA", "ggfortify", "ggplot2", "httr", "magrittr", "plyr", "randomForest", "rstatix", "stringr", "tidyr"] + "depends": ["FSA", "broom", "caret", "dplyr", "ggfortify", "ggplot2", "httr", "magrittr", "plyr", "randomForest", "rstatix", "stringr", "tidyr"] }, "onadata": { "name": "onadata", @@ -89825,25 +90761,25 @@ "name": "oncoPredict", "version": "1.2", "sha256": "0cp0b0d5nbanflp1jrkvdcybjii4lzv275d880wbadsx960rax2l", - "depends": ["BiocGenerics", "car", "GenomicFeatures", "GenomicRanges", "glmnet", "IRanges", "org_Hs_eg_db", "pls", "preprocessCore", "ridge", "S4Vectors", "sva", "TCGAbiolinks", "tidyverse", "TxDb_Hsapiens_UCSC_hg19_knownGene"] + "depends": ["BiocGenerics", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "TCGAbiolinks", "TxDb_Hsapiens_UCSC_hg19_knownGene", "car", "glmnet", "org_Hs_eg_db", "pls", "preprocessCore", "ridge", "sva", "tidyverse"] }, "oncomsm": { "name": "oncomsm", "version": "0.1.4", "sha256": "1crjpfa7yxcafnhsxs2sbf153lsr9ffaqdxjxp0zkd7hiash0mfm", - "depends": ["BH", "checkmate", "dplyr", "furrr", "ggplot2", "magrittr", "purrr", "Rcpp", "RcppEigen", "RcppNumerical", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders", "stringr", "tibble", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppNumerical", "RcppParallel", "StanHeaders", "checkmate", "dplyr", "furrr", "ggplot2", "magrittr", "purrr", "rlang", "rstan", "rstantools", "stringr", "tibble", "tidyr"] }, "oncrawlR": { "name": "oncrawlR", "version": "0.2.0", "sha256": "0cm26diaf3jlzfrpgh13q0hakakmj6vy41wk9z0w81az4jcg9sn9", - "depends": ["caret", "DALEX", "dplyr", "e1071", "formattable", "fs", "ggplot2", "htmltools", "jsonlite", "pdp", "pROC", "RCurl", "readr", "rjson", "rlang", "rlist", "scales", "sparkline", "tidyr", "webshot", "xgboost"] + "depends": ["DALEX", "RCurl", "caret", "dplyr", "e1071", "formattable", "fs", "ggplot2", "htmltools", "jsonlite", "pROC", "pdp", "readr", "rjson", "rlang", "rlist", "scales", "sparkline", "tidyr", "webshot", "xgboost"] }, "ondisc": { "name": "ondisc", "version": "1.0.0", "sha256": "071jrldclkaz5lfp3k5fh1ilpgvvcnakh2vvnr69n3pri9dl3fls", - "depends": ["crayon", "data_table", "dplyr", "magrittr", "Matrix", "Rcpp", "readr", "rhdf5", "Rhdf5lib"] + "depends": ["Matrix", "Rcpp", "Rhdf5lib", "crayon", "data_table", "dplyr", "magrittr", "readr", "rhdf5"] }, "oneclust": { "name": "oneclust", @@ -89861,13 +90797,13 @@ "name": "onelogin", "version": "0.2.0", "sha256": "06p3a8kaxmvsj8nn7dy8w6wv1jjw67is991hqg9q0fa20ifym3dl", - "depends": ["glue", "jsonlite", "magrittr", "R6", "safer", "tibble"] + "depends": ["R6", "glue", "jsonlite", "magrittr", "safer", "tibble"] }, "onemap": { "name": "onemap", "version": "3.0.0", "sha256": "0h5bi4zyiglic60msrkfny28k1rb7avqbs87ipzwwayb452b970c", - "depends": ["dendextend", "dplyr", "ggplot2", "ggpubr", "htmlwidgets", "plotly", "princurve", "RColorBrewer", "Rcpp", "rebus", "reshape2", "smacof", "tidyr", "vcfR"] + "depends": ["RColorBrewer", "Rcpp", "dendextend", "dplyr", "ggplot2", "ggpubr", "htmlwidgets", "plotly", "princurve", "rebus", "reshape2", "smacof", "tidyr", "vcfR"] }, "onetime": { "name": "onetime", @@ -89885,7 +90821,7 @@ "name": "onion", "version": "1.5-3", "sha256": "0ja3nqi684c314hh9y5lp59bdfi01vycz17ridw1xlzh89na8c60", - "depends": ["emulator", "freealg", "mathjaxr", "Matrix"] + "depends": ["Matrix", "emulator", "freealg", "mathjaxr"] }, "onlineBcp": { "name": "onlineBcp", @@ -89903,13 +90839,13 @@ "name": "onlinePCA", "version": "1.3.2", "sha256": "1xc9kjqvpspymywzaykw4nw14y43fi4ydwj4jfhvx5ws51f7y9i8", - "depends": ["Rcpp", "RcppArmadillo", "RSpectra"] + "depends": ["RSpectra", "Rcpp", "RcppArmadillo"] }, "onlineforecast": { "name": "onlineforecast", "version": "1.0.2", "sha256": "0qj9943hmcf584b7czf877zg5rxz8byg97dkk3gnb57q5ar60f3z", - "depends": ["digest", "pbs", "R6", "Rcpp", "RcppArmadillo"] + "depends": ["R6", "Rcpp", "RcppArmadillo", "digest", "pbs"] }, "onlineretail": { "name": "onlineretail", @@ -89981,25 +90917,25 @@ "name": "ontologyPlot", "version": "1.7", "sha256": "06ynryr4yx2mg85v12vhggx795hwwwfniskv3dgmb5nmrxhvh26m", - "depends": ["ontologyIndex", "paintmap", "Rgraphviz"] + "depends": ["Rgraphviz", "ontologyIndex", "paintmap"] }, "ontologySimilarity": { "name": "ontologySimilarity", "version": "2.7", "sha256": "03fga6xqvxpa3hwf5pb0dzyz4scz2szvbgm8bsj1wl35gl477cjp", - "depends": ["ontologyIndex", "Rcpp"] + "depends": ["Rcpp", "ontologyIndex"] }, "ontophylo": { "name": "ontophylo", "version": "1.1.3", "sha256": "1pb8w39ckx2ffchrrxp1jqs555b5bfz7cv5kbwgyzpfshv9s0ca4", - "depends": ["ape", "dplyr", "fANCOVA", "ggplot2", "grImport", "magrittr", "ontologyIndex", "phytools", "purrr", "RColorBrewer", "stringdist", "tibble", "tidyr", "truncnorm"] + "depends": ["RColorBrewer", "ape", "dplyr", "fANCOVA", "ggplot2", "grImport", "magrittr", "ontologyIndex", "phytools", "purrr", "stringdist", "tibble", "tidyr", "truncnorm"] }, "oolong": { "name": "oolong", "version": "0.6.1", "sha256": "10fn3llypnglz6i02pii7i4lki0hrh46b76y8wd7df8j4bcixnn5", - "depends": ["cli", "cowplot", "digest", "ggplot2", "irr", "purrr", "quanteda", "R6", "seededlda", "shiny", "tibble"] + "depends": ["R6", "cli", "cowplot", "digest", "ggplot2", "irr", "purrr", "quanteda", "seededlda", "shiny", "tibble"] }, "oompaBase": { "name": "oompaBase", @@ -90023,7 +90959,7 @@ "name": "oosse", "version": "1.0.11", "sha256": "08nx25j5m6vqg9hqns6psldfdmsb81ixjlzdhxpx392ad0j4yfbx", - "depends": ["BiocParallel", "doParallel", "Matrix", "Rdpack"] + "depends": ["BiocParallel", "Matrix", "Rdpack", "doParallel"] }, "oottest": { "name": "oottest", @@ -90035,13 +90971,13 @@ "name": "opGMMassessment", "version": "0.4", "sha256": "0qnxq9i0spygz2lmjb23y94r9cgvkkariv0v8llqdb6l89bhfdqm", - "depends": ["AdaptGauss", "caTools", "cluster", "ClusterR", "DataVisualizations", "DistributionOptimization", "doParallel", "dplyr", "foreach", "ggplot2", "mclust", "mixAK", "mixtools", "multimode", "NbClust", "rlang"] + "depends": ["AdaptGauss", "ClusterR", "DataVisualizations", "DistributionOptimization", "NbClust", "caTools", "cluster", "doParallel", "dplyr", "foreach", "ggplot2", "mclust", "mixAK", "mixtools", "multimode", "rlang"] }, "opa": { "name": "opa", "version": "0.8.3", "sha256": "09k3bkh2glkl0sf5pcbii9cxq6ijpdsayncb02dm0ing2bh9kh0m", - "depends": ["lattice", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "lattice"] }, "opalr": { "name": "opalr", @@ -90059,7 +90995,7 @@ "name": "openCR", "version": "2.2.6", "sha256": "08cqv6xxv35hzllab0glb42h54racgqk0x3dvam6lk7c561kbas4", - "depends": ["abind", "BH", "MASS", "nlme", "plyr", "Rcpp", "RcppParallel", "secr", "stringr"] + "depends": ["BH", "MASS", "Rcpp", "RcppParallel", "abind", "nlme", "plyr", "secr", "stringr"] }, "openEBGM": { "name": "openEBGM", @@ -90071,7 +91007,7 @@ "name": "openMSE", "version": "1.0.0", "sha256": "15jp9hybnkwmnkcqawhpd3y3imq6wfxxzxzh90yx4cvzky36hf89", - "depends": ["crayon", "DLMtool", "MSEtool", "SAMtool"] + "depends": ["DLMtool", "MSEtool", "SAMtool", "crayon"] }, "openNLP": { "name": "openNLP", @@ -90089,13 +91025,13 @@ "name": "openSkies", "version": "1.2.1", "sha256": "0ky11gpgnf2afv6kzhwbzwzrmril99ixxxzzmav3h9hzcig3igyj", - "depends": ["cluster", "DBI", "dbscan", "ggmap", "ggplot2", "httr", "magick", "R6", "RPresto", "ssh", "xml2"] + "depends": ["DBI", "R6", "RPresto", "cluster", "dbscan", "ggmap", "ggplot2", "httr", "magick", "ssh", "xml2"] }, "openVA": { "name": "openVA", "version": "1.1.2", "sha256": "0ywf9hh4liz992ym1xdqpk4pnywy9azasyvqdy3ih8idmj3y5h0d", - "depends": ["cli", "crayon", "ggplot2", "InSilicoVA", "InterVA4", "InterVA5", "Tariff"] + "depends": ["InSilicoVA", "InterVA4", "InterVA5", "Tariff", "cli", "crayon", "ggplot2"] }, "openai": { "name": "openai", @@ -90107,7 +91043,7 @@ "name": "openair", "version": "2.18-2", "sha256": "1pw4bdqkd515n7fdcjavjmanhpaywxamzywgiaz4nk5bqq5mh84b", - "depends": ["cli", "cluster", "dplyr", "hexbin", "lattice", "latticeExtra", "lubridate", "mapproj", "MASS", "mgcv", "purrr", "Rcpp", "readr", "rlang", "tibble", "tidyr"] + "depends": ["MASS", "Rcpp", "cli", "cluster", "dplyr", "hexbin", "lattice", "latticeExtra", "lubridate", "mapproj", "mgcv", "purrr", "readr", "rlang", "tibble", "tidyr"] }, "openairmaps": { "name": "openairmaps", @@ -90119,12 +91055,12 @@ "name": "openaistream", "version": "0.3.0", "sha256": "0zihkpq6p7a3n0qdwpazds4qbpagk7zh6ziflm9194vbygyskv2z", - "depends": ["curl", "httr2", "iterators", "jsonlite", "R6"] + "depends": ["R6", "curl", "httr2", "iterators", "jsonlite"] }, "openalexR": { "name": "openalexR", - "version": "1.3.1", - "sha256": "1hhsqzplcp0xr70q9g5k45ra92c3i9rnk4xdbjnjzwyqhmjf1fiw", + "version": "1.4.0", + "sha256": "14bhwbkwxaj8vjrix7klhqqxrfkaybd83dxkvxhpnsfr7yqhls3q", "depends": ["httr", "jsonlite", "progress", "tibble"] }, "openbankeR": { @@ -90147,15 +91083,15 @@ }, "opencpu": { "name": "opencpu", - "version": "2.2.12", - "sha256": "144rq0lyag4b93gshjaf4zghshnvx5vcbnahy4x43f22r0zq5gkv", + "version": "2.2.13", + "sha256": "1gyfgv5w9bi1lng8xzkpnqr50x90qshb1q4927jxzl5l4vdzlahn", "depends": ["brew", "curl", "evaluate", "httpuv", "jsonlite", "knitr", "mime", "openssl", "protolite", "rappdirs", "remotes", "rlang", "sys", "vctrs", "webutils", "zip"] }, "opencv": { "name": "opencv", "version": "0.4.0", "sha256": "0bplljn5qpgb3yp3jlmr99vrffqr53q8hlznbzpmj78kn5f1j71y", - "depends": ["magrittr", "Rcpp"] + "depends": ["Rcpp", "magrittr"] }, "opendatatoronto": { "name": "opendatatoronto", @@ -90173,7 +91109,7 @@ "name": "openeo", "version": "1.3.1", "sha256": "02rm34mgjhcb3pp71x0rspyz7cmpmj4g5rs93xnly304il8v0rx2", - "depends": ["base64enc", "htmltools", "httr2", "IRdisplay", "jsonlite", "lubridate", "R6", "rlang", "sf"] + "depends": ["IRdisplay", "R6", "base64enc", "htmltools", "httr2", "jsonlite", "lubridate", "rlang", "sf"] }, "openintro": { "name": "openintro", @@ -90195,33 +91131,33 @@ }, "openssl": { "name": "openssl", - "version": "2.2.0", - "sha256": "1cyx2yv2l446xwf0a0im70zfd6jlpg8113ncgdydajyvx1mb9f0q", + "version": "2.2.1", + "sha256": "13gp6q8s0pdjvnd7mnmdqhmmsb0mf4m3snq99j6js8c4sll27895", "depends": ["askpass"] }, "opentripplanner": { "name": "opentripplanner", "version": "0.5.2", "sha256": "0h0dq72gfiyhnl9j8pdr295a93xcd59mqag4ca5hnvq8v93hn0cc", - "depends": ["checkmate", "curl", "data_table", "geodist", "googlePolylines", "progressr", "purrr", "RcppSimdJson", "rjson", "sf", "sfheaders"] + "depends": ["RcppSimdJson", "checkmate", "curl", "data_table", "geodist", "googlePolylines", "progressr", "purrr", "rjson", "sf", "sfheaders"] }, "openxlsx": { "name": "openxlsx", - "version": "4.2.5.2", - "sha256": "0rwvzhk2brhbf1cdpg5jmwiwx5jhr9ybzvnhw0pg4bl3wpkqjw7f", + "version": "4.2.6.1", + "sha256": "1absl7kl3gzg2rwjv3qj74clcyj6xgfbxc6232ddi8fnll3ca262", "depends": ["Rcpp", "stringi", "zip"] }, "openxlsx2": { "name": "openxlsx2", - "version": "1.7", - "sha256": "0kkkb755z2wqyjszpqsq3db489qblbkq733lr83sj01b00chw0sy", - "depends": ["magrittr", "R6", "Rcpp", "stringi", "zip"] + "version": "1.8", + "sha256": "1gicp19n8y4hid0mh3yig9cx6p0b25f56v6ndb4pggzzlff3s994", + "depends": ["R6", "Rcpp", "magrittr", "stringi", "zip"] }, "opera": { "name": "opera", "version": "1.2.0", "sha256": "09gh0c74y3n25f9p1rya8ybql5mfaqkcnr8i8wwwzfm67vqdfrnh", - "depends": ["alabama", "htmltools", "htmlwidgets", "pipeR", "rAmCharts", "Rcpp", "RcppEigen", "Rdpack"] + "depends": ["Rcpp", "RcppEigen", "Rdpack", "alabama", "htmltools", "htmlwidgets", "pipeR", "rAmCharts"] }, "operator_tools": { "name": "operator.tools", @@ -90251,13 +91187,13 @@ "name": "oppr", "version": "1.0.4", "sha256": "1kyzrpr09fmx7rhbgwy5d1s8ggl7avcrs4vjb9s6m03w756zbb3a", - "depends": ["ape", "assertthat", "cli", "ggplot2", "lpSolveAPI", "magrittr", "Matrix", "proto", "Rcpp", "RcppArmadillo", "RcppProgress", "tibble", "tidytree", "uuid", "viridisLite", "withr"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "ape", "assertthat", "cli", "ggplot2", "lpSolveAPI", "magrittr", "proto", "tibble", "tidytree", "uuid", "viridisLite", "withr"] }, "optBiomarker": { "name": "optBiomarker", "version": "1.0-28", "sha256": "10i9ir0056qxyiayg10v6v25m1b94m1wd7c8ssigiqjhjncpddw5", - "depends": ["e1071", "ipred", "MASS", "Matrix", "msm", "randomForest", "rgl", "rpanel"] + "depends": ["MASS", "Matrix", "e1071", "ipred", "msm", "randomForest", "rgl", "rpanel"] }, "optDesignSlopeInt": { "name": "optDesignSlopeInt", @@ -90281,7 +91217,7 @@ "name": "optbdmaeAT", "version": "1.0.1", "sha256": "1y1mvcyjihpj1wgjmifhmd10717wr1srp7h87azs4gfypgsiqchn", - "depends": ["igraph", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "igraph"] }, "optbin": { "name": "optbin", @@ -90303,21 +91239,21 @@ }, "optiSel": { "name": "optiSel", - "version": "2.0.8", - "sha256": "1fgh9lb4pmis8wm9vr5p7883xnhx50r5a2swdy2vlhwpgcc3caqz", - "depends": ["data_table", "doParallel", "ECOSolveR", "foreach", "kinship2", "magic", "MASS", "Matrix", "nadiv", "optiSolve", "pedigree", "plyr", "pspline", "purrr", "quadprog", "Rcpp", "RcppArmadillo", "reshape2", "stringr"] + "version": "2.0.9", + "sha256": "0n1snxh05dsrgcgzl5xm65ghixja8yb1kbkxws9i0i1zy7qm6kzp", + "depends": ["ECOSolveR", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "data_table", "doParallel", "foreach", "kinship2", "magic", "nadiv", "optiSolve", "pedigree", "plyr", "pspline", "purrr", "quadprog", "reshape2", "stringr"] }, "optiSolve": { "name": "optiSolve", "version": "1.0", "sha256": "0mhl5gdz3y3cs3p6v7z4n50na3sqj0w739gixcf4qgb1ppx0h1xa", - "depends": ["alabama", "cccp", "MASS", "Matrix", "nloptr", "plyr", "Rcpp", "shapes", "stringr"] + "depends": ["MASS", "Matrix", "Rcpp", "alabama", "cccp", "nloptr", "plyr", "shapes", "stringr"] }, "optic": { "name": "optic", "version": "1.0.1", "sha256": "166ngas1zp1ln951n26kmyfj9jcpi2fm2g2yxs9vs4as6fl1yf2n", - "depends": ["did", "dplyr", "future_apply", "lmtest", "magrittr", "MASS", "purrr", "R6", "rlang", "sandwich", "tidyr"] + "depends": ["MASS", "R6", "did", "dplyr", "future_apply", "lmtest", "magrittr", "purrr", "rlang", "sandwich", "tidyr"] }, "optical": { "name": "optical", @@ -90335,7 +91271,7 @@ "name": "opticut", "version": "0.1-3", "sha256": "1knjxfz52gisnkz62m885zf4gn73dnkhc0q2wfvmhj02vqq0sfhf", - "depends": ["betareg", "MASS", "mefa4", "pbapply", "pscl", "ResourceSelection"] + "depends": ["MASS", "ResourceSelection", "betareg", "mefa4", "pbapply", "pscl"] }, "optifunset": { "name": "optifunset", @@ -90355,12 +91291,6 @@ "sha256": "1la3v8yd9cdichp3mka4x86hr9lynh6qfg7h9ab6cwijw6kzkn6g", "depends": ["lhs", "randtoolbox", "stringr"] }, - "optimCheck": { - "name": "optimCheck", - "version": "1.0", - "sha256": "1qjkv1mfyn7sw0dkxxcdaqj85vl71cgffpf3k3mvzy0s8yhxjb4n", - "depends": [] - }, "optimLanduse": { "name": "optimLanduse", "version": "1.2.1", @@ -90383,7 +91313,7 @@ "name": "optimalThreshold", "version": "1.0", "sha256": "1m39q36p7i7z31b90awriq5jf9rfybyw5lj3m1w33v2ssipkzp1n", - "depends": ["ars", "coda", "HDInterval", "mgcv", "rjags"] + "depends": ["HDInterval", "ars", "coda", "mgcv", "rjags"] }, "optimall": { "name": "optimall", @@ -90407,13 +91337,13 @@ "name": "optimization", "version": "1.0-9", "sha256": "1pg9a78hhm0h4pfagj13r1dmynv714knhw2dxhzhcvlgk9inpam8", - "depends": ["colorspace", "Rcpp"] + "depends": ["Rcpp", "colorspace"] }, "optimizeR": { "name": "optimizeR", - "version": "1.1.0", - "sha256": "07p7bjh0jhg74csh094473dflpc1va4p45laxbdwv3hbxagk1zkx", - "depends": ["checkmate", "cli", "lbfgsb3c", "oeli", "R6", "TestFunctions", "ucminf"] + "version": "1.1.1", + "sha256": "134828h3ibypam0k0xxmj7pj6pzx084in06rmbcxgc900ibbqgb4", + "depends": ["R6", "TestFunctions", "checkmate", "cli", "lbfgsb3c", "oeli", "ucminf"] }, "optimos_prime": { "name": "optimos.prime", @@ -90473,7 +91403,7 @@ "name": "optmatch", "version": "0.10.7", "sha256": "07bx6bs5kk9pv0a2nsvq5y4bq4z17sa5f54kpxpim476xd8w43rk", - "depends": ["dplyr", "Rcpp", "rlemon", "tibble"] + "depends": ["Rcpp", "dplyr", "rlemon", "tibble"] }, "optparse": { "name": "optparse", @@ -90485,37 +91415,37 @@ "name": "optpart", "version": "3.0-3", "sha256": "18h659gbgzflq81lcchc058xjgljkmhpsjkh51ylygwrv1qjrz2i", - "depends": ["cluster", "labdsv", "MASS", "plotrix"] + "depends": ["MASS", "cluster", "labdsv", "plotrix"] }, "optrcdmaeAT": { "name": "optrcdmaeAT", "version": "1.0.0", "sha256": "16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h", - "depends": ["igraph", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "igraph"] }, "optrefine": { "name": "optrefine", "version": "1.1.0", "sha256": "1ijahjraiaax0xyr1y4s3aq1b4xk8h7ablrvy2m2fr879q3xfi9i", - "depends": ["ggplot2", "MASS", "Rglpk", "sampling"] + "depends": ["MASS", "Rglpk", "ggplot2", "sampling"] }, "optweight": { "name": "optweight", "version": "0.2.5", "sha256": "1mfk9sp47flqq7i762wip5191j8m0q9kbyxs4a7f0pd76qwf67q2", - "depends": ["ggplot2", "Matrix", "osqp"] + "depends": ["Matrix", "ggplot2", "osqp"] }, "opusminer": { "name": "opusminer", "version": "0.1-1", "sha256": "1vw6pbk1iiaxmfws95wmwf56p3afk10s5c3x9f0lliamckpyzkck", - "depends": ["arules", "Matrix", "Rcpp"] + "depends": ["Matrix", "Rcpp", "arules"] }, - "orbweaver": { - "name": "orbweaver", - "version": "0.10.2", - "sha256": "1n8gay2nsxh0pc1jc6hgs2n5knk5ajaaqisq2l5dsnkl172r62rf", - "depends": ["glue", "rlang"] + "orbital": { + "name": "orbital", + "version": "0.2.0", + "sha256": "167hpki2v1m8n0fpx3giy7pdc49lwcsn1qacgi38f7m8v0dca4ga", + "depends": ["cli", "dplyr", "rlang"] }, "orca": { "name": "orca", @@ -90545,7 +91475,7 @@ "name": "ordPens", "version": "1.1.0", "sha256": "1837d2rz42y71yq9rzzkc5pkywvyc4zbk7s4kg4kwrvxysg0y6p1", - "depends": ["glmpath", "grplasso", "mgcv", "ordinalNet", "quadprog", "RLRsim"] + "depends": ["RLRsim", "glmpath", "grplasso", "mgcv", "ordinalNet", "quadprog"] }, "ordbetareg": { "name": "ordbetareg", @@ -90569,13 +91499,13 @@ "name": "orderly", "version": "1.4.3", "sha256": "0k7xk64schhw9jdbg50hlnf6gfhlgnv1n20rz3fga02z38441xkn", - "depends": ["crayon", "DBI", "digest", "docopt", "fs", "gert", "ids", "R6", "RSQLite", "withr", "yaml", "zip"] + "depends": ["DBI", "R6", "RSQLite", "crayon", "digest", "docopt", "fs", "gert", "ids", "withr", "yaml", "zip"] }, "orders": { "name": "orders", "version": "0.1.8", "sha256": "05fq8mvqjvm4dir7zc7dxri3n6ar08afvrg49x8hbf920yqxkmq1", - "depends": ["actuar", "gamlss_dist", "Newdistns", "VGAM"] + "depends": ["Newdistns", "VGAM", "actuar", "gamlss_dist"] }, "orderstats": { "name": "orderstats", @@ -90587,7 +91517,7 @@ "name": "ordgam", "version": "0.9.1", "sha256": "0flldxv53qyiprq44670b4b98i791si3nmi983pgkzd8s39aa68l", - "depends": ["cubicBsplines", "marqLevAlg", "MASS", "Matrix", "mgcv", "numDeriv", "sn", "ucminf"] + "depends": ["MASS", "Matrix", "cubicBsplines", "marqLevAlg", "mgcv", "numDeriv", "sn", "ucminf"] }, "ordiBreadth": { "name": "ordiBreadth", @@ -90605,13 +91535,13 @@ "name": "ordinalCont", "version": "2.0.2", "sha256": "1azwcr1si3b8dxf2y59d3rxw4msfq79khzg7zgqd0kbzyka4ygl8", - "depends": ["boot", "Deriv"] + "depends": ["Deriv", "boot"] }, "ordinalForest": { "name": "ordinalForest", "version": "2.4-3", "sha256": "06blmwmn42dv6sri3j3473arrql5rihdlp7kgh56b2w1j2wdqq7s", - "depends": ["combinat", "nnet", "Rcpp", "verification"] + "depends": ["Rcpp", "combinat", "nnet", "verification"] }, "ordinalLBM": { "name": "ordinalLBM", @@ -90635,7 +91565,7 @@ "name": "ordinalbayes", "version": "0.1.1", "sha256": "13f9rv6gndjr18rfk60rmginzam1xjsssjn45l6hhl6y3gglsyzh", - "depends": ["coda", "dclone", "DESeq2", "devtools", "runjags", "SummarizedExperiment"] + "depends": ["DESeq2", "SummarizedExperiment", "coda", "dclone", "devtools", "runjags"] }, "ordinalgmifs": { "name": "ordinalgmifs", @@ -90671,7 +91601,7 @@ "name": "orf", "version": "0.1.4", "sha256": "1njcnya5f2wx50l7gyf53js16xj1y6pwgbghxq4nm4grf2ck3mz1", - "depends": ["ggplot2", "ranger", "Rcpp", "xtable"] + "depends": ["Rcpp", "ggplot2", "ranger", "xtable"] }, "org": { "name": "org", @@ -90731,7 +91661,7 @@ "name": "ormBigData", "version": "0.0.1", "sha256": "1rq202k4assmij21bjjk1ba7121p5p3rp21k548cc6lk81xj1rcc", - "depends": ["benchmarkme", "doParallel", "foreach", "Hmisc", "iterators", "rms", "SparseM"] + "depends": ["Hmisc", "SparseM", "benchmarkme", "doParallel", "foreach", "iterators", "rms"] }, "ormPlot": { "name": "ormPlot", @@ -90749,7 +91679,7 @@ "name": "oro.nifti", "version": "0.11.4", "sha256": "01mn90qxb7i15zr83xrl2cn4akayfzpm83r5x71zczz3qb9gbr7g", - "depends": ["abind", "bitops", "RNifti"] + "depends": ["RNifti", "abind", "bitops"] }, "oro_pet": { "name": "oro.pet", @@ -90773,7 +91703,7 @@ "name": "orthoDr", "version": "0.6.8", "sha256": "0dsdmrmqib5mx57v0f32dw9ybydxh80h1xn0130nrw27268bqi52", - "depends": ["dr", "MASS", "plot3D", "pracma", "Rcpp", "RcppArmadillo", "rgl", "survival"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "dr", "plot3D", "pracma", "rgl", "survival"] }, "orthogonalsplinebasis": { "name": "orthogonalsplinebasis", @@ -90803,7 +91733,7 @@ "name": "oscar", "version": "1.2.1", "sha256": "1khyl3y8rpyn0skn45wcl1saa713fh48fv6vh3hfgyf46j8ibgra", - "depends": ["hamlet", "Matrix", "pROC", "survival"] + "depends": ["Matrix", "hamlet", "pROC", "survival"] }, "osd": { "name": "osd", @@ -90835,6 +91765,12 @@ "sha256": "1fsgz4jln3nk53bxpmjpc7dcapc9j1wdqlrab169ymvrlzypgvqc", "depends": [] }, + "osmapiR": { + "name": "osmapiR", + "version": "0.1.0", + "sha256": "1bdfi1ykw3vjlca44kpn69b0snz948r8nyvg3dn1ik89f8xc9sj7", + "depends": ["curl", "httr2", "xml2"] + }, "osmclass": { "name": "osmclass", "version": "0.1.3", @@ -90845,7 +91781,7 @@ "name": "osmdata", "version": "0.2.5", "sha256": "0073dnnznq479ffnizrv8wqmfiv3gmdmmlkmkh1hxgr7p32v1i4z", - "depends": ["curl", "httr2", "lubridate", "magrittr", "Rcpp", "reproj", "rvest", "tibble", "xml2"] + "depends": ["Rcpp", "curl", "httr2", "lubridate", "magrittr", "reproj", "rvest", "tibble", "xml2"] }, "osmextract": { "name": "osmextract", @@ -90863,13 +91799,13 @@ "name": "osrm", "version": "4.2.0", "sha256": "1256pksd8mxzxi1vnl6ghhyl8f7g2li4wabs0kllw9i54yxvc83b", - "depends": ["curl", "googlePolylines", "mapiso", "RcppSimdJson", "sf"] + "depends": ["RcppSimdJson", "curl", "googlePolylines", "mapiso", "sf"] }, "osrmr": { "name": "osrmr", "version": "0.1.36", "sha256": "1vnf6g1d9fjckz9ay910nb9gr1km2adwk3b0k460mxvpr36izkh7", - "depends": ["assertthat", "bitops", "R_utils", "rjson", "stringr"] + "depends": ["R_utils", "assertthat", "bitops", "rjson", "stringr"] }, "otargen": { "name": "otargen", @@ -90887,7 +91823,7 @@ "name": "otp", "version": "0.1.1", "sha256": "19fi2a4gi6fjhhkybrlx9chph2adjqqx4h1mc214cjn6m5bg37mq", - "depends": ["base64url", "openssl", "R6"] + "depends": ["R6", "base64url", "openssl"] }, "otpr": { "name": "otpr", @@ -90907,29 +91843,23 @@ "sha256": "0rca8ln9cyikfpsf1af550cfx2zx110c8jxv64xf8dnnd09s9h7b", "depends": ["doParallel", "foreach", "mclust", "mvtnorm", "robustbase"] }, - "otsad": { - "name": "otsad", - "version": "0.2.0", - "sha256": "1jb6raxm70aywbgs7bdyw8vccy1nj924f4hkpjrlgnvzmy0hyhvs", - "depends": ["ggplot2", "plotly", "reticulate", "sigmoid"] - }, "otsfeatures": { "name": "otsfeatures", "version": "1.0.0", "sha256": "1akny7bdls9ddvkpm906ih9h7bc5sgnj03z7kkzbpy703d1y6krr", - "depends": ["astsa", "Bolstad2", "ggplot2", "latex2exp", "Rdpack"] + "depends": ["Bolstad2", "Rdpack", "astsa", "ggplot2", "latex2exp"] }, "ottr": { "name": "ottr", "version": "1.5.0", "sha256": "1b1p957plsx09xfa4qwqk2bnib1hnbikrsdn2cll17b8pfwrp29k", - "depends": ["jsonlite", "R6", "testthat", "zip"] + "depends": ["R6", "jsonlite", "testthat", "zip"] }, "ottrpal": { "name": "ottrpal", "version": "1.2.1", "sha256": "0wjavfgn9cjk83bsrcj820nxairb5jxszryqzppwwbjf844vi17y", - "depends": ["bookdown", "curl", "dplyr", "fs", "glue", "httr", "jsonlite", "knitr", "magrittr", "openssl", "purrr", "R_utils", "readr", "rmarkdown", "rprojroot", "rvest", "stringr", "xml2", "yaml"] + "depends": ["R_utils", "bookdown", "curl", "dplyr", "fs", "glue", "httr", "jsonlite", "knitr", "magrittr", "openssl", "purrr", "readr", "rmarkdown", "rprojroot", "rvest", "stringr", "xml2", "yaml"] }, "otuSummary": { "name": "otuSummary", @@ -90939,8 +91869,8 @@ }, "ouch": { "name": "ouch", - "version": "2.19", - "sha256": "15ryd76max77zwjlbijj4v7h42mscr4zqg8b01cq3gsr51l8bwkf", + "version": "2.20", + "sha256": "1r1nj4m2hw4gdaw596q14d6majcz15ppa0mfhfl8f791phcyarka", "depends": ["subplex"] }, "outForest": { @@ -90953,7 +91883,7 @@ "name": "outbreaker2", "version": "1.1.3", "sha256": "06wlmf51ciy7zy5nchfn2myvkwrvq44cnzzjl75vz32ixn8iy56v", - "depends": ["ape", "ggplot2", "magrittr", "Rcpp", "visNetwork"] + "depends": ["Rcpp", "ape", "ggplot2", "magrittr", "visNetwork"] }, "outbreaks": { "name": "outbreaks", @@ -90971,7 +91901,7 @@ "name": "outlierensembles", "version": "0.1.0", "sha256": "0m2iaf3rbpwvyrjz6qglbrinmz676hnbqqm6vc38zb3k3cjcllaq", - "depends": ["airt", "apcluster", "EstCRM", "psych"] + "depends": ["EstCRM", "airt", "apcluster", "psych"] }, "outliers": { "name": "outliers", @@ -90983,7 +91913,7 @@ "name": "outliers.ts.oga", "version": "0.0.1", "sha256": "1v10v4nw7xkrranv4pa4xqw3cayb1lq2p3qda76w6vxxwfch32pi", - "depends": ["caret", "forecast", "gsarima", "parallelly", "robust", "SLBDD"] + "depends": ["SLBDD", "caret", "forecast", "gsarima", "parallelly", "robust"] }, "outliertree": { "name": "outliertree", @@ -91027,6 +91957,18 @@ "sha256": "1s16x5kn0apb0w1f7hqzcsqvw3x621y5n6yr1qn7yb7431pdw3cz", "depends": ["bigmemory"] }, + "overtureR": { + "name": "overtureR", + "version": "0.2.1", + "sha256": "07m6ly4wci51zsrszznpcds9z8acv4lajf29s8icn21xkfsnr32f", + "depends": ["DBI", "dbplyr", "dplyr", "duckdb", "glue", "rlang", "sf"] + }, + "overturemapsr": { + "name": "overturemapsr", + "version": "0.0.4", + "sha256": "176vh7gp6ijqb4dqnk3shhrs1q0x3gz0gj1w24a7qrcp5zdp24ff", + "depends": ["arrow", "dplyr", "sf"] + }, "overviewR": { "name": "overviewR", "version": "0.0.13", @@ -91059,9 +92001,9 @@ }, "ows4R": { "name": "ows4R", - "version": "0.3-6", - "sha256": "1nzvvkixgcqpz0hxzb4fyby5c3rlh0ac3i5q00wz3w3bhhdzrdcb", - "depends": ["geometa", "httr", "keyring", "openssl", "R6", "sf", "terra", "XML"] + "version": "0.4", + "sha256": "0isp6f4q900yzx2fbm3nflm7ngpvycz33a6i1zilcjxsbyjkhxxk", + "depends": ["R6", "XML", "crayon", "geometa", "httr", "keyring", "openssl", "sf", "terra"] }, "ox": { "name": "ox", @@ -91103,7 +92045,7 @@ "name": "pARI", "version": "1.1.1", "sha256": "17dxrs4ckxh70d33n93bxr0gzsidychnyclwvnb42cqfplbndca5", - "depends": ["ARIbrain", "matrixStats", "plyr", "Rcpp", "RcppArmadillo", "RNifti"] + "depends": ["ARIbrain", "RNifti", "Rcpp", "RcppArmadillo", "matrixStats", "plyr"] }, "pAnalysis": { "name": "pAnalysis", @@ -91121,19 +92063,25 @@ "name": "pCODE", "version": "0.9.4", "sha256": "17igf35324r0dkjff7m4v9zlhsbpw4k1idvgswq3mvv449jvybsa", - "depends": ["deSolve", "fda", "MASS", "pracma"] + "depends": ["MASS", "deSolve", "fda", "pracma"] }, "pCalibrate": { "name": "pCalibrate", "version": "0.2-1", "sha256": "0gi4hjnykn4gbj9krmw4z1qy4lbxkvacczkks3zkwalw9ylwkpxl", - "depends": ["exact2x2", "MCMCpack"] + "depends": ["MCMCpack", "exact2x2"] + }, + "pEPA": { + "name": "pEPA", + "version": "1.0", + "sha256": "1a2jij7rwkcf77krwgazldbgh0hjg7dg0911x7np42sjgiqn2li5", + "depends": [] }, "pGPx": { "name": "pGPx", "version": "0.1.4", "sha256": "037grwk41z5zdcw6nc004x5hj5s6q8y7zck417ylgyygsvgazhsf", - "depends": ["DiceKriging", "KrigInv", "pbivnorm", "pracma", "randtoolbox", "Rcpp", "RcppArmadillo", "rgenoud"] + "depends": ["DiceKriging", "KrigInv", "Rcpp", "RcppArmadillo", "pbivnorm", "pracma", "randtoolbox", "rgenoud"] }, "pGRN": { "name": "pGRN", @@ -91157,7 +92105,7 @@ "name": "pROC", "version": "1.18.5", "sha256": "129cnh3kh9sr42nc7n9f14kr9svi3501834x40njynnzlr0wi4sm", - "depends": ["plyr", "Rcpp"] + "depends": ["Rcpp", "plyr"] }, "pRSR": { "name": "pRSR", @@ -91189,6 +92137,12 @@ "sha256": "0rjq0b68qh5ayn5nd174bw6h7d707fy4kli1zi74vj4yc51z0las", "depends": ["ggplot2"] }, + "paar": { + "name": "paar", + "version": "1.0.1", + "sha256": "1yc5yqx1rdvmkwz0pmzbdlpbnb4vxxhzyp0h5j74nzk22j9332f3", + "depends": ["data_table", "e1071", "gstat", "sf", "spdep"] + }, "pack": { "name": "pack", "version": "0.1-1", @@ -91199,19 +92153,19 @@ "name": "packDAMipd", "version": "1.1.0", "sha256": "0y81ap4nhvfc5k0xfcbghnf32svgkx8p01g0md3hzhyfvmgjffqm", - "depends": ["broom", "car", "data_table", "dplyr", "effects", "flextable", "ggplot2", "ggpubr", "gvlma", "hash", "haven", "IPDFileCheck", "ISLR", "labelled", "lme4", "lmtest", "MASS", "purrr", "readxl", "relaimpo", "reshape2", "rlang", "stringr", "survival", "survminer", "SurvRegCensCov", "systemfit", "tidyr", "valueEQ5D"] + "depends": ["IPDFileCheck", "ISLR", "MASS", "SurvRegCensCov", "broom", "car", "data_table", "dplyr", "effects", "flextable", "ggplot2", "ggpubr", "gvlma", "hash", "haven", "labelled", "lme4", "lmtest", "purrr", "readxl", "relaimpo", "reshape2", "rlang", "stringr", "survival", "survminer", "systemfit", "tidyr", "valueEQ5D"] }, "packHV": { "name": "packHV", "version": "2.2", "sha256": "0bj7zhlz2283y1hfdqdn7xil4wscwri1f5hszarwjwczx4n5sv81", - "depends": ["survival", "WriteXLS"] + "depends": ["WriteXLS", "survival"] }, "packMBPLSDA": { "name": "packMBPLSDA", "version": "0.9.0", "sha256": "1d9plb88d4hic6881ibij888ic3p65d0ijlsyxcghi93ag3wsfj3", - "depends": ["ade4", "doParallel", "FactoMineR", "foreach", "MASS", "pROC"] + "depends": ["FactoMineR", "MASS", "ade4", "doParallel", "foreach", "pROC"] }, "packageDiff": { "name": "packageDiff", @@ -91221,9 +92175,9 @@ }, "packageRank": { "name": "packageRank", - "version": "0.9.1", - "sha256": "1d8savfry05xy3lxd5yhvmpky34563y433yxqsa2v6p252s6d6p7", - "depends": ["cranlogs", "curl", "data_table", "ggplot2", "ISOcodes", "memoise", "pkgsearch", "R_utils", "RCurl", "rlang", "rversions", "sugrrants"] + "version": "0.9.2", + "sha256": "0k5lby2gfvqa6d9r0js3n9k6s62cnj2b31vrpik6wf4nbrps709m", + "depends": ["ISOcodes", "RCurl", "R_utils", "cranlogs", "curl", "data_table", "ggplot2", "memoise", "pkgsearch", "rlang", "rversions", "sugrrants"] }, "packagefinder": { "name": "packagefinder", @@ -91277,7 +92231,7 @@ "name": "pacotest", "version": "0.4.2", "sha256": "0zdrvcrf6ynid2wpngdslxzkpc4grcvrf6bzbrni9rvp94sfzjlf", - "depends": ["ggplot2", "gridExtra", "numDeriv", "Rcpp", "RcppArmadillo", "VineCopula"] + "depends": ["Rcpp", "RcppArmadillo", "VineCopula", "ggplot2", "gridExtra", "numDeriv"] }, "pacs": { "name": "pacs", @@ -91289,7 +92243,7 @@ "name": "padr", "version": "0.6.2", "sha256": "0mgjdva2yj9m0mps69gafy3w1c4zhik002b5b2j2zvbv3m34mw97", - "depends": ["dplyr", "lubridate", "Rcpp", "rlang"] + "depends": ["Rcpp", "dplyr", "lubridate", "rlang"] }, "pafdR": { "name": "pafdR", @@ -91317,8 +92271,8 @@ }, "pagenum": { "name": "pagenum", - "version": "1.2", - "sha256": "0nid26wmrm76ifxqpqqry232q4alf80i7df1rg237qil8asx06k1", + "version": "1.3", + "sha256": "0gcy9gsjb75v9wc03n1yazxnf1b4v5x8w4mwlsvv9d42kbx1ib3r", "depends": [] }, "pageviews": { @@ -91331,7 +92285,7 @@ "name": "pagoda2", "version": "1.0.12", "sha256": "1kck12ri52nwsrxhjs8ghjji3rv1dxxjy8bxn1kk1hbg30265fsw", - "depends": ["dendsort", "drat", "fastcluster", "igraph", "irlba", "magrittr", "MASS", "Matrix", "mgcv", "N2R", "plyr", "R_utils", "R6", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress", "rjson", "rlang", "RMTstat", "Rook", "Rtsne", "sccore", "urltools"] + "depends": ["MASS", "Matrix", "N2R", "R6", "RMTstat", "R_utils", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress", "Rook", "Rtsne", "dendsort", "drat", "fastcluster", "igraph", "irlba", "magrittr", "mgcv", "plyr", "rjson", "rlang", "sccore", "urltools"] }, "painbow": { "name": "painbow", @@ -91373,7 +92327,7 @@ "name": "pairwiseCI", "version": "0.1-27", "sha256": "0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822", - "depends": ["boot", "coin", "MASS", "MCPAN", "mcprofile"] + "depends": ["MASS", "MCPAN", "boot", "coin", "mcprofile"] }, "pak": { "name": "pak", @@ -91385,7 +92339,7 @@ "name": "palaeoSig", "version": "2.1-3", "sha256": "121akb42lqzp2vvfj6kjlaxsivxd71r7vnwyg6pcymkin94r8c3k", - "depends": ["assertr", "dplyr", "forcats", "ggplot2", "ggrepel", "magrittr", "MASS", "mgcv", "purrr", "rioja", "rlang", "TeachingDemos", "tibble", "tidyr", "vegan"] + "depends": ["MASS", "TeachingDemos", "assertr", "dplyr", "forcats", "ggplot2", "ggrepel", "magrittr", "mgcv", "purrr", "rioja", "rlang", "tibble", "tidyr", "vegan"] }, "palaeoverse": { "name": "palaeoverse", @@ -91397,7 +92351,7 @@ "name": "palasso", "version": "0.0.9", "sha256": "1qx6xa1csa4dz4vjr0q83pr22yxy01dzzqrjp5mxqqm6265wxqdh", - "depends": ["glmnet", "Matrix", "survival"] + "depends": ["Matrix", "glmnet", "survival"] }, "pald": { "name": "pald", @@ -91437,9 +92391,9 @@ }, "paleotree": { "name": "paleotree", - "version": "3.4.5", - "sha256": "09fi0fq0xpxa4d3k7fhl6rvfc302gzmjrxm979j30ixpa8rypp64", - "depends": ["ape", "jsonlite", "phangorn", "phytools", "png", "RCurl"] + "version": "3.4.7", + "sha256": "05v35w84xm186mc0f9k53fpgfx4ihfvj7523jh0ba1crjakwha6b", + "depends": ["RCurl", "ape", "jsonlite", "phangorn", "phytools", "png"] }, "palette": { "name": "palette", @@ -91461,8 +92415,8 @@ }, "palettes": { "name": "palettes", - "version": "0.2.0", - "sha256": "1clgzlhyg2iw1mgf7v6nx6vs4bvqs83c6431i59vgkmz0qbgqfik", + "version": "0.2.1", + "sha256": "0s0pdza87jq5p7biq4vnajl59gnw77m2yi0x05gb31nmvcicxf2b", "depends": ["cli", "farver", "ggplot2", "pillar", "prismatic", "purrr", "rlang", "scales", "tibble", "vctrs"] }, "palettesForR": { @@ -91487,7 +92441,7 @@ "name": "palm", "version": "1.1.5", "sha256": "108w8vsb41j1kwvymjcf5123xi8qiprcpiqynlvvfk1bp24jaz45", - "depends": ["gsl", "minqa", "mvtnorm", "R6", "Rcpp"] + "depends": ["R6", "Rcpp", "gsl", "minqa", "mvtnorm"] }, "palmerpenguins": { "name": "palmerpenguins", @@ -91509,8 +92463,8 @@ }, "pals": { "name": "pals", - "version": "1.8", - "sha256": "0z6lkvkq7b3wsxvizljf08sjqrdcj33p5kdx6074pc5jv36dylhb", + "version": "1.9", + "sha256": "1rnm6yvql39b4gbly90svbb5n9m66gc7f0abrxzkll6vsn71xfar", "depends": ["colorspace", "dichromat", "mapproj", "maps"] }, "pamm": { @@ -91523,7 +92477,7 @@ "name": "pammtools", "version": "0.5.93", "sha256": "0xihvszndsnzzh3kzn67yqqdxms5pba609lvlg68k3gfxbxk104l", - "depends": ["checkmate", "dplyr", "Formula", "ggplot2", "lazyeval", "magrittr", "mgcv", "mvtnorm", "pec", "purrr", "rlang", "survival", "tibble", "tidyr", "vctrs"] + "depends": ["Formula", "checkmate", "dplyr", "ggplot2", "lazyeval", "magrittr", "mgcv", "mvtnorm", "pec", "purrr", "rlang", "survival", "tibble", "tidyr", "vctrs"] }, "pampe": { "name": "pampe", @@ -91533,8 +92487,8 @@ }, "pamr": { "name": "pamr", - "version": "1.56.2", - "sha256": "0n7wpgzdadngj44ddsg3171wap4qhiaap75ndr6g768r3mv6q119", + "version": "1.57", + "sha256": "0gdgaspan6j4qw98357mdk7rs6r1abzzfrp63jzf99gi41v8z5h1", "depends": ["cluster", "survival"] }, "pan": { @@ -91547,7 +92501,7 @@ "name": "pander", "version": "0.6.5", "sha256": "144zkq5w7v6fpzk3x40i0baybbp0y6x2ckh4b9qljryas9mhgp9a", - "depends": ["digest", "Rcpp"] + "depends": ["Rcpp", "digest"] }, "pandoc": { "name": "pandoc", @@ -91571,7 +92525,7 @@ "name": "panelSUR", "version": "0.1.0", "sha256": "025p6dqd7fxa0nh07mwrkbvi5cb6jsfx28kskqvzf8zvar6rbr41", - "depends": ["fastmatrix", "formula_tools", "MASS", "matlib", "plm"] + "depends": ["MASS", "fastmatrix", "formula_tools", "matlib", "plm"] }, "panelView": { "name": "panelView", @@ -91583,7 +92537,7 @@ "name": "panelWranglR", "version": "1.2.13", "sha256": "0zj0m08518zi6xsa7qik61ys1qqa2lqiar4l7acclkw58w5zrmbc", - "depends": ["caret", "data_table", "Hmisc"] + "depends": ["Hmisc", "caret", "data_table"] }, "panelaggregation": { "name": "panelaggregation", @@ -91595,13 +92549,13 @@ "name": "panelhetero", "version": "1.0.1", "sha256": "12csjgcjxwl7fxlqib0vgywf32frd7jri3dj9lyq5fmz9riqkdix", - "depends": ["boot", "ggplot2", "KernSmooth", "Rearrangement"] + "depends": ["KernSmooth", "Rearrangement", "boot", "ggplot2"] }, "panelr": { "name": "panelr", "version": "0.7.8", "sha256": "0vq7f91lqpd0n507lswgj7zpp56dzps3zcvbgsp2ivaj3c9vy0s5", - "depends": ["crayon", "dplyr", "Formula", "ggplot2", "jtools", "lme4", "lmerTest", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["Formula", "crayon", "dplyr", "ggplot2", "jtools", "lme4", "lmerTest", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"] }, "panelsummary": { "name": "panelsummary", @@ -91613,7 +92567,7 @@ "name": "panelvar", "version": "0.5.5", "sha256": "15bks8aqy29rslgbjp4w8xw7w2mcpgcc77bya7a9jcs5715j9xdb", - "depends": ["ggplot2", "knitr", "MASS", "Matrix", "matrixcalc", "progress", "reshape2", "texreg"] + "depends": ["MASS", "Matrix", "ggplot2", "knitr", "matrixcalc", "progress", "reshape2", "texreg"] }, "pangaear": { "name": "pangaear", @@ -91637,7 +92591,7 @@ "name": "papci", "version": "0.1.0", "sha256": "0ma1pfwgmj6qcg23yzhbnqip4qnxhsmfnvrgrr3ln65q5plmvh58", - "depends": ["binom", "dplyr", "DT", "Hmisc", "PropCIs", "ratesci", "readxl", "shiny", "shinythemes", "tidyverse"] + "depends": ["DT", "Hmisc", "PropCIs", "binom", "dplyr", "ratesci", "readxl", "shiny", "shinythemes", "tidyverse"] }, "papeR": { "name": "papeR", @@ -91661,13 +92615,13 @@ "name": "parTimeROC", "version": "0.1.0", "sha256": "0rshkjckv0llzgp2yywrbz55ahbzcq140k78wwwsjlwymjfxim9f", - "depends": ["BH", "cubature", "DescTools", "flexsurv", "Matrix", "moments", "mvtnorm", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "sn", "StanHeaders", "survival", "VineCopula"] + "depends": ["BH", "DescTools", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "VineCopula", "cubature", "flexsurv", "moments", "mvtnorm", "rstan", "rstantools", "sn", "survival"] }, "parabar": { "name": "parabar", "version": "1.1.1", "sha256": "1hhhcxaap1ih4chf5l2c8mqkv9i4bsqml64ak3nfydsi4znymha4", - "depends": ["callr", "filelock", "progress", "R6"] + "depends": ["R6", "callr", "filelock", "progress"] }, "parade": { "name": "parade", @@ -91677,9 +92631,9 @@ }, "paradox": { "name": "paradox", - "version": "1.0.0", - "sha256": "0lll3sjyn0hmxfzg71zk53f3fddibvq7762ax7gxjgiy6zgi9mny", - "depends": ["backports", "checkmate", "data_table", "mlr3misc", "R6"] + "version": "1.0.1", + "sha256": "120ll8xrdg9s7ip0053m0i83gshxh3n79spsfwv6dzjwsj3mmpkj", + "depends": ["R6", "backports", "checkmate", "data_table", "mlr3misc"] }, "parallelDist": { "name": "parallelDist", @@ -91701,21 +92655,21 @@ }, "parallelPlot": { "name": "parallelPlot", - "version": "0.3.1", - "sha256": "12rpzcz1nc8c9rnsdg7kx6gh98plhp2jv22h58gg5gyl0pcsh2hx", + "version": "0.4.0", + "sha256": "0lchizczzsn3b147lkq3ws7zlx2106fxn6776jqkvch5aph1mrqw", "depends": ["htmlwidgets"] }, "parallelly": { "name": "parallelly", - "version": "1.37.1", - "sha256": "189ngbh9i6mqmfn4z6446in7687ddlpdq6v5rj3hr8zqinqlwznz", + "version": "1.38.0", + "sha256": "1ani63idvsx2apg3q2h9smi3sx7wbwpwpwjz585q9fyichy84b33", "depends": [] }, "parallelpam": { "name": "parallelpam", - "version": "1.4", - "sha256": "0iv11jqr9040rnw7hkfdj4vq4s7lhzz6as7f0zcy6jm36b3hllh2", - "depends": ["memuse", "Rcpp"] + "version": "1.4.3", + "sha256": "0dq50b3nrmzjjn1p05iykvvnl5g4pyx7jl552czfprsjw4wx7ans", + "depends": ["Rcpp", "memuse"] }, "param2moment": { "name": "param2moment", @@ -91723,23 +92677,29 @@ "sha256": "1k5zgzi985hglk5xh0qan6f6bsayln6vq1jykrxyxlffvpbc4hg1", "depends": [] }, + "paramDemo": { + "name": "paramDemo", + "version": "1.0.1", + "sha256": "165fz12cqpc88cmfx0xq80dnbxgkmbn8v84dxv96ggh9jsxh06d9", + "depends": [] + }, "paramGUI": { "name": "paramGUI", "version": "2.2.0", "sha256": "16z7fbrykyfysiqfrj00ks567wwrz2mpcwx75crbg45spdw0dck6", - "depends": ["fields", "shiny", "shinydashboard", "TIMP"] + "depends": ["TIMP", "fields", "shiny", "shinydashboard"] }, "parameters": { "name": "parameters", - "version": "0.21.7", - "sha256": "1br7mxfmb58f0kcinb1cyr7zvw1l37zhidsqf6280zyqqwdg46ir", + "version": "0.22.1", + "sha256": "0axyl6iwa0x6yk340g5943v1d1q023z63smxf0j6033mdikf3xm4", "depends": ["bayestestR", "datawizard", "insight"] }, "paramhetero": { "name": "paramhetero", "version": "1.0.0", "sha256": "1zkwzmh3igkwfq87v3rmp3axfspl20qn4qmpyqql6ain564yyabw", - "depends": ["ggplot2", "MASS"] + "depends": ["MASS", "ggplot2"] }, "paramlink": { "name": "paramlink", @@ -91757,7 +92717,7 @@ "name": "params", "version": "0.7.3", "sha256": "0zii9nxgl2z46vyqn2l0kdjmib90534ybpizck74mp2wp1vh9ndj", - "depends": ["glue", "purrr", "RcppTOML", "readr", "whisker"] + "depends": ["RcppTOML", "glue", "purrr", "readr", "whisker"] }, "paramsim": { "name": "paramsim", @@ -91811,7 +92771,7 @@ "name": "parma", "version": "1.7", "sha256": "0rv53d3ailqh5a0qarpw9967ghnvslr2kcn02yn8xbkpcvnb7lfk", - "depends": ["corpcor", "nloptr", "quadprog", "Rglpk", "slam", "truncnorm"] + "depends": ["Rglpk", "corpcor", "nloptr", "quadprog", "slam", "truncnorm"] }, "parmigene": { "name": "parmigene", @@ -91829,7 +92789,7 @@ "name": "paropt", "version": "0.3.3", "sha256": "0rmiamj3s0s9qcymx74lmk266mrja3mxkflf32dpahnric9rvpsl", - "depends": ["ast2ast", "dfdr", "Rcpp", "RcppArmadillo", "RcppThread", "rlang"] + "depends": ["Rcpp", "RcppArmadillo", "RcppThread", "ast2ast", "dfdr", "rlang"] }, "parqr": { "name": "parqr", @@ -91841,7 +92801,7 @@ "name": "parquetize", "version": "0.5.7", "sha256": "0vmvjycyw4kihdx13wgi8qbynnaic96wgvw2hhdjz8fjrg1lb9sy", - "depends": ["arrow", "cli", "curl", "DBI", "dplyr", "fst", "glue", "haven", "jsonlite", "lifecycle", "readr", "rlang", "RSQLite", "tidyselect"] + "depends": ["DBI", "RSQLite", "arrow", "cli", "curl", "dplyr", "fst", "glue", "haven", "jsonlite", "lifecycle", "readr", "rlang", "tidyselect"] }, "parseRPDR": { "name": "parseRPDR", @@ -91865,13 +92825,13 @@ "name": "parsel", "version": "0.3.0", "sha256": "0d2sviaq94v5szd2qq1kdpirp3zyrx6r3kyins9xyfma9026770x", - "depends": ["lubridate", "purrr", "rlang", "RSelenium"] + "depends": ["RSelenium", "lubridate", "purrr", "rlang"] }, "parsermd": { "name": "parsermd", "version": "0.1.3", "sha256": "1xlqbgx65b137849f7w01xkkj2gi8sqfm0scjjzvxmi6kr0x5awh", - "depends": ["BH", "checkmate", "cli", "dplyr", "lifecycle", "magrittr", "pillar", "purrr", "Rcpp", "readr", "rlang", "rmarkdown", "tibble", "tidyr", "tidyselect", "withr", "yaml"] + "depends": ["BH", "Rcpp", "checkmate", "cli", "dplyr", "lifecycle", "magrittr", "pillar", "purrr", "readr", "rlang", "rmarkdown", "tibble", "tidyr", "tidyselect", "withr", "yaml"] }, "parsnip": { "name": "parsnip", @@ -91913,7 +92873,7 @@ "name": "partition", "version": "0.2.1", "sha256": "0nbhkzx4rp8zm6n49sf2kdzqkyfjh9032qbkpp4f4mnk5434z1qk", - "depends": ["crayon", "dplyr", "forcats", "ggplot2", "infotheo", "magrittr", "MASS", "pillar", "progress", "purrr", "Rcpp", "RcppArmadillo", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "crayon", "dplyr", "forcats", "ggplot2", "infotheo", "magrittr", "pillar", "progress", "purrr", "rlang", "stringr", "tibble", "tidyr"] }, "partitionBEFsp": { "name": "partitionBEFsp", @@ -91925,7 +92885,7 @@ "name": "partitionComparison", "version": "0.2.6", "sha256": "1z4ckjgjsq94wbnazb3335rcy6hhqh8pf9j5d22z6qkgfgxcv7w6", - "depends": ["lpSolve", "Rdpack"] + "depends": ["Rdpack", "lpSolve"] }, "partitionMetric": { "name": "partitionMetric", @@ -91937,7 +92897,7 @@ "name": "partitions", "version": "1.10-7", "sha256": "1kxiy1wl7dr39kyfg2y9hd67s32knd83r2jsb7j9p3vg8iqq7yqb", - "depends": ["gmp", "mathjaxr", "polynom", "Rdpack", "sets"] + "depends": ["Rdpack", "gmp", "mathjaxr", "polynom", "sets"] }, "partools": { "name": "partools", @@ -91959,14 +92919,14 @@ }, "party": { "name": "party", - "version": "1.3-15", - "sha256": "05r2mp7hfqxqnhk5wy73510x7yn1r15gww4mhxkvl9jm44p7rqn0", + "version": "1.3-17", + "sha256": "0jvxy9v30aazh9rkvhwz95gaq7s64sasdlsp9ckm1ks3wyqpdq7h", "depends": ["coin", "modeltools", "mvtnorm", "sandwich", "strucchange", "survival", "zoo"] }, "partykit": { "name": "partykit", - "version": "1.2-20", - "sha256": "1np0sa7fx7wvwxbpk5lpgbdpz0xwcvppq0sc52nifx1dxnirll33", + "version": "1.2-22", + "sha256": "1nqabizmy44c6ip7clg15wljwmd66p7jzzdb3xfsh40bjym1a00g", "depends": ["Formula", "inum", "libcoin", "mvtnorm", "rpart", "survival"] }, "parzer": { @@ -92011,11 +92971,17 @@ "sha256": "16a1rk903py7bm36wkywwspq927698k1kvv5h1h7ln6rcd2376r3", "depends": ["ggeffects", "ggplot2", "glmmTMB", "lme4"] }, + "pastboon": { + "name": "pastboon", + "version": "0.1.1", + "sha256": "17qaglv3hf0llkf5v16pdb8ym5p2lhxvhvaj025qpf60x20y6zmc", + "depends": [] + }, "pastclim": { "name": "pastclim", - "version": "2.0.0", - "sha256": "00zkf6flv4f5ljn0difpa8j3n221gvflsjnfdhfjbxnnw80qbyrp", - "depends": ["curl", "lubridate", "ncdf4", "terra"] + "version": "2.1.0", + "sha256": "0wdccbnb808wc2fr2ysr7z5i9d3rjgfdd8lcmgkipdprq0ymvqak", + "depends": ["curl", "lubridate", "ncdf4", "sf", "terra", "xml2"] }, "pasteAsComment": { "name": "pasteAsComment", @@ -92051,7 +93017,7 @@ "name": "patentr", "version": "0.1.4", "sha256": "14jxqaq306mpppzz14f0qw1d0brrrkcs121h5fdiskvly3vjvs1j", - "depends": ["dplyr", "lubridate", "magrittr", "progress", "Rcpp", "rlang", "xml2"] + "depends": ["Rcpp", "dplyr", "lubridate", "magrittr", "progress", "rlang", "xml2"] }, "patentsview": { "name": "patentsview", @@ -92069,7 +93035,7 @@ "name": "pathfindR", "version": "2.4.1", "sha256": "0lwjnw6krqz2yi39as07zcpyh13c6b4d0qxxhhqbqcms6anms7q3", - "depends": ["AnnotationDbi", "DBI", "doParallel", "foreach", "fpc", "ggkegg", "ggplot2", "ggraph", "ggupset", "httr", "igraph", "knitr", "msigdbr", "org_Hs_eg_db", "pathfindR_data", "R_utils", "rmarkdown"] + "depends": ["AnnotationDbi", "DBI", "R_utils", "doParallel", "foreach", "fpc", "ggkegg", "ggplot2", "ggraph", "ggupset", "httr", "igraph", "knitr", "msigdbr", "org_Hs_eg_db", "pathfindR_data", "rmarkdown"] }, "pathfindR_data": { "name": "pathfindR.data", @@ -92105,18 +93071,18 @@ "name": "pathviewr", "version": "1.1.7", "sha256": "0n3jv5zzwb7579ymv8s6vr7nzrc3gz5bi30yf6qvqixr8j0k4ggr", - "depends": ["cowplot", "data_table", "dplyr", "fANCOVA", "ggplot2", "lubridate", "magrittr", "purrr", "R_matlab", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["R_matlab", "cowplot", "data_table", "dplyr", "fANCOVA", "ggplot2", "lubridate", "magrittr", "purrr", "stringr", "tibble", "tidyr", "tidyselect"] }, "pathwayTMB": { "name": "pathwayTMB", "version": "0.1.3", "sha256": "1zrs7l9vifrsixk20p0nxs6s8kadc3l3mj933s7ribaby2fb0r8m", - "depends": ["BiocGenerics", "caret", "clusterProfiler", "data_table", "glmnet", "maftools", "pROC", "purrr", "randomForest", "RColorBrewer", "survival", "survminer"] + "depends": ["BiocGenerics", "RColorBrewer", "caret", "clusterProfiler", "data_table", "glmnet", "maftools", "pROC", "purrr", "randomForest", "survival", "survminer"] }, "patientProfilesVis": { "name": "patientProfilesVis", - "version": "2.0.8", - "sha256": "1ivc356cr6zsyggw6if43h135ynij9c36rg9p467945q8dcf4hcr", + "version": "2.0.9", + "sha256": "1jmf86dy5hvw81jc7n0hlhl6hwvcsi270bpq7vjj5r0zdlhgjgb7", "depends": ["clinUtils", "cowplot", "ggplot2", "gridExtra", "knitr", "plyr", "reshape2", "scales", "stringr"] }, "patrick": { @@ -92131,17 +93097,23 @@ "sha256": "0s4vrhdfblllnhpz2awhhrkwm8d4170xg7fpsp7kvvqy8z8biwvi", "depends": ["data_table"] }, + "patterncausality": { + "name": "patterncausality", + "version": "0.1.1", + "sha256": "0gsh7wca9ncs8ixsj2j3vz28ab7xfmvim1zzwrn3clgwp0g1rasf", + "depends": [] + }, "patternize": { "name": "patternize", "version": "0.0.5", "sha256": "1d0x27fy41sdxhmyj4cy01xxxcbyp4hvxjcybbmgg1r4ivi1sp08", - "depends": ["abind", "ClusterR", "dplyr", "geomorph", "imager", "magrittr", "Morpho", "purrr", "raster", "RNiftyReg", "sf", "sp", "vegan"] + "depends": ["ClusterR", "Morpho", "RNiftyReg", "abind", "dplyr", "geomorph", "imager", "magrittr", "purrr", "raster", "sf", "sp", "vegan"] }, "patternplot": { "name": "patternplot", "version": "1.0.0", "sha256": "0n4y23g894amwi62lx10k15i28rsmiaw52bds8dzmvkykkp9mm8q", - "depends": ["dplyr", "ggplot2", "gridExtra", "gtable", "jpeg", "png", "R6", "Rcpp", "RcppParallel"] + "depends": ["R6", "Rcpp", "RcppParallel", "dplyr", "ggplot2", "gridExtra", "gtable", "jpeg", "png"] }, "pavo": { "name": "pavo", @@ -92175,9 +93147,9 @@ }, "paws_common": { "name": "paws.common", - "version": "0.7.3", - "sha256": "1h7xsddwjhjx5n3fns16nhk249h6mypk80d3jp7lwpianhdll90m", - "depends": ["base64enc", "curl", "digest", "httr", "jsonlite", "Rcpp", "xml2"] + "version": "0.7.4", + "sha256": "0jrnliac0la9i9mlb95p07s3p7qkp3m79haz16bf8q3wdnc522i1", + "depends": ["Rcpp", "base64enc", "curl", "digest", "httr", "jsonlite", "xml2"] }, "paws_compute": { "name": "paws.compute", @@ -92255,7 +93227,7 @@ "name": "pbANOVA", "version": "0.1.0", "sha256": "0m7946jv4zbs0k74klxkl8nbwirc48g6paqrfl5fadkd17xxqq2j", - "depends": ["DescTools", "dplyr", "lmtest", "MASS", "plyr", "Rmisc"] + "depends": ["DescTools", "MASS", "Rmisc", "dplyr", "lmtest", "plyr"] }, "pbapply": { "name": "pbapply", @@ -92307,9 +93279,9 @@ }, "pbkrtest": { "name": "pbkrtest", - "version": "0.5.2", - "sha256": "1qxnd4pfpsq762x81s3vkw09wdwpfj25bba5474g7z506pqasycf", - "depends": ["broom", "dplyr", "lme4", "MASS", "Matrix", "numDeriv"] + "version": "0.5.3", + "sha256": "0qxswrk54r40qmi9ky7jzv53mrlr2w2mrlf1czma597nzrb52gmh", + "depends": ["MASS", "Matrix", "broom", "doBy", "dplyr", "lme4", "numDeriv"] }, "pbm": { "name": "pbm", @@ -92357,13 +93329,13 @@ "name": "pcFactorStan", "version": "1.5.4", "sha256": "09mjvgvdlc85246jgi4x99jr2x2j6c5vn3y3gwjxw61cmmyybqzf", - "depends": ["BH", "igraph", "lifecycle", "loo", "mvtnorm", "Rcpp", "RcppEigen", "RcppParallel", "reshape2", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "igraph", "lifecycle", "loo", "mvtnorm", "reshape2", "rstan", "rstantools"] }, "pcIRT": { "name": "pcIRT", "version": "0.2.4", "sha256": "0crll51s14nisnaxjln7bc3b1a181v358nfkh1p5iiyn98clacl6", - "depends": ["combinat", "Rcpp"] + "depends": ["Rcpp", "combinat"] }, "pcLasso": { "name": "pcLasso", @@ -92385,15 +93357,15 @@ }, "pcaPP": { "name": "pcaPP", - "version": "2.0-4", - "sha256": "0cw18pcbpsr5rc8fxbwnzfag5g76j4hscij7j08zlbyr2436gifn", + "version": "2.0-4-1", + "sha256": "04xqicm1c16ajhzvlg17w8y50qnbqjisj3xvgpi3k18idkmmf6xx", "depends": ["mvtnorm"] }, "pcadapt": { "name": "pcadapt", "version": "4.3.5", "sha256": "106h6xvqixi1lgrx1280f7jmdyc5k6da6j9vy49iq2gyma6v2q9v", - "depends": ["bigutilsr", "data_table", "ggplot2", "magrittr", "mmapcharr", "Rcpp", "rmio", "RSpectra"] + "depends": ["RSpectra", "Rcpp", "bigutilsr", "data_table", "ggplot2", "magrittr", "mmapcharr", "rmio"] }, "pcal": { "name": "pcal", @@ -92405,7 +93377,7 @@ "name": "pcalg", "version": "2.7-11", "sha256": "14709561m2vz3y0qx1jwnxq0z464j9ddmvr8p765aclm97n87rvm", - "depends": ["abind", "bdsmatrix", "BH", "clue", "corpcor", "fastICA", "ggm", "graph", "igraph", "RBGL", "Rcpp", "RcppArmadillo", "robustbase", "sfsmisc", "vcd"] + "depends": ["BH", "RBGL", "Rcpp", "RcppArmadillo", "abind", "bdsmatrix", "clue", "corpcor", "fastICA", "ggm", "graph", "igraph", "robustbase", "sfsmisc", "vcd"] }, "pcalls": { "name": "pcalls", @@ -92429,7 +93401,7 @@ "name": "pccc", "version": "1.0.5", "sha256": "0jh8yadks76ip9jmgvld9nycdm74f5gllkyhfmnrir8vi6xwvbad", - "depends": ["dplyr", "Rcpp"] + "depends": ["Rcpp", "dplyr"] }, "pcdpca": { "name": "pcdpca", @@ -92441,13 +93413,13 @@ "name": "pcds", "version": "0.1.8", "sha256": "0cgi54lhgx0lc84nsj91qh8dy8a3f6r7zpkiqwwsx2vn4lm3lsp1", - "depends": ["combinat", "gMOIP", "interp", "plot3D", "plotrix", "Rdpack"] + "depends": ["Rdpack", "combinat", "gMOIP", "interp", "plot3D", "plotrix"] }, "pcds_ugraph": { "name": "pcds.ugraph", "version": "0.1.1", "sha256": "1mfqrc25ppqa88yqymrzlncpw8rviqgsrq50isa2v79hncijlj5v", - "depends": ["interp", "pcds", "Rdpack"] + "depends": ["Rdpack", "interp", "pcds"] }, "pcensmix": { "name": "pcensmix", @@ -92459,7 +93431,7 @@ "name": "pcev", "version": "2.2.2", "sha256": "1l0afcdzkxzkhkc8ln2fzi50hc7nfq46lg6hhx6rrzkb41w82iqw", - "depends": ["corpcor", "RMTstat"] + "depends": ["RMTstat", "corpcor"] }, "pcg": { "name": "pcg", @@ -92471,7 +93443,7 @@ "name": "pcgen", "version": "0.2.0", "sha256": "1v2fmxbj9gz5sg0hizw03ad8cfm9v25708h7fvnf6gb42b2mmyb3", - "depends": ["ggm", "graph", "Hmisc", "lme4", "MASS", "Matrix", "pcalg", "sommer"] + "depends": ["Hmisc", "MASS", "Matrix", "ggm", "graph", "lme4", "pcalg", "sommer"] }, "pch": { "name": "pch", @@ -92483,7 +93455,7 @@ "name": "pchc", "version": "1.2", "sha256": "0h1b1n9mw22wsh51nciphgyqk2cp98qkm4wskxw4ryj6lyqjk4k2", - "depends": ["bigstatsr", "bnlearn", "dcov", "doParallel", "foreach", "Rfast", "Rfast2", "robustbase"] + "depends": ["Rfast", "Rfast2", "bigstatsr", "bnlearn", "dcov", "doParallel", "foreach", "robustbase"] }, "pci": { "name": "pci", @@ -92525,7 +93497,7 @@ "name": "pcsstools", "version": "0.1.2", "sha256": "0pqc6qpl95dxphi77wcgi0v22a1q455iqaplsrvg32cf0mn3gikg", - "depends": ["gtools", "Rdpack"] + "depends": ["Rdpack", "gtools"] }, "pct": { "name": "pct", @@ -92537,19 +93509,19 @@ "name": "pctax", "version": "0.1.1", "sha256": "153vbgs3fw3x5n20wn58r3958kqrzcx0y15z5xjyc0lzhc66bzfs", - "depends": ["ade4", "dplyr", "ggnewscale", "ggplot2", "ggpubr", "ggrepel", "magrittr", "pcutils", "RColorBrewer", "reshape2", "scales", "tibble", "vegan"] + "depends": ["RColorBrewer", "ade4", "dplyr", "ggnewscale", "ggplot2", "ggpubr", "ggrepel", "magrittr", "pcutils", "reshape2", "scales", "tibble", "vegan"] }, "pcts": { "name": "pcts", "version": "0.15.7", "sha256": "1cr44w561sh05qpi0jyf2ypj4dadwyqkbaqn347v533bywasip2h", - "depends": ["BB", "gbutils", "lagged", "lubridate", "Matrix", "mcompanion", "PolynomF", "Rdpack", "sarima", "xts", "zoo"] + "depends": ["BB", "Matrix", "PolynomF", "Rdpack", "gbutils", "lagged", "lubridate", "mcompanion", "sarima", "xts", "zoo"] }, "pcutils": { "name": "pcutils", - "version": "0.2.5", - "sha256": "1fq8gzc63951q87akjqklvi4mqy29wywg0hknw7mn5zs9bim0zdd", - "depends": ["dplyr", "ggplot2", "magrittr", "RColorBrewer", "reshape2", "scales", "tibble", "tidyr"] + "version": "0.2.6", + "sha256": "1732qrr9f419a2g4wi7dnf97209k57qk9myb839sybdb3irvra9j", + "depends": ["RColorBrewer", "dplyr", "ggplot2", "magrittr", "reshape2", "scales", "tibble", "tidyr"] }, "pcv": { "name": "pcv", @@ -92559,21 +93531,21 @@ }, "pdR": { "name": "pdR", - "version": "1.9.2", - "sha256": "1g7qs1x4794rdkb0z25qxqyg3mgq8b4iq7fbiz51s6sjrmdwljk4", + "version": "1.9.3", + "sha256": "1rf7wpdswhn0m6nikzsj0xr0v1rdl4g96gkp59ikbvwjvzf58l7s", "depends": ["glmmTMB", "lme4", "pglm", "plm"] }, "pdSpecEst": { "name": "pdSpecEst", "version": "1.2.4", "sha256": "1sf2d7vh7a1qc0cq230an8pzg9qi9g640z0ql8x2pp9wfawfzn1f", - "depends": ["ddalpha", "multitaper", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "ddalpha", "multitaper"] }, "pda": { "name": "pda", "version": "1.2.7", "sha256": "0cdbjp6yrbqhkznsr282iyy76nzw9dz8z0gz48y12czjk9k6nvfd", - "depends": ["data_table", "glmnet", "httr", "jsonlite", "MASS", "metafor", "minqa", "numDeriv", "ordinal", "plyr", "Rcpp", "RcppArmadillo", "rvest", "survival"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "data_table", "glmnet", "httr", "jsonlite", "metafor", "minqa", "numDeriv", "ordinal", "plyr", "rvest", "survival"] }, "pdc": { "name": "pdc", @@ -92597,7 +93569,7 @@ "name": "pdfetch", "version": "0.2.9", "sha256": "03hx8h2sfahfy05wwrac048wzzlh1d1g6hbr0qzkkhk4xsv69qa1", - "depends": ["curl", "dplyr", "httr", "jsonlite", "lubridate", "magrittr", "readr", "stringr", "tidyr", "XML", "xml2", "xts", "zoo"] + "depends": ["XML", "curl", "dplyr", "httr", "jsonlite", "lubridate", "magrittr", "readr", "stringr", "tidyr", "xml2", "xts", "zoo"] }, "pdfminer": { "name": "pdfminer", @@ -92621,7 +93593,7 @@ "name": "pdftools", "version": "3.4.0", "sha256": "0r1c91qrva8lz0gs717llzs6zjiqjrdjhi71asf9bmx600hpp78b", - "depends": ["qpdf", "Rcpp"] + "depends": ["Rcpp", "qpdf"] }, "pdi": { "name": "pdi", @@ -92667,9 +93639,9 @@ }, "pdynmc": { "name": "pdynmc", - "version": "0.9.10", - "sha256": "1zz0q3s7cj3ypqz2hp3x2hy7d0m10130qdlk501l8w9z22f7raxq", - "depends": ["data_table", "MASS", "Matrix", "optimx", "Rdpack"] + "version": "0.9.11", + "sha256": "0lw0hnqp3czwrjwm7jbbqmkdp1rwwkfffrahs28ywbxpka0mzv1v", + "depends": ["MASS", "Matrix", "Rdpack", "data_table", "optimx"] }, "peRiodiCS": { "name": "peRiodiCS", @@ -92711,7 +93683,7 @@ "name": "pecora", "version": "0.1.1", "sha256": "0l66brd5d24hn279ck785jy4qnxiv9lc3d1czh4f3l25d0hj99xi", - "depends": ["matrixStats", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "matrixStats"] }, "pedFamilias": { "name": "pedFamilias", @@ -92741,7 +93713,7 @@ "name": "pedbp", "version": "2.0.0", "sha256": "1cs03920am54c944ca8xif5k154zwzrvb8pa8kr0j03nxymkp7dm", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "scales"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "scales"] }, "pedbuildr": { "name": "pedbuildr", @@ -92753,7 +93725,7 @@ "name": "pedgene", "version": "3.9", "sha256": "18b0galqql6pci0bfy8k93p29mqsk707wz4lr72plnciqg04l5sf", - "depends": ["CompQuadForm", "kinship2", "Matrix", "survey"] + "depends": ["CompQuadForm", "Matrix", "kinship2", "survey"] }, "pedigree": { "name": "pedigree", @@ -92771,13 +93743,7 @@ "name": "pedigreemm", "version": "0.3-4", "sha256": "1fy9fq5g94p7v2s0yih1kj4in5gqmip8dd96pls0k9ixbgcqj95v", - "depends": ["lme4", "Matrix"] - }, - "pedmod": { - "name": "pedmod", - "version": "0.2.4", - "sha256": "1xr98vp2s3s2cw4bjdw6156zas15jxvp9fbyz9rxd68i3zrblplx", - "depends": ["alabama", "BH", "psqn", "Rcpp", "RcppArmadillo", "testthat"] + "depends": ["Matrix", "lme4"] }, "pedmut": { "name": "pedmut", @@ -92789,7 +93755,7 @@ "name": "pedometrics", "version": "0.12.1", "sha256": "06s1iyv2nldqqkh1n3cgl3a7ribk17kyadgfx76lpgy016fi7vz5", - "depends": ["lattice", "latticeExtra", "Rcpp"] + "depends": ["Rcpp", "lattice", "latticeExtra"] }, "pedprobr": { "name": "pedprobr", @@ -92801,7 +93767,7 @@ "name": "pedquant", "version": "0.2.4", "sha256": "07b2jd3fryv3jdhp5wrsycnzfwhbx55dw34lxll60zn73m4ii24w", - "depends": ["curl", "data_table", "echarts4r", "httr", "jsonlite", "lubridate", "PerformanceAnalytics", "readr", "readxl", "rvest", "stringi", "TTR", "xefun", "zoo"] + "depends": ["PerformanceAnalytics", "TTR", "curl", "data_table", "echarts4r", "httr", "jsonlite", "lubridate", "readr", "readxl", "rvest", "stringi", "xefun", "zoo"] }, "pedsuite": { "name": "pedsuite", @@ -92811,8 +93777,8 @@ }, "pedtools": { "name": "pedtools", - "version": "2.6.0", - "sha256": "1df3dh0znwwp556krnfais7cs7970jzz8kgmmiiqz6c7g3acchrp", + "version": "2.7.0", + "sha256": "01zh9jks0qdry8yszfdb8rkmmp8035av3y4vxkybnaryymlnmaqy", "depends": ["kinship2", "pedmut"] }, "peermodels": { @@ -92837,7 +93803,7 @@ "name": "pema", "version": "0.1.3", "sha256": "0ymzq5s86z97sac1gq8qdh37p2aa39j4pz1n29ga3l0kmv5cxjky", - "depends": ["BH", "ggplot2", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "shiny", "sn", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "rstan", "rstantools", "shiny", "sn"] }, "pempi": { "name": "pempi", @@ -92849,19 +93815,19 @@ "name": "pems.utils", "version": "0.2.29.1", "sha256": "0nmawl1l2wf77r02qpazqwm5708fk98k7l07wyybviwb1j3x1pqj", - "depends": ["baseline", "dplyr", "ggplot2", "lattice", "latticeExtra", "loa", "RColorBrewer", "Rcpp", "rlang"] + "depends": ["RColorBrewer", "Rcpp", "baseline", "dplyr", "ggplot2", "lattice", "latticeExtra", "loa", "rlang"] }, "pemultinom": { "name": "pemultinom", "version": "0.1.0", "sha256": "0xxcar0vmp6cc58471n5lnp5z5avrn3cv60mjdc96ifms0ghi3vl", - "depends": ["doParallel", "foreach", "magrittr", "nnet", "Rcpp"] + "depends": ["Rcpp", "doParallel", "foreach", "magrittr", "nnet"] }, "penAFT": { "name": "penAFT", "version": "0.3.0", "sha256": "1yhg9fr3fwpxxcp0ri4iqfwa9f2y134y5b13qfils4y15cp0rnzj", - "depends": ["ggplot2", "irlba", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "ggplot2", "irlba"] }, "penMSM": { "name": "penMSM", @@ -92885,7 +93851,7 @@ "name": "penalizedSVM", "version": "1.1.4", "sha256": "1vafdczbqrwj9cagjd7la81jsrqkn917sxppxvz3i608yfl32igl", - "depends": ["corpcor", "e1071", "MASS", "mlegp", "statmod", "tgp"] + "depends": ["MASS", "corpcor", "e1071", "mlegp", "statmod", "tgp"] }, "penalizedcdf": { "name": "penalizedcdf", @@ -92909,13 +93875,13 @@ "name": "pencal", "version": "2.2.2", "sha256": "1wafrq4qgljycdmxhgc2jgbd2ayr9h4nbvss6l5dk2fxsq7yyv6x", - "depends": ["doParallel", "dplyr", "foreach", "glmnet", "lcmm", "magic", "MASS", "Matrix", "nlme", "purrr", "riskRegression", "survcomp", "survival", "survivalROC"] + "depends": ["MASS", "Matrix", "doParallel", "dplyr", "foreach", "glmnet", "lcmm", "magic", "nlme", "purrr", "riskRegression", "survcomp", "survival", "survivalROC"] }, "pencopulaCond": { "name": "pencopulaCond", "version": "0.2", "sha256": "18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511", - "depends": ["doParallel", "fda", "foreach", "igraph", "lattice", "latticeExtra", "pacotest", "quadprog", "TSP"] + "depends": ["TSP", "doParallel", "fda", "foreach", "igraph", "lattice", "latticeExtra", "pacotest", "quadprog"] }, "pendensity": { "name": "pendensity", @@ -92933,13 +93899,13 @@ "name": "penppml", "version": "0.2.3", "sha256": "1pxfnq5z7aygd2i3qcn2nvzvbw83gp4zhy3bavir3vpjd655llc3", - "depends": ["collapse", "devtools", "dplyr", "fixest", "glmnet", "magrittr", "matrixStats", "Rcpp", "RcppEigen", "rlang"] + "depends": ["Rcpp", "RcppEigen", "collapse", "devtools", "dplyr", "fixest", "glmnet", "magrittr", "matrixStats", "rlang"] }, "pense": { "name": "pense", - "version": "2.2.0", - "sha256": "1v077lmi7hs793yqv9m4ir0hd8s671714nj2gf3ya48qjmbizyg0", - "depends": ["lifecycle", "Matrix", "Rcpp", "RcppArmadillo", "rlang"] + "version": "2.2.2", + "sha256": "00z4safn8p0k7ib3jks60lz5cdbm5384cpf95p6js8a8an8p8lb6", + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "lifecycle", "rlang"] }, "pensim": { "name": "pensim", @@ -92951,7 +93917,7 @@ "name": "pensynth", "version": "0.5.1", "sha256": "1ph3552y3jsm9kmv68bx15xn383djq2yhc34rpvazc8dyd3impkv", - "depends": ["clarabel", "Matrix"] + "depends": ["Matrix", "clarabel"] }, "peopleanalytics": { "name": "peopleanalytics", @@ -92987,19 +93953,19 @@ "name": "pepr", "version": "0.5.0", "sha256": "0q2pfsch6g3zhaj6cffg6rzmlrmzwpvny84nls6x5jjljhan4nzz", - "depends": ["data_table", "pryr", "RCurl", "stringr", "yaml"] + "depends": ["RCurl", "data_table", "pryr", "stringr", "yaml"] }, "peptoolkit": { "name": "peptoolkit", "version": "0.0.1", "sha256": "067x3v8m3ph2mqcglbd2h4y7xsslcvdr5iailiqxzfqg77mcqxx6", - "depends": ["caret", "dplyr", "Peptides", "stringr"] + "depends": ["Peptides", "caret", "dplyr", "stringr"] }, "perARMA": { "name": "perARMA", "version": "1.7", "sha256": "1d3gg5yb2gj3mfmk72lps40hkiaf65wv7zhhgxf918kqyqi5zhs2", - "depends": ["corpcor", "gnm", "matlab", "Matrix", "signal"] + "depends": ["Matrix", "corpcor", "gnm", "matlab", "signal"] }, "peramo": { "name": "peramo", @@ -93015,8 +93981,8 @@ }, "performance": { "name": "performance", - "version": "0.12.0", - "sha256": "0py6b1mix26z7fmarya7gfa9bwb8ymsr7z78ag8kld6ih3slga7z", + "version": "0.12.2", + "sha256": "0a20xnky7h6hgd6sk9n5jb4a2s201kr0cibhbii8i3jvnhz6cpmm", "depends": ["bayestestR", "datawizard", "insight"] }, "performanceEstimation": { @@ -93035,7 +94001,7 @@ "name": "periscope2", "version": "0.2.3", "sha256": "00zjap5l8aqyn6ykf3vmhsgiahkkgzkakjzc7z0wlm5ksv0cskdm", - "depends": ["bs4Dash", "DT", "fresh", "lifecycle", "lubridate", "shiny", "shinyFeedback", "shinyWidgets", "writexl", "yaml"] + "depends": ["DT", "bs4Dash", "fresh", "lifecycle", "lubridate", "shiny", "shinyFeedback", "shinyWidgets", "writexl", "yaml"] }, "perm": { "name": "perm", @@ -93069,27 +94035,27 @@ }, "perms": { "name": "perms", - "version": "1.13", - "sha256": "0zi7a8pai7j2i9ckfn87f2g5nm3r54631cib0lz0xdzczad2j2nr", - "depends": ["doParallel", "foreach", "MASS", "mclust", "Rdpack"] + "version": "1.14", + "sha256": "1qw6pqiw4jn5qgdr0i8h0m1jlaa218khbn8z3xdp82csx4y8ia1l", + "depends": ["Rdpack", "doParallel", "foreach"] }, "permubiome": { "name": "permubiome", "version": "1.3.2", "sha256": "102xmz27c97nc6wlllqq1k3nkvv28a0j7vx1msl0c7m6w2z6395b", - "depends": ["dabestr", "dplyr", "ggplot2", "gridExtra", "Matrix", "rlang"] + "depends": ["Matrix", "dabestr", "dplyr", "ggplot2", "gridExtra", "rlang"] }, "permuco": { "name": "permuco", "version": "1.1.2", "sha256": "0lh7n94hchq7wcp8j27c1m2v0xa5mq1dzpdvzkv2cwagy45v4383", - "depends": ["Matrix", "permute", "Rcpp"] + "depends": ["Matrix", "Rcpp", "permute"] }, "permutations": { "name": "permutations", - "version": "1.1-2", - "sha256": "0ilwf5d3cl6vv7dgdcdw4crlrxa6h5q4d3z17la71k3cz6ib3hvk", - "depends": ["freealg", "magic", "mathjaxr", "numbers", "partitions"] + "version": "1.1-5", + "sha256": "1cw6z9cw1pvkyf6c9v0rkfx3mr0bpncji4hsj1smxpq3y0pdwajx", + "depends": ["freealg", "magic", "numbers", "partitions"] }, "permute": { "name": "permute", @@ -93137,7 +94103,7 @@ "name": "personalized2part", "version": "0.0.1", "sha256": "104flqjyf0x0619msyc0vlkg61znvhf0v86fsdpksdxkgwb7wv7j", - "depends": ["foreach", "HDtweedie", "personalized", "Rcpp", "RcppEigen"] + "depends": ["HDtweedie", "Rcpp", "RcppEigen", "foreach", "personalized"] }, "personalr": { "name": "personalr", @@ -93191,13 +94157,13 @@ "name": "pestr", "version": "0.8.2", "sha256": "15w89cipky9di4csbp0cbw7s3qslr5mk94wivps77i3k0j9ys74g", - "depends": ["curl", "DBI", "dplyr", "httr", "jsonlite", "magrittr", "readr", "rlang", "RSQLite", "tidyr"] + "depends": ["DBI", "RSQLite", "curl", "dplyr", "httr", "jsonlite", "magrittr", "readr", "rlang", "tidyr"] }, "petersenlab": { "name": "petersenlab", "version": "1.0.0", "sha256": "1333k1kcy1ih9z09bl37zalsqrgf2xkqkqnsm28clc0r5np8df1d", - "depends": ["digest", "dplyr", "ggplot2", "Hmisc", "lavaan", "mitools", "mix", "mvtnorm", "nlme", "plyr", "psych", "RColorBrewer", "reshape2", "scales", "stringr", "tidyselect", "viridisLite", "xtable"] + "depends": ["Hmisc", "RColorBrewer", "digest", "dplyr", "ggplot2", "lavaan", "mitools", "mix", "mvtnorm", "nlme", "plyr", "psych", "reshape2", "scales", "stringr", "tidyselect", "viridisLite", "xtable"] }, "petitr": { "name": "petitr", @@ -93215,7 +94181,7 @@ "name": "pewdata", "version": "0.3.2", "sha256": "1a4ci8hzpmwxs48lsppswcwkxv72yn44w486m9izwvx8wr1nlh2d", - "depends": ["foreign", "magrittr", "purrr", "rio", "RSelenium", "stringr"] + "depends": ["RSelenium", "foreign", "magrittr", "purrr", "rio", "stringr"] }, "pexm": { "name": "pexm", @@ -93227,13 +94193,13 @@ "name": "pez", "version": "1.2-4", "sha256": "1z3lpbijivr32r9y0lh2yxsww7sz9kqmsvnril1gzn09d498xz3b", - "depends": ["ade4", "animation", "ape", "caper", "FD", "Matrix", "mvtnorm", "phytools", "picante", "quantreg", "vegan"] + "depends": ["FD", "Matrix", "ade4", "animation", "ape", "caper", "mvtnorm", "phytools", "picante", "quantreg", "vegan"] }, "pfa": { "name": "pfa", "version": "1.1", "sha256": "0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31", - "depends": ["lars", "POET", "quantreg"] + "depends": ["POET", "lars", "quantreg"] }, "pfica": { "name": "pfica", @@ -93257,13 +94223,13 @@ "name": "pgKDEsphere", "version": "1.0.1", "sha256": "01ck72mjzpkihkifsg2ca3xxivq7xq47483pl7dwy8xfjm2s0csd", - "depends": ["circular", "Directional", "DirStats", "matrixStats", "movMF", "Rcpp", "RcppArmadillo", "rgl", "rotasym"] + "depends": ["DirStats", "Directional", "Rcpp", "RcppArmadillo", "circular", "matrixStats", "movMF", "rgl", "rotasym"] }, "pgTools": { "name": "pgTools", "version": "1.0.2", "sha256": "1262q30ci6h10sk54s9wbadz6v22y4k6m32sclxw93kkvgvlkj6b", - "depends": ["data_table", "DBI", "odbc", "stringi", "toolbox"] + "depends": ["DBI", "data_table", "odbc", "stringi", "toolbox"] }, "pgam": { "name": "pgam", @@ -93281,7 +94247,7 @@ "name": "pgee.mixed", "version": "0.1.0", "sha256": "115vvpv54q80486i3xs2yhmfyx476cf4g1v43q6l7wj3jwzcrvbg", - "depends": ["copula", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "copula", "mvtnorm"] }, "pgenlibr": { "name": "pgenlibr", @@ -93317,13 +94283,13 @@ "name": "pgraph", "version": "1.6", "sha256": "1mfpyj4ahs5szkzzv5fs9g26651vcnign3mkfgp23g8nlrs50cqa", - "depends": ["energy", "glasso", "glmnet", "SAM"] + "depends": ["SAM", "energy", "glasso", "glmnet"] }, "pgsc": { "name": "pgsc", "version": "1.0.0", "sha256": "1y4szqn1jhp3yn8q738dpbhnqcqk45vgbmczamai154w3wb0qai7", - "depends": ["nloptr", "Rcpp", "RcppArmadillo", "reshape2"] + "depends": ["Rcpp", "RcppArmadillo", "nloptr", "reshape2"] }, "ph2bayes": { "name": "ph2bayes", @@ -93335,7 +94301,7 @@ "name": "ph2bye", "version": "0.1.4", "sha256": "0h5d8d4bagkp6g0nb67cb225ki5p1amnclnfj6afgdcsli5clr67", - "depends": ["animation", "nleqslv", "Rcpp", "VGAM"] + "depends": ["Rcpp", "VGAM", "animation", "nleqslv"] }, "ph2mult": { "name": "ph2mult", @@ -93347,13 +94313,13 @@ "name": "phacking", "version": "0.2.1", "sha256": "0spx3aq35mpd6z87zfn4019jnazang45w3ly2p8kgxcp0wqj67h8", - "depends": ["BH", "dplyr", "ggplot2", "metabias", "metafor", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "rlang", "rstan", "rstantools", "StanHeaders", "truncnorm"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "dplyr", "ggplot2", "metabias", "metafor", "purrr", "rlang", "rstan", "rstantools", "truncnorm"] }, "phangorn": { "name": "phangorn", "version": "2.11.1", "sha256": "086lxqzqx1n3237h9q28r54libaz2xk9h3f6vfj8l49yw356w28h", - "depends": ["ape", "digest", "fastmatch", "generics", "igraph", "Matrix", "quadprog", "Rcpp"] + "depends": ["Matrix", "Rcpp", "ape", "digest", "fastmatch", "generics", "igraph", "quadprog"] }, "phantSEM": { "name": "phantSEM", @@ -93375,8 +94341,8 @@ }, "pharmaverseadam": { "name": "pharmaverseadam", - "version": "0.2.0", - "sha256": "18pmbvjy4v7182kriffp733snb84inqjii6gj1g0l5ahh24k7xim", + "version": "1.0.0", + "sha256": "1nwm0mbaaca5ry449h1llvv44wcy2lgd4bs3wfacb9ag2pfgglc8", "depends": [] }, "pharmaversesdtm": { @@ -93395,13 +94361,13 @@ "name": "phase", "version": "1.2.9", "sha256": "12v453jn99jzvicr5xipzkgb1yqmrkv9gbpw7ykl19kakw7qnqs3", - "depends": ["behavr", "circular", "lubridate", "plotly", "pracma", "shiny", "shinycssloaders", "shinydashboard", "shinyFiles", "shinythemes", "signal", "wesanderson", "zeitgebr", "zoo"] + "depends": ["behavr", "circular", "lubridate", "plotly", "pracma", "shiny", "shinyFiles", "shinycssloaders", "shinydashboard", "shinythemes", "signal", "wesanderson", "zeitgebr", "zoo"] }, "phase1PRMD": { "name": "phase1PRMD", "version": "1.0.2", "sha256": "0gr73nsp0an0ci6l86h9fw6l791jdw0b1497qi58w25zypggdyac", - "depends": ["arrayhelpers", "coda", "dplyr", "ggplot2", "gridExtra", "kableExtra", "knitr", "MASS", "plyr", "RColorBrewer", "reshape2", "rjags"] + "depends": ["MASS", "RColorBrewer", "arrayhelpers", "coda", "dplyr", "ggplot2", "gridExtra", "kableExtra", "knitr", "plyr", "reshape2", "rjags"] }, "phase1RMD": { "name": "phase1RMD", @@ -93419,7 +94385,7 @@ "name": "phateR", "version": "1.0.7", "sha256": "16xb6fy0aa024054jwfbavjbzhwj6g4p6yrzy1lnzvpn8kb23hn5", - "depends": ["ggplot2", "Matrix", "memoise", "reticulate"] + "depends": ["Matrix", "ggplot2", "memoise", "reticulate"] }, "phd": { "name": "phd", @@ -93431,25 +94397,25 @@ "name": "phdcocktail", "version": "0.1.0", "sha256": "02gsyjqmafl5aw18lzd54ldfy521r9r9iwqlc44yqn70pi0i8rrs", - "depends": ["ggplot2", "here", "RColorBrewer", "rstudioapi", "scales"] + "depends": ["RColorBrewer", "ggplot2", "here", "rstudioapi", "scales"] }, "pheatmap": { "name": "pheatmap", "version": "1.0.12", "sha256": "1hdh74az3vyzz6dqa311rhxdm74n46lyr03p862kn80p0kp9d7ap", - "depends": ["gtable", "RColorBrewer", "scales"] + "depends": ["RColorBrewer", "gtable", "scales"] }, "pheble": { "name": "pheble", "version": "0.1.0", "sha256": "14q66ldpksxsh5q7mpgp4d9p43kbx1v4yqd35p3gqi6qxrlb5q1z", - "depends": ["adabag", "C50", "caret", "caTools", "data_table", "doParallel", "dplyr", "e1071", "earth", "evtree", "frbs", "glmnet", "gmodels", "hda", "HDclassif", "ipred", "kernlab", "kknn", "klaR", "magrittr", "MASS", "Matrix", "mda", "MLmetrics", "nnet", "party", "pls", "randomForest", "rpartScore", "sparseLDA", "themis"] + "depends": ["C50", "HDclassif", "MASS", "MLmetrics", "Matrix", "adabag", "caTools", "caret", "data_table", "doParallel", "dplyr", "e1071", "earth", "evtree", "frbs", "glmnet", "gmodels", "hda", "ipred", "kernlab", "kknn", "klaR", "magrittr", "mda", "nnet", "party", "pls", "randomForest", "rpartScore", "sparseLDA", "themis"] }, "phecodemap": { "name": "phecodemap", "version": "0.1.0", "sha256": "12dhyzazdsf938zp7i4ckbh2h5fvxg209mb4mq319akp34746h50", - "depends": ["collapsibleTree", "config", "dplyr", "DT", "golem", "plotly", "purrr", "readr", "rintrojs", "shiny", "shinyBS", "shinycssloaders", "shinydashboard", "shinydashboardPlus"] + "depends": ["DT", "collapsibleTree", "config", "dplyr", "golem", "plotly", "purrr", "readr", "rintrojs", "shiny", "shinyBS", "shinycssloaders", "shinydashboard", "shinydashboardPlus"] }, "phenModel": { "name": "phenModel", @@ -93473,13 +94439,13 @@ "name": "phenmod", "version": "1.2-7", "sha256": "1gxag58gbm3xmy9w0qx7j70bgdy8bwwjh2xz1iffbghvshximi1s", - "depends": ["gstat", "lattice", "pheno", "RColorBrewer"] + "depends": ["RColorBrewer", "gstat", "lattice", "pheno"] }, "pheno": { "name": "pheno", "version": "1.7-0", "sha256": "1hg2gqz3ibawn5ah1hffgfp15cis75nwd04jha09mjpkn1w8h9lg", - "depends": ["nlme", "quantreg", "SparseM"] + "depends": ["SparseM", "nlme", "quantreg"] }, "phenoCDM": { "name": "phenoCDM", @@ -93491,13 +94457,13 @@ "name": "phenocamr", "version": "1.1.5", "sha256": "1w9lzlmp4q2x12qhp4xmschcd79razy5fybq94381l7dshrwvzln", - "depends": ["changepoint", "daymetr", "httr", "jsonlite", "memoise", "MODISTools", "zoo"] + "depends": ["MODISTools", "changepoint", "daymetr", "httr", "jsonlite", "memoise", "zoo"] }, "phenofit": { "name": "phenofit", "version": "0.3.9", "sha256": "1b6laz7idd4cbliidv0xqz0k1h5f2f0v9lz82qhsy7p7pm9zagi6", - "depends": ["data_table", "dplyr", "ggplot2", "gridExtra", "lubridate", "magrittr", "numDeriv", "optimx", "purrr", "Rcpp", "RcppArmadillo", "stringr", "ucminf", "zeallot", "zoo"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "dplyr", "ggplot2", "gridExtra", "lubridate", "magrittr", "numDeriv", "optimx", "purrr", "stringr", "ucminf", "zeallot", "zoo"] }, "phenolocrop": { "name": "phenolocrop", @@ -93539,30 +94505,30 @@ "name": "phia", "version": "0.3-1", "sha256": "1lsprm49njwp0gfn4knvwdq7d5lpq4irhysl8f26glcz9x929sff", - "depends": ["car", "Matrix"] + "depends": ["Matrix", "car"] }, "philentropy": { "name": "philentropy", "version": "0.8.0", "sha256": "0gmycszk86mc9clmxfdrspqh5z0g3cw2cgzaaqngxx38h68x99is", - "depends": ["KernSmooth", "poorman", "Rcpp"] + "depends": ["KernSmooth", "Rcpp", "poorman"] }, "phm": { "name": "phm", "version": "1.1.2", "sha256": "05ymrynv5zzrbj3vsdrijay841hv5jbkn8c0v4l6dqndysl9xis4", - "depends": ["data_table", "Matrix", "NLP", "shiny", "smallstuff", "tm"] + "depends": ["Matrix", "NLP", "data_table", "shiny", "smallstuff", "tm"] }, "phoenics": { "name": "phoenics", - "version": "0.1", - "sha256": "06312f3awzpgfhzl4ahla37hkw0nqyw8zb5yv7m25i53x0afxwr5", - "depends": ["blme", "factoextra", "FactoMineR", "lme4", "tibble", "tidyr"] + "version": "0.3", + "sha256": "1a7dws11pf2bpgkvchddr14v6zvbn16xwqrdmmz9plw9lindc00j", + "depends": ["FactoMineR", "blme", "factoextra", "lme4", "tibble", "tidyr"] }, "phoenix": { "name": "phoenix", - "version": "1.1.0", - "sha256": "1yhjbj1wgjlywa965d89pzk9c8gm3bjaapmi2dpdf7nzj9114n9r", + "version": "1.1.1", + "sha256": "0vb1y6ga3gjgm7xhaa2pv61cc4a8i45bdf1pvk2ym4l6c717s3yp", "depends": [] }, "phonR": { @@ -93585,15 +94551,15 @@ }, "phonfieldwork": { "name": "phonfieldwork", - "version": "0.0.14", - "sha256": "130gcpcblniasnqjjp085225ccq98wyqhcknxcn0iqs4v6m59dyc", + "version": "0.0.17", + "sha256": "0ysxa6zxd8mb798bm6vsdhnnnl2y2vyhfi4kbv64qsgjbyjqjkvh", "depends": ["mime", "phonTools", "readr", "rmarkdown", "tuneR", "xml2"] }, "phonics": { "name": "phonics", "version": "1.3.10", "sha256": "1g4gmfz190xaj800gawl79fzhmgimssa31kqzw8a70scp5psz3fw", - "depends": ["BH", "data_table", "Rcpp"] + "depends": ["BH", "Rcpp", "data_table"] }, "phosphoricons": { "name": "phosphoricons", @@ -93669,8 +94635,8 @@ }, "phreeqc": { "name": "phreeqc", - "version": "3.7.6", - "sha256": "086c8lpg6sq57j4q1nazl9gx51mfc5yz22yrw9qz115v8hbmq7w3", + "version": "3.8.0", + "sha256": "0ywhxqc33ybwlch2ym6wgm5s4dillhwg3ccdiz9iklv0i85grmd8", "depends": [] }, "phsmethods": { @@ -93713,13 +94679,13 @@ "name": "phyloTop", "version": "2.1.2", "sha256": "1f7sr0qp5i0kj1j2xr7fwpkjnpfnpdjy51dx33yz2q8jmn2axxdf", - "depends": ["ape", "igraph", "NHPoisson", "phylobase"] + "depends": ["NHPoisson", "ape", "igraph", "phylobase"] }, "phylobase": { "name": "phylobase", "version": "0.8.12", "sha256": "084gfzq51acmvzbsfpkqv3kgghdbncnwr008f95yf5b2vihcm0cv", - "depends": ["ade4", "ape", "Rcpp", "rncl", "RNeXML"] + "depends": ["RNeXML", "Rcpp", "ade4", "ape", "rncl"] }, "phylocanvas": { "name": "phylocanvas", @@ -93757,6 +94723,12 @@ "sha256": "1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il", "depends": ["mvtnorm"] }, + "phylopairs": { + "name": "phylopairs", + "version": "0.1.0", + "sha256": "0rspl6py8zjx5cs4q3cba1f7lvfvry4c06m5ng2ckwggjwpjcnam", + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ape", "loo", "phytools", "rstan", "rstantools"] + }, "phylopath": { "name": "phylopath", "version": "1.3.0", @@ -93767,13 +94739,13 @@ "name": "phyloraster", "version": "2.1.0", "sha256": "0xildxiv8k2hrxdp0zkf939zbag62griq1ksalq0vfb32sb5l106", - "depends": ["ape", "SESraster", "terra"] + "depends": ["SESraster", "ape", "terra"] }, "phyloregion": { "name": "phyloregion", "version": "1.0.8", "sha256": "10i5s3dv71nr0m3wmph2rynzg9zj8xqzb6a25r5kj66r8v91jz3d", - "depends": ["ape", "betapart", "clustMixType", "colorspace", "igraph", "maptpx", "Matrix", "phangorn", "predicts", "smoothr", "terra", "vegan"] + "depends": ["Matrix", "ape", "betapart", "clustMixType", "colorspace", "igraph", "maptpx", "phangorn", "predicts", "smoothr", "terra", "vegan"] }, "phylosamp": { "name": "phylosamp", @@ -93785,7 +94757,7 @@ "name": "phylosem", "version": "1.1.4", "sha256": "0x93v0316xd79ab0pdc0w4pb4ljds89ihpp7a61kfdla7v2548bj", - "depends": ["ape", "phylobase", "phylopath", "RcppEigen", "sem", "TMB"] + "depends": ["RcppEigen", "TMB", "ape", "phylobase", "phylopath", "sem"] }, "phyloseqGraphTest": { "name": "phyloseqGraphTest", @@ -93797,7 +94769,7 @@ "name": "phylosignal", "version": "1.3.1", "sha256": "13gahqnxvqzvyr4x1aq3cq08832ljizsa5c71hf44175dfmdz5cd", - "depends": ["adephylo", "ape", "boot", "DBI", "igraph", "phylobase", "Rcpp", "RcppArmadillo"] + "depends": ["DBI", "Rcpp", "RcppArmadillo", "adephylo", "ape", "boot", "igraph", "phylobase"] }, "phylotate": { "name": "phylotate", @@ -93815,13 +94787,13 @@ "name": "phylter", "version": "0.9.11", "sha256": "1dkm6wfrmbbx7ygfbvk68mv4ay3986wzy0wadxskbbvbvqcshjqa", - "depends": ["ape", "ggplot2", "Rcpp", "RcppArmadillo", "RcppEigen", "reshape2", "Rfast", "RSpectra"] + "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "RcppEigen", "Rfast", "ape", "ggplot2", "reshape2"] }, "phyr": { "name": "phyr", "version": "1.1.0", "sha256": "0jvjxvxx2nz9ra9vp00bmm3dxr2am4zs8cvxij8w4jjyskznxc96", - "depends": ["ape", "dplyr", "gridExtra", "latticeExtra", "lme4", "Matrix", "mvtnorm", "nloptr", "Rcpp", "RcppArmadillo", "tidyr"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "ape", "dplyr", "gridExtra", "latticeExtra", "lme4", "mvtnorm", "nloptr", "tidyr"] }, "phyreg": { "name": "phyreg", @@ -93839,19 +94811,19 @@ "name": "phytoclass", "version": "1.2.0", "sha256": "12b1xmzwcp90km4irjsrnks44b1rd82p8yn9cn4m6hsaiq6mb45c", - "depends": ["bestNormalize", "dplyr", "dynamicTreeCut", "ggplot2", "Metrics", "RcppML", "tidyr"] + "depends": ["Metrics", "RcppML", "bestNormalize", "dplyr", "dynamicTreeCut", "ggplot2", "tidyr"] }, "phytools": { "name": "phytools", "version": "2.3-0", "sha256": "10fh8svaxdk7s9abbzih9pj6carmv4r6fzbxlfafygxyjnk20c4p", - "depends": ["ape", "clusterGeneration", "coda", "combinat", "DEoptim", "doParallel", "expm", "foreach", "maps", "MASS", "mnormt", "nlme", "numDeriv", "optimParallel", "phangorn", "scatterplot3d"] + "depends": ["DEoptim", "MASS", "ape", "clusterGeneration", "coda", "combinat", "doParallel", "expm", "foreach", "maps", "mnormt", "nlme", "numDeriv", "optimParallel", "phangorn", "scatterplot3d"] }, "piar": { "name": "piar", "version": "0.7.0", "sha256": "04m2xcym1pm0v6riz18mdfjzhgw9hpi67djym2a15970av15ld9l", - "depends": ["gpindex", "Matrix"] + "depends": ["Matrix", "gpindex"] }, "picClip": { "name": "picClip", @@ -93895,17 +94867,23 @@ "sha256": "15zk36cpip49286djl45qqdfbj4w3yc6if1vk4bqphrascrg2val", "depends": ["cli", "glue", "rlang", "stringi", "stringr"] }, + "piecenorms": { + "name": "piecenorms", + "version": "1.1.0", + "sha256": "0cxr26j7gda9c8zqw4rcnhbm8740gfrq9fi7p24bg4z4cp78fl5n", + "depends": ["COINr", "R6", "classInt", "dplyr", "rlang", "scales", "univariateML", "vdiffr"] + }, "piecepackr": { "name": "piecepackr", - "version": "1.13.10", - "sha256": "1pplmwgi0wyp4qx6arlh96qiqxhlwb77g57bx70r10p99pfmjhyn", - "depends": ["gridGeometry", "grImport2", "jpeg", "png", "purrr", "R6", "rlang", "stringr", "tibble"] + "version": "1.13.11", + "sha256": "12xcl0p85dxa1zr5ps4aa3jqqlf2hnwyghj8g00f5km7534irxcs", + "depends": ["R6", "grImport2", "gridGeometry", "jpeg", "png", "purrr", "rlang", "stringr", "tibble"] }, "piecewiseSEM": { "name": "piecewiseSEM", "version": "2.3.0.1", "sha256": "0cgzvfcc0pwz4qvdmx7xj5wl8cki2ss0kjmlqz2kmxklfiz3y5c0", - "depends": ["car", "DiagrammeR", "emmeans", "igraph", "lme4", "MASS", "multcomp", "MuMIn", "nlme", "performance"] + "depends": ["DiagrammeR", "MASS", "MuMIn", "car", "emmeans", "igraph", "lme4", "multcomp", "nlme", "performance"] }, "piggyback": { "name": "piggyback", @@ -93929,7 +94907,7 @@ "name": "pimeta", "version": "1.1.3", "sha256": "1mx0m438db4n041bns6sm8sr8vrj6w8b2kvpmrkkp0bly2vpv40q", - "depends": ["ggplot2", "Rcpp", "RcppEigen", "scales"] + "depends": ["Rcpp", "RcppEigen", "ggplot2", "scales"] }, "pinfsc50": { "name": "pinfsc50", @@ -94049,7 +95027,7 @@ "name": "pivmet", "version": "0.6.0", "sha256": "0cz8grr03w29dnlhmf5r8yjcklhw6qz8rdf8ng1hdqcbp3ysplhk", - "depends": ["bayesmix", "bayesplot", "cluster", "corpcor", "MASS", "mclust", "mvtnorm", "rjags", "rstan", "runjags", "scales"] + "depends": ["MASS", "bayesmix", "bayesplot", "cluster", "corpcor", "mclust", "mvtnorm", "rjags", "rstan", "runjags", "scales"] }, "pivotaltrackR": { "name": "pivotaltrackR", @@ -94059,15 +95037,15 @@ }, "pivotea": { "name": "pivotea", - "version": "1.0.1", - "sha256": "1lrxpvas2m3p25x8j9mjbvpnsz984i847knibfjpmhkwyd3ik86z", - "depends": ["dplyr", "magrittr", "purrr", "rlang", "tidyr"] + "version": "1.0.2", + "sha256": "104xpmanp0l3fw2hnay6xpbzgcjfpqzbjp5mz6imyzwv5199fw4m", + "depends": ["dplyr", "purrr", "rlang", "tidyr"] }, "pivottabler": { "name": "pivottabler", "version": "1.5.5", "sha256": "1kf9z2ashfvgjl0sviryx2r9b9k1k9j9b9nzivr1nxm0d9x9n3yn", - "depends": ["data_table", "dplyr", "htmltools", "htmlwidgets", "R6"] + "depends": ["R6", "data_table", "dplyr", "htmltools", "htmlwidgets"] }, "piwikproR": { "name": "piwikproR", @@ -94139,13 +95117,13 @@ "name": "pkgbuild", "version": "1.4.4", "sha256": "1a72s2gg7ddjj94naiii44f3vyhky05gaa6xvdf72m1nshy88wjr", - "depends": ["callr", "cli", "desc", "processx", "R6"] + "depends": ["R6", "callr", "cli", "desc", "processx"] }, "pkgcache": { "name": "pkgcache", "version": "2.2.2", "sha256": "1qsvgdhinrz2mb4fr33pp6rm23pra6bgwzc70kjyl983zk2nrgby", - "depends": ["callr", "cli", "curl", "filelock", "jsonlite", "processx", "R6"] + "depends": ["R6", "callr", "cli", "curl", "filelock", "jsonlite", "processx"] }, "pkgcond": { "name": "pkgcond", @@ -94169,13 +95147,13 @@ "name": "pkgdepends", "version": "0.7.2", "sha256": "09nddbcz0z5lh6aaspjvfvbp74na7693a5w3hq36p4ah2b824zmi", - "depends": ["callr", "cli", "curl", "desc", "filelock", "jsonlite", "lpSolve", "pkgbuild", "pkgcache", "processx", "ps", "R6", "zip"] + "depends": ["R6", "callr", "cli", "curl", "desc", "filelock", "jsonlite", "lpSolve", "pkgbuild", "pkgcache", "processx", "ps", "zip"] }, "pkgdown": { "name": "pkgdown", - "version": "2.0.9", - "sha256": "186xzilh4079a6xjig3j4pdn99ipg4d5s5q1k75qclivq0b24m3f", - "depends": ["bslib", "callr", "cli", "desc", "digest", "downlit", "fs", "httr", "jsonlite", "magrittr", "memoise", "purrr", "ragg", "rlang", "rmarkdown", "tibble", "whisker", "withr", "xml2", "yaml"] + "version": "2.1.0", + "sha256": "1d4z4wv18yn00cj9wb4pizjjyvy4hqfc0mqynw6ycrldfcxxzlf4", + "depends": ["bslib", "callr", "cli", "desc", "digest", "downlit", "fontawesome", "fs", "httr2", "jsonlite", "openssl", "purrr", "ragg", "rlang", "rmarkdown", "tibble", "whisker", "withr", "xml2", "yaml"] }, "pkgfilecache": { "name": "pkgfilecache", @@ -94187,7 +95165,7 @@ "name": "pkggraph", "version": "0.2.3", "sha256": "1isiywgm20rypc5qr03p0k7lis76zzd96x5ncbvia644d2n13brm", - "depends": ["curl", "data_table", "dplyr", "ggnetwork", "ggplot2", "htmltools", "igraph", "intergraph", "Matrix", "network", "networkD3", "plyr", "RColorBrewer", "tibble"] + "depends": ["Matrix", "RColorBrewer", "curl", "data_table", "dplyr", "ggnetwork", "ggplot2", "htmltools", "igraph", "intergraph", "network", "networkD3", "plyr", "tibble"] }, "pkglite": { "name": "pkglite", @@ -94197,9 +95175,9 @@ }, "pkgload": { "name": "pkgload", - "version": "1.3.4", - "sha256": "1ki6k7l7dpb6bncvvcndrv5764jb1adrzs5iaxicakfsija4pc30", - "depends": ["cli", "crayon", "desc", "fs", "glue", "pkgbuild", "rlang", "rprojroot", "withr"] + "version": "1.4.0", + "sha256": "0jbmlvii40q6ymdhislmgby6dpf9585xl9d5cf8g4nn2kig8ir09", + "depends": ["cli", "desc", "fs", "glue", "lifecycle", "pkgbuild", "processx", "rlang", "rprojroot", "withr"] }, "pkgmaker": { "name": "pkgmaker", @@ -94211,13 +95189,13 @@ "name": "pkgndep", "version": "1.99.3", "sha256": "1llpizr2wkhfgygr9fd79qxym0xcrxfvz8w5n0kwvkvlq3iqid44", - "depends": ["BiocManager", "BiocVersion", "brew", "ComplexHeatmap", "GetoptLong", "GlobalOptions", "hash"] + "depends": ["BiocManager", "BiocVersion", "ComplexHeatmap", "GetoptLong", "GlobalOptions", "brew", "hash"] }, "pkgnet": { "name": "pkgnet", "version": "0.5.0", "sha256": "10sjvd3mwwlbj71zmdmczyrx5s95zax0w7m07nr6413c96ahny14", - "depends": ["assertthat", "covr", "data_table", "DT", "futile_logger", "glue", "igraph", "knitr", "magrittr", "R6", "rlang", "rmarkdown", "visNetwork"] + "depends": ["DT", "R6", "assertthat", "covr", "data_table", "futile_logger", "glue", "igraph", "knitr", "magrittr", "rlang", "rmarkdown", "visNetwork"] }, "pkgnews": { "name": "pkgnews", @@ -94295,13 +95273,13 @@ "name": "planningML", "version": "1.0.1", "sha256": "1s9lf43kkiciqkrcyq9icxdqfs8a1za60pwpbxnrdsa7gzf76i29", - "depends": ["caret", "dplyr", "glmnet", "lubridate", "Matrix", "MESS", "pROC"] + "depends": ["MESS", "Matrix", "caret", "dplyr", "glmnet", "lubridate", "pROC"] }, "planr": { "name": "planr", "version": "0.4.1", "sha256": "0qk8m235qja26g02rkg4sla6998mswqsy3hjwq39zdsmh88zy6bi", - "depends": ["dplyr", "lubridate", "magrittr", "RcppRoll", "tidyr"] + "depends": ["RcppRoll", "dplyr", "lubridate", "magrittr", "tidyr"] }, "planscorer": { "name": "planscorer", @@ -94313,7 +95291,7 @@ "name": "plantTracker", "version": "1.1.0", "sha256": "0qn07pb84j110zrml24gwb27za4wdxn0a4yfhc0c1174fipl6az1", - "depends": ["igraph", "Matrix", "sf", "units"] + "depends": ["Matrix", "igraph", "sf", "units"] }, "plantecophys": { "name": "plantecophys", @@ -94343,13 +95321,13 @@ "name": "plasma", "version": "1.1.3", "sha256": "02ygj3sjjds6iyh1d2jz8ifqc4m31zslplsmf88c8q8l67ilvrhl", - "depends": ["beanplot", "oompaBase", "pls", "plsRcox", "Polychrome", "survival", "viridisLite"] + "depends": ["Polychrome", "beanplot", "oompaBase", "pls", "plsRcox", "survival", "viridisLite"] }, "plasso": { "name": "plasso", "version": "0.1.2", "sha256": "09pc210wb98xnhm9wxsqvf217gysj9c2piwwhzxdp3lxb3my533x", - "depends": ["doParallel", "foreach", "glmnet", "iterators", "Matrix"] + "depends": ["Matrix", "doParallel", "foreach", "glmnet", "iterators"] }, "plater": { "name": "plater", @@ -94361,7 +95339,7 @@ "name": "platetools", "version": "0.1.7", "sha256": "1y4ih36y8z32pqd3cjz2qwysg4c8d6lqdgdb0pixi4i3nxsxq85b", - "depends": ["ggplot2", "RColorBrewer"] + "depends": ["RColorBrewer", "ggplot2"] }, "platowork": { "name": "platowork", @@ -94415,7 +95393,7 @@ "name": "plfMA", "version": "2.0", "sha256": "14v3q4sv3inax3b1sp0i4scrz70ca9yphzikhx0z9dh2w5mggq0k", - "depends": ["gWidgets2", "gWidgets2tcltk", "limma", "RColorBrewer", "tkrplot"] + "depends": ["RColorBrewer", "gWidgets2", "gWidgets2tcltk", "limma", "tkrplot"] }, "plfm": { "name": "plfm", @@ -94433,19 +95411,19 @@ "name": "plgraphics", "version": "1.2", "sha256": "04i79hrsqqygiq64n7bqzfvrhl1c3k2j3y58zzbqq79v9vshjy7p", - "depends": ["chron", "lme4", "MASS", "survival"] + "depends": ["MASS", "chron", "lme4", "survival"] }, "pliman": { "name": "pliman", "version": "2.1.0", "sha256": "0pgv7ayb78k481yd071hjvympikhdw6q8wqb9d5fazp9avmjlfz7", - "depends": ["doParallel", "foreach", "Rcpp", "RcppArmadillo", "sf", "stars", "terra"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "sf", "stars", "terra"] }, "plink": { "name": "plink", "version": "1.5-1", "sha256": "0rn2i9i8af9aq0xgxhpcdchs2952lq2d2sg8x3js0zi3vcml76k0", - "depends": ["lattice", "MASS", "statmod"] + "depends": ["MASS", "lattice", "statmod"] }, "plinkFile": { "name": "plinkFile", @@ -94457,13 +95435,13 @@ "name": "plinkQC", "version": "0.3.4", "sha256": "0l5gf7wf33fhzby0n2qzph02v7an2gj2dji1i129hxsxqnynx7dy", - "depends": ["cowplot", "data_table", "dplyr", "ggforce", "ggplot2", "ggrepel", "igraph", "optparse", "R_utils", "sys", "UpSetR"] + "depends": ["R_utils", "UpSetR", "cowplot", "data_table", "dplyr", "ggforce", "ggplot2", "ggrepel", "igraph", "optparse", "sys"] }, "plm": { "name": "plm", "version": "2.6-4", "sha256": "0xpd6r75g2mc9dsf8ckafbd3pjyrvlyrh12izj9yaqfw4v0vr9fx", - "depends": ["bdsmatrix", "collapse", "Formula", "lattice", "lmtest", "MASS", "maxLik", "nlme", "Rdpack", "sandwich", "zoo"] + "depends": ["Formula", "MASS", "Rdpack", "bdsmatrix", "collapse", "lattice", "lmtest", "maxLik", "nlme", "sandwich", "zoo"] }, "pln": { "name": "pln", @@ -94475,7 +95453,7 @@ "name": "plnr", "version": "2022.11.23", "sha256": "1qi24zpvclamxxfppgll7rcmq7fysxf8chk6wlkwkzmjl5c3cs4n", - "depends": ["data_table", "digest", "foreach", "fs", "glue", "purrr", "R6", "usethis", "uuid"] + "depends": ["R6", "data_table", "digest", "foreach", "fs", "glue", "purrr", "usethis", "uuid"] }, "plogr": { "name": "plogr", @@ -94553,7 +95531,7 @@ "name": "plotSEMM", "version": "2.4", "sha256": "0fircrayhz92zvkigkyb1zpn07bvssqs1ip15p926zj3rl77fqgy", - "depends": ["MplusAutomation", "plotrix", "plyr", "Rcpp", "shiny"] + "depends": ["MplusAutomation", "Rcpp", "plotrix", "plyr", "shiny"] }, "plotbb": { "name": "plotbb", @@ -94565,7 +95543,7 @@ "name": "plotcli", "version": "0.1.0", "sha256": "0qk78gagn5i6zs4srr3q2kzhi5vlyxhmxgwg2ah9c24asnfa3hyg", - "depends": ["crayon", "ggplot2", "knitr", "R6", "rlang", "rmarkdown", "stringr"] + "depends": ["R6", "crayon", "ggplot2", "knitr", "rlang", "rmarkdown", "stringr"] }, "plotdap": { "name": "plotdap", @@ -94589,13 +95567,13 @@ "name": "plotluck", "version": "1.1.1", "sha256": "16wqj4xfa8b7kal6v8mp2zlhwf9l3y6y5n44qbpvy652gzb2rw2z", - "depends": ["ggplot2", "hexbin", "Hmisc", "plyr", "quantreg", "RColorBrewer", "scales"] + "depends": ["Hmisc", "RColorBrewer", "ggplot2", "hexbin", "plyr", "quantreg", "scales"] }, "plotly": { "name": "plotly", "version": "4.10.4", "sha256": "0ryqcs9y7zan36zs6n1hxxy91pajldpax8q7cwcimlsmxnvrbafg", - "depends": ["base64enc", "crosstalk", "data_table", "digest", "dplyr", "ggplot2", "htmltools", "htmlwidgets", "httr", "jsonlite", "lazyeval", "magrittr", "promises", "purrr", "RColorBrewer", "rlang", "scales", "tibble", "tidyr", "vctrs", "viridisLite"] + "depends": ["RColorBrewer", "base64enc", "crosstalk", "data_table", "digest", "dplyr", "ggplot2", "htmltools", "htmlwidgets", "httr", "jsonlite", "lazyeval", "magrittr", "promises", "purrr", "rlang", "scales", "tibble", "tidyr", "vctrs", "viridisLite"] }, "plotlyGeoAssets": { "name": "plotlyGeoAssets", @@ -94615,6 +95593,12 @@ "sha256": "0ywv334n0f9x8iy0vxwcf0dkznd8wvwxw57vk0liyprjhn0ws5v9", "depends": ["Formula", "plotrix"] }, + "plotor": { + "name": "plotor", + "version": "0.4.1", + "sha256": "1cn1sa1m4afcszlxj5rq89i876d2pnmxinaiizc9hdzdmwciswjn", + "depends": ["broom", "dplyr", "ggplot2", "glue", "purrr", "scales", "tidyselect"] + }, "plotpc": { "name": "plotpc", "version": "1.0.4", @@ -94625,7 +95609,7 @@ "name": "plotprotein", "version": "1.0", "sha256": "14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks", - "depends": ["ade4", "plotrix", "plyr", "seqinr", "XML"] + "depends": ["XML", "ade4", "plotrix", "plyr", "seqinr"] }, "plotrix": { "name": "plotrix", @@ -94653,15 +95637,15 @@ }, "pls": { "name": "pls", - "version": "2.8-3", - "sha256": "1qvbwr567vxywpfsl7cb15lpwxpd04kf01nzk1v8dm4csf6p5sz6", + "version": "2.8-4", + "sha256": "0qnmndljjnk9amsrmx402dhpc742pm3cskqjxhdq2m4pcdiinnvq", "depends": [] }, "plsRbeta": { "name": "plsRbeta", "version": "0.3.0", "sha256": "0xikaxg1n298j8mm4vzzn7bfma1lmhak39aawfhp3ny3j1d8llr4", - "depends": ["betareg", "boot", "Formula", "MASS", "mvtnorm", "plsRglm"] + "depends": ["Formula", "MASS", "betareg", "boot", "mvtnorm", "plsRglm"] }, "plsRcox": { "name": "plsRcox", @@ -94673,13 +95657,13 @@ "name": "plsRglm", "version": "1.5.1", "sha256": "1xpf4rz4midrl62yn39bq4ax5yl8h18kcyv2ckxis888yv5b1bqr", - "depends": ["bipartite", "boot", "car", "MASS", "mvtnorm"] + "depends": ["MASS", "bipartite", "boot", "car", "mvtnorm"] }, "plsVarSel": { "name": "plsVarSel", "version": "0.9.12", "sha256": "0130hqnjwgm2l7sacxh5m98gm35qxgqwylbk42jnlp03azwqdbax", - "depends": ["bdsmatrix", "genalg", "MASS", "mvtnorm", "pls", "praznik", "progress"] + "depends": ["MASS", "bdsmatrix", "genalg", "mvtnorm", "pls", "praznik", "progress"] }, "plsdepot": { "name": "plsdepot", @@ -94697,13 +95681,13 @@ "name": "plsgenomics", "version": "1.5-3", "sha256": "0a1vzpbjd0lyj9vzx6fav4swiv89f3aj8i82g4yj0vd83vwakrnr", - "depends": ["boot", "fields", "MASS", "plyr", "reshape2", "RhpcBLASctl"] + "depends": ["MASS", "RhpcBLASctl", "boot", "fields", "plyr", "reshape2"] }, "plsmmLasso": { "name": "plsmmLasso", "version": "1.1.0", "sha256": "0xdpscm6villr4fby19jvg60y3mc81bcj6hwavrbmnbp02b4lhcj", - "depends": ["dplyr", "ggplot2", "glmnet", "hdi", "MASS", "mvtnorm", "rlang", "scalreg"] + "depends": ["MASS", "dplyr", "ggplot2", "glmnet", "hdi", "mvtnorm", "rlang", "scalreg"] }, "plsmod": { "name": "plsmod", @@ -94745,7 +95729,7 @@ "name": "plumber", "version": "1.2.2", "sha256": "1ycq3kjkrlx66h05g5ncvmq2cr051609xs4bzs8n49c70h6p0bpr", - "depends": ["crayon", "ellipsis", "httpuv", "jsonlite", "lifecycle", "magrittr", "mime", "promises", "R6", "rlang", "sodium", "stringi", "swagger", "webutils"] + "depends": ["R6", "crayon", "ellipsis", "httpuv", "jsonlite", "lifecycle", "magrittr", "mime", "promises", "rlang", "sodium", "stringi", "swagger", "webutils"] }, "plumberDeploy": { "name": "plumberDeploy", @@ -94769,7 +95753,7 @@ "name": "plume", "version": "0.2.4", "sha256": "00czlz71wwj77kxppxrfvsgi23g71h5r4xbdsadqjr8jidcplhch", - "depends": ["dplyr", "glue", "jsonlite", "knitr", "lifecycle", "purrr", "R6", "readr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs", "yaml"] + "depends": ["R6", "dplyr", "glue", "jsonlite", "knitr", "lifecycle", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs", "yaml"] }, "plusCode2": { "name": "plusCode2", @@ -94787,7 +95771,7 @@ "name": "plutor", "version": "0.1.0", "sha256": "09wwv47rigjl61q2c7bhq5qa2gghklzia5pqm4vwp66v3j7nb1pn", - "depends": ["baizer", "cli", "dplyr", "ggh4x", "ggplot2", "ggsci", "magrittr", "purrr", "RColorBrewer", "repr", "rlang", "scales", "stringr", "tibble", "tidyr"] + "depends": ["RColorBrewer", "baizer", "cli", "dplyr", "ggh4x", "ggplot2", "ggsci", "magrittr", "purrr", "repr", "rlang", "scales", "stringr", "tibble", "tidyr"] }, "plyr": { "name": "plyr", @@ -94797,15 +95781,15 @@ }, "pm3": { "name": "pm3", - "version": "0.1.9", - "sha256": "03q36qmq9hvkws5v79c39z698fjgfpyfxz5nx7g8diy6sj834mw6", + "version": "0.2.0", + "sha256": "0mnhjvgra6a270ji1916siyn63qz9w1kmpqabsg3r68cjqbp0a0w", "depends": ["tableone"] }, "pmartR": { "name": "pmartR", "version": "2.4.5", "sha256": "07996a2xs3rwxaa8dw53pm07n2052lq223prqd4lbf8ijy3za765", - "depends": ["BH", "data_table", "doParallel", "dplyr", "e1071", "foreach", "ggplot2", "glmpca", "magrittr", "mvtnorm", "parallelly", "patchwork", "pcaMethods", "purrr", "RColorBrewer", "Rcpp", "RcppArmadillo", "rrcov", "stringr", "tidyr"] + "depends": ["BH", "RColorBrewer", "Rcpp", "RcppArmadillo", "data_table", "doParallel", "dplyr", "e1071", "foreach", "ggplot2", "glmpca", "magrittr", "mvtnorm", "parallelly", "patchwork", "pcaMethods", "purrr", "rrcov", "stringr", "tidyr"] }, "pmc": { "name": "pmc", @@ -94817,7 +95801,7 @@ "name": "pmcalibration", "version": "0.1.0", "sha256": "1zhg55jdf8jd92216waa2g18mvni8qh6j2idgf77k6mcwb63m9zw", - "depends": ["checkmate", "chk", "Hmisc", "MASS", "mgcv", "pbapply", "survival"] + "depends": ["Hmisc", "MASS", "checkmate", "chk", "mgcv", "pbapply", "survival"] }, "pmclust": { "name": "pmclust", @@ -94829,19 +95813,25 @@ "name": "pmd", "version": "0.2.1", "sha256": "14xra1d6qx6gxnpiwfsxz200qhmm7s4zy2j8h5kwbvbpnykdyr5c", - "depends": ["data_table", "enviGCMS", "igraph", "RColorBrewer"] + "depends": ["RColorBrewer", "data_table", "enviGCMS", "igraph"] }, "pmetar": { "name": "pmetar", "version": "0.5.0", "sha256": "14vz227mq1kjrmhb0gknx4alk0krl6aaj7rss3mm2hf832kr5724", - "depends": ["curl", "dplyr", "httr", "lubridate", "magrittr", "RCurl", "stringr", "tidyr"] + "depends": ["RCurl", "curl", "dplyr", "httr", "lubridate", "magrittr", "stringr", "tidyr"] + }, + "pmev": { + "name": "pmev", + "version": "0.0.2", + "sha256": "02qkajcmv46s1aapxmm59k7y8mcnjdcgvhirdzqmzj88li3sgm3f", + "depends": ["dplyr", "lubridate", "magrittr", "rlang", "zoo"] }, "pmhtutorial": { "name": "pmhtutorial", "version": "1.5", "sha256": "1hcw8hwpsivbhz86lnzy08q9n8vahnq8f7rmi4xkmg6b44582cqx", - "depends": ["mvtnorm", "Quandl"] + "depends": ["Quandl", "mvtnorm"] }, "pmlbr": { "name": "pmlbr", @@ -94859,7 +95849,7 @@ "name": "pmml", "version": "2.5.2", "sha256": "1faad5yqyh6dx40056w74vlyw4wxjgh41jv8b2vf2gh26laf22kk", - "depends": ["stringr", "XML"] + "depends": ["XML", "stringr"] }, "pmmlTransformations": { "name": "pmmlTransformations", @@ -94871,7 +95861,7 @@ "name": "pmparser", "version": "1.0.20", "sha256": "0csjvy730c0pd7b2rq732whv7wb3pahnrc1mvzh33ymlbhd6jng8", - "depends": ["curl", "data_table", "DBI", "foreach", "glue", "iterators", "jsonlite", "R_utils", "RCurl", "withr", "xml2"] + "depends": ["DBI", "RCurl", "R_utils", "curl", "data_table", "foreach", "glue", "iterators", "jsonlite", "withr", "xml2"] }, "pmr": { "name": "pmr", @@ -94901,13 +95891,13 @@ "name": "pmwg", "version": "0.2.7", "sha256": "17q2w48bgk7m4jp5567ig0gvvcz14rswf36q8561ykd0kyaxq2vj", - "depends": ["checkmate", "coda", "condMVNorm", "MASS", "mvtnorm"] + "depends": ["MASS", "checkmate", "coda", "condMVNorm", "mvtnorm"] }, "pmxTools": { "name": "pmxTools", "version": "1.3", "sha256": "1is56is0xg9syfwma90wqp7rxbgcv36qcpmcxnz0dlf7ypnvqsak", - "depends": ["chron", "data_tree", "dplyr", "ggdist", "gghalves", "ggplot2", "magrittr", "MASS", "patchwork", "PKNCA", "scales", "stringr", "tibble", "xml2"] + "depends": ["MASS", "PKNCA", "chron", "data_tree", "dplyr", "ggdist", "gghalves", "ggplot2", "magrittr", "patchwork", "scales", "stringr", "tibble", "xml2"] }, "pmxcode": { "name": "pmxcode", @@ -94979,13 +95969,13 @@ "name": "pointRes", "version": "2.0.2", "sha256": "1a3yj94rg16fbc47ahwdq17i8pganm6vg6xfl3b0glybw5f2hpkj", - "depends": ["DescTools", "dplR", "ggplot2", "plyr", "TripleR"] + "depends": ["DescTools", "TripleR", "dplR", "ggplot2", "plyr"] }, "pointblank": { "name": "pointblank", "version": "0.12.1", "sha256": "1wwb9ncji7450rbbmrh9mznl4pnpmxq8ibx785bz9dsswdglzfhq", - "depends": ["base64enc", "blastula", "cli", "DBI", "dbplyr", "digest", "dplyr", "fs", "glue", "gt", "htmltools", "knitr", "magrittr", "rlang", "scales", "testthat", "tibble", "tidyr", "tidyselect", "yaml"] + "depends": ["DBI", "base64enc", "blastula", "cli", "dbplyr", "digest", "dplyr", "fs", "glue", "gt", "htmltools", "knitr", "magrittr", "rlang", "scales", "testthat", "tibble", "tidyr", "tidyselect", "yaml"] }, "pointdensityP": { "name": "pointdensityP", @@ -95053,29 +96043,35 @@ "sha256": "11i1xxvj3ik8kjpm8q1ind3qkwrgyhv0sdcynwj4wld2n6i1v2v5", "depends": ["shiny"] }, + "poldis": { + "name": "poldis", + "version": "0.1.1", + "sha256": "02043wqc2ja12pybaid7c1a33s14q7dhj7mzca5z6i5ganqihrgr", + "depends": ["dplyr", "purrr", "quanteda", "spacyr", "stringdist", "stringi", "stringr", "textstem", "tidyr"] + }, "policytree": { "name": "policytree", "version": "1.2.3", "sha256": "1a0yqg754gb793k9zrhp2zb1j5lw1kv1ziv9dr7rk2zmzgs1k5pb", - "depends": ["BH", "grf", "Rcpp"] + "depends": ["BH", "Rcpp", "grf"] }, "polimetrics": { "name": "polimetrics", "version": "1.2.1.14", "sha256": "0zzqzcfmvb6a9lav5sdgzhx4637r068q3kyjqk1ykdjg2d7s7lrv", - "depends": ["car", "dplyr", "formula_tools", "ggplot2", "gplots", "MASS", "purrr", "rlang", "rstatix", "stringr", "tidyverse"] + "depends": ["MASS", "car", "dplyr", "formula_tools", "ggplot2", "gplots", "purrr", "rlang", "rstatix", "stringr", "tidyverse"] }, "poliscidata": { "name": "poliscidata", "version": "2.3.0", "sha256": "1ywfhksc6gcc2xk5lp6s8nn4wib92sv7p3wq92dzabf75q6mscix", - "depends": ["abind", "car", "descr", "gplots", "Hmisc", "plotrix", "plyr", "survey", "weights", "xtable"] + "depends": ["Hmisc", "abind", "car", "descr", "gplots", "plotrix", "plyr", "survey", "weights", "xtable"] }, "polished": { "name": "polished", "version": "0.8.1", "sha256": "0qn7zlxw7jr0apvn23a6x00xn5fbg2c2hg6713biwsi7iqhb0amc", - "depends": ["automagic", "desc", "digest", "dplyr", "DT", "htmltools", "httr", "jose", "jsonlite", "lubridate", "otp", "purrr", "rlang", "rmarkdown", "shiny", "shinycssloaders", "shinydashboard", "shinyFeedback", "shinyjs", "shinyWidgets", "stringr", "tibble", "tidyr", "uuid", "yaml"] + "depends": ["DT", "automagic", "desc", "digest", "dplyr", "htmltools", "httr", "jose", "jsonlite", "lubridate", "otp", "purrr", "rlang", "rmarkdown", "shiny", "shinyFeedback", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyjs", "stringr", "tibble", "tidyr", "uuid", "yaml"] }, "polite": { "name": "polite", @@ -95099,7 +96095,7 @@ "name": "polle", "version": "1.4", "sha256": "11n2g4gbwvcgw49pfr7qgbfidfwliqkag3n6wxcinl44b2l6jjfi", - "depends": ["data_table", "DynTxRegime", "future_apply", "lava", "policytree", "progressr", "SuperLearner", "survival", "targeted"] + "depends": ["DynTxRegime", "SuperLearner", "data_table", "future_apply", "lava", "policytree", "progressr", "survival", "targeted"] }, "pollen": { "name": "pollen", @@ -95123,7 +96119,7 @@ "name": "polmineR", "version": "0.8.9", "sha256": "0cxjy3w4k52kdjf66yysvd1yd96rv5xrzqjrkdvl4wrhxvla3202", - "depends": ["cli", "data_table", "DT", "fs", "jsonlite", "knitr", "lifecycle", "magrittr", "Matrix", "pbapply", "RcppCWB", "rlang", "slam", "stringi", "tm", "xml2"] + "depends": ["DT", "Matrix", "RcppCWB", "cli", "data_table", "fs", "jsonlite", "knitr", "lifecycle", "magrittr", "pbapply", "rlang", "slam", "stringi", "tm", "xml2"] }, "polspline": { "name": "polspline", @@ -95147,7 +96143,7 @@ "name": "polyRAD", "version": "2.0.0", "sha256": "12qlws0d6s94rand1a7azd7yv22qzij1aqmhrvw4az0y7jy2wka4", - "depends": ["fastmatch", "pcaMethods", "Rcpp", "stringi"] + "depends": ["Rcpp", "fastmatch", "pcaMethods", "stringi"] }, "polySegratio": { "name": "polySegratio", @@ -95175,27 +96171,27 @@ }, "polyclip": { "name": "polyclip", - "version": "1.10-6", - "sha256": "0qwb5w1ishbhg1nhdp8985ddvcs7ljdyrbv059hx576xmgni6brw", + "version": "1.10-7", + "sha256": "1lshalmhdaw0g0hzfy2qwid282pq3kwzy4jz1hf73xmjlp1sm3pm", "depends": [] }, "polycor": { "name": "polycor", "version": "0.8-1", "sha256": "0285rvx8238qp8dix0jq0cqq7ks8h6cjwsscbc7dx4n9nph56pzh", - "depends": ["admisc", "Matrix", "mvtnorm"] + "depends": ["Matrix", "admisc", "mvtnorm"] }, "polyglotr": { "name": "polyglotr", - "version": "1.5.0", - "sha256": "0v3ada7279i619gv5r92xnyhjgb3qyydq88b5w7mj58al1wni6cg", - "depends": ["dplyr", "httr", "jsonlite", "magrittr", "purrr", "RCurl", "rlang", "rvest", "stringr", "tibble", "urltools"] + "version": "1.5.1", + "sha256": "00h9v05sv6bqyp2wqa6dvxix9psa2i6csx4yig74i8iycl9issfb", + "depends": ["RCurl", "dplyr", "httr", "jsonlite", "magrittr", "purrr", "rlang", "rvest", "stringr", "tibble", "urltools"] }, "polyhedralCubature": { "name": "polyhedralCubature", "version": "1.1.0", "sha256": "1la8cj261c4vshr4yd3vgplzv1ykrkgvlwrjm49fgzh142rk59gc", - "depends": ["gmp", "magrittr", "Matrix", "ompr", "qspray", "rcdd", "SimplicialCubature", "spray", "tessellation"] + "depends": ["Matrix", "SimplicialCubature", "gmp", "magrittr", "ompr", "qspray", "rcdd", "spray", "tessellation"] }, "polylabelr": { "name": "polylabelr", @@ -95207,7 +96203,7 @@ "name": "polymapR", "version": "1.1.6", "sha256": "0aschby014m0j0nrr2q4pfghhakx89jq6wn8pv2dnbfpbg779l18", - "depends": ["doParallel", "foreach", "igraph", "knitr", "MDSMap"] + "depends": ["MDSMap", "doParallel", "foreach", "igraph", "knitr"] }, "polynom": { "name": "polynom", @@ -95231,7 +96227,7 @@ "name": "polyqtlR", "version": "0.1.1", "sha256": "0yz27785cfw50sw6nniiqmdggji502wh84zcvqf31wzznjryy9v5", - "depends": ["abind", "doParallel", "foreach", "Hmisc", "knitr", "nlme", "RColorBrewer", "Rcpp", "RcppArmadillo", "reshape2"] + "depends": ["Hmisc", "RColorBrewer", "Rcpp", "RcppArmadillo", "abind", "doParallel", "foreach", "knitr", "nlme", "reshape2"] }, "polyreg": { "name": "polyreg", @@ -95249,7 +96245,7 @@ "name": "polywog", "version": "0.4-1", "sha256": "02qk1cyvkd77mwlvhj1zzzi0bmy7qxz29j2v730wp7rz4w7h5x5n", - "depends": ["foreach", "Formula", "glmnet", "iterators", "Matrix", "miscTools", "ncvreg", "Rcpp", "stringr"] + "depends": ["Formula", "Matrix", "Rcpp", "foreach", "glmnet", "iterators", "miscTools", "ncvreg", "stringr"] }, "pomcheckr": { "name": "pomcheckr", @@ -95261,7 +96257,7 @@ "name": "pomdp", "version": "1.2.3", "sha256": "1l873a4p0fzfmgz52v57i2ccmpsrv10lvbrm7mr39qwqsaklh3bv", - "depends": ["foreach", "igraph", "Matrix", "pomdpSolve", "processx", "Rcpp"] + "depends": ["Matrix", "Rcpp", "foreach", "igraph", "pomdpSolve", "processx"] }, "pomdpSolve": { "name": "pomdpSolve", @@ -95277,8 +96273,8 @@ }, "pomp": { "name": "pomp", - "version": "5.9", - "sha256": "1hhsv06vcqfzzb42nk0sidp9gd1larqrr3s6f5qh7hf1jv1b0d86", + "version": "5.10", + "sha256": "0pz12apfh600nnbdcrm3p9xr47p3qlc9bp80ahkvixb17vkr9z30", "depends": ["coda", "data_table", "deSolve", "digest", "mvtnorm"] }, "pompom": { @@ -95291,7 +96287,7 @@ "name": "pompp", "version": "0.1.3", "sha256": "0svlzhsm1kfwgjpx2cas63jm8v5b9cxlksipv758vxlnc3jiarvk", - "depends": ["coda", "geoR", "Rcpp", "RcppEigen", "RcppProgress"] + "depends": ["Rcpp", "RcppEigen", "RcppProgress", "coda", "geoR"] }, "pooh": { "name": "pooh", @@ -95303,13 +96299,13 @@ "name": "pool", "version": "1.0.3", "sha256": "1v0w396cszpyi6p59bmvbbpzb8gk0qj0s5hq42jj9rf351lzjqf4", - "depends": ["DBI", "later", "R6", "rlang"] + "depends": ["DBI", "R6", "later", "rlang"] }, "poolABC": { "name": "poolABC", "version": "1.0.0", "sha256": "0l1sg9w1a385g6cz82b73a13661bx716ppvabvji7b6p99i9kv99", - "depends": ["doParallel", "foreach", "ggplot2", "locfit", "MetricsWeighted", "nnet", "poolHelper", "RColorBrewer", "rlang", "scrm"] + "depends": ["MetricsWeighted", "RColorBrewer", "doParallel", "foreach", "ggplot2", "locfit", "nnet", "poolHelper", "rlang", "scrm"] }, "poolHelper": { "name": "poolHelper", @@ -95327,7 +96323,7 @@ "name": "poolfstat", "version": "2.2.0", "sha256": "17wama4lxl7q2i9j2v15kn33i2lszrsyim9qj8dihhx9r6p9vdls", - "depends": ["ape", "data_table", "DiagrammeR", "doParallel", "foreach", "Matrix", "nnls", "progress", "Rcpp", "RcppProgress", "Ryacas", "zoo"] + "depends": ["DiagrammeR", "Matrix", "Rcpp", "RcppProgress", "Ryacas", "ape", "data_table", "doParallel", "foreach", "nnls", "progress", "zoo"] }, "pooling": { "name": "pooling", @@ -95351,7 +96347,7 @@ "name": "pop", "version": "0.1", "sha256": "0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj", - "depends": ["igraph", "MASS"] + "depends": ["MASS", "igraph"] }, "pop_lion": { "name": "pop.lion", @@ -95369,7 +96365,7 @@ "name": "popEpi", "version": "0.4.12", "sha256": "13fasp84hxxpbn6gmfjfl1kzija7y11mvlhc77rpqnj1l5wcm1rn", - "depends": ["data_table", "Epi", "survival"] + "depends": ["Epi", "data_table", "survival"] }, "popPCR": { "name": "popPCR", @@ -95405,7 +96401,7 @@ "name": "popdemo", "version": "1.3-1", "sha256": "0xvqp71spqh5khi2gdzxmj8pp71i6l2qpcgcw8s9xbqwx9w905mq", - "depends": ["expm", "MCMCpack"] + "depends": ["MCMCpack", "expm"] }, "popgenr": { "name": "popgenr", @@ -95417,7 +96413,7 @@ "name": "popkin", "version": "1.3.23", "sha256": "07wlja7c96az0d82c3b0m1kmc04sbgp73asbaks26jwvjw4vmby5", - "depends": ["ape", "RColorBrewer"] + "depends": ["RColorBrewer", "ape"] }, "poppr": { "name": "poppr", @@ -95429,7 +96425,7 @@ "name": "popstudy", "version": "1.0.1", "sha256": "09lavka4hr4f8m2j8wqvd4pqxbxhclac1p2f2vq15xk7n4xfbhw3", - "depends": ["correlation", "corrplot", "corrr", "demography", "DescTools", "dplyr", "forecast", "ggplot2", "ggpubr", "here", "Hmisc", "lubridate", "magrittr", "moments", "rainbow", "rcompanion", "Rdpack", "scales", "stringr", "tidyr"] + "depends": ["DescTools", "Hmisc", "Rdpack", "correlation", "corrplot", "corrr", "demography", "dplyr", "forecast", "ggplot2", "ggpubr", "here", "lubridate", "magrittr", "moments", "rainbow", "rcompanion", "scales", "stringr", "tidyr"] }, "poptrend": { "name": "poptrend", @@ -95441,7 +96437,7 @@ "name": "populR", "version": "0.2.1", "sha256": "1j0ip93pd5sq2rcqd0pw5c0nmi1pjjaxi5k4xk97kgwnqcq5ib7n", - "depends": ["dplyr", "Metrics", "osmdata", "rlang", "sf", "units", "usethis"] + "depends": ["Metrics", "dplyr", "osmdata", "rlang", "sf", "units", "usethis"] }, "population": { "name": "population", @@ -95465,7 +96461,7 @@ "name": "porridge", "version": "0.3.3", "sha256": "0zya6zv8rsmbwv330jmx2pz1cn97m359nb0a7cjiyjgbggygxryf", - "depends": ["MASS", "Matrix", "mvtnorm", "pracma", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "mvtnorm", "pracma"] }, "port4me": { "name": "port4me", @@ -95495,13 +96491,13 @@ "name": "portfolio.optimization", "version": "1.0-0", "sha256": "1rdhwffsjc1pa1qq7rqy6dwk8yrcblkmijz94p2w7sf2v4jmwxxr", - "depends": ["magrittr", "MASS", "modopt_matlab", "xts"] + "depends": ["MASS", "magrittr", "modopt_matlab", "xts"] }, "portfolioBacktest": { "name": "portfolioBacktest", "version": "0.4.1", "sha256": "1qf7bbf3frivp0q55h3fj9ki2igaa6djpg3zv1x6hh53nl25dvbb", - "depends": ["digest", "evaluate", "ggplot2", "pbapply", "PerformanceAnalytics", "quadprog", "quantmod", "R_utils", "rlang", "xts", "zoo"] + "depends": ["PerformanceAnalytics", "R_utils", "digest", "evaluate", "ggplot2", "pbapply", "quadprog", "quantmod", "rlang", "xts", "zoo"] }, "portion": { "name": "portion", @@ -95525,7 +96521,13 @@ "name": "portvine", "version": "1.0.3", "sha256": "0ikz7lcrj3sky9ybbnpnlzxqbv004d7rl5sqdx90gvx1lvbs8aaq", - "depends": ["BH", "checkmate", "data_table", "dplyr", "dtplyr", "future_apply", "kde1d", "ppcor", "Rcpp", "RcppEigen", "RcppThread", "rlang", "rugarch", "rvinecopulib", "tidyr", "wdm"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppThread", "checkmate", "data_table", "dplyr", "dtplyr", "future_apply", "kde1d", "ppcor", "rlang", "rugarch", "rvinecopulib", "tidyr", "wdm"] + }, + "poset": { + "name": "poset", + "version": "1.0.0", + "sha256": "012abgxx4nazr7ls7iiwpvxcxwkcfc08iyggjbd0d2hdm29h4fq0", + "depends": [] }, "posologyr": { "name": "posologyr", @@ -95537,7 +96539,7 @@ "name": "postGGIR", "version": "2.4.0.2", "sha256": "1jxmvgzq4hv7sy2zcs8jicp0223mhv3mywhxbay2nv3bl0h4xfgs", - "depends": ["abind", "accelerometry", "ActCR", "ActFrag", "cosinor", "cosinor2", "denseFLMM", "dplyr", "GGIR", "ineq", "kableExtra", "minpack_lm", "refund", "survival", "tidyr", "xlsx", "zoo"] + "depends": ["ActCR", "ActFrag", "GGIR", "abind", "accelerometry", "cosinor", "cosinor2", "denseFLMM", "dplyr", "ineq", "kableExtra", "minpack_lm", "refund", "survival", "tidyr", "xlsx", "zoo"] }, "postHoc": { "name": "postHoc", @@ -95565,8 +96567,8 @@ }, "posterior": { "name": "posterior", - "version": "1.5.0", - "sha256": "1pp233ddrs116w1rmp3khhmibjf6l021b1x79k6z48g3r9zk042a", + "version": "1.6.0", + "sha256": "037l1cav2vglcd2pgp8n89apfpsb3822mhzmdsxf7a0mzcwjlq9l", "depends": ["abind", "checkmate", "distributional", "matrixStats", "pillar", "rlang", "tensorA", "tibble", "vctrs"] }, "postinfectious": { @@ -95627,7 +96629,7 @@ "name": "povmap", "version": "1.0.1", "sha256": "1qr4i7ph17mzhjamssc6h4q02mw6jykl2kqc5n3i7vfp88q4frcp", - "depends": ["bestNormalize", "boot", "formula_tools", "ggplot2", "gridExtra", "HLMdiag", "MASS", "moments", "MuMIn", "nlme", "openxlsx", "parallelMap", "readODS", "reshape2", "saeRobust", "sf", "spdep", "stringr", "survey"] + "depends": ["HLMdiag", "MASS", "MuMIn", "bestNormalize", "boot", "formula_tools", "ggplot2", "gridExtra", "moments", "nlme", "openxlsx", "parallelMap", "readODS", "reshape2", "saeRobust", "sf", "spdep", "stringr", "survey"] }, "pow_int": { "name": "pow.int", @@ -95645,7 +96647,7 @@ "name": "powdR", "version": "1.3.0", "sha256": "1bkx43xd46gzgiphknqyz2nyvviia0xkn4h8z4k2dwcfq92iwsbw", - "depends": ["baseline", "DT", "factoextra", "FactoMineR", "ggplot2", "ggpubr", "nnls", "plotly", "plyr", "reshape", "rxylib", "shiny", "shinyWidgets", "tidyr"] + "depends": ["DT", "FactoMineR", "baseline", "factoextra", "ggplot2", "ggpubr", "nnls", "plotly", "plyr", "reshape", "rxylib", "shiny", "shinyWidgets", "tidyr"] }, "powdist": { "name": "powdist", @@ -95653,6 +96655,12 @@ "sha256": "1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z", "depends": ["gamlss_dist", "normalp", "rmutil"] }, + "poweRbal": { + "name": "poweRbal", + "version": "0.0.1.1", + "sha256": "16n331pyc41cy59cvp9fidvy3dzi68nw64lg6862amzna72nk85b", + "depends": ["R_utils", "ape", "diversitree", "phytools", "scales", "treebalance"] + }, "poweRlaw": { "name": "poweRlaw", "version": "0.80.0", @@ -95689,11 +96697,17 @@ "sha256": "08zszskhd21pbjamch5q7v7vx2p78c1d53zrp31hmpxk1ymx2xf3", "depends": [] }, + "powerNLSEM": { + "name": "powerNLSEM", + "version": "0.1.1", + "sha256": "08l8yfry95zdfdi809vyymv71gal54jb8jlyxkpa08iwj7zyybc4", + "depends": ["crayon", "ggplot2", "lavaan", "mvtnorm", "numDeriv", "pbapply", "rlang", "stringr"] + }, "powerPLS": { "name": "powerPLS", "version": "0.1.0", "sha256": "03y06wnd8i3lkw5fakihgrb9karjfw496vfygqgl8b6fxb2nz2yw", - "depends": ["compositions", "foreach", "ks", "MASS", "mvtnorm", "nipals", "simukde"] + "depends": ["MASS", "compositions", "foreach", "ks", "mvtnorm", "nipals", "simukde"] }, "powerSurvEpi": { "name": "powerSurvEpi", @@ -95711,7 +96725,7 @@ "name": "powerbydesign", "version": "1.0.5", "sha256": "006m127rc49bshgljd5d3ii6sfx24ndn2690ixj0vnqm2dp3zjnw", - "depends": ["gdata", "ggplot2", "lme4", "MASS", "plyr", "reshape2", "stringr"] + "depends": ["MASS", "gdata", "ggplot2", "lme4", "plyr", "reshape2", "stringr"] }, "powerindexR": { "name": "powerindexR", @@ -95729,7 +96743,7 @@ "name": "powerly", "version": "1.8.6", "sha256": "0vc2wpx2b4i9vx9jvvlywq5w4dx22bn4r9fcwz123h1m09252ng8", - "depends": ["bootnet", "ggplot2", "mvtnorm", "osqp", "patchwork", "progress", "qgraph", "quadprog", "R6", "rlang", "splines2"] + "depends": ["R6", "bootnet", "ggplot2", "mvtnorm", "osqp", "patchwork", "progress", "qgraph", "quadprog", "rlang", "splines2"] }, "powerpkg": { "name": "powerpkg", @@ -95737,6 +96751,12 @@ "sha256": "18cq3zsdvzmqjp0niq0libjk4riarmiar3h6lifq54spqgrvvxh2", "depends": [] }, + "ppRank": { + "name": "ppRank", + "version": "0.1.0", + "sha256": "1843cnrdiwns14471dnjq8i5wxkp3p1sj4rw74zzy9w3ydcc3v1z", + "depends": [] + }, "ppRep": { "name": "ppRep", "version": "0.42.3", @@ -95747,7 +96767,7 @@ "name": "ppcSpatial", "version": "0.3.0", "sha256": "0dxl5vv41462vhhdvbjczcghp0rv2f2101qygn4cldfihja397y9", - "depends": ["dplyr", "ggplot2", "htmltools", "htmlwidgets", "leaflet", "magrittr", "PakPC2017", "scales", "shiny", "tidyr", "tmap"] + "depends": ["PakPC2017", "dplyr", "ggplot2", "htmltools", "htmlwidgets", "leaflet", "magrittr", "scales", "shiny", "tidyr", "tmap"] }, "ppcc": { "name": "ppcc", @@ -95759,7 +96779,7 @@ "name": "ppclust", "version": "1.1.0.1", "sha256": "1lrha08i5cp8f6670d6207jp6ad4vnmwq0lxfrlr9vhaxbs5akgi", - "depends": ["inaparc", "MASS"] + "depends": ["MASS", "inaparc"] }, "ppcor": { "name": "ppcor", @@ -95775,15 +96795,15 @@ }, "ppendemic": { "name": "ppendemic", - "version": "0.1.7", - "sha256": "0f9gqhkgg1vd3di1xfx0ix4is30v3abcyldpkbnj81kv60zmzcfr", - "depends": [] + "version": "0.1.8", + "sha256": "1glk6l78pb4076a059api2a963yfly5d47dc4pkf6bj3df927l10", + "depends": ["assertthat", "dplyr", "fuzzyjoin", "memoise", "progress", "purrr", "readr", "stringr", "tibble", "tidyr"] }, "ppgam": { "name": "ppgam", - "version": "1.0.1", - "sha256": "0w2jci5k0y8m7rapj8w6xq849y59m7y4fp9n3f5l6q954mbc6bv0", - "depends": ["evgam", "MASS", "mgcv"] + "version": "1.0.2", + "sha256": "0k5xcsjk3kb6k702dd5aq1z6m8g6w0kly0z169ymviidicgqphw3", + "depends": ["MASS", "evgam", "mgcv"] }, "ppgm": { "name": "ppgm", @@ -95795,7 +96815,7 @@ "name": "ppgmmga", "version": "1.3", "sha256": "0ms6pqhdvws6dp27mgvwdm039h6z3psgbdmy2k6wq1wqr5jbsiz1", - "depends": ["cli", "crayon", "GA", "ggplot2", "mclust", "Rcpp", "RcppArmadillo"] + "depends": ["GA", "Rcpp", "RcppArmadillo", "cli", "crayon", "ggplot2", "mclust"] }, "ppitables": { "name": "ppitables", @@ -95837,7 +96857,7 @@ "name": "ppsbm", "version": "0.2.2", "sha256": "0y4whxv14jqx7mqxj7n427vpbxb5rkwj8xvx0mj4knnwy9v437z4", - "depends": ["clue", "gtools", "Rfast"] + "depends": ["Rfast", "clue", "gtools"] }, "ppseq": { "name": "ppseq", @@ -95855,7 +96875,7 @@ "name": "pqantimalarials", "version": "0.2", "sha256": "0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1", - "depends": ["plyr", "RColorBrewer", "reshape2", "shiny"] + "depends": ["RColorBrewer", "plyr", "reshape2", "shiny"] }, "pql": { "name": "pql", @@ -95867,7 +96887,7 @@ "name": "pqrBayes", "version": "1.0.2", "sha256": "0mbhkha99qyk5hkpk13ysb0686lcn6q9vq34838fz1l7xy47mzw3", - "depends": ["glmnet", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "glmnet"] }, "pqrfe": { "name": "pqrfe", @@ -95909,7 +96929,7 @@ "name": "practicalSigni", "version": "0.1.2", "sha256": "1ymq5mkp0y0zjgjvfdq3wx5qig9fiibnff4irgwkrckvp58xc9fn", - "depends": ["generalCorr", "hypergeo", "NNS", "np", "randomForest", "ShapleyValue", "xtable"] + "depends": ["NNS", "ShapleyValue", "generalCorr", "hypergeo", "np", "randomForest", "xtable"] }, "prais": { "name": "prais", @@ -95933,7 +96953,7 @@ "name": "prcbench", "version": "1.1.8", "sha256": "0h49cgzaqcy97gl57glh0z34g7dnx4wr4y8a1h7r3nxgkvdcvx74", - "depends": ["assertthat", "ggplot2", "gridExtra", "memoise", "precrec", "PRROC", "R6", "Rcpp", "ROCR"] + "depends": ["PRROC", "R6", "ROCR", "Rcpp", "assertthat", "ggplot2", "gridExtra", "memoise", "precrec"] }, "prclust": { "name": "prclust", @@ -95951,7 +96971,7 @@ "name": "pre", "version": "1.0.7", "sha256": "170kfyhnb6hqyknkf4h6cxcaif6z2m8n6gslyj88sfch2xbfx0b1", - "depends": ["earth", "Formula", "glmnet", "Matrix", "MatrixModels", "partykit", "rpart", "stringr", "survival"] + "depends": ["Formula", "Matrix", "MatrixModels", "earth", "glmnet", "partykit", "rpart", "stringr", "survival"] }, "precintcon": { "name": "precintcon", @@ -95975,13 +96995,13 @@ "name": "precmed", "version": "1.0.0", "sha256": "1hkdm1fqq9fswfii9ac016xfnbggdvxcvazi5l8ir0vna9jfkcwb", - "depends": ["dplyr", "gam", "gbm", "ggplot2", "glmnet", "MASS", "MESS", "mgcv", "randomForestSRC", "rlang", "stringr", "survival", "tidyr"] + "depends": ["MASS", "MESS", "dplyr", "gam", "gbm", "ggplot2", "glmnet", "mgcv", "randomForestSRC", "rlang", "stringr", "survival", "tidyr"] }, "precommit": { "name": "precommit", - "version": "0.4.2", - "sha256": "15ll48m3aw7gg99vqvbrygms6hwlpgmpnz56n7x1drqwzl59qgf7", - "depends": ["cli", "fs", "here", "magrittr", "purrr", "R_cache", "rlang", "rprojroot", "withr", "yaml"] + "version": "0.4.3", + "sha256": "0rh5vrr6q3z4pqm4548v3mxfcf681kpamkq8q54w49hhlp73dgmi", + "depends": ["R_cache", "cli", "fs", "here", "magrittr", "purrr", "rlang", "rprojroot", "withr", "yaml"] }, "precondition": { "name": "precondition", @@ -95993,7 +97013,7 @@ "name": "precrec", "version": "0.14.4", "sha256": "03hvp5h7fz4v2aswxim0mqgj9rdrhnk5xqz212161kpcrw6m67z8", - "depends": ["assertthat", "data_table", "ggplot2", "gridExtra", "Rcpp", "rlang", "withr"] + "depends": ["Rcpp", "assertthat", "data_table", "ggplot2", "gridExtra", "rlang", "withr"] }, "predReliability": { "name": "predReliability", @@ -96023,7 +97043,7 @@ "name": "predhy.GUI", "version": "2.0.1", "sha256": "04grfxb18vqhdh3ylq7dm3z3kal21nkr33pgj9698lzy1gn6ki22", - "depends": ["BGLR", "data_table", "doParallel", "DT", "foreach", "glmnet", "htmltools", "lightgbm", "pls", "predhy", "shiny", "xgboost"] + "depends": ["BGLR", "DT", "data_table", "doParallel", "foreach", "glmnet", "htmltools", "lightgbm", "pls", "predhy", "shiny", "xgboost"] }, "predict3d": { "name": "predict3d", @@ -96035,7 +97055,7 @@ "name": "predictMe", "version": "0.1", "sha256": "0n4sv9ahyvly17grlilybb7vwq9pzyn6mvhcn8z9cyswqa7svs49", - "depends": ["ggplot2", "Rdpack", "reshape2"] + "depends": ["Rdpack", "ggplot2", "reshape2"] }, "predictNMB": { "name": "predictNMB", @@ -96053,19 +97073,19 @@ "name": "predictionInterval", "version": "1.0.0", "sha256": "029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn", - "depends": ["ggplot2", "MASS", "MBESS", "pbapply"] + "depends": ["MASS", "MBESS", "ggplot2", "pbapply"] }, "predictmeans": { "name": "predictmeans", "version": "1.1.0", "sha256": "1010s79c55vndv3v4my0xrmdxvgpy7vhp46j1anxvr3xzgx1279q", - "depends": ["car", "ggplot2", "glmmTMB", "HRW", "lme4", "lmeInfo", "lmerTest", "lmeSplines", "MASS", "Matrix", "nlme", "numDeriv", "pbkrtest", "plotly", "plyr", "splines2"] + "depends": ["HRW", "MASS", "Matrix", "car", "ggplot2", "glmmTMB", "lme4", "lmeInfo", "lmeSplines", "lmerTest", "nlme", "numDeriv", "pbkrtest", "plotly", "plyr", "splines2"] }, "predictoR": { "name": "predictoR", "version": "3.0.10", "sha256": "0lj13rn9dpx0rqxb03abisa06ihphmrq5shpv6q2p0qb857pgmkf", - "depends": ["colourpicker", "config", "dplyr", "DT", "echarts4r", "glmnet", "golem", "htmltools", "loadeR", "rlang", "rpart_plot", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "traineR", "xgboost", "xtable"] + "depends": ["DT", "colourpicker", "config", "dplyr", "echarts4r", "glmnet", "golem", "htmltools", "loadeR", "rlang", "rpart_plot", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "traineR", "xgboost", "xtable"] }, "predictrace": { "name": "predictrace", @@ -96083,31 +97103,31 @@ "name": "predieval", "version": "0.1.1", "sha256": "096zfb94iixza0lfzr4p21gkcs9hl7h0d5jhbzdi3hhyz80zymrj", - "depends": ["ggplot2", "Hmisc", "MASS", "Matching"] + "depends": ["Hmisc", "MASS", "Matching", "ggplot2"] }, "predint": { "name": "predint", "version": "2.2.1", "sha256": "1db5nzwhj2zjzqpdrp0phcwxxgn4pdphb05hjlyc9r58hspg8k11", - "depends": ["ggplot2", "lme4", "MASS"] + "depends": ["MASS", "ggplot2", "lme4"] }, "predkmeans": { "name": "predkmeans", "version": "0.1.1", "sha256": "0352c50zlyzn8fczrkinayllj9jp978njjl7dazzkzypx0p20va5", - "depends": ["e1071", "maxLik", "mgcv", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "e1071", "maxLik", "mgcv"] }, "predtools": { "name": "predtools", "version": "0.0.3", "sha256": "150jlfbjvhnvvvbbjsr3hc0v778p9lyj8ml167inzbw4cynk2g9j", - "depends": ["dplyr", "ggplot2", "magrittr", "mvtnorm", "pROC", "RConics", "Rcpp"] + "depends": ["RConics", "Rcpp", "dplyr", "ggplot2", "magrittr", "mvtnorm", "pROC"] }, "predtoolsTS": { "name": "predtoolsTS", "version": "0.1.1", "sha256": "0f9fapw9yjdzj6pwcskbyfwjsvg09ahn20vrv4bgi0dx8am291rl", - "depends": ["caret", "forecast", "Metrics", "tseries", "TSPred"] + "depends": ["Metrics", "TSPred", "caret", "forecast", "tseries"] }, "pref": { "name": "pref", @@ -96233,7 +97253,7 @@ "name": "prettifyAddins", "version": "2.6.1", "sha256": "0ncj10j1ygc1dhlqdg5vklzf258bjbg6mry8i8vqqh1dxvl2djwr", - "depends": ["chromote", "httr", "rstudioapi", "shiny", "webdriver", "xml2", "XRJulia"] + "depends": ["XRJulia", "chromote", "httr", "rstudioapi", "shiny", "webdriver", "xml2"] }, "prettyB": { "name": "prettyB", @@ -96269,7 +97289,7 @@ "name": "prettyglm", "version": "1.0.1", "sha256": "1pivjpnspis7zshdj7kasncb8qpy40ld9f40fwlb3x14snrvbqix", - "depends": ["broom", "car", "dplyr", "forcats", "kableExtra", "knitr", "plotly", "RColorBrewer", "stringr", "tibble", "tidycat", "tidyr", "tidyselect", "vip"] + "depends": ["RColorBrewer", "broom", "car", "dplyr", "forcats", "kableExtra", "knitr", "plotly", "stringr", "tibble", "tidycat", "tidyr", "tidyselect", "vip"] }, "prettymapr": { "name": "prettymapr", @@ -96287,7 +97307,7 @@ "name": "prevR", "version": "5.0.0", "sha256": "17sygcfj29cvycsi1d2870gwcqq1ij6gppsqj46phc04r8q5hs5v", - "depends": ["directlabels", "fields", "foreign", "ggplot2", "gstat", "KernSmooth", "sf", "stars"] + "depends": ["KernSmooth", "directlabels", "fields", "foreign", "ggplot2", "gstat", "sf", "stars"] }, "prevalence": { "name": "prevalence", @@ -96303,15 +97323,15 @@ }, "preventr": { "name": "preventr", - "version": "0.9.0", - "sha256": "06rl3xm8h5zmpmf9v7ibs12i2b4i8r9vlk56d4iyzbsww2hh13a7", + "version": "0.10.0", + "sha256": "1m7g2p38wb95m3rci29b4x65ks1m4cwlawxwkqqzshcwnknxm57g", "depends": ["dplyr"] }, "previsionio": { "name": "previsionio", "version": "11.7.0", "sha256": "08hrklr3ngphdhp50lkz6ls9nn1bzdvs6xj583spsw4vm7j44yfr", - "depends": ["data_table", "futile_logger", "httr", "jsonlite", "magrittr", "Metrics", "plotly", "XML"] + "depends": ["Metrics", "XML", "data_table", "futile_logger", "httr", "jsonlite", "magrittr", "plotly"] }, "prevtoinc": { "name": "prevtoinc", @@ -96321,8 +97341,8 @@ }, "priceR": { "name": "priceR", - "version": "1.0.1", - "sha256": "0yf7hgvbm8a0ks2c8wnim8b9kqk7dljnaahw7faq2lzn67751dqc", + "version": "1.0.2", + "sha256": "08s3sx3cmvvr7ibrybbw35pkvizhc8yqdikwhv9c0ljmv5q3qww9", "depends": ["dplyr", "gsubfn", "jsonlite", "lubridate", "purrr", "stringi", "stringr", "tidyr"] }, "pricelevels": { @@ -96371,7 +97391,7 @@ "name": "primerTree", "version": "1.0.6", "sha256": "1w2xmmpqsp8plwsacfknkjkgs4x1fksrks614jwlg6fll4zxh42n", - "depends": ["ape", "directlabels", "foreach", "ggplot2", "gridExtra", "httr", "lubridate", "plyr", "reshape2", "scales", "stringr", "XML"] + "depends": ["XML", "ape", "directlabels", "foreach", "ggplot2", "gridExtra", "httr", "lubridate", "plyr", "reshape2", "scales", "stringr"] }, "primes": { "name": "primes", @@ -96395,7 +97415,7 @@ "name": "prinvars", "version": "1.0.0", "sha256": "10cxp5dqjmi0kbx8g2qvpvwv2lcdg4sd2njg81l9g8dphx0c662f", - "depends": ["elasticnet", "PMA", "Rdpack"] + "depends": ["PMA", "Rdpack", "elasticnet"] }, "prioGene": { "name": "prioGene", @@ -96407,13 +97427,13 @@ "name": "prioriactions", "version": "0.5.0", "sha256": "0k0vaqpdj9rlxcmfn6qb1bj8ssbazj33qa4rg4l8agpf9x83n9f8", - "depends": ["assertthat", "BH", "dplyr", "magrittr", "Matrix", "proto", "Rcpp", "RcppArmadillo", "rlang", "tidyr"] + "depends": ["BH", "Matrix", "Rcpp", "RcppArmadillo", "assertthat", "dplyr", "magrittr", "proto", "rlang", "tidyr"] }, "prioritizr": { "name": "prioritizr", "version": "8.0.4", "sha256": "18z5zm34ry45kapp0a146gvwij41wyhhxxyzwiz7ly79l6lwgs9s", - "depends": ["ape", "assertthat", "BH", "cli", "exactextractr", "igraph", "magrittr", "Matrix", "R6", "raster", "Rcpp", "RcppArmadillo", "rlang", "sf", "slam", "terra", "tibble", "withr"] + "depends": ["BH", "Matrix", "R6", "Rcpp", "RcppArmadillo", "ape", "assertthat", "cli", "exactextractr", "igraph", "magrittr", "raster", "rlang", "sf", "slam", "terra", "tibble", "withr"] }, "prioritizrdata": { "name": "prioritizrdata", @@ -96427,6 +97447,12 @@ "sha256": "1vn4i7rg1nsir98lgaxnw4851rwyv8kx25z8nc942qsr3r7cvdf6", "depends": ["checkmate", "glmnet", "survival"] }, + "priorsense": { + "name": "priorsense", + "version": "1.0.2", + "sha256": "1gilv3w1nn7ika226p78lj4fba7icp5xc8wgf1vg3fg8m2jjq356", + "depends": ["checkmate", "ggdist", "ggh4x", "ggplot2", "matrixStats", "posterior", "rlang", "tibble"] + }, "prism": { "name": "prism", "version": "0.2.1", @@ -96491,7 +97517,7 @@ "name": "probe", "version": "1.1", "sha256": "1bgkbsx8aa0r5dpnr1nv2q9p6af40dfzl3g333wmdg1dd6d2zp4n", - "depends": ["glmnet", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "glmnet"] }, "probout": { "name": "probout", @@ -96499,6 +97525,12 @@ "sha256": "1x7q878xzw1b1c6jfx856akxzcxrwanv67jji2ifkcdx2hgmgvpx", "depends": ["FNN", "MASS", "mclust"] }, + "probs": { + "name": "probs", + "version": "0.9.9", + "sha256": "0gbivss3ydnjy1acjczf5khp40l4sk1r53pbx151bxrdq74q8a3i", + "depends": ["MASS", "combinat", "reshape"] + }, "probstats4econ": { "name": "probstats4econ", "version": "0.2.0", @@ -96521,7 +97553,7 @@ "name": "processanimateR", "version": "1.0.5", "sha256": "054m578ifb4hhlalijkdmjxifn36vy61sdzjgcr1gg4yxfi2fbx3", - "depends": ["bupaR", "DiagrammeR", "dplyr", "htmltools", "htmlwidgets", "magrittr", "processmapR", "rlang", "stringr", "tidyr"] + "depends": ["DiagrammeR", "bupaR", "dplyr", "htmltools", "htmlwidgets", "magrittr", "processmapR", "rlang", "stringr", "tidyr"] }, "processcheckR": { "name": "processcheckR", @@ -96531,9 +97563,9 @@ }, "processmapR": { "name": "processmapR", - "version": "0.5.3", - "sha256": "1q3zppi2hmvqaydwyjyann1zajvk19rww0mj4ra7kj20icg8520h", - "depends": ["BH", "bupaR", "cli", "data_table", "DiagrammeR", "dplyr", "edeaR", "forcats", "ggplot2", "glue", "hms", "htmltools", "lifecycle", "miniUI", "plotly", "purrr", "Rcpp", "rlang", "scales", "shiny", "stringr", "tidyr"] + "version": "0.5.4", + "sha256": "0jb69si8npmw92nfsd35wfzrj8jwfflaajsd6xxvyp1bhfvjsvn6", + "depends": ["BH", "DiagrammeR", "Rcpp", "bupaR", "cli", "data_table", "dplyr", "edeaR", "forcats", "ggplot2", "glue", "hms", "htmltools", "htmlwidgets", "lifecycle", "miniUI", "plotly", "purrr", "rlang", "scales", "shiny", "stringr", "tidyr"] }, "processmonitR": { "name": "processmonitR", @@ -96551,7 +97583,7 @@ "name": "processx", "version": "3.8.4", "sha256": "02z7n59pglz6jw1vyyl0mkc7mz2c7y8yzsnhq5yz62digwnnf9v6", - "depends": ["ps", "R6"] + "depends": ["R6", "ps"] }, "proclhmm": { "name": "proclhmm", @@ -96575,7 +97607,7 @@ "name": "prodest", "version": "1.0.1", "sha256": "16nqgd9wrjfxymwbxrnlak54cagbv3fxgbql0w5bxnmyrbbqy509", - "depends": ["AER", "DEoptim", "dplyr", "Matrix", "Rsolnp"] + "depends": ["AER", "DEoptim", "Matrix", "Rsolnp", "dplyr"] }, "prodigenr": { "name": "prodigenr", @@ -96585,9 +97617,9 @@ }, "prodlim": { "name": "prodlim", - "version": "2023.08.28", - "sha256": "1s2xalxfq2q6a9ssz01vzpldpa98q3cl5icap0k2xr5v72gj40l0", - "depends": ["data_table", "diagram", "KernSmooth", "lava", "Rcpp", "survival"] + "version": "2024.06.25", + "sha256": "0r3780j04wy3ihrhvfm3qcwa9xjrxl43bcllzzq7xaki85jiz5j6", + "depends": ["KernSmooth", "Rcpp", "data_table", "diagram", "lava", "survival"] }, "productivity": { "name": "productivity", @@ -96605,13 +97637,13 @@ "name": "profExtrema", "version": "0.2.1", "sha256": "0gdhamnngh1yh3nb7l656qhdr61s0zn6h1hagh22k2fn11z3xhsl", - "depends": ["DiceKriging", "KrigInv", "lhs", "MASS", "microbenchmark", "pGPx", "quantreg", "rcdd", "RColorBrewer"] + "depends": ["DiceKriging", "KrigInv", "MASS", "RColorBrewer", "lhs", "microbenchmark", "pGPx", "quantreg", "rcdd"] }, "proffer": { "name": "proffer", "version": "0.1.6", "sha256": "0y94rwhg3gr63avmmwvfv84cgg08fya6vc7q535xjv1wspiyvjnl", - "depends": ["cli", "parallelly", "pingr", "processx", "profile", "RProtoBuf", "withr"] + "depends": ["RProtoBuf", "cli", "parallelly", "pingr", "processx", "profile", "withr"] }, "profile": { "name": "profile", @@ -96629,7 +97661,7 @@ "name": "profileR", "version": "0.3-5", "sha256": "0fgc7585a7194c67irafjnx8g2j6mn3qhcfn76c6dh28clp20qp9", - "depends": ["ggplot2", "lavaan", "RColorBrewer", "reshape"] + "depends": ["RColorBrewer", "ggplot2", "lavaan", "reshape"] }, "profiplots": { "name": "profiplots", @@ -96647,7 +97679,7 @@ "name": "profoc", "version": "1.3.2", "sha256": "1vs5l6f18maga6v27wschxzsbr5i4wqwsd64mz4z666rf92d7l60", - "depends": ["abind", "generics", "ggplot2", "lifecycle", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "rcpptimer", "splines2", "tibble"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "abind", "generics", "ggplot2", "lifecycle", "rcpptimer", "splines2", "tibble"] }, "profr": { "name": "profr", @@ -96683,7 +97715,7 @@ "name": "progress", "version": "1.2.3", "sha256": "0xljky4ad2jbbcfrcyh48li461pc5b2wk210n4x5rs2di6dhfaza", - "depends": ["crayon", "hms", "prettyunits", "R6"] + "depends": ["R6", "crayon", "hms", "prettyunits"] }, "progressr": { "name": "progressr", @@ -96719,7 +97751,7 @@ "name": "projpred", "version": "2.8.0", "sha256": "1xm1444qv0pkxdf2nacxnb2apx5lar1f3qz4jrxp6xd2xk2xv0xk", - "depends": ["abind", "gamm4", "ggplot2", "gtools", "lme4", "loo", "MASS", "mclogit", "mgcv", "mvtnorm", "nnet", "ordinal", "Rcpp", "RcppArmadillo", "rstantools", "scales"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "abind", "gamm4", "ggplot2", "gtools", "lme4", "loo", "mclogit", "mgcv", "mvtnorm", "nnet", "ordinal", "rstantools", "scales"] }, "prolific_api": { "name": "prolific.api", @@ -96737,7 +97769,7 @@ "name": "prome", "version": "1.9.1.0", "sha256": "134nc90av9js4qdq7dxy7z93h621i6w1vbgly38minprfam0wwm0", - "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools"] }, "promethee123": { "name": "promethee123", @@ -96749,13 +97781,13 @@ "name": "promises", "version": "1.3.0", "sha256": "1lzs65csxaq26d1g37qjjgxzm418xv52c3ccpk0l0cxkpbrrs87q", - "depends": ["fastmap", "later", "magrittr", "R6", "Rcpp", "rlang"] + "depends": ["R6", "Rcpp", "fastmap", "later", "magrittr", "rlang"] }, "promor": { "name": "promor", "version": "0.2.1", "sha256": "0cpf6946522lhnsr6fxm8ppvq69vjpkx7p7p0chx7kibc9ivb1ia", - "depends": ["caret", "ggplot2", "ggrepel", "gridExtra", "kernlab", "limma", "missForest", "naivebayes", "pcaMethods", "pROC", "reshape2", "statmod", "VIM", "viridis", "xgboost"] + "depends": ["VIM", "caret", "ggplot2", "ggrepel", "gridExtra", "kernlab", "limma", "missForest", "naivebayes", "pROC", "pcaMethods", "reshape2", "statmod", "viridis", "xgboost"] }, "promote": { "name": "promote", @@ -96767,7 +97799,7 @@ "name": "promotionImpact", "version": "0.1.5", "sha256": "18iq2r5zirddlfx20alm6qnxf9qv3ii3c9bcm789q0q18d2hyj2q", - "depends": ["crayon", "dplyr", "ggplot2", "ggpubr", "KernSmooth", "lmtest", "prophet", "Rcpp", "reshape2", "scales", "stringr", "strucchange"] + "depends": ["KernSmooth", "Rcpp", "crayon", "dplyr", "ggplot2", "ggpubr", "lmtest", "prophet", "reshape2", "scales", "stringr", "strucchange"] }, "prompt": { "name": "prompt", @@ -96803,7 +97835,7 @@ "name": "propagate", "version": "1.0-6", "sha256": "17jinz1jramlsf87i7vyn2qp82rc1dacljfaxxplrk3crhw3bhs7", - "depends": ["ff", "MASS", "minpack_lm", "Rcpp", "tmvtnorm"] + "depends": ["MASS", "Rcpp", "ff", "minpack_lm", "tmvtnorm"] }, "properties": { "name": "properties", @@ -96815,7 +97847,7 @@ "name": "prophet", "version": "1.0", "sha256": "06mryavky9xj54ig4scqjgpx7i56nwhs53g0zqsbs9f6qxja7gll", - "depends": ["BH", "dplyr", "dygraphs", "extraDistr", "ggplot2", "lubridate", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "scales", "StanHeaders", "tidyr", "xts"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "dygraphs", "extraDistr", "ggplot2", "lubridate", "rlang", "rstan", "rstantools", "scales", "tidyr", "xts"] }, "proporz": { "name": "proporz", @@ -96827,7 +97859,7 @@ "name": "prospectr", "version": "0.2.7", "sha256": "0hg2afw5aixx0xdwwr6g0wi8sksn7r21hz8diyqxg2345rwnzbg4", - "depends": ["foreach", "iterators", "lifecycle", "mathjaxr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "foreach", "iterators", "lifecycle", "mathjaxr"] }, "protHMM": { "name": "protHMM", @@ -96845,7 +97877,7 @@ "name": "protag", "version": "1.0.0", "sha256": "1iaw2w1d7hdvlg5vplpqc49wq08dgmm0ifvp2v0ggqb8invvdnw8", - "depends": ["dplyr", "ggplot2", "RColorBrewer"] + "depends": ["RColorBrewer", "dplyr", "ggplot2"] }, "protein8k": { "name": "protein8k", @@ -96855,15 +97887,15 @@ }, "proteomicsCV": { "name": "proteomicsCV", - "version": "0.2.5", - "sha256": "0wkyp21ns3k8812k109ilm9yi1y89m524cwwpa4wr0vqy65lrgba", + "version": "0.3.0", + "sha256": "0gvjl47x1wca2y386if2fgzp8k7a1xn9qxlq82ml66n193bp4k6a", "depends": [] }, "proteus": { "name": "proteus", "version": "1.1.4", "sha256": "1i8h07k5pdsywpw5g8d06xgl5gk06g5q93jimfwkbry9ykagh1cw", - "depends": ["abind", "actuar", "dplyr", "fANCOVA", "furrr", "future", "ggplot2", "ggthemes", "greybox", "imputeTS", "lubridate", "modeest", "moments", "narray", "purrr", "readr", "scales", "sn", "stringr", "tictoc", "torch", "VGAM"] + "depends": ["VGAM", "abind", "actuar", "dplyr", "fANCOVA", "furrr", "future", "ggplot2", "ggthemes", "greybox", "imputeTS", "lubridate", "modeest", "moments", "narray", "purrr", "readr", "scales", "sn", "stringr", "tictoc", "torch"] }, "proto": { "name": "proto", @@ -96881,7 +97913,7 @@ "name": "protolite", "version": "2.3.0", "sha256": "1sccyyf89bban3b83yxzkcyqpgcp7ggm9lirxixzjj433baj9vsk", - "depends": ["jsonlite", "Rcpp"] + "depends": ["Rcpp", "jsonlite"] }, "proton": { "name": "proton", @@ -96899,25 +97931,25 @@ "name": "prototest", "version": "1.2", "sha256": "07g58hq2qdpczqhjsv6dq1bya9rs958r103n91icw5yc19bvyhi2", - "depends": ["glmnet", "intervals", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "glmnet", "intervals"] }, "protr": { "name": "protr", - "version": "1.7-1", - "sha256": "1dakbkj07l2mnmnmi9j2xv0lk1bm8qpzac8s9gg7j4xpwsf0yyl7", + "version": "1.7-2", + "sha256": "0qkp9h6kndr5vkgqckzhhy7dsidbynpns3bap3r3gy2p1wzwmhx5", "depends": [] }, "protti": { "name": "protti", - "version": "0.8.0", - "sha256": "052ffldvy7a1h1z1c2gq9hdmhhwwiia5l6cyikq5j7yb8g1ff1n3", - "depends": ["curl", "data_table", "dplyr", "forcats", "ggplot2", "ggrepel", "httr", "janitor", "lifecycle", "magrittr", "plotly", "progress", "purrr", "R_utils", "readr", "rlang", "stringr", "tibble", "tidyr"] + "version": "0.9.0", + "sha256": "1lnlikkgw0cvyw6sh49fzzwin31vya3dgq6zyash51vf6i3nc992", + "depends": ["R_utils", "curl", "data_table", "dplyr", "forcats", "ggplot2", "ggrepel", "httr", "janitor", "lifecycle", "magrittr", "plotly", "progress", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr"] }, "proustr": { "name": "proustr", "version": "0.4.0", "sha256": "1qp4v4vb1qh137qn7zi1d2g999z17kq6kpyxy9355mj8c49iy8pn", - "depends": ["attempt", "rlang", "SnowballC", "stringr", "tidyr", "tokenizers"] + "depends": ["SnowballC", "attempt", "rlang", "stringr", "tidyr", "tokenizers"] }, "provDebugR": { "name": "provDebugR", @@ -96935,7 +97967,7 @@ "name": "provGraphR", "version": "1.0.1", "sha256": "0flq20i2m2dhkjjnipb4fash32db5pnlrwswqw1v1028vgv4yfnq", - "depends": ["igraph", "Matrix", "provParseR"] + "depends": ["Matrix", "igraph", "provParseR"] }, "provParseR": { "name": "provParseR", @@ -96995,7 +98027,7 @@ "name": "prozor", "version": "0.3.1", "sha256": "0gcjfjsvj2pjp9ih7nxvs9gfj5b94g8d3ziaz16wfbnjqm4a38lp", - "depends": ["AhoCorasickTrie", "docopt", "dplyr", "Matrix", "purrr", "readr", "rlang", "seqinr", "stringr"] + "depends": ["AhoCorasickTrie", "Matrix", "docopt", "dplyr", "purrr", "readr", "rlang", "seqinr", "stringr"] }, "prqlr": { "name": "prqlr", @@ -97007,7 +98039,7 @@ "name": "prrd", "version": "0.0.6", "sha256": "1wr469jvzgsic38x8xr72lx7px0k6l957z4hl63bgj7w2dczwyqz", - "depends": ["config", "crayon", "data_table", "DBI", "liteq", "RSQLite"] + "depends": ["DBI", "RSQLite", "config", "crayon", "data_table", "liteq"] }, "prt": { "name": "prt", @@ -97019,25 +98051,25 @@ "name": "pryr", "version": "0.1.6", "sha256": "013p2xxd51kr9ddx051cvn45mzgj44fm47nkchdb13l0885a7hb8", - "depends": ["codetools", "lobstr", "Rcpp", "stringr"] + "depends": ["Rcpp", "codetools", "lobstr", "stringr"] }, "ps": { "name": "ps", - "version": "1.7.6", - "sha256": "1lkd0mxr65sfh47dig0ck530kmsaxxqxdfy7ji59h78y7py5zhsj", + "version": "1.7.7", + "sha256": "1wi27l0a3z7wkrgn97jj5yqx6khy3brycj0y8nhlxagsp2rdrzj6", "depends": [] }, "psBayesborrow": { "name": "psBayesborrow", "version": "1.1.0", "sha256": "1kxwb9kvxykapw8mmihazx1wbd4z3yqwyj09dli6h82zcq2w220n", - "depends": ["BH", "boot", "copula", "e1071", "MatchIt", "optmatch", "overlapping", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "survival"] + "depends": ["BH", "MatchIt", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "boot", "copula", "e1071", "optmatch", "overlapping", "rstan", "rstantools", "survival"] }, "psData": { "name": "psData", "version": "0.2.2", "sha256": "013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4", - "depends": ["countrycode", "DataCombine", "reshape2", "rio", "xlsx"] + "depends": ["DataCombine", "countrycode", "reshape2", "rio", "xlsx"] }, "psSubpathway": { "name": "psSubpathway", @@ -97049,25 +98081,25 @@ "name": "psbcGroup", "version": "1.7", "sha256": "08gabhcpjsm92xrld3h14y092x05apz4b1znf10d6j3n1880fbl4", - "depends": ["LearnBayes", "mvtnorm", "SuppDists", "survival"] + "depends": ["LearnBayes", "SuppDists", "mvtnorm", "survival"] }, "psbcSpeedUp": { "name": "psbcSpeedUp", - "version": "2.0.6", - "sha256": "0dyvpdr9jafnac0m7x8rdsjbsl0fbd3c5lzc5483p3nnnynnml4q", - "depends": ["GGally", "ggplot2", "MASS", "Rcpp", "RcppArmadillo", "riskRegression", "survival", "xml2"] + "version": "2.0.7", + "sha256": "12nzqg67wpycalv31d04h8qq519c2i2rkxpqdnf1vb6w84c6nknv", + "depends": ["GGally", "MASS", "Rcpp", "RcppArmadillo", "ggplot2", "riskRegression", "survival", "xml2"] }, "psborrow": { "name": "psborrow", "version": "0.2.1", "sha256": "0m2jcf5awlwkzscsps0fczpaflxzi0w6m9qxlzm7abip277lhgpd", - "depends": ["data_table", "doParallel", "dplyr", "foreach", "futile_logger", "ggplot2", "MatchIt", "mvtnorm", "rjags", "survival"] + "depends": ["MatchIt", "data_table", "doParallel", "dplyr", "foreach", "futile_logger", "ggplot2", "mvtnorm", "rjags", "survival"] }, "psborrow2": { "name": "psborrow2", "version": "0.0.3.4", "sha256": "05mcfbgkdlx6yfiysvh3yk75c8rdcci7ql89n76vlm9h17ff5fm1", - "depends": ["checkmate", "future", "generics", "glue", "Matrix", "mvtnorm", "posterior", "simsurv"] + "depends": ["Matrix", "checkmate", "future", "generics", "glue", "mvtnorm", "posterior", "simsurv"] }, "pscl": { "name": "pscl", @@ -97079,7 +98111,7 @@ "name": "pscore", "version": "0.4.0", "sha256": "0flzqr9x0z2mjnbm5cjm8hqndkbv2yp11agkx89mbaafsg0hmjn1", - "depends": ["ggplot2", "JWileymisc", "lavaan", "reshape2"] + "depends": ["JWileymisc", "ggplot2", "lavaan", "reshape2"] }, "psd": { "name": "psd", @@ -97097,7 +98129,7 @@ "name": "pseudo", "version": "1.4.3", "sha256": "0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs", - "depends": ["geepack", "KMsurv"] + "depends": ["KMsurv", "geepack"] }, "pseudohouseholds": { "name": "pseudohouseholds", @@ -97121,19 +98153,19 @@ "name": "psgp", "version": "0.3-21", "sha256": "1pcg6q1g5ipial8kyk20n15zzls4ig0m0sxcc7d3ngryir89cyzs", - "depends": ["automap", "doParallel", "foreach", "gstat", "intamap", "Rcpp", "RcppArmadillo", "sp"] + "depends": ["Rcpp", "RcppArmadillo", "automap", "doParallel", "foreach", "gstat", "intamap", "sp"] }, "psica": { "name": "psica", "version": "1.0.2", "sha256": "1cnrd1p8ikv0hl97jwypw8np1ypa0d8k2mizwd1clkv7inbb264g", - "depends": ["BayesTree", "gridBase", "party", "partykit", "randomForest", "Rdpack", "rpart"] + "depends": ["BayesTree", "Rdpack", "gridBase", "party", "partykit", "randomForest", "rpart"] }, "psidR": { "name": "psidR", "version": "2.2", "sha256": "0vfvx5aidd7g3s02hajnlfr8c0czzzbsrkgzfw5zx1lm4rxw8z26", - "depends": ["data_table", "foreign", "futile_logger", "openxlsx", "RCurl", "SAScii"] + "depends": ["RCurl", "SAScii", "data_table", "foreign", "futile_logger", "openxlsx"] }, "psidread": { "name": "psidread", @@ -97145,7 +98177,7 @@ "name": "psm3mkv", "version": "0.3.2", "sha256": "0fbqyqgmjzqncx68x1cydfa9cm5k00k57d7hbb0iffcq08c0ya36", - "depends": ["admiral", "dplyr", "flexsurv", "ggplot2", "pharmaverseadam", "purrr", "rlang", "SimplicialCubature", "stringr", "survival", "tibble", "tidyr"] + "depends": ["SimplicialCubature", "admiral", "dplyr", "flexsurv", "ggplot2", "pharmaverseadam", "purrr", "rlang", "stringr", "survival", "tibble", "tidyr"] }, "psmineR": { "name": "psmineR", @@ -97167,15 +98199,15 @@ }, "psp": { "name": "psp", - "version": "1.0.0", - "sha256": "0fjpjzf0m1f5xw1jrxn78m4r8ghwkcs2fsfhivbvws31gc11h7k0", - "depends": ["data_table", "Rcpp", "RcppArmadillo"] + "version": "1.0.2", + "sha256": "10b93c3x39304j9wz2fqlmx1x417vpzdi9b11bjil8brdg5qipk6", + "depends": ["Rcpp", "RcppArmadillo", "data_table"] }, "pspatreg": { "name": "pspatreg", "version": "1.1.2", "sha256": "0giaxz7zdwik6qw9xlgipxwksdia044y2h64ik2bz03hi21w5n2i", - "depends": ["AmesHousing", "dplyr", "fields", "ggplot2", "MASS", "Matrix", "MBA", "minqa", "numDeriv", "plm", "Rdpack", "sf", "spatialreg", "spdep", "stringr"] + "depends": ["AmesHousing", "MASS", "MBA", "Matrix", "Rdpack", "dplyr", "fields", "ggplot2", "minqa", "numDeriv", "plm", "sf", "spatialreg", "spdep", "stringr"] }, "pspearman": { "name": "pspearman", @@ -97199,13 +98231,13 @@ "name": "pssmooth", "version": "1.0.3", "sha256": "08syh52gjaf72kq01v6b5dljmwi29nvmjmkkgmjb97zsi15z1wd3", - "depends": ["chngpt", "MASS", "np", "osDesign"] + "depends": ["MASS", "chngpt", "np", "osDesign"] }, "pstest": { "name": "pstest", "version": "0.1.3.900", "sha256": "1rhd4vgqpr9yq0pc3xql3nfgl30v20ldywapp9n967ky2dja4k0z", - "depends": ["glmx", "MASS"] + "depends": ["MASS", "glmx"] }, "psy": { "name": "psy", @@ -97227,9 +98259,9 @@ }, "psych": { "name": "psych", - "version": "2.4.3", - "sha256": "0ic479y314knn20m1cjlp15lji7f70xrg95ln570pgkhrk5853bi", - "depends": ["lattice", "mnormt", "nlme"] + "version": "2.4.6.26", + "sha256": "1gnjpcpqlviyyj5myhy440fj1zwx14b9jwhp5907yyhhw2ail69d", + "depends": ["GPArotation", "lattice", "mnormt", "nlme"] }, "psychReport": { "name": "psychReport", @@ -97245,8 +98277,8 @@ }, "psychmeta": { "name": "psychmeta", - "version": "2.6.5", - "sha256": "0rdbi432kr433rqy5y8rjh11cq66zcc8zr4nckjqw88hsz4qhin4", + "version": "2.7.0", + "sha256": "1705zj755sw6pigyqrh62z84cpi3yvgmqfzn8gl7bpgc1fjyryck", "depends": ["boot", "curl", "dplyr", "ggplot2", "metafor", "progress", "purrr", "rlang", "tibble", "tidyr"] }, "psycho": { @@ -97265,13 +98297,13 @@ "name": "psychomix", "version": "1.1-8", "sha256": "0lfhfcmrk65gkr1yp317b515vmadbcf0vjcnc76d07yp6yfkz5qw", - "depends": ["flexmix", "Formula", "lattice", "modeltools", "psychotools"] + "depends": ["Formula", "flexmix", "lattice", "modeltools", "psychotools"] }, "psychonetrics": { "name": "psychonetrics", - "version": "0.12", - "sha256": "0kpfkn1sy773vafh7jxbdmcawyssl7lkvr8bg0wr864dq6j1jjbc", - "depends": ["abind", "combinat", "corpcor", "dplyr", "GA", "glasso", "IsingSampler", "lavaan", "magrittr", "Matrix", "mgcv", "numDeriv", "optimx", "pbapply", "pbv", "psych", "qgraph", "Rcpp", "RcppArmadillo", "rlang", "roptim", "tidyr", "VCA"] + "version": "0.13", + "sha256": "0yrpw1dcz8mzfydv48dk4liqhfcwqh3s7c9xpfcniisab5hvq3m6", + "depends": ["GA", "IsingSampler", "Matrix", "Rcpp", "RcppArmadillo", "VCA", "abind", "combinat", "corpcor", "dplyr", "glasso", "lavaan", "magrittr", "mgcv", "numDeriv", "optimx", "pbapply", "pbv", "psych", "qgraph", "rlang", "roptim", "tidyr"] }, "psychotools": { "name": "psychotools", @@ -97301,7 +98333,7 @@ "name": "psyntur", "version": "0.1.0", "sha256": "0dh7vdj3ynsxibcf0wmh5h4yknijg78azjzlma25glihpgd2nbbw", - "depends": ["dplyr", "effsize", "ez", "fastDummies", "formula_tools", "GGally", "ggplot2", "ggthemes", "magrittr", "plyr", "psych", "purrr", "rlang", "tidyr", "tidyselect"] + "depends": ["GGally", "dplyr", "effsize", "ez", "fastDummies", "formula_tools", "ggplot2", "ggthemes", "magrittr", "plyr", "psych", "purrr", "rlang", "tidyr", "tidyselect"] }, "psyphy": { "name": "psyphy", @@ -97319,7 +98351,7 @@ "name": "ptable", "version": "1.0.0", "sha256": "142nw1rq9nm9fc6amcsdfy4qnv89p5yz90cxxbw1r4bylm86grs2", - "depends": ["data_table", "flexdashboard", "ggplot2", "nloptr", "RColorBrewer", "rlang", "rmarkdown"] + "depends": ["RColorBrewer", "data_table", "flexdashboard", "ggplot2", "nloptr", "rlang", "rmarkdown"] }, "ptinpoly": { "name": "ptinpoly", @@ -97343,7 +98375,7 @@ "name": "ptools", "version": "2.0.0", "sha256": "12k47f2nwf5r0d4r1n3qksdsd1gk3ax519hqz6803hynwlcqx2a3", - "depends": ["igraph", "partitions", "RANN", "raster", "sf", "sp", "spatstat_geom", "spatstat_utils"] + "depends": ["RANN", "igraph", "partitions", "raster", "sf", "sp", "spatstat_geom", "spatstat_utils"] }, "ptspotter": { "name": "ptspotter", @@ -97383,9 +98415,9 @@ }, "pubh": { "name": "pubh", - "version": "1.3.2", - "sha256": "1a4hmnzg2ghh5785yzw6bj0zr7mvx6kdyynv21pd2m16kx1jm8ia", - "depends": ["car", "dplyr", "emmeans", "Epi", "epiR", "epitools", "ggformula", "ggplot2", "gtsummary", "huxtable", "lmtest", "magrittr", "moonBook", "sandwich", "sjlabelled", "sjmisc", "survival", "tibble", "tidyselect"] + "version": "1.3.7", + "sha256": "16z0icqzcjz28wqjjmgv66v5x4m8kdf6vakqq1ihvghz5dyv1j8c", + "depends": ["Epi", "car", "dplyr", "emmeans", "epiR", "epitools", "ggformula", "ggplot2", "gtsummary", "huxtable", "jtools", "lmtest", "moonBook", "performance", "sandwich", "sjlabelled", "sjmisc", "survival", "tibble", "tidyselect"] }, "public_ctn0094data": { "name": "public.ctn0094data", @@ -97403,19 +98435,19 @@ "name": "publipha", "version": "0.1.2", "sha256": "03fpwxh5fyiq84wvmp5yyvsvqnznxyc4ncffn0nfhdnj5giymqvh", - "depends": ["BH", "loo", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "truncnorm"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "loo", "rstan", "rstantools", "truncnorm"] }, "pubmed_mineR": { "name": "pubmed.mineR", "version": "1.0.20", "sha256": "0apmdrn5bdis55d73j8xgfvv4x54fplmny5c28y5pwa262kchbid", - "depends": ["boot", "R2HTML", "RCurl", "RJSONIO", "XML"] + "depends": ["R2HTML", "RCurl", "RJSONIO", "XML", "boot"] }, "pubmedR": { "name": "pubmedR", "version": "0.0.3", "sha256": "153br94iqayrvvgzrzx0r3ilcrmnznfdnzk8yaii01s8i1g1wxcd", - "depends": ["rentrez", "XML"] + "depends": ["XML", "rentrez"] }, "pubmedtk": { "name": "pubmedtk", @@ -97427,7 +98459,7 @@ "name": "pubtatordb", "version": "0.1.4", "sha256": "0i5azbf75bwxxzpsr5fc2hh22pbwix00hz9dcdpn5jgp2957f7wx", - "depends": ["assertthat", "DBI", "dplyr", "R_utils", "readr", "RSQLite"] + "depends": ["DBI", "RSQLite", "R_utils", "assertthat", "dplyr", "readr"] }, "pullword": { "name": "pullword", @@ -97457,7 +98489,7 @@ "name": "puniform", "version": "0.2.7", "sha256": "15q5wlcps7387rjz7p1f5kifg1fl5yxxy7gjx6fvspvqwjkjbs4z", - "depends": ["ADGofTest", "metafor", "numDeriv", "Rcpp", "RcppArmadillo"] + "depends": ["ADGofTest", "Rcpp", "RcppArmadillo", "metafor", "numDeriv"] }, "puremoe": { "name": "puremoe", @@ -97469,7 +98501,7 @@ "name": "pureseqtmr", "version": "1.4", "sha256": "105v0ydl458xzgkdas7m8llf0672s9klv816sjl27dy0a3k8163f", - "depends": ["data_table", "devtools", "dplyr", "ggplot2", "Peptides", "plyr", "rappdirs", "Rcpp", "readr", "stringr", "tibble"] + "depends": ["Peptides", "Rcpp", "data_table", "devtools", "dplyr", "ggplot2", "plyr", "rappdirs", "readr", "stringr", "tibble"] }, "purge": { "name": "purge", @@ -97481,7 +98513,7 @@ "name": "purgeR", "version": "1.8.2", "sha256": "0w3mcij7q5aqbs5phiyqprgr3hvs77fnjmbayp2rwn9qm1sx160a", - "depends": ["doSNOW", "foreach", "progress", "Rcpp", "RcppProgress"] + "depends": ["Rcpp", "RcppProgress", "doSNOW", "foreach", "progress"] }, "purging": { "name": "purging", @@ -97499,7 +98531,7 @@ "name": "purrrlyr", "version": "0.0.8", "sha256": "0ql08dka07wi1cxjcn12pxj00j0cm112074l7byj9vmi3rlqynh8", - "depends": ["dplyr", "magrittr", "purrr", "Rcpp"] + "depends": ["Rcpp", "dplyr", "magrittr", "purrr"] }, "pushbar": { "name": "pushbar", @@ -97523,7 +98555,7 @@ "name": "pvLRT", "version": "0.5.1", "sha256": "02w88z752svyk63n288dwnbwlw5v5cla294pzrms361ggs1bdkph", - "depends": ["bit64", "data_table", "ggfittext", "ggplot2", "glue", "magrittr", "progress", "RColorBrewer"] + "depends": ["RColorBrewer", "bit64", "data_table", "ggfittext", "ggplot2", "glue", "magrittr", "progress"] }, "pvaluefunctions": { "name": "pvaluefunctions", @@ -97559,7 +98591,7 @@ "name": "pvda", "version": "0.0.3", "sha256": "0m7lw5wplwv3w7bwcflk6ijw83rv85zdch3flvcnx8slqxzaidrg", - "depends": ["checkmate", "cli", "data_table", "dplyr", "dtplyr", "glue", "purrr", "Rdpack", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["Rdpack", "checkmate", "cli", "data_table", "dplyr", "dtplyr", "glue", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] }, "pvldcurve": { "name": "pvldcurve", @@ -97571,7 +98603,7 @@ "name": "pwlmm", "version": "1.1.1", "sha256": "0mqf26mx6bamnasknxj3fwsn60nkwh4h74wbr2950qwz1s320hmz", - "depends": ["lme4", "Matrix", "Rcpp", "RcppEigen"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "lme4"] }, "pwr": { "name": "pwr", @@ -97589,7 +98621,7 @@ "name": "pwr2ppl", "version": "0.5.0", "sha256": "0vq7xw6nlaf3vi3415640752988vjj0cdrpjmpl7fjh0z2m5w758", - "depends": ["afex", "broom", "car", "dplyr", "ez", "lavaan", "lmPerm", "lmtest", "MASS", "MBESS", "nlme", "phia", "pls", "quantreg", "semTools", "tidyr"] + "depends": ["MASS", "MBESS", "afex", "broom", "car", "dplyr", "ez", "lavaan", "lmPerm", "lmtest", "nlme", "phia", "pls", "quantreg", "semTools", "tidyr"] }, "pwrAB": { "name": "pwrAB", @@ -97643,7 +98675,7 @@ "name": "pxR", "version": "0.42.7", "sha256": "05i1cg35hq0z37xnh2qfcp8mnrphadrg7av5d0mcgi9nx6c1w80j", - "depends": ["plyr", "reshape2", "RJSONIO", "stringr"] + "depends": ["RJSONIO", "plyr", "reshape2", "stringr"] }, "pxweb": { "name": "pxweb", @@ -97655,7 +98687,7 @@ "name": "pyMTurkR", "version": "1.1.6", "sha256": "16a16rjm71xlv57lkw0w49cv563pg1b8ihligmacrnv9vmzv0843", - "depends": ["curl", "reticulate", "XML"] + "depends": ["XML", "curl", "reticulate"] }, "pycno": { "name": "pycno", @@ -97689,9 +98721,9 @@ }, "pysparklyr": { "name": "pysparklyr", - "version": "0.1.4", - "sha256": "1qya9v6hh2jrsxihz87yk2sxhyp7mcnjl4invv7n5awq9ljz946l", - "depends": ["cli", "DBI", "dbplyr", "dplyr", "fs", "glue", "httr2", "magrittr", "processx", "purrr", "reticulate", "rlang", "rsconnect", "rstudioapi", "sparklyr", "tidyr", "tidyselect", "vctrs"] + "version": "0.1.5", + "sha256": "1029way7vq02bi6hj78vxfqgq3ccbzyv7b758lv51rjm6fm9ckpr", + "depends": ["DBI", "arrow", "cli", "dbplyr", "dplyr", "fs", "glue", "httr2", "magrittr", "processx", "purrr", "reticulate", "rlang", "rsconnect", "rstudioapi", "sparklyr", "tidyr", "tidyselect", "vctrs"] }, "pzfx": { "name": "pzfx", @@ -97733,13 +98765,13 @@ "name": "qacBase", "version": "1.0.3", "sha256": "0rmxmaaa162w1qrbkcm2fd2rnrp2kqjjh6mpszpv1lpfdaq7p4yq", - "depends": ["crayon", "dplyr", "ggcorrplot", "ggExtra", "ggplot2", "haven", "multcompView", "patchwork", "PMCMRplus", "purrr", "rlang", "tidyr"] + "depends": ["PMCMRplus", "crayon", "dplyr", "ggExtra", "ggcorrplot", "ggplot2", "haven", "multcompView", "patchwork", "purrr", "rlang", "tidyr"] }, "qad": { "name": "qad", "version": "1.0.4", "sha256": "1pvdm6h5zilvrpggvy5qq5lhxxblslkjvjjfdj1f5zaick2hmf3s", - "depends": ["copula", "cowplot", "data_table", "dplyr", "ggExtra", "ggplot2", "Rcpp", "viridis"] + "depends": ["Rcpp", "copula", "cowplot", "data_table", "dplyr", "ggExtra", "ggplot2", "viridis"] }, "qap": { "name": "qap", @@ -97751,13 +98783,13 @@ "name": "qape", "version": "2.1", "sha256": "18ryi0mxpm6rcfqj8dl4rvmkcpkch4yv001lwkbsipdm206704ys", - "depends": ["dplyr", "future_apply", "lme4", "Matrix", "matrixcalc", "mvtnorm", "plyr", "reshape2"] + "depends": ["Matrix", "dplyr", "future_apply", "lme4", "matrixcalc", "mvtnorm", "plyr", "reshape2"] }, "qbld": { "name": "qbld", "version": "1.0.3", "sha256": "0zz2n8f4cn03k80wakfgjhablxhbr8hxj5ydl4m7zlya4kdkl5md", - "depends": ["knitr", "mcmcse", "Rcpp", "RcppArmadillo", "RcppDist", "rmarkdown", "stableGR"] + "depends": ["Rcpp", "RcppArmadillo", "RcppDist", "knitr", "mcmcse", "rmarkdown", "stableGR"] }, "qboxplot": { "name": "qboxplot", @@ -97805,7 +98837,7 @@ "name": "qch", "version": "2.0.0", "sha256": "1d2mcyzfnpmr4pv036crhsc91gypj0jrn6hmd9jcnm49khqc0lan", - "depends": ["copula", "dplyr", "ks", "purrr", "qvalue", "Rcpp", "RcppArmadillo", "stringr"] + "depends": ["Rcpp", "RcppArmadillo", "copula", "dplyr", "ks", "purrr", "qvalue", "stringr"] }, "qcpm": { "name": "qcpm", @@ -97817,7 +98849,7 @@ "name": "qcr", "version": "1.4", "sha256": "14nilw60p2kcabh9w5k8bvdjqx4lm5lj79qiigg3i372byq5gb7r", - "depends": ["fda_usc", "MASS", "mvtnorm", "qcc"] + "depends": ["MASS", "fda_usc", "mvtnorm", "qcc"] }, "qcv": { "name": "qcv", @@ -97829,7 +98861,7 @@ "name": "qdap", "version": "2.4.6", "sha256": "1dr48b0187w003v98qckzi4zxb6r0yi3jh8f6krknv4c4qasfn9n", - "depends": ["chron", "dplyr", "gender", "ggplot2", "gridExtra", "igraph", "NLP", "openNLP", "openxlsx", "plotrix", "qdapDictionaries", "qdapRegex", "qdapTools", "RColorBrewer", "RCurl", "reshape2", "scales", "stringdist", "tidyr", "tm", "venneuler", "wordcloud", "XML"] + "depends": ["NLP", "RColorBrewer", "RCurl", "XML", "chron", "dplyr", "gender", "ggplot2", "gridExtra", "igraph", "openNLP", "openxlsx", "plotrix", "qdapDictionaries", "qdapRegex", "qdapTools", "reshape2", "scales", "stringdist", "tidyr", "tm", "venneuler", "wordcloud"] }, "qdapDictionaries": { "name": "qdapDictionaries", @@ -97847,7 +98879,7 @@ "name": "qdapTools", "version": "1.3.7", "sha256": "1cf42lxzqha2ah0yjl144pch50imfr5rf6g0b59xr5jf9x96dsjp", - "depends": ["chron", "data_table", "RCurl", "XML"] + "depends": ["RCurl", "XML", "chron", "data_table"] }, "qdm": { "name": "qdm", @@ -97865,7 +98897,7 @@ "name": "qfa", "version": "2.1", "sha256": "1cawddpspdwrnc7ysp0v109j3k1lqpl9gyhp0jg5ribfiipyszww", - "depends": ["colorRamps", "doParallel", "fields", "foreach", "MASS", "mgcv", "nlme", "quantreg", "RhpcBLASctl"] + "depends": ["MASS", "RhpcBLASctl", "colorRamps", "doParallel", "fields", "foreach", "mgcv", "nlme", "quantreg"] }, "qfasar": { "name": "qfasar", @@ -97901,19 +98933,19 @@ "name": "qgg", "version": "1.1.2", "sha256": "0195fzcr0xy2dns4jl5kn3nigy989l47syn8iavfdpqb76zsh0a3", - "depends": ["coda", "corpcor", "data_table", "MASS", "MCMCpack", "Rcpp", "RcppArmadillo", "statmod"] + "depends": ["MASS", "MCMCpack", "Rcpp", "RcppArmadillo", "coda", "corpcor", "data_table", "statmod"] }, "qgisprocess": { "name": "qgisprocess", - "version": "0.3.0", - "sha256": "0l7696hl728vcjapsczkj3lvip23b1n22skk6cinwkjb8hyc7h9y", + "version": "0.4.0", + "sha256": "0dshfyfhn9lwr8rx1d0ys0bg6m1y99wma0v07h5r8gz8h7zzm1hb", "depends": ["assertthat", "glue", "jsonlite", "processx", "rappdirs", "rlang", "stringr", "tibble", "vctrs", "withr"] }, "qgraph": { "name": "qgraph", "version": "1.9.8", "sha256": "1m019j5nxc0184p0r2zgdn457g555nxsp2s08maa053nydj1va0l", - "depends": ["abind", "colorspace", "corpcor", "fdrtool", "ggplot2", "glasso", "gtools", "Hmisc", "igraph", "jpeg", "lavaan", "Matrix", "pbapply", "plyr", "png", "psych", "Rcpp", "reshape2"] + "depends": ["Hmisc", "Matrix", "Rcpp", "abind", "colorspace", "corpcor", "fdrtool", "ggplot2", "glasso", "gtools", "igraph", "jpeg", "lavaan", "pbapply", "plyr", "png", "psych", "reshape2"] }, "qgshiny": { "name": "qgshiny", @@ -97961,24 +98993,24 @@ "name": "qlcMatrix", "version": "0.9.8", "sha256": "0d38jb653787s05g8syc9wgaljaifmkviijwz5rzcd881glgs8sv", - "depends": ["docopt", "Matrix", "slam", "sparsesvd"] + "depends": ["Matrix", "docopt", "slam", "sparsesvd"] }, "qlcVisualize": { "name": "qlcVisualize", - "version": "0.3", - "sha256": "0njckbdrvzjlmdxmdygcxh6zc30r0gcna5i8jyr1cibmckcbl96h", - "depends": ["alphahull", "cartogramR", "concaveman", "fields", "geodata", "mapplots", "maps", "MASS", "qlcMatrix", "RSpectra", "seriation", "sf", "sp", "spatstat_geom", "spatstat_random"] + "version": "0.4", + "sha256": "13bznvc1915igbaj5bkc96lzsjpvpbkixs3gqpdgl1nzmakrlpjj", + "depends": ["MASS", "RSpectra", "alphahull", "automap", "cartogramR", "concaveman", "fields", "geodata", "gstat", "mapplots", "maps", "qlcMatrix", "seriation", "sf", "sp", "spatstat_geom", "spatstat_random", "stars"] }, "qlcal": { "name": "qlcal", - "version": "0.0.11", - "sha256": "0r40vjnp8aqsdd6wznaff6awadcm64j0am5nln564zw8g8amwl6l", + "version": "0.0.12", + "sha256": "1q8944agv3wdd1ylssk7p11mms0s3jpy3ai0rnhafdj4spycwgp2", "depends": ["BH", "Rcpp"] }, "qlifetable": { "name": "qlifetable", - "version": "0.0.2-4", - "sha256": "01p5gkadmfw2hc9h1gdg88k2g7rq204km9ncldmpf10vnglpiww0", + "version": "0.0.2-5", + "sha256": "1r1pxj35k5vyvq3gc7nzp7q2zwvvqjzs9xzw3i8pv5sixmaqv47a", "depends": [] }, "qmap": { @@ -97991,7 +99023,7 @@ "name": "qmd", "version": "1.1.2", "sha256": "15y1bivli3jy09l4j37zp327x1nchkg6qm8hs46srcxznh9zb99d", - "depends": ["cowplot", "dplyr", "ggplot2", "qad", "Rcpp"] + "depends": ["Rcpp", "cowplot", "dplyr", "ggplot2", "qad"] }, "qmethod": { "name": "qmethod", @@ -98033,13 +99065,13 @@ "name": "qpdf", "version": "1.3.3", "sha256": "0lzyc1g7q809h047il5nkizv124j13m1zf3j32in0gx7dyz10mj1", - "depends": ["askpass", "curl", "Rcpp"] + "depends": ["Rcpp", "askpass", "curl"] }, "qpmadr": { "name": "qpmadr", "version": "1.1.0-0", "sha256": "0krv3zhr42z2mkkbn2bkglzfxbf06dmd9vnnc3rcyhm1r85n4fbq", - "depends": ["checkmate", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "checkmate"] }, "qqboxplot": { "name": "qqboxplot", @@ -98063,7 +99095,7 @@ "name": "qqplotr", "version": "0.0.6", "sha256": "0kj1m7m04599d3b6227vja02zwq5d2vc0cyz2c7jvki4g3q2knxf", - "depends": ["dplyr", "ggplot2", "MASS", "opdisDownsampling", "qqconf", "robustbase"] + "depends": ["MASS", "dplyr", "ggplot2", "opdisDownsampling", "qqconf", "robustbase"] }, "qqtest": { "name": "qqtest", @@ -98079,14 +99111,14 @@ }, "qrLMM": { "name": "qrLMM", - "version": "2.2", - "sha256": "1y612kqnwqzrg5b7c4fc0al8zxycb6g6bgq747yvkm9kqyhbxszh", + "version": "2.3", + "sha256": "0j42akh84jawjq4dslqcf0yg5k4r6dz8psgv812l4qmrl3s9frnz", "depends": ["ald", "lqr", "mvtnorm", "psych", "quantreg"] }, "qrNLMM": { "name": "qrNLMM", - "version": "3.3", - "sha256": "085xjxgswzfra90s88h0mhpns9fpm9pjpi6y2zcv46a67zfvpn9v", + "version": "3.4", + "sha256": "0kzyk01c20bzglkdapy8gwnvkmrjndakm2lj9svx4lhl80v1jh31", "depends": ["ald", "lqr", "mvtnorm", "progress", "psych", "quantreg"] }, "qra": { @@ -98117,31 +99149,31 @@ "name": "qrencoder", "version": "0.1.0", "sha256": "1lg60lg2fiqdw0m228i8pln2p0kqp9f21qmrx6r6rwxifvwlfhv8", - "depends": ["base64enc", "png", "raster", "Rcpp"] + "depends": ["Rcpp", "base64enc", "png", "raster"] }, "qreport": { "name": "qreport", "version": "1.0-1", "sha256": "1d3dlpcf6w4bj6bwmydr3rlnscfdqyad6j2cm1rda7565q7k9iyf", - "depends": ["data_table", "Formula", "ggplot2", "Hmisc", "htmltools", "knitr", "rms", "viridis"] + "depends": ["Formula", "Hmisc", "data_table", "ggplot2", "htmltools", "knitr", "rms", "viridis"] }, "qris": { "name": "qris", "version": "1.1.1", "sha256": "0nx4x4ywgwg55fpv9cr30r09in4rzm6070fm0g88qpvgvrihs9a6", - "depends": ["ggplot2", "nleqslv", "quantreg", "Rcpp", "RcppArmadillo", "stringr", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "nleqslv", "quantreg", "stringr", "survival"] }, "qrjoint": { "name": "qrjoint", "version": "2.0-9", "sha256": "0dvz5adawy143r0ddgrblzac76igwmngnblr6vq57sxlvj1nsm7h", - "depends": ["coda", "kernlab", "Matrix", "quantreg"] + "depends": ["Matrix", "coda", "kernlab", "quantreg"] }, "qrlabelr": { "name": "qrlabelr", "version": "0.2.0", "sha256": "1bv76d3fkficcaqg4kzkkxjq1p24c6hxd25jyfia96nkmxyds44m", - "depends": ["argonDash", "argonR", "assertthat", "bslib", "desplot", "dplyr", "ggplot2", "purrr", "QBMS", "qrencoder", "raster", "reactable", "readxl", "shiny", "shinyBS", "shinycssloaders", "shinyjs", "shinyWidgets", "uuid"] + "depends": ["QBMS", "argonDash", "argonR", "assertthat", "bslib", "desplot", "dplyr", "ggplot2", "purrr", "qrencoder", "raster", "reactable", "readxl", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "shinyjs", "uuid"] }, "qrmdata": { "name": "qrmdata", @@ -98159,7 +99191,7 @@ "name": "qrmtools", "version": "0.0-17", "sha256": "1vv9y6mmvqnlimghw3dl873r4l47imwcp2x58yzrn53fa2y7b6mi", - "depends": ["ADGofTest", "lattice", "Quandl", "quantmod", "rugarch", "xts", "zoo"] + "depends": ["ADGofTest", "Quandl", "lattice", "quantmod", "rugarch", "xts", "zoo"] }, "qrng": { "name": "qrng", @@ -98201,19 +99233,19 @@ "name": "qsplines", "version": "1.0.1", "sha256": "0zln3w2qx8ck9631hkq8ig5bc2l55wg5mdp3i0fm9amg8mhzq37i", - "depends": ["BH", "onion", "Rcpp", "shiny"] + "depends": ["BH", "Rcpp", "onion", "shiny"] }, "qspray": { "name": "qspray", - "version": "3.0.0", - "sha256": "1vxs8z6whl5a829nk4cjljl47722nzgi8pl0wfhry1skans6gbkq", - "depends": ["BH", "DescTools", "gmp", "partitions", "purrr", "RationalMatrix", "Rcpp", "RcppArmadillo", "Ryacas"] + "version": "3.1.0", + "sha256": "0i5sq29zdcvdrmzsd0xxrw200q6nhg8b00n2jwya8hq4al9xq2z6", + "depends": ["BH", "DescTools", "RationalMatrix", "Rcpp", "Ryacas", "gmp", "partitions", "purrr"] }, "qst": { "name": "qst", "version": "0.1.2", "sha256": "0f5c4088y9c5fxyy2dyfkp049lnzvys3zyizazxsa82xwkwsbc8a", - "depends": ["DBI", "dbplyr", "dplyr", "magrittr", "RSQLite", "tibble"] + "depends": ["DBI", "RSQLite", "dbplyr", "dplyr", "magrittr", "tibble"] }, "qsub": { "name": "qsub", @@ -98225,7 +99257,13 @@ "name": "qte", "version": "1.3.1", "sha256": "1hz3rwsi3w2b1xjigf5s3866djcxdkjz7jwcz0rin22v5h6sql80", - "depends": ["BMisc", "data_table", "formula_tools", "ggplot2", "Hmisc", "pbapply", "quantreg", "texreg"] + "depends": ["BMisc", "Hmisc", "data_table", "formula_tools", "ggplot2", "pbapply", "quantreg", "texreg"] + }, + "qtkit": { + "name": "qtkit", + "version": "1.0.0", + "sha256": "0bplhks1sbhx5h34ijx3xdalgvczl8zg4vi6hh7iyp92wncid1vx", + "depends": ["Matrix", "chromote", "dplyr", "ggplot2", "glue", "gutenbergr", "kableExtra", "knitr", "openai", "purrr", "readr", "rlang", "stringr", "tibble", "tidytext"] }, "qtl": { "name": "qtl", @@ -98237,25 +99275,25 @@ "name": "qtl2", "version": "0.36", "sha256": "0sy4j3f1dw7w7qcp3lsc5mmd8kwa5qaxcl8c4236a8zbzkvvnp5j", - "depends": ["data_table", "jsonlite", "Rcpp", "RcppEigen", "RSQLite", "yaml"] + "depends": ["RSQLite", "Rcpp", "RcppEigen", "data_table", "jsonlite", "yaml"] }, "qtl2convert": { "name": "qtl2convert", "version": "0.30", "sha256": "1rpg74gblh30qy0byxvyhlrimcgx7ml5jn7dxs032my7pa58mspf", - "depends": ["qtl", "qtl2", "Rcpp"] + "depends": ["Rcpp", "qtl", "qtl2"] }, "qtl2fst": { "name": "qtl2fst", - "version": "0.26", - "sha256": "0wpqpmj752pwjgghv7b30r69nc950h5fnsszsj142p7vws7ss8j9", + "version": "0.28", + "sha256": "1dnbnpx1xbm8n7jgczh6fzwnns7biab8x742l8n8knh6zrksqn93", "depends": ["fst", "qtl2"] }, "qtl2ggplot": { "name": "qtl2ggplot", "version": "1.2.4", "sha256": "0ygadcm05fqkpa8j2h6rpcxpd287g2av7qnlwlqp1s86zfxshk96", - "depends": ["assertthat", "dplyr", "ggplot2", "ggrepel", "purrr", "qtl2", "RColorBrewer", "Rcpp", "rlang", "stringr", "tidyr"] + "depends": ["RColorBrewer", "Rcpp", "assertthat", "dplyr", "ggplot2", "ggrepel", "purrr", "qtl2", "rlang", "stringr", "tidyr"] }, "qtl2pattern": { "name": "qtl2pattern", @@ -98267,7 +99305,7 @@ "name": "qtl2pleio", "version": "1.4.3", "sha256": "0az71vgj1gv7rfz0hnc9rysh49ak2pnkvmih5mwmymr4an84c34k", - "depends": ["dplyr", "gemma2", "ggplot2", "magrittr", "MASS", "Rcpp", "RcppEigen", "rlang", "tibble"] + "depends": ["MASS", "Rcpp", "RcppEigen", "dplyr", "gemma2", "ggplot2", "magrittr", "rlang", "tibble"] }, "qtlDesign": { "name": "qtlDesign", @@ -98315,7 +99353,7 @@ "name": "qtlpoly", "version": "0.2.4", "sha256": "1lcfb19akddxljwvgsryjvhks0lqkdg7f1br1l2szd6qyd4mmdvs", - "depends": ["abind", "CompQuadForm", "doParallel", "foreach", "ggplot2", "gtools", "mappoly", "MASS", "Matrix", "mvtnorm", "nlme", "quadprog", "Rcpp", "RcppArmadillo", "RcppProgress", "RLRsim"] + "depends": ["CompQuadForm", "MASS", "Matrix", "RLRsim", "Rcpp", "RcppArmadillo", "RcppProgress", "abind", "doParallel", "foreach", "ggplot2", "gtools", "mappoly", "mvtnorm", "nlme", "quadprog"] }, "qtwAcademic": { "name": "qtwAcademic", @@ -98373,9 +99411,9 @@ }, "quadrupen": { "name": "quadrupen", - "version": "0.2-11", - "sha256": "1gmq6wqf4qaamz33qk1y7003lbbfg34rcr48a3jp7fd3aww0yp9c", - "depends": ["ggplot2", "Matrix", "Rcpp", "RcppArmadillo", "reshape2", "scales"] + "version": "0.2-12", + "sha256": "1h05cywpi83saaqg1m8zb49nxn9ablzb8152yd5rynp877cc636h", + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "ggplot2", "reshape2", "scales"] }, "quadtree": { "name": "quadtree", @@ -98405,13 +99443,13 @@ "name": "qualpalr", "version": "0.4.4", "sha256": "13mahl7v1sldy35ssmr9k0anhx569g1rv44kgvdw5w5s8dm28512", - "depends": ["assertthat", "randtoolbox", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "assertthat", "randtoolbox"] }, "qualtRics": { "name": "qualtRics", - "version": "3.2.0", - "sha256": "1sxpvi2cyasmq2ywg979l75qg8g9ahzzhxjxi8rnx5qmvzlj7br8", - "depends": ["cli", "dplyr", "fs", "glue", "httr", "jsonlite", "lifecycle", "lubridate", "purrr", "readr", "rlang", "sjlabelled", "stringr", "tibble", "tidyr", "withr"] + "version": "3.2.1", + "sha256": "1f63524a4xwdd2wgv4b8ny24xqc4kgcca7ql9c0v71l7yx6ia06r", + "depends": ["archive", "cli", "dplyr", "fs", "glue", "httr", "jsonlite", "lifecycle", "lubridate", "purrr", "readr", "rlang", "sjlabelled", "stringr", "tibble", "tidyr", "withr"] }, "qualvar": { "name": "qualvar", @@ -98427,39 +99465,39 @@ }, "quantdates": { "name": "quantdates", - "version": "1.0", - "sha256": "1hyds8rwr1yg740aq4w5fqjrwdf3dl4phf8mj8qsgbb7i0wbbf3q", + "version": "2.0.4", + "sha256": "1xlrbxslm4i3cwhzw3xa67vib43gpfclz18hkjbvas5ij68axvap", "depends": ["lubridate"] }, "quantdr": { "name": "quantdr", "version": "1.2.2", "sha256": "0w6jdd6i4wxbk4fp44rmy32mwq9ng63zwamq8zpa1hlfbm5qh4s2", - "depends": ["dr", "KernSmooth", "mvtnorm", "quantreg"] + "depends": ["KernSmooth", "dr", "mvtnorm", "quantreg"] }, "quanteda": { "name": "quanteda", "version": "4.0.2", "sha256": "1s046p3bnf36z2mqh5ijirq7jygqj5clal3r0l3f89gr0466a75j", - "depends": ["fastmatch", "jsonlite", "lifecycle", "magrittr", "Matrix", "Rcpp", "RcppArmadillo", "SnowballC", "stopwords", "stringi", "xml2", "yaml"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "SnowballC", "fastmatch", "jsonlite", "lifecycle", "magrittr", "stopwords", "stringi", "xml2", "yaml"] }, "quanteda_textmodels": { "name": "quanteda.textmodels", "version": "0.9.7", "sha256": "0whzy9hbybxmlzkckhlp6whbbg17vskx9bk40iy02j2z6fw6bqxg", - "depends": ["glmnet", "LiblineaR", "Matrix", "quanteda", "Rcpp", "RcppArmadillo", "RSpectra", "SparseM", "stringi"] + "depends": ["LiblineaR", "Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "SparseM", "glmnet", "quanteda", "stringi"] }, "quanteda_textplots": { "name": "quanteda.textplots", "version": "0.94.4", "sha256": "0adl3dahr51f2sqdr0fng99r87pq4mknlqmhg6nfjx617rni9w2a", - "depends": ["extrafont", "ggplot2", "ggrepel", "igraph", "Matrix", "network", "quanteda", "RColorBrewer", "Rcpp", "sna", "stringi"] + "depends": ["Matrix", "RColorBrewer", "Rcpp", "extrafont", "ggplot2", "ggrepel", "igraph", "network", "quanteda", "sna", "stringi"] }, "quanteda_textstats": { "name": "quanteda.textstats", "version": "0.97", "sha256": "0h8fyb8smyyhbfk677a2ldyl6b7sdjl0pzk5bbgz8qymw6yg1zdj", - "depends": ["Matrix", "nsyllable", "proxyC", "quanteda", "Rcpp", "RcppArmadillo", "stringi"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "nsyllable", "proxyC", "quanteda", "stringi"] }, "quantification": { "name": "quantification", @@ -98477,31 +99515,31 @@ "name": "quantilogram", "version": "2.2.1", "sha256": "0gvr93d6jjixcrislym0mna2l3plqhl8adaqiagdvxg4y0adfmf0", - "depends": ["np", "quantreg", "SparseM"] + "depends": ["SparseM", "np", "quantreg"] }, "quantities": { "name": "quantities", - "version": "0.2.1", - "sha256": "15z988jz1kza162qwfbiz90wjm3sc8kfkylwa73nkjifcd9l2ir5", - "depends": ["errors", "Rcpp", "units"] + "version": "0.2.2", + "sha256": "0rybq5q5airh01lp779hmqw448szx0i56sp5fv8aza2hmh6f7gxz", + "depends": ["Rcpp", "errors", "units"] }, "quantkriging": { "name": "quantkriging", "version": "0.1.0", "sha256": "0v6kckgzhgsn3158sc06xszdhmk8sfny10j1qyppxsl2hk89n8jf", - "depends": ["ggplot2", "hetGP", "Matrix", "reshape2"] + "depends": ["Matrix", "ggplot2", "hetGP", "reshape2"] }, "quantmod": { "name": "quantmod", "version": "0.4.26", "sha256": "165vp2ygry8ibcpxjbyfvfrjbv98syln12kkyzci2ygp84r5sv1r", - "depends": ["curl", "jsonlite", "TTR", "xts", "zoo"] + "depends": ["TTR", "curl", "jsonlite", "xts", "zoo"] }, "quantoptr": { "name": "quantoptr", "version": "0.1.3", "sha256": "0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3", - "depends": ["quantreg", "Rdpack", "rgenoud", "stringr"] + "depends": ["Rdpack", "quantreg", "rgenoud", "stringr"] }, "quantreg": { "name": "quantreg", @@ -98513,31 +99551,31 @@ "name": "quantreg.nonpar", "version": "1.0", "sha256": "1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k", - "depends": ["fda", "mnormt", "quantreg", "Rearrangement"] + "depends": ["Rearrangement", "fda", "mnormt", "quantreg"] }, "quantregForest": { "name": "quantregForest", "version": "1.3-7", "sha256": "0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz", - "depends": ["randomForest", "RColorBrewer"] + "depends": ["RColorBrewer", "randomForest"] }, "quantregGrowth": { "name": "quantregGrowth", "version": "1.7-1", "sha256": "07hj5kanas42kj70p03h77j5m9vnvsnsb02r31snai4smbaps4ad", - "depends": ["quantreg", "SparseM"] + "depends": ["SparseM", "quantreg"] }, "quantregRanger": { "name": "quantregRanger", "version": "1.0", "sha256": "1a9q2prr790bpw6s0y5ni5ppd3vqkjr0v4nqp6ywcj5n3sk69pvx", - "depends": ["ranger", "Rcpp"] + "depends": ["Rcpp", "ranger"] }, "quantspec": { "name": "quantspec", - "version": "1.2-3", - "sha256": "0ifwq2jmvxhpijz9yd9hffkff6ixcliaqkp9ispp9k1b8icwi8zn", - "depends": ["abind", "quantreg", "Rcpp", "snowfall", "zoo"] + "version": "1.2-4", + "sha256": "1azwxxn4831fdqfz36mb5bv5ji4das2wh0r6qakrycqj1zjilk6k", + "depends": ["Rcpp", "abind", "quantreg", "snowfall", "zoo"] }, "quarks": { "name": "quarks", @@ -98559,8 +99597,8 @@ }, "quarto": { "name": "quarto", - "version": "1.4", - "sha256": "092v5vbrqb1qbmzf0wv29lrkhcbk4nz8kz8cb27dmhx08ns7zk5c", + "version": "1.4.4", + "sha256": "18403v03hh57fm09csg6jmxh6biih7dgq9sakn0hg6x3kn8vnnaf", "depends": ["cli", "jsonlite", "later", "processx", "rlang", "rmarkdown", "rstudioapi", "yaml"] }, "quaxnat": { @@ -98585,7 +99623,7 @@ "name": "quest", "version": "0.2.0", "sha256": "0a3slzskacp0pj0whnnqysqiclf6fby5x81i4mjdvckidgdyjprf", - "depends": ["abind", "boot", "car", "checkmate", "lavaan", "lme4", "MBESS", "multilevel", "nlme", "plyr", "psych", "str2str"] + "depends": ["MBESS", "abind", "boot", "car", "checkmate", "lavaan", "lme4", "multilevel", "nlme", "plyr", "psych", "str2str"] }, "questionr": { "name": "questionr", @@ -98597,7 +99635,7 @@ "name": "queuecomputer", "version": "1.2.0", "sha256": "0qlcj4rqfkp8qanzwi1p2s7r89x5w6aa8zwkcl7rqapbd4nwayhc", - "depends": ["dplyr", "Rcpp", "RcppArmadillo", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "tidyr"] }, "queueing": { "name": "queueing", @@ -98615,7 +99653,7 @@ "name": "quickPWCR", "version": "1.0", "sha256": "1igxjrmli16lxf07xawkslb8gkas63sdpmxrl07vfwl8yq8n6wwl", - "depends": ["dplyr", "pbmcapply", "Rcpp"] + "depends": ["Rcpp", "dplyr", "pbmcapply"] }, "quickPlot": { "name": "quickPlot", @@ -98631,8 +99669,8 @@ }, "quickblock": { "name": "quickblock", - "version": "0.2.1", - "sha256": "1pl3cwb4byz3b4s08rahk20ckkwrl977qr4a7cw0pd09qm0qgcq3", + "version": "0.2.2", + "sha256": "0xlx6g73qxrijxmjzbw980abvk60rvkm847b5in1izwf5fiv7m0p", "depends": ["distances", "scclust"] }, "quickcheck": { @@ -98643,21 +99681,21 @@ }, "quickcode": { "name": "quickcode", - "version": "0.8", - "sha256": "04v95f8ppxqiyqi42z8lrgcygdfc9vb3zk30824jh83vwba9h2y8", - "depends": ["fitdistrplus", "Polychrome", "rstudioapi"] + "version": "0.9.1", + "sha256": "0q9pmnwxrhkf4x78wgfdz3ysahfg4yn51m2ljsk4nf4zvhgdi1yr", + "depends": ["Polychrome", "fitdistrplus", "rstudioapi"] }, "quickmatch": { "name": "quickmatch", - "version": "0.2.2", - "sha256": "0y1yss83q4mpdb5ipldg2080vrnc5725452zrs89gxnsykx1qv6j", + "version": "0.2.3", + "sha256": "1r369153zfxy7xzwzixigpz6ai6avmc5kvcqrf7nvr210xbs72r1", "depends": ["distances", "sandwich", "scclust"] }, "quickpsy": { "name": "quickpsy", "version": "0.1.5.1", "sha256": "0dfqlpghnw79idw3ir03cxx9n88sqs5p14jz7jgpkdwvjpw1y4q9", - "depends": ["DEoptim", "dplyr", "ggplot2", "MPDiR"] + "depends": ["DEoptim", "MPDiR", "dplyr", "ggplot2"] }, "quickregression": { "name": "quickregression", @@ -98669,7 +99707,7 @@ "name": "quid", "version": "0.0.1", "sha256": "10qfby1w3q3z0vwqk3nnxxlf62cr5v60ipagx0wb79vanl318pp0", - "depends": ["BayesFactor", "checkmate", "dplyr", "ellipsis", "ggplot2", "janitor", "magrittr", "Matrix", "MCMCpack", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["BayesFactor", "MCMCpack", "Matrix", "checkmate", "dplyr", "ellipsis", "ggplot2", "janitor", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] }, "quiddich": { "name": "quiddich", @@ -98735,7 +99773,7 @@ "name": "qwraps2", "version": "0.6.0", "sha256": "06i3h6ydjfvy7qrhzznsb272r843fgvykfsgaviq83gi8k5c5i00", - "depends": ["ggplot2", "knitr", "Rcpp", "RcppArmadillo", "xfun"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "knitr", "xfun"] }, "r_blip": { "name": "r.blip", @@ -98763,8 +99801,8 @@ }, "r2country": { "name": "r2country", - "version": "2.0.2.3.1", - "sha256": "02xz9an51qd3b92s8fask5rgmv227di21yv6xzgkz9ccabp12lq7", + "version": "2.0.2.4.0", + "sha256": "1a98zq4xyni0lx7x2vhnwill9d5c0f17l49ashpj2mh81y76c1s7", "depends": ["quickcode"] }, "r2d2": { @@ -98793,14 +99831,14 @@ }, "r2dii_data": { "name": "r2dii.data", - "version": "0.5.0", - "sha256": "1f8gvian0l3wsw9bwyxzlwv0qpw4mz1qq4747hjm8d4jr37hi0r6", + "version": "0.6.0", + "sha256": "160mzbb9j2hvhf60k236nli899rz2ghfnwc7wzb18bfffhsj1ysx", "depends": ["lifecycle"] }, "r2dii_match": { "name": "r2dii.match", - "version": "0.2.0", - "sha256": "12h7bn4dha4fiplwm7az4fyaa8cdkn3b4j3ndmwr6c2r11gfwy0n", + "version": "0.2.1", + "sha256": "1f2r5f0p851yhjb81gam7spai46bbrrj2y1g89p0s1kjcpnz6ixz", "depends": ["data_table", "dplyr", "glue", "lifecycle", "magrittr", "purrr", "r2dii_data", "rlang", "stringdist", "stringi", "tibble", "tidyr", "tidyselect"] }, "r2dii_plot": { @@ -98819,7 +99857,7 @@ "name": "r2glmm", "version": "0.1.2", "sha256": "0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy", - "depends": ["afex", "data_table", "dplyr", "ggplot2", "gridExtra", "lmerTest", "MASS", "Matrix", "mgcv", "pbkrtest"] + "depends": ["MASS", "Matrix", "afex", "data_table", "dplyr", "ggplot2", "gridExtra", "lmerTest", "mgcv", "pbkrtest"] }, "r2mlm": { "name": "r2mlm", @@ -98829,8 +99867,8 @@ }, "r2pmml": { "name": "r2pmml", - "version": "0.27.1", - "sha256": "1liixrwrr23k96rkl3ijfcvxmfh43ffj8y7qr2zr50c1ampipnkr", + "version": "0.28.0", + "sha256": "110hr4cj4xlm050hmhag0v32jw6g5ka2ws0jibjw58zm4fg3c0x0", "depends": [] }, "r2pptx": { @@ -98853,9 +99891,9 @@ }, "r2resize": { "name": "r2resize", - "version": "1.9", - "sha256": "19dsc3ljvgi8f4na71gbkz7fgq63y7vvwknzbwfrgz2ygpd0vyqg", - "depends": ["DT", "htmltools", "nextGenShinyApps", "quickcode", "shiny"] + "version": "1.9.1", + "sha256": "1s5mkgrq66kbwh8vm2dnbhn801b44ym3vr98nvv9bn81cbn4ifaf", + "depends": ["DT", "htmltools", "quickcode", "shiny"] }, "r2rtf": { "name": "r2rtf", @@ -98871,8 +99909,8 @@ }, "r2social": { "name": "r2social", - "version": "1.2", - "sha256": "0lwdjbb99zab94nkbdw6ilkz3rvgv6lkrgcvb1z24midiykwfmfs", + "version": "1.2.1", + "sha256": "19q4sndbz5hxvkqy7w9s33l03jv26n4sp6vmcpb08ifxrxjxjsca", "depends": ["htmltools", "quickcode", "shiny"] }, "r2spss": { @@ -98889,8 +99927,8 @@ }, "r2sundials": { "name": "r2sundials", - "version": "6.5.0-4", - "sha256": "03ibv93yh7idjrrrkjdbpsi4pnb3rjd48qdlqa89w0wn99lf5qqd", + "version": "6.5.0-5", + "sha256": "0zbaqfml3f778zip3aggy17l1wzn26z41bzx9mk0wbgzx2mi0dwf", "depends": ["Rcpp", "RcppArmadillo", "rmumps"] }, "r2symbols": { @@ -98899,6 +99937,12 @@ "sha256": "18q4jlc6agbpryv34bjjx49srq57m3731g13rcfdidk32kfgj7l7", "depends": ["htmltools", "jsonlite"] }, + "r311": { + "name": "r311", + "version": "0.3.7", + "sha256": "1gnyccin2f6wg7g2knnzsckkf3wrfb6xrkw8cg2z9db61nxacdrq", + "depends": ["curl", "jsonlite"] + }, "r3PG": { "name": "r3PG", "version": "0.1.6", @@ -98919,8 +99963,8 @@ }, "r4ds_tutorials": { "name": "r4ds.tutorials", - "version": "0.2.0", - "sha256": "0cb8fp65ys1cmxx9zrna8cnj72yind05l70b7gbgqgaaaahd7rjp", + "version": "0.3.0", + "sha256": "05wy99n3i43wgzpqd4gsj1skz1jgp2q4q8s99q0ia453xig49shm", "depends": ["tutorial_helpers"] }, "r4googleads": { @@ -98951,7 +99995,7 @@ "name": "r6extended", "version": "0.1.2", "sha256": "1kq1j5rx57053mslj8jx1s0wjvhis7x3y264zw44q4k2x48q9wxs", - "depends": ["digest", "hellno", "magrittr", "R6"] + "depends": ["R6", "digest", "hellno", "magrittr"] }, "r6methods": { "name": "r6methods", @@ -98963,7 +100007,7 @@ "name": "rADA", "version": "1.1.9", "sha256": "0p47nqm8mki03pq5gzc2r5vx4vixs6hpf7am1fvadgi2bn2jrcl2", - "depends": ["car", "dplyr", "e1071", "forestplot", "ggplot2", "gridExtra", "Hmisc", "knitr", "lme4", "lmerTest", "matrixStats", "openxlsx", "reshape2", "stringr", "tidyr"] + "depends": ["Hmisc", "car", "dplyr", "e1071", "forestplot", "ggplot2", "gridExtra", "knitr", "lme4", "lmerTest", "matrixStats", "openxlsx", "reshape2", "stringr", "tidyr"] }, "rARPACK": { "name": "rARPACK", @@ -99017,7 +100061,7 @@ "name": "rBayesianOptimization", "version": "1.2.1", "sha256": "071317r3xbcvkckzvgiac786zi2cy7zbrknscj3r521kaki1rfaf", - "depends": ["data_table", "foreach", "GPfit", "magrittr"] + "depends": ["GPfit", "data_table", "foreach", "magrittr"] }, "rBeta2009": { "name": "rBeta2009", @@ -99035,7 +100079,7 @@ "name": "rCBA", "version": "0.4.3", "sha256": "10rc08gwsf15f4lci8bbgwpwj8n7k1m23hxk633v68g9amla5nvx", - "depends": ["arules", "R_utils", "rJava", "TunePareto"] + "depends": ["R_utils", "TunePareto", "arules", "rJava"] }, "rCMA": { "name": "rCMA", @@ -99047,7 +100091,7 @@ "name": "rCNV", "version": "1.2.0", "sha256": "07c47qz5ma0g9nr0qdsmwhiw1fq3a7r40siavgkhd2in9rb5fzrw", - "depends": ["colorspace", "data_table", "qgraph", "R_utils", "stringr"] + "depends": ["R_utils", "colorspace", "data_table", "qgraph", "stringr"] }, "rChoiceDialogs": { "name": "rChoiceDialogs", @@ -99067,17 +100111,11 @@ "sha256": "0qfmr13bk0gklwj4cv5v3bvwpz831d7yhv7lr42v2j1f0n4db3v4", "depends": ["maxLik", "slam", "truncnorm", "truncreg"] }, - "rDNAse": { - "name": "rDNAse", - "version": "1.1-1", - "sha256": "0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk", - "depends": [] - }, "rDataPipeline": { "name": "rDataPipeline", "version": "0.54.1", "sha256": "0i0vb7gsjshh1wn0lksdma51xdyn6qw54j02cb0xmzcg896gl2p9", - "depends": ["assertthat", "cli", "configr", "dplyr", "git2r", "httr", "jsonlite", "openssl", "R6", "rhdf5", "semver", "usethis", "yaml"] + "depends": ["R6", "assertthat", "cli", "configr", "dplyr", "git2r", "httr", "jsonlite", "openssl", "rhdf5", "semver", "usethis", "yaml"] }, "rDecode": { "name": "rDecode", @@ -99095,13 +100133,13 @@ "name": "rEMM", "version": "1.2.1", "sha256": "13pxw0np8pn895wcb3rxvc0s7ayr968567fx4p2z8gnz2hp7g62j", - "depends": ["cluster", "clusterGeneration", "igraph", "MASS", "proxy", "stream"] + "depends": ["MASS", "cluster", "clusterGeneration", "igraph", "proxy", "stream"] }, "rENA": { "name": "rENA", "version": "0.2.7", "sha256": "136rlzm4pkip0j1zhn4ycsfmq4hjwvhp4d5359wsjkym6lr9n846", - "depends": ["concatenate", "data_table", "doParallel", "foreach", "magrittr", "plotly", "R6", "Rcpp", "RcppArmadillo", "scales"] + "depends": ["R6", "Rcpp", "RcppArmadillo", "concatenate", "data_table", "doParallel", "foreach", "magrittr", "plotly", "scales"] }, "rFSA": { "name": "rFSA", @@ -99143,7 +100181,7 @@ "name": "rIsing", "version": "0.1.0", "sha256": "1208lwfk9j8gghj8xf6i8v6s18h89ydqsd4jq3r88n403yzbzzck", - "depends": ["data_table", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "data_table"] }, "rJava": { "name": "rJava", @@ -99155,13 +100193,13 @@ "name": "rKIN", "version": "1.0.2", "sha256": "0dp8m7x5a9glz7yvbv207j3l0226xjxmgf0k2x6rv7zwg9v6y5qk", - "depends": ["dplyr", "ggplot2", "ks", "MASS", "randomcoloR", "RColorBrewer", "sf", "shades"] + "depends": ["MASS", "RColorBrewer", "dplyr", "ggplot2", "ks", "randomcoloR", "sf", "shades"] }, "rKOMICS": { "name": "rKOMICS", "version": "1.3", "sha256": "0v04f9kjdwxdggk3cv29hrnbykz3yq523gxh1kh7vls9xpm6c5wr", - "depends": ["ape", "circlize", "ComplexHeatmap", "dplyr", "factoextra", "FactoMineR", "ggplot2", "ggpubr", "magrittr", "reshape2", "stringr"] + "depends": ["ComplexHeatmap", "FactoMineR", "ape", "circlize", "dplyr", "factoextra", "ggplot2", "ggpubr", "magrittr", "reshape2", "stringr"] }, "rKenyaForex": { "name": "rKenyaForex", @@ -99209,7 +100247,7 @@ "name": "rMIDAS", "version": "1.0.0", "sha256": "18z9fkbvyz290qcv0nmsrk8hchr5niwmhaj7gx3gh7m1ldw53asw", - "depends": ["data_table", "mltools", "rappdirs", "Rdpack", "reticulate"] + "depends": ["Rdpack", "data_table", "mltools", "rappdirs", "reticulate"] }, "rMOST": { "name": "rMOST", @@ -99227,31 +100265,31 @@ "name": "rMVP", "version": "1.0.8", "sha256": "1k7n8hmwybbp41iqgckkvzqa75kl0ikl5mpq2c5ynmlfkr244by8", - "depends": ["BH", "bigmemory", "MASS", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress"] + "depends": ["BH", "MASS", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress", "bigmemory"] }, "rMultiNet": { "name": "rMultiNet", "version": "0.1", "sha256": "0r4zdh91f87xzjr85i8iafghpi60hlmjp763nm025n4h33qvvrfl", - "depends": ["dbscan", "geigen", "glmnet", "Matrix", "plotly", "rTensor"] + "depends": ["Matrix", "dbscan", "geigen", "glmnet", "plotly", "rTensor"] }, "rNOMADS": { "name": "rNOMADS", "version": "2.5.3", "sha256": "196iwdwin73kva9jrjjzx9kgl91h7a3d04p9i3r1rzp3v9xj4gpp", - "depends": ["fields", "GEOmap", "httr", "MBA", "rvest", "stringr", "uuid", "XML"] + "depends": ["GEOmap", "MBA", "XML", "fields", "httr", "rvest", "stringr", "uuid"] }, "rNeighborGWAS": { "name": "rNeighborGWAS", "version": "1.2.4", "sha256": "1j2rafli0ns34ms5s8zjxwyvlxhl88r5krw0qqzc3igd9sc0mjvn", - "depends": ["gaston", "Matrix", "RcppParallel"] + "depends": ["Matrix", "RcppParallel", "gaston"] }, "rNeighborQTL": { "name": "rNeighborQTL", "version": "1.1.2", "sha256": "1balbky8jyvyn2v56dvx7b80gpys40pfslqrsv25sywmp0cqy68p", - "depends": ["gaston", "Matrix", "qtl"] + "depends": ["Matrix", "gaston", "qtl"] }, "rODE": { "name": "rODE", @@ -99275,7 +100313,7 @@ "name": "rPBK", "version": "0.2.4", "sha256": "0sbnxhbv7gi1y1in96cw875sgbr54w5i43al2ivwj6kkdds0i91i", - "depends": ["BH", "ggplot2", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "rstan", "rstantools"] }, "rPDBapi": { "name": "rPDBapi", @@ -99293,7 +100331,7 @@ "name": "rPanglaoDB", "version": "0.2.1", "sha256": "1ykzih3idgp2yhbw4039hhhzv0nmrmn3wx2c4dxmgp5qzhrg42nf", - "depends": ["Matrix", "pbapply", "Seurat", "XML", "xml2"] + "depends": ["Matrix", "Seurat", "XML", "pbapply", "xml2"] }, "rPowerSampleSize": { "name": "rPowerSampleSize", @@ -99311,7 +100349,7 @@ "name": "rPref", "version": "1.4.0", "sha256": "1ylb4mc5fjvmi8wly9w4v25l7sc8i9hk28lfidgzaavp5447af2w", - "depends": ["dplyr", "igraph", "lazyeval", "Rcpp", "RcppParallel"] + "depends": ["Rcpp", "RcppParallel", "dplyr", "igraph", "lazyeval"] }, "rQCC": { "name": "rQCC", @@ -99329,7 +100367,7 @@ "name": "rRAP", "version": "1.1", "sha256": "1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb", - "depends": ["lars", "lassoshooting", "MASS"] + "depends": ["MASS", "lars", "lassoshooting"] }, "rSAFE": { "name": "rSAFE", @@ -99365,7 +100403,7 @@ "name": "rSHAPE", "version": "0.3.2", "sha256": "0z6dizsxlkmaymbd24b1m1i8kmndcf21nxxnyfzq6gvdii7bal4h", - "depends": ["abind", "DBI", "doParallel", "evd", "foreach", "RSQLite", "sn", "VGAM"] + "depends": ["DBI", "RSQLite", "VGAM", "abind", "doParallel", "evd", "foreach", "sn"] }, "rSPARCS": { "name": "rSPARCS", @@ -99377,25 +100415,25 @@ "name": "rSPDE", "version": "2.3.3", "sha256": "1l03rd8knh9mws1fbagspvpyli1sdgijslc0axwwbfjqxcpqg6yq", - "depends": ["broom", "fmesher", "lifecycle", "Matrix"] + "depends": ["Matrix", "broom", "fmesher", "lifecycle"] }, "rSRD": { "name": "rSRD", "version": "0.1.7", "sha256": "1srvv49xxkq2nx7fvbn3d2hr4v6ypkxgz6ms1l89zgd0ypdgmypa", - "depends": ["dplyr", "ggplot2", "ggrepel", "gplots", "janitor", "Rcpp", "rlang", "stringr", "tibble"] + "depends": ["Rcpp", "dplyr", "ggplot2", "ggrepel", "gplots", "janitor", "rlang", "stringr", "tibble"] }, "rSpectral": { "name": "rSpectral", "version": "1.0.0.10", "sha256": "12fgyjlk4a6gm2ccjw4mh47ccln2i7iklqammmk8y20i3hd3mh6x", - "depends": ["graph", "igraph", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "graph", "igraph"] }, "rStrava": { "name": "rStrava", "version": "1.3.1", "sha256": "1kn2x208iyz235zf64r2wz4jqgas5srzzjf6gpckqh8dkc6s234f", - "depends": ["dplyr", "geosphere", "ggplot2", "ggspatial", "googleway", "httr", "magrittr", "maptiles", "purrr", "RCurl", "rvest", "tibble", "tidyr", "tidyterra", "XML", "xml2"] + "depends": ["RCurl", "XML", "dplyr", "geosphere", "ggplot2", "ggspatial", "googleway", "httr", "magrittr", "maptiles", "purrr", "rvest", "tibble", "tidyr", "tidyterra", "xml2"] }, "rTCRBCRr": { "name": "rTCRBCRr", @@ -99405,8 +100443,8 @@ }, "rTG": { "name": "rTG", - "version": "1.0.2", - "sha256": "1zg8ly42z7dy2b7iaggfc1wgf7hw2fsaj0ixbf5kw0gqmf7gxzss", + "version": "1.0.3", + "sha256": "00kdibqi54f6f3zjmmmjyrxh3kg91qvzi5pzwapx86fij8x188jb", "depends": ["brnn", "dplyr", "ggplot2", "knitr", "magrittr", "mgcv", "minpack_lm"] }, "rTLsDeep": { @@ -99449,7 +100487,7 @@ "name": "rTensor2", "version": "2.0.0", "sha256": "0bangmph2hmk50gx21dkky0b22aimh168bndbp7a0s5vg2m49ijz", - "depends": ["gsignal", "Matrix", "matrixcalc", "png", "raster", "rTensor", "wavethresh"] + "depends": ["Matrix", "gsignal", "matrixcalc", "png", "rTensor", "raster", "wavethresh"] }, "rTephra": { "name": "rTephra", @@ -99467,7 +100505,7 @@ "name": "rTwig", "version": "1.0.2", "sha256": "1d3h4ym2vrlp04arjxg4s8zd9d5kyxf6ibvv169calsvkd4rfcn7", - "depends": ["cobs", "colourvalues", "data_table", "DescTools", "doFuture", "foreach", "future", "igraph", "kit", "Matrix", "Morpho", "progressr", "purrr", "R_matlab", "randomcoloR", "Rdpack", "rgl", "rmatio", "tidytable"] + "depends": ["DescTools", "Matrix", "Morpho", "R_matlab", "Rdpack", "cobs", "colourvalues", "data_table", "doFuture", "foreach", "future", "igraph", "kit", "progressr", "purrr", "randomcoloR", "rgl", "rmatio", "tidytable"] }, "rUM": { "name": "rUM", @@ -99479,19 +100517,19 @@ "name": "rWCVP", "version": "1.2.4", "sha256": "1qs3h66m2nw44iry5jlczwd00s79669vrk8k1crdh7vgvhnf5r4y", - "depends": ["cli", "dplyr", "ggplot2", "gt", "htmltools", "magrittr", "phonics", "purrr", "RecordLinkage", "rlang", "rmarkdown", "sf", "stringr", "tibble", "tidyr", "withr"] + "depends": ["RecordLinkage", "cli", "dplyr", "ggplot2", "gt", "htmltools", "magrittr", "phonics", "purrr", "rlang", "rmarkdown", "sf", "stringr", "tibble", "tidyr", "withr"] }, "rWishart": { "name": "rWishart", "version": "0.1.2", "sha256": "0wzijc454mrvmggb7a5jqwjbmk0kzr4bmy0iwniz5cn343pr1rri", - "depends": ["lazyeval", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "lazyeval"] }, "rYoutheria": { "name": "rYoutheria", "version": "1.0.3", "sha256": "07l7xn0csy95hvviyn6p0h2ybh36cqrm5lz60dphwsq3ahf7sw68", - "depends": ["plyr", "RCurl", "reshape2", "RJSONIO"] + "depends": ["RCurl", "RJSONIO", "plyr", "reshape2"] }, "ra4bayesmeta": { "name": "ra4bayesmeta", @@ -99507,15 +100545,15 @@ }, "racademyocean": { "name": "racademyocean", - "version": "0.3.2", - "sha256": "0p16xwlm67rvbla6mnky6yv5aa2r61v645jlwhg0zn2dyc8xpajk", + "version": "0.3.3", + "sha256": "14dj4vizs8yvmmf5ny5d0cz7g42ncrk2aibb139vkd69h2a3xaax", "depends": ["cli", "dplyr", "httr2", "pbapply", "purrr", "rappdirs", "retry", "rlang", "stringr", "tidyr", "withr"] }, "raceland": { "name": "raceland", "version": "1.2.1", "sha256": "0kkl12amzaff6y4bj1c62p1clkvxlfm8d20i6d09x35hkkxblnjk", - "depends": ["comat", "plotwidgets", "Rcpp", "RcppArmadillo", "sf", "terra"] + "depends": ["Rcpp", "RcppArmadillo", "comat", "plotwidgets", "sf", "terra"] }, "racir": { "name": "racir", @@ -99563,7 +100601,7 @@ "name": "radiant.data", "version": "1.6.6", "sha256": "09cbd21bvj4a3n5r1ch638y5dgi7xmmg1y62i6ixcjhbr8wypjmn", - "depends": ["arrow", "base64enc", "broom", "bslib", "car", "curl", "dplyr", "DT", "ggplot2", "glue", "jsonlite", "knitr", "lubridate", "magrittr", "markdown", "MASS", "patchwork", "plotly", "png", "psych", "r_import", "randomizr", "readr", "readxl", "rlang", "rmarkdown", "rstudioapi", "scales", "shiny", "shinyAce", "shinyFiles", "stringi", "tibble", "tidyr", "writexl"] + "depends": ["DT", "MASS", "arrow", "base64enc", "broom", "bslib", "car", "curl", "dplyr", "ggplot2", "glue", "jsonlite", "knitr", "lubridate", "magrittr", "markdown", "patchwork", "plotly", "png", "psych", "r_import", "randomizr", "readr", "readxl", "rlang", "rmarkdown", "rstudioapi", "scales", "shiny", "shinyAce", "shinyFiles", "stringi", "tibble", "tidyr", "writexl"] }, "radiant_design": { "name": "radiant.design", @@ -99575,13 +100613,13 @@ "name": "radiant.model", "version": "1.6.6", "sha256": "0y1qvngicw279m9065pr6kj2yp80iz88bf4jqj1dawjvcbrl27wv", - "depends": ["broom", "car", "data_tree", "DiagrammeR", "dplyr", "e1071", "ggplot2", "ggrepel", "lubridate", "magrittr", "NeuralNetTools", "nnet", "patchwork", "pdp", "psych", "r_import", "radiant_basics", "radiant_data", "ranger", "rlang", "rpart", "sandwich", "scales", "shiny", "stringi", "stringr", "tidyr", "tidyselect", "vip", "xgboost", "yaml"] + "depends": ["DiagrammeR", "NeuralNetTools", "broom", "car", "data_tree", "dplyr", "e1071", "ggplot2", "ggrepel", "lubridate", "magrittr", "nnet", "patchwork", "pdp", "psych", "r_import", "radiant_basics", "radiant_data", "ranger", "rlang", "rpart", "sandwich", "scales", "shiny", "stringi", "stringr", "tidyr", "tidyselect", "vip", "xgboost", "yaml"] }, "radiant_multivariate": { "name": "radiant.multivariate", "version": "1.6.6", "sha256": "02nviya2i45xpgnjsldpm5hvy30nh5z1nb6yk5wrps3hl044lqgi", - "depends": ["car", "clustMixType", "dplyr", "ggplot2", "ggrepel", "gower", "GPArotation", "lubridate", "magrittr", "MASS", "patchwork", "polycor", "psych", "r_import", "radiant_data", "radiant_model", "rlang", "scales", "shiny"] + "depends": ["GPArotation", "MASS", "car", "clustMixType", "dplyr", "ggplot2", "ggrepel", "gower", "lubridate", "magrittr", "patchwork", "polycor", "psych", "r_import", "radiant_data", "radiant_model", "rlang", "scales", "shiny"] }, "radir": { "name": "radir", @@ -99605,7 +100643,7 @@ "name": "radsafer", "version": "2.3.0", "sha256": "0zw0dn8pi1yn786fcmm414dap77wdni43dma2pyjbxb15zagpmli", - "depends": ["dplyr", "ggplot2", "ggthemes", "lifecycle", "magrittr", "RadData", "readr", "rlang", "scatterplot3d", "stringr"] + "depends": ["RadData", "dplyr", "ggplot2", "ggthemes", "lifecycle", "magrittr", "readr", "rlang", "scatterplot3d", "stringr"] }, "rafalib": { "name": "rafalib", @@ -99623,7 +100661,7 @@ "name": "rags2ridges", "version": "2.2.7", "sha256": "09dp04y8wl7cws5y94k9j2rlrmm2ci1lk8y77cb17lxr0i1yv6gb", - "depends": ["expm", "fdrtool", "ggplot2", "graph", "gRbase", "Hmisc", "igraph", "RBGL", "Rcpp", "RcppArmadillo", "reshape", "RSpectra", "sfsmisc", "snowfall"] + "depends": ["Hmisc", "RBGL", "RSpectra", "Rcpp", "RcppArmadillo", "expm", "fdrtool", "gRbase", "ggplot2", "graph", "igraph", "reshape", "sfsmisc", "snowfall"] }, "ragtop": { "name": "ragtop", @@ -99641,7 +100679,7 @@ "name": "rainbow", "version": "3.8", "sha256": "0gc25napmcgg1qr17z4zixzxcdiv9midi1x5fin4pzkhicl5d97c", - "depends": ["cluster", "colorspace", "hdrcde", "ks", "MASS", "pcaPP"] + "depends": ["MASS", "cluster", "colorspace", "hdrcde", "ks", "pcaPP"] }, "raincin": { "name": "raincin", @@ -99653,7 +100691,7 @@ "name": "rainette", "version": "0.3.1.1", "sha256": "1x6929rsav80x7ihy7572pqbvdf2hhnb0wp28mvyfvzj9ivqcx8w", - "depends": ["dendextend", "dplyr", "ggplot2", "ggwordcloud", "gridExtra", "highr", "miniUI", "progressr", "purrr", "quanteda", "quanteda_textstats", "Rcpp", "rlang", "RSpectra", "shiny", "stringr", "tidyr"] + "depends": ["RSpectra", "Rcpp", "dendextend", "dplyr", "ggplot2", "ggwordcloud", "gridExtra", "highr", "miniUI", "progressr", "purrr", "quanteda", "quanteda_textstats", "rlang", "shiny", "stringr", "tidyr"] }, "rainfarmr": { "name": "rainfarmr", @@ -99713,7 +100751,7 @@ "name": "ramps", "version": "0.6.18", "sha256": "198m5616n6z71a33jkaw22i7y8324vbnwgzblsicdl4wdrdd0h78", - "depends": ["coda", "fields", "maps", "Matrix", "nlme"] + "depends": ["Matrix", "coda", "fields", "maps", "nlme"] }, "ramsvm": { "name": "ramsvm", @@ -99743,7 +100781,7 @@ "name": "randnet", "version": "0.7", "sha256": "1zb2arx63avjlqjpbf37cvix080khkihh6bb0g1h2alv4lbaaaak", - "depends": ["AUC", "data_table", "entropy", "irlba", "Matrix", "mgcv", "nnls", "poweRlaw", "pracma", "RSpectra", "sparseFLMM"] + "depends": ["AUC", "Matrix", "RSpectra", "data_table", "entropy", "irlba", "mgcv", "nnls", "poweRlaw", "pracma", "sparseFLMM"] }, "rando": { "name": "rando", @@ -99767,7 +100805,7 @@ "name": "random.polychor.pa", "version": "1.1.4-5", "sha256": "1a8mnggdmyklxzqid81a88sx6v5jvhfnx5khvy21idsd8pp7pav2", - "depends": ["boot", "MASS", "mvtnorm", "nFactors", "psych", "sfsmisc"] + "depends": ["MASS", "boot", "mvtnorm", "nFactors", "psych", "sfsmisc"] }, "randomForest": { "name": "randomForest", @@ -99779,13 +100817,13 @@ "name": "randomForestExplainer", "version": "0.10.1", "sha256": "1ny8c3vn2zvdx12avwvlm4lp648jigkrkcvnhf5qmj8rh0w069v0", - "depends": ["data_table", "dplyr", "DT", "GGally", "ggplot2", "ggrepel", "randomForest", "ranger", "reshape2", "rmarkdown"] + "depends": ["DT", "GGally", "data_table", "dplyr", "ggplot2", "ggrepel", "randomForest", "ranger", "reshape2", "rmarkdown"] }, "randomForestSRC": { "name": "randomForestSRC", - "version": "3.2.3", - "sha256": "0vsgdpacqfhwd958vn3wmf8lnh3wb74bgq37qzb3c02fbwilz8lc", - "depends": ["data_tree", "DiagrammeR"] + "version": "3.3.1", + "sha256": "0fm8lfmspq796iqpsywnh7c5h2mllwxpihaas9bx1mx366kfxly5", + "depends": ["DiagrammeR", "data_tree"] }, "randomForestVIP": { "name": "randomForestVIP", @@ -99797,13 +100835,13 @@ "name": "randomGLM", "version": "1.10-1", "sha256": "0557dpca39nj1451l28x4xxfr92cf48gy7crlfhnv4k91kglwcnz", - "depends": ["doParallel", "foreach", "geometry", "Hmisc", "MASS", "matrixStats", "survival"] + "depends": ["Hmisc", "MASS", "doParallel", "foreach", "geometry", "matrixStats", "survival"] }, "randomLCA": { "name": "randomLCA", "version": "1.1-3", "sha256": "1hjkglqdr9czjr91iwshcdb0acrlk461x896rca4bzc9jv8in9cy", - "depends": ["boot", "doParallel", "doRNG", "fastGHQuad", "foreach", "lattice", "Matrix", "Rfast"] + "depends": ["Matrix", "Rfast", "boot", "doParallel", "doRNG", "fastGHQuad", "foreach", "lattice"] }, "randomMachines": { "name": "randomMachines", @@ -99821,13 +100859,13 @@ "name": "randomUniformForest", "version": "1.1.6", "sha256": "1qr7c0pkqn2a9knpbc2ch6chwwrvfw1sr5949mkgml36xyv1syv7", - "depends": ["cluster", "doParallel", "foreach", "ggplot2", "iterators", "MASS", "pROC", "Rcpp"] + "depends": ["MASS", "Rcpp", "cluster", "doParallel", "foreach", "ggplot2", "iterators", "pROC"] }, "randomcoloR": { "name": "randomcoloR", "version": "1.1.0.1", "sha256": "0rqh1zrdza12qq7475f77yvryhh4hj0pg25lb8ywrcljgaj53bnb", - "depends": ["cluster", "colorspace", "Rtsne", "scales", "stringr", "V8"] + "depends": ["Rtsne", "V8", "cluster", "colorspace", "scales", "stringr"] }, "randomizationInference": { "name": "randomizationInference", @@ -99845,7 +100883,7 @@ "name": "randomizeR", "version": "3.0.2", "sha256": "00w4h8xamf6wix67g921j0xqma5y6zmzd23vr8k2qa48an9bnkfm", - "depends": ["coin", "dplyr", "ggplot2", "gsDesign", "insight", "magrittr", "mstate", "mvtnorm", "plotrix", "purrr", "PwrGSD", "reshape2", "rlang", "survival"] + "depends": ["PwrGSD", "coin", "dplyr", "ggplot2", "gsDesign", "insight", "magrittr", "mstate", "mvtnorm", "plotrix", "purrr", "reshape2", "rlang", "survival"] }, "randomizr": { "name": "randomizr", @@ -99881,13 +100919,13 @@ "name": "rangeBuilder", "version": "2.1", "sha256": "1r82rmmfwbfl2lxcsnl9xwyr2932jv43cjlvlihi5172irpfgvpw", - "depends": ["alphahull", "pbapply", "Rcpp", "rnaturalearth", "sf", "stringi", "terra", "units"] + "depends": ["Rcpp", "alphahull", "pbapply", "rnaturalearth", "sf", "stringi", "terra", "units"] }, "rangeMapper": { "name": "rangeMapper", "version": "2.0.3", "sha256": "1wasvd3k2c6crl2q27d9q88x21pv66b6h9x3msfdcw0k0h719dzc", - "depends": ["data_table", "DBI", "exactextractr", "future", "future_apply", "glue", "magrittr", "progressr", "raster", "RSQLite", "sf"] + "depends": ["DBI", "RSQLite", "data_table", "exactextractr", "future", "future_apply", "glue", "magrittr", "progressr", "raster", "sf"] }, "rangeModelMetadata": { "name": "rangeModelMetadata", @@ -99901,6 +100939,12 @@ "sha256": "12c52gqqwaaid5b062gad18ir1vala1z3a0z5j4af1xqzlxgk583", "depends": ["Matrix", "Rcpp", "RcppEigen"] }, + "rank": { + "name": "rank", + "version": "0.1.0", + "sha256": "1pbi2s7361v6jzv9574dhcvdryachrw8s25vk2ca5jjvp9yrj2li", + "depends": [] + }, "rankCorr": { "name": "rankCorr", "version": "1.0.1", @@ -99911,7 +100955,7 @@ "name": "rankFD", "version": "0.1.1", "sha256": "0p8kkscjnfssz58gp2kvpvw206vhqi6m1rknzs35l5ajck3gqzrm", - "depends": ["coin", "lattice", "MASS", "multcomp", "mvtnorm"] + "depends": ["MASS", "coin", "lattice", "multcomp", "mvtnorm"] }, "rankICC": { "name": "rankICC", @@ -99923,13 +100967,13 @@ "name": "rankdifferencetest", "version": "2021-11-25", "sha256": "11isc6fjaicyibnbc315036wp7m670ja6kg4xq5s2x72k076v55f", - "depends": ["coin", "modeltools", "Rdpack"] + "depends": ["Rdpack", "coin", "modeltools"] }, "rankdist": { "name": "rankdist", "version": "1.1.4", "sha256": "1xqrkss8d5vv3blqpvrvdczsygphbx259hy9j7w9b2ahssw8cjr5", - "depends": ["hash", "optimx", "permute", "Rcpp"] + "depends": ["Rcpp", "hash", "optimx", "permute"] }, "rankhazard": { "name": "rankhazard", @@ -99959,7 +101003,7 @@ "name": "ranktreeEnsemble", "version": "0.23", "sha256": "09nax4h3jajbkbjkxwd8zd075lkhgcfhh42c2zqwwn8bkdyk03gr", - "depends": ["data_tree", "gbm", "randomForestSRC", "Rcpp"] + "depends": ["Rcpp", "data_tree", "gbm", "randomForestSRC"] }, "rapiclient": { "name": "rapiclient", @@ -99991,6 +101035,12 @@ "sha256": "1dhjsv22rdsv668d8dzdd6pm5xy549iiycv6isjmc5cwj3dp5fyz", "depends": ["openNLPdata", "rJava", "slowraker"] }, + "rapidsplithalf": { + "name": "rapidsplithalf", + "version": "0.3", + "sha256": "1ac7hpvi26gjzwxf6xma0307222aiap9029kpv8w9abpyz7v34jw", + "depends": ["Rcpp", "doParallel", "foreach"] + }, "rapidxmlr": { "name": "rapidxmlr", "version": "0.1.0", @@ -100025,13 +101075,13 @@ "name": "rapsimng", "version": "0.4.4", "sha256": "0nlvagjilzjbnpy7h7k6kc1jlg589g74dak8f5pksin3kch1bbb0", - "depends": ["DBI", "dplyr", "jsonlite", "magrittr", "rlang", "RSQLite", "tibble"] + "depends": ["DBI", "RSQLite", "dplyr", "jsonlite", "magrittr", "rlang", "tibble"] }, "raptr": { "name": "raptr", "version": "1.0.1", "sha256": "01l5047xdjr3hq2d3hfcs7yb27wm0abmx3jxszq9lm4yic9zjr76", - "depends": ["adehabitatHR", "assertthat", "BH", "boot", "ggplot2", "hypervolume", "ks", "Matrix", "mvtnorm", "PBSmapping", "RColorBrewer", "Rcpp", "RcppEigen", "scales", "sf", "shape", "sp", "terra", "withr"] + "depends": ["BH", "Matrix", "PBSmapping", "RColorBrewer", "Rcpp", "RcppEigen", "adehabitatHR", "assertthat", "boot", "ggplot2", "hypervolume", "ks", "mvtnorm", "scales", "sf", "shape", "sp", "terra", "withr"] }, "raqs": { "name": "raqs", @@ -100049,7 +101099,7 @@ "name": "rare", "version": "0.1.1", "sha256": "0j78ilswiaxdp9107psiw8ibxncd7i81z2njhfqf0n7532pbvjss", - "depends": ["glmnet", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "glmnet"] }, "rareNMtests": { "name": "rareNMtests", @@ -100079,13 +101129,13 @@ "name": "rasclass", "version": "0.2.2", "sha256": "1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50", - "depends": ["car", "e1071", "nnet", "randomForest", "RSNNS"] + "depends": ["RSNNS", "car", "e1071", "nnet", "randomForest"] }, "rassta": { "name": "rassta", "version": "1.0.5", "sha256": "0yia0pwg29fd6hq0f96hdf6k70pj296805a4lgxn4qqwn3gw7006", - "depends": ["cluster", "data_table", "dplyr", "DT", "foreach", "GGally", "ggplot2", "histogram", "KernSmooth", "kohonen", "plotly", "rlang", "scales", "shiny", "stringdist", "stringi", "terra"] + "depends": ["DT", "GGally", "KernSmooth", "cluster", "data_table", "dplyr", "foreach", "ggplot2", "histogram", "kohonen", "plotly", "rlang", "scales", "shiny", "stringdist", "stringi", "terra"] }, "raster": { "name": "raster", @@ -100121,7 +101171,7 @@ "name": "rasterVis", "version": "0.51.6", "sha256": "12cl201gwah0bn14ji4nbygayd77w5fck9zkcikhrda5s0chvgb1", - "depends": ["hexbin", "lattice", "latticeExtra", "raster", "RColorBrewer", "sp", "terra", "viridisLite", "zoo"] + "depends": ["RColorBrewer", "hexbin", "lattice", "latticeExtra", "raster", "sp", "terra", "viridisLite", "zoo"] }, "rasterbc": { "name": "rasterbc", @@ -100169,13 +101219,13 @@ "name": "ratematrix", "version": "1.2.4", "sha256": "0azn52d88m1xxckv4g02vraa9gdr5jmsxqwxwaim90p2s8jy33np", - "depends": ["ape", "coda", "corpcor", "ellipse", "geiger", "MASS", "mvMORPH", "phylolm", "Rcpp", "RcppArmadillo", "readr"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "ape", "coda", "corpcor", "ellipse", "geiger", "mvMORPH", "phylolm", "readr"] }, "rater": { "name": "rater", "version": "1.3.1", "sha256": "0ipgjhxn8d9g6yv369hckvq84v8rrw5b230zz24h72dy9s2nyr44", - "depends": ["BH", "ggplot2", "loo", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "loo", "rlang", "rstan", "rstantools"] }, "rateratio_test": { "name": "rateratio.test", @@ -100185,8 +101235,8 @@ }, "raters": { "name": "raters", - "version": "2.0.4", - "sha256": "1ypg3inqbn4rkwcmqbcwkiydp7sb2bpfrcfdgd1pfp0k73zbin2s", + "version": "2.1.0", + "sha256": "0pjyg4g8z6ixcypi4sz4asgbafcfg0kchza1fpa65xvjmss681bj", "depends": [] }, "ratesci": { @@ -100197,9 +101247,9 @@ }, "ratioOfQsprays": { "name": "ratioOfQsprays", - "version": "1.0.0", - "sha256": "1xzss28wpyx9c5n504sllnlsjqv6ybiswbn3ws9is03024fzcaa9", - "depends": ["BH", "gmp", "qspray", "Rcpp", "RcppArmadillo", "RcppCGAL", "Ryacas"] + "version": "1.1.0", + "sha256": "1g5xpjqwp8rplz85vrjmy9fjg1vf4gs793immljac8c8pcvxixds", + "depends": ["BH", "Rcpp", "RcppCGAL", "Ryacas", "gmp", "qspray"] }, "rationalfun": { "name": "rationalfun", @@ -100217,7 +101267,7 @@ "name": "rattle", "version": "5.5.1", "sha256": "1nhknpdy2a3szcbylg9cq1c1g9ds5y3m35dbbi6rh8r85777qviy", - "depends": ["bitops", "dplyr", "ggplot2", "magrittr", "rpart_plot", "stringi", "stringr", "tibble", "tidyr", "XML"] + "depends": ["XML", "bitops", "dplyr", "ggplot2", "magrittr", "rpart_plot", "stringi", "stringr", "tibble", "tidyr"] }, "ravelRy": { "name": "ravelRy", @@ -100233,9 +101283,9 @@ }, "ravetools": { "name": "ravetools", - "version": "0.1.6", - "sha256": "1akid3qsjppracvqz6cxwaz1w9v251m0xb534gd2dsfibk1s2jli", - "depends": ["digest", "filearray", "pracma", "R6", "Rcpp", "RcppEigen", "RNiftyReg", "signal", "waveslim"] + "version": "0.1.7", + "sha256": "1y0zpbdyr8izdjdgxma8v226fqacrg0j0ykiivqarkkdq82gvbj5", + "depends": ["R6", "RNiftyReg", "Rcpp", "RcppEigen", "digest", "filearray", "gsignal", "pracma", "waveslim"] }, "raw": { "name": "raw", @@ -100247,7 +101297,7 @@ "name": "rawKS", "version": "0.1.0", "sha256": "1yiw9imhgij49qbm9hk6psb73zngqmxxwnaxq144ydwb7fbk6j0z", - "depends": ["dplyr", "ggplot2", "magrittr", "ROCR", "tidyr"] + "depends": ["ROCR", "dplyr", "ggplot2", "magrittr", "tidyr"] }, "raws_profile": { "name": "raws.profile", @@ -100259,31 +101309,31 @@ "name": "raybevel", "version": "0.1.3", "sha256": "0431mk0lslqwffknarb7zm2nbgv564d3karf9davc7w1xgnf11fj", - "depends": ["BH", "decido", "digest", "progress", "rayvertex", "Rcpp", "RcppCGAL", "RcppThread", "sf"] + "depends": ["BH", "Rcpp", "RcppCGAL", "RcppThread", "decido", "digest", "progress", "rayvertex", "sf"] }, "rayimage": { "name": "rayimage", - "version": "0.10.0", - "sha256": "1ss1l8cbm0p7d413s81ncqhd7dqhyd22v5z1z48s9a56pxm2lw5l", - "depends": ["jpeg", "png", "progress", "Rcpp", "RcppArmadillo"] + "version": "0.11.0", + "sha256": "056j9fbhglkf5hnh7ql99wfzf0qf6rls93wmdlyabpdnssq01nma", + "depends": ["Rcpp", "RcppArmadillo", "jpeg", "png", "progress", "tiff"] }, "raymolecule": { "name": "raymolecule", "version": "0.5.3", "sha256": "0lwjx43wd4ziriqd3rxar14z5497x79nfh3h05kn9b7rsiiv8ir9", - "depends": ["httr", "magrittr", "PeriodicTable", "rayrender", "rayvertex"] + "depends": ["PeriodicTable", "httr", "magrittr", "rayrender", "rayvertex"] }, "rayrender": { "name": "rayrender", - "version": "0.32.2", - "sha256": "1vmxnwr8bf4w8kfizqvbi94p2bh7cnwsl8xcljvf4cslsx2ky8l3", - "depends": ["cli", "decido", "magrittr", "pillar", "png", "progress", "raster", "rayimage", "rayvertex", "Rcpp", "RcppThread", "spacefillr", "vctrs", "withr"] + "version": "0.34.3", + "sha256": "1dcrkd4pncmxvi8n5lzy11amcbrrw7c7h2gxgjsywb180kimvv5g", + "depends": ["Rcpp", "RcppThread", "cli", "decido", "magrittr", "pillar", "png", "progress", "raster", "rayimage", "rayvertex", "spacefillr", "vctrs", "withr"] }, "rayshader": { "name": "rayshader", "version": "0.37.3", "sha256": "10jqh7kpn572a100vm59r2cbqzhhng7r6fjfmyw0n44s9bfw5490", - "depends": ["doParallel", "foreach", "jpeg", "magrittr", "png", "progress", "raster", "rayimage", "rayrender", "rayvertex", "Rcpp", "RcppArmadillo", "rgl", "scales", "terrainmeshr"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "jpeg", "magrittr", "png", "progress", "raster", "rayimage", "rayrender", "rayvertex", "rgl", "scales", "terrainmeshr"] }, "raytracing": { "name": "raytracing", @@ -100293,21 +101343,21 @@ }, "rayvertex": { "name": "rayvertex", - "version": "0.10.4", - "sha256": "16rkin3dq648x1gwi9kdpaamb4zsvp326y84pnbwrivny2g9j7q3", - "depends": ["digest", "png", "rayimage", "Rcpp", "RcppThread", "spacefillr"] + "version": "0.11.4", + "sha256": "0xbhkv77238y742vpci6d2z87n6mnnp80qxv938rwb9hfs4c66j4", + "depends": ["Rcpp", "RcppThread", "cli", "digest", "pillar", "png", "rayimage", "spacefillr", "tibble", "vctrs", "withr"] }, "rb3": { "name": "rb3", - "version": "0.0.10", - "sha256": "1gf4i5fbpx238af5f5bzcfmb763mlyk97aq8335slyc8828b9a9c", - "depends": ["ascii", "base64enc", "bizdays", "cli", "digest", "dplyr", "httr", "jsonlite", "proto", "purrr", "readr", "readxl", "rlang", "rvest", "stringr", "tidyr", "XML", "yaml"] + "version": "0.0.11", + "sha256": "1nxh4a3ihjdm1xp3sam9pqh56q2yic97fssm00g7djdfcxq6y0fy", + "depends": ["XML", "ascii", "base64enc", "bizdays", "cli", "digest", "dplyr", "httr", "jsonlite", "proto", "purrr", "readr", "readxl", "rlang", "rvest", "stringr", "tidyr", "yaml"] }, "rbacon": { "name": "rbacon", "version": "3.2.0", "sha256": "18d0mcfmslycbsi9sgqkxw1xwm9cgq4rxkwrvlbm67g0ryad86l3", - "depends": ["coda", "data_table", "Rcpp", "rintcal"] + "depends": ["Rcpp", "coda", "data_table", "rintcal"] }, "rbbnp": { "name": "rbbnp", @@ -100325,7 +101375,7 @@ "name": "rbcc", "version": "0.1.1", "sha256": "1v99cpbq7wd9kfjfanyxfmxifvnr73882hh0zyrp6n3nvj7l85rz", - "depends": ["ggplot2", "PearsonDS", "pracma", "qcc", "reshape2"] + "depends": ["PearsonDS", "ggplot2", "pracma", "qcc", "reshape2"] }, "rbch": { "name": "rbch", @@ -100337,7 +101387,7 @@ "name": "rbedrock", "version": "0.3.2", "sha256": "0jyc7cikr86927ax3qhniv8injqwndzhr4bhd4yphh2sliv6ci8c", - "depends": ["bit64", "digest", "dplyr", "fs", "magrittr", "purrr", "R6", "rappdirs", "readr", "rlang", "stringr", "tibble", "tidyr", "vctrs"] + "depends": ["R6", "bit64", "digest", "dplyr", "fs", "magrittr", "purrr", "rappdirs", "readr", "rlang", "stringr", "tibble", "tidyr", "vctrs"] }, "rbenchmark": { "name": "rbenchmark", @@ -100361,7 +101411,7 @@ "name": "rbi.helpers", "version": "0.4.0", "sha256": "1qj5b9wwh40ni549l9xiarp7w5x9q5n22k413azjhnssm7799hbv", - "depends": ["data_table", "lubridate", "Matrix", "rbi", "reshape2"] + "depends": ["Matrix", "data_table", "lubridate", "rbi", "reshape2"] }, "rbibutils": { "name": "rbibutils", @@ -100379,7 +101429,7 @@ "name": "rbioacc", "version": "1.2.1", "sha256": "0yz3mlkz6869rlg56m49bl5bq16gnmr69lznlvcsz7vmwli2ic4x", - "depends": ["BH", "GGally", "ggmcmc", "ggplot2", "loo", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "stringr", "zoo"] + "depends": ["BH", "GGally", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggmcmc", "ggplot2", "loo", "rstan", "rstantools", "stringr", "zoo"] }, "rbioapi": { "name": "rbioapi", @@ -100391,7 +101441,7 @@ "name": "rbiom", "version": "1.0.3", "sha256": "13nma1s3p4bzh8mvikrnmkqyyrx9axvxavq6fyk2w0j804w1qzcg", - "depends": ["magrittr", "openxlsx", "plyr", "R_utils", "Rcpp", "RcppParallel", "rjson", "rlang", "slam"] + "depends": ["R_utils", "Rcpp", "RcppParallel", "magrittr", "openxlsx", "plyr", "rjson", "rlang", "slam"] }, "rbiouml": { "name": "rbiouml", @@ -100415,7 +101465,7 @@ "name": "rbmi", "version": "1.2.6", "sha256": "0yy5yz9ld74wvljvpfz4gh7xzq9b60nf9lc97s1zvmwjgrzp77v4", - "depends": ["assertthat", "BH", "Matrix", "mmrm", "pkgload", "R6", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Matrix", "R6", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "assertthat", "mmrm", "pkgload", "rstan", "rstantools"] }, "rbmn": { "name": "rbmn", @@ -100427,7 +101477,7 @@ "name": "rbooster", "version": "1.1.0", "sha256": "0v524hjp3im94hbf6kbmi4xhqnak135mmpmq1sni1c97dqal2hqy", - "depends": ["earth", "Hmisc", "rpart"] + "depends": ["Hmisc", "earth", "rpart"] }, "rbounds": { "name": "rbounds", @@ -100439,7 +101489,7 @@ "name": "rbridge", "version": "1.0.2", "sha256": "0m4c61rdrhq1jw3rwq2ld29g5dchbk4sfpnq0wmwbvzhdjq76plc", - "depends": ["dplyr", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "dplyr"] }, "rbscCI": { "name": "rbscCI", @@ -100475,7 +101525,7 @@ "name": "rcaiman", "version": "1.2.2", "sha256": "1zhs56my1229826ilxfdm5vdgw2n8vql3flmj64604fsyjsnv833", - "depends": ["colorspace", "filenamer", "lidR", "magrittr", "pracma", "Rdpack", "spatial", "terra", "testthat"] + "depends": ["Rdpack", "colorspace", "filenamer", "lidR", "magrittr", "pracma", "spatial", "terra", "testthat"] }, "rcarbon": { "name": "rcarbon", @@ -100489,6 +101539,12 @@ "sha256": "0lqipmrcvgjlh7ya4r3vf7qiypc2pwgqcxzmg4xmb5h5p5l37cq0", "depends": ["ggplot2", "scales"] }, + "rcausim": { + "name": "rcausim", + "version": "0.1.1", + "sha256": "1h1ml452xc8m1mzz2y915x9vzyykq6wgfbayabdjk14k2w6n1a0n", + "depends": ["dplyr", "igraph", "magrittr", "purrr", "tidyr"] + }, "rcbalance": { "name": "rcbalance", "version": "1.8.8", @@ -100499,7 +101555,7 @@ "name": "rcbayes", "version": "0.2.0", "sha256": "1qwbpx9snqgaz7gshvyhq9ylsf59grjhx56f7cnq25h2f76km9cc", - "depends": ["BH", "dplyr", "magrittr", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "rlang", "rstan", "rstantools", "shiny", "shinythemes", "StanHeaders", "tibble", "tidybayes"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "dplyr", "magrittr", "rlang", "rstan", "rstantools", "shiny", "shinythemes", "tibble", "tidybayes"] }, "rcbsubset": { "name": "rcbsubset", @@ -100517,7 +101573,7 @@ "name": "rcccd", "version": "0.3.2", "sha256": "0wyh4ijiy0mm7alfkz06hnkgya87npxgz33zpaarb3phkkzjhcs2", - "depends": ["proxy", "RANN", "Rcpp", "RcppArmadillo", "Rfast"] + "depends": ["RANN", "Rcpp", "RcppArmadillo", "Rfast", "proxy"] }, "rccola": { "name": "rccola", @@ -100535,7 +101591,7 @@ "name": "rcdk", "version": "3.8.1", "sha256": "15dwjrnw0zdkck56gs2282gw5fvzqimhhjyrryh1rdnvvqsbj9i7", - "depends": ["fingerprint", "iterators", "itertools", "png", "rcdklibs", "rJava"] + "depends": ["fingerprint", "iterators", "itertools", "png", "rJava", "rcdklibs"] }, "rcdklibs": { "name": "rcdklibs", @@ -100559,12 +101615,12 @@ "name": "rchemo", "version": "0.1-2", "sha256": "06wrpv3bnzq9sz6wq4f1sgcq549rafnqh6rzldl160hv7yb7rl80", - "depends": ["data_table", "e1071", "FNN", "signal"] + "depends": ["FNN", "data_table", "e1071", "signal"] }, "rcheology": { "name": "rcheology", - "version": "4.4.0.0", - "sha256": "1iazraakb1jvcjs2ygay1r7f04fpnmsgcgv028bdxj8ck6pqksrq", + "version": "4.4.1.0", + "sha256": "1k49z9czxdksvc7m7767q52l613lv7fsfykx0yaajjlvp67ac4ly", "depends": [] }, "rciplot": { @@ -100589,7 +101645,7 @@ "name": "rcmdcheck", "version": "1.4.0", "sha256": "1l696byn3kjq2xvz4wxybzaj6ink85h4lz3a35v2132ba5yyzm5v", - "depends": ["callr", "cli", "curl", "desc", "digest", "pkgbuild", "prettyunits", "R6", "rprojroot", "sessioninfo", "withr", "xopen"] + "depends": ["R6", "callr", "cli", "curl", "desc", "digest", "pkgbuild", "prettyunits", "rprojroot", "sessioninfo", "withr", "xopen"] }, "rco": { "name": "rco", @@ -100613,7 +101669,7 @@ "name": "rcompanion", "version": "2.4.36", "sha256": "0r6kppwfm44h9y5wda3pfnxgsjvrdj3ysdmxclhrciq5rlzs2n8v", - "depends": ["boot", "coin", "DescTools", "lmtest", "multcompView", "nortest", "plyr"] + "depends": ["DescTools", "boot", "coin", "lmtest", "multcompView", "nortest", "plyr"] }, "rcompendium": { "name": "rcompendium", @@ -100631,12 +101687,12 @@ "name": "rcontroll", "version": "0.1.1", "sha256": "14xh5hhb96qk0f3kvvvjbkyswcq17g6y70v5prazldq7i4bzpv8q", - "depends": ["doParallel", "doSNOW", "dplyr", "foreach", "gganimate", "ggplot2", "iterators", "lidR", "lubridate", "magrittr", "Rcpp", "RcppGSL", "readr", "reshape2", "sys", "terra", "tibble", "tidyr", "viridis", "vroom"] + "depends": ["Rcpp", "RcppGSL", "doParallel", "doSNOW", "dplyr", "foreach", "gganimate", "ggplot2", "iterators", "lidR", "lubridate", "magrittr", "readr", "reshape2", "sys", "terra", "tibble", "tidyr", "viridis", "vroom"] }, "rcorpora": { "name": "rcorpora", - "version": "2.0.0", - "sha256": "1b8xa81mn3afadz77576vda9b0d99f1k096drxrpqd989g993aqy", + "version": "2.0.1", + "sha256": "1gwiqp0ysw509pjggiw6czw8yf8lz917gvrnish0wgivc317x268", "depends": ["jsonlite"] }, "rcpptimer": { @@ -100649,13 +101705,13 @@ "name": "rcrimeanalysis", "version": "0.5.0", "sha256": "0a7h3gblc69g1mkalb3yss9x609701zwd3hh4pr2v96fdmsxdpkc", - "depends": ["forecast", "ggmap", "htmltools", "igraph", "KernSmooth", "leaflet", "leafsync", "lubridate", "pals", "raster", "sp", "terra"] + "depends": ["KernSmooth", "forecast", "ggmap", "htmltools", "igraph", "leaflet", "leafsync", "lubridate", "pals", "raster", "sp", "terra"] }, "rcrossref": { "name": "rcrossref", "version": "1.2.0", "sha256": "0hqvhqmfmbhvxv555x3vjwz7rh4r2cw6wj8p3wq4hcf107r555c0", - "depends": ["crul", "dplyr", "DT", "jsonlite", "miniUI", "plyr", "R6", "shiny", "stringr", "tibble", "xml2"] + "depends": ["DT", "R6", "crul", "dplyr", "jsonlite", "miniUI", "plyr", "shiny", "stringr", "tibble", "xml2"] }, "rcssci": { "name": "rcssci", @@ -100701,8 +101757,8 @@ }, "rdataretriever": { "name": "rdataretriever", - "version": "3.1.0", - "sha256": "06jbsrrl4db4w1ksjy7p0ywqba1di3nf491zfpgni8bz3a90ia0w", + "version": "3.1.1", + "sha256": "0ill7bgah219zp33yr9crq4fvzkhjbqm3y5y70nx14zq2jn5v9dg", "depends": ["reticulate", "semver"] }, "rdbnomics": { @@ -100721,7 +101777,7 @@ "name": "rddapp", "version": "1.3.2", "sha256": "1bb76v35cpcvmjnkzficl1rvwkz37z0i56bq81m7nb87cb9p1hkv", - "depends": ["AER", "DT", "Formula", "lmtest", "plot3D", "R_utils", "sandwich", "shiny", "sp"] + "depends": ["AER", "DT", "Formula", "R_utils", "lmtest", "plot3D", "sandwich", "shiny", "sp"] }, "rddensity": { "name": "rddensity", @@ -100739,7 +101795,7 @@ "name": "rddtools", "version": "1.6.0", "sha256": "12lxdpazfhwn5kkzs91qhs0xcky30dj01yp0v5708ahr1ywqdxmd", - "depends": ["AER", "Formula", "ggplot2", "KernSmooth", "lmtest", "locpol", "np", "rdd", "rdrobust", "rmarkdown", "sandwich"] + "depends": ["AER", "Formula", "KernSmooth", "ggplot2", "lmtest", "locpol", "np", "rdd", "rdrobust", "rmarkdown", "sandwich"] }, "rde": { "name": "rde", @@ -100761,21 +101817,21 @@ }, "rdflib": { "name": "rdflib", - "version": "0.2.8", - "sha256": "0massic915hyw2752jkaa3rx9nf2v7a87gp3c5qpyn4fnqjai4dn", + "version": "0.2.9", + "sha256": "0cfkbqr4m9dqbiqnr01wkxl6qd09384aq5x0d8vycylmngvmh4ay", "depends": ["dplyr", "readr", "redland", "stringi", "tidyr"] }, "rdfp": { "name": "rdfp", "version": "0.1.4", "sha256": "1490227hhfjjscfmd8p897v1ijs61pk5sc0a2vr9yjnfmsnxpqrl", - "depends": ["curl", "data_table", "dplyr", "httr", "lubridate", "plyr", "purrr", "readr", "XML", "xml2"] + "depends": ["XML", "curl", "data_table", "dplyr", "httr", "lubridate", "plyr", "purrr", "readr", "xml2"] }, "rdhs": { "name": "rdhs", "version": "0.8.1", "sha256": "0i25lbfbi3ikipk7k53bi1b57v2348ab08sh7rh2pqdlxpfkp7b7", - "depends": ["brio", "cli", "digest", "foreign", "getPass", "haven", "httr", "iotools", "jsonlite", "magrittr", "qdapRegex", "R6", "rappdirs", "rlang", "sf", "storr", "xml2"] + "depends": ["R6", "brio", "cli", "digest", "foreign", "getPass", "haven", "httr", "iotools", "jsonlite", "magrittr", "qdapRegex", "rappdirs", "rlang", "sf", "storr", "xml2"] }, "rdi": { "name": "rdi", @@ -100823,7 +101879,7 @@ "name": "rdomains", "version": "0.2.1", "sha256": "1gpgryfdv4dhv98nfnr15lqq9ndwi8q17rwm5z7j2klgi5d644ld", - "depends": ["aws_alexa", "curl", "devtools", "glmnet", "httr", "jsonlite", "Matrix", "R_utils", "urltools", "virustotal", "XML", "xml2"] + "depends": ["Matrix", "R_utils", "XML", "aws_alexa", "curl", "devtools", "glmnet", "httr", "jsonlite", "urltools", "virustotal", "xml2"] }, "rdoxygen": { "name": "rdoxygen", @@ -100841,13 +101897,13 @@ "name": "rdracor", "version": "1.0.3", "sha256": "014xa4n6av0g3ffplna8z25b00176war3h2pv20wclx9lq8wz9hs", - "depends": ["data_table", "httr", "igraph", "jsonlite", "purrr", "Rdpack", "stringr", "tibble", "tidyr", "xml2"] + "depends": ["Rdpack", "data_table", "httr", "igraph", "jsonlite", "purrr", "stringr", "tibble", "tidyr", "xml2"] }, "rdrobust": { "name": "rdrobust", "version": "2.2", "sha256": "1p9k8gd39090r5ml1sk30k3hvfns2v6laysbaswsn9i2ka70zj42", - "depends": ["ggplot2", "MASS"] + "depends": ["MASS", "ggplot2"] }, "rdryad": { "name": "rdryad", @@ -100859,7 +101915,7 @@ "name": "rdtLite", "version": "1.4", "sha256": "0m2fxwz0h4rriw62g2hp20iw6ddbq5l8n80z9xgxk49n6pfm1ywj", - "depends": ["curl", "digest", "gtools", "jsonlite", "knitr", "provViz", "rlang", "rmarkdown", "sessioninfo", "stringi", "XML"] + "depends": ["XML", "curl", "digest", "gtools", "jsonlite", "knitr", "provViz", "rlang", "rmarkdown", "sessioninfo", "stringi"] }, "rdwd": { "name": "rdwd", @@ -100883,7 +101939,7 @@ "name": "reReg", "version": "1.4.6", "sha256": "1p1rbj88bc5qz909w2q6mnzkscz2djdm8w3lcfj1pzka6699jz8z", - "depends": ["BB", "dfoptim", "directlabels", "ggplot2", "MASS", "nleqslv", "optimx", "Rcpp", "RcppArmadillo", "reda", "rootSolve", "scam", "SQUAREM", "survival"] + "depends": ["BB", "MASS", "Rcpp", "RcppArmadillo", "SQUAREM", "dfoptim", "directlabels", "ggplot2", "nleqslv", "optimx", "reda", "rootSolve", "scam", "survival"] }, "react": { "name": "react", @@ -100899,8 +101955,8 @@ }, "reactR": { "name": "reactR", - "version": "0.5.0", - "sha256": "14pi2wc25qa9q0hp8jby07798l53phyj1zifj46fg2pjq8vkz7p7", + "version": "0.6.0", + "sha256": "0mi9zfy50njvykmp4rfgpvsmf7q8l92n2196jw9sc06q7ybjn92v", "depends": ["htmltools"] }, "reactable": { @@ -100927,12 +101983,6 @@ "sha256": "1njihrnq1x162nc2wk16kj1l0vpvk8xcdgjvj36arw4z8nv8wpah", "depends": ["jsonlite"] }, - "read_dbc": { - "name": "read.dbc", - "version": "1.0.7", - "sha256": "1virjl00x1yzby6wvxjdf1kqbjgm2kkdv53b72c0jq4nrfrl55nw", - "depends": ["foreign"] - }, "read_gb": { "name": "read.gb", "version": "2.2", @@ -100979,13 +102029,13 @@ "name": "readMzXmlData", "version": "2.8.3", "sha256": "1mh6rgy8s0rkvycv99p3zgw831pgzi5cacsj4awb7h4dl11sf8sf", - "depends": ["base64enc", "digest", "XML"] + "depends": ["XML", "base64enc", "digest"] }, "readNSx": { "name": "readNSx", "version": "0.0.4", "sha256": "1mllas238wvmpc094vw242h2gv9qgdyfml9k618ijp1s0mabnwcc", - "depends": ["cpp11", "data_table", "fastmap", "hdf5r", "jsonlite", "R6"] + "depends": ["R6", "cpp11", "data_table", "fastmap", "hdf5r", "jsonlite"] }, "readODS": { "name": "readODS", @@ -101029,6 +102079,12 @@ "sha256": "1sq2spjgdc9rq8cr5i9qjmqd4vcf7cknpx5dndwjdqrv112y8bk9", "depends": ["crayon", "haven", "jsonlite", "readr", "readxl"] }, + "readme2vignette": { + "name": "readme2vignette", + "version": "0.1.0", + "sha256": "1nrcmi5g0fa2jnmaw7kc9zir4nvn64imwz8b2jmhcg7k0nxakybv", + "depends": ["desc", "fs", "glue", "knitr", "pkgbuild", "remotes", "rmarkdown", "usethis", "whisker"] + }, "readmet": { "name": "readmet", "version": "1.7.1", @@ -101045,7 +102101,7 @@ "name": "readmoRe", "version": "0.2-12", "sha256": "18zxhnh8nzh3l5j94mrqf9l94bxvc82nzhl8sx5k9h08gj4f1zfw", - "depends": ["plyr", "R_utils", "readxl", "xml2"] + "depends": ["R_utils", "plyr", "readxl", "xml2"] }, "readobj": { "name": "readobj", @@ -101057,12 +102113,12 @@ "name": "readr", "version": "2.1.5", "sha256": "02p1jjal73j39r49ba4jlvbx8bdqmm96nsdp47igyv54w1gmm9hg", - "depends": ["cli", "clipr", "cpp11", "crayon", "hms", "lifecycle", "R6", "rlang", "tibble", "tzdb", "vroom"] + "depends": ["R6", "cli", "clipr", "cpp11", "crayon", "hms", "lifecycle", "rlang", "tibble", "tzdb", "vroom"] }, "readrba": { "name": "readrba", - "version": "0.1.8", - "sha256": "0hvz8zss5gh7r2w9ar3qh66k7vgbdikz942fp8pbzag8khah5rza", + "version": "0.1.10", + "sha256": "16g1zwib8f4vm4jb8lc9w2rfvszajfrs978gbgdgqz0raw7h4grf", "depends": ["dplyr", "httr", "lubridate", "purrr", "readxl", "rlang", "rvest", "stringr", "tidyr", "xml2"] }, "readroper": { @@ -101111,7 +102167,7 @@ "name": "readwritesqlite", "version": "0.2.0", "sha256": "1p80ghra71j83xrrsqrpqkdaylp4sl1daw1paxw9jpajw679n986", - "depends": ["chk", "crayon", "DBI", "glue", "hms", "lifecycle", "rlang", "RSQLite", "sf", "tibble"] + "depends": ["DBI", "RSQLite", "chk", "crayon", "glue", "hms", "lifecycle", "rlang", "sf", "tibble"] }, "readxl": { "name": "readxl", @@ -101123,19 +102179,19 @@ "name": "readxlsb", "version": "0.1.61", "sha256": "1l7lklfk6ifjq6v4m0ha5k1fxak62zac2yn698r03x41k29382f7", - "depends": ["cellranger", "Rcpp", "xml2"] + "depends": ["Rcpp", "cellranger", "xml2"] }, "ready4": { "name": "ready4", - "version": "0.1.9", - "sha256": "0y7mjsah7a1f8jzz9mf3f9dvqnv30qdn2m4hccw0hyqvwcr1a4pf", - "depends": ["dataverse", "dplyr", "gh", "kableExtra", "lifecycle", "magrittr", "piggyback", "purrr", "rlang", "rvest", "stringi", "stringr", "tibble", "tidyRSS", "tidyselect"] + "version": "0.1.14", + "sha256": "09kf290dq1qdafyx8f12sasf10chiqrh8d1wa1apfkrr01n4b45j", + "depends": ["curl", "dataverse", "dplyr", "gh", "kableExtra", "lifecycle", "magrittr", "piggyback", "purrr", "rlang", "rvest", "stringi", "stringr", "tibble", "tidyRSS", "tidyselect"] }, "realTimeloads": { "name": "realTimeloads", "version": "1.0.0", "sha256": "0ragbi8sczhs8hsbgxl4gmb8lwbmhnxiz88almpml2slsmx7nrrq", - "depends": ["data_table", "imputeTS", "mice", "signal", "TideHarmonics"] + "depends": ["TideHarmonics", "data_table", "imputeTS", "mice", "signal"] }, "realtest": { "name": "realtest", @@ -101153,7 +102209,7 @@ "name": "rearrr", "version": "0.3.4", "sha256": "1inx1gikiqxaf6a8g10b02l1qs2y0zxs2yrxn6dyx9n6xlra3rnr", - "depends": ["checkmate", "dplyr", "lifecycle", "plyr", "purrr", "R6", "rlang", "tibble"] + "depends": ["R6", "checkmate", "dplyr", "lifecycle", "plyr", "purrr", "rlang", "tibble"] }, "reasonabletools": { "name": "reasonabletools", @@ -101175,8 +102231,8 @@ }, "rebmix": { "name": "rebmix", - "version": "2.15.0", - "sha256": "1ikpfsdjwlck9nmx781k0783r94f3ngxixrv1q3w9r7rgk769mx4", + "version": "2.16.0", + "sha256": "12scbgbjyfpskv1lly34r0iwci13pad4g7lgiz7wsph0gynmai13", "depends": [] }, "rebus": { @@ -101211,9 +102267,9 @@ }, "recalibratiNN": { "name": "recalibratiNN", - "version": "0.2.0", - "sha256": "10baqzbwggry9lwydr6vbsx5mx2jpbggm7dxamz9887min8n2lfa", - "depends": ["dplyr", "ggplot2", "glue", "Hmisc", "magrittr", "purrr", "RANN", "Rdpack", "tibble", "tidyr"] + "version": "0.3.0", + "sha256": "1xa70a8w9fi3yq6x1f5jch0ids5zkxq1ij5y5hd124q53bp0q90l", + "depends": ["Hmisc", "RANN", "Rdpack", "dplyr", "ggplot2", "glue", "magrittr", "purrr", "tibble", "tidyr"] }, "recapr": { "name": "recapr", @@ -101231,31 +102287,31 @@ "name": "recexcavAAR", "version": "0.3.0", "sha256": "0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20", - "depends": ["kriging", "Rcpp"] + "depends": ["Rcpp", "kriging"] }, "rechaRge": { "name": "rechaRge", "version": "1.0.0", "sha256": "05in0rv36g282f79b0f3crn1y7azfvw7863n8c583jgvhmvndqsn", - "depends": ["airGR", "data_table", "doFuture", "foreach", "future", "hydrostats", "lubridate", "ncdf4", "plyr", "progressr", "R_utils", "raster", "sp", "zoo"] + "depends": ["R_utils", "airGR", "data_table", "doFuture", "foreach", "future", "hydrostats", "lubridate", "ncdf4", "plyr", "progressr", "raster", "sp", "zoo"] }, "rechonest": { "name": "rechonest", "version": "1.2", "sha256": "0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2", - "depends": ["httr", "jsonlite", "RCurl"] + "depends": ["RCurl", "httr", "jsonlite"] }, "recipes": { "name": "recipes", - "version": "1.0.10", - "sha256": "1m4v9j7by0w5avqljmwck1jsgjgwc8rsby0affa5zii3xkvvvifg", - "depends": ["cli", "clock", "dplyr", "ellipsis", "generics", "glue", "gower", "hardhat", "ipred", "lifecycle", "lubridate", "magrittr", "Matrix", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "timeDate", "vctrs", "withr"] + "version": "1.1.0", + "sha256": "0v9063w4ahdc0xnwry3knykl4k2656df6jxv5f0p40k8piv8ip65", + "depends": ["Matrix", "cli", "clock", "dplyr", "generics", "glue", "gower", "hardhat", "ipred", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "timeDate", "vctrs", "withr"] }, "reclin2": { "name": "reclin2", "version": "0.5.0", "sha256": "08jf6r74fmsj2bvhz76vf74hphg8543x4wj1dnbsj44xjzh6abi4", - "depends": ["data_table", "lpSolve", "Rcpp", "stringdist"] + "depends": ["Rcpp", "data_table", "lpSolve", "stringdist"] }, "recluster": { "name": "recluster", @@ -101279,7 +102335,7 @@ "name": "recodeflow", "version": "0.1.0", "sha256": "0qi5y1rbdw6dcvkl8gw9fh7rcb0f6ckig8464sgxslgf7cdk2gcz", - "depends": ["dplyr", "haven", "magrittr", "sjlabelled", "stringr", "tidyr", "XML"] + "depends": ["XML", "dplyr", "haven", "magrittr", "sjlabelled", "stringr", "tidyr"] }, "recogito": { "name": "recogito", @@ -101303,13 +102359,13 @@ "name": "recometrics", "version": "0.1.6-3", "sha256": "1i7842k6qw9zbcslfwgdfd7358jh63aybi4mifq6knc8qm577nqk", - "depends": ["float", "Matrix", "MatrixExtra", "Rcpp", "RhpcBLASctl"] + "depends": ["Matrix", "MatrixExtra", "Rcpp", "RhpcBLASctl", "float"] }, "recommenderlab": { "name": "recommenderlab", "version": "1.0.6", "sha256": "1dxpdgmv3hfwix1w8lzc0ijcd8myslsqnznr5pbwsrh7wypwqk1h", - "depends": ["arules", "irlba", "Matrix", "matrixStats", "proxy", "recosystem", "registry"] + "depends": ["Matrix", "arules", "irlba", "matrixStats", "proxy", "recosystem", "registry"] }, "recommenderlabBX": { "name": "recommenderlabBX", @@ -101333,7 +102389,7 @@ "name": "reconstructr", "version": "2.0.4", "sha256": "05nvp19fkmyr2sc7k5qjz2521f8nrzxvjdbnqa148qs0mac84b16", - "depends": ["openssl", "Rcpp"] + "depends": ["Rcpp", "openssl"] }, "recorder": { "name": "recorder", @@ -101345,7 +102401,7 @@ "name": "recosystem", "version": "0.5.1", "sha256": "01d8r1pwvd606cbs9bq2rq3ahq7jnfgak9p58ch4fs4ki5nxf1sj", - "depends": ["float", "Rcpp", "RcppProgress"] + "depends": ["Rcpp", "RcppProgress", "float"] }, "recurrentpseudo": { "name": "recurrentpseudo", @@ -101355,8 +102411,8 @@ }, "recurse": { "name": "recurse", - "version": "1.3.0", - "sha256": "05x2qcabxw0xgirvb39si1j8szrz328fx1f3v8yvdysmfa3bg408", + "version": "1.4.0", + "sha256": "1rv2pa8ghmxdl3s2s16m1xci6v9kjpilyfsmzacmnfgx734c4ihf", "depends": ["Rcpp"] }, "red": { @@ -101369,12 +102425,12 @@ "name": "reda", "version": "0.5.4", "sha256": "1lrfbcvxgbbpi7l3vls3rdj8y3w30gg5f1fjcfscmykvp0i01j3d", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "splines2"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "splines2"] }, "redbookperu": { "name": "redbookperu", - "version": "0.0.2", - "sha256": "0pf6ihk5k4milzz9j2y5wsxj7ishadlx1zvffhkw600c3i7ssi5b", + "version": "0.0.3", + "sha256": "1v90xrvwcfbkgqm6yq0dhsp9i9wfgwv3ijyja70v3bqa46klvq91", "depends": [] }, "redcapAPI": { @@ -101399,13 +102455,19 @@ "name": "redist", "version": "4.2.0", "sha256": "1ibwldd24zj2fhpn18q4381mp82p7wbv61xmqm2lzybil92y800w", - "depends": ["cli", "doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "patchwork", "Rcpp", "RcppArmadillo", "RcppThread", "redistmetrics", "rlang", "servr", "sf", "stringr", "sys", "tidyselect", "vctrs"] + "depends": ["Rcpp", "RcppArmadillo", "RcppThread", "cli", "doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "patchwork", "redistmetrics", "rlang", "servr", "sf", "stringr", "sys", "tidyselect", "vctrs"] }, "redistmetrics": { "name": "redistmetrics", "version": "1.0.7", "sha256": "0r9fa0p65bpklgcb5nbbsm2s3vhrcbbp4glciglmw185vfjqg7s2", - "depends": ["cli", "doParallel", "dplyr", "foreach", "geos", "magrittr", "Rcpp", "RcppArmadillo", "RcppThread", "rlang", "sf", "vctrs", "wk"] + "depends": ["Rcpp", "RcppArmadillo", "RcppThread", "cli", "doParallel", "dplyr", "foreach", "geos", "magrittr", "rlang", "sf", "vctrs", "wk"] + }, + "redistverse": { + "name": "redistverse", + "version": "0.1.0", + "sha256": "08154l54afih3828xc7zdacj0n3wnahwdq1hjjk3gdyfzl8ad0qy", + "depends": ["PL94171", "alarmdata", "birdie", "censable", "cli", "easycensus", "geomander", "ggredist", "redist", "redistmetrics", "sf", "tinytiger"] }, "redland": { "name": "redland", @@ -101435,7 +102497,7 @@ "name": "ref.ICAR", "version": "2.0.1", "sha256": "1mix12qxap6rqs6dg4nlbm9vlkzxgr1ivkjjkzap3k0km0agldx9", - "depends": ["classInt", "coda", "dplyr", "ggplot2", "gtools", "MCMCglmm", "mvtnorm", "pracma", "Rdpack", "sf", "sp", "spdep"] + "depends": ["MCMCglmm", "Rdpack", "classInt", "coda", "dplyr", "ggplot2", "gtools", "mvtnorm", "pracma", "sf", "sp", "spdep"] }, "refdb": { "name": "refdb", @@ -101453,7 +102515,7 @@ "name": "referenceIntervals", "version": "1.3.1", "sha256": "1vgiy0ds982y9mjnpigzhmckxwj010ymfip2x2gfsqrc320gl2hq", - "depends": ["boot", "extremevalues", "MASS", "outliers"] + "depends": ["MASS", "boot", "extremevalues", "outliers"] }, "refineR": { "name": "refineR", @@ -101471,7 +102533,7 @@ "name": "refitME", "version": "1.2.2", "sha256": "125hxp24vlwg3g0v1rlhi3zbvnnzyj95a6d9f52f98hf6bp05yhb", - "depends": ["caret", "dplyr", "expm", "MASS", "mgcv", "mvtnorm", "sandwich", "scales", "SemiPar", "VGAM", "VGAMdata"] + "depends": ["MASS", "SemiPar", "VGAM", "VGAMdata", "caret", "dplyr", "expm", "mgcv", "mvtnorm", "sandwich", "scales"] }, "reflectR": { "name": "reflectR", @@ -101495,7 +102557,7 @@ "name": "refreg", "version": "0.1.1", "sha256": "0dqlqh3ndpqjab2cz3aikb9srhmyj3j133lwcnajgycwr5334mri", - "depends": ["doParallel", "foreach", "ggplot2", "gridExtra", "KernSmooth", "ks", "matrixcalc", "mbend", "mgcv", "misc3d", "pracma", "RColorBrewer", "rgl", "sp", "stringr"] + "depends": ["KernSmooth", "RColorBrewer", "doParallel", "foreach", "ggplot2", "gridExtra", "ks", "matrixcalc", "mbend", "mgcv", "misc3d", "pracma", "rgl", "sp", "stringr"] }, "refreshr": { "name": "refreshr", @@ -101505,8 +102567,8 @@ }, "refseqR": { "name": "refseqR", - "version": "1.0.2", - "sha256": "076ai3jgpll30fx7hnvy5b11n7v4c9vgsnkw98pfddi7p5xxiw2f", + "version": "1.1.4", + "sha256": "09zh4fq232arcykaflgjy2bmjikfqhrqbwfy6pdhj48ixwxbwdbf", "depends": ["Biostrings", "IRanges", "rentrez", "tibble"] }, "refset": { @@ -101523,15 +102585,15 @@ }, "refugees": { "name": "refugees", - "version": "2023.6.0", - "sha256": "1sy93zg4vjv02ga96vzhdjvgnwmv3gmd3m7w2fplah7d49i3z85v", + "version": "2023.12.0", + "sha256": "11isc2q3y3syi1hkvxg8rgism9qynskxypsivcvjdpdhw4sfh263", "depends": ["tibble"] }, "refund": { "name": "refund", "version": "0.1-35", "sha256": "0hdm8ycgxzmmpgp885w49fxzvn6j5078x42gf7hh1ms7w0k4k72g", - "depends": ["boot", "fda", "gamm4", "ggplot2", "grpreg", "lattice", "lme4", "magic", "MASS", "Matrix", "mgcv", "nlme", "pbs", "RLRsim"] + "depends": ["MASS", "Matrix", "RLRsim", "boot", "fda", "gamm4", "ggplot2", "grpreg", "lattice", "lme4", "magic", "mgcv", "nlme", "pbs"] }, "refund_shiny": { "name": "refund.shiny", @@ -101549,19 +102611,19 @@ "name": "regRSM", "version": "0.5", "sha256": "0nbp3yjk9r7qvwm7wla39155rmqnvpdb720iq3b0hcy1bbsxbk9s", - "depends": ["doParallel", "foreach", "Rmpi"] + "depends": ["Rmpi", "doParallel", "foreach"] }, "regclass": { "name": "regclass", "version": "1.6", "sha256": "0m974k3yhf0dgv5f1qjs8c53mam0cll3cjn35ywfrmlfla0wlhf5", - "depends": ["bestglm", "leaps", "randomForest", "rpart", "rpart_plot", "VGAM"] + "depends": ["VGAM", "bestglm", "leaps", "randomForest", "rpart", "rpart_plot"] }, "regda": { "name": "regda", "version": "1.0", "sha256": "0zdipzkf8yil1cf142g66cls9d2yabzag9k4nm9nab0nyfidkdcw", - "depends": ["doParallel", "foreach", "Rfast", "Rfast2"] + "depends": ["Rfast", "Rfast2", "doParallel", "foreach"] }, "regexPipes": { "name": "regexPipes", @@ -101579,7 +102641,7 @@ "name": "reghelper", "version": "1.1.2", "sha256": "1vd8kd719kyjp65zym6zx3vax1q2kbhpl6la71d5aa59s54ylri3", - "depends": ["ggplot2", "lme4", "MASS", "nlme", "rlang"] + "depends": ["MASS", "ggplot2", "lme4", "nlme", "rlang"] }, "regional": { "name": "regional", @@ -101603,7 +102665,7 @@ "name": "registr", "version": "2.1.0", "sha256": "033kvhcx27g0vw85gi8xb035wijqb6xsg8jjskqpp4l1gw3a1v1c", - "depends": ["dplyr", "gamm4", "lme4", "magrittr", "MASS", "Matrix", "mgcv", "pbs", "purrr", "Rcpp", "RcppArmadillo", "tidyr"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "dplyr", "gamm4", "lme4", "magrittr", "mgcv", "pbs", "purrr", "tidyr"] }, "registry": { "name": "registry", @@ -101615,31 +102677,31 @@ "name": "reglogit", "version": "1.2-7", "sha256": "0mknx71h24kbh4agarkhrfp2wz1kjvd34kv0c6qy0f1jwvr3kzr6", - "depends": ["boot", "Matrix", "mvtnorm"] + "depends": ["Matrix", "boot", "mvtnorm"] }, "regmed": { "name": "regmed", "version": "2.1.0", "sha256": "1m74865y2pahk50a149nv8aqkiilg23hbyijwmdcpqgi94ys40h3", - "depends": ["glasso", "gtools", "igraph", "knitr", "lavaan", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "glasso", "gtools", "igraph", "knitr", "lavaan"] }, "regmedint": { "name": "regmedint", "version": "1.0.1", "sha256": "1f8p19a1m6qyypjfv8yr1gcqx6djjjkly3xxkp5fy5pldm7ik2sk", - "depends": ["assertthat", "Deriv", "MASS", "Matrix", "sandwich", "survival"] + "depends": ["Deriv", "MASS", "Matrix", "assertthat", "sandwich", "survival"] }, "regmhmm": { "name": "regmhmm", "version": "1.0.0", "sha256": "19w4r94n67wab3jswh0pdyj7237aijfxhz18s6cr9h4m9bldkvji", - "depends": ["glmnet", "glmnetUtils", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "glmnet", "glmnetUtils"] }, "regnet": { "name": "regnet", "version": "1.0.1", "sha256": "13d2awfq68im3zqab0pqg8mdi7ns7bam3ln94ysl8k86qi19i6ax", - "depends": ["glmnet", "igraph", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "glmnet", "igraph"] }, "rego": { "name": "rego", @@ -101657,7 +102719,7 @@ "name": "regport", "version": "0.3.0", "sha256": "0mbx1ja1mbhd0z7jcxjrs6b8ldp87ym21fyqigx3w295kh9zm0xx", - "depends": ["broom_helpers", "data_table", "dplyr", "forestploter", "glue", "parameters", "R6", "rlang", "survival"] + "depends": ["R6", "broom_helpers", "data_table", "dplyr", "forestploter", "glue", "parameters", "rlang", "survival"] }, "regr_easy": { "name": "regr.easy", @@ -101679,27 +102741,27 @@ }, "regressinator": { "name": "regressinator", - "version": "0.1.3", - "sha256": "103f940cy4xy0zs2j1jsx1kwwa5vy5j7975zl5qxaj1fn3a3jqcq", - "depends": ["broom", "cli", "dplyr", "ggplot2", "insight", "nullabor", "purrr", "rlang", "tibble", "tidyr", "tidyselect"] + "version": "0.2.0", + "sha256": "1wl8xsy0q1g9rv203yl9jkqxi2cwfb80zax43vs6zr1ibyb3vf2d", + "depends": ["DHARMa", "broom", "cli", "dplyr", "ggplot2", "insight", "nullabor", "purrr", "rlang", "tibble", "tidyr", "tidyselect"] }, "regressoR": { "name": "regressoR", "version": "3.0.2", "sha256": "0c7kxhkcy02vlb0fabf70bzkrk6l7rsvj7ppx3nxhjrhfp7p8j2m", - "depends": ["dplyr", "DT", "echarts4r", "glmnet", "golem", "htmltools", "loadeR", "pls", "rlang", "rpart_plot", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "traineR"] + "depends": ["DT", "dplyr", "echarts4r", "glmnet", "golem", "htmltools", "loadeR", "pls", "rlang", "rpart_plot", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "traineR"] }, "regrrr": { "name": "regrrr", "version": "0.1.3", "sha256": "1ih27mgqfzjlas97rvj18s8j3p0bpwb03vr71yrq776vzv1v6fcs", - "depends": ["dplyr", "ggplot2", "lspline", "magrittr", "MuMIn", "purrr", "robustbase", "scales", "stringr", "tidyr", "usdm"] + "depends": ["MuMIn", "dplyr", "ggplot2", "lspline", "magrittr", "purrr", "robustbase", "scales", "stringr", "tidyr", "usdm"] }, "regsem": { "name": "regsem", "version": "1.9.5", "sha256": "0lvsy7byrhiizyhwnwr22v8g36735nb0liyzl1nzk0py9rjbv4kk", - "depends": ["lavaan", "Rcpp", "RcppArmadillo", "Rsolnp"] + "depends": ["Rcpp", "RcppArmadillo", "Rsolnp", "lavaan"] }, "regspec": { "name": "regspec", @@ -101717,13 +102779,13 @@ "name": "regtomean", "version": "1.1", "sha256": "0xw0pany9cwfxdn26ckk6fdjnqx1916288mhphsnvwns3383nq4k", - "depends": ["effsize", "formattable", "mefa", "plotrix", "plyr", "sjlabelled", "sjmisc", "sjPlot"] + "depends": ["effsize", "formattable", "mefa", "plotrix", "plyr", "sjPlot", "sjlabelled", "sjmisc"] }, "regtools": { "name": "regtools", "version": "1.7.0", "sha256": "00g50dcfy93rgy9a2l24rsjgwk1575gxhpg9dy5r9928nwwd6lx9", - "depends": ["car", "data_table", "FNN", "glmnet", "gtools", "MASS", "mvtnorm", "polyreg", "R_utils", "rje", "sandwich", "text2vec"] + "depends": ["FNN", "MASS", "R_utils", "car", "data_table", "glmnet", "gtools", "mvtnorm", "polyreg", "rje", "sandwich", "text2vec"] }, "rehh": { "name": "rehh", @@ -101765,13 +102827,13 @@ "name": "relSim", "version": "1.0.0", "sha256": "1f2dz25hkh2ak7cypn3zj9rabj3z7d59q4yhrrq4f6mzdki80d15", - "depends": ["multicool", "Rcpp", "rvest", "stringr", "xml2", "xtable"] + "depends": ["Rcpp", "multicool", "rvest", "stringr", "xml2", "xtable"] }, "relaimpo": { "name": "relaimpo", "version": "2.2-7", "sha256": "1430p6kxh582k0saagns6mxz7qp6myf6n66hp1p02isl61w3w6sa", - "depends": ["boot", "corpcor", "MASS", "mitools", "survey"] + "depends": ["MASS", "boot", "corpcor", "mitools", "survey"] }, "relatable": { "name": "relatable", @@ -101831,7 +102893,7 @@ "name": "relliptical", "version": "1.3.0", "sha256": "1d978ig1k6drb4imz04j28l1xbb04vl8l5iirhmlm096i7bn3psx", - "depends": ["FuzzyNumbers_Ext_2", "matrixcalc", "Rcpp", "RcppArmadillo", "Rdpack", "Ryacas0"] + "depends": ["FuzzyNumbers_Ext_2", "Rcpp", "RcppArmadillo", "Rdpack", "Ryacas0", "matrixcalc"] }, "relsurv": { "name": "relsurv", @@ -101843,19 +102905,19 @@ "name": "rem", "version": "1.3.1", "sha256": "1q4p26irhhl1lvc0ydv9wmng1y635zm16szpl7gwq1kyn2p90rai", - "depends": ["doParallel", "foreach", "Rcpp"] + "depends": ["Rcpp", "doParallel", "foreach"] }, "rema": { "name": "rema", "version": "0.0.1", "sha256": "15b68pynac9ff9bina0mf94absvfsn21xcdmvd4lbl97pxwj83ph", - "depends": ["progress", "Rcpp", "Rdpack"] + "depends": ["Rcpp", "Rdpack", "progress"] }, "remaCor": { "name": "remaCor", "version": "0.0.18", "sha256": "0c8n2zj84m2z0vznx81qrspnyyj38imb73di4l2k0brr8jxgzr2p", - "depends": ["EnvStats", "ggplot2", "mvtnorm", "Rcpp", "RcppArmadillo", "Rdpack", "reshape2"] + "depends": ["EnvStats", "Rcpp", "RcppArmadillo", "Rdpack", "ggplot2", "mvtnorm", "reshape2"] }, "remap": { "name": "remap", @@ -101885,7 +102947,7 @@ "name": "remify", "version": "3.2.6", "sha256": "062bgggz4bkzm3ijpghsrlf9q813zmzisxdwgzlizpqhzppwvzig", - "depends": ["igraph", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "igraph"] }, "remindR": { "name": "remindR", @@ -101897,7 +102959,7 @@ "name": "remiod", "version": "1.0.2", "sha256": "1darwljspxm6mkkp0d7xx375kvhlfwpzxc93yr2mb0mwi2877yi9", - "depends": ["coda", "data_table", "doFuture", "foreach", "future", "ggplot2", "JointAI", "mathjaxr", "Matrix", "mcmcse", "ordinal", "progressr", "rjags", "survival"] + "depends": ["JointAI", "Matrix", "coda", "data_table", "doFuture", "foreach", "future", "ggplot2", "mathjaxr", "mcmcse", "ordinal", "progressr", "rjags", "survival"] }, "remmy": { "name": "remmy", @@ -101909,13 +102971,13 @@ "name": "remote", "version": "1.2.1", "sha256": "1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w", - "depends": ["gridExtra", "latticeExtra", "mapdata", "raster", "Rcpp", "scales"] + "depends": ["Rcpp", "gridExtra", "latticeExtra", "mapdata", "raster", "scales"] }, "remotePARTS": { "name": "remotePARTS", "version": "1.0.4", "sha256": "0rhbvqiixzzwkyicd1w75xvbchhillsdwllgrglsbn04b4hzqa73", - "depends": ["CompQuadForm", "doParallel", "foreach", "geosphere", "iterators", "Rcpp", "RcppEigen"] + "depends": ["CompQuadForm", "Rcpp", "RcppEigen", "doParallel", "foreach", "geosphere", "iterators"] }, "remotes": { "name": "remotes", @@ -101925,8 +102987,8 @@ }, "rempsyc": { "name": "rempsyc", - "version": "0.1.7", - "sha256": "1s4iv2ssz12pppjc9glhnryfkqnafid3fz9gmvhs9k5jk3cnq4pa", + "version": "0.1.8", + "sha256": "0y5b0cv6zpdg51jlxkhnyvpk55v4pd188y87q2rx1zkj82v6cdlh", "depends": ["dplyr", "rlang"] }, "remss": { @@ -101945,7 +103007,7 @@ "name": "remstimate", "version": "2.3.11", "sha256": "0sa1fxpy9cpfxkm9pkb7kq6qbkv9bvq900j2182yrsx4g02sxa41", - "depends": ["mvnfast", "Rcpp", "RcppArmadillo", "remify", "remstats", "trust"] + "depends": ["Rcpp", "RcppArmadillo", "mvnfast", "remify", "remstats", "trust"] }, "renpow": { "name": "renpow", @@ -101957,7 +103019,7 @@ "name": "rentrez", "version": "1.2.3", "sha256": "0x1g2f6hvkqqlb39z8m5qxhcvsizddic5i7rpqw0wy77xfbna9gv", - "depends": ["httr", "jsonlite", "XML"] + "depends": ["XML", "httr", "jsonlite"] }, "renv": { "name": "renv", @@ -101981,7 +103043,7 @@ "name": "repana", "version": "2.2.0", "sha256": "1iyxyq8fl7cbbw374xc32fsrxsl40306anvyia6fwjr5j5dy7v5g", - "depends": ["config", "DBI", "digest", "dplyr", "lubridate", "magrittr", "openxlsx", "pool", "processx", "readr", "rmarkdown", "rstudioapi", "yaml"] + "depends": ["DBI", "config", "digest", "dplyr", "lubridate", "magrittr", "openxlsx", "pool", "processx", "readr", "rmarkdown", "rstudioapi", "yaml"] }, "repeated": { "name": "repeated", @@ -102017,7 +103079,7 @@ "name": "replicateBE", "version": "1.1.3", "sha256": "079fkrp9jhp3qr5a1wvz66ldqxbj2pqarmxq5f1adqnyym2aw684", - "depends": ["lmerTest", "nlme", "pbkrtest", "PowerTOST", "readxl"] + "depends": ["PowerTOST", "lmerTest", "nlme", "pbkrtest", "readxl"] }, "replicatedpp2w": { "name": "replicatedpp2w", @@ -102029,7 +103091,7 @@ "name": "repmis", "version": "0.5", "sha256": "0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5", - "depends": ["data_table", "digest", "httr", "plyr", "R_cache"] + "depends": ["R_cache", "data_table", "digest", "httr", "plyr"] }, "repmod": { "name": "repmod", @@ -102057,8 +103119,8 @@ }, "report": { "name": "report", - "version": "0.5.8", - "sha256": "0frqqijhr98nqpy157capkx6h93z2jaxsl8r0vl9vk3k2g120wq1", + "version": "0.5.9", + "sha256": "075x4kzqjwrfqp2130ahcvj70vip9k000pg6z48y75ry58y80iyx", "depends": ["bayestestR", "datawizard", "effectsize", "insight", "parameters", "performance"] }, "reportROC": { @@ -102077,7 +103139,7 @@ "name": "reportRmd", "version": "0.1.0", "sha256": "0z0k6g0dxxni78x9z6h29ybgdj38cyb8ywn1b1lbjqb1nkjc9phs", - "depends": ["aod", "cmprsk", "cowplot", "geepack", "ggplot2", "ggpubr", "gridExtra", "kableExtra", "knitr", "lifecycle", "MASS", "pander", "plyr", "rlang", "rstatix", "scales", "survival"] + "depends": ["MASS", "aod", "cmprsk", "cowplot", "geepack", "ggplot2", "ggpubr", "gridExtra", "kableExtra", "knitr", "lifecycle", "pander", "plyr", "rlang", "rstatix", "scales", "survival"] }, "reporter": { "name": "reporter", @@ -102119,7 +103181,7 @@ "name": "representr", "version": "0.1.5", "sha256": "0w84kh9nsa8861yfhj13f29wcdfs1mrhjr6jyvxk55f34vj7fhf1", - "depends": ["doParallel", "dplyr", "foreach", "Rcpp"] + "depends": ["Rcpp", "doParallel", "dplyr", "foreach"] }, "represtools": { "name": "represtools", @@ -102129,15 +103191,15 @@ }, "reprex": { "name": "reprex", - "version": "2.1.0", - "sha256": "0ld90pkw2r7z115xdnyqk4p39vnxrc8jnn57sl4bkpg5frczw38a", + "version": "2.1.1", + "sha256": "174705043b90phm6aj5yb199pn1clipsnqgvhskhxybypj63cq68", "depends": ["callr", "cli", "clipr", "fs", "glue", "knitr", "lifecycle", "rlang", "rmarkdown", "rstudioapi", "withr"] }, "reproducer": { "name": "reproducer", "version": "0.5.3", "sha256": "0nm8x1bwigbvkz7bbr313fmxb9ypk6dw2yl9g1cppdws2c6rq1mr", - "depends": ["dplyr", "GetoptLong", "ggplot2", "gridExtra", "httr", "jsonlite", "lme4", "MASS", "metafor", "nortest", "openxlsx", "readr", "reshape", "stringr", "tibble", "tidyr", "xtable"] + "depends": ["GetoptLong", "MASS", "dplyr", "ggplot2", "gridExtra", "httr", "jsonlite", "lme4", "metafor", "nortest", "openxlsx", "readr", "reshape", "stringr", "tibble", "tidyr", "xtable"] }, "reproducible": { "name": "reproducible", @@ -102149,7 +103211,7 @@ "name": "reproj", "version": "0.7.0", "sha256": "1r2m8j75hmy61h7ld0ra1kpigr1ax6zap8kjxkgjkxcdlqznbbxj", - "depends": ["crsmeta", "PROJ", "proj4"] + "depends": ["PROJ", "crsmeta", "proj4"] }, "repsd": { "name": "repsd", @@ -102167,13 +103229,13 @@ "name": "reqres", "version": "0.2.5", "sha256": "1j8gxacbfnaqvrhjqy851yb8shc73issv08yca6mbnx6aq34wcrd", - "depends": ["assertthat", "brotli", "jsonlite", "R6", "stringi", "urltools", "webutils", "xml2"] + "depends": ["R6", "assertthat", "brotli", "jsonlite", "stringi", "urltools", "webutils", "xml2"] }, "request": { "name": "request", "version": "0.1.0", "sha256": "1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh", - "depends": ["curl", "httr", "jsonlite", "lazyeval", "magrittr", "R6", "whisker"] + "depends": ["R6", "curl", "httr", "jsonlite", "lazyeval", "magrittr", "whisker"] }, "requiRements": { "name": "requiRements", @@ -102201,8 +103263,8 @@ }, "rerddapXtracto": { "name": "rerddapXtracto", - "version": "1.2.0", - "sha256": "0vd2zm3zmcssfr5p392kqmp70dwa7dxsmgp5pwm9cg0hs66i975m", + "version": "1.2.1", + "sha256": "0bamid5820zxbr4byqbzvflvgcbagd8lyyr72hbnfns9ficnj7xc", "depends": ["abind", "dplyr", "ggplot2", "httr", "maps", "ncdf4", "parsedate", "plotdap", "readr", "rerddap", "sf", "sp"] }, "resample": { @@ -102233,7 +103295,7 @@ "name": "resemble", "version": "2.2.3", "sha256": "1m27y1wmig4d7gxmli1n8mbqid9sh6vij0aj7vi1wk4vnwxgnq6w", - "depends": ["data_table", "foreach", "iterators", "lifecycle", "magrittr", "mathjaxr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "foreach", "iterators", "lifecycle", "magrittr", "mathjaxr"] }, "reservoir": { "name": "reservoir", @@ -102249,9 +103311,9 @@ }, "reservr": { "name": "reservr", - "version": "0.0.2", - "sha256": "0w6bax0ycmix46mm5jmr49vl7l3rnvwg4vv6xq78hdczspdbc0g7", - "depends": ["assertthat", "BH", "generics", "glue", "keras", "matrixStats", "nloptr", "numDeriv", "purrr", "R6", "Rcpp", "RcppArmadillo", "RcppParallel", "rlang"] + "version": "0.0.3", + "sha256": "1p0jxjv5kc6ggxynvxs3ikrrkdn5nv68h0sk2bvnvdariqhn0cny", + "depends": ["BH", "R6", "Rcpp", "RcppArmadillo", "RcppParallel", "assertthat", "generics", "glue", "keras3", "matrixStats", "nloptr", "numDeriv", "purrr", "rlang"] }, "resevol": { "name": "resevol", @@ -102269,12 +103331,12 @@ "name": "reshape2", "version": "1.4.4", "sha256": "1n0jrajpvc8hjkh9z4g8bwq63qy5vy5cgl2pzjardyih4ngcz3fq", - "depends": ["plyr", "Rcpp", "stringr"] + "depends": ["Rcpp", "plyr", "stringr"] }, "resilience": { "name": "resilience", - "version": "2023.1.1", - "sha256": "0pa0c5l3jm5szn7vffg030krn7f9lz9riqvjz9n7waiszfs0mzdr", + "version": "2024.1.1", + "sha256": "0rzjj6bsi9dwis0k3zl329njcb6khr4a037k7i8s20v28qvs760c", "depends": ["doParallel", "foreach", "nptest"] }, "reslife": { @@ -102287,19 +103349,19 @@ "name": "reslr", "version": "0.1.1", "sha256": "0hklhkr0fxrhhi6apskq498z1vv1w90zsfvvc344rmj9qid2lj2a", - "depends": ["data_table", "dplyr", "fastDummies", "fields", "geosphere", "ggplot2", "magrittr", "ncdf4", "plyr", "posterior", "purrr", "R2jags", "stringr", "tidybayes", "tidyr"] + "depends": ["R2jags", "data_table", "dplyr", "fastDummies", "fields", "geosphere", "ggplot2", "magrittr", "ncdf4", "plyr", "posterior", "purrr", "stringr", "tidybayes", "tidyr"] }, "resmush": { "name": "resmush", - "version": "0.1.1", - "sha256": "1qmgkxnbdlb544vyzwcsinpdafgq07bligx05pilcz73kic4bwla", + "version": "0.2.0", + "sha256": "0d4mldxxgfypfm9p2b38iqr55j31vcyim018m7csqxplmvxrs45b", "depends": ["cli", "curl", "httr2"] }, "resourcer": { "name": "resourcer", "version": "1.4.0", "sha256": "0rffkz2ybvr58jpa3kfiw4s3rk0cmrm9r5ca2abbzlcny7kxb7v5", - "depends": ["httr", "R6"] + "depends": ["R6", "httr"] }, "respR": { "name": "respR", @@ -102309,8 +103371,8 @@ }, "respirometry": { "name": "respirometry", - "version": "1.5.0", - "sha256": "17sfg3c1y7yhyyvq7krii2vazyvnqf1l0ifcdqsr477wwlnwyynr", + "version": "2.0.0", + "sha256": "0z8600bwh8c7kg69qf4nab26sqbxs73h24dfwk2fiispxvs1c83k", "depends": ["birk", "dplyr", "lubridate", "marelac", "measurements", "minpack_lm", "plyr", "rlang", "seacarb", "segmented"] }, "responsePatterns": { @@ -102327,9 +103389,9 @@ }, "restatis": { "name": "restatis", - "version": "0.1.0", - "sha256": "0y36qdnadmcdmwik2iyjh8h47jchrbwpal8djy29hx7q1140ra2r", - "depends": ["askpass", "httr2", "memoise", "readr", "tibble", "vctrs"] + "version": "0.2.0", + "sha256": "0n55gn2srd6m4a62bv6c6dcnfxy4lb4zhk7i2ggg8vz9xhxxwhnd", + "depends": ["askpass", "httr2", "memoise", "purrr", "readr", "tibble", "vctrs"] }, "restaurant": { "name": "restaurant", @@ -102341,13 +103403,13 @@ "name": "restez", "version": "2.1.4", "sha256": "1jzffv1lsxwa2dvkqx48ldwffghkg91vz99d9l3kjdxmg9gb8y9k", - "depends": ["ape", "assertthat", "cli", "crayon", "curl", "DBI", "duckdb", "fs", "rentrez", "stringi"] + "depends": ["DBI", "ape", "assertthat", "cli", "crayon", "curl", "duckdb", "fs", "rentrez", "stringi"] }, "restfulr": { "name": "restfulr", "version": "0.0.15", "sha256": "14p6h0gjknqy5z2fprxw7waf4p0cd2qmp18s7qig4ylqn8gqzzs0", - "depends": ["RCurl", "rjson", "S4Vectors", "XML", "yaml"] + "depends": ["RCurl", "S4Vectors", "XML", "rjson", "yaml"] }, "restimizeapi": { "name": "restimizeapi", @@ -102363,9 +103425,9 @@ }, "restriktor": { "name": "restriktor", - "version": "0.5-60", - "sha256": "0ksb1jqrkvqjhxcfx4wc6f27p097228h5ck3682409lmj3amp11r", - "depends": ["boot", "ggplot2", "glue", "ic_infer", "lavaan", "MASS", "mvtnorm", "norm", "pbapply", "quadprog", "tmvtnorm"] + "version": "0.5-80", + "sha256": "1dpkwwkww19pr57rqx77g8q1b0chflyihgb4nsdkaizgc5mh5r04", + "depends": ["MASS", "boot", "ggplot2", "glue", "gridExtra", "ic_infer", "lavaan", "mvtnorm", "norm", "pbapply", "quadprog", "scales", "tmvtnorm"] }, "result": { "name": "result", @@ -102373,6 +103435,12 @@ "sha256": "031vviwvn85k7hl04c4hqxycj8mnr2j00gi2jqpwdxrxjaaf1dzb", "depends": [] }, + "resultant": { + "name": "resultant", + "version": "1.0.0", + "sha256": "0d9mql0cn48mx3id6gfi3lqgbn1vbx0dpp3lvfcd7x3n3j9wdw1x", + "depends": ["BH", "Rcpp", "RcppCGAL", "gmp", "qspray"] + }, "resumer": { "name": "resumer", "version": "0.0.5", @@ -102383,7 +103451,7 @@ "name": "retel", "version": "0.1.0", "sha256": "1rajv6y3zsk7hd9wr7szxi685rh377hhvj69rvg77fn0pk56g40b", - "depends": ["checkmate", "Matrix", "matrixcalc", "nloptr"] + "depends": ["Matrix", "checkmate", "matrixcalc", "nloptr"] }, "rethinker": { "name": "rethinker", @@ -102393,15 +103461,15 @@ }, "rethnicity": { "name": "rethnicity", - "version": "0.2.4", - "sha256": "1h8d9q06dc98l55lqmjxf69ngvdj6r9fcck1bdvk0rin40q07zfk", - "depends": ["cli", "Rcpp", "RcppEigen", "RcppThread"] + "version": "0.2.5", + "sha256": "0v2v2vajidw9nv1c9drglyyy4smxz740zx3kvl77pn9djf2im85v", + "depends": ["Rcpp", "RcppEigen", "RcppThread", "cli"] }, "reticulate": { "name": "reticulate", - "version": "1.37.0", - "sha256": "0zn7rjdfrjhbghngaiir3safidbwqk3hpw6ik227gbhmm3zlk1l9", - "depends": ["here", "jsonlite", "Matrix", "png", "rappdirs", "Rcpp", "RcppTOML", "rlang", "withr"] + "version": "1.38.0", + "sha256": "13favs31kzzff7ii0fxsdwvwb3iijasn2mg57ghcv8si4cz32byb", + "depends": ["Matrix", "Rcpp", "RcppTOML", "here", "jsonlite", "png", "rappdirs", "rlang", "withr"] }, "retriever": { "name": "retriever", @@ -102437,7 +103505,7 @@ "name": "reutils", "version": "0.2.3", "sha256": "09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7", - "depends": ["assertthat", "jsonlite", "RCurl", "tibble", "XML"] + "depends": ["RCurl", "XML", "assertthat", "jsonlite", "tibble"] }, "reval": { "name": "reval", @@ -102447,15 +103515,15 @@ }, "revdbayes": { "name": "revdbayes", - "version": "1.5.3", - "sha256": "1pcz09zbgpivzykag087b0f2fz82m48idasddn85yh8wpv6ijsah", - "depends": ["bayesplot", "exdex", "Rcpp", "RcppArmadillo", "rust"] + "version": "1.5.5", + "sha256": "1s8hnc2izd2117njidgw4jj5qpwgn28nmghg69i0dhbw6vb5mhk0", + "depends": ["Rcpp", "RcppArmadillo", "bayesplot", "exdex", "rust"] }, "revealedPrefs": { "name": "revealedPrefs", "version": "0.4.1", "sha256": "1m8y1mj39bnf9q0n9mi0ashvb79lksx5dfkxb04qj2h5kkyxg49g", - "depends": ["pso", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "pso"] }, "revealjs": { "name": "revealjs", @@ -102485,7 +103553,7 @@ "name": "revert", "version": "0.0.1", "sha256": "1x3ykqlyhy9z1rizp4y1p90mkl2wv56k87z2qcz69dznys34z5xy", - "depends": ["Biostrings", "BSgenome", "BSgenome_Hsapiens_UCSC_hg38", "GenomicRanges", "IRanges", "Rsamtools"] + "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg38", "Biostrings", "GenomicRanges", "IRanges", "Rsamtools"] }, "revgeo": { "name": "revgeo", @@ -102501,15 +103569,15 @@ }, "revss": { "name": "revss", - "version": "1.0.6", - "sha256": "0c7yh3fyzhb5fxdmdwc04n26alca3l8g34fca20af9sn93s3bvih", + "version": "2.0.0", + "sha256": "1m3bkgvbq7x8s89a26a6kah3f141rig306jwvcb3h35f7kp72cpg", "depends": [] }, "revtools": { "name": "revtools", "version": "0.4.1", "sha256": "0nms7rwpdzf3xq2incraxppha4c830gcygpbnhwjs92c836hh2f0", - "depends": ["ade4", "modeltools", "ngram", "plotly", "shiny", "shinydashboard", "slam", "SnowballC", "stringdist", "tm", "topicmodels", "viridisLite"] + "depends": ["SnowballC", "ade4", "modeltools", "ngram", "plotly", "shiny", "shinydashboard", "slam", "stringdist", "tm", "topicmodels", "viridisLite"] }, "revulyticsR": { "name": "revulyticsR", @@ -102521,7 +103589,7 @@ "name": "rewie", "version": "0.1.0", "sha256": "1ysrpd2cqmz27sjj3dh0wpg86685d708kjwiqybwjlw9ap55jb06", - "depends": ["lme4", "MASS", "plm", "rockchalk"] + "depends": ["MASS", "lme4", "plm", "rockchalk"] }, "rex": { "name": "rex", @@ -102561,8 +103629,8 @@ }, "rfacebookstat": { "name": "rfacebookstat", - "version": "2.10.0", - "sha256": "179wwpyzhli8h1skn7y3jjms3rigfrgxsv9v0n0npwr1g0r5sv8r", + "version": "2.11.0", + "sha256": "1xlj65pg87hhpc9cg9cz8xzg8f0dx4qcg76bvgpvdsd55pn8qilf", "depends": ["dplyr", "httr", "jsonlite", "pbapply", "purrr", "stringr", "tidyr", "tidyselect"] }, "rfacts": { @@ -102587,7 +103655,7 @@ "name": "rfigshare", "version": "0.3.8", "sha256": "10shwl1y9220m7ld5w9fjsjzy5yg8myrz9cz97ps9z2bw7bvka5j", - "depends": ["ggplot2", "httpuv", "httr", "RJSONIO", "XML", "yaml"] + "depends": ["RJSONIO", "XML", "ggplot2", "httpuv", "httr", "yaml"] }, "rfinterval": { "name": "rfinterval", @@ -102599,7 +103667,7 @@ "name": "rfishbase", "version": "4.1.2", "sha256": "1v0dzgzxl1p6ay60z0dfmi499hzywi5k4vdrf5ag4q6zvrk0vp8w", - "depends": ["contentid", "DBI", "dbplyr", "dplyr", "duckdb", "fs", "glue", "jsonlite", "magrittr", "memoise", "progress", "purrr", "readr", "rlang", "rstudioapi", "stringr", "tibble"] + "depends": ["DBI", "contentid", "dbplyr", "dplyr", "duckdb", "fs", "glue", "jsonlite", "magrittr", "memoise", "progress", "purrr", "readr", "rlang", "rstudioapi", "stringr", "tibble"] }, "rfishdraw": { "name": "rfishdraw", @@ -102629,7 +103697,7 @@ "name": "rflexscan", "version": "1.1.0", "sha256": "0jlswyfdmi4c8jd2m56inid08injjjmmjy3m3hmqspm6arv9flq1", - "depends": ["igraph", "Rcpp", "sf"] + "depends": ["Rcpp", "igraph", "sf"] }, "rflsgen": { "name": "rflsgen", @@ -102641,7 +103709,7 @@ "name": "rfm", "version": "0.3.0", "sha256": "0n0sbf9c3p0df0vdymyp6pbfvyf0nh90fxjxwkdg3l5hm8m26hkp", - "depends": ["dplyr", "ggplot2", "magrittr", "RColorBrewer", "rlang", "scales", "treemapify", "xplorerr"] + "depends": ["RColorBrewer", "dplyr", "ggplot2", "magrittr", "rlang", "scales", "treemapify", "xplorerr"] }, "rfoaas": { "name": "rfoaas", @@ -102689,19 +103757,19 @@ "name": "rgbif", "version": "3.8.0", "sha256": "1s1cdls4sv2ncxp8c9a2rah9yw95rlvfskzcg2bx74a282bd0p4b", - "depends": ["crul", "data_table", "ggplot2", "jsonlite", "lazyeval", "magrittr", "oai", "R6", "tibble", "whisker", "wk", "xml2"] + "depends": ["R6", "crul", "data_table", "ggplot2", "jsonlite", "lazyeval", "magrittr", "oai", "tibble", "whisker", "wk", "xml2"] }, "rgdax": { "name": "rgdax", "version": "1.2.1", "sha256": "01hpyyhb6jcw9w0q9h4ghgh4cbba27mfl9zdv4vv4ppakvl80czl", - "depends": ["digest", "httr", "jsonlite", "plyr", "RCurl"] + "depends": ["RCurl", "digest", "httr", "jsonlite", "plyr"] }, "rgee": { "name": "rgee", "version": "1.1.7", "sha256": "1v6xczz7n3gby7ckh323yr5jqvzsvpjy1qszqh9hk7a56m3y31mh", - "depends": ["cli", "crayon", "jsonlite", "leafem", "leaflet", "magrittr", "processx", "R6", "reticulate", "rstudioapi"] + "depends": ["R6", "cli", "crayon", "jsonlite", "leafem", "leaflet", "magrittr", "processx", "reticulate", "rstudioapi"] }, "rgeedim": { "name": "rgeedim", @@ -102737,13 +103805,13 @@ "name": "rgeoda", "version": "0.0.10-4", "sha256": "18rcrlah1iaqvf90cymh71c8wpgy3yxlwlq84waxilpccwhd68x0", - "depends": ["BH", "digest", "Rcpp", "sf"] + "depends": ["BH", "Rcpp", "digest", "sf"] }, "rgeomstats": { "name": "rgeomstats", "version": "0.0.1", "sha256": "1fy5fvkifv80sf3x0d2y3vyv7adn0h57q1hvip1phcvxg8p5prff", - "depends": ["cli", "purrr", "R6", "Rdpack", "reticulate", "rlang"] + "depends": ["R6", "Rdpack", "cli", "purrr", "reticulate", "rlang"] }, "rgeopat2": { "name": "rgeopat2", @@ -102753,21 +103821,21 @@ }, "rgexf": { "name": "rgexf", - "version": "0.16.2", - "sha256": "00c2zka1n3k7p1l0mlchr063s6x58p9r3fb64d4wgl4rvsq55q3f", - "depends": ["igraph", "servr", "XML"] + "version": "0.16.3", + "sha256": "1c1rqgr7qsj61gp2frm197k396xfdspvmmwr56izwb09225cbp6d", + "depends": ["XML", "igraph", "servr"] }, "rgho": { "name": "rgho", "version": "3.0.2", "sha256": "1j46pkb8n2hn1isz5xgfagwn77cxs48wv3rs4qqvq2nq1r5bpa4x", - "depends": ["curl", "dplyr", "httr", "lifecycle", "magrittr", "ODataQuery", "rlang", "tibble", "tidyr"] + "depends": ["ODataQuery", "curl", "dplyr", "httr", "lifecycle", "magrittr", "rlang", "tibble", "tidyr"] }, "rgl": { "name": "rgl", "version": "1.3.1", "sha256": "0jbda1b4lrkcpdld369687pm7isy69l5sx1wg2yrpvvzvmcppslz", - "depends": ["base64enc", "htmltools", "htmlwidgets", "jsonlite", "knitr", "magrittr", "mime", "R6"] + "depends": ["R6", "base64enc", "htmltools", "htmlwidgets", "jsonlite", "knitr", "magrittr", "mime"] }, "rgl_cry": { "name": "rgl.cry", @@ -102779,13 +103847,13 @@ "name": "rgl2gltf", "version": "1.0.3", "sha256": "0krn4dp8xf6z5363agz42v4dwhhxdrxpqzhmf9yd8xl2l3yj6pfp", - "depends": ["base64enc", "jsonlite", "R6", "rgl"] + "depends": ["R6", "base64enc", "jsonlite", "rgl"] }, "rglobi": { "name": "rglobi", "version": "0.3.4", "sha256": "14jwl1cl20q7sgsiidd2sd2p2vjjfvqam0bijg9j8328g27cbi63", - "depends": ["curl", "RCurl", "readr"] + "depends": ["RCurl", "curl", "readr"] }, "rglplus": { "name": "rglplus", @@ -102797,13 +103865,13 @@ "name": "rgm", "version": "1.0.4", "sha256": "0d6149mg0mvnp64dnn3nh9bxqcal324pjipnbqsmfslhk8sw8bwb", - "depends": ["BDgraph", "ggplot2", "huge", "MASS", "pROC", "Rcpp", "reshape2", "truncnorm"] + "depends": ["BDgraph", "MASS", "Rcpp", "ggplot2", "huge", "pROC", "reshape2", "truncnorm"] }, "rgnoisefilt": { "name": "rgnoisefilt", "version": "1.1.2", "sha256": "0rdjbxws1bimpnwfv46yycafvwjc2lcqgdf993f5mm2sg2fxv2da", - "depends": ["arules", "class", "e1071", "entropy", "FNN", "gbm", "ggplot2", "infotheo", "kknn", "modelr", "nnet", "randomForest", "rpart"] + "depends": ["FNN", "arules", "class", "e1071", "entropy", "gbm", "ggplot2", "infotheo", "kknn", "modelr", "nnet", "randomForest", "rpart"] }, "rgnparser": { "name": "rgnparser", @@ -102821,13 +103889,13 @@ "name": "rgoogleclassroom", "version": "0.9.1", "sha256": "0s4s5ipvnbwrf76ihzcjqkf3l1j008gn0ncl2a4znp9ka432gk49", - "depends": ["assertthat", "attempt", "curl", "dplyr", "httr", "jsonlite", "knitr", "lubridate", "magrittr", "openssl", "ottrpal", "purrr", "R6", "stringr"] + "depends": ["R6", "assertthat", "attempt", "curl", "dplyr", "httr", "jsonlite", "knitr", "lubridate", "magrittr", "openssl", "ottrpal", "purrr", "stringr"] }, "rgoogleslides": { "name": "rgoogleslides", "version": "0.3.2", "sha256": "0h9gws1vcf0zdd21d8b65c2yz9kxppp3218h5lhd5iz879ajwa2i", - "depends": ["assertthat", "httr", "jsonlite", "R6"] + "depends": ["R6", "assertthat", "httr", "jsonlite"] }, "rgplates": { "name": "rgplates", @@ -102843,8 +103911,8 @@ }, "rgrass": { "name": "rgrass", - "version": "0.4-2", - "sha256": "0b95b52yrpagjcfi8wxsg8cf5zfhrdlxzvppnb73815cj39wdfns", + "version": "0.4-3", + "sha256": "1zn549yas4j8m9qn3c0zsa0qfbc221v7q612rhb5rg45jw2bfy19", "depends": ["xml2"] }, "rgsp": { @@ -102897,8 +103965,8 @@ }, "rhino": { "name": "rhino", - "version": "1.8.0", - "sha256": "1vsf5bvbqdrvsd21z1ps1hxxmpkf39x2xk5wk45695pg9zq8dy19", + "version": "1.9.0", + "sha256": "0s7l23zmdskidqhc49j77qxi1nj321q5rgdayq91fdg1vcchrwvp", "depends": ["box", "box_linters", "cli", "config", "fs", "glue", "lintr", "logger", "purrr", "renv", "rstudioapi", "sass", "shiny", "styler", "testthat", "withr", "yaml"] }, "rhmc": { @@ -102941,7 +104009,7 @@ "name": "rhub", "version": "2.0.0", "sha256": "05q1jv7c2l09ssb72d17hhcisvzqmcd3d1njc1j6w8lhvc5kqs47", - "depends": ["callr", "cli", "curl", "desc", "gert", "gitcreds", "glue", "jsonlite", "pkgbuild", "processx", "R6", "rappdirs", "rematch", "rprojroot", "whoami"] + "depends": ["R6", "callr", "cli", "curl", "desc", "gert", "gitcreds", "glue", "jsonlite", "pkgbuild", "processx", "rappdirs", "rematch", "rprojroot", "whoami"] }, "rhymer": { "name": "rhymer", @@ -102965,7 +104033,7 @@ "name": "riAFTBART", "version": "0.3.3", "sha256": "0wcnw955zqmr7qqwwb3d37km6nkhwvhvaissv97fxkq9rwyz67ky", - "depends": ["BART", "cowplot", "dbarts", "doParallel", "dplyr", "foreach", "ggplot2", "magrittr", "MCMCpack", "msm", "nnet", "randomForest", "RRF", "stringr", "survival", "tidyr", "twang"] + "depends": ["BART", "MCMCpack", "RRF", "cowplot", "dbarts", "doParallel", "dplyr", "foreach", "ggplot2", "magrittr", "msm", "nnet", "randomForest", "stringr", "survival", "tidyr", "twang"] }, "rib": { "name": "rib", @@ -103007,7 +104075,7 @@ "name": "rid", "version": "0.0.1", "sha256": "1m213jxqhb95q7cj9nl1wj8ikzmpx3sn9xn9q1p7vhczp58yb578", - "depends": ["CircularSilhouette", "pracma", "purrr", "Rcpp", "RcppEigen"] + "depends": ["CircularSilhouette", "Rcpp", "RcppEigen", "pracma", "purrr"] }, "ridge": { "name": "ridge", @@ -103019,7 +104087,7 @@ "name": "ridgetorus", "version": "1.0.2", "sha256": "04wabvf7agyk8djfqn41zcsj33940vx32zzf6811h4n5bs14kp65", - "depends": ["circular", "Rcpp", "RcppArmadillo", "rootSolve", "sdetorus", "sphunif"] + "depends": ["Rcpp", "RcppArmadillo", "circular", "rootSolve", "sdetorus", "sphunif"] }, "ridgregextra": { "name": "ridgregextra", @@ -103041,8 +104109,8 @@ }, "riem": { "name": "riem", - "version": "0.3.1", - "sha256": "04j9g0g3wgwm0qikad35vi0jb55n7bna12gq5jgy1kkc26l1srgw", + "version": "0.3.2", + "sha256": "0cvgddp7k7905k7cfz12cz48iv8ygli2n2nk1jyaxjxqvghv5zql", "depends": ["cli", "httr2", "jsonlite", "lubridate", "magrittr", "purrr", "rlang", "tibble"] }, "rifle": { @@ -103055,7 +104123,7 @@ "name": "rifreg", "version": "0.1.0", "sha256": "053hlvx3yibiadzwjsv55qvysc0bkznzqk61rjwb23lyxvjbb3rq", - "depends": ["Formula", "ggplot2", "Hmisc", "pbapply", "sandwich"] + "depends": ["Formula", "Hmisc", "ggplot2", "pbapply", "sandwich"] }, "rigr": { "name": "rigr", @@ -103073,13 +104141,13 @@ "name": "rim", "version": "0.6.4", "sha256": "0i4xb56kj4w9hd5i4g42y1ml6yy3p94lsmfm5mlkwixg8f25hhwj", - "depends": ["GlobalOptions", "knitr", "R6", "Rcpp"] + "depends": ["GlobalOptions", "R6", "Rcpp", "knitr"] }, "rimu": { "name": "rimu", "version": "0.6", "sha256": "0233dxj6z87piz88v15yg7gby0vm44mqhf76944lr8z17w2rrf8m", - "depends": ["ggplot2", "UpSetR"] + "depends": ["UpSetR", "ggplot2"] }, "rinat": { "name": "rinat", @@ -103125,9 +104193,9 @@ }, "rio": { "name": "rio", - "version": "1.1.1", - "sha256": "0llvdd4vdxpvjvbya3b6kh04h0k48ijy4dkjl77ynvhlh9wyzw9y", - "depends": ["curl", "data_table", "foreign", "haven", "lifecycle", "R_utils", "readr", "readxl", "tibble", "writexl"] + "version": "1.2.1", + "sha256": "0iqfgic57qzbgqqxgfrccxwi05zknlgr5v929qqmb4mxx3569fmw", + "depends": ["R_utils", "curl", "data_table", "foreign", "haven", "lifecycle", "readr", "readxl", "tibble", "writexl"] }, "rioja": { "name": "rioja", @@ -103143,8 +104211,8 @@ }, "ripc": { "name": "ripc", - "version": "0.3.0", - "sha256": "1a89qg6q6ysvaggf50qdrpcfcjk6zrv133g93p9pq35d2ldava55", + "version": "0.3.1", + "sha256": "0pb19jx682xabfymyc97hnw4w5im285gkjmsa6pa5y5gd4gc8ikb", "depends": ["countrycode", "dplyr", "httr", "jsonlite", "lifecycle", "lubridate", "purrr", "readr", "rlang", "sf", "stringr", "tidyr"] }, "ripserr": { @@ -103169,25 +104237,25 @@ "name": "riskCommunicator", "version": "1.0.1", "sha256": "07rfqaf5dpj0wgbz65kdxzl762w8k5a2fsfmg1g895y2i5npq6mz", - "depends": ["boot", "dplyr", "ggplot2", "ggpubr", "magrittr", "MASS", "purrr", "rlang", "tidyr", "tidyselect"] + "depends": ["MASS", "boot", "dplyr", "ggplot2", "ggpubr", "magrittr", "purrr", "rlang", "tidyr", "tidyselect"] }, "riskParityPortfolio": { "name": "riskParityPortfolio", "version": "0.2.2", "sha256": "1n2z1vhslrip209j79wm03wmwqdcnbm939sir2wfs5h2cfv126xk", - "depends": ["alabama", "Matrix", "nloptr", "quadprog", "Rcpp", "RcppEigen"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "alabama", "nloptr", "quadprog"] }, "riskPredictClustData": { "name": "riskPredictClustData", "version": "0.2.6", "sha256": "0mvy9299pg374gvvqs9lmj2j0f3bzyy279kjpz7jq35hkgz5wif3", - "depends": ["gee", "Hmisc", "MASS", "mvtnorm"] + "depends": ["Hmisc", "MASS", "gee", "mvtnorm"] }, "riskRegression": { "name": "riskRegression", "version": "2023.12.21", "sha256": "07cvj86v2k1i34yrsqcgl2wqxlbbmslbbilvcnvkwfsk9l6ajk5c", - "depends": ["cmprsk", "data_table", "doParallel", "foreach", "ggplot2", "lattice", "lava", "mets", "mvtnorm", "plotrix", "prodlim", "Publish", "ranger", "Rcpp", "RcppArmadillo", "rms", "survival", "timereg"] + "depends": ["Publish", "Rcpp", "RcppArmadillo", "cmprsk", "data_table", "doParallel", "foreach", "ggplot2", "lattice", "lava", "mets", "mvtnorm", "plotrix", "prodlim", "ranger", "rms", "survival", "timereg"] }, "riskSimul": { "name": "riskSimul", @@ -103205,7 +104273,7 @@ "name": "riskmetric", "version": "0.2.4", "sha256": "00zc0jnnkx8z4mgr4h7w1xh8id4bai5l8jvh10xhylsvc1gy4ysg", - "depends": ["backports", "BiocManager", "covr", "cranlogs", "curl", "devtools", "httr", "memoise", "pillar", "pkgload", "tibble", "urltools", "vctrs", "xml2"] + "depends": ["BiocManager", "backports", "covr", "cranlogs", "curl", "devtools", "httr", "memoise", "pillar", "pkgload", "tibble", "urltools", "vctrs", "xml2"] }, "risks": { "name": "risks", @@ -103247,7 +104315,7 @@ "name": "riverconn", "version": "0.3.31", "sha256": "094w6mkndpvwldmlak2z1dm7n093n3s81mnz4x9dac6mrdl63s19", - "depends": ["dodgr", "doParallel", "dplyr", "foreach", "igraph", "magrittr", "reshape2", "rlang", "tidyr", "tidyselect"] + "depends": ["doParallel", "dodgr", "dplyr", "foreach", "igraph", "magrittr", "reshape2", "rlang", "tidyr", "tidyselect"] }, "riverdist": { "name": "riverdist", @@ -103265,7 +104333,7 @@ "name": "rivnet", "version": "0.4.2", "sha256": "1mzhxf3xirblbrz13w29970ja9ldhsfjk2pszj86z39dyby17dj0", - "depends": ["curl", "elevatr", "fields", "OCNet", "raster", "Rcpp", "sf", "spam", "terra", "traudem"] + "depends": ["OCNet", "Rcpp", "curl", "elevatr", "fields", "raster", "sf", "spam", "terra", "traudem"] }, "rivr": { "name": "rivr", @@ -103289,19 +104357,19 @@ "name": "rjdmarkdown", "version": "0.2.2", "sha256": "1g1r11zi8agifndlnayrh1vbz570s2x535kn89yz1llrk378v9c5", - "depends": ["kableExtra", "knitr", "magrittr", "RJDemetra"] + "depends": ["RJDemetra", "kableExtra", "knitr", "magrittr"] }, "rjdqa": { "name": "rjdqa", "version": "0.1.5", "sha256": "0m3r5ficsj1hlp72imb1v2fbl2kvh9gni2rkff66wag805v0sjxp", - "depends": ["ggdemetra", "plotrix", "RJDemetra"] + "depends": ["RJDemetra", "ggdemetra", "plotrix"] }, "rjdworkspace": { "name": "rjdworkspace", "version": "1.1.7", "sha256": "19knl5qynwa3f2f77fkxv0fg13hqcdrkh5rwrpzd3gv71iifzc8r", - "depends": ["rJava", "RJDemetra", "XML"] + "depends": ["RJDemetra", "XML", "rJava"] }, "rje": { "name": "rje", @@ -103329,9 +104397,9 @@ }, "rjsoncons": { "name": "rjsoncons", - "version": "1.3.0", - "sha256": "09dxvw64kri4dx5hn399r0w50zvi13sk9fzyijy45a7m5366wq0w", - "depends": ["cli", "cpp11"] + "version": "1.3.1", + "sha256": "1icp56jimfsjjniq1sg45g89xfq56x8728dkp0c2pv7snjpxjcjl", + "depends": ["cli", "cpp11", "tibble"] }, "rjstat": { "name": "rjstat", @@ -103355,7 +104423,13 @@ "name": "rkafkajars", "version": "1.2", "sha256": "1z1rn02ymzaq3v3pz206wlm78y591xa9780fwf77i4vfq2k9pxrz", - "depends": ["rJava", "RUnit"] + "depends": ["RUnit", "rJava"] + }, + "rkriging": { + "name": "rkriging", + "version": "1.0.1", + "sha256": "05hi1b2qlsc93iq4rhczrimc9pqnfmssmxmsa0fcgqwvpn0l934q", + "depends": ["BH", "Rcpp", "RcppEigen", "nloptr"] }, "rkt": { "name": "rkt", @@ -103383,15 +104457,15 @@ }, "rlas": { "name": "rlas", - "version": "1.7.0", - "sha256": "0abbzh17cyiamgdln55b23nsywr3p60bk7n3wv70asg945pqnxhi", - "depends": ["BH", "data_table", "Rcpp"] + "version": "1.8.0", + "sha256": "0fqlg2hqyxvv7lfrqy8qjf1vbxwf5irsw70h7qqw1n5wrv7h6yfw", + "depends": ["Rcpp", "data_table"] }, "rlc": { "name": "rlc", "version": "0.5.0", "sha256": "1n13hlspsb118md6nh1w09gww4b58kxqf3lcp8g3zv14hr2dgwkr", - "depends": ["hwriter", "jrc", "jsonlite", "plyr", "R6", "stringr"] + "depends": ["R6", "hwriter", "jrc", "jsonlite", "plyr", "stringr"] }, "rlcv": { "name": "rlcv", @@ -103433,7 +104507,7 @@ "name": "rlfsm", "version": "1.1.2", "sha256": "0qlyz4v1966x73hx3lwv1kgk18304xfp9qm66cb9a6g8bk54xp8z", - "depends": ["doParallel", "foreach", "ggplot2", "plyr", "Rcpp", "Rdpack", "reshape2", "stabledist"] + "depends": ["Rcpp", "Rdpack", "doParallel", "foreach", "ggplot2", "plyr", "reshape2", "stabledist"] }, "rlibkriging": { "name": "rlibkriging", @@ -103445,7 +104519,7 @@ "name": "rliger", "version": "2.0.1", "sha256": "1903jylhv6pb87p4zywx8b5aqvf3c96lpx479r1c58lbc0i3f5p1", - "depends": ["circlize", "cli", "ComplexHeatmap", "cowplot", "dplyr", "ggplot2", "hdf5r", "leidenAlg", "lifecycle", "magrittr", "Matrix", "RANN", "RColorBrewer", "Rcpp", "RcppArmadillo", "RcppProgress", "rlang", "Rtsne", "S4Vectors", "scales", "uwot", "viridis"] + "depends": ["ComplexHeatmap", "Matrix", "RANN", "RColorBrewer", "Rcpp", "RcppArmadillo", "RcppProgress", "Rtsne", "S4Vectors", "circlize", "cli", "cowplot", "dplyr", "ggplot2", "hdf5r", "leidenAlg", "lifecycle", "magrittr", "rlang", "scales", "uwot", "viridis"] }, "rlinkedinads": { "name": "rlinkedinads", @@ -103457,12 +104531,12 @@ "name": "rlist", "version": "0.4.6.2", "sha256": "15q99rhbbjq8zd976yjmfnny45dd5fg2p2dv1sljg2kwi66nbppb", - "depends": ["data_table", "jsonlite", "XML", "yaml"] + "depends": ["XML", "data_table", "jsonlite", "yaml"] }, "rlistings": { "name": "rlistings", - "version": "0.2.8", - "sha256": "1x0i2gis01ik9r0fy2znzlg0chgcjablk74xncsj7cgpgvdzfwmi", + "version": "0.2.9", + "sha256": "09rgmjh88lp27bfw7rm0xbfw4f1m73hmjcz7f33lvvkbrydc4h91", "depends": ["checkmate", "formatters", "tibble"] }, "rllama": { @@ -103481,7 +104555,7 @@ "name": "rlme", "version": "0.5", "sha256": "0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif", - "depends": ["magic", "MASS", "mgcv", "nlme", "quantreg", "Rcpp", "robustbase", "stringr"] + "depends": ["MASS", "Rcpp", "magic", "mgcv", "nlme", "quantreg", "robustbase", "stringr"] }, "rlog": { "name": "rlog", @@ -103493,13 +104567,13 @@ "name": "rly", "version": "1.7.4", "sha256": "044rpc1gs1jhm2hlmdmwinf24qvh2d0d6kg55zicmwdcdf8gnn8z", - "depends": ["futile_logger", "R6"] + "depends": ["R6", "futile_logger"] }, "rmBayes": { "name": "rmBayes", "version": "0.1.16", "sha256": "1a32xghqphnyx8w8dy6970f5d30m5ghjgwxa5g7qbzw3fc0b7ic3", - "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools"] }, "rma_exact": { "name": "rma.exact", @@ -103507,6 +104581,12 @@ "sha256": "1igs92la79akyqj84ah23lpcay7i33k7zgzcwm7sii782fhirivx", "depends": ["abind", "metafor"] }, + "rmacrostrat": { + "name": "rmacrostrat", + "version": "0.0.1", + "sha256": "1db884smxz6vymvm7ihm63gvwiv8hpragk0cmjzpfw6qrl76sn40", + "depends": ["curl", "geojsonsf", "httr", "jsonlite", "sf"] + }, "rmake": { "name": "rmake", "version": "1.1.0", @@ -103517,13 +104597,13 @@ "name": "rmapshaper", "version": "0.5.0", "sha256": "01c1sd02ws3k2dmlj964c4j5jg93x192s3brhmaw4pi4qfjzc21x", - "depends": ["geojsonsf", "jsonify", "readr", "sf", "sp", "V8"] + "depends": ["V8", "geojsonsf", "jsonify", "readr", "sf", "sp"] }, "rmapzen": { "name": "rmapzen", "version": "0.5.1", "sha256": "17nphlsck1fjkhfjbwdxzyxxn23z626wy49gpkf2jvan4lg7bb84", - "depends": ["assertthat", "digest", "dplyr", "geojsonio", "httr", "ISOcodes", "jsonlite", "purrr", "sf", "tibble", "tidyr"] + "depends": ["ISOcodes", "assertthat", "digest", "dplyr", "geojsonio", "httr", "jsonlite", "purrr", "sf", "tibble", "tidyr"] }, "rmarchingcubes": { "name": "rmarchingcubes", @@ -103539,8 +104619,8 @@ }, "rmarkdown": { "name": "rmarkdown", - "version": "2.27", - "sha256": "17rba2k1n945i56am345v9zfgdwm4rjmhcwdm7z8g1agmczcpsb1", + "version": "2.28", + "sha256": "11d0fpzcwgi84dfbvjpg33gn155g3m2pa1jsih1h6hidm41sa0m1", "depends": ["bslib", "evaluate", "fontawesome", "htmltools", "jquerylib", "jsonlite", "knitr", "tinytex", "xfun", "yaml"] }, "rmass2": { @@ -103559,25 +104639,25 @@ "name": "rmcfs", "version": "1.3.5", "sha256": "0rbq2b9fw1x44v7ifxp8qgp4yciinw2sw9mqp4ms5jsxznpi2pi6", - "depends": ["data_table", "dplyr", "ggplot2", "gridExtra", "igraph", "reshape2", "rJava", "stringi", "yaml"] + "depends": ["data_table", "dplyr", "ggplot2", "gridExtra", "igraph", "rJava", "reshape2", "stringi", "yaml"] }, "rmcorr": { "name": "rmcorr", - "version": "0.6.0", - "sha256": "0p3vqhqyh4lrnlj05bdqxza2dl08nmfadsl0dg67vbr3rjzfh62k", - "depends": ["psych", "RColorBrewer"] + "version": "0.7.0", + "sha256": "03i460ccajvy2swb86mcygs2wxjiyw0k9vx6vc4gqvh0l772ciha", + "depends": ["RColorBrewer", "psych"] }, "rmdHelpers": { "name": "rmdHelpers", - "version": "1.2", - "sha256": "1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r", + "version": "1.3.1", + "sha256": "0bmdq6s8ywakz3gxskm6ph2gc80yzrjnzns4q09n05hy6l034058", "depends": ["dplyr", "knitr"] }, "rmda": { "name": "rmda", "version": "1.6", "sha256": "1m7j79jwii9la47w34ka3yl1n7nql8pfn32if0aycn4yw5sy8dmc", - "depends": ["caret", "MASS", "pander", "reshape"] + "depends": ["MASS", "caret", "pander", "reshape"] }, "rmdfiltr": { "name": "rmdfiltr", @@ -103637,13 +104717,13 @@ "name": "rmfanova", "version": "0.1.0", "sha256": "1wm849b2s1s691ln9vycww0ai5002y7y92a2vkrg7g50rgqg21qa", - "depends": ["doParallel", "foreach", "MASS", "refund"] + "depends": ["MASS", "doParallel", "foreach", "refund"] }, "rmgarch": { "name": "rmgarch", "version": "1.3-9", "sha256": "0sg10j4jp74s65lzs2da2qqdcwgkf71rss9p7f1b14n2yz7xdf1v", - "depends": ["Bessel", "corpcor", "ff", "MASS", "Matrix", "pcaPP", "Rcpp", "RcppArmadillo", "Rsolnp", "rugarch", "shape", "spd", "xts", "zoo"] + "depends": ["Bessel", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "Rsolnp", "corpcor", "ff", "pcaPP", "rugarch", "shape", "spd", "xts", "zoo"] }, "rmi": { "name": "rmi", @@ -103655,13 +104735,13 @@ "name": "rminer", "version": "1.4.6", "sha256": "1xydc43is756cy4vsm4k4micj88hhqgyrhb8cmvgv1y8zfrzg2qz", - "depends": ["adabag", "Cubist", "e1071", "glmnet", "kernlab", "kknn", "lattice", "MASS", "mda", "nnet", "party", "plotrix", "pls", "randomForest", "rpart", "xgboost"] + "depends": ["Cubist", "MASS", "adabag", "e1071", "glmnet", "kernlab", "kknn", "lattice", "mda", "nnet", "party", "plotrix", "pls", "randomForest", "rpart", "xgboost"] }, "rminizinc": { "name": "rminizinc", "version": "0.0.8", "sha256": "0yyg8ikdlksxlsc8ms4gb8dvpdjk26np6cpm5a7rjp748x8is6qx", - "depends": ["checkmate", "R6", "Rcpp", "rjson", "rlang", "rlist"] + "depends": ["R6", "Rcpp", "checkmate", "rjson", "rlang", "rlist"] }, "rminqa": { "name": "rminqa", @@ -103691,19 +104771,19 @@ "name": "rmpw", "version": "0.0.5", "sha256": "150wvnzhwvi8vv76glrbqns1r09cx42fxjrpfvvkdjd5vsbhmibv", - "depends": ["gtools", "MASS"] + "depends": ["MASS", "gtools"] }, "rms": { "name": "rms", "version": "6.8-1", "sha256": "0sjr4lwvh05ji8s6jk2f4imnyzsaw8f1iqds8b1661s395bm8f4x", - "depends": ["cluster", "colorspace", "digest", "ggplot2", "Hmisc", "htmlTable", "htmltools", "knitr", "MASS", "multcomp", "nlme", "polspline", "quantreg", "rpart", "SparseM", "survival"] + "depends": ["Hmisc", "MASS", "SparseM", "cluster", "colorspace", "digest", "ggplot2", "htmlTable", "htmltools", "knitr", "multcomp", "nlme", "polspline", "quantreg", "rpart", "survival"] }, "rmsb": { "name": "rmsb", - "version": "1.1-0", - "sha256": "1pwx9y1jppy7fvm7wr5gnxmjrcfzc1x9n5p2ybc5xisz1ymb2fdn", - "depends": ["BH", "cluster", "digest", "ggplot2", "Hmisc", "knitr", "loo", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "rms", "rstan", "StanHeaders", "survival"] + "version": "1.1-1", + "sha256": "1f33wv5bjqp59r4sdz8c3ckxhv4xz3clnsswpqxx6zagm7v572vp", + "depends": ["BH", "Hmisc", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cluster", "digest", "ggplot2", "knitr", "loo", "rms", "rstan", "survival"] }, "rmsfact": { "name": "rmsfact", @@ -103715,7 +104795,13 @@ "name": "rmsfuns", "version": "1.0.0.1", "sha256": "18bpj7xh3kc7pl6ivi3cripam26bsaf9r9099cjf22qndvy18hb6", - "depends": ["dplyr", "magrittr", "PerformanceAnalytics", "purrr", "readr", "tbl2xts", "xts", "zoo"] + "depends": ["PerformanceAnalytics", "dplyr", "magrittr", "purrr", "readr", "tbl2xts", "xts", "zoo"] + }, + "rmstBayespara": { + "name": "rmstBayespara", + "version": "0.1.0", + "sha256": "0qggmlf6li4sibb0lzzymm80242qnbivpiwd5yh35mcrwy820qsq", + "depends": ["brms", "crayon", "loo", "rstan", "zipfR"] }, "rmstcompsens": { "name": "rmstcompsens", @@ -103757,7 +104843,13 @@ "name": "rmzqc", "version": "0.5.4", "sha256": "18nyw4amg8l8hby3fpfbafz730g0bsk4xp31fgfhlv2qzcbm07aw", - "depends": ["jsonlite", "jsonvalidate", "knitr", "ontologyIndex", "R6", "R6P", "rmarkdown", "testthat"] + "depends": ["R6", "R6P", "jsonlite", "jsonvalidate", "knitr", "ontologyIndex", "rmarkdown", "testthat"] + }, + "rnaCrosslinkOO": { + "name": "rnaCrosslinkOO", + "version": "0.1.4", + "sha256": "06vv10hnq48mjp3kyjvzabjdgksa8xfjsh05nnbdrxm3c3ylv7id", + "depends": ["ClassDiscovery", "GenomicRanges", "IRanges", "MASS", "R4RNA", "RColorBrewer", "RRNA", "S4Vectors", "TopDom", "doParallel", "foreach", "ggplot2", "ggrepel", "heatmap3", "igraph", "mixtools", "patchwork", "reshape2", "seqinr", "tidyverse"] }, "rnames": { "name": "rnames", @@ -103793,7 +104885,7 @@ "name": "rncl", "version": "0.8.7", "sha256": "0flrqz7pansy11ds23qv06bcmh6vxqljq0517v6292ibbx7nx1qx", - "depends": ["progress", "Rcpp"] + "depends": ["Rcpp", "progress"] }, "rneos": { "name": "rneos", @@ -103829,7 +104921,7 @@ "name": "rnmamod", "version": "0.4.0", "sha256": "0gwx4mwrirricbfwlsfq9ckbn34w8dwy3d0c532s50vcwpd3dm1g", - "depends": ["cluster", "dendextend", "fdrtool", "gemtc", "ggfittext", "ggplot2", "ggpubr", "ggrepel", "heatmaply", "igraph", "knitr", "MASS", "mcmcplots", "R2jags", "reshape2", "scales", "stringr", "writexl"] + "depends": ["MASS", "R2jags", "cluster", "dendextend", "fdrtool", "gemtc", "ggfittext", "ggplot2", "ggpubr", "ggrepel", "heatmaply", "igraph", "knitr", "mcmcplots", "reshape2", "scales", "stringr", "writexl"] }, "rnn": { "name": "rnn", @@ -103841,13 +104933,13 @@ "name": "rnndescent", "version": "0.1.6", "sha256": "1qgmy4sqs14zbv1mm6cany6xxk0hsaaiblsd4am85qj8gbjflm3f", - "depends": ["BH", "dqrng", "Matrix", "Rcpp", "sitmo"] + "depends": ["BH", "Matrix", "Rcpp", "dqrng", "sitmo"] }, "rnpn": { "name": "rnpn", "version": "1.2.8.0", "sha256": "1svamnpfs76551cil1grch4nr6716j2qncdq7nqzp3ni5ia8522w", - "depends": ["curl", "data_table", "httr", "jsonlite", "magrittr", "plyr", "raster", "sp", "tibble", "XML"] + "depends": ["XML", "curl", "data_table", "httr", "jsonlite", "magrittr", "plyr", "raster", "sp", "tibble"] }, "rnr": { "name": "rnr", @@ -103857,8 +104949,8 @@ }, "rnrfa": { "name": "rnrfa", - "version": "2.1.0.5", - "sha256": "1fqfcj4z05p6lxc9708pbal7fkwhdqrm4c2cx2jb76s09rc840ci", + "version": "2.1.0.6", + "sha256": "0j3cl8sg2srqp2j3aaymq6m9yf7xr21np53ckjxa9dyv4kw11371", "depends": ["curl", "ggmap", "ggplot2", "httr", "jsonlite", "lubridate", "sf", "tibble", "zoo"] }, "roadoi": { @@ -103869,8 +104961,8 @@ }, "roads": { "name": "roads", - "version": "1.1.1", - "sha256": "0n0azkvpgiw0d649y7608izy9vp96vfbj27nr3vl6pi481w7ajcz", + "version": "1.2.0", + "sha256": "1hpa74mqihf90nv2q1bcmkc2xq0ay5i2jl4vq484nxgaicms69ws", "depends": ["data_table", "dplyr", "igraph", "rlang", "sf", "terra", "tidyselect", "units"] }, "roahd": { @@ -103883,19 +104975,19 @@ "name": "robCompositions", "version": "2.4.1", "sha256": "1kln6b95hjx3cyr9957ga7a5p6lnafn49q3pnb7vlvcw3p0zyhrf", - "depends": ["cluster", "cvTools", "data_table", "dplyr", "e1071", "fda", "fpc", "GGally", "ggfortify", "ggplot2", "kernlab", "magrittr", "MASS", "mclust", "pls", "Rcpp", "RcppEigen", "reshape2", "robustbase", "robustHD", "rrcov", "tidyr", "VIM", "zCompositions"] + "depends": ["GGally", "MASS", "Rcpp", "RcppEigen", "VIM", "cluster", "cvTools", "data_table", "dplyr", "e1071", "fda", "fpc", "ggfortify", "ggplot2", "kernlab", "magrittr", "mclust", "pls", "reshape2", "robustHD", "robustbase", "rrcov", "tidyr", "zCompositions"] }, "robStepSplitReg": { "name": "robStepSplitReg", "version": "1.1.0", "sha256": "04azi5pk8jpq5lcssbax8jyf1lb0g8grmxpj56kaifzp764y66wn", - "depends": ["cellWise", "glmnet", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "cellWise", "glmnet"] }, "robber": { "name": "robber", "version": "0.2.4", "sha256": "0db1cnf8f3f1i0mnp58cjq46cr0x6ffx6yzqnsdg6v7mwppdranb", - "depends": ["blockmodels", "ggplot2", "GREMLINS", "igraph", "magrittr", "pammtools", "partitions", "purrr"] + "depends": ["GREMLINS", "blockmodels", "ggplot2", "igraph", "magrittr", "pammtools", "partitions", "purrr"] }, "robcor": { "name": "robcor", @@ -103907,25 +104999,25 @@ "name": "roben", "version": "0.1.1", "sha256": "0ak3l17wmw2z0rgaymqczv40z8kqaflzzjj0fbdfcnskdik2ynfq", - "depends": ["glmnet", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "glmnet"] }, "robfilter": { "name": "robfilter", - "version": "4.1.4", - "sha256": "10wrfd2ii99vscnajjrd48msn4ka75pn7h9yhgclilc9l9r0q1wn", - "depends": ["lattice", "MASS", "robustbase"] + "version": "4.1.5", + "sha256": "18yqrwl60srr6r3hg6qcv8li91qz83xksvs383zs5bxa5y400azj", + "depends": ["MASS", "lattice", "robustbase"] }, "robflreg": { "name": "robflreg", "version": "1.2", "sha256": "1zhc2m8j4yzd5z54jx2lqks1bvvf4w0w3i7hr4hd46k8i3iy2cj2", - "depends": ["expm", "fda", "fda_usc", "fields", "goffda", "MASS", "mvtnorm", "pcaPP", "robustbase"] + "depends": ["MASS", "expm", "fda", "fda_usc", "fields", "goffda", "mvtnorm", "pcaPP", "robustbase"] }, "robin": { "name": "robin", - "version": "1.1.2", - "sha256": "1xzcq81a08mpj7nx11z8vq0g1w8jq2257glvm5jgzz9z4spcc0xz", - "depends": ["DescTools", "fdatest", "ggplot2", "gridExtra", "igraph", "Matrix", "networkD3", "qpdf", "spam"] + "version": "1.2.0", + "sha256": "0d61gibxs2cx6k8l4j0g8vcrprpa4m4242r9qcq5p3slr4hwrk2q", + "depends": ["BiocParallel", "DescTools", "Matrix", "fdatest", "ggplot2", "gridExtra", "igraph", "networkD3", "perturbR", "qpdf", "spam"] }, "robis": { "name": "robis", @@ -103949,13 +105041,13 @@ "name": "robmixglm", "version": "1.2-3", "sha256": "18xcbxj3jl9w5i74vy5i2ha7zsln4sgh8anv9n7haa7zilflvrx3", - "depends": ["actuar", "bbmle", "boot", "doParallel", "doRNG", "fastGHQuad", "foreach", "MASS", "numDeriv", "Rcpp", "VGAM"] + "depends": ["MASS", "Rcpp", "VGAM", "actuar", "bbmle", "boot", "doParallel", "doRNG", "fastGHQuad", "foreach", "numDeriv"] }, "robnptests": { "name": "robnptests", "version": "1.1.0", "sha256": "0pc6g2apdcdrhpja6g922z03q92lcdydq9x85ii1slqpvla493k3", - "depends": ["checkmate", "gtools", "Rdpack", "robustbase", "statmod"] + "depends": ["Rdpack", "checkmate", "gtools", "robustbase", "statmod"] }, "roboBayes": { "name": "roboBayes", @@ -103973,7 +105065,7 @@ "name": "robotoolbox", "version": "1.3.2", "sha256": "0aj7819za3abw40rflvpwndf8i8gpmqmzb691km7shy9xq4sq48s", - "depends": ["cli", "crul", "data_table", "dm", "dplyr", "glue", "labelled", "purrr", "RcppSimdJson", "readr", "rlang", "stringi", "tibble", "tidyr", "tidyselect"] + "depends": ["RcppSimdJson", "cli", "crul", "data_table", "dm", "dplyr", "glue", "labelled", "purrr", "readr", "rlang", "stringi", "tibble", "tidyr", "tidyselect"] }, "robotstxt": { "name": "robotstxt", @@ -103991,13 +105083,13 @@ "name": "robregcc", "version": "1.1", "sha256": "06fapmc3jfrfdqvz02jr12dk1d5iw6s3mcb13jz1nm2bybw6r04a", - "depends": ["magrittr", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "magrittr"] }, "robsel": { "name": "robsel", "version": "0.1.0", "sha256": "0vf9hry11hf6bi4pz18c6gh9janx0v6shm2m14kckscvh80z3k5b", - "depends": ["glasso", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "glasso"] }, "robservable": { "name": "robservable", @@ -104023,29 +105115,35 @@ "sha256": "1lybq36p1n1z9p0iqiyzwmv5f07q1wlkqfgrnx9kjf6pwlp9mkyk", "depends": [] }, + "robusTest": { + "name": "robusTest", + "version": "1.1.0", + "sha256": "0iwjplmry7s5834gg1wrqcqpad93krrglh6m5dayv8s22mk83wsc", + "depends": ["Rcpp"] + }, "robust": { "name": "robust", - "version": "0.7-4", - "sha256": "0qh816ha18v0n021cccjan1kplmyj0xyb7jmkmrnb6gxf8kma3b3", - "depends": ["fit_models", "lattice", "MASS", "robustbase", "rrcov"] + "version": "0.7-5", + "sha256": "1k0s5i9r0lyz3qsw76dd514qclggqj9k2axmgj86df81j6f2mh53", + "depends": ["MASS", "fit_models", "lattice", "robustbase", "rrcov"] }, "robust2sls": { "name": "robust2sls", "version": "0.2.2", "sha256": "1q12lvb5kifcn6qjaw1zpzq8p59lw92x79jfj9ffgy3sswhznpq4", - "depends": ["exactci", "foreach", "ivreg", "MASS", "mathjaxr", "pracma"] + "depends": ["MASS", "exactci", "foreach", "ivreg", "mathjaxr", "pracma"] }, "robustBLME": { "name": "robustBLME", "version": "0.1.3", "sha256": "18wx116l1riy4wn4083kxl637mkyyi9wbwnmvhkgqw3vb36s4vxd", - "depends": ["doParallel", "foreach", "iterators", "lme4", "mvtnorm", "numDeriv", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "iterators", "lme4", "mvtnorm", "numDeriv"] }, "robustDA": { "name": "robustDA", "version": "1.2", "sha256": "0kxdqvv17dgnlqp0hkazwfqsg3h4g9gw1w57blwpay67xp4d1jyx", - "depends": ["MASS", "mclust", "Rsolnp"] + "depends": ["MASS", "Rsolnp", "mclust"] }, "robustETM": { "name": "robustETM", @@ -104055,9 +105153,9 @@ }, "robustHD": { "name": "robustHD", - "version": "0.8.0", - "sha256": "16ihvb2v4i3ld3hx4vjkqc4fs07hnp8zi35pijcayxpp09bfk6s3", - "depends": ["ggplot2", "MASS", "perry", "Rcpp", "RcppArmadillo", "robustbase"] + "version": "0.8.1", + "sha256": "0f42x3r8g9nppfdd9vfqhq1ccj4sv8q1g7mdwlkmcyak3fajswcv", + "depends": ["MASS", "Rcpp", "RcppArmadillo", "ggplot2", "perry", "robustbase"] }, "robustX": { "name": "robustX", @@ -104067,21 +105165,21 @@ }, "robustbase": { "name": "robustbase", - "version": "0.99-2", - "sha256": "0i6dzri3bfkpmp7h0h5nyzigs9rjzdd3c4ilapmvadmfywl9d9mn", + "version": "0.99-3", + "sha256": "11h0v9q44i8gl55q40aszmzn7214pljpzncgcws9pvgbypf17g31", "depends": ["DEoptimR"] }, "robustbetareg": { "name": "robustbetareg", "version": "0.3.0", "sha256": "09f4binbi5gcf80fhpxzrmpm2k2xf6f7rcw9g2xzmni8b4cs2l6p", - "depends": ["BBmisc", "betareg", "crayon", "Formula", "MASS", "Matrix", "miscTools", "numDeriv", "pracma", "Rmpfr", "robustbase", "rstudioapi", "zoo"] + "depends": ["BBmisc", "Formula", "MASS", "Matrix", "Rmpfr", "betareg", "crayon", "miscTools", "numDeriv", "pracma", "robustbase", "rstudioapi", "zoo"] }, "robustcov": { "name": "robustcov", "version": "0.1", "sha256": "1bgvf9h727aqfb11q976y2ybp3mpghkyd29waypyfp95csp3cf26", - "depends": ["caret", "glasso", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "caret", "glasso"] }, "robustfa": { "name": "robustfa", @@ -104099,7 +105197,7 @@ "name": "robustlmm", "version": "3.3-1", "sha256": "1rv08rxv0s2013hq196p4rnh3hh5gvcv8jw14sbh9lm1hzkj67rg", - "depends": ["fastGHQuad", "lattice", "lme4", "Matrix", "nlme", "Rcpp", "rlang", "robustbase", "xtable"] + "depends": ["Matrix", "Rcpp", "fastGHQuad", "lattice", "lme4", "nlme", "rlang", "robustbase", "xtable"] }, "robustmatrix": { "name": "robustmatrix", @@ -104135,7 +105233,7 @@ "name": "robustsae", "version": "0.1.0", "sha256": "0fi1fpqnfj6vkmidlr90kqbn1bxxxqb5qpqqrz9rrimlsvrc4ddl", - "depends": ["coda", "lattice", "MCMCpack", "mvtnorm", "pscl"] + "depends": ["MCMCpack", "coda", "lattice", "mvtnorm", "pscl"] }, "robustsur": { "name": "robustsur", @@ -104165,13 +105263,13 @@ "name": "rocTree", "version": "1.1.1", "sha256": "1hd5v47gymffg5829swpd38xscm4vq75d46fibwkrr7jp9iy37ra", - "depends": ["data_tree", "DiagrammeR", "flexsurv", "ggplot2", "MASS", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["DiagrammeR", "MASS", "Rcpp", "RcppArmadillo", "data_tree", "flexsurv", "ggplot2", "survival"] }, "rocbc": { "name": "rocbc", "version": "3.1.0", "sha256": "1c2lbh3zmgzi87irbrxx8bdvvnz9ck24839nci00ylh8dvwq8893", - "depends": ["clinfun", "formattable", "MRMCaov", "mvtnorm", "pracma", "pROC", "splancs"] + "depends": ["MRMCaov", "clinfun", "formattable", "mvtnorm", "pROC", "pracma", "splancs"] }, "rocc": { "name": "rocc", @@ -104189,13 +105287,13 @@ "name": "rock", "version": "0.8.1", "sha256": "04byjz2k1wnjxbj22b307ghdrp7zz2ik5cxkxa0v980isfq5dv9i", - "depends": ["data_tree", "DiagrammeR", "DiagrammeRsvg", "dplyr", "ggplot2", "glue", "htmltools", "markdown", "purrr", "yaml", "yum"] + "depends": ["DiagrammeR", "DiagrammeRsvg", "data_tree", "dplyr", "ggplot2", "glue", "htmltools", "markdown", "purrr", "yaml", "yum"] }, "rockchalk": { "name": "rockchalk", "version": "1.8.157", "sha256": "13g2rdnxazqfgy653d7vj6w79b2vgnd7bbz0sqn9k4qiig59jh41", - "depends": ["carData", "kutils", "lme4", "MASS"] + "depends": ["MASS", "carData", "kutils", "lme4"] }, "rocker": { "name": "rocker", @@ -104241,15 +105339,15 @@ }, "rodeo": { "name": "rodeo", - "version": "0.7.8", - "sha256": "0sqds225bvnw1z6a36f14fck0jnaa0ilz2n8ylkw6j5f7dx1yf0n", - "depends": ["deSolve", "R6"] + "version": "0.8.2", + "sha256": "14bs944nn7avb06j7xb24qphr09n2i011skfdgqgybm9q5dxawpk", + "depends": ["R6", "deSolve", "readODS", "readxl"] }, "rofanova": { "name": "rofanova", "version": "1.0.0", "sha256": "0w8c5c5q0s2qv1b4nxgf8y1z3g0l9c6jr6i0280b5mp9in9wn8a6", - "depends": ["abind", "fda_usc", "Rcpp", "RcppArmadillo", "robustbase"] + "depends": ["Rcpp", "RcppArmadillo", "abind", "fda_usc", "robustbase"] }, "roger": { "name": "roger", @@ -104313,8 +105411,8 @@ }, "rolog": { "name": "rolog", - "version": "0.9.17", - "sha256": "1h69xgj1gx8w8vrkrnwpcs1cakz08k8c9fzdh62bxbk512y7p5za", + "version": "0.9.18", + "sha256": "0wdz2mnmih0hxrylqnrqrzgpwji3gi7mxzk9h60idfpwdhgc1krq", "depends": ["Rcpp", "rswipl"] }, "rolr": { @@ -104351,7 +105449,7 @@ "name": "ropenblas", "version": "0.3.0", "sha256": "161k0mjsbwyr4670cab546lxx9car9spc9qsjqcz8q9lj42rfyvn", - "depends": ["cli", "fs", "getPass", "git2r", "glue", "magrittr", "pingr", "RCurl", "rlang", "rstudioapi", "rvest", "stringr", "withr", "XML"] + "depends": ["RCurl", "XML", "cli", "fs", "getPass", "git2r", "glue", "magrittr", "pingr", "rlang", "rstudioapi", "rvest", "stringr", "withr"] }, "ropendata": { "name": "ropendata", @@ -104375,7 +105473,7 @@ "name": "ropercenter", "version": "0.3.2", "sha256": "13h1bd54xasryixnkv59zb0lfyya0bl4i83544a5nws6zzy7dsyz", - "depends": ["dplyr", "foreign", "haven", "magrittr", "netstat", "purrr", "readr", "rio", "RSelenium", "stringr", "tibble", "tidyr"] + "depends": ["RSelenium", "dplyr", "foreign", "haven", "magrittr", "netstat", "purrr", "readr", "rio", "stringr", "tibble", "tidyr"] }, "roptim": { "name": "roptim", @@ -104435,7 +105533,7 @@ "name": "rosv", "version": "0.5.1", "sha256": "1xgmn2n9iryijp36a7vzyaylc21wmfv2gjqn0qwa57hwy30f1wbw", - "depends": ["digest", "furrr", "httr2", "jsonlite", "memoise", "purrr", "R6"] + "depends": ["R6", "digest", "furrr", "httr2", "jsonlite", "memoise", "purrr"] }, "rotasym": { "name": "rotasym", @@ -104453,7 +105551,7 @@ "name": "rotations", "version": "1.6.5", "sha256": "1gcwz9aq99w54pq03i164kqa0dnf68rkd3ch3l7m97ndf32lawwk", - "depends": ["ggplot2", "gridExtra", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "gridExtra"] }, "rotatogram": { "name": "rotatogram", @@ -104471,7 +105569,7 @@ "name": "rotor", "version": "0.3.7", "sha256": "02mzcwd94hykysz3cv0q3dlhbbd4k3rm1di7dcw6m4masgzy05zb", - "depends": ["dint", "R6"] + "depends": ["R6", "dint"] }, "roughnet": { "name": "roughnet", @@ -104507,7 +105605,7 @@ "name": "routr", "version": "0.4.1", "sha256": "0sqllafwxqlkf8bl5nc3fpf17aqg5nbimrmc8l3z95y3gwhnqhkb", - "depends": ["assertthat", "digest", "R6", "reqres", "stringi", "uuid"] + "depends": ["R6", "assertthat", "digest", "reqres", "stringi", "uuid"] }, "roxut": { "name": "roxut", @@ -104517,9 +105615,9 @@ }, "roxygen2": { "name": "roxygen2", - "version": "7.3.1", - "sha256": "1j72arkadw93f4wrzxhryn3666jwnablr1bhk0zv6g77q2lrypi1", - "depends": ["brew", "cli", "commonmark", "cpp11", "desc", "knitr", "pkgload", "purrr", "R6", "rlang", "stringi", "stringr", "withr", "xml2"] + "version": "7.3.2", + "sha256": "0701v8dglv0mdsjs1mijpylpciiijb2schplavkf5drjj6gqg25p", + "depends": ["R6", "brew", "cli", "commonmark", "cpp11", "desc", "knitr", "pkgload", "purrr", "rlang", "stringi", "stringr", "withr", "xml2"] }, "roxygen2md": { "name": "roxygen2md", @@ -104555,7 +105653,7 @@ "name": "rpact", "version": "4.0.0", "sha256": "1mwsy5y917sihyq3i001hzz98zx5zvm8042inv072vxik2pybngc", - "depends": ["knitr", "R6", "Rcpp", "rlang"] + "depends": ["R6", "Rcpp", "knitr", "rlang"] }, "rpaleoclim": { "name": "rpaleoclim", @@ -104599,17 +105697,11 @@ "sha256": "135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z", "depends": [] }, - "rpdo": { - "name": "rpdo", - "version": "0.3.2", - "sha256": "0sh52y7hmnm9qhyp0m6vp3c23wzz3ds8j577z105s6f3pdf398l0", - "depends": ["chk", "lifecycle"] - }, "rpf": { "name": "rpf", "version": "1.0.14", "sha256": "15pp6fdqxngsmcibxfzv72g25q3ww3hrazsl4c5fgi0fh450kfz4", - "depends": ["lifecycle", "mvtnorm", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "lifecycle", "mvtnorm"] }, "rphylopic": { "name": "rphylopic", @@ -104629,6 +105721,12 @@ "sha256": "0ndhsw4nnz6wf0v8dh4sz8867m01jjkzw6aq7f490z1ypa3d9fv5", "depends": ["htmlwidgets"] }, + "rplanes": { + "name": "rplanes", + "version": "0.1.0", + "sha256": "1pv45g55rgsgjljqlz8sb3q4iimn1921ibihmlf32myilnavs87b", + "depends": ["dplyr", "dtw", "ecp", "lubridate", "magrittr", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr"] + }, "rplotengine": { "name": "rplotengine", "version": "1.0-9", @@ -104651,12 +105749,12 @@ "name": "rpm", "version": "0.7-3", "sha256": "1bzlvyrjib7wgv57didcqmlvzv4skp587jmn7vpfwpqb4lkp7ia1", - "depends": ["abind", "coda", "doFuture", "doRNG", "dplyr", "foreach", "future", "ggplot2", "MASS", "matrixStats", "nloptr", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "abind", "coda", "doFuture", "doRNG", "dplyr", "foreach", "future", "ggplot2", "matrixStats", "nloptr"] }, "rpmodel": { "name": "rpmodel", - "version": "1.2.0", - "sha256": "131kzag51r1fpa63xzj77b9hh4b1723lc424ch8dhbrcdrnjh730", + "version": "1.2.3", + "sha256": "1vpgc38waijd670pydankq0vqz53zi3jxj8621xxg3wiwga91sl3", "depends": [] }, "rpms": { @@ -104681,19 +105779,19 @@ "name": "rpostgis", "version": "1.5.1", "sha256": "1fnizm0xb7div6mrg3s9a4mv8dbm6lrq9azjxi786261jmv3dbvg", - "depends": ["DBI", "purrr", "raster", "RPostgreSQL", "sf", "sp", "terra"] + "depends": ["DBI", "RPostgreSQL", "purrr", "raster", "sf", "sp", "terra"] }, "rpql": { "name": "rpql", "version": "0.8.1", "sha256": "065mkdfrhs7jmkwyvkydic04snih1wb18xshddll1r5kam4ixvn2", - "depends": ["gamlss_dist", "lme4", "MASS", "Matrix", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "gamlss_dist", "lme4", "mvtnorm"] }, "rpredictit": { "name": "rpredictit", "version": "0.1.0", "sha256": "0azq75fhjadchc4pxgs4pccpvskc508zhggxxb7ab012nysap027", - "depends": ["dplyr", "DT", "dygraphs", "httr", "jsonlite", "magrittr", "quantmod", "shiny", "xts"] + "depends": ["DT", "dplyr", "dygraphs", "httr", "jsonlite", "magrittr", "quantmod", "shiny", "xts"] }, "rprev": { "name": "rprev", @@ -104747,19 +105845,25 @@ "name": "rpyANTs", "version": "0.0.3", "sha256": "1dmlpwx9x1gh2x0a4krp0v5a4km7pp65zalvbibb6r69iqmqr858", - "depends": ["reticulate", "RNifti", "rpymat"] + "depends": ["RNifti", "reticulate", "rpymat"] }, "rpymat": { "name": "rpymat", "version": "0.1.7", "sha256": "0zrq4j0xw4blv9bsdrnkf0wb61bsm1lrlh92a2qw8p3daa48833q", - "depends": ["fastmap", "glue", "IRkernel", "jsonlite", "rappdirs", "reticulate", "rstudioapi"] + "depends": ["IRkernel", "fastmap", "glue", "jsonlite", "rappdirs", "reticulate", "rstudioapi"] }, "rqPen": { "name": "rqPen", "version": "4.1.1", "sha256": "112x6y6ykmd1isw19xdpzn8alf5llz6jp7l5pfi6vp22w27z852w", - "depends": ["data_table", "hqreg", "hrqglas", "lifecycle", "Matrix", "plyr", "quantreg", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "Rdpack", "data_table", "hqreg", "hrqglas", "lifecycle", "plyr", "quantreg"] + }, + "rqcanon": { + "name": "rqcanon", + "version": "0.1.0", + "sha256": "17h5bsi2iqhfjm4mdi65ni2qi8n8dm4g5wgmgg50g1kv07n18l9s", + "depends": ["quantreg"] }, "rqdatatable": { "name": "rqdatatable", @@ -104775,8 +105879,8 @@ }, "rqti": { "name": "rqti", - "version": "0.2.1", - "sha256": "0waayqsqwydd3mv5zplbivqspxnkdznq47mj8v5yyzf28042aax7", + "version": "0.3.0", + "sha256": "12jx51cvc7d9plmvjsrnkcgaadhn8hdxc5l3fqm592wd6sfw3l6x", "depends": ["curl", "digest", "fs", "getPass", "htmltools", "httr2", "kableExtra", "keyring", "knitr", "lubridate", "magrittr", "rmarkdown", "rstudioapi", "servr", "stringr", "textutils", "xml2", "yaml", "zip"] }, "rquery": { @@ -104789,13 +105893,13 @@ "name": "rr", "version": "1.4.2", "sha256": "1xzyys6hjh01iy66a63sxda502pr4jr79pz0kcml9vgaqwf16bdp", - "depends": ["arm", "coda", "magic", "MASS"] + "depends": ["MASS", "arm", "coda", "magic"] }, "rr2": { "name": "rr2", "version": "1.1.1", "sha256": "0c80zl8qyfd4fdvxp381vixfr8q2dxzn2j7siqawf0dbbvxpdr73", - "depends": ["ape", "lme4", "Matrix", "nlme", "phylolm", "phyr"] + "depends": ["Matrix", "ape", "lme4", "nlme", "phylolm", "phyr"] }, "rrBLUP": { "name": "rrBLUP", @@ -104807,18 +105911,18 @@ "name": "rrMixture", "version": "0.1-2", "sha256": "0bh63v9zis8w3ylvbc99iy2hx0wn6302d49bhcw3wr7wmbzvdi8s", - "depends": ["gtools", "MASS", "Matrix", "matrixcalc", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "gtools", "matrixcalc"] }, "rrandvec": { "name": "rrandvec", "version": "1.0.0", "sha256": "0n92wm95xjng2j93a055mliph2cmialmcpm9b45jf75zqdhzizp5", - "depends": ["checkmate", "Rcpp"] + "depends": ["Rcpp", "checkmate"] }, "rrapply": { "name": "rrapply", - "version": "1.2.6", - "sha256": "05shia32hs6y739dfk35y671c8nrifhb415mn3sdg4v065j2k1jc", + "version": "1.2.7", + "sha256": "04qzfkf011fvvc3ll8qcn300d63z2p2p7qri24ylrsyl5g0v1w9i", "depends": [] }, "rrat": { @@ -104837,25 +105941,25 @@ "name": "rrcov3way", "version": "0.5-0", "sha256": "1n4wjxb5irgsm9yfhg5aav161ca2s1cgzhggxgf8xxyy1yw3xnk0", - "depends": ["nnls", "pracma", "robustbase", "rrcov", "ThreeWay"] + "depends": ["ThreeWay", "nnls", "pracma", "robustbase", "rrcov"] }, "rrcovHD": { "name": "rrcovHD", - "version": "0.3-0", - "sha256": "13g2akydz05933jv9fgc8jpqi8lcm506pcrdpjs88yapb4p5ar4j", - "depends": ["pcaPP", "pls", "Rcpp", "robustbase", "robustHD", "rrcov", "spls"] + "version": "0.3-1", + "sha256": "0ybj4lqfn27a1f0k434my6plk8zh6xmfgfmyavpl01pb16f7c30m", + "depends": ["Rcpp", "pcaPP", "pls", "robustHD", "robustbase", "rrcov", "spls"] }, "rrcovNA": { "name": "rrcovNA", - "version": "0.5-1", - "sha256": "0bf3r5j37pfv84fmmgsaq4ddrq7f290w8673fapqrirci7dnawxc", + "version": "0.5-2", + "sha256": "1hp6cji9w38qq00bb0jyx0s2lh74960qciwhbc1vdiv5dfg38qmx", "depends": ["cluster", "lattice", "norm", "robustbase", "rrcov"] }, "rrecsys": { "name": "rrecsys", "version": "0.9.7.3.1", "sha256": "1qnjriv1xq4gjjhzz8jxrbk88mw5xddl2l2i4bmfhnxhi51d2rk3", - "depends": ["ggplot2", "knitr", "MASS", "Rcpp", "registry"] + "depends": ["MASS", "Rcpp", "ggplot2", "knitr", "registry"] }, "rredlist": { "name": "rredlist", @@ -104885,7 +105989,7 @@ "name": "rres", "version": "1.1", "sha256": "138m26ya119805b1akwski0hf1ypiqsqjlkrm9p0l2x22zrv1n60", - "depends": ["kernlab", "Rcpp"] + "depends": ["Rcpp", "kernlab"] }, "rriskDistributions": { "name": "rriskDistributions", @@ -104909,19 +106013,19 @@ "name": "rrpack", "version": "0.1-13", "sha256": "0h9m2gsi16zxdhff02fxa6r4kw32m7vs3y6ikwpczhlnxd0d0qjy", - "depends": ["ggplot2", "glmnet", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "ggplot2", "glmnet"] }, "rrr": { "name": "rrr", "version": "1.0.0", "sha256": "0sv6k70mv325yjm8yjy4dw8cqc0xc071iiv94fk1l1yfz0n67prz", - "depends": ["dplyr", "GGally", "ggplot2", "magrittr", "MASS", "plotly", "Rcpp"] + "depends": ["GGally", "MASS", "Rcpp", "dplyr", "ggplot2", "magrittr", "plotly"] }, "rrscale": { "name": "rrscale", "version": "1.0", "sha256": "1s8ziwh95410i9p176xbsk9k6ccyihi2mqa5gaigcqrkb3dzyy08", - "depends": ["abind", "DEoptim", "nloptr"] + "depends": ["DEoptim", "abind", "nloptr"] }, "rrtable": { "name": "rrtable", @@ -104951,12 +106055,12 @@ "name": "rsat", "version": "0.1.21", "sha256": "1fi2xy9q49w77b0xgqqny8y5v53jxybdpysv0mw4nlfq0q8glvgx", - "depends": ["calendR", "curl", "fields", "httr", "leafem", "leaflet", "raster", "Rdpack", "rjson", "rvest", "sf", "sp", "stars", "terra", "tmap", "XML", "xml2", "zip"] + "depends": ["Rdpack", "XML", "calendR", "curl", "fields", "httr", "leafem", "leaflet", "raster", "rjson", "rvest", "sf", "sp", "stars", "terra", "tmap", "xml2", "zip"] }, "rsatscan": { "name": "rsatscan", - "version": "1.0.7", - "sha256": "14q568xyigjsq8g98y393ln7m45bnrf3sy201mi7432wzxjl6ia8", + "version": "1.0.8", + "sha256": "018958mln4gfqk9xmiqma2gp5drysf9z17ilraf4wlaxi7dm7qf6", "depends": ["foreign"] }, "rscc": { @@ -104969,7 +106073,7 @@ "name": "rsconnect", "version": "1.3.1", "sha256": "0msmrdw7933xics464asyy9v2gm5b4jb8gr4nfhy54x45n1qmpj7", - "depends": ["cli", "curl", "digest", "jsonlite", "lifecycle", "openssl", "packrat", "PKI", "renv", "rlang", "rstudioapi", "yaml"] + "depends": ["PKI", "cli", "curl", "digest", "jsonlite", "lifecycle", "openssl", "packrat", "renv", "rlang", "rstudioapi", "yaml"] }, "rscontract": { "name": "rscontract", @@ -105005,7 +106109,7 @@ "name": "rsdmx", "version": "0.6-3", "sha256": "0axy02p6kh67sc1nqp67sa1i2n3r24j1cdd3lczxzfkxms0qznc7", - "depends": ["httr", "plyr", "R6", "XML"] + "depends": ["R6", "XML", "httr", "plyr"] }, "rseedcalc": { "name": "rseedcalc", @@ -105017,13 +106121,13 @@ "name": "rsem", "version": "0.5.1", "sha256": "1rzfshfmhicpm45xmmsbns1qkb9p7m5mj0nwcnl7arlmlik4jn4p", - "depends": ["lavaan", "MASS"] + "depends": ["MASS", "lavaan"] }, "rsetse": { "name": "rsetse", "version": "0.5.0", "sha256": "095f37a48l9dhz5s3zri6y1kv74x150wrrxinrh177mi3m63shgr", - "depends": ["dplyr", "igraph", "magrittr", "Matrix", "minpack_lm", "purrr", "rlang", "tibble"] + "depends": ["Matrix", "dplyr", "igraph", "magrittr", "minpack_lm", "purrr", "rlang", "tibble"] }, "rsf": { "name": "rsf", @@ -105031,12 +106135,6 @@ "sha256": "0vlnmqj6if2d8m4frdyarc985s73zapsj74rjv1nv074z422l2ci", "depends": ["bookdown", "gert", "here", "knitr", "magrittr", "renv", "rlang", "usethis", "yaml", "ymlthis"] }, - "rsgeo": { - "name": "rsgeo", - "version": "0.1.6", - "sha256": "04mv8ifl1k2vqacglw0j41j96l9ls8khiligjhk499c5zg4aadip", - "depends": ["rlang", "vctrs"] - }, "rshift": { "name": "rshift", "version": "3.0.0", @@ -105045,15 +106143,15 @@ }, "rsi": { "name": "rsi", - "version": "0.2.0", - "sha256": "1r6igxar0mbnqscnrp7mq98isi40njiwf8377rk2qpyq69108v7h", + "version": "0.2.1", + "sha256": "03vipq6ykq5px705r1ixaj02770rh6wpmk0zjw73zr04dzrg878n", "depends": ["future_apply", "glue", "httr", "jsonlite", "lifecycle", "proceduralnames", "rlang", "rstac", "sf", "terra", "tibble"] }, "rsides": { "name": "rsides", "version": "0.1", "sha256": "08vwk7d7p6m38gmnbmx50kb44jhxdxvq6pbm6ym66ifhlxmbigr1", - "depends": ["BH", "doParallel", "doRNG", "flextable", "foreach", "officer", "Rcpp", "RcppEigen", "survival", "xml2"] + "depends": ["BH", "Rcpp", "RcppEigen", "doParallel", "doRNG", "flextable", "foreach", "officer", "survival", "xml2"] }, "rsimsum": { "name": "rsimsum", @@ -105063,8 +106161,8 @@ }, "rsinaica": { "name": "rsinaica", - "version": "1.0.0", - "sha256": "0ndskcgzd38mblk3xfazszhh3f5fjlmz6rmc297nka2c8rw56lz2", + "version": "1.1.0", + "sha256": "00fnz0afa635zbkphc92wbwzarxa5dnvxy2g4gry43zykq1m3wgd", "depends": ["dplyr", "httr", "jsonlite", "lubridate", "stringr"] }, "rskey": { @@ -105095,7 +106193,7 @@ "name": "rsmatch", "version": "0.2.1", "sha256": "0fncr8gakhldnvlzyv2sb2cqz3ninnwa353l8vvxvy122lnjlwbz", - "depends": ["dplyr", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "dplyr"] }, "rsmatrix": { "name": "rsmatrix", @@ -105125,7 +106223,7 @@ "name": "rsolr", "version": "0.0.13", "sha256": "1pky70f4w44xaz57ricq40c950l443q693h0wfvk684wcvgnga0s", - "depends": ["BiocGenerics", "graph", "RCurl", "restfulr", "rjson", "S4Vectors", "XML"] + "depends": ["BiocGenerics", "RCurl", "S4Vectors", "XML", "graph", "restfulr", "rjson"] }, "rspa": { "name": "rspa", @@ -105141,20 +106239,20 @@ }, "rsparse": { "name": "rsparse", - "version": "0.5.1", - "sha256": "15kdllm2lh6xdlv4j0ljyj5pczhx26s9d8cac7953zbb0sd45chz", - "depends": ["data_table", "float", "lgr", "Matrix", "MatrixExtra", "Rcpp", "RcppArmadillo", "RhpcBLASctl"] + "version": "0.5.2", + "sha256": "0a40mhbzlakjsf6wj00p8pqr6slhn7gxsgq2rycp3yg478ajwqyp", + "depends": ["Matrix", "MatrixExtra", "Rcpp", "RcppArmadillo", "RhpcBLASctl", "data_table", "float", "lgr"] }, "rspiro": { "name": "rspiro", - "version": "0.4", - "sha256": "1k91zdph8inkdyafz73lacbgq8x7rp55407rkpnr7nf0sbshxrr2", + "version": "0.5", + "sha256": "0vwbgrgdgvj52y290rh70c1hwfi1sa915qpss400r5405j8sgvkw", "depends": [] }, "rspm": { "name": "rspm", - "version": "0.5.3", - "sha256": "0zl3mpr1k40jfhx45xhjvwr4p7qpyxnaphrc5mbjypflaxcns4ym", + "version": "0.6.0", + "sha256": "0jr4zqz0jw8i5zvp8sf5irsz08sbcs8d8jdvqlda9ajv42qmqhna", "depends": [] }, "rsppfp": { @@ -105167,18 +106265,18 @@ "name": "rsprite2", "version": "0.2.1", "sha256": "1j1v9d5h2p9574zsl8gi4lkmq1yblklmpd40fd19bw1p67fqhpm0", - "depends": ["checkmate", "Rdpack"] + "depends": ["Rdpack", "checkmate"] }, "rsq": { "name": "rsq", "version": "2.6", "sha256": "01b9rl2ng1sq0ibpfsf50agkwh01pfpw354vvgdjd0lzh9dxmsgp", - "depends": ["deming", "Deriv", "lme4", "MASS", "Matrix", "nlme"] + "depends": ["Deriv", "MASS", "Matrix", "deming", "lme4", "nlme"] }, "rstac": { "name": "rstac", - "version": "1.0.0", - "sha256": "0ivd7ahaynfwz5w1cr2qvz2bhjx710pgj533gi8l9akln59fqzzf", + "version": "1.0.1", + "sha256": "024av3pl9xgd45fr7lxd2y09nbgkjs0rp0rl91lgsvzvgr5qc8q6", "depends": ["crayon", "httr", "jpeg", "jsonlite", "magrittr", "png", "sf"] }, "rstack": { @@ -105197,31 +106295,31 @@ "name": "rstan", "version": "2.32.6", "sha256": "0w0si8sd26c4nivqh85y0imil14sp4vy97yikmrv1lxvj40x141k", - "depends": ["BH", "ggplot2", "gridExtra", "inline", "loo", "pkgbuild", "QuickJSR", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders"] + "depends": ["BH", "QuickJSR", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "gridExtra", "inline", "loo", "pkgbuild"] }, "rstanarm": { "name": "rstanarm", "version": "2.32.1", "sha256": "1pj3s8yy8dwxfnxsd5rzd1hc7997bh5mg66zs83ljpbl0xi6qvaw", - "depends": ["bayesplot", "BH", "ggplot2", "lme4", "loo", "Matrix", "nlme", "posterior", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "shinystan", "StanHeaders", "survival"] + "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "ggplot2", "lme4", "loo", "nlme", "posterior", "rstan", "rstantools", "shinystan", "survival"] }, "rstanbdp": { "name": "rstanbdp", - "version": "0.0.2", - "sha256": "0244gbi449nd5q80i1y0k56114c6x9a8k83hvbbc5ny10lmn980j", - "depends": ["bayestestR", "BH", "KernSmooth", "mixtools", "Rcpp", "RcppEigen", "RcppParallel", "rrcov", "rstan", "rstantools", "StanHeaders"] + "version": "0.0.3", + "sha256": "1cd411qjw3qc9klihxya75r948ii3i2gpy0yjab6b2ci19fwcy6a", + "depends": ["BH", "KernSmooth", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayestestR", "mixtools", "rrcov", "rstan", "rstantools"] }, "rstanemax": { "name": "rstanemax", "version": "0.1.5", "sha256": "0n15dw6bz7g5j5dng32zna1r4p4ywkmspc82q1b3lcg3zbjmda3f", - "depends": ["BH", "dplyr", "ggplot2", "magrittr", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "ggplot2", "magrittr", "purrr", "rstan", "rstantools", "tidyr"] }, "rstantools": { "name": "rstantools", "version": "2.4.0", "sha256": "1ajg7g425cmw9h9a8225szmacwyvdwl3x0k851fnqb1my2i2rxxz", - "depends": ["desc", "Rcpp", "RcppParallel"] + "depends": ["Rcpp", "RcppParallel", "desc"] }, "rstatix": { "name": "rstatix", @@ -105245,7 +106343,7 @@ "name": "rstpm2", "version": "1.6.3", "sha256": "07q3n9hv8azwiipggyb6ykhvb8qy10s4nkp5irv76d54fsl7jq2y", - "depends": ["bbmle", "BH", "deSolve", "fastGHQuad", "mgcv", "mvtnorm", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "bbmle", "deSolve", "fastGHQuad", "mgcv", "mvtnorm", "survival"] }, "rstream": { "name": "rstream", @@ -105281,13 +106379,13 @@ "name": "rsurv", "version": "0.0.1", "sha256": "1xin45sc6zlap0w2ydq0ji4w3kz4ksvhark7vgim6vb1d1zv3py0", - "depends": ["dplyr", "Rdpack", "stabledist"] + "depends": ["Rdpack", "dplyr", "stabledist"] }, "rsurveycto": { "name": "rsurveycto", - "version": "0.1.6", - "sha256": "1w9xg2qcgqachc8y24vqxgw701si5g9qb5ps68lrn4w33hbywzjl", - "depends": ["checkmate", "cli", "curl", "data_table", "glue", "httr", "jsonlite", "rlang", "withr"] + "version": "0.2.0", + "sha256": "10ahwi1xiy2gw3abj6scrp1qdlqg3js4h9q2z6d7a5vwaxpz95hh", + "depends": ["checkmate", "cli", "curl", "data_table", "glue", "httr", "jsonlite", "lifecycle", "readxl", "rlang", "vctrs", "withr"] }, "rsvd": { "name": "rsvd", @@ -105299,7 +106397,7 @@ "name": "rsvddpd", "version": "1.0.0", "sha256": "0p2cpv3ipkvl27zhncpcyxp6lqw54ncdnxyk659qc24l0fqbw7dc", - "depends": ["MASS", "matrixStats", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "matrixStats"] }, "rsvg": { "name": "rsvg", @@ -105309,15 +106407,15 @@ }, "rswipl": { "name": "rswipl", - "version": "9.3.5.1", - "sha256": "07l9vrjn4cfzz517sqn9q7aj4026b2bqbqm15agr2211z3ppjfmz", + "version": "9.3.7.2", + "sha256": "1wyyvv8nrgfk811vbsixyiyhz0yq65bls420d5fl9rrcwzdv3rkj", "depends": ["Rcpp"] }, "rsyncrosim": { "name": "rsyncrosim", "version": "1.5.0", "sha256": "0pg7i40m8qjcfwamb9prhkzyf4571jgnamqibxzd35n6vm6s9npy", - "depends": ["DBI", "gtools", "lifecycle", "RSQLite", "terra"] + "depends": ["DBI", "RSQLite", "gtools", "lifecycle", "terra"] }, "rsyntax": { "name": "rsyntax", @@ -105351,9 +106449,9 @@ }, "rtables": { "name": "rtables", - "version": "0.6.7", - "sha256": "0x0wnv3zscbb4csgg656518krc88pqss7pd40n61q474mf6jj5s7", - "depends": ["checkmate", "formatters", "htmltools", "magrittr", "stringi"] + "version": "0.6.9", + "sha256": "137c8ks15v1w19a3g7pvnwabzpj1vj277r46npr6ymr90ddb5ha7", + "depends": ["checkmate", "formatters", "htmltools", "lifecycle", "magrittr", "stringi"] }, "rtape": { "name": "rtape", @@ -105365,19 +106463,19 @@ "name": "rtdists", "version": "0.11-5", "sha256": "1v8yhyvliw3dm3ciwxxaa9spfw05wp334l7gmvgv20mab2kjxkwp", - "depends": ["evd", "gsl", "msm", "Rcpp"] + "depends": ["Rcpp", "evd", "gsl", "msm"] }, "rtematres": { "name": "rtematres", "version": "0.2", "sha256": "1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2", - "depends": ["gdata", "plyr", "RCurl", "XML"] + "depends": ["RCurl", "XML", "gdata", "plyr"] }, "rtemps": { "name": "rtemps", "version": "0.8.0", "sha256": "1x64j13g1lv0s7yy1b4453l7xnscgf079hkgkp8dv9c38g0mfx98", - "depends": ["bookdown", "DT", "ggplot2", "knitr", "rmarkdown", "xfun"] + "depends": ["DT", "bookdown", "ggplot2", "knitr", "rmarkdown", "xfun"] }, "rtern": { "name": "rtern", @@ -105425,7 +106523,7 @@ "name": "rties", "version": "5.0.0", "sha256": "1mxgzrlf41hhawab2664az151fmmhm8ivnnimmzm538yliilc0b7", - "depends": ["DataCombine", "DescTools", "deSolve", "dplyr", "ggplot2", "gridExtra", "interactions", "lattice", "lme4", "MASS", "mclust", "nlme", "nnet", "plyr", "zoo"] + "depends": ["DataCombine", "DescTools", "MASS", "deSolve", "dplyr", "ggplot2", "gridExtra", "interactions", "lattice", "lme4", "mclust", "nlme", "nnet", "plyr", "zoo"] }, "rtika": { "name": "rtika", @@ -105455,7 +106553,7 @@ "name": "rtkore", "version": "1.6.12", "sha256": "10mwa5m6papd6a3vx7zb36fy93wjkhzyxgcvi3i88lslh5hsccnm", - "depends": ["inline", "Rcpp"] + "depends": ["Rcpp", "inline"] }, "rtlr": { "name": "rtlr", @@ -105467,7 +106565,7 @@ "name": "rtmpt", "version": "2.0-1", "sha256": "0isd7vwr1qbyzym0awmgb38fiix8v8r46ckl0d24q0hqls3aydz5", - "depends": ["coda", "data_table", "loo", "Ryacas", "stringr", "truncnorm"] + "depends": ["Ryacas", "coda", "data_table", "loo", "stringr", "truncnorm"] }, "rtms": { "name": "rtms", @@ -105495,21 +106593,21 @@ }, "rtpcr": { "name": "rtpcr", - "version": "1.0.9", - "sha256": "0pwwkcgzhmhdc5fic8h623w1qggmaa3cb1li6vprsxi4k5diq44c", + "version": "2.0.0", + "sha256": "17jbwyi19h5x9sbn14rgpbp2c23qi4w3jxdsvscrbhfrmckwfj90", "depends": ["dplyr", "emmeans", "ggplot2", "lmerTest", "multcomp", "multcompView", "purrr", "reshape2", "tidyr"] }, "rtrek": { "name": "rtrek", - "version": "0.4.0", - "sha256": "0w5726mjy8yf9h1kk3snqc4rqbg6b55ybvkbk5xqnp5iarnsd7v4", - "depends": ["downloader", "dplyr", "ggplot2", "jpeg", "jsonlite", "memoise", "purrr", "rvest", "tibble", "tidyr", "xml2"] + "version": "0.5.0", + "sha256": "0sra9v02vh6x8jydgibd2962f9nkzbdx02r4gn9b6qsirgsgn502", + "depends": ["downloader", "dplyr", "ggplot2", "jpeg", "jsonlite", "memoise", "png", "purrr", "rvest", "tibble", "tidyr", "xml2"] }, "rtrend": { "name": "rtrend", "version": "0.1.5", "sha256": "03spmnqbydwfv0nx0rmp6pj67y8vxaqwaj2c76jrrk5qmjvpjkc1", - "depends": ["boot", "fftwtools", "lubridate", "magrittr", "matrixStats", "plyr", "Rcpp", "RcppArmadillo", "terra"] + "depends": ["Rcpp", "RcppArmadillo", "boot", "fftwtools", "lubridate", "magrittr", "matrixStats", "plyr", "terra"] }, "rtrends": { "name": "rtrends", @@ -105517,6 +106615,12 @@ "sha256": "04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1", "depends": ["dplyr", "lubridate", "tidyr"] }, + "rtrim": { + "name": "rtrim", + "version": "2.3.0", + "sha256": "14i81rd4iyych1yrqf3y1b3nf5hrpfjfdb4xync2v4mqqrhx0cmx", + "depends": [] + }, "rtry": { "name": "rtry", "version": "1.1.0", @@ -105527,19 +106631,19 @@ "name": "rts", "version": "1.1-14", "sha256": "07rnpn8bz9r7p6xymzmbynrg2xq8wfpzh50j7i578v6rmyhm2fl8", - "depends": ["raster", "RCurl", "terra", "xts", "zoo"] + "depends": ["RCurl", "raster", "terra", "xts", "zoo"] }, "rts2": { "name": "rts2", - "version": "0.7.4", - "sha256": "13s1v4izqhq3w6ahna228wgs3n9zxqbmxzjjy69lmvrksfrkdy57", - "depends": ["BH", "glmmrBase", "lubridate", "R6", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "sf", "SparseChol", "StanHeaders"] + "version": "0.7.5", + "sha256": "0qzdcwrs326vl5m82x06029a8y85k2ysxbwy1lzgdnhwqp127a42", + "depends": ["BH", "R6", "Rcpp", "RcppEigen", "RcppParallel", "SparseChol", "StanHeaders", "glmmrBase", "lubridate", "rstan", "rstantools", "sf"] }, "rtsdata": { "name": "rtsdata", "version": "0.1.4", "sha256": "0djw6qp6jdkz4r0j5dzjql2rhap4syl7psdglgd9razv5vzqmn6c", - "depends": ["anytime", "brotli", "curl", "data_table", "mongolite", "Quandl", "quantmod", "xts", "zoo"] + "depends": ["Quandl", "anytime", "brotli", "curl", "data_table", "mongolite", "quantmod", "xts", "zoo"] }, "rtson": { "name": "rtson", @@ -105551,7 +106655,7 @@ "name": "rtsplot", "version": "0.1.5", "sha256": "1vryh0s1mz9h9ksf5n27vvrdbsjk8yvizd31cnj4grz71v4c1dh1", - "depends": ["quantmod", "RColorBrewer", "xts", "zoo"] + "depends": ["RColorBrewer", "quantmod", "xts", "zoo"] }, "rtweet": { "name": "rtweet", @@ -105575,7 +106679,7 @@ "name": "rubias", "version": "0.3.4", "sha256": "1b36w3mqfazv62zb542b3c4h2xwjrjqx1azxhl0daw57x2lfh01b", - "depends": ["dplyr", "gtools", "magrittr", "Rcpp", "RcppParallel", "readr", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["Rcpp", "RcppParallel", "dplyr", "gtools", "magrittr", "readr", "rlang", "stringr", "tibble", "tidyr"] }, "rucm": { "name": "rucm", @@ -105593,7 +106697,7 @@ "name": "rugarch", "version": "1.5-1", "sha256": "07nyfwaqqlizg0cawgiv8wdj7qr36pgi0z1mk9lambzb0w453zlz", - "depends": ["chron", "ks", "nloptr", "numDeriv", "Rcpp", "RcppArmadillo", "Rsolnp", "SkewHyperbolic", "spd", "xts", "zoo"] + "depends": ["Rcpp", "RcppArmadillo", "Rsolnp", "SkewHyperbolic", "chron", "ks", "nloptr", "numDeriv", "spd", "xts", "zoo"] }, "ruijter": { "name": "ruijter", @@ -105629,13 +106733,13 @@ "name": "rumidas", "version": "0.1.2", "sha256": "1y2fahyffdmnybj3hi4826sc7m5q9vvrcbz4xvd9dmm1zpgjqajx", - "depends": ["lubridate", "maxLik", "Rdpack", "roll", "tseries", "xts", "zoo"] + "depends": ["Rdpack", "lubridate", "maxLik", "roll", "tseries", "xts", "zoo"] }, "ruminate": { "name": "ruminate", "version": "0.2.4", "sha256": "1i3b5mlg4kcd8hsphax75r046yq180jrbnyr7iylkyilf6dgqyyf", - "depends": ["digest", "dplyr", "DT", "flextable", "formods", "ggplot2", "onbrand", "PKNCA", "plotly", "rhandsontable", "rlang", "rxode2", "shiny", "shinyAce", "shinyWidgets", "stringr", "tidyr", "yaml"] + "depends": ["DT", "PKNCA", "digest", "dplyr", "flextable", "formods", "ggplot2", "onbrand", "plotly", "rhandsontable", "rlang", "rxode2", "shiny", "shinyAce", "shinyWidgets", "stringr", "tidyr", "yaml"] }, "runDRT": { "name": "runDRT", @@ -105695,7 +106799,13 @@ "name": "rusda", "version": "1.0.8", "sha256": "0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338", - "depends": ["foreach", "httr", "plyr", "RCurl", "stringr", "taxize", "testthat", "XML"] + "depends": ["RCurl", "XML", "foreach", "httr", "plyr", "stringr", "taxize", "testthat"] + }, + "rush": { + "name": "rush", + "version": "0.1.1", + "sha256": "1lq1yikhykxa70ypn7y2s3njj0b8vnazjd24766sq4bgmyp60fdj", + "depends": ["R6", "checkmate", "data_table", "jsonlite", "lgr", "mlr3misc", "processx", "redux", "uuid"] }, "rusk": { "name": "rusk", @@ -105703,16 +106813,10 @@ "sha256": "0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk", "depends": ["dplyr", "ggforce", "ggplot2", "reshape2", "shiny", "tidyr"] }, - "rusquant": { - "name": "rusquant", - "version": "1.1.1", - "sha256": "02saxymlmjmbzczhn2ihyn09106005wi39f2q9dyasrzi7n6v6pk", - "depends": ["base64enc", "data_table", "httr", "jose", "jsonlite", "quantmod", "rvest", "stringr", "XML", "xts"] - }, "rust": { "name": "rust", - "version": "1.4.2", - "sha256": "1pp37h27pyjzcwabazyfmlgrma6x0k8hbq3ksfvlgphsk9hac93z", + "version": "1.4.3", + "sha256": "069zybqgmf1mnhw9g6kr7ypm0r9ghlw9kndqigvwgzqwfmqj62c9", "depends": ["Rcpp", "RcppArmadillo"] }, "rutifier": { @@ -105785,7 +106889,7 @@ "name": "rvg", "version": "0.3.3", "sha256": "0m9xfii35rv5dkk1n675s2schnxy90344ccbk1998g1qw9x1bj0m", - "depends": ["gdtools", "officer", "Rcpp", "rlang", "xml2"] + "depends": ["Rcpp", "gdtools", "officer", "rlang", "xml2"] }, "rviewgraph": { "name": "rviewgraph", @@ -105803,7 +106907,7 @@ "name": "rvinecopulib", "version": "0.6.3.1.1", "sha256": "0cmzijh03mbl3b3x8gin3vzgc52yrxmai45dxw5a6zrfal3x15fz", - "depends": ["assertthat", "BH", "kde1d", "lattice", "Rcpp", "RcppEigen", "RcppThread", "wdm"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppThread", "assertthat", "kde1d", "lattice", "wdm"] }, "rvisidata": { "name": "rvisidata", @@ -105839,7 +106943,7 @@ "name": "rwarrior", "version": "0.4.1", "sha256": "1s92qy57n92qwlf51hr6v5k2gip5f9jz9q4kpgb3vjql6nykrp4v", - "depends": ["checkmate", "cli", "dplyr", "glue", "R6", "stringr", "tibble"] + "depends": ["R6", "checkmate", "cli", "dplyr", "glue", "stringr", "tibble"] }, "rwavelet": { "name": "rwavelet", @@ -105887,7 +106991,7 @@ "name": "rworkflows", "version": "1.0.1", "sha256": "1ys66dcl5k61bkzvz8pxw08hr987jy3xpgm8akha5s4vp3jdkpqc", - "depends": ["badger", "BiocManager", "data_table", "desc", "here", "renv", "yaml"] + "depends": ["BiocManager", "badger", "data_table", "desc", "here", "renv", "yaml"] }, "rworldmap": { "name": "rworldmap", @@ -105911,7 +107015,7 @@ "name": "rwty", "version": "1.0.2", "sha256": "0p0bpq5dk8vjqx8ry364xhaq3rgxa49planapggicg7by2mhaacc", - "depends": ["ape", "coda", "GGally", "ggdendro", "ggplot2", "phangorn", "plyr", "reshape2", "viridis"] + "depends": ["GGally", "ape", "coda", "ggdendro", "ggplot2", "phangorn", "plyr", "reshape2", "viridis"] }, "rwunderground": { "name": "rwunderground", @@ -105923,37 +107027,37 @@ "name": "rxSeq", "version": "0.99.3", "sha256": "0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx", - "depends": ["MASS", "numDeriv", "VGAM"] + "depends": ["MASS", "VGAM", "numDeriv"] }, "rxode2": { "name": "rxode2", "version": "2.1.3", "sha256": "0r6j4wxkzxw4dabz2z1lssbw98mfk7sb64br01bmsqr1d19p5n1v", - "depends": ["backports", "BH", "checkmate", "cli", "data_table", "ggplot2", "inline", "lotri", "magrittr", "memoise", "PreciseSums", "qs", "Rcpp", "RcppArmadillo", "rex", "rxode2et", "rxode2ll", "rxode2parse", "rxode2random", "sys"] + "depends": ["BH", "PreciseSums", "Rcpp", "RcppArmadillo", "backports", "checkmate", "cli", "data_table", "ggplot2", "inline", "lotri", "magrittr", "memoise", "qs", "rex", "rxode2et", "rxode2ll", "rxode2parse", "rxode2random", "sys"] }, "rxode2et": { "name": "rxode2et", "version": "2.0.13", "sha256": "1pprky6j5vzijichr7kzfavc8ly3k272xnzvwix60v77z9zn5kyw", - "depends": ["checkmate", "cli", "crayon", "lotri", "magrittr", "Rcpp", "rxode2parse", "rxode2random"] + "depends": ["Rcpp", "checkmate", "cli", "crayon", "lotri", "magrittr", "rxode2parse", "rxode2random"] }, "rxode2ll": { "name": "rxode2ll", "version": "2.0.11", "sha256": "0fj5lbs67g1adjywfnav88rsj0sy3lwwf4gyimdh89rbm1glrrs3", - "depends": ["BH", "checkmate", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "checkmate"] }, "rxode2parse": { "name": "rxode2parse", "version": "2.0.19", "sha256": "01q3chhq7nl1jl50w623m1nik9jdrizpc4hi792ynsr27lsqlhcx", - "depends": ["BH", "checkmate", "crayon", "data_table", "digest", "dparser", "knitr", "qs", "Rcpp", "RcppEigen", "rex", "StanHeaders", "symengine"] + "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "checkmate", "crayon", "data_table", "digest", "dparser", "knitr", "qs", "rex", "symengine"] }, "rxode2random": { "name": "rxode2random", "version": "2.1.1", "sha256": "1zrddjq1i2wfx6ai4wwp1l0vnyk5i19dcr7f2q3f66jhlj9fqp27", - "depends": ["BH", "checkmate", "lotri", "Rcpp", "RcppArmadillo", "rxode2parse", "sitmo"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "checkmate", "lotri", "rxode2parse", "sitmo"] }, "rxylib": { "name": "rxylib", @@ -105993,8 +107097,8 @@ }, "s2": { "name": "s2", - "version": "1.1.6", - "sha256": "0rm0jd5k5w725v1bnn6ix8vic40grdh61y6qdy8jy4lhg1mjx78x", + "version": "1.1.7", + "sha256": "0y38g1zy19m7xsipns3m6avmjb9vnyw683nmlgsf4wnxa1qjqxih", "depends": ["Rcpp", "wk"] }, "s20x": { @@ -106007,7 +107111,7 @@ "name": "s2dv", "version": "2.0.0", "sha256": "0lgkdb1gphqsggqnyrl1hlfx1x5zxbhb9msr6xyj4hhp03m16z9x", - "depends": ["abind", "bigmemory", "ClimProjDiags", "easyNCDF", "easyVerification", "mapproj", "maps", "multiApply", "NbClust", "ncdf4", "plyr", "SpecsVerification"] + "depends": ["ClimProjDiags", "NbClust", "SpecsVerification", "abind", "bigmemory", "easyNCDF", "easyVerification", "mapproj", "maps", "multiApply", "ncdf4", "plyr"] }, "s2net": { "name": "s2net", @@ -106025,13 +107129,13 @@ "name": "s3.resourcer", "version": "1.1.1", "sha256": "0njl93c1pxsg04fr74pnrpvx3z5m8nk2xv700l0jhbygshw8k5z2", - "depends": ["aws_s3", "httr", "R6", "resourcer", "sparklyr"] + "depends": ["R6", "aws_s3", "httr", "resourcer", "sparklyr"] }, "s3fs": { "name": "s3fs", - "version": "0.1.5", - "sha256": "08i8a1629b63b1ai3ngh59xwnh8vzmzpz1wvxhwylpk7igwwsbg0", - "depends": ["curl", "data_table", "fs", "future", "future_apply", "lgr", "paws_storage", "R6"] + "version": "0.1.6", + "sha256": "18v81w2b7xgq8x66x3z893bg456qq38v1f9n4xx12vhk45sh8y2h", + "depends": ["R6", "curl", "data_table", "fs", "future", "future_apply", "lgr", "paws_storage"] }, "s4vd": { "name": "s4vd", @@ -106049,7 +107153,7 @@ "name": "sBIC", "version": "0.2.0", "sha256": "1fx17c9w7v6wi02i293vjdahwxx4b5a118r655cl12gsd5qwqj11", - "depends": ["combinat", "flexmix", "hash", "igraph", "mclust", "poLCA", "R_methodsS3", "R_oo", "Rcpp"] + "depends": ["R_methodsS3", "R_oo", "Rcpp", "combinat", "flexmix", "hash", "igraph", "mclust", "poLCA"] }, "sClust": { "name": "sClust", @@ -106067,7 +107171,7 @@ "name": "sFFLHD", "version": "0.1.2", "sha256": "014gy3nj6gr740z4apw82jh4n7s57zmnr95bm3g9xxnwnb224npq", - "depends": ["conf_design", "DoE_base", "R6"] + "depends": ["DoE_base", "R6", "conf_design"] }, "sGBJ": { "name": "sGBJ", @@ -106091,25 +107195,25 @@ "name": "sMTL", "version": "0.1.0", "sha256": "03xq19vh4g3j3jbpad92m2rg933h9lcy4wrzkdi9y47v8h3fqyw1", - "depends": ["caret", "dplyr", "glmnet", "JuliaCall", "JuliaConnectoR"] + "depends": ["JuliaCall", "JuliaConnectoR", "caret", "dplyr", "glmnet"] }, "sNPLS": { "name": "sNPLS", "version": "1.0.27", "sha256": "0h05crdmwmzax4pwmyxb2z1dagyqb3kybpxc064y1kl8m84kcyvv", - "depends": ["clickR", "future", "future_apply", "ggplot2", "ggrepel", "ks", "MASS", "Matrix", "pbapply"] + "depends": ["MASS", "Matrix", "clickR", "future", "future_apply", "ggplot2", "ggrepel", "ks", "pbapply"] }, "sRDA": { "name": "sRDA", "version": "1.0.0", "sha256": "0g11smn4adm3b79m9w7wzcragxggkf8rrrsgj2yzdhm1d7zzjwbk", - "depends": ["doParallel", "elasticnet", "foreach", "Matrix", "mvtnorm"] + "depends": ["Matrix", "doParallel", "elasticnet", "foreach", "mvtnorm"] }, "sRNAGenetic": { "name": "sRNAGenetic", "version": "0.1.0", "sha256": "1cvk40rkbxvr8jhwfqkgdfy150mi56y976pjp2w34rnghry6ql8z", - "depends": ["DESeq2", "futile_logger", "ggplot2", "ggsci", "plyr", "VennDiagram"] + "depends": ["DESeq2", "VennDiagram", "futile_logger", "ggplot2", "ggsci", "plyr"] }, "sRdpData": { "name": "sRdpData", @@ -106151,13 +107255,13 @@ "name": "sacRebleu", "version": "0.1.3", "sha256": "0piapn7srrfc4qmwkpjrsfyhz253pl69ppm3y9flqlffki5b5zx1", - "depends": ["checkmate", "Rcpp", "tok"] + "depends": ["Rcpp", "checkmate", "tok"] }, "saccadr": { "name": "saccadr", "version": "0.1.3", "sha256": "0c51zbkh8b0xi0sshzq5agbijw6nprrb3r1k77wcfqsr2mazfwi5", - "depends": ["cluster", "dplyr", "magrittr", "Rcpp", "rlang", "signal", "tidyr"] + "depends": ["Rcpp", "cluster", "dplyr", "magrittr", "rlang", "signal", "tidyr"] }, "sad": { "name": "sad", @@ -106169,25 +107273,25 @@ "name": "sadists", "version": "0.2.5", "sha256": "0c7bmca6yyz5hca2ghr2zc6lmwi94cywz8gkpsakrnmk0f7680xi", - "depends": ["hypergeo", "orthopolynom", "PDQutils"] + "depends": ["PDQutils", "hypergeo", "orthopolynom"] }, "sads": { "name": "sads", "version": "0.6.3", "sha256": "196kzsq3afzj8j69417i6xmbbjgbm5qyinrw6s6drs07yhvnzp0f", - "depends": ["bbmle", "GUILDS", "MASS", "poilog", "poweRlaw", "VGAM"] + "depends": ["GUILDS", "MASS", "VGAM", "bbmle", "poilog", "poweRlaw"] }, "sae": { "name": "sae", "version": "1.3", "sha256": "1ncrlzgnga9pfa2j8x1y6axl2665rp08aff98zrim6gq6n6yap8z", - "depends": ["lme4", "MASS"] + "depends": ["MASS", "lme4"] }, "sae_prop": { "name": "sae.prop", "version": "0.1.2", "sha256": "19q86xjpvr3s3paspkzsr40zvff60mxxh57xpz0fnxldivynh6ia", - "depends": ["corpcor", "fpc", "magic", "MASS", "progress"] + "depends": ["MASS", "corpcor", "fpc", "magic", "progress"] }, "sae2": { "name": "sae2", @@ -106205,7 +107309,7 @@ "name": "saeHB", "version": "0.2.2", "sha256": "1wv9b656s93r9vnm6j0j10gd1q92vbawhy5ijjzvzsn9drzzwzsc", - "depends": ["CARBayesdata", "coda", "MASS", "nimble", "rjags", "stringr"] + "depends": ["CARBayesdata", "MASS", "coda", "nimble", "rjags", "stringr"] }, "saeHB_ME": { "name": "saeHB.ME", @@ -106265,19 +107369,19 @@ "name": "saeRobust", "version": "0.5.0", "sha256": "0rq4az5rzjljjswkdbcz7y5lyrnhyx9b20w81s4665iwrl3fcniw", - "depends": ["aoos", "assertthat", "ggplot2", "magrittr", "MASS", "Matrix", "memoise", "modules", "pbapply", "Rcpp", "RcppArmadillo", "spdep"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "aoos", "assertthat", "ggplot2", "magrittr", "memoise", "modules", "pbapply", "spdep"] }, "saeSim": { "name": "saeSim", "version": "0.11.0", "sha256": "0s0zcls4j3cx7wbvi0l3q4c3b0f9x9i2wcqnz4gzwyqik6pcfaic", - "depends": ["dplyr", "functional", "ggplot2", "MASS", "parallelMap", "spdep", "tibble"] + "depends": ["MASS", "dplyr", "functional", "ggplot2", "parallelMap", "spdep", "tibble"] }, "saeTrafo": { "name": "saeTrafo", "version": "1.0.4", "sha256": "1sqmymazs3g1xlqvphbwmpvl5yhkmbmpcyc1mxqdxaj3yap44qwr", - "depends": ["emdi", "ggplot2", "gridExtra", "HLMdiag", "moments", "nlme", "openxlsx", "parallelMap", "readODS", "reshape2", "rlang", "sfsmisc", "stringr"] + "depends": ["HLMdiag", "emdi", "ggplot2", "gridExtra", "moments", "nlme", "openxlsx", "parallelMap", "readODS", "reshape2", "rlang", "sfsmisc", "stringr"] }, "saebnocov": { "name": "saebnocov", @@ -106289,7 +107393,7 @@ "name": "saeczi", "version": "0.2.0", "sha256": "02jsmmzaig5d8lr9avra3acy93klh7f88izxsf04gn0w855y37cv", - "depends": ["dplyr", "furrr", "future", "lme4", "progressr", "purrr", "Rcpp", "RcppEigen", "rlang"] + "depends": ["Rcpp", "RcppEigen", "dplyr", "furrr", "future", "lme4", "progressr", "purrr", "rlang"] }, "saeeb": { "name": "saeeb", @@ -106307,7 +107411,7 @@ "name": "saemix", "version": "3.3", "sha256": "1xx6254sj6lyarkkdkl3lajflyh8c2y8261bl9a19d1457l1h8wv", - "depends": ["ggplot2", "gridExtra", "MASS", "mclust", "npde", "rlang", "scales"] + "depends": ["MASS", "ggplot2", "gridExtra", "mclust", "npde", "rlang", "scales"] }, "saens": { "name": "saens", @@ -106337,13 +107441,13 @@ "name": "safetensors", "version": "0.1.2", "sha256": "0xvg5y2sd7gzcal0qqgxbx8vcvmy50jm0j2ajr8iw3wyy5qpyvkp", - "depends": ["cli", "jsonlite", "R6", "rlang"] + "depends": ["R6", "cli", "jsonlite", "rlang"] }, "safetyCharts": { "name": "safetyCharts", "version": "0.3.0", "sha256": "1riyd2rb799rr0j95s3wd45rwq8syfm0xllpihycpak0f56vg1s8", - "depends": ["dplyr", "DT", "forcats", "ggplot2", "htmlwidgets", "huxtable", "jsonlite", "pharmaRTF", "plotly", "purrr", "RColorBrewer", "rlang", "shiny", "stringr", "Tendril", "Tplyr"] + "depends": ["DT", "RColorBrewer", "Tendril", "Tplyr", "dplyr", "forcats", "ggplot2", "htmlwidgets", "huxtable", "jsonlite", "pharmaRTF", "plotly", "purrr", "rlang", "shiny", "stringr"] }, "safetyData": { "name": "safetyData", @@ -106355,7 +107459,7 @@ "name": "safetyGraphics", "version": "2.1.1", "sha256": "1bvmxhy2giprf4cy1xfc42rl8hcw0pi3691kzfgqhj65sawdjwfd", - "depends": ["datamods", "dplyr", "DT", "htmlwidgets", "jsonlite", "magrittr", "purrr", "rclipboard", "rlang", "safetyCharts", "safetyData", "shiny", "shinyjs", "sortable", "stringr", "tidyr", "yaml"] + "depends": ["DT", "datamods", "dplyr", "htmlwidgets", "jsonlite", "magrittr", "purrr", "rclipboard", "rlang", "safetyCharts", "safetyData", "shiny", "shinyjs", "sortable", "stringr", "tidyr", "yaml"] }, "sageR": { "name": "sageR", @@ -106369,11 +107473,17 @@ "sha256": "1grhfxpqx9dyvqd2v91im3jgki2k3abcaal2ix9pcdzz93fc9xlw", "depends": ["mvtnorm"] }, + "salad": { + "name": "salad", + "version": "1.0", + "sha256": "1fcs6g1ld514gkr5rxbawpxd81p9ywfxfhrh3jjwd3807gc9l2r4", + "depends": [] + }, "salesforcer": { "name": "salesforcer", "version": "1.0.1", "sha256": "19z4q5k0k1c1s2piqjg0z6nrwabap016nbx3jpf51lvmh5lp8ycf", - "depends": ["anytime", "base64enc", "curl", "data_table", "dplyr", "httr", "jsonlite", "lifecycle", "lubridate", "mime", "purrr", "readr", "rlang", "rlist", "tibble", "vctrs", "XML", "xml2", "zip"] + "depends": ["XML", "anytime", "base64enc", "curl", "data_table", "dplyr", "httr", "jsonlite", "lifecycle", "lubridate", "mime", "purrr", "readr", "rlang", "rlist", "tibble", "vctrs", "xml2", "zip"] }, "salso": { "name": "salso", @@ -106391,19 +107501,19 @@ "name": "samadb", "version": "0.3.0", "sha256": "1qbjjnchx9h3wrhf23cpmwfaixdkm4jcpkgniz3h5ghrhqv32grr", - "depends": ["collapse", "data_table", "DBI", "RMySQL", "writexl"] + "depends": ["DBI", "RMySQL", "collapse", "data_table", "writexl"] }, "sambia": { "name": "sambia", "version": "0.1.0", "sha256": "15yz5lrjav5bs8m52crg3l43xmi4gf7wydji76p181ssyg43z2ln", - "depends": ["dplyr", "e1071", "FNN", "mvtnorm", "pROC", "ranger", "smotefamily"] + "depends": ["FNN", "dplyr", "e1071", "mvtnorm", "pROC", "ranger", "smotefamily"] }, "samc": { "name": "samc", - "version": "3.2.1", - "sha256": "0i5k27699p28xzfbdk41ni45l5lp1k2zla5mf15x3livmnn8c3d4", - "depends": ["circular", "Matrix", "raster", "Rcpp", "RcppEigen", "RcppThread", "terra"] + "version": "3.3.0", + "sha256": "0vr6f63phzki3wsq3c4db00wzzfbfnbym33skvxn41c3xggvl324", + "depends": ["Matrix", "Rcpp", "RcppEigen", "RcppThread", "circular", "raster", "terra"] }, "samon": { "name": "samon", @@ -106421,7 +107531,7 @@ "name": "sampleSelection", "version": "1.2-12", "sha256": "1am1w8c24f27gcdmrk3b4wp9j5awghnw9s9lphnkm10pl31881dy", - "depends": ["Formula", "maxLik", "miscTools", "mvtnorm", "systemfit", "VGAM"] + "depends": ["Formula", "VGAM", "maxLik", "miscTools", "mvtnorm", "systemfit"] }, "sampleVADIR": { "name": "sampleVADIR", @@ -106445,7 +107555,7 @@ "name": "samplesize4surveys", "version": "4.1.1", "sha256": "0v332xb4vkkjr3nwf3231aqgzsj7mqld9ffkla1nj52lxay2ji75", - "depends": ["dplyr", "magrittr", "TeachingSampling", "timeDate"] + "depends": ["TeachingSampling", "dplyr", "magrittr", "timeDate"] }, "samplesizeCMH": { "name": "samplesizeCMH", @@ -106469,7 +107579,7 @@ "name": "sampling", "version": "2.10", "sha256": "0x976wblv663aidqmcif1rjv72nbxf4nzms901lmryxbq1p9gv7x", - "depends": ["lpSolve", "MASS"] + "depends": ["MASS", "lpSolve"] }, "samplingDataCRT": { "name": "samplingDataCRT", @@ -106501,6 +107611,12 @@ "sha256": "0a7c078vz4p5x5r29xsvab630pq3p7fwsn31qdcjdcl7n4475rhr", "depends": ["data_table", "dplyr", "magrittr", "rlang", "sampling"] }, + "samplr": { + "name": "samplr", + "version": "1.0.0", + "sha256": "1zmh68518vz3nfjch524b9q5fi8wap54qziq6z5mz9ymaqrwayaa", + "depends": ["R6", "Rcpp", "RcppArmadillo", "RcppDist", "Rdpack", "ggplot2", "latex2exp", "lme4", "pracma", "testthat"] + }, "samplrData": { "name": "samplrData", "version": "1.0.0", @@ -106595,19 +107711,19 @@ "name": "sansa", "version": "0.0.1", "sha256": "1p5qv94f62dxzkbl1jn1fx3vksyhqqa3w2ipqwiflaxlk7q9k5pq", - "depends": ["data_table", "FNN", "ggplot2"] + "depends": ["FNN", "data_table", "ggplot2"] }, "santaR": { "name": "santaR", "version": "1.2.4", "sha256": "048zbx7fr71ibxzgsayzifzv8gka7dmdfsdyvmzssxvzyjcm4qwc", - "depends": ["bslib", "doParallel", "DT", "foreach", "ggplot2", "gridExtra", "iterators", "pcaMethods", "plyr", "reshape2", "shiny"] + "depends": ["DT", "bslib", "doParallel", "foreach", "ggplot2", "gridExtra", "iterators", "pcaMethods", "plyr", "reshape2", "shiny"] }, "santoku": { "name": "santoku", "version": "1.0.0", "sha256": "054bl8sgl0rcvymsqsg8br201snw6rlmac54mfb05a4hsd8y7vq4", - "depends": ["assertthat", "glue", "lifecycle", "Rcpp", "rlang", "vctrs"] + "depends": ["Rcpp", "assertthat", "glue", "lifecycle", "rlang", "vctrs"] }, "sanzo": { "name": "sanzo", @@ -106649,7 +107765,7 @@ "name": "sarima", "version": "0.9.3", "sha256": "0x6wndy7mdmnliabrbs9qbpm7ibf2h7s3m4d90pasna6hw11yg3d", - "depends": ["Formula", "lagged", "ltsa", "numDeriv", "PolynomF", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Formula", "PolynomF", "Rcpp", "RcppArmadillo", "Rdpack", "lagged", "ltsa", "numDeriv"] }, "saros": { "name": "saros", @@ -106683,9 +107799,9 @@ }, "sarsop": { "name": "sarsop", - "version": "0.6.14", - "sha256": "0y315gg3masbpvsf9zk0abj0mh0834h1yhmjg1fwwbqvygg64cjp", - "depends": ["BH", "digest", "Matrix", "processx", "xml2"] + "version": "0.6.15", + "sha256": "0793pvfldbxnqsm0gzpwr792xvvzcr35yj75s5wc4hbv2adv9mvn", + "depends": ["BH", "Matrix", "digest", "processx", "xml2"] }, "sas7bdat": { "name": "sas7bdat", @@ -106703,7 +107819,7 @@ "name": "sasfunclust", "version": "1.0.0", "sha256": "1ba7g3rxyq5h806na6bsdvh6mw6hydgcf3740qkfd4d5fx7m0mq4", - "depends": ["fda", "MASS", "Matrix", "matrixcalc", "mclust", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "fda", "matrixcalc", "mclust"] }, "sasr": { "name": "sasr", @@ -106715,7 +107831,7 @@ "name": "sass", "version": "0.4.9", "sha256": "1lnl2xssz33vg7p6a8ij55hg6j1p1d3y2mq22pvf0r3rmnd08cz1", - "depends": ["fs", "htmltools", "R6", "rappdirs", "rlang"] + "depends": ["R6", "fs", "htmltools", "rappdirs", "rlang"] }, "sassy": { "name": "sassy", @@ -106727,25 +107843,25 @@ "name": "satdad", "version": "1.1", "sha256": "1ig7z0z4filq57sk9rc38pnx79j1lxm1sacl9hbi407y0pqx01k7", - "depends": ["BH", "graphicalExtremes", "igraph", "maps", "partitions", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "graphicalExtremes", "igraph", "maps", "partitions"] }, "sate": { "name": "sate", "version": "2.1.0", "sha256": "19jd8z1343ajx27b14grjnvxxf38b008fzclv7rcpqqp717ajpnv", - "depends": ["ellipse", "MASS"] + "depends": ["MASS", "ellipse"] }, "satellite": { "name": "satellite", "version": "1.0.5", "sha256": "1bd1f8mimx53dcy3fnlhjk7yam08jvr3lhh39zcb5c2yj0pkhk1y", - "depends": ["plyr", "raster", "Rcpp", "terra"] + "depends": ["Rcpp", "plyr", "raster", "terra"] }, "satin": { "name": "satin", "version": "1.1.0", "sha256": "17knbgy89ljp607mkhs62fx9p6b40iqqzgpxr9karlf07l48c0ya", - "depends": ["geosphere", "maps", "ncdf4", "PBSmapping", "sp", "splancs"] + "depends": ["PBSmapping", "geosphere", "maps", "ncdf4", "sp", "splancs"] }, "satres": { "name": "satres", @@ -106769,7 +107885,7 @@ "name": "savvyr", "version": "0.1.1", "sha256": "08lrhb4nc0hcbqjdv1ar31l80gbfgxjivpc5k0farcldksybxjsg", - "depends": ["checkmate", "etm", "Rdpack"] + "depends": ["Rdpack", "checkmate", "etm"] }, "sawnuti": { "name": "sawnuti", @@ -106793,7 +107909,7 @@ "name": "sbd", "version": "0.1.0", "sha256": "0wf46p330l2lx6j9w4600q27n4jzhpzb2kw056654fz2ggd8x6kn", - "depends": ["bbmle", "dplyr", "MASS"] + "depends": ["MASS", "bbmle", "dplyr"] }, "sbde": { "name": "sbde", @@ -106805,7 +107921,7 @@ "name": "sbfc", "version": "1.0.3", "sha256": "0yfbxp3b9j2xjpd1xffkjl2bfxixc7hhzfiwicd9lyi5w2kfwavf", - "depends": ["DiagrammeR", "discretization", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["DiagrammeR", "Matrix", "Rcpp", "RcppArmadillo", "discretization"] }, "sbgcop": { "name": "sbgcop", @@ -106823,7 +107939,7 @@ "name": "sbm", "version": "0.4.6", "sha256": "1cnf4d5xrfsvsy56sh4nz83j82j8yp09hlnvddfgi15zf4md7glx", - "depends": ["alluvial", "blockmodels", "dplyr", "ggplot2", "GREMLINS", "igraph", "magrittr", "prodlim", "purrr", "R6", "Rcpp", "RcppArmadillo", "reshape2", "rlang", "stringr"] + "depends": ["GREMLINS", "R6", "Rcpp", "RcppArmadillo", "alluvial", "blockmodels", "dplyr", "ggplot2", "igraph", "magrittr", "prodlim", "purrr", "reshape2", "rlang", "stringr"] }, "sbmSDP": { "name": "sbmSDP", @@ -106835,19 +107951,19 @@ "name": "sbo", "version": "0.5.0", "sha256": "00pnvpcl6441gf8npf6b6cvzxh0kq4qbfxggjiqdny6lq2nl0d47", - "depends": ["dplyr", "Rcpp", "rlang", "testthat", "tidyr"] + "depends": ["Rcpp", "dplyr", "rlang", "testthat", "tidyr"] }, "sboost": { "name": "sboost", "version": "0.1.2", "sha256": "1vh3hk15chkyrkpnj4i40542bck9ny45g424bncxdxl9fgxc4nhk", - "depends": ["dplyr", "Rcpp", "rlang"] + "depends": ["Rcpp", "dplyr", "rlang"] }, "sbrl": { "name": "sbrl", "version": "1.4", "sha256": "0sr57zfd75ywgv4az0y7jiacalywf36z3gmsjdgmw0adzaxxdcsg", - "depends": ["arules", "Rcpp"] + "depends": ["Rcpp", "arules"] }, "sbtools": { "name": "sbtools", @@ -106857,9 +107973,9 @@ }, "sbw": { "name": "sbw", - "version": "1.1.5", - "sha256": "10ks912f4xiy0i484vf24w5zz9n7kxlcy77ikz95p8vr5zlqkvgc", - "depends": ["MASS", "Matrix", "quadprog", "slam", "spatstat_geom"] + "version": "1.1.9", + "sha256": "0815xxgzz0b79bv9g4cw144dl6y6f2yi2k2n2khfhpwd8ipgmsr7", + "depends": ["MASS", "Matrix", "quadprog", "slam", "spatstat_univar"] }, "sc2sc": { "name": "sc2sc", @@ -106871,19 +107987,19 @@ "name": "scAnnotate", "version": "0.3", "sha256": "02hrfs5ci2ii3hr4d4ks5bj80n5ajdnx71m6swmdciiy72sdm1lc", - "depends": ["glmnet", "harmony", "Seurat", "SeuratObject"] + "depends": ["Seurat", "SeuratObject", "glmnet", "harmony"] }, "scBSP": { "name": "scBSP", "version": "1.0.0", "sha256": "0cabj2hizmnadq5vijaip4d1wcsycwy5bdpgjwivzgqkhy9r5ss7", - "depends": ["fitdistrplus", "Matrix", "RANN", "spam", "sparseMatrixStats"] + "depends": ["Matrix", "RANN", "fitdistrplus", "spam", "sparseMatrixStats"] }, "scBio": { "name": "scBio", "version": "0.1.6", "sha256": "1bpizxm9fbxd4sfapi1ayfg5csacb4dvqbvappd79jkq4mrsk12q", - "depends": ["doSNOW", "fields", "foreach", "LiblineaR", "limma", "raster", "sp"] + "depends": ["LiblineaR", "doSNOW", "fields", "foreach", "limma", "raster", "sp"] }, "scCAN": { "name": "scCAN", @@ -106901,7 +108017,7 @@ "name": "scCustomize", "version": "2.1.2", "sha256": "150h8aj9qyg7v9yh5mhkr6nbf05ia91l5v9cqy58ipg6bwa9lmib", - "depends": ["circlize", "cli", "cowplot", "data_table", "dplyr", "forcats", "ggbeeswarm", "ggplot2", "ggprism", "ggrastr", "ggrepel", "glue", "janitor", "lifecycle", "magrittr", "Matrix", "paletteer", "patchwork", "pbapply", "purrr", "rlang", "scales", "scattermore", "Seurat", "SeuratObject", "stringi", "stringr", "tibble", "tidyr"] + "depends": ["Matrix", "Seurat", "SeuratObject", "circlize", "cli", "cowplot", "data_table", "dplyr", "forcats", "ggbeeswarm", "ggplot2", "ggprism", "ggrastr", "ggrepel", "glue", "janitor", "lifecycle", "magrittr", "paletteer", "patchwork", "pbapply", "purrr", "rlang", "scales", "scattermore", "stringi", "stringr", "tibble", "tidyr"] }, "scDECO": { "name": "scDECO", @@ -106913,7 +108029,7 @@ "name": "scDHA", "version": "1.2.2", "sha256": "1l9i5r7z4n387mrfmq43md2a0wrhvshrggb4nc3varjyq3drh3yd", - "depends": ["cluster", "coro", "doParallel", "foreach", "igraph", "Matrix", "matrixStats", "Rcpp", "RcppAnnoy", "RcppArmadillo", "RcppParallel", "RhpcBLASctl", "torch", "uwot"] + "depends": ["Matrix", "Rcpp", "RcppAnnoy", "RcppArmadillo", "RcppParallel", "RhpcBLASctl", "cluster", "coro", "doParallel", "foreach", "igraph", "matrixStats", "torch", "uwot"] }, "scDIFtest": { "name": "scDIFtest", @@ -106925,37 +108041,37 @@ "name": "scDiffCom", "version": "1.0.0", "sha256": "17scb8hhx2d67cbhzxd0l2hzy4sj22x5j9rvc71ba2d958wk4ysa", - "depends": ["data_table", "DelayedArray", "future", "future_apply", "magrittr", "Seurat"] + "depends": ["DelayedArray", "Seurat", "data_table", "future", "future_apply", "magrittr"] }, "scGOclust": { "name": "scGOclust", "version": "0.2.1", "sha256": "0jbmjrc5xmxvkc6q93blbryqvyxcy6ia6bmca03vq05l6isybal6", - "depends": ["biomaRt", "dplyr", "limma", "magrittr", "Matrix", "networkD3", "Seurat", "slanter", "tibble", "tidyr"] + "depends": ["Matrix", "Seurat", "biomaRt", "dplyr", "limma", "magrittr", "networkD3", "slanter", "tibble", "tidyr"] }, "scGate": { "name": "scGate", "version": "1.6.2", "sha256": "0zlbrvr6lxcihspfqgpvv5kyrzqqpy3451j0kpnqc0n93bbs4cqk", - "depends": ["BiocParallel", "dplyr", "ggplot2", "ggridges", "patchwork", "reshape2", "Seurat", "UCell"] + "depends": ["BiocParallel", "Seurat", "UCell", "dplyr", "ggplot2", "ggridges", "patchwork", "reshape2"] }, "scINSIGHT": { "name": "scINSIGHT", "version": "0.1.4", "sha256": "1zkm2n19px3yh3y2z1g5l84ym36ar31i96i54mm7wa0ki179swap", - "depends": ["igraph", "RANN", "Rcpp", "RcppArmadillo", "stringr"] + "depends": ["RANN", "Rcpp", "RcppArmadillo", "igraph", "stringr"] }, "scISR": { "name": "scISR", "version": "0.1.1", "sha256": "0m4sgbyc05qy1zklw45zj4w4wx0fhiwqr90fc3gpkqq7xkd7ihbw", - "depends": ["cluster", "entropy", "irlba", "markdown", "matrixStats", "PINSPlus"] + "depends": ["PINSPlus", "cluster", "entropy", "irlba", "markdown", "matrixStats"] }, "scITD": { "name": "scITD", "version": "1.0.4", "sha256": "0xcx8bvl2w2qa4c68w5hvfx9412qvscjvj8d6hp4q62z58xqy1f8", - "depends": ["circlize", "ComplexHeatmap", "dplyr", "edgeR", "fgsea", "ggplot2", "ggpubr", "ica", "Matrix", "mgcv", "msigdbr", "NMF", "RColorBrewer", "Rcpp", "RcppArmadillo", "RcppProgress", "reshape2", "Rmisc", "rTensor", "sccore", "sva"] + "depends": ["ComplexHeatmap", "Matrix", "NMF", "RColorBrewer", "Rcpp", "RcppArmadillo", "RcppProgress", "Rmisc", "circlize", "dplyr", "edgeR", "fgsea", "ggplot2", "ggpubr", "ica", "mgcv", "msigdbr", "rTensor", "reshape2", "sccore", "sva"] }, "scLink": { "name": "scLink", @@ -106967,13 +108083,13 @@ "name": "scMappR", "version": "1.0.11", "sha256": "0a2jm2a10lawqrlcglaz31gx3kbvjz19f4ynhllkj0px61awxjah", - "depends": ["ADAPTS", "downloader", "ggplot2", "gProfileR", "gprofiler2", "GSVA", "limSolve", "pbapply", "pcaMethods", "pheatmap", "reshape", "Seurat"] + "depends": ["ADAPTS", "GSVA", "Seurat", "downloader", "gProfileR", "ggplot2", "gprofiler2", "limSolve", "pbapply", "pcaMethods", "pheatmap", "reshape"] }, "scModels": { "name": "scModels", "version": "1.0.4", "sha256": "01minq4b0pdjlh2r56lvr2ab6r7sp7l9sjz8a9hmx5xmizmygmvr", - "depends": ["gamlss_dist", "Rcpp"] + "depends": ["Rcpp", "gamlss_dist"] }, "scOntoMatch": { "name": "scOntoMatch", @@ -106985,25 +108101,25 @@ "name": "scPloidy", "version": "0.6.2", "sha256": "0p8rn2c58601yjkampgw360w6r8sbwg0rk007jnvkayfad5xhdvd", - "depends": ["dplyr", "GenomicRanges", "magrittr", "MASS", "matrixStats", "mixtools", "nimble", "rlang", "Rsamtools", "tibble", "tidyr"] + "depends": ["GenomicRanges", "MASS", "Rsamtools", "dplyr", "magrittr", "matrixStats", "mixtools", "nimble", "rlang", "tibble", "tidyr"] }, "scRNAstat": { "name": "scRNAstat", "version": "0.1.1", "sha256": "0yv5np7jafmygg77bwisrha5y2rdb1va906ngzs4zc8mvxr0dvlm", - "depends": ["clustree", "dplyr", "ggplot2", "magrittr", "Matrix", "patchwork", "Seurat", "stringr"] + "depends": ["Matrix", "Seurat", "clustree", "dplyr", "ggplot2", "magrittr", "patchwork", "stringr"] }, "scRNAtools": { "name": "scRNAtools", "version": "1.0", "sha256": "0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a", - "depends": ["ALL", "ConsensusClusterPlus", "corrplot", "edgeR", "foreach", "ggplot2", "ggthemes", "Hmisc", "igraph", "lattice", "limma", "PerformanceAnalytics", "plyr", "reshape2", "Rmisc", "Rtsne", "scatterplot3d", "survival", "TPEA"] + "depends": ["ALL", "ConsensusClusterPlus", "Hmisc", "PerformanceAnalytics", "Rmisc", "Rtsne", "TPEA", "corrplot", "edgeR", "foreach", "ggplot2", "ggthemes", "igraph", "lattice", "limma", "plyr", "reshape2", "scatterplot3d", "survival"] }, "scROSHI": { "name": "scROSHI", "version": "1.0.0.0", "sha256": "15mgbgb21wz1gnkw6mxkvckxj345cxi4w5hzwgxfqjvxq9wx6bik", - "depends": ["limma", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "uwot"] + "depends": ["S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "limma", "uwot"] }, "scSorter": { "name": "scSorter", @@ -107021,19 +108137,19 @@ "name": "scTenifoldKnk", "version": "1.0.1", "sha256": "0d6gcr0qrm7mc36n2lihl7bq9vj40dblqswznbwvxichv8kc5svz", - "depends": ["MASS", "Matrix", "pbapply", "RSpectra", "scTenifoldNet"] + "depends": ["MASS", "Matrix", "RSpectra", "pbapply", "scTenifoldNet"] }, "scTenifoldNet": { "name": "scTenifoldNet", "version": "1.3", "sha256": "02ijwi487pfwhgdmpals2snx5dvdnkbkyp9g1yldw12a9v8rz8q7", - "depends": ["MASS", "Matrix", "pbapply", "RhpcBLASctl", "RSpectra"] + "depends": ["MASS", "Matrix", "RSpectra", "RhpcBLASctl", "pbapply"] }, "scUtils": { "name": "scUtils", "version": "0.1.0", "sha256": "09c4vwrjj4r0nfcwb8q0a243m0v5wa3qisdlcy7ik58gyxp02zv8", - "depends": ["assertthat", "dplyr", "ggplot2", "Matrix", "scales", "viridis", "viridisLite"] + "depends": ["Matrix", "assertthat", "dplyr", "ggplot2", "scales", "viridis", "viridisLite"] }, "sca": { "name": "sca", @@ -107075,13 +108191,13 @@ "name": "scales", "version": "1.3.0", "sha256": "122qyd88qr8cc8h3k46xpygm00inqpm55zdy0b7535958imhygmk", - "depends": ["cli", "farver", "glue", "labeling", "lifecycle", "munsell", "R6", "RColorBrewer", "rlang", "viridisLite"] + "depends": ["R6", "RColorBrewer", "cli", "farver", "glue", "labeling", "lifecycle", "munsell", "rlang", "viridisLite"] }, "scalpel": { "name": "scalpel", "version": "1.0.3", "sha256": "0c8k99i5v2ki2bmcjjr6rfk7y1ds7jlykdwgn5x2zvzpdw7p4vlw", - "depends": ["gam", "igraph", "Matrix", "protoclust", "R_matlab"] + "depends": ["Matrix", "R_matlab", "gam", "igraph", "protoclust"] }, "scalreg": { "name": "scalreg", @@ -107091,21 +108207,21 @@ }, "scam": { "name": "scam", - "version": "1.2-16", - "sha256": "097gxx1lxsrjacj38ahxz3mkjy9621yw0v2fk59bm90403i6zjb7", + "version": "1.2-17", + "sha256": "00h5wcvh8wz2xqqh7j2qpdamhzdl3yawswyvwbp0r4ys30mfcgdk", "depends": ["Matrix", "mgcv"] }, "scan": { "name": "scan", - "version": "0.60.0", - "sha256": "0ncysjc28maq0ghpj8bpcppmdyllclsshwvd0hvwkc48xnji488q", - "depends": ["car", "kableExtra", "knitr", "magrittr", "mblm", "nlme", "readxl"] + "version": "0.61.0", + "sha256": "04a43vyz8brl4mzn2pzbhdap49zzb64rwb40lzc6150mqmb09bcs", + "depends": ["car", "gt", "kableExtra", "knitr", "magrittr", "mblm", "nlme", "readxl"] }, "scanstatistics": { "name": "scanstatistics", "version": "1.1.1", "sha256": "04pymq6bikmsjqlwszd9ihv85s5qg8ci5y4dr6jmi95dgdm988pj", - "depends": ["dplyr", "ismev", "magrittr", "plyr", "Rcpp", "RcppArmadillo", "sets", "tibble", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "ismev", "magrittr", "plyr", "sets", "tibble", "tidyr"] }, "scapGNN": { "name": "scapGNN", @@ -107117,13 +108233,13 @@ "name": "scape", "version": "2.3.3", "sha256": "1jb5c335qsbrpsgngs8c1qlibyb7zvvx6mwydfhm1plx4pkcq0n1", - "depends": ["coda", "Hmisc", "lattice"] + "depends": ["Hmisc", "coda", "lattice"] }, "scaper": { "name": "scaper", "version": "0.1.0", "sha256": "0ygh5lhbpgxc0mbyvc2cv0m3g405aiappysb7msw7r7g2f4x0w6s", - "depends": ["dplyr", "magrittr", "Seurat", "SeuratObject", "stringr", "VAM", "xml2"] + "depends": ["Seurat", "SeuratObject", "VAM", "dplyr", "magrittr", "stringr", "xml2"] }, "scapesClassification": { "name": "scapesClassification", @@ -107141,7 +108257,7 @@ "name": "scatr", "version": "1.0.1", "sha256": "1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d", - "depends": ["cowplot", "ggplot2", "ggridges", "ggstance", "jmvcore", "R6"] + "depends": ["R6", "cowplot", "ggplot2", "ggridges", "ggstance", "jmvcore"] }, "scatterD3": { "name": "scatterD3", @@ -107151,8 +108267,8 @@ }, "scatterPlotMatrix": { "name": "scatterPlotMatrix", - "version": "0.2.0", - "sha256": "0jnahr5hxcbs742h4wr0r6yz8qgfli8xqmxwl29cbr32ipkwjmfg", + "version": "0.3.0", + "sha256": "1hg49n0qk3wlca4abfyzr5n10k2gcv4kq42fm7x9fhiw2mm1xiw9", "depends": ["htmlwidgets"] }, "scattermore": { @@ -107183,19 +108299,19 @@ "name": "sccca", "version": "0.1.1", "sha256": "193d6015zchnmky0kic0msdw040ykvw3isxpzw5ccmg9dqr7j1xp", - "depends": ["dplyr", "HGNChelper", "openxlsx", "plyr", "scales", "Seurat"] + "depends": ["HGNChelper", "Seurat", "dplyr", "openxlsx", "plyr", "scales"] }, "scclust": { "name": "scclust", - "version": "0.2.4", - "sha256": "0rhr5qnsc0ylgs4gmn3d3d4ah2ijnd24n029vik1f0n4ykszn3np", + "version": "0.2.5", + "sha256": "028ssw7k4sj4vzyylb5njfbjisir2vas0xzh63hmwkalncr2dcpv", "depends": ["distances"] }, "sccore": { "name": "sccore", "version": "1.0.5", "sha256": "12jljngm0v75zp0zka1zdrn6pvxvqy7qpakr7vzazvq1vvjd5qlg", - "depends": ["dplyr", "ggplot2", "ggrepel", "igraph", "irlba", "magrittr", "Matrix", "pbmcapply", "pROC", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress", "rlang", "scales", "tibble", "uwot", "withr"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress", "dplyr", "ggplot2", "ggrepel", "igraph", "irlba", "magrittr", "pROC", "pbmcapply", "rlang", "scales", "tibble", "uwot", "withr"] }, "sccr": { "name": "sccr", @@ -107219,13 +108335,13 @@ "name": "scdtb", "version": "0.1.0", "sha256": "0f79lrdrfn064gsgjpj9mr4sx2wyc5z2d6kkz42kb67rqpk23ibl", - "depends": ["broom_mixed", "DT", "ggplot2", "mmcards", "nlme", "shiny", "shinythemes"] + "depends": ["DT", "broom_mixed", "ggplot2", "mmcards", "nlme", "shiny", "shinythemes"] }, "scellpam": { "name": "scellpam", - "version": "1.4.5", - "sha256": "0sgwqpmjwnwvs8s3l4x264kndjsh3k7h5mpxyl0za9s4na3y6s9j", - "depends": ["cluster", "memuse", "Rcpp"] + "version": "1.4.6.2", + "sha256": "0hxbvgq6mq365q8hw91k0pm0ky9psivcd98bxafrgrncqc117cd1", + "depends": ["Rcpp", "cluster", "memuse"] }, "scenes": { "name": "scenes", @@ -107237,19 +108353,19 @@ "name": "scgwr", "version": "0.1.2-21", "sha256": "15pwasxkwirr2wwf8w02cy8zx0bqavzyfixjz3m37c1llrhddpka", - "depends": ["dplyr", "FNN", "optimParallel", "sp", "spData"] + "depends": ["FNN", "dplyr", "optimParallel", "sp", "spData"] }, "sched": { "name": "sched", "version": "1.0.1", "sha256": "0cbbchax694aqbi12hxnssmfk8x56k5wdzkshbzanwjn2ivvr1rb", - "depends": ["chk", "fscache", "lgr", "openssl", "R6", "RCurl"] + "depends": ["R6", "RCurl", "chk", "fscache", "lgr", "openssl"] }, "schemr": { "name": "schemr", - "version": "0.2.0", - "sha256": "192dk2b69wlwwkqrkk1n05q8hsn6djxhscjizj3amj4b701xw612", - "depends": ["apcluster", "dplyr", "magrittr", "OpenImageR", "purrr", "stringr"] + "version": "0.3.0", + "sha256": "0g27w49mg3sd2mc82cj18dafhg757nig1gax8aiqyraga55a4hb1", + "depends": ["OpenImageR", "apcluster", "dplyr", "magrittr", "purrr", "stringr"] }, "schoRsch": { "name": "schoRsch", @@ -107267,7 +108383,7 @@ "name": "scholar", "version": "0.2.4", "sha256": "12r4j1s71szh77nsnqzsi0q5cvkp0cyr2fxzcagk02f42bnp5aww", - "depends": ["dplyr", "ggplot2", "ggraph", "httr", "R_cache", "rlang", "rvest", "stringr", "tidygraph", "xml2"] + "depends": ["R_cache", "dplyr", "ggplot2", "ggraph", "httr", "rlang", "rvest", "stringr", "tidygraph", "xml2"] }, "schoolmath": { "name": "schoolmath", @@ -107309,7 +108425,7 @@ "name": "scicomptools", "version": "1.0.0", "sha256": "193byqr8sjb0hk1k4qj26pnqr5dgqfsxn47ckddgcvzk6ybd6cpl", - "depends": ["data_tree", "dplyr", "ggplot2", "ggwordcloud", "gitcreds", "googledrive", "magrittr", "purrr", "readxl", "SemNetCleaner", "stringr", "tibble", "tidyr", "tidytext", "tidyxl"] + "depends": ["SemNetCleaner", "data_tree", "dplyr", "ggplot2", "ggwordcloud", "gitcreds", "googledrive", "magrittr", "purrr", "readxl", "stringr", "tibble", "tidyr", "tidytext", "tidyxl"] }, "scidesignR": { "name": "scidesignR", @@ -107357,13 +108473,13 @@ "name": "scistreer", "version": "1.2.0", "sha256": "03nd4p7ik66v09yv18c0z1bvdnkr5m0axk78yapd2ri80ihmyi3c", - "depends": ["ape", "dplyr", "ggplot2", "ggtree", "igraph", "parallelDist", "patchwork", "phangorn", "Rcpp", "RcppArmadillo", "RcppParallel", "reshape2", "RhpcBLASctl", "stringr", "tidygraph"] + "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "RhpcBLASctl", "ape", "dplyr", "ggplot2", "ggtree", "igraph", "parallelDist", "patchwork", "phangorn", "reshape2", "stringr", "tidygraph"] }, "scitb": { "name": "scitb", "version": "0.1.8", "sha256": "1dkp4ch2n3j09b49pp0wsnx7pd9c3007kjm4jm72mpk1z17w5c9f", - "depends": ["ggplot2", "MASS", "nortest", "reshape2", "stringi"] + "depends": ["MASS", "ggplot2", "nortest", "reshape2", "stringi"] }, "sclr": { "name": "sclr", @@ -107375,7 +108491,7 @@ "name": "scoper", "version": "1.3.0", "sha256": "0y0bqdxr4g929paddrgs8qqxzp0pwsc62kxl6lbzp4l2xmg3j2j2", - "depends": ["alakazam", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "Rcpp", "rlang", "scales", "shazam", "stringi", "tidyr"] + "depends": ["Rcpp", "alakazam", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "rlang", "scales", "shazam", "stringi", "tidyr"] }, "score": { "name": "score", @@ -107395,11 +108511,17 @@ "sha256": "09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl", "depends": ["car", "e1071", "gbm", "ggplot2", "partykit", "randomForest", "reshape2", "sqldf", "stringr"] }, + "scorematchingad": { + "name": "scorematchingad", + "version": "0.0.67", + "sha256": "1dfnnb5fd16i5m6mwxw60jq42cn8migpqmy0s2rbpd9jdg96lwpj", + "depends": ["FixedPoint", "MCMCpack", "R6", "Rcpp", "RcppEigen", "Rdpack", "optimx", "rlang"] + }, "scorepeak": { "name": "scorepeak", "version": "0.1.2", "sha256": "1g9n7kjqb9qk5b7hw8ysrc069w9dzc4z29ay6z1kbm0v4kkzp7bi", - "depends": ["checkmate", "Rcpp"] + "depends": ["Rcpp", "checkmate"] }, "scoring": { "name": "scoring", @@ -107411,7 +108533,7 @@ "name": "scoringRules", "version": "1.1.1", "sha256": "1qy521jhr5mj7999ncz27f3ggld2rqvgy3y3wznk23772xpgjgrr", - "depends": ["knitr", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "knitr"] }, "scoringfunctions": { "name": "scoringfunctions", @@ -107435,25 +108557,25 @@ "name": "scperturbR", "version": "0.1.0", "sha256": "0bddsfms1zaq8hfviw68n5n5mjiwg47hiyzbnnwbimxaamz4rkkb", - "depends": ["dplyr", "energy", "rdist", "Seurat"] + "depends": ["Seurat", "dplyr", "energy", "rdist"] }, "scpi": { "name": "scpi", "version": "2.2.5", "sha256": "12wr7kk57qv28kypk5czr0gv2xfib040m8k5047kdgd4fj3i6fhr", - "depends": ["abind", "CVXR", "doSNOW", "dplyr", "ECOSolveR", "fastDummies", "foreach", "ggplot2", "magrittr", "MASS", "Matrix", "purrr", "Qtools", "reshape2", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["CVXR", "ECOSolveR", "MASS", "Matrix", "Qtools", "abind", "doSNOW", "dplyr", "fastDummies", "foreach", "ggplot2", "magrittr", "purrr", "reshape2", "rlang", "stringr", "tibble", "tidyr"] }, "scplot": { "name": "scplot", - "version": "0.3.3", - "sha256": "09a7nj95jwmp99jcx6jb0pqgmb651xmf1zdmwi1qi62142lxqwvx", + "version": "0.4.0", + "sha256": "0ksk93i7vj616kbzs1i6wrngrzwqjb70imb1vmbk5r5lf9sningn", "depends": ["ggplot2", "mblm", "scan"] }, "scpoisson": { "name": "scpoisson", "version": "0.0.1", "sha256": "0v8is1y9mqbvcvhqay1a0ycbhfxwxqkxifmbxb0sjzxg02mla65x", - "depends": ["broom", "dplyr", "ggplot2", "glmpca", "magrittr", "Matrix", "matrixStats", "purrr", "Rdpack", "Seurat", "SeuratObject", "tidyr", "WGCNA"] + "depends": ["Matrix", "Rdpack", "Seurat", "SeuratObject", "WGCNA", "broom", "dplyr", "ggplot2", "glmpca", "magrittr", "matrixStats", "purrr", "tidyr"] }, "scqe": { "name": "scqe", @@ -107471,7 +108593,7 @@ "name": "scraEP", "version": "1.2", "sha256": "1qkfd4bp3sd3xrh9bdaqwmmvx7f9rvjcch6hi2p387ky04ywwqn4", - "depends": ["data_table", "rvest", "XML", "xml2"] + "depends": ["XML", "data_table", "rvest", "xml2"] }, "scrapeR": { "name": "scrapeR", @@ -107579,7 +108701,7 @@ "name": "sctransform", "version": "0.4.1", "sha256": "0wgimf7qqgnnmyspn2rpb4a8hl570fv0fwh0r0r4qgjlpvwffssz", - "depends": ["dplyr", "future", "future_apply", "ggplot2", "gridExtra", "magrittr", "MASS", "Matrix", "matrixStats", "Rcpp", "RcppArmadillo", "reshape2", "rlang"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "dplyr", "future", "future_apply", "ggplot2", "gridExtra", "magrittr", "matrixStats", "reshape2", "rlang"] }, "scuba": { "name": "scuba", @@ -107597,7 +108719,7 @@ "name": "sdPrior", "version": "1.0-0", "sha256": "0g4crlasnvxz752n3az5jc681jvvj2g87c3a8s2h1i2vh64p5h37", - "depends": ["doParallel", "GB2", "MASS", "mgcv", "mvtnorm", "pscl"] + "depends": ["GB2", "MASS", "doParallel", "mgcv", "mvtnorm", "pscl"] }, "sda": { "name": "sda", @@ -107609,7 +108731,7 @@ "name": "sdafilter", "version": "1.0.0", "sha256": "0y692j25pln46dp6xvaq17fkym0461yqfa6rv5avfw2b240k8jiq", - "depends": ["glasso", "glmnet", "huge", "POET"] + "depends": ["POET", "glasso", "glmnet", "huge"] }, "sdam": { "name": "sdam", @@ -107627,7 +108749,7 @@ "name": "sdcHierarchies", "version": "0.21.0", "sha256": "0ihfddjkqdmzpr62dackblwbjcvbkhzm4ap1xzbn4m8i3z1nlbi0", - "depends": ["cli", "data_table", "jsonlite", "Rcpp", "rlang", "shiny", "shinyjs", "shinythemes", "shinyTree"] + "depends": ["Rcpp", "cli", "data_table", "jsonlite", "rlang", "shiny", "shinyTree", "shinyjs", "shinythemes"] }, "sdcLog": { "name": "sdcLog", @@ -107639,7 +108761,7 @@ "name": "sdcMicro", "version": "5.7.8", "sha256": "18qd30rvhqxyh8sxmajc0cs4wys0wvpl7nqw0dhapjkgygwk5nrq", - "depends": ["car", "carData", "cluster", "data_table", "DT", "e1071", "ggplot2", "haven", "knitr", "MASS", "prettydoc", "Rcpp", "rhandsontable", "rmarkdown", "robustbase", "shiny", "shinyBS", "VIM", "xtable"] + "depends": ["DT", "MASS", "Rcpp", "VIM", "car", "carData", "cluster", "data_table", "e1071", "ggplot2", "haven", "knitr", "prettydoc", "rhandsontable", "rmarkdown", "robustbase", "shiny", "shinyBS", "xtable"] }, "sdcSpatial": { "name": "sdcSpatial", @@ -107651,31 +108773,31 @@ "name": "sdcTable", "version": "0.32.6", "sha256": "15jjc25zmxlhh6jvf1ml9q2ngf3blr6c1rarfsx993i4lbb6lg12", - "depends": ["data_table", "glpkAPI", "knitr", "Matrix", "progress", "Rcpp", "Rglpk", "rlang", "sdcHierarchies", "slam", "SSBtools", "stringr"] + "depends": ["Matrix", "Rcpp", "Rglpk", "SSBtools", "data_table", "glpkAPI", "knitr", "progress", "rlang", "sdcHierarchies", "slam", "stringr"] }, "sde": { "name": "sde", "version": "2.0.18", "sha256": "1rk9wqaam21fipsinag3ychfkl6p7fpgbamr0119v8gjgskajxl8", - "depends": ["fda", "MASS", "zoo"] + "depends": ["MASS", "fda", "zoo"] }, "sdetorus": { "name": "sdetorus", "version": "0.1.10", "sha256": "09y23s5pxrhfv2l4q08vi8rf1nwainyy7dm0aij10sfwr86k0brn", - "depends": ["mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "mvtnorm"] }, "sdm": { "name": "sdm", - "version": "1.2-40", - "sha256": "1mcalw96mpylgi9yalm0pxxcmv9724vaylgkanmx2cbnsjracq2z", + "version": "1.2-46", + "sha256": "035x08bml5d3yw5ikh8kicvlzd2hnv679cpfab3ssib96scd6662", "depends": ["raster", "sp", "terra"] }, "sdmTMB": { "name": "sdmTMB", "version": "0.6.0", "sha256": "0v2kmyppax5f1g1jji7l2m6v49kxj65r81giv84hnkwmcqdzsic8", - "depends": ["assertthat", "cli", "clisymbols", "fishMod", "fmesher", "generics", "lifecycle", "lme4", "Matrix", "mgcv", "mvtnorm", "nlme", "RcppEigen", "rlang", "TMB"] + "depends": ["Matrix", "RcppEigen", "TMB", "assertthat", "cli", "clisymbols", "fishMod", "fmesher", "generics", "lifecycle", "lme4", "mgcv", "mvtnorm", "nlme", "rlang"] }, "sdmpredictors": { "name": "sdmpredictors", @@ -107693,13 +108815,13 @@ "name": "sdpdth", "version": "0.2", "sha256": "1yn8fsjxpbagargf3mv0p23vsgnl64dxfkggrzvfp0ylxsx8nnvc", - "depends": ["Matrix", "matrixcalc", "rCMA", "Rcpp", "RcppArmadillo", "rJava"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "matrixcalc", "rCMA", "rJava"] }, "sdprisk": { "name": "sdprisk", "version": "1.1-6", "sha256": "061x78irryc5phd8bv9cs2mfgiajgwmr85ryp1r47anadydb2haa", - "depends": ["numDeriv", "PolynomF", "rootSolve"] + "depends": ["PolynomF", "numDeriv", "rootSolve"] }, "sdpt3r": { "name": "sdpt3r", @@ -107713,6 +108835,12 @@ "sha256": "1kiq73m1wzqa8d0542nhm2bh7rc0bib0jnrwccawjyxmhm4jix73", "depends": ["pracma", "psych", "tseries"] }, + "sdtmchecks": { + "name": "sdtmchecks", + "version": "1.0.0", + "sha256": "0dpnvyfgvaqj3n4ci7hjqb1mvj3f5hsab4h02vz5q2brx7fq4ll0", + "depends": ["dplyr", "openxlsx", "tidyselect"] + }, "sdtmval": { "name": "sdtmval", "version": "0.4.1", @@ -107729,7 +108857,7 @@ "name": "seacarb", "version": "3.3.3", "sha256": "1xrwvkal60dkj4i6h27dskbliizkz6q476s06627asjacy8vdls3", - "depends": ["gsw", "oce", "SolveSAPHE"] + "depends": ["SolveSAPHE", "gsw", "oce"] }, "sealasso": { "name": "sealasso", @@ -107753,7 +108881,7 @@ "name": "season", "version": "0.3.15", "sha256": "0f63ichlnj49g0ni9560avr4415iyj5061pixkjmqj83y7bbsz22", - "depends": ["ggplot2", "MASS", "survival"] + "depends": ["MASS", "ggplot2", "survival"] }, "seasonal": { "name": "seasonal", @@ -107765,7 +108893,7 @@ "name": "seasonalityPlot", "version": "1.2.1", "sha256": "03gfbpzy97kjw1mxm9xqh384ilyap2nqn4j5ir22rdyg60rfj2mp", - "depends": ["assertthat", "crypto2", "dygraphs", "htmltools", "lubridate", "magrittr", "plotrix", "quantmod", "TTR", "zoo"] + "depends": ["TTR", "assertthat", "crypto2", "dygraphs", "htmltools", "lubridate", "magrittr", "plotrix", "quantmod", "zoo"] }, "seasonalview": { "name": "seasonalview", @@ -107787,15 +108915,15 @@ }, "secr": { "name": "secr", - "version": "4.6.7", - "sha256": "1zr2yp51dx5f8ggvwd9bspa3j08yjh6bpph7mpxqky7cn2clbf9b", - "depends": ["abind", "BH", "MASS", "mgcv", "nlme", "raster", "Rcpp", "RcppEigen", "RcppNumerical", "RcppParallel", "sf", "stringr", "terra"] + "version": "4.6.9", + "sha256": "1rm7hlfwz8wf4551dw79figmx6n968dlyrq1n2agdv5wdv97gjdg", + "depends": ["BH", "MASS", "Rcpp", "RcppEigen", "RcppNumerical", "RcppParallel", "abind", "mgcv", "nlme", "raster", "sf", "stringr", "terra"] }, "secrdesign": { "name": "secrdesign", "version": "2.9.1", "sha256": "03aibck9r4rs9cc9rywm8rs9s9swp7wil1xgfgy6fxpxypapqfvx", - "depends": ["abind", "BH", "kofnGA", "Rcpp", "RcppArmadillo", "secr", "sf"] + "depends": ["BH", "Rcpp", "RcppArmadillo", "abind", "kofnGA", "secr", "sf"] }, "secret": { "name": "secret", @@ -107805,8 +108933,8 @@ }, "secretbase": { "name": "secretbase", - "version": "1.0.0", - "sha256": "1lnmkppw6scgdd3qd45jfvnrxx5bsa4b37z212aq6ss7xxjlv8wh", + "version": "1.0.1", + "sha256": "013f9lvsgfr5way2clkrwb1r2s9kvq2d3al68yjmf1lfpdmc1fdb", "depends": [] }, "secrettext": { @@ -107819,19 +108947,19 @@ "name": "secrlinear", "version": "1.2.2", "sha256": "1ivhl5imc7ic72h4v5276d2n02s39j78lcdr0rcx3dqycf3yyqag", - "depends": ["igraph", "MASS", "secr", "sf", "sp"] + "depends": ["MASS", "igraph", "secr", "sf", "sp"] }, "secsse": { "name": "secsse", "version": "3.1.0", "sha256": "0v4qjsjmc7shqx8cy92c99fh6bfy2zdkwi2as05r2h4c2vk3p73z", - "depends": ["ape", "BH", "DDD", "geiger", "ggplot2", "Rcpp", "RcppParallel", "rlang", "tibble", "treestats"] + "depends": ["BH", "DDD", "Rcpp", "RcppParallel", "ape", "geiger", "ggplot2", "rlang", "tibble", "treestats"] }, "sectorgap": { "name": "sectorgap", "version": "0.1.0", "sha256": "0nn9cpy7svil2y9snvk5zznnlqd825gb4kxp31kzwcvwf5frx8q2", - "depends": ["dplyr", "ggplot2", "KFAS", "MCMCpack", "tempdisagg", "tidyr", "zoo"] + "depends": ["KFAS", "MCMCpack", "dplyr", "ggplot2", "tempdisagg", "tidyr", "zoo"] }, "secuTrialR": { "name": "secuTrialR", @@ -107853,15 +108981,15 @@ }, "see": { "name": "see", - "version": "0.8.4", - "sha256": "0xz1n8n232jhp8r8w5isp1nzxscj0fqfm3hxgq6725hm14sl9wqj", + "version": "0.8.5", + "sha256": "1c0pgl9k0m2zdwcz4sf158wpg1gkza1hqcry6hjqql7rg2dga7f8", "depends": ["bayestestR", "correlation", "datawizard", "effectsize", "ggplot2", "insight", "modelbased", "parameters", "performance"] }, "seeclickfixr": { "name": "seeclickfixr", "version": "1.1.0", "sha256": "1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n", - "depends": ["jsonlite", "RCurl"] + "depends": ["RCurl", "jsonlite"] }, "seecolor": { "name": "seecolor", @@ -107877,9 +109005,9 @@ }, "seededlda": { "name": "seededlda", - "version": "1.2.1", - "sha256": "1nvlmfx1ib9ffgippnlgiy7srnc4gasqailvsc0xfyxn70hsz9pb", - "depends": ["Matrix", "proxyC", "quanteda", "Rcpp", "RcppArmadillo", "testthat"] + "version": "1.3.2", + "sha256": "0333b74aiam8k8rgqbbaqqlnh1mbqlyz0lxbpbqpvd2sb50ic3fx", + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "proxyC", "quanteda", "testthat"] }, "seedr": { "name": "seedr", @@ -107897,19 +109025,19 @@ "name": "seeds", "version": "0.9.1", "sha256": "0adk7y5ripg78bwkdgnlfwq9w9h6mlpdrikgbnn5z8az2qahc0in", - "depends": ["callr", "coda", "Deriv", "deSolve", "dplyr", "ggplot2", "Hmisc", "MASS", "matrixStats", "mvtnorm", "pracma", "R_utils", "Ryacas", "statmod", "tidyr"] + "depends": ["Deriv", "Hmisc", "MASS", "R_utils", "Ryacas", "callr", "coda", "deSolve", "dplyr", "ggplot2", "matrixStats", "mvtnorm", "pracma", "statmod", "tidyr"] }, "seeker": { "name": "seeker", "version": "1.1.5", "sha256": "14gxxa7d929ynlrsxz24nprfy1q2x51lh2zxg8wpi3yswphkvd6b", - "depends": ["affy", "AnnotationDbi", "BiocManager", "biomaRt", "checkmate", "curl", "data_table", "foreach", "GEOquery", "glue", "jsonlite", "qs", "R_utils", "RCurl", "readr", "sessioninfo", "tximport", "withr", "yaml"] + "depends": ["AnnotationDbi", "BiocManager", "GEOquery", "RCurl", "R_utils", "affy", "biomaRt", "checkmate", "curl", "data_table", "foreach", "glue", "jsonlite", "qs", "readr", "sessioninfo", "tximport", "withr", "yaml"] }, "seer": { "name": "seer", "version": "1.1.8", "sha256": "13r26iyciq9wbzn4r3447s4j4m6k5sdymp704i6hkf0fphv4340c", - "depends": ["dplyr", "forecast", "forecTheta", "furrr", "future", "magrittr", "purrr", "randomForest", "stringr", "tibble", "tsfeatures", "urca"] + "depends": ["dplyr", "forecTheta", "forecast", "furrr", "future", "magrittr", "purrr", "randomForest", "stringr", "tibble", "tsfeatures", "urca"] }, "seewave": { "name": "seewave", @@ -107921,7 +109049,7 @@ "name": "segMGarch", "version": "1.2", "sha256": "0chw41h25jka9wa3rf3d8dq2ym47379jflv33q6qxaak8xy1kmd9", - "depends": ["corpcor", "doParallel", "fGarch", "foreach", "iterators", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "corpcor", "doParallel", "fGarch", "foreach", "iterators", "mvtnorm"] }, "segRDA": { "name": "segRDA", @@ -107933,19 +109061,19 @@ "name": "segclust2d", "version": "0.3.3", "sha256": "0vsdmlpf9nd8lbv8iwvywrzajbpc76ifvx2fx7mlai1pskgyqfwm", - "depends": ["cli", "dplyr", "ggplot2", "magrittr", "plyr", "RColorBrewer", "Rcpp", "RcppArmadillo", "reshape2", "rlang", "scales", "zoo"] + "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "cli", "dplyr", "ggplot2", "magrittr", "plyr", "reshape2", "rlang", "scales", "zoo"] }, "segen": { "name": "segen", "version": "1.1.0", "sha256": "1l60rb1w0rfp1rv5favi4yxzyqs1nb1881mcz66xv789r3awhp11", - "depends": ["entropy", "fANCOVA", "fastDummies", "ggplot2", "greybox", "imputeTS", "lubridate", "modeest", "moments", "narray", "philentropy", "purrr", "readr", "Rfast", "scales", "tictoc"] + "depends": ["Rfast", "entropy", "fANCOVA", "fastDummies", "ggplot2", "greybox", "imputeTS", "lubridate", "modeest", "moments", "narray", "philentropy", "purrr", "readr", "scales", "tictoc"] }, "segmag": { "name": "segmag", "version": "1.2.4", "sha256": "1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm", - "depends": ["plyr", "Rcpp"] + "depends": ["Rcpp", "plyr"] }, "segmenTier": { "name": "segmenTier", @@ -107955,15 +109083,15 @@ }, "segmented": { "name": "segmented", - "version": "2.1-0", - "sha256": "1whcch1lw9y5fgy205377hr69xdjmav57z63vzgj7ammihja0yvd", + "version": "2.1-1", + "sha256": "1p83g6qj8y4xblggm12bhr9zpsqbrrc7lbbigxcafhhi9c8v08v7", "depends": ["MASS", "nlme"] }, "segmentr": { "name": "segmentr", "version": "0.2.0", "sha256": "0q5kxxiw0akpk7w2a2l9zp7v4pvqblzdvrld5fjyl5f6h8hsb40z", - "depends": ["foreach", "glue", "Rcpp"] + "depends": ["Rcpp", "foreach", "glue"] }, "segmetric": { "name": "segmetric", @@ -107975,12 +109103,12 @@ "name": "segregation", "version": "1.1.0", "sha256": "1l2dlqva58l9glpsn1bflbggk0645zhsr3a1n1ydikp7q54wf72m", - "depends": ["checkmate", "data_table", "Rcpp", "RcppProgress"] + "depends": ["Rcpp", "RcppProgress", "checkmate", "data_table"] }, "segregatr": { "name": "segregatr", - "version": "0.3.0", - "sha256": "1n6fdq16lymfk49z75y2d9s8n9l0v8i0987cfnxigqz8h5jyzm6x", + "version": "0.4.0", + "sha256": "12par5appi94jliz8lghrhj3q6ws99hw49r2mcgs8g5c0mzgmp4x", "depends": ["pedprobr", "pedtools"] }, "seguid": { @@ -107993,7 +109121,7 @@ "name": "sehrnett", "version": "0.1.0", "sha256": "0nsgaf79cs2fnjb42vzlmbi92290vrlp5bpgg6mnik3yh5fq2ndr", - "depends": ["DBI", "dplyr", "magrittr", "purrr", "RSQLite", "tibble"] + "depends": ["DBI", "RSQLite", "dplyr", "magrittr", "purrr", "tibble"] }, "seismic": { "name": "seismic", @@ -108011,7 +109139,7 @@ "name": "sejmRP", "version": "1.3.4", "sha256": "1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0", - "depends": ["cluster", "DBI", "dplyr", "factoextra", "RPostgreSQL", "rvest", "stringi", "tidyr", "XML", "xml2"] + "depends": ["DBI", "RPostgreSQL", "XML", "cluster", "dplyr", "factoextra", "rvest", "stringi", "tidyr", "xml2"] }, "selcorr": { "name": "selcorr", @@ -108047,7 +109175,7 @@ "name": "selectiveInference", "version": "1.2.5", "sha256": "07kzpvdmflca1sriqfzn20f84fx2b9kwwiqm91lqjpx854bsx5kh", - "depends": ["adaptMCMC", "glmnet", "intervals", "MASS", "Rcpp", "survival"] + "depends": ["MASS", "Rcpp", "adaptMCMC", "glmnet", "intervals", "survival"] }, "selectr": { "name": "selectr", @@ -108071,7 +109199,7 @@ "name": "selenium", "version": "0.1.3", "sha256": "1v1bh9a1ybzwyzfsy7q82cjjaz2011zi9i80y275ayjwdsw1rfyf", - "depends": ["httr2", "jsonlite", "lifecycle", "processx", "R6", "rappdirs", "rlang"] + "depends": ["R6", "httr2", "jsonlite", "lifecycle", "processx", "rappdirs", "rlang"] }, "seleniumPipes": { "name": "seleniumPipes", @@ -108089,7 +109217,7 @@ "name": "sem", "version": "3.1-15", "sha256": "05hk72zxvyv6kkjhk5y6qw253c64108az7030z8j1sz8wq03n0md", - "depends": ["boot", "MASS", "mi"] + "depends": ["MASS", "boot", "mi"] }, "semEff": { "name": "semEff", @@ -108101,7 +109229,7 @@ "name": "semPlot", "version": "1.1.6", "sha256": "0s9bp4pfsllg1k4x8a36yw82fw432dyz0xvmvi8dw9l12q3jkx8i", - "depends": ["colorspace", "corpcor", "igraph", "lavaan", "lisrelToR", "OpenMx", "plyr", "qgraph", "rockchalk", "sem", "XML"] + "depends": ["OpenMx", "XML", "colorspace", "corpcor", "igraph", "lavaan", "lisrelToR", "plyr", "qgraph", "rockchalk", "sem"] }, "semPower": { "name": "semPower", @@ -108149,7 +109277,7 @@ "name": "semfindr", "version": "0.1.8", "sha256": "02p2l5xsy53v6485as8azqamqy6cnjfmxb9zav1wnhm9p7d1f9ss", - "depends": ["ggplot2", "ggrepel", "lavaan", "Matrix", "rlang"] + "depends": ["Matrix", "ggplot2", "ggrepel", "lavaan", "rlang"] }, "semgram": { "name": "semgram", @@ -108167,13 +109295,13 @@ "name": "semiArtificial", "version": "2.4.1", "sha256": "0zsn3r5n7n3dsa02i194lr6ail7mizq9xp8x3kc5k17z4ckcfysd", - "depends": ["cluster", "CORElearn", "flexclust", "fpc", "ks", "logspline", "MASS", "mcclust", "nnet", "robustbase", "RSNNS", "StatMatch", "timeDate"] + "depends": ["CORElearn", "MASS", "RSNNS", "StatMatch", "cluster", "flexclust", "fpc", "ks", "logspline", "mcclust", "nnet", "robustbase", "timeDate"] }, "semicmprskcoxmsm": { "name": "semicmprskcoxmsm", "version": "0.2.0", "sha256": "00nxmyp4g1pxzqrw3zd5il92vinzpy12wnjnpm33nbh4wx2i5356", - "depends": ["fastGHQuad", "ggplot2", "Rcpp", "survival", "twang"] + "depends": ["Rcpp", "fastGHQuad", "ggplot2", "survival", "twang"] }, "semicontMANOVA": { "name": "semicontMANOVA", @@ -108185,7 +109313,7 @@ "name": "semidist", "version": "0.1.0", "sha256": "0bgl7z78psd2b3v4c4fzhq0r8w0zfn408ji21cw1x7h87dg70qr2", - "depends": ["energy", "FNN", "furrr", "purrr", "Rcpp", "RcppArmadillo"] + "depends": ["FNN", "Rcpp", "RcppArmadillo", "energy", "furrr", "purrr"] }, "seminr": { "name": "seminr", @@ -108197,7 +109325,13 @@ "name": "semlbci", "version": "0.11.2", "sha256": "131nbwq8g0l2imbjv61l83c5avhwqndhdgwkaf0hj0h6a0qwvhqa", - "depends": ["callr", "ggplot2", "ggrepel", "lavaan", "MASS", "nloptr", "pbapply", "rlang"] + "depends": ["MASS", "callr", "ggplot2", "ggrepel", "lavaan", "nloptr", "pbapply", "rlang"] + }, + "semlrtp": { + "name": "semlrtp", + "version": "0.1.1", + "sha256": "089hw80rwi4rxlz1b04jyylc7rnqpv6b1nl89w6pzdkk0dv98h4g", + "depends": ["lavaan", "pbapply"] }, "semmcci": { "name": "semmcci", @@ -108221,7 +109355,7 @@ "name": "semnova", "version": "0.1-6", "sha256": "1vghf8gy0vahwn3nq752wm0rbj33jdy69yqjzin94sk8xa42d0wi", - "depends": ["lavaan", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "lavaan"] }, "semptools": { "name": "semptools", @@ -108239,19 +109373,19 @@ "name": "semtree", "version": "0.9.20", "sha256": "1dcxnlnl5j9dha5bdmj4rn117cbssdzp1gwdnch2pc0234ziq4ys", - "depends": ["clisymbols", "cluster", "crayon", "data_table", "expm", "future_apply", "ggplot2", "gridBase", "lavaan", "OpenMx", "rpart", "rpart_plot", "sandwich", "strucchange", "tidyr", "zoo"] + "depends": ["OpenMx", "clisymbols", "cluster", "crayon", "data_table", "expm", "future_apply", "ggplot2", "gridBase", "lavaan", "rpart", "rpart_plot", "sandwich", "strucchange", "tidyr", "zoo"] }, "semver": { "name": "semver", "version": "0.2.0", "sha256": "10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy", - "depends": ["assertthat", "Rcpp"] + "depends": ["Rcpp", "assertthat"] }, "semverutils": { "name": "semverutils", "version": "0.1.0", "sha256": "0y3zh8n8bgs3ag8yy9cnp0i0xrn0iqflcbrya70glyb40148w9sw", - "depends": ["foreach", "R6"] + "depends": ["R6", "foreach"] }, "sendgridr": { "name": "sendgridr", @@ -108263,7 +109397,7 @@ "name": "sendigR", "version": "1.0.0", "sha256": "0zc9hbxfvgb9dgmyqj5dsm2pcfykx6sk3wjcbxmpk7shyb34b6yl", - "depends": ["cicerone", "data_table", "DescTools", "dplyr", "DT", "ggplot2", "haven", "Hmisc", "htmltools", "magrittr", "parsedate", "plotly", "readxl", "reticulate", "RSQLite", "shiny", "shinydashboard", "sjlabelled", "stringr", "xfun"] + "depends": ["DT", "DescTools", "Hmisc", "RSQLite", "cicerone", "data_table", "dplyr", "ggplot2", "haven", "htmltools", "magrittr", "parsedate", "plotly", "readxl", "reticulate", "shiny", "shinydashboard", "sjlabelled", "stringr", "xfun"] }, "sendmailR": { "name": "sendmailR", @@ -108279,14 +109413,14 @@ }, "sense": { "name": "sense", - "version": "1.0.0", - "sha256": "09idl88n6jlgbn5apgk0vr1bwmqi624ikv1qfx7hvyi79ixg49f4", - "depends": ["bbotk", "data_table", "forcats", "lubridate", "Metrics", "mlr3", "mlr3filters", "mlr3learners", "mlr3pipelines", "mlr3tuning", "mlr3viz", "paradox", "purrr", "readr", "tictoc", "visNetwork"] + "version": "1.1.0", + "sha256": "10cvjhvzfz1y8372wryxxzi0p6xlcchgdhs8idjgk3isvjbps953", + "depends": ["Metrics", "bbotk", "data_table", "forcats", "lubridate", "mlr3", "mlr3filters", "mlr3learners", "mlr3pipelines", "mlr3tuning", "mlr3viz", "paradox", "purrr", "readr", "tictoc", "visNetwork"] }, "sensemakr": { "name": "sensemakr", - "version": "0.1.4", - "sha256": "1bwc4m9fz250iyq5rl63ncgnb5f9490aas8gp51r7yljagq584va", + "version": "0.1.6", + "sha256": "1r4vmprwq91bda9klmw6aaqg1fklqs9da094ggf6qx7lh4kvj9xz", "depends": [] }, "sensiPhy": { @@ -108305,7 +109439,7 @@ "name": "sensitivity", "version": "1.30.0", "sha256": "1larcjjl3yy8rk448m0k77h9bc1mfsm7n8wxf6i2ig2fbyh1rlkl", - "depends": ["boot", "dtwclust", "foreach", "ggplot2", "numbers", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "boot", "dtwclust", "foreach", "ggplot2", "numbers"] }, "sensitivity2x2xk": { "name": "sensitivity2x2xk", @@ -108353,13 +109487,13 @@ "name": "sensobol", "version": "1.1.5", "sha256": "0vw53aqlgdqncy8cpwlc959bavrsfqam7yq99ic6ij8kxqf4h9xl", - "depends": ["boot", "data_table", "deSolve", "ggplot2", "lhs", "magrittr", "matrixStats", "randtoolbox", "Rcpp", "RcppArmadillo", "Rdpack", "Rfast", "rlang", "scales", "stringr"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "Rfast", "boot", "data_table", "deSolve", "ggplot2", "lhs", "magrittr", "matrixStats", "randtoolbox", "rlang", "scales", "stringr"] }, "sensory": { "name": "sensory", "version": "1.1", "sha256": "1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7", - "depends": ["gtools", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "gtools"] }, "senstrat": { "name": "senstrat", @@ -108389,13 +109523,13 @@ "name": "sentometrics", "version": "1.0.0", "sha256": "06qvwfgshr70n1qgf2zqjvycwwrak8d5hfyn3v5k2qzkfaxkihmm", - "depends": ["caret", "data_table", "foreach", "ggplot2", "glmnet", "ISOweek", "quanteda", "Rcpp", "RcppArmadillo", "RcppParallel", "RcppRoll", "stringi"] + "depends": ["ISOweek", "Rcpp", "RcppArmadillo", "RcppParallel", "RcppRoll", "caret", "data_table", "foreach", "ggplot2", "glmnet", "quanteda", "stringi"] }, "sentopics": { "name": "sentopics", "version": "0.7.3", "sha256": "1n9z2k4nwzd7j2nliar4v1as1vixx6cbmcysf4phjmh7qfay8bqk", - "depends": ["data_table", "generics", "quanteda", "Rcpp", "RcppArmadillo", "RcppHungarian", "RcppProgress"] + "depends": ["Rcpp", "RcppArmadillo", "RcppHungarian", "RcppProgress", "data_table", "generics", "quanteda"] }, "sentryR": { "name": "sentryR", @@ -108407,13 +109541,13 @@ "name": "separationplot", "version": "1.4", "sha256": "1dvm073mckn6mkyf6fvclc8glsr8d3p2413x5i91w00hphm2lg8z", - "depends": ["foreign", "Hmisc", "MASS", "RColorBrewer"] + "depends": ["Hmisc", "MASS", "RColorBrewer", "foreign"] }, "sephora": { "name": "sephora", "version": "0.1.31", "sha256": "1axh5qd8mp55d45k34935sm0wc6ib4b309a92d1vaxz3hzgvbygi", - "depends": ["doParallel", "dplyr", "dtwclust", "eBsc", "foreach", "geoTS", "ggnewscale", "ggplot2", "MASS", "nlme", "rootSolve", "spiralize"] + "depends": ["MASS", "doParallel", "dplyr", "dtwclust", "eBsc", "foreach", "geoTS", "ggnewscale", "ggplot2", "nlme", "rootSolve", "spiralize"] }, "sepkoski": { "name": "sepkoski", @@ -108431,7 +109565,7 @@ "name": "seqHMM", "version": "1.2.6", "sha256": "17rphq6n2pzgxma0v27vaixi4a343gzc6sk15czfd96kfz7m0gad", - "depends": ["gridBase", "igraph", "Matrix", "nloptr", "numDeriv", "Rcpp", "RcppArmadillo", "TraMineR"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "TraMineR", "gridBase", "igraph", "nloptr", "numDeriv"] }, "seqICP": { "name": "seqICP", @@ -108445,12 +109579,6 @@ "sha256": "1p1flpw055jb135jpqlgdyyn19p6hwiqj9kx085irlyczi5kiimi", "depends": ["dplyr", "haven"] }, - "seqest": { - "name": "seqest", - "version": "1.0.1", - "sha256": "06zk87n26305m0hy6lg7v3bpxmsqvinwkvw3dvmzkqp5jdkhwikb", - "depends": ["foreach", "geepack", "MASS", "mvtnorm", "nnet", "Rcpp", "RcppArmadillo", "VGAM"] - }, "seqgendiff": { "name": "seqgendiff", "version": "1.2.4", @@ -108467,7 +109595,7 @@ "name": "seqimpute", "version": "2.0.0", "sha256": "1g60drnx12j6wzkisxlmhidvqzzgsrmmmmp8dljq94bb5iv8xjmz", - "depends": ["Amelia", "cluster", "dfidx", "doRNG", "doSNOW", "dplyr", "foreach", "mice", "mlr", "nnet", "plyr", "ranger", "rms", "stringr", "TraMineR", "TraMineRextras"] + "depends": ["Amelia", "TraMineR", "TraMineRextras", "cluster", "dfidx", "doRNG", "doSNOW", "dplyr", "foreach", "mice", "mlr", "nnet", "plyr", "ranger", "rms", "stringr"] }, "seqinr": { "name": "seqinr", @@ -108503,7 +109631,7 @@ "name": "seqtrie", "version": "0.2.8", "sha256": "12pkcb5ylqlr7ljzrwna6fjqvnikgvsr7k664bw6xkbx1g370s2a", - "depends": ["BH", "dplyr", "R6", "Rcpp", "RcppParallel", "rlang", "stringi"] + "depends": ["BH", "R6", "Rcpp", "RcppParallel", "dplyr", "rlang", "stringi"] }, "sequoia": { "name": "sequoia", @@ -108515,7 +109643,7 @@ "name": "sergeant", "version": "0.9.1", "sha256": "0mgrrlny1qfddznyc34awh8vkbjnyskbyqrxszdhsm2c5wgp2nwh", - "depends": ["bit64", "DBI", "dbplyr", "dplyr", "htmltools", "httr", "jsonlite", "magrittr", "purrr", "readr", "scales", "stringi", "tibble"] + "depends": ["DBI", "bit64", "dbplyr", "dplyr", "htmltools", "httr", "jsonlite", "magrittr", "purrr", "readr", "scales", "stringi", "tibble"] }, "serial": { "name": "serial", @@ -108527,7 +109655,7 @@ "name": "seriation", "version": "1.5.5", "sha256": "0v84pic838rpbcmrz8ip466aagz57vmzlgfk0vkhlcv8zn34r0zp", - "depends": ["ca", "cluster", "colorspace", "foreach", "gclus", "MASS", "qap", "registry", "TSP", "vegan"] + "depends": ["MASS", "TSP", "ca", "cluster", "colorspace", "foreach", "gclus", "qap", "registry", "vegan"] }, "serieslcb": { "name": "serieslcb", @@ -108535,6 +109663,12 @@ "sha256": "1ip4k2xzg06hwsni62ai1whs1zzhwlf94507inpfpqz3jmmafrhq", "depends": ["gplots", "shiny"] }, + "serocalculator": { + "name": "serocalculator", + "version": "1.0.3", + "sha256": "1cxwii35gp9dybjp2989wbmsrv9f3s1qxrrsl4s57lj3q1by2kpk", + "depends": ["Rcpp", "cli", "doParallel", "dplyr", "foreach", "ggplot2", "ggpubr", "lifecycle", "magrittr", "mixtools", "rlang", "rngtools", "scales", "tibble", "tidyr"] + }, "serp": { "name": "serp", "version": "0.2.4", @@ -108543,8 +109677,8 @@ }, "serpstatr": { "name": "serpstatr", - "version": "0.2.1", - "sha256": "09yzxkwgargd42f0bngv6jzhd8arzbvwj2js7lb9yf7vhjq1xv5f", + "version": "0.3.0", + "sha256": "087rlfqdx74rx9fil4lgchl0v8mzs3ld46ji89nx885913wfhjf2", "depends": ["httr"] }, "serrsBayes": { @@ -108615,9 +109749,9 @@ }, "sevenbridges2": { "name": "sevenbridges2", - "version": "0.1.0", - "sha256": "1z3sp85jvqzzf6szi2bz69wyp44spvc0r2gm81shak2fk5z8460f", - "depends": ["checkmate", "cli", "curl", "data_table", "DescTools", "glue", "httr", "jsonlite", "purrr", "R6", "readr", "rlang", "stringr", "yaml"] + "version": "0.2.0", + "sha256": "065r7qggr3hb4jzwbw5sfkimyvaqr9pgyqa5k7aagmy5xdsgzczp", + "depends": ["DescTools", "R6", "checkmate", "cli", "curl", "data_table", "glue", "httr", "jsonlite", "purrr", "readr", "rlang", "stringr", "yaml"] }, "sever": { "name": "sever", @@ -108629,19 +109763,19 @@ "name": "sewage", "version": "0.2.5", "sha256": "171rd59w90q29a9ywdx5225gw6m57bz9rcj25ql38jk62xdmrx69", - "depends": ["cli", "DiagrammeR", "glue"] + "depends": ["DiagrammeR", "cli", "glue"] }, "sf": { "name": "sf", "version": "1.0-16", "sha256": "11wrbaj5s0dqbnh1mfm03l7xi9flzx8grgbkqxrs1wnd2481jvp9", - "depends": ["classInt", "DBI", "magrittr", "Rcpp", "s2", "units"] + "depends": ["DBI", "Rcpp", "classInt", "magrittr", "s2", "units"] }, "sfaR": { "name": "sfaR", "version": "1.0.0", "sha256": "1c7rnnsmdlhby765avb8134f7424qf0b8gdl5q6vz3ialalfg49d", - "depends": ["cubature", "fastGHQuad", "Formula", "marqLevAlg", "maxLik", "mnorm", "nleqslv", "plm", "qrng", "randtoolbox", "sandwich", "texreg", "trustOptim", "ucminf"] + "depends": ["Formula", "cubature", "fastGHQuad", "marqLevAlg", "maxLik", "mnorm", "nleqslv", "plm", "qrng", "randtoolbox", "sandwich", "texreg", "trustOptim", "ucminf"] }, "sfadv": { "name": "sfadv", @@ -108665,13 +109799,13 @@ "name": "sfcentral", "version": "0.1.0", "sha256": "1jvdyalrvk7kzrkwm19fhqrqy1ji6jmz1jp5xdq36myamkj790lg", - "depends": ["geodist", "Hmisc", "lwgeom", "scales", "sf"] + "depends": ["Hmisc", "geodist", "lwgeom", "scales", "sf"] }, "sfcr": { "name": "sfcr", "version": "0.2.1", "sha256": "05ip1z6rh0k7az0y7nwp9c6rv1s53i0i698yfhx46lfnhzz87anf", - "depends": ["dplyr", "expm", "forcats", "igraph", "kableExtra", "magrittr", "purrr", "Rcpp", "RcppArmadillo", "Rdpack", "rlang", "rootSolve", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "dplyr", "expm", "forcats", "igraph", "kableExtra", "magrittr", "purrr", "rlang", "rootSolve", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] }, "sfd": { "name": "sfd", @@ -108683,7 +109817,7 @@ "name": "sfdct", "version": "0.3.0", "sha256": "1v86s8nb021swfq53jmj3vjcyjkzm8aqjlw55xjjxsk29rmq4694", - "depends": ["dplyr", "RTriangle", "sf", "sp", "tibble"] + "depends": ["RTriangle", "dplyr", "sf", "sp", "tibble"] }, "sfdep": { "name": "sfdep", @@ -108695,13 +109829,13 @@ "name": "sfheaders", "version": "0.4.4", "sha256": "01xxp7lpf333djs0lifnnhk5akv8prk0r5mq0ilynyyhn5kzwpzn", - "depends": ["geometries", "Rcpp"] + "depends": ["Rcpp", "geometries"] }, "sfhotspot": { "name": "sfhotspot", "version": "0.8.0", "sha256": "17vlayqqhv59p9mhrxzxs5r6gfqd6wyyi1k6p05n2sd9c06jzadb", - "depends": ["ggplot2", "rlang", "sf", "SpatialKDE", "spdep", "tibble"] + "depends": ["SpatialKDE", "ggplot2", "rlang", "sf", "spdep", "tibble"] }, "sfinx": { "name": "sfinx", @@ -108737,7 +109871,7 @@ "name": "sft", "version": "2.2-1", "sha256": "0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33", - "depends": ["fda", "SuppDists"] + "depends": ["SuppDists", "fda"] }, "sftime": { "name": "sftime", @@ -108767,7 +109901,7 @@ "name": "sgat", "version": "0.9", "sha256": "14sniq5yfh7xmbnd8d0ighw97352qjgfdg587a6hxafisx9is61p", - "depends": ["data_table", "dplyr", "plyr", "qdapRegex", "RCurl", "RSelenium", "stringr"] + "depends": ["RCurl", "RSelenium", "data_table", "dplyr", "plyr", "qdapRegex", "stringr"] }, "sgboost": { "name": "sgboost", @@ -108779,7 +109913,7 @@ "name": "sgd", "version": "1.1.2", "sha256": "0spcv9dysl2vlgrpjxicai9nkg7hylf2wci45pjpl8jph6yj8c70", - "depends": ["BH", "bigmemory", "ggplot2", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "MASS", "Rcpp", "RcppArmadillo", "bigmemory", "ggplot2"] }, "sgee": { "name": "sgee", @@ -108797,13 +109931,13 @@ "name": "sglasso", "version": "1.2.6", "sha256": "01162sh2cndqhcyswk7qprsychxik1yvkk7lr7d5vf25sq85h1k1", - "depends": ["igraph", "Matrix"] + "depends": ["Matrix", "igraph"] }, "sglg": { "name": "sglg", "version": "0.2.2", "sha256": "0h1f31ksygg4cpsnqi87lknxyv39mygjj7sirwgxdha6wmzhl1dc", - "depends": ["AdequacyModel", "Formula", "ggplot2", "gridExtra", "magrittr", "moments", "plot3D", "plotly", "pracma", "progress", "Rcpp", "survival", "TeachingSampling"] + "depends": ["AdequacyModel", "Formula", "Rcpp", "TeachingSampling", "ggplot2", "gridExtra", "magrittr", "moments", "plot3D", "plotly", "pracma", "progress", "survival"] }, "sglr": { "name": "sglr", @@ -108815,7 +109949,7 @@ "name": "sgmodel", "version": "0.1.2", "sha256": "1aq2klppwv1hn1nmicfxmb3vnkfw5jnmaa8gxxz4gnkk59k5rxpr", - "depends": ["ggplot2", "ramify", "Rtauchen"] + "depends": ["Rtauchen", "ggplot2", "ramify"] }, "sgo": { "name": "sgo", @@ -108825,8 +109959,8 @@ }, "sgof": { "name": "sgof", - "version": "2.3.4", - "sha256": "11y3c77yvq3xl3l596zgc1da4jdicyrrxn751dxh5ha21y98w31m", + "version": "2.3.5", + "sha256": "028gas18jrfg6ww5r0p32am7x0rjk0a9bcb84pdg9k091dz4b120", "depends": ["poibin"] }, "sgolay": { @@ -108851,19 +109985,19 @@ "name": "sgraph", "version": "1.0.0", "sha256": "07kqgzdfhkmannx5kpnmm2hrw74ywpnbi9964628lk82pi9g8la9", - "depends": ["cowplot", "ggplot2", "htmlwidgets", "igraph", "jsonlite", "magrittr", "RColorBrewer", "stringi"] + "depends": ["RColorBrewer", "cowplot", "ggplot2", "htmlwidgets", "igraph", "jsonlite", "magrittr", "stringi"] }, "sgs": { "name": "sgs", - "version": "0.1.1", - "sha256": "0glyxlimh97qyhjsqkal05ncjmr6wqa00y9fa4j9ilkqyq6nn0jq", - "depends": ["caret", "faux", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "Rlab", "SLOPE"] + "version": "0.2.0", + "sha256": "1vkg7pw83hf12j8sjxpc9n6c6cpc7w2llry263lcw7a6293j69vr", + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "Rlab", "SLOPE", "caret", "faux"] }, "sgsR": { "name": "sgsR", "version": "1.4.5", "sha256": "1ircbwlc6ysv8v8vxn5snjqx47qhi5rdqyd3vvf3cx54jndsnvah", - "depends": ["BalancedSampling", "clhs", "dplyr", "ggplot2", "SamplingBigData", "sf", "spatstat_geom", "terra", "tidyr"] + "depends": ["BalancedSampling", "SamplingBigData", "clhs", "dplyr", "ggplot2", "sf", "spatstat_geom", "terra", "tidyr"] }, "sgstar": { "name": "sgstar", @@ -108891,8 +110025,8 @@ }, "shadowtext": { "name": "shadowtext", - "version": "0.1.3", - "sha256": "109bq4d3j7vw6rcj9cjby955bdzgghkxwvwrb974xqq16kzzc6l6", + "version": "0.1.4", + "sha256": "1s3fsh6cmblyhlqrswialc9437as306ki36dyx0dv4001slvxl47", "depends": ["ggplot2", "scales"] }, "shape": { @@ -108911,7 +110045,7 @@ "name": "shapeR", "version": "1.0-1", "sha256": "02al1g9ycfb63mcx4s16abniggl825ihjanx6silbpv6dn6g1ms8", - "depends": ["jpeg", "MASS", "pixmap", "plotrix", "vegan", "wavethresh"] + "depends": ["MASS", "jpeg", "pixmap", "plotrix", "vegan", "wavethresh"] }, "shapefiles": { "name": "shapefiles", @@ -108941,7 +110075,7 @@ "name": "shapr", "version": "0.2.2", "sha256": "0c8vivr1ia7x4jvdsffv06nl2yahxx38r5xbws5cdkalhbhlwv4h", - "depends": ["condMVNorm", "data_table", "Matrix", "mvnfast", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "condMVNorm", "data_table", "mvnfast"] }, "shapviz": { "name": "shapviz", @@ -108959,7 +110093,7 @@ "name": "sharp", "version": "1.4.6", "sha256": "0sa0l5bnglmbm4ykmna1z1b1janggpah8g29505n4pfabw0r4lpl", - "depends": ["abind", "beepr", "fake", "future", "future_apply", "glassoFast", "glmnet", "igraph", "mclust", "nloptr", "plotrix", "Rdpack", "withr"] + "depends": ["Rdpack", "abind", "beepr", "fake", "future", "future_apply", "glassoFast", "glmnet", "igraph", "mclust", "nloptr", "plotrix", "withr"] }, "sharpData": { "name": "sharpData", @@ -108971,13 +110105,13 @@ "name": "sharpPen", "version": "1.9", "sha256": "0ra1iq6bfiy87arj7nb4s4adiji3pcp7vrjhsfbm2agfw05k4zj4", - "depends": ["glmnet", "KernSmooth", "locpol", "Matrix", "np"] + "depends": ["KernSmooth", "Matrix", "glmnet", "locpol", "np"] }, "sharpeRratio": { "name": "sharpeRratio", "version": "1.4.3", "sha256": "0ndqckz7pi099yynzfwzcbz9jcz93bb9jcd2a4px2sjbagfmx7ag", - "depends": ["ghyp", "Rcpp"] + "depends": ["Rcpp", "ghyp"] }, "sharpr2": { "name": "sharpr2", @@ -108989,25 +110123,25 @@ "name": "sharpshootR", "version": "2.3.1", "sha256": "1cvq2wh05dkaijkmwm20bs7xcmcv0xwv1gcf535xnd9gkzpy8xdr", - "depends": ["ape", "aqp", "circular", "cluster", "curl", "digest", "e1071", "lattice", "plyr", "RColorBrewer", "reshape2", "scales", "soilDB", "stringi"] + "depends": ["RColorBrewer", "ape", "aqp", "circular", "cluster", "curl", "digest", "e1071", "lattice", "plyr", "reshape2", "scales", "soilDB", "stringi"] }, "sharx": { "name": "sharx", "version": "1.0-6", "sha256": "0fyz7m8zx2i4r1kj5svzmn6l43f7zg2sj4c3ynyjwa1lzi5wf75v", - "depends": ["dclone", "dcmle", "Formula"] + "depends": ["Formula", "dclone", "dcmle"] }, "shattering": { "name": "shattering", "version": "1.0.7", "sha256": "0dmb57pdgzwm001gfm1zm8ba7x71bp2vjk4ml0cy4r05hpdswfh3", - "depends": ["e1071", "FNN", "NMF", "pdist", "pracma", "rmarkdown", "Ryacas", "slam"] + "depends": ["FNN", "NMF", "Ryacas", "e1071", "pdist", "pracma", "rmarkdown", "slam"] }, "shazam": { "name": "shazam", "version": "1.2.0", "sha256": "16bkwm903v4hv6ng6ncfzax2s5x8qfa4ldlwzclry7iggniq7dzh", - "depends": ["alakazam", "ape", "diptest", "doParallel", "dplyr", "foreach", "ggplot2", "igraph", "iterators", "KernSmooth", "lazyeval", "MASS", "progress", "rlang", "scales", "seqinr", "stringi", "tidyr", "tidyselect"] + "depends": ["KernSmooth", "MASS", "alakazam", "ape", "diptest", "doParallel", "dplyr", "foreach", "ggplot2", "igraph", "iterators", "lazyeval", "progress", "rlang", "scales", "seqinr", "stringi", "tidyr", "tidyselect"] }, "shelltrace": { "name": "shelltrace", @@ -109029,9 +110163,9 @@ }, "shide": { "name": "shide", - "version": "0.2.0", - "sha256": "1czdl0i93plqc1d2cf874603s4fiym96kv4d23vr1kvy2kx1jnh9", - "depends": ["cpp11", "rlang", "tzdb", "vctrs"] + "version": "0.2.1", + "sha256": "0wf84npx431c9hb09yxgbi0w1apzrfh7qisamlybvq3mhs8aaqdr", + "depends": ["cli", "cpp11", "rlang", "tzdb", "vctrs"] }, "shiftR": { "name": "shiftR", @@ -109043,13 +110177,13 @@ "name": "shinipsum", "version": "0.1.1", "sha256": "1l6skq9y5417x174l7svbvvlh10vv5kdnp2s4q7g76l62y710ks4", - "depends": ["attempt", "DT", "dygraphs", "ggplot2", "magrittr", "plotly"] + "depends": ["DT", "attempt", "dygraphs", "ggplot2", "magrittr", "plotly"] }, "shiny": { "name": "shiny", - "version": "1.8.1.1", - "sha256": "0lv7wfbmv72ilckm46dvkc0cg6qzih9iy4793h4w5qjhsysmz3d3", - "depends": ["bslib", "cachem", "commonmark", "crayon", "fastmap", "fontawesome", "glue", "htmltools", "httpuv", "jsonlite", "later", "lifecycle", "mime", "promises", "R6", "rlang", "sourcetools", "withr", "xtable"] + "version": "1.9.1", + "sha256": "1qsllqmkhhcddzsi26f1b2q0jcnmbxkjvq70w8nnaz8j9whnljw5", + "depends": ["R6", "bslib", "cachem", "commonmark", "crayon", "fastmap", "fontawesome", "glue", "htmltools", "httpuv", "jsonlite", "later", "lifecycle", "mime", "promises", "rlang", "sourcetools", "withr", "xtable"] }, "shiny_benchmark": { "name": "shiny.benchmark", @@ -109067,7 +110201,7 @@ "name": "shiny.emptystate", "version": "0.1.0", "sha256": "07vw8dw6yv3gqp400h2b1x2nv2v3hzgfgmhb8fxxdicbx08vxv47", - "depends": ["fontawesome", "htmltools", "R6", "shiny"] + "depends": ["R6", "fontawesome", "htmltools", "shiny"] }, "shiny_exe": { "name": "shiny.exe", @@ -109085,7 +110219,7 @@ "name": "shiny.i18n", "version": "0.3.0", "sha256": "0kcdvan8ds1kdqdxk6yvqpxlxv6xj4nxr8mp1qns3fzklyf4n4gy", - "depends": ["glue", "jsonlite", "R6", "rstudioapi", "shiny", "stringr", "yaml"] + "depends": ["R6", "glue", "jsonlite", "rstudioapi", "shiny", "stringr", "yaml"] }, "shiny_info": { "name": "shiny.info", @@ -109109,7 +110243,7 @@ "name": "shiny.reglog", "version": "0.5.2", "sha256": "018dnnisidmn799api7kgwknvm3ka2sk1vvq2wcx65acqc450i18", - "depends": ["dplyr", "lifecycle", "lubridate", "R6", "scrypt", "shiny", "shinyjs", "stringi", "uuid"] + "depends": ["R6", "dplyr", "lifecycle", "lubridate", "scrypt", "shiny", "shinyjs", "stringi", "uuid"] }, "shiny_router": { "name": "shiny.router", @@ -109121,7 +110255,7 @@ "name": "shiny.semantic", "version": "0.5.1", "sha256": "1gfkwgij365j0i9wz7dqdadpa9mdarn8n70cygm46fcak7lp08h8", - "depends": ["glue", "htmltools", "htmlwidgets", "jsonlite", "magrittr", "purrr", "R6", "semantic_assets", "shiny"] + "depends": ["R6", "glue", "htmltools", "htmlwidgets", "jsonlite", "magrittr", "purrr", "semantic_assets", "shiny"] }, "shiny_tailwind": { "name": "shiny.tailwind", @@ -109131,15 +110265,15 @@ }, "shiny_telemetry": { "name": "shiny.telemetry", - "version": "0.2.0", - "sha256": "0kp0wb3rh501bg7y8r90bwy1bbz5skmlvfjsqxj3nc1gpanndbjs", - "depends": ["checkmate", "digest", "dplyr", "glue", "httr2", "jsonlite", "logger", "lubridate", "odbc", "purrr", "R6", "rlang", "RSQLite", "shiny", "tidyr"] + "version": "0.3.0", + "sha256": "190cpxx9ddapixv8ci6xkabmyb0i8qb1kak49c286p43psm6dy66", + "depends": ["R6", "RSQLite", "checkmate", "digest", "dplyr", "glue", "htmltools", "httr2", "jsonlite", "lifecycle", "logger", "lubridate", "odbc", "purrr", "rlang", "shiny", "stringr", "tidyr"] }, "shiny_worker": { "name": "shiny.worker", "version": "0.0.1", "sha256": "1l30dx46s3q1x9nd42r6dracd3lqkjk80r9jyjqy8lmdsq48300i", - "depends": ["future", "R6", "shiny"] + "depends": ["R6", "future", "shiny"] }, "shinyAce": { "name": "shinyAce", @@ -109169,7 +110303,7 @@ "name": "shinyChatR", "version": "1.2.0", "sha256": "174jm8a52h7lr4bvl88ajllhknzczq8lwvbrldh07hiphbid071d", - "depends": ["data_table", "DBI", "purrr", "R6", "shiny"] + "depends": ["DBI", "R6", "data_table", "purrr", "shiny"] }, "shinyCohortBuilder": { "name": "shinyCohortBuilder", @@ -109209,9 +110343,9 @@ }, "shinyExprPortal": { "name": "shinyExprPortal", - "version": "1.1.0", - "sha256": "0740qzwz2wcl5avby2x50kjg51la6nfzz92lfk2ysnfvq58ph6aa", - "depends": ["bslib", "cli", "config", "data_table", "dplyr", "DT", "htmltools", "iheatmapr", "markdown", "qvalue", "Rfast", "rlang", "shiny", "shinyhelper", "tidyr", "vegawidget", "yaml"] + "version": "1.2.1", + "sha256": "1cldz5m7w3db3izgqcpichpixfixhdy7rz4iksnsdywih0kdhqwc", + "depends": ["DT", "Rfast", "bslib", "cli", "config", "data_table", "dplyr", "htmltools", "iheatmapr", "markdown", "qvalue", "rlang", "shiny", "shinyhelper", "tidyr", "vegawidget", "yaml"] }, "shinyFeedback": { "name": "shinyFeedback", @@ -109247,7 +110381,7 @@ "name": "shinyHugePlot", "version": "0.2.6", "sha256": "1sf26jz2jbyrs11a1gricnb3iq4106cpf10kbhqx0hy12q47lk1y", - "depends": ["assertthat", "bit64", "data_table", "dplyr", "htmltools", "jsonlite", "lazyeval", "nanotime", "plotly", "purrr", "R6", "rlang", "shiny", "shinyjs", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["R6", "assertthat", "bit64", "data_table", "dplyr", "htmltools", "jsonlite", "lazyeval", "nanotime", "plotly", "purrr", "rlang", "shiny", "shinyjs", "stringr", "tibble", "tidyr", "tidyselect"] }, "shinyIRT": { "name": "shinyIRT", @@ -109265,7 +110399,7 @@ "name": "shinyKGode", "version": "1.0.5", "sha256": "004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1", - "depends": ["ggplot2", "gridExtra", "KGode", "mvtnorm", "pracma", "pspline", "reshape2", "shiny", "shinyjs", "XML"] + "depends": ["KGode", "XML", "ggplot2", "gridExtra", "mvtnorm", "pracma", "pspline", "reshape2", "shiny", "shinyjs"] }, "shinyKnobs": { "name": "shinyKnobs", @@ -109279,11 +110413,17 @@ "sha256": "1cdi9dbaz1q71c0wb5a910xz3rspqgqxdk14ibhh06lb0hs9n4nc", "depends": ["shiny"] }, + "shinyLottie": { + "name": "shinyLottie", + "version": "1.0.0", + "sha256": "1fs1cpi7qab8zqb4jn3lw4bpan3434m6jdy6zj7vbzfibdj0y2wf", + "depends": ["glue", "htmltools", "jsonlite", "shiny"] + }, "shinyML": { "name": "shinyML", "version": "1.0.1", "sha256": "086iavycv1gd6scfsixf7cmw0s5a4dc6x5cylfasxrzgiixd76c9", - "depends": ["argonDash", "argonR", "data_table", "dplyr", "DT", "dygraphs", "ggplot2", "h2o", "lubridate", "plotly", "shiny", "shinycssloaders", "shinyjs", "shinyWidgets", "sparklyr", "tidyr"] + "depends": ["DT", "argonDash", "argonR", "data_table", "dplyr", "dygraphs", "ggplot2", "h2o", "lubridate", "plotly", "shiny", "shinyWidgets", "shinycssloaders", "shinyjs", "sparklyr", "tidyr"] }, "shinyMatrix": { "name": "shinyMatrix", @@ -109307,7 +110447,7 @@ "name": "shinyMolBio", "version": "0.2", "sha256": "09lq5pvis450il1agcq5n9cilnq84rfv08w2dz1d0bbq1qgrgnvg", - "depends": ["checkmate", "dplyr", "plotly", "purrr", "RColorBrewer", "RDML", "shiny", "stringr", "whisker"] + "depends": ["RColorBrewer", "RDML", "checkmate", "dplyr", "plotly", "purrr", "shiny", "stringr", "whisker"] }, "shinyMonacoEditor": { "name": "shinyMonacoEditor", @@ -109319,13 +110459,13 @@ "name": "shinyNORRRM", "version": "0.8.6", "sha256": "1cb6n3bwqfygqc0p25z62nmrrns6hm2by4chi45sl898is5hkhdn", - "depends": ["pracma", "shiny", "shinythemes", "shinyWidgets", "Ternary"] + "depends": ["Ternary", "pracma", "shiny", "shinyWidgets", "shinythemes"] }, "shinyNotes": { "name": "shinyNotes", "version": "0.0.2", "sha256": "19k4n3ikffxs24c66i9wi7ldw50wjs0gym73n9clnq3hh6l2fzz8", - "depends": ["DBI", "dbplyr", "dplyr", "magrittr", "markdown", "rlang", "RSQLite", "shiny", "shinyjs", "shinyWidgets", "stringr"] + "depends": ["DBI", "RSQLite", "dbplyr", "dplyr", "magrittr", "markdown", "rlang", "shiny", "shinyWidgets", "shinyjs", "stringr"] }, "shinyPredict": { "name": "shinyPredict", @@ -109361,7 +110501,7 @@ "name": "shinySbm", "version": "0.1.5", "sha256": "0r6zq235krg4rikpypwp9a2hwblgygl7mmc1phxrpxr8xppgq2da", - "depends": ["colourpicker", "config", "data_table", "dplyr", "DT", "flextable", "fresh", "ggplot2", "golem", "magrittr", "patchwork", "purrr", "rmarkdown", "sbm", "shiny", "shinyalert", "shinydashboard", "stringr", "visNetwork"] + "depends": ["DT", "colourpicker", "config", "data_table", "dplyr", "flextable", "fresh", "ggplot2", "golem", "magrittr", "patchwork", "purrr", "rmarkdown", "sbm", "shiny", "shinyalert", "shinydashboard", "stringr", "visNetwork"] }, "shinySearchbar": { "name": "shinySearchbar", @@ -109383,15 +110523,15 @@ }, "shinyStorePlus": { "name": "shinyStorePlus", - "version": "1.1", - "sha256": "1y4yqladglkyz3br7g0prd9dniqd0pdj775dic0nlgg27gdl8ca8", + "version": "1.2", + "sha256": "08xyd26wcfv629a4791s20f690faf472rn33qhnlsjbddnmla62z", "depends": ["htmltools", "jsonlite", "shiny", "shinyWidgets"] }, "shinyTempSignal": { "name": "shinyTempSignal", "version": "0.0.8", "sha256": "1ww164zqqc9rh158wfi6c4jcp4pn61mz56zbhh2fkmyc2mcv6xbb", - "depends": ["ape", "forecast", "ggplot2", "ggpmisc", "ggprism", "ggtree", "golem", "nlme", "shiny", "shinydashboard", "shinyjs", "shinyWidgets", "treeio", "yulab_utils"] + "depends": ["ape", "forecast", "ggplot2", "ggpmisc", "ggprism", "ggtree", "golem", "nlme", "shiny", "shinyWidgets", "shinydashboard", "shinyjs", "treeio", "yulab_utils"] }, "shinyTime": { "name": "shinyTime", @@ -109467,9 +110607,9 @@ }, "shinycssloaders": { "name": "shinycssloaders", - "version": "1.0.0", - "sha256": "0r3xm273lhdhzbs2mkgw1m2kwb7z1dh1pzya8yxy5vacda1l2ikl", - "depends": ["digest", "glue", "shiny"] + "version": "1.1.0", + "sha256": "0w7gw81j5d2dvjdk49dd222bqd40ll3sl8mykg68vcz64ihdg2h3", + "depends": ["digest", "glue", "htmltools", "shiny"] }, "shinycustomloader": { "name": "shinycustomloader", @@ -109485,15 +110625,15 @@ }, "shinydashboardPlus": { "name": "shinydashboardPlus", - "version": "2.0.4", - "sha256": "11ckx8il1v4jk26ss0bylk73xb5bh3xd2d5421i5s8wlxlwd0z5q", + "version": "2.0.5", + "sha256": "1k53ycfdv5r58rwqsk7mkrrlz72wikhrhzlfrg3dkwbdbzblrhqb", "depends": ["fresh", "htmltools", "lifecycle", "shiny", "shinydashboard", "waiter"] }, "shinydbauth": { "name": "shinydbauth", "version": "1.0.0.1", "sha256": "04f8cq5vismbl05cvkd4kh5h1bzank5fhsgfmxdqwpy3jp68a1kf", - "depends": ["billboarder", "DT", "glue", "htmltools", "openssl", "R_utils", "R6", "scrypt", "shiny", "yaml"] + "depends": ["DT", "R6", "R_utils", "billboarder", "glue", "htmltools", "openssl", "scrypt", "shiny", "yaml"] }, "shinydisconnect": { "name": "shinydisconnect", @@ -109511,7 +110651,7 @@ "name": "shinydrive", "version": "0.1.3", "sha256": "16yfc9grmjzkpl6xzqn5rpkqd2qnlj4qdgia8img794l6j0y8dgp", - "depends": ["DT", "htmltools", "knitr", "R_utils", "shiny", "yaml"] + "depends": ["DT", "R_utils", "htmltools", "knitr", "shiny", "yaml"] }, "shinyfilter": { "name": "shinyfilter", @@ -109563,15 +110703,15 @@ }, "shinylive": { "name": "shinylive", - "version": "0.1.1", - "sha256": "1hsvcsbzrzv0gb99mfc02sd77mlwcxjqzzr5v2jfr5ajq33q3ffb", - "depends": ["archive", "brio", "fs", "httr2", "jsonlite", "progress", "rappdirs", "rlang"] + "version": "0.2.0", + "sha256": "16r3fbzgv9qjdr08cdazddjxanliymi2mhlx56p0bdrn10miiyp9", + "depends": ["archive", "brio", "cli", "fs", "gh", "glue", "httr2", "jsonlite", "pkgdepends", "progress", "rappdirs", "renv", "rlang", "whisker", "withr"] }, "shinyloadtest": { "name": "shinyloadtest", - "version": "1.1.0", - "sha256": "0684p9anbc3qdn4rqkxp33nm0d04zb264b3blwa23pa5akis2klq", - "depends": ["curl", "dplyr", "ggplot2", "httpuv", "jsonlite", "magrittr", "R6", "rlang", "scales", "stringr", "svglite", "vroom", "websocket", "xml2"] + "version": "1.2.0", + "sha256": "01y75imwjbg1wdw7xx50a48py23ya0hgl4jm24lgfl60llm2lfrz", + "depends": ["R6", "cli", "curl", "dplyr", "ggplot2", "httpuv", "jsonlite", "magrittr", "rlang", "scales", "stringr", "svglite", "vroom", "websocket", "xml2"] }, "shinylogs": { "name": "shinylogs", @@ -109583,7 +110723,7 @@ "name": "shinymanager", "version": "1.0.410", "sha256": "0nl672dgwj34wm4i3pxk28lv6qw9xsgg3hm0h78q3zdgk8a33kdn", - "depends": ["billboarder", "DBI", "DT", "htmltools", "openssl", "R_utils", "R6", "RSQLite", "scrypt", "shiny"] + "depends": ["DBI", "DT", "R6", "RSQLite", "R_utils", "billboarder", "htmltools", "openssl", "scrypt", "shiny"] }, "shinymaterial": { "name": "shinymaterial", @@ -109601,13 +110741,13 @@ "name": "shinymgr", "version": "1.1.0", "sha256": "000r7vh8myc10jxna5h65kjx1sqw45aqjj24brls5vnvz5rg4i3w", - "depends": ["DBI", "reactable", "renv", "RSQLite", "shiny", "shinydashboard", "shinyjs"] + "depends": ["DBI", "RSQLite", "reactable", "renv", "shiny", "shinydashboard", "shinyjs"] }, "shinymodels": { "name": "shinymodels", "version": "0.1.1", "sha256": "1ydj4ny94y77akbsq0asaz29s3hnkb237icbxsnrh18z2wnyhhll", - "depends": ["dplyr", "DT", "generics", "ggplot2", "glue", "htmltools", "magrittr", "parsnip", "plotly", "purrr", "rlang", "scales", "shiny", "shinydashboard", "tidyr", "tidyselect", "tune", "yardstick"] + "depends": ["DT", "dplyr", "generics", "ggplot2", "glue", "htmltools", "magrittr", "parsnip", "plotly", "purrr", "rlang", "scales", "shiny", "shinydashboard", "tidyr", "tidyselect", "tune", "yardstick"] }, "shinyobjects": { "name": "shinyobjects", @@ -109643,13 +110783,13 @@ "name": "shinyrecipes", "version": "0.1.0", "sha256": "1b4l27qsl1lpssh3jv1pqmw2mq8hanfj0m269yp5618nd5nxd2ck", - "depends": ["dplyr", "DT", "esquisse", "miniUI", "purrr", "recipes", "rstudioapi", "shiny", "shinyglide", "shinyWidgets", "sortable", "stringr", "tidyr"] + "depends": ["DT", "dplyr", "esquisse", "miniUI", "purrr", "recipes", "rstudioapi", "shiny", "shinyWidgets", "shinyglide", "sortable", "stringr", "tidyr"] }, "shinyreforms": { "name": "shinyreforms", "version": "0.0.1", "sha256": "1g1blc57c6zkca0m52bqkw8jwgpplabns07x1cwkk46dmv6sgqci", - "depends": ["htmltools", "R6", "shiny"] + "depends": ["R6", "htmltools", "shiny"] }, "shinyscreenshot": { "name": "shinyscreenshot", @@ -109667,7 +110807,7 @@ "name": "shinystan", "version": "2.6.0", "sha256": "0afm703zriyqprz1zvypir80lq2ylfff3qvj5i7p9n365mm8b150", - "depends": ["bayesplot", "colourpicker", "DT", "dygraphs", "ggplot2", "gridExtra", "gtools", "markdown", "reshape2", "rstan", "shiny", "shinyjs", "shinythemes", "threejs", "xtable", "xts"] + "depends": ["DT", "bayesplot", "colourpicker", "dygraphs", "ggplot2", "gridExtra", "gtools", "markdown", "reshape2", "rstan", "shiny", "shinyjs", "shinythemes", "threejs", "xtable", "xts"] }, "shinysurveys": { "name": "shinysurveys", @@ -109679,13 +110819,13 @@ "name": "shinytest", "version": "1.6.1", "sha256": "0h9ciivic0fg7w5yq9cycdj1fh4zhdg4fz1gkn2fdx87c0d5j7a4", - "depends": ["assertthat", "callr", "crayon", "debugme", "digest", "htmlwidgets", "httpuv", "httr", "jsonlite", "parsedate", "pingr", "R6", "rematch", "rlang", "rstudioapi", "shiny", "testthat", "webdriver", "withr"] + "depends": ["R6", "assertthat", "callr", "crayon", "debugme", "digest", "htmlwidgets", "httpuv", "httr", "jsonlite", "parsedate", "pingr", "rematch", "rlang", "rstudioapi", "shiny", "testthat", "webdriver", "withr"] }, "shinytest2": { "name": "shinytest2", "version": "0.3.2", "sha256": "1qrnh9cfgi67szv1yiaqkv10vf1r70i9l88h6dssgiv1q2fw8yx1", - "depends": ["callr", "checkmate", "chromote", "cpp11", "crayon", "fs", "globals", "httr", "jsonlite", "pingr", "R6", "rlang", "rmarkdown", "shiny", "testthat", "withr"] + "depends": ["R6", "callr", "checkmate", "chromote", "cpp11", "crayon", "fs", "globals", "httr", "jsonlite", "pingr", "rlang", "rmarkdown", "shiny", "testthat", "withr"] }, "shinythemes": { "name": "shinythemes", @@ -109721,7 +110861,7 @@ "name": "shock", "version": "1.0", "sha256": "11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp", - "depends": ["capushe", "GGMselect", "glasso", "igraph", "mvtnorm"] + "depends": ["GGMselect", "capushe", "glasso", "igraph", "mvtnorm"] }, "shopifyadsR": { "name": "shopifyadsR", @@ -109733,7 +110873,7 @@ "name": "shopifyr", "version": "1.0.0", "sha256": "05hih1v5vvr7vmwarizsdx8517g74s96fdsz3klcz3g12idx1nqn", - "depends": ["curl", "jsonlite", "R6"] + "depends": ["R6", "curl", "jsonlite"] }, "shoredate": { "name": "shoredate", @@ -109745,7 +110885,7 @@ "name": "shortIRT", "version": "0.1.3", "sha256": "1z2db31r332dayaprdjrm9r3yihj7jnpk7j106m74q5ckwsaw859", - "depends": ["dplyr", "ggplot2", "TAM"] + "depends": ["TAM", "dplyr", "ggplot2"] }, "shortcuts": { "name": "shortcuts", @@ -109757,13 +110897,13 @@ "name": "shorts", "version": "3.2.0", "sha256": "1ajqvm6y5djdjh5prci31hyv1ilycn1vf5gniq92gxqhzab7bnxc", - "depends": ["ggplot2", "LambertW", "minpack_lm", "purrr", "tidyr"] + "depends": ["LambertW", "ggplot2", "minpack_lm", "purrr", "tidyr"] }, "shotGroups": { "name": "shotGroups", "version": "0.8.2", "sha256": "0m3n3ja6ny45rdd13s9f7nm1ml3p3y7nisbhfg0fj369wym95r1p", - "depends": ["boot", "coin", "CompQuadForm", "KernSmooth", "robustbase"] + "depends": ["CompQuadForm", "KernSmooth", "boot", "coin", "robustbase"] }, "showimage": { "name": "showimage", @@ -109799,13 +110939,13 @@ "name": "shrinkDSM", "version": "0.2.0", "sha256": "0vl3cl9njl0irz9hsli7xkf49jawkywww91j5gxlmz5vdrxnwz9c", - "depends": ["coda", "Rcpp", "RcppArmadillo", "RcppProgress", "shrinkTVP", "stochvol"] + "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "coda", "shrinkTVP", "stochvol"] }, "shrinkTVP": { "name": "shrinkTVP", "version": "3.0.1", "sha256": "0fcvx7pz4mn89g9g8x32wgqil9xyh29vjxx8hlvv5385ig2wd4lw", - "depends": ["coda", "GIGrvg", "Rcpp", "RcppArmadillo", "RcppGSL", "RcppProgress", "stochvol", "zoo"] + "depends": ["GIGrvg", "Rcpp", "RcppArmadillo", "RcppGSL", "RcppProgress", "coda", "stochvol", "zoo"] }, "shroomDK": { "name": "shroomDK", @@ -109865,7 +111005,7 @@ "name": "sievePH", "version": "1.1", "sha256": "0bzf7k3qk8ih9qvkr196wcy8b6wq5q6x6cn311z312713n9jly10", - "depends": ["ggplot2", "ggpubr", "np", "plyr", "Rcpp", "RcppArmadillo", "scales", "survival"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "ggpubr", "np", "plyr", "scales", "survival"] }, "sievetest": { "name": "sievetest", @@ -109893,9 +111033,9 @@ }, "sigQC": { "name": "sigQC", - "version": "0.1.23", - "sha256": "0fpci6l0h6047qq7igwmm38rma768l706xfmfdfn1qqgkm5sv0x8", - "depends": ["biclust", "circlize", "class", "cluster", "ComplexHeatmap", "fmsb", "gplots", "gridGraphics", "GSVA", "KernSmooth", "lattice", "MASS", "mclust", "moments", "nnet"] + "version": "0.1.24", + "sha256": "0z728hsicnx6j95y9q4gs9drv568bjqxckvgp08g3ahk5iymcym2", + "depends": ["ComplexHeatmap", "GSVA", "KernSmooth", "MASS", "biclust", "circlize", "class", "cluster", "fmsb", "gplots", "gridGraphics", "lattice", "mclust", "moments", "nnet"] }, "sigclust": { "name": "sigclust", @@ -109913,7 +111053,7 @@ "name": "sigminer", "version": "2.3.1", "sha256": "0fwmq6p6qyz5pq1vhh26ddrivcqaqnfv1bsnhzfplz1glmv6r0xj", - "depends": ["cli", "cowplot", "data_table", "dplyr", "furrr", "future", "ggplot2", "ggpubr", "maftools", "magrittr", "NMF", "purrr", "Rcpp", "rlang", "tidyr"] + "depends": ["NMF", "Rcpp", "cli", "cowplot", "data_table", "dplyr", "furrr", "future", "ggplot2", "ggpubr", "maftools", "magrittr", "purrr", "rlang", "tidyr"] }, "sigmoid": { "name": "sigmoid", @@ -109923,8 +111063,8 @@ }, "signal": { "name": "signal", - "version": "1.8-0", - "sha256": "1126p631zm0wc4h9ghqai5yb9vklpz676fygb0d0aavs2raaijw9", + "version": "1.8-1", + "sha256": "1c7fw5akdm8f44zgdafsgz2fpn6kfwifaw29yakl7zykq89vq8m3", "depends": ["MASS"] }, "signalHsmm": { @@ -109955,7 +111095,7 @@ "name": "signnet", "version": "1.0.4", "sha256": "04w8wik8q15hi7yc9rp30bc31pvw15bkrvr3lnif46zrrhsq6cv8", - "depends": ["igraph", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "igraph"] }, "signs": { "name": "signs", @@ -110003,13 +111143,13 @@ "name": "sim1000G", "version": "1.40", "sha256": "1avq6xfc34izavvp9vb5ccc2b9nc4m7cwr06ygnsmpgwi5nswbb8", - "depends": ["hapsim", "MASS", "readr", "stringr"] + "depends": ["MASS", "hapsim", "readr", "stringr"] }, "sim2Dpredictr": { "name": "sim2Dpredictr", "version": "0.1.1", "sha256": "14v35ngwj27j2r4mszwjz1dnk4iydakk5qf4z0swwi931q1jiphc", - "depends": ["dplyr", "MASS", "matrixcalc", "Rdpack", "spam", "tibble"] + "depends": ["MASS", "Rdpack", "dplyr", "matrixcalc", "spam", "tibble"] }, "simCAT": { "name": "simCAT", @@ -110021,7 +111161,7 @@ "name": "simDAG", "version": "0.1.2", "sha256": "18zbqpvndblrqmdz7hsbc0kf1w8v6a75z4x9yr95f3saazirrj6p", - "depends": ["data_table", "igraph", "Rfast", "rlang"] + "depends": ["Rfast", "data_table", "igraph", "rlang"] }, "simDNAmixtures": { "name": "simDNAmixtures", @@ -110051,7 +111191,7 @@ "name": "simFrame", "version": "0.5.4", "sha256": "1a2p4hx80rrrzs4gjscdsy1jbzpahkw0h2nlna4q8p75blgnzwpn", - "depends": ["lattice", "Rcpp"] + "depends": ["Rcpp", "lattice"] }, "simIDM": { "name": "simIDM", @@ -110063,7 +111203,7 @@ "name": "simIReff", "version": "1.0", "sha256": "0yi43splda8chnh4bq5x6chbrl5c0y9sv1k2m31763da0czayall", - "depends": ["bde", "extraDistr", "ks", "MASS", "np", "rvinecopulib", "truncnorm"] + "depends": ["MASS", "bde", "extraDistr", "ks", "np", "rvinecopulib", "truncnorm"] }, "simITS": { "name": "simITS", @@ -110075,7 +111215,7 @@ "name": "simMP", "version": "0.17.3", "sha256": "1pzg79dd08ds3pfzxnk9h95gaibicv00mnm0jb4i8v5is4gzrdhr", - "depends": ["Biostrings", "BSgenome", "doParallel", "foreach", "GenomeInfoDb", "GenomicRanges", "IRanges", "XVector"] + "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "XVector", "doParallel", "foreach"] }, "simMSM": { "name": "simMSM", @@ -110093,13 +111233,13 @@ "name": "simPH", "version": "1.3.13", "sha256": "086060f78f1dmpa6cyhx160blchckplw04gs6997f1hwzswci2l2", - "depends": ["data_table", "dplyr", "ggplot2", "gridExtra", "lazyeval", "MASS", "mgcv", "quadprog", "stringr", "survival"] + "depends": ["MASS", "data_table", "dplyr", "ggplot2", "gridExtra", "lazyeval", "mgcv", "quadprog", "stringr", "survival"] }, "simPop": { "name": "simPop", "version": "2.1.3", "sha256": "0rgaalkaxxh92yryzd39qnpahzi7d2bqnnsgx4i5rai2vrj1hqfi", - "depends": ["colorspace", "data_table", "doParallel", "e1071", "EnvStats", "fitdistrplus", "foreach", "lattice", "MASS", "matrixStats", "nnet", "partykit", "ranger", "Rcpp", "RcppArmadillo", "vcd", "VIM", "wrswoR", "xgboost"] + "depends": ["EnvStats", "MASS", "Rcpp", "RcppArmadillo", "VIM", "colorspace", "data_table", "doParallel", "e1071", "fitdistrplus", "foreach", "lattice", "matrixStats", "nnet", "partykit", "ranger", "vcd", "wrswoR", "xgboost"] }, "simRestore": { "name": "simRestore", @@ -110109,8 +111249,8 @@ }, "simStateSpace": { "name": "simStateSpace", - "version": "1.2.1", - "sha256": "1151r60vrb3b9crjb77a4aba6mzv13wq5awd0hrh8684h6pz9f76", + "version": "1.2.2", + "sha256": "072dyrzxpmp6i565162bpriviy47d59f3ssvkhpdpvs1d0g11j2a", "depends": ["Rcpp", "RcppArmadillo"] }, "simTargetCov": { @@ -110129,7 +111269,7 @@ "name": "simaerep", "version": "0.5.0", "sha256": "1r0hgf8i7grpiww42l28az4pr81s998ghyrmbrva8ap27vj3r269", - "depends": ["cowplot", "dplyr", "forcats", "furrr", "ggplot2", "knitr", "magrittr", "progressr", "purrr", "RColorBrewer", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["RColorBrewer", "cowplot", "dplyr", "forcats", "furrr", "ggplot2", "knitr", "magrittr", "progressr", "purrr", "rlang", "stringr", "tibble", "tidyr"] }, "simboot": { "name": "simboot", @@ -110141,7 +111281,7 @@ "name": "simcausal", "version": "0.5.6", "sha256": "0r87i5m8sd9bf8ddlkgq9dl0pglhxl9pj5b0vx79va9r5wb55vgk", - "depends": ["assertthat", "data_table", "igraph", "Matrix", "R6", "stringr"] + "depends": ["Matrix", "R6", "assertthat", "data_table", "igraph", "stringr"] }, "simcdm": { "name": "simcdm", @@ -110161,6 +111301,12 @@ "sha256": "0igwn82zfx6ajv42gpyx6969aldygldkpdc9ik6601511sscvf2a", "depends": [] }, + "simdata": { + "name": "simdata", + "version": "0.4.0", + "sha256": "1yzxa2xfjclhwbzvzdivgd99h8n9cvb16ws074r5gw2xvd0ilf3m", + "depends": ["Matrix", "igraph", "mvtnorm"] + }, "simdd": { "name": "simdd", "version": "1.1-2", @@ -110183,7 +111329,7 @@ "name": "simer", "version": "0.9.0.4", "sha256": "1mgkmfv1mm4paxvzq43rdxjxf13csxizl8v1gc47y7h21hq2f5sx", - "depends": ["BH", "bigmemory", "igraph", "jsonlite", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress"] + "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "bigmemory", "igraph", "jsonlite"] }, "simest": { "name": "simest", @@ -110213,7 +111359,7 @@ "name": "simfinapi", "version": "1.0.0", "sha256": "1i9zf17nn9xbyccmr8blrlybqakrlzrxxm961bgrsb2pzawn6f6j", - "depends": ["checkmate", "data_table", "httr2", "lifecycle", "memoise", "RcppSimdJson"] + "depends": ["RcppSimdJson", "checkmate", "data_table", "httr2", "lifecycle", "memoise"] }, "simfit": { "name": "simfit", @@ -110237,7 +111383,7 @@ "name": "simhelpers", "version": "0.2.1", "sha256": "0awj430nmwgh2v19zy9sfkq06kjnbr7hp9mrnz4ziwlzm7bzv9wk", - "depends": ["furrr", "Rdpack", "rstudioapi", "tibble", "tidyr"] + "depends": ["Rdpack", "furrr", "rstudioapi", "tibble", "tidyr"] }, "simitation": { "name": "simitation", @@ -110249,13 +111395,13 @@ "name": "simlandr", "version": "0.3.1", "sha256": "1bgpka5z23763d8vlxz1pymgypqj0wyab3kcf6rkhliliksqqqp0", - "depends": ["bigmemory", "digest", "dplyr", "forcats", "gganimate", "ggplot2", "htmlwidgets", "ks", "lifecycle", "magrittr", "MASS", "plotly", "progress", "purrr", "rlang", "tibble"] + "depends": ["MASS", "bigmemory", "digest", "dplyr", "forcats", "gganimate", "ggplot2", "htmlwidgets", "ks", "lifecycle", "magrittr", "plotly", "progress", "purrr", "rlang", "tibble"] }, "simmer": { "name": "simmer", - "version": "4.4.6.3", - "sha256": "03fns5z7qvmx42cj5q9k5mc3klbb3wi23qzwym6rjcik6zrlyasx", - "depends": ["codetools", "magrittr", "Rcpp"] + "version": "4.4.6.4", + "sha256": "110wjmhr4645nrrjx4vk8inpz543qkrz8zg4avv4i05zrad2393x", + "depends": ["Rcpp", "codetools", "magrittr"] }, "simmer_bricks": { "name": "simmer.bricks", @@ -110279,7 +111425,7 @@ "name": "simmr", "version": "0.5.1.216", "sha256": "0rvf6b0x6iivgp1czj98972p8gr1g96sc3g55p30gnw08b48i1x5", - "depends": ["bayesplot", "boot", "checkmate", "compositions", "GGally", "ggplot2", "R2jags", "Rcpp", "RcppArmadillo", "RcppDist", "reshape2", "viridis"] + "depends": ["GGally", "R2jags", "Rcpp", "RcppArmadillo", "RcppDist", "bayesplot", "boot", "checkmate", "compositions", "ggplot2", "reshape2", "viridis"] }, "simode": { "name": "simode", @@ -110289,8 +111435,8 @@ }, "simodels": { "name": "simodels", - "version": "0.0.5", - "sha256": "149490vgw0549x5zym28kyxgyjhjl2wx7rcak9gabkznwjjrhqk5", + "version": "0.1.0", + "sha256": "0fhrlmyh0hnv518131wabadidim5k6f2gjsq5k4jc9zwmm5qbgfz", "depends": ["dplyr", "geodist", "od", "rlang", "sf"] }, "simphony": { @@ -110345,7 +111491,7 @@ "name": "simplePHENOTYPES", "version": "1.3.0", "sha256": "0f5mzlx6vcvq6cvyz4v9yr1k2acgnxizg8clsxdm6hpi4maizrpk", - "depends": ["data_table", "gdsfmt", "mvtnorm", "SNPRelate"] + "depends": ["SNPRelate", "data_table", "gdsfmt", "mvtnorm"] }, "simpleRCache": { "name": "simpleRCache", @@ -110361,8 +111507,8 @@ }, "simpleboot": { "name": "simpleboot", - "version": "1.1-7", - "sha256": "0769dmrk8rw5v9598p7xlpawybwsdxnrqkxhavqpzy1vwg885575", + "version": "1.1-8", + "sha256": "18pqsjkpl7szwfinc842q6s6vjlsr0gkkqr1l6174ibryqvlf2fx", "depends": ["boot"] }, "simplecolors": { @@ -110381,7 +111527,7 @@ "name": "simplegraphdb", "version": "2021.03.10", "sha256": "0573hrv23nimmf3d8dgdynii79h84a3mfr4xxk3cggxhsxpfmb2i", - "depends": ["DBI", "rjson", "RSQLite"] + "depends": ["DBI", "RSQLite", "rjson"] }, "simplermarkdown": { "name": "simplermarkdown", @@ -110389,6 +111535,12 @@ "sha256": "0lffwsrhsdqcqhklh24v0y0x6w4vq9jch93m330kfdv2amab1l06", "depends": ["rjson"] }, + "simpletex": { + "name": "simpletex", + "version": "1.0.4", + "sha256": "13hcb3k5car0q5yqb9wqccdzgrqxvjbbzn8c9rcrx23wgwpr226l", + "depends": ["digest", "glue", "httr", "jsonlite"] + }, "simplexreg": { "name": "simplexreg", "version": "1.3", @@ -110399,13 +111551,13 @@ "name": "simplextree", "version": "1.0.1", "sha256": "18jvzcz4fdsi17j7qdqpjvx6zygvlcvpziikb8qxskaib5180l08", - "depends": ["magrittr", "Rcpp"] + "depends": ["Rcpp", "magrittr"] }, "simplifyNet": { "name": "simplifyNet", "version": "0.0.1", "sha256": "04iv1alkd85lwwyf8k6iwsj9fbxl6smsjm2b34z91za70n0rsw5q", - "depends": ["dplyr", "igraph", "Matrix", "sanic"] + "depends": ["Matrix", "dplyr", "igraph", "sanic"] }, "simpr": { "name": "simpr", @@ -110417,13 +111569,13 @@ "name": "simputation", "version": "0.2.8", "sha256": "02l7j2s74mjd4vgly4nnf2w7as9m3m6qifa292r29iaw12l0zj81", - "depends": ["glmnet", "gower", "MASS", "missForest", "norm", "randomForest", "rpart", "VIM"] + "depends": ["MASS", "VIM", "glmnet", "gower", "missForest", "norm", "randomForest", "rpart"] }, "simr": { "name": "simr", "version": "1.0.7", "sha256": "1rfnhyqvdazvar7r1ml71lskh1hdk3yfzv5jlcz18wzffscgkgmb", - "depends": ["binom", "car", "iterators", "lme4", "lmerTest", "pbkrtest", "plotrix", "plyr", "RLRsim", "stringr"] + "depends": ["RLRsim", "binom", "car", "iterators", "lme4", "lmerTest", "pbkrtest", "plotrix", "plyr", "stringr"] }, "simrec": { "name": "simrec", @@ -110469,9 +111621,9 @@ }, "simstudy": { "name": "simstudy", - "version": "0.8.0", - "sha256": "1xdqk5jikhvxxd78frfj3s3m7aigkhkavzryifhzv47l22rmpkcb", - "depends": ["backports", "data_table", "fastglm", "glue", "mvnfast", "pbv", "Rcpp"] + "version": "0.8.1", + "sha256": "1qj0f5c40z1dhxm6wfrl83nd4h1s90qy7aa1ka3ziz8bpkpxkcnw", + "depends": ["Rcpp", "backports", "data_table", "fastglm", "glue", "mvnfast", "pbv"] }, "simsurv": { "name": "simsurv", @@ -110495,13 +111647,13 @@ "name": "simtrial", "version": "0.4.1", "sha256": "1gsd7ykqws7y5ggblbjjrg3yid9fj7samrnbk7fb4dnknvv8lgls", - "depends": ["data_table", "doFuture", "foreach", "future", "mvtnorm", "Rcpp", "rlang", "survival"] + "depends": ["Rcpp", "data_table", "doFuture", "foreach", "future", "mvtnorm", "rlang", "survival"] }, "simts": { "name": "simts", "version": "0.2.2", "sha256": "12v6djqij8w0vy25pndri4kng7zq7bncvbg9h28vg1m8sk3nlfc4", - "depends": ["broom", "dplyr", "magrittr", "purrr", "Rcpp", "RcppArmadillo", "robcor", "scales", "tidyr"] + "depends": ["Rcpp", "RcppArmadillo", "broom", "dplyr", "magrittr", "purrr", "robcor", "scales", "tidyr"] }, "simuclustfactor": { "name": "simuclustfactor", @@ -110513,7 +111665,7 @@ "name": "simukde", "version": "1.3.0", "sha256": "0mpj8pfrlagc97v53idsiypjcpbaj07y6klanph5lkiwzsgbz8sv", - "depends": ["ks", "MASS", "mvtnorm"] + "depends": ["MASS", "ks", "mvtnorm"] }, "simulMGF": { "name": "simulMGF", @@ -110567,7 +111719,7 @@ "name": "singR", "version": "0.1.2", "sha256": "1xfmgavcm63imc5a57vk9x3yvdsf2y9599ipmimivdi6q0cxv7bc", - "depends": ["clue", "gam", "ICtest", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["ICtest", "MASS", "Rcpp", "RcppArmadillo", "clue", "gam"] }, "singcar": { "name": "singcar", @@ -110579,12 +111731,12 @@ "name": "singleCellHaystack", "version": "1.0.2", "sha256": "1kfkbfabv9j87rsy3nb3dmk6ckncvimrwax1p74vnszbz91a1zg7", - "depends": ["ggplot2", "Matrix", "reshape2"] + "depends": ["Matrix", "ggplot2", "reshape2"] }, "singleRcapture": { "name": "singleRcapture", - "version": "0.2.1.1", - "sha256": "184kvkjjhm3ak58yg0sdzkjnw0jzsm22pxlx3nq5a4jv6ckaxrix", + "version": "0.2.1.2", + "sha256": "18h10ms9xh97c4s9sa33bcvv341img73b9vh4ppgyk1lpissa1mb", "depends": ["doParallel", "foreach", "lamW", "mathjaxr", "sandwich"] }, "sinib": { @@ -110621,13 +111773,13 @@ "name": "sirt", "version": "4.1-15", "sha256": "0rihmkpnd6hdvb2qga387nw9hxz5ydhjbh9lgaf58nza7fwgqby1", - "depends": ["CDM", "pbapply", "pbv", "Rcpp", "RcppArmadillo", "TAM"] + "depends": ["CDM", "Rcpp", "RcppArmadillo", "TAM", "pbapply", "pbv"] }, "sirus": { "name": "sirus", "version": "0.3.3", "sha256": "0whjshqwy3dhim22rj358811s3h872d861j93zlhh32ivvwj2434", - "depends": ["ggplot2", "glmnet", "Matrix", "Rcpp", "RcppEigen", "ROCR"] + "depends": ["Matrix", "ROCR", "Rcpp", "RcppEigen", "ggplot2", "glmnet"] }, "sisVIVE": { "name": "sisVIVE", @@ -110639,7 +111791,7 @@ "name": "sisal", "version": "0.48", "sha256": "1fh35ndra58dryw222ng7ys3gx1izyk5789k30lyd4n8wqy6sjjd", - "depends": ["boot", "digest", "lattice", "mgcv", "R_matlab", "R_methodsS3"] + "depends": ["R_matlab", "R_methodsS3", "boot", "digest", "lattice", "mgcv"] }, "sisireg": { "name": "sisireg", @@ -110675,7 +111827,7 @@ "name": "sitepickR", "version": "0.0.1", "sha256": "1cqvf4d2jpav53v7h7vzknm8cbr5kqk1djqkhmjrwv2zjnx3fg97", - "depends": ["data_table", "dplyr", "ggplot2", "magrittr", "MatchIt", "reshape2", "sampling", "scales", "stringr", "tidyr", "tidyselect"] + "depends": ["MatchIt", "data_table", "dplyr", "ggplot2", "magrittr", "reshape2", "sampling", "scales", "stringr", "tidyr", "tidyselect"] }, "siteymlgen": { "name": "siteymlgen", @@ -110711,7 +111863,7 @@ "name": "sits", "version": "1.5.0", "sha256": "0ym6dkw1nvijvhyskiwp9m4pys9gmsxqhjwmqs6n670mxfnqibss", - "depends": ["dplyr", "gdalUtilities", "lubridate", "purrr", "Rcpp", "RcppArmadillo", "rstac", "sf", "showtext", "slider", "sysfonts", "terra", "tibble", "tidyr", "torch", "yaml"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "gdalUtilities", "lubridate", "purrr", "rstac", "sf", "showtext", "slider", "sysfonts", "terra", "tibble", "tidyr", "torch", "yaml"] }, "sivs": { "name": "sivs", @@ -110723,19 +111875,19 @@ "name": "sizeMat", "version": "1.1.2", "sha256": "1vbndadsn80ddrg471vp1qxf0gan38w6dkjk1p2npvfb47wdjj2h", - "depends": ["MASS", "matrixStats", "MCMCpack"] + "depends": ["MASS", "MCMCpack", "matrixStats"] }, "sjPlot": { "name": "sjPlot", "version": "2.8.16", "sha256": "093nmn1gq8i4kr5nhwby883rxpdiyb959shqvfnvplwcnnv762ji", - "depends": ["bayestestR", "datawizard", "dplyr", "ggeffects", "ggplot2", "insight", "knitr", "MASS", "parameters", "performance", "purrr", "rlang", "scales", "sjlabelled", "sjmisc", "sjstats", "tidyr"] + "depends": ["MASS", "bayestestR", "datawizard", "dplyr", "ggeffects", "ggplot2", "insight", "knitr", "parameters", "performance", "purrr", "rlang", "scales", "sjlabelled", "sjmisc", "sjstats", "tidyr"] }, "sjSDM": { "name": "sjSDM", "version": "1.0.5", "sha256": "1qrslxrminbzvqkcngx875kkbaj9f2wd8svdwsd0706v5w72pisg", - "depends": ["abind", "checkmate", "cli", "crayon", "ggplot2", "ggtern", "mathjaxr", "Metrics", "mgcv", "mvtnorm", "reticulate", "rstudioapi"] + "depends": ["Metrics", "abind", "checkmate", "cli", "crayon", "ggplot2", "ggtern", "mathjaxr", "mgcv", "mvtnorm", "reticulate", "rstudioapi"] }, "sjdbc": { "name": "sjdbc", @@ -110777,7 +111929,7 @@ "name": "skedastic", "version": "2.0.2", "sha256": "1ln0scwgvpif610jgwdl0rzlx41i8w2ri1vaq0kl11vg69xp5105", - "depends": ["bazar", "broom", "caret", "CompQuadForm", "inflection", "MASS", "Matrix", "mgcv", "osqp", "pracma", "quadprog", "quadprogXT", "Rdpack", "Rfast", "ROI", "ROI_plugin_qpoases", "slam"] + "depends": ["CompQuadForm", "MASS", "Matrix", "ROI", "ROI_plugin_qpoases", "Rdpack", "Rfast", "bazar", "broom", "caret", "inflection", "mgcv", "osqp", "pracma", "quadprog", "quadprogXT", "slam"] }, "skeletor": { "name": "skeletor", @@ -110795,7 +111947,7 @@ "name": "sketch", "version": "1.1.20.3", "sha256": "03ssz4vwrcfcqs5lvnrkm7yqc8ir62kz3zp8aycgl88rw5qm9003", - "depends": ["base64enc", "glue", "htmltools", "jsonlite", "magrittr", "purrr", "rlang", "rstudioapi", "shiny", "V8"] + "depends": ["V8", "base64enc", "glue", "htmltools", "jsonlite", "magrittr", "purrr", "rlang", "rstudioapi", "shiny"] }, "sketcher": { "name": "sketcher", @@ -110807,7 +111959,7 @@ "name": "sketching", "version": "0.1.2", "sha256": "0k2rdiawj84zhfik3qzqqzabm9sdjwnr008p0fhaaqpifbr0q5xj", - "depends": ["MASS", "phangorn", "Rcpp"] + "depends": ["MASS", "Rcpp", "phangorn"] }, "sketchy": { "name": "sketchy", @@ -110819,13 +111971,13 @@ "name": "skewMLRM", "version": "1.6", "sha256": "16gr0haag0pqw7k7nvfqlc6s5i92lkpd0ghkgvlwgql8jzw7zmlk", - "depends": ["clusterGeneration", "doParallel", "foreach", "MASS", "matrixcalc", "moments", "mvtnorm"] + "depends": ["MASS", "clusterGeneration", "doParallel", "foreach", "matrixcalc", "moments", "mvtnorm"] }, "skewlmm": { "name": "skewlmm", "version": "1.1.0", "sha256": "04jxf7bwh71r33s1s2xhiy0ipfaqz97ya86rr4m0f5kxnb942ggv", - "depends": ["dplyr", "furrr", "future", "ggplot2", "ggrepel", "haven", "matrixcalc", "moments", "MomTrunc", "mvtnorm", "nlme", "numDeriv", "optimParallel", "purrr", "relliptical", "TruncatedNormal"] + "depends": ["MomTrunc", "TruncatedNormal", "dplyr", "furrr", "future", "ggplot2", "ggrepel", "haven", "matrixcalc", "moments", "mvtnorm", "nlme", "numDeriv", "optimParallel", "purrr", "relliptical"] }, "skewsamp": { "name": "skewsamp", @@ -110855,19 +112007,19 @@ "name": "skipTrack", "version": "0.1.0", "sha256": "0s5w2jixm52pbpi2cmgf9s1d6prs49dz4kcrr135d0nbdx34ma2w", - "depends": ["doParallel", "foreach", "genMCMCDiag", "ggplot2", "ggtext", "glmnet", "gridExtra", "LaplacesDemon", "lifecycle", "mvtnorm", "optimg"] + "depends": ["LaplacesDemon", "doParallel", "foreach", "genMCMCDiag", "ggplot2", "ggtext", "glmnet", "gridExtra", "lifecycle", "mvtnorm", "optimg"] }, "sklarsomega": { "name": "sklarsomega", "version": "3.0-2", "sha256": "027rx1x5hsn0qx7s6s2sqf13p49jbhi6g7w0fzfqf619p3fzkghg", - "depends": ["dfoptim", "extraDistr", "hash", "LaplacesDemon", "Matrix", "mcmcse", "numDeriv", "spam"] + "depends": ["LaplacesDemon", "Matrix", "dfoptim", "extraDistr", "hash", "mcmcse", "numDeriv", "spam"] }, "skm": { "name": "skm", "version": "0.1.5.4", "sha256": "06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v", - "depends": ["data_table", "magrittr", "plyr", "Rcpp", "RcppArmadillo", "RcppParallel"] + "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "data_table", "magrittr", "plyr"] }, "skmeans": { "name": "skmeans", @@ -110879,7 +112031,7 @@ "name": "skpr", "version": "1.7.1", "sha256": "1g19pq73map54sypkarvyw191zgf4cbmr1hskr8amg75wvw8mg11", - "depends": ["car", "doFuture", "doParallel", "doRNG", "foreach", "future", "iterators", "lme4", "lmerTest", "magrittr", "progress", "progressr", "Rcpp", "RcppEigen", "scales", "survival", "viridis"] + "depends": ["Rcpp", "RcppEigen", "car", "doFuture", "doParallel", "doRNG", "foreach", "future", "iterators", "lme4", "lmerTest", "magrittr", "progress", "progressr", "scales", "survival", "viridis"] }, "skylight": { "name": "skylight", @@ -110891,13 +112043,13 @@ "name": "skynet", "version": "1.4.3", "sha256": "08a5p3rk0qhsxawdxj5sfw07rdk56x6viy37w1b0hxqaxxxv239i", - "depends": ["data_table", "dplyr", "geosphere", "ggplot2", "ggrepel", "httr", "igraph", "leaflet", "maps", "RCurl", "stringr"] + "depends": ["RCurl", "data_table", "dplyr", "geosphere", "ggplot2", "ggrepel", "httr", "igraph", "leaflet", "maps", "stringr"] }, "skyscapeR": { "name": "skyscapeR", "version": "1.0.0", "sha256": "1x3s003wdmnf0h1k3gl6cvd35g516y7v2yzahr3wxk2np832kjli", - "depends": ["doParallel", "foreach", "httr", "MESS", "numDeriv", "oce", "plotrix", "png", "RColorBrewer", "rootSolve", "swephR", "zoo"] + "depends": ["MESS", "RColorBrewer", "doParallel", "foreach", "httr", "numDeriv", "oce", "plotrix", "png", "rootSolve", "swephR", "zoo"] }, "slackr": { "name": "slackr", @@ -110907,8 +112059,8 @@ }, "slam": { "name": "slam", - "version": "0.1-50", - "sha256": "1ggqcf8l1z2hpi7qy4mg0d2ps48bjjb8z1y1xz6fq162cqrbz6bq", + "version": "0.1-52", + "sha256": "09j1k63nw1m1vgblnla6s52v2337ixs958jmlzkjjz1xb01yd0y3", "depends": [] }, "slanter": { @@ -110927,13 +112079,13 @@ "name": "slasso", "version": "1.0.0", "sha256": "0k83szk6jzvn5353p9ia2ipmjyl65ivx95rj62rq8dyjfrdyzs0d", - "depends": ["cxxfunplus", "fda", "fda_usc", "inline", "MASS", "matrixcalc", "matrixStats", "plot3D", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "cxxfunplus", "fda", "fda_usc", "inline", "matrixStats", "matrixcalc", "plot3D"] }, "slca": { "name": "slca", "version": "1.0.0", "sha256": "0wllwz9cn9wvxwb4gd4g3blwhaplmfdxx06jki41ii64sq9cxbyq", - "depends": ["DiagrammeR", "magrittr", "MASS", "Rcpp"] + "depends": ["DiagrammeR", "MASS", "Rcpp", "magrittr"] }, "slcm": { "name": "slcm", @@ -110957,7 +112109,7 @@ "name": "sleeperapi", "version": "1.1.1", "sha256": "1lmpcpd407bz7fwb20c8m5vaxq7l7sgna7jmh6mjy579az0fzllj", - "depends": ["dplyr", "DT", "htmltools", "htmlwidgets", "httr", "jsonlite", "plotly", "purrr", "RColorBrewer", "rlang", "scales", "shiny", "shinycssloaders", "shinyWidgets", "stringr", "tidyr"] + "depends": ["DT", "RColorBrewer", "dplyr", "htmltools", "htmlwidgets", "httr", "jsonlite", "plotly", "purrr", "rlang", "scales", "shiny", "shinyWidgets", "shinycssloaders", "stringr", "tidyr"] }, "sleepr": { "name": "sleepr", @@ -110987,13 +112139,13 @@ "name": "slfm", "version": "1.0.2", "sha256": "1xrla1c91x636vi55ajhaiz10293bppxylpm2jqrmfgs9gh2rbrn", - "depends": ["coda", "lattice", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "coda", "lattice"] }, "slgf": { "name": "slgf", "version": "2.0.0", "sha256": "07gkl35hq3w42kw103gn9f15s0z4n49nq39ip1nzm3s6d1ad6in6", - "depends": ["numDeriv", "Rdpack"] + "depends": ["Rdpack", "numDeriv"] }, "slickR": { "name": "slickR", @@ -111017,13 +112169,13 @@ "name": "slim", "version": "0.1.1", "sha256": "0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1", - "depends": ["data_table", "MASS"] + "depends": ["MASS", "data_table"] }, "slimrec": { "name": "slimrec", "version": "0.1.0", "sha256": "1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377", - "depends": ["assertthat", "bigmemory", "glmnet", "Matrix", "pbapply"] + "depends": ["Matrix", "assertthat", "bigmemory", "glmnet", "pbapply"] }, "slippymath": { "name": "slippymath", @@ -111043,12 +112195,6 @@ "sha256": "00fk5fr5zsk2qxc1kfhmshhjxgnamm3401089sx8m2l529zd6r8j", "depends": ["codetools", "crayon", "purrr", "rlang", "tibble"] }, - "slopeOP": { - "name": "slopeOP", - "version": "1.0.1", - "sha256": "0rcxa2wdj57aj7n17sxv05dvwchhfsnhssmc372xjfgi72gdnv58", - "depends": ["Rcpp"] - }, "slouch": { "name": "slouch", "version": "2.1.5", @@ -111059,7 +112205,7 @@ "name": "slowraker", "version": "0.1.1", "sha256": "0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx", - "depends": ["NLP", "openNLP", "SnowballC"] + "depends": ["NLP", "SnowballC", "openNLP"] }, "slp": { "name": "slp", @@ -111071,7 +112217,7 @@ "name": "slr", "version": "1.3.0", "sha256": "1pj23nxp5c12z37fssqc5vyyig9qsa7q4ziyygmj1gm7di313hdc", - "depends": ["gmp", "ibd", "MASS"] + "depends": ["MASS", "gmp", "ibd"] }, "slurmR": { "name": "slurmR", @@ -111095,13 +112241,13 @@ "name": "smacof", "version": "2.1-6", "sha256": "06mdvkbc9q8b5sbqnx4c5mq06jkqspvc4bb7zn15byz8ybv5h7aa", - "depends": ["candisc", "colorspace", "doParallel", "e1071", "ellipse", "foreach", "Hmisc", "MASS", "nnls", "plotrix", "polynom", "weights", "wordcloud"] + "depends": ["Hmisc", "MASS", "candisc", "colorspace", "doParallel", "e1071", "ellipse", "foreach", "nnls", "plotrix", "polynom", "weights", "wordcloud"] }, "smacofx": { "name": "smacofx", - "version": "0.6-6", - "sha256": "0i4v3qbizqniaf92nv2q2860k454hwnhqb789p0nkkcyh9wgyrc9", - "depends": ["MASS", "minqa", "plotrix", "ProjectionBasedClustering", "smacof", "vegan", "weights"] + "version": "1.5-3", + "sha256": "19pb825b7fx6ah0njap03yg763swhbfw79vhk25d37yvcidj7nm3", + "depends": ["MASS", "ProjectionBasedClustering", "minqa", "plotrix", "smacof", "vegan", "weights"] }, "smacpod": { "name": "smacpod", @@ -111125,13 +112271,13 @@ "name": "smallstuff", "version": "1.0.3", "sha256": "17x73fcrvnw71bn52mg6lgpm9is99djy5avpnyqsffhqa8x6mzsv", - "depends": ["class", "data_table", "igraph", "matlib", "Matrix", "pryr", "ROCR"] + "depends": ["Matrix", "ROCR", "class", "data_table", "igraph", "matlib", "pryr"] }, "smam": { "name": "smam", "version": "0.7.2", "sha256": "0p7k4x27rbfmibifq9hn161v57zvlgw088inq2gnmm95sh6kqh1v", - "depends": ["doParallel", "doSNOW", "EnvStats", "foreach", "Matrix", "nloptr", "numDeriv", "Rcpp", "RcppGSL", "RcppParallel"] + "depends": ["EnvStats", "Matrix", "Rcpp", "RcppGSL", "RcppParallel", "doParallel", "doSNOW", "foreach", "nloptr", "numDeriv"] }, "smartDesign": { "name": "smartDesign", @@ -111161,7 +112307,7 @@ "name": "smartsnp", "version": "1.1.0", "sha256": "1gzzhys6bja55iclkji254kri6r3iamiw7bv881mp615wi9r3hx2", - "depends": ["bootSVD", "data_table", "foreach", "Rcpp", "RcppArmadillo", "Rfast", "RSpectra", "vegan", "vroom"] + "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "Rfast", "bootSVD", "data_table", "foreach", "vegan", "vroom"] }, "smatr": { "name": "smatr", @@ -111179,7 +112325,7 @@ "name": "smcfcs", "version": "1.8.0", "sha256": "0l658ynkf3lb1nckfrgysj19m6735fi2k48r7l5qaf6jq7f3l3bh", - "depends": ["abind", "brglm2", "checkmate", "MASS", "rlang", "survival", "VGAM"] + "depends": ["MASS", "VGAM", "abind", "brglm2", "checkmate", "rlang", "survival"] }, "smcryptoR": { "name": "smcryptoR", @@ -111207,9 +112353,9 @@ }, "smdi": { "name": "smdi", - "version": "0.2.2", - "sha256": "0bjwh9qbcr8221k43gayridqrsr3sf7mwgvlwy76k9dmjr0bid63", - "depends": ["broom", "dplyr", "fastDummies", "forcats", "ggplot2", "glue", "gt", "Hotelling", "lifecycle", "magrittr", "mice", "naniar", "pROC", "randomForest", "stringr", "survival", "tableone", "tibble", "tidyr", "tidyselect"] + "version": "0.3.0", + "sha256": "0grgj1wf2pdcz1wangnsni5x6idqz19plr7jghq6p0a7w9b89d6q", + "depends": ["Hotelling", "broom", "caret", "dplyr", "fastDummies", "forcats", "ggplot2", "glue", "gt", "lifecycle", "magrittr", "mice", "naniar", "pROC", "randomForest", "stringr", "survival", "tableone", "tibble", "tidyr"] }, "smdocker": { "name": "smdocker", @@ -111221,7 +112367,7 @@ "name": "smerc", "version": "1.8.3", "sha256": "181av1l1r327iszxrihilvfiqbc4m4496g94i5r9vhhamvgk8cwm", - "depends": ["pbapply", "Rcpp", "RcppProgress"] + "depends": ["Rcpp", "RcppProgress", "pbapply"] }, "smetlite": { "name": "smetlite", @@ -111233,7 +112379,7 @@ "name": "smfishHmrf", "version": "0.1", "sha256": "1k6mpyp11zv5rc3k98baymr903p2pf424nf9xng20q1li8s8y2ab", - "depends": ["fs", "pracma", "Rdpack"] + "depends": ["Rdpack", "fs", "pracma"] }, "smfsb": { "name": "smfsb", @@ -111245,7 +112391,7 @@ "name": "smicd", "version": "1.1.5", "sha256": "0lcdclp2bxs5g47a49xhwqgsl15czg2pym0d6z287wj4ccpxihxh", - "depends": ["formula_tools", "Hmisc", "ineq", "laeken", "lme4", "mvtnorm", "truncnorm", "weights"] + "depends": ["Hmisc", "formula_tools", "ineq", "laeken", "lme4", "mvtnorm", "truncnorm", "weights"] }, "smidm": { "name": "smidm", @@ -111257,7 +112403,7 @@ "name": "smile", "version": "1.0.5", "sha256": "1474jfk6vqcx3jv0mlf45l93bnn3f2qgm2j03rbjid4skg811618", - "depends": ["Matrix", "mvtnorm", "numDeriv", "Rcpp", "RcppArmadillo", "sf"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "mvtnorm", "numDeriv", "sf"] }, "smirnov": { "name": "smirnov", @@ -111299,19 +112445,19 @@ "name": "smoof", "version": "1.6.0.3", "sha256": "1cazhnd0m5jjzixaqgqh2h3rsa2sw3k8slj5cmgm8v47aaqn91mg", - "depends": ["BBmisc", "checkmate", "ggplot2", "ParamHelpers", "Rcpp", "RcppArmadillo"] + "depends": ["BBmisc", "ParamHelpers", "Rcpp", "RcppArmadillo", "checkmate", "ggplot2"] }, "smooth": { "name": "smooth", - "version": "4.0.1", - "sha256": "0z9iacmrvlrz6rk1dmih6qqfgmav14aar2nkmk7f1gr5f285r56d", - "depends": ["generics", "greybox", "MASS", "nloptr", "pracma", "Rcpp", "RcppArmadillo", "statmod", "xtable", "zoo"] + "version": "4.0.2", + "sha256": "1q0sgn30hsak9nyy30nbslh39byhqygypi1kp6gp99qfdrgxflva", + "depends": ["MASS", "Rcpp", "RcppArmadillo", "generics", "greybox", "nloptr", "pracma", "statmod", "xtable", "zoo"] }, "smoothAPC": { "name": "smoothAPC", "version": "0.3", "sha256": "11f34qqdm8m0hmy9jf29q439slchvmqgdfrmak7vcdhfnjcylr5r", - "depends": ["colorspace", "lmtest", "quantreg", "rgl", "SparseM"] + "depends": ["SparseM", "colorspace", "lmtest", "quantreg", "rgl"] }, "smoothHR": { "name": "smoothHR", @@ -111347,7 +112493,7 @@ "name": "smoothic", "version": "1.2.0", "sha256": "11id442cgnk6a0nd0c20rz5ccxlq3hhpsmvmlvg93jf4v6c2046z", - "depends": ["data_table", "dplyr", "ggplot2", "MASS", "numDeriv", "purrr", "rlang", "stringr", "tibble", "tidyr", "toOrdinal"] + "depends": ["MASS", "data_table", "dplyr", "ggplot2", "numDeriv", "purrr", "rlang", "stringr", "tibble", "tidyr", "toOrdinal"] }, "smoothie": { "name": "smoothie", @@ -111383,19 +112529,19 @@ "name": "smoots", "version": "1.1.4", "sha256": "1drlnh22gn6fdziplnja5w7gc5lyvpjq54aqqmwfh6h78ivcg0vs", - "depends": ["future", "future_apply", "progress", "progressr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "future", "future_apply", "progress", "progressr"] }, "smosr": { "name": "smosr", "version": "1.0.1", "sha256": "1arj4skjqnwfk4yr26iwp1j9pjp75xk18hap0ff1wqpxmvajlmgj", - "depends": ["fields", "lubridate", "ncdf4", "RCurl", "terra", "tidyr"] + "depends": ["RCurl", "fields", "lubridate", "ncdf4", "terra", "tidyr"] }, "smotefamily": { "name": "smotefamily", "version": "1.4.0", "sha256": "05ck6c4pldqqspb7abjh8vabc3g0fp6ivfbd9y2q2rm031mil4p2", - "depends": ["dbscan", "FNN", "igraph"] + "depends": ["FNN", "dbscan", "igraph"] }, "smovie": { "name": "smovie", @@ -111411,9 +112557,9 @@ }, "smplot2": { "name": "smplot2", - "version": "0.2.3", - "sha256": "1cn4sv7a7gra2b7xwkwjglaygrrcd9b6mdh00dgq3mpf0b8rllvg", - "depends": ["cowplot", "dplyr", "ggplot2", "ggpubr", "Hmisc", "patchwork", "pwr", "rlang", "tibble", "zoo"] + "version": "0.2.4", + "sha256": "1aigy0md8xgv9yfr0391wpc9a36566m5avm71g48688hg26djrh7", + "depends": ["Hmisc", "cowplot", "dplyr", "ggplot2", "ggpubr", "patchwork", "pwr", "rlang", "tibble", "zoo"] }, "sms": { "name": "sms", @@ -111431,13 +112577,13 @@ "name": "smurf", "version": "1.1.5", "sha256": "1gpzzj67x0i70vw1x4rv56mhk2b74ynvdsy93rzmdk6b2h3dvv46", - "depends": ["catdata", "glmnet", "MASS", "Matrix", "mgcv", "RColorBrewer", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Matrix", "RColorBrewer", "Rcpp", "RcppArmadillo", "catdata", "glmnet", "mgcv"] }, "smvgraph": { "name": "smvgraph", "version": "0.1.2", "sha256": "06pvnrhd3q913nxhk1icj11xkd1is3qi31b0kv6zbc0qkixn1ym7", - "depends": ["DescTools", "fmsb", "MASS", "shiny", "shinydashboard", "sortable"] + "depends": ["DescTools", "MASS", "fmsb", "shiny", "shinydashboard", "sortable"] }, "sn": { "name": "sn", @@ -111449,7 +112595,7 @@ "name": "snSMART", "version": "0.2.3", "sha256": "0d05wn2w9x7gapaz94zpf251rh2mld8agsir3hqbzjyil14xrpv6", - "depends": ["bayestestR", "condMVNorm", "cubature", "EnvStats", "geepack", "HDInterval", "pracma", "rjags", "tidyr", "truncdist"] + "depends": ["EnvStats", "HDInterval", "bayestestR", "condMVNorm", "cubature", "geepack", "pracma", "rjags", "tidyr", "truncdist"] }, "sna": { "name": "sna", @@ -111461,7 +112607,7 @@ "name": "snahelper", "version": "1.4.2", "sha256": "04l6ad4rj45kr7p98nbpsqbqppv2bgp71n6zph0aqm6b13hp0jyy", - "depends": ["colourpicker", "DT", "formatR", "ggplot2", "ggraph", "graphlayouts", "igraph", "miniUI", "rstudioapi", "shiny"] + "depends": ["DT", "colourpicker", "formatR", "ggplot2", "ggraph", "graphlayouts", "igraph", "miniUI", "rstudioapi", "shiny"] }, "snakecase": { "name": "snakecase", @@ -111503,7 +112649,7 @@ "name": "snfa", "version": "0.0.1", "sha256": "01k2nw8b8mwsd07jijfqk3rj88l9m36c5jai7qma56fjxx23s3wb", - "depends": ["abind", "ggplot2", "prodlim", "quadprog", "Rdpack", "rootSolve"] + "depends": ["Rdpack", "abind", "ggplot2", "prodlim", "quadprog", "rootSolve"] }, "snha": { "name": "snha", @@ -111539,7 +112685,7 @@ "name": "snowboot", "version": "1.0.2", "sha256": "0jj3p0g4rwml8vmlwj10rfisxfjlipcrpvq5z134z4j35jp6ggv3", - "depends": ["igraph", "Rcpp", "Rdpack"] + "depends": ["Rcpp", "Rdpack", "igraph"] }, "snowfall": { "name": "snowfall", @@ -111557,7 +112703,7 @@ "name": "snowquery", "version": "1.2.0", "sha256": "1q9qbz35pid2y010gs69yqb4x2cq56xkgxk1grl8hhvp4fb1iszg", - "depends": ["DBI", "reticulate", "RPostgres", "RSQLite", "yaml"] + "depends": ["DBI", "RPostgres", "RSQLite", "reticulate", "yaml"] }, "snpAIMeR": { "name": "snpAIMeR", @@ -111569,25 +112715,25 @@ "name": "snpReady", "version": "0.9.6", "sha256": "1r96j8zh84dn7qh3zgl0p0v3a80hx2wd3c4jgjlr43hzl7yglpqr", - "depends": ["impute", "Matrix", "matrixcalc", "rgl", "stringr"] + "depends": ["Matrix", "impute", "matrixcalc", "rgl", "stringr"] }, "snplinkage": { "name": "snplinkage", "version": "1.0.0", "sha256": "112wg2gnr4ikj916nb71sm39g41ls05d4j56hhml9hfnkiv76x5p", - "depends": ["gdsfmt", "ggplot2", "gtable", "GWASTools", "magrittr"] + "depends": ["GWASTools", "gdsfmt", "ggplot2", "gtable", "magrittr"] }, "snplist": { "name": "snplist", "version": "0.18.2", "sha256": "1sa2s3br4agx920jpr250iih61p99v500nh0c1w99w0846g9908c", - "depends": ["biomaRt", "DBI", "R_utils", "Rcpp", "RSQLite"] + "depends": ["DBI", "RSQLite", "R_utils", "Rcpp", "biomaRt"] }, "snpsettest": { "name": "snpsettest", "version": "0.1.2", "sha256": "0djz39b59x3kd5albdwjsgvln1qbm9xfbbglbym87xc3924sbwqj", - "depends": ["data_table", "gaston", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "gaston"] }, "sns": { "name": "sns", @@ -111611,7 +112757,7 @@ "name": "soc.ca", "version": "0.8.0", "sha256": "16l0synym91b7djgzdcz43dnvw44fkyxky9gm37ixbxzq1czdp9w", - "depends": ["dplyr", "ellipse", "FactoMineR", "flextable", "forcats", "ggplot2", "ggrepel", "gridExtra", "htmlTable", "magrittr", "Matrix", "purrr", "RColorBrewer", "reshape2", "rlang", "shiny", "stringr", "tibble", "tidyr"] + "depends": ["FactoMineR", "Matrix", "RColorBrewer", "dplyr", "ellipse", "flextable", "forcats", "ggplot2", "ggrepel", "gridExtra", "htmlTable", "magrittr", "purrr", "reshape2", "rlang", "shiny", "stringr", "tibble", "tidyr"] }, "socceR": { "name": "socceR", @@ -111677,7 +112823,7 @@ "name": "sofa", "version": "0.4.0", "sha256": "1w78f8pnx4vh6znpwwcy9k4j795zji4bv88mi6ihdv09ar7if7yv", - "depends": ["crul", "jsonlite", "mime", "R6"] + "depends": ["R6", "crul", "jsonlite", "mime"] }, "softImpute": { "name": "softImpute", @@ -111699,15 +112845,15 @@ }, "soilDB": { "name": "soilDB", - "version": "2.8.3", - "sha256": "1b85j3fpcvzm05pyv6zmd7j8af1nvkrbpsiz5cxzcx1l8kg1fmy4", - "depends": ["aqp", "curl", "data_table", "DBI"] + "version": "2.8.4", + "sha256": "122vwi9149xd8cadm4lrbq1fdxvdxzh3vs23zdvcbsm4dmzqhr6k", + "depends": ["DBI", "aqp", "curl", "data_table"] }, "soilassessment": { "name": "soilassessment", "version": "0.2.6", "sha256": "0cgyji88q3r6b57q32nk8xgxb4q29678h8zgh9ywxhr3mr40i0qv", - "depends": ["caret", "deSolve", "e1071", "FuzzyAHP", "googledrive", "Hmisc", "nnet", "png", "randomForest", "raster", "sf", "soiltexture", "sp", "terra"] + "depends": ["FuzzyAHP", "Hmisc", "caret", "deSolve", "e1071", "googledrive", "nnet", "png", "randomForest", "raster", "sf", "soiltexture", "sp", "terra"] }, "soilchemistry": { "name": "soilchemistry", @@ -111725,18 +112871,18 @@ "name": "soilhypfit", "version": "0.1-7", "sha256": "1ssz9w9ibw8mban0fq50j4lgr8vmkrsn8v9cpkg0wl28z1hqbhz3", - "depends": ["mgcv", "nloptr", "quadprog", "Rmpfr", "snowfall", "SoilHyP"] + "depends": ["Rmpfr", "SoilHyP", "mgcv", "nloptr", "quadprog", "snowfall"] }, "soilphysics": { "name": "soilphysics", "version": "5.0", "sha256": "1ijnqlb52c3vm6ydiginp0f82vkip0kbsvbd9yac3scrc5g1b5z3", - "depends": ["boot", "fields", "MASS", "rhandsontable", "shiny", "shinydashboard"] + "depends": ["MASS", "boot", "fields", "rhandsontable", "shiny", "shinydashboard"] }, "soiltestcorr": { "name": "soiltestcorr", - "version": "2.2.0", - "sha256": "1c5w3w4nrxdy2cdch048kmb35jqm8rws0am31vgn263y1045shwd", + "version": "2.2.1", + "sha256": "1p1nimd7d0m2qb2rdj0pfrcw95rrch2vqkwhqbwsn2bxbgn942yj", "depends": ["AICcmodavg", "data_table", "dplyr", "ggplot2", "ggpp", "minpack_lm", "modelr", "nlraa", "nlstools", "purrr", "rlang", "smatr", "tidyr"] }, "soiltexture": { @@ -111761,7 +112907,7 @@ "name": "solaR", "version": "0.46", "sha256": "1hv9rj8kvqh5i77s6cls7hknz43scdsi5zjh04mjg0gynb265f4p", - "depends": ["lattice", "latticeExtra", "RColorBrewer", "zoo"] + "depends": ["RColorBrewer", "lattice", "latticeExtra", "zoo"] }, "solarPos": { "name": "solarPos", @@ -111779,7 +112925,7 @@ "name": "solitude", "version": "1.1.3", "sha256": "1cqbcm72fq13lp0lazfngdylcasck1ffrj16ggxlryzps1181rhy", - "depends": ["data_table", "future_apply", "igraph", "lgr", "R6", "ranger"] + "depends": ["R6", "data_table", "future_apply", "igraph", "lgr", "ranger"] }, "solrad": { "name": "solrad", @@ -111791,12 +112937,12 @@ "name": "solrium", "version": "1.2.0", "sha256": "16x4gjk0x6m9yjq9sk3kwbw8qm7w16vmbnfy5xa9zikw96cl3iky", - "depends": ["crul", "dplyr", "jsonlite", "plyr", "R6", "tibble", "xml2"] + "depends": ["R6", "crul", "dplyr", "jsonlite", "plyr", "tibble", "xml2"] }, "solvebio": { "name": "solvebio", - "version": "2.14.0", - "sha256": "182ybiia1qc25fnc9wrzrfzvgd4m340nrrn7llx0pbc1iq1q7as2", + "version": "2.15.0", + "sha256": "0risi2s3m73hn7ip3x6gva6cr8dw9vmk237jncx9hcq07n5wr630", "depends": ["httr", "jsonlite", "mime"] }, "som": { @@ -111817,6 +112963,12 @@ "sha256": "05hm6yqh1d10kbgvy5j0cj2lvcnib4p9lmjcl32zxy1hazpagplq", "depends": ["reportr"] }, + "somaticflags": { + "name": "somaticflags", + "version": "0.1.0", + "sha256": "0b7g1i8qgrks6prdcmhdqpq9ivrlk47j8najq0baz02drrrf3fhm", + "depends": [] + }, "someMTP": { "name": "someMTP", "version": "1.4.1.1", @@ -111825,9 +112977,9 @@ }, "sommer": { "name": "sommer", - "version": "4.3.4", - "sha256": "0c6g0ldla3ix40aw0h7mylz3xlvdnvrlz288hjkq86r8g9i5mq2b", - "depends": ["crayon", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress"] + "version": "4.3.5", + "sha256": "0lhbrv4m44zgd178xpm5h0qdn54ldfjz7c96mmhm41pz0zn97h5h", + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "crayon"] }, "somspace": { "name": "somspace", @@ -111851,7 +113003,7 @@ "name": "sonicscrewdriver", "version": "0.0.7", "sha256": "0z18hyicbh6naxq5hz5bzx61x7kr1j5jsk98j71m8dalch2wysbm", - "depends": ["ggplot2", "hms", "jsonlite", "mime", "Rdpack", "seewave", "stringi", "suncalc", "tuneR"] + "depends": ["Rdpack", "ggplot2", "hms", "jsonlite", "mime", "seewave", "stringi", "suncalc", "tuneR"] }, "sonify": { "name": "sonify", @@ -111863,7 +113015,7 @@ "name": "soptdmaeA", "version": "1.0.0", "sha256": "03n1y82myq0rz14awjnx9nx1dz3dxqq58m13cw7a7ncap7fmw9r5", - "depends": ["igraph", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "igraph"] }, "soql": { "name": "soql", @@ -111875,7 +113027,7 @@ "name": "sorcering", "version": "1.0.1", "sha256": "195m83n57fsxg3w59y8q33b4hl9ng752lxdnvmvfb1m7iy1yaj49", - "depends": ["mathjaxr", "Rcpp", "RcppArmadillo", "Rdpack"] + "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "mathjaxr"] }, "sorocs": { "name": "sorocs", @@ -111897,15 +113049,15 @@ }, "sos": { "name": "sos", - "version": "2.1-7", - "sha256": "11q698wr3xnzr0nmzb9frifrizfl27f1ymdi6mrvyzw0y9cv3sq6", + "version": "2.1-8", + "sha256": "02wvdskc6fpb9yp83703xh332g69dhmvcfdjr47fcbfrzmvw1r0q", "depends": ["brew"] }, "sotkanet": { "name": "sotkanet", - "version": "0.9.79", - "sha256": "1d6g09rf7irk3d8hkm6ahp8zl6lj24jnipwvzr0njx2sqi3fwd4f", - "depends": ["curl", "httr", "jsonlite"] + "version": "0.10.1", + "sha256": "1384rsvhz39i8s8wvgik3jgv1h9yrdy7qmxpvmdqay6wjimmjz09", + "depends": ["RefManageR", "curl", "digest", "frictionless", "httr2", "lubridate", "magrittr"] }, "sotu": { "name": "sotu", @@ -111923,7 +113075,7 @@ "name": "soundClass", "version": "0.0.9.2", "sha256": "0z697asv2kzs93b45ndbkxfdzq3fmi1f6aprvpxps4x354gg2pi6", - "depends": ["DBI", "dbplyr", "dplyr", "generics", "htmltools", "keras", "magrittr", "RSQLite", "seewave", "shiny", "shinyBS", "shinyFiles", "shinyjs", "signal", "tuneR", "zoo"] + "depends": ["DBI", "RSQLite", "dbplyr", "dplyr", "generics", "htmltools", "keras", "magrittr", "seewave", "shiny", "shinyBS", "shinyFiles", "shinyjs", "signal", "tuneR", "zoo"] }, "soundecology": { "name": "soundecology", @@ -111951,9 +113103,9 @@ }, "sox": { "name": "sox", - "version": "1.1", - "sha256": "03lnl431k0fr19akhdwzci2dgmcclkqqj30984wp05ldn87drcyy", - "depends": ["glmnet", "Rcpp", "survival"] + "version": "1.2", + "sha256": "1phrs0mxycimzf7zz0g7bzkdkzf0fvqa86jwqnvmfyjjzqplpf2p", + "depends": ["Rcpp", "glmnet", "survival"] }, "sp": { "name": "sp", @@ -111971,13 +113123,13 @@ "name": "spANOVA", "version": "0.99.4", "sha256": "0y1kqqfrl9rrskyvmzdjw9zyjgyqmz8b3cfgbba49n41wx2aiw79", - "depends": ["ape", "car", "DT", "geoR", "gtools", "knitr", "MASS", "Matrix", "multcomp", "multcompView", "mvtnorm", "rmarkdown", "ScottKnott", "shiny", "shinyBS", "shinycssloaders", "shinythemes", "spatialreg", "spdep", "xtable"] + "depends": ["DT", "MASS", "Matrix", "ScottKnott", "ape", "car", "geoR", "gtools", "knitr", "multcomp", "multcompView", "mvtnorm", "rmarkdown", "shiny", "shinyBS", "shinycssloaders", "shinythemes", "spatialreg", "spdep", "xtable"] }, "spAbundance": { "name": "spAbundance", "version": "0.1.3", "sha256": "02qvgyiyrwaz2jgfp746fyr1bwd8m4lwjijaml9ychq4rdmrfjli", - "depends": ["abind", "coda", "doParallel", "foreach", "lme4", "RANN"] + "depends": ["RANN", "abind", "coda", "doParallel", "foreach", "lme4"] }, "spAddins": { "name": "spAddins", @@ -111989,25 +113141,25 @@ "name": "spBFA", "version": "1.3", "sha256": "1bi3lhbx37zlj2x0nql51x5422zxc1gcbn8vqjf81badwf80fwsp", - "depends": ["msm", "mvtnorm", "pgdraw", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "msm", "mvtnorm", "pgdraw"] }, "spBayes": { "name": "spBayes", "version": "0.4-7", "sha256": "18rb4k7yfnz07ilrgdipbl30a78zzl3yaikd999l482v1a95hibr", - "depends": ["coda", "Formula", "magic", "Matrix", "sp"] + "depends": ["Formula", "Matrix", "coda", "magic", "sp"] }, "spBayesSurv": { "name": "spBayesSurv", "version": "1.1.8", "sha256": "0z91k88m5bh8ipicb43kknxshjr6dwr6whfkm28j49xwjrm4ydsy", - "depends": ["coda", "fields", "MASS", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "coda", "fields", "survival"] }, "spCP": { "name": "spCP", "version": "1.3", "sha256": "0rphd8zawr2r14dzwv77plk5xw020pkc26ir72qiqc1acin42xd1", - "depends": ["msm", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "msm", "mvtnorm"] }, "spData": { "name": "spData", @@ -112037,7 +113189,7 @@ "name": "spGARCH", "version": "0.2.2", "sha256": "1wrmk2ybgysvibfy8vvp7pyqda5apqp0jxjfp3hlb416fza52966", - "depends": ["Matrix", "nleqslv", "Rcpp", "RcppEigen", "Rsolnp", "spdep", "truncnorm"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "Rsolnp", "nleqslv", "spdep", "truncnorm"] }, "spINAR": { "name": "spINAR", @@ -112061,13 +113213,19 @@ "name": "spNNGP", "version": "1.0.0", "sha256": "0z09hxmm2pbxsbm3zqk839z2gb3g2n2hqkahcbvcgywrqn3v8cal", - "depends": ["coda", "Formula", "RANN"] + "depends": ["Formula", "RANN", "coda"] + }, + "spNetwork": { + "name": "spNetwork", + "version": "0.4.4.3", + "sha256": "18g885w54d5hx9pwbqwz28gs723h9wpnfhr4a0yl37j5i3rasccx", + "depends": ["BH", "Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "abind", "cubature", "data_table", "dbscan", "future_apply", "ggplot2", "igraph", "progressr", "sf", "sfheaders", "spdep"] }, "spOccupancy": { "name": "spOccupancy", "version": "0.7.6", "sha256": "0gl6z2dch254nmyd19w7z3jmivadzvv27ymsbn1rk08qm19bf69g", - "depends": ["abind", "coda", "doParallel", "foreach", "lme4", "RANN", "spAbundance"] + "depends": ["RANN", "abind", "coda", "doParallel", "foreach", "lme4", "spAbundance"] }, "spRingsteen": { "name": "spRingsteen", @@ -112079,7 +113237,7 @@ "name": "spTDyn", "version": "2.0.2", "sha256": "010x3rjncasly1scngwyiys7asmk4ay51bzhk0zfjazwfkmqd12r", - "depends": ["coda", "sp", "spacetime", "spTimer"] + "depends": ["coda", "sp", "spTimer", "spacetime"] }, "spThin": { "name": "spThin", @@ -112097,7 +113255,7 @@ "name": "spaMM", "version": "4.5.0", "sha256": "1nr44jg73gnbc3q1ip7zmzl1n5bggbcgjrdlh6fg81zp41ba3ydv", - "depends": ["backports", "boot", "crayon", "geometry", "gmp", "MASS", "Matrix", "minqa", "nlme", "nloptr", "numDeriv", "pbapply", "proxy", "Rcpp", "RcppEigen", "ROI"] + "depends": ["MASS", "Matrix", "ROI", "Rcpp", "RcppEigen", "backports", "boot", "crayon", "geometry", "gmp", "minqa", "nlme", "nloptr", "numDeriv", "pbapply", "proxy"] }, "spaa": { "name": "spaa", @@ -112109,7 +113267,7 @@ "name": "spaceNet", "version": "1.2", "sha256": "1s2672icxs0qvdhl52xhllgvh1i9mjfrn5j3icyw6h61ljbnhy11", - "depends": ["MASS", "mclust", "permute", "RcppTN", "Rfast", "sna", "vegan"] + "depends": ["MASS", "RcppTN", "Rfast", "mclust", "permute", "sna", "vegan"] }, "spacefillr": { "name": "spacefillr", @@ -112155,15 +113313,15 @@ }, "spagmix": { "name": "spagmix", - "version": "0.4-1", - "sha256": "1vy951y7c1dabykqiij56qa56hc2lqahrav80698hpjbmxcr3w5f", + "version": "0.4-2", + "sha256": "0s3y0xapqn67hjl42g9w6jkcip5x5fbv8fyq2angkvqahps1nrg4", "depends": ["abind", "mvtnorm", "sparr", "spatstat", "spatstat_geom", "spatstat_random"] }, "spam": { "name": "spam", "version": "2.10-0", "sha256": "0ydc513jg7phzdqg8jp7210ayrrmxq91jafqzx8z1v0172i8d73i", - "depends": ["dotCall64", "Rcpp"] + "depends": ["Rcpp", "dotCall64"] }, "spam64": { "name": "spam64", @@ -112179,9 +113337,9 @@ }, "spant": { "name": "spant", - "version": "2.21.0", - "sha256": "0qaspbgphlicaak1c2n7bip60dv5wib1nxhv4x8za33s1v45h549", - "depends": ["abind", "expm", "fields", "irlba", "jsonlite", "minpack_lm", "mmand", "nloptr", "numDeriv", "plyr", "pracma", "ptw", "RNifti", "RNiftyReg", "signal", "stringr"] + "version": "2.22.0", + "sha256": "01snrzvyxc48dy2md3iac0c858i016wykmyhnk3p7gjh7bmh12s5", + "depends": ["RNifti", "RNiftyReg", "abind", "expm", "fields", "irlba", "jsonlite", "minpack_lm", "mmand", "nloptr", "numDeriv", "plyr", "pracma", "ptw", "signal", "stringr"] }, "sparcl": { "name": "sparcl", @@ -112223,7 +113381,7 @@ "name": "sparklyr", "version": "1.8.6", "sha256": "1yp3hwi1rhxx8sdhibcnjxsz1sd5jhfxn6cy9bphkwadrd19pn63", - "depends": ["config", "DBI", "dbplyr", "dplyr", "generics", "globals", "glue", "httr", "jsonlite", "openssl", "purrr", "rlang", "rstudioapi", "tidyr", "tidyselect", "uuid", "vctrs", "withr", "xml2"] + "depends": ["DBI", "config", "dbplyr", "dplyr", "generics", "globals", "glue", "httr", "jsonlite", "openssl", "purrr", "rlang", "rstudioapi", "tidyr", "tidyselect", "uuid", "vctrs", "withr", "xml2"] }, "sparklyr_flint": { "name": "sparklyr.flint", @@ -112263,9 +113421,9 @@ }, "sparr": { "name": "sparr", - "version": "2.3-10", - "sha256": "03dp6gvkpw8vjsf0p4igr2q4lgahn24j5f94h43jdrm4ppz860zh", - "depends": ["doParallel", "foreach", "misc3d", "spatstat", "spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_utils"] + "version": "2.3-15", + "sha256": "140gdk12dsl39k13g77iaqh0kzdi19ys3l00008fqn807mhcn2hz", + "depends": ["doParallel", "foreach", "misc3d", "spatstat", "spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_univar", "spatstat_utils"] }, "sparrpowR": { "name": "sparrpowR", @@ -112283,13 +113441,13 @@ "name": "sparseCov", "version": "0.0.1", "sha256": "1zgqfjahlbbwimxcn7l0jn316xd2a65s8gy4pck0aksyfqh56kb1", - "depends": ["Matrix", "mvnfast", "Rfast", "sparseMVN"] + "depends": ["Matrix", "Rfast", "mvnfast", "sparseMVN"] }, "sparseDFM": { "name": "sparseDFM", "version": "1.0", "sha256": "0w4xn0hyk3l94b9nplbhlbzkjkh2fx4cyqyjjn5x6dpkf1wj9aaz", - "depends": ["ggplot2", "Matrix", "Rcpp", "RcppArmadillo"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "ggplot2"] }, "sparseEigen": { "name": "sparseEigen", @@ -112301,13 +113459,13 @@ "name": "sparseFLMM", "version": "0.4.1", "sha256": "174lnhqig7m6fjfsj114ld059z9mjih3jzm5cq8iscxnhr9m11lr", - "depends": ["data_table", "MASS", "Matrix", "mgcv", "refund"] + "depends": ["MASS", "Matrix", "data_table", "mgcv", "refund"] }, "sparseGAM": { "name": "sparseGAM", "version": "1.0", "sha256": "0qqfsgrp0ll11mws0s54g5nsqxwn2j5kbs60q2zrviv6n8bs8xf0", - "depends": ["grpreg", "MASS", "pracma"] + "depends": ["MASS", "grpreg", "pracma"] }, "sparseHessianFD": { "name": "sparseHessianFD", @@ -112325,7 +113483,7 @@ "name": "sparseLDA", "version": "0.1-9", "sha256": "1k3sw9kc40yxnfss4vrsx34qxmv8ssddyhbfjhxrdldvblhbwchb", - "depends": ["elasticnet", "MASS", "mda"] + "depends": ["MASS", "elasticnet", "mda"] }, "sparseLRMatrix": { "name": "sparseLRMatrix", @@ -112353,8 +113511,8 @@ }, "sparseR": { "name": "sparseR", - "version": "0.2.3", - "sha256": "1q77n45kl1hqx5a6cr4hschj8zv0ymw8v7yvm748sdplan2dj417", + "version": "0.3.1", + "sha256": "166140mb4d63z59whg8c8478n5zx8jlmw7m4ji77ma9wws4pr6ww", "depends": ["dplyr", "magrittr", "ncvreg", "recipes", "rlang"] }, "sparseSEM": { @@ -112377,9 +113535,9 @@ }, "sparsegl": { "name": "sparsegl", - "version": "1.0.2", - "sha256": "0c5iqhq3rn5wsy8a5lj37b4spqhy46d7d5k5q3kn034amml4cyfb", - "depends": ["cli", "dotCall64", "ggplot2", "magrittr", "Matrix", "rlang", "RSpectra", "tidyr"] + "version": "1.1.0", + "sha256": "0931wsd905bhrqkwjdv6m3vg7wpzdqyvzkkqp5pcwilvrswh0kdb", + "depends": ["Matrix", "RSpectra", "cli", "dotCall64", "ggplot2", "magrittr", "rlang", "tidyr"] }, "sparseinv": { "name": "sparseinv", @@ -112409,7 +113567,7 @@ "name": "sparsereg", "version": "1.2", "sha256": "1ipsang2fppmjx4h5ljgzx3c44z3lggc376ghrqqgmxb5ql8bcp3", - "depends": ["coda", "ggplot2", "GIGrvg", "glmnet", "gridExtra", "MASS", "MCMCpack", "msm", "Rcpp", "RcppArmadillo", "VGAM"] + "depends": ["GIGrvg", "MASS", "MCMCpack", "Rcpp", "RcppArmadillo", "VGAM", "coda", "ggplot2", "glmnet", "gridExtra", "msm"] }, "sparsestep": { "name": "sparsestep", @@ -112427,13 +113585,13 @@ "name": "sparsevar", "version": "0.1.0", "sha256": "1kcy6bm04mccky529nryy5l001bv71hx304ysiabl4myakw0rwy7", - "depends": ["corpcor", "doParallel", "ggplot2", "glmnet", "Matrix", "mvtnorm", "ncvreg", "picasso", "reshape2"] + "depends": ["Matrix", "corpcor", "doParallel", "ggplot2", "glmnet", "mvtnorm", "ncvreg", "picasso", "reshape2"] }, "sparsevb": { "name": "sparsevb", "version": "0.1.0", "sha256": "1cigq8hwymrrkiy3iyrxsjjbj228ahrd7mq9lqar4jlb925jzqx4", - "depends": ["glmnet", "Rcpp", "RcppArmadillo", "RcppEnsmallen", "selectiveInference"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEnsmallen", "glmnet", "selectiveInference"] }, "sparsevctrs": { "name": "sparsevctrs", @@ -112463,7 +113621,7 @@ "name": "spass", "version": "1.3", "sha256": "1c148z0i3d185hnf54xmgppjrblv3b2s3sm0lmj78gvav04mj5s4", - "depends": ["geepack", "MASS", "multcomp", "mvtnorm", "Rcpp"] + "depends": ["MASS", "Rcpp", "geepack", "multcomp", "mvtnorm"] }, "spatPomp": { "name": "spatPomp", @@ -112493,13 +113651,13 @@ "name": "spathial", "version": "0.1.2", "sha256": "1vwzcwpmx8kwv821vjf940qd5am3k0shf1s14jva71mgxs70ddmb", - "depends": ["class", "igraph", "irlba", "knitr", "MASS", "matrixStats", "pracma", "rmarkdown", "Rtsne"] + "depends": ["MASS", "Rtsne", "class", "igraph", "irlba", "knitr", "matrixStats", "pracma", "rmarkdown"] }, "spaths": { "name": "spaths", - "version": "1.1.2", - "sha256": "08gzw4lbk288230309g1craf4jm5xv4kqxcbpy649g1cdzqq4lf1", - "depends": ["data_table", "Rcpp"] + "version": "1.1.3", + "sha256": "1637y3ws9ivjkc5k4r3cwza485ynyjya1wgk866g0h6v7rpfx7xq", + "depends": ["Rcpp", "data_table"] }, "spatial": { "name": "spatial", @@ -112529,13 +113687,13 @@ "name": "spatialTIME", "version": "1.3.4-5", "sha256": "0i5fcy2q53612kq1qjg2sp10lwsiva6nay0v2jl2mw28zx6p22s9", - "depends": ["crayon", "dixon", "dplyr", "furrr", "future", "ggplot2", "magrittr", "pbmcapply", "purrr", "RColorBrewer", "scales", "spatstat_explore", "spatstat_geom", "spatstat_univar", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["RColorBrewer", "crayon", "dixon", "dplyr", "furrr", "future", "ggplot2", "magrittr", "pbmcapply", "purrr", "scales", "spatstat_explore", "spatstat_geom", "spatstat_univar", "stringr", "tibble", "tidyr", "tidyselect"] }, "spatialising": { "name": "spatialising", "version": "0.6.0", "sha256": "0q2gj16crhr1s92pazj6zbhr03xjp0pqwdc64qanpxmv4sbm65wq", - "depends": ["comat", "Rcpp", "terra"] + "depends": ["Rcpp", "comat", "terra"] }, "spatialprobit": { "name": "spatialprobit", @@ -112547,13 +113705,13 @@ "name": "spatialreg", "version": "1.3-4", "sha256": "0sgvcqswfpa9aq1x2ir1d5vg52gny1r1l15g66nk0113vvbrz982", - "depends": ["boot", "coda", "LearnBayes", "MASS", "Matrix", "multcomp", "nlme", "sf", "spData", "spdep"] + "depends": ["LearnBayes", "MASS", "Matrix", "boot", "coda", "multcomp", "nlme", "sf", "spData", "spdep"] }, "spatialrisk": { "name": "spatialrisk", "version": "0.7.1", "sha256": "1r6dr4n3d0x1yb4vcbfq0aqdqmy0h4n73snl86wrk86agvi5rmwp", - "depends": ["classInt", "colourvalues", "data_table", "dplyr", "fs", "GenSA", "geohashTools", "ggplot2", "leafem", "leafgl", "leaflet", "Rcpp", "RcppProgress", "sf", "tmap", "units", "viridis"] + "depends": ["GenSA", "Rcpp", "RcppProgress", "classInt", "colourvalues", "data_table", "dplyr", "fs", "geohashTools", "ggplot2", "leafem", "leafgl", "leaflet", "sf", "tmap", "units", "viridis"] }, "spatialsample": { "name": "spatialsample", @@ -112565,13 +113723,13 @@ "name": "spatialwarnings", "version": "3.0.3", "sha256": "03a0gb8v6028v6q5w3iap8fn9nkb2rpnabqgzmr2dyxnpfgr9dn3", - "depends": ["future", "future_apply", "ggplot2", "gsl", "plyr", "Rcpp", "RcppArmadillo", "segmented"] + "depends": ["Rcpp", "RcppArmadillo", "future", "future_apply", "ggplot2", "gsl", "plyr", "segmented"] }, "spatialwidget": { "name": "spatialwidget", "version": "0.2.5", "sha256": "01w0iwwjfbb8cxfs3l1vxlay8x6694d7c7ksrfrdd003h7dxwksj", - "depends": ["BH", "colourvalues", "geojsonsf", "geometries", "interleave", "jsonify", "rapidjsonr", "Rcpp", "sfheaders"] + "depends": ["BH", "Rcpp", "colourvalues", "geojsonsf", "geometries", "interleave", "jsonify", "rapidjsonr", "sfheaders"] }, "spatsoc": { "name": "spatsoc", @@ -112581,87 +113739,87 @@ }, "spatstat": { "name": "spatstat", - "version": "3.0-8", - "sha256": "0ghhj161n7bxd6hpk3hz6lq2gv8bwx5clrdp729lfyi9d1xjw162", - "depends": ["spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model", "spatstat_random", "spatstat_utils"] + "version": "3.1-1", + "sha256": "04jmyngwzdb1v5yzcmnsj26kaaxxvhjnmdp7is5nrry632c30jan", + "depends": ["spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model", "spatstat_random", "spatstat_univar", "spatstat_utils"] }, "spatstat_Knet": { "name": "spatstat.Knet", - "version": "3.0-2", - "sha256": "1yvdasrxmsa2m9016kclb33kv5893fsz5rcr416yhpf6jixdsfh8", - "depends": ["Matrix", "spatstat", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model", "spatstat_random", "spatstat_sparse", "spatstat_utils"] + "version": "3.1-0", + "sha256": "1n9hqq0pamk4bm9jbl1plpsa6ynab7kll6j3dhcvpmyai462wcxa", + "depends": ["Matrix", "spatstat", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model", "spatstat_random", "spatstat_sparse", "spatstat_univar", "spatstat_utils"] }, "spatstat_data": { "name": "spatstat.data", - "version": "3.0-4", - "sha256": "1s0ns5nhgigfn3d9rdy3f4ymnwj1w71v26iphkhwxddm9qzk80yi", + "version": "3.1-2", + "sha256": "0xqb94xm095qwxkhfrjqv7qwyxfs9i2xrwq06ir0y15q0dil36wv", "depends": ["Matrix", "spatstat_utils"] }, "spatstat_explore": { "name": "spatstat.explore", - "version": "3.2-7", - "sha256": "08740yclqv86mnds0a8xhn6r2qdqhw4qgkbrb2cl93crqwcdkr2f", - "depends": ["abind", "goftest", "Matrix", "nlme", "spatstat_data", "spatstat_geom", "spatstat_random", "spatstat_sparse", "spatstat_utils"] + "version": "3.3-1", + "sha256": "09if9x87g1zgcpqrg4ad4j6l0nd2yalpbbd3syxdvs4m671y7gyc", + "depends": ["Matrix", "abind", "goftest", "nlme", "spatstat_data", "spatstat_geom", "spatstat_random", "spatstat_sparse", "spatstat_univar", "spatstat_utils"] }, "spatstat_geom": { "name": "spatstat.geom", - "version": "3.2-9", - "sha256": "05ymr4h6g5kp6kinm8qi6mcwi51d2rp671cm3hqgyrhk91k72cx7", - "depends": ["deldir", "polyclip", "spatstat_data", "spatstat_utils"] + "version": "3.3-2", + "sha256": "03spxazgjspmsialvjy2sv5yxjh049dns4q4l4g0zgzd4ilqmh6b", + "depends": ["deldir", "polyclip", "spatstat_data", "spatstat_univar", "spatstat_utils"] }, "spatstat_gui": { "name": "spatstat.gui", - "version": "3.0-1", - "sha256": "1y6z3gdad0nhqg494b5pjq4h0mr3mcrhnnc0chy56lf8chb6p5jb", - "depends": ["rpanel", "spatstat", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model", "spatstat_random", "spatstat_utils"] + "version": "3.1-0", + "sha256": "108ls75y8zhcygfra9zbd2c0gfpf6n0kl2d6jlixa712l3m6lx8l", + "depends": ["rpanel", "spatstat", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model", "spatstat_random", "spatstat_univar", "spatstat_utils"] }, "spatstat_linnet": { "name": "spatstat.linnet", - "version": "3.1-5", - "sha256": "18zp6dsddc9js4ck6iqh5li4hw5qbyvh16vsa9vqk4ccgc1krl57", - "depends": ["Matrix", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_model", "spatstat_random", "spatstat_sparse", "spatstat_utils"] + "version": "3.2-1", + "sha256": "1gqivj8lsqn67068ygjqjjbnl2wywq3zp6mpqqbhyrbj7h3diw0s", + "depends": ["Matrix", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_model", "spatstat_random", "spatstat_sparse", "spatstat_univar", "spatstat_utils"] }, "spatstat_local": { "name": "spatstat.local", - "version": "5.0-1", - "sha256": "02ip6d2mr07n3lv4i5xdmb1j55syk5hwjwr7j81ibxkp3gj8gm61", - "depends": ["spatstat", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_model", "spatstat_random", "spatstat_sparse", "spatstat_utils", "tensor"] + "version": "5.1-0", + "sha256": "1brbk98hibsb7nh71xb3nhxsj8bb6lzclg746xd62cn9y72dl0v0", + "depends": ["spatstat", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_model", "spatstat_random", "spatstat_sparse", "spatstat_univar", "spatstat_utils", "tensor"] }, "spatstat_model": { "name": "spatstat.model", - "version": "3.2-11", - "sha256": "0hvnqig6cdrp8hk2fkcajag3hrqsamfr6h66wn4cs30iblic23bh", - "depends": ["abind", "goftest", "Matrix", "mgcv", "nlme", "rpart", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_sparse", "spatstat_utils", "tensor"] + "version": "3.3-1", + "sha256": "19xgc4hmcyhxdk4cw7k5qyffr48vyc9dj76k3blxzgrbbydrc72w", + "depends": ["Matrix", "abind", "goftest", "mgcv", "nlme", "rpart", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_sparse", "spatstat_univar", "spatstat_utils", "tensor"] }, "spatstat_random": { "name": "spatstat.random", - "version": "3.2-3", - "sha256": "19rl757lccr169fj00zmhb1a20bxw4kljzb81hbbr5xhj0za6lp0", - "depends": ["spatstat_data", "spatstat_geom", "spatstat_utils"] + "version": "3.3-1", + "sha256": "1lxvi1wkbv6z0hcargcjb5b79vvrhaf0y2psxlil9q82i376n0l3", + "depends": ["spatstat_data", "spatstat_geom", "spatstat_univar", "spatstat_utils"] }, "spatstat_sparse": { "name": "spatstat.sparse", - "version": "3.0-3", - "sha256": "0scdk3ns4nl1v1avbggnsinfpvl4i8391qy3x1iwxvkimr14xg3b", - "depends": ["abind", "Matrix", "spatstat_utils", "tensor"] + "version": "3.1-0", + "sha256": "1sdv9d3f5xc87qiwbfjikl12h2vkmdfq2faal5wbhfc3h72mvgk3", + "depends": ["Matrix", "abind", "spatstat_utils", "tensor"] }, "spatstat_univar": { "name": "spatstat.univar", - "version": "2.0-3", - "sha256": "0lsn7hjvrzfz0nzp601izm856ccm14zqwx8gpw84n772b9lmz4z8", + "version": "3.0-0", + "sha256": "0wa7zys089sym8f16rg4dih81miv34rj8mph0w926cpckcfm1g00", "depends": ["spatstat_utils"] }, "spatstat_utils": { "name": "spatstat.utils", - "version": "3.0-5", - "sha256": "15pm4fpc3fvqkh9kh4i0pgalxbxfp9y3blsyaw37s07v41gnd67b", + "version": "3.1-0", + "sha256": "0g9djqpn4yl9wcv3x1qb2pvjhq8491194a5lx6xg8180f1a32363", "depends": [] }, "spatsurv": { "name": "spatsurv", "version": "2.0-1", "sha256": "17s88w8ikrazhjbilvwcw1i1r9b77ci7f69jgr8lni7dd7l0b0hy", - "depends": ["fields", "iterators", "lubridate", "Matrix", "raster", "RColorBrewer", "sf", "sp", "spatstat_explore", "spatstat_geom", "spatstat_random", "stringr", "survival"] + "depends": ["Matrix", "RColorBrewer", "fields", "iterators", "lubridate", "raster", "sf", "sp", "spatstat_explore", "spatstat_geom", "spatstat_random", "stringr", "survival"] }, "spbabel": { "name": "spbabel", @@ -112725,8 +113883,8 @@ }, "spdesign": { "name": "spdesign", - "version": "0.0.3", - "sha256": "0gz7862pp18cliz8n6grjzjq0ldy5cxln16w1i18ifqpjdhss53s", + "version": "0.0.4", + "sha256": "0kc73mv7fpz0anzr9q2l5zd3g127igi5kbmfn0m19x3hpwh3qfyj", "depends": ["cli", "dplyr", "future", "matrixStats", "randtoolbox", "stringr", "tibble"] }, "spdl": { @@ -112745,7 +113903,7 @@ "name": "spduration", "version": "0.17.2", "sha256": "1cgrpfljb43qay38qjhb2xccawh8llrp545bm5bv29k7h1nsa9cb", - "depends": ["corpcor", "forecast", "MASS", "Rcpp", "RcppArmadillo", "separationplot", "xtable"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "corpcor", "forecast", "separationplot", "xtable"] }, "spdynmod": { "name": "spdynmod", @@ -112753,6 +113911,12 @@ "sha256": "1zbh1p3lmil4vsrw7q6af3p5xqvhw2k9hx59kbzabnzj4gy8wjk3", "depends": ["animation", "deSolve", "raster", "sp"] }, + "speakeasyR": { + "name": "speakeasyR", + "version": "0.1.2", + "sha256": "0idymzf2rh0vzgi3x84prqkkr6rjzf7whbj8ax11v141abwb7nlk", + "depends": ["Matrix"] + }, "speakr": { "name": "speakr", "version": "3.2.2", @@ -112763,13 +113927,13 @@ "name": "speaq", "version": "2.7.0", "sha256": "0z9a3nbfazphp090c6hg892vjq7jp4g4cij3s5wbs1q567inbmlk", - "depends": ["cluster", "data_table", "doSNOW", "foreach", "ggplot2", "gridExtra", "impute", "MassSpecWavelet", "missForest", "reshape2", "Rfast", "rvest", "xml2"] + "depends": ["MassSpecWavelet", "Rfast", "cluster", "data_table", "doSNOW", "foreach", "ggplot2", "gridExtra", "impute", "missForest", "reshape2", "rvest", "xml2"] }, "spearmanCI": { "name": "spearmanCI", "version": "1.1", "sha256": "0dn5gbyvw5rqqqbag16ljfwm4pc8mzyjq3fb49g7zq3c6l16wj27", - "depends": ["emplik", "MASS"] + "depends": ["MASS", "emplik"] }, "spec": { "name": "spec", @@ -112829,13 +113993,13 @@ "name": "spectral", "version": "2.0", "sha256": "116gn41nvlw7jmr6qx9pl8hckg2pzgzx49kql52j5xqf39sgyx9p", - "depends": ["lattice", "pbapply", "rasterImage", "RhpcBLASctl"] + "depends": ["RhpcBLASctl", "lattice", "pbapply", "rasterImage"] }, "spectralAnalysis": { "name": "spectralAnalysis", "version": "4.3.3", "sha256": "0b2f992p7vpzhzncrvpdkifbgymyiqxz66yk6md3j39wmx3ijkjw", - "depends": ["baseline", "BiocGenerics", "data_table", "dplyr", "ggplot2", "hNMF", "jsonlite", "magrittr", "NMF", "nnls", "plotly", "pls", "plyr", "RColorBrewer", "signal", "viridis", "zoo"] + "depends": ["BiocGenerics", "NMF", "RColorBrewer", "baseline", "data_table", "dplyr", "ggplot2", "hNMF", "jsonlite", "magrittr", "nnls", "plotly", "pls", "plyr", "signal", "viridis", "zoo"] }, "spectralGP": { "name": "spectralGP", @@ -112847,7 +114011,7 @@ "name": "spectralGraphTopology", "version": "0.2.3", "sha256": "09nsszm2f6q8kz84kn7ihhb627q186jwpvr6fm633l8app4ilf2x", - "depends": ["MASS", "Matrix", "progress", "Rcpp", "RcppArmadillo", "RcppEigen", "rlist"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "progress", "rlist"] }, "spectralR": { "name": "spectralR", @@ -112859,7 +114023,7 @@ "name": "spectre", "version": "1.0.2", "sha256": "1n5z7970pzhavdf7qhxsb7gzz8dsrwa1pwyxf8n6sxvmdbk8v2z1", - "depends": ["ggplot2", "Rcpp", "RcppProgress", "testthat"] + "depends": ["Rcpp", "RcppProgress", "ggplot2", "testthat"] }, "sped": { "name": "sped", @@ -112889,7 +114053,7 @@ "name": "speedglm", "version": "0.3-5", "sha256": "0jxvh9gbhip1hj7hzjs5fj8iw6ibvl6hc0llcg2j9wqgq5vkcrpq", - "depends": ["biglm", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "biglm"] }, "speedycode": { "name": "speedycode", @@ -112901,13 +114065,13 @@ "name": "speedytax", "version": "1.0.4", "sha256": "0iqgn0mxw5ygnnjz1sbmpz1wqcx1gx5xpncbl93ra8k7qmidw7gk", - "depends": ["dplyr", "phyloseq", "Rcpp", "stringr", "tibble", "tidyr"] + "depends": ["Rcpp", "dplyr", "phyloseq", "stringr", "tibble", "tidyr"] }, "spef": { "name": "spef", "version": "1.0.9", "sha256": "115lmv2a21ws1mj22v1fbk72mqn3siqmw3frbg4nci96lnyr7qh6", - "depends": ["BB", "ggplot2", "nleqslv", "plyr", "sm", "SQUAREM", "survival"] + "depends": ["BB", "SQUAREM", "ggplot2", "nleqslv", "plyr", "sm", "survival"] }, "speff2trial": { "name": "speff2trial", @@ -112943,7 +114107,7 @@ "name": "sperrorest", "version": "3.0.5", "sha256": "0hhigyv0p92gmxkchy4cim9mczsclahy5k6zkql5bjdky19zf72q", - "depends": ["dplyr", "future", "future_apply", "ROCR", "stringr"] + "depends": ["ROCR", "dplyr", "future", "future_apply", "stringr"] }, "spex": { "name": "spex", @@ -112985,7 +114149,7 @@ "name": "sphereTessellation", "version": "1.2.0", "sha256": "1b8wxbh44qd0rznjln3icp9k4jy598rva9kwcgzscpjm5j86r97w", - "depends": ["BH", "colorsGen", "Polychrome", "Rcpp", "RcppCGAL", "RcppEigen", "rgl"] + "depends": ["BH", "Polychrome", "Rcpp", "RcppCGAL", "RcppEigen", "colorsGen", "rgl"] }, "spherepc": { "name": "spherepc", @@ -113009,13 +114173,13 @@ "name": "sphet", "version": "2.0", "sha256": "1qr4n4kbmc58qmr8niqq3mnwv18x9q2f24c1kg67asf7n3pnmy77", - "depends": ["coda", "Matrix", "mvtnorm", "nlme", "sf", "sp", "spatialreg", "spData", "spdep", "stringr"] + "depends": ["Matrix", "coda", "mvtnorm", "nlme", "sf", "sp", "spData", "spatialreg", "spdep", "stringr"] }, "sphunif": { "name": "sphunif", "version": "1.4.0", "sha256": "125w91cz60j3lkx8dm74c8gh67k5j2k8mypx7rihym9rsdibdric", - "depends": ["doFuture", "doRNG", "foreach", "future", "gsl", "Rcpp", "RcppArmadillo", "rotasym"] + "depends": ["Rcpp", "RcppArmadillo", "doFuture", "doRNG", "foreach", "future", "gsl", "rotasym"] }, "spidR": { "name": "spidR", @@ -113039,7 +114203,7 @@ "name": "spikeSlabGAM", "version": "1.1-19", "sha256": "0qj16s4vmg058wzjd1bi1dc32kbj1gh56696hkqmpb87cgbwmff2", - "depends": ["cluster", "coda", "ggplot2", "gridExtra", "interp", "MASS", "MCMCpack", "mvtnorm", "R2WinBUGS", "reshape", "scales"] + "depends": ["MASS", "MCMCpack", "R2WinBUGS", "cluster", "coda", "ggplot2", "gridExtra", "interp", "mvtnorm", "reshape", "scales"] }, "spikes": { "name": "spikes", @@ -113057,19 +114221,19 @@ "name": "spinBayes", "version": "0.2.1", "sha256": "1p3gfxw1jnnj22s43facsna1ivazfj3x431f1ckv8qycdv61h31d", - "depends": ["ggplot2", "glmnet", "Rcpp", "RcppArmadillo", "testthat"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "glmnet", "testthat"] }, "spind": { "name": "spind", "version": "2.2.1", "sha256": "1yasqy086h4dv348krisc024mic0dvdsncqys95l85924djlfipp", - "depends": ["gee", "geepack", "ggplot2", "lattice", "MASS", "RColorBrewer", "rje", "rlang", "splancs", "stringr", "waveslim"] + "depends": ["MASS", "RColorBrewer", "gee", "geepack", "ggplot2", "lattice", "rje", "rlang", "splancs", "stringr", "waveslim"] }, "spinifex": { "name": "spinifex", "version": "0.3.7.0", "sha256": "1hw7kc4shmclx8i4794w8mlhl7awfrz0nr2k33nbk4pzdy0c02hk", - "depends": ["gganimate", "ggplot2", "magrittr", "plotly", "Rdimtools", "shiny", "tourr"] + "depends": ["Rdimtools", "gganimate", "ggplot2", "magrittr", "plotly", "shiny", "tourr"] }, "spinner": { "name": "spinner", @@ -113085,9 +114249,9 @@ }, "spiralize": { "name": "spiralize", - "version": "1.0.6", - "sha256": "10zz0f3z033pqi9rm3kgac85i5h8ngg2cx4dlr8z5y8v08dpln6b", - "depends": ["circlize", "GetoptLong", "GlobalOptions", "lubridate"] + "version": "1.1.0", + "sha256": "07ckzg2fhjjn5p1q7jpxlpj8ls5rzcafy3krjvr6a51hidlfan56", + "depends": ["ComplexHeatmap", "GetoptLong", "GlobalOptions", "circlize", "lubridate"] }, "spiritR": { "name": "spiritR", @@ -113117,12 +114281,12 @@ "name": "spldv", "version": "0.1.3", "sha256": "10bvx4z2b0kl2dl91dvr611cfp28dvch41vj9z1k1qlw03ybqpr8", - "depends": ["car", "Formula", "MASS", "Matrix", "maxLik", "memisc", "numDeriv", "spatialreg", "sphet"] + "depends": ["Formula", "MASS", "Matrix", "car", "maxLik", "memisc", "numDeriv", "spatialreg", "sphet"] }, "splines2": { "name": "splines2", - "version": "0.5.2", - "sha256": "1wvj57b92qpqnn4bmd5gbbnnds32s6bm04bq72c1q3fr069r9r8b", + "version": "0.5.3", + "sha256": "1p0xl3k33b539j6fifxaack956z3p4yfvhglcpvral315p8pnzn2", "depends": ["Rcpp", "RcppArmadillo"] }, "splinetree": { @@ -113153,7 +114317,7 @@ "name": "splithalf", "version": "0.8.2", "sha256": "0lq1a07kh2jdvg68p2jzhjcidwp6r83qbkggqdv0rmdj4x47lj5s", - "depends": ["dplyr", "ggplot2", "lme4", "patchwork", "plyr", "psych", "Rcpp", "robustbase", "tidyr"] + "depends": ["Rcpp", "dplyr", "ggplot2", "lme4", "patchwork", "plyr", "psych", "robustbase", "tidyr"] }, "splithalfr": { "name": "splithalfr", @@ -113171,13 +114335,13 @@ "name": "splm", "version": "1.6-5", "sha256": "0zwyl8pyx5ldr1rwqlkmzzbjc7r4dp261lsvw4b37ydm0sdhsizk", - "depends": ["bdsmatrix", "MASS", "Matrix", "maxLik", "nlme", "plm", "spam", "spatialreg", "spdep", "stringr"] + "depends": ["MASS", "Matrix", "bdsmatrix", "maxLik", "nlme", "plm", "spam", "spatialreg", "spdep", "stringr"] }, "splmm": { "name": "splmm", "version": "1.2.0", "sha256": "1qnzm1mnx5i0q1a5534s5n6fwgs95fdknc6k5s65z9jqd33n39c4", - "depends": ["emulator", "ggplot2", "gridExtra", "MASS", "miscTools", "penalized", "plot3D", "progress", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "emulator", "ggplot2", "gridExtra", "miscTools", "penalized", "plot3D", "progress"] }, "splot": { "name": "splot", @@ -113217,20 +114381,20 @@ }, "spmodel": { "name": "spmodel", - "version": "0.6.0", - "sha256": "0dllygmpc75s8cwxxgzy49a8098zb37k3xalk4l0n1ccfqxspf8b", - "depends": ["generics", "Matrix", "sf", "tibble"] + "version": "0.7.0", + "sha256": "099ki3j9zafxczx0bw6sc5gv1pzj6xc4vdxm34bh3h16bkwgxs0q", + "depends": ["Matrix", "generics", "sf", "tibble"] }, "spmoran": { "name": "spmoran", "version": "0.2.3", "sha256": "0gjniczvggcpgyriskcbry8hn5pbf4ga4nx6hj98kvy5qrv5dcnj", - "depends": ["doParallel", "fields", "FNN", "foreach", "ggplot2", "Matrix", "rARPACK", "RColorBrewer", "sf", "spdep", "vegan"] + "depends": ["FNN", "Matrix", "RColorBrewer", "doParallel", "fields", "foreach", "ggplot2", "rARPACK", "sf", "spdep", "vegan"] }, "spnaf": { "name": "spnaf", - "version": "1.0.0", - "sha256": "1xiky882smpyqscdwaqgjx505f5gwpl9i419n15j90lv4f768k6q", + "version": "1.1.0", + "sha256": "1l9p56f6yg10drag7mphk183kzz6s4b2ghfn3dlifgq76yqi7zfl", "depends": ["deldir", "dplyr", "magrittr", "rlang", "sf", "spdep", "tidyr"] }, "spnn": { @@ -113279,7 +114443,7 @@ "name": "sport", "version": "0.2.1", "sha256": "1vifh5x3rqnj0y7lzxhxa8jiiq9gza7r55kajcdib0hr65amwssk", - "depends": ["data_table", "ggplot2", "Rcpp"] + "depends": ["Rcpp", "data_table", "ggplot2"] }, "sportyR": { "name": "sportyR", @@ -113303,19 +114467,19 @@ "name": "spotoroo", "version": "0.1.4", "sha256": "004pjlad31xkxvl9bm4ga33ikmph93blb0qd1rpvs8s0lgi7v6pn", - "depends": ["cli", "dplyr", "geodist", "ggbeeswarm", "ggExtra", "ggplot2", "ggrepel", "patchwork", "progress"] + "depends": ["cli", "dplyr", "geodist", "ggExtra", "ggbeeswarm", "ggplot2", "ggrepel", "patchwork", "progress"] }, "spray": { "name": "spray", "version": "1.0-25", "sha256": "1mdnabkrj10r4bqll0qd2h7nqpmalbwfs8kzry1wxxy0j1886fv3", - "depends": ["disordR", "magic", "mathjaxr", "partitions", "Rcpp"] + "depends": ["Rcpp", "disordR", "magic", "mathjaxr", "partitions"] }, "spreadr": { "name": "spreadr", "version": "0.2.0", "sha256": "180dvr39i1glc0jllsnnglwrxh133q20v7px2fmdi7229pr175id", - "depends": ["assertthat", "extrafont", "ggplot2", "igraph", "Matrix", "Rcpp"] + "depends": ["Matrix", "Rcpp", "assertthat", "extrafont", "ggplot2", "igraph"] }, "spreval": { "name": "spreval", @@ -113345,13 +114509,13 @@ "name": "sprintr", "version": "0.9.0", "sha256": "0nnzjn7zrcgcmk3rs0hn56jcjrzrn5z0kc77bv4zzvbz5vr8gbwj", - "depends": ["glmnet", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "glmnet"] }, "sprtt": { "name": "sprtt", "version": "0.2.0", "sha256": "0nllzisyf6ykamdi9y9hfscfa3hkmfaz7ddg9l25sqnawjvwrncr", - "depends": ["dplyr", "ggplot2", "glue", "lifecycle", "MBESS", "purrr"] + "depends": ["MBESS", "dplyr", "ggplot2", "glue", "lifecycle", "purrr"] }, "sps": { "name": "sps", @@ -113363,13 +114527,13 @@ "name": "spsComps", "version": "0.3.3.0", "sha256": "1yhd2iw9z614mcb2lnq43x5ixfpc5lbdm5avgawp726c3fvflky8", - "depends": ["assertthat", "crayon", "glue", "htmltools", "magrittr", "R6", "shiny", "shinyAce", "shinytoastr", "stringr"] + "depends": ["R6", "assertthat", "crayon", "glue", "htmltools", "magrittr", "shiny", "shinyAce", "shinytoastr", "stringr"] }, "spsUtil": { "name": "spsUtil", "version": "0.2.2", "sha256": "1hhiz2bmgrvpadag1d4ljynk7mhwknaslja9hcmf665l2x3hzdl6", - "depends": ["assertthat", "crayon", "glue", "httr", "magrittr", "R6", "stringr"] + "depends": ["R6", "assertthat", "crayon", "glue", "httr", "magrittr", "stringr"] }, "spselect": { "name": "spselect", @@ -113381,25 +114545,25 @@ "name": "spsh", "version": "1.1.0", "sha256": "1rmsgp0mrb4153v5f5xby7r3izvgz1a0vi63g5p9q5jd6z0gd2i1", - "depends": ["DEoptim", "FME", "hypergeo", "lhs", "pracma", "Rdpack"] + "depends": ["DEoptim", "FME", "Rdpack", "hypergeo", "lhs", "pracma"] }, "spsur": { "name": "spsur", "version": "1.0.2.5", "sha256": "0ar1b48r2hi50rvzkr432lpcc4c9r72hxkz74gip5gf12i7mx2ci", - "depends": ["Formula", "ggplot2", "gmodels", "gridExtra", "MASS", "Matrix", "minqa", "numDeriv", "Rdpack", "rlang", "sparseMVN", "spatialreg", "spdep", "sphet"] + "depends": ["Formula", "MASS", "Matrix", "Rdpack", "ggplot2", "gmodels", "gridExtra", "minqa", "numDeriv", "rlang", "sparseMVN", "spatialreg", "spdep", "sphet"] }, "spsurv": { "name": "spsurv", "version": "1.0.0", "sha256": "11jlbzvzxv3d1d0nwpbii46ddvphglrxv25rw7pvxbybcx2i7k6x", - "depends": ["BH", "coda", "loo", "MASS", "Rcpp", "RcppEigen", "rstan", "rstantools", "StanHeaders", "survival"] + "depends": ["BH", "MASS", "Rcpp", "RcppEigen", "StanHeaders", "coda", "loo", "rstan", "rstantools", "survival"] }, "spsurvey": { "name": "spsurvey", "version": "5.5.1", "sha256": "13h25mhb45s2k73a5709zlxfxylxqls0avan6d8pcp0iyrmpxjak", - "depends": ["boot", "crossdes", "deldir", "lme4", "MASS", "sampling", "sf", "survey", "units"] + "depends": ["MASS", "boot", "crossdes", "deldir", "lme4", "sampling", "sf", "survey", "units"] }, "spt": { "name": "spt", @@ -113417,7 +114581,7 @@ "name": "spuRs", "version": "2.0.2", "sha256": "00c0hnyrcbkbj269czxbfgmgi88y0vxzm79sxclllkzr9rdd1p53", - "depends": ["lattice", "MASS"] + "depends": ["MASS", "lattice"] }, "spup": { "name": "spup", @@ -113429,7 +114593,7 @@ "name": "sqlHelpers", "version": "0.1.2", "sha256": "1r46sak65ipfnflmd7w7ac6p62ihx7l9lpi8cjrx3c5xb6gaaxqx", - "depends": ["data_table", "DBI", "odbc", "stringi", "toolbox"] + "depends": ["DBI", "data_table", "odbc", "stringi", "toolbox"] }, "sqlcaser": { "name": "sqlcaser", @@ -113441,7 +114605,7 @@ "name": "sqldf", "version": "0.4-11", "sha256": "0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff", - "depends": ["chron", "DBI", "gsubfn", "proto", "RSQLite"] + "depends": ["DBI", "RSQLite", "chron", "gsubfn", "proto"] }, "sqlhelper": { "name": "sqlhelper", @@ -113453,13 +114617,13 @@ "name": "sqliter", "version": "0.1.0", "sha256": "17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx", - "depends": ["DBI", "functional", "RSQLite", "stringr"] + "depends": ["DBI", "RSQLite", "functional", "stringr"] }, "sqliteutils": { "name": "sqliteutils", "version": "0.1.0", "sha256": "0v7d52m9yvl5iadqnscgrcvniwhk7i7fmzd3gw23a0q4qxjs8iy9", - "depends": ["DBI", "dbplyr", "dplyr", "magrittr", "RSQLite"] + "depends": ["DBI", "RSQLite", "dbplyr", "dplyr", "magrittr"] }, "sqlparseR": { "name": "sqlparseR", @@ -113481,9 +114645,9 @@ }, "sqltargets": { "name": "sqltargets", - "version": "0.0.1", - "sha256": "1lf1p0lk3z8hmfpbzprjsp77m5dszgdwzq5vhrcrg5mbr2mkz697", - "depends": ["cli", "DBI", "fs", "glue", "purrr", "readr", "rlang", "RSQLite", "stringr", "tarchetypes", "targets", "withr"] + "version": "0.2.0", + "sha256": "08jwbpdzs686yx433l066qpyxb2c2nv0vpbhj5ybsm6x7q8nsb9a", + "depends": ["DBI", "cli", "fs", "glue", "jinjar", "purrr", "readr", "rlang", "stringr", "tarchetypes", "targets", "withr"] }, "squant": { "name": "squant", @@ -113501,25 +114665,25 @@ "name": "squat", "version": "0.3.0", "sha256": "0a5vm1ldwysadf50jvq7p988gv9arszg2a1hppcfjvwq193ywy0g", - "depends": ["cli", "dbscan", "dtw", "fdacluster", "funData", "furrr", "ggplot2", "ggrepel", "MFPCA", "progressr", "purrr", "Rcpp", "RcppArmadillo", "RcppEigen", "rlang", "roahd", "scales", "tibble", "tidyr"] + "depends": ["MFPCA", "Rcpp", "RcppArmadillo", "RcppEigen", "cli", "dbscan", "dtw", "fdacluster", "funData", "furrr", "ggplot2", "ggrepel", "progressr", "purrr", "rlang", "roahd", "scales", "tibble", "tidyr"] }, "squeezy": { "name": "squeezy", "version": "1.1-1", "sha256": "1dykp6hz056f9ajx1sg5bl89v4qmn41lsp9p9zzd9yib6d6ryfsm", - "depends": ["glmnet", "Matrix", "multiridge", "mvtnorm"] + "depends": ["Matrix", "glmnet", "multiridge", "mvtnorm"] }, "squid": { "name": "squid", "version": "0.2.1", "sha256": "1zpm787ifzrhww32ghi57ii37p9dssq7q7gbai9iqass78z90y2j", - "depends": ["arm", "brms", "data_table", "ggplot2", "lme4", "MASS", "plotly", "shiny", "shinyMatrix"] + "depends": ["MASS", "arm", "brms", "data_table", "ggplot2", "lme4", "plotly", "shiny", "shinyMatrix"] }, "sr": { "name": "sr", "version": "0.1.0", "sha256": "0d8c7gsr48xxg7y09n0namzqp148bk4idz51d2d5xlmlzcyq74k8", - "depends": ["dplyr", "ggplot2", "progress", "RANN", "vdiffr"] + "depends": ["RANN", "dplyr", "ggplot2", "progress", "vdiffr"] }, "sra": { "name": "sra", @@ -113539,17 +114703,23 @@ "sha256": "0hmlvq8rwhdv8hh7i517ml46p1hvd2idby4xx7firin8ca1829n5", "depends": ["DBI", "dplyr", "jsonlite"] }, + "sreg": { + "name": "sreg", + "version": "1.0.0", + "sha256": "05rvx5frd9c7qz00wjk8qirsnj1hmqlpvmzvf6lwbhbx2abwzd1j", + "depends": ["cli", "dplyr", "extraDistr", "rlang", "tidyr"] + }, "sregsurvey": { "name": "sregsurvey", "version": "0.1.3", "sha256": "1wpqsjhj4vl8gzma4i9y75srzwl8zmkj55lmrhni7xar4d81mnb4", - "depends": ["caret", "dplyr", "gamlss", "gamlss_dist", "magrittr", "TeachingSampling"] + "depends": ["TeachingSampling", "caret", "dplyr", "gamlss", "gamlss_dist", "magrittr"] }, "srlTS": { "name": "srlTS", "version": "0.1.1", "sha256": "1alqywbp36adgnak1s78mcwfg0gcg90a9412nypylsk6bfa7wgsv", - "depends": ["dplyr", "ncvreg", "RcppRoll", "rlang", "yardstick"] + "depends": ["RcppRoll", "dplyr", "ncvreg", "rlang", "yardstick"] }, "srlars": { "name": "srlars", @@ -113597,19 +114767,19 @@ "name": "ssMousetrack", "version": "1.1.6", "sha256": "014b1ylynn3l3k24p4zr001ys32ajrxxdpk3jwl0lmfm7r63as58", - "depends": ["BH", "CircStats", "cowplot", "dtw", "ggplot2", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "CircStats", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cowplot", "dtw", "ggplot2", "rstan", "rstantools"] }, "ssMutPA": { "name": "ssMutPA", "version": "0.1.0", "sha256": "15nrv2yzs5ydzm7030cznyqxdisg68hld28z3060bvq4ad3a9wvq", - "depends": ["ggplot2", "ggridges", "igraph", "kernlab", "maftools", "Matrix", "NbClust", "pheatmap", "RColorBrewer", "survival"] + "depends": ["Matrix", "NbClust", "RColorBrewer", "ggplot2", "ggridges", "igraph", "kernlab", "maftools", "pheatmap", "survival"] }, "ssaBSS": { "name": "ssaBSS", "version": "0.1.1", "sha256": "1sfhrp5y4hhnc417jq2vyk935iyicl58jbw4nwrj3rayh0ng7dbp", - "depends": ["BSSprep", "ggplot2", "ICtest", "JADE", "tsBSS", "xts", "zoo"] + "depends": ["BSSprep", "ICtest", "JADE", "ggplot2", "tsBSS", "xts", "zoo"] }, "ssanv": { "name": "ssanv", @@ -113635,17 +114805,23 @@ "sha256": "1266wn3vwlajr57sdjqk5zylnm7vcss37r4qwa02iv9d98qmwmrw", "depends": ["actuar", "config", "fitdistrplus", "ggplot2", "golem", "htmltools", "htmlwidgets", "jsonlite", "rhandsontable", "rlang", "rmarkdown", "shiny", "shinybusy", "shinyjs"] }, + "ssdGSA": { + "name": "ssdGSA", + "version": "0.1.1", + "sha256": "1167vfacvhkc9p7pv30snj24jz2x09fpfvad5qb3brw7lkr0japs", + "depends": ["GSVA", "clusterProfiler", "dplyr", "org_Hs_eg_db", "purrr", "stringr", "tibble", "tidyselect", "vctrs"] + }, "ssddata": { "name": "ssddata", "version": "1.0.0", "sha256": "0njcnjcgdghwrbjcbiq4yfn7nq9h4dvylrqh57c6vx35yqc4g375", - "depends": ["chk", "dplyr", "Rdpack"] + "depends": ["Rdpack", "chk", "dplyr"] }, "ssdtools": { "name": "ssdtools", "version": "1.0.6", "sha256": "13pyl9cscs6zsbfjg2x7gfk568mnrnhv7n5fkl0r47r6x94vbr0s", - "depends": ["abind", "chk", "doFuture", "foreach", "furrr", "generics", "ggplot2", "goftest", "lifecycle", "plyr", "purrr", "Rcpp", "RcppEigen", "scales", "ssddata", "stringr", "tibble", "TMB", "universals", "VGAM"] + "depends": ["Rcpp", "RcppEigen", "TMB", "VGAM", "abind", "chk", "doFuture", "foreach", "furrr", "generics", "ggplot2", "goftest", "lifecycle", "plyr", "purrr", "scales", "ssddata", "stringr", "tibble", "universals"] }, "sse": { "name": "sse", @@ -113679,21 +114855,21 @@ }, "ssh": { "name": "ssh", - "version": "0.9.1", - "sha256": "1jb9mvy16zj7g62n1b4j1jfydvs526zn372knm8yy1x1zpljwn6h", + "version": "0.9.2", + "sha256": "06lalzlh0kis4jlhlgyqbq5xzqy0dr8b4nh5z50qjks9jzai7qyv", "depends": ["askpass", "credentials"] }, "sship": { "name": "sship", "version": "0.9.0", "sha256": "0h0cbbvqfmik2z0qp34gym81p01x01yndymczb8vpqnj0nfnmyhc", - "depends": ["httr", "jsonlite", "openssl", "RCurl", "yaml"] + "depends": ["RCurl", "httr", "jsonlite", "openssl", "yaml"] }, "ssifs": { "name": "ssifs", "version": "1.0.2", "sha256": "17q1p4cgdwmn3vlhkc4p49j1222wd8d6dcp7n5ngvqcfjn3lrarh", - "depends": ["ggplot2", "gtools", "igraph", "netmeta", "plyr", "R2jags", "Rdpack", "RevEcoR"] + "depends": ["R2jags", "Rdpack", "RevEcoR", "ggplot2", "gtools", "igraph", "netmeta", "plyr"] }, "ssimparser": { "name": "ssimparser", @@ -113711,7 +114887,7 @@ "name": "ssizeRNA", "version": "1.3.2", "sha256": "1qw10yswzpg28fhvr6rsq0gh7xivfapw64gxc0hakb1nc31jf8ky", - "depends": ["Biobase", "edgeR", "limma", "MASS", "qvalue", "ssize_fdr"] + "depends": ["Biobase", "MASS", "edgeR", "limma", "qvalue", "ssize_fdr"] }, "ssmn": { "name": "ssmn", @@ -113723,7 +114899,7 @@ "name": "ssmodels", "version": "1.0.1", "sha256": "19w3vr4zz23xbb4mr4zwqwj024i10hgnpm0cf47qh5c1zkjcwdib", - "depends": ["miscTools", "numDeriv", "pracma", "Rdpack", "sn"] + "depends": ["Rdpack", "miscTools", "numDeriv", "pracma", "sn"] }, "ssmrob": { "name": "ssmrob", @@ -113741,7 +114917,7 @@ "name": "sspse", "version": "1.1.0-1", "sha256": "0dy78fkazjm6ai2smxfkkhfzgbqk4sxvq7yhj89zdnk1vp1p1fy7", - "depends": ["coda", "KernSmooth", "RDS", "scam"] + "depends": ["KernSmooth", "RDS", "coda", "scam"] }, "ssr": { "name": "ssr", @@ -113771,13 +114947,13 @@ "name": "sssc", "version": "1.0.0", "sha256": "00m5zfd3jnbxa8x76v4pfyl4qdfq90n8rqx4hngany0ka1z5g7m6", - "depends": ["changepoint", "e1071", "ggplot2", "VGAM"] + "depends": ["VGAM", "changepoint", "e1071", "ggplot2"] }, "sstvars": { "name": "sstvars", "version": "1.0.1", "sha256": "16ans039cx5kj0l1l8108jfplgz4mq5bbqhixks2dqmlsn5qn34m", - "depends": ["pbapply", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "pbapply"] }, "ssym": { "name": "ssym", @@ -113793,33 +114969,33 @@ }, "stR": { "name": "stR", - "version": "0.6", - "sha256": "1gh26yhcpkiif6zyrrg0rw4118xcf7j1d1wf70wgyrwb1hrr6vcv", - "depends": ["foreach", "forecast", "Matrix", "quantreg", "SparseM"] + "version": "0.7", + "sha256": "1ihhz62ajkiq4d5s9zvqfp2h4k7hwgynfdy7walrhpxlcb9pjgay", + "depends": ["Matrix", "SparseM", "foreach", "forecast", "quantreg"] }, "stRoke": { "name": "stRoke", "version": "23.9.1", "sha256": "0rlhi8cj1gb5cpvpds4hr6m1g4g53yqlzrvl5gzn3xkiyd5i3kx3", - "depends": ["calendar", "dplyr", "ggplot2", "gtsummary", "lubridate", "MASS", "rankinPlot", "tidyr"] + "depends": ["MASS", "calendar", "dplyr", "ggplot2", "gtsummary", "lubridate", "rankinPlot", "tidyr"] }, "sta": { "name": "sta", "version": "0.1.7", "sha256": "00kv2gd0ar2j992cn7j516y3w9nx83ylxp35xrqg2n43z4kgsacs", - "depends": ["doParallel", "foreach", "geoTS", "mapview", "raster", "RColorBrewer", "trend"] + "depends": ["RColorBrewer", "doParallel", "foreach", "geoTS", "mapview", "raster", "trend"] }, "staRdom": { "name": "staRdom", "version": "1.1.28", "sha256": "1nihk9fyng0skzi2g0rgl85c3ka92bmr1jaiq4l9mi81g823bk3b", - "depends": ["cdom", "data_table", "doParallel", "dplyr", "drc", "eemR", "foreach", "GGally", "ggplot2", "gtools", "matrixStats", "MBA", "multiway", "pracma", "R_matlab", "readr", "stringr", "tibble", "tidyr", "viridisLite", "zoo"] + "depends": ["GGally", "MBA", "R_matlab", "cdom", "data_table", "doParallel", "dplyr", "drc", "eemR", "foreach", "ggplot2", "gtools", "matrixStats", "multiway", "pracma", "readr", "stringr", "tibble", "tidyr", "viridisLite", "zoo"] }, "stabiliser": { "name": "stabiliser", "version": "1.0.6", "sha256": "1zyqmj8s8x0h8dji50r3yhn3n3838vci81gm02p971px8x5wq9y8", - "depends": ["bigstep", "broom", "caret", "dplyr", "expss", "ggplot2", "glmnet", "Hmisc", "knitr", "lme4", "lmerTest", "matrixStats", "ncvreg", "purrr", "recipes", "rsample", "stringr", "tibble", "tidyr"] + "depends": ["Hmisc", "bigstep", "broom", "caret", "dplyr", "expss", "ggplot2", "glmnet", "knitr", "lme4", "lmerTest", "matrixStats", "ncvreg", "purrr", "recipes", "rsample", "stringr", "tibble", "tidyr"] }, "stability": { "name": "stability", @@ -113847,27 +115023,27 @@ }, "stabledist": { "name": "stabledist", - "version": "0.7-1", - "sha256": "0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86", + "version": "0.7-2", + "sha256": "1mbgl6an18dzry55pvy08zdhj1gar5mlyvkfnlawiqyqq081frr6", "depends": [] }, "stablelearner": { "name": "stablelearner", "version": "0.1-5", "sha256": "0a1fsy9hf63c1yfp4dallfsiknzsnhjl91yzqsgvni3gyx0vjykm", - "depends": ["e1071", "MASS", "party", "partykit", "randomForest", "ranger"] + "depends": ["MASS", "e1071", "party", "partykit", "randomForest", "ranger"] }, "stablespec": { "name": "stablespec", "version": "0.3.0", "sha256": "0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22", - "depends": ["foreach", "ggm", "graph", "matrixcalc", "nsga2R", "polycor", "Rgraphviz", "sem"] + "depends": ["Rgraphviz", "foreach", "ggm", "graph", "matrixcalc", "nsga2R", "polycor", "sem"] }, "stabm": { "name": "stabm", "version": "1.2.2", "sha256": "1vslidq2pzpwhsrsklghaqsdjjf4w4wqs2dng0p68zhrv5vlivhq", - "depends": ["checkmate", "Matrix"] + "depends": ["Matrix", "checkmate"] }, "stabreg": { "name": "stabreg", @@ -113895,27 +115071,27 @@ }, "stacks": { "name": "stacks", - "version": "1.0.4", - "sha256": "1i28m6jxg83h3as74ax39frdwbzwnsq20vb18shswc62azrimw9q", + "version": "1.0.5", + "sha256": "1bhfdnyf4w5r5bmfnrcwwy9h6qdimklbcr0b50vwmkj4jcyin48a", "depends": ["butcher", "cli", "doFuture", "dplyr", "foreach", "future", "generics", "ggplot2", "glmnet", "glue", "parsnip", "purrr", "recipes", "rlang", "rsample", "tibble", "tidyr", "tune", "vctrs", "workflows"] }, "stacomiR": { "name": "stacomiR", "version": "0.6.1", "sha256": "0ik0804j8fvqmpj0xyzmjdsykw3672a5vyb4dhiss7dc1g4la20f", - "depends": ["DBI", "dplyr", "ggplot2", "Hmisc", "intervals", "lattice", "lubridate", "magrittr", "mgcv", "pool", "RColorBrewer", "reshape2", "rlang", "RPostgres", "scales", "stacomirtools", "stringr", "withr", "xtable"] + "depends": ["DBI", "Hmisc", "RColorBrewer", "RPostgres", "dplyr", "ggplot2", "intervals", "lattice", "lubridate", "magrittr", "mgcv", "pool", "reshape2", "rlang", "scales", "stacomirtools", "stringr", "withr", "xtable"] }, "stacomirtools": { "name": "stacomirtools", "version": "0.6.0.1", "sha256": "1hw1k0mjddw46j3aagry2mx43wak03kkx4zzxplgcafwks5bp82y", - "depends": ["DBI", "pool", "RODBC", "RPostgres", "xtable"] + "depends": ["DBI", "RODBC", "RPostgres", "pool", "xtable"] }, "stagePop": { "name": "stagePop", "version": "1.1-2", "sha256": "0yaxdq0p47qkjwjrsj4vb8rif9ip2k0vjnvz1k87h1mcslkfzygs", - "depends": ["deSolve", "PBSddesolve"] + "depends": ["PBSddesolve", "deSolve"] }, "stagedtrees": { "name": "stagedtrees", @@ -113927,7 +115103,7 @@ "name": "staggered", "version": "1.1", "sha256": "0z9358qbgn637j8iz5qwr4nyrlvi9w85l325vxpc61mcwksx5ip8", - "depends": ["coop", "dplyr", "magrittr", "MASS", "purrr", "Rcpp", "RcppEigen", "reshape2", "tidyr"] + "depends": ["MASS", "Rcpp", "RcppEigen", "coop", "dplyr", "magrittr", "purrr", "reshape2", "tidyr"] }, "stampr": { "name": "stampr", @@ -113939,13 +115115,13 @@ "name": "stan4bart", "version": "0.0-8", "sha256": "1i0asl380p38ksi59wmyi23jwq05mm9kxymphyqjniq68i0lban4", - "depends": ["BH", "dbarts", "Matrix", "Rcpp", "RcppEigen", "RcppParallel"] + "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "dbarts"] }, "standardize": { "name": "standardize", "version": "0.2.2", "sha256": "008nz9vf08qxwdsn373yzpmsw5lhbm6mpm6dlwyys58wq0bdvh28", - "depends": ["lme4", "MASS", "stringr"] + "depends": ["MASS", "lme4", "stringr"] }, "standardlastprofile": { "name": "standardlastprofile", @@ -113969,13 +115145,13 @@ "name": "stapler", "version": "0.7.1", "sha256": "1bzhahn72fzm2bjpis76hphv8whnkp2jq8bm1qldadhng4z1nsak", - "depends": ["matrixStats", "RNifti"] + "depends": ["RNifti", "matrixStats"] }, "staplr": { "name": "staplr", "version": "3.2.2", "sha256": "1wqknnrbcwcmw0kvyydwrgs0yz5cixpgxglva377lzqlbw8ll7wn", - "depends": ["assertthat", "fs", "glue", "pdftools", "purrr", "rJava", "stringr", "XML"] + "depends": ["XML", "assertthat", "fs", "glue", "pdftools", "purrr", "rJava", "stringr"] }, "stargazer": { "name": "stargazer", @@ -113993,24 +115169,24 @@ "name": "starma", "version": "1.3", "sha256": "07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx", - "depends": ["ggplot2", "Rcpp", "RcppArmadillo", "scales"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "scales"] }, "starnet": { "name": "starnet", "version": "0.0.6", "sha256": "0gbg8svyj4nh846q7986ap7jjry599kb1348k9lifz19kvyr4rn4", - "depends": ["cornet", "glmnet", "Matrix", "survival"] + "depends": ["Matrix", "cornet", "glmnet", "survival"] }, "starry": { "name": "starry", "version": "0.1.2", "sha256": "18dn18y5vs4fhj3jzm2zmvyx2wqakkrkppmggizz60vrarnaqp8i", - "depends": ["bslib", "car", "corrr", "dplyr", "ggplot2", "magrittr", "shiny", "shinyjs", "shinyWidgets", "stringr"] + "depends": ["bslib", "car", "corrr", "dplyr", "ggplot2", "magrittr", "shiny", "shinyWidgets", "shinyjs", "stringr"] }, "stars": { "name": "stars", - "version": "0.6-5", - "sha256": "1b5gs0qa8097f2mvz4rgl46wrvk1rbbbi2a4s901hdg4bkr15jsg", + "version": "0.6-6", + "sha256": "1b679s25f9vpzrisyxs5xzc0dv47yn3prm0hi752fhpvml4kbjkh", "depends": ["abind", "classInt", "rlang", "sf", "units"] }, "starsExtra": { @@ -114023,7 +115199,7 @@ "name": "starsTileServer", "version": "0.1.1", "sha256": "04z3xaijhgn5g10vvx19lya6v17ypcq00w4jlgkap3fafw61pqhn", - "depends": ["assertthat", "leaflet", "plumber", "png", "R6", "rlang", "sf", "stars", "units"] + "depends": ["R6", "assertthat", "leaflet", "plumber", "png", "rlang", "sf", "stars", "units"] }, "starschemar": { "name": "starschemar", @@ -114035,18 +115211,18 @@ "name": "startR", "version": "2.3.1", "sha256": "03wdaqiyrjhihsnw33z87baplv854znh4l7ww4ywmp17hl6hr7l8", - "depends": ["abind", "bigmemory", "ClimProjDiags", "easyNCDF", "future", "multiApply", "PCICt", "s2dv"] + "depends": ["ClimProjDiags", "PCICt", "abind", "bigmemory", "easyNCDF", "future", "multiApply", "s2dv"] }, "starter": { "name": "starter", "version": "0.1.15", "sha256": "0lzaiw4m6wxniv8bgri33z8np49mqbgip4jhibsw0xa717anlqa4", - "depends": ["cli", "dplyr", "gert", "glue", "R_utils", "renv", "rlang", "rprojroot", "rstudioapi"] + "depends": ["R_utils", "cli", "dplyr", "gert", "glue", "renv", "rlang", "rprojroot", "rstudioapi"] }, "startup": { "name": "startup", - "version": "0.21.0", - "sha256": "0iwq1nbiv2j78g17mq566qqv5p5msk1gmi0bb0hs1j1xx9vjamnl", + "version": "0.22.0", + "sha256": "04hifi5cck1vzhacmy9kg7k1f278lvvsrj6p0d1n61fiiv3fqscm", "depends": [] }, "startupmsg": { @@ -114059,13 +115235,13 @@ "name": "starvars", "version": "1.1.10", "sha256": "1mq31g05ahpsmda2zrmkg1dlaqqk4c9hm9fjzhgrsxlg4j3klbbf", - "depends": ["doSNOW", "foreach", "ks", "lessR", "MASS", "matrixcalc", "optimParallel", "quantmod", "vars", "xts", "zoo"] + "depends": ["MASS", "doSNOW", "foreach", "ks", "lessR", "matrixcalc", "optimParallel", "quantmod", "vars", "xts", "zoo"] }, "starvz": { "name": "starvz", "version": "0.8.0", "sha256": "0slym8xwvihbslxm4llbzb8fybjbk040lbzng4fh5dsw58zf04r1", - "depends": ["BH", "data_tree", "dplyr", "ggplot2", "gtools", "lpSolve", "magrittr", "patchwork", "purrr", "RColorBrewer", "Rcpp", "readr", "rlang", "stringr", "tibble", "tidyr", "yaml", "zoo"] + "depends": ["BH", "RColorBrewer", "Rcpp", "data_tree", "dplyr", "ggplot2", "gtools", "lpSolve", "magrittr", "patchwork", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr", "yaml", "zoo"] }, "starwarsdb": { "name": "starwarsdb", @@ -114075,8 +115251,8 @@ }, "statBasics": { "name": "statBasics", - "version": "0.2.0", - "sha256": "1yphfzwj8hmqsz1qfckb05xxjyyi9r6g6iqcl8n20bs5hgr3d2s9", + "version": "0.2.2", + "sha256": "1hhwg2190bndjgmxmv37ihqdg665s9zn1h1smwshs59wk0r7bzjx", "depends": ["stringr", "tibble"] }, "statConfR": { @@ -114087,15 +115263,15 @@ }, "statGraph": { "name": "statGraph", - "version": "1.0.1", - "sha256": "0jqb8bp0szzp67n52y0wsxpb0amb3sy00l25l933pxgfcj5hpdnz", - "depends": ["cluster", "doParallel", "foreach", "igraph", "MASS", "rARPACK"] + "version": "1.0.3", + "sha256": "0rwmn6mhvvahzdqhp58v3icas4mlr73jizmb7lv8dzgxvq8dz0i0", + "depends": ["MASS", "cluster", "doParallel", "foreach", "igraph", "mvtnorm", "rARPACK"] }, "statVisual": { "name": "statVisual", "version": "1.2.1", "sha256": "1cc9p9g8lzn0lgh793r977yhqbk89l74m443gnznjlfml69bfb21", - "depends": ["Biobase", "dplyr", "factoextra", "forestplot", "gbm", "GGally", "ggdendro", "ggfortify", "ggplot2", "ggrepel", "glmnet", "gridExtra", "knitr", "limma", "magrittr", "pheatmap", "pROC", "pvca", "randomForest", "RColorBrewer", "reshape2", "rmarkdown", "rpart_plot", "tibble", "tidyverse"] + "depends": ["Biobase", "GGally", "RColorBrewer", "dplyr", "factoextra", "forestplot", "gbm", "ggdendro", "ggfortify", "ggplot2", "ggrepel", "glmnet", "gridExtra", "knitr", "limma", "magrittr", "pROC", "pheatmap", "pvca", "randomForest", "reshape2", "rmarkdown", "rpart_plot", "tibble", "tidyverse"] }, "statar": { "name": "statar", @@ -114107,7 +115283,7 @@ "name": "statcanR", "version": "0.2.6", "sha256": "1hnf3zjlpfp86lii9sz8m2dvzbj9bs320ffdr81q2jsla71xybaa", - "depends": ["curl", "data_table", "dplyr", "DT", "ggplot2", "httr", "qpdf", "qs", "readr", "reshape2", "tibble"] + "depends": ["DT", "curl", "data_table", "dplyr", "ggplot2", "httr", "qpdf", "qs", "readr", "reshape2", "tibble"] }, "statcheck": { "name": "statcheck", @@ -114149,7 +115325,7 @@ "name": "statgenGWAS", "version": "1.0.9", "sha256": "0isjzb83vwml654b1azgvnwiijpihdk24b3jamls976is359qvrv", - "depends": ["data_table", "ggplot2", "Rcpp", "RcppArmadillo", "sommer"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "ggplot2", "sommer"] }, "statgenGxE": { "name": "statgenGxE", @@ -114161,31 +115337,31 @@ "name": "statgenHTP", "version": "1.0.6.1", "sha256": "1lhs72y9p98vas7iv1zgqb9zac6plzgv5lffccyg75r88784xn1s", - "depends": ["animation", "factoextra", "ggforce", "ggnewscale", "ggplot2", "gridExtra", "LMMsolver", "locfit", "lubridate", "Matrix", "reshape2", "rlang", "scales", "spam", "SpATS"] + "depends": ["LMMsolver", "Matrix", "SpATS", "animation", "factoextra", "ggforce", "ggnewscale", "ggplot2", "gridExtra", "locfit", "lubridate", "reshape2", "rlang", "scales", "spam"] }, "statgenIBD": { "name": "statgenIBD", "version": "1.0.7", "sha256": "1dw0riwycd59hcidnxczy61xib8if8m2hv6dni2qd6n2i99vfbpc", - "depends": ["data_table", "ggplot2", "Matrix", "Rcpp", "RcppArmadillo", "rlang", "statgenGWAS", "stringi"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "data_table", "ggplot2", "rlang", "statgenGWAS", "stringi"] }, "statgenMPP": { "name": "statgenMPP", "version": "1.0.2", "sha256": "1qpf9gic9671hr6zyj56sqwx9wl51qr6gj84rfssdla718h766im", - "depends": ["data_table", "foreach", "ggplot2", "gridExtra", "LMMsolver", "Matrix", "scales", "spam", "statgenGWAS", "statgenIBD", "stringi"] + "depends": ["LMMsolver", "Matrix", "data_table", "foreach", "ggplot2", "gridExtra", "scales", "spam", "statgenGWAS", "statgenIBD", "stringi"] }, "statgenQTLxT": { "name": "statgenQTLxT", "version": "1.0.2", "sha256": "1lq8v49zf9l6gaifdwc0qpx8kknnhqw2jg19v2vr7da1xqd7wfdi", - "depends": ["data_table", "foreach", "Rcpp", "RcppArmadillo", "sommer", "statgenGWAS"] + "depends": ["Rcpp", "RcppArmadillo", "data_table", "foreach", "sommer", "statgenGWAS"] }, "statgenSTA": { "name": "statgenSTA", "version": "1.0.13", "sha256": "1pnb13psnyqj4mjry6g78pjc4qz642wjnxi9ki8i4h73i335ixxv", - "depends": ["emmeans", "ggplot2", "ggrepel", "gridExtra", "knitr", "lme4", "mapproj", "maps", "qtl", "rlang", "scales", "SpATS", "xtable"] + "depends": ["SpATS", "emmeans", "ggplot2", "ggrepel", "gridExtra", "knitr", "lme4", "mapproj", "maps", "qtl", "rlang", "scales", "xtable"] }, "stationaRy": { "name": "stationaRy", @@ -114231,9 +115407,9 @@ }, "statnetWeb": { "name": "statnetWeb", - "version": "0.5.6", - "sha256": "1haf2kr1mwvaz4hlwla2ysbcy3sbfcg3i4hyiy9y6lcffvy4w9w0", - "depends": ["ergm", "lattice", "latticeExtra", "network", "RColorBrewer", "shiny", "sna"] + "version": "0.5.8", + "sha256": "12qwx0gnrmb449rz5a2qhds6rparfpw8ak4n0cxk9dmy6d47903l", + "depends": ["RColorBrewer", "ergm", "lattice", "latticeExtra", "network", "shiny", "sna"] }, "statnipokladna": { "name": "statnipokladna", @@ -114249,9 +115425,9 @@ }, "statpsych": { "name": "statpsych", - "version": "1.5.0", - "sha256": "0sgdz97svj2krg6576pc74jiqpws4qjvvk351d88av3cc9s3g9y8", - "depends": ["mathjaxr", "mnonr", "Rdpack"] + "version": "1.6.0", + "sha256": "1kxgwzg6qwkrlih0rwllmm31c9yyxp6w051wslb4q695piq4las2", + "depends": ["Rdpack", "mathjaxr", "mnonr"] }, "statquotes": { "name": "statquotes", @@ -114261,21 +115437,21 @@ }, "stats19": { "name": "stats19", - "version": "3.0.3", - "sha256": "001bmwkr07lv0r02i5glssqw2kf6b6n8m3bwgz3rpljqz07y0j80", + "version": "3.1.0", + "sha256": "1af7a2p1n1rxgx25qpkw27qmhy0gyiq2549vibdp8gfdybsf38g6", "depends": ["readr", "sf"] }, "stats4teaching": { "name": "stats4teaching", "version": "0.1.0", "sha256": "1i2v97k6c75096hp23zpffmdbajdzzkqp508p9dvw841vpx2wxdn", - "depends": ["asbio", "car", "clusterGeneration", "knitr", "MASS", "MVN", "nortest", "psych", "pwr", "rstatix"] + "depends": ["MASS", "MVN", "asbio", "car", "clusterGeneration", "knitr", "nortest", "psych", "pwr", "rstatix"] }, "statsExpressions": { "name": "statsExpressions", - "version": "1.5.4", - "sha256": "061qrhibfanh4f38pyhlj2z364y75d4njvrlr2415bww4jcwlpfd", - "depends": ["afex", "BayesFactor", "correlation", "datawizard", "dplyr", "effectsize", "glue", "insight", "magrittr", "parameters", "performance", "PMCMRplus", "purrr", "rlang", "tibble", "tidyr", "withr", "WRS2", "zeallot"] + "version": "1.5.5", + "sha256": "0ba594rvqgczb10ldkmc637z9v6c0j3qixa1pw7jzd2bmhqfmaxh", + "depends": ["BayesFactor", "PMCMRplus", "WRS2", "afex", "correlation", "datawizard", "dplyr", "effectsize", "glue", "insight", "magrittr", "parameters", "performance", "purrr", "rlang", "tibble", "tidyr", "withr", "zeallot"] }, "statsearchanalyticsr": { "name": "statsearchanalyticsr", @@ -114305,7 +115481,7 @@ "name": "stcos", "version": "0.3.1", "sha256": "146s0jdd88pax9xsn2z56x8sfkjx8yr8sf59ma9zryq42ajyq43d", - "depends": ["dplyr", "Matrix", "Rcpp", "RcppArmadillo", "sf"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "dplyr", "sf"] }, "stcov": { "name": "stcov", @@ -114347,7 +115523,7 @@ "name": "steadyICA", "version": "1.0", "sha256": "0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g", - "depends": ["clue", "combinat", "MASS", "Rcpp"] + "depends": ["MASS", "Rcpp", "clue", "combinat"] }, "steepness": { "name": "steepness", @@ -114359,7 +115535,7 @@ "name": "stelfi", "version": "1.0.1", "sha256": "06sj1az5803xh1ikkawdrp0c8yc1kh8iqky6vazxr516hc3b0f9w", - "depends": ["dplyr", "fmesher", "ggplot2", "gridExtra", "Matrix", "RcppEigen", "sf", "TMB"] + "depends": ["Matrix", "RcppEigen", "TMB", "dplyr", "fmesher", "ggplot2", "gridExtra", "sf"] }, "stellaR": { "name": "stellaR", @@ -114377,7 +115553,7 @@ "name": "stenR", "version": "0.6.9", "sha256": "19vn7123wys1jqrm4y8f6b4kvwygi1ql6ady2d5jz93vf29ihdzj", - "depends": ["cli", "data_table", "dplyr", "moments", "R6", "rlang"] + "depends": ["R6", "cli", "data_table", "dplyr", "moments", "rlang"] }, "stencilaschema": { "name": "stencilaschema", @@ -114401,13 +115577,13 @@ "name": "stepR", "version": "2.1-9", "sha256": "1dw402p49j2m076b7ybmnfhxhxb4i8fnalqqblxq2ax7rl69i2vz", - "depends": ["digest", "lowpassFilter", "R_cache", "Rcpp"] + "depends": ["R_cache", "Rcpp", "digest", "lowpassFilter"] }, "stepSplitReg": { "name": "stepSplitReg", "version": "1.0.3", "sha256": "04ks599bb3rbyc81kyakj6nmj7i8fvkb1pild0gd3i6j84j70071", - "depends": ["nnls", "Rcpp", "RcppArmadillo", "SplitGLM"] + "depends": ["Rcpp", "RcppArmadillo", "SplitGLM", "nnls"] }, "stepdownfdp": { "name": "stepdownfdp", @@ -114449,7 +115625,7 @@ "name": "steps", "version": "1.3.0", "sha256": "0yvqz5jhzwqkm3gphb2mmlq1ip6sr8g6c09hirs827j12dj63ixf", - "depends": ["future", "future_apply", "memuse", "raster", "rasterVis", "Rcpp", "viridisLite"] + "depends": ["Rcpp", "future", "future_apply", "memuse", "raster", "rasterVis", "viridisLite"] }, "stevedata": { "name": "stevedata", @@ -114485,7 +115661,13 @@ "name": "stfit", "version": "0.99.9", "sha256": "0668nnsgkdd2v7bx06wnq8sc0asbi19p4752jm0hj2jziiibk0kn", - "depends": ["abind", "doParallel", "fda", "foreach", "Matrix", "raster", "rasterVis", "RColorBrewer", "Rcpp"] + "depends": ["Matrix", "RColorBrewer", "Rcpp", "abind", "doParallel", "fda", "foreach", "raster", "rasterVis"] + }, + "stgam": { + "name": "stgam", + "version": "0.0.1.2", + "sha256": "0p6w0yb0cyc4zpsb7nwkxh8s7vlssprb5ssg0rfbmh83n37faqb4", + "depends": ["cowplot", "doParallel", "dplyr", "foreach", "ggplot2", "glue", "magrittr", "metR", "mgcv", "tidyselect"] }, "sticky": { "name": "sticky", @@ -114509,7 +115691,7 @@ "name": "stim", "version": "1.0.0", "sha256": "0a2lcyhh12jzg2znyc648vs8pl19098wz3z60kgd5r9jns707ca4", - "depends": ["lavaan", "Ryacas"] + "depends": ["Ryacas", "lavaan"] }, "stima": { "name": "stima", @@ -114551,19 +115733,19 @@ "name": "stlplus", "version": "0.5.1", "sha256": "14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5", - "depends": ["lattice", "Rcpp", "yaImpute"] + "depends": ["Rcpp", "lattice", "yaImpute"] }, "stm": { "name": "stm", "version": "1.3.7", "sha256": "0cvv6q5r55iqk327rav25dymvnn77rj8chmgkbkwd0c1dpqf4x5q", - "depends": ["data_table", "glmnet", "lda", "Matrix", "matrixStats", "quadprog", "quanteda", "Rcpp", "RcppArmadillo", "slam", "stringr"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "data_table", "glmnet", "lda", "matrixStats", "quadprog", "quanteda", "slam", "stringr"] }, "stmCorrViz": { "name": "stmCorrViz", "version": "1.3", "sha256": "1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv", - "depends": ["jsonlite", "SnowballC", "stm", "tm"] + "depends": ["SnowballC", "jsonlite", "stm", "tm"] }, "stmgp": { "name": "stmgp", @@ -114577,17 +115759,23 @@ "sha256": "1fn2m5l7y3p1riw39g6r3hpjxdccygih7yipp7dvc4msl9fm4h5c", "depends": ["markdown", "shiny", "shinyBS", "shinyjs", "shinythemes", "stm", "tm"] }, + "stminsights": { + "name": "stminsights", + "version": "0.4.3", + "sha256": "1yx87ia1i0p7cavxikz4dvy2j0ymnqpwqmdhci5x7yzsb0arl4kf", + "depends": ["DT", "dplyr", "ggplot2", "ggraph", "ggrepel", "huge", "igraph", "purrr", "readr", "scales", "shiny", "shinyBS", "shinydashboard", "shinyjs", "stm", "stringr", "tibble", "tidygraph"] + }, "stoRy": { "name": "stoRy", "version": "0.2.2", "sha256": "05lji6gl8nzkxhygfvfm7alk5yp5gw1dkkr5r993vnj67m10pcbq", - "depends": ["cli", "crayon", "dplyr", "fansi", "httr", "lifecycle", "purrr", "R6", "rappdirs", "readr", "rlang", "stringr", "tibble", "tidyjson", "tidyr"] + "depends": ["R6", "cli", "crayon", "dplyr", "fansi", "httr", "lifecycle", "purrr", "rappdirs", "readr", "rlang", "stringr", "tibble", "tidyjson", "tidyr"] }, "stocc": { "name": "stocc", "version": "1.31", "sha256": "0d0n9nrcva0vradippq30y6dc6klwd1mllnzpnzq9rczpz5cw7mw", - "depends": ["coda", "fields", "Matrix", "rARPACK", "truncnorm"] + "depends": ["Matrix", "coda", "fields", "rARPACK", "truncnorm"] }, "stochLAB": { "name": "stochLAB", @@ -114605,13 +115793,13 @@ "name": "stochvol", "version": "3.2.4", "sha256": "1cr8rn4nzdbvgjhsahyijn2kgbndiyvycbn6rjxc0x5prc99j52w", - "depends": ["coda", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "coda"] }, "stochvolTMB": { "name": "stochvolTMB", "version": "0.2.0", "sha256": "07m3qz8j1sw37lrxzmbkbifd3nsdvd2blbca8vr1aq5bbafr1g1b", - "depends": ["data_table", "ggplot2", "MASS", "RcppEigen", "sn", "TMB"] + "depends": ["MASS", "RcppEigen", "TMB", "data_table", "ggplot2", "sn"] }, "stockAnalyst": { "name": "stockAnalyst", @@ -114623,13 +115811,13 @@ "name": "stockR", "version": "1.0.76", "sha256": "1n1xnz97x82bc9n930cwm11sl8r40224psya5z29a2zp449a5540", - "depends": ["gtools", "RColorBrewer", "Rcpp"] + "depends": ["RColorBrewer", "Rcpp", "gtools"] }, "stocks": { "name": "stocks", "version": "1.1.4", "sha256": "0b6rl7pfkgzbpwnv7zzkr36hs5f1zb60d16ijslf7g9m25vvcyg6", - "depends": ["dvmisc", "Hmisc", "lubridate", "quantmod", "rbenchmark", "RColorBrewer", "Rcpp", "TTR", "zoo"] + "depends": ["Hmisc", "RColorBrewer", "Rcpp", "TTR", "dvmisc", "lubridate", "quantmod", "rbenchmark", "zoo"] }, "stodom": { "name": "stodom", @@ -114659,7 +115847,7 @@ "name": "stopp", "version": "0.2.4", "sha256": "09cvh2h8c91zb8iak7g4j0sznv8kxbn0r2xjl36p663mqk2lb5ss", - "depends": ["fields", "KernSmooth", "MASS", "mgcv", "optimx", "plot3D", "sparr", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model", "spatstat_random", "spatstat_univar", "spatstat_utils", "splancs", "stlnpp", "stpp"] + "depends": ["KernSmooth", "MASS", "fields", "mgcv", "optimx", "plot3D", "sparr", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model", "spatstat_random", "spatstat_univar", "spatstat_utils", "splancs", "stlnpp", "stpp"] }, "stoppingrule": { "name": "stoppingrule", @@ -114669,9 +115857,9 @@ }, "stops": { "name": "stops", - "version": "1.0-1", - "sha256": "12zc338wh78an1nsmqr7sbfcr96yrb6xqzg9miwlb58sv28hm8i3", - "depends": ["acepack", "clue", "cmaes", "cordillera", "dfoptim", "DiceKriging", "DiceOptim", "energy", "MASS", "minerva", "nloptr", "pomp", "pso", "rgl", "scagnostics", "scatterplot3d", "smacof", "tgp", "vegan"] + "version": "1.6-2", + "sha256": "1fn1xbxq1ls5xw38hnv0kh5gx9pd4myspkj146q6w83yzzrwjnry", + "depends": ["DiceKriging", "DiceOptim", "acepack", "clue", "cmaes", "cordillera", "dfoptim", "energy", "minerva", "nloptr", "pomp", "pso", "scagnostics", "smacof", "smacofx", "tgp", "vegan"] }, "stopwords": { "name": "stopwords", @@ -114683,7 +115871,7 @@ "name": "storr", "version": "1.2.5", "sha256": "0qszdq16bf0dbss33zi63ciwmkgjsyc0c3akrr2kl14w3ncw6922", - "depends": ["digest", "R6"] + "depends": ["R6", "digest"] }, "stortingscrape": { "name": "stortingscrape", @@ -114707,31 +115895,31 @@ "name": "stplanr", "version": "1.2.1", "sha256": "08hhx6lagfwy153xwbpqbvsz13dfq29607bp2640c5bfmddgnaxp", - "depends": ["curl", "data_table", "dplyr", "geosphere", "httr", "jsonlite", "lwgeom", "magrittr", "nabor", "od", "pbapply", "Rcpp", "rlang", "sf", "sfheaders"] + "depends": ["Rcpp", "curl", "data_table", "dplyr", "geosphere", "httr", "jsonlite", "lwgeom", "magrittr", "nabor", "od", "pbapply", "rlang", "sf", "sfheaders"] }, "stpm": { "name": "stpm", "version": "1.7.12", "sha256": "16kp69356bj1s26iwwysxdyr87kd3jqhj2gmmz4vc003ai63ga6y", - "depends": ["MASS", "nloptr", "Rcpp", "RcppArmadillo", "sas7bdat", "survival"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "nloptr", "sas7bdat", "survival"] }, "stpp": { "name": "stpp", - "version": "2.0-7", - "sha256": "1w9jn71ha817gldfhkmr2vfx3nkr78g1y662rfxg6flx2wyxs3kq", - "depends": ["ggplot2", "gridExtra", "KernSmooth", "plot3D", "rgl", "rpanel", "spatstat_explore", "spatstat_geom", "spatstat_random", "splancs"] + "version": "2.0-8", + "sha256": "1xb80nbfx7f1frzcw61fr2vnb8br8355f7aaifrjfz6vclf2ax1z", + "depends": ["KernSmooth", "ggplot2", "gridExtra", "plot3D", "rgl", "rpanel", "spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_univar", "splancs"] }, "stppSim": { "name": "stppSim", - "version": "1.3.2", - "sha256": "00wxbahfamxf4y2fmscq48n5j81qx4xsnh8har2mhhnqvaiikbvz", - "depends": ["chron", "cowplot", "data_table", "dplyr", "future_apply", "geosphere", "ggplot2", "gstat", "ks", "leaflet", "lubridate", "magrittr", "otuSummary", "progressr", "raster", "sf", "SiMRiv", "sp", "sparr", "spatstat_geom", "splancs", "stringr", "terra", "tibble", "tidyr"] + "version": "1.3.4", + "sha256": "0rrridj6r354lz3fbpyzhbvbb72cif0yxmd7d5ghbv2ig9dwz310", + "depends": ["SiMRiv", "chron", "cowplot", "data_table", "dplyr", "future_apply", "geosphere", "ggplot2", "gstat", "ks", "leaflet", "lubridate", "magrittr", "otuSummary", "progressr", "raster", "sf", "sp", "sparr", "spatstat_geom", "splancs", "stringr", "terra", "tibble", "tidyr"] }, "stpphawkes": { "name": "stpphawkes", "version": "0.2.1", "sha256": "1mfhvfjlshhigyl5bfagjiv3q8dizqf89ikyifkchylni5szblbs", - "depends": ["extraDistr", "interp", "Rcpp", "RcppArmadillo", "RcppGSL", "RcppProgress"] + "depends": ["Rcpp", "RcppArmadillo", "RcppGSL", "RcppProgress", "extraDistr", "interp"] }, "str2str": { "name": "str2str", @@ -114743,7 +115931,7 @@ "name": "strand", "version": "0.2.0", "sha256": "0gd9nnbdilvk4bszg77bxilan6qpg1np7c38w1b7j5sr3r30y5in", - "depends": ["arrow", "dplyr", "ggplot2", "lubridate", "Matrix", "R6", "Rglpk", "rlang", "tibble", "tidyr", "yaml"] + "depends": ["Matrix", "R6", "Rglpk", "arrow", "dplyr", "ggplot2", "lubridate", "rlang", "tibble", "tidyr", "yaml"] }, "stranslate": { "name": "stranslate", @@ -114785,7 +115973,7 @@ "name": "stratamatch", "version": "0.1.9", "sha256": "1z395355kac0wd4f0m1ijh851m046ra8h1wam04if4qp00ychajp", - "depends": ["dplyr", "Hmisc", "magrittr", "rlang", "survival"] + "depends": ["Hmisc", "dplyr", "magrittr", "rlang", "survival"] }, "stratastats": { "name": "stratastats", @@ -114831,27 +116019,21 @@ }, "strawr": { "name": "strawr", - "version": "0.0.91", - "sha256": "1nbcn20g3f3f5x9sscj3020n5h4iaphr70s90n2fz31vc4snzq2m", + "version": "0.0.92", + "sha256": "0dy6pagwvmswmrlvb9ndy8lz3krcm8fqik83l0gmv9wjb9vba27s", "depends": ["Rcpp"] }, "stray": { "name": "stray", "version": "0.1.1", "sha256": "1pjw1bdkqsp085lrwca1psma95ncapfz8a5iampxgghydkhh3dm8", - "depends": ["colorspace", "FNN", "ggplot2", "ks", "pcaPP"] + "depends": ["FNN", "colorspace", "ggplot2", "ks", "pcaPP"] }, "stream": { "name": "stream", "version": "2.0-2", "sha256": "0qpn6rf0rp1nklarw0jkdlvpalcnvvjs26h8slnqkgrkb1rr0vhc", - "depends": ["BH", "clue", "cluster", "clusterGeneration", "dbscan", "fpc", "magrittr", "MASS", "mlbench", "proxy", "Rcpp", "rpart"] - }, - "streamConnect": { - "name": "streamConnect", - "version": "0.0-4", - "sha256": "0sg28i9p6frlccabq9cq2j4w47jgcknwpjhpwl32qrwll7q9k4r3", - "depends": ["callr", "httr", "jsonlite", "plumber", "readr", "stream", "stringr"] + "depends": ["BH", "MASS", "Rcpp", "clue", "cluster", "clusterGeneration", "dbscan", "fpc", "magrittr", "mlbench", "proxy", "rpart"] }, "streamDAG": { "name": "streamDAG", @@ -114863,7 +116045,7 @@ "name": "streamDepletr", "version": "0.2.0", "sha256": "0pa0hsnhscsa98xkqzg7l83yagzq1r6m250m3m4r79baab8ndqp4", - "depends": ["dplyr", "Rmpfr", "sf"] + "depends": ["Rmpfr", "dplyr", "sf"] }, "streamMOA": { "name": "streamMOA", @@ -114875,7 +116057,7 @@ "name": "streamR", "version": "0.4.5", "sha256": "1clx3b0j2515r1nmnl6ki7qw5n54q3x2jvqv3zrc00kq71mlj7ix", - "depends": ["ndjson", "RCurl", "rjson"] + "depends": ["RCurl", "ndjson", "rjson"] }, "streambugs": { "name": "streambugs", @@ -114887,7 +116069,7 @@ "name": "streetscape", "version": "1.0.2", "sha256": "0y06719766yh6ifbk1h7wgdsw3asnwagli50czwqyilcp8p0fc4z", - "depends": ["dplyr", "httr", "mapview", "OpenImageR", "osmdata", "parallelly", "pbmcapply", "quickPWCR", "reticulate", "rlang", "sf", "sp", "SuperpixelImageSegmentation"] + "depends": ["OpenImageR", "SuperpixelImageSegmentation", "dplyr", "httr", "mapview", "osmdata", "parallelly", "pbmcapply", "quickPWCR", "reticulate", "rlang", "sf", "sp"] }, "stressaddition": { "name": "stressaddition", @@ -114905,7 +116087,7 @@ "name": "stressr", "version": "1.0.0", "sha256": "00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7", - "depends": ["lattice", "latticeExtra", "XML", "xts"] + "depends": ["XML", "lattice", "latticeExtra", "xts"] }, "strex": { "name": "strex", @@ -114989,7 +116171,7 @@ "name": "striprtf", "version": "0.6.0", "sha256": "1c8z2qf1kp43ir4dmyxq6hc46dclq8vx3ggkj02p8j1icjswm9bh", - "depends": ["magrittr", "Rcpp", "stringr"] + "depends": ["Rcpp", "magrittr", "stringr"] }, "strucchange": { "name": "strucchange", @@ -115013,7 +116195,7 @@ "name": "strvalidator", "version": "2.4.1", "sha256": "0s7n26in5fb6lxgffx01743vd4854qg4wclqgsa6mwnrqg8ihg4y", - "depends": ["data_table", "dplyr", "DT", "ggplot2", "gridExtra", "gtable", "gWidgets2", "gWidgets2tcltk", "MASS", "plotly", "plyr", "scales"] + "depends": ["DT", "MASS", "data_table", "dplyr", "gWidgets2", "gWidgets2tcltk", "ggplot2", "gridExtra", "gtable", "plotly", "plyr", "scales"] }, "stuart": { "name": "stuart", @@ -115025,25 +116207,25 @@ "name": "studentlife", "version": "1.1.0", "sha256": "1xvlcwg7ckxsm5hb5ax8r3hzdqnx61ax59ini5xc5jrsmir13g67", - "depends": ["crayon", "dplyr", "ggplot2", "jsonlite", "purrr", "R_utils", "readr", "skimr", "tibble", "tidyr", "visdat"] + "depends": ["R_utils", "crayon", "dplyr", "ggplot2", "jsonlite", "purrr", "readr", "skimr", "tibble", "tidyr", "visdat"] }, "studyStrap": { "name": "studyStrap", "version": "1.0.0", "sha256": "0lvzqnq40j0xn74qrj0pqhr8zz34mbhfd7dg8bnadscsvj5ffm4c", - "depends": ["caret", "CCA", "dplyr", "MatrixCorrelation", "nnls", "pls", "tibble", "tidyverse"] + "depends": ["CCA", "MatrixCorrelation", "caret", "dplyr", "nnls", "pls", "tibble", "tidyverse"] }, "stxplore": { "name": "stxplore", "version": "0.1.0", "sha256": "1bnpp53s7r8ghvbxvnlk103h66a55xf7y9fcdhvmfgf31d2x5dsd", - "depends": ["fields", "ggmap", "ggplot2", "ggridges", "gridExtra", "gstat", "lubridate", "magrittr", "RColorBrewer", "rlang", "sp", "spacetime", "stars", "tidyr"] + "depends": ["RColorBrewer", "fields", "ggmap", "ggplot2", "ggridges", "gridExtra", "gstat", "lubridate", "magrittr", "rlang", "sp", "spacetime", "stars", "tidyr"] }, "styler": { "name": "styler", "version": "1.10.3", "sha256": "0hfspw1q40jqla238dw86iyf0lyk1agc19flwvf9nrm824hw5fdd", - "depends": ["cli", "magrittr", "purrr", "R_cache", "rlang", "rprojroot", "vctrs", "withr"] + "depends": ["R_cache", "cli", "magrittr", "purrr", "rlang", "rprojroot", "vctrs", "withr"] }, "stylest2": { "name": "stylest2", @@ -115101,8 +116283,8 @@ }, "subplex": { "name": "subplex", - "version": "1.8", - "sha256": "19g5bd39gmcn27xdsklkzxg99x1r5v5q8zcw1iwry31qj24ivhrv", + "version": "1.9", + "sha256": "1dv9bpwm7ml662yrc2jnrjf4f8n1g5rfiipq6z0fx9j6pa6fma87", "depends": [] }, "subrank": { @@ -115115,19 +116297,13 @@ "name": "subscore", "version": "3.3", "sha256": "01y7bp7nj0p47n69pxvj2gyrcvgj617ymhwhxlqp0jrkns1wqjy5", - "depends": ["boot", "cocor", "CTT", "irtoys", "ltm", "sirt"] + "depends": ["CTT", "boot", "cocor", "irtoys", "ltm", "sirt"] }, "subscreen": { "name": "subscreen", "version": "3.0.7", "sha256": "0vxwyx08bjha7vgv3lcgigar43f74fr3w7wna6z8viawh3bc7k96", - "depends": ["bsplus", "colourpicker", "data_table", "dplyr", "DT", "jsonlite", "plyr", "purrr", "ranger", "shiny", "shinyjs", "shinyWidgets"] - }, - "subselect": { - "name": "subselect", - "version": "0.15.5", - "sha256": "1xw8ya8kq1b7vn7rp976b3i4bsxvnw53xw34bhsq6xk2c9idk3pw", - "depends": ["corpcor", "ISwR", "MASS"] + "depends": ["DT", "bsplus", "colourpicker", "data_table", "dplyr", "jsonlite", "plyr", "purrr", "ranger", "shiny", "shinyWidgets", "shinyjs"] }, "subsemble": { "name": "subsemble", @@ -115143,9 +116319,9 @@ }, "success": { "name": "success", - "version": "1.0.1", - "sha256": "0imwba2p50da9ymyj1pkg2dbn1ramzahabdnic0k0dmcn9g74d64", - "depends": ["ggplot2", "ggrepel", "Matrix", "matrixcalc", "pbapply", "plotly", "Rfast", "survival"] + "version": "1.1.0", + "sha256": "14y6farbnjxd0jq3g4vzj6y1xivcibgfic3w4s2jir1wq10ixf5x", + "depends": ["Matrix", "Rfast", "ggplot2", "ggrepel", "matrixcalc", "pbapply", "plotly", "survival"] }, "sudachir": { "name": "sudachir", @@ -115211,7 +116387,7 @@ "name": "sumSome", "version": "1.1.0", "sha256": "1a70kxvp9d9hn38jnvgk934vwbz4bjb6k4kcngp6rp9gv9h2bh2r", - "depends": ["ARIbrain", "pARI", "Rcpp", "RNifti"] + "depends": ["ARIbrain", "RNifti", "Rcpp", "pARI"] }, "summariser": { "name": "summariser", @@ -115229,7 +116405,7 @@ "name": "summclust", "version": "0.7.2", "sha256": "1cdzv5bm3l8fnnpk0c94y32ss1pmx7dddks33ha9r2yqw7p9xwvq", - "depends": ["cli", "collapse", "dreamerr", "generics", "MASS", "rlang"] + "depends": ["MASS", "cli", "collapse", "dreamerr", "generics", "rlang"] }, "sunburstR": { "name": "sunburstR", @@ -115243,18 +116419,18 @@ "sha256": "1xkci2sbcf5x1wn2jqzbfzc5dly331dhihrxjlmdiic247blwqyp", "depends": ["data_table", "lubridate", "magrittr"] }, + "sundialr": { + "name": "sundialr", + "version": "0.1.4.2", + "sha256": "1qzak0zrdj2ygw4h6cn28z6q5qxaam8dybqblmf17xq2lkvn2bpn", + "depends": ["Rcpp", "RcppArmadillo"] + }, "suntools": { "name": "suntools", "version": "1.0.0", "sha256": "1qlp0q2ckqg5v3yvbr98k3nr9awgg7ks0l1103nqvm1ssadv7ds2", "depends": ["sf"] }, - "supc": { - "name": "supc", - "version": "0.2.6.2", - "sha256": "0gvrmhvjkfbgi0ivwa8ri69rxj4kqn3xqrc2d5rfrdfm9jmqb56h", - "depends": ["BH", "Rcpp"] - }, "supclust": { "name": "supclust", "version": "1.1-1", @@ -115265,19 +116441,19 @@ "name": "superMICE", "version": "1.1.1", "sha256": "0wf043vyd89a5jdvm128rqmfrnm9c0lhir35jyzy20rm75aqqh1w", - "depends": ["mice", "SuperLearner"] + "depends": ["SuperLearner", "mice"] }, "superb": { "name": "superb", - "version": "0.95.9", - "sha256": "1amqfmkn7zfpsmq1r7xdc8x4kpshpjd54jpdwbbwj0mw8qzs2g7n", - "depends": ["foreign", "ggplot2", "lsr", "MASS", "plyr", "Rdpack", "shiny", "shinyBS", "stringr"] + "version": "0.95.15", + "sha256": "1lirfmsrkbssfg0kwlfw67g8hi4j2g71c7q177hvahpw90ajr6gf", + "depends": ["MASS", "Rdpack", "foreign", "ggplot2", "lsr", "plyr", "shiny", "shinyBS", "stringr"] }, "superbiclust": { "name": "superbiclust", "version": "1.2", "sha256": "0mk3d820skp99hl8ilwic2fz90yb9dwy2jq3vfjb726gj1qich3b", - "depends": ["biclust", "fabia", "Matrix"] + "depends": ["Matrix", "biclust", "fabia"] }, "supercells": { "name": "supercells", @@ -115307,7 +116483,7 @@ "name": "superml", "version": "0.5.7", "sha256": "0r2xp520j8w395b272681g9d7vzinmf4cl627xxcsw8575k89lpf", - "depends": ["assertthat", "BH", "data_table", "Metrics", "R6", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "Metrics", "R6", "Rcpp", "RcppArmadillo", "assertthat", "data_table"] }, "supernova": { "name": "supernova", @@ -115385,19 +116561,19 @@ "name": "sureLDA", "version": "0.1.0-1", "sha256": "09ls5gv9jip2pw38qw3v2ag91fgmmkq989pyr8c8j92nbwk6i3hr", - "depends": ["doParallel", "foreach", "glmnet", "MAP", "Matrix", "pROC", "Rcpp", "RcppArmadillo"] + "depends": ["MAP", "Matrix", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "glmnet", "pROC"] }, "surface": { "name": "surface", "version": "0.5", "sha256": "1fw75543aa6yafldffh9cnpm6m0rif0fpcihwj56d7nfnkbslawz", - "depends": ["ape", "geiger", "MASS", "ouch"] + "depends": ["MASS", "ape", "geiger", "ouch"] }, "surrosurv": { "name": "surrosurv", "version": "1.1.26", "sha256": "1zkrbc71n06i0fccrv5f15rnkbp3cb8lnizh4z16mmqgvn35hg1j", - "depends": ["copula", "eha", "lme4", "MASS", "Matrix", "msm", "mvmeta", "optimx", "parfm", "survival"] + "depends": ["MASS", "Matrix", "copula", "eha", "lme4", "msm", "mvmeta", "optimx", "parfm", "survival"] }, "surrosurvROC": { "name": "surrosurvROC", @@ -115409,7 +116585,7 @@ "name": "surtvep", "version": "1.0.0", "sha256": "0mmpyjv8cyayqpkkr7lh31s7bascv6i3h3774sfc015lzjpwl22f", - "depends": ["ggplot2", "ggpubr", "Rcpp", "RcppArmadillo", "rlang", "tibble"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "ggpubr", "rlang", "tibble"] }, "surv2sampleComp": { "name": "surv2sampleComp", @@ -115481,7 +116657,7 @@ "name": "survMisc", "version": "0.5.6", "sha256": "014cf7sfndmib9jmj0p3h67sr750k2pvw7m865zwdpvlqddi44fr", - "depends": ["data_table", "ggplot2", "gridExtra", "km_ci", "KMsurv", "knitr", "survival", "xtable", "zoo"] + "depends": ["KMsurv", "data_table", "ggplot2", "gridExtra", "km_ci", "knitr", "survival", "xtable", "zoo"] }, "survParamSim": { "name": "survParamSim", @@ -115523,7 +116699,7 @@ "name": "survSNP", "version": "0.26", "sha256": "0fvmqlzg6j43d5bwvn70n4630n396wrykl5blkszadj3l118rmp4", - "depends": ["foreach", "lattice", "Rcpp", "survival", "xtable"] + "depends": ["Rcpp", "foreach", "lattice", "survival", "xtable"] }, "survSens": { "name": "survSens", @@ -115545,15 +116721,15 @@ }, "surveil": { "name": "surveil", - "version": "0.2.2", - "sha256": "1bk048mjnviwrls2s25wqrrm3iwi6qjkjlhnpb0i7wjm9cckzz7j", - "depends": ["BH", "dplyr", "ggdist", "ggplot2", "gridExtra", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "scales", "StanHeaders", "tidybayes", "tidyr"] + "version": "0.3.0", + "sha256": "18q7i3pi5b4nx24zfkcswvdivqa7s0zri1gfimygyaz4mdpza1y1", + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "ggdist", "ggplot2", "gridExtra", "rlang", "rstan", "rstantools", "scales", "tidybayes", "tidyr"] }, "surveillance": { "name": "surveillance", "version": "1.23.0", "sha256": "1xqcm71mfmk3x8kq9sb66a4654c1vblpjz4may4xn7yh62nbcy2n", - "depends": ["MASS", "Matrix", "nlme", "polyCub", "Rcpp", "sp", "spatstat_geom", "xtable"] + "depends": ["MASS", "Matrix", "Rcpp", "nlme", "polyCub", "sp", "spatstat_geom", "xtable"] }, "survex": { "name": "survex", @@ -115565,13 +116741,13 @@ "name": "survexp.fr", "version": "1.1", "sha256": "0ci65w3w06kwab98q9gb7nb7smq9r25qfibkgfilsg1i5li6p9h5", - "depends": ["survival", "WriteXLS"] + "depends": ["WriteXLS", "survival"] }, "survey": { "name": "survey", "version": "4.4-2", "sha256": "1ggisal5g16p3n03bch7ymawd4hig3fmm02nhxy1z5zh48qhyjla", - "depends": ["lattice", "Matrix", "minqa", "mitools", "numDeriv", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "lattice", "minqa", "mitools", "numDeriv", "survival"] }, "surveyCV": { "name": "surveyCV", @@ -115583,19 +116759,19 @@ "name": "surveyPrev", "version": "1.0.0", "sha256": "1vp4v27vj9w0vsab6jjy9hvx36lrn01qkx3d0idmx0zwbd0bxy50", - "depends": ["data_table", "dplyr", "ggplot2", "labelled", "matrixStats", "naniar", "raster", "rdhs", "sf", "sjlabelled", "sp", "spdep", "stringr", "SUMMER", "survey", "tidyverse"] + "depends": ["SUMMER", "data_table", "dplyr", "ggplot2", "labelled", "matrixStats", "naniar", "raster", "rdhs", "sf", "sjlabelled", "sp", "spdep", "stringr", "survey", "tidyverse"] }, "surveybootstrap": { "name": "surveybootstrap", "version": "0.0.3", "sha256": "1ci6gqs1kiizpmddkw9r5nsq9wqdhha3kxhnn6b28fczrsypilf8", - "depends": ["dplyr", "functional", "plyr", "purrr", "Rcpp", "RcppArmadillo", "stringr"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "functional", "plyr", "purrr", "stringr"] }, "surveydata": { "name": "surveydata", "version": "0.2.7", "sha256": "0wrp92j50a19is4xvh5s82zkp3rvn46gi2344pxinppfax0kjf2h", - "depends": ["assertthat", "dplyr", "DT", "ggplot2", "magrittr", "purrr", "rlang", "scales", "tidyr"] + "depends": ["DT", "assertthat", "dplyr", "ggplot2", "magrittr", "purrr", "rlang", "scales", "tidyr"] }, "surveyexplorer": { "name": "surveyexplorer", @@ -115619,7 +116795,7 @@ "name": "surveysd", "version": "1.3.1", "sha256": "16l17ying9xshfn563kp7nn3hdqrg03ny578sgi08b7zfds5yf8b", - "depends": ["data_table", "ggplot2", "laeken", "Rcpp"] + "depends": ["Rcpp", "data_table", "ggplot2", "laeken"] }, "surveytable": { "name": "surveytable", @@ -115631,13 +116807,13 @@ "name": "surveyvoi", "version": "1.0.6", "sha256": "0lkws90jlvr4l40l8h7fkck0skpf9yp4989a3bsqvm670l8qvc1w", - "depends": ["assertthat", "doParallel", "dplyr", "groupdata2", "Matrix", "nloptr", "plyr", "PoissonBinomial", "progress", "Rcpp", "RcppAlgos", "RcppEigen", "Rsymphony", "scales", "sf", "tibble", "vegan", "withr", "xgboost"] + "depends": ["Matrix", "PoissonBinomial", "Rcpp", "RcppAlgos", "RcppEigen", "Rsymphony", "assertthat", "doParallel", "dplyr", "groupdata2", "nloptr", "plyr", "progress", "scales", "sf", "tibble", "vegan", "withr", "xgboost"] }, "survidm": { "name": "survidm", "version": "1.3.2", "sha256": "0ass7ffpk70ph7dcdjm2f6xyzqaavlkhr1pcij2vcasiy4v1vyiv", - "depends": ["doParallel", "doRNG", "foreach", "ggplot2", "gridExtra", "KernSmooth", "np", "plotly", "Rcpp", "survival", "TPmsm"] + "depends": ["KernSmooth", "Rcpp", "TPmsm", "doParallel", "doRNG", "foreach", "ggplot2", "gridExtra", "np", "plotly", "survival"] }, "survival": { "name": "survival", @@ -115649,7 +116825,7 @@ "name": "survival.svb", "version": "0.0-2", "sha256": "13lipzn1cnkd5dcg8n69cdghycifiin3jnjvgzsv0g60l1jk0lmp", - "depends": ["glmnet", "Rcpp", "RcppEigen", "survival"] + "depends": ["Rcpp", "RcppEigen", "glmnet", "survival"] }, "survival666": { "name": "survival666", @@ -115691,7 +116867,7 @@ "name": "survivalSL", "version": "0.94", "sha256": "03d38fh8pw5m2cd3v6hvcwc9d9b15idzrh9nj48cn6k27cnzf8qg", - "depends": ["caret", "date", "dplyr", "flexsurv", "glmnet", "glmnetUtils", "hdnom", "MASS", "randomForestSRC", "rpart", "survival"] + "depends": ["MASS", "caret", "date", "dplyr", "flexsurv", "glmnet", "glmnetUtils", "hdnom", "randomForestSRC", "rpart", "survival"] }, "survivalVignettes": { "name": "survivalVignettes", @@ -115709,19 +116885,19 @@ "name": "survivalsvm", "version": "0.0.5", "sha256": "1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga", - "depends": ["Hmisc", "kernlab", "Matrix", "pracma", "quadprog", "survival"] + "depends": ["Hmisc", "Matrix", "kernlab", "pracma", "quadprog", "survival"] }, "survivoR": { "name": "survivoR", - "version": "2.3.3", - "sha256": "08ficbw2bwc7pk5gcis6q6ghm7ivs47j5x3bjw4grrbr1jwssy18", - "depends": ["crayon", "dplyr", "DT", "ggplot2", "glue", "lubridate", "magrittr", "purrr", "readr", "shiny", "shinycssloaders", "shinyjs", "stringr", "tidyr"] + "version": "2.3.4", + "sha256": "1jc6qfms8awd49vgv9ncdbaqmm7c9ynx9azgbdcbvpp9pb9f3glc", + "depends": ["DT", "crayon", "dplyr", "ggplot2", "glue", "lubridate", "magrittr", "purrr", "readr", "shiny", "shinycssloaders", "shinyjs", "stringr", "tidyr"] }, "survminer": { "name": "survminer", "version": "0.4.9", "sha256": "0byh0wxdbjfwdrzsnqv4xlmnik6lj0vkkzfxy7lssk8dv5zmj7nz", - "depends": ["broom", "dplyr", "ggplot2", "ggpubr", "ggtext", "gridExtra", "magrittr", "maxstat", "purrr", "rlang", "scales", "survival", "survMisc", "tibble", "tidyr"] + "depends": ["broom", "dplyr", "ggplot2", "ggpubr", "ggtext", "gridExtra", "magrittr", "maxstat", "purrr", "rlang", "scales", "survMisc", "survival", "tibble", "tidyr"] }, "survmixer": { "name": "survmixer", @@ -115731,8 +116907,8 @@ }, "survobj": { "name": "survobj", - "version": "3.1.0", - "sha256": "0wd6ghnzvla7lxpg8nnjxmal6v82321q7kpwmvlswp8b4s0rp89l", + "version": "3.1.1", + "sha256": "0vxv34sj15077jgiq1jfw7wdi0j396scp7ngz9nzg7zq1icg214q", "depends": ["dplyr", "ggplot2", "survival", "tidyr"] }, "survout": { @@ -115751,13 +116927,13 @@ "name": "survstan", "version": "0.0.7.1", "sha256": "1yd634a4bqv5sfmsp2n4xxjjn23ms67iw3zzaa0yqzwldh09z6ng", - "depends": ["actuar", "BH", "broom", "doFuture", "dplyr", "extraDistr", "foreach", "future", "generics", "ggplot2", "gridExtra", "MASS", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "rlang", "rstan", "rstantools", "StanHeaders", "survival", "tibble", "tidyr"] + "depends": ["BH", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "actuar", "broom", "doFuture", "dplyr", "extraDistr", "foreach", "future", "generics", "ggplot2", "gridExtra", "purrr", "rlang", "rstan", "rstantools", "survival", "tibble", "tidyr"] }, "susieR": { "name": "susieR", "version": "0.12.35", "sha256": "0fhdc3lkhl4s9h2ng72gypy2z3hgk6566jfhwhsfbddyzd22drpd", - "depends": ["crayon", "ggplot2", "Matrix", "matrixStats", "mixsqp", "reshape"] + "depends": ["Matrix", "crayon", "ggplot2", "matrixStats", "mixsqp", "reshape"] }, "susographql": { "name": "susographql", @@ -115793,7 +116969,7 @@ "name": "svIDE", "version": "0.9-54", "sha256": "1a03xpjx22xhxfqkgcm1pmal0dlp544hvnckj0p6sy4y56hmsfik", - "depends": ["svMisc", "XML"] + "depends": ["XML", "svMisc"] }, "svKomodo": { "name": "svKomodo", @@ -115841,7 +117017,7 @@ "name": "svars", "version": "1.3.11", "sha256": "1y8klpj4b1dcba0d3b3kr29n8ji8pfis7v311ph0bx4j1mwilc9g", - "depends": ["clue", "copula", "DEoptim", "expm", "ggplot2", "pbapply", "Rcpp", "RcppArmadillo", "reshape2", "steadyICA", "strucchange", "vars", "zoo"] + "depends": ["DEoptim", "Rcpp", "RcppArmadillo", "clue", "copula", "expm", "ggplot2", "pbapply", "reshape2", "steadyICA", "strucchange", "vars", "zoo"] }, "svd": { "name": "svd", @@ -115883,7 +117059,7 @@ "name": "svines", "version": "0.2.3", "sha256": "0pmipkywpffs5zkvgdncz4ila6wndhvcm73bl73ncg7jqrrsi86r", - "depends": ["assertthat", "BH", "fGarch", "Rcpp", "RcppEigen", "RcppThread", "rvinecopulib", "univariateML", "wdm"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppThread", "assertthat", "fGarch", "rvinecopulib", "univariateML", "wdm"] }, "svmpath": { "name": "svmpath", @@ -115911,15 +117087,15 @@ }, "svs": { "name": "svs", - "version": "3.0.0", - "sha256": "1jn3dbaqpgydkwf9y7hq97nva26vvrpl9zmw2bw4ky1qgzgz1ypb", - "depends": ["gtools", "Matrix"] + "version": "3.1.1", + "sha256": "0hfs0dif4b9ssi98mv2aa849blgdgvphymafabmsix4nkdjqzi2k", + "depends": ["Matrix", "gtools"] }, "svyVGAM": { "name": "svyVGAM", "version": "1.2", "sha256": "01y372p52xjd7j20xk5gwxkl8sfnwdvixx3pb3f6r407ca7l330h", - "depends": ["survey", "VGAM"] + "depends": ["VGAM", "survey"] }, "svydiags": { "name": "svydiags", @@ -115931,7 +117107,7 @@ "name": "svylme", "version": "1.5-1", "sha256": "1bbg6ha0crg166856h65aly9l5x8y18wv39jymbaczqhs0ba5w1s", - "depends": ["lme4", "Matrix", "minqa", "survey"] + "depends": ["Matrix", "lme4", "minqa", "survey"] }, "svyweight": { "name": "svyweight", @@ -115949,43 +117125,43 @@ "name": "swa", "version": "0.8.1", "sha256": "1zy1a6c17vmdkmkwp8vv3niww2zs1m0hylsa0b2cz68vfhnmpim4", - "depends": ["ggplot2", "reshape", "ROCR"] + "depends": ["ROCR", "ggplot2", "reshape"] }, "swaRm": { "name": "swaRm", "version": "0.6.0", "sha256": "0p29dyig4zyrjp5gbm17q4s4g2jxl2idq6cqp6zyhsr0n197d38h", - "depends": ["geosphere", "lubridate", "MASS", "splancs"] + "depends": ["MASS", "geosphere", "lubridate", "splancs"] }, "swaRmverse": { "name": "swaRmverse", "version": "0.1.0", "sha256": "1z14ys2y42griwbwcjilk552haczlfbazjzwa5g6kvlxjibm1dq0", - "depends": ["geosphere", "pbapply", "Rtsne", "swaRm", "trackdf"] + "depends": ["Rtsne", "geosphere", "pbapply", "swaRm", "trackdf"] }, "swag": { "name": "swag", "version": "0.1.0", "sha256": "1w6schbj5gw7278krjzkcwafz3wv7vp7cfsvy17c0i1b5g3qqkpd", - "depends": ["caret", "Rdpack"] + "depends": ["Rdpack", "caret"] }, "swagger": { "name": "swagger", - "version": "5.17.14", - "sha256": "0vbz6cm6qclgydjlbymjjcsdb94bs8yprk5wmzzp6ny3ghaxjh9k", + "version": "5.17.14.1", + "sha256": "0ykmz3j1n06w1injcnlkb3xv79vwiyv94j74m950rfrbv97dda58", "depends": [] }, "swamp": { "name": "swamp", "version": "1.5.1", "sha256": "1mj6cqrc19p07v051fg6ikhhbccsg2lvz7wjiakaswqqm0269843", - "depends": ["amap", "gplots", "impute", "MASS"] + "depends": ["MASS", "amap", "gplots", "impute"] }, "swaprinc": { "name": "swaprinc", "version": "1.0.1", "sha256": "0r90w387chh4xgqn7jfi2wawsgr8faansp94hrp4vkhdmbbsb86z", - "depends": ["broom", "broom_mixed", "dplyr", "Gifi", "lme4", "magrittr", "rlang", "tidyselect"] + "depends": ["Gifi", "broom", "broom_mixed", "dplyr", "lme4", "magrittr", "rlang", "tidyselect"] }, "swatches": { "name": "swatches", @@ -116009,7 +117185,7 @@ "name": "sweater", "version": "0.1.8", "sha256": "045cyhdsnrhkcpgpgv7s209wn2pa9plj7pnlmmnfiz7dy67ikkr3", - "depends": ["cli", "combinat", "data_table", "LiblineaR", "proxy", "purrr", "quanteda", "Rcpp"] + "depends": ["LiblineaR", "Rcpp", "cli", "combinat", "data_table", "proxy", "purrr", "quanteda"] }, "sweep": { "name": "sweep", @@ -116037,15 +117213,15 @@ }, "swfscDAS": { "name": "swfscDAS", - "version": "0.6.2", - "sha256": "146xm4i0khdk217x4mgxi1j006fk8xpqqjf1hll6p2ky65iklmj4", + "version": "0.6.3", + "sha256": "0xyhaabbcmb3hja6pylnmr2vwxqhsxa47ih8chdwcnrz5lqz9inw", "depends": ["dplyr", "lubridate", "magrittr", "purrr", "readr", "rlang", "sf", "swfscMisc", "tidyr"] }, "swfscMisc": { "name": "swfscMisc", "version": "1.6.5", "sha256": "1qc2d3ykzxqqnjdq93j9nvkb8gfkvyr2x1l657q7jh1wcj8b7754", - "depends": ["abind", "dplyr", "ggplot2", "ggrepel", "HDInterval", "kknn", "magrittr", "modeest", "rlang", "runjags", "sf", "spatstat_geom", "tibble", "tidyr"] + "depends": ["HDInterval", "abind", "dplyr", "ggplot2", "ggrepel", "kknn", "magrittr", "modeest", "rlang", "runjags", "sf", "spatstat_geom", "tibble", "tidyr"] }, "swgee": { "name": "swgee", @@ -116069,7 +117245,7 @@ "name": "swirl", "version": "2.4.5", "sha256": "0cqyn2rnqfkb2wza4zdr1kcms5l0igbq79xh5i7765agdday2z9w", - "depends": ["digest", "httr", "RCurl", "stringr", "testthat", "yaml"] + "depends": ["RCurl", "digest", "httr", "stringr", "testthat", "yaml"] }, "swirlify": { "name": "swirlify", @@ -116087,7 +117263,7 @@ "name": "switchSelection", "version": "1.1.2", "sha256": "0mgl3s02pz9nbhdnm7fhyd8vbrfl718rv7bardlqc448qyb78hb8", - "depends": ["gena", "hpa", "mnorm", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "gena", "hpa", "mnorm"] }, "switchboard": { "name": "switchboard", @@ -116121,8 +117297,8 @@ }, "syllogi": { "name": "syllogi", - "version": "1.0.2", - "sha256": "0f461qak9naglyfqisc6fbv076v5ncijrv5ja2p37h39dc8i3fxz", + "version": "1.0.3", + "sha256": "1rdgkc4vncx74awznjkfldma5n7jbv2cd7sapyl064vlh0hhrlqf", "depends": [] }, "sylly": { @@ -116147,31 +117323,31 @@ "name": "symDMatrix", "version": "2.1.1", "sha256": "0xmpw37qkbadqp1idv8qmazdmmv0sd4fwgihg1b97hxzqhsxw0fh", - "depends": ["bit", "ff", "LinkedMatrix"] + "depends": ["LinkedMatrix", "bit", "ff"] }, "symSEM": { "name": "symSEM", "version": "0.4", "sha256": "0zk9a1l1pcyjg43j8jafbms072kzz6qqz514a0kbnyg7ja0bfrmj", - "depends": ["caracas", "metaSEM", "OpenMx"] + "depends": ["OpenMx", "caracas", "metaSEM"] }, "symbol_equation_gpt": { "name": "symbol.equation.gpt", - "version": "1.1.3", - "sha256": "1z7ww9wvyd4ma7bk0ynp2rbkrajd8b3frb1msh8wn2msj5k7pfpg", + "version": "1.1.4", + "sha256": "0h1301406spbl7yz0i0b1vqqrf5zd0yxvxx3ljsi5pj4mdhp5j32", "depends": ["htmltools", "markdown", "nextGenShinyApps", "r2symbols", "rstudioapi", "shiny", "shinyStorePlus"] }, "symbolicDA": { "name": "symbolicDA", "version": "0.7-1", "sha256": "1x1qwrf587lgp9ciakrhiy3wj4g90x4g7r784rr2b97g1xwysjff", - "depends": ["ade4", "cluster", "clusterSim", "e1071", "RSDA", "shapes", "XML"] + "depends": ["RSDA", "XML", "ade4", "cluster", "clusterSim", "e1071", "shapes"] }, "symbolicQspray": { "name": "symbolicQspray", - "version": "1.0.0", - "sha256": "03znlsgyli2jdbv4i1k358j1796w11zbiidl3iy9lgv9adrh3cnh", - "depends": ["BH", "gmp", "qspray", "ratioOfQsprays", "Rcpp", "RcppArmadillo", "RcppCGAL"] + "version": "1.1.0", + "sha256": "0l7lhpxnbbfgwypyqy3sy13vcjv63fv707i5d4r9gh2almk373s7", + "depends": ["BH", "Rcpp", "RcppCGAL", "gmp", "qspray", "ratioOfQsprays"] }, "symengine": { "name": "symengine", @@ -116195,7 +117371,7 @@ "name": "symphony", "version": "0.1.1", "sha256": "0bgdhah202sh5mjbzqzk14vkl6xwdxxhri0ik03xh654b4s8hscc", - "depends": ["class", "data_table", "dplyr", "ggplot2", "harmony", "irlba", "magrittr", "Matrix", "purrr", "RANN", "RColorBrewer", "Rcpp", "RcppArmadillo", "rlang", "tibble", "tidyr", "uwot"] + "depends": ["Matrix", "RANN", "RColorBrewer", "Rcpp", "RcppArmadillo", "class", "data_table", "dplyr", "ggplot2", "harmony", "irlba", "magrittr", "purrr", "rlang", "tibble", "tidyr", "uwot"] }, "symptomcheckR": { "name": "symptomcheckR", @@ -116219,7 +117395,7 @@ "name": "synchronicity", "version": "1.3.10", "sha256": "12svf4xzb9s3m1h2ddqgl6q2v57ifsj2p80j8cg2k0543a43pww2", - "depends": ["BH", "bigmemory_sri", "Rcpp", "uuid"] + "depends": ["BH", "Rcpp", "bigmemory_sri", "uuid"] }, "synchrony": { "name": "synchrony", @@ -116255,12 +117431,12 @@ "name": "synthACS", "version": "1.7.1", "sha256": "1s4jawg2g0zy41y0ajacki4nif9m3r0hnaz63yhapcnizc37lyy1", - "depends": ["acs", "data_table", "Rcpp", "retry"] + "depends": ["Rcpp", "acs", "data_table", "retry"] }, "synthesis": { "name": "synthesis", - "version": "1.2.4", - "sha256": "1yb0z4klz4hd7ab83j3h4x8v2yp2glmnnvz64g76iclx5mcgl6az", + "version": "1.2.5", + "sha256": "0zsk3y322qzmq3rcclka176xbqfwqkg2r4p3k0cx057dkn4v7866", "depends": ["MASS"] }, "synthesisr": { @@ -116279,7 +117455,13 @@ "name": "synthpop", "version": "1.8-0", "sha256": "0ljq3vhprzxj0p5s57pr223n3mxbiwz0p5bdvjcdkw4xykx7zkka", - "depends": ["broman", "classInt", "foreign", "ggplot2", "lattice", "MASS", "mipfp", "nnet", "party", "plyr", "polspline", "proto", "randomForest", "ranger", "rmutil", "rpart", "stringr", "survival"] + "depends": ["MASS", "broman", "classInt", "foreign", "ggplot2", "lattice", "mipfp", "nnet", "party", "plyr", "polspline", "proto", "randomForest", "ranger", "rmutil", "rpart", "stringr", "survival"] + }, + "syrup": { + "name": "syrup", + "version": "0.1.1", + "sha256": "008h2fzj620fh4gkbfjs40yk2mq047512djraqkj501s80x0rvib", + "depends": ["bench", "callr", "dplyr", "ps", "purrr", "rlang", "tibble", "vctrs", "withr"] }, "sys": { "name": "sys", @@ -116309,7 +117491,7 @@ "name": "systemfit", "version": "1.1-30", "sha256": "1qhw8gda85lliqhj67zsgva4cb6wihr5hks1c9c34y0n3ywgp52r", - "depends": ["car", "lmtest", "MASS", "Matrix", "sandwich"] + "depends": ["MASS", "Matrix", "car", "lmtest", "sandwich"] }, "systemfonts": { "name": "systemfonts", @@ -116321,19 +117503,19 @@ "name": "systemicrisk", "version": "0.4.3", "sha256": "05isv0wdx98s824nk0v8r3mqvmnrmsq7ffki40092snsfda3451z", - "depends": ["lpSolve", "Rcpp"] + "depends": ["Rcpp", "lpSolve"] }, "syt": { "name": "syt", - "version": "0.4.0", - "sha256": "1iw3nx0xsjrmmxmvr88nkawix7imdwv2agzhg7hqy6iaa263k6mi", + "version": "0.5.0", + "sha256": "1xpvvknyv5c0kvvipmyzrzrvqj51kkp86yl5gkgxfzs570zafwzp", "depends": ["Matrix", "partitions"] }, "syuzhet": { "name": "syuzhet", "version": "1.0.7", "sha256": "0cpjg16hwn6843jdxp4h94qjw1wwwblvjzg30w54rac08m62nkxg", - "depends": ["dplyr", "dtt", "NLP", "rlang", "textshape", "tidyr", "zoo"] + "depends": ["NLP", "dplyr", "dtt", "rlang", "textshape", "tidyr", "zoo"] }, "tLagInterim": { "name": "tLagInterim", @@ -116345,13 +117527,13 @@ "name": "tLagPropOdds", "version": "1.9", "sha256": "0bygx77s28izfwdyk6gihcyanch55cha7x52h29kxxp1kaapyf11", - "depends": ["dplyr", "R_utils", "survival"] + "depends": ["R_utils", "dplyr", "survival"] }, "tRigon": { "name": "tRigon", "version": "0.3.2", "sha256": "1qnvg06dgny2q4lfsbnjn5c664ibm332mr8rfwv5lzgr56d44nnk", - "depends": ["boot", "caret", "data_table", "dplyr", "DT", "factoextra", "ggcorrplot", "ggplot2", "ggpubr", "ggridges", "markdown", "patchwork", "randomForest", "RColorBrewer", "readxl", "sessioninfo", "shiny", "shinydashboard", "shinydashboardPlus", "shinyWidgets", "simpleboot", "writexl"] + "depends": ["DT", "RColorBrewer", "boot", "caret", "data_table", "dplyr", "factoextra", "ggcorrplot", "ggplot2", "ggpubr", "ggridges", "markdown", "patchwork", "randomForest", "readxl", "sessioninfo", "shiny", "shinyWidgets", "shinydashboard", "shinydashboardPlus", "simpleboot", "writexl"] }, "tRnslate": { "name": "tRnslate", @@ -116369,7 +117551,7 @@ "name": "tab", "version": "5.1.1", "sha256": "1kg8c1safi9klkx2mdkmsf5dn9piy4jljwd4ma7g4jz2rwl4jzhv", - "depends": ["dplyr", "kableExtra", "knitr", "MASS", "survey"] + "depends": ["MASS", "dplyr", "kableExtra", "knitr", "survey"] }, "tabbycat": { "name": "tabbycat", @@ -116399,7 +117581,7 @@ "name": "table.express", "version": "0.4.2", "sha256": "0iyx45q64ya82054alj1jm53zh2l8m05z743k0ifscyr0lkmp3zm", - "depends": ["data_table", "dplyr", "magrittr", "R6", "rlang", "tidyselect"] + "depends": ["R6", "data_table", "dplyr", "magrittr", "rlang", "tidyselect"] }, "table_glue": { "name": "table.glue", @@ -116435,7 +117617,7 @@ "name": "tabledown", "version": "1.0.0", "sha256": "1l2snq2damqckqi3nqiwlh3hiin3qs0wlkmlim9h9ar87dp56r44", - "depends": ["data_table", "dplyr", "ggplot2", "kutils", "lavaan", "magrittr", "mirt", "MOTE", "plotly", "psych", "tibble", "tidyr", "tidyselect"] + "depends": ["MOTE", "data_table", "dplyr", "ggplot2", "kutils", "lavaan", "magrittr", "mirt", "plotly", "psych", "tibble", "tidyr", "tidyselect"] }, "tableeasy": { "name": "tableeasy", @@ -116447,7 +117629,7 @@ "name": "tableone", "version": "0.13.2", "sha256": "1br78y68037g5v5jhgi9l393kj2msamdklim8ki40hmxk9bibkxi", - "depends": ["e1071", "gmodels", "labelled", "MASS", "nlme", "survey", "zoo"] + "depends": ["MASS", "e1071", "gmodels", "labelled", "nlme", "survey", "zoo"] }, "tablerDash": { "name": "tablerDash", @@ -116457,15 +117639,15 @@ }, "tables": { "name": "tables", - "version": "0.9.25", - "sha256": "1yqwnq44ylvqhr0lpadff6y9x362naz00j76jbfirjrrdrwhw05r", + "version": "0.9.28", + "sha256": "0adkbx8jcjxlx9jhg4ic1jyclx2x8ky9z8zd9x14xw8a94yczlnc", "depends": ["htmltools", "knitr"] }, "tableschema_r": { "name": "tableschema.r", "version": "1.1.2", "sha256": "1lnl1xybwzg00hqksbj2g6r1hrzwlh2al08hhml0n42khmvpg05g", - "depends": ["config", "future", "httr", "jsonlite", "jsonvalidate", "lubridate", "purrr", "R6", "RCurl", "rlist", "stringr", "urltools"] + "depends": ["R6", "RCurl", "config", "future", "httr", "jsonlite", "jsonvalidate", "lubridate", "purrr", "rlist", "stringr", "urltools"] }, "tablesgg": { "name": "tablesgg", @@ -116489,7 +117671,7 @@ "name": "tabnet", "version": "0.6.0", "sha256": "1bvbl1b4i3mx2qf6hjbkk114s1bq76gnhpfasy4c5q2f9k6z33c7", - "depends": ["coro", "data_tree", "dials", "dplyr", "ggplot2", "hardhat", "magrittr", "Matrix", "parsnip", "progress", "purrr", "rlang", "stringr", "tibble", "tidyr", "torch", "tune", "vctrs", "withr", "zeallot"] + "depends": ["Matrix", "coro", "data_tree", "dials", "dplyr", "ggplot2", "hardhat", "magrittr", "parsnip", "progress", "purrr", "rlang", "stringr", "tibble", "tidyr", "torch", "tune", "vctrs", "withr", "zeallot"] }, "taboolaR": { "name": "taboolaR", @@ -116499,8 +117681,8 @@ }, "tabr": { "name": "tabr", - "version": "0.4.9", - "sha256": "0dsm98lhl7j2bb3z5cliz1f34sv904svhniw6iar1nqh6p9y8a5l", + "version": "0.5.0", + "sha256": "0b8qg6zkfm7hqclpb79asjsz3p8kg0645n8gxc61r6gcv7hyzdvc", "depends": ["crayon", "dplyr", "ggplot2", "purrr", "tibble", "tidyr"] }, "tabshiftr": { @@ -116525,7 +117707,7 @@ "name": "tabulapdf", "version": "1.0.5-3", "sha256": "1cavgzchfpwa8mg7g4di5sys41909iwvy6sj0ah7p8cd623k9f7g", - "depends": ["png", "readr", "rJava"] + "depends": ["png", "rJava", "readr"] }, "tabularMLC": { "name": "tabularMLC", @@ -116549,7 +117731,7 @@ "name": "tabulate", "version": "0.1.0", "sha256": "1x5rf8shd3jxa7k8p8ak5a6c2fmxv476is5vlrg1fsg6f964h01v", - "depends": ["cli", "magrittr", "Rcpp", "rlang"] + "depends": ["Rcpp", "cli", "magrittr", "rlang"] }, "tabulator": { "name": "tabulator", @@ -116567,19 +117749,19 @@ "name": "tabxplor", "version": "1.1.3", "sha256": "1fxcbw117sz564ylxch7jgs6zv5d3lniyam5vlxfbdgvszlw9vhh", - "depends": ["cli", "crayon", "data_table", "DescTools", "dplyr", "forcats", "kableExtra", "magrittr", "pillar", "purrr", "rlang", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] + "depends": ["DescTools", "cli", "crayon", "data_table", "dplyr", "forcats", "kableExtra", "magrittr", "pillar", "purrr", "rlang", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] }, "tacmagic": { "name": "tacmagic", "version": "0.3.1", "sha256": "1rayyavjppi5dbcmb4yb2nf85ch2li766sdllfsirb19bb3d4c2d", - "depends": ["pracma", "R_matlab"] + "depends": ["R_matlab", "pracma"] }, "tactile": { "name": "tactile", "version": "0.2.1", "sha256": "1yly05zin0isad69d6j1k2nb9ykvz0gj2xs9mqiq2cda0mdxmh65", - "depends": ["gridExtra", "lattice", "latticeExtra", "MASS", "RColorBrewer"] + "depends": ["MASS", "RColorBrewer", "gridExtra", "lattice", "latticeExtra"] }, "tada": { "name": "tada", @@ -116601,15 +117783,15 @@ }, "tagtools": { "name": "tagtools", - "version": "0.1.0", - "sha256": "18r4hjip7dsij476h3fj8q7dgpnwh9fcbyvkly3669m5pqc1m3dw", - "depends": ["CircStats", "dplyr", "latex2exp", "lubridate", "matlab", "ncdf4", "plotly", "pracma", "readr", "signal", "stringr", "zoo", "zoom"] + "version": "0.2.0", + "sha256": "03vmvbhwrk105dzyfz1cjw6ar37rgacmc85fvcx85qh4rp0kbi53", + "depends": ["CircStats", "cowplot", "dplyr", "ggplot2", "latex2exp", "lubridate", "matlab", "ncdf4", "plotly", "pracma", "readr", "signal", "stringr", "zoo", "zoom"] }, "tailDepFun": { "name": "tailDepFun", "version": "1.0.1", "sha256": "0rrjg4ky3pjbfwppmnwyijvlzq3c3nf33rl0w4vly52v1ramp5c6", - "depends": ["copula", "cubature", "mvtnorm", "SpatialExtremes"] + "depends": ["SpatialExtremes", "copula", "cubature", "mvtnorm"] }, "tailTransform": { "name": "tailTransform", @@ -116633,13 +117815,13 @@ "name": "takos", "version": "0.2.0", "sha256": "09w9lkqhxdb26fvrsb8n16601kqpr2smplipx3lj6cdgbyhb1hqz", - "depends": ["baseline", "broom", "colorRamps", "data_table", "deSolve", "devEMF", "MASS", "minpack_lm", "pracma", "segmented", "sfsmisc", "smoother"] + "depends": ["MASS", "baseline", "broom", "colorRamps", "data_table", "deSolve", "devEMF", "minpack_lm", "pracma", "segmented", "sfsmisc", "smoother"] }, "tame": { "name": "tame", "version": "0.0.1", "sha256": "183s8mxy1wvqkwick5gzrf5ijx8frwk2b8bpb4hh5rwvlqwm6p4h", - "depends": ["dplyr", "fuzzyjoin", "magrittr", "purrr", "Rcpp", "Rfast", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["Rcpp", "Rfast", "dplyr", "fuzzyjoin", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] }, "tanaka": { "name": "tanaka", @@ -116651,7 +117833,7 @@ "name": "tangram", "version": "0.8.2", "sha256": "1r4wvz3nrms3mh06a7zykhkbsi4hz57xdn7af49yiypynhrxiin5", - "depends": ["base64enc", "digest", "htmltools", "knitr", "magrittr", "R6", "stringi", "stringr"] + "depends": ["R6", "base64enc", "digest", "htmltools", "knitr", "magrittr", "stringi", "stringr"] }, "tangram_pipe": { "name": "tangram.pipe", @@ -116669,7 +117851,7 @@ "name": "tapnet", "version": "0.3", "sha256": "1fjg98m19iwbzijs5b5l4ssrbx1shv1hmgn1166cbni9y76m44sh", - "depends": ["ape", "bipartite", "MPSEM", "phytools", "vegan"] + "depends": ["MPSEM", "ape", "bipartite", "phytools", "vegan"] }, "tarchetypes": { "name": "tarchetypes", @@ -116687,25 +117869,25 @@ "name": "targeted", "version": "0.5", "sha256": "176h4zswxf33394ngf4kczcan4acs91jnpk5pyz5fw49l5yhkqlg", - "depends": ["data_table", "digest", "futile_logger", "future_apply", "lava", "mets", "optimx", "progressr", "R6", "Rcpp", "RcppArmadillo", "survival"] + "depends": ["R6", "Rcpp", "RcppArmadillo", "data_table", "digest", "futile_logger", "future_apply", "lava", "mets", "optimx", "progressr", "survival"] }, "targets": { "name": "targets", - "version": "1.7.0", - "sha256": "1h939mvyxd1wjakcbxjxcmn6a7i23ya1kc89aqwarizsj00hdjil", - "depends": ["base64url", "callr", "cli", "codetools", "data_table", "igraph", "knitr", "ps", "R6", "rlang", "secretbase", "tibble", "tidyselect", "vctrs", "yaml"] + "version": "1.7.1", + "sha256": "1r4pg990nhmyg4i15qgqafvqas4vh5rvcki3iaff2hyrfdcmy6vy", + "depends": ["R6", "base64url", "callr", "cli", "codetools", "data_table", "igraph", "knitr", "ps", "rlang", "secretbase", "tibble", "tidyselect", "vctrs", "yaml"] }, "tashu": { "name": "tashu", "version": "0.1.1", "sha256": "0rirjalridr79a7j3qz80l2vp6m8paqr97ac241b58756k7nr5j7", - "depends": ["dplyr", "drat", "ggplot2", "lubridate", "plyr", "randomForest", "RColorBrewer", "reshape2"] + "depends": ["RColorBrewer", "dplyr", "drat", "ggplot2", "lubridate", "plyr", "randomForest", "reshape2"] }, "tastypie": { "name": "tastypie", "version": "0.1.1", "sha256": "0a7wq8jg3f0852y9pla1f63dqnkwn3vnb9p7fh9jq9rf75ljcpjk", - "depends": ["dplyr", "fmsb", "ggplot2", "packcircles", "RColorBrewer", "scales", "shadowtext", "tibble"] + "depends": ["RColorBrewer", "dplyr", "fmsb", "ggplot2", "packcircles", "scales", "shadowtext", "tibble"] }, "tatest": { "name": "tatest", @@ -116747,7 +117929,7 @@ "name": "taxadb", "version": "0.2.1", "sha256": "0m6rbvnf6ngz6i2w5jvmca0zl0pyy3b30vhjqxi08glii5fkwx2k", - "depends": ["contentid", "DBI", "dbplyr", "dplyr", "duckdb", "magrittr", "memoise", "rlang", "stringi", "tibble"] + "depends": ["DBI", "contentid", "dbplyr", "dplyr", "duckdb", "magrittr", "memoise", "rlang", "stringi", "tibble"] }, "taxalight": { "name": "taxalight", @@ -116759,37 +117941,31 @@ "name": "taxize", "version": "0.9.100", "sha256": "0afdjcwkkpkc5kgk558jccnw6jzs6mswd4i86c316pgb8py7irg2", - "depends": ["ape", "bold", "cli", "conditionz", "crayon", "crul", "data_table", "foreach", "jsonlite", "natserv", "phangorn", "R6", "ritis", "rotl", "rredlist", "tibble", "wikitaxa", "worrms", "xml2", "zoo"] + "depends": ["R6", "ape", "bold", "cli", "conditionz", "crayon", "crul", "data_table", "foreach", "jsonlite", "natserv", "phangorn", "ritis", "rotl", "rredlist", "tibble", "wikitaxa", "worrms", "xml2", "zoo"] }, "taxizedb": { "name": "taxizedb", "version": "0.3.1", "sha256": "157xpbmqp3l0blf6n7cb0qswj12v39rhvx0zkbrc2w73g601naj5", - "depends": ["curl", "DBI", "dbplyr", "dplyr", "hoardr", "magrittr", "readr", "rlang", "RSQLite", "tibble"] + "depends": ["DBI", "RSQLite", "curl", "dbplyr", "dplyr", "hoardr", "magrittr", "readr", "rlang", "tibble"] }, "taxlist": { "name": "taxlist", - "version": "0.2.4", - "sha256": "144nsiz90nkrm2v4nnhpvdnzpvjg2jh88dkqrm4gjm0drl9s981g", + "version": "0.3.0", + "sha256": "15abqk70dmz39m85aczwfvrhyvmw53r49l6ywip1i84pla991wsg", "depends": ["biblio", "foreign", "stringdist", "stringi", "stringr", "vegdata"] }, - "taxonbridge": { - "name": "taxonbridge", - "version": "1.2.2", - "sha256": "1ivks3bvwyn0ybvyz6dhsx7qxnlskf4icjkgsichdv4p24w5iwb9", - "depends": ["dplyr", "ggplot2", "purrr", "rje", "stringr", "vroom", "withr"] + "taxnames": { + "name": "taxnames", + "version": "0.1.0", + "sha256": "02f3n010gc91jd2l20w7kvjjsd2cix32xy0p4jx0aywb0mx8sxj2", + "depends": ["taxlist"] }, "taxonomizr": { "name": "taxonomizr", "version": "0.10.6", "sha256": "1g4r42zc9h6f0x875b0nyg56frzn4q7k5vk1jkwczz6ic5cbwigj", - "depends": ["curl", "data_table", "R_utils", "RSQLite"] - }, - "taxotools": { - "name": "taxotools", - "version": "0.0.139", - "sha256": "1nx79a0jfy0xrd83zk3zwk65mdk35lgz564b3fmhdv9rqpmg9q7n", - "depends": ["plyr", "rmarkdown", "sqldf", "stringdist", "stringi", "stringr", "taxize", "wikitaxa"] + "depends": ["RSQLite", "R_utils", "curl", "data_table"] }, "tayloRswift": { "name": "tayloRswift", @@ -116811,9 +117987,9 @@ }, "tbea": { "name": "tbea", - "version": "1.4.2", - "sha256": "1lffwmy4qiy24vkhizv8vxhffm35xh7ls818fhn50j7my8gzpip1", - "depends": ["ape", "boot", "coda", "Rfit"] + "version": "1.5.0", + "sha256": "0h2v6h93r36h9v7g6w4jrj38rln9qqck5xnwcljdrhnd8r5x3v29", + "depends": ["Rfit", "ape", "boot", "coda"] }, "tbl2xts": { "name": "tbl2xts", @@ -116849,19 +118025,19 @@ "name": "tcgaViz", "version": "1.0.2", "sha256": "0k1jrgbxzlc9q3cx5y03mxfrrvhdfwjjqjfqlmrq72skbl027y08", - "depends": ["config", "data_table", "dplyr", "DT", "ggplot2", "ggpubr", "golem", "magrittr", "plotly", "readr", "reshape2", "rlang", "rstatix", "scales", "shiny", "shinyFeedback", "shinyjs", "stringr", "tidyr", "tidyselect"] + "depends": ["DT", "config", "data_table", "dplyr", "ggplot2", "ggpubr", "golem", "magrittr", "plotly", "readr", "reshape2", "rlang", "rstatix", "scales", "shiny", "shinyFeedback", "shinyjs", "stringr", "tidyr", "tidyselect"] }, "tci": { "name": "tci", "version": "0.2.0", "sha256": "15drq6rvakf8jxmb1g5d7jjl7vnbzg314d809zzq19bicivvxsqj", - "depends": ["ggplot2", "gridExtra", "knitr", "mvtnorm", "Rcpp", "RcppArmadillo", "reshape", "reshape2", "truncnorm", "xtable"] + "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "gridExtra", "knitr", "mvtnorm", "reshape", "reshape2", "truncnorm", "xtable"] }, "tcl": { "name": "tcl", "version": "0.2.0", "sha256": "0n735xyl0fr3zgigw68xpy1ky3rfd2djwg9qhgbgif0cvgrrki1n", - "depends": ["eRm", "lattice", "ltm", "MASS", "Matrix", "numDeriv", "psychotools", "rlang"] + "depends": ["MASS", "Matrix", "eRm", "lattice", "ltm", "numDeriv", "psychotools", "rlang"] }, "tcltk2": { "name": "tcltk2", @@ -116873,19 +118049,19 @@ "name": "tclust", "version": "2.0-4", "sha256": "0y05aqpmal7ky33hs8n1phai94d7f48ich43jvy4m5wbfxkp2rm6", - "depends": ["doParallel", "foreach", "MASS", "Rcpp", "RcppArmadillo"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "doParallel", "foreach"] }, "tcpl": { "name": "tcpl", "version": "3.1.0", "sha256": "0s35j9ky49d2f58hg93a47l6j855vm95a3qzwq3i8wd0p2zh1x7b", - "depends": ["data_table", "DBI", "dplyr", "ggplot2", "gridExtra", "numDeriv", "plotly", "RColorBrewer", "RMariaDB", "sqldf", "stringr", "tcplfit2", "tidyr"] + "depends": ["DBI", "RColorBrewer", "RMariaDB", "data_table", "dplyr", "ggplot2", "gridExtra", "numDeriv", "plotly", "sqldf", "stringr", "tcplfit2", "tidyr"] }, "tcplfit2": { "name": "tcplfit2", "version": "0.1.6", "sha256": "1znhma87nyy36m3viyh80m6gygqh4iwwh1xj0nw6wh88qal4935p", - "depends": ["numDeriv", "RColorBrewer", "stringr"] + "depends": ["RColorBrewer", "numDeriv", "stringr"] }, "td": { "name": "td", @@ -116897,7 +118073,7 @@ "name": "tdROC", "version": "2.0", "sha256": "0m53a9w2365mb1bq9wlj7gwsabnbh9m4ax8klq22frj2dzvlk7xm", - "depends": ["magrittr", "Rcpp", "survival"] + "depends": ["Rcpp", "magrittr", "survival"] }, "tdata": { "name": "tdata", @@ -116907,8 +118083,8 @@ }, "tdaunif": { "name": "tdaunif", - "version": "0.1.1", - "sha256": "03m8lzg4w1ys0shr2gir5m78c02r71l5pwqgvpcn004kirh3xhwv", + "version": "0.2.0", + "sha256": "0hygfm589rhcbq7ls4jprxwxvksqqr7fh4i5xgk5fb09fdqy9k1g", "depends": [] }, "tdcmStan": { @@ -116919,15 +118095,15 @@ }, "tdigest": { "name": "tdigest", - "version": "0.4.1", - "sha256": "1g4yk01lmx8cz5q06bxm3kcsi7c9cvpdfi925csc4qaf5rdrad4y", + "version": "0.4.2", + "sha256": "0a6zd4y7wrxdwl3fchjn6g8p70frd0jpq9a6cf5bnxbhr5sjk6x1", "depends": ["magrittr"] }, "tdr": { "name": "tdr", "version": "0.13", "sha256": "0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15", - "depends": ["ggplot2", "lattice", "RColorBrewer"] + "depends": ["RColorBrewer", "ggplot2", "lattice"] }, "tdsa": { "name": "tdsa", @@ -116981,25 +118157,25 @@ "name": "teal.modules.clinical", "version": "0.9.1", "sha256": "1fvy0xcbxjfskdyp3y4y70y7q6swmkjzpswkw7z3fq856fbnaz75", - "depends": ["broom", "checkmate", "cowplot", "dplyr", "DT", "ggplot2", "ggrepel", "lifecycle", "rlistings", "rmarkdown", "rtables", "scales", "shiny", "shinyjs", "shinyvalidate", "shinyWidgets", "teal", "teal_code", "teal_data", "teal_logger", "teal_reporter", "teal_transform", "teal_widgets", "tern", "tern_gee", "tern_mmrm", "vistime"] + "depends": ["DT", "broom", "checkmate", "cowplot", "dplyr", "ggplot2", "ggrepel", "lifecycle", "rlistings", "rmarkdown", "rtables", "scales", "shiny", "shinyWidgets", "shinyjs", "shinyvalidate", "teal", "teal_code", "teal_data", "teal_logger", "teal_reporter", "teal_transform", "teal_widgets", "tern", "tern_gee", "tern_mmrm", "vistime"] }, "teal_modules_general": { "name": "teal.modules.general", "version": "0.3.0", "sha256": "0j07ak6g2rk8b16pix853j7hvyhac580akflwxxb97zvzipy51qx", - "depends": ["checkmate", "dplyr", "DT", "forcats", "ggmosaic", "ggplot2", "logger", "scales", "shiny", "shinyjs", "shinyTree", "shinyvalidate", "shinyWidgets", "stringr", "teal", "teal_code", "teal_data", "teal_logger", "teal_reporter", "teal_transform", "teal_widgets", "tern", "tibble", "tidyr"] + "depends": ["DT", "checkmate", "dplyr", "forcats", "ggmosaic", "ggplot2", "logger", "scales", "shiny", "shinyTree", "shinyWidgets", "shinyjs", "shinyvalidate", "stringr", "teal", "teal_code", "teal_data", "teal_logger", "teal_reporter", "teal_transform", "teal_widgets", "tern", "tibble", "tidyr"] }, "teal_reporter": { "name": "teal.reporter", "version": "0.3.1", "sha256": "1hgp17rjmwjqi00w28qgh5h13vn58wnwhx4y8825qnc8v45vchb5", - "depends": ["bslib", "checkmate", "flextable", "htmltools", "knitr", "lifecycle", "R6", "rmarkdown", "shiny", "shinybusy", "shinyWidgets", "yaml", "zip"] + "depends": ["R6", "bslib", "checkmate", "flextable", "htmltools", "knitr", "lifecycle", "rmarkdown", "shiny", "shinyWidgets", "shinybusy", "yaml", "zip"] }, "teal_slice": { "name": "teal.slice", "version": "0.5.1", "sha256": "0vnp61cmmbxfjmli7y9i9b388yh6rqic33a061s2k61j925cisg0", - "depends": ["bslib", "checkmate", "dplyr", "htmltools", "jsonlite", "lifecycle", "logger", "plotly", "R6", "shiny", "shinycssloaders", "shinyjs", "shinyWidgets", "teal_data", "teal_logger", "teal_widgets"] + "depends": ["R6", "bslib", "checkmate", "dplyr", "htmltools", "jsonlite", "lifecycle", "logger", "plotly", "shiny", "shinyWidgets", "shinycssloaders", "shinyjs", "teal_data", "teal_logger", "teal_widgets"] }, "teal_transform": { "name": "teal.transform", @@ -117011,7 +118187,7 @@ "name": "teal.widgets", "version": "0.4.2", "sha256": "0qdjc1w1kh0k155vp0w0rs5yh26lmds9i6xv4dhrgnn7h2gaqgv1", - "depends": ["bslib", "checkmate", "ggplot2", "htmltools", "lifecycle", "rtables", "shiny", "shinyjs", "shinyWidgets", "styler"] + "depends": ["bslib", "checkmate", "ggplot2", "htmltools", "lifecycle", "rtables", "shiny", "shinyWidgets", "shinyjs", "styler"] }, "tealeaves": { "name": "tealeaves", @@ -117029,13 +118205,13 @@ "name": "teamr", "version": "0.0.1", "sha256": "01gngws8lf093598wlzrv4ls74avsli6ij33v1plqgc0znyaw4s2", - "depends": ["httr", "jsonlite", "R6"] + "depends": ["R6", "httr", "jsonlite"] }, "tectonicr": { "name": "tectonicr", "version": "0.3.2", "sha256": "0w2pg7b3bk4vc72aw2n7hcp47aq7a25l41m9yh3x3a6ssnzcg350", - "depends": ["boot", "dplyr", "ggplot2", "RColorBrewer", "sf", "smoothr", "spatstat_explore", "spatstat_geom", "spatstat_univar", "spatstat_utils", "terra", "tidyr", "viridis", "zoo"] + "depends": ["RColorBrewer", "boot", "dplyr", "ggplot2", "sf", "smoothr", "spatstat_explore", "spatstat_geom", "spatstat_univar", "spatstat_utils", "terra", "tidyr", "viridis", "zoo"] }, "teda": { "name": "teda", @@ -117047,7 +118223,7 @@ "name": "tehtuner", "version": "0.3.0", "sha256": "1m1gkkl0kgjrlkbh3vz8lh64gq6l8v3vay0977lwx8g3yzs40z0g", - "depends": ["earth", "foreach", "glmnet", "party", "randomForestSRC", "Rdpack", "rpart", "stringr", "SuperLearner"] + "depends": ["Rdpack", "SuperLearner", "earth", "foreach", "glmnet", "party", "randomForestSRC", "rpart", "stringr"] }, "teigen": { "name": "teigen", @@ -117059,19 +118235,19 @@ "name": "telefit", "version": "1.0.3", "sha256": "0z6dr4ni00dyagbkzr3c7l4h2g23w3bfj99a9755vmrzyy6r45iq", - "depends": ["abind", "coda", "cowplot", "dplyr", "fields", "foreach", "ggplot2", "gtable", "itertools", "mvtnorm", "raster", "Rcpp", "RcppArmadillo", "RcppEigen", "reshape2", "scales", "scoringRules", "sp", "stringr"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "abind", "coda", "cowplot", "dplyr", "fields", "foreach", "ggplot2", "gtable", "itertools", "mvtnorm", "raster", "reshape2", "scales", "scoringRules", "sp", "stringr"] }, "telegram": { "name": "telegram", "version": "0.6.0", "sha256": "02wwa115f0vz2d9y4nf01397hjkpc3cv2gdl47snrajrm41gji7y", - "depends": ["curl", "httr", "jsonlite", "R6"] + "depends": ["R6", "curl", "httr", "jsonlite"] }, "telegram_bot": { "name": "telegram.bot", "version": "3.0.0", "sha256": "0fqv2piddb8i37rpvw6li25jhc9mbi7fyqmib90xah6qmlaji02g", - "depends": ["curl", "httpuv", "httr", "jsonlite", "openssl", "R6"] + "depends": ["R6", "curl", "httpuv", "httr", "jsonlite", "openssl"] }, "telemetR": { "name": "telemetR", @@ -117083,7 +118259,7 @@ "name": "telescope", "version": "0.1-0", "sha256": "1r6ciiy12jy7z4hb2jhgv1ml7p57rqcpfbz2fs0bn5bc1jbzm3ch", - "depends": ["abind", "bayesm", "DirichletReg", "extraDistr", "MCMCpack", "mvtnorm"] + "depends": ["DirichletReg", "MCMCpack", "abind", "bayesm", "extraDistr", "mvtnorm"] }, "telraamStats": { "name": "telraamStats", @@ -117113,7 +118289,7 @@ "name": "templateICAr", "version": "0.6.4", "sha256": "15f2bv4vcsnqcb2rnpa1ylhxj8a511ab3mil3b8n9icffpzgahy0", - "depends": ["abind", "excursions", "expm", "fMRItools", "ica", "Matrix", "matrixStats", "pesel", "Rcpp", "RcppEigen", "SQUAREM"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "SQUAREM", "abind", "excursions", "expm", "fMRItools", "ica", "matrixStats", "pesel"] }, "templates": { "name": "templates", @@ -117139,6 +118315,12 @@ "sha256": "0xpp1hi3xnkg55aixgy2bp5476i503h8gsiss9x7f15274kx0d7s", "depends": ["stringr"] }, + "tenm": { + "name": "tenm", + "version": "0.5.1", + "sha256": "1dx60ilpwzsn5gkm50pyxq1hkpk11i8gz9yj823ylqc5qbbrsq1q", + "depends": ["MASS", "dplyr", "furrr", "future", "lubridate", "purrr", "rgl", "sf", "stringr", "terra", "tidyr"] + }, "tensor": { "name": "tensor", "version": "1.5", @@ -117161,7 +118343,7 @@ "name": "tensorBSS", "version": "0.3.8", "sha256": "1chgkdshjpxzy0cxkgjzpr5k4v2hyad1vchrxyqhsj9isfic2581", - "depends": ["abind", "fICA", "ggplot2", "ICtest", "JADE", "Rcpp", "RcppArmadillo", "tensor", "tsBSS"] + "depends": ["ICtest", "JADE", "Rcpp", "RcppArmadillo", "abind", "fICA", "ggplot2", "tensor", "tsBSS"] }, "tensorEVD": { "name": "tensorEVD", @@ -117179,7 +118361,7 @@ "name": "tensorTS", "version": "1.0.2", "sha256": "11kmp5qy54rhb302jwpncsbqifgqn7zivav8ph1qbz3f3911chw2", - "depends": ["abind", "expm", "MASS", "Matrix", "pracma", "rTensor", "tensor"] + "depends": ["MASS", "Matrix", "abind", "expm", "pracma", "rTensor", "tensor"] }, "tensorflow": { "name": "tensorflow", @@ -117209,13 +118391,13 @@ "name": "tergm", "version": "4.2.0", "sha256": "0sfszgvm38y2j0j6hnwg2llf6djgxbw0ibq6cxv6blf4q9na5xfw", - "depends": ["coda", "ergm", "ergm_multi", "MASS", "network", "networkDynamic", "nlme", "purrr", "robustbase", "statnet_common"] + "depends": ["MASS", "coda", "ergm", "ergm_multi", "network", "networkDynamic", "nlme", "purrr", "robustbase", "statnet_common"] }, "tergmLite": { "name": "tergmLite", "version": "2.6.1", "sha256": "03dr3bfi5ywavfijkc6gmci8i1kmbsh26awhl7748mn9wcsgs2pc", - "depends": ["ergm", "network", "networkDynamic", "Rcpp", "statnet_common", "tergm", "tibble"] + "depends": ["Rcpp", "ergm", "network", "networkDynamic", "statnet_common", "tergm", "tibble"] }, "term": { "name": "term", @@ -117227,13 +118409,13 @@ "name": "terminaldigits", "version": "0.1.0", "sha256": "0vj7pylr410wi59qj2313iximsyl0v9ffg7z9gcfg720g5zrvfkm", - "depends": ["discretefit", "Rcpp"] + "depends": ["Rcpp", "discretefit"] }, "tern": { "name": "tern", - "version": "0.9.4", - "sha256": "1byv3q2kjd1aibzxhvwnm7fl2vsz069pxmcjx1zjl6w6453y5s3h", - "depends": ["broom", "car", "checkmate", "cowplot", "dplyr", "emmeans", "forcats", "formatters", "ggplot2", "gridExtra", "gtable", "labeling", "lifecycle", "magrittr", "MASS", "Rdpack", "rlang", "rtables", "scales", "survival", "tibble", "tidyr"] + "version": "0.9.5", + "sha256": "0pmx2f9xjw463jnnbdbpvlwjaq5c04lry8iavisxniwshr5piqfm", + "depends": ["MASS", "Rdpack", "broom", "car", "checkmate", "cowplot", "dplyr", "emmeans", "forcats", "formatters", "ggplot2", "gridExtra", "gtable", "labeling", "lifecycle", "magrittr", "rlang", "rtables", "scales", "survival", "tibble", "tidyr"] }, "tern_gee": { "name": "tern.gee", @@ -117275,7 +118457,7 @@ "name": "tessellation", "version": "2.3.0", "sha256": "0l8ffw7szmfd51lf9x8vh673zq0zg8rrx1527hgllddk82kyhmia", - "depends": ["colorsGen", "cxhull", "english", "hash", "Polychrome", "R6", "rgl", "Rvcg", "scales", "sets"] + "depends": ["Polychrome", "R6", "Rvcg", "colorsGen", "cxhull", "english", "hash", "rgl", "scales", "sets"] }, "tesselle": { "name": "tesselle", @@ -117287,7 +118469,7 @@ "name": "tesseract", "version": "5.2.1", "sha256": "1zhpl6pbi7gwwc9y1d8cd7hb21ljcs561lyysjva4cfmqm0sdazz", - "depends": ["curl", "digest", "pdftools", "rappdirs", "Rcpp"] + "depends": ["Rcpp", "curl", "digest", "pdftools", "rappdirs"] }, "test2norm": { "name": "test2norm", @@ -117353,7 +118535,7 @@ "name": "testforDEP", "version": "0.2.0", "sha256": "1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9", - "depends": ["Hmisc", "minerva", "Rcpp"] + "depends": ["Hmisc", "Rcpp", "minerva"] }, "testit": { "name": "testit", @@ -117365,7 +118547,7 @@ "name": "testthat", "version": "3.2.1.1", "sha256": "1xz94i0r62lslyqya8gz6i2r100wi26y5c2822v2i7lkflwwx1fp", - "depends": ["brio", "callr", "cli", "desc", "digest", "evaluate", "jsonlite", "lifecycle", "magrittr", "pkgload", "praise", "processx", "ps", "R6", "rlang", "waldo", "withr"] + "depends": ["R6", "brio", "callr", "cli", "desc", "digest", "evaluate", "jsonlite", "lifecycle", "magrittr", "pkgload", "praise", "processx", "ps", "rlang", "waldo", "withr"] }, "testthatmulti": { "name": "testthatmulti", @@ -117385,17 +118567,23 @@ "sha256": "06fr13ww2wqk753p0cnl1ldn3nqrvdfnz0lgkpldcn0xwiwjh2x2", "depends": ["mvtnorm"] }, + "tetRys": { + "name": "tetRys", + "version": "1.1", + "sha256": "0xqvkr6lick8isykgdpb9bmag6w19br2k6w26j8zlwa2kf84hw85", + "depends": ["audio"] + }, "tetraclasse": { "name": "tetraclasse", "version": "0.1.21", "sha256": "1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a", - "depends": ["dplyr", "FactoMineR", "ggplot2", "ggrepel", "magrittr", "reshape2", "tibble", "tidyr"] + "depends": ["FactoMineR", "dplyr", "ggplot2", "ggrepel", "magrittr", "reshape2", "tibble", "tidyr"] }, "tetragon": { "name": "tetragon", "version": "1.3.0", "sha256": "0ck7crfa63ra63pbpbq7qvn4kjkbr9wqndin4fd1b4hc8kprqqhx", - "depends": ["abind", "dqrng", "entropy", "fANCOVA", "fastDummies", "ggplot2", "greybox", "imputeTS", "lubridate", "modeest", "moments", "narray", "philentropy", "purrr", "readr", "Rfast", "scales", "stringr", "tictoc"] + "depends": ["Rfast", "abind", "dqrng", "entropy", "fANCOVA", "fastDummies", "ggplot2", "greybox", "imputeTS", "lubridate", "modeest", "moments", "narray", "philentropy", "purrr", "readr", "scales", "stringr", "tictoc"] }, "tetrascatt": { "name": "tetrascatt", @@ -117413,7 +118601,7 @@ "name": "texmex", "version": "2.4.9", "sha256": "1vdrhf4mn7c54w9zz0k4xpmvg9w3ysi67ncbr4pbllnarxa582yz", - "depends": ["ggplot2", "mvtnorm", "Rcpp"] + "depends": ["Rcpp", "ggplot2", "mvtnorm"] }, "texor": { "name": "texor", @@ -117423,14 +118611,14 @@ }, "texreg": { "name": "texreg", - "version": "1.39.3", - "sha256": "0kbdnxfgdin4vydrw84xzbw9xldvn8paikij9ya8976la6gpf6il", + "version": "1.39.4", + "sha256": "1h4377j18rja8mb72779zpj0ls5fxk15qdc92frx2av5c8wxvciy", "depends": ["httr"] }, "text": { "name": "text", - "version": "1.2.1", - "sha256": "06rvcdl06ki3qw46r7yp21jjjbgmmr2cyb0rgr7d1kqcwl12gcg4", + "version": "1.2.3", + "sha256": "0mgjc9yjrb3y1avzdqzx01zbdy1sl7glfgv2yvjrxkw3lw9lwjlb", "depends": ["cowplot", "dplyr", "furrr", "future", "ggplot2", "ggrepel", "magrittr", "overlapping", "parsnip", "purrr", "recipes", "reticulate", "rlang", "rsample", "stringi", "tibble", "tidyr", "tune", "workflows", "yardstick"] }, "text_alignment": { @@ -117443,7 +118631,7 @@ "name": "text2map", "version": "0.2.0", "sha256": "0fs51r2gz2kzyqd9i9vbyyvd8lx9ng40vxw3ncrph22b3vn9q5dl", - "depends": ["ClusterR", "doParallel", "dplyr", "fastmatch", "foreach", "igraph", "kit", "Matrix", "permute", "qgraph", "rlang", "rsvd", "stringi", "text2vec", "tibble"] + "depends": ["ClusterR", "Matrix", "doParallel", "dplyr", "fastmatch", "foreach", "igraph", "kit", "permute", "qgraph", "rlang", "rsvd", "stringi", "text2vec", "tibble"] }, "text2sdg": { "name": "text2sdg", @@ -117467,7 +118655,7 @@ "name": "text2vec", "version": "0.6.4", "sha256": "0sjlvp4zhzwc0ai7626fpw3ws8xv0xhl8gv8mrk24lrpk5nhin2h", - "depends": ["data_table", "digest", "lgr", "Matrix", "mlapi", "R6", "Rcpp", "rsparse", "stringi"] + "depends": ["Matrix", "R6", "Rcpp", "data_table", "digest", "lgr", "mlapi", "rsparse", "stringi"] }, "textBoxPlacement": { "name": "textBoxPlacement", @@ -117479,7 +118667,7 @@ "name": "textTinyR", "version": "1.1.8", "sha256": "15yzxxnnkaj9x94dqpsqy67r7mlh7wdqir5fira8sjr4j1fqx3l1", - "depends": ["BH", "data_table", "Matrix", "R6", "Rcpp", "RcppArmadillo"] + "depends": ["BH", "Matrix", "R6", "Rcpp", "RcppArmadillo", "data_table"] }, "textTools": { "name": "textTools", @@ -117515,7 +118703,7 @@ "name": "texteffect", "version": "0.3", "sha256": "1qcbr18h3vakh6ymw4axzqcqrpss6z68a592xl879b82l2nlq8a7", - "depends": ["boot", "ggplot2", "MASS"] + "depends": ["MASS", "boot", "ggplot2"] }, "texter": { "name": "texter", @@ -117539,13 +118727,13 @@ "name": "textir", "version": "2.0-5", "sha256": "0ban5qiinlxizqpcgafv4b5gwxlil6jdfarjd6l1m48awxh3mlnb", - "depends": ["distrom", "gamlr", "Matrix"] + "depends": ["Matrix", "distrom", "gamlr"] }, "textmineR": { "name": "textmineR", "version": "3.0.5", "sha256": "0qpl9fnrirxsvch97pjwws02x67p3dk6fizg7h4wcjaihibbbx3q", - "depends": ["gtools", "magrittr", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "RSpectra", "stopwords", "stringr", "text2vec"] + "depends": ["Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "RcppProgress", "gtools", "magrittr", "stopwords", "stringr", "text2vec"] }, "textometry": { "name": "textometry", @@ -117557,7 +118745,7 @@ "name": "textplot", "version": "0.2.2", "sha256": "1ag2h365zsx0fxbl05s2yfhf1q13p40akvbqg4qwsb5ynh2a56bf", - "depends": ["data_table", "lattice", "Matrix"] + "depends": ["Matrix", "data_table", "lattice"] }, "textrank": { "name": "textrank", @@ -117575,7 +118763,7 @@ "name": "textrecipes", "version": "1.0.6", "sha256": "0c4l54vqawnwl1341mk5jvqwj1r0dwdprbp2fh362493c8fy04iv", - "depends": ["cpp11", "dplyr", "generics", "glue", "lifecycle", "magrittr", "Matrix", "purrr", "recipes", "rlang", "SnowballC", "tibble", "tokenizers", "vctrs"] + "depends": ["Matrix", "SnowballC", "cpp11", "dplyr", "generics", "glue", "lifecycle", "magrittr", "purrr", "recipes", "rlang", "tibble", "tokenizers", "vctrs"] }, "textreg": { "name": "textreg", @@ -117587,7 +118775,7 @@ "name": "textreuse", "version": "0.1.5", "sha256": "1mva0f6pk0kpfw0vf90qw3a25f1i3imdhk2s7hxyzans0z2237jd", - "depends": ["assertthat", "BH", "digest", "dplyr", "NLP", "Rcpp", "RcppProgress", "stringr", "tibble", "tidyr"] + "depends": ["BH", "NLP", "Rcpp", "RcppProgress", "assertthat", "digest", "dplyr", "stringr", "tibble", "tidyr"] }, "textshape": { "name": "textshape", @@ -117605,7 +118793,7 @@ "name": "textstem", "version": "0.1.4", "sha256": "1pbhi5ia3w16vsix2x3if51zd2v9bcv0j4lj9hfikgq1yz9zxmw2", - "depends": ["dplyr", "hunspell", "koRpus", "koRpus_lang_en", "lexicon", "quanteda", "SnowballC", "stringi", "textclean", "textshape"] + "depends": ["SnowballC", "dplyr", "hunspell", "koRpus", "koRpus_lang_en", "lexicon", "quanteda", "stringi", "textclean", "textshape"] }, "textutils": { "name": "textutils", @@ -117641,7 +118829,7 @@ "name": "tfarima", "version": "0.3.2", "sha256": "1vql4592js9kzv3466dn57dfx19w6i573nh933v2gcnr6mlzhiga", - "depends": ["numDeriv", "Rcpp", "RcppArmadillo", "zoo"] + "depends": ["Rcpp", "RcppArmadillo", "numDeriv", "zoo"] }, "tfautograph": { "name": "tfautograph", @@ -117651,8 +118839,8 @@ }, "tfdatasets": { "name": "tfdatasets", - "version": "2.9.0", - "sha256": "1q8zznwjjx809qvfjg07dhprqcsibzwq9i5sj377y4ypychxq2nl", + "version": "2.17.0", + "sha256": "1bvm1yk204c64ywva672q1pf9safnkyb7jlwaqz9jkgmqa9wwlxy", "depends": ["generics", "magrittr", "reticulate", "rlang", "tensorflow", "tidyselect", "vctrs"] }, "tfdeploy": { @@ -117675,9 +118863,9 @@ }, "tfevents": { "name": "tfevents", - "version": "0.0.3", - "sha256": "1a8dgmi71smaqc71r7pjpdgks6z7s0wkz5nll951846sxkhxpg5v", - "depends": ["blob", "cli", "digest", "ellipsis", "fs", "png", "Rcpp", "rlang", "vctrs", "withr", "zeallot"] + "version": "0.0.4", + "sha256": "06ll43agal3pgq6avfmz5fsf8kzgrh4c2zk823hk80mfpilrskj1", + "depends": ["Rcpp", "blob", "cli", "digest", "fs", "png", "rlang", "vctrs", "withr", "zeallot"] }, "tfhub": { "name": "tfhub", @@ -117717,15 +118905,15 @@ }, "tfrmt": { "name": "tfrmt", - "version": "0.1.1", - "sha256": "1jz5xvmfi53mki0d0jx5bvlmmz2y6pmmasij4c9jgdpd9p57ryaf", + "version": "0.1.2", + "sha256": "19ymfvz9pdlrgz2z6mnwz6w4wk7v3mj1pnfzddsy997ii4qh8y5k", "depends": ["dplyr", "forcats", "ggplot2", "glue", "gt", "jsonlite", "magrittr", "purrr", "rlang", "stringi", "stringr", "tibble", "tidyr", "tidyselect"] }, "tfrmtbuilder": { "name": "tfrmtbuilder", "version": "0.0.6", "sha256": "0c5x0sva90q7ghfz64fjy4w83a549ism6hwl6a1j4j81l9w6p8f7", - "depends": ["bslib", "dplyr", "DT", "fontawesome", "forcats", "gt", "purrr", "rio", "rlang", "shiny", "shinyAce", "shinycssloaders", "shinyFeedback", "shinyjs", "shinyWidgets", "sortable", "stringr", "tfrmt", "tidyr", "webshot2"] + "depends": ["DT", "bslib", "dplyr", "fontawesome", "forcats", "gt", "purrr", "rio", "rlang", "shiny", "shinyAce", "shinyFeedback", "shinyWidgets", "shinycssloaders", "shinyjs", "sortable", "stringr", "tfrmt", "tidyr", "webshot2"] }, "tfruns": { "name": "tfruns", @@ -117755,12 +118943,12 @@ "name": "tglkmeans", "version": "0.5.5", "sha256": "0hdnxgkxpgb8jm9aygv3wlhd42blm5nz906vlpl72blgcyc77hhh", - "depends": ["cli", "doFuture", "doRNG", "dplyr", "future", "ggplot2", "magrittr", "Matrix", "plyr", "purrr", "Rcpp", "RcppParallel", "tgstat", "tibble"] + "depends": ["Matrix", "Rcpp", "RcppParallel", "cli", "doFuture", "doRNG", "dplyr", "future", "ggplot2", "magrittr", "plyr", "purrr", "tgstat", "tibble"] }, "tgp": { "name": "tgp", - "version": "2.4-22", - "sha256": "0gpndjq2xiic6fb5187f4hgrqj3477pd83caajnw3yy9wan4vly6", + "version": "2.4-22.1", + "sha256": "1jf4mr59qp169z00pxb4kc0484mg73hgcyajg9hisdxl02qs1m4r", "depends": ["maptree"] }, "tgram": { @@ -117803,31 +118991,31 @@ "name": "theft", "version": "0.6.1", "sha256": "0fapqgbr3mnag8nvciz6cv7i0xadj8madjzqrd67if3z37afhn0p", - "depends": ["dplyr", "fabletools", "feasts", "purrr", "R_matlab", "Rcatch22", "reticulate", "rlang", "tibble", "tidyr", "tsfeatures", "tsibble"] + "depends": ["R_matlab", "Rcatch22", "dplyr", "fabletools", "feasts", "purrr", "reticulate", "rlang", "tibble", "tidyr", "tsfeatures", "tsibble"] }, "theftdlc": { "name": "theftdlc", "version": "0.1.0", "sha256": "0zv9ihzs41dk4q4wsfyi2v6g9z8gglak17l71bhvqs207rl923d1", - "depends": ["broom", "correctR", "dplyr", "e1071", "ggplot2", "janitor", "MASS", "mclust", "normaliseR", "purrr", "reshape2", "rlang", "Rtsne", "scales", "theft", "tibble", "tidyr", "umap"] + "depends": ["MASS", "Rtsne", "broom", "correctR", "dplyr", "e1071", "ggplot2", "janitor", "mclust", "normaliseR", "purrr", "reshape2", "rlang", "scales", "theft", "tibble", "tidyr", "umap"] }, "theiaR": { "name": "theiaR", "version": "0.4.0", "sha256": "07m532r67cil2ya2w9lfhycrm8n0ga0r3x7jwbp5jbd83hw4l1p6", - "depends": ["askpass", "httr", "R6", "raster", "XML"] + "depends": ["R6", "XML", "askpass", "httr", "raster"] }, "thematic": { "name": "thematic", - "version": "0.1.5", - "sha256": "1ims007m3h9qhfbav21hinqmkgs8kblslr22pvqp19ndlsibllki", + "version": "0.1.6", + "sha256": "00ym9blns25cq6wij8bjgq3g79bllm8h617lvd9ald51q78pd52h", "depends": ["farver", "ggplot2", "rappdirs", "rlang", "rstudioapi", "scales"] }, "themis": { "name": "themis", "version": "1.0.2", "sha256": "1qg1kxax866s84rgjlp2c153793j45lrvay8bqfjnc2cj04h2dgi", - "depends": ["dplyr", "generics", "glue", "gower", "hardhat", "lifecycle", "purrr", "RANN", "recipes", "rlang", "ROSE", "tibble", "vctrs", "withr"] + "depends": ["RANN", "ROSE", "dplyr", "generics", "glue", "gower", "hardhat", "lifecycle", "purrr", "recipes", "rlang", "tibble", "vctrs", "withr"] }, "thermocouple": { "name": "thermocouple", @@ -117861,8 +119049,8 @@ }, "this_path": { "name": "this.path", - "version": "2.4.0", - "sha256": "10zll3bh20wc3swk5y0if1bgx40pjz87yk9z7np5g3wgxp0wzcdv", + "version": "2.5.0", + "sha256": "0ickm26sqlgi6kz8vh92408l04brxqznwrrmhcs2pvk2czj6dr0p", "depends": [] }, "thor": { @@ -117881,7 +119069,7 @@ "name": "thredds", "version": "0.1-4", "sha256": "1323hgd7id4q1g88bczvnghdlb3g2vmywhij0f98ghj0a0ip6v00", - "depends": ["httr", "magrittr", "R6", "rlang", "xml2"] + "depends": ["R6", "httr", "magrittr", "rlang", "xml2"] }, "threejs": { "name": "threejs", @@ -117915,8 +119103,8 @@ }, "threshr": { "name": "threshr", - "version": "1.0.5", - "sha256": "0gr5vnb3bc6b2blpa63mvyhgyjkplq8x0p27h7czjnwinzwsrwrg", + "version": "1.0.6", + "sha256": "1ws40jlc22p4fb0wcczqf5aqgvsq464nr39rdm6vwwz7spvr8vly", "depends": ["revdbayes", "rust"] }, "thriftr": { @@ -117929,13 +119117,13 @@ "name": "thunder", "version": "1.1.3", "sha256": "0gn4kkpagh5blhp1zpgilkpa8mwfz8w05qlri5ca4wwcy7xkmn41", - "depends": ["aiRthermo", "curl", "dplyr", "httr", "Rcpp"] + "depends": ["Rcpp", "aiRthermo", "curl", "dplyr", "httr"] }, "thurstonianIRT": { "name": "thurstonianIRT", "version": "0.12.5", "sha256": "0rdiv9pdxxp36ggxlfs1g6jcv1f259ky2cpxb6kg21s4xfllrah2", - "depends": ["BH", "dplyr", "lavaan", "magrittr", "mvtnorm", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders", "tibble", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "lavaan", "magrittr", "mvtnorm", "rlang", "rstan", "rstantools", "tibble", "tidyr"] }, "tibble": { "name": "tibble", @@ -117947,7 +119135,7 @@ "name": "tibbletime", "version": "0.1.8", "sha256": "18a63vipcw95yk37r490a3a4xag59v7475bch2dizq7nqhfc5wfn", - "depends": ["assertthat", "dplyr", "glue", "hms", "lifecycle", "lubridate", "pillar", "purrr", "Rcpp", "rlang", "tibble", "vctrs", "zoo"] + "depends": ["Rcpp", "assertthat", "dplyr", "glue", "hms", "lifecycle", "lubridate", "pillar", "purrr", "rlang", "tibble", "vctrs", "zoo"] }, "tibblify": { "name": "tibblify", @@ -117989,7 +119177,7 @@ "name": "tidyCDISC", "version": "0.2.1", "sha256": "06pri456bqmvnfna7g092ccd7lqr3bc9gdnw67d7nfz91qwnsny6", - "depends": ["cicerone", "config", "dplyr", "DT", "GGally", "ggcorrplot", "ggplot2", "glue", "golem", "gt", "haven", "IDEAFilter", "plotly", "purrr", "rlang", "rmarkdown", "shiny", "shinyjs", "shinyWidgets", "sjlabelled", "stringr", "survival", "tidyr", "timevis", "tippy"] + "depends": ["DT", "GGally", "IDEAFilter", "cicerone", "config", "dplyr", "ggcorrplot", "ggplot2", "glue", "golem", "gt", "haven", "plotly", "purrr", "rlang", "rmarkdown", "shiny", "shinyWidgets", "shinyjs", "sjlabelled", "stringr", "survival", "tidyr", "timevis", "tippy"] }, "tidyCpp": { "name": "tidyCpp", @@ -118007,7 +119195,7 @@ "name": "tidyEdSurvey", "version": "0.1.3", "sha256": "0vimgaq09dbz78i68ks5p3wiiahl59grdcvbg4bgdq3147pbmd3k", - "depends": ["cli", "dplyr", "EdSurvey", "ggplot2", "lifecycle", "rlang", "tidyselect"] + "depends": ["EdSurvey", "cli", "dplyr", "ggplot2", "lifecycle", "rlang", "tidyselect"] }, "tidyEmoji": { "name": "tidyEmoji", @@ -118019,13 +119207,13 @@ "name": "tidyHeatmap", "version": "1.8.1", "sha256": "19gpp8p3ms60qzny26vx8h7x4zl495ynrfrvf1nndhm2njbx6i4m", - "depends": ["circlize", "ComplexHeatmap", "dendextend", "dplyr", "lifecycle", "magrittr", "patchwork", "purrr", "RColorBrewer", "rlang", "tibble", "tidyr", "viridis"] + "depends": ["ComplexHeatmap", "RColorBrewer", "circlize", "dendextend", "dplyr", "lifecycle", "magrittr", "patchwork", "purrr", "rlang", "tibble", "tidyr", "viridis"] }, "tidyLPA": { "name": "tidyLPA", "version": "1.1.0", "sha256": "1lyd8cx90j49bm65330i57jyimiid75c2pvnzk7dcp6mbmglvimz", - "depends": ["dplyr", "ggplot2", "gtable", "mclust", "mix", "MplusAutomation", "tibble"] + "depends": ["MplusAutomation", "dplyr", "ggplot2", "gtable", "mclust", "mix", "tibble"] }, "tidyMC": { "name": "tidyMC", @@ -118037,7 +119225,7 @@ "name": "tidyREDCap", "version": "1.1.1", "sha256": "1k06bnxvq5k4j005h269n5ivxn1vr2i8nkdg048q8m7vmpanwz4m", - "depends": ["cli", "dplyr", "janitor", "labelVector", "magrittr", "purrr", "REDCapR", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] + "depends": ["REDCapR", "cli", "dplyr", "janitor", "labelVector", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"] }, "tidyRSS": { "name": "tidyRSS", @@ -118049,7 +119237,7 @@ "name": "tidySEM", "version": "0.2.7", "sha256": "1da0hpapns93a1znlq8gh1nmjczczy4sg4c14kikkxhar1wq4lrk", - "depends": ["bain", "blavaan", "car", "dbscan", "future_apply", "ggplot2", "gtable", "igraph", "lavaan", "Matrix", "MplusAutomation", "nonnest2", "OpenMx", "progressr", "psych", "RANN"] + "depends": ["Matrix", "MplusAutomation", "OpenMx", "RANN", "bain", "blavaan", "car", "dbscan", "future_apply", "ggplot2", "gtable", "igraph", "lavaan", "nonnest2", "progressr", "psych"] }, "tidyUSDA": { "name": "tidyUSDA", @@ -118067,7 +119255,7 @@ "name": "tidybins", "version": "0.1.1", "sha256": "11213qv79qlqlkxh10y3vhidy120f9gyfwj4xqbr6w3wqa5cjg60", - "depends": ["autostats", "badger", "ClusterR", "dplyr", "framecleaner", "ggplot2", "janitor", "lubridate", "magrittr", "OneR", "purrr", "rlang", "rlist", "scales", "strex", "stringr", "tibble", "tidyselect", "xgboost"] + "depends": ["ClusterR", "OneR", "autostats", "badger", "dplyr", "framecleaner", "ggplot2", "janitor", "lubridate", "magrittr", "purrr", "rlang", "rlist", "scales", "strex", "stringr", "tibble", "tidyselect", "xgboost"] }, "tidyboot": { "name": "tidyboot", @@ -118083,8 +119271,8 @@ }, "tidycensus": { "name": "tidycensus", - "version": "1.6.3", - "sha256": "160swqjrcfkqrjpgvyxqqpvm2xnbb1yr0jb89w9mva4mmlnncfj4", + "version": "1.6.5", + "sha256": "08pi8pzxvlprjii11xrfw1kyqpyvx9wh9zkcbw1zh77jxxp40imq", "depends": ["crayon", "dplyr", "httr", "jsonlite", "purrr", "rappdirs", "readr", "rlang", "rvest", "sf", "stringr", "tidyr", "tidyselect", "tigris", "units", "xml2"] }, "tidycharts": { @@ -118095,14 +119283,14 @@ }, "tidyclust": { "name": "tidyclust", - "version": "0.2.1", - "sha256": "0v4hlgmjya6w0jb091qh1hv47xgqx79xvr0ddlz9hnv23rxrrbsf", - "depends": ["cli", "dials", "dplyr", "flexclust", "foreach", "generics", "glue", "hardhat", "modelenv", "parsnip", "prettyunits", "Rfast", "rlang", "rsample", "tibble", "tidyr", "tune", "vctrs"] + "version": "0.2.3", + "sha256": "1z5fhs4ws7cbvsxkwcd4plj968glfing2jgy2hqs1m49di8gjrib", + "depends": ["Rfast", "cli", "dials", "dplyr", "flexclust", "foreach", "generics", "glue", "hardhat", "modelenv", "parsnip", "prettyunits", "rlang", "rsample", "tibble", "tidyr", "tune", "vctrs"] }, "tidycmprsk": { "name": "tidycmprsk", - "version": "1.0.0", - "sha256": "15a3v0lmqnqf3zc0mdjrxpvm02r20fbmh7ma3y1myl00gs7swv8l", + "version": "1.1.0", + "sha256": "1w88zz5wscb25j59hx1bzlmf13mh8wqngkffnhmp6vwn1a53i8lx", "depends": ["broom", "cli", "cmprsk", "dplyr", "ggplot2", "gtsummary", "hardhat", "purrr", "rlang", "stringr", "survival", "tibble", "tidyr"] }, "tidycode": { @@ -118115,7 +119303,7 @@ "name": "tidycomm", "version": "0.4.1", "sha256": "07izzm2ywdjs8z4yfkrrdy0mn54vqc3gnpiymgag8wkxsmxqpz64", - "depends": ["car", "dplyr", "fastDummies", "forcats", "GGally", "ggplot2", "glue", "lm_beta", "lubridate", "magrittr", "MASS", "MBESS", "misty", "pillar", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["GGally", "MASS", "MBESS", "car", "dplyr", "fastDummies", "forcats", "ggplot2", "glue", "lm_beta", "lubridate", "magrittr", "misty", "pillar", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"] }, "tidycwl": { "name": "tidycwl", @@ -118135,6 +119323,12 @@ "sha256": "0d7qr1j5ag6ikzq89xc7w9pvsbcp14r0x8ra9v4svx59bg31n94q", "depends": ["clipr", "knitr", "rstudioapi"] }, + "tidydelta": { + "name": "tidydelta", + "version": "0.1.0", + "sha256": "0my8mxk9gx2pk3hjnd50gd6322i1l1ll4z3l4k2mr2nahbdfhbwh", + "depends": ["cli", "dplyr", "numDeriv", "purrr", "rlang", "tibble"] + }, "tidydice": { "name": "tidydice", "version": "1.0.0", @@ -118167,15 +119361,15 @@ }, "tidyfinance": { "name": "tidyfinance", - "version": "0.2.0", - "sha256": "1vch27q03gg447hkndl55fgmwxl0ggq524zbrkslj1cf9dzs9r20", - "depends": ["dplyr", "lifecycle", "lubridate", "purrr", "rlang", "tibble", "tidyr"] + "version": "0.3.0", + "sha256": "01vk9h6p4kk9qh07c8mhwk6267j6p05lblc74zmwxqcfblf0zymn", + "depends": ["dplyr", "lifecycle", "lubridate", "purrr", "rlang", "tidyr"] }, "tidyfit": { "name": "tidyfit", "version": "0.7.1", "sha256": "117x0cmrs0hhp0k4c2c6dx80jjvar7bfgipjzx5d977l4343fhx7", - "depends": ["broom", "crayon", "dials", "dplyr", "furrr", "generics", "magrittr", "MASS", "progressr", "purrr", "rlang", "rsample", "tibble", "tidyr", "vctrs", "yardstick"] + "depends": ["MASS", "broom", "crayon", "dials", "dplyr", "furrr", "generics", "magrittr", "progressr", "purrr", "rlang", "rsample", "tibble", "tidyr", "vctrs", "yardstick"] }, "tidyformula": { "name": "tidyformula", @@ -118207,11 +119401,17 @@ "sha256": "1m6bynwnw1msrzvdmy12w3ympinqpd8j3may3rwmg9941nndjv2d", "depends": ["data_table", "dplyr", "readxl", "tidyr"] }, + "tidygate": { + "name": "tidygate", + "version": "1.0.13", + "sha256": "1ighc3193ifvk3qisxinlgkw3p70ap64w7skspms648x7n89bb4a", + "depends": ["RColorBrewer", "dplyr", "ggplot2", "lifecycle", "magrittr", "plotly", "purrr", "rlang", "scales", "shiny", "stringr", "tibble", "tidyr", "viridis"] + }, "tidygenomics": { "name": "tidygenomics", "version": "0.1.2", "sha256": "1cnwmmmzp9kg4k7iy2kgb22bdllpnz257pv1ahy3l11zy6bl48fc", - "depends": ["dplyr", "fuzzyjoin", "IRanges", "purrr", "Rcpp", "rlang", "tidyr"] + "depends": ["IRanges", "Rcpp", "dplyr", "fuzzyjoin", "purrr", "rlang", "tidyr"] }, "tidygeoRSS": { "name": "tidygeoRSS", @@ -118229,25 +119429,25 @@ "name": "tidygraph", "version": "1.3.1", "sha256": "06mc31yb771midi8lq0zdfymcsm2s4y1mqdxxjz1n24njfxx9hda", - "depends": ["cli", "cpp11", "dplyr", "igraph", "lifecycle", "magrittr", "pillar", "R6", "rlang", "tibble", "tidyr"] + "depends": ["R6", "cli", "cpp11", "dplyr", "igraph", "lifecycle", "magrittr", "pillar", "rlang", "tibble", "tidyr"] }, "tidyheatmaps": { "name": "tidyheatmaps", "version": "0.2.1", "sha256": "158vr8miwmg7i673vk0kpvr79k4ad4ivj8gy612ffqjsg31ws2dn", - "depends": ["dplyr", "pheatmap", "RColorBrewer", "rlang", "tibble", "tidyr"] + "depends": ["RColorBrewer", "dplyr", "pheatmap", "rlang", "tibble", "tidyr"] }, "tidyhte": { "name": "tidyhte", "version": "1.0.2", "sha256": "0c19b7yh09gixgicrr7x65a9vzyvzapr4pv130ysx4jksjcqvdfp", - "depends": ["checkmate", "dplyr", "lifecycle", "magrittr", "progress", "purrr", "R6", "rlang", "SuperLearner", "tibble"] + "depends": ["R6", "SuperLearner", "checkmate", "dplyr", "lifecycle", "magrittr", "progress", "purrr", "rlang", "tibble"] }, "tidyhydat": { "name": "tidyhydat", "version": "0.6.1", "sha256": "0rcb3q17ckp7l7xrjf3r32dlnxm6ykwlk20w5h7amnc2vimjnir9", - "depends": ["cli", "crayon", "DBI", "dbplyr", "dplyr", "httr", "lubridate", "rappdirs", "readr", "rlang", "RSQLite", "tidyr"] + "depends": ["DBI", "RSQLite", "cli", "crayon", "dbplyr", "dplyr", "httr", "lubridate", "rappdirs", "readr", "rlang", "tidyr"] }, "tidyindex": { "name": "tidyindex", @@ -118265,7 +119465,7 @@ "name": "tidylda", "version": "0.0.5", "sha256": "1i5nhb49g5sw5dwha7ia61yp5nnqi9bln35ij0smhrrfjwxz5djp", - "depends": ["dplyr", "generics", "gtools", "Matrix", "mvrsquared", "Rcpp", "RcppArmadillo", "RcppProgress", "RcppThread", "rlang", "stringr", "tibble", "tidyr", "tidytext"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "RcppThread", "dplyr", "generics", "gtools", "mvrsquared", "rlang", "stringr", "tibble", "tidyr", "tidytext"] }, "tidylo": { "name": "tidylo", @@ -118293,9 +119493,9 @@ }, "tidync": { "name": "tidync", - "version": "0.3.0", - "sha256": "0w8i8h3rr7mjxbc5zasw6zi9v95z51635pdl91ip4awgkrkyn9f3", - "depends": ["dplyr", "forcats", "magrittr", "ncdf4", "ncmeta", "purrr", "rlang", "RNetCDF", "tibble", "tidyr"] + "version": "0.4.0", + "sha256": "0rm62pcxchknaz0bgfy1fcam33asspbzhwf03jx9vl5vx78ymk04", + "depends": ["CFtime", "RNetCDF", "dplyr", "forcats", "magrittr", "ncdf4", "ncmeta", "purrr", "rlang", "tibble", "tidyr"] }, "tidypaleo": { "name": "tidypaleo", @@ -118337,7 +119537,7 @@ "name": "tidyquant", "version": "1.0.7", "sha256": "1pb7d6x2b8kf16aah1n9kq4il4kp54lcvzd27r5viwdbgvk1sr4h", - "depends": ["alphavantager", "curl", "dplyr", "ggplot2", "httr", "jsonlite", "lazyeval", "lubridate", "magrittr", "PerformanceAnalytics", "purrr", "Quandl", "quantmod", "readr", "readxl", "riingo", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "tidyverse", "timeDate", "timetk", "TTR", "xts"] + "depends": ["PerformanceAnalytics", "Quandl", "TTR", "alphavantager", "curl", "dplyr", "ggplot2", "httr", "jsonlite", "lazyeval", "lubridate", "magrittr", "purrr", "quantmod", "readr", "readxl", "riingo", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "tidyverse", "timeDate", "timetk", "xts"] }, "tidyquery": { "name": "tidyquery", @@ -118365,14 +119565,14 @@ }, "tidyrules": { "name": "tidyrules", - "version": "0.1.5", - "sha256": "04y6pnrp132sckjpp9g8yl0z7glcsx9dcfdpa8r27wsc2g491i63", - "depends": ["assertthat", "magrittr", "partykit", "purrr", "stringr", "tibble"] + "version": "0.2.7", + "sha256": "1h81bffqshasfgjdy9rlvi6jqd89r933p324x172mzcpqkvp484n", + "depends": ["DescTools", "MetricsWeighted", "checkmate", "cli", "data_table", "generics", "glue", "magrittr", "partykit", "pheatmap", "proxy", "purrr", "rlang", "stringr", "tibble", "tidytable"] }, "tidysdm": { "name": "tidysdm", - "version": "0.9.4", - "sha256": "14z6qawbqhs77m842bj1ls9cnb7v35vs6aqbvha0s7kkqlcs1k7l", + "version": "0.9.5", + "sha256": "0vpxral92mnaisz39nkib6mpllwpaw38s9qaly1djyxm8s4lrl48", "depends": ["DALEX", "DALEXtra", "dials", "dplyr", "ggplot2", "lubridate", "magrittr", "maxnet", "parsnip", "patchwork", "recipes", "rlang", "rsample", "sf", "spatialsample", "terra", "tibble", "tidymodels", "tune", "workflows", "workflowsets", "yardstick"] }, "tidyselect": { @@ -118385,7 +119585,7 @@ "name": "tidyseurat", "version": "0.8.0", "sha256": "0xm1vls01d6pcsh824w6li8wp9nf5xrxm9ranrx673vjkjrdwilf", - "depends": ["cli", "dplyr", "ellipsis", "fansi", "ggplot2", "lifecycle", "magrittr", "Matrix", "pillar", "plotly", "purrr", "rlang", "Seurat", "SeuratObject", "stringr", "tibble", "tidyr", "tidyselect", "ttservice", "vctrs"] + "depends": ["Matrix", "Seurat", "SeuratObject", "cli", "dplyr", "ellipsis", "fansi", "ggplot2", "lifecycle", "magrittr", "pillar", "plotly", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "ttservice", "vctrs"] }, "tidysmd": { "name": "tidysmd", @@ -118397,12 +119597,12 @@ "name": "tidysq", "version": "1.1.3", "sha256": "1k4ws5zymrc93rlh8118xxfgjdwr7g99cyhzjp34abcsip1c3g21", - "depends": ["checkmate", "cli", "crayon", "dplyr", "pillar", "Rcpp", "testthat", "tibble", "vctrs"] + "depends": ["Rcpp", "checkmate", "cli", "crayon", "dplyr", "pillar", "testthat", "tibble", "vctrs"] }, "tidystats": { "name": "tidystats", - "version": "0.6.1", - "sha256": "1cq4xkmjk2q9fds8m21l4dhmr9jivk9n1g199kn3jprjwfydhy96", + "version": "0.6.2", + "sha256": "0y9l72915cq7dkdw7c4l931niq9rdadjvgr8w33s05a5vawg3w40", "depends": ["checkmate", "dplyr", "jsonlite", "purrr", "readr", "stringr", "tibble", "tidyr"] }, "tidystopwords": { @@ -118425,8 +119625,8 @@ }, "tidytable": { "name": "tidytable", - "version": "0.11.0", - "sha256": "09xcjh9vpkz6bcv8rg8g25rpirvsjvbl282ys6y1r1npgb3mrdgm", + "version": "0.11.1", + "sha256": "0mhwfa8zaljnsxm5bkhkfjy3v5a4hlf55qjvy840rgyyw06vfw06", "depends": ["data_table", "glue", "lifecycle", "magrittr", "pillar", "rlang", "tidyselect", "vctrs"] }, "tidyterra": { @@ -118439,7 +119639,7 @@ "name": "tidytext", "version": "0.4.2", "sha256": "0m1dxlrmkany4pjbr2p2m9hzn59gldmznyvs6dcb3zdr5861ix0c", - "depends": ["cli", "dplyr", "generics", "janeaustenr", "lifecycle", "Matrix", "purrr", "rlang", "stringr", "tibble", "tokenizers", "vctrs"] + "depends": ["Matrix", "cli", "dplyr", "generics", "janeaustenr", "lifecycle", "purrr", "rlang", "stringr", "tibble", "tokenizers", "vctrs"] }, "tidytidbits": { "name": "tidytidbits", @@ -118491,15 +119691,15 @@ }, "tidywikidatar": { "name": "tidywikidatar", - "version": "0.5.8", - "sha256": "1f6651nh98assi6wr6k1qp55bspqln83arz6di1fx8p7mlkrh8li", - "depends": ["cli", "DBI", "dplyr", "fs", "glue", "jsonlite", "magrittr", "pool", "progress", "purrr", "rlang", "RSQLite", "stringr", "tibble", "tidyr", "vctrs", "WikidataQueryServiceR", "WikidataR", "WikipediR"] + "version": "0.5.9", + "sha256": "1ff5qlz4h99d7x1pcjcji5li2421mlr55yfv6b32165f1yrkm8qw", + "depends": ["DBI", "RSQLite", "WikidataQueryServiceR", "WikidataR", "cli", "dplyr", "fs", "glue", "httr2", "jsonlite", "magrittr", "pool", "progress", "purrr", "rlang", "stringr", "tibble", "tidyr", "vctrs"] }, "tidyxl": { "name": "tidyxl", "version": "1.0.10", "sha256": "1y8bbll3mhxb2drdraymblzw8gjxym2lrj90fg2z75rn00lnwf8f", - "depends": ["piton", "Rcpp"] + "depends": ["Rcpp", "piton"] }, "tiff": { "name": "tiff", @@ -118523,7 +119723,7 @@ "name": "tigerstats", "version": "0.3.2", "sha256": "0p5z4qh0aznj03rnhk4lpqfkwnsa5zgvj51rddkzligg9zx73xwl", - "depends": ["abd", "ggplot2", "lattice", "manipulate", "MASS", "mosaic", "mosaicData", "rlang"] + "depends": ["MASS", "abd", "ggplot2", "lattice", "manipulate", "mosaic", "mosaicData", "rlang"] }, "tigger": { "name": "tigger", @@ -118569,9 +119769,9 @@ }, "tiledb": { "name": "tiledb", - "version": "0.28.0", - "sha256": "1m4larx3d6si1283hza8pvf0z49rb7h2v3dv5bn9mm6cf82xm5fx", - "depends": ["nanoarrow", "nanotime", "Rcpp", "RcppInt64", "spdl"] + "version": "0.29.0", + "sha256": "1fzmsgn9x4z5ya7rrb83nlwarjswbq5gpjb0lka0xldmdzl9f22j", + "depends": ["Rcpp", "RcppInt64", "nanoarrow", "nanotime", "spdl"] }, "tilegramsR": { "name": "tilegramsR", @@ -118631,13 +119831,13 @@ "name": "timeLineGraphics", "version": "1.0", "sha256": "06i2palpc19g0480d53232fj4jd5j0brhdkmj5vcr6p58qsvhyhm", - "depends": ["berryFunctions", "magick", "pdftools", "R2HTML"] + "depends": ["R2HTML", "berryFunctions", "magick", "pdftools"] }, "timeR": { "name": "timeR", "version": "1.2.0", "sha256": "0lkx2ilbzq29w1c9ssya4f0za0sj7y30y9ml4v3zc21c1la0b6vi", - "depends": ["lubridate", "R6"] + "depends": ["R6", "lubridate"] }, "timeROC": { "name": "timeROC", @@ -118671,8 +119871,8 @@ }, "timeless": { "name": "timeless", - "version": "0.2.1", - "sha256": "061pfg9p15kywzwmg7mfacj9mdrcn7zxlspb7fjfnmcay40v39n7", + "version": "0.2.3", + "sha256": "0wq98ngwn9ajgxmc1ybfgzmxr21jsvjqsc3crrkska7vpzxpjy11", "depends": [] }, "timelineS": { @@ -118695,8 +119895,8 @@ }, "timeplyr": { "name": "timeplyr", - "version": "0.8.1", - "sha256": "0ghr0vrg53fgxmi1w8lx7nfrfxfxhcd4rbi2qrk6pl254n41zwm7", + "version": "0.8.2", + "sha256": "1fcczr3q7c1sqwsk2i4vqy8bpipzvl5f99j1q972c3syzyas0rqa", "depends": ["cheapr", "collapse", "cpp11", "cppdoubles", "data_table", "dplyr", "ggplot2", "lubridate", "pillar", "rlang", "scales", "stringr", "tidyselect", "timechange", "vctrs"] }, "timereg": { @@ -118709,7 +119909,7 @@ "name": "timeseriesdb", "version": "1.0.0-1.1.2", "sha256": "17j1nxpgbfbzmfc6zrgcw68ri9ncslic9qdkxkdpfr2gi1w61bpc", - "depends": ["data_table", "DBI", "jsonlite", "RPostgres", "xts"] + "depends": ["DBI", "RPostgres", "data_table", "jsonlite", "xts"] }, "timetk": { "name": "timetk", @@ -118745,7 +119945,7 @@ "name": "tinkr", "version": "0.2.0", "sha256": "068ym4a0gwayd6a86zq6428j8gkmvxgm7hk0crbjp0lp9cz85dzq", - "depends": ["commonmark", "glue", "magrittr", "purrr", "R6", "xml2", "xslt", "yaml"] + "depends": ["R6", "commonmark", "glue", "magrittr", "purrr", "xml2", "xslt", "yaml"] }, "tinsel": { "name": "tinsel", @@ -118769,18 +119969,18 @@ "name": "tinyProject", "version": "0.6.1", "sha256": "0cflnfp5mib3j1y3n5yvi867h5a7z6xr6163gq9y9b6nrl2skxfk", - "depends": ["brew", "R_utils"] + "depends": ["R_utils", "brew"] }, "tinyarray": { "name": "tinyarray", "version": "2.4.2", "sha256": "188zc58yb68jyw3dw7y323slnlgl7872icrwf3zl6s7rm44dmljc", - "depends": ["BiocManager", "clusterProfiler", "dplyr", "ggplot2", "Hmisc", "limma", "patchwork", "pheatmap", "stringr", "survival", "survminer", "tibble"] + "depends": ["BiocManager", "Hmisc", "clusterProfiler", "dplyr", "ggplot2", "limma", "patchwork", "pheatmap", "stringr", "survival", "survminer", "tibble"] }, "tinycodet": { "name": "tinycodet", - "version": "0.5.0", - "sha256": "1zw9f0586mf78hs115l6bib6c3r1d5n8c9mgyxhqc52vdxv0cqhn", + "version": "0.5.3", + "sha256": "0pc0dlp5s96g37bm1d8fy64rmg8ji4ysr98wd6yddx4j3vghlm9d", "depends": ["Rcpp", "stringi"] }, "tinylabels": { @@ -118789,11 +119989,17 @@ "sha256": "01pvnirma3wzfqnnz8zvyqajjyysjm3sd6813bgdhz199lcg7hhz", "depends": [] }, + "tinyplot": { + "name": "tinyplot", + "version": "0.2.0", + "sha256": "0cd934pzrfg49f1l4pm2g8r83h8zzid23brh2jyl5ydlmfks1zmy", + "depends": [] + }, "tinyscholar": { "name": "tinyscholar", "version": "0.1.7", "sha256": "0cd9xbm1gk0v241fqa42hly40vkqb6hcvi8jp9iqq8sgmrs33adh", - "depends": ["curl", "dplyr", "ggplot2", "gt", "jsonlite", "magrittr", "purrr", "R_utils", "rlang", "rvest", "stringr", "xml2"] + "depends": ["R_utils", "curl", "dplyr", "ggplot2", "gt", "jsonlite", "magrittr", "purrr", "rlang", "rvest", "stringr", "xml2"] }, "tinysnapshot": { "name": "tinysnapshot", @@ -118827,8 +120033,8 @@ }, "tinytex": { "name": "tinytex", - "version": "0.51", - "sha256": "1sn8fkmz01x0igsh7ynkqsl5h50ccl4xf8025a87i3mmni8kn4dv", + "version": "0.52", + "sha256": "0fji3yca7qpxpzdd8hy55v0g40jny41qvhz8d64gwlnxkwxp2alk", "depends": ["xfun"] }, "tinythemes": { @@ -118847,7 +120053,7 @@ "name": "tip", "version": "0.1.0", "sha256": "11khhkszd5a81q0h6acx5rvp1k97qj1srcvz2jilwf3v6nrz7daz", - "depends": ["changepoint", "doParallel", "foreach", "GGally", "ggplot2", "igraph", "LaplacesDemon", "mniw", "network", "rlang"] + "depends": ["GGally", "LaplacesDemon", "changepoint", "doParallel", "foreach", "ggplot2", "igraph", "mniw", "network", "rlang"] }, "tipa": { "name": "tipa", @@ -118865,7 +120071,7 @@ "name": "tipmap", "version": "0.5.2", "sha256": "11wznnhv1jf0g72ahdcxvxm4n3kpdbx6ivdx9cb0c5gdyjh482ss", - "depends": ["assertthat", "dplyr", "furrr", "future", "ggplot2", "magrittr", "purrr", "RBesT"] + "depends": ["RBesT", "assertthat", "dplyr", "furrr", "future", "ggplot2", "magrittr", "purrr"] }, "tippy": { "name": "tippy", @@ -118881,9 +120087,9 @@ }, "tipsae": { "name": "tipsae", - "version": "1.0.1", - "sha256": "1ay67c3hlfzzflzcjwh9jqmy70jbvxp0bri1cc8vvs3ipdinygg9", - "depends": ["BH", "ggplot2", "ggpubr", "nlme", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "rstan", "shiny", "sp", "StanHeaders"] + "version": "1.0.2", + "sha256": "14x5g5qc1lnc2p0vkmf8vs7gkjlbkahgaf38j9q23xx8dizym6w9", + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "ggplot2", "ggpubr", "nlme", "rstan", "shiny", "sp"] }, "tis": { "name": "tis", @@ -118959,8 +120165,8 @@ }, "tm": { "name": "tm", - "version": "0.7-13", - "sha256": "1d0xczmmfsj82183nygvb4f9h1qbydz763b3jlzxb6ns8pi6q9p5", + "version": "0.7-14", + "sha256": "103n9m9vh1s1fn2wlab5qm4i1dx4wq0ffl7v69mwa6mvdklfw7ks", "depends": ["BH", "NLP", "Rcpp", "slam", "xml2"] }, "tm_plugin_alceste": { @@ -118979,7 +120185,7 @@ "name": "tm.plugin.europresse", "version": "1.4", "sha256": "03qi9rkfwgjvir4cjpi9imc8zaldvan42v9lqfr5d6zhr0ajy6wx", - "depends": ["NLP", "tm", "XML"] + "depends": ["NLP", "XML", "tm"] }, "tm_plugin_factiva": { "name": "tm.plugin.factiva", @@ -118991,7 +120197,7 @@ "name": "tm.plugin.koRpus", "version": "0.4-2", "sha256": "132w4rji68y1ddy93844n2ks5z059a16lqy71vcrxm6wcdn2w3hq", - "depends": ["koRpus", "NLP", "sylly", "tm"] + "depends": ["NLP", "koRpus", "sylly", "tm"] }, "tm_plugin_lexisnexis": { "name": "tm.plugin.lexisnexis", @@ -119001,9 +120207,9 @@ }, "tm_plugin_mail": { "name": "tm.plugin.mail", - "version": "0.2-2", - "sha256": "03d0y19yn4akkcjlyc17rb2r9nv8rfnqx1l8i5gp07w5s8czvfxf", - "depends": ["NLP", "tm"] + "version": "0.3-0", + "sha256": "02gbpdqi9cqk0na7ali1wwjapnf497hwv3k8mx354496pcrbi8m5", + "depends": ["NLP", "reticulate", "tm"] }, "tm1r": { "name": "tm1r", @@ -119015,19 +120221,19 @@ "name": "tmap", "version": "3.3-4", "sha256": "1xxa9ya1gci4ys5z00v95kp39rq12vd8kppj8j8n1a913kbbqrn9", - "depends": ["abind", "classInt", "htmltools", "htmlwidgets", "leafem", "leaflet", "leafsync", "RColorBrewer", "rlang", "sf", "stars", "tmaptools", "units", "viridisLite", "widgetframe"] + "depends": ["RColorBrewer", "abind", "classInt", "htmltools", "htmlwidgets", "leafem", "leaflet", "leafsync", "rlang", "sf", "stars", "tmaptools", "units", "viridisLite", "widgetframe"] }, "tmaptools": { "name": "tmaptools", "version": "3.1-1", "sha256": "0bal3czrdr93qig8s5cf5szld5vjbbks67rismfhlkmlgw6wp2gx", - "depends": ["dichromat", "lwgeom", "magrittr", "RColorBrewer", "sf", "stars", "units", "viridisLite", "XML"] + "depends": ["RColorBrewer", "XML", "dichromat", "lwgeom", "magrittr", "sf", "stars", "units", "viridisLite"] }, "tmbstan": { "name": "tmbstan", "version": "1.0.91", "sha256": "0wsa1999iaxzzbh27xmw8qfka1hzfi81kf6p3zlhfq8299vrg4py", - "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "StanHeaders", "TMB"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "TMB", "rstan"] }, "tmcn": { "name": "tmcn", @@ -119039,13 +120245,13 @@ "name": "tmle", "version": "2.0.1.1", "sha256": "1xl71md4rld9yk0z47qki1pg4mhgblmc9adqzwd2157dfvqlh94c", - "depends": ["glmnet", "SuperLearner"] + "depends": ["SuperLearner", "glmnet"] }, "tmod": { "name": "tmod", "version": "0.50.13", "sha256": "160aibvkz4ilyaig3bvkam6g96cngaynwsfrzh6vpq9xyraqxpix", - "depends": ["beeswarm", "ggplot2", "ggrepel", "gplots", "pheatmap", "plotwidgets", "purrr", "RColorBrewer", "rlang", "tagcloud", "tibble", "tidyr", "tidyselect", "XML"] + "depends": ["RColorBrewer", "XML", "beeswarm", "ggplot2", "ggrepel", "gplots", "pheatmap", "plotwidgets", "purrr", "rlang", "tagcloud", "tibble", "tidyr", "tidyselect"] }, "tmplate": { "name": "tmplate", @@ -119069,7 +120275,7 @@ "name": "tmt", "version": "0.3.4-0", "sha256": "0n0wrgrf99bvlwbgjgx3sa8icmjqy1swc0ck3l1yja228qc26179", - "depends": ["ggplot2", "Rcpp", "rlang"] + "depends": ["Rcpp", "ggplot2", "rlang"] }, "tmvmixnorm": { "name": "tmvmixnorm", @@ -119087,7 +120293,7 @@ "name": "tmvtnorm", "version": "1.6", "sha256": "1fhvisddn3x4li2q12c3hss0cj735c0iq32c9cw646ni619jr6rd", - "depends": ["gmm", "Matrix", "mvtnorm"] + "depends": ["Matrix", "gmm", "mvtnorm"] }, "tmvtnsim": { "name": "tmvtnsim", @@ -119139,9 +120345,9 @@ }, "tok": { "name": "tok", - "version": "0.1.1", - "sha256": "1rbn5b6gc5qx8d8rggxbvcs2phrdxj9r72sl6l75vpn4hh4ffpi6", - "depends": ["cli", "R6"] + "version": "0.1.3", + "sha256": "0grnqf0k8vlyfsy8nwaawbyd91l6j8kyvny3cnn8xjgws0pyslli", + "depends": ["R6", "cli"] }, "tokenbrowser": { "name": "tokenbrowser", @@ -119183,7 +120389,7 @@ "name": "toolStability", "version": "0.1.2", "sha256": "032czpmr484jm10i0pz9f3jyzkqrz5s11q2nxrhk8jrlg0s427lr", - "depends": ["data_table", "dplyr", "nortest", "Rdpack"] + "depends": ["Rdpack", "data_table", "dplyr", "nortest"] }, "toolbox": { "name": "toolbox", @@ -119205,8 +120411,8 @@ }, "topChef": { "name": "topChef", - "version": "0.1.0", - "sha256": "13gqifd3l47pand0bf0993x6fhm9vgj3l95lkc055rq3ffzpdyl4", + "version": "0.2.0", + "sha256": "0nad6a8iqgpyjj8hxj9lk48y4dvqiak267ikmjgv1avwayc4sa16", "depends": ["dplyr", "tidyr"] }, "topdowntimeratio": { @@ -119221,10 +120427,16 @@ "sha256": "195yly7r14cpavbbr02iq3lqfb0gcx5cngfigivnid1rk45wv7bz", "depends": ["slam", "topicmodels"] }, + "topiclabels": { + "name": "topiclabels", + "version": "0.1.0", + "sha256": "0x56bgm609xzx844j0qamyix3nr8ziqzj5rd33qgj023gfgrhg8i", + "depends": ["checkmate", "httr", "jsonlite", "progress"] + }, "topicmodels": { "name": "topicmodels", - "version": "0.2-16", - "sha256": "01g9avk0ldqnz15n8112vad31c1n7r6rih5dh6x3383vvmjrqp0d", + "version": "0.2-17", + "sha256": "138nsmwgg3npk3i78xagpm6fw1g4ixmikan1jmv3066kymgy2rrq", "depends": ["modeltools", "slam", "tm"] }, "topicmodels_etm": { @@ -119243,13 +120455,13 @@ "name": "topoDistance", "version": "1.0.2", "sha256": "1n6108giihc4aa1871m558s2z96m766ysvhak5b6zg1bnvpdj0l8", - "depends": ["gdistance", "plotly", "raster", "RColorBrewer", "scales", "sp"] + "depends": ["RColorBrewer", "gdistance", "plotly", "raster", "scales", "sp"] }, "topologyGSA": { "name": "topologyGSA", "version": "1.5.0", "sha256": "1pzyn916wllmry2gzwp6fhhcd3fjz7k4jlgsgqs3c2b2g0vqknm2", - "depends": ["fields", "graph", "gRbase", "igraph", "qpgraph"] + "depends": ["fields", "gRbase", "graph", "igraph", "qpgraph"] }, "toposort": { "name": "toposort", @@ -119259,8 +120471,8 @@ }, "topr": { "name": "topr", - "version": "2.0.1", - "sha256": "19n18m370dl8hginswwgamr4daj7ci4spjgdli3zk5glcqqq9a45", + "version": "2.0.2", + "sha256": "1hqljylwja01jn8zhkrkcyy4pza7pvmfibgzjvy9q3lbprf278zr", "depends": ["dplyr", "egg", "enshuman", "ggplot2", "ggrepel", "gridExtra", "magrittr", "scales", "stringr", "tidyr"] }, "toprdata": { @@ -119277,15 +120489,15 @@ }, "tor": { "name": "tor", - "version": "1.1.2", - "sha256": "1s34hzw3a4cm9gk85fcxgxwmn2xc7njs1iw1snd91id3gdl6vppx", + "version": "1.1.3", + "sha256": "0azizqb37gh8k7n1jkmxwh7923pyhjp0srdpxyf45w3g69clshaz", "depends": ["fs", "readr", "rlang", "tibble"] }, "torch": { "name": "torch", "version": "0.13.0", "sha256": "1vy855ahji98np2q5j5fag2zcnv4ki5mysxwg3y5kdns6mifd5ns", - "depends": ["bit64", "callr", "cli", "coro", "desc", "ellipsis", "glue", "jsonlite", "magrittr", "R6", "Rcpp", "rlang", "safetensors", "withr"] + "depends": ["R6", "Rcpp", "bit64", "callr", "cli", "coro", "desc", "ellipsis", "glue", "jsonlite", "magrittr", "rlang", "safetensors", "withr"] }, "torchaudio": { "name": "torchaudio", @@ -119295,8 +120507,8 @@ }, "torchdatasets": { "name": "torchdatasets", - "version": "0.3.0", - "sha256": "1mq87sgy9v1526iy03zpslkjxx7379q6x9dqs0nslvvfwk9sry4q", + "version": "0.3.1", + "sha256": "1lh0yjv18bjjdwc8pdl248vsbwm5y9xkv4dhsa1kbk01xmlvk3vy", "depends": ["fs", "pins", "stringr", "torch", "torchvision", "withr", "zip"] }, "torchopt": { @@ -119315,7 +120527,7 @@ "name": "torchvisionlib", "version": "0.5.0", "sha256": "1n9gvidi3lvcq730c70mzh94w42asv903708fqyqp2wrs68884na", - "depends": ["glue", "Rcpp", "rlang", "torch", "withr"] + "depends": ["Rcpp", "glue", "rlang", "torch", "withr"] }, "tornado": { "name": "tornado", @@ -119327,7 +120539,7 @@ "name": "tosca", "version": "0.3-2", "sha256": "1z8svczy93lpdj7n1gk9jz8jgzkjsf886ldlkgq1mfi1j6m8557y", - "depends": ["data_table", "htmltools", "lda", "lubridate", "quanteda", "RColorBrewer", "stringr", "tm", "WikipediR"] + "depends": ["RColorBrewer", "WikipediR", "data_table", "htmltools", "lda", "lubridate", "quanteda", "stringr", "tm"] }, "toscmask": { "name": "toscmask", @@ -119337,9 +120549,9 @@ }, "toscutil": { "name": "toscutil", - "version": "2.7.4", - "sha256": "07b89f43d9dm0lyfc0fd15bv2gxqmzz3ly9gzggix04v8zxivm2i", - "depends": ["languageserver", "rlang"] + "version": "2.8.0", + "sha256": "1k2p3kd29bi79lfaiinl96jbi3nfj9lfx2fgzvpbhxzgzfkxpg09", + "depends": ["rlang"] }, "tosr": { "name": "tosr", @@ -119369,7 +120581,7 @@ "name": "tourr", "version": "1.2.0", "sha256": "1sbaf94ms03jw5bc04xf974zp7zgfdx9xv8yl4hch82kfmfcdmxy", - "depends": ["dplyr", "MASS", "tibble"] + "depends": ["MASS", "dplyr", "tibble"] }, "toweranNA": { "name": "toweranNA", @@ -119381,19 +120593,19 @@ "name": "toxEval", "version": "1.3.2", "sha256": "1dyrbvb2l7bdz6d0lph7s8m3ydy6wz9k01qd9ilvkdqcf3y05ih0", - "depends": ["dplyr", "DT", "ggplot2", "leaflet", "magrittr", "RColorBrewer", "readxl", "shiny", "shinyAce", "shinycssloaders", "shinydashboard", "tidyr"] + "depends": ["DT", "RColorBrewer", "dplyr", "ggplot2", "leaflet", "magrittr", "readxl", "shiny", "shinyAce", "shinycssloaders", "shinydashboard", "tidyr"] }, "toxSummary": { "name": "toxSummary", "version": "1.0.0", "sha256": "1pxd8sgbby2n6bpcfxng0mj60xx5mx5m0svmqn355cl49vfccsbg", - "depends": ["cicerone", "data_table", "DBI", "dplyr", "DT", "flextable", "fs", "ggiraph", "ggplot2", "htmltools", "magrittr", "patchwork", "rlang", "RSQLite", "scales", "shiny", "shinycssloaders", "shinydisconnect", "stringr"] + "depends": ["DBI", "DT", "RSQLite", "cicerone", "data_table", "dplyr", "flextable", "fs", "ggiraph", "ggplot2", "htmltools", "magrittr", "patchwork", "rlang", "scales", "shiny", "shinycssloaders", "shinydisconnect", "stringr"] }, "toxpiR": { "name": "toxpiR", "version": "1.2.1", "sha256": "0n6x87gyzxsib267h0gs5b4sdkwmgjpgqzipfhlrjsnxq55q6599", - "depends": ["BiocGenerics", "pryr", "rlang", "S4Vectors", "tidyr"] + "depends": ["BiocGenerics", "S4Vectors", "pryr", "rlang", "tidyr"] }, "tpAUC": { "name": "tpAUC", @@ -119423,7 +120635,7 @@ "name": "tpn", "version": "1.8", "sha256": "1jhddrgkzlwmljqzy4hgday4ydyc76fskk2ahnz9x2abfm21dx7g", - "depends": ["moments", "pracma", "RBE3", "skewMLRM", "VGAM"] + "depends": ["RBE3", "VGAM", "moments", "pracma", "skewMLRM"] }, "tpr": { "name": "tpr", @@ -119453,7 +120665,7 @@ "name": "tracee", "version": "0.0.4", "sha256": "0ny6769zdl2i5y3fy3ysww91i5s0n86rcciaalryg6ms18989x0r", - "depends": ["data_table", "flextable", "ggplot2", "gridExtra", "NMdata"] + "depends": ["NMdata", "data_table", "flextable", "ggplot2", "gridExtra"] }, "tracenma": { "name": "tracenma", @@ -119471,7 +120683,7 @@ "name": "tracerer", "version": "2.2.3", "sha256": "0jqf0p0j0g4naspgg9k7jxslwcdqwv7mxca41wyffrgglgya8rci", - "depends": ["jsonlite", "Rcpp", "testit"] + "depends": ["Rcpp", "jsonlite", "testit"] }, "tracheideR": { "name": "tracheideR", @@ -119481,15 +120693,15 @@ }, "track2KBA": { "name": "track2KBA", - "version": "1.1.1", - "sha256": "0lhx18vilxlac3z9vrwjcxjvinkdpp1njkvg82dyz1sqby3fa9f8", - "depends": ["adehabitatHR", "dplyr", "foreach", "geosphere", "ggplot2", "lubridate", "magrittr", "maps", "Matching", "move", "purrr", "raster", "rlang", "sf", "sp", "tidyr"] + "version": "1.1.2", + "sha256": "1y5mj2qakwvgxh0s8dli9d2i97g1y19k0v3q20zgj7j3wx7x8fw4", + "depends": ["Matching", "adehabitatHR", "dplyr", "foreach", "geosphere", "ggplot2", "lubridate", "magrittr", "maps", "move", "purrr", "raster", "rlang", "sf", "sp", "tidyr"] }, "trackdem": { "name": "trackdem", "version": "0.7.2", "sha256": "0i3zjdykdv92b4g7gvr83rmx8cvwmm7w5chbxr6si08zw0jipzzn", - "depends": ["MASS", "neuralnet", "png", "raster", "Rcpp", "RcppArmadillo", "shiny"] + "depends": ["MASS", "Rcpp", "RcppArmadillo", "neuralnet", "png", "raster", "shiny"] }, "trackdf": { "name": "trackdf", @@ -119507,19 +120719,19 @@ "name": "trackeR", "version": "1.6.0", "sha256": "06fyki3w73hdmwlsmp6k5g5x6vs60ysznji3bgi9kpphcbn85frg", - "depends": ["fda", "foreach", "ggmap", "ggplot2", "ggridges", "gridExtra", "gtable", "jsonlite", "leaflet", "raster", "RSQLite", "scam", "sp", "xml2", "zoo"] + "depends": ["RSQLite", "fda", "foreach", "ggmap", "ggplot2", "ggridges", "gridExtra", "gtable", "jsonlite", "leaflet", "raster", "scam", "sp", "xml2", "zoo"] }, "trackeRapp": { "name": "trackeRapp", "version": "1.2", "sha256": "1y6n9hgzybz5860qpzj9rdb9yl4k6b9h13d91fqn3qarpnx9n5qr", - "depends": ["changepoint", "colorspace", "DT", "foreach", "mapdeck", "mgcv", "plotly", "sf", "shiny", "shinydashboard", "shinyjs", "shinyWidgets", "trackeR", "V8", "zoo"] + "depends": ["DT", "V8", "changepoint", "colorspace", "foreach", "mapdeck", "mgcv", "plotly", "sf", "shiny", "shinyWidgets", "shinydashboard", "shinyjs", "trackeR", "zoo"] }, "tractor_base": { "name": "tractor.base", "version": "3.4.2", "sha256": "12mp5x6c7c82a4z7p39cb478kwwf6lkrgbis6ak00yibsd3n6na3", - "depends": ["ore", "reportr", "RNifti", "shades"] + "depends": ["RNifti", "ore", "reportr", "shades"] }, "trade": { "name": "trade", @@ -119531,7 +120743,7 @@ "name": "tradepolicy", "version": "0.7.0", "sha256": "0nil9yd32dlafz7493i8vbv0q8np7drj502xm4nznq4ql9px46fh", - "depends": ["broom", "dplyr", "fixest", "Formula", "ggplot2", "knitr", "magrittr", "msm", "purrr", "sandwich", "tidyr"] + "depends": ["Formula", "broom", "dplyr", "fixest", "ggplot2", "knitr", "magrittr", "msm", "purrr", "sandwich", "tidyr"] }, "tradestatistics": { "name": "tradestatistics", @@ -119549,13 +120761,13 @@ "name": "trainR", "version": "0.0.1", "sha256": "0wmxhw8yxkxpw08jma3r0zy7dhsrkbh5wjvd3izp5gf9dn9533cd", - "depends": ["dplyr", "glue", "lubridate", "magrittr", "purrr", "RCurl", "stringr", "tibble", "tidyr", "usethis", "xml2"] + "depends": ["RCurl", "dplyr", "glue", "lubridate", "magrittr", "purrr", "stringr", "tibble", "tidyr", "usethis", "xml2"] }, "traineR": { "name": "traineR", "version": "2.2.0", "sha256": "0a07l38k18x97yzqh8qcaza4fac0r2ngf3588v3nrvhcm3wz70az", - "depends": ["ada", "adabag", "dplyr", "e1071", "gbm", "ggplot2", "glmnet", "kknn", "MASS", "neuralnet", "nnet", "randomForest", "ROCR", "rpart", "stringr", "xgboost"] + "depends": ["MASS", "ROCR", "ada", "adabag", "dplyr", "e1071", "gbm", "ggplot2", "glmnet", "kknn", "neuralnet", "nnet", "randomForest", "rpart", "stringr", "xgboost"] }, "trainsplit": { "name": "trainsplit", @@ -119583,8 +120795,8 @@ }, "traj": { "name": "traj", - "version": "2.1.0", - "sha256": "157v3bhb10x0fndx64pq3m5ddmwj070j1ca3d8ff64kpkfbxdgd3", + "version": "2.2.0", + "sha256": "1pv47ww443i290yjiqwx3bk1kynsv4kzhpq65mspbjdy61ilq5aq", "depends": ["cluster", "psych"] }, "trajectories": { @@ -119607,27 +120819,27 @@ }, "tram": { "name": "tram", - "version": "1.0-4", - "sha256": "04hbvsqawfqvfgmzbnbwxy6jlpnglpgmrnl9gp5kb6in36as92jz", - "depends": ["basefun", "Formula", "Matrix", "mlt", "multcomp", "mvtnorm", "sandwich", "survival", "variables"] + "version": "1.0-5", + "sha256": "12466rha6h7i034pwqjl37isga6lzxagjj7ppaffqg3aajzdlzss", + "depends": ["Formula", "Matrix", "basefun", "mlt", "multcomp", "mvtnorm", "sandwich", "survival", "variables"] }, "tramME": { "name": "tramME", - "version": "1.0.5", - "sha256": "1rfs38v0w2rxldxngbc1d6118cjnc8ad4zn2csqk8bg882b1yn18", - "depends": ["alabama", "basefun", "coneproj", "lme4", "MASS", "Matrix", "mgcv", "mlt", "mvtnorm", "nlme", "numDeriv", "RcppEigen", "TMB", "tram", "variables"] + "version": "1.0.6", + "sha256": "00i0813czlwlb6lxsljhsp644mpz3zwcy068lb1z7qkxncic377d", + "depends": ["MASS", "Matrix", "RcppEigen", "TMB", "alabama", "basefun", "coneproj", "mgcv", "mlt", "mvtnorm", "nlme", "numDeriv", "reformulas", "tram", "variables"] }, "tramicp": { "name": "tramicp", "version": "0.0-2", "sha256": "1d5dj695q16il35pmfi6kb0m78mdjj5gsirqb2sd74jwgj32qy5b", - "depends": ["basefun", "coin", "cotram", "dHSIC", "MASS", "mlt", "multcomp", "ranger", "sandwich", "survival", "tram", "variables"] + "depends": ["MASS", "basefun", "coin", "cotram", "dHSIC", "mlt", "multcomp", "ranger", "sandwich", "survival", "tram", "variables"] }, "tramnet": { "name": "tramnet", "version": "0.0-8", "sha256": "19hx2hn8m5abfzp4sm0myhxlx9hp2rl7dry5izxsfjjls3h8z1n4", - "depends": ["basefun", "CVXR", "lhs", "mlr", "mlrMBO", "mlt", "ParamHelpers", "sandwich", "smoof", "tram"] + "depends": ["CVXR", "ParamHelpers", "basefun", "lhs", "mlr", "mlrMBO", "mlt", "sandwich", "smoof", "tram"] }, "trampoline": { "name": "trampoline", @@ -119645,7 +120857,7 @@ "name": "tranSurv", "version": "1.2.2", "sha256": "17rvzjcn76z5niw1jappiadbkf66a9x0m7p3251lgb7qrnvpx3gk", - "depends": ["rootSolve", "SQUAREM", "survival", "truncSP"] + "depends": ["SQUAREM", "rootSolve", "survival", "truncSP"] }, "transPlotR": { "name": "transPlotR", @@ -119657,13 +120869,13 @@ "name": "transfR", "version": "1.0.11", "sha256": "1qmkqn0gl4d6c0j1f07nmlv1gxh6in7d21dlp80ilmnaqyhb1fnj", - "depends": ["doParallel", "foreach", "Rdpack", "sf", "stars", "units"] + "depends": ["Rdpack", "doParallel", "foreach", "sf", "stars", "units"] }, "transforEmotion": { "name": "transforEmotion", "version": "0.1.4", "sha256": "0vm6jls2whqkr1x7gwa9h6x1phng908z9qyfmpjr6nrykkwmk5va", - "depends": ["dplyr", "googledrive", "LSAfun", "Matrix", "pbapply", "remotes", "reticulate"] + "depends": ["LSAfun", "Matrix", "dplyr", "googledrive", "pbapply", "remotes", "reticulate"] }, "transform_hazards": { "name": "transform.hazards", @@ -119701,6 +120913,12 @@ "sha256": "12jd0dzbhliajg2x88kqwxpvrd1xy64sd551rsvbklfc3n7fqx09", "depends": ["glue", "jsonlite"] }, + "translit_uk": { + "name": "translit.uk", + "version": "1.0.0", + "sha256": "1c8pp0b23kmrnlbmkcx8ws5c2bcj1p3vbrz9cxkphvvai5b0rkci", + "depends": [] + }, "transmdl": { "name": "transmdl", "version": "0.1.0", @@ -119723,7 +120941,7 @@ "name": "transport", "version": "0.15-2", "sha256": "0pf0lza2qf0alwphiy978fyp58k3lz5i44kcw86a3rrf7cpf4rwa", - "depends": ["data_table", "Rcpp", "RcppEigen"] + "depends": ["Rcpp", "RcppEigen", "data_table"] }, "transreg": { "name": "transreg", @@ -119753,25 +120971,31 @@ "name": "traveltimeR", "version": "1.2.1", "sha256": "1029hxdgzapx0irvq5ir18fpdm5cyj5wjvl1h88x3g1rs88pvfzi", - "depends": ["data_table", "httr", "jsonlite", "RProtoBuf"] + "depends": ["RProtoBuf", "data_table", "httr", "jsonlite"] }, "trawl": { "name": "trawl", "version": "0.2.2", "sha256": "1a8cvkmw7bmdljggfv26n2nrad6974spga2yw5386k70ghq56mz3", - "depends": ["DEoptim", "ggplot2", "ggpubr", "MASS", "rootSolve", "Runuran", "squash", "TSA"] + "depends": ["DEoptim", "MASS", "Runuran", "TSA", "ggplot2", "ggpubr", "rootSolve", "squash"] + }, + "trdist": { + "name": "trdist", + "version": "1.0.1", + "sha256": "11j0giccn5vyr97c44nvgy678qckajmn0lq9li4pf2swf18v3ji7", + "depends": [] }, "treasury": { "name": "treasury", - "version": "0.1.0", - "sha256": "1h87pwzd474bw2rsq2cvv2jw2nkr9lxjnc5grhqsq6vd2hlkwch5", - "depends": ["httr2", "rlang", "xml2"] + "version": "0.2.0", + "sha256": "0dg7yik152gikxn35khcrc098li6n3ppb7d78cwmxl2ikvzcgbbm", + "depends": ["httr2", "readxl", "rlang", "tidyr", "xml2"] }, "treats": { "name": "treats", "version": "1.0", "sha256": "16ahw46wkjhvxhkiy4313ky9vvzjrg2bhxw1pz0j4hasdkd9xq1s", - "depends": ["ape", "dispRity", "MASS", "rgl"] + "depends": ["MASS", "ape", "dispRity", "rgl"] }, "tree": { "name": "tree", @@ -119801,7 +121025,7 @@ "name": "treeDA", "version": "0.0.5", "sha256": "0rdqvjj16w7ykpxd6m800h4zv79y9c1phhkl14xy10gbi2cqh10g", - "depends": ["ape", "ggplot2", "gtable", "Matrix", "mvtnorm", "phyloseq", "reshape2", "sparseLDA"] + "depends": ["Matrix", "ape", "ggplot2", "gtable", "mvtnorm", "phyloseq", "reshape2", "sparseLDA"] }, "treeDbalance": { "name": "treeDbalance", @@ -119825,7 +121049,7 @@ "name": "treebase", "version": "0.1.5", "sha256": "07rggigdgjbmz9wvbkxs6xcwg6k53zb4j4rvlfrgb5b4mq44s0wj", - "depends": ["ape", "httr", "RCurl", "XML"] + "depends": ["RCurl", "XML", "ape", "httr"] }, "treedata_table": { "name": "treedata.table", @@ -119843,7 +121067,7 @@ "name": "treediff", "version": "0.2.1", "sha256": "00yhqbxgz35fnz940zkqr0kylzqb55l1yhilphw1yzks3wmsd4id", - "depends": ["adjclust", "BiocGenerics", "csaw", "data_table", "dplyr", "HiCDOC", "InteractionSet", "limma", "purrr", "reshape2", "rlang", "SummarizedExperiment", "testthat"] + "depends": ["BiocGenerics", "HiCDOC", "InteractionSet", "SummarizedExperiment", "adjclust", "csaw", "data_table", "dplyr", "limma", "purrr", "reshape2", "rlang", "testthat"] }, "treefit": { "name": "treefit", @@ -119861,7 +121085,7 @@ "name": "treemap", "version": "2.4-4", "sha256": "1h3pas3kn8zrpdpvp9vs745q94kixw5lxkbq74l5lh0n3wkqnnn5", - "depends": ["colorspace", "data_table", "ggplot2", "gridBase", "igraph", "RColorBrewer", "shiny"] + "depends": ["RColorBrewer", "colorspace", "data_table", "ggplot2", "gridBase", "igraph", "shiny"] }, "treemapify": { "name": "treemapify", @@ -119873,13 +121097,25 @@ "name": "treenomial", "version": "1.1.4", "sha256": "0vx5x7078ccn2bsmcxdls3ymmc7jx71xzq0va0n7gyw36gi7k3nn", - "depends": ["ape", "Rcpp", "RcppArmadillo", "RcppThread"] + "depends": ["Rcpp", "RcppArmadillo", "RcppThread", "ape"] }, "treeshap": { "name": "treeshap", "version": "0.3.1", "sha256": "1ipj5k9dgrnbny0z2ydsdvdzg5ba53alyidnh90a08y2dhd4wffs", - "depends": ["data_table", "ggplot2", "Rcpp"] + "depends": ["Rcpp", "data_table", "ggplot2"] + }, + "treesitter": { + "name": "treesitter", + "version": "0.1.0", + "sha256": "1yppwpayv4krwyxzqcg9aisdlascksym603ad0a9qpjrsivqyhh9", + "depends": ["R6", "cli", "rlang", "vctrs"] + }, + "treesitter_r": { + "name": "treesitter.r", + "version": "1.0.1", + "sha256": "1bxliv544w2aa033r4nhqzs5cmsiriymfcxwcc76v05nm82dncim", + "depends": [] }, "treesliceR": { "name": "treesliceR", @@ -119891,7 +121127,7 @@ "name": "treespace", "version": "1.1.4.3", "sha256": "1f5kcydlnbbwf2q2rgb64y3i7x9p7prcw1xc5pjk8wqp2zyr0ijj", - "depends": ["ade4", "adegenet", "adegraphics", "ape", "combinat", "distory", "fields", "htmlwidgets", "MASS", "phangorn", "phytools", "Rcpp", "rgl", "RLumShiny", "scatterD3", "shiny", "shinyBS"] + "depends": ["MASS", "RLumShiny", "Rcpp", "ade4", "adegenet", "adegraphics", "ape", "combinat", "distory", "fields", "htmlwidgets", "phangorn", "phytools", "rgl", "scatterD3", "shiny", "shinyBS"] }, "treestartr": { "name": "treestartr", @@ -119901,15 +121137,15 @@ }, "treestats": { "name": "treestats", - "version": "1.0.5", - "sha256": "0j4bsag1fha3rnysidhd937vpxzvmq3vm1q4brqjpl08pniy9f9f", - "depends": ["ape", "Matrix", "nloptr", "Rcpp", "RSpectra"] + "version": "1.70.4", + "sha256": "0nfs4432q8nirhspdqnkp02a50c0rcphf1anx5qgqdal2njmk146", + "depends": ["Rcpp", "ape", "nloptr"] }, "treestructure": { "name": "treestructure", "version": "0.1.0", "sha256": "0514q53bdwv9fwd58srhr6lzw1j56fcd64hml8w4rv4wzcd6c01m", - "depends": ["ape", "Rcpp"] + "depends": ["Rcpp", "ape"] }, "trekcolors": { "name": "trekcolors", @@ -119927,7 +121163,7 @@ "name": "trelliscopejs", "version": "0.2.6", "sha256": "16i1km57yz8bl4ni919d3qmj8aj5l88l7byhd6ksh88ygpfl7wq8", - "depends": ["autocogs", "base64enc", "digest", "DistributionUtils", "dplyr", "ggplot2", "gtable", "htmltools", "htmlwidgets", "jsonlite", "knitr", "progress", "purrr", "rlang", "tidyr", "webshot"] + "depends": ["DistributionUtils", "autocogs", "base64enc", "digest", "dplyr", "ggplot2", "gtable", "htmltools", "htmlwidgets", "jsonlite", "knitr", "progress", "purrr", "rlang", "tidyr", "webshot"] }, "trelloR": { "name": "trelloR", @@ -119963,7 +121199,7 @@ "name": "trending", "version": "0.1.0", "sha256": "15nx0s5q2nk2z9lvpkpjzpg6qz0j182zzrl9v7wp70lfbpaahh24", - "depends": ["ciTools", "MASS", "pillar", "tibble", "vctrs"] + "depends": ["MASS", "ciTools", "pillar", "tibble", "vctrs"] }, "trendsegmentR": { "name": "trendsegmentR", @@ -119981,13 +121217,13 @@ "name": "triact", "version": "0.3.0", "sha256": "1ndxqrs1mg6ch99cksd7gnrjvhsklwfrjwrdxns099a3n16m3r0h", - "depends": ["checkmate", "data_table", "lubridate", "R6"] + "depends": ["R6", "checkmate", "data_table", "lubridate"] }, "trialr": { "name": "trialr", "version": "0.1.6", "sha256": "1a93pncc0w84z8d2xlgia9jvxad63r3ifxjd4nc284s760i9k2v7", - "depends": ["BH", "binom", "coda", "dplyr", "ggplot2", "gtools", "magrittr", "MASS", "purrr", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders", "stringr", "tibble", "tidybayes"] + "depends": ["BH", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "binom", "coda", "dplyr", "ggplot2", "gtools", "magrittr", "purrr", "rlang", "rstan", "rstantools", "stringr", "tibble", "tidybayes"] }, "triangle": { "name": "triangle", @@ -120065,7 +121301,7 @@ "name": "trip", "version": "1.10.0", "sha256": "0jbzwrckazs5zib5lnhlqdc3b825fnk8pzmwixpgq8k7s2m9px0l", - "depends": ["crsmeta", "dplyr", "geodist", "glue", "MASS", "raster", "reproj", "rlang", "sp", "spatstat_explore", "spatstat_geom", "traipse", "viridis"] + "depends": ["MASS", "crsmeta", "dplyr", "geodist", "glue", "raster", "reproj", "rlang", "sp", "spatstat_explore", "spatstat_geom", "traipse", "viridis"] }, "tripEstimation": { "name": "tripEstimation", @@ -120081,8 +121317,8 @@ }, "triplesmatch": { "name": "triplesmatch", - "version": "1.0.0", - "sha256": "1qjwnyijk3yf9dl18baww806xz2w1jhxcnaw3nlb27g24m28j2dq", + "version": "1.1.0", + "sha256": "0k1kwv6yk5gwwqvn7wwhg02ny8avd70mqs91b4hm5bi6857wfg0h", "depends": ["MASS", "optmatch", "rcbalance", "rlang", "rlemon"] }, "triplot": { @@ -120101,13 +121337,13 @@ "name": "triptych", "version": "0.1.3", "sha256": "1ggifvzqa5ifa66mhg0bsv47g54nbih9zg4sbm6m9483wvnsxhhs", - "depends": ["class", "cpp11", "dplyr", "geomtextpath", "ggplot2", "ggrepel", "monotone", "patchwork", "pROC", "purrr", "rlang", "scales", "tibble", "tidyr", "tidyselect", "vctrs"] + "depends": ["class", "cpp11", "dplyr", "geomtextpath", "ggplot2", "ggrepel", "monotone", "pROC", "patchwork", "purrr", "rlang", "scales", "tibble", "tidyr", "tidyselect", "vctrs"] }, "triversity": { "name": "triversity", "version": "1.0", "sha256": "1bar2bpy8jvj91jmzzdwy6rlvirsbxrzqnx4r825irqhc69gc53r", - "depends": ["data_tree", "Matrix"] + "depends": ["Matrix", "data_tree"] }, "troopdata": { "name": "troopdata", @@ -120139,6 +121375,12 @@ "sha256": "15aalp82igw23rlk36dqqkcnmcy8q869wjbr7ak19gygy8p525wn", "depends": ["Formula", "libcoin", "mlt", "partykit", "sandwich", "tram", "variables"] }, + "trud": { + "name": "trud", + "version": "0.1.0", + "sha256": "1mknagpm7m6m48hbzwc9r6sx657h792wmv6qpwb0x88rgla3wrn9", + "depends": ["cli", "dplyr", "httr2", "magrittr", "purrr", "rlang", "rvest", "stringr", "tibble", "tidyselect"] + }, "truelies": { "name": "truelies", "version": "0.2.0", @@ -120149,13 +121391,13 @@ "name": "truh", "version": "1.0.0", "sha256": "0acsyzm6rpmzyq8pg33c631hi4xir49gqxbpshcrr6i2v3q6k14j", - "depends": ["cluster", "doParallel", "foreach", "fpc", "iterators", "Rfast"] + "depends": ["Rfast", "cluster", "doParallel", "foreach", "fpc", "iterators"] }, "truncAIPW": { "name": "truncAIPW", "version": "1.0.1", "sha256": "01863yys0ih0piriksspylpsrfv7q4mkrsqhh1mgrkfyw1d11czn", - "depends": ["survival", "survPen"] + "depends": ["survPen", "survival"] }, "truncSP": { "name": "truncSP", @@ -120179,7 +121421,7 @@ "name": "truncnormbayes", "version": "0.0.3", "sha256": "06qz9xvqi59afjdq2djjvg455wx892w8p8wy2fb9wc4fnj0xbnrj", - "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "rstan", "rstantools"] }, "truncreg": { "name": "truncreg", @@ -120221,13 +121463,13 @@ "name": "tsBSS", "version": "1.0.0", "sha256": "04nsbifc6zkilqifj6iwc0vf2z84y8wcbf8pndgkzi039kk6c385", - "depends": ["boot", "BSSprep", "forecast", "ICtest", "JADE", "Rcpp", "RcppArmadillo", "xts", "zoo"] + "depends": ["BSSprep", "ICtest", "JADE", "Rcpp", "RcppArmadillo", "boot", "forecast", "xts", "zoo"] }, "tsDyn": { "name": "tsDyn", "version": "11.0.4.1", "sha256": "04w7kf66q9bspyh62g8r9xzcb6mj6nd11za63b0h5jyj6rv6kbrq", - "depends": ["foreach", "forecast", "MASS", "Matrix", "mgcv", "mnormt", "nnet", "tseries", "tseriesChaos", "urca", "vars"] + "depends": ["MASS", "Matrix", "foreach", "forecast", "mgcv", "mnormt", "nnet", "tseries", "tseriesChaos", "urca", "vars"] }, "tsLSTMx": { "name": "tsLSTMx", @@ -120237,8 +121479,8 @@ }, "tsModel": { "name": "tsModel", - "version": "0.6-1", - "sha256": "16cyq4xisrp4i8bd8wayzzk08ws0rfq9zrafphb9cssx50gbqb8q", + "version": "0.6-2", + "sha256": "1v9dbznngs1ws5339f7583hjgbj4i8zv9skkg3c09wpw2r9ggfzq", "depends": [] }, "tsPI": { @@ -120263,7 +121505,7 @@ "name": "tsapp", "version": "1.0.4", "sha256": "1x3f10rdg3ihq5cx6w1zyz3irv1wsgx6admz5qv3zwwlk0z6cwpx", - "depends": ["fftwtools", "hdm", "Matrix", "vars"] + "depends": ["Matrix", "fftwtools", "hdm", "vars"] }, "tsbox": { "name": "tsbox", @@ -120275,7 +121517,7 @@ "name": "tscopula", "version": "0.3.9", "sha256": "1cx761pigb3dakyz8587giq22vxzz2nr25x1ivdpdyshsaqj5sxq", - "depends": ["arfima", "FKF", "kdensity", "ltsa", "Matrix", "polynom", "rvinecopulib", "xts", "zoo"] + "depends": ["FKF", "Matrix", "arfima", "kdensity", "ltsa", "polynom", "rvinecopulib", "xts", "zoo"] }, "tscount": { "name": "tscount", @@ -120317,13 +121559,13 @@ "name": "tsdistributions", "version": "1.0.1", "sha256": "0xhia2w6s0b2zfva2pj58n8vj666ffmmgcbdid9lbgcsy09fsf01", - "depends": ["data_table", "future", "future_apply", "GeneralizedHyperbolic", "KernSmooth", "mev", "progressr", "RcppEigen", "Rdpack", "Rsolnp", "sandwich", "SkewHyperbolic", "TMB", "tsmethods", "zoo"] + "depends": ["GeneralizedHyperbolic", "KernSmooth", "RcppEigen", "Rdpack", "Rsolnp", "SkewHyperbolic", "TMB", "data_table", "future", "future_apply", "mev", "progressr", "sandwich", "tsmethods", "zoo"] }, "tsensembler": { "name": "tsensembler", "version": "0.1.0", "sha256": "0amb3dn96hdgy5a0j6s43mf82cdjwbz8dhz3yrjlr07nknxzirzi", - "depends": ["Cubist", "doParallel", "earth", "foreach", "gbm", "glmnet", "kernlab", "monmlp", "pls", "ranger", "RcppRoll", "softImpute", "xgboost", "xts", "zoo"] + "depends": ["Cubist", "RcppRoll", "doParallel", "earth", "foreach", "gbm", "glmnet", "kernlab", "monmlp", "pls", "ranger", "softImpute", "xgboost", "xts", "zoo"] }, "tsentiment": { "name": "tsentiment", @@ -120333,8 +121575,8 @@ }, "tseries": { "name": "tseries", - "version": "0.10-56", - "sha256": "1s7sz95j6mm4708s3hffrnfkmdjgj43gba07wr6v24fg9xygq7m8", + "version": "0.10-57", + "sha256": "1vlvz009y683k3xz2bhzkfdnk5m2c9abfz7661p92a17cjvlnx8q", "depends": ["jsonlite", "quadprog", "quantmod", "zoo"] }, "tseriesChaos": { @@ -120353,25 +121595,25 @@ "name": "tseriesTARMA", "version": "0.3-4", "sha256": "00ch7dg9fia7yh9q502wndi72nhz5ywqhhla9qgpgg08sfj2414f", - "depends": ["lbfgsb3c", "mathjaxr", "Matrix", "Rdpack", "Rsolnp", "rugarch", "zoo"] + "depends": ["Matrix", "Rdpack", "Rsolnp", "lbfgsb3c", "mathjaxr", "rugarch", "zoo"] }, "tsfeatures": { "name": "tsfeatures", "version": "1.1.1", "sha256": "1z0c1pc2hsw76qwy6nibp1dnmk5vq495g2b81j844ajma6gj7ssy", - "depends": ["forecast", "fracdiff", "furrr", "future", "purrr", "RcppRoll", "tibble", "tseries", "urca"] + "depends": ["RcppRoll", "forecast", "fracdiff", "furrr", "future", "purrr", "tibble", "tseries", "urca"] }, "tsfgrnn": { "name": "tsfgrnn", "version": "1.0.5", "sha256": "0pbscnz2mr7nnxvgcs7sw3awq78p5r4h0nwwycn6fi7wq7ngpd92", - "depends": ["ggplot2", "Rcpp"] + "depends": ["Rcpp", "ggplot2"] }, "tsfknn": { "name": "tsfknn", "version": "0.6.0", "sha256": "1yw0k2ivx31b4170wf93vvha4jpkapg4sg5j59igiayf750x1j6h", - "depends": ["ggplot2", "Rcpp"] + "depends": ["Rcpp", "ggplot2"] }, "tsfngm": { "name": "tsfngm", @@ -120383,7 +121625,7 @@ "name": "tsgarch", "version": "1.0.2", "sha256": "1hlbz6iycq9fvmcrdf238a48dl9hdpdrvxa5vfz1j28061r3sp8f", - "depends": ["data_table", "flextable", "future", "future_apply", "lubridate", "nloptr", "numDeriv", "progressr", "Rcpp", "RcppArmadillo", "RcppEigen", "Rdpack", "sandwich", "TMB", "tsdistributions", "tsmethods", "xts", "zoo"] + "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "Rdpack", "TMB", "data_table", "flextable", "future", "future_apply", "lubridate", "nloptr", "numDeriv", "progressr", "sandwich", "tsdistributions", "tsmethods", "xts", "zoo"] }, "tsiR": { "name": "tsiR", @@ -120393,8 +121635,8 @@ }, "tsibble": { "name": "tsibble", - "version": "1.1.4", - "sha256": "17zdlrp9rfh61q23k21yqzs6q7c0g5r93cxxqa3ig5ibmvhsfsrl", + "version": "1.1.5", + "sha256": "1ay4i9lc380y2h21l64sabv9lfz0dhzvldnhb6nakm0l176q6cg6", "depends": ["anytime", "dplyr", "ellipsis", "generics", "lifecycle", "lubridate", "rlang", "tibble", "tidyselect", "vctrs"] }, "tsibbledata": { @@ -120407,7 +121649,7 @@ "name": "tsibbletalk", "version": "0.1.0", "sha256": "14j1gpimvlz9cgxgl1n68ngkqx4w2ai92782ifrpvc57lqy9cs7v", - "depends": ["crosstalk", "dendextend", "dplyr", "glue", "lubridate", "plotly", "R6", "rlang", "shiny", "tsibble", "vctrs"] + "depends": ["R6", "crosstalk", "dendextend", "dplyr", "glue", "lubridate", "plotly", "rlang", "shiny", "tsibble", "vctrs"] }, "tsintermittent": { "name": "tsintermittent", @@ -120425,7 +121667,7 @@ "name": "tsmp", "version": "0.4.15", "sha256": "129vzazhcxynmi8nki0amm5xf57ji0fik0j6aj7r9izh4wq6lysn", - "depends": ["audio", "checkmate", "doSNOW", "foreach", "magrittr", "progress", "Rcpp", "RcppParallel", "RJSONIO"] + "depends": ["RJSONIO", "Rcpp", "RcppParallel", "audio", "checkmate", "doSNOW", "foreach", "magrittr", "progress"] }, "tsna": { "name": "tsna", @@ -120443,7 +121685,7 @@ "name": "tsnet", "version": "0.1.0", "sha256": "14wy4mfzxkigdm3abfybijqicfqxl0gfbf72asadwipaqyw91nf6", - "depends": ["BH", "cowplot", "dplyr", "ggdist", "ggokabeito", "ggplot2", "posterior", "Rcpp", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders", "tidyr"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cowplot", "dplyr", "ggdist", "ggokabeito", "ggplot2", "posterior", "rlang", "rstan", "rstantools", "tidyr"] }, "tsoutliers": { "name": "tsoutliers", @@ -120455,19 +121697,19 @@ "name": "tspmeta", "version": "1.2", "sha256": "028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd", - "depends": ["BBmisc", "checkmate", "fpc", "ggplot2", "MASS", "splancs", "stringr", "TSP", "vegan"] + "depends": ["BBmisc", "MASS", "TSP", "checkmate", "fpc", "ggplot2", "splancs", "stringr", "vegan"] }, "tspredit": { "name": "tspredit", - "version": "1.0.767", - "sha256": "0gxsbhigq0qxiw6kx4p7wgqjx7c09qj03w7j6600p2jzaqz959zj", - "depends": ["daltoolbox", "DescTools", "dplyr", "forecast", "KFAS", "mFilter"] + "version": "1.0.777", + "sha256": "0yqgd9rlqldplcsq8hk1wkgjq0931sbqdxd31ynylkpiy4d0psca", + "depends": ["DescTools", "KFAS", "daltoolbox", "dplyr", "forecast", "hht", "mFilter", "wavelets"] }, "tsqn": { "name": "tsqn", "version": "1.0.0", "sha256": "1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9", - "depends": ["fracdiff", "MASS", "robustbase"] + "depends": ["MASS", "fracdiff", "robustbase"] }, "tsriadditive": { "name": "tsriadditive", @@ -120479,7 +121721,7 @@ "name": "tsrobprep", "version": "0.3.2", "sha256": "0y7h8kh721r859b7y5vxh4q7dmjlx50qcc6pib204x3hhzv1yyrc", - "depends": ["glmnet", "MASS", "Matrix", "mclust", "quantreg", "Rdpack", "textTinyR", "zoo"] + "depends": ["MASS", "Matrix", "Rdpack", "glmnet", "mclust", "quantreg", "textTinyR", "zoo"] }, "tssim": { "name": "tssim", @@ -120491,7 +121733,7 @@ "name": "tstests", "version": "1.0.0", "sha256": "00gjmvg1b7v2cdrv95l9ic9j50wch8y23qxkiqmrp1nznjjicpsy", - "depends": ["car", "data_table", "flextable", "ks", "Rdpack", "tsmethods", "xts"] + "depends": ["Rdpack", "car", "data_table", "flextable", "ks", "tsmethods", "xts"] }, "tstools": { "name": "tstools", @@ -120503,7 +121745,7 @@ "name": "tsutils", "version": "0.9.4", "sha256": "1jf37asxg4nfm1jhf6q6fjs8dljlqs1r57kr4q38dnz11hz1jsm4", - "depends": ["forecast", "MAPA", "plotrix", "RColorBrewer"] + "depends": ["MAPA", "RColorBrewer", "forecast", "plotrix"] }, "tsvio": { "name": "tsvio", @@ -120527,19 +121769,19 @@ "name": "tswge", "version": "2.1.0", "sha256": "1pl10n20w2vz95q28zjiafcjmjij586h33s5b0nqvxfwlask6xbw", - "depends": ["astsa", "dplyr", "forecast", "ggplot2", "magrittr", "MASS", "nnfor", "plotrix", "PolynomF", "signal", "tidyverse", "waveslim", "zoo"] + "depends": ["MASS", "PolynomF", "astsa", "dplyr", "forecast", "ggplot2", "magrittr", "nnfor", "plotrix", "signal", "tidyverse", "waveslim", "zoo"] }, "tsxtreme": { "name": "tsxtreme", "version": "0.3.3", "sha256": "1725rkdq377z3c06hc2g9l0dwgfy5gz3pgygpz1pyy83s5c7j869", - "depends": ["evd", "MASS", "mvtnorm", "tictoc"] + "depends": ["MASS", "evd", "mvtnorm", "tictoc"] }, "ttScreening": { "name": "ttScreening", "version": "1.6", "sha256": "1i8c9l3sdkzl99zxxyfqm84vkh6wjdh3a32l5q8ikf74g9dhxkf4", - "depends": ["corpcor", "limma", "MASS", "matrixStats", "simsalapar", "sva"] + "depends": ["MASS", "corpcor", "limma", "matrixStats", "simsalapar", "sva"] }, "ttbary": { "name": "ttbary", @@ -120575,7 +121817,7 @@ "name": "ttservice", "version": "0.4.1", "sha256": "1r0prv3p3xlcfn16bxjyvkr255rsaf5m26c394qxc78y6qf6wrbd", - "depends": ["dplyr", "Matrix", "plotly"] + "depends": ["Matrix", "dplyr", "plotly"] }, "ttt": { "name": "ttt", @@ -120629,7 +121871,7 @@ "name": "tukeytrend", "version": "0.7", "sha256": "15j7g0drb92rpxq7d0jl9h0hxpi9pbgpvfcxaicrcgypxap3721q", - "depends": ["lme4", "Matrix", "mgcv", "multcomp", "nlme", "pbkrtest"] + "depends": ["Matrix", "lme4", "mgcv", "multcomp", "nlme", "pbkrtest"] }, "tumgr": { "name": "tumgr", @@ -120641,7 +121883,7 @@ "name": "tune", "version": "1.2.1", "sha256": "1qb4ncadq10pzy8xhkpgg06raahbv6n8002wdjdh4jlv73hsk6ki", - "depends": ["cli", "dials", "doFuture", "dplyr", "foreach", "future", "generics", "ggplot2", "glue", "GPfit", "hardhat", "lifecycle", "parsnip", "purrr", "recipes", "rlang", "rsample", "tibble", "tidyr", "tidyselect", "vctrs", "withr", "workflows", "yardstick"] + "depends": ["GPfit", "cli", "dials", "doFuture", "dplyr", "foreach", "future", "generics", "ggplot2", "glue", "hardhat", "lifecycle", "parsnip", "purrr", "recipes", "rlang", "rsample", "tibble", "tidyr", "tidyselect", "vctrs", "withr", "workflows", "yardstick"] }, "tuneR": { "name": "tuneR", @@ -120653,7 +121895,7 @@ "name": "tuneRanger", "version": "0.7", "sha256": "17hsqwg4h2pjns4bx3yjrkml8yn1vdxarf8lc4g9d4z01k4m7jk8", - "depends": ["BBmisc", "DiceKriging", "lhs", "mlr", "mlrMBO", "ParamHelpers", "ranger", "smoof"] + "depends": ["BBmisc", "DiceKriging", "ParamHelpers", "lhs", "mlr", "mlrMBO", "ranger", "smoof"] }, "tuple": { "name": "tuple", @@ -120681,9 +121923,9 @@ }, "tutorial_helpers": { "name": "tutorial.helpers", - "version": "0.2.7", - "sha256": "0r8dadwd6gcvbcyy7kj0l0n8rmbmjfjg3d31pjlfmmgbv0ax21hc", - "depends": ["dplyr", "gridExtra", "learnr", "parsermd", "purrr", "readr", "rmarkdown", "rstudioapi", "shiny", "stringr", "tibble"] + "version": "0.3.0", + "sha256": "0q8rwa2x7ail9rswlldbi8i7dly0yafc4ch4pbz7widgxv1wwc7l", + "depends": ["dplyr", "learnr", "mime", "parsermd", "purrr", "readr", "rmarkdown", "rstudioapi", "rvest", "shiny", "stringr", "tibble"] }, "tv": { "name": "tv", @@ -120701,7 +121943,7 @@ "name": "tvReg", "version": "0.5.9", "sha256": "0viv485l2b93j72274h9m3dkrm2ah0kn37pgbxby3ajg2gi86bh9", - "depends": ["bvarsv", "MASS", "Matrix", "plm", "systemfit", "vars"] + "depends": ["MASS", "Matrix", "bvarsv", "plm", "systemfit", "vars"] }, "tvem": { "name": "tvem", @@ -120747,15 +121989,15 @@ }, "twang": { "name": "twang", - "version": "2.6", - "sha256": "1nvzcrgaspl987ny49rxf3lm3mqiw286kipzrmszdsqwy4m3ha0b", - "depends": ["data_table", "gbm", "ggplot2", "lattice", "latticeExtra", "MatrixModels", "survey", "xgboost", "xtable"] + "version": "2.6.1", + "sha256": "0yci9qp9pvp4a8py2rb18kmxy8k2mblnbdahdkcjh1lviz6pvf0b", + "depends": ["MatrixModels", "data_table", "gbm", "ggplot2", "lattice", "latticeExtra", "survey", "xgboost", "xtable"] }, "twangContinuous": { "name": "twangContinuous", "version": "1.0.0", "sha256": "0bn1i9nid97irn820591ml3556bbmg6pw2qhm9k9vqgnqmnhcfnq", - "depends": ["gbm", "lattice", "Rcpp", "survey", "xtable"] + "depends": ["Rcpp", "gbm", "lattice", "survey", "xtable"] }, "twangMediation": { "name": "twangMediation", @@ -120767,13 +122009,13 @@ "name": "twangRDC", "version": "1.0", "sha256": "03z2c18nq6iwwb3si7wjc56npdyray3xsy6k6ifvbalib2ibv2f1", - "depends": ["data_table", "ggplot2", "MatrixModels", "xgboost"] + "depends": ["MatrixModels", "data_table", "ggplot2", "xgboost"] }, "twdtw": { "name": "twdtw", "version": "1.0-1", "sha256": "1w90942yf5xy1h0pf8x9zmq9wvm3n30flvi88bi0inv63ld17lyf", - "depends": ["proxy", "Rcpp"] + "depends": ["Rcpp", "proxy"] }, "tweedie": { "name": "tweedie", @@ -120791,13 +122033,13 @@ "name": "tweetcheck", "version": "0.1.0", "sha256": "025qshp3q7h54mwxx6707x24dciisf7rh6z7sbzchikrk1gh5wij", - "depends": ["tibble", "V8"] + "depends": ["V8", "tibble"] }, "twenty48": { "name": "twenty48", "version": "0.2.1", "sha256": "1aii4yd10k0jxd6ghdgm5d0pbr9d4m0lg6kaqig58d3s1klw5izd", - "depends": ["crayon", "R6", "rstudioapi"] + "depends": ["R6", "crayon", "rstudioapi"] }, "twfy": { "name": "twfy", @@ -120821,7 +122063,7 @@ "name": "twitteR", "version": "1.1.9", "sha256": "1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr", - "depends": ["bit64", "DBI", "httr", "rjson"] + "depends": ["DBI", "bit64", "httr", "rjson"] }, "twitteradsR": { "name": "twitteradsR", @@ -120839,7 +122081,7 @@ "name": "twl", "version": "1.0", "sha256": "0n2r40ddsr5zpzi92k7f0lvq78k5cmfbqzjxvr78hwq6j13dhar3", - "depends": ["corrplot", "data_table", "MCMCpack", "Rfast"] + "depends": ["MCMCpack", "Rfast", "corrplot", "data_table"] }, "twn": { "name": "twn", @@ -120851,7 +122093,7 @@ "name": "twopartm", "version": "0.1.0", "sha256": "0hncdfc9l1m31158kk5jdciqasv8nqr2q7cam38wi2wclqpk5r5v", - "depends": ["data_table", "MASS"] + "depends": ["MASS", "data_table"] }, "twopexp": { "name": "twopexp", @@ -120879,9 +122121,9 @@ }, "twowaytests": { "name": "twowaytests", - "version": "1.3", - "sha256": "0z04iizdqas9lhmw8i4k5i575j38b9xd4qkk5mrsnk8jm40fljcc", - "depends": ["car", "ggplot2", "nortest", "onewaytests", "wesanderson"] + "version": "1.4", + "sha256": "1blzifflmkcvjysw4bbn81fgydczg9rkcqchw832d322dymh2hzn", + "depends": ["MASS", "car", "ggplot2", "nortest", "onewaytests", "wesanderson"] }, "twoxtwo": { "name": "twoxtwo", @@ -120893,7 +122135,7 @@ "name": "txshift", "version": "0.3.8", "sha256": "0lniwb7lijcasqmhs1zryb9wqf5xka13q4yb9m2j8dblb51y3i79", - "depends": ["assertthat", "data_table", "ggplot2", "hal9001", "haldensify", "latex2exp", "lspline", "mvtnorm", "Rdpack", "scales", "stringr"] + "depends": ["Rdpack", "assertthat", "data_table", "ggplot2", "hal9001", "haldensify", "latex2exp", "lspline", "mvtnorm", "scales", "stringr"] }, "txtplot": { "name": "txtplot", @@ -120905,7 +122147,7 @@ "name": "txtq", "version": "0.2.4", "sha256": "1fvjprcwfqbw9c4sqcxv8r0jgvqmkip6d86r3cgrhwyic1ndk1l5", - "depends": ["base64url", "filelock", "R6"] + "depends": ["R6", "base64url", "filelock"] }, "typed": { "name": "typed", @@ -120951,21 +122193,21 @@ }, "uGMAR": { "name": "uGMAR", - "version": "3.4.5", - "sha256": "01zs919b24qb102qf9m19x0zzyg7yx8v8w674awzfk4lvm27d2aq", + "version": "3.5.0", + "sha256": "0bd5qj3sqb5swirjpind4rap3yssldjv2zd874p52z88rnf3qhys", "depends": ["Brobdingnag", "gsl", "pbapply"] }, "uHMM": { "name": "uHMM", "version": "1.0", "sha256": "1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl", - "depends": ["chron", "class", "cluster", "clValid", "corrplot", "FactoMineR", "HMM", "tcltk2", "tkrplot"] + "depends": ["FactoMineR", "HMM", "chron", "clValid", "class", "cluster", "corrplot", "tcltk2", "tkrplot"] }, "uaparserjs": { "name": "uaparserjs", "version": "0.3.5", "sha256": "0v24smgsz1p2wa23mc2llx7dycwmgf7zyxdhwxgwplabpmy3xzhl", - "depends": ["progress", "V8"] + "depends": ["V8", "progress"] }, "uavRmp": { "name": "uavRmp", @@ -120977,13 +122219,13 @@ "name": "ubiquity", "version": "2.0.3", "sha256": "1w1agdarsh45zf66cbczvippzk3f0ns5dajfbr1181j274f39rnh", - "depends": ["cli", "deSolve", "digest", "doParallel", "dplyr", "flextable", "foreach", "ggplot2", "knitr", "magrittr", "MASS", "onbrand", "optimx", "PKNCA", "pso", "readxl", "rhandsontable", "rmarkdown", "scales", "shiny", "stringr"] + "depends": ["MASS", "PKNCA", "cli", "deSolve", "digest", "doParallel", "dplyr", "flextable", "foreach", "ggplot2", "knitr", "magrittr", "onbrand", "optimx", "pso", "readxl", "rhandsontable", "rmarkdown", "scales", "shiny", "stringr"] }, "ubms": { "name": "ubms", "version": "1.2.6", "sha256": "10jr2nb8pq0rxx1h0zci4zybbj108maa5kdzgf9bj87pzsrxhda7", - "depends": ["BH", "ggplot2", "gridExtra", "lme4", "loo", "Matrix", "pbapply", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "rlang", "RSpectra", "rstan", "rstantools", "StanHeaders", "unmarked"] + "depends": ["BH", "Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "gridExtra", "lme4", "loo", "pbapply", "rlang", "rstan", "rstantools", "unmarked"] }, "uci": { "name": "uci", @@ -120997,6 +122239,12 @@ "sha256": "032anlli29a0iwzmn35afrcs4if5kipplpn8n4qpy1g14hc5zgvd", "depends": ["colorspace", "dplyr", "geometry", "pracma", "ptinpoly", "remotes", "rgl"] }, + "ucimlrepo": { + "name": "ucimlrepo", + "version": "0.0.1", + "sha256": "0v0qprchgi8553hf4aqwd4gn06spbr0yzym8c5z1c3dqy9vp8bax", + "depends": ["httr2"] + }, "uclust": { "name": "uclust", "version": "1.0.0", @@ -121005,15 +122253,15 @@ }, "ucminf": { "name": "ucminf", - "version": "1.2.1", - "sha256": "10ycpzxx73div9vpzmkhy524yd47kzmpl7ajpm248clsv6ivngpd", + "version": "1.2.2", + "sha256": "0adxynpi6mn5n37i1260yr6z7dm39dadr4nwrxks2jgsd7knmnsb", "depends": [] }, "udpipe": { "name": "udpipe", "version": "0.8.11", "sha256": "0crjcfrpb0m7f58w7ksz7kvglvmc45axy9kbbvqz9w6i4kg00aaj", - "depends": ["data_table", "Matrix", "Rcpp"] + "depends": ["Matrix", "Rcpp", "data_table"] }, "udunits2": { "name": "udunits2", @@ -121031,19 +122279,19 @@ "name": "ufs", "version": "0.5.12", "sha256": "002xvhn1mcgfjzaslarra0bv33plyz1a4akjxxbmh4q4v6abxk88", - "depends": ["digest", "diptest", "dplyr", "ggplot2", "ggrepel", "ggridges", "GPArotation", "gridExtra", "gtable", "htmltools", "kableExtra", "knitr", "pander", "plyr", "pwr", "rmdpartials", "scales", "SuppDists"] + "depends": ["GPArotation", "SuppDists", "digest", "diptest", "dplyr", "ggplot2", "ggrepel", "ggridges", "gridExtra", "gtable", "htmltools", "kableExtra", "knitr", "pander", "plyr", "pwr", "rmdpartials", "scales"] }, "ugatsdb": { "name": "ugatsdb", "version": "0.2.3", "sha256": "098dzh6slaxj22730nm9g6b5653600ms2ahxr87iblh5xq0dcidl", - "depends": ["collapse", "data_table", "DBI", "RMySQL", "writexl"] + "depends": ["DBI", "RMySQL", "collapse", "data_table", "writexl"] }, "ugomquantreg": { "name": "ugomquantreg", "version": "1.0.0", "sha256": "1a5vc1qgy3kp1by5bp296w980lkxcghzzxibhap2jg06jnzjfcq8", - "depends": ["gamlss", "gamlss_dist", "pracma", "Rcpp"] + "depends": ["Rcpp", "gamlss", "gamlss_dist", "pracma"] }, "ui": { "name": "ui", @@ -121073,19 +122321,19 @@ "name": "ukbnmr", "version": "2.2", "sha256": "05bcsz74aayi5rk9nv7izj4xz9mmf1yw933syvvp2g0ly6z8l66w", - "depends": ["bit64", "data_table", "MASS"] + "depends": ["MASS", "bit64", "data_table"] }, "ukbtools": { "name": "ukbtools", "version": "0.11.3", "sha256": "1j5p9ypn3s781582all64kvywih1ry0lqsh1zirr35g7r46fy783", - "depends": ["data_table", "doParallel", "dplyr", "foreach", "ggplot2", "magrittr", "purrr", "readr", "scales", "stringr", "tibble", "tidyr", "XML"] + "depends": ["XML", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "magrittr", "purrr", "readr", "scales", "stringr", "tibble", "tidyr"] }, "ukgasapi": { "name": "ukgasapi", "version": "0.21", "sha256": "1acl04bm8f2hgi26mpmzcwp44yv9zxarzw4r4k20b367k8g9rh8a", - "depends": ["httr", "XML"] + "depends": ["XML", "httr"] }, "uklr": { "name": "uklr", @@ -121099,6 +122347,12 @@ "sha256": "1dwwixhiarlpdss7rhiamzcsl1k2yphgmjzh7wn2my4vxj06817l", "depends": ["httr", "jsonlite", "purrr", "snakecase", "tibble"] }, + "ulex": { + "name": "ulex", + "version": "0.1.0", + "sha256": "1h379kqnnp1vvgx35q67h47fd8q9g81m234xsx5vshm3jvqakhn0", + "depends": ["dplyr", "geodist", "hunspell", "ngram", "purrr", "quanteda", "raster", "readr", "sf", "spacyr", "stringdist", "stringi", "stringr", "tidyr", "tidytext", "tm"] + }, "ulid": { "name": "ulid", "version": "0.4.0", @@ -121107,15 +122361,21 @@ }, "ulrb": { "name": "ulrb", - "version": "0.1.3", - "sha256": "0xwlj8cc7y4p51r0p46bz1ac7klrl2b9h7cr704d0cpvcwy11y7f", + "version": "0.1.5", + "sha256": "044gais5550wbr4gbfskm861hanwxmqyv53ghyhdr5868kqx127m", "depends": ["cluster", "clusterSim", "dplyr", "ggplot2", "gridExtra", "purrr", "rlang", "tidyr"] }, + "ultrapolaRplot": { + "name": "ultrapolaRplot", + "version": "0.1.1", + "sha256": "0a1dyz59ian3l1d4qjj8zqnmaiix33nwlsg42m2rq87p3zhh3h6z", + "depends": ["Cairo", "RColorBrewer", "ggplot2", "plyr", "purrr", "readr", "rjson", "stringr", "tibble"] + }, "umap": { "name": "umap", "version": "0.2.10.0", "sha256": "1abfddi0rq75b7nlx6550fx9nrqa62vb92xyp05ris25jf98ciwd", - "depends": ["Matrix", "openssl", "Rcpp", "reticulate", "RSpectra"] + "depends": ["Matrix", "RSpectra", "Rcpp", "openssl", "reticulate"] }, "umbridge": { "name": "umbridge", @@ -121127,7 +122387,7 @@ "name": "umiAnalyzer", "version": "1.0.0", "sha256": "147x48mr9mj0njwbz39876795rninvk89zm9immkppdm4s5g1ghf", - "depends": ["BiocManager", "dplyr", "DT", "forcats", "ggplot2", "gridExtra", "magrittr", "pheatmap", "plotly", "readr", "Rsamtools", "scales", "shiny", "shinydashboard", "shinyFiles", "shinyWidgets", "stringr", "tibble", "tidyr", "viridis"] + "depends": ["BiocManager", "DT", "Rsamtools", "dplyr", "forcats", "ggplot2", "gridExtra", "magrittr", "pheatmap", "plotly", "readr", "scales", "shiny", "shinyFiles", "shinyWidgets", "shinydashboard", "stringr", "tibble", "tidyr", "viridis"] }, "ump": { "name": "ump", @@ -121139,7 +122399,7 @@ "name": "umx", "version": "4.20.0", "sha256": "1b0xkwy9b8sq686smjjl08wmvijnkvm0rh3gy31lamcbw7k0b60w", - "depends": ["cowplot", "DiagrammeR", "foreign", "gert", "ggplot2", "hrbrthemes", "kableExtra", "knitr", "lavaan", "MASS", "Matrix", "MuMIn", "mvtnorm", "nlme", "OpenMx", "openxlsx", "paran", "polycor", "psych", "psychTools", "pwr", "R2HTML", "RCurl", "rmarkdown", "scales", "xtable"] + "depends": ["DiagrammeR", "MASS", "Matrix", "MuMIn", "OpenMx", "R2HTML", "RCurl", "cowplot", "foreign", "gert", "ggplot2", "hrbrthemes", "kableExtra", "knitr", "lavaan", "mvtnorm", "nlme", "openxlsx", "paran", "polycor", "psych", "psychTools", "pwr", "rmarkdown", "scales", "xtable"] }, "unbalhaar": { "name": "unbalhaar", @@ -121147,6 +122407,12 @@ "sha256": "0fgnvl9ammawgm5nf2icw64yzivqw7sl07dpvrsb5rypvrm8d040", "depends": [] }, + "uncertainUCDP": { + "name": "uncertainUCDP", + "version": "0.5.2", + "sha256": "0jrwwdnb7ss5w8ihlxvpjwi2c039kys9lmbdkxsdglkf2a0ck6hx", + "depends": ["dplyr", "mistr", "rlang", "tibble"] + }, "uncertainty": { "name": "uncertainty", "version": "0.2.0", @@ -121163,13 +122429,13 @@ "name": "uncorbets", "version": "0.1.2", "sha256": "1kp1rglxz4p38y399ym6q1p5i3xmb38px44bc4bba4r7x7b47n1x", - "depends": ["assertthat", "NlcOptim"] + "depends": ["NlcOptim", "assertthat"] }, "understandBPMN": { "name": "understandBPMN", "version": "1.1.1", "sha256": "04wnyxplrn5c6jb76dw25pawwcvvn5xq80lqn5imsf31nbwybpm5", - "depends": ["devtools", "dplyr", "purrr", "R_utils", "Rcpp", "tibble", "tidyr", "usethis", "XML"] + "depends": ["R_utils", "Rcpp", "XML", "devtools", "dplyr", "purrr", "tibble", "tidyr", "usethis"] }, "unglue": { "name": "unglue", @@ -121181,7 +122447,7 @@ "name": "ungroup", "version": "1.4.4", "sha256": "12dqhysz26l1jrnf4sz43hdpsxch8g1iah7cxsx7rcac42lhzwdk", - "depends": ["Matrix", "pbapply", "Rcpp", "RcppEigen", "Rdpack"] + "depends": ["Matrix", "Rcpp", "RcppEigen", "Rdpack", "pbapply"] }, "unhcrthemes": { "name": "unhcrthemes", @@ -121205,13 +122471,13 @@ "name": "uniReg", "version": "1.1", "sha256": "0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab", - "depends": ["DoseFinding", "MASS", "mvtnorm", "quadprog", "SEL"] + "depends": ["DoseFinding", "MASS", "SEL", "mvtnorm", "quadprog"] }, "uniah": { "name": "uniah", "version": "1.2", "sha256": "0hv7zgj55am1mlb8vl8k690z641lwsnsxdcvg7zzkhfpj58p7wai", - "depends": ["ahaz", "Iso", "survival"] + "depends": ["Iso", "ahaz", "survival"] }, "unicol": { "name": "unicol", @@ -121235,7 +122501,7 @@ "name": "unifir", "version": "0.2.4", "sha256": "02d9h1yalha7b7bdsjqpq1xa3gg0spfk42q2wxv1bjsizzbnbq2r", - "depends": ["glue", "proceduralnames", "R6"] + "depends": ["R6", "glue", "proceduralnames"] }, "uniformly": { "name": "uniformly", @@ -121271,7 +122537,7 @@ "name": "unisensR", "version": "0.3.3", "sha256": "1pqfb8i3rj64l9hh1bn9mm78wlfqphgrlp7zrydznqy88f4jwgvy", - "depends": ["hexView", "vroom", "XML"] + "depends": ["XML", "hexView", "vroom"] }, "uniset": { "name": "uniset", @@ -121295,7 +122561,7 @@ "name": "unitquantreg", "version": "0.0.6", "sha256": "087d4v5fpiznl37frjg6c01bfgvx3vx0yw8cnbm3wsdj9dak94ym", - "depends": ["Formula", "MASS", "numDeriv", "optimx", "quantreg", "Rcpp"] + "depends": ["Formula", "MASS", "Rcpp", "numDeriv", "optimx", "quantreg"] }, "units": { "name": "units", @@ -121305,8 +122571,8 @@ }, "unittest": { "name": "unittest", - "version": "1.6-1", - "sha256": "1y035zj23am2d6cmfz93nyflwwivfy5lq4m5d17yb6s1lir057pn", + "version": "1.7-0", + "sha256": "157py251fq3hkqv4782jaymahskahh10mcsva4nci681p2683wvb", "depends": [] }, "univOutl": { @@ -121349,7 +122615,7 @@ "name": "unmarked", "version": "1.4.1", "sha256": "1ishwzqkkvin7vralpxnb2fdc75gvsxz1l5b9902y4h0mm4749qw", - "depends": ["lattice", "lme4", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "TMB"] + "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "TMB", "lattice", "lme4"] }, "unmconf": { "name": "unmconf", @@ -121385,13 +122651,13 @@ "name": "unstruwwel", "version": "0.2.0", "sha256": "1s8vfmh1lafb244r0bwp4m0r9x5la95lglxqvhb4sq9wmah04ka7", - "depends": ["assertthat", "dplyr", "lubridate", "magrittr", "purrr", "R6", "rlang", "stringr", "tibble", "tidyr"] + "depends": ["R6", "assertthat", "dplyr", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"] }, "unsystation": { "name": "unsystation", "version": "0.2.0", "sha256": "02da7wzzk5bwd475i67v5x04ay2bn5yd5xffl1asqcqxcc5sy0m8", - "depends": ["doParallel", "foreach", "iterators", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "iterators"] }, "untb": { "name": "untb", @@ -121433,7 +122699,7 @@ "name": "updog", "version": "2.1.5", "sha256": "118i7z797cc7hhsk0i4w7n0p7znw9szvn7mbymc7d9yqnck4x6d9", - "depends": ["assertthat", "doFuture", "doRNG", "foreach", "future", "ggplot2", "iterators", "Rcpp", "RcppArmadillo", "reshape2"] + "depends": ["Rcpp", "RcppArmadillo", "assertthat", "doFuture", "doRNG", "foreach", "future", "ggplot2", "iterators", "reshape2"] }, "upndown": { "name": "upndown", @@ -121463,12 +122729,12 @@ "name": "uptimeRobot", "version": "1.0.0", "sha256": "1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww", - "depends": ["plyr", "RCurl", "rjson"] + "depends": ["RCurl", "plyr", "rjson"] }, "ura": { "name": "ura", - "version": "1.0.0", - "sha256": "18gs49hcmii951f995ch1sbk69lpf458halff539l8birv26q70d", + "version": "1.0.1", + "sha256": "1ahj58yn7gn8lcj95xxzg39p7vznppslqj4vyq5x66c21vq7dmn4", "depends": ["dplyr", "irr", "magrittr", "rlang", "tibble", "tidyr"] }, "urbin": { @@ -121563,21 +122829,21 @@ }, "usedthese": { "name": "usedthese", - "version": "0.4.0", - "sha256": "0qzhydj0i6cg2w8qfgabx10vqfzkfhv7vq8qds6d624c3ayc653h", - "depends": ["conflicted", "dplyr", "highr", "kableExtra", "knitr", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "withr"] + "version": "0.5.0", + "sha256": "0ahcyvy2w87mx2qr7pl1fzihiqnsjqbbx1ba435b8ypyz7fzrpy6", + "depends": ["cli", "conflicted", "dplyr", "highr", "httr", "kableExtra", "knitr", "lifecycle", "purrr", "readr", "rlang", "rvest", "stringr", "tibble", "tidyr", "tidyselect", "withr"] }, "useful": { "name": "useful", "version": "1.2.6.1", "sha256": "1gb9hqvbm6pr56dfqlsgz26lan7xargfsm8jpdja18mpgli2gyvc", - "depends": ["assertthat", "dplyr", "ggplot2", "magrittr", "Matrix", "plyr", "purrr", "scales"] + "depends": ["Matrix", "assertthat", "dplyr", "ggplot2", "magrittr", "plyr", "purrr", "scales"] }, "usefun": { "name": "usefun", "version": "0.5.0", "sha256": "1gpyix8xpn4jmfjrycan6r1qvp7z7mhcngp02fcws6k2hvd7jajr", - "depends": ["dplyr", "PRROC"] + "depends": ["PRROC", "dplyr"] }, "usemodels": { "name": "usemodels", @@ -121587,8 +122853,8 @@ }, "usethis": { "name": "usethis", - "version": "2.2.3", - "sha256": "1cyy1k5iansg63ziph4w76kzl59dgmam7m2wp6sz9d93bjcrh34d", + "version": "3.0.0", + "sha256": "1dfcyxvw95lhm4giarsw266833sfbckk44nddjqpxqxarvwm1y4q", "depends": ["cli", "clipr", "crayon", "curl", "desc", "fs", "gert", "gh", "glue", "jsonlite", "lifecycle", "purrr", "rappdirs", "rlang", "rprojroot", "rstudioapi", "whisker", "withr", "yaml"] }, "usfertilizer": { @@ -121607,7 +122873,7 @@ "name": "usincometaxes", "version": "0.7.1", "sha256": "1ryml266c7zbzlh5rq2h6gy8flchrjbrlapsy2vvc9s5mwc58vaj", - "depends": ["tibble", "V8", "vroom"] + "depends": ["V8", "tibble", "vroom"] }, "uskewFactors": { "name": "uskewFactors", @@ -121649,7 +122915,7 @@ "name": "ustyc", "version": "1.0.0", "sha256": "1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4", - "depends": ["plyr", "XML"] + "depends": ["XML", "plyr"] }, "utc": { "name": "utc", @@ -121697,18 +122963,18 @@ "name": "utilsIPEA", "version": "0.0.6", "sha256": "07avc0j6qkzqmznbydn0zdg743g7g7kn2bcx5n03m3wg0fqyggr7", - "depends": ["data_table", "dplyr", "RCurl", "stringdist", "stringr"] + "depends": ["RCurl", "data_table", "dplyr", "stringdist", "stringr"] }, "utiml": { "name": "utiml", "version": "0.1.7", "sha256": "16l64scyipj7plwyv6whv3h040sgvzxx43jhjxyhrcdci4pqwh94", - "depends": ["mldr", "ROCR"] + "depends": ["ROCR", "mldr"] }, "uuid": { "name": "uuid", - "version": "1.2-0", - "sha256": "1z9a4b7hkymkwjq69d00myy5xw8kl9g99f4m2y4lxqqjz0a0lwbk", + "version": "1.2-1", + "sha256": "15jbzj0i4qphakbi8s9yk55lm8z9s2vhgp5bj77sfvkx7mrlj3pr", "depends": [] }, "uwedragon": { @@ -121721,7 +122987,7 @@ "name": "uwot", "version": "0.2.2", "sha256": "1lbckamb2hk24qxcvchdfid982cvcz64j9hvdnrx8c4ms91qr4yr", - "depends": ["dqrng", "FNN", "irlba", "Matrix", "Rcpp", "RcppAnnoy", "RcppProgress", "RSpectra"] + "depends": ["FNN", "Matrix", "RSpectra", "Rcpp", "RcppAnnoy", "RcppProgress", "dqrng", "irlba"] }, "uxr": { "name": "uxr", @@ -121733,13 +122999,13 @@ "name": "vDiveR", "version": "1.2.1", "sha256": "1rxygl5micg07p7la9wyvp4dmfwkjdbhqp660mrq6a3drr4x5bj2", - "depends": ["dplyr", "DT", "gghalves", "ggplot2", "ggpubr", "ggtext", "gridExtra", "magrittr", "maps", "plyr", "readr", "rentrez", "rlang", "scales", "stringr", "tidyr"] + "depends": ["DT", "dplyr", "gghalves", "ggplot2", "ggpubr", "ggtext", "gridExtra", "magrittr", "maps", "plyr", "readr", "rentrez", "rlang", "scales", "stringr", "tidyr"] }, "vICC": { "name": "vICC", "version": "1.0.0", "sha256": "13lcs7wwj1xfbjf3q7r8ssf00jg5hr1vjp2pyw0r42iz7mx47xjv", - "depends": ["coda", "ggplot2", "nlme", "Rdpack", "rjags"] + "depends": ["Rdpack", "coda", "ggplot2", "nlme", "rjags"] }, "vMF": { "name": "vMF", @@ -121757,7 +123023,7 @@ "name": "vaccine", "version": "1.2.1", "sha256": "0pqgavah2bjb0mw8irgri9sglaff3assx10xmhqnixb4jig8d87r", - "depends": ["dplyr", "e1071", "fdrtool", "gam", "ggplot2", "ggpubr", "ranger", "rlang", "Rsolnp", "simest", "SuperLearner", "survival", "survML", "truncnorm"] + "depends": ["Rsolnp", "SuperLearner", "dplyr", "e1071", "fdrtool", "gam", "ggplot2", "ggpubr", "ranger", "rlang", "simest", "survML", "survival", "truncnorm"] }, "vacuum": { "name": "vacuum", @@ -121793,7 +123059,7 @@ "name": "vagam", "version": "1.1", "sha256": "1bgpf0z23yqyaz7dfmqilyqvr5v4w891027xrlr0mk9grj4srmiq", - "depends": ["gamm4", "Matrix", "mgcv", "mvtnorm", "truncnorm"] + "depends": ["Matrix", "gamm4", "mgcv", "mvtnorm", "truncnorm"] }, "valaddin": { "name": "valaddin", @@ -121835,7 +123101,7 @@ "name": "validata", "version": "0.1.0", "sha256": "01ghnkkhqgjllpwdvphcqymps7jq3wd919rplk092iiwwq1mpb9m", - "depends": ["badger", "BBmisc", "data_table", "dplyr", "framecleaner", "gtools", "janitor", "listviewer", "magrittr", "purrr", "rlang", "rlist", "scales", "stringr", "tibble", "tidyr", "tidyselect"] + "depends": ["BBmisc", "badger", "data_table", "dplyr", "framecleaner", "gtools", "janitor", "listviewer", "magrittr", "purrr", "rlang", "rlist", "scales", "stringr", "tibble", "tidyr", "tidyselect"] }, "validate": { "name": "validate", @@ -121847,7 +123113,7 @@ "name": "validateIt", "version": "1.2.1", "sha256": "16lcbn853rfnyh8hlvjdxh4abx6wkzsn876fh4mlfkpbcrnmp0ps", - "depends": ["here", "pyMTurkR", "rlang", "SnowballC", "tm"] + "depends": ["SnowballC", "here", "pyMTurkR", "rlang", "tm"] }, "validatesuggest": { "name": "validatesuggest", @@ -121865,7 +123131,7 @@ "name": "validmind", "version": "0.1.1", "sha256": "1rj93fgkix3xr1lla286whf06pnhs0n9hz23s85yn9155f7xgndk", - "depends": ["base64enc", "dplyr", "DT", "glue", "htmltools", "plotly", "reticulate", "rmarkdown"] + "depends": ["DT", "base64enc", "dplyr", "glue", "htmltools", "plotly", "reticulate", "rmarkdown"] }, "valmetrics": { "name": "valmetrics", @@ -121889,7 +123155,7 @@ "name": "valr", "version": "0.8.1", "sha256": "1pp8naglh26yi8c2p15arx8jkj3jyslzw7j3n5bnzngdpfprk3as", - "depends": ["broom", "cli", "dplyr", "ggplot2", "lifecycle", "Rcpp", "readr", "rlang", "rtracklayer", "stringr", "tibble"] + "depends": ["Rcpp", "broom", "cli", "dplyr", "ggplot2", "lifecycle", "readr", "rlang", "rtracklayer", "stringr", "tibble"] }, "valueEQ5D": { "name": "valueEQ5D", @@ -121919,7 +123185,7 @@ "name": "vampyr", "version": "1.1.1", "sha256": "137sdv4shmjg1cpndjknrys2jkvyq3p9l11nrdh0bzp9xxc1wkh1", - "depends": ["corpcor", "EFA_MRFA", "fungible", "GPArotation", "lavaan", "moments", "PCovR", "psych", "semPlot"] + "depends": ["EFA_MRFA", "GPArotation", "PCovR", "corpcor", "fungible", "lavaan", "moments", "psych", "semPlot"] }, "vandalico": { "name": "vandalico", @@ -121943,19 +123209,19 @@ "name": "vanquish", "version": "1.0.0", "sha256": "01di1j36npl7vnyhgsagvyf6j8bxcw867dwf9dgi7l1328s7lf0l", - "depends": ["changepoint", "e1071", "ggplot2", "VGAM"] + "depends": ["VGAM", "changepoint", "e1071", "ggplot2"] }, "vapour": { "name": "vapour", "version": "0.10.0", "sha256": "18icwn62mpjjrfn7y19svyipq1xziz3vag5vmgp7wxy5i8q5kvch", - "depends": ["jsonlite", "Rcpp"] + "depends": ["Rcpp", "jsonlite"] }, "varEst": { "name": "varEst", "version": "0.1.0", "sha256": "0i6nsxl5w4zipzrmdvx8plmxr33n405w2qhks3s7zzs3kcys32v6", - "depends": ["caret", "glmnet", "lm_beta", "SAM"] + "depends": ["SAM", "caret", "glmnet", "lm_beta"] }, "varImp": { "name": "varImp", @@ -121979,7 +123245,7 @@ "name": "varTestnlme", "version": "1.3.5", "sha256": "1qxbx1hwylybm4nza6a7bqgck0krvbcvwabp1710dhkk7skfgk8x", - "depends": ["alabama", "anocva", "corpcor", "doParallel", "foreach", "lme4", "lmeresampler", "Matrix", "merDeriv", "msm", "mvtnorm", "nlme", "quadprog", "saemix"] + "depends": ["Matrix", "alabama", "anocva", "corpcor", "doParallel", "foreach", "lme4", "lmeresampler", "merDeriv", "msm", "mvtnorm", "nlme", "quadprog", "saemix"] }, "varband": { "name": "varband", @@ -121997,13 +123263,13 @@ "name": "varbvs", "version": "2.6-10", "sha256": "0sjna51mz433s24dkjcq2aal6ss41gx6xlm2l45rm6s1q1k4m87f", - "depends": ["lattice", "latticeExtra", "Matrix", "nor1mix", "Rcpp"] + "depends": ["Matrix", "Rcpp", "lattice", "latticeExtra", "nor1mix"] }, "varclust": { "name": "varclust", "version": "0.9.4", "sha256": "0knmfq3pn38j8p29j6sqapdv3g5335si3gwiw932ml5z49a8ga5m", - "depends": ["doParallel", "doRNG", "foreach", "pesel", "RcppEigen"] + "depends": ["RcppEigen", "doParallel", "doRNG", "foreach", "pesel"] }, "vardiag": { "name": "vardiag", @@ -122015,7 +123281,7 @@ "name": "vardpoor", "version": "0.20.1", "sha256": "0jqls76xhhxc5hppy3pq5wkj9gjx3g3pzfbhnis7k10ysn76a1qj", - "depends": ["data_table", "foreach", "laeken", "MASS", "stringr", "surveyplanning"] + "depends": ["MASS", "data_table", "foreach", "laeken", "stringr", "surveyplanning"] }, "varhandle": { "name": "varhandle", @@ -122039,7 +123305,7 @@ "name": "varian", "version": "0.2.2", "sha256": "0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i", - "depends": ["Formula", "ggplot2", "gridExtra", "MASS", "rstan"] + "depends": ["Formula", "MASS", "ggplot2", "gridExtra", "rstan"] }, "variantspark": { "name": "variantspark", @@ -122063,13 +123329,13 @@ "name": "varitas", "version": "0.0.2", "sha256": "16y0fcisdf4pypwqshy9c45v57axa25k8cpp1pr2ij95zycs3g1k", - "depends": ["assertthat", "doParallel", "dplyr", "foreach", "magrittr", "openxlsx", "stringr", "tidyr", "VennDiagram", "yaml"] + "depends": ["VennDiagram", "assertthat", "doParallel", "dplyr", "foreach", "magrittr", "openxlsx", "stringr", "tidyr", "yaml"] }, "varjmcm": { "name": "varjmcm", "version": "0.1.1", "sha256": "1xgy3n57pxhv6wrsw9h4dranxbw6hdpm1f9ra3kwlzrpz5c3289x", - "depends": ["expm", "jmcm", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "expm", "jmcm"] }, "varoc": { "name": "varoc", @@ -122087,25 +123353,19 @@ "name": "vars", "version": "1.6-1", "sha256": "1i8ldzb44wnlaww8a0k6sgfj1khgah5v445gi45d7vgv68rg0gcv", - "depends": ["lmtest", "MASS", "sandwich", "strucchange", "urca"] - }, - "varsExplore": { - "name": "varsExplore", - "version": "0.3.0", - "sha256": "0d18wqq7fbs5ljdphsdgqmv8ab0wrzzykjhf4lqksi7n78s1fa2r", - "depends": ["dplyr", "DT", "glue", "magrittr", "purrr", "rio", "rstudioapi", "stringr", "tidyr"] + "depends": ["MASS", "lmtest", "sandwich", "strucchange", "urca"] }, "vartest": { "name": "vartest", "version": "1.2", "sha256": "0bnfyp6qh19nxsl9hzkz7ib9jgbv00vywzqwz6jvvcrxlii7023z", - "depends": ["psych", "SuppDists"] + "depends": ["SuppDists", "psych"] }, "varycoef": { "name": "varycoef", "version": "0.3.4", "sha256": "1dfych3qhqq4qadizxjgh4lswnm47m2g59gv14c8j349ji94i8qh", - "depends": ["glmnet", "lhs", "mlr", "mlrMBO", "optimParallel", "ParamHelpers", "pbapply", "smoof", "spam"] + "depends": ["ParamHelpers", "glmnet", "lhs", "mlr", "mlrMBO", "optimParallel", "pbapply", "smoof", "spam"] }, "vasicek": { "name": "vasicek", @@ -122117,7 +123377,7 @@ "name": "vasicekreg", "version": "1.0.1", "sha256": "0hlac3p6mm7x88wdlqc93byx1s2a287kvhwzhz01pz4anap30683", - "depends": ["gamlss", "gamlss_dist", "mvtnorm", "Rcpp"] + "depends": ["Rcpp", "gamlss", "gamlss_dist", "mvtnorm"] }, "vatcheckapi": { "name": "vatcheckapi", @@ -122129,13 +123389,13 @@ "name": "vaultr", "version": "1.2.0", "sha256": "1dbwr50jsx8m615wdlk437ac23y4dk9iqcihlbnail470hfdq5gw", - "depends": ["getPass", "httr", "jsonlite", "R6"] + "depends": ["R6", "getPass", "httr", "jsonlite"] }, "vaxpmx": { "name": "vaxpmx", "version": "0.0.3", "sha256": "0slbp5iaafwa3bw8mrzraq8yvklvyji1r4bvmvwlmgr99yk2kgk4", - "depends": ["dplyr", "MASS"] + "depends": ["MASS", "dplyr"] }, "vcPB": { "name": "vcPB", @@ -122147,25 +123407,25 @@ "name": "vccp", "version": "0.1.1", "sha256": "1c0mk46c74kj5y9rfniywbxxmwb2z16szzpq6b2sw8q0qi1cf5ji", - "depends": ["mosum", "mvtnorm", "VineCopula"] + "depends": ["VineCopula", "mosum", "mvtnorm"] }, "vcd": { "name": "vcd", "version": "1.4-12", "sha256": "127dkln826ah5ydp3pmd5bqyns9m9m6yrjnmn7fir4r9al8yycf9", - "depends": ["colorspace", "lmtest", "MASS"] + "depends": ["MASS", "colorspace", "lmtest"] }, "vcdExtra": { "name": "vcdExtra", "version": "0.8-5", "sha256": "09kpfnyi6q7xn4x6f7i3k8g6f2fdnm7kk81lxjmlhhn36jxc2p2i", - "depends": ["ca", "dplyr", "glue", "gnm", "here", "MASS", "purrr", "readxl", "stringr", "tidyr", "vcd"] + "depends": ["MASS", "ca", "dplyr", "glue", "gnm", "here", "purrr", "readxl", "stringr", "tidyr", "vcd"] }, "vcfR": { "name": "vcfR", "version": "1.15.0", "sha256": "1yj91cphin232m09wrpj8l27vxblyryh658siakz55hxjs5y85yz", - "depends": ["ape", "dplyr", "magrittr", "memuse", "pinfsc50", "Rcpp", "stringr", "tibble", "vegan", "viridisLite"] + "depends": ["Rcpp", "ape", "dplyr", "magrittr", "memuse", "pinfsc50", "stringr", "tibble", "vegan", "viridisLite"] }, "vcfppR": { "name": "vcfppR", @@ -122175,9 +123435,9 @@ }, "vcmeta": { "name": "vcmeta", - "version": "1.3.0", - "sha256": "11z1kfmd2kamkf39gr5ppry1g4pgrpqnyzbc2bgd1yay6yjhl93z", - "depends": ["ggplot2", "mathjaxr", "Rdpack"] + "version": "1.4.0", + "sha256": "0122xzfwsvxv0rwdaf331nwlikcwm409lya9wm8k037dk46gx2w3", + "depends": ["Rdpack", "ggplot2", "mathjaxr"] }, "vcov": { "name": "vcov", @@ -122189,13 +123449,13 @@ "name": "vcpen", "version": "1.9", "sha256": "0gg5ln9r7i8rh91pf7789fic4aah22jc259qyg606bax2w57qmi5", - "depends": ["knitr", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "knitr"] }, "vcr": { "name": "vcr", - "version": "1.2.2", - "sha256": "0vqq4lwgk9ss3x2vhkmgcymdwfppxjbaycm7pwik70sz9pkdk2d4", - "depends": ["base64enc", "crul", "httr", "R6", "rprojroot", "urltools", "webmockr", "yaml"] + "version": "1.6.0", + "sha256": "0jp6p9k6y2rshxyq5hb3gv3idk2l426cizy1j2aqcz3s503axsxf", + "depends": ["R6", "base64enc", "crul", "httr", "httr2", "rprojroot", "urltools", "webmockr", "yaml"] }, "vcrpart": { "name": "vcrpart", @@ -122249,7 +123509,7 @@ "name": "veccompare", "version": "0.1.0", "sha256": "03nyyxvhhwfxxg5w6qflk7q234ipbhj9fd4abcp50sxz3diabch1", - "depends": ["corrplot", "gtools", "pander", "purrr", "qgraph", "reshape2", "VennDiagram"] + "depends": ["VennDiagram", "corrplot", "gtools", "pander", "purrr", "qgraph", "reshape2"] }, "vecsets": { "name": "vecsets", @@ -122265,15 +123525,15 @@ }, "vectorsurvR": { "name": "vectorsurvR", - "version": "0.1.0", - "sha256": "00j2blaf5l8ancn4yjfywmw4l1kysxqkqfd5pg4klcr0h4idcnqd", - "depends": ["dplyr", "DT", "ggplot2", "httr", "jsonlite", "kableExtra", "knitr", "lubridate", "magrittr", "plotly", "rstudioapi", "stringr", "tidyr"] + "version": "0.2.0", + "sha256": "17h634yb4fqc3xgp48qxvrfzn0ly2x91j76i8cap90rhidq0vqxx", + "depends": ["DT", "dplyr", "ggplot2", "httr", "jsonlite", "kableExtra", "knitr", "lubridate", "magrittr", "plotly", "rstudioapi", "stringr", "tidyr"] }, "vectorwavelet": { "name": "vectorwavelet", "version": "0.1.0", "sha256": "1z0gl28hgrqgx0ynv248a80fh190pm15c9cg1l1665acrw62kqs7", - "depends": ["biwavelet", "fields", "foreach", "iterators", "maps", "Rcpp", "spam"] + "depends": ["Rcpp", "biwavelet", "fields", "foreach", "iterators", "maps", "spam"] }, "vegalite": { "name": "vegalite", @@ -122285,7 +123545,7 @@ "name": "vegan", "version": "2.6-6.1", "sha256": "0q0bp7xxmab1gcqk8wwm81sdvhccdvz5vqyn0grbwfb619q5wakx", - "depends": ["cluster", "lattice", "MASS", "mgcv", "permute"] + "depends": ["MASS", "cluster", "lattice", "mgcv", "permute"] }, "vegan3d": { "name": "vegan3d", @@ -122309,7 +123569,7 @@ "name": "vegdata", "version": "0.9.12", "sha256": "1fgha0sxgymiqnr6gwa3pjmbvb76iwxnpxs666zifscch4fz3z99", - "depends": ["curl", "DBI", "dbplyr", "dplyr", "foreign", "hoardr", "httr", "indicspecies", "magrittr", "plyr", "RSQLite", "stringr", "xml2"] + "depends": ["DBI", "RSQLite", "curl", "dbplyr", "dplyr", "foreign", "hoardr", "httr", "indicspecies", "magrittr", "plyr", "stringr", "xml2"] }, "vegperiod": { "name": "vegperiod", @@ -122373,8 +123633,8 @@ }, "verbalisr": { "name": "verbalisr", - "version": "0.5.2", - "sha256": "1h00dwfsw2k5x2m0mpwh2ni8wsvixv7i4ps4vl4pmhq73xxx3f9a", + "version": "0.6.0", + "sha256": "1i324dmcbm9pgkmb0v21x3z89vvb6805ziq059xf49p3m6m3ad8s", "depends": ["pedtools", "ribd"] }, "verhoeff": { @@ -122387,7 +123647,7 @@ "name": "verification", "version": "1.42", "sha256": "0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw", - "depends": ["boot", "CircStats", "dtw", "fields", "MASS"] + "depends": ["CircStats", "MASS", "boot", "dtw", "fields"] }, "vermeulen": { "name": "vermeulen", @@ -122399,7 +123659,7 @@ "name": "versioning", "version": "0.1.0", "sha256": "0r4ffd1s9warfan7ldcd6sn98qimsllf77dhxfygblr8spxcl7h5", - "depends": ["assertthat", "data_table", "foreign", "glue", "haven", "R6", "sf", "terra", "yaml"] + "depends": ["R6", "assertthat", "data_table", "foreign", "glue", "haven", "sf", "terra", "yaml"] }, "versions": { "name": "versions", @@ -122433,8 +123693,8 @@ }, "vetr": { "name": "vetr", - "version": "0.2.16", - "sha256": "0dpk2mfa6xk8b0zvanymgr00mydjvqmmax6n7cfvxd0gviwbfap4", + "version": "0.2.18", + "sha256": "0ymbv6d1xvsnpvhn6pniiwxw9fjyxy8bahkwfh56rxqlv9qx3pi0", "depends": [] }, "vfcp": { @@ -122459,7 +123719,7 @@ "name": "vglmer", "version": "1.0.3", "sha256": "0wfl1n6xp6qiv34d4p5qy3mwzrvf3n324hrlksdpa68j5xfw9w0f", - "depends": ["CholWishart", "lme4", "lmtest", "Matrix", "mgcv", "mvtnorm", "Rcpp", "RcppEigen"] + "depends": ["CholWishart", "Matrix", "Rcpp", "RcppEigen", "lme4", "lmtest", "mgcv", "mvtnorm"] }, "vhcub": { "name": "vhcub", @@ -122489,7 +123749,7 @@ "name": "vici", "version": "0.7.3", "sha256": "0gghmn7bs4wr2r24s794ljvz2r3qv0clvgj54b6hxmgn1b48bxg0", - "depends": ["cowplot", "DT", "ggplot2", "ggpubr", "nlme", "numDeriv", "RColorBrewer", "scales", "shiny", "shinyWidgets", "stringr", "tidyr"] + "depends": ["DT", "RColorBrewer", "cowplot", "ggplot2", "ggpubr", "nlme", "numDeriv", "scales", "shiny", "shinyWidgets", "stringr", "tidyr"] }, "video": { "name": "video", @@ -122513,13 +123773,13 @@ "name": "viewpoly", "version": "0.4.1", "sha256": "1c97khxsfnml21wh8np4qp7w2w31zxw72dl5vy25jjpx06dbp814", - "depends": ["abind", "config", "dplyr", "DT", "ggplot2", "ggpubr", "golem", "hidecan", "JBrowseR", "markdown", "plotly", "purrr", "reshape2", "shiny", "shinydashboard", "shinyjs", "shinythemes", "shinyWidgets", "tidyr", "vroom"] + "depends": ["DT", "JBrowseR", "abind", "config", "dplyr", "ggplot2", "ggpubr", "golem", "hidecan", "markdown", "plotly", "purrr", "reshape2", "shiny", "shinyWidgets", "shinydashboard", "shinyjs", "shinythemes", "tidyr", "vroom"] }, "viewscape": { "name": "viewscape", "version": "1.0.0", "sha256": "1hjr6r6p5n4knmbdd38dpdlwdpycq8k5im0i0rfk28xnix7769mv", - "depends": ["dplyr", "ForestTools", "pbmcapply", "Rcpp", "rlang", "sf", "sp", "terra"] + "depends": ["ForestTools", "Rcpp", "dplyr", "pbmcapply", "rlang", "sf", "sp", "terra"] }, "viking": { "name": "viking", @@ -122537,13 +123797,13 @@ "name": "vimp", "version": "2.3.3", "sha256": "069pcxzavi213idpslnc1skylsb1wn6xldajnn54prlwq9hkfb19", - "depends": ["boot", "data_table", "dplyr", "magrittr", "MASS", "rlang", "ROCR", "SuperLearner", "tibble"] + "depends": ["MASS", "ROCR", "SuperLearner", "boot", "data_table", "dplyr", "magrittr", "rlang", "tibble"] }, "vimpclust": { "name": "vimpclust", "version": "0.1.0", "sha256": "0ly7piz7q88sh2g7zq5b2pqph9467b4fclgq9amm0m7xc8vrv4f9", - "depends": ["ggplot2", "mclust", "PCAmixdata", "Polychrome", "rlang"] + "depends": ["PCAmixdata", "Polychrome", "ggplot2", "mclust", "rlang"] }, "vindecodr": { "name": "vindecodr", @@ -122555,13 +123815,13 @@ "name": "vinereg", "version": "0.10.0", "sha256": "0r4xg3a2mk7030z2vc1w5g0390vkhbnq757cj9j5imki2ii2xfnz", - "depends": ["assertthat", "BH", "kde1d", "Rcpp", "RcppEigen", "RcppThread", "rvinecopulib", "wdm"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppThread", "assertthat", "kde1d", "rvinecopulib", "wdm"] }, "vines": { "name": "vines", "version": "1.1.5", "sha256": "057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1", - "depends": ["ADGofTest", "copula", "cubature", "TSP"] + "depends": ["ADGofTest", "TSP", "copula", "cubature"] }, "violinplotter": { "name": "violinplotter", @@ -122571,8 +123831,8 @@ }, "vioplot": { "name": "vioplot", - "version": "0.4.0", - "sha256": "1db7g0378jbcd6ssb7afff4y4r0v472qnb625hfwixx4wf1v8aap", + "version": "0.5.0", + "sha256": "0r89ac9ilz1jwwfgylzscg3c8is7dsy3c4dcl89ksmqhp3692kmh", "depends": ["sm", "zoo"] }, "vip": { @@ -122589,9 +123849,9 @@ }, "viraldomain": { "name": "viraldomain", - "version": "0.0.3", - "sha256": "10lk3rjfr2faj8wdxd0v1c0xk22bzsrl1arz6ab5xxsd0zzc9kxh", - "depends": ["applicable", "dplyr", "earth", "ggplot2", "kknn", "nnet", "parsnip", "recipes", "vdiffr", "workflows"] + "version": "0.0.5", + "sha256": "0cm6k88jr1vyc2k61cpkj49kcha1v9cpkafslzdh8zy5ngbsfy1j", + "depends": ["applicable", "dplyr", "ggplot2", "parsnip", "recipes", "tidyselect", "workflows"] }, "viralmodels": { "name": "viralmodels", @@ -122603,7 +123863,7 @@ "name": "viralx", "version": "1.3.0", "sha256": "1449r74g4q7qigyqb21sasdyr80542b4lfavjszh2s5bd8pkc8di", - "depends": ["DALEX", "DALEXtra", "dplyr", "earth", "Formula", "kknn", "parsnip", "plotmo", "plotrix", "recipes", "rsample", "TeachingDemos", "vdiffr", "workflows"] + "depends": ["DALEX", "DALEXtra", "Formula", "TeachingDemos", "dplyr", "earth", "kknn", "parsnip", "plotmo", "plotrix", "recipes", "rsample", "vdiffr", "workflows"] }, "viridis": { "name": "viridis", @@ -122633,7 +123893,7 @@ "name": "virtuoso", "version": "0.1.8", "sha256": "1smb8sjfqcp3jflplgf92swasxzrp72fnnqwyisf87pjknm91qsc", - "depends": ["curl", "DBI", "digest", "fs", "ini", "odbc", "processx", "ps", "rappdirs"] + "depends": ["DBI", "curl", "digest", "fs", "ini", "odbc", "processx", "ps", "rappdirs"] }, "virustotal": { "name": "virustotal", @@ -122653,12 +123913,6 @@ "sha256": "1lfvihny8r8x0qhzlqhq3wysijypkqz3mgd70j9cy71m5hhypx6z", "depends": ["cli", "dplyr", "generics", "glue", "lifecycle", "omopgenerics", "rlang", "stringr", "tidyr"] }, - "visR": { - "name": "visR", - "version": "0.4.1", - "sha256": "1ra2fky23fv3rc9gj4zg64s2c2xcc52whf24wp2nfmg1f0nr278g", - "depends": ["broom", "cowplot", "dplyr", "DT", "forcats", "ggplot2", "gridExtra", "gt", "gtable", "kableExtra", "knitr", "lifecycle", "rlang", "survival", "tibble", "tidycmprsk", "tidyr"] - }, "visStatistics": { "name": "visStatistics", "version": "0.1.1", @@ -122675,13 +123929,13 @@ "name": "visa", "version": "0.1.0", "sha256": "1mx7nbbpxs4fdp781a75qvffa42dx2n6anslbfs9bnprmvzmljqr", - "depends": ["ggplot2", "ggpmisc", "Matrix", "RColorBrewer", "reshape2"] + "depends": ["Matrix", "RColorBrewer", "ggplot2", "ggpmisc", "reshape2"] }, "visaOTR": { "name": "visaOTR", "version": "0.1.0", "sha256": "12ix8ljbykwf493hw6npli2ad665jip2mzb8p25j5v10f8ij88qm", - "depends": ["e1071", "kernlab", "Matrix", "mboost", "randomForest", "Rglpk", "xgboost"] + "depends": ["Matrix", "Rglpk", "e1071", "kernlab", "mboost", "randomForest", "xgboost"] }, "visachartR": { "name": "visachartR", @@ -122693,19 +123947,19 @@ "name": "visae", "version": "0.2.0", "sha256": "0ycwb380z8nb646w7w42952lwvdi8prmph7yv1lraswvp4wjfx3p", - "depends": ["ca", "dplyr", "DT", "ggplot2", "ggrepel", "magrittr", "rlang", "shiny", "shinyjs", "tidyr"] + "depends": ["DT", "ca", "dplyr", "ggplot2", "ggrepel", "magrittr", "rlang", "shiny", "shinyjs", "tidyr"] }, "viscomp": { "name": "viscomp", "version": "1.0.0", "sha256": "18s9qapznc50xwjr3lx48nsn9prji8n13byqzvhy151wm4anak7k", - "depends": ["circlize", "dplyr", "ggExtra", "ggnewscale", "ggplot2", "Hmisc", "MASS", "netmeta", "plyr", "qgraph", "reshape2", "tibble", "tidyr"] + "depends": ["Hmisc", "MASS", "circlize", "dplyr", "ggExtra", "ggnewscale", "ggplot2", "netmeta", "plyr", "qgraph", "reshape2", "tibble", "tidyr"] }, "viscomplexr": { "name": "viscomplexr", "version": "1.1.1", "sha256": "1b45yi5xv4vq52pfa064ll3ghxgkwpbknzq94gg60vcvb7spd0if", - "depends": ["doParallel", "foreach", "plotrix", "Rcpp", "Rdpack", "scales"] + "depends": ["Rcpp", "Rdpack", "doParallel", "foreach", "plotrix", "scales"] }, "visdat": { "name": "visdat", @@ -122717,7 +123971,7 @@ "name": "visit", "version": "2.2", "sha256": "0mrwah122w9dyivyzs8xlv6vq9w8bpr468zjjw5q974wk7h31mk4", - "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "sqldf", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools", "sqldf"] }, "vismeteor": { "name": "vismeteor", @@ -122735,7 +123989,7 @@ "name": "vistime", "version": "1.2.4", "sha256": "14nm2p8yyl0zcf4al31cvnji4a9fi6zs1hvcjpa7dcyjdxd6yfyi", - "depends": ["assertthat", "ggplot2", "ggrepel", "plotly", "RColorBrewer", "rlang"] + "depends": ["RColorBrewer", "assertthat", "ggplot2", "ggrepel", "plotly", "rlang"] }, "vistla": { "name": "vistla", @@ -122753,7 +124007,7 @@ "name": "visualFields", "version": "1.0.1", "sha256": "1z62xappwjdv9f7ql5spydkb626rdj3hvpvzy3d71fwm0y3qwki3", - "depends": ["boot", "combinat", "deldir", "dplyr", "DT", "gtools", "Hmisc", "htmlTable", "oro_dicom", "plotrix", "polyclip", "pracma", "rlang", "shiny", "shinyjs", "XML"] + "depends": ["DT", "Hmisc", "XML", "boot", "combinat", "deldir", "dplyr", "gtools", "htmlTable", "oro_dicom", "plotrix", "polyclip", "pracma", "rlang", "shiny", "shinyjs"] }, "visualize": { "name": "visualize", @@ -122761,29 +124015,23 @@ "sha256": "0bsdyqakidgdgxhzyl6w0pg3mnkj84550c4s7dwcwjjqqjsr9bj1", "depends": [] }, - "visualpred": { - "name": "visualpred", - "version": "0.1.0", - "sha256": "19jq9h9kiv4vbzqz8zrv5gqb1bprq5jy7mcxvdwpfnna2rja6q4z", - "depends": ["data_table", "dplyr", "e1071", "FactoMineR", "gbm", "ggplot2", "ggrepel", "magrittr", "MASS", "MBA", "mltools", "nnet", "pROC", "randomForest"] - }, "visvow": { "name": "visvow", "version": "1.3.11", "sha256": "1my0gvp63lri56hkqrs7xsr5i6ji9w17xm94mrrc9lgwy5sj3vf0", - "depends": ["Cairo", "dplyr", "DT", "effectsize", "formattable", "ggdendro", "ggplot2", "ggrepel", "MASS", "PBSmapping", "plot3D", "plyr", "pracma", "psych", "Rdpack", "readxl", "Rtsne", "shiny", "shinyBS", "shinybusy", "splitstackshape", "svglite", "tidyr", "tikzDevice", "vegan", "WriteXLS"] + "depends": ["Cairo", "DT", "MASS", "PBSmapping", "Rdpack", "Rtsne", "WriteXLS", "dplyr", "effectsize", "formattable", "ggdendro", "ggplot2", "ggrepel", "plot3D", "plyr", "pracma", "psych", "readxl", "shiny", "shinyBS", "shinybusy", "splitstackshape", "svglite", "tidyr", "tikzDevice", "vegan"] }, "visxhclust": { "name": "visxhclust", "version": "1.1.0", "sha256": "1wx16mg5g58p4mgf5y776i5ahgpqqjy4wbfqhfjph36mrhs6qr22", - "depends": ["bsplus", "circlize", "cluster", "clValid", "ComplexHeatmap", "dendextend", "dplyr", "DT", "dunn_test", "fastcluster", "ggplot2", "kableExtra", "knitr", "patchwork", "RColorBrewer", "readr", "shiny", "shinycssloaders", "shinyhelper", "tidyr"] + "depends": ["ComplexHeatmap", "DT", "RColorBrewer", "bsplus", "circlize", "clValid", "cluster", "dendextend", "dplyr", "dunn_test", "fastcluster", "ggplot2", "kableExtra", "knitr", "patchwork", "readr", "shiny", "shinycssloaders", "shinyhelper", "tidyr"] }, "vita": { "name": "vita", "version": "1.0.0", "sha256": "114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v", - "depends": ["randomForest", "Rcpp"] + "depends": ["Rcpp", "randomForest"] }, "vitae": { "name": "vitae", @@ -122793,9 +124041,9 @@ }, "vital": { "name": "vital", - "version": "1.0.0", - "sha256": "0rq7abqpqj5l5vvawj8x0p4bhvs0pcd883xiqbjzc65girn9ffar", - "depends": ["cobs", "distributional", "dplyr", "fable", "fabletools", "future_apply", "generics", "ggplot2", "HMDHFDplus", "mgcv", "patchwork", "progressr", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "tsibble", "vctrs"] + "version": "1.1.0", + "sha256": "0qmqalqzqzzsc8fvzrqj5wzwaw90lf161524wibjzc89knz6z0g4", + "depends": ["HMDHFDplus", "cobs", "distributional", "dplyr", "fable", "fabletools", "future_apply", "generics", "ggplot2", "mgcv", "patchwork", "progressr", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "tsibble", "vctrs"] }, "vitality": { "name": "vitality", @@ -122817,9 +124065,9 @@ }, "vivid": { "name": "vivid", - "version": "0.2.8", - "sha256": "0zl9p8dsrz9lmylnfxj4b50g1lvk7563ss0w3k1pidkwrs4kazin", - "depends": ["colorspace", "condvis2", "DendSer", "dplyr", "flashlight", "GGally", "ggalt", "ggnewscale", "ggplot2", "igraph", "RColorBrewer", "sp"] + "version": "0.2.9", + "sha256": "13iagv585a5z7pggzlcgc8h17r5lx4nq2gljy58238nsi0xc9549", + "depends": ["DendSer", "GGally", "RColorBrewer", "colorspace", "condvis2", "dplyr", "flashlight", "ggalt", "ggnewscale", "ggplot2", "igraph", "sp"] }, "vivo": { "name": "vivo", @@ -122837,13 +124085,13 @@ "name": "vkR", "version": "0.2", "sha256": "1pk444fcw4yyv2dnfrw9vynbpc4gwr5yv9jd41djp9yipdf6d53l", - "depends": ["httr", "jsonlite", "purrr", "XML"] + "depends": ["XML", "httr", "jsonlite", "purrr"] }, "vmdTDNN": { "name": "vmdTDNN", "version": "0.1.1", "sha256": "08bdihlf2lj1wfxilshxww3sav7c35qiqzs468mdahbn4vnzbngr", - "depends": ["forecast", "nnfor", "VMDecomp"] + "depends": ["VMDecomp", "forecast", "nnfor"] }, "vmeasur": { "name": "vmeasur", @@ -122873,25 +124121,25 @@ "name": "voi", "version": "1.0.2", "sha256": "0fxaspvy64791dh9d00slfqi8wwip7353cf68kya0rkm2b12kr4m", - "depends": ["dbarts", "earth", "ggplot2", "gridExtra", "Matrix", "mgcv", "mvtnorm", "posterior", "progress"] + "depends": ["Matrix", "dbarts", "earth", "ggplot2", "gridExtra", "mgcv", "mvtnorm", "posterior", "progress"] }, "voice": { "name": "voice", "version": "0.4.21", "sha256": "0fh1k0596npm6yah992g3hc79g6lh12b7k97nnxlm1pgpdbb503v", - "depends": ["dplyr", "R_utils", "reticulate", "seewave", "tibble", "tidyselect", "tuneR", "wrassp", "zoo"] + "depends": ["R_utils", "dplyr", "reticulate", "seewave", "tibble", "tidyselect", "tuneR", "wrassp", "zoo"] }, "voiceR": { "name": "voiceR", "version": "0.1.0", "sha256": "1bc2h04i9l76wqrw93brg5ivpgd0pq20zq2nq8x7p851jfxz84p4", - "depends": ["doParallel", "DT", "foreach", "FSA", "ggplot2", "ggpubr", "ggthemes", "gridExtra", "gtable", "kableExtra", "knitr", "MASS", "phia", "plotly", "rcompanion", "rlang", "rmarkdown", "seewave", "shiny", "shinyFiles", "shinyjs", "soundgen", "stringr", "tuneR", "xfun"] + "depends": ["DT", "FSA", "MASS", "doParallel", "foreach", "ggplot2", "ggpubr", "ggthemes", "gridExtra", "gtable", "kableExtra", "knitr", "phia", "plotly", "rcompanion", "rlang", "rmarkdown", "seewave", "shiny", "shinyFiles", "shinyjs", "soundgen", "stringr", "tuneR", "xfun"] }, "vol2birdR": { "name": "vol2birdR", - "version": "1.0.2", - "sha256": "1mfyhr3z97b9gayx5fvzbbh85afjam28zcky4l62zgwirv15j5ib", - "depends": ["assertthat", "pkgbuild", "Rcpp", "RcppGSL", "rlang", "withr"] + "version": "1.0.3", + "sha256": "0pryk17cyimli1wgb573kq162pwkxir4nrmp3lbv6f4i61nyxxch", + "depends": ["Rcpp", "RcppGSL", "assertthat", "pkgbuild", "rlang", "withr"] }, "volatilityTrader": { "name": "volatilityTrader", @@ -122903,13 +124151,13 @@ "name": "volcano3D", "version": "2.0.9", "sha256": "1k1n49pzsdkwia09mf9ra75cbnx49q99ygn5c92kyq8kqv83d1w8", - "depends": ["ggplot2", "ggpubr", "htmlwidgets", "magrittr", "matrixTests", "plotly", "Rfast", "rlang"] + "depends": ["Rfast", "ggplot2", "ggpubr", "htmlwidgets", "magrittr", "matrixTests", "plotly", "rlang"] }, "volcanoPlot": { "name": "volcanoPlot", "version": "1.0.0", "sha256": "06nkv56c36wgnb7s6gkpp14syzhm5zm2wdfjx9wamxp5cf0wk3mk", - "depends": ["dplyr", "DT", "fmsb", "ggplot2", "purrr", "shiny", "tidyr"] + "depends": ["DT", "dplyr", "fmsb", "ggplot2", "purrr", "shiny", "tidyr"] }, "volesti": { "name": "volesti", @@ -122939,7 +124187,7 @@ "name": "voronoiTreemap", "version": "0.2.0", "sha256": "1wvnqdrvba4ss4f3k8gzb720irdq2brv2aaq16ywifv8fnjf02r3", - "depends": ["data_tree", "DT", "htmlwidgets", "rlang", "shiny", "shinyjs"] + "depends": ["DT", "data_tree", "htmlwidgets", "rlang", "shiny", "shinyjs"] }, "vortexRdata": { "name": "vortexRdata", @@ -122969,7 +124217,7 @@ "name": "voteSim", "version": "0.1.1", "sha256": "0wqyckpmwwyfmwqhmml62nf781zakbiir727jac1bc1iawxm9y7k", - "depends": ["extraDistr", "GenOrd", "truncnorm"] + "depends": ["GenOrd", "extraDistr", "truncnorm"] }, "voteogram": { "name": "voteogram", @@ -122987,7 +124235,7 @@ "name": "votesys", "version": "0.1.1", "sha256": "1z7cx3rj3bfrkb6jkmf1m1wad5ff46zrab5vhk69wf3jbwd9h920", - "depends": ["data_table", "gtools", "Matrix"] + "depends": ["Matrix", "data_table", "gtools"] }, "vottrans": { "name": "vottrans", @@ -123017,7 +124265,7 @@ "name": "vpc", "version": "1.2.2", "sha256": "15s9f6hmqawv2594xqv58hnqg2wm1fm8qaj8h9k4m55cx4sf1hik", - "depends": ["classInt", "dplyr", "ggplot2", "MASS", "readr", "stringr", "survival", "tidyr"] + "depends": ["MASS", "classInt", "dplyr", "ggplot2", "readr", "stringr", "survival", "tidyr"] }, "vprr": { "name": "vprr", @@ -123029,7 +124277,7 @@ "name": "vrnmf", "version": "1.0.2", "sha256": "0n0kmzhygaii9kipcmr943s0vcf8brxgsk25m9illd4fij6nwpp2", - "depends": ["ica", "lpSolveAPI", "Matrix", "nnls", "quadprog"] + "depends": ["Matrix", "ica", "lpSolveAPI", "nnls", "quadprog"] }, "vroom": { "name": "vroom", @@ -123047,7 +124295,7 @@ "name": "vscc", "version": "0.7", "sha256": "082jxk8fw4rplal9672bi6rr1jwpb5h6clrdlv9jj4ffvlbg6vaz", - "depends": ["ManlyMix", "mclust", "MixGHD", "teigen"] + "depends": ["ManlyMix", "MixGHD", "mclust", "teigen"] }, "vsd": { "name": "vsd", @@ -123055,11 +124303,17 @@ "sha256": "18whnvary4glblzx1vxf3yzsllnnnbnyijwhbw7bi3agppnwrf22", "depends": ["dplyr", "flexsurv", "ggplot2", "ggpubr", "magrittr", "muhaz", "survival", "survminer"] }, + "vse4ts": { + "name": "vse4ts", + "version": "1.0.0", + "sha256": "1js4iawg3c3hcflc7xmy8iif95l545mgg4cc5cmkp8jlfcdmbrig", + "depends": [] + }, "vsgoftest": { "name": "vsgoftest", "version": "1.0-1", "sha256": "0vypi4cf04bljmx3jwq3ixs86ivd6p7a825ik189y71fyqg9g70v", - "depends": ["fitdistrplus", "Rcpp"] + "depends": ["Rcpp", "fitdistrplus"] }, "vsmi": { "name": "vsmi", @@ -123071,19 +124325,19 @@ "name": "vsp", "version": "0.1.1", "sha256": "0aa3vqzazh0x5irbmqh9ac1xiprwnbgbrjl9bybxzynl91hwg9yw", - "depends": ["ggplot2", "glue", "invertiforms", "LRMF3", "magrittr", "Matrix", "rlang", "RSpectra", "tibble", "withr"] + "depends": ["LRMF3", "Matrix", "RSpectra", "ggplot2", "glue", "invertiforms", "magrittr", "rlang", "tibble", "withr"] }, "vstdct": { "name": "vstdct", "version": "0.2", "sha256": "0g26cplp5vjppyw8w37vdy3wah3i9wi14j64vl7i8d2fjbhqhqxp", - "depends": ["dtt", "MASS", "nlme"] + "depends": ["MASS", "dtt", "nlme"] }, "vstsr": { "name": "vstsr", "version": "1.1.0", "sha256": "071nfxkwwpbp2d8khxq7d1pp268pa1fcfj619bs6xwg4wk9srr3k", - "depends": ["httr", "jsonlite", "R6", "RCurl"] + "depends": ["R6", "RCurl", "httr", "jsonlite"] }, "vtable": { "name": "vtable", @@ -123143,7 +124397,7 @@ "name": "vvdoctor", "version": "0.0.1", "sha256": "1sxj7a6pg1kynwsb1fc28l3ipj3jf5azn4cyck0489hsxqnyjn5p", - "depends": ["datamods", "DescTools", "DT", "exact2x2", "irr", "magrittr", "rintrojs", "rstatix", "shiny", "shinyjs", "shinyWidgets"] + "depends": ["DT", "DescTools", "datamods", "exact2x2", "irr", "magrittr", "rintrojs", "rstatix", "shiny", "shinyWidgets", "shinyjs"] }, "vvfiller": { "name": "vvfiller", @@ -123167,13 +124421,13 @@ "name": "vvshiny", "version": "0.1.1", "sha256": "015rac6hz6k5wrg75abiyicjpljfs3cxibrala4dm5jxnwrm79sa", - "depends": ["dplyr", "DT", "forcats", "ggalluvial", "ggplot2", "ggpubr", "htmltools", "htmlwidgets", "magrittr", "plotly", "purrr", "rlang", "scales", "shiny", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyWidgets", "stringr"] + "depends": ["DT", "dplyr", "forcats", "ggalluvial", "ggplot2", "ggpubr", "htmltools", "htmlwidgets", "magrittr", "plotly", "purrr", "rlang", "scales", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "stringr"] }, "vvtableau": { "name": "vvtableau", "version": "0.6.0", "sha256": "0l5ma8004zw69w55qvdmrl1jzg25bp69szyhqddn2h5qcnbg9r1j", - "depends": ["data_table", "dplyr", "httr", "jsonlite", "magrittr", "purrr", "stringr", "tidyr", "XML", "xml2"] + "depends": ["XML", "data_table", "dplyr", "httr", "jsonlite", "magrittr", "purrr", "stringr", "tidyr", "xml2"] }, "vvtermtime": { "name": "vvtermtime", @@ -123191,7 +124445,7 @@ "name": "wCorr", "version": "1.9.8", "sha256": "0ja51w17q80r7xpwqhzn416b48ji9178026wf5ibm4s0hsfz7vb2", - "depends": ["minqa", "mnormt", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "minqa", "mnormt"] }, "wINEQ": { "name": "wINEQ", @@ -123217,6 +124471,12 @@ "sha256": "0f3v0kba87wkwyii0pzvs6a8ja897aifpvwkvryl2hzxxxaml7z4", "depends": [] }, + "wTO": { + "name": "wTO", + "version": "2.1", + "sha256": "11400qmpkpk4y9af4c0q7ir32gwrxgyjspkxk0xlid2an7pbrsr3", + "depends": ["HiClimR", "Rfast", "data_table", "igraph", "magrittr", "plyr", "reshape2", "som", "visNetwork"] + }, "wacolors": { "name": "wacolors", "version": "0.3.1", @@ -123227,19 +124487,19 @@ "name": "wactor", "version": "0.0.1", "sha256": "0dc7413jb3yz0nns2lc93w32wv6m4sg17j2ip63gc12vis0nf855", - "depends": ["ggplot2", "Matrix", "R6", "text2vec", "tibble", "tokenizers", "xgboost"] + "depends": ["Matrix", "R6", "ggplot2", "text2vec", "tibble", "tokenizers", "xgboost"] }, "waffle": { "name": "waffle", "version": "1.0.2", "sha256": "17z05mlnp2k9dywr0bbqz633sq1xs8q9879bl2na1in39qxq0l76", - "depends": ["curl", "DT", "extrafont", "ggplot2", "gridExtra", "gtable", "htmlwidgets", "plyr", "RColorBrewer", "rlang", "stringr"] + "depends": ["DT", "RColorBrewer", "curl", "extrafont", "ggplot2", "gridExtra", "gtable", "htmlwidgets", "plyr", "rlang", "stringr"] }, "waiter": { "name": "waiter", "version": "0.2.5", "sha256": "0ya92qr25ssfkzn888b7rr8rn0304f3gz4h4pnc2a95rknbmxhls", - "depends": ["htmltools", "R6", "shiny"] + "depends": ["R6", "htmltools", "shiny"] }, "wakefield": { "name": "wakefield", @@ -123269,7 +124529,7 @@ "name": "walker", "version": "1.0.8", "sha256": "1y8jj3kf8wrkw3rkai0scnakb9cyb8dbvhji3vprs3cyprcrkf4r", - "depends": ["bayesplot", "BH", "coda", "dplyr", "ggplot2", "Hmisc", "KFAS", "loo", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "rlang", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Hmisc", "KFAS", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "coda", "dplyr", "ggplot2", "loo", "rlang", "rstan", "rstantools"] }, "walkscore": { "name": "walkscore", @@ -123285,9 +124545,9 @@ }, "wallace": { "name": "wallace", - "version": "2.1.2", - "sha256": "1clg0h25cxjfcp6d3pscsakcbrcgcsbfazdsim08jw88hz5nxziq", - "depends": ["dplyr", "DT", "ecospat", "ENMeval", "knitcitations", "leafem", "leaflet", "leaflet_extras", "magrittr", "markdown", "RColorBrewer", "rJava", "rlang", "rmarkdown", "sf", "shiny", "shinyalert", "shinyjs", "shinyWidgets", "spocc", "spThin", "zip"] + "version": "2.1.3", + "sha256": "0zij0r5y7ra402w7x52mb9xzk2wdxq898ysyy3w32lwvbjs5lck9", + "depends": ["DT", "ENMeval", "RColorBrewer", "dplyr", "ecospat", "geodata", "knitcitations", "leafem", "leaflet", "leaflet_extras", "magrittr", "markdown", "rJava", "rlang", "rmarkdown", "sf", "shiny", "shinyWidgets", "shinyalert", "shinyjs", "spThin", "spocc", "zip"] }, "wally": { "name": "wally", @@ -123305,7 +124565,7 @@ "name": "walrus", "version": "1.0.5", "sha256": "0z674sg78rdv9rmqr7s4w9rw8diciifwr4bc2v57yfvp0n9gcys4", - "depends": ["ggplot2", "jmvcore", "R6", "WRS2"] + "depends": ["R6", "WRS2", "ggplot2", "jmvcore"] }, "wand": { "name": "wand", @@ -123319,12 +124579,6 @@ "sha256": "0b1g2fpshhkd15b6fz4v3qwf425p5ahbh57acclqq6znl1acl1hg", "depends": ["flextable", "lubridate", "readtext"] }, - "warbleR": { - "name": "warbleR", - "version": "1.1.30", - "sha256": "1fdlivdqawk4g9xb1zc4hdbdd0v44kpdzfb8z75i09zg2nqhgpw1", - "depends": ["bioacoustics", "cli", "dtw", "fftw", "knitr", "monitoR", "NatureSounds", "pbapply", "Rcpp", "RCurl", "rjson", "seewave", "testthat", "tuneR"] - }, "warp": { "name": "warp", "version": "0.2.1", @@ -123335,7 +124589,7 @@ "name": "warpMix", "version": "0.1.0", "sha256": "13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn", - "depends": ["fda", "fields", "lme4", "MASS", "nlme", "reshape2"] + "depends": ["MASS", "fda", "fields", "lme4", "nlme", "reshape2"] }, "washdata": { "name": "washdata", @@ -123353,7 +124607,7 @@ "name": "washex", "version": "1.2.0", "sha256": "0g5cgs6y3l7ng4bcia1w3ysb8z7s3187ph5g052bssd3w01kim6g", - "depends": ["curl", "dplyr", "httr", "purrr", "rlang", "XML", "xml2"] + "depends": ["XML", "curl", "dplyr", "httr", "purrr", "rlang", "xml2"] }, "washi": { "name": "washi", @@ -123443,7 +124697,7 @@ "name": "wavemulcor", "version": "3.1.2", "sha256": "0a9qhcgf0l3zpwq8m476py94wb4rasy6a8xj302y6kwg3gvh1smm", - "depends": ["plot3D", "RColorBrewer", "waveslim"] + "depends": ["RColorBrewer", "plot3D", "waveslim"] }, "waver": { "name": "waver", @@ -123477,9 +124731,9 @@ }, "waywiser": { "name": "waywiser", - "version": "0.5.1", - "sha256": "1ffi4422dph90lwdc72za0sj224mwwddr66awf9yicszj42a6q81", - "depends": ["dplyr", "fields", "FNN", "glue", "hardhat", "Matrix", "purrr", "rlang", "sf", "spdep", "tibble", "tidyselect", "vctrs", "yardstick"] + "version": "0.6.0", + "sha256": "0n6p7p6m5yspmxva7gb3s7drcznxmvx7yb6iccz6h7z8j7yvqv22", + "depends": ["FNN", "Matrix", "dplyr", "fields", "glue", "hardhat", "purrr", "rlang", "sf", "spdep", "tibble", "tidyselect", "vctrs", "yardstick"] }, "wbacon": { "name": "wbacon", @@ -123509,13 +124763,13 @@ "name": "wbsts", "version": "2.1", "sha256": "07h3wqmb9ya878fwdj49r0npks0pnd3jlnzri1cmf27c691hwka4", - "depends": ["mvtnorm", "Rcpp", "wavelets"] + "depends": ["Rcpp", "mvtnorm", "wavelets"] }, "wcde": { "name": "wcde", "version": "0.0.7", "sha256": "1wyq4m6ziv4b8zkzg3gjjnyhj2bg18ikfxz98q9c2nxqdiq4kbir", - "depends": ["countrycode", "dplyr", "forcats", "magrittr", "progress", "purrr", "RCurl", "stringr", "tibble", "tidyr"] + "depends": ["RCurl", "countrycode", "dplyr", "forcats", "magrittr", "progress", "purrr", "stringr", "tibble", "tidyr"] }, "wcep": { "name": "wcep", @@ -123525,8 +124779,8 @@ }, "wconf": { "name": "wconf", - "version": "1.1.0", - "sha256": "0860shxvyzgvbnfr0xrpi5cx0r5n6bcrk6ivhgryn48r0k3yrlp4", + "version": "1.2.0", + "sha256": "01ngm0ragl9fqhnk9l9pxdf23n16mvmy9znfdfd1q70qvj9y8v22", "depends": [] }, "wcox": { @@ -123551,7 +124805,7 @@ "name": "wdnet", "version": "1.2.3", "sha256": "02sz8rdj3wy2lj5zxb3znc4hymahmpxmsi1n3bg30naz7492k9pk", - "depends": ["CVXR", "igraph", "Matrix", "rARPACK", "Rcpp", "RcppArmadillo", "RcppXPtrUtils", "wdm"] + "depends": ["CVXR", "Matrix", "Rcpp", "RcppArmadillo", "RcppXPtrUtils", "igraph", "rARPACK", "wdm"] }, "wdnr_gis": { "name": "wdnr.gis", @@ -123581,7 +124835,13 @@ "name": "wearables", "version": "0.8.1", "sha256": "0fjf43cgna1mg4mgg98kqhhl88yfhrr57rln2z6xm6d6bj73q5zn", - "depends": ["dplyr", "futile_logger", "ggplot2", "kernlab", "lubridate", "magrittr", "padr", "R_utils", "RHRV", "signal", "varian", "waveslim", "xts"] + "depends": ["RHRV", "R_utils", "dplyr", "futile_logger", "ggplot2", "kernlab", "lubridate", "magrittr", "padr", "signal", "varian", "waveslim", "xts"] + }, + "weatherOz": { + "name": "weatherOz", + "version": "1.0.0", + "sha256": "14zr8gvrmkarpsdqmc35c6hxl2xyiz463d2bk0a7vv9qvsrrld2i", + "depends": ["apsimx", "clock", "crayon", "crul", "curl", "data_table", "foreign", "jsonlite", "knitr", "lubridate", "magick", "sf", "stars", "terra", "xml2"] }, "weatherindices": { "name": "weatherindices", @@ -123597,9 +124857,9 @@ }, "webSDM": { "name": "webSDM", - "version": "1.1-4", - "sha256": "1ix1sl5nyki8p5g7fwmrskz0ys8drdbyap5nbrw9kv3kjxd7dz14", - "depends": ["abind", "bayesplot", "brms", "broom_mixed", "dismo", "dplyr", "GGally", "ggplot2", "glmnet", "gridExtra", "igraph", "jtools", "rstanarm", "rstantools"] + "version": "1.1-5", + "sha256": "0dcqq99779isn5456j9zd1pvhrnx7b1gblwmm9v8qkjaf7darbg6", + "depends": ["GGally", "abind", "bayesplot", "brms", "broom_mixed", "dismo", "dplyr", "ggplot2", "glmnet", "gridExtra", "igraph", "jtools", "rstanarm", "rstantools"] }, "webchem": { "name": "webchem", @@ -123617,7 +124877,7 @@ "name": "webdriver", "version": "1.0.6", "sha256": "0k87any9rvv367p2zwy89r3rxszsq3w78pzdq36by4ijn659la2l", - "depends": ["base64enc", "callr", "curl", "debugme", "httr", "jsonlite", "R6", "showimage", "withr"] + "depends": ["R6", "base64enc", "callr", "curl", "debugme", "httr", "jsonlite", "showimage", "withr"] }, "webexercises": { "name": "webexercises", @@ -123645,9 +124905,9 @@ }, "webmockr": { "name": "webmockr", - "version": "0.9.0", - "sha256": "1a590fyzmag1p6c9a82yp93wd1s4jdznk0416i0pv8r5jwarkdv7", - "depends": ["base64enc", "crul", "curl", "fauxpas", "jsonlite", "magrittr", "R6", "urltools"] + "version": "1.0.0", + "sha256": "09j6j5d60cz0sjzg7zacdk3pypip3hnhf2qq24nmvy9aiz0a4lkk", + "depends": ["R6", "base64enc", "crul", "curl", "fauxpas", "jsonlite", "magrittr", "urltools"] }, "webp": { "name": "webp", @@ -123687,9 +124947,9 @@ }, "websocket": { "name": "websocket", - "version": "1.4.1", - "sha256": "1ks9cyj39jnb0rkx2ii3ckmpl373m5f8sz0i4q3gk7kkv3js07r8", - "depends": ["AsioHeaders", "cpp11", "later", "R6"] + "version": "1.4.2", + "sha256": "040kawypkkim5scjp86immcqn42jj8s591hvypx1anyf7d8nls4w", + "depends": ["AsioHeaders", "R6", "cpp11", "later"] }, "webtrackR": { "name": "webtrackR", @@ -123723,9 +124983,9 @@ }, "wehoop": { "name": "wehoop", - "version": "2.0.0", - "sha256": "031z2lr1sjnmb8awcd3r8ygj20c0p57sjhim9p7ifv5vkv0044g9", - "depends": ["cli", "data_table", "dplyr", "glue", "janitor", "jsonlite", "lubridate", "magrittr", "progressr", "purrr", "Rcpp", "RcppParallel", "rlang", "rvest", "stringr", "tidyr", "usethis"] + "version": "2.1.0", + "sha256": "0lg5k4w7k9pcp8dv4ayzlnd3xc39z5p6wabqnnhicy0byhjny838", + "depends": ["Rcpp", "RcppParallel", "cli", "data_table", "dplyr", "glue", "janitor", "jsonlite", "lubridate", "magrittr", "progressr", "purrr", "rlang", "rvest", "stringr", "tidyr", "usethis"] }, "weibullness": { "name": "weibullness", @@ -123737,7 +124997,7 @@ "name": "weibulltools", "version": "2.1.0", "sha256": "1scdpxvc9sj4jfxnf8xcsnpnp2vn0kl25gn1m2yqa3dw97h64mcl", - "depends": ["dplyr", "ggplot2", "lifecycle", "magrittr", "plotly", "purrr", "Rcpp", "RcppArmadillo", "sandwich", "segmented", "tibble"] + "depends": ["Rcpp", "RcppArmadillo", "dplyr", "ggplot2", "lifecycle", "magrittr", "plotly", "purrr", "sandwich", "segmented", "tibble"] }, "weightQuant": { "name": "weightQuant", @@ -123759,9 +125019,9 @@ }, "weightedRank": { "name": "weightedRank", - "version": "0.2.5", - "sha256": "0sz2d482cjp0z2wxlqjq745xz3ap6h7v03l19q4y99p86909i0v4", - "depends": ["mvtnorm", "sensitivitymv"] + "version": "0.3.7", + "sha256": "149xvsl20grf8wicx3xxyp9qpi7dga7ghklmrqam0y5rrkqp8y4j", + "depends": ["mvtnorm", "sensitivitymv", "senstrat"] }, "weightedScores": { "name": "weightedScores", @@ -123779,7 +125039,7 @@ "name": "weights", "version": "1.0.4", "sha256": "1fnchf7f0hyl514bk8sc3l884kg25kb5xm4mc2l28n6hm7l6bgpg", - "depends": ["gdata", "Hmisc", "lme4", "mice"] + "depends": ["Hmisc", "gdata", "lme4", "mice"] }, "weird": { "name": "weird", @@ -123803,7 +125063,7 @@ "name": "welo", "version": "0.1.4", "sha256": "14561rxbcc0w326nk24zl52nfw262z1pwvxsjfg9yx300byjljx3", - "depends": ["boot", "ggplot2", "Rdpack", "reshape2", "rio", "xts"] + "depends": ["Rdpack", "boot", "ggplot2", "reshape2", "rio", "xts"] }, "wesanderson": { "name": "wesanderson", @@ -123819,15 +125079,15 @@ }, "weyl": { "name": "weyl", - "version": "0.0-4", - "sha256": "1i6kzadw37l2bj8n6z2c9j7h7jk2gjhx7lizwlgpjn8sycm2rkqr", - "depends": ["disordR", "freealg", "mathjaxr", "spray"] + "version": "0.0-5", + "sha256": "18gapsjvv3xj161kk8y8cwq4c3zxc8gjamkmzxm68vfgixf8bkh8", + "depends": ["disordR", "freealg", "spray"] }, "wfe": { "name": "wfe", "version": "1.9.1", "sha256": "0lcg7hzdll1wqdwydkk96m4n715h8sjn3qwhabm245m0hqhdf7is", - "depends": ["arm", "MASS", "Matrix"] + "depends": ["MASS", "Matrix", "arm"] }, "wfg": { "name": "wfg", @@ -123869,7 +125129,7 @@ "name": "wheatmap", "version": "0.2.0", "sha256": "064idlrnb85xxav39gp3n854fic6514khvazrf5d0x48crpzyvdp", - "depends": ["colorspace", "RColorBrewer"] + "depends": ["RColorBrewer", "colorspace"] }, "when": { "name": "when", @@ -123935,7 +125195,7 @@ "name": "whoa", "version": "0.0.2", "sha256": "1wa1s2dqwkmfa3avrgqkm6w59b6vm2xnnb77q25w187wdpjq65xx", - "depends": ["dplyr", "ggplot2", "magrittr", "Rcpp", "tibble", "tidyr", "vcfR", "viridis"] + "depends": ["Rcpp", "dplyr", "ggplot2", "magrittr", "tibble", "tidyr", "vcfR", "viridis"] }, "whoami": { "name": "whoami", @@ -123947,7 +125207,7 @@ "name": "whomds", "version": "1.1.1", "sha256": "1n7i7hh18mplqrhz554pwx4n70p1k7ryfzcgpxigzqphdny44npp", - "depends": ["colorspace", "dplyr", "eRm", "ggplot2", "ggraph", "GPArotation", "igraph", "nFactors", "plyr", "polycor", "psych", "purrr", "RColorBrewer", "readr", "rlang", "scales", "srvyr", "stringr", "TAM", "tibble", "tidygraph", "tidyr", "WrightMap"] + "depends": ["GPArotation", "RColorBrewer", "TAM", "WrightMap", "colorspace", "dplyr", "eRm", "ggplot2", "ggraph", "igraph", "nFactors", "plyr", "polycor", "psych", "purrr", "readr", "rlang", "scales", "srvyr", "stringr", "tibble", "tidygraph", "tidyr"] }, "widals": { "name": "widals", @@ -123965,12 +125225,12 @@ "name": "widyr", "version": "0.1.5", "sha256": "05300hslrfpsqaxzzbmxgl2s2dz3wldpmnxh9hzgy97xkdc0c6fn", - "depends": ["broom", "dplyr", "Matrix", "purrr", "reshape2", "rlang", "tibble", "tidyr", "tidytext"] + "depends": ["Matrix", "broom", "dplyr", "purrr", "reshape2", "rlang", "tibble", "tidyr", "tidytext"] }, "wiesbaden": { "name": "wiesbaden", - "version": "1.2.9", - "sha256": "0sf61xrkzlk1pbjv1ha019nav20a5w1svx5jnsyck5050xxs2y06", + "version": "1.2.10", + "sha256": "0kmapfksrxkr3dry8didznhv3q0827183532s78bai9l2hm8is1p", "depends": ["httr", "jsonlite", "keyring", "readr", "stringi", "stringr", "xml2"] }, "wig": { @@ -123981,9 +125241,9 @@ }, "wikiTools": { "name": "wikiTools", - "version": "1.2.4", - "sha256": "1s6rssxalg3p4xfh1dc2igiqpiwyd8h5dlyfs5vwixn7pjyd3ac5", - "depends": ["httr", "jsonlite", "ratelimitr"] + "version": "1.2.7", + "sha256": "0yw1afj926pki61kfgmb5s4whaj25c93hqs4yja8gqb87pky5010", + "depends": ["collections", "curl", "httr", "jsonlite", "ratelimitr"] }, "wikibooks": { "name": "wikibooks", @@ -124001,25 +125261,19 @@ "name": "wikilake", "version": "0.7.0", "sha256": "0niym9azy4qzcr4rriw0bfd97scx1mdpx67szinj7qsh569xb61m", - "depends": ["dplyr", "maps", "rvest", "selectr", "sp", "stringi", "stringr", "tidyr", "units", "WikipediR", "xml2"] - }, - "wikiprofiler": { - "name": "wikiprofiler", - "version": "0.1.3", - "sha256": "1az2phwgy8aqbl9sxvsq1madrdlrw7zshq9fhw5q580xx0lfhkmk", - "depends": ["ggplot2", "ggplotify", "gson", "rsvg", "yulab_utils"] + "depends": ["WikipediR", "dplyr", "maps", "rvest", "selectr", "sp", "stringi", "stringr", "tidyr", "units", "xml2"] }, "wikitaxa": { "name": "wikitaxa", "version": "0.4.0", "sha256": "1z7p7dwgl8x4ambwss5dqlp4zgz52mgj0vhx2bqwizarmx9ji1xs", - "depends": ["crul", "curl", "data_table", "jsonlite", "tibble", "WikidataR", "xml2"] + "depends": ["WikidataR", "crul", "curl", "data_table", "jsonlite", "tibble", "xml2"] }, "wikkitidy": { "name": "wikkitidy", - "version": "0.1.12", - "sha256": "11i9spgl9zicy980a9r93277b7y6zqixnn8cks8yfh0phvazfgvj", - "depends": ["cli", "dplyr", "glue", "httr2", "lubridate", "magrittr", "openssl", "pillar", "purrr", "rlang", "stringr", "tibble", "vctrs"] + "version": "0.1.13", + "sha256": "03gdzmmic45z82a4c6cvdmispjl2r8iwkmmdzxm2b7ag4f7araak", + "depends": ["cli", "dplyr", "glue", "httr2", "lubridate", "magrittr", "openssl", "pillar", "purrr", "rlang", "stringr", "tibble", "vctrs", "webfakes"] }, "wilcoxmed": { "name": "wilcoxmed", @@ -124055,7 +125309,7 @@ "name": "wilson", "version": "2.4.2", "sha256": "050hi6rigs024is1ry0yymqapgqfhzpp0ghk5ya028k71k22lksx", - "depends": ["circlize", "colourpicker", "ComplexHeatmap", "data_table", "DESeq2", "DT", "factoextra", "FactoMineR", "ggplot2", "ggrepel", "gplots", "heatmaply", "log4r", "openssl", "plotly", "plyr", "R6", "RColorBrewer", "reshape", "rintrojs", "rje", "rjson", "RJSONIO", "scales", "shiny", "shinycssloaders", "shinydashboard", "shinyjs", "shinyWidgets", "viridis", "zip"] + "depends": ["ComplexHeatmap", "DESeq2", "DT", "FactoMineR", "R6", "RColorBrewer", "RJSONIO", "circlize", "colourpicker", "data_table", "factoextra", "ggplot2", "ggrepel", "gplots", "heatmaply", "log4r", "openssl", "plotly", "plyr", "reshape", "rintrojs", "rje", "rjson", "scales", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyjs", "viridis", "zip"] }, "winch": { "name": "winch", @@ -124089,8 +125343,8 @@ }, "winfapReader": { "name": "winfapReader", - "version": "0.1-5", - "sha256": "01hc0kcm7qfzk47rci6lfmrqs4zfj8z7abqydgi2ckq8n1k2pd0h", + "version": "0.1-5.1", + "sha256": "08b3311vw6cf9y9spzvd7pl7q53ik5alkxq4j5d6w8a4kd7bbwaf", "depends": ["lubridate"] }, "wingen": { @@ -124103,13 +125357,13 @@ "name": "winputall", "version": "1.0.1", "sha256": "17jwnnzy5a38a2n9ixhs8vk8ybq2a8lhjv5hfx4dwdg73iklnmib", - "depends": ["BH", "dplyr", "future", "future_apply", "ks", "LearnBayes", "MASS", "Matrix", "matrixcalc", "matrixStats", "plm", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "LearnBayes", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "future", "future_apply", "ks", "matrixStats", "matrixcalc", "plm", "rstan", "rstantools"] }, "wiqid": { "name": "wiqid", "version": "0.3.3", "sha256": "1d5bckkr6cnixccxaa14n7vbsya5cc00y9mryy1j69shhsmxp5ks", - "depends": ["coda", "HDInterval", "MASS", "mcmcOutput", "plotrix", "truncnorm"] + "depends": ["HDInterval", "MASS", "coda", "mcmcOutput", "plotrix", "truncnorm"] }, "withdots": { "name": "withdots", @@ -124119,14 +125373,14 @@ }, "withr": { "name": "withr", - "version": "3.0.0", - "sha256": "1rz0pgm1bg3cnc09s8q8yyg83lmf8bv9arlasciqqr0fdpgfwy4c", + "version": "3.0.1", + "sha256": "0h9qbaa4i63awk176i3pm7bia7wgssav9zk9jvc7sg3k5yng2wym", "depends": [] }, "wk": { "name": "wk", - "version": "0.9.1", - "sha256": "0yxzyb09by9winspdn0585xhjmdcablb07wx6pf7ahg0q18sz85p", + "version": "0.9.2", + "sha256": "1y75hdg1p1h6pja3zxpllmbvzqlh67n5z9d3d6zhknxfkgfmwrrk", "depends": [] }, "wkb": { @@ -124153,11 +125407,17 @@ "sha256": "0qy4cp4d8nlcqlcs4mqjv1f1kf1yh9y2wvh1ak6f049qlj7yfwfb", "depends": [] }, + "wmwm": { + "name": "wmwm", + "version": "1.0.0", + "sha256": "0dhh36wzcjg4c3yrg2qgb6kj7p8fpadvfwiach04dlqmbzjj2knw", + "depends": [] + }, "wmwpow": { "name": "wmwpow", "version": "0.1.3", "sha256": "03rd75r4wih1w7srhnwqxjkirisb43y1sd2f1wzixqj8lq0dmb25", - "depends": ["lamW", "MASS", "smoothmest"] + "depends": ["MASS", "lamW", "smoothmest"] }, "wnl": { "name": "wnl", @@ -124193,12 +125453,12 @@ "name": "womblR", "version": "1.0.5", "sha256": "0acvv7jylissacvln51pi14a8i9y02q5whrz3sx5dsnvsk00slzm", - "depends": ["msm", "mvtnorm", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "msm", "mvtnorm"] }, "woodValuationDE": { "name": "woodValuationDE", - "version": "1.0.1", - "sha256": "1sbyl4yd766lhjqghm4hq9162wz0qabiwiwnsiwzdn4fbfihxl7v", + "version": "1.0.2", + "sha256": "0lm6br7nnycng2lidkgg41li58q3pgsh85hi6b1mj2r6vkbnk3rx", "depends": ["dplyr"] }, "wooldridge": { @@ -124249,6 +125509,12 @@ "sha256": "0pvnijh2gvwjbd86ivky0zbi8y1x40xazsv2bdy5s2rfsscf4l88", "depends": ["crayon"] }, + "wordmap": { + "name": "wordmap", + "version": "0.8.0", + "sha256": "04s77aghy7q2x9khhl49xv2kbkhim39pmrr9ra3wrlm7map47ygr", + "depends": ["Matrix", "quanteda", "stringi"] + }, "wordnet": { "name": "wordnet", "version": "0.1-17", @@ -124271,7 +125537,7 @@ "name": "wordpredictor", "version": "0.0.3", "sha256": "0079nkjimzz07yzqx8ksgk7isi0b5j1nxmisicbc8qvsamirm68v", - "depends": ["digest", "dplyr", "ggplot2", "patchwork", "SnowballC", "stringr"] + "depends": ["SnowballC", "digest", "dplyr", "ggplot2", "patchwork", "stringr"] }, "words": { "name": "words", @@ -124289,7 +125555,7 @@ "name": "wordspace", "version": "0.2-8", "sha256": "17fqd4zrsklv2ik3lg00x66yasfh1kyhs3k9ri6lrk56wwv6hzb2", - "depends": ["cluster", "iotools", "MASS", "Matrix", "Rcpp", "sparsesvd"] + "depends": ["MASS", "Matrix", "Rcpp", "cluster", "iotools", "sparsesvd"] }, "workflowr": { "name": "workflowr", @@ -124315,6 +125581,12 @@ "sha256": "1gynlvmqxyibql5j3db9dwvc0jsc9jqzpy3d3gp43d5lcl11mcmq", "depends": ["pracma", "signal"] }, + "worldbank": { + "name": "worldbank", + "version": "0.2.0", + "sha256": "0bl8c5cqz5s8yl06qy7xg92nhgald7xil4ck7vb4h6rln210bz9v", + "depends": ["httr2"] + }, "worldfootballR": { "name": "worldfootballR", "version": "0.6.2", @@ -124355,7 +125627,7 @@ "name": "wpa", "version": "1.9.1", "sha256": "0likivdwxl66nj6wxkcssqgz8slhagbw9qhxbxwsw10gyq4769rb", - "depends": ["data_table", "dplyr", "DT", "ggplot2", "ggraph", "ggrepel", "ggwordcloud", "htmltools", "igraph", "magrittr", "markdown", "networkD3", "proxy", "purrr", "reshape2", "rmarkdown", "scales", "tidyr", "tidyselect", "tidytext"] + "depends": ["DT", "data_table", "dplyr", "ggplot2", "ggraph", "ggrepel", "ggwordcloud", "htmltools", "igraph", "magrittr", "markdown", "networkD3", "proxy", "purrr", "reshape2", "rmarkdown", "scales", "tidyr", "tidyselect", "tidytext"] }, "wpp2008": { "name": "wpp2008", @@ -124397,7 +125669,7 @@ "name": "wppExplorer", "version": "2.3-4", "sha256": "1pbmjg6y543aih8mxf9njfwpm090virhgqf8w0a5yx0jdfjwmz04", - "depends": ["DT", "ggplot2", "googleVis", "Hmisc", "plyr", "reshape2", "shiny", "shinyjs", "shinythemes", "wpp2019"] + "depends": ["DT", "Hmisc", "ggplot2", "googleVis", "plyr", "reshape2", "shiny", "shinyjs", "shinythemes", "wpp2019"] }, "wql": { "name": "wql", @@ -124409,13 +125681,13 @@ "name": "wqs", "version": "0.0.1", "sha256": "14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg", - "depends": ["glm2", "Rsolnp"] + "depends": ["Rsolnp", "glm2"] }, "wqspt": { "name": "wqspt", "version": "1.0.1", "sha256": "1xd588kw171djx7q21b2jjarhbzd4i0gx7ccv1j1wyl95yzq07ba", - "depends": ["cowplot", "extraDistr", "ggplot2", "gWQS", "mvtnorm", "pbapply", "rlang", "viridis"] + "depends": ["cowplot", "extraDistr", "gWQS", "ggplot2", "mvtnorm", "pbapply", "rlang", "viridis"] }, "wqtrends": { "name": "wqtrends", @@ -124427,18 +125699,18 @@ "name": "wrGraph", "version": "1.3.7", "sha256": "127s4i73ww817q9k7x463633rlk8fj0kjvpwqwcaxswdc7a3ks7b", - "depends": ["lattice", "RColorBrewer", "wrMisc"] + "depends": ["RColorBrewer", "lattice", "wrMisc"] }, "wrMisc": { "name": "wrMisc", - "version": "1.15.0.3", - "sha256": "0680lxkwyxyy0ks3cyp41gxkv7vjf235mwml5ixk07rkin195w9c", + "version": "1.15.1", + "sha256": "1ii3dl2dpxrshhh8dfvn75s7rn99ylvldb46cc3pdadjb8czzgmn", "depends": ["MASS"] }, "wrProteo": { "name": "wrProteo", - "version": "1.11.0.1", - "sha256": "0v9a62r4881aax5h5mnzgjzk2mgkrfa14lvy2w8i9mhcz5q6dg7k", + "version": "1.12.0", + "sha256": "1ghkh0j4sh7bv6zz73bdbdyjqhyc1q53flzzpq0khr98hl4rn6dv", "depends": ["knitr", "limma", "wrMisc"] }, "wrTopDownFrag": { @@ -124457,7 +125729,7 @@ "name": "wrappedtools", "version": "0.9.5", "sha256": "1rpbfsh8cs07icc8440rmcmgwzjwrax86hk7hx7zwmsjigap3pxi", - "depends": ["boot", "broom", "coin", "DescTools", "dplyr", "flextable", "forcats", "ggplot2", "glue", "kableExtra", "knitr", "lifecycle", "purrr", "rlang", "rlist", "stringr", "tibble", "tidyr"] + "depends": ["DescTools", "boot", "broom", "coin", "dplyr", "flextable", "forcats", "ggplot2", "glue", "kableExtra", "knitr", "lifecycle", "purrr", "rlang", "rlist", "stringr", "tibble", "tidyr"] }, "wrappr": { "name": "wrappr", @@ -124493,13 +125765,13 @@ "name": "wrswoR", "version": "1.1.1", "sha256": "1q0nc08q8f3kl9yvcivzylykk1ar5j5dw3ian2y9nrzgzri5l10i", - "depends": ["logging", "Rcpp"] + "depends": ["Rcpp", "logging"] }, "wru": { "name": "wru", "version": "3.0.3", "sha256": "1d8k9bmzwg11ypkhhcnj2l6i2qnk13a09la0nc713nlwc21zqc44", - "depends": ["cli", "dplyr", "furrr", "future", "piggyback", "PL94171", "purrr", "Rcpp", "RcppArmadillo", "rlang", "tidyr"] + "depends": ["PL94171", "Rcpp", "RcppArmadillo", "cli", "dplyr", "furrr", "future", "piggyback", "purrr", "rlang", "tidyr"] }, "wsbackfit": { "name": "wsbackfit", @@ -124535,7 +125807,7 @@ "name": "wsyn", "version": "1.0.4", "sha256": "0wq07n69l52rs0ddl1r3ml5jh5nflsg9mddvc3dxjdpd00mgbxnl", - "depends": ["fields", "MASS"] + "depends": ["MASS", "fields"] }, "wtest": { "name": "wtest", @@ -124547,18 +125819,18 @@ "name": "wv", "version": "0.1.2", "sha256": "0dx33bs05k6zi6rnk12v6z2l2pvvx2jdl99vafbpyydf0ls4ppbk", - "depends": ["coda", "Rcpp", "RcppArmadillo", "simts"] + "depends": ["Rcpp", "RcppArmadillo", "coda", "simts"] }, "wwntests": { "name": "wwntests", "version": "1.1.0", "sha256": "0bs0i66ydy5zg66nwhniqzd000rc5qcmkliqpb3f9n749x2sj2f6", - "depends": ["fda", "ftsa", "MASS", "rainbow", "sde"] + "depends": ["MASS", "fda", "ftsa", "rainbow", "sde"] }, "wxgenR": { "name": "wxgenR", - "version": "1.4.0", - "sha256": "00i89r7299psykl1pgaxp3hmkx7na0g9m0yh4gp68cnp6xla7wxh", + "version": "1.4.1", + "sha256": "057wvdkanzwc900fcfn26bs29sq4xsbvmp4xm6bvh21iy2ijj96d", "depends": ["doParallel", "dplyr", "foreach", "lubridate", "magrittr", "msm", "plyr", "sm"] }, "wyz_code_metaTesting": { @@ -124571,19 +125843,19 @@ "name": "wyz.code.offensiveProgramming", "version": "1.1.24", "sha256": "1q3yn5yp2qlzqg1xpxlkpdkiij4kzwn9yj8mc9xxx4bxnbspkakq", - "depends": ["crayon", "data_table", "R6", "stringr", "tidyr"] + "depends": ["R6", "crayon", "data_table", "stringr", "tidyr"] }, "wyz_code_rdoc": { "name": "wyz.code.rdoc", "version": "1.1.19", "sha256": "02k6wk45dn6i8kzxhgcxqxvrzxf063dny17jjnj83wsxx2b37jgv", - "depends": ["crayon", "data_table", "digest", "R6", "stringr", "tidyr", "wyz_code_offensiveProgramming"] + "depends": ["R6", "crayon", "data_table", "digest", "stringr", "tidyr", "wyz_code_offensiveProgramming"] }, "wyz_code_testthat": { "name": "wyz.code.testthat", "version": "1.1.20", "sha256": "1h3mf898wrqx212xxaqqm6vqgg1aicrykrnc32f9wl5hyjcbnq70", - "depends": ["data_table", "R6", "tidyr", "wyz_code_offensiveProgramming"] + "depends": ["R6", "data_table", "tidyr", "wyz_code_offensiveProgramming"] }, "x_ent": { "name": "x.ent", @@ -124599,21 +125871,21 @@ }, "x13binary": { "name": "x13binary", - "version": "1.1.60", - "sha256": "1hc5knakha9pwlm9irrrjav012a53x97jv2wpw4lwhfnp6lwy118", + "version": "1.1.61", + "sha256": "0v7cwgq3xkz4k9l2drxa4bjgam1drs43chfwvs8hbcl1ybrxi2h4", "depends": [] }, "x3ptools": { "name": "x3ptools", "version": "0.0.4", "sha256": "1gl7bpbkww98c8khcyjbydsfg55fa08wcsxf5f0jk1i49ap2q1ii", - "depends": ["assertthat", "digest", "dplyr", "imager", "magrittr", "MASS", "png", "pracma", "purrr", "readr", "rgl", "scales", "tidyr", "xml2", "yaml", "zoo"] + "depends": ["MASS", "assertthat", "digest", "dplyr", "imager", "magrittr", "png", "pracma", "purrr", "readr", "rgl", "scales", "tidyr", "xml2", "yaml", "zoo"] }, "xLLiM": { "name": "xLLiM", "version": "2.3", "sha256": "08v6acn6vpn8asn61ldqdryjz0xk5zyd2v63aqrc5xximpqwrp7d", - "depends": ["abind", "capushe", "corpcor", "e1071", "glmnet", "igraph", "MASS", "Matrix", "mda", "mixOmics", "progress", "randomForest"] + "depends": ["MASS", "Matrix", "abind", "capushe", "corpcor", "e1071", "glmnet", "igraph", "mda", "mixOmics", "progress", "randomForest"] }, "xRing": { "name": "xRing", @@ -124625,13 +125897,13 @@ "name": "xSub", "version": "3.0.2", "sha256": "07mib63zbvffr4w8klpv017d13wvqy3mwrpssr0vydcj8475gjfx", - "depends": ["countrycode", "haven", "RCurl"] + "depends": ["RCurl", "countrycode", "haven"] }, "xVA": { "name": "xVA", "version": "1.1", "sha256": "06y9qhly14y5r8d1g85jdzz8x5lwzfjkiy5zak6146mknl4nzz11", - "depends": ["data_table", "SACCR", "Trading"] + "depends": ["SACCR", "Trading", "data_table"] }, "xadmix": { "name": "xadmix", @@ -124661,7 +125933,7 @@ "name": "xdcclarge", "version": "0.1.0", "sha256": "1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn", - "depends": ["nlshrink", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "nlshrink"] }, "xefun": { "name": "xefun", @@ -124739,12 +126011,12 @@ "name": "xesreadR", "version": "0.2.3", "sha256": "1pvdx0mxg2f885bhy4hb3kqzcgva4q7hzzaipkfzyi5lnjdsbc81", - "depends": ["bupaR", "data_table", "dplyr", "lubridate", "purrr", "stringr", "tidyr", "XML", "xml2"] + "depends": ["XML", "bupaR", "data_table", "dplyr", "lubridate", "purrr", "stringr", "tidyr", "xml2"] }, "xfun": { "name": "xfun", - "version": "0.45", - "sha256": "049nk6h9xbdn2i6m07s26rqn790adww2y6mya03v95yj5xfg05iq", + "version": "0.47", + "sha256": "0jrc4g799nhyra8n202107mx7h42yzz4n4yblf3fdwjdpzyp964r", "depends": [] }, "xgb2sql": { @@ -124755,9 +126027,9 @@ }, "xgboost": { "name": "xgboost", - "version": "1.7.7.1", - "sha256": "08wpxr8jkzsqb5zaw43bmq5r7k3jnb1ibjkliwh2ffjq7b7jr4gp", - "depends": ["data_table", "jsonlite", "Matrix"] + "version": "1.7.8.1", + "sha256": "1s8vpj0rwyvzq6q4bby0szxwsj34z26mkrm7qx4pbs9g1g86yk9r", + "depends": ["Matrix", "data_table", "jsonlite"] }, "xgrove": { "name": "xgrove", @@ -124769,19 +126041,19 @@ "name": "xgxr", "version": "1.1.2", "sha256": "0mmnh6zab7qllbfpl3vn5sd7hcznm83v5rxi1pw5zv96ax0ikagv", - "depends": ["assertthat", "binom", "Deriv", "DescTools", "dplyr", "ggplot2", "glue", "gtable", "Hmisc", "labeling", "magrittr", "minpack_lm", "pander", "png", "RCurl", "readr", "scales", "stringr", "tibble"] + "depends": ["Deriv", "DescTools", "Hmisc", "RCurl", "assertthat", "binom", "dplyr", "ggplot2", "glue", "gtable", "labeling", "magrittr", "minpack_lm", "pander", "png", "readr", "scales", "stringr", "tibble"] }, "xhaz": { "name": "xhaz", - "version": "2.0.1", - "sha256": "1kipqscniyb4s7p29pdkg8hg95wb78jpnax8qh058vzrk5vqz181", - "depends": ["gtools", "numDeriv", "optimParallel", "statmod", "stringr", "survexp_fr", "survival"] + "version": "2.0.2", + "sha256": "0d91afvjrwgwf5h1p2z6q15psf3n9hvshb75jyxvyxnhq8c5darw", + "depends": ["gtools", "mexhaz", "numDeriv", "optimParallel", "statmod", "stringr", "survexp_fr", "survival"] }, "xkcd": { "name": "xkcd", "version": "0.0.6", "sha256": "1z2y0ihn68ppay7xkglhw7djki5654g6z4bbpyy41if57z9q554f", - "depends": ["extrafont", "ggplot2", "Hmisc"] + "depends": ["Hmisc", "extrafont", "ggplot2"] }, "xkcdcolors": { "name": "xkcdcolors", @@ -124829,7 +126101,7 @@ "name": "xmeta", "version": "1.3.2", "sha256": "1by3w7mn3kk4942pbjyqb6hbrsxbxywfjy96cq0cmvwzq7aamhxm", - "depends": ["aod", "glmmML", "MASS", "metafor", "mvmeta", "numDeriv", "plotrix"] + "depends": ["MASS", "aod", "glmmML", "metafor", "mvmeta", "numDeriv", "plotrix"] }, "xml2": { "name": "xml2", @@ -124871,7 +126143,7 @@ "name": "xmpdf", "version": "0.2.1", "sha256": "0pma8njk77ggpky6m4l9p7n7ardy41lsn0q67wkgr0mwgjjyil7w", - "depends": ["brio", "datetimeoffset", "jsonlite", "purrr", "R6", "rlang", "stringi"] + "depends": ["R6", "brio", "datetimeoffset", "jsonlite", "purrr", "rlang", "stringi"] }, "xmrr": { "name": "xmrr", @@ -124907,7 +126179,7 @@ "name": "xplain", "version": "0.2.2", "sha256": "152a83ckmhns6yniy87mmjva5bkv5x3phv63l1kkcmrr9bclfgz0", - "depends": ["httr", "RCurl", "readr", "XML"] + "depends": ["RCurl", "XML", "httr", "readr"] }, "xplorerr": { "name": "xplorerr", @@ -124937,7 +126209,7 @@ "name": "xpose4", "version": "4.7.3", "sha256": "0w670g9y8nsdjcdxnvwpx8j9yfr7xhb5x3a171z1xizdfgpcpjxz", - "depends": ["dplyr", "gam", "Hmisc", "lattice", "lazyeval", "readr", "survival", "tibble"] + "depends": ["Hmisc", "dplyr", "gam", "lattice", "lazyeval", "readr", "survival", "tibble"] }, "xray": { "name": "xray", @@ -124949,13 +126221,13 @@ "name": "xrf", "version": "0.2.2", "sha256": "0917chdkl6b20fdbwwj5b6wyihn9p444anwjspd0zqxmp8ag0i5f", - "depends": ["dplyr", "fuzzyjoin", "glmnet", "Matrix", "rlang", "xgboost"] + "depends": ["Matrix", "dplyr", "fuzzyjoin", "glmnet", "rlang", "xgboost"] }, "xrnet": { "name": "xrnet", - "version": "0.1.7", - "sha256": "136aadrvsdg9hizjg4q12h56ih0s3w88j3jpfb54ajgdmqw3pldi", - "depends": ["BH", "bigmemory", "foreach", "Rcpp", "RcppEigen"] + "version": "1.0.0", + "sha256": "04zcpxzam4avsc8qxvd5ssjxzg07xf2wjx90y6df4df2dpm7sr6i", + "depends": ["BH", "Rcpp", "RcppEigen", "bigmemory", "foreach"] }, "xslt": { "name": "xslt", @@ -125019,9 +126291,9 @@ }, "xxdi": { "name": "xxdi", - "version": "1.0.0", - "sha256": "1xvx9z24xrqfhpgzfdvscscg3lcjsy6abrw60amcww36sl41fas2", - "depends": ["agop", "ggplot2", "Matrix", "tidyr"] + "version": "1.2.3", + "sha256": "07yjq9f6dw1xvd5map5aj42qhbgdqyla270vqn0h8x2h8wfqjfgq", + "depends": ["Matrix", "agop", "dplyr", "ggplot2", "tidyr"] }, "xxhashlite": { "name": "xxhashlite", @@ -125051,18 +126323,18 @@ "name": "yager", "version": "0.1.1", "sha256": "178ypdr3f0w9rb4ci8q2hshr62b7993m8q6zxc4pf0msq175n1ml", - "depends": ["lhs", "MLmetrics", "randtoolbox"] + "depends": ["MLmetrics", "lhs", "randtoolbox"] }, "yahoofinancer": { "name": "yahoofinancer", "version": "0.3.0", "sha256": "197pidwi69hqrw6qpjg5d2y5mqp2rma4p8wsr2h51957qqql4z5d", - "depends": ["curl", "httr", "jsonlite", "lubridate", "magrittr", "purrr", "R6", "stringr"] + "depends": ["R6", "curl", "httr", "jsonlite", "lubridate", "magrittr", "purrr", "stringr"] }, "yaml": { "name": "yaml", - "version": "2.3.8", - "sha256": "1n1zlbnq3ldipnnm08whpvm8r21vxg4c9jzg7x7j3blw2pi7kl4y", + "version": "2.3.10", + "sha256": "0v9al1fh82vpjhml91j73sim7gfyc0154kxaam41sdkf6qnx8dp2", "depends": [] }, "yamlet": { @@ -125083,12 +126355,6 @@ "sha256": "1l6s06sj9hpb20xndnmm8xim9c9h444w6g98b56i5whb11x37d18", "depends": ["cli", "dplyr", "generics", "hardhat", "lifecycle", "rlang", "tibble", "tidyselect", "vctrs", "withr"] }, - "yarr": { - "name": "yarr", - "version": "0.1.2", - "sha256": "16q109jrydckz7s1rkmr2sh8q92cgr1c534fvpbh3h0bc3fvvf8g", - "depends": [] - }, "yarrr": { "name": "yarrr", "version": "0.1.5", @@ -125111,12 +126377,12 @@ "name": "ycevo", "version": "0.2.1", "sha256": "0gih1dq62k7163pjsjl32smdqy54wjhsp31mv7ddhp4xmr6qb7cw", - "depends": ["dplyr", "future_apply", "generics", "ggplot2", "lubridate", "Matrix", "progressr", "Rcpp", "RcppArmadillo", "rlang", "tibble", "tidyr", "tidyselect"] + "depends": ["Matrix", "Rcpp", "RcppArmadillo", "dplyr", "future_apply", "generics", "ggplot2", "lubridate", "progressr", "rlang", "tibble", "tidyr", "tidyselect"] }, "yesno": { "name": "yesno", - "version": "0.1.2", - "sha256": "1n9v8m1wkk9p2ahl7d1khbffxmshv68q1v44v04y4v1k6qjvm0i2", + "version": "0.1.3", + "sha256": "06qxjacvx17b0mry2qk5ksh814gyz88av80cpgz3d9fx01x3sxlv", "depends": [] }, "yfR": { @@ -125145,8 +126411,8 @@ }, "ymd": { "name": "ymd", - "version": "0.1.0", - "sha256": "18ivf09r7df4jq60pm0gdagcvpb4pz9a19y7dfb096h1yk7rqfa4", + "version": "0.1.1", + "sha256": "03lsq0prm4pzqmaiap5yddnpfl544ippp8vmdrvnc3d8n9fi6fg2", "depends": [] }, "ymlthis": { @@ -125189,13 +126455,13 @@ "name": "ypssc", "version": "1.1.0", "sha256": "0fpph19amj1cafcbh5k6s75pi7nahzgfvnsbs9i5644gv43iavbj", - "depends": ["dplyr", "eulerr", "Peptides", "readxl", "spelling", "stringr", "svDialogs"] + "depends": ["Peptides", "dplyr", "eulerr", "readxl", "spelling", "stringr", "svDialogs"] }, "yuima": { "name": "yuima", "version": "1.15.27", "sha256": "1w0g6yq1g2maq8wslgj5bis1f514ngxkxxbc9j7dsz7w51vppcwd", - "depends": ["boot", "calculus", "coda", "cubature", "expm", "glassoFast", "mvtnorm", "Rcpp", "RcppArmadillo", "statmod", "zoo"] + "depends": ["Rcpp", "RcppArmadillo", "boot", "calculus", "coda", "cubature", "expm", "glassoFast", "mvtnorm", "statmod", "zoo"] }, "yuimaGUI": { "name": "yuimaGUI", @@ -125205,9 +126471,9 @@ }, "yulab_utils": { "name": "yulab.utils", - "version": "0.1.4", - "sha256": "0m1iip6w711z92y6qw0rc0flxl9bzj85vrhm2q2rqjz9pyqf3m1j", - "depends": ["cli", "digest", "fs", "memoise", "rlang"] + "version": "0.1.6", + "sha256": "1v5y6i7s98lcw82rq815nznr9r1jqhpkb3vlqd6xixr52jnyg6sq", + "depends": ["cli", "digest", "fs", "httr2", "rlang"] }, "yum": { "name": "yum", @@ -125223,8 +126489,8 @@ }, "zCompositions": { "name": "zCompositions", - "version": "1.5.0-3", - "sha256": "1gbwx3vgx5viqnn5jsszild6ikyc2pmf1hdjc9475caf9xx9l589", + "version": "1.5.0-4", + "sha256": "1bvaw6m95hz8hd5p8h1d482b45r3w82dyj3sxlijf12s0qg8w63k", "depends": ["MASS", "NADA", "truncnorm"] }, "zTree": { @@ -125249,7 +126515,7 @@ "name": "zcurve", "version": "2.4.2", "sha256": "0a9x0j04mfjn2vfycylvqmsh7v4b1a5lx5j501xbzqp9m3m9bh9q", - "depends": ["evmix", "ggplot2", "nleqslv", "Rcpp", "Rdpack", "rlang"] + "depends": ["Rcpp", "Rdpack", "evmix", "ggplot2", "nleqslv", "rlang"] }, "zdeskR": { "name": "zdeskR", @@ -125267,19 +126533,19 @@ "name": "zebu", "version": "0.2.2.0", "sha256": "1bxzc110nxyssdvnk330qs8qbmf6m7v5gglcfdkxdzy5gcbs1bm6", - "depends": ["data_table", "ggplot2", "Rcpp", "reshape2"] + "depends": ["Rcpp", "data_table", "ggplot2", "reshape2"] }, "zeitgebr": { "name": "zeitgebr", "version": "0.3.5", "sha256": "1h2zx3ah1xdyyag40ragrv7gvpnlzqmappbnjp971dn9khqdxfqs", - "depends": ["behavr", "data_table", "lomb", "pracma", "WaveletComp"] + "depends": ["WaveletComp", "behavr", "data_table", "lomb", "pracma"] }, "zen4R": { "name": "zen4R", "version": "0.10", "sha256": "0sizxy7ck26jrq77y09qcqyzppamfm0kh2zw8s7n83z0bfy54vs6", - "depends": ["atom4R", "cli", "httr", "jsonlite", "keyring", "plyr", "R6", "utf8", "XML", "xml2"] + "depends": ["R6", "XML", "atom4R", "cli", "httr", "jsonlite", "keyring", "plyr", "utf8", "xml2"] }, "zendeskR": { "name": "zendeskR", @@ -125291,19 +126557,19 @@ "name": "zendown", "version": "0.1.0", "sha256": "0xmz4m9c96dm79csxwh878vvjyq147fzcy833i6a5flc5z9asw3z", - "depends": ["checkmate", "cli", "curl", "fs", "glue", "httr2", "RCurl", "tibble", "tidyr"] + "depends": ["RCurl", "checkmate", "cli", "curl", "fs", "glue", "httr2", "tibble", "tidyr"] }, "zenplots": { "name": "zenplots", "version": "1.0.6", "sha256": "0rf690qip2x7w037cbq51cfzqmla398a6x857wpz8cy9fd26ns7p", - "depends": ["graph", "MASS", "PairViz"] + "depends": ["MASS", "PairViz", "graph"] }, "zenstats": { "name": "zenstats", "version": "0.1.2", "sha256": "1ji4pqb0vh8ad8jr4pd6dkjr5cfckrlp24jncjc079wahw64fgs5", - "depends": ["checkmate", "cli", "curl", "polite", "purrr", "RCurl", "readr", "rlang", "rvest", "tibble"] + "depends": ["RCurl", "checkmate", "cli", "curl", "polite", "purrr", "readr", "rlang", "rvest", "tibble"] }, "zeroEQpart": { "name": "zeroEQpart", @@ -125339,7 +126605,7 @@ "name": "zic", "version": "0.9.1", "sha256": "1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp", - "depends": ["coda", "Rcpp", "RcppArmadillo"] + "depends": ["Rcpp", "RcppArmadillo", "coda"] }, "zip": { "name": "zip", @@ -125363,7 +126629,7 @@ "name": "zipcodeR", "version": "0.3.5", "sha256": "1fmjqfhxd0lgsn6l5jvi3qzhbq9865xcps3jm9iy72jx7jxr59lk", - "depends": ["curl", "DBI", "dplyr", "httr", "jsonlite", "raster", "rlang", "RSQLite", "stringr", "tidycensus", "tidyr"] + "depends": ["DBI", "RSQLite", "curl", "dplyr", "httr", "jsonlite", "raster", "rlang", "stringr", "tidycensus", "tidyr"] }, "zipfR": { "name": "zipfR", @@ -125375,7 +126641,13 @@ "name": "zipfextR", "version": "1.0.2", "sha256": "03rlvvw7rfbhsbwd5njmgkkkrxq1lgjdydmpkn6h1hi97pc0gbhh", - "depends": ["copula", "tolerance", "VGAM"] + "depends": ["VGAM", "copula", "tolerance"] + }, + "zippeR": { + "name": "zippeR", + "version": "0.1.0", + "sha256": "0cvgkaisig3h1rqwxxwn22wv8d0p5a8y3m93s7crqx2b8dabw2ql", + "depends": ["dplyr", "httr", "jsonlite", "purrr", "readr", "sf", "spatstat_univar", "stringr", "tibble", "tidycensus", "tidyr", "tigris"] }, "zipsae": { "name": "zipsae", @@ -125411,19 +126683,19 @@ "name": "zoib", "version": "1.6", "sha256": "1px4jjjpn6ikngzlxz1i6fgld9cy5lv6nqn1bjin4q6sqqixyx2j", - "depends": ["abind", "coda", "Formula", "rjags"] + "depends": ["Formula", "abind", "coda", "rjags"] }, "zoid": { "name": "zoid", "version": "1.3.1", "sha256": "1yr958iqk2w0r2cmvh4v2k1d20lrz6l7h9vdmah12krc04nma675", - "depends": ["BH", "gtools", "Rcpp", "RcppEigen", "RcppParallel", "rstan", "rstantools", "StanHeaders"] + "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "gtools", "rstan", "rstantools"] }, "zoltr": { "name": "zoltr", - "version": "0.5.1", - "sha256": "12zh7y3pwidclscgvd0b0iaqq9j5y8mc8xd6pz4vs0jy5qs3ahar", - "depends": ["base64url", "dplyr", "httr", "jsonlite", "magrittr", "MMWRweek", "mockery", "readr", "rlang", "webmockr"] + "version": "1.0.1", + "sha256": "0j1zyclfhl1njwyg7x4jg4vqaphiikplqa8b4ch9hrzlvjjw7zk8", + "depends": ["MMWRweek", "base64url", "data_table", "dplyr", "httr", "jsonlite", "lubridate", "magrittr", "readr", "rlang"] }, "zonebuilder": { "name": "zonebuilder", @@ -125433,8 +126705,8 @@ }, "zonohedra": { "name": "zonohedra", - "version": "0.2-2", - "sha256": "0bvlrbc3nkaw9pjzl65idw8ybk7frhyihr3cp93jby5rnip8xpyz", + "version": "0.3-0", + "sha256": "1xkli50nkhv7ygjrv7d9kcv4lq6wi7rxwvr13jg042571rml5l49", "depends": ["logger"] }, "zoo": { @@ -125447,7 +126719,7 @@ "name": "zooimage", "version": "5.5.2", "sha256": "0ck8w0zb9l1n9xvjwqshq9q9l8pigy3yslq2hnfbgcwk17kk9mp8", - "depends": ["digest", "DT", "filehash", "jpeg", "MASS", "mda", "mlearning", "png", "shiny", "svDialogs", "svMisc", "tiff"] + "depends": ["DT", "MASS", "digest", "filehash", "jpeg", "mda", "mlearning", "png", "shiny", "svDialogs", "svMisc", "tiff"] }, "zoolog": { "name": "zoolog", @@ -125469,9 +126741,9 @@ }, "zoomerjoin": { "name": "zoomerjoin", - "version": "0.1.4", - "sha256": "00ckdb9nxvxwk8rw8dxa7craq1hah26bnhl70cgrhw72mmxggvmb", - "depends": ["dplyr", "tibble", "tidyr"] + "version": "0.1.5", + "sha256": "09k18igddp4lwakd0k8vg767sahw5rq6ww9fkwhxwh6rxlx4bj2y", + "depends": ["collapse", "dplyr", "tibble", "tidyr"] }, "zoomr": { "name": "zoomr", @@ -125489,13 +126761,13 @@ "name": "ztable", "version": "0.2.3", "sha256": "1ps7ix0hc84s0p0ra6bkjxky3cffs1rvdcagqzj78lbdq22dk5j8", - "depends": ["flextable", "magrittr", "officer", "RColorBrewer", "rstudioapi", "scales", "stringr"] + "depends": ["RColorBrewer", "flextable", "magrittr", "officer", "rstudioapi", "scales", "stringr"] }, "ztpln": { "name": "ztpln", "version": "0.1.2", "sha256": "1b22m72a8117yrgq5k1gzsrbx6yrsrj7bpd49lh7x3vbaz56c0wr", - "depends": ["DistributionUtils", "mixtools", "Rcpp", "RcppEigen", "RcppNumerical"] + "depends": ["DistributionUtils", "Rcpp", "RcppEigen", "RcppNumerical", "mixtools"] }, "ztype": { "name": "ztype", @@ -125648,6 +126920,20 @@ "depends": ["maptools", "raster", "rgdal", "sp", "withr"], "broken": true }, + "ARDECO": { + "name": "ARDECO", + "version": "1.0.1", + "sha256": "1m249r65kh18v57wlhg9fv26fla5sbxqfqm725f95677ck852jf2", + "depends": ["dplyr", "ghql", "httr", "jsonlite", "rjstat", "tidyr"], + "broken": true + }, + "AROC": { + "name": "AROC", + "version": "1.0-4", + "sha256": "0wwv63mlh8pl5pzaih57l2qy70fz2wpfyxns1lyp95sxhq7ddwza", + "depends": ["Hmisc", "MASS", "Matrix", "moments", "nor1mix", "np", "spatstat_geom"], + "broken": true + }, "ARTP2": { "name": "ARTP2", "version": "0.9.45", @@ -125718,13 +127004,6 @@ "depends": ["AWR", "jsonlite", "rJava"], "broken": true }, - "ActiSleep": { - "name": "ActiSleep", - "version": "0.2.1", - "sha256": "0nkfddfv0g1bvsg6811lrmy0cx7knmi225snyp22bh9ly9fnlqp8", - "depends": ["accelerometry", "DBI", "dplyr", "lazyeval", "lubridate", "RSQLite", "stringr", "tibble"], - "broken": true - }, "ActiveDriverWGS": { "name": "ActiveDriverWGS", "version": "1.2.0", @@ -126096,13 +127375,6 @@ "depends": [], "broken": true }, - "BaSTA": { - "name": "BaSTA", - "version": "1.9.5", - "sha256": "09wvfg44g9j3gq9arkm2ajm8l4y7gna4fh49ihvmjzqdvsl6gkq6", - "depends": ["snowfall"], - "broken": true - }, "BacArena": { "name": "BacArena", "version": "1.8.2", @@ -126397,6 +127669,13 @@ "depends": ["np"], "broken": true }, + "CARlasso": { + "name": "CARlasso", + "version": "0.1.2", + "sha256": "05r5n5bh0fpwfigr6czh9pg29zyrw73idfvs9qm8vr3dvcmvc42r", + "depends": ["coda", "ggplot2", "ggraph", "igraph", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress"], + "broken": true + }, "CATkit": { "name": "CATkit", "version": "3.3.3", @@ -126677,13 +127956,6 @@ "depends": [], "broken": true }, - "ChangePointTaylor": { - "name": "ChangePointTaylor", - "version": "0.2", - "sha256": "0rf3h7l8l6fw2i489ldcqhsf9ppjzpx298p5ciyp9iyc0zcykz38", - "depends": ["bench", "dplyr", "ggplot2", "magrittr", "purrr", "Rcpp", "rlang", "tidyr"], - "broken": true - }, "ChargeTransport": { "name": "ChargeTransport", "version": "1.0.2", @@ -126747,13 +128019,6 @@ "depends": [], "broken": true }, - "CommEcol": { - "name": "CommEcol", - "version": "1.7.1", - "sha256": "1s6x4mhcx64qdzmp83x3mzmwyj1biawmdj2y752xpm8gpxfjnbc0", - "depends": ["adespatial", "ape", "betapart", "gmp", "picante", "vegan"], - "broken": true - }, "CommT": { "name": "CommT", "version": "0.1.1", @@ -127020,6 +128285,13 @@ "depends": ["Matrix"], "broken": true }, + "DMCfun": { + "name": "DMCfun", + "version": "3.5.4", + "sha256": "0kw0hzg5hwj76yz02ws62dmji7ggjm5isnh4blfhw55fsn7b6aic", + "depends": ["BH", "DEoptim", "dplyr", "pbapply", "Rcpp", "tidyr"], + "broken": true + }, "DMLLZU": { "name": "DMLLZU", "version": "0.1.1", @@ -127573,6 +128845,13 @@ "depends": ["kerdiest", "KernSmooth", "MASS", "mgcv", "nlme", "pspline", "sfsmisc"], "broken": true }, + "FCSlib": { + "name": "FCSlib", + "version": "1.3.0", + "sha256": "1191ba6dwpakcdnbcq61zm5xq24isxjnn98nmvk67fpf1ycw70w9", + "depends": ["bitops", "fields", "stringr", "tiff"], + "broken": true + }, "FDRSeg": { "name": "FDRSeg", "version": "1.0-3", @@ -127601,11 +128880,11 @@ "depends": [], "broken": true }, - "FLightR": { - "name": "FLightR", - "version": "0.5.4", - "sha256": "1lbdh4m0s12617s7sarqhlj88j3rn8zaiiwz361rx83map4vvhad", - "depends": ["bit", "CircStats", "circular", "fields", "geosphere", "ggmap", "ggplot2", "ggsn", "maps", "mgcv", "nlme", "RcppArmadillo", "sf", "suntools", "truncnorm"], + "FLSSS": { + "name": "FLSSS", + "version": "9.1.3", + "sha256": "1mjjnasc5f3l44dch7wjxl0b6jbcyjkk6m5b3xgjrir5qyy7fmdk", + "depends": ["Rcpp", "RcppParallel"], "broken": true }, "FPCA2D": { @@ -128392,13 +129671,6 @@ "depends": ["checkmate", "DiagrammeR", "dplyr", "graph", "magrittr", "nnet", "pixiedust", "plyr", "rjags", "stringr"], "broken": true }, - "HypergeoMat": { - "name": "HypergeoMat", - "version": "4.0.2", - "sha256": "06ljg2v0dbqi9mf2l236p616x62cbx4q05qymbsj8inmajwv0piz", - "depends": ["EigenR", "gsl", "JuliaConnectoR", "Rcpp", "RcppEigen"], - "broken": true - }, "IAbin": { "name": "IAbin", "version": "1.0", @@ -128455,13 +129727,6 @@ "depends": ["data_table", "httr", "tibble"], "broken": true }, - "IDSpatialStats": { - "name": "IDSpatialStats", - "version": "0.3.12", - "sha256": "0gkicafnzq8aq9bmbbr9n868sh91dwkhs1dk4wry5vkbfaawfxis", - "depends": ["doParallel", "foreach", "igraph", "spatstat_core", "spatstat_geom"], - "broken": true - }, "IFAA": { "name": "IFAA", "version": "1.1.2", @@ -129337,6 +130602,13 @@ "depends": ["changepoint", "glmnet", "HDPenReg", "R_utils", "spikeslab"], "broken": true }, + "MPCR": { + "name": "MPCR", + "version": "1.1.2", + "sha256": "0hq6df8rz7hi1s4kpcxlx21kppn70fjki8wfy6gi8kna8bmayyf7", + "depends": ["Rcpp"], + "broken": true + }, "MPINet": { "name": "MPINet", "version": "1.0", @@ -129449,6 +130721,13 @@ "depends": ["prismatic", "raster", "rgdal"], "broken": true }, + "MantaID": { + "name": "MantaID", + "version": "1.0.2", + "sha256": "01rc9p4ydq7s2iwqc017ijdbw8w8n0s82f0j69gsl6m5fbqm9a4k", + "depends": ["biomaRt", "caret", "data_table", "dplyr", "ggcorrplot", "ggplot2", "keras", "magrittr", "mlr3", "mlr3tuning", "paradox", "purrr", "RColorBrewer", "reshape2", "scutr", "stringr", "tibble", "tidyr", "tidyselect"], + "broken": true + }, "MapeBay": { "name": "MapeBay", "version": "0.1.0", @@ -129582,6 +130861,13 @@ "depends": ["igraph"], "broken": true }, + "MetaculR": { + "name": "MetaculR", + "version": "0.4.1", + "sha256": "130ic9q221lmnr5wzmw7bbskqzi5gmw8ark5zpw3y8wy9zbv2m98", + "depends": ["assertthat", "clipr", "cowplot", "dplyr", "ggplot2", "ggrepel", "httr", "jsonlite", "magrittr", "progress", "spatstat_geom", "tidyr", "verification"], + "broken": true + }, "MetaheuristicFPA": { "name": "MetaheuristicFPA", "version": "1.0", @@ -129624,13 +130910,6 @@ "depends": ["CompQuadForm"], "broken": true }, - "MicroSEC": { - "name": "MicroSEC", - "version": "1.1.3", - "sha256": "1imdxm15f792xw5kc9lhry5jsw739j6y3f2fs64abj22hqxfwypi", - "depends": ["BiocGenerics", "Biostrings", "data_table", "dplyr", "GenomeInfoDb", "GenomicAlignments", "gtools", "magrittr", "openxlsx", "R_utils", "Rsamtools", "stringr", "tidyr"], - "broken": true - }, "MinBAR": { "name": "MinBAR", "version": "1.1.3", @@ -129680,6 +130959,13 @@ "depends": ["doParallel", "dplyr", "foreach", "magrittr", "Matrix", "slam", "tm", "topicmodels"], "broken": true }, + "MobileTrigger": { + "name": "MobileTrigger", + "version": "0.0.31", + "sha256": "1zbnxdxh6gr4sgpi10i0pnd85f7i842105jgjswacziqamby6mcy", + "depends": ["caret", "ggplot2", "kableExtra", "knitr", "mailR", "plyr", "XML", "yaml"], + "broken": true + }, "ModelGood": { "name": "ModelGood", "version": "1.0.9", @@ -129750,6 +131036,13 @@ "depends": ["nlme", "reshape"], "broken": true }, + "Multiaovbay": { + "name": "Multiaovbay", + "version": "0.1.0", + "sha256": "0c5563h9v2xnxbxf9qkd567v154lnjnlyvc5aqbv4vd7awi8mn71", + "depends": ["BayesFactor", "broom", "car", "dplyr", "DT", "ggplot2", "ggstatsplot", "highcharter", "htmltools", "moments", "nortest", "PMCMRplus", "purrr", "reshape", "shiny", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "stringr", "tibble", "waiter"], + "broken": true + }, "Myrrix": { "name": "Myrrix", "version": "1.2", @@ -129764,6 +131057,13 @@ "depends": ["rJava"], "broken": true }, + "NADIA": { + "name": "NADIA", + "version": "0.4.2", + "sha256": "19545sc75a82smjvvyd353wjlh3wwzhwapcrk9fkg3ffjv9p4a3n", + "depends": ["Amelia", "data_table", "doParallel", "foreach", "glmnet", "mice", "missForest", "missMDA", "missRanger", "mlr3", "mlr3learners", "mlr3pipelines", "paradox", "rpart", "softImpute", "testthat", "VIM"], + "broken": true + }, "NB": { "name": "NB", "version": "0.9", @@ -129862,13 +131162,6 @@ "depends": [], "broken": true }, - "NPRED": { - "name": "NPRED", - "version": "1.0.7", - "sha256": "0nkfgc9zy3gszmnay77yj7i0p8w1q8j1m9wb05hkrmhiacp4mbn4", - "depends": [], - "broken": true - }, "NPS": { "name": "NPS", "version": "1.1", @@ -130079,6 +131372,13 @@ "depends": ["clinfun", "mvtnorm"], "broken": true }, + "OptiSembleForecasting": { + "name": "OptiSembleForecasting", + "version": "0.1.0", + "sha256": "0j1xjh59iyb99p73wjvqr8yrsj6yplsl2rrx50bds9ksjbq1qmym", + "depends": ["caretForecast", "dplyr", "factoextra", "FactoMineR", "forecast", "keras", "kknn", "MCS", "metaheuristicOpt", "Metrics", "neuralnet", "readxl", "tensorflow", "tibble", "tsutils"], + "broken": true + }, "OrdinalLogisticBiplot": { "name": "OrdinalLogisticBiplot", "version": "0.4", @@ -130163,13 +131463,6 @@ "depends": ["bcp", "changepoint", "chipPCR", "ecp", "fda_usc", "MBmca", "pbapply", "pracma", "qpcR", "robustbase", "segmented", "shiny", "zoo"], "broken": true }, - "PDXpower": { - "name": "PDXpower", - "version": "1.0.0", - "sha256": "144phmshjmm891f8sd8aagm7ql6hwb1i24mbpcfgak61q7anw2xy", - "depends": ["frailtypack", "ggplot2", "ggpubr", "nlme", "survival"], - "broken": true - }, "PEMM": { "name": "PEMM", "version": "1.0", @@ -130240,13 +131533,6 @@ "depends": [], "broken": true }, - "PRANA": { - "name": "PRANA", - "version": "1.0.4", - "sha256": "1i9gwz4dlsz9w0z3d995w6s6f10gwvwhyb77agbmmwym1fd2k2wh", - "depends": ["dnapath", "dplyr", "minet", "robustbase"], - "broken": true - }, "PROTOLIDAR": { "name": "PROTOLIDAR", "version": "0.1", @@ -131493,6 +132779,13 @@ "depends": ["Rcpp", "RcppArmadillo", "Rdpack"], "broken": true }, + "Rraven": { + "name": "Rraven", + "version": "1.0.13", + "sha256": "0nlqr1hzbzbz4rb3hjy01iw8czhaqvwmy9hh728fgl5vajwqwn8g", + "depends": ["NatureSounds", "pbapply", "seewave", "tuneR", "warbleR"], + "broken": true + }, "Rrdrand": { "name": "Rrdrand", "version": "0.1-16", @@ -131745,13 +133038,6 @@ "depends": ["JM"], "broken": true }, - "SFSI": { - "name": "SFSI", - "version": "1.3.1", - "sha256": "1h085bihjlbfa1ma63ngcshfw97fx0k879lpxjj82s1dbazagkdg", - "depends": ["ggplot2", "igraph", "reshape2", "scales", "tensorEVD", "viridis"], - "broken": true - }, "SHIP": { "name": "SHIP", "version": "1.0.2", @@ -132088,6 +133374,13 @@ "depends": ["data_table", "igraph", "XML"], "broken": true }, + "ShapeRotator": { + "name": "ShapeRotator", + "version": "0.1.0", + "sha256": "1pg2m1wh7fbchm8gp3mngfnf5g2rbhvzim1bpzqyvxqpx6ynicsa", + "depends": ["plot3D"], + "broken": true + }, "ShinyImage": { "name": "ShinyImage", "version": "0.1.0", @@ -132193,13 +133486,6 @@ "depends": ["EBImage"], "broken": true }, - "SmithWilsonYieldCurve": { - "name": "SmithWilsonYieldCurve", - "version": "1.0.1", - "sha256": "0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w", - "depends": [], - "broken": true - }, "SoDA": { "name": "SoDA", "version": "1.0-6.1", @@ -132886,6 +134172,13 @@ "depends": ["car", "MASS", "nloptr", "psych", "reshape2", "shiny", "zoo"], "broken": true }, + "VAJointSurv": { + "name": "VAJointSurv", + "version": "0.1.0", + "sha256": "19ib4b1kf1zg4l571f2asxkwbab44pzs954agj0wx1p6kb2v608q", + "depends": ["lme4", "Matrix", "psqn", "Rcpp", "RcppArmadillo", "RcppEigen", "SimSurvNMarker", "survival", "testthat"], + "broken": true + }, "VARMER": { "name": "VARMER", "version": "1.0.0", @@ -133243,13 +134536,6 @@ "depends": ["circular", "mclust", "overlap", "runjags"], "broken": true }, - "adass": { - "name": "adass", - "version": "1.0.0", - "sha256": "1g702pg335q9jwgdygb7n364ibad6z27fcd9yfim8gi4fcpjwlkq", - "depends": ["fda", "matrixcalc", "mvtnorm", "plot3D", "Rfast", "SparseM"], - "broken": true - }, "adhoc": { "name": "adhoc", "version": "1.1", @@ -133278,6 +134564,13 @@ "depends": ["assertthat", "dplyr", "lubridate", "stringr"], "broken": true }, + "affluenceIndex": { + "name": "affluenceIndex", + "version": "2.1", + "sha256": "0vcg4gphs0yxdxsgw7kj9r3hvjpfs2z8sjvllvfw9ki3y7jy5jb8", + "depends": ["spatstat", "spatstat_geom"], + "broken": true + }, "agroclim": { "name": "agroclim", "version": "0.3.0", @@ -133425,6 +134718,34 @@ "depends": ["coda", "MCMCpack", "pscl", "wnominate"], "broken": true }, + "antaresEditObject": { + "name": "antaresEditObject", + "version": "0.7.0", + "sha256": "1v9lhaw2cs4ggfpwi1zdlganks3xrnlsycziv0h3zi5zg45mar7v", + "depends": ["antaresRead", "assertthat", "cli", "data_table", "doFuture", "doParallel", "future", "httr", "jsonlite", "lifecycle", "memuse", "pbapply", "plyr", "progressr", "whisker", "yaml"], + "broken": true + }, + "antaresProcessing": { + "name": "antaresProcessing", + "version": "0.18.1", + "sha256": "1dlq850xqh9534ws88ma3vv5r79cbabn6r6a2jmicxx116s7wjrz", + "depends": ["antaresRead", "data_table"], + "broken": true + }, + "antaresRead": { + "name": "antaresRead", + "version": "2.7.0", + "sha256": "0rgb2glphf6f4vw1hrjxm1f2lhdsx1zag6r0bqgvmzkqipvp97zk", + "depends": ["bit64", "data_table", "doParallel", "httr", "jsonlite", "lifecycle", "lubridate", "memuse", "pbapply", "plyr", "purrr", "shiny", "stringi", "stringr"], + "broken": true + }, + "antaresViz": { + "name": "antaresViz", + "version": "0.18.0", + "sha256": "1lffsxv8fy3yq6rx6520rizp9f74d8bd78by5n209yr9yhw1629r", + "depends": ["antaresProcessing", "antaresRead", "assertthat", "data_table", "dygraphs", "geojsonio", "htmltools", "htmlwidgets", "leaflet", "leaflet_minicharts", "lubridate", "manipulateWidget", "plotly", "rAmCharts", "sf", "shiny", "sp", "spMaps", "webshot"], + "broken": true + }, "aof": { "name": "aof", "version": "0.1.2", @@ -133439,6 +134760,13 @@ "depends": ["ape", "coda", "cubature", "pbapply", "quantreg"], "broken": true }, + "appler": { + "name": "appler", + "version": "0.2.1", + "sha256": "0y0nj8ac6cm1qvbzy2w93j638s0f4mj2b1b9g2rw046rrf7maiz4", + "depends": ["httr", "jsonlite", "rvest"], + "broken": true + }, "apricom": { "name": "apricom", "version": "1.0.0", @@ -133453,6 +134781,13 @@ "depends": [], "broken": true }, + "apt": { + "name": "apt", + "version": "3.0", + "sha256": "14njvpf6q34nffm3r9gqcszlabzbydsxqj0ln9nk4mv59izp8sqm", + "depends": ["car", "erer", "urca"], + "broken": true + }, "aptg": { "name": "aptg", "version": "0.1.1", @@ -133628,6 +134963,13 @@ "depends": [], "broken": true }, + "async": { + "name": "async", + "version": "0.3.2", + "sha256": "0xf3c6gr04drv7xxzpshycd13h5lm7r529f5q4ajrsl0m3hp9xpv", + "depends": ["iterors", "later", "nseval", "promises", "stringr", "testthat"], + "broken": true + }, "asypow": { "name": "asypow", "version": "2015.6.25", @@ -133677,6 +135019,13 @@ "depends": ["checkmate", "cli", "glue", "httr", "jsonlite", "magrittr", "ows4R", "R6", "sf", "stringr"], "broken": true }, + "autocart": { + "name": "autocart", + "version": "1.4.5", + "sha256": "1zgcmrm4dkdnr130hwwka2nwdczgvc3jc9hxrb6nfs8ijb24gl36", + "depends": ["fields", "mgcv", "Rcpp", "RcppArmadillo", "RcppParallel"], + "broken": true + }, "autoencoder": { "name": "autoencoder", "version": "1.1", @@ -133740,13 +135089,6 @@ "depends": [], "broken": true }, - "babette": { - "name": "babette", - "version": "2.3.3", - "sha256": "0c9v6dm3n9bnr5x4nln9a51dff557vrhxdfji9xikwnz0vv8656v", - "depends": ["beastier", "beautier", "mauricer", "phangorn", "remotes", "stringr", "tracerer", "xml2"], - "broken": true - }, "babsim_hospital": { "name": "babsim.hospital", "version": "11.8.8", @@ -133768,13 +135110,6 @@ "depends": ["doParallel", "foreach", "kedd", "mclust"], "broken": true }, - "baggingbwsel": { - "name": "baggingbwsel", - "version": "1.0", - "sha256": "0khvkxml4nwkahgl5ijdv0bjgwabmznzq99p71iw26ck808hafkl", - "depends": ["doParallel", "foreach", "kedd", "mclust", "misc3d", "nor1mix", "Rcpp", "rgl", "rpanel", "sm", "tkrplot"], - "broken": true - }, "bamboo": { "name": "bamboo", "version": "0.9.25", @@ -134286,13 +135621,6 @@ "depends": ["bookdown", "knitr", "magick", "xaringan"], "broken": true }, - "boomer": { - "name": "boomer", - "version": "0.1.1", - "sha256": "16gwdvcp8bz5bgmvxsvc9iyz2a6mpwf5vgilc1lhf9l4n0l1m685", - "depends": ["crayon", "pryr", "rlang", "rstudioapi", "styler", "withr"], - "broken": true - }, "boostr": { "name": "boostr", "version": "1.0.0", @@ -134755,6 +136083,13 @@ "depends": ["ggplot2", "survival"], "broken": true }, + "changeRangeR": { + "name": "changeRangeR", + "version": "1.1.0", + "sha256": "0y13wwz62wsh29flb7v094gb47gd6xwjq6fvmkzmlhz8x71f5g1v", + "depends": ["dplyr", "phylobase", "rangeModelMetadata", "raster", "sf", "sp"], + "broken": true + }, "changedetection": { "name": "changedetection", "version": "0.2.0", @@ -134881,13 +136216,6 @@ "depends": [], "broken": true }, - "ciuupi": { - "name": "ciuupi", - "version": "1.1.0", - "sha256": "0czfmmf62p1vml24s87pdwv52spqycchpkqzwk8vyd4n1z27r5s2", - "depends": ["functional", "nloptr", "pracma", "statmod"], - "broken": true - }, "clampSeg": { "name": "clampSeg", "version": "1.1-1", @@ -134986,6 +136314,13 @@ "depends": ["car", "dplyr", "foreach", "lme4", "lmerTest", "mathjaxr", "nlme", "progress", "R_utils", "shiny", "tidyr"], "broken": true }, + "clusteredinterference": { + "name": "clusteredinterference", + "version": "1.0.1", + "sha256": "01w7i9pmvwmrlf5q6y2d48ib0bm16j16xiw4pqnrvbndx4d6wf6n", + "depends": ["cubature", "Formula", "lme4", "numDeriv", "rootSolve"], + "broken": true + }, "clustsig": { "name": "clustsig", "version": "1.1", @@ -135196,13 +136531,6 @@ "depends": ["JuliaCall", "magrittr"], "broken": true }, - "cooltools": { - "name": "cooltools", - "version": "2.1.27", - "sha256": "1f22qpwf9ynqf9n4hl0kz6cy8bsz47dcmvz0wawq2isw5wn3jcs5", - "depends": ["bit64", "celestial", "cubature", "data_table", "FNN", "jpeg", "MASS", "plotrix", "png", "pracma", "randtoolbox", "raster", "Rcpp", "sp"], - "broken": true - }, "coopProductGame": { "name": "coopProductGame", "version": "2.0", @@ -135392,13 +136720,6 @@ "depends": [], "broken": true }, - "crossmatch": { - "name": "crossmatch", - "version": "1.3-1", - "sha256": "082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz", - "depends": ["nbpMatching", "survival"], - "broken": true - }, "crrp": { "name": "crrp", "version": "1.0", @@ -135742,6 +137063,13 @@ "depends": [], "broken": true }, + "decon": { + "name": "decon", + "version": "1.3-4", + "sha256": "036cv56wf42q2p3d5h15hbrp5rc29xxy20qwv4k1qzhkq6hmw0qs", + "depends": [], + "broken": true + }, "deconstructSigs": { "name": "deconstructSigs", "version": "1.8.0", @@ -136099,13 +137427,6 @@ "depends": ["aricode", "arules", "clusterCrit", "dplyr", "ggplot2", "Gmedian", "MASS", "mice", "NbClust", "ncvreg", "plyr", "scales", "survival", "withr"], "broken": true }, - "docket": { - "name": "docket", - "version": "1.20", - "sha256": "104v18dqhw1npxyhrmpwvvnlmv9n67gh0pfv4983gmzalbka9xk9", - "depends": ["stringr", "XML", "xml2", "zip"], - "broken": true - }, "docreview": { "name": "docreview", "version": "0.0.1", @@ -136204,13 +137525,6 @@ "depends": [], "broken": true }, - "dropR": { - "name": "dropR", - "version": "0.1", - "sha256": "0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs", - "depends": ["plyr", "shiny"], - "broken": true - }, "dse": { "name": "dse", "version": "2020.2-1", @@ -136498,13 +137812,6 @@ "depends": ["curl", "ggplot2", "nhdplusTools", "quantreg", "sbtools", "scales", "sqldf", "stringr", "testit"], "broken": true }, - "emIRT": { - "name": "emIRT", - "version": "0.0.13", - "sha256": "1z6yd9m6vggbp42qms2sg0rbxjpg15x9m8gkdz1p3q4aqrc2ncj0", - "depends": ["pscl", "Rcpp", "RcppArmadillo"], - "broken": true - }, "emba": { "name": "emba", "version": "0.1.8", @@ -136680,6 +137987,13 @@ "depends": ["qtl"], "broken": true }, + "erer": { + "name": "erer", + "version": "3.1", + "sha256": "03pdq3p5c5f20959hgk5q2cx5x10bpgf0qg4z1nvsf31vc5ni77v", + "depends": ["lmtest", "systemfit", "tseries", "urca"], + "broken": true + }, "ergm_userterms": { "name": "ergm.userterms", "version": "3.10.0", @@ -136701,6 +138015,13 @@ "depends": ["rpanel"], "broken": true }, + "err": { + "name": "err", + "version": "0.2.0", + "sha256": "1915b0vmqdd8whwdrqjphld1jaxawh5b7di6wf7q3sx779lblsrs", + "depends": [], + "broken": true + }, "erratum": { "name": "erratum", "version": "2.2.0", @@ -137065,6 +138386,13 @@ "depends": ["energy", "fastICA"], "broken": true }, + "fastLaplace": { + "name": "fastLaplace", + "version": "0.0.2", + "sha256": "172irl97sxkc5m1rk2kxxl8hkb1yf0029k9szkw9qyz0ki8d657w", + "depends": ["bbmle", "fields", "RSpectra"], + "broken": true + }, "fastclime": { "name": "fastclime", "version": "1.4.1", @@ -137121,6 +138449,13 @@ "depends": ["combinat", "glmnet", "MASS"], "broken": true }, + "fcl": { + "name": "fcl", + "version": "0.1.0", + "sha256": "0rskl9q7z5k5q17m3c5w4pdc96m6fdag7nkkjmyyh43wbm4bjb0a", + "depends": ["xts", "ymd"], + "broken": true + }, "fdakma": { "name": "fdakma", "version": "1.3.1", @@ -137247,6 +138582,13 @@ "depends": ["caret", "concaveman", "geosphere", "ggplot2", "raster", "rgeos", "sp", "stringdist", "vegan"], "broken": true }, + "filibustr": { + "name": "filibustr", + "version": "0.2.1", + "sha256": "1q7307fwwrvpgf0ypkhs4ayg4m27vpf3kazsvnf73jk3gi33i0ki", + "depends": ["crul", "dplyr", "haven", "httr2", "lifecycle", "R_utils", "readr", "rlang", "rvest", "stringr", "tidyr", "tidyselect"], + "broken": true + }, "filteRjsats": { "name": "filteRjsats", "version": "1.0", @@ -137422,11 +138764,11 @@ "depends": ["arules", "doParallel", "foreach", "Matrix", "pmml", "pryr", "R_utils", "XML"], "broken": true }, - "frailtypack": { - "name": "frailtypack", - "version": "3.6.0", - "sha256": "03hm6kala923fr02sjmysm2ycxbynsp3h43f8mlw8agi52hf9nz2", - "depends": ["boot", "doBy", "MASS", "nlme", "rootSolve", "shiny", "statmod", "survC1", "survival"], + "fractalRegression": { + "name": "fractalRegression", + "version": "1.2", + "sha256": "1d79bv3lpg1p6zvjsnf8qwm5ajpsklm8gpqm241jv1cgjyfsi64x", + "depends": ["colorRamps", "Rcpp", "RcppArmadillo", "RcppEigen"], "broken": true }, "frambgrowth": { @@ -137779,13 +139121,6 @@ "depends": ["fda"], "broken": true }, - "geohabnet": { - "name": "geohabnet", - "version": "2.1.2", - "sha256": "03d1zv8p5d75qj42g4xfq4fhif304a1wfkcggib5xqwkj5zkqabs", - "depends": ["beepr", "config", "easycsv", "future", "future_apply", "geodata", "geosphere", "igraph", "magrittr", "memoise", "rlang", "rnaturalearth", "stringr", "terra", "viridisLite", "yaml"], - "broken": true - }, "geojsonlint": { "name": "geojsonlint", "version": "0.4.0", @@ -137835,13 +139170,6 @@ "depends": [], "broken": true }, - "geotoolsR": { - "name": "geotoolsR", - "version": "1.1", - "sha256": "162s37j7wh14h91b6acn453bvgpk3cakfi7mgrdvr5bjdqqn7j7v", - "depends": ["dplyr", "geoR", "ggplot2", "tidyr"], - "broken": true - }, "geoviz": { "name": "geoviz", "version": "0.2.2", @@ -137884,6 +139212,20 @@ "depends": ["dplyr", "magrittr", "rvest", "stringr", "tibble", "tidyr", "xml2"], "broken": true }, + "gfilmm": { + "name": "gfilmm", + "version": "2.0.5", + "sha256": "0mn2z4aihz0anpm6d0cpyabhbd88x1cp0wgwxl5hgvkw547818pb", + "depends": ["forcats", "lazyeval", "Matrix", "Rcpp", "RcppEigen", "spatstat", "spatstat_geom"], + "broken": true + }, + "gfilogisreg": { + "name": "gfilogisreg", + "version": "1.0.3", + "sha256": "1x9j2ac7lk2gkcwxkvyc3bj23z5bibhx64lj4nwsgdjq14677502", + "depends": ["BH", "EigenR", "lazyeval", "rcdd", "Rcpp", "RcppArmadillo", "roptim", "spatstat", "spatstat_geom"], + "broken": true + }, "gfmR": { "name": "gfmR", "version": "1.1-0", @@ -138710,6 +140052,13 @@ "depends": ["ada", "AUC", "doParallel", "e1071", "FNN", "foreach", "genalg", "GenSA", "glmnet", "kernelFactory", "NMOF", "nnet", "nnls", "pso", "quadprog", "randomForest", "reportr", "Rmalschains", "ROCR", "rotationForest", "rpart", "soma", "tabuSearch"], "broken": true }, + "hydflood": { + "name": "hydflood", + "version": "0.5.7", + "sha256": "18gw2jipssaid5q004gyvfk56vgvajv69kd0f6zh2fp7sgq5w33d", + "depends": ["hyd1d", "raster", "Rdpack", "sf", "terra"], + "broken": true + }, "hydroApps": { "name": "hydroApps", "version": "0.1-1", @@ -138787,13 +140136,6 @@ "depends": ["msm", "Rcpp", "RcppArmadillo"], "broken": true }, - "iC10": { - "name": "iC10", - "version": "1.5", - "sha256": "1xq6xv582wxdb0nc2nia3q38155gx8z26idiqyx7h1rjb20hhwdl", - "depends": ["iC10TrainingData", "impute", "pamr"], - "broken": true - }, "iCiteR": { "name": "iCiteR", "version": "0.2.1", @@ -138871,6 +140213,34 @@ "depends": [], "broken": true }, + "icesDatsu": { + "name": "icesDatsu", + "version": "1.1.0", + "sha256": "0vprh8y6x28q33b6zx9qhq991q0aqn5rhccf44k8211n5dwa555k", + "depends": ["httr", "icesConnect", "jsonlite"], + "broken": true + }, + "icesDatsuQC": { + "name": "icesDatsuQC", + "version": "1.0.1", + "sha256": "0pspd702vg2k7fza9jvj7hdnpjlg4k41mwiq45k7bsr0cbksggsg", + "depends": ["icesDatsu", "sqldf"], + "broken": true + }, + "icesSD": { + "name": "icesSD", + "version": "2.0.0", + "sha256": "1k0i79hh63bmsqw5m6ym2h3dydrjji57lkysp5n9x293lgh04pf2", + "depends": ["httr", "icesConnect"], + "broken": true + }, + "icesVMS": { + "name": "icesVMS", + "version": "1.1.4", + "sha256": "0ppml34s4zz3vav08fjaj71bml8amaslw22zmib0scvw8k70jlir", + "depends": ["glue", "httr", "icesConnect", "icesVocab"], + "broken": true + }, "iconr": { "name": "iconr", "version": "0.1.0", @@ -138906,6 +140276,20 @@ "depends": ["doParallel", "foreach", "survival"], "broken": true }, + "iemisc": { + "name": "iemisc", + "version": "1.0.5", + "sha256": "0dr9p4y0vdwxsd5dqp5ahqnv1sfckb3xy9i0bbas009g5hnzxp92", + "depends": ["anytime", "assertthat", "berryFunctions", "checkmate", "chem_databases", "data_table", "foreach", "fpCompare", "geosphere", "ggplot2", "ggpubr", "gsubfn", "iemiscdata", "lubridate", "matlab", "matlab2r", "measurements", "mgsub", "pracma", "qdapRegex", "ramify", "rivr", "roperators", "round", "sf", "signal", "sjmisc", "stringi", "units", "USA_state_boundaries", "zoo"], + "broken": true + }, + "iemiscdata": { + "name": "iemiscdata", + "version": "1.0.2", + "sha256": "1wsakabhj9majl4w63bpc95ccdvfg7xz9arj0ikvdj6dh1ardac6", + "depends": [], + "broken": true + }, "ifa": { "name": "ifa", "version": "7.0", @@ -139025,6 +140409,13 @@ "depends": ["ltm"], "broken": true }, + "inldata": { + "name": "inldata", + "version": "1.2.3", + "sha256": "0155mx8nx5g1vp3mcfar0n4qbxqyvs0fzqnmd8skrrygfk1aw0y5", + "depends": ["checkmate", "sf", "stringi", "terra"], + "broken": true + }, "inlmisc": { "name": "inlmisc", "version": "0.5.5", @@ -139039,6 +140430,13 @@ "depends": ["cli", "crayon", "doSNOW", "dplyr", "forcats", "foreach", "ggplot2", "glue", "mvtnorm", "optimizeR", "reshape2", "rlang", "scales"], "broken": true }, + "insee": { + "name": "insee", + "version": "1.1.5", + "sha256": "1f6y19dysm0mh3fkrwnqcgi5j1lzy08m3ij3wrx26q2vgwv5lkfg", + "depends": ["crayon", "dplyr", "httr", "openssl", "purrr", "rappdirs", "rlang", "stringr", "tibble", "tidyselect", "xml2"], + "broken": true + }, "insiderTrades": { "name": "insiderTrades", "version": "0.0.1", @@ -139921,6 +141319,13 @@ "depends": ["abind", "doParallel", "dplyr", "foreach", "jsonlite", "magrittr", "processx", "rlang", "tibble", "withr"], "broken": true }, + "lpme": { + "name": "lpme", + "version": "1.1.3", + "sha256": "1ch11cwjci98m7952p9wdsh9fj5y1mjya6ayq0q4wmbm824qfpzb", + "depends": ["decon", "flexmix", "locpol", "Rcpp", "RcppArmadillo"], + "broken": true + }, "lpmodeler": { "name": "lpmodeler", "version": "0.2-1", @@ -140152,6 +141557,13 @@ "depends": ["aucm", "Hmisc", "Rsolnp", "survival"], "broken": true }, + "maxnodf": { + "name": "maxnodf", + "version": "1.0.0", + "sha256": "1czhy3177bb4a5rxi2s4j3c9xn9f0b2pbkdka1dzw6ga389wdwb3", + "depends": ["Rcpp"], + "broken": true + }, "mbclusterwise": { "name": "mbclusterwise", "version": "1.0", @@ -140390,13 +141802,6 @@ "depends": ["corpcor", "evd", "fields", "numDeriv"], "broken": true }, - "mhurdle": { - "name": "mhurdle", - "version": "1.3-0", - "sha256": "1in07zk29z5fhrg75wl1fwbrsny4ihjnrqyh2kz1bd448p10f295", - "depends": ["Formula", "generics", "margins", "maxLik", "numDeriv", "prediction", "Rdpack", "survival", "truncreg"], - "broken": true - }, "miRada": { "name": "miRada", "version": "1.13.8-8", @@ -140453,13 +141858,6 @@ "depends": ["dplyr", "futile_logger", "lubridate", "Rcpp", "stringr"], "broken": true }, - "milorGWAS": { - "name": "milorGWAS", - "version": "0.6", - "sha256": "1gl4lg3m11hkj47g7zqq0xavxzj5z1vjbb88pf03r7200qnb5ff8", - "depends": ["gaston", "Rcpp", "RcppEigen"], - "broken": true - }, "mindr": { "name": "mindr", "version": "1.3.2", @@ -140747,13 +142145,6 @@ "depends": ["dplyr", "ggfittext", "ggplot2", "gridExtra", "magrittr", "RColorBrewer", "rlang", "scales"], "broken": true }, - "modeltime_ensemble": { - "name": "modeltime.ensemble", - "version": "1.0.3", - "sha256": "17mnz2x7i540gzwpqca106saafvsns9ar1q09pnnzkx2m4xv322i", - "depends": ["cli", "doParallel", "dplyr", "foreach", "generics", "glue", "magrittr", "modeltime", "modeltime_resample", "parsnip", "purrr", "recipes", "rlang", "rsample", "stringr", "tibble", "tictoc", "tidyr", "timetk", "tune", "workflows", "yardstick"], - "broken": true - }, "modeltime_gluonts": { "name": "modeltime.gluonts", "version": "0.1.0", @@ -140824,13 +142215,6 @@ "depends": [], "broken": true }, - "moranajp": { - "name": "moranajp", - "version": "0.9.6", - "sha256": "1w28fzwxgrmf12l40f4wl2h8qflbsii7g3wiqxxxg0v6njp49ws1", - "depends": ["dplyr", "ggplot2", "ggraph", "igraph", "magrittr", "purrr", "rlang", "rvest", "stringi", "stringr", "tibble", "tidyr"], - "broken": true - }, "morgenstemning": { "name": "morgenstemning", "version": "1.0", @@ -140838,6 +142222,13 @@ "depends": [], "broken": true }, + "morse": { + "name": "morse", + "version": "3.3.2", + "sha256": "0534k96fhfdkfr3dh6q85fmsqqld7xv1zxvikwcb6z6by3nr9cpp", + "depends": ["coda", "deSolve", "dplyr", "epitools", "ggplot2", "gridExtra", "magrittr", "reshape2", "rjags", "tibble", "tidyr", "zoo"], + "broken": true + }, "mortyr": { "name": "mortyr", "version": "0.0.2", @@ -141328,13 +142719,6 @@ "depends": ["analogue", "dplyr", "httr", "jsonlite", "leaflet", "plyr", "reshape2", "xml2"], "broken": true }, - "neotoma2": { - "name": "neotoma2", - "version": "1.0.3", - "sha256": "1a7qcpypbr7vakrzl039ckv3cdy040gl6m3jpya1s284r30b12fx", - "depends": ["assertthat", "dplyr", "geojsonsf", "gtools", "httr", "jsonlite", "leaflet", "lubridate", "magrittr", "progress", "purrr", "rlang", "sf", "stringr", "tidyr", "uuid", "wk"], - "broken": true - }, "netchain": { "name": "netchain", "version": "0.2.0", @@ -141342,6 +142726,13 @@ "depends": ["gtools", "igraph", "Matrix", "Rcpp", "stringr"], "broken": true }, + "netcox": { + "name": "netcox", + "version": "1.0.1", + "sha256": "04biaynmvqrilp0kdxw55b990j7iqnvn8gr07dhzm9f7r9sr7xk6", + "depends": ["glmnet", "Rcpp", "survival"], + "broken": true + }, "netgen": { "name": "netgen", "version": "1.3.2", @@ -141601,6 +142992,13 @@ "depends": ["jsonlite", "magrittr", "yahoofinancer"], "broken": true }, + "nseval": { + "name": "nseval", + "version": "0.5.1", + "sha256": "10b9kvvnlgc0jpbjnpkjmrkbl8plbkbggckwzy41kv41ha7rgda2", + "depends": [], + "broken": true + }, "nsgp": { "name": "nsgp", "version": "1.0.5", @@ -141685,6 +143083,13 @@ "depends": ["doParallel", "foreach", "forecast", "MASS", "Rcpp", "RcppArmadillo"], "broken": true }, + "ohun": { + "name": "ohun", + "version": "1.0.1", + "sha256": "103s9sv70p9hw6q55j98wri5bxqazfn9hxpk1mm39x7navx3qzvp", + "depends": ["checkmate", "cli", "fftw", "ggplot2", "igraph", "rlang", "seewave", "sf", "tuneR", "warbleR"], + "broken": true + }, "okmesonet": { "name": "okmesonet", "version": "0.1.5", @@ -141811,6 +143216,13 @@ "depends": ["AUC", "data_table", "ggplot2", "knitr", "plyr", "scales", "stringr", "XML"], "broken": true }, + "optimCheck": { + "name": "optimCheck", + "version": "1.0", + "sha256": "1qjkv1mfyn7sw0dkxxcdaqj85vl71cgffpf3k3mvzy0s8yhxjb4n", + "depends": [], + "broken": true + }, "optimr": { "name": "optimr", "version": "2019-12.16", @@ -141846,6 +143258,13 @@ "depends": ["DBI", "ROracle"], "broken": true }, + "orbweaver": { + "name": "orbweaver", + "version": "0.10.2", + "sha256": "1n8gay2nsxh0pc1jc6hgs2n5knk5ajaaqisq2l5dsnkl172r62rf", + "depends": ["glue", "rlang"], + "broken": true + }, "orderbook": { "name": "orderbook", "version": "1.03", @@ -141909,6 +143328,13 @@ "depends": [], "broken": true }, + "otsad": { + "name": "otsad", + "version": "0.2.0", + "sha256": "1jb6raxm70aywbgs7bdyw8vccy1nj924f4hkpjrlgnvzmy0hyhvs", + "depends": ["ggplot2", "plotly", "reticulate", "sigmoid"], + "broken": true + }, "otvPlots": { "name": "otvPlots", "version": "0.2.1", @@ -142266,6 +143692,13 @@ "depends": ["matrixStats"], "broken": true }, + "pedmod": { + "name": "pedmod", + "version": "0.2.4", + "sha256": "1xr98vp2s3s2cw4bjdw6156zas15jxvp9fbyz9rxd68i3zrblplx", + "depends": ["alabama", "BH", "psqn", "Rcpp", "RcppArmadillo", "testthat"], + "broken": true + }, "penDvine": { "name": "penDvine", "version": "0.2.4", @@ -143148,6 +144581,13 @@ "depends": ["RCurl", "rjson", "stringr", "tm", "XML"], "broken": true }, + "rDNAse": { + "name": "rDNAse", + "version": "1.1-1", + "sha256": "0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk", + "depends": [], + "broken": true + }, "rDotNet": { "name": "rDotNet", "version": "0.9.1", @@ -143610,6 +145050,13 @@ "depends": ["broom", "dataverse", "dplyr", "estimatr", "generics", "ggplot2", "prediction", "purrr", "randomizr", "readr", "rlang", "tibble", "tidyr"], "broken": true }, + "read_dbc": { + "name": "read.dbc", + "version": "1.0.7", + "sha256": "1virjl00x1yzby6wvxjdf1kqbjgm2kkdv53b72c0jq4nrfrl55nw", + "depends": ["foreign"], + "broken": true + }, "readSX": { "name": "readSX", "version": "0.8.4", @@ -144037,13 +145484,6 @@ "depends": [], "broken": true }, - "rnaCrosslinkOO": { - "name": "rnaCrosslinkOO", - "version": "0.1.2", - "sha256": "146595ib0730ppx4dxfq7vmvxwgf1vs1w3vkhb8ylrc8id3lki4z", - "depends": ["ClassDiscovery", "doParallel", "foreach", "GenomicRanges", "ggplot2", "ggrepel", "heatmap3", "igraph", "IRanges", "MASS", "mixtools", "patchwork", "R4RNA", "RColorBrewer", "reshape2", "RRNA", "S4Vectors", "seqinr", "tidyverse", "TopDom"], - "broken": true - }, "rngwell19937": { "name": "rngwell19937", "version": "0.6-0", @@ -144093,13 +145533,6 @@ "depends": ["forecast", "Rcpp"], "broken": true }, - "robusTest": { - "name": "robusTest", - "version": "1.0.1", - "sha256": "0rgm0cl47c8ddhbl0da3jdrkxhgy3jqlabmi4fqkc80zcmaldmhi", - "depends": ["Rcpp"], - "broken": true - }, "robustarima": { "name": "robustarima", "version": "0.2.6", @@ -144177,6 +145610,13 @@ "depends": ["assertthat", "combinat", "dplyr", "stringr", "xlsx"], "broken": true }, + "rpdo": { + "name": "rpdo", + "version": "0.3.2", + "sha256": "0sh52y7hmnm9qhyp0m6vp3c23wzz3ds8j577z105s6f3pdf398l0", + "depends": ["chk", "lifecycle"], + "broken": true + }, "rpicosat": { "name": "rpicosat", "version": "1.0.1", @@ -144254,6 +145694,13 @@ "depends": ["checkmate"], "broken": true }, + "rsgeo": { + "name": "rsgeo", + "version": "0.1.6", + "sha256": "04mv8ifl1k2vqacglw0j41j96l9ls8khiligjhk499c5zg4aadip", + "depends": ["rlang", "vctrs"], + "broken": true + }, "rsleep": { "name": "rsleep", "version": "1.0.12", @@ -144303,13 +145750,6 @@ "depends": ["digest", "hellno", "magrittr", "R6", "Rcpp", "RSQLite", "stringb"], "broken": true }, - "rtrim": { - "name": "rtrim", - "version": "2.1.1", - "sha256": "1l2ijkm4p3nd7n4q1b4y9pdyafgyf76zizpi7hhzw1rr9zkxhff2", - "depends": [], - "broken": true - }, "rtsVis": { "name": "rtsVis", "version": "0.0.3", @@ -144317,6 +145757,13 @@ "depends": ["assertthat", "dplyr", "forcats", "ggplot2", "magrittr", "moveVis", "pbapply", "raster", "RStoolbox", "sf", "sp", "tidyr"], "broken": true }, + "rusquant": { + "name": "rusquant", + "version": "1.1.1", + "sha256": "02saxymlmjmbzczhn2ihyn09106005wi39f2q9dyasrzi7n6v6pk", + "depends": ["base64enc", "data_table", "httr", "jose", "jsonlite", "quantmod", "rvest", "stringr", "XML", "xts"], + "broken": true + }, "ruta": { "name": "ruta", "version": "1.2.0", @@ -144562,13 +146009,6 @@ "depends": ["behavr", "curl", "data_table", "memoise", "readr", "RSQLite", "stringr"], "broken": true }, - "scorematchingad": { - "name": "scorematchingad", - "version": "0.0.60", - "sha256": "1jaqhqahg2pszmw9d9pgywpdlzdnwridj54y3mc3kkxwv7npd59r", - "depends": ["ellipsis", "FixedPoint", "MCMCpack", "optimx", "R6", "Rcpp", "RcppEigen", "Rdpack", "rlang"], - "broken": true - }, "scoringTools": { "name": "scoringTools", "version": "0.1.3", @@ -144758,6 +146198,13 @@ "depends": [], "broken": true }, + "seqest": { + "name": "seqest", + "version": "1.0.1", + "sha256": "06zk87n26305m0hy6lg7v3bpxmsqvinwkvw3dvmzkqp5jdkhwikb", + "depends": ["foreach", "geepack", "MASS", "mvtnorm", "nnet", "Rcpp", "RcppArmadillo", "VGAM"], + "broken": true + }, "sequence": { "name": "sequence", "version": "2.0", @@ -144989,6 +146436,13 @@ "depends": ["httr", "raster", "s2", "sf", "xml2"], "broken": true }, + "slopeOP": { + "name": "slopeOP", + "version": "1.0.1", + "sha256": "0rcxa2wdj57aj7n17sxv05dvwchhfsnhssmc372xjfgi72gdnv58", + "depends": ["Rcpp"], + "broken": true + }, "smapr": { "name": "smapr", "version": "0.2.1", @@ -145122,13 +146576,6 @@ "depends": ["assertthat", "cluster", "dplyr", "gplots", "gtools", "R6", "Rcpp", "reshape2", "SPIn", "tensorA"], "broken": true }, - "spNetwork": { - "name": "spNetwork", - "version": "0.4.4", - "sha256": "049fc00rnslairlryzlvgir05ha4pbsdbn0shrbvfh9yhwk2llpk", - "depends": ["abind", "BH", "cubature", "data_table", "dbscan", "future_apply", "ggplot2", "igraph", "progressr", "Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "sf", "sfheaders", "spdep"], - "broken": true - }, "space": { "name": "space", "version": "0.1-1.1", @@ -145521,13 +146968,6 @@ "depends": ["dplyr", "lubridate", "purrr", "readr", "readxl", "rlang", "rvest", "sf", "stringr", "tibble", "xml2"], "broken": true }, - "stminsights": { - "name": "stminsights", - "version": "0.4.2", - "sha256": "1a0wglrsl5sr7fc6vhiwva0lmr0ac3ns4rfis2y8ib2vxxwhwb8j", - "depends": ["dplyr", "ggplot2", "ggraph", "ggrepel", "huge", "igraph", "purrr", "readr", "scales", "shiny", "shinyBS", "shinydashboard", "shinyjs", "stm", "stringr", "tibble", "tidygraph"], - "broken": true - }, "stochprofML": { "name": "stochprofML", "version": "2.0.3", @@ -145542,6 +146982,13 @@ "depends": ["processx", "R6"], "broken": true }, + "streamConnect": { + "name": "streamConnect", + "version": "0.0-4", + "sha256": "0sg28i9p6frlccabq9cq2j4w47jgcknwpjhpwl32qrwll7q9k4r3", + "depends": ["callr", "httr", "jsonlite", "plumber", "readr", "stream", "stringr"], + "broken": true + }, "stringb": { "name": "stringb", "version": "0.1.17", @@ -145598,6 +147045,13 @@ "depends": [], "broken": true }, + "subselect": { + "name": "subselect", + "version": "0.15.5", + "sha256": "1xw8ya8kq1b7vn7rp976b3i4bsxvnw53xw34bhsq6xk2c9idk3pw", + "depends": ["corpcor", "ISwR", "MASS"], + "broken": true + }, "subtee": { "name": "subtee", "version": "1.0.1", @@ -145612,11 +147066,11 @@ "depends": ["penalized", "ROCR"], "broken": true }, - "sundialr": { - "name": "sundialr", - "version": "0.1.4.1", - "sha256": "1ln8zbihxfa7dnbhrm254l8qzdw16fhva58p5bd0p8j43grq6qrv", - "depends": ["Rcpp", "RcppArmadillo"], + "supc": { + "name": "supc", + "version": "0.2.6.2", + "sha256": "0gvrmhvjkfbgi0ivwa8ri69rxj4kqn3xqrc2d5rfrdfm9jmqb56h", + "depends": ["BH", "Rcpp"], "broken": true }, "supcluster": { @@ -145878,6 +147332,20 @@ "depends": ["digest", "raster", "sp"], "broken": true }, + "taxonbridge": { + "name": "taxonbridge", + "version": "1.2.2", + "sha256": "1ivks3bvwyn0ybvyz6dhsx7qxnlskf4icjkgsichdv4p24w5iwb9", + "depends": ["dplyr", "ggplot2", "purrr", "rje", "stringr", "vroom", "withr"], + "broken": true + }, + "taxotools": { + "name": "taxotools", + "version": "0.0.139", + "sha256": "1nx79a0jfy0xrd83zk3zwk65mdk35lgz564b3fmhdv9rqpmg9q7n", + "depends": ["plyr", "rmarkdown", "sqldf", "stringdist", "stringi", "stringr", "taxize", "wikitaxa"], + "broken": true + }, "tbart": { "name": "tbart", "version": "1.0", @@ -146025,13 +147493,6 @@ "depends": ["ade4", "broom", "car", "cowplot", "dplyr", "Evomorph", "factoextra", "ggplot2", "ggrepel", "gridExtra", "latex2exp", "lme4", "lsr", "magrittr", "MASS", "Matrix", "plotly", "plyr", "png", "purrr", "rlang", "scales", "scatterplot3d", "shapes", "stringr", "ThreeWay", "tibble", "tidyr", "tidyverse", "vegan", "VGAM"], "broken": true }, - "tidygate": { - "name": "tidygate", - "version": "0.4.9", - "sha256": "0zs2z4xf76d9hw7zwwpd3bisjvq672smbmxl0qgjb7xdzh66cqsf", - "depends": ["dplyr", "lifecycle", "magrittr", "purrr", "RColorBrewer", "rlang", "scales", "stringr", "tibble", "tidyr", "viridis"], - "broken": true - }, "tidylab": { "name": "tidylab", "version": "4.1.1", @@ -146620,6 +148081,13 @@ "depends": ["bio3d", "cowplot", "fastcluster", "ggplot2", "openxlsx", "reshape2", "scales"], "broken": true }, + "varsExplore": { + "name": "varsExplore", + "version": "0.3.0", + "sha256": "0d18wqq7fbs5ljdphsdgqmv8ab0wrzzykjhf4lqksi7n78s1fa2r", + "depends": ["dplyr", "DT", "glue", "magrittr", "purrr", "rio", "rstudioapi", "stringr", "tidyr"], + "broken": true + }, "vbdm": { "name": "vbdm", "version": "0.0.4", @@ -146683,6 +148151,20 @@ "depends": ["dials", "dplyr", "hardhat", "parsnip", "recipes", "rsample", "stacks", "tidyselect", "tune", "workflows", "workflowsets", "yardstick"], "broken": true }, + "visR": { + "name": "visR", + "version": "0.4.1", + "sha256": "1ra2fky23fv3rc9gj4zg64s2c2xcc52whf24wp2nfmg1f0nr278g", + "depends": ["broom", "cowplot", "dplyr", "DT", "forcats", "ggplot2", "gridExtra", "gt", "gtable", "kableExtra", "knitr", "lifecycle", "rlang", "survival", "tibble", "tidycmprsk", "tidyr"], + "broken": true + }, + "visualpred": { + "name": "visualpred", + "version": "0.1.0", + "sha256": "19jq9h9kiv4vbzqz8zrv5gqb1bprq5jy7mcxvdwpfnna2rja6q4z", + "depends": ["data_table", "dplyr", "e1071", "FactoMineR", "gbm", "ggplot2", "ggrepel", "magrittr", "MASS", "MBA", "mltools", "nnet", "pROC", "randomForest"], + "broken": true + }, "vlad": { "name": "vlad", "version": "0.2.2", @@ -146767,13 +148249,6 @@ "depends": ["MASS", "quadprog"], "broken": true }, - "wTO": { - "name": "wTO", - "version": "2.0.2", - "sha256": "0c5cr48h2zvp629iyg1n05fgh1v2wvc5bmzc75c1flrj2rrfs83v", - "depends": ["data_table", "HiClimR", "igraph", "magrittr", "plyr", "reshape2", "Rfast", "som", "visNetwork"], - "broken": true - }, "waccR": { "name": "waccR", "version": "0.1.0", @@ -146788,6 +148263,13 @@ "depends": [], "broken": true }, + "warbleR": { + "name": "warbleR", + "version": "1.1.30", + "sha256": "1fdlivdqawk4g9xb1zc4hdbdd0v44kpdzfb8z75i09zg2nqhgpw1", + "depends": ["bioacoustics", "cli", "dtw", "fftw", "knitr", "monitoR", "NatureSounds", "pbapply", "Rcpp", "RCurl", "rjson", "seewave", "testthat", "tuneR"], + "broken": true + }, "water": { "name": "water", "version": "0.8", @@ -146886,6 +148368,13 @@ "depends": ["ggplot2", "glue", "hellno", "httr", "pageviews", "rvest", "stringr", "xml2"], "broken": true }, + "wikiprofiler": { + "name": "wikiprofiler", + "version": "0.1.3", + "sha256": "1az2phwgy8aqbl9sxvsq1madrdlrw7zshq9fhw5q580xx0lfhkmk", + "depends": ["ggplot2", "ggplotify", "gson", "rsvg", "yulab_utils"], + "broken": true + }, "wildrwolf": { "name": "wildrwolf", "version": "0.6.1", @@ -147124,6 +148613,13 @@ "depends": ["circular", "cowplot", "data_table", "ggplot2", "ggrepel", "nloptr", "plyr", "Rcpp", "RcppEigen", "reshape2", "splusTimeSeries", "tictoc", "TMB", "viridis", "zoo"], "broken": true }, + "yarr": { + "name": "yarr", + "version": "0.1.2", + "sha256": "16q109jrydckz7s1rkmr2sh8q92cgr1c534fvpbh3h0bc3fvvf8g", + "depends": [], + "broken": true + }, "ycinterextra": { "name": "ycinterextra", "version": "0.1", diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index d22504e71a479..3ac1f52f2e76e 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -318,6 +318,7 @@ let svaNUMT = [ jbedo ]; svaRetro = [ jbedo ]; StructuralVariantAnnotation = [ jbedo ]; + RQuantLib = [ kupac ]; }; packagesWithRDepends = { @@ -338,7 +339,7 @@ let adimpro = [ pkgs.imagemagick ]; animation = [ pkgs.which ]; Apollonius = with pkgs; [ pkg-config gmp.dev mpfr.dev ]; - arrow = with pkgs; [ pkg-config cmake ] ++ lib.optionals stdenv.isDarwin [ intltool ]; + arrow = with pkgs; [ pkg-config cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ intltool ]; audio = [ pkgs.portaudio ]; BayesSAE = [ pkgs.gsl ]; BayesVarSel = [ pkgs.gsl ]; @@ -362,7 +363,7 @@ let clarabel = [ pkgs.cargo ]; curl = [ pkgs.curl.dev ]; CytoML = [ pkgs.libxml2.dev ]; - data_table = with pkgs; [ pkg-config zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; + data_table = with pkgs; [ pkg-config zlib.dev ] ++ lib.optional stdenv.hostPlatform.isDarwin pkgs.llvmPackages.openmp; devEMF = with pkgs; [ xorg.libXft.dev ]; diversitree = with pkgs; [ gsl fftw ]; exactextractr = [ pkgs.geos ]; @@ -422,7 +423,7 @@ let rvg = [ pkgs.libpng.dev ]; MAGEE = [ pkgs.zlib.dev pkgs.bzip2.dev ]; magick = [ pkgs.imagemagick.dev ]; - ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; + ModelMetrics = lib.optional stdenv.hostPlatform.isDarwin pkgs.llvmPackages.openmp; mvabund = [ pkgs.gsl ]; mwaved = [ pkgs.fftw.dev ]; mzR = with pkgs; [ zlib netcdf ]; @@ -437,7 +438,7 @@ let pander = with pkgs; [ pandoc which ]; pbdMPI = [ pkgs.mpi ]; pbdPROF = [ pkgs.mpi ]; - pbdZMQ = [ pkgs.pkg-config ] ++ lib.optionals stdenv.isDarwin [ pkgs.which ]; + pbdZMQ = [ pkgs.pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.which ]; pcaL1 = [ pkgs.pkg-config pkgs.clp ]; pdftools = [ pkgs.poppler.dev ]; PEPBVS = [ pkgs.gsl ]; @@ -475,6 +476,7 @@ let RODBC = [ pkgs.libiodbc ]; rpanel = [ pkgs.bwidget ]; Rpoppler = [ pkgs.poppler ]; + RPostgres = with pkgs; [ postgresql ]; RPostgreSQL = with pkgs; [ postgresql postgresql ]; RProtoBuf = [ pkgs.protobuf ]; RSclient = [ pkgs.openssl.dev ]; @@ -531,7 +533,7 @@ let V8 = [ pkgs.nodejs.libv8 ]; XBRL = with pkgs; [ zlib libxml2.dev ]; XLConnect = [ pkgs.jdk ]; - xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; + xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.perl ]; XML = with pkgs; [ libtool libxml2.dev xmlsec libxslt ]; affyPLM = [ pkgs.zlib.dev ]; BitSeq = [ pkgs.zlib.dev ]; @@ -605,8 +607,8 @@ let unrtf = with pkgs; [ xz.dev bzip2.dev zlib.dev icu.dev libdeflate ]; nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; - pbdZMQ = [ pkgs.zeromq ] ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; - bigmemory = lib.optionals stdenv.isLinux [ pkgs.libuuid.dev ]; + pbdZMQ = [ pkgs.zeromq ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.binutils ]; + bigmemory = lib.optionals stdenv.hostPlatform.isLinux [ pkgs.libuuid.dev ]; bayesWatch = [ pkgs.boost.dev ]; clustermq = [ pkgs.pkg-config ]; coga = [ pkgs.gsl.dev ]; @@ -767,6 +769,7 @@ let redux = [ pkgs.hiredis ]; RmecabKo = [ pkgs.mecab ]; markets = [ pkgs.gsl ]; + rlas = [ pkgs.boost ]; PoissonBinomial = [ pkgs.fftw.dev ]; poisbinom = [ pkgs.fftw.dev ]; PoissonMultinomial = [ pkgs.fftw.dev ]; @@ -789,7 +792,7 @@ let DropletUtils = [ pkgs.zlib.dev ]; RMariaDB = [ pkgs.libmysqlclient.dev ]; ijtiff = [ pkgs.libtiff ]; - ragg = with pkgs; [ freetype.dev libpng.dev libtiff.dev zlib.dev libjpeg.dev bzip2.dev ] ++ lib.optional stdenv.isDarwin lerc.dev; + ragg = with pkgs; [ freetype.dev libpng.dev libtiff.dev zlib.dev libjpeg.dev bzip2.dev ] ++ lib.optional stdenv.hostPlatform.isDarwin lerc.dev; qqconf = [ pkgs.fftw.dev ]; spFW = [ pkgs.fftw.dev ]; qspray = with pkgs; [ gmp.dev mpfr.dev ]; @@ -1217,7 +1220,7 @@ let ModelMetrics = old.ModelMetrics.overrideAttrs (attrs: { env = (attrs.env or { }) // { - NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + lib.optionalString stdenv.isDarwin " -fopenmp"; + NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + lib.optionalString stdenv.hostPlatform.isDarwin " -fopenmp"; }; }); @@ -1272,7 +1275,7 @@ let }); pbdZMQ = old.pbdZMQ.overrideAttrs (attrs: { - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' for file in R/*.{r,r.in}; do sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.cctools}/bin/\1"#g' $file done diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index ecbd78c4057d7..6e3f93f523213 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation ({ buildInputs = buildInputs ++ [R gettext] ++ lib.optionals requireX [util-linux xvfb-run] ++ - lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran libiconv]; + lib.optionals stdenv.hostPlatform.isDarwin [Cocoa Foundation gfortran libiconv]; env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; enableParallelBuilding = true; diff --git a/pkgs/development/rocm-modules/5/llvm/base.nix b/pkgs/development/rocm-modules/5/llvm/base.nix index 914b7d8275476..a8147d862e320 100644 --- a/pkgs/development/rocm-modules/5/llvm/base.nix +++ b/pkgs/development/rocm-modules/5/llvm/base.nix @@ -54,8 +54,8 @@ in let llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; inferNativeTarget = t: if t == "NATIVE" then llvmNativeTarget else t; llvmTargetsToBuild' = [ "AMDGPU" ] ++ builtins.map inferNativeTarget llvmTargetsToBuild; diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix index f601e96f0a352..ad4981aa435be 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix @@ -6,5 +6,5 @@ callPackage ../base.nix { inherit stdenv rocmUpdateScript; requiredSystemFeatures = [ "big-parallel" ]; - isBroken = stdenv.isAarch64; # https://github.com/ROCm/ROCm/issues/1831#issuecomment-1278205344 + isBroken = stdenv.hostPlatform.isAarch64; # https://github.com/ROCm/ROCm/issues/1831#issuecomment-1278205344 } diff --git a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix index 1ef226b338c42..ab43edf8a4b99 100644 --- a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix @@ -10,8 +10,8 @@ let llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; diff --git a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix index 28af3e9602664..3e769421548b7 100644 --- a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix @@ -9,8 +9,8 @@ let llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; diff --git a/pkgs/development/rocm-modules/5/rocminfo/default.nix b/pkgs/development/rocm-modules/5/rocminfo/default.nix index addbad038b94e..fbeb2f7d7f2cb 100644 --- a/pkgs/development/rocm-modules/5/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/5/rocminfo/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = stdenv.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; + broken = stdenv.hostPlatform.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocmlir/default.nix b/pkgs/development/rocm-modules/5/rocmlir/default.nix index 73dbbf8f95f85..33d0ddb55604d 100644 --- a/pkgs/development/rocm-modules/5/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/5/rocmlir/default.nix @@ -27,8 +27,8 @@ let else ""; llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir${suffix}"; diff --git a/pkgs/development/rocm-modules/6/llvm/base.nix b/pkgs/development/rocm-modules/6/llvm/base.nix index 1bbf164475496..b7a919c792ba0 100644 --- a/pkgs/development/rocm-modules/6/llvm/base.nix +++ b/pkgs/development/rocm-modules/6/llvm/base.nix @@ -54,8 +54,8 @@ in let llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; inferNativeTarget = t: if t == "NATIVE" then llvmNativeTarget else t; llvmTargetsToBuild' = [ "AMDGPU" ] ++ builtins.map inferNativeTarget llvmTargetsToBuild; diff --git a/pkgs/development/rocm-modules/6/llvm/stage-1/llvm.nix b/pkgs/development/rocm-modules/6/llvm/stage-1/llvm.nix index f601e96f0a352..ad4981aa435be 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-1/llvm.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-1/llvm.nix @@ -6,5 +6,5 @@ callPackage ../base.nix { inherit stdenv rocmUpdateScript; requiredSystemFeatures = [ "big-parallel" ]; - isBroken = stdenv.isAarch64; # https://github.com/ROCm/ROCm/issues/1831#issuecomment-1278205344 + isBroken = stdenv.hostPlatform.isAarch64; # https://github.com/ROCm/ROCm/issues/1831#issuecomment-1278205344 } diff --git a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix b/pkgs/development/rocm-modules/6/rocm-comgr/default.nix index c610b63abf682..033de08af11b8 100644 --- a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-comgr/default.nix @@ -10,8 +10,8 @@ let llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; diff --git a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix index defcf2e60ecb1..c55ba960fc618 100644 --- a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix @@ -9,8 +9,8 @@ let llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; diff --git a/pkgs/development/rocm-modules/6/rocminfo/default.nix b/pkgs/development/rocm-modules/6/rocminfo/default.nix index cb1df3f1fd43f..f53dcf19b96be 100644 --- a/pkgs/development/rocm-modules/6/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/6/rocminfo/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = stdenv.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = stdenv.hostPlatform.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocmlir/default.nix b/pkgs/development/rocm-modules/6/rocmlir/default.nix index d8747009a10e8..efc33fd8468ad 100644 --- a/pkgs/development/rocm-modules/6/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/6/rocmlir/default.nix @@ -28,8 +28,8 @@ let else ""; llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir${suffix}"; diff --git a/pkgs/development/ruby-modules/bundler-update-script/default.nix b/pkgs/development/ruby-modules/bundler-update-script/default.nix index 5d5ebfabce0e3..d0da591b4f516 100644 --- a/pkgs/development/ruby-modules/bundler-update-script/default.nix +++ b/pkgs/development/ruby-modules/bundler-update-script/default.nix @@ -18,6 +18,8 @@ let cd "$gemdir" + rm -f gemset.nix Gemfile.lock + export BUNDLE_FORCE_RUBY_PLATFORM=1 bundler lock --update bundix ''; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a541a8ee34bde..6234fcbccdf10 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -49,7 +49,7 @@ in atk = attrs: { dependencies = attrs.dependencies ++ [ "gobject-introspection" ]; nativeBuildInputs = [ rake bundler pkg-config ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 atk ]; }; @@ -70,13 +70,13 @@ in cairo = attrs: { nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; buildInputs = [ gtk2 pcre2 xorg.libpthreadstubs xorg.libXdmcp]; }; cairo-gobject = attrs: { nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; buildInputs = [ cairo expat pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; }; @@ -238,13 +238,13 @@ in gdk_pixbuf2 = attrs: { nativeBuildInputs = [ pkg-config bundler rake ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 gdk-pixbuf ]; }; gdk3 = attrs: { nativeBuildInputs = [ pkg-config bundler rake ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 gdk-pixbuf cairo ]; }; @@ -256,8 +256,8 @@ in gio2 = attrs: { nativeBuildInputs = [ pkg-config gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre pcre2 ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; + buildInputs = [ gtk2 pcre pcre2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux libsepol ]; }; gitlab-markup = attrs: { meta.priority = 1; }; @@ -345,16 +345,16 @@ in glib2 = attrs: { nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; buildInputs = [ gtk2 pcre2 ]; }; gtk2 = attrs: { nativeBuildInputs = [ binutils pkg-config - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux libsepol - ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; propagatedBuildInputs = [ atk gdk-pixbuf @@ -368,18 +368,18 @@ in xorg.libpthreadstubs xorg.libXdmcp ]; - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; }; gtk3 = attrs: { nativeBuildInputs = [ binutils pkg-config - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux libsepol - ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; propagatedBuildInputs = [ atk gdk-pixbuf @@ -399,12 +399,12 @@ in libxkbcommon libepoxy ]; - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; }; gobject-introspection = attrs: { nativeBuildInputs = [ pkg-config pcre2 ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 glib ]; }; @@ -425,8 +425,8 @@ in grpc = attrs: { nativeBuildInputs = [ pkg-config ] - ++ lib.optional stdenv.isDarwin cctools - ++ lib.optional (lib.versionAtLeast attrs.version "1.53.0" && stdenv.isDarwin && stdenv.isAarch64) autoSignDarwinBinariesHook; + ++ lib.optional stdenv.hostPlatform.isDarwin cctools + ++ lib.optional (lib.versionAtLeast attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) autoSignDarwinBinariesHook; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; env.NIX_CFLAGS_COMPILE = toString [ @@ -443,7 +443,7 @@ in postPatch = '' substituteInPlace Makefile \ --replace '-Wno-invalid-source-encoding' "" - '' + lib.optionalString (lib.versionOlder attrs.version "1.53.0" && stdenv.isDarwin) '' + '' + lib.optionalString (lib.versionOlder attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin) '' # For < v1.48.0 substituteInPlace src/ruby/ext/grpc/extconf.rb \ --replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" "" @@ -454,7 +454,7 @@ in }; hitimes = attrs: { - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; }; hpricot = attrs: { @@ -467,7 +467,7 @@ in iconv = attrs: { dontBuild = false; - buildFlags = lib.optionals stdenv.isDarwin [ + buildFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--with-iconv-dir=${lib.getLib libiconv}" "--with-iconv-include=${lib.getDev libiconv}/include" ]; @@ -524,7 +524,7 @@ in buildFlags = [ "--with-xml2-lib=${libxml2.out}/lib" "--with-xml2-include=${libxml2.dev}/include/libxml2" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-iconv-dir=${lib.getLib libiconv}" "--with-opt-include=${lib.getDev libiconv}/include" ]; @@ -565,7 +565,7 @@ in # For some reason 'mathematical.so' is missing cairo, glib, and # lasem in its RPATH, add them explicitly here - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' soPath="$out/${ruby.gemPath}/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so" rpath="$(patchelf --print-rpath "$soPath")" patchelf --set-rpath "${lib.makeLibraryPath [ lasem glib cairo ]}:$rpath" "$soPath" @@ -618,11 +618,11 @@ in "--with-xslt-include=${libxslt.dev}/include" "--with-exslt-lib=${libxslt.out}/lib" "--with-exslt-include=${libxslt.dev}/include" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-iconv-dir=${libiconv}" "--with-opt-include=${libiconv}/include" ]; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { buildInputs = [ libxml2 ]; }); @@ -653,9 +653,9 @@ in pcre pcre2 xorg.libpthreadstubs xorg.libXdmcp - ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; buildInputs = [ libdatrie libthai ] - ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux libsepol util-linux ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 gtk2 ]; }; @@ -671,7 +671,7 @@ in # Force pkg-config lookup for libpq. # See https://github.com/ged/ruby-pg/blob/6629dec6656f7ca27619e4675b45225d9e422112/ext/extconf.rb#L34-L55 # - # Note that setting --with-pg-config=${postgresql}/bin/pg_config would add + # Note that setting --with-pg-config=${lib.getDev postgresql}/bin/pg_config would add # an unnecessary reference to the entire postgresql package. buildFlags = [ "--with-pg-config=ignore" ]; nativeBuildInputs = [ pkg-config ]; @@ -791,7 +791,7 @@ in }; rugged = attrs: { - nativeBuildInputs = [ cmake pkg-config which ] ++ lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ cmake pkg-config which ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; buildInputs = [ openssl libssh2 zlib ]; dontUseCmakeConfigure = true; }; @@ -816,7 +816,7 @@ in ''; }; - scrypt = attrs: lib.optionalAttrs stdenv.isDarwin { + scrypt = attrs: lib.optionalAttrs stdenv.hostPlatform.isDarwin { dontBuild = false; postPatch = '' sed -i -e "s/-arch i386//" Rakefile ext/scrypt/Rakefile @@ -919,6 +919,6 @@ in }; zookeeper = attrs: { - buildInputs = lib.optionals stdenv.isDarwin [ cctools ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; }; } diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index b2bb437366571..5ed890f8ec489 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { buildInputs = [ ruby - ] ++ lib.optionals stdenv.isDarwin [ libobjc ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc ] ++ buildInputs; #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}"; diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index b0ad8d4ec1b0a..9ff23f2327eb8 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; # In procedure bytevector-u8-ref: Argument 2 out of range - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Structured access to bytevector contents"; diff --git a/pkgs/development/skaware-packages/build-skaware-package.nix b/pkgs/development/skaware-packages/build-skaware-package.nix index 4e912e3af2e8d..abad544145667 100644 --- a/pkgs/development/skaware-packages/build-skaware-package.nix +++ b/pkgs/development/skaware-packages/build-skaware-package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { # We assume every nix-based cross target has urandom. # This might not hold for e.g. BSD. "--with-sysdep-devurandom=yes" - (if stdenv.isDarwin + (if stdenv.hostPlatform.isDarwin then "--disable-shared" else "--enable-shared") ] @@ -93,7 +93,7 @@ stdenv.mkDerivation { # Explicitly setting target ensures code can be compiled against a skalibs # binary built on a different version of darwin. # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph - ++ (lib.optional stdenv.isDarwin + ++ (lib.optional stdenv.hostPlatform.isDarwin "--build=${stdenv.hostPlatform.system}"); inherit postConfigure; diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix index 4df0a2e2a3bb3..de3557d58f765 100644 --- a/pkgs/development/skaware-packages/tipidee/default.nix +++ b/pkgs/development/skaware-packages/tipidee/default.nix @@ -35,5 +35,5 @@ skawarePackages.buildPackage { mv examples $doc/share/doc/tipidee/examples ''; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; } diff --git a/pkgs/development/tools/aapt/default.nix b/pkgs/development/tools/aapt/default.nix index 4af284948f0b8..3bdb1e2f96eb7 100644 --- a/pkgs/development/tools/aapt/default.nix +++ b/pkgs/development/tools/aapt/default.nix @@ -12,10 +12,10 @@ stdenvNoCC.mkDerivation rec { src = let urlAndHash = - if stdenvNoCC.isLinux then { + if stdenvNoCC.hostPlatform.isLinux then { url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-linux.jar"; hash = "sha256-eSQaZrRtb5aCG320hrXAL256fxa/oMhBC4hcTA1KRxs="; - } else if stdenvNoCC.isDarwin then { + } else if stdenvNoCC.hostPlatform.isDarwin then { url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-osx.jar"; hash = "sha256-LUihNjase79JbUkHDb10A5d6pJ+VXDVfv7m09hkL8kY="; } else throw "Unsupport platform: ${stdenvNoCC.system}"; @@ -25,8 +25,8 @@ stdenvNoCC.mkDerivation rec { stripRoot = false; }); - nativeBuildInputs = lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenvNoCC.isLinux [ libcxx ]; + nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ libcxx ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix deleted file mode 100644 index f8572eeb19412..0000000000000 --- a/pkgs/development/tools/algolia-cli/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "algolia-cli"; - version = "1.6.11"; - - src = fetchFromGitHub { - owner = "algolia"; - repo = "cli"; - rev = "v${version}"; - hash = "sha256-VqY0h0Z3ocmgw0uFI4f6B5C/bTt3zoUXBlYPgOPxBo0="; - }; - - vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; - - nativeBuildInputs = [ installShellFiles ]; - - subPackages = [ "cmd/algolia" ]; - - ldflags = [ "-s" "-w" "-X github.com/algolia/cli/pkg/version.Version=${version}" ]; - - postInstall = '' - installShellCompletion --cmd algolia \ - --bash <($out/bin/algolia completion bash) \ - --fish <($out/bin/algolia completion fish) \ - --zsh <($out/bin/algolia completion zsh) - ''; - - meta = with lib; { - description = "Algolia’s official CLI devtool"; - mainProgram = "algolia"; - homepage = "https://algolia.com/doc/tools/cli/"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 53376e43943e8..c6f5739a35ab0 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "7.3.4"; + version = "7.3.6"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-wl5qlUhnwqqYM830m6KWNQBY2jVMh715HahLngyiL+I="; + sha256 = "sha256-jXFEpcmv8bkm7Yyo2GUwoakMlAwArCoZ1jIDeyF87Ms="; }; appimageContents = appimageTools.extract { inherit pname version src; }; @@ -14,8 +14,9 @@ in appimageTools.wrapType2 { inherit src pname version; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/development/tools/amazon-qldb-shell/default.nix b/pkgs/development/tools/amazon-qldb-shell/default.nix index 2aa7ba99479db..308552b99e2bf 100644 --- a/pkgs/development/tools/amazon-qldb-shell/default.nix +++ b/pkgs/development/tools/amazon-qldb-shell/default.nix @@ -21,7 +21,7 @@ let }; nativeBuildInputs = [ cmake rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix deleted file mode 100644 index 417a28cd1599a..0000000000000 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, makeWrapper -, python3Packages -, ronn -, shellcheck -}: - -buildGoModule rec { - pname = "actionlint"; - version = "1.7.1"; - - subPackages = [ "cmd/actionlint" ]; - - src = fetchFromGitHub { - owner = "rhysd"; - repo = "actionlint"; - rev = "v${version}"; - hash = "sha256-nu3Bj85L68YFNE4loh548A8ik3NCj4V32FlDV8V6BEE="; - }; - - vendorHash = "sha256-ZREtrdHUD1B1Mogidp1y/kFTK+KR4qYJj1c/M+0utPM="; - - nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; - - postInstall = '' - ronn --roff man/actionlint.1.ronn - installManPage man/actionlint.1 - wrapProgram "$out/bin/actionlint" \ - --prefix PATH : ${lib.makeBinPath [ python3Packages.pyflakes shellcheck ]} - ''; - - ldflags = [ "-s" "-w" "-X github.com/rhysd/actionlint.version=${version}" ]; - - meta = with lib; { - homepage = "https://rhysd.github.io/actionlint/"; - description = "Static checker for GitHub Actions workflow files"; - changelog = "https://github.com/rhysd/actionlint/raw/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "actionlint"; - }; -} diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 03f2e36eea9d9..f426f0f35dcd4 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ curl Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl Security ]; doCheck = false; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 05aa7f736bd3a..f8dfa00ab222f 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.239"; + version = "3.2.256"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-Y746ZwkLS6S682mnMSq30tQgFiZJduEkh3ZeOTf8V1E="; + hash = "sha256-y6BhNpbXwna8UVDBaAmxEyjIsCDslpi5sF/gAyX65Xg="; }; patches = [ ./flake8-compat-5.x.patch ]; @@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec { "bc-python-hcl2" "boto3" "botocore" + "cloudsplaining" "cyclonedx-python-lib" "dpath" "igraph" diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 24b8e1715fc45..482348b63c667 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.17.0"; + version = "10.18.1"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-UcNNc4UgwTidcZmKmrDm2r4NfPJiFJ8+AacpRJYGLkI="; + sha256 = "sha256-2nOh+jvi6CksU69cidNTVjOOIZTRQttpCOuf+KrILoM="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 47ca566551d59..fd56262a2e749 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.18.2"; + version = "2.19.0"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-WyfBiYvPi+iQkrsYMdTUFP5yStzyRQMqNbgD9IKFEMs="; + hash = "sha256-2t1X0SVkJBHcVqTCPdclDoZt8Z+ko9KE572cAQAcpxE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index f4dcd71f0b3c7..b32e1cf4e678d 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -1,26 +1,32 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, fetchpatch, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "cpplint"; - version = "1.6.1"; + version = "1.7.0"; pyproject = true; # Fetch from github instead of pypi, since the test cases are not in the pypi archive src = fetchFromGitHub { owner = "cpplint"; repo = "cpplint"; - rev = "refs/tags/${version}"; - hash = "sha256-N5YrlhEXQGYxhsJ4M5dGYZUzA81GKRSI83goaqbtCkI="; + # Commit where version was bumped to 1.7.0, no tag available + rev = "8f62396aff6dc850415cbe5ed7edf9dc95f4a731"; + hash = "sha256-EKD7vkxJjoKWfPrXEQRA0X3PyAoYXi9wGgUFT1zC4WM="; }; + patches = [ + # Whitespace fixes that make the tests pass + (fetchpatch { + url = "https://github.com/cpplint/cpplint/commit/fd257bd78db02888cf6b5985ab8f53d6b765704f.patch"; + hash = "sha256-BNyW8QEY9fUe2zMG4RZzBHASaIsu4d2FJt5rX3VgkrQ="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace-fail '"pytest-runner==5.2"' "" patchShebangs cpplint_unittest.py - - substituteInPlace cpplint_unittest.py \ - --replace-fail "assertEquals" "assertEqual" ''; build-system = with python3Packages; [ @@ -29,7 +35,6 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = with python3Packages; [ pytest - pytest-runner ]; checkPhase = '' diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index 603cc1d1ccbb7..c61f862f5178b 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix index 1b3cf09365022..192d85c5a2e99 100644 --- a/pkgs/development/tools/analysis/eresi/default.nix +++ b/pkgs/development/tools/analysis/eresi/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - (if stdenv.is64bit then "--enable-32-64" else "--enable-32") + (if stdenv.hostPlatform.is64bit then "--enable-32-64" else "--enable-32") "--enable-readline" ]; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { enableParallelInstalling = false; installTargets = lib.singleton "install" - ++ lib.optional stdenv.is64bit "install64"; + ++ lib.optional stdenv.hostPlatform.is64bit "install64"; meta = { description = "ERESI Reverse Engineering Software Interface"; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 956e460deca39..2bb80f22ecc4f 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = with ocamlPackages; [ ocaml dune_3 findlib ocamlbuild ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ] - ++ (with ocamlPackages; [ core_kernel dtoa fileutils lwt_log lwt_ppx ocaml_lwt ppx_deriving ppx_gen_rec ppx_let sedlex visitors wtf8 ] ++ lib.optionals stdenv.isLinux [ inotify ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ] + ++ (with ocamlPackages; [ core_kernel dtoa fileutils lwt_log lwt_ppx ocaml_lwt ppx_deriving ppx_gen_rec ppx_let sedlex visitors wtf8 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify ]); meta = with lib; { description = "Static type checker for JavaScript"; diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index 50f4f552e0ff9..f7fb222b4b842 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -1,45 +1,80 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, boost, tbb -, gmp, llvm, clang, sqlite, python3 -, ocamlPackages, mpfr, ppl, doxygen, graphviz +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + cmake, + boost, + tbb, + gmp, + llvm, + clang, + sqlite, + python3, + ocamlPackages, + mpfr, + ppl, + doxygen, + graphviz, }: -let - python = python3.withPackages (ps: with ps; [ - pygments - ]); -in - stdenv.mkDerivation rec { pname = "ikos"; - version = "3.1"; + version = "3.4"; src = fetchFromGitHub { owner = "NASA-SW-VnV"; repo = "ikos"; rev = "v${version}"; - hash = "sha256-scaFkUhCkIi41iR6CGPbEndzXkgqTKMb3PDNvhgVbCE="; + hash = "sha256-xJuSpQHShggDqLVQaj0a0fEPOWUFIrbGmxazu4FKISs="; }; - patches = [ (fetchpatch { - url = "https://github.com/NASA-SW-VnV/ikos/commit/2e647432427b3f0dbb639e0371d976ab6406f290.patch"; - hash = "sha256-ffzjlqEp4qp76Kwl5zpyQlg/xUMt8aLDSSP4XA4ndS8="; - }) - # Fix build with GCC 13 - # https://github.com/NASA-SW-VnV/ikos/pull/262 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/NASA-SW-VnV/ikos/commit/73c816641fb9780f0d3b5e448510363a3cf21ce2.patch"; - hash = "sha256-bkeSAtxrL+z+6QNiGOWSg7kN8XiZqMxlJiu5Dquhca0="; - }) + nativeBuildInputs = [ + cmake + python3.pkgs.setuptools + python3.pkgs.wheel + python3.pkgs.build + python3.pkgs.installer + python3.pkgs.wrapPython + ]; + + buildInputs = [ + boost + tbb + gmp + clang + llvm + sqlite + python3 + ocamlPackages.apron + mpfr + ppl + doxygen + graphviz + ]; + + propagatedBuildInputs = [ + python3.pkgs.pygments + ]; + + cmakeFlags = [ + "-DAPRON_ROOT=${ocamlPackages.apron}" + "-DINSTALL_PYTHON_VIRTUALENV=off" + "-DPYTHON_VENV_EXECUTABLE=${python3}/bin/python" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost tbb gmp clang llvm sqlite python - ocamlPackages.apron mpfr ppl doxygen graphviz ]; + postBuild = '' + make doc + ${python3}/bin/python -m build --no-isolation --outdir dist/ --wheel analyzer/python + ''; - cmakeFlags = [ "-DAPRON_ROOT=${ocamlPackages.apron}" ]; + postInstall = '' + ${python3}/bin/python -m installer --prefix "$out" dist/*.whl + ''; - postBuild = "make doc"; + postFixup = '' + wrapPythonPrograms + ''; meta = with lib; { homepage = "https://github.com/NASA-SW-VnV/ikos"; diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 0ed0ef816f092..fcdd944a1ad91 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -17,7 +17,7 @@ let perlPackages.GD perlPackages.JSONXS perlPackages.PathTools - ] ++ lib.optionals (!stdenv.isDarwin) [ perlPackages.MemoryProcess ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ perlPackages.MemoryProcess ]; in stdenv.mkDerivation rec { pname = "lcov"; diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 2d7e18d53e4cf..9c0be92e26189 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp -p converters/op2calltree $out/bin/op2calltree cp -p converters/pprof2calltree $out/bin/pprof2calltree chmod -R +x $out/bin/ - '' + (if stdenv.isDarwin then '' + '' + (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications cp cgview/cgview.app/Contents/MacOS/cgview $out/bin cp -a qcachegrind/qcachegrind.app $out/Applications @@ -35,7 +35,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Qt GUI to visualize profiling data"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 8d75f994aee61..95bcbf055b9af 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { popd ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath $out/lib $out/lib/libr_io.${finalAttrs.version}.dylib ''; diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index 44954c62a3c2c..123b58e8a21d8 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -52,7 +52,7 @@ let cutter = stdenv.mkDerivation rec { qttools qtwebengine rizin - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index f83c3dcdcfac9..6336d603a61b0 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -83,7 +83,7 @@ let rizin = stdenv.mkDerivation rec { fi done export LIBRARY_PATH - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace binrz/rizin/macos_sign.sh \ --replace 'codesign' '# codesign' ''; diff --git a/pkgs/development/tools/analysis/rizin/rz-ghidra.nix b/pkgs/development/tools/analysis/rizin/rz-ghidra.nix index fcc014f9944dc..d9ef68b8620e2 100644 --- a/pkgs/development/tools/analysis/rizin/rz-ghidra.nix +++ b/pkgs/development/tools/analysis/rizin/rz-ghidra.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { # errors out with undefined symbols from Cutter - broken = enableCutterPlugin && stdenv.isDarwin; + broken = enableCutterPlugin && stdenv.hostPlatform.isDarwin; description = "Deep ghidra decompiler and sleigh disassembler integration for rizin"; homepage = finalAttrs.src.meta.homepage; changelog = "${finalAttrs.src.meta.homepage}/releases/tag/${finalAttrs.src.rev}"; diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix deleted file mode 100644 index b55e8c5bcfa41..0000000000000 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, sqlite -, openssl -, buildllvmsparse ? false -, buildc2xml ? false -, libllvm -, libxml2 -}: - -stdenv.mkDerivation rec { - pname = "smatch"; - version = "1.73"; - - src = fetchFromGitHub { - owner = "error27"; - repo = "smatch"; - rev = version; - sha256 = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ sqlite openssl ] - ++ lib.optionals buildllvmsparse [ libllvm ] - ++ lib.optionals buildc2xml [ libxml2.dev ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" "CXX=${stdenv.cc.targetPrefix}c++" ]; - - meta = with lib; { - description = "Semantic analysis tool for C"; - homepage = "https://sparse.docs.kernel.org/"; - maintainers = [ ]; - license = licenses.gpl2Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix deleted file mode 100644 index 1bbdcb9e73cf9..0000000000000 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, stdenv -, testers -, snyk -}: - -buildNpmPackage rec { - pname = "snyk"; - version = "1.1292.2"; - - src = fetchFromGitHub { - owner = "snyk"; - repo = "cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-r7yQNxmvQ2RUUTX3zxEqnf7fgYJI/0kFqoPg60jI4ns="; - }; - - npmDepsHash = "sha256-hS1TYrqyYiixKtZoxWU10hj1ZC2RqrZ7gndU5B195/M="; - - postPatch = '' - substituteInPlace package.json \ - --replace-fail '"version": "1.0.0-monorepo"' '"version": "${version}"' - ''; - - env.NIX_CFLAGS_COMPILE = - # Fix error: no member named 'aligned_alloc' in the global namespace - lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; - - npmBuildScript = "build:prod"; - - passthru.tests.version = testers.testVersion { - package = snyk; - }; - - meta = with lib; { - description = "Scans and monitors projects for security vulnerabilities"; - homepage = "https://snyk.io"; - changelog = "https://github.com/snyk/cli/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ ]; - mainProgram = "snyk"; - }; -} diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix index e22a8b380926b..7bff76d87dbd8 100644 --- a/pkgs/development/tools/analysis/splint/default.nix +++ b/pkgs/development/tools/analysis/splint/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02pv8kscsrkrzip9r08pfs9xs98q74c52mlxzbii6cv6vx1vd3f7"; }; - patches = [ ./tmpdir.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ ./tmpdir.patch ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; buildInputs = [ flex ]; diff --git a/pkgs/development/tools/analysis/stylelint/default.nix b/pkgs/development/tools/analysis/stylelint/default.nix deleted file mode 100644 index 23cb2bfc5173f..0000000000000 --- a/pkgs/development/tools/analysis/stylelint/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildNpmPackage, fetchFromGitHub, lib }: - -buildNpmPackage rec { - pname = "stylelint"; - version = "16.8.1"; - - src = fetchFromGitHub { - owner = "stylelint"; - repo = "stylelint"; - rev = version; - hash = "sha256-LhLA1JxaTtdoXfylaDLiyW2gi0xy2l5Rm3B67+z1Wdc="; - }; - - npmDepsHash = "sha256-xi6we8XOGaLqwTLrF0Enpx7jQgbHOSItuqzlvvNNBWQ="; - - dontNpmBuild = true; - - meta = with lib; { - description = "Mighty CSS linter that helps you avoid errors and enforce conventions"; - mainProgram = "stylelint"; - homepage = "https://stylelint.io"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 0865a3b7ae79d..85679357520ba 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.28.10"; + version = "1.28.11"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "tfsec"; rev = "refs/tags/v${version}"; - hash = "sha256-Dulbo5ZTw4+1XxjpnZ1aIsVPLVEqwQKdNMv+L9/j1wc="; + hash = "sha256-7e75VdqwjzP+GyTtXqOf1pN+5wEbxNYoUcpsTjwB+0Y="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorHash = "sha256-Hu530cBJWGtvMmQ6gbROXf5JBfkOfc4nwznsKBTegUk="; + vendorHash = "sha256-Zr6Z9Px1nxkr6fKWINMbp6cESZeZkxnuDPwbV+WX2Oo="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index c54fb7bfeeabf..fe44e8b1922fd 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -49,18 +49,18 @@ stdenv.mkDerivation rec { # GDB is needed to provide a sane default for `--db-command'. # Perl is needed for `callgrind_{annotate,control}'. - buildInputs = [ gdb perl ] ++ lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ]; + buildInputs = [ gdb perl ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ bootstrap_cmds xnu ]; # Perl is also a native build input. nativeBuildInputs = [ autoreconfHook perl ]; enableParallelBuilding = true; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; - preConfigure = lib.optionalString stdenv.isFreeBSD '' + preConfigure = lib.optionalString stdenv.hostPlatform.isFreeBSD '' substituteInPlace configure --replace '`uname -r`' \ ${toString stdenv.hostPlatform.parsed.kernel.version}.0- - '' + lib.optionalString stdenv.isDarwin ( + '' + lib.optionalString stdenv.hostPlatform.isDarwin ( let OSRELEASE = '' $(awk -F '"' '/#define OSRELEASE/{ print $2 }' \ <${xnu}/Library/Frameworks/Kernel.framework/Headers/libkern/version.h)''; @@ -133,6 +133,6 @@ stdenv.mkDerivation rec { (x86 ++ power ++ s390x ++ armv7 ++ aarch64 ++ mips) (darwin ++ freebsd ++ illumos ++ linux); badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; - broken = stdenv.isDarwin; # https://hydra.nixos.org/build/128521440/nixlog/2 + broken = stdenv.hostPlatform.isDarwin; # https://hydra.nixos.org/build/128521440/nixlog/2 }; } diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 460d0686ff60e..5b2585f6bce71 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "apktool"; - version = "2.9.3"; + version = "2.10.0"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - hash = "sha256-eVbrBBlDAM4NCoStGHce68lLifuNHdzOjqTAVoGGRvQ="; + hash = "sha256-wDUKu6tTFCSN/i7gyQfe9O3RT2+u8fXTctPUq9KPBDE="; }; dontUnpack = true; diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix deleted file mode 100644 index 9615d4574cdb2..0000000000000 --- a/pkgs/development/tools/avro-tools/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, lib }: - -stdenv.mkDerivation rec { - pname = "avro-tools"; - version = "1.11.3"; - - src = fetchurl { - url = - "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "sha256-dPaV1rZxxE+G/gB7hEDyiMI7ZbzkTpNEtexp/Y6hrPI="; - }; - - dontUnpack = true; - - buildInputs = [ jre ]; - nativeBuildInputs = [ makeWrapper ]; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/libexec/avro-tools - cp $src $out/libexec/avro-tools/${pname}.jar - - makeWrapper ${jre}/bin/java $out/bin/avro-tools \ - --add-flags "-jar $out/libexec/avro-tools/${pname}.jar" - ''; - - meta = with lib; { - homepage = "https://avro.apache.org/"; - description = "Avro command-line tools and utilities"; - mainProgram = "avro-tools"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 2c667b8b5d6d8..bc28ff15db2e7 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -1,11 +1,12 @@ -{ lib -, python3 -, fetchFromGitHub -, git -, testers -, aws-sam-cli -, nix-update-script -, enableTelemetry ? false +{ + lib, + python3, + fetchFromGitHub, + git, + testers, + aws-sam-cli, + nix-update-script, + enableTelemetry ? false, }: python3.pkgs.buildPythonApplication rec { @@ -13,8 +14,6 @@ python3.pkgs.buildPythonApplication rec { version = "1.120.0"; pyproject = true; - disabled = python3.pythonOlder "3.8"; - src = fetchFromGitHub { owner = "aws"; repo = "aws-sam-cli"; @@ -22,9 +21,7 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-XFVh7e9ooIBhWRkVovPdrSuyosBMQ84PDRjV2o0x9ns="; }; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; pythonRelaxDeps = [ "aws-lambda-builders" @@ -43,44 +40,47 @@ python3.pkgs.buildPythonApplication rec { "watchdog" ]; - dependencies = with python3.pkgs; [ - aws-lambda-builders - aws-sam-translator - boto3 - boto3-stubs - cfn-lint - chevron - click - cookiecutter - dateparser - docker - flask - jsonschema - pyopenssl - pyyaml - requests - rich - ruamel-yaml - tomlkit - typing-extensions - tzlocal - watchdog - ] ++ (with python3.pkgs.boto3-stubs.optional-dependencies; [ - apigateway - cloudformation - ecr - iam - kinesis - lambda - s3 - schemas - secretsmanager - signer - sqs - stepfunctions - sts - xray - ]); + dependencies = + with python3.pkgs; + [ + aws-lambda-builders + aws-sam-translator + boto3 + boto3-stubs + cfn-lint + chevron + click + cookiecutter + dateparser + docker + flask + jsonschema + pyopenssl + pyyaml + requests + rich + ruamel-yaml + tomlkit + typing-extensions + tzlocal + watchdog + ] + ++ (with python3.pkgs.boto3-stubs.optional-dependencies; [ + apigateway + cloudformation + ecr + iam + kinesis + lambda + s3 + schemas + secretsmanager + signer + sqs + stepfunctions + sts + xray + ]); postFixup = '' # Disable telemetry: https://github.com/aws/aws-sam-cli/issues/1272 @@ -92,6 +92,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ filelock flaky + jaraco-text parameterized psutil pytest-timeout @@ -130,11 +131,10 @@ python3.pkgs.buildPythonApplication rec { "test_update_stage" "test_delete_deployment" "test_request_with_no_data" + "test_import_should_succeed_for_a_defined_hidden_package_540_pkg_resources_py2_warn" ]; - pythonImportsCheck = [ - "samcli" - ]; + pythonImportsCheck = [ "samcli" ]; passthru = { tests.version = testers.testVersion { @@ -142,7 +142,10 @@ python3.pkgs.buildPythonApplication rec { command = "sam --version"; }; updateScript = nix-update-script { - extraArgs = [ "--version-regex" "^v([0-9.]+)$" ]; + extraArgs = [ + "--version-regex" + "^v([0-9.]+)$" + ]; }; }; @@ -154,6 +157,9 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/aws/aws-sam-cli/releases/tag/v${version}"; license = licenses.asl20; mainProgram = "sam"; - maintainers = with maintainers; [ lo1tuma anthonyroussel ]; + maintainers = with maintainers; [ + lo1tuma + anthonyroussel + ]; }; } diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index c2bd3989b8bc6..8b5595ae40e74 100644 --- a/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,58 +1,58 @@ [ { "version": "latest", - "buildId": "1.0.026911", - "publishDate": "2024-05-15T19:23:23.3973684Z", + "buildId": "19449a00c0269fefc8f29a6d01801c4b19308181", + "publishDate": "2024-08-06T04:39:59.0569065Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/linux/StaticSitesClient", - "sha": "e1d9e033c973a35f64b7e41b6a114bd8e48022c9c3f7676e79047e87245a874d" + "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/linux/StaticSitesClient", + "sha": "87b0852f6a839fcf8e7d76df78aea1d36b803bb4cc4610fa9cd9531ff53175f0" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/windows/StaticSitesClient.exe", - "sha": "c67e5eed2b28fcf5c98348732653d1e2b37d842e6dde9a6b30322832c5d86fc7" + "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/windows/StaticSitesClient.exe", + "sha": "8d21e065a68a9aa983fdf95f6965b76f19286dba3dcc159d9af212b3fea31126" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/macOS/StaticSitesClient", - "sha": "18ca42a1b13db9b8b6db6bd8c77e65def56fa7bf3ce3fb1184e890d8cd7dd033" + "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/macOS/StaticSitesClient", + "sha": "a8d40d343d4135ccca4ebfd754d0e5c0d71821786a4d7c1b0d42c1b2679c80c1" } } }, { "version": "stable", - "buildId": "1.0.026911", - "publishDate": "2024-05-15T19:23:23.3973684Z", + "buildId": "19449a00c0269fefc8f29a6d01801c4b19308181", + "publishDate": "2024-08-06T04:39:59.0569065Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/linux/StaticSitesClient", - "sha": "e1d9e033c973a35f64b7e41b6a114bd8e48022c9c3f7676e79047e87245a874d" + "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/linux/StaticSitesClient", + "sha": "87b0852f6a839fcf8e7d76df78aea1d36b803bb4cc4610fa9cd9531ff53175f0" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/windows/StaticSitesClient.exe", - "sha": "c67e5eed2b28fcf5c98348732653d1e2b37d842e6dde9a6b30322832c5d86fc7" + "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/windows/StaticSitesClient.exe", + "sha": "8d21e065a68a9aa983fdf95f6965b76f19286dba3dcc159d9af212b3fea31126" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/macOS/StaticSitesClient", - "sha": "18ca42a1b13db9b8b6db6bd8c77e65def56fa7bf3ce3fb1184e890d8cd7dd033" + "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/macOS/StaticSitesClient", + "sha": "a8d40d343d4135ccca4ebfd754d0e5c0d71821786a4d7c1b0d42c1b2679c80c1" } } }, { "version": "backup", - "buildId": "1.0.026792", - "publishDate": "2024-05-03T18:31:36.0288058Z", + "buildId": "1.0.026911", + "publishDate": "2024-05-15T19:23:23.3973684Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026792/linux/StaticSitesClient", - "sha": "a9dcd998d22a3476fb97fe1c446e83cc7f060a3a36cdb6757b828d0facc42347" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/linux/StaticSitesClient", + "sha": "e1d9e033c973a35f64b7e41b6a114bd8e48022c9c3f7676e79047e87245a874d" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026792/windows/StaticSitesClient.exe", - "sha": "15f03e3f91208db2ea4015c4fce0623a692da1a289f23a782578ab7bc8a810e2" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/windows/StaticSitesClient.exe", + "sha": "c67e5eed2b28fcf5c98348732653d1e2b37d842e6dde9a6b30322832c5d86fc7" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026792/macOS/StaticSitesClient", - "sha": "454b10f0351694ec3475a3d85b8746356932b2061a5be7e7fc093a6509cf000c" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/macOS/StaticSitesClient", + "sha": "18ca42a1b13db9b8b6db6bd8c77e65def56fa7bf3ce3fb1184e890d8cd7dd033" } } } diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index 8298ff4c25576..c175badcc3004 100644 --- a/pkgs/development/tools/b4/default.nix +++ b/pkgs/development/tools/b4/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.14.1"; + version = "0.14.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ZJ1TxkvOZWQWQrtQvAIN0G9cLXRH89GcrTuIbaIKgDE="; + hash = "sha256-T4NbblrjDv9gBLslwV/Y9Pbs0RBVluhtsYcf730YET0="; }; # tests make dns requests and fails diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index c717be75ad08f..42eff7fface2b 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pfILpDJbHLAwv/hUoMBjQSEyFAmU5VmVYY8lyf6j6NQ="; + hash = "sha256-WIjTFP5koNQeHiTcVxQ18eZEdHzmpBFinvfNtirG+pg="; }; - cargoHash = "sha256-5LwWTmka13Pht7lgBH50AnEC0Y71v1OCuaqloMlr/20="; + cargoHash = "sha256-YaVnfwf0jyZTe6B35z9Zm9247kGU/G6nu23sHg9lnAk="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix index fd4161499c725..3cbf97398953a 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/pkgs/development/tools/bashate/default.nix @@ -1,39 +1,42 @@ -{ lib -, babel -, buildPythonApplication -, fetchPypi -, fixtures -, mock -, pbr -, pytestCheckHook -, pythonOlder -, setuptools -, testtools +{ + lib, + fetchPypi, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "bashate"; version = "2.1.1"; - disabled = pythonOlder "3.5"; + pyproject = true; + + disabled = python3Packages.pythonOlder "3.5"; src = fetchPypi { inherit pname version; hash = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w="; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ babel pbr setuptools ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ fixtures mock - pytestCheckHook + stestr testtools ]; + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + pythonImportsCheck = [ "bashate" ]; meta = with lib; { @@ -41,6 +44,6 @@ buildPythonApplication rec { mainProgram = "bashate"; homepage = "https://opendev.org/openstack/bashate"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; + maintainers = teams.openstack.members ++ (with maintainers; [ fab ]); }; } diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index ae152a3782ab1..f8300db3c064f 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -1,102 +1,34 @@ -{ buildBazelPackage -, bazel_5 -, fetchFromGitHub -, git -, go_1_21 -, python3 -, lib, stdenv +{ + lib, + fetchFromGitHub, + buildGoModule, + testers, + bazel-watcher, }: -let - patches = [ - ./use-go-in-path.patch - ]; - - # Patch the protoc alias so that it always builds from source. - rulesProto = fetchFromGitHub { - owner = "bazelbuild"; - repo = "rules_proto"; - rev = "4.0.0"; - hash = "sha256-WVPZx14thneAC4PdiDhBibnPwlCKEF9c93CHR0t1Efo="; - postFetch = '' - sed -i 's|name = "protoc"|name = "_protoc_original"|' $out/proto/private/BUILD.release - cat <<EOF >>$out/proto/private/BUILD.release - alias(name = "protoc", actual = "@com_github_protocolbuffers_protobuf//:protoc", visibility = ["//visibility:public"]) - EOF - ''; - }; - -in -buildBazelPackage rec { +buildGoModule rec { pname = "bazel-watcher"; - version = "0.25.2"; + version = "0.25.3"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - hash = "sha256-lreGKA0DZiOd1bJq8NNQ+80cyDwiughoXCkKu1RaZmc="; + hash = "sha256-5cRj04e5VVG4NSe4LOLkZIrerT4laLEDeXCqTiJj6MM="; }; - nativeBuildInputs = [ go_1_21 git python3 ]; - removeRulesCC = false; - - bazel = bazel_5; - bazelFlags = [ "--override_repository=rules_proto=${rulesProto}" ]; - bazelBuildFlags = lib.optionals stdenv.cc.isClang [ "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" ]; - bazelTargets = [ "//cmd/ibazel" ]; - - fetchConfigured = false; # we want to fetch all dependencies, regardless of the current system - fetchAttrs = { - inherit patches; - - preBuild = '' - patchShebangs . - - echo ${bazel_5.version} > .bazelversion - ''; + vendorHash = "sha256-0I/bvuyosN55oNSMuom4C8rVjxneUaqV19l9OMiwWhU="; - preInstall = '' - # Remove the go_sdk (it's just a copy of the go derivation) and all - # references to it from the marker files. Bazel does not need to download - # this sdk because we have patched the WORKSPACE file to point to the one - # currently present in PATH. Without removing the go_sdk from the marker - # file, the hash of it will change anytime the Go derivation changes and - # that would lead to impurities in the marker files which would result in - # a different hash for the fetch phase. - rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker} - sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker - - # Retains go build input markers - chmod -R 755 $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} - rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} - - # Remove the gazelle tools, they contain go binaries that are built - # non-deterministically. As long as the gazelle version matches the tools - # should be equivalent. - rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker} - sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker - - # remove com_google_protobuf because it had files with different permissions on linux and darwin - rm -rf $bazelOut/external/com_google_protobuf - ''; - - sha256 = "sha256-B2KVD/FmkAa7MNhLaH286gF3uA20qjN3CoA83KRB9E8="; - }; - - buildAttrs = { - inherit patches; - - preBuild = '' - patchShebangs . + CGO_ENABLED = "0"; + ldflags = [ + "-s" + "-X main.Version=${version}" + ]; - substituteInPlace cmd/ibazel/BUILD.bazel --replace '{STABLE_GIT_VERSION}' ${version} - echo ${bazel_5.version} > .bazelversion - ''; + subPackages = [ "cmd/ibazel" ]; - installPhase = '' - install -Dm755 bazel-bin/cmd/ibazel/ibazel_/ibazel $out/bin/ibazel - ''; + passthru = { + tests.version = testers.testVersion { package = bazel-watcher; }; }; meta = with lib; { diff --git a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch b/pkgs/development/tools/bazel-watcher/use-go-in-path.patch deleted file mode 100644 index 5ce4f81ff3ae6..0000000000000 --- a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/WORKSPACE b/WORKSPACE -index 51273b6..fcf9ffb 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -61,7 +61,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe - - go_rules_dependencies() - --go_register_toolchains(version = "1.19.4") -+go_register_toolchains(go_version = "host") - - load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") - diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 41bc278d805c2..1c149e72190cf 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.20.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UNrfLuSadkP3GBlFMg2V3mK/GSNlyvIxeHnkTuPjfy4="; + sha256 = "sha256-KD8lh3N9GFlht+HtcuE3i20noVha0lT21a5pSS3zbTw="; }; - vendorHash = "sha256-hjV7Pc3DFExSCsA0jKVxb1GxoXQ7LRFGuot3V0IHG58="; + vendorHash = "sha256-zoiQ69y0EicH9Jq2XYn+fttKHZY64GD4m/Edk+kle9M="; doCheck = false; diff --git a/pkgs/development/tools/bbin/default.nix b/pkgs/development/tools/bbin/default.nix index 42ef4285816cc..a5c165c77c718 100644 --- a/pkgs/development/tools/bbin/default.nix +++ b/pkgs/development/tools/bbin/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "bbin"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "babashka"; repo = "bbin"; rev = "v${version}"; - sha256 = "sha256-tWk5HzDKff+wwqRjLYbjfio3aQC6Xz5vsMf/NLm+Scc="; + sha256 = "sha256-26uZqHSLi+qnilyPWt/2mCr1wyu1flxNd+jq9zbumrg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/bin2c/default.nix b/pkgs/development/tools/bin2c/default.nix index 2528b1ea09617..7ac93c4539b9f 100644 --- a/pkgs/development/tools/bin2c/default.nix +++ b/pkgs/development/tools/bin2c/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { makeFlags = [ "prefix=$(out)" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkTarget = "test"; checkInputs = [ util-linux ]; # uuidgen diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix deleted file mode 100644 index aa8a2855882f8..0000000000000 --- a/pkgs/development/tools/biome/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, rust-jemalloc-sys -, zlib -, stdenv -, darwin -, git -}: - -rustPlatform.buildRustPackage rec { - pname = "biome"; - version = "1.8.3"; - - src = fetchFromGitHub { - owner = "biomejs"; - repo = "biome"; - rev = "cli/v${version}"; - hash = "sha256-6/RYuaR4HBXLI7eKysyRcSOxONFlChpQuhzWHAlx2CM="; - }; - - cargoHash = "sha256-ytGbiDamxkTCPjNTBMsW1YjK+qMZfktGG5mVUVdKV5I="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - libgit2 - rust-jemalloc-sys - zlib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - nativeCheckInputs = [ - git - ]; - - cargoBuildFlags = [ "-p=biome_cli" ]; - cargoTestFlags = cargoBuildFlags ++ - # skip a broken test from v1.7.3 release - # this will be removed on the next version - [ "-- --skip=diagnostics::test::termination_diagnostic_size" ]; - - env = { - BIOME_VERSION = version; - LIBGIT2_NO_VENDOR = 1; - }; - - preCheck = '' - # tests assume git repository - git init - - # tests assume $BIOME_VERSION is unset - unset BIOME_VERSION - ''; - - meta = with lib; { - description = "Toolchain of the web"; - homepage = "https://biomejs.dev/"; - changelog = "https://github.com/biomejs/biome/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "biome"; - }; -} diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix deleted file mode 100644 index 1393a7ca54e99..0000000000000 --- a/pkgs/development/tools/bloaty/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, stdenv, cmake, zlib, fetchFromGitHub, re2, abseil-cpp, protobuf, capstone, gtest, pkg-config, lit, llvmPackages_16 }: - -stdenv.mkDerivation rec { - pname = "bloaty"; - version = "1.1-unstable-2023-11-06"; - - src = fetchFromGitHub { - owner = "google"; - repo = "bloaty"; - rev = "16f9fe54d9cd0e9abe1d25fc1a9b44c214cfaa9f"; - hash = "sha256-mIVlNMKtJMfH2QdYZ6+oV7619oYzvKkq3fHY6uofqlM="; - }; - - # Old vendored package which has no other use than here, so not packaged in nixpkgs. - demumble = fetchFromGitHub { - owner = "nico"; - repo = "demumble"; - rev = "01098eab821b33bd31b9778aea38565cd796aa85"; - hash = "sha256-605SsXd7TSdm3BH854ChHIZbOXcHI/n8RN+pFMz4Ex4="; - }; - - cmakeFlags = [ - "-DLIT_EXECUTABLE=${lit}/bin/lit" - "-DFILECHECK_EXECUTABLE=${llvmPackages_16.libllvm}/bin/FileCheck" - "-DYAML2OBJ_EXECUTABLE=${llvmPackages_16.libllvm}/bin/yaml2obj" - ]; - - postPatch = '' - # 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)" "" \ - --replace "if(Python_FOUND AND LIT_EXECUTABLE" "if(LIT_EXECUTABLE" \ - --replace "COMMAND \''\${Python_EXECUTABLE} \''\${LIT_EXECUTABLE}" "COMMAND \''\${LIT_EXECUTABLE}" - # wasm test fail. Possibly due to LLVM version < 17. See https://github.com/google/bloaty/pull/354 - rm -rf tests/wasm - ''; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ zlib re2 abseil-cpp protobuf capstone gtest lit llvmPackages_16.libllvm ]; - - doCheck = true; - - postCheck = '' - # These lit tests need to be build seperatly. - # See https://github.com/google/bloaty/blob/main/tests/README.md - cmake --build . --target check-bloaty - ''; - installPhase = '' - install -Dm755 {.,$out/bin}/bloaty - ''; - - meta = with lib; { - description = "Size profiler for binaries"; - mainProgram = "bloaty"; - homepage = "https://github.com/google/bloaty"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index b1250a366a225..95fa7c96c2bf9 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.38.0"; + version = "1.42.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-BONfkSLQAnqKW/1PfMwK/DjAbLm5/i6V55SZDOF0rJA="; + hash = "sha256-T4cEl2aT6F/IamCd1FxomYxqGpbcbXzPtEu0AJUyJJU="; }; - vendorHash = "sha256-NV5l7dlb05rRLtNe2cFvaC/G2rhZLY+DmVQcuyJU/08="; + vendorHash = "sha256-apF3FpVlwonm76d0Ue7TMPDIRW0BNkZXWMLgh1+mmvo="; patches = [ # Skip a test that requires networking to be available to work. @@ -76,7 +76,7 @@ buildGoModule rec { changelog = "https://github.com/bufbuild/buf/releases/tag/v${version}"; description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; license = licenses.asl20; - maintainers = with maintainers; [ jk lrewega ]; + maintainers = with maintainers; [ jk lrewega aaronjheng ]; mainProgram = "buf"; }; } diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index c2210358344c2..da81c1fb4e9bc 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -522,7 +522,7 @@ stdenv.mkDerivation rec { which zip python3.pkgs.absl-py # Needed to build fish completion - ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; # Bazel makes extensive use of symlinks in the WORKSPACE. # This causes problems with infinite symlinks if the build output is in the same location as the @@ -650,7 +650,7 @@ stdenv.mkDerivation rec { # stored non-contiguously in the binary due to gcc optimisations, which leads # Nix to miss the hash when scanning for dependencies echo "${bazelRC}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index a49530ecfc693..b1069673f14a2 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -583,7 +583,7 @@ stdenv.mkDerivation rec { which zip python3.pkgs.absl-py # Needed to build fish completion - ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx sigtool CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx sigtool CoreFoundation CoreServices Foundation ]; # Bazel makes extensive use of symlinks in the WORKSPACE. # This causes problems with infinite symlinks if the build output is in the same location as the @@ -622,7 +622,7 @@ stdenv.mkDerivation rec { '' + # disable execlog parser on darwin, since it fails to build # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055 - lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # need to change directory for bazel to find the workspace cd ./bazel_src # build execlog tooling @@ -649,7 +649,7 @@ stdenv.mkDerivation rec { '' + # disable execlog parser on darwin, since it fails to build # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055 - (lib.optionalString (!stdenv.isDarwin) '' + (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir $out/share cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar cat <<EOF > $out/bin/bazel-execlog @@ -730,7 +730,7 @@ stdenv.mkDerivation rec { # stored non-contiguously in the binary due to gcc optimisations, which leads # Nix to miss the hash when scanning for dependencies echo "${bazelRC}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix index 5722d26ea1ed1..7f98f512c5199 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix @@ -56,7 +56,7 @@ let cp ${./cpp-test-MODULE.bazel.lock} $out/MODULE.bazel.lock echo > $out/WORSPACE '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -71,10 +71,10 @@ let --verbose_failures \ --repository_cache=${mergedDistDir} \ --curses=no \ - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' --cxxopt=-x --cxxopt=c++ \ --host_cxxopt=-x --host_cxxopt=c++ \ - '' + lib.optionalString (stdenv.isDarwin && Foundation != null) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && Foundation != null) '' --linkopt=-Wl,-F${Foundation}/Library/Frameworks \ --linkopt=-L${darwin.libobjc}/lib \ '' + '' diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 1a31de96ca4f0..661eb1a71aa9b 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -419,7 +419,7 @@ stdenv.mkDerivation rec { which zip python3.pkgs.absl-py # Needed to build fish completion - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx Foundation @@ -561,7 +561,7 @@ stdenv.mkDerivation rec { # stored non-contiguously in the binary due to gcc optimisations, which leads # Nix to miss the hash when scanning for dependencies echo "${bazelRC}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix index 51fea3e32dc35..752ddc4448556 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix @@ -55,7 +55,7 @@ let cp ${./cpp-test-MODULE.bazel} $out/MODULE.bazel cp ${./cpp-test-MODULE.bazel.lock} $out/MODULE.bazel.lock '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix index ebe4f13346bc0..309bae9b23876 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix @@ -122,7 +122,7 @@ let cp ${personProto} $out/person/person.proto cp ${personBUILD} $out/person/BUILD.bazel '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' echo 'tools bazel created' mkdir $out/tools install ${toolsBazel} $out/tools/bazel @@ -155,7 +155,7 @@ let --host_javabase='@local_jdk//:jdk' \ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ --javabase='@local_jdk//:jdk' \ - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ '' + '' diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index f5b3e03f8609c..f3cb1a9313e13 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "7.1.2"; + version = "7.3.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = "v${version}"; - hash = "sha256-Ax7UKkClYsoqxaR+tsQnTv6BFafl9SkY7MC4kYJNmwY="; + hash = "sha256-AdwJDRw+AY3F+ZDaKqn5YzAVyAzvrV+d1WTk8OJtUdk="; }; - vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; + vendorHash = "sha256-sYZ7ogQY0dWOwJMvLljOjaKeYGYdLrF5AnetregdlYY="; preBuild = '' rm -r warn/docs diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix index 6759bf14de100..cc3bc8d9a1418 100644 --- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix +++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix @@ -36,7 +36,7 @@ let cp -r ${bazel-examples}/cpp-tutorial/stage3 $out find $out -type d -exec chmod 755 {} \; '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -51,10 +51,10 @@ let --distdir=${distDir} \ --curses=no \ ${extraBazelArgs} \ - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \ - '' + lib.optionalString (stdenv.isDarwin && Foundation != null) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && Foundation != null) '' --linkopt=-Wl,-F${Foundation}/Library/Frameworks \ --linkopt=-L${darwin.libobjc}/lib \ ''; diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix index 3890d45d2b946..afdacaf6a8440 100644 --- a/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -35,7 +35,7 @@ let cp -r ${bazel-examples}/java-tutorial $out find $out -type d -exec chmod 755 {} \; '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix index 0466404ced965..5880c5dd95fe3 100644 --- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix +++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix @@ -154,7 +154,7 @@ let cp ${personProto} $out/person/person.proto cp ${personBUILD} $out/person/BUILD.bazel '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -178,7 +178,7 @@ let --host_javabase='@local_jdk//:jdk' \ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ --javabase='@local_jdk//:jdk' \ - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \ ''; diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index e0e59fb8891d4..59f5d0c01fccf 100644 --- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -65,7 +65,7 @@ let cp ${pythonBin} $out/python/bin.py cp ${pythonBUILD} $out/python/BUILD.bazel '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 5a97ad797f915..b0d9c72ad224f 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,11 +10,12 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "2.0.0"; + version = "2.0.2"; platform = - if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" - else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin" + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "x86_64-pc-linux" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "x86_64-apple-darwin" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "aarch64-apple-darwin" else throw "unsupported platform"; bloop-bash = fetchurl { @@ -35,14 +36,15 @@ stdenv.mkDerivation rec { bloop-binary = fetchurl rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = - if stdenv.isLinux && stdenv.isx86_64 then "sha256-SnDXAkNu//Dn24FaQcACEBEJODlrhvpQ8uNbge99nGA=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-MfenrNbL1UBC4t/0w9MTDI+kz2HKv7xJcmA57qBbMFw=" + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then "sha256-xYVfgi3ANjBiuf4/5FDgSYDL/fPsvuJn4jFxAEVYct4=" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "sha256-lq0S2AsulcUUYDd3qnWonwd/W0/gb7lJwC+QTYTlTdg=" + else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "sha256-e+9Q7xIEsHloaKOj13vZnGs2vulkOJv7tCOuACobHvk=" else throw "unsupported platform"; }; dontUnpack = true; nativeBuildInputs = [ installShellFiles makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = [ stdenv.cc.cc.lib zlib ]; propagatedBuildInputs = [ jre ]; @@ -67,7 +69,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; description = "Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; mainProgram = "bloop"; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; maintainers = with maintainers; [ kubukoz tomahna ]; }; } diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index f494e4053525c..06246f6b081a1 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; # https://github.com/facebook/buck/issues/2666 - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/tools/build-managers/build2/bdep.nix b/pkgs/development/tools/build-managers/build2/bdep.nix index 90a58e4f1b517..a1a77db45e1b4 100644 --- a/pkgs/development/tools/build-managers/build2/bdep.nix +++ b/pkgs/development/tools/build-managers/build2/bdep.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "bdep"; - version = "0.16.0"; + version = "0.17.0"; outputs = [ "out" "doc" "man" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/bdep-${version}.tar.gz"; - hash = "sha256-5w8Ng8TS8g+Nkbixn5txg4FGi57TSfc6ii+2wh8apCo="; + hash = "sha256-+2Hl5kanxWJmOpfePAvvSBSmG3kZLQv/kYIkT4J+kaQ="; }; strictDeps = true; diff --git a/pkgs/development/tools/build-managers/build2/bootstrap.nix b/pkgs/development/tools/build-managers/build2/bootstrap.nix index 0e1297506d4a3..c06be28e462ac 100644 --- a/pkgs/development/tools/build-managers/build2/bootstrap.nix +++ b/pkgs/development/tools/build-managers/build2/bootstrap.nix @@ -6,10 +6,10 @@ }: stdenv.mkDerivation rec { pname = "build2-bootstrap"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz"; - hash = "sha256-I3k/aCoXsdlcgLvYSSRHNe1Zo+JzYVKapIZdJ3b/itw="; + hash = "sha256-NyKonqht90JTnQ+Ru0Qp/Ua79mhVOjUHgKY0EbZIv10="; }; patches = [ # Pick up sysdirs from NIX_LDFLAGS diff --git a/pkgs/development/tools/build-managers/build2/bpkg.nix b/pkgs/development/tools/build-managers/build2/bpkg.nix index e395322df420f..bf9951e7ae172 100644 --- a/pkgs/development/tools/build-managers/build2/bpkg.nix +++ b/pkgs/development/tools/build-managers/build2/bpkg.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bpkg"; - version = "0.16.0"; + version = "0.17.0"; outputs = [ "out" "doc" "man" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/bpkg-${version}.tar.gz"; - hash = "sha256-sxzVidVL8dpoH82IevcwjcIWj4LQzliGv9zasTYqeok="; + hash = "sha256-Yw6wvTqO+VfCo91B2BUT0A8OIN0MVhGK1USYM7hgGMs="; }; strictDeps = true; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { openssl ]; - doCheck = !stdenv.isDarwin; # tests hang + doCheck = !stdenv.hostPlatform.isDarwin; # tests hang # Failing test postPatch = '' @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "config.bin.lib=${build2.configSharedStatic enableShared enableStatic}" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath '${lib.getLib build2}/lib' "''${!outputBin}/bin/bpkg" ''; diff --git a/pkgs/development/tools/build-managers/build2/default.nix b/pkgs/development/tools/build-managers/build2/default.nix index bbe1739392fee..c02334c98a51e 100644 --- a/pkgs/development/tools/build-managers/build2/default.nix +++ b/pkgs/development/tools/build-managers/build2/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "build2"; - version = "0.16.0"; + version = "0.17.0"; outputs = [ "out" "dev" "doc" "man" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz"; - hash = "sha256-ZK4+UACsAs51bC1dE0sIxmCiHlH3pYGPWJNsl61oSOY="; + hash = "sha256-Kx5X/GV3GjFSbjo1mzteiHnnm4mr6+NAKIR/mEE+IdA="; }; patches = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "config.build2.libpkgconf=true" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "''${!outputLib}/lib" "''${!outputBin}/bin/b" ''; diff --git a/pkgs/development/tools/build-managers/build2/setup-hook.sh b/pkgs/development/tools/build-managers/build2/setup-hook.sh index 1259fabc0548a..ba6b616cf417e 100644 --- a/pkgs/development/tools/build-managers/build2/setup-hook.sh +++ b/pkgs/development/tools/build-managers/build2/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + build2ConfigurePhase() { runHook preConfigure @@ -16,9 +18,10 @@ build2ConfigurePhase() { "config.install.man=${!outputDoc}/share/man" "config.install.sbin=${!outputBin}/sbin" "config.install.bin.mode=755" - $build2ConfigureFlags "${build2ConfigureFlagsArray[@]}" ) + concatTo flagsArray build2ConfigureFlags build2ConfigureFlagsArray + # shellcheck disable=SC2157 if [ -n "@isTargetDarwin@" ]; then flagsArray+=("config.bin.ld=ld64-lld") flagsArray+=("config.cc.loptions+=-fuse-ld=lld") @@ -35,9 +38,8 @@ build2ConfigurePhase() { build2BuildPhase() { runHook preBuild - local flagsArray=( - $build2BuildFlags "${build2BuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray build2BuildFlags build2BuildFlagsArray echo 'build flags' "${flagsArray[@]}" b "${flagsArray[@]}" @@ -48,13 +50,12 @@ build2BuildPhase() { build2CheckPhase() { runHook preCheck - local flagsArray=( - $build2CheckFlags "${build2CheckFlags[@]}" - ) + local flagsArray=() + concatTo flagsArray build2CheckFlags build2CheckFlags echo 'check flags' "${flagsArray[@]}" - b test ${build2Dir:-.} "${flagsArray[@]}" + b test "${build2Dir:-.}" "${flagsArray[@]}" runHook postCheck } @@ -62,10 +63,8 @@ build2CheckPhase() { build2InstallPhase() { runHook preInstall - local flagsArray=( - $build2InstallFlags "${build2InstallFlagsArray[@]}" - ${installTargets:-} - ) + local flagsArray=() + concatTo flagsArray build2InstallFlags build2InstallFlagsArray installTargets echo 'install flags' "${flagsArray[@]}" b install "${flagsArray[@]}" @@ -73,19 +72,20 @@ build2InstallPhase() { runHook postInstall } -if [ -z "${dontUseBuild2Configure-}" -a -z "${configurePhase-}" ]; then +if [ -z "${dontUseBuild2Configure-}" ] && [ -z "${configurePhase-}" ]; then + # shellcheck disable=SC2034 setOutputFlags= configurePhase=build2ConfigurePhase fi -if [ -z "${dontUseBuild2Build-}" -a -z "${buildPhase-}" ]; then +if [ -z "${dontUseBuild2Build-}" ] && [ -z "${buildPhase-}" ]; then buildPhase=build2BuildPhase fi -if [ -z "${dontUseBuild2Check-}" -a -z "${checkPhase-}" ]; then +if [ -z "${dontUseBuild2Check-}" ] && [ -z "${checkPhase-}" ]; then checkPhase=build2CheckPhase fi -if [ -z "${dontUseBuild2Install-}" -a -z "${installPhase-}" ]; then +if [ -z "${dontUseBuild2Install-}" ] && [ -z "${installPhase-}" ]; then installPhase=build2InstallPhase fi diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 5e7a0e866cff4..f9bb2457a4fa4 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec { requests tqdm urllib3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ idna cryptography pyopenssl @@ -49,7 +49,7 @@ python3.pkgs.buildPythonApplication rec { git pkg-config zlib - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ] ++ (with python3.pkgs; [ mock @@ -73,7 +73,7 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Tests require network access "TestFTP" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Rejects paths containing nix "test_conditional_os" # Requires Apple Clang diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index 6809ee7ffd7ac..500e56e9cfcc6 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hash = "sha256-vaNXXXaGqYNmhonU+ANN857LAUgwv+PMcON+nBuUoeo="; }; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index b44cefe6a9536..63d53e123aad5 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { }; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cargoHash = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk="; # fac includes a unit test called ls_files_works which assumes it's @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = '' A build system that uses ptrace to handle dependencies automatically ''; diff --git a/pkgs/development/tools/build-managers/gn/generic.nix b/pkgs/development/tools/build-managers/gn/generic.nix index fe74486ccfaad..71242ceaba84b 100644 --- a/pkgs/development/tools/build-managers/gn/generic.nix +++ b/pkgs/development/tools/build-managers/gn/generic.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ ninja python3 ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin; with apple_sdk.frameworks; [ libobjc cctools diff --git a/pkgs/development/tools/build-managers/gn/setup-hook.sh b/pkgs/development/tools/build-managers/gn/setup-hook.sh index 850f18948cad9..f459e979aa0fe 100644 --- a/pkgs/development/tools/build-managers/gn/setup-hook.sh +++ b/pkgs/development/tools/build-managers/gn/setup-hook.sh @@ -1,14 +1,20 @@ +# shellcheck shell=bash + gnConfigurePhase() { runHook preConfigure - echo "gn flags: $gnFlags ${gnFlagsArray[@]}" + local flagsArray=() + concatTo flagsArray gnFlags gnFlagsArray + + echoCmd 'gn flags' "${flagsArray[@]}" - gn gen out/Release --args="$gnFlags ${gnFlagsArray[@]}" + gn gen out/Release --args="${flagsArray[*]}" + # shellcheck disable=SC2164 cd out/Release/ runHook postConfigure } -if [ -z "${dontUseGnConfigure-}" -a -z "${configurePhase-}" ]; then +if [ -z "${dontUseGnConfigure-}" ] && [ -z "${configurePhase-}" ]; then configurePhase=gnConfigurePhase fi diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index ac22eee7e2061..1afadceb9b770 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # a second. So, tell Make to ignore nanoseconds in mtime here by # overriding the autoconf test for the struct. # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + ++ lib.optional stdenv.hostPlatform.isDarwin "ac_cv_struct_st_mtim_nsec=no"; outputs = [ "out" "man" "info" ]; diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index fcbb23a7119eb..5f215be7386a7 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # a second. So, tell Make to ignore nanoseconds in mtime here by # overriding the autoconf test for the struct. # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + ++ lib.optional stdenv.hostPlatform.isDarwin "ac_cv_struct_st_mtim_nsec=no"; outputs = [ "out" "man" "info" ]; separateDebugInfo = true; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index de85ea67eb965..61510384e31eb 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -3,7 +3,7 @@ rec { gen = - { version, nativeVersion, hash, + { version, hash, # The default JDK/JRE that will be used for derived Gradle packages. # A current LTS version of a JDK is a good choice. @@ -36,6 +36,7 @@ rec { , testers , runCommand , writeText + , autoPatchelfHook # The JDK/JRE used for running Gradle. , java ? defaultJava @@ -57,8 +58,22 @@ rec { dontBuild = true; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ java ]; + nativeBuildInputs = [ + makeWrapper + unzip + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ]; + + buildInputs = [ + java + stdenv.cc.cc + ncurses5 + ncurses6 + ]; + + # We only need to patchelf some libs embedded in JARs. + dontAutoPatchelf = true; installPhase = with builtins; let @@ -83,22 +98,26 @@ rec { --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain${toolchain.property}" ''; - dontFixup = !stdenv.isLinux; + dontFixup = !stdenv.hostPlatform.isLinux; - fixupPhase = let arch = if stdenv.is64bit then "amd64" else "i386"; + fixupPhase = let arch = if stdenv.hostPlatform.is64bit then "amd64" else "i386"; in '' + . ${./patching.sh} + + nativeVersion="$(extractVersion native-platform $out/lib/gradle/lib/native-platform-*.jar)" for variant in "" "-ncurses5" "-ncurses6"; do - mkdir "patching$variant" - pushd "patching$variant" - jar xf $out/lib/gradle/lib/native-platform-linux-${arch}$variant-${nativeVersion}.jar - patchelf \ - --set-rpath "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" \ - net/rubygrapefruit/platform/linux-${arch}$variant/libnative-platform*.so - jar cf native-platform-linux-${arch}$variant-${nativeVersion}.jar . - mv native-platform-linux-${arch}$variant-${nativeVersion}.jar $out/lib/gradle/lib/ - popd + autoPatchelfInJar \ + $out/lib/gradle/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \ + "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" done + # The file-events library _seems_ to follow the native-platform version, but + # we won’t assume that. + fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)" + autoPatchelfInJar \ + $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \ + "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" + # The scanner doesn't pick up the runtime dependency in the jar. # Manually add a reference where it will be found. mkdir $out/nix-support @@ -161,22 +180,19 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.8"; - nativeVersion = "0.22-milestone-26"; - hash = "sha256-pLQVhgH4Y2ze6rCb12r7ZAAwu1sUSq/iYaXorwJ9xhI="; + version = "8.10"; + hash = "sha256-W5xes/n8LJSrrqV9kL14dHyhF927+WyFnTdBGBoSvyo="; defaultJava = jdk21; }; gradle_7 = gen { version = "7.6.4"; - nativeVersion = "0.22-milestone-25"; hash = "sha256-vtHaM8yg9VerE2kcd/OLtnOIEZ5HlNET4FEDm4Cvm7E="; defaultJava = jdk17; }; gradle_6 = gen { version = "6.9.4"; - nativeVersion = "0.22-milestone-20"; hash = "sha256-PiQCKFON6fGHcqV06ZoLqVnoPW7zUQFDgazZYxeBOJo="; defaultJava = jdk11; }; diff --git a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix index 304898c0131c6..a0d3b10ba863d 100644 --- a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix +++ b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix @@ -22,7 +22,7 @@ in , data # redirect stdout to stderr to allow the update script to be used with update script combinators , silent ? true -, useBwrap ? stdenv.isLinux +, useBwrap ? stdenv.hostPlatform.isLinux } @ attrs: let diff --git a/pkgs/development/tools/build-managers/gradle/patching.sh b/pkgs/development/tools/build-managers/gradle/patching.sh new file mode 100644 index 0000000000000..73659fad2f803 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/patching.sh @@ -0,0 +1,29 @@ +extractVersion() { + local jar version + local prefix="$1" + shift + local candidates="$@" + + jar="$(basename -a $candidates | sort | head -n1)" + + version="${jar#$prefix-}" + + echo "${version%.jar}" +} + +autoPatchelfInJar() { + local file="$1" rpath="$2" + local work + + work="$(mktemp -dt patching.XXXXXXXXXX)" + pushd "$work" + + jar xf "$file" + rm "$file" + + autoPatchelf -- . + + jar cf "$file" . + + popd +} diff --git a/pkgs/development/tools/build-managers/gradle/update.sh b/pkgs/development/tools/build-managers/gradle/update.sh index 310c368405cb8..4e247954f0289 100755 --- a/pkgs/development/tools/build-managers/gradle/update.sh +++ b/pkgs/development/tools/build-managers/gradle/update.sh @@ -49,20 +49,7 @@ do read -d "\n" gradle_hash gradle_path < <(nix-prefetch-url --print-path $url) gradle_hash=$(nix-hash --to-sri --type sha256 "$gradle_hash") - # Prefix and suffix for "native-platform" dependency. - gradle_native_prefix="gradle-$v/lib/native-platform-" - gradle_native_suffix=".jar" - tmp=$(mktemp) - zipinfo -1 "$gradle_path" "$gradle_native_prefix*$gradle_native_suffix" > $tmp - gradle_native=$(cat $tmp | head -n1) - gradle_native=${gradle_native#"$gradle_native_prefix"} - gradle_native=${gradle_native%"$gradle_native_suffix"} - - # Supported architectures - #grep -Pho "(linux|osx)-\w+" $tmp | sort | uniq - rm -f $tmp - - echo -e "{\\n version = \"$v\";\\n nativeVersion = \"$gradle_native\";\\n sha256 = \"$gradle_hash\";\\n}" > $f + echo -e "{\\n version = \"$v\";\\n sha256 = \"$gradle_hash\";\\n}" > $f echo "$v DONE" done diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix deleted file mode 100644 index bf06954df4dee..0000000000000 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ lib, stdenv, fetchurl, bison, buildPackages, pkgsBuildTarget }: - -let - mkJam = { pname, version, src, meta ? { } }: stdenv.mkDerivation { - inherit pname version src; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ]; - - # Jam uses c89 conventions - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=c89"; - - # Jambase expects ar to have flags. - preConfigure = '' - export AR="$AR rc" - ''; - - # When cross-compiling, we need to set the preprocessor macros - # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the - # host platform. This looks a little ridiculous because the vast majority of - # build tools don't embed target-specific information into their binary, but - # in this case we behave more like a compiler than a make(1)-alike. - postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' - cat >>jam.h <<EOF - #undef OSMAJOR - #undef OSMINOR - #undef OSPLAT - $( - ${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc -E -dM jam.h \ - | grep -E '^#define (OSMAJOR|OSMINOR|OSPLAT) ' - ) - EOF - ''; - - LOCATE_TARGET = "bin.unix"; - - buildPhase = '' - runHook preBuild - make $makeFlags jam0 - ./jam0 -j$NIX_BUILD_CORES -sCC=${buildPackages.stdenv.cc.targetPrefix}cc jambase.c - ./jam0 -j$NIX_BUILD_CORES - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin $out/doc/jam - cp bin.unix/jam $out/bin/jam - cp *.html $out/doc/jam - runHook postInstall - ''; - - enableParallelBuilding = true; - - meta = with lib; { - license = licenses.free; - mainProgram = "jam"; - platforms = platforms.unix; - } // meta; - }; -in -{ - jam = let - pname = "jam"; - version = "2.6.1"; - - base = mkJam { - inherit pname version; - - src = fetchurl { - url = "https://swarm.workshop.perforce.com/projects/perforce_software-jam/download/main/${pname}-${version}.tar"; - sha256 = "19xkvkpycxfsncxvin6yqrql3x3z9ypc1j8kzls5k659q4kv5rmc"; - }; - - meta = with lib; { - description = "Just Another Make"; - homepage = "https://www.perforce.com/resources/documentation/jam"; - maintainers = with maintainers; [ impl orivej ]; - }; - }; - in base.overrideAttrs (oldAttrs: { - makeFlags = (oldAttrs.makeFlags or []) ++ [ - "CC=${buildPackages.stdenv.cc.targetPrefix}cc" - ]; - }); - - ftjam = let - pname = "ftjam"; - version = "2.5.2"; - - base = mkJam { - inherit pname version; - - src = fetchurl { - url = "https://downloads.sourceforge.net/project/freetype/${pname}/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-6JdzUAqSkS3pGOn+v/q+S2vOedaa8ZRDX04DK4ptZqM="; - }; - - meta = with lib; { - description = "FreeType's enhanced, backwards-compatible Jam clone"; - homepage = "https://freetype.org/jam/"; - maintainers = with maintainers; [ AndersonTorres impl ]; - }; - }; - in base.overrideAttrs (oldAttrs: { - postPatch = (oldAttrs.postPatch or "") + '' - substituteInPlace Jamfile --replace strip ${stdenv.cc.targetPrefix}strip - ''; - - # Doesn't understand how to cross compile once bootstrapped, so we'll just - # use the Makefile for the bootstrapping portion. - configurePlatforms = [ "build" "target" ]; - configureFlags = (oldAttrs.configureFlags or []) ++ [ - "CC=${buildPackages.stdenv.cc.targetPrefix}cc" - "--host=${stdenv.buildPlatform.config}" - ]; - }); -} diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix deleted file mode 100644 index efbce0bcd3391..0000000000000 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper -, coreutils, jdk, rlwrap, gnupg }: - -stdenv.mkDerivation rec { - pname = "leiningen"; - version = "2.11.2"; - - src = fetchurl { - url = "https://codeberg.org/leiningen/leiningen/raw/tag/${version}/bin/lein-pkg"; - hash = "sha256-KKGmJmjF9Ce0E6hnfjdq/6qZXwI7H80G4tTJisHfXz4="; - }; - - jarsrc = fetchurl { - url = "https://codeberg.org/leiningen/leiningen/releases/download/${version}/leiningen-${version}-standalone.jar"; - hash = "sha256-fTGuI652npJ0OLDNVdFak+faurCf1PwVh3l5Fh4Qh3Q="; - }; - - JARNAME = "${pname}-${version}-standalone.jar"; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ jdk ]; - - # the jar is not in share/java, because it's a standalone jar and should - # never be picked up by set-java-classpath.sh - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share - cp -v $src $out/bin/lein - cp -v $jarsrc $out/share/$JARNAME - - runHook postInstall - ''; - - fixupPhase = '' - runHook preFixup - - chmod +x $out/bin/lein - patchShebangs $out/bin/lein - substituteInPlace $out/bin/lein \ - --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME" - wrapProgram $out/bin/lein \ - --prefix PATH ":" "${lib.makeBinPath [ rlwrap coreutils ]}" \ - --set LEIN_GPG ${gnupg}/bin/gpg \ - --set JAVA_CMD ${jdk}/bin/java - - runHook postFixup - ''; - - meta = { - homepage = "https://leiningen.org/"; - description = "Project automation for Clojure"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.epl10; - platforms = jdk.meta.platforms; - maintainers = [ ]; - mainProgram = "lein"; - }; -} diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 849724b801489..6204b78692687 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.27.6"; + version = "1.28.3"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-oadbF1bXDaJPp6R7C6Ozm5NgFPmvPwgiPIDuRiNrWg8="; + hash = "sha256-X7O5F/gIkj0EOTMat6koKmCba2V/UiIUq0O46gNiCp8="; }; - cargoHash = "sha256-p3CBjdWOutEWIQMWS5nAYAsE9BQf2MViyoLIOD1OE/s="; + cargoHash = "sha256-I4QLlvN1F4Ptq43A0KpRCnSIxavsvLGnkbJzbiTxjm4="; env = { RUSTFLAGS = "-C strip=symbols"; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/build-managers/msbuild/create-deps.sh b/pkgs/development/tools/build-managers/msbuild/create-deps.sh deleted file mode 100755 index c9bd4ba7eb6ab..0000000000000 --- a/pkgs/development/tools/build-managers/msbuild/create-deps.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq -p xmlstarlet -p curl -set -euo pipefail - -cat << EOL -{ fetchurl }: [ -EOL - -mapfile -t repos < <( - xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.config | - while IFS= read index - do - curl --compressed -fsL "$index" | \ - jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"' - done - ) - -find .packages fake-home/.nuget/packages -name \*.nupkg -printf '%P\n' | sort -u | - while IFS= read file - do - packagedir=$(dirname $file) - version=$(basename $packagedir) - package=$(dirname $packagedir) - - found=false - for repo in "${repos[@]}" - do - url="$repo$package/$version/$package.$version.nupkg" - if curl -fsL "$url" -o /dev/null - then - found=true - break - fi - done - - if ! $found - then - echo "couldn't find $package $version" >&2 - exit 1 - fi - - sha256=$(nix-prefetch-url "$url" 2>/dev/null) - cat << EOL - { - name = "$package"; - version = "$version"; - src = fetchurl { - url = "$url"; - sha256 = "$sha256"; - }; - } -EOL - done - -cat << EOL -] -EOL diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index bf62dec69310e..8710ea93c0a9b 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, glibcLocales, mono, nuget, unzip, dotnetCorePackages, writeText, roslyn }: +{ lib, stdenv, fetchurl, makeWrapper, glibcLocales, mono, unzip, dotnetCorePackages, roslyn }: let @@ -9,23 +9,21 @@ let sha256 = "1wnzbdpk4s9bmawlh359ak2b8zi0sgx1qvcjnvfncr1wsck53v7q"; }; - deps = map (package: package.src) - (import ./deps.nix { inherit fetchurl; }); - - nuget-config = writeText "NuGet.config" '' - <?xml version="1.0" encoding="utf-8"?> - <configuration> - <packageSources> - <clear /> - </packageSources> - </configuration> - ''; - inherit (stdenv.hostPlatform.extensions) sharedLibrary; + mkPackage = attrs: stdenv.mkDerivation (finalAttrs: + dotnetCorePackages.addNuGetDeps + { + nugetDeps = ./deps.nix; + overrideFetchAttrs = a: { + dontBuild = false; + }; + } + attrs finalAttrs); + in -stdenv.mkDerivation rec { +mkPackage rec { pname = "msbuild"; version = "16.10.1+xamarinxplat.2021.05.26.14.00"; @@ -42,13 +40,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - nuget glibcLocales ]; # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux + LOCALE_ARCHIVE = lib.optionalString stdenv.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive"; postPatch = '' @@ -64,18 +61,9 @@ stdenv.mkDerivation rec { mv LICENSE license.bak && mv license.bak license ''; - buildPhase = '' - unset NUGET_PACKAGES - # nuget would otherwise try to base itself in /homeless-shelter - export HOME=$(pwd)/fake-home - - cp ${nuget-config} NuGet.config - nuget sources Add -Name nixos -Source $(pwd)/nixos - - for package in ${toString deps}; do - nuget add $package -Source nixos - done + linkNugetPackages = true; + buildPhase = '' mkdir -p artifacts unzip ${xplat} -d artifacts mv artifacts/msbuild artifacts/mono-msbuild @@ -98,7 +86,7 @@ stdenv.mkDerivation rec { # DisableNerdbankVersioning https://gitter.im/Microsoft/msbuild/archives/2018/06/27?at=5b33dbc4ce3b0f268d489bfa # TODO there are some (many?) failing tests - ./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true + NuGetPackageRoot="$NUGET_PACKAGES" ./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true patchShebangs stage1/mono-msbuild/msbuild ''; diff --git a/pkgs/development/tools/build-managers/msbuild/deps.nix b/pkgs/development/tools/build-managers/msbuild/deps.nix index 4a006428a5056..e7d1d362a1c55 100644 --- a/pkgs/development/tools/build-managers/msbuild/deps.nix +++ b/pkgs/development/tools/build-managers/msbuild/deps.nix @@ -1,1842 +1,235 @@ -{ fetchurl }: [ - { - name = "benchmarkdotnet"; - version = "0.12.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/benchmarkdotnet/0.12.1/benchmarkdotnet.0.12.1.nupkg"; - sha256 = "0whk81a0v70lkhcd9yffls6vnqnc63hw6jfx8mr7iqp02jbrb15w"; - }; - } - { - name = "benchmarkdotnet.annotations"; - version = "0.12.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/benchmarkdotnet.annotations/0.12.1/benchmarkdotnet.annotations.0.12.1.nupkg"; - sha256 = "061v8zdp69a80vb9gf5n8di2qqz6bwj2215shgsw40i0s8j3flw3"; - }; - } - { - name = "commandlineparser"; - version = "2.4.3"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/commandlineparser/2.4.3/commandlineparser.2.4.3.nupkg"; - sha256 = "1aca3q25n3dg55v4j3kzlzfzd5k2jpy6zhp8x7g74pdfdqzrhg55"; - }; - } - { - name = "fsharp.net.sdk"; - version = "1.0.4-bundled-0100"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/fsharp.net.sdk/1.0.4-bundled-0100/fsharp.net.sdk.1.0.4-bundled-0100.nupkg"; - sha256 = "06hydwby6pzqzzcxmz4z8v5hiiylhzldl7ggfvr4c5xhpb6bcl78"; - }; - } - { - name = "iced"; - version = "1.4.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/iced/1.4.0/iced.1.4.0.nupkg"; - sha256 = "1l8l20clb56vfsjcpspz0z4f3gy3mr2nwilbb8wjlr5fhx6g23n9"; - }; - } - { - name = "illink.tasks"; - version = "0.1.6-prerelease.20175.2"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/7d9f5c21-0d79-403f-bfe3-9a4506529760/nuget/v3/flat2/illink.tasks/0.1.6-prerelease.20175.2/illink.tasks.0.1.6-prerelease.20175.2.nupkg"; - sha256 = "0s4fk48m255n3figh0nnw8cp40qk33khq56sjqnippbk8n6w487z"; - }; - } - { - name = "jnm2.referenceassemblies.net35"; - version = "1.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/jnm2.referenceassemblies.net35/1.0.1/jnm2.referenceassemblies.net35.1.0.1.nupkg"; - sha256 = "10dplszwicqnjyxbxkyc3cs0kzqvcrf73pmbxxd0rmqnakz23a7c"; - }; - } - { - name = "largeaddressaware"; - version = "1.0.5"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/largeaddressaware/1.0.5/largeaddressaware.1.0.5.nupkg"; - sha256 = "0hsjh3m3wr5bfy82bzn606iin35ps03lzfrn3hvjgcn1w68d6291"; - }; - } - { - name = "microbuild.core"; - version = "0.2.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microbuild.core/0.2.0/microbuild.core.0.2.0.nupkg"; - sha256 = "0q4s45jskbyxfx4ay6znnvv94zma2wd85b8rwmwszd2nb0xl3194"; - }; - } - { - name = "microbuild.core.sentinel"; - version = "1.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microbuild.core.sentinel/1.0.0/microbuild.core.sentinel.1.0.0.nupkg"; - sha256 = "035kqx5fkapql108n222lz8psvxk04mv3dy1qg3h08i4b8j3dy8i"; - }; - } - { - name = "microsoft.bcl.asyncinterfaces"; - version = "1.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.1.1.0.nupkg"; - sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; - }; - } - { - name = "microsoft.build"; - version = "14.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/14.3.0/microsoft.build.14.3.0.nupkg"; - sha256 = "1zamn3p8xxi0wsjlpln0y71ncb977f3fp08mvaz4wmbmi76nr0rz"; - }; - } - { - name = "microsoft.build.centralpackageversions"; - version = "2.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.centralpackageversions/2.0.1/microsoft.build.centralpackageversions.2.0.1.nupkg"; - sha256 = "17cjiaj2b98q8s89168g42jb8rhwm6062jcbv57rbkdiiwdsn55k"; - }; - } - { - name = "microsoft.build.framework"; - version = "14.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/14.3.0/microsoft.build.framework.14.3.0.nupkg"; - sha256 = "0r7y1i7dbr3pb53fdrh268hyi627w85nzv2iblwyg8dzkfxraafd"; - }; - } - { - name = "microsoft.build.framework"; - version = "15.5.180"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/15.5.180/microsoft.build.framework.15.5.180.nupkg"; - sha256 = "064y3a711ikx9pm9d2wyms4i3k4f9hfvn3vymhwygg7yv7gcj92z"; - }; - } - { - name = "microsoft.build.nugetsdkresolver"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.nugetsdkresolver/5.9.1-rc.8/microsoft.build.nugetsdkresolver.5.9.1-rc.8.nupkg"; - sha256 = "1dgxkal27rqlnz0ppbmbg4v7yla5wb9s2djk5cb6bpsqy2ngd88d"; - }; - } - { - name = "microsoft.build.tasks.git"; - version = "1.1.0-beta-20206-02"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.build.tasks.git/1.1.0-beta-20206-02/microsoft.build.tasks.git.1.1.0-beta-20206-02.nupkg"; - sha256 = "1gwlhvqlkvs5c7qjky726alf71xflbh3x970g3dypfczi0y6gccx"; - }; - } - { - name = "microsoft.build.utilities.core"; - version = "14.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/14.3.0/microsoft.build.utilities.core.14.3.0.nupkg"; - sha256 = "0351nsnx12nzkss6vaqwwh7d7car7hrgyh0vyd4bl83c4x3ls1kb"; - }; - } - { - name = "microsoft.build.utilities.core"; - version = "15.5.180"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/15.5.180/microsoft.build.utilities.core.15.5.180.nupkg"; - sha256 = "0c4bjhaqgc98bchln8p5d2p1vyn8qrha2b8gpn2l7bnznbcrd630"; - }; - } - { - name = "microsoft.codeanalysis.analyzers"; - version = "2.6.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/2.6.1/microsoft.codeanalysis.analyzers.2.6.1.nupkg"; - sha256 = "1plk343h9fyxg08b9bcnlqyaq00cbnc1v73pj9nbcyphmgf5bqfp"; - }; - } - { - name = "microsoft.codeanalysis.build.tasks"; - version = "3.9.0-5.21112.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.build.tasks/3.9.0-5.21112.8/microsoft.codeanalysis.build.tasks.3.9.0-5.21112.8.nupkg"; - sha256 = "18wvmkpvp1yq288xryap3v07clhs36xiw6vyk4j59i2aqnjjnmc7"; - }; - } - { - name = "microsoft.codeanalysis.common"; - version = "2.10.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/2.10.0/microsoft.codeanalysis.common.2.10.0.nupkg"; - sha256 = "1l690xqrhmkasns5ghz0vqj8n2xyl5yrwan5gs52hwfxdwahqaaj"; - }; - } - { - name = "microsoft.codeanalysis.csharp"; - version = "2.10.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.csharp/2.10.0/microsoft.codeanalysis.csharp.2.10.0.nupkg"; - sha256 = "0saabsr81crawdzs2cnzyjp5cgg2hk5k6q7n0i0pxghswb0m4dxk"; - }; - } - { - name = "microsoft.codecoverage"; - version = "16.6.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codecoverage/16.6.1/microsoft.codecoverage.16.6.1.nupkg"; - sha256 = "01ffm4nflqdb93vq4xl0j3377x360fgx6c6h12mpkcy85ixbv3rl"; - }; - } - { - name = "microsoft.diagnostics.netcore.client"; - version = "0.2.61701"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diagnostics.netcore.client/0.2.61701/microsoft.diagnostics.netcore.client.0.2.61701.nupkg"; - sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; - }; - } - { - name = "microsoft.diagnostics.runtime"; - version = "1.1.57604"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diagnostics.runtime/1.1.57604/microsoft.diagnostics.runtime.1.1.57604.nupkg"; - sha256 = "1gm9gsg3h9ipcvwzp7jfns030c4b6l4cpkpyx9ccphlax9mvmfsi"; - }; - } - { - name = "microsoft.diagnostics.tracing.traceevent"; - version = "2.0.49"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diagnostics.tracing.traceevent/2.0.49/microsoft.diagnostics.tracing.traceevent.2.0.49.nupkg"; - sha256 = "08ww98l9a4cx52h3y8w1x5vzl4jf02a66wf9z1j2py406wjifja9"; - }; - } - { - name = "microsoft.dotnet.arcade.sdk"; - version = "5.0.0-beta.21226.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/5.0.0-beta.21226.1/microsoft.dotnet.arcade.sdk.5.0.0-beta.21226.1.nupkg"; - sha256 = "1d7pczd99cladgmblq8g1dqw88n3aqg7rf8bpsabqrjjrz0pfi43"; - }; - } - { - name = "microsoft.dotnet.msbuildsdkresolver"; - version = "5.0.300-servicing.21267.11"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a8a526e9-91b3-4569-ba2d-ff08dbb7c110/nuget/v3/flat2/microsoft.dotnet.msbuildsdkresolver/5.0.300-servicing.21267.11/microsoft.dotnet.msbuildsdkresolver.5.0.300-servicing.21267.11.nupkg"; - sha256 = "1jgg2akhpgfndqfdcyvm7b83nxva9h86nivc7p6dw8rcvazffbp5"; - }; - } - { - name = "microsoft.dotnet.platformabstractions"; - version = "2.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.dotnet.platformabstractions/2.1.0/microsoft.dotnet.platformabstractions.2.1.0.nupkg"; - sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; - }; - } - { - name = "microsoft.dotnet.signtool"; - version = "5.0.0-beta.21226.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.signtool/5.0.0-beta.21226.1/microsoft.dotnet.signtool.5.0.0-beta.21226.1.nupkg"; - sha256 = "1jd3648n3i9i1njx8wb9g8i29s3n5srx3whdhvrkwjm9g5n11gbj"; - }; - } - { - name = "microsoft.net.build.extensions"; - version = "3.1.400-preview.20365.20"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.build.extensions/3.1.400-preview.20365.20/microsoft.net.build.extensions.3.1.400-preview.20365.20.nupkg"; - sha256 = "1vmcj7p7jsr1lbkbxqqjsixkaxdazr5nwhhp1q402dgky9cayhd5"; - }; - } - { - name = "microsoft.net.compilers.toolset"; - version = "3.9.0-5.21112.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/3.9.0-5.21112.8/microsoft.net.compilers.toolset.3.9.0-5.21112.8.nupkg"; - sha256 = "1drcxgay9ylhs6dr3alnxr4lfapzlr86w3mpwp0gn58mfj5m0g1h"; - }; - } - { - name = "microsoft.netcore.platforms"; - version = "1.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; - sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; - }; - } - { - name = "microsoft.netcore.platforms"; - version = "1.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }; - } - { - name = "microsoft.netcore.targets"; - version = "1.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; - sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; - }; - } - { - name = "microsoft.netcore.targets"; - version = "1.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }; - } - { - name = "microsoft.netframework.referenceassemblies"; - version = "1.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg"; - sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; - }; - } - { - name = "microsoft.netframework.referenceassemblies.net45"; - version = "1.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net45/1.0.0/microsoft.netframework.referenceassemblies.net45.1.0.0.nupkg"; - sha256 = "1ipafi0zjrnzsfmwsisgp8z6m26cbw7vb3jj501nvz3v97b7d7lv"; - }; - } - { - name = "microsoft.netframework.referenceassemblies.net472"; - version = "1.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.0/microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg"; - sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; - }; - } - { - name = "microsoft.net.sdk"; - version = "3.1.400-preview.20365.20"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk/3.1.400-preview.20365.20/microsoft.net.sdk.3.1.400-preview.20365.20.nupkg"; - sha256 = "02ann6rsnc6wl84wsk2fz7dpxcp5sq0b6jm3vv23av4b1f86f82y"; - }; - } - { - name = "microsoft.net.sdk.publish"; - version = "3.1.300-servicing.20216.7"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk.publish/3.1.300-servicing.20216.7/microsoft.net.sdk.publish.3.1.300-servicing.20216.7.nupkg"; - sha256 = "1xivqihp2zrkmd4f65fgh9hn9ix75sqklbnanqlfk9dq67wscp41"; - }; - } - { - name = "microsoft.net.sdk.razor"; - version = "3.1.6"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.sdk.razor/3.1.6/microsoft.net.sdk.razor.3.1.6.nupkg"; - sha256 = "1vw0zi0lq52frivq8mgfvm79rfx0v492q6fci1jls1zwwjk0v9ia"; - }; - } - { - name = "microsoft.net.sdk.web"; - version = "3.1.300-servicing.20216.7"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk.web/3.1.300-servicing.20216.7/microsoft.net.sdk.web.3.1.300-servicing.20216.7.nupkg"; - sha256 = "001jd2iwww0vb5x5dii915z82syh1aj48n62bn8zi1d3chwacr51"; - }; - } - { - name = "microsoft.net.sdk.web.projectsystem"; - version = "3.1.300-servicing.20216.7"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk.web.projectsystem/3.1.300-servicing.20216.7/microsoft.net.sdk.web.projectsystem.3.1.300-servicing.20216.7.nupkg"; - sha256 = "0601mix6l18h8afxxgdbbv695d0sjskady209z52sf4bvf4h4kal"; - }; - } - { - name = "microsoft.net.test.sdk"; - version = "16.6.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.test.sdk/16.6.1/microsoft.net.test.sdk.16.6.1.nupkg"; - sha256 = "0jjdg468jc6pv2z764f3xc19lcr772nzjm9cjfqq3bqw8vkpzmhv"; - }; - } - { - name = "microsoft.sourcelink.azurerepos.git"; - version = "1.1.0-beta-20206-02"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.azurerepos.git/1.1.0-beta-20206-02/microsoft.sourcelink.azurerepos.git.1.1.0-beta-20206-02.nupkg"; - sha256 = "00hfjh8d3z5np51qgr1s3q4j7bl34mfiypf7nbxcmxa7cyj0rg65"; - }; - } - { - name = "microsoft.sourcelink.common"; - version = "1.1.0-beta-20206-02"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.common/1.1.0-beta-20206-02/microsoft.sourcelink.common.1.1.0-beta-20206-02.nupkg"; - sha256 = "1qv0k0apxv3j1pccki2rzakjfb0868hmg0968da0639f75s3glr9"; - }; - } - { - name = "microsoft.sourcelink.github"; - version = "1.1.0-beta-20206-02"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.github/1.1.0-beta-20206-02/microsoft.sourcelink.github.1.1.0-beta-20206-02.nupkg"; - sha256 = "0q1mgjjkwxvzn5v29pqiyg0j0jwi5qc0q04za9k1x138kliq2iba"; - }; - } - { - name = "microsoft.symboluploader.build.task"; - version = "1.1.145102"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.symboluploader.build.task/1.1.145102/microsoft.symboluploader.build.task.1.1.145102.nupkg"; - sha256 = "1nmd0cgj3kp2n1k8bzvvq7cfbpbrvk1k6mx9lpnzh1bv7v67rvm2"; - }; - } - { - name = "microsoft.visualstudio.sdk.embedinteroptypes"; - version = "15.0.15"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.sdk.embedinteroptypes/15.0.15/microsoft.visualstudio.sdk.embedinteroptypes.15.0.15.nupkg"; - sha256 = "0chr3slzzcanwcyd9isx4gichqzmfh4zd3h83piw0r4xsww1wmpd"; - }; - } - { - name = "microsoft.visualstudio.setup.configuration.interop"; - version = "1.16.30"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; - sha256 = "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4"; - }; - } - { - name = "microsoft.web.xdt"; - version = "3.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.web.xdt/3.0.0/microsoft.web.xdt.3.0.0.nupkg"; - sha256 = "18biff0hglccy34909zm9hc4lr9p8n2p155snq1dddp0av6m448n"; - }; - } - { - name = "microsoft.win32.primitives"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.0.1/microsoft.win32.primitives.4.0.1.nupkg"; - sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; - }; - } - { - name = "microsoft.win32.primitives"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; - sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; - }; - } - { - name = "microsoft.win32.registry"; - version = "4.5.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/4.5.0/microsoft.win32.registry.4.5.0.nupkg"; - sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; - }; - } - { - name = "netstandard.library"; - version = "1.6.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg"; - sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; - }; - } - { - name = "newtonsoft.json"; - version = "11.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/11.0.1/newtonsoft.json.11.0.1.nupkg"; - sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; - }; - } - { - name = "newtonsoft.json"; - version = "9.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg"; - sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; - }; - } - { - name = "nuget.build.tasks"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.build.tasks/5.9.1-rc.8/nuget.build.tasks.5.9.1-rc.8.nupkg"; - sha256 = "0610dh53gqmzbl70jxmn9jbvl0lv70qanis1q20rxnnyq6s2xb75"; - }; - } - { - name = "nuget.build.tasks.pack"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.build.tasks.pack/5.9.1-rc.8/nuget.build.tasks.pack.5.9.1-rc.8.nupkg"; - sha256 = "10qkdv165vz71z8ir3161ggaarbqk51gwg8n51iwxa5inz4y22lj"; - }; - } - { - name = "nuget.commandline"; - version = "4.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nuget.commandline/4.1.0/nuget.commandline.4.1.0.nupkg"; - sha256 = "03ik0rcdl7vdwxa9fx5cgl98yzb45swr08jmrnjk1ympjqvf94s1"; - }; - } - { - name = "nuget.commands"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.commands/5.9.1-rc.8/nuget.commands.5.9.1-rc.8.nupkg"; - sha256 = "0rdziczdkrqwl6wjqs4w29c460kc69v9z2pghqjlkag25c7hqwlr"; - }; - } - { - name = "nuget.common"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/5.9.1-rc.8/nuget.common.5.9.1-rc.8.nupkg"; - sha256 = "056b1h4fvik6z2qc2s6qzz0s4acbipc50af14fbr7hd9h2fxya4c"; - }; - } - { - name = "nuget.configuration"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/5.9.1-rc.8/nuget.configuration.5.9.1-rc.8.nupkg"; - sha256 = "0x8vigf0sfp6kf1i98xcr4k84vci596x16hmajdm0zgv3p1w2kvk"; - }; - } - { - name = "nuget.credentials"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.credentials/5.9.1-rc.8/nuget.credentials.5.9.1-rc.8.nupkg"; - sha256 = "128vsgz4rfrp17ys7vbc978y6inmvki93mswm82qvphxymsyrc6v"; - }; - } - { - name = "nuget.dependencyresolver.core"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/5.9.1-rc.8/nuget.dependencyresolver.core.5.9.1-rc.8.nupkg"; - sha256 = "1q9a97s1z3a6fb4p82ag2lqnzl53895prbqwlbvckdw9c3rpz3gc"; - }; - } - { - name = "nuget.frameworks"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/5.9.1-rc.8/nuget.frameworks.5.9.1-rc.8.nupkg"; - sha256 = "1n3mp9ns79yq4dwgj7h2av3b485mzgsw0qlj8z7p47krwlzp5hiv"; - }; - } - { - name = "nuget.librarymodel"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/5.9.1-rc.8/nuget.librarymodel.5.9.1-rc.8.nupkg"; - sha256 = "0sy8422c94wcg8ka85lnawq26mpixl79avk9m6y44lshrpga5v4v"; - }; - } - { - name = "nuget.packagemanagement"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packagemanagement/5.9.1-rc.8/nuget.packagemanagement.5.9.1-rc.8.nupkg"; - sha256 = "0mcxdqq3hfhxyn99pp5b5x2cd8rrmw6z616cbd9y0s9j0i6hm4pg"; - }; - } - { - name = "nuget.packaging"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/5.9.1-rc.8/nuget.packaging.5.9.1-rc.8.nupkg"; - sha256 = "0x9c3v741nn6m2xgidna88fa4xj5avhv6asj73hqv4pzpdprlrhv"; - }; - } - { - name = "nuget.projectmodel"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/5.9.1-rc.8/nuget.projectmodel.5.9.1-rc.8.nupkg"; - sha256 = "1xjh7isw467nkc7dkfj3wlw69vi2cns66z152jrzjdmxmia3i3pv"; - }; - } - { - name = "nuget.protocol"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/5.9.1-rc.8/nuget.protocol.5.9.1-rc.8.nupkg"; - sha256 = "1rnrxzaciqhhgwd4by0dhkvfrm1h161vvmkvlcwaz2589sqq2dzq"; - }; - } - { - name = "nuget.resolver"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.resolver/5.9.1-rc.8/nuget.resolver.5.9.1-rc.8.nupkg"; - sha256 = "0q6dqg0d5f9y7ynwqmzkzwl6yan94azvm0cd385k210y8wn4364v"; - }; - } - { - name = "nuget.versioning"; - version = "5.9.1-rc.8"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/5.9.1-rc.8/nuget.versioning.5.9.1-rc.8.nupkg"; - sha256 = "1vv7z122ilsk2rsvjm6j3hpifb45g8wa1mgnq1kwi9k8b2dbb6vv"; - }; - } - { - name = "perfolizer"; - version = "0.2.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/perfolizer/0.2.1/perfolizer.0.2.1.nupkg"; - sha256 = "012aqqi3y3nfikqmn26yajpwd52c04zlzp0p91iyslw7mf26qncy"; - }; - } - { - name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; - }; - } - { - name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; - }; - } - { - name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; - }; - } - { - name = "runtime.native.system"; - version = "4.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }; - } - { - name = "runtime.native.system"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }; - } - { - name = "runtime.native.system.io.compression"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg"; - sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; - }; - } - { - name = "runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }; - } - { - name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; - }; - } - { - name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; - }; - } - { - name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; - }; - } - { - name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; - }; - } - { - name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; - }; - } - { - name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; - }; - } - { - name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; - }; - } - { - name = "shouldly"; - version = "3.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/shouldly/3.0.0/shouldly.3.0.0.nupkg"; - sha256 = "1hg28w898kl84rx57sclb2z9b76v5hxlwxig1xnb6fr81aahzlw3"; - }; - } - { - name = "sn"; - version = "1.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/sn/1.0.0/sn.1.0.0.nupkg"; - sha256 = "1012fcdc6vq2355v86h434s6p2nnqgpdapb7p25l4h39g5q8p1qs"; - }; - } - { - name = "system.appcontext"; - version = "4.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg"; - sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; - }; - } - { - name = "system.appcontext"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg"; - sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; - }; - } - { - name = "system.buffers"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; - sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; - }; - } - { - name = "system.buffers"; - version = "4.4.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.4.0/system.buffers.4.4.0.nupkg"; - sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; - }; - } - { - name = "system.buffers"; - version = "4.5.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.0/system.buffers.4.5.0.nupkg"; - sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; - }; - } - { - name = "system.buffers"; - version = "4.5.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; - sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; - }; - } - { - name = "system.collections"; - version = "4.0.11"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.0.11/system.collections.4.0.11.nupkg"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }; - } - { - name = "system.collections"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }; - } - { - name = "system.collections.concurrent"; - version = "4.0.12"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg"; - sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; - }; - } - { - name = "system.collections.concurrent"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"; - sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; - }; - } - { - name = "system.collections.immutable"; - version = "1.2.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.2.0/system.collections.immutable.1.2.0.nupkg"; - sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; - }; - } - { - name = "system.collections.immutable"; - version = "1.5.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"; - sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; - }; - } - { - name = "system.collections.immutable"; - version = "5.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; - sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; - }; - } - { - name = "system.collections.nongeneric"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.nongeneric/4.0.1/system.collections.nongeneric.4.0.1.nupkg"; - sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; - }; - } - { - name = "system.configuration.configurationmanager"; - version = "4.7.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg"; - sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d"; - }; - } - { - name = "system.console"; - version = "4.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.console/4.0.0/system.console.4.0.0.nupkg"; - sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; - }; - } - { - name = "system.console"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.console/4.3.0/system.console.4.3.0.nupkg"; - sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; - }; - } - { - name = "system.diagnostics.debug"; - version = "4.0.11"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; - sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; - }; - } - { - name = "system.diagnostics.debug"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; - }; - } - { - name = "system.diagnostics.diagnosticsource"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; - sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; - }; - } - { - name = "system.diagnostics.fileversioninfo"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.fileversioninfo/4.3.0/system.diagnostics.fileversioninfo.4.3.0.nupkg"; - sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; - }; - } - { - name = "system.diagnostics.process"; - version = "4.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.1.0/system.diagnostics.process.4.1.0.nupkg"; - sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; - }; - } - { - name = "system.diagnostics.stacktrace"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.stacktrace/4.3.0/system.diagnostics.stacktrace.4.3.0.nupkg"; - sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; - }; - } - { - name = "system.diagnostics.tools"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg"; - sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; - }; - } - { - name = "system.diagnostics.tracesource"; - version = "4.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.0.0/system.diagnostics.tracesource.4.0.0.nupkg"; - sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; - }; - } - { - name = "system.diagnostics.tracing"; - version = "4.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg"; - sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; - }; - } - { - name = "system.diagnostics.tracing"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; - sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; - }; - } - { - name = "system.dynamic.runtime"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; - sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; - }; - } - { - name = "system.globalization"; - version = "4.0.11"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }; - } - { - name = "system.globalization"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }; - } - { - name = "system.globalization.calendars"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"; - sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; - }; - } - { - name = "system.io"; - version = "4.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.1.0/system.io.4.1.0.nupkg"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; - }; - } - { - name = "system.io"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }; - } - { - name = "system.io.compression"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg"; - sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; - }; - } - { - name = "system.io.compression.zipfile"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg"; - sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; - }; - } - { - name = "system.io.filesystem"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }; - } - { - name = "system.io.filesystem"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; - }; - } - { - name = "system.io.filesystem.primitives"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }; - } - { - name = "system.io.filesystem.primitives"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }; - } - { - name = "system.linq"; - version = "4.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.1.0/system.linq.4.1.0.nupkg"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; - }; - } - { - name = "system.linq"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.3.0/system.linq.4.3.0.nupkg"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; - }; - } - { - name = "system.linq.expressions"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; - sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; - }; - } - { - name = "system.management"; - version = "4.5.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.management/4.5.0/system.management.4.5.0.nupkg"; - sha256 = "19z5x23n21xi94bgl531l9hrm64nyw9d5fpd7klfvr5xfsbh9jwr"; - }; - } - { - name = "system.memory"; - version = "4.5.3"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.3/system.memory.4.5.3.nupkg"; - sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; - }; - } - { - name = "system.memory"; - version = "4.5.4"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.4/system.memory.4.5.4.nupkg"; - sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; - }; - } - { - name = "system.net.http"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.http/4.3.0/system.net.http.4.3.0.nupkg"; - sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; - }; - } - { - name = "system.net.primitives"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; - sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; - }; - } - { - name = "system.net.sockets"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; - sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; - }; - } - { - name = "system.numerics.vectors"; - version = "4.4.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; - sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; - }; - } - { - name = "system.numerics.vectors"; - version = "4.5.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; - sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; - }; - } - { - name = "system.objectmodel"; - version = "4.0.12"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; - }; - } - { - name = "system.objectmodel"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; - sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; - }; - } - { - name = "system.private.datacontractserialization"; - version = "4.1.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.datacontractserialization/4.1.1/system.private.datacontractserialization.4.1.1.nupkg"; - sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; - }; - } - { - name = "system.reflection"; - version = "4.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }; - } - { - name = "system.reflection"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }; - } - { - name = "system.reflection.emit"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }; - } - { - name = "system.reflection.emit"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }; - } - { - name = "system.reflection.emit.ilgeneration"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg"; - sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; - }; - } - { - name = "system.reflection.emit.lightweight"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg"; - sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; - }; - } - { - name = "system.reflection.emit.lightweight"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg"; - sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; - }; - } - { - name = "system.reflection.extensions"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; - }; - } - { - name = "system.reflection.extensions"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; - }; - } - { - name = "system.reflection.metadata"; - version = "1.6.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"; - sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; - }; - } - { - name = "system.reflection.metadata"; - version = "5.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; - sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; - }; - } - { - name = "system.reflection.primitives"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; - sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; - }; - } - { - name = "system.reflection.primitives"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }; - } - { - name = "system.reflection.typeextensions"; - version = "4.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }; - } - { - name = "system.resources.extensions"; - version = "4.6.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; - sha256 = "0inch9jgchgmsg3xjivbhh9mpin40mhdd8dgf4i1p3g42i0hzc0j"; - }; - } - { - name = "system.resources.reader"; - version = "4.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.reader/4.0.0/system.resources.reader.4.0.0.nupkg"; - sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; - }; - } - { - name = "system.resources.resourcemanager"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; - }; - } - { - name = "system.resources.resourcemanager"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }; - } - { - name = "system.runtime"; - version = "4.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }; - } - { - name = "system.runtime"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }; - } - { - name = "system.runtime.compilerservices.unsafe"; - version = "5.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg"; - sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; - }; - } - { - name = "system.runtime.extensions"; - version = "4.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; - sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; - }; - } - { - name = "system.runtime.extensions"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; - }; - } - { - name = "system.runtime.handles"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; - sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; - }; - } - { - name = "system.runtime.handles"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }; - } - { - name = "system.runtime.interopservices"; - version = "4.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }; - } - { - name = "system.runtime.interopservices"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }; - } - { - name = "system.runtime.interopservices.runtimeinformation"; - version = "4.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; - }; - } - { - name = "system.runtime.interopservices.runtimeinformation"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; - sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; - }; - } - { - name = "system.runtime.numerics"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; - }; - } - { - name = "system.runtime.serialization.primitives"; - version = "4.1.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; - }; - } - { - name = "system.runtime.serialization.xml"; - version = "4.1.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.xml/4.1.1/system.runtime.serialization.xml.4.1.1.nupkg"; - sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; - }; - } - { - name = "system.security.accesscontrol"; - version = "4.5.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg"; - sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; - }; - } - { - name = "system.security.accesscontrol"; - version = "4.7.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/4.7.0/system.security.accesscontrol.4.7.0.nupkg"; - sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; - }; - } - { - name = "system.security.cryptography.algorithms"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; - sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; - }; - } - { - name = "system.security.cryptography.encoding"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; - sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; - }; - } - { - name = "system.security.cryptography.primitives"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; - sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; - }; - } - { - name = "system.security.cryptography.x509certificates"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; - sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; - }; - } - { - name = "system.security.permissions"; - version = "4.7.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/4.7.0/system.security.permissions.4.7.0.nupkg"; - sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; - }; - } - { - name = "system.security.principal.windows"; - version = "4.5.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg"; - sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; - }; - } - { - name = "system.security.principal.windows"; - version = "4.7.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg"; - sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; - }; - } - { - name = "system.text.encoding"; - version = "4.0.11"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }; - } - { - name = "system.text.encoding"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }; - } - { - name = "system.text.encoding.codepages"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; - sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; - }; - } - { - name = "system.text.encoding.codepages"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.3.0/system.text.encoding.codepages.4.3.0.nupkg"; - sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; - }; - } - { - name = "system.text.encoding.extensions"; - version = "4.0.11"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }; - } - { - name = "system.text.encoding.extensions"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }; - } - { - name = "system.text.encodings.web"; - version = "4.7.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/4.7.0/system.text.encodings.web.4.7.0.nupkg"; - sha256 = "0sd3bihfar5rwm6nib4lhyys306nkm02qvk6p6sgzmnlfmma2wn3"; - }; - } - { - name = "system.text.json"; - version = "4.7.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/4.7.0/system.text.json.4.7.0.nupkg"; - sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; - }; - } - { - name = "system.text.regularexpressions"; - version = "4.1.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg"; - sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; - }; - } - { - name = "system.text.regularexpressions"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg"; - sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; - }; - } - { - name = "system.threading"; - version = "4.0.11"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.0.11/system.threading.4.0.11.nupkg"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }; - } - { - name = "system.threading"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }; - } - { - name = "system.threading.tasks"; - version = "4.0.11"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }; - } - { - name = "system.threading.tasks"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }; - } - { - name = "system.threading.tasks.dataflow"; - version = "4.9.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/4.9.0/system.threading.tasks.dataflow.4.9.0.nupkg"; - sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; - }; - } - { - name = "system.threading.tasks.extensions"; - version = "4.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }; - } - { - name = "system.threading.tasks.extensions"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }; - } - { - name = "system.threading.tasks.extensions"; - version = "4.5.2"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.2/system.threading.tasks.extensions.4.5.2.nupkg"; - sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; - }; - } - { - name = "system.threading.tasks.parallel"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.parallel/4.0.1/system.threading.tasks.parallel.4.0.1.nupkg"; - sha256 = "114wdg32hr46dfsnns3pgs67kcha5jn47p5gg0mhxfn5vrkr2p75"; - }; - } - { - name = "system.threading.tasks.parallel"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.parallel/4.3.0/system.threading.tasks.parallel.4.3.0.nupkg"; - sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; - }; - } - { - name = "system.threading.thread"; - version = "4.0.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg"; - sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; - }; - } - { - name = "system.threading.thread"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; - sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; - }; - } - { - name = "system.threading.timer"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.timer/4.0.1/system.threading.timer.4.0.1.nupkg"; - sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; - }; - } - { - name = "system.threading.timer"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg"; - sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; - }; - } - { - name = "system.valuetuple"; - version = "4.5.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; - sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; - }; - } - { - name = "system.xml.readerwriter"; - version = "4.0.11"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; - }; - } - { - name = "system.xml.readerwriter"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; - }; - } - { - name = "system.xml.xdocument"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg"; - sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; - }; - } - { - name = "system.xml.xmldocument"; - version = "4.0.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmldocument/4.0.1/system.xml.xmldocument.4.0.1.nupkg"; - sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; - }; - } - { - name = "system.xml.xmldocument"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmldocument/4.3.0/system.xml.xmldocument.4.3.0.nupkg"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; - }; - } - { - name = "system.xml.xmlserializer"; - version = "4.0.11"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmlserializer/4.0.11/system.xml.xmlserializer.4.0.11.nupkg"; - sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; - }; - } - { - name = "system.xml.xpath"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath/4.3.0/system.xml.xpath.4.3.0.nupkg"; - sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; - }; - } - { - name = "system.xml.xpath.xdocument"; - version = "4.3.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath.xdocument/4.3.0/system.xml.xpath.xdocument.4.3.0.nupkg"; - sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; - }; - } - { - name = "vswhere"; - version = "2.6.7"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/vswhere/2.6.7/vswhere.2.6.7.nupkg"; - sha256 = "0h4k5i96p7633zzf4xsv7615f9x72rr5qr7b9934ri2y6gshfcwk"; - }; - } - { - name = "xlifftasks"; - version = "1.0.0-beta.20502.2"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/xlifftasks/1.0.0-beta.20502.2/xlifftasks.1.0.0-beta.20502.2.nupkg"; - sha256 = "17k3dagcxhblzjbh00jsvc150rn7xqp3s3fw2qp1pyjj204y8a90"; - }; - } - { - name = "xunit"; - version = "2.4.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit/2.4.1/xunit.2.4.1.nupkg"; - sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; - }; - } - { - name = "xunit.abstractions"; - version = "2.0.3"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.abstractions/2.0.3/xunit.abstractions.2.0.3.nupkg"; - sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; - }; - } - { - name = "xunit.analyzers"; - version = "0.10.0"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.analyzers/0.10.0/xunit.analyzers.0.10.0.nupkg"; - sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; - }; - } - { - name = "xunit.assert"; - version = "2.4.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.assert/2.4.1/xunit.assert.2.4.1.nupkg"; - sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; - }; - } - { - name = "xunit.core"; - version = "2.4.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.core/2.4.1/xunit.core.2.4.1.nupkg"; - sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; - }; - } - { - name = "xunit.extensibility.core"; - version = "2.4.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.extensibility.core/2.4.1/xunit.extensibility.core.2.4.1.nupkg"; - sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; - }; - } - { - name = "xunit.extensibility.execution"; - version = "2.4.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.extensibility.execution/2.4.1/xunit.extensibility.execution.2.4.1.nupkg"; - sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; - }; - } - { - name = "xunit.runner.console"; - version = "2.4.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.runner.console/2.4.1/xunit.runner.console.2.4.1.nupkg"; - sha256 = "13ykz9anhz72xc4q6byvdfwrp54hlcbl6zsfapwfhnzyvfgb9w13"; - }; - } - { - name = "xunit.runner.visualstudio"; - version = "2.4.3"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.runner.visualstudio/2.4.3/xunit.runner.visualstudio.2.4.3.nupkg"; - sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; - }; - } +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.12.1"; hash = "sha256-vISVlxTg4nhyRd1Jw+EwzGK7jabO+dQYnBScDVRAE3I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/benchmarkdotnet/0.12.1/benchmarkdotnet.0.12.1.nupkg"; }) + (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.12.1"; hash = "sha256-g1M3JNIgAsL1g7oEISRf5mMsYkO2uJfWBkglc9tHOxg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/benchmarkdotnet.annotations/0.12.1/benchmarkdotnet.annotations.0.12.1.nupkg"; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.4.3"; hash = "sha256-pTyYP26uXXLe6ejCb/yVYpb23ad/Dkl2Ka8NWwQeiqk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/commandlineparser/2.4.3/commandlineparser.2.4.3.nupkg"; }) + (fetchNuGet { pname = "FSharp.NET.Sdk"; version = "1.0.4-bundled-0100"; hash = "sha256-6FC2zLqwF0bydu8d2uiH1McIy0af/NrZ//hf4xdvHho="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/fsharp.net.sdk/1.0.4-bundled-0100/fsharp.net.sdk.1.0.4-bundled-0100.nupkg"; }) + (fetchNuGet { pname = "Iced"; version = "1.4.0"; hash = "sha256-yQ7xTIeuZCo5WotGbkWuw7/hyAf/6sukdtuURRkQFNE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/iced/1.4.0/iced.1.4.0.nupkg"; }) + (fetchNuGet { pname = "ILLink.Tasks"; version = "0.1.6-prerelease.20175.2"; hash = "sha256-/yDCjUVz3RstltoUDOcYEwNyGeLWAviiG7YUURGZjmg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/7d9f5c21-0d79-403f-bfe3-9a4506529760/nuget/v3/flat2/illink.tasks/0.1.6-prerelease.20175.2/illink.tasks.0.1.6-prerelease.20175.2.nupkg"; }) + (fetchNuGet { pname = "jnm2.ReferenceAssemblies.net35"; version = "1.0.1"; hash = "sha256-7Kgh/lQW1wxa76vecVxmG/8JNBvMz766lxazyL+mt4E="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/jnm2.referenceassemblies.net35/1.0.1/jnm2.referenceassemblies.net35.1.0.1.nupkg"; }) + (fetchNuGet { pname = "LargeAddressAware"; version = "1.0.5"; hash = "sha256-IQnTkOHBsic3HDa7TwfQtwwbowHG/iWQd6tkPuqAUkM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/largeaddressaware/1.0.5/largeaddressaware.1.0.5.nupkg"; }) + (fetchNuGet { pname = "MicroBuild.Core"; version = "0.2.0"; hash = "sha256-JIVBO1hWtK955RmtghoXqn6S9rb2G69Id92vqWUhmmA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microbuild.core/0.2.0/microbuild.core.0.2.0.nupkg"; }) + (fetchNuGet { pname = "MicroBuild.Core.Sentinel"; version = "1.0.0"; hash = "sha256-Efk2JFokIgDHw8G3sSsBs2990adCCItAoPiq6UrHsww="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microbuild.core.sentinel/1.0.0/microbuild.core.sentinel.1.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; hash = "sha256-QYVojfqSZKbF8P6D/aacfxfumMaRUD9SEEQbzw73Bbc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.1.1.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build"; version = "14.3.0"; hash = "sha256-P4NszYl1VU6+2hWB64Y7Jy1mw/HA0kul5iD2ju6wVf0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/14.3.0/microsoft.build.14.3.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.CentralPackageVersions"; version = "2.0.1"; hash = "sha256-sxSrG4+xzZVP2YtJYYCpHGa0pCAPmZCQRhilJaSKkp0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.centralpackageversions/2.0.1/microsoft.build.centralpackageversions.2.0.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "14.3.0"; hash = "sha256-zSmVu5u/oec5XVHsbwviR5joITIC5uZGWXfk1U4M/mQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/14.3.0/microsoft.build.framework.14.3.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "15.5.180"; hash = "sha256-XyTJ3tn+vOc5rH4Pux1MjswRia6ei5bqTX3GEI4anhg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/15.5.180/microsoft.build.framework.15.5.180.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.NuGetSdkResolver"; version = "5.9.1-rc.8"; hash = "sha256-DaH2rPBY32UWK1M2odPiRVF/NnmrrnvBtxTnI6ia/bU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.nugetsdkresolver/5.9.1-rc.8/microsoft.build.nugetsdkresolver.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.0-beta-20206-02"; hash = "sha256-nbFnPIifuevbeOCkPuCirofjqDLi+CnxYUXvSfGGlL8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.build.tasks.git/1.1.0-beta-20206-02/microsoft.build.tasks.git.1.1.0-beta-20206-02.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "14.3.0"; hash = "sha256-awZNRydsILpI8xtA/zI8WbHTDuQcq220nt+K0K22oQw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/14.3.0/microsoft.build.utilities.core.14.3.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "15.5.180"; hash = "sha256-YJiW2bLfrkOFvQ8toWDGyPodrmjlIkshWyixhxWUizA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/15.5.180/microsoft.build.utilities.core.15.5.180.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.6.1"; hash = "sha256-1+FV3KvwerZsknecHZhdDACsPKaWrbQQeN27BAcZk94="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/2.6.1/microsoft.codeanalysis.analyzers.2.6.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Build.Tasks"; version = "3.9.0-5.21112.8"; hash = "sha256-h1UrpcVKxFQkmX4bHrsZGlJ2wB5X+dwREtiHu++sm6M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.build.tasks/3.9.0-5.21112.8/microsoft.codeanalysis.build.tasks.3.9.0-5.21112.8.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "2.10.0"; hash = "sha256-UikMFW/dcSiKfsUqnn2hvguLJN7gw1e01WpWmHEHydA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/2.10.0/microsoft.codeanalysis.common.2.10.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "2.10.0"; hash = "sha256-szdSweIavn5BBPZgM8uE4j1WrvTfMqF/4yqzgLJeSmk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.csharp/2.10.0/microsoft.codeanalysis.csharp.2.10.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.6.1"; hash = "sha256-NI+9eizIs3mrCNAw058DZvRzxpCAdoL3SKth6iypzgU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codecoverage/16.6.1/microsoft.codecoverage.16.6.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.61701"; hash = "sha256-ITNO2LJYyWhYs3A/iqfoaW6ddvkuuBVXQ5YSKQ8wgcU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diagnostics.netcore.client/0.2.61701/microsoft.diagnostics.netcore.client.0.2.61701.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "1.1.57604"; hash = "sha256-Ubu6a+qKwstY6v7Oywg1izAwgLZOnvv5ZjcmOJ5+qb4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diagnostics.runtime/1.1.57604/microsoft.diagnostics.runtime.1.1.57604.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "2.0.49"; hash = "sha256-SUkXJTeA+Ctk+MlxY5QAThL6d+mBIz+gKJ0RlShKnCM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diagnostics.tracing.traceevent/2.0.49/microsoft.diagnostics.tracing.traceevent.2.0.49.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "5.0.0-beta.21226.1"; hash = "sha256-g0R3wc9SZryUvgu5fB5WwyLEcQsPYbrqa4qylNpn97Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/5.0.0-beta.21226.1/microsoft.dotnet.arcade.sdk.5.0.0-beta.21226.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DotNet.MSBuildSdkResolver"; version = "5.0.300-servicing.21267.11"; hash = "sha256-5S7nvtosI97MPWxHaxBManc70Dp1e9Ycbta9C6cS78k="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a8a526e9-91b3-4569-ba2d-ff08dbb7c110/nuget/v3/flat2/microsoft.dotnet.msbuildsdkresolver/5.0.300-servicing.21267.11/microsoft.dotnet.msbuildsdkresolver.5.0.300-servicing.21267.11.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; hash = "sha256-vrZhYp94SjycUMGaVYCFWJ4p7KBKfqVyLWtIG73fzeM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.dotnet.platformabstractions/2.1.0/microsoft.dotnet.platformabstractions.2.1.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DotNet.SignTool"; version = "5.0.0-beta.21226.1"; hash = "sha256-cr0QbHmpSj7zhg3y0bMudugkInppcdSlDTHFYRExo8k="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.signtool/5.0.0-beta.21226.1/microsoft.dotnet.signtool.5.0.0-beta.21226.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.Build.Extensions"; version = "3.1.400-preview.20365.20"; hash = "sha256-pUGvWPLzNQEIDhdCbkv+qnU1e9QS477moiFree6RrO4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.build.extensions/3.1.400-preview.20365.20/microsoft.net.build.extensions.3.1.400-preview.20365.20.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Net.Compilers.Toolset"; version = "3.9.0-5.21112.8"; hash = "sha256-MDxQi3QVFfvA5bcOblCm/ypHSe6WqpGb0ZD65NXrLLc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/3.9.0-5.21112.8/microsoft.net.compilers.toolset.3.9.0-5.21112.8.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.Sdk"; version = "3.1.400-preview.20365.20"; hash = "sha256-XiBnkAuLbDXE3qNKswDW5bJ+2/lOTM0Jotwwq7OxVgk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk/3.1.400-preview.20365.20/microsoft.net.sdk.3.1.400-preview.20365.20.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.Sdk.Publish"; version = "3.1.300-servicing.20216.7"; hash = "sha256-gVym+TG4pekotsouOrEup8dkYYLPFeNIqzN/cWHEO/Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk.publish/3.1.300-servicing.20216.7/microsoft.net.sdk.publish.3.1.300-servicing.20216.7.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.Sdk.Razor"; version = "3.1.6"; hash = "sha256-KqYNpuT8B01liMwZLBLZoLucTt3uVYR3zE4UTEH8gO8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.sdk.razor/3.1.6/microsoft.net.sdk.razor.3.1.6.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.Sdk.Web"; version = "3.1.300-servicing.20216.7"; hash = "sha256-oWSmOGSjhfiRXcJYRKQK0GuBfgkpxlZ6WRtwzqNoMgA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk.web/3.1.300-servicing.20216.7/microsoft.net.sdk.web.3.1.300-servicing.20216.7.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.Sdk.Web.ProjectSystem"; version = "3.1.300-servicing.20216.7"; hash = "sha256-VE0CiduLOC3KT0D4pqaWGrSSzF6rvd6dQhAFanqsARg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk.web.projectsystem/3.1.300-servicing.20216.7/microsoft.net.sdk.web.projectsystem.3.1.300-servicing.20216.7.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.6.1"; hash = "sha256-G9Z/50Ycr4GxkyxV+a04JzOaAuvDEXO+2NcwiQx5TUo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.test.sdk/16.6.1/microsoft.net.test.sdk.16.6.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; hash = "sha256-6faPQ4jaFY3OGGVk3lZKW+DEZaIOBZ/wHqbiDTsRR1k="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net45"; version = "1.0.0"; hash = "sha256-m5521kl7/G0DKFKOtQ9fzIhqPrpPR82r099m+UF06sY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net45/1.0.0/microsoft.netframework.referenceassemblies.net45.1.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.0"; hash = "sha256-LI/XnqGb0Dzs5A7ZK3uv3gJPh8c6vOvj7/jabgW2Ea8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.0/microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.AzureRepos.Git"; version = "1.1.0-beta-20206-02"; hash = "sha256-xbwMpGdH9cr6ssddH10lg64jCR465IdDubb80RCUDgI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.azurerepos.git/1.1.0-beta-20206-02/microsoft.sourcelink.azurerepos.git.1.1.0-beta-20206-02.nupkg"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.0-beta-20206-02"; hash = "sha256-KdM3dDkuDQNUQyaBVyEyCCwnp/pZxMnYDXLsfhWYYOM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.common/1.1.0-beta-20206-02/microsoft.sourcelink.common.1.1.0-beta-20206-02.nupkg"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.0-beta-20206-02"; hash = "sha256-akWBI51ohB5mUp8ADBgukUsgwfMR3yR2sX93PqV8NWA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.github/1.1.0-beta-20206-02/microsoft.sourcelink.github.1.1.0-beta-20206-02.nupkg"; }) + (fetchNuGet { pname = "Microsoft.SymbolUploader.Build.Task"; version = "1.1.145102"; hash = "sha256-ou58zD57BfjtpalXM8Pced3l2MF7/4VmsOLOIR8Drdo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.symboluploader.build.task/1.1.145102/microsoft.symboluploader.build.task.1.1.145102.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.SDK.EmbedInteropTypes"; version = "15.0.15"; hash = "sha256-7VYeONedZMDjHQiO9gl09WPI4iNdx9Q841ax/6keGTI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.sdk.embedinteroptypes/15.0.15/microsoft.visualstudio.sdk.embedinteroptypes.15.0.15.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.16.30"; hash = "sha256-5IGlN0Nmp6887dxLgV0O3eFbXtertrU2xaztAToVApA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Web.Xdt"; version = "3.0.0"; hash = "sha256-FhFSzVbgttYCtrqUcIVFN2VKGEz1J5DI8IzRB4FzcaE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.web.xdt/3.0.0/microsoft.web.xdt.3.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; hash = "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.0.1/microsoft.win32.primitives.4.0.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; hash = "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/4.5.0/microsoft.win32.registry.4.5.0.nupkg"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.1"; hash = "sha256-lbR7rpS/EXgJ8TqQspuIIqAsiorrZb1oOK4HFw+QyPw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/11.0.1/newtonsoft.json.11.0.1.nupkg"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg"; }) + (fetchNuGet { pname = "NuGet.Build.Tasks"; version = "5.9.1-rc.8"; hash = "sha256-5awutMHe2p6BwEFHqzA4mwK6l0y2dgkOXb/iNwpsIBg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.build.tasks/5.9.1-rc.8/nuget.build.tasks.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.Build.Tasks.Pack"; version = "5.9.1-rc.8"; hash = "sha256-kgrhybexqM5jKBY9/kKZeGWl3gsmjBzRD+fvYsJuE4M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.build.tasks.pack/5.9.1-rc.8/nuget.build.tasks.pack.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.CommandLine"; version = "4.1.0"; hash = "sha256-QZPkNpa3+jClzVUikLkuZH2PEn2sdJdU520f2lgGMw4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nuget.commandline/4.1.0/nuget.commandline.4.1.0.nupkg"; }) + (fetchNuGet { pname = "NuGet.Commands"; version = "5.9.1-rc.8"; hash = "sha256-mXIMDyviqUklhu+Kn3YybAJDWBKcaCy5oRzn2T6Lv2U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.commands/5.9.1-rc.8/nuget.commands.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "5.9.1-rc.8"; hash = "sha256-jCjfnYCpwZOXI8EpUNiNiymiwf/YaMGw+GbG7QgMyxQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/5.9.1-rc.8/nuget.common.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "5.9.1-rc.8"; hash = "sha256-c0/Bwx37fVCbVBWa0E0qkW2CJsmsoxSDm+Y6DdyLG3U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/5.9.1-rc.8/nuget.configuration.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.Credentials"; version = "5.9.1-rc.8"; hash = "sha256-27DsdfUd3o0FqlzXkeLc1Ubj0Uls7aP9CTe7TP7TG4k="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.credentials/5.9.1-rc.8/nuget.credentials.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "5.9.1-rc.8"; hash = "sha256-7I1/82CJt8n2ohyvfEtCo9BvMRVPCXTJckaNH/RJKuE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/5.9.1-rc.8/nuget.dependencyresolver.core.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.9.1-rc.8"; hash = "sha256-O8JyP+V5HnLPR5JiwPX7tSCyxlYCHvl4I9ino226ddg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/5.9.1-rc.8/nuget.frameworks.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.LibraryModel"; version = "5.9.1-rc.8"; hash = "sha256-m+yi3s1QU0K8qWlulQ7t8VYjMFeWFqQmeoyTxIQgyGs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/5.9.1-rc.8/nuget.librarymodel.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.PackageManagement"; version = "5.9.1-rc.8"; hash = "sha256-75IKTQQyaeBTW8wE8w2vOaPGRC+r3JuS9R06ODBunVU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packagemanagement/5.9.1-rc.8/nuget.packagemanagement.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "5.9.1-rc.8"; hash = "sha256-G2aab7v/ko3hOFIrs+FWRXaiHELKtvi6qMbaQM4eLHU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/5.9.1-rc.8/nuget.packaging.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.9.1-rc.8"; hash = "sha256-+444VKy9NvmzFCV8Y7RlIu5kOOVDutkOm/YYwnU8UPY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/5.9.1-rc.8/nuget.projectmodel.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "5.9.1-rc.8"; hash = "sha256-+DeBsU6oiK84o3vWvYMJMNTs9oQN+EUafxDiyNTv2eY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/5.9.1-rc.8/nuget.protocol.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.Resolver"; version = "5.9.1-rc.8"; hash = "sha256-m5hBLEceBDELGo2Bur8iySpvKP/zV8ytPz650sDDzWA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.resolver/5.9.1-rc.8/nuget.resolver.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "5.9.1-rc.8"; hash = "sha256-e5u1mlhopshnwPbVoDh6hSwXLxzSVLl1FlPTKET4Z+8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/5.9.1-rc.8/nuget.versioning.5.9.1-rc.8.nupkg"; }) + (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; hash = "sha256-nllshKuHU+1jSBfcTz8BTJTGr1TeCFvxjM4OPyLGSgQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/perfolizer/0.2.1/perfolizer.0.2.1.nupkg"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "Shouldly"; version = "3.0.0"; hash = "sha256-g9MPlQooO7NsDy92Tjss25yVvliU6VN6JohOlBBH4sE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/shouldly/3.0.0/shouldly.3.0.0.nupkg"; }) + (fetchNuGet { pname = "sn"; version = "1.0.0"; hash = "sha256-GoeLcHlpQEKLuGdd1e7D1oprNBkEGrRLGQJvwxpzIoA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/sn/1.0.0/sn.1.0.0.nupkg"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; hash = "sha256-KTxAhYawFG2V5VX1jw3pzx3IrQXRgn1TsvgjPgxAbqA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.4.0/system.buffers.4.4.0.nupkg"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; hash = "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.0/system.buffers.4.5.0.nupkg"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.0.11/system.collections.4.0.11.nupkg"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; hash = "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.2.0"; hash = "sha256-FQ3l+ulbLSPhQ0JcQCC4D4SzjTnHsRqcOj56Ywy7pMo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.2.0/system.collections.immutable.1.2.0.nupkg"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; hash = "sha256-BliqYlL9ntbMXo5d7NUrKXwYN+PqdyqDIS5bp4qVr7Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.0.1"; hash = "sha256-jdCVXmGOsJ+2F0xAagCkiMZ91SGAm9iOhO2u4ksmKaU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.nongeneric/4.0.1/system.collections.nongeneric.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.7.0"; hash = "sha256-rYjp/UmagI4ZULU1ocia/AiXxLNL8uhMV8LBF4QFW10="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg"; }) + (fetchNuGet { pname = "System.Console"; version = "4.0.0"; hash = "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.console/4.0.0/system.console.4.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.console/4.3.0/system.console.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.FileVersionInfo"; version = "4.3.0"; hash = "sha256-JyqOf5/lsUNLMpIqK8XffcFTxB6vHWzGWHssmojokCQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.fileversioninfo/4.3.0/system.diagnostics.fileversioninfo.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.1.0"; hash = "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.1.0/system.diagnostics.process.4.1.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.StackTrace"; version = "4.3.0"; hash = "sha256-Tfq7F61N0VfujVyI5A9MZvyWewQ5HepB1f1UMBMkUCs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.stacktrace/4.3.0/system.diagnostics.stacktrace.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.0.0"; hash = "sha256-cCjdPU7ow91HGf1hBIOLJMQGO6pNmF+N+5/Z38XJh9U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.0.0/system.diagnostics.tracesource.4.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; hash = "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.1.0/system.io.4.1.0.nupkg"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.1.0/system.linq.4.1.0.nupkg"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.3.0/system.linq.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Management"; version = "4.5.0"; hash = "sha256-mcsEl3a95O3oPO260hL3lpiaYaJhFPoWSbEHYYfo5ac="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.management/4.5.0/system.management.4.5.0.nupkg"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.3/system.memory.4.5.3.nupkg"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.4/system.memory.4.5.4.nupkg"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.http/4.3.0/system.net.http.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.1.1"; hash = "sha256-OaE+ZcEfkpIkbdMOMAMiJa9vgiVP25FGuFrf+N/mafY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.datacontractserialization/4.1.1/system.private.datacontractserialization.4.1.1.nupkg"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; }) + (fetchNuGet { pname = "System.Resources.Extensions"; version = "4.6.0"; hash = "sha256-ErAPQRTkjRsica+h1mAFxMZbE4RrR9nH0/VB9mSCzEY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; }) + (fetchNuGet { pname = "System.Resources.Reader"; version = "4.0.0"; hash = "sha256-NOax26EYc/L4bfedL2a33fg4sFXVkBwzVTQ41saJTsk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.reader/4.0.0/system.resources.reader.4.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; hash = "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; hash = "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.1.1"; hash = "sha256-Mx/8hiqvp1E4I6ysJC3U8D2B9qhRQcVvEOivV6w65IQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.xml/4.1.1/system.runtime.serialization.xml.4.1.1.nupkg"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; hash = "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; hash = "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/4.7.0/system.security.accesscontrol.4.7.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "4.7.0"; hash = "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/4.7.0/system.security.permissions.4.7.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; hash = "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; hash = "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.0.1"; hash = "sha256-wxtwWQSTv5tuFP79KhUAhaL6bL4d8lSzSWkCn9aolwM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.3.0"; hash = "sha256-ezYVwe9atRkREc8O/HT/VfGDE2vuCpIckOfdY194/VE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.3.0/system.text.encoding.codepages.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.0"; hash = "sha256-w3KhanXU1v+0uWZuLECd1oChvYeUrGhN5blk5WBco2k="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/4.7.0/system.text.encodings.web.4.7.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.7.0"; hash = "sha256-ubmcBH9pNdILnROdpGfnfo90WijLE6bUbKUypn3u4zo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/4.7.0/system.text.json.4.7.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.0.11/system.threading.4.0.11.nupkg"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.9.0"; hash = "sha256-ZTZBJTrP5kzO38ec9lPxuNUYgEoeGNdQ8hF98uRN2rw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/4.9.0/system.threading.tasks.dataflow.4.9.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.2"; hash = "sha256-EqJF9TppMHTKvpR6emrdA61zalMW3HwrZ7j6Bn4bBuo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.2/system.threading.tasks.extensions.4.5.2.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Parallel"; version = "4.0.1"; hash = "sha256-5VyRZ97Fug4reK/cQ6wsCrJ5jH53aGu1a4ZkKMZrnIQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.parallel/4.0.1/system.threading.tasks.parallel.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Parallel"; version = "4.3.0"; hash = "sha256-8H2vRmsn29MNfMmCeIL5vHfbM19jWaLDKNLzDonCI+c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.parallel/4.3.0/system.threading.tasks.parallel.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; hash = "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; hash = "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; hash = "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.timer/4.0.1/system.threading.timer.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.0.1"; hash = "sha256-gdoFrPo54v1LjkBF79f8EvtltVVjHz9ZI9kc5ve0GkY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmldocument/4.0.1/system.xml.xmldocument.4.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; hash = "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmldocument/4.3.0/system.xml.xmldocument.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.0.11"; hash = "sha256-v6x4d6W18dijG5cDqQmVHdtWRf6Y4OkdBolT3d5g3wY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmlserializer/4.0.11/system.xml.xmlserializer.4.0.11.nupkg"; }) + (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; hash = "sha256-kd1JMqj6obhxzEPRJeYvcUyJqkOs/9A0UOQccC6oYrM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath/4.3.0/system.xml.xpath.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Xml.XPath.XDocument"; version = "4.3.0"; hash = "sha256-dqk4CWuwocj5qsUAYlS+XAe6GGcY/N/HIPEGe5afrPM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath.xdocument/4.3.0/system.xml.xpath.xdocument.4.3.0.nupkg"; }) + (fetchNuGet { pname = "vswhere"; version = "2.6.7"; hash = "sha256-kzMH9TNexExGSutkXHIWpydXgjlbd+L+H8Oca1Isk0A="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/vswhere/2.6.7/vswhere.2.6.7.nupkg"; }) + (fetchNuGet { pname = "XliffTasks"; version = "1.0.0-beta.20502.2"; hash = "sha256-ICnkCRBS+hsuFtwNPS7ux2ZQAttaAgCX/HTBzp5qY54="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/xlifftasks/1.0.0-beta.20502.2/xlifftasks.1.0.0-beta.20502.2.nupkg"; }) + (fetchNuGet { pname = "xunit"; version = "2.4.1"; hash = "sha256-QGDuE0ZnsxyEJONP8GcJ80PmPeb+OawwdSW8y72aw3U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit/2.4.1/xunit.2.4.1.nupkg"; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.abstractions/2.0.3/xunit.abstractions.2.0.3.nupkg"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; hash = "sha256-8lRZhogXHYksa9ChnkFXpBnTMlLlYIvu3Av7qQYWwJY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.analyzers/0.10.0/xunit.analyzers.0.10.0.nupkg"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; hash = "sha256-hl1cMSakAlwkpFEchxCNMdvQie6PMJ1uFrhzgOC3vsY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.assert/2.4.1/xunit.assert.2.4.1.nupkg"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; hash = "sha256-KgUgAIJIPHQ5VQ4FiB+i5u2JXSYxmvMCV8zXP4kcy9o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.core/2.4.1/xunit.core.2.4.1.nupkg"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; hash = "sha256-oACVOrvF4XmKFr+8ZqPVpjbopZgeRwaXveJGW2XUeIA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.extensibility.core/2.4.1/xunit.extensibility.core.2.4.1.nupkg"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; hash = "sha256-KmKEdgsUq4zuQJ2saJA0YT1CIZ2AuhZL5V7cF2Cncd0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.extensibility.execution/2.4.1/xunit.extensibility.execution.2.4.1.nupkg"; }) + (fetchNuGet { pname = "xunit.runner.console"; version = "2.4.1"; hash = "sha256-I/C0ntv+W+j4VU5/QxejkJSbuWvbL4MJ6+J8aFX6048="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.runner.console/2.4.1/xunit.runner.console.2.4.1.nupkg"; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.3"; hash = "sha256-42axn0yDDiJWKV8UEYzYWgiKbpc6mHh9M/eeylYGLUg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.runner.visualstudio/2.4.3/xunit.runner.visualstudio.2.4.3.nupkg"; }) ] diff --git a/pkgs/development/tools/build-managers/muon/default.nix b/pkgs/development/tools/build-managers/muon/default.nix deleted file mode 100644 index a479dd23d29be..0000000000000 --- a/pkgs/development/tools/build-managers/muon/default.nix +++ /dev/null @@ -1,139 +0,0 @@ -{ lib -, stdenv -, fetchFromSourcehut -, fetchurl -, curl -, libarchive -, libpkgconf -, pkgconf -, python3 -, samurai -, scdoc -, zlib -, embedSamurai ? false -, buildDocs ? true -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "muon" - + lib.optionalString embedSamurai "-embedded-samurai"; - version = "0.2.0"; - - src = fetchFromSourcehut { - name = "muon-src"; - owner = "~lattis"; - repo = "muon"; - rev = finalAttrs.version; - hash = "sha256-ZHWyUV/BqM3ihauXDqDVkZURDDbBiRcEzptyGQmw94I="; - }; - - outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ]; - - nativeBuildInputs = [ - pkgconf - samurai - ] - ++ lib.optionals buildDocs [ - (python3.withPackages (ps: [ ps.pyyaml ])) - scdoc - ]; - - buildInputs = [ - curl - libarchive - libpkgconf - samurai - zlib - ]; - - strictDeps = true; - - postUnpack = let - # URLs manually extracted from subprojects directory - meson-docs-wrap = fetchurl { - name = "meson-docs-wrap"; - url = "https://mochiro.moe/wrap/meson-docs-1.0.1-19-gdd8d4ee22.tar.gz"; - hash = "sha256-jHSPdLFR5jUeds4e+hLZ6JOblor5iuCV5cIwoc4K9gI="; - }; - - samurai-wrap = fetchurl { - name = "samurai-wrap"; - url = "https://mochiro.moe/wrap/samurai-1.2-32-g81cef5d.tar.gz"; - hash = "sha256-aPMAtScqweGljvOLaTuR6B0A0GQQQrVbRviXY4dpCoc="; - }; - in '' - pushd $sourceRoot/subprojects - ${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap}"} - ${lib.optionalString embedSamurai "tar xvf ${samurai-wrap}"} - popd - ''; - - postPatch = '' - patchShebangs bootstrap.sh - '' - + lib.optionalString buildDocs '' - patchShebangs subprojects/meson-docs/docs/genrefman.py - ''; - - # tests try to access "~" - postConfigure = '' - export HOME=$(mktemp -d) - ''; - - buildPhase = let - muonBool = lib.mesonBool; - muonEnable = lib.mesonEnable; - - cmdlineForMuon = lib.concatStringsSep " " [ - (muonBool "static" stdenv.targetPlatform.isStatic) - (muonEnable "docs" buildDocs) - (muonEnable "samurai" embedSamurai) - ]; - cmdlineForSamu = "-j$NIX_BUILD_CORES"; - in '' - runHook preBuild - - ./bootstrap.sh stage-1 - - ./stage-1/muon setup ${cmdlineForMuon} stage-2 - samu ${cmdlineForSamu} -C stage-2 - - stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3 - samu ${cmdlineForSamu} -C stage-3 - - runHook postBuild - ''; - - # tests are failing because they don't find Python - doCheck = false; - - checkPhase = '' - runHook preCheck - - ./stage-3/muon -C stage-3 test - - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - - stage-3/muon -C stage-3 install - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://muon.build/"; - description = "Implementation of Meson build system in C99"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; # typical `ar failure` - mainProgram = "muon"; - }; -}) -# TODO LIST: -# 1. automate sources acquisition (especially wraps) -# 2. setup hook -# 3. tests diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index ca64753cedbff..651bc16be06bc 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,7 +3,7 @@ writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }: let - version = "3.23.0"; + version = "3.24.0"; owner = "erlang"; deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; }; rebar3 = stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ let inherit owner; repo = pname; rev = version; - sha256 = "dLJ1ca7Tlx6Cfk/AyJ0HmAgH9+qRrto/m0GWWUeXNko="; + sha256 = "OhzgDipFhscHtRGlfc33ZewBgHgQLa9Zhjby/r1m49A="; }; buildInputs = [ erlang ]; diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix index 21bb25c2e3086..7f6be584098d7 100644 --- a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix +++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -1,6 +1,6 @@ # Generated by rebar3_nix let fetchOnly = { src, ... }: src; -in { builder ? fetchOnly, fetchHex, fetchgit, overrides ? (x: y: { }), ... }: +in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }: let self = packages // (overrides self packages); packages = with self; { diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix deleted file mode 100644 index e6a68c4215c37..0000000000000 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{lib, stdenv, fetchFromGitHub, perl }: - -stdenv.mkDerivation rec { - pname = "redo"; - version = "1.4"; - src = fetchFromGitHub { - owner = "jdebp"; - repo = "redo"; - rev = "91f5462339ef6373f9ac80902cfae2b614e2902b"; - hash = "sha256-cA8UN4aQnJ8VyMW3mDOIPna4Ucw1kp8CirZTDhSoCpU="; - }; - - nativeBuildInputs = [ perl /* for pod2man */ ]; - - buildPhase = '' - package/compile - ''; - installPhase = '' - package/export $out/ - ''; - - meta = { - homepage = "https://jdebp.eu./Softwares/redo/"; - description = "System for building target files from source files"; - license = lib.licenses.bsd2; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 7c44671a3b440..385cfc5c087ae 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "ed4bce34420650fbc06cc161f1960b539f19289d"; - version = "2024-07-10"; + rev = "408f74841b90169a7f674955389212e2d02f7f4d"; + version = "2024-09-28"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "lsYFupTSZQe2id0wuy+E7lszG4IT3R6fuo+Yql91MkM="; + sha256 = "2iXNs2Ks54Gj6T6PR5AtWrmR9uUxgFScAfek2v+qdTo="; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 3977d5b184410..8b6f3335962eb 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -9,20 +9,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-R/6YzpSY7kbmnyJnLzwSI0y+fnGedkQQoT5YtyXWWfM="; + hash = "sha256-pxbdAYvWi8epWi3RAzdmOqdvRDrWyZ3qvl6t0a38djk="; }; postPatch = '' echo -java-home ${jre.home} >>conf/sbtopts ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc # libstdc++.so.6 zlib ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { cp -ra . $out/share/sbt ln -sT ../share/sbt/bin/sbt $out/bin/sbt ln -sT ../share/sbt/bin/sbtn-${ - if (stdenv.isDarwin) then "universal-apple-darwin" + if (stdenv.hostPlatform.isDarwin) then "universal-apple-darwin" else if (stdenv.hostPlatform.isAarch64) then "aarch64-pc-linux" else "x86_64-pc-linux" } $out/bin/sbtn diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 5e2058899393c..3a0eb79b24303 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { inherit pname version; nativeBuildInputs = [ installShellFiles makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = assert lib.assertMsg (lib.versionAtLeast jre.version "17.0.0") '' scala-cli requires Java 17 or newer, but ${jre.name} is ${jre.version} @@ -54,7 +54,7 @@ stdenv.mkDerivation { # We need to call autopatchelf before generating completions dontAutoPatchelf = true; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' autoPatchelf $out '' + '' # hack to ensure the completion function looks right diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 184c038beae4a..073ca4ac017f9 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -1,48 +1,35 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, lua -, readline -, ncurses -, lz4 -, tbox -, xmake-core-sv +{ + lib, + stdenv, + fetchurl, + fetchpatch, + CoreServices, }: - stdenv.mkDerivation rec { pname = "xmake"; - version = "2.9.4"; - + version = "2.9.5"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-deLd4r0qSKMymJuAGuZQd8RS1JH+xRep2yeoHIcTzcU="; + hash = "sha256-A/61eH4i+rjdQEGew9hKvTWrzZ+KGyTEiMfrVx1nJMg="; }; - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - lua - lua.pkgs.cjson - readline - ncurses - lz4 - tbox - xmake-core-sv + patches = [ + (fetchpatch { + name = "xmake-fix-configure-compatibility.patch"; + url = "https://github.com/xmake-io/xmake/commit/2a1220727a367e753b92131577ab0c2fd974bff8.patch"; + hash = "sha256-xknlyydHvdwqTl975VQogKozT8nAp5+gPZQuRl1yXKE="; + }) ]; - strictDeps = true; - - configureFlags = [ "--external=y" ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; meta = with lib; { description = "Cross-platform build utility based on Lua"; homepage = "https://xmake.io"; license = licenses.asl20; - platforms = lua.meta.platforms; - maintainers = with maintainers; [ rewine ]; + maintainers = with maintainers; [ + rewine + rennsax + ]; }; } - diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index c242ab3b4ff32..c41de9d2b4b18 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.37.2"; + version = "1.37.3"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-ZZa/83Ut2+obDsh/t8/G6gUAfnBEohXeIQxC8yCQzHs="; + hash = "sha256-YYmgxlW80y6HOlRQbG3N+wTZM5pB58ZzZHEOa6vWbRw="; }; outputs = [ "out" "man" ]; @@ -36,7 +36,7 @@ buildGoModule rec { buildInputs = [ gpgme - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs libapparmor libseccomp diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index 60670791827d2..1b27c4899715d 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -19,7 +19,7 @@ let binPath = lib.makeBinPath ([ - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ runc crun conmon @@ -34,7 +34,7 @@ let # this only works for some binaries, others may need to be added to `binPath` or in the modules paths = [ - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ aardvark-dns netavark passt diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index a1b95f6ce6ccb..355233493c660 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "buildkit"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-N//XCiWWFjpJ6OncN7OT/C7+ziYr49T+0cOpH61mjg4="; + hash = "sha256-rAl2lPcm4JSRO9xVrZctGpWoi/JNZ5uUHDIZKd70+M8="; }; vendorHash = null; - subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; + subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "cmd/buildkitd" ]; ldflags = [ "-s" "-w" "-X github.com/moby/buildkit/version.Version=${version}" "-X github.com/moby/buildkit/version.Revision=${src.rev}" ]; diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix deleted file mode 100644 index 43279049ea0df..0000000000000 --- a/pkgs/development/tools/bundletool/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre_headless }: - -stdenvNoCC.mkDerivation rec { - pname = "bundletool"; - version = "1.17.0"; - - src = fetchurl { - url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-VOvuHx3oNn2a0mtGcr+yl2sLEhQuFdaD/HuOJU/GzBs="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeBinaryWrapper ]; - - installPhase = '' - runHook preInstall - makeWrapper ${jre_headless}/bin/java $out/bin/bundletool --add-flags "-jar $src" - runHook postInstall - ''; - - meta = with lib; { - description = "Command-line tool to manipulate Android App Bundles"; - mainProgram = "bundletool"; - homepage = "https://developer.android.com/studio/command-line/bundletool"; - changelog = "https://github.com/google/bundletool/releases/tag/${version}"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = [ ]; - platforms = jre_headless.meta.platforms; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index 01ba6089364ea..f525d9e5ce4ce 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "butane"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - hash = "sha256-KsI+mt7nJHwrq0+GPNcI79jRy/4WEjHp2/egw0PcRLM="; + hash = "sha256-ELCERcgw01RcSMQjM0PL8CyTKrdfEPV9U8/RSf7YxCs="; }; vendorHash = null; diff --git a/pkgs/development/tools/cfn-nag/Gemfile b/pkgs/development/tools/cfn-nag/Gemfile deleted file mode 100644 index 5ccc66872d415..0000000000000 --- a/pkgs/development/tools/cfn-nag/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'https://rubygems.org' -gem 'cfn-nag' diff --git a/pkgs/development/tools/cfn-nag/Gemfile.lock b/pkgs/development/tools/cfn-nag/Gemfile.lock deleted file mode 100644 index 86bfdad861081..0000000000000 --- a/pkgs/development/tools/cfn-nag/Gemfile.lock +++ /dev/null @@ -1,51 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - aws-eventstream (1.2.0) - aws-partitions (1.568.0) - aws-sdk-core (3.130.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.55.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.4.0) - aws-eventstream (~> 1, >= 1.0.2) - cfn-model (0.6.6) - kwalify (= 0.7.2) - psych (~> 3) - cfn-nag (0.8.9) - aws-sdk-s3 (~> 1.76) - cfn-model (= 0.6.6) - lightly (~> 0.3.2) - logging (~> 2.2.2) - netaddr (~> 2.0.4) - optimist (~> 3.0.0) - rexml - jmespath (1.6.1) - kwalify (0.7.2) - lightly (0.3.3) - little-plugger (1.1.4) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) - multi_json (1.15.0) - netaddr (2.0.5) - optimist (3.0.1) - psych (3.3.2) - rexml (3.2.5) - -PLATFORMS - ruby - -DEPENDENCIES - cfn-nag - -BUNDLED WITH - 2.2.28 diff --git a/pkgs/development/tools/cfn-nag/default.nix b/pkgs/development/tools/cfn-nag/default.nix deleted file mode 100644 index 8438607102c36..0000000000000 --- a/pkgs/development/tools/cfn-nag/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, bundlerEnv, bundlerUpdateScript, ruby }: - -bundlerEnv { - pname = "cfn-nag"; - version = "0.8.9"; - - inherit ruby; - gemdir = ./.; - - passthru.updateScript = bundlerUpdateScript "cfn-nag"; - - meta = with lib; { - description = "Linting tool for CloudFormation templates"; - homepage = "https://github.com/stelligent/cfn_nag"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/cfn-nag/gemset.nix b/pkgs/development/tools/cfn-nag/gemset.nix deleted file mode 100644 index e2e39f7a81372..0000000000000 --- a/pkgs/development/tools/cfn-nag/gemset.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ - aws-eventstream = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-partitions = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ap27g6hxcczpb5dj7v0wzxrvywfa2kf3zx69xnjz1qvxf3plw54"; - type = "gem"; - }; - version = "1.568.0"; - }; - aws-sdk-core = { - dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14ymvp06k46gvkpvz5zaqvbvr6wd8vdka5iq25q0wd0fzdx7aivm"; - type = "gem"; - }; - version = "3.130.0"; - }; - aws-sdk-kms = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi"; - type = "gem"; - }; - version = "1.55.0"; - }; - aws-sdk-s3 = { - dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax"; - type = "gem"; - }; - version = "1.113.0"; - }; - aws-sigv4 = { - dependencies = ["aws-eventstream"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; - type = "gem"; - }; - version = "1.4.0"; - }; - cfn-model = { - dependencies = ["kwalify" "psych"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b3ix36yfnfwyxb4w9ss8a7nc6w15m1wbj3q8rarsqjrs3xj6wjs"; - type = "gem"; - }; - version = "0.6.6"; - }; - cfn-nag = { - dependencies = ["aws-sdk-s3" "cfn-model" "lightly" "logging" "netaddr" "optimist" "rexml"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14qlnflxx5chjvda9n2ka2axcfcjbmn9h00cija8k7kvpy1dgqga"; - type = "gem"; - }; - version = "0.8.9"; - }; - jmespath = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; - type = "gem"; - }; - version = "1.6.1"; - }; - kwalify = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ngxg3ysq5vip9dn3d32ajc7ly61kdin86hfycm1hkrcvkkn1vjf"; - type = "gem"; - }; - version = "0.7.2"; - }; - lightly = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sgj2r6j7qxb9vqzkx5isjbphi38rplk4h8838am0cjcpq5h3jb3"; - type = "gem"; - }; - version = "0.3.3"; - }; - little-plugger = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; - type = "gem"; - }; - version = "1.1.4"; - }; - logging = { - dependencies = ["little-plugger" "multi_json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; - type = "gem"; - }; - version = "2.2.2"; - }; - multi_json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; - type = "gem"; - }; - version = "1.15.0"; - }; - netaddr = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r7nln9xvrralwwhd5s1q4sghp0k9y7g9z5pinzpqkx715xcpdxm"; - type = "gem"; - }; - version = "2.0.5"; - }; - optimist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; - type = "gem"; - }; - version = "3.0.1"; - }; - psych = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10iawnkpa44hcfrapy7yw6zmjn4g1g0y09lw244qiv424f7jasn5"; - type = "gem"; - }; - version = "3.3.2"; - }; - rexml = { - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; - type = "gem"; - }; - version = "3.2.5"; - }; -} diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index 03c301f193626..7d140bf2a794e 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -22,11 +22,11 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix index 29b6cb3d8a381..cbb952c1035b4 100644 --- a/pkgs/development/tools/circup/default.nix +++ b/pkgs/development/tools/circup/default.nix @@ -1,56 +1,55 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "circup"; - version = "1.4.0"; - format = "setuptools"; + version = "2.0.4"; + pyproject = true; src = fetchFromGitHub { owner = "adafruit"; - repo = pname; + repo = "circup"; rev = "refs/tags/${version}"; - hash = "sha256-kax4gnvRkHSqj0Y6Rk8eyPpT7Wia2QngCQtxpqWSl9s="; + hash = "sha256-Iid6IwPoj7F9X6Yb0ESsuvD9/tZdRQyCceGOVt2R1qw="; }; - pythonRelaxDeps = [ - "semver" - ]; + pythonRelaxDeps = [ "semver" ]; - nativeBuildInputs = with python3.pkgs; [ - setuptools-scm - ]; + build-system = with python3.pkgs; [ setuptools-scm ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ appdirs click findimports requests semver setuptools + toml update-checker ]; - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; postBuild = '' export HOME=$(mktemp -d); ''; - pythonImportsCheck = [ - "circup" + pythonImportsCheck = [ "circup" ]; + + disabledTests = [ + # Test requires network access + "test_libraries_from_imports_bad" ]; meta = with lib; { description = "CircuitPython library updater"; - mainProgram = "circup"; homepage = "https://github.com/adafruit/circup"; changelog = "https://github.com/adafruit/circup/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "circup"; }; } diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 00f5a9bc928f1..e764f34c91253 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -1,27 +1,21 @@ -{ lib, buildGraalvmNativeImage, graalvmCEPackages, removeReferencesTo, fetchurl +{ lib, buildGraalvmNativeImage, graalvmCEPackages, fetchurl }: buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2024.08.01"; + version = "2024.09.27"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-sDEZ3Tk2QRlL8oclV7vUZfdXpEdYCfCT45vP82Dccz4="; + sha256 = "sha256-DrSfL1WazlNd5H0jG6m0S5aED4BLVufr1rGIAyifn6E="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; - nativeBuildInputs = [ removeReferencesTo ]; - extraNativeImageBuildArgs = [ "-H:+ReportExceptionStackTraces" "--no-fallback" ]; - postInstall = '' - remove-references-to -t ${graalvmDrv} $out/bin/${pname} - ''; - meta = with lib; { description = "Linter for Clojure code that sparks joy"; homepage = "https://github.com/clj-kondo/clj-kondo"; diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 6760b4754203e..848b6fb2f10d0 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ libgit2 ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ libgit2 ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cog \ diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 74044655dc2bc..904f39f89a084 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -14,21 +14,21 @@ let channels = { stable = { - version = "2.13.5"; + version = "2.15.1"; hash = { - x86_64-linux = "sha256-drg19B1YTjpLvKDGE8B38T08KyMvuoAse5hQzDaJn5k="; - x86_64-darwin = "sha256-wj1zW6pJBx7eTFxdjBNiS6g+uixCUd1+O969K4JDj1k="; - aarch64-linux = "sha256-z2iiz5RWoVsDkwKCvDYbFRsLyiIBhJKrCo6p8d4ImMg="; - aarch64-darwin = "sha256-akuXh/izu9S9UQfIWhfdfcuez4FhZBz5PE5g9WmtpoQ="; + x86_64-linux = "sha256-DB/3iUkgWzAI+3DEQB8heYkG6apUARDulQ4lKDAPN1I="; + x86_64-darwin = "sha256-62tjAC3WtWC8eIkh9dPi2Exksp2gDHyXEU2tCavKZ4Q="; + aarch64-linux = "sha256-957GdH5sDjbjxEt8LXKPBM7vht7T6JizVwYYhbitdpw="; + aarch64-darwin = "sha256-ckcd1u9dgg9LKhr47Yw8dJKkR7hawPie4QNyySH8vyM="; }; }; mainline = { - version = "2.14.2"; + version = "2.16.0"; hash = { - x86_64-linux = "sha256-Qglz8F80QICwWOVwDELegewYHkPhhrTEuGKJgiw2mYg="; - x86_64-darwin = "sha256-uyslQIAXOROSdtyiLSUcxEwYzK+iDup8/jRI74QGcEo="; - aarch64-linux = "sha256-rzTBfO8+DSxJjhjIhl8qNji8bWe/EGZ4dG17D8wjlkA="; - aarch64-darwin = "sha256-+lFWz6qDuhtDNn7DID/lmpqltpEwftVP3U+2CseVMnY="; + x86_64-linux = "sha256-Uk9oGiLSHBCINAzQg88tlHyMw/OGfdmCw2/NXJs5wbQ="; + x86_64-darwin = "sha256-Bbayv00NDJGUA4M4KyG4XCXIiaQSf4JSgy5VvLSVmAM="; + aarch64-linux = "sha256-nV02uO+UkNNvQDIkh2G+9H8gvk9DOSYyIu4O3nwkYXk="; + aarch64-darwin = "sha256-C9Nm8dW3V25D7J/3ABO5oLGL4wcSCsAXtQNZABwVpWs="; }; }; }; diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix index ad7ab8559688f..4299c122109a4 100644 --- a/pkgs/development/tools/comby/default.nix +++ b/pkgs/development/tools/comby/default.nix @@ -92,7 +92,7 @@ mkCombyPackage { ocamlPackages.dune-configurator combyKernel combySemantic - ] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then + ] ++ (if !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64 then [ ocamlPackages.hack_parallel ] else [ ]); diff --git a/pkgs/development/tools/confluent-cli/default.nix b/pkgs/development/tools/confluent-cli/default.nix index e614fe7d947d3..09ca1e7ff8f1d 100644 --- a/pkgs/development/tools/confluent-cli/default.nix +++ b/pkgs/development/tools/confluent-cli/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; installPhase = '' mkdir -p $out/{bin,share/doc/confluent-cli} diff --git a/pkgs/development/tools/container2wasm/default.nix b/pkgs/development/tools/container2wasm/default.nix index b3db980a548fe..0245cb57ebfb4 100644 --- a/pkgs/development/tools/container2wasm/default.nix +++ b/pkgs/development/tools/container2wasm/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "container2wasm"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "ktock"; repo = "container2wasm"; rev = "refs/tags/v${version}"; - hash = "sha256-/E65h2kyzjtAnh72+zyxXf8OvxlUvXT/M25CPteUamE="; + hash = "sha256-PFgaqzl6uc6vHzcZ9+FpugAOFSBKhxAsoSvmYHxUmLs="; }; - vendorHash = "sha256-/V2n9SpBtJVQwERJhSugvAvIoOGuZNnhaaf8k9hh04k="; + vendorHash = "sha256-j6oqYpFcfZy4Lz4C9wbJGI2RdJsAxQxBqcLNWgKk/UU="; ldflags = [ "-s" diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index d0a2efb32b57a..904c5af636d11 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -71,7 +71,7 @@ let in buildPythonApplication rec { pname = "buildbot"; - version = "4.0.2"; + version = "4.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -80,7 +80,7 @@ buildPythonApplication rec { owner = "buildbot"; repo = "buildbot"; rev = "v${version}"; - hash = "sha256-0ctOInVRJqjmcqy67PTriRmqo3fz1qMEVV+K5lXvZ6k="; + hash = "sha256-4jxA8qvLX53cLooCpkn9hvcz4SFGc29TKxUah80Ufp4="; }; build-system = [ @@ -147,7 +147,7 @@ buildPythonApplication rec { SQLALCHEMY_SILENCE_UBER_WARNING = 1; # TimeoutErrors on slow machines -> aarch64 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; preCheck = '' export LC_ALL="en_US.UTF-8" @@ -162,7 +162,7 @@ buildPythonApplication rec { passthru = { inherit withPlugins; updateScript = ./update.sh; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { tests = { inherit (nixosTests) buildbot; }; @@ -174,6 +174,6 @@ buildPythonApplication rec { changelog = "https://github.com/buildbot/buildbot/releases/tag/v${version}"; maintainers = teams.buildbot.members; license = licenses.gpl2Only; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 530b46d263378..94564ce368535 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -8,7 +8,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-TU5/0KQQbNDpxuntIwQvxGp/7PvBb+iMiAOJA3EAAAA="; + hash = "sha256-wBwJXDR52jDRd+8efIjQ+ncWe708k1F21MuvBwhjEwc="; }; # Remove unnecessary circular dependency on buildbot @@ -35,7 +35,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-EtG4vlsoyIDcfKWvkL7ei/BGVItF5wkWPhq4aHfmJ24="; + hash = "sha256-JJK1vmTdOImKIM1glrTjo2E0KnotU2QJVc2OIzVQQ1Y="; }; # Remove unnecessary circular dependency on buildbot @@ -62,7 +62,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-gNei1LZXV7G+8u0AtNDSsj98LprsbyIFR94N4+AXO54="; + hash = "sha256-kzj4IPNn/cUW7nidOLyO7AD98uXxWcqvMxaOhXhFn74="; }; buildInputs = [ buildbot-pkg ]; @@ -84,7 +84,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-CJ14Se4Wlpb7jt5u1VVmd0MnUdO2l7KfQyVQbO7hMhA="; + hash = "sha256-4quLblPknI/vrCNF7Frl5+UlY50vuspW0XmMJubvVXI="; }; buildInputs = [ buildbot-pkg ]; @@ -106,7 +106,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-lY8ljjGaZ0i7aY1rR//7M7H83ZTSQj9CnTafWXner94="; + hash = "sha256-VC84rftiA7/x0X3lJfHTrEZve/ZDncVDuq6fisEI8nc="; }; buildInputs = [ buildbot-pkg ]; @@ -128,7 +128,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-XZAInGgM/hm4Rxk0usH0NRiCuq19XJeYuwJNF2gtn3M="; + hash = "sha256-2HZBnVvxPhU6rLmG6l9hX51zm8pvA5amsjExGx65+OQ="; }; buildInputs = [ buildbot-pkg ]; @@ -150,7 +150,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-RRdHvlm+98Cu+qiIhDMx6W65bQ30ULTKZrz05Xm32gg="; + hash = "sha256-IwTANqPNGon4lvT2ASpguEf8GcD1hz/7flNBml0NTdc="; }; buildInputs = [ buildbot-pkg ]; @@ -172,7 +172,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-sg/40zP3YMF8e3GsL+A9gtCUlhoqKqHNeFUycQrQNJc="; + hash = "sha256-SQiaIcupEtNePr4LUzwYm3RRKT9xa7RnHUaiE8EaRzQ="; }; buildInputs = [ buildbot-pkg ]; @@ -194,7 +194,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-pE6wDMLYGtDgaRjqv/SS9bm6F58molO9oQI3XklcWfg="; + hash = "sha256-dzK4WvBRxWoAfhsdKoYUnsG97OKmM8Jgr4Uv7NPpiVk="; }; buildInputs = [ buildbot-pkg ]; @@ -216,7 +216,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-ZgnfiQtKCs1Ui9KiUMaSbtaMnCgSgH+IzJTXWYcG/fE="; + hash = "sha256-vytU7WRdXWHazc/LYZSWlslkOb3lnTitEW3UZQ/VmTU="; }; buildInputs = [ buildbot-pkg ]; @@ -238,7 +238,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-yxbLY3LiT0qmRiz7+/F/TuODiSnteq0891fxAGSU7yY="; + hash = "sha256-O71qB9uIigYcK/t2t+481oktHjF5up1nk1dS4eEMb3A="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index aacdf92e30a53..3abc10134322e 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -56,6 +56,6 @@ buildPythonPackage ({ description = "Buildbot Worker Daemon"; maintainers = teams.buildbot.members; license = licenses.gpl2; - broken = stdenv.isDarwin; # https://hydra.nixos.org/build/243534318/nixlog/6 + broken = stdenv.hostPlatform.isDarwin; # https://hydra.nixos.org/build/243534318/nixlog/6 }; }) diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index dd81126d68fd1..f59f783231eb7 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkite-cli"; - version = "2.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-4MUgyUKyycsreAMVtyKJFpQOHvI6JJSn7TUZtbQANyc="; + sha256 = "sha256-fidE4MSZS53Odv5tlNPFJEhcb8JTmILVRNmcVF9Z9Oc="; }; - vendorHash = "sha256-3x7yJenJ2BHdqVPaBaqfFVeOSJZ/VRNF/TTfSsw+2os="; + vendorHash = "sha256-stxsMJPBUclLlmR88c7OwAhsw9dhyBIhStuxLVu00bo="; doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix index 28630e43b766e..84c62e5568583 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-PF2TFfzWmHXLgTopzJ04dfnzd3Sc/A6Hduffz2guxmU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix deleted file mode 100644 index 4e2fa7b6234d0..0000000000000 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, installShellFiles -}: - -buildGoModule rec { - pname = "cirrus-cli"; - version = "0.122.4"; - - src = fetchFromGitHub { - owner = "cirruslabs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-YpdzwGThmc9r4I+Rx8nxTZToi+J3UbqwZD+F2hYEG8M="; - }; - - vendorHash = "sha256-WAYjYIHsBkQiTUmMDRXnx3Q1UAFVfXmZDFxzw7Kh0ds="; - - ldflags = [ - "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" - "-X github.com/cirruslabs/cirrus-cli/internal/version.Commit=v${version}" - ]; - - nativeBuildInputs = [ installShellFiles ]; - postInstall = '' - installShellCompletion --cmd cirrus \ - --bash <($out/bin/cirrus completion bash) \ - --zsh <($out/bin/cirrus completion zsh) \ - --fish <($out/bin/cirrus completion fish) - ''; - - # tests fail on read-only filesystem - doCheck = false; - - meta = with lib; { - description = "CLI for executing Cirrus tasks locally and in any CI"; - homepage = "https://github.com/cirruslabs/cirrus-cli"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ techknowlogick ]; - mainProgram = "cirrus"; - }; -} diff --git a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix deleted file mode 100644 index 10e07234aafac..0000000000000 --- a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, fetchFromGitea -, buildGoModule -, testers -, gitea-actions-runner -}: - -buildGoModule rec { - pname = "gitea-actions-runner"; - version = "0.2.10"; - - src = fetchFromGitea { - domain = "gitea.com"; - owner = "gitea"; - repo = "act_runner"; - rev = "v${version}"; - hash = "sha256-YRWFBMHw9Fcmzkmglh2I1kXJkAAivqvCBcenLTjE/bI="; - }; - - vendorHash = "sha256-8sdSQhg9DnRLgghDZzWrUMM4vjinhCgu3dTKU7MBVQU="; - - ldflags = [ - "-s" - "-w" - "-X gitea.com/gitea/act_runner/internal/pkg/ver.version=v${version}" - ]; - - passthru.tests.version = testers.testVersion { - package = gitea-actions-runner; - version = "v${version}"; - }; - - meta = with lib; { - mainProgram = "act_runner"; - maintainers = with maintainers; [ techknowlogick ]; - license = licenses.mit; - changelog = "https://gitea.com/gitea/act_runner/releases/tag/v${version}"; - homepage = "https://gitea.com/gitea/act_runner"; - description = "Runner for Gitea based on act"; - }; -} diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/development/tools/continuous-integration/hci/default.nix index 4f04e0494f0ff..6da44a4786cd0 100644 --- a/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/pkgs/development/tools/continuous-integration/hci/default.nix @@ -2,7 +2,7 @@ let inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables appendConfigureFlags; inherit (lib) makeBinPath; - bundledBins = lib.optional stdenv.isLinux crun; + bundledBins = lib.optional stdenv.hostPlatform.isLinux crun; overrides = old: { hercules-ci-agent = diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index 0da85bae969a5..a01febb9113d3 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -15,7 +15,7 @@ let inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; - bundledBins = [ gnutar gzip git openssh ] ++ lib.optional stdenv.isLinux crun; + bundledBins = [ gnutar gzip git openssh ] ++ lib.optional stdenv.hostPlatform.isLinux crun; pkg = # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 @@ -43,7 +43,7 @@ in pkg.overrideAttrs (finalAttrs: o: { package = finalAttrs.finalPackage; command = "hercules-ci-agent --help"; }; - } // lib.optionalAttrs (stdenv.isLinux) { + } // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { # Does not test the package, but evaluation of the related NixOS module. nixos-simple-config = (nixos { boot.loader.grub.enable = false; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 46b5e25ef66b0..cd11eb515e198 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.462.1"; + version = "2.462.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-DyHCX9b6+0NfG1TTlTuiCoQl6ZWaNaeoQD6KARksDfw="; + hash = "sha256-DkyU06S9QFdtZ5HBJkzaZuRGjjeSnnxcs+Vs+lCANHQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix index 6c6fe743896a2..c8d28fa69dd27 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "woodpecker-plugin-git"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "plugin-git"; rev = "refs/tags/${version}"; - hash = "sha256-61WjfeHc8Qyl3RqgafVe1/y8cBOnL8i/fHOAIP4RCdI="; + hash = "sha256-ffP4CmvoxmXdwrWWOG2HIoz1pgmxTUdG5rPsgJ1+3do="; }; - vendorHash = "sha256-rUXi3oaawTJoGPmVxmdR1v2eh8BIvCBjxJBz3XRygEg="; + vendorHash = "sha256-wB1Uv7ZSIEHzR8z96hwXScoGA31uhoql/wwAH3Olj2E="; CGO_ENABLED = "0"; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 1bb8d45f7c44c..15b74b0a43e0a 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "2.7.0"; - srcHash = "sha256-A9F+kKR4oM4IEA5qLqMaQiW9KAjuQgyvv3peXos3gX8="; + version = "2.7.1"; + srcHash = "sha256-x9eCBxrujIJ0kwN5jyn7FKu7uyN+pIBCVDLckhiUzmM="; # The tarball contains vendored dependencies vendorHash = null; in diff --git a/pkgs/development/tools/cotton/default.nix b/pkgs/development/tools/cotton/default.nix index ec39c399bdd50..bc54f31549494 100644 --- a/pkgs/development/tools/cotton/default.nix +++ b/pkgs/development/tools/cotton/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Package manager for JavaScript projects"; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 3732a1eec55f9..cbd3fbcc02dab 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.10"; + version = "2.1.13"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - hash = "sha256-fiZwmDDuaafBbYQdOxPpTrleMLOSakCteizpKwcGStk="; + hash = "sha256-AGHpJaKhu9/rzWPfNWzJPdp/jpQOm28BGAcXuwyNNxE="; }; dontUnpack = true; diff --git a/pkgs/development/tools/crd2pulumi/default.nix b/pkgs/development/tools/crd2pulumi/default.nix index 58baefc71269f..66ab82d17594d 100644 --- a/pkgs/development/tools/crd2pulumi/default.nix +++ b/pkgs/development/tools/crd2pulumi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "crd2pulumi"; - version = "1.4.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "pulumi"; repo = "crd2pulumi"; rev = "v${version}"; - sha256 = "sha256-PfgFDYZS5zKywQH6f5L8mFmEagxcEQ74Ht7D22hSYHY="; + sha256 = "sha256-wIg14U3CNuO7PbhOkaZMfzXhjnMWiddQKiDzgD493iY="; }; - vendorHash = "sha256-k6YJhYY2P/D8Vbsp5PExKrcGXBv2GsIkqb3m6KeYm6g="; + vendorHash = "sha256-tSQuyGo4YaqKp5C9V/tEobc/4+x5ExPbV3Y4nd8D8jE="; ldflags = [ "-s" "-w" "-X github.com/pulumi/crd2pulumi/gen.Version=${src.rev}" ]; diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 6bfd7a01fca53..ccd57d05895cd 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.32"; + version = "0.8.34"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-ydwPnR5tazLeeHqsIMyZKeO0vvxtCSa5ulCw2/Hv8TA="; + hash = "sha256-Fmv6hq7t0ZrlWIbK8ahCXzgNI8Mg94nTmb9rgd5KEEY="; }; - vendorHash = "sha256-BjZYHLwXyagm9JJv+f83RkrpLBTIZvXGUXZhSxhhlfc="; + vendorHash = "sha256-d9TijRzBpMvRrOMexGtewtAA9XpLwDTjPnPzt7G67Cs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix deleted file mode 100644 index b4431c688a559..0000000000000 --- a/pkgs/development/tools/database/atlas/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, atlas }: - -buildGoModule rec { - pname = "atlas"; - version = "0.26.0"; - - src = fetchFromGitHub { - owner = "ariga"; - repo = "atlas"; - rev = "v${version}"; - hash = "sha256-QSm8KfpygHkXulwBrTG18l3pVEB32xj3HwezjZzJFl8="; - }; - - modRoot = "cmd/atlas"; - - proxyVendor = true; - vendorHash = "sha256-9K4zsly00dis3pYR++vXy0E8buKR6uOAmqw8IVYGXGM="; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ "-s" "-w" "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" ]; - - subPackages = [ "." ]; - - postInstall = '' - installShellCompletion --cmd atlas \ - --bash <($out/bin/atlas completion bash) \ - --fish <($out/bin/atlas completion fish) \ - --zsh <($out/bin/atlas completion zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = atlas; - command = "atlas version"; - version = "v${version}"; - }; - - meta = with lib; { - description = "Modern tool for managing database schemas"; - homepage = "https://atlasgo.io/"; - changelog = "https://github.com/ariga/atlas/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; - mainProgram = "atlas"; - }; -} diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index bcf12d4a258a9..a16fbaddc2c95 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.5.29"; + version = "2.6.2"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-Ouep7jd3t+5cryINIYV9KvY2j1caW3TxvPitThRU3kE="; + hash = "sha256-t9sRhcNKFvTTysornYf/7JQ7mkasTunnzKR4pYCAOk0="; }; - vendorHash = "sha256-IEqxC4EzkEZnZru6U9O7U9kf375YKqBeyeJPqzaWbuM="; + vendorHash = "sha256-n3rlijycZ5qZtR/e+Z/UPCcr47p4wN3kFgfWr+73WAQ="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 2241f25578ff9..2d0ca3e7681c1 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-5lsScWX7oaYU3IzqBYK41g96bLn2Er0XRq3nUgXI+Vk="; + hash = "sha256-RX8ocfXHoo1imjx7SRml6Ao6KjNK7xp43pVmth2zfPc="; }; - vendorHash = "sha256-BtMvaMb36F9c1CJb7qAhkMW8jxuPJqlKRSlMzkEOMAY="; + vendorHash = "sha256-lov0Ye+pmI5eyILepN87okZDDA9OPz4cTzK1KluHQuI="; doCheck = false; diff --git a/pkgs/development/tools/database/dynein/default.nix b/pkgs/development/tools/database/dynein/default.nix index 618ca16417db9..1673743484592 100644 --- a/pkgs/development/tools/database/dynein/default.nix +++ b/pkgs/development/tools/database/dynein/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; preBuild = '' export OPENSSL_DIR=${lib.getDev openssl} diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 1e8a7bbd31d66..57b4a7d7c8e6e 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -23,22 +23,18 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liquibase"; - version = "4.29.1"; + version = "4.29.2"; src = fetchurl { - url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-MFJP8cG+GqxGt3S8x+LVSI6yF8F06f+C8LrCRP65sRc="; + url = "https://github.com/liquibase/liquibase/releases/download/v${finalAttrs.version}/liquibase-${finalAttrs.version}.tar.gz"; + hash = "sha256-HQF6IGqVqzB2pS9mBnnC2AufIXSULLBxXjXVOTHiDuk="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - unpackPhase = '' - tar xfz ${src} - ''; - installPhase = let addJars = dir: '' for jar in ${dir}/*.jar; do @@ -53,12 +49,12 @@ stdenv.mkDerivation rec { mkdir -p $out/internal/lib mv ./internal/lib/*.jar $out/internal/lib/ - mkdir -p $out/share/doc/${pname}-${version} + mkdir -p $out/share/doc/liquibase-${finalAttrs.version} mv LICENSE.txt \ README.txt \ ABOUT.txt \ changelog.txt \ - $out/share/doc/${pname}-${version} + $out/share/doc/liquibase-${finalAttrs.version} mkdir -p $out/bin # there’s a lot of escaping, but I’m not sure how to improve that @@ -89,10 +85,10 @@ stdenv.mkDerivation rec { description = "Version Control for your database"; mainProgram = "liquibase"; homepage = "https://www.liquibase.org/"; - changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt"; + changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${finalAttrs.version}/changelog.txt"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ jsoo1 ]; platforms = with platforms; unix; }; -} +}) diff --git a/pkgs/development/tools/database/movine/default.nix b/pkgs/development/tools/database/movine/default.nix index 51a4d8f2943b1..41ea6a42a05d3 100644 --- a/pkgs/development/tools/database/movine/default.nix +++ b/pkgs/development/tools/database/movine/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/database/pg_checksums/default.nix b/pkgs/development/tools/database/pg_checksums/default.nix index 0aac2409c07b1..b65299cf1a506 100644 --- a/pkgs/development/tools/database/pg_checksums/default.nix +++ b/pkgs/development/tools/database/pg_checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_checksums"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "credativ"; repo = pname; rev = version; - sha256 = "sha256-Ij+4ceQauX3tC97ftk/JS3/WlocPBf7A7PJrylpTLzw="; + sha256 = "sha256-joGaCoRMGpEqq7pnT4Qd7XySjZ5wlZPW27WfOv1UFF4="; }; nativeBuildInputs = [ libxslt.bin ]; diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/development/tools/database/pgweb/default.nix index 81eaef5c5ee6c..b7ae5487d215c 100644 --- a/pkgs/development/tools/database/pgweb/default.nix +++ b/pkgs/development/tools/database/pgweb/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "pgweb"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "sosedoff"; repo = pname; rev = "v${version}"; - hash = "sha256-3iSnFzHqk3KBLvs7XixqpT4j2T/t2O2R7rMD4nlkIuw="; + hash = "sha256-lQc1ELeH2i9tate47rdHxFnvjQQUdg1B0CXcr5YGC+g="; }; postPatch = '' diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 295c791d4f5e1..756d5e85ab90f 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl protobuf - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; # FIXME: Workaround Rust 1.80 support by updating time to 0.3.36 # https://github.com/prisma/prisma-engines/issues/4989 diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/development/tools/database/prqlc/default.nix index 2eac6f4a20739..008eba559b110 100644 --- a/pkgs/development/tools/database/prqlc/default.nix +++ b/pkgs/development/tools/database/prqlc/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { sqlite zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/database/replibyte/default.nix b/pkgs/development/tools/database/replibyte/default.nix index 4437e4738e161..f04a00e881cae 100644 --- a/pkgs/development/tools/database/replibyte/default.nix +++ b/pkgs/development/tools/database/replibyte/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; cargoBuildFlags = [ "--all-features" ]; diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix deleted file mode 100644 index 5e07beaff6f7d..0000000000000 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, maven -, jre -, makeWrapper -, git -, fetchFromGitHub -, graphviz -, ensureNewerSourcesHook -}: - -maven.buildMavenPackage rec { - pname = "schemaspy"; - version = "6.1.1-SNAPSHOT"; - - src = fetchFromGitHub { - owner = "schemaspy"; - repo = "schemaspy"; - rev = "110b1614f9ae4aec0e4dc4e8f0e7c647274d3af6"; - hash = "sha256-X5B34zGhD/NxcK8TQvwdk1NljGJ1HwfBp47ocbE4HiU="; - }; - - mvnParameters = "-Dmaven.test.skip=true"; - mvnFetchExtraArgs = { - nativeBuildInputs = [ - # the build system gets angry if it doesn't see git (even though it's not - # actually in a git repository) - git - maven - ]; - }; - mvnHash = "sha256-1x6cNt6t3FnjRNg8iNYflkyDnuPFXGKoxhVJWoz2jIU="; - - nativeBuildInputs = [ - makeWrapper - git - - # springframework boot gets angry about 1970 sources - # fix from https://github.com/nix-community/mavenix/issues/25 - (ensureNewerSourcesHook { year = "1980"; }) - ]; - - wrappedPath = lib.makeBinPath [ - graphviz - ]; - - preBuild = '' - VERSION=${version} - SEMVER_STR=${version} - ''; - - installPhase = '' - install -D target/${pname}-${version}.jar $out/share/java/${pname}-${version}.jar - - makeWrapper ${jre}/bin/java $out/bin/schemaspy \ - --add-flags "-jar $out/share/java/${pname}-${version}.jar" \ - --prefix PATH : "$wrappedPath" - ''; - - meta = with lib; { - homepage = "https://schemaspy.org"; - description = "Document your database simply and easily"; - mainProgram = "schemaspy"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ jraygauthier ]; - }; -} - diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index fdbe69b113c3d..16ae0bbad20d3 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.1.1"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; rev = "refs/tags/${version}"; - hash = "sha256-IgYfysinQnK8qSp4r1AuBpRYBFvwITjGHJduayDA9Fw="; + hash = "sha256-7bCfIWJV7gB+WbvMxmhJW1RM1pd3gA/bCuH+o4FGg/A="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 96d9c035be304..c90bfbd3b37d8 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,30 +1,35 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake -, qtbase, qttools, sqlcipher, wrapGAppsHook3, qtmacextras +{ lib, stdenv, fetchFromGitHub, cmake +, qtbase, qttools, sqlcipher, wrapQtAppsHook, qtmacextras }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sqlitebrowser"; version = "3.13.0"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; + owner = "sqlitebrowser"; + repo = "sqlitebrowser"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-2U0jnL2hmrxynMxEiObl10bKFAFlCrY2hulZ/Ggqimw="; }; + patches = lib.optional stdenv.hostPlatform.isDarwin ./macos.patch; + # We should be using qscintilla from nixpkgs instead of the vendored version, # but qscintilla is currently in a bit of a mess as some consumers expect a # -qt4 or -qt5 prefix while others do not. # We *really* should get that cleaned up. - buildInputs = [ qtbase sqlcipher ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; + buildInputs = [ qtbase sqlcipher ] ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras; - nativeBuildInputs = [ cmake qttools wrapGAppsHook3 ]; + nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; cmakeFlags = [ "-Dsqlcipher=1" + (lib.cmakeBool "ENABLE_TESTING" (finalAttrs.doCheck or false)) ]; + doCheck = true; + meta = with lib; { description = "DB Browser for SQLite"; mainProgram = "sqlitebrowser"; @@ -33,4 +38,4 @@ mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/tools/database/sqlitebrowser/macos.patch b/pkgs/development/tools/database/sqlitebrowser/macos.patch new file mode 100644 index 0000000000000..6da7d67a03269 --- /dev/null +++ b/pkgs/development/tools/database/sqlitebrowser/macos.patch @@ -0,0 +1,86 @@ +diff -ru source/CMakeLists.txt source-patched/CMakeLists.txt +--- source/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100 ++++ source-patched/CMakeLists.txt 2024-09-03 11:09:48.289053141 +0200 +@@ -39,9 +39,7 @@ + set(CMAKE_AUTOMOC ON) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + +-if(APPLE) +- add_executable(${PROJECT_NAME} MACOSX_BUNDLE) +-elseif(WIN32) ++if(WIN32) + add_executable(${PROJECT_NAME} WIN32) + else() + add_executable(${PROJECT_NAME}) +@@ -106,33 +104,6 @@ + list(PREPEND CMAKE_PREFIX_PATH ${QT5_PATH} ${SQLITE3_PATH}) + endif() + +- +-if(APPLE) +- # For Intel Mac's +- if(EXISTS /usr/local/opt/qt5) +- list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/qt5") +- endif() +- +- # For Apple Silicon Mac's +- if(EXISTS /opt/homebrew/opt/qt5) +- list(APPEND CMAKE_PREFIX_PATH "/opt/homebrew/opt/qt5") +- endif() +- if(EXISTS /opt/homebrew/opt/sqlitefts5) +- list(PREPEND CMAKE_PREFIX_PATH "/opt/homebrew/opt/sqlitefts5") +- endif() +- +- # For Apple Silicon Mac's and install dependencies via our Homebrew tap(sqlitebrowser/homebrew-tap) +- if(customTap AND EXISTS /opt/homebrew/opt/) +- list(PREPEND CMAKE_PREFIX_PATH "/opt/homebrew/opt/sqlb-qt@5") +- list(PREPEND CMAKE_PREFIX_PATH "/opt/homebrew/opt/sqlb-sqlite") +- +- if(sqlcipher) +- list(APPEND SQLCIPHER_INCLUDE_DIR "/opt/homebrew/include") +- list(APPEND SQLCIPHER_LIBRARY "/opt/homebrew/opt/sqlb-sqlcipher/lib/libsqlcipher.0.dylib") +- endif() +- endif() +-endif() +- + find_package(Qt5 REQUIRED COMPONENTS Concurrent Gui LinguistTools Network PrintSupport Test Widgets Xml) + + if(NOT FORCE_INTERNAL_QSCINTILLA) +@@ -439,13 +410,6 @@ + set(LIBSQLITE_NAME SQLite3) + endif() + +-# add extra library path for MacOS and FreeBSD +-set(EXTRAPATH APPLE OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +-if(EXTRAPATH) +- list(PREPEND CMAKE_PREFIX_PATH /usr/local/opt/sqlite/lib) +- list(PREPEND CMAKE_PREFIX_PATH /usr/local/opt/sqlitefts5/lib) +-endif() +- + find_package(${LIBSQLITE_NAME}) + if (sqlcipher) + target_link_libraries(${PROJECT_NAME} SQLCipher::SQLCipher) +@@ -510,7 +474,7 @@ + endif() + endif() + +-if((NOT WIN32 AND NOT APPLE) OR MINGW) ++if(NOT WIN32 OR MINGW) + install(TARGETS ${PROJECT_NAME} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -630,14 +594,6 @@ + ) + endif() + +-if(APPLE) +- set_target_properties(${PROJECT_NAME} PROPERTIES +- BUNDLE True +- OUTPUT_NAME "DB Browser for SQLite" +- MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/src/app.plist +- ) +-endif() +- + # CPack configuration + set(CPACK_STRIP_FILES ON) + set(CPACK_DEBIAN_PACKAGE_PRIORITY optional) diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index f2db3fad5b006..e47174c93450e 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -10,7 +10,7 @@ let pname = "surrealdb-migrations"; - version = "2.0.0-preview.1"; + version = "2.0.0"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-Ijuohu/KgHN5Ux2aWIGJQF9z6vmDPAyE7Sy66zX7nd8="; + hash = "sha256-MrIawJr8EydfYFVzxODUZ7jDj0B0M1FAuX4Arktbf4Y="; }; - cargoHash = "sha256-4YTcWKyVrlgGA1hpoRszB5qn0qa/lizvvGXdfQJoxlc="; + cargoHash = "sha256-ELYBEQrh80LdNYNZwcGVh9GE+dSfjF+RuO8fd0PabIw="; buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; # Error: No such file or directory (os error 2) # failures: diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 32458926bd00e..71e1073f327de 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rOAXCru3m31lVFUyxywkuyKWUOJneA7ECMPyvAfw4mg="; + sha256 = "sha256-HCl0v9hS9/UgzLniFQ7QFb5pdOAnnoomT3Zv3BLf/Ac="; }; - vendorHash = "sha256-8Q+KMYu1yiHEYS035NmCvxSgIS/+oRhhcZa6SwmvGgk="; + vendorHash = "sha256-7u3eceVDnzjhGguijJXbm40qyCPO/Q101Zr5vEcGEqs="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix index 09969c80c4e3e..1363cf66b3045 100644 --- a/pkgs/development/tools/database/vitess/default.nix +++ b/pkgs/development/tools/database/vitess/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vitess"; - version = "20.0.1"; + version = "20.0.2"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-OkVBV/Fj2OKxkxjVBdTAyiGETuLw7OvV0KInp533iM8="; + hash = "sha256-I+pz8bz/H1mg7cQnPiJZxYr1gyzajMLVqg8yHbBXYLc="; }; vendorHash = "sha256-ZDPDL7vJoPv5pIS5xhHAgLiZsiF2B85KNnqGQJPk1SQ="; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 4552539bb76e9..a6e73420bc72d 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "delve"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - hash = "sha256-LtrPcYyuobHq6O3/vBKLTOMZfpYL7P3mtGfVqCMV9iM="; + hash = "sha256-+qC5fFBuQchz1dMP5AezWkkD2anZshN1wIteKce0Ecw="; }; vendorHash = null; @@ -29,7 +29,7 @@ buildGoModule rec { # even with __darwinAllowLocalNetworking allowed. # - CGO_FLAGS warnings break tests' expected stdout/stderr outputs. # - DAP test binaries exit prematurely. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = '' # fortify source breaks build since delve compiles with -O0 diff --git a/pkgs/development/tools/detekt/default.nix b/pkgs/development/tools/detekt/default.nix index 9b51881e5c2bf..45ef24e4b1f7c 100644 --- a/pkgs/development/tools/detekt/default.nix +++ b/pkgs/development/tools/detekt/default.nix @@ -1,13 +1,13 @@ -{ detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: -stdenv.mkDerivation rec { +{ lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: +stdenv.mkDerivation (finalAttrs: { pname = "detekt"; - version = "1.23.6"; + version = "1.23.7"; - jarfilename = "${pname}-${version}-executable.jar"; + jarfilename = "detekt-${finalAttrs.version}-executable.jar"; src = fetchurl { - url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; - sha256 = "sha256-iY3PgQ6JH0SeTj+fSk4tx1rs+OEInfQaQqaa2yy7z/o="; + url = "https://github.com/detekt/detekt/releases/download/v${finalAttrs.version}/detekt-cli-${finalAttrs.version}-all.jar"; + sha256 = "sha256-hL7e0oMBLLKzi8rvSZZFL81gadLpynS1Dqp54K0hiX4="; }; dontUnpack = true; @@ -17,15 +17,15 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -D "$src" "$out/share/java/${jarfilename}" + install -D "$src" "$out/share/java/${finalAttrs.jarfilename}" makeWrapper ${jre_headless}/bin/java $out/bin/detekt \ - --add-flags "-jar $out/share/java/${jarfilename}" + --add-flags "-jar $out/share/java/${finalAttrs.jarfilename}" runHook postInstall ''; - passthru.tests.version = testers.testVersion { package = detekt; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { description = "Static code analysis for Kotlin"; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ mdr ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; -} +}) diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 59200d18b2595..de3625a17b15a 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-+bnFaopmK8Yz2XSkN3wPiipoO5TsRD0IuAKUlx1KvKM="; + hash = "sha256-gTJotzg7ot9C7NVDiauVJHpkSXBwaK7arjtnwUGFqgE="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-fuLKo6m/n06W4jyCc4Ki0GLlSIYZNdGFOhpasTd95x0="; + vendorHash = "sha256-rwmNzYzmZqNcNVV4GgqCVLT6ofIkblVCMJHLGwlhcGw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index ea60c216a8f55..b24300558958f 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -9,13 +9,13 @@ python3.pkgs.buildPythonApplication rec { pname = "devpi-client"; - version = "7.0.3"; + version = "7.1.0"; pyproject = true; src = fetchPypi { pname = "devpi_client"; inherit version; - hash = "sha256-5aF6EIFnhfywDeAfWSN+eZUpaO6diPCP5QHT11Y/IQI="; + hash = "sha256-NwbhrojxOJSpDvMk0MbAGCbjmS8z2g1ynW6zzgVvy/M="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/development/tools/devpod/Cargo.lock b/pkgs/development/tools/devpod/Cargo.lock index 8b7d57a658b6e..45bf51a8f488e 100644 --- a/pkgs/development/tools/devpod/Cargo.lock +++ b/pkgs/development/tools/devpod/Cargo.lock @@ -10,9 +10,9 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -23,11 +23,22 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom 0.2.15", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -64,9 +75,28 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arboard" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +dependencies = [ + "clipboard-win", + "core-graphics 0.23.2", + "image 0.25.2", + "log", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot", + "windows-sys 0.48.0", + "wl-clipboard-rs", + "x11rb", +] [[package]] name = "arrayvec" @@ -74,24 +104,31 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 2.5.3", + "event-listener", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.1.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -99,64 +136,42 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.8.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ - "async-lock 3.2.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.1.0", + "fastrand", + "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock", "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", + "futures-lite", ] [[package]] name = "async-io" -version = "2.2.1" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.2.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "parking", - "polling 3.3.1", - "rustix 0.38.26", + "polling", + "rustix", "slab", "tracing", "windows-sys 0.52.0", @@ -164,85 +179,79 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.0", + "event-listener", "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.26", - "windows-sys 0.48.0", + "event-listener", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" dependencies = [ - "async-io 2.2.1", - "async-lock 2.8.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.26", + "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] @@ -266,7 +275,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -277,27 +286,27 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.7.1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810a80b128d70e6ed2bdf3fe8ed72c0ae56f5f5948d01c2753282dd92a84fce8" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.5", + "base64 0.21.7", "bytes", "futures-util", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.0.1", + "hyper 1.4.1", "hyper-util", - "itoa 1.0.9", + "itoa 1.0.11", "matchit", "memchr", "mime", @@ -309,39 +318,41 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", "tokio-tungstenite", "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] name = "axum-core" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0ddc355eab88f4955090a823715df47acf0b7660aab7a69ad5ce6301ee3b73" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", + "tracing", ] [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -360,9 +371,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" @@ -372,9 +389,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] [[package]] name = "block" @@ -391,27 +420,57 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", +] + [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.2.0", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "piper", - "tracing", +] + +[[package]] +name = "borsh" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +dependencies = [ + "borsh-derive", + "cfg_aliases 0.2.1", +] + +[[package]] +name = "borsh-derive" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +dependencies = [ + "once_cell", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.72", + "syn_derive", ] [[package]] name = "brotli" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -430,9 +489,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "serde", @@ -440,25 +499,48 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-unit" -version = "4.0.19" +version = "5.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" +checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e" dependencies = [ + "rust_decimal", "serde", "utf8-width", ] +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -466,11 +548,17 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" dependencies = [ "serde", ] @@ -496,7 +584,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -511,12 +599,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" [[package]] name = "cesu8" @@ -546,9 +631,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -560,11 +645,23 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -572,7 +669,16 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "clipboard-win" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +dependencies = [ + "error-code", ] [[package]] @@ -585,8 +691,8 @@ dependencies = [ "block", "cocoa-foundation", "core-foundation", - "core-graphics", - "foreign-types", + "core-graphics 0.22.3", + "foreign-types 0.3.2", "libc", "objc", ] @@ -613,9 +719,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -623,9 +729,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -661,7 +767,20 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", "libc", ] @@ -678,64 +797,55 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -771,24 +881,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "ctor" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "darling" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -796,67 +906,67 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", ] [[package]] -name = "derivative" -version = "2.2.0" +name = "derive-new" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -869,7 +979,7 @@ dependencies = [ "cocoa", "dirs", "dispatch", - "http 1.0.0", + "http 1.1.0", "lazy_static", "log", "objc", @@ -955,6 +1065,21 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.5", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + [[package]] name = "dtoa" version = "1.0.9" @@ -963,9 +1088,9 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dtoa-short" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" dependencies = [ "dtoa", ] @@ -978,15 +1103,16 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "embed-resource" -version = "2.4.0" +version = "2.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2" +checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602" dependencies = [ "cc", + "memchr", "rustc_version", - "toml 0.8.8", + "toml 0.8.15", "vswhom", - "winreg 0.51.0", + "winreg 0.52.0", ] [[package]] @@ -997,18 +1123,24 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -1016,13 +1148,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] @@ -1033,36 +1165,25 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] [[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" +name = "error-code" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "event-listener" -version = "4.0.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1071,34 +1192,25 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.0", + "event-listener", "pin-project-lite", ] [[package]] name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -1118,27 +1230,33 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "rustc_version", ] [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1156,7 +1274,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", ] [[package]] @@ -1165,6 +1304,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1174,6 +1319,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futf" version = "0.1.5" @@ -1186,24 +1337,24 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1212,32 +1363,17 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-lite" -version = "1.13.0" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -1246,32 +1382,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-io", @@ -1332,7 +1468,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1349,7 +1485,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1363,7 +1499,7 @@ dependencies = [ "gobject-sys", "libc", "pkg-config", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1375,7 +1511,7 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", "x11", ] @@ -1402,6 +1538,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + [[package]] name = "getrandom" version = "0.1.16" @@ -1415,9 +1561,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1426,9 +1572,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" @@ -1456,7 +1602,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", "winapi", ] @@ -1488,7 +1634,7 @@ checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" dependencies = [ "anyhow", "heck 0.4.1", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -1502,7 +1648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1520,8 +1666,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -1532,7 +1678,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1573,7 +1719,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1583,7 +1729,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -1592,36 +1738,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.11", - "indexmap 2.1.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 1.0.0", - "indexmap 2.1.0", + "http 0.2.12", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -1633,12 +1760,15 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -1655,11 +1785,23 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -1668,17 +1810,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "html5ever" -version = "0.25.2" +name = "home" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "log", - "mac", - "markup5ever 0.10.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "windows-sys 0.52.0", ] [[package]] @@ -1689,7 +1826,7 @@ checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" dependencies = [ "log", "mac", - "markup5ever 0.11.0", + "markup5ever", "proc-macro2", "quote", "syn 1.0.109", @@ -1697,57 +1834,57 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.9", + "itoa 1.0.11", ] [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", - "itoa 1.0.9", + "itoa 1.0.11", ] [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.0.0", + "http 1.1.0", ] [[package]] name = "http-body-util" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -1759,9 +1896,9 @@ checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1771,22 +1908,22 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2 0.3.22", - "http 0.2.11", - "http-body 0.4.5", + "h2", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", - "itoa 1.0.9", + "itoa 1.0.11", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -1795,20 +1932,20 @@ dependencies = [ [[package]] name = "hyper" -version = "1.0.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.0", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "httparse", "httpdate", - "itoa 1.0.9", + "itoa 1.0.11", "pin-project-lite", + "smallvec", "tokio", ] @@ -1819,7 +1956,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.27", + "hyper 0.14.30", "native-tls", "tokio", "tokio-native-tls", @@ -1827,36 +1964,31 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.1" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca339002caeb0d159cc6e023dff48e199f081e42fa039895c7c6f38b37f2e9d" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", - "futures-channel", "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "hyper 1.0.1", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", "pin-project-lite", - "socket2 0.5.5", "tokio", - "tower", - "tower-service", - "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1906,15 +2038,15 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ "crossbeam-deque", "globset", "log", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.7", "same-file", "walkdir", "winapi-util", @@ -1922,17 +2054,29 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-rational", "num-traits", ] +[[package]] +name = "image" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "num-traits", + "png", + "tiff", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -1946,12 +2090,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -1975,9 +2119,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -1995,17 +2139,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -2020,9 +2153,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "javascriptcore-rs" @@ -2067,37 +2200,30 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "json-patch" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" +checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" dependencies = [ "serde", "serde_json", "thiserror", - "treediff", -] - -[[package]] -name = "kuchiki" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" -dependencies = [ - "cssparser", - "html5ever 0.25.2", - "matches", - "selectors", ] [[package]] @@ -2107,7 +2233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" dependencies = [ "cssparser", - "html5ever 0.26.0", + "html5ever", "indexmap 1.9.3", "matches", "selectors", @@ -2115,9 +2241,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libappindicator" @@ -2139,15 +2265,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" dependencies = [ "gtk-sys", - "libloading", + "libloading 0.7.4", "once_cell", ] [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -2160,42 +2286,36 @@ dependencies = [ ] [[package]] -name = "libredox" -version = "0.0.1" +name = "libloading" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall 0.4.1", + "cfg-if", + "windows-targets 0.52.6", ] [[package]] -name = "line-wrap" -version = "0.1.1" +name = "libredox" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "safemem", + "bitflags 2.6.0", + "libc", ] [[package]] name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2203,9 +2323,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "value-bag", ] @@ -2249,22 +2369,8 @@ name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markup5ever" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" -dependencies = [ - "log", - "phf 0.8.0", - "phf_codegen 0.8.0", - "string_cache", - "string_cache_codegen", - "tendril", +dependencies = [ + "libc", ] [[package]] @@ -2304,9 +2410,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -2319,9 +2425,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -2332,6 +2438,12 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "minisign-verify" version = "0.2.1" @@ -2340,9 +2452,9 @@ checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -2350,9 +2462,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -2361,11 +2473,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -2407,9 +2518,9 @@ dependencies = [ [[package]] name = "new_debug_unreachable" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nix" @@ -2423,17 +2534,52 @@ dependencies = [ "memoffset 0.7.1", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.1.1", + "libc", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", + "memoffset 0.9.1", +] + [[package]] name = "nodrop" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "notify-rust" -version = "4.10.0" +version = "4.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226" +checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" dependencies = [ "log", "mac-notification-sys", @@ -2453,31 +2599,16 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2488,7 +2619,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] @@ -2507,7 +2638,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -2515,9 +2646,9 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] @@ -2545,9 +2676,9 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" @@ -2556,7 +2687,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" dependencies = [ "objc-sys", - "objc2-encode", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2 0.5.2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", ] [[package]] @@ -2565,6 +2746,49 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2 0.5.2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -2585,18 +2809,18 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" @@ -2610,13 +2834,13 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "cfg-if", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -2631,7 +2855,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] @@ -2642,9 +2866,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.96" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -2670,23 +2894,23 @@ dependencies = [ [[package]] name = "os_info" -version = "3.7.0" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", "serde", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "os_pipe" -version = "1.1.4" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" +checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2717,7 +2941,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -2728,9 +2952,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2738,15 +2962,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -2761,6 +2985,16 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap 2.2.6", +] + [[package]] name = "phf" version = "0.8.0" @@ -2865,7 +3099,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] @@ -2897,29 +3131,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2929,40 +3163,39 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.5", - "indexmap 2.1.0", - "line-wrap", - "quick-xml 0.31.0", + "base64 0.22.1", + "indexmap 2.2.6", + "quick-xml 0.32.0", "serde", "time", ] [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2973,30 +3206,15 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.3.1" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.26", + "rustix", "tracing", "windows-sys 0.52.0", ] @@ -3029,6 +3247,15 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3061,20 +3288,31 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] -name = "quick-xml" -version = "0.30.0" +name = "ptr_meta" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" dependencies = [ - "memchr", + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -3086,15 +3324,39 @@ dependencies = [ "memchr", ] +[[package]] +name = "quick-xml" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +dependencies = [ + "memchr", +] + [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.7.3" @@ -3155,7 +3417,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.15", ] [[package]] @@ -3184,43 +3446,43 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.15", "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -3234,13 +3496,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] @@ -3251,25 +3513,34 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "rend" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.22", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.27", + "h2", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.30", "hyper-tls", "ipnet", "js-sys", @@ -3279,9 +3550,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", @@ -3319,11 +3592,56 @@ dependencies = [ "windows 0.37.0", ] +[[package]] +name = "rkyv" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rust_decimal" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +dependencies = [ + "arrayvec 0.7.4", + "borsh", + "bytes", + "num-traits", + "rand 0.8.5", + "rkyv", + "serde", + "serde_json", +] + [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -3336,48 +3654,37 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "errno", - "io-lifetimes", "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", + "linux-raw-sys", + "windows-sys 0.52.0", ] [[package]] -name = "rustix" -version = "0.38.26" +name = "rustls-pemfile" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys 0.4.12", - "windows-sys 0.52.0", + "base64 0.21.7", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "safemem" -version = "0.3.3" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3390,11 +3697,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3409,13 +3716,19 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3424,9 +3737,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3454,51 +3767,52 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ - "itoa 1.0.9", + "indexmap 2.2.6", + "itoa 1.0.11", "ryu", "serde", ] [[package]] name = "serde_path_to_error" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ - "itoa 1.0.9", + "itoa 1.0.11", "serde", ] @@ -3515,20 +3829,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -3540,23 +3854,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.9", + "itoa 1.0.11", "ryu", "serde", ] [[package]] name = "serde_with" -version = "3.4.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ - "base64 0.21.5", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", + "serde_derive", "serde_json", "serde_with_macros", "time", @@ -3564,24 +3879,24 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.4.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "serde_yaml" -version = "0.9.27" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.1.0", - "itoa 1.0.9", + "indexmap 2.2.6", + "itoa 1.0.11", "ryu", "serde", "unsafe-libyaml", @@ -3662,9 +3977,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3675,6 +3990,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + [[package]] name = "siphasher" version = "0.3.11" @@ -3691,29 +4012,19 @@ dependencies = [ ] [[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3802,9 +4113,9 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" @@ -3819,21 +4130,39 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "sync_wrapper" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "sys-locale" version = "0.2.4" @@ -3883,29 +4212,29 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "cfg-expr 0.15.5", - "heck 0.4.1", + "cfg-expr 0.15.8", + "heck 0.5.0", "pkg-config", - "toml 0.8.8", - "version-compare 0.1.1", + "toml 0.8.15", + "version-compare 0.2.0", ] [[package]] name = "tao" -version = "0.16.5" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f5aefd6be4cd3ad3f047442242fd9f57cbfb3e565379f66b5e14749364fa4f" +checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab" dependencies = [ "bitflags 1.3.2", "cairo-rs", "cc", "cocoa", "core-foundation", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dirs-next", "dispatch", @@ -3918,7 +4247,7 @@ dependencies = [ "glib", "glib-sys", "gtk", - "image", + "image 0.24.9", "instant", "jni", "lazy_static", @@ -3939,7 +4268,7 @@ dependencies = [ "unicode-segmentation", "uuid", "windows 0.39.0", - "windows-implement", + "windows-implement 0.39.0", "x11-dl", ] @@ -3954,11 +4283,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -3967,34 +4302,38 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "tauri" -version = "1.5.3" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d563b672acde8d0cc4c1b1f5b855976923f67e8d6fe1eba51df0211e197be2" +checksum = "336bc661a3f3250853fa83c6e5245449ed1c26dce5dcb28bdee7efedf6278806" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", "bytes", "cocoa", "dirs-next", + "dunce", "embed_plist", "encoding_rs", "flate2", "futures-util", + "getrandom 0.2.15", "glib", "glob", "gtk", - "heck 0.4.1", - "http 0.2.11", + "heck 0.5.0", + "http 0.2.12", "ico 0.2.0", "ignore", + "indexmap 1.9.3", "infer 0.9.0", "minisign-verify", + "nix 0.26.4", "notify-rust", "objc", "once_cell", @@ -4034,14 +4373,14 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.5.0" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c" +checksum = "b0c6ec7a5c3296330c7818478948b422967ce4649094696c985f61d50076d29c" dependencies = [ "anyhow", "cargo_toml", "dirs-next", - "heck 0.4.1", + "heck 0.5.0", "json-patch", "semver", "serde", @@ -4053,11 +4392,11 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.4.1" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb" +checksum = "c1aed706708ff1200ec12de9cfbf2582b5d8ec05f6a7293911091effbd22036b" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "brotli", "ico 0.3.0", "json-patch", @@ -4079,11 +4418,11 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "1.4.2" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acea6445eececebd72ed7720cfcca46eee3b5bad8eb408be8f7ef2e3f7411500" +checksum = "b88f831d2973ae4f81a706a0004e67dac87f2e4439973bbe98efbd73825d8ede" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 1.0.109", @@ -4100,7 +4439,7 @@ dependencies = [ "dirs", "interprocess", "log", - "objc2", + "objc2 0.4.1", "once_cell", "tauri-utils", "windows-sys 0.48.0", @@ -4110,7 +4449,7 @@ dependencies = [ [[package]] name = "tauri-plugin-log" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#6ca80db9ac3ebd4031968f50a85f7df524d641a3" dependencies = [ "byte-unit", "fern", @@ -4125,7 +4464,7 @@ dependencies = [ [[package]] name = "tauri-plugin-store" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#6ca80db9ac3ebd4031968f50a85f7df524d641a3" dependencies = [ "log", "serde", @@ -4136,12 +4475,12 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.14.1" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43" +checksum = "3068ed62b63dedc705558f4248c7ecbd5561f0f8050949859ea0db2326f26012" dependencies = [ "gtk", - "http 0.2.11", + "http 0.2.12", "http-range", "rand 0.8.5", "raw-window-handle", @@ -4157,10 +4496,11 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.14.2" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803a01101bc611ba03e13329951a1bde44287a54234189b9024b78619c1bc206" +checksum = "d4c3db170233096aa30330feadcd895bf9317be97e624458560a20e814db7955" dependencies = [ + "arboard", "cocoa", "gtk", "percent-encoding", @@ -4177,16 +4517,16 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a52165bb340e6f6a75f1f5eeeab1bb49f861c12abe3a176067d53642b5454986" +checksum = "2826db448309d382dac14d520f0c0a40839b87b57b977e59cf5f296b3ace6a93" dependencies = [ "brotli", "ctor", "dunce", "glob", - "heck 0.4.1", - "html5ever 0.26.0", + "heck 0.5.0", + "html5ever", "infer 0.13.0", "json-patch", "kuchikiki", @@ -4217,25 +4557,25 @@ dependencies = [ [[package]] name = "tauri-winrt-notification" -version = "0.1.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" dependencies = [ - "quick-xml 0.30.0", - "windows 0.51.1", + "quick-xml 0.31.0", + "windows 0.56.0", + "windows-version", ] [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.26", - "windows-sys 0.48.0", + "fastrand", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -4251,9 +4591,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -4266,43 +4606,55 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", ] +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa 1.0.9", + "itoa 1.0.11", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -4318,18 +4670,19 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4348,9 +4701,9 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[package]] name = "tokio" -version = "1.34.0" +version = "1.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", @@ -4359,10 +4712,22 @@ dependencies = [ "num_cpus", "parking_lot", "pin-project-lite", - "socket2 0.5.5", + "socket2", + "tokio-macros", "windows-sys 0.48.0", ] +[[package]] +name = "tokio-macros" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "tokio-native-tls" version = "0.3.1" @@ -4375,9 +4740,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", @@ -4387,16 +4752,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4422,21 +4786,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.22.16", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -4447,24 +4811,35 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.14", ] [[package]] @@ -4485,14 +4860,14 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da193277a4e2c33e59e09b5861580c33dd0a637c3883d0fa74ba40c0374af2e" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "bytes", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", "pin-project-lite", "tower-layer", @@ -4531,7 +4906,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", ] [[package]] @@ -4574,19 +4949,24 @@ dependencies = [ ] [[package]] -name = "treediff" -version = "4.0.2" +name = "tree_magic_mini" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" +checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2" dependencies = [ - "serde_json", + "fnv", + "home", + "memchr", + "nom", + "once_cell", + "petgraph", ] [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ts-rs" @@ -4614,14 +4994,14 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", "bytes", "data-encoding", - "http 0.2.11", + "http 1.1.0", "httparse", "log", "rand 0.8.5", @@ -4639,19 +5019,20 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.1", "tempfile", "winapi", ] [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -4661,30 +5042,30 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4706,17 +5087,17 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.6.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.15", ] [[package]] @@ -4727,9 +5108,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "vcpkg" @@ -4745,9 +5126,9 @@ checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -4781,32 +5162,26 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" dependencies = [ - "arrayvec", + "arrayvec 0.5.2", "utf8parse", "vte_generate_state_changes", ] [[package]] name = "vte_generate_state_changes" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" dependencies = [ "proc-macro2", "quote", ] -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4835,9 +5210,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4845,24 +5220,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -4872,9 +5247,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4882,28 +5257,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -4912,11 +5287,84 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wayland-backend" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +dependencies = [ + "bitflags 2.6.0", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +dependencies = [ + "proc-macro2", + "quick-xml 0.34.0", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -4966,7 +5414,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -4978,7 +5426,7 @@ dependencies = [ "webview2-com-macros", "webview2-com-sys", "windows 0.39.0", - "windows-implement", + "windows-implement 0.39.0", ] [[package]] @@ -5007,6 +5455,12 @@ dependencies = [ "windows-metadata", ] +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + [[package]] name = "winapi" version = "0.3.9" @@ -5025,11 +5479,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -5069,7 +5523,7 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" dependencies = [ - "windows-implement", + "windows-implement 0.39.0", "windows_aarch64_msvc 0.39.0", "windows_i686_gnu 0.39.0", "windows_i686_msvc 0.39.0", @@ -5088,12 +5542,12 @@ dependencies = [ [[package]] name = "windows" -version = "0.51.1" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-core", - "windows-targets 0.48.5", + "windows-core 0.56.0", + "windows-targets 0.52.6", ] [[package]] @@ -5108,11 +5562,23 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement 0.56.0", + "windows-interface", + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -5125,12 +5591,43 @@ dependencies = [ "windows-tokens", ] +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "windows-metadata" version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.42.0" @@ -5170,7 +5667,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -5205,17 +5702,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -5226,11 +5724,11 @@ checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" [[package]] name = "windows-version" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -5247,9 +5745,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5277,9 +5775,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -5307,9 +5805,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -5337,9 +5841,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5367,9 +5871,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5385,9 +5889,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5415,15 +5919,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] [[package]] name = "winnow" -version = "0.5.19" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "374ec40a2d767a3c1b4972d9475ecd557356637be906f2cb3f7fe17a6eb5e22f" dependencies = [ "memchr", ] @@ -5440,33 +5953,53 @@ dependencies = [ [[package]] name = "winreg" -version = "0.51.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", ] +[[package]] +name = "wl-clipboard-rs" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12b41773911497b18ca8553c3daaf8ec9fe9819caf93d451d3055f69de028adb" +dependencies = [ + "derive-new", + "libc", + "log", + "nix 0.28.0", + "os_pipe", + "tempfile", + "thiserror", + "tree_magic_mini", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", +] + [[package]] name = "wry" -version = "0.24.6" +version = "0.24.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a70547e8f9d85da0f5af609143f7bde3ac7457a6e1073104d9b73d6c5ac744" +checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45" dependencies = [ "base64 0.13.1", "block", "cocoa", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dunce", "gdk", "gio", "glib", "gtk", - "html5ever 0.25.2", - "http 0.2.11", - "kuchiki", + "html5ever", + "http 0.2.12", + "kuchikiki", "libc", "log", "objc", @@ -5483,7 +6016,16 @@ dependencies = [ "webkit2gtk-sys", "webview2-com", "windows 0.39.0", - "windows-implement", + "windows-implement 0.39.0", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", ] [[package]] @@ -5507,51 +6049,67 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "gethostname", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ - "nix", - "winapi", + "libc", + "windows-sys 0.52.0", ] [[package]] name = "zbus" -version = "3.14.1" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix", - "once_cell", + "nix 0.29.0", "ordered-stream", "rand 0.8.5", "serde", @@ -5560,7 +6118,7 @@ dependencies = [ "static_assertions", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -5569,23 +6127,22 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.72", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -5605,13 +6162,12 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "zvariant_derive", @@ -5619,24 +6175,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] diff --git a/pkgs/development/tools/devpod/add-tauri-updater-feature.patch b/pkgs/development/tools/devpod/add-tauri-updater-feature.patch index 3fc7ac991099e..166948c78a03e 100644 --- a/pkgs/development/tools/devpod/add-tauri-updater-feature.patch +++ b/pkgs/development/tools/devpod/add-tauri-updater-feature.patch @@ -7,7 +7,6 @@ index 03f64e53..9e2ddcb6 100644 # Tauri tauri = { version = "1.2.4", features = [ + "updater", + "dialog-save", "process-relaunch", "window-close", - "notification-all", - diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 9be99097751b0..057c0d1e9df57 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -23,13 +23,13 @@ let pname = "devpod"; - version = "0.5.19"; + version = "0.5.20"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SQac42C6tVFSP5Gx2s6uP4OKW+b+FoT7/+Lo3W178p0="; + sha256 = "sha256-8LbqrOKC1als3Xm6ZuU2AySwT0UWjLN2xh+/CvioYew="; }; meta = with lib; { @@ -80,7 +80,7 @@ rec { offlineCache = fetchYarnDeps { yarnLock = "${src}/desktop/yarn.lock"; - sha256 = "sha256-I+c0zrybNv3iS+Wy+n+NlBalA6gLYuxBw00mAJbqgfU="; + hash = "sha256-vUV4yX+UvEKrP0vHxjGwtW2WyONGqHVmFor+WqWbkCc="; }; packageJSON = ./package.json; @@ -96,7 +96,7 @@ rec { dontInstall = true; }; - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; + rustTargetPlatformSpec = stdenv.hostPlatform.rust.rustcTarget; in rustPlatform.buildRustPackage { inherit version src; @@ -107,7 +107,7 @@ rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "tauri-plugin-log-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U="; + "tauri-plugin-log-0.0.0" = "sha256-tM6oLJe/wwqDDNMKBeMa5nNVvsmi5b104xMOvtm974Y="; }; }; @@ -122,7 +122,7 @@ rec { cp -r ${frontend-build} frontend-build substituteInPlace tauri.conf.json --replace '"distDir": "../dist",' '"distDir": "frontend-build",' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" @@ -134,20 +134,20 @@ rec { nativeBuildInputs = [ copyDesktopItems pkg-config - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ jq - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ libsoup openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 libayatana-appindicator webkitgtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.WebKit diff --git a/pkgs/development/tools/devpod/package.json b/pkgs/development/tools/devpod/package.json index 9cabd21c905f0..1efadc72ce6fa 100644 --- a/pkgs/development/tools/devpod/package.json +++ b/pkgs/development/tools/devpod/package.json @@ -26,7 +26,7 @@ "@tanstack/react-query": "4.36.1", "@tanstack/react-query-devtools": "4.36.1", "@tanstack/react-table": "8.10.7", - "@tauri-apps/api": "1.5.1", + "@tauri-apps/api": "1.5.3", "dayjs": "1.11.10", "framer-motion": "10.16.9", "markdown-to-jsx": "7.3.2", @@ -36,14 +36,14 @@ "react-icons": "4.12.0", "react-router": "6.20.0", "react-router-dom": "6.20.0", - "tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store", + "tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store#v1", "uuid": "9.0.1", "xterm": "5.3.0", "xterm-addon-fit": "0.7.0" }, "devDependencies": { "@tanstack/eslint-plugin-query": "4.36.1", - "@tauri-apps/cli": "1.5.2", + "@tauri-apps/cli": "1.5.11", "@types/node": "18.15.3", "@types/react": "18.2.28", "@types/react-dom": "18.2.13", @@ -54,10 +54,13 @@ "eslint": "8.44.0", "eslint-config-prettier": "8.8.0", "eslint-config-react-app": "7.0.1", - "eslint-plugin-react": "7.32.2", + "eslint-plugin-react": "7.34.1", "eslint-plugin-react-hooks": "4.6.0", "prettier": "3.0.3", "typescript": "5.0.4", "vite": "4.4.9" + }, + "resolutions": { + "lodash": "4.17.21" } } diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index a29e3a23a26b0..06cb34499a726 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs gpgme lvm2 ]; patches = [ # fix scrolling diff --git a/pkgs/development/tools/djlint/default.nix b/pkgs/development/tools/djlint/default.nix index 1929175c956a6..84cfb65522ecb 100644 --- a/pkgs/development/tools/djlint/default.nix +++ b/pkgs/development/tools/djlint/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "djlint"; - version = "1.34.1"; + version = "1.35.2"; pyproject = true; src = fetchFromGitHub { owner = "Riverside-Healthcare"; repo = "djlint"; rev = "refs/tags/v${version}"; - hash = "sha256-p9RIzX9zoZxBrhiNaIeCX9OgfQm/lXNwYsh6IcsnIVk="; + hash = "sha256-KdIK6SgOQiNc13Nzg6MI38BdkBdEClnMn1RcWvngP+A="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 0ab4b2a4a2f3d..8e274ee1b5644 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.109.1"; + version = "1.115.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-K27K79OAQERREu5doQGhy87XV5Fz4uZWctsZj+GiON0="; + sha256 = "sha256-Q/1AkP+KWomloe/kVtR0TUDfOf9CVldDqeLFYsBisc4="; }; meta = with lib; { diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 35fcdc7095214..455f18ba0a3dd 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv spdlog sqlite ] ++ lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cmakeFlags = [ "-DICONV_INCLUDE_DIR=${libiconv}/include" @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; + lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.9"; # put examples in an output so people/tools can test against them outputs = [ "out" "examples" ]; diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index fbd8ea3708660..d6b1266ab393f 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-86ecnwDDVvgXgBBodP2rSZOn+R52Jap8RCKILttGOn8="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index 631051ee3a2d1..7f723096a8a72 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -17,7 +17,7 @@ let pname = "dump_syms"; - version = "2.3.3"; + version = "2.3.4"; in rustPlatform.buildRustPackage { inherit pname version; @@ -26,10 +26,10 @@ rustPlatform.buildRustPackage { owner = "mozilla"; repo = pname; rev = "v${version}"; - hash = "sha256-pZlWA7LZeMb+ZhnfQh9MzvDDlre1kkPc6aSVNZcVi/w="; + hash = "sha256-6VDuZ5rw2N4z6wOVbaOKO6TNaq8QA5RstsIzmuE3QrI="; }; - cargoHash = "sha256-srphb7jFSJB08hSShk3f5QYPoYu8UwbUzkzn0zpMqyg="; + cargoHash = "sha256-ndRw5z4CfuX0KNqNgpA4yohG8p/cUR/Op2fIunuO6GM="; nativeBuildInputs = [ pkg-config @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ Security SystemConfiguration ]; diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 576c3edd405c6..e36971390d4f7 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { "-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${version}" "-X main.GitSha=v${version}" "-X main.DefaultInstallationName=earthly" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" ]; diff --git a/pkgs/development/tools/ec2-metadata-mock/default.nix b/pkgs/development/tools/ec2-metadata-mock/default.nix index 4b398629cab1a..5663782852c1b 100644 --- a/pkgs/development/tools/ec2-metadata-mock/default.nix +++ b/pkgs/development/tools/ec2-metadata-mock/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ec2-metadata-mock"; - version = "1.11.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ec2-metadata-mock"; rev = "v${version}"; - sha256 = "sha256-hYyJtkwAzweH8boUY3vrvy6Ug+Ier5f6fvR52R+Di8o="; + sha256 = "sha256-8X6LBGo496fG0Chhvg3jAaUF6mp8psCzHd+Es75z27Y="; }; - vendorHash = "sha256-T45abGVoiwxAEO60aPH3hUqiH6ON3aRhkrOFcOi+Bm8="; + vendorHash = "sha256-jRJX4hvfRuhR5TlZe7LsXaOlUCwmQGem2QKlX3vuk8c="; postInstall = '' mv $out/bin/{cmd,ec2-metadata-mock} diff --git a/pkgs/development/tools/ejs/default.nix b/pkgs/development/tools/ejs/default.nix deleted file mode 100644 index b9242836b62be..0000000000000 --- a/pkgs/development/tools/ejs/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "ejs"; - version = "3.1.9"; - - src = fetchFromGitHub { - owner = "mde"; - repo = "ejs"; - rev = "v${version}"; - hash = "sha256-bOZclhsnV3onxc32ZGfLpuGS5Jz6S12/BmkmwL4M6Dg="; - }; - - npmDepsHash = "sha256-829eWfJiMw9KRlhdmzD0ha//bgUQ5nPEzO+ayUPLxXY="; - - buildPhase = '' - runHook preBuild - - ./node_modules/.bin/jake build - - runHook postBuild - ''; - - meta = { - description = "Embedded JavaScript templates"; - homepage = "http://ejs.co"; - license = lib.licenses.asl20; - mainProgram = "ejs"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/ejson/Gemfile b/pkgs/development/tools/ejson/Gemfile deleted file mode 100644 index f860fe5075d46..0000000000000 --- a/pkgs/development/tools/ejson/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'fpm' -gem 'ronn' diff --git a/pkgs/development/tools/ejson/Gemfile.lock b/pkgs/development/tools/ejson/Gemfile.lock deleted file mode 100644 index d0a51c0a06238..0000000000000 --- a/pkgs/development/tools/ejson/Gemfile.lock +++ /dev/null @@ -1,54 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - arr-pm (0.0.10) - cabin (> 0) - backports (3.14.0) - cabin (0.9.0) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) - clamp (1.0.1) - dotenv (2.7.2) - ffi (1.10.0) - fpm (1.11.0) - arr-pm (~> 0.0.10) - backports (>= 2.6.2) - cabin (>= 0.6.0) - childprocess (= 0.9.0) - clamp (~> 1.0.0) - ffi - json (>= 1.7.7, < 2.0) - pleaserun (~> 0.0.29) - ruby-xz (~> 0.2.3) - stud - hpricot (0.8.6) - insist (1.0.0) - io-like (0.3.0) - json (1.8.6) - mustache (0.99.8) - pleaserun (0.0.30) - cabin (> 0) - clamp - dotenv - insist - mustache (= 0.99.8) - stud - rdiscount (2.2.0.1) - ronn (0.7.3) - hpricot (>= 0.8.2) - mustache (>= 0.7.0) - rdiscount (>= 1.5.8) - ruby-xz (0.2.3) - ffi (~> 1.9) - io-like (~> 0.3) - stud (0.0.23) - -PLATFORMS - ruby - -DEPENDENCIES - fpm - ronn - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix index 42e5e6cb33a52..9c4427dc4ea9e 100644 --- a/pkgs/development/tools/ejson/default.nix +++ b/pkgs/development/tools/ejson/default.nix @@ -1,38 +1,26 @@ -{ lib, bundlerEnv, ruby, buildGoModule, fetchFromGitHub }: -let - # needed for manpage generation - gems = bundlerEnv { - name = "ejson-gems"; - gemdir = ./.; - inherit ruby; - }; -in +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + buildGoModule rec { pname = "ejson"; - version = "1.3.3"; + version = "1.5.2"; src = fetchFromGitHub { owner = "Shopify"; repo = "ejson"; rev = "v${version}"; - sha256 = "sha256-M2Gk+/l1tNlIAe1/fR1WLEOey+tjCUmMAujc76gmeZA="; + sha256 = "sha256-Pv0eoFf/E+PE/C+0wsSQxhVTlymOMAYk5UVQP2udpnA="; }; - vendorHash = "sha256-9+x7HrbXRoS/7ZADWwhsbynQLr3SyCbcsp9QnSubov0="; - - nativeBuildInputs = [ gems ]; - - ldflags = [ "-s" "-w" ]; - - # set HOME, otherwise bundler will insert stuff in the manpages - postBuild = '' - HOME=$PWD make man SHELL=$SHELL - ''; + vendorHash = "sha256-N2vcj3STkaZO2eRr8VztZTWOBUTI+wOri0HYDJ1KiN8="; - postInstall = '' - mkdir -p $out/share - cp -r build/man $out/share - ''; + ldflags = [ + "-s" + "-w" + ]; meta = with lib; { description = "Small library to manage encrypted secrets using asymmetric encryption"; diff --git a/pkgs/development/tools/ejson/gemset.nix b/pkgs/development/tools/ejson/gemset.nix deleted file mode 100644 index 93fa1131f2a7a..0000000000000 --- a/pkgs/development/tools/ejson/gemset.nix +++ /dev/null @@ -1,188 +0,0 @@ -{ - arr-pm = { - dependencies = ["cabin"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg"; - type = "gem"; - }; - version = "0.0.10"; - }; - backports = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn"; - type = "gem"; - }; - version = "3.14.0"; - }; - cabin = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0b3b8j3iqnagjfn1261b9ncaac9g44zrx1kcg81yg4z9i513kici"; - type = "gem"; - }; - version = "0.9.0"; - }; - childprocess = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; - type = "gem"; - }; - version = "0.9.0"; - }; - clamp = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jb6l4scp69xifhicb5sffdixqkw8wgkk9k2q57kh2y36x1px9az"; - type = "gem"; - }; - version = "1.0.1"; - }; - dotenv = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13cis6bf06hmz744xrsl163p6gb78xcm8g8q4pcabsy5ywyv6kag"; - type = "gem"; - }; - version = "2.7.2"; - }; - ffi = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; - type = "gem"; - }; - version = "1.10.0"; - }; - fpm = { - dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0khzsiqzswxpql6w2ws9dawb27zgv4nmgrjszydmm0xpv6h21jrm"; - type = "gem"; - }; - version = "1.11.0"; - }; - hpricot = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z"; - type = "gem"; - }; - version = "0.8.6"; - }; - insist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bw3bdwns14mapbgb8cbjmr0amvwz8y72gyclq04xp43wpp5jrvg"; - type = "gem"; - }; - version = "1.0.0"; - }; - io-like = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04nn0s2wmgxij3k760h3r8m1dgih5dmd9h4v1nn085yi824i5z6k"; - type = "gem"; - }; - version = "0.3.0"; - }; - json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; - type = "gem"; - }; - version = "1.8.6"; - }; - mustache = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; - type = "gem"; - }; - version = "0.99.8"; - }; - pleaserun = { - dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p"; - type = "gem"; - }; - version = "0.0.30"; - }; - rdiscount = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3"; - type = "gem"; - }; - version = "2.2.0.1"; - }; - ronn = { - dependencies = ["hpricot" "mustache" "rdiscount"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07plsxxfx5bxdk72ii9za6km0ziqlq8jh3bicr4774dalga6zpw2"; - type = "gem"; - }; - version = "0.7.3"; - }; - ruby-xz = { - dependencies = ["ffi" "io-like"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw"; - type = "gem"; - }; - version = "0.2.3"; - }; - stud = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qpb57cbpm9rwgsygqxifca0zma87drnlacv49cqs2n5iyi6z8kb"; - type = "gem"; - }; - version = "0.0.23"; - }; -} diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 60255d21bcb1a..39f1d1011b33a 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -166,5 +166,5 @@ in stdenv.mkDerivation (finalAttrs: lib.recursiveUpdate (common stdenv.hostPlatform) - ((if stdenv.isDarwin then darwin else linux) finalAttrs) + ((if stdenv.hostPlatform.isDarwin then darwin else linux) finalAttrs) ) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 89308480266e7..a51217873b5b4 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -45,24 +45,35 @@ }, "30": { "hashes": { - "aarch64-darwin": "2238c45a85b2c78aed00aeaf15bbfa2f64b4d13e48cc6b9bc330f24c4d214595", - "aarch64-linux": "aa422122373b84f4eb8ce937937b1b6fe8fb3975c3edafb9df85f7fba449afd4", - "armv7l-linux": "3643857e1eec3037ad6f07e755bffc64f033a7196307ff0386bf67c9cc3ec31e", - "headers": "1zpl51g8d0j6xw4h2pw1wy6qlwgxj37x4lsj377kg27y809rf5ah", - "x86_64-darwin": "6e633bf87be9f8bf46dff9733cfd0d611e018ae5df75f30735747721f91fcf43", - "x86_64-linux": "b365aac23c61dc0b18002c60937c4842e814cbe6d8e6a34e4dc211774ebaec01" + "aarch64-darwin": "d312544ea29844cf328b44b9dbde12f4fdced90cb442dfca6df36c098dbb6e7a", + "aarch64-linux": "eb31470c0d7cd6e23e7ce0d89cc93a2356c9dac8bcc997e335353b8aa995afa0", + "armv7l-linux": "224bd46983e503101c756c72d10b195f14712a7a56438718acb126017dd04edf", + "headers": "0db38ndw9rrd8ixa14761cbff6ns31b6302bzx5q4in8i4dkrrs3", + "x86_64-darwin": "faf9dcc20d525607ea205f2f6a1dfe3270f6268aa439bb0ba5646c7e4fbbd842", + "x86_64-linux": "ec4707783d39e86005f42899e30ae59e50dd5d9c7f28531ed494eb43f2361403" }, - "version": "30.4.0" + "version": "30.5.1" }, "31": { "hashes": { - "aarch64-darwin": "4cd04f75e97f6cdfee1d166c7756b9a3c7341e51a7b12255c37bd46fa5a45da5", - "aarch64-linux": "37fbede76b30bad461cbfa3efec8aef07a34f6991c71c50a69ac489623413098", - "armv7l-linux": "7a6cba2d78ef3ff776d9482121f9b2400370da23b3065bfdafc4cd83c8bbe423", - "headers": "0iclnzcihiw7bnf7nn0p56m8zz8cwn951ccf6g52d7pfr791gbnv", - "x86_64-darwin": "e177e9846bfe63eefea3ecd6a889e9865e1fba21b93179a0cde08bd7c94796ee", - "x86_64-linux": "9b95e66cb4d55bb632e37bcb6083992a5d665f0b378466a771a2948c1aab57b7" + "aarch64-darwin": "dec23ecc15f4d0503163c5f65f59114127ce6d2518af8e6547ea787372575fcb", + "aarch64-linux": "1911b1cef253d68fead45432e93740223c686ebc11c931bdd08439ec88030cfd", + "armv7l-linux": "957d888d016270b658fb558f6e2061ffaa7f71c9d2b1c73c4f122342519ba741", + "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88", + "x86_64-darwin": "4d5d21963bf833ccc25edbc2e8e884f408e24c2a39b53f1d0c30f4017ac2ba8a", + "x86_64-linux": "86b3794aba055e84f23cba5d8319ca9f23a05385d2c06fe7d78d24d2bb356b67" }, - "version": "31.4.0" + "version": "31.6.0" + }, + "32": { + "hashes": { + "aarch64-darwin": "b5f6db900997ba931c98addaef28744a0a6af0f2ec2e8e5755f7f50db2fe8bbc", + "aarch64-linux": "702326c51679ed705bc22d7e4049b29cef2d66366d3387c401836aaae0fa450c", + "armv7l-linux": "d9511449c328f90f47e499f44c6d84c6204d4a3a2caec5c5d52f176cfc77f50d", + "headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk", + "x86_64-darwin": "150ac6a59e31ad516685bdbb9cee67c7e927b872ad94ffc900fbf6616433f8ab", + "x86_64-linux": "b51e5f1296f8971d7eb4ca86606b6f5d31fb3dab8caa91dcfbfa522be5679691" + }, + "version": "32.1.2" } } diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix index edd648713e27a..1eb1a8d870b83 100644 --- a/pkgs/development/tools/electron/chromedriver/generic.nix +++ b/pkgs/development/tools/electron/chromedriver/generic.nix @@ -92,5 +92,5 @@ let in stdenv.mkDerivation ( (common stdenv.hostPlatform) // - (if stdenv.isDarwin then darwin else linux) + (if stdenv.hostPlatform.isDarwin then darwin else linux) ) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index c6f0d90416b6b..3cb6b6a756c54 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -12,24 +12,35 @@ }, "30": { "hashes": { - "aarch64-darwin": "3e432bd550279c2d58c6a02b0bda048fa2a9a89aef9752e22c39a518a83fe96f", - "aarch64-linux": "338f2a361448e78aa8c319cd582f2dd6d891d6c0c66b676c628e50511c27514f", - "armv7l-linux": "8cffae19618fe5f0eaff40378c40084e18f9747bbbe2d87390203a3012c98367", - "headers": "1zpl51g8d0j6xw4h2pw1wy6qlwgxj37x4lsj377kg27y809rf5ah", - "x86_64-darwin": "4d38f40ec33955dd0aef5cc0053b2b07c4744abb9f2614a44780280c4678aca9", - "x86_64-linux": "7ff1b75defc522f327c0f1bf6f4d13938b041cf5de1d7417b9dc5d1e7026e93c" + "aarch64-darwin": "3de7da4462c7690f75680aecac8fddedc4b998d0da769136d8eff2932b36004e", + "aarch64-linux": "3722d46929fd2c7b33c17d37464a08150e60d9269053eb67195795254fb5e947", + "armv7l-linux": "a786d51f834c24b768bd415bf9a2fc5c1d9abdf9dc0b1a091bf9a8ff101becfe", + "headers": "0db38ndw9rrd8ixa14761cbff6ns31b6302bzx5q4in8i4dkrrs3", + "x86_64-darwin": "d89b89f7c2ba45cb10df7fc23722bacf6f77e13002c42648762cd18ae3fa9182", + "x86_64-linux": "688e4da8dbcb7dbfacab6f29341d96736e6d06e4c8029835b83ef30b69885b01" }, - "version": "30.4.0" + "version": "30.5.1" }, "31": { "hashes": { - "aarch64-darwin": "bca203c7705e56baa5c7c2f972dd3a606ee80589514a3d83283960b67bad446c", - "aarch64-linux": "a040723dc5c7860527f2718e5b3aaf43d219e35ae391a3338c7a85de2d08afb7", - "armv7l-linux": "64306c594ad37c94e2562d3fe4832667191321f90ec797e41ceae4640da26289", - "headers": "0iclnzcihiw7bnf7nn0p56m8zz8cwn951ccf6g52d7pfr791gbnv", - "x86_64-darwin": "47a04768ed44c4f4128d1fe90818b58cbef6da63b1112acaf2bbb7c20d22ad7d", - "x86_64-linux": "61225378c9a6097974638c241730db60230c9d774a2c7242aa9f001299bccf4b" + "aarch64-darwin": "904d665b4df7377ccdae58c35328456bf2a05a8d3e878954e48175ee60103b3f", + "aarch64-linux": "d66e80621dc8c667ca634c30c4be8486b56ebce17ba6debab5eb70dd40ed9ab9", + "armv7l-linux": "ae76cf56a793f7c98411f997db610d4729b6992e7ccbb7651a960947e87c5bb2", + "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88", + "x86_64-darwin": "3ee05c812e0ce5cb0ee7a36fb1c3a52447d8bfef80a57ca82667b501a354778a", + "x86_64-linux": "65b04f0d8980c17d205644903718a4b41ba6c1fab9d25a58dadf00b6db24a402" }, - "version": "31.4.0" + "version": "31.6.0" + }, + "32": { + "hashes": { + "aarch64-darwin": "7fb7b8736fcd9dbde92628e4aa951fd2c54d3136bf20c1821ce2a1b85fef3046", + "aarch64-linux": "405664c1b6529cd6c2af65778f2c84bfe262ad0b8d9d044a39d2eff2ed218828", + "armv7l-linux": "32682f487ed9307d0f40d35c4b998cee75272effd228093be3e008ca7b39e16e", + "headers": "19x1hyrzkakcrq49sfvzhhz05hi1iagzl2i3h4rfijrhy9jcv4sk", + "x86_64-darwin": "a9e43916cbe91c9a905f2bf38d326d5dc462c3d8a7d88f52c25c1e7c1b9ce7cc", + "x86_64-linux": "d98aa7a90ebfe519700e47fa6bcb94a157483fac615920c5ee467dcc41c46702" + }, + "version": "32.1.2" } } diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 1bef706fa16fd..3999b50e98884 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -47,10 +47,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-SUwtnpYQbPRCIzTQcJnoW9sI597LP1BvqNrhcb2NNfk=", + "hash": "sha256-LkDhMO6FOS/8WgAQBs3HZ8ujkS4yBtVJR7ARxEiJIME=", "owner": "electron", "repo": "electron", - "rev": "v30.4.0" + "rev": "v30.5.1" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -276,10 +276,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-FJVFKLhVCoOdM6dbuu/DQxw0hXjg+C8a2WfF0u3Qndw=", + "hash": "sha256-3pcWLDR1Y6oJUuwtequ5pK7nGwPeOqzALVNGJYskuc0=", "owner": "nodejs", "repo": "node", - "rev": "v20.15.1" + "rev": "v20.16.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -913,8 +913,8 @@ }, "electron_yarn_hash": "0vq12z09hcm6xdrd34b01vx1c47r4zdaqrkw9db6r612xrp2xi0c", "modules": "123", - "node": "20.15.1", - "version": "30.4.0" + "node": "20.16.0", + "version": "30.5.1" }, "31": { "chrome": "126.0.6478.234", @@ -964,10 +964,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-pio5G9ATJHsM4ygKkDhmAbpZecS8p1AQUJ7LHavMq6I=", + "hash": "sha256-dw2WLjkHCt/uYXT+eZpaJ1bdB6DdMcJLjnscREp4YU8=", "owner": "electron", "repo": "electron", - "rev": "v31.4.0" + "rev": "v31.6.0" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -1211,10 +1211,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-3pcWLDR1Y6oJUuwtequ5pK7nGwPeOqzALVNGJYskuc0=", + "hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=", "owner": "nodejs", "repo": "node", - "rev": "v20.16.0" + "rev": "v20.17.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -1854,7 +1854,948 @@ }, "electron_yarn_hash": "12pcq3zzx6627igdfd5bgyismz9n21093smpd43c4aall2mn6194", "modules": "125", - "node": "20.16.0", - "version": "31.4.0" + "node": "20.17.0", + "version": "31.6.0" + }, + "32": { + "chrome": "128.0.6613.162", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-BiMGbML5aNUt4JzzVqSszBj+8BMlEc92csNugo5qjUk=", + "rev": "b2afae122eeb6ce09c52d63f67dc53fc517dbdc8", + "url": "https://gn.googlesource.com/gn", + "version": "2024-06-11" + } + }, + "version": "128.0.6613.162" + }, + "chromium_npm_hash": "sha256-OBUYgjfoEZly8JLTtprfU+hlKNFSnHLheaVWhrirGJk=", + "deps": { + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-52pb9e5XYaiIpUlazoXbmEJ/3l4uPWt9sVmF0+cVBKQ=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "128.0.6613.162", + "url": "https://chromium.googlesource.com/chromium/src.git" + }, + "src/chrome/test/data/perf/canvas_bench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" + }, + "src/chrome/test/data/xr/webvr_info": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" + }, + "src/docs/website": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6pM0P5zXJQXNSQ7MaXSKEHfb7KmtztfhlNlS+i8ugD4=", + "rev": "82c1d3e5b812b35df1cb6a031f59616dc594d4f7", + "url": "https://chromium.googlesource.com/website.git" + }, + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-RkSdNjEmXO4xsCRzp5y5suG8svNT5LSI/eVbAUDbi5c=", + "owner": "electron", + "repo": "electron", + "rev": "v32.1.2" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "url": "https://chromium.googlesource.com/chromium/cdm.git" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bFe79wg+PHRphP6I5q2wRheGTUARKx0zjyn3LxCie0s=", + "rev": "aecfea159d58ef53bd690688e4aca512fc4a3d35", + "url": "https://quiche.googlesource.com/quiche.git" + }, + "src/testing/libfuzzer/fuzzers/wasm_corpus": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=", + "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367", + "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git" + }, + "src/third_party/accessibility_test_framework/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=", + "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe", + "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git" + }, + "src/third_party/angle": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YV7RIbGq3zcnl4ZXJndjqbaPPDxCOzPJ87aH672mNq0=", + "rev": "713102774487cf1a8b3f433529eb8181cbcec31a", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-haO6KT+VbG/d2FljtsoJT7xghPTeEY5GPJdh2s9faVs=", + "rev": "5b2dfe7c775aa7b7909432944ba3535abcd25fc9", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" + }, + "src/third_party/anonymous_tokens/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-o/9lOnPR6vT0pkqWgenfyh9nI5Qoxyd030MNTfcoRSc=", + "rev": "76bfcccb6418239183df55111f2f24782d9f3680", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" + }, + "src/third_party/beto-core/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E2oaN2nbqG21qFhUtatsbXwC8KhoQadvU6BmYxF2lgs=", + "rev": "08537fdd2b0990270ea0214a61dfd318f293bc15", + "url": "https://beto-core.googlesource.com/beto-core.git" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jZ9T5/6t1ImeCDBAMzW0aSmT/NcLxbESYv/F+cBjIFY=", + "rev": "f01108e4761e1d4189cb134322c3cb01dc71ef87", + "url": "https://boringssl.googlesource.com/boringssl.git" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-QuMzYywRDzbwZHJrz/Gm/W6kclvBImRZCnGq8AbTxUY=", + "rev": "81819541a78c49e9109d2267462775e801f89ce6", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" + }, + "src/third_party/cast_core/public/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", + "rev": "71f51fd6fa45fac73848f65421081edd723297cd", + "url": "https://chromium.googlesource.com/cast_core/public" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LIPOcMBxugyuYJ7IE1VszqLAWBBR58Ozy9VCRqVL208=", + "rev": "523ebded2f72a446544e2d9271ef39857f4e6ae7", + "url": "https://chromium.googlesource.com/catapult.git" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" + }, + "src/third_party/chromium-variations": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E6deeWYQt2BxT+9Zb2VSXvZWCQI64Kf1dzUYAZJVA2s=", + "rev": "c134de595151ae72a112767e22da4448eb50e57f", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=", + "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" + }, + "src/third_party/cpu_features/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UKy9TIiO/UJ5w+qLRlMd085CX2qtdVH2W3rtxB5r6MY=", + "rev": "ca678952a9a8eaa6de112d154e8e104b22f9ab3f", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "src/third_party/crabbyavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vnFxeAu6NMY6TOb2+LvGbCyOLbVD9R+utl/nnnCWVks=", + "rev": "716408df5cb6d43ebe31cb24194979b81a83b03c", + "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6XVrzfpQ8Rh99bCGbUkGd/zmFNgt4ZyRsyNvUkIfEyE=", + "rev": "39e57dd0d30ed019d6fb07c24b350f5fe78a1625", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Wq6XYQYAWzy3AurVkLGofFF4avntKIPmx6L7vPW2c2Q=", + "rev": "86bdf11581c80f776bfdf54db7f39f930fd6abaf", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ICE5UkP91LHBT0vCpwKmdR+3ePnYcwnFroPUpJMKDvU=", + "rev": "b03a515f9e56280ecabfb254b188349d1a049827", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SlHTLgqaVST4pRstuzSBZmMx87I9TJ1c0qhClvU2sjI=", + "rev": "2355eeb8f254a1c34dbb0241be5c70cdf6ed46d1", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ljZh99QPH8/9JAV1tVm6BVAYsJWqkJjzlM2AG2m01g=", + "rev": "5f86f5a316f4e082b2419d8b954ebb79c2be590d", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oIByfTUMy1EY3J0/m0iOqJbHd+DzpVAmZbaIdllcF04=", + "rev": "3ea0e7f6b5f464814d6b896eaf69cbd5ebe7fac4", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=", + "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jDjxhMN+cXrf2+sCdp5GqhXuoO2EkoEijSx3PcYahpg=", + "rev": "5167b71635dfbfa5d4558de0da01923d446a5cd4", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" + }, + "src/third_party/dawn/third_party/webgpu-headers": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4=", + "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686", + "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Tc3x10zkgOvOqMap0xwsFd7W2l8ZyA923C0RRgw+jp0=", + "rev": "31e21628c3a558d4f2189712e25849d608b3ff8c", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-agqi21oQNixRF+foVECaf4MiDVQdA308sLIgLGKiwYI=", + "rev": "47f04a536265028feb1254a3663853e0ce526455", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" + }, + "src/third_party/dom_distiller_js/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qmFsmFEQCDH+TRFc8+5BsYAG1ybL08fWhn8NpM6H6xY=", + "rev": "33d0937c6bdf5ec999939fb17f2a553183d14a74", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=", + "owner": "nodejs", + "repo": "node", + "rev": "v20.17.0" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "src/third_party/engflow-reclient-configs": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", + "owner": "EngFlow", + "repo": "reclient-configs", + "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fr18LL/xX23t9TIn3q8jWdV9Y6coepbGsO3vJVdDW6k=", + "rev": "a59c3edffa54a77b8d7b268ef527da541076ca6a", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HVsENaBsYThsScvLwwuBT9dhjq5Acf3eskMIH+09mu0=", + "rev": "d941d9677bb4802f01750fd908ec284fb72c84df", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-sdcZAL3ZHIHO9c1ko0xCfyii4jibwA+25RQkDa9XqTo=", + "rev": "fb9afbafc7dfe226b9db54d4923bfb8839635274", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=", + "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267", + "url": "https://chromium.googlesource.com/external/fontconfig.git" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4WPGveEx3PoBpMlh1PyCJ3w5hdpXztzrXcTZfQ+7DtA=", + "rev": "37cefe33b284d0bad4ec52bcccc1a8c2d8704340", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Go2Mrehkvk5fz2SlFrChMBnZJ3H8luhJU+M1TtqG7vg=", + "rev": "32eb84a95951fa3a0148fb3e6a1a02f830ded136", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" + }, + "src/third_party/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FhuQ4i8Xhy8FsEdAqJntffpo1vJRPsYdR5GFWXDtQD0=", + "rev": "dc9f6f61adaec755a09e1943cf7014c688443bcb", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=", + "rev": "344117638c8ff7e239044fd0fa7085839fc03021", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-iBR2otKeTc864DvCw0n7hpcn/4fHP+CIu2kLmBWym9M=", + "rev": "cee1ba1f24fb12b9ae8f31e70dca3f73dbb12cc2", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY=", + "rev": "1da053e87f0487382404656edca98b85fe51f2fd", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY=", + "rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YlX+PaPhvYh9JzHT9WtS1beUK+cQrHGVUl+IBbv7GeQ=", + "rev": "9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "src/third_party/instrumented_libs": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=", + "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9", + "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "url": "https://chromium.googlesource.com/external/leveldb.git" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", + "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-igHNDa/Jch0hiwDczrDOdrnGL4nMZMRevwX3AsYiUQ0=", + "rev": "93b8eee4f428675195c5c76e8da719ff50c2a01c", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aol16YtRFF1xQYXNRIZf4QMf5+ba09aDMEBx4lcAbWI=", + "rev": "03acd65314fe29e6627cf4eab752819f6ee15d74", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0=", + "rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514", + "url": "https://aomedia.googlesource.com/libavifinfo.git" + }, + "src/third_party/libc++/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vRRQW+ekjNpstfUI+OOA6rxwJp/OjRhfStmGEb/fOFg=", + "rev": "6bb75caa139ee1e686d2205910454cf6ea212e58", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "src/third_party/libc++abi/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tSIbtraD/pbqq4lCzgOakepXrSimCyry0WgcGAnkbwM=", + "rev": "a3c7d3e2f3e1e724b4651891b1a71257cbd88acc", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=", + "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UhDKDfAgcCS92R2EvxKpoiJMvakUDQgyHu2k/xeE7do=", + "rev": "ccfbe1c82a3b6dbe8647ceb36a3f9ee711fba3cf", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-XOPiDAOHpWyCiXI+fi1CAie0Zaj4v14m9Kc8+jbzpUY=", + "rev": "7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uUiAqW0OoB+ZWnTFpk2PJqI7kO9WgYLHiHkz8jikSKA=", + "rev": "d09db732ff68f40fd3581306c650b17ea1955b4e", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uG9dnz4l28RB8R1AZBR97Fz7RN/ZYknP0/RffR1FJ1g=", + "rev": "057e53d759ac05417bbc7880b1d2e2ac7f08fc67", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=", + "rev": "845d5476a866141ba35ac133f856fa62f0b7445f", + "url": "https://chromium.googlesource.com/webm/libwebp.git" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hD5B9fPNwf8M98iS/PYeUJgJxtBvvf2BrrlnBNYXSg0=", + "rev": "a6a2ec654b1be1166b376476a7555c89eca0c275", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=", + "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", + "owner": "nodejs", + "repo": "nan", + "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" + }, + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=", + "rev": "f477acb1049f5e043904b87b825c5915084a9a29", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-1cj+yG9B9hEvPiGW0jGJhiFG882l56PvgEUXyCBFsSk=", + "rev": "76651429b8f96fc6c80949ba8f4e18c4b738e216", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-x/SiWPBPeU2Rg7WqrwZcFvDk2J8ILTXyMEGix8r+7Js=", + "rev": "4f7c05781bc43e93706b0330eb830e2bc33fcb6c", + "url": "https://chromium.googlesource.com/openscreen" + }, + "src/third_party/openscreen/src/buildtools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=", + "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b", + "url": "https://chromium.googlesource.com/chromium/src/buildtools" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GRihOFfswz+cNDxU/6LHZLp6rVSuHhz+5apRXQapOnQ=", + "rev": "66c80ddf43e3c3181d404607dcdc0cf37fdf7675", + "url": "https://pdfium.googlesource.com/pdfium.git" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zs3PFwBmIxSfAk4HZpKsezkyE9kqaFNTbFQ7MSCl20Y=", + "rev": "077d742d9f9738a0453e408560a283a7514c9e8e", + "url": "https://android.googlesource.com/platform/external/perfetto.git" + }, + "src/third_party/protobuf-javascript/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=", + "rev": "e34549db516f8712f678fcd4bc411613b5cc5295", + "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", + "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=", + "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=", + "rev": "c08ec529fc91722bde519628d9449258082eb847", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-B5zb35NkwR3yT58344iAOM1Kywn8Yr/TuNBSJcrxwh4=", + "rev": "938144dd79c6e3664a3c0bbd019daedddf655ffa", + "url": "https://skia.googlesource.com/skia.git" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "url": "https://chromium.googlesource.com/external/smhasher.git" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=", + "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "src/third_party/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", + "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + }, + "src/third_party/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5lRPxsfXGWimJ7jNtM6kJembcAz357ER8PwFXnh6o4E=", + "rev": "db5a00f8cebe81146cafabf89019674a3c4bf03d", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" + }, + "src/third_party/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Uld5cLV+oD0wm8TxK0V15yiwrdiUbWGqPQEbtMW9Apg=", + "rev": "a0817526b8e391732632e6a887134be256a20a18", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZDByCZjc0coy19a0/BkVAU8y/Fkt7FKgWtCwI5K0Tdo=", + "rev": "9e45bccab2b8de8140c1732b0ec490db0362f730", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" + }, + "src/third_party/squirrel.mac": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "src/third_party/swiftshader": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YGVv/wDle+VyO/Ue7wR004dl8nvO5GjmDeWsoC30+kc=", + "rev": "c4dfa69de7deecf52c6b53badbc8bb7be1a05e8c", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" + }, + "src/third_party/text-fragments-polyfill/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" + }, + "src/third_party/tflite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2iYz04vqZI1nbvtnMjjy6aE9PMzvpLhttNbTrEvhC4M=", + "rev": "f9122e774969459927e9d956674c0aac06eb3b68", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" + }, + "src/third_party/vulkan-deps": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-88nATFDj0QqE57ZH7effuNXByjYwGI58SYiAdvyjrt8=", + "rev": "d8095b45a0b2dcc2a85327ff4cc306c618dfa39a", + "url": "https://chromium.googlesource.com/vulkan-deps" + }, + "src/third_party/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5gslQRGEeHu7lshmlM6SON+P6cKTGOYrmwkBRmu9NIw=", + "rev": "fabe9e2672334fdb9a622d42a2e8f94578952082", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + }, + "src/third_party/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-CwBKsSCvrhp8gw9zm5lw+aJ/lzYksXd5zGZw0abw2JY=", + "rev": "5892ebe2d7505c2238a643288d9a5b2e68784a36", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" + }, + "src/third_party/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BraOoeYPOaLw7LfqnG+bZHQiJtWByYjnUU8Gw5ee29k=", + "rev": "2cee0d5b1d8c34e26fd6d9992d3d428ac4c5139d", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + }, + "src/third_party/vulkan-utility-libraries/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0p4CEh0BzMXRDxOh72QIPUjhYFB+9cna2bRtJXEGE/M=", + "rev": "67522b34edde86dbb97e164280291f387ade55fc", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" + }, + "src/third_party/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ompMbxRxa0acD/+a830N0VL88s1GepOO0e8Rkg5Nmjk=", + "rev": "919599474e6e6639527e7c3775ed1064665412d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" + }, + "src/third_party/vulkan_memory_allocator": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" + }, + "src/third_party/wayland-protocols/gtk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5gWBte8oiuXM01StvyXFAsxFwuQZHjZT/LZ6l0mvrwI=", + "rev": "c7e9c4f5d396cda4051e49b15d7d0e4f91e4efac", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Cxu9+Kzw2t1BDfuGzNobaraT4eJcSPO7jvnHpuUANoo=", + "rev": "31577177454b89db37ceabd94e1640d398adbc87", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" + }, + "src/third_party/webdriver/pylib": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" + }, + "src/third_party/webgl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Yn0e1bpvtD4mGdZaRiBytc+upLulYVyHJqXJiTWEfmA=", + "rev": "1b6371436a0a60e6b9a4ae2a40a8eba198e3af02", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4ZDhNhd4kh2lT47PV9zBISNmZDqxZO8WY+pTtxajEfw=", + "rev": "198d1770062c1a8aba86e7d6e001bb47bea028ee", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZHkIEiazTp9MBDUufupLGeV97UEfjTwXxG87OUeHcog=", + "rev": "f237dc146debcfde3d70038c2b66f71bfea8d24b", + "url": "https://webrtc.googlesource.com/src.git" + }, + "src/third_party/weston/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", + "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" + }, + "src/third_party/xdg-utils": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" + }, + "src/third_party/xnnpack/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-JO49N/vJz2nske13dcNFxC9hO7oO/1X6AsNnRCW/RqI=", + "rev": "8df2e765487685757ab5dabd12516cd0a24e3e25", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "src/third_party/zstd/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-sy6cs+c3t/XlwwJOMKCuBmoyrOiYHYeqsr/uOMVOdlI=", + "rev": "0ff651dd876823b99fa5c5f53292be28381aee9b", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" + }, + "src/v8": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-weN8PR9qaRcws9T5PhWyJntrJJ4sKoLwP3gTSLHU574=", + "rev": "485b9d9f88ef1c4787b183b8ccc6cdcfbc07ab1a", + "url": "https://chromium.googlesource.com/v8/v8.git" + } + }, + "electron_yarn_hash": "0jb1rs1in1bp71syim7a7p0n669kbc6as90y3zi6nd0q340cwgqa", + "modules": "128", + "node": "20.17.0", + "version": "32.1.2" } } diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index 022306a2bacf5..14ccfe6d84a36 100755 --- a/pkgs/development/tools/electron/update.py +++ b/pkgs/development/tools/electron/update.py @@ -321,7 +321,6 @@ def get_hashes(self, major_version: str) -> dict: # and it is rather pointless trying to update those. # # https://endoflife.date/electron -@memory.cache def supported_version_range() -> range: """Returns a range of electron releases that have not reached end-of-life yet""" releases_json = json.loads( diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 60aec66919d1a..a7720470f4896 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-AH4Y5ELPicAdJZY5CBf2byOxTzOyQFRh4XoqRUQiAQw="; + hash = "sha256-czQJqLz6rRgyh9usuhDTmgwMC6oL5UzpwNFQ3PKpKck="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix index ca650be0e386f..336bdcdf5229f 100644 --- a/pkgs/development/tools/espup/default.nix +++ b/pkgs/development/tools/espup/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { openssl xz zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/exhaustive/default.nix b/pkgs/development/tools/exhaustive/default.nix index 078d886b09734..0356306bc0c22 100644 --- a/pkgs/development/tools/exhaustive/default.nix +++ b/pkgs/development/tools/exhaustive/default.nix @@ -1,23 +1,28 @@ { lib , buildGoModule , fetchFromGitHub +, nix-update-script }: buildGoModule rec { pname = "exhaustive"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "nishanths"; repo = "exhaustive"; rev = "v${version}"; - hash = "sha256-vMoFIyZcAdObeQD5bGcQHlGpJv/a8yl/2HUVc8aDiIA="; + hash = "sha256-OLIdtKzCqnBkzdUSIl+UlENeMl3zrBE47pLWPg+6qXw="; }; - vendorHash = "sha256-i3Cgefe4krvH99N233IeEWkVt9AhdzROkJ5JBeTIaAs="; + vendorHash = "sha256-DyN2z6+lA/163k6TTQZ+ypm9s2EV93zvSo/yKQZXvCg="; ldflags = [ "-s" "-w" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Check exhaustiveness of switch statements of enum-like constants in Go code"; mainProgram = "exhaustive"; diff --git a/pkgs/development/tools/explain/default.nix b/pkgs/development/tools/explain/default.nix index 66334b12d9966..fb25deacb46c1 100644 --- a/pkgs/development/tools/explain/default.nix +++ b/pkgs/development/tools/explain/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ McSinyx ]; platforms = platforms.unix; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix index ac577f16a9707..5923c9d58dbb1 100644 --- a/pkgs/development/tools/extism-cli/default.nix +++ b/pkgs/development/tools/extism-cli/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "extism-cli"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "extism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-kAdvQtc3FWXQffL1KRg4peeAJ+0439n609jTV9u11aA="; + hash = "sha256-zC03cvvotRIiW4IiVTwffgMYLDrCp72pgMJHoJk5L0Q="; }; - vendorHash = "sha256-yQ6LGWNVWxrUqFskt22+G9OfbcKfHXh1bf4uNoATsxg="; + vendorHash = "sha256-n4Ue2TSG0zbC2uqXiNakqWQjxhbOgXnC2Y7EKP2BM8Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index cf5d42b65a971..d9cd2d0cbbc55 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.34"; + version = "0.16.36"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-vz/RMwmZYCG76lZyloRz1CyLJuj+fK8oAaK1GqW6bvE="; + sha256 = "sha256-5wvVwUj4JqHHZ/Q7s65nlCYENgHENma3IuUsNwcNJ9M="; }; vendorHash = null; diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix index 3bc1217a80dae..ea5362daa90f6 100644 --- a/pkgs/development/tools/fable/default.nix +++ b/pkgs/development/tools/fable/default.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "fable"; - version = "4.19.3"; + version = "4.20.0"; - nugetHash = "sha256-+ZauUmFVDxnlSfYtNWaq5oCK2odTuBfFjKTo/POp0SQ="; + nugetHash = "sha256-K3908gEbl9crT4wmZfBtvag5Z6qYABfalBfLZlqZuDk="; passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix index e3f0db515cb14..3a04f6c2fd3dd 100644 --- a/pkgs/development/tools/fastddsgen/default.nix +++ b/pkgs/development/tools/fastddsgen/default.nix @@ -8,7 +8,7 @@ let pname = "fastddsgen"; - version = "4.0.0"; + version = "4.0.1"; gradle = gradle_7; @@ -21,7 +21,7 @@ stdenv.mkDerivation { repo = "Fast-DDS-Gen"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-Gs2O/8AIjpvN55HtA3gEwfBqxNZ3rqpVlJnTwOm4wXM="; + hash = "sha256-6kZndC5v/75FKY78jwmMuFXWpWzxZkCesYK4GLYxUY8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/fblog/default.nix b/pkgs/development/tools/fblog/default.nix index 8720d5a7f6251..69e8d2326ea45 100644 --- a/pkgs/development/tools/fblog/default.nix +++ b/pkgs/development/tools/fblog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fblog"; - version = "4.10.0"; + version = "4.12.0"; src = fetchFromGitHub { owner = "brocode"; repo = pname; rev = "v${version}"; - hash = "sha256-4Yg7gWVBG9GI1ailEbbcslM+XR8L7yjjjvf4dQq/87I="; + hash = "sha256-OZE+jqjsyvHLDJ+6r0txH56afufnl4H9PHcG7XRfxnE="; }; - cargoHash = "sha256-8rnQllCne1q1uDpeJkqAdzNKSkEgVp+v9drXL8TaQmM="; + cargoHash = "sha256-zZ/xE7DVX1HSK81xwB4VxCtnOTUwJvSScmJeA/t/ACI="; meta = with lib; { description = "Small command-line JSON log viewer"; diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix deleted file mode 100644 index dd3f45769a50f..0000000000000 --- a/pkgs/development/tools/fdroidserver/default.nix +++ /dev/null @@ -1,124 +0,0 @@ -{ - lib, - fetchFromGitLab, - fetchPypi, - apksigner, - appdirs, - buildPythonApplication, - python3, - installShellFiles, - androguard, - babel, - clint, - defusedxml, - gitpython, - libcloud, - mwclient, - oscrypto, - paramiko, - pillow, - pyasn1, - pyasn1-modules, - python-vagrant, - pyyaml, - qrcode, - requests, - ruamel-yaml, - sdkmanager, - yamllint, -}: - -let - version = "2.3a1"; -in -buildPythonApplication { - pname = "fdroidserver"; - inherit version; - - pyproject = true; - - src = fetchFromGitLab { - owner = "fdroid"; - repo = "fdroidserver"; - rev = "2.3a1"; - hash = "sha256-K6P5yGx2ZXHJZ/VyHTbQAObsvcfnOatrpwiW+ixLTuA="; - }; - - pythonRelaxDeps = [ - "androguard" - "pyasn1" - "pyasn1-modules" - ]; - - postPatch = '' - substituteInPlace fdroidserver/common.py \ - --replace-fail "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" - ''; - - preConfigure = '' - ${python3.pythonOnBuildForHost.interpreter} setup.py compile_catalog - ''; - - postInstall = '' - patchShebangs gradlew-fdroid - install -m 0755 gradlew-fdroid $out/bin - installShellCompletion --cmd fdroid \ - --bash completion/bash-completion - ''; - - nativeBuildInputs = [ installShellFiles ]; - - buildInputs = [ babel ]; - - propagatedBuildInputs = [ - androguard - appdirs - clint - defusedxml - gitpython - libcloud - mwclient - oscrypto - paramiko - pillow - pyasn1 - pyasn1-modules - python-vagrant - pyyaml - qrcode - requests - (ruamel-yaml.overrideAttrs (old: { - src = fetchPypi { - pname = "ruamel.yaml"; - version = "0.17.21"; - hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; - }; - })) - sdkmanager - yamllint - ]; - - makeWrapperArgs = [ - "--prefix" - "PATH" - ":" - "${lib.makeBinPath [ apksigner ]}" - ]; - - # no tests - doCheck = false; - - pythonImportsCheck = [ "fdroidserver" ]; - - meta = { - homepage = "https://gitlab.com/fdroid/fdroidserver"; - changelog = "https://gitlab.com/fdroid/fdroidserver/-/blob/${version}/CHANGELOG.md"; - description = "Server and tools for F-Droid, the Free Software repository system for Android"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ - linsui - jugendhacker - ]; - mainProgram = "fdroid"; - }; -} diff --git a/pkgs/development/tools/fermyon-spin/default.nix b/pkgs/development/tools/fermyon-spin/default.nix index 17c525d801a5c..aa6b1247b1177 100644 --- a/pkgs/development/tools/fermyon-spin/default.nix +++ b/pkgs/development/tools/fermyon-spin/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index 3e78b575df76e..ebad779c92aca 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.15.4"; + version = "13.18.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-sVLzEswyewffGoHhc/eJvOoHzMbMmoq1M23noJmvWxE="; + hash = "sha256-Tis5bF1rVuvjSuMeoa5ayyuZXdwolkNL3Ct+IWeYOKc="; }; - npmDepsHash = "sha256-hBXcA/rmbictMuBihu1kDgkriunwC+gP/lWEhaPklLM="; + npmDepsHash = "sha256-mQYetHLbxr3Jegz01BfFVdzcLuz46zcNVqXjjxdKM/E="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json @@ -25,7 +25,7 @@ buildNpmPackage rec { nativeBuildInputs = [ python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix index a95667282676e..29712678b9e90 100644 --- a/pkgs/development/tools/fission/default.nix +++ b/pkgs/development/tools/fission/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fission"; - version = "1.20.3"; + version = "1.20.4"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; rev = "v${version}"; - hash = "sha256-q1wyyzkqEMEYmgmj11YaZYl3lTtJKfPM8fxjTmh7cT4="; + hash = "sha256-zI8OBjmV7pnFe18sChRNdC2RQGfCif/5IG9sn/yHE94="; }; - vendorHash = "sha256-Vi6eEQR3DQupn3CnasKxknaSk7Hs7C7v2yUGtxhsovQ="; + vendorHash = "sha256-W5fPa02rpWhGwYJzRkn8umqdMHG72Ym8+S0f+Id/mcM="; ldflags = [ "-s" "-w" "-X info.Version=${version}" ]; diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index 9aafdb4e02c16..145da019b6f6b 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration Foundation Security ]; cargoHash = "sha256-b15m5DjTDNWJBHOaKSEMwkO/o+0mV+JMBDBurml7xOs="; diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix index f31f68b5021b3..4b9560f72e5cc 100644 --- a/pkgs/development/tools/fq/default.nix +++ b/pkgs/development/tools/fq/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fq"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - hash = "sha256-XvR2Ja3x75unzs7BeyuppmyzDdTZw+BlUmnjqfDTQI0="; + hash = "sha256-bHyLEJiSM42arZiM1VVKga6wp3Q3EAMgUrFnh3hbk9M="; }; - vendorHash = "sha256-QYeOd144ko04Aowi1gtPxgR+3mo7DozCca2xtEN8ARs="; + vendorHash = "sha256-in+c8Wl7ffXAqMvs+3K6dzAd5ePqBpRaxU2iM81moQM="; ldflags = [ "-s" diff --git a/pkgs/development/tools/functiontrace-server/default.nix b/pkgs/development/tools/functiontrace-server/default.nix index abacb1d9f9d4e..efb5026e069e3 100644 --- a/pkgs/development/tools/functiontrace-server/default.nix +++ b/pkgs/development/tools/functiontrace-server/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-3tLjW7yiS1dNsV81KUZbfN2pvYT9kqiC62nWFid2NH8="; - buildInputs = lib.optionals stdenv.isDarwin + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; meta = with lib; { diff --git a/pkgs/development/tools/garble/default.nix b/pkgs/development/tools/garble/default.nix index 438d834059886..0735e283d6db2 100644 --- a/pkgs/development/tools/garble/default.nix +++ b/pkgs/development/tools/garble/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { # Used for some of the tests. nativeCheckInputs = [git]; - preBuild = lib.optionalString (!stdenv.isx86_64) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isx86_64) '' # The test assumex amd64 assembly rm testdata/script/asm.txtar ''; @@ -30,6 +30,6 @@ buildGoModule rec { homepage = "https://github.com/burrowers/garble/"; maintainers = with lib.maintainers; [ davhau ]; license = lib.licenses.bsd3; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/garble.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/garble.x86_64-darwin }; } diff --git a/pkgs/development/tools/gauge/plugins/dotnet/data.json b/pkgs/development/tools/gauge/plugins/dotnet/data.json index fd2d19ec864e4..19d228a955cc2 100644 --- a/pkgs/development/tools/gauge/plugins/dotnet/data.json +++ b/pkgs/development/tools/gauge/plugins/dotnet/data.json @@ -1,5 +1,5 @@ { - "version": "0.5.7", - "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.5.7/gauge-dotnet-0.5.7.zip", - "hash": "sha256-VKs25WzS0UZAeCg91f/f6ZOGH28PulUvyDSc/dbJeoE=" + "version": "0.7.1", + "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.7.1/gauge-dotnet-0.7.1.zip", + "hash": "sha256-0sJctSdQfkm70Z1JDFMc2qwo0PbDWYlHbqfVsnlHyDg=" } diff --git a/pkgs/development/tools/gauge/plugins/java/data.json b/pkgs/development/tools/gauge/plugins/java/data.json index f5a9e09edfdcd..764a22697bb45 100644 --- a/pkgs/development/tools/gauge/plugins/java/data.json +++ b/pkgs/development/tools/gauge/plugins/java/data.json @@ -1,19 +1,19 @@ { - "version": "0.11.0", + "version": "0.11.1", "aarch64-darwin": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-darwin.arm64.zip", - "hash": "sha256-o7viYih6oghPipGmpsdGZXxtML4++Ux7Qul8pRzkdUc=" + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-darwin.arm64.zip", + "hash": "sha256-KoUVku5DRi6sUYCMJ5/DBEYv4NlNEcHdOlYGsfYR0Yw=" }, "x86_64-darwin": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-darwin.x86_64.zip", - "hash": "sha256-wTXVuyXU9mfVxAc/l0mgvKt3c/jinffILBUhe/tikgs=" + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-darwin.x86_64.zip", + "hash": "sha256-ea2s3b38MG8r7i6IqlOjQ2Wc7b237Eu1VL7euwNW43M=" }, "aarch64-linux": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-linux.arm64.zip", - "hash": "sha256-CsEzoNseWllbNtN5mOYVCPvTPlm60fd7eSXuTpxbRx8=" + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-linux.arm64.zip", + "hash": "sha256-QbQWDYkk+XnJReqx+Kj3hvGSDM7ACjDEWVFKd34hZkw=" }, "x86_64-linux": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-linux.x86_64.zip", - "hash": "sha256-zig+Wq6uyBl8fKfjcpKCRFtHBZ/xFeDaUrUqvx1ails=" + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-linux.x86_64.zip", + "hash": "sha256-Ikt8rE8tehLXtWa4CjU6tWiBvOVoDpds8Jgy8QwW6lY=" } } diff --git a/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix b/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix index acf902e1b79df..71f88a2c40ae6 100644 --- a/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix +++ b/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix @@ -17,7 +17,7 @@ let otherArgs = lib.attrsets.removeAttrs args [ "pname" "data" "repo" "releasePrefix" "isMultiArch" ]; inherit (stdenvNoCC.hostPlatform) system; - inherit (if isCrossArch then data else data.${system}) url hash; + inherit (if isCrossArch then data else data.${system} or (throw "gaugePlugins.${pname}: No source for system: ${system}")) url hash; # Upstream uses a different naming scheme for platforms systemMap = { "x86_64-darwin" = "darwin.x86_64"; diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix index 5779a6f45f94f..fcf1abe23fc2a 100644 --- a/pkgs/development/tools/gci/default.nix +++ b/pkgs/development/tools/gci/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "gci"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "daixiang0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nJyRgvMVmNmmxigsdDcKzUuTQg5lXa8JnmwVyQwyWxA="; + sha256 = "sha256-jtDqaUko0So/VwY3NF5NyPFu1jxt4nIbUkJxILc+iTs="; }; vendorHash = "sha256-/8fggERlHySyimrGOHkDERbCPZJWqojycaifNPF6MjE="; diff --git a/pkgs/development/tools/gdlv/default.nix b/pkgs/development/tools/gdlv/default.nix deleted file mode 100644 index 0d2cc49c9e028..0000000000000 --- a/pkgs/development/tools/gdlv/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, Foundation -, CoreGraphics -, Metal -, AppKit -}: - -buildGoModule rec { - pname = "gdlv"; - version = "1.10.0"; - - src = fetchFromGitHub { - owner = "aarzilli"; - repo = "gdlv"; - rev = "v${version}"; - hash = "sha256-OPsQOFwV6jIX4ZOVwJmpTeQUr/zkfkqCr86HmPhYarI="; - }; - - preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' - export MACOSX_DEPLOYMENT_TARGET=10.15 - ''; - - vendorHash = null; - - subPackages = "."; - - buildInputs = lib.optionals stdenv.isDarwin [ Foundation CoreGraphics Metal AppKit ]; - - meta = with lib; { - description = "GUI frontend for Delve"; - mainProgram = "gdlv"; - homepage = "https://github.com/aarzilli/gdlv"; - maintainers = with maintainers; [ mmlb ]; - license = licenses.gpl3; - }; -} diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index f62ab97c1beec..7af8747ef8c4b 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-gopI5iOCSzD23mvOues76WIiBtpNf9A6X9NoOULm6Qo="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; meta = with lib; { description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers"; diff --git a/pkgs/development/tools/gen-license/default.nix b/pkgs/development/tools/gen-license/default.nix deleted file mode 100644 index d875574ab04ae..0000000000000 --- a/pkgs/development/tools/gen-license/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchCrate -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "gen-license"; - version = "0.1.2"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-YZcycLQ436cjr2YTT7TEyMdeLTOl9oEfa5x3lgnnYyo="; - }; - - cargoHash = "sha256-2PT20eoXxBPhGsmHlEEGE2ZDyhyrD7tFdwnn3khjKNo="; - - buildInputs = lib.optional stdenv.isDarwin Security; - - meta = with lib; { - description = "Create licenses for your projects right from your terminal"; - mainProgram = "gen-license"; - homepage = "https://github.com/nexxeln/license-generator"; - license = licenses.mit; - maintainers = [ maintainers.ryanccn ]; - }; -} diff --git a/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix index 667cafdf67a57..089c03268931c 100644 --- a/pkgs/development/tools/git-ps-rs/default.nix +++ b/pkgs/development/tools/git-ps-rs/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Tool for working with a stack of patches"; diff --git a/pkgs/development/tools/github-copilot-intellij-agent/default.nix b/pkgs/development/tools/github-copilot-intellij-agent/default.nix index c919e2de62813..13c28ca5b71ab 100644 --- a/pkgs/development/tools/github-copilot-intellij-agent/default.nix +++ b/pkgs/development/tools/github-copilot-intellij-agent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin unzip -p $src github-copilot-intellij/copilot-agent/bin/copilot-agent-${ - if stdenv.isDarwin then (if stdenv.isAarch64 then "macos-arm64" else "macos") else "linux" + if stdenv.hostPlatform.isDarwin then (if stdenv.hostPlatform.isAarch64 then "macos-arm64" else "macos") else "linux" } | install -m755 /dev/stdin $out/bin/copilot-agent runHook postInstall diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index da706dcdb30a9..2658cbe241fe6 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -9,7 +9,7 @@ , gtk3 , glib , gjs -, enableWebkit2gtk ? stdenv.isLinux +, enableWebkit2gtk ? stdenv.hostPlatform.isLinux , webkitgtk_4_1 , gobject-introspection , wrapGAppsHook3 diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix index 05b74f6339bed..9f44b7493318c 100644 --- a/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/pkgs/development/tools/glamoroustoolkit/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchzip +, fetchurl +, patchelf , wrapGAppsHook3 , cairo , dbus @@ -18,25 +20,39 @@ , libglvnd , libuuid , libxcb +, harfbuzz +, libsoup_3 +, webkitgtk_4_1 +, zenity }: stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.0.11"; + version = "1.1.2"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-GQeYR232zoHLIt1AzznD7rp6u4zMiAdj1+0OfXfT6AQ="; + hash = "sha256-C48zAKkkOIHe7ggjtjBVLbfCVRdY6BJGqdvTI/rCfns="; }; - nativeBuildInputs = [ wrapGAppsHook3 ]; + nativeBuildInputs = [ + wrapGAppsHook3 + (patchelf.overrideAttrs (old: { + version = "0.11"; + src = fetchurl { + url = "https://nixos.org/releases/patchelf/patchelf-0.11/patchelf-0.11.tar.bz2"; + sha256 = "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx"; + }; + })) + ]; sourceRoot = "."; dontConfigure = true; dontBuild = true; dontPatchELF = true; + dontStrip = true; installPhase = '' runHook preInstall @@ -48,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; -preFixup = let + preFixup = let libPath = lib.makeLibraryPath [ cairo dbus @@ -65,8 +81,14 @@ preFixup = let libglvnd libuuid libxcb + harfbuzz # libWebView.so + libsoup_3 # libWebView.so + webkitgtk_4_1 # libWebView.so stdenv.cc.cc.lib ]; + binPath = lib.makeBinPath [ + zenity # File selection dialog + ]; in '' chmod +x $out/lib/*.so patchelf \ @@ -94,6 +116,10 @@ preFixup = let ln -s $out/lib/libcairo.so $out/lib/libcairo.so.2 rm $out/lib/libgit2.so ln -s "${libgit2}/lib/libgit2.so" $out/lib/libgit2.so.1.1 + + gappsWrapperArgs+=( + --prefix PATH : ${binPath} + ) ''; meta = { diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index 3b754db80fd89..26b820f264255 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub, llvmPackages, getconf }: -buildGoModule rec { +buildGoModule { pname = "gllvm"; - version = "1.3.1"; + version = "1.3.1-unstable-2024-04-28"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "gllvm"; - rev = "v${version}"; - sha256 = "sha256-CoreqnMRuPuv+Ci1uyF3HJCJFwK2jwB79okynv6AHTA="; + rev = "154531bdd9c05cd9d01742bc1b35bdf200a487d3"; + sha256 = "sha256-dxrtJFqEEDKx33+sOm+R7huBwbovlKzL4qFXoco8A4s="; }; vendorHash = null; @@ -16,7 +16,7 @@ buildGoModule rec { nativeCheckInputs = with llvmPackages; [ clang llvm - ] ++ lib.optionals stdenv.isDarwin [ getconf ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]; meta = with lib; { homepage = "https://github.com/SRI-CSL/gllvm"; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 809a674a36a94..0d950d24bf606 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ncurses ffmpeg ] - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; meta = with lib; { description = "Live GLSL coding renderer"; @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "glslViewer"; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index f459fe371c746..35c8c320cf215 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.17.1"; + version = "4.18.1"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "sha256-9PJ3XxEA2PEaPFE3BbZkJB8XdJmm0gZf2Ko5T9DAZBw="; + sha256 = "sha256-ZZeurnoFcObrK75zkIZvz9ycdDP9AM3uX6h/4bMWpGc="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-03nNN1FkGee01gNOmIASc2B7mMTes1pEDc6Lo08dhcw="; + vendorHash = "sha256-Zaq88oF5rSCSv736afyKDvTNCSIyrIGTN0kuJWqS7tg="; subPackages = [ "cmd/migrate" ]; diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix index eb370a22914a2..55601dd5704f3 100644 --- a/pkgs/development/tools/go-minimock/default.nix +++ b/pkgs/development/tools/go-minimock/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "go-minimock"; - version = "3.3.14"; + version = "3.4.0"; src = fetchFromGitHub { owner = "gojuno"; repo = "minimock"; rev = "v${version}"; - hash = "sha256-J4clMn65l7L+qSHbJBMDDRoEfgGHKllRu8nvTGlbgaw="; + hash = "sha256-IfowEauUoMybElxThsAZxtdZu3LCqwgpJM5wLQI/yAc="; }; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - vendorHash = "sha256-60mOX0N8q9Q4Cb1G3hxQgykkDgvrVLYaZElptsW1PPI="; + vendorHash = "sha256-ObyIiHidGioSelX2qplFMkC0KX44h0rT6ePa3QKpNfU="; doCheck = true; diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 64471895050a3..61cc59d4a8112 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.45.0"; + version = "2.46.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-k7mR5UJ9kk/jkjzqpS43/CrbNYPUCz4wJR2j/8HUd5c="; + sha256 = "sha256-qPE4hzdu5soGVfw6mLJLWvjiXxdkUAT+kpOCWMO1sL8="; }; preCheck = '' diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 3bbb466eaae4b..8c456874899bb 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -48,11 +48,11 @@ buildGoModule rec { installShellCompletion completion/{bash,fish,zsh}/* substituteInPlace $out/share/bash-completion/completions/task.bash \ - --replace-warn 'complete -F _task task' 'complete -F _task task go-task' + --replace-fail 'complete -F _task task' 'complete -F _task task go-task' substituteInPlace $out/share/fish/vendor_completions.d/task.fish \ - --replace-warn 'complete -c $GO_TASK_PROGNAME' 'complete -c $GO_TASK_PROGNAME -c go-task' + --replace-fail 'complete -c $GO_TASK_PROGNAME' 'complete -c $GO_TASK_PROGNAME -c go-task' substituteInPlace $out/share/zsh/site-functions/_task \ - --replace-warn '#compdef task' '#compdef task go-task' + --replace-fail '#compdef task' '#compdef task go-task' ''; passthru.tests = { diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 4f294564772f5..33a52e6264288 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.18.2"; + version = "3.19.1"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - hash = "sha256-TBGCykHW++o2t4NFbWS3IK+UpXbyGgaJZ/6aoCrqi2Q="; + hash = "sha256-UOw0bAUvaKpMmFmAAlheALhtgXU2+Df6b/nSRH7bWHc="; }; - vendorHash = "sha256-AwpPuj/nX8MD//JL/oF+RGGQi1fdUo28KII2+y5Ptso="; + vendorHash = "sha256-IqzW5fOLLBbpPFTE5PiOISdmp3Gq6b8SUbG4CbbU01s="; subPackages = [ "cmd/goa" ]; diff --git a/pkgs/development/tools/goda/default.nix b/pkgs/development/tools/goda/default.nix deleted file mode 100644 index ff8b0cecbc90b..0000000000000 --- a/pkgs/development/tools/goda/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, nix-update-script, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "goda"; - version = "0.5.9"; - - src = fetchFromGitHub { - owner = "loov"; - repo = "goda"; - rev = "v${version}"; - hash = "sha256-tkGIo4FWIFFMtp4rP0GJaF7B6lrmtjaAVx45G4wAPQg="; - }; - - vendorHash = "sha256-FYjlOYB0L4l6gF8hYtJroV1qMQD0ZmKWXBarjyConRs="; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - homepage = "https://github.com/loov/goda"; - description = "Go Dependency Analysis toolkit"; - maintainers = with maintainers; [ michaeladler ]; - license = licenses.mit; - mainProgram = "goda"; - }; -} diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 46054b646cff4..620dc94a8b033 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,17 +1,17 @@ -{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: +{ buildGo123Module, fetchFromGitHub, lib, installShellFiles }: -buildGoModule rec { +buildGo123Module rec { pname = "golangci-lint"; - version = "1.60.3"; + version = "1.61.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-0ScdJ5td2N8WF1dwHQ3dBSjyr1kqgrzCfBzbRg9cRrw="; + hash = "sha256-2YzVNOdasal27R92l6eVdeS81mAp0ZU6kYsC/Jfvkcg="; }; - vendorHash = "sha256-ixeswsfx36D0Tg103swbBD8UXXLNYbxSMYDE+JOm+uw="; + vendorHash = "sha256-mFDCRxbLq08yRd0ko3CCPJD2BZiCB0Gwd1g+/1oR6w8="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index c8deb9292d464..40532ac9dd0a7 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -5,38 +5,37 @@ buildGoModule rec { pname = "gomplate"; - version = "3.11.8"; + version = "4.1.0"; src = fetchFromGitHub { owner = "hairyhenderson"; - repo = pname; + repo = "gomplate"; rev = "refs/tags/v${version}"; - hash = "sha256-pE9TLEBY1KQvgMFwVJfn5kojESqZURcbCwRt4jrexhk="; + hash = "sha256-shbG0q86wlSjoCK2K7hNdUCwNPiQp94GWQJ1e71A1T0="; }; - vendorHash = "sha256-09QUEudbWnO11iwJafF9zoYqbTr7SVBUiPWTHGnZ06Q="; + vendorHash = "sha256-UKqSKypAm6gt2JUCZh/DyfWo8uJeMp0M+4FiqwzzHIA="; - postPatch = '' + ldflags = [ + "-s" + "-X github.com/${src.owner}/${pname}/v4/version.Version=${version}" + ]; + + preCheck = '' # some tests require network access rm net/net_test.go \ internal/tests/integration/datasources_blob_test.go \ - internal/tests/integration/datasources_git_test.go + internal/tests/integration/datasources_git_test.go \ + render_test.go # some tests rely on external tools we'd rather not depend on rm internal/tests/integration/datasources_consul_test.go \ internal/tests/integration/datasources_vault*_test.go ''; - # TestInputDir_RespectsUlimit - preCheck = '' - ulimit -n 1024 + postInstall = '' + rm $out/bin/gen ''; - ldflags = [ - "-s" - "-w" - "-X github.com/${src.owner}/${pname}/v3/version.Version=${version}" - ]; - meta = with lib; { description = "Flexible commandline tool for template rendering"; mainProgram = "gomplate"; diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix index cbecd3d59816b..5830538dcb9c6 100644 --- a/pkgs/development/tools/google-java-format/default.nix +++ b/pkgs/development/tools/google-java-format/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.23.0"; + version = "1.24.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-fGN1rCS0glvmu+YZAOi1ixo+iUShNnqDYyEPntLQhXA="; + sha256 = "sha256-gS+AX1gRJGDt8BvyAqjmHQ/R81wNT6vVQiBkB3bsV6E="; }; dontUnpack = true; diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/development/tools/goperf/default.nix index a27d3902dd6fb..dc5ee3052a015 100644 --- a/pkgs/development/tools/goperf/default.nix +++ b/pkgs/development/tools/goperf/default.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "goperf"; - version = "0-unstable-2024-08-06"; + version = "0-unstable-2024-09-05"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "3f62151e343cbb54ce6f792b9e1661c4e4845651"; - hash = "sha256-3JjutGKWSywXEHPw7YhH42EEIAh7PL09m37LokgTpuc="; + rev = "ce4811554b022ac27d024d355ad160e95079bec1"; + hash = "sha256-kJJod7Qma3++lrctezYltB9hV8/gH/CycHrk+GpOasE="; }; - vendorHash = "sha256-dCyw9b7ZZHN//4Nhriw3b4Q5AQ3RWs+H/MtqIq5BvpA="; + vendorHash = "sha256-VWywJ1LalYcfOQjrC0sLBfbQyIg8fYv4paMlIfa3RxI="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 8068988d0e6fc..be4d2d39dc5ff 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.20.0"; + version = "2.21.4"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - hash = "sha256-QQD24Z755AurBFXZj/wlRBJegQ74kTvWVy2cN5PnblY="; + hash = "sha256-fu0k+dZyEo2l0PWfN8iryGgUIJsWi7AQD3ku+w1tuGM="; }; - vendorHash = "sha256-VWbsSS3j8zgsZQzsO/ZyKoOUqhNhmMmDICImUZHmC9Y="; + vendorHash = "sha256-LYEAQ/7S31Rv2gmkLReV1lKeAHW5DpKkegKb0Js75q0="; subPackages = [ "cmd/gosec" diff --git a/pkgs/development/tools/gotemplate/default.nix b/pkgs/development/tools/gotemplate/default.nix index 57dbba5db01e9..b950f5865ce63 100644 --- a/pkgs/development/tools/gotemplate/default.nix +++ b/pkgs/development/tools/gotemplate/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGo123Module, fetchFromGitHub }: -buildGoModule rec { +buildGo123Module rec { pname = "gotemplate"; - version = "3.7.5"; + version = "3.9.1"; src = fetchFromGitHub { owner = "coveooss"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BMZyq7fa57WaE0cSkGjHWxtEnbC7vEy+kLaHDoI/KZU="; + hash = "sha256-sRCyOQmj4ti+1Qdap0Q5MLoJZLwjZtw1cYjZMGksvuA="; }; - vendorHash = "sha256-uRB3atrJ+A1/xXvgmkyM/AKN+9VKSIDvsnPIdtsc3vc="; + vendorHash = "sha256-xtvexOmzTXjP3QsGp0aL3FdJe3mdBSCnTeM6hLq/tIo="; meta = with lib; { description = "CLI for go text/template"; diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix deleted file mode 100644 index 5bb515592e57e..0000000000000 --- a/pkgs/development/tools/gotestsum/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, -}: -let - version = "1.11.0"; -in -buildGoModule { - pname = "gotestsum"; - inherit version; - - src = fetchFromGitHub { - owner = "gotestyourself"; - repo = "gotestsum"; - rev = "v${version}"; - hash = "sha256-Sq0ejnX7AJoPf3deBge8PMOq1NlMbw+Ljn145C5MQ+s="; - }; - - vendorHash = "sha256-zUqa6xlDV12ZV4N6+EZ7fLPsL8U+GB7boQ0qG9egvm0="; - - doCheck = false; - - ldflags = [ - "-s" - "-w" - "-X gotest.tools/gotestsum/cmd.version=${version}" - ]; - - subPackages = [ "." ]; - - meta = { - homepage = "https://github.com/gotestyourself/gotestsum"; - changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${version}"; - description = "Human friendly `go test` runner"; - mainProgram = "gotestsum"; - platforms = with lib.platforms; linux ++ darwin; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ isabelroses ]; - }; -} diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix deleted file mode 100644 index ef4a608fcbc41..0000000000000 --- a/pkgs/development/tools/gotools/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gotools"; - version = "0.22.0"; - - # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse - src = fetchFromGitHub { - owner = "golang"; - repo = "tools"; - rev = "v${version}"; - hash = "sha256-qqzvbHFbm6RlqztBnuj7HvMa9Wff1+YUA0fxiM0cx8o="; - }; - - postPatch = '' - # The gopls folder contains a Go submodule which causes a build failure - # and lives in its own package named gopls. - rm -r gopls - ''; - - vendorHash = "sha256-eQ/T/Zxmzn6KF0ewjvt9TDd48RSsSbQ3LgVcKgdeVbU="; - - doCheck = false; - - # Set GOTOOLDIR for derivations adding this to buildInputs - postInstall = '' - mkdir -p $out/nix-support - substitute ${./setup-hook.sh} $out/nix-support/setup-hook \ - --subst-var-by bin $out - ''; - - meta = with lib; { - description = "Additional tools for Go development"; - longDescription = '' - This package contains tools like: godoc, goimports, callgraph, digraph, stringer or toolstash. - ''; - homepage = "https://go.googlesource.com/tools"; - license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix index f1bd3376e160d..2c97533a26965 100644 --- a/pkgs/development/tools/gptcommit/default.nix +++ b/pkgs/development/tools/gptcommit/default.nix @@ -30,8 +30,8 @@ rustPlatform.buildRustPackage { # 0.5.6 release has failing tests doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ] - ++ lib.optionals stdenv.isLinux [ openssl ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix index ae8359101b2b9..ef0fd7c3c8ab7 100644 --- a/pkgs/development/tools/gqlgenc/default.nix +++ b/pkgs/development/tools/gqlgenc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.24.0"; + version = "0.25.2"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-tKEHqo7drOwHIRCgKEXbELi0u9uRpXSwB9R1fPhv/PE="; + sha256 = "sha256-g+l493Nt0SuW4gwJh0s9Zeejpyx2oLxVDykIvBup638="; }; excludedPackages = [ "example" ]; - vendorHash = "sha256-lQ2KQF+55qvscnYfm1jLK/4DdwFBaRZmv9oa/BUSoXI="; + vendorHash = "sha256-YGFMQrxghJIgmiwEPfEqaACH7OETVkD8O7oUhm9foJo="; meta = with lib; { description = "Go tool for building GraphQL client with gqlgen"; diff --git a/pkgs/development/tools/graphql-client/default.nix b/pkgs/development/tools/graphql-client/default.nix index 241e1ef95faa6..8fe6ff5bcf083 100644 --- a/pkgs/development/tools/graphql-client/default.nix +++ b/pkgs/development/tools/graphql-client/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "GraphQL tool for Rust projects"; diff --git a/pkgs/development/tools/haskell/ghc-settings-edit/Setup.hs b/pkgs/development/tools/haskell/ghc-settings-edit/Setup.hs new file mode 100644 index 0000000000000..9a994af677b0d --- /dev/null +++ b/pkgs/development/tools/haskell/ghc-settings-edit/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/pkgs/development/tools/haskell/ghc-settings-edit/default.nix b/pkgs/development/tools/haskell/ghc-settings-edit/default.nix new file mode 100644 index 0000000000000..fa5146a128bbf --- /dev/null +++ b/pkgs/development/tools/haskell/ghc-settings-edit/default.nix @@ -0,0 +1,31 @@ +{ + mkDerivation, + base, + containers, + lib, +}: + +mkDerivation { + pname = "ghc-settings-edit"; + version = "0.1.0"; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./Setup.hs + ./ghc-settings-edit.lhs + ./ghc-settings-edit.cabal + ]; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base + containers + ]; + license = [ + lib.licenses.mit + lib.licenses.bsd3 + ]; + description = "Tool for editing GHC's settings file"; + mainProgram = "ghc-settings-edit"; +} diff --git a/pkgs/development/tools/haskell/ghc-settings-edit/ghc-settings-edit.cabal b/pkgs/development/tools/haskell/ghc-settings-edit/ghc-settings-edit.cabal new file mode 100644 index 0000000000000..e31515c6391fc --- /dev/null +++ b/pkgs/development/tools/haskell/ghc-settings-edit/ghc-settings-edit.cabal @@ -0,0 +1,22 @@ +cabal-version: 2.2 +name: ghc-settings-edit +version: 0.1.0 +synopsis: Tool for editing GHC's settings file +-- TODO: description for hackage +-- TODO: category for hackage +license: MIT AND BSD-3-Clause +author: sternenseemann +-- FIXME: must be email for potential Hackage upload +maintainer: @NixOS/haskell +copyright: © 2024 The Nixpkgs/NixOS contributors +stability: experimental +build-type: Simple +bug-reports: https://github.com/NixOS/nixpkgs/issues + +executable ghc-settings-edit + default-language: Haskell2010 + -- TODO: bounds for hackage + build-depends: base + , containers + main-is: ghc-settings-edit.lhs + hs-source-dirs: . diff --git a/pkgs/development/tools/haskell/ghc-settings-edit/ghc-settings-edit.lhs b/pkgs/development/tools/haskell/ghc-settings-edit/ghc-settings-edit.lhs new file mode 100644 index 0000000000000..3b37bafe0d622 --- /dev/null +++ b/pkgs/development/tools/haskell/ghc-settings-edit/ghc-settings-edit.lhs @@ -0,0 +1,109 @@ +ghc-settings-edit is a small tool for changing certain fields in the settings +file that is part of every GHC installation (usually located at +lib/ghc-$version/lib/settings or lib/ghc-$version/settings). This is sometimes +necessary because GHC's build process leaks the tools used at build time into +the final settings file. This is fine, as long as the build and host platform +of the GHC build is the same since it will be possible to execute the tools +used at build time at run time. In case we are cross compiling GHC itself, +the settings file needs to be changed so that the correct tools are used in the +final installation. The GHC build system itself doesn't allow for this due to +its somewhat peculiar bootstrapping mechanism. + +This tool was originally written by sternenseemann and is licensed under the MIT +license (as is nixpkgs) as well as the BSD 3 Clause license since it incorporates +some code from GHC. It is primarily intended for use in nixpkgs, so it should be +considered unstable: No guarantees about the stability of its command line +interface are made at this time. + +> -- SPDX-License-Identifier: MIT AND BSD-3-Clause +> {-# LANGUAGE LambdaCase #-} +> module Main where + +ghc-settings-edit requires no additional dependencies to the ones already +required to bootstrap GHC. This means that it only depends on GHC and core +libraries shipped with the compiler (base and containers). This property should +be preserved going forward as to not needlessly complicate bootstrapping GHC +in nixpkgs. Additionally, a wide range of library versions and thus GHC versions +should be supported (via CPP if necessary). + +> import Control.Monad (foldM) +> import qualified Data.Map.Lazy as Map +> import System.Environment (getArgs, getProgName) +> import Text.Read (readEither) + +Note that the containers dependency is needed to represent the contents of the +settings file. In theory, [(String, String)] (think lookup) would suffice, but +base doesn't provide any facilities for updating such lists. To avoid needlessly +reinventing the wheel here, we depend on an extra core library. + +> type SettingsMap = Map.Map String String + +ghc-settings-edit accepts the following arguments: + +- The path to the settings file which is edited in place. +- For every field in the settings file to be updated, two arguments need to be + passed: the name of the field and its new value. Any number of these pairs + may be provided. If a field is missing from the given settings file, + it won't be added (see also below). + +> usage :: String -> String +> usage name = "Usage: " ++ name ++ " FILE [KEY NEWVAL [KEY2 NEWVAL2 ...]]" + +The arguments and the contents of the settings file are fed into the performEdits +function which implements the main logic of ghc-settings-edit (except IO). + +> performEdits :: [String] -> String -> Either String String +> performEdits editArgs settingsString = do + +First, the settings file is parsed and read into the SettingsMap structure. For +parsing, we can simply rely read, as GHC uses the familiar Read/Show format +(plus some formatting) for storing its settings. This is the main reason +ghc-settings-edit is written in Haskell: We don't need to roll our own parser. + +> settingsMap <- Map.fromList <$> readEither settingsString + +We also need to parse the remaining command line arguments (after the path) +which means splitting them into pairs of arguments describing the individual +edits. We use the chunkList utility function from GHC for this which is vendored +below. Since it doesn't guarantee that all sublists have the exact length given, +we'll have to check the length of the returned “pairs” later. + +> let edits = chunkList 2 editArgs + +Since each edit is a transformation of the SettingsMap, we use a fold to go +through the edits. The Either monad allows us to bail out if one is malformed. +The use of Map.adjust ensures that fields that aren't present in the original +settings file aren't added since the corresponding GHC installation wouldn't +understand them. Note that this is done silently which may be suboptimal: +It could be better to fail. + +> show . Map.toList <$> foldM applyEdit settingsMap edits +> where +> applyEdit :: SettingsMap -> [String] -> Either String SettingsMap +> applyEdit m [key, newValue] = Right $ Map.adjust (const newValue) key m +> applyEdit _ _ = Left "Uneven number of edit arguments provided" + +main just wraps performEdits and takes care of reading from and writing to the +given file. + +> main :: IO () +> main = +> getArgs >>= \case +> (settingsFile:edits) -> do +> orig <- readFile settingsFile +> case performEdits edits orig of +> Right edited -> writeFile settingsFile edited +> Left errorMsg -> error errorMsg +> _ -> do +> name <- getProgName +> error $ usage name + +As mentioned, chunkList is taken from GHC, specifically GHC.Utils.Misc of GHC +verson 9.8.2. We don't depend on the ghc library directly (which would be +possible in theory) since there are no stability guarantees or deprecation +windows for the ghc's public library. + +> -- | Split a list into chunks of /n/ elements +> chunkList :: Int -> [a] -> [[a]] +> chunkList _ [] = [] +> chunkList n xs = as : chunkList n bs where (as,bs) = splitAt n xs diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 5535b49a383cc..0314c3b90b044 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "heroku"; - version = "9.1.0"; + version = "9.3.0"; src = fetchzip { - url = "https://cli-assets.heroku.com/versions/9.1.0/e1e5252/heroku-v9.1.0-e1e5252-linux-x64.tar.xz"; - hash = "sha256-r3X1DN9s1cgFlyivVaMLDgFrMdIJmn4Y+UG1+o4T8t4="; + url = "https://cli-assets.heroku.com/versions/9.3.0/65eb66a/heroku-v9.3.0-65eb66a-linux-x64.tar.xz"; + hash = "sha256-4k/HLSB4o1BnzG7dPW20ejSFYmJ8o9eVrJWCdXrqC/Q="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix index d4a76bf29183e..f6d8c0fb8624a 100644 --- a/pkgs/development/tools/hobbes/default.nix +++ b/pkgs/development/tools/hobbes/default.nix @@ -58,7 +58,7 @@ llvmPackages.stdenv.mkDerivation { checkTarget = "test"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Language and an embedded JIT compiler"; longDescription = '' Hobbes is a a language, embedded compiler, and runtime for efficient diff --git a/pkgs/development/tools/hors/default.nix b/pkgs/development/tools/hors/default.nix index 4ecea68c18ec4..03f53f1eabafd 100644 --- a/pkgs/development/tools/hors/default.nix +++ b/pkgs/development/tools/hors/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1PB/JvgfC6qABI+cIePqtsSlZXPqMGQIay9SCXJkV9o="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # requires network access doCheck = false; diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index 11d9cf11b1525..8dcee1b730ddd 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -91,7 +91,7 @@ buildPythonApplication rec { disabledTests = [ # Test does not correctly handle path normalization for test comparison "test_cli_overrides" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test does not correctly handle absolute /home paths on Darwin (even fake ones) "test_index" ]; diff --git a/pkgs/development/tools/hred/default.nix b/pkgs/development/tools/hred/default.nix deleted file mode 100644 index 8de5ec2a5f636..0000000000000 --- a/pkgs/development/tools/hred/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildNpmPackage, fetchFromGitHub, runCommand, hred, jq }: - -buildNpmPackage rec { - pname = "hred"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "danburzo"; - repo = "hred"; - rev = "v${version}"; - hash = "sha256-rnobJG9Z1lXEeFm+c0f9OsbiTzxeP3+zut5LYpGzWfc="; - }; - - npmDepsHash = "sha256-POxlGWK0TJMwNWDpiK5+OXLGtAx4lFJO3imoe/h+7Sc="; - - dontNpmBuild = true; - - passthru.tests = { - simple = runCommand "${pname}-test" {} '' - set -e -o pipefail - echo '<i id="foo">bar</i>' | ${hred}/bin/hred 'i#foo { @id => id, @.textContent => text }' -c | ${jq}/bin/jq -c > $out - [ "$(cat $out)" = '{"id":"foo","text":"bar"}' ] - ''; - }; - - meta = { - description = "Command-line tool to extract data from HTML"; - mainProgram = "hred"; - license = lib.licenses.mit; - homepage = "https://github.com/danburzo/hred"; - maintainers = with lib.maintainers; [ tejing ]; - }; -} diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix index 7e55740d03ba8..e9767ca60029f 100644 --- a/pkgs/development/tools/htmlq/default.nix +++ b/pkgs/development/tools/htmlq/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; doCheck = false; diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index fcc616f7642c4..1de803fb6590f 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, testers, infisical, installShellFiles }: +{ stdenv, lib, fetchurl, testers, installShellFiles }: # this expression is mostly automated, and you are STRONGLY # RECOMMENDED to use to nix-update for updating this expression when new @@ -15,7 +15,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.28.6"; + version = "0.31.1"; # the platform-specific, statically linked binary src = @@ -36,7 +36,7 @@ let fetchurl { inherit name url hash; }; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "infisical"; version = version; inherit src; @@ -63,7 +63,7 @@ stdenv.mkDerivation { passthru = { updateScript = ./update.sh; - tests.version = testers.testVersion { package = infisical; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = with lib; { @@ -84,4 +84,4 @@ stdenv.mkDerivation { "x86_64-darwin" ]; }; -} +}) diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index 46faf5f344eb1..c83a5aea7b062 100644 --- a/pkgs/development/tools/infisical/hashes.json +++ b/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" -, "x86_64-linux": "sha256-izVUw/RcH+U6i5kCdPGojsBF+Ont40QBYk4sJW/BLOA=" -, "x86_64-darwin": "sha256-j0f4NhLivG+MmzitOSnAcc/EQAiFVEn44w3UMnLCkVY=" -, "aarch64-linux": "sha256-hunRA42xIMcu5JBtTnibWXKEECIeBIHyeBwVnOGR25U=" -, "aarch64-darwin": "sha256-s6bmANYuuAOq959R+lipThc39qyqww20ISZ965hWkWc=" +, "x86_64-linux": "sha256-8fRZNnXmP1E75Bk8PjvtZ5fBFwLEq+qPmBoB1b+ho6I=" +, "x86_64-darwin": "sha256-ayc16K60EMGhGZES2KEDGcebCQ1UXOWl1qJJc9KCsEA=" +, "aarch64-linux": "sha256-l4pweKQKHPNUwpm+1hhYjP0oK6Cs0eu2YdzXpvptzLg=" +, "aarch64-darwin": "sha256-LXrxFNevOjkXnQ+hEx1Y5FNfwGHTKksDLLEWbSK34pU=" } diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index 8304303d301fa..4bd2f8cb1a3f2 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-7MK0iLBpjvWE7UH5Tb3qIm2XnEVsAvBy34Ed4wHagZQ="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/development/tools/java/java-language-server/default.nix index 723937f8f5356..fa6bcbf10f5b6 100644 --- a/pkgs/development/tools/java/java-language-server/default.nix +++ b/pkgs/development/tools/java/java-language-server/default.nix @@ -5,9 +5,9 @@ let platform = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "mac" - else if stdenv.isWindows then "windows" + if stdenv.hostPlatform.isLinux then "linux" + else if stdenv.hostPlatform.isDarwin then "mac" + else if stdenv.hostPlatform.isWindows then "windows" else throw "unsupported platform"; in maven.buildMavenPackage rec { @@ -31,7 +31,7 @@ maven.buildMavenPackage rec { dontConfigure = true; preBuild = '' jlink \ - ${lib.optionalString (!stdenv.isDarwin) "--module-path './jdks/${platform}/jdk-13/jmods'"} \ + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "--module-path './jdks/${platform}/jdk-13/jmods'"} \ --add-modules java.base,java.compiler,java.logging,java.sql,java.xml,jdk.compiler,jdk.jdi,jdk.unsupported,jdk.zipfs \ --output dist/${platform} \ --no-header-files \ diff --git a/pkgs/development/tools/java/jprofiler/default.nix b/pkgs/development/tools/java/jprofiler/default.nix index 7f74d8665a80e..3e86ea7b702a7 100644 --- a/pkgs/development/tools/java/jprofiler/default.nix +++ b/pkgs/development/tools/java/jprofiler/default.nix @@ -26,7 +26,7 @@ let maintainers = with maintainers; [ catap ]; }; - src = if stdenv.isLinux then fetchurl { + src = if stdenv.hostPlatform.isLinux then fetchurl { url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_linux_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; hash = "sha256-orjBSaC7NvKcak+RSEa9V05oL3EZIBnp7TyaX/8XFyg="; } else fetchurl { @@ -39,15 +39,17 @@ let hash = "sha256-4T0j2ctHmgWOSCmFG2PZCLJS57nIa5MxmJBpMYzy9FI="; }; - desktopItems = makeDesktopItem { - name = pname; - exec = pname; - icon = pname; - comment = meta.description; - desktopName = nameApp; - genericName = "Java Profiler Tool"; - categories = [ "Development" ]; - }; + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = meta.description; + desktopName = nameApp; + genericName = "Java Profiler Tool"; + categories = [ "Development" ]; + }) + ]; linux = stdenv.mkDerivation { inherit pname version src desktopItems; @@ -99,4 +101,4 @@ let meta = meta // { platforms = lib.platforms.darwin; }; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 5ec81ec7040d8..5f7dc106663fc 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk }: stdenv.mkDerivation rec { - version = "2.1.9"; + version = "2.1.10"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-q1oIxdeCQq7JdVskjvF2KAFzFGrowRHjkvst3ukXSyY="; + sha256 = "sha256-CmbAYJzhzPIgUfo1M0JuwhNz6Bmymb0Fr1ERdmgQ95I="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index a344e31c320b9..085612b67a344 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.117.1"; + version = "0.119.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-LQ9xXTutKhAnAt51mglP/zc7k1v2X/QLwEY31M8SmzM="; + sha256 = "sha256-ebwBRzgpYEomboY+hMok8KmOaNR4hRaPy7SxjHbLeYU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jd-diff-patch/default.nix b/pkgs/development/tools/jd-diff-patch/default.nix index a322ad52ddf46..6f50f7d1c3ae8 100644 --- a/pkgs/development/tools/jd-diff-patch/default.nix +++ b/pkgs/development/tools/jd-diff-patch/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jd-diff-patch"; - version = "1.7.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "josephburnett"; repo = "jd"; rev = "v${version}"; - sha256 = "sha256-fi+vj1vHhgw2OPQqQ0827P6Axy/cio0UVFLeD/nhFvw="; + sha256 = "sha256-qq/Y2/NGK3xsgljT0D9+dD1D1UfjB9Niay81nQJ4gX0="; }; # not including web ui diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix deleted file mode 100644 index d031cd9394d78..0000000000000 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go, nix-update-script }: - -buildGoModule rec { - pname = "jira-cli-go"; - version = "1.5.1"; - - src = fetchFromGitHub { - owner = "ankitpokhrel"; - repo = "jira-cli"; - rev = "v${version}"; - hash = "sha256-edytj9hB8lDwy3qGSyLudu5G4DSRGKhD0vDoWz5eUgs="; - }; - - vendorHash = "sha256-DAdzbANqr0fa4uO8k/yJFoirgbZiKOQhOH8u8d+ncao="; - - ldflags = [ - "-s" "-w" - "-X github.com/ankitpokhrel/jira-cli/internal/version.GitCommit=${src.rev}" - "-X github.com/ankitpokhrel/jira-cli/internal/version.SourceDateEpoch=0" - "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}" - ]; - - __darwinAllowLocalNetworking = true; - - nativeCheckInputs = [ less more ]; # Tests expect a pager in $PATH - - passthru = { - tests.version = testers.testVersion { - package = jira-cli-go; - command = "jira version"; - inherit version; - }; - updateScript = nix-update-script { }; - }; - - nativeBuildInputs = [ installShellFiles ]; - postInstall = '' - installShellCompletion --cmd jira \ - --bash <($out/bin/jira completion bash) \ - --zsh <($out/bin/jira completion zsh) - - $out/bin/jira man --generate --output man - installManPage man/* - ''; - - meta = with lib; { - description = "Feature-rich interactive Jira command line"; - homepage = "https://github.com/ankitpokhrel/jira-cli"; - changelog = "https://github.com/ankitpokhrel/jira-cli/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ bryanasdev000 anthonyroussel ]; - mainProgram = "jira"; - }; -} diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix index e704ec994eed2..0aba5e3f23f11 100644 --- a/pkgs/development/tools/jless/default.nix +++ b/pkgs/development/tools/jless/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sas94liAOSIirIJGdexdApXic2gWIBDT4uJFRM3qMw0="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ python3 ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin [ AppKit ] - ++ lib.optionals stdenv.isLinux [ libxcb ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; meta = with lib; { description = "Command-line pager for JSON data"; diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 8d4ec0d1c5a65..1443ca78371a5 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; # https://github.com/jqlang/jq/issues/2871 - postPatch = lib.optionalString stdenv.isFreeBSD '' + postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' substituteInPlace Makefile.am --replace-fail "tests/mantest" "" --replace-fail "tests/optionaltest" "" ''; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # Otherwise, configure will detect that they’re in libm, but the build will fail # with clang 16+ due to calls to undeclared functions. # This is fixed upstream and can be removed once jq is updated (to 1.7 or an unstable release). - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ "-D_REENTRANT=1" "-D_DARWIN_C_SOURCE=1" ]); @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { "--mandir=\${man}/share/man" ] ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no" # jq is linked to libjq: - ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; # Break the dependency cycle: $dev refers to $bin via propagated-build-outputs, and # $bin refers to $dev because of https://github.com/jqlang/jq/commit/583e4a27188a2db097dd043dd203b9c106bba100 diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 8bb3b03a6fcc4..b9add5050a744 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.1.13"; + version = "7.2.0"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-JJV/r64TQecj2Sa/sjxaddiVFCGmtjEn+wfobUbN1OU="; + hash = "sha256-UyZ7unIbKRn/5WsoYxkHWQ5k0Tb5NcC+UGpiyvpShBo="; }; - cargoHash = "sha256-w3MF4FcBCq5gQnhVVlcXOeGH4r2cA6kWwIzGVeLY5zg="; + cargoHash = "sha256-gJQsap31twigZT5n5w7oHATdNf0DfqoNfdS7cMU/hiA="; meta = with lib; { description = "JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix index 39fa629df62b6..7255736cd500c 100644 --- a/pkgs/development/tools/json2hcl/default.nix +++ b/pkgs/development/tools/json2hcl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "json2hcl"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "kvz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0ku8sON4fzWAirqY+dhYAks2LSyC7OH/LKI0kb+QhpM="; + sha256 = "sha256-h7DudYVWvDRCbjoIgOoCIudf7ZfUfWXp5OJ4ni0nm6c="; }; vendorHash = "sha256-GxYuFak+5CJyHgC1/RsS0ub84bgmgL+bI4YKFTb+vIY="; diff --git a/pkgs/development/tools/kafka-delta-ingest/default.nix b/pkgs/development/tools/kafka-delta-ingest/default.nix index 8dd3cf1299cb7..a5fea071b48e7 100644 --- a/pkgs/development/tools/kafka-delta-ingest/default.nix +++ b/pkgs/development/tools/kafka-delta-ingest/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Highly efficient daemon for streaming data from Kafka into Delta Lake"; mainProgram = "kafka-delta-ingest"; homepage = "https://github.com/delta-io/kafka-delta-ingest"; diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix index 9bb202fee67b2..8e9b7c5ab8008 100644 --- a/pkgs/development/tools/kafkactl/default.nix +++ b/pkgs/development/tools/kafkactl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kafkactl"; - version = "5.0.6"; + version = "5.3.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pAi60t0mtRlAL+z6s5moWwxw0hC6CeiljjjFyzyN+nI="; + hash = "sha256-OPXSajfR/eHSL0nHOIYPYvML2PsxtflBt7aTLPT1i0M="; }; - vendorHash = "sha256-7ibev9Po8is+PXH0BC8ZLiTMJsPMR6VUwjNA/c1y/g0="; + vendorHash = "sha256-VY1pm1RSfNGswuVoD73Mrpq+yMtenbjfpV7q72x/z7o="; doCheck = false; diff --git a/pkgs/development/tools/karate/default.nix b/pkgs/development/tools/karate/default.nix index 1b5a08d5e674c..bc3076931d695 100644 --- a/pkgs/development/tools/karate/default.nix +++ b/pkgs/development/tools/karate/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "karate"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar"; - sha256 = "sha256-3gNoXUchrfGkZC6UAfw2TXorzSlqnOZCe0gnuUHIIb4="; + sha256 = "sha256-3uz51dQvyvK7gcmRoUjfszghBaPfVc/SJaKSEWkfgr8="; }; dontUnpack = true; diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix index 13edb7bd1fed1..aceddd467b023 100644 --- a/pkgs/development/tools/kdash/default.nix +++ b/pkgs/development/tools/kdash/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl python3 pkg-config ]; buildInputs = [ openssl xorg.xcbutil ] - ++ lib.optional stdenv.isDarwin AppKit; + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; cargoHash = "sha256-jm0UCKDy6TrogMPavB86lvk8yKZXubTGGbApk+oP2RQ="; diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix index 9ec00d3590610..520b0101bc546 100644 --- a/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,25 +2,16 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.14.0"; + version = "0.16.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G0jBQ12cpjfWGhXYppV9dB2n68bExi6ME9QbxXsUWvw="; + sha256 = "sha256-Txvzp8OcRTDCAB8nFrqj93X+Kk/sNPSSLOI07J3DwcM="; }; - patches = [ ./version.patch ]; - - postPatch = '' - # fix wrong go line which go mod tidy complains about - # https://github.com/kubernetes-sigs/controller-tools/pull/881 - substituteInPlace go.mod \ - --replace-fail "go 1.20" "go 1.21" - ''; - - vendorHash = "sha256-8XSMg/MII+HlsFuaOC6CK/jYiBXfeRZmLT7sW/ZN3Ts="; + vendorHash = "sha256-nwzXlsSG7JF145bf/AJZB1GbGJRHJC7Q73Jty6mHc/w="; ldflags = [ "-s" diff --git a/pkgs/development/tools/kubernetes-controller-tools/version.patch b/pkgs/development/tools/kubernetes-controller-tools/version.patch deleted file mode 100644 index b86c3d69c3a9b..0000000000000 --- a/pkgs/development/tools/kubernetes-controller-tools/version.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/pkg/version/version.go b/pkg/version/version.go -index 09c8efcf..b9ec798a 100644 ---- a/pkg/version/version.go -+++ b/pkg/version/version.go -@@ -20,14 +20,12 @@ import ( - "runtime/debug" - ) - -+var version string -+ - // Version returns the version of the main module - func Version() string { -- info, ok := debug.ReadBuildInfo() -- if !ok || info == nil || info.Main.Version == "" { -- // binary has not been built with module support or doesn't contain a version. -- return "(unknown)" -- } -- return info.Main.Version -+ _ = debug.ReadBuildInfo -+ return version - } - - // Print prints the main module version on stdout. diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 0fe6c0fb43dff..18b429e2d434d 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-TjZ8n88uldCNfpdReE/SYPkj0m6bBA2lI4SyNAhPFFM="; + sha256 = "sha256-9tBPV0VR1bZUgYDD6T+hthPIzN9aGAyi1sUyeaynOQA="; }; - cargoHash = "sha256-AkeKAPzgKDvnS+eyAh8MJfPOPFF+v6Rje3eXu7LM6Pk="; + cargoHash = "sha256-Igq4vjIyixpAhFd1wZqrVXCUmJdetUn6uM1eIX/0CiM="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' installShellCompletion completion/kubie.bash diff --git a/pkgs/development/tools/language-servers/ccls/default.nix b/pkgs/development/tools/language-servers/ccls/default.nix index 175d2800e4c7a..122ebea7c0f3d 100644 --- a/pkgs/development/tools/language-servers/ccls/default.nix +++ b/pkgs/development/tools/language-servers/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20240202"; + version = "0.20240505"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "sha256-xVx3+cnmIdoA7R1S31EaiPj+DOTqkINoQeMgauW61Ys="; + sha256 = "sha256-YZeP6sHYLNvlf49mvtymxHuH1lmIkqcanpqVMzeLeFQ="; }; nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; diff --git a/pkgs/development/tools/language-servers/crystalline/default.nix b/pkgs/development/tools/language-servers/crystalline/default.nix index 3687d1fc57a96..217e7ab0fa84a 100644 --- a/pkgs/development/tools/language-servers/crystalline/default.nix +++ b/pkgs/development/tools/language-servers/crystalline/default.nix @@ -7,7 +7,7 @@ }: let - version = "0.13.1"; + version = "0.14.0"; in crystal.buildCrystalPackage { pname = "crystalline"; @@ -17,7 +17,7 @@ crystal.buildCrystalPackage { owner = "elbywan"; repo = "crystalline"; rev = "v${version}"; - hash = "sha256-Exv83jmSyhJv90Oo4oApZwNgNjy7tOKxLNh7yJIbfws="; + hash = "sha256-NTuI9sYprX6lu/nfHU4U9bEks6EHlXz/L4yQJ5j3XvA="; }; format = "crystal"; diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index f34d3a8ba7324..df72b7dfb615e 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.22"; + version = "0.1.0"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-h3ppVj+Y1jtvsZLWzZxmFmmxr0My9Nd4zQBqeDSX0ZI="; + hash = "sha256-EuZbbeRssacrctIbxBbd2GOh8zgFi2OBRregfC88se0="; }; vendorHash = "sha256-AWKCE2BZGVYcr6Pe8URQo11Xnr3sfgWWkm9v7vvILOo="; diff --git a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix index 1e3a888b397d5..3e348c342ae4b 100644 --- a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix +++ b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "jsonnet-language-server"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "grafana"; repo = "jsonnet-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-W9xfbZWM6KK8UTwP0SaeywIlUku0+64vjEyUFJFFS5M="; + hash = "sha256-GR5EjVd1Tje9FLyP0pfNT6hMUGYkfPnsT8M72H713D4="; }; vendorHash = "sha256-rh+b089fr+z0YzgvzivzELnSbNDiNczGCRwFrIYR250="; diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index e0fc157f290b1..8e8f5fa3f79f1 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.10.5"; + version = "3.10.6"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = finalAttrs.version; - hash = "sha256-lFNguQxrpldOE+6KrSC3QeDJzmG4Lwq92vFHjOGX9s4="; + hash = "sha256-K5+xGRGmd6X3eYF1BzhqFbbfVJXSduo/9930HxLGQCo="; fetchSubmodules = true; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Foundation ditto @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pushd 3rd/luamake '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # This package uses the program clang for C and C++ files. The language # is selected via the command line argument -std, but this do not work # in combination with the nixpkgs clang wrapper. Therefor we have to @@ -55,7 +55,9 @@ stdenv.mkDerivation (finalAttrs: { -e '/cxx_/s,$cc,clang++,' ''; - ninjaFlags = [ "-fcompile/ninja/${if stdenv.isDarwin then "macos" else "linux"}.ninja" ]; + ninjaFlags = [ + "-fcompile/ninja/${if stdenv.hostPlatform.isDarwin then "macos" else "linux"}.ninja" + ]; postBuild = '' popd diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index 42968130d1a45..dc841414cf4de 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-t9cFECz4olFQ3VOuZzqHRMuvC8df1qaF7etb9ThJiok="; + hash = "sha256-DPKCAWIDw3ykYp2Cuwt9CcWHgdL7aoW5z2CjVFxizhg="; }; - cargoHash = "sha256-m+eO2y6TNRYc9Nau5ma9qcZcj7xUdxjo34eBmuXANkU="; + cargoHash = "sha256-wYh5JNT7HJnY6PLFCPm21LNFHsffFq53FTCRkUuHxWY="; meta = with lib; { description = "CMake lsp based on tower-lsp and treesitter"; diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index b4736c0b61738..ffa06bb33933e 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -21,13 +21,13 @@ let common = rec { - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; rev = version; - hash = "sha256-ffHLKHpqgVlYLGQ/Dc/6hW/inA98QdMJiv/fT2IrH7c="; + hash = "sha256-8F97zAu+icDC9ZYS7m+Y58oZQ7R3gVuXMvzAfgkVmJo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/language-servers/rune-languageserver/default.nix b/pkgs/development/tools/language-servers/rune-languageserver/default.nix index 3ae9c3ac43be4..41977f89e9096 100644 --- a/pkgs/development/tools/language-servers/rune-languageserver/default.nix +++ b/pkgs/development/tools/language-servers/rune-languageserver/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rune-languageserver"; - version = "0.12.4"; + version = "0.13.4"; src = fetchCrate { inherit pname version; - hash = "sha256-KVNof5s3hiCabsoypwS22FMyJIPF9aU8HNqVKPNo7Fk="; + hash = "sha256-Kw6Qh/9eQPMj4V689+7AxuJB+aCciK3FZTfcdhyZXGY="; }; - cargoHash = "sha256-HiydWqOHz4LJJwJTclRlQfOphE1W03HTMjCtqr1XnJs="; + cargoHash = "sha256-GlzT7lN9iCNiPFIjhL/UfqohgtOwDaIeTVEWOyaeicM="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/language-servers/vala-language-server/default.nix b/pkgs/development/tools/language-servers/vala-language-server/default.nix index 0a8b3ef124a5b..9faf60024c5dc 100644 --- a/pkgs/development/tools/language-servers/vala-language-server/default.nix +++ b/pkgs/development/tools/language-servers/vala-language-server/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ninja pkg-config scdoc - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # GNOME Builder Plugin gnome-builder ]; diff --git a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix index 4b7f571ead576..03dec7c8c2fb4 100644 --- a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix +++ b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix @@ -23,7 +23,7 @@ buildNpmPackage rec { buildPhase = let extensions = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then "../VSCodium.app/Contents/Resources/app/extensions" else "../resources/app/extensions"; in diff --git a/pkgs/development/tools/ldid-procursus/default.nix b/pkgs/development/tools/ldid-procursus/default.nix deleted file mode 100644 index b9ffbb2fc871c..0000000000000 --- a/pkgs/development/tools/ldid-procursus/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, installShellFiles -, pkg-config -, libplist -, openssl -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "ldid-procursus"; - version = "2.1.5-procursus7"; - - src = fetchFromGitHub { - owner = "ProcursusTeam"; - repo = "ldid"; - rev = "v${finalAttrs.version}"; - hash = "sha256-QnSmWY9zCOPYAn2VHc5H+VQXjTCyr0EuosxvKGGpDtQ="; - }; - - nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = [ libplist openssl ]; - - stripDebugFlags = [ "--strip-unneeded" ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - postPatch = '' - substituteInPlace Makefile \ - --replace "pkg-config" "$PKG_CONFIG" - ''; - - postInstall = '' - installShellCompletion --cmd ldid --zsh _ldid - ''; - - meta = with lib; { - mainProgram = "ldid"; - description = "Put real or fake signatures in a Mach-O binary"; - homepage = "https://github.com/ProcursusTeam/ldid"; - maintainers = with maintainers; [ keto ]; - platforms = platforms.unix; - license = licenses.agpl3Only; - }; -}) diff --git a/pkgs/development/tools/ldid/default.nix b/pkgs/development/tools/ldid/default.nix index 38b252781c7e6..c3a988885cec5 100644 --- a/pkgs/development/tools/ldid/default.nix +++ b/pkgs/development/tools/ldid/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libplist libxml2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "-lcrypto" "-lplist-2.0" "-lxml2" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-framework CoreFoundation" "-framework Security" ]; diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index ca9aee9c45924..c93c27722ec23 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook doxygen pkg-config python ]; buildInputs = [ libzip glib libusb1 libftdi1 check libserialport glibmm hidapi - ] ++ lib.optionals stdenv.isLinux [ libieee1284 bluez ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libieee1284 bluez ]; strictDeps = true; diff --git a/pkgs/development/tools/luaformatter/default.nix b/pkgs/development/tools/luaformatter/default.nix deleted file mode 100644 index eb8b5a799ce18..0000000000000 --- a/pkgs/development/tools/luaformatter/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, yaml-cpp }: - -let - antlr4 = antlr4_9; -in - -stdenv.mkDerivation rec { - pname = "luaformatter"; - version = "1.3.6"; - - src = fetchFromGitHub { - owner = "Koihik"; - repo = "LuaFormatter"; - rev = version; - sha256 = "14l1f9hrp6m7z3cm5yl0njba6gfixzdirxjl8nihp9val0685vm0"; - }; - - patches = [ - (substituteAll { - src = ./fix-lib-paths.patch; - antlr4RuntimeCpp = antlr4.runtime.cpp.dev; - inherit libargs catch2 yaml-cpp; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ antlr4.runtime.cpp yaml-cpp ]; - - meta = with lib; { - description = "Code formatter for Lua"; - homepage = "https://github.com/Koihik/LuaFormatter"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "lua-format"; - }; -} diff --git a/pkgs/development/tools/lurk/default.nix b/pkgs/development/tools/lurk/default.nix index e82445b8a7f4f..0f6f109899c36 100644 --- a/pkgs/development/tools/lurk/default.nix +++ b/pkgs/development/tools/lurk/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lurk"; - version = "0.3.6"; + version = "0.3.8"; src = fetchFromGitHub { owner = "jakwai01"; repo = pname; rev = "v${version}"; - hash = "sha256-u37q5AJe6zsPNe5L+k3uVP7r92X4v3qhApPKYndZif4="; + hash = "sha256-JY5MSjHN8/n5iILgqjo6EOzuQRuTovAptMPh6oiJ7Zw="; }; - cargoHash = "sha256-1hKyrlCDsOe+F88lg4+I5JMxG44CN2MOLi4GlaDBctk="; + cargoHash = "sha256-cVGN5LZwjWijvVoAnz8LUyTImfT6KvgTGEg5JODGXHk="; postPatch = '' substituteInPlace src/lib.rs \ diff --git a/pkgs/development/tools/mars-mips/default.nix b/pkgs/development/tools/mars-mips/default.nix index 66b9684175c37..d5489e7e2537a 100644 --- a/pkgs/development/tools/mars-mips/default.nix +++ b/pkgs/development/tools/mars-mips/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems unzip imagemagick - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix index 30cc14902e156..318f1a7ff1e18 100644 --- a/pkgs/development/tools/melange/default.nix +++ b/pkgs/development/tools/melange/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-OHIpMVXfuX5ezkDGsJIaFgsh5+YolJyap+i9jcUQch0="; + hash = "sha256-+G6lSG3iaKWC1SU0cyeU1sU8r9VBUwwtU7D/yjZmu04="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-X4jyLZATJIbTeL4moRrrJQ4B36tlUEfpK6SjBhlJTHQ="; + vendorHash = "sha256-GNY1ez7qC2aaEm8WAQqGy4vWZEZFQhze15r3QQZBNzA="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 8dabb8a239690..cfe12b41d3aa7 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "memray"; - version = "1.13.4"; + version = "1.14.0"; pyproject = true; src = fetchFromGitHub { owner = "bloomberg"; repo = "memray"; rev = "refs/tags/v${version}"; - hash = "sha256-8ztnXNdsthoMvooWoJLKrB9yGHjkYhQ2jiwF3KujAnw="; + hash = "sha256-U9JR60rSxPYXbZaKR7vVNhGT78AXnqcoqvVC6/1OW/E="; }; build-system = with python3Packages; [ @@ -44,8 +44,9 @@ python3Packages.buildPythonApplication rec { with python3Packages; [ ipython - pytestCheckHook pytest-cov # fix Unknown pytest.mark.no_cover + pytest-textual-snapshot + pytestCheckHook ] ++ lib.optionals (pythonOlder "3.12") [ greenlet ]; diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index 42bf1ac0d5f7d..62b69b6318ff4 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - hash = "sha256-fHX0bQj065aPihd/4jPUWWSi5kAmHov8720KOjsFeFs="; + hash = "sha256-+hpsGFZHuVhh+fKVcap0vhoUmRs3xPgUwW8SD56m6uI="; }; vendorHash = "sha256-X+GfM73LAWk2pT4ZOPT2pg8YaKyT+SNjQ14LgB+C7Wo="; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 099e56ce47e42..2ef6fed041896 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.5.1"; + version = "4.6.2"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-7l/SMJ+sTfz7/73ufQIB3q607yBHkUkHcFo9OkmCiwo="; + sha256 = "sha256-y+/qdZ9Kl6rVoziss+UipkU4/QSqZuD7J3efWdWNfl8="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 0a054fe43a1c7..183481d872dda 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; - version = "2.8.5"; + version = "2.8.7"; src = fetchFromGitHub { owner = "MiniZinc"; repo = "libminizinc"; rev = finalAttrs.version; - sha256 = "sha256-AD5hbHnu5/gmhvk4Hzeqzvq3E/7w54ijxl9US5eATRY="; + sha256 = "sha256-2JCTOgnzGeh106YBkLPM46MgnB4XHZmdMXNn1P0OBqA="; }; nativeBuildInputs = [ bison cmake flex jq ]; diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 45fd8da44b5ed..46025c0f9bb0e 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, qtbase, qmake, qtwebsockets, minizinc, makeWrapper, Cocoa }: let - executableLoc = if stdenv.isDarwin then "$out/Applications/MiniZincIDE.app/Contents/MacOS/MiniZincIDE" else "$out/bin/MiniZincIDE"; + executableLoc = if stdenv.hostPlatform.isDarwin then "$out/Applications/MiniZincIDE.app/Contents/MacOS/MiniZincIDE" else "$out/bin/MiniZincIDE"; in stdenv.mkDerivation rec { pname = "minizinc-ide"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake makeWrapper ]; - buildInputs = [ qtbase qtwebsockets ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ qtbase qtwebsockets ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; sourceRoot = "${src.name}/MiniZincIDE"; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix deleted file mode 100644 index e9877d257e62c..0000000000000 --- a/pkgs/development/tools/misc/act/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -}: - -buildGoModule rec { - pname = "act"; - version = "0.2.65"; - - src = fetchFromGitHub { - owner = "nektos"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-b2CJMjQr6Eez1xijGpXNkKeYeO87o1a13rB9bA2ShV0="; - }; - - vendorHash = "sha256-AqzhDEan0tdjfbP/nmpfa2e842zR6RyymllNR02zjlM="; - - doCheck = false; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - ]; - - meta = with lib; { - description = "Run your GitHub Actions locally"; - mainProgram = "act"; - homepage = "https://github.com/nektos/act"; - changelog = "https://github.com/nektos/act/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne kashw2 ]; - }; -} diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix index daf026dc3a5b4..c505cc6948054 100644 --- a/pkgs/development/tools/misc/autoconf/2.64.nix +++ b/pkgs/development/tools/misc/autoconf/2.64.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + #doCheck = ((!stdenv.hostPlatform.isCygwin) && (!stdenv.hostPlatform.isSunOS)); doCheck = false; # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the diff --git a/pkgs/development/tools/misc/autoconf/2.69.nix b/pkgs/development/tools/misc/autoconf/2.69.nix index 870b0ae1d34a8..bdd534055a5a0 100644 --- a/pkgs/development/tools/misc/autoconf/2.69.nix +++ b/pkgs/development/tools/misc/autoconf/2.69.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + #doCheck = ((!stdenv.hostPlatform.isCygwin) && (!stdenv.hostPlatform.isSunOS)); doCheck = false; # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the diff --git a/pkgs/development/tools/misc/autoconf/2.71.nix b/pkgs/development/tools/misc/autoconf/2.71.nix index 1fcb819bd4b72..bfc24892ecd92 100644 --- a/pkgs/development/tools/misc/autoconf/2.71.nix +++ b/pkgs/development/tools/misc/autoconf/2.71.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + doCheck = ((!stdenv.hostPlatform.isCygwin) && (!stdenv.hostPlatform.isSunOS)); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 8039e36a4f209..9f4ee80d1a767 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + doCheck = ((!stdenv.hostPlatform.isCygwin) && (!stdenv.hostPlatform.isSunOS)); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 3cb6760842f5f..e435716667191 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo" ] # See: https://sourceforge.net/p/autogen/bugs/187/ - ++ lib.optionals stdenv.isDarwin [ "ac_cv_func_utimensat=no" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "ac_cv_func_utimensat=no" ]; #doCheck = true; # not reliable diff --git a/pkgs/development/tools/misc/binutils/2.38/libbfd.nix b/pkgs/development/tools/misc/binutils/2.38/libbfd.nix index 08cf35970a6ce..313b610560da8 100644 --- a/pkgs/development/tools/misc/binutils/2.38/libbfd.nix +++ b/pkgs/development/tools/misc/binutils/2.38/libbfd.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { strictDeps = true; nativeBuildInputs = [ autoreconfHook bison ]; - buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.isDarwin [ libintl ]; + buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ]; configurePlatforms = [ "build" "host" ]; configureFlags = [ diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 491bfc19ae0fc..cbc6351d5545f 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { # not need to know binutils' BINDIR at all. It's an absolute path # where libraries are stored. ./plugins-no-BINDIR.patch - ] ++ lib.optionals buildPlatform.isDarwin [ + ] ++ lib.optionals hostPlatform.isDarwin [ # Note: Conditional to avoid Linux rebuilds on staging-next. Remove the conditional with the next update. # ld64 needs `-undefined dynamic_lookup` to link `libctf-nobfd.dylib`, but the Darwin # version detection in `libtool.m4` fails to detect the Darwin version correctly. @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals targetPlatform.isVc4 [ flex ] ; - buildInputs = [ zlib gettext ] ++ lib.optionals buildPlatform.isDarwin [ CoreServices ]; + buildInputs = [ zlib gettext ] ++ lib.optionals hostPlatform.isDarwin [ CoreServices ]; inherit noSysDirs; diff --git a/pkgs/development/tools/misc/binutils/gold-powerpc-for-llvm.patch b/pkgs/development/tools/misc/binutils/gold-powerpc-for-llvm.patch deleted file mode 100644 index 29330131499b3..0000000000000 --- a/pkgs/development/tools/misc/binutils/gold-powerpc-for-llvm.patch +++ /dev/null @@ -1,107 +0,0 @@ -https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=d537f77ef3b18a5fbfd598643aaad957652e9608 - -Fix llvm testsuite failure on a single test: - FAIL: LLVM :: tools/gold/PowerPC/mtriple.ll (43659 of 49708) - ld.gold: internal error in add_output_section_to_load, at output.cc:4097 - -From: Alan Modra <amodra@gmail.com> -Date: Thu, 24 Aug 2023 23:42:18 +0000 (+0930) -Subject: PR30794, PowerPC gold: internal error in add_output_section_to_load -X-Git-Tag: gdb-14-branchpoint~482 -X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=d537f77ef3b18a5fbfd598643aaad957652e9608 - -PR30794, PowerPC gold: internal error in add_output_section_to_load - -Caused by commit 5a97377e5513, specifically this code added to -Target_powerpc::do_relax -+ if (parameters->options().output_is_position_independent()) -+ this->rela_dyn_size_ -+ = this->rela_dyn_section(layout)->current_data_size(); - -The problem here is that if .rela.dyn isn't already created then the -call to rela_dyn_section creates it, and as this comment in -Target_powerpc::do_finalize_sections says: - // Annoyingly, we need to make these sections now whether or - // not we need them. If we delay until do_relax then we - // need to mess with the relaxation machinery checkpointing. -We can't be creating sections in do_relax. - - PR 30794 - * powerpc.cc (Target_powerpc::do_relax): Only set rela_dyn_size_ - for size == 64, and assert that rela_dyn_ already exists. - Tidy code setting plt_thread_safe, which also only needs to be - set when size == 64 for ELFv1. ---- - -diff --git a/gold/powerpc.cc b/gold/powerpc.cc -index e66d9cbb900..a4fecaae55a 100644 ---- a/gold/powerpc.cc -+++ b/gold/powerpc.cc -@@ -3714,12 +3714,7 @@ Target_powerpc<size, big_endian>::do_relax(int pass, - unsigned int prev_brlt_size = 0; - if (pass == 1) - { -- bool thread_safe -- = this->abiversion() < 2 && parameters->options().plt_thread_safe(); -- if (size == 64 -- && this->abiversion() < 2 -- && !thread_safe -- && !parameters->options().user_set_plt_thread_safe()) -+ if (size == 64 && this->abiversion() < 2) - { - static const char* const thread_starter[] = - { -@@ -3747,29 +3742,37 @@ Target_powerpc<size, big_endian>::do_relax(int pass, - /* libgo */ - "__go_go", - }; -+ bool thread_safe = parameters->options().plt_thread_safe(); - -- if (parameters->options().shared()) -- thread_safe = true; -- else -+ if (!thread_safe -+ && !parameters->options().user_set_plt_thread_safe()) - { -- for (unsigned int i = 0; -- i < sizeof(thread_starter) / sizeof(thread_starter[0]); -- i++) -+ if (parameters->options().shared()) -+ thread_safe = true; -+ else - { -- Symbol* sym = symtab->lookup(thread_starter[i], NULL); -- thread_safe = (sym != NULL -- && sym->in_reg() -- && sym->in_real_elf()); -- if (thread_safe) -- break; -+ for (unsigned int i = 0; -+ i < sizeof(thread_starter) / sizeof(thread_starter[0]); -+ i++) -+ { -+ Symbol* sym = symtab->lookup(thread_starter[i], NULL); -+ thread_safe = (sym != NULL -+ && sym->in_reg() -+ && sym->in_real_elf()); -+ if (thread_safe) -+ break; -+ } - } - } -+ this->plt_thread_safe_ = thread_safe; - } -- this->plt_thread_safe_ = thread_safe; - -- if (parameters->options().output_is_position_independent()) -- this->rela_dyn_size_ -- = this->rela_dyn_section(layout)->current_data_size(); -+ if (size == 64 -+ && parameters->options().output_is_position_independent()) -+ { -+ gold_assert (this->rela_dyn_); -+ this->rela_dyn_size_ = this->rela_dyn_->current_data_size(); -+ } - - this->stub_group_size_ = parameters->options().stub_group_size(); - bool no_size_errors = true; diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 0df4f3d41b217..e3114ea8bd3d8 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.11"; + version = "2.28.12"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ dpkg ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - if ${ lib.boolToString stdenv.isLinux } + if ${ lib.boolToString stdenv.hostPlatform.isLinux } then dpkg-deb -x $src $out mv $out/usr/* $out @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "g/Wt/rTmqSAM+m46J7bTGJnX3lD7aYHJKIqXGL2cUlo="; + sha256 = "Z8E8Nn+q9Onku6K7OM3qh2Co0QYnxn9s+g2/xgntFCw="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "GDNy0Y0ytySvU/6LgoY6OoEZex+EujhdWjfrOdmK968="; + sha256 = "RbT65OuvjUD73h5qp9n5EIXTPR94T7z6/4EcsE/XMsM="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "QzK4uxgt+nUtR9sY62PNk6ea3ZuUFVI1Ve16MdCeOog="; + sha256 = "d1VadZt5yZg7AF0UITh3XcEGxBLR6uONgkaLt5vXTE0="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "jrBP8iCD6/DNa/9UNBODvI1Du2SjiQSR2fJAXeWdIiY="; + sha256 = "h8IAxVUj85mh8Lz/zpxAHv0r4ozodiFWw+we0b4ZhJo="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "2xCz5/G/aFMopI3VGXEkXz4cetFI2NdUg+6dXfvOxFQ="; + sha256 = "wp5I8urCtH1zr5Pg10yBN5RqVMPmWS/KNd6zSvIslKo="; }; }; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 4a292f6079bc0..6ba14d3250480 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -15,47 +15,47 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "1.92.22"; + version = "1.92.23"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-MWAKoshKC+hW8ldRLfYQIcMwpSHvW+hV9dRMvZ4rqcU="; - "8.2" = "sha256-xAdECbxuaV5PxG+X7+o2p5pOEG9lgRLuOTp46k5I4RM="; - "8.3" = "sha256-4vCLpSy4kJ4qwOSonSFvlevCfNMxjIU6AUswm0uG59o="; + "8.1" = "sha256-/aWW1QY2NVsoMLTv1HOxx+ujhkCx4i+FWcwt9zdfPKI="; + "8.2" = "sha256-VYHxvpFxLBCDHwWQH0HO+3CEiN4zcry7jLn/3KzvENU="; + "8.3" = "sha256-vDJCDCF/COlmqdZVinIK9FUXTS5BiDpjUchabjrlpnA="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-fvXv3Yn3FXBO4EIgb/5LI3jJxV5HA2Q2JCNy14bA8eU="; - "8.2" = "sha256-0m2ze1e09IUGjTpxbyTOchQBBMa86cpiMrAImiXrAZ0="; - "8.3" = "sha256-nhVP4/Ls71MxPN6Ko1bDG8PSHkHQt+vC08EbP0WAL8g="; + "8.1" = "sha256-CsxaRbLg9j3djLPMbbsrduLXQTp4KJuWPecHWBMWIcA="; + "8.2" = "sha256-oy1FQ+1wSORHOUidQ8fNEXHMX5bLhLYyZ8mQLzKJh+0="; + "8.3" = "sha256-TnEYofVT6vsO3AnpsDvwiqz0LeuFkLGS1befnlSFfT4="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-pvzKVvtpBh+nwppqSqxSsR989mWzwyAHtwIdDjWx08o="; - "8.2" = "sha256-O6RhO/PY2C4GubYl/jcTzpWeiUKSGy8Np4/KrlMsE1Y="; - "8.3" = "sha256-3sfjwXq980oRV8u+IAamyYKDp2UMREFaynigz/dpyXE="; + "8.1" = "sha256-znvHYCaI08KWVwht83+fv74IY8hotXnww8eJLj/+5us="; + "8.2" = "sha256-Da9/wqFLnSE8GUzB4NrqbIAJ81deTgCpAGOgecIX40A="; + "8.3" = "sha256-Pii1cVwceg+BIbtQ1PhfuqAc60R3gt2o2iel7Zxs7l0="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-peZmwxzQ2NCKkq5qSraIb4pnnJDwcRkCyGW8qeBSGRk="; - "8.2" = "sha256-MvF7S+VITEnsJSLz3xEy927zIR6TN+p3nRGQFjKqtu8="; - "8.3" = "sha256-sUlD8cPk7emJPtz4en6AcFxs/7NUjxUMkqf/Qs3INIA="; + "8.1" = "sha256-y40O5YGZJxzZtF03h6cdxvXkWO51bJmykUTlnDZlhzI="; + "8.2" = "sha256-CRy/G84NFguOZhCDwYWtj3r0rjJarBXvWxS+QkHKzoA="; + "8.3" = "sha256-vr05O/MtS6UeD078aUZusmORutTysO711f2+H7gcaMU="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-kMftb/fC9uyMZyjP4jmtYLM+xEhFqP7umQ5FLvR9vAo="; - "8.2" = "sha256-W8LXYz8KzWlzdpyqmo7XQmkzuyfXO0BZSkiBIlfi18g="; - "8.3" = "sha256-a/Q7avEJr/we5GF2NxTZywpsal5AkAGxEABMPCgy2LM="; + "8.1" = "sha256-f4YZEfNDC3PM4vUcLJaUj5kRG/dVjIl5+QyBXBIOYps="; + "8.2" = "sha256-QpfucP0u8+OTPqcB9lrYjg7L7qpLFtyA6Jo+00havRA="; + "8.3" = "sha256-PBxklii6kseqOcGum/bqTfsK0nPUCEn6pje8WYXuGOM="; }; }; }; @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { inherit system phpMajor; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 51d80b6df9ae9..a7a923a6d4842 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -1,81 +1,107 @@ -{ stdenv, lib, callPackage }: +{ + stdenv, + lib, + callPackage, +}: let - common = arch: callPackage ( - { bison - , callPackage - , curl - , fetchgit - , flex - , getopt - , git - , gnat - , gcc - , lib - , perl - , stdenvNoCC - , zlib - , withAda ? true - }: + common = + arch: + callPackage ( + { + bison, + callPackage, + curl, + fetchgit, + flex, + getopt, + git, + gnat, + gcc, + lib, + perl, + stdenvNoCC, + zlib, + withAda ? true, + }: - stdenvNoCC.mkDerivation (finalAttrs: { - pname = "coreboot-toolchain-${arch}"; - version = "24.05"; + stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coreboot-toolchain-${arch}"; + version = "24.08"; - src = fetchgit { - url = "https://review.coreboot.org/coreboot"; - rev = finalAttrs.version; - hash = "sha256-jTfMFvl3sG3BIVVkpZ81BQ20Bs+2ESE6RMh0fW86rKE="; - fetchSubmodules = false; - leaveDotGit = true; - postFetch = '' - PATH=${lib.makeBinPath [ getopt ]}:$PATH ${stdenv.shell} $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version - rm -rf $out/.git - ''; - allowedRequisites = [ ]; - }; + src = fetchgit { + url = "https://review.coreboot.org/coreboot"; + rev = finalAttrs.version; + hash = "sha256-G/O8wN7moawiG4nAWsYSfiU3gpYxMvPtyvkgkrTL62E="; + fetchSubmodules = false; + leaveDotGit = true; + postFetch = '' + PATH=${lib.makeBinPath [ getopt ]}:$PATH ${stdenv.shell} $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version + rm -rf $out/.git + ''; + allowedRequisites = [ ]; + }; - nativeBuildInputs = [ bison curl git perl ]; - buildInputs = [ flex zlib (if withAda then gnat else gcc) ]; + nativeBuildInputs = [ + bison + curl + git + perl + ]; + buildInputs = [ + flex + zlib + (if withAda then gnat else gcc) + ]; - enableParallelBuilding = true; - dontConfigure = true; - dontInstall = true; + enableParallelBuilding = true; + dontConfigure = true; + dontInstall = true; - postPatch = '' - patchShebangs util/crossgcc/buildgcc + postPatch = '' + patchShebangs util/crossgcc/buildgcc - mkdir -p util/crossgcc/tarballs + mkdir -p util/crossgcc/tarballs - ${lib.concatMapStringsSep "\n" ( - file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}" - ) (callPackage ./stable.nix { }) - } + ${lib.concatMapStringsSep "\n" (file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}") ( + callPackage ./stable.nix { } + )} - patchShebangs util/genbuild_h/genbuild_h.sh - ''; + patchShebangs util/genbuild_h/genbuild_h.sh + ''; - buildPhase = '' - export CROSSGCC_VERSION=$(cat .crossgcc_version) - make crossgcc-${arch} CPUS=$NIX_BUILD_CORES DEST=$out - ''; + buildPhase = '' + export CROSSGCC_VERSION=$(cat .crossgcc_version) + make crossgcc-${arch} CPUS=$NIX_BUILD_CORES DEST=$out + ''; - meta = with lib; { - homepage = "https://www.coreboot.org"; - description = "coreboot toolchain for ${arch} targets"; - license = with licenses; [ bsd2 bsd3 gpl2 lgpl2Plus gpl3Plus ]; - maintainers = with maintainers; [ felixsinger jmbaur ]; - platforms = platforms.linux; - }; - }) - ); + meta = with lib; { + homepage = "https://www.coreboot.org"; + description = "coreboot toolchain for ${arch} targets"; + license = with licenses; [ + bsd2 + bsd3 + gpl2 + lgpl2Plus + gpl3Plus + ]; + maintainers = with maintainers; [ + felixsinger + jmbaur + ]; + platforms = platforms.linux; + }; + }) + ); in -lib.listToAttrs (map (arch: lib.nameValuePair arch (common arch { })) [ - "i386" - "x64" - "arm" - "aarch64" - "riscv" - "ppc64" - "nds32le" -]) +lib.listToAttrs ( + map (arch: lib.nameValuePair arch (common arch { })) [ + "i386" + "x64" + "arm" + "aarch64" + "riscv" + "ppc64" + ] +) + diff --git a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index 6656e78220869..fc20a1a3e7f85 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -1,4 +1,5 @@ -{ fetchurl }: [ +{ fetchurl }: +[ { name = "gmp-6.3.0.tar.xz"; archive = fetchurl { @@ -21,10 +22,10 @@ }; } { - name = "gcc-13.2.0.tar.xz"; + name = "gcc-14.1.0.tar.xz"; archive = fetchurl { - sha256 = "1nj3qyswcgc650sl3h0480a171ixp33ca13zl90p61m689jffxg2"; - url = "mirror://gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz"; + sha256 = "0h3889kkfp9bzw8km9w1ssh5qjskg6yw02q8v3lkvzksk1acd0z2"; + url = "mirror://gnu/gcc/gcc-14.1.0/gcc-14.1.0.tar.xz"; }; } { @@ -42,10 +43,10 @@ }; } { - name = "nasm-2.16.01.tar.bz2"; + name = "nasm-2.16.03.tar.bz2"; archive = fetchurl { - sha256 = "0bmv8xbzck7jim7fzm6jnwiahqkprbpz6wzhg53irm28w0pavdim"; - url = "https://www.nasm.us/pub/nasm/releasebuilds/2.16.01/nasm-2.16.01.tar.bz2"; + sha256 = "0mwynbnn7c4ay4rpcsyp99j49sa6j3p8gk5pigwssqfdkcaxxwxy"; + url = "https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/nasm-2.16.03.tar.bz2"; }; } ] diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 7adc78013f479..a8b6acb1e3f93 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # On Linux, c-reduce's preferred way to reason about # the cpu architecture/topology is to use 'lscpu', # so let's make sure it knows where to find it: - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace creduce/creduce_utils.pm --replace \ lscpu ${util-linux}/bin/lscpu ''; diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index 228f8ed98a67b..d74dfaa7e760f 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub +, clang-tools , cmake , colordiff , flex @@ -34,11 +35,11 @@ buildPythonApplication rec { # Avoid blanket -Werror to evade build failures on less # tested compilers. substituteInPlace CMakeLists.txt \ - --replace " -Werror " " " + --replace-fail " -Werror " " " substituteInPlace cvise/utils/testing.py \ - --replace "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \ - --replace "'colordiff'" "'${colordiff}/bin/colordiff'" + --replace-fail "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \ + --replace-fail "'colordiff'" "'${colordiff}/bin/colordiff'" ''; nativeBuildInputs = [ @@ -65,6 +66,12 @@ buildPythonApplication rec { unifdef ]; + cmakeFlags = [ + # By default `cvise` looks it up in `llvm` bin directory. But + # `nixpkgs` moves it into a separate derivation. + "-DCLANG_FORMAT_PATH=${clang-tools}/bin/clang-format" + ]; + disabledTests = [ # Needs gcc, fails when run noninteractively (without tty). "test_simple_reduction" diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 0321b24de3210..f33f08825799c 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -25,7 +25,9 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'debuggerCommand:' 'debuggerCommand: ${gdb}/bin/gdb' ''; - nativeBuildInputs = [ imagemagick ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + nativeBuildInputs = [ + imagemagick + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ motif @@ -36,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { # ioctl is not found without this flag. fixed in next release # Upstream issue ref: https://savannah.gnu.org/bugs/index.php?64188 - env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_COMPILE = "-DHAVE_SYS_IOCTL_H"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_COMPILE = "-DHAVE_SYS_IOCTL_H"; }; configureFlags = [ "--enable-builtin-manual" diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index a6bed02574407..33e37cb77e739 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.3.12"; + version = "6.3.13"; src = fetchFromGitHub { owner = "devspace-sh"; repo = "devspace"; rev = "v${version}"; - hash = "sha256-tnkMXB0BWavSZF3HEdvtCE42zgcHNRGI5CdK3RDvv9c="; + hash = "sha256-MWFDAyr4oHBe1K9ag5mC3iJAyJgs3ePa6W9//6T2G9A="; }; vendorHash = null; diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 6ab0259205338..fb4dff6b5e100 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -1,14 +1,33 @@ -{ lib, stdenv, fetchurl, python3, makeWrapper, libxml2 }: +{ + fetchurl, + lib, + libxml2, + makeWrapper, + python3, + stdenv, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "doclifter"; version = "2.21"; + src = fetchurl { - url = "http://www.catb.org/~esr/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-3zb+H/rRmU87LWh0+kQtiRMZ4JwJ3tVrt8vQ/EeKx8Q="; + url = "http://www.catb.org/~esr/doclifter/doclifter-${finalAttrs.version}.tar.gz"; + hash = "sha256-3zb+H/rRmU87LWh0+kQtiRMZ4JwJ3tVrt8vQ/EeKx8Q="; }; + + postPatch = '' + substituteInPlace manlifter \ + --replace-fail '/usr/bin/env python2' '/usr/bin/env python3' + 2to3 -w manlifter + ''; + + nativeBuildInputs = [ + python3 + makeWrapper + ]; + buildInputs = [ python3 ]; - nativeBuildInputs = [ python3 makeWrapper ]; strictDeps = true; @@ -17,19 +36,18 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 - substituteInPlace manlifter \ - --replace '/usr/bin/env python2' '/usr/bin/env python3' - 2to3 -w manlifter cp manlifter $out/bin wrapProgram "$out/bin/manlifter" \ - --prefix PATH : "${libxml2}/bin:$out/bin" - cp manlifter.1 $out/share/man/man1 + --prefix PATH : "${lib.getBin libxml2}/bin:$out/bin" + gzip < manlifter.1 > $out/share/man/man1/manlifter.1.gz ''; meta = { + changelog = "https://gitlab.com/esr/doclifter/-/blob/2.21/NEWS"; description = "Lift documents in nroff markups to XML-DocBook"; homepage = "http://www.catb.org/esr/doclifter"; - license = "BSD"; + license = lib.licenses.bsd2; + mainProgram = "doclifter"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/tools/misc/doq/default.nix b/pkgs/development/tools/misc/doq/default.nix index 8322c7e2b49c6..7867204650971 100644 --- a/pkgs/development/tools/misc/doq/default.nix +++ b/pkgs/development/tools/misc/doq/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Docstring generator for Python"; homepage = "https://github.com/heavenshell/py-doq"; - changelog = "https://github.com/heavenshell/py-doq/releases/tag/${src.rev}"; + changelog = "https://github.com/heavenshell/py-doq/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.bsd3; maintainers = with maintainers; [ natsukium ]; mainProgram = "doq"; diff --git a/pkgs/development/tools/misc/dura/default.nix b/pkgs/development/tools/misc/dura/default.nix index 34b5127e118ec..34b966607a745 100644 --- a/pkgs/development/tools/misc/dura/default.nix +++ b/pkgs/development/tools/misc/dura/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch b/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch new file mode 100644 index 0000000000000..a3442c6aa276a --- /dev/null +++ b/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch @@ -0,0 +1,331 @@ +From: Tristan Ross <tristan.ross@midstall.com> +Date: Wed, 31 Jul 2024 04:03:03 +0000 (-0700) +Subject: Prevent binaries in src from colliding with libc++ headers +X-Git-Url: https://sourceware.org/git/?p=elfutils.git;a=commitdiff_plain;h=232b9ede92cbecabbd61291c2fc9aaf3fc61061f;hp=87a60d22299c4ba7b94cbce04a32c2abf015f98a + +Prevent binaries in src from colliding with libc++ headers + +Discovered with Nix and LLVM 17. Headers inside of libc++ can easily +collide with binaries being linked in src. This results in clang trying +to include a binary as a header. + +Fix this by removing '-I.' and '-I$(srcdir)' from AM_CPPFLAGS and +DEFAULT_INCLUDES in src/Makefile.am. + +To facilitate this config/eu.am has been refactored. New file +config/eu-common.am contains all of the old eu.am but with the +AM_CPPFLAGS definition removed. eu.am now includes eu-common.am and +contains the old AM_CPPFLAGS definition. + +eu.am functionality does not change, but src/Makefile.am can instead +include eu-common.am and define its own AM_CPPFLAGS without causing a +"multiply defined" warning during autoreconf. + +Signed-off-by: Tristan Ross <tristan.ross@midstall.com> +--- + +diff --git a/config/eu-common.am b/config/eu-common.am +new file mode 100644 +index 000000000..9cc7f6969 +--- /dev/null ++++ b/config/eu-common.am +@@ -0,0 +1,148 @@ ++## Common automake fragments for elfutils subdirectory makefiles. ++## ++## Copyright (C) 2010, 2014, 2016 Red Hat, Inc. ++## Copyright (C) 2023, Mark J. Wielaard <mark@klomp.org> ++## ++## This file is part of elfutils. ++## ++## This file is free software; you can redistribute it and/or modify ++## it under the terms of either ++## ++## * the GNU Lesser General Public License as published by the Free ++## Software Foundation; either version 3 of the License, or (at ++## your option) any later version ++## ++## or ++## ++## * the GNU General Public License as published by the Free ++## Software Foundation; either version 2 of the License, or (at ++## your option) any later version ++## ++## or both in parallel, as here. ++## ++## elfutils is distributed in the hope that it will be useful, but ++## WITHOUT ANY WARRANTY; without even the implied warranty of ++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++## General Public License for more details. ++## ++## You should have received copies of the GNU General Public License and ++## the GNU Lesser General Public License along with this program. If ++## not, see <http://www.gnu.org/licenses/>. ++## ++ ++DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' ++ ++# Drop the 'u' flag that automake adds by default. It is incompatible ++# with deterministic archives. ++ARFLAGS = cr ++ ++# Warn about stack usage of more than 256K = 262144 bytes. ++if ADD_STACK_USAGE_WARNING ++STACK_USAGE_WARNING=-Wstack-usage=262144 ++STACK_USAGE_NO_ERROR=-Wno-error=stack-usage= ++else ++STACK_USAGE_WARNING= ++STACK_USAGE_NO_ERROR= ++endif ++ ++if SANE_LOGICAL_OP_WARNING ++LOGICAL_OP_WARNING=-Wlogical-op ++else ++LOGICAL_OP_WARNING= ++endif ++ ++if HAVE_DUPLICATED_COND_WARNING ++DUPLICATED_COND_WARNING=-Wduplicated-cond ++else ++DUPLICATED_COND_WARNING= ++endif ++ ++if HAVE_NULL_DEREFERENCE_WARNING ++NULL_DEREFERENCE_WARNING=-Wnull-dereference ++else ++NULL_DEREFERENCE_WARNING= ++endif ++ ++if HAVE_IMPLICIT_FALLTHROUGH_WARNING ++# Use strict fallthrough. Only __attribute__((fallthrough)) will prevent the ++# warning ++if HAVE_IMPLICIT_FALLTHROUGH_5_WARNING ++IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough=5 ++else ++IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough ++endif ++else ++IMPLICIT_FALLTHROUGH_WARNING= ++endif ++ ++if HAVE_TRAMPOLINES_WARNING ++TRAMPOLINES_WARNING=-Wtrampolines ++else ++TRAMPOLINES_WARNING= ++endif ++ ++if HAVE_NO_PACKED_NOT_ALIGNED_WARNING ++NO_PACKED_NOT_ALIGNED_WARNING=-Wno-packed-not-aligned ++else ++NO_PACKED_NOT_ALIGNED_WARNING= ++endif ++ ++if HAVE_USE_AFTER_FREE3_WARNING ++USE_AFTER_FREE3_WARNING=-Wuse-after-free=3 ++else ++USE_AFTER_FREE3_WARNING= ++endif ++ ++AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ ++ -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \ ++ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ ++ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ ++ $(USE_AFTER_FREE3_WARNING) \ ++ $(if $($(*F)_no_Werror),,-Werror) \ ++ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ ++ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ ++ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ ++ $($(*F)_CFLAGS) ++ ++AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ ++ $(TRAMPOLINES_WARNING) \ ++ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ ++ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ ++ $(if $($(*F)_no_Werror),,-Werror) \ ++ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ ++ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ ++ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ ++ $($(*F)_CXXFLAGS) ++ ++COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) ++ ++DEFS.os = -DPIC -DSHARED ++if SYMBOL_VERSIONING ++DEFS.os += -DSYMBOL_VERSIONING ++else ++endif ++ ++%.os: %.c %.o ++if AMDEP ++ $(AM_V_CC)if $(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) -MT $@ -MD -MP \ ++ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ ++ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ ++ rm -f "$(DEPDIR)/$*.Tpo"; \ ++ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++ fi ++else ++ $(AM_V_CC)$(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) $< ++endif ++ ++CLEANFILES = *.gcno *.gcda ++ ++textrel_msg = echo "WARNING: TEXTREL found in '$@'" ++if FATAL_TEXTREL ++textrel_found = $(textrel_msg); exit 1 ++else ++textrel_found = $(textrel_msg) ++endif ++textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found); fi ++ ++print-%: ++ @echo $*=$($*) +diff --git a/config/eu.am b/config/eu.am +index e6c241f9d..3aa6048aa 100644 +--- a/config/eu.am ++++ b/config/eu.am +@@ -1,4 +1,5 @@ +-## Common automake fragments for elfutils subdirectory makefiles. ++## Common automake fragments for elfutils subdirectory makefiles ++## with AM_CPPFLAGS set. + ## + ## Copyright (C) 2010, 2014, 2016 Red Hat, Inc. + ## Copyright (C) 2023, Mark J. Wielaard <mark@klomp.org> +@@ -30,120 +31,5 @@ + ## not, see <http://www.gnu.org/licenses/>. + ## + +-DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' + AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. +- +-# Drop the 'u' flag that automake adds by default. It is incompatible +-# with deterministic archives. +-ARFLAGS = cr +- +-# Warn about stack usage of more than 256K = 262144 bytes. +-if ADD_STACK_USAGE_WARNING +-STACK_USAGE_WARNING=-Wstack-usage=262144 +-STACK_USAGE_NO_ERROR=-Wno-error=stack-usage= +-else +-STACK_USAGE_WARNING= +-STACK_USAGE_NO_ERROR= +-endif +- +-if SANE_LOGICAL_OP_WARNING +-LOGICAL_OP_WARNING=-Wlogical-op +-else +-LOGICAL_OP_WARNING= +-endif +- +-if HAVE_DUPLICATED_COND_WARNING +-DUPLICATED_COND_WARNING=-Wduplicated-cond +-else +-DUPLICATED_COND_WARNING= +-endif +- +-if HAVE_NULL_DEREFERENCE_WARNING +-NULL_DEREFERENCE_WARNING=-Wnull-dereference +-else +-NULL_DEREFERENCE_WARNING= +-endif +- +-if HAVE_IMPLICIT_FALLTHROUGH_WARNING +-# Use strict fallthrough. Only __attribute__((fallthrough)) will prevent the +-# warning +-if HAVE_IMPLICIT_FALLTHROUGH_5_WARNING +-IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough=5 +-else +-IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough +-endif +-else +-IMPLICIT_FALLTHROUGH_WARNING= +-endif +- +-if HAVE_TRAMPOLINES_WARNING +-TRAMPOLINES_WARNING=-Wtrampolines +-else +-TRAMPOLINES_WARNING= +-endif +- +-if HAVE_NO_PACKED_NOT_ALIGNED_WARNING +-NO_PACKED_NOT_ALIGNED_WARNING=-Wno-packed-not-aligned +-else +-NO_PACKED_NOT_ALIGNED_WARNING= +-endif +- +-if HAVE_USE_AFTER_FREE3_WARNING +-USE_AFTER_FREE3_WARNING=-Wuse-after-free=3 +-else +-USE_AFTER_FREE3_WARNING= +-endif +- +-AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ +- -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \ +- $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ +- $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ +- $(USE_AFTER_FREE3_WARNING) \ +- $(if $($(*F)_no_Werror),,-Werror) \ +- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ +- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ +- $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ +- $($(*F)_CFLAGS) +- +-AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ +- $(TRAMPOLINES_WARNING) \ +- $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ +- $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ +- $(if $($(*F)_no_Werror),,-Werror) \ +- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ +- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ +- $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ +- $($(*F)_CXXFLAGS) +- +-COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) +- +-DEFS.os = -DPIC -DSHARED +-if SYMBOL_VERSIONING +-DEFS.os += -DSYMBOL_VERSIONING +-else +-endif +- +-%.os: %.c %.o +-if AMDEP +- $(AM_V_CC)if $(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) -MT $@ -MD -MP \ +- -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ +- then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ +- rm -f "$(DEPDIR)/$*.Tpo"; \ +- else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +- fi +-else +- $(AM_V_CC)$(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) $< +-endif +- +-CLEANFILES = *.gcno *.gcda +- +-textrel_msg = echo "WARNING: TEXTREL found in '$@'" +-if FATAL_TEXTREL +-textrel_found = $(textrel_msg); exit 1 +-else +-textrel_found = $(textrel_msg) +-endif +-textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found); fi +- +-print-%: +- @echo $*=$($*) ++include $(top_srcdir)/config/eu-common.am +diff --git a/src/Makefile.am b/src/Makefile.am +index 1d592d4de..5fcebc21d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -16,10 +16,12 @@ + ## You should have received a copy of the GNU General Public License + ## along with this program. If not, see <http://www.gnu.org/licenses/>. + ## +-include $(top_srcdir)/config/eu.am ++include $(top_srcdir)/config/eu-common.am + DEFS += $(YYDEBUG) -DDEBUGPRED=@DEBUGPRED@ \ + -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\" +-AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ ++DEFAULT_INCLUDES = -I$(top_builddir) ++AM_CPPFLAGS = -I$(top_srcdir)/lib -I.. \ ++ -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ + -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \ + -I$(srcdir)/../libdwfl -I$(srcdir)/../libasm -I../debuginfod diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 78c88f3420e96..260d385e350ba 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -2,7 +2,7 @@ , musl-obstack, m4, zlib, zstd, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs , argp-standalone , enableDebuginfod ? true, sqlite, curl, libmicrohttpd, libarchive -, gitUpdater +, gitUpdater, autoreconfHook }: # TODO: Look at the hardcoded paths to kernel, modules etc. @@ -37,7 +37,10 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ] + # Prevent headers and binaries from colliding which results in an error. + # https://sourceware.org/pipermail/elfutils-devel/2024q3/007281.html + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) ./cxx-header-collision.patch; postPatch = '' patchShebangs tests/*.sh @@ -53,7 +56,8 @@ stdenv.mkDerivation rec { # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. nativeBuildInputs = [ m4 bison flex gettext bzip2 ] - ++ lib.optional enableDebuginfod pkg-config; + ++ lib.optional enableDebuginfod pkg-config + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) autoreconfHook; buildInputs = [ zlib zstd bzip2 xz ] ++ lib.optionals stdenv.hostPlatform.isMusl [ argp-standalone diff --git a/pkgs/development/tools/misc/ezno/default.nix b/pkgs/development/tools/misc/ezno/default.nix index 559622bf7da21..af035e7565ec7 100644 --- a/pkgs/development/tools/misc/ezno/default.nix +++ b/pkgs/development/tools/misc/ezno/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-noMfKx6BsmWhAVI4r8LlC961Uwogv1JGMYSrNGlLGPQ="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index afeac90c58c05..05fbd759ffcaa 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-gVYDvda+6ZJkShJXUxUEVxq4enkRrhdvlTTxYWq4Aho="; }; - nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; buildInputs = [ gettext libtool texinfo ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/funzzy/default.nix b/pkgs/development/tools/misc/funzzy/default.nix index c05def18404bd..c1f4b642a86fa 100644 --- a/pkgs/development/tools/misc/funzzy/default.nix +++ b/pkgs/development/tools/misc/funzzy/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-eq5d6oHWKip9K+9yszLXW+JHtzYzrThXfqoZGMhnSHk="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 19f6890ac9649..ac1bd1627d1cb 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -27,7 +27,6 @@ let in assert pythonSupport -> python3 != null; -assert lib.asserts.assertMsg (stdenv.targetPlatform.system != "aarch64-darwin") "GDB does not support aarch64-darwin as a target"; stdenv.mkDerivation rec { pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only"; @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { hash = "sha256-OCVOrNRXITS8qcWlqk1MpWTLvTDDadiB9zP7a5AzVPI="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace gdb/darwin-nat.c \ --replace '#include "bfd/mach-o.h"' '#include "mach-o.h"' '' + lib.optionalString stdenv.hostPlatform.isMusl '' @@ -50,7 +49,7 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin-target-match.patch ]; @@ -60,7 +59,7 @@ stdenv.mkDerivation rec { ++ lib.optional pythonSupport python3 ++ lib.optional doCheck dejagnu ++ lib.optional enableDebuginfod (elfutils.override { enableDebuginfod = true; }) - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; @@ -69,7 +68,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # darwin build fails with format hardening since v7.12 - hardeningDisable = lib.optionals stdenv.isDarwin [ "format" ]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "format" ]; env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; @@ -156,6 +155,9 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux ++ cygwin ++ freebsd ++ darwin; + # upstream does not support targeting aarch64-darwin; + # see https://inbox.sourceware.org/gdb/3185c3b8-8a91-4beb-a5d5-9db6afb93713@Spark/ + badPlatforms = lib.optionals (stdenv.targetPlatform.system == "aarch64-darwin") meta.platforms; maintainers = with lib.maintainers; [ pierron globin lsix ]; }; } diff --git a/pkgs/development/tools/misc/grcov/default.nix b/pkgs/development/tools/misc/grcov/default.nix deleted file mode 100644 index d097f389deb94..0000000000000 --- a/pkgs/development/tools/misc/grcov/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "grcov"; - version = "0.8.19"; - - src = fetchFromGitHub { - owner = "mozilla"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-1t+hzB9sSApLScCkjBnLk9i2dsoEwZmWCFukEOvHhZI="; - }; - - cargoHash = "sha256-4KzFbfUqnGmle2fwSaHMPIJHQFDq8H2Qzm4FdYdqpuM="; - - # tests do not find grcov path correctly - checkFlags = let - skipList = [ - "test_coveralls_service_job_id_is_not_sufficient" - "test_coveralls_service_name_is_not_sufficient" - "test_coveralls_works_with_just_service_name_and_job_id_args" - "test_coveralls_works_with_just_token_arg" - "test_integration" - "test_integration_guess_single_file" - "test_integration_zip_dir" - "test_integration_zip_zip" - ]; - skipFlag = test: "--skip " + test; - in builtins.concatStringsSep " " (builtins.map skipFlag skipList); - - meta = with lib; { - description = - "Rust tool to collect and aggregate code coverage data for multiple source files"; - mainProgram = "grcov"; - homepage = "https://github.com/mozilla/grcov"; - license = licenses.mpl20; - maintainers = with maintainers; [ DieracDelta ]; - }; -} diff --git a/pkgs/development/tools/misc/gtkperf/bench.patch b/pkgs/development/tools/misc/gtkperf/bench.patch deleted file mode 100644 index 3d00a03e9a58c..0000000000000 --- a/pkgs/development/tools/misc/gtkperf/bench.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- gtkperf/src/callbacks.c 2005-10-30 11:33:42.000000000 +0000 -+++ gtkperf-patched/src/callbacks.c 2008-05-23 23:41:17.000000000 +0100 -@@ -219,6 +219,13 @@ - } - - -+void -+on_cmdline_test(char *optarg) -+{ -+ appdata->test_type = atoi(optarg); -+} -+ -+ - /* Initialize appdata */ - void - setup_appdata(AppData * appdata_in) -@@ -398,7 +405,7 @@ - appdata->pixbuf_drawing = gdk_pixbuf_new_from_file (filename, NULL); - - gtk_combo_box_set_active (GTK_COMBO_BOX (appdata->combobox_testtype), -- 0); -+ appdata->test_type); - - /* create end mark to info textview */ - GtkTextIter iter; ---- gtkperf/src/callbacks.h 2005-10-30 10:21:23.000000000 +0000 -+++ gtkperf-patched/src/callbacks.h 2008-05-23 23:22:30.000000000 +0100 -@@ -13,6 +13,7 @@ - void on_cmdline_run_all (); - void on_cmdline_help () ; - void on_cmdline_count (char *optarg) ; -+void on_cmdline_test (char *optarg) ; - void on_window_main_show (AppData * data); - - gboolean ---- gtkperf/src/main.c 2005-10-30 11:26:42.000000000 +0000 -+++ gtkperf-patched/src/main.c 2008-05-23 23:44:02.000000000 +0100 -@@ -65,9 +65,10 @@ - {"help", 0, 0, 0}, - {"automatic", 0, 0, 0}, - {"count", 1, 0, 0}, -+ {"test", 1, 0, 0}, - {0, 0, 0, 0} - }; -- c = getopt_long (argc, argv, "hac:", -+ c = getopt_long (argc, argv, "hac:t:", - long_options, &option_index); - if (c == -1) - break; -@@ -104,6 +105,10 @@ - on_cmdline_count(optarg); - break; - -+ case 't': -+ on_cmdline_test(optarg); -+ break; -+ - default: - case 'h': - on_cmdline_help (); diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix deleted file mode 100644 index 0d3da390847a7..0000000000000 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, gtk2, pkg-config, libintl }: - -stdenv.mkDerivation rec { - pname = "gtkperf"; - version = "0.40.0"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}_${lib.versions.majorMinor version}.tar.gz"; - sha256 = "0yxj3ap3yfi76vqg6xjvgc16nfi9arm9kp87s35ywf10fd73814p"; - }; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 libintl ]; - - # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db - patches = [ ./bench.patch ]; - - meta = with lib; { - description = "Application designed to test GTK performance"; - mainProgram = "gtkperf"; - homepage = "https://gtkperf.sourceforge.net/"; - license = with licenses; [ gpl2 ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index 5273621148510..bed0297be54e8 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -27,7 +27,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix index fc2036ec9bbd7..229532c755e10 100644 --- a/pkgs/development/tools/misc/igprof/default.nix +++ b/pkgs/development/tools/misc/igprof/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { CXXFLAGS = ["-fPIC" "-O2" "-w" "-fpermissive"]; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Ignominous Profiler"; longDescription = '' diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index dcafe4ceeff41..7c26da46b2031 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -43,22 +43,21 @@ stdenv.mkDerivation rec { pname = "intel-gpu-tools"; - version = "1.27.1"; + version = "1.29"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "drm"; repo = "igt-gpu-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-7Z9Y7uUjtjdQbB+xV/fvO18xB18VV7fBZqw1fI7U0jQ="; + hash = "sha256-t6DeFmIgTomMNwE53n5JicnvuCd/QfpNYWCdwPwc30E="; }; patches = [ - # fixes pkgsMusl.intel-gpu-tools - # https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/138 (fetchpatch { - url = "https://raw.githubusercontent.com/void-linux/void-packages/111918317d06598fe1459dbe139923404f3f4b9d/srcpkgs/igt-gpu-tools/patches/musl.patch"; - hash = "sha256-cvtwZg7js7O/Ww7puBTfVzLRji2bHTyV91+PvpH8qrg="; + name = "basename.patch"; + url = "https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/604dec781ef283885f65968358bd9ae88c5193c3.patch"; + hash = "sha256-zU6U9uuTDvuADVYmT9sMYA85Xgtvqgy378LvWFDVEJw="; }) ]; @@ -102,7 +101,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - patchShebangs tests man + patchShebangs lib man scripts tests ''; hardeningDisable = [ "bindnow" ]; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index bd7efb8edde9a..ec721340b34c8 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "linuxkit"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "linuxkit"; repo = "linuxkit"; rev = "v${version}"; - sha256 = "sha256-Tcc2FdZ0h97r1C5BMTVb45HB8AuN/wPD+A8samhaJY8="; + sha256 = "sha256-M/M4m/vsvvtSDnNNy8p6x+xpv1QmVzyfPRf/BNBX7zA="; }; vendorHash = null; @@ -24,8 +24,8 @@ buildGoModule rec { # able to use the Virtualization framework at runtime. # - sigtool is allows us to validly sign such executables with a dummy # authority. - nativeBuildInputs = lib.optionals stdenv.isDarwin [ sigtool ]; - buildInputs = lib.optionals stdenv.isDarwin [ Cocoa Virtualization ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa Virtualization ]; ldflags = [ "-s" @@ -43,7 +43,7 @@ buildGoModule rec { # - Finally, at the start of the fixup phase, the working directory is # $sourceRoot/src/cmd/linuxkit, so it's simpler to use the sign target from # the Makefile in that directory rather than $sourceRoot/Makefile. - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' make sign LOCAL_TARGET=$out/bin/linuxkit ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index de1decee524fb..98f7d239878db 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # We remove phony 'FRC' target that forces rebuilds: # 'version.h: FRC ...' is translated to 'version.h: ...'. sed -i lib/dialects/*/Makefile -e 's/version.h:\s*FRC/version.h:/' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|lcurses|lncurses|g' Configure ''; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 996bfeacb2d16..b15924b34f3c5 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* substituteInPlace $out/etc/luarocks/* \ - --replace-fail '${lua.luaOnBuild}' '${lua}' + --replace-quiet '${lua.luaOnBuild}' '${lua}' '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd luarocks \ diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 0d4d5c2c43311..6b190f9c659ea 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; # WiX tests fail on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postPatch = '' patchShebangs subprojects/bats-core/{bin,libexec} diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix index d3c08025108e4..3fd8c3eeaa949 100644 --- a/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/pkgs/development/tools/misc/netcoredbg/default.nix @@ -62,8 +62,8 @@ stdenv.mkDerivation { # include source here so that autoPatchelfHook can do it's job src = managed; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; installPhase = '' mkdir -p $out/share/netcoredbg $out/bin cp ${unmanaged}/* $out/share/netcoredbg diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix deleted file mode 100644 index 0249c098de5cf..0000000000000 --- a/pkgs/development/tools/misc/nrfutil/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "nrfutil"; - version = "6.1.7"; - - src = fetchFromGitHub { - owner = "NordicSemiconductor"; - repo = "pc-nrfutil"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-WiXqeQObhXszDcLxJN8ABd2ZkxsOUvtZQSVP8cYlT2M="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - click - crcmod - ecdsa - libusb1 - intelhex - pc-ble-driver-py - piccata - protobuf - pyserial - pyspinel - pyyaml - tqdm - ]; - - nativeCheckInputs = with python3.pkgs; [ - behave - pytestCheckHook - ]; - - # Workaround: pythonRelaxDepsHook doesn't work for this. - postPatch = '' - mkdir test-reports - substituteInPlace requirements.txt \ - --replace "libusb1==1.9.3" "libusb1" \ - --replace "protobuf >=3.17.3, < 4.0.0" "protobuf" - substituteInPlace nordicsemi/dfu/tests/test_signing.py \ - --replace "self.assertEqual(expected_vk_pem, vk_pem)" "" - ''; - - meta = { - description = "Device Firmware Update tool for nRF chips"; - homepage = "https://github.com/NordicSemiconductor/pc-nrfutil"; - license = lib.licenses.unfreeRedistributable; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ gebner ]; - }; -} diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 21bd640fb4807..8dc6c61283be8 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.20"; + version = "1.13.22"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-qlD1zm2eCQm27N268tht0jtsSiCi3A31XCTFXG9jB0Y="; + hash = "sha256-zFF8cHElrWtLOa5xtO5N0520JC47rGOQ7YshEf12tCw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/orogene/default.nix b/pkgs/development/tools/misc/orogene/default.nix index 218fdf706885d..0f772eac7dfc9 100644 --- a/pkgs/development/tools/misc/orogene/default.nix +++ b/pkgs/development/tools/misc/orogene/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 951493b843955..646fbb1aff14d 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru = { updateScript = unstableGitUpdater { diff --git a/pkgs/development/tools/misc/pest-ide-tools/default.nix b/pkgs/development/tools/misc/pest-ide-tools/default.nix index a962444a6fa59..d71155bd67117 100644 --- a/pkgs/development/tools/misc/pest-ide-tools/default.nix +++ b/pkgs/development/tools/misc/pest-ide-tools/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index ae567bb01b738..a04b8874e990f 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28 patches = lib.optional (!vanilla) ./requires-private.patch - ++ lib.optional stdenv.isCygwin ./2.36.3-not-win32.patch; + ++ lib.optional stdenv.hostPlatform.isCygwin ./2.36.3-not-win32.patch; # These three tests fail due to a (desired) behavior change from our ./requires-private.patch postPatch = @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; configureFlags = [ "--with-internal-glib" ] - ++ lib.optionals (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ] + ++ lib.optionals (stdenv.hostPlatform.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ] # Can't run these tests while cross-compiling ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "glib_cv_stack_grows=no" diff --git a/pkgs/development/tools/misc/planus/default.nix b/pkgs/development/tools/misc/planus/default.nix index 22cc165a93a5c..b92906e182651 100644 --- a/pkgs/development/tools/misc/planus/default.nix +++ b/pkgs/development/tools/misc/planus/default.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage rec { pname = "planus"; - version = "0.4.0"; + version = "1.0.0"; src = fetchCrate { pname = "planus-cli"; inherit version; - hash = "sha256-KpX4KSA2MjfRS8M0WVYpY4hoSvOOB7MUz7YKZwEGqj8="; + hash = "sha256-HbnuLu1yCpwouDVBH/vcFVLDMZWeqHH6qHFJoTbaS9Y="; }; - cargoHash = "sha256-yT/ZK5GG0rXpiaCQlQclK2iY8BXhhmiW/UDX9aL8wBQ="; + cargoHash = "sha256-AJtQrImQlxnp1RbbOZHAJsvlhm39OlC5WyvD5jybMAY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 64ee0c37317d6..e84d2a57c9430 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-2R5gq4jaQsp8Ny1oGuIYkef0kn2UG9jMf20vq0714oY="; }; - buildInputs = [ libuuid ] ++ lib.optionals stdenv.isDarwin [ Foundation readline ]; + buildInputs = [ libuuid ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation readline ]; patches = [ ./no-curl-ca.patch ]; postPatch = '' substituteInPlace contrib/curl/premake5.lua \ --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace premake5.lua \ --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 \ --replace-fail '"-arch arm64"' '""' \ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; buildPhase = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' make -f Bootstrap.mak osx '' else '' make -f Bootstrap.mak linux diff --git a/pkgs/development/tools/misc/premake/setup-hook.sh b/pkgs/development/tools/misc/premake/setup-hook.sh index 6e65e9e8c73f1..c99fae4d14f8f 100644 --- a/pkgs/development/tools/misc/premake/setup-hook.sh +++ b/pkgs/development/tools/misc/premake/setup-hook.sh @@ -1,11 +1,12 @@ +# shellcheck shell=bash + premakeConfigurePhase() { runHook preConfigure local flagsArray=( ${premakefile:+--file=$premakefile} - $premakeFlags ${premakeFlagsArray[@]} - ${premakeBackend:-gmake} ) + concatTo flagsArray premakeFlags premakeFlagsArray premakeBackend=gmake echoCmd 'configure flags' "${flagsArray[@]}" diff --git a/pkgs/development/tools/misc/pwninit/default.nix b/pkgs/development/tools/misc/pwninit/default.nix index 341532d00422d..d67c7e6406117 100644 --- a/pkgs/development/tools/misc/pwninit/default.nix +++ b/pkgs/development/tools/misc/pwninit/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-tbZS7PdRFvO2ifoHA/w3cSPfqqHrLeLHAg6V8oG9gVE="; }; - buildInputs = [ openssl xz ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl xz ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; postInstall = '' wrapProgram $out/bin/pwninit \ diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 6d70f5232dd3f..ec81d929a351c 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Iu5jFSVg7I0i/GsSqAn90foaTG/6KmLMaqgna/0NOY0="; + hash = "sha256-UB2cylJn90TE3ng9JaPwmpbkhuPOmRnlS/eCZSjfqwQ="; }; - vendorHash = "sha256-djM2nMwLG16NSBTZyovOvi0ZgzIMANAWhB+tAaqJ02Q="; + vendorHash = "sha256-hFmUhA35J1c2Mp7SeaJF4+Jid8GfdsEiF7lEdPoYbS4="; doCheck = false; diff --git a/pkgs/development/tools/misc/riff/default.nix b/pkgs/development/tools/misc/riff/default.nix index d6c7ee8164b92..aa85616720ddb 100644 --- a/pkgs/development/tools/misc/riff/default.nix +++ b/pkgs/development/tools/misc/riff/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 8299ceba53956..467e5dced1b9e 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "runme"; - version = "3.0.2"; + version = "3.7.1"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-a+7Gff3Z1V17uaywoUE+nLVeVprB50Gslarcle/NPB8="; + hash = "sha256-b1HP5JCtQFA0+GIkMswb8o3k9zbD5sLrLR7yz8UivLk="; }; - vendorHash = "sha256-QoZzEq1aC7cjY/RVp5Z5HhSuTFf2BSYQnfg0jSaeTJU="; + vendorHash = "sha256-qOM66jiSjAU5e6eGrM8kgJxWJzxwgHpLadx5pTjNFOs="; nativeBuildInputs = [ installShellFiles @@ -39,17 +39,21 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/stateful/runme/internal/version.BuildDate=1970-01-01T00:00:00Z" - "-X=github.com/stateful/runme/internal/version.BuildVersion=${version}" - "-X=github.com/stateful/runme/internal/version.Commit=${src.rev}" + "-X=github.com/stateful/runme/v3/internal/version.BuildDate=1970-01-01T00:00:00Z" + "-X=github.com/stateful/runme/v3/internal/version.BuildVersion=${version}" + "-X=github.com/stateful/runme/v3/internal/version.Commit=${src.rev}" ]; + # checkFlags = [ + # "-ldflags=-X=github.com/stateful/runme/v3/internal/version.BuildVersion=${version}" + # ]; + # tests fail to access /etc/bashrc on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postPatch = '' substituteInPlace testdata/{categories/basic,runall/basic,script/basic}.txtar \ - --replace /bin/bash "${runtimeShell}" + --replace-fail /bin/bash "${runtimeShell}" ''; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/development/tools/misc/rustywind/default.nix b/pkgs/development/tools/misc/rustywind/default.nix index 6ffcd67a5557b..12d3e2aa7f4c3 100644 --- a/pkgs/development/tools/misc/rustywind/default.nix +++ b/pkgs/development/tools/misc/rustywind/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-yZQSY2zqVpmhMd6+Avg2vBh0WQB2FJ2fiMuy5x9Zl9U="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/misc/samply/default.nix b/pkgs/development/tools/misc/samply/default.nix index a929d90652a95..98dfbc3aca1e5 100644 --- a/pkgs/development/tools/misc/samply/default.nix +++ b/pkgs/development/tools/misc/samply/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { ''; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index a268e1749f0dc..fc7e2b485a097 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index 414be9560b9a6..ae5441edb2518 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "-DUSE_GSL=1" "-DUSE_PCAP=1" "-DUSE_SSL=1" - "-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}" + "-DUSE_SCTP=${if stdenv.hostPlatform.isLinux then "1" else "0"}" # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake git ]; buildInputs = [ ncurses libpcap openssl ] - ++ lib.optional (stdenv.isLinux) lksctp-tools; + ++ lib.optional (stdenv.hostPlatform.isLinux) lksctp-tools; meta = with lib; { homepage = "http://sipp.sf.net"; diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 9fee7cca7f7e7..f51b848a621af 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -21,7 +21,7 @@ let rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi ] - ++ lib.optionals stdenv.isLinux [ libxkbcommon wayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ]; in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreGraphics CoreServices @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { OpenGL ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath ${lib.makeLibraryPath rpathLibs} $out/bin/slint-lsp ''; diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index 612ef223e67be..458e3b51d3096 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { pname = "sqitch"; version = sqitch.version; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; src = sqitch; dontBuild = true; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ln -s ${sqitch}/$d $out/$d fi done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/sqitch ''; dontStrip = true; diff --git a/pkgs/development/tools/misc/src-cli/default.nix b/pkgs/development/tools/misc/src-cli/default.nix index 44b8cc62145d6..c809b52826caf 100644 --- a/pkgs/development/tools/misc/src-cli/default.nix +++ b/pkgs/development/tools/misc/src-cli/default.nix @@ -25,9 +25,9 @@ buildGoModule rec { "cmd/src" ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 16785e4d4b891..c5c54351ac646 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -11,7 +11,7 @@ let # The Darwin build of stlink explicitly refers to static libusb. - libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; + libusb1' = if stdenv.hostPlatform.isDarwin then libusb1.override { withStatic = true; } else libusb1; # IMPORTANT: You need permissions to access the stlink usb devices. # Add services.udev.packages = [ pkgs.stlink ] to your configuration.nix diff --git a/pkgs/development/tools/misc/strace-analyzer/default.nix b/pkgs/development/tools/misc/strace-analyzer/default.nix index 625683196923e..ee4242c1ca3de 100644 --- a/pkgs/development/tools/misc/strace-analyzer/default.nix +++ b/pkgs/development/tools/misc/strace-analyzer/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ strace ]; - checkFlags = lib.optionals stdenv.isAarch64 [ + checkFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ # thread 'analysis::tests::analyze_dd' panicked at 'assertion failed: ...' "--skip=analysis::tests::analyze_dd" ]; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 0fd75a8de8565..f0f0eb7113c47 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.10"; + version = "6.11"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-dl7HGqHeL+NzY8HkDHt2afwdQMRLtdOLqOjNgsTtzwc="; + hash = "sha256-gyYlg6NSnwLDUBqouKx3K0y8A9yTTpi6tuSINibig6U="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; + enableParallelBuilding = true; + # libunwind for -k. # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace. # The build will silently fall back and -k will not work on RISC-V. diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix deleted file mode 100644 index 4b266044ff847..0000000000000 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: - -stdenv.mkDerivation rec { - pname = "swig"; - version = "3.0.12"; - - src = fetchFromGitHub { - owner = "swig"; - repo = "swig"; - rev = "rel-${version}"; - sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n"; - }; - - PCRE_CONFIG = "${pcre.dev}/bin/pcre-config"; - nativeBuildInputs = [ autoconf automake libtool bison ]; - buildInputs = [ pcre ]; - - configureFlags = [ "--without-tcl" ]; - - # Disable ccache documentation as it needs yodl - postPatch = '' - sed -i '/man1/d' CCache/Makefile.in - ''; - - preConfigure = '' - ./autogen.sh - ''; - - meta = with lib; { - description = "Interface compiler that connects C/C++ code to higher-level languages"; - homepage = "https://swig.org/"; - # Different types of licenses available: http://www.swig.org/Release/LICENSE . - license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix deleted file mode 100644 index bae53ad42f9d3..0000000000000 --- a/pkgs/development/tools/misc/swig/4.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre2 }: - -stdenv.mkDerivation (finalAttrs: { - pname = "swig"; - version = "4.2.1"; - - src = fetchFromGitHub { - owner = "swig"; - repo = "swig"; - rev = "v${finalAttrs.version}"; - hash = "sha256-VlUsiRZLScmbC7hZDzKqUr9481YXVwo0eXT/jy6Fda8="; - }; - - PCRE_CONFIG = "${pcre2.dev}/bin/pcre-config"; - nativeBuildInputs = [ autoconf automake libtool bison ]; - buildInputs = [ pcre2 ]; - - configureFlags = [ "--without-tcl" ]; - - # Disable ccache documentation as it needs yodl - postPatch = '' - sed -i '/man1/d' CCache/Makefile.in - ''; - - preConfigure = '' - ./autogen.sh - ''; - - meta = { - changelog = "https://github.com/swig/swig/blob/${finalAttrs.src.rev}/CHANGES.current"; - description = "Interface compiler that connects C/C++ code to higher-level languages"; - homepage = "https://swig.org/"; - # Different types of licenses available: https://www.swig.org/Release/LICENSE . - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ orivej ]; - mainProgram = "swig"; - platforms = with lib.platforms; linux ++ darwin; - }; -}) diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index fa39c310a269f..955a0296b72f6 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "1.0.20"; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libmysqlclient luajit ] ++ lib.optionals stdenv.isLinux [ libaio ]; + buildInputs = [ libmysqlclient luajit ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libaio ]; depsBuildBuild = [ pkg-config ]; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 500c2ff7ba1a5..f72e1e000ac47 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.34.2"; + version = "0.34.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-4k9ro5XfcZs68p4QmvO+SBxfgBFf2Z8yrXiWmkbOj1c="; + hash = "sha256-fN/C7H0s7ZhXSg8pLn9iex6WglMKsx6hA8OK/HYqbRU="; }; - vendorHash = "sha256-znBfzX6oS19auL1ptcVXM0l2Thpnb7DrciYs5Z2XVJY="; + vendorHash = "sha256-NL5pqcQTjauxLschhj3kCiZLBLagABSCU/zHLcG2anM="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/misc/terramate/default.nix b/pkgs/development/tools/misc/terramate/default.nix index 90bf025f814f0..341919bd41a42 100644 --- a/pkgs/development/tools/misc/terramate/default.nix +++ b/pkgs/development/tools/misc/terramate/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "terramate"; - version = "0.10.0"; + version = "0.10.4"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-SAMtEo84P5sxQ3JFU4evt2ycL1tg2yrLoWipWi4KObE="; + hash = "sha256-raVB0c/TZK/NKv/J1t8nrPAeABd5gQhjeuKL8kYm9YI="; }; - vendorHash = "sha256-TOntPPtynr333rX0wlb2pIeEwcNzyWP3wFqPoMz6LK0="; + vendorHash = "sha256-kjzpXOoyTwjpYLBqDuB6Eup5Yzgej2U+HUo4z8V+cEI="; # required for version info nativeBuildInputs = [ git ]; diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix index a3f5942a6bfdf..45f1af60ecf96 100644 --- a/pkgs/development/tools/misc/tet/default.nix +++ b/pkgs/development/tools/misc/tet/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation ({ sha256 = "1j57hv56df38w249l595b8rsgmsyvjkbysai03a9724gax5jl9av" ; }; - buildInputs = [ ]; - patchPhase = "chmod +x configure"; configurePhase = "./configure -t lite"; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index a43eab5f00e59..e630489ffae3d 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation { bash libintl ] - ++ optionals stdenv.isSunOS [ + ++ optionals stdenv.hostPlatform.isSunOS [ libiconv gawk ] @@ -104,7 +104,7 @@ stdenv.mkDerivation { ++ optionals (crossBuildTools && lib.versionAtLeast version "7.1") [ "texinfo_cv_sys_iconv_converts_euc_cn=yes" ] - ++ optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; + ++ optional stdenv.hostPlatform.isSunOS "AWK=${gawk}/bin/awk"; installFlags = [ "TEXMF=$(out)/texmf-dist" ]; installTargets = [ @@ -114,7 +114,7 @@ stdenv.mkDerivation { nativeCheckInputs = [ procps ] ++ optionals stdenv.buildPlatform.isFreeBSD [ freebsd.locale ]; - doCheck = interactive && !stdenv.isDarwin && !stdenv.isSunOS; # flaky + doCheck = interactive && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isSunOS; # flaky checkFlags = optionals (!stdenv.hostPlatform.isMusl && versionOlder version "7") [ # Test is known to fail on various locales on texinfo-6.8: diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix index 4131b6a53920f..ae1046318cd5d 100644 --- a/pkgs/development/tools/misc/texinfo/packages.nix +++ b/pkgs/development/tools/misc/texinfo/packages.nix @@ -88,10 +88,6 @@ in branch = finalAttrs.version; }; }); - texinfo5 = buildTexinfo { - version = "5.2"; - hash = "sha256-VHHvaDpkWIp8/vRu8r3T+8vKidhH4QgyYSKT8QXkTto="; - }; texinfo6_5 = buildTexinfo { version = "6.5"; hash = "sha256-d3dLP0oGwgcFzC7xyASGRCLjz5UjXpZbHwCkbffaX2I="; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index d691b94c38a3f..68e29724eb007 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!isCross) help2man; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security CoreServices diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index ff3ceafc7f5c5..6c6b232e9354b 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-U7Bode8qwDsNf4FVppfEHA9uiOFz74CtKgXG6xyYlT8="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; - checkInputs = lib.optionals stdenv.isDarwin [ zlib ]; + checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zlib ]; # enable all output formats buildFeatures = [ "all" ]; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix deleted file mode 100644 index 3297775bc53eb..0000000000000 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenv -, autoreconfHook -, buildPackages -, coreutils -, fetchFromGitHub -, jansson -, libiconv -, perl -, pkg-config -, python3 -, libseccomp -, libyaml -, pcre2 -, libxml2 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "universal-ctags"; - version = "6.1.0"; - - src = fetchFromGitHub { - owner = "universal-ctags"; - repo = "ctags"; - rev = "v${finalAttrs.version}"; - hash = "sha256-f8+Ifjn7bhSYozOy7kn+zCLdHGrH3iFupHUZEGynz9Y="; - }; - - depsBuildBuild = [ - buildPackages.stdenv.cc - ]; - - nativeBuildInputs = [ - autoreconfHook - perl - pkg-config - (python3.withPackages (p: [ p.docutils ])) - ]; - - buildInputs = [ - libyaml - pcre2 - libxml2 - jansson - ] - ++ lib.optional stdenv.isDarwin libiconv - ++ lib.optional stdenv.isLinux libseccomp; - - configureFlags = [ "--enable-tmpdir=/tmp" ]; - - patches = [ - ./000-nixos-specific.patch - ]; - - postPatch = '' - substituteInPlace Tmain/utils.sh \ - --replace /bin/echo ${coreutils}/bin/echo - # fails on sandbox - rm -fr Tmain/ptag-proc-cwd.d/ - patchShebangs misc/* - ''; - - doCheck = true; - - checkFlags = [ - "man-test" "tlib" "tmain" "tutil" "units" - ]; - - meta = with lib; { - homepage = "https://docs.ctags.io/en/latest/"; - description = "Maintained ctags implementation"; - longDescription = '' - Universal Ctags (abbreviated as u-ctags) is a maintained implementation of - ctags. ctags generates an index (or tag) file of language objects found in - source files for programming languages. This index makes it easy for text - editors and other tools to locate the indexed items. - ''; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.all; - mainProgram = "ctags"; - priority = 1; # over the emacs implementation - }; -}) diff --git a/pkgs/development/tools/misc/unixbench/default.nix b/pkgs/development/tools/misc/unixbench/default.nix index d5f060af82cf5..7721a2648b359 100644 --- a/pkgs/development/tools/misc/unixbench/default.nix +++ b/pkgs/development/tools/misc/unixbench/default.nix @@ -9,6 +9,7 @@ , libGLX , coreutils , unixtools +, runtimeShell , targetPackages , gnugrep , gawk @@ -89,7 +90,7 @@ stdenv.mkDerivation rec { preFixup = '' substituteInPlace $out/libexec/pgms/multi.sh \ - --replace '/bin/sh "$' '${targetPackages.runtimeShell} "$' + --replace '/bin/sh "$' '${runtimeShell} "$' substituteInPlace $out/bin/ubench \ --subst-var out diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 0befa7aac9d67..474de71004869 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ marcweber peterhoeg ]; platforms = platforms.linux; + mainProgram = "usb_modeswitch"; }; } diff --git a/pkgs/development/tools/misc/wasmer-pack/default.nix b/pkgs/development/tools/misc/wasmer-pack/default.nix index 7c1d84de885d6..f1216ae12416a 100644 --- a/pkgs/development/tools/misc/wasmer-pack/default.nix +++ b/pkgs/development/tools/misc/wasmer-pack/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-nyhjwEZyT8IEb0pTbou/EtN47gehge3fUCQVPs2TkIY="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/misc/xxgdb/default.nix b/pkgs/development/tools/misc/xxgdb/default.nix index 1c6eca4729a01..5ba3b74a5a3d5 100644 --- a/pkgs/development/tools/misc/xxgdb/default.nix +++ b/pkgs/development/tools/misc/xxgdb/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Simple but powerful graphical interface to gdb"; mainProgram = "xxgdb"; license = licenses.mit; diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix index af05842a252df..23116255c0de7 100644 --- a/pkgs/development/tools/modd/default.nix +++ b/pkgs/development/tools/modd/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { mainProgram = "modd"; homepage = "https://github.com/cortesi/modd"; license = licenses.mit; - maintainers = with maintainers; [ kierdavis ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix index 5b3bc7b1472cd..382dd8fd306b9 100644 --- a/pkgs/development/tools/msgpack-tools/default.nix +++ b/pkgs/development/tools/msgpack-tools/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ludocode/msgpack-tools"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ alibabzo ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix index 2f8983572f29d..79ceb8a0aadd5 100644 --- a/pkgs/development/tools/mysql-shell/8.nix +++ b/pkgs/development/tools/mysql-shell/8.nix @@ -72,8 +72,8 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] - ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ]; buildInputs = [ curl @@ -95,8 +95,8 @@ stdenv.mkDerivation (finalAttrs: { python3 antlr.runtime.cpp ] ++ pythonDeps - ++ lib.optionals stdenv.isLinux [ libtirpc ] - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; preConfigure = '' # Build MySQL diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index 32fd0746360fa..14ff96542c469 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -72,8 +72,8 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] - ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ]; buildInputs = [ curl @@ -95,8 +95,8 @@ stdenv.mkDerivation (finalAttrs: { python3 antlr.runtime.cpp ] ++ pythonDeps - ++ lib.optionals stdenv.isLinux [ libtirpc ] - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; preConfigure = '' # Build MySQL diff --git a/pkgs/development/tools/nest-cli/default.nix b/pkgs/development/tools/nest-cli/default.nix index 9c5f8a12df5ba..c9d422781827a 100644 --- a/pkgs/development/tools/nest-cli/default.nix +++ b/pkgs/development/tools/nest-cli/default.nix @@ -27,7 +27,7 @@ buildNpmPackage rec { python3 ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/development/tools/nodehun/default.nix b/pkgs/development/tools/nodehun/default.nix index 83ba3fe2e494a..5bc067085ed8f 100644 --- a/pkgs/development/tools/nodehun/default.nix +++ b/pkgs/development/tools/nodehun/default.nix @@ -30,9 +30,9 @@ buildNpmPackage { npmDepsHash = "sha256-mV6rWNf2p2w4H0ESUT0/Ybtx9YEdvO5l2gCvlWFXK+U="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; nativeBuildInputs = [ node-gyp python3 ] - ++ lib.optionals stdenv.isDarwin [ cctools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; postInstall = '' # Only keep the necessary parts of build/Release to reduce closure size diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index 32e69dcf7042a..1651a3c43d9ff 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -31,16 +31,16 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ scons ]; - buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; CPPPATH = symlinkJoin { name = "nsis-includes"; - paths = [ zlib.dev ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + paths = [ zlib.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; }; LIBPATH = symlinkJoin { name = "nsis-libs"; - paths = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + paths = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; }; sconsFlags = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "SKIPUTILS=all" "SKIPMISC=all" "NSIS_CONFIG_CONST_DATA=no" - ] ++ lib.optional stdenv.isDarwin "APPEND_LINKFLAGS=-liconv"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "APPEND_LINKFLAGS=-liconv"; preBuild = '' sconsFlagsArray+=( @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ pombeirp ]; mainProgram = "makensis"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/tools/nufmt/default.nix b/pkgs/development/tools/nufmt/default.nix index 4c9e6ff4af6a7..e5e656877ef98 100644 --- a/pkgs/development/tools/nufmt/default.nix +++ b/pkgs/development/tools/nufmt/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BwKLl8eMCrqVt9PA5SHAXxu3ypP2ePcSuljKL+wSkvw="; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index ff1fae302d169..408584de712e8 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -3,6 +3,7 @@ , atk , autoPatchelfHook , buildEnv +, buildPackages , cairo , cups , dbus @@ -32,7 +33,6 @@ , stdenv , systemd , udev -, wrapGAppsHook3 , xorg }: @@ -107,7 +107,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - (wrapGAppsHook3.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ nwEnv ]; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index f2c00e16c9e73..1aa192f1daab0 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ocaml findlib ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 6696a99977a09..194ea1c8a023a 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib -, version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.14.3" +, version ? if lib.versionAtLeast ocaml.version "4.08" then "0.15.0" else "0.14.3" }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index ec34ba2f17fc4..4e7d0af89ab09 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper unzip ocaml curl ]; buildInputs = [ ncurses getconf ] - ++ lib.optionals stdenv.isLinux [ bubblewrap ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; patches = [ ./opam-shebangs.patch ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation { mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ + --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.hostPlatform.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index f5b6148a028bd..8eb77449342a7 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.2.17"; + version = "0.2.19"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-pZOCxOoGl/qq6nfklnwPtCy6pPXjIaY6qhH4TuL5kGg="; + sha256 = "sha256-A5dqKbQhdJlSOU7qxC8xrCCSXK5yGmDsoVWfgWKl2TE="; }; - vendorHash = "sha256-LTlBj+F+QdLpndLhtH/vW6oNrvh+yUqtYngWpFMfahA="; + vendorHash = "sha256-ASR8Y/L8ub0w36fO+UpJ5ZpijP+YCLVbRtnhzvMNj9U="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 891733635cce7..4b11dd7576ddf 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -8,7 +8,7 @@ , enableWasmEval ? false }: -assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm on darwin is failing in nixpkgs"; +assert enableWasmEval && stdenv.hostPlatform.isDarwin -> builtins.throw "building with wasm on darwin is failing in nixpkgs"; buildGoModule rec { pname = "open-policy-agent"; @@ -55,9 +55,9 @@ buildGoModule rec { # want but also limits the tests # Also avoid wasm tests on darwin due to wasmtime-go build issues getGoDirs() { - go list ./... | grep -v -e e2e ${lib.optionalString stdenv.isDarwin "-e wasm"} + go list ./... | grep -v -e e2e ${lib.optionalString stdenv.hostPlatform.isDarwin "-e wasm"} } - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra rm server/server_test.go ''; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index a99849a3a3ac7..9f21ff46889a4 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.36.1"; + version = "1.37.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZUWbM2g3l5uesM9QDlRqRo9gFipgaS8YyEbnIyRaMS0="; + hash = "sha256-ANG9KpyEO+fpjelYU+HNTkbg2S0vFNyPzPRFjcLoLOI="; }; - vendorHash = "sha256-FEoAV3Fhmjhkc7sYfE1QQFmhOZbXps57mBD0fyvQq00="; + vendorHash = "sha256-pr3WTUZetps/Gof8lttN2beomiobVPCgX0j9V77g5sI="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/pkgs/development/tools/overcommit/Gemfile.lock deleted file mode 100644 index 1c75368b7d814..0000000000000 --- a/pkgs/development/tools/overcommit/Gemfile.lock +++ /dev/null @@ -1,19 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - childprocess (4.1.0) - iniparse (1.5.0) - overcommit (0.60.0) - childprocess (>= 0.6.3, < 5) - iniparse (~> 1.4) - rexml (~> 3.2) - rexml (3.2.6) - -PLATFORMS - ruby - -DEPENDENCIES - overcommit - -BUNDLED WITH - 2.4.17 diff --git a/pkgs/development/tools/overcommit/default.nix b/pkgs/development/tools/overcommit/default.nix deleted file mode 100644 index 663a13af370d6..0000000000000 --- a/pkgs/development/tools/overcommit/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, bundlerApp, bundlerUpdateScript }: - -bundlerApp { - pname = "overcommit"; - gemdir = ./.; - exes = [ "overcommit" ]; - - passthru = { - updateScript = bundlerUpdateScript "overcommit"; - }; - - meta = with lib; { - description = "Tool to manage and configure Git hooks"; - homepage = "https://github.com/sds/overcommit"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne anthonyroussel ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/overcommit/gemset.nix b/pkgs/development/tools/overcommit/gemset.nix deleted file mode 100644 index 96e84f288e4f5..0000000000000 --- a/pkgs/development/tools/overcommit/gemset.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - childprocess = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"; - type = "gem"; - }; - version = "4.1.0"; - }; - iniparse = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wb1qy4i2xrrd92dc34pi7q7ibrjpapzk9y465v0n9caiplnb89n"; - type = "gem"; - }; - version = "1.5.0"; - }; - overcommit = { - dependencies = ["childprocess" "iniparse" "rexml"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0slqmsycbqx746liwq0qw0c81xrp4051iff8s574a4fmj941gkia"; - type = "gem"; - }; - version = "0.60.0"; - }; - rexml = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; - type = "gem"; - }; - version = "3.2.6"; - }; -} diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix index 4625b97eb000f..5feddddb90b67 100644 --- a/pkgs/development/tools/oxlint/default.nix +++ b/pkgs/development/tools/oxlint/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/package-project-cmake/default.nix b/pkgs/development/tools/package-project-cmake/default.nix index 41cbef2a720b5..083bf37f8ad97 100644 --- a/pkgs/development/tools/package-project-cmake/default.nix +++ b/pkgs/development/tools/package-project-cmake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "package-project-cmake"; - version = "1.11.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "TheLartians"; repo = "PackageProject.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-2u7H2ZR7eQ6eoRIVZ1WBxw9K93E8BVYErZNDe1Jl8rg="; + hash = "sha256-TMf9nA0V1qTXpzEJ0A6b3mIVN0MIogn5WlZeVY+Q2bg="; }; dontConfigure = true; diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/development/tools/packcc/default.nix index 0f756388be3bd..682bc519238ee 100644 --- a/pkgs/development/tools/packcc/default.nix +++ b/pkgs/development/tools/packcc/default.nix @@ -2,21 +2,20 @@ bats, fetchFromGitHub, lib, - packcc, python3, stdenv, testers, uncrustify, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "packcc"; version = "2.0.2"; src = fetchFromGitHub { owner = "arithy"; repo = "packcc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-k1C/thvr/5fYrgu/j8YN3kwXp4k26sC9AhYhYAKQuX0="; }; @@ -61,7 +60,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.tests.version = testers.testVersion { package = packcc; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { description = "Parser generator for C"; @@ -72,10 +71,10 @@ stdenv.mkDerivation rec { - Supports direct and indirect left-recursive grammar rules. ''; homepage = "https://github.com/arithy/packcc"; - changelog = "https://github.com/arithy/packcc/releases/tag/${src.rev}"; + changelog = "https://github.com/arithy/packcc/releases/tag/${finalAttrs.src.rev}"; license = licenses.mit; maintainers = with maintainers; [ azahi ]; platforms = platforms.unix; mainProgram = "packcc"; }; -} +}) diff --git a/pkgs/development/tools/pactorio/default.nix b/pkgs/development/tools/pactorio/default.nix index e6254bdbbb6f5..06b55790ddf6f 100644 --- a/pkgs/development/tools/pactorio/default.nix +++ b/pkgs/development/tools/pactorio/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ bzip2 ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ bzip2 ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' installManPage artifacts/pactorio.1 diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index a47918f4354b1..991925cb4e762 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./2.7.7-fixes.patch ]; buildInputs = [ jdk ]; - CXXFLAGS = lib.optionalString stdenv.isDarwin "-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION"; + CXXFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION"; meta = with lib; { description = "Powerful parser generator"; diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix index 79db5301add9c..f575110b87fdb 100644 --- a/pkgs/development/tools/parsing/antlr/4.nix +++ b/pkgs/development/tools/parsing/antlr/4.nix @@ -89,7 +89,7 @@ let nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = - lib.optional stdenv.isDarwin CoreFoundation ++ + lib.optional stdenv.hostPlatform.isDarwin CoreFoundation ++ extraCppBuildInputs; cmakeDir = "../runtime/Cpp"; @@ -153,7 +153,7 @@ in { version = "4.10.1"; sourceSha256 = "sha256-Z1P81L0aPbimitzrHH/9rxsMCA6Qn3i42jFbUmVqu1E="; jarSha256 = "sha256-QZSdQfINMdW4J3GHc13XVRCN9Ss422yGUQjTOCBA+Rg="; - extraCppBuildInputs = lib.optional stdenv.isLinux libuuid; + extraCppBuildInputs = lib.optional stdenv.hostPlatform.isLinux libuuid; extraCppCmakeFlags = [ "-DANTLR4_INSTALL=ON" "-DANTLR_BUILD_CPP_TESTS=OFF" @@ -165,7 +165,7 @@ in { sourceSha256 = "1af3cfqwk7lq1b5qsh1am0922fyhy7wmlpnrqdnvch3zzza9n1qm"; jarSha256 = "0dnz2x54kigc58bxnynjhmr5iq49f938vj6p50gdir1xdna41kdg"; extraCppBuildInputs = [ utf8cpp ] - ++ lib.optional stdenv.isLinux libuuid; + ++ lib.optional stdenv.hostPlatform.isLinux libuuid; extraCppCmakeFlags = [ "-DCMAKE_CXX_FLAGS='-I${lib.getDev utf8cpp}/include/utf8cpp'" ]; @@ -178,7 +178,7 @@ in { version = "4.8"; sourceSha256 = "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m"; jarSha256 = "0nms976cnqyr1ndng3haxkmknpdq6xli4cpf4x4al0yr21l9v93k"; - extraCppBuildInputs = lib.optional stdenv.isLinux libuuid; + extraCppBuildInputs = lib.optional stdenv.hostPlatform.isLinux libuuid; extraCppCmakeFlags = [ "-DANTLR4_INSTALL=ON" ]; }).antlr; } diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 43ef3ffa3e199..80a2ad835c285 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # cannot add bash to buildInputs due to infinite recursion strictDeps = stdenv.hostPlatform != stdenv.buildPlatform; - nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man; + nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.hostPlatform.isSunOS help2man; propagatedBuildInputs = [ m4 ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index bd62241ec98ca..84cb5f35d3c6d 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { export ac_cv_func_realloc_0_nonnull=yes ''; - postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' + postConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' ''; diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix index 03814d3cfbe78..a6b64efb7fcf3 100644 --- a/pkgs/development/tools/parsing/jikespg/default.nix +++ b/pkgs/development/tools/parsing/jikespg/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; postPatch = '' - substituteInPlace Makefile --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.isDarwin "-std=c89"}" + substituteInPlace Makefile --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.hostPlatform.isDarwin "-std=c89"}" ''; sourceRoot = "jikespg/src"; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 72e77a55a1523..a6090f104fa24 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -50,6 +50,6 @@ in version = "7.0.0.12"; sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r"; license = lib.licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index 0cb424fdca643..6751e7db17d00 100644 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "spicy"; - version = "1.11.0"; + version = "1.11.2"; strictDeps = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zeek"; repo = "spicy"; rev = "v${version}"; - hash = "sha256-zndqNd4CTzXuDkkc6uzjwKdUnypnV/4NppcVJ0N3S1U="; + hash = "sha256-cWK/LdV73VkiUpXyK+M7AotD7ucmNvh3HOzpxtCfGQM="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index fbf5852ee47f8..662d6ace13a9e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -72,8 +72,7 @@ let { tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } // { tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; } // { tree-sitter-php = grammars'.tree-sitter-php // { location = "php"; }; } // - { tree-sitter-sql = grammars'.tree-sitter-sql // { generate = true; }; } // - { tree-sitter-wing = grammars'.tree-sitter-wing // { location = "libs/tree-sitter-wing"; generate = true; }; }; + { tree-sitter-sql = grammars'.tree-sitter-sql // { generate = true; }; }; in lib.mapAttrs build (grammars); @@ -115,7 +114,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-44FIO0kPso6NxjLwmggsheILba3r9GEhDld2ddt601g="; buildInputs = - lib.optionals stdenv.isDarwin [ Security CoreServices ]; + lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ]; nativeBuildInputs = [ which ] ++ lib.optionals webUISupport [ emscripten ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json index 0492557e1be0a..71879d700f855 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json @@ -1,10 +1,10 @@ { - "url": "https://github.com/winglang/wing", - "rev": "d65e4c03e1b992adc76df2c2485562c8f2204462", - "date": "2024-05-17T04:19:16+00:00", - "path": "/nix/store/3pdf6cy205v9s4bf2y8r45qpvf3j1zq1-wing", - "sha256": "0y0w3559980ryhnnbjkxxlr6w11110fxvvqsk2wr0sijy53j07w5", - "hash": "sha256-hR8gR/EyapC5mBrv3R0IIQRuMu19ymUt9BmglEoZHHg=", + "url": "https://github.com/winglang/tree-sitter-wing", + "rev": "27b595f5ea1aa45b5f777f194c0bd121a7b0c8e3", + "date": "2024-09-03T18:25:03-04:00", + "path": "/nix/store/az77v8z742hkqm830lvhgnqi1zpx9v8d-tree-sitter-wing", + "sha256": "09h79hvi35riwypskhh97qz8wis2kkz27xj777fg8lldvfh5kgdh", + "hash": "sha256-sL1ZoNuNUvTcOUf2I/6cQkeOPj4Jwqmv5zGXETdMByY=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 4c2f2c10aee58..6d5db177b8a56 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -417,7 +417,7 @@ let }; "tree-sitter-wing" = { orga = "winglang"; - repo = "wing"; + repo = "tree-sitter-wing"; }; "tree-sitter-wgsl" = { orga = "szebniok"; diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/development/tools/perseus-cli/default.nix index cffa0299beabe..ba795a6ef870b 100644 --- a/pkgs/development/tools/perseus-cli/default.nix +++ b/pkgs/development/tools/perseus-cli/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0="; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; postInstall = '' wrapProgram $out/bin/perseus \ diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index d4407fa5ec246..cad3d2af45052 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -35,8 +35,8 @@ perlPackages.buildPerlPackage rec { --replace "'INSTALLDIRS' => \$INSTALLDIRS," "'INSTALLDIRS' => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3'," ''; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/pg_format ''; diff --git a/pkgs/development/tools/pgtop/default.nix b/pkgs/development/tools/pgtop/default.nix index 5798b7da517ab..066e07fd484a3 100644 --- a/pkgs/development/tools/pgtop/default.nix +++ b/pkgs/development/tools/pgtop/default.nix @@ -15,8 +15,8 @@ perlPackages.buildPerlPackage rec { buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWP ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/pgtop ''; diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/development/tools/picotool/default.nix index a31f468083533..b4cbcde826524 100644 --- a/pkgs/development/tools/picotool/default.nix +++ b/pkgs/development/tools/picotool/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, pico-sdk }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, pico-sdk, mbedtls_2 }: stdenv.mkDerivation rec { pname = "picotool"; - version = "1.1.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "sha256-OcQJeiva6X2rUyh1rJ+w4O2dWxaR7MwMfbHlnWuBVb8="; + sha256 = "sha256-z7EFk3qxg1PoKZQpUQqjhttZ2RkhhhiMdYc9TkXzkwk="; }; + postPatch = '' + # necessary for signing/hashing support. our pico-sdk does not come with + # it by default, and it shouldn't due to submodule size. pico-sdk uses + # an upstream version of mbedtls 2.x so we patch ours in directly. + substituteInPlace lib/CMakeLists.txt \ + --replace-fail "''$"'{PICO_SDK_PATH}/lib/mbedtls' '${mbedtls_2.src}' + ''; + buildInputs = [ libusb1 pico-sdk ]; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ]; @@ -21,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/raspberrypi/picotool"; - description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; + description = "Tool for interacting with RP2040/RP2350 device(s) in BOOTSEL mode, or with an RP2040/RP2350 binary"; mainProgram = "picotool"; license = licenses.bsd3; maintainers = with maintainers; [ muscaln ]; diff --git a/pkgs/development/tools/pifpaf/default.nix b/pkgs/development/tools/pifpaf/default.nix index bc4d0c9ca6114..3979f9fc53e52 100644 --- a/pkgs/development/tools/pifpaf/default.nix +++ b/pkgs/development/tools/pifpaf/default.nix @@ -5,12 +5,12 @@ python3.pkgs.buildPythonApplication rec { pname = "pifpaf"; - version = "3.1.5"; + version = "3.2.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-lmixfUP+pq0RdyXeY6MmUQOx1sMLHqojOKUK1mivbaU="; + hash = "sha256-8SSSdXBj9Yd351Iv7TdASLCfYPnkG7h6X8rBLrArgFI="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index dd65dbe34221f..3265936c4377b 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -26,14 +26,14 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2024.0.1"; + version = "2024.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "pipenv"; rev = "refs/tags/v${version}"; - hash = "sha256-IyjJrIEcKHm7TpZk26MYI///ZIB/7ploTBzvms1gDmI="; + hash = "sha256-rfQIDGYBA2dc01AgW+qMBFQ+ETrOysNkgyKqeQeD/3A="; }; env.LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 232948d7a093d..aec4eab2e5de6 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -8,8 +8,8 @@ let hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY="; }; "9" = { - version = "9.7.0"; - hash = "sha256-s1AY+/qPWDZosmSeQHkipyE1XNgfYb7rSsHUJY5YVVk="; + version = "9.12.0"; + hash = "sha256-phtn/2zJevhkVk9EQlVsIqBPLlp3FPvudqEBE2HZtyY="; }; }; diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix index e5032da10590e..4ef68fdd50c8f 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -46,6 +46,8 @@ yq ]; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/poac/default.nix b/pkgs/development/tools/poac/default.nix index 95a028c6f8095..d6a1ad39bdaf0 100644 --- a/pkgs/development/tools/poac/default.nix +++ b/pkgs/development/tools/poac/default.nix @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake git cacert ]; buildInputs = [ (boost179.override { - enableShared = stdenv.isDarwin; - enableStatic = !stdenv.isDarwin; + enableShared = stdenv.hostPlatform.isDarwin; + enableStatic = !stdenv.hostPlatform.isDarwin; }) git2-cpp glob diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index 24851fc6763bc..11dbc8595f183 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "pprof"; - version = "0-unstable-2024-07-10"; + version = "0-unstable-2024-09-25"; src = fetchFromGitHub { owner = "google"; repo = "pprof"; - rev = "f6c9dda6c6da638264f96f1097bce50fd82b4927"; - hash = "sha256-jxPl3e9aYRWyR7vkz+15aZiG331WnrNkMW8vwbcldfY="; + rev = "fa3061bff0bcf0d611f07dbdba73665bd2bbac97"; + hash = "sha256-wUHCbgmJI3YTettVVrLnRPIexaHuAQDmbnHXPTLBBYM="; }; postPatch = '' diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/development/tools/protoc-gen-connect-go/default.nix index 516aa5927b971..36a5bb15e35c4 100644 --- a/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.16.2"; + version = "1.17.0"; src = fetchFromGitHub { owner = "connectrpc"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-Ej8ya2sKtRVRQdMr63YpPbqzwtV0ZsqO+7xiif3gFr0="; + hash = "sha256-GF7J21Y27LmKuDjuk2omQo2xV5pDo2GQXyu9SLwG0fs="; }; - vendorHash = "sha256-OKTRxExgJ2V3736fIVvQX3FEa44jGngwCi2D/uk0F58="; + vendorHash = "sha256-j5T1Ho3K0kPZOo5LA6Md06W/gF6DmEElGt9BvceBtTo="; subPackages = [ "cmd/protoc-gen-connect-go" diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/development/tools/protoc-gen-twirp_php/default.nix index 460f29bf5cf35..5d12aa44beace 100644 --- a/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-twirp_php"; - version = "0.11.0"; + version = "0.12.0"; # fetchFromGitHub currently not possible, because go.mod and go.sum are export-ignored src = fetchgit { url = "https://github.com/twirphp/twirp.git"; rev = "v${version}"; - hash = "sha256-LUFwmxlbZVTlEyp82lm3ylh6KYtVlviYK13pxj4MH0M="; + hash = "sha256-GDDycFWGrNXWdWNjGhb+W6kImF1nqVVH+dJ8VjYQ2MQ="; }; - vendorHash = "sha256-BPvKRIYvIxen0m8C9geFC4gIq4VH8mmdI0ZLMnlBB/I="; + vendorHash = "sha256-ErTXIbPKAFm8jBYRPuWSaCFbTS+5MPyto9edixbTR7E="; subPackages = [ "protoc-gen-twirp_php" ]; diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 4075b1ad9d3cb..bf055522254a6 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "pscale"; - version = "0.208.0"; + version = "0.209.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-q7rVTazlUmCOCv6W92uAg9/Jgkdxnl2eSxU3NSBsFZQ="; + sha256 = "sha256-XbGxFpkAVPhOShZWE6W/Z26NSOumB+1oh/o0zVVswL8="; }; vendorHash = "sha256-5Uul5c8Lwu6SJ7DlLU8+k2Pxa3V/DhqdvK5xY2g6S40="; diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 8522333ef9db1..01d847649bbf8 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { python3 ]; - buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # Pull a header that contains a definition of proc_pid_rusage(). darwin.apple_sdk_11_0.Libsystem ]; diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index a80e8282f8f48..f7c9f3ab82935 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.10"; + version = "2.4.14"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-d/RLFsQDyQR4KXZQexaYJs4Tszfd2vJz7TAv+FIwg54="; + hash = "sha256-SOCXr/btqub4affamyBH04rIXFb0oh3Hizpn1pFjfTA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/qc/default.nix b/pkgs/development/tools/qc/default.nix index e02df42fa1cc9..502d9480bd4c4 100644 --- a/pkgs/development/tools/qc/default.nix +++ b/pkgs/development/tools/qc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qc"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "qownnotes"; repo = "qc"; rev = "v${version}"; - hash = "sha256-SrvcRF2yRGGPTk835ykG+NH9WPoc/bXO5tSj43Q7T3g="; + hash = "sha256-+Mkg8x9f6oqPqPrk6iCHH69+k0jhQGfjtbJwJPLc7Dw="; }; - vendorHash = "sha256-7t5rQliLm6pMUHhtev/kNrQ7AOvmA/rR93SwNQhov6o="; + vendorHash = "sha256-Cg1Op/4okIi2UTtqWnR0N3iMWzrYEaYxmXzvWIibftg="; ldflags = [ "-s" "-w" "-X=github.com/qownnotes/qc/cmd.version=${version}" diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index 91f5c0f6ab854..4b4f81056e38b 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.12.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oj9/xVbb8+J4g/ul2CEs5LH7OKJdEqTTZonCHVlDc7M="; + sha256 = "sha256-J0ZRJ05MDO92Oa/82FPM69Xrge1ATHF4kgNUd5YISFc="; }; - vendorHash = "sha256-NcM+SdIgqtSRg7Fcwml/V73qYHcowBdOtmuF7EMSBB8="; + vendorHash = "sha256-M5LbB71fcEhXoDFd17TSruzl9y9tqiQpREwV/ZgvdQ4="; subPackages = [ "cmd/rain" ]; diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index 8b8a002d85b6a..beae01a2c57ea 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; rev = "refs/tags/v${version}"; - hash = "sha256-Tg9A7S6z/qaJ/saZRD3SSLxRQBwq/YNSTuHcmwwhqeM="; + hash = "sha256-6J+/clldoMSTcZXM4N8THZ3fk2NE9VQ2XyDIzVej6OY="; }; - cargoHash = "sha256-yDz7FuAw4mvL16EMUmywB0lfnMC6okLZ1px3Blx5rn4="; + cargoHash = "sha256-u42FDaSpunkj5u1zYtk27tKunW4ZzsNgYCmrSnuAe5k="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ ruby which - ] ++ lib.optional stdenv.isDarwin rustPlatform.bindgenHook; + ] ++ lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/rcodesign/default.nix b/pkgs/development/tools/rcodesign/default.nix index 72c261cfa0ed5..a110611ab4a9d 100644 --- a/pkgs/development/tools/rcodesign/default.nix +++ b/pkgs/development/tools/rcodesign/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-cpQBdxTw/ge4VtzjdL2a2xgSeCT22fMIjuKu5UEedhI="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/pkgs/development/tools/rebazel/default.nix b/pkgs/development/tools/rebazel/default.nix index d5979ac53dbdf..4b9549b8a58af 100644 --- a/pkgs/development/tools/rebazel/default.nix +++ b/pkgs/development/tools/rebazel/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "tool for expediting bazel build workflows"; diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index f3d384c5bfa2a..d60a81ea85fb8 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,20 +11,20 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2024.08.05.00"; + version = "2024.09.30.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; rev = "refs/tags/v${version}"; - hash = "sha256-888AFkVSQq8LvHi5x7N1BtiEe8s/V4FE/DJqiTf3NVQ="; + hash = "sha256-MGOT9fG5scZzHZ1mgqBE3GfhOnTRyPjD2kibbCteUjc="; }; - cargoHash = "sha256-bq+6lcetBUeVUxywsGLalfN48+alxAx3C1x/Gvtf7zM="; + cargoHash = "sha256-es2jdfVSufXdUxHbQ4MYPPmsnnxT7DTcoCi10YhW/7I="; nativeBuildInputs = [ pkg-config ]; buildInputs = - [ openssl ] ++ lib.optionals stdenv.isDarwin [ + [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/remodel/default.nix b/pkgs/development/tools/remodel/default.nix index 2788f4fb11d87..83b32a7dd26f3 100644 --- a/pkgs/development/tools/remodel/default.nix +++ b/pkgs/development/tools/remodel/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix deleted file mode 100644 index a70cd7805acbb..0000000000000 --- a/pkgs/development/tools/renderdoc/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ lib -, fetchFromGitHub -, nix-update-script -, cmake -, pkg-config -, mkDerivation -, qtbase -, qtx11extras -, qtsvg -, makeWrapper -, vulkan-loader -, libglvnd -, xorg -, python311 -, python311Packages -, bison -, pcre -, automake -, autoconf -, addDriverRunpath -, waylandSupport ? false -, wayland -}: -let - custom_swig = fetchFromGitHub { - owner = "baldurk"; - repo = "swig"; - rev = "renderdoc-modified-7"; - sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6"; - }; - cmakeBool = b: if b then "ON" else "OFF"; -in -mkDerivation rec { - pname = "renderdoc"; - version = "1.34"; - - src = fetchFromGitHub { - owner = "baldurk"; - repo = "renderdoc"; - rev = "v${version}"; - sha256 = "sha256-obRCILzMR7tCni0YoT3/oesTSADGI2sXqY3G6RS1h1o="; - }; - - buildInputs = [ - qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python311 - ] ++ (with python311Packages; [ - pyside2 pyside2-tools shiboken2 - ]) - ++ lib.optional waylandSupport wayland; - - nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addDriverRunpath ]; - - postUnpack = '' - cp -r ${custom_swig} swig - chmod -R +w swig - patchShebangs swig/autogen.sh - ''; - - cmakeFlags = [ - "-DBUILD_VERSION_HASH=${src.rev}" - "-DBUILD_VERSION_DIST_NAME=NixOS" - "-DBUILD_VERSION_DIST_VER=${version}" - "-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc" - "-DBUILD_VERSION_STABLE=ON" - "-DENABLE_WAYLAND=${cmakeBool waylandSupport}" - ]; - - # TODO: define these in the above array via placeholders, once those are widely supported - preConfigure = '' - cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" - cmakeFlags+=" -DRENDERDOC_SWIG_PACKAGE=$PWD/../swig" - ''; - - dontWrapQtApps = true; - preFixup = '' - wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib" - wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib" - ''; - - # The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh - postFixup = '' - addDriverRunpath $out/lib/librenderdoc.so - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Single-frame graphics debugger"; - homepage = "https://renderdoc.org/"; - license = licenses.mit; - longDescription = '' - RenderDoc is a free MIT licensed stand-alone graphics debugger that - allows quick and easy single-frame capture and detailed introspection - of any application using Vulkan, D3D11, OpenGL or D3D12 across - Windows 7 - 10, Linux or Android. - ''; - maintainers = [ ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index f687583888f2d..c5d79f3badf68 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -1,33 +1,44 @@ -{ lib -, git -, gnupg1 -, python3Packages -, fetchPypi +{ + lib, + fetchPypi, + git, + gnupg1, + python3Packages, }: -with python3Packages; buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "reno"; - version = "3.1.0"; + version = "4.1.0"; + pyproject = true; # Must be built from python sdist because of versioning quirks src = fetchPypi { inherit pname version; - sha256 = "2510e3aae4874674187f88f22f854e6b0ea1881b77039808a68ac1a5e8ee69b6"; + hash = "sha256-+ZLx/b0WIV7J3kevCBMdU6KDDJ54Q561Y86Nan9iU3A="; }; - propagatedBuildInputs = [ + # remove b/c doesn't list all dependencies, and requires a few packages not in nixpkgs + postPatch = '' + rm test-requirements.txt + ''; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ dulwich pbr pyyaml setuptools # required for finding pkg_resources at runtime ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ # Python packages - pytestCheckHook docutils fixtures sphinx + stestr testtools testscenarios @@ -36,17 +47,30 @@ with python3Packages; buildPythonApplication rec { gnupg1 ]; - # remove b/c doesn't list all dependencies, and requires a few packages not in nixpkgs - postPatch = '' - rm test-requirements.txt + checkPhase = '' + runHook preCheck + export HOME=$TMPDIR + stestr run -e <(echo " + # Expects to be run from a git repository + reno.tests.test_cache.TestCache.test_build_cache_db + reno.tests.test_semver.TestSemVer.test_major_post_release + reno.tests.test_semver.TestSemVer.test_major_working_and_post_release + reno.tests.test_semver.TestSemVer.test_major_working_copy + reno.tests.test_semver.TestSemVer.test_minor_post_release + reno.tests.test_semver.TestSemVer.test_minor_working_and_post_release + reno.tests.test_semver.TestSemVer.test_minor_working_copy + reno.tests.test_semver.TestSemVer.test_patch_post_release + reno.tests.test_semver.TestSemVer.test_patch_working_and_post_release + reno.tests.test_semver.TestSemVer.test_patch_working_copy + reno.tests.test_semver.TestSemVer.test_same + reno.tests.test_semver.TestSemVer.test_same_with_note + ") + runHook postCheck ''; - disabledTests = [ - "test_build_cache_db" # expects to be run from a git repository - ]; + pythonImportsCheck = [ "reno" ]; - # verify executable - postCheck = '' + postInstallCheck = '' $out/bin/reno -h ''; @@ -55,6 +79,6 @@ with python3Packages; buildPythonApplication rec { mainProgram = "reno"; homepage = "https://docs.openstack.org/reno/latest"; license = licenses.asl20; - maintainers = with maintainers; [ drewrisinger guillaumekoenig ]; + maintainers = teams.openstack.members ++ (with maintainers; [ drewrisinger guillaumekoenig ]); }; } diff --git a/pkgs/development/tools/reshape/default.nix b/pkgs/development/tools/reshape/default.nix index 273b0577dc04f..256f6515efd6c 100644 --- a/pkgs/development/tools/reshape/default.nix +++ b/pkgs/development/tools/reshape/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VTJ3FNhVLgxo/VVBhk1yF9UUktLXcbrEkYwoyoWFhXA="; buildInputs = - lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeCheckInputs = [ postgresqlTestHook diff --git a/pkgs/development/tools/resolve-march-native/default.nix b/pkgs/development/tools/resolve-march-native/default.nix index a5db33e712ab9..312d0d11c50cb 100644 --- a/pkgs/development/tools/resolve-march-native/default.nix +++ b/pkgs/development/tools/resolve-march-native/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "resolve-march-native"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fkiEWZvg/h8Gn0TL3Ov8aq2cAG5VncUTrVcUTRNOx+Y="; + hash = "sha256-02d7ip5E/vkOMkkeHOx1m7FdpurXT9O6HdwrygNPHdY="; }; # NB: The tool uses gcc at runtime to resolve the -march=native flags diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index 1c181c0efbe02..927eb7b43c5f1 100644 --- a/pkgs/development/tools/revive/default.nix +++ b/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.3.9"; + version = "1.4.0"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - hash = "sha256-ZfZNqr7zeMrLjSS1h3ZbjiXNjX1UiqldtrEFth2Z4f0="; + hash = "sha256-ViYNXZXvlOOpBjQuMAQXwcDtu1HoF+NstrOZzQcBOuQ="; # 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; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-iIAKPCE06lhAf/4f4TRVO51RdlvuXNA7yMlGVPGrIeo="; + vendorHash = "sha256-btuAXaJL8URkJvzPy+9tci5gOAqSkkNZn3mN2ox1Vfk="; ldflags = [ "-s" diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 96d938ad20401..4e9f750520f92 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -18,19 +18,20 @@ , libXi , libxkbcommon , ncurses +, wayland , zlib }: let - buildNum = "2024-04-18-1396"; + buildNum = "2024-06-26-1341"; in stdenv.mkDerivation { pname = "rgp"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - hash = "sha256-mP5tmq252IsWYVRGNKVib8ZbM5M4srUKXJ3x2ff4YhM="; + hash = "sha256-mpm4hxWyunq6Z6kdSuk4jqnYOTuLFVe+XzXZvHJPf/Q="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; @@ -51,6 +52,7 @@ stdenv.mkDerivation { libXi libxkbcommon ncurses + wayland zlib ]; @@ -65,13 +67,11 @@ stdenv.mkDerivation { # makeWrapper is needed so that executables are started from the opt # directory, where qt.conf and other tools are. # Unset Qt theme, it does not work if the nixos Qt version is different from the packaged one. - # The packaged Qt version only supports X11, so enforce that. makeWrapper \ $out/opt/rgp/$prog \ $out/bin/$prog \ --unset QT_QPA_PLATFORMTHEME \ --unset QT_STYLE_OVERRIDE \ - --set QT_QPA_PLATFORM xcb \ --prefix LD_LIBRARY_PATH : $out/opt/rgp/lib done ''; diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/development/tools/rojo/default.nix index 32ebfcf4189c1..ada53d437f4a0 100644 --- a/pkgs/development/tools/rojo/default.nix +++ b/pkgs/development/tools/rojo/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices SystemConfiguration ]; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = "1"; # tests flaky on darwin on hydra - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Project management tool for Roblox"; diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix index c70869299c9da..978935595fecf 100644 --- a/pkgs/development/tools/rover/default.nix +++ b/pkgs/development/tools/rover/default.nix @@ -1,7 +1,8 @@ { lib , fetchFromGitHub -, perl +, pkg-config , rustPlatform +, openssl , darwin , stdenv }: @@ -19,16 +20,22 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeBuildInputs = [ - perl + pkg-config ]; + env = { + OPENSSL_NO_VENDOR = true; + }; + # This test checks whether the plugins specified in the plugins json file are # valid by making a network call to the repo that houses their binaries; but, the # build env can't make network calls (impurity) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 3710cb6122a87..b3f9e00a81a5f 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config llvmPackages.llvm.dev ]; buildInputs = [ llvmPackages.llvm llvmPackages.libclang openssl emacs ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] - ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; src = fetchFromGitHub { owner = "andersbakken"; diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix index 287959dbf0b57..480826ab55d0b 100644 --- a/pkgs/development/tools/rubyfmt/default.nix +++ b/pkgs/development/tools/rubyfmt/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { libxcrypt libyaml rust-jemalloc-sys-unprefixed - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ readline libiconv libobjc @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-QZ26GmsKyENkzdCGg2peie/aJhEt7KQAF/lwsibonDk="; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec"; preFixup = '' mv $out/bin/rubyfmt{-main,} @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/fables-tales/rubyfmt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bobvanderlinden ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "rubyfmt"; }; } diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index ee7da1db88904..3da8e4beea340 100644 --- a/pkgs/development/tools/rust/cargo-about/default.nix +++ b/pkgs/development/tools/rust/cargo-about/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zstd ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 9c66f2cd97981..4e8cecb4a338c 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-QsaOFman+VBSIAbCalW63I3QXY0uECZy9+ufOKhSQrA="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # Test checks against machine code output, which fails with some # LLVM/compiler versions. diff --git a/pkgs/development/tools/rust/cargo-audit/default.nix b/pkgs/development/tools/rust/cargo-audit/default.nix index 01f72f1bc4216..9de3d6c9437ce 100644 --- a/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/pkgs/development/tools/rust/cargo-audit/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-bazel/default.nix b/pkgs/development/tools/rust/cargo-bazel/default.nix index 22567ad2d135f..151f155f9ee14 100644 --- a/pkgs/development/tools/rust/cargo-bazel/default.nix +++ b/pkgs/development/tools/rust/cargo-bazel/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # `test_data` is explicitly excluded from the package published to crates.io, so tests cannot be run doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 45ddee8da311c..f7b24266123f1 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.10.3"; + version = "1.10.5"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-2Vo8zORVyWu0IA44K8BmXCjiFtdKJelZm/D6p5vqI2k="; + hash = "sha256-VhmyfGVO1rDcorOznovkUu0GHgUSwKHhk/3jqg1pDZk="; }; - cargoHash = "sha256-iKhP1P/8oz/0ulkLeZFiAdFGhhs3vZh6JGeQpmd1ZdQ="; + cargoHash = "sha256-rgr++LD6YsTlrxKmNRtn2gdT5a1ul6A5UrXgKmpWC7w="; nativeBuildInputs = [ pkg-config @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { bzip2 xz zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix b/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix index 9babac9ebadee..8a89387ca8483 100644 --- a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix +++ b/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix @@ -39,13 +39,13 @@ rustPlatform.buildRustPackage rec { --subst-var libPath ''; in - lib.optionals stdenv.isLinux [ patchelfPatch ]; + lib.optionals stdenv.hostPlatform.isLinux [ patchelfPatch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-bundle/default.nix b/pkgs/development/tools/rust/cargo-bundle/default.nix index daf4bc230b8d0..7d302da1003b5 100644 --- a/pkgs/development/tools/rust/cargo-bundle/default.nix +++ b/pkgs/development/tools/rust/cargo-bundle/default.nix @@ -26,9 +26,9 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ]; diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index ca0f8a590ebd9..3dd89aefe7acf 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-UfhIz87s0CLUDbIpWMPzGQ7qVmh14GuiFoquauSbTOw="; nativeBuildInputs = [ pkg-config (lib.getDev curl) ]; - buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl curl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation libiconv Security diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 1c19b61bf8b45..fc5da4b5b1cbe 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; checkFlags = [ "offline_tests" ]; diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix index 50025c628f106..b307704c76fb7 100644 --- a/pkgs/development/tools/rust/cargo-chef/default.nix +++ b/pkgs/development/tools/rust/cargo-chef/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-chef"; - version = "0.1.67"; + version = "0.1.68"; src = fetchCrate { inherit pname version; - hash = "sha256-5bvA3lss+F2Wx0SSx5KRCmpERdIXUkUhFP+zRn8aZH0="; + hash = "sha256-NTFrNSEIzHppwOOjI3VadjhdV6EgGUmJzyX5JmTsJoI="; }; - cargoHash = "sha256-EIpi1k5GffGCk+fzHSW32T+ZLkRfswnEGZdER95TyBk="; + cargoHash = "sha256-DoIkK/tj3AYt0vm7u7f4SmgOKbdQZv3ZunMFT68+37E="; meta = with lib; { description = "Cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; diff --git a/pkgs/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix index c5e065eb2eaa6..ee119146feaf5 100644 --- a/pkgs/development/tools/rust/cargo-clone/default.nix +++ b/pkgs/development/tools/rust/cargo-clone/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 23880c2480fc0..ce20d409df288 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index 178b10b0be09d..e23844785c62e 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-jdGNZg/LXOoudxVhJbFeWEC9L3s0HW1S4nhfsGR4mEI="; + hash = "sha256-MCsFcEdP8SaT6PiCidUD5DBjRdeS+YIrQHpKsAnL4gA="; }; - cargoHash = "sha256-YW++YcpQM1Al7qD+KoVJitfK41i59sLjb3edBge1cvA="; + cargoHash = "sha256-Eif6e/6HHOLI4dvptQvk1LTIoaalCoVtXwM4CpEivcI="; nativeBuildInputs = [ pkg-config @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 0a2b797610d48..67c5ca0bc0a38 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index 14ca5cd027dff..3fbb42c88aa1f 100644 --- a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cyclonedx"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-rust-cargo"; rev = "${pname}-${version}"; - hash = "sha256-H/CFEz1+rFHiTEP8JBFH9W9OTHjRdIBOov9c0JO69xE="; + hash = "sha256-DOnf2O0ezQ6rR83lSG9mtvxXFz2hpxb8qi7xLvVKkYw="; }; - cargoHash = "sha256-OhkC8R/+mdjFI6WRisFYZk5PKxje3W9X5p9tGCgKQOw="; + cargoHash = "sha256-UHdugnKZ43qYpbaM+orPy7g09ZIcpCvhSMkptmmAf7s="; nativeBuildInputs = [ pkg-config @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration CoreFoundation diff --git a/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/pkgs/development/tools/rust/cargo-deadlinks/default.nix index d206e739bb837..70c9a377f00c1 100644 --- a/pkgs/development/tools/rust/cargo-deadlinks/default.nix +++ b/pkgs/development/tools/rust/cargo-deadlinks/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # assumes the target is x86_64-unknown-linux-gnu "--skip simple_project::it_checks_okay_project_correctly"; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Cargo subcommand to check rust documentation for broken links"; diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 573bdb96db022..71ff14557fec3 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-dephell/default.nix b/pkgs/development/tools/rust/cargo-dephell/default.nix index 1302fd581bbec..b1f390f77388f 100644 --- a/pkgs/development/tools/rust/cargo-dephell/default.nix +++ b/pkgs/development/tools/rust/cargo-dephell/default.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl darwin.apple_sdk.frameworks.Security libgit2 diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index b004c16aa276b..cbdd2a90b5918 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.21.1"; + version = "0.22.1"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-0CL/2n1MZJLMdlrtD7IoYBJY0aHtE93Z/gpWnJw1+zQ="; + hash = "sha256-Pq7gVZWvtWhS7HJPwKPDq3TJqwurG6fXisM5FsSMZ9k="; }; - cargoHash = "sha256-JJWPFsFQ+2DFyMxscjrzA/nnAAEIM3dnwKAqQPKcLP0="; + cargoHash = "sha256-0j3u4oQ8JxJP+lBufDiSMyvFrW70X1snpHstjaM9tDg="; nativeBuildInputs = [ pkg-config @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { bzip2 xz zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-duplicates/default.nix b/pkgs/development/tools/rust/cargo-duplicates/default.nix index f9417651cf6aa..17c9cd7d83dea 100644 --- a/pkgs/development/tools/rust/cargo-duplicates/default.nix +++ b/pkgs/development/tools/rust/cargo-duplicates/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/rust/cargo-edit/Cargo.lock b/pkgs/development/tools/rust/cargo-edit/Cargo.lock deleted file mode 100644 index de3cfdf9786ef..0000000000000 --- a/pkgs/development/tools/rust/cargo-edit/Cargo.lock +++ /dev/null @@ -1,2381 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon 1.0.2", - "colorchoice", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstream" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon 2.1.0", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "assert_cmd" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" -dependencies = [ - "anstream 0.3.2", - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "assert_fs" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" -dependencies = [ - "anstream 0.3.2", - "anstyle", - "doc-comment", - "globwalk", - "predicates", - "predicates-core", - "predicates-tree", - "tempfile", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base64" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[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.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-edit" -version = "0.12.2" -dependencies = [ - "anyhow", - "assert_cmd", - "assert_fs", - "cargo-test-macro", - "cargo-test-support", - "cargo_metadata", - "clap", - "clap-cargo", - "concolor-control", - "crates-index", - "dunce", - "env_proxy", - "git2", - "hex", - "home", - "indexmap 1.9.3", - "native-tls", - "pathdiff", - "predicates", - "regex", - "semver", - "serde", - "serde_derive", - "serde_json", - "snapbox", - "subprocess", - "termcolor", - "toml", - "toml_edit", - "trycmd", - "ureq", - "url", -] - -[[package]] -name = "cargo-platform" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-test-macro" -version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" - -[[package]] -name = "cargo-test-support" -version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" -dependencies = [ - "anyhow", - "cargo-test-macro", - "cargo-util", - "crates-io", - "filetime", - "flate2", - "git2", - "glob", - "itertools", - "lazy_static", - "pasetors", - "serde", - "serde_json", - "snapbox", - "tar", - "termcolor", - "time", - "toml", - "url", - "windows-sys", -] - -[[package]] -name = "cargo-util" -version = "0.2.7" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" -dependencies = [ - "anyhow", - "core-foundation", - "filetime", - "hex", - "jobserver", - "libc", - "miow", - "same-file", - "sha2", - "shell-escape", - "tempfile", - "tracing", - "walkdir", - "windows-sys", -] - -[[package]] -name = "cargo_metadata" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap-cargo" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383f21342a464d4af96e9a4cad22a0b4f2880d4a5b3bbf5c9654dd1d9a224ee4" -dependencies = [ - "anstyle", - "clap", -] - -[[package]] -name = "clap_builder" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" -dependencies = [ - "anstream 0.5.0", - "anstyle", - "clap_lex", - "strsim", - "terminal_size", -] - -[[package]] -name = "clap_derive" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "concolor-control" -version = "0.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7104119c2f80d887239879d0c50e033cd40eac9a3f3561e0684ba7d5d654f4da" -dependencies = [ - "atty", - "bitflags 1.3.2", - "concolor-query", -] - -[[package]] -name = "concolor-query" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad159cc964ac8f9d407cbc0aa44b02436c054b541f2b4b5f06972e1efdc54bc7" - -[[package]] -name = "const-oid" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" - -[[package]] -name = "content_inspector" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" -dependencies = [ - "memchr", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[package]] -name = "crates-index" -version = "0.19.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3cab38e209d6ba8bd5b0d41c784ec63a5a9ea3adf866b820d377588960f1ded" -dependencies = [ - "git2", - "hex", - "home", - "memchr", - "rayon", - "rustc-hash", - "semver", - "serde", - "serde_derive", - "serde_json", - "smol_str", - "toml", -] - -[[package]] -name = "crates-io" -version = "0.39.0" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" -dependencies = [ - "curl", - "percent-encoding", - "serde", - "serde_json", - "thiserror", - "url", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-bigint" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" -dependencies = [ - "generic-array", - "rand_core", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "ct-codecs" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.65+curl-8.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - -[[package]] -name = "der" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "deranged" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" -dependencies = [ - "serde", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", - "subtle", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "ecdsa" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" -dependencies = [ - "der", - "digest", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - -[[package]] -name = "ed25519-compact" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3d382e8464107391c8706b4c14b087808ecb909f6c15c34114bc42e53a9e4c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "elliptic-curve" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest", - "ff", - "generic-array", - "group", - "hkdf", - "pem-rfc7468", - "pkcs8", - "rand_core", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "env_proxy" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a5019be18538406a43b5419a5501461f0c8b49ea7dfda0cfc32f4e51fc44be1" -dependencies = [ - "log", - "url", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "rand_core", - "subtle", -] - -[[package]] -name = "fiat-crypto" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" - -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "windows-sys", -] - -[[package]] -name = "flate2" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" -dependencies = [ - "crc32fast", - "libz-sys", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", - "zeroize", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "git2" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "globwalk" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" -dependencies = [ - "bitflags 1.3.2", - "ignore", - "walkdir", -] - -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff", - "rand_core", - "subtle", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -dependencies = [ - "serde", -] - -[[package]] -name = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "humantime-serde" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" -dependencies = [ - "humantime", - "serde", -] - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown 0.14.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.9", - "windows-sys", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[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.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libgit2-sys" -version = "0.15.2+1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" -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.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "miow" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.2", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "openssl" -version = "0.10.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "111.27.0+1.1.1v" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "orion" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11468cc6afd61a126fe3f91cc4cc8a0dbe7917d0a4b5e8357ba91cc47444462" -dependencies = [ - "fiat-crypto", - "subtle", - "zeroize", -] - -[[package]] -name = "os_pipe" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "pasetors" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba765699a309908d55950919a3445e9491453e89b2587b1b2abe4143a48894c0" -dependencies = [ - "ct-codecs", - "ed25519-compact", - "getrandom", - "orion", - "p384", - "rand_core", - "regex", - "serde", - "serde_json", - "sha2", - "subtle", - "time", - "zeroize", -] - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "predicates" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" -dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "itertools", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "primeorder" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" -dependencies = [ - "elliptic-curve", -] - -[[package]] -name = "proc-macro2" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[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.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys 0.4.5", - "windows-sys", -] - -[[package]] -name = "rustls" -version = "0.21.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.4", - "sct", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - -[[package]] -name = "sha2" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shell-escape" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "signature" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "similar" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" - -[[package]] -name = "smol_str" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" -dependencies = [ - "serde", -] - -[[package]] -name = "snapbox" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad90eb3a2e3a8031d636d45bd4832751aefd58a291b553f7305a2bacae21aff3" -dependencies = [ - "anstream 0.5.0", - "anstyle", - "content_inspector", - "dunce", - "filetime", - "libc", - "normalize-line-endings", - "os_pipe", - "similar", - "snapbox-macros", - "tempfile", - "wait-timeout", - "walkdir", - "windows-sys", -] - -[[package]] -name = "snapbox-macros" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f4ffd811b87da98d0e48285134b7847954bd76e843bb794a893b47ca3ee325" -dependencies = [ - "anstream 0.5.0", -] - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socks" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" -dependencies = [ - "byteorder", - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spki" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subprocess" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "2.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", -] - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix 0.38.9", - "windows-sys", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix 0.37.23", - "windows-sys", -] - -[[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.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" -dependencies = [ - "deranged", - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - -[[package]] -name = "time-macros" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" -dependencies = [ - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "toml" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" -dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "trycmd" -version = "0.14.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6a42f89ccf3c6ee115608a68e256c172734d525a4ac36d4a17a6d4a8108149" -dependencies = [ - "glob", - "humantime", - "humantime-serde", - "rayon", - "serde", - "shlex", - "snapbox", - "toml_edit", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" -dependencies = [ - "base64", - "log", - "native-tls", - "once_cell", - "rustls", - "rustls-webpki 0.100.2", - "serde", - "serde_json", - "socks", - "url", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[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 = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.2", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winnow" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" -dependencies = [ - "memchr", -] - -[[package]] -name = "zeroize" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 6b911251501bd..f42607332d711 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,25 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-tMYuhUb1e/wTMZGwrAa3bz3INAld/ZtQzJqpeG0w/G8="; + hash = "sha256-Y5tnY8EZJcVhYyVTpvcT6DFbPSmmw3+knzkMVvQxQbI="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "cargo-test-macro-0.1.0" = "sha256-yE8BJMTRBT3P29t5ygMCybs0CYDcFLVlxi1L0LkBV9Q="; - }; - }; + cargoHash = "sha256-X8wQvLSvZ7rrDfX423SDB5QDDMoeDDFvJZKO92CLycg="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl zlib ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/development/tools/rust/cargo-feature/default.nix index 1e713076e1f33..81f0a1c62bb60 100644 --- a/pkgs/development/tools/rust/cargo-feature/default.nix +++ b/pkgs/development/tools/rust/cargo-feature/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU="; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; meta = with lib; { description = "Cargo plugin to manage dependency features"; diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix index 4a6d9c3ff39d7..aca8e713e6e3f 100644 --- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-KwpveTiViY+C4A+fE5yeGuT9PXbDyi+YsOc75mX2KdU="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/cargo-flamegraph \ --set-default PERF ${perf}/bin/perf wrapProgram $out/bin/flamegraph \ diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix index 42f703aaa2402..23d13a8841ae7 100644 --- a/pkgs/development/tools/rust/cargo-fund/default.nix +++ b/pkgs/development/tools/rust/cargo-fund/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv curl ]; meta = with lib; { description = "Discover funding links for your project's dependencies"; diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index fc60b761fe4ed..6c296e8ccbce1 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sfvepPpYtgA0TuUlu0CD50HX933AVQbUGzJBNAzFR94="; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index f4c25a60dbc4c..fa6a0578028f3 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { # - should_canonicalize: the test assumes that it will be called from the /Users/<project_dir>/ folder on darwin variant. checkFlags = [ "--skip=favorites::favorites_default_to_git_if_not_defined" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=git::utils::should_canonicalize" ]; diff --git a/pkgs/development/tools/rust/cargo-guppy/default.nix b/pkgs/development/tools/rust/cargo-guppy/default.nix index 13bb3eaff1cff..68a696ab1ae9d 100644 --- a/pkgs/development/tools/rust/cargo-guppy/default.nix +++ b/pkgs/development/tools/rust/cargo-guppy/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix index ec689cb515d6d..8859fa605a429 100644 --- a/pkgs/development/tools/rust/cargo-hf2/default.nix +++ b/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; meta = with lib; { description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders"; diff --git a/pkgs/development/tools/rust/cargo-info/default.nix b/pkgs/development/tools/rust/cargo-info/default.nix index c2892ab70783c..70700aa4ee2db 100644 --- a/pkgs/development/tools/rust/cargo-info/default.nix +++ b/pkgs/development/tools/rust/cargo-info/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-info"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitLab { owner = "imp"; repo = "cargo-info"; rev = version; - hash = "sha256-02Zkp7Vc1M5iZsG4iJL30S73T2HHg3lqrPJ9mW3FOuk="; + hash = "sha256-MrkYGUd1jsAqIVYWe7YDZaq7NPv/mHQqLS7GFrYYIo8="; }; - cargoHash = "sha256-zp7qklME28HNGomAcQgrEi7W6zQ1QCJc4FjxtnKySUE="; + cargoHash = "sha256-yxftWLGIFt4QO1XKXpBcKnTEiL0x9RKGRCMEO/H1PEU="; nativeBuildInputs = [ pkg-config @@ -26,8 +26,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration ]; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index e8b1443dd0093..b1126b42f2480 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "026vc8d0jkc1d7dlp3ldmwks7svpvqzl0k5niri8a12cl5w5b9hj"; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoHash = "sha256-+cYbejdZOmvaX8jdf1llAvaTefPVtIOl1fqGm5tHMRk="; diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index 36dfaafdadfd1..a70f6b4e4585a 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -5,20 +5,23 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - # use stable release once 1.40 lands - version = "1.39-unstable-2024-08-22"; + version = "1.40"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; - rev = "abb6ba50163fb9093fa79c2fb784a57e08b2fcc0"; - hash = "sha256-465xY68M00lBM+3pz8FIXkBXnRrMi4wbBRieYHz0w+s="; + rev = "83f33653b687c84823fe6af00806107e1dd4f4b8"; + hash = "sha256-eau5h75oZpxufTrf0fLHfr+3TIOFXB/kSgHX+o2GtiE="; }; - cargoHash = "sha256-2mf9GJ1BtZE1k9jIdFmjiK1KfQ9qPkeSABT8X7G+p9I="; + cargoHash = "sha256-OqM8SERSWHtbvW6SZfM7lOrQZu66uzsv5wiD3Iqaf3s="; + checkFlags = [ # Depends on `rustfmt` and does not matter for packaging. - checkFlags = [ "--skip=utils::test_format_rust_expression" ]; + "--skip=utils::test_format_rust_expression" + # Requires networking + "--skip=test_force_update_snapshots" + ]; meta = with lib; { description = "Cargo subcommand for snapshot testing"; diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix index 31bc188f5883a..b63c9e43b4156 100644 --- a/pkgs/development/tools/rust/cargo-lambda/default.nix +++ b/pkgs/development/tools/rust/cargo-lambda/default.nix @@ -1,36 +1,46 @@ -{ lib -, cacert -, curl -, rustPlatform -, fetchFromGitHub -, makeWrapper -, pkg-config -, openssl -, stdenv -, CoreServices -, Security -, zig -, nix-update-script +{ + lib, + cacert, + curl, + rustPlatform, + fetchFromGitHub, + makeWrapper, + pkg-config, + openssl, + stdenv, + CoreServices, + Security, + zig, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "cargo-lambda"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-6259HRTMQZWQ8wDcsExvUVzl9IaChsMmB6zaVAeSSAM="; + hash = "sha256-QTFIFD04pAcNgj+ktY8WP0ScDmSy6mNlhfiXAabMlGE="; }; - cargoHash = "sha256-fMQFifEnEsDU99vWifPWgHpGGZae84xez3m01MLK7Mo="; + cargoHash = "sha256-1/+bkxEpIvaJBJatqpX186MHKOdLO8Jiw8NEnyr9ctg="; - nativeCheckInputs = [cacert]; + nativeCheckInputs = [ cacert ]; - nativeBuildInputs = [ makeWrapper pkg-config ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl CoreServices Security ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + curl + CoreServices + Security + ]; checkFlags = [ # Disabled because they access the network. @@ -44,6 +54,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_build_internal_zip_extension" "--skip=test_build_logs_extension" "--skip=test_build_telemetry_extension" + "--skip=test_build_zip_workspace" "--skip=test_download_example" "--skip=test_init_subcommand" "--skip=test_init_subcommand_without_override" @@ -77,6 +88,9 @@ rustPlatform.buildRustPackage rec { mainProgram = "cargo-lambda"; homepage = "https://cargo-lambda.info"; license = licenses.mit; - maintainers = with maintainers; [ taylor1791 calavera ]; + maintainers = with maintainers; [ + taylor1791 + calavera + ]; }; } diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/development/tools/rust/cargo-leptos/default.nix index 2beed790ed696..5a14ac34252d5 100644 --- a/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -10,7 +10,7 @@ let SystemConfiguration Security; inherit (lib) optionals; - inherit (stdenv) isDarwin; + inherit (stdenv.hostPlatform) isDarwin; in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix index 958bfeb447c3b..7132ebff02ad0 100644 --- a/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/pkgs/development/tools/rust/cargo-limit/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 93994a7bc75b3..2672d165b26d7 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -26,7 +26,7 @@ let pname = "cargo-llvm-cov"; - version = "0.6.11"; + version = "0.6.12"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -37,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-/PwzG+Erz1aMDg50glZBP7mNHzuvvn2Dn+dicMG2ouo="; + sha256 = "sha256-QMO5J5c8MQr84w6X74oQrHV99cjSUVfpC8Ub1csQ0gI="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-1HZNYC7bMG7olnZH4oOC/fXOAF9qt7MYhlQbaOKDmvg="; + sha256 = "sha256-BlXgbCWjGya/I94nqfjBqQPSWnVhyhNn0oSRL9xiS6k="; }; # Upstream doesn't include the lockfile so we need to add it back @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoHash = "sha256-sN3vNZgi45pcDXI8kQ0L/r6HCDGs8l2VMwI+LHjwZ6Q="; + cargoHash = "sha256-nabO19JePQRuhxsbm5wVIU4+5si6p0VgqR2QLmLeivU="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests @@ -94,6 +94,6 @@ rustPlatform.buildRustPackage { maintainers = with lib.maintainers; [ wucke13 matthiasbeyer CobaltCause ]; # The profiler runtime is (currently) disabled on non-Linux platforms - broken = !(stdenv.isLinux && !stdenv.targetPlatform.isRedox); + broken = !(stdenv.hostPlatform.isLinux && !stdenv.targetPlatform.isRedox); }; } diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 614630549b776..3e567af66173c 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.39"; + version = "0.4.40"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-iy8bZvF3JYnlABzhmsrzo89pmKAWQYVNSZ9HoplpWiY="; + hash = "sha256-FyPq2+Smx4ZbJG13TKUHlyAANU4JbpAAUxisH9c4Aq8="; }; - cargoHash = "sha256-vFj7U+30dcLkFJ1eet6lykTcJHzKWOSzAqPqKJrp6Gg="; + cargoHash = "sha256-AH27+WrWguFpZFIq3N8Wb1Nlwbof6tgX0W4AtwMtoVw="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/cargo-local-registry/default.nix b/pkgs/development/tools/rust/cargo-local-registry/default.nix index 76f26decd8682..7e6c0c917a734 100644 --- a/pkgs/development/tools/rust/cargo-local-registry/default.nix +++ b/pkgs/development/tools/rust/cargo-local-registry/default.nix @@ -33,9 +33,9 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/pkgs/development/tools/rust/cargo-machete/default.nix b/pkgs/development/tools/rust/cargo-machete/default.nix index aadd97f30a951..c18bea07a1bb7 100644 --- a/pkgs/development/tools/rust/cargo-machete/default.nix +++ b/pkgs/development/tools/rust/cargo-machete/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-machete"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "bnjbvr"; repo = "cargo-machete"; rev = "v${version}"; - hash = "sha256-8ktiBnlcnC4QD3rIox8rfxhF0ZWOlbok8rK7fnqeZOM="; + hash = "sha256-qOWa2Q7B073b5UssRnUkk24+PkIzl+czWGCcORUc55w="; }; - cargoHash = "sha256-emW/TDpeh/7hgqTgXAZeQwzkSIktDxk3Lp3JyhdTSRo="; + cargoHash = "sha256-q5oC2leWjsCFrwJ9ITeEjxtnnvfDrGyyKNR4kAXBQ6Q="; # tests require internet access doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix index b8180bb4348e6..4ee8ec165f5ec 100644 --- a/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ b/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -12,7 +12,7 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.15.1"; + version = "0.17.3"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-kWoVjEZsHvuVfsl/SsVm/XJ4Y/U/gjcprY4xISE5xs8="; + hash = "sha256-DOV4QjtjOH1420KH70kkISo9lNbcjbnAn34MnAJWYvQ="; }; # 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 = "${src.name}/tooling/cli"; - cargoHash = "sha256-zfu5cRTJY5yZOOa41PribmcbEVcxbRJfosj4+tU/OsU="; + cargoHash = "sha256-aC6IxamPHRZ1V6ZTiXGVSt4YIa+GPK/j6IWh86JOrV8="; preBuild = '' mkdir -p $out/share/ @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage { export CARGO_HOME=$out/share/ ''; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; nativeBuildInputs = [ pkg-config git makeWrapper ]; preFixup = '' diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 3787173f0fff2..da236481f45d5 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-j3AYWKq7SrlNlsY7A80iwcWKW8wi6hx0U9UwDIQkXZs="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index e8b23c70bd113..2db732560df1f 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { # Integration tests fail doCheck = false; - buildInputs = if stdenv.isDarwin + buildInputs = if stdenv.hostPlatform.isDarwin then [ libiconv Security ] else [ openssl ]; diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index 7420002138792..2c415009cdff3 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "24.7.1"; + version = "24.9.0"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-56IIMifv5epThXeWtQbNLwee1IQ52SPKik4hsHlnv6w="; + hash = "sha256-fMw3Whyl+zTPpDTdYpwvzMQtSdr42ueEvkdmRI0N2aA="; }; - cargoHash = "sha256-VRkhDgKunSUOz2/U4oC2t0YrDh5l48z4luevMazfj6o="; + cargoHash = "sha256-+vI/HPw0oe9K0kWpJXGBM0r7oVBh3+RJzSwklaywa54="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-ndk/default.nix b/pkgs/development/tools/rust/cargo-ndk/default.nix index b1068127483bb..1397ffc3742c2 100644 --- a/pkgs/development/tools/rust/cargo-ndk/default.nix +++ b/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sIKan8LnGv4sGVrGOUOKSD3R4fNRu5yBFATm5MWDTSU="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreGraphics Foundation ]; diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 00515c2252af6..cb3465a592f9e 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -1,31 +1,22 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: +{ lib, rustPlatform, fetchFromGitHub, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.72"; + version = "0.9.78"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-FQM1SVzGgmu6HHijP9kKEJPhhzSLs/jo36b4qnx0lb4="; + hash = "sha256-nQIq/WCbB3iWxDdD13tthvmndYhccttcOeXWJ7Dri+0="; }; - cargoHash = "sha256-2ttG9lPIkLRzDPcDNZjROOIIDhcEHfBvs/DTniZtQUY="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + cargoHash = "sha256-XGDPxak2jVKkGyhPMpW4KxzyMd5aaIj1Hguw+XEM7w8="; cargoBuildFlags = [ "-p" "cargo-nextest" ]; cargoTestFlags = [ "-p" "cargo-nextest" ]; - # TODO: investigate some more why these tests fail in nix - checkFlags = [ - "--skip=tests_integration::test_list" - "--skip=tests_integration::test_relocated_run" - "--skip=tests_integration::test_run" - ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Next-generation test runner for Rust projects"; diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index 64b7c4a77656c..0c575c604cf8b 100644 --- a/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl CoreFoundation CoreServices diff --git a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix index 7138ae8ecfef8..89293ab62ef88 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix @@ -56,6 +56,7 @@ # dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g. # if you include the generated code in the output via postInstall. , useFakeRustfmt ? true +, usePgTestCheckFeature ? true , ... } @ args: let @@ -86,7 +87,7 @@ let preBuildAndTest = '' export PGRX_HOME=$(mktemp -d) export PGDATA="$PGRX_HOME/data-${pgrxPostgresMajor}/" - cargo-pgrx pgrx init "--pg${pgrxPostgresMajor}" ${postgresql}/bin/pg_config + cargo-pgrx pgrx init "--pg${pgrxPostgresMajor}" ${lib.getDev postgresql}/bin/pg_config echo "unix_socket_directories = '$(mktemp -d)'" > "$PGDATA/postgresql.conf" # This is primarily for Mac or other Nix systems that don't use the nixbld user. @@ -96,12 +97,12 @@ let pg_ctl stop ''; - argsForBuildRustPackage = builtins.removeAttrs args [ "postgresql" "useFakeRustfmt" ]; + argsForBuildRustPackage = builtins.removeAttrs args [ "postgresql" "useFakeRustfmt" "usePgTestCheckFeature" ]; # so we don't accidentally `(rustPlatform.buildRustPackage argsForBuildRustPackage) // { ... }` because # we forgot parentheses finalArgs = argsForBuildRustPackage // { - buildInputs = (args.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = (args.buildInputs or [ ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cargo-pgrx @@ -117,11 +118,10 @@ let ${preBuildAndTest} ${maybeEnterBuildAndTestSubdir} - NIX_PGLIBDIR="${postgresql}/lib" \ PGRX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}" \ - ${lib.optionalString stdenv.isDarwin ''RUSTFLAGS="''${RUSTFLAGS:+''${RUSTFLAGS} }-Clink-args=-Wl,-undefined,dynamic_lookup"''} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin ''RUSTFLAGS="''${RUSTFLAGS:+''${RUSTFLAGS} }-Clink-args=-Wl,-undefined,dynamic_lookup"''} \ cargo pgrx package \ - --pg-config ${postgresql}/bin/pg_config \ + --pg-config ${lib.getDev postgresql}/bin/pg_config \ ${maybeDebugFlag} \ --features "${builtins.concatStringsSep " " buildFeatures}" \ --out-dir "$out" @@ -155,7 +155,7 @@ let RUST_BACKTRACE = "full"; checkNoDefaultFeatures = true; - checkFeatures = (args.checkFeatures or [ ]) ++ [ "pg_test pg${pgrxPostgresMajor}" ]; + checkFeatures = (args.checkFeatures or [ ]) ++ (lib.optionals usePgTestCheckFeature [ "pg_test" ]) ++ [ "pg${pgrxPostgresMajor}" ]; }; in rustPlatform.buildRustPackage finalArgs diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 3aa7003b75677..93010928ddc65 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -24,13 +24,13 @@ let inherit cargoHash; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -71,4 +71,10 @@ in hash = "sha256-UHIfwOdXoJvR4Svha6ud0FxahP1wPwUtviUwUnTmLXU="; cargoHash = "sha256-j4HnD8Zt9uhlV5N7ldIy9564o9qFEqs5KfXHmnQ1WEw="; }; + + cargo-pgrx_0_12_0_alpha_1 = generic { + version = "0.12.0-alpha.1"; + hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws="; + cargoHash = "sha256-9XTIcpoCnROP63ZTDgMMMmj0kPggiTazKlKQfCgXKzk="; + }; } diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index aa55cac49d757..8bc991d0bd4c2 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.37.0"; + version = "0.38.0"; src = fetchCrate { inherit pname version; - hash = "sha256-BwCqGQJpFjrZtQpjZ7FIIUfIaIXBTJWDzjZoktSa2Zg="; + hash = "sha256-NgaW/QsBaMMBbfUGyHwuu0fb3q3GmD8Qv5wG6qYPjvA="; }; - cargoHash = "sha256-McqRVfTX8z3NkkIvp3jqJlhtOhOGdcahTghDCMY2E6c="; + cargoHash = "sha256-KX3+tIdAyaWdaq2nabVTvoZRTXLSXEALFJYCa5nda4w="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; # Tests fail doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index 8f9abcb28da20..c818582433a2f 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-risczero/default.nix b/pkgs/development/tools/rust/cargo-risczero/default.nix index ead0103d3f659..bf61c32cf7782 100644 --- a/pkgs/development/tools/rust/cargo-risczero/default.nix +++ b/pkgs/development/tools/rust/cargo-risczero/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index a219cbd41d1da..ad2e4b7f337e6 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index f6d52a2c54c61..80af89869c147 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.38"; + version = "0.2.39"; src = fetchCrate { inherit pname version; - hash = "sha256-CYnW6wv4aL/Qs6IwPaRi9w8/iNMo5to0J3z4zTdgHaE="; + hash = "sha256-fGUx2SOgs5IF7KTr36fHktykrFkxqLWp4CWVGOZ+MeM="; }; - cargoHash = "sha256-jRsxP4b1URTDcnp8VsZvSTaPNOBBwq570eCn2jfQSGg="; + cargoHash = "sha256-iCHf4/bqICZ0bTeFFeVopU0Yl8VbxRd+Cr4WucuptVk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust/cargo-shuttle/default.nix b/pkgs/development/tools/rust/cargo-shuttle/default.nix index 61a0bf1c6c060..57d61041857a8 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index aae0be3376141..6d6bfa5ae2580 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; preCheck = "HOME=$(mktemp -d)"; diff --git a/pkgs/development/tools/rust/cargo-supply-chain/default.nix b/pkgs/development/tools/rust/cargo-supply-chain/default.nix index 395a48498237d..073500a16e2f4 100644 --- a/pkgs/development/tools/rust/cargo-supply-chain/default.nix +++ b/pkgs/development/tools/rust/cargo-supply-chain/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Fx1C4X0dQqePqLa+X+4ZDrIMFKBQ6J50nBApYXcGbFM="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 828f50e467c38..b85112f755383 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Dkz3QJchUAn4/kQsmQcSfxVrRdiCA2qJSOTszfvE4No="; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration Foundation IOKit diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix deleted file mode 100644 index 1dcc79fb4b750..0000000000000 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromGitHub, - openssl, - pkg-config, - glibc, - libsoup, - cairo, - gtk3, - webkitgtk, - darwin, -}: - -let - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; -in -rustPlatform.buildRustPackage rec { - pname = "tauri"; - version = "1.7.1-unstable-2024-08-16"; - - src = fetchFromGitHub { - owner = "tauri-apps"; - repo = "tauri"; - rev = "2b61447dfc167ec11724f99671bf9e2de0bf6768"; - hash = "sha256-gKG7olZuTCkW+SKI3FVZqgS6Pp5hFemRJshdma8rpyg="; - }; - - # 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 = "${src.name}/tooling/cli"; - - cargoHash = "sha256-VXg/dAhwPTSrLwJm8HNzAi/sVF9RqgpHIF3PZe1LjSA="; - - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.isLinux [ - glibc - libsoup - cairo - gtk3 - webkitgtk - ] - ++ lib.optionals stdenv.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; - nativeBuildInputs = [ pkg-config ]; - - meta = { - description = "Build smaller, faster, and more secure desktop applications with a web frontend"; - mainProgram = "cargo-tauri"; - homepage = "https://tauri.app/"; - license = with lib.licenses; [ - asl20 # or - mit - ]; - maintainers = with lib.maintainers; [ - dit7ya - happysalada - ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-temp/default.nix b/pkgs/development/tools/rust/cargo-temp/default.nix index a00d4fef2275c..8f1e96c5562dc 100644 --- a/pkgs/development/tools/rust/cargo-temp/default.nix +++ b/pkgs/development/tools/rust/cargo-temp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.2.21"; + version = "0.2.22"; src = fetchFromGitHub { owner = "yozhgoor"; repo = "cargo-temp"; rev = "v${version}"; - hash = "sha256-8VkhEpggSoE0DIdZk8Y1fCYAwN6CZd2nK6auWRIbS6w="; + hash = "sha256-gsrmHCj9DC6OkGS0CD/NE2UMc/9TdjA2In6f3iKXMOg="; }; - cargoHash = "sha256-fYpG/Bl3hsbkWWTkbX59UqD/HuL9OpmcZc6hPAmnNtM="; + cargoHash = "sha256-ryvv4SuhxIXPJKa3WLdjNQZAP+JLAjWtrCfWXUm+WVg="; meta = with lib; { description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index bc72b8a6a7577..a41e2616ba89b 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { # TODO figure out how to use provided curl instead of compiling curl from curl-sys buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security libiconv SystemConfiguration ]; # Requires network access doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-ui/default.nix b/pkgs/development/tools/rust/cargo-ui/default.nix index 01578e497deb2..fedd72458c8ed 100644 --- a/pkgs/development/tools/rust/cargo-ui/default.nix +++ b/pkgs/development/tools/rust/cargo-ui/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ expat fontconfig libGL @@ -39,11 +39,11 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr xorg.libxcb - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/cargo-ui \ --add-rpath ${lib.makeLibraryPath [ fontconfig libGL ]} ''; diff --git a/pkgs/development/tools/rust/cargo-unused-features/default.nix b/pkgs/development/tools/rust/cargo-unused-features/default.nix index 32fae29d903aa..cf1fd1deb3981 100644 --- a/pkgs/development/tools/rust/cargo-unused-features/default.nix +++ b/pkgs/development/tools/rust/cargo-unused-features/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { curl libgit2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index b0210e5187d7a..cc6427400304f 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -16,21 +16,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "14.0.2"; + version = "15.0.0"; src = fetchCrate { inherit pname version; - hash = "sha256-5fNypt1zezBWmt0eLDGxL7PmRUSuzQ3s4Aymz9ZMXT0="; + hash = "sha256-2Z/fRd80qZi61KO07gx3Jdnslxv1KUCubv9bIUmjGKU="; }; - cargoHash = "sha256-NKo3Ry2bok7jxblrHjFJB24FFm62zclCxae+SxoYQqc="; + cargoHash = "sha256-v5rsFzox1x2pf/LilZy/YI985sL5Pigm2GGaCWWjB7s="; nativeBuildInputs = [ cmake installShellFiles pkg-config ronn - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ]; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { libssh2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix index 96822b3078d2b..69c5d69d2c69f 100644 --- a/pkgs/development/tools/rust/cargo-vet/default.nix +++ b/pkgs/development/tools/rust/cargo-vet/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-M8sZzgSEMIB6pPVaE+tC18MCbwYaYpHOnhrEvm9JTso="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # the test_project tests require internet access checkFlags = [ diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 69c04b520b305..1033476eb9765 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-skUG1B6TCFEXeQSRwA6vWjXmNifk5bTR4+JESw7CZMo="; - buildInputs = lib.optionals stdenv.isDarwin [ Foundation Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation Cocoa ]; - NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ]; + NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-framework" "AppKit" ]; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) diff --git a/pkgs/development/tools/rust/cargo-web/default.nix b/pkgs/development/tools/rust/cargo-web/default.nix index 11f1fc6aacf07..b5da3fdb7f0dc 100644 --- a/pkgs/development/tools/rust/cargo-web/default.nix +++ b/pkgs/development/tools/rust/cargo-web/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform -, CoreServices, Security +{ + lib, + stdenv, + fetchFromGitHub, + openssl, + perl, + pkg-config, + rustPlatform, + CoreServices, + Security, + fetchpatch, }: rustPlatform.buildRustPackage rec { @@ -13,16 +22,34 @@ rustPlatform.buildRustPackage rec { sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; }; + patches = [ + (fetchpatch { + name = "fix-qualified-path.patch"; + url = "https://github.com/koute/cargo-web/commit/c9584542163d60d0aae6d6890509794e838e257f.patch"; + hash = "sha256-w59fXmrszptKt0llqGt0AF+0b3r9N6xUY6zQkpZnemE="; + }) + ]; + cargoHash = "sha256-apPXSG8RV9hZ+jttn4XHhgmuLQ7344SQJna7Z/fu/mA="; - nativeBuildInputs = [ openssl perl pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; + nativeBuildInputs = [ + openssl + perl + pkg-config + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + CoreServices + Security + ]; meta = with lib; { description = "Cargo subcommand for the client-side Web"; mainProgram = "cargo-web"; homepage = "https://github.com/koute/cargo-web"; - license = with licenses; [ asl20 /* or */ mit ]; + license = with licenses; [ + asl20 # or + mit + ]; maintainers = with maintainers; [ kevincox ]; }; } diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index 4e757c6402a3f..42b3078f4e947 100644 --- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Simple cargo plugin to get a list of features for a specific crate"; diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index 32c4730b3940d..5e0b5483e7545 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { libssh2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index f15e5bf6ff2ac..d2ef936227862 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.19.1"; + version = "0.19.3"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-AY5oq8fSF1IEvmbB5hRjo+Esz7EE9ZI4EKwtZIjbasA="; + hash = "sha256-fVsYQjv+DjGCWv/dAk8S8GcEtDIdaxb1yXAqCpTm0sQ="; }; - cargoHash = "sha256-StYEw5DvgxEojRcF0g88CTa58qUDjgNJiw6BCYKNzBY="; + cargoHash = "sha256-R5jv8hFHdhS6MoU5oHleN5B7k2RPX7GhJMwym8kYAYY="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/cargo2junit/default.nix b/pkgs/development/tools/rust/cargo2junit/default.nix deleted file mode 100644 index 907d92e3c4371..0000000000000 --- a/pkgs/development/tools/rust/cargo2junit/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ fetchCrate, lib, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "cargo2junit"; - version = "0.1.13"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-R3a87nXCnGhdeyR7409hFR5Cj3TFUWqaLNOtlXPsvto="; - }; - - cargoHash = "sha256-u5Pd967qxjqFl9fV/KkClLDBwKql7p66WqbIVBvWKuM="; - - meta = with lib; { - description = "Converts cargo's json output (from stdin) to JUnit XML (to stdout)"; - mainProgram = "cargo2junit"; - homepage = "https://github.com/johnterickson/cargo2junit"; - license = licenses.mit; - maintainers = with maintainers; [ alekseysidorov ]; - }; -} diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 95dacabcf5d2f..ff4cfdf9ef862 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-l4FgwXdibek4BAnqjWd1rLxpEwuMNjYgvo6X3SS3fRo="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeCheckInputs = [ cmake @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { "--skip lib_default_uses_debug_build" "--skip lib_explicit_debug_build" "--skip lib_explicit_release_build" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # WORKAROUND: test_body fails when using clang # https://github.com/eqrion/cbindgen/issues/628 "--skip test_body" diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/development/tools/rust/dioxus-cli/default.nix index 68632a1d6002c..148bb86601f60 100644 --- a/pkgs/development/tools/rust/dioxus-cli/default.nix +++ b/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -7,23 +7,24 @@ , cacert , openssl , darwin +, nix-update-script , testers , dioxus-cli }: rustPlatform.buildRustPackage rec { pname = "dioxus-cli"; - version = "0.5.6"; + version = "0.5.7"; src = fetchCrate { inherit pname version; - hash = "sha256-cOd8OGkmebUYw6fNLO/kja81qKwqBuVpJqCix1Izf64="; + hash = "sha256-/LeMh5WX4dvkveu5w6qBQLbtoi5yUW6iad0YatA/tMQ="; }; - cargoHash = "sha256-shllaNdg9g6fD8qRyCKpN47keFUTu0g96MzVX4BrhXI="; + cargoHash = "sha256-D6y2NiFqSf0u6icSKCRZK7ycR+GswOX627M7PEy/D6U="; nativeBuildInputs = [ pkg-config cacert ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -38,10 +39,9 @@ rustPlatform.buildRustPackage rec { "--skip=server::web::proxy::test::add_proxy_trailing_slash" ]; - passthru.tests.version = testers.testVersion { - package = dioxus-cli; - command = "${meta.mainProgram} --version"; - inherit version; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = dioxus-cli; }; }; meta = with lib; { diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index be536194d290f..dfdb3e5e008f7 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration libiconv ]; cargoHash = "sha256-bBqcHETEWooMgQeqPOZIK/77DdTtGq1JusBKoRj5K6w="; diff --git a/pkgs/development/tools/rust/humility/default.nix b/pkgs/development/tools/rust/humility/default.nix index a8c157f9ac4db..5486d0785233e 100644 --- a/pkgs/development/tools/rust/humility/default.nix +++ b/pkgs/development/tools/rust/humility/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { version = "unstable-2023-11-08"; nativeBuildInputs = [ pkg-config cargo-readme ]; - buildInputs = [ libusb1 libftdi ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libusb1 libftdi ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; diff --git a/pkgs/development/tools/rust/leptosfmt/default.nix b/pkgs/development/tools/rust/leptosfmt/default.nix index 0a6f53fa05333..ef5324d4ba37f 100644 --- a/pkgs/development/tools/rust/leptosfmt/default.nix +++ b/pkgs/development/tools/rust/leptosfmt/default.nix @@ -5,16 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "leptosfmt"; - version = "0.1.18"; + version = "0.1.30"; src = fetchFromGitHub { owner = "bram209"; repo = "leptosfmt"; - rev = version; - hash = "sha256-bNfTZgcru7PJR/9AcaOmW0E8QwdiXcuP7MWXcDPXGso="; + rev = "85b06b9a8bb0616b6a03ba43517245c79e1dd4cf"; + hash = "sha256-PiVPnni7W8SIhO6L9698RSMTD4VVTB+klLrqMzEtWWo="; + fetchSubmodules = true; }; - cargoHash = "sha256-NQYIq9Wc2mtUGeS3Iv2e0nfQkvcX6hOxZ6FHVcHD5cs="; + cargoHash = "sha256-zj81fXjDM648Y8mIb6QMmAh/ck9GGEypzuJIBWZ32r8="; meta = with lib; { description = "Formatter for the leptos view! macro"; diff --git a/pkgs/development/tools/rust/measureme/Cargo.lock b/pkgs/development/tools/rust/measureme/Cargo.lock deleted file mode 100644 index 20f1f96a10b28..0000000000000 --- a/pkgs/development/tools/rust/measureme/Cargo.lock +++ /dev/null @@ -1,1106 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "analyzeme" -version = "9.2.0" -source = "git+https://github.com/rust-lang/measureme?tag=9.2.0#9f51cde2e5dd3ef0392f0f6a7201f4946502ef41" -dependencies = [ - "byteorder", - "measureme 9.2.0", - "memchr", - "rustc-hash", - "serde", - "serde_json", -] - -[[package]] -name = "analyzeme" -version = "11.0.1" -dependencies = [ - "analyzeme 9.2.0", - "decodeme 10.1.2", - "decodeme 11.0.1", - "flate2", - "measureme 10.1.2", - "measureme 11.0.1", - "memchr", - "rustc-hash", - "serde", -] - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_derive", - "clap_lex", - "indexmap", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_derive" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crox" -version = "11.0.1" -dependencies = [ - "analyzeme 11.0.1", - "clap", - "measureme 11.0.1", - "rustc-hash", - "serde", - "serde_json", -] - -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "decodeme" -version = "10.1.2" -source = "git+https://github.com/rust-lang/measureme?tag=10.1.2#f9f84d1a79c46e9927926c177c33eb3ea3c72979" -dependencies = [ - "measureme 10.1.2", - "memchr", - "rustc-hash", - "serde", - "serde_json", -] - -[[package]] -name = "decodeme" -version = "11.0.1" -dependencies = [ - "measureme 11.0.1", - "memchr", - "rustc-hash", - "serde", - "serde_json", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "flamegraph" -version = "11.0.1" -dependencies = [ - "analyzeme 11.0.1", - "clap", - "inferno", - "measureme 11.0.1", -] - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "getrandom" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "inferno" -version = "0.11.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" -dependencies = [ - "ahash", - "is-terminal", - "itoa", - "log", - "num-format", - "once_cell", - "quick-xml", - "rgb", - "str_stack", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.3", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[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.151" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall 0.4.1", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "measureme" -version = "9.2.0" -source = "git+https://github.com/rust-lang/measureme?tag=9.2.0#9f51cde2e5dd3ef0392f0f6a7201f4946502ef41" -dependencies = [ - "log", - "memmap2", - "parking_lot 0.11.2", - "perf-event-open-sys 1.0.1", - "rustc-hash", - "smallvec", -] - -[[package]] -name = "measureme" -version = "10.1.2" -source = "git+https://github.com/rust-lang/measureme?tag=10.1.2#f9f84d1a79c46e9927926c177c33eb3ea3c72979" -dependencies = [ - "log", - "memmap2", - "parking_lot 0.12.1", - "perf-event-open-sys 3.0.0", - "rustc-hash", - "smallvec", -] - -[[package]] -name = "measureme" -version = "11.0.1" -dependencies = [ - "log", - "memmap2", - "parking_lot 0.12.1", - "perf-event-open-sys 3.0.0", - "rustc-hash", - "smallvec", -] - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memmap2" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4" -dependencies = [ - "libc", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mmedit" -version = "11.0.1" -dependencies = [ - "clap", - "decodeme 11.0.1", - "measureme 11.0.1", -] - -[[package]] -name = "mmview" -version = "11.0.1" -dependencies = [ - "analyzeme 11.0.1", - "clap", - "measureme 11.0.1", -] - -[[package]] -name = "num-format" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" -dependencies = [ - "arrayvec", - "itoa", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "perf-event-open-sys" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce9bedf5da2c234fdf2391ede2b90fabf585355f33100689bc364a3ea558561a" -dependencies = [ - "libc", -] - -[[package]] -name = "perf-event-open-sys" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b29be2ba35c12c6939f6bc73187f728bba82c3c062ecdc5fa90ea739282a1f58" -dependencies = [ - "libc", -] - -[[package]] -name = "prettytable-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" -dependencies = [ - "csv", - "encode_unicode", - "is-terminal", - "lazy_static", - "term", - "unicode-width", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quick-xml" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - -[[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.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "stack_collapse" -version = "11.0.1" -dependencies = [ - "analyzeme 11.0.1", - "clap", - "measureme 11.0.1", -] - -[[package]] -name = "str_stack" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "summarize" -version = "11.0.1" -dependencies = [ - "analyzeme 11.0.1", - "clap", - "measureme 11.0.1", - "prettytable-rs", - "rustc-hash", - "serde", - "serde_json", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "thiserror" -version = "1.0.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "version_checker" -version = "11.0.1" -dependencies = [ - "glob", - "regex", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] diff --git a/pkgs/development/tools/rust/measureme/default.nix b/pkgs/development/tools/rust/measureme/default.nix deleted file mode 100644 index 0c97a189478d2..0000000000000 --- a/pkgs/development/tools/rust/measureme/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "measureme"; - version = "11.0.1"; - - src = fetchFromGitHub { - owner = "rust-lang"; - repo = "measureme"; - rev = version; - hash = "sha256-p8XSe/LyHrEHEuxe1uK0Iy1YoJFw/jWtFvTDMhJMmnM="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "analyzeme-9.2.0" = "sha256-YOZiux4ouWBToGFx0+fiqjcyrnSjwc+8Qfi2rLGT/18="; - "decodeme-10.1.2" = "sha256-20PJnBS6TCnltRuCiYkHKJcivKGDDQUrBc70hAX89bc="; - }; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - - meta = with lib; { - description = "Support crate for rustc's self-profiling feature"; - homepage = "https://github.com/rust-lang/measureme"; - license = licenses.asl20; - maintainers = [ maintainers.t4ccer ]; - }; -} diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix index 16d8176de4eb0..3ca774d0d30fd 100644 --- a/pkgs/development/tools/rust/panamax/default.nix +++ b/pkgs/development/tools/rust/panamax/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 122e5d7477876..7fd2aafb70546 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-08-27"; - cargoHash = "sha256-zYKBNByyHjLbShhmoVTvqWe30EKVf3XBKzktZzGjifo="; + version = "2024-09-02"; + cargoHash = "sha256-t45RzYkuywGByGWwUON3dW0aKjLYcFXB8uy4CybPuf4="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-tRaJTAfFpV2y+kqf8ZzX74waPpkZ0r2EB4WIKLQAsrw="; + hash = "sha256-YH0kH5CSOnAuPUB1BUzUqvnKiv5SgDhfMNjrkki9Ahk="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optional useMimalloc cmake; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices libiconv ]; diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/development/tools/rust/rust-script/default.nix index 95f60f19011a1..d9df9404fbca3 100644 --- a/pkgs/development/tools/rust/rust-script/default.nix +++ b/pkgs/development/tools/rust/rust-script/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-script"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "fornwall"; repo = pname; rev = version; - sha256 = "sha256-a9VWPN/mTz159xKgN2RNflrcuutWXVdEFzbTIZJKgdY="; + sha256 = "sha256-uKmQgrbsFIY0XwrO16Urz3L76Gm2SxHW/CpHeCIUinM="; }; - cargoHash = "sha256-dawNgQtF9zVhlwIZzP+c5fHzcLJbCLOZx3kgIRAktTk="; + cargoHash = "sha256-WekXZ1bn2bGZu80SsEHtTY8wLwBhJsnJLu/r5GPdGzM="; # tests require network access doCheck = false; diff --git a/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix b/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix index d71b1e655d782..f5dacb999a685 100644 --- a/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix +++ b/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix @@ -41,13 +41,13 @@ rustPlatform.buildRustPackage rec { --subst-var libPath ''; in - lib.optionals stdenv.isLinux [ patchelfPatch ]; + lib.optionals stdenv.hostPlatform.isLinux [ patchelfPatch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl xz - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index b59d9d08ef23d..5824696a43ac4 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -39,13 +39,13 @@ rustPlatform.buildRustPackage rec { buildInputs = [ (curl.override { inherit openssl; }) zlib - ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security libiconv xz ]; buildFeatures = [ "no-self-update" ]; checkFeatures = [ "test" ]; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals stdenv.hostPlatform.isLinux [ (runCommand "0001-dynamically-patchelf-binaries.patch" { CC = stdenv.cc; @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec { # Random tests fail nondeterministically on macOS. # TODO: Investigate this. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # skip failing tests checkFlags = [ diff --git a/pkgs/development/tools/rust/rustycli/default.nix b/pkgs/development/tools/rust/rustycli/default.nix index 09bc2e44f7484..ce16743a07158 100644 --- a/pkgs/development/tools/rust/rustycli/default.nix +++ b/pkgs/development/tools/rust/rustycli/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-WU3lgGJH6qVDI1Un3HBqg0edqiP5sobTsAIXdnjeNTU="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index ef98fb9bd23bf..71f6b2b9ddcd7 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - hash = "sha256-amccPHkgtBm52PG6Lnv5Hyqff2O56GH6mVTmK5oi3ao="; + hash = "sha256-hxqd0TrsKANCPgQf6JUP0p1BYhZdqfnWbtCQCBxF8Gs="; }; - cargoHash = "sha256-ywKYq36G19jLg/H/OAHJv6VNSTcJ8gYUTJzE2zulKfc="; + cargoHash = "sha256-jDwfFHC19m20ECAo5VbFI6zht4gnZMYqTKsbyoVJJZU="; buildNoDefaultFeatures = true; buildFeatures = [ @@ -45,10 +45,10 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ openssl ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security SystemConfiguration diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix index 1283df16fd002..600c53e69d294 100644 --- a/pkgs/development/tools/rust/typeshare/default.nix +++ b/pkgs/development/tools/rust/typeshare/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "typeshare"; - version = "1.9.2"; + version = "1.11.0"; src = fetchFromGitHub { owner = "1password"; repo = "typeshare"; rev = "v${version}"; - hash = "sha256-ccUeIywOHZYqfo4o0rKKswFmdPcQkwD18OP9v/wkfe0="; + hash = "sha256-hzlrhawHQOM12pYAHqmkk+PPI/3tJx8rFFQ9+znv9c8="; }; - cargoHash = "sha256-mPA19+8Ti2fluOFn/oDvf62JZTtZNQRggMhf9cem5rU="; + cargoHash = "sha256-yHtKgQZlKJ/vmecjzMHkmA/0sbiNJdP0zoUSIowWttQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 562125acf0681..6d3c5434e20ac 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - patchPhase = lib.optionalString stdenv.isLinux '' + patchPhase = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${lib.makeLibraryPath [zlib]}" \ diff --git a/pkgs/development/tools/scenic-view/default.nix b/pkgs/development/tools/scenic-view/default.nix index 3fc74d7e3c737..925fc8d5b29dd 100644 --- a/pkgs/development/tools/scenic-view/default.nix +++ b/pkgs/development/tools/scenic-view/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, openjdk, openjfx, gradle_7, makeDesktopItem, makeWrapper }: let - jdk = openjdk.override (lib.optionalAttrs stdenv.isLinux { + jdk = openjdk.override (lib.optionalAttrs stdenv.hostPlatform.isLinux { enableJavaFX = true; openjfx = openjfx.override { withWebKit = true; }; }); @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { desktopItems = [ desktopItem ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications"; mainProgram = "scenic-view"; longDescription = '' diff --git a/pkgs/development/tools/sea-orm-cli/default.nix b/pkgs/development/tools/sea-orm-cli/default.nix index 98b52a55af8dc..6e9df125e3bb2 100644 --- a/pkgs/development/tools/sea-orm-cli/default.nix +++ b/pkgs/development/tools/sea-orm-cli/default.nix @@ -8,19 +8,19 @@ }: rustPlatform.buildRustPackage rec { pname = "sea-orm-cli"; - version = "0.12.15"; + version = "1.0.1"; src = fetchCrate { inherit pname version; - hash = "sha256-eRsWQXaE8zzECPY+xxVIwTylbuSPT6ABamI4WNVkw8M="; + hash = "sha256-b1Nlt3vsLDajTiIW9Vn51Tv9gXja8/ZZBD62iZjh3KY="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - cargoHash = "sha256-sIyKkTO2DSLkRAlSUSRQYrZb8UtKZrszjn2jELNOSOU="; + cargoHash = "sha256-ZGM+Y67ycBiukgEBUq+WiA1OUCGahya591gM6CGwzMQ="; meta = with lib; { homepage = "https://www.sea-ql.org/SeaORM"; diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index 0d836fe7a24d5..bcd1409b9985e 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals robloxSupport [ openssl - ] ++ lib.optionals (robloxSupport && stdenv.isDarwin) [ + ] ++ lib.optionals (robloxSupport && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/semantic-release/default.nix b/pkgs/development/tools/semantic-release/default.nix index fb8f568c31d98..f5cc94fea54b9 100644 --- a/pkgs/development/tools/semantic-release/default.nix +++ b/pkgs/development/tools/semantic-release/default.nix @@ -8,22 +8,22 @@ buildNpmPackage rec { pname = "semantic-release"; - version = "24.1.0"; + version = "24.1.2"; src = fetchFromGitHub { owner = "semantic-release"; repo = "semantic-release"; rev = "v${version}"; - hash = "sha256-k1sqr41ctlBYmN3QdoPDVajQtDGrQMlvBqGHsxBZ+8U="; + hash = "sha256-YeTKW7Aq7VLCD8FabnqDTcgvSeHNa96ZT8KQ4KNrrw4="; }; - npmDepsHash = "sha256-6I5WUUkvj5Ob9By00FpxiNMiLU5sMnqG03kHJBrndHs="; + npmDepsHash = "sha256-pyTfdVdaHi8oABhI6GoHi6HusTUMEyngGAR2Tw5bF2c="; dontNpmBuild = true; nativeBuildInputs = [ python3 - ] ++ lib.optional stdenv.isDarwin cctools; + ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; # Fixes `semantic-release --version` output postPatch = '' diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index f90c06c3eee84..5ceb744d504fd 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -11,23 +11,23 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.34.1"; + version = "2.36.3"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-TaBhYZYIoY1W+O7lMRFKlMAhoaz2emqVE9h6AB+jMbE="; + sha256 = "sha256-iqWOcGuDblFKla90w2J8gV2Fv8RjsgfG1VLuNDz4Poc="; }; doCheck = false; # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - cargoHash = "sha256-uCNlOsgrQNoHZvuoQDdxuvD4JCqi82OdGeKlphayPC8="; + cargoHash = "sha256-TIAKUoiPWlNtcL0Iu/CGLSx8dm9x0GQCtxPCg+t9zyw="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index deab8539ef142..e50986dd65021 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -31,12 +31,12 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ which pkg-config avrgcc ] - ++ lib.optional stdenv.isDarwin setupHookDarwin; + ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin; buildInputs = [ libelf libglut libGLU libGL ] - ++ lib.optional stdenv.isDarwin GLUT; + ++ lib.optional stdenv.hostPlatform.isDarwin GLUT; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* ''; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 082abb488cb78..facfb6e7c56ae 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; buildInputs = [ gpgme ] - ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ lvm2 btrfs-progs ]; buildPhase = '' runHook preBuild @@ -49,7 +49,7 @@ buildGoModule rec { runHook preInstall PREFIX=${placeholder "out"} make install-binary install-completions install-docs install ${passthru.policy}/default-policy.json -Dt $out/etc/containers - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/skopeo \ --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]} '' + '' diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix index c279425384547..a5fee4c38c241 100644 --- a/pkgs/development/tools/snazy/default.nix +++ b/pkgs/development/tools/snazy/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "snazy"; - version = "0.52.17"; + version = "0.53.0"; src = fetchFromGitHub { owner = "chmouel"; repo = pname; rev = version; - hash = "sha256-0r5xhmU9a9I+q24mjJ+C4EKK1Nw/67YThuBFibAx3Dw="; + hash = "sha256-iRoNmqZadwUxowcC/emqdGhOWMl5c1OJr/VVyxYg2h0="; }; - cargoHash = "sha256-ljYsF5lBRqiTqx9nta5h/75052GWOBJ9uJnqZkWJvwI="; + cargoHash = "sha256-e39lmGEPRU/vATcJKB89+B/STi1viP6r43X4Y2u/fe4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 50d04ba050c3f..40764df422801 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-at3krE0torhjg7G+NkX0/ewc26Sg/1t2xW7wghAAuZo="; + hash = "sha256-5swjNHeJpsCDkUVBL1uFqAzOPFzCESsYtDfRkno2bN4="; }; # The cmake options are sufficient for turning on static building, but not diff --git a/pkgs/development/tools/spr/default.nix b/pkgs/development/tools/spr/default.nix index 7ecd5dcfb2577..d7a9b4530c631 100644 --- a/pkgs/development/tools/spr/default.nix +++ b/pkgs/development/tools/spr/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Submit pull requests for individual, amendable, rebaseable commits to GitHub"; diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix index 4c5c4e6c230b9..5b357fb11ee68 100644 --- a/pkgs/development/tools/sqldef/default.nix +++ b/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.17.17"; + version = "0.17.19"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-J3qFafiMVjnJUa9bsYOxBqe3Hrsc/XDUI4p/GGO9Kmg="; + hash = "sha256-euIP6ev1qc+75MA9vlTZHY7LT03AM8hya+sPWohvCWI="; }; proxyVendor = true; - vendorHash = "sha256-cMRzDqsnQwZTSjroaXOgN4uOFCxVb2x7FT57VfN9qhk="; + vendorHash = "sha256-+5vfQoTRCbwY/Ydq21VG/xt6CeOWHIup8bxWI/2v24A="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index ec071f739efad..e7b0342ac697d 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { preConfigure = '' export SYBASE=${freetds} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace "libct.so" "libct.dylib" ''; diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/development/tools/squawk/default.nix index 5270523caf6e5..2190401c00bdc 100644 --- a/pkgs/development/tools/squawk/default.nix +++ b/pkgs/development/tools/squawk/default.nix @@ -27,10 +27,10 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libiconv openssl - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); diff --git a/pkgs/development/tools/subxt/default.nix b/pkgs/development/tools/subxt/default.nix index e239483e4a616..73907cac3731f 100644 --- a/pkgs/development/tools/subxt/default.nix +++ b/pkgs/development/tools/subxt/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { # Needed by wabt-sys nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/development/tools/summon/default.nix index 7b34ae2e6169e..db3eed974f450 100644 --- a/pkgs/development/tools/summon/default.nix +++ b/pkgs/development/tools/summon/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "summon"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "cyberark"; repo = "summon"; rev = "v${version}"; - hash = "sha256-98dgsO/33tJ4hBwCwAdJBJCzWwnpbrSZPbqa5NSNmXM="; + hash = "sha256-Y61lVqsKZiHLJF0X4DIq6U7eRXJ0+6I/dBPwXYb2GmQ="; }; vendorHash = "sha256-StcJvUtMfBh7p1sD8ucvHNJ572whRfqz3id6XsFoXtk="; diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index 5baad629a2738..d0feae3c25206 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.191.3"; + version = "1.192.5"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-8T58CrXbLxrw8TNRNB48w3zGOgBW+L/zWpsaGyWnLy8="; + hash = "sha256-heGW7SS4OOZrKCdVHoGlYS4NAu29jncwE1cMwHDYB4c="; }; vendorHash = "sha256-RiSZaNbMwOmKGzgFpeLmAjsiNg1ADMNAtMH7wHj/vlw="; diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix index c6a784f98d5bc..041f88111b002 100644 --- a/pkgs/development/tools/systemfd/default.nix +++ b/pkgs/development/tools/systemfd/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.4.2"; + version = "0.4.4"; in rustPlatform.buildRustPackage { @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { repo = "systemfd"; owner = "mitsuhiko"; rev = version; - sha256 = "sha256-MASpQJkqmKpHZzMxHqAsuVO50dHHTv74Rnbv1gLapTU="; + sha256 = "sha256-U+pBKuoMhyIOhLl1nzmxk5yFt9nOq/KZ6rx9JhalLmM="; }; - cargoHash = "sha256-zgRbaZchdqzr+E6gqltSte9dGMnjbrM7/7t0BiNn4kA="; + cargoHash = "sha256-k8FgdNVjFYO/lflVzRQUwHvdy4+eCNTnTYImdfy1GaQ="; meta = { description = "Convenient helper for passing sockets into another process"; diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix index 40956b0851cc8..d06878f0fa31a 100644 --- a/pkgs/development/tools/tailwindcss/default.nix +++ b/pkgs/development/tools/tailwindcss/default.nix @@ -18,16 +18,16 @@ let }.${system} or throwSystem; hash = { - aarch64-darwin = "sha256-8ZEfjHzAKl3zhR411+DG1dYCvH+5kjyKCaAsvGPxufM="; - aarch64-linux = "sha256-5SHOyRnJJusu07zCLg6t+Y+N9fchHrw/CDIea77p140="; - armv7l-linux = "sha256-Gww+nE22t1IGiZgMozdFt6UAARjS5GUU+TAouPCJU2s="; - x86_64-darwin = "sha256-kUQH5sENMfgL8AStspXMJfCaP+/KQ6t3i+1bqFbMndg="; - x86_64-linux = "sha256-DD4h2EeaTFP/4c/H/pZfa2DYz1l73zTbEyuMZcYUNUE="; + aarch64-darwin = "sha256-MncDpGRggZBuEdEW/06OQwdkZsPSaSgrvmElVbn+DFg="; + aarch64-linux = "sha256-2Hiv11tqeSlFx/I0VD8MOJt+AmAB5yUFqny3bT4eR+w="; + armv7l-linux = "sha256-msguyvTGQV7BC1eIMAGyIIaZk1qVz/pB8G8iQsKJAEA="; + x86_64-darwin = "sha256-PEQjSU2CBLN0Vct3sbhe9cbEJBP1jhUWpL91KFMcBn0="; + x86_64-linux = "sha256-yRzMhkL3nX21U46NaGpNwY4AqTGA9TdyCKmpPH77m2o="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "tailwindcss"; - version = "3.4.10"; + version = "3.4.13"; src = fetchurl { url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}"; diff --git a/pkgs/development/tools/taplo/default.nix b/pkgs/development/tools/taplo/default.nix index 77774a0d9a721..d353127070a8e 100644 --- a/pkgs/development/tools/taplo/default.nix +++ b/pkgs/development/tools/taplo/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/tarmac/default.nix b/pkgs/development/tools/tarmac/default.nix index 34471106d73aa..a2b03fa93cbd3 100644 --- a/pkgs/development/tools/tarmac/default.nix +++ b/pkgs/development/tools/tarmac/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/teller/default.nix b/pkgs/development/tools/teller/default.nix index 16e44c4637c6c..21eb39d6558a2 100644 --- a/pkgs/development/tools/teller/default.nix +++ b/pkgs/development/tools/teller/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; doCheck = false; diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 550553385828c..2101512886fc3 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/development/tools/trunk-io/default.nix b/pkgs/development/tools/trunk-io/default.nix deleted file mode 100644 index 8990dc9341136..0000000000000 --- a/pkgs/development/tools/trunk-io/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation (finalAttrs: { - pname = "trunk-io"; - version = "1.3.1"; - - src = fetchurl { - url = "https://trunk.io/releases/launcher/${finalAttrs.version}/trunk"; - hash = "sha256-kiUcc7RFPo7UWzEe2aQ2nrbI3GZ/zfxOlOdWw7YFoAs="; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - install -D $src $out/bin/trunk - ''; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - homepage = "https://trunk.io/"; - description = "Developer experience toolkit used to check, test, merge, and monitor code"; - license = licenses.unfree; - maintainers = with maintainers; [ aaronjheng ]; - }; -}) diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index 17cf053b98f15..9845c565196b7 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = if stdenv.isDarwin + buildInputs = if stdenv.hostPlatform.isDarwin then [ CoreServices SystemConfiguration ] else [ openssl ]; # requires network diff --git a/pkgs/development/tools/ttfb/default.nix b/pkgs/development/tools/ttfb/default.nix index c2c599f32ff71..e9bc3c11bdfb8 100644 --- a/pkgs/development/tools/ttfb/default.nix +++ b/pkgs/development/tools/ttfb/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Cdup65w31wF1RZu0g4/msHfLESrNTcuCU5kxkk0gnW8="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index d715b34661f77..d08622783bf5a 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,16 +8,16 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.97.0"; + version = "0.97.2"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-m/0LfUs9oMWSjRPkVSPyHsFw8U1Fk2SXjqfOrLYsZlI="; + hash = "sha256-6Ci1QESSN6wNpUAQoWtTyHWrGaI/3xs/jGCSkJsYC8o="; }; - vendorHash = "sha256-c8dX60GPZSNMoCaF51jLWJK+aNDmw6TdzlBYS+vSuEY="; + vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 5b386b9822634..810403d53fab8 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.21.1"; + version = "5.22.2"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-0hriMtxmqjQrR/gAdOk8RfyPQp2ZYCdyt/sMTUqC1/4="; + hash = "sha256-tC0FF6UfMCxhZRQD1ebOo3fFA1M0d5IbzFzJHUfHwBg="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix deleted file mode 100644 index 5494fd18829e4..0000000000000 --- a/pkgs/development/tools/typos/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "typos"; - version = "1.24.1"; - - src = fetchFromGitHub { - owner = "crate-ci"; - repo = pname; - rev = "v${version}"; - hash = "sha256-oQy3R9PSM8jU4qs3clxK0HmmM0Ua4pwZYxnu0d6SW+I="; - }; - - cargoHash = "sha256-z2JN5JyUIEeZInw5qpRf/Zja+7Np9YnBj3hcohFkAsc="; - - meta = with lib; { - description = "Source code spell checker"; - mainProgram = "typos"; - homepage = "https://github.com/crate-ci/typos"; - changelog = "https://github.com/crate-ci/typos/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda mgttlinger ]; - }; -} diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 84fe6d4359364..c18c8b60f6d0e 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.8.0"; + version = "3.9.1"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-TjuOsF4LFqQGx4j5j/Er97MNhVm72qlvGYZvA5vuXs8="; + sha256 = "sha256-ZNsViLT0sFnHeV3FvJFPQbJ99mgpD2rH+bZOOGPgIhA="; }; nativeBuildInputs = [ @@ -97,6 +97,9 @@ stdenv.mkDerivation rec { xorg.libXrender gnome2.GConf libcap + + # Unity Editor 6000 specific dependencies + harfbuzz ] ++ extraLibs pkgs; }; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 064f1cf6baaa0..6eb3ceca77aa7 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive -, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux +, libguestfs, qemu, writeText, withLibvirt ? stdenv.hostPlatform.isLinux , openssl }: diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index e2d14e6ccb262..2e53aa6d35fa5 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-5CbwGwZ2dt9FVBO9sW4ZWRHiYN85rIsEKjcFUa2xJ0g="; + sha256 = "sha256-/lbCSZZQensoPQbzs3ZC3H02CE6V/eOruiqPRS5vlTE="; }; vendorHash = null; diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 806adb97a9db3..34c547a461fe2 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-8Vfi/lHkaUvp6szSrqHaewXUWZ9Rb0oQdc8tuBFlvLI="; + hash = "sha256-0jED0Ju7ojqDxfEjZKmWuCfGR830/gJF5p+QtcVajIY="; }; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - cargoHash = "sha256-3HhNFcNo/TNnAOLARtVnN/Moh2/8cdW7cn7MTahR18g="; + cargoHash = "sha256-rSZe/MrJlbB0oaAsKg38mEnS3pqe9Rk4/aoRuLlOUFc="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/pkgs/development/tools/volta/default.nix b/pkgs/development/tools/volta/default.nix index 15c9c493b797a..c49145e0a9d62 100644 --- a/pkgs/development/tools/volta/default.nix +++ b/pkgs/development/tools/volta/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; HOME = "$TMPDIR"; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index fdcf2994c189d..c5331ea2475fe 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -24,15 +24,17 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-OT9VfGg3+NBVV6SCGZ+Hu9FAxGJXXT45yvt2sHDIFTA="; + hash = "sha256-FMzQpc7mwZGib544w0Dx6LeGi64cercm5oUW45raasc="; }; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config @@ -40,12 +42,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glslang libX11 libXau libXdmcp libXrandr libffi libxcb + robin-hood-hashing + spirv-headers spirv-tools vulkan-headers vulkan-utility-libraries @@ -53,11 +58,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DGLSLANG_INSTALL_DIR=${glslang}" - "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" - "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-DBUILD_LAYER_SUPPORT_FILES=ON" - "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" # Hide dev warnings that are useless for packaging "-Wno-dev" ]; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 8988424d7738a..de73c6b637641 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -46,7 +46,7 @@ buildGoModule rec { go stdenv.cc nodejs - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk ]; @@ -60,7 +60,7 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/wails \ --prefix PATH : ${lib.makeBinPath [ pkg-config go stdenv.cc nodejs ]} \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.isLinux [ gtk3 webkitgtk ])}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk ])}" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" ''; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix deleted file mode 100644 index 3b0a6c1b53ebc..0000000000000 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, nix-update-script -, nodejs -, pkg-config -, openssl -, stdenv -, curl -, Security -, version ? "0.2.93" -, hash ? "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=" -, cargoHash ? "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=" -}: - -rustPlatform.buildRustPackage rec { - pname = "wasm-bindgen-cli"; - inherit version hash cargoHash; - - src = fetchCrate { - inherit pname version hash; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - - nativeCheckInputs = [ nodejs ]; - - # tests require it to be ran in the wasm-bindgen monorepo - doCheck = false; - - meta = with lib; { - homepage = "https://rustwasm.github.io/docs/wasm-bindgen/"; - license = with licenses; [ asl20 /* or */ mit ]; - description = "Facilitating high-level interactions between wasm modules and JavaScript"; - maintainers = with maintainers; [ rizary ]; - mainProgram = "wasm-bindgen"; - }; - - passthru.updateScript = nix-update-script { }; -} diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 94c1ae6e01ed6..4b978485895db 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -1,24 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, darwin +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, + cmake, + pkg-config, + zstd, }: rustPlatform.buildRustPackage rec { pname = "wasm-pack"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-pack"; rev = "refs/tags/v${version}"; - hash = "sha256-L4mCgUPG4cgTUpCoaIUOTONBOggXn5vMyPKj48B3MMk="; + hash = "sha256-NEujk4ZPQ2xHWBCVjBCD7H6f58P4KrwCNoDHKa0d5JE="; }; - cargoHash = "sha256-mqQRQXaUW6mreE7UUEA0zhhaaGGKLRUngH9QLxcaIdY="; + cargoHash = "sha256-pFKGQcWW1/GaIIWMyWBzts4w1hMu27hTG/uUMjkfDMo="; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security ++ [ + zstd + ]; # Most tests rely on external resources and build artifacts. # Disabling check here to work with build sandboxing. @@ -28,7 +39,10 @@ rustPlatform.buildRustPackage rec { description = "Utility that builds rust-generated WebAssembly package"; mainProgram = "wasm-pack"; homepage = "https://github.com/rustwasm/wasm-pack"; - license = with licenses; [ asl20 /* or */ mit ]; + license = with licenses; [ + asl20 # or + mit + ]; maintainers = [ maintainers.dhkl ]; }; } diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 938fcba2da2e9..4ca0844821d3a 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wasmedge"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "WasmEdge"; repo = "WasmEdge"; rev = finalAttrs.version; - sha256 = "sha256-JPuJIM5OU1qCvFZEQ3gDNBZsIiJijtWLAVGp54z7lt0="; + sha256 = "sha256-70vvQGYcer3dosb1ulWO1F4xFwKwfo35l/TFSFa5idM="; }; nativeBuildInputs = [ @@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { llvmPackages.llvm libxml2 libffi - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; cmakeFlags = [ "-DWASMEDGE_BUILD_TESTS=OFF" # Tests are downloaded using git - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DWASMEDGE_FORCE_DISABLE_LTO=ON" ]; diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index b60872dce6730..aa915d89c7fae 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "-DENABLE_EDEN_SUPPORT=NO" # requires sapling (formerly known as eden), which is not packaged in nixpkgs "-DWATCHMAN_STATE_DIR=${stateDir}" "-DWATCHMAN_VERSION_OVERRIDE=${version}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { lz4 zstd libiconv - ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cargoRoot = "watchman/cli"; diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/development/tools/web-ext/default.nix index 89e3f2257ff81..5789d1e11ee2c 100644 --- a/pkgs/development/tools/web-ext/default.nix +++ b/pkgs/development/tools/web-ext/default.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "web-ext"; - version = "8.2.0"; + version = "8.3.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "web-ext"; rev = version; - hash = "sha256-5q1vB1EN+Qmss6o6qn4BAaNSwLJBhC8joFJVzncBx6k="; + hash = "sha256-Jlxfsyir1+vutfuHt6SxBkcn0PTtr9/cZzEGa6z6LU0="; }; - npmDepsHash = "sha256-MGuLCuTTUdh2L64j41K6GvCdquCDYPPPEk1Z/9R6sNA="; + npmDepsHash = "sha256-MCK1bCWZpUk2Z/+ZWsY+iUCpz+n1UEcBqkAtiBtJl0k="; npmBuildFlags = [ "--production" ]; diff --git a/pkgs/development/tools/winhelpcgi/default.nix b/pkgs/development/tools/winhelpcgi/default.nix index c2d4dd31bf1ce..51383b5b792dc 100644 --- a/pkgs/development/tools/winhelpcgi/default.nix +++ b/pkgs/development/tools/winhelpcgi/default.nix @@ -19,6 +19,6 @@ license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.shlevy ]; platforms = lib.platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/tools/worker-build/default.nix b/pkgs/development/tools/worker-build/default.nix index fd7c1e378603c..cc48ae31d39ba 100644 --- a/pkgs/development/tools/worker-build/default.nix +++ b/pkgs/development/tools/worker-build/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; buildAndTestSubdir = "worker-build"; diff --git a/pkgs/development/tools/wrangler_1/default.nix b/pkgs/development/tools/wrangler_1/default.nix index 7fc33c2dda6d9..570092b7ee484 100644 --- a/pkgs/development/tools/wrangler_1/default.nix +++ b/pkgs/development/tools/wrangler_1/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl CoreFoundation CoreServices Security libiconv ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix index ad31bcad0d7bb..7a5d7a933216e 100644 --- a/pkgs/development/tools/wxformbuilder/default.nix +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -37,21 +37,21 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ shared-mime-info ]; buildInputs = [ boost wxGTK32 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/wxFormBuilder.app $out/Applications makeWrapper $out/Applications/wxFormBuilder.app/Contents/MacOS/wxFormBuilder $out/bin/wxformbuilder diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index 8dc527c0e1f5b..e30700ca20258 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise ''; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Fix build on gcc-13 due to missing includes sed -e '1i #include <cstdint>' -i \ Libraries/libutil/Headers/libutil/Permissions.h \ @@ -48,7 +48,7 @@ in stdenv.mkDerivation { # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. sed 1i'#include <sys/sysmacros.h>' \ -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Apple Open Sourced LZFSE, but not libcompression, and it isn't # part of an impure framework we can add substituteInPlace Libraries/libcar/Sources/Rendition.cpp \ @@ -68,7 +68,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ zlib libxml2 libpng ] - ++ lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices CoreGraphics ImageIO ]; meta = with lib; { description = "Xcode-compatible build tool"; diff --git a/pkgs/development/tools/xcbuild/platforms.nix b/pkgs/development/tools/xcbuild/platforms.nix index 0108ac8ef6973..333e5471b976f 100644 --- a/pkgs/development/tools/xcbuild/platforms.nix +++ b/pkgs/development/tools/xcbuild/platforms.nix @@ -48,7 +48,7 @@ let ArchitectureSetting = "ARCHS_STANDARD_64_BIT"; } { - Identifier = if stdenv.isAarch64 then "arm64" else "x86_64"; + Identifier = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"; Type = "Architecture"; Name = "Apple Silicon or Intel 64-bit"; } diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/development/tools/xcbuild/toolchains.nix index a5e8ed28ce1e5..2da12ba7cbcbe 100644 --- a/pkgs/development/tools/xcbuild/toolchains.nix +++ b/pkgs/development/tools/xcbuild/toolchains.nix @@ -59,7 +59,7 @@ runCommand "Toolchains" {} ('' ln -s ${buildPackages.gperf}/bin/gperf $toolchain/bin/gperf ln -s ${buildPackages.indent}/bin/indent $toolchain/bin/indent ln -s ${buildPackages.ctags}/bin/ctags $toolchain/bin/ctags -'' + optionalString stdenv.isDarwin '' +'' + optionalString stdenv.hostPlatform.isDarwin '' for bin in ${getBin buildPackages.cctools}/bin/*; do if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then ln -s $bin $toolchain/bin diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/development/tools/yarn-berry/default.nix index 79f3143ef318e..0f0e7c7f81eca 100644 --- a/pkgs/development/tools/yarn-berry/default.nix +++ b/pkgs/development/tools/yarn-berry/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yarn-berry"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; rev = "@yarnpkg/cli/${finalAttrs.version}"; - hash = "sha256-bkhPdnRImeYBd0yY+iRYXk1KELyCWZusSmVGl2tbM+s="; + hash = "sha256-OTCFUoEgj1kY8QSqaYIqtSoWBYR0i0ao2dNRBhijEzc="; }; buildInputs = [ diff --git a/pkgs/development/tools/yo/default.nix b/pkgs/development/tools/yo/default.nix index ded4b5d0202a2..b3857d44a470f 100644 --- a/pkgs/development/tools/yo/default.nix +++ b/pkgs/development/tools/yo/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "yo"; - version = "4.3.1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "yeoman"; repo = "yo"; rev = "v${version}"; - hash = "sha256-vnvcg3hvAYcqS11enBEHtpTwTOy4puY5i/6zPOHCywo="; + hash = "sha256-0UkDANW58OZcEXGAgZ0Omob2AWyO6WszbN1nHLavdsM="; }; - npmDepsHash = "sha256-QkEPaepvI6NfEEmqnVA4Xx/tByn6goyGWVpoJNMigd8="; + npmDepsHash = "sha256-z0ZYrIk7FJXBsZJ72LiBWXJMI7FrCP/EjSTgqis+zIs="; dontNpmBuild = true; diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index 8adf786836c90..a567ce7f474b2 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "zed"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bafX3i6jEMqYB4YCpIX4z4SgQbJjryGmZ6pvqtVrk3A="; + sha256 = "sha256-NCoeTeOkxkCsj/nRBhMJeEshFuwozOXNJvgp8vyCQDk="; }; - vendorHash = "sha256-X1rE6/sgpB6jeTjLZJL/a7ghjRJYTXSQDHB4PmEFUmU="; + vendorHash = "sha256-E9CXS3BQAglJV36BPgwhkb9SswxAj/yBcGqJ+XXwTmE="; subPackages = [ "cmd/zed" "cmd/zq" ]; diff --git a/pkgs/development/web/boa/default.nix b/pkgs/development/web/boa/default.nix index 122e0df08aa47..9f695ff7d7939 100644 --- a/pkgs/development/web/boa/default.nix +++ b/pkgs/development/web/boa/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 openssl zstd ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 0cc03477db96c..6e187aa3fe038 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,13 +12,13 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.20"; + version = "1.1.29"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); strictDeps = true; - nativeBuildInputs = [ unzip installShellFiles ] ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = [ unzip installShellFiles ] ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ openssl ]; dontConfigure = true; @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-ErutjiXBjC9GDvb0F39AgbbsSo6zhRzpDEvDor/xRbI="; + hash = "sha256-RSMuealmdHe7qGFwhK9e51TED3PaCwSqzd4aj2RKMxE="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-vqL/H5t0elgT9fSk0Op7Td69eP9WPY2XVo1a8sraTwM="; + hash = "sha256-gY+MDJqDjQamxQsk/CJJVuHsBAfwgrebs/h6nI0HV78="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-5PLk8q3di5TW8HUfo7P3xrPWLhleAiSv9jp2XeL47Kk="; + hash = "sha256-j5jpgofGcfjto/3CtBsC4QV411lUGdk2wHwLGmLduo4="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-bLcK0DSaLOzJSrIRPNHQeld5qud8ccqxzyDIgawMB3U="; + hash = "sha256-RnKczYB/IkUYVBnRktCFhHsmvObQovVMfCilqJq3q1g="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 7ab1cfa4d6b4c..2f3b8cf20808d 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -4,13 +4,15 @@ , gtk2 , gtk3 , lib +, buildPackages +, makeShellWrapper , mesa , nss , stdenv , udev , unzip -, wrapGAppsHook3 , xorg +, darwin }: let @@ -23,6 +25,10 @@ let platform = "linux-arm64"; checksum = "sha256-rB0ak6jYnJMb0aHDLAyhaGoOFK4FXDLEOeofNdW/Wk8="; }; + aarch64-darwin = { + platform = "darwin-arm64"; + checksum = "sha256-L2rhtB/DIK7Qum2YNoWVBn4mf+DA3rbcBUfZEEa/C8c="; + }; }; inherit (stdenv.hostPlatform) system; binary = availableBinaries.${system} or (throw "cypress: No binaries available for system ${system}"); @@ -34,27 +40,47 @@ in stdenv.mkDerivation rec { src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip"; sha256 = checksum; + stripRoot = !stdenv.isDarwin; }; # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook3 unzip ]; + nativeBuildInputs = + [ + unzip + makeShellWrapper + ] + ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) + ]; + - buildInputs = with xorg; [ + buildInputs = lib.optionals stdenv.isLinux (with xorg; [ libXScrnSaver libXdamage libXtst libxshmfence - ] ++ [ nss gtk2 alsa-lib gtk3 mesa # for libgbm - ]; + ]) ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa + CoreServices + CoreMedia + CoreAudio + AudioToolbox + AVFoundation + Foundation + ApplicationServices + ]); - runtimeDependencies = [ (lib.getLib udev) ]; + runtimeDependencies = lib.optional stdenv.isLinux (lib.getLib udev); installPhase = '' runHook preInstall @@ -67,11 +93,20 @@ in stdenv.mkDerivation rec { printf '{"version":"%b"}' $version > $out/bin/resources/app/package.json # Cypress now looks for binary_state.json in bin echo '{"verified": true}' > $out/binary_state.json - ln -s $out/opt/cypress/Cypress $out/bin/Cypress - + ${if stdenv.isDarwin then '' + ln -s $out/opt/cypress/Cypress.app/Contents/MacOS/Cypress $out/bin/cypress + '' else '' + ln -s $out/opt/cypress/Cypress $out/bin/cypress + ''} runHook postInstall ''; + postFixup = lib.optionalString (!stdenv.isDarwin) '' + # exit with 1 after 25.05 + makeWrapper $out/opt/cypress/Cypress $out/bin/Cypress \ + --run 'echo "Warning: Use the lowercase cypress executable instead of the capitalized one."' + ''; + passthru = { updateScript = ./update.sh; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix deleted file mode 100644 index 90fcceedbd067..0000000000000 --- a/pkgs/development/web/deno/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ stdenv -, lib -, callPackage -, fetchFromGitHub -, rustPlatform -, cmake -, protobuf -, installShellFiles -, libiconv -, darwin -, librusty_v8 ? callPackage ./librusty_v8.nix { } -, -}: -rustPlatform.buildRustPackage rec { - pname = "deno"; - version = "1.45.5"; - - src = fetchFromGitHub { - owner = "denoland"; - repo = pname; - rev = "v${version}"; - hash = "sha256-hV//IH9PoAS9vt7uESBAyD6KYhZdCQuMx4NtB+BaBss="; - }; - - cargoHash = "sha256-TopzwlyvaDnZ3J2oDz9a27Fw3aRM000IcvKBykDPytU="; - - postPatch = '' - # upstream uses lld on aarch64-darwin for faster builds - # within nix lld looks for CoreFoundation rather than CoreFoundation.tbd and fails - substituteInPlace .cargo/config.toml --replace "-fuse-ld=lld " "" - ''; - - # uses zlib-ng but can't dynamically link yet - # https://github.com/rust-lang/libz-sys/issues/158 - nativeBuildInputs = [ - # required by libz-ng-sys crate - cmake - # required by deno_kv crate - protobuf - installShellFiles - ]; - buildInputs = lib.optionals stdenv.isDarwin ( - [ libiconv darwin.libobjc ] - ++ (with darwin.apple_sdk_11_0.frameworks; [ - Security - CoreServices - Metal - MetalPerformanceShaders - Foundation - QuartzCore - ]) - ); - - # work around "error: unknown warning group '-Wunused-but-set-parameter'" - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option"; - - buildAndTestSubdir = "cli"; - - # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem - # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE - RUSTY_V8_ARCHIVE = librusty_v8; - - # Tests have some inconsistencies between runs with output integration tests - # Skipping until resolved - doCheck = false; - - preInstall = '' - find ./target -name libswc_common${stdenv.hostPlatform.extensions.sharedLibrary} -delete - ''; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd deno \ - --bash <($out/bin/deno completions bash) \ - --fish <($out/bin/deno completions fish) \ - --zsh <($out/bin/deno completions zsh) - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/deno --help - $out/bin/deno --version | grep "deno ${version}" - runHook postInstallCheck - ''; - - passthru.updateScript = ./update/update.ts; - passthru.tests = callPackage ./tests { }; - - meta = with lib; { - homepage = "https://deno.land/"; - changelog = "https://github.com/denoland/deno/releases/tag/v${version}"; - description = "Secure runtime for JavaScript and TypeScript"; - longDescription = '' - Deno aims to be a productive and secure scripting environment for the modern programmer. - Deno will always be distributed as a single executable. - Given a URL to a Deno program, it is runnable with nothing more than the ~15 megabyte zipped executable. - Deno explicitly takes on the role of both runtime and package manager. - It uses a standard browser-compatible protocol for loading modules: URLs. - Among other things, Deno is a great replacement for utility scripts that may have been historically written with - bash or python. - ''; - license = licenses.mit; - mainProgram = "deno"; - maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - }; -} diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix deleted file mode 100644 index 43bd7d9ef9fa1..0000000000000 --- a/pkgs/development/web/deno/librusty_v8.nix +++ /dev/null @@ -1,23 +0,0 @@ -# auto-generated file -- DO NOT EDIT! -{ lib, stdenv, fetchurl }: - -let - fetch_librusty_v8 = args: fetchurl { - name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; - sha256 = args.shas.${stdenv.hostPlatform.system}; - meta = { - inherit (args) version; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; - }; -in -fetch_librusty_v8 { - version = "0.99.0"; - shas = { - x86_64-linux = "sha256-rXAxKDTDB7tU5T6tf7XQUEAbDD2PXfzU+0bgA6WOsOQ="; - aarch64-linux = "sha256-4V3EtxH+rGsJzam57OByLlB0D1xtnSz+1P34EfaIry4="; - x86_64-darwin = "sha256-fYo8B9uMS6ElPA+4A3wLQvuLH2dqar6hGhpOTvnKK7s="; - aarch64-darwin = "sha256-vh/fitDe3s0AoncO9nlJPNTMLQhWuJnYzFHsYdmERrU="; - }; -} diff --git a/pkgs/development/web/edge-runtime/default.nix b/pkgs/development/web/edge-runtime/default.nix index 7a51944a4ff31..891c4ca303ca3 100644 --- a/pkgs/development/web/edge-runtime/default.nix +++ b/pkgs/development/web/edge-runtime/default.nix @@ -33,8 +33,8 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security CoreFoundation SystemConfiguration ]); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security CoreFoundation SystemConfiguration ]); # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 03485e92ea95f..95b5e7551393c 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.120"; + version = "0.3.10"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-n+EWwjz4+zmwqDGzBRi2rtnxe+mxd906JcqtrbGiz4w="; + hash = "sha256-xg26di6ceko6QUVciy1BLNC7hMEf4I1HRHmRCrdd4vc="; }; - vendorHash = "sha256-RtHTAigoPlmop9XURD1nw1nCkGJCdYwFUnp5AWp3x3M="; + vendorHash = "sha256-N/evH8AiTHzO2fXJM3j4vIfSvAuiCc2IWpVcuRU7zlY="; subPackages = [ "." ]; diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/development/web/function-runner/default.nix index 62809d6a32bb7..6ea238f53523f 100644 --- a/pkgs/development/web/function-runner/default.nix +++ b/pkgs/development/web/function-runner/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "function-runner"; - version = "5.1.4"; + version = "6.2.1"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nKOgXUwhOHaOnxycTsEReS/4y9DNpyqDKz7ohfAaJ3U="; + sha256 = "sha256-5X/d6phYXmJcCacHvGkk5o/J91SdlFamxJrqc5X/Y4Y="; }; - cargoHash = "sha256-UDeHNIw7e+3zXO9Hggq3pVSDDp6iSoO8ikOl6RxZyb0="; + cargoHash = "sha256-D6BTP/a3wOpcOLnGUASyBL3pzAieAllLzEZuaEv2Oco="; meta = with lib; { description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 9317dbe8f4e95..2e886e195c497 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -6,16 +6,16 @@ }: let pname = "insomnia"; - version = "9.0.0"; + version = "10.0.0"; src = fetchurl { x86_64-darwin = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; - hash = "sha256-QIArPdThQcNTUgrXpWP8JHaZfrZ/6ztekIvzFdoWjsY="; + hash = "sha256-HYEZzLDV2T4ugCjIeskS5SkrQlu5nQt1S0RG9R/rlcs="; }; x86_64-linux = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage"; - hash = "sha256-2UiqopYmNxnDcIqQMn/H89ugvOtTWkHH4LrmKkQErSs="; + hash = "sha256-hElisKB1C1By8lCCgNqNr6bIOMKqMG3UyBQ6jYu8yNg="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); @@ -29,7 +29,7 @@ let maintainers = with maintainers; [ markus1189 kashw2 DataHearth ]; }; in -if stdenv.isDarwin then stdenv.mkDerivation { +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname version src meta; sourceRoot = "."; diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 84bfc654c7733..7732ce9f4822b 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ libbsd ] ; + buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libbsd ] ; dontAddPrefix = true; installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://kristaps.bsd.lv/kcgi"; description = "Minimal CGI and FastCGI library for C/C++"; license = licenses.isc; diff --git a/pkgs/development/web/netlify-cli/composition.nix b/pkgs/development/web/netlify-cli/composition.nix index 2e54104d7dce4..4bd736ddc723c 100644 --- a/pkgs/development/web/netlify-cli/composition.nix +++ b/pkgs/development/web/netlify-cli/composition.nix @@ -8,7 +8,7 @@ let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/development/web/netlify-cli/node-env.nix b/pkgs/development/web/netlify-cli/node-env.nix index bc1e36628ac8a..eb94495aeba31 100644 --- a/pkgs/development/web/netlify-cli/node-env.nix +++ b/pkgs/development/web/netlify-cli/node-env.nix @@ -499,8 +499,8 @@ let stdenv.mkDerivation ({ name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux + ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -591,8 +591,8 @@ let name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux + ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -662,7 +662,7 @@ let stdenv.mkDerivation ({ name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF diff --git a/pkgs/development/web/netlify-cli/test.nix b/pkgs/development/web/netlify-cli/test.nix index d25c6c48936b0..5acd4f1046d56 100644 --- a/pkgs/development/web/netlify-cli/test.nix +++ b/pkgs/development/web/netlify-cli/test.nix @@ -11,7 +11,7 @@ runCommand "netlify-cli-test" { nativeBuildInputs = [ netlify-cli curl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.ps ]; meta.timeout = 600; diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 1aa0fbf72e8d1..bb2a446d6eefa 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -12,8 +12,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.16.0"; - sha256 = "cd6c8fc3ff2606aadbc7155db6f7e77247d2d0065ac18e2f7f049095584b8b46"; + version = "20.17.0"; + sha256 = "9abf03ac23362c60387ebb633a516303637145cb3c177be3348b16880fd8b28c"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -21,13 +21,5 @@ buildNodejs { ./bypass-darwin-xcrun-node16.patch ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/87598d4b63ef2c827a2bebdfa0f1540c35718519.patch"; - hash = "sha256-efRJ2nN9QXaT91SQTB+ESkHvXtBq30Cb9BEDEZU9M/8="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch"; - hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k="; - }) ] ++ gypPatches; } diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 9724d70c2b517..90174977ffa90 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -12,8 +12,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.6.0"; - sha256 = "37259d618d5565ca55acc2585045c7e1c5b9965a3d4eb44c0a237fdae84b9d44"; + version = "22.8.0"; + sha256 = "f130e82176d1ee0702d99afc1995d0061bf8ed357c38834a32a08c9ef74f1ac7"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch diff --git a/pkgs/development/web/playwright-test/default.nix b/pkgs/development/web/playwright-test/default.nix deleted file mode 100644 index e59fd8a77f515..0000000000000 --- a/pkgs/development/web/playwright-test/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import <nixpkgs> { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin or pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/development/web/playwright-test/node-env.nix b/pkgs/development/web/playwright-test/node-env.nix deleted file mode 100644 index bc1e36628ac8a..0000000000000 --- a/pkgs/development/web/playwright-test/node-env.nix +++ /dev/null @@ -1,689 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <<EOF - #! ${stdenv.shell} -e - $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore - EOF - - chmod +x $out/bin/tar - ''; - - # Function that generates a TGZ file from a NPM project - buildNodeSourceDist = - { name, version, src, ... }: - - stdenv.mkDerivation { - name = "node-tarball-${name}-${version}"; - inherit src; - buildInputs = [ nodejs ]; - buildPhase = '' - export HOME=$TMPDIR - tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) - ''; - installPhase = '' - mkdir -p $out/tarballs - mv $tgzFile $out/tarballs - mkdir -p $out/nix-support - echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - cd "$DIR/$packageName" - } - ''; - - # Bundle the dependencies of the package - # - # Only include dependencies if they don't exist. They may also be bundled in the package. - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) ( - '' - mkdir -p node_modules - cd node_modules - '' - + (lib.concatMapStrings (dependency: - '' - if [ ! -e "${dependency.packageName}" ]; then - ${composePackage dependency} - fi - '' - ) dependencies) - + '' - cd .. - '' - ); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - installPackage "${packageName}" "${src}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - else { - packageObj.devDependencies = {}; - } - replaceDependencies(packageObj.optionalDependencies); - replaceDependencies(packageObj.peerDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "reconstructpackagelock.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 2, - requires: true, - packages: { - "": { - name: packageObj.name, - version: packageObj.version, - license: packageObj.license, - bin: packageObj.bin, - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - } - }, - dependencies: {} - }; - - function augmentPackageJSON(filePath, packages, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - packages[filePath] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - }; - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, packages, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, packages, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, packages, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.packages, lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - # Script that links bins defined in package.json to the node_modules bin directory - # NPM does not do this for top-level packages itself anymore as of v7 - linkBinsScript = writeTextFile { - name = "linkbins.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); - - if(packageObj.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - if(typeof packageObj.bin == "object") { - Object.keys(packageObj.bin).forEach(function(exe) { - if(fs.existsSync(packageObj.bin[exe])) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin[exe]), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - else { - if(fs.existsSync(packageObj.bin)) { - console.log("linking bin '" + packageObj.bin + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin), - path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) - ); - } - else { - console.log("skipping non-existent bin '" + packageObj.bin + "'"); - } - } - } - else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { - if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.directories.bin, exe), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - runHook postRebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install - fi - - # Link executables defined in package.json - node ${linkBinsScript} - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version ? null - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - - # Fixup all executables - ls $out/bin/* | while read i - do - file="$(readlink -f "$i")" - chmod u+rwx "$file" - if isScript "$file" - then - sed -i 's/\r$//' "$file" # convert crlf to lf - fi - done - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - chmod 644 package-lock.json - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell <<EOF - #! ${stdenv.shell} -e - $shellHook - exec ${stdenv.shell} - EOF - chmod +x $out/bin/shell - ''; - - # Provide the dependencies in a development shell through the NODE_PATH environment variable - inherit nodeDependencies; - shellHook = lib.optionalString (dependencies != []) '' - export NODE_PATH=${nodeDependencies}/lib/node_modules - export PATH="${nodeDependencies}/bin:$PATH" - ''; - } // extraArgs); -in -{ - buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; - buildNodePackage = lib.makeOverridable buildNodePackage; - buildNodeDependencies = lib.makeOverridable buildNodeDependencies; - buildNodeShell = lib.makeOverridable buildNodeShell; -} diff --git a/pkgs/development/web/playwright-test/node-packages.json b/pkgs/development/web/playwright-test/node-packages.json deleted file mode 100644 index 1da87aa5b4ef6..0000000000000 --- a/pkgs/development/web/playwright-test/node-packages.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - {"@playwright/test": "1.40.0"} -] diff --git a/pkgs/development/web/playwright-test/node-packages.nix b/pkgs/development/web/playwright-test/node-packages.nix deleted file mode 100644 index 978ac1219b4d3..0000000000000 --- a/pkgs/development/web/playwright-test/node-packages.nix +++ /dev/null @@ -1,50 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "playwright-1.40.0" = { - name = "playwright"; - packageName = "playwright"; - version = "1.40.0"; - src = fetchurl { - url = "https://registry.npmjs.org/playwright/-/playwright-1.40.0.tgz"; - sha512 = "gyHAgQjiDf1m34Xpwzaqb76KgfzYrhK7iih+2IzcOCoZWr/8ZqmdBw+t0RU85ZmfJMgtgAiNtBQ/KS2325INXw=="; - }; - }; - "playwright-core-1.40.0" = { - name = "playwright-core"; - packageName = "playwright-core"; - version = "1.40.0"; - src = fetchurl { - url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.40.0.tgz"; - sha512 = "fvKewVJpGeca8t0ipM56jkVSU6Eo0RmFvQ/MaCQNDYm+sdvKkMBBWTE1FdeMqIdumRaXXjZChWHvIzCGM/tA/Q=="; - }; - }; - }; -in -{ - "@playwright/test-1.40.0" = nodeEnv.buildNodePackage { - name = "_at_playwright_slash_test"; - packageName = "@playwright/test"; - version = "1.40.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@playwright/test/-/test-1.40.0.tgz"; - sha512 = "PdW+kn4eV99iP5gxWNSDQCbhMaDVej+RXL5xr6t04nbKLCBwYtA046t7ofoczHOm8u6c+45hpDKQVZqtqwkeQg=="; - }; - dependencies = [ - sources."playwright-1.40.0" - sources."playwright-core-1.40.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "High-level API to automate web browsers"; - homepage = "https://playwright.dev"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} diff --git a/pkgs/development/web/playwright-test/wrapped.nix b/pkgs/development/web/playwright-test/wrapped.nix deleted file mode 100644 index 1557b80765f72..0000000000000 --- a/pkgs/development/web/playwright-test/wrapped.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, callPackage -, buildNpmPackage -, fetchurl -, python3 -, playwright-driver -, makeWrapper -}: -let - driver = playwright-driver; - browsers = playwright-driver.browsers; - - - # nodeDependencies / package / shell - playwright-test-raw = (callPackage ./default.nix { })."@playwright/test-${driver.version}"; - - playwright-test = playwright-test-raw.overrideAttrs (oa: { - nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ - makeWrapper - ]; - postInstall = '' - # you need to set both the path and version else playwright looks into the wrong one - wrapProgram $out/bin/playwright \ - --set-default PLAYWRIGHT_BROWSERS_PATH "${browsers}" \ - --prefix NODE_PATH : ${placeholder "out"}/lib/node_modules - ''; - }); -in - playwright-test diff --git a/pkgs/development/web/playwright/browsers.json b/pkgs/development/web/playwright/browsers.json new file mode 100644 index 0000000000000..e7fb77faf27ee --- /dev/null +++ b/pkgs/development/web/playwright/browsers.json @@ -0,0 +1,28 @@ +{ + "comment": "This file is kept up to date via update.sh", + "browsers": { + "chromium": { + "revision": "1134", + "browserVersion": "129.0.6668.29" + }, + "firefox": { + "revision": "1463", + "browserVersion": "130.0" + }, + "webkit": { + "revision": "2070", + "revisionOverrides": { + "mac10.14": "1446", + "mac10.15": "1616", + "mac11": "1816", + "mac11-arm64": "1816", + "mac12": "2009", + "mac12-arm64": "2009" + }, + "browserVersion": "18.0" + }, + "ffmpeg": { + "revision": "1010" + } + } +} diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix new file mode 100644 index 0000000000000..709cef5c5ca41 --- /dev/null +++ b/pkgs/development/web/playwright/chromium.nix @@ -0,0 +1,24 @@ +{ + runCommand, + makeWrapper, + fontconfig_file, + chromium, + ... +}: +runCommand "playwright-chromium" + { + nativeBuildInputs = [ + makeWrapper + ]; + } + '' + mkdir -p $out/chrome-linux + + # See here for the Chrome options: + # https://github.com/NixOS/nixpkgs/issues/136207#issuecomment-908637738 + # We add --disable-gpu to be able to run in gpu-less environments such + # as headless nixos test vms. + makeWrapper ${chromium}/bin/chromium $out/chrome-linux/chrome \ + --set-default SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \ + --set-default FONTCONFIG_FILE ${fontconfig_file} + '' diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index a4fe8272be4c9..12db713de82d7 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -1,101 +1,214 @@ -{ lib -, stdenv -, chromium -, ffmpeg -, git -, jq -, nodejs -, fetchurl -, makeFontsConf -, makeWrapper -, runCommand -, unzip -, cacert +{ + lib, + buildNpmPackage, + stdenv, + chromium, + ffmpeg, + jq, + nodejs, + fetchFromGitHub, + linkFarm, + callPackage, + makeFontsConf, + makeWrapper, + runCommand, + cacert, }: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; - - driver = stdenv.mkDerivation (finalAttrs: - let - suffix = { - x86_64-linux = "linux"; - aarch64-linux = "linux-arm64"; - x86_64-darwin = "mac"; - aarch64-darwin = "mac-arm64"; - }.${system} or throwSystem; - filename = "playwright-${finalAttrs.version}-${suffix}.zip"; - in + suffix = { - pname = "playwright-driver"; - # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.40.0"; - - src = fetchurl { - url = "https://playwright.azureedge.net/builds/driver/${filename}"; - sha256 = { - x86_64-linux = "0y9n23r4yfcgm4a50rfgicl91vrllak0d8h26yagh6h8hl0r3nhh"; - aarch64-linux = "0zd456klidi4sg7wahfrdbs2bwiq3q6ngxd4iv3vi9f9w9nq2p2k"; - x86_64-darwin = "0yaiwg9821w9nszzkrp5skzf5792nahvfqnr4axk84dcngslxvmk"; - aarch64-darwin = "1b1jmv6l97ss8c4sc3n1xckn05fpq3fihjbjxr2qz6i9dsy3xj57"; - }.${system} or throwSystem; - }; + x86_64-linux = "linux"; + aarch64-linux = "linux-arm64"; + x86_64-darwin = "mac"; + aarch64-darwin = "mac-arm64"; + } + .${system} or throwSystem; + + version = "1.47.0"; + + src = fetchFromGitHub { + owner = "Microsoft"; + repo = "playwright"; + rev = "v${version}"; + hash = "sha256-cKjVDy1wFo8NlF8v+8YBuQUF2OUYjCmv27uhEoVUrno="; + }; + + babel-bundle = buildNpmPackage { + pname = "babel-bundle"; + inherit version src; + sourceRoot = "${src.name}/packages/playwright/bundles/babel"; + npmDepsHash = "sha256-HrDTkP2lHl2XKD8aGpmnf6YtSe/w9UePH5W9QfbaoMg="; + dontNpmBuild = true; + installPhase = '' + cp -r . "$out" + ''; + }; + expect-bundle = buildNpmPackage { + pname = "expect-bundle"; + inherit version src; + sourceRoot = "${src.name}/packages/playwright/bundles/expect"; + npmDepsHash = "sha256-qnFx/AQZtmxNFrrabfOpsWy6I64DFJf3sWrJzL1wfU4="; + dontNpmBuild = true; + installPhase = '' + cp -r . "$out" + ''; + }; + utils-bundle = buildNpmPackage { + pname = "utils-bundle"; + inherit version src; + sourceRoot = "${src.name}/packages/playwright/bundles/utils"; + npmDepsHash = "sha256-d+nE11x/493BexI70mVbnZFLQClU88sscbNwruXjx1M="; + dontNpmBuild = true; + installPhase = '' + cp -r . "$out" + ''; + }; + utils-bundle-core = buildNpmPackage { + pname = "utils-bundle-core"; + inherit version src; + sourceRoot = "${src.name}/packages/playwright-core/bundles/utils"; + npmDepsHash = "sha256-aktxEDQKxsDcInyjDKDuIu4zwtrAH0lRda/mP1IayPA="; + dontNpmBuild = true; + installPhase = '' + cp -r . "$out" + ''; + }; + zip-bundle = buildNpmPackage { + pname = "zip-bundle"; + inherit version src; + sourceRoot = "${src.name}/packages/playwright-core/bundles/zip"; + npmDepsHash = "sha256-62Apz8uX6d4HKDqQxR6w5Vs31tl63McWGPwT6s2YsBE="; + dontNpmBuild = true; + installPhase = '' + cp -r . "$out" + ''; + }; + + playwright = buildNpmPackage { + pname = "playwright"; + inherit version src; + + sourceRoot = "${src.name}"; # update.sh depends on sourceRoot presence + npmDepsHash = "sha256-FaDTJmIiaaOCvq6tARfiWX5IBTTNOJ/iVkRsO4D8aqc="; - sourceRoot = "."; + nativeBuildInputs = [ cacert ]; - nativeBuildInputs = [ unzip ]; + ELECTRON_SKIP_BINARY_DOWNLOAD = true; postPatch = '' - # Use Nix's NodeJS instead of the bundled one. - substituteInPlace playwright.sh --replace '"$SCRIPT_PATH/node"' '"${nodejs}/bin/node"' - rm node + sed -i '/\/\/ Update test runner./,/^\s*$/{d}' utils/build/build.js + sed -i '/\/\/ Update bundles./,/^\s*$/{d}' utils/build/build.js + sed -i '/execSync/d' ./utils/generate_third_party_notice.js + sed -i '/plugins: /d' ./packages/playwright/bundles/utils/build.js + sed -i '/plugins: /d' ./packages/playwright-core/bundles/zip/build.js + chmod +w packages/playwright/bundles/babel + ln -s ${babel-bundle}/node_modules packages/playwright/bundles/babel/node_modules + chmod +w packages/playwright/bundles/expect + ln -s ${expect-bundle}/node_modules packages/playwright/bundles/expect/node_modules + chmod +w packages/playwright/bundles/utils + ln -s ${utils-bundle}/node_modules packages/playwright/bundles/utils/node_modules + chmod +w packages/playwright-core/bundles/utils + ln -s ${utils-bundle-core}/node_modules packages/playwright-core/bundles/utils/node_modules + chmod +w packages/playwright-core/bundles/zip + ln -s ${zip-bundle}/node_modules packages/playwright-core/bundles/zip/node_modules + ''; + + installPhase = '' + runHook preInstall + + shopt -s extglob + + mkdir -p "$out/lib" + cp -r packages/playwright/node_modules "$out/lib/node_modules" + + mkdir -p "$out/lib/node_modules/playwright" + cp -r packages/playwright/!(bundles|src|node_modules|.*) "$out/lib/node_modules/playwright" - # Hard-code the script path to $out directory to avoid a dependency on coreutils - substituteInPlace playwright.sh \ - --replace 'SCRIPT_PATH="$(cd "$(dirname "$0")" ; pwd -P)"' "SCRIPT_PATH=$out" + mkdir -p "$out/lib/node_modules/playwright-core" + cp -r packages/playwright-core/!(bundles|src|bin|.*) "$out/lib/node_modules/playwright-core" - patchShebangs playwright.sh package/bin/*.sh + mkdir -p "$out/lib/node_modules/@playwright/test" + cp -r packages/playwright-test/* "$out/lib/node_modules/@playwright/test" + + runHook postInstall ''; + meta = { + description = "Framework for Web Testing and Automation"; + homepage = "https://playwright.dev"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kalekseev ]; + inherit (nodejs.meta) platforms; + }; + }; + + playwright-core = stdenv.mkDerivation (finalAttrs: { + pname = "playwright-core"; + inherit (playwright) version src meta; + installPhase = '' runHook preInstall - mkdir -p $out/bin - mv playwright.sh $out/bin/playwright - mv package $out/ + cp -r ${playwright}/lib/node_modules/playwright-core "$out" runHook postInstall ''; passthru = { - inherit filename; - browsers = { - x86_64-linux = browsers-linux { }; - aarch64-linux = browsers-linux { }; - x86_64-darwin = browsers-mac; - aarch64-darwin = browsers-mac; - }.${system} or throwSystem; - browsers-chromium = browsers-linux {}; + browsersJSON = (lib.importJSON ./browsers.json).browsers; + browsers = + { + x86_64-linux = browsers-linux { }; + aarch64-linux = browsers-linux { }; + x86_64-darwin = browsers-mac; + aarch64-darwin = browsers-mac; + } + .${system} or throwSystem; + browsers-chromium = browsers-linux { }; + }; + }); + + playwright-test = stdenv.mkDerivation (finalAttrs: { + pname = "playwright-test"; + inherit (playwright) version src; + + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' + runHook preInstall + + shopt -s extglob + mkdir -p $out/bin + cp -r ${playwright}/* $out + + makeWrapper "${nodejs}/bin/node" "$out/bin/playwright" \ + --add-flags "$out/lib/node_modules/@playwright/test/cli.js" \ + --prefix NODE_PATH : ${placeholder "out"}/lib/node_modules \ + --set-default PLAYWRIGHT_BROWSERS_PATH "${playwright-core.passthru.browsers}" + + runHook postInstall + ''; + + meta = playwright.meta // { + mainProgram = "playwright"; }; - meta.mainProgram = "playwright"; }); browsers-mac = stdenv.mkDerivation { pname = "playwright-browsers"; - inherit (driver) version; + inherit (playwright) version; dontUnpack = true; - nativeBuildInputs = [ - cacert - ]; + nativeBuildInputs = [ cacert ]; installPhase = '' runHook preInstall export PLAYWRIGHT_BROWSERS_PATH=$out - ${driver}/bin/playwright install + ${playwright-core}/cli.js install rm -r $out/.links runHook postInstall @@ -104,33 +217,50 @@ let meta.platforms = lib.platforms.darwin; }; - browsers-linux = { withChromium ? true }: let - fontconfig = makeFontsConf { - fontDirectories = []; - }; - in - runCommand ("playwright-browsers" - + lib.optionalString withChromium "-chromium") - { - nativeBuildInputs = [ - makeWrapper - jq - ]; - } ('' - BROWSERS_JSON=${driver}/package/browsers.json - '' + lib.optionalString withChromium '' - CHROMIUM_REVISION=$(jq -r '.browsers[] | select(.name == "chromium").revision' $BROWSERS_JSON) - mkdir -p $out/chromium-$CHROMIUM_REVISION/chrome-linux - - # See here for the Chrome options: - # https://github.com/NixOS/nixpkgs/issues/136207#issuecomment-908637738 - makeWrapper ${chromium}/bin/chromium $out/chromium-$CHROMIUM_REVISION/chrome-linux/chrome \ - --set SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \ - --set FONTCONFIG_FILE ${fontconfig} - '' + '' - FFMPEG_REVISION=$(jq -r '.browsers[] | select(.name == "ffmpeg").revision' $BROWSERS_JSON) - mkdir -p $out/ffmpeg-$FFMPEG_REVISION - ln -s ${ffmpeg}/bin/ffmpeg $out/ffmpeg-$FFMPEG_REVISION/ffmpeg-linux - ''); + browsers-linux = lib.makeOverridable ( + { + withChromium ? true, + withFirefox ? true, + withWebkit ? true, + withFfmpeg ? true, + fontconfig_file ? makeFontsConf { + fontDirectories = [ ]; + }, + }: + let + browsers = + lib.optionals withChromium [ "chromium" ] + ++ lib.optionals withFirefox [ "firefox" ] + ++ lib.optionals withWebkit [ "webkit" ] + ++ lib.optionals withFfmpeg [ "ffmpeg" ]; + in + linkFarm "playwright-browsers" ( + lib.listToAttrs ( + map ( + name: + let + value = playwright-core.passthru.browsersJSON.${name}; + in + lib.nameValuePair + # TODO check platform for revisionOverrides + "${name}-${value.revision}" + ( + callPackage ./${name}.nix ( + { + inherit suffix system throwSystem; + inherit (value) revision; + } + // lib.optionalAttrs (name == "chromium") { + inherit fontconfig_file; + } + ) + ) + ) browsers + ) + ) + ); in - driver +{ + playwright-core = playwright-core; + playwright-test = playwright-test; +} diff --git a/pkgs/development/web/playwright/ffmpeg.nix b/pkgs/development/web/playwright/ffmpeg.nix new file mode 100644 index 0000000000000..f541031019ed3 --- /dev/null +++ b/pkgs/development/web/playwright/ffmpeg.nix @@ -0,0 +1,17 @@ +{ + fetchzip, + suffix, + revision, + system, + throwSystem, +}: +fetchzip { + url = "https://playwright.azureedge.net/builds/ffmpeg/${revision}/ffmpeg-${suffix}.zip"; + stripRoot = false; + hash = + { + x86_64-linux = "sha256-FEm62UvMv0h6Sav93WmbPLw3CW1L1xg4nD26ca5ol38="; + aarch64-linux = "sha256-jtQ+NS++VHRiKoIV++PIxEnyVnYtVwUyNlSILKSH4A4="; + } + .${system} or throwSystem; +} diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix new file mode 100644 index 0000000000000..0f404bee2899f --- /dev/null +++ b/pkgs/development/web/playwright/firefox.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchzip, + firefox-bin, + suffix, + revision, + system, + throwSystem, +}: +let + suffix' = + if lib.hasPrefix "linux" suffix then "ubuntu-22.04" + (lib.removePrefix "linux" suffix) else suffix; +in +stdenv.mkDerivation { + name = "playwright-firefox"; + src = fetchzip { + url = "https://playwright.azureedge.net/builds/firefox/${revision}/firefox-${suffix'}.zip"; + hash = + { + x86_64-linux = "sha256-Hd9LlSRLW51gDoFyszqvg46Q/sMizLRsVKAN9atbwsw="; + aarch64-linux = "sha256-SEXH3gLOfNjOcnNWQjQ5gaaow47veVs0BoTYSgXw+24="; + } + .${system} or throwSystem; + }; + + inherit (firefox-bin.unwrapped) + nativeBuildInputs + buildInputs + runtimeDependencies + appendRunpaths + patchelfFlags + ; + + buildPhase = '' + mkdir -p $out/firefox + cp -R . $out/firefox + ''; +} diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix new file mode 100644 index 0000000000000..5c8062bb6f703 --- /dev/null +++ b/pkgs/development/web/playwright/webkit.nix @@ -0,0 +1,135 @@ +{ + lib, + stdenv, + fetchzip, + fetchFromGitHub, + makeWrapper, + autoPatchelfHook, + patchelfUnstable, + + at-spi2-atk, + cairo, + flite, + fontconfig, + freetype, + glib, + glib-networking, + gst_all_1, + harfbuzz, + harfbuzzFull, + icu70, + lcms, + libdrm, + libepoxy, + libevent, + libgcc, + libgcrypt, + libgpg-error, + libjpeg8, + libopus, + libpng, + libsoup_3, + libtasn1, + libvpx, + libwebp, + libwpe, + libwpe-fdo, + libxkbcommon, + libxml2, + libxslt, + mesa, + sqlite, + systemdLibs, + wayland-scanner, + woff2, + zlib, + suffix, + revision, + system, + throwSystem, +}: +let + suffix' = + if lib.hasPrefix "linux" suffix then "ubuntu-22.04" + (lib.removePrefix "linux" suffix) else suffix; + libvpx' = libvpx.overrideAttrs ( + finalAttrs: previousAttrs: { + version = "1.12.0"; + src = fetchFromGitHub { + owner = "webmproject"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-9SFFE2GfYYMgxp1dpmL3STTU2ea1R5vFKA1L0pZwIvQ="; + }; + } + ); + +in +stdenv.mkDerivation { + name = "playwright-webkit"; + src = fetchzip { + url = "https://playwright.azureedge.net/builds/webkit/${revision}/webkit-${suffix'}.zip"; + stripRoot = false; + hash = + { + x86_64-linux = "sha256-pHYGQYwu47jdOAD+/mLrP6Dd+2aDMHENddVwAu0uEfI="; + aarch64-linux = "sha256-0UeYWjeFnQ8yVa3juWg7Z7VF1GDbP4pJ9OUJRbv1OJw="; + } + .${system} or throwSystem; + }; + + nativeBuildInputs = [ + autoPatchelfHook + patchelfUnstable + makeWrapper + ]; + buildInputs = [ + at-spi2-atk + cairo + flite + fontconfig.lib + freetype + glib + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + harfbuzz + harfbuzzFull + icu70 + lcms + libdrm + libepoxy + libevent + libgcc.lib + libgcrypt + libgpg-error + libjpeg8 + libopus + libpng + libsoup_3 + libtasn1 + libwebp + libwpe + libwpe-fdo + libvpx' + libxml2 + libxslt + mesa + sqlite + systemdLibs + wayland-scanner + woff2.lib + libxkbcommon + zlib + ]; + + patchelfFlags = [ "--no-clobber-old-sections" ]; + buildPhase = '' + cp -R . $out + + # remove unused gtk browser + rm -rf $out/minibrowser-gtk + + wrapProgram $out/minibrowser-wpe/bin/MiniBrowser \ + --prefix GIO_EXTRA_MODULES ":" "${glib-networking}/lib/gio/modules/" + ''; +} diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index f9684f64feeb7..ae2ea6f86230d 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -14,6 +14,6 @@ let in -if stdenvNoCC.isDarwin +if stdenvNoCC.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname version meta; } else callPackage ./linux.nix { inherit pname version meta; } diff --git a/pkgs/games/1oom/default.nix b/pkgs/games/1oom/default.nix deleted file mode 100644 index 9f7b23f4cac1b..0000000000000 --- a/pkgs/games/1oom/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - gitUpdater, - autoreconfHook, - allegro, - libsamplerate, - libX11, - libXext, - SDL, - SDL_mixer, - SDL2, - SDL2_mixer, - readline, -}: - -stdenv.mkDerivation rec { - pname = "1oom"; - version = "1.10.1"; - - src = fetchFromGitHub { - owner = "1oom-fork"; - repo = "1oom"; - rev = "refs/tags/v${version}"; - hash = "sha256-M8UpdIOOMUMNY0e+Cxx/uoLBWKc2x7cv2d4VyLwcMng="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ - allegro - libsamplerate - libX11 - libXext - SDL - SDL_mixer - SDL2 - SDL2_mixer - readline - ]; - - outputs = [ - "out" - "doc" - ]; - - postInstall = '' - install -d $doc/share/doc/${pname} - install -t $doc/share/doc/${pname} \ - HACKING NEWS PHILOSOPHY README.md doc/*.txt - ''; - - passthru.updateScript = gitUpdater { rev-prefix = "f"; }; - - meta = with lib; { - homepage = "https://github.com/1oom-fork/1oom"; - description = "Master of Orion (1993) game engine recreation; a more updated fork"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; - }; -} diff --git a/pkgs/games/7kaa/default.nix b/pkgs/games/7kaa/default.nix index 972e959c1ec37..2dd4d67221536 100644 --- a/pkgs/games/7kaa/default.nix +++ b/pkgs/games/7kaa/default.nix @@ -7,7 +7,6 @@ , fetchurl , fetchFromGitHub , openal -, libtool , enet , SDL2 , curl @@ -55,7 +54,7 @@ gccStdenv.mkDerivation (finalAttrs: { autoupdate ''; - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "stackprotector" ]; postInstall = '' mkdir $out/share/7kaa/MUSIC diff --git a/pkgs/games/abbaye-des-morts/default.nix b/pkgs/games/abbaye-des-morts/default.nix index 4f1d744653d34..653a9dcc83340 100644 --- a/pkgs/games/abbaye-des-morts/default.nix +++ b/pkgs/games/abbaye-des-morts/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abbaye-des-morts"; - version = "2.0.2"; + version = "2.0.4"; src = fetchFromGitHub { owner = "nevat"; repo = "abbayedesmorts-gpl"; rev = "v${version}"; - sha256 = "sha256-/RAtOL51o3/5pDgqPLJMTtDFY9BpIowM5MpJ88+v/Zs="; + sha256 = "sha256-IU7E1zmeif9CdoBxzmh7MG2jElGGnEZyKnK7eYFrjsQ="; }; buildInputs = [ SDL2 SDL2_image SDL2_mixer ]; diff --git a/pkgs/games/abuse/default.nix b/pkgs/games/abuse/default.nix index cd3587a244e0b..6b46e61aaf1a2 100644 --- a/pkgs/games/abuse/default.nix +++ b/pkgs/games/abuse/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: { # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648272 maintainers = with lib.maintainers; [ iblech ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/games/airshipper/Cargo.lock b/pkgs/games/airshipper/Cargo.lock deleted file mode 100644 index d89ec3a7472a8..0000000000000 --- a/pkgs/games/airshipper/Cargo.lock +++ /dev/null @@ -1,5355 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" - -[[package]] -name = "ab_glyph" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04a9283dace1c41c265496614998d5b9c4a97b3eb770e804f007c5144bf03f2b" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363b9b88fad3af3be80bc8f762c9a3f9dfe906fd0327b8e92f1c12e5ae1b8bbb" - -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if 1.0.0", - "cipher", - "cpufeatures", - "opaque-debug", -] - -[[package]] -name = "aes-gcm" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.7", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -dependencies = [ - "memchr", -] - -[[package]] -name = "airshipper" -version = "0.10.0" -dependencies = [ - "bytesize", - "chrono", - "clap", - "colored", - "country-parser", - "derive_more", - "dirs-next", - "find_folder", - "futures-util", - "html2text", - "iced", - "iced_lazy", - "iced_native", - "image", - "indicatif 0.16.2", - "lazy_static", - "md5", - "opener", - "openssl-sys", - "pulldown-cmark 0.8.0", - "rand 0.8.5", - "regex", - "reqwest", - "ron 0.6.6", - "rss", - "rustyline", - "self_update", - "semver 1.0.13", - "serde", - "socket2", - "strip_markdown", - "surge-ping", - "termcolor", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "tracing-appender", - "tracing-futures", - "tracing-log", - "tracing-subscriber", - "url", - "veloren-serverbrowser-api", - "winapi", - "winres", - "zip", -] - -[[package]] -name = "airshipper-server" -version = "0.10.0" -dependencies = [ - "bytes", - "chrono", - "diesel", - "diesel_migrations", - "dotenv", - "futures", - "lazy_static", - "libsqlite3-sys", - "md5", - "octocrab", - "openssl-sys", - "prometheus", - "regex", - "reqwest", - "rocket", - "rocket_sync_db_pools", - "ron 0.7.1", - "serde", - "serde_json", - "termcolor", - "thiserror", - "tokio", - "tokio-util 0.6.10", - "tracing", - "tracing-appender", - "tracing-log", - "tracing-subscriber", - "url", -] - -[[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arc-swap" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "ash" -version = "0.34.0+1.2.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0f780da53d0063880d45554306489f09dd8d1bda47688b4a57bc579119356df" -dependencies = [ - "libloading", -] - -[[package]] -name = "async-stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" -dependencies = [ - "async-stream-impl", - "futures-core", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "async-trait" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "atom_syndication" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5016bf52ff4f3ed28bf3ec1fed96b53daf4b137d5e6b9f97a8cfae7b57a3a2" -dependencies = [ - "chrono", - "derive_builder", - "diligent-date-parser", - "quick-xml", -] - -[[package]] -name = "atomic" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide 0.5.4", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "binascii" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72" - -[[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 = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", -] - -[[package]] -name = "bumpalo" -version = "3.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" - -[[package]] -name = "bytemuck" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9e1f5fa78f69496407a27ae9ed989e3c3b072310286f5ef385525e4cbc24a9" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - -[[package]] -name = "bytesize" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" - -[[package]] -name = "bzip2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "calloop" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82" -dependencies = [ - "log", - "nix 0.22.3", -] - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "chrono" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "serde", - "time 0.1.44", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "clap" -version = "3.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", - "once_cell", - "strsim 0.10.0", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_derive" -version = "3.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clipboard-win" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "clipboard_macos" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95" -dependencies = [ - "objc", - "objc-foundation", - "objc_id", -] - -[[package]] -name = "clipboard_wayland" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747" -dependencies = [ - "smithay-clipboard", -] - -[[package]] -name = "clipboard_x11" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921" -dependencies = [ - "thiserror", - "x11rb", -] - -[[package]] -name = "cocoa" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" -dependencies = [ - "bitflags", - "block", - "core-foundation 0.9.3", - "core-graphics-types", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi", -] - -[[package]] -name = "console" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" -dependencies = [ - "encode_unicode", - "libc", - "once_cell", - "terminal_size", - "unicode-width", - "winapi", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cookie" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05" -dependencies = [ - "aes-gcm", - "base64 0.13.0", - "hkdf", - "hmac", - "percent-encoding", - "rand 0.8.5", - "sha2", - "subtle", - "time 0.3.14", - "version_check", -] - -[[package]] -name = "copyless" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" - -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys 0.8.3", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "core-graphics" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" -dependencies = [ - "bitflags", - "core-foundation 0.7.0", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags", - "core-foundation 0.9.3", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" -dependencies = [ - "bitflags", - "core-foundation 0.9.3", - "foreign-types", - "libc", -] - -[[package]] -name = "core-video-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" -dependencies = [ - "cfg-if 0.1.10", - "core-foundation-sys 0.7.0", - "core-graphics 0.19.2", - "libc", - "objc", -] - -[[package]] -name = "country-parser" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dee23a8308105cbce67c6b9bf85d204949b614bf9286c24f5eebfae50f17b60" -dependencies = [ - "lazy_static", - "ron 0.6.6", - "serde", -] - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils", - "memoffset", - "once_cell", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", -] - -[[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 = "ctr" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" -dependencies = [ - "cipher", -] - -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] -name = "d3d12" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c" -dependencies = [ - "bitflags", - "libloading", - "winapi", -] - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.4", - "quote", - "syn", -] - -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "derive_builder" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" -dependencies = [ - "darling 0.10.2", - "derive_builder_core", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_builder_core" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" -dependencies = [ - "darling 0.10.2", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn", -] - -[[package]] -name = "devise" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c7580b072f1c8476148f16e0a0d5dedddab787da98d86c5082c5e9ed8ab595" -dependencies = [ - "devise_codegen", - "devise_core", -] - -[[package]] -name = "devise_codegen" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2" -dependencies = [ - "devise_core", - "quote", -] - -[[package]] -name = "devise_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0" -dependencies = [ - "bitflags", - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn", -] - -[[package]] -name = "diesel" -version = "1.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28135ecf6b7d446b43e27e225622a038cc4e2930a1022f51cdb97ada19b8e4d" -dependencies = [ - "byteorder", - "chrono", - "diesel_derives", - "libsqlite3-sys", - "r2d2", -] - -[[package]] -name = "diesel_derives" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "diesel_migrations" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c" -dependencies = [ - "migrations_internals", - "migrations_macros", -] - -[[package]] -name = "digest" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "diligent-date-parser" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d0fd95c7c02e2d6c588c6c5628466fff9bdde4b8c6196465e087b08e792720" -dependencies = [ - "chrono", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dlib" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" -dependencies = [ - "libloading", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "either" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "euclid" -version = "0.22.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade" -dependencies = [ - "num-traits", -] - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "fd-lock" -version = "3.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb21c69b9fea5e15dbc1049e4b77145dd0ba1c84019c488102de0dc4ea4b0a27" -dependencies = [ - "cfg-if 1.0.0", - "rustix", - "windows-sys 0.42.0", -] - -[[package]] -name = "figment" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e3bd154d9ae2f1bb0ada5b7eebd56529513efa5de7d2fc8c6adf33bc43260cf" -dependencies = [ - "atomic", - "pear", - "serde", - "toml", - "uncased", - "version_check", -] - -[[package]] -name = "find_folder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b" - -[[package]] -name = "flate2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -dependencies = [ - "crc32fast", - "miniz_oxide 0.5.4", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" - -[[package]] -name = "futures-executor" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", - "num_cpus", -] - -[[package]] -name = "futures-io" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" - -[[package]] -name = "futures-macro" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" - -[[package]] -name = "futures-task" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" - -[[package]] -name = "futures-util" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generator" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc184cace1cea8335047a471cc1da80f18acf8a76f3bab2028d499e328948ec7" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "ghash" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gif" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" - -[[package]] -name = "glam" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579160312273c954cc51bd440f059dde741029ac8daf8c84fece76cb77f62c15" -dependencies = [ - "version_check", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "glow" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glyph_brush" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac02497410cdb5062cc056a33f2e1e19ff69fbf26a4be9a02bf29d6e17ea105b" -dependencies = [ - "glyph_brush_draw_cache", - "glyph_brush_layout", - "log", - "ordered-float", - "rustc-hash", - "twox-hash", -] - -[[package]] -name = "glyph_brush_draw_cache" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610" -dependencies = [ - "ab_glyph", - "crossbeam-channel", - "crossbeam-deque", - "linked-hash-map", - "rayon", - "rustc-hash", -] - -[[package]] -name = "glyph_brush_layout" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38" -dependencies = [ - "ab_glyph", - "approx", - "xi-unicode", -] - -[[package]] -name = "gpu-alloc" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" -dependencies = [ - "bitflags", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" -dependencies = [ - "bitflags", -] - -[[package]] -name = "gpu-descriptor" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" -dependencies = [ - "bitflags", - "gpu-descriptor-types", - "hashbrown", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" -dependencies = [ - "bitflags", -] - -[[package]] -name = "guillotiere" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" -dependencies = [ - "euclid", - "svg_fmt", -] - -[[package]] -name = "h2" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util 0.7.3", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] -name = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "html2text" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26379dcb715e237b96102a12b505c553e2bffa74bae2e54658748d298660ef1" -dependencies = [ - "html5ever", - "markup5ever_rcdom", - "unicode-width", -] - -[[package]] -name = "html5ever" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "http" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "hyper" -version = "0.14.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" -dependencies = [ - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "hyperx" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5617e92fc2f2501c3e2bc6ce547cad841adba2bae5b921c7e52510beca6d084c" -dependencies = [ - "base64 0.13.0", - "bytes", - "http", - "httpdate", - "language-tags", - "mime", - "percent-encoding", - "unicase", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" -dependencies = [ - "android_system_properties", - "core-foundation-sys 0.8.3", - "js-sys", - "once_cell", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "iced" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6025abe6b1056c9b5adad79c484c5fd8b7012e5230f3b0439a1294ade7ded7bf" -dependencies = [ - "iced_core", - "iced_futures", - "iced_graphics", - "iced_native", - "iced_pure", - "iced_wgpu", - "iced_winit", - "thiserror", -] - -[[package]] -name = "iced_core" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf9133ceb345ec640047d5597fb8aa88e9cf74ce2d0277a9a62e2d6ed4a8148" -dependencies = [ - "bitflags", - "wasm-timer", -] - -[[package]] -name = "iced_futures" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d13241d5ed32846bbcffaf60e27e7ceebb60cf16d791ff00d582f0d4d1b07b" -dependencies = [ - "futures", - "log", - "tokio", - "wasm-bindgen-futures", - "wasm-timer", -] - -[[package]] -name = "iced_graphics" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adcf703fc326e0985ea99c75f1b73e718560a7b220d57ec6478417ccb2f463f" -dependencies = [ - "bytemuck", - "glam", - "iced_native", - "iced_pure", - "iced_style", - "raw-window-handle 0.4.3", - "thiserror", -] - -[[package]] -name = "iced_lazy" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "333979d705964832864ee7676516ab3c3df4ab0b65efb603c86a256d4adbec6f" -dependencies = [ - "iced_native", - "ouroboros", -] - -[[package]] -name = "iced_native" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca174d4693a5daa2ffcae38d5c28cf0dbd54bd8fc19848f28392cd52624751a" -dependencies = [ - "iced_core", - "iced_futures", - "iced_style", - "num-traits", - "twox-hash", - "unicode-segmentation", -] - -[[package]] -name = "iced_pure" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80aeaecadfd6832c2c787cbdfd357adc256a51c55d68142d852037451e72f393" -dependencies = [ - "iced_native", - "iced_style", - "num-traits", -] - -[[package]] -name = "iced_style" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90028c94ab62c13cd3b6fb1499a593a51510d4729c5b4e8e60705b2b28c6bc2" -dependencies = [ - "iced_core", -] - -[[package]] -name = "iced_wgpu" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bc44ca209f77bd855f035d2e86e50e66332f55fb60d9fb67eeb09eae9d9de2e" -dependencies = [ - "bitflags", - "bytemuck", - "futures", - "glyph_brush", - "guillotiere", - "iced_graphics", - "iced_native", - "image", - "kamadak-exif", - "log", - "raw-window-handle 0.4.3", - "wgpu", - "wgpu_glyph", -] - -[[package]] -name = "iced_winit" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72011b895e439e2ebad8f545720e3e97c7368ecfc47a23cbfeaa9508a98af90c" -dependencies = [ - "iced_futures", - "iced_graphics", - "iced_native", - "log", - "thiserror", - "web-sys", - "winapi", - "window_clipboard", - "winit", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif", - "jpeg-decoder", - "num-iter", - "num-rational", - "num-traits", - "png", -] - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown", - "serde", -] - -[[package]] -name = "indicatif" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" -dependencies = [ - "console", - "lazy_static", - "number_prefix 0.3.0", - "regex", -] - -[[package]] -name = "indicatif" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" -dependencies = [ - "console", - "lazy_static", - "number_prefix 0.4.0", - "regex", -] - -[[package]] -name = "inlinable_string" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" - -[[package]] -name = "inplace_it" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67f0347836f3f6362c1e7efdadde2b1c4b4556d211310b70631bae7eb692070b" - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d367024b3f3414d8e01f437f704f41a9f64ab36f9067fa73e526ad4c763c87" -dependencies = [ - "libc", - "windows-sys 0.42.0", -] - -[[package]] -name = "ipnet" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" - -[[package]] -name = "itoa" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jpeg-decoder" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "jsonwebtoken" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afabcc15e437a6484fc4f12d0fd63068fe457bf93f1c148d3d9649c60b103f32" -dependencies = [ - "base64 0.12.3", - "pem", - "ring", - "serde", - "serde_json", - "simple_asn1", -] - -[[package]] -name = "kamadak-exif" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70494964492bf8e491eb3951c5d70c9627eb7100ede6cc56d748b9a3f302cfb6" -dependencies = [ - "mutate_once", -] - -[[package]] -name = "khronos-egl" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" -dependencies = [ - "libc", - "libloading", -] - -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" - -[[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.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" - -[[package]] -name = "libloading" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" -dependencies = [ - "cfg-if 1.0.0", - "winapi", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb68f22743a3fb35785f1e7f844ca5a3de2dde5bd0c0ef5b372065814699b121" - -[[package]] -name = "lock_api" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if 1.0.0", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markup5ever" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" -dependencies = [ - "log", - "phf", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "markup5ever_rcdom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" -dependencies = [ - "html5ever", - "markup5ever", - "tendril", - "xml5ever", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0514f491f4cc03632ab399ee01e2c1c1b12d3e1cf2d667c1ff5f87d6dcd2084" -dependencies = [ - "bitflags", - "block", - "core-graphics-types", - "foreign-types", - "log", - "objc", -] - -[[package]] -name = "migrations_internals" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860" -dependencies = [ - "diesel", -] - -[[package]] -name = "migrations_macros" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" -dependencies = [ - "migrations_internals", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[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.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.36.1", -] - -[[package]] -name = "multer" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a30ba6d97eb198c5e8a35d67d5779d6680cca35652a60ee90fc23dc431d4fde8" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http", - "httparse", - "log", - "memchr", - "mime", - "spin 0.9.4", - "tokio", - "tokio-util 0.7.3", - "version_check", -] - -[[package]] -name = "mutate_once" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" - -[[package]] -name = "naga" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3012f2dbcc79e8e0b5825a4836a7106a75dd9b2fe42c528163be0f572538c705" -dependencies = [ - "bit-set", - "bitflags", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "rustc-hash", - "spirv", - "thiserror", -] - -[[package]] -name = "native-tls" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d" -dependencies = [ - "bitflags", - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-glue" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71bee8ea72d685477e28bd004cfe1bf99c754d688cd78cad139eae4089484d4" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling 0.13.4", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ndk-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "nix" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - -[[package]] -name = "nix" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", - "objc_exception", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -dependencies = [ - "memchr", -] - -[[package]] -name = "octocrab" -version = "0.15.4" -source = "git+https://github.com/XAMPPRocky/octocrab?rev=c78edcd87fa5edcd5a6d0d0878b2a8d020802c40#c78edcd87fa5edcd5a6d0d0878b2a8d020802c40" -dependencies = [ - "arc-swap", - "async-trait", - "base64 0.13.0", - "bytes", - "chrono", - "hyperx", - "jsonwebtoken", - "once_cell", - "reqwest", - "serde", - "serde_json", - "serde_path_to_error", - "snafu", - "url", -] - -[[package]] -name = "once_cell" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "opener" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952" -dependencies = [ - "bstr", - "winapi", -] - -[[package]] -name = "openssl" -version = "0.10.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "111.22.0+1.1.1q" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" -dependencies = [ - "autocfg", - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-float" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bcbab4bfea7a59c2c0fe47211a1ac4e3e96bea6eb446d704f310bc5c732ae2" -dependencies = [ - "num-traits", -] - -[[package]] -name = "os_str_bytes" -version = "6.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" - -[[package]] -name = "ouroboros" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f357ef82d1b4db66fbed0b8d542cbd3c22d0bf5b393b3c257b9ba4568e70c9c3" -dependencies = [ - "aliasable", - "ouroboros_macro", - "stable_deref_trait", -] - -[[package]] -name = "ouroboros_macro" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44a0b52c2cbaef7dffa5fec1a43274afe8bd2a644fa9fc50a9ef4ff0269b1257" -dependencies = [ - "Inflector", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb" -dependencies = [ - "ttf-parser", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.3", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.36.1", -] - -[[package]] -name = "pear" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e44241c5e4c868e3eaa78b7c1848cadd6344ed4f54d029832d32b415a58702" -dependencies = [ - "inlinable_string", - "pear_codegen", - "yansi", -] - -[[package]] -name = "pear_codegen" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0" -dependencies = [ - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn", -] - -[[package]] -name = "pem" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" -dependencies = [ - "base64 0.13.0", - "once_cell", - "regex", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pest" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0560d531d1febc25a3c9398a62a71256c0178f2e3443baedd9ad4bb8c9deb4" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - -[[package]] -name = "pnet_base" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e88341c6c842f89bdc7287f7b1e26b6fa64fa11c7ea3756971e6f18cd2510c4" -dependencies = [ - "no-std-net", -] - -[[package]] -name = "pnet_macros" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfcdc9c072966723026b3596a1f655fb8bbfe0142f9770f8d481aee4459d6b9" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn", -] - -[[package]] -name = "pnet_macros_support" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bba532f5a4b320c029d89e612671fb621851b3b07e972c53850d34130033a5cd" -dependencies = [ - "pnet_base", -] - -[[package]] -name = "pnet_packet" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7009716ac86091c1b6e2cdec95a2b028c880f516054c1ec11edd02f9f463cbde" -dependencies = [ - "glob", - "pnet_base", - "pnet_macros", - "pnet_macros_support", -] - -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags", - "crc32fast", - "deflate", - "miniz_oxide 0.3.7", -] - -[[package]] -name = "polyval" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-crate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" -dependencies = [ - "once_cell", - "thiserror", - "toml", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proc-macro2-diagnostics" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "version_check", - "yansi", -] - -[[package]] -name = "profiling" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f61dcf0b917cd75d4521d7343d1ffff3d1583054133c9b5cbea3375c703c40d" - -[[package]] -name = "prometheus" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5986aa8d62380092d2f50f8b1cdba9cb9b6731ffd4b25b51fd126b6c3e05b99c" -dependencies = [ - "cfg-if 1.0.0", - "fnv", - "lazy_static", - "memchr", - "parking_lot 0.11.2", - "protobuf", - "thiserror", -] - -[[package]] -name = "protobuf" -version = "2.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96" - -[[package]] -name = "pulldown-cmark" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca36dea94d187597e104a5c8e4b07576a8a45aa5db48a65e12940d3eb7461f55" -dependencies = [ - "bitflags", - "getopts", - "memchr", - "unicase", -] - -[[package]] -name = "pulldown-cmark" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" -dependencies = [ - "bitflags", - "getopts", - "memchr", - "unicase", -] - -[[package]] -name = "quick-xml" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26aab6b48e2590e4a64d1ed808749ba06257882b461d01ca71baeb747074a6dd" -dependencies = [ - "encoding_rs", - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r2d2" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" -dependencies = [ - "log", - "parking_lot 0.12.1", - "scheduled-thread-pool", -] - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.7", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "range-alloc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6" - -[[package]] -name = "raw-window-handle" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" -dependencies = [ - "libc", - "raw-window-handle 0.4.3", -] - -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - -[[package]] -name = "rayon" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.7", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "ref-cast" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed13bcd201494ab44900a96490291651d200730904221832b9547d24a87d332b" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5234cd6063258a5e32903b53b1b6ac043a0541c8adc1f610f67b0326c7a578fa" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "regex" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "renderdoc-sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" - -[[package]] -name = "reqwest" -version = "0.11.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" -dependencies = [ - "base64 0.13.0", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-tls", - "ipnet", - "js-sys", - "lazy_static", - "log", - "mime", - "native-tls", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-util 0.7.3", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rocket" -version = "0.5.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ead083fce4a405feb349cf09abdf64471c6077f14e0ce59364aa90d4b99317" -dependencies = [ - "async-stream", - "async-trait", - "atomic", - "atty", - "binascii", - "bytes", - "either", - "figment", - "futures", - "indexmap", - "log", - "memchr", - "multer", - "num_cpus", - "parking_lot 0.12.1", - "pin-project-lite", - "rand 0.8.5", - "ref-cast", - "rocket_codegen", - "rocket_http", - "serde", - "serde_json", - "state", - "tempfile", - "time 0.3.14", - "tokio", - "tokio-stream", - "tokio-util 0.7.3", - "ubyte", - "version_check", - "yansi", -] - -[[package]] -name = "rocket_codegen" -version = "0.5.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6aeb6bb9c61e9cd2c00d70ea267bf36f76a4cc615e5908b349c2f9d93999b47" -dependencies = [ - "devise", - "glob", - "indexmap", - "proc-macro2", - "quote", - "rocket_http", - "syn", - "unicode-xid", -] - -[[package]] -name = "rocket_http" -version = "0.5.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ded65d127954de3c12471630bf4b81a2792f065984461e65b91d0fdaafc17a2" -dependencies = [ - "cookie", - "either", - "futures", - "http", - "hyper", - "indexmap", - "log", - "memchr", - "pear", - "percent-encoding", - "pin-project-lite", - "ref-cast", - "serde", - "smallvec", - "stable-pattern", - "state", - "time 0.3.14", - "tokio", - "uncased", -] - -[[package]] -name = "rocket_sync_db_pools" -version = "0.1.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fa48b6ab25013e9812f1b0c592741900b3a2a83c0936292e0565c0ac842f558" -dependencies = [ - "diesel", - "r2d2", - "rocket", - "rocket_sync_db_pools_codegen", - "serde", - "tokio", -] - -[[package]] -name = "rocket_sync_db_pools_codegen" -version = "0.1.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280ef2d232923e69cb93da156972eb5476a7cce5ba44843f6608f46a4abf7aab" -dependencies = [ - "devise", - "quote", -] - -[[package]] -name = "ron" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86018df177b1beef6c7c8ef949969c4f7cb9a9344181b92486b23c79995bdaa4" -dependencies = [ - "base64 0.13.0", - "bitflags", - "serde", -] - -[[package]] -name = "ron" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" -dependencies = [ - "base64 0.13.0", - "bitflags", - "serde", -] - -[[package]] -name = "rss" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e70d6ae72f8a4333af8ce9dce58942020528430eb0d46ee2fcb5e8d4d16377" -dependencies = [ - "atom_syndication", - "derive_builder", - "quick-xml", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.13", -] - -[[package]] -name = "rustix" -version = "0.36.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "203974af07ea769452490ee8de3e5947971efc3a090dca8a779dd432d3fa46a7" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.42.0", -] - -[[package]] -name = "rustls" -version = "0.20.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" -dependencies = [ - "base64 0.13.0", -] - -[[package]] -name = "rustversion" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" - -[[package]] -name = "rustyline" -version = "10.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1cd5ae51d3f7bf65d7969d579d502168ef578f289452bd8ccc91de28fda20e" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "clipboard-win", - "dirs-next", - "fd-lock", - "libc", - "log", - "memchr", - "nix 0.24.2", - "radix_trie", - "scopeguard", - "unicode-segmentation", - "unicode-width", - "utf8parse", - "winapi", -] - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "schannel" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -dependencies = [ - "lazy_static", - "windows-sys 0.36.1", -] - -[[package]] -name = "scheduled-thread-pool" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" -dependencies = [ - "parking_lot 0.12.1", -] - -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -dependencies = [ - "bitflags", - "core-foundation 0.9.3", - "core-foundation-sys 0.8.3", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys 0.8.3", - "libc", -] - -[[package]] -name = "self_update" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb85f1802f7b987237b8525c0fde86ea86f31c957c1875467c727d5b921179c" -dependencies = [ - "hyper", - "indicatif 0.15.0", - "log", - "quick-xml", - "regex", - "reqwest", - "semver 0.11.0", - "serde_json", - "tempfile", - "zip", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] -name = "serde" -version = "1.0.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha2" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "simple_asn1" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b" -dependencies = [ - "chrono", - "num-bigint", - "num-traits", -] - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "slab" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" - -[[package]] -name = "smithay-client-toolkit" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3" -dependencies = [ - "bitflags", - "calloop", - "dlib", - "lazy_static", - "log", - "memmap2 0.3.1", - "nix 0.22.3", - "pkg-config", - "wayland-client", - "wayland-cursor", - "wayland-protocols", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" -dependencies = [ - "bitflags", - "dlib", - "lazy_static", - "log", - "memmap2 0.5.7", - "nix 0.24.2", - "pkg-config", - "wayland-client", - "wayland-cursor", - "wayland-protocols", -] - -[[package]] -name = "smithay-clipboard" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" -dependencies = [ - "smithay-client-toolkit 0.16.0", - "wayland-client", -] - -[[package]] -name = "snafu" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5177903bf45656592d9eb5c0e22f408fc023aae51dbe2088889b71633ba451f2" -dependencies = [ - "backtrace", - "doc-comment", - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410b26ed97440d90ced3e2488c868d56a86e2064f5d7d6f417909b286afe25e5" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "socket2" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" - -[[package]] -name = "spirv" -version = "0.2.0+1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" -dependencies = [ - "bitflags", - "num-traits", -] - -[[package]] -name = "stable-pattern" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045" -dependencies = [ - "memchr", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "state" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" -dependencies = [ - "loom", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "string_cache" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot 0.12.1", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strip_markdown" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32c754386109f9adc8ca62513c51cf81cc2d8502588064103aa8e9f69b4276da" -dependencies = [ - "log", - "pulldown-cmark 0.7.2", -] - -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "surge-ping" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d33636a95261e9f939742d4712b20f8813a9b3cfaf1510b751096329cd3902b" -dependencies = [ - "hex", - "parking_lot 0.12.1", - "pnet_packet", - "rand 0.8.5", - "socket2", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "svg_fmt" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" - -[[package]] -name = "syn" -version = "1.0.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "textwrap" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" - -[[package]] -name = "thiserror" -version = "1.0.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" -dependencies = [ - "itoa", - "libc", - "num_threads", - "time-macros", -] - -[[package]] -name = "time-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "once_cell", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "winapi", -] - -[[package]] -name = "tokio-macros" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-stream" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" -dependencies = [ - "cfg-if 1.0.0", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-appender" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" -dependencies = [ - "crossbeam-channel", - "time 0.3.14", - "tracing-subscriber", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" -dependencies = [ - "ansi_term", - "matchers", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "time 0.3.14", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "ttf-parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if 1.0.0", - "rand 0.8.5", - "static_assertions", -] - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "ubyte" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c81f0dae7d286ad0d9366d7679a77934cfc3cf3a8d67e82669794412b2368fe6" -dependencies = [ - "serde", -] - -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - -[[package]] -name = "uncased" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" -dependencies = [ - "serde", - "version_check", -] - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-ident" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" - -[[package]] -name = "unicode-normalization" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "veloren-serverbrowser-api" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25e966b27a95a55d4903c4646dc55ffdf59f23bef7e27978b97fa92fd64ca27" -dependencies = [ - "country-parser", - "serde", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" - -[[package]] -name = "wasm-timer" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" -dependencies = [ - "futures", - "js-sys", - "parking_lot 0.11.2", - "pin-utils", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags", - "downcast-rs", - "libc", - "nix 0.24.2", - "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix 0.24.2", - "once_cell", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-cursor" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" -dependencies = [ - "nix 0.24.2", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags", - "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 = [ - "dlib", - "lazy_static", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" -dependencies = [ - "webpki", -] - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "wgpu" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97cd781ff044d6d697b632a2e212032c2e957d1afaa21dbf58069cbb8f78567" -dependencies = [ - "arrayvec", - "js-sys", - "log", - "naga", - "parking_lot 0.11.2", - "raw-window-handle 0.4.3", - "smallvec", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-core" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4688c000eb841ca55f7b35db659b78d6e1cd77d7caf8fb929f4e181f754047d" -dependencies = [ - "arrayvec", - "bitflags", - "cfg_aliases", - "codespan-reporting", - "copyless", - "fxhash", - "log", - "naga", - "parking_lot 0.11.2", - "profiling", - "raw-window-handle 0.4.3", - "smallvec", - "thiserror", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d684ea6a34974a2fc19f1dfd183d11a62e22d75c4f187a574bb1224df8e056c2" -dependencies = [ - "arrayvec", - "ash", - "bit-set", - "bitflags", - "block", - "core-graphics-types", - "d3d12", - "foreign-types", - "fxhash", - "glow", - "gpu-alloc", - "gpu-descriptor", - "inplace_it", - "js-sys", - "khronos-egl", - "libloading", - "log", - "metal", - "naga", - "objc", - "parking_lot 0.11.2", - "profiling", - "range-alloc", - "raw-window-handle 0.4.3", - "renderdoc-sys", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549533d9e1cdd4b4cda7718d33ff500fc4c34b5467b71d76b547ae0324f3b2a2" -dependencies = [ - "bitflags", -] - -[[package]] -name = "wgpu_glyph" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8134edb15ae465caf308125646c9e98bdef7398cdefc69227ac77a5eb795e7fe" -dependencies = [ - "bytemuck", - "glyph_brush", - "log", - "wgpu", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "window_clipboard" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47d7fb4df5cd1fea61e5ee3841380f54359bac814e227d8f72709f4f193f8cf" -dependencies = [ - "clipboard-win", - "clipboard_macos", - "clipboard_wayland", - "clipboard_x11", - "raw-window-handle 0.3.4", - "thiserror", -] - -[[package]] -name = "windows" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec" -dependencies = [ - "windows_aarch64_msvc 0.32.0", - "windows_i686_gnu 0.32.0", - "windows_i686_msvc 0.32.0", - "windows_x86_64_gnu 0.32.0", - "windows_x86_64_msvc 0.32.0", -] - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" - -[[package]] -name = "windows_i686_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" - -[[package]] -name = "windows_i686_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" - -[[package]] -name = "winit" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b43cc931d58b99461188607efd7acb2a093e65fc621f54cad78517a6063e73a" -dependencies = [ - "bitflags", - "cocoa", - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "core-video-sys", - "dispatch", - "instant", - "lazy_static", - "libc", - "log", - "mio", - "ndk", - "ndk-glue", - "ndk-sys", - "objc", - "parking_lot 0.11.2", - "percent-encoding", - "raw-window-handle 0.4.3", - "smithay-client-toolkit 0.15.4", - "wasm-bindgen", - "wayland-client", - "wayland-protocols", - "web-sys", - "winapi", - "x11-dl", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "winres" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" -dependencies = [ - "toml", -] - -[[package]] -name = "x11-dl" -version = "2.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c83627bc137605acc00bb399c7b908ef460b621fc37c953db2b09f88c449ea6" -dependencies = [ - "lazy_static", - "libc", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a" -dependencies = [ - "gethostname", - "nix 0.22.3", - "winapi", - "winapi-wsapoll", -] - -[[package]] -name = "xcursor" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] - -[[package]] -name = "xi-unicode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" - -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" - -[[package]] -name = "xml5ever" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865" -dependencies = [ - "log", - "mac", - "markup5ever", - "time 0.1.44", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zip" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" -dependencies = [ - "byteorder", - "bzip2", - "crc32fast", - "flate2", - "thiserror", - "time 0.1.44", -] diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 56369398942ad..0d55a703c0d54 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -15,13 +15,17 @@ , alsa-lib , stdenv , libxcb +, bzip2 +, cmake +, fontconfig +, freetype , pkg-config , makeWrapper , writeShellScript , patchelf }: let - version = "0.10.0"; + version = "0.14.0"; # Patch for airshipper to install veloren patch = let runtimeLibs = [ @@ -59,17 +63,13 @@ rustPlatform.buildRustPackage { owner = "Veloren"; repo = "airshipper"; rev = "v${version}"; - hash = "sha256-5zP1Ye1fJNQp8eWKwdxLqBr4qzBfWEEBsJ9s7+8idL4="; + hash = "sha256-+ZU3WAjmPDAFAevebePcIlYcgSYSJJ3LyvwbTBKGUH4="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "octocrab-0.15.4" = "sha256-uKHLlb0EyWF0Ho8FP38DFZsEWXiAG8FEYzJgwO9W90U="; - }; - }; + cargoHash = "sha256-mwfYCVcOH2zFr76W9ZC4t/LmEwO5P2eGYXRVkwn6Fm4="; buildInputs = [ + fontconfig openssl wayland wayland-protocols @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage { libXi libXcursor ]; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; RUSTC_BOOTSTRAP = 1; # We need rust unstable features @@ -95,6 +95,9 @@ rustPlatform.buildRustPackage { vulkan-loader wayland wayland-protocols + bzip2 + fontconfig + freetype libxkbcommon libX11 libXrandr diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index a75cc801257ef..8daf97caf56b8 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -115,13 +115,13 @@ let ); in -if stdenv.isLinux then +if stdenv.hostPlatform.isLinux then fhsEnvAnki else stdenv.mkDerivation { inherit pname version passthru; - src = if stdenv.isAarch64 then sources.darwin-aarch64 else sources.darwin-x86_64; + src = if stdenv.hostPlatform.isAarch64 then sources.darwin-aarch64 else sources.darwin-x86_64; nativeBuildInputs = [ undmg ]; sourceRoot = "."; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 76c23365f400e..d9a4984d3d794 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -152,12 +152,12 @@ python3.pkgs.buildPythonApplication { qt6.wrapQtAppsHook rsync rustPlatform.cargoSetupHook - ] ++ lib.optional stdenv.isDarwin swift; + ] ++ lib.optional stdenv.hostPlatform.isDarwin swift; buildInputs = [ qt6.qtbase qt6.qtsvg - ] ++ lib.optional stdenv.isLinux qt6.qtwayland; + ] ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland; propagatedBuildInputs = with python3.pkgs; @@ -213,7 +213,7 @@ python3.pkgs.buildPythonApplication { wrapt zipp ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVKit CoreAudio ]; @@ -226,7 +226,7 @@ python3.pkgs.buildPythonApplication { # tests fail with to many open files # TODO: verify if this is still true (I can't, no mac) - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkFlags = [ # these two tests are flaky, see https://github.com/ankitects/anki/issues/3353 @@ -344,6 +344,6 @@ python3.pkgs.buildPythonApplication { oxij ]; # Reported to crash at launch on darwin (as of 2.1.65) - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/games/anki/sync-server.nix b/pkgs/games/anki/sync-server.nix index 8dc73e405afde..0b351ae3ffade 100644 --- a/pkgs/games/anki/sync-server.nix +++ b/pkgs/games/anki/sync-server.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 334219a289012..9dbe2ce7a7dfc 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, zlib, boost , openal, glm, freetype, libGLU, SDL2, libepoxy , dejavu_fonts, inkscape, optipng, imagemagick -, withCrashReporter ? !stdenv.isDarwin +, withCrashReporter ? !stdenv.hostPlatform.isDarwin , qtbase ? null , wrapQtAppsHook ? null , curl ? null @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { zlib boost openal glm freetype libGLU SDL2 libepoxy ] ++ optionals withCrashReporter [ qtbase curl ] - ++ optionals stdenv.isLinux [ gdb ]; + ++ optionals stdenv.hostPlatform.isLinux [ gdb ]; cmakeFlags = [ "-DDATA_DIR_PREFIXES=$out/share" diff --git a/pkgs/games/augustus/default.nix b/pkgs/games/augustus/default.nix index bf360d2dcb944..5b94777dea69e 100644 --- a/pkgs/games/augustus/default.nix +++ b/pkgs/games/augustus/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool libicns imagemagick @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { SDL2 SDL2_mixer libpng - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall mkdir -p $out/Applications cp -r augustus.app $out/Applications/ diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix index ee69fc697b312..b5ebd8c279ee4 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/games/blightmud/default.nix @@ -31,10 +31,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ openssl ] - ++ lib.optionals (withTTS && stdenv.isLinux) [ speechd-minimal ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals (withTTS && stdenv.isDarwin) [ AVFoundation AppKit ] - ++ lib.optionals stdenv.isDarwin [ CoreAudio AudioUnit ]; + ++ lib.optionals (withTTS && stdenv.hostPlatform.isLinux) [ speechd-minimal ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals (withTTS && stdenv.hostPlatform.isDarwin) [ AVFoundation AppKit ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio AudioUnit ]; checkFlags = let diff --git a/pkgs/games/brogue-ce/default.nix b/pkgs/games/brogue-ce/default.nix deleted file mode 100644 index 2c50647455bf9..0000000000000 --- a/pkgs/games/brogue-ce/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeDesktopItem -, copyDesktopItems -, SDL2 -, SDL2_image -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "brogue-ce"; - version = "1.14"; - - src = fetchFromGitHub { - owner = "tmewett"; - repo = "BrogueCE"; - rev = "v${finalAttrs.version}"; - hash = "sha256-cEPFujWBzm7CQWDVmrdiCMcj4rnweAldufWtkAjUA3c="; - }; - - postPatch = '' - substituteInPlace linux/brogue-multiuser.sh \ - --replace broguedir= "broguedir=$out/opt/brogue-ce #" - ''; - - nativeBuildInputs = [ - copyDesktopItems - ]; - - buildInputs = [ - SDL2 - SDL2_image - ]; - - makeFlags = [ "DATADIR=$(out)/opt/brogue-ce" ]; - - desktopItems = [(makeDesktopItem { - name = "brogue-ce"; - desktopName = "Brogue CE"; - genericName = "Roguelike"; - comment = "Brave the Dungeons of Doom!"; - icon = "brogue-ce"; - exec = "brogue-ce"; - categories = [ "Game" "AdventureGame" ]; - })]; - - installPhase = '' - runHook preInstall - mkdir -p $out/opt - cp -r bin $out/opt/brogue-ce - install -Dm755 linux/brogue-multiuser.sh $out/bin/brogue-ce - install -Dm 644 bin/assets/icon.png $out/share/icons/hicolor/256x256/apps/brogue-ce.png - runHook postInstall - ''; - - meta = with lib; { - description = "Community-lead fork of the minimalist roguelike game Brogue"; - mainProgram = "brogue-ce"; - homepage = "https://github.com/tmewett/BrogueCE"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ AndersonTorres fgaz ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 400fa33e68625..9b20252feffa7 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl SDL2 libGLU libGL glew ncurses c-ares ] - ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreServices ]; meta = with lib; { description = "Multiplayer 3D Tank game"; diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index f18d2cc37550e..268f5d5256d28 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -8,10 +8,10 @@ let inherit (lib) optionals optionalString; cursesDeps = [ gettext ncurses ] - ++ optionals stdenv.isDarwin [ CoreFoundation ]; + ++ optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ]; tilesDeps = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf freetype ] - ++ optionals stdenv.isDarwin [ Cocoa ]; + ++ optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; patchDesktopFile = '' substituteInPlace $out/share/applications/org.cataclysmdda.CataclysmDDA.desktop \ @@ -50,14 +50,14 @@ stdenv.mkDerivation { "RELEASE=1" ] ++ optionals tiles [ "TILES=1" "SOUND=1" - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ "NATIVE=osx" "CLANG=1" "OSX_MIN=${stdenv.hostPlatform.darwinMinVersion}" ]; postInstall = optionalString tiles - ( if !stdenv.isDarwin + ( if !stdenv.hostPlatform.isDarwin then patchDesktopFile else installMacOSAppLauncher ); diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index e577d1aa710f9..495d5f97fb099 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -2,9 +2,9 @@ , tiles ? true, Cocoa , debug ? false , useXdgDir ? false -, version ? "2022-08-20" -, rev ? "f65b2bc4c6dea24bd9a993b8df146e5698e7e36f" -, sha256 ? "sha256-00Tp9OmsM39PYwAJXKKRS9zmn7KsGQ9s1eVmEqghkpw=" +, version ? "2024-07-28" +, rev ? "bfeb1fffc4179fed242a042f24b1c97f6cfaff3d" +, sha256 ? "sha256-IodXEA+pWfDdR9huRXieP3+J3WZJO19C8PUPT18dFBw=" }: let @@ -24,20 +24,7 @@ let patches = [ # Unconditionally look for translation files in $out/share/locale - ./locale-path.patch - # Fixes for failing build with GCC 13, remove on updating next release after 0.G - (fetchpatch { - url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-dangling-reference-warning.patch"; - hash = "sha256-9nPbyz49IYBOVHqr7jzCIyS8z/SQgpK4EjEz1fruIPE="; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-cstdint.patch"; - hash = "sha256-8IBW2OzAHVgEJZoViQ490n37sl31hA55ePuqDL/lil0="; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch"; - hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8="; - }) + ./locale-path-git.patch ]; makeFlags = common.makeFlags ++ [ diff --git a/pkgs/games/cataclysm-dda/locale-path-git.patch b/pkgs/games/cataclysm-dda/locale-path-git.patch new file mode 100644 index 0000000000000..8f18b0ffb71ed --- /dev/null +++ b/pkgs/games/cataclysm-dda/locale-path-git.patch @@ -0,0 +1,17 @@ +diff --git a/src/translations.cpp b/src/translations.cpp +--- a/src/translations.cpp ++++ b/src/translations.cpp +@@ -52,13 +52,11 @@ std::string locale_dir() + #define CATA_IS_ON_BSD + #endif + +-#if !defined(__ANDROID__) && ((defined(__linux__) || defined(CATA_IS_ON_BSD) || (defined(MACOSX) && !defined(TILES)))) + if( !PATH_INFO::base_path().empty() ) { + loc_dir = PATH_INFO::base_path() + "share/locale"; + } else { + loc_dir = PATH_INFO::langdir(); + } +-#endif + #endif // LOCALIZE + return loc_dir; + } diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 492a4216df411..7909bc476e7e4 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ nixinator ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/cdogs-sdl.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/cdogs-sdl.x86_64-darwin }; } diff --git a/pkgs/games/cgoban/default.nix b/pkgs/games/cgoban/default.nix index 5b453b728d4c1..73dd262173eea 100644 --- a/pkgs/games/cgoban/default.nix +++ b/pkgs/games/cgoban/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, writers , temurin-jre-bin-17 , fetchurl , makeWrapper diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index b49fb2c894734..527188019e73e 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://chessx.sourceforge.io/"; description = "Browse and analyse chess games"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eclairevoyant luispedro ]; + maintainers = with maintainers; [ luispedro ]; platforms = platforms.linux; mainProgram = "chessx"; }; diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix new file mode 100644 index 0000000000000..6ef2bb380fff2 --- /dev/null +++ b/pkgs/games/chiaki-ng/default.nix @@ -0,0 +1,126 @@ +{ lib +, fetchFromGitHub +, stdenv +, cmake +, pkg-config +, protobuf +, python3 +, ffmpeg +, libopus +, wrapQtAppsHook +, qtbase +, qtmultimedia +, qtsvg +, qtwayland +, qtdeclarative +, qtwebengine +, SDL2 +, libevdev +, udev +, curlFull +, hidapi +, json_c +, fftw +, miniupnpc +, speexdsp +, libplacebo +, vulkan-loader +, vulkan-headers +, libunwind +, shaderc +, lcms2 +, libdovi +, xxHash +}: + +stdenv.mkDerivation rec { + pname = "chiaki-ng"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "streetpea"; + repo = "chiaki-ng"; + rev = "v${version}"; + hash = "sha256-7+AixZu74y1V+rUauVswPzuWX2x6n3MJoM2A2w4zyuI="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + protobuf + python3 + python3.pkgs.wrapPython + python3.pkgs.protobuf + python3.pkgs.setuptools + ]; + + buildInputs = [ + ffmpeg + libopus + qtbase + qtmultimedia + qtsvg + qtdeclarative + qtwayland + qtwebengine + protobuf + SDL2 + curlFull + hidapi + json_c + fftw + miniupnpc + libevdev + udev + speexdsp + libplacebo + vulkan-headers + libunwind + shaderc + lcms2 + libdovi + xxHash + ]; + + # handle library name discrepancy when curl not built with cmake + postPatch = '' + substituteInPlace lib/CMakeLists.txt \ + --replace-fail 'libcurl_shared' 'libcurl' + ''; + + cmakeFlags = [ + "-Wno-dev" + (lib.cmakeFeature "CHIAKI_USE_SYSTEM_CURL" "true") + ]; + + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" + ]; + + pythonPath = [ + python3.pkgs.requests + ]; + + postInstall = '' + install -Dm755 $src/scripts/psn-account-id.py $out/bin/psn-account-id + ''; + + postFixup = '' + wrapPythonPrograms + ''; + + meta = with lib; { + homepage = "https://streetpea.github.io/chiaki-ng/"; + description = "Next-Generation of Chiaki (the open-source remote play client for PlayStation)"; + # Includes OpenSSL linking exception that we currently have no way + # to represent. + # + # See also: <https://github.com/spdx/license-list-XML/issues/939> + license = licenses.agpl3Only; + maintainers = with maintainers; [ devusb ]; + platforms = platforms.linux; + mainProgram = "chiaki"; + }; +} diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index ed1867aeffc16..6ff93f4d47e5d 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -44,10 +44,10 @@ mkDerivation rec { qtsvg protobuf SDL2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libevdev udev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; diff --git a/pkgs/games/chiaki4deck/default.nix b/pkgs/games/chiaki4deck/default.nix deleted file mode 100644 index 509fa9eccb22d..0000000000000 --- a/pkgs/games/chiaki4deck/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ lib -, fetchFromGitHub -, fetchpatch2 -, stdenv -, cmake -, pkg-config -, protobuf -, python3 -, ffmpeg -, libopus -, wrapQtAppsHook -, qtbase -, qtmultimedia -, qtsvg -, qtwayland -, qtdeclarative -, qtwebengine -, SDL2 -, libevdev -, udev -, curlFull -, hidapi -, json_c -, fftw -, miniupnpc -, speexdsp -, libplacebo -, vulkan-loader -, vulkan-headers -, libunwind -, shaderc -, lcms2 -, libdovi -, xxHash -}: - -stdenv.mkDerivation rec { - pname = "chiaki4deck"; - version = "1.7.4"; - - src = fetchFromGitHub { - owner = "streetpea"; - repo = pname; - rev = "v${version}"; - hash = "sha256-9EF+Mm6nZeo3XYH8KO7e22cJ4e9TWUEinhkm+Z213RU="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - protobuf - python3 - python3.pkgs.wrapPython - python3.pkgs.protobuf - python3.pkgs.setuptools - ]; - - buildInputs = [ - ffmpeg - libopus - qtbase - qtmultimedia - qtsvg - qtdeclarative - qtwayland - qtwebengine - protobuf - SDL2 - curlFull - hidapi - json_c - fftw - miniupnpc - libevdev - udev - speexdsp - libplacebo - vulkan-headers - libunwind - shaderc - lcms2 - libdovi - xxHash - ]; - - # handle library name discrepancy when curl not built with cmake - postPatch = '' - substituteInPlace lib/CMakeLists.txt \ - --replace-fail 'libcurl_shared' 'libcurl' - ''; - - cmakeFlags = [ - "-Wno-dev" - (lib.cmakeFeature "CHIAKI_USE_SYSTEM_CURL" "true") - ]; - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" - ]; - - pythonPath = [ - python3.pkgs.requests - ]; - - postInstall = '' - install -Dm755 $src/scripts/psn-account-id.py $out/bin/psn-account-id - ''; - - postFixup = '' - wrapPythonPrograms - ''; - - meta = with lib; { - homepage = "https://streetpea.github.io/chiaki4deck/"; - description = "Fork of Chiaki (Open Source Playstation Remote Play) with Enhancements for Steam Deck"; - # Includes OpenSSL linking exception that we currently have no way - # to represent. - # - # See also: <https://github.com/spdx/license-list-XML/issues/939> - license = licenses.agpl3Only; - maintainers = with maintainers; [ devusb ]; - platforms = platforms.linux; - mainProgram = "chiaki"; - }; -} diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix index d0c7fd79475a8..e17c8bffd3360 100644 --- a/pkgs/games/classicube/default.nix +++ b/pkgs/games/classicube/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ClassiCube"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "UnknownShadow200"; repo = "ClassiCube"; rev = version; - sha256 = "sha256-7VPn5YXNoAR3ftYMDQuQRqeMCrbyB56ir1sQWBiPWAI="; + sha256 = "sha256-ZITyfxkQB4Jpm2ZsQyM+ouPLqCVmGB7UZRXDSU/BX0k="; }; nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ]; diff --git a/pkgs/games/classicube/fix-linking.patch b/pkgs/games/classicube/fix-linking.patch index 4fc0e826cb4a8..a35d19caaca49 100644 --- a/pkgs/games/classicube/fix-linking.patch +++ b/pkgs/games/classicube/fix-linking.patch @@ -1,13 +1,14 @@ diff --git a/Makefile b/Makefile -index 83188ce..3439cdb 100644 +index a10eb5214..70e2f720e 100644 --- a/Makefile +++ b/Makefile -@@ -40,7 +40,7 @@ LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -lcrypt32 -ld3d9 - endif +@@ -55,7 +55,7 @@ endif ifeq ($(PLAT),linux) --LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -+LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -lcurl -lopenal + CFLAGS += -DCC_BUILD_ICON +- LIBS = -lX11 -lXi -lpthread -lGL -ldl ++ LIBS = -lX11 -lXi -lpthread -lGL -ldl -lcurl -lopenal + BUILD_DIR = build-linux endif - ifeq ($(PLAT),sunos) + diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 568dcc7e51e1a..d3549fd211f2a 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -28,10 +28,14 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf libGL boost libvorbis zlib curl python3 ]; - preConfigure = '' - export cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DSHAREDIR=$out/share" - export makeFlags="$makeFlags DESTDIR=$(out)" - ''; + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DSHAREDIR=${placeholder "out"}/share" + ]; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/games/corsix-th/default.nix b/pkgs/games/corsix-th/default.nix index f55a9a20b3281..8e393904b920c 100644 --- a/pkgs/games/corsix-th/default.nix +++ b/pkgs/games/corsix-th/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation(finalAttrs: { SDL2 SDL2_mixer timidity - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa CoreVideo @@ -53,11 +53,11 @@ stdenv.mkDerivation(finalAttrs: { cmakeFlags = [ "-Wno-dev" ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/corsix-th \ --set LUA_PATH "$LUA_PATH" \ --set LUA_CPATH "$LUA_CPATH" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/CorsixTH.app $out/Applications wrapProgram $out/Applications/CorsixTH.app/Contents/MacOS/CorsixTH \ diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index e32fb5fa60d6b..c240e116047f0 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "crawl${lib.optionalString tileMode "-tiles"}"; - version = "0.31.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - hash = "sha256-06tVEduk3Y2VDsoOuI4nGjN8p+wGZT7wEU80nBSg+UU="; + hash = "sha256-jhjFC8+A2dQomMwKZPSiEViXeQpty2Dk9alDcNsLvq0="; }; # Patch hard-coded paths and remove force library builds @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ++ (with python3.pkgs; [ pyyaml ]) ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU libGL ] ++ lib.optional enableSound SDL2_mixer - ++ (lib.optionals stdenv.isDarwin ( + ++ (lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit AudioUnit diff --git a/pkgs/games/crossfire/crossfire-server.nix b/pkgs/games/crossfire/crossfire-server.nix index 214fdf65451b2..aab4e2c2032b0 100644 --- a/pkgs/games/crossfire/crossfire-server.nix +++ b/pkgs/games/crossfire/crossfire-server.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchsvn -, autoreconfHook , autoconf , automake , libtool diff --git a/pkgs/games/cutechess/default.nix b/pkgs/games/cutechess/default.nix index 5e374afa1bca5..6c473857ba75b 100644 --- a/pkgs/games/cutechess/default.nix +++ b/pkgs/games/cutechess/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { description = "GUI, CLI, and library for playing chess"; homepage = "https://cutechess.com/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ eclairevoyant ]; + maintainers = with maintainers; [ ]; platforms = with platforms; (linux ++ windows); mainProgram = "cutechess"; }; diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index 658511b02dad7..2a1f194f5c0dd 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' runHook preInstall mkdir -p $out/Applications diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 7356e9395d766..baeabd63ebe4d 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -83,9 +83,9 @@ stdenv.mkDerivation rec { vulkan-headers glslang spirv-tools - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa OpenGL @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { ]; # Tests loop forever on Darwin for some reason - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkTarget = "run_tests"; postInstall = lib.optionalString (!buildClient) '' diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 9168a34253b96..c8d2102728b22 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -21,8 +21,8 @@ let # fork with patches, far behind upstream asio = fetchurl { - url = "https://github.com/diasurgical/asio/archive/bd1c839ef741b14365e77964bdd5a78994c05934.tar.gz"; - sha256 = "sha256-ePcdyvOfO5tyPVP+8t3+cS/XeEp47lfaE8gERRVoJSM="; + url = "https://github.com/diasurgical/asio/archive/4bcf552fcea3e1ae555dde2ab33bc9fa6770da4d.tar.gz"; + sha256 = "sha256-AFBy5OFsAzxZsiI4DirIHh+VjFkdalEhN9OGqhC0Cvc="; }; # fork with patches, upstream seems to be dead @@ -67,13 +67,13 @@ in stdenv.mkDerivation rec { pname = "devilutionx"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; rev = version; - sha256 = "sha256-XILPpIYSC0+CbhyVXCNvAknAhqU7VW1dWZCh2BapQjs="; + sha256 = "sha256-4cA2OHTc51U8XIk3iS16En7JJExkcn4a4VdtjNkZfH8="; }; postPatch = '' @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + (if stdenv.isDarwin then '' + '' + (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications mv devilutionx.app $out/Applications '' else '' diff --git a/pkgs/games/doom-ports/dhewm3/default.nix b/pkgs/games/doom-ports/dhewm3/default.nix index 94e4e4dc3d241..81bf7ec2108c6 100644 --- a/pkgs/games/doom-ports/dhewm3/default.nix +++ b/pkgs/games/doom-ports/dhewm3/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dhewm3"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "dhewm"; repo = "dhewm3"; rev = version; - sha256 = "sha256-BFVadzN8qhdXTUqFVM7EIqHuW2yx1x+TSWC9+myGfP0="; + sha256 = "sha256-losqnxnjRPOczjrRPyyOxCeg9TNScXLcXADgo9Bxm5k="; }; # Add libGLU libGL linking diff --git a/pkgs/games/doom-ports/doomseeker/default.nix b/pkgs/games/doom-ports/doomseeker/default.nix index 6f83fa130459c..25c536230a6c7 100644 --- a/pkgs/games/doom-ports/doomseeker/default.nix +++ b/pkgs/games/doom-ports/doomseeker/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ wrapQtAppsHook cmake qttools pkg-config xxd ]; buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - hardeningDisable = lib.optional stdenv.isDarwin "format"; + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "format"; # Doomseeker looks for the engines in the program directory postInstall = '' diff --git a/pkgs/games/doom-ports/gzdoom/default.nix b/pkgs/games/doom-ports/gzdoom/default.nix deleted file mode 100644 index f34276c7783f2..0000000000000 --- a/pkgs/games/doom-ports/gzdoom/default.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, makeDesktopItem -, copyDesktopItems -, SDL2 -, bzip2 -, cmake -, fluidsynth -, game-music-emu -, gtk3 -, imagemagick -, libGL -, libjpeg -, libsndfile -, libvpx -, libwebp -, mpg123 -, ninja -, openal -, pkg-config -, vulkan-loader -, zlib -, zmusic -}: - -stdenv.mkDerivation rec { - pname = "gzdoom"; - version = "4.12.2"; - - src = fetchFromGitHub { - owner = "ZDoom"; - repo = "gzdoom"; - rev = "g${version}"; - fetchSubmodules = true; - hash = "sha256-taie1Iod3pXvuxxBC7AArmtndkIV0Di9mtJoPvPkioo="; - }; - - outputs = [ "out" "doc" ]; - - nativeBuildInputs = [ - cmake - copyDesktopItems - imagemagick - makeWrapper - ninja - pkg-config - ]; - - buildInputs = [ - SDL2 - bzip2 - fluidsynth - game-music-emu - gtk3 - libGL - libjpeg - libsndfile - libvpx - libwebp - mpg123 - openal - vulkan-loader - zlib - zmusic - ]; - - postPatch = '' - substituteInPlace tools/updaterevision/UpdateRevision.cmake \ - --replace "ret_var(Tag)" "ret_var(\"${src.rev}\")" \ - --replace "ret_var(Timestamp)" "ret_var(\"1970-00-00 00:00:00 +0000\")" \ - --replace "ret_var(Hash)" "ret_var(\"${src.rev}\")" - ''; - - cmakeFlags = [ - "-DDYN_GTK=OFF" - "-DDYN_OPENAL=OFF" - ]; - - desktopItems = [ - (makeDesktopItem { - name = "gzdoom"; - exec = "gzdoom"; - desktopName = "GZDoom"; - comment = meta.description; - icon = "gzdoom"; - categories = [ "Game" ]; - }) - ]; - - postInstall = '' - mv $out/bin/gzdoom $out/share/games/doom/gzdoom - makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom - - for size in 16 24 32 48 64 128; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -background none -resize "$size"x"$size" $src/src/win32/icon1.ico -flatten \ - $out/share/icons/hicolor/"$size"x"$size"/apps/gzdoom.png - done; - ''; - - meta = with lib; { - homepage = "https://github.com/ZDoom/gzdoom"; - description = "Modder-friendly OpenGL and Vulkan source port based on the DOOM engine"; - mainProgram = "gzdoom"; - longDescription = '' - GZDoom is a feature centric port for all DOOM engine games, based on - ZDoom, adding an OpenGL renderer and powerful scripting capabilities. - ''; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ azahi lassulus ]; - }; -} diff --git a/pkgs/games/doom-ports/odamex/default.nix b/pkgs/games/doom-ports/odamex/default.nix index fb3b9a2fda4f0..b813fc0e1c410 100644 --- a/pkgs/games/doom-ports/odamex/default.nix +++ b/pkgs/games/doom-ports/odamex/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + (if stdenv.isDarwin then '' + '' + (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/{Applications,bin} mv odalaunch/odalaunch.app $out/Applications makeWrapper $out/{Applications/odalaunch.app/Contents/MacOS,bin}/odalaunch diff --git a/pkgs/games/doom-ports/zandronum/fmod.nix b/pkgs/games/doom-ports/zandronum/fmod.nix index 59075d69c7531..0d965cb717243 100644 --- a/pkgs/games/doom-ports/zandronum/fmod.nix +++ b/pkgs/games/doom-ports/zandronum/fmod.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "4.44.64"; shortVersion = builtins.replaceStrings [ "." ] [ "" ] version; - src = fetchurl (if stdenv.isLinux then { + src = fetchurl (if stdenv.hostPlatform.isLinux then { url = "https://zdoom.org/files/fmod/fmodapi${shortVersion}linux.tar.gz"; sha256 = "047hk92xapwwqj281f4zwl0ih821rrliya70gfj82sdfjh9lz8i1"; } else { @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { dontPatchELF = true; dontBuild = true; - installPhase = lib.optionalString stdenv.isLinux '' + installPhase = lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm755 api/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex-${version}.so ln -s libfmodex-${version}.so $out/lib/libfmodex.so patchelf --set-rpath ${libPath} $out/lib/libfmodex.so - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install -D api/lib/libfmodex.dylib $out/lib/libfmodex.dylib install -D api/lib/libfmodexL.dylib $out/lib/libfmodexL.dylib '' + '' diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index e5bbf60e15500..72ca14578baed 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -49,8 +49,8 @@ let # The latest Dwarf Fortress version. Maintainers: when a new version comes # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing # this. Note that unfuck and twbt are not required for 50. - latestVersion = if stdenv.isLinux then "50.13" - else if stdenv.isDarwin then "0.47.05" + latestVersion = if stdenv.hostPlatform.isLinux then "50.13" + else if stdenv.hostPlatform.isDarwin then "0.47.05" else throw "Unsupported system"; # Converts a version to a package name. @@ -64,7 +64,7 @@ let let isAtLeast50 = versionAtLeast dfVersion "50.0"; - dwarf-fortress-unfuck = optionalAttrs (!isAtLeast50 && stdenv.isLinux) (callPackage ./unfuck.nix { inherit dfVersion; }); + dwarf-fortress-unfuck = optionalAttrs (!isAtLeast50 && stdenv.hostPlatform.isLinux) (callPackage ./unfuck.nix { inherit dfVersion; }); dwarf-fortress = callPackage ./game.nix { inherit dfVersion; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 845aae0815e2a..1c3e05e92368d 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-GNinja" ]; installPhase = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications cp -r DwarfTherapist.app $out/Applications '' else null; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 1aefe5b642a21..02dfd89f636d1 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -67,7 +67,7 @@ let if hasAttr dfPlatform game then getAttr dfPlatform game else throw "Unsupported dfPlatform: ${dfPlatform}"; - exe = if stdenv.isLinux then + exe = if stdenv.hostPlatform.isLinux then if baseVersion >= 50 then "dwarfort" else "libs/Dwarf_Fortress" else "dwarfort.exe"; @@ -86,8 +86,8 @@ stdenv.mkDerivation { postUnpack = '' directory=${ - if stdenv.isLinux then "df_linux" - else if stdenv.isDarwin then "df_osx" + if stdenv.hostPlatform.isLinux then "df_linux" + else if stdenv.hostPlatform.isDarwin then "df_osx" else throw "Unsupported system" } if [ -d "$directory" ]; then @@ -95,7 +95,7 @@ stdenv.mkDerivation { fi ''; - nativeBuildInputs = optional stdenv.isLinux autoPatchelfHook; + nativeBuildInputs = optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = optionals isAtLeast50 [ SDL2 SDL2_image SDL2_mixer ] ++ optional (!isAtLeast50) SDL ++ optional enableUnfuck dwarf-fortress-unfuck @@ -124,7 +124,7 @@ stdenv.mkDerivation { # Store the original hash md5sum $exe | awk '{ print $1 }' > $out/hash.md5.orig echo "Original MD5: $(<$out/hash.md5.orig)" >&2 - '' + optionalString stdenv.isDarwin '' + '' + optionalString stdenv.hostPlatform.isDarwin '' # My custom unfucked dwarfort.exe for macOS. Can't use # absolute paths because original doesn't have enough # header space. Someone plz break into Tarn's house & put diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index c94a46f04d9ef..eef830965eb4e 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -9,7 +9,7 @@ # This package should, at any given time, provide an opinionated "optimal" # DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and # should contain every utility available unless you disable them. -, enableDFHack ? stdenvNoCC.isLinux +, enableDFHack ? stdenvNoCC.hostPlatform.isLinux , enableTWBT ? enableDFHack , enableSoundSense ? true , enableStoneSense ? true diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix index ad033b043a46b..279c816211ee1 100644 --- a/pkgs/games/dwarf-fortress/themes/default.nix +++ b/pkgs/games/dwarf-fortress/themes/default.nix @@ -23,7 +23,7 @@ listToAttrs (map meta = { platforms = platforms.all; maintainers = [ maintainers.matthewbauer maintainers.shazow ]; - license = licenses.free; + license = licenses.unfree; }; }; }) diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index daa27ce5dc00a..268a5c1f5da53 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -197,8 +197,8 @@ stdenv.mkDerivation rec { chmod 755 $out/bin/soundsense ''; - doInstallCheck = stdenv.isLinux; - nativeInstallCheckInputs = lib.optionals stdenv.isLinux [ expect xvfb-run ]; + doInstallCheck = stdenv.hostPlatform.isLinux; + nativeInstallCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ expect xvfb-run ]; installCheckPhase = let commonExpectStatements = fmod: lib.optionalString isAtLeast50 '' diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 8bbbc53a0dcdb..77ccc9a929c35 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -25,16 +25,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ] - ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; # ECWolf installs its binary to the games/ directory, but Nix only adds bin/ # directories to the PATH. - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mv "$out/games" "$out/bin" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} cp -R ecwolf.app $out/Applications makeWrapper $out/{Applications/ecwolf.app/Contents/MacOS,bin}/ecwolf diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 740d0bc47ea75..c213a6317b107 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -49,11 +49,11 @@ in stdenv.mkDerivation (finalAttrs: { libvpx SDL2 SDL2_mixer - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib gtk2 libGL - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AGL Cocoa GLUT @@ -74,7 +74,7 @@ in stdenv.mkDerivation (finalAttrs: { --replace-fail '#include <SDL.h>' '#include <SDL2/SDL.h>' \ --replace-fail '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \ --replace-fail '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' for f in glad.c glad_wgl.c ; do substituteInPlace source/glad/src/$f \ --replace-fail libGL.so ${libGL}/lib/libGL.so @@ -117,7 +117,7 @@ in stdenv.mkDerivation (finalAttrs: { runHook preInstall install -Dm755 -t $out/bin eduke32 mapster32 voidsw wangulator - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper $out/bin/eduke32 $out/bin/${wrapper} \ --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \ --add-flags '-g "$EDUKE32_DATA_DIR/DUKE3D.GRP"' @@ -127,7 +127,7 @@ in stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/icons/hicolor/scalable/apps gm convert "./source/duke3d/rsrc/game_icon.ico[10]" $out/share/icons/hicolor/scalable/apps/eduke32.png install -Dm644 ./source/sw/rsrc/game_icon.svg $out/share/icons/hicolor/scalable/apps/voidsw.svg - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications/EDuke32.app/Contents/MacOS mkdir -p $out/Applications/Mapster32.app/Contents/MacOS mkdir -p $out/Applications/VoidSW.app/Contents/MacOS diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 0e436ed4a7412..60e88c026f9d3 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.109.tar.xz", + "name": "factorio_alpha_x64-1.1.110.tar.xz", "needsAuth": true, - "sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h", + "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/alpha/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", + "version": "1.1.110" }, "stable": { - "name": "factorio_alpha_x64-1.1.109.tar.xz", + "name": "factorio_alpha_x64-1.1.110.tar.xz", "needsAuth": true, - "sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h", + "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/alpha/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", + "version": "1.1.110" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.109.tar.xz", + "name": "factorio_demo_x64-1.1.110.tar.xz", "needsAuth": false, - "sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx", + "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/demo/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/demo/linux64", + "version": "1.1.110" }, "stable": { - "name": "factorio_demo_x64-1.1.109.tar.xz", + "name": "factorio_demo_x64-1.1.110.tar.xz", "needsAuth": false, - "sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx", + "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/demo/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/demo/linux64", + "version": "1.1.110" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.109.tar.xz", + "name": "factorio_headless_x64-1.1.110.tar.xz", "needsAuth": false, - "sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh", + "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/headless/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/headless/linux64", + "version": "1.1.110" }, "stable": { - "name": "factorio_headless_x64-1.1.109.tar.xz", + "name": "factorio_headless_x64-1.1.110.tar.xz", "needsAuth": false, - "sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh", + "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/headless/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/headless/linux64", + "version": "1.1.110" } } } diff --git a/pkgs/games/fallout-ce/build.nix b/pkgs/games/fallout-ce/build.nix index 58305487d7c19..5f0c0b404f36d 100644 --- a/pkgs/games/fallout-ce/build.nix +++ b/pkgs/games/fallout-ce/build.nix @@ -7,6 +7,7 @@ , extraBuildInputs ? [ ] , extraMeta +, patches , pname , version , src @@ -45,7 +46,7 @@ let ''; in stdenv.mkDerivation { - inherit pname version src; + inherit pname version src patches; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] ++ extraBuildInputs; diff --git a/pkgs/games/fallout-ce/fallout-ce.nix b/pkgs/games/fallout-ce/fallout-ce.nix index 2053738d1df27..2c30d62bb77ff 100644 --- a/pkgs/games/fallout-ce/fallout-ce.nix +++ b/pkgs/games/fallout-ce/fallout-ce.nix @@ -1,5 +1,6 @@ { callPackage , fetchFromGitHub +, fetchpatch2 }: callPackage ./build.nix rec { @@ -13,6 +14,14 @@ callPackage ./build.nix rec { hash = "sha256-ZiBoF3SL00sN0QrD3fkWG9SAknumOvzRB1oQJff6ITA="; }; + patches = [ + # Fix case-sensitive filesystems issue when save/load games + (fetchpatch2 { + url = "https://github.com/alexbatalov/fallout1-ce/commit/aa3c5c1e3e3f9642d536406b2d8d6b362c9e402f.patch"; + sha256 = "sha256-quFRbKMS2pNDCNTWc1ZoB3jnB5qzw0b+2OeJUi8IPBc="; + }) + ]; + extraMeta = { description = "Fully working re-implementation of Fallout, with the same original gameplay, engine bugfixes, and some quality of life improvements"; homepage = "https://github.com/alexbatalov/fallout1-ce"; diff --git a/pkgs/games/fallout-ce/fallout2-ce.nix b/pkgs/games/fallout-ce/fallout2-ce.nix index b9d41ad994c24..09dbd93feb9df 100644 --- a/pkgs/games/fallout-ce/fallout2-ce.nix +++ b/pkgs/games/fallout-ce/fallout2-ce.nix @@ -1,5 +1,6 @@ { callPackage , fetchFromGitHub +, fetchpatch2 , zlib }: @@ -14,6 +15,14 @@ callPackage ./build.nix rec { hash = "sha256-r1pnmyuo3uw2R0x9vGScSHIVNA6t+txxABzgHkUEY5U="; }; + patches = [ + # Fix case-sensitive filesystems issue when save/load games + (fetchpatch2 { + url = "https://github.com/alexbatalov/fallout2-ce/commit/d843a662b3ceaf01ac363e9abb4bfceb8b805c36.patch"; + sha256 = "sha256-u4E9+DE6sGYikIGwKDmSBj3ErCfIo6YzIw2eMiqXw/E="; + }) + ]; + extraBuildInputs = [ zlib ]; extraMeta = { diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index ea9a092d2ccb4..08710c42214da 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -9,18 +9,18 @@ rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - hash = "sha256-jj3BdaxH7ofhHNF2eu+burn6+/0bPQQZ8JfjXAFyN4A="; + hash = "sha256-eeQjezB6pRdnPADLgDLo8b+bUSP12gfBhFNt/uYCwHU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-dysKHi6CqPrF/q7LPn1+TwOP3p2KwauhTuqLCda3OSs="; + cargoHash = "sha256-yBi6zyljkYEIUvSH4nXMw8fjPnt4kjqiuZ/QLT5IbqQ="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 0d6ba0b24eb87..c505970c964fa 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -7,19 +7,19 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-RzMSHcyDsdZYTJYU53DjoCrCpy5gjgrtZb8NuP5trPk="; + hash = "sha256-FSfA2gjJZWAbl2nTJwkAhWcJghbw5ulftU+6QBqljxY="; }; nativeBuildInputs = [ imagemagick ]; buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; makeFlags = [ "FHEROES2_STRICT_COMPILATION=1" diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index a1f8761815aa0..b404e8ecfcd03 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ] - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; meta = with lib; { description = "Free/Libre Action Roleplaying Engine"; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 47dfb08405092..1a0cb892dceac 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pierron ]; platforms = lib.platforms.unix; hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin - broken = qtClient && stdenv.isDarwin; # Missing Qt5 development files + broken = qtClient && stdenv.hostPlatform.isDarwin; # Missing Qt5 development files }; } diff --git a/pkgs/games/freedroid/default.nix b/pkgs/games/freedroid/default.nix index a3aba73131117..130b02997b59a 100644 --- a/pkgs/games/freedroid/default.nix +++ b/pkgs/games/freedroid/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ iblech ]; platforms = platforms.unix; # Builds but fails to render to the screen at runtime. - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index 702e259b97897..8c9b3e0cbf0d7 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -1,24 +1,17 @@ -{ fetchurl, fetchpatch, lib, stdenv, pkg-config, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: +{ fetchurl, lib, stdenv, pkg-config, gettext, glew, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: let - version = "0.16.1"; + version = "1.0"; in stdenv.mkDerivation { pname = "freedroidrpg"; inherit version; src = fetchurl { url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz"; - sha256 = "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2"; + hash = "sha256-eZW3C1lCSOoU0bTvWVOXpgGDAxyZFjsBwainDM7zu88="; }; patches = [ - # Pull upstream fix for -fno-common tolchains. - (fetchpatch { - name = "fno-common.patch"; - url = "https://gitlab.com/freedroid/freedroid-src/-/commit/e610d427374226b79da5258d979936459f30c761.patch"; - sha256 = "1s7sw4dkc7b6i72j6x47driq6v0k3wss48l9ivd4fw40n3iaxjb1"; - }) - # Do not embed build flags in the binary to reduce closure size. ./drop-build-deps.patch ]; @@ -26,8 +19,10 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkg-config gettext python3 ]; buildInputs = [ - SDL SDL_image SDL_gfx SDL_mixer libogg libvorbis lua5_3 libjpeg libpng zlib - ] ++ lib.optional stdenv.isDarwin libiconv; + glew SDL SDL_image SDL_gfx SDL_mixer libogg libvorbis lua5_3 libjpeg libpng zlib + ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; + + enableParallelBuilding = true; meta = with lib; { description = "Isometric 3D RPG similar to game Diablo"; diff --git a/pkgs/games/freedroidrpg/drop-build-deps.patch b/pkgs/games/freedroidrpg/drop-build-deps.patch index d9f2d37b57c7c..8bc29fb022dd1 100644 --- a/pkgs/games/freedroidrpg/drop-build-deps.patch +++ b/pkgs/games/freedroidrpg/drop-build-deps.patch @@ -2,10 +2,10 @@ Do not embed paths to build-only depends (-I...SDL2-dev and friends) into savefile lua comments. --- a/src/savestruct_internal.c +++ b/src/savestruct_internal.c -@@ -486,8 +486,8 @@ void save_game_data(struct auto_string *strout) +@@ -571,8 +571,8 @@ void save_game_data(struct auto_string *strout) autostr_append(strout, - "SAVEGAME: %s %s %s;sizeof(tux_t)=%d;sizeof(enemy)=%d;sizeof(bullet)=%d;MAXBULLETS=%d\n", - SAVEGAME_VERSION, SAVEGAME_REVISION, VERSION, (int)sizeof(tux_t), (int)sizeof(enemy), (int)sizeof(bullet), (int)MAXBULLETS); + "SAVEGAME: %s %s %s;sizeof(tux_t)=%d;sizeof(enemy)=%d;sizeof(bullet)=%d\n", + SAVEGAME_VERSION, SAVEGAME_REVISION, VERSION, (int)sizeof(tux_t), (int)sizeof(enemy), (int)sizeof(bullet)); - autostr_append(strout, "BUILD_CFLAGS: %s\n", BUILD_CFLAGS); - autostr_append(strout, "BUILD_LDFLAGS: %s\n", BUILD_LDFLAGS); + autostr_append(strout, "BUILD_CFLAGS: %s\n", "<hidden>"); diff --git a/pkgs/games/freenukum/default.nix b/pkgs/games/freenukum/default.nix index af202ffd528dc..e0f90773810e6 100644 --- a/pkgs/games/freenukum/default.nix +++ b/pkgs/games/freenukum/default.nix @@ -69,6 +69,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://salsa.debian.org/silwol/freenukum/-/blob/v${version}/CHANGELOG.md"; license = licenses.agpl3Plus; maintainers = with maintainers; [ _0x4A6F ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index 6013f17a03a70..5e658947e8039 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mainProgram = "freesweep"; homepage = "https://github.com/rwestlund/freesweep"; license = licenses.gpl2Only; - maintainers = with maintainers; [ kierdavis ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 35b8dc7330312..d7863361b8461 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -5,7 +5,7 @@ let jamenv = '' unset AR - '' + (if stdenv.isDarwin then '' + '' + (if stdenv.hostPlatform.isDarwin then '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${lib.getDev SDL}/include/SDL" export GARGLKINI="$out/Applications/Gargoyle.app/Contents/Resources/garglk.ini" '' else '' @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz"; }; - nativeBuildInputs = [ jam pkg-config ] ++ lib.optional stdenv.isDarwin cctools; + nativeBuildInputs = [ jam pkg-config ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] - ++ lib.optionals stdenv.isDarwin [ smpeg libvorbis ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ smpeg libvorbis ]; # Workaround build failure on -fno-common toolchains: # ld: build/linux.release/alan3/Location.o:(.bss+0x0): multiple definition of @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; installPhase = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then (substituteAll { inherit (stdenv) shell; isExecutable = true; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "http://ccxvii.net/gargoyle/"; license = licenses.gpl2Plus; description = "Interactive fiction interpreter GUI"; diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index a28bb8d0cc009..85ea2954309e7 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -20,20 +20,20 @@ let backend = if stdenv.hostPlatform.isx86 then "OpenGL" else "GLES"; - withVLC = stdenv.isDarwin; + withVLC = stdenv.hostPlatform.isDarwin; inherit (lib) optional optionalString; in stdenv.mkDerivation rec { pname = "gemrb"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "gemrb"; repo = "gemrb"; rev = "v${version}"; - hash = "sha256-riea48Jc9zYb19mf5sBunTp5l27PGRFd/B5KdCUWr6Y="; + hash = "sha256-n01Q/27iYXahBbUDFHW1Q3lPqCtTvhstUBgownZbKtg="; }; buildInputs = [ diff --git a/pkgs/games/gimx/conf.patch b/pkgs/games/gimx/conf.patch index 875cc68824ac6..1040a6192f383 100644 --- a/pkgs/games/gimx/conf.patch +++ b/pkgs/games/gimx/conf.patch @@ -7,7 +7,7 @@ index 451fc48..ed45f4d 100644 snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file); - -+ if(getenv("GIMXCONF")) { snprintf(file_path, sizeof(file_path), "%s", file); } ++ snprintf(file_path, sizeof(file_path), "%s", file); if(read_file(file_path) == -1) { gerror("read_file failed\n"); @@ -20,7 +20,7 @@ index 700cae9..9143d8b 100755 snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file); - -+ if(getenv("GIMXCONF")) { snprintf(file_path, sizeof(file_path), "%s", gimx_params.config_file); } ++ snprintf(file_path, sizeof(file_path), "%s", gimx_params.config_file); FILE * fp = gfile_fopen(file_path, "r"); if (fp == NULL) { diff --git a/pkgs/games/gimx/custom/Dualshock4.xml b/pkgs/games/gimx/custom/Dualshock4.xml deleted file mode 100644 index 45ee5ed7c1c16..0000000000000 --- a/pkgs/games/gimx/custom/Dualshock4.xml +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root> - <controller id="1" dpi="0" type="DS4"> - <configuration id="1"> - <trigger type="" id="" name="" button_id="" switch_back="no" delay="0"/> - <mouse_options_list/> - <intensity_list/> - <button_map> - <button id="abs_axis_10" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="3"/> - </button> - <button id="abs_axis_9" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="0"/> - </button> - <button id="abs_axis_8" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="1"/> - </button> - <button id="abs_axis_7" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="2"/> - </button> - <button id="abs_axis_11" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="4"/> - </button> - <button id="abs_axis_12" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="5"/> - </button> - <button id="abs_axis_0" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="8"/> - </button> - <button id="abs_axis_1" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="9"/> - </button> - <button id="abs_axis_15" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="11"/> - </button> - <button id="abs_axis_16" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="12"/> - </button> - <button id="abs_axis_2" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="10"/> - </button> - <button id="abs_axis_3" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="13"/> - </button> - <button id="abs_axis_4" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="14"/> - </button> - <button id="abs_axis_5" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="15"/> - </button> - <button id="abs_axis_6" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="button" id="16"/> - </button> - </button_map> - <axis_map> - <axis id="rel_axis_0" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="axis" id="0" dead_zone="0" multiplier="0.004" exponent="1.00" shape=""/> - </axis> - <axis id="rel_axis_1" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="axis" id="1" dead_zone="0" multiplier="0.004" exponent="1.00" shape=""/> - </axis> - <axis id="rel_axis_2" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="axis" id="3" dead_zone="0" multiplier="0.004" exponent="1.00" shape=""/> - </axis> - <axis id="rel_axis_3" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="axis" id="4" dead_zone="0" multiplier="0.004" exponent="1.00" shape=""/> - </axis> - <axis id="abs_axis_13" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="axis" id="2" dead_zone="0" multiplier="0.008" exponent="1.00" shape=""/> - </axis> - <axis id="abs_axis_14" label=""> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <event type="axis" id="5" dead_zone="0" multiplier="0.008" exponent="1.00" shape=""/> - </axis> - </axis_map> - <joystick_corrections_list/> - <force_feedback> - <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/> - <inversion enable="no"/> - <gain rumble="0" constant="0" spring="0" damper="0"/> - </force_feedback> - </configuration> - </controller> -</root> diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix index 4173ac0cc2d6d..8f81ab09357de 100644 --- a/pkgs/games/gimx/default.nix +++ b/pkgs/games/gimx/default.nix @@ -1,96 +1,48 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch -, makeWrapper, curl, libusb1, xorg, libxml2 -, ncurses5, bluez, libmhash, gimxPdpGamepad ? false }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, bluez, libxml2, ncurses5, libmhash, xorg }: let gimx-config = fetchFromGitHub { owner = "matlo"; repo = "GIMX-configurations"; rev = "c20300f24d32651d369e2b27614b62f4b856e4a0"; - sha256 = "02wcjk8da188x7y0jf3p0arjdh9zbb0lla3fxdb28b1xyybfvx5p"; + hash = "sha256-t/Ttlvc9LCRW624oSsFaP8EmswJ3OAn86QgF1dCUjAs="; }; in stdenv.mkDerivation rec { pname = "gimx"; - version = "unstable-2021-08-31"; + version = "8.0"; src = fetchFromGitHub { owner = "matlo"; repo = "GIMX"; - rev = "58d2098dce75ed4c90ae649460d3a7a150f4ef0a"; + rev = "v${version}"; fetchSubmodules = true; - sha256 = "05kdv2qqr311c2p76hdlgvrq7b04vcpps5c80zn8b8l7p831ilgz"; + hash = "sha256-BcFLdQgEAi6Sxyb5/P9YAIkmeXNZXrKcOa/6g817xQg="; }; - patches = [ - ./conf.patch - - # gcc-13 build fixes: - # https://github.com/matlo/GIMX/pull/705 - (fetchpatch { - name = "gcc-13-headers.patch"; - url = "https://github.com/matlo/GIMX/commit/4525dff4d9af672116d8c6c182707f2ad6295b2d.patch"; - hash = "sha256-LkswnFsxqADooa09yO7Yf0AbxTrGfjBObyv/6FQJvRs="; - }) - (fetchpatch { - name = "gcc-13-protos.patch"; - url = "https://github.com/matlo/GIMX/commit/f11855fcb8bd9d0cb9c94871b4111ddfd5b610df.patch"; - hash = "sha256-JL67UUsEyPcOuaimJtMviiGLGghuq9665Lg1QuiaWUU="; - }) - ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + patches = [ ./conf.patch ./gcc14.patch ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - curl libusb1 bluez libxml2 ncurses5 libmhash - xorg.libX11 xorg.libXi xorg.libXext - ]; - - postPatch = lib.optionals gimxPdpGamepad '' - substituteInPlace ./shared/gimxcontroller/include/x360.h \ - --replace "0x045e" "0x0e6f" --replace "0x028e" "0x0213" - substituteInPlace ./loader/firmware/EMU360.hex \ - --replace "1B210001" "1B211001" \ - --replace "09210001" "09211001" \ - --replace "5E048E021001" "6F0E13020001" - ''; - + buildInputs = [ curl libusb1 bluez libxml2 ncurses5 libmhash xorg.libX11 xorg.libXi ]; makeFlags = [ "build-core" ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=address" - "-Wno-error=deprecated-declarations" - "-Wno-error=use-after-free" - ]; - installPhase = '' runHook preInstall mkdir -p $out - substituteInPlace ./core/Makefile --replace "chmod ug+s" "echo" - + substituteInPlace ./core/Makefile --replace-fail "chmod ug+s" "echo" export DESTDIR="$out" make install-shared install-core mv $out/usr/lib $out/lib mv $out/usr/bin $out/bin - rmdir $out/usr + cp -r ${gimx-config}/Linux $out/share - runHook postInstall - ''; - - postInstall = '' - mkdir -p $out/share - cp -r ./loader/firmware $out/share/firmware - cp -r ${gimx-config}/Linux $out/share/config - cp -r ${./custom} $out/share/custom + makeWrapper $out/bin/gimx $out/bin/gimx-ds4 \ + --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ + --add-flags "-c $out/share/Dualshock4.xml" - makeWrapper $out/bin/gimx $out/bin/gimx-dualshock4 \ - --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ - --add-flags "-c $out/share/custom/Dualshock4.xml" - - makeWrapper $out/bin/gimx $out/bin/gimx-xboxonepad \ - --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ - --add-flags "-c $out/share/config/XOnePadUsb.xml" + runHook postInstall ''; meta = with lib; { @@ -98,6 +50,5 @@ in stdenv.mkDerivation rec { description = "Game Input Multiplexer"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ bb2020 ]; }; } diff --git a/pkgs/games/gimx/gcc14.patch b/pkgs/games/gimx/gcc14.patch new file mode 100644 index 0000000000000..b736891f07eaa --- /dev/null +++ b/pkgs/games/gimx/gcc14.patch @@ -0,0 +1,26 @@ +diff --git a/core/config_reader.c b/core/config_reader.c +index 451fc48..737d27c 100644 +--- a/core/config_reader.c ++++ b/core/config_reader.c +@@ -17,7 +17,7 @@ + #include "../directories.h" + #include "macros.h" + #include <errno.h> +- ++#include <stdlib.h> + /* + * These variables are used to read the configuration. + */ +diff --git a/core/gimx.c b/core/gimx.c +index 700cae9..693f72f 100755 +--- a/core/gimx.c ++++ b/core/gimx.c +@@ -8,7 +8,7 @@ + #include <errno.h> //to print errors + #include <string.h> //to print errors + #include <limits.h> //PATH_MAX +- ++#include <stdlib.h> + #ifndef WIN32 + #include <termios.h> //to disable/enable echo + #include <unistd.h> diff --git a/pkgs/games/gmad/default.nix b/pkgs/games/gmad/default.nix index 97538679ee597..799609856137b 100644 --- a/pkgs/games/gmad/default.nix +++ b/pkgs/games/gmad/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ premake4 bootil ]; targetName = - if stdenv.isLinux then "gmad_linux" - else if stdenv.isDarwin then "gmad_osx" + if stdenv.hostPlatform.isLinux then "gmad_linux" + else if stdenv.hostPlatform.isDarwin then "gmad_osx" else "gmad"; premakeFlags = [ "--bootil_lib=${bootil}/lib" "--bootil_inc=${bootil}/include" ]; diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix deleted file mode 100644 index 41cc79f26c2e3..0000000000000 --- a/pkgs/games/gnome-hexgl/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, ninja -, meson -, pkg-config -, gthree -, gsound -, libepoxy -, gtk3 -}: - -stdenv.mkDerivation rec { - pname = "gnome-hexgl"; - version = "unstable-2020-07-24"; - - src = fetchFromGitHub { - owner = "alexlarsson"; - repo = "gnome-hexgl"; - rev = "f47a351055a235730795341dcd6b2397cc4bfa0c"; - sha256 = "yZWGymaSUfnCP8VAEdDH64w0muSnRK/XPi1/IqTrE4k="; - }; - - nativeBuildInputs = [ - ninja - meson - pkg-config - ]; - - buildInputs = [ - gthree - gsound - libepoxy - gtk3 - ]; - - meta = with lib; { - description = "Gthree port of HexGL"; - mainProgram = "gnome-hexgl"; - homepage = "https://github.com/alexlarsson/gnome-hexgl"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index 84bc7f5df8af0..18d5698fd23e7 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -18,15 +18,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gtk" "--with--board3d" ]; - desktopItems = makeDesktopItem { - desktopName = "GNU Backgammon"; - name = pname; - genericName = "Backgammon"; - comment = meta.description; - exec = pname; - icon = pname; - categories = [ "Game" "GTK" "StrategyGame" ]; - }; + desktopItems = [ + (makeDesktopItem { + desktopName = "GNU Backgammon"; + name = pname; + genericName = "Backgammon"; + comment = meta.description; + exec = pname; + icon = pname; + categories = [ "Game" "GTK" "StrategyGame" ]; + }) + ]; meta = with lib; { description = "World class backgammon application"; diff --git a/pkgs/games/gogdl/default.nix b/pkgs/games/gogdl/default.nix index dacf8a2f9fc5b..0f96f0e4e36a4 100644 --- a/pkgs/games/gogdl/default.nix +++ b/pkgs/games/gogdl/default.nix @@ -10,14 +10,14 @@ buildPythonApplication rec { pname = "gogdl"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "heroic-gogdl"; - rev = "b1d9792f4b6c60382a88f09d03d6ed63afcc0310"; - hash = "sha256-/J50pRbc3iua86HES/3RUIeamz/abh8wo0c/yegC4cM="; + rev = "1ff09820915f855ea764c6e49ea2def63e86b3bb"; + hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0="; }; disabled = pythonOlder "3.8"; diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix index 169b0fa77db08..4d9fe630ca42d 100644 --- a/pkgs/games/gtypist/default.nix +++ b/pkgs/games/gtypist/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ ncurses perl fortune ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; preFixup = '' wrapProgram "$out/bin/typefortune" \ diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix index 1add66074204d..f76085b77ddf1 100644 --- a/pkgs/games/gweled/default.nix +++ b/pkgs/games/gweled/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchbzr { url = "lp:gweled"; rev = "108"; - sha256 = "sha256-rM4dgbYfSrVqZwi+xzKuEtmtjK3HVvqeutmni1vleLo="; + hash = "sha256-rM4dgbYfSrVqZwi+xzKuEtmtjK3HVvqeutmni1vleLo="; }; doCheck = false; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 351dd15c417fb..389beb7b51c8f 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { hedgehog or hedgehogs after a player's or CPU turn is shown only when all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; platforms = platforms.linux; }; } diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index 4a4e2abd66d1e..a9c85e26b5132 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -1,26 +1,28 @@ -{ lib -, stdenv -, fetchFromGitHub -, pnpm -, nodejs -, makeWrapper -, electron -, vulkan-helper -, gogdl -, legendary-gl -, nile -, comet-gog +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + pnpm, + nodejs, + makeWrapper, + electron, + vulkan-helper, + gogdl, + legendary-gl, + nile, + comet-gog, }: stdenv.mkDerivation (finalAttrs: { pname = "heroic-unwrapped"; - version = "2.15.1"; + version = "2.15.2"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${finalAttrs.version}"; - hash = "sha256-+OQRcBOf9Y34DD7FOp/3SO05mREG6or/HPiOkasHWPM="; + hash = "sha256-AndJqk1VAUdC4pOTRzyfhdxmzJMskGF6pUiqPs3fIy4="; }; pnpmDeps = pnpm.fetchDeps { @@ -93,6 +95,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + inherit (finalAttrs) pnpmDeps; + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac"; homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher"; diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index 54732d0e87d5f..4fe9429193199 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -1,7 +1,8 @@ -{ buildFHSEnv -, heroic-unwrapped -, extraPkgs ? pkgs: [ ] -, extraLibraries ? pkgs: [ ] +{ + buildFHSEnv, + heroic-unwrapped, + extraPkgs ? pkgs: [ ], + extraLibraries ? pkgs: [ ], }: buildFHSEnv { @@ -15,120 +16,131 @@ buildFHSEnv { # required by Electron unshareIpc = false; - targetPkgs = pkgs: with pkgs; [ - heroic-unwrapped - gamemode - curl - gawk - zenity - plasma5Packages.kdialog - mangohud - nettools - opencl-headers - p7zip - perl - psmisc - python3 - unzip - which - xorg.xrandr - zstd - ] ++ extraPkgs pkgs; + targetPkgs = + pkgs: + with pkgs; + [ + heroic-unwrapped + gamemode + curl + gawk + zenity + plasma5Packages.kdialog + mangohud + nettools + opencl-headers + p7zip + perl + psmisc + python3 + unzip + which + xorg.xrandr + zstd + ] + ++ extraPkgs pkgs; - multiPkgs = let - xorgDeps = pkgs: with pkgs.xorg; [ - libpthreadstubs - libSM - libX11 - libXaw - libxcb - libXcomposite - libXcursor - libXdmcp - libXext - libXi - libXinerama - libXmu - libXrandr - libXrender - libXv - libXxf86vm - ]; - gstreamerDeps = pkgs: with pkgs.gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-plugins-bad - gst-libav - ]; - in pkgs: with pkgs; [ - alsa-lib - alsa-plugins - bash - cabextract - cairo - coreutils - cups - dbus - freealut - freetype - fribidi - giflib - glib - gnutls - gtk3 - icu - lcms2 - libevdev - libgcrypt - libGLU - libglvnd - libgpg-error - libgudev - libjpeg - libkrb5 - libmpeg2 - libogg - libopus - libpng - libpulseaudio - libselinux - libsndfile - libsoup - libtheora - libtiff - libunwind - libusb1 - libv4l - libva - libvdpau - libvorbis - libvpx - libwebp - libxkbcommon - libxml2 - mpg123 - ncurses - ocl-icd - openal - openldap - openssl - pango - pipewire - samba4 - sane-backends - SDL2 - speex - sqlite - udev - unixODBC - util-linux - v4l-utils - vulkan-loader - wayland - zlib - ] ++ xorgDeps pkgs + multiPkgs = + let + xorgDeps = + pkgs: with pkgs.xorg; [ + libpthreadstubs + libSM + libX11 + libXaw + libxcb + libXcomposite + libXcursor + libXdmcp + libXext + libXi + libXinerama + libXmu + libXrandr + libXrender + libXv + libXxf86vm + ]; + gstreamerDeps = + pkgs: with pkgs.gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav + ]; + in + pkgs: + with pkgs; + [ + alsa-lib + alsa-plugins + bash + cabextract + cairo + coreutils + cups + dbus + freealut + freetype + fribidi + giflib + glib + gnutls + gtk3 + icu + lcms2 + libevdev + libgcrypt + libGLU + libglvnd + libgpg-error + libgudev + libjpeg + libkrb5 + libmpeg2 + libogg + libopus + libpng + libpulseaudio + libselinux + libsndfile + libsoup + libtheora + libtiff + libunwind + libusb1 + libv4l + libva + libvdpau + libvorbis + libvpx + libwebp + libxkbcommon + libxml2 + mpg123 + ncurses + ocl-icd + openal + openldap + openssl + pango + pipewire + samba4 + sane-backends + SDL2 + speex + sqlite + udev + unixODBC + util-linux + v4l-utils + vulkan-loader + wayland + zlib + ] + ++ xorgDeps pkgs ++ gstreamerDeps pkgs ++ extraLibraries pkgs; diff --git a/pkgs/games/hheretic/default.nix b/pkgs/games/hheretic/default.nix index 6e4be6bd54b71..83b0ccb620cf5 100644 --- a/pkgs/games/hheretic/default.nix +++ b/pkgs/games/hheretic/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "hheretic-gl"; maintainers = with lib.maintainers; [ moody ]; inherit (SDL.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/games/hhexen/default.nix b/pkgs/games/hhexen/default.nix index 0e5345e85a7d3..c73040a30f7e3 100644 --- a/pkgs/games/hhexen/default.nix +++ b/pkgs/games/hhexen/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ moody djanatyn ]; mainProgram = "hhexen-gl"; inherit (SDL.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/games/hmcl/default.nix b/pkgs/games/hmcl/default.nix index 69b546183406a..7a330c399272b 100644 --- a/pkgs/games/hmcl/default.nix +++ b/pkgs/games/hmcl/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { glib openal libglvnd - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 xorg.libXxf86vm xorg.libXext diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index ea363c969429d..9ad6e3105406f 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { inherit src version; nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ SDL2 fltk rapidjson gtest ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; + buildInputs = [ SDL2 fltk rapidjson gtest ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; patches = [ ./remove-rust-buildstep.patch diff --git a/pkgs/games/jfsw/default.nix b/pkgs/games/jfsw/default.nix index ed82964e4d0eb..181b28e06c9d6 100644 --- a/pkgs/games/jfsw/default.nix +++ b/pkgs/games/jfsw/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; mainProgram = "sw"; maintainers = with lib.maintainers; [ moody ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; inherit (SDL2.meta) platforms; }; }) diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix index 69f3c34a1f0ff..f5f5bb6d1eb46 100644 --- a/pkgs/games/julius/default.nix +++ b/pkgs/games/julius/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool libicns imagemagick @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { SDL2 SDL2_mixer libpng - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall mkdir -p $out/Applications cp -r julius.app $out/Applications/ diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index 23e130582a3d0..7040aa4e34019 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zstd - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libxkbcommon udev @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { xorg.libXcursor xorg.libXi xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa rustPlatform.bindgenHook ]; @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/jumpy --chdir $out/share ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/.jumpy-wrapped \ --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; diff --git a/pkgs/games/kabeljau/default.nix b/pkgs/games/kabeljau/default.nix index 7f917dce4b3d5..58d35ddecb0f3 100644 --- a/pkgs/games/kabeljau/default.nix +++ b/pkgs/games/kabeljau/default.nix @@ -1,29 +1,26 @@ -{ stdenvNoCC, lib, fetchFromGitea, just, inkscape, makeWrapper, bash, dialog }: +{ stdenvNoCC, lib, fetchFromGitea, just, imagemagick, makeWrapper, bash, dialog }: stdenvNoCC.mkDerivation rec { pname = "kabeljau"; - version = "1.2.0"; + version = "2.1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "annaaurora"; repo = "kabeljau"; rev = "v${version}"; - hash = "sha256-RedVItgfr6vgqXHA3bOiHXDpfGuHI+sX4jCHL9G5jYk="; + hash = "sha256-yZHDnzNTdDXHR+Pi3NODqw4npzuthHgOJYnTmIvGyUE="; }; # Inkscape is needed in a just recipe where it is used to export the SVG icon to several different sized PNGs. - nativeBuildInputs = [ just inkscape makeWrapper ]; + nativeBuildInputs = [ just imagemagick makeWrapper ]; postPatch = '' patchShebangs --host ${pname} - substituteInPlace ./justfile \ - --replace " /bin" " $out/bin" \ - --replace " /usr" " $out" ''; installPhase = '' runHook preInstall - just install + just --set bin-path $out/bin --set share-path $out/share linux-install wrapProgram $out/bin/${pname} --suffix PATH : ${ lib.makeBinPath [ dialog ] } diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 58dda8d23a635..adaae799cb5cf 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in "$out"/bin/*; do if isELF "$f"; then patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" diff --git a/pkgs/games/ldmud/default.nix b/pkgs/games/ldmud/default.nix index 83bbadfe7dc41..de92518781fe1 100644 --- a/pkgs/games/ldmud/default.nix +++ b/pkgs/games/ldmud/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ++ lib.optional postgresSupport postgresql ++ lib.optional sqliteSupport sqlite ++ lib.optional tlsSupport openssl ++ lib.optional pythonSupport python310 - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # To support systems without autoconf LD puts its configure.ac in a non-default # location and uses a helper script. We skip that script and symlink the .ac diff --git a/pkgs/games/libremines/default.nix b/pkgs/games/libremines/default.nix index f1a79e54bd62e..e639b981369e7 100644 --- a/pkgs/games/libremines/default.nix +++ b/pkgs/games/libremines/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtmultimedia - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index 3f77d9bbe415f..deb4f2eb02509 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/lincity"; maintainers = [ ]; # ../lcintl.h:14:10: fatal error: 'libintl.h' file not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index 9c61f97d1a7f9..64ea76560f134 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ allegro ]; - configureFlags = lib.optional stdenv.isx86_64 "--disable-asm"; + configureFlags = lib.optional stdenv.hostPlatform.isx86_64 "--disable-asm"; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/manaplus/default.nix b/pkgs/games/manaplus/default.nix index deb12d45ad4b7..768a971d83465 100644 --- a/pkgs/games/manaplus/default.nix +++ b/pkgs/games/manaplus/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Free OpenSource 2D MMORPG client"; homepage = "https://manaplus.org/"; license = lib.licenses.gpl2Plus; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/games/mchprs/default.nix b/pkgs/games/mchprs/default.nix index 49ef836423cdc..97fc84b5d9b46 100644 --- a/pkgs/games/mchprs/default.nix +++ b/pkgs/games/mchprs/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 789b2bca65a52..43001343b7488 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -187,7 +187,7 @@ stdenv.mkDerivation { mkdir -p $out/bin makeWrapper ${jdk}/bin/java $out/bin/mindustry \ --add-flags "-jar $out/share/mindustry.jar" \ - ${lib.optionalString stdenv.isLinux "--suffix PATH : ${lib.makeBinPath [zenity]}"} \ + ${lib.optionalString stdenv.hostPlatform.isLinux "--suffix PATH : ${lib.makeBinPath [zenity]}"} \ --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libpulseaudio alsa-lib libjack2]} \ --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/'' + lib.optionalString enableWayland '' \ --set SDL_VIDEODRIVER wayland \ @@ -240,6 +240,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ chkno fgaz thekostins ]; platforms = lib.platforms.all; # TODO alsa-lib is linux-only, figure out what dependencies are required on Darwin - broken = enableClient && stdenv.isDarwin; + broken = enableClient && stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/games/minecraft-servers/derivation.nix b/pkgs/games/minecraft-servers/derivation.nix index a94a2daecac24..c6f26d73eb6f1 100644 --- a/pkgs/games/minecraft-servers/derivation.nix +++ b/pkgs/games/minecraft-servers/derivation.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeWrapper ${lib.getExe jre_headless} $out/bin/minecraft-server \ --append-flags "-jar $out/lib/minecraft/server.jar nogui" \ - ${lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"} + ${lib.optionalString stdenv.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"} runHook postInstall ''; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index d17be89b47210..f4ccf5ac71e9b 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minetest"; - version = "5.9.0"; + version = "5.9.1"; src = fetchFromGitHub { owner = "minetest"; repo = "minetest"; rev = finalAttrs.version; - hash = "sha256-cxbiuoD1J3WFoveUgxeR/XXdE7MMR0UEDFleDiaxnsA="; + hash = "sha256-0WTDhFt7GDzN4AK8U17iLkjeSMK+gOWZRq46HBTeO3w="; }; cmakeFlags = [ @@ -119,13 +119,13 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' patchShebangs $out - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/minetest.app $out/Applications ''; diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 78a7eb901c501..eef4560e386a5 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { qtmultimedia yajl discord-rpc - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ AppKit ]; @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { cp -r ../translations $out/share/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r src/mudlet.app/ $out/Applications/mudlet.app mv $out/Applications/mudlet.app/Contents/MacOS/mudlet $out/Applications/mudlet.app/Contents/MacOS/mudlet-unwrapped @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsForQt5.qtkeychain discord-rpc ]}:$out/lib" \ --chdir "$out"; - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -pv $out/bin cp src/mudlet $out/bin/mudlet-unwrapped makeQtWrapper $out/bin/mudlet-unwrapped $out/bin/mudlet \ diff --git a/pkgs/games/nile/default.nix b/pkgs/games/nile/default.nix index ae368b696e60e..38fcced181279 100644 --- a/pkgs/games/nile/default.nix +++ b/pkgs/games/nile/default.nix @@ -1,5 +1,5 @@ { lib -, unstableGitUpdater +, gitUpdater , buildPythonApplication , fetchFromGitHub , pythonOlder @@ -10,19 +10,21 @@ , zstandard , json5 , platformdirs -, cacert }: -buildPythonApplication rec { +let + version = "1.1.2"; +in +buildPythonApplication { pname = "nile"; - version = "1.1.1-unstable-2024-08-07"; + inherit version; format = "pyproject"; src = fetchFromGitHub { owner = "imLinguin"; repo = "nile"; - rev = "9ce614f82a550a714ae55c4365658dba7bb1bb15"; - hash = "sha256-7EzU8aUYiYe1eXFs6nE1qchlMzIKh2U09uIGmiN32xM="; + rev = "v${version}"; + hash = "sha256-/C4b8wPKWHGgiheuAN7AvU+KcD5aj5i6KzgFSdTIkNI="; }; disabled = pythonOlder "3.8"; @@ -56,7 +58,7 @@ buildPythonApplication rec { maintainers = with maintainers; [ aidalgol ]; }; - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; }; } diff --git a/pkgs/games/npush/default.nix b/pkgs/games/npush/default.nix index 7a061a4bc638e..e3d199c7fa87b 100644 --- a/pkgs/games/npush/default.nix +++ b/pkgs/games/npush/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://npush.sourceforge.net/"; description = "Sokoban-like game"; mainProgram = "npush"; diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index 3562aa8c6f89d..a66504fa1d83c 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { ]; # source/utils/StackTraceUnix.cpp:122:2: error: #error Unsupported architecture. - postPatch = lib.optionalString (!stdenv.isx86_64) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isx86_64) '' cp source/utils/StackTrace{Stub,Unix}.cpp ''; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index edeed841c923a..22bd90a348a97 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { postPatch = '' sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12 - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Don't fix Darwin app bundle sed -i '/fixup_bundle/d' CMakeLists.txt ''; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; # If not set, OSG plugin .so files become shell scripts on Darwin. - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; buildInputs = [ SDL2 @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { recastnavigation unshield yaml-cpp - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreMedia VideoDecodeAcceleration VideoToolbox @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=${GL}" "-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENMW_OSX_DEPLOYMENT=ON" ]; diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index ac33578ca3517..5ed0f6da36631 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -29,34 +29,34 @@ }: let - openrct2-version = "0.4.12"; + openrct2-version = "0.4.14"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.4.6"; - openmsx-version = "1.5"; + objects-version = "1.4.7"; + openmsx-version = "1.6"; opensfx-version = "1.0.5"; - title-sequences-version = "0.4.6"; + title-sequences-version = "0.4.14"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - hash = "sha256-AZFJt1ZsYO07hHN9Nt+N95wTGfYPob/kZ7EkVVkUezg="; + hash = "sha256-d02LXcqoB6lDGdd82IrHi0Br8rjAFpRgQ86344XUeCA="; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; rev = "v${objects-version}"; - hash = "sha256-XfVic6b5jB1P2I0w5C+f97vvWvCh2zlcWpaXGLOj3CA="; + hash = "sha256-XtKhgCahGzhuIdwvoz47rlRthZEhb0w+OuGhZnplHSc="; }; openmsx-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenMusic"; rev = "v${openmsx-version}"; - hash = "sha256-p/wlvQFfu3R+jIuCcRbTMvxt0VKGGwJw0NDIsf6URWI="; + hash = "sha256-KjWJSB2tdE0ExswVlz0dLXNPhLJ1kI6VZb3vqXQfx8w="; }; opensfx-src = fetchFromGitHub { @@ -70,7 +70,7 @@ let owner = "OpenRCT2"; repo = "title-sequences"; rev = "v${title-sequences-version}"; - hash = "sha256-HWp2ecClNM/7O3oaydVipOnEsYNP/bZnZFS+SDidPi0="; + hash = "sha256-ier7sBYJjBIvKVxfaCelJPZ+oF9NEshvR2k/X9JpP+0="; }; in stdenv.mkDerivation { diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 061d053e34ec1..d2d86226af261 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { buildInputs = [ sfml libGLU libGL bullet glm libmad openal SDL2 boost ffmpeg_6 - ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenAL Cocoa ]; meta = with lib; { description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable"; diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index ebab9a018fbfa..fd070312b1f9f 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ abbradar azahi ]; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isDarwin || (stdenv.isLinux && stdenv.isAarch64); + broken = stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index 5ab1d50830ba5..89ebe14cb41e1 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -3,26 +3,27 @@ , fetchurl , fetchzip , appimageTools +, makeWrapper }: let pname = "osu-lazer-bin"; - version = "2024.817.0"; + version = "2024.906.2"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-ssyKy9CDN5LcyaQE7o56VoXoYYVU1zksMT3GxdMu2lA="; + hash = "sha256-KyvC8gEqZvXMATxS2513X0WdlR7nF8tHS4R/TPFrHao="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-6yGMZ+rMnzuu0NNBD0BBSV5YvuGibIkhBL3HQWqudzo="; + hash = "sha256-ToxDZHL59YPmybvB9tsiOnFEd+FJJE4mNMfaK6btYKo="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-AruD0XoJJm3+LQ+WH2CqKb+7S/VjG6YmdWhsH5l3/uM="; + hash = "sha256-zQnR3KwlE1gTWH8f+GDRBsc7Whfn9XpT1D/NLg5TtrU="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); @@ -42,7 +43,7 @@ let passthru.updateScript = ./update-bin.sh; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then stdenv.mkDerivation { inherit pname version src meta passthru; @@ -64,10 +65,13 @@ else appimageTools.wrapType2 { contents = appimageTools.extract { inherit pname version src; }; in '' - mv -v $out/bin/${pname} $out/bin/osu\! - install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications + . ${makeWrapper}/nix-support/setup-hook + mv -v $out/bin/${pname} $out/bin/osu! + wrapProgram $out/bin/osu! \ + --set OSU_EXTERNAL_UPDATE_PROVIDER 1 + install -m 444 -D ${contents}/osu!.desktop -t $out/share/applications for i in 16 32 48 64 96 128 256 512 1024; do - install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png + install -D ${contents}/osu!.png $out/share/icons/hicolor/''${i}x$i/apps/osu!.png done ''; } diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index c0f27745280e5..d2826e295ed90 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -5,6 +5,7 @@ , dotnetCorePackages , makeDesktopItem , copyDesktopItems +, makeWrapper , ffmpeg , alsa-lib , SDL2 @@ -17,13 +18,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.817.0"; + version = "2024.906.2"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-X6YaNHwNtHSqjV4oKQmYUd1aadbHSmr3EZDoq6epAkE="; + hash = "sha256-ykCO+q28IUJumt3nra1BUlwuXqLS1FYOqcDe2LPPGVY="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; @@ -32,7 +33,10 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; - nativeBuildInputs = [ copyDesktopItems ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; runtimeDeps = [ ffmpeg @@ -59,8 +63,11 @@ buildDotnetModule rec { fixupPhase = '' runHook preFixup + wrapProgram $out/bin/osu! \ + --set OSU_EXTERNAL_UPDATE_PROVIDER 1 + for i in 16 32 48 64 96 128 256 512 1024; do - install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png + install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu!.png done ln -sft $out/lib/${pname} ${SDL2}/lib/libSDL2${stdenvNoCC.hostPlatform.extensions.sharedLibrary} diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index d4a20ceeb389d..bd57355c7910f 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -3,7 +3,6 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AutoMapper"; version = "12.0.1"; hash = "sha256-a3wCSaOXl+5RKWNi1ddRbNWkOzfodFAUokqPyQiVHGg="; }) - (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.11.1"; hash = "sha256-oNqHp7FwK7/gxCi0XhOqzdmGlWfp1D7gYuHfQBnICmk="; }) (fetchNuGet { pname = "CodeFileSanity"; version = "0.0.37"; hash = "sha256-+BoA4FdDUfeREdc42xbnonh3IBLOjzyrrBosaswbSg4="; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.2"; hash = "sha256-Vsn81duAmPIPkR40h5bEz7hgtF5Kt5nAAGhQZrQbqxE="; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; hash = "sha256-oRNrlF1/yK0QvrW2+48RsmSg9h9/pDIfA56/bpoHXFU="; }) @@ -63,7 +62,7 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; hash = "sha256-N3D1z5aoGwAZ6+ZxrWMtXgacvQcgDG+aLrQQI9uysmM="; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; hash = "sha256-/Eykez68qYMO5mlmUelzAke8aJehyp8fspO5Z+yt5G4="; }) (fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2023.3.3"; hash = "sha256-Nn3imJvnqLe02gR1GyUHYH4+XkrNnhLy9dyCjJCkB7M="; }) - (fetchNuGet { pname = "managed-midi"; version = "1.10.0"; hash = "sha256-eNcYo4O0hnuYN6wk/WcR5z6/yT9SNAPEsEaSiXBEMOY="; }) + (fetchNuGet { pname = "managed-midi"; version = "1.10.1"; hash = "sha256-iuqpyp8vM7ZjtcM9KNqx9se/UhQHsYrQ+lxL4EntyXU="; }) (fetchNuGet { pname = "Markdig"; version = "0.23.0"; hash = "sha256-4Kjeb54eyas0pCMbTHGPK13vW9zEnFyZ5VStwwtClq8="; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.140"; hash = "sha256-qcqLsxV9RO5/YLWh3gE6vJFgiWg+94GcP2MtptimOBI="; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.140"; hash = "sha256-im4hZAocYWEn5AS2ACreP3mQTEzkW1MiuUJTycIqHUY="; }) @@ -88,11 +87,13 @@ (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; hash = "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; hash = "sha256-oTYhI+lMwaQ7l9CfDHeNMBAdfofv4kHC0vqBZ7oJr4U="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; hash = "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.3"; hash = "sha256-itpwRYzmJZUt2kYJrrcq2IOwqqOskdbE3HMmD8GV/jY="; }) (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "7.0.15"; hash = "sha256-EnqalFuhuEsdm/4Op2K+yAdvWzad3L7hKcnwFwahypE="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; hash = "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; hash = "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; hash = "sha256-05mravm6SK0wNV3BKDTmN+8/1RxcPOM9kaUvGhjWY3c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.11"; hash = "sha256-xNqhEqOm7tI3nxdlbAJ9NSm5/WbkRSUCrdDM+syJ9EQ="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; hash = "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.1"; hash = "sha256-uI5Mo+e+8x7mhDcFyDEW2Nwg+LTpw+0R38LZ/ognHz4="; }) @@ -123,6 +124,7 @@ (fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.11.0"; hash = "sha256-Bdwsy96KpU44Dr6JVKPOhOmiZYZ/uMKQ0Ug2nKZiDcQ="; }) (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; hash = "sha256-q11PcqNtfTKavfr1SPtmJTEx3qwHrXW+MrCw6Y3aNxA="; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; hash = "sha256-eBfn91Kr7Vv+js8kvKrnai2W3ZN7dY+7u9ivHGwoIxA="; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.10.1"; hash = "sha256-jOh27AORk0TIhVePDVAgVhh6FuUo2v3oh/Xapcw7UVI="; }) (fetchNuGet { pname = "NUnit"; version = "3.14.0"; hash = "sha256-CuP/q5HovPWfAW3Cty/QxRi7VpjykJ3TDLq5TENI6KY="; }) (fetchNuGet { pname = "NVika"; version = "3.0.0"; hash = "sha256-zgg8aUuIFQ4EZHScy+YHmkwDE9K5vzUJF8s9aiJNFuw="; }) (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.4"; hash = "sha256-tTk8ezYrMs/Kj+snMvWq9Ae7WLU4pq5NpFHEZV8WjJM="; }) @@ -136,17 +138,17 @@ (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; hash = "sha256-VfIbFhCDsCRZW5bCbt8MSmE2kAlcKxxx6vdFOus4he8="; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; hash = "sha256-qUEGJHoYfDvHrpuXdVaiSoV2iVVh9X0yEB41u96+q6A="; }) (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; hash = "sha256-HzhypEVJA+6h3aBB95zNeGbmzEIRc5435Eh9nYpjVkA="; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.809.2"; hash = "sha256-Q8AmtVjauwe0mJMkvY6SXTF0WsycjRyInQv8/Uo2iQs="; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.907.1"; hash = "sha256-h9wQPX7EP4b6+a7D/qU3qvSi05yp2rOj52nBmko1Y2o="; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2024.809.1-nativelibs"; hash = "sha256-F7xd66bCEDgEjYgqmx21lYde+ebCsX/E2fuqWXH4xyU="; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; hash = "sha256-XXV/qBJ9vEVF15fcOlDyoJ8j47azuSJaXHEgsn3fOwA="; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.810.0"; hash = "sha256-p8aegRGVYUTKhV9qdIlvFxISMpFL761Q6RdbpT8gWWY="; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.904.0"; hash = "sha256-x3et2Rnr90bdlFzR852Pt1EkW69/eQxlXciPNtFrN44="; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; hash = "sha256-Xu4uiYs1pqIXcBWeTBIc8OIqbLmH6MvaY6Dim4ZNikg="; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.741-alpha"; hash = "sha256-sdX+MoMlIPUyi4yEUVHtqxKWF/VK04e2VaUavmgBEJU="; }) (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.807.1"; hash = "sha256-9ppVYCkc43NIsfe9iKWlxd8elgECZqP+pRPT9ybxiAU="; }) - (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.58-gfe61932a71"; hash = "sha256-+fZB3EJpXQPolB13mRNglznpUXgCh82MqymkCjteTPg="; }) - (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.58-gfe61932a71"; hash = "sha256-BejLZdoBRcqCgoiHWi/vSr2apyxnpZ95tYjN9hj9ox4="; }) - (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.58-gfe61932a71"; hash = "sha256-f1a/pHOWs0S5sWsiTRW1KUdqEpA1WVO+d96bdagt0eA="; }) - (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-g0c0fcee30c"; hash = "sha256-e5CtTT8/66xCtAf3oTuyoHvnWh6zegZYD3A9pHQE7Sc="; }) + (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.62-gca0239da6b"; hash = "sha256-mGlMQbp2/ewA7PzamEeMA1pbboC73iAIARhK4MPrwO4="; }) + (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.62-gca0239da6b"; hash = "sha256-8jkbU2QV4HV8RU1vnSNtP8kNEhDWbTb3Dr2cl8w/T6A="; }) + (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.62-gca0239da6b"; hash = "sha256-I81to2x5D4LlIJN80d5DbqcU0jPTVSPoc0tvL15YG6I="; }) + (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-gfbb03d21c2"; hash = "sha256-rnl6+U4E3BJVYTWtEjOx7fDVcJJNBP8MOisoGVLT7vA="; }) (fetchNuGet { pname = "ppy.Vk"; version = "1.0.26"; hash = "sha256-YA+U8RhOrGdtw3tlluiv1+M7FIMB0zQMnPVY8ynOxvE="; }) (fetchNuGet { pname = "Realm"; version = "11.5.0"; hash = "sha256-ykC2fyOh4XeRJyLoO3jQQC4sZcFhSms7wswSO6Iu8mQ="; }) (fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.5.0"; hash = "sha256-6QUO6jQC3VwxKsNY24WSgLNtOwcaGjQDtP0S4DSt670="; }) @@ -319,6 +321,7 @@ (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; hash = "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w="; }) + (fetchNuGet { pname = "Velopack"; version = "0.0.598-g933b2ab"; hash = "sha256-i1VR1tZ+rNl8F4EL8x5OAdnqfIRuHmviTp19uPFi14A="; }) (fetchNuGet { pname = "Vortice.D3DCompiler"; version = "2.4.2"; hash = "sha256-LXdgts8lKbTU67c1W001XRbq5nenzf8XcYCRxc75jR8="; }) (fetchNuGet { pname = "Vortice.Direct3D11"; version = "2.4.2"; hash = "sha256-hU4qzLKhv4QxiP2c9s4IZUGgeQxsOjRhgurrlXXq/qM="; }) (fetchNuGet { pname = "Vortice.DirectX"; version = "2.4.2"; hash = "sha256-LOIxdET0ynaJz70fakVwDYU0qm+1P0SfD1+I9P320oc="; }) diff --git a/pkgs/games/papermc/derivation.nix b/pkgs/games/papermc/derivation.nix index 5dd169dbc9b49..c7ad650d00f69 100644 --- a/pkgs/games/papermc/derivation.nix +++ b/pkgs/games/papermc/derivation.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe jre} "$out/bin/minecraft-server" \ --append-flags "-jar $out/share/papermc/papermc.jar nogui" \ - ${lib.optionalString stdenvNoCC.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"} + ${lib.optionalString stdenvNoCC.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"} runHook postInstall ''; diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json index 79068fcc39956..a8efe02630e0f 100644 --- a/pkgs/games/papermc/versions.json +++ b/pkgs/games/papermc/versions.json @@ -52,11 +52,15 @@ "version": "1.20.5-22" }, "1.20.6": { - "hash": "sha256-u9adg4SOJb3w7LBAzJiiJj2V7WbjvVEoqMhVL3v5lL0=", - "version": "1.20.6-148" + "hash": "sha256-kpofEntQrUtOMBiMgJfFAL+2yLO97vGowKYRocA8P7g=", + "version": "1.20.6-150" }, "1.21": { - "hash": "sha256-BiD2eK6xWBogwZFiG0J8ELTw2G4YvwSVX9xE/5vcdY8=", - "version": "1.21-124" + "hash": "sha256-q5uxr8POppeKDAPOhEiqZU/oqcTd3zQefL2hsO2qc/U=", + "version": "1.21-130" + }, + "1.21.1": { + "hash": "sha256-1oKvRB00bfdJZ7uVsUabv9EAFiT2YwEsLXetQ3BrVvA=", + "version": "1.21.1-110" } } diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 0fcd79b4b9563..622df7873b389 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { qttools wrapQtAppsHook icoutils - ] ++ lib.optional stdenv.isLinux copyDesktopItems; + ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ qtbase @@ -126,6 +126,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; maintainers = [ lib.maintainers.k900 ]; mainProgram = "pobfrontend"; - broken = stdenv.isDarwin; # doesn't find uic6 for some reason + broken = stdenv.hostPlatform.isDarwin; # doesn't find uic6 for some reason }; } diff --git a/pkgs/games/powermanga/default.nix b/pkgs/games/powermanga/default.nix index 3c89266370cf0..eaa45460be922 100644 --- a/pkgs/games/powermanga/default.nix +++ b/pkgs/games/powermanga/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index cff2915093e5c..8d63aaed94884 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -106,6 +106,6 @@ python311Packages.buildPythonApplication rec { mainProgram = "pysol.py"; homepage = "https://pysolfc.sourceforge.io"; license = licenses.gpl3; - maintainers = with maintainers; [ kierdavis ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix index 39f1d43fb46e3..8fa696de889f5 100644 --- a/pkgs/games/qqwing/default.nix +++ b/pkgs/games/qqwing/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, perl, autoconf, automake, libtool }: +{ + lib, + stdenv, + fetchFromGitHub, + perl, + autoconf, + automake, + libtool, +}: stdenv.mkDerivation rec { pname = "qqwing"; @@ -7,31 +15,42 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "stephenostermiller"; repo = "qqwing"; - rev = "v${version}"; - sha256 = "1qq0vi4ch4y3a5fb1ncr0yzkj3mbvdiwa3d51qpabq94sh0cz09i"; + rev = "refs/tags/v${version}"; + hash = "sha256-MYHPANQk4aUuDqUNxWPbqw45vweZ2bBcUcMTyEjcAOM="; }; - postPatch = '' - for file in "src-first-comment.pl" "src_neaten.pl"; do - substituteInPlace "build/$file" \ - --replace "#!/usr/bin/perl" "#!${perl}/bin/perl" - done + strictDeps = true; - substituteInPlace "build/cpp_install.sh" \ - --replace "sudo " "" - ''; + nativeBuildInputs = [ + autoconf + automake + libtool + perl + ]; + + configureFlags = [ + "--prefix=${placeholder "out"}" + ]; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ perl libtool ]; + buildFlags = [ + "cppcompile" + ]; - makeFlags = [ "prefix=$(out)" "tgz" ]; + postPatch = '' + patchShebangs --build build/src-first-comment.pl build/src_neaten.pl + + substituteInPlace build/cpp_configure.sh \ + --replace-fail "./configure" "./configure $configureFlags" + substituteInPlace build/cpp_install.sh \ + --replace-fail "sudo " "" + ''; - meta = with lib; { + meta = { homepage = "https://qqwing.com"; description = "Sudoku generating and solving software"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ nickcao ]; mainProgram = "qqwing"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = [ ]; }; } diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 4135706c98136..3c78d0e5f2335 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -25,13 +25,13 @@ let postPatch = '' substituteInPlace src/client/curl/qcurl.c \ --replace "\"libcurl.so.3\", \"libcurl.so.4\"" "\"${curl.out}/lib/libcurl.so\", \"libcurl.so.3\", \"libcurl.so.4\"" - '' + lib.optionalString (openalSupport && !stdenv.isDarwin) '' + '' + lib.optionalString (openalSupport && !stdenv.hostPlatform.isDarwin) '' substituteInPlace Makefile \ --replace "\"libopenal.so.1\"" "\"${openal}/lib/libopenal.so.1\"" ''; buildInputs = [ SDL2 libGL curl ] - ++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenAL ] ++ lib.optional openalSupport openal; makeFlags = [ diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 81dd202dc5431..8bf6ed19ab0f0 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "Quake3e"; - version = "2022-04-01-dev"; + version = "2024-09-02-dev"; src = fetchFromGitHub { owner = "ec-"; repo = pname; - rev = "c6cec00b858aa5955eb1d6eb65b9bfd41fd869cb"; - sha256 = "0qd13fndbhgkkmhxbprpzmj2l2v9ihacxagpdqi9sg9nrzvahr9h"; + rev = "b6e7ce4f78711e1c9d2924044a9a9d8a9db7020f"; + sha256 = "sha256-tQgrHiP+QhBzcUnHRwzaDe38Th0uDt450fra8O3Vjqc="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { description = "Improved Quake III Arena engine"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ pmiddend ]; + maintainers = with maintainers; [ pmiddend alx ]; }; } diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index 6b3080c7573e5..5b124cb464d17 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, SDL, SDL2, fetchurl, gzip, libvorbis, libmad, flac, libopus, opusfile, libogg, libxmp , Cocoa, CoreAudio, CoreFoundation, IOKit, OpenGL , copyDesktopItems, makeDesktopItem, pkg-config -, useSDL2 ? stdenv.isDarwin # TODO: CoreAudio fails to initialize with SDL 1.x for some reason. +, useSDL2 ? stdenv.hostPlatform.isDarwin # TODO: CoreAudio fails to initialize with SDL 1.x for some reason. }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sourceRoot = "${pname}-${version}/Quake"; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Makes Darwin Makefile use system libraries instead of ones from app bundle ./quakespasm-darwin-makefile-improvements.patch ]; @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { buildInputs = [ gzip libvorbis libmad flac libopus opusfile libogg libxmp (if useSDL2 then SDL2 else SDL) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreAudio IOKit OpenGL - ] ++ lib.optionals (stdenv.isDarwin && useSDL2) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && useSDL2) [ CoreFoundation ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "USE_SDL2=1" ]; - makefile = if (stdenv.isDarwin) then "Makefile.darwin" else "Makefile"; + makefile = if (stdenv.hostPlatform.isDarwin) then "Makefile.darwin" else "Makefile"; preInstall = '' mkdir -p "$out/bin" @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.darwin --replace "/usr/local/games" "$out/bin" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # Let's build app bundle mkdir -p $out/Applications/Quake.app/Contents/MacOS mkdir -p $out/Applications/Quake.app/Contents/Resources diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 458927bfcc88f..d4fdc41b4a326 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -14,6 +14,7 @@ gzip, libvorbis, libmad, + vulkan-headers, vulkan-loader, moltenvk, }: @@ -46,12 +47,18 @@ stdenv.mkDerivation rec { libvorbis opusfile vulkan-loader - ] ++ lib.optional stdenv.isDarwin moltenvk; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + moltenvk + vulkan-headers + ]; buildFlags = [ "DO_USERDIRS=1" ]; - env = lib.optionalAttrs stdenv.isDarwin { - NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + "-Wno-error=unused-but-set-variable" + "-Wno-error=implicit-const-int-float-conversion" + ]; }; installPhase = '' @@ -59,7 +66,7 @@ stdenv.mkDerivation rec { cp vkquake "$out/bin" ''; - postFixup = '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' patchelf $out/bin/vkquake \ --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix index c91fb8b28c538..b7e8feae24286 100644 --- a/pkgs/games/quantumminigolf/default.nix +++ b/pkgs/games/quantumminigolf/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index 594a431300ca3..4a4a7fc3716ee 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -6,7 +6,7 @@ , nodejs , electron , fetchFromGitHub -, gitUpdater +, nix-update-script , makeWrapper , makeDesktopItem , copyDesktopItems @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; - version = "3.1.49"; + version = "3.1.50"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${finalAttrs.version}"; - hash = "sha256-Br+VkBHgwM/Zu1aypzlVYHB/v8T/KV+B6XUNJn/EbYM="; + hash = "sha256-WmF7tH5PiaggyvP/klWwNgaLKVhIoApxDtwwLpug52A="; }; offlineCache = fetchYarnDeps { @@ -103,9 +103,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = nix-update-script { }; meta = { changelog = "https://github.com/ebkr/r2modmanPlus/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/games/randtype/default.nix b/pkgs/games/randtype/default.nix index f7e6ee06ceac0..ba5c40367ec0b 100644 --- a/pkgs/games/randtype/default.nix +++ b/pkgs/games/randtype/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dandellion ]; license = licenses.gpl2Only; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/randtype.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/randtype.x86_64-darwin }; } diff --git a/pkgs/games/raylib-games/default.nix b/pkgs/games/raylib-games/default.nix index 7a0d80a4c5e67..cad4424a30885 100644 --- a/pkgs/games/raylib-games/default.nix +++ b/pkgs/games/raylib-games/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ raylib ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/games/rott/default.nix b/pkgs/games/rott/default.nix index 534f14bcb289b..e678994e47f0f 100644 --- a/pkgs/games/rott/default.nix +++ b/pkgs/games/rott/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { "SHAREWARE=${if buildShareware then "1" else "0"}" ]; - # when using SDL_compat instead of SDL_classic, SDL_mixer isn't correctly - # detected, but there is no harm just specifying it + # when using SDL_compat instead of SDL1, SDL_mixer isn't correctly detected, + # but there is no harm just specifying it env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev SDL_mixer}/include/SDL" ]; diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index cdd6eb0e574a3..f6c3249c72594 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "1.0.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; rev = version; - sha256 = "sha256-rhG/EK68PWvQYoZdjhk0w7oNmh/QiTaAt4/WgEkgxEA="; + sha256 = "sha256-xNkM8qN9vg/WGRR/96aCQRVjIbSdSs2845l6oE6+tzg="; }; - cargoHash = "sha256-YXQohmDmkClziaLkL2N4cGURZ0tewyt7BuNY4hS+a4w="; + cargoHash = "sha256-AiNyyLEpVhNhDGq2vngna1ZJmPiI0rFT00gj7vXOW20="; # tests assume the authors macbook, and thus fail doCheck = false; diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 20fb99f82b7d1..101bfbe3b01ab 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -12,13 +12,13 @@ maven.buildMavenPackage rec { pname = "runelite"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "runelite"; repo = "launcher"; rev = version; - hash = "sha256-7T9n23qMl4IJQL7yWLXKvRzYcMeXDUwkY8MBFc2t3Rw="; + hash = "sha256-ckeZ/7rACyZ5j+zzC5hv1NaXTi9q/KvOzMPTDd1crHQ="; }; mvnJdk = jdk17; diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 6bed4908f471f..700003f640b09 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -8,7 +8,6 @@ , gcc-unwrapped , glib , glibc -, gnome2 , gtk2-x11 , libGL , libpulseaudio diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix deleted file mode 100644 index b32ffadaea161..0000000000000 --- a/pkgs/games/sauerbraten/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchzip -, SDL2 -, SDL2_image -, SDL2_mixer -, zlib -, makeWrapper -, copyDesktopItems -, makeDesktopItem -}: - -stdenv.mkDerivation rec { - pname = "sauerbraten"; - version = "2020-12-27"; - - src = fetchzip { - url = "mirror://sourceforge/sauerbraten/sauerbraten_${builtins.replaceStrings [ "-" ] [ "_" ] version}_linux.tar.bz2"; - sha256 = "0llknzj23vx6f3y452by9c7wlhzclyq4bqi22qd52m3l916z2mn5"; - }; - - nativeBuildInputs = [ - makeWrapper - copyDesktopItems - ]; - - buildInputs = [ - SDL2 - SDL2_mixer - SDL2_image - zlib - ]; - - sourceRoot = "${src.name}/src"; - - enableParallelBuilding = true; - - desktopItems = [ - (makeDesktopItem { - name = "sauerbraten"; - exec = "sauerbraten_client %u"; - icon = "sauerbraten"; - desktopName = "Sauerbraten"; - comment = "FPS that uses an improved version of the Cube engine"; - categories = [ "Application" "Game" "ActionGame" ]; - }) - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/icon/ $out/share/sauerbraten $out/share/doc/sauerbraten - cp -r "../docs/"* $out/share/doc/sauerbraten/ - cp sauer_client sauer_server $out/share/sauerbraten/ - cp -r ../packages ../data $out/share/sauerbraten/ - ln -s $out/share/sauerbraten/cube.png $out/share/icon/sauerbraten.png - - makeWrapper $out/share/sauerbraten/sauer_server $out/bin/sauerbraten_server \ - --chdir "$out/share/sauerbraten" - makeWrapper $out/share/sauerbraten/sauer_client $out/bin/sauerbraten_client \ - --chdir "$out/share/sauerbraten" \ - --add-flags "-q\''${HOME}/.config/sauerbraten" - - runHook postInstall - ''; - - meta = with lib; { - description = "Free multiplayer & singleplayer first person shooter, the successor of the Cube FPS"; - homepage = "http://sauerbraten.org"; - maintainers = with maintainers; [ raskin ajs124 ]; - mainProgram = "sauerbraten_client"; - hydraPlatforms = - # raskin: tested amd64-linux; - # not setting platforms because it is 0.5+ GiB of game data - [ ]; - license = "freeware"; # as an aggregate - data files have different licenses code is under zlib license - platforms = platforms.linux; - }; -} diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 2252146679b24..6c6fc7fac0aed 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libGLU libGL - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa AudioToolbox Carbon CoreMIDI AudioUnit ] ++ [ curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis SDL2 zlib @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # They use 'install -s', that calls the native strip instead of the cross postConfigure = '' sed -i "s/-c -s/-c -s --strip-program=''${STRIP@Q}/" ports.mk - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.mk \ --replace x86_64-apple-darwin-ranlib ${cctools}/bin/ranlib \ --replace aarch64-apple-darwin-ranlib ${cctools}/bin/ranlib diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 04d1136a9386b..a73837b6e9a4d 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20240827.52afffa"; + version = "20240928.182b3d9"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-G+FZnr7+XvvxDpBWyH4Dv8NEjSWTXDoVNzbzNpMTbLg="; + hash = "sha256-D4Mdec7h7MPG+WStDDapzjWLiaLWzqbOipmfWUpk7bA="; }; sgt-puzzles-menu = fetchurl { diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index f5a8ceb209849..9edc11876bafd 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -5,13 +5,13 @@ callPackage ./generic.nix rec { pname = "shattered-pixel-dungeon"; - version = "2.4.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - hash = "sha256-1msmjKDEd/pFMqLB4vJgR6GPC9z4CnNew2hlemLw2d0="; + hash = "sha256-Y23w3Pdq5Lsn4gywHhhfL2o9gVQlw/6mbRrjlHNfJjA="; }; depsPath = ./deps.json; diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix index ec379dfef033c..60a0b67232ca7 100644 --- a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix @@ -4,13 +4,13 @@ callPackage ../generic.nix rec { pname = "experienced-pixel-dungeon"; - version = "2.18"; + version = "2.18.2"; src = fetchFromGitHub { owner = "TrashboxBobylev"; repo = "Experienced-Pixel-Dungeon-Redone"; rev = "ExpPD-${version}"; - hash = "sha256-jOKHBd9LaDn3oqLdQWqAcJnicktlbkDGw00nT8JveoI="; + hash = "sha256-REBltg7rKgrNSKHh3QuG8XVLPivS1fAtyqf/TRjH0W0="; }; desktopName = "Experienced Pixel Dungeon"; diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix index fcdf31cf94ff8..6956e36149008 100644 --- a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix @@ -4,13 +4,13 @@ callPackage ../generic.nix rec { pname = "rat-king-adventure"; - version = "1.5.3"; + version = "2.0.1"; src = fetchFromGitHub { owner = "TrashboxBobylev"; repo = "Rat-King-Adventure"; rev = version; - hash = "sha256-Q/smIObu7khcRnwdT8m7+WstpPE1tbDFJcZ4OGYJ338="; + hash = "sha256-FAIFrlVyNYTiS+UBLZFOhuMzj8C6qNGAffYrTxcNeDM="; }; desktopName = "Rat King Adventure"; diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json index 231b9de371582..76260aee36368 100644 --- a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json +++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json @@ -1,51 +1,65 @@ { "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, + "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames": { + "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": { + "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=", + "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4=" + }, + "gdx-controllers#gdx-controllers-desktop/2.2.4-20231021.200114-6/SNAPSHOT": { + "jar": "sha256-4mhLijZwQHk2pP5qXIIzrsO9CwNC3CDti/5szclkVa8=", + "pom": "sha256-10+zD8flpKIPzji5NFgtYcwE5O74hSzzvvqBh84wLf4=" + }, + "gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200112" + } + }, + "gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200114" + } + } + }, "https://repo.maven.apache.org/maven2": { - "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.11.0": { - "jar": "sha256-my0CJorGB5QwSi4E5ep1H62fX5bsyvFdgCOm4LF6994=", - "module": "sha256-o7gpPFXSp2lb60LCcKrfKpQcK4NqQL8Ob4W6OOY0VwY=", - "pom": "sha256-wa55d83hp9muWlhfDe8Ap2d4LzcR5/+RYTX2UPA2HOo=" + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": { + "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=", + "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=", + "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo=" }, - "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0": { - "pom": "sha256-a5PHPPIyrqNpnueP5GEkJ14KwbsROJkXUcz96l8Au9c=" + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1": { + "pom": "sha256-cAGFUunqi4o21kDX8V86OT6aMmXjJUqyMHLHhUWLBm4=" }, - "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0/natives-desktop": { - "jar": "sha256-9GCzmqhP9bnWC4mT4j/zKtpWellmThTrfha7VcWk9yE=" + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1/natives-desktop": { + "jar": "sha256-1g5ZN21QWpk+yLogowR3rwaQKx4pJ/8uN17/2/Ql2UE=" }, - "com/badlogicgames/gdx#gdx-freetype/1.11.0": { - "jar": "sha256-u5hP1RQ13YCN0HaSWOqzJikXG19OnkPzmvRUPh7E3yI=", - "module": "sha256-n5oGuAY9dyn7H94+ippXm3vuPUqevY+xrDubsj78b/M=", - "pom": "sha256-xkjQNIE46uOtYmScUTA8R5rr5czpsbXQeLX3rkVQG+0=" + "com/badlogicgames/gdx#gdx-freetype/1.12.1": { + "jar": "sha256-rbjskAa7YdrW0pdslaHeGN5eGmUULRilgH0OUkyL8WU=", + "module": "sha256-HG9UGDxQFjSvGqLrKEkE7YnVvqtURs7FyqWwunHdXKE=", + "pom": "sha256-pLaMZBcEufzo+xszIlcUPJSYJJQg1uY6rm7tb6fHyT8=" }, "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" }, - "com/badlogicgames/gdx#gdx-platform/1.11.0": { - "pom": "sha256-8cBBk8LQnXP8lVNQL05ZFMIOgDWrdpoZ0z4bxJJ0AkA=" - }, - "com/badlogicgames/gdx#gdx-platform/1.11.0/natives-desktop": { - "jar": "sha256-yUFpxwl25LGMCL1qKWtETqiLtUlF67EtHy5DK5L4OTA=" - }, - "com/badlogicgames/gdx#gdx/1.11.0": { - "jar": "sha256-IxU8Z+GVYGROD6EjUjK12F7kHPKJKBwtp+yMKONXULk=", - "module": "sha256-twUVE1CLWninINOZQrsifRvrOrzgBpskstIAA2TPbbM=", - "pom": "sha256-2W6H3BZixRugifIY1Cy3/U3b3sZQiytosvCsZ5dvJSU=" + "com/badlogicgames/gdx#gdx-platform/1.12.1": { + "pom": "sha256-bZhlcVVYfr/+qIAG20v12CgcyUetGduKZP28TnOzkZc=" }, - "com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.2": { - "jar": "sha256-DKa7jeeMTIY2ycrjhvrAU4LdMp9y1xCU+62wL89aEAQ=", - "pom": "sha256-Y0QV6aRkzGOr46Gb6+AYM2OdS95sUt2zIoaOQduz724=" + "com/badlogicgames/gdx#gdx-platform/1.12.1/natives-desktop": { + "jar": "sha256-P+utqUwiNjYQkXufuMJLD55h4+bGnHO9DTUDhYTA4e0=" }, - "com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.2": { - "jar": "sha256-oJnxlAyrkj1QtnHH4uK6HkXq44+mxdzq6piktPUqTl0=", - "pom": "sha256-ZAhAV2hHVAbq8aLVysozRiKXIYdZmkssHWSOf+rarn8=" + "com/badlogicgames/gdx#gdx/1.12.1": { + "jar": "sha256-jTIJ6UghH96c2swrAfrO0yPlSKpS73jlx2CEWoh0aXA=", + "module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=", + "pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY=" }, - "com/badlogicgames/jamepad#jamepad/2.0.20.0": { - "jar": "sha256-6fFqB9SpRCSs0DiOw6P+TsZLfhiWxlgUwv9rRisTs2Y=", - "module": "sha256-vXFX36GUJsdj2VgYbnHR3+lKnBRgBeEI9pwUameDrmY=", - "pom": "sha256-+gwaoDndosNqw/VslH3vLEOptLnkbCPhrqddHQaZ3eQ=" + "com/badlogicgames/jamepad#jamepad/2.26.5.0": { + "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=", + "module": "sha256-KGmFPVwJdU2vuY9u6veZLc2Q6K3uFxL/bgjmUgBKflA=", + "pom": "sha256-Up7mQ8lbw+6SfuSnRqwFaOQSnbb5dscD82IjN9/6Inc=" }, "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", @@ -59,174 +73,174 @@ "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" }, - "org/lwjgl#lwjgl-glfw/3.3.1": { - "jar": "sha256-CLvDTrdS+GPjf4OrHHsMIvfLJtD4+wpKSoxgKKxFs4U=", - "pom": "sha256-TKQrQ8iqDodIWWB0d0C5lFqqH99+QTTm+iTo+d8cF2A=" + "org/lwjgl#lwjgl-glfw/3.3.3": { + "jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=", + "pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux": { - "jar": "sha256-Ze0Ev/fQf+ybf958OxHEBShsjWbk609Mm3kuJn7OWwY=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": { + "jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm32": { - "jar": "sha256-hOvo8klGPrF84PrpnYsto8G/kcjUEHOjtYNFd7dS4/s=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": { + "jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm64": { - "jar": "sha256-IgDyzcENHaZ215o+oFybpVnaCZUFwbdWtu0iL2FagSA=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": { + "jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos": { - "jar": "sha256-G2z/nmSKci7gzBRmlhIFKqW6gJRp+os/sh8kw6vnDek=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": { + "jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos-arm64": { - "jar": "sha256-nHlVeHSNWPQtXUcu2A0ulpk71Psf/ABYztosYx7zmJo=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": { + "jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows": { - "jar": "sha256-nnROy4QCnXrO2uh24lV2WRhKKa/uVeRT9KslZzSb+Ek=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": { + "jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0=" }, - "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows-x86": { - "jar": "sha256-pYAgBm4ePVP/xMf7ShWMDLP/tPM6rrPlTSVScyGUxBI=" + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": { + "jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1": { - "jar": "sha256-7kn8Co2UVkUuVM1vd3gj7aZm4sY/wU1lsv0sws/tXb4=", - "pom": "sha256-+ZSGEVVV8RPaHOOs1f7LyWk7X9o1P/era9Lj1//dsn4=" + "org/lwjgl#lwjgl-jemalloc/3.3.3": { + "jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=", + "pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux": { - "jar": "sha256-m3mvXH/Q2UkG7h0qU6NCCidQfWYiS0/0a59ncmRd7TQ=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": { + "jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm32": { - "jar": "sha256-Bj8Lsu2V5d4q0G4Q0xJ/hJDdviBKyj5qOc5C3pF4TF8=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": { + "jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm64": { - "jar": "sha256-X4nVRq4fr1Gv+/sMZBR60swze/ajLwv4fEbTTDQvxdU=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": { + "jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos": { - "jar": "sha256-B6qwMJQFjjiph2upM54IoiQDlO+Ii35/z9R2I1j22Wg=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": { + "jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos-arm64": { - "jar": "sha256-500OE6wC9BAsIMF/DUFmCK2FNDSV7K4wAp32VousLSc=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": { + "jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows": { - "jar": "sha256-Il8331UAYUZ1vprLYnjLbJyAo0kmR5iyz8fsQ08e1HI=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": { + "jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs=" }, - "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows-x86": { - "jar": "sha256-Y5uy113z3Vnqewv4uEfgr1cHRpTXk5ILoclTeJeyw9g=" + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": { + "jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo=" }, - "org/lwjgl#lwjgl-openal/3.3.1": { - "jar": "sha256-cyXuG5GooQwGJsabVXqI8t9qwb3KDlLiqS0yQknyytA=", - "pom": "sha256-+ZzowctqhyXSbdyzNFxAPNu8x8qO6WYIu/PCxP2WaiE=" + "org/lwjgl#lwjgl-openal/3.3.3": { + "jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=", + "pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-linux": { - "jar": "sha256-C3OB9R7cYQy2ByRdw0p2LSsht0R4FARAaKGmADu4eDg=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux": { + "jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm32": { - "jar": "sha256-PQ39lwowYdM7FdvxjT7u/PB83EFx6skgUU8DhkY4mmI=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": { + "jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm64": { - "jar": "sha256-RPO9inlEGNtNU+51Rtkdl9nK9/QuE+ojU2PMM18u9ig=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": { + "jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-macos": { - "jar": "sha256-UYTKJLjf6XJVtstVjFKb1qOImBu+VeITcY4/0r2ehuQ=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos": { + "jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-macos-arm64": { - "jar": "sha256-wi7Lzvj+5K7q+YEDLfPiy8MKkRqQJS7awfFJeX1YdXU=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": { + "jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-windows": { - "jar": "sha256-X35maqJMqLP7dY5ywD/7nYCbMEicantH6tZ8aXf/ZU4=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows": { + "jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg=" }, - "org/lwjgl#lwjgl-openal/3.3.1/natives-windows-x86": { - "jar": "sha256-fVtbb61e+7Lowk80dgDHy8bv3RNh/TewtaEzGSMehR4=" + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": { + "jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE=" }, - "org/lwjgl#lwjgl-opengl/3.3.1": { - "jar": "sha256-5DbSFE86Nv/3cv1kIzMWgJt5XzkN79TVVmD8aG58KDQ=", - "pom": "sha256-LL9XxnqNBGatgI4aJ/4908EQ6KwC3IqyushKhRl3VUE=" + "org/lwjgl#lwjgl-opengl/3.3.3": { + "jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=", + "pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux": { - "jar": "sha256-vPzZ+N/SKUiK2ew1PUjHsC3lyiG63UCS8ZAiOaHtBpA=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": { + "jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm32": { - "jar": "sha256-IDPJfXY+YL2sAX/bsI06Q7vlwXqjZ7QsU3ycw6tAYY8=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": { + "jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm64": { - "jar": "sha256-EFjEunNUzavz75NZUeKT91tJYedT13/XU13ccy4oPyg=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": { + "jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos": { - "jar": "sha256-cR8plyiIUJJiqVfxsxOL+ptQVRnRHfbldj0cmj+LPF0=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": { + "jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos-arm64": { - "jar": "sha256-29EQBE6uitvKjjx6cwUpo1FVnnTOqIe7PNbvDcAW8pU=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": { + "jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows": { - "jar": "sha256-hRubWTysIeOvUd1MMD6N8/5qNEo/gda5vMGG5+VAv9o=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": { + "jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc=" }, - "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows-x86": { - "jar": "sha256-aD2K09DQl3puoYuIpMvn6P1PBsGrIbq+2riDCXQLzGA=" + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": { + "jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw=" }, - "org/lwjgl#lwjgl-stb/3.3.1": { - "jar": "sha256-ZOXMzi/Hy88Mg0pb6GQtniSYzj/jHBT/HfdBh4o/gSE=", - "pom": "sha256-dKgsbPvqhNIxAk2f2FgO2VumPCAafUeqsmO6hofDCVk=" + "org/lwjgl#lwjgl-stb/3.3.3": { + "jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=", + "pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-linux": { - "jar": "sha256-+BuZjoxdYj1XHi/NRvy4e30w7SXfd95jrsjP7bNMSnA=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux": { + "jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm32": { - "jar": "sha256-6xnGjFt5MUjKOT24bzHQ3pVALZ9MFOUADjkYSA9iKkc=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": { + "jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm64": { - "jar": "sha256-XOyb0h8xIAJaLIOB3BCax+yI5o5xX9fK27kPXVVfZZs=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": { + "jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-macos": { - "jar": "sha256-oXjWYDA5nGmJeN/kqVALdVep2vTAYeg8iHAzfpsL0+c=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos": { + "jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-macos-arm64": { - "jar": "sha256-DXoP8tto86vkFpFn4vSJ3/d72igvQvhuQelEvnxDbdg=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": { + "jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-windows": { - "jar": "sha256-/W/3om6GRa95oNIcpz6NyeRz80AtEzPlRKgdIcpQd+c=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows": { + "jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI=" }, - "org/lwjgl#lwjgl-stb/3.3.1/natives-windows-x86": { - "jar": "sha256-v3PjtRu0MOWIvRWOlsyimOmMoS8p3FzxRFwfDFw5uhs=" + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": { + "jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4=" }, - "org/lwjgl#lwjgl-tinyfd/3.3.1": { - "jar": "sha256-SI9R7ZXw+sSNHYfLDjusCMAS3L9u88FohoXXCM28zVY=", - "pom": "sha256-78RtVita7rFRzJnBhn5KUeVLzwWs+2EwOtZUh45Nyq8=" + "org/lwjgl#lwjgl-tinyfd/3.3.3": { + "jar": "sha256-7gUVBU7hmj9AiEJv7p2HnrLuZXsH5QZOTiyFH2rc8Us=", + "pom": "sha256-LBvRGfQeZaVEYT+R5xYOAGuBkW5zpu919UkkLMTzvvI=" }, - "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-linux": { - "jar": "sha256-e9cLKCM/RiGdoZiaw+n27vcuvyEc43Uv8eZFzqQYpM8=" + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux": { + "jar": "sha256-oHb6BaTRdHYuq1hS7nLCnRSrEKVlTyf7AGZO8bUsDAU=" }, - "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-linux-arm64": { - "jar": "sha256-pLai7OGbhNkzyXmwx1+46BgCpoLVJEmWXDP0xaH+cAw=" + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux-arm64": { + "jar": "sha256-gNNOdtFcBJUXRBSIMpCDkdqLFPaKAwtksLQHAqNzkdc=" }, - "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-macos": { - "jar": "sha256-H1yGorLASVqlahKnTHwvwsk1PMOKoAzBOjJAR2QcMk0=" + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos": { + "jar": "sha256-RGXdRv35MJwM5kw1KaDaZ5L7ZxHDKB6MXbqTXmqb/Dw=" }, - "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-macos-arm64": { - "jar": "sha256-EY1ViXZdZobUeDcZwt6MpmWiSX2LncKK00/RDtU0P6o=" + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos-arm64": { + "jar": "sha256-b32XlBRlHjQ9yLiz+q3g4tnk/fmdVl1WI+EtQNuuSiI=" }, - "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-windows": { - "jar": "sha256-7McVIQloBZdWnZsyIEXynBp93uxxgs9pGJ2uFUE4ucg=" + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-windows": { + "jar": "sha256-AihZEfHIgXNfpNDrFB/+qv2aK7k0nZj3wfuKnLScD1g=" }, - "org/lwjgl#lwjgl/3.3.1": { - "jar": "sha256-z4P5DjL7lz/17fyk7zX1XKUbtwpXm2ofKQdE9VLo5IQ=", - "pom": "sha256-xMXHr6uOt4JTZqIwhsPf7droMIwRXF1iF6gm7DJLN+M=" + "org/lwjgl#lwjgl/3.3.3": { + "jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=", + "pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ=" }, - "org/lwjgl#lwjgl/3.3.1/natives-linux": { - "jar": "sha256-Iu8q+jGhdAozfsnGgGxrjZfpMaY+LEMnDLrxT7P2/E4=" + "org/lwjgl#lwjgl/3.3.3/natives-linux": { + "jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk=" }, - "org/lwjgl#lwjgl/3.3.1/natives-linux-arm32": { - "jar": "sha256-9rVYGOx25ewBfiW8OvbsTbe3ol56KhdW+i/6uojIZWQ=" + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": { + "jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE=" }, - "org/lwjgl#lwjgl/3.3.1/natives-linux-arm64": { - "jar": "sha256-T9lq94+cKTsXAAEcfbGg7AI3xNGIPjf6vgj3To0uAiQ=" + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": { + "jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg=" }, - "org/lwjgl#lwjgl/3.3.1/natives-macos": { - "jar": "sha256-9I5hCpgdylFbm75zRcx240UME0BLBS2Kw1fvCvjpCr8=" + "org/lwjgl#lwjgl/3.3.3/natives-macos": { + "jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM=" }, - "org/lwjgl#lwjgl/3.3.1/natives-macos-arm64": { - "jar": "sha256-cZfomrgKKiGDtO6SXMtE5XLwy3V6kndq34JlJpIAo2o=" + "org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": { + "jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg=" }, - "org/lwjgl#lwjgl/3.3.1/natives-windows": { - "jar": "sha256-CT0T1ipkNLxla/EKOzfiUw/ZrzsLwg+OlUW+WGWdFEM=" + "org/lwjgl#lwjgl/3.3.3/natives-windows": { + "jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk=" }, - "org/lwjgl#lwjgl/3.3.1/natives-windows-x86": { - "jar": "sha256-6QwfnPVwGu7ymC6/CQWiuZH0YiuKf4JQ6vCHO1oKAiM=" + "org/lwjgl#lwjgl/3.3.3/natives-windows-x86": { + "jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k=" }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix index a53f27fb14d07..8fb66c87b3453 100644 --- a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix @@ -4,13 +4,13 @@ callPackage ../generic.nix rec { pname = "shorter-pixel-dungeon"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "TrashboxBobylev"; repo = "Shorter-Pixel-Dungeon"; rev = "Short-${version}"; - hash = "sha256-iG90T/Ho8/JY3HgkACiBnGdbUGsVRlfxXbcNFHhzZi4="; + hash = "sha256-y4DKSdq0LofKxlAi6RoaF8q+QD5KrTcmCmx9cpBxGgs="; }; desktopName = "Shorter Pixel Dungeon"; diff --git a/pkgs/games/shipwright/default.nix b/pkgs/games/shipwright/default.nix index d214e6934b190..2ff8c063f5f0d 100644 --- a/pkgs/games/shipwright/default.nix +++ b/pkgs/games/shipwright/default.nix @@ -62,10 +62,10 @@ stdenv.mkDerivation (finalAttrs: { python3 imagemagick makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release copyDesktopItems - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns darwin.sigtool ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_net libpng - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { libXext libpulseaudio zenity - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOSurface Metal QuartzCore @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { ]; env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin "-Wno-int-conversion -Wno-implicit-int"; + lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int"; dontAddPrefix = true; @@ -114,18 +114,18 @@ stdenv.mkDerivation (finalAttrs: { popd ''; - preInstall = lib.optionalString stdenv.isLinux '' + preInstall = lib.optionalString stdenv.hostPlatform.isLinux '' # Cmake likes it here for its install paths cp ../OTRExporter/soh.otr .. - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' cp ../OTRExporter/soh.otr soh/soh.otr ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/bin ln -s $out/lib/soh.elf $out/bin/soh install -Dm644 ../soh/macosx/sohIcon.png $out/share/pixmaps/soh.png - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Recreate the macOS bundle (without using cpack) # We mirror the structure of the bundle distributed by the project @@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: { codesign -f -s - $out/Applications/soh.app/Contents/Resources/soh-macos ''; - fixupPhase = lib.optionalString stdenv.isLinux '' + fixupPhase = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]} ''; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 6a48c5a2caeb4..b6452819bee51 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -121,8 +121,8 @@ let configurePhase = let # Configuration as per the readme.txt and config.template platform = - if stdenv.isLinux then "linux" else - if stdenv.isDarwin then "mac" else throw "add your platform"; + if stdenv.hostPlatform.isLinux then "linux" else + if stdenv.hostPlatform.isDarwin then "mac" else throw "add your platform"; config = '' BACKEND = mixer_sdl COLOUR_DEPTH = 16 diff --git a/pkgs/games/sm64ex/generic.nix b/pkgs/games/sm64ex/generic.nix index fcdd6616a506a..fd53b78042f5e 100644 --- a/pkgs/games/sm64ex/generic.nix +++ b/pkgs/games/sm64ex/generic.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { makeFlags = [ "VERSION=${region}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "OSX_BUILD=1" ] ++ compileFlags; diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix index f978a1b71d7b7..7212d6d816705 100644 --- a/pkgs/games/snipes/default.nix +++ b/pkgs/games/snipes/default.nix @@ -42,6 +42,6 @@ in stdenv.mkDerivation { homepage = "https://www.vogons.org/viewtopic.php?f=7&t=49073"; license = licenses.free; # This reverse-engineered source code is released with the original authors' permission. maintainers = with maintainers; [ peterhoeg cybershadow ]; - broken = stdenv.isDarwin; # not supported upstream - https://github.com/Davidebyzero/Snipes/issues/8#issuecomment-433720046 + broken = stdenv.hostPlatform.isDarwin; # not supported upstream - https://github.com/Davidebyzero/Snipes/issues/8#issuecomment-433720046 }; } diff --git a/pkgs/games/space-cadet-pinball/default.nix b/pkgs/games/space-cadet-pinball/default.nix index 53edf5860518a..0f3009e4abe51 100644 --- a/pkgs/games/space-cadet-pinball/default.nix +++ b/pkgs/games/space-cadet-pinball/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_mixer - ] ++ lib.optional stdenv.isDarwin Cocoa; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; # Darwin needs a custom installphase since it is excluded from the cmake install # https://github.com/k4zmu2a/SpaceCadetPinball/blob/0f88e43ba261bc21fa5c3ef9d44969a2a079d0de/CMakeLists.txt#L221 - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall mkdir -p $out/bin install ../bin/SpaceCadetPinball $out/bin diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix index 74db273bb879e..c5bd6fdf77f0c 100644 --- a/pkgs/games/space-orbit/default.nix +++ b/pkgs/games/space-orbit/default.nix @@ -38,7 +38,7 @@ EOF ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Space combat simulator"; mainProgram = "space-orbit"; license = licenses.gpl2Plus; diff --git a/pkgs/games/space-station-14-launcher/deps.nix b/pkgs/games/space-station-14-launcher/deps.nix index 0c439f953d363..92ce23401995c 100644 --- a/pkgs/games/space-station-14-launcher/deps.nix +++ b/pkgs/games/space-station-14-launcher/deps.nix @@ -2,142 +2,142 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.5"; sha256 = "1l8vpw7dmkgll197i42r98ikkl0g08469wkl1kxkcv8f0allgah6"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.5"; sha256 = "0w1909yjg1s1h6zzxbfw1dazvlknpgk9v7d03ik7ihd14lxzr1i2"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.5"; sha256 = "14nr767zhxcqwis901sn5s9qala0wf2ip4pic3ncdvkhyhq6w9fs"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.5"; sha256 = "1zqp8whkvm95zxhjpwska7rhkbxjfkv2fz3821pn782931pn59ah"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.5"; sha256 = "1plr03dgq24gjlcx39qlbcg2ywh7in58yfkkq9snvnagh8yk3ifi"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.5"; sha256 = "0sn6c3mqvc62vhy8ssmz515wbcaq418qfrck67zysp2qzw5iyv9v"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.5"; sha256 = "1n41g1z36sgvhfl7bdavc3j7ccr3qkbqjc4znimqazzyfifh0m99"; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.5"; sha256 = "0dgycvkd53lnvx3g9s1w3yhgjg0hmph63za68issni0g1p48plgj"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.5"; sha256 = "0a6a8lbpna3z5bcall7a953r3xjibcl90ic21gimwhipyp29sfn1"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.5"; sha256 = "008pqpim91i6mya0nfn3g9gclh0dw5mqmhi2fdalbh62sa8a18xc"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.5"; sha256 = "1i6xpihpw32i9mywzzhw0nyc2gkifmri6ylila21y8xb0jdazdyv"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.5"; sha256 = "03rbx4msnl8jvw1017wi88rxvgg8iz7idy7wajp3nzk9m0c4pilx"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.5"; sha256 = "1bixdr5yzd9spyjc4n2kf1bwg52q3p5akj9xsr25xp310j3kgyxf"; }) - (fetchNuGet { pname = "CodeHollow.FeedReader"; version = "1.2.6"; sha256 = "1ac98diww07cfs3cv142nlwzi9w3n2s5w7m60mkc0rpzg0vpq3mv"; }) - (fetchNuGet { pname = "Dapper"; version = "2.0.123"; sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91"; }) - (fetchNuGet { pname = "DynamicData"; version = "7.13.1"; sha256 = "0hy2ba2nkhgp23glkinhfx3v892fkkf4cr9m41daaahnl2r2l8y1"; }) - (fetchNuGet { pname = "Fody"; version = "6.6.4"; sha256 = "1hhdwj0ska7dvak9hki8cnyfmmw5r8yw8w24gzsdwhqx68dnrvsx"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0-eap3"; sha256 = "12fkafmx2h1h4av04lc5d8x4v3vw3pnva5vw872r3w8w6ws85r5k"; }) - (fetchNuGet { pname = "libsodium"; version = "1.0.18.2"; sha256 = "02xd4phd6wfixhdq48ma92c166absqw41vdq5kvjch8p0vc9cdl2"; }) - (fetchNuGet { pname = "Linguini.Bundle"; version = "0.8.1"; sha256 = "1p7nn56yd4v4rx5k3x352vdsbvkvyn9lb1739dj111z3jpmw2aja"; }) - (fetchNuGet { pname = "Linguini.Shared"; version = "0.8.0"; sha256 = "08q0p5wz6lf7ab7m18yj5wvwks10c9v3d83f6262wbvkmnms0w06"; }) - (fetchNuGet { pname = "Linguini.Syntax"; version = "0.8.0"; sha256 = "0gfl8j9kdjxgz0iaxs35y801pxflk50kzlf0qq4z42jmh9swi4y7"; }) - (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.4"; sha256 = "0mhfj8bj8dlc01y20ihq6j9r59f67cry6yd6qi6rg9zh93m43jpv"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.0"; sha256 = "13y3bilk9rrrgsk9abks7xvpwp12zw150xcyi0diig2hqswys1h4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.Toolkit.Mvvm"; version = "7.1.2"; sha256 = "0hrlgjr41hlpp3hb697i0513x2cm4ysbl0wj4bj67md604cmkv14"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) - (fetchNuGet { pname = "NSec.Cryptography"; version = "22.4.0"; sha256 = "0v89wyvl58ia8r74wn3shajs1ia0rgx1p60nlr87g7ys6lq7ql2d"; }) - (fetchNuGet { pname = "ReactiveUI"; version = "18.4.26"; sha256 = "0xhj4vk64smjfw7sr2gqxvradqbgky6jgfryq8q85h1hz10r7xaa"; }) - (fetchNuGet { pname = "ReactiveUI.Fody"; version = "18.4.26"; sha256 = "0i79ajjmibg10cardpq9qh5wy1b4ngvb2v33fr4c5pf1y65xzhmr"; }) - (fetchNuGet { pname = "Robust.Natives"; version = "0.1.1"; sha256 = "1spfaxk8nsx368zncdcj0b3kg7gj7h14mjji19xrraf8ij0dnczw"; }) - (fetchNuGet { pname = "Robust.Natives.Angle"; version = "0.1.1-chromium4758"; sha256 = "0awydljd6psr0w661p9q73pg2aa29lfb4i0arkpszl0ra33mhrah"; }) - (fetchNuGet { pname = "Robust.Natives.Fluidsynth"; version = "0.1.0"; sha256 = "00nkww5sjixs1dmn979niq0hrhplcpabrp18bmpm240wl53ay72x"; }) - (fetchNuGet { pname = "Robust.Natives.Freetype"; version = "0.1.0"; sha256 = "0skrj5bj5vlxvmp8wg8ar8n393w1vv1bs64hwas7svxf2adwgrw2"; }) - (fetchNuGet { pname = "Robust.Natives.Glfw"; version = "0.1.0"; sha256 = "0xfak1d76jmr4ajfzclarna0x1c19xf4c3zfzhjn4vqmkk1znck0"; }) - (fetchNuGet { pname = "Robust.Natives.OpenAL"; version = "0.1.0"; sha256 = "06waksj5rmc50xas4a2nmlj8v01kpwh5k367pcq2yjn0ld22klnx"; }) - (fetchNuGet { pname = "Robust.Natives.Swnfd"; version = "0.1.0"; sha256 = "1ssnl6zasf2cdaffib4pzyfd1w962y1zmcsivyalgpsh6p4g9as1"; }) - (fetchNuGet { pname = "Robust.Shared.AuthLib"; version = "0.1.2"; sha256 = "1vn19d81n8jdyy75ryrlajyxr0kp7pwjdlbyqcn8gcid5plrzmh0"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; sha256 = "1rpkphmqfh3bv3m7v1zwz88wz4sirj4xqyff9ga0c6bqhblj6wii"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "SharpZstd.Interop"; version = "1.5.2-beta2"; sha256 = "1145jlprsgll8ixwib0i8phc6jsv6nm4yki4wi1bkxx2bgf9yjay"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; sha256 = "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.6"; sha256 = "0cg38xgddww1y93xrnbfn40sin63yl39j5zm7gm5pdgp5si0cf2n"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; sha256 = "1fp9h8c8k6sbsh48b69dc6461isd4dajq7yw5i7j6fhkas78q4zf"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.6"; sha256 = "02wpxwqwknhdhkl00in766samqfzi7r6jmhxs4d047v0fmygv1h8"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; sha256 = "1w2mwcwkqvrg4x4ybc4674xnkqwh1n2ihg520gqgpnqfc11ghc4n"; }) - (fetchNuGet { pname = "SpaceWizards.Sodium"; version = "0.2.1"; sha256 = "059slmfg8diivd7hv53cp24vvrzfviqp6fyg8135azynyxk787fp"; }) - (fetchNuGet { pname = "SpaceWizards.Sodium.Interop"; version = "1.0.18-beta4"; sha256 = "1w59i27z2xdvdflfbnq2braas5f4gpkq9m1xcmc1961hm97z1wvn"; }) - (fetchNuGet { pname = "Splat"; version = "14.6.8"; sha256 = "1nj0bsqcr93n8jdyb1all8l35gydlgih67kr7cs1bc12l18fwx2w"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.4"; sha256 = "0shdspl9cm71wwqg9103s44r0l01r3sgnpxr523y4a0wlgac50g0"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.4"; sha256 = "11l85ksv1ck46j8z08fyf0c3l572zmp9ynb7p5chm5iyrh8xwkkn"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.4"; sha256 = "0b8f51nrjkq0pmfzjaqk5rp7r0cp2lbdm2whynj3xsjklppzmn35"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Net.Http.WinHttpHandler"; version = "8.0.0"; sha256 = "0lqg9zfqcz18r34sgz7x50dsxbikh0lp8pdkb1y3m55gslmbj8n1"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "TerraFX.Interop.Windows"; version = "10.0.22621.1"; sha256 = "0qbiaczssgd28f1kb1zz1g0fqsizv36qr2lbjmdrd1lfsyp2a2nj"; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) - (fetchNuGet { pname = "YamlDotNet"; version = "13.0.2"; sha256 = "031pvc6idvjyrn1bfdn8zaljrndp5ch7fkcn82f06332gqs3n8k8"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.5"; hash = "sha256-BqpHqQIObTb7DHTyZAgCD9A5I0pZkHhSoPTN2g6/G9E="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.5"; hash = "sha256-Iob8OyWhwXhmHKCdnea7dtL9VQvcrf6/gUGHJ30CKXA="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.5"; hash = "sha256-2iVuMPRw7sbsYPGSG4XjQFGFky5WB5B05Jh1+I852ZI="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.5"; hash = "sha256-UKVibxhJoGNvEGh8J/Z0sq8J81FT8yth/yXVPSFHF/8="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.5"; hash = "sha256-0cUxPYJP2W11wnM6j4qNB3IvHlsUp9EZlY8I/NoAmd4="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.5"; hash = "sha256-O20fC/9YXO3/MZNlh1EgWLHFSyi/ao083MKwjetgxmo="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.5"; hash = "sha256-KVUAXXT+f4VrtJ8widfEIzN25GBbtXWog/tpM354gdg="; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.5"; hash = "sha256-8tGLyA0PRKt1REb9YeCtEDz5oB886PRG35aO0uZm/jU="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.5"; hash = "sha256-wTqdxPU3Ql7jC4JFkChbUfaRR0nqUKrYKn8oexdFyig="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.5"; hash = "sha256-rKOgkNLCwEVVcyLCimvhDUDKXnrDOguUryaGVOPFFwE="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.5"; hash = "sha256-27evmgSrIx+EopF6E3N1cT7BvAUc/s99TVEMfmG83cQ="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.5"; hash = "sha256-ncZLGKhpfjuuVPz4Fs+P6L3dM0KRnwAC3xJRqyvpKw8="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.5"; hash = "sha256-rvs3hwRh3F5E1j3JqcodWJTHV3BTWMKkvzq170tuPa4="; }) + (fetchNuGet { pname = "CodeHollow.FeedReader"; version = "1.2.6"; hash = "sha256-uw58N3j/ZsBmBaYeXrSwg6f4ObWChM2GduwAzmNDiak="; }) + (fetchNuGet { pname = "Dapper"; version = "2.0.123"; hash = "sha256-Ic3pMHtq5jF94tPi8l5MFDGyLnEZYofcqxbH5yDLHZY="; }) + (fetchNuGet { pname = "DynamicData"; version = "7.13.1"; hash = "sha256-wSMqsqAWKqVaIDVlRtycTiS0R3fQxknfEPfBaYVawkM="; }) + (fetchNuGet { pname = "Fody"; version = "6.6.4"; hash = "sha256-Xe9sGzIdQ970f0RwxD3KhdfqvGUoTpim2u2oqYHkDcI="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0-eap3"; hash = "sha256-s+SCNDcc8ZHFQXwXte0dfI9NOmqFUQK2IjBA0atT04k="; }) + (fetchNuGet { pname = "libsodium"; version = "1.0.18.2"; hash = "sha256-gjaW2AYXQSb3LLjtQDjWSxkTmEiqIoIb7NFx0+AlrQs="; }) + (fetchNuGet { pname = "Linguini.Bundle"; version = "0.8.1"; hash = "sha256-SirB65XjhxBkS+OERZP1e+6l2xZl9DFLz2ST5k2x9tw="; }) + (fetchNuGet { pname = "Linguini.Shared"; version = "0.8.0"; hash = "sha256-BnCgq61zLy6MMG6gNnZiIOjJNy/So1DPUsdR83m5ACM="; }) + (fetchNuGet { pname = "Linguini.Syntax"; version = "0.8.0"; hash = "sha256-x5PIdYJVCvIJxsDRP0GZ1PUbAPJl6K4i+K/LNpNE1D0="; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.4"; hash = "sha256-+8pB6kjwp5dNxKZ54zM7xqWSkzQYRiB8AIw2JBeSDlY="; }) + (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.0"; hash = "sha256-BAbtucZQvBgbiJ51UAL/Ilx+dz96LpWmfjnnNGlcw48="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.Toolkit.Mvvm"; version = "7.1.2"; hash = "sha256-JOxZGQGm1WPkIpIDurQnlYk+QgHxJLPguJfCQLJ8NEM="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; hash = "sha256-/F61k7MY/fu2FcfW7CkyjuUroKwlYAXPQFVeDs1QknY="; }) + (fetchNuGet { pname = "NSec.Cryptography"; version = "22.4.0"; hash = "sha256-TVB8MDXan3dQphaYG/rLQMWgpYJ6WE5ORiqiQrfnCW0="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.4.26"; hash = "sha256-SvWTQfgwwIIwwj67J42fb+Gm8u74iawPd7JqYuYmEnY="; }) + (fetchNuGet { pname = "ReactiveUI.Fody"; version = "18.4.26"; hash = "sha256-ucLfi/HB3cJIdmNssfazZAXPC8QJ35YVA+GtWKVU6UQ="; }) + (fetchNuGet { pname = "Robust.Natives"; version = "0.1.1"; hash = "sha256-/DPbgIzIqZx7ClHKSgI88p03xwKSNWY/MqNri2ZX7uo="; }) + (fetchNuGet { pname = "Robust.Natives.Angle"; version = "0.1.1-chromium4758"; hash = "sha256-UGVYx1AZ0K/vzApEshxNQinx7jg43WAMB1lf0yRtnis="; }) + (fetchNuGet { pname = "Robust.Natives.Fluidsynth"; version = "0.1.0"; hash = "sha256-XRyvRqEcEFFvXSjcvNRl9MIMAY42nWRrC7pHqQvn0wI="; }) + (fetchNuGet { pname = "Robust.Natives.Freetype"; version = "0.1.0"; hash = "sha256-gufHmxKub3204pAYvcLegY80LMoKPY5u3Z3uIleReWo="; }) + (fetchNuGet { pname = "Robust.Natives.Glfw"; version = "0.1.0"; hash = "sha256-YDL7w5wVb2Il/O4PRlxPgYUOlM2Ksu+kIrlKc1qYynU="; }) + (fetchNuGet { pname = "Robust.Natives.OpenAL"; version = "0.1.0"; hash = "sha256-3dIpRKPASi8wu8eMWSC/M4CNJK1WKKJVB4XVXKSeihs="; }) + (fetchNuGet { pname = "Robust.Natives.Swnfd"; version = "0.1.0"; hash = "sha256-Qav0yDVQ30eV31Gz+oMXJvHQnP+XrOicakw4rb6hVus="; }) + (fetchNuGet { pname = "Robust.Shared.AuthLib"; version = "0.1.2"; hash = "sha256-ANaf6S0tsocsw37RJvk9d4LcvVQ0+1yO900iG1BLwe4="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "Serilog"; version = "2.12.0"; hash = "sha256-JD+ud+CFoLGdYGasTWKTxx5PYj2W5pBv2lMybBK7HVM="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; hash = "sha256-MXIj6YJ4GQbUS8553InMUZPPEfr8h33q2GtAhyu88+Y="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "SharpZstd.Interop"; version = "1.5.2-beta2"; hash = "sha256-Xkmf3Fui97lC5CROT6o1W0vD4EURrMh7RJQ+nS+VhYQ="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; hash = "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.6"; hash = "sha256-VjgGoi73tVvqO/UXmQb1w9ioAbFu2dxH8oHz1l5H4zE="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; hash = "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.6"; hash = "sha256-CIb9fHVgHwIa0R1WafKJ3+GqtDHHRgDohA3ayTHvlws="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; hash = "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA="; }) + (fetchNuGet { pname = "SpaceWizards.Sodium"; version = "0.2.1"; hash = "sha256-1x10ZvfWf1VGQM87c3Hc7ue9ibhslA1P2zE29FylOhU="; }) + (fetchNuGet { pname = "SpaceWizards.Sodium.Interop"; version = "1.0.18-beta4"; hash = "sha256-dvPwT6owmBRYZT3UhOd9xBWtVF4C2+Woa7t18Y+IqfA="; }) + (fetchNuGet { pname = "Splat"; version = "14.6.8"; hash = "sha256-XHTuUKAisBU0O3keA+Ojzb8yKKJUheWbRHakzLBeQNo="; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.4"; hash = "sha256-4IHC1KMcKOKHKLlf+/TIAVCQCdEDhPQw5+FUlujVDWo="; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; hash = "sha256-jSI3SIE/HBLEvM+IzhfnAS0QU+JQzIokC/lGLNLvUyU="; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.4"; hash = "sha256-dk7eEcw+lgpZuWdZn2794hQ6GHDeIfCRNGSysPUsiIY="; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.4"; hash = "sha256-Zdj676VT6j6k9ZCL2hYVl4F8bi4TK/ldvQBPmW0oDi0="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Net.Http.WinHttpHandler"; version = "8.0.0"; hash = "sha256-wSK5KtWvlDp8WLNddCmAM66uGyj9/KfJyCh8ht1PD1M="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "TerraFX.Interop.Windows"; version = "10.0.22621.1"; hash = "sha256-0golrteOhpZblYuKjM3YP2rswAv/hzWDQ6I9rT9TcWE="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) + (fetchNuGet { pname = "YamlDotNet"; version = "13.0.2"; hash = "sha256-aCI7NH5iDAOcQJZNdyArt9ksqfrINreCzV7uFg3bNww="; }) ] diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index cde4cee0384af..2679866a523b3 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -6,14 +6,6 @@ , iconConvTools , copyDesktopItems , makeDesktopItem -, libX11 -, libICE -, libSM -, libXi -, libXcursor -, libXext -, libXrandr -, fontconfig , glew , SDL2 , glfw @@ -31,7 +23,7 @@ , gdk-pixbuf }: let - version = "0.28.0"; + version = "0.29.0"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -44,7 +36,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-mBFTXwnxijXAP6i7DNQ/3bujualysCGjDDjmhe15s4I="; + hash = "sha256-0HpHTZhGqCcSCCBk1d5923ALVCjozLn5fym4RH2Ov5Y="; fetchSubmodules = true; }; @@ -95,14 +87,6 @@ buildDotnetModule rec { gdk-pixbuf # Avalonia UI dependencies. - libX11 - libICE - libSM - libXi - libXcursor - libXext - libXrandr - fontconfig glew ]; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index b7489c2363530..6a4a1e002058f 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -46,7 +46,7 @@ let sqlite ] ++ extraPkgs pkgs; - ldPath = lib.optionals stdenv.is64bit [ "/lib64" ] + ldPath = lib.optionals stdenv.hostPlatform.is64bit [ "/lib64" ] ++ [ "/lib32" ] ++ map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs); @@ -60,8 +60,8 @@ let # bootstrap.tar.xz has 444 permissions, which means that simple deletes fail # and steam will not be able to start fixBootstrap = '' - if [ -r $HOME/.local/share/Steam/bootstrap.tar.xz ]; then - chmod +w $HOME/.local/share/Steam/bootstrap.tar.xz + if [ -r $HOME/.steam/steam/bootstrap.tar.xz ]; then + chmod +w $HOME/.steam/steam/bootstrap.tar.xz fi ''; @@ -125,8 +125,7 @@ in buildFHSEnv rec { xorg.libXi xorg.libSM xorg.libICE - gnome2.GConf - curlWithGnuTls + curl nspr nss cups @@ -300,7 +299,7 @@ in buildFHSEnv rec { '' + args.extraPreBwrapCmds or ""; extraBwrapArgs = [ - "--bind /etc/NIXOS /etc/NIXOS" # required 32bit driver check in runScript + "--bind-try /etc/NIXOS /etc/NIXOS" # required 32bit driver check in runScript "--bind-try /tmp/dumps /tmp/dumps" ] ++ args.extraBwrapArgs or []; @@ -342,6 +341,10 @@ in buildFHSEnv rec { description = "Run commands in the same FHS environment that is used for Steam"; mainProgram = "steam-run"; name = "steam-run"; + # steam-run itself is just a script that lives in nixpkgs (which is licensed under MIT). + # steam is a dependency and already unfree, so normal steam-run will not install without + # allowing unfree packages or appropriate `allowUnfreePredicate` rules. + license = lib.licenses.mit; }; }; } diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 151a1ba5be469..bbdb946a6b06e 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -1,22 +1,21 @@ { lib, stdenv, fetchurl, runtimeShell, traceDeps ? false, bash }: -let - traceLog = "/tmp/steam-trace-dependencies.log"; - version = "1.0.0.74"; - -in stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "steam-original"; - inherit version; + version = "1.0.0.81"; src = fetchurl { # use archive url so the tarball doesn't 404 on a new release - url = "https://repo.steampowered.com/steam/archive/stable/steam_${version}.tar.gz"; - sha256 = "sha256-sO07g3j1Qejato2LWJ2FrW3AzfMCcBz46HEw7aKxojQ="; + url = "https://repo.steampowered.com/steam/archive/stable/steam_${finalAttrs.version}.tar.gz"; + hash = "sha256-Gia5182s4J4E3Ia1EeC5kjJX9mSltsr+b+1eRtEXtPk="; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - postInstall = '' + postInstall = + let + traceLog = "/tmp/steam-trace-dependencies.log"; + in '' rm $out/bin/steamdeps ${lib.optionalString traceDeps '' cat > $out/bin/steamdeps <<EOF @@ -39,6 +38,8 @@ in stdenv.mkDerivation { sed -e 's,/usr/bin/steam,steam,g' steam.desktop > $out/share/applications/steam.desktop ''; + passthru.updateScript = ./update-bootstrap.py; + meta = with lib; { description = "Digital distribution platform"; longDescription = '' @@ -51,4 +52,4 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ jagajaga ]; mainProgram = "steam"; }; -} +}) diff --git a/pkgs/games/steam/update-bootstrap.py b/pkgs/games/steam/update-bootstrap.py new file mode 100755 index 0000000000000..7720a08f4fced --- /dev/null +++ b/pkgs/games/steam/update-bootstrap.py @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure --keep NIX_PATH -i python3 -p git nix-update "python3.withPackages (ps: [ ps.beautifulsoup4 ps.requests ])" + +import sys +import re +import requests +import subprocess +from bs4 import BeautifulSoup + +VERSION_PATTERN = re.compile(r'^steam_(?P<ver>(\d+\.)+)tar.gz$') + +found_versions = [] +response = requests.get("https://repo.steampowered.com/steam/archive/stable/") +soup = BeautifulSoup (response.text, "html.parser") +for a in soup.find_all("a"): + href = a["href"] + if not href.endswith(".tar.gz"): + continue + + match = VERSION_PATTERN.match(href) + if match is not None: + version = match.groupdict()["ver"][0:-1] + found_versions.append(version) + +if len(found_versions) == 0: + print("Failed to find available versions!", file=sys.stderr) + sys.exit(1) + +found_versions.sort() +subprocess.run(["nix-update", "--version", found_versions[-1], "steamPackages.steam"]) +found_versions[0] diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index ac8c765ac94c8..b4531fc0015d6 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -4,37 +4,37 @@ let # The x86-64-modern may need to be refined further in the future # but stdenv.hostPlatform CPU flags do not currently work on Darwin # https://discourse.nixos.org/t/darwin-system-and-stdenv-hostplatform-features/9745 - archDarwin = if stdenv.isx86_64 then "x86-64-modern" else "apple-silicon"; - arch = if stdenv.isDarwin then archDarwin else - if stdenv.isx86_64 then "x86-64" else - if stdenv.isi686 then "x86-32" else - if stdenv.isAarch64 then "armv8" else + archDarwin = if stdenv.hostPlatform.isx86_64 then "x86-64-modern" else "apple-silicon"; + arch = if stdenv.hostPlatform.isDarwin then archDarwin else + if stdenv.hostPlatform.isx86_64 then "x86-64" else + if stdenv.hostPlatform.isi686 then "x86-32" else + if stdenv.hostPlatform.isAarch64 then "armv8" else "unknown"; # These files can be found in src/evaluate.h - nnueBigFile = "nn-b1a57edbea57.nnue"; + nnueBigFile = "nn-1111cefa1111.nnue"; nnueBig = fetchurl { name = nnueBigFile; url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}"; - sha256 = "sha256-saV+2+pXTKi4jWg3RzhFeRvrU9iF+H+G1czdVln787I="; + sha256 = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ="; }; - nnueSmallFile = "nn-baff1ede1f90.nnue"; + nnueSmallFile = "nn-37f18f62d772.nnue"; nnueSmall = fetchurl { name = nnueSmallFile; url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}"; - sha256 = "sha256-uv8e3h+Qwd0bT3cvHv8phIghgB6BhjRdp/DrQSG9b2M="; + sha256 = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0="; }; in stdenv.mkDerivation rec { pname = "stockfish"; - version = "16.1"; + version = "17"; src = fetchFromGitHub { owner = "official-stockfish"; repo = "Stockfish"; rev = "sf_${version}"; - sha256 = "sha256-xTtjfJgEHF0SQT9Fw/9RLZA0Quh00jrIbihr7IYCm2U="; + sha256 = "sha256-oXvLaC5TEUPlHjhm7tOxpNPY88QxYHFw+Cev3Q8NEeQ="; }; postUnpack = '' @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { Stockfish is one of the strongest chess engines in the world. It is also much stronger than the best human chess grandmasters. ''; - maintainers = with maintainers; [ luispedro siraben ]; + maintainers = with maintainers; [ luispedro siraben thibaultd ]; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; license = licenses.gpl3Only; }; diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/games/system-syzygy/default.nix index b478259a8a9c3..d321284b74279 100644 --- a/pkgs/games/system-syzygy/default.nix +++ b/pkgs/games/system-syzygy/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Story and a puzzle game, where you solve a variety of puzzle"; mainProgram = "syzygy"; homepage = "https://mdsteele.games/syzygy"; diff --git a/pkgs/games/taisei/default.nix b/pkgs/games/taisei/default.nix index cb87e48da38eb..ee5712f7b7f68 100644 --- a/pkgs/games/taisei/default.nix +++ b/pkgs/games/taisei/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Free and open-source Touhou Project clone and fangame"; mainProgram = "taisei"; longDescription = '' diff --git a/pkgs/games/tecnoballz/default.nix b/pkgs/games/tecnoballz/default.nix index 0d19a2c0f7e24..b3f1914bc18ef 100644 --- a/pkgs/games/tecnoballz/default.nix +++ b/pkgs/games/tecnoballz/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 505c61588e3e2..b07dbc311a2cc 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -51,19 +51,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optionals (buildClient && stdenv.isLinux) [ + ] ++ lib.optionals (buildClient && stdenv.hostPlatform.isLinux) [ icoutils ]; buildInputs = [ python3 lua5_3 zlib wavpack - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optionals buildClient ([ SDL2 freetype - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU alsa-lib libX11 @@ -73,14 +73,14 @@ stdenv.mkDerivation rec { "-DCLIENT=${if buildClient then "ON" else "OFF"}" ]; - postInstall = lib.optionalString buildClient (lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString buildClient (lib.optionalString stdenv.hostPlatform.isLinux '' # Convert and install desktop icon mkdir -p $out/share/pixmaps icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico # Install menu item install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications/teeworlds.app/Contents/MacOS" mkdir -p "$out/Applications/teeworlds.app/Contents/Resources" diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index 90c99ed60e270..f0e13bc9be686 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -28,13 +28,14 @@ let url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2024-01-29/tuxpaint-stamps-2024.01.29.tar.gz"; hash = "sha256-GwJx9tqaX7I623tJQYO53iiaApZtYsTLQw2ptBIFlKk="; }; + in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.9.32"; pname = "tuxpaint"; src = fetchurl { - url = "mirror://sourceforge/tuxpaint/${version}/tuxpaint-${version}.tar.gz"; + url = "mirror://sourceforge/tuxpaint/${finalAttrs.version}/tuxpaint-${finalAttrs.version}.tar.gz"; hash = "sha256-CcziIkFIHcE2D8S8XU2h0xgV16JWO56fohemcrqXS/I="; }; @@ -110,5 +111,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ woffs ]; platforms = lib.platforms.linux; + mainProgram = "tuxpaint"; }; -} +}) diff --git a/pkgs/games/uhexen2/default.nix b/pkgs/games/uhexen2/default.nix index 1d44b16c3aef9..a0922a145703d 100644 --- a/pkgs/games/uhexen2/default.nix +++ b/pkgs/games/uhexen2/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Cross-platform port of Hexen II game"; longDescription = '' Hammer of Thyrion (uHexen2) is a cross-platform port of Raven Software's Hexen II source. diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index bd07544712ad5..49bb6c44b7f75 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "2024.5.1"; + version = "2024.8.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${version}"; - hash = "sha256-HtvKy3uQwIO2BiLUqIcv9crf9Ngq0dmYOm6E8Gm2EHs="; + hash = "sha256-eji8lMrZbKAMYTqUk9d8tBIKkH083fbh4s01M0mPLpM="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 45b1e6f68e4ef..4b68bc53d086c 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.12"; + version = "3.7.14"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-pNpDaGx/h3W+AsX965zu3zZ94kMYvh1pV8C8qYN0imc="; + sha256 = "sha256-3P3f6X2c5lF1AizEs9z59MhLy0Ntg203rkPAkv+SBtw="; }; buildInputs = [ diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 42408cd042aa0..ddbbf68bbc089 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { directory where you saved it. ''; - src = if (stdenv.isi686) then + src = if (stdenv.hostPlatform.isi686) then requireFile { message = goBuyItNow; name = "vessel-${version}-bin"; diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index b32417d7754bf..1c5c171895115 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -48,14 +48,16 @@ stdenv.mkDerivation rec { libXi ])); - desktopItems = makeDesktopItem { - name = "vintagestory"; - desktopName = "Vintage Story"; - exec = "vintagestory"; - icon = "vintagestory"; - comment = "Innovate and explore in a sandbox world"; - categories = [ "Game" ]; - }; + desktopItems = [ + (makeDesktopItem { + name = "vintagestory"; + desktopName = "Vintage Story"; + exec = "vintagestory"; + icon = "vintagestory"; + comment = "Innovate and explore in a sandbox world"; + categories = [ "Game" ]; + }) + ]; installPhase = '' runHook preInstall diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index bac78ab72f35b..b1b30a7e769db 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ ]; - broken = stdenv.isAarch64; # build fails with "libIrrlicht.so: undefined reference to `png_init_filter_functions_neon'" + broken = stdenv.hostPlatform.isAarch64; # build fails with "libIrrlicht.so: undefined reference to `png_init_filter_functions_neon'" }; } diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix index 5bc2ef7dbd91f..71bf581f14fad 100644 --- a/pkgs/games/warsow/engine.nix +++ b/pkgs/games/warsow/engine.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ astsmtl abbradar ]; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 02c60c157976f..81ab98e67bc9b 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "4.5.2"; + version = "4.5.3"; src = fetchurl { url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz"; - hash = "sha256-J8IJH2/A2OO7YP9moWOM77qDW7TdZ40MLVv/y0xDAms="; + hash = "sha256-7tSfLkVth9nbGSwn1uNWeFrHx5ac+jaO3Gk9Bb+hLIk="; }; buildInputs = [ @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { freetype harfbuzz sqlite - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ vulkan-headers vulkan-loader ]; @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { # # Alternatively, we could have set CMAKE_INSTALL_BINDIR to "bin". "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share" - ] ++ lib.optional stdenv.isDarwin "-P../configure_mac.cmake"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "-P../configure_mac.cmake"; postInstall = lib.optionalString withVideos '' cp ${sequences_src} $out/share/warzone2100/sequences.wz @@ -141,6 +141,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; # configure_mac.cmake tries to download stuff # https://github.com/Warzone2100/warzone2100/blob/master/macosx/README.md - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 01dd8ceaca173..5017216aecc43 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost libvorbis fribidi dbus libpng pcre openssl icu lua curl ] - ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa Foundation]; cmakeFlags = [ "-DENABLE_SYSTEM_LUA=ON" ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; meta = with lib; { description = "Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 11e6db9c687ec..e34e23ab60354 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Wno-dev" # dev warnings are only needed for upstream development - "-DCMAKE_BUILD_TYPE=Release" "-DWL_INSTALL_BASEDIR=${placeholder "out"}/share/widelands" # for COPYING, Changelog, etc. "-DWL_INSTALL_DATADIR=${placeholder "out"}/share/widelands" # for game data "-DWL_INSTALL_BINDIR=${placeholder "out"}/bin" @@ -73,12 +72,12 @@ stdenv.mkDerivation rec { libSM # XXX: these should be propagated by SDL2? libICE ] - ++ lib.optional stdenv.isLinux libXext - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optional stdenv.hostPlatform.isLinux libXext + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa ]); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm444 -t $out/share/applications ../xdg/org.widelands.Widelands.desktop for s in 16 32 48 64 128; do diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix index 3af6f069a5aa1..dca1d74a43ff1 100644 --- a/pkgs/games/zaz/default.nix +++ b/pkgs/games/zaz/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Puzzle game about arranging balls in triplets, like Luxor, Zuma, or Puzzle Bobble"; homepage = "https://zaz.sourceforge.net/"; license = licenses.gpl3; diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index f16f625c7c646..f5092b6da53d3 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -11,76 +11,91 @@ wayland-protocols, wayland, zxing-cpp, -}: let - allPackages = self: let - frameworks = import ./frameworks {inherit (self) callPackage;}; - gear = import ./gear {inherit (self) callPackage;}; - plasma = import ./plasma {inherit (self) callPackage;}; +}: +let + allPackages = + self: + let + frameworks = import ./frameworks { inherit (self) callPackage; }; + gear = import ./gear { inherit (self) callPackage; }; + plasma = import ./plasma { inherit (self) callPackage; }; - sets = ["gear" "frameworks" "plasma"]; + sets = [ + "gear" + "frameworks" + "plasma" + ]; - loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json"); - allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets); + loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json"); + allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets); - sources = lib.mapAttrs (_: v: - (fetchurl { - inherit (v) url hash; - }) - // {inherit (v) version;}) - allUrls; - in ( - qt6Packages - // frameworks - // gear - // plasma - // { - inherit sources; + sources = lib.mapAttrs ( + _: v: + (fetchurl { + inherit (v) url hash; + }) + // { + inherit (v) version; + } + ) allUrls; + in + ( + qt6Packages + // frameworks + // gear + // plasma + // { + inherit sources; - mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) {}; + mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) { }; - # THIRD PARTY - inherit - cmark - gpgme - taglib - wayland - wayland-protocols - zxing-cpp - ; + # THIRD PARTY + inherit + cmark + gpgme + taglib + wayland + wayland-protocols + zxing-cpp + ; - # Alias to match metadata - kquickimageeditor = self.kquickimageedit; + # Alias to match metadata + kquickimageeditor = self.kquickimageedit; - # Alias because it's just data - plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols; + # Alias because it's just data + plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols; - selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub + selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub - alpaka = self.callPackage ./misc/alpaka {}; - kdiagram = self.callPackage ./misc/kdiagram {}; - kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt {}; - kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {}; - kirigami-addons = self.callPackage ./misc/kirigami-addons {}; - kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {}; - kio-fuse = self.callPackage ./misc/kio-fuse {}; - ktextaddons = self.callPackage ./misc/ktextaddons {}; - kunifiedpush = self.callPackage ./misc/kunifiedpush {}; - kup = self.callPackage ./misc/kup {}; - marknote = self.callPackage ./misc/marknote {}; - mpvqt = self.callPackage ./misc/mpvqt {}; - oxygen-icons = self.callPackage ./misc/oxygen-icons {}; - phonon = self.callPackage ./misc/phonon {}; - phonon-vlc = self.callPackage ./misc/phonon-vlc {}; - polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 {}; - pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt {}; + alpaka = self.callPackage ./misc/alpaka { }; + calligra = self.callPackage ./misc/calligra { }; + kdiagram = self.callPackage ./misc/kdiagram { }; + kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { }; + kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client { }; + kirigami-addons = self.callPackage ./misc/kirigami-addons { }; + kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 { }; + kio-fuse = self.callPackage ./misc/kio-fuse { }; + klevernotes = self.callPackage ./misc/klevernotes { }; + ktextaddons = self.callPackage ./misc/ktextaddons { }; + kunifiedpush = self.callPackage ./misc/kunifiedpush { }; + kup = self.callPackage ./misc/kup { }; + marknote = self.callPackage ./misc/marknote { }; + mpvqt = self.callPackage ./misc/mpvqt { }; + oxygen-icons = self.callPackage ./misc/oxygen-icons { }; + phonon = self.callPackage ./misc/phonon { }; + phonon-vlc = self.callPackage ./misc/phonon-vlc { }; + polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { }; + pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { }; - applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {}; - karousel = self.callPackage ./third-party/karousel {}; - kzones = self.callPackage ./third-party/kzones {}; - } - ); + applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 { }; + karousel = self.callPackage ./third-party/karousel { }; + koi = self.callPackage ./third-party/koi { }; + krohnkite = self.callPackage ./third-party/krohnkite { }; + kzones = self.callPackage ./third-party/kzones { }; + } + ); in - makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "kdePackages"; - f = allPackages; - } +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "kdePackages"; + f = allPackages; +} diff --git a/pkgs/kde/frameworks/attica/default.nix b/pkgs/kde/frameworks/attica/default.nix index 05b5c1e59be9a..c2d8a53157781 100644 --- a/pkgs/kde/frameworks/attica/default.nix +++ b/pkgs/kde/frameworks/attica/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "attica"; } diff --git a/pkgs/kde/frameworks/baloo/default.nix b/pkgs/kde/frameworks/baloo/default.nix index 40ab00ebd193d..dc05d254dfd58 100644 --- a/pkgs/kde/frameworks/baloo/default.nix +++ b/pkgs/kde/frameworks/baloo/default.nix @@ -11,5 +11,8 @@ mkKdeDerivation { substituteInPlace src/file/kde-baloo.service.in --replace-fail @KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition /run/current-system/sw/bin/kde-systemd-start-condition ''; - extraBuildInputs = [qtdeclarative lmdb]; + extraBuildInputs = [ + qtdeclarative + lmdb + ]; } diff --git a/pkgs/kde/frameworks/bluez-qt/default.nix b/pkgs/kde/frameworks/bluez-qt/default.nix index 3bccb4309af73..24814d0d8d387 100644 --- a/pkgs/kde/frameworks/bluez-qt/default.nix +++ b/pkgs/kde/frameworks/bluez-qt/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "bluez-qt"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/breeze-icons/default.nix b/pkgs/kde/frameworks/breeze-icons/default.nix index 103903c04cb4e..e7c75aad85fbf 100644 --- a/pkgs/kde/frameworks/breeze-icons/default.nix +++ b/pkgs/kde/frameworks/breeze-icons/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "breeze-icons"; extraNativeBuildInputs = [ - (python3.withPackages (ps: [ps.lxml])) + (python3.withPackages (ps: [ ps.lxml ])) libxml2 ]; diff --git a/pkgs/kde/frameworks/default.nix b/pkgs/kde/frameworks/default.nix index 302be8ad3eba4..148c6a3d98956 100644 --- a/pkgs/kde/frameworks/default.nix +++ b/pkgs/kde/frameworks/default.nix @@ -1,74 +1,75 @@ -{callPackage}: { - attica = callPackage ./attica {}; - baloo = callPackage ./baloo {}; - bluez-qt = callPackage ./bluez-qt {}; - breeze-icons = callPackage ./breeze-icons {}; - extra-cmake-modules = callPackage ./extra-cmake-modules {}; - frameworkintegration = callPackage ./frameworkintegration {}; - kapidox = callPackage ./kapidox {}; - karchive = callPackage ./karchive {}; - kauth = callPackage ./kauth {}; - kbookmarks = callPackage ./kbookmarks {}; - kcalendarcore = callPackage ./kcalendarcore {}; - kcmutils = callPackage ./kcmutils {}; - kcodecs = callPackage ./kcodecs {}; - kcolorscheme = callPackage ./kcolorscheme {}; - kcompletion = callPackage ./kcompletion {}; - kconfig = callPackage ./kconfig {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; - kcontacts = callPackage ./kcontacts {}; - kcoreaddons = callPackage ./kcoreaddons {}; - kcrash = callPackage ./kcrash {}; - kdav = callPackage ./kdav {}; - kdbusaddons = callPackage ./kdbusaddons {}; - kdeclarative = callPackage ./kdeclarative {}; - kded = callPackage ./kded {}; - kdesu = callPackage ./kdesu {}; - kdnssd = callPackage ./kdnssd {}; - kdoctools = callPackage ./kdoctools {}; - kfilemetadata = callPackage ./kfilemetadata {}; - kglobalaccel = callPackage ./kglobalaccel {}; - kguiaddons = callPackage ./kguiaddons {}; - kholidays = callPackage ./kholidays {}; - ki18n = callPackage ./ki18n {}; - kiconthemes = callPackage ./kiconthemes {}; - kidletime = callPackage ./kidletime {}; - kimageformats = callPackage ./kimageformats {}; - kio = callPackage ./kio {}; - kirigami = callPackage ./kirigami {}; - kitemmodels = callPackage ./kitemmodels {}; - kitemviews = callPackage ./kitemviews {}; - kjobwidgets = callPackage ./kjobwidgets {}; - knewstuff = callPackage ./knewstuff {}; - knotifications = callPackage ./knotifications {}; - knotifyconfig = callPackage ./knotifyconfig {}; - kpackage = callPackage ./kpackage {}; - kparts = callPackage ./kparts {}; - kpeople = callPackage ./kpeople {}; - kplotting = callPackage ./kplotting {}; - kpty = callPackage ./kpty {}; - kquickcharts = callPackage ./kquickcharts {}; - krunner = callPackage ./krunner {}; - kservice = callPackage ./kservice {}; - kstatusnotifieritem = callPackage ./kstatusnotifieritem {}; - ksvg = callPackage ./ksvg {}; - ktexteditor = callPackage ./ktexteditor {}; - ktexttemplate = callPackage ./ktexttemplate {}; - ktextwidgets = callPackage ./ktextwidgets {}; - kunitconversion = callPackage ./kunitconversion {}; - kuserfeedback = callPackage ./kuserfeedback {}; - kwallet = callPackage ./kwallet {}; - kwidgetsaddons = callPackage ./kwidgetsaddons {}; - kwindowsystem = callPackage ./kwindowsystem {}; - kxmlgui = callPackage ./kxmlgui {}; - modemmanager-qt = callPackage ./modemmanager-qt {}; - networkmanager-qt = callPackage ./networkmanager-qt {}; - prison = callPackage ./prison {}; - purpose = callPackage ./purpose {}; - qqc2-desktop-style = callPackage ./qqc2-desktop-style {}; - solid = callPackage ./solid {}; - sonnet = callPackage ./sonnet {}; - syndication = callPackage ./syndication {}; - syntax-highlighting = callPackage ./syntax-highlighting {}; - threadweaver = callPackage ./threadweaver {}; +{ callPackage }: +{ + attica = callPackage ./attica { }; + baloo = callPackage ./baloo { }; + bluez-qt = callPackage ./bluez-qt { }; + breeze-icons = callPackage ./breeze-icons { }; + extra-cmake-modules = callPackage ./extra-cmake-modules { }; + frameworkintegration = callPackage ./frameworkintegration { }; + kapidox = callPackage ./kapidox { }; + karchive = callPackage ./karchive { }; + kauth = callPackage ./kauth { }; + kbookmarks = callPackage ./kbookmarks { }; + kcalendarcore = callPackage ./kcalendarcore { }; + kcmutils = callPackage ./kcmutils { }; + kcodecs = callPackage ./kcodecs { }; + kcolorscheme = callPackage ./kcolorscheme { }; + kcompletion = callPackage ./kcompletion { }; + kconfig = callPackage ./kconfig { }; + kconfigwidgets = callPackage ./kconfigwidgets { }; + kcontacts = callPackage ./kcontacts { }; + kcoreaddons = callPackage ./kcoreaddons { }; + kcrash = callPackage ./kcrash { }; + kdav = callPackage ./kdav { }; + kdbusaddons = callPackage ./kdbusaddons { }; + kdeclarative = callPackage ./kdeclarative { }; + kded = callPackage ./kded { }; + kdesu = callPackage ./kdesu { }; + kdnssd = callPackage ./kdnssd { }; + kdoctools = callPackage ./kdoctools { }; + kfilemetadata = callPackage ./kfilemetadata { }; + kglobalaccel = callPackage ./kglobalaccel { }; + kguiaddons = callPackage ./kguiaddons { }; + kholidays = callPackage ./kholidays { }; + ki18n = callPackage ./ki18n { }; + kiconthemes = callPackage ./kiconthemes { }; + kidletime = callPackage ./kidletime { }; + kimageformats = callPackage ./kimageformats { }; + kio = callPackage ./kio { }; + kirigami = callPackage ./kirigami { }; + kitemmodels = callPackage ./kitemmodels { }; + kitemviews = callPackage ./kitemviews { }; + kjobwidgets = callPackage ./kjobwidgets { }; + knewstuff = callPackage ./knewstuff { }; + knotifications = callPackage ./knotifications { }; + knotifyconfig = callPackage ./knotifyconfig { }; + kpackage = callPackage ./kpackage { }; + kparts = callPackage ./kparts { }; + kpeople = callPackage ./kpeople { }; + kplotting = callPackage ./kplotting { }; + kpty = callPackage ./kpty { }; + kquickcharts = callPackage ./kquickcharts { }; + krunner = callPackage ./krunner { }; + kservice = callPackage ./kservice { }; + kstatusnotifieritem = callPackage ./kstatusnotifieritem { }; + ksvg = callPackage ./ksvg { }; + ktexteditor = callPackage ./ktexteditor { }; + ktexttemplate = callPackage ./ktexttemplate { }; + ktextwidgets = callPackage ./ktextwidgets { }; + kunitconversion = callPackage ./kunitconversion { }; + kuserfeedback = callPackage ./kuserfeedback { }; + kwallet = callPackage ./kwallet { }; + kwidgetsaddons = callPackage ./kwidgetsaddons { }; + kwindowsystem = callPackage ./kwindowsystem { }; + kxmlgui = callPackage ./kxmlgui { }; + modemmanager-qt = callPackage ./modemmanager-qt { }; + networkmanager-qt = callPackage ./networkmanager-qt { }; + prison = callPackage ./prison { }; + purpose = callPackage ./purpose { }; + qqc2-desktop-style = callPackage ./qqc2-desktop-style { }; + solid = callPackage ./solid { }; + sonnet = callPackage ./sonnet { }; + syndication = callPackage ./syndication { }; + syntax-highlighting = callPackage ./syntax-highlighting { }; + threadweaver = callPackage ./threadweaver { }; } diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix index b7dc85d277a3c..d0b5c09a101df 100644 --- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix +++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix @@ -1,5 +1,6 @@ -{ mkKdeDerivation -, python3 +{ + mkKdeDerivation, + python3, }: mkKdeDerivation { pname = "extra-cmake-modules"; diff --git a/pkgs/kde/frameworks/frameworkintegration/default.nix b/pkgs/kde/frameworks/frameworkintegration/default.nix index 3607c115c3011..938ed4e1c0815 100644 --- a/pkgs/kde/frameworks/frameworkintegration/default.nix +++ b/pkgs/kde/frameworks/frameworkintegration/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "frameworkintegration"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [packagekit-qt]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ packagekit-qt ]; } diff --git a/pkgs/kde/frameworks/kapidox/default.nix b/pkgs/kde/frameworks/kapidox/default.nix index 2544e7921f873..8a79a0dde1fc3 100644 --- a/pkgs/kde/frameworks/kapidox/default.nix +++ b/pkgs/kde/frameworks/kapidox/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kapidox"; } diff --git a/pkgs/kde/frameworks/karchive/default.nix b/pkgs/kde/frameworks/karchive/default.nix index fe124e1187d1c..d9d15c9592a83 100644 --- a/pkgs/kde/frameworks/karchive/default.nix +++ b/pkgs/kde/frameworks/karchive/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "karchive"; - extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [xz]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; + extraBuildInputs = [ xz ]; } diff --git a/pkgs/kde/frameworks/kauth/default.nix b/pkgs/kde/frameworks/kauth/default.nix index df033770a3035..4ed23d29fd1cc 100644 --- a/pkgs/kde/frameworks/kauth/default.nix +++ b/pkgs/kde/frameworks/kauth/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { # Late resolve paths so things end up in their own prefix # FIXME(later): discuss with upstream - patches = [./fix-paths.patch]; + patches = [ ./fix-paths.patch ]; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kbookmarks/default.nix b/pkgs/kde/frameworks/kbookmarks/default.nix index ac9255e6f83d5..e52786637ff14 100644 --- a/pkgs/kde/frameworks/kbookmarks/default.nix +++ b/pkgs/kde/frameworks/kbookmarks/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kbookmarks"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kcalendarcore/default.nix b/pkgs/kde/frameworks/kcalendarcore/default.nix index 0e9802e5aa22b..05f1023a9b615 100644 --- a/pkgs/kde/frameworks/kcalendarcore/default.nix +++ b/pkgs/kde/frameworks/kcalendarcore/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kcalendarcore"; - extraBuildInputs = [qtdeclarative libical]; + extraBuildInputs = [ + qtdeclarative + libical + ]; } diff --git a/pkgs/kde/frameworks/kcmutils/default.nix b/pkgs/kde/frameworks/kcmutils/default.nix index 617fb5978d116..62c80823df213 100644 --- a/pkgs/kde/frameworks/kcmutils/default.nix +++ b/pkgs/kde/frameworks/kcmutils/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kcmutils"; - extraPropagatedBuildInputs = [qtdeclarative]; + extraPropagatedBuildInputs = [ qtdeclarative ]; meta.mainProgram = "kcmshell6"; } diff --git a/pkgs/kde/frameworks/kcodecs/default.nix b/pkgs/kde/frameworks/kcodecs/default.nix index be91267120559..c2649fe03dec2 100644 --- a/pkgs/kde/frameworks/kcodecs/default.nix +++ b/pkgs/kde/frameworks/kcodecs/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kcodecs"; - extraNativeBuildInputs = [qttools gperf]; + extraNativeBuildInputs = [ + qttools + gperf + ]; } diff --git a/pkgs/kde/frameworks/kcolorscheme/default.nix b/pkgs/kde/frameworks/kcolorscheme/default.nix index 05f32ce574f39..eb682a4e563c5 100644 --- a/pkgs/kde/frameworks/kcolorscheme/default.nix +++ b/pkgs/kde/frameworks/kcolorscheme/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcolorscheme"; } diff --git a/pkgs/kde/frameworks/kcompletion/default.nix b/pkgs/kde/frameworks/kcompletion/default.nix index c07f274e08ee3..922182e9280bd 100644 --- a/pkgs/kde/frameworks/kcompletion/default.nix +++ b/pkgs/kde/frameworks/kcompletion/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kcompletion"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kconfig/default.nix b/pkgs/kde/frameworks/kconfig/default.nix index b29a081524c74..451ec7db5d285 100644 --- a/pkgs/kde/frameworks/kconfig/default.nix +++ b/pkgs/kde/frameworks/kconfig/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kconfig"; - extraNativeBuildInputs = [qttools]; - extraPropagatedBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ qttools ]; + extraPropagatedBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kconfigwidgets/default.nix b/pkgs/kde/frameworks/kconfigwidgets/default.nix index 354972d005aeb..7f026b34a152f 100644 --- a/pkgs/kde/frameworks/kconfigwidgets/default.nix +++ b/pkgs/kde/frameworks/kconfigwidgets/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kconfigwidgets"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kcontacts/default.nix b/pkgs/kde/frameworks/kcontacts/default.nix index 57e35a90a9ae5..fa8e1429fa805 100644 --- a/pkgs/kde/frameworks/kcontacts/default.nix +++ b/pkgs/kde/frameworks/kcontacts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcontacts"; } diff --git a/pkgs/kde/frameworks/kcoreaddons/default.nix b/pkgs/kde/frameworks/kcoreaddons/default.nix index 12c6ae5d770bd..55189f9f544f0 100644 --- a/pkgs/kde/frameworks/kcoreaddons/default.nix +++ b/pkgs/kde/frameworks/kcoreaddons/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kcoreaddons"; - extraNativeBuildInputs = [qttools shared-mime-info]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ + qttools + shared-mime-info + ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kcrash/default.nix b/pkgs/kde/frameworks/kcrash/default.nix index b3ade8fd67638..ae389456e51a8 100644 --- a/pkgs/kde/frameworks/kcrash/default.nix +++ b/pkgs/kde/frameworks/kcrash/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcrash"; } diff --git a/pkgs/kde/frameworks/kdav/default.nix b/pkgs/kde/frameworks/kdav/default.nix index d53562fc9038b..04e27a4818943 100644 --- a/pkgs/kde/frameworks/kdav/default.nix +++ b/pkgs/kde/frameworks/kdav/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdav"; } diff --git a/pkgs/kde/frameworks/kdbusaddons/default.nix b/pkgs/kde/frameworks/kdbusaddons/default.nix index 6803331b1e366..c75df4132c0bb 100644 --- a/pkgs/kde/frameworks/kdbusaddons/default.nix +++ b/pkgs/kde/frameworks/kdbusaddons/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kdbusaddons"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; meta.mainProgram = "kquitapp6"; } diff --git a/pkgs/kde/frameworks/kdeclarative/default.nix b/pkgs/kde/frameworks/kdeclarative/default.nix index 8b05ec66b0f4a..a1a0bb4089b89 100644 --- a/pkgs/kde/frameworks/kdeclarative/default.nix +++ b/pkgs/kde/frameworks/kdeclarative/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kdeclarative"; - extraNativeBuildInputs = [spirv-tools]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ spirv-tools ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kded/default.nix b/pkgs/kde/frameworks/kded/default.nix index aa2ec5fc5ac22..2eecc23ab8364 100644 --- a/pkgs/kde/frameworks/kded/default.nix +++ b/pkgs/kde/frameworks/kded/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kded"; meta.mainProgram = "kded6"; diff --git a/pkgs/kde/frameworks/kdesu/default.nix b/pkgs/kde/frameworks/kdesu/default.nix index ae7ed3a33c383..479c7cc6a4af0 100644 --- a/pkgs/kde/frameworks/kdesu/default.nix +++ b/pkgs/kde/frameworks/kdesu/default.nix @@ -1,7 +1,7 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdesu"; # Look for NixOS SUID wrapper first - patches = [./kdesu-search-for-wrapped-daemon-first.patch]; + patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ]; } diff --git a/pkgs/kde/frameworks/kdnssd/default.nix b/pkgs/kde/frameworks/kdnssd/default.nix index 3241dcf9c2fb5..ce22856035e34 100644 --- a/pkgs/kde/frameworks/kdnssd/default.nix +++ b/pkgs/kde/frameworks/kdnssd/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kdnssd"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [avahi]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ avahi ]; } diff --git a/pkgs/kde/frameworks/kdoctools/default.nix b/pkgs/kde/frameworks/kdoctools/default.nix index 2de9ed21d9c88..ee5115c9f4698 100644 --- a/pkgs/kde/frameworks/kdoctools/default.nix +++ b/pkgs/kde/frameworks/kdoctools/default.nix @@ -10,7 +10,17 @@ mkKdeDerivation { pname = "kdoctools"; # Perl could be used both at build time and at runtime. - extraNativeBuildInputs = [perl perlPackages.URI libxml2]; - extraBuildInputs = [docbook_xml_dtd_45 docbook-xsl-nons]; - extraPropagatedBuildInputs = [perl perlPackages.URI]; + extraNativeBuildInputs = [ + perl + perlPackages.URI + libxml2 + ]; + extraBuildInputs = [ + docbook_xml_dtd_45 + docbook-xsl-nons + ]; + extraPropagatedBuildInputs = [ + perl + perlPackages.URI + ]; } diff --git a/pkgs/kde/frameworks/kfilemetadata/default.nix b/pkgs/kde/frameworks/kfilemetadata/default.nix index 0e9fd5489e7e1..9bd377380c186 100644 --- a/pkgs/kde/frameworks/kfilemetadata/default.nix +++ b/pkgs/kde/frameworks/kfilemetadata/default.nix @@ -14,8 +14,16 @@ mkKdeDerivation { # Fix installing cmake files into wrong directory # FIXME(later): upstream - patches = [./cmake-install-paths.patch]; + patches = [ ./cmake-install-paths.patch ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kconfig kdegraphics-mobipocket libappimage]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + attr + ebook_tools + exiv2 + ffmpeg + kconfig + kdegraphics-mobipocket + libappimage + ]; } diff --git a/pkgs/kde/frameworks/kglobalaccel/default.nix b/pkgs/kde/frameworks/kglobalaccel/default.nix index b7d5e627d64fb..10d40753ae307 100644 --- a/pkgs/kde/frameworks/kglobalaccel/default.nix +++ b/pkgs/kde/frameworks/kglobalaccel/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kglobalaccel"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kguiaddons/default.nix b/pkgs/kde/frameworks/kguiaddons/default.nix index 3aa8bcdf29f5a..e4cf58bbb36fa 100644 --- a/pkgs/kde/frameworks/kguiaddons/default.nix +++ b/pkgs/kde/frameworks/kguiaddons/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kguiaddons"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtwayland ]; meta.mainProgram = "kde-geo-uri-handler"; } diff --git a/pkgs/kde/frameworks/kholidays/default.nix b/pkgs/kde/frameworks/kholidays/default.nix index 07702734a06b6..966ca350c6fda 100644 --- a/pkgs/kde/frameworks/kholidays/default.nix +++ b/pkgs/kde/frameworks/kholidays/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kholidays"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/ki18n/default.nix b/pkgs/kde/frameworks/ki18n/default.nix index 9c3bef7852981..0e50c345f5500 100644 --- a/pkgs/kde/frameworks/ki18n/default.nix +++ b/pkgs/kde/frameworks/ki18n/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "ki18n"; - extraNativeBuildInputs = [python3]; - propagatedNativeBuildInputs = [gettext]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ python3 ]; + propagatedNativeBuildInputs = [ gettext ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kidletime/default.nix b/pkgs/kde/frameworks/kidletime/default.nix index 7171822ec1da4..1fc517f20585d 100644 --- a/pkgs/kde/frameworks/kidletime/default.nix +++ b/pkgs/kde/frameworks/kidletime/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kidletime"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland xorg.libXScrnSaver]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + xorg.libXScrnSaver + ]; } diff --git a/pkgs/kde/frameworks/kimageformats/default.nix b/pkgs/kde/frameworks/kimageformats/default.nix index 21c84cb569927..0b3d049dc185a 100644 --- a/pkgs/kde/frameworks/kimageformats/default.nix +++ b/pkgs/kde/frameworks/kimageformats/default.nix @@ -10,7 +10,13 @@ mkKdeDerivation { pname = "kimageformats"; - extraCmakeFlags = ["-DKIMAGEFORMATS_HEIF=1"]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libheif libjxl libavif libraw openexr_3]; + extraCmakeFlags = [ "-DKIMAGEFORMATS_HEIF=1" ]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + libheif + libjxl + libavif + libraw + openexr_3 + ]; } diff --git a/pkgs/kde/frameworks/kio/default.nix b/pkgs/kde/frameworks/kio/default.nix index 98d7a12f00b7d..45f448692baa1 100644 --- a/pkgs/kde/frameworks/kio/default.nix +++ b/pkgs/kde/frameworks/kio/default.nix @@ -13,5 +13,10 @@ mkKdeDerivation { ./0001-Remove-impure-smbd-search-path.patch ]; - extraBuildInputs = [qt5compat qttools acl attr]; + extraBuildInputs = [ + qt5compat + qttools + acl + attr + ]; } diff --git a/pkgs/kde/frameworks/kirigami/default.nix b/pkgs/kde/frameworks/kirigami/default.nix index cf82923596a00..83edf8c526541 100644 --- a/pkgs/kde/frameworks/kirigami/default.nix +++ b/pkgs/kde/frameworks/kirigami/default.nix @@ -17,18 +17,27 @@ let unwrapped = mkKdeDerivation { pname = "kirigami"; - extraNativeBuildInputs = [qtsvg qttools]; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [qt5compat]; + extraNativeBuildInputs = [ + qtsvg + qttools + ]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ qt5compat ]; }; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "kirigami-wrapped"; inherit (unwrapped) version; - propagatedBuildInputs = [ unwrapped qqc2-desktop-style ]; + propagatedBuildInputs = [ + unwrapped + qqc2-desktop-style + ]; dontUnpack = true; dontWrapQtApps = true; - passthru = { inherit unwrapped; }; + passthru = { + inherit unwrapped; + }; } diff --git a/pkgs/kde/frameworks/kitemmodels/default.nix b/pkgs/kde/frameworks/kitemmodels/default.nix index 22476d21c4e47..9e818457334c0 100644 --- a/pkgs/kde/frameworks/kitemmodels/default.nix +++ b/pkgs/kde/frameworks/kitemmodels/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kitemmodels"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kitemviews/default.nix b/pkgs/kde/frameworks/kitemviews/default.nix index b9831f05ea991..487d63092c002 100644 --- a/pkgs/kde/frameworks/kitemviews/default.nix +++ b/pkgs/kde/frameworks/kitemviews/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kitemviews"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kjobwidgets/default.nix b/pkgs/kde/frameworks/kjobwidgets/default.nix index 27e9720d84e11..b8b494310f45b 100644 --- a/pkgs/kde/frameworks/kjobwidgets/default.nix +++ b/pkgs/kde/frameworks/kjobwidgets/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kjobwidgets"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/knewstuff/default.nix b/pkgs/kde/frameworks/knewstuff/default.nix index 26e3207764e7c..8bbc171f2408c 100644 --- a/pkgs/kde/frameworks/knewstuff/default.nix +++ b/pkgs/kde/frameworks/knewstuff/default.nix @@ -9,9 +9,12 @@ mkKdeDerivation { # Late resolve knsrcdir so other things install to their own prefix # FIXME(later): upstream - patches = [./delay-resolving-knsrcdir.patch]; + patches = [ ./delay-resolving-knsrcdir.patch ]; - extraBuildInputs = [qtdeclarative qttools]; - extraPropagatedBuildInputs = [kcmutils]; + extraBuildInputs = [ + qtdeclarative + qttools + ]; + extraPropagatedBuildInputs = [ kcmutils ]; meta.mainProgram = "knewstuff-dialog6"; } diff --git a/pkgs/kde/frameworks/knotifications/default.nix b/pkgs/kde/frameworks/knotifications/default.nix index 232d4469f0e61..08b8decea8f00 100644 --- a/pkgs/kde/frameworks/knotifications/default.nix +++ b/pkgs/kde/frameworks/knotifications/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "knotifications"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [qtdeclarative libcanberra]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ + qtdeclarative + libcanberra + ]; } diff --git a/pkgs/kde/frameworks/knotifyconfig/default.nix b/pkgs/kde/frameworks/knotifyconfig/default.nix index 9c778a322b67d..c0fb343c16fe6 100644 --- a/pkgs/kde/frameworks/knotifyconfig/default.nix +++ b/pkgs/kde/frameworks/knotifyconfig/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "knotifyconfig"; - extraBuildInputs = [libcanberra]; + extraBuildInputs = [ libcanberra ]; } diff --git a/pkgs/kde/frameworks/kpackage/default.nix b/pkgs/kde/frameworks/kpackage/default.nix index 19e4d7932a568..f18b43d42d53d 100644 --- a/pkgs/kde/frameworks/kpackage/default.nix +++ b/pkgs/kde/frameworks/kpackage/default.nix @@ -1,9 +1,9 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kpackage"; # Follow symlinks when resolving packages # FIXME(later): upstream - patches = [./follow-symlinks.patch]; + patches = [ ./follow-symlinks.patch ]; meta.mainProgram = "kpackagetool6"; } diff --git a/pkgs/kde/frameworks/kparts/default.nix b/pkgs/kde/frameworks/kparts/default.nix index 547e8b1b016e3..f3ae2c79ca771 100644 --- a/pkgs/kde/frameworks/kparts/default.nix +++ b/pkgs/kde/frameworks/kparts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kparts"; } diff --git a/pkgs/kde/frameworks/kpeople/default.nix b/pkgs/kde/frameworks/kpeople/default.nix index 18d56704c2d81..5f9ce156b1f82 100644 --- a/pkgs/kde/frameworks/kpeople/default.nix +++ b/pkgs/kde/frameworks/kpeople/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kpeople"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kplotting/default.nix b/pkgs/kde/frameworks/kplotting/default.nix index b23c198fd8796..27284e0006b70 100644 --- a/pkgs/kde/frameworks/kplotting/default.nix +++ b/pkgs/kde/frameworks/kplotting/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kplotting"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kpty/default.nix b/pkgs/kde/frameworks/kpty/default.nix index d60c2a5665f20..e0ba42a271f90 100644 --- a/pkgs/kde/frameworks/kpty/default.nix +++ b/pkgs/kde/frameworks/kpty/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kpty"; } diff --git a/pkgs/kde/frameworks/kquickcharts/default.nix b/pkgs/kde/frameworks/kquickcharts/default.nix index 305df6000403d..736f065103362 100644 --- a/pkgs/kde/frameworks/kquickcharts/default.nix +++ b/pkgs/kde/frameworks/kquickcharts/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kquickcharts"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/krunner/default.nix b/pkgs/kde/frameworks/krunner/default.nix index f817c1560c26e..fcdc91e68e854 100644 --- a/pkgs/kde/frameworks/krunner/default.nix +++ b/pkgs/kde/frameworks/krunner/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "krunner"; - extraBuildInputs = [plasma-activities]; + extraBuildInputs = [ plasma-activities ]; } diff --git a/pkgs/kde/frameworks/kservice/default.nix b/pkgs/kde/frameworks/kservice/default.nix index c21bab7c83462..5a7bb7a5884a9 100644 --- a/pkgs/kde/frameworks/kservice/default.nix +++ b/pkgs/kde/frameworks/kservice/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kservice"; diff --git a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix index bc3b255caaeb0..e6845ef569854 100644 --- a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix +++ b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kstatusnotifieritem"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/ksvg/default.nix b/pkgs/kde/frameworks/ksvg/default.nix index 82dbce5c08294..1d91aa3143a43 100644 --- a/pkgs/kde/frameworks/ksvg/default.nix +++ b/pkgs/kde/frameworks/ksvg/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "ksvg"; - extraBuildInputs = [qtdeclarative qtsvg]; + extraBuildInputs = [ + qtdeclarative + qtsvg + ]; } diff --git a/pkgs/kde/frameworks/ktexteditor/default.nix b/pkgs/kde/frameworks/ktexteditor/default.nix index 9a666c4e6a617..e7c470c99d096 100644 --- a/pkgs/kde/frameworks/ktexteditor/default.nix +++ b/pkgs/kde/frameworks/ktexteditor/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "ktexteditor"; - extraBuildInputs = [qtdeclarative qtspeech editorconfig-core-c]; + extraBuildInputs = [ + qtdeclarative + qtspeech + editorconfig-core-c + ]; } diff --git a/pkgs/kde/frameworks/ktexttemplate/default.nix b/pkgs/kde/frameworks/ktexttemplate/default.nix index 673a10863ac6a..6fc59c7376274 100644 --- a/pkgs/kde/frameworks/ktexttemplate/default.nix +++ b/pkgs/kde/frameworks/ktexttemplate/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ktexttemplate"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kunitconversion/default.nix b/pkgs/kde/frameworks/kunitconversion/default.nix index 1d7cb52566d4e..544aebb871f35 100644 --- a/pkgs/kde/frameworks/kunitconversion/default.nix +++ b/pkgs/kde/frameworks/kunitconversion/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kunitconversion"; } diff --git a/pkgs/kde/frameworks/kuserfeedback/default.nix b/pkgs/kde/frameworks/kuserfeedback/default.nix index 979362e6bfb81..7379061982b57 100644 --- a/pkgs/kde/frameworks/kuserfeedback/default.nix +++ b/pkgs/kde/frameworks/kuserfeedback/default.nix @@ -7,6 +7,12 @@ mkKdeDerivation { pname = "kuserfeedback"; # Disable server-side stuff we don't care about - extraCmakeFlags = ["-DENABLE_CONSOLE=0" "-DENABLE_CLI=0"]; - extraNativeBuildInputs = [qttools qtsvg]; + extraCmakeFlags = [ + "-DENABLE_CONSOLE=0" + "-DENABLE_CLI=0" + ]; + extraNativeBuildInputs = [ + qttools + qtsvg + ]; } diff --git a/pkgs/kde/frameworks/kwallet/default.nix b/pkgs/kde/frameworks/kwallet/default.nix index 3fffce1f30684..331bdee02b312 100644 --- a/pkgs/kde/frameworks/kwallet/default.nix +++ b/pkgs/kde/frameworks/kwallet/default.nix @@ -1,10 +1,15 @@ { mkKdeDerivation, libgcrypt, + kcrash, kdoctools, }: mkKdeDerivation { pname = "kwallet"; - extraBuildInputs = [libgcrypt kdoctools]; + extraBuildInputs = [ + libgcrypt + kcrash + kdoctools + ]; } diff --git a/pkgs/kde/frameworks/kwidgetsaddons/default.nix b/pkgs/kde/frameworks/kwidgetsaddons/default.nix index 09dfb3228d05c..00e9adca5b2f5 100644 --- a/pkgs/kde/frameworks/kwidgetsaddons/default.nix +++ b/pkgs/kde/frameworks/kwidgetsaddons/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kwidgetsaddons"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kwindowsystem/default.nix b/pkgs/kde/frameworks/kwindowsystem/default.nix index a5fb8eddb7eab..5ae167b1cc9ad 100644 --- a/pkgs/kde/frameworks/kwindowsystem/default.nix +++ b/pkgs/kde/frameworks/kwindowsystem/default.nix @@ -8,6 +8,12 @@ mkKdeDerivation { pname = "kwindowsystem"; - extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [qtdeclarative qtwayland]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; + extraBuildInputs = [ + qtdeclarative + qtwayland + ]; } diff --git a/pkgs/kde/frameworks/kxmlgui/default.nix b/pkgs/kde/frameworks/kxmlgui/default.nix index 64734cde5af65..3b93b5b35146e 100644 --- a/pkgs/kde/frameworks/kxmlgui/default.nix +++ b/pkgs/kde/frameworks/kxmlgui/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kxmlgui"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/modemmanager-qt/default.nix b/pkgs/kde/frameworks/modemmanager-qt/default.nix index 34a6f19548427..5acc420a8909e 100644 --- a/pkgs/kde/frameworks/modemmanager-qt/default.nix +++ b/pkgs/kde/frameworks/modemmanager-qt/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "modemmanager-qt"; - extraNativeBuildInputs = [pkg-config]; - extraPropagatedBuildInputs = [modemmanager]; + extraNativeBuildInputs = [ pkg-config ]; + extraPropagatedBuildInputs = [ modemmanager ]; } diff --git a/pkgs/kde/frameworks/networkmanager-qt/default.nix b/pkgs/kde/frameworks/networkmanager-qt/default.nix index bdec89a9ca1da..e276cb3a82baf 100644 --- a/pkgs/kde/frameworks/networkmanager-qt/default.nix +++ b/pkgs/kde/frameworks/networkmanager-qt/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "networkmanager-qt"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [networkmanager]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ networkmanager ]; } diff --git a/pkgs/kde/frameworks/prison/default.nix b/pkgs/kde/frameworks/prison/default.nix index 6411be8a34cf8..4cde20f930b06 100644 --- a/pkgs/kde/frameworks/prison/default.nix +++ b/pkgs/kde/frameworks/prison/default.nix @@ -8,5 +8,10 @@ mkKdeDerivation { pname = "prison"; - extraBuildInputs = [qtdeclarative qtmultimedia qrencode libdmtx]; + extraBuildInputs = [ + qtdeclarative + qtmultimedia + qrencode + libdmtx + ]; } diff --git a/pkgs/kde/frameworks/purpose/default.nix b/pkgs/kde/frameworks/purpose/default.nix index 8bf85ae19afe9..a515728a3af45 100644 --- a/pkgs/kde/frameworks/purpose/default.nix +++ b/pkgs/kde/frameworks/purpose/default.nix @@ -8,6 +8,10 @@ mkKdeDerivation { pname = "purpose"; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [kaccounts-integration kdeclarative prison]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ + kaccounts-integration + kdeclarative + prison + ]; } diff --git a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix index 5ceb41012d667..45f22d8fa5d3d 100644 --- a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix +++ b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "qqc2-desktop-style"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [qtdeclarative kirigami.unwrapped]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ + qtdeclarative + kirigami.unwrapped + ]; - excludeDependencies = ["kirigami"]; + excludeDependencies = [ "kirigami" ]; } diff --git a/pkgs/kde/frameworks/solid/default.nix b/pkgs/kde/frameworks/solid/default.nix index 2c628b8dbc3ed..6b767e9d43f73 100644 --- a/pkgs/kde/frameworks/solid/default.nix +++ b/pkgs/kde/frameworks/solid/default.nix @@ -13,7 +13,11 @@ mkKdeDerivation { ./fix-search-path.patch ]; - extraNativeBuildInputs = [qttools bison flex]; - extraBuildInputs = [libimobiledevice]; + extraNativeBuildInputs = [ + qttools + bison + flex + ]; + extraBuildInputs = [ libimobiledevice ]; meta.mainProgram = "solid-hardware6"; } diff --git a/pkgs/kde/frameworks/sonnet/default.nix b/pkgs/kde/frameworks/sonnet/default.nix index b5b82f6e675c5..fbeb8b10d555b 100644 --- a/pkgs/kde/frameworks/sonnet/default.nix +++ b/pkgs/kde/frameworks/sonnet/default.nix @@ -9,7 +9,14 @@ mkKdeDerivation { pname = "sonnet"; - extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [qtdeclarative aspell hunspell]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; + extraBuildInputs = [ + qtdeclarative + aspell + hunspell + ]; meta.mainProgram = "parsetrigrams6"; } diff --git a/pkgs/kde/frameworks/syndication/default.nix b/pkgs/kde/frameworks/syndication/default.nix index cec50a6777f79..444fec8614897 100644 --- a/pkgs/kde/frameworks/syndication/default.nix +++ b/pkgs/kde/frameworks/syndication/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "syndication"; } diff --git a/pkgs/kde/frameworks/syntax-highlighting/default.nix b/pkgs/kde/frameworks/syntax-highlighting/default.nix index 1a5430901f2e5..7985dcb957020 100644 --- a/pkgs/kde/frameworks/syntax-highlighting/default.nix +++ b/pkgs/kde/frameworks/syntax-highlighting/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "syntax-highlighting"; - extraBuildInputs = [qtdeclarative]; - extraNativeBuildInputs = [qttools perl]; + extraBuildInputs = [ qtdeclarative ]; + extraNativeBuildInputs = [ + qttools + perl + ]; meta.mainProgram = "ksyntaxhighlighter6"; } diff --git a/pkgs/kde/frameworks/threadweaver/default.nix b/pkgs/kde/frameworks/threadweaver/default.nix index 9da07c2af2acd..dddae60d96660 100644 --- a/pkgs/kde/frameworks/threadweaver/default.nix +++ b/pkgs/kde/frameworks/threadweaver/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "threadweaver"; } diff --git a/pkgs/kde/gear/accessibility-inspector/default.nix b/pkgs/kde/gear/accessibility-inspector/default.nix index 1197f29330085..cb623e7cebb30 100644 --- a/pkgs/kde/gear/accessibility-inspector/default.nix +++ b/pkgs/kde/gear/accessibility-inspector/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "accessibility-inspector"; } diff --git a/pkgs/kde/gear/akonadi-calendar-tools/default.nix b/pkgs/kde/gear/akonadi-calendar-tools/default.nix index bc863c0267095..0c0d88a425705 100644 --- a/pkgs/kde/gear/akonadi-calendar-tools/default.nix +++ b/pkgs/kde/gear/akonadi-calendar-tools/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-calendar-tools"; } diff --git a/pkgs/kde/gear/akonadi-calendar/default.nix b/pkgs/kde/gear/akonadi-calendar/default.nix index 66c615e53b189..10ef8e6ed05e2 100644 --- a/pkgs/kde/gear/akonadi-calendar/default.nix +++ b/pkgs/kde/gear/akonadi-calendar/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-calendar"; meta.mainProgram = "kalendarac"; diff --git a/pkgs/kde/gear/akonadi-contacts/default.nix b/pkgs/kde/gear/akonadi-contacts/default.nix index b8c1c5bf92cc1..b93d750c0ffd7 100644 --- a/pkgs/kde/gear/akonadi-contacts/default.nix +++ b/pkgs/kde/gear/akonadi-contacts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-contacts"; } diff --git a/pkgs/kde/gear/akonadi-import-wizard/default.nix b/pkgs/kde/gear/akonadi-import-wizard/default.nix index 9037457ee8b06..ff7e72d540414 100644 --- a/pkgs/kde/gear/akonadi-import-wizard/default.nix +++ b/pkgs/kde/gear/akonadi-import-wizard/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-import-wizard"; meta.mainProgram = "akonadiimportwizard"; diff --git a/pkgs/kde/gear/akonadi-mime/default.nix b/pkgs/kde/gear/akonadi-mime/default.nix index 9db5272e6b4b2..72cc1275afe6b 100644 --- a/pkgs/kde/gear/akonadi-mime/default.nix +++ b/pkgs/kde/gear/akonadi-mime/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "akonadi-mime"; - extraNativeBuildInputs = [shared-mime-info libxslt]; + extraNativeBuildInputs = [ + shared-mime-info + libxslt + ]; } diff --git a/pkgs/kde/gear/akonadi-notes/default.nix b/pkgs/kde/gear/akonadi-notes/default.nix index a1cd161a510fc..01f572f8fb90f 100644 --- a/pkgs/kde/gear/akonadi-notes/default.nix +++ b/pkgs/kde/gear/akonadi-notes/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-notes"; } diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index fcc4b9d2c8071..5b8add9abb8c0 100644 --- a/pkgs/kde/gear/akonadi-search/default.nix +++ b/pkgs/kde/gear/akonadi-search/default.nix @@ -7,7 +7,7 @@ cargo, rustc, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-XZ40qGBPRz7xyem3EP4+hzTliryxxDyGtvfjbNNVDQo=", + cargoHash ? "sha256-myS9icWi2ZeQCCHZRP3xEMKToAa+afc8C+s3T8y19RE=", }: mkKdeDerivation rec { pname = "akonadi-search"; @@ -29,5 +29,8 @@ mkKdeDerivation rec { rustc ]; - extraBuildInputs = [corrosion xapian]; + extraBuildInputs = [ + corrosion + xapian + ]; } diff --git a/pkgs/kde/gear/akonadi/default.nix b/pkgs/kde/gear/akonadi/default.nix index 64966c4fad583..bb6d2f609930b 100644 --- a/pkgs/kde/gear/akonadi/default.nix +++ b/pkgs/kde/gear/akonadi/default.nix @@ -20,8 +20,16 @@ mkKdeDerivation { "-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin" ]; - extraNativeBuildInputs = [qttools shared-mime-info]; - extraBuildInputs = [kaccounts-integration accounts-qt xz mariadb]; + extraNativeBuildInputs = [ + qttools + shared-mime-info + ]; + extraBuildInputs = [ + kaccounts-integration + accounts-qt + xz + mariadb + ]; # Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically postFixup = '' diff --git a/pkgs/kde/gear/akonadiconsole/default.nix b/pkgs/kde/gear/akonadiconsole/default.nix index ca116910011c9..dbed7d5564523 100644 --- a/pkgs/kde/gear/akonadiconsole/default.nix +++ b/pkgs/kde/gear/akonadiconsole/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "akonadiconsole"; - extraBuildInputs = [xapian]; + extraBuildInputs = [ xapian ]; meta.mainProgram = "akonadiconsole"; } diff --git a/pkgs/kde/gear/akregator/default.nix b/pkgs/kde/gear/akregator/default.nix index 4d52e4947b783..17517816b73e4 100644 --- a/pkgs/kde/gear/akregator/default.nix +++ b/pkgs/kde/gear/akregator/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "akregator"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/gear/alligator/default.nix b/pkgs/kde/gear/alligator/default.nix index c2f7a14734e2f..f317a97e86234 100644 --- a/pkgs/kde/gear/alligator/default.nix +++ b/pkgs/kde/gear/alligator/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "alligator"; meta.mainProgram = "alligator"; diff --git a/pkgs/kde/gear/analitza/default.nix b/pkgs/kde/gear/analitza/default.nix index 318c0b648279e..4402ab1d53005 100644 --- a/pkgs/kde/gear/analitza/default.nix +++ b/pkgs/kde/gear/analitza/default.nix @@ -9,6 +9,13 @@ mkKdeDerivation { pname = "analitza"; - extraNativeBuildInputs = [qt5compat qtsvg qttools]; - extraBuildInputs = [qtdeclarative eigen]; + extraNativeBuildInputs = [ + qt5compat + qtsvg + qttools + ]; + extraBuildInputs = [ + qtdeclarative + eigen + ]; } diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index 74a05ba11455b..f599178ad37b2 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -8,7 +8,7 @@ cargo, rustc, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-y7iJGN3ATK3IT8ko64puGlFXBM9OZw9u8JenrOBDuFA=", + cargoHash ? "sha256-xZkFVINKcJlJizHpBFLsMheQ45GsgWafzlDmxUydf5k=", qcoro, }: mkKdeDerivation rec { @@ -28,5 +28,10 @@ mkKdeDerivation rec { rustc ]; - extraBuildInputs = [qtsvg qtwebengine corrosion qcoro]; + extraBuildInputs = [ + qtsvg + qtwebengine + corrosion + qcoro + ]; } diff --git a/pkgs/kde/gear/ark/default.nix b/pkgs/kde/gear/ark/default.nix index fb9c3d8e596fe..6127e723dd40a 100644 --- a/pkgs/kde/gear/ark/default.nix +++ b/pkgs/kde/gear/ark/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "ark"; - extraBuildInputs = [libarchive libzip]; + extraBuildInputs = [ + libarchive + libzip + ]; meta.mainProgram = "ark"; } diff --git a/pkgs/kde/gear/artikulate/default.nix b/pkgs/kde/gear/artikulate/default.nix index c82db10260f76..60bd663852ee7 100644 --- a/pkgs/kde/gear/artikulate/default.nix +++ b/pkgs/kde/gear/artikulate/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "artikulate"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; # FIXME(qt5) meta.broken = true; } diff --git a/pkgs/kde/gear/audex/default.nix b/pkgs/kde/gear/audex/default.nix index c6043d6416089..9a7c8fb0eabf1 100644 --- a/pkgs/kde/gear/audex/default.nix +++ b/pkgs/kde/gear/audex/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "audex"; - extraBuildInputs = [libcdio libcdio-paranoia]; + extraBuildInputs = [ + libcdio + libcdio-paranoia + ]; } diff --git a/pkgs/kde/gear/audiocd-kio/default.nix b/pkgs/kde/gear/audiocd-kio/default.nix index c2f5c25588261..b4fa60026b182 100644 --- a/pkgs/kde/gear/audiocd-kio/default.nix +++ b/pkgs/kde/gear/audiocd-kio/default.nix @@ -20,5 +20,10 @@ mkKdeDerivation { }) ]; - extraBuildInputs = [cdparanoia flac libogg libvorbis]; + extraBuildInputs = [ + cdparanoia + flac + libogg + libvorbis + ]; } diff --git a/pkgs/kde/gear/audiotube/default.nix b/pkgs/kde/gear/audiotube/default.nix index c9ae14f3be9b9..b27ab60155a52 100644 --- a/pkgs/kde/gear/audiotube/default.nix +++ b/pkgs/kde/gear/audiotube/default.nix @@ -14,41 +14,40 @@ purpose, qcoro, python3, -}: let +}: +let ps = python3.pkgs; pythonDeps = [ ps.yt-dlp ps.ytmusicapi ]; in - mkKdeDerivation { - pname = "audiotube"; +mkKdeDerivation { + pname = "audiotube"; - extraNativeBuildInputs = [ - ps.pybind11 - ]; + extraNativeBuildInputs = [ + ps.pybind11 + ]; - extraBuildInputs = - [ - qtdeclarative - qtmultimedia - qtsvg + extraBuildInputs = [ + qtdeclarative + qtmultimedia + qtsvg - extra-cmake-modules - futuresql - kirigami - kirigami-addons - kcoreaddons - ki18n - kcrash - kwindowsystem - purpose - qcoro - ] - ++ pythonDeps; + extra-cmake-modules + futuresql + kirigami + kirigami-addons + kcoreaddons + ki18n + kcrash + kwindowsystem + purpose + qcoro + ] ++ pythonDeps; - qtWrapperArgs = [ - "--prefix PYTHONPATH : ${ps.makePythonPath pythonDeps}" - ]; - meta.mainProgram = "audiotube"; - } + qtWrapperArgs = [ + "--prefix PYTHONPATH : ${ps.makePythonPath pythonDeps}" + ]; + meta.mainProgram = "audiotube"; +} diff --git a/pkgs/kde/gear/baloo-widgets/default.nix b/pkgs/kde/gear/baloo-widgets/default.nix index 7e576348f0606..9835c248eec53 100644 --- a/pkgs/kde/gear/baloo-widgets/default.nix +++ b/pkgs/kde/gear/baloo-widgets/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "baloo-widgets"; meta.mainProgram = "baloo_filemetadata_temp_extractor"; diff --git a/pkgs/kde/gear/blinken/default.nix b/pkgs/kde/gear/blinken/default.nix index 8b6fbc68066a9..92cb126b089d4 100644 --- a/pkgs/kde/gear/blinken/default.nix +++ b/pkgs/kde/gear/blinken/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "blinken"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "blinken"; } diff --git a/pkgs/kde/gear/bomber/default.nix b/pkgs/kde/gear/bomber/default.nix index 611edb5d2c7aa..3e10833d322ab 100644 --- a/pkgs/kde/gear/bomber/default.nix +++ b/pkgs/kde/gear/bomber/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "bomber"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "bomber"; } diff --git a/pkgs/kde/gear/bovo/default.nix b/pkgs/kde/gear/bovo/default.nix index 5bafedfd1b141..c3fef1c907783 100644 --- a/pkgs/kde/gear/bovo/default.nix +++ b/pkgs/kde/gear/bovo/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "bovo"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "bovo"; } diff --git a/pkgs/kde/gear/calendarsupport/default.nix b/pkgs/kde/gear/calendarsupport/default.nix index b6632a384d65e..9b80b02aa79d9 100644 --- a/pkgs/kde/gear/calendarsupport/default.nix +++ b/pkgs/kde/gear/calendarsupport/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "calendarsupport"; } diff --git a/pkgs/kde/gear/calindori/default.nix b/pkgs/kde/gear/calindori/default.nix index 41efa7a9e48f3..565ffe6d58656 100644 --- a/pkgs/kde/gear/calindori/default.nix +++ b/pkgs/kde/gear/calindori/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "calindori"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/gear/cantor/default.nix b/pkgs/kde/gear/cantor/default.nix index 42963aabbba02..80d11e576a98b 100644 --- a/pkgs/kde/gear/cantor/default.nix +++ b/pkgs/kde/gear/cantor/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "cantor"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; # FIXME(qt5) meta.broken = true; } diff --git a/pkgs/kde/gear/cervisia/default.nix b/pkgs/kde/gear/cervisia/default.nix index d8546e9d8a30a..804cd7bed758b 100644 --- a/pkgs/kde/gear/cervisia/default.nix +++ b/pkgs/kde/gear/cervisia/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "cervisia"; # FIXME(qt5) diff --git a/pkgs/kde/gear/colord-kde/default.nix b/pkgs/kde/gear/colord-kde/default.nix index 9e2aa630d6883..e2ce75a98e77d 100644 --- a/pkgs/kde/gear/colord-kde/default.nix +++ b/pkgs/kde/gear/colord-kde/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "colord-kde"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [lcms2 xorg.libXrandr]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + lcms2 + xorg.libXrandr + ]; meta.mainProgram = "colord-kde-icc-importer"; } diff --git a/pkgs/kde/gear/default.nix b/pkgs/kde/gear/default.nix index 303e3dde5da5a..c296c82a8d9ed 100644 --- a/pkgs/kde/gear/default.nix +++ b/pkgs/kde/gear/default.nix @@ -1,252 +1,253 @@ -{callPackage}: { - accessibility-inspector = callPackage ./accessibility-inspector {}; - akonadi = callPackage ./akonadi {}; - akonadi-calendar = callPackage ./akonadi-calendar {}; - akonadi-calendar-tools = callPackage ./akonadi-calendar-tools {}; - akonadi-contacts = callPackage ./akonadi-contacts {}; - akonadi-import-wizard = callPackage ./akonadi-import-wizard {}; - akonadi-mime = callPackage ./akonadi-mime {}; - akonadi-notes = callPackage ./akonadi-notes {}; - akonadi-search = callPackage ./akonadi-search {}; - akonadiconsole = callPackage ./akonadiconsole {}; - akregator = callPackage ./akregator {}; - alligator = callPackage ./alligator {}; - analitza = callPackage ./analitza {}; - angelfish = callPackage ./angelfish {}; - arianna = callPackage ./arianna {}; - ark = callPackage ./ark {}; - artikulate = callPackage ./artikulate {}; - audex = callPackage ./audex {}; - audiocd-kio = callPackage ./audiocd-kio {}; - audiotube = callPackage ./audiotube {}; - baloo-widgets = callPackage ./baloo-widgets {}; - blinken = callPackage ./blinken {}; - bomber = callPackage ./bomber {}; - bovo = callPackage ./bovo {}; - calendarsupport = callPackage ./calendarsupport {}; - calindori = callPackage ./calindori {}; - cantor = callPackage ./cantor {}; - cervisia = callPackage ./cervisia {}; - colord-kde = callPackage ./colord-kde {}; - dolphin = callPackage ./dolphin {}; - dolphin-plugins = callPackage ./dolphin-plugins {}; - dragon = callPackage ./dragon {}; - elisa = callPackage ./elisa {}; - eventviews = callPackage ./eventviews {}; - falkon = callPackage ./falkon {}; - ffmpegthumbs = callPackage ./ffmpegthumbs {}; - filelight = callPackage ./filelight {}; - francis = callPackage ./francis {}; - ghostwriter = callPackage ./ghostwriter {}; - granatier = callPackage ./granatier {}; - grantlee-editor = callPackage ./grantlee-editor {}; - grantleetheme = callPackage ./grantleetheme {}; - gwenview = callPackage ./gwenview {}; - incidenceeditor = callPackage ./incidenceeditor {}; - isoimagewriter = callPackage ./isoimagewriter {}; - itinerary = callPackage ./itinerary {}; - juk = callPackage ./juk {}; - k3b = callPackage ./k3b {}; - kaccounts-integration = callPackage ./kaccounts-integration {}; - kaccounts-providers = callPackage ./kaccounts-providers {}; - kaddressbook = callPackage ./kaddressbook {}; - kajongg = callPackage ./kajongg {}; - kalarm = callPackage ./kalarm {}; - kalgebra = callPackage ./kalgebra {}; - kalk = callPackage ./kalk {}; - kalm = callPackage ./kalm {}; - kalzium = callPackage ./kalzium {}; - kamera = callPackage ./kamera {}; - kamoso = callPackage ./kamoso {}; - kanagram = callPackage ./kanagram {}; - kapman = callPackage ./kapman {}; - kapptemplate = callPackage ./kapptemplate {}; - kasts = callPackage ./kasts {}; - kate = callPackage ./kate {}; - katomic = callPackage ./katomic {}; - kbackup = callPackage ./kbackup {}; - kblackbox = callPackage ./kblackbox {}; - kblocks = callPackage ./kblocks {}; - kbounce = callPackage ./kbounce {}; - kbreakout = callPackage ./kbreakout {}; - kbruch = callPackage ./kbruch {}; - kcachegrind = callPackage ./kcachegrind {}; - kcalc = callPackage ./kcalc {}; - kcalutils = callPackage ./kcalutils {}; - kcharselect = callPackage ./kcharselect {}; - kclock = callPackage ./kclock {}; - kcolorchooser = callPackage ./kcolorchooser {}; - kcron = callPackage ./kcron {}; - kde-dev-scripts = callPackage ./kde-dev-scripts {}; - kde-dev-utils = callPackage ./kde-dev-utils {}; - kde-inotify-survey = callPackage ./kde-inotify-survey {}; - kdebugsettings = callPackage ./kdebugsettings {}; - kdeconnect-kde = callPackage ./kdeconnect-kde {}; - kdeedu-data = callPackage ./kdeedu-data {}; - kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket {}; - kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers {}; - kdenetwork-filesharing = callPackage ./kdenetwork-filesharing {}; - kdenlive = callPackage ./kdenlive {}; - kdepim-addons = callPackage ./kdepim-addons {}; - kdepim-runtime = callPackage ./kdepim-runtime {}; - kdesdk-kio = callPackage ./kdesdk-kio {}; - kdesdk-thumbnailers = callPackage ./kdesdk-thumbnailers {}; - kdev-php = callPackage ./kdev-php {}; - kdev-python = callPackage ./kdev-python {}; - kdevelop = callPackage ./kdevelop {}; - kdf = callPackage ./kdf {}; - kdialog = callPackage ./kdialog {}; - kdiamond = callPackage ./kdiamond {}; - keditbookmarks = callPackage ./keditbookmarks {}; - keysmith = callPackage ./keysmith {}; - kfind = callPackage ./kfind {}; - kfourinline = callPackage ./kfourinline {}; - kgeography = callPackage ./kgeography {}; - kget = callPackage ./kget {}; - kgoldrunner = callPackage ./kgoldrunner {}; - kgpg = callPackage ./kgpg {}; - kgraphviewer = callPackage ./kgraphviewer {}; - khangman = callPackage ./khangman {}; - khealthcertificate = callPackage ./khealthcertificate {}; - khelpcenter = callPackage ./khelpcenter {}; - kidentitymanagement = callPackage ./kidentitymanagement {}; - kig = callPackage ./kig {}; - kigo = callPackage ./kigo {}; - killbots = callPackage ./killbots {}; - kimagemapeditor = callPackage ./kimagemapeditor {}; - kimap = callPackage ./kimap {}; - kio-admin = callPackage ./kio-admin {}; - kio-extras = callPackage ./kio-extras {}; - kio-gdrive = callPackage ./kio-gdrive {}; - kio-zeroconf = callPackage ./kio-zeroconf {}; - kirigami-gallery = callPackage ./kirigami-gallery {}; - kiriki = callPackage ./kiriki {}; - kiten = callPackage ./kiten {}; - kitinerary = callPackage ./kitinerary {}; - kjournald = callPackage ./kjournald {}; - kjumpingcube = callPackage ./kjumpingcube {}; - kldap = callPackage ./kldap {}; - kleopatra = callPackage ./kleopatra {}; - klettres = callPackage ./klettres {}; - klickety = callPackage ./klickety {}; - klines = callPackage ./klines {}; - kmag = callPackage ./kmag {}; - kmahjongg = callPackage ./kmahjongg {}; - kmail = callPackage ./kmail {}; - kmail-account-wizard = callPackage ./kmail-account-wizard {}; - kmailtransport = callPackage ./kmailtransport {}; - kmbox = callPackage ./kmbox {}; - kmime = callPackage ./kmime {}; - kmines = callPackage ./kmines {}; - kmix = callPackage ./kmix {}; - kmousetool = callPackage ./kmousetool {}; - kmouth = callPackage ./kmouth {}; - kmplot = callPackage ./kmplot {}; - knavalbattle = callPackage ./knavalbattle {}; - knetwalk = callPackage ./knetwalk {}; - knights = callPackage ./knights {}; - koko = callPackage ./koko {}; - kolf = callPackage ./kolf {}; - kollision = callPackage ./kollision {}; - kolourpaint = callPackage ./kolourpaint {}; - kompare = callPackage ./kompare {}; - kongress = callPackage ./kongress {}; - konqueror = callPackage ./konqueror {}; - konquest = callPackage ./konquest {}; - konsole = callPackage ./konsole {}; - kontact = callPackage ./kontact {}; - kontactinterface = callPackage ./kontactinterface {}; - kontrast = callPackage ./kontrast {}; - konversation = callPackage ./konversation {}; - kopeninghours = callPackage ./kopeninghours {}; - korganizer = callPackage ./korganizer {}; - kosmindoormap = callPackage ./kosmindoormap {}; - kpat = callPackage ./kpat {}; - kpimtextedit = callPackage ./kpimtextedit {}; - kpkpass = callPackage ./kpkpass {}; - kpmcore = callPackage ./kpmcore {}; - kpublictransport = callPackage ./kpublictransport {}; - kqtquickcharts = callPackage ./kqtquickcharts {}; - krdc = callPackage ./krdc {}; - krecorder = callPackage ./krecorder {}; - kreversi = callPackage ./kreversi {}; - krfb = callPackage ./krfb {}; - kross-interpreters = callPackage ./kross-interpreters {}; - kruler = callPackage ./kruler {}; - ksanecore = callPackage ./ksanecore {}; - kshisen = callPackage ./kshisen {}; - ksirk = callPackage ./ksirk {}; - ksmtp = callPackage ./ksmtp {}; - ksnakeduel = callPackage ./ksnakeduel {}; - kspaceduel = callPackage ./kspaceduel {}; - ksquares = callPackage ./ksquares {}; - ksudoku = callPackage ./ksudoku {}; - ksystemlog = callPackage ./ksystemlog {}; - kteatime = callPackage ./kteatime {}; - ktimer = callPackage ./ktimer {}; - ktnef = callPackage ./ktnef {}; - ktorrent = callPackage ./ktorrent {}; - ktouch = callPackage ./ktouch {}; - ktrip = callPackage ./ktrip {}; - ktuberling = callPackage ./ktuberling {}; - kturtle = callPackage ./kturtle {}; - kubrick = callPackage ./kubrick {}; - kwalletmanager = callPackage ./kwalletmanager {}; - kwave = callPackage ./kwave {}; - kweather = callPackage ./kweather {}; - kweathercore = callPackage ./kweathercore {}; - kwordquiz = callPackage ./kwordquiz {}; - libgravatar = callPackage ./libgravatar {}; - libkcddb = callPackage ./libkcddb {}; - libkcompactdisc = callPackage ./libkcompactdisc {}; - libkdcraw = callPackage ./libkdcraw {}; - libkdegames = callPackage ./libkdegames {}; - libkdepim = callPackage ./libkdepim {}; - libkeduvocdocument = callPackage ./libkeduvocdocument {}; - libkexiv2 = callPackage ./libkexiv2 {}; - libkgapi = callPackage ./libkgapi {}; - libkleo = callPackage ./libkleo {}; - libkmahjongg = callPackage ./libkmahjongg {}; - libkomparediff2 = callPackage ./libkomparediff2 {}; - libksane = callPackage ./libksane {}; - libksieve = callPackage ./libksieve {}; - libktorrent = callPackage ./libktorrent {}; - lokalize = callPackage ./lokalize {}; - lskat = callPackage ./lskat {}; - mailcommon = callPackage ./mailcommon {}; - mailimporter = callPackage ./mailimporter {}; - marble = callPackage ./marble {}; - markdownpart = callPackage ./markdownpart {}; - massif-visualizer = callPackage ./massif-visualizer {}; - mbox-importer = callPackage ./mbox-importer {}; - merkuro = callPackage ./merkuro {}; - messagelib = callPackage ./messagelib {}; - mimetreeparser = callPackage ./mimetreeparser {}; - minuet = callPackage ./minuet {}; - neochat = callPackage ./neochat {}; - okular = callPackage ./okular {}; - palapeli = callPackage ./palapeli {}; - parley = callPackage ./parley {}; - partitionmanager = callPackage ./partitionmanager {}; - picmi = callPackage ./picmi {}; - pim-data-exporter = callPackage ./pim-data-exporter {}; - pim-sieve-editor = callPackage ./pim-sieve-editor {}; - pimcommon = callPackage ./pimcommon {}; - plasmatube = callPackage ./plasmatube {}; - poxml = callPackage ./poxml {}; - qmlkonsole = callPackage ./qmlkonsole {}; - rocs = callPackage ./rocs {}; - signon-kwallet-extension = callPackage ./signon-kwallet-extension {}; - skanlite = callPackage ./skanlite {}; - skanpage = callPackage ./skanpage {}; - skladnik = callPackage ./skladnik {}; - spectacle = callPackage ./spectacle {}; - step = callPackage ./step {}; - svgpart = callPackage ./svgpart {}; - sweeper = callPackage ./sweeper {}; - telly-skout = callPackage ./telly-skout {}; - tokodon = callPackage ./tokodon {}; - umbrello = callPackage ./umbrello {}; - yakuake = callPackage ./yakuake {}; - zanshin = callPackage ./zanshin {}; +{ callPackage }: +{ + accessibility-inspector = callPackage ./accessibility-inspector { }; + akonadi = callPackage ./akonadi { }; + akonadi-calendar = callPackage ./akonadi-calendar { }; + akonadi-calendar-tools = callPackage ./akonadi-calendar-tools { }; + akonadi-contacts = callPackage ./akonadi-contacts { }; + akonadi-import-wizard = callPackage ./akonadi-import-wizard { }; + akonadi-mime = callPackage ./akonadi-mime { }; + akonadi-notes = callPackage ./akonadi-notes { }; + akonadi-search = callPackage ./akonadi-search { }; + akonadiconsole = callPackage ./akonadiconsole { }; + akregator = callPackage ./akregator { }; + alligator = callPackage ./alligator { }; + analitza = callPackage ./analitza { }; + angelfish = callPackage ./angelfish { }; + arianna = callPackage ./arianna { }; + ark = callPackage ./ark { }; + artikulate = callPackage ./artikulate { }; + audex = callPackage ./audex { }; + audiocd-kio = callPackage ./audiocd-kio { }; + audiotube = callPackage ./audiotube { }; + baloo-widgets = callPackage ./baloo-widgets { }; + blinken = callPackage ./blinken { }; + bomber = callPackage ./bomber { }; + bovo = callPackage ./bovo { }; + calendarsupport = callPackage ./calendarsupport { }; + calindori = callPackage ./calindori { }; + cantor = callPackage ./cantor { }; + cervisia = callPackage ./cervisia { }; + colord-kde = callPackage ./colord-kde { }; + dolphin = callPackage ./dolphin { }; + dolphin-plugins = callPackage ./dolphin-plugins { }; + dragon = callPackage ./dragon { }; + elisa = callPackage ./elisa { }; + eventviews = callPackage ./eventviews { }; + falkon = callPackage ./falkon { }; + ffmpegthumbs = callPackage ./ffmpegthumbs { }; + filelight = callPackage ./filelight { }; + francis = callPackage ./francis { }; + ghostwriter = callPackage ./ghostwriter { }; + granatier = callPackage ./granatier { }; + grantlee-editor = callPackage ./grantlee-editor { }; + grantleetheme = callPackage ./grantleetheme { }; + gwenview = callPackage ./gwenview { }; + incidenceeditor = callPackage ./incidenceeditor { }; + isoimagewriter = callPackage ./isoimagewriter { }; + itinerary = callPackage ./itinerary { }; + juk = callPackage ./juk { }; + k3b = callPackage ./k3b { }; + kaccounts-integration = callPackage ./kaccounts-integration { }; + kaccounts-providers = callPackage ./kaccounts-providers { }; + kaddressbook = callPackage ./kaddressbook { }; + kajongg = callPackage ./kajongg { }; + kalarm = callPackage ./kalarm { }; + kalgebra = callPackage ./kalgebra { }; + kalk = callPackage ./kalk { }; + kalm = callPackage ./kalm { }; + kalzium = callPackage ./kalzium { }; + kamera = callPackage ./kamera { }; + kamoso = callPackage ./kamoso { }; + kanagram = callPackage ./kanagram { }; + kapman = callPackage ./kapman { }; + kapptemplate = callPackage ./kapptemplate { }; + kasts = callPackage ./kasts { }; + kate = callPackage ./kate { }; + katomic = callPackage ./katomic { }; + kbackup = callPackage ./kbackup { }; + kblackbox = callPackage ./kblackbox { }; + kblocks = callPackage ./kblocks { }; + kbounce = callPackage ./kbounce { }; + kbreakout = callPackage ./kbreakout { }; + kbruch = callPackage ./kbruch { }; + kcachegrind = callPackage ./kcachegrind { }; + kcalc = callPackage ./kcalc { }; + kcalutils = callPackage ./kcalutils { }; + kcharselect = callPackage ./kcharselect { }; + kclock = callPackage ./kclock { }; + kcolorchooser = callPackage ./kcolorchooser { }; + kcron = callPackage ./kcron { }; + kde-dev-scripts = callPackage ./kde-dev-scripts { }; + kde-dev-utils = callPackage ./kde-dev-utils { }; + kde-inotify-survey = callPackage ./kde-inotify-survey { }; + kdebugsettings = callPackage ./kdebugsettings { }; + kdeconnect-kde = callPackage ./kdeconnect-kde { }; + kdeedu-data = callPackage ./kdeedu-data { }; + kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket { }; + kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers { }; + kdenetwork-filesharing = callPackage ./kdenetwork-filesharing { }; + kdenlive = callPackage ./kdenlive { }; + kdepim-addons = callPackage ./kdepim-addons { }; + kdepim-runtime = callPackage ./kdepim-runtime { }; + kdesdk-kio = callPackage ./kdesdk-kio { }; + kdesdk-thumbnailers = callPackage ./kdesdk-thumbnailers { }; + kdev-php = callPackage ./kdev-php { }; + kdev-python = callPackage ./kdev-python { }; + kdevelop = callPackage ./kdevelop { }; + kdf = callPackage ./kdf { }; + kdialog = callPackage ./kdialog { }; + kdiamond = callPackage ./kdiamond { }; + keditbookmarks = callPackage ./keditbookmarks { }; + keysmith = callPackage ./keysmith { }; + kfind = callPackage ./kfind { }; + kfourinline = callPackage ./kfourinline { }; + kgeography = callPackage ./kgeography { }; + kget = callPackage ./kget { }; + kgoldrunner = callPackage ./kgoldrunner { }; + kgpg = callPackage ./kgpg { }; + kgraphviewer = callPackage ./kgraphviewer { }; + khangman = callPackage ./khangman { }; + khealthcertificate = callPackage ./khealthcertificate { }; + khelpcenter = callPackage ./khelpcenter { }; + kidentitymanagement = callPackage ./kidentitymanagement { }; + kig = callPackage ./kig { }; + kigo = callPackage ./kigo { }; + killbots = callPackage ./killbots { }; + kimagemapeditor = callPackage ./kimagemapeditor { }; + kimap = callPackage ./kimap { }; + kio-admin = callPackage ./kio-admin { }; + kio-extras = callPackage ./kio-extras { }; + kio-gdrive = callPackage ./kio-gdrive { }; + kio-zeroconf = callPackage ./kio-zeroconf { }; + kirigami-gallery = callPackage ./kirigami-gallery { }; + kiriki = callPackage ./kiriki { }; + kiten = callPackage ./kiten { }; + kitinerary = callPackage ./kitinerary { }; + kjournald = callPackage ./kjournald { }; + kjumpingcube = callPackage ./kjumpingcube { }; + kldap = callPackage ./kldap { }; + kleopatra = callPackage ./kleopatra { }; + klettres = callPackage ./klettres { }; + klickety = callPackage ./klickety { }; + klines = callPackage ./klines { }; + kmag = callPackage ./kmag { }; + kmahjongg = callPackage ./kmahjongg { }; + kmail = callPackage ./kmail { }; + kmail-account-wizard = callPackage ./kmail-account-wizard { }; + kmailtransport = callPackage ./kmailtransport { }; + kmbox = callPackage ./kmbox { }; + kmime = callPackage ./kmime { }; + kmines = callPackage ./kmines { }; + kmix = callPackage ./kmix { }; + kmousetool = callPackage ./kmousetool { }; + kmouth = callPackage ./kmouth { }; + kmplot = callPackage ./kmplot { }; + knavalbattle = callPackage ./knavalbattle { }; + knetwalk = callPackage ./knetwalk { }; + knights = callPackage ./knights { }; + koko = callPackage ./koko { }; + kolf = callPackage ./kolf { }; + kollision = callPackage ./kollision { }; + kolourpaint = callPackage ./kolourpaint { }; + kompare = callPackage ./kompare { }; + kongress = callPackage ./kongress { }; + konqueror = callPackage ./konqueror { }; + konquest = callPackage ./konquest { }; + konsole = callPackage ./konsole { }; + kontact = callPackage ./kontact { }; + kontactinterface = callPackage ./kontactinterface { }; + kontrast = callPackage ./kontrast { }; + konversation = callPackage ./konversation { }; + kopeninghours = callPackage ./kopeninghours { }; + korganizer = callPackage ./korganizer { }; + kosmindoormap = callPackage ./kosmindoormap { }; + kpat = callPackage ./kpat { }; + kpimtextedit = callPackage ./kpimtextedit { }; + kpkpass = callPackage ./kpkpass { }; + kpmcore = callPackage ./kpmcore { }; + kpublictransport = callPackage ./kpublictransport { }; + kqtquickcharts = callPackage ./kqtquickcharts { }; + krdc = callPackage ./krdc { }; + krecorder = callPackage ./krecorder { }; + kreversi = callPackage ./kreversi { }; + krfb = callPackage ./krfb { }; + kross-interpreters = callPackage ./kross-interpreters { }; + kruler = callPackage ./kruler { }; + ksanecore = callPackage ./ksanecore { }; + kshisen = callPackage ./kshisen { }; + ksirk = callPackage ./ksirk { }; + ksmtp = callPackage ./ksmtp { }; + ksnakeduel = callPackage ./ksnakeduel { }; + kspaceduel = callPackage ./kspaceduel { }; + ksquares = callPackage ./ksquares { }; + ksudoku = callPackage ./ksudoku { }; + ksystemlog = callPackage ./ksystemlog { }; + kteatime = callPackage ./kteatime { }; + ktimer = callPackage ./ktimer { }; + ktnef = callPackage ./ktnef { }; + ktorrent = callPackage ./ktorrent { }; + ktouch = callPackage ./ktouch { }; + ktrip = callPackage ./ktrip { }; + ktuberling = callPackage ./ktuberling { }; + kturtle = callPackage ./kturtle { }; + kubrick = callPackage ./kubrick { }; + kwalletmanager = callPackage ./kwalletmanager { }; + kwave = callPackage ./kwave { }; + kweather = callPackage ./kweather { }; + kweathercore = callPackage ./kweathercore { }; + kwordquiz = callPackage ./kwordquiz { }; + libgravatar = callPackage ./libgravatar { }; + libkcddb = callPackage ./libkcddb { }; + libkcompactdisc = callPackage ./libkcompactdisc { }; + libkdcraw = callPackage ./libkdcraw { }; + libkdegames = callPackage ./libkdegames { }; + libkdepim = callPackage ./libkdepim { }; + libkeduvocdocument = callPackage ./libkeduvocdocument { }; + libkexiv2 = callPackage ./libkexiv2 { }; + libkgapi = callPackage ./libkgapi { }; + libkleo = callPackage ./libkleo { }; + libkmahjongg = callPackage ./libkmahjongg { }; + libkomparediff2 = callPackage ./libkomparediff2 { }; + libksane = callPackage ./libksane { }; + libksieve = callPackage ./libksieve { }; + libktorrent = callPackage ./libktorrent { }; + lokalize = callPackage ./lokalize { }; + lskat = callPackage ./lskat { }; + mailcommon = callPackage ./mailcommon { }; + mailimporter = callPackage ./mailimporter { }; + marble = callPackage ./marble { }; + markdownpart = callPackage ./markdownpart { }; + massif-visualizer = callPackage ./massif-visualizer { }; + mbox-importer = callPackage ./mbox-importer { }; + merkuro = callPackage ./merkuro { }; + messagelib = callPackage ./messagelib { }; + mimetreeparser = callPackage ./mimetreeparser { }; + minuet = callPackage ./minuet { }; + neochat = callPackage ./neochat { }; + okular = callPackage ./okular { }; + palapeli = callPackage ./palapeli { }; + parley = callPackage ./parley { }; + partitionmanager = callPackage ./partitionmanager { }; + picmi = callPackage ./picmi { }; + pim-data-exporter = callPackage ./pim-data-exporter { }; + pim-sieve-editor = callPackage ./pim-sieve-editor { }; + pimcommon = callPackage ./pimcommon { }; + plasmatube = callPackage ./plasmatube { }; + poxml = callPackage ./poxml { }; + qmlkonsole = callPackage ./qmlkonsole { }; + rocs = callPackage ./rocs { }; + signon-kwallet-extension = callPackage ./signon-kwallet-extension { }; + skanlite = callPackage ./skanlite { }; + skanpage = callPackage ./skanpage { }; + skladnik = callPackage ./skladnik { }; + spectacle = callPackage ./spectacle { }; + step = callPackage ./step { }; + svgpart = callPackage ./svgpart { }; + sweeper = callPackage ./sweeper { }; + telly-skout = callPackage ./telly-skout { }; + tokodon = callPackage ./tokodon { }; + umbrello = callPackage ./umbrello { }; + yakuake = callPackage ./yakuake { }; + zanshin = callPackage ./zanshin { }; } diff --git a/pkgs/kde/gear/dolphin-plugins/default.nix b/pkgs/kde/gear/dolphin-plugins/default.nix index cc88d732389f2..652158c2e07bb 100644 --- a/pkgs/kde/gear/dolphin-plugins/default.nix +++ b/pkgs/kde/gear/dolphin-plugins/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "dolphin-plugins"; } diff --git a/pkgs/kde/gear/dolphin/default.nix b/pkgs/kde/gear/dolphin/default.nix index eb70e9c9d0860..df4c4c3bdaf37 100644 --- a/pkgs/kde/gear/dolphin/default.nix +++ b/pkgs/kde/gear/dolphin/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "dolphin"; } diff --git a/pkgs/kde/gear/dragon/default.nix b/pkgs/kde/gear/dragon/default.nix index 3b49b3372ce6a..a825f60421b96 100644 --- a/pkgs/kde/gear/dragon/default.nix +++ b/pkgs/kde/gear/dragon/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "dragon"; meta.mainProgram = "dragon"; diff --git a/pkgs/kde/gear/elisa/default.nix b/pkgs/kde/gear/elisa/default.nix index 459fb247390b1..ee280ae931985 100644 --- a/pkgs/kde/gear/elisa/default.nix +++ b/pkgs/kde/gear/elisa/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "elisa"; - extraBuildInputs = [qtmultimedia libvlc]; + extraBuildInputs = [ + qtmultimedia + libvlc + ]; meta.mainProgram = "elisa"; } diff --git a/pkgs/kde/gear/eventviews/default.nix b/pkgs/kde/gear/eventviews/default.nix index d9d0eeb7d798d..dfdca9c5ce10e 100644 --- a/pkgs/kde/gear/eventviews/default.nix +++ b/pkgs/kde/gear/eventviews/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "eventviews"; } diff --git a/pkgs/kde/gear/falkon/default.nix b/pkgs/kde/gear/falkon/default.nix index bc8125b99ec8f..daa26d9ce5e72 100644 --- a/pkgs/kde/gear/falkon/default.nix +++ b/pkgs/kde/gear/falkon/default.nix @@ -9,7 +9,16 @@ mkKdeDerivation { pname = "falkon"; - extraNativeBuildInputs = [qttools qtwebchannel qtwebengine]; - extraBuildInputs = [extra-cmake-modules qtwebchannel qtwebengine python3Packages.pyside6]; + extraNativeBuildInputs = [ + qttools + qtwebchannel + qtwebengine + ]; + extraBuildInputs = [ + extra-cmake-modules + qtwebchannel + qtwebengine + python3Packages.pyside6 + ]; meta.mainProgram = "falkon"; } diff --git a/pkgs/kde/gear/ffmpegthumbs/default.nix b/pkgs/kde/gear/ffmpegthumbs/default.nix index 62bd0e10378c0..71740192c4218 100644 --- a/pkgs/kde/gear/ffmpegthumbs/default.nix +++ b/pkgs/kde/gear/ffmpegthumbs/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ffmpegthumbs"; - extraBuildInputs = [ffmpeg]; + extraBuildInputs = [ ffmpeg ]; } diff --git a/pkgs/kde/gear/francis/default.nix b/pkgs/kde/gear/francis/default.nix index 8e2494b65fe18..231eadcd85b40 100644 --- a/pkgs/kde/gear/francis/default.nix +++ b/pkgs/kde/gear/francis/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "francis"; - extraBuildInputs = [qtsvg knotifications]; + extraBuildInputs = [ + qtsvg + knotifications + ]; } diff --git a/pkgs/kde/gear/granatier/default.nix b/pkgs/kde/gear/granatier/default.nix index 1c8593258ca3a..6f1f673c6f051 100644 --- a/pkgs/kde/gear/granatier/default.nix +++ b/pkgs/kde/gear/granatier/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "granatier"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "granatier"; } diff --git a/pkgs/kde/gear/grantlee-editor/default.nix b/pkgs/kde/gear/grantlee-editor/default.nix index a80ea7d8b939e..4c82ad082c708 100644 --- a/pkgs/kde/gear/grantlee-editor/default.nix +++ b/pkgs/kde/gear/grantlee-editor/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "grantlee-editor"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/gear/grantleetheme/default.nix b/pkgs/kde/gear/grantleetheme/default.nix index 5e21e92a54e54..5457d75b0f0c8 100644 --- a/pkgs/kde/gear/grantleetheme/default.nix +++ b/pkgs/kde/gear/grantleetheme/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "grantleetheme"; } diff --git a/pkgs/kde/gear/gwenview/default.nix b/pkgs/kde/gear/gwenview/default.nix index 4bbb5f98eb1e8..71780b6bf9a79 100644 --- a/pkgs/kde/gear/gwenview/default.nix +++ b/pkgs/kde/gear/gwenview/default.nix @@ -14,7 +14,7 @@ mkKdeDerivation { pname = "gwenview"; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsvg qtwayland diff --git a/pkgs/kde/gear/incidenceeditor/default.nix b/pkgs/kde/gear/incidenceeditor/default.nix index cf8c1e7857c4e..b5603c82ca0cd 100644 --- a/pkgs/kde/gear/incidenceeditor/default.nix +++ b/pkgs/kde/gear/incidenceeditor/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "incidenceeditor"; } diff --git a/pkgs/kde/gear/isoimagewriter/default.nix b/pkgs/kde/gear/isoimagewriter/default.nix index e9b41bcb84e95..e9dc082f32934 100644 --- a/pkgs/kde/gear/isoimagewriter/default.nix +++ b/pkgs/kde/gear/isoimagewriter/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "isoimagewriter"; - extraBuildInputs = [qgpgme]; + extraBuildInputs = [ qgpgme ]; meta.mainProgram = "isoimagewriter"; } diff --git a/pkgs/kde/gear/itinerary/default.nix b/pkgs/kde/gear/itinerary/default.nix index ca1872662f32b..0b2292a2ada3d 100644 --- a/pkgs/kde/gear/itinerary/default.nix +++ b/pkgs/kde/gear/itinerary/default.nix @@ -10,9 +10,16 @@ mkKdeDerivation { pname = "itinerary"; # FIXME: this should really be fixed at ECM level somehow - patches = [./optional-runtime-dependencies.patch]; + patches = [ ./optional-runtime-dependencies.patch ]; - extraNativeBuildInputs = [pkg-config shared-mime-info]; - extraBuildInputs = [qtlocation qtpositioning libical]; + extraNativeBuildInputs = [ + pkg-config + shared-mime-info + ]; + extraBuildInputs = [ + qtlocation + qtpositioning + libical + ]; meta.mainProgram = "itinerary"; } diff --git a/pkgs/kde/gear/juk/default.nix b/pkgs/kde/gear/juk/default.nix index 53eff6a9cc183..c0bc805639a4c 100644 --- a/pkgs/kde/gear/juk/default.nix +++ b/pkgs/kde/gear/juk/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "juk"; - extraBuildInputs = [qtsvg taglib]; + extraBuildInputs = [ + qtsvg + taglib + ]; meta.mainProgram = "juk"; } diff --git a/pkgs/kde/gear/k3b/default.nix b/pkgs/kde/gear/k3b/default.nix index ba4a1fc6aab4c..a11f03a6333f0 100644 --- a/pkgs/kde/gear/k3b/default.nix +++ b/pkgs/kde/gear/k3b/default.nix @@ -25,7 +25,10 @@ mkKdeDerivation { pname = "k3b"; - extraNativeBuildInputs = [pkg-config shared-mime-info]; + extraNativeBuildInputs = [ + pkg-config + shared-mime-info + ]; # FIXME: Musicbrainz 2.x???, musepack extraBuildInputs = [ @@ -40,20 +43,27 @@ mkKdeDerivation { ]; qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ - cdrdao - cdrtools - dvdplusrwtools - libburn - normalize - sox - transcode - vcdimager - flac - ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + cdrdao + cdrtools + dvdplusrwtools + libburn + normalize + sox + transcode + vcdimager + flac + ] + }" # FIXME: this should really be done with patchelf --add-rpath, but it breaks the binary somehow - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ cdparanoia libdvdcss ]}" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + cdparanoia + libdvdcss + ] + }" ]; meta.mainProgram = "k3b"; diff --git a/pkgs/kde/gear/kaccounts-integration/default.nix b/pkgs/kde/gear/kaccounts-integration/default.nix index 1b927d3e01efa..06a4436ba1332 100644 --- a/pkgs/kde/gear/kaccounts-integration/default.nix +++ b/pkgs/kde/gear/kaccounts-integration/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kaccounts-integration"; - propagatedNativeBuildInputs = [intltool]; + propagatedNativeBuildInputs = [ intltool ]; } diff --git a/pkgs/kde/gear/kaccounts-providers/default.nix b/pkgs/kde/gear/kaccounts-providers/default.nix index 6cd2fd7e33046..bf0ecf6783026 100644 --- a/pkgs/kde/gear/kaccounts-providers/default.nix +++ b/pkgs/kde/gear/kaccounts-providers/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kaccounts-providers"; - extraNativeBuildInputs = [intltool]; - extraBuildInputs = [qtdeclarative qtwebengine]; + extraNativeBuildInputs = [ intltool ]; + extraBuildInputs = [ + qtdeclarative + qtwebengine + ]; } diff --git a/pkgs/kde/gear/kaddressbook/default.nix b/pkgs/kde/gear/kaddressbook/default.nix index a5ef9c659f4ec..56039912bb516 100644 --- a/pkgs/kde/gear/kaddressbook/default.nix +++ b/pkgs/kde/gear/kaddressbook/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kaddressbook"; meta.mainProgram = "kaddressbook"; diff --git a/pkgs/kde/gear/kajongg/default.nix b/pkgs/kde/gear/kajongg/default.nix index 651ac3b3115a6..555c384b60814 100644 --- a/pkgs/kde/gear/kajongg/default.nix +++ b/pkgs/kde/gear/kajongg/default.nix @@ -6,7 +6,11 @@ mkKdeDerivation { pname = "kajongg"; - extraBuildInputs = [qtsvg python3 python3.pkgs.twisted]; + extraBuildInputs = [ + qtsvg + python3 + python3.pkgs.twisted + ]; # FIXME: completely horked, is actually a Python app, needs a lot of fixing meta.broken = true; } diff --git a/pkgs/kde/gear/kalarm/default.nix b/pkgs/kde/gear/kalarm/default.nix index f795cd3bf68eb..0a1dc3524417b 100644 --- a/pkgs/kde/gear/kalarm/default.nix +++ b/pkgs/kde/gear/kalarm/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kalarm"; - extraBuildInputs = [libcanberra libvlc]; + extraBuildInputs = [ + libcanberra + libvlc + ]; } diff --git a/pkgs/kde/gear/kalgebra/default.nix b/pkgs/kde/gear/kalgebra/default.nix index 89aaafc04c96b..1b3cd47fc93e5 100644 --- a/pkgs/kde/gear/kalgebra/default.nix +++ b/pkgs/kde/gear/kalgebra/default.nix @@ -8,5 +8,10 @@ mkKdeDerivation { pname = "kalgebra"; - extraBuildInputs = [qtsvg qtwebengine ncurses readline]; + extraBuildInputs = [ + qtsvg + qtwebengine + ncurses + readline + ]; } diff --git a/pkgs/kde/gear/kalk/default.nix b/pkgs/kde/gear/kalk/default.nix index 511b0bdf0654e..6f339fe609dd7 100644 --- a/pkgs/kde/gear/kalk/default.nix +++ b/pkgs/kde/gear/kalk/default.nix @@ -12,7 +12,11 @@ mkKdeDerivation { pname = "kalk"; - extraNativeBuildInputs = [pkg-config bison flex]; + extraNativeBuildInputs = [ + pkg-config + bison + flex + ]; extraBuildInputs = [ qtdeclarative kirigami-addons diff --git a/pkgs/kde/gear/kalm/default.nix b/pkgs/kde/gear/kalm/default.nix index 0c4eee90bc31e..295084a63db7e 100644 --- a/pkgs/kde/gear/kalm/default.nix +++ b/pkgs/kde/gear/kalm/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kalm"; } diff --git a/pkgs/kde/gear/kalzium/default.nix b/pkgs/kde/gear/kalzium/default.nix index 1c45498294d06..7cdcd1efec638 100644 --- a/pkgs/kde/gear/kalzium/default.nix +++ b/pkgs/kde/gear/kalzium/default.nix @@ -11,7 +11,15 @@ mkKdeDerivation { pname = "kalzium"; # FIXME: look into how to make it find libfacile - extraNativeBuildInputs = [pkg-config ocaml]; - extraBuildInputs = [eigen openbabel qtsvg qtscxml]; + extraNativeBuildInputs = [ + pkg-config + ocaml + ]; + extraBuildInputs = [ + eigen + openbabel + qtsvg + qtscxml + ]; meta.mainProgram = "kalzium"; } diff --git a/pkgs/kde/gear/kamera/default.nix b/pkgs/kde/gear/kamera/default.nix index 3ab21c99f4edd..d6f9be0bc99a0 100644 --- a/pkgs/kde/gear/kamera/default.nix +++ b/pkgs/kde/gear/kamera/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kamera"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libgphoto2]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ libgphoto2 ]; } diff --git a/pkgs/kde/gear/kamoso/default.nix b/pkgs/kde/gear/kamoso/default.nix index b83e193f31178..fa86b87f2f8df 100644 --- a/pkgs/kde/gear/kamoso/default.nix +++ b/pkgs/kde/gear/kamoso/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kamoso"; # FIXME(qt5) diff --git a/pkgs/kde/gear/kanagram/default.nix b/pkgs/kde/gear/kanagram/default.nix index e7d3d7b443ed4..aec99c0f32c28 100644 --- a/pkgs/kde/gear/kanagram/default.nix +++ b/pkgs/kde/gear/kanagram/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kanagram"; - extraBuildInputs = [qtspeech]; + extraBuildInputs = [ qtspeech ]; meta.mainProgram = "kanagram"; } diff --git a/pkgs/kde/gear/kapman/default.nix b/pkgs/kde/gear/kapman/default.nix index 61cfb1fdf3faa..abae489b60f60 100644 --- a/pkgs/kde/gear/kapman/default.nix +++ b/pkgs/kde/gear/kapman/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kapman"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kapman"; } diff --git a/pkgs/kde/gear/kapptemplate/default.nix b/pkgs/kde/gear/kapptemplate/default.nix index 9b4f350b1b658..49b8dab441b07 100644 --- a/pkgs/kde/gear/kapptemplate/default.nix +++ b/pkgs/kde/gear/kapptemplate/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kapptemplate"; meta.mainProgram = "kapptemplate"; diff --git a/pkgs/kde/gear/kasts/default.nix b/pkgs/kde/gear/kasts/default.nix index 2375bb00af21f..f95ea1c80892f 100644 --- a/pkgs/kde/gear/kasts/default.nix +++ b/pkgs/kde/gear/kasts/default.nix @@ -9,7 +9,7 @@ mkKdeDerivation { pname = "kasts"; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsvg qtmultimedia diff --git a/pkgs/kde/gear/kate/default.nix b/pkgs/kde/gear/kate/default.nix index 044b7b35e8b5b..622787ac38770 100644 --- a/pkgs/kde/gear/kate/default.nix +++ b/pkgs/kde/gear/kate/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kate"; } diff --git a/pkgs/kde/gear/katomic/default.nix b/pkgs/kde/gear/katomic/default.nix index e9dcd6ebe040c..61d3d6e653eaa 100644 --- a/pkgs/kde/gear/katomic/default.nix +++ b/pkgs/kde/gear/katomic/default.nix @@ -1,11 +1,11 @@ { mkKdeDerivation, - _7zz + _7zz, }: mkKdeDerivation { pname = "katomic"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "katomic"; } diff --git a/pkgs/kde/gear/kbackup/default.nix b/pkgs/kde/gear/kbackup/default.nix index 49e43996b9321..4ccab6e8ca3e3 100644 --- a/pkgs/kde/gear/kbackup/default.nix +++ b/pkgs/kde/gear/kbackup/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "kbackup"; - extraNativeBuildInputs = [shared-mime-info]; - extraBuildInputs = [qt5compat libarchive]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ + qt5compat + libarchive + ]; meta.mainProgram = "kbackup"; } diff --git a/pkgs/kde/gear/kblackbox/default.nix b/pkgs/kde/gear/kblackbox/default.nix index 26156c9195a92..5d1147074e4a3 100644 --- a/pkgs/kde/gear/kblackbox/default.nix +++ b/pkgs/kde/gear/kblackbox/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kblackbox"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kblackbox"; } diff --git a/pkgs/kde/gear/kblocks/default.nix b/pkgs/kde/gear/kblocks/default.nix index 1e4628b03037e..228e02beb8cc6 100644 --- a/pkgs/kde/gear/kblocks/default.nix +++ b/pkgs/kde/gear/kblocks/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kblocks"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kblocks"; } diff --git a/pkgs/kde/gear/kbounce/default.nix b/pkgs/kde/gear/kbounce/default.nix index e93c9e50d6731..d816a91632f18 100644 --- a/pkgs/kde/gear/kbounce/default.nix +++ b/pkgs/kde/gear/kbounce/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kbounce"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kbounce"; } diff --git a/pkgs/kde/gear/kbreakout/default.nix b/pkgs/kde/gear/kbreakout/default.nix index 541ae0789ed46..29fb4eeadd9b5 100644 --- a/pkgs/kde/gear/kbreakout/default.nix +++ b/pkgs/kde/gear/kbreakout/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kbreakout"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kbreakout"; } diff --git a/pkgs/kde/gear/kbruch/default.nix b/pkgs/kde/gear/kbruch/default.nix index 9533db2c30e52..d4e4c40b20f2e 100644 --- a/pkgs/kde/gear/kbruch/default.nix +++ b/pkgs/kde/gear/kbruch/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kbruch"; meta.mainProgram = "kbruch"; diff --git a/pkgs/kde/gear/kcachegrind/default.nix b/pkgs/kde/gear/kcachegrind/default.nix index 52de8a88e6665..d657c059ca220 100644 --- a/pkgs/kde/gear/kcachegrind/default.nix +++ b/pkgs/kde/gear/kcachegrind/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "kcachegrind"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; qtWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ graphviz ]}" diff --git a/pkgs/kde/gear/kcalc/default.nix b/pkgs/kde/gear/kcalc/default.nix index 28f1d314ce964..645ececef858f 100644 --- a/pkgs/kde/gear/kcalc/default.nix +++ b/pkgs/kde/gear/kcalc/default.nix @@ -8,6 +8,11 @@ mkKdeDerivation { pname = "kcalc"; - extraBuildInputs = [qt5compat gmp mpfr kdoctools]; + extraBuildInputs = [ + qt5compat + gmp + mpfr + kdoctools + ]; meta.mainProgram = "kcalc"; } diff --git a/pkgs/kde/gear/kcalutils/default.nix b/pkgs/kde/gear/kcalutils/default.nix index 1b58cce9ff004..38f9951477c93 100644 --- a/pkgs/kde/gear/kcalutils/default.nix +++ b/pkgs/kde/gear/kcalutils/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcalutils"; } diff --git a/pkgs/kde/gear/kcharselect/default.nix b/pkgs/kde/gear/kcharselect/default.nix index 9ee054d9339aa..3dae9bdfa84b0 100644 --- a/pkgs/kde/gear/kcharselect/default.nix +++ b/pkgs/kde/gear/kcharselect/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcharselect"; meta.mainProgram = "kcharselect"; diff --git a/pkgs/kde/gear/kclock/default.nix b/pkgs/kde/gear/kclock/default.nix index 97db5fd92f0eb..56ec55e885da8 100644 --- a/pkgs/kde/gear/kclock/default.nix +++ b/pkgs/kde/gear/kclock/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kclock"; - extraBuildInputs = [qtsvg qtmultimedia]; + extraBuildInputs = [ + qtsvg + qtmultimedia + ]; } diff --git a/pkgs/kde/gear/kcolorchooser/default.nix b/pkgs/kde/gear/kcolorchooser/default.nix index f4c5132800e36..f4f51cf5164f4 100644 --- a/pkgs/kde/gear/kcolorchooser/default.nix +++ b/pkgs/kde/gear/kcolorchooser/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcolorchooser"; meta.mainProgram = "kcolorchooser"; diff --git a/pkgs/kde/gear/kcron/default.nix b/pkgs/kde/gear/kcron/default.nix index b1707101d49f5..9278e6672d865 100644 --- a/pkgs/kde/gear/kcron/default.nix +++ b/pkgs/kde/gear/kcron/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcron"; } diff --git a/pkgs/kde/gear/kde-dev-scripts/default.nix b/pkgs/kde/gear/kde-dev-scripts/default.nix index 7e82f80b8114a..41dcc71d8c17e 100644 --- a/pkgs/kde/gear/kde-dev-scripts/default.nix +++ b/pkgs/kde/gear/kde-dev-scripts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kde-dev-scripts"; } diff --git a/pkgs/kde/gear/kde-dev-utils/default.nix b/pkgs/kde/gear/kde-dev-utils/default.nix index 6efce8354eec9..98365e9f0c2dc 100644 --- a/pkgs/kde/gear/kde-dev-utils/default.nix +++ b/pkgs/kde/gear/kde-dev-utils/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kde-dev-utils"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/gear/kde-inotify-survey/default.nix b/pkgs/kde/gear/kde-inotify-survey/default.nix index 6e319b60c81d5..5ecc800aa9dae 100644 --- a/pkgs/kde/gear/kde-inotify-survey/default.nix +++ b/pkgs/kde/gear/kde-inotify-survey/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kde-inotify-survey"; meta.mainProgram = "kde-inotify-survey"; diff --git a/pkgs/kde/gear/kdebugsettings/default.nix b/pkgs/kde/gear/kdebugsettings/default.nix index 21477c6656945..c2cceb3838739 100644 --- a/pkgs/kde/gear/kdebugsettings/default.nix +++ b/pkgs/kde/gear/kdebugsettings/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdebugsettings"; meta.mainProgram = "kdebugsettings"; diff --git a/pkgs/kde/gear/kdeconnect-kde/default.nix b/pkgs/kde/gear/kdeconnect-kde/default.nix index c8575ee51ea69..3bc3abd422eaa 100644 --- a/pkgs/kde/gear/kdeconnect-kde/default.nix +++ b/pkgs/kde/gear/kdeconnect-kde/default.nix @@ -27,8 +27,15 @@ mkKdeDerivation { echo "${sshfs}" > $out/nix-support/depends ''; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtconnectivity qtmultimedia qtwayland wayland wayland-protocols libfakekey]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtconnectivity + qtmultimedia + qtwayland + wayland + wayland-protocols + libfakekey + ]; extraCmakeFlags = [ "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" diff --git a/pkgs/kde/gear/kdeedu-data/default.nix b/pkgs/kde/gear/kdeedu-data/default.nix index 74bc3921389c1..d47f41510a3a1 100644 --- a/pkgs/kde/gear/kdeedu-data/default.nix +++ b/pkgs/kde/gear/kdeedu-data/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdeedu-data"; } diff --git a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix index 7636cbe1dd27f..56596b0537f63 100644 --- a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix +++ b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdegraphics-mobipocket"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; } diff --git a/pkgs/kde/gear/kdenetwork-filesharing/default.nix b/pkgs/kde/gear/kdenetwork-filesharing/default.nix index a91dc2529503a..35292d554ef6d 100644 --- a/pkgs/kde/gear/kdenetwork-filesharing/default.nix +++ b/pkgs/kde/gear/kdenetwork-filesharing/default.nix @@ -5,10 +5,10 @@ mkKdeDerivation { pname = "kdenetwork-filesharing"; - patches = [./smbd-path.patch]; + patches = [ ./smbd-path.patch ]; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; # We can't actually install samba via PackageKit, so let's not confuse users any more than we have to - extraCmakeFlags = ["-DSAMBA_INSTALL=OFF"]; + extraCmakeFlags = [ "-DSAMBA_INSTALL=OFF" ]; } diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index 8c08272cd9462..b9a6e321531c6 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -17,13 +17,11 @@ mkKdeDerivation { pname = "kdenlive"; patches = [ - ( - substituteAll { - src = ./dependency-paths.patch; - inherit mediainfo mlt glaxnimate; - ffmpeg = ffmpeg-full; - } - ) + (substituteAll { + src = ./dependency-paths.patch; + inherit mediainfo mlt glaxnimate; + ffmpeg = ffmpeg-full; + }) ]; extraNativeBuildInputs = [ shared-mime-info ]; diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index d8cde9a4f8964..4b800b7c19136 100644 --- a/pkgs/kde/gear/kdepim-addons/default.nix +++ b/pkgs/kde/gear/kdepim-addons/default.nix @@ -8,7 +8,7 @@ corrosion, alpaka, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-ZKLoX6sMKc6o7cnmxPYXL0d+Lmh8+n6Ko6VR/CzfZGs=", + cargoHash ? "sha256-hIiJEuUk950g29Qkka4oS7EsZDbPvm8Q3CrqxQG40bU=", }: mkKdeDerivation rec { pname = "kdepim-addons"; @@ -31,5 +31,9 @@ mkKdeDerivation rec { rustc ]; - extraBuildInputs = [discount corrosion alpaka]; + extraBuildInputs = [ + discount + corrosion + alpaka + ]; } diff --git a/pkgs/kde/gear/kdepim-runtime/default.nix b/pkgs/kde/gear/kdepim-runtime/default.nix index a4c2f81afb824..e3cd581afcd58 100644 --- a/pkgs/kde/gear/kdepim-runtime/default.nix +++ b/pkgs/kde/gear/kdepim-runtime/default.nix @@ -14,11 +14,26 @@ mkKdeDerivation { pname = "kdepim-runtime"; - extraNativeBuildInputs = [pkg-config shared-mime-info libxslt]; + extraNativeBuildInputs = [ + pkg-config + shared-mime-info + libxslt + ]; # FIXME: libkolabxml - extraBuildInputs = [qtnetworkauth qtspeech qtwebengine cyrus_sasl libetebase]; + extraBuildInputs = [ + qtnetworkauth + qtspeech + qtwebengine + cyrus_sasl + libetebase + ]; qtWrapperArgs = [ - "--prefix SASL_PATH : ${lib.makeSearchPath "lib/sasl2" [ cyrus_sasl.out libkgapi ]}" + "--prefix SASL_PATH : ${ + lib.makeSearchPath "lib/sasl2" [ + cyrus_sasl.out + libkgapi + ] + }" ]; } diff --git a/pkgs/kde/gear/kdesdk-kio/default.nix b/pkgs/kde/gear/kdesdk-kio/default.nix index 1ec970a818f69..24a4601ddbb29 100644 --- a/pkgs/kde/gear/kdesdk-kio/default.nix +++ b/pkgs/kde/gear/kdesdk-kio/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdesdk-kio"; - extraNativeBuildInputs = [perl]; + extraNativeBuildInputs = [ perl ]; } diff --git a/pkgs/kde/gear/kdesdk-thumbnailers/default.nix b/pkgs/kde/gear/kdesdk-thumbnailers/default.nix index 727fff83b3d24..47673f9bed225 100644 --- a/pkgs/kde/gear/kdesdk-thumbnailers/default.nix +++ b/pkgs/kde/gear/kdesdk-thumbnailers/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdesdk-thumbnailers"; } diff --git a/pkgs/kde/gear/kdev-php/default.nix b/pkgs/kde/gear/kdev-php/default.nix index 861bc9615b1c6..285c51170c6ba 100644 --- a/pkgs/kde/gear/kdev-php/default.nix +++ b/pkgs/kde/gear/kdev-php/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdev-php"; - extraNativeBuildInputs = [kdevelop-pg-qt]; + extraNativeBuildInputs = [ kdevelop-pg-qt ]; } diff --git a/pkgs/kde/gear/kdev-python/default.nix b/pkgs/kde/gear/kdev-python/default.nix index 6ddeff1b5850f..23901bb4d78e4 100644 --- a/pkgs/kde/gear/kdev-python/default.nix +++ b/pkgs/kde/gear/kdev-python/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdev-python"; } diff --git a/pkgs/kde/gear/kdf/default.nix b/pkgs/kde/gear/kdf/default.nix index 8021e701cbaaf..f4350dc606dfb 100644 --- a/pkgs/kde/gear/kdf/default.nix +++ b/pkgs/kde/gear/kdf/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdf"; } diff --git a/pkgs/kde/gear/kdialog/default.nix b/pkgs/kde/gear/kdialog/default.nix index 2ef1266505789..c1f96a49b1e96 100644 --- a/pkgs/kde/gear/kdialog/default.nix +++ b/pkgs/kde/gear/kdialog/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdialog"; } diff --git a/pkgs/kde/gear/kdiamond/default.nix b/pkgs/kde/gear/kdiamond/default.nix index 1636a80fd727f..11e0dbf40f50c 100644 --- a/pkgs/kde/gear/kdiamond/default.nix +++ b/pkgs/kde/gear/kdiamond/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kdiamond"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kdiamond"; } diff --git a/pkgs/kde/gear/keditbookmarks/default.nix b/pkgs/kde/gear/keditbookmarks/default.nix index 8eec9c76ec75e..4308c79ccee3b 100644 --- a/pkgs/kde/gear/keditbookmarks/default.nix +++ b/pkgs/kde/gear/keditbookmarks/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "keditbookmarks"; } diff --git a/pkgs/kde/gear/keysmith/default.nix b/pkgs/kde/gear/keysmith/default.nix index 4d96f630a661a..e01b7a61e266b 100644 --- a/pkgs/kde/gear/keysmith/default.nix +++ b/pkgs/kde/gear/keysmith/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "keysmith"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsvg libsodium]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + libsodium + ]; meta.mainProgram = "keysmith"; } diff --git a/pkgs/kde/gear/kfind/default.nix b/pkgs/kde/gear/kfind/default.nix index b652b790eb7ff..d1e8159132548 100644 --- a/pkgs/kde/gear/kfind/default.nix +++ b/pkgs/kde/gear/kfind/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kfind"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; meta.mainProgram = "kfind"; } diff --git a/pkgs/kde/gear/kfourinline/default.nix b/pkgs/kde/gear/kfourinline/default.nix index 2c77d372fc16c..1bd6606b2cf2b 100644 --- a/pkgs/kde/gear/kfourinline/default.nix +++ b/pkgs/kde/gear/kfourinline/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kfourinline"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/gear/kgeography/default.nix b/pkgs/kde/gear/kgeography/default.nix index 560faec8e010b..c2c04553c24d2 100644 --- a/pkgs/kde/gear/kgeography/default.nix +++ b/pkgs/kde/gear/kgeography/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kgeography"; meta.mainProgram = "kgeography"; diff --git a/pkgs/kde/gear/kget/default.nix b/pkgs/kde/gear/kget/default.nix index e88cd601bb0eb..412d0a3c0b699 100644 --- a/pkgs/kde/gear/kget/default.nix +++ b/pkgs/kde/gear/kget/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "kget"; - extraBuildInputs = [qgpgme libmms]; + extraBuildInputs = [ + qgpgme + libmms + ]; meta.mainProgram = "kget"; } diff --git a/pkgs/kde/gear/kgoldrunner/default.nix b/pkgs/kde/gear/kgoldrunner/default.nix index ba82b55cccad1..10a0634e1b50a 100644 --- a/pkgs/kde/gear/kgoldrunner/default.nix +++ b/pkgs/kde/gear/kgoldrunner/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kgoldrunner"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kgoldrunner"; } diff --git a/pkgs/kde/gear/kgpg/default.nix b/pkgs/kde/gear/kgpg/default.nix index 2b974de5123c1..d2979a933a54f 100644 --- a/pkgs/kde/gear/kgpg/default.nix +++ b/pkgs/kde/gear/kgpg/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kgpg"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [gpgme]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ gpgme ]; meta.mainProgram = "kgpg"; } diff --git a/pkgs/kde/gear/kgraphviewer/default.nix b/pkgs/kde/gear/kgraphviewer/default.nix index de47a29cb6a1a..560d4685921ae 100644 --- a/pkgs/kde/gear/kgraphviewer/default.nix +++ b/pkgs/kde/gear/kgraphviewer/default.nix @@ -10,5 +10,10 @@ mkKdeDerivation { pname = "kgraphviewer"; extraNativeBuildInputs = [ pkg-config ]; - extraBuildInputs = [ qt5compat qtsvg boost graphviz ]; + extraBuildInputs = [ + qt5compat + qtsvg + boost + graphviz + ]; } diff --git a/pkgs/kde/gear/khangman/default.nix b/pkgs/kde/gear/khangman/default.nix index e3f95b7a6a5ad..460baf52760b9 100644 --- a/pkgs/kde/gear/khangman/default.nix +++ b/pkgs/kde/gear/khangman/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "khangman"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "khangman"; } diff --git a/pkgs/kde/gear/khealthcertificate/default.nix b/pkgs/kde/gear/khealthcertificate/default.nix index 6d5461bffc3c1..ef4b1ab166805 100644 --- a/pkgs/kde/gear/khealthcertificate/default.nix +++ b/pkgs/kde/gear/khealthcertificate/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "khealthcertificate"; - extraNativeBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/gear/khelpcenter/default.nix b/pkgs/kde/gear/khelpcenter/default.nix index 231d1036b0b12..2348754b71b6e 100644 --- a/pkgs/kde/gear/khelpcenter/default.nix +++ b/pkgs/kde/gear/khelpcenter/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "khelpcenter"; - extraBuildInputs = [qtwebengine xapian]; + extraBuildInputs = [ + qtwebengine + xapian + ]; meta.mainProgram = "khelpcenter"; } diff --git a/pkgs/kde/gear/kidentitymanagement/default.nix b/pkgs/kde/gear/kidentitymanagement/default.nix index c66c416fd7ce6..bfcfa3f196964 100644 --- a/pkgs/kde/gear/kidentitymanagement/default.nix +++ b/pkgs/kde/gear/kidentitymanagement/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kidentitymanagement"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/gear/kig/default.nix b/pkgs/kde/gear/kig/default.nix index a3e4de99e6a8d..8a17616443784 100644 --- a/pkgs/kde/gear/kig/default.nix +++ b/pkgs/kde/gear/kig/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kig"; # FIXME(qt5) diff --git a/pkgs/kde/gear/kigo/default.nix b/pkgs/kde/gear/kigo/default.nix index 4fd00e721f81b..6c2f4a1793d79 100644 --- a/pkgs/kde/gear/kigo/default.nix +++ b/pkgs/kde/gear/kigo/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kigo"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kigo"; } diff --git a/pkgs/kde/gear/killbots/default.nix b/pkgs/kde/gear/killbots/default.nix index 592cb97ba681b..71853ae6eb96e 100644 --- a/pkgs/kde/gear/killbots/default.nix +++ b/pkgs/kde/gear/killbots/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "killbots"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "killbots"; } diff --git a/pkgs/kde/gear/kimagemapeditor/default.nix b/pkgs/kde/gear/kimagemapeditor/default.nix index 71efc86fd2ae3..9341cf5ab4dba 100644 --- a/pkgs/kde/gear/kimagemapeditor/default.nix +++ b/pkgs/kde/gear/kimagemapeditor/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kimagemapeditor"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; meta.mainProgram = "kimagemapeditor"; } diff --git a/pkgs/kde/gear/kimap/default.nix b/pkgs/kde/gear/kimap/default.nix index d106166ec4a6f..3f5bc44960706 100644 --- a/pkgs/kde/gear/kimap/default.nix +++ b/pkgs/kde/gear/kimap/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kimap"; - extraBuildInputs = [cyrus_sasl]; + extraBuildInputs = [ cyrus_sasl ]; } diff --git a/pkgs/kde/gear/kio-admin/default.nix b/pkgs/kde/gear/kio-admin/default.nix index 042253978983b..7734ac049225c 100644 --- a/pkgs/kde/gear/kio-admin/default.nix +++ b/pkgs/kde/gear/kio-admin/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kio-admin"; } diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix index 79a5cb405ae48..2260feeac62cd 100644 --- a/pkgs/kde/gear/kio-extras/default.nix +++ b/pkgs/kde/gear/kio-extras/default.nix @@ -19,7 +19,11 @@ mkKdeDerivation { pname = "kio-extras"; - extraNativeBuildInputs = [pkg-config gperf shared-mime-info]; + extraNativeBuildInputs = [ + pkg-config + gperf + shared-mime-info + ]; extraBuildInputs = [ qt5compat qtsvg diff --git a/pkgs/kde/gear/kio-gdrive/default.nix b/pkgs/kde/gear/kio-gdrive/default.nix index 1c28dd3dcd10e..3fc930a31699d 100644 --- a/pkgs/kde/gear/kio-gdrive/default.nix +++ b/pkgs/kde/gear/kio-gdrive/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kio-gdrive"; } diff --git a/pkgs/kde/gear/kio-zeroconf/default.nix b/pkgs/kde/gear/kio-zeroconf/default.nix index 0b731162af835..8a1d91bbb1a57 100644 --- a/pkgs/kde/gear/kio-zeroconf/default.nix +++ b/pkgs/kde/gear/kio-zeroconf/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kio-zeroconf"; } diff --git a/pkgs/kde/gear/kirigami-gallery/default.nix b/pkgs/kde/gear/kirigami-gallery/default.nix index d9e1e12367a2c..bb739046baca7 100644 --- a/pkgs/kde/gear/kirigami-gallery/default.nix +++ b/pkgs/kde/gear/kirigami-gallery/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kirigami-gallery"; - extraNativeBuildInputs = [qtsvg qttools]; + extraNativeBuildInputs = [ + qtsvg + qttools + ]; } diff --git a/pkgs/kde/gear/kiriki/default.nix b/pkgs/kde/gear/kiriki/default.nix index 50d04e49e9393..91290cbc3a295 100644 --- a/pkgs/kde/gear/kiriki/default.nix +++ b/pkgs/kde/gear/kiriki/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kiriki"; meta.mainProgram = "kiriki"; diff --git a/pkgs/kde/gear/kiten/default.nix b/pkgs/kde/gear/kiten/default.nix index 5f87c6c66b395..d6eeab96eb665 100644 --- a/pkgs/kde/gear/kiten/default.nix +++ b/pkgs/kde/gear/kiten/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kiten"; } diff --git a/pkgs/kde/gear/kitinerary/default.nix b/pkgs/kde/gear/kitinerary/default.nix index de3f4ef00005a..28710c095fccc 100644 --- a/pkgs/kde/gear/kitinerary/default.nix +++ b/pkgs/kde/gear/kitinerary/default.nix @@ -10,7 +10,7 @@ mkKdeDerivation { pname = "kitinerary"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; extraBuildInputs = [ qtsvg qtdeclarative diff --git a/pkgs/kde/gear/kjournald/default.nix b/pkgs/kde/gear/kjournald/default.nix index 879e698db4d1e..f902fba1e0dcb 100644 --- a/pkgs/kde/gear/kjournald/default.nix +++ b/pkgs/kde/gear/kjournald/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "kjournald"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtdeclarative systemd]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtdeclarative + systemd + ]; meta.mainProgram = "kjournaldbrowser"; } diff --git a/pkgs/kde/gear/kjumpingcube/default.nix b/pkgs/kde/gear/kjumpingcube/default.nix index 0141748b39dce..65ae1386cf27b 100644 --- a/pkgs/kde/gear/kjumpingcube/default.nix +++ b/pkgs/kde/gear/kjumpingcube/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kjumpingcube"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kjumpingcube"; } diff --git a/pkgs/kde/gear/kldap/default.nix b/pkgs/kde/gear/kldap/default.nix index 99c17b1691478..7c3e9b960002c 100644 --- a/pkgs/kde/gear/kldap/default.nix +++ b/pkgs/kde/gear/kldap/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kldap"; - extraBuildInputs = [cyrus_sasl openldap]; + extraBuildInputs = [ + cyrus_sasl + openldap + ]; } diff --git a/pkgs/kde/gear/kleopatra/default.nix b/pkgs/kde/gear/kleopatra/default.nix index 58d3f4b5a9cf6..560ab8fb71fcf 100644 --- a/pkgs/kde/gear/kleopatra/default.nix +++ b/pkgs/kde/gear/kleopatra/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kleopatra"; - extraNativeBuildInputs = [shared-mime-info]; - extraBuildInputs = [akonadi-mime]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ akonadi-mime ]; } diff --git a/pkgs/kde/gear/klettres/default.nix b/pkgs/kde/gear/klettres/default.nix index ef6305d0f1216..b01e228783850 100644 --- a/pkgs/kde/gear/klettres/default.nix +++ b/pkgs/kde/gear/klettres/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "klettres"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "klettres"; } diff --git a/pkgs/kde/gear/klickety/default.nix b/pkgs/kde/gear/klickety/default.nix index 339fa31003a56..a0d214f3e79c8 100644 --- a/pkgs/kde/gear/klickety/default.nix +++ b/pkgs/kde/gear/klickety/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "klickety"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "klickety"; } diff --git a/pkgs/kde/gear/klines/default.nix b/pkgs/kde/gear/klines/default.nix index 52bb95c0d787d..fe39ba85440c3 100644 --- a/pkgs/kde/gear/klines/default.nix +++ b/pkgs/kde/gear/klines/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "klines"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "klines"; } diff --git a/pkgs/kde/gear/kmag/default.nix b/pkgs/kde/gear/kmag/default.nix index 3d8046715dca7..0650d3bd763c0 100644 --- a/pkgs/kde/gear/kmag/default.nix +++ b/pkgs/kde/gear/kmag/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmag"; meta.mainProgram = "kmag"; diff --git a/pkgs/kde/gear/kmahjongg/default.nix b/pkgs/kde/gear/kmahjongg/default.nix index 9d01f435be006..1816b16f283c5 100644 --- a/pkgs/kde/gear/kmahjongg/default.nix +++ b/pkgs/kde/gear/kmahjongg/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "kmahjongg"; - extraBuildInputs = [qtdeclarative qtsvg]; + extraBuildInputs = [ + qtdeclarative + qtsvg + ]; - qtWrapperArgs = ["--prefix XDG_DATA_DIRS : ${libkmahjongg}/share"]; + qtWrapperArgs = [ "--prefix XDG_DATA_DIRS : ${libkmahjongg}/share" ]; meta.mainProgram = "kmahjongg"; } diff --git a/pkgs/kde/gear/kmail-account-wizard/default.nix b/pkgs/kde/gear/kmail-account-wizard/default.nix index acd23f72d6838..88e790f1a93ab 100644 --- a/pkgs/kde/gear/kmail-account-wizard/default.nix +++ b/pkgs/kde/gear/kmail-account-wizard/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmail-account-wizard"; meta.mainProgram = "accountwizard"; diff --git a/pkgs/kde/gear/kmail/default.nix b/pkgs/kde/gear/kmail/default.nix index f3f659fbaf5f7..ce38c7d15fdc6 100644 --- a/pkgs/kde/gear/kmail/default.nix +++ b/pkgs/kde/gear/kmail/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmail"; } diff --git a/pkgs/kde/gear/kmailtransport/default.nix b/pkgs/kde/gear/kmailtransport/default.nix index cf1bf8c1b2233..7953ec021b64d 100644 --- a/pkgs/kde/gear/kmailtransport/default.nix +++ b/pkgs/kde/gear/kmailtransport/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmailtransport"; } diff --git a/pkgs/kde/gear/kmbox/default.nix b/pkgs/kde/gear/kmbox/default.nix index ef840d3eda4d4..9f1a0ef7c4009 100644 --- a/pkgs/kde/gear/kmbox/default.nix +++ b/pkgs/kde/gear/kmbox/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmbox"; } diff --git a/pkgs/kde/gear/kmime/default.nix b/pkgs/kde/gear/kmime/default.nix index a2beb4fdf58f2..3001856434814 100644 --- a/pkgs/kde/gear/kmime/default.nix +++ b/pkgs/kde/gear/kmime/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kmime"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [ki18n]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ ki18n ]; } diff --git a/pkgs/kde/gear/kmines/default.nix b/pkgs/kde/gear/kmines/default.nix index 687cf0d29480e..243fd722e9547 100644 --- a/pkgs/kde/gear/kmines/default.nix +++ b/pkgs/kde/gear/kmines/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kmines"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kmines"; } diff --git a/pkgs/kde/gear/kmix/default.nix b/pkgs/kde/gear/kmix/default.nix index b83392baa7dfc..8c6e1a3c4b815 100644 --- a/pkgs/kde/gear/kmix/default.nix +++ b/pkgs/kde/gear/kmix/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmix"; # FIXME(qt5) diff --git a/pkgs/kde/gear/kmousetool/default.nix b/pkgs/kde/gear/kmousetool/default.nix index 78a73e45768b1..7eca9ab12c73d 100644 --- a/pkgs/kde/gear/kmousetool/default.nix +++ b/pkgs/kde/gear/kmousetool/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "kmousetool"; - extraBuildInputs = [qtmultimedia xorg.libXt]; + extraBuildInputs = [ + qtmultimedia + xorg.libXt + ]; meta.mainProgram = "kmousetool"; } diff --git a/pkgs/kde/gear/kmouth/default.nix b/pkgs/kde/gear/kmouth/default.nix index 9abffa1d2da63..098f8a5ec33fc 100644 --- a/pkgs/kde/gear/kmouth/default.nix +++ b/pkgs/kde/gear/kmouth/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kmouth"; - extraBuildInputs = [qtspeech]; + extraBuildInputs = [ qtspeech ]; meta.mainProgram = "kmouth"; } diff --git a/pkgs/kde/gear/kmplot/default.nix b/pkgs/kde/gear/kmplot/default.nix index b38941765747f..6830d3edeae19 100644 --- a/pkgs/kde/gear/kmplot/default.nix +++ b/pkgs/kde/gear/kmplot/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kmplot"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kmplot"; } diff --git a/pkgs/kde/gear/knavalbattle/default.nix b/pkgs/kde/gear/knavalbattle/default.nix index abd9281ff52ec..a04c8dee5baa8 100644 --- a/pkgs/kde/gear/knavalbattle/default.nix +++ b/pkgs/kde/gear/knavalbattle/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "knavalbattle"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "knavalbattle"; } diff --git a/pkgs/kde/gear/knetwalk/default.nix b/pkgs/kde/gear/knetwalk/default.nix index 265e6d32f542a..36305d57cc87f 100644 --- a/pkgs/kde/gear/knetwalk/default.nix +++ b/pkgs/kde/gear/knetwalk/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "knetwalk"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "knetwalk"; } diff --git a/pkgs/kde/gear/knights/default.nix b/pkgs/kde/gear/knights/default.nix index 4deca218d0954..2fd61dc79f198 100644 --- a/pkgs/kde/gear/knights/default.nix +++ b/pkgs/kde/gear/knights/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "knights"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg qtspeech]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ + qtsvg + qtspeech + ]; meta.mainProgram = "knights"; } diff --git a/pkgs/kde/gear/koko/default.nix b/pkgs/kde/gear/koko/default.nix index 1241f68e12a74..e823a6cff1392 100644 --- a/pkgs/kde/gear/koko/default.nix +++ b/pkgs/kde/gear/koko/default.nix @@ -7,7 +7,8 @@ qtsvg, exiv2, kirigami-addons, -}: let +}: +let # URLs snapshotted through # https://web.archive.org/save/$url # Update when stale enough I guess? @@ -24,22 +25,22 @@ sha256 = "0cwbfff8gzci5zrahh6d53b9b3bfv1cbwlv0k6076531i1c7md9p"; }; in - mkKdeDerivation { - pname = "koko"; +mkKdeDerivation { + pname = "koko"; - prePatch = '' - ln -s ${admin1} src/admin1CodesASCII.txt - ln -s ${admin2} src/admin2Codes.txt - ln -s ${cities1000} src/cities1000.zip - ''; + prePatch = '' + ln -s ${admin1} src/admin1CodesASCII.txt + ln -s ${admin2} src/admin2Codes.txt + ln -s ${cities1000} src/cities1000.zip + ''; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [ - qtmultimedia - qtpositioning - qtsvg - exiv2 - kirigami-addons - ]; - meta.mainProgram = "koko"; - } + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtmultimedia + qtpositioning + qtsvg + exiv2 + kirigami-addons + ]; + meta.mainProgram = "koko"; +} diff --git a/pkgs/kde/gear/kolf/default.nix b/pkgs/kde/gear/kolf/default.nix index 39657f077a7d4..020ffdad5c996 100644 --- a/pkgs/kde/gear/kolf/default.nix +++ b/pkgs/kde/gear/kolf/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kolf"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kolf"; } diff --git a/pkgs/kde/gear/kollision/default.nix b/pkgs/kde/gear/kollision/default.nix index 299549d475130..f8924cb689304 100644 --- a/pkgs/kde/gear/kollision/default.nix +++ b/pkgs/kde/gear/kollision/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kollision"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kollision"; } diff --git a/pkgs/kde/gear/kolourpaint/default.nix b/pkgs/kde/gear/kolourpaint/default.nix index 7cf5583345d2f..752be8e2bd45b 100644 --- a/pkgs/kde/gear/kolourpaint/default.nix +++ b/pkgs/kde/gear/kolourpaint/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kolourpaint"; meta.mainProgram = "kolourpaint"; diff --git a/pkgs/kde/gear/kompare/default.nix b/pkgs/kde/gear/kompare/default.nix index 32bcaf2401d9a..223db6239307e 100644 --- a/pkgs/kde/gear/kompare/default.nix +++ b/pkgs/kde/gear/kompare/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kompare"; meta.mainProgram = "kompare"; diff --git a/pkgs/kde/gear/kongress/default.nix b/pkgs/kde/gear/kongress/default.nix index 8ac8807eb68ee..c82cb663f37ef 100644 --- a/pkgs/kde/gear/kongress/default.nix +++ b/pkgs/kde/gear/kongress/default.nix @@ -1,9 +1,15 @@ { mkKdeDerivation, + kcontacts, + qtlocation, qtsvg, }: mkKdeDerivation { pname = "kongress"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ + kcontacts + qtsvg + qtlocation + ]; } diff --git a/pkgs/kde/gear/konqueror/default.nix b/pkgs/kde/gear/konqueror/default.nix index 9ae274fc84c38..5bd29359e9794 100644 --- a/pkgs/kde/gear/konqueror/default.nix +++ b/pkgs/kde/gear/konqueror/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "konqueror"; - extraNativeBuildInputs = [hunspell]; - extraBuildInputs = [qtwebengine]; + extraNativeBuildInputs = [ hunspell ]; + extraBuildInputs = [ qtwebengine ]; extraCmakeFlags = [ "-DWebEngineDictConverter_EXECUTABLE=${qtwebengine}/libexec/qwebengine_convert_dict" diff --git a/pkgs/kde/gear/konquest/default.nix b/pkgs/kde/gear/konquest/default.nix index 538428d84c723..3b7cfbf59e543 100644 --- a/pkgs/kde/gear/konquest/default.nix +++ b/pkgs/kde/gear/konquest/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "konquest"; - extraBuildInputs = [qtscxml qtsvg]; + extraBuildInputs = [ + qtscxml + qtsvg + ]; meta.mainProgram = "konquest"; } diff --git a/pkgs/kde/gear/konsole/default.nix b/pkgs/kde/gear/konsole/default.nix index 65a94bb190964..0e95e6a045a89 100644 --- a/pkgs/kde/gear/konsole/default.nix +++ b/pkgs/kde/gear/konsole/default.nix @@ -6,7 +6,10 @@ mkKdeDerivation { pname = "konsole"; - extraBuildInputs = [qt5compat qtmultimedia]; + extraBuildInputs = [ + qt5compat + qtmultimedia + ]; meta.mainProgram = "konsole"; } diff --git a/pkgs/kde/gear/kontactinterface/default.nix b/pkgs/kde/gear/kontactinterface/default.nix index 4c7d6acab1ca7..1f81eda91e926 100644 --- a/pkgs/kde/gear/kontactinterface/default.nix +++ b/pkgs/kde/gear/kontactinterface/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kontactinterface"; } diff --git a/pkgs/kde/gear/kontrast/default.nix b/pkgs/kde/gear/kontrast/default.nix index 1ad85ad648022..6d3ef5d3adb9c 100644 --- a/pkgs/kde/gear/kontrast/default.nix +++ b/pkgs/kde/gear/kontrast/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "kontrast"; - extraBuildInputs = [qtsvg qcoro]; + extraBuildInputs = [ + qtsvg + qcoro + ]; meta.mainProgram = "kontrast"; } diff --git a/pkgs/kde/gear/konversation/default.nix b/pkgs/kde/gear/konversation/default.nix index ba58215e3093e..b78bb62f62fcb 100644 --- a/pkgs/kde/gear/konversation/default.nix +++ b/pkgs/kde/gear/konversation/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "konversation"; - extraBuildInputs = [qt5compat]; - extraNativeBuildInputs = [qtmultimedia qttools]; + extraBuildInputs = [ qt5compat ]; + extraNativeBuildInputs = [ + qtmultimedia + qttools + ]; meta.mainProgram = "konversation"; } diff --git a/pkgs/kde/gear/kopeninghours/default.nix b/pkgs/kde/gear/kopeninghours/default.nix index 7ba5214ac09fb..7cb81e62ee789 100644 --- a/pkgs/kde/gear/kopeninghours/default.nix +++ b/pkgs/kde/gear/kopeninghours/default.nix @@ -9,7 +9,10 @@ mkKdeDerivation { pname = "kopeninghours"; - extraNativeBuildInputs = [bison flex]; + extraNativeBuildInputs = [ + bison + flex + ]; extraBuildInputs = [ qtdeclarative (boost.override { diff --git a/pkgs/kde/gear/korganizer/default.nix b/pkgs/kde/gear/korganizer/default.nix index c20e6625e1bd2..17331248185fd 100644 --- a/pkgs/kde/gear/korganizer/default.nix +++ b/pkgs/kde/gear/korganizer/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "korganizer"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; meta.mainProgram = "korganizer"; } diff --git a/pkgs/kde/gear/kosmindoormap/default.nix b/pkgs/kde/gear/kosmindoormap/default.nix index 37f991a7adeb8..26ad09427458e 100644 --- a/pkgs/kde/gear/kosmindoormap/default.nix +++ b/pkgs/kde/gear/kosmindoormap/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kosmindoormap"; - extraNativeBuildInputs = [bison flex]; - extraBuildInputs = [recastnavigation]; + extraNativeBuildInputs = [ + bison + flex + ]; + extraBuildInputs = [ recastnavigation ]; } diff --git a/pkgs/kde/gear/kpat/default.nix b/pkgs/kde/gear/kpat/default.nix index e770f59357050..0462c8c4f9aa9 100644 --- a/pkgs/kde/gear/kpat/default.nix +++ b/pkgs/kde/gear/kpat/default.nix @@ -10,13 +10,16 @@ mkKdeDerivation { pname = "kpat"; - extraNativeBuildInputs = [_7zz shared-mime-info]; + extraNativeBuildInputs = [ + _7zz + shared-mime-info + ]; extraBuildInputs = [ qtsvg black-hole-solver freecell-solver ]; - qtWrapperArgs = ["--prefix XDG_DATA_DIRS : ${libkdegames}/share"]; + qtWrapperArgs = [ "--prefix XDG_DATA_DIRS : ${libkdegames}/share" ]; meta.mainProgram = "kpat"; } diff --git a/pkgs/kde/gear/kpimtextedit/default.nix b/pkgs/kde/gear/kpimtextedit/default.nix index 0c33280cc0598..f24c126f4669d 100644 --- a/pkgs/kde/gear/kpimtextedit/default.nix +++ b/pkgs/kde/gear/kpimtextedit/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kpimtextedit"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; } diff --git a/pkgs/kde/gear/kpkpass/default.nix b/pkgs/kde/gear/kpkpass/default.nix index a2f116f67d779..6628733004475 100644 --- a/pkgs/kde/gear/kpkpass/default.nix +++ b/pkgs/kde/gear/kpkpass/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kpkpass"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/pkgs/kde/gear/kpmcore/default.nix b/pkgs/kde/gear/kpmcore/default.nix index 9dfa4f3d6813b..3da512e1701a9 100644 --- a/pkgs/kde/gear/kpmcore/default.nix +++ b/pkgs/kde/gear/kpmcore/default.nix @@ -24,7 +24,8 @@ udftools, xfsprogs, zfs, -}: let +}: +let # https://github.com/KDE/kpmcore/blob/06f15334ecfbe871730a90dbe2b694ba060ee998/src/util/externalcommand_whitelist.h runtimeDeps = [ cryptsetup @@ -54,21 +55,23 @@ # FIXME: audit to see if these are all still required ]; - trustedprefixes = writeText "kpmcore-trustedprefixes" (lib.concatStringsSep "\n" (map lib.getBin runtimeDeps)); + trustedprefixes = writeText "kpmcore-trustedprefixes" ( + lib.concatStringsSep "\n" (map lib.getBin runtimeDeps) + ); in - mkKdeDerivation { - pname = "kpmcore"; +mkKdeDerivation { + pname = "kpmcore"; - postPatch = '' - cp ${trustedprefixes} src/util/trustedprefixes - ''; + postPatch = '' + cp ${trustedprefixes} src/util/trustedprefixes + ''; - preConfigure = '' - substituteInPlace src/util/CMakeLists.txt \ - --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions - substituteInPlace src/backend/corebackend.cpp \ - --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy - ''; + preConfigure = '' + substituteInPlace src/util/CMakeLists.txt \ + --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions + substituteInPlace src/backend/corebackend.cpp \ + --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy + ''; - extraNativeBuildInputs = [pkg-config]; - } + extraNativeBuildInputs = [ pkg-config ]; +} diff --git a/pkgs/kde/gear/kpublictransport/default.nix b/pkgs/kde/gear/kpublictransport/default.nix index bc1a663b77620..40f0587d30240 100644 --- a/pkgs/kde/gear/kpublictransport/default.nix +++ b/pkgs/kde/gear/kpublictransport/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kpublictransport"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/gear/kqtquickcharts/default.nix b/pkgs/kde/gear/kqtquickcharts/default.nix index 682cd0531b7b7..310b50170b150 100644 --- a/pkgs/kde/gear/kqtquickcharts/default.nix +++ b/pkgs/kde/gear/kqtquickcharts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kqtquickcharts"; # FIXME(qt5) diff --git a/pkgs/kde/gear/krdc/default.nix b/pkgs/kde/gear/krdc/default.nix index e589de328b82c..f54d123644971 100644 --- a/pkgs/kde/gear/krdc/default.nix +++ b/pkgs/kde/gear/krdc/default.nix @@ -9,8 +9,13 @@ mkKdeDerivation { pname = "krdc"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland libssh libvncserver freerdp]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + libssh + libvncserver + freerdp + ]; meta.mainProgram = "krdc"; } diff --git a/pkgs/kde/gear/krecorder/default.nix b/pkgs/kde/gear/krecorder/default.nix index a975f1b95684c..04d9d4c058265 100644 --- a/pkgs/kde/gear/krecorder/default.nix +++ b/pkgs/kde/gear/krecorder/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "krecorder"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; meta.mainProgram = "krecorder"; } diff --git a/pkgs/kde/gear/kreversi/default.nix b/pkgs/kde/gear/kreversi/default.nix index 3f5591c299b6a..4b15b9c1a8beb 100644 --- a/pkgs/kde/gear/kreversi/default.nix +++ b/pkgs/kde/gear/kreversi/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kreversi"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kreversi"; } diff --git a/pkgs/kde/gear/krfb/default.nix b/pkgs/kde/gear/krfb/default.nix index 3ab41fcc4f511..808067fb00009 100644 --- a/pkgs/kde/gear/krfb/default.nix +++ b/pkgs/kde/gear/krfb/default.nix @@ -13,6 +13,11 @@ mkKdeDerivation { "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland libvncserver pipewire xorg.libXdamage]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + libvncserver + pipewire + xorg.libXdamage + ]; } diff --git a/pkgs/kde/gear/kross-interpreters/default.nix b/pkgs/kde/gear/kross-interpreters/default.nix index 4040fa401ef91..186c4bc67ccfb 100644 --- a/pkgs/kde/gear/kross-interpreters/default.nix +++ b/pkgs/kde/gear/kross-interpreters/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kross-interpreters"; - extraBuildInputs = [extra-cmake-modules]; + extraBuildInputs = [ extra-cmake-modules ]; # FIXME(qt5) meta.broken = true; } diff --git a/pkgs/kde/gear/kruler/default.nix b/pkgs/kde/gear/kruler/default.nix index 9eb9a917fc17e..9a21899a18d2e 100644 --- a/pkgs/kde/gear/kruler/default.nix +++ b/pkgs/kde/gear/kruler/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kruler"; meta.mainProgram = "kruler"; diff --git a/pkgs/kde/gear/ksanecore/default.nix b/pkgs/kde/gear/ksanecore/default.nix index 7f7e63fb2caf3..36b7b1b458042 100644 --- a/pkgs/kde/gear/ksanecore/default.nix +++ b/pkgs/kde/gear/ksanecore/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ksanecore"; - extraBuildInputs = [sane-backends]; + extraBuildInputs = [ sane-backends ]; } diff --git a/pkgs/kde/gear/kshisen/default.nix b/pkgs/kde/gear/kshisen/default.nix index 3859610e0f1de..7d41717f9ba6f 100644 --- a/pkgs/kde/gear/kshisen/default.nix +++ b/pkgs/kde/gear/kshisen/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kshisen"; meta.mainProgram = "kshisen"; diff --git a/pkgs/kde/gear/ksirk/default.nix b/pkgs/kde/gear/ksirk/default.nix index 5c4196a7aff02..2123d3d54abf6 100644 --- a/pkgs/kde/gear/ksirk/default.nix +++ b/pkgs/kde/gear/ksirk/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ksirk"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; } diff --git a/pkgs/kde/gear/ksmtp/default.nix b/pkgs/kde/gear/ksmtp/default.nix index c098ddd49c819..290456b3273d8 100644 --- a/pkgs/kde/gear/ksmtp/default.nix +++ b/pkgs/kde/gear/ksmtp/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "ksmtp"; - extraBuildInputs = [qt5compat cyrus_sasl]; + extraBuildInputs = [ + qt5compat + cyrus_sasl + ]; } diff --git a/pkgs/kde/gear/ksnakeduel/default.nix b/pkgs/kde/gear/ksnakeduel/default.nix index 3f07eaa0e48f9..a5e656fa427b9 100644 --- a/pkgs/kde/gear/ksnakeduel/default.nix +++ b/pkgs/kde/gear/ksnakeduel/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "ksnakeduel"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "ksnakeduel"; } diff --git a/pkgs/kde/gear/kspaceduel/default.nix b/pkgs/kde/gear/kspaceduel/default.nix index 34194d2322cfc..28e0f9f256a6e 100644 --- a/pkgs/kde/gear/kspaceduel/default.nix +++ b/pkgs/kde/gear/kspaceduel/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kspaceduel"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kspaceduel"; } diff --git a/pkgs/kde/gear/ksquares/default.nix b/pkgs/kde/gear/ksquares/default.nix index 8dfbcf00244dc..b13cd0c56f6f0 100644 --- a/pkgs/kde/gear/ksquares/default.nix +++ b/pkgs/kde/gear/ksquares/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ksquares"; meta.mainProgram = "ksquares"; diff --git a/pkgs/kde/gear/ksudoku/default.nix b/pkgs/kde/gear/ksudoku/default.nix index 15ac4e2ce4f8d..4b6841bf1b1f3 100644 --- a/pkgs/kde/gear/ksudoku/default.nix +++ b/pkgs/kde/gear/ksudoku/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "ksudoku"; - extraBuildInputs = [qtsvg]; - extraNativeBuildInputs = [_7zz]; + extraBuildInputs = [ qtsvg ]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "ksudoku"; } diff --git a/pkgs/kde/gear/ksystemlog/default.nix b/pkgs/kde/gear/ksystemlog/default.nix index 772a4f54b077c..6594c685e149e 100644 --- a/pkgs/kde/gear/ksystemlog/default.nix +++ b/pkgs/kde/gear/ksystemlog/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "ksystemlog"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qt5compat audit]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qt5compat + audit + ]; meta.mainProgram = "ksystemlog"; } diff --git a/pkgs/kde/gear/kteatime/default.nix b/pkgs/kde/gear/kteatime/default.nix index 408bc14883cf5..ac7056109d728 100644 --- a/pkgs/kde/gear/kteatime/default.nix +++ b/pkgs/kde/gear/kteatime/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kteatime"; meta.mainProgram = "kteatime"; diff --git a/pkgs/kde/gear/ktimer/default.nix b/pkgs/kde/gear/ktimer/default.nix index 1b46f8b72c72c..714643cc40d0b 100644 --- a/pkgs/kde/gear/ktimer/default.nix +++ b/pkgs/kde/gear/ktimer/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "ktimer"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; meta.mainProgram = "ktimer"; } diff --git a/pkgs/kde/gear/ktnef/default.nix b/pkgs/kde/gear/ktnef/default.nix index 7fcd568ade726..81bd5c70b616e 100644 --- a/pkgs/kde/gear/ktnef/default.nix +++ b/pkgs/kde/gear/ktnef/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ktnef"; } diff --git a/pkgs/kde/gear/ktorrent/default.nix b/pkgs/kde/gear/ktorrent/default.nix index 92e0646e696af..ae1d8aedfdf39 100644 --- a/pkgs/kde/gear/ktorrent/default.nix +++ b/pkgs/kde/gear/ktorrent/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "ktorrent"; - extraBuildInputs = [qtwebengine taglib libmaxminddb]; + extraBuildInputs = [ + qtwebengine + taglib + libmaxminddb + ]; } diff --git a/pkgs/kde/gear/ktouch/default.nix b/pkgs/kde/gear/ktouch/default.nix index 7f744a9f79d50..6955dc3f04029 100644 --- a/pkgs/kde/gear/ktouch/default.nix +++ b/pkgs/kde/gear/ktouch/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ktouch"; # FIXME(qt5) diff --git a/pkgs/kde/gear/ktrip/default.nix b/pkgs/kde/gear/ktrip/default.nix index 0f8b001c7d6bf..feb8f5c54a748 100644 --- a/pkgs/kde/gear/ktrip/default.nix +++ b/pkgs/kde/gear/ktrip/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ktrip"; meta.mainProgram = "ktrip"; diff --git a/pkgs/kde/gear/ktuberling/default.nix b/pkgs/kde/gear/ktuberling/default.nix index 100301670bf31..278f7f823d3d6 100644 --- a/pkgs/kde/gear/ktuberling/default.nix +++ b/pkgs/kde/gear/ktuberling/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "ktuberling"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; meta.mainProgram = "ktuberling"; } diff --git a/pkgs/kde/gear/kturtle/default.nix b/pkgs/kde/gear/kturtle/default.nix index 8997c051b189e..aa628c11219a7 100644 --- a/pkgs/kde/gear/kturtle/default.nix +++ b/pkgs/kde/gear/kturtle/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kturtle"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kturtle"; } diff --git a/pkgs/kde/gear/kubrick/default.nix b/pkgs/kde/gear/kubrick/default.nix index a194ebae5b682..27648efe830fa 100644 --- a/pkgs/kde/gear/kubrick/default.nix +++ b/pkgs/kde/gear/kubrick/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "kubrick"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg libGLU]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ + qtsvg + libGLU + ]; meta.mainProgram = "kubrick"; } diff --git a/pkgs/kde/gear/kwalletmanager/default.nix b/pkgs/kde/gear/kwalletmanager/default.nix index 4ce00339a2599..466d42129ef36 100644 --- a/pkgs/kde/gear/kwalletmanager/default.nix +++ b/pkgs/kde/gear/kwalletmanager/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwalletmanager"; meta.mainProgram = "kwalletmanager5"; diff --git a/pkgs/kde/gear/kwave/default.nix b/pkgs/kde/gear/kwave/default.nix index 1c0f82ac7b3df..0c0fa7aca5ace 100644 --- a/pkgs/kde/gear/kwave/default.nix +++ b/pkgs/kde/gear/kwave/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwave"; # FIXME(qt5) diff --git a/pkgs/kde/gear/kweather/default.nix b/pkgs/kde/gear/kweather/default.nix index 53e122c98fe6e..20d4c8a1e670b 100644 --- a/pkgs/kde/gear/kweather/default.nix +++ b/pkgs/kde/gear/kweather/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "kweather"; - extraBuildInputs = [qtsvg qtcharts kholidays]; + extraBuildInputs = [ + qtsvg + qtcharts + kholidays + ]; meta.mainProgram = "kweather"; } diff --git a/pkgs/kde/gear/libgravatar/default.nix b/pkgs/kde/gear/libgravatar/default.nix index ddbdfa6dc6c86..fe2fddb9f0185 100644 --- a/pkgs/kde/gear/libgravatar/default.nix +++ b/pkgs/kde/gear/libgravatar/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "libgravatar"; } diff --git a/pkgs/kde/gear/libkcddb/default.nix b/pkgs/kde/gear/libkcddb/default.nix index 8325f19cedff7..fea14f50c6e36 100644 --- a/pkgs/kde/gear/libkcddb/default.nix +++ b/pkgs/kde/gear/libkcddb/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkcddb"; - extraBuildInputs = [libmusicbrainz5]; + extraBuildInputs = [ libmusicbrainz5 ]; } diff --git a/pkgs/kde/gear/libkcompactdisc/default.nix b/pkgs/kde/gear/libkcompactdisc/default.nix index 66615d3791d60..bbe58fc00a417 100644 --- a/pkgs/kde/gear/libkcompactdisc/default.nix +++ b/pkgs/kde/gear/libkcompactdisc/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkcompactdisc"; - extraBuildInputs = [alsa-lib]; + extraBuildInputs = [ alsa-lib ]; } diff --git a/pkgs/kde/gear/libkdcraw/default.nix b/pkgs/kde/gear/libkdcraw/default.nix index df6717b22ded1..883d86f3b12f0 100644 --- a/pkgs/kde/gear/libkdcraw/default.nix +++ b/pkgs/kde/gear/libkdcraw/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "libkdcraw"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libraw]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ libraw ]; } diff --git a/pkgs/kde/gear/libkdegames/default.nix b/pkgs/kde/gear/libkdegames/default.nix index 95a0265f08362..81325c12837aa 100644 --- a/pkgs/kde/gear/libkdegames/default.nix +++ b/pkgs/kde/gear/libkdegames/default.nix @@ -10,6 +10,14 @@ mkKdeDerivation { pname = "libkdegames"; - extraNativeBuildInputs = [_7zz svgcleaner]; - extraBuildInputs = [openal libsndfile qtdeclarative qtsvg]; + extraNativeBuildInputs = [ + _7zz + svgcleaner + ]; + extraBuildInputs = [ + openal + libsndfile + qtdeclarative + qtsvg + ]; } diff --git a/pkgs/kde/gear/libkdepim/default.nix b/pkgs/kde/gear/libkdepim/default.nix index d682c45225eba..fc9d3f3d637ca 100644 --- a/pkgs/kde/gear/libkdepim/default.nix +++ b/pkgs/kde/gear/libkdepim/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkdepim"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/gear/libkeduvocdocument/default.nix b/pkgs/kde/gear/libkeduvocdocument/default.nix index f67c4e0ba4972..3a68dabf464b7 100644 --- a/pkgs/kde/gear/libkeduvocdocument/default.nix +++ b/pkgs/kde/gear/libkeduvocdocument/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "libkeduvocdocument"; } diff --git a/pkgs/kde/gear/libkexiv2/default.nix b/pkgs/kde/gear/libkexiv2/default.nix index fa5cb7851ea2a..c6d1d034e5da9 100644 --- a/pkgs/kde/gear/libkexiv2/default.nix +++ b/pkgs/kde/gear/libkexiv2/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "libkexiv2"; - extraBuildInputs = [qt5compat exiv2]; - extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [ + qt5compat + exiv2 + ]; + extraNativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/kde/gear/libkgapi/default.nix b/pkgs/kde/gear/libkgapi/default.nix index 87d3beb23c506..43322955a26a9 100644 --- a/pkgs/kde/gear/libkgapi/default.nix +++ b/pkgs/kde/gear/libkgapi/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "libkgapi"; - extraBuildInputs = [qttools cyrus_sasl]; + extraBuildInputs = [ + qttools + cyrus_sasl + ]; } diff --git a/pkgs/kde/gear/libkleo/default.nix b/pkgs/kde/gear/libkleo/default.nix index 47cd88fee5772..e6a01bfdc7d87 100644 --- a/pkgs/kde/gear/libkleo/default.nix +++ b/pkgs/kde/gear/libkleo/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "libkleo"; - extraBuildInputs = [qt5compat boost]; - extraPropagatedBuildInputs = [qgpgme]; + extraBuildInputs = [ + qt5compat + boost + ]; + extraPropagatedBuildInputs = [ qgpgme ]; } diff --git a/pkgs/kde/gear/libkmahjongg/default.nix b/pkgs/kde/gear/libkmahjongg/default.nix index f411605318a23..5a736622beedc 100644 --- a/pkgs/kde/gear/libkmahjongg/default.nix +++ b/pkgs/kde/gear/libkmahjongg/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "libkmahjongg"; - extraNativeBuildInputs = [_7zz svgcleaner]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ + _7zz + svgcleaner + ]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/gear/libkomparediff2/default.nix b/pkgs/kde/gear/libkomparediff2/default.nix index 43cccc19603fc..c7b15720d8370 100644 --- a/pkgs/kde/gear/libkomparediff2/default.nix +++ b/pkgs/kde/gear/libkomparediff2/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkomparediff2"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; } diff --git a/pkgs/kde/gear/libksane/default.nix b/pkgs/kde/gear/libksane/default.nix index 319d47b8b2d9f..a5a67b0123568 100644 --- a/pkgs/kde/gear/libksane/default.nix +++ b/pkgs/kde/gear/libksane/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "libksane"; } diff --git a/pkgs/kde/gear/libksieve/default.nix b/pkgs/kde/gear/libksieve/default.nix index cec2f027b73d0..e36d8995687ef 100644 --- a/pkgs/kde/gear/libksieve/default.nix +++ b/pkgs/kde/gear/libksieve/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "libksieve"; - extraBuildInputs = [qtwebengine cyrus_sasl]; + extraBuildInputs = [ + qtwebengine + cyrus_sasl + ]; } diff --git a/pkgs/kde/gear/libktorrent/default.nix b/pkgs/kde/gear/libktorrent/default.nix index 263cbb3cadb3c..c802f01111f91 100644 --- a/pkgs/kde/gear/libktorrent/default.nix +++ b/pkgs/kde/gear/libktorrent/default.nix @@ -9,7 +9,11 @@ mkKdeDerivation { pname = "libktorrent"; - extraNativeBuildInputs = [doxygen]; - extraBuildInputs = [qt5compat]; - extraPropagatedBuildInputs = [boost gmp libgcrypt]; + extraNativeBuildInputs = [ doxygen ]; + extraBuildInputs = [ qt5compat ]; + extraPropagatedBuildInputs = [ + boost + gmp + libgcrypt + ]; } diff --git a/pkgs/kde/gear/lokalize/default.nix b/pkgs/kde/gear/lokalize/default.nix index b92c8e9fb5e8e..28fd327349337 100644 --- a/pkgs/kde/gear/lokalize/default.nix +++ b/pkgs/kde/gear/lokalize/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "lokalize"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [hunspell]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ hunspell ]; } diff --git a/pkgs/kde/gear/lskat/default.nix b/pkgs/kde/gear/lskat/default.nix index eefb95f9e1b40..84b7c2715d8e0 100644 --- a/pkgs/kde/gear/lskat/default.nix +++ b/pkgs/kde/gear/lskat/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "lskat"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "lskat"; } diff --git a/pkgs/kde/gear/mailcommon/default.nix b/pkgs/kde/gear/mailcommon/default.nix index a82e6adb266c5..51a702ac9d9b8 100644 --- a/pkgs/kde/gear/mailcommon/default.nix +++ b/pkgs/kde/gear/mailcommon/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "mailcommon"; - extraNativeBuildInputs = [libxslt]; - extraBuildInputs = [qtwebengine qttools]; + extraNativeBuildInputs = [ libxslt ]; + extraBuildInputs = [ + qtwebengine + qttools + ]; } diff --git a/pkgs/kde/gear/mailimporter/default.nix b/pkgs/kde/gear/mailimporter/default.nix index d43e0a2288f9c..f9b3c490b9a1b 100644 --- a/pkgs/kde/gear/mailimporter/default.nix +++ b/pkgs/kde/gear/mailimporter/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "mailimporter"; } diff --git a/pkgs/kde/gear/marble/default.nix b/pkgs/kde/gear/marble/default.nix index 1f6e574ed312b..d2ecc7ae5093a 100644 --- a/pkgs/kde/gear/marble/default.nix +++ b/pkgs/kde/gear/marble/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "marble"; # FIXME(qt5) diff --git a/pkgs/kde/gear/markdownpart/default.nix b/pkgs/kde/gear/markdownpart/default.nix index e40b6d03f883c..962be3a91b5f3 100644 --- a/pkgs/kde/gear/markdownpart/default.nix +++ b/pkgs/kde/gear/markdownpart/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "markdownpart"; } diff --git a/pkgs/kde/gear/massif-visualizer/default.nix b/pkgs/kde/gear/massif-visualizer/default.nix index 27eb0515ee640..04b958217e74b 100644 --- a/pkgs/kde/gear/massif-visualizer/default.nix +++ b/pkgs/kde/gear/massif-visualizer/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "massif-visualizer"; - extraBuildInputs = [ qt5compat qtsvg ]; + extraBuildInputs = [ + qt5compat + qtsvg + ]; extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/pkgs/kde/gear/mbox-importer/default.nix b/pkgs/kde/gear/mbox-importer/default.nix index 44092f401a435..3e28187b3d209 100644 --- a/pkgs/kde/gear/mbox-importer/default.nix +++ b/pkgs/kde/gear/mbox-importer/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "mbox-importer"; meta.mainProgram = "mboximporter"; diff --git a/pkgs/kde/gear/merkuro/default.nix b/pkgs/kde/gear/merkuro/default.nix index 7ad2c3637f709..ec149aea4bf78 100644 --- a/pkgs/kde/gear/merkuro/default.nix +++ b/pkgs/kde/gear/merkuro/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "merkuro"; - extraBuildInputs = [qtsvg libplasma]; + extraBuildInputs = [ + qtsvg + libplasma + ]; } diff --git a/pkgs/kde/gear/messagelib/default.nix b/pkgs/kde/gear/messagelib/default.nix index 47058be348265..db8f4e04f0453 100644 --- a/pkgs/kde/gear/messagelib/default.nix +++ b/pkgs/kde/gear/messagelib/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "messagelib"; - extraPropagatedBuildInputs = [qtwebengine]; + extraPropagatedBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/gear/mimetreeparser/default.nix b/pkgs/kde/gear/mimetreeparser/default.nix index 3bebd8aee726d..67c271ad2612b 100644 --- a/pkgs/kde/gear/mimetreeparser/default.nix +++ b/pkgs/kde/gear/mimetreeparser/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "mimetreeparser"; - extraBuildInputs = [qt5compat qtdeclarative qgpgme]; + extraBuildInputs = [ + qt5compat + qtdeclarative + qgpgme + ]; } diff --git a/pkgs/kde/gear/minuet/default.nix b/pkgs/kde/gear/minuet/default.nix index 05e80a5901288..347d2cd7e9ee4 100644 --- a/pkgs/kde/gear/minuet/default.nix +++ b/pkgs/kde/gear/minuet/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "minuet"; - extraBuildInputs = [qtdeclarative qtsvg fluidsynth]; + extraBuildInputs = [ + qtdeclarative + qtsvg + fluidsynth + ]; meta.mainProgram = "minuet"; } diff --git a/pkgs/kde/gear/neochat/default.nix b/pkgs/kde/gear/neochat/default.nix index a45aa2c328fca..56c96f2245ffc 100644 --- a/pkgs/kde/gear/neochat/default.nix +++ b/pkgs/kde/gear/neochat/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "neochat"; - extraBuildInputs = [qtlocation qtwebview kunifiedpush]; + extraBuildInputs = [ + qtlocation + qtwebview + kunifiedpush + ]; meta.mainProgram = "neochat"; } diff --git a/pkgs/kde/gear/okular/default.nix b/pkgs/kde/gear/okular/default.nix index e500709a28b85..b6048d9611d4e 100644 --- a/pkgs/kde/gear/okular/default.nix +++ b/pkgs/kde/gear/okular/default.nix @@ -14,7 +14,7 @@ mkKdeDerivation { pname = "okular"; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtspeech qtsvg diff --git a/pkgs/kde/gear/palapeli/default.nix b/pkgs/kde/gear/palapeli/default.nix index 144ef589e51cb..f6a96aed4f55f 100644 --- a/pkgs/kde/gear/palapeli/default.nix +++ b/pkgs/kde/gear/palapeli/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "palapeli"; - extraNativeBuildInputs = [shared-mime-info]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "palapeli"; } diff --git a/pkgs/kde/gear/parley/default.nix b/pkgs/kde/gear/parley/default.nix index 35342dd958cbe..e2a275c4c02c0 100644 --- a/pkgs/kde/gear/parley/default.nix +++ b/pkgs/kde/gear/parley/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "parley"; - extraBuildInputs = [qtsvg qtmultimedia qtwebengine]; + extraBuildInputs = [ + qtsvg + qtmultimedia + qtwebengine + ]; meta.mainProgram = "parley"; } diff --git a/pkgs/kde/gear/partitionmanager/default.nix b/pkgs/kde/gear/partitionmanager/default.nix index 68cb09a01a5ae..9f36e91df58c8 100644 --- a/pkgs/kde/gear/partitionmanager/default.nix +++ b/pkgs/kde/gear/partitionmanager/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "partitionmanager"; - propagatedUserEnvPkgs = [kpmcore]; + propagatedUserEnvPkgs = [ kpmcore ]; passthru = { inherit kpmcore; diff --git a/pkgs/kde/gear/picmi/default.nix b/pkgs/kde/gear/picmi/default.nix index 341cd3922aff5..aa7bf73fe97a3 100644 --- a/pkgs/kde/gear/picmi/default.nix +++ b/pkgs/kde/gear/picmi/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "picmi"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "picmi"; } diff --git a/pkgs/kde/gear/pim-data-exporter/default.nix b/pkgs/kde/gear/pim-data-exporter/default.nix index da2097f46763e..162a2524f8286 100644 --- a/pkgs/kde/gear/pim-data-exporter/default.nix +++ b/pkgs/kde/gear/pim-data-exporter/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "pim-data-exporter"; } diff --git a/pkgs/kde/gear/pim-sieve-editor/default.nix b/pkgs/kde/gear/pim-sieve-editor/default.nix index 5cc193d0d7ee9..323ec35e768ba 100644 --- a/pkgs/kde/gear/pim-sieve-editor/default.nix +++ b/pkgs/kde/gear/pim-sieve-editor/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "pim-sieve-editor"; meta.mainProgram = "sieveeditor"; diff --git a/pkgs/kde/gear/pimcommon/default.nix b/pkgs/kde/gear/pimcommon/default.nix index 9ef947dde6fed..853c6e0afba6a 100644 --- a/pkgs/kde/gear/pimcommon/default.nix +++ b/pkgs/kde/gear/pimcommon/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "pimcommon"; - extraBuildInputs = [qttools]; - extraNativeBuildInputs = [libxslt]; + extraBuildInputs = [ qttools ]; + extraNativeBuildInputs = [ libxslt ]; } diff --git a/pkgs/kde/gear/plasmatube/default.nix b/pkgs/kde/gear/plasmatube/default.nix index 63236fe00d76f..46b32c5790403 100644 --- a/pkgs/kde/gear/plasmatube/default.nix +++ b/pkgs/kde/gear/plasmatube/default.nix @@ -10,9 +10,18 @@ mkKdeDerivation { pname = "plasmatube"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtquick3d qtsvg mpv-unwrapped]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtquick3d + qtsvg + mpv-unwrapped + ]; - qtWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ yt-dlp ])]; + qtWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ yt-dlp ]) + ]; meta.mainProgram = "plasmatube"; } diff --git a/pkgs/kde/gear/poxml/default.nix b/pkgs/kde/gear/poxml/default.nix index 963f0502964a8..508d311dbc4a6 100644 --- a/pkgs/kde/gear/poxml/default.nix +++ b/pkgs/kde/gear/poxml/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "poxml"; } diff --git a/pkgs/kde/gear/qmlkonsole/default.nix b/pkgs/kde/gear/qmlkonsole/default.nix index 9be6552020f64..470752ffd7952 100644 --- a/pkgs/kde/gear/qmlkonsole/default.nix +++ b/pkgs/kde/gear/qmlkonsole/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "qmlkonsole"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "qmlkonsole"; } diff --git a/pkgs/kde/gear/rocs/default.nix b/pkgs/kde/gear/rocs/default.nix index 73e7143f8df00..0e368461a770f 100644 --- a/pkgs/kde/gear/rocs/default.nix +++ b/pkgs/kde/gear/rocs/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "rocs"; - extraBuildInputs = [boost]; + extraBuildInputs = [ boost ]; # FIXME(qt5) meta.broken = true; } diff --git a/pkgs/kde/gear/signon-kwallet-extension/default.nix b/pkgs/kde/gear/signon-kwallet-extension/default.nix index 15900552d50f7..ec954b9873287 100644 --- a/pkgs/kde/gear/signon-kwallet-extension/default.nix +++ b/pkgs/kde/gear/signon-kwallet-extension/default.nix @@ -6,11 +6,11 @@ mkKdeDerivation { pname = "signon-kwallet-extension"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [signond]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ signond ]; # NB: not actually broken, just makes it install to $out instead of $signon/lib/extensions # This is useless without a wrapped signond. # FIXME: wrap signond with SSO_EXTENSIONS_DIR=$wrapper/lib/extensions - extraCmakeFlags = ["-DINSTALL_BROKEN_SIGNON_EXTENSION=1"]; + extraCmakeFlags = [ "-DINSTALL_BROKEN_SIGNON_EXTENSION=1" ]; } diff --git a/pkgs/kde/gear/skanlite/default.nix b/pkgs/kde/gear/skanlite/default.nix index 4a9c26e41588f..20fff8d8c1df7 100644 --- a/pkgs/kde/gear/skanlite/default.nix +++ b/pkgs/kde/gear/skanlite/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "skanlite"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; meta.mainProgram = "skanlite"; } diff --git a/pkgs/kde/gear/skanpage/default.nix b/pkgs/kde/gear/skanpage/default.nix index c855041220c9a..4c9e104220984 100644 --- a/pkgs/kde/gear/skanpage/default.nix +++ b/pkgs/kde/gear/skanpage/default.nix @@ -1,7 +1,7 @@ { mkKdeDerivation, qtwebengine, - tesseractLanguages ? [], + tesseractLanguages ? [ ], tesseract5, leptonica, }: @@ -10,7 +10,7 @@ mkKdeDerivation { extraBuildInputs = [ qtwebengine - (tesseract5.override {enableLanguages = tesseractLanguages;}) + (tesseract5.override { enableLanguages = tesseractLanguages; }) leptonica ]; meta.mainProgram = "skanpage"; diff --git a/pkgs/kde/gear/skladnik/default.nix b/pkgs/kde/gear/skladnik/default.nix index ae4dd03f3e3c3..6c574514dbb7c 100644 --- a/pkgs/kde/gear/skladnik/default.nix +++ b/pkgs/kde/gear/skladnik/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "skladnik"; } diff --git a/pkgs/kde/gear/spectacle/default.nix b/pkgs/kde/gear/spectacle/default.nix index dba026d22f248..c5c71a1beaa2f 100644 --- a/pkgs/kde/gear/spectacle/default.nix +++ b/pkgs/kde/gear/spectacle/default.nix @@ -11,9 +11,12 @@ mkKdeDerivation { qtwayland qtmultimedia (opencv.override { - enableCuda = false; # fails to compile, disabled in case someone sets config.cudaSupport - enabledModules = [ "core" "imgproc" ]; # https://invent.kde.org/graphics/spectacle/-/blob/master/CMakeLists.txt?ref_type=heads#L83 - runAccuracyTests = false; # tests will fail because of missing plugins but that's okay + enableCuda = false; # fails to compile, disabled in case someone sets config.cudaSupport + enabledModules = [ + "core" + "imgproc" + ]; # https://invent.kde.org/graphics/spectacle/-/blob/master/CMakeLists.txt?ref_type=heads#L83 + runAccuracyTests = false; # tests will fail because of missing plugins but that's okay }) ]; meta.mainProgram = "spectacle"; diff --git a/pkgs/kde/gear/step/default.nix b/pkgs/kde/gear/step/default.nix index f921df1991282..983755d211390 100644 --- a/pkgs/kde/gear/step/default.nix +++ b/pkgs/kde/gear/step/default.nix @@ -11,7 +11,16 @@ mkKdeDerivation { pname = "step"; - extraNativeBuildInputs = [qttools qtsvg pkg-config shared-mime-info]; - extraBuildInputs = [eigen gsl libqalculate]; + extraNativeBuildInputs = [ + qttools + qtsvg + pkg-config + shared-mime-info + ]; + extraBuildInputs = [ + eigen + gsl + libqalculate + ]; meta.mainProgram = "step"; } diff --git a/pkgs/kde/gear/svgpart/default.nix b/pkgs/kde/gear/svgpart/default.nix index 44f25d0312b15..b79a9053a065c 100644 --- a/pkgs/kde/gear/svgpart/default.nix +++ b/pkgs/kde/gear/svgpart/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "svgpart"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/gear/sweeper/default.nix b/pkgs/kde/gear/sweeper/default.nix index 24e75b7c5301e..99aad7379dd8f 100644 --- a/pkgs/kde/gear/sweeper/default.nix +++ b/pkgs/kde/gear/sweeper/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "sweeper"; diff --git a/pkgs/kde/gear/telly-skout/default.nix b/pkgs/kde/gear/telly-skout/default.nix index 9bcae06c90490..d179f8d5be863 100644 --- a/pkgs/kde/gear/telly-skout/default.nix +++ b/pkgs/kde/gear/telly-skout/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "telly-skout"; meta.mainProgram = "telly-skout"; diff --git a/pkgs/kde/gear/tokodon/default.nix b/pkgs/kde/gear/tokodon/default.nix index fd47144eda1d1..47411b5e37c26 100644 --- a/pkgs/kde/gear/tokodon/default.nix +++ b/pkgs/kde/gear/tokodon/default.nix @@ -11,7 +11,14 @@ mkKdeDerivation { pname = "tokodon"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtmultimedia qtsvg qtwebsockets qtwebview mpv-unwrapped sonnet]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtmultimedia + qtsvg + qtwebsockets + qtwebview + mpv-unwrapped + sonnet + ]; meta.mainProgram = "tokodon"; } diff --git a/pkgs/kde/gear/umbrello/default.nix b/pkgs/kde/gear/umbrello/default.nix index 6aca83a9e825c..836ae577c7f46 100644 --- a/pkgs/kde/gear/umbrello/default.nix +++ b/pkgs/kde/gear/umbrello/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "umbrello"; # FIXME(qt5) diff --git a/pkgs/kde/gear/yakuake/default.nix b/pkgs/kde/gear/yakuake/default.nix index a5955e5c2e18d..fb7fc1ecf007c 100644 --- a/pkgs/kde/gear/yakuake/default.nix +++ b/pkgs/kde/gear/yakuake/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "yakuake"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "yakuake"; } diff --git a/pkgs/kde/gear/zanshin/default.nix b/pkgs/kde/gear/zanshin/default.nix index 357b6963ff09f..2b814696444d5 100644 --- a/pkgs/kde/gear/zanshin/default.nix +++ b/pkgs/kde/gear/zanshin/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "zanshin"; - extraBuildInputs = [boost]; + extraBuildInputs = [ boost ]; } diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index a75d47e25640f..dc6ee319c2438 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/attica-6.5.0.tar.xz", - "hash": "sha256-bOgGGNxSp6LEikJWFxYexGtxJtBeyyMHbmVf3h1gEOY=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/attica-6.6.0.tar.xz", + "hash": "sha256-4jcOfwoORyEYDDZDQvR7yXTPO0XEXHzp5wxdm6UjC+M=" }, "baloo": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/baloo-6.5.0.tar.xz", - "hash": "sha256-2ARstuffHVuDEK7U5Nxx7IN5tgJ0S5DQj6nxS9pHpq8=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/baloo-6.6.0.tar.xz", + "hash": "sha256-ewl1JtHIyQzbgSapQf9OFZ+AD8//b4EmaDc9e5tbtxk=" }, "bluez-qt": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/bluez-qt-6.5.0.tar.xz", - "hash": "sha256-8CNHZvwa+UEHCNCIbu8wQXWwmluZxIwOuHeoD+xqpl4=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/bluez-qt-6.6.0.tar.xz", + "hash": "sha256-GiqAW6EmOcF4TS9Un16Y8hD8jRh4xcp3CTbqyCfI6wA=" }, "breeze-icons": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/breeze-icons-6.5.0.tar.xz", - "hash": "sha256-ym6PrvhIkXUOvCQNC5n0JBTl9kNnjVsa6UvLrVUasMQ=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/breeze-icons-6.6.0.tar.xz", + "hash": "sha256-LYzMQn7IZLZBfqvjqv6bH2hXvypP3NDcXABkExSOZtk=" }, "extra-cmake-modules": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/extra-cmake-modules-6.5.0.tar.xz", - "hash": "sha256-jzwsoeUCmQYp87aFBxifwPkS88qyebUA2ske5wMaSc8=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/extra-cmake-modules-6.6.0.tar.xz", + "hash": "sha256-IG4j4Fuok0rHonXI/dNwQWX1WIeNPb4ymfmRRzmXzLg=" }, "frameworkintegration": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/frameworkintegration-6.5.0.tar.xz", - "hash": "sha256-xXtVdC5gLSyFyQAhWOiP4HfToWTGjtUMd2cqdOEaDfQ=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/frameworkintegration-6.6.0.tar.xz", + "hash": "sha256-6llMOVegn9y4VxHUvf9tkjwOPrjsSW5WhlhfxWcj06A=" }, "kapidox": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kapidox-6.5.0.tar.xz", - "hash": "sha256-8lQvIiEUdJh5mJActIrSIC7lFWzzmYBYhOFEnZhgo6E=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kapidox-6.6.0.tar.xz", + "hash": "sha256-55ydq7bbMXCDid1HqL3UjRamCgLlyytV80fQOm/H4rc=" }, "karchive": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/karchive-6.5.0.tar.xz", - "hash": "sha256-5VMCU8cN4CSSbhmFFU+RFfAq9Qx9mYqHSjF1tARETnk=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/karchive-6.6.0.tar.xz", + "hash": "sha256-UenSHLh+IkG8pqaeFJZmHQXQClgRB7/PmFmqnnCsrBs=" }, "kauth": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kauth-6.5.0.tar.xz", - "hash": "sha256-GvUXpQnaHF3bRCDXQwiUt1FWLgfMTBNKvg3LYGNY05Q=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kauth-6.6.0.tar.xz", + "hash": "sha256-BPteP/Zy8x9sPy5ApZ2cdEelJRuZ2+X16mf1SkyYHzo=" }, "kbookmarks": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kbookmarks-6.5.0.tar.xz", - "hash": "sha256-l9q86uWw6sEQfEnFDR19mn0muSRsmrU9EjmQUlxV++w=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kbookmarks-6.6.0.tar.xz", + "hash": "sha256-MtC0ynRtsrK9Kk5SgvSsq6CEucoQRJWitFC5riRWt9c=" }, "kcalendarcore": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kcalendarcore-6.5.0.tar.xz", - "hash": "sha256-baWZ9e0V9s5UwvkoAm7i9k7dL+DVIDtPULv4mosh9SI=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kcalendarcore-6.6.0.tar.xz", + "hash": "sha256-GrY5BBH4aB4FWcx7PC87Q4TWB6QIaBB3U1/5k2BjYvg=" }, "kcmutils": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kcmutils-6.5.0.tar.xz", - "hash": "sha256-64R07FrmIONh5u+XHj7BSsaAe+LfjgLSfn2K6brcqZM=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kcmutils-6.6.0.tar.xz", + "hash": "sha256-jxufJs57BVzsRqlSHqt1+RCunDlaraiNbYLPOVRZsnA=" }, "kcodecs": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kcodecs-6.5.0.tar.xz", - "hash": "sha256-6Wwi9UcOOVkazbsB6FID5dLxecgLGMKlmRln4Wr5Hgg=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kcodecs-6.6.0.tar.xz", + "hash": "sha256-2dwuMpSqMmhJkL3gG7iN7bJhCijXwdYqF4o5P6VmEjs=" }, "kcolorscheme": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kcolorscheme-6.5.0.tar.xz", - "hash": "sha256-MjtV3TfcQIzMFY3yzlyKRrYo+TVdKneRbkVlr86QtCs=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kcolorscheme-6.6.0.tar.xz", + "hash": "sha256-ZXg54f+BQf8JcFvpEuJ2otyY3xIvW8wv3D7RHRAQDNE=" }, "kcompletion": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kcompletion-6.5.0.tar.xz", - "hash": "sha256-d4r4DlAV9Jzh4d3mGAv1EWeh9d+xLQfHMha1+oBO7fk=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kcompletion-6.6.0.tar.xz", + "hash": "sha256-uAZZsx+tQ30Z7JSGQF1J+NsM6nCWKeO0/w6ykszxC0M=" }, "kconfig": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kconfig-6.5.0.tar.xz", - "hash": "sha256-5I5TFdNJHd+4eKvxJKbhSIamMXhX+mP0EezXINqKXRM=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kconfig-6.6.0.tar.xz", + "hash": "sha256-BwvQGbB+FSAeTHBytxM3x19pF0B0BqGnEH/KG/8oVf4=" }, "kconfigwidgets": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kconfigwidgets-6.5.0.tar.xz", - "hash": "sha256-pIBGg/wEd/tQXEEERBZL8oA//CFtIhYJoL5YQoA+VhI=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kconfigwidgets-6.6.0.tar.xz", + "hash": "sha256-g7FBhnYJqOY+PL6HTlGfLT2KU/99zpWLgVfGl9XMWHI=" }, "kcontacts": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kcontacts-6.5.0.tar.xz", - "hash": "sha256-txHgmEaaWCEES/mb100KFrgEcxo0fPU2CaS9G1+l/cQ=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kcontacts-6.6.0.tar.xz", + "hash": "sha256-mfBSfUm8az+9yRxLfttnyGk256TIzYgb2dou7fVmbWw=" }, "kcoreaddons": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kcoreaddons-6.5.0.tar.xz", - "hash": "sha256-Xg4dKdzU4E50WE3xV3066f+9R8zbhO5WItHtI3Pl75g=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kcoreaddons-6.6.0.tar.xz", + "hash": "sha256-Wrqav5NOLa9fcIN8usCIYH/ovVBeFyxK9s2qzdolxQs=" }, "kcrash": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kcrash-6.5.0.tar.xz", - "hash": "sha256-hwxs4VEyzDBAvFk0RxJe08JWtpi6Izt1hDD05yUxm/M=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kcrash-6.6.0.tar.xz", + "hash": "sha256-+0rK9nCo4fYberIfzGzxMg0vZkWgNyqUYjxg33sImN4=" }, "kdav": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kdav-6.5.0.tar.xz", - "hash": "sha256-kA+7i2MtlGzTXoJuZPUFBzRhUfG1+0ATeJCrwolu788=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kdav-6.6.0.tar.xz", + "hash": "sha256-gl7Z3l/JTiKPzNSvSM98EBwLvje79jhc+Bggu+r3eOc=" }, "kdbusaddons": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kdbusaddons-6.5.0.tar.xz", - "hash": "sha256-r6z5/116LdKUUgcYUI0z6t8/Y6lXCR0wpopFqx7wqP4=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kdbusaddons-6.6.0.tar.xz", + "hash": "sha256-UhMV+A0x4ttOQ0Tr8kNqIudUdbcO2r6BV/SvtKLLQq0=" }, "kdeclarative": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kdeclarative-6.5.0.tar.xz", - "hash": "sha256-s8QVLJcuPVNkXxyIdXp4zltm+/Tst25Nad940qs4z4M=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kdeclarative-6.6.0.tar.xz", + "hash": "sha256-OooyFeWlrpoufmexeo/qtkEdcp3wNnEC4JTI16X/WLY=" }, "kded": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kded-6.5.0.tar.xz", - "hash": "sha256-KSypQazGnEQ/R4lep4RJOwj9Vzr+D06Z9fQrigKZVLA=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kded-6.6.0.tar.xz", + "hash": "sha256-zJY5dfgN4ZBuizmXBXmvIRE4xYKxYw2vKAuimbLT+f4=" }, "kdesu": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kdesu-6.5.0.tar.xz", - "hash": "sha256-A8CNC7z3HvEi6+PJexCQkq2ehxnSDTQdhRBge9qas5M=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kdesu-6.6.0.tar.xz", + "hash": "sha256-1awSfjshjaenhfpgZJCwUsCdSBvP8CJ7RdQu8OPzSl8=" }, "kdnssd": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kdnssd-6.5.0.tar.xz", - "hash": "sha256-N/0lTDm2b8obUviYwEXzIqDqMXfJJ5QZecy3ubmOv/0=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kdnssd-6.6.0.tar.xz", + "hash": "sha256-N0PqPxVjWNaUXfaeZ8mMafQ4QTYgxqxyhtBCc0IVf8c=" }, "kdoctools": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kdoctools-6.5.0.tar.xz", - "hash": "sha256-eB4a4iLuHlTMYxBBLDcJ4MM+HE/4JHDSlg1uXapgAd0=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kdoctools-6.6.0.tar.xz", + "hash": "sha256-FJ4LRCKQ+LydKgyZyOJ6VzWjqDhwqC3gB+SHUp8KrUQ=" }, "kfilemetadata": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kfilemetadata-6.5.0.tar.xz", - "hash": "sha256-V0QZgj1/44nfxrwUGwqRUf2tpnFbmFyCaSk8DAT9wPQ=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kfilemetadata-6.6.0.tar.xz", + "hash": "sha256-IYzLySbh4mdl9yE7iqzn69qnhUZO+tK7YPjmSDYs/qA=" }, "kglobalaccel": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kglobalaccel-6.5.0.tar.xz", - "hash": "sha256-iDoc9I/EuM4iq58UO2vdVGrDD74pyQ1ANfsq3zijOaQ=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kglobalaccel-6.6.0.tar.xz", + "hash": "sha256-SSlepeSgGCIqm0g+fA+458+0t2GpKSCx4TRU/Y+F/oE=" }, "kguiaddons": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kguiaddons-6.5.0.tar.xz", - "hash": "sha256-cZP6kwuF+m5/2jqF8eUvNi7NPhEOgAVdkITur66sSAc=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kguiaddons-6.6.0.tar.xz", + "hash": "sha256-vKo25MBGpK2tvmu7hkkWnBsblqtolT4+oZV9e4fBgzE=" }, "kholidays": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kholidays-6.5.0.tar.xz", - "hash": "sha256-hKAwhf+vqwbNKKMhVLD+RpT1izfSHxRogYtf7CxkPco=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kholidays-6.6.0.tar.xz", + "hash": "sha256-cSsr4xiZcCK+KDdBlaSejHyioTApWqtqznuI1+wPKw8=" }, "ki18n": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/ki18n-6.5.0.tar.xz", - "hash": "sha256-eHPTaorkUnRdWBAOfNoGfq5jLHh8H8WjxjpwcqrPp/w=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/ki18n-6.6.0.tar.xz", + "hash": "sha256-WCtMWLtpgDQSMi09tlb9T1/eFU6sGsibLGvJBcW2Hm4=" }, "kiconthemes": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kiconthemes-6.5.0.tar.xz", - "hash": "sha256-zcTFeI4LP4jyWqR01R1DSW5MdCd3+IAl7y+mBvJyEzE=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kiconthemes-6.6.0.tar.xz", + "hash": "sha256-LQCxeSnYhkJTlelsTBi/Xo378/HKwtrBmabyrFrzWyI=" }, "kidletime": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kidletime-6.5.0.tar.xz", - "hash": "sha256-ttx9bq22QiSAAPFlFVpy0t+rbBqT4BMPj4M5SnYo6vY=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kidletime-6.6.0.tar.xz", + "hash": "sha256-gkgKbwYDnCt+BKdcafEVGxeE7ce80nCXrGJksaoV9Cc=" }, "kimageformats": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kimageformats-6.5.0.tar.xz", - "hash": "sha256-xkq3NkdyZPigzkQY8L5imtDxegeBYbJ3NwDTuWynUCI=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kimageformats-6.6.0.tar.xz", + "hash": "sha256-G0zaFPlgiPjeGQyb5/vjUKgKVcPuKo/5ENoNmZLE3a8=" }, "kio": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kio-6.5.0.tar.xz", - "hash": "sha256-nIv4NTRXejItRjPSQdl3C8i6ikViTi8EHhuNvbwZihM=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kio-6.6.0.tar.xz", + "hash": "sha256-l3+fB26vJJ7N2WFyQzQybD86Hn2M/MbKE3DzkMdqJ2Y=" }, "kirigami": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kirigami-6.5.0.tar.xz", - "hash": "sha256-Q6c7Fh4chdo+rcY+fMbBs8aGqlaVGw0OLfSizBM0dZw=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kirigami-6.6.0.tar.xz", + "hash": "sha256-mAnM5wPfqK/ixk4Zb5DANYUOLkMqm9kM4ypAhlNop/4=" }, "kitemmodels": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kitemmodels-6.5.0.tar.xz", - "hash": "sha256-NuwEs/0lJJoc6c/QiCTywuQO9NVCJOEY4G+iHF+aT3Y=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kitemmodels-6.6.0.tar.xz", + "hash": "sha256-/gZ3vW6vK8zTUOe4DuusOCkI/COIr2cWFxrXdBfueAI=" }, "kitemviews": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kitemviews-6.5.0.tar.xz", - "hash": "sha256-B/OziAWXmVqbvDybxH26K82STsUDtCPthWbn6AXLtpw=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kitemviews-6.6.0.tar.xz", + "hash": "sha256-p6QwwMN7Z4F3SrfuCEX5vgkBQkpe1R0V5bWzUNDL7m4=" }, "kjobwidgets": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kjobwidgets-6.5.0.tar.xz", - "hash": "sha256-Z8XasRka5oMNRSdRdn6UmRs0/q9CKPGKsELCwSCRCtg=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kjobwidgets-6.6.0.tar.xz", + "hash": "sha256-PI7M2J1BGLbs1hkQb5OpsVbfWJlGW4INS2XZaYE9tRU=" }, "knewstuff": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/knewstuff-6.5.0.tar.xz", - "hash": "sha256-gVWJpmC5pTofwYJouVkUY2EktvPzGTyUBOCVn4tzjHk=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/knewstuff-6.6.0.tar.xz", + "hash": "sha256-P5J1ZLRUwfwa7sBRdLj552MDtNmkWXnXayGIolvUcCU=" }, "knotifications": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/knotifications-6.5.0.tar.xz", - "hash": "sha256-PXPcaCF2E4y6mVtpVO6v3UUHCXMT8bIQKk1e2QWj7uY=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/knotifications-6.6.0.tar.xz", + "hash": "sha256-KBU9zjjrSI0iiUKi7Rl+V3ORB9sQAkSK1WvdW+EL9g0=" }, "knotifyconfig": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/knotifyconfig-6.5.0.tar.xz", - "hash": "sha256-+yrWv/tU5qBfq03IcYl76roDpG1C+ikLVu4fy7LuBZQ=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/knotifyconfig-6.6.0.tar.xz", + "hash": "sha256-4DL8jr03XNQG3+8wOOvUnXwdHefHm3ytTMzwAoUAbx8=" }, "kpackage": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kpackage-6.5.0.tar.xz", - "hash": "sha256-zzRSwXGREgR/mjvQCrLh5ZuntrT+YgpDU4hTCFCNt3M=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kpackage-6.6.0.tar.xz", + "hash": "sha256-EtdyQVhtwSuqOqLGW86+oxYEIWuRt22aqqvzcGc+ntI=" }, "kparts": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kparts-6.5.0.tar.xz", - "hash": "sha256-TrVBeyZ/d8FshUgvkZrftbdxSpUjl3HEqvv+uQ5KNx8=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kparts-6.6.0.tar.xz", + "hash": "sha256-1JTe92o6TC4ovJ1PiJ1tTZtkRRX/+2EWn0Kc57m7Isc=" }, "kpeople": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kpeople-6.5.0.tar.xz", - "hash": "sha256-ECzXrTJgsNEL0uwDMMg5gm6jJMXNhlgBY9g2TTNwpsI=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kpeople-6.6.0.tar.xz", + "hash": "sha256-oPEAoyUZCFnHdU9qlMONB85g+J8w4NWN35lkHx8W4rA=" }, "kplotting": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kplotting-6.5.0.tar.xz", - "hash": "sha256-AhaXxNQgAvrUnbDSg1UqK0DoH5aHY9h7OtR+w/WA2UM=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kplotting-6.6.0.tar.xz", + "hash": "sha256-knXdmc7bT9U6AJReRO1pS1onraQWBLKlSyvMW04qP3k=" }, "kpty": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kpty-6.5.0.tar.xz", - "hash": "sha256-3JNlukqDuUioMm8vddRtTeqDJ7wGte4hkDBsv4/fUkE=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kpty-6.6.0.tar.xz", + "hash": "sha256-Y6HeuVKEyP8vt3QEqBGD3XfZZFjQURC0aHQrOg91XmE=" }, "kquickcharts": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kquickcharts-6.5.0.tar.xz", - "hash": "sha256-xamlzCBv3SqGhUKEsIGxZXX2OLuyi2WAZWd7RH2MkAI=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kquickcharts-6.6.0.tar.xz", + "hash": "sha256-2EQQCNYldjv3sgqLFoXQnNaUFsbORgN0PpPBb8U5ekc=" }, "krunner": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/krunner-6.5.0.tar.xz", - "hash": "sha256-VnSv7yP+Z0eqqLBsQFpTpOQPd7okU10ggNUSYCsDYDA=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/krunner-6.6.0.tar.xz", + "hash": "sha256-F9QgG+fOcSBx0p6VKP6v3CviA5GDShEMNYTMFCyfSxE=" }, "kservice": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kservice-6.5.0.tar.xz", - "hash": "sha256-SM3SBLyfuSgsN7a8wjZPfbwSQFdUfdtrFHGYi0ZM+L0=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kservice-6.6.0.tar.xz", + "hash": "sha256-ug1jI+/srwVWVbttndBy5/iJ0jlpyk/FVWW9qJmRAfQ=" }, "kstatusnotifieritem": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kstatusnotifieritem-6.5.0.tar.xz", - "hash": "sha256-Xe9eGoYthdDzJcTxlzlnvPj6lzU/4dNhocr7BnAZhAM=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kstatusnotifieritem-6.6.0.tar.xz", + "hash": "sha256-8lIr0d4LAhYPeKrgFQxIqe0pkYaIT7mdCm+4BUnkCd0=" }, "ksvg": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/ksvg-6.5.0.tar.xz", - "hash": "sha256-riAkvU1+aVDJK1kk3s7V1VthAXSdY1eZsk/trGDLJs0=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/ksvg-6.6.0.tar.xz", + "hash": "sha256-/VdIZraHmAns/ST52Sx85RqtuRUn5R0ffGfeyGR9isY=" }, "ktexteditor": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/ktexteditor-6.5.0.tar.xz", - "hash": "sha256-m7uIdaaMa2J/OZnC2rL5H+FVcOKkPDsqqRSeW5jbuME=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/ktexteditor-6.6.0.tar.xz", + "hash": "sha256-mZGnj9XPaSlk2EIQuupHLs5WQ02ST55nVhuFf4tIx3c=" }, "ktexttemplate": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/ktexttemplate-6.5.0.tar.xz", - "hash": "sha256-KVo/h/8Irxf4NJb9ZrP2NJF7ysZGbHm+H0y2eG7LBMY=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/ktexttemplate-6.6.0.tar.xz", + "hash": "sha256-I2EadyTZzLU0y6ItyIiFdIzy7JA309zK1cxUo9S9uVQ=" }, "ktextwidgets": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/ktextwidgets-6.5.0.tar.xz", - "hash": "sha256-qZ3xxjSDHp0B9wQAnJUTeBCDNKQlitW2T2D1XlV3AhI=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/ktextwidgets-6.6.0.tar.xz", + "hash": "sha256-gF3/Mgt1piMW/lCqM+7bNVweLbNtALWMOfw2zmv9iYg=" }, "kunitconversion": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kunitconversion-6.5.0.tar.xz", - "hash": "sha256-x9UhQjx0Q9MFgD4vYG6N/1j6nhx8c7Cbzo3Thi6ZL+Q=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kunitconversion-6.6.0.tar.xz", + "hash": "sha256-qHTwk6PmTwjR034RQuF9eKESthPs5c+h90fdHSZ4n5E=" }, "kuserfeedback": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kuserfeedback-6.5.0.tar.xz", - "hash": "sha256-M0jS8puS5lUkm3UP13+1a8RRG6O6dDmb0/skQIIaKSo=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kuserfeedback-6.6.0.tar.xz", + "hash": "sha256-O7QiUWee3WQ8zcy8m6vK55C51Rud+u9t7ZtKw0rS31U=" }, "kwallet": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kwallet-6.5.0.tar.xz", - "hash": "sha256-nrnvUKEDGa/fjdurBrt2wF9D2NQJVIPy2O/tdS1dgVo=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kwallet-6.6.0.tar.xz", + "hash": "sha256-sxnMTPecwXluckb2G7xWu6Bwql7JlLMOEbH6poXOfVQ=" }, "kwidgetsaddons": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kwidgetsaddons-6.5.0.tar.xz", - "hash": "sha256-zzq8xAphkYPH1GJdyWGgtlrlk8bEGv4KqkUOkLXQ/gk=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kwidgetsaddons-6.6.0.tar.xz", + "hash": "sha256-E3zFSdYvm8mhR9goHWFvRBX8WsNUHUjmbFy3mOcRH8M=" }, "kwindowsystem": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kwindowsystem-6.5.0.tar.xz", - "hash": "sha256-yq6G4WvybpGnIv3461iIIk98ds6HB0PaSlm8cA2HO8Y=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kwindowsystem-6.6.0.tar.xz", + "hash": "sha256-LHcevxopd3QwXfz3lCPbBoTaBmLqy5nldAsA8//jMuU=" }, "kxmlgui": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/kxmlgui-6.5.0.tar.xz", - "hash": "sha256-dVSd1Urns+C/AcbYLr4tzHlxla3iI7aYbd6daIxc2QM=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/kxmlgui-6.6.0.tar.xz", + "hash": "sha256-ZH/HUQ0zud6Rlv0sj29qEU3RhVnuIaq3z0f2h7iuBFI=" }, "modemmanager-qt": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/modemmanager-qt-6.5.0.tar.xz", - "hash": "sha256-dsKxjJxcXZw2AoKgMf6q6WYCkyLxneBQ2R05IHzVcXs=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/modemmanager-qt-6.6.0.tar.xz", + "hash": "sha256-6M/4coyD42OKqF0vg3ynXhxQMlYy9LZOXkGF0M1rBxs=" }, "networkmanager-qt": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/networkmanager-qt-6.5.0.tar.xz", - "hash": "sha256-ql8rMsgXjuic86THWwn5nvgb4y/22ZpCWu4XTFAwG2w=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/networkmanager-qt-6.6.0.tar.xz", + "hash": "sha256-Bjktcebgl1jLG0M9Ox3GZ8tZ3XqWs1EPIytcrf8zLkA=" }, "prison": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/prison-6.5.0.tar.xz", - "hash": "sha256-u8F9zPtxmIr0HnARC2Y1Mj4X2O1IwI9zgI+fIg+wZ7o=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/prison-6.6.0.tar.xz", + "hash": "sha256-2LrzMlLPK7Qx+ASMRZoKDEtyzmp8L15zJa0t98p0ulw=" }, "purpose": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/purpose-6.5.0.tar.xz", - "hash": "sha256-QPgKBKc39bedmYC6q9ylTIIEVrswrdBEeSVykcYqwnQ=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/purpose-6.6.0.tar.xz", + "hash": "sha256-0Cxww9Ei7aRznocW8FybtzcHUdBnMNjiPRz0Jm0AwtI=" }, "qqc2-desktop-style": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/qqc2-desktop-style-6.5.0.tar.xz", - "hash": "sha256-iIY4d1pMi7f4DhDoeP2SOIDHXyqm44eNUsEqd/PakyE=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/qqc2-desktop-style-6.6.0.tar.xz", + "hash": "sha256-qCNhp7IGuUp4Tum5GSdu9zP7aUcQoVBa+acdtwgy62I=" }, "solid": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/solid-6.5.0.tar.xz", - "hash": "sha256-6CN8bJYXvvS/X8dEYbt0F8pXr+FdT1SHjP6MgG5walw=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/solid-6.6.0.tar.xz", + "hash": "sha256-iPZ/NpxyCqoNNH7gknNoQzVQXE+Pr192hNGstyKUVfE=" }, "sonnet": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/sonnet-6.5.0.tar.xz", - "hash": "sha256-foa2+Ct5UcPoHOp195uveooPiE/LAk8CphU6Rno94ao=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/sonnet-6.6.0.tar.xz", + "hash": "sha256-L4pe8tUmSjGvaG76j+MTcoN+3FMX8xAzld04nDcjcxY=" }, "syndication": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/syndication-6.5.0.tar.xz", - "hash": "sha256-za/FHJJxsAFQuNY78lDW0ED3vIxWkHr2HcWaRMlsZ04=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/syndication-6.6.0.tar.xz", + "hash": "sha256-Yn5LMQuHIei0JuxUkvQDandW2Ykz0xhzg1K/3Qp4oNA=" }, "syntax-highlighting": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/syntax-highlighting-6.5.0.tar.xz", - "hash": "sha256-PhiD3VGjJn5WzTrOOGIAlKFa5tuuzdGNM7fU+i8Yw3g=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/syntax-highlighting-6.6.0.tar.xz", + "hash": "sha256-v5RtJgbvKTlJpRp0RvFQlU4veBk/9UYbSr0ZiTm58bY=" }, "threadweaver": { - "version": "6.5.0", - "url": "mirror://kde/stable/frameworks/6.5/threadweaver-6.5.0.tar.xz", - "hash": "sha256-rnDQk2xDjr9KP3sqcI77nNMLWkFH2bcK5dRDfbsgveg=" + "version": "6.6.0", + "url": "mirror://kde/stable/frameworks/6.6/threadweaver-6.6.0.tar.xz", + "hash": "sha256-GVVUiKvwWp1aFkHxZaZ9NH4jq30UxvlGT/z42yNwMXo=" } } \ No newline at end of file diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json index 1dd796ca97433..ccbb924490909 100644 --- a/pkgs/kde/generated/sources/gear.json +++ b/pkgs/kde/generated/sources/gear.json @@ -1,1252 +1,1252 @@ { "accessibility-inspector": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/accessibility-inspector-24.08.0.tar.xz", - "hash": "sha256-wHUmoPdpH6tNEGj9rmtKcTKQjgshGuoRAvoLXmX8mFY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/accessibility-inspector-24.08.1.tar.xz", + "hash": "sha256-c/xkVA4gvgDQxi4OHyDDE58UueXZ/cMdTyaKw1Wzl24=" }, "akonadi": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/akonadi-24.08.0.tar.xz", - "hash": "sha256-4UD2ggqllupIzmIzWL31hJQtbioIUwubQ95oCAFWiUU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-24.08.1.tar.xz", + "hash": "sha256-1abzT2+XLT4cH2BY5AwjhswEsClINzxOEpkqA+PZlQE=" }, "akonadi-calendar": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/akonadi-calendar-24.08.0.tar.xz", - "hash": "sha256-yzVHlaaBdwyGVUT1sLJ4YEJnSzqfRCoNr/BOyRwiLZc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-calendar-24.08.1.tar.xz", + "hash": "sha256-4GyJgKbKy//WjHpZrBgHc9xcG9wyKp697CmKk8PAsvk=" }, "akonadi-calendar-tools": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/akonadi-calendar-tools-24.08.0.tar.xz", - "hash": "sha256-RIY2J7y0TAZ/6tupNdpbNMI/G2bXUM6Y07GAAPHCM/k=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-calendar-tools-24.08.1.tar.xz", + "hash": "sha256-mhZfaW/1qEF0uVpAs98naZWloLu8ioY7eclfiPLFmHk=" }, "akonadiconsole": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/akonadiconsole-24.08.0.tar.xz", - "hash": "sha256-gFmt6sz1jC/nGC8Pk74cpxkIQSZwyWgm0NkwLWRlu90=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/akonadiconsole-24.08.1.tar.xz", + "hash": "sha256-oF06JK+cHDZrw2ULku6UDAoheRxOojS4EAqYuIjMa6s=" }, "akonadi-contacts": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/akonadi-contacts-24.08.0.tar.xz", - "hash": "sha256-Kw+FT4KQCqIC3F8WrAHv/WhyF7LRNf9RoIeN4HqvtFE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-contacts-24.08.1.tar.xz", + "hash": "sha256-8i9VJMpOMOi6Mrk6BHLlQu40+W+yzOLVEjCDJJQ8oXY=" }, "akonadi-import-wizard": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/akonadi-import-wizard-24.08.0.tar.xz", - "hash": "sha256-Bv6u8HFjWi5YMzBwip8lWvzp1JGJl5RqfUwgqxOBWao=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-import-wizard-24.08.1.tar.xz", + "hash": "sha256-EONChsiO/aBvfjC3IIr+nssu5L2YymdaWdcJwAkPVIE=" }, "akonadi-mime": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/akonadi-mime-24.08.0.tar.xz", - "hash": "sha256-6wgpRm9pTa8MTOBHBzwpn9PiS+ckR730B1YYIrzxAiw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-mime-24.08.1.tar.xz", + "hash": "sha256-hMvuG4HWxQ//Rl0U62DaUTvv2fEB8V/dQwazmrqnj9Y=" }, "akonadi-notes": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/akonadi-notes-24.08.0.tar.xz", - "hash": "sha256-EyeUSPsRhqNVP3ASkJuUP0z0dspbEeTtx+cL32lAt40=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-notes-24.08.1.tar.xz", + "hash": "sha256-GCDN1GVQlNaKWP7fFrM+ld5D23GxrFZq2DmP3ladmBg=" }, "akonadi-search": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/akonadi-search-24.08.0.tar.xz", - "hash": "sha256-iDwA8eHAeChgbQ/yDYWBnSSxAj6cv22f7vLKseKQnrc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/akonadi-search-24.08.1.tar.xz", + "hash": "sha256-mf427ewIfrsLLJpyOsV/B/chTRa626m57mI/5kz9f8I=" }, "akregator": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/akregator-24.08.0.tar.xz", - "hash": "sha256-twNbS2RP2n6VQX7VcG5EpzMadyi9UG2ZZQuhv7IwctA=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/akregator-24.08.1.tar.xz", + "hash": "sha256-WfEfezNuj5pBMcz64iLp8b9JLve8yCNKmuDSwCxxEUA=" }, "alligator": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/alligator-24.08.0.tar.xz", - "hash": "sha256-gVKmuI/+7KNlwDjgYu145lqX3blquZiJddeE5Z3ONQ0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/alligator-24.08.1.tar.xz", + "hash": "sha256-+yeAQzQEYgTa5TU4Dt3sKQSwD7txjtWKJyeMzO4CSCU=" }, "analitza": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/analitza-24.08.0.tar.xz", - "hash": "sha256-Pu3MwkoZOOnT29MiUiX+7LKukE55mrdQgIN1P1y+wsw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/analitza-24.08.1.tar.xz", + "hash": "sha256-L0lO4m8OIbbeMtESh2jwe8/1ANKs7mVyq8IwztF9pLw=" }, "angelfish": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/angelfish-24.08.0.tar.xz", - "hash": "sha256-jOUdW43AHcB1TOFTMeiKsbNElCoZxQgqLFSoCcBo7nQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/angelfish-24.08.1.tar.xz", + "hash": "sha256-vVKyD9e2EK3FSpMPJyXd5ktIo5ly1gS1oUbOeoczUqM=" }, "arianna": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/arianna-24.08.0.tar.xz", - "hash": "sha256-DTrqfWrNSg7AdM16P4jGZQ1Y4CMGvjD6Q/CsO+7fLKs=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/arianna-24.08.1.tar.xz", + "hash": "sha256-cn1NMHtJQrEWveG2NeLLqh9vz96TM74Fn3D1lWAs5F4=" }, "ark": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ark-24.08.0.tar.xz", - "hash": "sha256-wYjDD3TIeRi5oQJHbhlFOYF23x7PnAfkt14RgyGLNK0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ark-24.08.1.tar.xz", + "hash": "sha256-CamKNE5t6/k5/yw5c9Z8d5TBXyL6/3uLuvuj0eOqXY0=" }, "artikulate": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/artikulate-24.08.0.tar.xz", - "hash": "sha256-daugK75a9OFdXFVIpW1HlnEbUZhBDAswNSMYo6SCuJE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/artikulate-24.08.1.tar.xz", + "hash": "sha256-99zL62pvlA6IlP/nLQ/fG3pFbz33Nhiw/nsxg5sYTkM=" }, "audex": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/audex-24.08.0.tar.xz", - "hash": "sha256-aTpBCH6t8ttPaZL3hsui2y4eOmXagx6g3Hi+hzlzICM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/audex-24.08.1.tar.xz", + "hash": "sha256-42AqObpwROMl+zV9mb0mADsJYy8tBeUUhLnsS6atHJY=" }, "audiocd-kio": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/audiocd-kio-24.08.0.tar.xz", - "hash": "sha256-5/LZs0l5ypXAHEylFrT4jmK2wbuRQ2/bGqH8DU8rLks=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/audiocd-kio-24.08.1.tar.xz", + "hash": "sha256-irBJyI1vHXCpj6zQINdYv6YwexgDq3zFZ51uTJykjbE=" }, "audiotube": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/audiotube-24.08.0.tar.xz", - "hash": "sha256-Bc1VI7o7MGfAXzGnY8gIH8ybRBsLEFTteJcENIvilwk=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/audiotube-24.08.1.tar.xz", + "hash": "sha256-+jhMt2q0k67wWv0togsM0jMkv6jMMxJ896cuovQfVUU=" }, "baloo-widgets": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/baloo-widgets-24.08.0.tar.xz", - "hash": "sha256-oEfZEWBavn29HHR0Q75BO5n5VjOyPoDb1bcCKVV3Mys=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/baloo-widgets-24.08.1.tar.xz", + "hash": "sha256-l5/oO2Kn9HtnN35SiLUdgDwGIpVvUFvtLbsJGaxKeWU=" }, "blinken": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/blinken-24.08.0.tar.xz", - "hash": "sha256-o9VY+esSjIAM4UdEV/FNx3A+tPN86rJpsBqjsaXbuDs=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/blinken-24.08.1.tar.xz", + "hash": "sha256-JxREVor1VacbWFVY4G3otGXqZ4pXcwgWdXQHxg/kNLg=" }, "bomber": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/bomber-24.08.0.tar.xz", - "hash": "sha256-yJdnzh0KzRqfK7AhXTcjxnPT9FANC4Xfr80j4N7ait8=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/bomber-24.08.1.tar.xz", + "hash": "sha256-TgAyn/j9fr6v4YatxbT8tuX4jdc76Xm+i23Pdvz5HXg=" }, "bovo": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/bovo-24.08.0.tar.xz", - "hash": "sha256-BqC3hLKdP2TBrVivjNIQ3ilnC+p0uzVzN1yPBTugp6E=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/bovo-24.08.1.tar.xz", + "hash": "sha256-tboqMf7JIYqHGHX3UQpkBeqpdM1UIFPJEGowiwusvy4=" }, "calendarsupport": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/calendarsupport-24.08.0.tar.xz", - "hash": "sha256-SjBWE9JXDyeaKxC74N4uc3BSH87kqEd34JxeoDnnww0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/calendarsupport-24.08.1.tar.xz", + "hash": "sha256-jU6QQdvQUSV19vA9MPdDGmFNvS9EJa0HBQvWq/fb84o=" }, "calindori": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/calindori-24.08.0.tar.xz", - "hash": "sha256-RTuYVSlnPwWEc5EJk2FNJGfq7Vw6oesG/KCSj+N+yfg=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/calindori-24.08.1.tar.xz", + "hash": "sha256-KEJTQlK4OFk7edpGXrQaoPlv4HPANuDr3Df6U42eXOM=" }, "cantor": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/cantor-24.08.0.tar.xz", - "hash": "sha256-UpKXfRqW4w1iARUyqmQtMHG3UfPJZWNxQB4O6NnnCS8=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/cantor-24.08.1.tar.xz", + "hash": "sha256-GOSuBBLFDgbNX2ZQcqqaMigeLoMV7tjNKs624jNM8Xo=" }, "cervisia": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/cervisia-24.08.0.tar.xz", - "hash": "sha256-qmPG+HRzGjOw+ugr3Iuv2ymCgXgY7Qa5bMso9rbR1Wc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/cervisia-24.08.1.tar.xz", + "hash": "sha256-0oTAd48sWfoUCwIaHayCzxe0PXcl+1vgW1oV4e472M8=" }, "colord-kde": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/colord-kde-24.08.0.tar.xz", - "hash": "sha256-9VW0QPIu9riqxxcDCxGhx52zgIt9HUZtyvTYOfOYJKs=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/colord-kde-24.08.1.tar.xz", + "hash": "sha256-am1yTQpiemaZjHVTzNSSf7e1TnVZ3Iq655QCtRNiDyI=" }, "dolphin": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/dolphin-24.08.0.tar.xz", - "hash": "sha256-Sp1S3NZRPSGTwMNJRLJws5kVDx2k/zfaBqD4r4f22Nc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/dolphin-24.08.1.tar.xz", + "hash": "sha256-Hbqa+2YXCAwbSTeojsAS+6dxhDJ6zIVz2eNR/u1Tdmg=" }, "dolphin-plugins": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/dolphin-plugins-24.08.0.tar.xz", - "hash": "sha256-Ppwn9mfNswt7MmRVfhqj4/BGZGFVhdAkeXwspOdOAt8=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/dolphin-plugins-24.08.1.tar.xz", + "hash": "sha256-yIZimA9qW9BCc1wH1KqilHRSTfUad5GmwDd89ym/CzU=" }, "dragon": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/dragon-24.08.0.tar.xz", - "hash": "sha256-4+PLjZeemeTI6CMmOsdlLnhSVU/HoXzDG8ZeoG8LpKA=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/dragon-24.08.1.tar.xz", + "hash": "sha256-wRkXTxc8jfnoU/WikxHBqHO0uCSNBQmJuw7YCDI0/oo=" }, "elisa": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/elisa-24.08.0.tar.xz", - "hash": "sha256-fxzrmaSuV6G2Cf7k9JA7AkPzzISoVOHUHNIipCCF7oE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/elisa-24.08.1.tar.xz", + "hash": "sha256-zt9tyeHYERPmWZBB0JtS1N3wbJQWe9zcybjLHGbAoko=" }, "eventviews": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/eventviews-24.08.0.tar.xz", - "hash": "sha256-8tbz1JCqp5GiuU7Sp1ZyXnVwK5/HsCpmBLO5uV2FKGI=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/eventviews-24.08.1.tar.xz", + "hash": "sha256-IUb+uHifA8DnvWVW/dHfX0qjzloCK+65omUhX6HO270=" }, "falkon": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/falkon-24.08.0.tar.xz", - "hash": "sha256-jSO00NWK+vtofDi9jiqbjdWLVpxmNc58Eov21qdcpJ0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/falkon-24.08.1.tar.xz", + "hash": "sha256-q3y3v8mevszeKqXiUqlp+HE4UAfCiaqxLh3sNoJrkxU=" }, "ffmpegthumbs": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ffmpegthumbs-24.08.0.tar.xz", - "hash": "sha256-JcZcUnK7vtzavGlhhGgHFD1DZJpOPbZiwwvlJLUUh9M=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ffmpegthumbs-24.08.1.tar.xz", + "hash": "sha256-4sagvdIW09GMObvyxyRifCB1Qj4+4WSpBm2vYP3EttQ=" }, "filelight": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/filelight-24.08.0.tar.xz", - "hash": "sha256-cFmbzAZohw6C3iAv9bMd+2U22Bmdcxu5e+CYeopWYok=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/filelight-24.08.1.tar.xz", + "hash": "sha256-i9XzR36JKKT0XaN6Pw7i1Gn8/uIPe1GXv6z/R3K7UKI=" }, "francis": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/francis-24.08.0.tar.xz", - "hash": "sha256-1maoSzfg5fhykFGGtPpuKAi5x2y6qF8hP5mboD4f2K8=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/francis-24.08.1.tar.xz", + "hash": "sha256-9kkssY5dsGxmBNnTO44GBG+2ZU8JBrKcGEMx06LsNU0=" }, "ghostwriter": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ghostwriter-24.08.0.tar.xz", - "hash": "sha256-VKFqAvETmKli/RhDJ9I4wxyGypaK5/ENdQKjAcwXgrE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ghostwriter-24.08.1.tar.xz", + "hash": "sha256-0MGFISTFK04+rXoj0zomwdKdXppFGI66MTwaC8UJ6pI=" }, "granatier": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/granatier-24.08.0.tar.xz", - "hash": "sha256-DYHEXIxEdWoujT4V8gjJWQpt1+jCgIt8d9QGEHsQ41M=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/granatier-24.08.1.tar.xz", + "hash": "sha256-nCAHu6MrAZ3ZAtCv2vQhN4lXfgR/mEm9sXqtmqBvo4k=" }, "grantlee-editor": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/grantlee-editor-24.08.0.tar.xz", - "hash": "sha256-OFN/abHSQ0fvgUPlxym6GDw6Dq9V1jp5KaT0MgTcjv4=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/grantlee-editor-24.08.1.tar.xz", + "hash": "sha256-qf/5M/ZCMh/0sn8gxtB0Zfvp4tNTnHbtM/a4t4FmUxg=" }, "grantleetheme": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/grantleetheme-24.08.0.tar.xz", - "hash": "sha256-YjJmXo2igIS+GQVClO0hD4BAClqlTGxxDf3m1VjOe7E=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/grantleetheme-24.08.1.tar.xz", + "hash": "sha256-opm5Mdt1PQYLX0Sj/HyJg9u8g8MxWTUZx+/pa5Aq8XI=" }, "gwenview": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/gwenview-24.08.0.tar.xz", - "hash": "sha256-GNEO2090khBaKMsd4RQzG3zr8SnOYmuHeeH9dRmedHY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/gwenview-24.08.1.tar.xz", + "hash": "sha256-Q4DF1CF0e1HmDMfYU64IheR1W5qN9OjKNTRmzrYQbU4=" }, "incidenceeditor": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/incidenceeditor-24.08.0.tar.xz", - "hash": "sha256-p/csMc+xSA3e11r366g2uWdnXLO0MEJA8mi1iIzzSZc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/incidenceeditor-24.08.1.tar.xz", + "hash": "sha256-z92Ob/F7J16pTFojSzLilwGkBUKgRnj0pyUJhaKA0k8=" }, "isoimagewriter": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/isoimagewriter-24.08.0.tar.xz", - "hash": "sha256-PfdDbVphmTNkWm2CtJdt6pQRSzsVT1eoq4zi2MTaSJw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/isoimagewriter-24.08.1.tar.xz", + "hash": "sha256-9lApzJlRVZO2yEFdp02Aj9yU3spyOU9jIVUgDkDPW0A=" }, "itinerary": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/itinerary-24.08.0.tar.xz", - "hash": "sha256-Fmhk+wePToNzmzZyqCTvulC4fgjjZvfE7flFVfVNBDU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/itinerary-24.08.1.tar.xz", + "hash": "sha256-asCgnKBudz6FgljPyu0zOzMFijnBQRPFP2Emo+JikL4=" }, "juk": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/juk-24.08.0.tar.xz", - "hash": "sha256-Z5twwl9AFOzc7ZVaQa0O+TKR4ZBdgqFfLMJsDXrPJoQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/juk-24.08.1.tar.xz", + "hash": "sha256-11qpNpcAABo4O2PjJS+nsbsHpfkhx/Ecbk1zy75Qf5g=" }, "k3b": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/k3b-24.08.0.tar.xz", - "hash": "sha256-YQYjZIQprodLu6pfZVm73weXKeMfBYVSfZ5kjLuh4K0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/k3b-24.08.1.tar.xz", + "hash": "sha256-U5iwgVxi7M11YXOdxFVOe/sVSHk8SoOnkVWoLyP1WCM=" }, "kaccounts-integration": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kaccounts-integration-24.08.0.tar.xz", - "hash": "sha256-+yHSQ1sqqplg/tlmCpzVa3cCCAxOmfmiB+bBuo1Ss/Q=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kaccounts-integration-24.08.1.tar.xz", + "hash": "sha256-PJM8nEkbMpSrQrhAVLKyRwMq/WuTSA3xV/m9SUXau2Q=" }, "kaccounts-providers": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kaccounts-providers-24.08.0.tar.xz", - "hash": "sha256-7jZnTG6PD+H0glj/qJL3xtSUXOEzLp37iZQ8Knpx2VI=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kaccounts-providers-24.08.1.tar.xz", + "hash": "sha256-HNHN5M/2a9WUqie0+UG2HcTW/9e1Ol8/oE1Dup6JZ9w=" }, "kaddressbook": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kaddressbook-24.08.0.tar.xz", - "hash": "sha256-flGfcrYtgbWI3FHTyEF+smQxNHzVUv9Ezf9xHecj9Vk=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kaddressbook-24.08.1.tar.xz", + "hash": "sha256-U1I23jS8hihW7lKrer2NRuFj+WyVbvXWMrQ4wrWJf60=" }, "kajongg": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kajongg-24.08.0.tar.xz", - "hash": "sha256-Qd2RR9fWeP82OltD1i/tZva4gTBdcgC+JfVf18J2nvY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kajongg-24.08.1.tar.xz", + "hash": "sha256-pHqsB16aKVphfELxShAyeaUMZMJGcgx9m/W+HMk1bmg=" }, "kalarm": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kalarm-24.08.0.tar.xz", - "hash": "sha256-LoQrZtyepZhq3vmwSdcLajrpDj82AWILXnct6K64KQ0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kalarm-24.08.1.tar.xz", + "hash": "sha256-bUacnOaicHR1O34LycYfWO1IQzMrCf3YF/1NhIucJ0I=" }, "kalgebra": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kalgebra-24.08.0.tar.xz", - "hash": "sha256-AxHLFTWb2WNwdi3jHDxM1oSfsVUXKzmoypW+kAtF01M=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kalgebra-24.08.1.tar.xz", + "hash": "sha256-oaI6wTw99k3ScY89qJo1WMCXr26/ycHi+6oZxs1pUic=" }, "kalk": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kalk-24.08.0.tar.xz", - "hash": "sha256-7JeEWZIgGGspSbfkoa7a7r+0Xg65s+0y3YNjQ5kL24I=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kalk-24.08.1.tar.xz", + "hash": "sha256-BRU+AM/eGJdVRgPBEL6HTpzX4KbqndV9UWm2TtAZMUE=" }, "kalm": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kalm-24.08.0.tar.xz", - "hash": "sha256-x1mB5cAVc7OhzyIItiZ4zHl+mxkhamktI1284J+HHDY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kalm-24.08.1.tar.xz", + "hash": "sha256-VMK4O1/mFv4hsyeny5B0R2AJ3lwFgDZ21ZLB+SVvEKk=" }, "kalzium": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kalzium-24.08.0.tar.xz", - "hash": "sha256-Xkwql1hSLW7SYSKnf55Fqus+glFlL3BSHWOk5ekSbDA=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kalzium-24.08.1.tar.xz", + "hash": "sha256-/ybAT+pJCwl2g+SFTvct2moryS9ObAKp/7yegHd2Dvw=" }, "kamera": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kamera-24.08.0.tar.xz", - "hash": "sha256-2BnrTYHOUdl1s1ckI15CbgyyuWqcWLeFTI8Mhrum91A=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kamera-24.08.1.tar.xz", + "hash": "sha256-Ql8s6RWcAkqS+zWlOvLPxK0+Gz4a5h4gnBfCMJL7WR8=" }, "kamoso": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kamoso-24.08.0.tar.xz", - "hash": "sha256-FL/WlMMeRgzs0jXVNXWsmMGWvefP3iJex5SFmDL9PYM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kamoso-24.08.1.tar.xz", + "hash": "sha256-MwLqpX1YLXWcptZ6DN3GTDsAS2UrzQLhk5iO9jFgq74=" }, "kanagram": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kanagram-24.08.0.tar.xz", - "hash": "sha256-44TpMTUd+a1vAy134AWjlUp4uFTNncLi0vXDduXYEl0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kanagram-24.08.1.tar.xz", + "hash": "sha256-aS4BtIJXgcgSy9vwdRR0s5cEuqVkXhlXagXm5wMJGIM=" }, "kapman": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kapman-24.08.0.tar.xz", - "hash": "sha256-Rkqxg82TQY2682vwJ9mR68eKgryvMf0bZl7phsG87Sg=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kapman-24.08.1.tar.xz", + "hash": "sha256-AmYN6yBbSazmjPUwcHgLF91d1Se5s2OWLqDCZ6lHuxk=" }, "kapptemplate": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kapptemplate-24.08.0.tar.xz", - "hash": "sha256-m+Cr7W6izseuS109xVCbqjrKLPk6KcZghXXB4XAAyCM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kapptemplate-24.08.1.tar.xz", + "hash": "sha256-5x+eNNmIaONUW+eSz2prlFZsmhjJ2VKCMSp5E4sH+r4=" }, "kasts": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kasts-24.08.0.tar.xz", - "hash": "sha256-VsXvgXH8gS1pIGASXJ7paOT0P7Dw05FedoCF++JrBsg=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kasts-24.08.1.tar.xz", + "hash": "sha256-jyeYFRT0GrQ2q21YJWPGSYfNfYHuriXZpeewjWOPW1w=" }, "kate": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kate-24.08.0.tar.xz", - "hash": "sha256-hbICFePM/bseYVEIpwZz8eZEPOyhlIKQ7uOEGgYRc+k=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kate-24.08.1.tar.xz", + "hash": "sha256-wQUYskOG8dr19kcjwls/TtfjRGpwkSq+W2yWXv2bLcY=" }, "katomic": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/katomic-24.08.0.tar.xz", - "hash": "sha256-hCs1mHINM4K4LphtnhWKSkk+Uduv+d0C32Cn9fhGupc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/katomic-24.08.1.tar.xz", + "hash": "sha256-odgFbXiCOw3vg+9A/SowiXsql/0xmr8zcBT42KEJqqI=" }, "kbackup": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kbackup-24.08.0.tar.xz", - "hash": "sha256-3NkbYY+0Pl4NQpeGhvYbSJtCRHbVp4HxSe34CRmByIY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kbackup-24.08.1.tar.xz", + "hash": "sha256-GSflfY9tJ65sM/RmA4aMemAV5TfCayPtPP2XaAhPK7g=" }, "kblackbox": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kblackbox-24.08.0.tar.xz", - "hash": "sha256-v0KYakBsZjaa7N7L9TgZr5MeLBBbafmWvpuiXp5xqZU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kblackbox-24.08.1.tar.xz", + "hash": "sha256-Oe9PSgJRe3LkPPZnCfiZo8CiFq8j8y0ZpTsupjGzThA=" }, "kblocks": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kblocks-24.08.0.tar.xz", - "hash": "sha256-pmlMQ12Yi31QKeM9Jo6vskND7saYiEChCSbAXFXyjK0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kblocks-24.08.1.tar.xz", + "hash": "sha256-CXEUA2EcKIqgImChG8nUNDIiXFrkwX1bRwH7X98Eu9o=" }, "kbounce": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kbounce-24.08.0.tar.xz", - "hash": "sha256-vuipN4rVhIi5QVRsFk+xTQic6RFJZltjjzoBVFzq/+Q=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kbounce-24.08.1.tar.xz", + "hash": "sha256-DPMpvhdXzOkZsrLYiHECSxmqQuWBhadS0JH4lO/noP4=" }, "kbreakout": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kbreakout-24.08.0.tar.xz", - "hash": "sha256-4R3r0q0SlihSye3jmYx9m+ZurJBldrrnuUV5lT6mk/U=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kbreakout-24.08.1.tar.xz", + "hash": "sha256-5Si9OKFfBlZ8g6XL4YVXrPfyGcBCvOCfQ3FeEgfhgyM=" }, "kbruch": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kbruch-24.08.0.tar.xz", - "hash": "sha256-qFfk09eHEHvg5tNxzDCGLkzyX6Nmobz4hzdpgj34my8=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kbruch-24.08.1.tar.xz", + "hash": "sha256-W/n8XRqgmFJSw7TdPikGqh41RoTl3mAw4zqfTEjqzEw=" }, "kcachegrind": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kcachegrind-24.08.0.tar.xz", - "hash": "sha256-M3jufmciFyBEF2yhwPB7hQuxzs6aFWSsSOy089v6cXA=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kcachegrind-24.08.1.tar.xz", + "hash": "sha256-BPJMq1/l3IinmYSY3ntstl537xKrHrvjS8oAs7ISuyE=" }, "kcalc": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kcalc-24.08.0.tar.xz", - "hash": "sha256-7K+LK6U2n0qBCGdiUUqeaTWjQDz5gqdIL70FJbz/LTU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kcalc-24.08.1.tar.xz", + "hash": "sha256-huu5s2tfTWIJBIhCBphc7MD/0lNmbycxPse66ZsQqW4=" }, "kcalutils": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kcalutils-24.08.0.tar.xz", - "hash": "sha256-2jFk1tLOxETObXPcwhDghwsIGrgy2yeBaWb7HLMrCFY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kcalutils-24.08.1.tar.xz", + "hash": "sha256-pRrD1dx1xuWlTtrwZ+DUvfWOeucRelCIpPkocng/sJk=" }, "kcharselect": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kcharselect-24.08.0.tar.xz", - "hash": "sha256-bdbujxGwdkhalBcyDA00lRiWtY0QfKIVG2LbTBVFPF4=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kcharselect-24.08.1.tar.xz", + "hash": "sha256-ZdhYIhssUv0QY+pXkkRPdO2trb0iz6baMPTnJXFsl8g=" }, "kclock": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kclock-24.08.0.tar.xz", - "hash": "sha256-ntjb5IMjMynmYRewrkGuiBk3n4JkQjtu2CCVZye2jrk=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kclock-24.08.1.tar.xz", + "hash": "sha256-qZ1bv4ADG2wzyHi9axI9LQLLnIrJ0Gl6PmMyBtTgGYw=" }, "kcolorchooser": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kcolorchooser-24.08.0.tar.xz", - "hash": "sha256-Tuj9iemf+0eqMiuKGFidDBpcoj5OsZhRmkPlXAzQp60=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kcolorchooser-24.08.1.tar.xz", + "hash": "sha256-2EYvEtVOcAqm7ENcuK7zn8QtrUhC7m6E+27+u+QncDw=" }, "kcron": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kcron-24.08.0.tar.xz", - "hash": "sha256-UDngQRPRTLT4D5Mk4m3nIbQ2LXzfnufHNP5EFVcjjRI=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kcron-24.08.1.tar.xz", + "hash": "sha256-qSy05C9ocXNLV9rs7T9o9KI37ExHwceKa1wlqv9/jCo=" }, "kdebugsettings": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdebugsettings-24.08.0.tar.xz", - "hash": "sha256-r0doqSX7EXfFE1MNCcPBDOQqEKsfVEML846rOT9Eg20=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdebugsettings-24.08.1.tar.xz", + "hash": "sha256-ibanaWiHlfgYaLyFsAAhSAdpBkvsgbIc8FwLC3qtkms=" }, "kdeconnect-kde": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdeconnect-kde-24.08.0.tar.xz", - "hash": "sha256-y9ECzzCD0sBD6HXMTvGsOjODdIT0QLLnN3vJwL0yEq4=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdeconnect-kde-24.08.1.tar.xz", + "hash": "sha256-+de1XVKujQdDKSKv2ErxnNNz3we0Xrl9OBvNLbTV0eY=" }, "kde-dev-scripts": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kde-dev-scripts-24.08.0.tar.xz", - "hash": "sha256-ygk/61k6YMoqLxa6wHHc93mzKl5C+LRIX78RyeJWk9k=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kde-dev-scripts-24.08.1.tar.xz", + "hash": "sha256-kOmjzmiB9cRlunkmDWaeZtsBvwHezfqZXD8wP+RxaHQ=" }, "kde-dev-utils": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kde-dev-utils-24.08.0.tar.xz", - "hash": "sha256-22DPG18W5juVjbaIL/hP8gQGW86wc+UtsZ9FKhTF72o=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kde-dev-utils-24.08.1.tar.xz", + "hash": "sha256-zDkPbsPxy8oBJbBy3coI859+fWsVYeuKwdHOjCx1Hak=" }, "kdeedu-data": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdeedu-data-24.08.0.tar.xz", - "hash": "sha256-zh1w45rNPDM6jmgZVzs42DqJ/NgPMpPIwxcH5gT0cEw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdeedu-data-24.08.1.tar.xz", + "hash": "sha256-8RR38NoL8kLcMJ4LxGGkP6AdlHQ6MEm9M2r1jdlZtOI=" }, "kdegraphics-mobipocket": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdegraphics-mobipocket-24.08.0.tar.xz", - "hash": "sha256-u3Lpg+/1z6TzcJ4YwseuR81CbgaPgA7k2yeqeHbwezU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdegraphics-mobipocket-24.08.1.tar.xz", + "hash": "sha256-DZQoX812kENYZwDDMrgqlylZ76Y+H3SozqIhZY/+0DI=" }, "kdegraphics-thumbnailers": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdegraphics-thumbnailers-24.08.0.tar.xz", - "hash": "sha256-DoMmhh3J2K/DeA7ytISOm7KoGU8hRLlZKOW8OZidcLI=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdegraphics-thumbnailers-24.08.1.tar.xz", + "hash": "sha256-cILM8eT4+mQ74znmTLD/0axenq5hSGllw7flfr+p3XQ=" }, "kde-inotify-survey": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kde-inotify-survey-24.08.0.tar.xz", - "hash": "sha256-FQqKEdisDoSL5hBSi1Iu6jOuS42WLM4m0syF4OROr+I=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kde-inotify-survey-24.08.1.tar.xz", + "hash": "sha256-pDRnqWVvACqyspGnR/Z6U9bTFT2dLhgJvECDU26loIg=" }, "kdenetwork-filesharing": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdenetwork-filesharing-24.08.0.tar.xz", - "hash": "sha256-zoNu04Nz01lW6LX9llfIKTJVD2E8sB+0AssfCv724QY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdenetwork-filesharing-24.08.1.tar.xz", + "hash": "sha256-Db0oYRg5RQ55rr2aybfbxFuCuMHNMgbV02DVRfc/cMM=" }, "kdenlive": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdenlive-24.08.0.tar.xz", - "hash": "sha256-5DBqKqWnU1zqUK7/ST6p3otyktSZ1yBMQXgMsER1L5Y=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdenlive-24.08.1.tar.xz", + "hash": "sha256-VbQq9UUwTsJr8gtOnnnonpHWFIH7u5Ol33x06G+64UI=" }, "kdepim-addons": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdepim-addons-24.08.0.tar.xz", - "hash": "sha256-jQKVWmA7cFpsIucPmg0GaTBpPA/4ZS1IzfLyfSYfRSQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdepim-addons-24.08.1.tar.xz", + "hash": "sha256-RlftIyEsDu5T5IyHnxc25V9XFYaT+H+sUA5df5Td8t0=" }, "kdepim-runtime": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdepim-runtime-24.08.0.tar.xz", - "hash": "sha256-4gKNdItBdCbp4CgkksN+4xi1Ms1solb23PTTjnaX3Hc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdepim-runtime-24.08.1.tar.xz", + "hash": "sha256-KZHdMBhHtvdQB2nBJ8d3lVW4LwmuCFbRqevM4Zh+WSU=" }, "kdesdk-kio": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdesdk-kio-24.08.0.tar.xz", - "hash": "sha256-SOoT8tyFW3Rp8Q5UtUIZftoEHGESDc2mUQRla/0iu4U=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdesdk-kio-24.08.1.tar.xz", + "hash": "sha256-Y/9boahTKccAaUbo/zma++H2TLZmnoWN/hr4/F8RFzI=" }, "kdesdk-thumbnailers": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdesdk-thumbnailers-24.08.0.tar.xz", - "hash": "sha256-EgoH+1dVr+OpD3WTniVLImkL6bTLt5aBWTmz0poUqoY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdesdk-thumbnailers-24.08.1.tar.xz", + "hash": "sha256-ScTJaB5hQi3rDnA70zLBjRzrIvDI7xo/rUmlMgmq1Eg=" }, "kdevelop": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdevelop-24.08.0.tar.xz", - "hash": "sha256-xSAdgUuCRcpqrJF18s9QTXvvf4Xxhnnm/Kdt/Q/4WRo=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdevelop-24.08.1.tar.xz", + "hash": "sha256-urE8gll/YOcByuE91aL0BqixGL+padTE+psUeHAJ5Qg=" }, "kdev-php": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdev-php-24.08.0.tar.xz", - "hash": "sha256-OsOu6LFOcmIkVR1SSxtLaY4w1OWPUfIYfUM3emMtH80=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdev-php-24.08.1.tar.xz", + "hash": "sha256-N4Oq2zSuCSKZq0uEOWvhIXA2hl1nEsxsf5ldQcUv1jE=" }, "kdev-python": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdev-python-24.08.0.tar.xz", - "hash": "sha256-ID8iZ/nyTFfsQVSZaDiVSBdxGCMcfS2oyz8HIqCdXO4=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdev-python-24.08.1.tar.xz", + "hash": "sha256-aQvo1nRZyCg+8CLOPsesBT5V3INKEV6Rous7faISMSA=" }, "kdf": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdf-24.08.0.tar.xz", - "hash": "sha256-51Kq6FZDwuQIvodu2ky6wuj2Xzb+3AjdyIaYlbNlfTk=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdf-24.08.1.tar.xz", + "hash": "sha256-agXTh2RFk2rOPqLHy67+5r2X6F6gvnCRXH0yHPo2LRo=" }, "kdialog": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdialog-24.08.0.tar.xz", - "hash": "sha256-/nYoKZZXjxTnOwxczOybUCh0fR2WaB/aZPDPopX1CFQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdialog-24.08.1.tar.xz", + "hash": "sha256-N+gAwnAP+R1MYUMnAxaqtIolaXtlIRicQ30Z7uZUYpM=" }, "kdiamond": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kdiamond-24.08.0.tar.xz", - "hash": "sha256-xeSeUkHL1aNa0Eal+cIQM2YPmpqzDdzhWXIF54IvY7c=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kdiamond-24.08.1.tar.xz", + "hash": "sha256-JDWBGhDyl1vHLFxdPoyWrp3UGxEdRuV49zhx4aC/Ubo=" }, "keditbookmarks": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/keditbookmarks-24.08.0.tar.xz", - "hash": "sha256-rmQGM6HjhfVwm9/B7DSd5vU3sICK6nzLg3wPyLaL8V0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/keditbookmarks-24.08.1.tar.xz", + "hash": "sha256-DM5Tik2QttsXByP9n6mqMjgB0VEm4+kk1jbpe65SJJY=" }, "keysmith": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/keysmith-24.08.0.tar.xz", - "hash": "sha256-rhyQhb1Ia2v/MjXi7WGzecFtvvUxH6LEQFjKbhnx45I=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/keysmith-24.08.1.tar.xz", + "hash": "sha256-z3677BL9Yx7INiHDQePKx3kqnoWfX5kubiNklaIyMCY=" }, "kfind": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kfind-24.08.0.tar.xz", - "hash": "sha256-WN3rs3ZUWnYaZlpXOam5htLzBN0jz0c87V56h+RtWd0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kfind-24.08.1.tar.xz", + "hash": "sha256-6Hf6xQi+xojheSMwxvZW//+8vVn+FhoXSwvS1QHYA7s=" }, "kfourinline": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kfourinline-24.08.0.tar.xz", - "hash": "sha256-aF4NkJXwfwMdEs4TW07Rdb+lDEBlyQMkSvBzBvl5/Ug=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kfourinline-24.08.1.tar.xz", + "hash": "sha256-uN/mXbWUjga/RVsholNmjNLnxGSblHbC+RJ/UxzRMs4=" }, "kgeography": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kgeography-24.08.0.tar.xz", - "hash": "sha256-nvd1N4uYcs0hccyKm6ELrsXtXRHNzpeTjci0SpLvbKI=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kgeography-24.08.1.tar.xz", + "hash": "sha256-iZhXtmjxeZPaax5X2OZlYg0KuIWe1uMhCEKgCpXu8tY=" }, "kget": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kget-24.08.0.tar.xz", - "hash": "sha256-1zg/Kz9dmHI8lzRdL4ndO6VcRJzOTmQq3iHyN4C/TV0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kget-24.08.1.tar.xz", + "hash": "sha256-GvgduQsNtTULqxDJZk0OMSOjY10seg71g5OXc6mmiAQ=" }, "kgoldrunner": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kgoldrunner-24.08.0.tar.xz", - "hash": "sha256-VEURZnimglPZ3X5axyUrE+mVVY5+z3l2DXUsX010QSE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kgoldrunner-24.08.1.tar.xz", + "hash": "sha256-AL5ilt3iO/2x4FGOcszSeT4zLP8+/7Zir16GOfMX68U=" }, "kgpg": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kgpg-24.08.0.tar.xz", - "hash": "sha256-58HFYxPVl+m5PFQu1Af/4UMpq5glwaar1ZUNn0GoH1c=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kgpg-24.08.1.tar.xz", + "hash": "sha256-xhNdZ4VNSyHNKlR01f2a26VEfK0ouCTor1zAAlhjZIU=" }, "kgraphviewer": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kgraphviewer-24.08.0.tar.xz", - "hash": "sha256-8u/hWRvieU326yme1qsyYpv5EgjAl6Dipf6JyM5cjNE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kgraphviewer-24.08.1.tar.xz", + "hash": "sha256-NdRqvxblLQZKJA6UaQ4HiXGcnlNi61h+pBXuQB2+w8U=" }, "khangman": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/khangman-24.08.0.tar.xz", - "hash": "sha256-/RFmhbPE1fad5v0PC1oiVRiLneHieIV/914HQXXOCpw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/khangman-24.08.1.tar.xz", + "hash": "sha256-nEY8khR9xjmOSRlP14n3ptFrkFLvgMighp+ctS7xTK0=" }, "khealthcertificate": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/khealthcertificate-24.08.0.tar.xz", - "hash": "sha256-SXXahXZNTjYa+W+1zV+g9cXFyYXF/2hmrK/4Bm9GRfY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/khealthcertificate-24.08.1.tar.xz", + "hash": "sha256-VWOHgtRpMqtEO4SchWJWSPVZEkTr12qlvhfvdEQbgTk=" }, "khelpcenter": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/khelpcenter-24.08.0.tar.xz", - "hash": "sha256-XZ+TuPWxFcK7uRT1pi228Yb9wNlKfjnF0yGPb9D5xUM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/khelpcenter-24.08.1.tar.xz", + "hash": "sha256-dg+iWle5QrpTJlpW/7EmSf+fWU3N/Gfa39m8UcEofnw=" }, "kidentitymanagement": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kidentitymanagement-24.08.0.tar.xz", - "hash": "sha256-B+rz6mVT+id8NFqarZ4ZHHLjJXY3khHXHjtcrFhuR0I=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kidentitymanagement-24.08.1.tar.xz", + "hash": "sha256-3/wCWTKvAIkIDjZ8xnCLIM5vr6GCOSHaSeQ745mmWtc=" }, "kig": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kig-24.08.0.tar.xz", - "hash": "sha256-13DKDWzVEdFlndLW1ABIEQCApxeeQIWqAK7W3Yvd4Hk=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kig-24.08.1.tar.xz", + "hash": "sha256-z4qALboiPIqEN98oyCydZHWElAN+XBD1dFIcs6MBTog=" }, "kigo": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kigo-24.08.0.tar.xz", - "hash": "sha256-1MVyIWdcRv/sNfXY2QtaeX7GbaNIg7wjTOzDBgEHfZE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kigo-24.08.1.tar.xz", + "hash": "sha256-ftJhAt4OF5GcUOFqYvMlelilVUDpCBgj9+AgQzy1Ky4=" }, "killbots": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/killbots-24.08.0.tar.xz", - "hash": "sha256-fU945cgMIat5618KHaPKNuQ6gLSsQtV7p3jKDB8UeCM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/killbots-24.08.1.tar.xz", + "hash": "sha256-N+t7AZWZ/ZtWkJgM+3wD/Sqb1kZ36EWWGBaY+5ug78c=" }, "kimagemapeditor": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kimagemapeditor-24.08.0.tar.xz", - "hash": "sha256-8jIsATQgf5cbrXjF+Tgz0W3uV36c5xbtcHx+jKfgI/k=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kimagemapeditor-24.08.1.tar.xz", + "hash": "sha256-h3vdViqMwOUQ/8u7ckxjrxFomeqVYwuh2KlDmKmQs9s=" }, "kimap": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kimap-24.08.0.tar.xz", - "hash": "sha256-Bf6UlADAjxbYog1WnVrcJ8YZzVW3jnEmG1dbsvVGFe4=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kimap-24.08.1.tar.xz", + "hash": "sha256-9hMeZ2TPptVomXlvXztkladQGBV/8Y2I2VX7EXpcfEk=" }, "kio-admin": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kio-admin-24.08.0.tar.xz", - "hash": "sha256-AwTS2EjlFdTXLS1reF3rZMRk/2bG+7WsL0OQeA/YMxc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kio-admin-24.08.1.tar.xz", + "hash": "sha256-BnJ3NrmK98JN5GFt0kTZVg2ZUXqlAw+0fBtwww9XV6I=" }, "kio-extras": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kio-extras-24.08.0.tar.xz", - "hash": "sha256-dZD0iXliOIFJwP7CXn64tpFZfaz9Su3zNDu+60uYRFw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kio-extras-24.08.1.tar.xz", + "hash": "sha256-ZAUd2i8Xo5AUJsCptcpltkQp8AtoIOd5bmBQhLDPzto=" }, "kio-gdrive": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kio-gdrive-24.08.0.tar.xz", - "hash": "sha256-H2FIcR89lazbxiV74lCuUDCe2Vw519j7zaACm0NFr74=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kio-gdrive-24.08.1.tar.xz", + "hash": "sha256-NZLVghzhXHzdD/8/j1ViHkN0UiFDvAG2MqpJ9GAABIM=" }, "kio-zeroconf": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kio-zeroconf-24.08.0.tar.xz", - "hash": "sha256-OnVSm+KvjFCoFlhtc0fRnZyL2cu/cJkudBs2paS6K7w=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kio-zeroconf-24.08.1.tar.xz", + "hash": "sha256-npc22mc/+tT9HN3kjIVMRKtv+UX9xWZa4UatxC2+nt8=" }, "kirigami-gallery": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kirigami-gallery-24.08.0.tar.xz", - "hash": "sha256-UpirQVaDP3+2X6Qh+g+fY7V4vc+Hw9OAIk6fs7EyxEo=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kirigami-gallery-24.08.1.tar.xz", + "hash": "sha256-RtnzyDmT+jJ33jpRG9yg1qYKkA6Qkr41ToJxKP6MQcM=" }, "kiriki": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kiriki-24.08.0.tar.xz", - "hash": "sha256-4K81n7TZWSvon1n+W4qjDc852KsAbgDiu9cDt6SG0jM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kiriki-24.08.1.tar.xz", + "hash": "sha256-Fd44QysYqiR1tDFkMvX0Woi9MuCRWUN9Aw32MH22y6g=" }, "kiten": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kiten-24.08.0.tar.xz", - "hash": "sha256-f5KffVA7B0eG+paT0YC5/9nC10BaM5Buka9yN+5xVLI=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kiten-24.08.1.tar.xz", + "hash": "sha256-lbsIvt97/nMKYIICc3GmLVrWoE4vJV0ana8wtuXUDEM=" }, "kitinerary": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kitinerary-24.08.0.tar.xz", - "hash": "sha256-vvuV8WIODJuqgiZKq/ugzGdsnuQFg5OL4gkfElTyzaw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kitinerary-24.08.1.tar.xz", + "hash": "sha256-aeMQJL74CDbhz16vFUP+mgygfXJD1DSfnaCoJ6EjOTM=" }, "kjournald": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kjournald-24.08.0.tar.xz", - "hash": "sha256-mZPS5PxfkepzlknYXFMZfFSwuNSe4oy96437YlkAM8Y=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kjournald-24.08.1.tar.xz", + "hash": "sha256-UVgjC7F6esn9eS7T2uejnmDZTKSjTXLY2GoOuIG3G7Y=" }, "kjumpingcube": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kjumpingcube-24.08.0.tar.xz", - "hash": "sha256-88TO/fByNQohsH85CQyPswVOU2DhqEAkoDiT5ZQnoBE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kjumpingcube-24.08.1.tar.xz", + "hash": "sha256-c6gHitp0vTGpzC56uusi6m84OmEyTIepJ+2j1P0n3U0=" }, "kldap": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kldap-24.08.0.tar.xz", - "hash": "sha256-PkXm7KztC3IBi7mn/Nn2ipaCN+oMK5U2JwQL6QhkAJQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kldap-24.08.1.tar.xz", + "hash": "sha256-lLUsSNWaKgeEYefTmP3eigdG+DGTkuSdIBdF8C5G0u8=" }, "kleopatra": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kleopatra-24.08.0.tar.xz", - "hash": "sha256-1qiptQIBpBqRNQYzxs7shh+lf7DKBzAYJYV5QtReoys=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kleopatra-24.08.1.tar.xz", + "hash": "sha256-juW9kggi5PVMm11ap7dzMdKBOyW0PtipwMExygsby2w=" }, "klettres": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/klettres-24.08.0.tar.xz", - "hash": "sha256-HhXa6pJSePIoTS5QD4mnGwSMuGD6db3PqJnAevX/gbI=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/klettres-24.08.1.tar.xz", + "hash": "sha256-qqD9gS5frocObmIJ+M6jAmKeQP7CJBtAKefOsxSmlxg=" }, "klickety": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/klickety-24.08.0.tar.xz", - "hash": "sha256-//ovtQu0Qwin6byVbqWDi233mjdXd+hFGPXPa3hLGU0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/klickety-24.08.1.tar.xz", + "hash": "sha256-/nUD35uFODiJC96uo+wTP0gn2qhxZkbLL6/QNpBcDYA=" }, "klines": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/klines-24.08.0.tar.xz", - "hash": "sha256-MMKL9cNmL3HuKQAlmW8PDeEYdx7L+D3Bw3TGN1vcOFg=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/klines-24.08.1.tar.xz", + "hash": "sha256-yj8R/4zLzTXdmvpk6tthFm1lcSqhenm++70YsDeGTMs=" }, "kmag": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kmag-24.08.0.tar.xz", - "hash": "sha256-aftNNBPuoxufhF8fZZZ4DZKeZq/PvxNFrfqbIOxkuqc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kmag-24.08.1.tar.xz", + "hash": "sha256-hbe0tq2gRm9plDLUun7VpzPhqczTxu2PG/r8+vTERu4=" }, "kmahjongg": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kmahjongg-24.08.0.tar.xz", - "hash": "sha256-FlC1LdiQMAcDUHvM0UI0rsVQY7Lhgw0q7Q02BJoQtmM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kmahjongg-24.08.1.tar.xz", + "hash": "sha256-2LlkBhMLPEH90LMzCRnXWMtZ/kGigZlM0Gdk5BFL7HA=" }, "kmail": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kmail-24.08.0.tar.xz", - "hash": "sha256-lNyJElVy+BrCo/s4ffOyDfLglGLYr3NDhtavX8+fwdM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kmail-24.08.1.tar.xz", + "hash": "sha256-q1q9BXjxmW2vOp+2dPOUkVRM4z5++zyh//Fe9vVzEHI=" }, "kmail-account-wizard": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kmail-account-wizard-24.08.0.tar.xz", - "hash": "sha256-I4Qyfo0JEaxqB/WG6ZvSxqR5rt98zT0bVabW9s/g2tQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kmail-account-wizard-24.08.1.tar.xz", + "hash": "sha256-0Sz6miBt3l6gHn6iS6oKpJX6Sz1V+oZMZgZP1Q38cLI=" }, "kmailtransport": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kmailtransport-24.08.0.tar.xz", - "hash": "sha256-llhyO/aSXTOdybQ5K22KHPZOG9FLi5aD5q5H+RhrP58=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kmailtransport-24.08.1.tar.xz", + "hash": "sha256-J/MiRRtp1EU2LPcKjnySB36O2LJUjhlJBXpNE3y6MG8=" }, "kmbox": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kmbox-24.08.0.tar.xz", - "hash": "sha256-UCNBTXAREwWVeHnZZX7abHnqpr3Q9ImVu7H0iTNBAuM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kmbox-24.08.1.tar.xz", + "hash": "sha256-kyjDkwOMGYvlVHx0Nsoar3zfQUZtzMMsjt+SrDPq8I8=" }, "kmime": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kmime-24.08.0.tar.xz", - "hash": "sha256-nlqpDYojFLX7wBXwZpIvLh+lKdqtO3bf01FWepVDU8I=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kmime-24.08.1.tar.xz", + "hash": "sha256-7EePJhRLHftvDquOjvsMHwatNJy7T1XP8jPcrPY1pIM=" }, "kmines": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kmines-24.08.0.tar.xz", - "hash": "sha256-B9KVW7Z3zpHjAaahj1NfIGtU8karg01dZ8N3C/s87Ao=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kmines-24.08.1.tar.xz", + "hash": "sha256-H40mz5Iiirt5DdfC7eTBmnmov8PKeEZ2h9R1WhnNM9o=" }, "kmix": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kmix-24.08.0.tar.xz", - "hash": "sha256-8SG70thSZcxBeyL1wbcz0V/LkXuyZRO5DbvK3V/Zd/k=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kmix-24.08.1.tar.xz", + "hash": "sha256-IXOVdWDucSwh895FvK3l/YNJgegmLooyU6NBZlYVuBw=" }, "kmousetool": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kmousetool-24.08.0.tar.xz", - "hash": "sha256-Ug2uvGzeDTtzs7+VOJ2dFtK7t5Tpcamlwxx7XQQwemc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kmousetool-24.08.1.tar.xz", + "hash": "sha256-GWRrYdkheqaefPmIzDTyWBXRY2T2LyBeYCmXNiVhEGw=" }, "kmouth": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kmouth-24.08.0.tar.xz", - "hash": "sha256-kOK6mzqcrCFc/Ky2CSjtTgEbvUnPml/Pp+GF1lPR1Hw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kmouth-24.08.1.tar.xz", + "hash": "sha256-T0Ta2Fj+LJYpgfHgh8Sppis5OVCywr2KAgotYjlQcf0=" }, "kmplot": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kmplot-24.08.0.tar.xz", - "hash": "sha256-T2ohqTUE31cS8PJ69yKM+HEpSTU2tiRQvM4e8LpfmRI=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kmplot-24.08.1.tar.xz", + "hash": "sha256-eUVVrvF5lzOUQ0ePh1TUq3kdXBxLJkOdRep3BHJMHNk=" }, "knavalbattle": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/knavalbattle-24.08.0.tar.xz", - "hash": "sha256-u5yXhhOw/AoXIueX6+/AD0dkkyu7R+HTFfYqluUw8dU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/knavalbattle-24.08.1.tar.xz", + "hash": "sha256-QLLpz37dyroTfNAL00N6q40OlZFab1rO58HtpXaMI58=" }, "knetwalk": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/knetwalk-24.08.0.tar.xz", - "hash": "sha256-UKtpU7G0dv2QtnsUNLX1T+QEsPMiL+cZvgrFPXqAbn8=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/knetwalk-24.08.1.tar.xz", + "hash": "sha256-TRvvJ4y70n7W1YoDU4TyVDdzzaWx+OTAL/2lTDhJvtg=" }, "knights": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/knights-24.08.0.tar.xz", - "hash": "sha256-M9sCuZsxF55CIj/b66ISJ7Rz6aXj1xT8LRc/f4N0okc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/knights-24.08.1.tar.xz", + "hash": "sha256-k8Ns4f0GTDmWVUXck21Qg8q71OdcIqynW4aXpJ+mF1Q=" }, "koko": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/koko-24.08.0.tar.xz", - "hash": "sha256-dUjbFz7b/8tC/vaT2NCWbb/E745kmoXaXADMqM9MmFU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/koko-24.08.1.tar.xz", + "hash": "sha256-PGOOXH09hfpsHxgJT9LBJDdOBEwxx+tlB2fJGsEGVRw=" }, "kolf": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kolf-24.08.0.tar.xz", - "hash": "sha256-2QmZlBSK6WDyIxd8JcG8XDneuPMVFDdPeroI0/BB/Xg=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kolf-24.08.1.tar.xz", + "hash": "sha256-ccoQ9q40xymrFoA2hDARz9IsFtKi4mhAk2yp77Qaw60=" }, "kollision": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kollision-24.08.0.tar.xz", - "hash": "sha256-VVdbCbs6HOB6EtugyyyKeYeJVnGnS4hyeETFfJRuwj4=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kollision-24.08.1.tar.xz", + "hash": "sha256-XZ9LgoiftA6kHXhSRUYW5Ky31he8njrYzkFT9SLOlF8=" }, "kolourpaint": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kolourpaint-24.08.0.tar.xz", - "hash": "sha256-DbzZL29Vv0SNVVe/bxX8pXeSWcfAXy1IRhKcbCAkbY8=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kolourpaint-24.08.1.tar.xz", + "hash": "sha256-MOEZLGX50WBi+cx4sJNvBvbrzTR8VuYZn+KT19RWl3U=" }, "kompare": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kompare-24.08.0.tar.xz", - "hash": "sha256-Md7D7zjzylqVvCJRg1bnIwG/2UCYwmn6av95auuPCA0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kompare-24.08.1.tar.xz", + "hash": "sha256-wEJKFqgjilcR8Olge9+eJF0e7/f4LT2h8YSS6yvnWLU=" }, "kongress": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kongress-24.08.0.tar.xz", - "hash": "sha256-lB1kZpcA/8ixQ0tU/j+78U1tjultXQ1pr1DlZiUqNDY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kongress-24.08.1.tar.xz", + "hash": "sha256-2PY4gA9a3q1SP1ynmv0U892lUH55db6ic+eLuEcoJtg=" }, "konqueror": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/konqueror-24.08.0.tar.xz", - "hash": "sha256-0RwVPbGmPThQ4FCRNVaqiPg0uk3fcEWhpXaZ7BmLN+Q=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/konqueror-24.08.1.tar.xz", + "hash": "sha256-lpFvLR8klPKtGkVVDxz7hLDqMNnulK78AhedysW8ah0=" }, "konquest": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/konquest-24.08.0.tar.xz", - "hash": "sha256-AukocveKyFpoW4SVItpA2a3JrPZ2JgywUlsKIt94J3A=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/konquest-24.08.1.tar.xz", + "hash": "sha256-VOiobACwcPJhfRjdhZqfdqGea7Kn04BUtjlIB+fIDbY=" }, "konsole": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/konsole-24.08.0.tar.xz", - "hash": "sha256-AJXxr8TkpM02oSopJ+CQ5i+w0BbTiRS8hYr1aLdBYQE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/konsole-24.08.1.tar.xz", + "hash": "sha256-ZSGeT2r6Ceryb9PpE3nQfZOWDS9c5BJWhADotxsN1wg=" }, "kontact": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kontact-24.08.0.tar.xz", - "hash": "sha256-UUPIrP5Dd5wLtQ+nrjtYjsEepg8SPascncQt6egxtA4=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kontact-24.08.1.tar.xz", + "hash": "sha256-1XMonau/VuJIyPCxYrMtZjbiMhBxoJsXm67Ie7XCG7I=" }, "kontactinterface": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kontactinterface-24.08.0.tar.xz", - "hash": "sha256-9mOFH6UY2TXqhteBOHx5fyEpl93v8m95Il5lzYuUwrM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kontactinterface-24.08.1.tar.xz", + "hash": "sha256-/ju5yF4J/aselLEpYYtDLwY1JadaqpdVthIvpKpD8To=" }, "kontrast": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kontrast-24.08.0.tar.xz", - "hash": "sha256-0WPUA6144PQtoJa5mtu+DykJU8FwMs0MFw5tj1r910c=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kontrast-24.08.1.tar.xz", + "hash": "sha256-0CRFlgNuhhtIyYeIrtOL17mDQQOoXKKIW/aFGgCiyC8=" }, "konversation": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/konversation-24.08.0.tar.xz", - "hash": "sha256-0WWH9QzGUZvo8Idv/M0/azyRQmUgRmN6OTzYInWJB6A=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/konversation-24.08.1.tar.xz", + "hash": "sha256-Y1zbukUfov8mwzFz/+RGdBgLTJDz13ToZBj9hF5bDG0=" }, "kopeninghours": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kopeninghours-24.08.0.tar.xz", - "hash": "sha256-2cl7PG/8bHEFvB+JB4hHWobke8Anh5FtrmRZvcw2WNY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kopeninghours-24.08.1.tar.xz", + "hash": "sha256-9NZDVi8Ohy7kyOCpfzGcuUtpoB2UhJtShReMi7pZpwM=" }, "korganizer": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/korganizer-24.08.0.tar.xz", - "hash": "sha256-J9Gt4vSOidseS7uufqcaVWHmZgBGbY4Sjx6M+Vsu6yA=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/korganizer-24.08.1.tar.xz", + "hash": "sha256-AZ9o2VKqWmYAGI8gs1Fh4etbKQqww52P09lNUxBlTmM=" }, "kosmindoormap": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kosmindoormap-24.08.0.tar.xz", - "hash": "sha256-t0x46OIDj3UWXcmJmhZJjlJFgMmuaHJpo41sWlgqspk=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kosmindoormap-24.08.1.tar.xz", + "hash": "sha256-0uz2Kwl/hp2g0VjkoAoIuwYOdKCvnjS3oa8/2swVV1o=" }, "kpat": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kpat-24.08.0.tar.xz", - "hash": "sha256-18llnfgpl+NTRdSsmaY8gbVXcyzRrL9n8pSyhLvBXj0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kpat-24.08.1.tar.xz", + "hash": "sha256-wYkifGsBxoQMKEYwFMQNBcUOvjrSc+oVah8RgCRWfMo=" }, "kpimtextedit": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kpimtextedit-24.08.0.tar.xz", - "hash": "sha256-q8fVFwlnsBD6as4v92JnG1ISqd5FQvPaP8MdvnI1wKM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kpimtextedit-24.08.1.tar.xz", + "hash": "sha256-v5QdJFoGJrOzarAcGHIqpS/My5GgF8f/Owb8+ctz0t0=" }, "kpkpass": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kpkpass-24.08.0.tar.xz", - "hash": "sha256-D7bLVHoFAdT70B3UmYbpjUL/Sv4CpNzgrLt0HN/2sbs=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kpkpass-24.08.1.tar.xz", + "hash": "sha256-iSMVU9aTQ/y+NjaI+km8ngW292lYBP21ISDocSsdgW8=" }, "kpmcore": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kpmcore-24.08.0.tar.xz", - "hash": "sha256-rCX+KCl7oqMor6oDwOXYF63jcU13k6kKIE+baUsJDWc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kpmcore-24.08.1.tar.xz", + "hash": "sha256-J0VQpdyNYTuo73lH/k5XwPgjOmCVRWM1nycS4FnwmoA=" }, "kpublictransport": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kpublictransport-24.08.0.tar.xz", - "hash": "sha256-6RRF031M4Pa7mqDAOepz8nCfZXEr0Rxy86g6rbwDjJY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kpublictransport-24.08.1.tar.xz", + "hash": "sha256-y3MFz/jWBY8Xc7hPfiztgmFMl2hUwTtFX6tJcyrWVqc=" }, "kqtquickcharts": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kqtquickcharts-24.08.0.tar.xz", - "hash": "sha256-1B2Vg8ukbLNt407DVef3PPd+OAqP+yvTS/93nja+L2o=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kqtquickcharts-24.08.1.tar.xz", + "hash": "sha256-EoDXakzOtuGHMbyZs7LAeOufzawKA5PfXnoG80JjzWM=" }, "krdc": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/krdc-24.08.0.tar.xz", - "hash": "sha256-tr/aXajvUu83rA1A8ddV+CrC5onzSG05nZu5tXruMwU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/krdc-24.08.1.tar.xz", + "hash": "sha256-YOVQAFPJW+vq26Y0jWRhGJrVkBkIvP5R+E/7RwIGyDw=" }, "krecorder": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/krecorder-24.08.0.tar.xz", - "hash": "sha256-LCpD9pzXvGj1hLIV++OmBl5wXR8JQZhpEECLqwYOZa8=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/krecorder-24.08.1.tar.xz", + "hash": "sha256-Y6SSwryA8N5Yq3bfudtKvPLK/TmwsD/C8tePYfYx64w=" }, "kreversi": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kreversi-24.08.0.tar.xz", - "hash": "sha256-zhrjBv8EgbSwK27vIEBzRBW+XPTMUHTpxNcdTcrvsTQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kreversi-24.08.1.tar.xz", + "hash": "sha256-hnwq00iukLRC8QQ59c8InhR5cKHgahOtYSt+jORxZe4=" }, "krfb": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/krfb-24.08.0.tar.xz", - "hash": "sha256-0IwKqlT/oFWLBFBdplVjF2mVt1rBlKFLWG2lWZEGGMQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/krfb-24.08.1.tar.xz", + "hash": "sha256-7l9Nqy0sBSrwltWHgkYTUfFQ/KGbbsZtrOh8iZVgl1o=" }, "kross-interpreters": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kross-interpreters-24.08.0.tar.xz", - "hash": "sha256-CiBDIPQQsRItXtCwuneAWN1yLeuf1NqZqdDDnmnwyMI=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kross-interpreters-24.08.1.tar.xz", + "hash": "sha256-rPySduwB4DsNCB63ubj8p0kA/42h8MqtSKshJ4eCGlA=" }, "kruler": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kruler-24.08.0.tar.xz", - "hash": "sha256-d6r/L2d+7TOGzZot+IZ5/c0ZQEwy2GFVazzE2+VOkb8=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kruler-24.08.1.tar.xz", + "hash": "sha256-LVlVGfQdD9UO4pXQF8TbnRFiqwV0K2Sq7JkAVRsqc7I=" }, "ksanecore": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ksanecore-24.08.0.tar.xz", - "hash": "sha256-jTe4HuWtzkNQ1s5RwEWyXf3uX+RQVv2Z6fKyHVPARy0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ksanecore-24.08.1.tar.xz", + "hash": "sha256-qe7k925CmnzbhoyQFVrZsawBNAXYVp7PpXFcISvN/Uo=" }, "kshisen": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kshisen-24.08.0.tar.xz", - "hash": "sha256-9fjZOUc4hngc+Sr3YwpK3wAKPRKFPNHQThzQ5qyV7Co=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kshisen-24.08.1.tar.xz", + "hash": "sha256-i5U7us2B34vH5nDdApt+syS/Q0Z0dx2GNwiB3/NfwZ0=" }, "ksirk": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ksirk-24.08.0.tar.xz", - "hash": "sha256-aalvqmlVkqEohmpKHhXBAYropkc7/r5U/3kzwC8IISg=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ksirk-24.08.1.tar.xz", + "hash": "sha256-ixOSCC76lYHA1cuddZB4IlL9t5ZzgWNWrntaDUZY9nk=" }, "ksmtp": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ksmtp-24.08.0.tar.xz", - "hash": "sha256-QJ/8+W5D6LZcxJwVdtmiFOf7rGOJVPqehkPUYgzrzHQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ksmtp-24.08.1.tar.xz", + "hash": "sha256-3mc85BCk+FeWxaEs5DihsNoNOnX+99L1amt3k8bf7zM=" }, "ksnakeduel": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ksnakeduel-24.08.0.tar.xz", - "hash": "sha256-NAxI0GcmRqee2WNbFwhrQ4kXZuvghbTJ4oNRP/T+bkg=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ksnakeduel-24.08.1.tar.xz", + "hash": "sha256-Rn7rvYP2MqTyUTSWgMKogWVNqxBnEgmFaIYPeMgv+24=" }, "kspaceduel": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kspaceduel-24.08.0.tar.xz", - "hash": "sha256-gXjVRIdZ7Nvr8z/WvY2eXzfi5WI/V1e1A82/O0enYzA=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kspaceduel-24.08.1.tar.xz", + "hash": "sha256-uLMh2JxwLWsGU1JQ+bGiklbvWqzJiPun7WENGgQGtwI=" }, "ksquares": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ksquares-24.08.0.tar.xz", - "hash": "sha256-q498N7qP1G+TonbahvY5+jIn08Sv9VBjCrnVdImIeLQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ksquares-24.08.1.tar.xz", + "hash": "sha256-b+A4dxS9/XtcODTo9rlIjxb3Xv4mcrTzEKeL/zBDI54=" }, "ksudoku": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ksudoku-24.08.0.tar.xz", - "hash": "sha256-o0h2qqZ1LF1hPYfT/1HSMwxMWXNmXv8DoZwIcivnUxE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ksudoku-24.08.1.tar.xz", + "hash": "sha256-UOmy4zgs78Cr9xWvKc7pp8ywmAzVMGZnls+JLPRjRq8=" }, "ksystemlog": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ksystemlog-24.08.0.tar.xz", - "hash": "sha256-0EuV0VoqXvVbtQy/azpYXvgrFkkfw8mw2oIx3BeMbFI=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ksystemlog-24.08.1.tar.xz", + "hash": "sha256-pMnTIhX4PYSRGOgvNxvKazg2u1Dbtrw6/t66MQquqZ4=" }, "kteatime": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kteatime-24.08.0.tar.xz", - "hash": "sha256-EYUaSftTq3Qx194iGAppByifLNGnL2jVFWEZOVSnV1M=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kteatime-24.08.1.tar.xz", + "hash": "sha256-6C8Jhqc8hRycFZBbxMzrG4rhd1WZvc3dWiBhygggpwg=" }, "ktimer": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ktimer-24.08.0.tar.xz", - "hash": "sha256-oCxXlOyOSBeFqosFwOvN9U8JrOIY434XFRLPlSo8Fqc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ktimer-24.08.1.tar.xz", + "hash": "sha256-bUK/vpkN4+5FZwreEWTBhxFart6VCuNV1Txv4J4Ed0c=" }, "ktnef": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ktnef-24.08.0.tar.xz", - "hash": "sha256-Jero6cKN56hUEKsV11h07DK1ECrVZucZYZQRQuPVLGY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ktnef-24.08.1.tar.xz", + "hash": "sha256-wFoDST3jrgwjsr86exDO24ES1gZuh8CTtcslR2tb074=" }, "ktorrent": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ktorrent-24.08.0.tar.xz", - "hash": "sha256-wK5GiaqT9QBZIIgFjefLFuuZVuSBKtPTo7p+upCOJ0E=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ktorrent-24.08.1.tar.xz", + "hash": "sha256-aU98JBF1+vkSVRfOs2knPNq4yR6BxP6rej7D4afkvmE=" }, "ktouch": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ktouch-24.08.0.tar.xz", - "hash": "sha256-bBsZBV/ga5msdoUttTWEbU1IKkF6jbwzv0iNwXK//BQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ktouch-24.08.1.tar.xz", + "hash": "sha256-jx31T7k+i2+IyGmjvfuxWZYAETFZJcsnUFdN/d3dsg0=" }, "ktrip": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ktrip-24.08.0.tar.xz", - "hash": "sha256-Ya41l/Z/7HGteY+H7OwNqQpm1o3zK3bFUfeGyH8gQJE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ktrip-24.08.1.tar.xz", + "hash": "sha256-X997nkQqO3LJ7kSVxz8Dpy66VOuB8ALCDIZmQFe9ipc=" }, "ktuberling": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/ktuberling-24.08.0.tar.xz", - "hash": "sha256-3U3xWYoZRKdzw3YKgcSnJl0e8UA8x3zbue5oZcmMV5A=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/ktuberling-24.08.1.tar.xz", + "hash": "sha256-W4nzpWKPOsH4KqV++ml3USxMPgOQBFefrQvSp+aLLCE=" }, "kturtle": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kturtle-24.08.0.tar.xz", - "hash": "sha256-W2ehCybNjs+rJD6wzSVIV9qLXibgCYgnfO89yvJxaTQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kturtle-24.08.1.tar.xz", + "hash": "sha256-OU93eu1iaOieu2ywMaftW9DjQXWfSfxEBn3vlRSqTbw=" }, "kubrick": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kubrick-24.08.0.tar.xz", - "hash": "sha256-zmklL8jYSVTSWhUZZc6QgzPFkIYdClcPKkEuTd/Imp0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kubrick-24.08.1.tar.xz", + "hash": "sha256-gPuqpzxzlVjiDNkweMz/8RHpotN6WZelw/XeEodS9/8=" }, "kwalletmanager": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kwalletmanager-24.08.0.tar.xz", - "hash": "sha256-CPkA+e93CyvJIIeB5dzbfgxD8MekehUVsYiPJHVlQvc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kwalletmanager-24.08.1.tar.xz", + "hash": "sha256-0Aa5uz1OCjx30qc/v+FQ83s8Kj/lJkQgMazPHcG7OqU=" }, "kwave": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kwave-24.08.0.tar.xz", - "hash": "sha256-w6rlGXSpFDuzfFCcwSPABCTMUXNdwSsBVDDwg5v4RNo=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kwave-24.08.1.tar.xz", + "hash": "sha256-VcXNXSH8A19huuZvORao1/0IwhjCeT288T/cMzOxu+U=" }, "kweather": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kweather-24.08.0.tar.xz", - "hash": "sha256-arQZYb9Xv+tCtnkWfzpC4livJkuRllTnD3gLgU0eA1Q=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kweather-24.08.1.tar.xz", + "hash": "sha256-efVml7TzyJe2tgLo6Gntq+Ld0Vy8nT2VYSg5AlLS2AI=" }, "kweathercore": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kweathercore-24.08.0.tar.xz", - "hash": "sha256-raRpFE8s119wxtR0uWXj1c9JyAxPMnD602OZiJEmsbI=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kweathercore-24.08.1.tar.xz", + "hash": "sha256-FudSDS/wPNxUnX+xsY+bTuUF+KpZiSZjuWa8rQKshiE=" }, "kwordquiz": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/kwordquiz-24.08.0.tar.xz", - "hash": "sha256-ebRx+Y4cuDbbxMleW33ClXOf2j9zYIc+hAVFgyTA5Bw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/kwordquiz-24.08.1.tar.xz", + "hash": "sha256-RprRKZmzQxyXEjMn1eUXaF+OMdRPjl4OWA74oqPcOmA=" }, "libgravatar": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libgravatar-24.08.0.tar.xz", - "hash": "sha256-MY5VHQ66AT1rqh1SXgbdtU0e5rmoVAX438sFf9ZbHfs=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libgravatar-24.08.1.tar.xz", + "hash": "sha256-jU0QOjWxD8gmQeSMW/pWII+9RKNsbhCqZJ1cDqzpU94=" }, "libkcddb": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libkcddb-24.08.0.tar.xz", - "hash": "sha256-Ystogr/0zidLxemHFd7Mi4lk+YCReCGe9Jy9N9CRlBo=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libkcddb-24.08.1.tar.xz", + "hash": "sha256-pgzebMlDJPF+XkHlCf+t3/y1f7xzQR0tFWfAnkxTB74=" }, "libkcompactdisc": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libkcompactdisc-24.08.0.tar.xz", - "hash": "sha256-QL4OXtsFGqfejKfOIOdd6TXzTje2pSUbetHzCIpGazw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libkcompactdisc-24.08.1.tar.xz", + "hash": "sha256-RWJLclL8vjD24QX/i8+OhEy1bBzT3iZCXBvawefJLrY=" }, "libkdcraw": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libkdcraw-24.08.0.tar.xz", - "hash": "sha256-tkt/CUKWvk5on0hGyNOsgvk9wwy9ksy/YrZVluiGJcI=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libkdcraw-24.08.1.tar.xz", + "hash": "sha256-3O2i6790ebojLpEI0c9Y1hPfD6dsmQEG7lnbuoycMvY=" }, "libkdegames": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libkdegames-24.08.0.tar.xz", - "hash": "sha256-IvnUIHbYlqjgpVuOALN5dBgOn2uGBrARA4247m9DV8U=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libkdegames-24.08.1.tar.xz", + "hash": "sha256-SLIlSmzfOHRLbvQP9H5EMLkmM7sgAwMK7Y7f1JdBT8I=" }, "libkdepim": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libkdepim-24.08.0.tar.xz", - "hash": "sha256-NrdzUbmL3RLLKnA+s/TIe1akf4G84SQYxNZ0EkZey8o=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libkdepim-24.08.1.tar.xz", + "hash": "sha256-y3b6t+zhTcA8sJCiymopcsy8NPaobExn7Smhj/Mwn20=" }, "libkeduvocdocument": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libkeduvocdocument-24.08.0.tar.xz", - "hash": "sha256-n/lNd8Zu9XS8UfU4T6M3CoVFJKgJurEKKSzNV9cjqMU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libkeduvocdocument-24.08.1.tar.xz", + "hash": "sha256-DplQDk46v04XlaOQw3KM6f55m1ZpZdWNTrJQA6EwMpE=" }, "libkexiv2": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libkexiv2-24.08.0.tar.xz", - "hash": "sha256-YV+qaUmskGmDLTgcVqfIMRpCDF1CxNZ0utpiYFpVcpE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libkexiv2-24.08.1.tar.xz", + "hash": "sha256-J9i2HgWGnP3uaFGDkZyzFELbeF0LRAOZyLqEYpSnvmc=" }, "libkgapi": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libkgapi-24.08.0.tar.xz", - "hash": "sha256-Hbnl4rG7VQs2eA+ateVx4Vt105fFVV4OGP2ONUHdyRU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libkgapi-24.08.1.tar.xz", + "hash": "sha256-wk7cdR9mtsRorB6R3z8sQRSmItk+u6kAuXjprRPbj/M=" }, "libkleo": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libkleo-24.08.0.tar.xz", - "hash": "sha256-lRZX62JWhvEzBf2uHVLgxeWhCOHzugPRCAI5oMD1MfE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libkleo-24.08.1.tar.xz", + "hash": "sha256-yYJYD4wbzr8aIUYl3J//iEK+YuR+iVF1X/HKflIuLRg=" }, "libkmahjongg": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libkmahjongg-24.08.0.tar.xz", - "hash": "sha256-jg09iIjDgyg3+Y/+dUiz/W+WF8Ai/jxQz29A3hfp93s=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libkmahjongg-24.08.1.tar.xz", + "hash": "sha256-L/oISXYIZG33aSnnCRdV7i+NsuwN/IryoyRxKmSjiog=" }, "libkomparediff2": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libkomparediff2-24.08.0.tar.xz", - "hash": "sha256-qfV+nxGzTdncFI+4XC/JBPbIqH3ZLmdsOH1bhQzQzGY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libkomparediff2-24.08.1.tar.xz", + "hash": "sha256-+6rD4LlVhlwSPF+DBtsZmytcv4pBF83xyZvwu7sI0PI=" }, "libksane": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libksane-24.08.0.tar.xz", - "hash": "sha256-S/vFYomxj8AggJ1cuJGFCUeDNwco4Ct83So4MrYJuz0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libksane-24.08.1.tar.xz", + "hash": "sha256-4+cDtO+jNrdKUwn9WJMgUrg8Kh45/x6KkLXPfLm6Mm4=" }, "libksieve": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libksieve-24.08.0.tar.xz", - "hash": "sha256-j0ISnmvWqDt1HwQ9DHsxbc6318Af1ZWpjXputlj56BQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libksieve-24.08.1.tar.xz", + "hash": "sha256-hYjjTbiC2qAW9GRh5RNcB63kO1zfZZGL5ny4itGnrx0=" }, "libktorrent": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/libktorrent-24.08.0.tar.xz", - "hash": "sha256-f16GYmQvhdbXav4A4cN98DD8Kk8z2UXWxuJ9JAGvs9E=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/libktorrent-24.08.1.tar.xz", + "hash": "sha256-cwWY05Pxvaanvg8df4vy7SckYG6SVhDyIgJ3Fkn8WwI=" }, "lokalize": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/lokalize-24.08.0.tar.xz", - "hash": "sha256-t4dEUvwUnTLv2o3ARxn3V4s/InPuqCJ7K/JXVGUKnKY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/lokalize-24.08.1.tar.xz", + "hash": "sha256-wonzvixrGfX71UwCuR+An/fPNyzty/B48cTxphRx+Fs=" }, "lskat": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/lskat-24.08.0.tar.xz", - "hash": "sha256-OvVvW569ab/H/WQSvqmyiDbTf5K4QSygJNxDKs7V35c=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/lskat-24.08.1.tar.xz", + "hash": "sha256-VwyDfV32tL4HmkIOcl+CC/NGBCaUNlpnesu1fdZsY3I=" }, "mailcommon": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/mailcommon-24.08.0.tar.xz", - "hash": "sha256-6Ud0WtcsS0uc80dC/Oz4TUVml4XQ3wgfXE5Z3gCQDhE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/mailcommon-24.08.1.tar.xz", + "hash": "sha256-LzZeswVktJu4+lT0E/TvSVhw8kSqY3vbbQm28pukM9U=" }, "mailimporter": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/mailimporter-24.08.0.tar.xz", - "hash": "sha256-ZfxxidFpgoSgN2Nfx/tsZFc3xLxhqLI21npofra7YtM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/mailimporter-24.08.1.tar.xz", + "hash": "sha256-XtHepApkb6bCqiHNcFjrXIvFPYrFJqclzvTB4JZ65IM=" }, "marble": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/marble-24.08.0.tar.xz", - "hash": "sha256-vALHCcFVGPocan2v7yxQfhRXHU9yJIb6yhv44YvpMaU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/marble-24.08.1.tar.xz", + "hash": "sha256-e+fQQNGNXLVfOzntLxb4I5wx1a0STNHSvBJK5px6THw=" }, "markdownpart": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/markdownpart-24.08.0.tar.xz", - "hash": "sha256-L4O25JE3CZUxRLhzoBp5tugcp14zvq5D/DeIu9gP/Rc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/markdownpart-24.08.1.tar.xz", + "hash": "sha256-A59jxdlixu7xvRS5PJQ3+17nEESO/JqA3YlGehnkDT0=" }, "massif-visualizer": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/massif-visualizer-24.08.0.tar.xz", - "hash": "sha256-3WBcRz9tLHfNKm66q1ZFp3hO9+QUplv/NXg26KJt9ZA=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/massif-visualizer-24.08.1.tar.xz", + "hash": "sha256-zIkB9p7LuXv5EN9wCr9eC0lEykXpEWuMQdRX+GAZQSw=" }, "mbox-importer": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/mbox-importer-24.08.0.tar.xz", - "hash": "sha256-VZoRLA28c8oVLR0jekFJ3qmM6X7LdVZvve82p+GyHDY=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/mbox-importer-24.08.1.tar.xz", + "hash": "sha256-45RaecU9MmKBnms06GbZBaN1RCKpDRuQq0QOqryWhmU=" }, "merkuro": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/merkuro-24.08.0.tar.xz", - "hash": "sha256-cmBwvvOEU+rdPe5oto+ylNwhUQe5jBqO20YbrRyfva4=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/merkuro-24.08.1.tar.xz", + "hash": "sha256-h+cTXd1UzXrO2exfxZPF4oPFwsR6gkF2M2iGN78yBqU=" }, "messagelib": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/messagelib-24.08.0.tar.xz", - "hash": "sha256-xEwMTsMFa0eTCEb0TraFR52wYoHHnurXjt9XkDuKuKU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/messagelib-24.08.1.tar.xz", + "hash": "sha256-dBSFVm1WwRnZ0atguaBPwoOVw/mDCCSbotUGvahu+5s=" }, "mimetreeparser": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/mimetreeparser-24.08.0.tar.xz", - "hash": "sha256-vAQBp9TbrksYzq19eItUvWsntGCFCymbAfB7RwadsF4=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/mimetreeparser-24.08.1.tar.xz", + "hash": "sha256-43lifAN816wxbFRXVjJuqHP6w+QwOA4yYjd77gKp7Ew=" }, "minuet": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/minuet-24.08.0.tar.xz", - "hash": "sha256-fpo9jvI7pJrKFi4XjTrGS+gxfPMoDS3v+adVS5d2RXM=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/minuet-24.08.1.tar.xz", + "hash": "sha256-jc00peuH4LYSxrudt3jQ+sx5YYy53I3ePNhyQ5dMDNQ=" }, "neochat": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/neochat-24.08.0.tar.xz", - "hash": "sha256-a3LRhkzA2QcEMYyJcLncai2s1UH8W5XEbc67XGphcF8=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/neochat-24.08.1.tar.xz", + "hash": "sha256-o5TwTPGdVWdDflWAdcn3zlw3v3OUOxPEdzn/VqzeVx0=" }, "okular": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/okular-24.08.0.tar.xz", - "hash": "sha256-PeFuJilLOGMnDfF2BAOmdro9cgRzi+vOigVWLZMsMYs=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/okular-24.08.1.tar.xz", + "hash": "sha256-sFdlXBPk+lZtKIcwrrlhmK74qQy2odalX1ZvpaawLok=" }, "palapeli": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/palapeli-24.08.0.tar.xz", - "hash": "sha256-VyhEOYlURTtfjcUxa7D0uc4WCqBKCNs3OXqas6yvgGk=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/palapeli-24.08.1.tar.xz", + "hash": "sha256-7C0TN9iUk6BTA/vx6AAZDiJx7HqUgrRMx3g0yuFrw2g=" }, "parley": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/parley-24.08.0.tar.xz", - "hash": "sha256-xc2yp8U4X013GWaWpWmOjgWSrDh2X0nnUK96RuLOB7M=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/parley-24.08.1.tar.xz", + "hash": "sha256-SHHwS3OYssUKxqaoY5VHCxeHWJx0lKPoQAvw11ERib4=" }, "partitionmanager": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/partitionmanager-24.08.0.tar.xz", - "hash": "sha256-9fjcTxqqFkuXxBCGyjgH75OmjZUi+Q3RZ+bH563sZKs=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/partitionmanager-24.08.1.tar.xz", + "hash": "sha256-MuRN734ePlesgfIHRK/KpYX/Imnq+2GSJC8KsPNtXNw=" }, "picmi": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/picmi-24.08.0.tar.xz", - "hash": "sha256-eDu6M8fC+FkxHtM7iG9QuyRYDqgN5ZHFijGe11d3ooQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/picmi-24.08.1.tar.xz", + "hash": "sha256-AcFyuif12DI4NrRy3EOeM7l1IQPd1dI8AStLkzJZSbE=" }, "pimcommon": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/pimcommon-24.08.0.tar.xz", - "hash": "sha256-zo6F5Fv8TviPDAgXGfz4+tR0PJvAsQmhOpxzZi4b130=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/pimcommon-24.08.1.tar.xz", + "hash": "sha256-MV7VWJKzxU6lFDrdx+kuwIvfYVcSlkPI/ZVi3DbsWp0=" }, "pim-data-exporter": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/pim-data-exporter-24.08.0.tar.xz", - "hash": "sha256-MSWiGSKJQYwI5yVSYExxBPLo8w9MPXwYGhdJqItMsfU=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/pim-data-exporter-24.08.1.tar.xz", + "hash": "sha256-q4J4Eo9vcFe0344eThuG7q1UBnUl/upxgMV4Qg6trcU=" }, "pim-sieve-editor": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/pim-sieve-editor-24.08.0.tar.xz", - "hash": "sha256-506FaBQs9/vrkmMwE9Lzn0dTcb9jJbP66aJvV5RjGrk=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/pim-sieve-editor-24.08.1.tar.xz", + "hash": "sha256-ojtEVNvQjK7tZpksjRBZ16Z8dEqqQi38p0YpPoiZ0qI=" }, "plasmatube": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/plasmatube-24.08.0.tar.xz", - "hash": "sha256-s8D03CEkaNE9L61zO8Jnt27mnYRTf4PvcbRX7HmuDLg=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/plasmatube-24.08.1.tar.xz", + "hash": "sha256-Jmk+Wpwqhitytla0hWTrtquuLolCHNf+ex/9f5j08mQ=" }, "poxml": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/poxml-24.08.0.tar.xz", - "hash": "sha256-wHJfCs2lCrVLr8SZ/Ru17004LvbPaLvkJREUY8DbUWo=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/poxml-24.08.1.tar.xz", + "hash": "sha256-1DCqQqvsG3+k9UcKZbTutT+AtOgJ2yKp0PxcN8XMb7A=" }, "qmlkonsole": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/qmlkonsole-24.08.0.tar.xz", - "hash": "sha256-hIgG4AcE1ElGsxmkSeuibBp5CqKIE5+355owSAkKdAw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/qmlkonsole-24.08.1.tar.xz", + "hash": "sha256-n1WUGOGtT7KJwMvKO5g9yxK1Bkdv0JggNqv9OHI0WAk=" }, "rocs": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/rocs-24.08.0.tar.xz", - "hash": "sha256-dGHHkdWrOylYGruihprg+57Ayod8evJysqAXCGDa0Yw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/rocs-24.08.1.tar.xz", + "hash": "sha256-4Xs60rEjlBU/dRbQzd2N87JOsrbf71UL1MbxAoovBoo=" }, "signon-kwallet-extension": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/signon-kwallet-extension-24.08.0.tar.xz", - "hash": "sha256-1cxHu5z+RchXrOYsDYBSnugOAFuWNpV5zzYE8SLOEsE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/signon-kwallet-extension-24.08.1.tar.xz", + "hash": "sha256-thBohLLk4aS3awPOHwZKfRvOQOj7Hk2ICLKaF9fLFK8=" }, "skanlite": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/skanlite-24.08.0.tar.xz", - "hash": "sha256-NDvrGS3AGEa3WTpTD+RoUF3YOSqOJ3jJJ0aYSAW1/78=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/skanlite-24.08.1.tar.xz", + "hash": "sha256-BtJoQKifmrCj5WMYViMS8jdppb7EBxOQG6XWxuW0DxM=" }, "skanpage": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/skanpage-24.08.0.tar.xz", - "hash": "sha256-aF7Q+f021EpwuMdU+W66p8X4Z6XB8RBPdfXXoS66lIQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/skanpage-24.08.1.tar.xz", + "hash": "sha256-SI24TNKnodN7ghoyDyOhk/5Hp/tp9F6UuEh/NBlmock=" }, "skladnik": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/skladnik-24.08.0.tar.xz", - "hash": "sha256-U1Q3bJAnOyxAQyxdAlFZlqnMMZEZeU/bisxjoBxG2Yg=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/skladnik-24.08.1.tar.xz", + "hash": "sha256-o76i2B2B5vWkbp0SEZtDjJlH97nAxXdB7uzBo+ATGOk=" }, "spectacle": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/spectacle-24.08.0.tar.xz", - "hash": "sha256-jTcTXG7dYvCfXmAEvvlHMxRmzyD97XlFBQDcgC3RrYw=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/spectacle-24.08.1.tar.xz", + "hash": "sha256-6DUYuyPFYpT8eGBkNBN2YOAnPBt5QaFbuglXE1TM1Mg=" }, "step": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/step-24.08.0.tar.xz", - "hash": "sha256-bI89lq4xelB+0rRUQcUQ5+92qbm+rrz35WiCkokTblE=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/step-24.08.1.tar.xz", + "hash": "sha256-aBdO/5L6WKaq94AwvselXWjvVJNPqlJ/MsoiIbGJPvY=" }, "svgpart": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/svgpart-24.08.0.tar.xz", - "hash": "sha256-IWvu1JWcImFb1x5NStM1AdpNK8MNqgUXlLne6vp+EzQ=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/svgpart-24.08.1.tar.xz", + "hash": "sha256-OAdmUcGQoZnqU4afgaczR/3pBIdTGQ8vFzy11LUbdXQ=" }, "sweeper": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/sweeper-24.08.0.tar.xz", - "hash": "sha256-F2t9cbNEVF7av45GyfcBxKAXAfMW4HeN7U8ZgW82TN8=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/sweeper-24.08.1.tar.xz", + "hash": "sha256-hpe5ZJU9hKKVcQcCAzB4HZ9LhXeWgNst43bVcdhqdt0=" }, "telly-skout": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/telly-skout-24.08.0.tar.xz", - "hash": "sha256-oSdsoZ2+N2DdXvrp7V+D/LHV7AbU84h81QDBeaKxZ/M=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/telly-skout-24.08.1.tar.xz", + "hash": "sha256-9biRXD2n9HYtL90FHJ9JXD9DCrDm64ydyclP2qANpPk=" }, "tokodon": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/tokodon-24.08.0.tar.xz", - "hash": "sha256-JNQhc5hmCGCCd/F/VofMJfbJOWjAkjlFzKJ9oTrkB4o=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/tokodon-24.08.1.tar.xz", + "hash": "sha256-YtuG+0Cow2+IQhoJsN3/7NgmapwlIEuRg3Fd2810Mzs=" }, "umbrello": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/umbrello-24.08.0.tar.xz", - "hash": "sha256-eQnTzMyH2yOVQhrFIqNGMQgbBhsLHaHvAIEV26sBEro=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/umbrello-24.08.1.tar.xz", + "hash": "sha256-WiT4p0L4lSsDXfCSMeR58fT93TWSFrgD233+/l74isI=" }, "yakuake": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/yakuake-24.08.0.tar.xz", - "hash": "sha256-9hVhGaS+i30Hp6yb8kJ+TW2GICJafgshxd3vceRizm0=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/yakuake-24.08.1.tar.xz", + "hash": "sha256-sLajoPtOFoaFVA46Go3SpNA89Z3bpv2PwFgFnxVaxhs=" }, "zanshin": { - "version": "24.08.0", - "url": "mirror://kde/stable/release-service/24.08.0/src/zanshin-24.08.0.tar.xz", - "hash": "sha256-mi3GYJ1Okzpj6usIr0B1LMFKjsZXmn/g3V2YgRjJSLc=" + "version": "24.08.1", + "url": "mirror://kde/stable/release-service/24.08.1/src/zanshin-24.08.1.tar.xz", + "hash": "sha256-yB7hLZE8irYDA8V8ldeY3FuebePgZ4Mlgy3nCWgprU0=" } } \ No newline at end of file diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 1dbb8340e05c2..6d10817031843 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,322 +1,322 @@ { "bluedevil": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/bluedevil-6.1.4.tar.xz", - "hash": "sha256-cPjpXMm1kSBOgjJ4kkBHqeOWWwOFv5oSIgEy5sAMFA8=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/bluedevil-6.1.5.tar.xz", + "hash": "sha256-KZWNoIsyQr2kJDiYnuPsuB04bKW+cjMlBuXPDe0LcHc=" }, "breeze": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/breeze-6.1.4.tar.xz", - "hash": "sha256-Imcm3zewPLyuFUCfy13Dtp9WCu5oVB5AHivXYIDaAaU=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/breeze-6.1.5.tar.xz", + "hash": "sha256-VEkXfJBhP5e0dK53YoXM/G6Gc2kdEgM32VNwyefIPLI=" }, "breeze-grub": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/breeze-grub-6.1.4.tar.xz", - "hash": "sha256-kU++NVAJnd4PBufxsixTui7iF+7Dz+d3GntvbWxicAQ=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/breeze-grub-6.1.5.tar.xz", + "hash": "sha256-ezzwtCaAG9dLvWuPDcSvN7E3UPl7817c006moU0gCQk=" }, "breeze-gtk": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/breeze-gtk-6.1.4.tar.xz", - "hash": "sha256-Xlv86u28XdtpPxd17QAuWBmyYXgyGjHclNO/2NYQrsk=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/breeze-gtk-6.1.5.tar.xz", + "hash": "sha256-lgw98EdCPoXh8zvbYLcb3HSGuZQdideFMQ3r5QG9RtE=" }, "breeze-plymouth": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/breeze-plymouth-6.1.4.tar.xz", - "hash": "sha256-6XdesIkZALeHBnBNjIpCY5cMrHUzmL8REcXkhzevL/4=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/breeze-plymouth-6.1.5.tar.xz", + "hash": "sha256-Z2H6s/bVdWhjWwfBwjRgqRaBLgSXk3IYAdd6xd+O1gs=" }, "discover": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/discover-6.1.4.tar.xz", - "hash": "sha256-ZOc+mQvr4TomFCRfA761HFAnwoX8eTMJos/3nmFW0oQ=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/discover-6.1.5.tar.xz", + "hash": "sha256-biz1n6wst5JCDtbfZT+AMH1uM9bmrpwa8oJ6k7rjy40=" }, "drkonqi": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/drkonqi-6.1.4.tar.xz", - "hash": "sha256-a5cXw7BrkHFLQLw/iyiNJM2uI5Bgk2JXfuDh6QHgOFs=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/drkonqi-6.1.5.tar.xz", + "hash": "sha256-Dhsn5OjrUdEcO9SnyfA5my6qP6tr6H3fQNKL4N6ujb8=" }, "flatpak-kcm": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/flatpak-kcm-6.1.4.tar.xz", - "hash": "sha256-5Bt38ewwuLIkDLCQA0EOYB2s3VkhIuCFNeXFsVeCvhI=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/flatpak-kcm-6.1.5.tar.xz", + "hash": "sha256-UI99mL0UEkIUdG8kSAT+3c0kWIyw63xYA5B7IlE9KQo=" }, "kactivitymanagerd": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kactivitymanagerd-6.1.4.tar.xz", - "hash": "sha256-mJZSw3G6gRw+ubFhswaH9Gyv/DvB+skXVUx5UUqYcMA=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kactivitymanagerd-6.1.5.tar.xz", + "hash": "sha256-P4r9onN4eALVzUa/dvjxRn7OHyHIO7qmUTQ1d1UjgQ8=" }, "kde-cli-tools": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kde-cli-tools-6.1.4.tar.xz", - "hash": "sha256-1thK/HG6tr7EXKhzM7JhaUkgzCJGNFs2PMRp7a2uGuI=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kde-cli-tools-6.1.5.tar.xz", + "hash": "sha256-wPM2Bir4AIBFTKOahatgvKHseoVOhMCdSSgwsRB5AxM=" }, "kdecoration": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kdecoration-6.1.4.tar.xz", - "hash": "sha256-h/DgCGkHjhBIVRkqtC22PR1qTSul6QvzU2kIteS3u/E=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kdecoration-6.1.5.tar.xz", + "hash": "sha256-POFs6mWdhj9465PVZ7+VKz9mRAvs1CSwbSBB/wZ53vc=" }, "kde-gtk-config": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kde-gtk-config-6.1.4.tar.xz", - "hash": "sha256-s9TlyNoudSW9I8d6hUaOOnzzsanZyeiuaofiB6P5gBk=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kde-gtk-config-6.1.5.tar.xz", + "hash": "sha256-Yx5Z9SYZ3alA0gWU3FUAjC8ZLacF5sXb+m0lF1CHti4=" }, "kdeplasma-addons": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kdeplasma-addons-6.1.4.tar.xz", - "hash": "sha256-izOaflDG+fOj0UyvEF2D5/OhW7yWdDF+OdVV+6G+mhI=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kdeplasma-addons-6.1.5.tar.xz", + "hash": "sha256-Nrb54cA+UupOXQQJoHhhF8gkcWYWny0KIh8g8a6riGM=" }, "kgamma": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kgamma-6.1.4.tar.xz", - "hash": "sha256-vSCIKmZ2p2oGIGtCQ2irSu9yeYcepUYbvYUi2sFxinw=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kgamma-6.1.5.tar.xz", + "hash": "sha256-L0Psa0q6wnJJsQFZTxnyIv5+WUcFT1JSwRqdnsIKtCw=" }, "kglobalacceld": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kglobalacceld-6.1.4.tar.xz", - "hash": "sha256-bLSTvqMxaskW6H9WAimal/HwL9wBZppS6iUiOmCFrag=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kglobalacceld-6.1.5.tar.xz", + "hash": "sha256-3A4Kl34Lrhd4jnAwvsONZVrvYMzgG3QOSPVXmkcx06o=" }, "kinfocenter": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kinfocenter-6.1.4.tar.xz", - "hash": "sha256-F539wiT/ZvHWkkVlYLHJ8N10tWjiMzRxgjFnCawlINk=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kinfocenter-6.1.5.tar.xz", + "hash": "sha256-CXauQ3Vrbdv05w51DLF/Qi2r52BMXi+CSrTx4BYa5dA=" }, "kmenuedit": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kmenuedit-6.1.4.tar.xz", - "hash": "sha256-xqLXReZAKEPbCrxjPv9jYtbk0tgO9OpbB9PZxdwK39A=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kmenuedit-6.1.5.tar.xz", + "hash": "sha256-/LJ6g6VVT7VlRjO+0Iy2CJhlcuMPXkJBYHo1TsidZVY=" }, "kpipewire": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kpipewire-6.1.4.tar.xz", - "hash": "sha256-qxFtVv2Kazbaa1lfWXz0OD2O0XH45iXcpnt6RkUzcTQ=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kpipewire-6.1.5.tar.xz", + "hash": "sha256-JbMs/K/zUvDErNpXRq3/0uOyi1/wZIUhvehijKcUWkk=" }, "krdp": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/krdp-6.1.4.tar.xz", - "hash": "sha256-dN6OGFvmfTW91mpBlMedf+TZh5SjPsm+kVQzyGvFkcs=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/krdp-6.1.5.tar.xz", + "hash": "sha256-qR3iyOi2/oUu3u5QtyLyq+vDs4R31++TX55re3znxrc=" }, "kscreen": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kscreen-6.1.4.tar.xz", - "hash": "sha256-mf5k7bCX/IKF7CvTIi0C/LXJVg0p/L5B9/S4mLHjMa8=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kscreen-6.1.5.tar.xz", + "hash": "sha256-QWap9tWI7v3BntnZqeD4Jlq0mZviSLoRtI7jU+y8UR8=" }, "kscreenlocker": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kscreenlocker-6.1.4.tar.xz", - "hash": "sha256-HccK6N42XT7EH49aM7Rgma3VplDCNGn3pz9yyFs663M=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kscreenlocker-6.1.5.tar.xz", + "hash": "sha256-oOqDVBIqKOCsxuxgSnZY/uWwDxJcwJ6nWMm5G/PH8Pw=" }, "ksshaskpass": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/ksshaskpass-6.1.4.tar.xz", - "hash": "sha256-W3Izf5OaqBRI6JK9PLYvWb120M0PnYBwAUYDP7vZZQw=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/ksshaskpass-6.1.5.tar.xz", + "hash": "sha256-NN1y8r94XdS2yYlEvU5ETb60a7Xy10xblbrtghxnGPE=" }, "ksystemstats": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/ksystemstats-6.1.4.tar.xz", - "hash": "sha256-pBETmZ+QdzzYfy5u10solTu6fA9vnQ1xMWSF7jvAg5w=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/ksystemstats-6.1.5.tar.xz", + "hash": "sha256-hCW7nwdiNNFn6vaJt09ynioFYcNnRz6KhPq0pMOcaJM=" }, "kwallet-pam": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kwallet-pam-6.1.4.tar.xz", - "hash": "sha256-cySxPgMnz7c/20reiUjK0XuFTgIkHfqcF8urhY8vLjY=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kwallet-pam-6.1.5.tar.xz", + "hash": "sha256-swysTx4mY3dlR5U6YhCTcdX5tDRKjfkgeILx4d3koD8=" }, "kwayland": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kwayland-6.1.4.tar.xz", - "hash": "sha256-hpHAbmWsLHOd5IQsDRIZV577SuGGS4YU3HSkZF3Vl3Q=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kwayland-6.1.5.tar.xz", + "hash": "sha256-Z6PhVzC9o2Bz8wQivcIa7ie/IF++7BorgCDJ0al/jak=" }, "kwayland-integration": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kwayland-integration-6.1.4.tar.xz", - "hash": "sha256-XB4oE4Yh2AYd75CGQsahPqttMRkoUFL2oeF3lLOAzk4=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kwayland-integration-6.1.5.tar.xz", + "hash": "sha256-I8YQID8b+qzMgnGOYK2qMz4x3UKDfU6E3/DPgOYUxog=" }, "kwin": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kwin-6.1.4.tar.xz", - "hash": "sha256-/P/ORo3qI6ksrTOsGxJkxVwHmdSX9U9rjiNDnc2t6zo=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kwin-6.1.5.tar.xz", + "hash": "sha256-ugqs4yMZW1itv94U7HTN1MKMIR14pWfESvcPM23Ks/c=" }, "kwrited": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kwrited-6.1.4.tar.xz", - "hash": "sha256-z76mnrm3S33+/m1m8Jso3os0jMt8rF7sZUtKRlJFgUs=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kwrited-6.1.5.tar.xz", + "hash": "sha256-oFnd8o7Oi0OYml6ofkR/o/Ajea7HmKHefLWaWqoqlhg=" }, "layer-shell-qt": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/layer-shell-qt-6.1.4.tar.xz", - "hash": "sha256-YjnS3GvvU4a5SOwhgCAqGPdeI/N5AsLXQQ+zgR37Mmg=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/layer-shell-qt-6.1.5.tar.xz", + "hash": "sha256-0Ry1X3XW64kE5IzQloVwQ6bamQCxw0t6xXFubkbw7TI=" }, "libkscreen": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/libkscreen-6.1.4.tar.xz", - "hash": "sha256-cwJivuy8YnC5avwNP7v+tUa044OIkiKzhdB67LQsZns=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/libkscreen-6.1.5.tar.xz", + "hash": "sha256-WPUjqd/gely5dY1g9qfxyfQBICifg1UVpOLY1tbaTGU=" }, "libksysguard": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/libksysguard-6.1.4.tar.xz", - "hash": "sha256-0qeuvJVxzoG0ynkJW3Sg2RgpwkkwPSJGIDggOkxWxbE=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/libksysguard-6.1.5.tar.xz", + "hash": "sha256-rQH6LGZPgs4kt9YXvBmUIGN2Nz+b1krjE7Mof9WKArk=" }, "libplasma": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/libplasma-6.1.4.tar.xz", - "hash": "sha256-Kv4xTZlg6G4NF5mqwmkExWZb4pNNXZ1chTO6liprhBA=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/libplasma-6.1.5.tar.xz", + "hash": "sha256-d8K4Ot5pmawOUmmk6HKEQ6fWGUbWjQu0EQarQpKnnMk=" }, "milou": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/milou-6.1.4.tar.xz", - "hash": "sha256-coA8zCCnhG7kWY/h6yyFobz+aKxeI3ZuS0tgelJyAII=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/milou-6.1.5.tar.xz", + "hash": "sha256-QFFIoS7n/siTiPmbxUhVB1SMhRLeIroDAlFURCc1OQo=" }, "ocean-sound-theme": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/ocean-sound-theme-6.1.4.tar.xz", - "hash": "sha256-ogAEz6y4sNzp5d63LXVe6Wv9GOtzB6ChuCnDL9ylb1w=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/ocean-sound-theme-6.1.5.tar.xz", + "hash": "sha256-ro+lnDo8PTekOOOrXtEcwAjqBFAZU3cL2euTJwBRKTU=" }, "oxygen": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/oxygen-6.1.4.tar.xz", - "hash": "sha256-A2AX2f33J2TLS7B4lypdlcYdYvhlEAxW71qBHjGrqdU=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/oxygen-6.1.5.tar.xz", + "hash": "sha256-B0HWside8AtZPvXjHKJniZ1zvD8W0TLJKkLnZ+wCVzU=" }, "oxygen-sounds": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/oxygen-sounds-6.1.4.tar.xz", - "hash": "sha256-aHXpmEzhnHnsGZ9uju0f2FoIinhmlxCoj2ErWCqjQck=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/oxygen-sounds-6.1.5.tar.xz", + "hash": "sha256-ZpCkniLRWmpogrh/clqdo7xJYXe4mjlSsBVVqYu0RqU=" }, "plasma5support": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma5support-6.1.4.tar.xz", - "hash": "sha256-yZ/VDWSW988SPRHjdnkLy81sgGcK9+kD7gKVrULdRNY=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma5support-6.1.5.tar.xz", + "hash": "sha256-BWNYUiLFMz4iee/agpw2oTl0HJ4M86024+gJaEDAF9E=" }, "plasma-activities": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-activities-6.1.4.tar.xz", - "hash": "sha256-7LOVeSNL/+uPUYq30ZZAkbMW8Pl8JRyJCZLud7j1IoY=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-activities-6.1.5.tar.xz", + "hash": "sha256-s1P7564w9qBO9PgdPgJQZUoPmFmp70MhTInHi5JOKEs=" }, "plasma-activities-stats": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-activities-stats-6.1.4.tar.xz", - "hash": "sha256-kvrmvylZTF/pliUIa8lPW7q5knYPlta0Mk6Txex/IHc=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-activities-stats-6.1.5.tar.xz", + "hash": "sha256-JiBQpTiU3gbxND+x1QtuAPeXo+NJMW7d/re1Fs3cDd8=" }, "plasma-browser-integration": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-browser-integration-6.1.4.tar.xz", - "hash": "sha256-1r+a6v48iw5lzB78SEbQwhI20Elh3qjG1qezPi1MPFU=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-browser-integration-6.1.5.tar.xz", + "hash": "sha256-Q2JcNeo57uvtesyXWazGCHGrwdK4jcnnuQivpMAJiqo=" }, "plasma-desktop": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-desktop-6.1.4.tar.xz", - "hash": "sha256-g7iX9gL73LjVcZCMJ/IwPh+LqN3tM8GwN1JDfEEkh9E=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-desktop-6.1.5.tar.xz", + "hash": "sha256-2eI2yamjMti3tO3eRMZdCw7Djqda3Fu/ohpsTH9CYcI=" }, "plasma-disks": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-disks-6.1.4.tar.xz", - "hash": "sha256-eV9r2rov6XnVg2R5ER/D1vxrKgs1W0jIMz21q7XfTEc=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-disks-6.1.5.tar.xz", + "hash": "sha256-XXZpwBnovmaLmF1z1/D9sxWYSpCsewzx45ibgJRubEo=" }, "plasma-firewall": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-firewall-6.1.4.tar.xz", - "hash": "sha256-yz8cmu0MZZ4KvKPIIEGGDr9ACfDnMQPrVlKZtIo3u2Q=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-firewall-6.1.5.tar.xz", + "hash": "sha256-TtMb3Y8CEScpR1GM8uvqVHu8RLfPxvbz50fsyRi0r0I=" }, "plasma-integration": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-integration-6.1.4.tar.xz", - "hash": "sha256-CKEoI/14574E4j8d0fXubrFTXKtWEjfW79Sw0DLcqnQ=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-integration-6.1.5.tar.xz", + "hash": "sha256-FatL93CRJOxP54QiggkByO+3+7kiRVdr5XyEdIKl7Js=" }, "plasma-mobile": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-mobile-6.1.4.tar.xz", - "hash": "sha256-lJsF1BwFpadOS3qqoFBg/B5AabOPT87AbCnLy/kjMNI=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-mobile-6.1.5.tar.xz", + "hash": "sha256-z1vUSN34Lfw6Zh4I6va0al5wa+yzDuwYfppXTokILa0=" }, "plasma-nano": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-nano-6.1.4.tar.xz", - "hash": "sha256-hE59Cmt4GSgN85e6mcRNQsJ1A5N7/yoTpqxDrrjYiMI=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-nano-6.1.5.tar.xz", + "hash": "sha256-weZFmXGZ/l4kn7JKA4kkhlcL3kgVPVLUkDQ58wlLosY=" }, "plasma-nm": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-nm-6.1.4.tar.xz", - "hash": "sha256-FK9HEIzzKvaMANDOb7NifztKkeLgV6bvW6j8/Lb1BeE=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-nm-6.1.5.tar.xz", + "hash": "sha256-ywTdrwDXKOoLS10QizOJ1GLOUHhyb4tlXzjeMw7rIfU=" }, "plasma-pa": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-pa-6.1.4.tar.xz", - "hash": "sha256-NEvUYKj2qf9E6/cT9kWfsdxcOrHD7aWs9m+8kfPkc00=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-pa-6.1.5.tar.xz", + "hash": "sha256-ckwFkdvr3l+WxBYxbJAOiPSmbXSJBe0cp05hUjV6dZE=" }, "plasma-sdk": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-sdk-6.1.4.tar.xz", - "hash": "sha256-8GZKIu6Z9BUFC8LtWD2KE3IUrLKCkwyw8eDZsX7Sc0o=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-sdk-6.1.5.tar.xz", + "hash": "sha256-jQ1OheR9KCSblR88mX9ghVoQyt7Ze+o0FAc5flUbjEY=" }, "plasma-systemmonitor": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-systemmonitor-6.1.4.tar.xz", - "hash": "sha256-JipI0p2gYbx2qnwkkE1IKLwt7AtmQKz/zjeZGUxL5Fc=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-systemmonitor-6.1.5.tar.xz", + "hash": "sha256-C17szwR1FiWfcgXBQ4FC1KglLq3gC7hhtm1IMbsDpwQ=" }, "plasma-thunderbolt": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-thunderbolt-6.1.4.tar.xz", - "hash": "sha256-gahEJUn8r3wA/VESR0jB1IhcUTrCSwq4nwSGbabtTGw=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-thunderbolt-6.1.5.tar.xz", + "hash": "sha256-lAKt8+6u1MXvynGXVbWfLShk2prV/YHSKzqPX9bjrmA=" }, "plasma-vault": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-vault-6.1.4.tar.xz", - "hash": "sha256-NKT/TFub9v51xOqwIl2uohwlEpF53vyJsLkuyxp7yN8=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-vault-6.1.5.tar.xz", + "hash": "sha256-ULE1v9sVmUd0QSJ4hwn4kSp2Ew0pIOqXdc5AL3p9xAQ=" }, "plasma-welcome": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-welcome-6.1.4.tar.xz", - "hash": "sha256-pK22ef6cdc3cUVOmMTgJoRtMRxndEFkNBE0pNcfVO34=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-welcome-6.1.5.tar.xz", + "hash": "sha256-Euzp59YcPsaiP+k1dmdBbiaAKrr9xp8kXMPZagXvnZY=" }, "plasma-workspace": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-workspace-6.1.4.tar.xz", - "hash": "sha256-yyCZ3TnAsj/0sFyM9leEUYcHXTH3X+QfD+Ae3OVsjVY=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-workspace-6.1.5.tar.xz", + "hash": "sha256-wp4Vo+1CRG+Ze34WlYZPhev/CE4uzlgckUoNio4mWuc=" }, "plasma-workspace-wallpapers": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-workspace-wallpapers-6.1.4.tar.xz", - "hash": "sha256-iPZcI2CNeTMXzDaeqO792rJuYaIcptQ0oCDv7ppbQ8Q=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-workspace-wallpapers-6.1.5.tar.xz", + "hash": "sha256-qOpCuZslRm1S0/5Vcsn7w4cJvxNwVEiOk3+HDzNU7gI=" }, "plymouth-kcm": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plymouth-kcm-6.1.4.tar.xz", - "hash": "sha256-K1U6vuM4JPLWEtW2Qd3pkL746Qvw7L13zF6gSHwDNFw=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plymouth-kcm-6.1.5.tar.xz", + "hash": "sha256-Bz4D+KhROOBdiGcqXB4GIjjjSz3t5BGPKRHCAMBVWHU=" }, "polkit-kde-agent-1": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/polkit-kde-agent-1-6.1.4.tar.xz", - "hash": "sha256-ePqZS3Eqq82+/e8MBfr9oEasPOTlBlfYGjzDD6Jd278=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/polkit-kde-agent-1-6.1.5.tar.xz", + "hash": "sha256-CWXl/61DKj5u6eNVQO/Le0CDIApIxp2R5SXAmke5IPY=" }, "powerdevil": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/powerdevil-6.1.4.tar.xz", - "hash": "sha256-oalm4uJJgwXjM5fvJ9+mjRAlX8twmbDZHF7ajUKQE+U=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/powerdevil-6.1.5.tar.xz", + "hash": "sha256-BQ4cb88H2izXv+IqYYqpFQS7KwC9MapoEhuQPN6dhF0=" }, "print-manager": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/print-manager-6.1.4.tar.xz", - "hash": "sha256-xXR79USAS6EhED0mRP/dblLtgEZWgpLMohdROnbQDt8=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/print-manager-6.1.5.tar.xz", + "hash": "sha256-pJRE4WoHlZUxU2UlF8ZlcamYujjc2IYWa4gjHpbIzhI=" }, "qqc2-breeze-style": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/qqc2-breeze-style-6.1.4.tar.xz", - "hash": "sha256-j7m8QVb53JIMY7DYr6pKrLcutlDpB8BtrN44v9VdUWg=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/qqc2-breeze-style-6.1.5.tar.xz", + "hash": "sha256-a0tsDwiy7OO12hyJ3mzhBiHY4mt/q+2/YBA6XyyK+EU=" }, "sddm-kcm": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/sddm-kcm-6.1.4.tar.xz", - "hash": "sha256-IE9gmeyxQOtYjOkHT/zBRCES4pHSzd7obDGYPJ9OFKA=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/sddm-kcm-6.1.5.tar.xz", + "hash": "sha256-AJI1F003IHnuOq31HgvX2ho4LRhSrmWwuWcQsiZpjpw=" }, "systemsettings": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/systemsettings-6.1.4.tar.xz", - "hash": "sha256-wOomYnfMt1mns7nFidYJlnTz4/YD56pHHtidxq0AfaM=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/systemsettings-6.1.5.tar.xz", + "hash": "sha256-B0J66nzuCzSrzD732q8D1ivfcgXKP5ccjT+u3AunT9c=" }, "wacomtablet": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/wacomtablet-6.1.4.tar.xz", - "hash": "sha256-Uy8DnsW7JltwxlyeDiiwNh39Tzt71Z4nj0nZ26szf4k=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/wacomtablet-6.1.5.tar.xz", + "hash": "sha256-IerMb3eC/fnKcYndlP2OyRAzAs9gWY91chY18N8MREo=" }, "xdg-desktop-portal-kde": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/xdg-desktop-portal-kde-6.1.4.tar.xz", - "hash": "sha256-OMoV/YbV/vLMeayY9WtM09k879MugtOyJGu3dALcp7I=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/xdg-desktop-portal-kde-6.1.5.tar.xz", + "hash": "sha256-CdE8DAb93AgySdH1vpB+Jx6jnwH1d9N9JnQ7Ad9aaXg=" } } \ No newline at end of file diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index b32e79295f6dd..37921f442173f 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -1,21 +1,22 @@ -self: { +self: +{ lib, stdenv, makeSetupHook, fetchurl, cmake, qt6, -}: let +}: +let dependencies = (lib.importJSON ../generated/dependencies.json).dependencies; projectInfo = lib.importJSON ../generated/projects.json; licenseInfo = lib.importJSON ../generated/licenses.json; licensesBySpdxId = (lib.mapAttrs' (_: v: { - name = v.spdxId or "unknown"; - value = v; - }) - lib.licenses) + name = v.spdxId or "unknown"; + value = v; + }) lib.licenses) // { # https://community.kde.org/Policies/Licensing_Policy "LicenseRef-KDE-Accepted-GPL" = lib.licenses.gpl3Plus; @@ -71,78 +72,89 @@ self: { None = null; }; - moveDevHook = makeSetupHook {name = "kf6-move-dev-hook";} ./move-dev-hook.sh; + moveDevHook = makeSetupHook { name = "kf6-move-dev-hook"; } ./move-dev-hook.sh; in - { - pname, - version ? self.sources.${pname}.version, - src ? self.sources.${pname}, - extraBuildInputs ? [], - extraNativeBuildInputs ? [], - extraPropagatedBuildInputs ? [], - extraCmakeFlags ? [], - excludeDependencies ? [], - ... - } @ args: let - depNames = dependencies.${pname} or []; - filteredDepNames = builtins.filter (dep: !(builtins.elem dep excludeDependencies)) depNames; - - # FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs, - # but cross is currently very broken anyway, so we can figure this out later. - deps = map (dep: self.${dep}) filteredDepNames; - - traceDuplicateDeps = attrName: attrValue: - let - pretty = lib.generators.toPretty {}; - duplicates = builtins.filter (dep: (builtins.elem (lib.getName dep) filteredDepNames)) attrValue; - in - if duplicates != [] - then lib.warn "Duplicate dependencies in ${attrName} of package ${pname}: ${pretty duplicates}" - else lib.id; - - traceAllDuplicateDeps = lib.flip lib.pipe [ - (traceDuplicateDeps "extraBuildInputs" extraBuildInputs) - (traceDuplicateDeps "extraPropagatedBuildInputs" extraPropagatedBuildInputs) +{ + pname, + version ? self.sources.${pname}.version, + src ? self.sources.${pname}, + extraBuildInputs ? [ ], + extraNativeBuildInputs ? [ ], + extraPropagatedBuildInputs ? [ ], + extraCmakeFlags ? [ ], + excludeDependencies ? [ ], + ... +}@args: +let + depNames = dependencies.${pname} or [ ]; + filteredDepNames = builtins.filter (dep: !(builtins.elem dep excludeDependencies)) depNames; + + # FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs, + # but cross is currently very broken anyway, so we can figure this out later. + deps = map (dep: self.${dep}) filteredDepNames; + + traceDuplicateDeps = + attrName: attrValue: + let + pretty = lib.generators.toPretty { }; + duplicates = builtins.filter (dep: (builtins.elem (lib.getName dep) filteredDepNames)) attrValue; + in + if duplicates != [ ] then + lib.warn "Duplicate dependencies in ${attrName} of package ${pname}: ${pretty duplicates}" + else + lib.id; + + traceAllDuplicateDeps = lib.flip lib.pipe [ + (traceDuplicateDeps "extraBuildInputs" extraBuildInputs) + (traceDuplicateDeps "extraPropagatedBuildInputs" extraPropagatedBuildInputs) + ]; + + defaultArgs = { + inherit version src; + + outputs = [ + "out" + "dev" + "devtools" ]; - defaultArgs = { - inherit version src; - - outputs = ["out" "dev" "devtools"]; - - nativeBuildInputs = [cmake qt6.wrapQtAppsHook moveDevHook] ++ extraNativeBuildInputs; - buildInputs = [qt6.qtbase] ++ extraBuildInputs; - - # FIXME: figure out what to propagate here - propagatedBuildInputs = deps ++ extraPropagatedBuildInputs; - strictDeps = true; - - dontFixCmake = true; - cmakeFlags = ["-DQT_MAJOR_VERSION=6"] ++ extraCmakeFlags; - - separateDebugInfo = true; - - env.LANG = "C.UTF-8"; - }; - - cleanArgs = builtins.removeAttrs args [ - "extraBuildInputs" - "extraNativeBuildInputs" - "extraPropagatedBuildInputs" - "extraCmakeFlags" - "excludeDependencies" - "meta" - ]; - - meta = { - description = projectInfo.${pname}.description; - homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}"; - license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname}); - maintainers = lib.teams.qt-kde.members; - # Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest. - platforms = lib.platforms.linux ++ lib.platforms.freebsd; - } // (args.meta or { }); - - pos = builtins.unsafeGetAttrPos "pname" args; - in - traceAllDuplicateDeps (stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; })) + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + moveDevHook + ] ++ extraNativeBuildInputs; + buildInputs = [ qt6.qtbase ] ++ extraBuildInputs; + + # FIXME: figure out what to propagate here + propagatedBuildInputs = deps ++ extraPropagatedBuildInputs; + strictDeps = true; + + dontFixCmake = true; + cmakeFlags = [ "-DQT_MAJOR_VERSION=6" ] ++ extraCmakeFlags; + + separateDebugInfo = true; + + env.LANG = "C.UTF-8"; + }; + + cleanArgs = builtins.removeAttrs args [ + "extraBuildInputs" + "extraNativeBuildInputs" + "extraPropagatedBuildInputs" + "extraCmakeFlags" + "excludeDependencies" + "meta" + ]; + + meta = { + description = projectInfo.${pname}.description; + homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}"; + license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname}); + maintainers = lib.teams.qt-kde.members; + # Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest. + platforms = lib.platforms.linux ++ lib.platforms.freebsd; + } // (args.meta or { }); + + pos = builtins.unsafeGetAttrPos "pname" args; +in +traceAllDuplicateDeps (stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; })) diff --git a/pkgs/kde/misc/calligra/default.nix b/pkgs/kde/misc/calligra/default.nix new file mode 100644 index 0000000000000..ff407e1a142f7 --- /dev/null +++ b/pkgs/kde/misc/calligra/default.nix @@ -0,0 +1,76 @@ +{ + mkKdeDerivation, + lib, + fetchurl, + boost, + eigen, + imath, + libetonyek, + libgit2, + libodfgen, + librevenge, + libvisio, + libwpd, + libwpg, + libwps, + okular, + perl, + pkg-config, + poppler, + qtkeychain, + qtsvg, +}: + +mkKdeDerivation rec { + pname = "calligra"; + version = "4.0.1"; + + src = fetchurl { + url = "mirror://kde/stable/calligra/calligra-${version}.tar.xz"; + hash = "sha256-1AH15z9PG9wLNUjqGlCwrBd4we3jCmozWUTtf72I2V8="; + }; + + extraBuildInputs = [ + boost + eigen + imath + libetonyek + libgit2 + libodfgen + librevenge + libvisio + libwpd + libwpg + libwps + okular + poppler + qtkeychain + qtsvg + ]; + + extraNativeBuildInputs = [ + perl + pkg-config + ]; + + # Recommended by the upstream packaging instructions. RELEASE_BUILD disables + # unmaintained components, like Braindump, from being built, and KDE_NO_DEBUG_OUTPUT + # is supposed to improve performance in the finished package. + extraCmakeFlags = [ + (lib.cmakeBool "RELEASE_BUILD" true) + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DKDE_NO_DEBUG_OUTPUT") + ]; + + meta = { + maintainers = with lib.maintainers; [ + ebzzry + zraexy + sigmasquadron + ]; + license = with lib.licenses; [ + gpl2 + lgpl2 + ]; + mainProgram = "calligralauncher"; + }; +} diff --git a/pkgs/kde/misc/kdevelop-pg-qt/default.nix b/pkgs/kde/misc/kdevelop-pg-qt/default.nix index cca569099b8ff..534733516757f 100644 --- a/pkgs/kde/misc/kdevelop-pg-qt/default.nix +++ b/pkgs/kde/misc/kdevelop-pg-qt/default.nix @@ -10,14 +10,17 @@ mkKdeDerivation rec { version = "2.3.0"; # Breaks with split -dev - outputs = ["out"]; + outputs = [ "out" ]; src = fetchurl { url = "mirror://kde/stable/kdevelop-pg-qt/${version}/src/kdevelop-pg-qt-${version}.tar.xz"; hash = "sha256-PT7zyzlelnDmDDmepthlzHluAOUsNV7tlD++yn2nEg0="; }; - extraNativeBuildInputs = [ bison flex ]; + extraNativeBuildInputs = [ + bison + flex + ]; meta.license = with lib.licenses; [ bsd3 diff --git a/pkgs/kde/misc/kdiagram/default.nix b/pkgs/kde/misc/kdiagram/default.nix index f5d6d9d8bc586..48355004b7616 100644 --- a/pkgs/kde/misc/kdiagram/default.nix +++ b/pkgs/kde/misc/kdiagram/default.nix @@ -14,7 +14,10 @@ mkKdeDerivation rec { hash = "sha256-Rlmwws2dsYFD9avZyAYJHDqrarwalWu/goFas9MYnG0="; }; - extraNativeBuildInputs = [qttools qtsvg]; + extraNativeBuildInputs = [ + qttools + qtsvg + ]; - meta.license = [lib.licenses.gpl2Only]; + meta.license = [ lib.licenses.gpl2Only ]; } diff --git a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix index f4c2637a96004..aead489e80d4c 100644 --- a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix +++ b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix @@ -13,7 +13,7 @@ mkKdeDerivation rec { hash = "sha256-LNJHwBPnX0EGWbrDcq/5PSLXHFpUwFnhN7lESvizQno="; }; - extraNativeBuildInputs = [doxygen]; + extraNativeBuildInputs = [ doxygen ]; - meta.license = [lib.licenses.gpl3Plus]; + meta.license = [ lib.licenses.gpl3Plus ]; } diff --git a/pkgs/kde/misc/kio-fuse/default.nix b/pkgs/kde/misc/kio-fuse/default.nix index b5461fd02de0c..cf28083b0813a 100644 --- a/pkgs/kde/misc/kio-fuse/default.nix +++ b/pkgs/kde/misc/kio-fuse/default.nix @@ -14,8 +14,8 @@ mkKdeDerivation rec { hash = "sha256-fRBFgSJ9Whm0JLM/QWjRgVVrEBXW3yIY4BqI1kRJ6Us="; }; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [fuse3]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ fuse3 ]; - meta.license = with lib.licenses; [gpl3Plus]; + meta.license = with lib.licenses; [ gpl3Plus ]; } diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix index 5930357a7ee81..d23cc7175bafe 100644 --- a/pkgs/kde/misc/kirigami-addons/default.nix +++ b/pkgs/kde/misc/kirigami-addons/default.nix @@ -14,8 +14,8 @@ mkKdeDerivation rec { hash = "sha256-VuPOtSBVtWAzIOoIsn02c9MqORqNWGRtmYIn2LUfCpM="; }; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [qt5compat]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ qt5compat ]; meta.license = with lib.licenses; [ bsd2 diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix new file mode 100644 index 0000000000000..3998a5a940dab --- /dev/null +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -0,0 +1,38 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + qtsvg, + qtwebengine, +}: +mkKdeDerivation rec { + pname = "klevernotes"; + version = "1.0.0"; + + src = fetchurl { + url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz"; + hash = "sha256-9nXOaa2/DyJO3nXGbnvPaYjXFrVoAgx52th67l5geOU="; + }; + + extraBuildInputs = [ + qtsvg + qtwebengine + ]; + + meta.license = with lib.licenses; [ + bsd3 + cc-by-sa-40 + cc0 + # TODO: add FSFAP license + gpl2Plus + gpl3Only + gpl3Plus + lgpl2Only + lgpl2Plus + lgpl21Only + lgpl21Plus + lgpl3Only + lgpl3Plus + mit + ]; +} diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix index ae37770e99274..4ca047e52f404 100644 --- a/pkgs/kde/misc/ktextaddons/default.nix +++ b/pkgs/kde/misc/ktextaddons/default.nix @@ -15,7 +15,11 @@ mkKdeDerivation rec { hash = "sha256-ZLgGAuhLJekWRiCvP2NB+oZbhegmq49eAgYa4koneyA="; }; - extraBuildInputs = [qtspeech qttools kxmlgui]; + extraBuildInputs = [ + qtspeech + qttools + kxmlgui + ]; meta.license = with lib.licenses; [ bsd3 diff --git a/pkgs/kde/misc/kunifiedpush/default.nix b/pkgs/kde/misc/kunifiedpush/default.nix index 9e7cb57ba3ad5..5e9ac62a97325 100644 --- a/pkgs/kde/misc/kunifiedpush/default.nix +++ b/pkgs/kde/misc/kunifiedpush/default.nix @@ -18,8 +18,17 @@ mkKdeDerivation { hash = "sha256-bhlsEP7cLuA6Rj6nrpp5iC3uolc02twNMLsWl+d/BXo="; }; - extraBuildInputs = [qtwebsockets kdeclarative kpackage]; + extraBuildInputs = [ + qtwebsockets + kdeclarative + kpackage + ]; - meta.license = with lib.licenses; [bsd2 bsd3 cc0 lgpl2Plus]; + meta.license = with lib.licenses; [ + bsd2 + bsd3 + cc0 + lgpl2Plus + ]; meta.mainProgram = "kunifiedpush-distributor"; } diff --git a/pkgs/kde/misc/kup/default.nix b/pkgs/kde/misc/kup/default.nix index 420b6bc72c5de..60ae6db479e90 100644 --- a/pkgs/kde/misc/kup/default.nix +++ b/pkgs/kde/misc/kup/default.nix @@ -1,7 +1,8 @@ -{ lib -, mkKdeDerivation -, fetchFromGitLab -, libgit2 +{ + lib, + mkKdeDerivation, + fetchFromGitLab, + libgit2, }: mkKdeDerivation rec { pname = "kup"; diff --git a/pkgs/kde/misc/mpvqt/default.nix b/pkgs/kde/misc/mpvqt/default.nix index 84d78e26bc000..c7bd84f174013 100644 --- a/pkgs/kde/misc/mpvqt/default.nix +++ b/pkgs/kde/misc/mpvqt/default.nix @@ -17,8 +17,17 @@ mkKdeDerivation rec { hash = "sha256-XHiCxH7dJxJamloM2SJbiFHDt8j4rVfv/M9PaBzvgM4="; }; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [mpv-unwrapped]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ mpv-unwrapped ]; - meta.license = with lib.licenses; [bsd2 bsd3 cc-by-sa-40 cc0 lgpl21Only lgpl3Only lgpl3Plus mit]; + meta.license = with lib.licenses; [ + bsd2 + bsd3 + cc-by-sa-40 + cc0 + lgpl21Only + lgpl3Only + lgpl3Plus + mit + ]; } diff --git a/pkgs/kde/misc/oxygen-icons/default.nix b/pkgs/kde/misc/oxygen-icons/default.nix index 91144f0c0bcf0..b556bd989e2cb 100644 --- a/pkgs/kde/misc/oxygen-icons/default.nix +++ b/pkgs/kde/misc/oxygen-icons/default.nix @@ -14,5 +14,5 @@ mkKdeDerivation rec { dontStrip = true; - meta.license = [lib.licenses.lgpl3Plus]; + meta.license = [ lib.licenses.lgpl3Plus ]; } diff --git a/pkgs/kde/misc/phonon-vlc/default.nix b/pkgs/kde/misc/phonon-vlc/default.nix index bd828172bf8df..88f278d929869 100644 --- a/pkgs/kde/misc/phonon-vlc/default.nix +++ b/pkgs/kde/misc/phonon-vlc/default.nix @@ -14,10 +14,13 @@ mkKdeDerivation rec { hash = "sha256-M4R53EUeS5SzyltXje90Hc+C9cYmooB9NiNb4tznyaU="; }; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [libvlc]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ libvlc ]; - cmakeFlags = ["-DPHONON_BUILD_QT5=0" "-DPHONON_BUILD_QT6=1"]; + cmakeFlags = [ + "-DPHONON_BUILD_QT5=0" + "-DPHONON_BUILD_QT6=1" + ]; - meta.license = with lib.licenses; [lgpl21Plus]; + meta.license = with lib.licenses; [ lgpl21Plus ]; } diff --git a/pkgs/kde/misc/phonon/default.nix b/pkgs/kde/misc/phonon/default.nix index ed0aad0527468..76e57f30b3a57 100644 --- a/pkgs/kde/misc/phonon/default.nix +++ b/pkgs/kde/misc/phonon/default.nix @@ -30,8 +30,14 @@ mkKdeDerivation rec { qttools ]; - cmakeFlags = ["-DPHONON_BUILD_QT5=0" "-DPHONON_BUILD_QT6=1"]; + cmakeFlags = [ + "-DPHONON_BUILD_QT5=0" + "-DPHONON_BUILD_QT6=1" + ]; - meta.license = with lib.licenses; [lgpl21Plus gpl2Plus]; + meta.license = with lib.licenses; [ + lgpl21Plus + gpl2Plus + ]; meta.mainProgram = "phononsettings"; } diff --git a/pkgs/kde/misc/polkit-qt-1/default.nix b/pkgs/kde/misc/polkit-qt-1/default.nix index 432cc5da80597..78ce60455d09f 100644 --- a/pkgs/kde/misc/polkit-qt-1/default.nix +++ b/pkgs/kde/misc/polkit-qt-1/default.nix @@ -15,10 +15,17 @@ mkKdeDerivation rec { sha256 = "sha256-XTthHAYtK3apN1C7EMkHv9IdH/CNChXcLPY+J44Wd/s="; }; - patches = [./full-paths.patch]; + patches = [ ./full-paths.patch ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [glib polkit]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + glib + polkit + ]; - meta.license = with lib.licenses; [bsd3 gpl2Plus lgpl2Plus]; + meta.license = with lib.licenses; [ + bsd3 + gpl2Plus + lgpl2Plus + ]; } diff --git a/pkgs/kde/misc/pulseaudio-qt/default.nix b/pkgs/kde/misc/pulseaudio-qt/default.nix index d5a69da692ac7..108824c87ff61 100644 --- a/pkgs/kde/misc/pulseaudio-qt/default.nix +++ b/pkgs/kde/misc/pulseaudio-qt/default.nix @@ -14,8 +14,11 @@ mkKdeDerivation rec { hash = "sha256-zY9RyHAAc9D9kNV4QIOs63PnK6mnBOYF4KZ5CUJqhSA="; }; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [pulseaudio]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ pulseaudio ]; - meta.license = with lib.licenses; [lgpl21Only lgpl3Only]; + meta.license = with lib.licenses; [ + lgpl21Only + lgpl3Only + ]; } diff --git a/pkgs/kde/plasma/bluedevil/default.nix b/pkgs/kde/plasma/bluedevil/default.nix index 993d121d1f37a..3a66958336547 100644 --- a/pkgs/kde/plasma/bluedevil/default.nix +++ b/pkgs/kde/plasma/bluedevil/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "bluedevil"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/pkgs/kde/plasma/breeze-grub/default.nix b/pkgs/kde/plasma/breeze-grub/default.nix index 5dd3d199e44a6..033e2a34800f7 100644 --- a/pkgs/kde/plasma/breeze-grub/default.nix +++ b/pkgs/kde/plasma/breeze-grub/default.nix @@ -1,12 +1,12 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "breeze-grub"; # doesn't actually use cmake or anything - nativeBuildInputs = []; - buildInputs = []; + nativeBuildInputs = [ ]; + buildInputs = [ ]; - outputs = ["out"]; + outputs = [ "out" ]; installPhase = '' runHook preInstall diff --git a/pkgs/kde/plasma/breeze-gtk/default.nix b/pkgs/kde/plasma/breeze-gtk/default.nix index fc0bc4759d483..88c424d0fd27b 100644 --- a/pkgs/kde/plasma/breeze-gtk/default.nix +++ b/pkgs/kde/plasma/breeze-gtk/default.nix @@ -8,7 +8,11 @@ mkKdeDerivation { pname = "breeze-gtk"; # FIXME(later): upstream - patches = [./0001-fix-add-executable-bit.patch]; + patches = [ ./0001-fix-add-executable-bit.patch ]; - extraNativeBuildInputs = [sass python3 python3Packages.pycairo]; + extraNativeBuildInputs = [ + sass + python3 + python3Packages.pycairo + ]; } diff --git a/pkgs/kde/plasma/breeze-plymouth/default.nix b/pkgs/kde/plasma/breeze-plymouth/default.nix index 7551eca94e3a1..97abe3948ac9d 100644 --- a/pkgs/kde/plasma/breeze-plymouth/default.nix +++ b/pkgs/kde/plasma/breeze-plymouth/default.nix @@ -12,41 +12,58 @@ osVersion ? null, topColor ? "black", bottomColor ? "black", -}: let - validColors = ["black" "cardboard_grey" "charcoal_grey" "icon_blue" "paper_white" "plasma_blue" "neon_blue" "neon_green"]; +}: +let + validColors = [ + "black" + "cardboard_grey" + "charcoal_grey" + "icon_blue" + "paper_white" + "plasma_blue" + "neon_blue" + "neon_green" + ]; resolvedLogoName = - if (logoFile != null && logoName == null) - then lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) - else logoName; + if (logoFile != null && logoName == null) then + lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) + else + logoName; in - assert lib.asserts.assertOneOf "topColor" topColor validColors; - assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; - mkKdeDerivation { - pname = "breeze-plymouth"; +assert lib.asserts.assertOneOf "topColor" topColor validColors; +assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; +mkKdeDerivation { + pname = "breeze-plymouth"; - # FIXME(later): discuss with upstream - patches = [./install-paths.patch]; + # FIXME(later): discuss with upstream + patches = [ ./install-paths.patch ]; - extraNativeBuildInputs = [pkg-config] ++ lib.optionals (logoFile != null) [imagemagick netpbm perl]; - extraBuildInputs = [plymouth]; + extraNativeBuildInputs = + [ pkg-config ] + ++ lib.optionals (logoFile != null) [ + imagemagick + netpbm + perl + ]; + extraBuildInputs = [ plymouth ]; - extraCmakeFlags = - [] - ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" - ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" - ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" - ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" - ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"; + extraCmakeFlags = + [ ] + ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" + ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" + ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" + ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" + ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"; - postPatch = - '' - substituteInPlace cmake/FindPlymouth.cmake --subst-var out - '' - + lib.optionalString (logoFile != null) '' - cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png + postPatch = + '' + substituteInPlace cmake/FindPlymouth.cmake --subst-var out + '' + + lib.optionalString (logoFile != null) '' + cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png - # conversion for 16bit taken from the breeze-plymouth readme - convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png - pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png - ''; - } + # conversion for 16bit taken from the breeze-plymouth readme + convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png + pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png + ''; +} diff --git a/pkgs/kde/plasma/breeze/default.nix b/pkgs/kde/plasma/breeze/default.nix index 3b6fed6221fd5..6768ffb94ecf3 100644 --- a/pkgs/kde/plasma/breeze/default.nix +++ b/pkgs/kde/plasma/breeze/default.nix @@ -6,7 +6,11 @@ mkKdeDerivation { pname = "breeze"; - outputs = ["out" "dev" "qt5"]; + outputs = [ + "out" + "dev" + "qt5" + ]; # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix index 6fa4d2383f994..4610811b357c7 100644 --- a/pkgs/kde/plasma/default.nix +++ b/pkgs/kde/plasma/default.nix @@ -1,66 +1,67 @@ -{callPackage}: { - bluedevil = callPackage ./bluedevil {}; - breeze = callPackage ./breeze {}; - breeze-grub = callPackage ./breeze-grub {}; - breeze-gtk = callPackage ./breeze-gtk {}; - breeze-plymouth = callPackage ./breeze-plymouth {}; - discover = callPackage ./discover {}; - drkonqi = callPackage ./drkonqi {}; - flatpak-kcm = callPackage ./flatpak-kcm {}; - kactivitymanagerd = callPackage ./kactivitymanagerd {}; - kde-cli-tools = callPackage ./kde-cli-tools {}; - kde-gtk-config = callPackage ./kde-gtk-config {}; - kdecoration = callPackage ./kdecoration {}; - kdeplasma-addons = callPackage ./kdeplasma-addons {}; - kgamma = callPackage ./kgamma {}; - kglobalacceld = callPackage ./kglobalacceld {}; - kinfocenter = callPackage ./kinfocenter {}; - kmenuedit = callPackage ./kmenuedit {}; - kpipewire = callPackage ./kpipewire {}; - krdp = callPackage ./krdp {}; - kscreen = callPackage ./kscreen {}; - kscreenlocker = callPackage ./kscreenlocker {}; - ksshaskpass = callPackage ./ksshaskpass {}; - ksystemstats = callPackage ./ksystemstats {}; - kwallet-pam = callPackage ./kwallet-pam {}; - kwayland = callPackage ./kwayland {}; - kwayland-integration = callPackage ./kwayland-integration {}; - kwin = callPackage ./kwin {}; - kwrited = callPackage ./kwrited {}; - layer-shell-qt = callPackage ./layer-shell-qt {}; - libkscreen = callPackage ./libkscreen {}; - libksysguard = callPackage ./libksysguard {}; - libplasma = callPackage ./libplasma {}; - milou = callPackage ./milou {}; - ocean-sound-theme = callPackage ./ocean-sound-theme {}; - oxygen = callPackage ./oxygen {}; - oxygen-sounds = callPackage ./oxygen-sounds {}; - plasma-activities = callPackage ./plasma-activities {}; - plasma-activities-stats = callPackage ./plasma-activities-stats {}; - plasma-browser-integration = callPackage ./plasma-browser-integration {}; - plasma-desktop = callPackage ./plasma-desktop {}; - plasma-disks = callPackage ./plasma-disks {}; - plasma-firewall = callPackage ./plasma-firewall {}; - plasma-integration = callPackage ./plasma-integration {}; - plasma-mobile = callPackage ./plasma-mobile {}; - plasma-nano = callPackage ./plasma-nano {}; - plasma-nm = callPackage ./plasma-nm {}; - plasma-pa = callPackage ./plasma-pa {}; - plasma-sdk = callPackage ./plasma-sdk {}; - plasma-systemmonitor = callPackage ./plasma-systemmonitor {}; - plasma-thunderbolt = callPackage ./plasma-thunderbolt {}; - plasma-vault = callPackage ./plasma-vault {}; - plasma-welcome = callPackage ./plasma-welcome {}; - plasma-workspace = callPackage ./plasma-workspace {}; - plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers {}; - plasma5support = callPackage ./plasma5support {}; - plymouth-kcm = callPackage ./plymouth-kcm {}; - polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 {}; - powerdevil = callPackage ./powerdevil {}; - print-manager = callPackage ./print-manager {}; - qqc2-breeze-style = callPackage ./qqc2-breeze-style {}; - sddm-kcm = callPackage ./sddm-kcm {}; - systemsettings = callPackage ./systemsettings {}; - wacomtablet = callPackage ./wacomtablet {}; - xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde {}; +{ callPackage }: +{ + bluedevil = callPackage ./bluedevil { }; + breeze = callPackage ./breeze { }; + breeze-grub = callPackage ./breeze-grub { }; + breeze-gtk = callPackage ./breeze-gtk { }; + breeze-plymouth = callPackage ./breeze-plymouth { }; + discover = callPackage ./discover { }; + drkonqi = callPackage ./drkonqi { }; + flatpak-kcm = callPackage ./flatpak-kcm { }; + kactivitymanagerd = callPackage ./kactivitymanagerd { }; + kde-cli-tools = callPackage ./kde-cli-tools { }; + kde-gtk-config = callPackage ./kde-gtk-config { }; + kdecoration = callPackage ./kdecoration { }; + kdeplasma-addons = callPackage ./kdeplasma-addons { }; + kgamma = callPackage ./kgamma { }; + kglobalacceld = callPackage ./kglobalacceld { }; + kinfocenter = callPackage ./kinfocenter { }; + kmenuedit = callPackage ./kmenuedit { }; + kpipewire = callPackage ./kpipewire { }; + krdp = callPackage ./krdp { }; + kscreen = callPackage ./kscreen { }; + kscreenlocker = callPackage ./kscreenlocker { }; + ksshaskpass = callPackage ./ksshaskpass { }; + ksystemstats = callPackage ./ksystemstats { }; + kwallet-pam = callPackage ./kwallet-pam { }; + kwayland = callPackage ./kwayland { }; + kwayland-integration = callPackage ./kwayland-integration { }; + kwin = callPackage ./kwin { }; + kwrited = callPackage ./kwrited { }; + layer-shell-qt = callPackage ./layer-shell-qt { }; + libkscreen = callPackage ./libkscreen { }; + libksysguard = callPackage ./libksysguard { }; + libplasma = callPackage ./libplasma { }; + milou = callPackage ./milou { }; + ocean-sound-theme = callPackage ./ocean-sound-theme { }; + oxygen = callPackage ./oxygen { }; + oxygen-sounds = callPackage ./oxygen-sounds { }; + plasma-activities = callPackage ./plasma-activities { }; + plasma-activities-stats = callPackage ./plasma-activities-stats { }; + plasma-browser-integration = callPackage ./plasma-browser-integration { }; + plasma-desktop = callPackage ./plasma-desktop { }; + plasma-disks = callPackage ./plasma-disks { }; + plasma-firewall = callPackage ./plasma-firewall { }; + plasma-integration = callPackage ./plasma-integration { }; + plasma-mobile = callPackage ./plasma-mobile { }; + plasma-nano = callPackage ./plasma-nano { }; + plasma-nm = callPackage ./plasma-nm { }; + plasma-pa = callPackage ./plasma-pa { }; + plasma-sdk = callPackage ./plasma-sdk { }; + plasma-systemmonitor = callPackage ./plasma-systemmonitor { }; + plasma-thunderbolt = callPackage ./plasma-thunderbolt { }; + plasma-vault = callPackage ./plasma-vault { }; + plasma-welcome = callPackage ./plasma-welcome { }; + plasma-workspace = callPackage ./plasma-workspace { }; + plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers { }; + plasma5support = callPackage ./plasma5support { }; + plymouth-kcm = callPackage ./plymouth-kcm { }; + polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 { }; + powerdevil = callPackage ./powerdevil { }; + print-manager = callPackage ./print-manager { }; + qqc2-breeze-style = callPackage ./qqc2-breeze-style { }; + sddm-kcm = callPackage ./sddm-kcm { }; + systemsettings = callPackage ./systemsettings { }; + wacomtablet = callPackage ./wacomtablet { }; + xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde { }; } diff --git a/pkgs/kde/plasma/discover/default.nix b/pkgs/kde/plasma/discover/default.nix index d25a4fc6ea9b3..89d3df6818145 100644 --- a/pkgs/kde/plasma/discover/default.nix +++ b/pkgs/kde/plasma/discover/default.nix @@ -9,10 +9,15 @@ mkKdeDerivation { pname = "discover"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwebview discount flatpak fwupd]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwebview + discount + flatpak + fwupd + ]; # The PackageKit backend doesn't work for us and causes Discover # to freak out when loading. Disable it to not confuse users. - excludeDependencies = ["packagekit-qt"]; + excludeDependencies = [ "packagekit-qt" ]; } diff --git a/pkgs/kde/plasma/drkonqi/default.nix b/pkgs/kde/plasma/drkonqi/default.nix index 2fa13f09d0bdc..6e936a23cd99f 100644 --- a/pkgs/kde/plasma/drkonqi/default.nix +++ b/pkgs/kde/plasma/drkonqi/default.nix @@ -5,7 +5,8 @@ gdb, python3, substituteAll, -}: let +}: +let gdb' = gdb.override { hostCpuOnly = true; python3 = python3.withPackages (ps: [ @@ -15,21 +16,21 @@ ]); }; in - mkKdeDerivation { - pname = "drkonqi"; +mkKdeDerivation { + pname = "drkonqi"; - patches = [ - (substituteAll { - src = ./gdb-path.patch; - gdb = "${gdb'}/bin/gdb"; - }) - ]; + patches = [ + (substituteAll { + src = ./gdb-path.patch; + gdb = "${gdb'}/bin/gdb"; + }) + ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [systemd]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ systemd ]; - extraCmakeFlags = [ - "-DWITH_GDB12=1" - "-DWITH_PYTHON_VENDORING=0" - ]; - } + extraCmakeFlags = [ + "-DWITH_GDB12=1" + "-DWITH_PYTHON_VENDORING=0" + ]; +} diff --git a/pkgs/kde/plasma/flatpak-kcm/default.nix b/pkgs/kde/plasma/flatpak-kcm/default.nix index a43447a154133..1afd87240d165 100644 --- a/pkgs/kde/plasma/flatpak-kcm/default.nix +++ b/pkgs/kde/plasma/flatpak-kcm/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "flatpak-kcm"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [flatpak qtsvg]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + flatpak + qtsvg + ]; } diff --git a/pkgs/kde/plasma/kactivitymanagerd/default.nix b/pkgs/kde/plasma/kactivitymanagerd/default.nix index b0d2fea109ccc..48c539521d299 100644 --- a/pkgs/kde/plasma/kactivitymanagerd/default.nix +++ b/pkgs/kde/plasma/kactivitymanagerd/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kactivitymanagerd"; - extraBuildInputs = [qt5compat boost]; + extraBuildInputs = [ + qt5compat + boost + ]; } diff --git a/pkgs/kde/plasma/kde-cli-tools/default.nix b/pkgs/kde/plasma/kde-cli-tools/default.nix index cbaddad841698..45b3040e6d9fe 100644 --- a/pkgs/kde/plasma/kde-cli-tools/default.nix +++ b/pkgs/kde/plasma/kde-cli-tools/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kde-cli-tools"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/plasma/kde-gtk-config/default.nix b/pkgs/kde/plasma/kde-gtk-config/default.nix index 045358ffbde5d..c9b5a827eea88 100644 --- a/pkgs/kde/plasma/kde-gtk-config/default.nix +++ b/pkgs/kde/plasma/kde-gtk-config/default.nix @@ -17,24 +17,26 @@ mkKdeDerivation { # aren't found. patches = [ ./0001-gsettings-schemas-path.patch - ( - substituteAll { - src = ./dependency-paths.patch; - pgrep = lib.getExe' procps "pgrep"; - xsettingsd = lib.getExe xsettingsd; - } - ) + (substituteAll { + src = ./dependency-paths.patch; + pgrep = lib.getExe' procps "pgrep"; + xsettingsd = lib.getExe xsettingsd; + }) ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\"" ''; - extraNativeBuildInputs = [pkg-config wrapGAppsHook3 sass]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + sass + ]; + extraBuildInputs = [ qtsvg ]; dontWrapGApps = true; # There is nothing to wrap - extraCmakeFlags = ["-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"]; + extraCmakeFlags = [ "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; # Hardcoded as QStrings, which are UTF-16 so Nix can't pick these up automatically postFixup = '' diff --git a/pkgs/kde/plasma/kdecoration/default.nix b/pkgs/kde/plasma/kdecoration/default.nix index 9f879b1cea17f..21025a6678ceb 100644 --- a/pkgs/kde/plasma/kdecoration/default.nix +++ b/pkgs/kde/plasma/kdecoration/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdecoration"; } diff --git a/pkgs/kde/plasma/kdeplasma-addons/default.nix b/pkgs/kde/plasma/kdeplasma-addons/default.nix index afb0708e8e6b2..e23fdacdf1586 100644 --- a/pkgs/kde/plasma/kdeplasma-addons/default.nix +++ b/pkgs/kde/plasma/kdeplasma-addons/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdeplasma-addons"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/plasma/kgamma/default.nix b/pkgs/kde/plasma/kgamma/default.nix index dcd119ace8ecf..607a04a945eab 100644 --- a/pkgs/kde/plasma/kgamma/default.nix +++ b/pkgs/kde/plasma/kgamma/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kgamma"; - extraBuildInputs = [xorg.libXxf86vm]; + extraBuildInputs = [ xorg.libXxf86vm ]; } diff --git a/pkgs/kde/plasma/kglobalacceld/default.nix b/pkgs/kde/plasma/kglobalacceld/default.nix index caafb6c91347e..afe98e7fa6b29 100644 --- a/pkgs/kde/plasma/kglobalacceld/default.nix +++ b/pkgs/kde/plasma/kglobalacceld/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kglobalacceld"; } diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix index 2ef5008905ace..8911e77cf4522 100644 --- a/pkgs/kde/plasma/kinfocenter/default.nix +++ b/pkgs/kde/plasma/kinfocenter/default.nix @@ -40,9 +40,12 @@ mkKdeDerivation { patches = [ # fwupdmgr is provided through NixOS' module - (substituteAll ({ - src = ./0001-tool-paths.patch; - } // tools)) + (substituteAll ( + { + src = ./0001-tool-paths.patch; + } + // tools + )) ]; postPatch = '' @@ -50,7 +53,7 @@ mkKdeDerivation { --replace-fail " aha " " ${lib.getExe aha} " ''; - extraBuildInputs = [libusb1]; + extraBuildInputs = [ libusb1 ]; # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in # the same directory, while it is actually located in a completely different diff --git a/pkgs/kde/plasma/kmenuedit/default.nix b/pkgs/kde/plasma/kmenuedit/default.nix index 4f88e8013173d..85e56a3de6d98 100644 --- a/pkgs/kde/plasma/kmenuedit/default.nix +++ b/pkgs/kde/plasma/kmenuedit/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmenuedit"; meta.mainProgram = "kmenuedit"; diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix index c79bfc792d517..eb604d1a61c44 100644 --- a/pkgs/kde/plasma/kpipewire/default.nix +++ b/pkgs/kde/plasma/kpipewire/default.nix @@ -10,6 +10,12 @@ mkKdeDerivation { pname = "kpipewire"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtquick3d + pipewire + ffmpeg + mesa + libva + ]; } diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix index 38208475ca279..8dd95c1a76591 100644 --- a/pkgs/kde/plasma/krdp/default.nix +++ b/pkgs/kde/plasma/krdp/default.nix @@ -20,7 +20,7 @@ mkKdeDerivation { }) ]; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtkeychain qtwayland diff --git a/pkgs/kde/plasma/kscreen/default.nix b/pkgs/kde/plasma/kscreen/default.nix index 3ceedb860de05..379e13d561c8f 100644 --- a/pkgs/kde/plasma/kscreen/default.nix +++ b/pkgs/kde/plasma/kscreen/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kscreen"; - extraBuildInputs = [qtsensors]; + extraBuildInputs = [ qtsensors ]; postFixup = '' substituteInPlace $out/share/kglobalaccel/org.kde.kscreen.desktop \ diff --git a/pkgs/kde/plasma/kscreenlocker/default.nix b/pkgs/kde/plasma/kscreenlocker/default.nix index cab85f5e68894..edf549ef75e97 100644 --- a/pkgs/kde/plasma/kscreenlocker/default.nix +++ b/pkgs/kde/plasma/kscreenlocker/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kscreenlocker"; - extraNativeBuildInputs = [wayland-scanner]; - extraBuildInputs = [pam qqc2-breeze-style]; + extraNativeBuildInputs = [ wayland-scanner ]; + extraBuildInputs = [ + pam + qqc2-breeze-style + ]; } diff --git a/pkgs/kde/plasma/ksshaskpass/default.nix b/pkgs/kde/plasma/ksshaskpass/default.nix index dee8ae1e2ce81..4a148489a1298 100644 --- a/pkgs/kde/plasma/ksshaskpass/default.nix +++ b/pkgs/kde/plasma/ksshaskpass/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ksshaskpass"; meta.mainProgram = "ksshaskpass"; diff --git a/pkgs/kde/plasma/ksystemstats/default.nix b/pkgs/kde/plasma/ksystemstats/default.nix index 1d098b10b0239..5582de47cb9f9 100644 --- a/pkgs/kde/plasma/ksystemstats/default.nix +++ b/pkgs/kde/plasma/ksystemstats/default.nix @@ -9,8 +9,14 @@ mkKdeDerivation { pname = "ksystemstats"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [networkmanager-qt lm_sensors libnl]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + networkmanager-qt + lm_sensors + libnl + ]; - cmakeFlags = ["-DSYSTEMSTATS_DBUS_INTERFACE=${libksysguard}/share/dbus-1/interfaces/org.kde.ksystemstats1.xml"]; + cmakeFlags = [ + "-DSYSTEMSTATS_DBUS_INTERFACE=${libksysguard}/share/dbus-1/interfaces/org.kde.ksystemstats1.xml" + ]; } diff --git a/pkgs/kde/plasma/kwallet-pam/default.nix b/pkgs/kde/plasma/kwallet-pam/default.nix index a540f54a85ce8..4dc35d59f4859 100644 --- a/pkgs/kde/plasma/kwallet-pam/default.nix +++ b/pkgs/kde/plasma/kwallet-pam/default.nix @@ -13,6 +13,9 @@ mkKdeDerivation { sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" ''; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [pam libgcrypt]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + pam + libgcrypt + ]; } diff --git a/pkgs/kde/plasma/kwayland-integration/default.nix b/pkgs/kde/plasma/kwayland-integration/default.nix index 0274068f7f79e..8de6d3fae8be0 100644 --- a/pkgs/kde/plasma/kwayland-integration/default.nix +++ b/pkgs/kde/plasma/kwayland-integration/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwayland-integration"; # FIXME(qt5) diff --git a/pkgs/kde/plasma/kwayland/default.nix b/pkgs/kde/plasma/kwayland/default.nix index 86713b834bec7..f456e94dc3c60 100644 --- a/pkgs/kde/plasma/kwayland/default.nix +++ b/pkgs/kde/plasma/kwayland/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kwayland"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtwayland ]; } diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index ffa7e146ece68..85679de86150d 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -41,7 +41,10 @@ mkKdeDerivation { "--set-default TZDIR /etc/zoneinfo" ]; - extraNativeBuildInputs = [pkg-config python3]; + extraNativeBuildInputs = [ + pkg-config + python3 + ]; extraBuildInputs = [ qtquick3d qtsensors diff --git a/pkgs/kde/plasma/kwrited/default.nix b/pkgs/kde/plasma/kwrited/default.nix index c9bb0ff6e6cad..2b66791b16855 100644 --- a/pkgs/kde/plasma/kwrited/default.nix +++ b/pkgs/kde/plasma/kwrited/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwrited"; meta.mainProgram = "kwrited"; diff --git a/pkgs/kde/plasma/layer-shell-qt/default.nix b/pkgs/kde/plasma/layer-shell-qt/default.nix index dd7290379c5f2..009b2633b6f76 100644 --- a/pkgs/kde/plasma/layer-shell-qt/default.nix +++ b/pkgs/kde/plasma/layer-shell-qt/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "layer-shell-qt"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtwayland ]; } diff --git a/pkgs/kde/plasma/libkscreen/default.nix b/pkgs/kde/plasma/libkscreen/default.nix index ccd11318e2be2..fa969f46a5372 100644 --- a/pkgs/kde/plasma/libkscreen/default.nix +++ b/pkgs/kde/plasma/libkscreen/default.nix @@ -8,7 +8,12 @@ mkKdeDerivation { pname = "libkscreen"; - extraNativeBuildInputs = [qttools qtwayland jq wayland]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ + qttools + qtwayland + jq + wayland + ]; + extraBuildInputs = [ qtwayland ]; meta.mainProgram = "kscreen-doctor"; } diff --git a/pkgs/kde/plasma/libksysguard/default.nix b/pkgs/kde/plasma/libksysguard/default.nix index 9dae888737ab5..5f6ecce543537 100644 --- a/pkgs/kde/plasma/libksysguard/default.nix +++ b/pkgs/kde/plasma/libksysguard/default.nix @@ -10,5 +10,12 @@ mkKdeDerivation { pname = "libksysguard"; - extraBuildInputs = [qtwebchannel qtwebengine qttools libpcap libnl lm_sensors]; + extraBuildInputs = [ + qtwebchannel + qtwebengine + qttools + libpcap + libnl + lm_sensors + ]; } diff --git a/pkgs/kde/plasma/libplasma/default.nix b/pkgs/kde/plasma/libplasma/default.nix index 1ff05b92ef0e5..348bd4cb2bc24 100644 --- a/pkgs/kde/plasma/libplasma/default.nix +++ b/pkgs/kde/plasma/libplasma/default.nix @@ -8,6 +8,10 @@ mkKdeDerivation { pname = "libplasma"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsvg qtwayland wayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + qtwayland + wayland + ]; } diff --git a/pkgs/kde/plasma/lightdm-greeter-kde/default.nix b/pkgs/kde/plasma/lightdm-greeter-kde/default.nix index 9d508409f9d3d..e6b7b64f925db 100644 --- a/pkgs/kde/plasma/lightdm-greeter-kde/default.nix +++ b/pkgs/kde/plasma/lightdm-greeter-kde/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "lightdm-greeter-kde"; } diff --git a/pkgs/kde/plasma/milou/default.nix b/pkgs/kde/plasma/milou/default.nix index 555c7cbee2c7d..69a69e14753f9 100644 --- a/pkgs/kde/plasma/milou/default.nix +++ b/pkgs/kde/plasma/milou/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "milou"; } diff --git a/pkgs/kde/plasma/ocean-sound-theme/default.nix b/pkgs/kde/plasma/ocean-sound-theme/default.nix index 72adf43e3604c..784e80f5997a1 100644 --- a/pkgs/kde/plasma/ocean-sound-theme/default.nix +++ b/pkgs/kde/plasma/ocean-sound-theme/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ocean-sound-theme"; } diff --git a/pkgs/kde/plasma/oxygen-sounds/default.nix b/pkgs/kde/plasma/oxygen-sounds/default.nix index 68ee47d20eb8e..8153b0d757156 100644 --- a/pkgs/kde/plasma/oxygen-sounds/default.nix +++ b/pkgs/kde/plasma/oxygen-sounds/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "oxygen-sounds"; } diff --git a/pkgs/kde/plasma/oxygen/default.nix b/pkgs/kde/plasma/oxygen/default.nix index 718a9737a8e1c..7d4eb0c378748 100644 --- a/pkgs/kde/plasma/oxygen/default.nix +++ b/pkgs/kde/plasma/oxygen/default.nix @@ -6,7 +6,11 @@ mkKdeDerivation { pname = "oxygen"; - outputs = ["out" "dev" "qt5"]; + outputs = [ + "out" + "dev" + "qt5" + ]; # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. diff --git a/pkgs/kde/plasma/plasma-activities-stats/default.nix b/pkgs/kde/plasma/plasma-activities-stats/default.nix index dff496e4f6311..3e25cdb19674c 100644 --- a/pkgs/kde/plasma/plasma-activities-stats/default.nix +++ b/pkgs/kde/plasma/plasma-activities-stats/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-activities-stats"; } diff --git a/pkgs/kde/plasma/plasma-activities/default.nix b/pkgs/kde/plasma/plasma-activities/default.nix index c9fdd08211814..01354b5a6a284 100644 --- a/pkgs/kde/plasma/plasma-activities/default.nix +++ b/pkgs/kde/plasma/plasma-activities/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "plasma-activities"; - extraBuildInputs = [qtdeclarative boost]; + extraBuildInputs = [ + qtdeclarative + boost + ]; meta.mainProgram = "plasma-activities-cli6"; } diff --git a/pkgs/kde/plasma/plasma-browser-integration/default.nix b/pkgs/kde/plasma/plasma-browser-integration/default.nix index e069d067f2948..b4fb1c2b03a37 100644 --- a/pkgs/kde/plasma/plasma-browser-integration/default.nix +++ b/pkgs/kde/plasma/plasma-browser-integration/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-browser-integration"; meta.mainProgram = "plasma-browser-integration-host"; diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index a84a55779d365..46a0a73fb453d 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -18,55 +18,56 @@ libcanberra, libxkbfile, ibus, -}: let +}: +let # run gsettings with desktop schemas for using in "kcm_access" kcm # and in kaccess - gsettings-wrapper = runCommandLocal "gsettings-wrapper" {nativeBuildInputs = [makeWrapper];} '' + gsettings-wrapper = runCommandLocal "gsettings-wrapper" { nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${glib}/bin/gsettings $out/bin/gsettings --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas.out}/share/gsettings-schemas/${gsettings-desktop-schemas.name} ''; in - mkKdeDerivation { - pname = "plasma-desktop"; +mkKdeDerivation { + pname = "plasma-desktop"; - patches = [ - (substituteAll { - src = ./hwclock-path.patch; - hwclock = "${lib.getBin util-linux}/bin/hwclock"; - }) - (substituteAll { - src = ./kcm-access.patch; - gsettings = "${gsettings-wrapper}/bin/gsettings"; - }) - ./tzdir.patch - ./no-discover-shortcut.patch - (substituteAll { - src = ./wallpaper-paths.patch; - wallpapers = "${lib.getBin breeze}/share/wallpapers"; - }) - ]; + patches = [ + (substituteAll { + src = ./hwclock-path.patch; + hwclock = "${lib.getBin util-linux}/bin/hwclock"; + }) + (substituteAll { + src = ./kcm-access.patch; + gsettings = "${gsettings-wrapper}/bin/gsettings"; + }) + ./tzdir.patch + ./no-discover-shortcut.patch + (substituteAll { + src = ./wallpaper-paths.patch; + wallpapers = "${lib.getBin breeze}/share/wallpapers"; + }) + ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [ - qtsvg - qtwayland + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + qtwayland - kaccounts-integration + kaccounts-integration - SDL2 - libcanberra - libxkbfile - xkeyboard_config + SDL2 + libcanberra + libxkbfile + xkeyboard_config - xorg.libXcursor - xorg.libXft - xorg.xf86inputlibinput - xorg.xf86inputevdev - xorg.xorgserver + xorg.libXcursor + xorg.libXft + xorg.xf86inputlibinput + xorg.xf86inputevdev + xorg.xorgserver - ibus - ]; + ibus + ]; - # wrap kaccess with wrapped gsettings so it can access accessibility schemas - qtWrapperArgs = ["--prefix PATH : ${lib.makeBinPath [gsettings-wrapper]}"]; - } + # wrap kaccess with wrapped gsettings so it can access accessibility schemas + qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ gsettings-wrapper ]}" ]; +} diff --git a/pkgs/kde/plasma/plasma-firewall/default.nix b/pkgs/kde/plasma/plasma-firewall/default.nix index 202d3ea089b27..b777de3bb6194 100644 --- a/pkgs/kde/plasma/plasma-firewall/default.nix +++ b/pkgs/kde/plasma/plasma-firewall/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-firewall"; } diff --git a/pkgs/kde/plasma/plasma-integration/default.nix b/pkgs/kde/plasma/plasma-integration/default.nix index a626b94479347..55c1bb7ee10ad 100644 --- a/pkgs/kde/plasma/plasma-integration/default.nix +++ b/pkgs/kde/plasma/plasma-integration/default.nix @@ -9,9 +9,13 @@ mkKdeDerivation { pname = "plasma-integration"; # force it to check our custom import path too - patches = [./qml-path.patch]; + patches = [ ./qml-path.patch ]; - outputs = ["out" "dev" "qt5"]; + outputs = [ + "out" + "dev" + "qt5" + ]; # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. @@ -57,7 +61,10 @@ mkKdeDerivation { "-DKF5XmlGui_DIR=${libsForQt5.kxmlgui.dev}/lib/cmake/KF5XmlGui" ]; - extraBuildInputs = [qtwayland xorg.libXcursor]; + extraBuildInputs = [ + qtwayland + xorg.libXcursor + ]; # Move Qt5 plugin to Qt5 plugin path postInstall = '' diff --git a/pkgs/kde/plasma/plasma-mobile/default.nix b/pkgs/kde/plasma/plasma-mobile/default.nix index 8c6766e13b03a..18654f28dc3d3 100644 --- a/pkgs/kde/plasma/plasma-mobile/default.nix +++ b/pkgs/kde/plasma/plasma-mobile/default.nix @@ -7,8 +7,8 @@ mkKdeDerivation { pname = "plasma-mobile"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsensors]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtsensors ]; postFixup = '' substituteInPlace "$out/share/wayland-sessions/plasma-mobile.desktop" \ --replace-fail \ diff --git a/pkgs/kde/plasma/plasma-nano/default.nix b/pkgs/kde/plasma/plasma-nano/default.nix index 9cdb24f013e7f..2d16f3085f175 100644 --- a/pkgs/kde/plasma/plasma-nano/default.nix +++ b/pkgs/kde/plasma/plasma-nano/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "plasma-nano"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/plasma/plasma-nm/default.nix b/pkgs/kde/plasma/plasma-nm/default.nix index a53ec99a8bed1..6d93b623477b3 100644 --- a/pkgs/kde/plasma/plasma-nm/default.nix +++ b/pkgs/kde/plasma/plasma-nm/default.nix @@ -17,7 +17,7 @@ mkKdeDerivation { }) ]; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwebengine mobile-broadband-provider-info diff --git a/pkgs/kde/plasma/plasma-pa/default.nix b/pkgs/kde/plasma/plasma-pa/default.nix index 4d721ecc711ba..8213000dc40e5 100644 --- a/pkgs/kde/plasma/plasma-pa/default.nix +++ b/pkgs/kde/plasma/plasma-pa/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "plasma-pa"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libcanberra pulseaudio]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + libcanberra + pulseaudio + ]; } diff --git a/pkgs/kde/plasma/plasma-sdk/default.nix b/pkgs/kde/plasma/plasma-sdk/default.nix index 68f5a30fc936d..52e3f6859e5b3 100644 --- a/pkgs/kde/plasma/plasma-sdk/default.nix +++ b/pkgs/kde/plasma/plasma-sdk/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "plasma-sdk"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/plasma/plasma-systemmonitor/default.nix b/pkgs/kde/plasma/plasma-systemmonitor/default.nix index a8e20716ed56e..0aceb98496ac6 100644 --- a/pkgs/kde/plasma/plasma-systemmonitor/default.nix +++ b/pkgs/kde/plasma/plasma-systemmonitor/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-systemmonitor"; meta.mainProgram = "plasma-systemmonitor"; diff --git a/pkgs/kde/plasma/plasma-thunderbolt/default.nix b/pkgs/kde/plasma/plasma-thunderbolt/default.nix index 5b1b682ac9bc1..6a1a963710475 100644 --- a/pkgs/kde/plasma/plasma-thunderbolt/default.nix +++ b/pkgs/kde/plasma/plasma-thunderbolt/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-thunderbolt"; } diff --git a/pkgs/kde/plasma/plasma-vault/default.nix b/pkgs/kde/plasma/plasma-vault/default.nix index 9ab545ab87b8c..f933687143a8e 100644 --- a/pkgs/kde/plasma/plasma-vault/default.nix +++ b/pkgs/kde/plasma/plasma-vault/default.nix @@ -25,5 +25,5 @@ mkKdeDerivation { ''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"'' ]; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/kde/plasma/plasma-welcome/default.nix b/pkgs/kde/plasma/plasma-welcome/default.nix index 7265a3f3f1ffb..3786b3d0c89ae 100644 --- a/pkgs/kde/plasma/plasma-welcome/default.nix +++ b/pkgs/kde/plasma/plasma-welcome/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "plasma-welcome"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "plasma-welcome"; } diff --git a/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix b/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix index af8c892492746..5d661c1c94fd4 100644 --- a/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix +++ b/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "plasma-workspace-wallpapers"; - extraBuildInputs = [extra-cmake-modules]; + extraBuildInputs = [ extra-cmake-modules ]; } diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index a8dfdd9a9e12a..2bb51422b0afe 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -36,7 +36,10 @@ mkKdeDerivation { chmod -x $out/libexec/plasma-sourceenv.sh ''; - extraNativeBuildInputs = [pkg-config spirv-tools]; + extraNativeBuildInputs = [ + pkg-config + spirv-tools + ]; extraBuildInputs = [ qtsvg qtwayland @@ -61,5 +64,8 @@ mkKdeDerivation { echo "${lsof} ${xorg.xmessage} ${xorg.xsetroot}" > $out/nix-support/depends ''; - passthru.providedSessions = ["plasma" "plasmax11"]; + passthru.providedSessions = [ + "plasma" + "plasmax11" + ]; } diff --git a/pkgs/kde/plasma/plasma5support/default.nix b/pkgs/kde/plasma/plasma5support/default.nix index 385626aeedc00..f1c0632fdcf37 100644 --- a/pkgs/kde/plasma/plasma5support/default.nix +++ b/pkgs/kde/plasma/plasma5support/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma5support"; } diff --git a/pkgs/kde/plasma/plymouth-kcm/default.nix b/pkgs/kde/plasma/plymouth-kcm/default.nix index ccb117f11a53f..b5f7f65780144 100644 --- a/pkgs/kde/plasma/plymouth-kcm/default.nix +++ b/pkgs/kde/plasma/plymouth-kcm/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "plymouth-kcm"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [plymouth]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ plymouth ]; meta.mainProgram = "kplymouththemeinstaller"; } diff --git a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix index 6c4bf0653f091..53f7f2959d601 100644 --- a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix +++ b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "polkit-kde-agent-1"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/plasma/powerdevil/default.nix b/pkgs/kde/plasma/powerdevil/default.nix index 8b0c270e85c64..3faa5c38417e6 100644 --- a/pkgs/kde/plasma/powerdevil/default.nix +++ b/pkgs/kde/plasma/powerdevil/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "powerdevil"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libcap]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ libcap ]; } diff --git a/pkgs/kde/plasma/print-manager/default.nix b/pkgs/kde/plasma/print-manager/default.nix index fce60dcb968b9..dd06f52176374 100644 --- a/pkgs/kde/plasma/print-manager/default.nix +++ b/pkgs/kde/plasma/print-manager/default.nix @@ -6,5 +6,5 @@ mkKdeDerivation { pname = "print-manager"; # FIXME: cups-smb? - extraBuildInputs = [cups]; + extraBuildInputs = [ cups ]; } diff --git a/pkgs/kde/plasma/qqc2-breeze-style/default.nix b/pkgs/kde/plasma/qqc2-breeze-style/default.nix index 2d950f63e0c57..97a7da9567945 100644 --- a/pkgs/kde/plasma/qqc2-breeze-style/default.nix +++ b/pkgs/kde/plasma/qqc2-breeze-style/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "qqc2-breeze-style"; } diff --git a/pkgs/kde/plasma/sddm-kcm/default.nix b/pkgs/kde/plasma/sddm-kcm/default.nix index d21ea6ac58f29..e6ba4bb608f22 100644 --- a/pkgs/kde/plasma/sddm-kcm/default.nix +++ b/pkgs/kde/plasma/sddm-kcm/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "sddm-kcm"; meta.mainProgram = "sddmthemeinstaller"; diff --git a/pkgs/kde/plasma/systemsettings/default.nix b/pkgs/kde/plasma/systemsettings/default.nix index 10feafc859c33..7902e83710ffb 100644 --- a/pkgs/kde/plasma/systemsettings/default.nix +++ b/pkgs/kde/plasma/systemsettings/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "systemsettings"; meta.mainProgram = "systemsettings"; diff --git a/pkgs/kde/plasma/wacomtablet/default.nix b/pkgs/kde/plasma/wacomtablet/default.nix index 58b80fa9575f1..c4482a6896063 100644 --- a/pkgs/kde/plasma/wacomtablet/default.nix +++ b/pkgs/kde/plasma/wacomtablet/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "wacomtablet"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libwacom xf86_input_wacom]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + libwacom + xf86_input_wacom + ]; meta.mainProgram = "kde_wacom_tabletfinder"; } diff --git a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix index 7563e934e502f..0614c0c191d54 100644 --- a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix +++ b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "xdg-desktop-portal-kde"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland cups]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + cups + ]; } diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix index 3f157eb2f5b0a..282978fbc338a 100644 --- a/pkgs/kde/third-party/applet-window-buttons6/default.nix +++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix @@ -1,13 +1,13 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, extra-cmake-modules -, kcoreaddons -, kdeclarative -, kdecoration -, libplasma +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + extra-cmake-modules, + kcoreaddons, + kdeclarative, + kdecoration, + libplasma, }: stdenv.mkDerivation rec { diff --git a/pkgs/kde/third-party/koi/default.nix b/pkgs/kde/third-party/koi/default.nix new file mode 100644 index 0000000000000..1c1d3c92172b5 --- /dev/null +++ b/pkgs/kde/third-party/koi/default.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kconfig, + kcoreaddons, + kwidgetsaddons, + wrapQtAppsHook, +}: +stdenv.mkDerivation rec { + pname = "koi"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "baduhai"; + repo = "Koi"; + rev = version; + sha256 = "sha256-dhpuKIY/Xi62hzJlnVCIOF0k6uoQ3zH129fLq/r+Kmg"; + }; + + # See https://github.com/baduhai/Koi/blob/master/development/Nix%20OS/dev.nix + sourceRoot = "source/src"; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + buildInputs = [ + kconfig + kcoreaddons + kwidgetsaddons + ]; + + meta = with lib; { + description = "Scheduling LIGHT/DARK Theme Converter for the KDE Plasma Desktop"; + longDescription = '' + Koi is a program designed to provide the KDE Plasma Desktop functionality to automatically switch between light and dark themes. Koi is under semi-active development, and while it is stable enough to use daily, expect bugs. Koi is designed to be used with Plasma, and while some features may function under different desktop environments, they are unlikely to work and untested. + + Features: + + - Toggle between light and dark presets based on time + - Change Plasma style + - Change Qt colour scheme + - Change Icon theme + - Change GTK theme + - Change wallpaper + - Hide application to system tray + - Toggle between LIGHT/DARK themes by clicking mouse wheel + ''; + license = licenses.lgpl3; + platforms = platforms.linux; + homepage = "https://github.com/baduhai/Koi"; + maintainers = with lib.maintainers; [ fnune ]; + }; +} diff --git a/pkgs/kde/third-party/krohnkite/default.nix b/pkgs/kde/third-party/krohnkite/default.nix new file mode 100644 index 0000000000000..03b3e64adcfe9 --- /dev/null +++ b/pkgs/kde/third-party/krohnkite/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs_22, + kwin, + kpackage, + zip, +}: +buildNpmPackage rec { + pname = "krohnkite"; + version = "0.9.7"; + + src = fetchFromGitHub { + owner = "anametologin"; + repo = "krohnkite"; + rev = "refs/tags/${version}"; + hash = "sha256-8A3zW5tK8jK9fSxYx28b8uXGsvxEoUYybU0GaMD2LNw="; + }; + + npmDepsHash = "sha256-My1goFEoZW9kFA3zb8xKPxAPXm6bypyq+ajPM8zVOHQ="; + + dontWrapQtApps = true; + + nodejs = nodejs_22; + + nativeBuildInputs = [ + kpackage + zip + kwin + ]; + + postPatch = '' + cp ${./package-lock.json} package-lock.json + ''; + + npmBuildScript = "tsc"; + + installPhase = '' + runHook preInstall + + substituteInPlace Makefile --replace-fail '7z a -tzip' 'zip -r' + make krohnkite-${version}.kwinscript + kpackagetool6 --type=KWin/Script --install=krohnkite-${version}.kwinscript --packageroot=$out/share/kwin/scripts + + runHook postInstall + ''; + + meta = { + description = "Dynamic Tiling Extension for KWin 6"; + homepage = "https://github.com/anametologin/krohnkite"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ben9986 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/kde/third-party/krohnkite/package-lock.json b/pkgs/kde/third-party/krohnkite/package-lock.json new file mode 100644 index 0000000000000..2ac91ccab8757 --- /dev/null +++ b/pkgs/kde/third-party/krohnkite/package-lock.json @@ -0,0 +1,877 @@ +{ + "name": "krohnkite", + "version": "0.9.7", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "krohnkite", + "version": "0.9.7", + "license": "MIT", + "devDependencies": { + "mocha": "^10.4.0", + "typescript": "^5.4.5" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chalk/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, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "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/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.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==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/diff": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "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", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "bin": { + "flat": "cli.js" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "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, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "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, + "engines": { + "node": ">=8" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "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, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "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==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha": { + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz", + "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==", + "dev": true, + "dependencies": { + "ansi-colors": "^4.1.3", + "browser-stdout": "^1.3.1", + "chokidar": "^3.5.3", + "debug": "^4.3.5", + "diff": "^5.2.0", + "escape-string-regexp": "^4.0.0", + "find-up": "^5.0.0", + "glob": "^8.1.0", + "he": "^1.2.0", + "js-yaml": "^4.1.0", + "log-symbols": "^4.1.0", + "minimatch": "^5.1.6", + "ms": "^2.1.3", + "serialize-javascript": "^6.0.2", + "strip-json-comments": "^3.1.1", + "supports-color": "^8.1.1", + "workerpool": "^6.5.1", + "yargs": "^16.2.0", + "yargs-parser": "^20.2.9", + "yargs-unparser": "^2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha.js" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/typescript": { + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/workerpool": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", + "dev": true + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/pkgs/kde/third-party/kzones/default.nix b/pkgs/kde/third-party/kzones/default.nix index a53d88af099ad..de2ff39b311b6 100644 --- a/pkgs/kde/third-party/kzones/default.nix +++ b/pkgs/kde/third-party/kzones/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kzones"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "gerritdevriese"; repo = "kzones"; rev = "v${finalAttrs.version}"; - hash = "sha256-6cZJEcvynlP9nXyBKRst8Bca0d8Mh51ft7ocRrgCV7w="; + hash = "sha256-xqTQiL+7T6p+Y86eC5InAk6waYoM82iFoLflkN6/dG8="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index f4120816cba97..b4bd9d9d41d2f 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -8,7 +8,7 @@ let nodeEnv = import ../../development/node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages-generated.nix { diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix index fc312b1d519c9..853c187d38ae5 100644 --- a/pkgs/misc/calaos/installer/default.nix +++ b/pkgs/misc/calaos/installer/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { qmakeFlags = [ "REVISION=${version}" ]; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications cp -a calaos_installer.app $out/Applications '' else '' diff --git a/pkgs/misc/cbeams/default.nix b/pkgs/misc/cbeams/default.nix deleted file mode 100644 index 928b03df09f7d..0000000000000 --- a/pkgs/misc/cbeams/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildPythonApplication, fetchPypi, isPy3k, blessings, docopt }: - -buildPythonApplication rec { - pname = "cbeams"; - version = "1.0.3"; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1agcjg6kmcyvk834xd2j60mi349qi9iw3dc2vwpd7pqwq1daq3gi"; - }; - - propagatedBuildInputs = [ blessings docopt ]; - - meta = with lib; { - homepage = "https://github.com/tartley/cbeams"; - description = "Command-line program to draw animated colored circles in the terminal"; - license = licenses.bsd3; - maintainers = with maintainers; [ oxzi ]; - }; -} diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix index bdfa620ef3f2f..0617b0f8069bc 100644 --- a/pkgs/misc/cliscord/default.nix +++ b/pkgs/misc/cliscord/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dmR49yyErahOUxR9pGW1oYy8Wq5SWOprK317u+JPBv4="; }; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 194074ce9cb66..4c9d2de108734 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -48,21 +48,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config removeReferencesTo ]; buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ] - ++ lib.optionals stdenv.isLinux [ avahi pam dbus acl ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ avahi pam dbus acl ] ++ lib.optional enableSystemd systemd - ++ lib.optionals stdenv.isDarwin (with darwin; [ + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin; [ configd apple_sdk.frameworks.ApplicationServices ]); propagatedBuildInputs = [ gmp ]; - configurePlatforms = lib.optionals stdenv.isLinux [ "build" "host" ]; + configurePlatforms = lib.optionals stdenv.hostPlatform.isLinux [ "build" "host" ]; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--enable-raw-printing" "--enable-threads" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-dbus" "--enable-pam" "--with-dbusdir=${placeholder "out"}/share/dbus-1" @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { "--with-systemd=$out/lib/systemd/system" - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' "--with-bundledir=$out" ''} ) @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postInstall = '' - libexec=${if stdenv.isDarwin then "libexec/cups" else "lib/cups"} + libexec=${if stdenv.hostPlatform.isDarwin then "libexec/cups" else "lib/cups"} moveToOutput $libexec "$out" # $lib contains references to $out/share/cups. @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { for f in "$out"/lib/systemd/system/*; do substituteInPlace "$f" --replace "$lib/$libexec" "$out/$libexec" done - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Use xdg-open when on Linux substituteInPlace "$out"/share/applications/cups.desktop \ --replace "Exec=htmlview" "Exec=xdg-open" diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index d683e80b28937..98116903ec64c 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -30,7 +30,7 @@ let myPatchElf = file: '' patchelf --set-interpreter \ - ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.hostPlatform.is64bit "-x86-64"}.so.2 \ ${file} ''; in diff --git a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix index 8ebcccbaa2819..2b265498ac6d0 100644 --- a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix @@ -1,5 +1,4 @@ { lib -, findutils , stdenv , fetchurl , dpkg diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 127910f97aac6..b4a7b66c02e3a 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { url = "https://github.com/OpenPrinting/cups-filters/commit/93e60d3df358c0ae6f3dba79e1c9684657683d89.patch"; hash = "sha256-KgWTYFr2uShL040azzE+KaNyBPy7Gs/hCnEgQmmPCys="; }) + (fetchpatch { + name = "CVE-2024-47076.patch"; + url = "https://github.com/OpenPrinting/libcupsfilters/commit/95576ec3d20c109332d14672a807353cdc551018.patch"; + hash = "sha256-MXWllrdWt8n7zqvumQNg34dBgWMwMTwf9lrD+ZZP8Wk="; + }) ]; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/misc/drivers/infnoise/default.nix b/pkgs/misc/drivers/infnoise/default.nix index 47ff00459923f..e2f117e1e8c49 100644 --- a/pkgs/misc/drivers/infnoise/default.nix +++ b/pkgs/misc/drivers/infnoise/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, libftdi -, infnoise, testers }: +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "infnoise"; version = "0.3.2"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { }) ]; - GIT_COMMIT = src.rev; - GIT_VERSION = version; + GIT_COMMIT = finalAttrs.src.rev; + GIT_VERSION = finalAttrs.version; GIT_DATE = "2019-08-12"; buildInputs = [ libftdi ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; passthru = { - tests.version = testers.testVersion { package = infnoise; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = with lib; { @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ StijnDW zhaofengli ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index e58e71a93f556..41614b27711c4 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -8,13 +8,13 @@ buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.8.18"; + version = "0.4.8.21"; src = fetchFromGitHub { - owner = "C0rn3j"; - repo = pname; + owner = "C0rn3j"; + repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-xSxAzvyBXfU7IzTWOXPPDBX4bTvbZ7RHUTtz3zwi7a8="; + hash = "sha256-XakbCuwjIAXYFZxvJsAlDIJEl09pwFPT12h04onXd34="; }; nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; @@ -47,7 +47,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = "https://github.com/Ryochan7/sc-controller"; + homepage = "https://github.com/C0rn3j/sc-controller"; # donations: https://www.patreon.com/kozec description = "User-mode driver and GUI for Steam Controller and other controllers"; license = licenses.gpl2Only; diff --git a/pkgs/misc/drivers/spacenavd/default.nix b/pkgs/misc/drivers/spacenavd/default.nix index eb2fc165cccbf..27ea69943cc1a 100644 --- a/pkgs/misc/drivers/spacenavd/default.nix +++ b/pkgs/misc/drivers/spacenavd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libX11 ] - ++ lib.optional stdenv.isDarwin IOKit; + ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; configureFlags = [ "--disable-debug" ]; diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index b853c21ac31a7..739b431d99f8e 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.13.3"; + version = "10.15.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-tjaYsvCj0Vy0DyTgoZthtQhYYLuBw1+ncVdb9rB71Vw="; + hash = "sha256-zKF9ef28lZns2WWZ7BjLSP7Z5N5+wIaztLmgfzA05+c="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-WZfaIoVwLMoXU/NLVQAiwH6SuEU0BEKy4Vg887K6c6o="; + vendorHash = "sha256-PoP4dMhNj+pHPSNmX24W/qipUJJeL88mjx1sqtcF40M="; nativeBuildInputs = [ installShellFiles @@ -52,8 +52,8 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20231130153524/https://developer.fastly.com/api/internal/cli-config"; - hash = "sha256-ZKr6D4DI+lr8FDjfLMgpn4Zq4i5kiwcLEDEScuuCBBw="; + url = "https://web.archive.org/web/20240910172801/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-r4ahroyU4hyTN88UK02FvXU8OTQ6OoNInt9WrzZk7Bk="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index f37826501d729..653c4747c9336 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -56,7 +56,7 @@ python311Packages.buildPythonApplication rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ sepi ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/frescobaldi.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/frescobaldi.x86_64-darwin mainProgram = "frescobaldi"; }; } diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 466bd1c909387..c5cb69bea4b53 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -21,7 +21,7 @@ , bash , buildPackages , openjpeg -, cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin) +, cupsSupport ? config.ghostscript.cups or (!stdenv.hostPlatform.isDarwin) , cups , x11Support ? cupsSupport , xorg # with CUPS, X11 only adds very little @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { buildFlags = [ "so" ] # without -headerpad, the following error occurs on Darwin when compiling with X11 support (as of 10.02.0) # error: install_name_tool: changing install names or rpaths can't be redone for: [...]libgs.dylib.10 (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names) - ++ lib.optional (x11Support && stdenv.isDarwin) "LDFLAGS=-headerpad_max_install_names"; + ++ lib.optional (x11Support && stdenv.hostPlatform.isDarwin) "LDFLAGS=-headerpad_max_install_names"; installTargets = [ "soinstall" ]; postInstall = '' @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { mkdir -p $fonts/share/fonts cp -rv ${fonts}/* "$fonts/share/fonts/" ln -s "$fonts/share/fonts" "$out/share/ghostscript/fonts" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/*.dylib* ; do install_name_tool -id "$file" $file done @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { # dynamic library name only contains maj.min, eg. '9.53' dylib_version = lib.versions.majorMinor version; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libgs.dylib.$dylib_version $out/lib/libgs.dylib.$dylib_version $out/bin/gs install_name_tool -change libgs.dylib.$dylib_version $out/lib/libgs.dylib.$dylib_version $out/bin/gsx ''; diff --git a/pkgs/misc/ite-backlight/default.nix b/pkgs/misc/ite-backlight/default.nix index 376c4c409ca08..9660ad613be1d 100644 --- a/pkgs/misc/ite-backlight/default.nix +++ b/pkgs/misc/ite-backlight/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , stdenv , fetchpatch , ninja diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 09e158da3ac32..54827497f846d 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -20,7 +20,7 @@ let libOnly = prefix == "lib"; - optDbus = if stdenv.isDarwin then null else shouldUsePkg dbus; + optDbus = if stdenv.hostPlatform.isDarwin then null else shouldUsePkg dbus; optPythonDBus = if libOnly then null else shouldUsePkg dbus-python; optLibffado = if libOnly then null else shouldUsePkg libffado; optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config python makeWrapper wafHook ]; buildInputs = [ libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ aften AudioUnit CoreAudio Accelerate libobjc ]; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 428bb9685f47f..d50f21f53fcbb 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "JACK audio connection kit"; homepage = "https://jackaudio.org"; license = with licenses; [ gpl2Plus lgpl21 ]; diff --git a/pkgs/misc/jackaudio/tools.nix b/pkgs/misc/jackaudio/tools.nix index e0e51a0ba4d98..76826d30cae9e 100644 --- a/pkgs/misc/jackaudio/tools.nix +++ b/pkgs/misc/jackaudio/tools.nix @@ -16,7 +16,7 @@ , zita-alsa-pcmi , zita-resampler -, enableAlsa ? stdenv.isLinux +, enableAlsa ? stdenv.hostPlatform.isLinux }: stdenv.mkDerivation (final: { diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 327882951d298..95bc57227e20d 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; - FONTCONFIG_FILE = lib.optional stdenv.isDarwin (makeFontsConf { + FONTCONFIG_FILE = lib.optional stdenv.hostPlatform.isDarwin (makeFontsConf { fontDirectories = [ freefont_ttf ]; }); } diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index 74f9932794939..738c5f76da203 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,10 +1,10 @@ { lib, fetchurl, lilypond }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.17"; + version = "2.25.19"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-AVGd/H2+lQxUYyXGB2dOBU4rpqR5LSkn3ishu5uqDYs="; + hash = "sha256-gGG4ObmY9PcO0JIKxAagquHS74Elc49SZ/8FDwFfZDU="; }; passthru.updateScript = { diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix index 87ab12ee29c8a..e0d20dfcb46cf 100644 --- a/pkgs/misc/logging/pacemaker/default.nix +++ b/pkgs/misc/logging/pacemaker/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pacemaker"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "Pacemaker-${version}"; - sha256 = "sha256-cvCMIzeyP9oEzHpafOvCORYwWg6cH5qj3qXOUMW4nHA="; + sha256 = "sha256-J57+NSs4cL3BlEjSaXAoUTEhbMMxhWy8sUZ/K3x2nRM="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/moonfire-nvr/default.nix b/pkgs/misc/moonfire-nvr/default.nix index d6a994ac3e684..67e5f129927cf 100644 --- a/pkgs/misc/moonfire-nvr/default.nix +++ b/pkgs/misc/moonfire-nvr/default.nix @@ -54,7 +54,7 @@ in rustPlatform.buildRustPackage { buildInputs = [ ncurses sqlite - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); diff --git a/pkgs/misc/opcua-client-gui/default.nix b/pkgs/misc/opcua-client-gui/default.nix index c37568cfc9cbd..2266970603659 100644 --- a/pkgs/misc/opcua-client-gui/default.nix +++ b/pkgs/misc/opcua-client-gui/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ copyDesktopItems wrapQtAppsHook ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; makeWrapperArgs = [ "\${qtWrapperArgs[@]}" diff --git a/pkgs/misc/opensbi/default.nix b/pkgs/misc/opensbi/default.nix index 172e28c056697..dae75b546caec 100644 --- a/pkgs/misc/opensbi/default.nix +++ b/pkgs/misc/opensbi/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "opensbi"; - version = "1.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "riscv-software-src"; repo = "opensbi"; rev = "v${version}"; - hash = "sha256-vK14P97FcaVz4GDr/0055Z6s/k7BPKPQGZ/MQxbOWu0="; + hash = "sha256-qb3orbmZJtesIBj9F2OX+BhrlctymZA1ZIbV/GVa0lU="; }; postPatch = '' diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 2da49d1f45bca..40f308280e629 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, alsa-lib, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, alsa-lib, fixDarwinDylibNames, gitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "sndio"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "https://www.sndio.org/sndio-${finalAttrs.version}.tar.gz"; - hash = "sha256-8wgm/JwH42nTkk1fzt9qClPA30rh9atQ/pzygFQPaZo="; + hash = "sha256-vr07/QHFDJN2zz54FLk3m+2eF9A5O1ETt+t6PQ0DjFQ="; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; @@ -18,6 +18,13 @@ stdenv.mkDerivation (finalAttrs: { ''; enableParallelBuilding = true; + # does not provide --disable-static + dontDisableStatic = true; + + passthru.updateScript = gitUpdater { + url = "https://sndio.org/git/sndio"; + rev-prefix = "v"; + }; meta = { homepage = "https://www.sndio.org"; diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix deleted file mode 100644 index 09964fd58bccf..0000000000000 --- a/pkgs/misc/solfege/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook3 -, buildPythonApplication, pycairo, pygobject3 -, gdk-pixbuf, gobject-introspection, gtk3, librsvg -, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond -, automake, autoconf, txt2man -}: - -buildPythonApplication rec { - pname = "solfege"; - version = "3.23.4"; - - src = fetchurl { - url = "https://alpha.gnu.org/gnu/solfege/solfege-${version}.tar.gz"; - sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp"; - }; - - patches = [ - ./css.patch - ./menubar.patch - ./texinfo.patch - ./webbrowser.patch - ]; - - preConfigure = '' - aclocal - autoconf - ''; - - nativeBuildInputs = [ - automake - autoconf - gdk-pixbuf - gettext - pkg-config - texinfo - txt2man - - gobject-introspection - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - librsvg - ]; - - propagatedBuildInputs = [ - pycairo - pygobject3 - ]; - - preBuild = '' - sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \ - -e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \ - -e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \ - -e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \ - -e 's|csound=.*|csound=${csound}/bin/csound|' \ - -e 's|lilypond-book=.*|lilypond-book=${lilypond}/bin/lilypond-book|' \ - default.config - ''; - - format = "other"; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Ear training program"; - homepage = "https://www.gnu.org/software/solfege/"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor orivej anthonyroussel ]; - mainProgram = "solfege"; - }; -} diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index eb243aa4f9b80..9e73b77c59cf2 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -58,7 +58,7 @@ # without this creating tag files for lifted-base fails export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 - ${lib.optionalString stdenv.isLinux "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;"} + ${lib.optionalString stdenv.hostPlatform.isLinux "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;"} ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags . mv tags \$TAG_FILE diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index fd64b3942b5a1..5ca07007d14ae 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib expat libmicrohttpd ] ++ - lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "Stubbed XMPP Server"; diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index ac99abb7e5cdd..c67a8d60557b5 100644 --- a/pkgs/misc/t-rec/default.nix +++ b/pkgs/misc/t-rec/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ imagemagick ] - ++ lib.optionals stdenv.isDarwin [ libiconv Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Foundation ]; postInstall = '' wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 6343c5b1b9dd9..d8da9f10164cd 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -140,26 +140,26 @@ in rec { }; }; - copy-toolkit = mkTmuxPlugin rec { + copy-toolkit = mkTmuxPlugin { pluginName = "copy-toolkit"; rtpFilePath = "copytk.tmux"; - version = "1.1"; + version = "2021-12-20"; src = fetchFromGitHub { owner = "CrispyConductor"; repo = "tmux-copy-toolkit"; - rev = "v${version}"; - sha256 = "MEMC9klm+PH66UHwrB2SqdCaZX0LAujL+Woo/hV84m4="; + rev = "c80c2c068059fe04f840ea9f125c21b83cb6f81f"; + hash = "sha256-cLeOoJ+4MF8lSpwy5lkcPakvB3cpgey0RfLbVTwERNk="; }; postInstall = '' sed -i -e 's|python3 |${pkgs.python3}/bin/python3 |g' $target/copytk.tmux - sed -i -e 's|/bin/bash|${pkgs.bash}/bin/bash|g;s|/bin/cat|${pkgs.coreutils}/bin/cat|g' $target/copytk.py + sed -i -e 's|python3|${pkgs.python3}/bin/python3|g;s|/bin/bash|${pkgs.bash}/bin/bash|g;s|/bin/cat|${pkgs.coreutils}/bin/cat|g' $target/copytk.py ''; meta = { homepage = "https://github.com/CrispyConductor/tmux-copy-toolkit"; description = "Various copy-mode tools"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ deejayem ]; + maintainers = with lib.maintainers; [ deejayem sedlund ]; }; }; @@ -242,29 +242,8 @@ in rec { }; }; - fingers = mkTmuxPlugin rec { - pluginName = "tmux-fingers"; - rtpFilePath = "load-config.tmux"; - version = "2.1.1"; - src = fetchFromGitHub { - owner = "Morantron"; - repo = "tmux-fingers"; - rev = "${version}"; - sha256 = "sha256-1YMh6m8M6FKf8RPXsOfWCVC5CXSr/MynguwkG7O+oEY="; - }; - nativeBuildInputs = [ pkgs.makeWrapper pkgs.crystal pkgs.shards ]; - postInstall = '' - shards build --production - rm -rf $target/* $target/.* - cp -r bin $target/bin - echo "$target/bin/${pluginName} load-config" > $target/${rtpFilePath} - chmod +x $target/${rtpFilePath} - - wrapProgram $target/${rtpFilePath} \ - --prefix PATH : ${with pkgs; lib.makeBinPath ( - [ gawk ] ++ lib.optionals stdenv.isDarwin [ reattach-to-user-namespace ] - )} - ''; + fingers = pkgs.callPackage ./tmux-fingers { + inherit mkTmuxPlugin; }; fpp = mkTmuxPlugin { @@ -614,7 +593,7 @@ in rec { rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5"; sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx"; }; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -e 's:reattach-to-user-namespace:${pkgs.reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux ''; }; diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix new file mode 100644 index 0000000000000..bb415d76935b7 --- /dev/null +++ b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix @@ -0,0 +1,46 @@ +{ + mkTmuxPlugin, + substituteAll, + fetchFromGitHub, + crystal, +}: +let + fingers = crystal.buildCrystalPackage rec { + format = "shards"; + version = "2.2.2"; + pname = "fingers"; + src = fetchFromGitHub { + owner = "Morantron"; + repo = "tmux-fingers"; + rev = "${version}"; + sha256 = "sha256-m9QON7diHVEDnnv/alXCJOG+BnfrAKygScrubZZ605I="; + }; + + shardsFile = ./shards.nix; + crystalBinaries.tmux-fingers.src = "src/fingers.cr"; + + postInstall = '' + shopt -s dotglob extglob + rm -rv !("tmux-fingers.tmux"|"bin") + shopt -u dotglob extglob + ''; + + # TODO: Needs starting a TMUX session to run tests + # Unhandled exception: Missing ENV key: "TMUX" (KeyError) + doCheck = false; + doInstallCheck = false; + }; +in +mkTmuxPlugin { + inherit (fingers) version src meta; + + pluginName = fingers.src.repo; + rtpFilePath = "tmux-fingers.tmux"; + + patches = [ + (substituteAll { + src = ./fix.patch; + tmuxFingersDir = "${fingers}/bin"; + }) + ]; +} diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch b/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch new file mode 100644 index 0000000000000..34014441ebf95 --- /dev/null +++ b/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch @@ -0,0 +1,41 @@ +diff --git a/tmux-fingers.tmux b/tmux-fingers.tmux +index f15b509..a14e312 100755 +--- a/tmux-fingers.tmux ++++ b/tmux-fingers.tmux +@@ -1,35 +1,4 @@ + #!/usr/bin/env bash + +-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +- +-if command -v "tmux-fingers" &>/dev/null; then +- FINGERS_BINARY="tmux-fingers" +-elif [[ -f "$CURRENT_DIR/bin/tmux-fingers" ]]; then +- FINGERS_BINARY="$CURRENT_DIR/bin/tmux-fingers" +-fi +- +-if [[ -z "$FINGERS_BINARY" ]]; then +- tmux run-shell -b "bash $CURRENT_DIR/install-wizard.sh" +- exit 0 +-fi +- +-CURRENT_FINGERS_VERSION="$($FINGERS_BINARY version)" +- +-pushd $CURRENT_DIR &> /dev/null +-CURRENT_GIT_VERSION=$(cat shard.yml | grep "^version" | cut -f2 -d':' | sed "s/ //g") +-popd &> /dev/null +- +-SKIP_WIZARD=$(tmux show-option -gqv @fingers-skip-wizard) +-SKIP_WIZARD=${SKIP_WIZARD:-0} +- +-if [ "$SKIP_WIZARD" = "0" ] && [ "$CURRENT_FINGERS_VERSION" != "$CURRENT_GIT_VERSION" ]; then +- tmux run-shell -b "FINGERS_UPDATE=1 bash $CURRENT_DIR/install-wizard.sh" +- +- if [[ "$?" != "0" ]]; then +- echo "Something went wrong while updating tmux-fingers. Please try again." +- exit 1 +- fi +-fi +- +-tmux run "$FINGERS_BINARY load-config" ++tmux run "@tmuxFingersDir@/tmux-fingers load-config" + exit $? diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix b/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix new file mode 100644 index 0000000000000..9367ddf7b1a76 --- /dev/null +++ b/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix @@ -0,0 +1,12 @@ +{ + cling = { + url = "https://github.com/devnote-dev/cling.git"; + rev = "v3.0.0"; + sha256 = "0mj5xvpiif1vhg4qds938p9zb5a47qzl397ybz1l1jks0gg361wq"; + }; + xdg_base_directory = { + url = "https://github.com/tijn/xdg_base_directory.git"; + rev = "60bf28dc060c221d5af52727927e92b840022eb0"; + sha256 = "1sa8bw8mzsz0pbj3m8v0w1pnk1q86zjivr0jndfg77wa33ki34y0"; + }; +} diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 295cb525a6469..351c5788584a2 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -389,6 +389,14 @@ in { filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; }; + ubootOrangePi5Plus = buildUBoot { + defconfig = "orangepi-5-plus-rk3588_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; + ROCKCHIP_TPL = rkbin.TPL_RK3588; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; + }; + ubootOrangePiPc = buildUBoot { defconfig = "orangepi_pc_defconfig"; extraMeta.platforms = ["armv7l-linux"]; diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index aa78c949e5c0c..955b16bf693e4 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -4,8 +4,8 @@ }: let - os = if stdenv.isDarwin then "macos" else "linux"; - arch = if stdenv.isAarch64 then "aarch64" else "x86_64"; + os = if stdenv.hostPlatform.isDarwin then "macos" else "linux"; + arch = if stdenv.hostPlatform.isAarch64 then "aarch64" else "x86_64"; platform = "${os}-${arch}"; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 1724fe435faac..4d96c78cb5608 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoHash = "sha256-XovbT+KC0va7yC5j7kf6t1SnXe1uyy1KI8FRV1AwkS0="; diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-cdefs-static-assert.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-cdefs-static-assert.patch new file mode 100644 index 0000000000000..b5a054f124d34 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-cdefs-static-assert.patch @@ -0,0 +1,41 @@ +From 22cdafe197ac960c5ce839ef6ec699b59f4b0080 Mon Sep 17 00:00:00 2001 +From: Warner Losh <imp@FreeBSD.org> +Date: Sat, 20 Jul 2024 09:57:53 -0600 +Subject: cdefs.h: Don't define fallback for _Static_assert + +Remove pre 4.6 code to define _Static_assert in terms of _COUNTER. We +no longer need to support compilers this old (in fact support for all +pre gcc 10 compilers has been removed in -current). This is a partial +MFC of that work because removing this fixes a bug that's oft reported +with -pedantic-errors and C++98 compilations. + +PR: 280382, 276738 +Sponsored by: Netflix + +This is a direct commit to stable/14. +--- + sys/sys/cdefs.h | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h +index 19b7d8fe427d..a52864c5db9d 100644 +--- a/sys/sys/cdefs.h ++++ b/sys/sys/cdefs.h +@@ -277,15 +277,6 @@ + #if (defined(__cplusplus) && __cplusplus >= 201103L) || \ + __has_extension(cxx_static_assert) + #define _Static_assert(x, y) static_assert(x, y) +-#elif __GNUC_PREREQ__(4,6) && !defined(__cplusplus) +-/* Nothing, gcc 4.6 and higher has _Static_assert built-in */ +-#elif defined(__COUNTER__) +-#define _Static_assert(x, y) __Static_assert(x, __COUNTER__) +-#define __Static_assert(x, y) ___Static_assert(x, y) +-#define ___Static_assert(x, y) typedef char __assert_ ## y[(x) ? 1 : -1] \ +- __unused +-#else +-#define _Static_assert(x, y) struct __hack + #endif + #endif + +-- +cgit v1.2.3 diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/make.nix b/pkgs/os-specific/bsd/freebsd/pkgs/make.nix index ecf231c304145..a622e25f7a77c 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/make.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/make.nix @@ -13,7 +13,7 @@ mkDerivation { export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \ --replace '-Wl,--fatal-warnings' "" \ --replace '-Wl,--warn-shared-textrel' "" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index 4c2fe571999f1..1a3b0f8232539 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -89,14 +89,14 @@ lib.makeOverridable ( # Since STRIP in `makeFlags` has to be a flag, not the binary itself STRIPBIN = "${stdenv'.cc.bintools.targetPrefix}strip"; } - // lib.optionalAttrs stdenv'.isDarwin { MKRELRO = "no"; } + // lib.optionalAttrs stdenv'.hostPlatform.isDarwin { MKRELRO = "no"; } // lib.optionalAttrs (stdenv'.cc.isClang or false) { HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); } // lib.optionalAttrs (stdenv'.cc.isGNU or false) { HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); } - // lib.optionalAttrs (stdenv'.isx86_32) { USE_SSP = "no"; } + // lib.optionalAttrs (stdenv'.hostPlatform.isx86_32) { USE_SSP = "no"; } // lib.optionalAttrs (attrs.headersOnly or false) { installPhase = "includesPhase"; dontBuild = true; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix index bbcaff3a1c6a8..f1cf4f9bd220a 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix @@ -18,7 +18,7 @@ mkDerivation { libmd libnetbsd ] - ++ lib.optional (stdenv.isFreeBSD) libutil; + ++ lib.optional (stdenv.hostPlatform.isFreeBSD) libutil; postPatch = '' ln -s $BSDSRCDIR/contrib/mknod/*.c $BSDSRCDIR/contrib/mknod/*.h $BSDSRCDIR/contrib/mtree @@ -32,7 +32,7 @@ mkDerivation { "-lnetbsd" ] ++ lib.optional compatIsNeeded "-legacy" - ++ lib.optional stdenv.isFreeBSD "-lutil" + ++ lib.optional stdenv.hostPlatform.isFreeBSD "-lutil" ) }" ''; diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 7dff70cc4f17c..dc38be2f1d972 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,6 +1,6 @@ { lib, - crossLibcStdenv, + stdenvNoLibc, stdenvNoCC, makeScopeWithSplicing', generateSplicesForMkScope, @@ -37,7 +37,7 @@ makeScopeWithSplicing' { compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isNetBSD) self.compat; - stdenvLibcMinimal = crossLibcStdenv.override (old: { + stdenvLibcMinimal = stdenvNoLibc.override (old: { cc = old.cc.override { libc = self.libcMinimal; noLibc = false; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix index 40113028bbf15..ad83b06502020 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix @@ -118,7 +118,7 @@ mkDerivation ( install -D $BSDSRCDIR/common/include/rpc/types.h $dev/include/rpc/types.h sed -i '1s;^;#include "nbtool_config.h"\n;' $dev/include/rpc/types.h '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $dev/include/ssp touch $dev/include/ssp/ssp.h '' diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix index 8d61bcfdf7d97..75ca446b708ce 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix @@ -16,12 +16,12 @@ mkDerivation { "-D__va_list=va_list" "-D__warn_references(a,b)=" ] - ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)=" + ++ lib.optional stdenv.hostPlatform.isDarwin "-D__strong_alias(a,b)=" ); propagatedBuildInputs = compatIfNeeded; MKDOC = "no"; # missing vfontedpr makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${libterminfo}/lib" ]; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace $COMPONENT_PATH/printw.c \ --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix index 8605bfbfcebe2..e926557fc444f 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix @@ -2,7 +2,7 @@ lib, stdenv, stdenvNoCC, - crossLibcStdenv, + stdenvNoLibc, stdenvLibcMinimal, runCommand, rsync, @@ -28,7 +28,7 @@ lib.makeOverridable ( if attrs.noCC or false then stdenvNoCC else if attrs.noLibc or false then - crossLibcStdenv + stdenvNoLibc else if attrs.libcMinimal or false then stdenvLibcMinimal else @@ -104,14 +104,14 @@ lib.makeOverridable ( # TODO should CC wrapper set this? CPP = "${stdenv'.cc.targetPrefix}cpp"; } - // lib.optionalAttrs stdenv'.isDarwin { MKRELRO = "no"; } + // lib.optionalAttrs stdenv'.hostPlatform.isDarwin { MKRELRO = "no"; } // lib.optionalAttrs (stdenv'.cc.isClang or false) { HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); } // lib.optionalAttrs (stdenv'.cc.isGNU or false) { HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); } - // lib.optionalAttrs (stdenv'.isx86_32) { USE_SSP = "no"; } + // lib.optionalAttrs (stdenv'.hostPlatform.isx86_32) { USE_SSP = "no"; } // lib.optionalAttrs (attrs.headersOnly or false) { installPhase = "includesPhase"; dontBuild = true; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/source.nix b/pkgs/os-specific/bsd/netbsd/pkgs/source.nix index 432de84ffb3e1..47f200090ca49 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/source.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/source.nix @@ -8,5 +8,5 @@ fetchcvs { cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; module = "src"; tag = "netbsd-${lib.replaceStrings [ "." ] [ "-" ] version}-RELEASE"; - sha256 = "sha256-+onT/ajWayaKALucaZBqoiEkvBBI400Fs2OCtMf/bYU="; + hash = "sha256-+onT/ajWayaKALucaZBqoiEkvBBI400Fs2OCtMf/bYU="; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix b/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix index 1e58df16ceeec..da3c9bb05dc07 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix @@ -6,6 +6,6 @@ mkDerivation { path = "usr.bin/uudecode"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNO_BASE64"; - NIX_LDFLAGS = lib.optional stdenv.isDarwin "-lresolv"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-DNO_BASE64"; + NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isDarwin "-lresolv"; } diff --git a/pkgs/os-specific/bsd/openbsd/default.nix b/pkgs/os-specific/bsd/openbsd/default.nix index cfe594d518ed4..aa12d73079b6a 100644 --- a/pkgs/os-specific/bsd/openbsd/default.nix +++ b/pkgs/os-specific/bsd/openbsd/default.nix @@ -1,6 +1,6 @@ { lib, - crossLibcStdenv, + stdenvNoLibc, makeScopeWithSplicing', generateSplicesForMkScope, buildPackages, @@ -22,7 +22,7 @@ makeScopeWithSplicing' { // { version = "7.5"; - stdenvLibcMinimal = crossLibcStdenv.override (old: { + stdenvLibcMinimal = stdenvNoLibc.override (old: { cc = old.cc.override { libc = self.libcMinimal; noLibc = false; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix index 94fda2d905715..dfe82eff271e7 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix @@ -1,6 +1,6 @@ { lib, - crossLibcStdenv, + stdenvNoLibc, mkDerivation, fetchpatch, bsdSetupHook, @@ -65,7 +65,7 @@ mkDerivation { # Suppress lld >= 16 undefined version errors # https://github.com/freebsd/freebsd-src/commit/2ba84b4bcdd6012e8cfbf8a0d060a4438623a638 env.NIX_LDFLAGS = lib.optionalString ( - crossLibcStdenv.hostPlatform.linker == "lld" + stdenvNoLibc.hostPlatform.linker == "lld" ) "--undefined-version"; makeFlags = [ diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix index 6ec9ba3429161..44709f680884d 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix @@ -2,7 +2,7 @@ lib, stdenv, stdenvNoCC, - crossLibcStdenv, + stdenvNoLibc, stdenvLibcMinimal, runCommand, rsync, @@ -22,7 +22,7 @@ lib.makeOverridable ( if attrs.noCC or false then stdenvNoCC else if attrs.noLibc or false then - crossLibcStdenv + stdenvNoLibc else if attrs.libcMinimal or false then stdenvLibcMinimal else diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 7262400c3eb02..c64f011c0534d 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -127,7 +127,7 @@ let }) bindgenHook; }; - callPackage = newScope (lib.optionalAttrs stdenv.isDarwin (stdenvs // rec { + callPackage = newScope (lib.optionalAttrs stdenv.hostPlatform.isDarwin (stdenvs // rec { inherit (pkgs.darwin.apple_sdk_11_0) xcodebuild rustPlatform; darwin = pkgs.darwin.overrideScope (_: prev: { inherit (prev.darwin.apple_sdk_11_0) diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index b642b993df0e3..787fc93da1f69 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -2,8 +2,8 @@ , libutil }: let - xnu-src = if stdenv.isAarch64 then macosPackages_11_0_1.xnu.src else xnu.src; - arch = if stdenv.isAarch64 then "arm" else "i386"; + xnu-src = if stdenv.hostPlatform.isAarch64 then macosPackages_11_0_1.xnu.src else xnu.src; + arch = if stdenv.hostPlatform.isAarch64 then "arm" else "i386"; in appleDerivation { patches = [ # Fixes a build failure with newer versions of clang that make implicit int an error. diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/spinlocks.patch b/pkgs/os-specific/darwin/apple-source-releases/objc4/spinlocks.patch deleted file mode 100644 index 50c6a983fe4d6..0000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/spinlocks.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- objc4-551.1/runtime/objc-os.h 2013-06-10 21:16:15.000000000 -0400 -+++ ../objc4-551.1/runtime/objc-os.h 2015-01-19 01:01:36.000000000 -0500 -@@ -77,27 +77,72 @@ - # include <mach-o/getsect.h> - # include <mach-o/dyld_priv.h> - # include <malloc/malloc.h> --# include <os/lock_private.h> - # include <libkern/OSAtomic.h> - # include <libkern/OSCacheControl.h> --# include <System/pthread_machdep.h> - # include "objc-probes.h" // generated dtrace probe definitions. - -+#define __PTK_FRAMEWORK_OBJC_KEY5 45 -+#define __PTK_FRAMEWORK_OBJC_KEY6 46 -+#define __PTK_FRAMEWORK_OBJC_KEY7 47 -+#define __PTK_FRAMEWORK_OBJC_KEY8 48 -+#define __PTK_FRAMEWORK_OBJC_KEY9 49 -+ -+extern "C" int pthread_key_init_np(int, void (*)(void *)); -+ - // Some libc functions call objc_msgSend() - // so we can't use them without deadlocks. - void syslog(int, const char *, ...) UNAVAILABLE_ATTRIBUTE; - void vsyslog(int, const char *, va_list) UNAVAILABLE_ATTRIBUTE; - -+#if defined(__i386__) || defined(__x86_64__) -+ -+// Inlined spinlock. -+// Not for arm on iOS because it hurts uniprocessor performance. -+ -+#define ARR_SPINLOCK_INIT 0 -+// XXX -- Careful: OSSpinLock isn't volatile, but should be -+typedef volatile int ARRSpinLock; -+__attribute__((always_inline)) -+static inline void ARRSpinLockLock(ARRSpinLock *l) -+{ -+ unsigned y; -+again: -+ if (__builtin_expect(__sync_lock_test_and_set(l, 1), 0) == 0) { -+ return; -+ } -+ for (y = 1000; y; y--) { -+#if defined(__i386__) || defined(__x86_64__) -+ asm("pause"); -+#endif -+ if (*l == 0) goto again; -+ } -+ thread_switch(THREAD_NULL, SWITCH_OPTION_DEPRESS, 1); -+ goto again; -+} -+__attribute__((always_inline)) -+static inline void ARRSpinLockUnlock(ARRSpinLock *l) -+{ -+ __sync_lock_release(l); -+} -+__attribute__((always_inline)) -+static inline int ARRSpinLockTry(ARRSpinLock *l) -+{ -+ return __sync_bool_compare_and_swap(l, 0, 1); -+} -+ -+#define spinlock_t ARRSpinLock -+#define spinlock_trylock(l) ARRSpinLockTry(l) -+#define spinlock_lock(l) ARRSpinLockLock(l) -+#define spinlock_unlock(l) ARRSpinLockUnlock(l) -+#define SPINLOCK_INITIALIZER ARR_SPINLOCK_INIT - --#define spinlock_t os_lock_handoff_s --#define spinlock_trylock(l) os_lock_trylock(l) --#define spinlock_lock(l) os_lock_lock(l) --#define spinlock_unlock(l) os_lock_unlock(l) --#define SPINLOCK_INITIALIZER OS_LOCK_HANDOFF_INIT -+#endif - - - #if !TARGET_OS_IPHONE --# include <CrashReporterClient.h> -+#define CRSetCrashLogMessage(msg) -+#define CRGetCrashLogMessage() 0 -+#define CRSetCrashLogMessage2(msg) - #else - // CrashReporterClient not yet available on iOS - __BEGIN_DECLS -@@ -594,21 +639,13 @@ - { - assert(is_valid_direct_key(k)); - -- if (_pthread_has_direct_tsd()) { -- return _pthread_getspecific_direct(k); -- } else { -- return pthread_getspecific(k); -- } -+ return pthread_getspecific(k); - } - static inline void tls_set_direct(tls_key_t k, void *value) - { - assert(is_valid_direct_key(k)); - -- if (_pthread_has_direct_tsd()) { -- _pthread_setspecific_direct(k, value); -- } else { -- pthread_setspecific(k, value); -- } -+ pthread_setspecific(k, value); - } - - // not arm diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 1ba9a278ecc58..20a34e814d425 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -5,7 +5,7 @@ }: appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ( - let arch = if stdenv.isx86_64 then "x86_64" else "arm64"; + let arch = if stdenv.hostPlatform.isx86_64 then "x86_64" else "arm64"; in { depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/os-specific/darwin/bartender/default.nix b/pkgs/os-specific/darwin/bartender/default.nix index c56c419d67038..ce38a86b5e0e8 100644 --- a/pkgs/os-specific/darwin/bartender/default.nix +++ b/pkgs/os-specific/darwin/bartender/default.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bartender"; - version = "5.1.1"; + version = "5.1.8"; src = fetchurl { name = "Bartender ${lib.versions.major finalAttrs.version}.dmg"; url = "https://www.macbartender.com/B2/updates/${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}/Bartender%20${lib.versions.major finalAttrs.version}.dmg"; - hash = "sha256-XxBnzHYX/S172rVEiymc3sLOmIeH7ttIxSHMsh1vR/s="; + hash = "sha256-8ypSGbgnfbUv1zZlEihBjiW3UEwU8GwBT4FGiuEpLfU="; }; dontPatch = true; @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { changelog = "https://www.macbartender.com/Bartender${lib.versions.major finalAttrs.version}/release_notes/"; license = [ lib.licenses.unfree ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - maintainers = with lib.maintainers; [ stepbrobd ]; + maintainers = with lib.maintainers; [ stepbrobd DimitarNestorov ]; platforms = [ "aarch64-darwin" "x86_64-darwin" ]; }; }) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index 13aadfce24043..4babe83c63518 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "goku"; version = "0.6.0"; - src = if stdenv.isAarch64 then + src = if stdenv.hostPlatform.isAarch64 then fetchurl { url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip"; hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk="; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { joker ]; - sourceRoot = if stdenv.isAarch64 then "goku" else "."; + sourceRoot = if stdenv.hostPlatform.isAarch64 then "goku" else "."; installPhase = '' chmod +x goku diff --git a/pkgs/os-specific/darwin/noah/default.nix b/pkgs/os-specific/darwin/noah/default.nix index 502a165c33d44..ed20f67e48e9c 100644 --- a/pkgs/os-specific/darwin/noah/default.nix +++ b/pkgs/os-specific/darwin/noah/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = platforms.darwin; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/os-specific/darwin/openwith/default.nix b/pkgs/os-specific/darwin/openwith/default.nix index d28ed4942821c..dbbd94fe43637 100644 --- a/pkgs/os-specific/darwin/openwith/default.nix +++ b/pkgs/os-specific/darwin/openwith/default.nix @@ -2,7 +2,7 @@ let inherit (swiftPackages) apple_sdk stdenv swift; - arch = if stdenv.isAarch64 then "arm64" else "x86_64"; + arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"; in stdenv.mkDerivation rec { pname = "openwith"; diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index 1b866a70691b6..f22b80a776824 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.81.2"; + version = "1.83.2"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-Yz4H71doc5QC+AX5iSmOwewuKjU9dnK5ijVzYoOedYc="; + hash = "sha256-/oFzkC4I4fuHIaw6V6YyhmlHb/nGVeeqnawr3GjgAGw="; }; dontPatch = true; diff --git a/pkgs/os-specific/darwin/shortcat/default.nix b/pkgs/os-specific/darwin/shortcat/default.nix index 59009fede2b2e..e67e230a46b94 100644 --- a/pkgs/os-specific/darwin/shortcat/default.nix +++ b/pkgs/os-specific/darwin/shortcat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "shortcat"; - version = "0.11.0"; + version = "0.11.4"; src = fetchurl { url = "https://files.shortcat.app/releases/v${version}/Shortcat.zip"; - sha256 = "sha256-P8NQy9odWOD8wRHBTmaNH7OCXXvgQsMiI169KfsAABU="; + sha256 = "sha256-0uhAGU5y98oOLAlM7Uu4dWyK85RfNR5c8z3U7LHi8g8="; }; sourceRoot = "Shortcat.app"; diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix index 050a725b2cb8b..ae3736474a6ed 100644 --- a/pkgs/os-specific/darwin/utm/default.nix +++ b/pkgs/os-specific/darwin/utm/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-7hpWTe6TvnNodFt1rSRGougeZuEjvSeuVzBWFfYo53Y="; + hash = "sha256-GzwokK/q8S38lbOVhGgNaqbDAAryHJ9eBAAWGpuOQOE="; }; nativeBuildInputs = [ undmg makeWrapper ]; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 3ed088a660c22..1aa1a56936557 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -84,5 +84,8 @@ in lib.makeExtensible (self: { xcode_14_1 = requireXcode "14.1" "sha256-QJGAUVIhuDYyzDNttBPv5lIGOfvkYqdOFSUAr5tlkfs="; xcode_15 = requireXcode "15" "sha256-ffqISt2Ayccln5BArKIjSdzbEgoSoNwq8TPLGysAE0c="; xcode_15_1 = requireXcode "15.1" "sha256-0djqoSamU87rCpjo50Un3cFg9wKf+pSczRko6uumGM0="; + xcode_15_2 = requireXcode "15.2" "sha256-9B/4Tdyb3QGAzm579QGn5Iq/hA2hscD8OcoSJ5BFFXs="; + xcode_15_3 = requireXcode "15.3" "sha256-FyVA8EEPCI12Z4sJ4RQRZlMMpFmi7S8VYLcyvad3swM="; + xcode_15_4 = requireXcode "15.4" "sha256-yeo+sf6bBIJy9/1sQiMuPEMPniwGXMB6/FXXL0UrI5U="; xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) diff --git a/pkgs/os-specific/linux/adcli/default.nix b/pkgs/os-specific/linux/adcli/default.nix deleted file mode 100644 index 2f81c12977dc3..0000000000000 --- a/pkgs/os-specific/linux/adcli/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, openldap -, libkrb5 -, libxslt -, autoreconfHook -, pkg-config -, cyrus_sasl -, util-linux -, xmlto -, docbook_xsl -, docbook_xml_dtd_43 -}: - -stdenv.mkDerivation rec { - pname = "adcli"; - version = "0.9.2"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "realmd"; - repo = pname; - rev = version; - sha256 = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - docbook_xsl - util-linux - xmlto - ]; - - buildInputs = [ - openldap - libkrb5 - libxslt - cyrus_sasl - ]; - - configureFlags = [ "--disable-debug" ]; - - postPatch = '' - substituteInPlace tools/Makefile.am \ - --replace 'sbin_PROGRAMS' 'bin_PROGRAMS' - - substituteInPlace doc/Makefile.am \ - --replace 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \ - '${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl' - - function patch_docbook() { - substituteInPlace $1 \ - --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ - "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd" - } - patch_docbook doc/adcli.xml - patch_docbook doc/adcli-devel.xml - patch_docbook doc/adcli-docs.xml - ''; - - meta = with lib; { - homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html"; - description = "Helper library and tools for Active Directory client operations"; - mainProgram = "adcli"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ SohamG anthonyroussel ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index df64c0d1f56c7..33d950b76cd66 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix the build on macOS with macFUSE installed substituteInPlace configure.ac --replace \ 'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH' \ diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 22d69959e21ff..dd617562aa66d 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -6,7 +6,7 @@ }: let - tag = "0.3.10"; + tag = "0.3.11"; in stdenv.mkDerivation { pname = "apfs"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "linux-apfs"; repo = "linux-apfs-rw"; rev = "v${tag}"; - hash = "sha256-GFqBRZMoBBRRrWAhRKJrxawPS4z+xVkuHSlCoSrMEEI="; + hash = "sha256-Vt63JA9VNIuigSmDp8TuCpShebCsssrBFIsI7HUM5q0="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index f70ba4c7aad18..3fef396208f1d 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -152,7 +152,7 @@ let ]; propagatedBuildInputs = [ - libapparmor.python + (libapparmor.python or null) # Used by aa-notify python.pkgs.notify2 diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index 7e5f1e496522a..65b4516d3b2b2 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "checkpolicy"; - version = "3.6"; + version = "3.7"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/checkpolicy-${version}.tar.gz"; - sha256 = "sha256-GzRrPN1PinihV2J7rWSjs0ecZ7ahnRXm1chpRiDq28E="; + sha256 = "sha256-/T4ZJUd9SZRtERaThmGvRMH4bw1oFGb9nwLqoGACoH8="; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/os-specific/linux/cpupower-gui/default.nix b/pkgs/os-specific/linux/cpupower-gui/default.nix index be11dff2bd356..ca6ce58bad455 100644 --- a/pkgs/os-specific/linux/cpupower-gui/default.nix +++ b/pkgs/os-specific/linux/cpupower-gui/default.nix @@ -42,6 +42,11 @@ buildPythonApplication rec { url = "https://github.com/vagnum08/cpupower-gui/commit/97f8ac02fe33e412b59d3f3968c16a217753e74b.patch"; sha256 = "XYnpm03kq8JLMjAT73BMCJWlzz40IAuHESm715VV6G0="; }) + # Fixes https://github.com/vagnum08/cpupower-gui/issues/86 + (fetchpatch { + url = "https://github.com/vagnum08/cpupower-gui/commit/22ea668aa4ecf848149ea4c150aa840a25dc6ff8.patch"; + sha256 = "sha256-Mri7Af1Y79lt2pvZl4DQSvrqSLIJLIjzyXwMPFEbGVI="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/dcgm/default.nix b/pkgs/os-specific/linux/dcgm/default.nix index 5e03e19bf26d2..7573cb37ec226 100644 --- a/pkgs/os-specific/linux/dcgm/default.nix +++ b/pkgs/os-specific/linux/dcgm/default.nix @@ -16,18 +16,10 @@ , symlinkJoin , tclap_1_4 , yaml-cpp + +, static ? gcc11Stdenv.hostPlatform.isStatic }: let - # Flags copied from DCGM's libevent build script - libevent-nossl = libevent.override { sslSupport = false; }; - libevent-nossl-static = libevent-nossl.overrideAttrs (super: { - CFLAGS = "-Wno-cast-function-type -Wno-implicit-fallthrough -fPIC"; - CXXFLAGS = "-Wno-cast-function-type -Wno-implicit-fallthrough -fPIC"; - configureFlags = super.configureFlags ++ [ "--disable-shared" "--with-pic" ]; - }); - - jsoncpp-static = jsoncpp.override { enableStatic = true; }; - # DCGM depends on 3 different versions of CUDA at the same time. # The runtime closure, thankfully, is quite small because most things # are statically linked. @@ -86,13 +78,13 @@ let # C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/build.sh#L22 in gcc11Stdenv.mkDerivation rec { pname = "dcgm"; - version = "3.2.5"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version. + version = "3.3.5"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version. src = fetchFromGitHub { owner = "NVIDIA"; repo = "DCGM"; rev = "refs/tags/v${version}"; - hash = "sha256-iMyYOr3dSpdRV2S/TlB/tEOAWYhK09373ZRbd5vzogQ="; + hash = "sha256-n/uWvgvxAGfr1X51XgtHfFGDOO5AMBSV5UWQQpsylpg="; }; # Add our paths to the CUDA paths so FindCuda.cmake can find them. @@ -117,14 +109,18 @@ in gcc11Stdenv.mkDerivation rec { ]; buildInputs = [ - plog.dev # header-only - tclap_1_4 # header-only - + # Header-only catch2 - fmt_9 - jsoncpp-static - libevent-nossl-static - yaml-cpp + plog.dev + tclap_1_4 + + # Dependencies that can be either static or dynamic. + (fmt_9.override { enableShared = !static; }) # DCGM's build uses the static outputs regardless of enableShared + (yaml-cpp.override { inherit static; stdenv = gcc11Stdenv; }) + + # TODO: Dependencies that DCGM's CMake hard-codes to be static-only. + (jsoncpp.override { enableStatic = true; }) + (libevent.override { sslSupport = false; static = true; }) ]; disallowedReferences = lib.concatMap (x: x.pkgSet) cudaPackageSetByVersion; diff --git a/pkgs/os-specific/linux/device-tree/apply_overlays.py b/pkgs/os-specific/linux/device-tree/apply_overlays.py new file mode 100644 index 0000000000000..307c00fa7863d --- /dev/null +++ b/pkgs/os-specific/linux/device-tree/apply_overlays.py @@ -0,0 +1,102 @@ +from argparse import ArgumentParser +from dataclasses import dataclass +from functools import cached_property +import json +from pathlib import Path + +from libfdt import Fdt, FdtException, FDT_ERR_NOSPACE, fdt_overlay_apply + + +@dataclass +class Overlay: + name: str + filter: str + dtbo_file: Path + + @cached_property + def fdt(self): + with self.dtbo_file.open("rb") as fd: + return Fdt(fd.read()) + + @cached_property + def compatible(self): + return get_compatible(self.fdt) + + +def get_compatible(fdt): + root_offset = fdt.path_offset("/") + return set(fdt.getprop(root_offset, "compatible").as_stringlist()) + + +def apply_overlay(dt: Fdt, dto: Fdt) -> Fdt: + while True: + # we need to copy the buffers because they can be left in an inconsistent state + # if the operation fails (ref: fdtoverlay source) + result = dt.as_bytearray().copy() + err = fdt_overlay_apply(result, dto.as_bytearray().copy()) + + if err == 0: + new_dt = Fdt(result) + # trim the extra space from the final tree + new_dt.pack() + return new_dt + + if err == -FDT_ERR_NOSPACE: + # not enough space, add some blank space and try again + # magic number of more space taken from fdtoverlay + dt.resize(dt.totalsize() + 65536) + continue + + raise FdtException(err) + +def main(): + parser = ArgumentParser(description='Apply a list of overlays to a directory of device trees') + parser.add_argument("--source", type=Path, help="Source directory") + parser.add_argument("--destination", type=Path, help="Destination directory") + parser.add_argument("--overlays", type=Path, help="JSON file with overlay descriptions") + args = parser.parse_args() + + source: Path = args.source + destination: Path = args.destination + overlays: Path = args.overlays + + with overlays.open() as fd: + overlays_data = [ + Overlay( + name=item["name"], + filter=item["filter"], + dtbo_file=Path(item["dtboFile"]), + ) + for item in json.load(fd) + ] + + for source_dt in source.glob("**/*.dtb"): + rel_path = source_dt.relative_to(source) + + print(f"Processing source device tree {rel_path}...") + with source_dt.open("rb") as fd: + dt = Fdt(fd.read()) + + dt_compatible = get_compatible(dt) + + for overlay in overlays_data: + if overlay.filter and overlay.filter not in str(rel_path): + print(f" Skipping overlay {overlay.name}: filter does not match") + continue + + if not overlay.compatible.intersection(dt_compatible): + print(f" Skipping overlay {overlay.name}: {overlay.compatible} is incompatible with {dt_compatible}") + continue + + print(f" Applying overlay {overlay.name}") + dt = apply_overlay(dt, overlay.fdt) + + print(f"Saving final device tree {rel_path}...") + dest_path = destination / rel_path + dest_path.parent.mkdir(parents=True, exist_ok=True) + with dest_path.open("wb") as fd: + fd.write(dt.as_bytearray()) + + +if __name__ == '__main__': + main() diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/os-specific/linux/device-tree/default.nix index 87c9b84e12404..b8c71cc5a8ae3 100644 --- a/pkgs/os-specific/linux/device-tree/default.nix +++ b/pkgs/os-specific/linux/device-tree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, stdenvNoCC, dtc }: +{ lib, stdenv, stdenvNoCC, dtc, writers, python3 }: { # Compile single Device Tree overlay source @@ -26,41 +26,11 @@ applyOverlays = (base: overlays': stdenvNoCC.mkDerivation { name = "device-tree-overlays"; - nativeBuildInputs = [ dtc ]; - buildCommand = let - overlays = lib.toList overlays'; - in '' - mkdir -p $out - cd "${base}" - find -L . -type f -name '*.dtb' -print0 \ - | xargs -0 cp -v --no-preserve=mode --target-directory "$out" --parents - - for dtb in $(find "$out" -type f -name '*.dtb'); do - dtbCompat=$(fdtget -t s "$dtb" / compatible 2>/dev/null || true) - # skip files without `compatible` string - test -z "$dtbCompat" && continue - - ${lib.flip (lib.concatMapStringsSep "\n") overlays (o: '' - overlayCompat="$(fdtget -t s "${o.dtboFile}" / compatible)" - - # skip incompatible and non-matching overlays - if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then - echo "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")" - elif ${if (o.filter == null) then "false" else '' - [[ "''${dtb//${o.filter}/}" == "$dtb" ]] - ''} - then - echo "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")" - else - echo -n "Applying overlay ${o.name} to $(basename "$dtb")... " - mv "$dtb"{,.in} - fdtoverlay -o "$dtb" -i "$dtb.in" "${o.dtboFile}" - echo "ok" - rm "$dtb.in" - fi - '')} - - done + nativeBuildInputs = [ + (python3.pythonOnBuildForHost.withPackages(ps: [ps.libfdt])) + ]; + buildCommand = '' + python ${./apply_overlays.py} --source ${base} --destination $out --overlays ${writers.writeJSON "overlays.json" overlays'} ''; }); } diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 3fd703c7ce1e8..f49a723e2b0a1 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -6,8 +6,8 @@ , withExamples ? [] , shared ? false , machine ? ( - if stdenv.isx86_64 then "nehalem" - else if stdenv.isAarch64 then "generic" + if stdenv.hostPlatform.isx86_64 then "nehalem" + else if stdenv.hostPlatform.isAarch64 then "generic" else null ) }: diff --git a/pkgs/os-specific/linux/fan2go/default.nix b/pkgs/os-specific/linux/fan2go/default.nix index edd44842eed9a..296bfea580696 100644 --- a/pkgs/os-specific/linux/fan2go/default.nix +++ b/pkgs/os-specific/linux/fan2go/default.nix @@ -1,21 +1,26 @@ -{ buildGoModule, fetchFromGitHub, lib, lm_sensors }: +{ buildGo123Module, fetchFromGitHub, lib, lm_sensors }: -buildGoModule rec { +buildGo123Module rec { pname = "fan2go"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "markusressel"; repo = pname; rev = version; - hash = "sha256-w2Qwu3ZmBkoA86xa7V6pnIBAbfG9mtkAHePkQjefRW8="; + hash = "sha256-eSHeHBzDvzsDAck0zexwR8drasisvlQNTeowv92E2uc="; }; - vendorHash = "sha256-6OEdl7ie0dTjXrG//Fvcg4ZyTW/mhrUievDljY2zi/4="; + vendorHash = "sha256-ad0e/cxbcU/KfPDOdD46KdCcvns83dgGDAyLLQiGyiA="; postConfigure = '' substituteInPlace vendor/github.com/md14454/gosensors/gosensors.go \ - --replace '"/etc/sensors3.conf"' '"${lm_sensors}/etc/sensors3.conf"' + --replace-fail '"/etc/sensors3.conf"' '"${lm_sensors}/etc/sensors3.conf"' + + # Uses /usr/bin/echo, and even if we patch that, it refuses to execute any + # binary without being able to confirm that it's owned by root, which isn't + # possible under the sandbox. + rm internal/fans/cmd_test.go ''; CGO_CFLAGS = "-I ${lm_sensors}/include"; diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index 0e8a42c2f2c54..ce75a4e304950 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20240811"; + version = "20240909"; src = fetchzip { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"; - hash = "sha256-sfQIXXBU5oIDmTpWExDc0drO8QH9lBL8opPO3mSk98E="; + hash = "sha256-3nwo4lGTV5PlsxZXa5D/7upaB+5XfXFZHbgEO5jnRrw="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 3f1a0ed04bb17..0393174d889d6 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation { "OBJCOPY7=${stdenv.cc.targetPrefix}objcopy" "OBJDUMP7=${stdenv.cc.targetPrefix}objdump" ] - ++ optionals (stdenv.isAarch64) [ "armstub8.bin" "armstub8-gic.bin" ] - ++ optionals (stdenv.isAarch32) [ "armstub7.bin" "armstub8-32.bin" "armstub8-32-gic.bin" ] + ++ optionals (stdenv.hostPlatform.isAarch64) [ "armstub8.bin" "armstub8-gic.bin" ] + ++ optionals (stdenv.hostPlatform.isAarch32) [ "armstub7.bin" "armstub8-32.bin" "armstub8-32-gic.bin" ] ; installPhase = '' diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index ece39dade72b0..ab60a10447ef6 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -3,13 +3,13 @@ stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20240529"; + version = "1.20240926"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - hash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA="; + hash = "sha256-MCutxzdSFoZ4hn2Fxk2AHHgWCt/Jgc+reqJZHUuSKOc="; }; installPhase = '' @@ -28,6 +28,6 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ dezgeg ]; # Hash mismatch on source, mystery. # Maybe due to https://github.com/NixOS/nix/issues/847 - broken = stdenvNoCC.isDarwin; + broken = stdenvNoCC.hostPlatform.isDarwin; }; } diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index e4aa0b353acae..b1ad7ce0410c4 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "sof-firmware"; - version = "2024.03"; + version = "2024.09"; src = fetchurl { url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-${version}.tar.gz"; - sha256 = "sha256-T9ky97vBUXsG+nkR5tVmgU1dxP7FYIvbROfE/kkp+/Y="; + sha256 = "sha256-6kfZn4E1kAjQdhi8oQPPePgthOlAv+lBoor+B8jLxiA="; }; dontFixup = true; # binaries must not be stripped or patchelfed diff --git a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix index c31ce1b84b6b1..d0ca1a3bb1d9c 100644 --- a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix +++ b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix @@ -1,19 +1,19 @@ { lib , stdenv -, linuxPackages , kernel , fetchFromGitHub +, unstableGitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "framework-laptop-kmod"; - version = "0-unstable-2024-01-02"; + version = "0-unstable-2024-09-15"; src = fetchFromGitHub { owner = "DHowett"; repo = "framework-laptop-kmod"; - rev = "a9e8db9ba2959b75c1fb820ffac8fa189f0f63c3"; - hash = "sha256-Ai/OxvkaKPltri8R0oyfmxQLUVfaj6Q8vebrhmWYhUU="; + rev = "6164bc3dec24b6bb2806eedd269df6a170bcc930"; + hash = "sha256-OwtXQR0H4GNlYjVZ5UU5MEM6ZOjlV3B0x2auYawbS2U="; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -28,11 +28,15 @@ stdenv.mkDerivation rec { runHook postInstall ''; + + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Kernel module that exposes the Framework Laptop (13, 16)'s battery charge limit and LEDs to userspace"; homepage = "https://github.com/DHowett/framework-laptop-kmod"; license = licenses.gpl2Only; maintainers = with maintainers; [ gaykitty ]; platforms = platforms.linux; + broken = lib.versionOlder kernel.version "6.1"; }; } diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix deleted file mode 100644 index 4b38913b7122b..0000000000000 --- a/pkgs/os-specific/linux/fscryptctl/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "fscryptctl"; - version = "1.0.0"; - - goPackagePath = "github.com/google/fscrypt"; - - src = fetchFromGitHub { - owner = "google"; - repo = "fscryptctl"; - rev = "v${version}"; - sha256 = "1hwj726mm0yhlcf6523n07h0yq1rvkv4km64h3ydpjcrcxklhw6l"; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - description = "Small C tool for Linux filesystem encryption"; - mainProgram = "fscryptctl"; - longDescription = '' - fscryptctl is a low-level tool written in C that handles raw keys and - manages policies for Linux filesystem encryption, specifically the - "fscrypt" kernel interface which is supported by the ext4, f2fs, and - UBIFS filesystems. - fscryptctl is mainly intended for embedded systems which can't use the - full-featured fscrypt tool, or for testing or experimenting with the - kernel interface to Linux filesystem encryption. fscryptctl does not - handle key generation, key stretching, key wrapping, or PAM integration. - Most users should use the fscrypt tool instead, which supports these - features and generally is much easier to use. - As fscryptctl is intended for advanced users, you should read the kernel - documentation for filesystem encryption before using fscryptctl. - ''; - inherit (src.meta) homepage; - changelog = "https://github.com/google/fscryptctl/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index f4b8bfc5661a5..cadf176b7c6e6 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { patches = lib.optional - (!isFuse3 && (stdenv.isAarch64 || stdenv.hostPlatform.isLoongArch64)) + (!isFuse3 && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isLoongArch64)) (fetchpatch { url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 2d438a8a88c68..8d7cf3313ff69 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "24.03.00"; + version = "24.07.00"; src = fetchzip { url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "sha256-UKL5q5sURSVXvEOzoZdG+wWBSS5f9YWo5stViY3F2vg="; + sha256 = "sha256-h+KDXa5wQsT0HMgd0WDfsZM4Tg3Un+CWKa0slZ5cVbA="; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index e41f5c8e3c524..52a71d57199e8 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -13,7 +13,7 @@ , gsl , libpng , sfml -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio ? null , useQt ? false , qtbase ? null diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 3531a0da94faa..8eed47235f068 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.26.30049.6"; + version = "24.35.30872.22"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - hash = "sha256-VZGHVATA6B/+WB541tsnY3lVi526p7+Rd7cSGpNICLU="; + hash = "sha256-OI1pyH6g4U6FI2zE63oU9y8e39VgZUO0tSIOsOOon88="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index b1451421d69b9..3b83b16cb09e9 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://software.intel.com/en-us/articles/opencl-drivers"; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = [ lib.maintainers.kierdavis ]; + maintainers = [ ]; }; } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c0bc223b9a05e..ee3862052135a 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -29,19 +29,23 @@ let (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) || (stdenv.hostPlatform.isMips && stdenv.hostPlatform.is64bit)); + forceRust = features.rust or false; + kernelSupportsRust = lib.versionAtLeast version "6.7"; + + # Currently not enabling Rust by default, as upstream requires rustc 1.81 + defaultRust = false; + withRust = (forceRust || defaultRust) && kernelSupportsRust; + options = { debug = { # Necessary for BTF - DEBUG_INFO = lib.mkMerge [ - (whenOlder "5.2" (if (features.debug or false) then yes else no)) - (whenBetween "5.2" "5.18" yes) - ]; + DEBUG_INFO = whenOlder "5.18" yes; DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes; # Reduced debug info conflict with BTF and have been enabled in # aarch64 defconfig since 5.13 DEBUG_INFO_REDUCED = whenAtLeast "5.13" (option no); - DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes); + DEBUG_INFO_BTF = option yes; # Allow loading modules with mismatched BTFs # FIXME: figure out how to actually make BTFs reproducible instead # See https://github.com/NixOS/nixpkgs/pull/181456 for details. @@ -86,7 +90,7 @@ let # ACPI Firmware Performance Data Table Support ACPI_FPDT = whenAtLeast "5.12" (option yes); # ACPI Heterogeneous Memory Attribute Table Support - ACPI_HMAT = whenAtLeast "5.2" (option yes); + ACPI_HMAT = option yes; # ACPI Platform Error Interface ACPI_APEI = (option yes); # APEI Generic Hardware Error Source @@ -128,7 +132,7 @@ let PWM = yes; } // lib.optionalAttrs (stdenv.hostPlatform.isx86) { INTEL_IDLE = yes; - INTEL_RAPL = whenAtLeast "5.3" module; + INTEL_RAPL = module; X86_INTEL_LPSS = yes; X86_INTEL_PSTATE = yes; X86_AMD_PSTATE = whenAtLeast "5.17" yes; @@ -137,6 +141,7 @@ let # Required to bring up some Bay Trail devices properly I2C = yes; + I2C_DESIGNWARE_CORE = yes; I2C_DESIGNWARE_PLATFORM = yes; PMIC_OPREGION = whenAtLeast "5.10" yes; INTEL_SOC_PMIC = whenAtLeast "5.10" yes; @@ -185,7 +190,7 @@ let # Collect ECC errors and retire pages that fail too often RAS_CEC = yes; - } // lib.optionalAttrs (stdenv.is32bit) { + } // lib.optionalAttrs (stdenv.hostPlatform.is32bit) { # Enable access to the full memory range (aka PAE) on 32-bit architectures # This check isn't super accurate but it's close enough HIGHMEM = option yes; @@ -202,22 +207,22 @@ let IOSCHED_CFQ = whenOlder "5.0" yes; # Removed in 5.0-RC1 BLK_CGROUP = yes; # required by CFQ" BLK_CGROUP_IOLATENCY = yes; - BLK_CGROUP_IOCOST = whenAtLeast "5.4" yes; + BLK_CGROUP_IOCOST = yes; IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1 MQ_IOSCHED_DEADLINE = yes; BFQ_GROUP_IOSCHED = yes; MQ_IOSCHED_KYBER = yes; IOSCHED_BFQ = module; # Enable CPU utilization clamping for RT tasks - UCLAMP_TASK = whenAtLeast "5.3" yes; - UCLAMP_TASK_GROUP = whenAtLeast "5.4" yes; + UCLAMP_TASK = yes; + UCLAMP_TASK_GROUP = yes; }; timer = { # Enable Full Dynticks System. # NO_HZ_FULL depends on HAVE_VIRT_CPU_ACCOUNTING_GEN depends on 64BIT - NO_HZ_FULL = lib.mkIf stdenv.is64bit yes; + NO_HZ_FULL = lib.mkIf stdenv.hostPlatform.is64bit yes; }; # Enable NUMA. @@ -244,7 +249,7 @@ let HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes; BPF_STREAM_PARSER = yes; XDP_SOCKETS = yes; - XDP_SOCKETS_DIAG = whenAtLeast "5.1" yes; + XDP_SOCKETS_DIAG = yes; WAN = yes; TCP_CONG_ADVANCED = yes; TCP_CONG_CUBIC = yes; # This is the default congestion control algorithm since 2.6.19 @@ -306,8 +311,7 @@ let # IPv6: Netfilter Configuration NF_TABLES_IPV6 = yes; # Bridge Netfilter Configuration - NF_TABLES_BRIDGE = lib.mkMerge [ (whenOlder "5.3" yes) - (whenAtLeast "5.3" module) ]; + NF_TABLES_BRIDGE = module; # Expose some debug info NF_CONNTRACK_PROCFS = yes; NF_FLOW_TABLE_PROCFS = whenAtLeast "6.0" yes; @@ -377,9 +381,9 @@ let ATH10K_DFS_CERTIFIED = option yes; B43_PHY_HT = option yes; BCMA_HOST_PCI = option yes; - RTW88 = whenAtLeast "5.2" module; - RTW88_8822BE = lib.mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; - RTW88_8822CE = lib.mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; + RTW88 = module; + RTW88_8822BE = lib.mkMerge [ (whenOlder "5.8" yes) (whenAtLeast "5.8" module) ]; + RTW88_8822CE = lib.mkMerge [ (whenOlder "5.8" yes) (whenAtLeast "5.8" module) ]; }; fb = { @@ -415,7 +419,7 @@ let }; video = let - whenHasDevicePrivate = lib.mkIf (!stdenv.isx86_32 && lib.versionAtLeast version "5.1"); + whenHasDevicePrivate = lib.mkIf (!stdenv.hostPlatform.isx86_32); in { # compile in DRM so simpledrm can load before initrd if necessary AGP = yes; @@ -423,7 +427,7 @@ let DRM_LEGACY = whenOlder "6.8" no; - NOUVEAU_LEGACY_CTX_SUPPORT = whenBetween "5.2" "6.3" no; + NOUVEAU_LEGACY_CTX_SUPPORT = whenOlder "6.3" no; # Enable simpledrm and use it for generic framebuffer # Technically added in 5.14, but adding more complex configuration is not worth it @@ -446,8 +450,8 @@ let DRM_DISPLAY_DP_AUX_CHARDEV = whenAtLeast "6.10" yes; # amdgpu display core (DC) support DRM_AMD_DC_DCN1_0 = whenOlder "5.6" yes; - DRM_AMD_DC_DCN2_0 = whenBetween "5.3" "5.6" yes; - DRM_AMD_DC_DCN2_1 = whenBetween "5.4" "5.6" yes; + DRM_AMD_DC_DCN2_0 = whenOlder "5.6" yes; + DRM_AMD_DC_DCN2_1 = whenOlder "5.6" yes; DRM_AMD_DC_DCN3_0 = whenBetween "5.9" "5.11" yes; DRM_AMD_DC_DCN = whenBetween "5.11" "6.4" yes; DRM_AMD_DC_FP = whenAtLeast "6.4" yes; @@ -460,6 +464,9 @@ let # Enable AMD secure display when available DRM_AMD_SECURE_DISPLAY = whenAtLeast "5.13" yes; + # Enable AMD image signal processor + DRM_AMD_ISP = whenAtLeast "6.11" yes; + # Enable new firmware (and by extension NVK) for compatible hardware on Nouveau DRM_NOUVEAU_GSP_DEFAULT = whenAtLeast "6.8" yes; @@ -485,14 +492,16 @@ let DRM_VC4_HDMI_CEC = yes; }; - # Enables Rust support in the Linux kernel. This is currently not enabled by default, because it occasionally requires - # patching the Linux kernel for the specific Rust toolchain in nixpkgs. These patches usually take a bit - # of time to appear and this would hold up Linux kernel and Rust toolchain updates. - # - # Once Rust in the kernel has more users, we can reconsider enabling it by default. - rust = lib.optionalAttrs ((features.rust or false) && lib.versionAtLeast version "6.7") { + # Enable Rust and features that depend on it + rust = lib.optionalAttrs withRust { RUST = yes; - GCC_PLUGINS = no; + + # These don't technically require Rust but we probably want to get some more testing + # on the whole DRM panic setup before shipping it by default. + DRM_PANIC = whenAtLeast "6.12" yes; + DRM_PANIC_SCREEN = whenAtLeast "6.12" (freeform "kmsg"); + + DRM_PANIC_SCREEN_QR_CODE = whenAtLeast "6.12" yes; }; sound = { @@ -553,7 +562,7 @@ let USB_EHCI_ROOT_HUB_TT = yes; # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED = yes; # Improved transaction translator scheduling - USB_HIDDEV = yes; # USB Raw HID Devices (like monitor controls and Uninterruptable Power Supplies) + USB_HIDDEV = yes; # USB Raw HID Devices (like monitor controls and Uninterruptable Power Supplies) # default to dual role mode USB_DWC2_DUAL_ROLE = yes; @@ -575,7 +584,7 @@ let TMPFS = yes; TMPFS_POSIX_ACL = yes; - FS_ENCRYPTION = if (lib.versionAtLeast version "5.1") then yes else option module; + FS_ENCRYPTION = yes; EXT2_FS_XATTR = yes; EXT2_FS_POSIX_ACL = yes; @@ -586,7 +595,6 @@ let EXT4_FS_POSIX_ACL = yes; EXT4_FS_SECURITY = yes; - EXT4_ENCRYPTION = whenOlder "5.1" yes; NTFS_FS = whenBetween "5.15" "6.9" no; NTFS3_LZX_XPRESS = whenAtLeast "5.15" yes; @@ -615,7 +623,6 @@ let F2FS_FS = module; F2FS_FS_SECURITY = option yes; - F2FS_FS_ENCRYPTION = whenOlder "5.1" yes; F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; @@ -631,13 +638,13 @@ let NFS_V4_1 = yes; # NFSv4.1 client support NFS_V4_2 = yes; NFS_V4_SECURITY_LABEL = yes; + NFS_LOCALIO = whenAtLeast "6.12" yes; CIFS_XATTR = yes; CIFS_POSIX = option yes; CIFS_FSCACHE = yes; CIFS_WEAK_PW_HASH = whenOlder "5.15" yes; CIFS_UPCALL = yes; - CIFS_ACL = whenOlder "5.3" yes; CIFS_DFS_UPCALL = yes; CEPH_FSCACHE = yes; @@ -665,7 +672,7 @@ let DEVTMPFS = yes; - UNICODE = whenAtLeast "5.2" yes; # Casefolding support for filesystems + UNICODE = yes; # Casefolding support for filesystems }; security = { @@ -684,7 +691,6 @@ let STRICT_MODULE_RWX = yes; STRICT_DEVMEM = lib.mkDefault yes; # Filter access to /dev/mem IO_STRICT_DEVMEM = lib.mkDefault yes; - SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default # Prevent processes from ptracing non-children processes SECURITY_YAMA = option yes; @@ -702,17 +708,17 @@ let SECURITY_DMESG_RESTRICT = yes; RANDOM_TRUST_CPU = whenOlder "6.2" yes; # allow RDRAND to seed the RNG - RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" (whenAtLeast "5.4" yes); # allow the bootloader to seed the RNG + RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" yes; # allow the bootloader to seed the RNG MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules # and enforce signatures which we don't do by default. - SECURITY_LOCKDOWN_LSM = whenAtLeast "5.4" no; + SECURITY_LOCKDOWN_LSM = no; # provides a register of persistent per-UID keyrings, useful for encrypting storage pools in stratis PERSISTENT_KEYRINGS = yes; # enable temporary caching of the last request_key() result - KEYS_REQUEST_CACHE = whenAtLeast "5.3" yes; + KEYS_REQUEST_CACHE = yes; # randomized slab caches RANDOM_KMALLOC_CACHES = whenAtLeast "6.6" yes; @@ -729,13 +735,17 @@ let # Enable support for page poisoning. Still needs to be enabled on the command line to actually work. PAGE_POISONING = yes; # Randomize page allocator when page_alloc.shuffle=1 - SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; + SHUFFLE_PAGE_ALLOCATOR = yes; - INIT_ON_ALLOC_DEFAULT_ON = whenAtLeast "5.3" yes; + INIT_ON_ALLOC_DEFAULT_ON = yes; # Enable stack smashing protections in schedule() # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.8&id=0d9e26329b0c9263d4d9e0422d80a0e73268c52f SCHED_STACK_END_CHECK = yes; + + # Enable separate slab buckets for user controlled allocations + # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=67f2df3b82d091ed095d0e47e1f3a9d3e18e4e41 + SLAB_BUCKETS = whenAtLeast "6.11" yes; } // lib.optionalAttrs stdenv.hostPlatform.isx86_64 { # Enable Intel SGX X86_SGX = whenAtLeast "5.11" yes; @@ -837,11 +847,11 @@ let KSM = yes; VIRT_DRIVERS = yes; # We need 64 GB (PAE) support for Xen guest support - HIGHMEM64G = { optional = true; tristate = lib.mkIf (!stdenv.is64bit) "y";}; + HIGHMEM64G = { optional = true; tristate = lib.mkIf (!stdenv.hostPlatform.is64bit) "y";}; - VFIO_PCI_VGA = lib.mkIf stdenv.is64bit yes; + VFIO_PCI_VGA = lib.mkIf stdenv.hostPlatform.is64bit yes; - UDMABUF = whenAtLeast "4.20" yes; + UDMABUF = yes; # VirtualBox guest drivers in the kernel conflict with the ones in the # official additions package and prevent the vboxsf module from loading, @@ -865,7 +875,6 @@ let XEN_PVH = option yes; XEN_PVHVM = option yes; XEN_SAVE_RESTORE = option yes; - XEN_SELFBALLOONING = whenOlder "5.3" yes; # Enable device detection on virtio-mmio hypervisors VIRTIO_MMIO_CMDLINE_DEVICES = yes; @@ -897,6 +906,12 @@ let ZRAM = module; ZRAM_WRITEBACK = option yes; ZRAM_MULTI_COMP = whenAtLeast "6.2" yes; + ZRAM_BACKEND_842 = whenAtLeast "6.12" yes; + ZRAM_BACKEND_DEFLATE = whenAtLeast "6.12" yes; + ZRAM_BACKEND_LZ4 = whenAtLeast "6.12" yes; + ZRAM_BACKEND_LZ4HC = whenAtLeast "6.12" yes; + ZRAM_BACKEND_LZO = whenAtLeast "6.12" yes; + ZRAM_BACKEND_ZSTD = whenAtLeast "6.12" yes; ZRAM_DEF_COMP_ZSTD = whenAtLeast "5.11" yes; ZSWAP = option yes; ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (lib.mkOptionDefault yes); @@ -942,7 +957,7 @@ let # Allows soft-dirty tracking on pages, used by CRIU. # See https://docs.kernel.org/admin-guide/mm/soft-dirty.html - MEM_SOFT_DIRTY = lib.mkIf (!stdenv.isx86_32) yes; + MEM_SOFT_DIRTY = lib.mkIf (!stdenv.hostPlatform.isx86_32) yes; }; misc = let @@ -975,7 +990,11 @@ let THRUSTMASTER_FF = yes; ZEROPLUS_FF = yes; - MODULE_COMPRESS = whenOlder "5.13" yes; + MODULE_COMPRESS = lib.mkMerge [ + (whenOlder "5.13" yes) + (whenAtLeast "6.12" yes) + ]; + MODULE_COMPRESS_ALL = whenAtLeast "6.12" yes; MODULE_COMPRESS_XZ = yes; SYSVIPC = yes; # System-V IPC @@ -1027,7 +1046,7 @@ let SERIAL_DEV_BUS = yes; # enables support for serial devices SERIAL_DEV_CTRL_TTYPORT = yes; # enables support for TTY serial devices - BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support + BT_HCIBTUSB_MTK = yes; # MediaTek protocol support BT_HCIUART = module; # required for BT devices with serial port interface (QCA6390) BT_HCIUART_BCM = option yes; # Broadcom Bluetooth support @@ -1067,12 +1086,10 @@ let IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14 IDLE_PAGE_TRACKING = yes; - JOYSTICK_IFORCE_232 = { optional = true; tristate = whenOlder "5.3" "y"; }; # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB = { optional = true; tristate = whenOlder "5.3" "y"; }; # I-Force USB joysticks and wheels JOYSTICK_XPAD_FF = option yes; # X-Box gamepad rumble support JOYSTICK_XPAD_LEDS = option yes; # LED Support for Xbox360 controller 'BigX' LED - KEYBOARD_APPLESPI = whenAtLeast "5.3" module; + KEYBOARD_APPLESPI = module; KEXEC_FILE = option yes; KEXEC_JUMP = option yes; @@ -1102,9 +1119,9 @@ let NVME_TARGET_AUTH = whenAtLeast "6.0" yes; NVME_TARGET_TCP_TLS = whenAtLeast "6.7" yes; - PCI_P2PDMA = lib.mkIf (stdenv.hostPlatform.is64bit && lib.versionAtLeast version "4.20") yes; + PCI_P2PDMA = lib.mkIf (stdenv.hostPlatform.is64bit) yes; - PSI = whenAtLeast "4.20" yes; + PSI = yes; MOUSE_ELAN_I2C_SMBUS = yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension @@ -1161,17 +1178,17 @@ let # Disable the firmware helper fallback, udev doesn't implement it any more FW_LOADER_USER_HELPER_FALLBACK = option no; - FW_LOADER_COMPRESS = whenAtLeast "5.3" yes; + FW_LOADER_COMPRESS = yes; FW_LOADER_COMPRESS_ZSTD = whenAtLeast "5.19" yes; HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support # Enable AMD's ROCm GPU compute stack - HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "4.20" yes); - ZONE_DEVICE = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "5.3" yes); - HMM_MIRROR = whenAtLeast "5.3" yes; - DRM_AMDGPU_USERPTR = whenAtLeast "5.3" yes; + HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit (yes); + ZONE_DEVICE = lib.mkIf stdenv.hostPlatform.is64bit (yes); + HMM_MIRROR = yes; + DRM_AMDGPU_USERPTR = yes; PREEMPT = no; PREEMPT_VOLUNTARY = yes; @@ -1183,6 +1200,7 @@ let LIRC = yes; SCHED_CORE = whenAtLeast "5.14" yes; + SCHED_CLASS_EXT = whenAtLeast "6.12" yes; LRU_GEN = whenAtLeast "6.1" yes; LRU_GEN_ENABLED = whenAtLeast "6.1" yes; @@ -1232,13 +1250,13 @@ let NR_CPUS = freeform "384"; # Enable LEDS to display link-state status of PHY devices (i.e. eth lan/wan interfaces) - LED_TRIGGER_PHY = whenAtLeast "4.10" yes; + LED_TRIGGER_PHY = yes; } // lib.optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enables support for the Allwinner Display Engine 2.0 SUN8I_DE2_CCU = yes; # See comments on https://github.com/NixOS/nixpkgs/commit/9b67ea9106102d882f53d62890468071900b9647 - CRYPTO_AEGIS128_SIMD = whenAtLeast "5.4" no; + CRYPTO_AEGIS128_SIMD = no; # Distros should configure the default as a kernel option. # We previously defined it on the kernel command line as cma= @@ -1272,7 +1290,7 @@ let # differently when run under aarch64 kernels compared to when # it is run under an aarch32 kernel. COMPAT_ALIGNMENT_FIXUPS = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "6.1" yes); - } // lib.optionalAttrs (lib.versionAtLeast version "5.4" && (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux")) { + } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Required for various hardware features on Chrome OS devices CHROME_PLATFORMS = yes; CHROMEOS_TBMC = module; @@ -1287,10 +1305,10 @@ let CROS_KBD_LED_BACKLIGHT = module; TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes; - } // lib.optionalAttrs (lib.versionAtLeast version "5.4" && stdenv.hostPlatform.system == "x86_64-linux") { + } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { CHROMEOS_LAPTOP = module; CHROMEOS_PSTORE = module; - } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { + # Enable x86 resource control X86_CPU_RESCTRL = whenAtLeast "5.0" yes; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index a6067439a8f33..fdfc782352266 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -84,7 +84,7 @@ lib.makeOverridable ({ # The kernel source tarball. # cgit) that are needed here should be included directly in Nixpkgs as # files. -assert stdenv.isLinux; +assert stdenv.hostPlatform.isLinux; let # Dirty hack to make sure that `version` & `src` have @@ -230,7 +230,6 @@ kernel.overrideAttrs (finalAttrs: previousAttrs: { passthru = previousAttrs.passthru or { } // basicArgs // { features = kernelFeatures; inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre; - isVanilla = !(isHardened || isLibre || isZen); isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; # Adds dependencies needed to edit the config: diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 62f1fcdda20c6..bdb0520f6a4b5 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,82 +1,62 @@ { - "4.19": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-4.19.315-hardened1.patch", - "sha256": "1w17mwsv618pw5bkahmz6in0i5zjjxd3d14gggafqdd3dgfr1h8q", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.315-hardened1/linux-hardened-4.19.315-hardened1.patch" - }, - "sha256": "1j1j8awy0237jp2r211qpa305c10y7rlcbkxkzdvzbgyhwy4spkc", - "version": "4.19.315" - }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.218-hardened1.patch", - "sha256": "1ah4pznha17ngg3w7l0j74h4910gjv8qj503adrap7plvapf82m4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.218-hardened1/linux-hardened-5.10.218-hardened1.patch" + "name": "linux-hardened-v5.10.226-hardened1.patch", + "sha256": "1vxcr0f3ikkg10wcvq76djxzmhlc6h5fv34xf8vm48wfi7ryajbk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.226-hardened1/linux-hardened-v5.10.226-hardened1.patch" }, - "sha256": "1mmj5hwm5i16gc1y4nzr1cs882vi6vrihrincdcivv63x11v4dlw", - "version": "5.10.218" + "sha256": "19hwwl5sbya65mch7fwmji2cli9b8796zjqbmkybjrarg1j9m8gn", + "version": "5.10.226" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.160-hardened1.patch", - "sha256": "1r10ylx886rslsmrixlijjm4crhwzkl3wj6kpyn2344qik1gxpqr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.160-hardened1/linux-hardened-5.15.160-hardened1.patch" + "name": "linux-hardened-v5.15.167-hardened1.patch", + "sha256": "1mwww490bf5i1njzyprnamfn8n471r94klgn7wghwi2f5vsn6j9g", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.167-hardened1/linux-hardened-v5.15.167-hardened1.patch" }, - "sha256": "018v19a7rhzc4szybzzn86jlnk42x7jm6xkadfd2d3xq6f7727pl", - "version": "5.15.160" + "sha256": "0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi", + "version": "5.15.167" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.277-hardened1.patch", - "sha256": "1zjw5wl8lj69j402qm8dg3m4dxgq3ppx2jyz8jks976vyhh8fsg4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.277-hardened1/linux-hardened-5.4.277-hardened1.patch" + "name": "linux-hardened-v5.4.284-hardened1.patch", + "sha256": "1skqaq90bigrxg0w075nssqbdq868ii62r8asx0m6wcvd5cl50af", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.284-hardened1/linux-hardened-v5.4.284-hardened1.patch" }, - "sha256": "0l8zq3k07hdprfpvw69ykkf2pdg8wiv28xz733yxsjcfb0l5n7vy", - "version": "5.4.277" + "sha256": "0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp", + "version": "5.4.284" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.92-hardened1.patch", - "sha256": "0cw87ygmisi823y3f7xrck12b6zh3mq1qmb7lcmr3hg6w3xskmn3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.92-hardened1/linux-hardened-6.1.92-hardened1.patch" - }, - "sha256": "1j9n8gk76nn4gw42iba5zgghr360gb9n1mslr5dyv76wpwkz86ch", - "version": "6.1.92" - }, - "6.6": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-6.6.32-hardened1.patch", - "sha256": "19362a6lxs3cnaw19jvda7n791y95lfgn9ki4wmaxnw2qbpi0bgg", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.32-hardened1/linux-hardened-6.6.32-hardened1.patch" + "name": "linux-hardened-v6.1.112-hardened1.patch", + "sha256": "1kna12dhs1csg2cd9ixm261pgnc44v7q67njd0z1mnjrk9q1y7n6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.112-hardened1/linux-hardened-v6.1.112-hardened1.patch" }, - "sha256": "1qbc8dqmk2xs1cz968rysw5xvhq3lj8g0pxp48fr2qbzy3m29a5a", - "version": "6.6.32" + "sha256": "094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b", + "version": "6.1.112" }, - "6.8": { + "6.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.8.11-hardened1.patch", - "sha256": "08i03dmri9h6jxcjd9g6s7pv0spqi3f4fgch1ars68cgngikvbpq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.8.11-hardened1/linux-hardened-6.8.11-hardened1.patch" + "name": "linux-hardened-v6.10.12-hardened1.patch", + "sha256": "07z35f4nqj9vgj2ynq7spgckb770a0w0906m7l28i1x0kch2kr3j", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.10.12-hardened1/linux-hardened-v6.10.12-hardened1.patch" }, - "sha256": "1di8kr596sf68sm61kp5rz6bn3sb0q5ag1qc5hm8f9dpyq4wv3dp", - "version": "6.8.11" + "sha256": "1kvkwgnq5gsdqarrdg32qjrbq1dggxp1x2yy2zpsjsaq5y2mhj2j", + "version": "6.10.12" }, - "6.9": { + "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.9.2-hardened1.patch", - "sha256": "0ph1m0pnlqrhvddz2mjgcwvs0ddcpzigz8kgi9zi063qinlfbm3q", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.9.2-hardened1/linux-hardened-6.9.2-hardened1.patch" + "name": "linux-hardened-v6.6.53-hardened1.patch", + "sha256": "09i25qrn18psyrzr8srav4zcbyqmn2z8ycfk9fix2pdfxsaxl8h9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.53-hardened1/linux-hardened-v6.6.53-hardened1.patch" }, - "sha256": "1yg5j284y1gz7zwxjz2abvlnas259m1y1vzd9lmcqqar5kgmnv6l", - "version": "6.9.2" + "sha256": "0yfpyiz57wz9rkwif6n3k2n87waw46ad0h7h0pwhnar53cfihp98", + "version": "6.6.53" } } diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py index 8b46137afb37b..0603812124bea 100755 --- a/pkgs/os-specific/linux/kernel/hardened/update.py +++ b/pkgs/os-specific/linux/kernel/hardened/update.py @@ -145,7 +145,7 @@ def find_asset(filename: str) -> str: if not sig_ok: return None - kernel_ver = re.sub(r"(.*)(-hardened[\d]+)$", r'\1', release_info.release.tag_name) + kernel_ver = re.sub(r"v?(.*)(-hardened[\d]+)$", r'\1', release_info.release.tag_name) major = kernel_ver.split('.')[0] sha256_kernel, _ = nix_prefetch_url(f"mirror://kernel/linux/kernel/v{major}.x/linux-{kernel_ver}.tar.xz") @@ -157,8 +157,11 @@ def find_asset(filename: str) -> str: def parse_version(version_str: str) -> Version: + # There have been two variants v6.10[..] and 6.10[..], drop the v + version_str_without_v = version_str[1:] if not version_str[0].isdigit() else version_str version: Version = [] - for component in re.split(r'\.|\-', version_str): + + for component in re.split(r'\.|\-', version_str_without_v): try: version.append(int(component)) except ValueError: @@ -227,7 +230,7 @@ def commit_patches(*, kernel_key: str, message: str) -> None: # It's not reliable to exit earlier because not every kernel minor may # have hardened patches, hence the naive search below. i += 1 - if i > 500: + if i > 100: break version = parse_version(release.tag_name) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index f68ef004e4d17..bc537d9c7b302 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,42 +1,34 @@ { "testing": { - "version": "6.11-rc5", - "hash": "sha256:06qq6y7cryq0xy4b68ky2hr44cw2nqhbna0dbzfbmr9d5sh9c0gn" + "version": "6.12-rc1", + "hash": "sha256:16zwvjcvgndvr0izx0qs2k7v85nvxwlx6j7y2yrdl3shalsdlmx2" }, "6.1": { - "version": "6.1.107", - "hash": "sha256:1s5h51r41l0d3k1h9i4mya7nz53jd6i200s06w5gl49hsz8jjcpl" + "version": "6.1.112", + "hash": "sha256:094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b" }, "5.15": { - "version": "5.15.165", - "hash": "sha256:1zn627gid0dik3r5k61r9ff4sz7md1jnbwiixpyllqzb5kld6vd3" + "version": "5.15.167", + "hash": "sha256:0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi" }, "5.10": { - "version": "5.10.224", - "hash": "sha256:06nivms93yjbddv3gl88m7bdrr0676nm3p12iqvsdfr4fg39kc0r" + "version": "5.10.226", + "hash": "sha256:19hwwl5sbya65mch7fwmji2cli9b8796zjqbmkybjrarg1j9m8gn" }, "5.4": { - "version": "5.4.282", - "hash": "sha256:1q3xvl4c5dlql6jh0g8kn01aljgl946gmq4ljjzvffykfq4pg0jm" - }, - "4.19": { - "version": "4.19.320", - "hash": "sha256:18a723djyq3y2jhjazwgiwqslh1yz954wb82cg7bf083n091lrwx" + "version": "5.4.284", + "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" }, "6.6": { - "version": "6.6.48", - "hash": "sha256:0a90fx0r25nkcr5b16dn1j7vwyndnshaxn6ziyviccds59xxy5kb" - }, - "6.8": { - "version": "6.8.12", - "hash": "sha256:0fb0m0fv4521g63gq04d7lm6hy8169s1rykiav5bkd99s9b1kcqr" - }, - "6.9": { - "version": "6.9.12", - "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss" + "version": "6.6.54", + "hash": "sha256:186ggr0yz7fgp05qav6k6j72aazvwdljdnf2zwb5q194dafqdbjz" }, "6.10": { - "version": "6.10.7", - "hash": "sha256:1adkbn6dqbpzlr3x87a18mhnygphmvx3ffscwa67090qy1zmc3ch" + "version": "6.10.13", + "hash": "sha256:0smimvnivdswiggplz9x65d03vdysgr3v9iijbk4f5fva0iypz2z" + }, + "6.11": { + "version": "6.11.2", + "hash": "sha256:0hlwsfq6brdkdcwdq6d1aq2b210hkqgpmy0y1sa5bfyfp6hgg7pc" } } diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 46b412c302261..7f4f1aa291164 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19624"; - sha256 = "0q3kg7dqvsiar3m70mvmn6bkkm4k1zn4fbh5r8ynib753wlhf504"; + rev = "19631"; + sha256 = "0hydmrdwqrrmrnk6r583m7c2hq1k68c9c8yqjc0bd6q4x7ys32ci"; } , ... } @ args: diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 775a50980f6d4..54c5ace091542 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -72,7 +72,7 @@ lib.overrideDerivation (buildLinux (args // { # Make copies of the DTBs named after the upstream names so that U-Boot finds them. # This is ugly as heck, but I don't know a better solution so far. postFixup = '' - dtbDir=${if stdenv.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"} + dtbDir=${if stdenv.hostPlatform.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"} rm $dtbDir/bcm283*.dtb copyDTB() { cp -v "$dtbDir/$1" "$dtbDir/$2" @@ -91,6 +91,7 @@ lib.overrideDerivation (buildLinux (args // { copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) '' copyDTB bcm2710-rpi-zero-2.dtb bcm2837-rpi-zero-2.dtb + copyDTB bcm2710-rpi-zero-2-w.dtb bcm2837-rpi-zero-2-w.dtb copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 8c702380c519e..257754d218ece 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.223-rt115"; # updated by ./update-rt.sh + version = "5.10.225-rt117"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "189b3yl4lsjzh6qpza0phj8hgsvnyh38cgrd70rnqw3rddmdh2fa"; + sha256 = "0770757ildcc0cs6alnb5cspg6ysg2wqly9z5q1vjf3mh0xbzmw5"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1kxm1ibc2krzjwvhhlz6h7047mir52x2cafg3pvp2kdpls8kw3jf"; + sha256 = "1c14gm4wzcbkhzgdm5lwq1as9is784yra7bc226bz3bqs3h7vmw2"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index 070a5714ee83e..a1cd2eb5d93fc 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.163-rt78"; # updated by ./update-rt.sh + version = "5.15.167-rt79"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "00mkipkhz0i5xld7kyaxcj8cj8faw4gmjl5fribg832nn7ccfpq2"; + sha256 = "0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "030aycnrcnjhylkqj0wrfi992v2l26v17rgvxl16514zpdjmiv1x"; + sha256 = "0z9yhg0vxzrqn2vyg973pd8qy5iq30jkza8c0mrjjpjzyc8jvm57"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index df92857c25437..29a40809d0fcd 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.105-rt38"; # updated by ./update-rt.sh + version = "6.1.111-rt42"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "162yz32jqd2xkswsd1jxmjq4yhzmhzn17snicad35x51k3vaigr3"; + sha256 = "1c7d49kppv8xgqlsrfm1286mnvz8vcnbqqh6zgfca2s13px9hwn4"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0mk9xz1llzfib0g68b7d1ni5qyj899ldz6n1x1him0ngrqqb0y97"; + sha256 = "16yb962fkkvgppbx8glp5ph3h1jl2q1b4m2s8gsf3k9i9yim7v5c"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index dbbe62e673b2d..c27ae8cf120a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.6.44-rt39"; # updated by ./update-rt.sh + version = "6.6.52-rt43"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "1n6ckxx0i4dbq018b56q1wkwq944jhjy225swrpn65a9jfb848ck"; + sha256 = "1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0c6a75b33xyzwp779j35xyz9gp9njmqvg84425yrnmykdl5fwfqh"; + sha256 = "0g33n9idc3lhbj5z637zm3bgqh601a05cl1s8ji8zbnfh971jcgh"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch b/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch deleted file mode 100644 index 58a9191989ae9..0000000000000 --- a/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst -index 07650ee..934a7a8 100644 ---- a/scripts/Makefile.modinst -+++ b/scripts/Makefile.modinst -@@ -9,7 +9,8 @@ include scripts/Kbuild.include - - # - --__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod))) -+__modules := $(sort $(foreach f,$(wildcard $(MODVERDIR)/*.mod),$(shell \ -+ grep -h '\.ko$$' '$f'))) - modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) - - PHONY += $(modules) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 5d4ebc214dc7b..9e15991dd635a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -39,11 +39,6 @@ patch = ./request-key-helper-updated.patch; }; - modinst_arg_list_too_long = - { name = "modinst-arglist-too-long"; - patch = ./modinst-arg-list-too-long.patch; - }; - hardened = let mkPatch = kernelVersion: { version, sha256, patch }: let src = patch; in { name = lib.removeSuffix ".patch" src.name; diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 17f1fc2da464a..0d639531e840b 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -57,13 +57,12 @@ in stdenv.mkDerivation { pname = "perf-linux"; - version = kernel.version; + inherit (kernel) version src; - inherit (kernel) src; - - # Fix 6.10.0 holding pkg-config completely wrong. - # Patches from perf-tools-next, should be in 6.11 or hopefully backported. - patches = lib.optionals (lib.versionAtLeast kernel.version "6.10") [ + patches = [ + # fix wrong path to dmesg + ./fix-dmesg-path.diff + ] ++ lib.optionals (lib.versions.majorMinor kernel.version == "6.10") [ (fetchpatch { url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=0f0e1f44569061e3dc590cd0b8cb74d8fd53706b"; hash = "sha256-9u/zhbsDgwOr4T4k9td/WJYRuSHIfbtfS+oNx8nbOlM="; diff --git a/pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff b/pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff new file mode 100644 index 0000000000000..0bc3300a2eaf2 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff @@ -0,0 +1,11 @@ +--- a/tools/perf/util/evsel.c 2023-10-20 15:50:53.011023294 +0200 ++++ b/tools/perf/util/evsel.c 2023-10-20 15:51:03.205997633 +0200 +@@ -3076,7 +3076,7 @@ + + return scnprintf(msg, size, + "The sys_perf_event_open() syscall returned with %d (%s) for event (%s).\n" +- "/bin/dmesg | grep -i perf may provide additional information.\n", ++ "\"dmesg | grep -i perf\" may provide additional information.\n", + err, str_error_r(err, sbuf, sizeof(sbuf)), evsel__name(evsel)); + } + diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index cd11af5262fb4..5b6f24ae3183c 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -7,12 +7,12 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.6.47"; - hash = "sha256-FF5kOUC3wIGPjf2f9pogaR51L8kdwJIpAmGc1h/LdV8="; + version = "6.6.52"; + hash = "sha256-bTsxESXY0uhx9/UjUg9cATC1ErfkxF1gH8TXimYVzX4="; }; main = { - version = "6.10.6"; - hash = "sha256-QG0rOysVFm+yeYbVX9OHotdq9IvCF+zxceUuG1yytrc="; + version = "6.10.11"; + hash = "sha256-FDWFpiN0VvzdXcS3nZHm1HFgASazNX5+pL/8UJ3hkI8="; }; }; @@ -59,7 +59,7 @@ let branch = lib.versions.majorMinor version; maintainers = with lib.maintainers; [ moni lovesegfault atemu shawn8901 zzzsy ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } // (args.argsOverride or { })); in diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 246ab4f2d728a..9b1dbc3c9bbe0 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -5,16 +5,16 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.10.7"; #zen + version = "6.10.9"; #zen suffix = "zen1"; #zen - sha256 = "1km3b7nad429hw7d8ff14zj1cg0fhh65ycrrwk4iaxj6rvafzsz1"; #zen + sha256 = "199362jd1waqri6arb8sdfqrzjkdki5vis2z03cpp2blnbqva10b"; #zen isLqx = false; }; # ./update-zen.py lqx lqx = { - version = "6.10.6"; #lqx + version = "6.10.9"; #lqx suffix = "lqx1"; #lqx - sha256 = "0b1pqsssnxc69yhx2wai5xnj6cb9713z33m8xal25jjgx9z4v8kv"; #lqx + sha256 = "0y7r55iy7ylddv7yrlwkz7ps82j447a6m3khq2w4sfh8f0xy86p7"; #lqx isLqx = true; }; }; @@ -120,7 +120,7 @@ let maintainers = with lib.maintainers; [ thiagokokada jerrysm64 ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads." + lib.optionalString isLqx " (Same as linux_zen, but less aggressive release schedule and additional extra config)"; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } // (args.argsOverride or { })); diff --git a/pkgs/os-specific/linux/kvdo/default.nix b/pkgs/os-specific/linux/kvdo/default.nix deleted file mode 100644 index cc5ace339b420..0000000000000 --- a/pkgs/os-specific/linux/kvdo/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, vdo, kernel }: - -stdenv.mkDerivation rec { - inherit (vdo); - pname = "kvdo"; - version = "8.2.3.3"; # bump this version with vdo - - src = fetchFromGitHub { - owner = "dm-vdo"; - repo = "kvdo"; - rev = version; - hash = "sha256-y7uVgWFV6uWRoRqfiu0arG9731mgWijXjcp9KSaZ5X0="; - }; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - dontConfigure = true; - enableParallelBuilding = true; - - KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = placeholder "out"; - - preBuild = '' - makeFlags="$makeFlags -C ${KSRC} M=$(pwd)" - ''; - installTargets = [ "modules_install" ]; - - meta = with lib; { - inherit (vdo.meta) license maintainers; - homepage = "https://github.com/dm-vdo/kvdo"; - description = "Pair of kernel modules which provide pools of deduplicated and/or compressed block storage"; - platforms = platforms.linux; - broken = kernel.kernelOlder "5.17"; - }; -} diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix index 3224fc137db1b..a527351262be8 100644 --- a/pkgs/os-specific/linux/kvmfr/default.nix +++ b/pkgs/os-specific/linux/kvmfr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, kernel, looking-glass-client }: +{ lib, stdenv, fetchpatch, kernel, looking-glass-client }: stdenv.mkDerivation { pname = "kvmfr"; @@ -9,6 +9,23 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = kernel.moduleBuildDependencies; + patches = [ + # fix build for linux-6_10 + (fetchpatch { + url = "https://github.com/gnif/LookingGlass/commit/7305ce36af211220419eeab302ff28793d515df2.patch"; + hash = "sha256-97nZsIH+jKCvSIPf1XPf3i8Wbr24almFZzMOhjhLOYk="; + stripLen = 1; + }) + + # securtiy patch for potential buffer overflow + # https://github.com/gnif/LookingGlass/issues/1133 + (fetchpatch { + url = "https://github.com/gnif/LookingGlass/commit/3ea37b86e38a87ee35eefb5d8fcc38b8dc8e2903.patch"; + hash = "sha256-Kk1gN1uB86ZJA374zmzM9dwwfMZExJcix3hee7ifpp0="; + stripLen = 1; + }) + ]; + makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 4986f0abf4a34..080571ad71d1a 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "prefix=${placeholder "out"}" ] ++ lib.optional stdenv.hostPlatform.isStatic "ENABLE_SHARED=0"; - hardeningDisable = lib.optional (stdenv.isi686) "stackprotector"; + hardeningDisable = lib.optional (stdenv.hostPlatform.isi686) "stackprotector"; checkTarget = "partcheck"; # "check" needs root diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index 6571c46eb680d..da038595bde2c 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libtraceevent"; - version = "1.8.2"; + version = "1.8.3"; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; - hash = "sha256-2oa3pR8DOPaeHcoqcLX00ihx1lpXablnsf0IZR2sOm8="; + hash = "sha256-yftCaZ3mEPOreENd9Q/te/WqM7etokO+D8RZbB1epSA="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 3d99466c8f34e..d35b9e709626f 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -7,7 +7,6 @@ , xmlto , docbook_xml_dtd_45 , docbook_xsl -, coreutils , valgrind , sourceHighlight , meson @@ -15,17 +14,27 @@ , bison , ninja , cunit +, gitUpdater +, fetchpatch }: stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.7.0"; + version = "1.8.1"; src = fetchzip { url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-libtracefs-${version}.tar.gz"; - hash = "sha256-64eXFFdnZHHf4C3vbADtPuIMsfJ85VZ6t8A1gIc1CW0="; + hash = "sha256-2UiEgY4mQRLpWah+2rVfPiiUYBSSzRAy5gOv4YELQFQ="; }; + patches = [ + (fetchpatch { + name = "add-missing-documentation-to-meson-build.patch"; + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/patch/?id=4cbebed79b1fe933367e298ea7ddef694b9f98d0"; + hash = "sha256-tSaR0wpxrm50IyMgMoUCcHBB9r8lQQZZYGru6Znre50="; + }) + ]; + postPatch = '' chmod +x samples/extract-example.sh patchShebangs --build check-manpages.sh samples/extract-example.sh Documentation/install-docs.sh.in @@ -52,6 +61,12 @@ stdenv.mkDerivation rec { doCheck = true; checkInputs = [ cunit ]; + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; + rev-prefix = "libtracefs-"; + }; + meta = with lib; { description = "Linux kernel trace file system library"; mainProgram = "sqlhist"; diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index 23f79e7f66536..66a03a4ffa327 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "linuxptp"; - version = "4.3"; + version = "4.4"; src = fetchFromGitHub { owner = "nwtime"; repo = "linuxptp"; rev = "v${version}"; - hash = "sha256-FFBbbmVPP74p/OkqNXXgynBS/NcuPoYs3OCof11NZOI="; + hash = "sha256-w1buo+D8Mnd6ytMhQYhvCDqt+RejlNSN/iVjrDR+Khk="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/os-specific/linux/lsirec/default.nix b/pkgs/os-specific/linux/lsirec/default.nix index 10da88b691d97..aab36459ae95a 100644 --- a/pkgs/os-specific/linux/lsirec/default.nix +++ b/pkgs/os-specific/linux/lsirec/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ Luflosi ]; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index fa0a2cc8a6009..ad559a6c2bb61 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.23"; - hash = "sha256-dOeUqene4bz4ogZfZbkZbET98yHiLWO5jtfejJqhel0="; + version = "2.03.26"; + hash = "sha256-cuqLTw4WEN5dEZKWsV7yoiA0MQiVQdy+vGY2H2X7NfU="; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 9cba67ee2b39d..6f7c3cb77f234 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -101,10 +101,7 @@ stdenv.mkDerivation rec { multipath_tools = optionalTool enableMultipath multipath-tools; vdo = optionalTool enableVDO vdo; })) - # Musl fix from Alpine ./fix-stdio-usage.patch - # https://gitlab.com/lvmteam/lvm2/-/merge_requests/8 - ./fix-static.patch ]; doCheck = false; # requires root diff --git a/pkgs/os-specific/linux/lvm2/fix-static.patch b/pkgs/os-specific/linux/lvm2/fix-static.patch deleted file mode 100644 index 89192744adecb..0000000000000 --- a/pkgs/os-specific/linux/lvm2/fix-static.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0cbe7f0adc86c92c61156c417b27b063f156b31b Mon Sep 17 00:00:00 2001 -From: Alyssa Ross <hi@alyssa.is> -Date: Tue, 2 Jan 2024 18:15:20 +0100 -Subject: [PATCH] makefiles: fix disabling shared link - -LIB_SHARED still gets set when shared linking has been disabled, so -the previous version of this check still attempted to build the -shared library. ---- - libdm/make.tmpl.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in -index 2dd9625d4d..69ba2c35ab 100644 ---- a/libdm/make.tmpl.in -+++ b/libdm/make.tmpl.in -@@ -436,7 +436,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64 - @echo " [CC] $(<F)" - $(Q) $(CC) -c $(CFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@ - --ifneq (,$(LIB_SHARED)) -+ifeq ("@SHARED_LINK@", "yes") - - TARGETS += $(LIB_SHARED).$(LIB_VERSION) - $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS) --- -GitLab - diff --git a/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch b/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch index 98cdc6eb3ec9f..7b9989bc25909 100644 --- a/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch +++ b/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch @@ -1,40 +1,45 @@ -From 63b1c7332bee6080bffecf9ce9d75ff15d799166 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 16 Nov 2022 10:42:39 +0100 -Subject: [PATCH] fix stdio usage - ---- - lib/commands/toolcontext.c | 4 ++-- - tools/lvmcmdline.c | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c -index b630554a9..f20080d18 100644 +index 56dc1f856..011ec2700 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c -@@ -1667,7 +1667,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, +@@ -1660,6 +1660,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, /* FIXME Make this configurable? */ reset_lvm_errno(1); --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) ++#ifdef __GLIBC__ /* Set in/out stream buffering before glibc */ if (set_buffering - #ifdef SYS_gettid -@@ -2045,7 +2045,7 @@ void destroy_toolcontext(struct cmd_context *cmd) + && !cmd->running_on_valgrind /* Skipping within valgrind execution. */ +@@ -1704,7 +1705,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, + } else if (!set_buffering) + /* Without buffering, must not use stdin/stdout */ + init_silent(1); +- ++#endif + /* + * Environment variable LVM_SYSTEM_DIR overrides this below. + */ +@@ -2038,6 +2039,7 @@ void destroy_toolcontext(struct cmd_context *cmd) + if (cmd->cft_def_hash) dm_hash_destroy(cmd->cft_def_hash); - dm_device_list_destroy(&cmd->cache_dm_devs); --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - if (cmd->linebuffer) { ++#ifdef __GLIBC__ + if (!cmd->running_on_valgrind && cmd->linebuffer) { + int flags; /* Reset stream buffering to defaults */ - if (is_valid_fd(STDIN_FILENO) && +@@ -2061,6 +2063,7 @@ void destroy_toolcontext(struct cmd_context *cmd) + + free(cmd->linebuffer); + } ++#endif + + destroy_config_context(cmd); + diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c -index a5bb6a5c5..0ebfa375c 100644 +index 1b2f7f47c..e0674d42d 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c -@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void) +@@ -3378,7 +3378,7 @@ static int _check_standard_fds(void) int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && @@ -43,7 +48,7 @@ index a5bb6a5c5..0ebfa375c 100644 if (err) perror("stdin stream open"); else -@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void) +@@ -3388,7 +3388,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDOUT_FILENO) && @@ -52,7 +57,7 @@ index a5bb6a5c5..0ebfa375c 100644 if (err) perror("stdout stream open"); /* else no stdout */ -@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void) +@@ -3396,7 +3396,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDERR_FILENO) && @@ -61,6 +66,3 @@ index a5bb6a5c5..0ebfa375c 100644 printf("stderr stream open: %s\n", strerror(errno)); return 0; --- -2.38.1 - diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix deleted file mode 100644 index 3c82cdec29fb7..0000000000000 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, linux-firmware, libarchive }: - -stdenv.mkDerivation { - pname = "amd-ucode"; - version = linux-firmware.version; - - src = linux-firmware; - - sourceRoot = "."; - - nativeBuildInputs = [ libarchive ]; - - buildPhase = '' - mkdir -p kernel/x86/microcode - find ${linux-firmware}/lib/firmware/amd-ucode -name \*.bin -print0 | sort -z |\ - xargs -0 -I{} sh -c 'cat {} >> kernel/x86/microcode/AuthenticAMD.bin' - ''; - - installPhase = '' - mkdir -p $out - touch -d @$SOURCE_DATE_EPOCH kernel/x86/microcode/AuthenticAMD.bin - echo kernel/x86/microcode/AuthenticAMD.bin | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- > $out/amd-ucode.img - ''; - - meta = with lib; { - description = "AMD Processor microcode patch"; - homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - license = licenses.unfreeRedistributableFirmware; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix deleted file mode 100644 index 8e807b990d3e7..0000000000000 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libarchive, iucode-tool }: - -stdenv.mkDerivation rec { - pname = "microcode-intel"; - version = "20240813"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "Intel-Linux-Processor-Microcode-Data-Files"; - rev = "microcode-${version}"; - hash = "sha256-O2UWa04MnU9ndzvWy8fruOTm85PexEd+i1McQNz6uFE="; - }; - - nativeBuildInputs = [ iucode-tool libarchive ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out kernel/x86/microcode - iucode_tool -w kernel/x86/microcode/GenuineIntel.bin intel-ucode/ - touch -d @$SOURCE_DATE_EPOCH kernel/x86/microcode/GenuineIntel.bin - echo kernel/x86/microcode/GenuineIntel.bin | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- > $out/intel-ucode.img - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://www.intel.com/"; - changelog = "https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/${src.rev}"; - description = "Microcode for Intel processors"; - license = licenses.unfreeRedistributableFirmware; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix deleted file mode 100644 index d38fa0a488950..0000000000000 --- a/pkgs/os-specific/linux/microcode/iucode-tool.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, fetchpatch, argp-standalone }: - -stdenv.mkDerivation rec { - pname = "iucode-tool"; - version = "2.3.1"; - - src = fetchFromGitLab { - owner = "iucode-tool"; - repo = "iucode-tool"; - rev = "v${version}"; - sha256 = "04dlisw87dd3q3hhmkqc5dd58cp22fzx3rzah7pvcyij135yjc3a"; - }; - - patches = [ - # build fix for musl libc, pending upstream review - # https://gitlab.com/iucode-tool/iucode-tool/-/merge_requests/4 - (fetchpatch { - url = "https://gitlab.com/iucode-tool/iucode-tool/-/commit/fda4aaa4727601dbe817fac001f234c19420351a.patch"; - hash = "sha256-BxYrXALpZFyJtFrgU5jFmzd1dIMPmpNgvYArgkwGt/w="; - }) - ]; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = lib.optional stdenv.hostPlatform.isMusl argp-standalone; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Intel® 64 and IA-32 processor microcode tool"; - mainProgram = "iucode_tool"; - homepage = "https://gitlab.com/iucode-tool/iucode-tool"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ peterhoeg ]; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; -} diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index b0513f5663d49..c83596a1fbe04 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -2,7 +2,7 @@ let bits = - if stdenv.is64bit then "64" + if stdenv.hostPlatform.is64bit then "64" else "32"; libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc alsa-lib ]; diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix index 35e77c7922dfd..7a3700d4c3184 100644 --- a/pkgs/os-specific/linux/nct6687d/default.nix +++ b/pkgs/os-specific/linux/nct6687d/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "nct6687d"; - version = "0-unstable-2024-02-23"; + version = "0-unstable-2024-09-02"; src = fetchFromGitHub { owner = "Fred78290"; repo = "nct6687d"; - rev = "0ee35ed9541bde22fe219305d1647b51ed010c5e"; - hash = "sha256-g81U+ngnsOslBDCQP51uDDyHPpCv9T/j+KmFUAQfz/M="; + rev = "f45b72a6ca335e20f8a2df5ee5d4e130916150d0"; + hash = "sha256-2sAL6aXUafmm2DKIhqEoTSPZVmzu/lnTkpPznJndX3o="; }; setSourceRoot = '' diff --git a/pkgs/os-specific/linux/new-lg4ff/default.nix b/pkgs/os-specific/linux/new-lg4ff/default.nix index a92ee9ae64b53..8eed8edbc166f 100644 --- a/pkgs/os-specific/linux/new-lg4ff/default.nix +++ b/pkgs/os-specific/linux/new-lg4ff/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ matthiasbenaets ]; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 89f4ae7c97f23..5f0e62b1b8113 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent , sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, python3, buildPackages, nixosTests, rpcsvc-proto, openldap, libxml2 +, python3, buildPackages, nixosTests, rpcsvc-proto, openldap, cyrus_sasl, libxml2 , enablePython ? true, enableLdap ? true }: @@ -27,7 +27,10 @@ stdenv.mkDerivation rec { libtirpc libcap libevent sqlite lvm2 libuuid keyutils libkrb5 tcp_wrappers libxml2 ] ++ lib.optional enablePython python3 - ++ lib.optional enableLdap openldap; + ++ lib.optionals enableLdap [ + openldap + cyrus_sasl + ]; enableParallelBuilding = true; @@ -48,7 +51,7 @@ stdenv.mkDerivation rec { "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap "--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen" "--with-modprobedir=${placeholder "out"}/etc/modprobe.d" - ] ++ lib.optional enableLdap "--with-ldap"; + ] ++ lib.optional enableLdap "--enable-ldap"; patches = lib.optionals stdenv.hostPlatform.isMusl [ # http://openwall.com/lists/musl/2015/08/18/10 @@ -103,7 +106,7 @@ stdenv.mkDerivation rec { ''; # One test fails on mips. - # doCheck = !stdenv.isMips; + # doCheck = !stdenv.hostPlatform.isMips; # https://bugzilla.kernel.org/show_bug.cgi?id=203793 doCheck = false; diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 54e9e92bb292c..c5bc19f82980f 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -548,6 +548,28 @@ getNixDrv() { fi } +getVersion() { + local dir="$1" + local rev= + local gitDir="$dir/.git" + if [ -e "$gitDir" ]; then + if [ -z "$(type -P git)" ]; then + echo "warning: Git not found; cannot figure out revision of $dir" >&2 + return + fi + cd "$dir" + rev=$(git --git-dir="$gitDir" rev-parse --short HEAD) + if git --git-dir="$gitDir" describe --always --dirty | grep -q dirty; then + rev+=M + fi + fi + + if [ -n "$rev" ]; then + echo ".git.$rev" + fi +} + + if [[ -n $buildNix && -z $flake ]]; then log "building Nix..." getNixDrv @@ -569,7 +591,7 @@ fi # nixos-version shows something useful). if [[ -n $canRun && -z $flake ]]; then if nixpkgs=$(runCmd nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then - suffix=$(runCmd $SHELL "$nixpkgs/nixos/modules/installer/tools/get-version-suffix" "${extraBuildFlags[@]}" || true) + suffix=$(getVersion "$nixpkgs" || true) if [ -n "$suffix" ]; then echo -n "$suffix" > "$nixpkgs/.version-suffix" || true fi @@ -588,7 +610,7 @@ if [ "$action" = repl ]; then if [[ -z $buildingAttribute ]]; then exec nix repl --file $buildFile $attr "${extraBuildFlags[@]}" elif [[ -z $flake ]]; then - exec nix repl '<nixpkgs/nixos>' "${extraBuildFlags[@]}" + exec nix repl --file '<nixpkgs/nixos>' "${extraBuildFlags[@]}" else if [[ -n "${lockFlags[0]}" ]]; then # nix repl itself does not support locking flags diff --git a/pkgs/os-specific/linux/nsncd/0001-cargo-bump.patch b/pkgs/os-specific/linux/nsncd/0001-cargo-bump.patch deleted file mode 100644 index 2afea887428fe..0000000000000 --- a/pkgs/os-specific/linux/nsncd/0001-cargo-bump.patch +++ /dev/null @@ -1,197 +0,0 @@ -From b68e8356cf85fa75582237b4bc02f47efc40e8f0 Mon Sep 17 00:00:00 2001 -From: Picnoir <picnoir@alternativebit.fr> -Date: Tue, 6 Aug 2024 11:43:34 +0200 -Subject: [PATCH] cargo.lock: bump time version - -Bumping time to 0.3.36. Fix the build for rustc > 1.80. - -Fix https://github.com/twosigma/nsncd/issues/118 ---- - Cargo.lock | 74 ++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 55 insertions(+), 19 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index a043bde..f6ce6f4 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -205,6 +205,15 @@ version = "0.8.19" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -+[[package]] -+name = "deranged" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", -+] -+ - [[package]] - name = "dirs-next" - version = "2.0.0" -@@ -426,6 +435,12 @@ dependencies = [ - "temp-env", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-derive" - version = "0.3.3" -@@ -434,7 +449,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -519,20 +534,26 @@ dependencies = [ - "plotters-backend", - ] - -+[[package]] -+name = "powerfmt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -+ - [[package]] - name = "proc-macro2" --version = "1.0.64" -+version = "1.0.86" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" - dependencies = [ - "unicode-ident", - ] - - [[package]] - name = "quote" --version = "1.0.23" -+version = "1.0.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" - dependencies = [ - "proc-macro2", - ] -@@ -652,22 +673,22 @@ checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" - - [[package]] - name = "serde" --version = "1.0.154" -+version = "1.0.204" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e" -+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.154" -+version = "1.0.204" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217" -+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.72", - ] - - [[package]] -@@ -745,6 +766,17 @@ dependencies = [ - "unicode-ident", - ] - -+[[package]] -+name = "syn" -+version = "2.0.72" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ - [[package]] - name = "take_mut" - version = "0.2.2" -@@ -788,7 +820,7 @@ checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -803,11 +835,14 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.20" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ -+ "deranged", - "itoa", -+ "num-conv", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -815,16 +850,17 @@ dependencies = [ - - [[package]] - name = "time-core" --version = "0.1.0" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.8" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - -@@ -882,7 +918,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - "wasm-bindgen-shared", - ] - -@@ -904,7 +940,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix index 9acef3cd9342b..f235fa0646cb6 100644 --- a/pkgs/os-specific/linux/nsncd/default.nix +++ b/pkgs/os-specific/linux/nsncd/default.nix @@ -3,26 +3,22 @@ stdenv, fetchFromGitHub, rustPlatform, + nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage { pname = "nsncd"; - version = "1.4.1-unstable-2024-04-10"; + version = "1.4.1-unstable-2024-10-03"; src = fetchFromGitHub { owner = "twosigma"; repo = "nsncd"; - rev = "7605e330d5a313a8656e6fcaf1c10cd6b5cdd427"; - hash = "sha256-Bd7qE9MP5coBCkr70TdoJfwYhQpdrn/zmN4KoARcaMI="; + rev = "cf94e3cfc7dfff69867209c7e68945bac2d3913d"; + hash = "sha256-mjTbyO0b9i4LMv7DWHm0Y4z1pvcapCtFsHLV5cTAxQE="; }; - cargoHash = "sha256-N7U9YsyGh8+fLT973GGZTmVXcdnWhpqkeYTxzJ0rzdo="; - - # TOREMOVE when https://github.com/twosigma/nsncd/pull/119 gets merged. - cargoPatches = [ ./0001-cargo-bump.patch ]; - - # TOREMOVE when https://github.com/twosigma/nsncd/pull/119 gets merged. - RUSTFLAGS = "-A dead_code"; + cargoHash = "sha256-cgdob/HmE6I59W5UQRItAFXDj7IvazNt99LbJlKQDNo="; checkFlags = [ # Relies on the test environment to be able to resolve "localhost" @@ -44,6 +40,11 @@ rustPlatform.buildRustPackage { picnoir ]; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; + }; + + passthru = { + tests.nscd = nixosTests.nscd; + updateScript = nix-update-script { }; }; } diff --git a/pkgs/os-specific/linux/nullfs/default.nix b/pkgs/os-specific/linux/nullfs/default.nix new file mode 100644 index 0000000000000..62a71829b2e13 --- /dev/null +++ b/pkgs/os-specific/linux/nullfs/default.nix @@ -0,0 +1,47 @@ +{ + stdenv, + lib, + fetchFromGitHub, + kernel, +}: +stdenv.mkDerivation rec { + pname = "nullfs"; + version = "0.17"; + + src = fetchFromGitHub { + owner = "abbbi"; + repo = "nullfsvfs"; + rev = "v${version}"; + sha256 = "sha256-Hkplhem4Gb1xsYQtRSWub0m15Fiil3qJAO183ygP+WI="; + }; + + hardeningDisable = [ "pic" ]; + + enableParallelBuilding = true; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + prePatch = '' + substituteInPlace "Makefile" \ + --replace-fail "/lib/modules/\$(shell uname -r)/build" "\$(KSRC)" + ''; + + installPhase = '' + runHook preInstall + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfs/" + install -p -m 644 nullfs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfs/ + runHook postInstall + ''; + + meta = with lib; { + description = "A virtual black hole file system that behaves like /dev/null"; + homepage = "https://github.com/abbbi/nullfsvfs"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ callumio ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 61ea120772b49..00f38b0a30426 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -185,20 +185,32 @@ installPhase() { patchelf --set-rpath "$out/lib:$libPath" "$libname" fi - libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` - - if [[ "$libname" != "$libname_short" ]]; then - ln -srnf "$libname" "$libname_short" - fi + # Manually create the right symlinks for the libraries. + # + # We can't just use ldconfig, because it does not create libfoo.so symlinks, + # only libfoo.so.1. + # Also, the symlink chain must be libfoo.so -> libfoo.so.1 -> libfoo.so.123.45, + # or ldconfig will explode. + # See: https://github.com/bminor/glibc/blob/6f3f6c506cdaf981a4374f1f12863b98ac7fea1a/elf/ldconfig.c#L854-L877 + + libbase=$(basename "$libname") + libdir=$(dirname "$libname") + soname=$(patchelf --print-soname "$libname") + unversioned=${libbase/\.so\.[0-9\.]*/.so} + + if [[ -n "$soname" ]]; then + if [[ "$soname" != "$libbase" ]]; then + ln -s "$libbase" "$libdir/$soname" + fi - if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so || $libname_short =~ libGLX.so || $libname_short =~ libGLX_nvidia.so ]]; then - major=0 - else - major=1 + if [[ "$soname" != "$unversioned" ]]; then + ln -s "$soname" "$libdir/$unversioned" + fi fi - if [[ "$libname" != "$libname_short.$major" ]]; then - ln -srnf "$libname" "$libname_short.$major" + # FIXME: libglxserver_nvidia does not have a soname, but must still be symlinked + if [[ "$unversioned" == "libglxserver_nvidia.so" ]]; then + ln -s "$libbase" "$libdir/$unversioned" fi done diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index dd4cd3d94a17a..60588ea4f03ac 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,6 +22,12 @@ let url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch"; hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg="; }; + + # Fixes framebuffer with linux 6.11 + fbdev_linux_611_patch = fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/NVIDIA/open-gpu-kernel-modules/pull/692.patch"; + hash = "sha256-OYw8TsHDpBE5DBzdZCBT45+AiznzO9SfECz5/uXN5Uc="; + }; in rec { mkDriver = generic; @@ -33,12 +39,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "550.107.02"; - sha256_64bit = "sha256-+XwcpN8wYCjYjHrtYx+oBhtVxXxMI02FO1ddjM5sAWg="; - sha256_aarch64 = "sha256-mVEeFWHOFyhl3TGx1xy5EhnIS/nRMooQ3+LdyGe69TQ="; - openSha256 = "sha256-Po+pASZdBaNDeu5h8sgYgP9YyFAm9ywf/8iyyAaLm+w="; - settingsSha256 = "sha256-WFZhQZB6zL9d5MUChl2kCKQ1q9SgD0JlP4CMXEwp2jE="; - persistencedSha256 = "sha256-Vz33gNYapQ4++hMqH3zBB4MyjxLxwasvLzUJsCcyY4k="; + version = "550.120"; + sha256_64bit = "sha256-gBkoJ0dTzM52JwmOoHjMNwcN2uBN46oIRZHAX8cDVpc="; + sha256_aarch64 = "sha256-dzTEUuSIWKEuAMhsL9QkR7CCHpm6m9ZwtGSpSKqwJdc="; + openSha256 = "sha256-O3OrGGDR+xrpfyPVQ04aM3eGI6aWuZfRzmaPjMfnGIg="; + settingsSha256 = "sha256-fPfIPwpIijoUpNlAUt9C8EeXR5In633qnlelL+btGbU="; + persistencedSha256 = "sha256-ztEemWt0VR+cQbxDmMnAbEVfThdvASHni4SJ0dTZ2T4="; }; latest = selectHighestVersion production (generic { @@ -48,6 +54,7 @@ rec { openSha256 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg="; settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk="; persistencedSha256 = "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs="; + patchesOpen = [ fbdev_linux_611_patch ]; }); beta = selectHighestVersion latest (generic { @@ -62,11 +69,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "550.40.71"; + version = "550.40.75"; persistencedVersion = "550.54.14"; settingsVersion = "550.54.14"; - sha256_64bit = "sha256-LDh3Kz7Iop+Y2rxXANuPPkDr6WKPuZ5KV9L3+RPa2d0="; - openSha256 = "sha256-0HGAE0SlQmEc75E0h7Oq7qu7rVfLhQoBqQF1OuHSa2Y="; + sha256_64bit = "sha256-Bgze1hx2gTKhchNHNVTnPnGOqpUe5UjNXJW5tVFi0wE="; + openSha256 = "sha256-NnJ3AxLWg90WjoZ81vzjII/UT2RaERF4IEZp5bRgElk="; settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 87fde8db23408..bc4a22621cf33 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -23,6 +23,7 @@ , postPatch ? null , patchFlags ? null , patches ? [ ] +, patchesOpen ? [ ] , preInstall ? null , postInstall ? null , broken ? false @@ -201,6 +202,7 @@ let (hash: callPackage ./open.nix { inherit hash; nvidia_x11 = self; + patches = patchesOpen; broken = brokenOpen; }) openSha256; diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix index a6795c3fd5e77..d9926f9cc3eb9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -4,6 +4,7 @@ , kernel , nvidia_x11 , hash +, patches ? [ ] , broken ? false }: @@ -18,6 +19,8 @@ stdenv.mkDerivation ({ inherit hash; }; + inherit patches; + nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = kernel.makeFlags ++ [ diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index b460348a105d4..9e97071bbc7c9 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://www.linux-pam.org/"; + homepage = "https://github.com/linux-pam/linux-pam"; description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user"; platforms = platforms.linux; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/pam_p11/default.nix b/pkgs/os-specific/linux/pam_p11/default.nix index 0a7e02f4ad819..a1e1dc109a158 100644 --- a/pkgs/os-specific/linux/pam_p11/default.nix +++ b/pkgs/os-specific/linux/pam_p11/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pam libp11.passthru.openssl libp11 ] - ++ lib.optionals stdenv.isDarwin [ libintl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ]; meta = with lib; { homepage = "https://github.com/OpenSC/pam_p11"; diff --git a/pkgs/os-specific/linux/pam_rssh/default.nix b/pkgs/os-specific/linux/pam_rssh/default.nix index 8b4224d6f4dfe..a67ec6ddedf43 100644 --- a/pkgs/os-specific/linux/pam_rssh/default.nix +++ b/pkgs/os-specific/linux/pam_rssh/default.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "pam_rssh"; - version = "1.1.0"; + version = "1.2.0-rc2"; src = fetchFromGitHub { owner = "z4yx"; repo = "pam_rssh"; rev = "v${version}"; - hash = "sha256-SDtMqGy2zhq9jEQVwSEl4EwRp2jgXfTVLrCX7k/kBeU="; + hash = "sha256-sXTSICVYSmwr12kRWuhVcag8kY6VAFdCqbe6LtYs4hU="; fetchSubmodules = true; }; - cargoHash = "sha256-gNy1tcHDUOG1XduGAIMapvx5dlq+U1LitUQkccGfb9o="; + cargoHash = "sha256-QZ1Cs3TZab9wf8l4Fe95LFZhHB6q1uq7JRzEVUMKQSI="; postPatch = '' substituteInPlace src/auth_keys.rs \ diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index dcecfa4c13b85..ac4cae906a2b8 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -4,7 +4,7 @@ , buildPackages , docbook_xml_dtd_44 , docbook_xsl -, withLibcap ? stdenv.isLinux, libcap +, withLibcap ? stdenv.hostPlatform.isLinux, libcap , pkg-config , meson , ninja diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index 5c111952727de..0ce82515d1d0f 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pcm"; - version = "202405"; + version = "202409"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - hash = "sha256-yEe1lWbvafc3N3+K9WMMlIXVVX+fVO8QsuKdyIqiKAg="; + hash = "sha256-eCFyk6V1wpTImDKbsSiwgnqIduh62YG8GK0jxZL04Yc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix deleted file mode 100644 index be984c5648607..0000000000000 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ stdenv -, lib -, bash-completion -, pkg-config -, meson -, mesonEmulatorHook -, ninja -, fetchFromGitLab -, libgudev -, glib -, polkit -, dbus -, gobject-introspection -, wrapGAppsNoGuiHook -, gettext -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_412 -, libxml2 -, libxslt -, upower -, umockdev -, systemd -, python3 -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "power-profiles-daemon"; - version = "0.21"; - - outputs = [ "out" "devdoc" ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "upower"; - repo = "power-profiles-daemon"; - rev = version; - sha256 = "sha256-5JbMbz38SeNEkVKFjJLxeUHiOrx+QCaK/vXgRPbzwzY="; - }; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_412 - libxml2 # for xmllint for stripping GResources - libxslt # for xsltproc for building docs - gobject-introspection - wrapGAppsNoGuiHook - # checkInput but cheked for during the configuring - (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ - pygobject3 - dbus-python - python-dbusmock - argparse-manpage - shtab - ])) - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - bash-completion - libgudev - systemd - upower - glib - polkit - # for cli tool - (python3.withPackages (ps: [ - ps.pygobject3 - ])) - ]; - - strictDeps = true; - - checkInputs = [ - umockdev - ]; - - nativeCheckInputs = [ - umockdev - dbus - ]; - - mesonFlags = [ - "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - "-Dgtk_doc=true" - "-Dpylint=disabled" - "-Dzshcomp=${placeholder "out"}/share/zsh/site-functions" - "-Dtests=${lib.boolToString (stdenv.buildPlatform.canExecute stdenv.hostPlatform)}" - ]; - - doCheck = true; - - # Only need to wrap the Python tool (powerprofilectl) - dontWrapGApps = true; - - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; - - postPatch = '' - patchShebangs --build \ - tests/integration-test.py \ - tests/unittest_inspector.py - - patchShebangs --host \ - src/powerprofilesctl - ''; - - postFixup = '' - wrapGApp "$out/bin/powerprofilesctl" - ''; - - passthru = { - tests = { - nixos = nixosTests.power-profiles-daemon; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.freedesktop.org/hadess/power-profiles-daemon"; - description = "Makes user-selected power profiles handling available over D-Bus"; - mainProgram = "powerprofilesctl"; - platforms = platforms.linux; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ mvnetbiz picnoir lyndeno ]; - }; -} diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix deleted file mode 100644 index 756bd99816fbd..0000000000000 --- a/pkgs/os-specific/linux/powertop/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gettext -, libnl -, ncurses -, pciutils -, pkg-config -, zlib -, autoreconfHook -, autoconf-archive -, nix-update-script -, testers -, powertop -, xorg -}: - -stdenv.mkDerivation rec { - pname = "powertop"; - version = "2.15"; - - src = fetchFromGitHub { - owner = "fenrus75"; - repo = pname; - rev = "v${version}"; - hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M="; - }; - - outputs = [ "out" "man" ]; - - nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ]; - buildInputs = [ gettext libnl ncurses pciutils zlib ]; - - postPatch = '' - substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" - substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "${lib.getExe xorg.xset}" - substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool" - ''; - - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = powertop; - command = "powertop --version"; - inherit version; - }; - }; - - meta = with lib; { - inherit (src.meta) homepage; - changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}"; - description = "Analyze power consumption on Intel-based laptops"; - mainProgram = "powertop"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ fpletz anthonyroussel ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 664e499cd1d45..15ca9f9212e45 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -8,6 +8,7 @@ , perl , undmg , dbus-glib +, fuse , glib , xorg , zlib @@ -36,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "19.4.1-54985"; + version = "20.0.1-55659"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-VBHCsxaMI6mfmc/iQ4hJW/592rKck9HilTX2Hq7Hb5s="; + hash = "sha256-5h8WZB7L6D9KOgIPSstN1sNcf3FZQiOQFB5MUC4YzvA="; }; hardeningDisable = [ "pic" "format" ]; @@ -58,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ dbus-glib + fuse glib xorg.libX11 xorg.libXcomposite @@ -78,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { undmg $src export sourceRoot=prl-tools-build - 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.isAarch64 "-arm"}.iso" -o$sourceRoot + 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm"}.iso" -o$sourceRoot ( cd $sourceRoot/kmods; tar -xaf prl_mod.tar.gz ) runHook postUnpack @@ -109,12 +111,12 @@ stdenv.mkDerivation (finalAttrs: { cp prl_fs/SharedFolders/Guest/Linux/prl_fs/prl_fs.ko $out/lib/modules/${kernelVersion}/extra cp prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.ko $out/lib/modules/${kernelVersion}/extra cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra - ${lib.optionalString stdenv.isAarch64 + ${lib.optionalString stdenv.hostPlatform.isAarch64 "cp prl_notifier/Installation/lnx/prl_notifier/prl_notifier.ko $out/lib/modules/${kernelVersion}/extra"} ) ( # tools - cd tools/tools${if stdenv.isAarch64 then "-arm64" else if stdenv.isx86_64 then "64" else "32"} + cd tools/tools${if stdenv.hostPlatform.isAarch64 then "-arm64" else if stdenv.hostPlatform.isx86_64 then "64" else "32"} mkdir -p $out/lib # prltoolsd contains hardcoded /bin/bash path @@ -142,6 +144,7 @@ stdenv.mkDerivation (finalAttrs: { done install -Dm755 ../../tools/prlfsmountd.sh $out/sbin/prlfsmountd + install -Dm755 ../../tools/prlbinfmtconfig.sh $out/sbin/prlbinfmtconfig for f in $out/bin/* $out/sbin/*; do wrapProgram $f \ --prefix LD_LIBRARY_PATH ':' "${libPath}" \ @@ -166,11 +169,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Parallels Tools for Linux guests"; homepage = "https://parallels.com"; license = licenses.unfree; - maintainers = with maintainers; [ catap wegank ]; + maintainers = with maintainers; [ catap wegank codgician ]; platforms = platforms.linux; }; }) diff --git a/pkgs/os-specific/linux/prl-tools/update.sh b/pkgs/os-specific/linux/prl-tools/update.sh new file mode 100644 index 0000000000000..58b7c14c47fb1 --- /dev/null +++ b/pkgs/os-specific/linux/prl-tools/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq + +set -eu -o pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" +path="$nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix" + +# Currently this script only supports Parallels 20 +# Please change the knowledge base url after each major release +kb_url="https://kb.parallels.com/en/130212" +content="$(curl -s "$kb_url")" + +# Match latest version from Parallels knowledge base +regex='<meta property="og:description" content="[^"]*Parallels Desktop ([0-9]+) for Mac ([0-9]+\.[0-9]+\.[0-9+]) \(([0-9]+)\)[^"]*" />' +if [[ $content =~ $regex ]]; then + major_version="${BASH_REMATCH[1]}" + version="${BASH_REMATCH[2]}-${BASH_REMATCH[3]}" + echo "Found latest version: $version, major version: $major_version" +else + echo "Failed to extract version from $kb_url" + exit 1 +fi + +# Extract and compare current version +old_version="$(grep -o 'version = ".*"' "$path" | awk -F'"' '{print $2}')" +if [[ "$old_version" > "$version" || "$old_version" == "$version" ]]; then + echo "Current version $old_version is up-to-date" + exit 0 +fi + +# Update version and hash +dmg_url="https://download.parallels.com/desktop/v${major_version}/${version}/ParallelsDesktop-${version}.dmg" +sha256="$(nix store prefetch-file $dmg_url --json | jq -r '.hash')" +sed -i -e "s/version = \"$old_version\"/version = \"$version\"/" \ + -e "s/hash = \"sha256-.*\"/hash = \"$sha256\"/" "$path" + +git commit -qm "linuxPackages_latest.prl-tools: $old_version -> $version" "$path" +echo "Updated linuxPackages_latest.prl-tools $old_version -> $version" diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index da2c80934172b..32a7f7865b122 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -14,7 +14,7 @@ # system (or very similar like that found in Cygwin). The one # exception is ‘watch’ which is portable enough to run on pretty much # any UNIX-compatible system. -, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin) +, watchOnly ? !(stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isCygwin) , binlore , procps diff --git a/pkgs/os-specific/linux/rasdaemon/default.nix b/pkgs/os-specific/linux/rasdaemon/default.nix index 35478732fb8cc..5a1df895b4c03 100644 --- a/pkgs/os-specific/linux/rasdaemon/default.nix +++ b/pkgs/os-specific/linux/rasdaemon/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libtraceevent (perl.withPackages (ps: with ps; [ DBI DBDSQLite ])) ] - ++ lib.optionals (!stdenv.isAarch64) [ dmidecode ]; + ++ lib.optionals (!stdenv.hostPlatform.isAarch64) [ dmidecode ]; configureFlags = [ "--sysconfdir=/etc" @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/ras-mc-ctl \ --replace 'find_prog ("modprobe") or exit (1)' '"${kmod}/bin/modprobe"' '' - + lib.optionalString (!stdenv.isAarch64) '' + + lib.optionalString (!stdenv.hostPlatform.isAarch64) '' substituteInPlace $out/bin/ras-mc-ctl \ --replace 'find_prog ("dmidecode")' '"${dmidecode}/bin/dmidecode"' ''; diff --git a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix index 5348f932250e9..9956d0e6530ce 100644 --- a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, kernel, bc, fetchpatch }: +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + bc, +}: stdenv.mkDerivation { pname = "rtl8188eus-aircrack"; - version = "${kernel.version}-unstable-2023-09-21"; + version = "${kernel.version}-unstable-2024-09-18"; src = fetchFromGitHub { owner = "aircrack-ng"; repo = "rtl8188eus"; - rev = "3fae7237ba121f1169e9a2ea55040dc123697d3b"; - sha256 = "sha256-ILSMEt9nMdg1ZbFeatWm8Yxf6a/E7Vm7KtKhN933KTc="; + rev = "f969c544ab6100da3d80a5709e077f920f2df698"; + sha256 = "sha256-uwO2nDDff4t0PZw3mLWmUPOHHftDgoaBaWMXQKHQunI="; }; prePatch = '' @@ -17,18 +23,6 @@ stdenv.mkDerivation { --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - # until https://github.com/aircrack-ng/rtl8188eus/pull/275 get merged using patches to fix and add newer kernel 6.7 support - patches = [ - (fetchpatch { - url = "https://github.com/aircrack-ng/rtl8188eus/commit/dcf602320ce0cfa316c990ce067317954d75edae.patch"; - hash = "sha256-AkrqqWv5TPHBfQ7FhS0urXnUw5QHQUrbvEb+NkLxpJA="; - }) - (fetchpatch { - url = "https://github.com/aircrack-ng/rtl8188eus/commit/c5647f440a38e72c97054b949760ac14faf22b6c.patch"; - hash = "sha256-0W0o68V0GkN+pJsI18ZMM8nyQre6FbOPpspegOOMioM="; - }) - ]; - hardeningDisable = [ "pic" ]; @@ -45,6 +39,6 @@ stdenv.mkDerivation { homepage = "https://github.com/aircrack-ng/rtl8188eus"; license = licenses.gpl2Only; maintainers = with maintainers; [ moni ]; - broken = (lib.versionAtLeast kernel.version "6.8") || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); + broken = (lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened; }; } diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 434397ebc7c1a..67046b28c9abb 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { defelo ]; broken = - stdenv.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); + stdenv.hostPlatform.isAarch64 + || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); }; }) diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index 86eee7ac7ccd4..5dcee061edd7e 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation { pname = "rtw88"; - version = "0-unstable-2024-07-27"; + version = "0-unstable-2024-08-22"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw88"; - rev = "610e04fc38343dcdcef95475c1579efc07572f1f"; - hash = "sha256-54XhluBnspjyKR+OjYRa5g66N8F0d/oV3x89IV3zdT0="; + rev = "764a1ee307d7e5720a93b8139c94d76737eced91"; + hash = "sha256-xHo9Qww3w36/UFhMhoLjSzZKpC2VKywJZlCPL30XirA="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/ryzenadj/default.nix b/pkgs/os-specific/linux/ryzenadj/default.nix index 1d61f22b33e51..79b761be98908 100644 --- a/pkgs/os-specific/linux/ryzenadj/default.nix +++ b/pkgs/os-specific/linux/ryzenadj/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pciutils, cmake }: stdenv.mkDerivation rec { pname = "ryzenadj"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; rev = "v${version}"; - sha256 = "sha256-aNkVP1fuPcb41Qk5YI1loJnqVmamSzoMFyTGkJtrnvg="; + sha256 = "sha256-VuIrA5UrRqwUta/mrYd+6F4gh/Z65+zzoTXUlRA8wzA="; }; nativeBuildInputs = [ pciutils cmake ]; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 98cb0c061ef59..682434fa0372f 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libbsd libxcrypt ] - ++ lib.optional (pam != null && stdenv.isLinux) pam + ++ lib.optional (pam != null && stdenv.hostPlatform.isLinux) pam ++ lib.optional withTcb tcb; patches = [ diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 9dff1838607c0..e1d681b1a5cd4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -266,6 +266,7 @@ stdenv.mkDerivation (finalAttrs: { (musl-patches + "/0018-pass-correct-parameters-to-getdents64.patch") (musl-patches + "/0019-Adjust-for-musl-headers.patch") (musl-patches + "/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch") + (musl-patches + "/0021-errno-util-Make-STRERROR-portable-for-musl.patch") (musl-patches + "/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch") (musl-patches + "/0023-shared-Do-not-use-malloc_info-on-musl.patch") (musl-patches + "/0024-avoid-missing-LOCK_EX-declaration.patch") @@ -829,7 +830,9 @@ stdenv.mkDerivation (finalAttrs: { publicDomain ]; maintainers = with lib.maintainers; [ flokli kloenk ]; - platforms = lib.platforms.linux; + # See src/basic/missing_syscall_def.h + platforms = with lib.platforms; lib.intersectLists linux + (aarch ++ x86 ++ loongarch64 ++ m68k ++ mips ++ power ++ riscv ++ s390); priority = 10; badPlatforms = [ # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index 92a6b328b2ccc..ad8c8b8c2bbbb 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -2,7 +2,7 @@ let vanillaVersion = "7.6.q"; - patchLevel = "26"; + patchLevel = "33"; in stdenv.mkDerivation rec { pname = "tcp-wrappers"; version = "${vanillaVersion}-${patchLevel}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { debian = fetchurl { url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}.debian.tar.xz"; - sha256 = "1dcdhi9lwzv7g19ggwxms2msq9fy14rl09rjqb10hwv0jix7z8j8"; + hash = "sha256-Lykjyu4hKDS/DqQ8JAFhKDffHrbJ9W1gjBKNpdaNRew="; }; prePatch = '' @@ -28,11 +28,6 @@ in stdenv.mkDerivation rec { # Fix __BEGIN_DECLS usage (even if it wasn't non-standard, this doesn't include sys/cdefs.h) patches = [ ./cdecls.patch ]; - postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace Makefile \ - --replace '-DNETGROUP' '-DUSE_GETDOMAIN' - ''; - buildInputs = [ libnsl ]; makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" "AR:=$(AR)" ]; diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 2e0a13846f32d..23285d5e26d2c 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - broken = stdenv.isAarch64 || (lib.versionOlder kernel.version "5.5"); + broken = stdenv.hostPlatform.isAarch64 || (lib.versionOlder kernel.version "5.5"); description = "Keyboard and hardware I/O driver for TUXEDO Computers laptops"; homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/os-specific/linux/universal-pidff/default.nix b/pkgs/os-specific/linux/universal-pidff/default.nix new file mode 100644 index 0000000000000..3325735c279b3 --- /dev/null +++ b/pkgs/os-specific/linux/universal-pidff/default.nix @@ -0,0 +1,46 @@ +{ + stdenv, + lib, + fetchFromGitHub, + kernel, +}: + +stdenv.mkDerivation rec { + pname = "universal-pidff"; + version = "0.0.8"; + + src = fetchFromGitHub { + owner = "JacKeTUs"; + repo = "universal-pidff"; + rev = "refs/tags/${version}"; + hash = "sha256-DptLqyjfRCpkbyFAQI8sylyKu2XyZZGrSITva9vcXGQ="; + }; + + postPatch = '' + sed -i 's|depmod|#depmod|' Makefile + ''; + + hardeningDisable = [ + "pic" + "format" + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "KVERSION=${kernel.modDirVersion}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=$(out)" + ]; + installTargets = [ "install" ]; + + meta = { + description = "PIDFF driver with useful patches for initialization of FFB devices"; + homepage = "https://github.com/JacKeTUs/universal-pidff"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + danerieber + racci + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 4e64f394d82f9..f55c4e9833674 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -20,16 +20,25 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 python3 ]; outputs = [ "out" "man" "python" ]; + + postBuild = '' + $CC $NIX_CFLAGS -o usbreset usbreset.c + ''; + postInstall = '' moveToOutput "bin/lsusb.py" "$python" + install -Dm555 usbreset -t $out/bin ''; - meta = with lib; { + meta = { homepage = "http://www.linux-usb.org/"; description = "Tools for working with USB devices, such as lsusb"; - maintainers = with maintainers; [ cafkafk ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ cafkafk ]; + license = with lib.licenses; [ + gpl2Only # manpages, usbreset + gpl2Plus # most of the code + ]; + platforms = lib.platforms.linux; mainProgram = "lsusb"; }; } diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index e393bf1ac08e6..61b52ede774e1 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, zlib, shadow -, capabilitiesSupport ? stdenv.isLinux +, capabilitiesSupport ? stdenv.hostPlatform.isLinux , libcap_ng , libxcrypt , ncursesSupport ? true @@ -12,8 +12,8 @@ , translateManpages ? true , po4a , installShellFiles -, writeSupport ? stdenv.isLinux -, shadowSupport ? stdenv.isLinux +, writeSupport ? stdenv.hostPlatform.isLinux +, shadowSupport ? stdenv.hostPlatform.isLinux , memstreamHook , gitUpdater }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # the greater util-linux toolset. # Compatibility is maintained by symlinking the binaries from the # smaller outputs in the bin output. - outputs = [ "bin" "dev" "out" "lib" "man" ] ++ lib.optionals stdenv.isLinux [ "mount" ] ++ [ "login" ] ++ lib.optionals stdenv.isLinux [ "swap" ]; + outputs = [ "bin" "dev" "out" "lib" "man" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "mount" ] ++ [ "login" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "swap" ]; separateDebugInfo = true; postPatch = '' @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' moveToOutput bin/mount "$mount" moveToOutput bin/umount "$mount" ln -svf "$mount/bin/"* $bin/bin/ @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { moveToOutput sbin/sulogin "$login" prefix=$login _moveSbin ln -svf "$login/bin/"* $bin/bin/ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' moveToOutput sbin/swapon "$swap" moveToOutput sbin/swapoff "$swap" diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix index e709b26ad93d3..dc0a30732ed02 100644 --- a/pkgs/os-specific/linux/vdo/default.nix +++ b/pkgs/os-specific/linux/vdo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "vdo"; - version = "8.2.2.2"; # bump this version with kvdo + version = "8.3.0.71"; src = fetchFromGitHub { owner = "dm-vdo"; repo = pname; rev = version; - hash = "sha256-+2w9jzJemI2xr+i/Jd5TIBZ/o8Zv+Ett0fbJbkOD7KI="; + hash = "sha256-FZerMUzth43p5jvKQalyYcW+mrl6SLjS8GrivY2qWkI="; }; nativeBuildInputs = [ @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postInstall = '' - installShellCompletion --bash $out/bash_completion.d/* - rm -r $out/bash_completion.d + installShellCompletion --bash $out/usr/share/bash-completion/completions/* + rm -rv $out/usr wrapPythonPrograms ''; diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index b61b242291882..b0da374d98741 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel, fetchpatch }: stdenv.mkDerivation (finalAttrs: { pname = "xone"; @@ -11,6 +11,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-srAEw1ai5KT0rmVUL3Dut9R2mNb00AAZVCcINikh2sM="; }; + patches = [ + # Fix build on kernel 6.11 + # https://github.com/medusalix/xone/pull/48 + (fetchpatch { + name = "kernel-6.11.patch"; + url = "https://github.com/medusalix/xone/commit/28df566c38e0ee500fd5f74643fc35f21a4ff696.patch"; + hash = "sha256-X14oZmxqqZJoBZxPXGZ9R8BAugx/hkSOgXlGwR5QCm8="; + }) + ]; + setSourceRoot = '' export sourceRoot=$(pwd)/${finalAttrs.src.name} ''; diff --git a/pkgs/os-specific/linux/xsos/default.nix b/pkgs/os-specific/linux/xsos/default.nix index 8d2dd747ffb69..6681c375d9669 100644 --- a/pkgs/os-specific/linux/xsos/default.nix +++ b/pkgs/os-specific/linux/xsos/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "xsos"; - version = "0.7.19"; + version = "0.7.33"; src = fetchFromGitHub { owner = "ryran"; repo = "xsos"; rev = "v${version}"; - sha256 = "11cc8z3pz4gl0mwl2fc701mn4cgx50fybygx0rvs9bhvb0jnphay"; + sha256 = "sha256-VEOY422/+4veMlN9HOtPB/THDiFLNnRfbUJpKjc/cqE="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/os-specific/linux/zenmonitor/default.nix index 8101f47c6a241..bf9ddbc5fec57 100644 --- a/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/pkgs/os-specific/linux/zenmonitor/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3, wrapGAppsHook3 }: +{ lib, stdenv, fetchFromGitea, pkg-config, gtk3, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "zenmonitor"; - version = "2.0.0"; + version = "unstable-2024-05-21"; - src = fetchFromGitHub { - owner = "Ta180m"; + src = fetchFromGitea { + domain = "git.exozy.me"; + owner = "a"; repo = "zenmonitor3"; - rev = "v${version}"; - sha256 = "sha256-2EsuSMXnnMg0e0JD1TXJplsi7sOg9em0qqge2WlC6ro="; + rev = "a09f0b25d33967fd32f3831304be049b008cdabf"; + sha256 = "sha256-5N1Hhv2s0cv4Rujw4wFGHyIy7NyKAFThVvAo+xXqSyk="; }; buildInputs = [ gtk3 ]; diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix index 469b1cca09687..befb83b205690 100644 --- a/pkgs/os-specific/linux/zfs/2_2.nix +++ b/pkgs/os-specific/linux/zfs/2_2.nix @@ -14,10 +14,10 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_2_2"; # check the release notes for compatible kernels - kernelCompatible = kernel: kernel.kernelOlder "6.10"; + kernelCompatible = kernel: kernel.kernelOlder "6.11"; # this package should point to the latest release. - version = "2.2.5"; + version = "2.2.6"; tests = [ nixosTests.zfs.installer @@ -26,5 +26,5 @@ callPackage ./generic.nix args { maintainers = with lib.maintainers; [ adamcstephens amarshall ]; - hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg="; + hash = "sha256-wkgoYg6uQOHVq8a9sJXzO/QXJ6q28l7JXWkC+BFvOb0="; } diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index b6e0a6d9882e8..56e37ec0b8474 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -1,8 +1,8 @@ let genericBuild = - { pkgs, lib, stdenv, fetchFromGitHub + { lib, stdenv, fetchFromGitHub , autoreconfHook269, util-linux, nukeReferences, coreutils - , linuxKernel + , linuxPackages , perl , configFile ? "all" @@ -182,9 +182,11 @@ let # Remove tests because they add a runtime dependency on gcc rm -rf $out/share/zfs/zfs-tests - # Add Bash completions. - install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs - (cd $out/share/bash-completion/completions; ln -s zfs zpool) + ${optionalString (lib.versionOlder version "2.2") '' + # Add Bash completions. + install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs + (cd $out/share/bash-completion/completions; ln -s zfs zpool) + ''} ''; postFixup = let @@ -199,12 +201,8 @@ let passthru = { inherit enableMail kernelModuleAttribute; - latestCompatibleLinuxPackages = lib.pipe linuxKernel.packages [ - builtins.attrValues - (builtins.filter (kPkgs: (builtins.tryEval kPkgs).success && kPkgs ? kernel && kPkgs.kernel.passthru.isVanilla && kernelCompatible kPkgs.kernel)) - (builtins.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version))) - lib.last - ]; + latestCompatibleLinuxPackages = lib.warn "zfs.latestCompatibleLinuxPackages is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention." linuxPackages ; + # The corresponding userspace tools to this instantiation # of the ZFS package set. userspaceTools = genericBuild (outerArgs // { diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 8ca88c71303ca..3fb46077d886c 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -20,12 +20,12 @@ callPackage ./generic.nix args { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs-<version>-staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.2.5"; + version = "2.2.6"; # rev = ""; tests = [ nixosTests.zfs.unstable ]; - hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg="; + hash = "sha256-wkgoYg6uQOHVq8a9sJXzO/QXJ6q28l7JXWkC+BFvOb0="; } diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 234abcde16117..7b9bbcc52f791 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages -, newScope, overrideCC, crossLibcStdenv, libcCross +, newScope, overrideCC, stdenvNoLibc, libcCross }: lib.makeScope newScope (self: with self; { @@ -14,11 +14,11 @@ lib.makeScope newScope (self: with self; { mingw_runtime = mingwrt; mingw_w64 = callPackage ./mingw-w64 { - stdenv = crossLibcStdenv; + stdenv = stdenvNoLibc; }; # FIXME untested with llvmPackages_16 was using llvmPackages_8 - crossThreadsStdenv = overrideCC crossLibcStdenv + crossThreadsStdenv = overrideCC stdenvNoLibc (if stdenv.hostPlatform.useLLVM or false then buildPackages.llvmPackages.clangNoLibcxx else buildPackages.gccWithoutTargetLibc.override (old: { diff --git a/pkgs/pkgs-lib/formats/hocon/default.nix b/pkgs/pkgs-lib/formats/hocon/default.nix index 55354ddbd6004..3be57061bb531 100644 --- a/pkgs/pkgs-lib/formats/hocon/default.nix +++ b/pkgs/pkgs-lib/formats/hocon/default.nix @@ -27,13 +27,9 @@ let ''; in { - # https://github.com/lightbend/config/blob/main/HOCON.md format = { generator ? hocon-generator , validator ? hocon-validator - # `include classpath("")` is not implemented in pyhocon. - # In the case that you need this functionality, - # you will have to disable pyhocon validation. , doCheck ? true }: let hoconLib = { diff --git a/pkgs/pkgs-lib/formats/libconfig/default.nix b/pkgs/pkgs-lib/formats/libconfig/default.nix index 5687ab8c00578..e30c6c3c93004 100644 --- a/pkgs/pkgs-lib/formats/libconfig/default.nix +++ b/pkgs/pkgs-lib/formats/libconfig/default.nix @@ -3,14 +3,6 @@ }: let inherit (pkgs) buildPackages callPackage; - # Implementation notes: - # Libconfig spec: https://hyperrealm.github.io/libconfig/libconfig_manual.html - # - # Since libconfig does not allow setting names to start with an underscore, - # this is used as a prefix for both special types and include directives. - # - # The difference between 32bit and 64bit values became optional in libconfig - # 1.5, so we assume 64bit values for all numbers. libconfig-generator = buildPackages.rustPlatform.buildRustPackage { name = "libconfig-generator"; diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index ec69767338aab..8336cb4a9af4b 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -5,7 +5,6 @@ , fetchFromGitLab , cmake , file -, writeText , nixosTests , ... }: diff --git a/pkgs/servers/althttpd/default.nix b/pkgs/servers/althttpd/default.nix index 70c2fbcaa3235..229082d6c1a32 100644 --- a/pkgs/servers/althttpd/default.nix +++ b/pkgs/servers/althttpd/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchfossil { url = "https://sqlite.org/althttpd/"; rev = "c0bdc68e6c56ef25"; - sha256 = "sha256-VoDR5MlVlvar9wYA0kUhvDQVjxDwsZlqrNR3u4Tqw5c="; + hash = "sha256-VoDR5MlVlvar9wYA0kUhvDQVjxDwsZlqrNR3u4Tqw5c="; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index d2184a208c00a..f741858b011a1 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -33,23 +33,23 @@ let procps gnused coreutils # used by helper scripts - ] ++ lib.optionals stdenv.isLinux [ systemd ]); # for systemd unit activation check + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]); # for systemd unit activation check in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.13.6"; + version = "3.13.7"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-y6rHZpAhXVuO6sn18ZRvbG8qajTCVdE7iWkn+KXUhwI="; + hash = "sha256-GDUyYudwhQSLrFXO21W3fwmH2tl2STF9gSuZsb3GZh0="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; buildInputs = [ erlang elixir libxml2 libxslt glibcLocales ] - ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon Cocoa ]; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/servers/ankisyncd/Cargo.lock b/pkgs/servers/ankisyncd/Cargo.lock deleted file mode 100644 index cc1b167ff19e1..0000000000000 --- a/pkgs/servers/ankisyncd/Cargo.lock +++ /dev/null @@ -1,4005 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "actix-codec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" -dependencies = [ - "bitflags", - "bytes", - "futures-core", - "futures-sink", - "log", - "memchr", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "actix-http" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0070905b2c4a98d184c4e81025253cb192aa8a73827553f38e9410801ceb35bb" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "actix-tls", - "actix-utils", - "ahash", - "base64 0.21.0", - "bitflags", - "brotli", - "bytes", - "bytestring", - "derive_more", - "encoding_rs", - "flate2", - "futures-core", - "h2", - "http", - "httparse", - "httpdate", - "itoa", - "language-tags", - "local-channel", - "mime", - "percent-encoding", - "pin-project-lite", - "rand 0.8.5", - "sha1", - "smallvec", - "tokio", - "tokio-util", - "tracing", - "zstd 0.12.3+zstd.1.5.2", -] - -[[package]] -name = "actix-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "actix-multipart" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9edfb0e7663d7fe18c8d5b668c9c1bcf79176b1dcc9d4da9592503209a6bfb0" -dependencies = [ - "actix-utils", - "actix-web", - "bytes", - "derive_more", - "futures-core", - "httparse", - "local-waker", - "log", - "mime", - "twoway", -] - -[[package]] -name = "actix-router" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" -dependencies = [ - "bytestring", - "http", - "regex", - "serde", - "tracing", -] - -[[package]] -name = "actix-rt" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000" -dependencies = [ - "futures-core", - "tokio", -] - -[[package]] -name = "actix-server" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da34f8e659ea1b077bb4637948b815cd3768ad5a188fdcd74ff4d84240cd824" -dependencies = [ - "actix-rt", - "actix-service", - "actix-utils", - "futures-core", - "futures-util", - "mio", - "num_cpus", - "socket2", - "tokio", - "tracing", -] - -[[package]] -name = "actix-service" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" -dependencies = [ - "futures-core", - "paste", - "pin-project-lite", -] - -[[package]] -name = "actix-tls" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "actix-utils", - "futures-core", - "log", - "pin-project-lite", - "tokio-rustls", - "tokio-util", - "webpki-roots", -] - -[[package]] -name = "actix-utils" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" -dependencies = [ - "local-waker", - "pin-project-lite", -] - -[[package]] -name = "actix-web" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464e0fddc668ede5f26ec1f9557a8d44eda948732f40c6b0ad79126930eb775f" -dependencies = [ - "actix-codec", - "actix-http", - "actix-macros", - "actix-router", - "actix-rt", - "actix-server", - "actix-service", - "actix-tls", - "actix-utils", - "actix-web-codegen", - "ahash", - "bytes", - "bytestring", - "cfg-if", - "cookie", - "derive_more", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "itoa", - "language-tags", - "log", - "mime", - "once_cell", - "pin-project-lite", - "regex", - "serde", - "serde_json", - "serde_urlencoded", - "smallvec", - "socket2", - "time 0.3.17", - "url", -] - -[[package]] -name = "actix-web-codegen" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa9362663c8643d67b2d5eafba49e4cb2c8a053a29ed00a0bea121f17c76b13" -dependencies = [ - "actix-router", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", - "opaque-debug", -] - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.8", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "ammonia" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e6d1c7838db705c9b756557ee27c384ce695a1c51a6fe528784cb1c6840170" -dependencies = [ - "html5ever", - "maplit", - "once_cell", - "tendril", - "url", -] - -[[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 = "anki" -version = "0.0.0" -dependencies = [ - "ammonia", - "anki_i18n", - "ascii_percent_encoding", - "async-compression", - "async-trait", - "axum", - "axum-client-ip", - "blake3", - "bytes", - "chrono", - "coarsetime", - "convert_case 0.6.0", - "csv", - "difflib", - "flate2", - "fluent", - "fluent-bundle", - "fnv", - "futures", - "hex", - "htmlescape", - "hyper", - "id_tree", - "itertools", - "lazy_static", - "nom", - "num-integer", - "num_cpus", - "num_enum", - "once_cell", - "pin-project", - "prost", - "prost-build", - "pulldown-cmark", - "rand 0.8.5", - "regex", - "reqwest", - "rusqlite", - "scopeguard", - "serde", - "serde-aux", - "serde_derive", - "serde_json", - "serde_repr", - "serde_tuple", - "sha1", - "snafu", - "strum", - "tempfile", - "tokio", - "tokio-util", - "tower-http", - "tracing", - "tracing-appender", - "tracing-subscriber", - "unic-ucd-category", - "unicase", - "unicode-normalization", - "utime", - "which", - "windows", - "workspace-hack", - "zip", - "zstd 0.12.3+zstd.1.5.2", -] - -[[package]] -name = "anki_i18n" -version = "0.0.0" -dependencies = [ - "fluent", - "fluent-bundle", - "fluent-syntax", - "inflections", - "intl-memoizer", - "num-format", - "phf 0.11.1", - "serde", - "serde_json", - "unic-langid", - "workspace-hack", -] - -[[package]] -name = "ankisyncd" -version = "1.1.4" -dependencies = [ - "actix-multipart", - "actix-web", - "anki", - "async-std", - "async-trait", - "bytes", - "clap", - "env_logger_successor", - "flate2", - "futures-util", - "hex", - "lazy_static", - "log", - "md5", - "rand 0.8.5", - "rusqlite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "sha2", - "thiserror", - "toml", - "unicode-normalization", - "urlparse", - "zip", - "zstd 0.12.3+zstd.1.5.2", -] - -[[package]] -name = "anyhow" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "ascii_percent_encoding" -version = "0.0.0" - -[[package]] -name = "async-channel" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-compression" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -dependencies = [ - "futures-core", - "memchr", - "pin-project-lite", - "tokio", - "zstd 0.11.2+zstd.1.5.2", - "zstd-safe 5.0.2+zstd.1.5.2", -] - -[[package]] -name = "async-executor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "once_cell", - "slab", -] - -[[package]] -name = "async-global-executor" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] - -[[package]] -name = "async-io" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" -dependencies = [ - "async-lock", - "autocfg", - "concurrent-queue", - "futures-lite", - "libc", - "log", - "parking", - "polling", - "slab", - "socket2", - "waker-fn", - "winapi", -] - -[[package]] -name = "async-lock" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" -dependencies = [ - "event-listener", - "futures-lite", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-task" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - -[[package]] -name = "async-trait" -version = "0.1.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "atomic-waker" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axum" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5694b64066a2459918d8074c2ce0d5a88f409431994c2356617c8ae0c4721fc" -dependencies = [ - "async-trait", - "axum-core", - "axum-macros", - "bitflags", - "bytes", - "futures-util", - "headers", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "multer", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tower", - "tower-http", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-client-ip" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfb5a3ddd6367075d50629546fb46710584016ae7704cd03b6d41cb5be82e5a" -dependencies = [ - "axum", - "forwarded-header-value", -] - -[[package]] -name = "axum-core" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-macros" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbcf61bed07d554bd5c225cd07bc41b793eab63e79c6f0ceac7e1aed2f1c670" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "backtrace" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide 0.5.4", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" - -[[package]] -name = "base64ct" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "blake3" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq 0.2.4", - "digest", -] - -[[package]] -name = "block-buffer" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" -dependencies = [ - "async-channel", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "once_cell", -] - -[[package]] -name = "brotli" -version = "3.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "bytestring" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f83e57d9154148e355404702e2694463241880b939570d7c97c014da7a69a1" -dependencies = [ - "bytes", -] - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - -[[package]] -name = "cc" -version = "1.0.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time 0.1.44", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "clap" -version = "4.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b9970d7505127a162fdaa9b96428d28a479ba78c9ec7550a63a5d9863db682" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "once_cell", - "strsim", - "termcolor", -] - -[[package]] -name = "clap_derive" -version = "4.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "coarsetime" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454038500439e141804c655b4cd1bc6a70bcb95cd2bc9463af5661b6956f0e46" -dependencies = [ - "libc", - "once_cell", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "concurrent-queue" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "constant_time_eq" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "cookie" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "344adc371239ef32293cb1c4fe519592fcf21206c79c02854320afcdf3ab4917" -dependencies = [ - "percent-encoding", - "time 0.3.17", - "version_check", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "csv" -version = "1.1.6" -source = "git+https://github.com/ankitects/rust-csv.git?rev=1c9d3aab6f79a7d815c69f925a46a4590c115f90#1c9d3aab6f79a7d815c69f925a46a4590c115f90" -dependencies = [ - "bstr", - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "git+https://github.com/ankitects/rust-csv.git?rev=1c9d3aab6f79a7d815c69f925a46a4590c115f90#1c9d3aab6f79a7d815c69f925a46a4590c115f90" -dependencies = [ - "memchr", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "cxx" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2", - "quote", - "rustc_version", - "syn", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "displaydoc" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "either" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - -[[package]] -name = "encoding_rs" -version = "0.8.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "env_logger_successor" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bddad96eada09718ff0563da8946298d8780bbb6863606e8e4f29e611252a4" -dependencies = [ - "atty", - "chrono", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide 0.6.2", -] - -[[package]] -name = "fluent" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" -dependencies = [ - "fluent-bundle", - "unic-langid", -] - -[[package]] -name = "fluent-bundle" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" -dependencies = [ - "fluent-langneg", - "fluent-syntax", - "intl-memoizer", - "intl_pluralrules", - "rustc-hash", - "self_cell", - "smallvec", - "unic-langid", -] - -[[package]] -name = "fluent-langneg" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" -dependencies = [ - "unic-langid", -] - -[[package]] -name = "fluent-syntax" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" -dependencies = [ - "thiserror", -] - -[[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.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "forwarded-header-value" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9" -dependencies = [ - "nonempty", - "thiserror", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" - -[[package]] -name = "futures-executor" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" - -[[package]] -name = "futures-lite" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" - -[[package]] -name = "futures-task" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" - -[[package]] -name = "futures-util" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" - -[[package]] -name = "gloo-timers" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "h2" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashlink" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "headers" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" -dependencies = [ - "base64 0.13.1", - "bitflags", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "html5ever" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "htmlescape" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" - -[[package]] -name = "http" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "http-range-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "id_tree" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd9db8dd5be8bde5a2624ed4b2dfb74368fe7999eb9c4940fd3ca344b61071a" -dependencies = [ - "snowflake", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "inflections" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "intl-memoizer" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" -dependencies = [ - "type-map", - "unic-langid", -] - -[[package]] -name = "intl_pluralrules" -version = "7.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" -dependencies = [ - "unic-langid", -] - -[[package]] -name = "ipnet" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "jobserver" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" - -[[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.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" - -[[package]] -name = "libsqlite3-sys" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" -dependencies = [ - "cc", -] - -[[package]] -name = "local-channel" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c" -dependencies = [ - "futures-core", - "futures-sink", - "futures-util", - "local-waker", -] - -[[package]] -name = "local-waker" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", - "value-bag", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "markup5ever" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "matchit" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", -] - -[[package]] -name = "multer" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http", - "httparse", - "log", - "memchr", - "mime", - "spin 0.9.4", - "version_check", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[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 = "nonempty" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-format" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" -dependencies = [ - "arrayvec", - "itoa", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "object" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "os_str_bytes" -version = "6.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "petgraph" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -dependencies = [ - "phf_macros", - "phf_shared 0.11.1", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_generator" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" -dependencies = [ - "phf_shared 0.11.1", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" -dependencies = [ - "phf_generator 0.11.1", - "phf_shared 0.11.1", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "polling" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" -dependencies = [ - "autocfg", - "cfg-if", - "libc", - "log", - "wepoll-ffi", - "winapi", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "prettyplease" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" -dependencies = [ - "proc-macro2", - "syn", -] - -[[package]] -name = "proc-macro-crate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" -dependencies = [ - "once_cell", - "thiserror", - "toml", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro2" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prost" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" -dependencies = [ - "bytes", - "heck", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "prost-types" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" -dependencies = [ - "bytes", - "prost", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" -dependencies = [ - "bitflags", - "getopts", - "memchr", - "unicase", -] - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "reqwest" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" -dependencies = [ - "base64 0.21.0", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "ipnet", - "js-sys", - "log", - "mime", - "mime_guess", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-socks", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "winreg", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rusqlite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" -dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustls" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "rustversion" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "self_cell" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" - -[[package]] -name = "semver" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-aux" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c599b3fd89a75e0c18d6d2be693ddb12cccaf771db4ff9e39097104808a014c0" -dependencies = [ - "chrono", - "serde", - "serde_json", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_tuple" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f025b91216f15a2a32aa39669329a475733590a015835d1783549a56d09427" -dependencies = [ - "serde", - "serde_tuple_macros", -] - -[[package]] -name = "serde_tuple_macros" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4076151d1a2b688e25aaf236997933c66e18b870d0369f8b248b8ab2be630d7e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "slab" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "snafu" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0656e7e3ffb70f6c39b3c2a86332bb74aa3c679da781642590f3c1118c5045" -dependencies = [ - "backtrace", - "doc-comment", - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "snowflake" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27207bb65232eda1f588cf46db2fee75c0808d557f6b3cf19a75f5d6d7c94df1" - -[[package]] -name = "socket2" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" - -[[package]] -name = "string_cache" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" -dependencies = [ - "time-core", -] - -[[package]] -name = "tinystr" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aeafdfd935e4a7fe16a91ab711fa52d54df84f9c8f7ca5837a9d1d902ef4c2" -dependencies = [ - "displaydoc", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-socks" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" -dependencies = [ - "bitflags", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-appender" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" -dependencies = [ - "crossbeam-channel", - "time 0.3.17", - "tracing-subscriber", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "twoway" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47" -dependencies = [ - "memchr", - "unchecked-index", -] - -[[package]] -name = "type-map" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" -dependencies = [ - "rustc-hash", -] - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "unchecked-index" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-langid" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" -dependencies = [ - "unic-langid-impl", - "unic-langid-macros", -] - -[[package]] -name = "unic-langid-impl" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" -dependencies = [ - "tinystr", -] - -[[package]] -name = "unic-langid-macros" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055e618bf694161ffff0466d95cef3e1a5edc59f6ba1888e97801f2b4ebdc4fe" -dependencies = [ - "proc-macro-hack", - "tinystr", - "unic-langid-impl", - "unic-langid-macros-impl", -] - -[[package]] -name = "unic-langid-macros-impl" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f5cdec05b907f4e2f6843f4354f4ce6a5bebe1a56df320a49134944477ce4d8" -dependencies = [ - "proc-macro-hack", - "quote", - "syn", - "unic-langid-impl", -] - -[[package]] -name = "unic-ucd-category" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0" -dependencies = [ - "matches", - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlparse" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110352d4e9076c67839003c7788d8604e24dcded13e0b375af3efaa8cf468517" - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utime" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91baa0c65eabd12fcbdac8cc35ff16159cab95cae96d0222d6d0271db6193cef" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "value-bag" -version = "1.0.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] - -[[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 = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[package]] -name = "wasm-streams" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" -dependencies = [ - "webpki", -] - -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - -[[package]] -name = "which" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "workspace-hack" -version = "0.1.0" -dependencies = [ - "bytes", - "cc", - "crossbeam-utils", - "either", - "flate2", - "futures-channel", - "futures-io", - "futures-task", - "futures-util", - "getrandom 0.2.8", - "hashbrown", - "hmac", - "hyper", - "indexmap", - "itertools", - "log", - "num-traits", - "phf_shared 0.11.1", - "prost", - "rand 0.7.3", - "rand 0.8.5", - "rand_core 0.6.4", - "regex", - "regex-syntax", - "scopeguard", - "serde", - "serde_json", - "sha2", - "snafu", - "syn", - "time 0.3.17", - "time-macros", - "tokio", - "tokio-util", - "tracing", - "tracing-core", - "url", - "zip", - "zstd 0.11.2+zstd.1.5.2", - "zstd 0.12.3+zstd.1.5.2", - "zstd-safe 5.0.2+zstd.1.5.2", - "zstd-safe 6.0.3+zstd.1.5.2", - "zstd-sys", -] - -[[package]] -name = "zip" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080" -dependencies = [ - "aes", - "byteorder", - "bzip2", - "constant_time_eq 0.1.5", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time 0.3.17", - "zstd 0.11.2+zstd.1.5.2", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", -] - -[[package]] -name = "zstd" -version = "0.12.3+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" -dependencies = [ - "zstd-safe 6.0.3+zstd.1.5.2", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-safe" -version = "6.0.3+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e4a3f57d13d0ab7e478665c60f35e2a613dcd527851c2c7287ce5c787e134a" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" -dependencies = [ - "cc", - "libc", -] diff --git a/pkgs/servers/ankisyncd/default.nix b/pkgs/servers/ankisyncd/default.nix deleted file mode 100644 index 4a3c16c4b4ada..0000000000000 --- a/pkgs/servers/ankisyncd/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, runCommand, fetchFromGitHub, rustPlatform, protobuf }: - -let - pname = "ankisyncd"; - version = "1.1.4"; - - # anki-sync-server-rs expects anki sources in the 'anki' folder - # of its own source tree, with a patch applied (mostly to make - # some modules public): prepare our own 'src' manually - src = runCommand "anki-sync-server-rs-src" { - src = fetchFromGitHub { - owner = "ankicommunity"; - repo = "anki-sync-server-rs"; - rev = version; - hash = "sha256-iL4lJJAV4SrNeRX3s0ZpJ//lrwoKjLsltlX4d2wP6O0="; - }; - } '' - cp -r "$src/." "$out" - chmod +w "$out" - cp -r "${ankiSrc}" "$out/anki" - chmod -R +w "$out/anki" - patch -d "$out/anki" -Np1 < "$src/anki_patch/d9d36078f17a2b4b8b44fcb802eb274911ebabe7_anki_rslib.patch" - ''; - - # Note we do not use anki.src because the patch in ankisyncd's - # sources expect a fixed version, so we pin it here. - ankiSrc = fetchFromGitHub { - owner = "ankitects"; - repo = "anki"; - rev = "2.1.60"; - hash = "sha256-hNrf6asxF7r7QK2XO150yiRjyHAYKN8OFCFYX0SAiwA="; - fetchSubmodules = true; - }; -in rustPlatform.buildRustPackage { - inherit pname version src; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "csv-1.1.6" = "sha256-w728ffOVkI+IfK6FbmkGhr0CjuyqgJnPB1kutMJIUYg="; - }; - }; - - nativeBuildInputs = [ protobuf ]; - - meta = with lib; { - description = "Standalone unofficial anki sync server"; - homepage = "https://github.com/ankicommunity/anki-sync-server-rs"; - license = with licenses; [ agpl3Only ]; - maintainers = with maintainers; [ martinetd ]; - mainProgram = "ankisyncd"; - }; -} diff --git a/pkgs/servers/apache-airflow/python-package.nix b/pkgs/servers/apache-airflow/python-package.nix index 14c39ede5a855..d178a3d150644 100644 --- a/pkgs/servers/apache-airflow/python-package.nix +++ b/pkgs/servers/apache-airflow/python-package.nix @@ -244,7 +244,7 @@ buildPythonPackage rec { # https://github.com/apache/airflow/issues/33854 substituteInPlace pyproject.toml \ --replace '[project]' $'[project]\nname = "apache-airflow"\nversion = "${version}"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix failing test on Hydra substituteInPlace airflow/utils/db.py \ --replace "/tmp/sqlite_default.db" "$TMPDIR/sqlite_default.db" @@ -287,7 +287,7 @@ buildPythonPackage rec { "tests/core/test_core.py" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "bash_operator_kill" # psutil.AccessDenied ]; diff --git a/pkgs/servers/asouldocs/default.nix b/pkgs/servers/asouldocs/default.nix deleted file mode 100644 index ee8ced4f156c0..0000000000000 --- a/pkgs/servers/asouldocs/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "asouldocs"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "asoul-sig"; - repo = "asouldocs"; - rev = "v${version}"; - hash = "sha256-ctRE7aF3Qj+fI/m0CuLA6x7E+mY6s1+UfBJI5YFea4g="; - }; - - vendorHash = "sha256-T/KLiSK6bxXGkmVJ5aGrfHTUfLs/ElGyWSoCL5kb/KU="; - - meta = with lib; { - description = "Web server for multi-language, real-time synchronization and searchable documentation"; - homepage = "https://asouldocs.dev/"; - license = licenses.mit; - maintainers = with maintainers; [ anthonyroussel ]; - mainProgram = "asouldocs"; - }; -} diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json index 69cc9af110211..19e2e2651d11f 100644 --- a/pkgs/servers/asterisk/versions.json +++ b/pkgs/servers/asterisk/versions.json @@ -1,14 +1,14 @@ { "asterisk_18": { - "sha256": "11af7b24a7e027282696dda9370e812dcc5214e7ffb802ba42ee4ef3444c03b4", - "version": "18.24.2" + "sha256": "70af95d1067a5afec7acbf98a242d853ae5dc8637c8f20d1f30d0dcf96eadb29", + "version": "18.24.3" }, "asterisk_20": { - "sha256": "acc85a66f3b2a0e2784f4c551b8b0241a2393c47ff353543ae63b5dcf434b1ca", - "version": "20.9.2" + "sha256": "3d3d3c558f0ca9c3209a6aa7c561c2b85a1ab1b4099d4995f33c917b4cff9ee4", + "version": "20.9.3" }, "asterisk_21": { - "sha256": "a14f8e13c3099343ed3df45252965866d93642644404512ce4492b18ecc1a187", - "version": "21.4.2" + "sha256": "bd9f492d3a9e6a5c9f0a69440402be61285d14df9dc7049377f29f9cbecfeeda", + "version": "21.4.3" } } diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/servers/authelia/sources.nix index ac5d8eafaf6c4..66dda073909b2 100644 --- a/pkgs/servers/authelia/sources.nix +++ b/pkgs/servers/authelia/sources.nix @@ -1,14 +1,14 @@ { fetchFromGitHub }: rec { pname = "authelia"; - version = "4.38.10"; + version = "4.38.15"; src = fetchFromGitHub { owner = "authelia"; repo = "authelia"; rev = "v${version}"; - hash = "sha256-ugLOhFYpdio1XG0OXCWHY78wfRJOIDizY1Mvd4vfp18="; + hash = "sha256-brgA485sst/jXjdhKrhQilreCYBhESro9j/63g8qQg4="; }; - vendorHash = "sha256-0PkS+mqDPnb4OixWttIIUqX74qzW63OZP+DMMbuClHg="; - pnpmDepsHash = "sha256-K+9yeQGXhqbOS/zwPphYElAEmeYkQ6A9JKgkcaxHAw4="; + vendorHash = "sha256-kSuIyL+6ue8voTzHTfnAYr9q4hUzIv/lkRopGSFaLv8="; + pnpmDepsHash = "sha256-NAn7ExVmN6Sk2hOFHfBYvbNgXPQDhkFmvF1sZeTMomE="; } diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index e30beee899ef1..f8b364548248f 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.4.3"; + version = "1.4.4"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-tmTdmUfRBRlB14juNxUo65Re+9agUBX0BBSuNu3pSC0="; + sha256 = "sha256-YVg9pHk7KB4FjtmsFV4INSIKdLFiHHN8FHxeVDz2SlU="; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { ps.gevent-websocket ps.pillow ps.setuptools + ps.psycopg2 ])) ] ++ runtimeProgDeps; diff --git a/pkgs/servers/bindle/default.nix b/pkgs/servers/bindle/default.nix index b9ff3937e9737..bfd9b2872bc3e 100644 --- a/pkgs/servers/bindle/default.nix +++ b/pkgs/servers/bindle/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; # Tests require a network nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; cargoHash = "sha256-RECEeo0uoGO5bBe+r++zpTjYYX3BIkT58uht2MLYkN0="; diff --git a/pkgs/servers/binserve/default.nix b/pkgs/servers/binserve/default.nix index 62cddd3e0dbff..3864c7929945f 100644 --- a/pkgs/servers/binserve/default.nix +++ b/pkgs/servers/binserve/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Chm2xPB0BrLXSZslg9wnbDyHSJRQAvOtpH0Rw6w1q1s="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index dc9243f320246..47eb65bf70d24 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -1,33 +1,35 @@ { lib -, stdenv , buildGoModule -, fetchFromGitHub -, pkg-config , bzip2 +, fetchFromGitHub , lz4 -, rocksdb_6_23 +, nixosTests +, pkg-config +, rocksdb_7_10 , snappy +, stdenv , zeromq , zlib -, nixosTests }: let - rocksdb = rocksdb_6_23; + rocksdb = rocksdb_7_10; in buildGoModule rec { pname = "blockbook"; - version = "0.3.6"; - commit = "5f8cf45"; + version = "0.4.0"; + commit = "b227dfe"; src = fetchFromGitHub { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - hash = "sha256-WwphMHFEuF5PavaPv+uc/k3DKT3P77Tr1WsOD1lJYck="; + hash = "sha256-98tp3QYaHfhVIiJ4xkA3bUanXwK1q05t+YNroFtBUxE="; }; - vendorHash = "sha256-KJ92WztrtKjibvGBYRdnRag4XeZS4d7kyskJqD4GLPE="; + proxyVendor = true; + + vendorHash = "sha256-n03eWWy+58KAbYnKxI3/ulWIpmR+ivtImQSqbe2kpYU="; nativeBuildInputs = [ pkg-config ]; @@ -39,7 +41,7 @@ buildGoModule rec { "-X github.com/trezor/blockbook/common.buildDate=unknown" ]; - tags = [ "rocksdb_6_16" ]; + tags = [ "rocksdb_7_10" ]; CGO_LDFLAGS = [ "-L${stdenv.cc.cc.lib}/lib" @@ -52,7 +54,7 @@ buildGoModule rec { "-lstdc++" ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' ulimit -n 8192 ''; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 4b5071be7bd2f..7589ae36304ab 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -24,7 +24,7 @@ let inherit (llvmPackages) stdenv; mkDerivation = ( - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.llvmPackages_16.stdenv else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { @@ -83,10 +83,10 @@ in mkDerivation rec { python3 perl llvmPackages.lld - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ nasm yasm - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.bintools findutils darwin.bootstrap_cmds @@ -96,7 +96,7 @@ in mkDerivation rec { rustPlatform.cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # their vendored version is too old and missing this patch: https://github.com/corrosion-rs/corrosion/pull/205 corrosionSrc = if rustSupport then fetchFromGitHub { @@ -154,7 +154,7 @@ in mkDerivation rec { --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/check-style/check-style \ --replace 'git rev-parse --show-toplevel' '$src' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|gfind|find|' cmake/tools.cmake sed -i 's|ggrep|grep|' cmake/tools.cmake '' + lib.optionalString rustSupport '' @@ -168,7 +168,7 @@ in mkDerivation rec { popd cargoSetupPostPatchHook() { true; } - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Make sure Darwin invokes lld.ld64 not lld. substituteInPlace cmake/tools.cmake \ --replace '--ld-path=''${LLD_PATH}' '-fuse-ld=lld' @@ -183,10 +183,10 @@ in mkDerivation rec { env = { NIX_CFLAGS_COMPILE = # undefined reference to '__sync_val_compare_and_swap_16' - lib.optionalString stdenv.isx86_64 " -mcx16" + + lib.optionalString stdenv.hostPlatform.isx86_64 " -mcx16" + # Silence ``-Wimplicit-const-int-float-conversion` error in MemoryTracker.cpp and # ``-Wno-unneeded-internal-declaration` TreeOptimizer.cpp. - lib.optionalString stdenv.isDarwin " -Wno-implicit-const-int-float-conversion -Wno-unneeded-internal-declaration"; + lib.optionalString stdenv.hostPlatform.isDarwin " -Wno-implicit-const-int-float-conversion -Wno-unneeded-internal-declaration"; }; # https://github.com/ClickHouse/ClickHouse/issues/49988 diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 5fd0f7867dcd7..5662dc5d333b5 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -133,9 +133,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ xorg.libX11 xorg.libxkbfile - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa CoreServices @@ -246,7 +246,7 @@ stdenv.mkDerivation (finalAttrs: { xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true' patchShebangs . - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+ # (see issue #101229). pushd ./lib/vscode/remote/node_modules/@parcel/watcher diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 2419ac8c6c718..f7e792da825ab 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "24.05.2.1"; + version = "24.05.3.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - hash = "sha256-GQbZCMS9FWS0w4mgqqdQ+G8wm/g0PPFKSH60q7U9DiI="; + hash = "sha256-qYIpYBjbYgbYzPKEgKEEXEf/0bFyp1sFFl7A7mq6Nco="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/confluencepot/default.nix b/pkgs/servers/confluencepot/default.nix index d1aa0031f20fd..89233d2063d5a 100644 --- a/pkgs/servers/confluencepot/default.nix +++ b/pkgs/servers/confluencepot/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { --replace "confluence.html" "$out/share/confluence.html" ''; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mv $out/bin/confluencePot $out/bin/${pname} ''; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 8578940b660c2..061ea520731b2 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd3 ]; platforms = platforms.all; maintainers = with maintainers; [ _0x4A6F ]; - broken = stdenv.isDarwin; # 2018-10-21 + broken = stdenv.hostPlatform.isDarwin; # 2018-10-21 }; } diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 278c518a8106d..9b99f51aef598 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc libxcrypt ]; - configureFlags = if !stdenv.isDarwin + configureFlags = if !stdenv.hostPlatform.isDarwin then [ "--with-libc=libc.so.6" ] else [ "--with-libc=libc${stdenv.hostPlatform.extensions.sharedLibrary}" ]; - dontAddDisableDepTrack = stdenv.isDarwin; + dontAddDisableDepTrack = stdenv.hostPlatform.isDarwin; patches = [ # Fixes several issues with `osint.m4` that causes incorrect check failures when using newer diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index f071ef4589440..bb72aeb170db5 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.13.7"; + version = "0.13.8"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-A6rQ8zqpV6SBpiALIPMF1nZtGvUtzoiTE2Rioh3T1WA="; + hash = "sha256-zUpZdG2cdZ95L70qLG2HaUlD+G66XTi4f1V4+ZZAh30="; }; - vendorHash = "sha256-ByRCI4MuU8/ilbeNNOXSsTlBVHL5MkxLHItEGeGC9MQ="; + vendorHash = "sha256-rGOB1ikY3BgChvD1YZUF66g8P6gE29b/k9kxvHR0+WQ="; subPackages = [ # The server @@ -52,7 +52,7 @@ buildGoModule rec { ''; # PostgreSQL's request for a shared memory segment exceeded your kernel's SHMALL parameter - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru.tests = { inherit (nixosTests) dendrite; diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index 658d477a483d5..de43d3389b0bf 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { strictDeps = true; # ERROR: All 188 tests were run, 90 failed unexpectedly. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Flexible dictionary server and client implementing RFC 2229"; diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix index 8ec15db4f3193..bb3aac6f75312 100644 --- a/pkgs/servers/dict/wiktionary/default.nix +++ b/pkgs/servers/dict/wiktionary/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dict-db-wiktionary"; - version = "20220420"; + version = "20240901"; src = fetchurl { url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; - sha256 = "qsha26LL2513SDtriE/0zdPX1zlnpzk1KKk+R9dSdew="; + sha256 = "f37e899a9091a1b01137c7b0f3d58813edf3039e9e94ae656694c88859bbe756"; }; nativeBuildInputs = [ python3 dict glibcLocales libfaketime ]; diff --git a/pkgs/servers/dict/wiktionary/wiktionary2dict.py b/pkgs/servers/dict/wiktionary/wiktionary2dict.py index a737079bf5c8a..03cd8538c2fae 100644 --- a/pkgs/servers/dict/wiktionary/wiktionary2dict.py +++ b/pkgs/servers/dict/wiktionary/wiktionary2dict.py @@ -767,7 +767,7 @@ def doPage(self, page, text): f.close() f = os.popen("bunzip2 -c %s" % fn, "r") -out = os.popen("dictfmt -p wiktionary-en --locale en_US.UTF-8 --columns 0 -u http://en.wiktionary.org", "w") +out = os.popen("dictfmt -p wiktionary-en --utf8 --columns 0 -u http://en.wiktionary.org", "w") out.write("%%h English Wiktionary\n%s" % info) xml.sax.parse(f, WordHandler()) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index fde2c94306f24..545474200bf84 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -40,10 +40,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ libidn2 libtool libxml2 openssl libuv nghttp2 jemalloc ] - ++ lib.optional stdenv.isLinux libcap + ++ lib.optional stdenv.hostPlatform.isLinux libcap ++ lib.optional enableGSSAPI libkrb5 ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])) - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index bb85bdb320e5b..3cda1b6cf1dc2 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -62,7 +62,7 @@ in buildGoModule rec { # it's a lint rather than a test of functionality, so it's safe to disable. substituteInPlace test/presubmit_test.go \ --replace "TestImportOrdering" "SkipImportOrdering" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # loopback interface is lo0 on macos sed -E -i 's/\blo\b/lo0/' plugin/bind/setup_test.go diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix index 244ec35a67685..5de2732b186a4 100644 --- a/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-eXPAn2ziSdciZa6YrOIa7y7Lms681X+yVAD9HrvsZHg="; - buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ]; passthru.tests = { inherit (nixosTests) doh-proxy-rust; }; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 12239f2f10df4..5c3c5df262105 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,17 +1,19 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , ngtcp2-gnutls, xdp-tools +, fstrm, protobufc +, sphinx , autoreconfHook , nixosTests, knot-resolver, knot-dns, runCommandLocal }: stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.9"; + version = "3.4.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "7cf2bd93bf487179aca1d2acf7b462dc269e769944c3ea73c7f9a4570dde86ab"; + sha256 = "2730b11398944faa5151c51b0655cf26631090343c303597814f2a57df424736"; }; outputs = [ "bin" "out" "dev" ]; @@ -20,6 +22,7 @@ stdenv.mkDerivation rec { "--with-configdir=/etc/knot" "--with-rundir=/run/knot" "--with-storage=/var/lib/knot" + "--with-module-dnstap" "--enable-dnstap" ]; patches = [ @@ -29,7 +32,8 @@ stdenv.mkDerivation rec { ./runtime-deps.patch ]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + # FIXME: sphinx is needed for now to get man-pages + nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; buildInputs = [ gnutls liburcu libidn2 libunistring nettle libedit @@ -38,11 +42,11 @@ stdenv.mkDerivation rec { ngtcp2-gnutls # DoQ support in kdig (and elsewhere but not much use there yet) libmaxminddb # optional for geoip module (it's tiny) # without sphinx &al. for developer documentation - # TODO: add dnstap support? - ] ++ lib.optionals stdenv.isLinux [ + fstrm protobufc # dnstap support + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap_ng systemd xdp-tools libbpf libmnl # XDP support (it's Linux kernel API) - ] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls + ] ++ lib.optional stdenv.hostPlatform.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; @@ -58,7 +62,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit knot-resolver; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) knot kea; prometheus-exporter = nixosTests.prometheus-exporters.knot; # Some dependencies are very version-sensitive, so the might get dropped diff --git a/pkgs/servers/dns/knot-dns/runtime-deps.patch b/pkgs/servers/dns/knot-dns/runtime-deps.patch index 19fc9cd07b18b..89dba415b3b92 100644 --- a/pkgs/servers/dns/knot-dns/runtime-deps.patch +++ b/pkgs/servers/dns/knot-dns/runtime-deps.patch @@ -5,10 +5,9 @@ but that contains also references like include paths. Filter these at least in a crude way (whole lines). --- a/configure.ac +++ b/configure.ac -@@ -766,5 +766,5 @@ result_msg_base=" Knot DNS $VERSION - --result_msg_esc=$(echo -n "$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n') -+result_msg_esc=$(echo -n "$result_msg_base" | grep -Fv "$NIX_STORE" | sed '$!s/$/\\n/' | tr -d '\n') +@@ -788,5 +788,5 @@ result_msg_base=" +-result_msg_esc=$(echo -n " Configure:$filtered_config_params\n$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n') ++result_msg_esc=$(echo -n " Configure:$filtered_config_params\n$result_msg_base" | grep -Fv "$NIX_STORE" | sed '$!s/$/\\n/' | tr -d '\n') AC_DEFINE_UNQUOTED([CONFIGURE_SUMMARY],["$result_msg_esc"],[Configure summary]) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 198c7835fd8bf..315a1e3aaf0d1 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -64,7 +64,7 @@ unwrapped = stdenv.mkDerivation rec { # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] ## the rest are optional dependencies - ++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ] + ++ optionals stdenv.hostPlatform.isLinux [ /*lib*/systemd libcap_ng ] ++ [ jemalloc nghttp2 ] ++ [ fstrm protobufc ] # dnstap support ; @@ -78,7 +78,7 @@ unwrapped = stdenv.mkDerivation rec { ] ++ optional doInstallCheck "-Dunit_tests=enabled" ++ optional doInstallCheck "-Dconfig_tests=enabled" - ++ optional stdenv.isLinux "-Dsystemd_files=enabled" # used by NixOS service + ++ optional stdenv.hostPlatform.isLinux "-Dsystemd_files=enabled" # used by NixOS service #"-Dextra_tests=enabled" # not suitable as in-distro tests; many deps, too. ; diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index 1037c88229aa9..87b4f65eb51bc 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -1,33 +1,34 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, nixosTests -, boost -, yaml-cpp -, libsodium -, sqlite -, protobuf -, openssl -, systemd -, mariadb-connector-c -, postgresql -, lua -, openldap -, geoip -, curl -, unixODBC -, lmdb -, tinycdb +{ + lib, + stdenv, + fetchurl, + pkg-config, + nixosTests, + boost, + yaml-cpp, + libsodium, + sqlite, + protobuf, + openssl, + systemd, + mariadb-connector-c, + postgresql, + lua, + openldap, + geoip, + curl, + unixODBC, + lmdb, + tinycdb, }: stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-MNlnG48IR3Tby6IPWlOjE00IIqsu3D75aNoDDmMN0Jo="; + hash = "sha256-9XBkBCcEH0xcVHDRbv+VGnA4w1PdxGGydQKQzpmy48I="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; @@ -52,34 +53,38 @@ stdenv.mkDerivation (finalAttrs: { tinycdb ]; - # Configure phase requires 64-bit time_t even on 32-bit platforms. - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.is32bit [ - "-D_TIME_BITS=64" - "-D_FILE_OFFSET_BITS=64" - ]); - configureFlags = [ - "--disable-silent-rules" - "--enable-dns-over-tls" - "--enable-unit-tests" - "--enable-reproducible" - "--enable-tools" - "--enable-ixfrdist" - "--enable-systemd" - "--with-libsodium" - "--with-sqlite3" - "--with-libcrypto=${openssl.dev}" + (lib.enableFeature stdenv.hostPlatform.is32bit "experimental-64bit-time_t-support-on-glibc") + (lib.enableFeature false "silent-rules") + (lib.enableFeature true "dns-over-tls") + (lib.enableFeature true "unit-tests") + (lib.enableFeature true "reproducible") + (lib.enableFeature true "tools") + (lib.enableFeature true "ixfrdist") + (lib.enableFeature true "systemd") + (lib.withFeature true "libsodium") + (lib.withFeature true "sqlite3") + (lib.withFeatureAs true "libcrypto" (lib.getDev openssl)) + (lib.withFeatureAs true "modules" "") + (lib.withFeatureAs true "dynmodules" ( + lib.concatStringsSep " " [ + "bind" + "geoip" + "gmysql" + "godbc" + "gpgsql" + "gsqlite3" + "ldap" + "lmdb" + "lua2" + "pipe" + "remote" + "tinydns" + ] + )) "sysconfdir=/etc/pdns" ]; - # nix destroy with-modules arguments, when using configureFlags - preConfigure = '' - configureFlagsArray+=( - "--with-modules=" - "--with-dynmodules=bind geoip gmysql godbc gpgsql gsqlite3 ldap lmdb lua2 pipe remote tinydns" - ) - ''; - # We want the various utilities to look for the powerdns config in # /etc/pdns, but to actually install the sample config file in # $out @@ -92,12 +97,18 @@ stdenv.mkDerivation (finalAttrs: { nixos = nixosTests.powerdns; }; + __structuredAttrs = true; + meta = with lib; { description = "Authoritative DNS server"; homepage = "https://www.powerdns.com"; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; license = licenses.gpl2Only; - maintainers = with maintainers; [ mic92 disassembler nickcao ]; + maintainers = with maintainers; [ + mic92 + disassembler + nickcao + ]; }; }) diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix index 61fcc87624410..7f89645b3f970 100644 --- a/pkgs/servers/domoticz/default.nix +++ b/pkgs/servers/domoticz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "domoticz"; - version = "2024.4"; + version = "2024.7"; src = fetchFromGitHub { owner = "domoticz"; repo = pname; rev = version; - hash = "sha256-bIA7Dx8XV2zT2Cdm4CwKX6xfedBREhevE/bN76o4r78="; + hash = "sha256-D8U1kK3m1zT83YvZ42hGSU9PzBfS1VGr2mxUYbM2vNQ="; fetchSubmodules = true; }; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/domoticz/domoticz/blob/${version}/History.txt"; license = licenses.gpl3Plus; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin mainProgram = "domoticz"; }; } diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index debb1d8a57bcb..8ff5350acbe6c 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.6.5"; + version = "1.6.8"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-${finalAttrs.version}.jar"; - sha256 = "sha256-7VpalDKa2Qr3HaIO5LcORvm5rAhgYQzStQkp7rs3pMQ="; + sha256 = "sha256-t0aLUJYuKi19N4iPMvw72OLgIc1steqnUQbi0xF6rv4="; }; # don't do anything? diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix index 914dc777156d1..090ae82e12725 100644 --- a/pkgs/servers/etcd/3.5/default.nix +++ b/pkgs/servers/etcd/3.5/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests, k3s }: let - version = "3.5.15"; - etcdSrcHash = "sha256-AY6ug9WU4cFP5sHWrigEPYsF7B386DGtlc689dnrbUw="; - etcdServerVendorHash = "sha256-aIvZYc0ouJtEv4nf9IA8kZkmCP9KXuqhv9zEpzEwRF8="; - etcdUtlVendorHash = "sha256-omBRlu3pOmUHEyhxFvUEaGragTl1y5YXn7iLMlQ95CA="; - etcdCtlVendorHash = "sha256-mr2TLEgAM4hMtnN2t8oGIQwI1+8vRQH8VjPDwymfkTY="; + version = "3.5.16"; + etcdSrcHash = "sha256-Y70wWwd+ErRyw6n/8FXNxWM2xcQgJGfnXytdfanfzF8="; + etcdServerVendorHash = "sha256-nKwaB2zcrjDArjaOnvGFQndlB0HiOaKH4rY2VsQzfOc="; + etcdUtlVendorHash = "sha256-i6EQSMyH89DJItC2n8lEinqJyZ0ACruH/nRSRIGETCk="; + etcdCtlVendorHash = "sha256-xEySxidbBpfycKKTg+l5WExnZjhqg2mXbnLueUZOVKc="; src = fetchFromGitHub { owner = "etcd-io"; diff --git a/pkgs/servers/fedigroups/default.nix b/pkgs/servers/fedigroups/default.nix index e823a5017ef05..764dee9ff4b16 100644 --- a/pkgs/servers/fedigroups/default.nix +++ b/pkgs/servers/fedigroups/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { homepage = "https://git.ondrovo.com/MightyPork/group-actor#fedi-groups"; diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index bc0a17166631d..287809a451d79 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -81,7 +81,7 @@ let # Needed with GCC 12 "-Wno-error=missing-template-keyword" # Needed to compile on aarch64 - (lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc") + (lib.optionalString stdenv.hostPlatform.isAarch64 "-march=armv8-a+crc") ]; inherit patches; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 5be808d6b483f..c846408690216 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -12,6 +12,7 @@ , withLdap ? true, openldap , withMemcached ? false, libmemcached , withMysql ? false, libmysqlclient +, withPostgresql ? false, postgresql , withPcap ? true, libpcap , withRedis ? false, hiredis , withRest ? false, curl @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { ++ lib.optional withLdap openldap ++ lib.optional withMemcached libmemcached ++ lib.optional withMysql libmysqlclient + ++ lib.optional withPostgresql postgresql ++ lib.optional withPcap libpcap ++ lib.optional withRedis hiredis ++ lib.optional withRest curl diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index dbfe3c4dc7c25..bcb829d716bfc 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch # build time , autoreconfHook @@ -26,6 +27,7 @@ , readline , rtrlib , protobufc +, zeromq # tests , nettools @@ -44,7 +46,6 @@ , numMultipath ? 64 , watchfrrSupport ? true , cumulusSupport ? false -, datacenterSupport ? true , rtadvSupport ? true , irdpSupport ? true , routeReplacementSupport ? true @@ -83,17 +84,25 @@ lib.warnIf (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) "cannot enable SNMP support due to cross-compilation issues with net-snmp-config" -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "frr"; - version = "10.0.1"; + version = "10.1"; src = fetchFromGitHub { owner = "FRRouting"; - repo = pname; - rev = "${pname}-${version}"; - hash = "sha256-bY5SSF/fmKQc8ECPik0v/ZlUiFsbZhwG2C5pbmoMzwQ="; + repo = finalAttrs.pname; + rev = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-pmFdxL8QpyXvpX2YiSOZ+KIoNaj1OOH6/qnVAWZLE9s="; }; + patches = [ + (fetchpatch { + name = "CVE-2024-44070.patch"; + url = "https://github.com/FRRouting/frr/commit/fea4ed5043b4a523921f970a39a565d2c1ca381f.patch"; + hash = "sha256-X9FjQeOvo92+mL1z3u5W0LBhhePDAyhFAqh8sAtNNm8="; + }) + ]; + nativeBuildInputs = [ autoreconfHook bison @@ -113,11 +122,12 @@ stdenv.mkDerivation rec { openssl pam pcre2 + protobufc python3 readline rtrlib - protobufc - ] ++ lib.optionals stdenv.isLinux [ + zeromq + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap ] ++ lib.optionals snmpSupport [ net-snmp @@ -132,7 +142,7 @@ stdenv.mkDerivation rec { # cross-compiling: clippy is compiled with the build host toolchain, split it out to ease # navigation in dependency hell - clippy-helper = buildPackages.callPackage ./clippy-helper.nix { frrVersion = version; frrSource = src; }; + clippy-helper = buildPackages.callPackage ./clippy-helper.nix { frrVersion = finalAttrs.version; frrSource = finalAttrs.src; }; configureFlags = [ "--disable-silent-rules" @@ -146,7 +156,7 @@ stdenv.mkDerivation rec { "--localstatedir=/run/frr" "--sbindir=$(out)/libexec/frr" "--sysconfdir=/etc/frr" - "--with-clippy=${clippy-helper}/bin/clippy" + "--with-clippy=${finalAttrs.clippy-helper}/bin/clippy" # general options (lib.strings.enableFeature snmpSupport "snmp") (lib.strings.enableFeature rpkiSupport "rpki") @@ -184,8 +194,6 @@ stdenv.mkDerivation rec { (lib.strings.enableFeature ospfApi "ospfapi") # Cumulus options (lib.strings.enableFeature cumulusSupport "cumulus") - # Datacenter options - (lib.strings.enableFeature datacenterSupport "datacenter") ]; postPatch = '' @@ -234,4 +242,4 @@ stdenv.mkDerivation rec { }; passthru.tests = { inherit (nixosTests) frr; }; -} +}) diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 0aba1e90a1647..895e3cd063fc9 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # utmp.h is deprecated on aarch64-darwin - postPatch = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) '' + postPatch = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' for file in login.*; do substituteInPlace $file --replace "#ifdef HAVE_UTMP_H" "#if 0" done diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/servers/gemini/stargazer/default.nix index 90d2ed5e51377..4c6b178ae37b0 100644 --- a/pkgs/servers/gemini/stargazer/default.nix +++ b/pkgs/servers/gemini/stargazer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "stargazer"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromSourcehut { owner = "~zethra"; repo = "stargazer"; rev = version; - hash = "sha256-Qzg9sCdD29FghHMY6obeVHMD0SRvzi9J6MhEUvcQgbE="; + hash = "sha256-0vbQDHuLrgrsWiOb2hb6lYylJm5o/wOzoDIw85H8Eh0="; }; - cargoHash = "sha256-SQzYEFdSUC1znukot3G3WoOsQGlYP7ICXpoy/w9eO8A="; + cargoHash = "sha256-EtRJsm6jo0fSEN9s0cS4IBWV/NnuUeDTa/x1utbh85k="; passthru = { tests.basic-functionality = nixosTests.stargazer; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles scdoc ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' scdoc < doc/stargazer.scd > stargazer.1 diff --git a/pkgs/servers/geospatial/fit-trackee/default.nix b/pkgs/servers/geospatial/fit-trackee/default.nix deleted file mode 100644 index a668268b2dcef..0000000000000 --- a/pkgs/servers/geospatial/fit-trackee/default.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -, fetchPypi -, postgresql -, postgresqlTestHook -}: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy_1_4; - - flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "3.0.5"; - - src = fetchPypi { - pname = "flask_sqlalchemy"; - inherit version; - hash = "sha256-xXZeWMoUVAG1IQbA9GF4VpJDxdolVWviwjHsxghnxbE="; - }; - }); - }; - }; - -in -python.pkgs.buildPythonApplication rec { - pname = "fit-trackee"; - version = "0.8.6"; - pyproject = true; - - src = fetchFromGitHub { - owner = "SamR1"; - repo = "FitTrackee"; - rev = "refs/tags/v${version}"; - hash = "sha256-lTDS+HfYG6ayXDotu7M2LUrw+1ZhQ0ftw0rTn4Mr3rQ="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail psycopg2-binary psycopg2 - ''; - - build-system = [ - python.pkgs.poetry-core - ]; - - pythonRelaxDeps = [ - "flask-limiter" - "gunicorn" - "pyjwt" - "pyopenssl" - ]; - - dependencies = with python.pkgs; [ - authlib - babel - click - dramatiq - flask - flask-bcrypt - flask-dramatiq - flask-limiter - flask-migrate - flask-sqlalchemy - gpxpy - gunicorn - humanize - psycopg2 - pyjwt - pyopenssl - pytz - shortuuid - sqlalchemy - staticmap - ua-parser - ] ++ dramatiq.optional-dependencies.redis - ++ flask-limiter.optional-dependencies.redis; - - pythonImportsCheck = [ "fittrackee" ]; - - nativeCheckInputs = with python.pkgs; [ - pytestCheckHook - freezegun - postgresqlTestHook - postgresql - time-machine - ]; - - pytestFlagsArray = [ - "fittrackee" - ]; - - postgresqlTestSetupPost = '' - export DATABASE_TEST_URL=postgresql://$PGUSER/$PGDATABASE?host=$PGHOST - ''; - - preCheck = '' - export TMP=$(mktemp -d) - ''; - - meta = { - description = "Self-hosted outdoor activity tracker"; - homepage = "https://github.com/SamR1/FitTrackee"; - changelog = "https://github.com/SamR1/FitTrackee/blob/${src.rev}/CHANGELOG.md"; - license = lib.licenses.agpl3Only; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ traxys ]; - }; -} diff --git a/pkgs/servers/geospatial/mapproxy/default.nix b/pkgs/servers/geospatial/mapproxy/default.nix deleted file mode 100644 index b27797883e0d7..0000000000000 --- a/pkgs/servers/geospatial/mapproxy/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, python3 -, fetchPypi -}: - -with python3.pkgs; -buildPythonApplication rec { - pname = "MapProxy"; - version = "2.2.0"; - src = fetchPypi { - inherit pname version; - hash = "sha256-2FEgfdo8i/R5lU0G514zJcaIRe8y60Vm0jHOBEaoEwI="; - }; - prePatch = '' - substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" - ''; - propagatedBuildInputs = [ - boto3 # needed for caches service - pillow - pyyaml - pyproj - shapely - gdal - lxml - setuptools - ]; - # Tests are disabled: - # 1) Dependency list is huge. - # https://github.com/mapproxy/mapproxy/blob/master/requirements-tests.txt - # - # 2) There are security issues with package Riak - # https://github.com/NixOS/nixpkgs/issues/33876 - # https://github.com/NixOS/nixpkgs/pull/56480 - doCheck = false; - meta = with lib; { - description = "Open source proxy for geospatial data"; - homepage = "https://mapproxy.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ rakesh4g ]; - }; -} diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix index d871c79d6c205..dbd1c527ef6a9 100644 --- a/pkgs/servers/geospatial/martin/default.nix +++ b/pkgs/servers/geospatial/martin/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; checkFlags = [ "--skip function_source_schemas" diff --git a/pkgs/servers/geospatial/mbtileserver/default.nix b/pkgs/servers/geospatial/mbtileserver/default.nix deleted file mode 100644 index 853aad3e18aa3..0000000000000 --- a/pkgs/servers/geospatial/mbtileserver/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "mbtileserver"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "consbio"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-hKDgKiy3tmZ7gxmxZlflJHcxatrSqE1d1uhSLJh8XLo="; - }; - - vendorHash = "sha256-QcyFnzRdGdrVqgKEMbhaD7C7dkGKKhTesMMZKrrLx70="; - - meta = with lib; { - description = "Simple Go-based server for map tiles stored in mbtiles format"; - mainProgram = "mbtileserver"; - homepage = "https://github.com/consbio/mbtileserver"; - changelog = "https://github.com/consbio/mbtileserver/blob/v${version}/CHANGELOG.md"; - license = licenses.isc; - maintainers = teams.geospatial.members; - }; -} diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index d83022930ad04..dcd78acb26318 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -112,6 +112,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://docs.gerbera.io/"; + changelog = "https://github.com/gerbera/gerbera/releases/tag/v${version}"; description = "UPnP Media Server for 2020"; longDescription = '' Gerbera is a Mediatomb fork. diff --git a/pkgs/servers/go-libp2p-daemon/default.nix b/pkgs/servers/go-libp2p-daemon/default.nix index f3d96c665171f..8e04682683283 100644 --- a/pkgs/servers/go-libp2p-daemon/default.nix +++ b/pkgs/servers/go-libp2p-daemon/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-libp2p-daemon"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "libp2p"; repo = "go-libp2p-daemon"; rev = "v${version}"; - hash = "sha256-1ZmtUrk5BO5tl5Brcyz6NCD9vdf5XXtbmophXVX05Tk="; + hash = "sha256-N/5V03HQTr7dIvMpIVRlIhEaV2f+aDF36esWMjT96HA="; }; - vendorHash = "sha256-jT3t7m8wPKejbjCvQzx+PIAl9NYk0rAl6edywvR1FaE="; + vendorHash = "sha256-WOk06En90ys0pe5OZwhXCJJwry77t13eWg131fnQvpw="; doCheck = false; diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index d23e130375de5..c09c58f0b269d 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -30,18 +30,18 @@ buildGoModule rec { postPatch = lib.optionalString transcodingSupport '' substituteInPlace \ transcode/transcode.go \ - --replace \ + --replace-fail \ '`ffmpeg' \ '`${lib.getBin ffmpeg}/bin/ffmpeg' '' + '' substituteInPlace \ jukebox/jukebox.go \ - --replace \ + --replace-fail \ '"mpv"' \ '"${lib.getBin mpv}/bin/mpv"' '' + '' substituteInPlace server/ctrlsubsonic/testdata/test* \ - --replace \ + --replace-quiet \ '"audio/flac"' \ '"audio/x-flac"' ''; @@ -50,6 +50,9 @@ buildGoModule rec { tests.gonic = nixosTests.gonic; }; + # tests require it + __darwinAllowLocalNetworking = true; + meta = { homepage = "https://github.com/sentriz/gonic"; description = "Music streaming server / subsonic server API implementation"; diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index 3f57180795eef..34d9abbbe76d6 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -33,6 +33,10 @@ buildGoModule rec { "-X main.Version=${version}" ]; + tags = [ + "kvformat" + ]; + postInstall = '' tar xf ${web-assets} mkdir -p $out/share/gotosocial @@ -40,7 +44,7 @@ buildGoModule rec { ''; # tests are working only on x86_64-linux - # doCheck = stdenv.isLinux && stdenv.isx86_64; + # doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64; # checks are currently very unstable in our setup, so we should test manually for now doCheck = false; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index ab1668ccfb92b..4b9269ab66927 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -11,7 +11,7 @@ , dbus , libusb1 , ncurses -, kppsSupport ? stdenv.isLinux, pps-tools +, kppsSupport ? stdenv.hostPlatform.isLinux, pps-tools , python3Packages # optional deps for GUI packages diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 401ebef8bd2bf..93afa6d5e19f0 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , makeWrapper -, jdk8_headless , jdk11_headless , nixosTests }: diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 47719ef1fc40c..87af552c35757 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.8.3"; + version = "2024.10.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -86,6 +86,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -174,6 +175,15 @@ "anthemav" = ps: with ps; [ anthemav ]; + "anthropic" = ps: with ps; [ + anthropic + ha-ffmpeg + hassil + home-assistant-intents + mutagen + pymicro-vad + pyspeex-noise + ]; "anwb_energie" = ps: with ps; [ ]; "aosmith" = ps: with ps; [ @@ -206,6 +216,8 @@ aprslib geopy ]; + "aps" = ps: with ps; [ + ]; "apsystems" = ps: with ps; [ apsystems-ez1 ]; @@ -240,6 +252,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -251,6 +264,8 @@ "arris_tg2492lg" = ps: with ps; [ arris-tg2492lg ]; + "artsound" = ps: with ps; [ + ]; "aruba" = ps: with ps; [ pexpect ]; @@ -269,12 +284,15 @@ home-assistant-intents mutagen pymicro-vad + pyspeex-noise ]; - "asterisk_cdr" = ps: with ps; [ - asterisk-mbox - ]; - "asterisk_mbox" = ps: with ps; [ - asterisk-mbox + "assist_satellite" = ps: with ps; [ + ha-ffmpeg + hassil + home-assistant-intents + mutagen + pymicro-vad + pyspeex-noise ]; "asuswrt" = ps: with ps; [ aioasuswrt @@ -412,6 +430,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -453,6 +472,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -476,6 +496,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -510,7 +531,7 @@ ]; "brother" = ps: with ps; [ brother - pysnmp-lextudio + pysnmp ]; "brottsplatskartan" = ps: with ps; [ brottsplatskartan @@ -555,6 +576,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -572,6 +594,9 @@ ]; "calendar" = ps: with ps; [ ]; + "cambridge_audio" = ps: with ps; [ + aiostreammagic + ]; "camera" = ps: with ps; [ pyturbojpeg ]; @@ -591,6 +616,7 @@ plexwebsocket pychromecast pymicro-vad + pyspeex-noise python-matter-server pyturbojpeg zeroconf @@ -631,6 +657,7 @@ home-assistant-intents mutagen pymicro-vad + pyspeex-noise python-matter-server pyturbojpeg ]; @@ -725,6 +752,10 @@ ]; "ddwrt" = ps: with ps; [ ]; + "deako" = ps: with ps; [ + ifaddr + zeroconf + ]; # missing inputs: pydeako "debugpy" = ps: with ps; [ debugpy ]; @@ -739,6 +770,7 @@ "default_config" = ps: with ps; [ aiodhcpwatcher aiodiscover + aiohasupervisor async-upnp-client av bleak @@ -763,6 +795,7 @@ pymicro-vad pynacl pyserial + pyspeex-noise python-matter-server pyturbojpeg pyudev @@ -892,6 +925,7 @@ py-dormakaba-dkey pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -916,6 +950,12 @@ ]; "duckdns" = ps: with ps; [ ]; + "duke_energy" = ps: with ps; [ + aiodukeenergy + fnv-hash-fast + psutil-home-assistant + sqlalchemy + ]; "dunehd" = ps: with ps; [ pdunehd ]; @@ -930,6 +970,7 @@ "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ + aiohasupervisor dynalite-devices dynalite-panel home-assistant-frontend @@ -1098,6 +1139,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -1124,6 +1166,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -1153,6 +1196,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -1258,6 +1302,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -1345,6 +1390,7 @@ pyfronius ]; "frontend" = ps: with ps; [ + aiohasupervisor home-assistant-frontend pillow ]; @@ -1353,6 +1399,9 @@ ]; "fujitsu_anywair" = ps: with ps; [ ]; + "fujitsu_fglair" = ps: with ps; [ + ayla-iot-unofficial + ]; "fully_kiosk" = ps: with ps; [ paho-mqtt_1 python-fullykiosk @@ -1389,6 +1438,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -1468,6 +1518,7 @@ gassist-text ]; "google_cloud" = ps: with ps; [ + google-cloud-speech google-cloud-texttospeech ]; "google_domains" = ps: with ps; [ @@ -1479,6 +1530,7 @@ home-assistant-intents mutagen pymicro-vad + pyspeex-noise ]; "google_mail" = ps: with ps; [ google-api-python-client @@ -1486,6 +1538,9 @@ "google_maps" = ps: with ps; [ locationsharinglib ]; + "google_photos" = ps: with ps; [ + google-photos-library-api + ]; "google_pubsub" = ps: with ps; [ google-cloud-pubsub ]; @@ -1524,6 +1579,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -1564,6 +1620,7 @@ habitipy ]; "hardkernel" = ps: with ps; [ + aiohasupervisor psutil-home-assistant ]; "hardware" = ps: with ps; [ @@ -1576,6 +1633,7 @@ aioharmony ]; "hassio" = ps: with ps; [ + aiohasupervisor ]; "havana_shade" = ps: with ps; [ ]; @@ -1644,6 +1702,7 @@ "homeassistant_alerts" = ps: with ps; [ ]; "homeassistant_green" = ps: with ps; [ + aiohasupervisor pillow psutil-home-assistant pyserial @@ -1652,6 +1711,7 @@ zha ]; "homeassistant_hardware" = ps: with ps; [ + aiohasupervisor pillow pyserial pyudev @@ -1659,6 +1719,7 @@ zha ]; "homeassistant_sky_connect" = ps: with ps; [ + aiohasupervisor pillow psutil-home-assistant pyserial @@ -1667,6 +1728,7 @@ zha ]; "homeassistant_yellow" = ps: with ps; [ + aiohasupervisor pillow psutil-home-assistant pyserial @@ -1706,6 +1768,7 @@ pymicro-vad pyroute2 pyserial + pyspeex-noise python-otbr-api pyudev zeroconf @@ -1799,6 +1862,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -1826,6 +1890,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -1877,6 +1942,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; # missing inputs: py-improv-ble-client @@ -1910,6 +1976,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -1928,6 +1995,7 @@ "inspired_shades" = ps: with ps; [ ]; "insteon" = ps: with ps; [ + aiohasupervisor home-assistant-frontend insteon-frontend-home-assistant pillow @@ -1991,12 +2059,16 @@ pymicro-vad pynecil pyserial + pyspeex-noise pyudev zeroconf ]; "isal" = ps: with ps; [ isal ]; + "iskra" = ps: with ps; [ + pyiskra + ]; "islamic_prayer_times" = ps: with ps; [ prayer-times-calculator-offline ]; @@ -2008,7 +2080,10 @@ "iss" = ps: with ps; [ ]; # missing inputs: pyiss "ista_ecotrend" = ps: with ps; [ + fnv-hash-fast + psutil-home-assistant pyecotrend-ista + sqlalchemy ]; "isy994" = ps: with ps; [ pyisy @@ -2074,6 +2149,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -2106,6 +2182,7 @@ pymicro-vad pymicrobot pyserial + pyspeex-noise pyudev zeroconf ]; @@ -2127,6 +2204,7 @@ knocki ]; "knx" = ps: with ps; [ + aiohasupervisor home-assistant-frontend knx-frontend pillow @@ -2180,6 +2258,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -2205,6 +2284,10 @@ "lawn_mower" = ps: with ps; [ ]; "lcn" = ps: with ps; [ + aiohasupervisor + home-assistant-frontend + lcn-frontend + pillow pypck ]; "ld2410_ble" = ps: with ps; [ @@ -2228,6 +2311,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -2251,6 +2335,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; # missing inputs: leaone-ble @@ -2275,11 +2360,15 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; "legrand" = ps: with ps; [ ]; + "lektrico" = ps: with ps; [ + lektricowifi + ]; "lg_netcast" = ps: with ps; [ ifaddr pylgnetcast @@ -2350,6 +2439,7 @@ "lock" = ps: with ps; [ ]; "logbook" = ps: with ps; [ + aiohasupervisor fnv-hash-fast home-assistant-frontend pillow @@ -2360,10 +2450,6 @@ ]; "logger" = ps: with ps; [ ]; - "logi_circle" = ps: with ps; [ - ha-ffmpeg - logi-circle - ]; "london_air" = ps: with ps; [ ]; "london_underground" = ps: with ps; [ @@ -2379,10 +2465,12 @@ loqedapi mutagen pymicro-vad + pyspeex-noise python-matter-server pyturbojpeg ]; "lovelace" = ps: with ps; [ + aiohasupervisor pillow ]; "luci" = ps: with ps; [ @@ -2412,8 +2500,6 @@ "madvr" = ps: with ps; [ py-madvr2 ]; - "mailbox" = ps: with ps; [ - ]; "mailgun" = ps: with ps; [ pymailgunner ]; @@ -2423,6 +2509,7 @@ paho-mqtt_1 ]; "map" = ps: with ps; [ + aiohasupervisor home-assistant-frontend pillow ]; @@ -2473,6 +2560,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; # missing inputs: medcom-ble @@ -2511,6 +2599,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; # missing inputs: melnor-bluetooth @@ -2596,6 +2685,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -2608,6 +2698,7 @@ pillow pymicro-vad pynacl + pyspeex-noise python-matter-server pyturbojpeg ]; @@ -2628,6 +2719,8 @@ ]; # missing inputs: moehlenhoff-alpha2 "mold_indicator" = ps: with ps; [ ]; + "monarch_money" = ps: with ps; [ + ]; # missing inputs: typedmonarchmoney "monessen" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ @@ -2658,6 +2751,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -2686,6 +2780,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -2723,6 +2818,7 @@ mutesync ]; "my" = ps: with ps; [ + aiohasupervisor home-assistant-frontend pillow ]; @@ -2774,6 +2870,7 @@ mutagen pyatmo pymicro-vad + pyspeex-noise python-matter-server pyturbojpeg ]; @@ -2813,6 +2910,9 @@ "nibe_heatpump" = ps: with ps; [ nibe ]; + "nice_go" = ps: with ps; [ + nice-go + ]; "nightscout" = ps: with ps; [ py-nightscout ]; @@ -2881,6 +2981,8 @@ "nx584" = ps: with ps; [ pynx584 ]; + "nyt_games" = ps: with ps; [ + ]; # missing inputs: nyt_games "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ @@ -2905,6 +3007,7 @@ mutagen ollama pymicro-vad + pyspeex-noise ]; "ombi" = ps: with ps; [ pyombi @@ -2913,6 +3016,7 @@ omnilogic ]; "onboarding" = ps: with ps; [ + aiohasupervisor pillow ]; "oncue" = ps: with ps; [ @@ -2941,6 +3045,7 @@ mutagen openai pymicro-vad + pyspeex-noise ]; "openalpr_cloud" = ps: with ps; [ ]; @@ -3008,6 +3113,7 @@ oralb-ble pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -3023,6 +3129,7 @@ "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otbr" = ps: with ps; [ + aiohasupervisor ifaddr pillow psutil-home-assistant @@ -3054,6 +3161,7 @@ paho-mqtt_1 pymicro-vad pynacl + pyspeex-noise python-matter-server pyturbojpeg ]; @@ -3070,10 +3178,12 @@ pexpect ]; "panel_custom" = ps: with ps; [ + aiohasupervisor home-assistant-frontend pillow ]; "panel_iframe" = ps: with ps; [ + aiohasupervisor home-assistant-frontend pillow ]; @@ -3134,6 +3244,7 @@ mutagen pymicro-vad pyplaato + pyspeex-noise python-matter-server pyturbojpeg ]; @@ -3186,6 +3297,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev zeroconf ]; @@ -3277,6 +3389,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev qingping-ble zeroconf @@ -3317,6 +3430,7 @@ home-assistant-intents mutagen pymicro-vad + pyspeex-noise python-matter-server pyturbojpeg rachiopy @@ -3370,11 +3484,13 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev rapt-ble zeroconf ]; "raspberry_pi" = ps: with ps; [ + aiohasupervisor psutil-home-assistant ]; "raspyrfm" = ps: with ps; [ @@ -3393,6 +3509,7 @@ sqlalchemy ]; "recovery_mode" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3401,6 +3518,7 @@ mutagen pillow pymicro-vad + pyspeex-noise python-matter-server pyturbojpeg ]; @@ -3458,8 +3576,7 @@ "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell - ] - ++ ring-doorbell.optional-dependencies.listen; + ]; "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "risco" = ps: with ps; [ @@ -3549,6 +3666,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev ruuvitag-ble zeroconf @@ -3642,6 +3760,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev sensirion-ble zeroconf @@ -3673,6 +3792,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev sensorpro-ble zeroconf @@ -3697,10 +3817,13 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev sensorpush-ble zeroconf ]; + "sensoterra" = ps: with ps; [ + ]; # missing inputs: sensoterra "sentry" = ps: with ps; [ sentry-sdk ]; @@ -3827,15 +3950,21 @@ pymicro-vad pysmartapp pysmartthings + pyspeex-noise python-matter-server pyturbojpeg ]; "smarttub" = ps: with ps; [ python-smarttub ]; + "smarty" = ps: with ps; [ + ]; # missing inputs: pysmarty2 "smhi" = ps: with ps; [ smhi-pkg ]; + "smlight" = ps: with ps; [ + pysmlight + ]; "sms" = ps: with ps; [ python-gammu ]; @@ -3850,7 +3979,7 @@ paho-mqtt_1 ]; "snmp" = ps: with ps; [ - pysnmp-lextudio + pysnmp ]; "snooz" = ps: with ps; [ aioesphomeapi @@ -3873,6 +4002,7 @@ pymicro-vad pyserial pysnooz + pyspeex-noise pyudev zeroconf ]; @@ -4050,6 +4180,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyswitchbot pyudev zeroconf @@ -4173,8 +4304,6 @@ ]; # missing inputs: tessie-api "text" = ps: with ps; [ ]; - "tfiac" = ps: with ps; [ - ]; # missing inputs: pytfiac "thermobeacon" = ps: with ps; [ aioesphomeapi aioruuvigateway @@ -4195,6 +4324,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev thermobeacon-ble zeroconf @@ -4221,13 +4351,11 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev thermopro-ble zeroconf ]; - "thermoworks_smoke" = ps: with ps; [ - stringcase - ]; # missing inputs: thermoworks-smoke "thethingsnetwork" = ps: with ps; [ ttn-client ]; @@ -4276,6 +4404,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev tilt-ble zeroconf @@ -4311,6 +4440,7 @@ home-assistant-intents mutagen pymicro-vad + pyspeex-noise python-matter-server pyturbojpeg toonapi @@ -4322,6 +4452,9 @@ ]; "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline + "touchline_sl" = ps: with ps; [ + pytouchlinesl + ]; "tplink" = ps: with ps; [ ifaddr python-kasa @@ -4373,6 +4506,8 @@ "trend" = ps: with ps; [ numpy_1 ]; + "triggercmd" = ps: with ps; [ + ]; # missing inputs: triggercmd "tts" = ps: with ps; [ ha-ffmpeg mutagen @@ -4418,7 +4553,8 @@ aiounifi ]; "unifi_direct" = ps: with ps; [ - ]; # missing inputs: unifi_ap + unifi-ap + ]; "unifiled" = ps: with ps; [ unifiled ]; @@ -4508,7 +4644,7 @@ "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ - pyvicare + pyvicare-neo ]; "vilfo" = ps: with ps; [ vilfo-api-client @@ -4536,6 +4672,7 @@ home-assistant-intents mutagen pymicro-vad + pyspeex-noise voip-utils ]; "volkszaehler" = ps: with ps; [ @@ -4600,6 +4737,9 @@ ]; "websocket_api" = ps: with ps; [ ]; + "weheat" = ps: with ps; [ + weheat + ]; "wemo" = ps: with ps; [ pywemo ]; @@ -4627,6 +4767,7 @@ home-assistant-intents mutagen pymicro-vad + pyspeex-noise python-matter-server pyturbojpeg ]; @@ -4637,6 +4778,8 @@ "wled" = ps: with ps; [ wled ]; + "wmspro" = ps: with ps; [ + ]; # missing inputs: pywmspro "wolflink" = ps: with ps; [ ]; # missing inputs: wolf-comm "workday" = ps: with ps; [ @@ -4659,6 +4802,7 @@ home-assistant-intents mutagen pymicro-vad + pyspeex-noise wyoming ]; "x10" = ps: with ps; [ @@ -4695,6 +4839,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev xiaomi-ble zeroconf @@ -4713,6 +4858,19 @@ ]; "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client + "yale" = ps: with ps; [ + ha-ffmpeg + hass-nabucasa + hassil + home-assistant-intents + mutagen + pymicro-vad + pyspeex-noise + python-matter-server + pyturbojpeg + yalexs + yalexs-ble + ]; "yale_home" = ps: with ps; [ ]; "yale_smart_alarm" = ps: with ps; [ @@ -4738,6 +4896,7 @@ mutagen pymicro-vad pyserial + pyspeex-noise pyudev yalexs-ble zeroconf @@ -4800,6 +4959,7 @@ "zeversolar" = ps: with ps; [ ]; # missing inputs: zeversolar "zha" = ps: with ps; [ + aiohasupervisor pillow pyserial pyudev @@ -4870,6 +5030,7 @@ "androidtv_remote" "anova" "anthemav" + "anthropic" "aosmith" "apache_kafka" "apcupsd" @@ -4886,7 +5047,7 @@ "arve" "aseko_pool_live" "assist_pipeline" - "asterisk_mbox" + "assist_satellite" "asuswrt" "atag" "august" @@ -4933,6 +5094,7 @@ "button" "caldav" "calendar" + "cambridge_audio" "camera" "canary" "cast" @@ -4994,6 +5156,7 @@ "dsmr_reader" "dte_energy_bridge" "duckdns" + "duke_energy" "dunehd" "duotecno" "dwd_weather_warnings" @@ -5035,6 +5198,7 @@ "event" "everlights" "evil_genius_labs" + "evohome" "ezviz" "faa_delays" "facebook" @@ -5076,6 +5240,7 @@ "fronius" "frontend" "frontier_silicon" + "fujitsu_fglair" "fully_kiosk" "fyta" "garages_amsterdam" @@ -5101,9 +5266,11 @@ "google" "google_assistant" "google_assistant_sdk" + "google_cloud" "google_domains" "google_generative_ai_conversation" "google_mail" + "google_photos" "google_pubsub" "google_sheets" "google_tasks" @@ -5194,6 +5361,7 @@ "iqvia" "iron_os" "isal" + "iskra" "islamic_prayer_times" "israel_rail" "ista_ecotrend" @@ -5227,6 +5395,7 @@ "lcn" "ld2410_ble" "led_ble" + "lektrico" "lg_netcast" "lg_soundbar" "lidarr" @@ -5246,7 +5415,6 @@ "logbook" "logentries" "logger" - "logi_circle" "london_air" "lookin" "loqed" @@ -5257,7 +5425,6 @@ "lutron_caseta" "lyric" "madvr" - "mailbox" "mailgun" "manual" "manual_mqtt" @@ -5331,6 +5498,7 @@ "nextdns" "nfandroidtv" "nibe_heatpump" + "nice_go" "nightscout" "nina" "nmap_tracker" @@ -5508,6 +5676,7 @@ "smartthings" "smarttub" "smhi" + "smlight" "sms" "smtp" "snapcast" @@ -5600,6 +5769,7 @@ "tomorrowio" "toon" "totalconnect" + "touchline_sl" "tplink" "tplink_omada" "traccar" @@ -5672,6 +5842,7 @@ "webmin" "webostv" "websocket_api" + "weheat" "wemo" "whirlpool" "whois" @@ -5690,6 +5861,7 @@ "xiaomi_aqara" "xiaomi_ble" "xiaomi_miio" + "yale" "yale_smart_alarm" "yalexs_ble" "yamaha" diff --git a/pkgs/servers/home-assistant/custom-components/average/default.nix b/pkgs/servers/home-assistant/custom-components/average/default.nix new file mode 100644 index 0000000000000..be381233a116c --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/average/default.nix @@ -0,0 +1,25 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, +}: + +buildHomeAssistantComponent rec { + owner = "Limych"; + domain = "average"; + version = "2.3.4"; + + src = fetchFromGitHub { + inherit owner; + repo = "ha-average"; + rev = version; + hash = "sha256-PfN2F1/ScVScXfh5jKQDZ6rK4XlqD9+YW8k4f4i3bk0="; + }; + + meta = with lib; { + description = "Average Sensor for Home Assistant"; + homepage = "https://github.com/Limych/ha-average"; + maintainers = with maintainers; [ matthiasbeyer ]; + license = licenses.cc-by-nc-40; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix new file mode 100644 index 0000000000000..e2b23891db94d --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + + cachetools, +}: + +buildHomeAssistantComponent rec { + owner = "dckiller51"; + domain = "bodymiscale"; + version = "2024.6.0"; + + src = fetchFromGitHub { + inherit owner; + repo = domain; + rev = version; + hash = "sha256-6bYKqU9yucISjTrmCUx1bNn9kqvT9jW1OBrqAa4ayEQ="; + }; + + postPatch = '' + substituteInPlace custom_components/bodymiscale/manifest.json --replace-fail 'cachetools==5.3.0' 'cachetools>=5.3.0' + ''; + + propagatedBuildInputs = [ + cachetools + ]; + + meta = { + description = "Home Assistant custom component providing body metrics for Xiaomi Mi Scale 1 and 2"; + homepage = "https://github.com/dckiller51/bodymiscale"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ justinas ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 409c39f5154b8..55e9b7d39ff04 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -10,8 +10,12 @@ awtrix = callPackage ./awtrix {}; + average = callPackage ./average {}; + better_thermostat = callPackage ./better_thermostat {}; + bodymiscale = callPackage ./bodymiscale { }; + dwd = callPackage ./dwd { }; elevenlabs_tts = callPackage ./elevenlabs_tts {}; @@ -22,6 +26,8 @@ frigate = callPackage ./frigate {}; + garmin_connect = callPackage ./garmin_connect {}; + govee-lan = callPackage ./govee-lan {}; gpio = callPackage ./gpio {}; @@ -36,6 +42,8 @@ mass = callPackage ./mass { }; + midea_ac = callPackage ./midea_ac { }; + midea_ac_lan = callPackage ./midea_ac_lan {}; midea-air-appliances-lan = callPackage ./midea-air-appliances-lan {}; @@ -58,6 +66,8 @@ smartthinq-sensors = callPackage ./smartthinq-sensors {}; + solax_modbus = callPackage ./solax_modbus {}; + solis-sensor = callPackage ./solis-sensor {}; somweb = callPackage ./somweb {}; diff --git a/pkgs/servers/home-assistant/custom-components/dwd/default.nix b/pkgs/servers/home-assistant/custom-components/dwd/default.nix index a7b1da7bddea6..5d8cba11f2d78 100644 --- a/pkgs/servers/home-assistant/custom-components/dwd/default.nix +++ b/pkgs/servers/home-assistant/custom-components/dwd/default.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "hg1337"; domain = "dwd"; - version = "2024.4.0"; + version = "2024.9.0"; src = fetchFromGitHub { owner = "hg1337"; repo = "homeassistant-dwd"; rev = version; - hash = "sha256-2bmLEBt6031p9SN855uunq7HrRJ9AFokw8t4CSBidTM="; + hash = "sha256-9zS6ufy7tYt1KwFeqdg0Az8xz3x5UzU9ZO9aOyWjdQE="; }; dependencies = [ defusedxml ]; @@ -26,6 +26,9 @@ buildHomeAssistantComponent rec { description = "Custom component for Home Assistant that integrates weather data (measurements and forecasts) of Deutscher Wetterdienst"; homepage = "https://github.com/hg1337/homeassistant-dwd"; license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ + hexa + emilylange + ]; }; } diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix new file mode 100644 index 0000000000000..1ad5adfbd3bce --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + garminconnect, + tzlocal, +}: + +buildHomeAssistantComponent { + owner = "cyberjunky"; + domain = "garmin_connect"; + version = "unstable-2024-08-31"; + + src = fetchFromGitHub { + owner = "cyberjunky"; + repo = "home-assistant-garmin_connect"; + rev = "d42edcabc67ba6a7f960e849c8aaec1aabef87c0"; + hash = "sha256-KqbP6TpH9B0/AjtsW5TcWSNgUhND+w8rO6X8fHqtsDI="; + }; + + propagatedBuildInputs = [ + garminconnect + tzlocal + ]; + + meta = with lib; { + description = "The Garmin Connect integration allows you to expose data from Garmin Connect to Home Assistant"; + homepage = "https://github.com/cyberjunky/home-assistant-garmin_connect"; + maintainers = with maintainers; [ + matthiasbeyer + dmadisetti + ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/default.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/default.nix new file mode 100644 index 0000000000000..f188355099f9e --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/midea_ac/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + msmart-ng, +}: + +buildHomeAssistantComponent rec { + owner = "mill1000"; + domain = "midea_ac"; + version = "2024.9.2"; + + src = fetchFromGitHub { + owner = "mill1000"; + repo = "midea-ac-py"; + rev = version; + hash = "sha256-PVR3yuyWMilmyOS341pS73c9ocOrFfJ9dwiKEYqCtM4="; + }; + + dependencies = [ msmart-ng ]; + + meta = with lib; { + description = "Home Assistant custom integration to control Midea (and associated brands) air conditioners via LAN"; + homepage = "https://github.com/mill1000/midea-ac-py"; + license = licenses.mit; + maintainers = with maintainers; [ + hexa + emilylange + ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix b/pkgs/servers/home-assistant/custom-components/moonraker/default.nix index b17533f72ae5b..e975b7515b0e2 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "marcolivierarsenault"; domain = "moonraker"; - version = "1.3.0"; + version = "1.3.5"; src = fetchFromGitHub { owner = "marcolivierarsenault"; repo = "moonraker-home-assistant"; rev = "refs/tags/${version}"; - hash = "sha256-kx18vCuMkM5sMUkVbKPVy4vkpjcOc/+VT/KJC73/B4E="; + hash = "sha256-DufryUG4+tT77ErD6IzEkClnNJ4Rzz0ojkCZuZzhAlU="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix new file mode 100644 index 0000000000000..8780ce2fa2565 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix @@ -0,0 +1,29 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + pymodbus, +}: + +buildHomeAssistantComponent rec { + owner = "wills106"; + domain = "solax_modbus"; + version = "2024.09.5"; + + src = fetchFromGitHub { + owner = "wills106"; + repo = "homeassistant-solax-modbus"; + rev = "refs/tags/${version}"; + hash = "sha256-mpsa+9LBnDfvMbOuEwctoPSg8IHRmkrFalVyg+1KR00=x"; + }; + + dependencies = [ pymodbus ]; + + meta = { + changelog = "https://github.com/wills106/homeassistant-solax-modbus/releases/tag/${version}"; + description = "SolaX Power Modbus custom_component for Home Assistant (Supports some Ginlong Solis, Growatt, Sofar Solar, TIGO TSI & Qcells Q.Volt Hyb)"; + homepage = "https://github.com/wills106/homeassistant-solax-modbus"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix index 544223b43080e..2a370fc9de114 100644 --- a/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix +++ b/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix @@ -8,19 +8,20 @@ buildHomeAssistantComponent rec { owner = "hultenvp"; domain = "solis"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "hultenvp"; repo = "solis-sensor"; rev = "v${version}"; - sha256 = "sha256-DIUhUN1UfyXptaldJBsQEsImEnQqi4zFFKp70yXxDSk="; + sha256 = "sha256-bKe8c+gQj9jvZKlqcbLiD6NhPDJVy/2mxRM8jjlOPnI="; }; dependencies = [ aiofiles ]; meta = with lib; { description = "Home Assistant integration for the SolisCloud PV Monitoring portal via SolisCloud API"; + changelog = "https://github.com/hultenvp/solis-sensor/releases/tag/v${version}"; homepage = "https://github.com/hultenvp/solis-sensor"; license = licenses.asl20; maintainers = with maintainers; [ jnsgruk ]; diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/default.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/default.nix index 7d72209c57b0a..a097dac5d6efe 100644 --- a/pkgs/servers/home-assistant/custom-components/tuya_local/default.nix +++ b/pkgs/servers/home-assistant/custom-components/tuya_local/default.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "make-all"; domain = "tuya_local"; - version = "2024.6.0"; + version = "2024.8.0"; src = fetchFromGitHub { inherit owner; repo = "tuya-local"; rev = "refs/tags/${version}"; - hash = "sha256-OLR/KFoXKqL7r7S97VpyoVHdbLfOyWU50aK6c0QhqyE="; + hash = "sha256-IHTWcNxmNXJk7SNnrLNFbaXJQSg6VYkAgAVmyt3JmRw="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix index 9f87bf5007372..7e911c14f1d0c 100644 --- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix +++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix @@ -12,13 +12,13 @@ buildHomeAssistantComponent rec { owner = "mampfes"; domain = "waste_collection_schedule"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { inherit owner; repo = "hacs_${domain}"; rev = "refs/tags/${version}"; - hash = "sha256-BRxBZecOg8R4yF1lVEfOWMmuYK4JQ1ORsY4bclVYOow="; + hash = "sha256-XzHShFM0H8F/erc/XiCMDotCfN/JJoO5SWX+O9Fqxkw="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix index 40899c8926ea9..fc659ba68e471 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "AlexxIT"; domain = "xiaomi_gateway3"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "XiaomiGateway3"; rev = "v${version}"; - hash = "sha256-C8aY23e6iWANbhCRQYNHx+3fomVO+7qdxj+qfv+K3JM="; + hash = "sha256-E3BekX0Xbp1R36+dYmOlsI2BTrdGjFsMoYYRIiBi1qU="; }; propagatedBuildInputs = [ zigpy ]; @@ -25,7 +25,7 @@ buildHomeAssistantComponent rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - changelog = "https://github.com/AlexxIT/XiaomiGateway3/releases/tag/v{version}"; + changelog = "https://github.com/AlexxIT/XiaomiGateway3/releases/tag/v${version}"; description = "Home Assistant custom component for control Xiaomi Multimode Gateway (aka Gateway 3), Xiaomi Multimode Gateway 2, Aqara Hub E1 on default firmwares over LAN"; homepage = "https://github.com/AlexxIT/XiaomiGateway3"; maintainers = with maintainers; [ azuwis ]; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix deleted file mode 100644 index 270f979bae86e..0000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "android-tv-card"; - version = "3.9.4"; - - src = fetchFromGitHub { - owner = "Nerwyn"; - repo = "android-tv-card"; - rev = version; - hash = "sha256-I50WNH/OL7O6YrZ0yf+uPJc05STJrjP8DS/wfaSBTHU="; - }; - - patches = [ ./dont-call-git.patch ]; - - npmDepsHash = "sha256-cuc7+QziclvJWp7MncLjkzfub5UbWYPVoUC/DZfs38g="; - - installPhase = '' - runHook preInstall - - mkdir $out - cp dist/android-tv-card.min.js $out - - runHook postInstall - ''; - - passthru.entrypoint = "android-tv-card.min.js"; - - meta = with lib; { - description = "Universal Customizable TV Remote Card, with HA actions, super configurable touchpad, slider, haptics, and keyboard"; - homepage = "https://github.com/Nerwyn/android-tv-card"; - license = licenses.asl20; - maintainers = with maintainers; [ k900 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix index f716973d14b9f..6271c3681bb1d 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix @@ -1,9 +1,10 @@ -{ callPackage +{ + lib, + pkgs, + callPackage, }: { - android-tv-card = callPackage ./android-tv-card { }; - apexcharts-card = callPackage ./apexcharts-card { }; atomic-calendar-revive = callPackage ./atomic-calendar-revive { }; @@ -32,7 +33,14 @@ template-entity-row = callPackage ./template-entity-row { }; + universal-remote-card = callPackage ./universal-remote-card { }; + valetudo-map-card = callPackage ./valetudo-map-card { }; zigbee2mqtt-networkmap = callPackage ./zigbee2mqtt-networkmap { }; } +// lib.optionalAttrs pkgs.config.allowAliases { + android-tv-card = + lib.warn "`home-assistant-custom-lovelace-modules.android-tv-card` has been renamed to `universal-remote-card`" + pkgs.home-assistant-custom-lovelace-modules.universal-remote-card; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix index 11ec3d02ad85e..f8fa78acf18d8 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "hourly-weather"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "decompil3d"; repo = "lovelace-hourly-weather"; rev = version; - hash = "sha256-IvwWeksEnq44PhCpUXVufYb8w5XEX9Dk0LMLLeM7Dps="; + hash = "sha256-dDWdVAVrZrZIyGG9gOyLohxRZ3DGfjbvW3gGCLqZr+A="; }; - npmDepsHash = "sha256-4uQfaYMg533xZobAl6+/9+FsHAFBm03wrF01nDa53Qg="; + npmDepsHash = "sha256-UzbMDlVOef6dO+tOeTHBBeuT578brklibbfma+VVYD8="; env.CYPRESS_INSTALL_BINARY = "0"; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix index 8a6b64034466f..9a03f71e80413 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "4.0.5"; + version = "4.0.7"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-a/3HUwHrAhAutdVIf0/1HVKZwCcfAKxKnAnjU+6YZsU="; + hash = "sha256-97FW4kNPaoP501xD0W/PjmykwhLbLz7yHVNZiwl/clE="; }; - npmDepsHash = "sha256-8vVv8fJ403FyFigztVoT3nyTdka3bwLxjug99/PeSrE="; + npmDepsHash = "sha256-Gpt17teEbBMHU8teiH66fjZmgq+6v/XovTVxNfHFTg4="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix new file mode 100644 index 0000000000000..1398dc0f2d7e0 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "universal-remote-card"; + version = "4.0.6"; + + src = fetchFromGitHub { + owner = "Nerwyn"; + repo = "android-tv-card"; + rev = version; + hash = "sha256-daxuvbjbnB1OZbvVGrA/jRe65x3MCXGFQ3o4L17Bgjk="; + }; + + patches = [ ./dont-call-git.patch ]; + + npmDepsHash = "sha256-AQYsXaZ4TyL8QjxOfub24NBxp0U6WMe+Czq+ooXwkIw="; + + installPhase = '' + runHook preInstall + + mkdir $out + cp dist/universal-remote-card.min.js $out + + runHook postInstall + ''; + + passthru.entrypoint = "universal-remote-card.min.js"; + + meta = with lib; { + description = "Completely customizable universal remote card for Home Assistant. Supports multiple platforms out of the box"; + homepage = "https://github.com/Nerwyn/android-tv-card"; + license = licenses.asl20; + maintainers = with maintainers; [ k900 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/dont-call-git.patch b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/dont-call-git.patch similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/dont-call-git.patch rename to pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/dont-call-git.patch diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2076801074393..c22bfe4418b99 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -30,16 +30,6 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { - aioazuredevops = super.aioazuredevops.overridePythonAttrs (old: rec { - version = "2.1.1"; - src = fetchFromGitHub { - owner = "timmo001"; - repo = "aioazuredevops"; - rev = "refs/tags/${version}"; - hash = "sha256-rnvWjsTRBoojsuNG3uSdBlyycE4XSrhgjmb77jy7fxY="; - }; - }); - aioelectricitymaps = super.aioelectricitymaps.overridePythonAttrs (oldAttrs: rec { version = "0.4.0"; src = fetchFromGitHub { @@ -53,16 +43,6 @@ let ]; }); - aiolyric = super.aiolyric.overridePythonAttrs (oldAttrs: rec { - version = "1.1.1"; - src = fetchFromGitHub { - owner = "timmo001"; - repo = "aiolyric"; - rev = "refs/tags/${version}"; - hash = "sha256-FZhLjVrLzLv6CZz/ROlvbtBK9XnpO8pG48aSIoBxhCo="; - }; - }); - aiopurpleair = super.aiopurpleair.overridePythonAttrs (oldAttrs: rec { version = "2022.12.1"; src = fetchFromGitHub { @@ -120,12 +100,6 @@ let ]; }); - debugpy = super.debugpy.overridePythonAttrs (oldAttrs: { - # tests are deadlocking too often - # https://github.com/NixOS/nixpkgs/issues/262000 - doCheck = false; - }); - geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -149,26 +123,6 @@ let ]; }); - intellifire4py = super.intellifire4py.overridePythonAttrs (oldAttrs: rec { - version = "2.2.2"; - src = fetchFromGitHub { - owner = "jeeftor"; - repo = "intellifire4py"; - rev = "refs/tags/${version}"; - hash = "sha256-iqlKfpnETLqQwy5sNcK2x/TgmuN2hCfYoHEFK2WWVXI="; - }; - nativeBuildInputs = with self; [ - setuptools - ]; - propagatedBuildInputs = with self; [ - aenum - aiohttp - pydantic - requests - ]; - doCheck = false; # requires asynctest, which does not work on python 3.11 - }); - openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec { version = "2.2"; src = fetchFromGitHub { @@ -275,23 +229,6 @@ let ]; }); - pytibber = super.pytibber.overridePythonAttrs (oldAttrs: rec { - version = "0.28.2"; - src = fetchFromGitHub { - owner = "Danielhiversen"; - repo = "pyTibber"; - rev = "refs/tags/${version}"; - hash = "sha256-vi5f4V0nPb9K3nwdmwMDoNE85Or6haOWjMY4d/2Fj2s="; - }; - dependencies = with self; [ - aiohttp - async-timeout - gql - python-dateutil - websockets - ]; - }); - pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { version = "1.0.1"; src = fetchFromGitHub { @@ -471,7 +408,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.8.3"; + hassVersion = "2024.10.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -489,13 +426,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-4UQ2+MpcngkAKQxfA9y0JUKQ3/m0Y7t2K80ujLoJUvU="; + hash = "sha256-X7atEjhw6QcS5xNiW+17/vrwqjCL4N3VocxUTELLXgo="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-iGAH6hxLgqAEovI82W0FREw7nqgX+4J+gm4cCGIS7h4="; + hash = "sha256-SHNs/zLyNVi0uGguRTWMnt9UpPYEFJbrfwBYFz+q5Nk="; }; build-system = with python.pkgs; [ @@ -513,11 +450,15 @@ in python.pkgs.buildPythonApplication rec { "httpx" "orjson" "pillow" + "pyjwt" "pyopenssl" + "pyyaml" "requests" "sqlalchemy" "typing-extensions" "urllib3" + "uv" + "yarl" ]; # extract translations from pypi sdist @@ -533,7 +474,7 @@ in python.pkgs.buildPythonApplication rec { # Patch path to ffmpeg binary (substituteAll { src = ./patches/ffmpeg-path.patch; - ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg"; + ffmpeg = "${lib.getExe ffmpeg-headless}"; }) ]; @@ -549,6 +490,7 @@ in python.pkgs.buildPythonApplication rec { dependencies = with python.pkgs; [ # Only packages required in pyproject.toml aiodns + aiohasupervisor aiohttp aiohttp-cors aiohttp-fast-zlib @@ -572,7 +514,6 @@ in python.pkgs.buildPythonApplication rec { orjson packaging pillow - pip psutil-home-assistant pyjwt pyopenssl @@ -583,6 +524,7 @@ in python.pkgs.buildPythonApplication rec { typing-extensions ulid-transform urllib3 + uv voluptuous voluptuous-openapi voluptuous-serialize @@ -590,14 +532,12 @@ in python.pkgs.buildPythonApplication rec { # REQUIREMENTS in homeassistant/auth/mfa_modules/totp.py and homeassistant/auth/mfa_modules/notify.py pyotp pyqrcode - # Implicit dependency via homeassistant/requirements.py - packaging ]; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; # upstream only tests on Linux, so do we. - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; nativeCheckInputs = with python.pkgs; [ # test infrastructure (selectively from requirement_test.txt) @@ -623,10 +563,7 @@ in python.pkgs.buildPythonApplication rec { ] ++ lib.concatMap (component: getPackages component python.pkgs) [ # some components are needed even if tests in tests/components are disabled "default_config" - "debugpy" "hue" - "qwikswitch" - "sentry" ]; pytestFlagsArray = [ @@ -650,6 +587,8 @@ in python.pkgs.buildPythonApplication rec { "--deselect=tests/helpers/test_script.py::test_parallel_error" "--deselect=tests/helpers/test_script.py::test_propagate_error_service_not_found" "--deselect=tests/helpers/test_script.py::test_continue_on_error_automation_issue" + # checks whether pip is installed + "--deselect=tests/util/test_package.py::test_check_package_fragment" # tests are located in tests/ "tests" ]; @@ -659,6 +598,8 @@ in python.pkgs.buildPythonApplication rec { "tests/hassfest" # we don't care about code quality "tests/pylint" + # redundant component import test, which would make debugpy & sentry expensive to review + "tests/test_circular_imports.py" # don't bulk test all components "tests/components" ]; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 480b23216e3f0..d56630451d99c 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20240809.0"; + version = "20241002.2"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-PVW/W6/a/kbhbGw35/+AHvjAn1Xq3dW5nslMJWsDgv4="; + hash = "sha256-9NqPBWcNM288ATdKH+Em0e9g2V2497YJLt8Wx5OL4+k="; }; # there is nothing to strip in this package @@ -22,6 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/home-assistant/frontend/releases/tag/${version}"; description = "Frontend for Home Assistant"; homepage = "https://github.com/home-assistant/frontend"; license = licenses.asl20; diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 87cc658d2a475..a7360dd7e2e58 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.8.7"; + version = "2024.10.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { repo = "intents-package"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-s6cw9Ni4NFNNLu7s8YaHk6MeKlss60GgxdwcUVA1djo="; + hash = "sha256-bVKsZvQ4JhVpwILkRR/+lUzchBGwG2D4TTdBD7lDRcY="; }; build-system = [ @@ -62,6 +62,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/home-assistant/intents/releases/tag/${version}"; description = "Intents to be used with Home Assistant"; homepage = "https://github.com/home-assistant/intents"; license = licenses.cc-by-40; diff --git a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch index 5417c64f13eac..287821a1f5fc6 100644 --- a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch +++ b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch @@ -1,5 +1,5 @@ diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py -index 4ab4ee32a0..0f04f037f6 100644 +index 5e1be36f39..df19ff1a49 100644 --- a/homeassistant/components/ffmpeg/__init__.py +++ b/homeassistant/components/ffmpeg/__init__.py @@ -46,7 +46,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin" @@ -9,13 +9,13 @@ index 4ab4ee32a0..0f04f037f6 100644 -DEFAULT_BINARY = "ffmpeg" +DEFAULT_BINARY = "@ffmpeg@" - CONFIG_SCHEMA = vol.Schema( - { + # Currently we only care if the version is < 3 + # because we use a different content-type diff --git a/tests/components/ffmpeg/test_binary_sensor.py b/tests/components/ffmpeg/test_binary_sensor.py -index 6eec115d6f..c55b4fb26c 100644 +index 535ac86336..321eab4270 100644 --- a/tests/components/ffmpeg/test_binary_sensor.py +++ b/tests/components/ffmpeg/test_binary_sensor.py -@@ -24,7 +24,7 @@ async def test_noise_setup_component(hass: HomeAssistant) -> None: +@@ -25,7 +25,7 @@ async def test_noise_setup_component(hass: HomeAssistant) -> None: await async_setup_component(hass, "binary_sensor", CONFIG_NOISE) await hass.async_block_till_done() @@ -24,7 +24,7 @@ index 6eec115d6f..c55b4fb26c 100644 assert hass.states.get("binary_sensor.ffmpeg_noise") is not None -@@ -35,7 +35,7 @@ async def test_noise_setup_component_start(mock_start, hass: HomeAssistant): +@@ -36,7 +36,7 @@ async def test_noise_setup_component_start(mock_start, hass: HomeAssistant) -> N await async_setup_component(hass, "binary_sensor", CONFIG_NOISE) await hass.async_block_till_done() @@ -33,7 +33,7 @@ index 6eec115d6f..c55b4fb26c 100644 assert hass.states.get("binary_sensor.ffmpeg_noise") is not None hass.bus.async_fire(EVENT_HOMEASSISTANT_START) -@@ -55,7 +55,7 @@ async def test_noise_setup_component_start_callback(mock_ffmpeg, hass: HomeAssis +@@ -58,7 +58,7 @@ async def test_noise_setup_component_start_callback( await async_setup_component(hass, "binary_sensor", CONFIG_NOISE) await hass.async_block_till_done() @@ -42,7 +42,7 @@ index 6eec115d6f..c55b4fb26c 100644 assert hass.states.get("binary_sensor.ffmpeg_noise") is not None hass.bus.async_fire(EVENT_HOMEASSISTANT_START) -@@ -80,7 +80,7 @@ async def test_motion_setup_component(hass: HomeAssistant) -> None: +@@ -83,7 +83,7 @@ async def test_motion_setup_component(hass: HomeAssistant) -> None: await async_setup_component(hass, "binary_sensor", CONFIG_MOTION) await hass.async_block_till_done() @@ -51,7 +51,7 @@ index 6eec115d6f..c55b4fb26c 100644 assert hass.states.get("binary_sensor.ffmpeg_motion") is not None -@@ -91,7 +91,7 @@ async def test_motion_setup_component_start(mock_start, hass: HomeAssistant): +@@ -94,7 +94,7 @@ async def test_motion_setup_component_start(mock_start, hass: HomeAssistant) -> await async_setup_component(hass, "binary_sensor", CONFIG_MOTION) await hass.async_block_till_done() @@ -60,7 +60,7 @@ index 6eec115d6f..c55b4fb26c 100644 assert hass.states.get("binary_sensor.ffmpeg_motion") is not None hass.bus.async_fire(EVENT_HOMEASSISTANT_START) -@@ -111,7 +111,7 @@ async def test_motion_setup_component_start_callback(mock_ffmpeg, hass: HomeAssi +@@ -116,7 +116,7 @@ async def test_motion_setup_component_start_callback( await async_setup_component(hass, "binary_sensor", CONFIG_MOTION) await hass.async_block_till_done() @@ -70,15 +70,15 @@ index 6eec115d6f..c55b4fb26c 100644 hass.bus.async_fire(EVENT_HOMEASSISTANT_START) diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py -index 452a818859..41ba776436 100644 +index aa407d5b69..e6d292c040 100644 --- a/tests/components/ffmpeg/test_init.py +++ b/tests/components/ffmpeg/test_init.py -@@ -81,7 +81,7 @@ def test_setup_component(): - with assert_setup_component(1): - setup_component(hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}}) +@@ -87,7 +87,7 @@ async def test_setup_component(hass: HomeAssistant) -> None: + with assert_setup_component(1): + await async_setup_component(hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}}) -- assert hass.data[ffmpeg.DATA_FFMPEG].binary == "ffmpeg" -+ assert hass.data[ffmpeg.DATA_FFMPEG].binary == "@ffmpeg@" - hass.stop() +- assert hass.data[ffmpeg.DATA_FFMPEG].binary == "ffmpeg" ++ assert hass.data[ffmpeg.DATA_FFMPEG].binary == "@ffmpeg@" + async def test_setup_component_test_service(hass: HomeAssistant) -> None: diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 5e7a0ab482008..da133b6a9c06b 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, hatchling +, hatch-vcs , home-assistant , python }: buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.8.3"; + version = "2024.10.0"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -17,19 +18,20 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-cpOxBdqrbN/YmtbxTLyarYdDhdlbnLoFfsBvnAdsWks="; + hash = "sha256-CI8orK0iR8avP4zgdIo9EWa9G7fqAul9CF/rEZBqDbQ="; }; build-system = [ - poetry-core + hatchling + hatch-vcs home-assistant ]; postPatch = '' # Relax constraint to year and month substituteInPlace pyproject.toml --replace-fail \ - 'homeassistant = "${version}"' \ - 'homeassistant = "~${lib.versions.majorMinor home-assistant.version}"' + 'homeassistant==${version}' \ + 'homeassistant~=${lib.versions.majorMinor home-assistant.version}' ''; pythonImportsCheck = [ diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 1889aff36148f..1c68331d1c1c3 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -106,12 +106,17 @@ def parse_components(version: str = "master"): components_with_tests.append(entry.name) sys.path.append(core_path) - from script.hassfest.model import Integration # type: ignore - integrations = Integration.load_dir( - pathlib.Path( + from script.hassfest.model import Config, Integration # type: ignore + config = Config( + root=pathlib.Path(core_path), + specific_integrations=None, + action="generate", + requirements=False, + core_integrations_path=pathlib.Path( os.path.join(core_path, "homeassistant/components") - ) + ), ) + integrations = Integration.load_dir(config.core_integrations_path, config) for domain in sorted(integrations): integration = integrations[domain] if extra_deps := EXTRA_COMPONENT_DEPS.get(integration.domain): diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 4c6bff7e458e0..5f93c55867199 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGo123Module rec { pname = "evcc"; - version = "0.130.6"; + version = "0.130.9"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-8ThvDl/dxD2YO9Z+iVhq+JQmnL8M9RdWVfHykoRIERg="; + hash = "sha256-g3z2yqw/84OMui5mchfqVHoR/6LdwNHgeBodf1jUtj4="; }; - vendorHash = "sha256-L04EQwA2HYLTtYZMP2K7ubuq8IqbqHNEF9W3UmM4pOg="; + vendorHash = "sha256-C2eoNmv0GSi5DV53aUwGcBOw6n2btU/HhniMyu21vLE="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-8DfLh6RhBI6GeTSIvmXCZ8Yudt5TYnimUoAdbOYfWfw="; + hash = "sha256-60F6j87T77JEt3ej4FVTc8rnnpZSGzomrQp8VPWjv6Q="; }; nativeBuildInputs = [ @@ -67,32 +67,13 @@ buildGo123Module rec { make ui ''; - doCheck = !stdenv.isDarwin; # darwin sandbox limitations around network access, access to /etc/protocols and likely more + doCheck = !stdenv.hostPlatform.isDarwin; # darwin sandbox limitations around network access, access to /etc/protocols and likely more checkFlags = let skippedTests = [ # network access "TestOctopusConfigParse" - "TestTemplates/ac-elwa-2" - "TestTemplates/allinpower" - "TestTemplates/electricitymaps" - "TestTemplates/elering" - "TestTemplates/energinet" - "TestTemplates/grünstromindex" - "TestTemplates/keba-modbus" - "TestTemplates/pun" - "TestTemplates/entsoe" - "TestTemplates/ngeso" - "TestTemplates/tibber" - "TestTemplates/groupe-e" - "TestTemplates/awattar" - "TestTemplates/energy-charts-api" - "TestTemplates/polestar" - "TestTemplates/sma-inverter-speedwire/battery" - "TestTemplates/sma-inverter-speedwire/pv" - "TestTemplates/smartenergy" - "TestTemplates/tibber-pulse/grid" - + "TestTemplates" ]; in [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index 788cd01d067aa..96c58a598187d 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -16,8 +16,8 @@ let dashboardIcons = fetchFromGitHub { owner = "walkxcode"; repo = "dashboard-icons"; - rev = "a02a5999fe56948671721da8b0830cdd5b609ed7"; # Until 2024-02-25 - hash = "sha256-s0Doh4j6CH66fZoQKMt4yc7aLStNFGMVoDp5dvs7+pk="; + rev = "be82e22c418f5980ee2a13064d50f1483df39c8c"; # Until 2024-07-21 + hash = "sha256-z69DKzKhCVNnNHjRM3dX/DD+WJOL9wm1Im1nImhBc9Y="; }; installLocalIcons = '' @@ -29,16 +29,16 @@ let in buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.9.6"; + version = "0.9.10"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-jUKXAqq6Oj8CmOuBUlsf0zDIcK+3MX/czzNDmakN9VM="; + hash = "sha256-qDbYgitMbjOMIZUyQuFSNAyb/ZRAcStm/jDrsIutKno="; }; - npmDepsHash = "sha256-YjcF8FkURnTurcJ0Iq0ghv/bhu5sFA860jXrn3TkRds="; + npmDepsHash = "sha256-gAti4y4Ios7XjJ3nVOhzjwPzcAC2upODZ64qQjx17JE="; preBuild = '' mkdir -p config @@ -50,9 +50,11 @@ buildNpmPackage rec { patchShebangs .next/standalone/server.js ''; - nativeBuildInputs = [ git ] ++ lib.optionals stdenv.isDarwin [ cctools ]; + nativeBuildInputs = [ git ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; - buildInputs = [ nodePackages.node-gyp-build ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = [ + nodePackages.node-gyp-build + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; env.PYTHON = "${python3}/bin/python"; @@ -107,6 +109,6 @@ buildNpmPackage rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ jnsgruk ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/servers/http/angie/console-light.nix b/pkgs/servers/http/angie/console-light.nix index 15d035d21d824..0966e9b94a214 100644 --- a/pkgs/servers/http/angie/console-light.nix +++ b/pkgs/servers/http/angie/console-light.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, gzip , brotli }: diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix index e77647ffe4b1a..a0bd7bbceee16 100644 --- a/pkgs/servers/http/angie/default.nix +++ b/pkgs/servers/http/angie/default.nix @@ -8,12 +8,12 @@ }@args: callPackage ../nginx/generic.nix args rec { - version = "1.6.2"; + version = "1.7.0"; pname = if withQuic then "angieQuic" else "angie"; src = fetchurl { url = "https://download.angie.software/files/angie-${version}.tar.gz"; - hash = "sha256-5+7FFnf3WHzFf9EyYMAyL6dozaqEkhWzFdrU4OcfXFk="; + hash = "sha256-B5fm4BgV/bMLvJ9wOAA4fJyLLGARManDlQmjPXPyHAE="; }; configureFlags = lib.optionals withAcme [ diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index c0ebb2e8bfcc6..2d9ac45b8e82b 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { lib.optional brotliSupport brotli ++ lib.optional sslSupport openssl ++ lib.optional modTlsSupport rustls-ffi ++ - lib.optional (modTlsSupport && stdenv.isDarwin) Foundation ++ + lib.optional (modTlsSupport && stdenv.hostPlatform.isDarwin) Foundation ++ lib.optional ldapSupport openldap ++ # there is no --with-ldap flag lib.optional libxml2Support libxml2 ++ lib.optional http2Support nghttp2 ++ - lib.optional stdenv.isDarwin libiconv; + lib.optional stdenv.hostPlatform.isDarwin libiconv; postPatch = '' sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; # Required for ‘pthread_cancel’. - NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-lgcc_s"; configureFlags = [ "--with-apr=${apr.dev}" diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 4b6c5681470fa..b8b3b72d54328 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "mod_auth_mellon"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "latchset"; repo = "mod_auth_mellon"; rev = "v${version}"; - sha256 = "sha256-frSfhddLfEZ2xSI7/HPZkr5AiTJ9nnYmnJZY8aC3zwI="; + sha256 = "sha256-VcR+HZ5S7fLrGqT1SHCQLQw6v516G0x+wf8Wb5Sy4Gk="; }; nativeBuildInputs = [ autoreconfHook pkg-config autoconf automake ]; diff --git a/pkgs/servers/http/apache-modules/mod_jk/default.nix b/pkgs/servers/http/apache-modules/mod_jk/default.nix index 22a50ea8feb67..b1134f7d3f3cc 100644 --- a/pkgs/servers/http/apache-modules/mod_jk/default.nix +++ b/pkgs/servers/http/apache-modules/mod_jk/default.nix @@ -1,36 +1,52 @@ -{ lib, stdenv, fetchurl, apacheHttpd, jdk }: +{ + lib, + stdenv, + apacheHttpd, + autoreconfHook, + fetchFromGitHub, + jdk, +}: stdenv.mkDerivation rec { pname = "mod_jk"; - version = "1.2.49"; + version = "1.2.50"; - src = fetchurl { - url = "mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-${version}-src.tar.gz"; - hash = "sha256-Q8sCg8koeOnU7xEGMdvSvra1VxPBJ84EMZCyswh1fpw="; + src = fetchFromGitHub { + owner = "apache"; + repo = "tomcat-connectors"; + rev = "refs/tags/JK_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-hlwlx7Sb4oeZIzHQYOC3e9xEZK9u6ZG8Q2U/XdKMe3U="; }; + sourceRoot = "${src.name}/native"; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ + apacheHttpd + jdk + ]; + configureFlags = [ "--with-apxs=${apacheHttpd.dev}/bin/apxs" "--with-java-home=${jdk}" ]; - setSourceRoot = '' - sourceRoot=$(echo */native) - ''; - installPhase = '' + runHook preInstall + mkdir -p $out/modules cp apache-2.0/mod_jk.so $out/modules - ''; - buildInputs = [ apacheHttpd jdk ]; + runHook postInstall + ''; - meta = with lib; { + meta = { description = "Provides web server plugins to connect web servers with Tomcat"; homepage = "https://tomcat.apache.org/download-connectors.cgi"; changelog = "https://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html"; - license = licenses.asl20; - maintainers = with maintainers; [ anthonyroussel ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anthonyroussel ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index ddd33184e046b..bebd1278acc2d 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ apacheHttpd python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ]; diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix deleted file mode 100644 index 0aad8168ffa8f..0000000000000 --- a/pkgs/servers/http/bozohttpd/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenv -, fetchurl -, bmake -, groff -, inetutils -, wget -, openssl -, libxcrypt -, minimal ? false -, userSupport ? !minimal -, cgiSupport ? !minimal -, dirIndexSupport ? !minimal -, dynamicContentSupport ? !minimal -, sslSupport ? !minimal -, luaSupport ? !minimal -, lua -, htpasswdSupport ? !minimal -}: - -let inherit (lib) optional optionals; -in -stdenv.mkDerivation rec { - pname = "bozohttpd"; - version = "20240126"; - - # bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at: - # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo - src = fetchurl { - url = "http://eterna23.net/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha512-fr1PnyYAS3wkpmj/npRC3A87UL9LIXw4thlM4GfrtlJbuX5EkWGVJnHJW/EmYp7z+N91dcdRJgdO79l6WJsKpg=="; - }; - - buildInputs = [ openssl libxcrypt ] ++ optional (luaSupport) lua; - nativeBuildInputs = [ bmake groff ]; - - COPTS = [ - "-D_DEFAULT_SOURCE" - "-D_GNU_SOURCE" - - # ensure that we can serve >2GB files even on 32-bit systems. - "-D_LARGEFILE_SOURCE" - "-D_FILE_OFFSET_BITS=64" - - # unpackaged dependency: https://man.netbsd.org/blocklist.3 - "-DNO_BLOCKLIST_SUPPORT" - ] - ++ optional (!userSupport) "-DNO_USER_SUPPORT" - ++ optional (!dirIndexSupport) "-DNO_DIRINDEX_SUPPORT" - ++ optional (!dynamicContentSupport) "-DNO_DYNAMIC_CONTENT" - ++ optional (!luaSupport) "-DNO_LUA_SUPPORT" - ++ optional (!sslSupport) "-DNO_SSL_SUPPORT" - ++ optional (!cgiSupport) "-DNO_CGIBIN_SUPPORT" - ++ optional (htpasswdSupport) "-DDO_HTPASSWD"; - - _LDADD = [ "-lm" ] - ++ optional (stdenv.hostPlatform.libc != "libSystem") "-lcrypt" - ++ optional (luaSupport) "-llua" - ++ optionals (sslSupport) [ "-lssl" "-lcrypto" ]; - makeFlags = [ "LDADD=$(_LDADD)" ]; - - doCheck = true; - nativeCheckInputs = [ inetutils wget ]; - checkFlags = optional (!cgiSupport) "CGITESTS="; - - meta = with lib; { - description = "Bozotic HTTP server; small and secure"; - longDescription = '' - bozohttpd is a small and secure HTTP version 1.1 server. Its main - feature is the lack of features, reducing the code size and improving - verifiability. - - It supports CGI/1.1, HTTP/1.1, HTTP/1.0, HTTP/0.9, ~user translations, - virtual hosting support, as well as multiple IP-based servers on a - single machine. It is capable of servicing pages via the IPv6 protocol. - It has SSL support. It has no configuration file by design. - ''; - homepage = "http://www.eterna.com.au/bozohttpd/"; - changelog = "http://www.eterna.com.au/bozohttpd/CHANGES"; - license = licenses.bsd2; - maintainers = [ maintainers.embr ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index 87e80976b8c5d..092c13f070a1c 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-91' "${spidermonkey_91.dev}/include/mozjs-91" substituteInPlace configure --replace '/usr/include/''${SM_HEADERS}' "${spidermonkey_91.dev}/include/mozjs-91" patchShebangs bin/rebar - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # LTO with Clang produces LLVM bitcode, which causes linking to fail quietly. # (There are warnings, but no hard errors, and it produces an empty dylib.) substituteInPlace src/jiffy/rebar.config.script --replace '"-flto"' '""' diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index 267f1ed38aaa6..b7dfb2d3b643b 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -8,26 +8,26 @@ rustPlatform.buildRustPackage rec { pname = "dufs"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "dufs"; rev = "v${version}"; - hash = "sha256-Ab/f6n2n24mLsWS4WF6jOBt9m7dyeSP0ftYixKANsjY="; + hash = "sha256-eada2xQlzB1kknwitwxZhFiv6myTbtYHHFkQtppa0tc="; }; - cargoHash = "sha256-CNHDZHyg4jrEl3hmdQ7ITCtg9iTmB2RwDAzqSirOCO4="; + cargoHash = "sha256-juT3trREV7LmjBz+x7Od4XoTGuL1XRhknbU4Nopg2HU="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; # FIXME: checkPhase on darwin will leave some zombie spawn processes # see https://github.com/NixOS/nixpkgs/issues/205620 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkFlags = [ # tests depend on network interface, may fail with virtual IPs. "--skip=validate_printed_urls" diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix deleted file mode 100644 index 5fbd3cdaf0d0b..0000000000000 --- a/pkgs/servers/http/envoy/default.nix +++ /dev/null @@ -1,210 +0,0 @@ -{ - lib, - bazel_6, - bazel-gazelle, - buildBazelPackage, - fetchFromGitHub, - stdenv, - cmake, - gn, - go, - jdk, - ninja, - patchelf, - python3, - linuxHeaders, - nixosTests, - - # v8 (upstream default), wavm, wamr, wasmtime, disabled - wasmRuntime ? "wamr", -}: - -let - srcVer = { - # We need the commit hash, since Bazel stamps the build with it. - # However, the version string is more useful for end-users. - # These are contained in a attrset of their own to make it obvious that - # people should update both. - version = "1.31.0"; - rev = "7b8baff1758f0a584dcc3cb657b5032000bcb3d7"; - hash = "sha256-pKERyXABcpMpKMRRvqJavp2jYGXTxwFLDPERqDT6jnY="; - }; - - # these need to be updated for any changes to fetchAttrs - depsHash = - { - x86_64-linux = "sha256-33yu2oxP2zgKs01qn6RIyZx6zHJ1NuCNxolgk0/uWpM="; - aarch64-linux = "sha256-ox7CJPqNbwucMDORQvx8SFs4oXR/WKixwJ6uK+l4NJc="; - } - .${stdenv.system} or (throw "unsupported system ${stdenv.system}"); -in -buildBazelPackage { - pname = "envoy"; - inherit (srcVer) version; - bazel = bazel_6; - src = fetchFromGitHub { - owner = "envoyproxy"; - repo = "envoy"; - inherit (srcVer) hash rev; - - postFetch = '' - chmod -R +w $out - rm $out/.bazelversion - echo ${srcVer.rev} > $out/SOURCE_VERSION - ''; - }; - - postPatch = '' - sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch - sed -i '/javabase=/d' .bazelrc - sed -i '/"-Werror"/d' bazel/envoy_internal.bzl - ''; - - patches = [ - # use system Python, not bazel-fetched binary Python - ./0001-nixpkgs-use-system-Python.patch - - # use system Go, not bazel-fetched binary Go - ./0002-nixpkgs-use-system-Go.patch - - # use system C/C++ tools - ./0003-nixpkgs-use-system-C-C-toolchains.patch - ]; - - nativeBuildInputs = [ - cmake - python3 - gn - go - jdk - ninja - patchelf - ]; - - buildInputs = [ linuxHeaders ]; - - fetchAttrs = { - sha256 = depsHash; - dontUseCmakeConfigure = true; - dontUseGnConfigure = true; - preInstall = '' - # Strip out the path to the build location (by deleting the comment line). - find $bazelOut/external -name requirements.bzl | while read requirements; do - sed -i '/# Generated from /d' "$requirements" - done - - # Remove references to paths in the Nix store. - sed -i \ - -e 's,${python3},__NIXPYTHON__,' \ - -e 's,${stdenv.shellPackage},__NIXSHELL__,' \ - $bazelOut/external/com_github_luajit_luajit/build.py \ - $bazelOut/external/local_config_sh/BUILD \ - $bazelOut/external/*_pip3/BUILD.bazel - - rm -r $bazelOut/external/go_sdk - rm -r $bazelOut/external/local_jdk - rm -r $bazelOut/external/bazel_gazelle_go_repository_tools/bin - - # Remove compiled python - find $bazelOut -name '*.pyc' -delete - - # Remove Unix timestamps from go cache. - rm -rf $bazelOut/external/bazel_gazelle_go_repository_cache/{gocache,pkg/mod/cache,pkg/sumdb} - - # fix tcmalloc failure https://github.com/envoyproxy/envoy/issues/30838 - sed -i '/TCMALLOC_GCC_FLAGS = \[/a"-Wno-changes-meaning",' $bazelOut/external/com_github_google_tcmalloc/tcmalloc/copts.bzl - ''; - }; - buildAttrs = { - dontUseCmakeConfigure = true; - dontUseGnConfigure = true; - dontUseNinjaInstall = true; - preConfigure = '' - # Make executables work, for the most part. - find $bazelOut/external -type f -executable | while read execbin; do - file "$execbin" | grep -q ': ELF .*, dynamically linked,' || continue - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - "$execbin" - done - - ln -s ${bazel-gazelle}/bin $bazelOut/external/bazel_gazelle_go_repository_tools/bin - - sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/foreign_cc/private/framework/toolchains/linux_commands.bzl - - # Add paths to Nix store back. - sed -i \ - -e 's,__NIXPYTHON__,${python3},' \ - -e 's,__NIXSHELL__,${stdenv.shellPackage},' \ - $bazelOut/external/com_github_luajit_luajit/build.py \ - $bazelOut/external/local_config_sh/BUILD \ - $bazelOut/external/*_pip3/BUILD.bazel - ''; - installPhase = '' - install -Dm0755 bazel-bin/source/exe/envoy-static $out/bin/envoy - ''; - }; - - removeRulesCC = false; - removeLocalConfigCc = true; - removeLocal = false; - bazelTargets = [ "//source/exe:envoy-static" ]; - bazelBuildFlags = - [ - "-c opt" - "--spawn_strategy=standalone" - "--noexperimental_strict_action_env" - "--cxxopt=-Wno-error" - "--linkopt=-Wl,-z,noexecstack" - - # Force use of system Java. - "--extra_toolchains=@local_jdk//:all" - "--java_runtime_version=local_jdk" - "--tool_java_runtime_version=local_jdk" - - # undefined reference to 'grpc_core::*Metadata*::*Memento* - # - # During linking of the final binary, we see undefined references to grpc_core related symbols. - # The missing symbols would be instantiations of a template class from https://github.com/grpc/grpc/blob/v1.59.4/src/core/lib/transport/metadata_batch.h - # "ParseMemento" and "MementoToValue" are only implemented for some types - # and appear unused and unimplemented for the undefined cases reported by the linker. - "--linkopt=-Wl,--unresolved-symbols=ignore-in-object-files" - - "--define=wasm=${wasmRuntime}" - ] - ++ (lib.optionals stdenv.isAarch64 [ - # external/com_github_google_tcmalloc/tcmalloc/internal/percpu_tcmalloc.h:611:9: error: expected ':' or '::' before '[' token - # 611 | : [end_ptr] "=&r"(end_ptr), [cpu_id] "=&r"(cpu_id), - # | ^ - "--define=tcmalloc=disabled" - ]); - - bazelFetchFlags = [ - "--define=wasm=${wasmRuntime}" - - # https://github.com/bazelbuild/rules_go/issues/3844 - "--repo_env=GOPROXY=https://proxy.golang.org,direct" - "--repo_env=GOSUMDB=sum.golang.org" - ]; - - requiredSystemFeatures = [ "big-parallel" ]; - - passthru.tests = { - envoy = nixosTests.envoy; - # tested as a core component of Pomerium - pomerium = nixosTests.pomerium; - }; - - meta = with lib; { - homepage = "https://envoyproxy.io"; - changelog = "https://github.com/envoyproxy/envoy/releases/tag/v${version}"; - description = "Cloud-native edge and service proxy"; - mainProgram = "envoy"; - license = licenses.asl20; - maintainers = with maintainers; [ lukegb ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; - }; -} diff --git a/pkgs/servers/http/jetty/11.x.nix b/pkgs/servers/http/jetty/11.x.nix index e19e1b4dc1308..144085433bb8c 100644 --- a/pkgs/servers/http/jetty/11.x.nix +++ b/pkgs/servers/http/jetty/11.x.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "11.0.22"; - hash = "sha256-afFuUZ1csDuE60m+WKMriU/wObBZleTORLOCFU8qcJk="; + version = "11.0.23"; + hash = "sha256-ISsDetefL9ow5aZ7vcSG1BgGwBO0FtDrd741mi8ORiY="; } diff --git a/pkgs/servers/http/jetty/12.x.nix b/pkgs/servers/http/jetty/12.x.nix index 0bbcb76e03a36..a7039fa48932c 100644 --- a/pkgs/servers/http/jetty/12.x.nix +++ b/pkgs/servers/http/jetty/12.x.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "12.0.11"; - hash = "sha256-5fZMHb2ZpkoAFY/v124F+99Kq9vZypSYrG8QmQ/RK6k="; + version = "12.0.12"; + hash = "sha256-CFdVT+AYK2KvXRzqMtTLz89BsXSuPolv+2u8EbTsil4="; } diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 28e5af7a44d69..b169e5a83dab2 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, pkg-config, pcre2, libxml2, zlib, bzip2, which, file +, autoreconfHook , openssl , enableDbi ? false, libdbi , enableMagnet ? false, lua5_1 @@ -14,11 +15,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.75"; + version = "1.4.76"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-i3IcqTnTEq+qbvMdy9avtRYe04Wsgo5vzNTFt2vhidY="; + sha256 = "sha256-jL9CluNzz9DO3+nZeHYLWwXFj9xASLTivK8KYayPUBE="; }; separateDebugInfo = true; @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcre2 pcre2.dev libxml2 zlib bzip2 which file openssl ] ++ lib.optional enableDbi libdbi ++ lib.optional enableMagnet lua5_1 diff --git a/pkgs/servers/http/merecat/default.nix b/pkgs/servers/http/merecat/default.nix index 6231fb9e2ad2c..344f81da2ff7a 100644 --- a/pkgs/servers/http/merecat/default.nix +++ b/pkgs/servers/http/merecat/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # Strange header and/or linker errors - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 9369259ff65eb..266c09755ab0a 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation { ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ # fix build vts module on gcc11 "-Wno-error=stringop-overread" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=deprecated-declarations" "-Wno-error=gnu-folding-constant" "-Wno-error=unused-but-set-variable" @@ -173,7 +173,7 @@ stdenv.mkDerivation { inherit postPatch; - hardeningEnable = lib.optional (!stdenv.isDarwin) "pie"; + hardeningEnable = lib.optional (!stdenv.hostPlatform.isDarwin) "pie"; enableParallelBuilding = true; diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix deleted file mode 100644 index 8e78b8f07287e..0000000000000 --- a/pkgs/servers/http/pomerium/default.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -, envoy -, mkYarnPackage -, fetchYarnDeps -, nixosTests -, pomerium-cli -}: - -let - inherit (lib) concatStringsSep concatMap id mapAttrsToList; -in -buildGoModule rec { - pname = "pomerium"; - version = "0.26.1"; - src = fetchFromGitHub { - owner = "pomerium"; - repo = "pomerium"; - rev = "v${version}"; - hash = "sha256-lMI6dVCTInqHsz4N0HsOVUQo8TkheAwr54FW46r+DUA="; - }; - - vendorHash = "sha256-AHlnhAh4RBz8aJoFJjbX/MUDHq81xK7b7gvCyuV3gjU="; - - ui = mkYarnPackage { - inherit version; - src = "${src}/ui"; - - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/ui/yarn.lock"; - sha256 = lib.fileContents ./yarn-hash; - }; - - buildPhase = '' - runHook preBuild - yarn --offline build - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - cp -R deps/pomerium/dist $out - runHook postInstall - ''; - - doDist = false; - }; - - subPackages = [ - "cmd/pomerium" - ]; - - # patch pomerium to allow use of external envoy - patches = [ - ./0001-envoy-allow-specification-of-external-binary.patch - ]; - - ldflags = let - # Set a variety of useful meta variables for stamping the build with. - setVars = { - "github.com/pomerium/pomerium/internal/version" = { - Version = "v${version}"; - BuildMeta = "nixpkgs"; - ProjectName = "pomerium"; - ProjectURL = "github.com/pomerium/pomerium"; - }; - "github.com/pomerium/pomerium/pkg/envoy" = { - OverrideEnvoyPath = "${envoy}/bin/envoy"; - }; - }; - concatStringsSpace = list: concatStringsSep " " list; - mapAttrsToFlatList = fn: list: concatMap id (mapAttrsToList fn list); - varFlags = concatStringsSpace ( - mapAttrsToFlatList (package: packageVars: - mapAttrsToList (variable: value: - "-X ${package}.${variable}=${value}" - ) packageVars - ) setVars); - in [ - "${varFlags}" - ]; - - preBuild = '' - # Replace embedded envoy with nothing. - # We set OverrideEnvoyPath above, so rawBinary should never get looked at - # but we still need to set a checksum/version. - rm pkg/envoy/files/files_{darwin,linux}*.go - cat <<EOF >pkg/envoy/files/files_external.go - package files - - import _ "embed" // embed - - var rawBinary []byte - - //go:embed envoy.sha256 - var rawChecksum string - - //go:embed envoy.version - var rawVersion string - EOF - sha256sum '${envoy}/bin/envoy' > pkg/envoy/files/envoy.sha256 - echo '${envoy.version}' > pkg/envoy/files/envoy.version - - # put the built UI files where they will be picked up as part of binary build - cp -r ${ui}/* ui/dist - ''; - - installPhase = '' - install -Dm0755 $GOPATH/bin/pomerium $out/bin/pomerium - ''; - - passthru = { - tests = { - inherit (nixosTests) pomerium; - inherit pomerium-cli; - }; - updateScript = ./updater.sh; - }; - - meta = with lib; { - homepage = "https://pomerium.io"; - description = "Authenticating reverse proxy"; - mainProgram = "pomerium"; - license = licenses.asl20; - maintainers = with maintainers; [ lukegb devusb ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - }; -} diff --git a/pkgs/servers/http/pomerium/yarn-hash b/pkgs/servers/http/pomerium/yarn-hash deleted file mode 100644 index a631334cc391c..0000000000000 --- a/pkgs/servers/http/pomerium/yarn-hash +++ /dev/null @@ -1 +0,0 @@ -1xkn1zbhg4q35azlhcgc1bk1sykrawngq1fcb5r5ghgh3m2kmz76 diff --git a/pkgs/servers/http/router/default.nix b/pkgs/servers/http/router/default.nix index e4aed3674af59..c5a2f7d33c148 100644 --- a/pkgs/servers/http/router/default.nix +++ b/pkgs/servers/http/router/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "router"; - version = "1.52.1"; + version = "1.55.0"; src = fetchFromGitHub { owner = "apollographql"; repo = pname; rev = "v${version}"; - hash = "sha256-Gd+YXDztRfeJ7fFKSs7EPq0FsaSzMRYgh9CUXHS675w="; + hash = "sha256-qnjerjU940Tl/2kmvIMU5K40Qtv3Ukrou6uTuBcwfbQ="; }; - cargoHash = "sha256-jRv8mzeRznq8txQ+kgOr6TIXe5VDUCfGin8aLRX6HAo="; + cargoHash = "sha256-gl2UTAljMsjm+TrSjHGEXqJGHdx5PB1Jobm7aNX2nFY="; nativeBuildInputs = [ cmake diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 6f7ff9ceb7653..bddb334e8c5d4 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -100,11 +100,11 @@ stdenv.mkDerivation rec { ++ map (mod: "--add-module=${mod.src}") modules; env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough" - + optionalString stdenv.isDarwin " -Wno-error=deprecated-declarations"; + + optionalString stdenv.hostPlatform.isDarwin " -Wno-error=deprecated-declarations"; preConfigure = (lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); - hardeningEnable = optional (!stdenv.isDarwin) "pie"; + hardeningEnable = optional (!stdenv.hostPlatform.isDarwin) "pie"; enableParallelBuilding = true; diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix deleted file mode 100644 index 771a38376fa97..0000000000000 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - ant, - jdk, - stripJavaArchivesHook, - unzip, - nixosTests, -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "axis2"; - version = "1.8.2"; - - src = fetchurl { - url = "mirror://apache/axis/axis2/java/core/${finalAttrs.version}/axis2-${finalAttrs.version}-bin.zip"; - hash = "sha256-oilPVFFpl3F61nVDxcYx/bc81FopS5fzoIdXzeP8brk="; - }; - - nativeBuildInputs = [ - ant - jdk - stripJavaArchivesHook - unzip - ]; - - buildPhase = '' - runHook preBuild - ant -f webapp - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 dist/axis2.war -t $out/webapps - unzip $out/webapps/axis2.war -d $out/webapps/axis2 - - runHook postInstall - ''; - - passthru.tests = { - inherit (nixosTests) tomcat; - }; - - meta = { - description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack"; - homepage = "https://axis.apache.org/axis2/java/core/"; - changelog = "https://axis.apache.org/axis2/java/core/release-notes/${finalAttrs.version}.html"; - maintainers = [ lib.maintainers.anthonyroussel ]; - platforms = lib.platforms.unix; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - }; -}) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index f883f3d3e58aa..e917a9558ce39 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -59,12 +59,12 @@ let in { tomcat9 = common { - version = "9.0.93"; - hash = "sha256-aeDzU+p9hQBPneN5wepo5XdSh/4uCFnFYIHghcGykiY="; + version = "9.0.95"; + hash = "sha256-WzdanjSlywXfIYi/6eK2pve2kaPApiaytMBHxR1DQgU="; }; tomcat10 = common { - version = "10.1.28"; - hash = "sha256-89N3d9Pqv4TwQ9ljTQj6Qzfw2B75ADzo/H4c8Uc7hdo="; + version = "10.1.30"; + hash = "sha256-jeWoCPPcdirOZ5SM2Q0TJ7EWgWYiBE3IdQ8EIH35Ci4="; }; } diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 927ee7246c31e..e0b20f68bf067 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -10,8 +10,6 @@ , pcre , perlPackages , python3 -, xz -, zlib , catch2 # recommended dependencies , withHwloc ? true @@ -20,9 +18,9 @@ , curl , withCurses ? true , ncurses -, withCap ? stdenv.isLinux +, withCap ? stdenv.hostPlatform.isLinux , libcap -, withUnwind ? stdenv.isLinux +, withUnwind ? stdenv.hostPlatform.isLinux , libunwind # optional dependencies , withBrotli ? false @@ -66,7 +64,7 @@ stdenv.mkDerivation rec { # [2]: https://github.com/apache/trafficserver/blob/3fd2c60/configure.ac#L742-L788 nativeBuildInputs = [ makeWrapper pkg-config file python3 ] ++ (with perlPackages; [ perl ExtUtilsMakeMaker ]) - ++ lib.optionals stdenv.isLinux [ linuxHeaders ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ linuxHeaders ]; buildInputs = [ openssl @@ -97,10 +95,10 @@ stdenv.mkDerivation rec { tools/check-unused-dependencies substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace configure \ --replace '/usr/include/linux' '${linuxHeaders}/include/linux' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # 'xcrun leaks' probably requires non-free XCode substituteInPlace iocore/net/test_certlookup.cc \ --replace 'xcrun leaks' 'true' diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 31f4b8bec1009..b292780505c50 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -27,14 +27,14 @@ let inherit (lib) optional optionals optionalString; in stdenv.mkDerivation rec { - version = "1.32.1"; + version = "1.33.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-YqejETJTbnmXoPsYITJ6hSnd1fIWUc1p5FldYkw2HQI="; + sha256 = "sha256-Q3RXhWI9+G7oUnHYtVK6WZ9s7eIkQ+yPmdqbjWyatTE="; }; nativeBuildInputs = [ which ]; @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { postConfigure = '' ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP81 "./configure php --module=php81 --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"} - ${optionalString withPHP82 "./configure php --module=php81 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} + ${optionalString withPHP82 "./configure php --module=php82 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} ${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"} ${optionalString withPerl538 "./configure perl --module=perl538 --perl=${perl538}/bin/perl"} ${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 246ad636ceb4c..3c66ce8129f34 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -32,8 +32,8 @@ let pname = "hylafaxplus"; - version = "7.0.8"; - hash = "sha512-6wTLVcaHpASy+2i+jeoJ1cM2aLgI5vznGrLd4NCkLHiOxlfCh/ASRaj2Nxt9ZZ5NN/deEwf9tNSZ7MkFZHVsqA=="; + version = "7.0.9"; + hash = "sha512-3OJwM4vFC9pzPozPobFLiNNx/Qnkl8BpNNziRUpJNBDLBxjtg/eDm3GnprS2hpt7VUoV4PCsFvp1hxhNnhlUwQ=="; configSite = substituteAll { name = "${pname}-config.site"; diff --git a/pkgs/servers/hylafaxplus/libtiff-4.patch b/pkgs/servers/hylafaxplus/libtiff-4.patch index d7284e2428651..2257705710c06 100644 --- a/pkgs/servers/hylafaxplus/libtiff-4.patch +++ b/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -5,7 +5,7 @@ https://bugs.gentoo.org/706154 echo '#define TIFFSTRIPBYTECOUNTS uint32_t' echo '#define TIFFVERSION TIFF_VERSION' echo '#define TIFFHEADER TIFFHeader';; -- 4.[0123456]) tiff_runlen_t="uint32_t" +- 4.[01234567]) tiff_runlen_t="uint32_t" + 4.[0-9]) tiff_runlen_t="uint32_t" tiff_offset_t="uint64_t" echo '#define TIFFSTRIPBYTECOUNTS uint64_t' diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index 254729a31762c..e6f3ea5f16851 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.13.2"; + version = "0.14.1"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - hash = "sha256-b0y3EKcYWt3cH79HvHnpiHt18ZbRf9lEsfKTZO0dHME="; + hash = "sha256-TR2hd8TdWA2zSyalxBaqqdcK6FO2CovqddF8mvvyb1U="; }; installPhase = '' diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 5388376720c9d..18f94c5998638 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,21 +3,21 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.25.0"; + version = "3.26.0"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-TkfyhePilOwuW6+MtTqYUYvpP/FnFhpsHt2APMFNbvo="; + hash = "sha256-sjgSbKKTUq6HL7QZ3LNU1Eo+2n/KnlY7Yt80lXAR26k="; rev = "v${version}"; }; - vendorHash = "sha256-LlVZRHotJcHtgeGXIDnbIwpO8iCrBB8nXBnqzHcrJWk="; + vendorHash = "sha256-YxZuAo8l3fhCGCEQVPzKeVdL7i4jWe8rZ5pILI4NVP4="; nativeBuildInputs = [ pkg-config gobject-introspection ]; buildInputs = [ vips ] - ++ lib.optionals stdenv.isDarwin [ libunwind ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libunwind ]; preBuild = '' export CGO_LDFLAGS_ALLOW='-(s|w)' diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index e70d6cc0a8e60..b31a7e16cd1fa 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var/lib" "--with-rundir=/run" "--with-logdir=/var/log" - ] ++ lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "--enable-sctp=${lksctp-tools.out}/lib" ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { sqlite ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; enableParallelBuilding = true; # Missing install depends: diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 64ce9873f45f3..b0d5ffaa17cf7 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -28,7 +28,7 @@ buildDotnetModule rec { runtimeDeps = [ openssl ]; - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); # mono is not available on aarch64-darwin + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # mono is not available on aarch64-darwin nativeCheckInputs = [ mono ]; testProjectFile = "src/Jackett.Test/Jackett.Test.csproj"; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 69aa61b92bf40..2ef6b0fdf399a 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "25.0.4"; + version = "25.0.6"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-Pj8+0bfYnHhkYIDQkePpsmbYb6MN4BI+2VLLdZv3C1Q="; + hash = "sha256-1VHixRgErao/1ZEJv+rlnNmUd2NT35X89D8wuUhYF08="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 5bca109ec16cf..297cffb365cef 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -4,17 +4,18 @@ , python3 , unstableGitUpdater , makeWrapper +, writeShellScript }: stdenv.mkDerivation rec { pname = "klipper"; - version = "0.12.0-unstable-2024-08-14"; + version = "0.12.0-unstable-2024-09-22"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "d81eb557d7f2aad5e22e3633fbcd53a4d60ac5d1"; - sha256 = "sha256-O6W2xiG5rZzD/40ytIFo4HovKq0ml0oCV6amcAQhoUs="; + rev = "9426485bb6c3855b117e05b1927e0b7c1937e0a9"; + sha256 = "sha256-ACSK2G6byCx6TTHjGM0wf/tBzKI70DCywtEQbLe9e4w="; }; sourceRoot = "${src.name}/klippy"; @@ -44,6 +45,18 @@ stdenv.mkDerivation rec { --replace 'GCC_CMD = "gcc"' 'GCC_CMD = "${stdenv.cc.targetPrefix}cc"' ''; + pythonInterpreter = + (python3.withPackages ( + p: with p; [ + numpy + matplotlib + ] + )).interpreter; + + pythonScriptWrapper = writeShellScript pname '' + ${pythonInterpreter} "@out@/lib/scripts/@script@" "$@" + ''; + # NB: We don't move the main entry point into `/bin`, or even symlink it, # because it uses relative paths to find necessary modules. We could wrap but # this is used 99% of the time as a service, so it's not worth the effort. @@ -56,6 +69,8 @@ stdenv.mkDerivation rec { # under `klipper_path` cp -r $src/docs $out/lib/docs cp -r $src/config $out/lib/config + cp -r $src/scripts $out/lib/scripts + cp -r $src/klippy $out/lib/klippy # Add version information. For the normal procedure see https://www.klipper3d.org/Packaging.html#versioning # This is done like this because scripts/make_version.py is not available when sourceRoot is set to "${src.name}/klippy" @@ -64,6 +79,12 @@ stdenv.mkDerivation rec { mkdir -p $out/bin chmod 755 $out/lib/klipper/klippy.py makeWrapper $out/lib/klipper/klippy.py $out/bin/klippy --chdir $out/lib/klipper + + substitute "$pythonScriptWrapper" "$out/bin/klipper-calibrate-shaper" \ + --subst-var "out" \ + --subst-var-by "script" "calibrate_shaper.py" + chmod 755 "$out/bin/klipper-calibrate-shaper" + runHook postInstall ''; diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index de6594a992b92..4d9eb36af84dc 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.11.2"; + version = "1.13.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-gbn0vhk+lYBPnAPwWwbAd+2AQKOkYW+akal/9tUVKVI="; + sha256 = "sha256-ihZS4mNHOk0QoK1SCfjVWATyfGNpwTS/X4f5tr2aoBU="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix index a8847215d65cb..f310b4d020eff 100644 --- a/pkgs/servers/krill/default.nix +++ b/pkgs/servers/krill/default.nix @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Z12fUK4TUgk38/vNAt8RWLFGLc8WnZAgHWz0xl1QKLI="; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; # disable failing tests on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "RPKI Certificate Authority and Publication Server written in Rust"; diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 4fa70976e8554..6c5e88633e96b 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let - os = if stdenv.isDarwin then "osx" else "linux"; + os = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; arch = { x86_64-linux = "x64"; aarch64-linux = "arm64"; x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-ulWg9BhDr/RFE4sfXGf+i9W0KpOYKjtk49qBeIwI9dU="; - arm64-linux_hash = "sha256-iSXXx89I7Pj2nAuapHwJtIblj+TDrd/k9OiBK8QExSg="; - x64-osx_hash = "sha256-xjnDePaxQWRNo1VmH1sbp0Xtvbac3nu0+fiMg0wMddg="; + x64-linux_hash = "sha256-RrxGd96O9vFtBR5AEKTr58XfHzYST3TW3eG95+5vsHA="; + arm64-linux_hash = "sha256-SqRE62hIOmaE6kAyu7903OiDQC2byd/Q4S1WKxpIwuU="; + x64-osx_hash = "sha256-9/P9B4iIcB0/OF/ZjdAvaPhrwJ1VJtbL6NgYJ5CVf8A="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "2.3.3.4204"; + version = "2.5.3.4341"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index e7be597d7e4fa..7a2c42fad1f9f 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ] - ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ systemd pam libcap inotify-tools ] ++ lib.optional withMySQL libmysqlclient ++ lib.optional withPgSQL postgresql ++ lib.optional withSQLite sqlite @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # DES-encrypted passwords are not supported by NixPkgs anymore sed '/test_password_scheme("CRYPT"/d' -i src/auth/test-libpassword.c - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' export systemdsystemunitdir=$out/etc/systemd/system ''; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/dovecot/-/raw/debian/1%252.3.19.1+dfsg1-2/debian/patches/Support-openssl-3.0.patch"; hash = "sha256-PbBB1jIY3jIC8Js1NY93zkV0gISGUq7Nc67Ul5tN7sw="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fix timespec calls ./timespec.patch ]; @@ -86,9 +86,9 @@ stdenv.mkDerivation rec { "--with-lucene" "--with-icu" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "i_cv_epoll_works=${if stdenv.isLinux then "yes" else "no"}" - "i_cv_posix_fallocate_works=${if stdenv.isDarwin then "no" else "yes"}" - "i_cv_inotify_works=${if stdenv.isLinux then "yes" else "no"}" + "i_cv_epoll_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}" + "i_cv_posix_fallocate_works=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}" + "i_cv_inotify_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}" "i_cv_signed_size_t=no" "i_cv_signed_time_t=yes" "i_cv_c99_vsnprintf=yes" @@ -100,14 +100,14 @@ stdenv.mkDerivation rec { "lib_cv_va_copy=yes" "lib_cv___va_copy=yes" "lib_cv_va_val_copy=yes" - ] ++ lib.optional stdenv.isLinux "--with-systemd" - ++ lib.optional stdenv.isDarwin "--enable-static" + ] ++ lib.optional stdenv.hostPlatform.isLinux "--with-systemd" + ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-static" ++ lib.optional withMySQL "--with-mysql" ++ lib.optional withPgSQL "--with-pgsql" ++ lib.optional withSQLite "--with-sqlite" ++ lib.optional withLua "--with-lua"; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://dovecot.org/"; diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 283e47965110b..78bb5b1e1cc4e 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Only; maintainers = with maintainers; [ julm symphorien ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/dovecot_fts_xapian.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/dovecot_fts_xapian.x86_64-darwin }; } diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 26967b333eb94..bf593354da92f 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -82,7 +82,6 @@ in stdenv.mkDerivation rec { s:^# \(LOOKUP_PGSQL=yes\)$:\1: s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lpq -L${postgresql.lib}/lib: s:^# \(LOOKUP_LIBS\)=.*:\1=-lpq -L${postgresql.lib}/lib: - s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${postgresql}/include: ''} ${lib.optionalString enableSqlite '' s:^# \(LOOKUP_SQLITE=yes\)$:\1: diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/servers/mail/mailpit/default.nix index fd8f01674d80b..c29baacd447cb 100644 --- a/pkgs/servers/mail/mailpit/default.nix +++ b/pkgs/servers/mail/mailpit/default.nix @@ -39,7 +39,7 @@ let hash = source.npmDepsHash; }; - env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { # Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin. # Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+. NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300"; diff --git a/pkgs/servers/mail/mailpit/source.nix b/pkgs/servers/mail/mailpit/source.nix index 38828817ccdf5..cf45c132f677e 100644 --- a/pkgs/servers/mail/mailpit/source.nix +++ b/pkgs/servers/mail/mailpit/source.nix @@ -1,6 +1,6 @@ { - version = "1.20.2"; - hash = "sha256-VQwDb1Q0RPoRzBm7GWjzXpL3jnYhqmKPmOGLqCzUosY="; - npmDepsHash = "sha256-DBSlzpsZbXcaPogTgsXpl/KlcSS21vFeI0BMS58XJhg="; - vendorHash = "sha256-QcsDF/YKAaNhg61zEURGuB54XfnjvFeDmTlk/J/445I="; + version = "1.20.4"; + hash = "sha256-YvVaKNd7e+NHgRaIzzjSj2Jv4FowGJSwiPzdN2viQdk="; + npmDepsHash = "sha256-9/55zhRLMxo51vuLcCMGiJ9VPvUF1cSm8HhvDn2UnQo="; + vendorHash = "sha256-peE8VzgzQeawajk+bndO8lJZEGpCO17003dD90c9Xfg="; } diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index 2795ba1af358a..76ce2d0115998 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -1,27 +1,32 @@ -{ lib, stdenv, fetchurl }: - +{ + lib, + stdenv, + fetchFromGitea, + autoreconfHook, + atf, + pkg-config, + kyua, +}: stdenv.mkDerivation rec { - pname = "mlmmj"; - version = "1.3.0"; - - src = fetchurl { - url = "http://mlmmj.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn"; + version = "1.4.7"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = pname; + repo = pname; + rev = "refs/tags/RELEASE_" + lib.replaceStrings ["."] ["_"] version; + hash = "sha256-QetxCxny9elPetKuAsgKF0xTov1bNIRxi7gWhv6dYyU="; }; + nativeBuildInputs = [autoreconfHook atf pkg-config kyua]; + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # AC_FUNC_MALLOC is broken on cross builds. "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: getlistdelim.o:/build/mlmmj-1.3.0/src/../include/mlmmj.h:84: multiple definition of - # `subtype_strs'; mlmmj-send.o:/build/mlmmj-1.3.0/src/../include/mlmmj.h:84: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - postInstall = '' # grab all documentation files docfiles=$(find -maxdepth 1 -name "[[:upper:]][[:upper:]]*") @@ -31,9 +36,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://mlmmj.org"; description = "Mailing List Management Made Joyful"; - maintainers = [ maintainers.edwtjo ]; + maintainers = [maintainers.edwtjo]; platforms = platforms.linux; license = licenses.mit; }; - } diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index c642c62be1ce7..69244b86d62b8 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -6,7 +6,6 @@ , pkgconf , libtool , bison -, libasr , libevent , zlib , libressl diff --git a/pkgs/servers/mail/public-inbox/default.nix b/pkgs/servers/mail/public-inbox/default.nix index 05dc98b466d42..72caae6a5b05e 100644 --- a/pkgs/servers/mail/public-inbox/default.nix +++ b/pkgs/servers/mail/public-inbox/default.nix @@ -126,7 +126,7 @@ buildPerlPackage rec { man ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ curl git @@ -138,7 +138,7 @@ buildPerlPackage rec { PlackTestExternalServer TestSimple13 XMLTreePP - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ LinuxInotify2 ]; preCheck = '' diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index aff57ef0e1370..65fec7bad3f5f 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -24,12 +24,12 @@ zstd, libarchive, withBlas ? true, - withHyperscan ? stdenv.isx86_64, - withLuaJIT ? stdenv.isx86_64, + withHyperscan ? stdenv.hostPlatform.isx86_64, + withLuaJIT ? stdenv.hostPlatform.isx86_64, nixosTests, }: -assert withHyperscan -> stdenv.isx86_64; +assert withHyperscan -> stdenv.hostPlatform.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index d6e73054a7171..20be6e58e3d87 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -610,10 +610,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default" "test"]; @@ -895,10 +895,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v"; + sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.11"; }; excon = { groups = ["default"]; @@ -1144,10 +1144,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cm2lrvhrpqq19hbdsxf4lq2nkb2qdldbdxh3gvi15l62dlb5zqq"; + sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578"; type = "gem"; }; - version = "1.8.1"; + version = "1.11.1"; }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; @@ -1881,10 +1881,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; + sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; type = "gem"; }; - version = "1.16.6"; + version = "1.16.7"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -1913,10 +1913,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15xjsxis357np7dy1lak39x1n8g8wxljb08wplw5i4gxi743zr7j"; + sha256 = "1km0wqx9pj609jidvrqfsvzbzfgdnlpdnv7i7xfqm3wb55vk5w6y"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; omniauth-cas = { dependencies = ["addressable" "nokogiri" "omniauth"]; @@ -1948,10 +1948,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n"; + sha256 = "05idjrc01nmmqz4g7kv16xd9yfzzvyibxzfrxk8rcwd1p0zgsxnb"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.2"; }; omniauth_openid_connect = { dependencies = ["omniauth" "openid_connect"]; @@ -2127,10 +2127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y"; + sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; type = "gem"; }; - version = "6.4.2"; + version = "6.4.3"; }; pundit = { dependencies = ["activesupport"]; @@ -2158,10 +2158,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; rack = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -2212,10 +2212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis"; + sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8"; type = "gem"; }; - version = "3.0.5"; + version = "3.0.6"; }; rack-proxy = { dependencies = ["rack"]; @@ -2435,15 +2435,14 @@ version = "3.1.0"; }; rexml = { - dependencies = ["strscan"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gccz5lixnddazvhksmj7l7hjwzjra2kz3qfyrzl2bz1q9h80bzh"; + sha256 = "09shc1dvg88c4yx83d4c9wf26z838nlapa3cmlq8iqdci39a98v2"; type = "gem"; }; - version = "3.3.5"; + version = "3.3.7"; }; rotp = { groups = ["default"]; @@ -2674,10 +2673,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18vnbzin5ypxrgcs9lllg7x311b69dyrdw2w1pwz84438hmxm79s"; + sha256 = "1adq06m684gnpjp6qyb8shgj8jjy2npcfg7y6mg2ab9ilfdq6684"; type = "gem"; }; - version = "1.15.0"; + version = "1.17.0"; }; ruby2_keywords = { groups = ["default"]; @@ -2946,16 +2945,6 @@ }; version = "0.8.0"; }; - strscan = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; - type = "gem"; - }; - version = "3.1.0"; - }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; groups = ["default"]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 0b2fd5b57e097..dccf253ea9387 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.2.12"; + version = "4.2.13"; in ( applyPatches { @@ -9,7 +9,7 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-q+j7zHJrIUOumJfk4w5BVu7eTUa1AjI5ho8XoOA2uJU="; + hash = "sha256-+HGu02fjYJ1x6Tk9AdqmFN7JHk3UnlvCdiQ/5yMu69M="; }; patches = patches ++ []; }) // { diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix index 91cdded5a2feb..4e3ddb37db4d4 100644 --- a/pkgs/servers/matrix-conduit/default.nix +++ b/pkgs/servers/matrix-conduit/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { }; # tests failed on x86_64-darwin with SIGILL: illegal instruction - doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); + doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin); passthru.tests = { inherit (nixosTests) matrix-conduit; diff --git a/pkgs/servers/matrix-hebbot/Cargo.lock b/pkgs/servers/matrix-hebbot/Cargo.lock deleted file mode 100644 index 764ac9b16c4f7..0000000000000 --- a/pkgs/servers/matrix-hebbot/Cargo.lock +++ /dev/null @@ -1,2782 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "aead" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e3e798aa0c8239776f54415bc06f3d74b1850f3f830b45c35cfc80556973f70" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aes" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495ee669413bfbe9e8cace80f4d3d78e6d8c8d99579f97fb93bde351b185f2d4" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", - "ctr 0.7.0", - "opaque-debug", -] - -[[package]] -name = "aes-gcm" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a930fd487faaa92a30afa92cc9dd1526a5cff67124abbbb1c617ce070f4dcf" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr 0.8.0", - "ghash", - "subtle", -] - -[[package]] -name = "ahash" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" -dependencies = [ - "getrandom 0.2.3", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "assign" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" - -[[package]] -name = "async-trait" -version = "0.1.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" -dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", -] - -[[package]] -name = "atomic" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281" -dependencies = [ - "autocfg", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "backoff" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fe17f59a06fe8b87a6fc8bf53bb70b3aba76d7685f432487a68cd5552853625" -dependencies = [ - "futures-core", - "getrandom 0.2.3", - "instant", - "pin-project", - "rand 0.8.4", - "tokio", -] - -[[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bumpalo" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" - -[[package]] -name = "bytemuck" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" - -[[package]] -name = "cc" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chacha20" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8756167ea0aca10e066cdbe7813bd71d2f24e69b0bc7b50509590cef2ce0b9" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", - "zeroize", -] - -[[package]] -name = "chacha20poly1305" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175a11316f33592cf2b71416ee65283730b5b7849813c4891d02a12906ed9acc" -dependencies = [ - "aead", - "chacha20", - "cipher", - "poly1305", - "zeroize", -] - -[[package]] -name = "checked_int_cast" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" - -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "serde", - "time 0.1.43", - "winapi", -] - -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "cmake" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" -dependencies = [ - "cc", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "const-oid" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c32f031ea41b4291d695026c023b95d59db2d8a2c7640800ed56bc8f510f22" - -[[package]] -name = "const_fn" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" - -[[package]] -name = "core-foundation" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" - -[[package]] -name = "cpufeatures" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "lazy_static", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" -dependencies = [ - "cfg-if", - "lazy_static", -] - -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "ctr" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481" -dependencies = [ - "cipher", -] - -[[package]] -name = "ctr" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" -dependencies = [ - "cipher", -] - -[[package]] -name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - -[[package]] -name = "dashmap" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" -dependencies = [ - "cfg-if", - "num_cpus", -] - -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "der" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f215f706081a44cb702c71c39a52c05da637822e9c1645a50b7202689e982d" -dependencies = [ - "const-oid", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] -name = "ed25519" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" -dependencies = [ - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand 0.7.3", - "serde", - "sha2", - "zeroize", -] - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "encoding_rs" -version = "0.8.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "env_logger" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "futures" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" - -[[package]] -name = "futures-executor" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" - -[[package]] -name = "futures-locks" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c4e684ddb2d8a4db5ca8a02b35156da129674ba4412b6f528698d58c594954" -dependencies = [ - "futures", -] - -[[package]] -name = "futures-macro" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" -dependencies = [ - "autocfg", - "proc-macro-hack", - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", -] - -[[package]] -name = "futures-sink" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" - -[[package]] -name = "futures-task" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" - -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" -dependencies = [ - "gloo-timers", - "send_wrapper", -] - -[[package]] -name = "futures-util" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" -dependencies = [ - "autocfg", - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "proc-macro-hack", - "proc-macro-nested", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "g2gen" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc100b16c63808c5c388cd23ff94c5a35cf28ea459f336323f7948a39480555" -dependencies = [ - "g2poly", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "g2p" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf09bc632629cbe5420b330e45bcc8f80403e74ba1027d213258914fd5c62755" -dependencies = [ - "g2gen", - "g2poly", -] - -[[package]] -name = "g2poly" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e837767888fca507f07e89c90e0b350da7bbb89170f67a4655dc9bdc4cca457b" - -[[package]] -name = "generic-array" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.10.2+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "ghash" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b442c439366184de619215247d24e908912b175e824a530253845ac4c251a5c1" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gif" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a668f699973d0f573d15749b7002a9ac9e1f9c6b220e7b165601334c173d8de" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gloo-timers" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "h2" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hebbot" -version = "2.1.0" -dependencies = [ - "async-trait", - "chrono", - "log", - "matrix-sdk", - "mime", - "pretty_env_logger", - "rand 0.8.4", - "regex", - "ruma", - "serde", - "serde_json", - "tokio", - "toml", - "url", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac", - "digest", -] - -[[package]] -name = "http" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" - -[[package]] -name = "httpdate" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" - -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - -[[package]] -name = "hyper" -version = "0.14.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif", - "jpeg-decoder", - "num-iter", - "num-rational", - "num-traits", - "png", - "scoped_threadpool", - "tiff", -] - -[[package]] -name = "indexmap" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" -dependencies = [ - "autocfg", - "hashbrown", - "serde", -] - -[[package]] -name = "indoc" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136" -dependencies = [ - "unindent", -] - -[[package]] -name = "instant" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" -dependencies = [ - "cfg-if", - "js-sys", - "time 0.2.27", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "ipnet" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" - -[[package]] -name = "itertools" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "jpeg-decoder" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "js_int" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaba9bcd19568a4b4b3736b23e368e5b75e3ea126fd4cb3e4ad2ea5af274fd" -dependencies = [ - "serde", -] - -[[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.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" - -[[package]] -name = "lock_api" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "lru" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "matrix-qrcode" -version = "0.1.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk#1fd1570e0717dddb9b9bde4407b64007d17f6695" -dependencies = [ - "base64", - "byteorder", - "image", - "qrcode", - "rqrr", - "ruma-identifiers", - "thiserror", -] - -[[package]] -name = "matrix-sdk" -version = "0.3.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk#1fd1570e0717dddb9b9bde4407b64007d17f6695" -dependencies = [ - "backoff", - "bytes", - "dashmap", - "futures", - "futures-timer", - "http", - "matrix-sdk-base", - "matrix-sdk-common", - "mime", - "reqwest", - "ruma", - "serde_json", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "url", - "zeroize", -] - -[[package]] -name = "matrix-sdk-base" -version = "0.3.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk#1fd1570e0717dddb9b9bde4407b64007d17f6695" -dependencies = [ - "chacha20poly1305", - "dashmap", - "futures", - "hmac", - "lru", - "matrix-sdk-common", - "matrix-sdk-crypto", - "pbkdf2", - "rand 0.8.4", - "ruma", - "serde", - "serde_json", - "sha2", - "sled", - "thiserror", - "tokio", - "tracing", - "zeroize", -] - -[[package]] -name = "matrix-sdk-common" -version = "0.3.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk#1fd1570e0717dddb9b9bde4407b64007d17f6695" -dependencies = [ - "async-trait", - "futures", - "futures-locks", - "instant", - "ruma", - "serde", - "tokio", - "uuid", - "wasm-bindgen-futures", -] - -[[package]] -name = "matrix-sdk-crypto" -version = "0.3.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk#1fd1570e0717dddb9b9bde4407b64007d17f6695" -dependencies = [ - "aes", - "aes-gcm", - "atomic", - "base64", - "byteorder", - "dashmap", - "futures", - "getrandom 0.2.3", - "hmac", - "matrix-qrcode", - "matrix-sdk-common", - "olm-rs", - "pbkdf2", - "ruma", - "serde", - "serde_json", - "sha2", - "sled", - "thiserror", - "tracing", - "zeroize", -] - -[[package]] -name = "memchr" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" - -[[package]] -name = "memoffset" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "mio" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "native-tls" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "olm-rs" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8962a1fc909accf520991dcda872888554ecf16320097e02d3bd9981844a24ae" -dependencies = [ - "getrandom 0.2.3", - "olm-sys", - "serde", - "serde_json", - "zeroize", -] - -[[package]] -name = "olm-sys" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "067ed86d3c0ab5d9009601082cd16a438e2104174f956d38fc81e0ad56f5696b" -dependencies = [ - "cmake", -] - -[[package]] -name = "once_cell" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" - -[[package]] -name = "openssl-sys" -version = "0.9.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "parking_lot" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "paste" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" - -[[package]] -name = "pbkdf2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" -dependencies = [ - "crypto-mac", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pin-project" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" -dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkcs8" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbee84ed13e44dd82689fa18348a49934fa79cc774a344c42fc9b301c71b140a" -dependencies = [ - "der", - "spki", - "zeroize", -] - -[[package]] -name = "pkg-config" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" - -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags", - "crc32fast", - "deflate", - "miniz_oxide 0.3.7", -] - -[[package]] -name = "poly1305" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fcffab1f78ebbdf4b93b68c1ffebc24037eedf271edaca795732b24e5e4e349" -dependencies = [ - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "polyval" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ba6a405ef63530d6cb12802014b22f9c5751bd17cdcddbe9e46d5c8ae83287" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "pretty_env_logger" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" -dependencies = [ - "env_logger", - "log", -] - -[[package]] -name = "proc-macro-crate" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" -dependencies = [ - "thiserror", - "toml", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" -dependencies = [ - "unicode-xid 0.2.2", -] - -[[package]] -name = "qrcode" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" -dependencies = [ - "checked_int_cast", - "image", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2 1.0.28", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", - "rand_hc 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.3", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - -[[package]] -name = "rayon" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "lazy_static", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "reqwest" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" -dependencies = [ - "base64", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "lazy_static", - "log", - "mime", - "native-tls", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "rqrr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a63da014e6f18dbe76e3084feb2f6c5a570ad8d524cc1afff4a6db18404cd" -dependencies = [ - "g2p", - "image", - "lru", -] - -[[package]] -name = "ruma" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a4acf77afac731e1fa133e6952d074af052f02d64909677a66619f52e758261" -dependencies = [ - "assign", - "js_int", - "ruma-api", - "ruma-client-api", - "ruma-common", - "ruma-events", - "ruma-federation-api", - "ruma-identifiers", - "ruma-serde", - "ruma-signatures", - "ruma-state-res", -] - -[[package]] -name = "ruma-api" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6473753f244f057181f975224aeaf5b4e2003f43f2a6279bf0b95f4e0126335" -dependencies = [ - "bytes", - "http", - "percent-encoding", - "ruma-api-macros", - "ruma-identifiers", - "ruma-serde", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "ruma-api-macros" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85286e2c65897079e7dcc120964cca47d5a3c23b7d1e9f730f533060919fedf7" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", -] - -[[package]] -name = "ruma-client-api" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b86eba1c6fce6dd5c7a17ed632515aa7d04bbe6fbaa74c1699fb72c9fcc2d3d" -dependencies = [ - "assign", - "bytes", - "http", - "js_int", - "maplit", - "percent-encoding", - "ruma-api", - "ruma-common", - "ruma-events", - "ruma-identifiers", - "ruma-serde", - "serde", - "serde_json", -] - -[[package]] -name = "ruma-common" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146a88f34b7a084d54eaf790aaf4c25f5d2366ca8f3d1f326985fa5d31d72595" -dependencies = [ - "indexmap", - "js_int", - "ruma-identifiers", - "ruma-serde", - "serde", - "serde_json", - "tracing", - "wildmatch", -] - -[[package]] -name = "ruma-events" -version = "0.23.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da5f1472d60803e06744f83040a055948fd5bc1f4344d3e555ea378d0d6c96d" -dependencies = [ - "indoc", - "js_int", - "ruma-common", - "ruma-events-macros", - "ruma-identifiers", - "ruma-serde", - "serde", - "serde_json", -] - -[[package]] -name = "ruma-events-macros" -version = "0.23.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85929d84b29c4ce034bd1742e13d7ca25d885831f0185b73f7f9a9094296e1c4" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", -] - -[[package]] -name = "ruma-federation-api" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5206d4922c5dbd3b6faf2aaec9b5551fdf710ef73cc2145f13d0a5bb3945dc" -dependencies = [ - "js_int", - "ruma-api", - "ruma-common", - "ruma-events", - "ruma-identifiers", - "ruma-serde", - "serde", - "serde_json", -] - -[[package]] -name = "ruma-identifiers" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be9ce339ce206dd5eb5eb29b7ad1b964652d46345bc46f25d68105effc75f4b" -dependencies = [ - "paste", - "ruma-identifiers-macros", - "ruma-identifiers-validation", - "ruma-serde", - "ruma-serde-macros", - "serde", -] - -[[package]] -name = "ruma-identifiers-macros" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c7bc7e132a84f8d03924cf63d3a37bd87ffee5c29fee69b9125d045c7e4020" -dependencies = [ - "quote 1.0.9", - "ruma-identifiers-validation", - "syn 1.0.74", -] - -[[package]] -name = "ruma-identifiers-validation" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8edeb165c4dcb8c93d1b7396b32fd5f52c5d9c7e7898ab87d772f824fe642f7c" - -[[package]] -name = "ruma-serde" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63074bc5313acbb4145c7a98c2aa90f1a5b218926ed10d3d71c469664326a4dc" -dependencies = [ - "bytes", - "form_urlencoded", - "itoa", - "js_int", - "ruma-serde-macros", - "serde", - "serde_json", -] - -[[package]] -name = "ruma-serde-macros" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025cad7b962e7fb95f9e2df20339ec8ab1c250c9fb148b201f374ce41919d32c" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", -] - -[[package]] -name = "ruma-signatures" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d83873429181c7747b42fce80d86be84d63fd178e83573472c93143643b7a67" -dependencies = [ - "base64", - "ed25519-dalek", - "pkcs8", - "rand 0.7.3", - "ruma-identifiers", - "ruma-serde", - "serde_json", - "sha2", - "thiserror", - "tracing", -] - -[[package]] -name = "ruma-state-res" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50be7be79f1036dfdacda38e94f334e99f845db2e414887eedb757d065a05594" -dependencies = [ - "itertools", - "js_int", - "maplit", - "ruma-common", - "ruma-events", - "ruma-identifiers", - "ruma-serde", - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi", -] - -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "security-framework" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "send_wrapper" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" - -[[package]] -name = "serde" -version = "1.0.127" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.127" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" -dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", -] - -[[package]] -name = "serde_json" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" - -[[package]] -name = "sha2" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" -dependencies = [ - "block-buffer", - "cfg-if", - "cpufeatures", - "digest", - "opaque-debug", -] - -[[package]] -name = "signature" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335" - -[[package]] -name = "slab" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" - -[[package]] -name = "sled" -version = "0.34.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0132f3e393bcb7390c60bb45769498cf4550bcb7a21d7f95c02b69f6362cdc" -dependencies = [ - "crc32fast", - "crossbeam-epoch", - "crossbeam-utils", - "fs2", - "fxhash", - "libc", - "log", - "parking_lot", -] - -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - -[[package]] -name = "socket2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spki" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987637c5ae6b3121aba9d513f869bd2bff11c4cc086c22473befd6649c0bd521" -dependencies = [ - "der", -] - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "serde", - "serde_derive", - "syn 1.0.74", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2 1.0.28", - "quote 1.0.9", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.74", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" -dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "unicode-xid 0.2.2", -] - -[[package]] -name = "synstructure" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" -dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", - "unicode-xid 0.2.2", -] - -[[package]] -name = "tempfile" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" -dependencies = [ - "cfg-if", - "libc", - "rand 0.8.4", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" -dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", -] - -[[package]] -name = "tiff" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" -dependencies = [ - "jpeg-decoder", - "miniz_oxide 0.4.4", - "weezl", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2 1.0.28", - "quote 1.0.9", - "standback", - "syn 1.0.74", -] - -[[package]] -name = "tinyvec" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "pin-project-lite", - "tokio-macros", - "winapi", -] - -[[package]] -name = "tokio-macros" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" -dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -dependencies = [ - "serde", -] - -[[package]] -name = "tower-service" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" - -[[package]] -name = "tracing" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" -dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", -] - -[[package]] -name = "tracing-core" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "typenum" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" - -[[package]] -name = "unicode-bidi" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "unindent" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.3", - "serde", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "wasm-bindgen" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586" -dependencies = [ - "cfg-if", - "serde", - "serde_json", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f" -dependencies = [ - "bumpalo", - "lazy_static", - "log", - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16646b21c3add8e13fdb8f20172f8a28c3dbf62f45406bcff0233188226cfe0c" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c" -dependencies = [ - "quote 1.0.9", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f" -dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" - -[[package]] -name = "web-sys" -version = "0.3.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "weezl" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e" - -[[package]] -name = "wildmatch" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c48bd20df7e4ced539c12f570f937c6b4884928a87fee70a479d72f031d4e0" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi", -] - -[[package]] -name = "zeroize" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1" -dependencies = [ - "proc-macro2 1.0.28", - "quote 1.0.9", - "syn 1.0.74", - "synstructure", -] diff --git a/pkgs/servers/matrix-hebbot/default.nix b/pkgs/servers/matrix-hebbot/default.nix deleted file mode 100644 index 24d1d89ecde5a..0000000000000 --- a/pkgs/servers/matrix-hebbot/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, fetchFromGitHub -, pkgs -, stdenv -, rustPlatform -, pkg-config -, cmake -, openssl -, autoconf -, automake -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "hebbot"; - version = "2.1"; - - src = fetchFromGitHub { - owner = "haecker-felix"; - repo = "hebbot"; - rev = "v${version}"; - sha256 = "sha256-zcsoTWpNonkgJLTC8S9Nubnzdhj5ROL/UGNWUsLxLgs="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "matrix-qrcode-0.1.0" = "sha256-g78Ql+r5NYNcnkoirH9E6AHagZgBCgxBfweaX1D0z0E="; - }; - }; - - nativeBuildInputs = [ pkg-config cmake ] ++ - lib.optionals stdenv.isDarwin [ autoconf automake ]; - - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - - meta = with lib; { - 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/v${version}"; - license = with licenses; [ agpl3Only ]; - mainProgram = "hebbot"; - maintainers = with maintainers; [ a-kenji ]; - }; -} diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c5179d10f848b..b464696df5a20 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -17,20 +17,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.113.0"; + version = "1.116.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-8Ts2QOSugPU8Do1Mpusez9tSqiaB+UzCWWY4XJk/KRM="; + hash = "sha256-TDVqRdp723zq57rb5ZFIX8lqA5D2p9akqNXvoJXSIKg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Jlnv3GAobrXaO5fBq6oI9Gq8phz2/jFc+QIUYsUyeNo="; + hash = "sha256-GSl4B2EVENspJsQ9jVh+gPJaRlCZwaPStjz5ALSzj/U="; }; postPatch = '' @@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; @@ -96,7 +96,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ twisted.optional-dependencies.tls; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { postgres = if isPyPy then [ psycopg2cffi ] else [ @@ -138,9 +138,9 @@ python3.pkgs.buildPythonApplication rec { mock parameterized ]) - ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ++ lib.flatten (lib.attrValues optional-dependencies); - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 993fa909b1a8c..c17f0fcec98fc 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -13,19 +13,19 @@ let pname = "matrix-appservice-irc"; - version = "2.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ue3fOkrEBRI/NRE+uKFR+NaqP8QvzVVeX3LUh4aZYJA="; + hash = "sha256-ugnFlvu5kkfTHPD44/F8OvGUx55VcHQvTS99T7Wc2fE="; }; yarnOfflineCache = fetchYarnDeps { name = "${pname}-${version}-offline-cache"; yarnLock = "${src}/yarn.lock"; - hash = "sha256-hapEbdjvvzeZHfrpYRW9W3vXkQVNyGZ0qydO34+mQqQ="; + hash = "sha256-PObpXC8VIdsqhOZLLeHdS9mvXnjNQOrs2vlTeK5keRw="; }; in diff --git a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix index e728e1cb013ab..364abdb951963 100644 --- a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix +++ b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/matrix-org/mjolnir/blob/main/docs/synapse_module.md"; license = licenses.asl20; maintainers = with maintainers; [ jojosch ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix index 08baf4a78576f..ba85de7aba2f1 100644 --- a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix +++ b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "matrix-synapse-s3-storage-provider"; - version = "1.4.0"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "matrix-org"; repo = "synapse-s3-storage-provider"; rev = "refs/tags/v${version}"; - hash = "sha256-LOkSsgxHoABiiVtqssBaWYUroQBzzaJ3SclYcEMm2Mk="; + hash = "sha256-Nv8NkzOcUDX17N7Lyx/NT1vXztiRNaTYIAWNPHxgxJ4="; }; postPatch = '' diff --git a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/default.nix b/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/default.nix index a66a1bdb89fee..de1cc21cf47df 100644 --- a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/default.nix +++ b/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Tool to compress some state in a Synapse instance's database"; homepage = "https://github.com/matrix-org/rust-synapse-compress-state"; license = licenses.asl20; diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix deleted file mode 100644 index 023bbe9ddc1e6..0000000000000 --- a/pkgs/servers/matterbridge/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "matterbridge"; - version = "1.26.0"; - - src = fetchFromGitHub { - owner = "42wim"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-APlnJUu/ttK/S2AxO+SadU2ttmEnU+js/3GUf3x0aSQ="; - }; - - subPackages = [ "." ]; - - vendorHash = null; - - meta = with lib; { - 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 licenses; [ asl20 ]; - maintainers = with maintainers; [ ryantm ]; - mainProgram = "matterbridge"; - }; -} diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index cb7897853b520..3857e5abd45de 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonPackage rec { aiohttp asyncpg commonmark - mautrix + (mautrix.override { withOlm = true; }) paho-mqtt pillow prometheus-client diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/servers/mautrix-googlechat/default.nix index e0f5bc80b8f14..a352b5ab8e875 100644 --- a/pkgs/servers/mautrix-googlechat/default.nix +++ b/pkgs/servers/mautrix-googlechat/default.nix @@ -7,13 +7,13 @@ , enableSqlite ? true }: python3.pkgs.buildPythonApplication rec { pname = "mautrix-googlechat"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "googlechat"; rev = "refs/tags/v${version}"; - hash = "sha256-a/EWz/aCkBE6XdDpmZcx2Q7/xKNwGCiZUhZc9YIIDhU="; + hash = "sha256-4H+zUH0GEQ5e/9Bv0BVdf1/pXulx2ihZrhJ+jl/db+U="; }; patches = [ @@ -32,7 +32,7 @@ install -D mautrix_googlechat/example-config.yaml $out/$baseConfigPath ''; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { e2be = [ python-olm pycryptodome @@ -55,10 +55,10 @@ commonmark python-magic protobuf - mautrix - ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be - ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics - ++ lib.optionals enableSqlite passthru.optional-dependencies.sqlite; + (mautrix.override { withOlm = enableE2be; }) + ] ++ lib.optionals enableE2be optional-dependencies.e2be + ++ lib.optionals enableMetrics optional-dependencies.metrics + ++ lib.optionals enableSqlite optional-dependencies.sqlite; doCheck = false; diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 309f7df1a62b3..d2d7274bf8adc 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -1,24 +1,36 @@ -{ lib, buildGoModule, fetchFromGitHub, olm, libsignal-ffi }: +{ + lib, + buildGoModule, + fetchFromGitHub, + olm, + libsignal-ffi, + # This option enables the use of an experimental pure-Go implementation of + # the Olm protocol instead of libolm for end-to-end encryption. Using goolm + # is not recommended by the mautrix developers, but they are interested in + # people trying it out in non-production-critical environments and reporting + # any issues they run into. + withGoolm ? false, +}: buildGoModule rec { pname = "mautrix-signal"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; rev = "v${version}"; - hash = "sha256-KBb/rLYM2ne4VD/bPy/lcXD0avCx3J74e3zDcmg+Dzs="; + hash = "sha256-OjWRdYAxjYMGZswwKqGKUwCIc5qHkNBTQgIcbiRquH0="; }; - buildInputs = [ - olm + buildInputs = (lib.optional (!withGoolm) olm) ++ [ # must match the version used in https://github.com/mautrix/signal/tree/main/pkg/libsignalgo # see https://github.com/mautrix/signal/issues/401 libsignal-ffi ]; + tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-DDcz4O3RhV6OVI+qC/LkDW/UsE5jOAn5t/gmILxHx1s="; + vendorHash = "sha256-oV8ILDEyMpOZy5m2mnPAZj5XAhleO8yNz49wxvZboVs="; doCheck = false; @@ -26,7 +38,11 @@ buildGoModule rec { homepage = "https://github.com/mautrix/signal"; description = "Matrix-Signal puppeting bridge"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ expipiplus1 niklaskorz ma27 ]; + maintainers = with maintainers; [ + expipiplus1 + niklaskorz + ma27 + ]; mainProgram = "mautrix-signal"; }; } diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 4e9d00a9534b4..53bdb18c22ae8 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -43,7 +43,7 @@ python.pkgs.buildPythonPackage rec { commonmark aiohttp yarl - mautrix + (mautrix.override { withOlm = withE2BE; }) tulir-telethon asyncpg mako diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index d7bad1c9c79b8..b66dad00dad55 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,4 +1,15 @@ -{ lib, buildGoModule, fetchFromGitHub, olm }: +{ + lib, + buildGoModule, + fetchFromGitHub, + olm, + # This option enables the use of an experimental pure-Go implementation of + # the Olm protocol instead of libolm for end-to-end encryption. Using goolm + # is not recommended by the mautrix developers, but they are interested in + # people trying it out in non-production-critical environments and reporting + # any issues they run into. + withGoolm ? false, +}: buildGoModule rec { pname = "mautrix-whatsapp"; @@ -11,7 +22,8 @@ buildGoModule rec { hash = "sha256-iVILI6OGndnxIVmgNcIwHA64tkv9V3OTH3YtrCyeYx4="; }; - buildInputs = [ olm ]; + buildInputs = lib.optional (!withGoolm) olm; + tags = lib.optional withGoolm "goolm"; vendorHash = "sha256-DpgkSXSLF+U6zIzJ4AF2uTcFWQQYsRgkaUTG9F+bnVk="; diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index ef30a8772f9a8..58c3bab2b1604 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -15,16 +15,16 @@ in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-iCUCQLMWB0cH9SuudP1KvSD1X58hvYgE30nIh2FpKlY="; + hash = "sha256-DCt0P0DHlWFAQ5i4+7U5+Q2XcCPlSZrlj+Ljcyg/Wj0="; }; - vendorHash = "sha256-TiI02M6k1zN/iWJntOfc9EY5xFo3ESOtdDSumxYmSU0="; + vendorHash = "sha256-YKNNQPEdO8K7Lpm/S86GKD3QcNcyvwZSrBspZJMJ78Y="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index ccc9fff51ace6..71e77f4940add 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=deprecated-declarations" ] - ++ lib.optional stdenv.isDarwin "-Wno-error"); + ++ lib.optional stdenv.hostPlatform.isDarwin "-Wno-error"); meta = with lib; { description = "Distributed memory object caching system"; diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 2036d31e5b20f..1454f4994c15a 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { chmod +x $out/bin/meteor ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # Patch Meteor to dynamically fixup shebangs and ELF metadata where # necessary. pushd $out diff --git a/pkgs/servers/microbin/default.nix b/pkgs/servers/microbin/default.nix index 55ebc572b686e..62cb97ce1b2fb 100644 --- a/pkgs/servers/microbin/default.nix +++ b/pkgs/servers/microbin/default.nix @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix index acc223627fce6..810128a5d6eaa 100644 --- a/pkgs/servers/microserver/default.nix +++ b/pkgs/servers/microserver/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-JGsMtlWuww1rYE4w6i2VlyD6gGHqnLehLDZmW57R+Fo="; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); meta = with lib; { homepage = "https://github.com/robertohuertasm/microserver"; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix deleted file mode 100644 index 9e0e854435c8d..0000000000000 --- a/pkgs/servers/miniflux/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch2, installShellFiles, nixosTests }: - -buildGoModule rec { - pname = "miniflux"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "miniflux"; - repo = "v2"; - rev = "refs/tags/${version}"; - hash = "sha256-JE0sHxmvLGvbgOqH5f7OONAvP93dJLWLAbgTnlNHGHE="; - }; - - vendorHash = "sha256-Y5FcKmvYMN9Q9/VpP8IWclFXt7gl61UiyPJ+Rdmlito="; - - nativeBuildInputs = [ installShellFiles ]; - - checkFlags = [ "-skip=TestClient" ]; # skip client tests as they require network access - - ldflags = [ - "-s" "-w" "-X miniflux.app/v2/internal/version.Version=${version}" - ]; - - postInstall = '' - mv $out/bin/miniflux.app $out/bin/miniflux - installManPage miniflux.1 - ''; - - passthru.tests = nixosTests.miniflux; - - meta = with lib; { - description = "Minimalist and opinionated feed reader"; - homepage = "https://miniflux.app/"; - license = licenses.asl20; - maintainers = with maintainers; [ rvolosatovs benpye emilylange ]; - mainProgram = "miniflux"; - }; -} diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 811c6b8133618..7d872128f1f98 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-08-26T15-33-07Z"; + version = "2024-09-22T00-33-43Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-ZQzHKosJfjtr++jrRvbY9w3x5uXXjw/eNrgcf3+6/2c="; + hash = "sha256-/2H79fJYdusFNBXj/2i4p+O16wseHzPzJ5LnS1O+Gm4="; }; - vendorHash = "sha256-L4mmQyXd/NQkKBHMKCLWs4A9XFKdrpcy+SYx2ExvqQE="; + vendorHash = "sha256-MDClQjCh/ygdbybE4jIoWGBsqr3roNn7stXUw9eoN2Y="; doCheck = false; diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix index fa147541fc4ba..4041ae7cf087e 100644 --- a/pkgs/servers/mir/common.nix +++ b/pkgs/servers/mir/common.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + nixosTests, testers, cmake, pkg-config, @@ -12,6 +13,7 @@ glib, glm, glog, + libapparmor, libdrm, libepoxy, libevdev, @@ -58,28 +60,31 @@ stdenv.mkDerivation (finalAttrs: { inherit patches; - postPatch = '' - # Fix scripts that get run in tests - patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in - - # Fix LD_PRELOADing in tests - substituteInPlace \ - cmake/MirCommon.cmake \ - tests/umock-acceptance-tests/CMakeLists.txt \ - tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt \ - tests/unit-tests/CMakeLists.txt \ - --replace-warn 'LD_PRELOAD=liblttng-ust-fork.so' 'LD_PRELOAD=${lib.getLib lttng-ust}/lib/liblttng-ust-fork.so' \ - --replace-warn 'LD_PRELOAD=libumockdev-preload.so.0' 'LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0' - - # Fix Xwayland default - substituteInPlace src/miral/x11_support.cpp \ - --replace-fail '/usr/bin/Xwayland' '${lib.getExe xwayland}' - - # Fix paths for generating drm-formats - substituteInPlace src/platform/graphics/CMakeLists.txt \ - --replace-fail "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \ - --replace-fail "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" - ''; + postPatch = + '' + # Fix scripts that get run in tests + patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in + + # Fix LD_PRELOADing in tests + substituteInPlace \ + cmake/MirCommon.cmake \ + tests/umock-acceptance-tests/CMakeLists.txt \ + tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt \ + tests/unit-tests/CMakeLists.txt \ + --replace-warn 'LD_PRELOAD=liblttng-ust-fork.so' 'LD_PRELOAD=${lib.getLib lttng-ust}/lib/liblttng-ust-fork.so' \ + --replace-warn 'LD_PRELOAD=libumockdev-preload.so.0' 'LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0' + + # Fix Xwayland default + substituteInPlace src/miral/x11_support.cpp \ + --replace-fail '/usr/bin/Xwayland' '${lib.getExe xwayland}' + '' + + lib.optionalString (lib.strings.versionOlder version "2.18.0") '' + + # Fix paths for generating drm-formats + substituteInPlace src/platform/graphics/CMakeLists.txt \ + --replace-fail "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \ + --replace-fail "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" + ''; strictDeps = true; @@ -127,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXcursor xorg.xorgproto xwayland - ]; + ] ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [ libapparmor ]; nativeCheckInputs = [ dbus @@ -181,7 +186,9 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + } // lib.optionalAttrs (!pinned) { inherit (nixosTests) miriway miracle-wm; }; providedSessions = lib.optionals (lib.strings.versionOlder version "2.16.0") [ # More of an example than a fully functioning shell, some notes for the adventurous: # - ~/.config/miral-shell.config is one possible user config location, @@ -192,36 +199,35 @@ stdenv.mkDerivation (finalAttrs: { # does not know about preferred terminal "mir-shell" ]; - } // lib.optionalAttrs (!pinned) { - updateScript = ./update.sh; - }; + } // lib.optionalAttrs (!pinned) { updateScript = ./update.sh; }; - meta = with lib; { + meta = { description = "Display server and Wayland compositor developed by Canonical"; homepage = "https://mir-server.io"; changelog = "https://github.com/canonical/mir/releases/tag/v${finalAttrs.version}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ onny OPNA2608 ]; - platforms = platforms.linux; - pkgConfigModules = [ - "miral" - "mircommon" - "mircore" - "miroil" - "mirplatform" - "mir-renderer-gl-dev" - "mirrenderer" - "mirserver" - "mirtest" - "mirwayland" - ] ++ lib.optionals (lib.strings.versionOlder version "2.17.0") [ - "mircookie" - ] ++ lib.optionals (lib.strings.versionAtLeast version "2.17.0") [ - "mircommon-internal" - "mirserver-internal" - ]; + platforms = lib.platforms.linux; + pkgConfigModules = + [ + "miral" + "mircommon" + "mircore" + "miroil" + "mirplatform" + "mir-renderer-gl-dev" + "mirrenderer" + "mirserver" + "mirtest" + "mirwayland" + ] + ++ lib.optionals (lib.strings.versionOlder version "2.17.0") [ "mircookie" ] + ++ lib.optionals (lib.strings.versionAtLeast version "2.17.0") [ + "mircommon-internal" + "mirserver-internal" + ]; }; }) diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index b61419eacf47f..bbf250bf7a565 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -5,8 +5,8 @@ let in { mir = common { - version = "2.17.0"; - hash = "sha256-iDJ7NIFoSSXjMrHK2I6Linf7z0hvShj8fr6BGxgK5gE="; + version = "2.18.2"; + hash = "sha256-Yko5ws8dUazPziXzM77Zg4p1taC0mbjAcpOKJR0dJ5M="; }; mir_2_15 = common { diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 4f653a50a9729..11ffcbcd3b6bd 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.29.0"; + version = "3.30.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-mTg3eN5ZmzQxItPq8ghPpFafr6zF+nliofGEKShnH88="; + hash = "sha256-UB3LYXRr6GnqVCRwAxnwqBCkOtor3mC4k73kPesZs0g="; }; - vendorHash = "sha256-wrgRQwisOHAhvRbvGXMW5VWkQuEifCwCo3usuxLie4A="; + vendorHash = "sha256-FYLH1Ej8Bm0+tS5Ikj1CPF+1t5opmzee8iHRZSW94Yk="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/pkgs/servers/misc/qremotecontrol-server/default.nix index 5fba2c0a382f7..104a2b876c9ba 100644 --- a/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation { powering on the computer via Wake On Lan is supported. ''; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index d001d245d4c0a..3158f9b2424b9 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -22,6 +22,6 @@ buildGoModule { license = licenses.mit; homepage = "https://bosun.org"; maintainers = with maintainers; [ offline ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix index b3f5caa29da15..58e4be36878ad 100644 --- a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix +++ b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { pname = "buildkite-agent-metrics"; - version = "5.9.7"; + version = "5.9.9"; outputs = [ "out" "lambda" ]; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "buildkite"; repo = "buildkite-agent-metrics"; rev = "v${version}"; - hash = "sha256-HHTPgrMNxaX2fbkf7oasrEopXg6ocMSwdymeNAIrckg="; + hash = "sha256-Y39v+OBhR4WpytCeQN6qBuQpdwKlEgiKgeG5U79QFxU="; }; vendorHash = "sha256-i2+nefRE4BD93rG842oZj0/coamYVRMPxEHio80bdWk="; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index a297c85bed3c6..487741866464f 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cadvisor"; - version = "unstable-2023-10-22"; + version = "0.49.1"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; - rev = "bf2a7fee4170e418e7ac774af7679257fe26dc69"; - hash = "sha256-wf5TtUmBC8ikpaUp3KLs8rBMunFPevNYYoactudHMsU="; + rev = "v${version}"; + hash = "sha256-Hr9L9cewJN1ibh+6L0XhxxNAH4U8TrK+j7YBjS6FzZc="; }; modRoot = "./cmd"; - vendorHash = "sha256-LEtiJC3L6Q7MZH2gvpR9y2Zn9vig+9mWlRyVuKY3rsA="; + vendorHash = "sha256-9h+W+zuwxlpkBaCpk1otrBrwfyitfGLViOcZRpKB3uU="; ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 98a26fa5a9f5c..1382302def422 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,21 +15,21 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.42.0"; + version = "0.43.3"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-qSxm00zC1Ms9C5R077Zn5FKluEqFs8KYUPnDUaMvMs8="; + hash = "sha256-10H3qcvjbmwKL06u+gCxfAdn1z6HaJ/8sWoVa2/ojnA="; }; - vendorHash = "sha256-rC8iqCZ6tzXVCOHNqH+jAMDh2yTAR88zj45HcgJ2lSg="; + vendorHash = "sha256-NtFdrdDnuLT5CSax81smNnZxe+I9OouwVyIANyTNzF8="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { yarnLock = src + "/internal/web/ui/yarn.lock"; - hash = "sha256-FvrfWcuKld242YfZ8CixF5GGFRp8iFWZ3Vkef3Kf4ag="; + hash = "sha256-bnJL7W7VfJIrJKvRt9Q6kdEyjLH/IJoCi0TENxz7SUE="; }; ldflags = let @@ -79,12 +79,12 @@ buildGoModule rec { # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isLinux [ "-I${lib.getDev systemd}/include" ]); + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isLinux [ "-I${lib.getDev systemd}/include" ]); # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at # runtime. # Add to RUNPATH so it can be found. - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/grafana-agent)" \ $out/bin/grafana-agent diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 9015c2a7ca594..0c949ed7ce9fe 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,18 +7,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.11.3"; + version = "3.11.5"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-a++aQt2y7+Nrvjka9XV7j8YwmppWFnUffFO4XEiZVvo="; + hash = "sha256-ARrK6eL5G/IdJ4AgcpgyfCNA0cDBdj4bM1elFuXDCmM="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-rW9mxrM4aHKGojyRbsxQe3ZZJQ8I42PJ0MplkVu3qyA="; + hash = "sha256-+WxZ5gJgRBhKy9igkw8r/J7r1R/L/EYL3AGjCuwmMb0="; }; packageJSON = ./package.json; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index adc7428a89fdd..48e49521f9420 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -28,10 +28,10 @@ "@grpc/grpc-js": "^1.8.22", "@grpc/proto-loader": "^0.7.2", "@hapi/boom": "^10.0.0", - "@puppeteer/browsers": "^1.6.0", + "@puppeteer/browsers": "^2.3.1", "chokidar": "^3.5.2", "dompurify": "^2.4.0", - "express": "^4.19.2", + "express": "^4.21.0", "express-prom-bundle": "^6.5.0", "jimp": "^0.22.12", "jsdom": "20.0.0", @@ -40,10 +40,10 @@ "morgan": "^1.9.0", "multer": "^1.4.5-lts.1", "on-finished": "^2.3.0", - "poolpeteer": "^0.23.0", + "poolpeteer": "^0.24.0", "prom-client": "^14.1.0", - "puppeteer": "^21.0.3", - "puppeteer-cluster": "^0.23.0", + "puppeteer": "^22.8.2", + "puppeteer-cluster": "^0.24.0", "unique-filename": "^2.0.1", "winston": "^3.8.2" }, @@ -59,7 +59,7 @@ "@types/supertest": "^2.0.15", "@typescript-eslint/eslint-plugin": "5.37.0", "@typescript-eslint/parser": "5.37.0", - "axios": "1.6.7", + "axios": "1.7.4", "cross-env": "7.0.3", "eslint": "8.23.1", "fast-png": "^6.2.0", diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 4eca91169012c..89b7cec1023d1 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "grafana"; - version = "11.2.0"; + version = "11.2.1"; subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; @@ -16,13 +16,13 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-SthxNf8e8LEV0LSdVR/x6UXOXy+lGAUqHtQd0bQufjY="; + hash = "sha256-rMRzrGdTPfGzMtE3xej5dSOjyyEMn66oPjDUWifMjnQ="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 env = { CYPRESS_INSTALL_BINARY = 0; - } // lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { # Fix error: no member named 'aligned_alloc' in the global namespace. # Occurs while building @esfx/equatable@npm:1.0.2 on x86_64-darwin NIX_CFLAGS_COMPILE = "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; @@ -35,7 +35,7 @@ buildGoModule rec { yarn nodejs cacert jq moreutils python3 # @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild` - ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ]; buildPhase = '' runHook preBuild export HOME="$(mktemp -d)" @@ -51,21 +51,21 @@ buildGoModule rec { dontFixup = true; outputHashMode = "recursive"; outputHash = rec { - x86_64-linux = "sha256-Fo6WsgrFTp79wk+nPuUbPklneTvE+/ki0hX3IE8WR94="; + x86_64-linux = "sha256-rz/IP6wi4VKWgO8P4Mov3oviwsDe5iBSKamArVR/+T0="; aarch64-linux = x86_64-linux; - aarch64-darwin = "sha256-C2zo+ykk5Zr5DDO4AB9wkc8jgn82VY8WlTR3XiqbD/0="; + aarch64-darwin = "sha256-9J9wD8nJ4JEUKroxCEBYZytywzjGkGhujdj9FcNe0rM="; x86_64-darwin = aarch64-darwin; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; disallowedRequisites = [ offlineCache ]; - vendorHash = "sha256-Pmh+tSJR7l34Ncr2DexjvbWRxnWLG3rzuz4n8vpPbx0="; + vendorHash = "sha256-shQ39N9YxksfzHDgHx3qjLbZfv5D1+sqtpALI0hCK3U="; proxyVendor = true; nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 faketty ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ]; postConfigure = '' # Generate DI code that's required to compile the package. diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 20525bfbf9653..76048222edb7e 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -42,7 +42,7 @@ let sourceRoot = "${src.name}/libflux"; cargoHash = "sha256-oAMoGGdR0QEjSzZ0/J5J9s/ekSlryCcRBSo5N2r70Ko="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; pkgcfg = '' Name: flux Version: ${libflux_version} @@ -56,7 +56,7 @@ let cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include substitute $pkgcfgPath $out/pkgconfig/flux.pc \ --replace /out $out - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib ''; }; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index d70ba0ea19914..7570428d7f3ec 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 00924d94c5ae8..987ec3f5419bf 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -10,14 +10,14 @@ }: buildGoModule rec { - version = "3.1.1"; + version = "3.2.0"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-QOokLht/nIzQAzXQuJv5M4QTQD0Zhzf9+Q0ILl2Mds0="; + hash = "sha256-dche8MbVSlwKMD/znOCj80FNf5KZmEuI3uodrFLrmjM="; }; vendorHash = null; @@ -34,9 +34,9 @@ buildGoModule rec { tags = ["promtail_journal_enabled"]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isLinux [ systemd.dev ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd.dev ]; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/promtail \ --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 9507b5d1dcf45..69538107ad4f3 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -12,8 +12,8 @@ buildGoModule rec { }; nativeBuildInputs = [ makeWrapper ]; - nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ nettools ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ iproute2 ]; vendorHash = "sha256-JIqQXS2iw3opeotpfqC16w7hdu+7XjxhIyVj2M+98ec="; diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index e64ac13754146..96d7544da2c82 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mtail"; - version = "3.0.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "google"; repo = "mtail"; rev = "v${version}"; - hash = "sha256-Rnpf0RgGltSrUPHra5LbvVmS9jftcimYM2Zc39xoxDk="; + hash = "sha256-ZyQpTxWBCU+pmulEXi/Y2PimbNMsUlbEFj8r+gTOTA0="; }; - vendorHash = "sha256-30V+SS+fl1qmK/0i7eB4OGI6pv232kNIMPclRyTNWww="; + vendorHash = "sha256-96r2UWM5HUF69BOGW6buV6juJEDYoiBPmR5iGNmI5WA="; ldflags = [ "-X=main.Branch=main" @@ -24,7 +24,7 @@ buildGoModule rec { ]; # fails on darwin with: write unixgram -> <tmpdir>/rsyncd.log: write: message too long - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Tool for extracting metrics from application logs"; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 5d46addfc9635..d10c614828c79 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nagios"; - version = "4.5.3"; + version = "4.5.4"; src = fetchFromGitHub { owner = "NagiosEnterprises"; repo = "nagioscore"; rev = "refs/tags/nagios-${finalAttrs.version}"; - hash = "sha256-irr6JVCE3krcD3kScGR8maSbvsNPeQFqWm5oNl9OhQU="; + hash = "sha256-QZKSVjaOUDmsQwOlJSTQgy8BuTZ5tcDaJB0a6KttrdU="; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index d7b2549c41779..a8043d57148af 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.83.0"; + version = "2.84.4"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-wGg7KqpnHPz4kSpvM1FEc0om1xoWQNFNQ9Qeq/JfCwg="; + hash = "sha256-HVif2pjVumrf2YFSHbNiL9pfXy8XNeXHRgaIlx/Tzds="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/check_ssl_cert \ - --prefix PATH : "${lib.makeBinPath ([ openssl file which curl bc coreutils bind nmap netcat-gnu python3 ] ++ lib.optional stdenv.isLinux iproute2) }" + --prefix PATH : "${lib.makeBinPath ([ openssl file which curl bc coreutils bind nmap netcat-gnu python3 ] ++ lib.optional stdenv.hostPlatform.isLinux iproute2) }" ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 66085a04babd3..5aa0e8697c58b 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch , file, openssl, perl, nettools -, withPerlTools ? false }: let +, autoreconfHook +, withPerlTools ? false +, darwin }: let perlWithPkgs = perl.withPackages (ps: with ps; [ JSON @@ -25,7 +27,11 @@ in stdenv.mkDerivation rec { in [ (fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m") (fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid") - (fetchAlpinePatch "fix-fd_mask.patch" "/i9ve61HjDzqZt+u1wajNtSQoizl+KePvhcAt24HKd0=") + (fetchpatch { + name = "configure-musl.patch"; + url = "https://github.com/net-snmp/net-snmp/commit/a62169f1fa358be8f330ea8519ade0610fac525b.patch"; + hash = "sha256-+vWH095fFL3wE6XLsTaPXgMDya0LRWdlL6urD5AIBUs="; + }) ]; outputs = [ "bin" "out" "dev" "lib" ]; @@ -39,7 +45,7 @@ in stdenv.mkDerivation rec { "--with-openssl=${openssl.dev}" "--disable-embedded-perl" "--without-perl-modules" - ] ++ lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; + ] ++ lib.optional stdenv.hostPlatform.isLinux "--with-mnttab=/proc/mounts"; postPatch = '' substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" @@ -52,9 +58,15 @@ in stdenv.mkDerivation rec { -e "/NETSNMP_CONFIGURE_OPTIONS/ s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" ''; - nativeBuildInputs = [ nettools file ]; + nativeBuildInputs = [ nettools file autoreconfHook ]; buildInputs = [ openssl ] - ++ lib.optional withPerlTools perlWithPkgs; + ++ lib.optional withPerlTools perlWithPkgs + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.ApplicationServices + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.DiskArbitration + ]; enableParallelBuilding = true; # Missing dependencies during relinking: @@ -74,6 +86,6 @@ in stdenv.mkDerivation rec { description = "Clients and server for the SNMP network monitoring protocol"; homepage = "http://www.net-snmp.org/"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/openobserve/Cargo.lock b/pkgs/servers/monitoring/openobserve/Cargo.lock index 211385d4921e7..52dabf332caaa 100644 --- a/pkgs/servers/monitoring/openobserve/Cargo.lock +++ b/pkgs/servers/monitoring/openobserve/Cargo.lock @@ -2,6 +2,31 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "actix" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de7fa236829ba0841304542f7614c42b80fca007455315c45c785ccfa873a85b" +dependencies = [ + "actix-macros", + "actix-rt", + "actix_derive", + "bitflags 2.5.0", + "bytes", + "crossbeam-channel", + "futures-core", + "futures-sink", + "futures-task", + "futures-util", + "log", + "once_cell", + "parking_lot", + "pin-project-lite", + "smallvec", + "tokio", + "tokio-util", +] + [[package]] name = "actix-codec" version = "0.5.2" @@ -21,9 +46,9 @@ dependencies = [ [[package]] name = "actix-cors" -version = "0.6.5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0346d8c1f762b41b458ed3145eea914966bb9ad20b9be0d6d463b20d45586370" +checksum = "f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331" dependencies = [ "actix-utils", "actix-web", @@ -36,25 +61,25 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743" +checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", "ahash 0.8.11", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.5.0", - "brotli", + "brotli 6.0.0", "bytes", "bytestring", "derive_more", "encoding_rs", "flate2", "futures-core", - "h2", + "h2 0.3.26", "http 0.2.12", "httparse", "httpdate", @@ -80,14 +105,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "actix-multipart" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b960e2aea75f49c8f069108063d12a48d329fc8b60b786dfc7552a9d5918d2d" +checksum = "d974dd6c4f78d102d057c672dcf6faa618fafa9df91d44f9c466688fc1275a3a" dependencies = [ "actix-multipart-derive", "actix-utils", @@ -101,6 +126,7 @@ dependencies = [ "log", "memchr", "mime", + "rand", "serde", "serde_json", "serde_plain", @@ -118,27 +144,29 @@ dependencies = [ "parse-size", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "actix-router" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22475596539443685426b6bdadb926ad0ecaefdfc5fb05e5e3441f15463c511" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" dependencies = [ "bytestring", + "cfg-if 1.0.0", "http 0.2.12", "regex", + "regex-lite", "serde", "tracing", ] [[package]] name = "actix-rt" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" dependencies = [ "futures-core", "tokio", @@ -146,9 +174,9 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4" +checksum = "b02303ce8d4e8be5b855af6cf3c3a08f3eff26880faad82bab679c22d3650cb5" dependencies = [ "actix-rt", "actix-service", @@ -174,9 +202,9 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cce60a2f2b477bc72e5cde0af1812a6e82d8fd85b5570a5dcf2a5bf2c5be5f" +checksum = "ac453898d866cdbecdbc2334fe1738c747b4eba14a677261f2b768ba05329389" dependencies = [ "actix-rt", "actix-service", @@ -203,9 +231,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.5.1" +version = "4.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" dependencies = [ "actix-codec", "actix-http", @@ -232,6 +260,7 @@ dependencies = [ "once_cell", "pin-project-lite", "regex", + "regex-lite", "serde", "serde_json", "serde_urlencoded", @@ -241,27 +270,45 @@ dependencies = [ "url", ] +[[package]] +name = "actix-web-actors" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "420b001bb709d8510c3e2659dae046e54509ff9528018d09c78381e765a1f9fa" +dependencies = [ + "actix", + "actix-codec", + "actix-http", + "actix-web", + "bytes", + "bytestring", + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util", +] + [[package]] name = "actix-web-codegen" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "actix-web-httpauth" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d613edf08a42ccc6864c941d30fe14e1b676a77d16f1dbadc1174d065a0a775" +checksum = "456348ed9dcd72a13a1f4a660449fafdecee9ac8205552e286809eb5b0b29bd3" dependencies = [ "actix-utils", "actix-web", - "base64 0.21.7", + "base64 0.22.1", "futures-core", "futures-util", "log", @@ -314,7 +361,7 @@ checksum = "9aa0b287c8de4a76b691f29dbb5451e8dd5b79d777eaf87350c9b0cbfdb5e968" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -342,7 +389,7 @@ dependencies = [ "futures-lite 1.13.0", "pin-project", "prometheus", - "quanta", + "quanta 0.10.1", "thiserror", ] @@ -354,7 +401,7 @@ checksum = "fd68c2339c8e4498a4b9b83392b58b85c337c835baf38c90757e3236e1121c97" dependencies = [ "actix-web", "base64 0.21.7", - "brotli", + "brotli 3.5.0", "chrono", "flate2", "futures-core", @@ -363,11 +410,35 @@ dependencies = [ "rust-embed-for-web", ] +[[package]] +name = "actix-ws" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "535aec173810be3ca6f25dd5b4d431ae7125d62000aa3cbae1ec739921b02cf3" +dependencies = [ + "actix-codec", + "actix-http", + "actix-web", + "futures-core", + "tokio", +] + +[[package]] +name = "actix_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c7db3d5a9718568e4cf4a537cfd7070e6e6ff7481510d0237fb529ac850f6d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -457,9 +528,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -482,49 +553,59 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -532,15 +613,18 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] -name = "anymap" -version = "1.0.0-beta.2" +name = "arbitrary" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] name = "arc-swap" @@ -574,9 +658,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "arrow" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa285343fba4d829d49985bdc541e3789cf6000ed0e84be7c039438df4a4e78c" +checksum = "05048a8932648b63f21c37d88b552ccc8a65afb6dfe9fc9f30ce79174c2e7a85" dependencies = [ "arrow-arith", "arrow-array", @@ -595,9 +679,9 @@ dependencies = [ [[package]] name = "arrow-arith" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "753abd0a5290c1bcade7c6623a556f7d1659c5f4148b140b5b63ce7bd1a45705" +checksum = "1d8a57966e43bfe9a3277984a14c24ec617ad874e4c0e1d2a1b083a39cfbf22c" dependencies = [ "arrow-array", "arrow-buffer", @@ -610,9 +694,9 @@ dependencies = [ [[package]] name = "arrow-array" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d390feeb7f21b78ec997a4081a025baef1e2e0d6069e181939b61864c9779609" +checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c" dependencies = [ "ahash 0.8.11", "arrow-buffer", @@ -621,15 +705,15 @@ dependencies = [ "chrono", "chrono-tz", "half", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "num", ] [[package]] name = "arrow-buffer" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69615b061701bcdffbc62756bc7e85c827d5290b472b580c972ebbbf690f5aa4" +checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1" dependencies = [ "bytes", "half", @@ -638,28 +722,30 @@ dependencies = [ [[package]] name = "arrow-cast" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e448e5dd2f4113bf5b74a1f26531708f5edcacc77335b7066f9398f4bcf4cdef" +checksum = "da26719e76b81d8bc3faad1d4dbdc1bcc10d14704e63dc17fc9f3e7e1e567c8e" dependencies = [ "arrow-array", "arrow-buffer", "arrow-data", "arrow-schema", "arrow-select", - "base64 0.21.7", + "atoi", + "base64 0.22.1", "chrono", "comfy-table", "half", "lexical-core", "num", + "ryu", ] [[package]] name = "arrow-csv" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46af72211f0712612f5b18325530b9ad1bfbdc87290d5fbfd32a7da128983781" +checksum = "c13c36dc5ddf8c128df19bab27898eea64bf9da2b555ec1cd17a8ff57fba9ec2" dependencies = [ "arrow-array", "arrow-buffer", @@ -676,9 +762,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d644b91a162f3ad3135ce1184d0a31c28b816a581e08f29e8e9277a574c64e" +checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5" dependencies = [ "arrow-buffer", "arrow-schema", @@ -688,9 +774,9 @@ dependencies = [ [[package]] name = "arrow-ipc" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03dea5e79b48de6c2e04f03f62b0afea7105be7b77d134f6c5414868feefb80d" +checksum = "e786e1cdd952205d9a8afc69397b317cfbb6e0095e445c69cda7e8da5c1eeb0f" dependencies = [ "arrow-array", "arrow-buffer", @@ -704,9 +790,9 @@ dependencies = [ [[package]] name = "arrow-json" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8950719280397a47d37ac01492e3506a8a724b3fb81001900b866637a829ee0f" +checksum = "fb22284c5a2a01d73cebfd88a33511a3234ab45d66086b2ca2d1228c3498e445" dependencies = [ "arrow-array", "arrow-buffer", @@ -715,7 +801,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.1.0", + "indexmap 2.2.6", "lexical-core", "num", "serde", @@ -724,9 +810,9 @@ dependencies = [ [[package]] name = "arrow-ord" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed9630979034077982d8e74a942b7ac228f33dd93a93b615b4d02ad60c260be" +checksum = "42745f86b1ab99ef96d1c0bcf49180848a64fe2c7a7a0d945bc64fa2b21ba9bc" dependencies = [ "arrow-array", "arrow-buffer", @@ -739,9 +825,9 @@ dependencies = [ [[package]] name = "arrow-row" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "007035e17ae09c4e8993e4cb8b5b96edf0afb927cd38e2dff27189b274d83dcf" +checksum = "4cd09a518c602a55bd406bcc291a967b284cfa7a63edfbf8b897ea4748aad23c" dependencies = [ "ahash 0.8.11", "arrow-array", @@ -749,23 +835,22 @@ dependencies = [ "arrow-data", "arrow-schema", "half", - "hashbrown 0.14.3", ] [[package]] name = "arrow-schema" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ff3e9c01f7cd169379d269f926892d0e622a704960350d09d331be3ec9e0029" +checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8" dependencies = [ "serde", ] [[package]] name = "arrow-select" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce20973c1912de6514348e064829e50947e35977bb9d7fb637dc99ea9ffd78c" +checksum = "600bae05d43483d216fb3494f8c32fdbefd8aa4e1de237e790dbb3d9f44690a3" dependencies = [ "ahash 0.8.11", "arrow-array", @@ -777,18 +862,19 @@ dependencies = [ [[package]] name = "arrow-string" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f3b37f2aeece31a2636d1b037dabb69ef590e03bdc7eb68519b51ec86932a7" +checksum = "f0dc1985b67cb45f6606a248ac2b4a288849f196bab8c657ea5589f47cdd55e6" dependencies = [ "arrow-array", "arrow-buffer", "arrow-data", "arrow-schema", "arrow-select", + "memchr", "num", "regex", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -826,7 +912,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -846,22 +932,21 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.7" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86a9249d1447a85f95810c620abea82e001fe58a31713fcce614caf52499f905" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ "bzip2", "flate2", @@ -877,9 +962,9 @@ dependencies = [ [[package]] name = "async-fs" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ "async-lock", "blocking", @@ -888,22 +973,22 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-nats" -version = "0.34.0" +version = "0.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea7b126ebfa4db78e9e788b2a792b6329f35b4f2fdd56dbc646dedc2beec7a5" +checksum = "ab8df97cb8fc4a884af29ab383e9292ea0939cfcdd7d2a17179086dc6c427e7f" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "bytes", "futures", "memchr", @@ -913,10 +998,10 @@ dependencies = [ "portable-atomic", "rand", "regex", - "ring 0.17.8", + "ring", "rustls-native-certs 0.7.0", - "rustls-pemfile 2.1.1", - "rustls-webpki 0.102.2", + "rustls-pemfile 2.1.2", + "rustls-webpki 0.102.4", "serde", "serde_json", "serde_nanos", @@ -924,7 +1009,7 @@ dependencies = [ "thiserror", "time", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tracing", "tryhard", "url", @@ -932,13 +1017,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -960,24 +1045,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -991,7 +1076,7 @@ dependencies = [ "log", "pin-project-lite", "tokio", - "tungstenite", + "tungstenite 0.20.1", ] [[package]] @@ -1013,6 +1098,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "atomic" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + [[package]] name = "atomic-waker" version = "1.1.2" @@ -1032,15 +1123,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "awc" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c09cc97310b926f01621faee652f3d1b0962545a3cec6c9ac07def9ea36c2c" +checksum = "fe6b67e44fb95d1dc9467e3930383e115f9b4ed60ca689db41409284e967a12d" dependencies = [ "actix-codec", "actix-http", @@ -1048,343 +1139,25 @@ dependencies = [ "actix-service", "actix-tls", "actix-utils", - "base64 0.21.7", + "base64 0.22.1", "bytes", "cfg-if 1.0.0", "cookie", "derive_more", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "itoa", "log", - "mime", - "percent-encoding", - "pin-project-lite", - "rand", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", -] - -[[package]] -name = "aws-config" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6b3804dca60326e07205179847f17a4fce45af3a1106939177ad41ac08a6de" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-sdk-sso", - "aws-sdk-sts", - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand 2.0.2", - "hex", - "http 0.2.12", - "hyper", - "ring 0.16.20", - "time", - "tokio", - "tower", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-credential-types" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a66ac8ef5fa9cf01c2d999f39d16812e90ec1467bd382cbbb74ba23ea86201" -dependencies = [ - "aws-smithy-async", - "aws-smithy-types", - "fastrand 2.0.2", - "tokio", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-http" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e626370f9ba806ae4c439e49675fd871f5767b093075cdf4fef16cac42ba900" -dependencies = [ - "aws-credential-types", - "aws-smithy-http", - "aws-smithy-types", - "aws-types", - "bytes", - "http 0.2.12", - "http-body", - "lazy_static", - "percent-encoding", - "pin-project-lite", - "tracing", -] - -[[package]] -name = "aws-runtime" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ac5cf0ff19c1bca0cea7932e11b239d1025a45696a4f44f72ea86e2b8bdd07" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "fastrand 2.0.2", - "http 0.2.12", - "percent-encoding", - "tracing", - "uuid", -] - -[[package]] -name = "aws-sdk-sso" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903f888ff190e64f6f5c83fb0f8d54f9c20481f1dc26359bb8896f5d99908949" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http 0.2.12", - "regex", - "tokio-stream", - "tracing", -] - -[[package]] -name = "aws-sdk-sts" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47ad6bf01afc00423d781d464220bf69fb6a674ad6629cbbcb06d88cdc2be82" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-query", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", - "http 0.2.12", - "regex", - "tracing", -] - -[[package]] -name = "aws-sigv4" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b28f4910bb956b7ab320b62e98096402354eca976c587d1eeccd523d9bac03" -dependencies = [ - "aws-smithy-http", - "form_urlencoded", - "hex", - "hmac", - "http 0.2.12", - "once_cell", - "percent-encoding", - "regex", - "sha2", - "time", - "tracing", -] - -[[package]] -name = "aws-smithy-async" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cdb73f85528b9d19c23a496034ac53703955a59323d581c06aa27b4e4e247af" -dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", - "tokio-stream", -] - -[[package]] -name = "aws-smithy-client" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27b2756264c82f830a91cb4d2d485b2d19ad5bea476d9a966e03d27f27ba59a" -dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-types", - "bytes", - "fastrand 2.0.2", - "http 0.2.12", - "http-body", - "hyper", - "hyper-rustls", - "lazy_static", - "pin-project-lite", - "rustls 0.21.10", - "tokio", - "tower", - "tracing", -] - -[[package]] -name = "aws-smithy-http" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54cdcf365d8eee60686885f750a34c190e513677db58bbc466c44c588abf4199" -dependencies = [ - "aws-smithy-types", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http-body", - "hyper", - "once_cell", - "percent-encoding", - "pin-project-lite", - "pin-utils", - "tracing", -] - -[[package]] -name = "aws-smithy-http-tower" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822de399d0ce62829a69dfa8c5cd08efdbe61a7426b953e2268f8b8b52a607bd" -dependencies = [ - "aws-smithy-http", - "aws-smithy-types", - "bytes", - "http 0.2.12", - "http-body", - "pin-project-lite", - "tower", - "tracing", -] - -[[package]] -name = "aws-smithy-json" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1e7ab8fa7ad10c193af7ae56d2420989e9f4758bf03601a342573333ea34f" -dependencies = [ - "aws-smithy-types", -] - -[[package]] -name = "aws-smithy-query" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28556a3902091c1f768a34f6c998028921bdab8d47d92586f363f14a4a32d047" -dependencies = [ - "aws-smithy-types", - "urlencoding", -] - -[[package]] -name = "aws-smithy-runtime" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745e096b3553e7e0f40622aa04971ce52765af82bebdeeac53aa6fc82fe801e6" -dependencies = [ - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "fastrand 2.0.2", - "http 0.2.12", - "http-body", - "once_cell", - "pin-project-lite", - "pin-utils", - "tokio", - "tracing", -] - -[[package]] -name = "aws-smithy-runtime-api" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d0ae0c9cfd57944e9711ea610b48a963fb174a53aabacc08c5794a594b1d02" -dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-types", - "bytes", - "http 0.2.12", - "tokio", - "tracing", -] - -[[package]] -name = "aws-smithy-types" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d90dbc8da2f6be461fa3c1906b20af8f79d14968fe47f2b7d29d086f62a51728" -dependencies = [ - "base64-simd", - "itoa", - "num-integer", - "ryu", - "serde", - "time", -] - -[[package]] -name = "aws-smithy-xml" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01d2dedcdd8023043716cfeeb3c6c59f2d447fce365d8e194838891794b23b6" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "aws-types" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85aa0451bf8af1bf22a4f028d5d28054507a14be43cb8ac0597a8471fba9edfe" -dependencies = [ - "aws-credential-types", - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-types", - "http 0.2.12", - "rustc_version", - "tracing", + "mime", + "percent-encoding", + "pin-project-lite", + "rand", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", ] [[package]] @@ -1399,8 +1172,8 @@ dependencies = [ "bytes", "futures-util", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.29", "itoa", "matchit", "memchr", @@ -1425,7 +1198,7 @@ dependencies = [ "bytes", "futures-util", "http 0.2.12", - "http-body", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -1434,9 +1207,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -1459,6 +1232,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d27c3610c36aee21ce8ac510e6224498de4228ad772a171ed65643a24693a5a8" +[[package]] +name = "base62" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f879ef8fc74665ed7f0e6127cb106315888fc2744f68e14b74f83edbb2a08992" + [[package]] name = "base64" version = "0.12.3" @@ -1479,19 +1258,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" - -[[package]] -name = "base64-simd" -version = "0.8.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" -dependencies = [ - "outref", - "vsimd", -] +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -1606,43 +1375,49 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock", "async-task", - "fastrand 2.0.2", "futures-io", "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] name = "borsh" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0901fc8eb0aca4c83be0106d6f2db17d86a08dfc2c25f0e84464bf381158add6" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" dependencies = [ "borsh-derive", - "cfg_aliases", + "cfg_aliases 0.2.1", ] [[package]] name = "borsh-derive" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51670c3aa053938b0ee3bd67c3817e471e626151131b934038e83c5bf8de48f5" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", "syn_derive", ] @@ -1654,7 +1429,18 @@ checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", - "brotli-decompressor", + "brotli-decompressor 2.5.1", +] + +[[package]] +name = "brotli" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor 4.0.1", ] [[package]] @@ -1667,6 +1453,16 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "brotli-decompressor" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bstr" version = "1.9.1" @@ -1679,9 +1475,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecheck" @@ -1720,16 +1516,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bytes-utils" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" -dependencies = [ - "bytes", - "either", -] - [[package]] name = "bytestring" version = "1.3.1" @@ -1789,12 +1575,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -1830,6 +1617,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "cfgrammar" version = "0.12.0" @@ -1894,7 +1687,7 @@ dependencies = [ "futures", "futures-timer", "pin-project-lite", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "thiserror", @@ -1924,7 +1717,7 @@ dependencies = [ "anyhow", "directories", "os_info", - "reqwest", + "reqwest 0.11.27", "thiserror", "tokio", "zip", @@ -1957,9 +1750,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1967,14 +1760,14 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] name = "chrono-tz" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" dependencies = [ "chrono", "chrono-tz-build", @@ -1983,9 +1776,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" dependencies = [ "parse-zoneinfo", "phf", @@ -1998,7 +1791,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", "stacker", ] @@ -2029,17 +1822,21 @@ dependencies = [ "half", ] +[[package]] +name = "cidr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdf600c45bd958cf2945c445264471cca8b6c8e67bc87b71affd6d7e5682621" + [[package]] name = "cidr-utils" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2315f7119b7146d6a883de6acd63ddf96071b5f79d9d98d2adaa84d749f6abf1" +checksum = "25c0a9fb70c2c2cc2a520aa259b1d1345650046a07df1b6da1d3cefcd327f43e" dependencies = [ - "debug-helper", + "cidr", "num-bigint", "num-traits", - "once_cell", - "regex", ] [[package]] @@ -2078,23 +1875,23 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", - "clap_derive 4.5.4", + "clap_derive 4.5.5", ] [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", - "clap_lex 0.7.0", + "clap_lex 0.7.1", "strsim 0.11.1", ] @@ -2113,14 +1910,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -2134,19 +1931,17 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", - "str-buf", - "winapi 0.3.9", ] [[package]] @@ -2164,7 +1959,7 @@ dependencies = [ "chrono", "delegate-attr", "futures", - "hostname", + "hostname 0.3.1", "http 0.2.12", "serde", "serde_json", @@ -2186,15 +1981,15 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -2202,12 +1997,12 @@ dependencies = [ [[package]] name = "comfy-table" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ - "strum 0.25.0", - "strum_macros 0.25.3", + "strum 0.26.2", + "strum_macros 0.26.4", "unicode-width", ] @@ -2227,9 +2022,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -2241,26 +2036,30 @@ dependencies = [ "actix-web-prometheus", "ahash 0.8.11", "anyhow", + "arc-swap", "arrow", "arrow-json", "arrow-schema", + "async-recursion", "async-walkdir", "base64 0.21.7", + "bitvec", "byteorder", "bytes", "chromiumoxide", "chrono", "cityhasher", "dashmap", + "datafusion", "dotenv_config", "dotenvy", "futures", "get_if_addrs", "getrandom", "gxhash", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "hex", - "indexmap 2.1.0", + "indexmap 2.2.6", "itertools 0.12.1", "lettre", "log", @@ -2273,7 +2072,7 @@ dependencies = [ "proto", "rand", "regex", - "reqwest", + "reqwest 0.11.27", "segment", "serde", "serde_json", @@ -2294,7 +2093,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" dependencies = [ "futures-core", - "prost 0.12.3", + "prost 0.12.6", "prost-types", "tonic 0.10.2", "tracing-core", @@ -2418,9 +2217,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] @@ -2433,9 +2232,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] @@ -2449,7 +2248,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.4", + "clap 4.5.7", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -2488,9 +2287,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -2525,9 +2324,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -2593,16 +2392,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if 1.0.0", "cpufeatures", "curve25519-dalek-derive", "digest", "fiat-crypto", - "platforms", "rustc_version", "subtle", ] @@ -2615,14 +2413,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -2630,37 +2428,38 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.58", + "strsim 0.11.1", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "dashmap" -version = "5.5.3" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.3", + "crossbeam-utils", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -2669,15 +2468,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "datafusion" -version = "36.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b360b692bf6c6d6e6b6dbaf41a3be0020daeceac0f406aed54c75331e50dbb" +checksum = "e4fd4a99fc70d40ef7e52b243b4a399c3f8d353a40d5ecb200deee05e49c61bb" dependencies = [ "ahash 0.8.11", "arrow", @@ -2690,27 +2489,33 @@ dependencies = [ "bzip2", "chrono", "dashmap", + "datafusion-catalog", "datafusion-common", + "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", "datafusion-functions", - "datafusion-functions-array", + "datafusion-functions-aggregate", + "datafusion-functions-nested", "datafusion-optimizer", "datafusion-physical-expr", + "datafusion-physical-expr-common", + "datafusion-physical-optimizer", "datafusion-physical-plan", "datafusion-sql", "flate2", "futures", "glob", "half", - "hashbrown 0.14.3", - "indexmap 2.1.0", + "hashbrown 0.14.5", + "indexmap 2.2.6", "itertools 0.12.1", "log", "num_cpus", "object_store", "parking_lot", "parquet", + "paste", "pin-project-lite", "rand", "sqlparser", @@ -2723,11 +2528,25 @@ dependencies = [ "zstd", ] +[[package]] +name = "datafusion-catalog" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b3cfbd84c6003594ae1972314e3df303a27ce8ce755fcea3240c90f4c0529" +dependencies = [ + "arrow-schema", + "async-trait", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-plan", +] + [[package]] name = "datafusion-common" -version = "36.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37f343ccc298f440e25aa38ff82678291a7acc24061c7370ba6c0ff5cc811412" +checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c" dependencies = [ "ahash 0.8.11", "arrow", @@ -2736,6 +2555,8 @@ dependencies = [ "arrow-schema", "chrono", "half", + "hashbrown 0.14.5", + "instant", "libc", "num_cpus", "object_store", @@ -2743,11 +2564,20 @@ dependencies = [ "sqlparser", ] +[[package]] +name = "datafusion-common-runtime" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7496d1f664179f6ce3a5cbef6566056ccaf3ea4aa72cc455f80e62c1dd86b1" +dependencies = [ + "tokio", +] + [[package]] name = "datafusion-execution" -version = "36.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9c93043081487e335399a21ebf8295626367a647ac5cb87d41d18afad7d0f7" +checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1" dependencies = [ "arrow", "chrono", @@ -2755,7 +2585,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "futures", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "log", "object_store", "parking_lot", @@ -2766,54 +2596,95 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "36.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e204d89909e678846b6a95f156aafc1ee5b36cb6c9e37ec2e1449b078a38c818" +checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2" dependencies = [ "ahash 0.8.11", "arrow", "arrow-array", + "arrow-buffer", + "chrono", "datafusion-common", "paste", + "serde_json", "sqlparser", "strum 0.26.2", - "strum_macros 0.26.2", + "strum_macros 0.26.4", ] [[package]] name = "datafusion-functions" -version = "36.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98f1c73f7801b2b8ba2297b3ad78ffcf6c1fc6b8171f502987eb9ad5cb244ee7" +checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb" dependencies = [ "arrow", - "base64 0.21.7", + "arrow-buffer", + "base64 0.22.1", + "blake2", + "blake3", + "chrono", "datafusion-common", "datafusion-execution", "datafusion-expr", + "hashbrown 0.14.5", "hex", + "itertools 0.12.1", + "log", + "md-5", + "rand", + "regex", + "sha2", + "unicode-segmentation", + "uuid", +] + +[[package]] +name = "datafusion-functions-aggregate" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b4ece19f73c02727e5e8654d79cd5652de371352c1df3c4ac3e419ecd6943fb" +dependencies = [ + "ahash 0.8.11", + "arrow", + "arrow-schema", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", "log", + "paste", + "sqlparser", ] [[package]] -name = "datafusion-functions-array" -version = "36.0.0" +name = "datafusion-functions-nested" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d16a0ddf2c991526f6ffe2f47a72c6da0b7354d6c32411dd20631fe2e38937" +checksum = "a1474552cc824e8c9c88177d454db5781d4b66757d4aca75719306b8343a5e8d" dependencies = [ "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", "datafusion-common", "datafusion-execution", "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate", + "itertools 0.12.1", "log", "paste", + "rand", ] [[package]] name = "datafusion-optimizer" -version = "36.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae27e07bf1f04d327be5c2a293470879801ab5535204dc3b16b062fda195496" +checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906" dependencies = [ "arrow", "async-trait", @@ -2821,17 +2692,19 @@ dependencies = [ "datafusion-common", "datafusion-expr", "datafusion-physical-expr", - "hashbrown 0.14.3", + "hashbrown 0.14.5", + "indexmap 2.2.6", "itertools 0.12.1", "log", - "regex-syntax 0.8.3", + "paste", + "regex-syntax 0.8.4", ] [[package]] name = "datafusion-physical-expr" -version = "36.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde620cd9ef76a3bca9c754fb68854bd2349c49f55baf97e08001f9e967f6d6b" +checksum = "9a223962b3041304a3e20ed07a21d5de3d88d7e4e71ca192135db6d24e3365a4" dependencies = [ "ahash 0.8.11", "arrow", @@ -2840,50 +2713,74 @@ dependencies = [ "arrow-ord", "arrow-schema", "arrow-string", - "base64 0.21.7", - "blake2", - "blake3", + "base64 0.22.1", "chrono", "datafusion-common", "datafusion-execution", "datafusion-expr", + "datafusion-physical-expr-common", "half", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "hex", - "indexmap 2.1.0", + "indexmap 2.2.6", "itertools 0.12.1", "log", - "md-5", "paste", "petgraph", - "rand", "regex", - "sha2", - "unicode-segmentation", - "uuid", +] + +[[package]] +name = "datafusion-physical-expr-common" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6" +dependencies = [ + "ahash 0.8.11", + "arrow", + "datafusion-common", + "datafusion-expr", + "hashbrown 0.14.5", + "rand", +] + +[[package]] +name = "datafusion-physical-optimizer" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0" +dependencies = [ + "datafusion-common", + "datafusion-execution", + "datafusion-physical-expr", + "datafusion-physical-plan", ] [[package]] name = "datafusion-physical-plan" -version = "36.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4c75fba9ea99d64b2246cbd2fcae2e6fc973e6616b1015237a616036506dd4" +checksum = "8d1116949432eb2d30f6362707e2846d942e491052a206f2ddcb42d08aea1ffe" dependencies = [ "ahash 0.8.11", "arrow", "arrow-array", "arrow-buffer", + "arrow-ord", "arrow-schema", "async-trait", "chrono", "datafusion-common", + "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", + "datafusion-functions-aggregate", "datafusion-physical-expr", + "datafusion-physical-expr-common", "futures", "half", - "hashbrown 0.14.3", - "indexmap 2.1.0", + "hashbrown 0.14.5", + "indexmap 2.2.6", "itertools 0.12.1", "log", "once_cell", @@ -2891,29 +2788,54 @@ dependencies = [ "pin-project-lite", "rand", "tokio", - "uuid", +] + +[[package]] +name = "datafusion-proto" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1d25864c18178d0e51438648f5e0fa08417dbbc39b642c1752cbbb1013abf0" +dependencies = [ + "arrow", + "chrono", + "datafusion", + "datafusion-common", + "datafusion-expr", + "datafusion-proto-common", + "object_store", + "prost 0.12.6", +] + +[[package]] +name = "datafusion-proto-common" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a683253732334526b1cc5314a73a0f786803831f7e189ed3fe387ac50d7222" +dependencies = [ + "arrow", + "chrono", + "datafusion-common", + "object_store", + "prost 0.12.6", ] [[package]] name = "datafusion-sql" -version = "36.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21474a95c3a62d113599d21b439fa15091b538bac06bd20be0bb2e7d22903c09" +checksum = "b45d0180711165fe94015d7c4123eb3e1cf5fb60b1506453200b8d1ce666bef0" dependencies = [ "arrow", + "arrow-array", "arrow-schema", "datafusion-common", "datafusion-expr", "log", + "regex", "sqlparser", + "strum 0.26.2", ] -[[package]] -name = "debug-helper" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" - [[package]] name = "debugid" version = "0.8.0" @@ -2955,6 +2877,17 @@ dependencies = [ "serde", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -3031,11 +2964,22 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "dissimilar" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" +checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d" [[package]] name = "dns-lookup" @@ -3055,6 +2999,24 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "domain" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eefe29e8dd614abbee51a1616654cab123c4c56850ab83f5b7f1e1f9977bf7c" +dependencies = [ + "bytes", + "futures-util", + "moka", + "octseq", + "rand", + "serde", + "smallvec", + "time", + "tokio", + "tracing", +] + [[package]] name = "dotenv_config" version = "0.1.9" @@ -3108,9 +3070,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" dependencies = [ "serde", ] @@ -3121,7 +3083,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "memchr", ] @@ -3133,9 +3095,9 @@ checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" [[package]] name = "ena" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5" dependencies = [ "log", ] @@ -3148,9 +3110,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if 1.0.0", ] @@ -3158,7 +3120,7 @@ dependencies = [ [[package]] name = "enrichment" version = "0.1.0" -source = "git+https://github.com/openobserve/vector?rev=66667dd291482a440c5eb2032ef3cbfb7377b53b#66667dd291482a440c5eb2032ef3cbfb7377b53b" +source = "git+https://github.com/openobserve/vector?rev=70e61fc344b9db2f191cfba9ad58ee08e79d30b4#70e61fc344b9db2f191cfba9ad58ee08e79d30b4" dependencies = [ "arc-swap", "chrono", @@ -3177,13 +3139,23 @@ dependencies = [ [[package]] name = "enum-iterator-derive" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" +checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", +] + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "log", + "regex", ] [[package]] @@ -3207,9 +3179,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3217,13 +3189,9 @@ dependencies = [ [[package]] name = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "etcd-client" @@ -3232,7 +3200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae697f3928e8c89ae6f4dcf788059f49fd01a76dc53e63628f5a33881f5715e" dependencies = [ "http 0.2.12", - "prost 0.12.3", + "prost 0.12.6", "tokio", "tokio-stream", "tonic 0.10.2", @@ -3260,20 +3228,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -3282,21 +3239,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "pin-project-lite", ] @@ -3327,15 +3274,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "faststr" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803cb35bf6b85a5879e47236c828243a74fe612e5c794e229ca61b25edf55706" +checksum = "f375fcf41ec4dac873a8028fba4210dbda5c86bba13d2d741e651b474f7c05a4" dependencies = [ "bytes", "serde", @@ -3344,9 +3291,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" @@ -3356,7 +3303,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "windows-sys 0.52.0", ] @@ -3372,12 +3319,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - [[package]] name = "fixedbitset" version = "0.4.2" @@ -3386,9 +3327,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flatbuffers" -version = "23.5.26" +version = "24.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640" +checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f" dependencies = [ "bitflags 1.3.2", "rustc_version", @@ -3396,9 +3337,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "libz-sys", @@ -3526,7 +3467,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -3541,7 +3482,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3630,9 +3571,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3655,9 +3596,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -3674,8 +3615,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -3690,12 +3631,11 @@ dependencies = [ [[package]] name = "gxhash" -version = "3.0.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc9a192659d9fd88d8bd8b8ccdec491225e3623083c1251a1a406c47934415c" +checksum = "a197c9b654827513cf53842c5c6d3da2b4b35a785f8e0eff78bdf8e445aba1bb" dependencies = [ - "rand", - "rustc_version", + "rustversion", ] [[package]] @@ -3710,7 +3650,26 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -3719,9 +3678,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if 1.0.0", "crunchy", @@ -3739,9 +3698,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", @@ -3754,7 +3713,16 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", ] [[package]] @@ -3844,6 +3812,17 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "windows", +] + [[package]] name = "http" version = "0.2.12" @@ -3886,11 +3865,34 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "pin-project-lite", +] + [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" [[package]] name = "httpdate" @@ -3915,17 +3917,17 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -3937,6 +3939,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -3945,26 +3967,61 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper", - "log", - "rustls 0.21.10", - "rustls-native-certs 0.6.3", + "hyper 0.14.29", + "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", ] +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", + "rustls 0.22.4", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", +] + [[package]] name = "hyper-timeout" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.29", "pin-project-lite", "tokio", "tokio-io-timeout", ] +[[package]] +name = "hyper-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.3.1", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -3988,12 +4045,140 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "idna" version = "0.5.0" @@ -4004,6 +4189,18 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +dependencies = [ + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", +] + [[package]] name = "impl-more" version = "0.1.6" @@ -4022,12 +4219,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -4046,15 +4243,14 @@ dependencies = [ "async-nats", "async-recursion", "async-trait", - "aws-config", "bytes", "chrono", "config", "datafusion", "etcd-client", "futures", - "hashbrown 0.14.3", - "hashlink", + "hashbrown 0.14.5", + "hashlink 0.9.1", "log", "object_store", "once_cell", @@ -4065,6 +4261,8 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", + "tracing", + "zstd", ] [[package]] @@ -4078,9 +4276,11 @@ dependencies = [ "bytes", "chrono", "config", + "datafusion", "futures", - "hashbrown 0.14.3", - "indexmap 2.1.0", + "hashbrown 0.14.5", + "indexmap 2.2.6", + "infra", "itertools 0.12.1", "log", "once_cell", @@ -4104,11 +4304,14 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -4117,17 +4320,6 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -4163,6 +4355,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -4190,6 +4388,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -4220,9 +4427,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -4251,7 +4458,7 @@ dependencies = [ "base64 0.21.7", "js-sys", "pem", - "ring 0.17.8", + "ring", "serde", "serde_json", "simple_asn1", @@ -4279,7 +4486,7 @@ dependencies = [ "lalrpop-util", "petgraph", "regex", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", "string_cache", "term", "tiny-keccak", @@ -4293,7 +4500,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex-automata 0.4.6", + "regex-automata 0.4.7", ] [[package]] @@ -4313,32 +4520,32 @@ dependencies = [ [[package]] name = "lettre" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47460276655930189e0919e4fbf46e46476b14f934f18a63dd726a5fb7b60e2e" +checksum = "1a62049a808f1c4e2356a2a380bd5f2aca3b011b0b482cf3b914ba1731426969" dependencies = [ "async-trait", - "base64 0.22.0", + "base64 0.22.1", "chumsky", "email-encoding", "email_address", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-io", "futures-util", - "hostname", + "hostname 0.4.0", "httpdate", - "idna", + "idna 0.5.0", "mime", "nom", "percent-encoding", "quoted_printable", - "rustls 0.23.4", - "rustls-pemfile 2.1.1", + "rustls 0.23.9", + "rustls-pemfile 2.1.2", "socket2", "tokio", "tokio-rustls 0.26.0", "url", - "webpki-roots 0.26.1", + "webpki-roots 0.26.2", ] [[package]] @@ -4407,9 +4614,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libflate" @@ -4439,9 +4646,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" -version = "0.1.35" +version = "0.1.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "0e7bb23d733dfcc8af652a78b7bf232f0e967710d044732185e561e47c0336b6" dependencies = [ "cc", "libc", @@ -4470,9 +4677,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "pkg-config", @@ -4481,15 +4688,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] -name = "linux-raw-sys" -version = "0.4.13" +name = "litemap" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" [[package]] name = "local-channel" @@ -4510,9 +4717,9 @@ checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -4606,15 +4813,6 @@ dependencies = [ "libc", ] -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - [[package]] name = "match_cfg" version = "0.1.0" @@ -4691,9 +4889,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.39" +version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +checksum = "e9186d86b79b52f4a77af65604b51225e8db1d6ee7e3f41aec1e40829c71a176" dependencies = [ "libmimalloc-sys", ] @@ -4722,9 +4920,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -4741,11 +4939,35 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "moka" +version = "0.12.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cf62eb4dd975d2dde76432fb1075c49e3ee2331cf36f1f8fd4b66550d32b6f" +dependencies = [ + "async-lock", + "async-trait", + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "event-listener 5.3.1", + "futures-util", + "once_cell", + "parking_lot", + "quanta 0.12.3", + "rustc_version", + "smallvec", + "tagptr", + "thiserror", + "triomphe", + "uuid", +] + [[package]] name = "multimap" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "murmur3" @@ -4796,13 +5018,24 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if 1.0.0", + "cfg_aliases 0.1.1", + "libc", +] + [[package]] name = "nkeys" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafe79aeb8066a6f1f84dc44c03ae97403013e946bf0b13626468e0d5e26c6f" +checksum = "bc522a19199a0795776406619aa6aa78e1e55690fbeb3181b8db5265fd0e89ce" dependencies = [ - "byteorder", "data-encoding", "ed25519", "ed25519-dalek", @@ -4852,9 +5085,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -4866,11 +5099,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -4894,9 +5126,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -4918,9 +5150,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -4929,11 +5161,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -4941,9 +5172,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -4977,49 +5208,74 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] -name = "objc" -version = "0.2.7" +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ - "malloc_buf", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2", + "libc", + "objc2", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] [[package]] name = "object_store" -version = "0.9.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8718f8b65fdf67a45108d1548347d4af7d71fb81ce727bbf9e3b2535e079db3" +checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3" dependencies = [ "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bytes", "chrono", "futures", "humantime", - "hyper", - "itertools 0.12.1", + "hyper 1.3.1", + "itertools 0.13.0", "md-5", "parking_lot", "percent-encoding", "quick-xml", "rand", - "reqwest", - "ring 0.17.8", - "rustls-pemfile 2.1.1", + "reqwest 0.12.4", + "ring", + "rustls-pemfile 2.1.2", "serde", "serde_json", "snafu 0.7.5", @@ -5029,6 +5285,17 @@ dependencies = [ "walkdir", ] +[[package]] +name = "octseq" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ed2eaec452d98ccc1c615dd843fd039d9445f2fb4da114ee7e6af5fcb68be98" +dependencies = [ + "bytes", + "serde", + "smallvec", +] + [[package]] name = "ofb" version = "0.6.1" @@ -5080,16 +5347,20 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openobserve" -version = "0.10.0" +version = "0.10.9" dependencies = [ + "actix", "actix-cors", + "actix-http", "actix-multipart", "actix-web", + "actix-web-actors", "actix-web-httpauth", "actix-web-lab", "actix-web-opentelemetry", "actix-web-prometheus", "actix-web-rust-embed-responder", + "actix-ws", "ahash 0.8.11", "anyhow", "argon2", @@ -5097,14 +5368,14 @@ dependencies = [ "arrow-schema", "async-recursion", "async-trait", - "async-walkdir", "awc", "base64 0.21.7", + "bitvec", "blake3", "bytes", "chromiumoxide", "chrono", - "clap 4.5.4", + "clap 4.5.7", "cloudevents-sdk", "config", "console-subscriber", @@ -5112,9 +5383,9 @@ dependencies = [ "csv", "dashmap", "datafusion", - "datafusion-expr", + "datafusion-proto", "enrichment", - "env_logger", + "env_logger 0.10.2", "etcd-client", "expect-test", "faststr", @@ -5122,7 +5393,7 @@ dependencies = [ "float-cmp", "futures", "getrandom", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "hex", "http-auth-basic", "infra", @@ -5145,15 +5416,16 @@ dependencies = [ "parquet", "prometheus", "promql-parser", - "prost 0.12.3", + "prost 0.12.6", "proto", "pyroscope", "pyroscope_pprofrs", "rand", "rayon", "regex", - "regex-syntax 0.8.3", - "reqwest", + "regex-syntax 0.8.4", + "report_server", + "reqwest 0.11.27", "rust-embed-for-web", "segment", "serde", @@ -5170,6 +5442,7 @@ dependencies = [ "time", "tokio", "tokio-stream", + "tokio-tungstenite", "tonic 0.11.0", "tracing", "tracing-appender", @@ -5215,7 +5488,7 @@ dependencies = [ "bytes", "http 0.2.12", "opentelemetry", - "reqwest", + "reqwest 0.11.27", ] [[package]] @@ -5232,8 +5505,8 @@ dependencies = [ "opentelemetry-proto", "opentelemetry-semantic-conventions", "opentelemetry_sdk", - "prost 0.12.3", - "reqwest", + "prost 0.12.6", + "reqwest 0.11.27", "serde", "thiserror", "tokio", @@ -5248,7 +5521,7 @@ checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" dependencies = [ "opentelemetry", "opentelemetry_sdk", - "prost 0.12.3", + "prost 0.12.6", "serde", "tonic 0.11.0", ] @@ -5322,18 +5595,18 @@ version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" -[[package]] -name = "outref" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" - [[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + [[package]] name = "packedvec" version = "1.2.4" @@ -5344,6 +5617,15 @@ dependencies = [ "serde", ] +[[package]] +name = "pad" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" +dependencies = [ + "unicode-width", +] + [[package]] name = "parking" version = "2.2.0" @@ -5352,9 +5634,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -5362,22 +5644,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "parquet" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "547b92ebf0c1177e3892f44c8f79757ee62e678d564a9834189725f2c5b7a750" +checksum = "e977b9066b4d3b03555c22bdc442f3fadebd96a39111249113087d0edb2691cd" dependencies = [ "ahash 0.8.11", "arrow-array", @@ -5387,14 +5669,14 @@ dependencies = [ "arrow-ipc", "arrow-schema", "arrow-select", - "base64 0.21.7", - "brotli", + "base64 0.22.1", + "brotli 6.0.0", "bytes", "chrono", "flate2", "futures", "half", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lz4_flex", "num", "num-bigint", @@ -5406,6 +5688,7 @@ dependencies = [ "tokio", "twox-hash", "zstd", + "zstd-sys", ] [[package]] @@ -5416,9 +5699,9 @@ checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae" [[package]] name = "parse-zoneinfo" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" dependencies = [ "regex", ] @@ -5436,9 +5719,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "peeking_take_while" @@ -5448,11 +5731,11 @@ checksum = "9e9ed2178b0575fff8e1b83b58ba6f75e727aafac2e1b6c795169ad3b17eb518" [[package]] name = "pem" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "serde", ] @@ -5473,9 +5756,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -5484,9 +5767,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -5494,22 +5777,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "pest_meta" -version = "2.7.9" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -5518,12 +5801,12 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.6", ] [[package]] @@ -5590,7 +5873,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -5607,12 +5890,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-io", ] @@ -5643,12 +5926,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - [[package]] name = "poly1305" version = "0.8.0" @@ -5683,7 +5960,7 @@ dependencies = [ "findshlibs", "libc", "log", - "nix", + "nix 0.26.4", "once_cell", "parking_lot", "smallvec", @@ -5704,14 +5981,24 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +[[package]] +name = "prettydiff" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abec3fb083c10660b3854367697da94c674e9e82aa7511014dc958beeb7215e9" +dependencies = [ + "owo-colors", + "pad", +] + [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -5772,31 +6059,41 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] [[package]] name = "procfs" -version = "0.14.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69" +checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 1.3.2", - "byteorder", + "bitflags 2.5.0", "hex", "lazy_static", - "rustix 0.36.17", + "procfs-core", + "rustix", +] + +[[package]] +name = "procfs-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +dependencies = [ + "bitflags 2.5.0", + "hex", ] [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ "cfg-if 1.0.0", "fnv", @@ -5834,34 +6131,33 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.3", + "prost-derive 0.12.6", ] [[package]] name = "prost-build" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", - "heck 0.4.1", - "itertools 0.11.0", + "heck 0.5.0", + "itertools 0.12.1", "log", "multimap", "once_cell", "petgraph", "prettyplease", - "prost 0.12.3", + "prost 0.12.6", "prost-types", "regex", - "syn 2.0.58", + "syn 2.0.66", "tempfile", - "which", ] [[package]] @@ -5879,34 +6175,49 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", +] + +[[package]] +name = "prost-reflect" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f5eec97d5d34bdd17ad2db2219aabf46b054c6c41bd5529767c9ce55be5898f" +dependencies = [ + "once_cell", + "prost 0.12.6", + "prost-types", ] [[package]] name = "prost-types" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.3", + "prost 0.12.6", ] [[package]] name = "proto" version = "0.1.0" dependencies = [ - "prost 0.12.3", + "async-trait", + "datafusion", + "datafusion-proto", + "prost 0.12.6", "prost-build", "serde", "serde_json", + "tokio", "tonic 0.11.0", "tonic-build 0.11.0", ] @@ -5917,6 +6228,21 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" +[[package]] +name = "psl" +version = "2.1.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce9398ad066421139b2e3afe16ea46772ffda30bd9ba57554dc035df5e26edc8" +dependencies = [ + "psl-types", +] + +[[package]] +name = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + [[package]] name = "psm" version = "0.1.21" @@ -5946,6 +6272,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "publicsuffix" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] + [[package]] name = "pyroscope" version = "0.5.7" @@ -5958,7 +6294,7 @@ dependencies = [ "log", "names", "prost 0.11.9", - "reqwest", + "reqwest 0.11.27", "thiserror", "url", "winapi 0.3.9", @@ -5986,27 +6322,53 @@ dependencies = [ "libc", "mach", "once_cell", - "raw-cpuid", + "raw-cpuid 10.7.0", "wasi 0.10.2+wasi-snapshot-preview1", "web-sys", "winapi 0.3.9", ] +[[package]] +name = "quanta" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid 11.1.0", + "wasi 0.11.0+wasi-snapshot-preview1", + "web-sys", + "winapi 0.3.9", +] + [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" dependencies = [ "memchr", "serde", ] +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "env_logger 0.8.4", + "log", + "rand", +] + [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -6063,10 +6425,13 @@ dependencies = [ ] [[package]] -name = "raw-window-handle" -version = "0.5.2" +name = "raw-cpuid" +version = "11.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" +checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +dependencies = [ + "bitflags 2.5.0", +] [[package]] name = "rayon" @@ -6097,6 +6462,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[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 = "redox_users" version = "0.4.5" @@ -6110,14 +6484,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -6131,15 +6505,21 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + [[package]] name = "regex-syntax" version = "0.6.29" @@ -6148,9 +6528,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rend" @@ -6161,6 +6541,25 @@ dependencies = [ "bytecheck", ] +[[package]] +name = "report_server" +version = "0.1.0" +dependencies = [ + "actix-web", + "anyhow", + "chromiumoxide", + "chrono", + "config", + "env_logger 0.10.2", + "futures", + "lettre", + "log", + "once_cell", + "serde", + "tempfile", + "tokio", +] + [[package]] name = "reqwest" version = "0.11.27" @@ -6172,11 +6571,11 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", - "hyper", - "hyper-rustls", + "http-body 0.4.6", + "hyper 0.14.29", + "hyper-rustls 0.24.2", "ipnet", "js-sys", "log", @@ -6184,7 +6583,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.10", + "rustls 0.21.12", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "serde", @@ -6201,23 +6600,52 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.4", - "winreg 0.50.0", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi 0.3.9", + "webpki-roots 0.25.4", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-rustls 0.26.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.22.4", + "rustls-native-certs 0.7.0", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls 0.25.0", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg 0.52.0", ] [[package]] @@ -6231,7 +6659,7 @@ dependencies = [ "getrandom", "libc", "spin 0.9.8", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.52.0", ] @@ -6272,12 +6700,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "roxmltree" -version = "0.18.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" -dependencies = [ - "xmlparser", -] +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rsa" @@ -6301,9 +6726,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" +checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -6312,9 +6737,9 @@ dependencies = [ [[package]] name = "rust-embed-for-web" -version = "11.2.0" +version = "11.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f84d0a081592f9a39ab2d4a203423b7c5a5beddea477a23e9a74a8bf4f1956" +checksum = "acadd634962e6a536f9c0058aaf712b65ee0f21394614b342e8de3feff79c4cc" dependencies = [ "rust-embed-for-web-impl", "rust-embed-for-web-utils", @@ -6323,26 +6748,26 @@ dependencies = [ [[package]] name = "rust-embed-for-web-impl" -version = "11.2.0" +version = "11.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d1c01db6abf4e30579a31246030c5409d58eee37af20e44193f5c5603cd4bb" +checksum = "b4a25a96341f5b99dfb29ba21dfe72d8d02109b40be52aac50022c91917bc178" dependencies = [ - "brotli", + "brotli 6.0.0", "flate2", "globset", "proc-macro2", "quote", "rust-embed-for-web-utils", "shellexpand", - "syn 2.0.58", + "syn 2.0.66", "walkdir", ] [[package]] name = "rust-embed-for-web-utils" -version = "11.2.0" +version = "11.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7956b3948b20e5a24e3f77e266e9bdd191907fcdf919ea4dfc178dc5c3226d02" +checksum = "6cc18e05c3925164af76d54900ac3eb6e0557acbd52504f4878e231161d442dd" dependencies = [ "base85rs", "chrono", @@ -6354,23 +6779,23 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" +checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.58", + "syn 2.0.66", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" +checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" dependencies = [ "sha2", "walkdir", @@ -6394,9 +6819,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -6409,68 +6834,54 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-webpki 0.101.7", "sct", ] [[package]] name = "rustls" -version = "0.22.3" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] [[package]] name = "rustls" -version = "0.23.4" +version = "0.23.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4d6d8ad9f2492485e13453acbb291dd08f64441b6609c491f1c2cd2c6b4fe1" +checksum = "a218f0f6d05669de4eabfb24f31ce802035c952429d037507b4a4a39f0e60c5b" dependencies = [ "log", "once_cell", - "ring 0.17.8", + "ring", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] @@ -6494,7 +6905,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.1", + "rustls-pemfile 2.1.2", "rustls-pki-types", "schannel", "security-framework", @@ -6511,19 +6922,19 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" @@ -6531,32 +6942,32 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ - "ring 0.17.8", + "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustyline" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" +checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" dependencies = [ "bitflags 2.5.0", "cfg-if 1.0.0", @@ -6564,19 +6975,18 @@ dependencies = [ "libc", "log", "memchr", - "nix", - "scopeguard", + "nix 0.28.0", "unicode-segmentation", "unicode-width", "utf8parse", - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "salsa20" @@ -6617,8 +7027,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -6629,11 +7039,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -6642,9 +7052,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -6657,7 +7067,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12485833e00457a6bbba60397d3f19362751a0caefe27f6755fff1a2be4fd601" dependencies = [ "async-trait", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "thiserror", @@ -6666,9 +7076,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "seq-macro" @@ -6678,22 +7088,22 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -6703,7 +7113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5" dependencies = [ "form_urlencoded", - "indexmap 2.1.0", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -6711,9 +7121,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -6722,9 +7132,9 @@ dependencies = [ [[package]] name = "serde_nanos" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae801b7733ca8d6a2b580debe99f67f36826a0f5b8a36055dc6bc40f8d6bc71" +checksum = "a93142f0367a4cc53ae0fead1bcda39e85beccfad3dcd717656cacab94b12985" dependencies = [ "serde", ] @@ -6740,13 +7150,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -6767,7 +7177,7 @@ version = "0.9.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -6850,9 +7260,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -6938,6 +7348,15 @@ dependencies = [ "snafu-derive 0.7.5", ] +[[package]] +name = "snafu" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b835cb902660db3415a672d862905e791e54d306c6e8189168c7f3d9ae1c79d" +dependencies = [ + "snafu-derive 0.8.4", +] + [[package]] name = "snafu-derive" version = "0.6.10" @@ -6961,6 +7380,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "snafu-derive" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d1e02fca405f6280643174a50c942219f0bbf4dbf7d480f1dd864d6f211ae5" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "snap" version = "1.1.1" @@ -6969,9 +7400,9 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -7016,20 +7447,19 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" +checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" dependencies = [ - "itertools 0.12.1", "nom", "unicode_categories", ] [[package]] name = "sqlparser" -version = "0.43.1" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95c4bae5aba7cd30bd506f7140026ade63cff5afd778af8854026f9606bf5d4" +checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" dependencies = [ "log", "serde", @@ -7044,7 +7474,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -7080,15 +7510,15 @@ dependencies = [ "futures-intrusive", "futures-io", "futures-util", - "hashlink", + "hashlink 0.8.4", "hex", - "indexmap 2.1.0", + "indexmap 2.2.6", "log", "memchr", "once_cell", "paste", "percent-encoding", - "rustls 0.21.10", + "rustls 0.21.12", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -7273,12 +7703,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - [[package]] name = "string_cache" version = "0.8.7" @@ -7294,13 +7718,13 @@ dependencies = [ [[package]] name = "stringprep" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" dependencies = [ - "finl_unicode", "unicode-bidi", "unicode-normalization", + "unicode-properties", ] [[package]] @@ -7339,7 +7763,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ - "strum_macros 0.26.2", + "strum_macros 0.26.4", ] [[package]] @@ -7352,20 +7776,20 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -7389,9 +7813,9 @@ dependencies = [ [[package]] name = "symbolic-common" -version = "12.8.0" +version = "12.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cccfffbc6bb3bb2d3a26cd2077f4d055f6808d266f9d4d158797a4c60510dfe" +checksum = "71297dc3e250f7dbdf8adb99e235da783d690f5819fdeb4cce39d9cfb0aca9f1" dependencies = [ "debugid", "memmap2", @@ -7401,9 +7825,9 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "12.8.0" +version = "12.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a99812da4020a67e76c4eb41f08c87364c14170495ff780f30dd519c221a68" +checksum = "424fa2c9bf2c862891b9cfd354a752751a6730fd838a4691e7f6c2c7957b9daf" dependencies = [ "cpp_demangle", "rustc-demangle", @@ -7423,9 +7847,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -7441,7 +7865,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -7450,6 +7874,17 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "sysinfo" version = "0.29.11" @@ -7477,9 +7912,9 @@ dependencies = [ [[package]] name = "syslog_loose" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf5252d1adec0a489a0225f867c1a7fd445e41674530a396d0629cff0c4b211" +checksum = "161028c00842709450114c39db3b29f44c898055ed8833bb9b535aba7facf30e" dependencies = [ "chrono", "nom", @@ -7506,6 +7941,12 @@ dependencies = [ "libc", ] +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + [[package]] name = "tap" version = "1.0.1" @@ -7519,8 +7960,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.2", - "rustix 0.38.32", + "fastrand 2.1.0", + "rustix", "windows-sys 0.52.0", ] @@ -7552,22 +7993,22 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -7613,9 +8054,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -7634,9 +8075,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -7651,6 +8092,16 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinytemplate" version = "1.2.1" @@ -7678,9 +8129,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -7708,13 +8159,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -7723,7 +8174,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.10", + "rustls 0.21.12", "tokio", ] @@ -7733,7 +8184,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.3", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] @@ -7744,7 +8195,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.4", + "rustls 0.23.9", "rustls-pki-types", "tokio", ] @@ -7760,25 +8211,36 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-tungstenite" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.23.0", +] + [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" [[package]] name = "toml_edit" @@ -7786,7 +8248,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "toml_datetime", "winnow", ] @@ -7797,7 +8259,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "toml_datetime", "winnow", ] @@ -7813,15 +8275,15 @@ dependencies = [ "axum", "base64 0.21.7", "bytes", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.29", "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.3", - "rustls 0.21.10", + "prost 0.12.6", + "rustls 0.21.12", "rustls-pemfile 1.0.4", "tokio", "tokio-rustls 0.24.1", @@ -7844,14 +8306,14 @@ dependencies = [ "base64 0.21.7", "bytes", "flate2", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.29", "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.3", + "prost 0.12.6", "tokio", "tokio-stream", "tower", @@ -7870,7 +8332,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -7883,7 +8345,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -7950,7 +8412,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -8023,6 +8485,12 @@ dependencies = [ "tracing-serde", ] +[[package]] +name = "triomphe" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" + [[package]] name = "try-lock" version = "0.2.5" @@ -8068,6 +8536,24 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "utf-8", +] + [[package]] name = "twox-hash" version = "1.6.3" @@ -8086,9 +8572,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uaparser" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4d8fcdf9685cad74cecf1553af084ab4c494e833c47d3c50ca32cba8035545" +checksum = "a4c9e1c3f893758f154004195fc2d2c52fbda462df725220ceaef830ac29affa" dependencies = [ "derive_more", "lazy_static", @@ -8134,6 +8620,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + [[package]] name = "unicode-segmentation" version = "1.11.0" @@ -8142,9 +8634,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -8174,12 +8666,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" -[[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" @@ -8188,12 +8674,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" dependencies = [ "form_urlencoded", - "idna", + "idna 1.0.0", "percent-encoding", "serde", ] @@ -8210,25 +8696,37 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + [[package]] name = "utf8-width" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "utoipa" -version = "4.2.0" +version = "4.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "272ebdfbc99111033031d2f10e018836056e4d2c8e2acda76450ec7974269fa7" +checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_json", "utoipa-gen", @@ -8236,15 +8734,15 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c9f4d08338c1bfa70dde39412a040a884c6f318b3d09aaaf3437a1e52027fc" +checksum = "7bf0e16c02bc4bf5322ab65f10ab1149bdbcaa782cba66dc7057370a3f8190be" dependencies = [ "proc-macro-error", "proc-macro2", "quote", "regex", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -8269,6 +8767,7 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ + "atomic", "getrandom", "wasm-bindgen", ] @@ -8325,14 +8824,16 @@ dependencies = [ [[package]] name = "vrl" -version = "0.8.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a93ee342590c4df0ff63961d7d76a347e0c7b6e6c0be4c001317ca1ff11b53" +checksum = "84451e6a979d54175932cfe49f36f31ab7a483f3feb3cfa65ee584b91ef2f858" dependencies = [ "aes", - "anymap", + "ansi_term", + "arbitrary", "base16", - "base64 0.21.7", + "base62", + "base64 0.22.1", "bytes", "cbc", "cfb-mode", @@ -8342,24 +8843,28 @@ dependencies = [ "chrono", "chrono-tz", "cidr-utils", - "clap 4.5.4", + "clap 4.5.7", "codespan-reporting", "community-id", "crypto_secretbox", "csv", "ctr", "data-encoding", + "digest", "dns-lookup", + "domain", "dyn-clone", "exitcode", "flate2", "grok", "hex", "hmac", - "hostname", - "indexmap 2.1.0", + "hostname 0.4.0", + "iana-time-zone", + "idna 0.5.0", + "indexmap 2.2.6", "indoc", - "itertools 0.11.0", + "itertools 0.13.0", "lalrpop", "lalrpop-util", "md-5", @@ -8373,7 +8878,14 @@ dependencies = [ "percent-encoding", "pest", "pest_derive", + "prettydiff", "prettytable-rs", + "prost 0.12.6", + "prost-reflect", + "psl", + "psl-types", + "publicsuffix", + "quickcheck", "quoted_printable", "rand", "regex", @@ -8386,11 +8898,13 @@ dependencies = [ "sha-1", "sha2", "sha3", - "snafu 0.7.5", + "snafu 0.8.4", + "snap", "strip-ansi-escapes", - "syslog_loose 0.19.0", + "syslog_loose 0.21.0", "termcolor", "thiserror", + "tokio", "tracing", "uaparser", "url", @@ -8401,12 +8915,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "vsimd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" - [[package]] name = "vte" version = "0.11.1" @@ -8419,9 +8927,9 @@ dependencies = [ [[package]] name = "vte_generate_state_changes" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" dependencies = [ "proc-macro2", "quote", @@ -8429,9 +8937,9 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "wal" @@ -8505,7 +9013,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -8539,7 +9047,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8585,17 +9093,18 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.13" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1b04c569c83a9bb971dd47ec6fd48753315f4bf989b9b04a2e7ca4d7f0dc950" +checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" dependencies = [ + "block2", "core-foundation", "home", "jni", "log", "ndk-context", - "objc", - "raw-window-handle", + "objc2", + "objc2-foundation", "url", "web-sys", ] @@ -8608,9 +9117,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" dependencies = [ "rustls-pki-types", ] @@ -8624,7 +9133,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.32", + "rustix", ] [[package]] @@ -8633,7 +9142,7 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "redox_syscall", + "redox_syscall 0.4.1", "wasite", ] @@ -8661,11 +9170,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] @@ -8674,13 +9183,23 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + [[package]] name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -8707,7 +9226,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -8742,17 +9261,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "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]] @@ -8769,9 +9289,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -8787,9 +9307,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -8805,9 +9325,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +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 = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -8823,9 +9349,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -8841,9 +9367,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -8859,9 +9385,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -8877,9 +9403,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -8910,6 +9436,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + [[package]] name = "woothee" version = "0.13.0" @@ -8920,6 +9456,18 @@ dependencies = [ "regex", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -8929,12 +9477,6 @@ dependencies = [ "tap", ] -[[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - [[package]] name = "xz2" version = "0.1.7" @@ -8944,31 +9486,98 @@ dependencies = [ "lzma-sys", ] +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", +] + [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", + "synstructure", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] [[package]] name = "zip" @@ -8984,27 +9593,27 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.1.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/servers/monitoring/openobserve/default.nix b/pkgs/servers/monitoring/openobserve/default.nix index ea49c2c41bbeb..0948f72fcb09e 100644 --- a/pkgs/servers/monitoring/openobserve/default.nix +++ b/pkgs/servers/monitoring/openobserve/default.nix @@ -15,12 +15,12 @@ }: let - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "openobserve"; repo = "openobserve"; rev = "v${version}"; - hash = "sha256-68fJYk/R1F7FHm4F+pyyA9BRVdV8S8p5uEM1hVbuArg="; + hash = "sha256-VRkAOUtF/eOxE7/Xjxi/WEfeSseGEJ9IROCFbgeFUkI="; }; web = buildNpmPackage { inherit src version; @@ -28,7 +28,7 @@ let sourceRoot = "${src.name}/web"; - npmDepsHash = "sha256-7l1tdgR/R7qaYBbBm9OnKDBETPkaIN8AUgc9WdYQuwI="; + npmDepsHash = "sha256-2beTB6BHHshQkgbqVc195j2/0hBEn/fFz8+0ViSG5Gc="; preBuild = '' # Patch vite config to not open the browser to visualize plugin composition @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage { lockFile = ./Cargo.lock; outputHashes = { "chromiumoxide-0.5.7" = "sha256-GHrm5u8FtXRUjSRGMU4PNU6AJZ5W2KcgfZY1c/CBVYA="; - "enrichment-0.1.0" = "sha256-FDPSCBkx+DPeWwTBz9+ORcbbiSBC2a8tJaay9Pxwz4w="; + "enrichment-0.1.0" = "sha256-Ui4rsvmemOF00E4yBRFRS2gw9qliDrNEVQu5fvIpahA="; }; }; @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage { xz zlib zstd - ] ++ lib.optionals stdenv.isDarwin (with apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with apple_sdk.frameworks; [ CoreFoundation CoreServices IOKit @@ -105,6 +105,7 @@ rustPlatform.buildRustPackage { # requires network access or filesystem mutations checkFlags = [ "--skip handler::http::auth::tests::test_validate" + "--skip handler::http::router::tests::test_get_proxy_routes" "--skip handler::http::router::ui::tests::test_index_not_ok" "--skip handler::http::router::ui::tests::test_index_ok" "--skip handler::http::request::search::saved_view::tests::test_create_view_post" @@ -120,6 +121,7 @@ rustPlatform.buildRustPackage { "--skip service::db::compact::files::tests::test_compact_files" "--skip service::db::user::tests::test_user" "--skip service::ingestion::grpc::tests::test_get_val" + "--skip service::metadata::trace_list_index::tests::test_write" "--skip service::organization::tests::test_organization" "--skip service::search::sql::tests::test_sql_full" "--skip service::triggers::tests::test_triggers" diff --git a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix index f71cd1776bd44..05b210ac2efe9 100644 --- a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix @@ -3,31 +3,19 @@ , fetchFromGitHub , autoAddDriverRunpath , dcgm -, linuxPackages }: buildGoModule rec { pname = "dcgm-exporter"; # The first portion of this version string corresponds to a compatible DCGM # version. - version = "3.2.5-3.1.7"; # N.B: If you change this, update dcgm as well to the matching version. + version = "3.3.5-3.4.0"; # N.B: If you change this, update dcgm as well to the matching version. src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+Hviq+iu1LBcy2VwmCX5xOq1I/zevfydesVlrVorGOI="; - }; - - # Upgrade to go 1.17 during the vendoring FOD build because it fails otherwise. - overrideModAttrs = _: { - preBuild = '' - substituteInPlace go.mod --replace 'go 1.16' 'go 1.17' - go mod tidy - ''; - postInstall = '' - cp go.mod "$out/go.mod" - ''; + hash = "sha256-IOVPEK+9ogBZJYns2pTyJwHUBMN8JqG1THTJPvpCwdo="; }; CGO_LDFLAGS = "-ldcgm"; @@ -40,12 +28,7 @@ buildGoModule rec { # symbols are available on startup. hardeningDisable = [ "bindnow" ]; - # Copy the modified go.mod we got from the vendoring process. - preBuild = '' - cp vendor/go.mod go.mod - ''; - - vendorHash = "sha256-Fjvx15e/psxoqoS6c6GhiQfe7g2aI40EmPR26xLhrzg="; + vendorHash = "sha256-urKa0O8QZnM8cWjPcGVhoAWhx6fCdMmhRX0JOriRaig="; nativeBuildInputs = [ autoAddDriverRunpath diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 420d2c39000eb..6d3e32640fe1f 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.53.1"; + version = "2.54.1"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-V13YfSEm0PMYvX13W3lahNSdDJ2oLnDr1VderLEEwyM="; + hash = "sha256-asum4ND7dHIIP6f1ofIb/xboCPZEIhes7lXqRUhUDJk="; }; in buildGoModule rec { @@ -47,10 +47,10 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-7A3UJNA045l5oWLcTeEw+X/YNjeeNOvqdh/CudplLSM="; + hash = "sha256-SF9A/xyjQwwIcMZtuLeJiwkBZvvEyU5EKu0WXTQAT/A="; }; - vendorHash = "sha256-0TR0jFEY+ls8C9EJEhSl2vX5VVZqZ8jGWDUalOddUPM="; + vendorHash = "sha256-y91c5qPND3wbFlX5rV6bcSlXAKn1eomylI6EdZQvkh0="; excludedPackages = [ "documentation/prometheus-mixin" ]; @@ -121,7 +121,7 @@ buildGoModule rec { # https://hydra.nixos.org/build/130673870/nixlog/1 # Test mock data uses 64 bit data without an explicit (u)int64 - doCheck = !(stdenv.isDarwin || stdenv.hostPlatform.parsed.cpu.bits < 64); + doCheck = !(stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.parsed.cpu.bits < 64); passthru.tests = { inherit (nixosTests) prometheus; }; diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index 169e14f75753d..7b6ef72c7d20a 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -1,14 +1,14 @@ -{ lib -, python3 -, fetchFromGitHub +{ + lib, + stdenv, + python3, + fetchFromGitHub, }: python3.pkgs.buildPythonApplication rec { pname = "dmarc-metrics-exporter"; version = "1.1.0"; - disabled = python3.pythonOlder "3.8"; - pyproject = true; src = fetchFromGitHub { @@ -20,19 +20,21 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ - bite-parser - dataclasses-serialization - prometheus-client - structlog - uvicorn - xsdata - ] - ++ uvicorn.optional-dependencies.standard; + dependencies = + with python3.pkgs; + [ + bite-parser + dataclasses-serialization + prometheus-client + structlog + uvicorn + xsdata + ] + ++ uvicorn.optional-dependencies.standard; nativeCheckInputs = with python3.pkgs; [ aiohttp @@ -41,6 +43,12 @@ python3.pkgs.buildPythonApplication rec { requests ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # flaky tests + "test_build_info" + "test_prometheus_exporter" + ]; + disabledTestPaths = [ # require networking "dmarc_metrics_exporter/tests/test_e2e.py" diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index c75a7400da775..0c071a092cfac 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsmasq_exporter"; - version = "unstable-2024-05-06"; + version = "0.3.0"; src = fetchFromGitHub { owner = "google"; repo = "dnsmasq_exporter"; - rev = "03f84edc208fa88e31cf00533db42e7e0c9717ca"; - hash = "sha256-YFQ4XO3vnj2Ka3D/LS5aG6WX+qOCVTlq5khDxLoQllo="; + rev = "v${version}"; + hash = "sha256-2sOOJWEEseWwozIyZ7oes400rBjlxIrOOtkP3rSNFXo="; }; vendorHash = "sha256-oD68TCNJKwjY3iwE/pUosMIMGOhsWj9cHC/+hq3xxI4="; diff --git a/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/pkgs/servers/monitoring/prometheus/exportarr/default.nix index caef8c57605da..d23cc62c80ffc 100644 --- a/pkgs/servers/monitoring/prometheus/exportarr/default.nix +++ b/pkgs/servers/monitoring/prometheus/exportarr/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - tags = lib.optionals stdenv.isLinux [ "netgo" ]; + tags = lib.optionals stdenv.hostPlatform.isLinux [ "netgo" ]; preCheck = '' # Run all tests. diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index 5750b01163157..7b80035544385 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.3.9"; + version = "3.4.0"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-8OeMWEXnAaLYpZD/bKAm8vtf0mkGCavmJOV4ThWGDDo="; + hash = "sha256-YOVLHAJXIgje8Ek7iKGxq4l4PAcWgWnNllRxEJpUcU0="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix index 5ea8d7c4feeb4..5df77a26541e2 100644 --- a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mongodb_exporter"; - version = "0.40.0"; + version = "0.41.1"; src = fetchFromGitHub { owner = "percona"; repo = "mongodb_exporter"; rev = "v${version}"; - hash = "sha256-cWXfMi48aF06Prua3n4geG2yP1JzLlHq/xh1HmiJkT4="; + hash = "sha256-2/oYfeybXnaoccyhriCHEY5lZcojLnk9qoiSlt4TDZY="; }; - vendorHash = "sha256-69YBrDAEruWXaAqLfRVtqmZ0pop3r5cusePSV2Q1MXw="; + vendorHash = "sha256-xKqt4JdHbFxMvFMa/zi8qGm9OZ3YFjGJQrMXfBfj4xA="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix deleted file mode 100644 index 49181699d65a7..0000000000000 --- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "openldap_exporter"; - version = "2.2.2"; - - src = fetchFromGitHub { - owner = "tomcz"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-1u+89odwV/lz34wtrK91lET2bOqkH6kRA7JCjzsmiEg="; - }; - - vendorHash = null; - - ldflags = [ - "-s" - "-w" - "-X github.com/tomcz/openldap_exporter.tag=v${version}" - "-X github.com/tomcz/openldap_exporter.commit=unknown" - ]; - - - meta = with lib; { - homepage = "https://github.com/tomcz/openldap_exporter"; - description = "Simple service that scrapes metrics from OpenLDAP and exports them via HTTP for Prometheus consumption"; - mainProgram = "openldap_exporter"; - license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix index 970d63ec0f2e1..90ffdb48f0d11 100644 --- a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgbouncer-exporter"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "pgbouncer_exporter"; rev = "v${version}"; - hash = "sha256-QnA9H4qedCPZKqJQ1I2OJO42mCWcWqYxLmeF3+JXzTw="; + hash = "sha256-fKoyRHYLwVefsZ014eazVCD5B9eV8/CUkuHE4mbUqVo="; }; - vendorHash = "sha256-NYiVW+CNrxFrEUl1nsTeNNgy7SmTYgqs1d50rCvyBcw="; + vendorHash = "sha256-IxmxfF9WsF0Hbym4G0UecyW8hAvucoaCFUE1kXUljJs="; meta = with lib; { description = "Prometheus exporter for PgBouncer"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 7b6b0e473907f..63f1d7e7b89e0 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prom2json"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prom2json"; - sha256 = "sha256-oOnrIGtNQqS/7XCKcFtzXskv7N6syNyS52pZMwrY5wU="; + sha256 = "sha256-cKz+ZFQYjsL7dFfXXCrl4T8OuvQkdqVAotG9HRNtN7o="; }; - vendorHash = "sha256-d+/38wUMFChuLlVb84DELRQylCDIqopzk2bw/yd5B/E="; + vendorHash = "sha256-pCy4oECZnvoODezUD1+lOT46yWUr78zvnHgEB2BJN3c="; meta = with lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index 5ecbc60140e61..513f71e25f11c 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec { pname = "prometheus_pve_exporter"; - version = "3.4.4"; + version = "3.4.5"; src = fetchPypi { inherit pname version; - hash = "sha256-kQo3NVrqsM78bFE9sZjubNdT6yj3Dza3BqF6DkYA6eI="; + hash = "sha256-Jsv45qK1KZYJn9ClokaXa+FVWOEQzoPX9uP26VAQ4yo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index bff0677642788..3a1aa978a2727 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.62.0"; + version = "1.63.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-EKI/oF0bAiwDYjkdEPi84R8H8wExaCxFK3uPx8MrHk8="; + sha256 = "sha256-OqQjKj2WA5AsXm26HAYhbmhDkFU0el8K831i67WMXlI="; }; - vendorHash = "sha256-nrEglhb22LANgm6hiZToPVPfGpkpxpJ7TQlLW0Z7+/4="; + vendorHash = "sha256-wBViyiYj8Duq5KrXi+YFuAUVSAkCZsnhA3fLWRLcKmU="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index bca77e93151ef..1ebd2be3c4ba3 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K7UDmV56VW4TM5YUl+xUWmE8GUAYbWowm/hU7xBG+Hs="; + sha256 = "sha256-kNIf8HwqNPGJAR8+/IkGn/5ryMEd6rGCixjnKG63xcY="; }; vendorHash = null; diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 50fe085d4a0d1..51a13f1efcd03 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { rm .cargo/config.toml ''; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) wireguard; }; diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index c95b4d7644492..97c2dcde13f64 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -1,8 +1,8 @@ -{ buildGo121Module, fetchFromGitHub, lib }: +{ buildGo122Module, fetchFromGitHub, lib }: let generic = { subPackages, pname, postInstall ? "", mainProgram }: - buildGo121Module rec { + buildGo122Module rec { inherit pname; version = "6.11.0"; shortRev = "9587df6"; # for internal version info diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix deleted file mode 100644 index d2291890d8b61..0000000000000 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, nixosTests -, stdenv -, testers -, telegraf -}: - -buildGoModule rec { - pname = "telegraf"; - version = "1.31.3"; - - subPackages = [ "cmd/telegraf" ]; - - src = fetchFromGitHub { - owner = "influxdata"; - repo = "telegraf"; - rev = "v${version}"; - hash = "sha256-J5jIyrxG2cLEu909/fcPQCo+xUlW6VAoge5atCrW4HY="; - }; - - vendorHash = "sha256-lxLFUKOFg7HAjgZIVACW6VlWLgCeZX38SNRsjxc9D7g="; - proxyVendor = true; - - ldflags = [ - "-s" - "-w" - "-X=github.com/influxdata/telegraf/internal.Commit=${src.rev}" - "-X=github.com/influxdata/telegraf/internal.Version=${version}" - ]; - - passthru.tests = { - version = testers.testVersion { - package = telegraf; - }; - } // lib.optionalAttrs stdenv.isLinux { - inherit (nixosTests) telegraf; - }; - - meta = with lib; { - description = "Plugin-driven server agent for collecting & reporting metrics"; - mainProgram = "telegraf"; - homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; - changelog = "https://github.com/influxdata/telegraf/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 roblabla timstott zowoq ]; - }; -} diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix deleted file mode 100644 index ce4a75cea75b7..0000000000000 --- a/pkgs/servers/monitoring/thanos/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, go -, nix-update-script -, nixosTests -, testers -, thanos -}: - -buildGoModule rec { - pname = "thanos"; - version = "0.35.1"; - - src = fetchFromGitHub { - owner = "thanos-io"; - repo = "thanos"; - rev = "refs/tags/v${version}"; - hash = "sha256-XSQMFtMZvcUcOFi14EZiyq65GdPbzOqUVqFM0FLSj3E="; - }; - - vendorHash = "sha256-i8EGUxNbxfyPQ3BVa7yBR1ygHIC64v6m/aDGFzWWfIE="; - - doCheck = true; - - subPackages = "cmd/thanos"; - - ldflags = let t = "github.com/prometheus/common/version"; in [ - "-X ${t}.Version=${version}" - "-X ${t}.Revision=unknown" - "-X ${t}.Branch=unknown" - "-X ${t}.BuildUser=nix@nixpkgs" - "-X ${t}.BuildDate=unknown" - "-X ${t}.GoVersion=${lib.getVersion go}" - ]; - - passthru = { - updateScript = nix-update-script { }; - tests = { - inherit (nixosTests) thanos; - version = testers.testVersion { - command = "thanos --version"; - package = thanos; - }; - }; - }; - - meta = with lib; { - description = "Highly available Prometheus setup with long term storage capabilities"; - homepage = "https://github.com/thanos-io/thanos"; - changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}"; - license = licenses.asl20; - mainProgram = "thanos"; - maintainers = with maintainers; [ basvandijk anthonyroussel ]; - }; -} diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index f787588aa90e8..d7e03ab16cd45 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.23.13"; + version = "1.23.15"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = version; - hash = "sha256-7JWn78gRLzuXuZjhTvjdJ7JVtLOtQ08zyokqkPdzYh0="; + hash = "sha256-/UAou+l7ppXU3t54YYdDZcXUNvEw7VGcn/OVPXdFdj0="; }; - npmDepsHash = "sha256-MKONzKCGYeMQK8JR9W9KiPLaqP/F0uAOzql4wZK4Sp4="; + npmDepsHash = "sha256-KaOnlqvfGatrdEqtw2Y0SudLuyzU6yC78DWn3+EZcec="; patches = [ # Fixes the permissions of the database being not set correctly @@ -46,6 +46,6 @@ buildNpmPackage rec { license = licenses.mit; maintainers = with maintainers; [ julienmalka ]; # FileNotFoundError: [Errno 2] No such file or directory: 'xcrun' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 57178da7297f3..ee70b1b1e0c48 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -97,8 +97,8 @@ let # Disable platform specific features if needed # using libmad to decode mp3 files on darwin is causing a segfault -- there # is probably a solution, but I'm disabling it for now - platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "smbclient" ] - ++ lib.optionals (!stdenv.isLinux) [ "alsa" "pipewire" "io_uring" "systemd" "syslog" ]; + platformMask = lib.optionals stdenv.hostPlatform.isDarwin [ "mad" "pulse" "jack" "smbclient" ] + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "alsa" "pipewire" "io_uring" "systemd" "syslog" ]; knownFeatures = builtins.attrNames featureDependencies ++ builtins.attrNames nativeFeatureDependencies; platformFeatures = lib.subtractLists platformMask knownFeatures; @@ -137,7 +137,7 @@ let gtest ] ++ concatAttrVals features_ featureDependencies - ++ lib.optionals stdenv.isDarwin [ AudioToolbox AudioUnit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AudioUnit ]; nativeBuildInputs = [ meson @@ -148,7 +148,7 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; - postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0") '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0") '' substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ --replace kAudioObjectPropertyElement{Main,Master} \ --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume @@ -166,7 +166,7 @@ let outputs = [ "out" "doc" ] ++ lib.optional (builtins.elem "documentation" features_) "man"; - CXXFLAGS = lib.optionals stdenv.isDarwin [ + CXXFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0" ]; @@ -210,9 +210,9 @@ in "libmpdclient" "id3tag" "expat" "pcre" "yajl" "sqlite" "soundcloud" "qobuz" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "alsa" "systemd" "syslog" "io_uring" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "mad" "jack" ]; }; mpdWithFeatures = run; diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 7f32957fdbf4d..3c3a6199f7b50 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Vs0blV2IhnlEAm0WtOartz+0vLesJfp78FNJCivRxHk="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { name = "revert-cmake-shared-to-module.patch"; # See https://github.com/eclipse/mosquitto/issues/2277 url = "https://github.com/eclipse/mosquitto/commit/e21eaeca37196439b3e89bb8fd2eb1903ef94845.patch"; diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index 27fde8301a225..254434a8ba3df 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -47,7 +47,7 @@ in myNodePackages.package.override { maintainers = with maintainers; [ expipiplus1 ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "mx-puppet-discord"; }; } diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix index c5d958bef2c43..f47a724999ed7 100644 --- a/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -8,7 +8,7 @@ let nodeEnv = import ../../development/node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index e727bb1e482a9..6bec9a2d8265a 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.19"; + version = "2.10.21"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-zgLo6j6CC/AHQKCnpXJIczneT4RbU6WneUSoL2vTthw="; + hash = "sha256-d2ko6ejSdGDeroWIELrCBQjYYSobWp4R4XC58eN50xs="; }; - vendorHash = "sha256-D/3c8Sov8LJzeWN2tu6iqwnwfb3EXXnJpgONo96pmYI="; + vendorHash = "sha256-RmVDlboqwujTy8SVSwUu8mesSUmkNERi/sYQH7WAUUI="; doCheck = false; diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index 12bfc319635ef..d82043f2f5e0f 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,69 +1,74 @@ { stdenv , lib -, fetchurl +, fetchFromGitHub , autoreconfHook , autoconf-archive +, gobject-introspection , pkg-config -, systemd +, wrapGAppsHook3 , glib , dbus , libnl -, python2Packages +, python3Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "neard"; - version = "0.18"; + version = "0.19-unstable-2024-07-02"; outputs = [ "out" "dev" ]; - src = fetchurl { - url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/neard-${version}.tar.gz"; - sha256 = "wBPjEVMV4uEdFrXw8cjOmvvNuiaACq2RJF/ZtKXck4s="; + src = fetchFromGitHub { + owner = "linux-nfc"; + repo = "neard"; + rev = "a0a7d4d677800a39346f0c89d93d0fe43a95efad"; + hash = "sha256-6BgX7cJwxX+1RX3wU+HY/PIBgzomzOKemnl0SDLJNro="; }; + postPatch = '' + patchShebangs test/* + ''; + nativeBuildInputs = [ autoreconfHook autoconf-archive + gobject-introspection pkg-config - python2Packages.wrapPython + python3Packages.wrapPython + wrapGAppsHook3 + ]; + + dontWrapGApps = true; + + configureFlags = [ + "--enable-pie" + "--enable-test" + "--enable-tools" + "--with-sysconfdir=/etc" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" ]; buildInputs = [ - systemd - glib dbus + glib libnl - ] ++ (with python2Packages; [ - python - ]); - - pythonPath = with python2Packages; [ - pygobject2 - dbus-python - pygtk ]; strictDeps = true; enableParallelBuilding = true; - configureFlags = [ - "--disable-debug" - "--enable-tools" - "--enable-ese" - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + pythonPath = with python3Packages; [ + pygobject3 + dbus-python ]; - postInstall = '' - install -m 0755 tools/snep-send $out/bin/ - - install -D -m644 src/main.conf $out/etc/neard/main.conf + doCheck = true; - # INFO: the config option "--enable-test" would copy the apps to $out/lib/neard/test/ instead - install -d $out/lib/neard - install -m 0755 test/* $out/lib/neard/ - wrapPythonProgramsIn $out/lib/neard "$out $pythonPath" + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + wrapPythonProgramsIn "$out/lib/neard" "$pythonPath" ''; meta = with lib; { @@ -72,7 +77,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ ]; platforms = platforms.unix; - # error: wcwidth-0.2.13 not supported for interpreter python2.7 - broken = true; # Added 2024-03-17 }; } diff --git a/pkgs/servers/networking/rustus/default.nix b/pkgs/servers/networking/rustus/default.nix index 77bf8ce7d776b..3819a23781ef2 100644 --- a/pkgs/servers/networking/rustus/default.nix +++ b/pkgs/servers/networking/rustus/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 5db49397fdb7a..7cdda6534d451 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,58 +1,81 @@ -{ lib, stdenvNoCC, fetchurl, nixosTests -, nextcloud28Packages -, nextcloud29Packages +{ + lib, + stdenvNoCC, + fetchurl, + nixosTests, + nextcloud28Packages, + nextcloud29Packages, + nextcloud30Packages, }: let - generic = { - version, hash - , eol ? false, extraVulnerabilities ? [] - , packages - }: stdenvNoCC.mkDerivation rec { - pname = "nextcloud"; - inherit version; - - src = fetchurl { - url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; - inherit hash; - }; + generic = + { + version, + hash, + eol ? false, + extraVulnerabilities ? [ ], + packages, + }: + stdenvNoCC.mkDerivation rec { + pname = "nextcloud"; + inherit version; - passthru = { - tests = nixosTests.nextcloud; - inherit packages; - }; + src = fetchurl { + url = "https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2"; + inherit hash; + }; + + passthru = { + tests = lib.filterAttrs ( + key: _: (lib.hasSuffix (lib.versions.major version) key) + ) nixosTests.nextcloud; + inherit packages; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/ + cp -R . $out/ + runHook postInstall + ''; - installPhase = '' - runHook preInstall - mkdir -p $out/ - cp -R . $out/ - runHook postInstall - ''; - - meta = with lib; { - changelog = "https://nextcloud.com/changelog/#${lib.replaceStrings [ "." ] [ "-" ] version}"; - description = "Sharing solution for files, calendars, contacts and more"; - homepage = "https://nextcloud.com"; - maintainers = with maintainers; [ schneefux bachp globin ma27 ]; - license = licenses.agpl3Plus; - platforms = platforms.linux; - knownVulnerabilities = extraVulnerabilities - ++ (optional eol "Nextcloud version ${version} is EOL"); + meta = { + changelog = "https://nextcloud.com/changelog/#${lib.replaceStrings [ "." ] [ "-" ] version}"; + description = "Sharing solution for files, calendars, contacts and more"; + homepage = "https://nextcloud.com"; + maintainers = with lib.maintainers; [ + schneefux + bachp + globin + ma27 + ]; + license = lib.licenses.agpl3Plus; + platforms = lib.platforms.linux; + knownVulnerabilities = + extraVulnerabilities ++ (lib.optional eol "Nextcloud version ${version} is EOL"); + }; }; - }; -in { +in +{ nextcloud28 = generic { - version = "28.0.9"; - hash = "sha256-DZd3NkDn+A6gqTP7+L0pe/JB2ghy+hzFQ1D/F5Nmmxs="; + version = "28.0.10"; + hash = "sha256-LoAVJtKJHBhf6sWYXL084pLOcKQl9Tb5GfkBuftMwhA="; packages = nextcloud28Packages; }; nextcloud29 = generic { - version = "29.0.5"; - hash = "sha256-x/6cYeXsMKXlmejxUqGCXfaE0w6JnbDKqIaMjWe1Oiw="; + version = "29.0.7"; + hash = "sha256-9TL/wxvlqDdLXgcrhv/4dl7Bn9oMhQnO45hzCB2yxUQ="; packages = nextcloud29Packages; }; + nextcloud30 = generic { + version = "30.0.0"; + hash = "sha256-GNeoCVe7U+lPsESS9rUhNDTdo+naEtn3iZl2h8hWTmA="; + packages = nextcloud30Packages; + }; + # tip: get the sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index ba9a83d242103..834225e95e52a 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -1,8 +1,8 @@ { "bookmarks": { - "hash": "sha256-jByO7cJ9oQ4lQopzXCii11wqhg9tIlm/AFFViH+P3O0=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz", - "version": "14.2.4", + "hash": "sha256-xwyft6RGra/T9l8TSRRmWN50ZrdfTlZy3/pIpq/IzZs=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.6/bookmarks-14.2.6.tar.gz", + "version": "14.2.6", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-AcPONkfFTDRd7CQC5d0C7Fr3pKRsQXl8+GhaNlqpgiY=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.15/calendar-v4.7.15.tar.gz", - "version": "4.7.15", + "hash": "sha256-NwXTuSHl278Q2Wko4DC3rzqvNHnDI513UJ+8/3Rp5/U=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.16/calendar-v4.7.16.tar.gz", + "version": "4.7.16", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -30,9 +30,9 @@ ] }, "cookbook": { - "hash": "sha256-QRzXNoqOeEYYp0ctmsNisbQL5PWFOeqEVkcFeCduQtY=", - "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz", - "version": "0.11.1", + "hash": "sha256-upbTdzu17BH6tehgCUcTxBvTVOO31Kri/33vGd4Unyw=", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz", + "version": "0.11.2", "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", "homepage": "https://github.com/nextcloud/cookbook/", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "hash": "sha256-wr7uy5vfrfwxK3uytttJyWy8lvCDqfQjvFVGVD7mtco=", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.4/deck-v1.12.4.tar.gz", - "version": "1.12.4", + "hash": "sha256-XzflNdPCNfOYJkZopxBR6es0Fv9x0kpxtMqOxLthG6o=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.5/deck-v1.12.5.tar.gz", + "version": "1.12.5", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -80,9 +80,9 @@ ] }, "gpoddersync": { - "hash": "sha256-e4RtBCPtk8jIK+p4tGfukLmC8ikhAD7GiRSmmkWciZQ=", - "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.9.0/gpoddersync.tar.gz", - "version": "3.9.0", + "hash": "sha256-OMH/pnDS/icDVUb56mzxowAhBCaVY60bMGJmwsjEc0k=", + "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.10.0/gpoddersync.tar.gz", + "version": "3.10.0", "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", "homepage": "https://github.com/thrillfall/nextcloud-gpodder", "licenses": [ @@ -90,10 +90,10 @@ ] }, "groupfolders": { - "hash": "sha256-AMhhpzznCMW6vHc5vHkP4/wWY+NcqSvB/ZTVj2U6peM=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.8/groupfolders-v16.0.8.tar.gz", - "version": "16.0.8", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", + "hash": "sha256-PaDPYHUzkqY24Hzpi4e3DkvT32f+WYmx7WUNRevqIh8=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.10/groupfolders-v16.0.10.tar.gz", + "version": "16.0.10", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -120,9 +120,9 @@ ] }, "integration_paperless": { - "hash": "sha256-ARjs8cCUJICJaZiMIIt/lYk15WlXzzRqAQBWwax6HY4=", - "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.3/integration_paperless-v1.0.3.tar.gz", - "version": "1.0.3", + "hash": "sha256-D8w2TA2Olab326REnHHG+fFWRmWrhejAEokXZYx5H6w=", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.4/integration_paperless-v1.0.4.tar.gz", + "version": "1.0.4", "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", "homepage": "", "licenses": [ @@ -130,9 +130,9 @@ ] }, "mail": { - "hash": "sha256-oXdwApzy67tCsUNsPTdsE3HIs89g46I2W+cCVCPkRow=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.7/mail-v3.7.7.tar.gz", - "version": "3.7.7", + "hash": "sha256-8xQglDlOudopTsEqvnlsOTwOU6eAt6argVSXDxJdWUA=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.8/mail-v3.7.8.tar.gz", + "version": "3.7.8", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -150,29 +150,29 @@ ] }, "memories": { - "hash": "sha256-tzxeffvwMwthvBRG+/cLCXZkVS32rlf5v7XOKTbGoOo=", - "url": "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.tar.gz", - "version": "7.3.1", - "description": "# Memories: Photo Management for Nextcloud\r\n\r\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\r\n\r\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\r\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\r\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\r\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\r\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\r\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\r\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\r\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\r\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\r\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\r\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\r\n- **⚡️ Performance**: Do all this very fast.\r\n\r\n## 🚀 Installation\r\n\r\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\r\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\r\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\r\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", + "hash": "sha256-VMaOC+sCh84SsKjJk/pC3BwYRWRkqbCJPRgptI9dppA=", + "url": "https://github.com/pulsejet/memories/releases/download/v7.4.1/memories.tar.gz", + "version": "7.4.1", + "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ "agpl" ] }, "music": { - "hash": "sha256-RnTyQYCbmkHDZhtonpvbKLUM3n93u53IhknyTrNGh9Y=", - "url": "https://github.com/owncloud/music/releases/download/v2.0.0/music_2.0.0_for_nextcloud.tar.gz", - "version": "2.0.0", - "description": "A stand-alone music player app and a \"lite\" player for the Files app\r\n\r\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\r\n- Playlist support with import from m3u, m3u8, and pls files\r\n- Browse by artists, albums, genres, or folders\r\n- Gapless play\r\n- Filter the shown content with the search function\r\n- Play internet radio and podcast channels\r\n- Setup Last.fm connection to see background information on artists, albums, and songs\r\n- Control with media control keys on the keyboard or OS\r\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\r\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", + "hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=", + "url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz", + "version": "2.0.1", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", "homepage": "https://github.com/owncloud/music", "licenses": [ "agpl" ] }, "notes": { - "hash": "sha256-T7FUmazib5LZVsno/VN/NZYYJetTXcG89njamSgJ6Iw=", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.10.1/notes-v4.10.1.tar.gz", - "version": "4.10.1", + "hash": "sha256-dpMCehjhPQoOA+MVdLeGc370hmqWzmsMczgV08m/cO4=", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz", + "version": "4.11.0", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -190,9 +190,9 @@ ] }, "onlyoffice": { - "hash": "sha256-rHUM3HVY3INPAtTqYxpm9V3Ad8VTl+Wd2S7xAj0CJko=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.3.0/onlyoffice.tar.gz", - "version": "9.3.0", + "hash": "sha256-YkYsD/14syHOaxWEwBKgGGV0i5WlYJbGcqesLsWnimc=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.4.0/onlyoffice.tar.gz", + "version": "9.4.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ @@ -210,9 +210,9 @@ ] }, "polls": { - "hash": "sha256-6vYcZvI0F+imCMRO1XwBcyLmNJR+1miOkR2mpPpYAJE=", - "url": "https://github.com/nextcloud/polls/releases/download/v7.2.0/polls.tar.gz", - "version": "7.2.0", + "hash": "sha256-rLNB0idaKoL4e5O5NYXyhIyFpYguDG4Hg5OkHUEaQUM=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.4/polls-v7.2.4.tar.gz", + "version": "7.2.4", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -230,9 +230,9 @@ ] }, "qownnotesapi": { - "hash": "sha256-k1Sm0ZO9qx9KmAGCGYupcLeMSllKUmOlPSUgbWVrqI4=", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.4.0/qownnotesapi-nc.tar.gz", - "version": "24.4.0", + "hash": "sha256-jnKtJrzW5FzrluO5S+2Qdrune6TfWDOXlOh9xNm8h1M=", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.9.0/qownnotesapi-nc.tar.gz", + "version": "24.9.0", "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", "homepage": "https://github.com/pbek/qownnotesapi", "licenses": [ @@ -250,9 +250,9 @@ ] }, "richdocuments": { - "hash": "sha256-OrlbwMjoB8MGemB85xHa4otfB1PpriUxjYp+wbswR7s=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.9/richdocuments-v8.3.9.tar.gz", - "version": "8.3.9", + "hash": "sha256-nk5l9naHHBmpZe0oNzRNuYchbOl2asPgoRaM1vQ3CLc=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.3.11/richdocuments-v8.3.11.tar.gz", + "version": "8.3.11", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -260,9 +260,9 @@ ] }, "spreed": { - "hash": "sha256-kKdMx8KXQQ5RemdINtiZG+zJGpDSn7TYlTMYG7GHIhI=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.10/spreed-v18.0.10.tar.gz", - "version": "18.0.10", + "hash": "sha256-eMdFS5yQWJNsTVuHBZX4v0PSocP/nT+JaS7RSTYF8p0=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.11/spreed-v18.0.11.tar.gz", + "version": "18.0.11", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -309,6 +309,16 @@ "agpl" ] }, + "unsplash": { + "hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.1/unsplash.tar.gz", + "version": "3.0.1", + "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", + "homepage": "https://github.com/nextcloud/unsplash/", + "licenses": [ + "agpl" + ] + }, "user_oidc": { "hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=", "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 2a0e2d1bbc75e..df265671698da 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -1,8 +1,8 @@ { "bookmarks": { - "hash": "sha256-jByO7cJ9oQ4lQopzXCii11wqhg9tIlm/AFFViH+P3O0=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz", - "version": "14.2.4", + "hash": "sha256-xwyft6RGra/T9l8TSRRmWN50ZrdfTlZy3/pIpq/IzZs=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.6/bookmarks-14.2.6.tar.gz", + "version": "14.2.6", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-AcPONkfFTDRd7CQC5d0C7Fr3pKRsQXl8+GhaNlqpgiY=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.15/calendar-v4.7.15.tar.gz", - "version": "4.7.15", + "hash": "sha256-NwXTuSHl278Q2Wko4DC3rzqvNHnDI513UJ+8/3Rp5/U=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.16/calendar-v4.7.16.tar.gz", + "version": "4.7.16", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -30,9 +30,9 @@ ] }, "cookbook": { - "hash": "sha256-QRzXNoqOeEYYp0ctmsNisbQL5PWFOeqEVkcFeCduQtY=", - "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz", - "version": "0.11.1", + "hash": "sha256-upbTdzu17BH6tehgCUcTxBvTVOO31Kri/33vGd4Unyw=", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz", + "version": "0.11.2", "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", "homepage": "https://github.com/nextcloud/cookbook/", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "hash": "sha256-yJJS85Ll+lBN61v+q3q15RI9T9zlUKnq/b+QvcYQtuU=", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.13.1/deck-v1.13.1.tar.gz", - "version": "1.13.1", + "hash": "sha256-3vwl+KxYQTDAANdR3XKLU/jv5TbhDZBktKpITJaaGBo=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.13.2/deck-v1.13.2.tar.gz", + "version": "1.13.2", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -80,9 +80,9 @@ ] }, "gpoddersync": { - "hash": "sha256-e4RtBCPtk8jIK+p4tGfukLmC8ikhAD7GiRSmmkWciZQ=", - "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.9.0/gpoddersync.tar.gz", - "version": "3.9.0", + "hash": "sha256-OMH/pnDS/icDVUb56mzxowAhBCaVY60bMGJmwsjEc0k=", + "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.10.0/gpoddersync.tar.gz", + "version": "3.10.0", "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", "homepage": "https://github.com/thrillfall/nextcloud-gpodder", "licenses": [ @@ -90,10 +90,10 @@ ] }, "groupfolders": { - "hash": "sha256-cWWlvuUTO4B89CDZzfJLN8MRmQwPMwj0OwFqhIUxAsQ=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.2/groupfolders-v17.0.2.tar.gz", - "version": "17.0.2", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", + "hash": "sha256-3CG5lp1lcPzcvOjcQIFcP8OVZvWCq3iNf4OUCu3X7t8=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.4/groupfolders-v17.0.4.tar.gz", + "version": "17.0.4", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -120,9 +120,9 @@ ] }, "integration_paperless": { - "hash": "sha256-ARjs8cCUJICJaZiMIIt/lYk15WlXzzRqAQBWwax6HY4=", - "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.3/integration_paperless-v1.0.3.tar.gz", - "version": "1.0.3", + "hash": "sha256-D8w2TA2Olab326REnHHG+fFWRmWrhejAEokXZYx5H6w=", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.4/integration_paperless-v1.0.4.tar.gz", + "version": "1.0.4", "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", "homepage": "", "licenses": [ @@ -130,9 +130,9 @@ ] }, "mail": { - "hash": "sha256-oXdwApzy67tCsUNsPTdsE3HIs89g46I2W+cCVCPkRow=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.7/mail-v3.7.7.tar.gz", - "version": "3.7.7", + "hash": "sha256-8xQglDlOudopTsEqvnlsOTwOU6eAt6argVSXDxJdWUA=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.8/mail-v3.7.8.tar.gz", + "version": "3.7.8", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -150,29 +150,29 @@ ] }, "memories": { - "hash": "sha256-tzxeffvwMwthvBRG+/cLCXZkVS32rlf5v7XOKTbGoOo=", - "url": "https://github.com/pulsejet/memories/releases/download/v7.3.1/memories.tar.gz", - "version": "7.3.1", - "description": "# Memories: Photo Management for Nextcloud\r\n\r\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\r\n\r\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\r\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\r\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\r\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\r\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\r\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\r\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\r\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\r\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\r\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\r\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\r\n- **⚡️ Performance**: Do all this very fast.\r\n\r\n## 🚀 Installation\r\n\r\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\r\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\r\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\r\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", + "hash": "sha256-VMaOC+sCh84SsKjJk/pC3BwYRWRkqbCJPRgptI9dppA=", + "url": "https://github.com/pulsejet/memories/releases/download/v7.4.1/memories.tar.gz", + "version": "7.4.1", + "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ "agpl" ] }, "music": { - "hash": "sha256-RnTyQYCbmkHDZhtonpvbKLUM3n93u53IhknyTrNGh9Y=", - "url": "https://github.com/owncloud/music/releases/download/v2.0.0/music_2.0.0_for_nextcloud.tar.gz", - "version": "2.0.0", - "description": "A stand-alone music player app and a \"lite\" player for the Files app\r\n\r\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\r\n- Playlist support with import from m3u, m3u8, and pls files\r\n- Browse by artists, albums, genres, or folders\r\n- Gapless play\r\n- Filter the shown content with the search function\r\n- Play internet radio and podcast channels\r\n- Setup Last.fm connection to see background information on artists, albums, and songs\r\n- Control with media control keys on the keyboard or OS\r\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\r\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", + "hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=", + "url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz", + "version": "2.0.1", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", "homepage": "https://github.com/owncloud/music", "licenses": [ "agpl" ] }, "notes": { - "hash": "sha256-T7FUmazib5LZVsno/VN/NZYYJetTXcG89njamSgJ6Iw=", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.10.1/notes-v4.10.1.tar.gz", - "version": "4.10.1", + "hash": "sha256-dpMCehjhPQoOA+MVdLeGc370hmqWzmsMczgV08m/cO4=", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz", + "version": "4.11.0", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -190,9 +190,9 @@ ] }, "onlyoffice": { - "hash": "sha256-rHUM3HVY3INPAtTqYxpm9V3Ad8VTl+Wd2S7xAj0CJko=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.3.0/onlyoffice.tar.gz", - "version": "9.3.0", + "hash": "sha256-YkYsD/14syHOaxWEwBKgGGV0i5WlYJbGcqesLsWnimc=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.4.0/onlyoffice.tar.gz", + "version": "9.4.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ @@ -210,9 +210,9 @@ ] }, "polls": { - "hash": "sha256-6vYcZvI0F+imCMRO1XwBcyLmNJR+1miOkR2mpPpYAJE=", - "url": "https://github.com/nextcloud/polls/releases/download/v7.2.0/polls.tar.gz", - "version": "7.2.0", + "hash": "sha256-rLNB0idaKoL4e5O5NYXyhIyFpYguDG4Hg5OkHUEaQUM=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.4/polls-v7.2.4.tar.gz", + "version": "7.2.4", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -230,9 +230,9 @@ ] }, "qownnotesapi": { - "hash": "sha256-k1Sm0ZO9qx9KmAGCGYupcLeMSllKUmOlPSUgbWVrqI4=", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.4.0/qownnotesapi-nc.tar.gz", - "version": "24.4.0", + "hash": "sha256-jnKtJrzW5FzrluO5S+2Qdrune6TfWDOXlOh9xNm8h1M=", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.9.0/qownnotesapi-nc.tar.gz", + "version": "24.9.0", "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", "homepage": "https://github.com/pbek/qownnotesapi", "licenses": [ @@ -240,9 +240,9 @@ ] }, "registration": { - "hash": "sha256-4MLNKwYx/3hqnrcF2TpTCKOMveWINvWo71aOXcBO79E=", - "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.4.0/registration-v2.4.0.tar.gz", - "version": "2.4.0", + "hash": "sha256-LHrs6kCawIj7Te/OftUOEw8khgGnAP0nm9y/JaP8KkE=", + "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.5.0/registration-v2.5.0.tar.gz", + "version": "2.5.0", "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", "homepage": "https://github.com/nextcloud/registration", "licenses": [ @@ -250,9 +250,9 @@ ] }, "richdocuments": { - "hash": "sha256-uTY8li9cIBd/0/k9UAcoTboPNnvb66+6vB3nlplLY1E=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.4/richdocuments-v8.4.4.tar.gz", - "version": "8.4.4", + "hash": "sha256-fcKzfo8tyYiZTwqMnR6vP+dTwTYt1UfBZG8ortPDCNg=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.7/richdocuments-v8.4.7.tar.gz", + "version": "8.4.7", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -260,9 +260,9 @@ ] }, "spreed": { - "hash": "sha256-8PuYhxqP4594+Tt1lwGw93K2/dZwm97hSw13J0T3lhc=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.7/spreed-v19.0.7.tar.gz", - "version": "19.0.7", + "hash": "sha256-cZYE528jSNnPFgJSnqosoPyo/7V3zdUAIxnFpcOuvh4=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz", + "version": "19.0.9", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -309,6 +309,16 @@ "agpl" ] }, + "unsplash": { + "hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.1/unsplash.tar.gz", + "version": "3.0.1", + "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", + "homepage": "https://github.com/nextcloud/unsplash/", + "licenses": [ + "agpl" + ] + }, "user_oidc": { "hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=", "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json new file mode 100644 index 0000000000000..f4620a76062e1 --- /dev/null +++ b/pkgs/servers/nextcloud/packages/30.json @@ -0,0 +1,302 @@ +{ + "bookmarks": { + "hash": "sha256-F3r+FU5m9vj13bhJqGi7cCtZUxAIL453QUu1y65Ty/I=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v15.0.2/bookmarks-15.0.2.tar.gz", + "version": "15.0.2", + "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", + "homepage": "https://github.com/nextcloud/bookmarks", + "licenses": [ + "agpl" + ] + }, + "calendar": { + "hash": "sha256-mlxW7ALSUr3t7fd4H/TDWASzsSlPKojOLh76v8wd1w0=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.0/calendar-v5.0.0.tar.gz", + "version": "5.0.0", + "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", + "homepage": "https://github.com/nextcloud/calendar/", + "licenses": [ + "agpl" + ] + }, + "contacts": { + "hash": "sha256-/vikmy5phOK1OhFu6w5A1BYiNfbYaU7Js2+jiurM2ug=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.1.0/contacts-v6.1.0.tar.gz", + "version": "6.1.0", + "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", + "homepage": "https://github.com/nextcloud/contacts#readme", + "licenses": [ + "agpl" + ] + }, + "cookbook": { + "hash": "sha256-upbTdzu17BH6tehgCUcTxBvTVOO31Kri/33vGd4Unyw=", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz", + "version": "0.11.2", + "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", + "homepage": "https://github.com/nextcloud/cookbook/", + "licenses": [ + "agpl" + ] + }, + "cospend": { + "hash": "sha256-N2Vj5LTJpXEedKZljJGJfPSikh6qNBh8OKN7Ne3gt3o=", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v2.0.0/cospend-2.0.0.tar.gz", + "version": "2.0.0", + "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share expenses with a group of people.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. Balances are not an absolute amount of money at members disposal but rather a relative information showing if a member has spent more for the group than the group has spent for her/him, independently of exactly who spent money for whom. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be shared with other Nextcloud users or via public links.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently under developpement!\n\nThe private and public APIs are documented using [the Nextcloud OpenAPI extractor](https://github.com/nextcloud/openapi-extractor/). This documentation can be accessed directly in Nextcloud. All you need is to install Cospend (>= v1.6.0) and use the [the OCS API Viewer app](https://apps.nextcloud.com/apps/ocs_api_viewer) to browse the OpenAPI documentation.\n\n## Features\n\n* ✎ Create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ Check member balances\n* 🗠 Display project statistics\n* ♻ Display settlement plan\n* Move bills from one project to another\n* Move bills to trash before actually deleting them\n* Archive old projects before deleting them\n* 🎇 Automatically create reimbursement bills from settlement plan\n* 🗓 Create recurring bills (day/week/month/year)\n* 📊 Optionally provide custom amount for each member in new bills\n* 🔗 Link personal files to bills (picture of physical receipt for example)\n* 👩 Public links for people outside Nextcloud (can be password protected)\n* 👫 Share projects with Nextcloud users/groups/circles\n* 🖫 Import/export projects as csv (compatible with csv files from IHateMoney and SplitWise)\n* 🔗 Generate link/QRCode to easily add projects in MoneyBuster\n* 🗲 Implement Nextcloud notifications and activity stream\n\nThis app usually support the 2 or 3 last major versions of Nextcloud.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://github.com/julien-nc/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/julien-nc/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/julien-nc/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* It does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", + "homepage": "https://github.com/julien-nc/cospend-nc", + "licenses": [ + "agpl" + ] + }, + "deck": { + "hash": "sha256-X64B6l7h8MglBW5apC21G8jkg7WfnRYroczguI58V9g=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.1/deck-v1.14.1.tar.gz", + "version": "1.14.1", + "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", + "homepage": "https://github.com/nextcloud/deck", + "licenses": [ + "agpl" + ] + }, + "end_to_end_encryption": { + "hash": "sha256-lBuhMlAPWUQaRo+VBktbYM12RrXy3k1N4+YyYTv2oGQ=", + "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.16.1/end_to_end_encryption-v1.16.1.tar.gz", + "version": "1.16.1", + "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption", + "homepage": "https://github.com/nextcloud/end_to_end_encryption", + "licenses": [ + "agpl" + ] + }, + "gpoddersync": { + "hash": "sha256-OMH/pnDS/icDVUb56mzxowAhBCaVY60bMGJmwsjEc0k=", + "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.10.0/gpoddersync.tar.gz", + "version": "3.10.0", + "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", + "homepage": "https://github.com/thrillfall/nextcloud-gpodder", + "licenses": [ + "agpl" + ] + }, + "groupfolders": { + "hash": "sha256-jSDp8+s0bqYHMZ95UaiAMkMQdYL7tmdbde5mLG6gLOk=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.0.2/groupfolders-v18.0.2.tar.gz", + "version": "18.0.2", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", + "homepage": "https://github.com/nextcloud/groupfolders", + "licenses": [ + "agpl" + ] + }, + "impersonate": { + "hash": "sha256-lPzWFv00dIKe7S5L4t0edvzMWsV4cqVArdCb3TLgeeM=", + "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.17.0/impersonate-v1.17.0.tar.gz", + "version": "1.17.0", + "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.\n- You can limit which users/groups can use impersonation in Administration settings > Additional settings.", + "homepage": "https://github.com/nextcloud/impersonate", + "licenses": [ + "agpl" + ] + }, + "integration_openai": { + "hash": "sha256-J7ePjQlYy5gxVK6AmERWCo0aOFf9OP6KyYVZm8y82ek=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.1.2/integration_openai-v3.1.2.tar.gz", + "version": "3.1.2", + "description": "⚠️ The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALL·E via the OpenAI API: 🔴\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: 🟡\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "homepage": "https://github.com/nextcloud/integration_openai", + "licenses": [ + "agpl" + ] + }, + "integration_paperless": { + "hash": "sha256-D8w2TA2Olab326REnHHG+fFWRmWrhejAEokXZYx5H6w=", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.4/integration_paperless-v1.0.4.tar.gz", + "version": "1.0.4", + "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", + "homepage": "", + "licenses": [ + "agpl" + ] + }, + "mail": { + "hash": "sha256-ldrGgqgeRLjYmtWiSAcllaIkTeeUmhjQiXrcpwgb/wk=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.0.0/mail-v4.0.0.tar.gz", + "version": "4.0.0", + "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "homepage": "https://github.com/nextcloud/mail#readme", + "licenses": [ + "agpl" + ] + }, + "memories": { + "hash": "sha256-VMaOC+sCh84SsKjJk/pC3BwYRWRkqbCJPRgptI9dppA=", + "url": "https://github.com/pulsejet/memories/releases/download/v7.4.1/memories.tar.gz", + "version": "7.4.1", + "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", + "homepage": "https://memories.gallery", + "licenses": [ + "agpl" + ] + }, + "music": { + "hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=", + "url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz", + "version": "2.0.1", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", + "homepage": "https://github.com/owncloud/music", + "licenses": [ + "agpl" + ] + }, + "notes": { + "hash": "sha256-dpMCehjhPQoOA+MVdLeGc370hmqWzmsMczgV08m/cO4=", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz", + "version": "4.11.0", + "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", + "homepage": "https://github.com/nextcloud/notes", + "licenses": [ + "agpl" + ] + }, + "notify_push": { + "hash": "sha256-5VjDDU8YpSDHSV45GKP+YDSd9bq1F3/qLppaLiBzjy4=", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.7.0/notify_push-v0.7.0.tar.gz", + "version": "0.7.0", + "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", + "homepage": "", + "licenses": [ + "agpl" + ] + }, + "onlyoffice": { + "hash": "sha256-YkYsD/14syHOaxWEwBKgGGV0i5WlYJbGcqesLsWnimc=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.4.0/onlyoffice.tar.gz", + "version": "9.4.0", + "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", + "homepage": "https://www.onlyoffice.com", + "licenses": [ + "agpl" + ] + }, + "phonetrack": { + "hash": "sha256-zQt+3t86HZJVT/wiETHkPdTwV6Qy+iNkH3/THtTe1Xs=", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.8.1/phonetrack-0.8.1.tar.gz", + "version": "0.8.1", + "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* 📍 Display location history\n* ⛛ Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* ⛶ Define geofencing zones for devices\n* ⚇ Define proximity alerts for device pairs\n* 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n* 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n* 🗠 Display sessions statistics\n* 🔒 [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n* ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", + "homepage": "https://github.com/julien-nc/phonetrack", + "licenses": [ + "agpl" + ] + }, + "polls": { + "hash": "sha256-rLNB0idaKoL4e5O5NYXyhIyFpYguDG4Hg5OkHUEaQUM=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.4/polls-v7.2.4.tar.gz", + "version": "7.2.4", + "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", + "homepage": "https://github.com/nextcloud/polls", + "licenses": [ + "agpl" + ] + }, + "previewgenerator": { + "hash": "sha256-hjlwZfgfoH3iqbtJrPovgBC0Tu/vBhFqC752DZvndFY=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.6.0/previewgenerator-v5.6.0.tar.gz", + "version": "5.6.0", + "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", + "homepage": "https://github.com/nextcloud/previewgenerator", + "licenses": [ + "agpl" + ] + }, + "qownnotesapi": { + "hash": "sha256-jnKtJrzW5FzrluO5S+2Qdrune6TfWDOXlOh9xNm8h1M=", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.9.0/qownnotesapi-nc.tar.gz", + "version": "24.9.0", + "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", + "homepage": "https://github.com/pbek/qownnotesapi", + "licenses": [ + "agpl" + ] + }, + "registration": { + "hash": "sha256-LHrs6kCawIj7Te/OftUOEw8khgGnAP0nm9y/JaP8KkE=", + "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.5.0/registration-v2.5.0.tar.gz", + "version": "2.5.0", + "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", + "homepage": "https://github.com/nextcloud/registration", + "licenses": [ + "agpl" + ] + }, + "richdocuments": { + "hash": "sha256-sM536BlvbNNrGL++ZQItvnOBk+85Hr1Sxr6/0SZTm+g=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.1/richdocuments-v8.5.1.tar.gz", + "version": "8.5.1", + "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", + "homepage": "https://collaboraoffice.com/", + "licenses": [ + "agpl" + ] + }, + "spreed": { + "hash": "sha256-p0m4s4ZbWEyiPPBRKvEGFk/0xN+IiYPETDegm/8QDWY=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.0.0/spreed-v20.0.0.tar.gz", + "version": "20.0.0", + "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", + "homepage": "https://github.com/nextcloud/spreed", + "licenses": [ + "agpl" + ] + }, + "tasks": { + "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=", + "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz", + "version": "0.16.1", + "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", + "homepage": "https://github.com/nextcloud/tasks/", + "licenses": [ + "agpl" + ] + }, + "twofactor_webauthn": { + "hash": "sha256-gjMXFvn1FL6ptiW7CAlS9klaQdQFoJ6l/TzY4HQkUcY=", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.0.0/twofactor_webauthn-v2.0.0.tar.gz", + "version": "2.0.0", + "description": "A two-factor provider for WebAuthn devices", + "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", + "licenses": [ + "agpl" + ] + }, + "unroundedcorners": { + "hash": "sha256-ONOBDUciyWlKvi3Fd5+mWh3OLRfyW+PlKJKJWdMph0U=", + "url": "https://github.com/OliverParoczai/nextcloud-unroundedcorners/releases/download/v1.1.4/unroundedcorners-v1.1.4.tar.gz", + "version": "1.1.4", + "description": "# Unrounded Corners\nA Nextcloud app that restores the corners of buttons and widgets to their original looks by unrounding them.", + "homepage": "https://github.com/OliverParoczai/nextcloud-unroundedcorners", + "licenses": [ + "agpl" + ] + }, + "user_oidc": { + "hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz", + "version": "6.0.1", + "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", + "homepage": "https://github.com/nextcloud/user_oidc", + "licenses": [ + "agpl" + ] + }, + "user_saml": { + "hash": "sha256-+oeTDRomjmfSLIM6eyP6MHg+qtOs8IPqIWUzBofahYQ=", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.2.0/user_saml-v6.2.0.tar.gz", + "version": "6.2.0", + "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", + "homepage": "https://github.com/nextcloud/user_saml", + "licenses": [ + "agpl" + ] + } +} diff --git a/pkgs/servers/nextcloud/packages/apps/hmr_enabler.nix b/pkgs/servers/nextcloud/packages/apps/hmr_enabler.nix new file mode 100644 index 0000000000000..0249ad1e3ad9a --- /dev/null +++ b/pkgs/servers/nextcloud/packages/apps/hmr_enabler.nix @@ -0,0 +1,38 @@ +{ + php, + fetchFromGitHub, + lib, +}: + +php.buildComposerProject (finalAttrs: { + pname = "hmr_enabler"; + # composer doesn't support our unstable version format + # version = "0-unstable-2024-08-24"; + version = "0"; + + src = fetchFromGitHub { + owner = "nextcloud"; + repo = "hmr_enabler"; + rev = "d5d9d330d405ac4aa0de1a87d1133784560462ed"; + hash = "sha256-uLCpwvMVQ20z9vlO5q/GVPnaaQZ7ZjE8+V/zuqaB9Yo="; + }; + + composerNoDev = false; + + vendorHash = "sha256-ZuEEcFT+q49CCooEwdiu2Co345s0ZCC7jeEksi6A99A="; + + postInstall = '' + chmod -R u+w $out/share + mv $out/share/php/hmr_enabler/* $out/ + rm -r $out/share $out/composer.* $out/Makefile $out/psalm.xml $out/tests + ''; + + meta = { + description = " Development Nextcloud app to enable apps to use hot module reloading"; + homepage = "https://github.com/nextcloud/hmr_enabler"; + changelog = "https://github.com/nextcloud/hmr_enabler/blob/master/CHANGELOG.md"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ onny ]; + }; + +}) diff --git a/pkgs/servers/nextcloud/packages/default.nix b/pkgs/servers/nextcloud/packages/default.nix index 8af2e2f5833b9..7158bf8a2d0a8 100644 --- a/pkgs/servers/nextcloud/packages/default.nix +++ b/pkgs/servers/nextcloud/packages/default.nix @@ -2,28 +2,58 @@ # Licensed under: MIT # Slightly modified -{ lib, pkgs, newScope, apps }: +{ + lib, + pkgs, + newScope, + apps, + callPackage, +}: -let packages = self: - let - generatedJson = { - inherit apps; - }; - appBaseDefs = builtins.fromJSON (builtins.readFile ./nextcloud-apps.json); +let + packages = + self: + let + generatedJson = { + inherit apps; + }; + appBaseDefs = builtins.fromJSON (builtins.readFile ./nextcloud-apps.json); - in { - # Create a derivation from the official Nextcloud apps. - # This takes the data generated from the go tool. - mkNextcloudDerivation = self.callPackage ({ }: { pname, data }: - pkgs.fetchNextcloudApp { - appName = pname; - appVersion = data.version; - license = appBaseDefs.${pname}; - inherit (data) url hash description homepage; - }) {}; + in + { + # Create a derivation from the official Nextcloud apps. + # This takes the data generated from the go tool. + mkNextcloudDerivation = self.callPackage ( + { }: + { pname, data }: + pkgs.fetchNextcloudApp { + appName = pname; + appVersion = data.version; + license = appBaseDefs.${pname}; + inherit (data) + url + hash + description + homepage + ; + } + ) { }; - } // lib.mapAttrs (type: pkgs: - lib.makeExtensible (_: lib.mapAttrs (pname: data: self.mkNextcloudDerivation { inherit pname; inherit data; }) pkgs)) - generatedJson; + } + // lib.mapAttrs ( + type: pkgs: + lib.makeExtensible ( + _: + lib.mapAttrs ( + pname: data: + self.mkNextcloudDerivation { + inherit pname data; + } + ) pkgs + ) + ) generatedJson; -in (lib.makeExtensible (_: (lib.makeScope newScope packages))).extend (selfNC: superNC: {}) +in +(lib.makeExtensible (_: (lib.makeScope newScope packages))).extend ( + import ./thirdparty.nix +) diff --git a/pkgs/servers/nextcloud/packages/thirdparty.nix b/pkgs/servers/nextcloud/packages/thirdparty.nix new file mode 100644 index 0000000000000..bcf151bc93f0b --- /dev/null +++ b/pkgs/servers/nextcloud/packages/thirdparty.nix @@ -0,0 +1,12 @@ +_: +{ apps, callPackage, ... }: +{ + + apps = apps.extend ( + self: super: { + + hmr_enabler = callPackage ./apps/hmr_enabler.nix { }; + + } + ); +} diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix deleted file mode 100644 index dd066fb5193b4..0000000000000 --- a/pkgs/servers/nfd/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, boost179 # probably needs to match the one from ndn-cxx -, fetchFromGitHub -, libpcap -, ndn-cxx -, openssl -, pkg-config -, sphinx -, systemd -, wafHook -, websocketpp -, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, withWebSocket ? true -}: - -stdenv.mkDerivation rec { - pname = "nfd"; - version = "24.07"; - - src = fetchFromGitHub { - owner = "named-data"; - repo = lib.toUpper pname; - rev = "NFD-${version}"; - hash = "sha256-iEI8iS0eLLVe6PkOiCHL3onYNVYVZ1ttmk/aWrBkDhg="; - fetchSubmodules = true; - }; - - postPatch = '' - # These tests fail because they try to check for user/group permissions. - rm tests/daemon/mgmt/general-config-section.t.cpp - ''; - - nativeBuildInputs = [ pkg-config sphinx wafHook ]; - buildInputs = [ boost179 libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd; - - wafConfigureFlags = [ - "--boost-includes=${boost179.dev}/include" - "--boost-libs=${boost179.out}/lib" - "--with-tests" - ] ++ lib.optional (!withWebSocket) "--without-websocket"; - - doCheck = true; - checkPhase = '' - runHook preCheck - build/unit-tests-core - build/unit-tests-daemon - build/unit-tests-tools - runHook postCheck - ''; - - meta = with lib; { - homepage = "https://named-data.net/"; - description = "Named Data Networking (NDN) Forwarding Daemon"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ bertof ]; - }; -} diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index c5d3d97d629fa..82f9eca8d88d8 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "5.9"; + version = "6.1"; outputs = [ "out" "tools" ]; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-YFQcqRZenJUdTnlYM7gPnIxU47dytSHk5ALdbpSf5Ms="; + sha256 = "sha256-XQpbQ7NXVGVbm99d1ZEh1ckR5fd81xwZw8HorXHaeBk="; }; preConfigure = "cd src"; diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index 4e0f7b3c6b857..668500035222f 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aerospike-server"; - version = "7.1.0.5"; + version = "7.1.0.6"; src = fetchFromGitHub { owner = "aerospike"; repo = "aerospike-server"; rev = version; - hash = "sha256-eUB9A9dv71hlrnOQsKcZTfqxXVhz5ErhIOIks2wJois="; + hash = "sha256-10Ky4j4XyskjuuabCvD0mjpLOd9QjChM9TrDvKmgGHQ="; fetchSubmodules = true; }; diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index f7f5f36a6d0ee..7e6d5f02ddfc1 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, python +, python311Packages , makeWrapper , gawk , bash @@ -40,7 +40,11 @@ stdenv.mkDerivation rec { url = "mirror://apache/cassandra/${version}/apache-cassandra-${version}-bin.tar.gz"; }; - nativeBuildInputs = [ makeWrapper ]; + pythonPath = with python311Packages; [ cassandra-driver ]; + + nativeBuildInputs = [ python311Packages.wrapPython ]; + + buildInputs = [ python311Packages.python ] ++ pythonPath; installPhase = '' runHook preInstall @@ -98,11 +102,18 @@ stdenv.mkDerivation rec { fi done - wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin - runHook postInstall ''; + postFixup = '' + # Remove cassandra bash script wrapper. + # The wrapper searches for a suitable python version and is not necessary with Nix. + rm $out/bin/cqlsh + # Make "cqlsh.py" accessible by invoking "cqlsh" + ln -s $out/bin/cqlsh.py $out/bin/cqlsh + wrapPythonPrograms + ''; + passthru = { tests = let diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index d068f28ccf212..9269993a845e0 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -37,7 +37,7 @@ buildDotnetModule rec { executables = [ mainProgram ]; # This test has a problem running on macOS - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "EventStore.Projections.Core.Tests.Services.grpc_service.ServerFeaturesTests<LogFormat+V2,String>.should_receive_expected_endpoints" "EventStore.Projections.Core.Tests.Services.grpc_service.ServerFeaturesTests<LogFormat+V3,UInt32>.should_receive_expected_endpoints" ]; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 739fab6f81197..384958624611a 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -28,7 +28,7 @@ let sourceRoot = "${src.name}/libflux"; cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; pkgcfg = '' Name: flux Version: ${libflux_version} @@ -42,7 +42,7 @@ let cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include substitute $pkgcfgPath $out/pkgconfig/flux.pc \ --replace /out $out - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib ''; }; diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 81333a9f1ec30..99ae9bc38c2bf 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -53,7 +53,7 @@ let sourceRoot = "${src.name}/libflux"; cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; pkgcfg = '' Name: flux Version: ${libflux_version} @@ -67,7 +67,7 @@ let cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include substitute $pkgcfgPath $out/pkgconfig/flux.pc \ --replace /out $out - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib ''; }; diff --git a/pkgs/servers/nosql/mongodb/5.0.nix b/pkgs/servers/nosql/mongodb/5.0.nix index 1738ba2f05e1c..84c0991515b0d 100644 --- a/pkgs/servers/nosql/mongodb/5.0.nix +++ b/pkgs/servers/nosql/mongodb/5.0.nix @@ -8,13 +8,13 @@ let buildMongoDB = callPackage ./mongodb.nix { inherit sasl boost Security CoreFoundation cctools; }; - variants = if stdenv.isLinux then + variants = if stdenv.hostPlatform.isLinux then { - version = "5.0.28"; - sha256 = "sha256-r4JltJL4w0TX6dT45W3tYptShnEGxnlF7tYe5mCuc78="; + version = "5.0.29"; + sha256 = "sha256-27+SXo0fjFwJFFm/NhpDhq95dMwiN8RCJO7j5ic49Ls="; patches = [ ./fix-build-with-boost-1.79-5_0-linux.patch ]; } - else lib.optionalAttrs stdenv.isDarwin + else lib.optionalAttrs stdenv.hostPlatform.isDarwin { version = "5.0.3"; # at least darwin has to stay on 5.0.3 until the SDK used by nixpkgs is bumped to 10.13 sha256 = "1p9pq0dfd6lynvnz5p1c8dqp4filzrz86j840xwxwx82dm1zl6p0"; @@ -29,6 +29,8 @@ buildMongoDB { ./forget-build-dependencies-4-4.patch ./asio-no-experimental-string-view-4-4.patch ./fix-gcc-Wno-exceptions-5.0.patch + # Fix building with python 3.12 since the imp module was removed + ./mongodb-python312.patch ] ++ variants.patches; passthru.tests = { inherit (nixosTests) mongodb; }; } diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 170aeec068cf4..7132039908b06 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -21,6 +21,9 @@ buildMongoDB { url = "https://github.com/mongodb/mongo/commit/5435f9585f857f6145beaf6d31daf336453ba86f.patch"; sha256 = "sha256-gWlE2b/NyGe2243iNCXzjcERIY8/4ZWI4Gjh5SF0tYA="; }) + + # Fix building with python 3.12 since the imp module was removed + ./mongodb-python312.patch ]; # passthru.tests = { inherit (nixosTests) mongodb; }; # currently tests mongodb-5_0 } diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix new file mode 100644 index 0000000000000..ec71361194722 --- /dev/null +++ b/pkgs/servers/nosql/mongodb/7.0.nix @@ -0,0 +1,37 @@ +{ + stdenv, + callPackage, + sasl, + boost, + Security, + CoreFoundation, + cctools, + avxSupport ? stdenv.hostPlatform.avxSupport, +}: + +let + buildMongoDB = callPackage ./mongodb.nix { + inherit + sasl + boost + Security + CoreFoundation + cctools + stdenv + ; + }; +in +buildMongoDB { + inherit avxSupport; + version = "7.0.14"; + sha256 = "sha256-3NUv/Rr6V0rH6zHCXJwHZ7ZQOqMJvYGessNVemUF6g0="; + patches = [ + # ModuleNotFoundError: No module named 'mongo_tooling_metrics': + # NameError: name 'SConsToolingMetrics' is not defined: + # The recommended linker 'lld' is not supported with the current compiler configuration, you can try the 'gold' linker with '--linker=gold'. + ./mongodb7-SConstruct.patch + + # Fix building with python 3.12 since the imp module was removed + ./mongodb-python312.patch + ]; +} diff --git a/pkgs/servers/nosql/mongodb/mongodb-python312.patch b/pkgs/servers/nosql/mongodb/mongodb-python312.patch new file mode 100644 index 0000000000000..c0fa630dddca4 --- /dev/null +++ b/pkgs/servers/nosql/mongodb/mongodb-python312.patch @@ -0,0 +1,22 @@ +diff --git a/buildscripts/moduleconfig.py b/buildscripts/moduleconfig.py +index b4d0bba0490..f59ddd7bc5c 100644 +--- a/buildscripts/moduleconfig.py ++++ b/buildscripts/moduleconfig.py +@@ -27,7 +27,7 @@ MongoDB SConscript files do. + __all__ = ('discover_modules', 'discover_module_directories', 'configure_modules', + 'register_module_test') # pylint: disable=undefined-all-variable + +-import imp ++import importlib + import inspect + import os + +@@ -71,7 +71,7 @@ def discover_modules(module_root, allowed_modules): + print("adding module: %s" % (name)) + fp = open(build_py, "r") + try: +- module = imp.load_module("module_" + name, fp, build_py, ++ module = importlib.load_module("module_" + name, fp, build_py, + (".py", "r", imp.PY_SOURCE)) + if getattr(module, "name", None) is None: + module.name = name diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 47d788b753e3b..5836a925498f1 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -4,6 +4,7 @@ , buildPackages , boost , gperftools +, pcre2 , pcre-cpp , snappy , zlib @@ -13,7 +14,6 @@ , openldap , openssl , libpcap -, python311Packages , curl , Security , CoreFoundation @@ -32,12 +32,13 @@ }: let - scons = buildPackages.scons.override{ python3Packages = python311Packages; }; + scons = buildPackages.scons; python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools + distutils ] ++ lib.optionals (lib.versionAtLeast version "6.0") [ packaging pymongo @@ -48,7 +49,6 @@ let system-libraries = [ "boost" - "pcre" "snappy" "yaml" "zlib" @@ -56,7 +56,13 @@ let #"stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs). #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source. #"wiredtiger" - ] ++ lib.optionals stdenv.isLinux [ "tcmalloc" ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "tcmalloc" ] + ++ lib.optionals (lib.versionOlder version "7.0") [ + "pcre" + ] + ++ lib.optionals (lib.versionAtLeast version "7.0") [ + "pcre2" + ]; inherit (lib) systems subtractLists; in stdenv.mkDerivation rec { @@ -73,7 +79,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ scons python - ] ++ lib.optional stdenv.isLinux net-snmp; + ] ++ lib.optional stdenv.hostPlatform.isLinux net-snmp; buildInputs = [ boost @@ -83,12 +89,13 @@ in stdenv.mkDerivation rec { yaml-cpp openssl openldap + pcre2 pcre-cpp sasl snappy zlib - ] ++ lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ] - ++ lib.optional stdenv.isLinux net-snmp + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreFoundation cctools ] + ++ lib.optional stdenv.hostPlatform.isLinux net-snmp ++ [ xz ]; # MongoDB keeps track of its build parameters, which tricks nix into @@ -107,9 +114,9 @@ in stdenv.mkDerivation rec { #include <string>' substituteInPlace src/mongo/db/exec/plan_stats.h --replace '#include <string>' '#include <optional> #include <string>' - '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder version "6.0") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder version "6.0") '' substituteInPlace src/third_party/mozjs-${mozjsVersion}/extract/js/src/jsmath.cpp --replace '${mozjsReplace}' 0 - '' + lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.hostPlatform.isi686 '' # don't fail by default on i686 substituteInPlace src/mongo/db/storage/storage_options.h \ @@ -142,9 +149,9 @@ in stdenv.mkDerivation rec { preBuild = '' sconsFlags+=" CC=$CC" sconsFlags+=" CXX=$CXX" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sconsFlags+=" AR=$AR" - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' sconsFlags+=" CCFLAGS='-march=armv8-a+crc'" ''; diff --git a/pkgs/servers/nosql/mongodb/mongodb7-SConstruct.patch b/pkgs/servers/nosql/mongodb/mongodb7-SConstruct.patch new file mode 100644 index 0000000000000..e5489ea38dfd1 --- /dev/null +++ b/pkgs/servers/nosql/mongodb/mongodb7-SConstruct.patch @@ -0,0 +1,63 @@ +diff --git a/SConstruct b/SConstruct +index 07579349b83..68a26f26a49 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -23,7 +23,6 @@ from pkg_resources import parse_version + + import SCons + import SCons.Script +-from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics + from site_scons.mongo import build_profiles + + # This must be first, even before EnsureSConsVersion, if +@@ -1653,16 +1652,6 @@ env = Environment(variables=env_vars, **envDict) + del envDict + env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption') + +-# The placement of this is intentional. Here we setup an atexit method to store tooling metrics. +-# We should only register this function after env, env_vars and the parser have been properly initialized. +-SConsToolingMetrics.register_metrics( +- utc_starttime=datetime.utcnow(), +- artifact_dir=env.Dir('$BUILD_DIR').get_abspath(), +- env_vars=env_vars, +- env=env, +- parser=_parser, +-) +- + if get_option('build-metrics'): + env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR' + env.Tool('build_metrics') +@@ -3549,33 +3538,6 @@ def doConfigure(myenv): + myenv.AddMethod( + functools.partial(var_func, var=var, func=CheckFlag), f"Check{var}Supported") + +- if myenv.ToolchainIs('gcc', 'clang'): +- # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker +- # because it is much faster. Don't use it if the user has already configured another linker +- # selection manually. +- if any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']): +- myenv.FatalError( +- f"Use the '--linker' option instead of modifying the LINKFLAGS directly.") +- +- linker_ld = get_option('linker') +- if linker_ld == 'auto': +- if not env.TargetOSIs('darwin', 'macOS'): +- if not myenv.AddToLINKFLAGSIfSupported('-fuse-ld=lld'): +- myenv.FatalError( +- f"The recommended linker 'lld' is not supported with the current compiler configuration, you can try the 'gold' linker with '--linker=gold'." +- ) +- elif link_model.startswith("dynamic") and linker_ld == 'bfd': +- # BFD is not supported due to issues with it causing warnings from some of +- # the third party libraries that mongodb is linked with: +- # https://jira.mongodb.org/browse/SERVER-49465 +- myenv.FatalError(f"Linker {linker_ld} is not supported with dynamic link model builds.") +- else: +- if not myenv.AddToLINKFLAGSIfSupported(f'-fuse-ld={linker_ld}'): +- myenv.FatalError(f"Linker {linker_ld} could not be configured.") +- +- if has_option('gcov') and myenv.AddToCCFLAGSIfSupported('-fprofile-update=single'): +- myenv.AppendUnique(LINKFLAGS=['-fprofile-update=single']) +- + detectCompiler = Configure( + myenv, + help=False, diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index f4b375a62cc1b..4b8e039bc7567 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "neo4j"; - version = "5.21.0"; + version = "5.22.0"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - hash = "sha256-NFGoUqmG8VArQqx0p8qDUgvbtRnYbk1MYPSQ5CUFexg="; + hash = "sha256-gK5iNkGjs1Pjsryl5Jy28Nu3nYnVEoUMdRw1ahN4xEQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index f201e34e85c76..2fd43c1e2566c 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "8.0.1"; + version = "8.1.1"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-S6i6XLxFpIxYAlxCu+MAznMLkBWvp8QVxged+rYCWT0="; + hash = "sha256-modTynPY7NqzdOKekmSaMpYvRF5oSF0BCRT2xZEUMN0="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index d15b05699d630..42bafb37c8192 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withSystemd systemd ++ lib.optionals tlsSupport [ openssl ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/Makefile --replace "-flto" "" ''; @@ -53,12 +53,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); # darwin currently lacks a pure `pgrep` which is extensively used here - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; checkPhase = '' runHook preCheck diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 2ba228dd699b3..03aed49f564b7 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - configureFlags = lib.optionals (!stdenv.isDarwin) [ + configureFlags = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "--with-jemalloc" "--lib-path=${jemalloc}/lib" ]; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { makeFlags = [ "rethinkdb" ]; buildInputs = [ protobuf boost zlib curl openssl icu ] - ++ lib.optional (!stdenv.isDarwin) jemalloc - ++ lib.optional stdenv.isDarwin libtool; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) jemalloc + ++ lib.optional stdenv.hostPlatform.isDarwin libtool; nativeBuildInputs = [ which m4 python3Packages.python makeWrapper ]; diff --git a/pkgs/servers/nostr-rs-relay/default.nix b/pkgs/servers/nostr-rs-relay/default.nix index f52e8ff16e238..c63f4d2a057f5 100644 --- a/pkgs/servers/nostr-rs-relay/default.nix +++ b/pkgs/servers/nostr-rs-relay/default.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "nostr-rs-relay"; - version = "0.8.13"; + version = "0.8.13-unstable-2024-08-14"; src = fetchFromGitHub { owner = "scsibug"; repo = "nostr-rs-relay"; - rev = version; - hash = "sha256-YgYi387b1qlGpjupqgGuLx8muHJ1iMx1sH82UW3TsQg="; + rev = "5a2189062560709b641bb13bedaca2cd478b4403"; + hash = "sha256-ZUndTcLGdAODgSsIqajlNdaEYbYWame0vFRBVmRFzKw="; }; - cargoHash = "sha256-CwyX8VlzH/y5LZtaMDd/4yWGCZLczc9bW4AqUzQFFKU="; + cargoHash = "sha256-+agmlg6tAnEJ5o586fUY7V4fdNScDPKCbaZqt7R3gqg="; buildInputs = [ openssl.dev ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index 6e6ece8ea7cb9..a9fb9aa335862 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeWrapper, autoPatchelfHook, fixDarwinDylibNames, zlib, krb5, openssl, icu, nixosTests }: let - os = if stdenv.isDarwin then "osx" else "linux"; + os = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; arch = { x86_64-linux = "x64"; aarch64-linux = "arm64"; diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/servers/onlyoffice-documentserver/default.nix index 278259459a545..e494344d72cd5 100644 --- a/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/pkgs/servers/onlyoffice-documentserver/default.nix @@ -15,12 +15,18 @@ let # var/www/onlyoffice/documentserver/server/DocService/docservice onlyoffice-documentserver = stdenv.mkDerivation rec { pname = "onlyoffice-documentserver"; - version = "8.1.1"; + version = "8.1.3"; - src = fetchurl { - url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb"; - sha256 = "sha256-YzGImBG/CkJqKrZwQQ/mgptasxqYgmmE2ivzbYzbz9M="; - }; + src = fetchurl ({ + "aarch64-linux" = { + url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${version}/onlyoffice-documentserver_arm64.deb"; + sha256 = "sha256-+7hHz1UcnlJNhBAVaYQwK0m2tkgsfbjqY3oa8XU0yxo="; + }; + "x86_64-linux" = { + url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${version}/onlyoffice-documentserver_amd64.deb"; + sha256 = "sha256-jCwcXb97Z9/ZofKLYneJxKAnaZE/Hwvm34GLQu/BoUM="; + }; + }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")); preferLocalBuild = true; @@ -144,7 +150,7 @@ let ''; homepage = "https://github.com/ONLYOFFICE/DocumentServer"; license = licenses.agpl3Plus; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; sourceProvenance = [ sourceTypes.binaryNativeCode ]; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index bc1e7a3f5e182..f21693591672a 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -103,9 +103,9 @@ stdenv.mkDerivation (finalAttrs: { moreutils ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] ++ (with xorg; [ libX11 libxkbfile libkrb5 ]) - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Security @@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: { find -path "*@vscode/ripgrep" -type d \ -execdir mkdir -p {}/bin \; \ -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+ # (see issue #101229) pushd ./remote/node_modules/@parcel/watcher diff --git a/pkgs/servers/osmocom/osmo-bsc/default.nix b/pkgs/servers/osmocom/osmo-bsc/default.nix index 647a54bf53282..ced3be6b350fb 100644 --- a/pkgs/servers/osmocom/osmo-bsc/default.nix +++ b/pkgs/servers/osmocom/osmo-bsc/default.nix @@ -11,7 +11,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/osmocom/osmo-ggsn/default.nix b/pkgs/servers/osmocom/osmo-ggsn/default.nix index 87c1ee1d9573d..f2c77d33ddb1f 100644 --- a/pkgs/servers/osmocom/osmo-ggsn/default.nix +++ b/pkgs/servers/osmocom/osmo-ggsn/default.nix @@ -7,7 +7,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/osmocom/osmo-hlr/default.nix b/pkgs/servers/osmocom/osmo-hlr/default.nix index ec8d4622a8482..a287619155ed4 100644 --- a/pkgs/servers/osmocom/osmo-hlr/default.nix +++ b/pkgs/servers/osmocom/osmo-hlr/default.nix @@ -9,7 +9,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/osmocom/osmo-hnbgw/default.nix b/pkgs/servers/osmocom/osmo-hnbgw/default.nix index fc3798fde18d8..e074e0100d28a 100644 --- a/pkgs/servers/osmocom/osmo-hnbgw/default.nix +++ b/pkgs/servers/osmocom/osmo-hnbgw/default.nix @@ -13,7 +13,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/osmocom/osmo-hnodeb/default.nix b/pkgs/servers/osmocom/osmo-hnodeb/default.nix index 9455b14aad2a4..27cf6c04f41ae 100644 --- a/pkgs/servers/osmocom/osmo-hnodeb/default.nix +++ b/pkgs/servers/osmocom/osmo-hnodeb/default.nix @@ -13,7 +13,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/osmocom/osmo-iuh/default.nix b/pkgs/servers/osmocom/osmo-iuh/default.nix index 98629719ee8dc..55add5a09b731 100644 --- a/pkgs/servers/osmocom/osmo-iuh/default.nix +++ b/pkgs/servers/osmocom/osmo-iuh/default.nix @@ -12,7 +12,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/osmocom/osmo-mgw/default.nix b/pkgs/servers/osmocom/osmo-mgw/default.nix index 23959b3be9ecd..08774c7236515 100644 --- a/pkgs/servers/osmocom/osmo-mgw/default.nix +++ b/pkgs/servers/osmocom/osmo-mgw/default.nix @@ -9,7 +9,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/osmocom/osmo-msc/default.nix b/pkgs/servers/osmocom/osmo-msc/default.nix index 679c88e5cff92..352489af8b68d 100644 --- a/pkgs/servers/osmocom/osmo-msc/default.nix +++ b/pkgs/servers/osmocom/osmo-msc/default.nix @@ -14,7 +14,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/osmocom/osmo-pcu/default.nix b/pkgs/servers/osmocom/osmo-pcu/default.nix index 74f56957059b5..a8b2000ec8525 100644 --- a/pkgs/servers/osmocom/osmo-pcu/default.nix +++ b/pkgs/servers/osmocom/osmo-pcu/default.nix @@ -8,7 +8,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/osmocom/osmo-sgsn/default.nix b/pkgs/servers/osmocom/osmo-sgsn/default.nix index d9ca0d72084c5..a182986ee27ce 100644 --- a/pkgs/servers/osmocom/osmo-sgsn/default.nix +++ b/pkgs/servers/osmocom/osmo-sgsn/default.nix @@ -12,7 +12,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/osmocom/osmo-sip-connector/default.nix b/pkgs/servers/osmocom/osmo-sip-connector/default.nix index c10361f119b34..b1f810d0f5f7e 100644 --- a/pkgs/servers/osmocom/osmo-sip-connector/default.nix +++ b/pkgs/servers/osmocom/osmo-sip-connector/default.nix @@ -9,7 +9,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 23a3d85b91e22..9adbf38811ef9 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -53,13 +53,27 @@ stdenv.mkDerivation rec { }) ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=stringop-overflow" - "-Wno-error=uninitialized" - # Needed for GCC 13 - "-Wno-error=array-bounds" - ]; + env.NIX_CFLAGS_COMPILE = toString ( + [ + # Needed with GCC 12 + "-Wno-error=stringop-overflow" + "-Wno-error=uninitialized" + # Needed for GCC 13 + "-Wno-error=array-bounds" + ] + ++ + # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer + (lib.optionals + ( + stdenv.hostPlatform.isDarwin + && stdenv.hostPlatform.isx86_64 + && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" + ) + [ + "-faligned-allocation" + ] + ) + ); postInstall = '' mkdir -p $out/share/osrm-backend diff --git a/pkgs/servers/owntracks-recorder/default.nix b/pkgs/servers/owntracks-recorder/default.nix index c0c28fac254e1..98c97f833bde0 100644 --- a/pkgs/servers/owntracks-recorder/default.nix +++ b/pkgs/servers/owntracks-recorder/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "owntracks-recorder"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "owntracks"; repo = "recorder"; rev = finalAttrs.version; - hash = "sha256-KDImoIUAkjCa4O++F9LdDN+i8VoC78g8644Rhbpy+mc="; + hash = "sha256-h+hjcaa+Ooa8gErjzfX+p+S24fbnCOtjfliFWVj73dI="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index 868ec8f8bd396..091b2037d2356 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Security ]; cargoBuildFlags = [ "--package" "oxigraph_server" ]; diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/servers/photoprism/default.nix index 0c39ad8b6b810..ab641548b42c1 100644 --- a/pkgs/servers/photoprism/default.nix +++ b/pkgs/servers/photoprism/default.nix @@ -1,4 +1,5 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg_7, libheif, exiftool, imagemagick, makeWrapper, testers +{ lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg_7, libheif, exiftool, imagemagick, makeWrapper, testers +, callPackage , nixosTests , librsvg }: @@ -13,9 +14,9 @@ let hash = "sha256-ihDv5c5RUjDbFcAHJjzp/8qCwKfA+rlFXPziaYarzs8="; }; - libtensorflow = pkgs.callPackage ./libtensorflow.nix { }; - backend = pkgs.callPackage ./backend.nix { inherit libtensorflow src version; }; - frontend = pkgs.callPackage ./frontend.nix { inherit src version; }; + libtensorflow = callPackage ./libtensorflow.nix { }; + backend = callPackage ./backend.nix { inherit libtensorflow src version; }; + frontend = callPackage ./frontend.nix { inherit src version; }; fetchModel = { name, hash }: fetchzip { @@ -41,7 +42,7 @@ let assets_path = "$out/share/${pname}"; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { inherit pname version; nativeBuildInputs = [ @@ -62,7 +63,7 @@ stdenv.mkDerivation { --set PHOTOPRISM_ASSETS_PATH ${assets_path} \ --set PHOTOPRISM_DARKTABLE_BIN ${darktable}/bin/darktable-cli \ --set PHOTOPRISM_RAWTHERAPEE_BIN ${rawtherapee}/bin/rawtherapee-cli \ - --set PHOTOPRISM_HEIFCONVERT_BIN ${libheif}/bin/heif-convert \ + --set PHOTOPRISM_HEIFCONVERT_BIN ${libheif}/bin/heif-dec \ --set PHOTOPRISM_RSVGCONVERT_BIN ${librsvg}/bin/rsvg-convert \ --set PHOTOPRISM_FFMPEG_BIN ${ffmpeg_7}/bin/ffmpeg \ --set PHOTOPRISM_EXIFTOOL_BIN ${exiftool}/bin/exiftool \ @@ -78,7 +79,7 @@ stdenv.mkDerivation { runHook postInstall ''; - passthru.tests.version = testers.testVersion { package = pkgs.photoprism; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; passthru.tests.photoprism = nixosTests.photoprism; meta = with lib; { @@ -89,4 +90,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ benesim ]; mainProgram = "photoprism"; }; -} +}) diff --git a/pkgs/servers/pim6sd/default.nix b/pkgs/servers/pim6sd/default.nix index e1bc6ce48ff40..81b60d46e28b6 100644 --- a/pkgs/servers/pim6sd/default.nix +++ b/pkgs/servers/pim6sd/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/pim6sd.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/pim6sd.x86_64-darwin }; } diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/pingvin-share/backend.nix index 37bc0ffd6be19..17046f1fd9f5e 100644 --- a/pkgs/servers/pingvin-share/backend.nix +++ b/pkgs/servers/pingvin-share/backend.nix @@ -31,7 +31,7 @@ buildNpmPackage { prisma ]; - npmDepsHash = "sha256-btjvX+2krSc0/bJqeLcVTqHBVWqiTFipp3MidO9wApY="; + npmDepsHash = "sha256-F+pYEsaU4Rsiq1z3rwGeKznZqpITF+AoFgswhTFeXf8="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/pingvin-share/default.nix index 9dd4fd88c2374..eaf7392ab4d29 100644 --- a/pkgs/servers/pingvin-share/default.nix +++ b/pkgs/servers/pingvin-share/default.nix @@ -5,12 +5,12 @@ }: let - version = "0.29.0"; + version = "1.1.3"; src = fetchFromGitHub { owner = "stonith404"; repo = "pingvin-share"; rev = "v${version}"; - hash = "sha256-ETsIGb6IxGruApUP05cuMtTDNAE23CI1Q2MmjxX3aPo="; + hash = "sha256-n3EwmS8uKrhEuNOh55eAkEtibAerAy6AduszW4leJuI="; }; in diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/pingvin-share/frontend.nix index eaddc1f6f01e4..84092c174810d 100644 --- a/pkgs/servers/pingvin-share/frontend.nix +++ b/pkgs/servers/pingvin-share/frontend.nix @@ -23,7 +23,7 @@ buildNpmPackage { buildInputs = [ vips ]; nativeBuildInputs = [ pkg-config ]; - npmDepsHash = "sha256-66CUVLbq2XdOQAr69DcvxTMvOgSR/RTKPaq80JG+8dg="; + npmDepsHash = "sha256-laVAVwx/A/6TunCmmZYQKAuYqv1xTG3e1DIonj2S9IU="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix index f3cc1c5543c48..0e081884e4cf8 100644 --- a/pkgs/servers/piping-server-rust/default.nix +++ b/pkgs/servers/piping-server-rust/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-YSiClSnjgqFqT2IGJoatcy7j3NUKcff826AvJ/+RNNU="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; meta = with lib; { description = "Infinitely transfer between every device over pure HTTP with pipes or browsers"; diff --git a/pkgs/servers/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch b/pkgs/servers/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch index 48aa60d4f0d10..34d3fd14e8859 100644 --- a/pkgs/servers/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch +++ b/pkgs/servers/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch @@ -3,7 +3,8 @@ From: Yaya <yaya@uwu.is> Date: Sun, 6 Aug 2023 00:02:40 +0000 Subject: [PATCH] Revert "Config: Restrict permissions of OTP config file" -This reverts commit 4befb3b1d02f32eb2c56f12e4684a7bb3167b0ee. +This reverts commit 4befb3b1d02f32eb2c56f12e4684a7bb3167b0ee +and 3b82864bccee1af625dd19faed511d5b76f66f9d. The Nix store is world readable by design. --- @@ -19,7 +20,7 @@ index 9ec0f975e..91e5f1a54 100644 with_runtime_config = if File.exists?(config_path) do - # <https://git.pleroma.social/pleroma/pleroma/-/issues/3135> -- %File.Stat{mode: mode} = File.lstat!(config_path) +- %File.Stat{mode: mode} = File.stat!(config_path) - - if Bitwise.band(mode, 0o007) > 0 do - raise "Configuration at #{config_path} has world-permissions, execute the following: chmod o= #{config_path}" diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 15382071602f4..565fb8ad52e37 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -1,93 +1,81 @@ -{ lib, beamPackages -, fetchFromGitHub, fetchFromGitLab, fetchHex -, file, cmake -, nixosTests, writeText -, ... +{ + lib, + beamPackages, + fetchFromGitHub, + fetchFromGitLab, + fetchHex, + file, + cmake, + nixosTests, + writeText, + vips, + pkg-config, + glib, + ... }: beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.6.3"; + version = "2.7.0"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-ZiupcCu6ES/G9rsdNo5+JXOIPhb4CHT2YhKThWiLisw="; + sha256 = "sha256-2uKVwjxMLC8jyZWW+ltBRNtOR7RaAb8SPO1iV2wyROc="; }; - patches = [ - ./Revert-Config-Restrict-permissions-of-OTP-config.patch - ]; + patches = [ ./Revert-Config-Restrict-permissions-of-OTP-config.patch ]; mixNixDeps = import ./mix.nix { inherit beamPackages lib; overrides = final: prev: { # mix2nix does not support git dependencies yet, # so we need to add them manually - prometheus_ex = beamPackages.buildMix rec { - name = "prometheus_ex"; - version = "3.0.5"; - - src = fetchFromGitHub { - owner = "lanodan"; - repo = "prometheus.ex"; - rev = "31f7fbe4b71b79ba27efc2a5085746c4011ceb8f"; - sha256 = "sha256-2PZP+YnwnHt69HtIAQvjMBqBbfdbkRSoMzb1AL2Zsyc="; - }; - beamDeps = with final; [ prometheus ]; - }; - captcha = beamPackages.buildMix rec { + captcha = beamPackages.buildMix { name = "captcha"; version = "0.1.0"; src = fetchFromGitLab { domain = "git.pleroma.social"; - group = "pleroma"; - owner = "elixir-libraries"; + owner = "pleroma/elixir-libraries"; repo = "elixir-captcha"; rev = "90f6ce7672f70f56708792a98d98bd05176c9176"; - hash = "sha256-s7EuAhmCsQA/4p2NJHJSWB/DZ5hA+7EelPsUOvKr2Po="; + sha256 = "sha256-s7EuAhmCsQA/4p2NJHJSWB/DZ5hA+7EelPsUOvKr2Po="; }; - beamDeps = with final; [ ]; + beamDeps = [ ]; + }; + prometheus_ex = beamPackages.buildMix { + name = "prometheus_ex"; + version = "3.0.5"; - postInstall = "mv priv/* $out/lib/erlang/lib/${name}-${version}/priv/"; + src = fetchFromGitHub { + owner = "lanodan"; + repo = "prometheus.ex"; + rev = "31f7fbe4b71b79ba27efc2a5085746c4011ceb8f"; + hash = "sha256-2PZP+YnwnHt69HtIAQvjMBqBbfdbkRSoMzb1AL2Zsyc="; + }; + beamDeps = with final; [ prometheus ]; }; - remote_ip = beamPackages.buildMix rec { + remote_ip = beamPackages.buildMix { name = "remote_ip"; version = "0.1.5"; src = fetchFromGitLab { domain = "git.pleroma.social"; - group = "pleroma"; - owner = "elixir-libraries"; + owner = "pleroma/elixir-libraries"; repo = "remote_ip"; rev = "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"; - sha256 = "0c7vmakcxlcs3j040018i7bfd6z0yq6fjfig02g5fgakx398s0x6"; - }; - beamDeps = with final; [ combine plug inet_cidr ]; - }; - prometheus_phx = beamPackages.buildMix rec { - name = "prometheus_phx"; - version = "0.1.1"; - - preBuild = '' - touch config/prod.exs - ''; - src = fetchFromGitLab { - domain = "git.pleroma.social"; - group = "pleroma"; - owner = "elixir-libraries"; - repo = "prometheus-phx"; - rev = "9cd8f248c9381ffedc799905050abce194a97514"; - sha256 = "0211z4bxb0bc0zcrhnph9kbbvvi1f2v95madpr96pqzr60y21cam"; + hash = "sha256-pgON0uhTPVeeAC866Qz24Jvm1okoAECAHJrRzqaq+zA="; }; - beamDeps = with final; [ prometheus_ex ]; - }; - majic = prev.majic.override { - buildInputs = [ file ]; + beamDeps = with final; [ + combine + plug + inet_cidr + ]; }; + majic = prev.majic.override { buildInputs = [ file ]; }; # Some additional build inputs and build fixes http_signatures = prev.http_signatures.override { patchPhase = '' @@ -98,8 +86,16 @@ beamPackages.mixRelease rec { nativeBuildInputs = [ cmake ]; dontUseCmakeConfigure = true; }; - syslog = prev.syslog.override { - buildPlugins = with beamPackages; [ pc ]; + + syslog = prev.syslog.override { buildPlugins = with beamPackages; [ pc ]; }; + + vix = prev.vix.override { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + vips + glib.dev + ]; + VIX_COMPILATION_MODE = "PLATFORM_PROVIDED_LIBVIPS"; }; # This needs a different version (1.0.14 -> 1.0.18) to build properly with @@ -132,25 +128,27 @@ beamPackages.mixRelease rec { sha256 = "120znzz0yw1994nk6v28zql9plgapqpv51n9g6qm6md1f4x7gj0z"; }; - beamDeps = []; + beamDeps = [ ]; }; mime = prev.mime.override { - patchPhase = let - cfgFile = writeText "config.exs" '' - use Mix.Config - config :mime, :types, %{ - "application/activity+json" => ["activity+json"], - "application/jrd+json" => ["jrd+json"], - "application/ld+json" => ["activity+json"], - "application/xml" => ["xml"], - "application/xrd+xml" => ["xrd+xml"] - } + patchPhase = + let + cfgFile = writeText "config.exs" '' + use Mix.Config + config :mime, :types, %{ + "application/activity+json" => ["activity+json"], + "application/jrd+json" => ["jrd+json"], + "application/ld+json" => ["activity+json"], + "application/xml" => ["xml"], + "application/xrd+xml" => ["xrd+xml"] + } + ''; + in + '' + mkdir config + cp ${cfgFile} config/config.exs ''; - in '' - mkdir config - cp ${cfgFile} config/config.exs - ''; }; }; }; @@ -164,7 +162,11 @@ beamPackages.mixRelease rec { description = "ActivityPub microblogging server"; homepage = "https://git.pleroma.social/pleroma/pleroma"; license = licenses.agpl3Only; - maintainers = with maintainers; [ picnoir kloenk yayayayaka ]; + maintainers = with maintainers; [ + picnoir + kloenk + yayayayaka + ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix index 2b3512f1c8a83..65ab75c39d4a6 100644 --- a/pkgs/servers/pleroma/mix.nix +++ b/pkgs/servers/pleroma/mix.nix @@ -21,6 +21,19 @@ let beamDeps = []; }; + bandit = buildMix rec { + name = "bandit"; + version = "1.5.5"; + + src = fetchHex { + pkg = "bandit"; + version = "${version}"; + sha256 = "f21579a29ea4bc08440343b2b5f16f7cddf2fea5725d31b72cf973ec729079e1"; + }; + + beamDeps = [ hpax plug telemetry thousand_island websock ]; + }; + base62 = buildMix rec { name = "base62"; version = "1.2.2"; @@ -62,25 +75,38 @@ let benchee = buildMix rec { name = "benchee"; - version = "1.1.0"; + version = "1.3.0"; src = fetchHex { pkg = "benchee"; version = "${version}"; - sha256 = "7da57d545003165a012b587077f6ba90b89210fd88074ce3c60ce239eb5e6d93"; + sha256 = "34f4294068c11b2bd2ebf2c59aac9c7da26ffa0068afdf3419f1b176e16c5f81"; }; beamDeps = [ deep_merge statistex ]; }; + blurhash = buildMix rec { + name = "blurhash"; + version = "0.1.0"; + + src = fetchHex { + pkg = "rinpatch_blurhash"; + version = "${version}"; + sha256 = "19911a5dcbb0acb9710169a72f702bce6cb048822b12de566ccd82b2cc42b907"; + }; + + beamDeps = [ mogrify ]; + }; + bunt = buildMix rec { name = "bunt"; - version = "0.2.1"; + version = "1.0.0"; src = fetchHex { pkg = "bunt"; version = "${version}"; - sha256 = "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"; + sha256 = "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"; }; beamDeps = []; @@ -125,14 +151,27 @@ let beamDeps = []; }; + cc_precompiler = buildMix rec { + name = "cc_precompiler"; + version = "0.1.9"; + + src = fetchHex { + pkg = "cc_precompiler"; + version = "${version}"; + sha256 = "9dcab3d0f3038621f1601f13539e7a9ee99843862e66ad62827b0c42b2f58a54"; + }; + + beamDeps = [ elixir_make ]; + }; + certifi = buildRebar3 rec { name = "certifi"; - version = "2.9.0"; + version = "2.12.0"; src = fetchHex { pkg = "certifi"; version = "${version}"; - sha256 = "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"; + sha256 = "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"; }; beamDeps = []; @@ -153,12 +192,12 @@ let comeonin = buildMix rec { name = "comeonin"; - version = "5.3.3"; + version = "5.4.0"; src = fetchHex { pkg = "comeonin"; version = "${version}"; - sha256 = "3e38c9c2cb080828116597ca8807bb482618a315bfafd98c90bc22a821cc84df"; + sha256 = "796393a9e50d01999d56b7b8420ab0481a7538d0caf80919da493b4a6e51faf1"; }; beamDeps = []; @@ -218,12 +257,12 @@ let cowboy = buildErlangMk rec { name = "cowboy"; - version = "2.10.0"; + version = "2.12.0"; src = fetchHex { pkg = "cowboy"; version = "${version}"; - sha256 = "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"; + sha256 = "8a7abe6d183372ceb21caa2709bec928ab2b72e18a3911aa1771639bef82651e"; }; beamDeps = [ cowlib ranch ]; @@ -244,12 +283,12 @@ let cowlib = buildRebar3 rec { name = "cowlib"; - version = "2.12.1"; + version = "2.13.0"; src = fetchHex { pkg = "cowlib"; version = "${version}"; - sha256 = "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"; + sha256 = "e1e1284dc3fc030a64b1ad0d8382ae7e99da46c3246b815318a4b848873800a4"; }; beamDeps = []; @@ -257,12 +296,12 @@ let credo = buildMix rec { name = "credo"; - version = "1.7.0"; + version = "1.7.3"; src = fetchHex { pkg = "credo"; version = "${version}"; - sha256 = "6839fcf63d1f0d1c0f450abc8564a57c43d644077ab96f2934563e68b8a769d7"; + sha256 = "35ea675a094c934c22fb1dca3696f3c31f2728ae6ef5a53b5d648c11180a4535"; }; beamDeps = [ bunt file_system jason ]; @@ -296,12 +335,12 @@ let db_connection = buildMix rec { name = "db_connection"; - version = "2.5.0"; + version = "2.7.0"; src = fetchHex { pkg = "db_connection"; version = "${version}"; - sha256 = "c92d5ba26cd69ead1ff7582dbb860adeedfff39774105a4f1c92cbb654b55aa2"; + sha256 = "dcf08f31b2701f857dfc787fbad78223d61a32204f217f15e881dd93e4bdd3ff"; }; beamDeps = [ telemetry ]; @@ -333,40 +372,40 @@ let beamDeps = []; }; - earmark = buildMix rec { - name = "earmark"; - version = "1.4.22"; + dialyxir = buildMix rec { + name = "dialyxir"; + version = "1.4.3"; src = fetchHex { - pkg = "earmark"; + pkg = "dialyxir"; version = "${version}"; - sha256 = "1caf5145665a42fd76d5317286b0c171861fb1c04f86ab103dde76868814fdfb"; + sha256 = "bf2cfb75cd5c5006bec30141b131663299c661a864ec7fbbc72dfa557487a986"; }; - beamDeps = [ earmark_parser ]; + beamDeps = [ erlex ]; }; - earmark_parser = buildMix rec { - name = "earmark_parser"; - version = "1.4.32"; + earmark = buildMix rec { + name = "earmark"; + version = "1.4.46"; src = fetchHex { - pkg = "earmark_parser"; + pkg = "earmark"; version = "${version}"; - sha256 = "b8b0dd77d60373e77a3d7e8afa598f325e49e8663a51bcc2b88ef41838cca755"; + sha256 = "798d86db3d79964e759ddc0c077d5eb254968ed426399fbf5a62de2b5ff8910a"; }; beamDeps = []; }; - eblurhash = buildRebar3 rec { - name = "eblurhash"; - version = "1.2.2"; + earmark_parser = buildMix rec { + name = "earmark_parser"; + version = "1.4.39"; src = fetchHex { - pkg = "eblurhash"; + pkg = "earmark_parser"; version = "${version}"; - sha256 = "8c20ca00904de023a835a9dcb7b7762fed32264c85a80c3cafa85288e405044c"; + sha256 = "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"; }; beamDeps = []; @@ -374,12 +413,12 @@ let ecto = buildMix rec { name = "ecto"; - version = "3.10.2"; + version = "3.11.2"; src = fetchHex { pkg = "ecto"; version = "${version}"; - sha256 = "6a895778f0d7648a4b34b486af59a1c8009041fbdf2b17f1ac215eb829c60235"; + sha256 = "3c38bca2c6f8d8023f2145326cc8a80100c3ffe4dcbd9842ff867f7fc6156c65"; }; beamDeps = [ decimal jason telemetry ]; @@ -400,12 +439,12 @@ let ecto_psql_extras = buildMix rec { name = "ecto_psql_extras"; - version = "0.7.11"; + version = "0.7.15"; src = fetchHex { pkg = "ecto_psql_extras"; version = "${version}"; - sha256 = "def61f1f92d4f40d51c80bbae2157212d6c0a459eb604be446e47369cbd40b23"; + sha256 = "b6127f3a5c6fc3d84895e4768cc7c199f22b48b67d6c99b13fbf4a374e73f039"; }; beamDeps = [ ecto_sql postgrex table_rex ]; @@ -413,12 +452,12 @@ let ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.10.1"; + version = "3.11.3"; src = fetchHex { pkg = "ecto_sql"; version = "${version}"; - sha256 = "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"; + sha256 = "e5f36e3d736b99c7fee3e631333b8394ade4bafe9d96d35669fca2d81c2be928"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -439,12 +478,25 @@ let elixir_make = buildMix rec { name = "elixir_make"; - version = "0.6.3"; + version = "0.7.8"; src = fetchHex { pkg = "elixir_make"; version = "${version}"; - sha256 = "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"; + sha256 = "7a71945b913d37ea89b06966e1342c85cfe549b15e6d6d081e8081c493062c07"; + }; + + beamDeps = [ castore certifi ]; + }; + + erlex = buildMix rec { + name = "erlex"; + version = "0.2.6"; + + src = fetchHex { + pkg = "erlex"; + version = "${version}"; + sha256 = "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"; }; beamDeps = []; @@ -491,12 +543,12 @@ let ex_aws_s3 = buildMix rec { name = "ex_aws_s3"; - version = "2.4.0"; + version = "2.5.3"; src = fetchHex { pkg = "ex_aws_s3"; version = "${version}"; - sha256 = "85dda6e27754d94582869d39cba3241d9ea60b6aa4167f9c88e309dc687e56bb"; + sha256 = "4f09dd372cc386550e484808c5ac5027766c8d0cd8271ccc578b82ee6ef4f3b8"; }; beamDeps = [ ex_aws sweet_xml ]; @@ -517,12 +569,12 @@ let ex_doc = buildMix rec { name = "ex_doc"; - version = "0.29.4"; + version = "0.31.1"; src = fetchHex { pkg = "ex_doc"; version = "${version}"; - sha256 = "2c6699a737ae46cb61e4ed012af931b57b699643b24dabe2400a8168414bc4f5"; + sha256 = "3178c3a407c557d8343479e1ff117a96fd31bafe52a039079593fb0524ef61b0"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -554,14 +606,27 @@ let beamDeps = [ poison syslog ]; }; + exile = buildMix rec { + name = "exile"; + version = "0.10.0"; + + src = fetchHex { + pkg = "exile"; + version = "${version}"; + sha256 = "c62ee8fee565b5ac4a898d0dcd58d2b04fb5eec1655af1ddcc9eb582c6732c33"; + }; + + beamDeps = [ elixir_make ]; + }; + expo = buildMix rec { name = "expo"; - version = "0.4.1"; + version = "0.5.1"; src = fetchHex { pkg = "expo"; version = "${version}"; - sha256 = "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"; + sha256 = "68a4233b0658a3d12ee00d27d37d856b1ba48607e7ce20fd376958d0ba6ce92b"; }; beamDeps = []; @@ -569,12 +634,12 @@ let fast_html = buildMix rec { name = "fast_html"; - version = "2.0.5"; + version = "2.2.0"; src = fetchHex { pkg = "fast_html"; version = "${version}"; - sha256 = "605f4f4829443c14127694ebabb681778712ceecb4470ec32aa31012330e6506"; + sha256 = "064c4f23b4a6168f9187dac8984b056f2c531bb0787f559fd6a8b34b38aefbae"; }; beamDeps = [ elixir_make nimble_pool ]; @@ -608,15 +673,15 @@ let finch = buildMix rec { name = "finch"; - version = "0.10.2"; + version = "0.18.0"; src = fetchHex { pkg = "finch"; version = "${version}"; - sha256 = "dd8b11b282072cec2ef30852283949c248bd5d2820c88d8acc89402b81db7550"; + sha256 = "69f5045b042e531e53edc2574f15e25e735b522c37e2ddb766e15b979e03aa65"; }; - beamDeps = [ castore mint nimble_options nimble_pool telemetry ]; + beamDeps = [ castore mime mint nimble_options nimble_pool telemetry ]; }; flake_id = buildMix rec { @@ -634,12 +699,12 @@ let floki = buildMix rec { name = "floki"; - version = "0.34.3"; + version = "0.35.2"; src = fetchHex { pkg = "floki"; version = "${version}"; - sha256 = "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"; + sha256 = "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"; }; beamDeps = []; @@ -660,12 +725,12 @@ let gettext = buildMix rec { name = "gettext"; - version = "0.22.2"; + version = "0.24.0"; src = fetchHex { pkg = "gettext"; version = "${version}"; - sha256 = "8a2d389673aea82d7eae387e6a2ccc12660610080ae7beb19452cfdc1ec30f60"; + sha256 = "bdf75cdfcbe9e4622dd18e034b227d77dd17f0f133853a1c73b97b3d6c770e8b"; }; beamDeps = [ expo ]; @@ -686,12 +751,12 @@ let hackney = buildRebar3 rec { name = "hackney"; - version = "1.18.1"; + version = "1.18.2"; src = fetchHex { pkg = "hackney"; version = "${version}"; - sha256 = "a4ecdaff44297e9b5894ae499e9a070ea1888c84afdd1fd9b7b2bc384950128e"; + sha256 = "af94d5c9f97857db257090a4a10e5426ecb6f4918aa5cc666798566ae14b65fd"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; @@ -699,12 +764,12 @@ let hpax = buildMix rec { name = "hpax"; - version = "0.1.2"; + version = "0.2.0"; src = fetchHex { pkg = "hpax"; version = "${version}"; - sha256 = "2c87843d5a23f5f16748ebe77969880e29809580efdaccd615cd3bed628a8c13"; + sha256 = "bea06558cdae85bed075e6c036993d43cd54d447f76d8190a8db0dc5893fa2f1"; }; beamDeps = []; @@ -725,12 +790,12 @@ let http_signatures = buildMix rec { name = "http_signatures"; - version = "0.1.1"; + version = "0.1.2"; src = fetchHex { pkg = "http_signatures"; version = "${version}"; - sha256 = "cc3b8a007322cc7b624c0c15eec49ee58ac977254ff529a3c482f681465942a3"; + sha256 = "f08aa9ac121829dae109d608d83c84b940ef2f183ae50f2dd1e9a8bc619d8be7"; }; beamDeps = []; @@ -764,12 +829,12 @@ let inet_cidr = buildMix rec { name = "inet_cidr"; - version = "1.0.4"; + version = "1.0.8"; src = fetchHex { pkg = "inet_cidr"; version = "${version}"; - sha256 = "64a2d30189704ae41ca7dbdd587f5291db5d1dda1414e0774c29ffc81088c1bc"; + sha256 = "d5b26da66603bb56c933c65214c72152f0de9a6ea53618b56d63302a68f6a90e"; }; beamDeps = []; @@ -777,12 +842,12 @@ let jason = buildMix rec { name = "jason"; - version = "1.4.0"; + version = "1.4.3"; src = fetchHex { pkg = "jason"; version = "${version}"; - sha256 = "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"; + sha256 = "9a90e868927f7c777689baa16d86f4d0e086d968db5c05d917ccff6d443e58a3"; }; beamDeps = [ decimal ]; @@ -803,12 +868,12 @@ let jose = buildMix rec { name = "jose"; - version = "1.11.5"; + version = "1.11.6"; src = fetchHex { pkg = "jose"; version = "${version}"; - sha256 = "dcd3b215bafe02ea7c5b23dafd3eb8062a5cd8f2d904fd9caa323d37034ab384"; + sha256 = "6275cb75504f9c1e60eeacb771adfeee4905a9e182103aa59b53fed651ff9738"; }; beamDeps = []; @@ -816,12 +881,12 @@ let jumper = buildMix rec { name = "jumper"; - version = "1.0.1"; + version = "1.0.2"; src = fetchHex { pkg = "jumper"; version = "${version}"; - sha256 = "318c59078ac220e966d27af3646026db9b5a5e6703cb2aa3e26bcfaba65b7433"; + sha256 = "9b7782409021e01ab3c08270e26f36eb62976a38c1aa64b2eaf6348422f165e1"; }; beamDeps = []; @@ -840,6 +905,19 @@ let beamDeps = []; }; + logger_backends = buildMix rec { + name = "logger_backends"; + version = "1.0.0"; + + src = fetchHex { + pkg = "logger_backends"; + version = "${version}"; + sha256 = "1faceb3e7ec3ef66a8f5746c5afd020e63996df6fd4eb8cdb789e5665ae6c9ce"; + }; + + beamDeps = []; + }; + majic = buildMix rec { name = "majic"; version = "1.0.0"; @@ -881,12 +959,12 @@ let makeup_erlang = buildMix rec { name = "makeup_erlang"; - version = "0.1.2"; + version = "0.1.3"; src = fetchHex { pkg = "makeup_erlang"; version = "${version}"; - sha256 = "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"; + sha256 = "b78dc853d2e670ff6390b605d807263bf606da3c82be37f9d7f68635bd886fc9"; }; beamDeps = [ makeup ]; @@ -933,12 +1011,12 @@ let mimerl = buildRebar3 rec { name = "mimerl"; - version = "1.2.0"; + version = "1.3.0"; src = fetchHex { pkg = "mimerl"; version = "${version}"; - sha256 = "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"; + sha256 = "a1e15a50d1887217de95f0b9b0793e32853f7c258a5cd227650889b38839fe9d"; }; beamDeps = []; @@ -946,12 +1024,12 @@ let mint = buildMix rec { name = "mint"; - version = "1.5.1"; + version = "1.6.1"; src = fetchHex { pkg = "mint"; version = "${version}"; - sha256 = "4a63e1e76a7c3956abd2c72f370a0d0aecddc3976dea5c27eccbecfa5e7d5b1e"; + sha256 = "4fc518dcc191d02f433393a72a7ba3f6f94b101d094cb6bf532ea54c89423780"; }; beamDeps = [ castore hpax ]; @@ -985,12 +1063,12 @@ let mogrify = buildMix rec { name = "mogrify"; - version = "0.9.3"; + version = "0.8.0"; src = fetchHex { pkg = "mogrify"; version = "${version}"; - sha256 = "0189b1e1de27455f2b9ae8cf88239cefd23d38de9276eb5add7159aea51731e6"; + sha256 = "2278d245f07056ea3b586e98801e933695147066fa4cf563f552c1b4f0ff8ad9"; }; beamDeps = []; @@ -998,12 +1076,12 @@ let mox = buildMix rec { name = "mox"; - version = "1.0.2"; + version = "1.1.0"; src = fetchHex { pkg = "mox"; version = "${version}"; - sha256 = "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2"; + sha256 = "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13"; }; beamDeps = []; @@ -1011,12 +1089,12 @@ let nimble_options = buildMix rec { name = "nimble_options"; - version = "0.4.0"; + version = "1.1.1"; src = fetchHex { pkg = "nimble_options"; version = "${version}"; - sha256 = "e6701c1af326a11eea9634a3b1c62b475339ace9456c1a23ec3bc9a847bca02d"; + sha256 = "821b2470ca9442c4b6984882fe9bb0389371b8ddec4d45a9504f00a66f650b44"; }; beamDeps = []; @@ -1050,25 +1128,51 @@ let oban = buildMix rec { name = "oban"; - version = "2.13.6"; + version = "2.17.12"; src = fetchHex { pkg = "oban"; version = "${version}"; - sha256 = "3c1c5eb16f377b3cbbf2ea14be24d20e3d91285af9d1ac86260b7c2af5464887"; + sha256 = "7a647d6cd6bb300073db17faabce22d80ae135da3baf3180a064fa7c4fa046e3"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; }; + oban_live_dashboard = buildMix rec { + name = "oban_live_dashboard"; + version = "0.1.1"; + + src = fetchHex { + pkg = "oban_live_dashboard"; + version = "${version}"; + sha256 = "16dc4ce9c9a95aa2e655e35ed4e675652994a8def61731a18af85e230e1caa63"; + }; + + beamDeps = [ oban phoenix_live_dashboard ]; + }; + + octo_fetch = buildMix rec { + name = "octo_fetch"; + version = "0.4.0"; + + src = fetchHex { + pkg = "octo_fetch"; + version = "${version}"; + sha256 = "cf8be6f40cd519d7000bb4e84adcf661c32e59369ca2827c4e20042eda7a7fc6"; + }; + + beamDeps = [ castore ssl_verify_fun ]; + }; + open_api_spex = buildMix rec { name = "open_api_spex"; - version = "3.17.3"; + version = "3.18.2"; src = fetchHex { pkg = "open_api_spex"; version = "${version}"; - sha256 = "165db21a85ca83cffc8e7c8890f35b354eddda8255de7404a2848ed652b9f0fe"; + sha256 = "aa3e6dcfc0ad6a02596b2172662da21c9dd848dac145ea9e603f54e3d81b8d2b"; }; beamDeps = [ jason plug poison ]; @@ -1076,12 +1180,12 @@ let parse_trans = buildRebar3 rec { name = "parse_trans"; - version = "3.3.1"; + version = "3.4.1"; src = fetchHex { pkg = "parse_trans"; version = "${version}"; - sha256 = "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"; + sha256 = "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"; }; beamDeps = []; @@ -1102,25 +1206,25 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.6.16"; + version = "1.7.14"; src = fetchHex { pkg = "phoenix"; version = "${version}"; - sha256 = "e15989ff34f670a96b95ef6d1d25bad0d9c50df5df40b671d8f4a669e050ac39"; + sha256 = "c7859bc56cc5dfef19ecfc240775dae358cbaa530231118a9e014df392ace61a"; }; - beamDeps = [ castore jason phoenix_pubsub phoenix_view plug plug_cowboy plug_crypto telemetry ]; + beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter ]; }; phoenix_ecto = buildMix rec { name = "phoenix_ecto"; - version = "4.4.2"; + version = "4.4.3"; src = fetchHex { pkg = "phoenix_ecto"; version = "${version}"; - sha256 = "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"; + sha256 = "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"; }; beamDeps = [ ecto phoenix_html plug ]; @@ -1128,12 +1232,12 @@ let phoenix_html = buildMix rec { name = "phoenix_html"; - version = "3.3.1"; + version = "3.3.4"; src = fetchHex { pkg = "phoenix_html"; version = "${version}"; - sha256 = "bed1906edd4906a15fd7b412b85b05e521e1f67c9a85418c55999277e553d0d3"; + sha256 = "0249d3abec3714aff3415e7ee3d9786cb325be3151e6c4b3021502c585bf53fb"; }; beamDeps = [ plug ]; @@ -1141,12 +1245,12 @@ let phoenix_live_dashboard = buildMix rec { name = "phoenix_live_dashboard"; - version = "0.6.5"; + version = "0.8.3"; src = fetchHex { pkg = "phoenix_live_dashboard"; version = "${version}"; - sha256 = "ef4fa50dd78364409039c99cf6f98ab5209b4c5f8796c17f4db118324f0db852"; + sha256 = "f9470a0a8bae4f56430a23d42f977b5a6205fdba6559d76f932b876bfaec652d"; }; beamDeps = [ ecto ecto_psql_extras mime phoenix_live_view telemetry_metrics ]; @@ -1167,15 +1271,15 @@ let phoenix_live_view = buildMix rec { name = "phoenix_live_view"; - version = "0.17.14"; + version = "0.19.5"; src = fetchHex { pkg = "phoenix_live_view"; version = "${version}"; - sha256 = "afeb6ba43ce329a6f7fc1c9acdfc6d3039995345f025febb7f409a92f6faebd3"; + sha256 = "b2eaa0dd3cfb9bd7fb949b88217df9f25aed915e986a28ad5c8a0d054e7ca9d3"; }; - beamDeps = [ jason phoenix phoenix_html telemetry ]; + beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ]; }; phoenix_pubsub = buildMix rec { @@ -1193,12 +1297,12 @@ let phoenix_swoosh = buildMix rec { name = "phoenix_swoosh"; - version = "1.2.0"; + version = "1.2.1"; src = fetchHex { pkg = "phoenix_swoosh"; version = "${version}"; - sha256 = "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"; + sha256 = "4000eeba3f9d7d1a6bf56d2bd56733d5cadf41a7f0d8ffe5bb67e7d667e204a2"; }; beamDeps = [ finch hackney phoenix phoenix_html phoenix_view swoosh ]; @@ -1206,12 +1310,12 @@ let phoenix_template = buildMix rec { name = "phoenix_template"; - version = "1.0.1"; + version = "1.0.4"; src = fetchHex { pkg = "phoenix_template"; version = "${version}"; - sha256 = "157dc078f6226334c91cb32c1865bf3911686f8bcd6bcff86736f6253e6993ee"; + sha256 = "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"; }; beamDeps = [ phoenix_html ]; @@ -1219,12 +1323,12 @@ let phoenix_view = buildMix rec { name = "phoenix_view"; - version = "2.0.2"; + version = "2.0.4"; src = fetchHex { pkg = "phoenix_view"; version = "${version}"; - sha256 = "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"; + sha256 = "4e992022ce14f31fe57335db27a28154afcc94e9983266835bb3040243eb620b"; }; beamDeps = [ phoenix_html phoenix_template ]; @@ -1232,12 +1336,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.14.2"; + version = "1.16.1"; src = fetchHex { pkg = "plug"; version = "${version}"; - sha256 = "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"; + sha256 = "a13ff6b9006b03d7e33874945b2755253841b238c34071ed85b0e86057f8cddc"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1245,12 +1349,12 @@ let plug_cowboy = buildMix rec { name = "plug_cowboy"; - version = "2.6.1"; + version = "2.7.1"; src = fetchHex { pkg = "plug_cowboy"; version = "${version}"; - sha256 = "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"; + sha256 = "02dbd5f9ab571b864ae39418db7811618506256f6d13b4a45037e5fe78dc5de3"; }; beamDeps = [ cowboy cowboy_telemetry plug ]; @@ -1258,12 +1362,12 @@ let plug_crypto = buildMix rec { name = "plug_crypto"; - version = "1.2.5"; + version = "2.1.0"; src = fetchHex { pkg = "plug_crypto"; version = "${version}"; - sha256 = "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"; + sha256 = "131216a4b030b8f8ce0f26038bc4421ae60e4bb95c5cf5395e1421437824c4fa"; }; beamDeps = []; @@ -1310,12 +1414,12 @@ let postgrex = buildMix rec { name = "postgrex"; - version = "0.17.1"; + version = "0.17.5"; src = fetchHex { pkg = "postgrex"; version = "${version}"; - sha256 = "14b057b488e73be2beee508fb1955d8db90d6485c6466428fe9ccf1d6692a555"; + sha256 = "50b8b11afbb2c4095a3ba675b4f055c416d0f3d7de6633a595fc131a828a67eb"; }; beamDeps = [ db_connection decimal jason ]; @@ -1336,15 +1440,15 @@ let prom_ex = buildMix rec { name = "prom_ex"; - version = "1.7.1"; + version = "1.9.0"; src = fetchHex { pkg = "prom_ex"; version = "${version}"; - sha256 = "4c978872b88a929833925a0f4d0561824804c671fdd04581e765509ed0a6ed08"; + sha256 = "01f3d4f69ec93068219e686cc65e58a29c42bea5429a8ff4e2121f19db178ee6"; }; - beamDeps = [ ecto finch jason oban phoenix phoenix_live_view plug plug_cowboy telemetry telemetry_metrics telemetry_metrics_prometheus_core telemetry_poller ]; + beamDeps = [ ecto finch jason oban octo_fetch phoenix phoenix_live_view plug plug_cowboy telemetry telemetry_metrics telemetry_metrics_prometheus_core telemetry_poller ]; }; prometheus = buildMix rec { @@ -1373,19 +1477,6 @@ let beamDeps = [ ecto prometheus_ex ]; }; - prometheus_phoenix = buildMix rec { - name = "prometheus_phoenix"; - version = "1.3.0"; - - src = fetchHex { - pkg = "prometheus_phoenix"; - version = "${version}"; - sha256 = "c4d1404ac4e9d3d963da601db2a7d8ea31194f0017057fabf0cfb9bf5a6c8c75"; - }; - - beamDeps = [ phoenix prometheus_ex ]; - }; - prometheus_plugs = buildMix rec { name = "prometheus_plugs"; version = "1.1.5"; @@ -1427,17 +1518,30 @@ let recon = buildMix rec { name = "recon"; - version = "2.5.3"; + version = "2.5.4"; src = fetchHex { pkg = "recon"; version = "${version}"; - sha256 = "6c6683f46fd4a1dfd98404b9f78dcabc7fcd8826613a89dcb984727a8c3099d7"; + sha256 = "e9ab01ac7fc8572e41eb59385efeb3fb0ff5bf02103816535bacaedf327d0263"; }; beamDeps = []; }; + rustler = buildMix rec { + name = "rustler"; + version = "0.30.0"; + + src = fetchHex { + pkg = "rustler"; + version = "${version}"; + sha256 = "9ef1abb6a7dda35c47cfc649e6a5a61663af6cf842a55814a554a84607dee389"; + }; + + beamDeps = [ jason toml ]; + }; + sleeplocks = buildRebar3 rec { name = "sleeplocks"; version = "1.1.2"; @@ -1479,12 +1583,12 @@ let sweet_xml = buildMix rec { name = "sweet_xml"; - version = "0.7.3"; + version = "0.7.4"; src = fetchHex { pkg = "sweet_xml"; version = "${version}"; - sha256 = "e110c867a1b3fe74bfc7dd9893aa851f0eed5518d0d7cad76d7baafd30e4f5ba"; + sha256 = "e7c4b0bdbf460c928234951def54fe87edf1a170f6896675443279e2dbeba167"; }; beamDeps = []; @@ -1492,15 +1596,15 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.10.3"; + version = "1.16.9"; src = fetchHex { pkg = "swoosh"; version = "${version}"; - sha256 = "8b7167d93047bac6e1a1c367bf7d899cf2e4fea0592ee04a70673548ef6091b9"; + sha256 = "878b1a7a6c10ebbf725a3349363f48f79c5e3d792eb621643b0d276a38acc0a6"; }; - beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mime plug_cowboy telemetry ]; + beamDeps = [ bandit cowboy ex_aws finch gen_smtp hackney jason mime plug plug_cowboy telemetry ]; }; syslog = buildRebar3 rec { @@ -1518,12 +1622,12 @@ let table_rex = buildMix rec { name = "table_rex"; - version = "3.1.1"; + version = "4.0.0"; src = fetchHex { pkg = "table_rex"; version = "${version}"; - sha256 = "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"; + sha256 = "c35c4d5612ca49ebb0344ea10387da4d2afe278387d4019e4d8111e815df8f55"; }; beamDeps = []; @@ -1544,12 +1648,12 @@ let telemetry_metrics = buildMix rec { name = "telemetry_metrics"; - version = "0.6.1"; + version = "0.6.2"; src = fetchHex { pkg = "telemetry_metrics"; version = "${version}"; - sha256 = "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"; + sha256 = "9b43db0dc33863930b9ef9d27137e78974756f5f198cae18409970ed6fa5b561"; }; beamDeps = [ telemetry ]; @@ -1557,12 +1661,12 @@ let telemetry_metrics_prometheus_core = buildMix rec { name = "telemetry_metrics_prometheus_core"; - version = "1.0.2"; + version = "1.2.0"; src = fetchHex { pkg = "telemetry_metrics_prometheus_core"; version = "${version}"; - sha256 = "48351a0d56f80e38c997b44232b1043e0a081670d16766eee920e6254175b730"; + sha256 = "9cba950e1c4733468efbe3f821841f34ac05d28e7af7798622f88ecdbbe63ea3"; }; beamDeps = [ telemetry telemetry_metrics ]; @@ -1583,17 +1687,30 @@ let tesla = buildMix rec { name = "tesla"; - version = "1.4.4"; + version = "1.11.0"; src = fetchHex { pkg = "tesla"; version = "${version}"; - sha256 = "d5503a49f9dec1b287567ea8712d085947e247cb11b06bc54adb05bfde466457"; + sha256 = "b83ab5d4c2d202e1ea2b7e17a49f788d49a699513d7c4f08f2aef2c281be69db"; }; beamDeps = [ castore finch gun hackney jason mime mint poison telemetry ]; }; + thousand_island = buildMix rec { + name = "thousand_island"; + version = "1.3.5"; + + src = fetchHex { + pkg = "thousand_island"; + version = "${version}"; + sha256 = "2be6954916fdfe4756af3239fb6b6d75d0b8063b5df03ba76fd8a4c87849e180"; + }; + + beamDeps = [ telemetry ]; + }; + timex = buildMix rec { name = "timex"; version = "3.7.7"; @@ -1607,6 +1724,19 @@ let beamDeps = [ combine gettext tzdata ]; }; + toml = buildMix rec { + name = "toml"; + version = "0.7.0"; + + src = fetchHex { + pkg = "toml"; + version = "${version}"; + sha256 = "0690246a2478c1defd100b0c9b89b4ea280a22be9a7b313a8a058a2408a2fa70"; + }; + + beamDeps = []; + }; + trailing_format_plug = buildMix rec { name = "trailing_format_plug"; version = "0.0.7"; @@ -1635,12 +1765,12 @@ let ueberauth = buildMix rec { name = "ueberauth"; - version = "0.10.5"; + version = "0.10.7"; src = fetchHex { pkg = "ueberauth"; version = "${version}"; - sha256 = "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"; + sha256 = "0bccf73e2ffd6337971340832947ba232877aa8122dba4c95be9f729c8987377"; }; beamDeps = [ plug ]; @@ -1661,17 +1791,30 @@ let unsafe = buildMix rec { name = "unsafe"; - version = "1.0.1"; + version = "1.0.2"; src = fetchHex { pkg = "unsafe"; version = "${version}"; - sha256 = "6c7729a2d214806450d29766abc2afaa7a2cbecf415be64f36a6691afebb50e5"; + sha256 = "b485231683c3ab01a9cd44cb4a79f152c6f3bb87358439c6f68791b85c2df675"; }; beamDeps = []; }; + vix = buildMix rec { + name = "vix"; + version = "0.26.0"; + + src = fetchHex { + pkg = "vix"; + version = "${version}"; + sha256 = "71b0a79ae7f199cacfc8e679b0e4ba25ee47dc02e182c5b9097efb29fbe14efd"; + }; + + beamDeps = [ castore cc_precompiler elixir_make ]; + }; + web_push_encryption = buildMix rec { name = "web_push_encryption"; version = "0.3.1"; @@ -1685,6 +1828,32 @@ let beamDeps = [ httpoison jose ]; }; + websock = buildMix rec { + name = "websock"; + version = "0.5.3"; + + src = fetchHex { + pkg = "websock"; + version = "${version}"; + sha256 = "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"; + }; + + beamDeps = []; + }; + + websock_adapter = buildMix rec { + name = "websock_adapter"; + version = "0.5.6"; + + src = fetchHex { + pkg = "websock_adapter"; + version = "${version}"; + sha256 = "e04378d26b0af627817ae84c92083b7e97aca3121196679b73c73b99d0d133ea"; + }; + + beamDeps = [ bandit plug plug_cowboy websock ]; + }; + websockex = buildMix rec { name = "websockex"; version = "0.4.3"; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 20de8eb6af496..bd2ee5b23da76 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.40.4.8679-424562606"; + version = "1.41.0.8992-8463ad060"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "sha256-EZAMZ8GLOLCWhgi2Xxtn+EIHavSwLrw32aCwzAQfu8s="; + sha256 = "1hv8bg2cy1s6cn1yp5s75kma5v2fr3dncbslglvpn3srba1xafgz"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-wVyA70xqZ9T8brPlzjov2j4C9W+RJYo99hO3VtNBVqw="; + sha256 = "0gwwlh47rfnayra3k8lwi794wiayl30crjjvzhqkg5zad77lkl4m"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 07e1dedce259b..37b72c4538da9 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.22.20"; + version = "0.22.21"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-ZkajcBwoXyH6+ARI/pl1HmvN99ibgqwqF/VfmptJgrc="; + hash = "sha256-KpW2ThWbAD/c1Z7xSCEbguMTPfBkgngxjXWOPvf5658="; }; vendorHash = "sha256-5lfjwCh930B5k8KbUDW81HkmiO7io4RqEr4VP8MikeA="; diff --git a/pkgs/servers/polaris/default.nix b/pkgs/servers/polaris/default.nix index b19eb1c47e7da..ee8ea856c9395 100644 --- a/pkgs/servers/polaris/default.nix +++ b/pkgs/servers/polaris/default.nix @@ -4,20 +4,19 @@ , rustPlatform , nix-update-script , polaris-web -, fetchpatch , darwin , nixosTests }: rustPlatform.buildRustPackage rec { pname = "polaris"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "agersant"; repo = "polaris"; rev = version; - hash = "sha256-UC66xRL9GyTPHJ3z0DD/yyI9GlyqelCaHHDyl79ptJg="; + hash = "sha256-2GHYIlEzRS7KXahdrxMjyIcPCNw8gXJw5/4ZpB/zT3Y="; # The polaris version upstream in Cargo.lock is "0.0.0". # We're unable to simply patch it in the patch phase due to @@ -31,17 +30,11 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoPatches = [ - (fetchpatch { # https://github.com/agersant/polaris/pull/213 - name = "bump-time-crate.patch"; - url = "https://github.com/agersant/polaris/commit/f625c57d203bdd3f2d7fcd99ccce1032f04d9b91.patch"; - hash = "sha256-ICScYbSv4sCMbfZN2thhZMXGPcDX89xIhZqBJpGOzrY="; - }) - ]; - - cargoHash = "sha256-PnNLSL6YIpM6b3+oCh2eNRNPpCKyvnWEW7uNaYTKzAU="; + cargoHash = if stdenv.buildPlatform.isDarwin + then "sha256-HTqsghjfSjwOaN/ApPFvWVEoquZzE3MYzULkhUOXIWI" + else "sha256-Z3AbYtdNAyKT5EuGtCktEg0fxs/gpKdsrttRkxZhLAU"; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; diff --git a/pkgs/servers/pr-tracker/default.nix b/pkgs/servers/pr-tracker/default.nix index 6c9e31729855f..14c87204013d1 100644 --- a/pkgs/servers/pr-tracker/default.nix +++ b/pkgs/servers/pr-tracker/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "pr-tracker"; - version = "1.5.0"; + version = "1.6.0"; src = fetchzip { url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz"; - hash = "sha256-ENgly8qmE3Xb6XhfjCdxcR0kQF5OTF9ACuCTnWvb+TQ="; + hash = "sha256-O+dtGxVhn3hW+vFQzEt7kQRTnZgc1R938BJ6pAkIW4E="; }; - cargoHash = "sha256-F1OwPk8XL0Hyqe9latYrmJhXUIwK9xg/6pi4s1X/vXk="; + cargoHash = "sha256-t+jiOr5pjJNMpaOLYKlk194b2njT1XWKKlPQtKsUu3E="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl systemd ]; diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index a92bb3f66ecc4..4d50e2f7e382f 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -6,9 +6,9 @@ let unsupported = throw "Unsupported system ${stdenv.hostPlatform.system} for ${pname}"; os = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "osx" - else if stdenv.isLinux then + else if stdenv.hostPlatform.isLinux then "linux" else unsupported; @@ -21,15 +21,15 @@ let }.${stdenv.hostPlatform.system} or unsupported; hash = { - aarch64-darwin = "sha256-AIec1ac3BKDI3Qw6v93yCrIfgF9vU4p5EhOABdCjWyE="; - aarch64-linux = "sha256-1Ew2XHkjllK3gl0JjsnxdpecpX8ehxrHE8txAvQBVx4="; - x86_64-darwin = "sha256-5qk/dioGpgUi9Ck+/X++s/dxxBoezEGwu6iD8e+cXYk="; - x86_64-linux = "sha256-KjulbI36KQr5qpHrwPevG+DI16/sTsbU1/Wprfp05J4="; + aarch64-darwin = "sha256-n9WGbxxackZ2FRexvy7lFVUTjcydhSzSkXO78wsywi8="; + aarch64-linux = "sha256-CS3T9beQZo/WllZo2mRMUMYvgM0x6H//tTqByx3ikQw="; + x86_64-darwin = "sha256-p3sPwSKE0761R7DlmO55FhmjGDWbGl8X9UcQBjaUXQs="; + x86_64-linux = "sha256-wfucjWxTpYsrRRLoQDgy66HZHdRILCKrFEnZyaoQ560="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.22.0.4670"; + version = "1.24.3.4754"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix index 30ca1318b9cf7..4d9e221a30b9d 100644 --- a/pkgs/servers/ps3netsrv/default.nix +++ b/pkgs/servers/ps3netsrv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mbedtls ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Doff64_t=off_t"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Doff64_t=off_t"; postInstall = '' install -Dm644 ../LICENSE.TXT $out/usr/share/licenses/${pname}/LICENSE.TXT diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 0186de73fddf8..44f89234ec6d9 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -21,15 +21,15 @@ , airtunesSupport ? false -, bluetoothSupport ? stdenv.isLinux +, bluetoothSupport ? stdenv.hostPlatform.isLinux , advancedBluetoothCodecs ? false , remoteControlSupport ? false , zeroconfSupport ? false -, alsaSupport ? stdenv.isLinux -, udevSupport ? stdenv.isLinux +, alsaSupport ? stdenv.hostPlatform.isLinux +, udevSupport ? stdenv.hostPlatform.isLinux , # Whether to build only the library. libOnly ? false @@ -68,23 +68,23 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config meson ninja makeWrapper perlPackages.perl perlPackages.XMLParser m4 ] - ++ lib.optionals stdenv.isLinux [ glib ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ glib ] # gstreamer plugin discovery requires wrapping ++ lib.optional (bluetoothSupport && advancedBluetoothCodecs) wrapGAppsHook3; propagatedBuildInputs = - lib.optionals stdenv.isLinux [ libcap ]; + lib.optionals stdenv.hostPlatform.isLinux [ libcap ]; buildInputs = [ libtool libsndfile soxr speexdsp fftwFloat check ] - ++ lib.optionals stdenv.isLinux [ glib dbus ] - ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreServices CoreAudio libintl ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ glib dbus ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit Cocoa CoreServices CoreAudio libintl ] ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing_1 ] ++ lib.optional jackaudioSupport libjack2 ++ lib.optionals x11Support [ xorg.libICE xorg.libSM xorg.libX11 xorg.libXi xorg.libXtst ] ++ lib.optional useSystemd systemd - ++ lib.optionals stdenv.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib udev ] ++ lib.optional airtunesSupport openssl ++ lib.optionals bluetoothSupport [ bluez5 sbc ] # aptX and LDAC codecs are in gst-plugins-bad so far, rtpldacpay is in -good @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { (lib.mesonBool "doxygen" false) (lib.mesonEnable "elogind" false) # gsettings does not support cross-compilation - (lib.mesonEnable "gsettings" (stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform))) + (lib.mesonEnable "gsettings" (stdenv.hostPlatform.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform))) (lib.mesonEnable "gstreamer" false) (lib.mesonEnable "gtk" false) (lib.mesonEnable "jack" (jackaudioSupport && !libOnly)) @@ -128,10 +128,10 @@ stdenv.mkDerivation rec { # renaming the unwrapped binaries (see below) "--bindir=${placeholder "out"}/.bin-unwrapped" ] - ++ lib.optionals (stdenv.isLinux && useSystemd) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && useSystemd) [ (lib.mesonOption "systemduserunitdir" "${placeholder "out"}/lib/systemd/user") ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.mesonEnable "consolekit" false) (lib.mesonEnable "dbus" false) (lib.mesonEnable "glib" false) @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { ]; # tests fail on Darwin because of timeouts - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME=$(mktemp -d) ''; @@ -156,13 +156,13 @@ stdenv.mkDerivation rec { cp config.h $dev/include/pulse ''; - preFixup = lib.optionalString (stdenv.isLinux && (stdenv.hostPlatform == stdenv.buildPlatform)) '' + preFixup = lib.optionalString (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform == stdenv.buildPlatform)) '' wrapProgram $out/libexec/pulse/gsettings-helper \ --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${pname}-${version}" \ --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" '' # add .so symlinks for modules to be found under macOS - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/pulseaudio/modules/*.dylib; do ln -s "''$file" "''${file%.dylib}.so" ln -s "''$file" "$out/lib/pulseaudio/''$(basename ''$file .dylib).so" diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 43ed4e175ede8..f85fd11172793 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let - os = if stdenv.isDarwin then "osx" else "linux"; + os = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; arch = { x86_64-linux = "x64"; aarch64-linux = "arm64"; @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-2UkdzOvJZ7fWag/kyfFffPtCVEXil0TTcTReykPKWuU="; - arm64-linux_hash = "sha256-IuLtPWsUukiIk9H/0yf74SipYcbvn1p5MZUbptypCJs="; - x64-osx_hash = "sha256-vLkY9rqdQwr/ntpmUMK5bCIjLWGCt1xEhH/QQzgkZV8="; - arm64-osx_hash = "sha256-Y0aXaMnOCdzrIiM7BqGdHAIO60VFNWUb5ISGaVDX/9s="; + x64-linux_hash = "sha256-ZI4ALGEdc9ZBUp8TnvzzbejxVBy61WAIxlbp0VYyc7M="; + arm64-linux_hash = "sha256-qN8CNV10q5JP+f1XdfsgCqnpbhzFlCPbM3TIAnGh9U8="; + x64-osx_hash = "sha256-u7Ny3ppD/mdIKk+I/ywsk1bS7EjEt63mbvzaM8MpoCE="; + arm64-osx_hash = "sha256-k5iOzyicXpoCWotGvC/J8euh0OQOuKLxU6OTWiWmWc8="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "5.8.3.8933"; + version = "5.11.0.9244"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index a0c1cea2c5866..3a67b592fcc3f 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let - os = if stdenv.isDarwin then "osx" else "linux"; + os = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; arch = { x86_64-linux = "x64"; aarch64-linux = "arm64"; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index f232e4804c6ca..231f6ee216a53 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -1,17 +1,17 @@ { buildGoModule -, doCheck ? !stdenv.isDarwin # Can't start localhost test server in MacOS sandbox. +, doCheck ? !stdenv.hostPlatform.isDarwin # Can't start localhost test server in MacOS sandbox. , fetchFromGitHub , installShellFiles , lib , stdenv }: let - version = "24.2.3"; + version = "24.2.5"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-X9RvMjmI6IMFsBvutXH8Bb8TTLRgaFGGXLxrIlmMEaU="; + sha256 = "sha256-25ijVHEcj0AXLxC1rSbp3Xyv+SMQRRkRq+qgRJgSnAI="; }; in buildGoModule rec { @@ -19,7 +19,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-8vwmxUi4oWmHzb2QkIS5sU1NgJmJSV1+2I48TDAo2a0="; + vendorHash = "sha256-JEbIC33J+uUzPN04EtO5XoC0MIkYRXKYNCsFsirJfhY="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/servers/rippled/package.nix b/pkgs/servers/rippled/package.nix deleted file mode 100644 index 87f4326c48c34..0000000000000 --- a/pkgs/servers/rippled/package.nix +++ /dev/null @@ -1,6029 +0,0 @@ -{ self, fetchurl ? null }: - -{ - by-spec."abbrev"."1" = - self.by-version."abbrev"."1.0.5"; - by-version."abbrev"."1.0.5" = self.buildNodePackage { - name = "abbrev-1.0.5"; - version = "1.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"; - name = "abbrev-1.0.5.tgz"; - sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."abbrev"."1.0.x" = - self.by-version."abbrev"."1.0.5"; - by-spec."accepts"."~1.2.5" = - self.by-version."accepts"."1.2.7"; - by-version."accepts"."1.2.7" = self.buildNodePackage { - name = "accepts-1.2.7"; - version = "1.2.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.2.7.tgz"; - name = "accepts-1.2.7.tgz"; - sha1 = "efea24e36e0b5b93d001a7598ac441c32ef56003"; - }; - deps = { - "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11"; - "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."accepts"."~1.2.7" = - self.by-version."accepts"."1.2.7"; - by-spec."amdefine".">=0.0.4" = - self.by-version."amdefine"."0.1.0"; - by-version."amdefine"."0.1.0" = self.buildNodePackage { - name = "amdefine-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"; - name = "amdefine-0.1.0.tgz"; - sha1 = "3ca9735cf1dde0edf7a4bf6641709c8024f9b227"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ansi"."^0.3.0" = - self.by-version."ansi"."0.3.0"; - by-version."ansi"."0.3.0" = self.buildNodePackage { - name = "ansi-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"; - name = "ansi-0.3.0.tgz"; - sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ansi"."~0.3.0" = - self.by-version."ansi"."0.3.0"; - by-spec."ansi-regex"."^0.2.0" = - self.by-version."ansi-regex"."0.2.1"; - by-version."ansi-regex"."0.2.1" = self.buildNodePackage { - name = "ansi-regex-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"; - name = "ansi-regex-0.2.1.tgz"; - sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ansi-regex"."^0.2.1" = - self.by-version."ansi-regex"."0.2.1"; - by-spec."ansi-regex"."^1.0.0" = - self.by-version."ansi-regex"."1.1.1"; - by-version."ansi-regex"."1.1.1" = self.buildNodePackage { - name = "ansi-regex-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; - name = "ansi-regex-1.1.1.tgz"; - sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ansi-regex"."^1.1.0" = - self.by-version."ansi-regex"."1.1.1"; - by-spec."ansi-styles"."^1.1.0" = - self.by-version."ansi-styles"."1.1.0"; - by-version."ansi-styles"."1.1.0" = self.buildNodePackage { - name = "ansi-styles-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"; - name = "ansi-styles-1.1.0.tgz"; - sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ansi-styles"."^2.0.1" = - self.by-version."ansi-styles"."2.0.1"; - by-version."ansi-styles"."2.0.1" = self.buildNodePackage { - name = "ansi-styles-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"; - name = "ansi-styles-2.0.1.tgz"; - sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."are-we-there-yet"."~1.0.0" = - self.by-version."are-we-there-yet"."1.0.4"; - by-version."are-we-there-yet"."1.0.4" = self.buildNodePackage { - name = "are-we-there-yet-1.0.4"; - version = "1.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz"; - name = "are-we-there-yet-1.0.4.tgz"; - sha1 = "527fe389f7bcba90806106b99244eaa07e886f85"; - }; - deps = { - "delegates-0.1.0" = self.by-version."delegates"."0.1.0"; - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."argparse"."~ 0.1.11" = - self.by-version."argparse"."0.1.16"; - by-version."argparse"."0.1.16" = self.buildNodePackage { - name = "argparse-0.1.16"; - version = "0.1.16"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; - name = "argparse-0.1.16.tgz"; - sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; - }; - deps = { - "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; - "underscore.string-2.4.0" = self.by-version."underscore.string"."2.4.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."argparse"."~1.0.2" = - self.by-version."argparse"."1.0.2"; - by-version."argparse"."1.0.2" = self.buildNodePackage { - name = "argparse-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz"; - name = "argparse-1.0.2.tgz"; - sha1 = "bcfae39059656d1973d0b9e6a1a74154b5a9a136"; - }; - deps = { - "lodash-3.8.0" = self.by-version."lodash"."3.8.0"; - "sprintf-js-1.0.2" = self.by-version."sprintf-js"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."asn1"."0.1.11" = - self.by-version."asn1"."0.1.11"; - by-version."asn1"."0.1.11" = self.buildNodePackage { - name = "asn1-0.1.11"; - version = "0.1.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - name = "asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."assert-diff"."^0.0.4" = - self.by-version."assert-diff"."0.0.4"; - by-version."assert-diff"."0.0.4" = self.buildNodePackage { - name = "assert-diff-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/assert-diff/-/assert-diff-0.0.4.tgz"; - name = "assert-diff-0.0.4.tgz"; - sha1 = "bf181c1575d5ad7c73df8076a689f4ae19951608"; - }; - deps = { - "assert-plus-0.1.4" = self.by-version."assert-plus"."0.1.4"; - "json-diff-0.3.1" = self.by-version."json-diff"."0.3.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "assert-diff" = self.by-version."assert-diff"."0.0.4"; - by-spec."assert-plus"."0.1.4" = - self.by-version."assert-plus"."0.1.4"; - by-version."assert-plus"."0.1.4" = self.buildNodePackage { - name = "assert-plus-0.1.4"; - version = "0.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.4.tgz"; - name = "assert-plus-0.1.4.tgz"; - sha1 = "283eff8b140ecd768529fbf3730a4c09ebec61f7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."assert-plus"."^0.1.5" = - self.by-version."assert-plus"."0.1.5"; - by-version."assert-plus"."0.1.5" = self.buildNodePackage { - name = "assert-plus-0.1.5"; - version = "0.1.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - name = "assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."assertion-error"."1.0.0" = - self.by-version."assertion-error"."1.0.0"; - by-version."assertion-error"."1.0.0" = self.buildNodePackage { - name = "assertion-error-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz"; - name = "assertion-error-1.0.0.tgz"; - sha1 = "c7f85438fdd466bc7ca16ab90c81513797a5d23b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."0.2.9" = - self.by-version."async"."0.2.9"; - by-version."async"."0.2.9" = self.buildNodePackage { - name = "async-0.2.9"; - version = "0.2.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; - name = "async-0.2.9.tgz"; - sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."0.9.x" = - self.by-version."async"."0.9.0"; - by-version."async"."0.9.0" = self.buildNodePackage { - name = "async-0.9.0"; - version = "0.9.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; - name = "async-0.9.0.tgz"; - sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."^0.2.9" = - self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = self.buildNodePackage { - name = "async-0.2.10"; - version = "0.2.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "async" = self.by-version."async"."0.2.10"; - by-spec."async"."~0.2.6" = - self.by-version."async"."0.2.10"; - by-spec."async"."~0.2.9" = - self.by-version."async"."0.2.10"; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.0"; - by-spec."aws-sign2"."~0.5.0" = - self.by-version."aws-sign2"."0.5.0"; - by-version."aws-sign2"."0.5.0" = self.buildNodePackage { - name = "aws-sign2-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - name = "aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."balanced-match"."^0.2.0" = - self.by-version."balanced-match"."0.2.0"; - by-version."balanced-match"."0.2.0" = self.buildNodePackage { - name = "balanced-match-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"; - name = "balanced-match-0.2.0.tgz"; - sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."basic-auth"."~1.0.1" = - self.by-version."basic-auth"."1.0.1"; - by-version."basic-auth"."1.0.1" = self.buildNodePackage { - name = "basic-auth-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.1.tgz"; - name = "basic-auth-1.0.1.tgz"; - sha1 = "4bae1dbfbf0aec4dc5dc47a8d3675b50140f3bf8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bignumber.js"."^1.4.0" = - self.by-version."bignumber.js"."1.5.0"; - by-version."bignumber.js"."1.5.0" = self.buildNodePackage { - name = "bignumber.js-1.5.0"; - version = "1.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-1.5.0.tgz"; - name = "bignumber.js-1.5.0.tgz"; - sha1 = "ff41453ac7b19ee15cda7977e179ff1b0d11956d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "bignumber.js" = self.by-version."bignumber.js"."1.5.0"; - by-spec."bignumber.js"."^2.0.3" = - self.by-version."bignumber.js"."2.0.7"; - by-version."bignumber.js"."2.0.7" = self.buildNodePackage { - name = "bignumber.js-2.0.7"; - version = "2.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-2.0.7.tgz"; - name = "bignumber.js-2.0.7.tgz"; - sha1 = "86eb0707cf6a5110909d23e6ea7434c14f500f1c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bignumber.js"."~1.4.0" = - self.by-version."bignumber.js"."1.4.1"; - by-version."bignumber.js"."1.4.1" = self.buildNodePackage { - name = "bignumber.js-1.4.1"; - version = "1.4.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-1.4.1.tgz"; - name = "bignumber.js-1.4.1.tgz"; - sha1 = "3d19ac321f8db4ba07aace23ebd4ac976fae6bfa"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bindings"."1.2.x" = - self.by-version."bindings"."1.2.1"; - by-version."bindings"."1.2.1" = self.buildNodePackage { - name = "bindings-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - name = "bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bl"."~0.9.0" = - self.by-version."bl"."0.9.4"; - by-version."bl"."0.9.4" = self.buildNodePackage { - name = "bl-0.9.4"; - version = "0.9.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz"; - name = "bl-0.9.4.tgz"; - sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7"; - }; - deps = { - "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."block-stream"."*" = - self.by-version."block-stream"."0.0.7"; - by-version."block-stream"."0.0.7" = self.buildNodePackage { - name = "block-stream-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; - name = "block-stream-0.0.7.tgz"; - sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bluebird"."^2.0.0" = - self.by-version."bluebird"."2.9.25"; - by-version."bluebird"."2.9.25" = self.buildNodePackage { - name = "bluebird-2.9.25"; - version = "2.9.25"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.25.tgz"; - name = "bluebird-2.9.25.tgz"; - sha1 = "6e36bd04064d9534c07160b9f7f26c5a738fe16a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bluebird"."^2.3.4" = - self.by-version."bluebird"."2.9.25"; - "bluebird" = self.by-version."bluebird"."2.9.25"; - by-spec."bluebird"."^2.9.25" = - self.by-version."bluebird"."2.9.25"; - by-spec."body-parser"."^1.7.0" = - self.by-version."body-parser"."1.12.4"; - by-version."body-parser"."1.12.4" = self.buildNodePackage { - name = "body-parser-1.12.4"; - version = "1.12.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz"; - name = "body-parser-1.12.4.tgz"; - sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; - }; - deps = { - "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "qs-2.4.2" = self.by-version."qs"."2.4.2"; - "raw-body-2.0.1" = self.by-version."raw-body"."2.0.1"; - "type-is-1.6.2" = self.by-version."type-is"."1.6.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "body-parser" = self.by-version."body-parser"."1.12.4"; - by-spec."boom"."0.4.x" = - self.by-version."boom"."0.4.2"; - by-version."boom"."0.4.2" = self.buildNodePackage { - name = "boom-0.4.2"; - version = "0.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - name = "boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."boom"."2.x.x" = - self.by-version."boom"."2.7.1"; - by-version."boom"."2.7.1" = self.buildNodePackage { - name = "boom-2.7.1"; - version = "2.7.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-2.7.1.tgz"; - name = "boom-2.7.1.tgz"; - sha1 = "fb165c348d337977c61d4363c21e9e1abf526705"; - }; - deps = { - "hoek-2.13.0" = self.by-version."hoek"."2.13.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."brace-expansion"."^1.0.0" = - self.by-version."brace-expansion"."1.1.0"; - by-version."brace-expansion"."1.1.0" = self.buildNodePackage { - name = "brace-expansion-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"; - name = "brace-expansion-1.1.0.tgz"; - sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9"; - }; - deps = { - "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0"; - "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bufferutil"."1.0.x" = - self.by-version."bufferutil"."1.0.1"; - by-version."bufferutil"."1.0.1" = self.buildNodePackage { - name = "bufferutil-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bufferutil/-/bufferutil-1.0.1.tgz"; - name = "bufferutil-1.0.1.tgz"; - sha1 = "0c53a9ffe8d616c4e2df27d00b808f7a25501e3b"; - }; - deps = { - "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-1.6.2" = self.by-version."nan"."1.6.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bytes"."1.0.0" = - self.by-version."bytes"."1.0.0"; - by-version."bytes"."1.0.0" = self.buildNodePackage { - name = "bytes-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; - name = "bytes-1.0.0.tgz"; - sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bytes"."2.0.1" = - self.by-version."bytes"."2.0.1"; - by-version."bytes"."2.0.1" = self.buildNodePackage { - name = "bytes-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bytes/-/bytes-2.0.1.tgz"; - name = "bytes-2.0.1.tgz"; - sha1 = "673743059be43d929f9c225dd7363ee0f8b15d97"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."caseless"."~0.9.0" = - self.by-version."caseless"."0.9.0"; - by-version."caseless"."0.9.0" = self.buildNodePackage { - name = "caseless-0.9.0"; - version = "0.9.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"; - name = "caseless-0.9.0.tgz"; - sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."chai".">=1.9.2 <3" = - self.by-version."chai"."2.3.0"; - by-version."chai"."2.3.0" = self.buildNodePackage { - name = "chai-2.3.0"; - version = "2.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/chai/-/chai-2.3.0.tgz"; - name = "chai-2.3.0.tgz"; - sha1 = "8a2f6a34748da801090fd73287b2aa739a4e909a"; - }; - deps = { - "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0"; - "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."chai"."^1.10.0" = - self.by-version."chai"."1.10.0"; - by-version."chai"."1.10.0" = self.buildNodePackage { - name = "chai-1.10.0"; - version = "1.10.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/chai/-/chai-1.10.0.tgz"; - name = "chai-1.10.0.tgz"; - sha1 = "e4031cc87654461a75943e5a35ab46eaf39c1eb9"; - }; - deps = { - "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0"; - "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "chai" = self.by-version."chai"."1.10.0"; - by-spec."chalk"."^1.0.0" = - self.by-version."chalk"."1.0.0"; - by-version."chalk"."1.0.0" = self.buildNodePackage { - name = "chalk-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; - name = "chalk-1.0.0.tgz"; - sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"; - }; - deps = { - "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1"; - "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3"; - "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3"; - "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1"; - "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."chalk"."~0.5.1" = - self.by-version."chalk"."0.5.1"; - by-version."chalk"."0.5.1" = self.buildNodePackage { - name = "chalk-0.5.1"; - version = "0.5.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; - name = "chalk-0.5.1.tgz"; - sha1 = "663b3a648b68b55d04690d49167aa837858f2174"; - }; - deps = { - "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0"; - "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3"; - "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0"; - "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0"; - "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cli-color"."~0.1.6" = - self.by-version."cli-color"."0.1.7"; - by-version."cli-color"."0.1.7" = self.buildNodePackage { - name = "cli-color-0.1.7"; - version = "0.1.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cli-color/-/cli-color-0.1.7.tgz"; - name = "cli-color-0.1.7.tgz"; - sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347"; - }; - deps = { - "es5-ext-0.8.2" = self.by-version."es5-ext"."0.8.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."colors"."1.0.x" = - self.by-version."colors"."1.0.3"; - by-version."colors"."1.0.3" = self.buildNodePackage { - name = "colors-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; - name = "colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.7"; - by-version."combined-stream"."0.0.7" = self.buildNodePackage { - name = "combined-stream-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - name = "combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - deps = { - "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."combined-stream"."~0.0.5" = - self.by-version."combined-stream"."0.0.7"; - by-spec."commander"."0.6.1" = - self.by-version."commander"."0.6.1"; - by-version."commander"."0.6.1" = self.buildNodePackage { - name = "commander-0.6.1"; - version = "0.6.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; - name = "commander-0.6.1.tgz"; - sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."commander"."2.3.0" = - self.by-version."commander"."2.3.0"; - by-version."commander"."2.3.0" = self.buildNodePackage { - name = "commander-2.3.0"; - version = "2.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; - name = "commander-2.3.0.tgz"; - sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."commander"."^2.2.0" = - self.by-version."commander"."2.8.1"; - by-version."commander"."2.8.1" = self.buildNodePackage { - name = "commander-2.8.1"; - version = "2.8.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; - name = "commander-2.8.1.tgz"; - sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; - }; - deps = { - "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."commander"."^2.8.1" = - self.by-version."commander"."2.8.1"; - by-spec."commander"."~2.1.0" = - self.by-version."commander"."2.1.0"; - by-version."commander"."2.1.0" = self.buildNodePackage { - name = "commander-2.1.0"; - version = "2.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; - name = "commander-2.1.0.tgz"; - sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-emitter"."1.1.2" = - self.by-version."component-emitter"."1.1.2"; - by-version."component-emitter"."1.1.2" = self.buildNodePackage { - name = "component-emitter-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; - name = "component-emitter-1.1.2.tgz"; - sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."compressible"."~2.0.2" = - self.by-version."compressible"."2.0.2"; - by-version."compressible"."2.0.2" = self.buildNodePackage { - name = "compressible-2.0.2"; - version = "2.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/compressible/-/compressible-2.0.2.tgz"; - name = "compressible-2.0.2.tgz"; - sha1 = "d0474a6ba6590a43d39c2ce9a6cfbb6479be76a5"; - }; - deps = { - "mime-db-1.9.1" = self.by-version."mime-db"."1.9.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."compression"."^1.3.0" = - self.by-version."compression"."1.4.4"; - by-version."compression"."1.4.4" = self.buildNodePackage { - name = "compression-1.4.4"; - version = "1.4.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.4.4.tgz"; - name = "compression-1.4.4.tgz"; - sha1 = "2f9994ca476e4d9ba5fdc67ac929942837d0b6a4"; - }; - deps = { - "accepts-1.2.7" = self.by-version."accepts"."1.2.7"; - "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "compressible-2.0.2" = self.by-version."compressible"."2.0.2"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; - "vary-1.0.0" = self.by-version."vary"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "compression" = self.by-version."compression"."1.4.4"; - by-spec."concat-map"."0.0.1" = - self.by-version."concat-map"."0.0.1"; - by-version."concat-map"."0.0.1" = self.buildNodePackage { - name = "concat-map-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - name = "concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."content-disposition"."0.5.0" = - self.by-version."content-disposition"."0.5.0"; - by-version."content-disposition"."0.5.0" = self.buildNodePackage { - name = "content-disposition-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; - name = "content-disposition-0.5.0.tgz"; - sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."content-type"."~1.0.1" = - self.by-version."content-type"."1.0.1"; - by-version."content-type"."1.0.1" = self.buildNodePackage { - name = "content-type-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"; - name = "content-type-1.0.1.tgz"; - sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie"."0.1.2" = - self.by-version."cookie"."0.1.2"; - by-version."cookie"."0.1.2" = self.buildNodePackage { - name = "cookie-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; - name = "cookie-0.1.2.tgz"; - sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie-signature"."1.0.6" = - self.by-version."cookie-signature"."1.0.6"; - by-version."cookie-signature"."1.0.6" = self.buildNodePackage { - name = "cookie-signature-1.0.6"; - version = "1.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - name = "cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookiejar"."1.3.2" = - self.by-version."cookiejar"."1.3.2"; - by-version."cookiejar"."1.3.2" = self.buildNodePackage { - name = "cookiejar-1.3.2"; - version = "1.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.2.tgz"; - name = "cookiejar-1.3.2.tgz"; - sha1 = "61d3229e2da20c859032233502958a9b7df58249"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."core-util-is"."~1.0.0" = - self.by-version."core-util-is"."1.0.1"; - by-version."core-util-is"."1.0.1" = self.buildNodePackage { - name = "core-util-is-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; - name = "core-util-is-1.0.1.tgz"; - sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."coveralls"."^2.10.0" = - self.by-version."coveralls"."2.11.2"; - by-version."coveralls"."2.11.2" = self.buildNodePackage { - name = "coveralls-2.11.2"; - version = "2.11.2"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz"; - name = "coveralls-2.11.2.tgz"; - sha1 = "d4d982016cb2f9da89d77ab204d86a8537e6a12d"; - }; - deps = { - "js-yaml-3.0.1" = self.by-version."js-yaml"."3.0.1"; - "lcov-parse-0.0.6" = self.by-version."lcov-parse"."0.0.6"; - "log-driver-1.2.4" = self.by-version."log-driver"."1.2.4"; - "request-2.40.0" = self.by-version."request"."2.40.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "coveralls" = self.by-version."coveralls"."2.11.2"; - by-spec."crc"."3.2.1" = - self.by-version."crc"."3.2.1"; - by-version."crc"."3.2.1" = self.buildNodePackage { - name = "crc-3.2.1"; - version = "3.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; - name = "crc-3.2.1.tgz"; - sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cryptiles"."0.2.x" = - self.by-version."cryptiles"."0.2.2"; - by-version."cryptiles"."0.2.2" = self.buildNodePackage { - name = "cryptiles-0.2.2"; - version = "0.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - name = "cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - deps = { - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cryptiles"."2.x.x" = - self.by-version."cryptiles"."2.0.4"; - by-version."cryptiles"."2.0.4" = self.buildNodePackage { - name = "cryptiles-2.0.4"; - version = "2.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz"; - name = "cryptiles-2.0.4.tgz"; - sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285"; - }; - deps = { - "boom-2.7.1" = self.by-version."boom"."2.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ctype"."0.5.3" = - self.by-version."ctype"."0.5.3"; - by-version."ctype"."0.5.3" = self.buildNodePackage { - name = "ctype-0.5.3"; - version = "0.5.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - name = "ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cycle"."1.0.x" = - self.by-version."cycle"."1.0.3"; - by-version."cycle"."1.0.3" = self.buildNodePackage { - name = "cycle-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - name = "cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."2.0.0" = - self.by-version."debug"."2.0.0"; - by-version."debug"."2.0.0" = self.buildNodePackage { - name = "debug-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; - name = "debug-2.0.0.tgz"; - sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; - }; - deps = { - "ms-0.6.2" = self.by-version."ms"."0.6.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."~0.7.2" = - self.by-version."debug"."0.7.4"; - by-version."debug"."0.7.4" = self.buildNodePackage { - name = "debug-0.7.4"; - version = "0.7.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; - name = "debug-0.7.4.tgz"; - sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."~2.1.3" = - self.by-version."debug"."2.1.3"; - by-version."debug"."2.1.3" = self.buildNodePackage { - name = "debug-2.1.3"; - version = "2.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; - name = "debug-2.1.3.tgz"; - sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; - }; - deps = { - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."~2.2.0" = - self.by-version."debug"."2.2.0"; - by-version."debug"."2.2.0" = self.buildNodePackage { - name = "debug-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - name = "debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - deps = { - "ms-0.7.1" = self.by-version."ms"."0.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."deep-eql"."0.1.3" = - self.by-version."deep-eql"."0.1.3"; - by-version."deep-eql"."0.1.3" = self.buildNodePackage { - name = "deep-eql-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz"; - name = "deep-eql-0.1.3.tgz"; - sha1 = "ef558acab8de25206cd713906d74e56930eb69f2"; - }; - deps = { - "type-detect-0.1.1" = self.by-version."type-detect"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."deep-extend"."~0.2.5" = - self.by-version."deep-extend"."0.2.11"; - by-version."deep-extend"."0.2.11" = self.buildNodePackage { - name = "deep-extend-0.2.11"; - version = "0.2.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"; - name = "deep-extend-0.2.11.tgz"; - sha1 = "7a16ba69729132340506170494bc83f7076fe08f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."delayed-stream"."0.0.5" = - self.by-version."delayed-stream"."0.0.5"; - by-version."delayed-stream"."0.0.5" = self.buildNodePackage { - name = "delayed-stream-0.0.5"; - version = "0.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - name = "delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."delegates"."^0.1.0" = - self.by-version."delegates"."0.1.0"; - by-version."delegates"."0.1.0" = self.buildNodePackage { - name = "delegates-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"; - name = "delegates-0.1.0.tgz"; - sha1 = "b4b57be11a1653517a04b27f0949bdc327dfe390"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."depd"."~1.0.0" = - self.by-version."depd"."1.0.1"; - by-version."depd"."1.0.1" = self.buildNodePackage { - name = "depd-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; - name = "depd-1.0.1.tgz"; - sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."depd"."~1.0.1" = - self.by-version."depd"."1.0.1"; - by-spec."destroy"."1.0.3" = - self.by-version."destroy"."1.0.3"; - by-version."destroy"."1.0.3" = self.buildNodePackage { - name = "destroy-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; - name = "destroy-1.0.3.tgz"; - sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."diff"."1.0.8" = - self.by-version."diff"."1.0.8"; - by-version."diff"."1.0.8" = self.buildNodePackage { - name = "diff-1.0.8"; - version = "1.0.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; - name = "diff-1.0.8.tgz"; - sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."difflib"."~0.2.1" = - self.by-version."difflib"."0.2.4"; - by-version."difflib"."0.2.4" = self.buildNodePackage { - name = "difflib-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz"; - name = "difflib-0.2.4.tgz"; - sha1 = "b5e30361a6db023176d562892db85940a718f47e"; - }; - deps = { - "heap-0.2.6" = self.by-version."heap"."0.2.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."dreamopt"."~0.6.0" = - self.by-version."dreamopt"."0.6.0"; - by-version."dreamopt"."0.6.0" = self.buildNodePackage { - name = "dreamopt-0.6.0"; - version = "0.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/dreamopt/-/dreamopt-0.6.0.tgz"; - name = "dreamopt-0.6.0.tgz"; - sha1 = "d813ccdac8d39d8ad526775514a13dda664d6b4b"; - }; - deps = { - "wordwrap-1.0.0" = self.by-version."wordwrap"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ee-first"."1.1.0" = - self.by-version."ee-first"."1.1.0"; - by-version."ee-first"."1.1.0" = self.buildNodePackage { - name = "ee-first-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; - name = "ee-first-1.1.0.tgz"; - sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."es5-ext"."0.8.x" = - self.by-version."es5-ext"."0.8.2"; - by-version."es5-ext"."0.8.2" = self.buildNodePackage { - name = "es5-ext-0.8.2"; - version = "0.8.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.8.2.tgz"; - name = "es5-ext-0.8.2.tgz"; - sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escape-html"."1.0.1" = - self.by-version."escape-html"."1.0.1"; - by-version."escape-html"."1.0.1" = self.buildNodePackage { - name = "escape-html-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; - name = "escape-html-1.0.1.tgz"; - sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escape-string-regexp"."1.0.2" = - self.by-version."escape-string-regexp"."1.0.2"; - by-version."escape-string-regexp"."1.0.2" = self.buildNodePackage { - name = "escape-string-regexp-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"; - name = "escape-string-regexp-1.0.2.tgz"; - sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escape-string-regexp"."^1.0.0" = - self.by-version."escape-string-regexp"."1.0.3"; - by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage { - name = "escape-string-regexp-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"; - name = "escape-string-regexp-1.0.3.tgz"; - sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escape-string-regexp"."^1.0.2" = - self.by-version."escape-string-regexp"."1.0.3"; - by-spec."escodegen"."1.3.x" = - self.by-version."escodegen"."1.3.3"; - by-version."escodegen"."1.3.3" = self.buildNodePackage { - name = "escodegen-1.3.3"; - version = "1.3.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; - name = "escodegen-1.3.3.tgz"; - sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; - }; - deps = { - "esutils-1.0.0" = self.by-version."esutils"."1.0.0"; - "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; - "esprima-1.1.1" = self.by-version."esprima"."1.1.1"; - }; - optionalDependencies = { - "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."esprima"."1.2.x" = - self.by-version."esprima"."1.2.5"; - by-version."esprima"."1.2.5" = self.buildNodePackage { - name = "esprima-1.2.5"; - version = "1.2.5"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"; - name = "esprima-1.2.5.tgz"; - sha1 = "0993502feaf668138325756f30f9a51feeec11e9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."esprima"."~ 1.0.2" = - self.by-version."esprima"."1.0.4"; - by-version."esprima"."1.0.4" = self.buildNodePackage { - name = "esprima-1.0.4"; - version = "1.0.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; - name = "esprima-1.0.4.tgz"; - sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."esprima"."~1.1.1" = - self.by-version."esprima"."1.1.1"; - by-version."esprima"."1.1.1" = self.buildNodePackage { - name = "esprima-1.1.1"; - version = "1.1.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; - name = "esprima-1.1.1.tgz"; - sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."esprima"."~2.2.0" = - self.by-version."esprima"."2.2.0"; - by-version."esprima"."2.2.0" = self.buildNodePackage { - name = "esprima-2.2.0"; - version = "2.2.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/esprima/-/esprima-2.2.0.tgz"; - name = "esprima-2.2.0.tgz"; - sha1 = "4292c1d68e4173d815fa2290dc7afc96d81fcd83"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."estraverse"."~1.5.0" = - self.by-version."estraverse"."1.5.1"; - by-version."estraverse"."1.5.1" = self.buildNodePackage { - name = "estraverse-1.5.1"; - version = "1.5.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; - name = "estraverse-1.5.1.tgz"; - sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."esutils"."~1.0.0" = - self.by-version."esutils"."1.0.0"; - by-version."esutils"."1.0.0" = self.buildNodePackage { - name = "esutils-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; - name = "esutils-1.0.0.tgz"; - sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."etag"."~1.5.1" = - self.by-version."etag"."1.5.1"; - by-version."etag"."1.5.1" = self.buildNodePackage { - name = "etag-1.5.1"; - version = "1.5.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; - name = "etag-1.5.1.tgz"; - sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; - }; - deps = { - "crc-3.2.1" = self.by-version."crc"."3.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."express"."^4.8.7" = - self.by-version."express"."4.12.3"; - by-version."express"."4.12.3" = self.buildNodePackage { - name = "express-4.12.3"; - version = "4.12.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.12.3.tgz"; - name = "express-4.12.3.tgz"; - sha1 = "6b9d94aec5ae03270d86d390c277a8c5a5ad0ee2"; - }; - deps = { - "accepts-1.2.7" = self.by-version."accepts"."1.2.7"; - "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; - "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "finalhandler-0.3.4" = self.by-version."finalhandler"."0.3.4"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0"; - "methods-1.1.1" = self.by-version."methods"."1.1.1"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8"; - "qs-2.4.1" = self.by-version."qs"."2.4.1"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - "send-0.12.2" = self.by-version."send"."0.12.2"; - "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2"; - "type-is-1.6.2" = self.by-version."type-is"."1.6.2"; - "vary-1.0.0" = self.by-version."vary"."1.0.0"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "express" = self.by-version."express"."4.12.3"; - by-spec."extend"."~1.2.1" = - self.by-version."extend"."1.2.1"; - by-version."extend"."1.2.1" = self.buildNodePackage { - name = "extend-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - name = "extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."extend"."~1.3.0" = - self.by-version."extend"."1.3.0"; - by-version."extend"."1.3.0" = self.buildNodePackage { - name = "extend-1.3.0"; - version = "1.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz"; - name = "extend-1.3.0.tgz"; - sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."eyes"."0.1.x" = - self.by-version."eyes"."0.1.8"; - by-version."eyes"."0.1.8" = self.buildNodePackage { - name = "eyes-0.1.8"; - version = "0.1.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - name = "eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fileset"."0.1.x" = - self.by-version."fileset"."0.1.5"; - by-version."fileset"."0.1.5" = self.buildNodePackage { - name = "fileset-0.1.5"; - version = "0.1.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz"; - name = "fileset-0.1.5.tgz"; - sha1 = "acc423bfaf92843385c66bf75822264d11b7bd94"; - }; - deps = { - "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."finalhandler"."0.3.4" = - self.by-version."finalhandler"."0.3.4"; - by-version."finalhandler"."0.3.4" = self.buildNodePackage { - name = "finalhandler-0.3.4"; - version = "0.3.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.4.tgz"; - name = "finalhandler-0.3.4.tgz"; - sha1 = "4787d3573d079ae8b07536f26b0b911ebaf2a2ac"; - }; - deps = { - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."findup-sync"."~0.1.2" = - self.by-version."findup-sync"."0.1.3"; - by-version."findup-sync"."0.1.3" = self.buildNodePackage { - name = "findup-sync-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz"; - name = "findup-sync-0.1.3.tgz"; - sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683"; - }; - deps = { - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."flagged-respawn"."~0.3.0" = - self.by-version."flagged-respawn"."0.3.1"; - by-version."flagged-respawn"."0.3.1" = self.buildNodePackage { - name = "flagged-respawn-0.3.1"; - version = "0.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz"; - name = "flagged-respawn-0.3.1.tgz"; - sha1 = "397700925df6e12452202a71e89d89545fbbbe9d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forever-agent"."~0.5.0" = - self.by-version."forever-agent"."0.5.2"; - by-version."forever-agent"."0.5.2" = self.buildNodePackage { - name = "forever-agent-0.5.2"; - version = "0.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - name = "forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forever-agent"."~0.6.0" = - self.by-version."forever-agent"."0.6.1"; - by-version."forever-agent"."0.6.1" = self.buildNodePackage { - name = "forever-agent-0.6.1"; - version = "0.6.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - name = "forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."form-data"."0.1.2" = - self.by-version."form-data"."0.1.2"; - by-version."form-data"."0.1.2" = self.buildNodePackage { - name = "form-data-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz"; - name = "form-data-0.1.2.tgz"; - sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445"; - }; - deps = { - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "async-0.2.10" = self.by-version."async"."0.2.10"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."form-data"."~0.1.0" = - self.by-version."form-data"."0.1.4"; - by-version."form-data"."0.1.4" = self.buildNodePackage { - name = "form-data-0.1.4"; - version = "0.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - name = "form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }; - deps = { - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "async-0.9.0" = self.by-version."async"."0.9.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."form-data"."~0.2.0" = - self.by-version."form-data"."0.2.0"; - by-version."form-data"."0.2.0" = self.buildNodePackage { - name = "form-data-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz"; - name = "form-data-0.2.0.tgz"; - sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466"; - }; - deps = { - "async-0.9.0" = self.by-version."async"."0.9.0"; - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."formatio"."1.1.1" = - self.by-version."formatio"."1.1.1"; - by-version."formatio"."1.1.1" = self.buildNodePackage { - name = "formatio-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz"; - name = "formatio-1.1.1.tgz"; - sha1 = "5ed3ccd636551097383465d996199100e86161e9"; - }; - deps = { - "samsam-1.1.2" = self.by-version."samsam"."1.1.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."formatio"."~1.0" = - self.by-version."formatio"."1.0.2"; - by-version."formatio"."1.0.2" = self.buildNodePackage { - name = "formatio-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz"; - name = "formatio-1.0.2.tgz"; - sha1 = "e7991ca144ff7d8cff07bb9ac86a9b79c6ba47ef"; - }; - deps = { - "samsam-1.1.2" = self.by-version."samsam"."1.1.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."formidable"."1.0.14" = - self.by-version."formidable"."1.0.14"; - by-version."formidable"."1.0.14" = self.buildNodePackage { - name = "formidable-1.0.14"; - version = "1.0.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; - name = "formidable-1.0.14.tgz"; - sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forwarded"."~0.1.0" = - self.by-version."forwarded"."0.1.0"; - by-version."forwarded"."0.1.0" = self.buildNodePackage { - name = "forwarded-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; - name = "forwarded-0.1.0.tgz"; - sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fresh"."0.2.4" = - self.by-version."fresh"."0.2.4"; - by-version."fresh"."0.2.4" = self.buildNodePackage { - name = "fresh-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; - name = "fresh-0.2.4.tgz"; - sha1 = "3582499206c9723714190edd74b4604feb4a614c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fstream"."^1.0.2" = - self.by-version."fstream"."1.0.6"; - by-version."fstream"."1.0.6" = self.buildNodePackage { - name = "fstream-1.0.6"; - version = "1.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-1.0.6.tgz"; - name = "fstream-1.0.6.tgz"; - sha1 = "817e50312fb4ed90da865c8eb5ecd1d1d7aed0ec"; - }; - deps = { - "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; - "rimraf-2.3.3" = self.by-version."rimraf"."2.3.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fstream"."~0.1.17" = - self.by-version."fstream"."0.1.31"; - by-version."fstream"."0.1.31" = self.buildNodePackage { - name = "fstream-0.1.31"; - version = "0.1.31"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; - name = "fstream-0.1.31.tgz"; - sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; - }; - deps = { - "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; - "rimraf-2.3.3" = self.by-version."rimraf"."2.3.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fstream"."~0.1.22" = - self.by-version."fstream"."0.1.31"; - by-spec."fstream"."~0.1.28" = - self.by-version."fstream"."0.1.31"; - by-spec."fstream-ignore"."0.0.7" = - self.by-version."fstream-ignore"."0.0.7"; - by-version."fstream-ignore"."0.0.7" = self.buildNodePackage { - name = "fstream-ignore-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; - name = "fstream-ignore-0.0.7.tgz"; - sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63"; - }; - deps = { - "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; - "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."gauge"."~1.2.0" = - self.by-version."gauge"."1.2.0"; - by-version."gauge"."1.2.0" = self.buildNodePackage { - name = "gauge-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz"; - name = "gauge-1.2.0.tgz"; - sha1 = "3094ab1285633f799814388fc8f2de67b4c012c5"; - }; - deps = { - "ansi-0.3.0" = self.by-version."ansi"."0.3.0"; - "has-unicode-1.0.0" = self.by-version."has-unicode"."1.0.0"; - "lodash.pad-3.1.0" = self.by-version."lodash.pad"."3.1.0"; - "lodash.padleft-3.1.1" = self.by-version."lodash.padleft"."3.1.1"; - "lodash.padright-3.1.1" = self.by-version."lodash.padright"."3.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."generate-function"."^2.0.0" = - self.by-version."generate-function"."2.0.0"; - by-version."generate-function"."2.0.0" = self.buildNodePackage { - name = "generate-function-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - name = "generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."generate-object-property"."^1.1.0" = - self.by-version."generate-object-property"."1.1.1"; - by-version."generate-object-property"."1.1.1" = self.buildNodePackage { - name = "generate-object-property-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz"; - name = "generate-object-property-1.1.1.tgz"; - sha1 = "8fda6b4cb69b34a189a6cebee7c4c268af47cc93"; - }; - deps = { - "is-property-1.0.2" = self.by-version."is-property"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."generic-pool-redux"."~0.1.0" = - self.by-version."generic-pool-redux"."0.1.0"; - by-version."generic-pool-redux"."0.1.0" = self.buildNodePackage { - name = "generic-pool-redux-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/generic-pool-redux/-/generic-pool-redux-0.1.0.tgz"; - name = "generic-pool-redux-0.1.0.tgz"; - sha1 = "326c2594e17fba4d4f0622cfe09acc3c84cb3a82"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."get-stdin"."^4.0.1" = - self.by-version."get-stdin"."4.0.1"; - by-version."get-stdin"."4.0.1" = self.buildNodePackage { - name = "get-stdin-4.0.1"; - version = "4.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - name = "get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."glob"."3.2.3" = - self.by-version."glob"."3.2.3"; - by-version."glob"."3.2.3" = self.buildNodePackage { - name = "glob-3.2.3"; - version = "3.2.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; - name = "glob-3.2.3.tgz"; - sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; - }; - deps = { - "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; - "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."glob"."3.x" = - self.by-version."glob"."3.2.11"; - by-version."glob"."3.2.11" = self.buildNodePackage { - name = "glob-3.2.11"; - version = "3.2.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; - name = "glob-3.2.11.tgz"; - sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."glob"."^4.4.2" = - self.by-version."glob"."4.5.3"; - by-version."glob"."4.5.3" = self.buildNodePackage { - name = "glob-4.5.3"; - version = "4.5.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; - name = "glob-4.5.3.tgz"; - sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; - }; - deps = { - "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-2.0.7" = self.by-version."minimatch"."2.0.7"; - "once-1.3.2" = self.by-version."once"."1.3.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."glob"."~3.2.9" = - self.by-version."glob"."3.2.11"; - by-spec."graceful-fs"."1.2" = - self.by-version."graceful-fs"."1.2.3"; - by-version."graceful-fs"."1.2.3" = self.buildNodePackage { - name = "graceful-fs-1.2.3"; - version = "1.2.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; - name = "graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."graceful-fs"."3" = - self.by-version."graceful-fs"."3.0.6"; - by-version."graceful-fs"."3.0.6" = self.buildNodePackage { - name = "graceful-fs-3.0.6"; - version = "3.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"; - name = "graceful-fs-3.0.6.tgz"; - sha1 = "dce3a18351cb94cdc82e688b2e3dd2842d1b09bb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."graceful-fs"."~2.0.0" = - self.by-version."graceful-fs"."2.0.3"; - by-version."graceful-fs"."2.0.3" = self.buildNodePackage { - name = "graceful-fs-2.0.3"; - version = "2.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"; - name = "graceful-fs-2.0.3.tgz"; - sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."graceful-fs"."~3.0.2" = - self.by-version."graceful-fs"."3.0.6"; - by-spec."graceful-readlink".">= 1.0.0" = - self.by-version."graceful-readlink"."1.0.1"; - by-version."graceful-readlink"."1.0.1" = self.buildNodePackage { - name = "graceful-readlink-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - name = "graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."growl"."1.8.1" = - self.by-version."growl"."1.8.1"; - by-version."growl"."1.8.1" = self.buildNodePackage { - name = "growl-1.8.1"; - version = "1.8.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz"; - name = "growl-1.8.1.tgz"; - sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."handlebars"."1.3.x" = - self.by-version."handlebars"."1.3.0"; - by-version."handlebars"."1.3.0" = self.buildNodePackage { - name = "handlebars-1.3.0"; - version = "1.3.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz"; - name = "handlebars-1.3.0.tgz"; - sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34"; - }; - deps = { - "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; - }; - optionalDependencies = { - "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."har-validator"."^1.4.0" = - self.by-version."har-validator"."1.7.0"; - by-version."har-validator"."1.7.0" = self.buildNodePackage { - name = "har-validator-1.7.0"; - version = "1.7.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/har-validator/-/har-validator-1.7.0.tgz"; - name = "har-validator-1.7.0.tgz"; - sha1 = "563f8c58edca6410e2e408b0e540161da580dc46"; - }; - deps = { - "bluebird-2.9.25" = self.by-version."bluebird"."2.9.25"; - "chalk-1.0.0" = self.by-version."chalk"."1.0.0"; - "commander-2.8.1" = self.by-version."commander"."2.8.1"; - "is-my-json-valid-2.11.0" = self.by-version."is-my-json-valid"."2.11.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-ansi"."^0.1.0" = - self.by-version."has-ansi"."0.1.0"; - by-version."has-ansi"."0.1.0" = self.buildNodePackage { - name = "has-ansi-0.1.0"; - version = "0.1.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"; - name = "has-ansi-0.1.0.tgz"; - sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e"; - }; - deps = { - "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-ansi"."^1.0.3" = - self.by-version."has-ansi"."1.0.3"; - by-version."has-ansi"."1.0.3" = self.buildNodePackage { - name = "has-ansi-1.0.3"; - version = "1.0.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz"; - name = "has-ansi-1.0.3.tgz"; - sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538"; - }; - deps = { - "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1"; - "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-unicode"."^1.0.0" = - self.by-version."has-unicode"."1.0.0"; - by-version."has-unicode"."1.0.0" = self.buildNodePackage { - name = "has-unicode-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"; - name = "has-unicode-1.0.0.tgz"; - sha1 = "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hawk"."1.1.1" = - self.by-version."hawk"."1.1.1"; - by-version."hawk"."1.1.1" = self.buildNodePackage { - name = "hawk-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; - name = "hawk-1.1.1.tgz"; - sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; - }; - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; - "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hawk"."~2.3.0" = - self.by-version."hawk"."2.3.1"; - by-version."hawk"."2.3.1" = self.buildNodePackage { - name = "hawk-2.3.1"; - version = "2.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz"; - name = "hawk-2.3.1.tgz"; - sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f"; - }; - deps = { - "hoek-2.13.0" = self.by-version."hoek"."2.13.0"; - "boom-2.7.1" = self.by-version."boom"."2.7.1"; - "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4"; - "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."heap".">= 0.2.0" = - self.by-version."heap"."0.2.6"; - by-version."heap"."0.2.6" = self.buildNodePackage { - name = "heap-0.2.6"; - version = "0.2.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/heap/-/heap-0.2.6.tgz"; - name = "heap-0.2.6.tgz"; - sha1 = "087e1f10b046932fc8594dd9e6d378afc9d1e5ac"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hoek"."0.9.x" = - self.by-version."hoek"."0.9.1"; - by-version."hoek"."0.9.1" = self.buildNodePackage { - name = "hoek-0.9.1"; - version = "0.9.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - name = "hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hoek"."2.x.x" = - self.by-version."hoek"."2.13.0"; - by-version."hoek"."2.13.0" = self.buildNodePackage { - name = "hoek-2.13.0"; - version = "2.13.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-2.13.0.tgz"; - name = "hoek-2.13.0.tgz"; - sha1 = "cc86b5c1c344b41a7271be449e232fac8d6f450c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."http-signature"."~0.10.0" = - self.by-version."http-signature"."0.10.1"; - by-version."http-signature"."0.10.1" = self.buildNodePackage { - name = "http-signature-0.10.1"; - version = "0.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - name = "http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - deps = { - "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; - "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; - "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."iconv-lite"."0.4.8" = - self.by-version."iconv-lite"."0.4.8"; - by-version."iconv-lite"."0.4.8" = self.buildNodePackage { - name = "iconv-lite-0.4.8"; - version = "0.4.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; - name = "iconv-lite-0.4.8.tgz"; - sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inflight"."^1.0.4" = - self.by-version."inflight"."1.0.4"; - by-version."inflight"."1.0.4" = self.buildNodePackage { - name = "inflight-1.0.4"; - version = "1.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"; - name = "inflight-1.0.4.tgz"; - sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a"; - }; - deps = { - "once-1.3.2" = self.by-version."once"."1.3.2"; - "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."2" = - self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = self.buildNodePackage { - name = "inherits-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."2.0.1" = - self.by-version."inherits"."2.0.1"; - by-spec."inherits"."~2.0.0" = - self.by-version."inherits"."2.0.1"; - by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.1"; - by-spec."ini"."1.x.x" = - self.by-version."ini"."1.3.3"; - by-version."ini"."1.3.3" = self.buildNodePackage { - name = "ini-1.3.3"; - version = "1.3.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ini/-/ini-1.3.3.tgz"; - name = "ini-1.3.3.tgz"; - sha1 = "c07e34aef1de06aff21d413b458e52b21533a11e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ini"."~1.3.0" = - self.by-version."ini"."1.3.3"; - by-spec."interpret"."^0.3.2" = - self.by-version."interpret"."0.3.10"; - by-version."interpret"."0.3.10" = self.buildNodePackage { - name = "interpret-0.3.10"; - version = "0.3.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"; - name = "interpret-0.3.10.tgz"; - sha1 = "088c25de731c6c5b112a90f0071cfaf459e5a7bb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ipaddr.js"."1.0.1" = - self.by-version."ipaddr.js"."1.0.1"; - by-version."ipaddr.js"."1.0.1" = self.buildNodePackage { - name = "ipaddr.js-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz"; - name = "ipaddr.js-1.0.1.tgz"; - sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-my-json-valid"."^2.10.1" = - self.by-version."is-my-json-valid"."2.11.0"; - by-version."is-my-json-valid"."2.11.0" = self.buildNodePackage { - name = "is-my-json-valid-2.11.0"; - version = "2.11.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.11.0.tgz"; - name = "is-my-json-valid-2.11.0.tgz"; - sha1 = "11f130d52c6c0b2ee132a72feb8e3e4c61a2c54f"; - }; - deps = { - "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0"; - "generate-object-property-1.1.1" = self.by-version."generate-object-property"."1.1.1"; - "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0"; - "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-property"."^1.0.0" = - self.by-version."is-property"."1.0.2"; - by-version."is-property"."1.0.2" = self.buildNodePackage { - name = "is-property-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - name = "is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = self.buildNodePackage { - name = "isarray-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isstream"."0.1.x" = - self.by-version."isstream"."0.1.2"; - by-version."isstream"."0.1.2" = self.buildNodePackage { - name = "isstream-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - name = "isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isstream"."~0.1.1" = - self.by-version."isstream"."0.1.2"; - by-spec."istanbul"."^0.2.10" = - self.by-version."istanbul"."0.2.16"; - by-version."istanbul"."0.2.16" = self.buildNodePackage { - name = "istanbul-0.2.16"; - version = "0.2.16"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.16.tgz"; - name = "istanbul-0.2.16.tgz"; - sha1 = "870545a0d4f4b4ce161039e9e805a98c2c700bd9"; - }; - deps = { - "esprima-1.2.5" = self.by-version."esprima"."1.2.5"; - "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3"; - "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0"; - "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; - "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; - "fileset-0.1.5" = self.by-version."fileset"."0.1.5"; - "which-1.0.9" = self.by-version."which"."1.0.9"; - "async-0.9.0" = self.by-version."async"."0.9.0"; - "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; - "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; - "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; - "js-yaml-3.3.1" = self.by-version."js-yaml"."3.3.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "istanbul" = self.by-version."istanbul"."0.2.16"; - by-spec."jade"."0.26.3" = - self.by-version."jade"."0.26.3"; - by-version."jade"."0.26.3" = self.buildNodePackage { - name = "jade-0.26.3"; - version = "0.26.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; - name = "jade-0.26.3.tgz"; - sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; - }; - deps = { - "commander-0.6.1" = self.by-version."commander"."0.6.1"; - "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jayschema"."^0.3.1" = - self.by-version."jayschema"."0.3.1"; - by-version."jayschema"."0.3.1" = self.buildNodePackage { - name = "jayschema-0.3.1"; - version = "0.3.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz"; - name = "jayschema-0.3.1.tgz"; - sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58"; - }; - deps = { - "when-3.4.6" = self.by-version."when"."3.4.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "jayschema" = self.by-version."jayschema"."0.3.1"; - by-spec."jayschema-error-messages"."^1.0.2" = - self.by-version."jayschema-error-messages"."1.0.3"; - by-version."jayschema-error-messages"."1.0.3" = self.buildNodePackage { - name = "jayschema-error-messages-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jayschema-error-messages/-/jayschema-error-messages-1.0.3.tgz"; - name = "jayschema-error-messages-1.0.3.tgz"; - sha1 = "8bac6e52ae89d406fbe1a7db4ae44debfd289066"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "jayschema-error-messages" = self.by-version."jayschema-error-messages"."1.0.3"; - by-spec."js-yaml"."3.0.1" = - self.by-version."js-yaml"."3.0.1"; - by-version."js-yaml"."3.0.1" = self.buildNodePackage { - name = "js-yaml-3.0.1"; - version = "3.0.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz"; - name = "js-yaml-3.0.1.tgz"; - sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe"; - }; - deps = { - "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; - "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."js-yaml"."3.x" = - self.by-version."js-yaml"."3.3.1"; - by-version."js-yaml"."3.3.1" = self.buildNodePackage { - name = "js-yaml-3.3.1"; - version = "3.3.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.3.1.tgz"; - name = "js-yaml-3.3.1.tgz"; - sha1 = "ca1acd3423ec275d12140a7bab51db015ba0b3c0"; - }; - deps = { - "argparse-1.0.2" = self.by-version."argparse"."1.0.2"; - "esprima-2.2.0" = self.by-version."esprima"."2.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json-diff"."0.3.1" = - self.by-version."json-diff"."0.3.1"; - by-version."json-diff"."0.3.1" = self.buildNodePackage { - name = "json-diff-0.3.1"; - version = "0.3.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/json-diff/-/json-diff-0.3.1.tgz"; - name = "json-diff-0.3.1.tgz"; - sha1 = "6dbc3ae2d25e075a7fd71bcd9874458666fb681b"; - }; - deps = { - "dreamopt-0.6.0" = self.by-version."dreamopt"."0.6.0"; - "difflib-0.2.4" = self.by-version."difflib"."0.2.4"; - "cli-color-0.1.7" = self.by-version."cli-color"."0.1.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json-stringify-safe"."~5.0.0" = - self.by-version."json-stringify-safe"."5.0.0"; - by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage { - name = "json-stringify-safe-5.0.0"; - version = "5.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; - name = "json-stringify-safe-5.0.0.tgz"; - sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jsonpointer"."^1.1.0" = - self.by-version."jsonpointer"."1.1.0"; - by-version."jsonpointer"."1.1.0" = self.buildNodePackage { - name = "jsonpointer-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz"; - name = "jsonpointer-1.1.0.tgz"; - sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."knex"."^0.7.6" = - self.by-version."knex"."0.7.6"; - by-version."knex"."0.7.6" = self.buildNodePackage { - name = "knex-0.7.6"; - version = "0.7.6"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/knex/-/knex-0.7.6.tgz"; - name = "knex-0.7.6.tgz"; - sha1 = "325d18174b0625658ff0d35aaf1cd9e631696992"; - }; - deps = { - "bluebird-2.9.25" = self.by-version."bluebird"."2.9.25"; - "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; - "commander-2.8.1" = self.by-version."commander"."2.8.1"; - "generic-pool-redux-0.1.0" = self.by-version."generic-pool-redux"."0.1.0"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "interpret-0.3.10" = self.by-version."interpret"."0.3.10"; - "liftoff-0.13.6" = self.by-version."liftoff"."0.13.6"; - "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; - "minimist-1.1.1" = self.by-version."minimist"."1.1.1"; - "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - "tildify-1.0.0" = self.by-version."tildify"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "knex" = self.by-version."knex"."0.7.6"; - by-spec."lcov-parse"."0.0.6" = - self.by-version."lcov-parse"."0.0.6"; - by-version."lcov-parse"."0.0.6" = self.buildNodePackage { - name = "lcov-parse-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz"; - name = "lcov-parse-0.0.6.tgz"; - sha1 = "819e5da8bf0791f9d3f39eea5ed1868187f11175"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."liftoff"."~0.13.2" = - self.by-version."liftoff"."0.13.6"; - by-version."liftoff"."0.13.6" = self.buildNodePackage { - name = "liftoff-0.13.6"; - version = "0.13.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/liftoff/-/liftoff-0.13.6.tgz"; - name = "liftoff-0.13.6.tgz"; - sha1 = "600e8966b92d1e0150eab5b577652569f4c7d1d8"; - }; - deps = { - "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3"; - "resolve-1.0.0" = self.by-version."resolve"."1.0.0"; - "minimist-1.1.1" = self.by-version."minimist"."1.1.1"; - "extend-1.3.0" = self.by-version."extend"."1.3.0"; - "flagged-respawn-0.3.1" = self.by-version."flagged-respawn"."0.3.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash".">= 3.2.0 < 4.0.0" = - self.by-version."lodash"."3.8.0"; - by-version."lodash"."3.8.0" = self.buildNodePackage { - name = "lodash-3.8.0"; - version = "3.8.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz"; - name = "lodash-3.8.0.tgz"; - sha1 = "376eb98bdcd9382a9365c33c4cb8250de1325b91"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash"."^3.1.0" = - self.by-version."lodash"."3.8.0"; - by-spec."lodash"."^3.6" = - self.by-version."lodash"."3.8.0"; - "lodash" = self.by-version."lodash"."3.8.0"; - by-spec."lodash"."^3.6.0" = - self.by-version."lodash"."3.8.0"; - by-spec."lodash"."~2.4.0" = - self.by-version."lodash"."2.4.2"; - by-version."lodash"."2.4.2" = self.buildNodePackage { - name = "lodash-2.4.2"; - version = "2.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; - name = "lodash-2.4.2.tgz"; - sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash"."~2.4.1" = - self.by-version."lodash"."2.4.2"; - by-spec."lodash._basetostring"."^3.0.0" = - self.by-version."lodash._basetostring"."3.0.0"; - by-version."lodash._basetostring"."3.0.0" = self.buildNodePackage { - name = "lodash._basetostring-3.0.0"; - version = "3.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"; - name = "lodash._basetostring-3.0.0.tgz"; - sha1 = "75a9a4aaaa2b2a8761111ff5431e7d83c1daf0e2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash._createpadding"."^3.0.0" = - self.by-version."lodash._createpadding"."3.6.0"; - by-version."lodash._createpadding"."3.6.0" = self.buildNodePackage { - name = "lodash._createpadding-3.6.0"; - version = "3.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz"; - name = "lodash._createpadding-3.6.0.tgz"; - sha1 = "c466850dd1a05e6bfec54fd0cf0db28b68332d5e"; - }; - deps = { - "lodash.repeat-3.0.0" = self.by-version."lodash.repeat"."3.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash.pad"."^3.0.0" = - self.by-version."lodash.pad"."3.1.0"; - by-version."lodash.pad"."3.1.0" = self.buildNodePackage { - name = "lodash.pad-3.1.0"; - version = "3.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz"; - name = "lodash.pad-3.1.0.tgz"; - sha1 = "9f18b1f3749a95e197b5ff2ae752ea9851ada965"; - }; - deps = { - "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; - "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash.padleft"."^3.0.0" = - self.by-version."lodash.padleft"."3.1.1"; - by-version."lodash.padleft"."3.1.1" = self.buildNodePackage { - name = "lodash.padleft-3.1.1"; - version = "3.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"; - name = "lodash.padleft-3.1.1.tgz"; - sha1 = "150151f1e0245edba15d50af2d71f1d5cff46530"; - }; - deps = { - "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; - "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash.padright"."^3.0.0" = - self.by-version."lodash.padright"."3.1.1"; - by-version."lodash.padright"."3.1.1" = self.buildNodePackage { - name = "lodash.padright-3.1.1"; - version = "3.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"; - name = "lodash.padright-3.1.1.tgz"; - sha1 = "79f7770baaa39738c040aeb5465e8d88f2aacec0"; - }; - deps = { - "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; - "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash.repeat"."^3.0.0" = - self.by-version."lodash.repeat"."3.0.0"; - by-version."lodash.repeat"."3.0.0" = self.buildNodePackage { - name = "lodash.repeat-3.0.0"; - version = "3.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz"; - name = "lodash.repeat-3.0.0.tgz"; - sha1 = "c340f4136c99dc5b2e397b3fd50cffbd172a94b0"; - }; - deps = { - "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."log-driver"."1.2.4" = - self.by-version."log-driver"."1.2.4"; - by-version."log-driver"."1.2.4" = self.buildNodePackage { - name = "log-driver-1.2.4"; - version = "1.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz"; - name = "log-driver-1.2.4.tgz"; - sha1 = "2d62d7faef45d8a71341961a04b0761eca99cfa3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lolex"."1.1.0" = - self.by-version."lolex"."1.1.0"; - by-version."lolex"."1.1.0" = self.buildNodePackage { - name = "lolex-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz"; - name = "lolex-1.1.0.tgz"; - sha1 = "5dbbbc850395e7523c74b3586f7fbd2626d25b1b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lru-cache"."2" = - self.by-version."lru-cache"."2.6.2"; - by-version."lru-cache"."2.6.2" = self.buildNodePackage { - name = "lru-cache-2.6.2"; - version = "2.6.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"; - name = "lru-cache-2.6.2.tgz"; - sha1 = "77741638c6dc972e503dbe41dcb6bfdfba499a38"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lru-cache"."~2.5.0" = - self.by-version."lru-cache"."2.5.2"; - by-version."lru-cache"."2.5.2" = self.buildNodePackage { - name = "lru-cache-2.5.2"; - version = "2.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz"; - name = "lru-cache-2.5.2.tgz"; - sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."media-typer"."0.3.0" = - self.by-version."media-typer"."0.3.0"; - by-version."media-typer"."0.3.0" = self.buildNodePackage { - name = "media-typer-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - name = "media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."merge-descriptors"."1.0.0" = - self.by-version."merge-descriptors"."1.0.0"; - by-version."merge-descriptors"."1.0.0" = self.buildNodePackage { - name = "merge-descriptors-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; - name = "merge-descriptors-1.0.0.tgz"; - sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."methods"."0.0.1" = - self.by-version."methods"."0.0.1"; - by-version."methods"."0.0.1" = self.buildNodePackage { - name = "methods-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; - name = "methods-0.0.1.tgz"; - sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."methods"."1.0.0" = - self.by-version."methods"."1.0.0"; - by-version."methods"."1.0.0" = self.buildNodePackage { - name = "methods-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz"; - name = "methods-1.0.0.tgz"; - sha1 = "9a73d86375dfcef26ef61ca3e4b8a2e2538a80e3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."methods"."~1.1.1" = - self.by-version."methods"."1.1.1"; - by-version."methods"."1.1.1" = self.buildNodePackage { - name = "methods-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz"; - name = "methods-1.1.1.tgz"; - sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."1.2.5" = - self.by-version."mime"."1.2.5"; - by-version."mime"."1.2.5" = self.buildNodePackage { - name = "mime-1.2.5"; - version = "1.2.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz"; - name = "mime-1.2.5.tgz"; - sha1 = "9eed073022a8bf5e16c8566c6867b8832bfbfa13"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."1.3.4" = - self.by-version."mime"."1.3.4"; - by-version."mime"."1.3.4" = self.buildNodePackage { - name = "mime-1.3.4"; - version = "1.3.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - name = "mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."~1.2.11" = - self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = self.buildNodePackage { - name = "mime-1.2.11"; - version = "1.2.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db".">= 1.1.2 < 2" = - self.by-version."mime-db"."1.9.1"; - by-version."mime-db"."1.9.1" = self.buildNodePackage { - name = "mime-db-1.9.1"; - version = "1.9.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz"; - name = "mime-db-1.9.1.tgz"; - sha1 = "1431049a71791482c29f37bafc8ea2cb3a6dd3e8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db"."~1.9.1" = - self.by-version."mime-db"."1.9.1"; - by-spec."mime-types"."~1.0.1" = - self.by-version."mime-types"."1.0.2"; - by-version."mime-types"."1.0.2" = self.buildNodePackage { - name = "mime-types-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - name = "mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.1" = - self.by-version."mime-types"."2.0.11"; - by-version."mime-types"."2.0.11" = self.buildNodePackage { - name = "mime-types-2.0.11"; - version = "2.0.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz"; - name = "mime-types-2.0.11.tgz"; - sha1 = "bf3449042799d877c815c29929d1e74760e72007"; - }; - deps = { - "mime-db-1.9.1" = self.by-version."mime-db"."1.9.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.11" = - self.by-version."mime-types"."2.0.11"; - by-spec."mime-types"."~2.0.3" = - self.by-version."mime-types"."2.0.11"; - by-spec."minimatch"."0.3" = - self.by-version."minimatch"."0.3.0"; - by-version."minimatch"."0.3.0" = self.buildNodePackage { - name = "minimatch-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; - name = "minimatch-0.3.0.tgz"; - sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; - }; - deps = { - "lru-cache-2.6.2" = self.by-version."lru-cache"."2.6.2"; - "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimatch"."0.x" = - self.by-version."minimatch"."0.4.0"; - by-version."minimatch"."0.4.0" = self.buildNodePackage { - name = "minimatch-0.4.0"; - version = "0.4.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz"; - name = "minimatch-0.4.0.tgz"; - sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b"; - }; - deps = { - "lru-cache-2.6.2" = self.by-version."lru-cache"."2.6.2"; - "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimatch"."^2.0.1" = - self.by-version."minimatch"."2.0.7"; - by-version."minimatch"."2.0.7" = self.buildNodePackage { - name = "minimatch-2.0.7"; - version = "2.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz"; - name = "minimatch-2.0.7.tgz"; - sha1 = "d23652ab10e663e7d914602e920e21f9f66492be"; - }; - deps = { - "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimatch"."~0.2.0" = - self.by-version."minimatch"."0.2.14"; - by-version."minimatch"."0.2.14" = self.buildNodePackage { - name = "minimatch-0.2.14"; - version = "0.2.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - name = "minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; - }; - deps = { - "lru-cache-2.6.2" = self.by-version."lru-cache"."2.6.2"; - "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimatch"."~0.2.11" = - self.by-version."minimatch"."0.2.14"; - by-spec."minimist"."0.0.8" = - self.by-version."minimist"."0.0.8"; - by-version."minimist"."0.0.8" = self.buildNodePackage { - name = "minimist-0.0.8"; - version = "0.0.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - name = "minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimist"."~0.0.1" = - self.by-version."minimist"."0.0.10"; - by-version."minimist"."0.0.10" = self.buildNodePackage { - name = "minimist-0.0.10"; - version = "0.0.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - name = "minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimist"."~0.0.7" = - self.by-version."minimist"."0.0.10"; - by-spec."minimist"."~1.1.0" = - self.by-version."minimist"."1.1.1"; - by-version."minimist"."1.1.1" = self.buildNodePackage { - name = "minimist-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"; - name = "minimist-1.1.1.tgz"; - sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."0.3.0" = - self.by-version."mkdirp"."0.3.0"; - by-version."mkdirp"."0.3.0" = self.buildNodePackage { - name = "mkdirp-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; - name = "mkdirp-0.3.0.tgz"; - sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."0.5" = - self.by-version."mkdirp"."0.5.1"; - by-version."mkdirp"."0.5.1" = self.buildNodePackage { - name = "mkdirp-0.5.1"; - version = "0.5.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - name = "mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - deps = { - "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."0.5.0" = - self.by-version."mkdirp"."0.5.0"; - by-version."mkdirp"."0.5.0" = self.buildNodePackage { - name = "mkdirp-0.5.0"; - version = "0.5.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - name = "mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; - }; - deps = { - "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."0.5.x" = - self.by-version."mkdirp"."0.5.1"; - by-spec."mkdirp".">=0.5 0" = - self.by-version."mkdirp"."0.5.1"; - by-spec."mkdirp"."^0.5.0" = - self.by-version."mkdirp"."0.5.1"; - by-spec."mkdirp"."~0.5.0" = - self.by-version."mkdirp"."0.5.1"; - by-spec."mocha"."^2.1.0" = - self.by-version."mocha"."2.2.4"; - by-version."mocha"."2.2.4" = self.buildNodePackage { - name = "mocha-2.2.4"; - version = "2.2.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-2.2.4.tgz"; - name = "mocha-2.2.4.tgz"; - sha1 = "192b0edc0e17e56613bc66e5fc7e81c00413a98d"; - }; - deps = { - "commander-2.3.0" = self.by-version."commander"."2.3.0"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; - "diff-1.0.8" = self.by-version."diff"."1.0.8"; - "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; - "glob-3.2.3" = self.by-version."glob"."3.2.3"; - "growl-1.8.1" = self.by-version."growl"."1.8.1"; - "jade-0.26.3" = self.by-version."jade"."0.26.3"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "supports-color-1.2.1" = self.by-version."supports-color"."1.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "mocha" = self.by-version."mocha"."2.2.4"; - by-spec."morgan"."^1.3.0" = - self.by-version."morgan"."1.5.3"; - by-version."morgan"."1.5.3" = self.buildNodePackage { - name = "morgan-1.5.3"; - version = "1.5.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/morgan/-/morgan-1.5.3.tgz"; - name = "morgan-1.5.3.tgz"; - sha1 = "8adb4e72f9e5c5436e5d93f42910835f79da9fdf"; - }; - deps = { - "basic-auth-1.0.1" = self.by-version."basic-auth"."1.0.1"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "morgan" = self.by-version."morgan"."1.5.3"; - by-spec."ms"."0.6.2" = - self.by-version."ms"."0.6.2"; - by-version."ms"."0.6.2" = self.buildNodePackage { - name = "ms-0.6.2"; - version = "0.6.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - name = "ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.7.0" = - self.by-version."ms"."0.7.0"; - by-version."ms"."0.7.0" = self.buildNodePackage { - name = "ms-0.7.0"; - version = "0.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; - name = "ms-0.7.0.tgz"; - sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.7.1" = - self.by-version."ms"."0.7.1"; - by-version."ms"."0.7.1" = self.buildNodePackage { - name = "ms-0.7.1"; - version = "0.7.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - name = "ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nan"."1.6.x" = - self.by-version."nan"."1.6.2"; - by-version."nan"."1.6.2" = self.buildNodePackage { - name = "nan-1.6.2"; - version = "1.6.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.6.2.tgz"; - name = "nan-1.6.2.tgz"; - sha1 = "2657d1c43b00f1e847e083832285b7d8f5ba8ec8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nan"."~1.0.0" = - self.by-version."nan"."1.0.0"; - by-version."nan"."1.0.0" = self.buildNodePackage { - name = "nan-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; - name = "nan-1.0.0.tgz"; - sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nan"."~1.8.4" = - self.by-version."nan"."1.8.4"; - by-version."nan"."1.8.4" = self.buildNodePackage { - name = "nan-1.8.4"; - version = "1.8.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz"; - name = "nan-1.8.4.tgz"; - sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nconf"."^0.6.9" = - self.by-version."nconf"."0.6.9"; - by-version."nconf"."0.6.9" = self.buildNodePackage { - name = "nconf-0.6.9"; - version = "0.6.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; - name = "nconf-0.6.9.tgz"; - sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661"; - }; - deps = { - "async-0.2.9" = self.by-version."async"."0.2.9"; - "ini-1.3.3" = self.by-version."ini"."1.3.3"; - "optimist-0.6.0" = self.by-version."optimist"."0.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "nconf" = self.by-version."nconf"."0.6.9"; - by-spec."negotiator"."0.5.3" = - self.by-version."negotiator"."0.5.3"; - by-version."negotiator"."0.5.3" = self.buildNodePackage { - name = "negotiator-0.5.3"; - version = "0.5.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; - name = "negotiator-0.5.3.tgz"; - sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-pre-gyp"."~0.6.7" = - self.by-version."node-pre-gyp"."0.6.7"; - by-version."node-pre-gyp"."0.6.7" = self.buildNodePackage { - name = "node-pre-gyp-0.6.7"; - version = "0.6.7"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.7.tgz"; - name = "node-pre-gyp-0.6.7.tgz"; - sha1 = "4c3ee4ac2934b0b27fead6bc76391c0dccf38ea8"; - }; - deps = { - "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; - "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0"; - "request-2.55.0" = self.by-version."request"."2.55.0"; - "semver-4.3.4" = self.by-version."semver"."4.3.4"; - "tar-2.1.1" = self.by-version."tar"."2.1.1"; - "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0"; - "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; - "rc-1.0.1" = self.by-version."rc"."1.0.1"; - "rimraf-2.3.3" = self.by-version."rimraf"."2.3.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-uuid"."^1.4.1" = - self.by-version."node-uuid"."1.4.3"; - by-version."node-uuid"."1.4.3" = self.buildNodePackage { - name = "node-uuid-1.4.3"; - version = "1.4.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; - name = "node-uuid-1.4.3.tgz"; - sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "node-uuid" = self.by-version."node-uuid"."1.4.3"; - by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.3"; - by-spec."nopt"."3.x" = - self.by-version."nopt"."3.0.1"; - by-version."nopt"."3.0.1" = self.buildNodePackage { - name = "nopt-3.0.1"; - version = "3.0.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz"; - name = "nopt-3.0.1.tgz"; - sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd"; - }; - deps = { - "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nopt"."~3.0.1" = - self.by-version."nopt"."3.0.1"; - by-spec."npmlog"."~1.2.0" = - self.by-version."npmlog"."1.2.0"; - by-version."npmlog"."1.2.0" = self.buildNodePackage { - name = "npmlog-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/npmlog/-/npmlog-1.2.0.tgz"; - name = "npmlog-1.2.0.tgz"; - sha1 = "b512f18ae8696a0192ada78ba00c06dbbd91bafb"; - }; - deps = { - "ansi-0.3.0" = self.by-version."ansi"."0.3.0"; - "are-we-there-yet-1.0.4" = self.by-version."are-we-there-yet"."1.0.4"; - "gauge-1.2.0" = self.by-version."gauge"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth-sign"."~0.3.0" = - self.by-version."oauth-sign"."0.3.0"; - by-version."oauth-sign"."0.3.0" = self.buildNodePackage { - name = "oauth-sign-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; - name = "oauth-sign-0.3.0.tgz"; - sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth-sign"."~0.6.0" = - self.by-version."oauth-sign"."0.6.0"; - by-version."oauth-sign"."0.6.0" = self.buildNodePackage { - name = "oauth-sign-0.6.0"; - version = "0.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz"; - name = "oauth-sign-0.6.0.tgz"; - sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."on-finished"."~2.2.0" = - self.by-version."on-finished"."2.2.1"; - by-version."on-finished"."2.2.1" = self.buildNodePackage { - name = "on-finished-2.2.1"; - version = "2.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; - name = "on-finished-2.2.1.tgz"; - sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; - }; - deps = { - "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."on-finished"."~2.2.1" = - self.by-version."on-finished"."2.2.1"; - by-spec."on-headers"."~1.0.0" = - self.by-version."on-headers"."1.0.0"; - by-version."on-headers"."1.0.0" = self.buildNodePackage { - name = "on-headers-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz"; - name = "on-headers-1.0.0.tgz"; - sha1 = "2c75b5da4375513d0161c6052e7fcbe4953fca5d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."once"."^1.3.0" = - self.by-version."once"."1.3.2"; - by-version."once"."1.3.2" = self.buildNodePackage { - name = "once-1.3.2"; - version = "1.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/once/-/once-1.3.2.tgz"; - name = "once-1.3.2.tgz"; - sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b"; - }; - deps = { - "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."once"."~1.1.1" = - self.by-version."once"."1.1.1"; - by-version."once"."1.1.1" = self.buildNodePackage { - name = "once-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz"; - name = "once-1.1.1.tgz"; - sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."optimist"."0.6.0" = - self.by-version."optimist"."0.6.0"; - by-version."optimist"."0.6.0" = self.buildNodePackage { - name = "optimist-0.6.0"; - version = "0.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; - name = "optimist-0.6.0.tgz"; - sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; - }; - deps = { - "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; - "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."optimist"."~0.3" = - self.by-version."optimist"."0.3.7"; - by-version."optimist"."0.3.7" = self.buildNodePackage { - name = "optimist-0.3.7"; - version = "0.3.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - name = "optimist-0.3.7.tgz"; - sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; - }; - deps = { - "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."optimist"."~0.3.5" = - self.by-version."optimist"."0.3.7"; - by-spec."options".">=0.0.5" = - self.by-version."options"."0.0.6"; - by-version."options"."0.0.6" = self.buildNodePackage { - name = "options-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; - name = "options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parseurl"."~1.3.0" = - self.by-version."parseurl"."1.3.0"; - by-version."parseurl"."1.3.0" = self.buildNodePackage { - name = "parseurl-1.3.0"; - version = "1.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; - name = "parseurl-1.3.0.tgz"; - sha1 = "b58046db4223e145afa76009e61bac87cc2281b3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."path-to-regexp"."0.1.3" = - self.by-version."path-to-regexp"."0.1.3"; - by-version."path-to-regexp"."0.1.3" = self.buildNodePackage { - name = "path-to-regexp-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; - name = "path-to-regexp-0.1.3.tgz"; - sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pkginfo"."0.3.x" = - self.by-version."pkginfo"."0.3.0"; - by-version."pkginfo"."0.3.0" = self.buildNodePackage { - name = "pkginfo-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; - name = "pkginfo-0.3.0.tgz"; - sha1 = "726411401039fe9b009eea86614295d5f3a54276"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."proxy-addr"."~1.0.7" = - self.by-version."proxy-addr"."1.0.8"; - by-version."proxy-addr"."1.0.8" = self.buildNodePackage { - name = "proxy-addr-1.0.8"; - version = "1.0.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz"; - name = "proxy-addr-1.0.8.tgz"; - sha1 = "db54ec878bcc1053d57646609219b3715678bafe"; - }; - deps = { - "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; - "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."0.6.6" = - self.by-version."qs"."0.6.6"; - by-version."qs"."0.6.6" = self.buildNodePackage { - name = "qs-0.6.6"; - version = "0.6.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; - name = "qs-0.6.6.tgz"; - sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."2.4.1" = - self.by-version."qs"."2.4.1"; - by-version."qs"."2.4.1" = self.buildNodePackage { - name = "qs-2.4.1"; - version = "2.4.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.4.1.tgz"; - name = "qs-2.4.1.tgz"; - sha1 = "68cbaea971013426a80c1404fad6b1a6b1175245"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."2.4.2" = - self.by-version."qs"."2.4.2"; - by-version."qs"."2.4.2" = self.buildNodePackage { - name = "qs-2.4.2"; - version = "2.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz"; - name = "qs-2.4.2.tgz"; - sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."~1.0.0" = - self.by-version."qs"."1.0.2"; - by-version."qs"."1.0.2" = self.buildNodePackage { - name = "qs-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-1.0.2.tgz"; - name = "qs-1.0.2.tgz"; - sha1 = "50a93e2b5af6691c31bcea5dae78ee6ea1903768"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."~2.4.0" = - self.by-version."qs"."2.4.2"; - by-spec."range-parser"."~1.0.2" = - self.by-version."range-parser"."1.0.2"; - by-version."range-parser"."1.0.2" = self.buildNodePackage { - name = "range-parser-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"; - name = "range-parser-1.0.2.tgz"; - sha1 = "06a12a42e5131ba8e457cd892044867f2344e549"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."raw-body"."~2.0.1" = - self.by-version."raw-body"."2.0.1"; - by-version."raw-body"."2.0.1" = self.buildNodePackage { - name = "raw-body-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/raw-body/-/raw-body-2.0.1.tgz"; - name = "raw-body-2.0.1.tgz"; - sha1 = "2b70a3ffd1681c0521bae73454e0ccbc785d378e"; - }; - deps = { - "bytes-2.0.1" = self.by-version."bytes"."2.0.1"; - "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."rc"."~1.0.1" = - self.by-version."rc"."1.0.1"; - by-version."rc"."1.0.1" = self.buildNodePackage { - name = "rc-1.0.1"; - version = "1.0.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/rc/-/rc-1.0.1.tgz"; - name = "rc-1.0.1.tgz"; - sha1 = "f919c25e804cb0aa60f6fd92d929fc86b45013e8"; - }; - deps = { - "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; - "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; - "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3"; - "ini-1.3.3" = self.by-version."ini"."1.3.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."1.0.27-1" = - self.by-version."readable-stream"."1.0.27-1"; - by-version."readable-stream"."1.0.27-1" = self.buildNodePackage { - name = "readable-stream-1.0.27-1"; - version = "1.0.27-1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; - name = "readable-stream-1.0.27-1.tgz"; - sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; - }; - deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."^1.1.12" = - self.by-version."readable-stream"."1.1.13"; - by-version."readable-stream"."1.1.13" = self.buildNodePackage { - name = "readable-stream-1.1.13"; - version = "1.1.13"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; - name = "readable-stream-1.1.13.tgz"; - sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e"; - }; - deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."^1.1.13" = - self.by-version."readable-stream"."1.1.13"; - by-spec."readable-stream"."~1.0.2" = - self.by-version."readable-stream"."1.0.33"; - by-version."readable-stream"."1.0.33" = self.buildNodePackage { - name = "readable-stream-1.0.33"; - version = "1.0.33"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; - name = "readable-stream-1.0.33.tgz"; - sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; - }; - deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."~1.0.26" = - self.by-version."readable-stream"."1.0.33"; - by-spec."reduce-component"."1.0.1" = - self.by-version."reduce-component"."1.0.1"; - by-version."reduce-component"."1.0.1" = self.buildNodePackage { - name = "reduce-component-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; - name = "reduce-component-1.0.1.tgz"; - sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."2.40.0" = - self.by-version."request"."2.40.0"; - by-version."request"."2.40.0" = self.buildNodePackage { - name = "request-2.40.0"; - version = "2.40.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.40.0.tgz"; - name = "request-2.40.0.tgz"; - sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67"; - }; - deps = { - "qs-1.0.2" = self.by-version."qs"."1.0.2"; - "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - }; - optionalDependencies = { - "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; - "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; - "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; - "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."2.x" = - self.by-version."request"."2.55.0"; - by-version."request"."2.55.0" = self.buildNodePackage { - name = "request-2.55.0"; - version = "2.55.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.55.0.tgz"; - name = "request-2.55.0.tgz"; - sha1 = "d75c1cdf679d76bb100f9bffe1fe551b5c24e93d"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "caseless-0.9.0" = self.by-version."caseless"."0.9.0"; - "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1"; - "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; - "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11"; - "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "qs-2.4.2" = self.by-version."qs"."2.4.2"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; - "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0"; - "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; - "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0"; - "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; - "har-validator-1.7.0" = self.by-version."har-validator"."1.7.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."require-directory"."^1.2.0" = - self.by-version."require-directory"."1.2.0"; - by-version."require-directory"."1.2.0" = self.buildNodePackage { - name = "require-directory-1.2.0"; - version = "1.2.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/require-directory/-/require-directory-1.2.0.tgz"; - name = "require-directory-1.2.0.tgz"; - sha1 = "35ff45a82ab73ca6ca35c746c0a17014371e1afd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "require-directory" = self.by-version."require-directory"."1.2.0"; - by-spec."resolve"."0.7.x" = - self.by-version."resolve"."0.7.4"; - by-version."resolve"."0.7.4" = self.buildNodePackage { - name = "resolve-0.7.4"; - version = "0.7.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"; - name = "resolve-0.7.4.tgz"; - sha1 = "395a9ef9e873fbfe12bd14408bd91bb936003d69"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."resolve"."~1.0.0" = - self.by-version."resolve"."1.0.0"; - by-version."resolve"."1.0.0" = self.buildNodePackage { - name = "resolve-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; - name = "resolve-1.0.0.tgz"; - sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."rimraf"."2" = - self.by-version."rimraf"."2.3.3"; - by-version."rimraf"."2.3.3" = self.buildNodePackage { - name = "rimraf-2.3.3"; - version = "2.3.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz"; - name = "rimraf-2.3.3.tgz"; - sha1 = "d0073d8b3010611e8f3ad377b08e9a3c18b98f06"; - }; - deps = { - "glob-4.5.3" = self.by-version."glob"."4.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."rimraf"."~2.2.0" = - self.by-version."rimraf"."2.2.8"; - by-version."rimraf"."2.2.8" = self.buildNodePackage { - name = "rimraf-2.2.8"; - version = "2.2.8"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - name = "rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."rimraf"."~2.3.2" = - self.by-version."rimraf"."2.3.3"; - by-spec."ripple-lib"."^0.12.3" = - self.by-version."ripple-lib"."0.12.4"; - by-version."ripple-lib"."0.12.4" = self.buildNodePackage { - name = "ripple-lib-0.12.4"; - version = "0.12.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ripple-lib/-/ripple-lib-0.12.4.tgz"; - name = "ripple-lib-0.12.4.tgz"; - sha1 = "97675f9ae92bda1397deaaad70a76955d14f91fd"; - }; - deps = { - "async-0.9.0" = self.by-version."async"."0.9.0"; - "bignumber.js-2.0.7" = self.by-version."bignumber.js"."2.0.7"; - "extend-1.2.1" = self.by-version."extend"."1.2.1"; - "lodash-3.8.0" = self.by-version."lodash"."3.8.0"; - "lru-cache-2.5.2" = self.by-version."lru-cache"."2.5.2"; - "ripple-wallet-generator-1.0.3" = self.by-version."ripple-wallet-generator"."1.0.3"; - "ws-0.7.1" = self.by-version."ws"."0.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "ripple-lib" = self.by-version."ripple-lib"."0.12.4"; - by-spec."ripple-lib-transactionparser"."^0.3.2" = - self.by-version."ripple-lib-transactionparser"."0.3.2"; - by-version."ripple-lib-transactionparser"."0.3.2" = self.buildNodePackage { - name = "ripple-lib-transactionparser-0.3.2"; - version = "0.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ripple-lib-transactionparser/-/ripple-lib-transactionparser-0.3.2.tgz"; - name = "ripple-lib-transactionparser-0.3.2.tgz"; - sha1 = "cf85e44f9f623798b68f664244e026956092f874"; - }; - deps = { - "bignumber.js-1.4.1" = self.by-version."bignumber.js"."1.4.1"; - "lodash-3.8.0" = self.by-version."lodash"."3.8.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "ripple-lib-transactionparser" = self.by-version."ripple-lib-transactionparser"."0.3.2"; - by-spec."ripple-wallet-generator"."^1.0.3" = - self.by-version."ripple-wallet-generator"."1.0.3"; - by-version."ripple-wallet-generator"."1.0.3" = self.buildNodePackage { - name = "ripple-wallet-generator-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ripple-wallet-generator/-/ripple-wallet-generator-1.0.3.tgz"; - name = "ripple-wallet-generator-1.0.3.tgz"; - sha1 = "2a1f0f6e2a39998fcf8fa89a55cb5c999cdb86ca"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."samsam"."~1.1" = - self.by-version."samsam"."1.1.2"; - by-version."samsam"."1.1.2" = self.buildNodePackage { - name = "samsam-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz"; - name = "samsam-1.1.2.tgz"; - sha1 = "bec11fdc83a9fda063401210e40176c3024d1567"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."semver"."~4.3.2" = - self.by-version."semver"."4.3.4"; - by-version."semver"."4.3.4" = self.buildNodePackage { - name = "semver-4.3.4"; - version = "4.3.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-4.3.4.tgz"; - name = "semver-4.3.4.tgz"; - sha1 = "bf43a1aae304de040e12a13f84200ca7aeab7589"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."send"."0.12.2" = - self.by-version."send"."0.12.2"; - by-version."send"."0.12.2" = self.buildNodePackage { - name = "send-0.12.2"; - version = "0.12.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.12.2.tgz"; - name = "send-0.12.2.tgz"; - sha1 = "ba6785e47ab41aa0358b9da401ab22ff0f58eab6"; - }; - deps = { - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "mime-1.3.4" = self.by-version."mime"."1.3.4"; - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."serve-static"."~1.9.2" = - self.by-version."serve-static"."1.9.2"; - by-version."serve-static"."1.9.2" = self.buildNodePackage { - name = "serve-static-1.9.2"; - version = "1.9.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.2.tgz"; - name = "serve-static-1.9.2.tgz"; - sha1 = "069fa32453557b218ec2e39140c82d8905d5672c"; - }; - deps = { - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "send-0.12.2" = self.by-version."send"."0.12.2"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sigmund"."~1.0.0" = - self.by-version."sigmund"."1.0.0"; - by-version."sigmund"."1.0.0" = self.buildNodePackage { - name = "sigmund-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; - name = "sigmund-1.0.0.tgz"; - sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sinon".">=1.4.0 <2" = - self.by-version."sinon"."1.14.1"; - by-version."sinon"."1.14.1" = self.buildNodePackage { - name = "sinon-1.14.1"; - version = "1.14.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sinon/-/sinon-1.14.1.tgz"; - name = "sinon-1.14.1.tgz"; - sha1 = "d82797841918734507c94b7a73e3f560904578ad"; - }; - deps = { - "formatio-1.1.1" = self.by-version."formatio"."1.1.1"; - "util-0.10.3" = self.by-version."util"."0.10.3"; - "lolex-1.1.0" = self.by-version."lolex"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sinon"."~1.10.0" = - self.by-version."sinon"."1.10.3"; - by-version."sinon"."1.10.3" = self.buildNodePackage { - name = "sinon-1.10.3"; - version = "1.10.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz"; - name = "sinon-1.10.3.tgz"; - sha1 = "c063e0e99d8327dc199113aab52eb83a2e9e3c2c"; - }; - deps = { - "formatio-1.0.2" = self.by-version."formatio"."1.0.2"; - "util-0.10.3" = self.by-version."util"."0.10.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "sinon" = self.by-version."sinon"."1.10.3"; - by-spec."sinon-chai"."^2.5.0" = - self.by-version."sinon-chai"."2.7.0"; - by-version."sinon-chai"."2.7.0" = self.buildNodePackage { - name = "sinon-chai-2.7.0"; - version = "2.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sinon-chai/-/sinon-chai-2.7.0.tgz"; - name = "sinon-chai-2.7.0.tgz"; - sha1 = "493df3a3d758933fdd3678d011a4f738d5e72540"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = [ - self.by-version."chai"."2.3.0" - self.by-version."sinon"."1.14.1"]; - os = [ ]; - cpu = [ ]; - }; - "sinon-chai" = self.by-version."sinon-chai"."2.7.0"; - by-spec."sntp"."0.2.x" = - self.by-version."sntp"."0.2.4"; - by-version."sntp"."0.2.4" = self.buildNodePackage { - name = "sntp-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - name = "sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }; - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sntp"."1.x.x" = - self.by-version."sntp"."1.0.9"; - by-version."sntp"."1.0.9" = self.buildNodePackage { - name = "sntp-1.0.9"; - version = "1.0.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - name = "sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - deps = { - "hoek-2.13.0" = self.by-version."hoek"."2.13.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."source-map"."~0.1.33" = - self.by-version."source-map"."0.1.43"; - by-version."source-map"."0.1.43" = self.buildNodePackage { - name = "source-map-0.1.43"; - version = "0.1.43"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; - name = "source-map-0.1.43.tgz"; - sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; - }; - deps = { - "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."source-map"."~0.1.7" = - self.by-version."source-map"."0.1.43"; - by-spec."sprintf-js"."~1.0.2" = - self.by-version."sprintf-js"."1.0.2"; - by-version."sprintf-js"."1.0.2" = self.buildNodePackage { - name = "sprintf-js-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz"; - name = "sprintf-js-1.0.2.tgz"; - sha1 = "11e4d84ff32144e35b0bf3a66f8587f38d8f9978"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sqlite3"."^3.0.2" = - self.by-version."sqlite3"."3.0.8"; - by-version."sqlite3"."3.0.8" = self.buildNodePackage { - name = "sqlite3-3.0.8"; - version = "3.0.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sqlite3/-/sqlite3-3.0.8.tgz"; - name = "sqlite3-3.0.8.tgz"; - sha1 = "662d6507426ba2af0cdaf894a1766c8099c0e435"; - }; - deps = { - "nan-1.8.4" = self.by-version."nan"."1.8.4"; - "node-pre-gyp-0.6.7" = self.by-version."node-pre-gyp"."0.6.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "sqlite3" = self.by-version."sqlite3"."3.0.8"; - by-spec."stack-trace"."0.0.x" = - self.by-version."stack-trace"."0.0.9"; - by-version."stack-trace"."0.0.9" = self.buildNodePackage { - name = "stack-trace-0.0.9"; - version = "0.0.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - name = "stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string_decoder"."~0.10.x" = - self.by-version."string_decoder"."0.10.31"; - by-version."string_decoder"."0.10.31" = self.buildNodePackage { - name = "string_decoder-0.10.31"; - version = "0.10.31"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - name = "string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stringstream"."~0.0.4" = - self.by-version."stringstream"."0.0.4"; - by-version."stringstream"."0.0.4" = self.buildNodePackage { - name = "stringstream-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"; - name = "stringstream-0.0.4.tgz"; - sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."strip-ansi"."^0.3.0" = - self.by-version."strip-ansi"."0.3.0"; - by-version."strip-ansi"."0.3.0" = self.buildNodePackage { - name = "strip-ansi-0.3.0"; - version = "0.3.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"; - name = "strip-ansi-0.3.0.tgz"; - sha1 = "25f48ea22ca79187f3174a4db8759347bb126220"; - }; - deps = { - "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."strip-ansi"."^2.0.1" = - self.by-version."strip-ansi"."2.0.1"; - by-version."strip-ansi"."2.0.1" = self.buildNodePackage { - name = "strip-ansi-2.0.1"; - version = "2.0.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"; - name = "strip-ansi-2.0.1.tgz"; - sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"; - }; - deps = { - "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."strip-json-comments"."0.1.x" = - self.by-version."strip-json-comments"."0.1.3"; - by-version."strip-json-comments"."0.1.3" = self.buildNodePackage { - name = "strip-json-comments-0.1.3"; - version = "0.1.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"; - name = "strip-json-comments-0.1.3.tgz"; - sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."superagent"."0.18.0" = - self.by-version."superagent"."0.18.0"; - by-version."superagent"."0.18.0" = self.buildNodePackage { - name = "superagent-0.18.0"; - version = "0.18.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.18.0.tgz"; - name = "superagent-0.18.0.tgz"; - sha1 = "9d4375a3ae2c4fbd55fd20d5b12a2470d2fc8f62"; - }; - deps = { - "qs-0.6.6" = self.by-version."qs"."0.6.6"; - "formidable-1.0.14" = self.by-version."formidable"."1.0.14"; - "mime-1.2.5" = self.by-version."mime"."1.2.5"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "methods-0.0.1" = self.by-version."methods"."0.0.1"; - "cookiejar-1.3.2" = self.by-version."cookiejar"."1.3.2"; - "debug-0.7.4" = self.by-version."debug"."0.7.4"; - "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1"; - "extend-1.2.1" = self.by-version."extend"."1.2.1"; - "form-data-0.1.2" = self.by-version."form-data"."0.1.2"; - "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."supertest"."^0.13.0" = - self.by-version."supertest"."0.13.0"; - by-version."supertest"."0.13.0" = self.buildNodePackage { - name = "supertest-0.13.0"; - version = "0.13.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/supertest/-/supertest-0.13.0.tgz"; - name = "supertest-0.13.0.tgz"; - sha1 = "4892bafd9beaa9bbcc95fd5a9f04949aef1ce06f"; - }; - deps = { - "superagent-0.18.0" = self.by-version."superagent"."0.18.0"; - "methods-1.0.0" = self.by-version."methods"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "supertest" = self.by-version."supertest"."0.13.0"; - by-spec."supports-color"."^0.2.0" = - self.by-version."supports-color"."0.2.0"; - by-version."supports-color"."0.2.0" = self.buildNodePackage { - name = "supports-color-0.2.0"; - version = "0.2.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"; - name = "supports-color-0.2.0.tgz"; - sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."supports-color"."^1.3.0" = - self.by-version."supports-color"."1.3.1"; - by-version."supports-color"."1.3.1" = self.buildNodePackage { - name = "supports-color-1.3.1"; - version = "1.3.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"; - name = "supports-color-1.3.1.tgz"; - sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."supports-color"."~1.2.0" = - self.by-version."supports-color"."1.2.1"; - by-version."supports-color"."1.2.1" = self.buildNodePackage { - name = "supports-color-1.2.1"; - version = "1.2.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz"; - name = "supports-color-1.2.1.tgz"; - sha1 = "12ee21507086cd98c1058d9ec0f4ac476b7af3b2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tar"."~0.1.17" = - self.by-version."tar"."0.1.20"; - by-version."tar"."0.1.20" = self.buildNodePackage { - name = "tar-0.1.20"; - version = "0.1.20"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; - name = "tar-0.1.20.tgz"; - sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; - }; - deps = { - "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; - "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tar"."~2.1.0" = - self.by-version."tar"."2.1.1"; - by-version."tar"."2.1.1" = self.buildNodePackage { - name = "tar-2.1.1"; - version = "2.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tar/-/tar-2.1.1.tgz"; - name = "tar-2.1.1.tgz"; - sha1 = "ac0649e135fa4546e430c7698514e1da2e8a7cc4"; - }; - deps = { - "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; - "fstream-1.0.6" = self.by-version."fstream"."1.0.6"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tar-pack"."~2.0.0" = - self.by-version."tar-pack"."2.0.0"; - by-version."tar-pack"."2.0.0" = self.buildNodePackage { - name = "tar-pack-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz"; - name = "tar-pack-2.0.0.tgz"; - sha1 = "c2c401c02dd366138645e917b3a6baa256a9dcab"; - }; - deps = { - "uid-number-0.0.3" = self.by-version."uid-number"."0.0.3"; - "once-1.1.1" = self.by-version."once"."1.1.1"; - "debug-0.7.4" = self.by-version."debug"."0.7.4"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; - "tar-0.1.20" = self.by-version."tar"."0.1.20"; - "fstream-ignore-0.0.7" = self.by-version."fstream-ignore"."0.0.7"; - "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; - }; - optionalDependencies = { - "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tildify"."~1.0.0" = - self.by-version."tildify"."1.0.0"; - by-version."tildify"."1.0.0" = self.buildNodePackage { - name = "tildify-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz"; - name = "tildify-1.0.0.tgz"; - sha1 = "2a021db5e8fbde0a8f8b4df37adaa8fb1d39d7dd"; - }; - deps = { - "user-home-1.1.1" = self.by-version."user-home"."1.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tinycolor"."0.x" = - self.by-version."tinycolor"."0.0.1"; - by-version."tinycolor"."0.0.1" = self.buildNodePackage { - name = "tinycolor-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; - name = "tinycolor-0.0.1.tgz"; - sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."1.1.0"; - by-version."tough-cookie"."1.1.0" = self.buildNodePackage { - name = "tough-cookie-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"; - name = "tough-cookie-1.1.0.tgz"; - sha1 = "126d2490e66ae5286b6863debd4a341076915954"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tunnel-agent"."~0.4.0" = - self.by-version."tunnel-agent"."0.4.0"; - by-version."tunnel-agent"."0.4.0" = self.buildNodePackage { - name = "tunnel-agent-0.4.0"; - version = "0.4.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"; - name = "tunnel-agent-0.4.0.tgz"; - sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."type-detect"."0.1.1" = - self.by-version."type-detect"."0.1.1"; - by-version."type-detect"."0.1.1" = self.buildNodePackage { - name = "type-detect-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"; - name = "type-detect-0.1.1.tgz"; - sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."type-is"."~1.6.1" = - self.by-version."type-is"."1.6.2"; - by-version."type-is"."1.6.2" = self.buildNodePackage { - name = "type-is-1.6.2"; - version = "1.6.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.6.2.tgz"; - name = "type-is-1.6.2.tgz"; - sha1 = "694e83e5d110417e681cea278227f264ae406e33"; - }; - deps = { - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."type-is"."~1.6.2" = - self.by-version."type-is"."1.6.2"; - by-spec."uglify-js"."~2.3" = - self.by-version."uglify-js"."2.3.6"; - by-version."uglify-js"."2.3.6" = self.buildNodePackage { - name = "uglify-js-2.3.6"; - version = "2.3.6"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; - name = "uglify-js-2.3.6.tgz"; - sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; - }; - deps = { - "async-0.2.10" = self.by-version."async"."0.2.10"; - "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; - "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."uid-number"."0.0.3" = - self.by-version."uid-number"."0.0.3"; - by-version."uid-number"."0.0.3" = self.buildNodePackage { - name = "uid-number-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"; - name = "uid-number-0.0.3.tgz"; - sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ultron"."1.0.x" = - self.by-version."ultron"."1.0.1"; - by-version."ultron"."1.0.1" = self.buildNodePackage { - name = "ultron-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz"; - name = "ultron-1.0.1.tgz"; - sha1 = "c9d8d86c9cf2823028eb45629ab725897dd65dc5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."~1.7.0" = - self.by-version."underscore"."1.7.0"; - by-version."underscore"."1.7.0" = self.buildNodePackage { - name = "underscore-1.7.0"; - version = "1.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; - name = "underscore-1.7.0.tgz"; - sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore.string"."~2.4.0" = - self.by-version."underscore.string"."2.4.0"; - by-version."underscore.string"."2.4.0" = self.buildNodePackage { - name = "underscore.string-2.4.0"; - version = "2.4.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; - name = "underscore.string-2.4.0.tgz"; - sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."user-home"."^1.0.0" = - self.by-version."user-home"."1.1.1"; - by-version."user-home"."1.1.1" = self.buildNodePackage { - name = "user-home-1.1.1"; - version = "1.1.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"; - name = "user-home-1.1.1.tgz"; - sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."utf-8-validate"."1.0.x" = - self.by-version."utf-8-validate"."1.0.1"; - by-version."utf-8-validate"."1.0.1" = self.buildNodePackage { - name = "utf-8-validate-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.0.1.tgz"; - name = "utf-8-validate-1.0.1.tgz"; - sha1 = "d15eb67e28f6bb93c9401eeb7eac7030a183e8d1"; - }; - deps = { - "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-1.6.2" = self.by-version."nan"."1.6.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."util".">=0.10.3 <1" = - self.by-version."util"."0.10.3"; - by-version."util"."0.10.3" = self.buildNodePackage { - name = "util-0.10.3"; - version = "0.10.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz"; - name = "util-0.10.3.tgz"; - sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."utils-merge"."1.0.0" = - self.by-version."utils-merge"."1.0.0"; - by-version."utils-merge"."1.0.0" = self.buildNodePackage { - name = "utils-merge-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - name = "utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."vary"."~1.0.0" = - self.by-version."vary"."1.0.0"; - by-version."vary"."1.0.0" = self.buildNodePackage { - name = "vary-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz"; - name = "vary-1.0.0.tgz"; - sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."when"."~3.4.6" = - self.by-version."when"."3.4.6"; - by-version."when"."3.4.6" = self.buildNodePackage { - name = "when-3.4.6"; - version = "3.4.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/when/-/when-3.4.6.tgz"; - name = "when-3.4.6.tgz"; - sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."which"."1.0.x" = - self.by-version."which"."1.0.9"; - by-version."which"."1.0.9" = self.buildNodePackage { - name = "which-1.0.9"; - version = "1.0.9"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/which/-/which-1.0.9.tgz"; - name = "which-1.0.9.tgz"; - sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."winston"."^1.0.0" = - self.by-version."winston"."1.0.0"; - by-version."winston"."1.0.0" = self.buildNodePackage { - name = "winston-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-1.0.0.tgz"; - name = "winston-1.0.0.tgz"; - sha1 = "30e36e0041fc0a864b0029565719e4dc41d026a4"; - }; - deps = { - "async-0.9.0" = self.by-version."async"."0.9.0"; - "colors-1.0.3" = self.by-version."colors"."1.0.3"; - "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; - "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; - "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; - "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "winston" = self.by-version."winston"."1.0.0"; - by-spec."wordwrap"."0.0.x" = - self.by-version."wordwrap"."0.0.3"; - by-version."wordwrap"."0.0.3" = self.buildNodePackage { - name = "wordwrap-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - name = "wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."wordwrap".">=0.0.2" = - self.by-version."wordwrap"."1.0.0"; - by-version."wordwrap"."1.0.0" = self.buildNodePackage { - name = "wordwrap-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; - name = "wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."wordwrap"."~0.0.2" = - self.by-version."wordwrap"."0.0.3"; - by-spec."wrappy"."1" = - self.by-version."wrappy"."1.0.1"; - by-version."wrappy"."1.0.1" = self.buildNodePackage { - name = "wrappy-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"; - name = "wrappy-1.0.1.tgz"; - sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ws"."^0.4.32" = - self.by-version."ws"."0.4.32"; - by-version."ws"."0.4.32" = self.buildNodePackage { - name = "ws-0.4.32"; - version = "0.4.32"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; - name = "ws-0.4.32.tgz"; - sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; - }; - deps = { - "commander-2.1.0" = self.by-version."commander"."2.1.0"; - "nan-1.0.0" = self.by-version."nan"."1.0.0"; - "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1"; - "options-0.0.6" = self.by-version."options"."0.0.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "ws" = self.by-version."ws"."0.4.32"; - by-spec."ws"."~0.7.1" = - self.by-version."ws"."0.7.1"; - by-version."ws"."0.7.1" = self.buildNodePackage { - name = "ws-0.7.1"; - version = "0.7.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ws/-/ws-0.7.1.tgz"; - name = "ws-0.7.1.tgz"; - sha1 = "8f1c7864ca08081be3cd0ac330df0d29c5fcd0da"; - }; - deps = { - "options-0.0.6" = self.by-version."options"."0.0.6"; - "ultron-1.0.1" = self.by-version."ultron"."1.0.1"; - }; - optionalDependencies = { - "bufferutil-1.0.1" = self.by-version."bufferutil"."1.0.1"; - "utf-8-validate-1.0.1" = self.by-version."utf-8-validate"."1.0.1"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xtend"."^4.0.0" = - self.by-version."xtend"."4.0.0"; - by-version."xtend"."4.0.0" = self.buildNodePackage { - name = "xtend-4.0.0"; - version = "4.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"; - name = "xtend-4.0.0.tgz"; - sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} diff --git a/pkgs/servers/roadrunner/default.nix b/pkgs/servers/roadrunner/default.nix index 531dfb9b7ee5e..bfe716b5aa513 100644 --- a/pkgs/servers/roadrunner/default.nix +++ b/pkgs/servers/roadrunner/default.nix @@ -30,8 +30,8 @@ buildGoModule rec { postInstall = '' installShellCompletion --cmd rr \ --bash <($out/bin/rr completion bash) \ - --zsh <($out/bin/rr zsh) \ - --fish <($out/bin/rr fish) + --zsh <($out/bin/rr completion zsh) \ + --fish <($out/bin/rr completion fish) ''; postPatch = '' diff --git a/pkgs/servers/roapi/http.nix b/pkgs/servers/roapi/http.nix index 019c979b47a21..8c0dc4ee59f24 100644 --- a/pkgs/servers/roapi/http.nix +++ b/pkgs/servers/roapi/http.nix @@ -5,7 +5,7 @@ let pname = "roapi-http"; version = "0.6.0"; - target = lib.optionalString stdenv.isDarwin "apple-darwin"; + target = lib.optionalString stdenv.hostPlatform.isDarwin "apple-darwin"; in # TODO build from source, currently compilation fails on darwin on snmalloc with # ./mem/../ds/../pal/pal_apple.h:277:64: error: use of undeclared identifier 'kCCSuccess' diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 84e75f90c4423..0fa88aa91a5e0 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1442"; + version = "2.0-1462"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-D6Xdij92bDUchkSTT9/ADaNALqCyYwL9EnLqma48alg="; + hash = "sha256-irTDjT9oN0CdxFKAgcHbL2grJ702E6H+WtifGh0pf0E="; }; dontConfigure = true; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 646379e3e6415..db49d376c62d1 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.8"; + version = "1.6.9"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-hGi+AgSnNMV0re9L4BV4x9xPq5wv40ADvzQaK9IO/So="; + sha256 = "sha256-thpfXCL4kMKZ6TWqz88IcGdpkNiuv/DWzf8HW/F8708="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/servers/rpiplay/default.nix b/pkgs/servers/rpiplay/default.nix index 90f773c73db15..8ca4cb5341971 100644 --- a/pkgs/servers/rpiplay/default.nix +++ b/pkgs/servers/rpiplay/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/FD-/RPiPlay"; description = "Open-source implementation of an AirPlay mirroring server"; license = licenses.gpl3Plus; diff --git a/pkgs/servers/rtrtr/default.nix b/pkgs/servers/rtrtr/default.nix index fa5b4a30c63ad..3697043c246e2 100644 --- a/pkgs/servers/rtrtr/default.nix +++ b/pkgs/servers/rtrtr/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ToJLE4nqgTqg5D4Qh2zi+wjmcdwDo0aupoDwKJCTwnM="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; buildNoDefaultFeatures = true; diff --git a/pkgs/servers/rustdesk-server/default.nix b/pkgs/servers/rustdesk-server/default.nix index 14cc9afcf484f..3b6ddf3bb1ecc 100644 --- a/pkgs/servers/rustdesk-server/default.nix +++ b/pkgs/servers/rustdesk-server/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libsodium sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index 97fdacecb9db8..f0a1fc8c3b9c1 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-b9KZzevaTl52pduN4gkF8k6yqgDcE8x5sOwmPxzYfWA="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index e2a9345d4c077..1e0f60224b5fc 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -45,9 +45,9 @@ , enableRegedit ? true, ncurses , enableCephFS ? false, ceph , enableGlusterFS ? false, glusterfs, libuuid -, enableAcl ? (!stdenv.isDarwin), acl -, enableLibunwind ? (!stdenv.isDarwin), libunwind -, enablePam ? (!stdenv.isDarwin), pam +, enableAcl ? (!stdenv.hostPlatform.isDarwin), acl +, enableLibunwind ? (!stdenv.hostPlatform.isDarwin), libunwind +, enablePam ? (!stdenv.hostPlatform.isDarwin), pam }: let @@ -100,10 +100,10 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_45 cmocka rpcsvc-proto - ] ++ optionals stdenv.isLinux [ + ] ++ optionals stdenv.hostPlatform.isLinux [ buildPackages.stdenv.cc ] ++ optional (stdenv.buildPlatform != stdenv.hostPlatform) samba # asn1_compile/compile_et - ++ optionals stdenv.isDarwin [ + ++ optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; @@ -124,16 +124,16 @@ stdenv.mkDerivation (finalAttrs: { libtasn1 tdb libxcrypt - ] ++ optionals stdenv.isLinux [ liburing systemd ] - ++ optionals stdenv.isDarwin [ libiconv ] + ] ++ optionals stdenv.hostPlatform.isLinux [ liburing systemd ] + ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ optionals enableLDAP [ openldap.dev python3Packages.markdown ] - ++ optionals (!enableLDAP && stdenv.isLinux) [ ldb talloc tevent ] - ++ optional (enablePrinting && stdenv.isLinux) cups + ++ optionals (!enableLDAP && stdenv.hostPlatform.isLinux) [ ldb talloc tevent ] + ++ optional (enablePrinting && stdenv.hostPlatform.isLinux) cups ++ optional enableMDNS avahi ++ optionals enableDomainController [ gpgme lmdb python3Packages.dnspython ] ++ optional enableRegedit ncurses - ++ optional (enableCephFS && stdenv.isLinux) (lib.getDev ceph) - ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] + ++ optional (enableCephFS && stdenv.hostPlatform.isLinux) (lib.getDev ceph) + ++ optionals (enableGlusterFS && stdenv.hostPlatform.isLinux) [ glusterfs libuuid ] ++ optional enableAcl acl ++ optional enableLibunwind libunwind ++ optional enablePam pam; @@ -165,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" - ] ++ optionals (!enableLDAP && stdenv.isLinux) [ + ] ++ optionals (!enableLDAP && stdenv.hostPlatform.isLinux) [ "--bundled-libraries=!ldb,!pyldb-util!talloc,!pytalloc-util,!tevent,!tdb,!pytdb" ] ++ optional enableLibunwind "--with-libunwind" ++ optional enableProfiling "--with-profiling-data" @@ -212,12 +212,12 @@ stdenv.mkDerivation (finalAttrs: { read -r -d "" SCRIPT << EOF || true [ -z "\$SAMBA_LIBS" ] && exit 1; BIN='{}'; - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' OLD_LIBS="\$(patchelf --print-rpath "\$BIN" 2>/dev/null | tr ':' '\n')"; ALL_LIBS="\$(echo -e "\$SAMBA_LIBS\n\$OLD_LIBS" | sort | uniq | tr '\n' ':')"; patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?; patchelf --shrink-rpath "\$BIN"; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id \$BIN \$BIN for old_rpath in \$(otool -L \$BIN | grep /private/tmp/ | awk '{print \$1}'); do new_rpath=\$(find \$SAMBA_LIBS -name \$(basename \$old_rpath) | head -n 1) diff --git a/pkgs/servers/seafile-server/default.nix b/pkgs/servers/seafile-server/default.nix deleted file mode 100644 index 109484c467b4d..0000000000000 --- a/pkgs/servers/seafile-server/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, python3 -, autoreconfHook -, libuuid -, sqlite -, glib -, libevent -, libsearpc -, openssl -, fuse -, libarchive -, libjwt -, curl -, which -, vala -, cmake -, oniguruma -, nixosTests -}: - -let - # seafile-server relies on a specific version of libevhtp. - # It contains non upstreamed patches and is forked off an outdated version. - libevhtp = import ./libevhtp.nix { - inherit stdenv lib fetchFromGitHub cmake libevent; - }; -in -stdenv.mkDerivation rec { - pname = "seafile-server"; - version = "10.0.1"; - - src = fetchFromGitHub { - owner = "haiwen"; - repo = "seafile-server"; - rev = "db09baec1b88fc131bf4453a808ab63a3fc714c9"; # using a fixed revision because upstream may re-tag releases :/ - sha256 = "sha256-a5vtJcbnaYzq6/3xmhbWk23BZ+Wil/Tb/q22ML4bDqs="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ - libuuid - sqlite - openssl - glib - libsearpc - libevent - python3 - fuse - libarchive - libjwt - curl - which - vala - libevhtp - oniguruma - ]; - - postInstall = '' - mkdir -p $out/share/seafile/sql - cp -r scripts/sql $out/share/seafile - ''; - - passthru.tests = { - inherit (nixosTests) seafile; - }; - - meta = with lib; { - description = "File syncing and sharing software with file encryption and group sharing, emphasis on reliability and high performance"; - homepage = "https://github.com/haiwen/seafile-server"; - license = licenses.agpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ greizgh schmittlauch ]; - }; -} diff --git a/pkgs/servers/search/lnx/default.nix b/pkgs/servers/search/lnx/default.nix index 447602b0463fd..7cda5d44c4423 100644 --- a/pkgs/servers/search/lnx/default.nix +++ b/pkgs/servers/search/lnx/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { "compose-0.1.0" = "sha256-zcniGI3wa+gI3jFTDqHcesX+6hAtNEbW81ABPUcFTXk="; }; }; - buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration Foundation ]; meta = with lib; { description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants."; mainProgram = "lnx"; diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index cbb4400869762..a58af212b20a5 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index 38488c0b68272..4177c8a2e5708 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.16.0"; + version = "2.17.0"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-7QuyNJnTig472I+Ll1shWmQ2YoWFAKwFYw4pK+BvZbI="; + hash = "sha256-I5CI9t5jsayE58O3lGRLQ2zj5lClWldKNsPBS4tNtfs="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/search/qdrant/Cargo.lock b/pkgs/servers/search/qdrant/Cargo.lock index 493bd645969b0..f5f5807efaef4 100644 --- a/pkgs/servers/search/qdrant/Cargo.lock +++ b/pkgs/servers/search/qdrant/Cargo.lock @@ -465,13 +465,13 @@ checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "api" -version = "1.11.2" +version = "1.11.5" dependencies = [ "chrono", "common", @@ -548,9 +548,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", @@ -740,7 +740,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.48", ] @@ -830,6 +830,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "borsh" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +dependencies = [ + "cfg_aliases", +] + [[package]] name = "brotli" version = "6.0.0" @@ -859,9 +868,9 @@ checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "bytemuck" -version = "1.12.3" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -912,9 +921,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.15" +version = "1.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800" dependencies = [ "jobserver", "libc", @@ -1066,9 +1075,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive 4.5.13", @@ -1076,9 +1085,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -1161,7 +1170,7 @@ dependencies = [ "fs_extra", "futures", "hashring", - "indexmap 2.4.0", + "indexmap 2.5.0", "indicatif", "io", "issues", @@ -1226,13 +1235,15 @@ dependencies = [ "common", "criterion", "lazy_static", - "memmap2 0.9.4", + "log", + "memmap2 0.9.5", "num_cpus", "ordered-float 4.2.2", "ph", "rand 0.8.5", "semver", "serde", + "tar", "tempfile", "thiserror", "thread-priority", @@ -1343,9 +1354,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" @@ -1434,7 +1445,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.16", + "clap 4.5.17", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1622,9 +1633,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1661,9 +1672,9 @@ dependencies = [ [[package]] name = "delegate" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +checksum = "5060bb0febb73fa907273f8a7ed17ab4bf831d585eac835b28ec24a1e2460956" dependencies = [ "proc-macro2", "quote", @@ -2302,7 +2313,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.9", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -2321,7 +2332,7 @@ dependencies = [ "futures-sink", "futures-util", "http 1.0.0", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -2601,7 +2612,7 @@ dependencies = [ "http 1.0.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-native-certs", "rustls-pki-types", "tokio", @@ -2714,9 +2725,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.2", @@ -2743,7 +2754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abfb2e51b23c338595ae0b6bdaaa7a4a8b860b8d788a4331cb07b50fe5dea71b" dependencies = [ "ahash", - "indexmap 2.4.0", + "indexmap 2.5.0", "is-terminal", "itoa", "log", @@ -3501,9 +3512,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -3523,7 +3534,7 @@ version = "0.0.0" dependencies = [ "bitvec", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "parking_lot", "rand 0.8.5", "serde", @@ -3777,6 +3788,15 @@ dependencies = [ "libc", ] +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -4561,7 +4581,7 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.11.2" +version = "1.11.5" dependencies = [ "actix-cors", "actix-files", @@ -4573,13 +4593,13 @@ dependencies = [ "api", "cancel", "chrono", - "clap 4.5.16", + "clap 4.5.17", "collection", "colored", "common", "config", "console-subscriber", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", "futures", "futures-util", "issues", @@ -4597,7 +4617,7 @@ dependencies = [ "rand 0.8.5", "reqwest 0.12.7", "rstack-self", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pemfile 2.1.3", "rustls-pki-types", "rusty-hook", @@ -4618,7 +4638,7 @@ dependencies = [ "tokio", "tonic 0.11.0", "tonic-reflection", - "tower 0.5.0", + "tower 0.5.1", "tower-layer", "tracing", "tracing-log", @@ -4632,15 +4652,17 @@ dependencies = [ [[package]] name = "quantization" version = "0.1.0" -source = "git+https://github.com/qdrant/quantization.git#0caf67d96f022a792bda2e41fa878ba1e113113f" dependencies = [ "cc", + "criterion", "num-traits", + "num_threads", "permutation_iterator", "rand 0.8.5", "rayon", "serde", "serde_json", + "tempfile", ] [[package]] @@ -4678,8 +4700,8 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", - "rustls 0.23.12", + "rustc-hash 1.1.0", + "rustls 0.23.13", "thiserror", "tokio", "tracing", @@ -4687,15 +4709,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.3" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand 0.8.5", "ring 0.17.5", - "rustc-hash", - "rustls 0.23.12", + "rustc-hash 2.0.0", + "rustls 0.23.13", "slab", "thiserror", "tinyvec", @@ -5008,7 +5030,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-native-certs", "rustls-pemfile 2.1.3", "rustls-pki-types", @@ -5031,9 +5053,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.34" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3603b7d71ca82644f79b5a06d1220e9a58ede60bd32255f698cb1af8838b8db3" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -5219,6 +5241,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -5276,22 +5304,22 @@ dependencies = [ "log", "ring 0.17.5", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "log", "once_cell", "ring 0.17.5", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] @@ -5346,9 +5374,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring 0.17.5", "rustls-pki-types", @@ -5439,7 +5467,7 @@ dependencies = [ "chrono", "dyn-clone", "indexmap 1.9.2", - "indexmap 2.4.0", + "indexmap 2.5.0", "schemars_derive", "serde", "serde_json", @@ -5571,7 +5599,7 @@ dependencies = [ "geohash", "half 2.4.1", "http 1.0.0", - "indexmap 2.4.0", + "indexmap 2.5.0", "indicatif", "io", "io-uring", @@ -5580,7 +5608,7 @@ dependencies = [ "itertools 0.13.0", "log", "macro_rules_attribute", - "memmap2 0.9.4", + "memmap2 0.9.5", "memory", "nom", "num-cmp", @@ -5636,9 +5664,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -5676,9 +5704,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -5698,11 +5726,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "itoa", "memchr", "ryu", @@ -5899,10 +5927,11 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smol_str" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +checksum = "66eaf762c5af19db3108300515c8aa7a50efc90ff745f4c62288052ebf9fdd25" dependencies = [ + "borsh", "serde", ] @@ -5972,7 +6001,7 @@ dependencies = [ "indicatif", "io", "itertools 0.13.0", - "memmap2 0.9.4", + "memmap2 0.9.5", "memory", "ordered-float 4.2.2", "parking_lot", @@ -6173,9 +6202,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.31.3" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b92e0bdf838cbc1c4c9ba14f9c97a7ec6cdcd1ae66b10e1e42775a25553f45d" +checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" dependencies = [ "core-foundation-sys", "libc", @@ -6215,8 +6244,7 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" version = "0.4.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +source = "git+https://github.com/qdrant/tar-rs?branch=main#856dbd090eede1736604f23cfe99a104b5639734" dependencies = [ "filetime", "libc", @@ -6399,9 +6427,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -6464,7 +6492,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "tokio", ] @@ -6482,9 +6510,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -6529,7 +6557,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", @@ -6645,9 +6673,9 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b837f86b25d7c0d7988f00a54e74739be6477f2aac6201b8f429a7569991b7" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ "futures-core", "futures-util", @@ -6665,9 +6693,9 @@ checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -6909,7 +6937,7 @@ dependencies = [ "once_cell", "rustls 0.22.4", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.8", "url", "webpki-roots 0.26.1", ] @@ -7017,7 +7045,7 @@ dependencies = [ "env_logger", "fs4", "log", - "memmap2 0.9.4", + "memmap2 0.9.5", "rand 0.8.5", "rand_distr", "rustix 0.38.31", diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index a55e5192f01d5..0ccdf1092e425 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -13,19 +13,19 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.11.2"; + version = "1.11.5"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ngDxabfs5cPu04Hn1V10qF1ryi100jzp5MmvPrkOD3k="; + sha256 = "sha256-yE7/xnAf0U9BpEEmtgXSH+EerUB20KeFePavuGW08f0="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "quantization-0.1.0" = "sha256-xqcwn9NmCKEulh4CTV6bwhPOlDgQt8EZaQbqdDjxgNA="; + "tar-0.4.41" = "sha256-32n96yoGbDzhgVZvISLGwxHuv7PGtxde5ma/YlsR1Gg="; "wal-0.1.2" = "sha256-QcyS0v7O1BziVT3oahebpq+u4l5JGaujCaRIPdmsJl4="; }; }; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/servers/search/quickwit/Cargo.lock b/pkgs/servers/search/quickwit/Cargo.lock index db5e22e698f2f..6d48db37fa128 100644 --- a/pkgs/servers/search/quickwit/Cargo.lock +++ b/pkgs/servers/search/quickwit/Cargo.lock @@ -8225,9 +8225,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -8258,9 +8258,9 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", diff --git a/pkgs/servers/search/quickwit/default.nix b/pkgs/servers/search/quickwit/default.nix index ccc32cb90056e..8dbb25398bc1a 100644 --- a/pkgs/servers/search/quickwit/default.nix +++ b/pkgs/servers/search/quickwit/default.nix @@ -71,6 +71,7 @@ rustPlatform.buildRustPackage rec { --replace-fail '.with_protos' '.with_includes(&["."]).with_protos' substituteInPlace ./quickwit-proto/build.rs \ --replace-fail '.with_protos' '.with_includes(&["."]).with_protos' + cp /build/cargo-vendor-dir/Cargo.lock /build/source/quickwit/Cargo.lock ''; sourceRoot = "${src.name}/quickwit"; @@ -82,7 +83,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/servers/search/sonic-server/default.nix deleted file mode 100644 index cb5521e9dfe8a..0000000000000 --- a/pkgs/servers/search/sonic-server/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, nix-update-script -, nixosTests -, testers -, sonic-server -}: - -rustPlatform.buildRustPackage rec { - pname = "sonic-server"; - version = "1.4.9"; - - src = fetchFromGitHub { - owner = "valeriansaliou"; - repo = "sonic"; - rev = "refs/tags/v${version}"; - hash = "sha256-PTujR3ciLRvbpiqStNMx3W5fkUdW2dsGmCj/iFRTKJM="; - }; - - cargoHash = "sha256-bH9u38gvH6QEySQ3XFXEHBiSqKKtB+kjcZRLjx4Z6XM="; - - # Found argument '--test-threads' which wasn't expected, or isn't valid in this context - doCheck = false; - - nativeBuildInputs = [ - rustPlatform.bindgenHook - ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; - - postPatch = '' - substituteInPlace src/main.rs --replace "./config.cfg" "$out/etc/sonic/config.cfg" - ''; - - postInstall = '' - install -Dm444 -t $out/etc/sonic config.cfg - install -Dm444 -t $out/lib/systemd/system debian/sonic.service - - substituteInPlace \ - $out/lib/systemd/system/sonic.service \ - --replace /usr/bin/sonic $out/bin/sonic \ - --replace /etc/sonic.cfg $out/etc/sonic/config.cfg - ''; - - passthru = { - tests = { - inherit (nixosTests) sonic-server; - version = testers.testVersion { - command = "sonic --version"; - package = sonic-server; - }; - }; - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Fast, lightweight and schema-less search backend"; - homepage = "https://github.com/valeriansaliou/sonic"; - changelog = "https://github.com/valeriansaliou/sonic/releases/tag/v${version}"; - license = licenses.mpl20; - platforms = platforms.unix; - mainProgram = "sonic"; - maintainers = with maintainers; [ pleshevskiy anthonyroussel ]; - }; -} diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 0b34c1f44a8f0..58887c5ef5e3d 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -31,13 +31,7 @@ stdenv.mkDerivation rec { expat ]; - CXXFLAGS = lib.concatStringsSep " " (lib.optionals stdenv.isDarwin [ - # see upstream bug: http://sphinxsearch.com/bugs/view.php?id=2578 - # workaround for "error: invalid suffix on literal - "-Wno-reserved-user-defined-literal" - # workaround for "error: non-constant-expression cannot be narrowed from type 'long' to 'int'" - "-Wno-c++11-narrowing" - ]); + CXXFLAGS = "-std=c++98"; meta = { description = "Open source full text search server"; diff --git a/pkgs/servers/search/typesense/default.nix b/pkgs/servers/search/typesense/default.nix index 762cc190f242f..2a641cd752fc4 100644 --- a/pkgs/servers/search/typesense/default.nix +++ b/pkgs/servers/search/typesense/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { inherit hash; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; diff --git a/pkgs/servers/search/typesense/sources.json b/pkgs/servers/search/typesense/sources.json index 854c0cfc4f9d9..501ba02d98c79 100644 --- a/pkgs/servers/search/typesense/sources.json +++ b/pkgs/servers/search/typesense/sources.json @@ -1,21 +1,21 @@ { - "version": "26.0", + "version": "27.1", "platforms": { "aarch64-linux": { "arch": "linux-arm64", - "hash": "sha256-ZexCxgBkscKTij0lfvAv4WI8bjpR29QGZhBav8C8TmQ=" + "hash": "sha256-5NJWbL+IQLXV5P4j9a4k7U3Khnw9B9FWG5YpkPPa5d4=" }, "x86_64-linux": { "arch": "linux-amd64", - "hash": "sha256-YFkr5iynq7q6w0oXlDGr/CnreBxvi7WVOtu6fKLtW2I=" + "hash": "sha256-63k/yh0nFGJy4+d20KIqrHC9Z5brjhjfkcsxzsFG1Vo=" }, "x86_64-darwin": { "arch": "darwin-amd64", - "hash": "sha256-FkWie6DgIhgojrn48rt9/GT0Lmu7jt74q2rzw1MI2Ws=" + "hash": "sha256-a8p4/+dCOyx2/slhynWJg6MswMiR9YP01ZrrjkfAheE=" }, "aarch64-darwin": { "arch": "darwin-arm64", - "hash": "sha256-ejw8B+DmCQs6cUSiLueY9tSdWnrFSFvLMS36U4+v8N4=" + "hash": "sha256-70ePCpMvON7T3kbeeRmkqQgJzEgNNE0W7VpcapzLF34=" } } } diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index 191a2fc531fee..ca7f8e33c7ece 100644 --- a/pkgs/servers/search/weaviate/default.nix +++ b/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.25.9"; + version = "1.26.4"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-liy3mw0+KJsac7AH1PEU6vk+MLo+ybEVCBeSU7MkoY0="; + hash = "sha256-JnzQ+B5zxbKZQ/jzOsD7r58f+TaCivN4BTJyNImi9xE="; }; - vendorHash = "sha256-5kfXX+VqGY2ka/w79sdtVHS/0XlF7DyHcq5hvFFIHK0="; + vendorHash = "sha256-QwB97LNUFK8yuKK8JSy1uH2hu+8ZAlvc+9VlTIld83U="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/pkgs/servers/search/zincsearch/default.nix b/pkgs/servers/search/zincsearch/default.nix index beef1758422f7..2a1d3fc6fabae 100644 --- a/pkgs/servers/search/zincsearch/default.nix +++ b/pkgs/servers/search/zincsearch/default.nix @@ -55,5 +55,8 @@ buildGoModule rec { homepage = "https://zincsearch-docs.zinc.dev/"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; + # Doesn't build with Go version later v1.21 (which is EOL). + # Upstream issue: https://github.com/zincsearch/zincsearch/issues/975 + broken = true; }; } diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index 2a7e643b60fd3..63de8df58fd84 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # the build will fail without complaining about a reference to /tmp - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --set-rpath "${lib.makeLibraryPath buildInputs}:$out/lib" \ $out/bin/shairplay diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index a9043f65331d0..f74813cd46082 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -28,8 +28,8 @@ , enablePipewire ? true , enableJack ? true , enableMetadata ? false -, enableMpris ? stdenv.isLinux -, enableDbus ? stdenv.isLinux +, enableMpris ? stdenv.hostPlatform.isLinux +, enableDbus ? stdenv.hostPlatform.isLinux , enableSoxr ? true , enableLibdaemon ? false }: @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { libuuid ffmpeg ] - ++ optional stdenv.isLinux glib; + ++ optional stdenv.hostPlatform.isLinux glib; postPatch = '' sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' dbus-service.c diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 4b3060d90b04d..926486c73c975 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; env.NIX_CFLAGS_COMPILE - = optionalString stdenv.isDarwin "-DBIND_8_COMPAT"; + = optionalString stdenv.hostPlatform.isDarwin "-DBIND_8_COMPAT"; doCheck = true; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index f01358146197c..8210e252bdab8 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.32.3"; + version = "3.32.7"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-Qqemee13V5+k56Q4hPOKjRsw6pmfALGRcKi4gHBj6eI="; + hash = "sha256-7kVT/aBL9EAx7oGeXEY9eL72dZGtuJUGlQ7bPyt/JZg="; }; patches = [ diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/servers/simple-http-server/default.nix index ff83e3f62d08b..cb4fe13000621 100644 --- a/pkgs/servers/simple-http-server/default.nix +++ b/pkgs/servers/simple-http-server/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 1e7021c7a7e58..9d11ad68a4056 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -90,7 +90,7 @@ defaultModules = mods: with mods; [ xml_int.cdr xml_int.rpc xml_int.scgi -] ++ lib.optionals stdenv.isLinux [ endpoints.gsmopen ]; +] ++ lib.optionals stdenv.hostPlatform.isLinux [ endpoints.gsmopen ]; enabledModules = (if modules != null then modules else defaultModules) availableModules; @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { libuuid libxcrypt ] ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules) - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration ]; enableParallelBuilding = true; @@ -168,6 +168,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mpl11; maintainers = with lib.maintainers; [ mikaelfangel ]; platforms = with lib.platforms; unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index ac5f0065d2cb2..0b8f718d0c969 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,21 +10,21 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.57"; + version = "2.59"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-ZszPHGEIcZEzFWSJ7jioQvLn5dwn9yjOvMMskMQKv8Y="; + hash = "sha256-CIn+/LC6z+2lnU8w3EzrBIBg94J9OnCxME2mZW65OwE="; }; buildInputs = [ curl openssl ]; makeFlags = [ "PREFIX=$(out)" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Dst_mtim=st_mtimespec" "-Dst_ctim=st_ctimespec" ]); diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index a6af3d77fbe2b..254b4aa8d9b9e 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.37.3"; + version = "2.38.0"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-Fa6VbWPROkdVS8wHkXYCNR+DiBR6SqvfmrjGVlhhkwU="; + sha256 = "sha256-RoyV/dbhFGyiAV9LB09EIHAbZOiu11KeTeiPJRmFRwE="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/softether/default.nix b/pkgs/servers/softether/default.nix deleted file mode 100644 index 976521f061d93..0000000000000 --- a/pkgs/servers/softether/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl -, openssl, readline, ncurses, zlib -, dataDir ? "/var/lib/softether" }: - -stdenv.mkDerivation rec { - pname = "softether"; - version = "4.38"; - build = "9760"; - - src = fetchurl { - url = "https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/releases/download/v${version}-${build}-rtm/softether-src-v${version}-${build}-rtm.tar.gz"; - sha256 = "0d8zahi9lkv72jh8yj66pwrsi4451vk113d3khzrzgbic6s2i0g6"; - }; - - buildInputs = [ openssl readline ncurses zlib ]; - - preConfigure = '' - ./configure - ''; - - buildPhase = '' - mkdir -p $out/bin - sed -i \ - -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \ - -e "/_DIR=/s|/usr|${dataDir}|g" \ - -e "s|\$(INSTALL|$out/\$(INSTALL|g" \ - -e "/echo/s|echo $out/|echo |g" \ - Makefile - ''; - - meta = with lib; { - description = "Open-Source Free Cross-platform Multi-protocol VPN Program"; - homepage = "https://www.softether.org/"; - license = licenses.asl20; - maintainers = [ maintainers.rick68 ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index f0467f7f9c27f..10427438e27d4 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf ]; buildInputs = - lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; doCheck = false; @@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ Br1ght0ne gaelreyrol ]; mainProgram = "sozu"; # error[E0432]: unresolved import `std::arch::x86_64` - broken = !stdenv.isx86_64; + broken = !stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 5d5acfcba130e..9c4e624202d8b 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.35.3"; + version = "1.36.2"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-ZawoeucJiU3o9a1DfsCTOlTwlnVJV4c/QqTSentHREA="; + hash = "sha256-39sRog9EUPF8x8splTl456viyZKiEupwqQLGTq/vFYU="; }; - vendorHash = "sha256-hr0o1dpbnPc9/sja419QnPzW5W7201DS2TQ8fF1+lJ8="; + vendorHash = "sha256-Xl03IVSqBSIq1ZV/c96qhlTQ1RcWcqqWPf63fGbfNOQ="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index 1046c94c115f2..07a523cd2fd48 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.21.0"; + version = "0.21.2"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-jHKugGQ3tta9vGjMtVEyTrLrmivLc41VFYVqAjH/IGQ="; + hash = "sha256-nSvWNelmqzgwf7M+9drqahwwo+YoQLgEscnigsBUwdI="; }; - vendorHash = "sha256-nYf/ruU1IPDOcumhQz6LGEpKLyAxgASgxjPT7qz0N8c="; + vendorHash = "sha256-uTuI8rYmRUkbRf46+hZm1xHflFDcro6hVG8aI2C4eWs="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 1cc5a99c51c18..98085856ac142 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.42.14"; + version = "1.42.20"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-KcaYoQgSDcALmYBtIKgE+C/Nmm+FrwV36bJ1EyQ4UoA="; + sha256 = "sha256-FbZ1cDzE6JFke3Bccspn/92mGvJzWr2gcoaVmnI0z1g="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-OU6b4h+sLN/9kdLGM3f9Are3sbBGqUxKAsSBph4jxVM="; + vendorHash = "sha256-Tzu+wbCFoTy282/jxFv1agCWCA0tEA64OlFuji+hptY="; proxyVendor = true; doCheck = false; diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index a2da81a0094f4..e27179e8ab2f1 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation { ''; # The cmake setup-hook uses $out/lib by default, this is not the case here. - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb") ''; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index dfa16d47968e3..7887704279646 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -244,28 +244,26 @@ in # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - # TODO should be removed - version = "10.5.25"; - hash = "sha256-lhnQ9R6GQ1dGayxjMBo0pT99/ZnxjE/UUvqyK/Obpk4="; + version = "10.5.26"; + hash = "sha256-3V+ZodMK5HNl/Bix3u/23AqzishOfZ/ZyMBP9rAZYfE="; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.18"; - hash = "sha256-aJihER9HEwcJ4ouix70aV+S7VxAfbhCeWX1R5tOFzxg="; + version = "10.6.19"; + hash = "sha256-vOyw/3t5pBNEc2+plHEHh8FVFtUet3FfJ4w/D8t+hwM="; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 - version = "10.11.8"; - hash = "sha256-XwTz4z2fHL7/BeecVNQdMCYwUAyZWu5ysGOOL5383w8="; + version = "10.11.9"; + hash = "sha256-CgAYCGTNAWGHyYb6q4AQ3iOhF7mnX5HWRWQh+JTkjSA="; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; - mariadb_110 = self.callPackage generic { - # Supported until 2024-06-07 - # TODO should be removed - version = "11.0.6"; - hash = "sha256-AYnWKUbDfG20a/GkaLqVgLy6joDwWVjsSDwzh+zPmgA="; + mariadb_114 = self.callPackage generic { + # Supported until 2029-05-29 + version = "11.4.3"; + hash = "sha256-bwAXuZAbsYl94O7SHK75/6nWbvVZNFoNim8BEwhBPs4="; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; } diff --git a/pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch b/pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch deleted file mode 100644 index a12dfb73d09de..0000000000000 --- a/pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 1f1ee5d3776af7ef56ffa3f4dcd22532c2c86c74 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Sun, 7 Jan 2024 10:19:54 +0100 -Subject: [PATCH] Fix build with libxml2 2.12 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libxml2 2.12.0 made `xmlGetLastError()` return `const` pointer: - -https://gitlab.gnome.org/GNOME/libxml2/-/commit/61034116d0a3c8b295c6137956adc3ae55720711 - -Clang 16 does not like this: - - error: assigning to 'xmlErrorPtr' (aka '_xmlError *') from 'const xmlError *' (aka 'const _xmlError *') discards qualifiers - error: cannot initialize a variable of type 'xmlErrorPtr' (aka '_xmlError *') with an rvalue of type 'const xmlError *' (aka 'const _xmlError *') - -Let’s update the variables to `const`. -For older versions, it will be automatically converted. - -But then `xmlResetError(xmlError*)` will not like the `const` pointer: - - error: no matching function for call to 'xmlResetError' - note: candidate function not viable: 1st argument ('const xmlError *' (aka 'const _xmlError *')) would lose const qualifier - -Let’s replace it with `xmlResetLastError()`. - -ALso remove `LIBXMLDOC::Xerr` protected member property. -It was introduced in 65b0e5455b547a3d574fa77b34cce23ae3bea0a0 -along with the `xmlResetError` calls. -It does not appear to be used for anything. ---- - storage/connect/libdoc.cpp | 39 +++++++++++++++++++------------------- - 1 file changed, 19 insertions(+), 20 deletions(-) - -diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp -index e414aa88355..10edcbc3ffa 100644 ---- a/storage/connect/libdoc.cpp -+++ b/storage/connect/libdoc.cpp -@@ -93,7 +93,6 @@ class LIBXMLDOC : public XMLDOCUMENT { - xmlXPathContextPtr Ctxp; - xmlXPathObjectPtr Xop; - xmlXPathObjectPtr NlXop; -- xmlErrorPtr Xerr; - char *Buf; // Temporary - bool Nofreelist; - }; // end of class LIBXMLDOC -@@ -327,7 +326,6 @@ LIBXMLDOC::LIBXMLDOC(char *nsl, char *nsdf, char *enc, PFBLOCK fp) - Ctxp = NULL; - Xop = NULL; - NlXop = NULL; -- Xerr = NULL; - Buf = NULL; - Nofreelist = false; - } // end of LIBXMLDOC constructor -@@ -365,8 +363,8 @@ bool LIBXMLDOC::ParseFile(PGLOBAL g, char *fn) - Encoding = (char*)Docp->encoding; - - return false; -- } else if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ } else if (xmlGetLastError()) -+ xmlResetLastError(); - - return true; - } // end of ParseFile -@@ -505,9 +503,9 @@ int LIBXMLDOC::DumpDoc(PGLOBAL g, char *ofn) - #if 1 - // This function does not crash ( - if (xmlSaveFormatFileEnc((const char *)ofn, Docp, Encoding, 0) < 0) { -- xmlErrorPtr err = xmlGetLastError(); -+ const xmlError *err = xmlGetLastError(); - strcpy(g->Message, (err) ? err->message : "Error saving XML doc"); -- xmlResetError(Xerr); -+ xmlResetLastError(); - rc = -1; - } // endif Save - // rc = xmlDocDump(of, Docp); -@@ -546,8 +544,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (Nlist) { - xmlXPathFreeNodeSet(Nlist); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - Nlist = NULL; - } // endif Nlist -@@ -555,8 +553,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (Xop) { - xmlXPathFreeObject(Xop); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - Xop = NULL; - } // endif Xop -@@ -564,8 +562,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (NlXop) { - xmlXPathFreeObject(NlXop); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - NlXop = NULL; - } // endif NlXop -@@ -573,8 +571,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (Ctxp) { - xmlXPathFreeContext(Ctxp); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - Ctxp = NULL; - } // endif Ctxp -@@ -590,6 +588,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - /******************************************************************/ - xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) - { -+ const xmlError *xerr; - xmlNodeSetPtr nl; - - if (trace(1)) -@@ -649,11 +648,11 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) - } else - xmlXPathFreeObject(Xop); // Caused node not found - -- if ((Xerr = xmlGetLastError())) { -- strcpy(g->Message, Xerr->message); -- xmlResetError(Xerr); -+ if ((xerr = xmlGetLastError())) { -+ strcpy(g->Message, xerr->message); -+ xmlResetLastError(); - return NULL; -- } // endif Xerr -+ } // endif xerr - - } // endif Xop - -@@ -1079,7 +1078,7 @@ void XML2NODE::AddText(PGLOBAL g, PCSZ txtp) - /******************************************************************/ - void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) - { -- xmlErrorPtr xerr; -+ const xmlError *xerr; - - if (trace(1)) - htrc("DeleteChild: node=%p\n", dnp); -@@ -1122,7 +1121,7 @@ void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) - if (trace(1)) - htrc("DeleteChild: errmsg=%-.256s\n", xerr->message); - -- xmlResetError(xerr); -+ xmlResetLastError(); - } // end of DeleteChild - - /* -------------------- class XML2NODELIST ---------------------- */ --- -2.42.0 - diff --git a/pkgs/servers/sql/materialize/default.nix b/pkgs/servers/sql/materialize/default.nix index 346e83f122067..1738b4fb92d6c 100644 --- a/pkgs/servers/sql/materialize/default.nix +++ b/pkgs/servers/sql/materialize/default.nix @@ -101,13 +101,13 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ] # Provides the mig command used by the krb5-src build script - ++ lib.optional stdenv.isDarwin bootstrap_cmds; + ++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; buildInputs = [ openssl rdkafka libclang ] - ++ lib.optionals stdenv.isDarwin [ libiconv DiskArbitration Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv DiskArbitration Foundation ]; # the check phase requires linking with rocksdb which can be a problem since # the rust rocksdb crate is not updated very often. diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index 6a276e7abf58c..2a8be0d6ac6ec 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mssql-jdbc"; - version = "12.8.0"; + version = "12.8.1"; src = fetchurl { url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar"; - sha256 = "sha256-mzSPFlv6MUtKNzZvRBy2khEa2YUEiH4xMR0EYXk3AHY="; + sha256 = "sha256-RPIXsdZ9IkQgAu4tHEq46GNYYGp4e5XutTAfI1SCoqs="; }; dontUnpack = true; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 4a072ae3f46b9..dbd09f9516a4d 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ bison cmake pkg-config ] - ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; patches = [ ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib zstd libfido2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl libtirpc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools CoreServices developer_cmds DarwinTools ]; diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index 619e269f15ff7..19739f2bcca29 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -6,13 +6,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "3.3.2"; + version = "4.0.2"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7Tq7i6AH6tt9Uyx276rVBwvbxxETRyVKnhhTijW02sU="; + sha256 = "sha256-ykTg5Zd4dU1D6dnj6QbNfGUXrSteKrQjV2hpIPhXGLU="; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/servers/sql/percona-server/innovation.nix b/pkgs/servers/sql/percona-server/innovation.nix index 27272410033fa..61b2ff7bb4a10 100644 --- a/pkgs/servers/sql/percona-server/innovation.nix +++ b/pkgs/servers/sql/percona-server/innovation.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { bison cmake pkg-config makeWrapper # required for scripts/CMakeLists.txt coreutils gnugrep procps - ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; patches = [ ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch @@ -45,13 +45,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib zstd libfido2 openldap perl cyrus_sasl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl libtirpc systemd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools CoreServices developer_cmds DarwinTools ] - ++ lib.optional (stdenv.isLinux && withJemalloc) jemalloc - ++ lib.optional (stdenv.isLinux && withTcmalloc) gperftools; + ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc + ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools; outputs = [ "out" "static" ]; @@ -81,12 +81,12 @@ stdenv.mkDerivation (finalAttrs: { "-DINSTALL_SHAREDIR=share/mysql" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DWITH_SYSTEMD=1" "-DWITH_SYSTEMD_DEBUG=1" ] - ++ lib.optional (stdenv.isLinux && withJemalloc) "-DWITH_JEMALLOC=1" - ++ lib.optional (stdenv.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1"; + ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1" + ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1"; postInstall = '' moveToOutput "lib/*.a" $static @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]} wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} ''; diff --git a/pkgs/servers/sql/percona-server/lts.nix b/pkgs/servers/sql/percona-server/lts.nix index 19e81654dd7bf..352b0239c429c 100644 --- a/pkgs/servers/sql/percona-server/lts.nix +++ b/pkgs/servers/sql/percona-server/lts.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { bison cmake pkg-config makeWrapper # required for scripts/CMakeLists.txt coreutils gnugrep procps - ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; patches = [ ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch @@ -39,9 +39,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib zstd libfido2 openldap perl cyrus_sasl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl libtirpc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools CoreServices developer_cmds DarwinTools ]; diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 17bb24562d7e6..dfffa518a5fd6 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevent openssl c-ares ] - ++ lib.optional stdenv.isLinux systemd; + ++ lib.optional stdenv.hostPlatform.isLinux systemd; enableParallelBuilding = true; - configureFlags = lib.optional stdenv.isLinux "--with-systemd"; + configureFlags = lib.optional stdenv.hostPlatform.isLinux "--with-systemd"; passthru.tests = { pgbouncer = nixosTests.pgbouncer; diff --git a/pkgs/servers/sql/pgcat/default.nix b/pkgs/servers/sql/pgcat/default.nix index 67665403c46d4..525380e46f24c 100644 --- a/pkgs/servers/sql/pgcat/default.nix +++ b/pkgs/servers/sql/pgcat/default.nix @@ -1,51 +1,48 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, darwin +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, + nix-update-script, + testers, + pgcat, }: rustPlatform.buildRustPackage rec { pname = "pgcat"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "postgresml"; repo = "pgcat"; rev = "v${version}"; - hash = "sha256-BERxdGgPk8POnhLsyy4lKV4LCoHsJTmv2OhAOz6CKKc="; + hash = "sha256-DHXUhAAOmPSt4aVp93I1y69of+MEboXJBZH50mzQTm8="; }; - cargoHash = "sha256-GwcqR8pEvz42NEmcuXpcoPdChzRBYsDEnllX62T8ulQ="; + cargoHash = "sha256-QqwUEbWKSUuxzYjWpVpQuKZDiNib1gM2eZJ4y7XIzXY="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; checkFlags = [ # requires network access - "--skip=dns_cache::CachedResolver::lookup_ip" - "--skip=dns_cache::CachedResolver::new" - "--skip=dns_cache::CachedResolver" - "--skip=dns_cache::tests::has_changed" - "--skip=dns_cache::tests::incorrect_address" - "--skip=dns_cache::tests::lookup_ip" - "--skip=dns_cache::tests::new" - "--skip=dns_cache::tests::thread" - "--skip=dns_cache::tests::unknown_host" + "--skip=dns_cache" ]; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/pgcat --version | grep "pgcat ${version}" - ''; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = pgcat; }; + }; meta = with lib; { homepage = "https://github.com/postgresml/pgcat"; description = "PostgreSQL pooler with sharding, load balancing and failover support"; - license = with licenses; [mit]; + changelog = "https://github.com/postgresml/pgcat/releases"; + license = with licenses; [ mit ]; platforms = platforms.unix; - maintainers = with maintainers; [cathalmullan]; + maintainers = with maintainers; [ cathalmullan ]; mainProgram = "pgcat"; }; } diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index f1762be17f2c7..b4f5724bcf779 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -4,7 +4,7 @@ , postgresql , openssl , libxcrypt -, withPam ? stdenv.isLinux +, withPam ? stdenv.hostPlatform.isLinux , pam }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "sysconfdir=\${out}/etc" ]; - patches = lib.optionals (stdenv.isDarwin) [ + patches = lib.optionals (stdenv.hostPlatform.isDarwin) [ # Build checks for strlcpy being available in the system, but doesn't # actually exclude its own copy from being built ./darwin-strlcpy.patch diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index 2c68d6dcbbad9..b80d1c203b2c6 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { echo -e "include Makefile\nfiles:\n\t@echo \$(REGRESS)" > Makefile.regress REGRESS_TESTS=$(make -f Makefile.regress files) - ${postgresql}/lib/pgxs/src/test/regress/pg_regress \ + ${lib.getDev postgresql}/lib/pgxs/src/test/regress/pg_regress \ --inputdir=./ \ --bindir='${postgresqlAge}/bin' \ --encoding=UTF-8 \ diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix index 2b8edb366ffae..ae52520925309 100644 --- a/pkgs/servers/sql/postgresql/ext/h3-pg.nix +++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace CMakeLists.txt \ --replace "add_subdirectory(cmake/h3)" "include_directories(${lib.getDev h3_4}/include/h3)" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/AddPostgreSQLExtension.cmake \ --replace "INTERPROCEDURAL_OPTIMIZATION TRUE" "" ''; diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index 1e632228663b1..9a3e01d535375 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ ]; platforms = postgresql.meta.platforms; # error: use of undeclared identifier 'aligned_alloc' - broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; + broken = stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; }; }) diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index ed0bfde0caba8..42d055a029aeb 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline, libkrb5, libxcrypt }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "pg_auto_failover"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index c265ae39ca461..3361e2100da2f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,12 +1,9 @@ { lib , stdenv , fetchFromGitHub -, openssl , postgresql , postgresqlTestHook -, readline , testers -, zlib }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 20e5299da25ae..a0669331055b0 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation { }; buildInputs = [ postgresql gcc ]; - buildPhase = "USE_PGXS=1 make"; + + makeFlags = [ "USE_PGXS=1" ]; + installPhase = '' install -D pg_similarity${postgresql.dlSuffix} -t $out/lib/ install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/postgresql/extension diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff index 2b145445cf15d..d05a5cd34e16d 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff @@ -4,16 +4,16 @@ index 8d822e5..8b7e371 100644 +++ b/crates/c/build.rs @@ -1,9 +1,13 @@ fn main() { - println!("cargo:rerun-if-changed=src/c.h"); - println!("cargo:rerun-if-changed=src/c.c"); + println!("cargo:rerun-if-changed=src/f16.h"); + println!("cargo:rerun-if-changed=src/f16.c"); + println!("cargo:rerun-if-env-changed=BINDGEN_EXTRA_CLANG_ARGS"); cc::Build::new() - .compiler("clang-16") + .compiler("@clang@") - .file("./src/c.c") + .file("./src/f16.c") + // read env var set by rustPlatform.bindgenHook + .try_flags_from_environment("BINDGEN_EXTRA_CLANG_ARGS") + .expect("the BINDGEN_EXTRA_CLANG_ARGS environment variable must be specified and UTF-8") .opt_level(3) .debug(true) - .compile("pgvectorsc"); + .compile("vectorsc"); diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-std-detect-use-upstream.diff b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-std-detect-use-upstream.diff deleted file mode 100644 index bd20cf6619a71..0000000000000 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-std-detect-use-upstream.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index a52b978..092bc1d 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2788,7 +2788,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] - name = "std_detect" - version = "0.1.5" --source = "git+https://github.com/tensorchord/stdarch.git?branch=avx512fp16#db0cdbc9b02074bfddabfd23a4a681f21640eada" -+source = "git+https://github.com/rust-lang/stdarch.git?branch=master#d2b1a070afc72d9ba4df80e055109ede5fc0a81f" - dependencies = [ - "cfg-if", - "libc", -diff --git a/crates/detect/Cargo.toml b/crates/detect/Cargo.toml -index b3ac782..c671c6a 100644 ---- a/crates/detect/Cargo.toml -+++ b/crates/detect/Cargo.toml -@@ -4,6 +4,6 @@ version.workspace = true - edition.workspace = true - - [dependencies] --std_detect = { git = "https://github.com/tensorchord/stdarch.git", branch = "avx512fp16" } -+std_detect = { git = "https://github.com/rust-lang/stdarch.git", branch = "master" } - ctor = "0.2.6" - rustix.workspace = true diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock index 092bc1d2e31c8..52dd4913b5a22 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -19,39 +19,94 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "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.4" +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 = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] [[package]] name = "anyhow" -version = "1.0.77" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayvec" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -dependencies = [ - "serde", -] [[package]] name = "ascii-canvas" @@ -72,6 +127,16 @@ dependencies = [ "serde_json", ] +[[package]] +name = "async-attributes" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "async-channel" version = "1.9.0" @@ -85,12 +150,11 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 4.0.1", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -98,15 +162,14 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.8.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ - "async-lock 3.2.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.1.0", + "fastrand 2.1.0", + "futures-lite 2.3.0", "slab", ] @@ -116,12 +179,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.1.1", + "async-channel 2.3.1", "async-executor", - "async-io 2.2.2", - "async-lock 3.2.0", + "async-io 2.3.3", + "async-lock 3.4.0", "blocking", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "once_cell", ] @@ -147,18 +210,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.4.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling 3.7.1", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -175,11 +238,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.1", + "event-listener 5.3.1", "event-listener-strategy", "pin-project-lite", ] @@ -206,26 +269,26 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.28", + "rustix 0.38.34", "windows-sys 0.48.0", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "329972aa325176e89114919f2a80fdae4f4c040f66a370b1a1159c6c0f94e7aa" dependencies = [ - "async-io 2.2.2", - "async-lock 2.8.0", + "async-io 2.3.3", + "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -234,6 +297,7 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ + "async-attributes", "async-channel 1.9.0", "async-global-executor", "async-io 1.13.0", @@ -257,28 +321,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.6.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.75" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", -] - -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", + "syn 2.0.66", ] [[package]] @@ -288,7 +343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b29ec3788e96fb4fdb275ccb9d62811f2fa903d76c5eb4dd6fe7d09a7ed5871f" dependencies = [ "cfg-if", - "rustc_version 0.3.3", + "rustc_version", ] [[package]] @@ -297,17 +352,28 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -318,17 +384,45 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base" +version = "0.0.0" +dependencies = [ + "base_macros", + "bytemuck", + "c", + "detect", + "half 2.4.1", + "libc", + "num-traits", + "rand", + "serde", + "thiserror", + "toml", + "uuid", + "validator", +] + [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base_macros" +version = "0.0.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] [[package]] name = "basic-cookies" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38" +checksum = "67bd8fd42c16bdb08688243dc5f0cc117a3ca9efeeaba3a345a18a6159ad96f7" dependencies = [ "lalrpop", "lalrpop-util", @@ -346,22 +440,22 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.43", + "syn 2.0.66", ] [[package]] @@ -387,9 +481,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitvec" @@ -403,55 +497,43 @@ dependencies = [ "wyz", ] -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel 2.1.1", - "async-lock 3.2.0", + "async-channel 2.3.1", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", ] [[package]] @@ -462,9 +544,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "c" @@ -472,32 +554,33 @@ version = "0.0.0" dependencies = [ "cc", "detect", - "half 2.3.1", + "half 2.4.1", "rand", ] [[package]] name = "cargo_toml" -version = "0.16.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3f9629bc6c4388ea699781dc988c2b99766d7679b151c81990b4fa1208fafd3" +checksum = "a98356df42a2eb1bd8f1793ae4ee4de48e384dd974ce5eac8eee802edb7492be" dependencies = [ "serde", "toml", ] [[package]] -name = "castaway" -version = "0.1.2" +name = "cc" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] -name = "cc" -version = "1.0.83" +name = "cee-scape" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "4d67dfb052149f779f77e9ce089cea126e00657e8f0d11dafc7901fde4291101" dependencies = [ + "cc", "libc", ] @@ -517,69 +600,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "clang-sys" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "4.4.12" +name = "chrono" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ - "clap_builder", - "clap_derive", + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.52.5", ] [[package]] -name = "clap-cargo" -version = "0.11.0" +name = "clang-sys" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25122ca6ebad5f53578c26638afd9f0160426969970dc37ec6c363ff6b082ebd" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ - "clap", - "doc-comment", + "glob", + "libc", + "libloading", ] [[package]] -name = "clap_builder" -version = "4.4.12" +name = "colorchoice" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" -dependencies = [ - "anstyle", - "clap_lex", -] +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +name = "common" +version = "0.0.0" dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.43", + "bytemuck", + "log", + "memmap2", + "rustix 0.38.34", + "serde", + "serde_json", ] -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -594,42 +661,36 @@ dependencies = [ ] [[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "cpufeatures" -version = "0.2.11" +name = "core-foundation" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ + "core-foundation-sys", "libc", ] +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] -[[package]] -name = "critical-section" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" - [[package]] name = "crossbeam" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -639,54 +700,46 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.10" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.17" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-queue" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -695,23 +748,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "crypto-common" -version = "0.1.6" +name = "csv" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ - "generic-array", - "typenum", + "csv-core", + "itoa", + "ryu", + "serde", ] [[package]] -name = "ctor" -version = "0.2.6" +name = "csv-core" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ - "quote", - "syn 2.0.43", + "memchr", ] [[package]] @@ -721,34 +775,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] -name = "curl" -version = "0.4.44" +name = "darling" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2 0.4.10", - "winapi", + "darling_core", + "darling_macro", ] [[package]] -name = "curl-sys" -version = "0.4.70+curl-8.5.0" +name = "darling_core" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0333d8849afe78a4c8102a429a446bfdd055832af071945520e835ae2d841e" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ - "cc", - "libc", - "libnghttp2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys 0.48.0", + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.66", +] + +[[package]] +name = "darling_macro" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.66", ] [[package]] @@ -768,35 +826,17 @@ dependencies = [ name = "detect" version = "0.0.0" dependencies = [ - "ctor", - "rustix 0.38.28", - "std_detect", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", + "detect_macros", + "rustix 0.38.34", ] [[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +name = "detect_macros" +version = "0.0.0" dependencies = [ - "dirs-sys", + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -809,18 +849,6 @@ dependencies = [ "dirs-sys-next", ] -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -833,37 +861,48 @@ dependencies = [ ] [[package]] -name = "doc-comment" -version = "0.3.3" +name = "either" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] -name = "downcast" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" +name = "elkan_k_means" +version = "0.0.0" +dependencies = [ + "base", + "bytemuck", + "common", + "num-traits", + "rand", + "rayon 0.0.0", +] [[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +name = "embedding" +version = "0.0.0" +dependencies = [ + "httpmock", + "reqwest", + "serde", + "serde_json", + "thiserror", +] [[package]] name = "ena" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5" dependencies = [ "log", ] [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -885,20 +924,30 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", ] [[package]] name = "env_logger" -version = "0.10.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -909,9 +958,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -936,9 +985,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.1" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -947,30 +996,24 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.1", + "event-listener 5.3.1", "pin-project-lite", ] [[package]] name = "eyre" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", ] -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - [[package]] name = "fastrand" version = "1.9.0" @@ -982,15 +1025,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "finl_unicode" -version = "1.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fixedbitset" @@ -999,13 +1036,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +name = "flat" +version = "0.0.0" dependencies = [ - "crc32fast", - "miniz_oxide", + "base", + "common", + "quantization", + "rayon 0.0.0", + "storage", ] [[package]] @@ -1023,12 +1061,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - [[package]] name = "funty" version = "2.0.0" @@ -1042,7 +1074,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", - "futures-sink", ] [[package]] @@ -1074,11 +1105,11 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -1093,7 +1124,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", ] [[package]] @@ -1115,29 +1146,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", + "futures-io", "futures-macro", - "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", "slab", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1146,9 +1168,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1168,17 +1190,36 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" -version = "1.8.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" [[package]] name = "half" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "bytemuck", "cfg-if", @@ -1191,58 +1232,71 @@ dependencies = [ [[package]] name = "hash32" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ "byteorder", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heapless" -version = "0.7.17" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ - "atomic-polyfill", "hash32", - "rustc_version 0.4.0", - "spin", "stable_deref_trait", ] [[package]] -name = "heck" -version = "0.4.1" +name = "hermit-abi" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] -name = "hmac" -version = "0.12.1" +name = "hnsw" +version = "0.0.0" +dependencies = [ + "base", + "bytemuck", + "common", + "parking_lot", + "quantization", + "rayon 0.0.0", + "storage", +] + +[[package]] +name = "home" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "digest", + "windows-sys 0.52.0", ] [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1274,12 +1328,13 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "httpmock" -version = "0.6.8" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b02e044d3b4c2f94936fb05f9649efa658ca788f44eb6b87554e2033fc8ce93" +checksum = "08ec9586ee0910472dec1a1f0f8acf52f0fdde93aea74d70d4a3107b4be0fd5b" dependencies = [ "assert-json-diff", "async-object-pool", + "async-std", "async-trait", "base64", "basic-cookies", @@ -1287,7 +1342,6 @@ dependencies = [ "form_urlencoded", "futures-util", "hyper", - "isahc", "lazy_static", "levenshtein", "log", @@ -1308,21 +1362,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", + "h2", "http", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -1330,15 +1385,48 @@ dependencies = [ ] [[package]] -name = "idna" -version = "0.4.0" +name = "hyper-rustls" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", ] +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.5.0" @@ -1349,23 +1437,46 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - [[package]] name = "indenter" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" +[[package]] +name = "index" +version = "0.0.0" +dependencies = [ + "arc-swap", + "base", + "bincode", + "byteorder", + "common", + "crc32fast", + "crossbeam", + "dashmap", + "elkan_k_means", + "flat", + "hnsw", + "ivf", + "log", + "parking_lot", + "quantization", + "rand", + "rayon 0.0.0", + "serde", + "serde_json", + "storage", + "thiserror", + "uuid", + "validator", +] + [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -1373,91 +1484,94 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] +[[package]] +name = "interprocess_atomic_wait" +version = "0.0.0" +dependencies = [ + "libc", + "ulock-sys", +] + [[package]] name = "io-lifetimes" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] [[package]] -name = "is-terminal" -version = "0.4.10" +name = "ipnet" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" -dependencies = [ - "hermit-abi", - "rustix 0.38.28", - "windows-sys 0.52.0", -] +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] -name = "isahc" -version = "1.7.2" +name = "is_ci" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" -dependencies = [ - "async-channel 1.9.0", - "castaway", - "crossbeam-utils", - "curl", - "curl-sys", - "encoding_rs", - "event-listener 2.5.3", - "futures-lite 1.13.0", - "http", - "log", - "mime", - "once_cell", - "polling 2.8.0", - "slab", - "sluice", - "tracing", - "tracing-futures", - "url", - "waker-fn", -] +checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "ivf" +version = "0.0.0" +dependencies = [ + "base", + "common", + "elkan_k_means", + "num-traits", + "quantization", + "rand", + "rayon 0.0.0", + "serde_json", + "storage", +] [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1473,33 +1587,33 @@ dependencies = [ [[package]] name = "lalrpop" -version = "0.19.12" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" dependencies = [ "ascii-canvas", "bit-set", - "diff", "ena", - "is-terminal", - "itertools 0.10.5", + "itertools 0.11.0", "lalrpop-util", "petgraph", + "pico-args", "regex", - "regex-syntax 0.6.29", + "regex-syntax", "string_cache", "term", "tiny-keccak", "unicode-xid", + "walkdir", ] [[package]] name = "lalrpop-util" -version = "0.19.12" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" +checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex", + "regex-automata", ] [[package]] @@ -1522,18 +1636,18 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.5", ] [[package]] @@ -1542,37 +1656,14 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libnghttp2-sys" -version = "0.1.8+1.55.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fae956c192dadcdb5dace96db71fa0b827333cce7c7b38dc71446f024d8a340" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", - "redox_syscall", -] - -[[package]] -name = "libz-sys" -version = "1.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", ] [[package]] @@ -1583,15 +1674,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1599,45 +1690,35 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" dependencies = [ "value-bag", ] -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] - [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] -name = "memmap2" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +name = "memfd" +version = "0.0.0" dependencies = [ - "libc", + "detect", + "rand", + "rustix 0.38.34", ] [[package]] -name = "memoffset" -version = "0.9.0" +name = "memmap2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ - "autocfg", + "libc", ] [[package]] @@ -1654,78 +1735,29 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", "windows-sys 0.48.0", ] -[[package]] -name = "mockall" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" -dependencies = [ - "cfg-if", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn 2.0.43", -] - -[[package]] -name = "multiversion" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c7b9d7fe61760ce5ea19532ead98541f6b4c495d87247aff9826445cf6872a" -dependencies = [ - "multiversion-macros", - "target-features", -] - -[[package]] -name = "multiversion-macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a83d8500ed06d68877e9de1dde76c1dbb83885dcdbda4ef44ccbc3fbda2ac8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "target-features", -] - [[package]] name = "new_debug_unreachable" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nom" @@ -1737,20 +1769,11 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -1762,15 +1785,15 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "object" -version = "0.32.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] @@ -1781,48 +1804,14 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "openai_api_rust" -version = "0.1.8" -source = "git+https://github.com/tensorchord/openai-api.git?rev=228d54b6002e98257b3c81501a054942342f585f#228d54b6002e98257b3c81501a054942342f585f" -dependencies = [ - "log", - "mime", - "rand", - "serde", - "serde_json", - "ureq", -] - -[[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.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - [[package]] name = "owo-colors" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +dependencies = [ + "supports-color", +] [[package]] name = "parking" @@ -1832,9 +1821,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1842,17 +1831,23 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + [[package]] name = "pathsearch" version = "0.2.0" @@ -1863,12 +1858,6 @@ dependencies = [ "libc", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "percent-encoding" version = "2.3.1" @@ -1877,9 +1866,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -1888,9 +1877,9 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap", @@ -1898,22 +1887,21 @@ dependencies = [ [[package]] name = "pgrx" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb44171122605250e719ca2ae49afb357bdb2fce4b3c876fcf2225165237328a" +version = "0.12.0-alpha.1" +source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" dependencies = [ "atomic-traits", - "bitflags 2.4.1", + "bitflags 2.5.0", "bitvec", "enum-map", "heapless", "libc", "once_cell", + "paste", "pgrx-macros", "pgrx-pg-sys", "pgrx-sql-entity-graph", "seahash", - "seq-macro", "serde", "serde_cbor", "serde_json", @@ -1923,46 +1911,42 @@ dependencies = [ [[package]] name = "pgrx-macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18ac8628b7de2f29a93d0abdbdcaee95a0e0ef4b59fd4de99cc117e166e843b" +version = "0.12.0-alpha.1" +source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" dependencies = [ "pgrx-sql-entity-graph", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "pgrx-pg-config" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd45ac6eb1142c5690df63c4e0bdfb74f27c9f93a7af84f064dc2c0a2c2d6f7" +version = "0.12.0-alpha.1" +source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" dependencies = [ "cargo_toml", - "dirs", "eyre", + "home", "owo-colors", "pathsearch", "serde", - "serde_derive", "serde_json", + "thiserror", "toml", "url", ] [[package]] name = "pgrx-pg-sys" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81c6207939582934fc26fceb651cb5338e363c06ddc6b2d50ca71867f7c70ffe" +version = "0.12.0-alpha.1" +source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" dependencies = [ "bindgen", + "cee-scape", "clang-sys", "eyre", "libc", - "memoffset", - "once_cell", "pgrx-macros", "pgrx-pg-config", "pgrx-sql-entity-graph", @@ -1971,56 +1955,23 @@ dependencies = [ "serde", "shlex", "sptr", - "syn 1.0.109", + "syn 2.0.66", "walkdir", ] [[package]] name = "pgrx-sql-entity-graph" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50083de83b1fac2484e8f2c2a7da5fed0193904e2578fa6c4ce02262c455c2b" +version = "0.12.0-alpha.1" +source = "git+https://github.com/tensorchord/pgrx.git?branch=v0.12.0-alpha.1-patch3#6a89f963209e9d4ed18d2fb868b8d2e967421785" dependencies = [ "convert_case", "eyre", "petgraph", "proc-macro2", "quote", - "syn 1.0.109", - "unescape", -] - -[[package]] -name = "pgrx-tests" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba0115cd80d9e3ca1d5d2a8ab8b7320d6ed614a53d025b86152696a8b3caa75" -dependencies = [ - "clap-cargo", - "eyre", - "libc", - "once_cell", - "owo-colors", - "pgrx", - "pgrx-macros", - "pgrx-pg-config", - "postgres", - "proptest", - "rand", - "regex", - "serde", - "serde_json", - "sysinfo", + "syn 2.0.66", "thiserror", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared 0.11.2", + "unescape", ] [[package]] @@ -2033,39 +1984,16 @@ dependencies = [ ] [[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.3" +name = "pico-args" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2075,21 +2003,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-io", ] -[[package]] -name = "pkg-config" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" - [[package]] name = "polling" version = "2.8.0" @@ -2108,61 +2030,19 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.1" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.3.9", "pin-project-lite", - "rustix 0.38.28", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] -[[package]] -name = "postgres" -version = "0.19.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7915b33ed60abc46040cbcaa25ffa1c7ec240668e0477c4f3070786f5916d451" -dependencies = [ - "bytes", - "fallible-iterator", - "futures-util", - "log", - "tokio", - "tokio-postgres", -] - -[[package]] -name = "postgres-protocol" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" -dependencies = [ - "base64", - "byteorder", - "bytes", - "fallible-iterator", - "hmac", - "md-5", - "memchr", - "rand", - "sha2", - "stringprep", -] - -[[package]] -name = "postgres-types" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" -dependencies = [ - "bytes", - "fallible-iterator", - "postgres-protocol", -] - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2175,33 +2055,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "predicates" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" -dependencies = [ - "anstyle", - "itertools 0.11.0", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2228,44 +2081,31 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.71" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] [[package]] -name = "proptest" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +name = "quantization" +version = "0.0.0" dependencies = [ - "bit-set", - "bit-vec", - "bitflags 2.4.1", - "lazy_static", + "base", + "common", + "detect", + "elkan_k_means", "num-traits", "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax 0.8.2", - "rusty-fork", - "tempfile", - "unarray", + "serde_json", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2317,19 +2157,18 @@ dependencies = [ ] [[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +name = "rayon" +version = "0.0.0" dependencies = [ - "rand_core", + "log", + "rayon 1.10.0", ] [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -2337,9 +2176,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -2347,18 +2186,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -2367,58 +2206,94 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] -name = "regex-syntax" -version = "0.8.2" +name = "reqwest" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -2432,16 +2307,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ - "semver 0.11.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.20", + "semver", ] [[package]] @@ -2460,22 +2326,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", @@ -2483,6 +2349,15 @@ dependencies = [ "sct", ] +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -2495,27 +2370,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2526,15 +2389,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "scopeguard" version = "1.2.0" @@ -2566,12 +2420,6 @@ dependencies = [ "semver-parser", ] -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" - [[package]] name = "semver-parser" version = "0.10.2" @@ -2582,16 +2430,19 @@ dependencies = [ ] [[package]] -name = "seq-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" +name = "send_fd" +version = "0.0.0" +dependencies = [ + "libc", + "log", + "rustix 0.38.34", +] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -2602,26 +2453,26 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ - "half 1.8.2", + "half 1.8.3", "serde", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -2640,10 +2491,22 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ + "form_urlencoded", + "itoa", + "ryu", "serde", ] @@ -2652,65 +2515,35 @@ name = "service" version = "0.0.0" dependencies = [ "arc-swap", - "arrayvec", - "bincode", - "bytemuck", - "byteorder", - "c", - "crc32fast", - "crossbeam", - "dashmap", - "detect", - "half 2.3.1", - "libc", - "log", - "memmap2", - "memoffset", - "multiversion", - "num-traits", + "base", + "common", + "index", "parking_lot", - "rand", - "rayon", - "rustix 0.38.28", "serde", "serde_json", "thiserror", - "ulock-sys", - "uuid", - "validator", -] - -[[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 = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] [[package]] name = "similar" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "siphasher" @@ -2727,22 +2560,11 @@ dependencies = [ "autocfg", ] -[[package]] -name = "sluice" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -dependencies = [ - "async-channel 1.9.0", - "futures-core", - "futures-io", -] - [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -2756,12 +2578,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2769,9 +2591,6 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "sptr" @@ -2786,12 +2605,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "std_detect" -version = "0.1.5" -source = "git+https://github.com/rust-lang/stdarch.git?branch=master#d2b1a070afc72d9ba4df80e055109ede5fc0a81f" +name = "storage" +version = "0.0.0" dependencies = [ - "cfg-if", - "libc", + "base", + "common", ] [[package]] @@ -2803,26 +2621,25 @@ dependencies = [ "new_debug_unreachable", "once_cell", "parking_lot", - "phf_shared 0.10.0", + "phf_shared", "precomputed-hash", ] [[package]] -name = "stringprep" -version = "0.1.4" +name = "strsim" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" -dependencies = [ - "finl_unicode", - "unicode-bidi", - "unicode-normalization", -] +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] -name = "subtle" -version = "2.5.0" +name = "supports-color" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" +dependencies = [ + "atty", + "is_ci", +] [[package]] name = "syn" @@ -2837,9 +2654,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.43" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -2847,18 +2664,30 @@ dependencies = [ ] [[package]] -name = "sysinfo" -version = "0.29.11" +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", - "ntapi", - "once_cell", - "rayon", - "winapi", ] [[package]] @@ -2867,25 +2696,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "target-features" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb5fa503293557c5158bd215fdc225695e567a77e453f5d4452a50a193969bd" - -[[package]] -name = "tempfile" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" -dependencies = [ - "cfg-if", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.28", - "windows-sys 0.52.0", -] - [[package]] name = "term" version = "0.7.0" @@ -2898,38 +2708,43 @@ dependencies = [ ] [[package]] -name = "termcolor" -version = "1.4.0" +name = "thiserror" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ - "winapi-util", + "thiserror-impl", ] [[package]] -name = "termtree" -version = "0.4.1" +name = "thiserror-impl" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] [[package]] -name = "thiserror" -version = "1.0.52" +name = "tikv-jemalloc-sys" +version = "0.5.4+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" dependencies = [ - "thiserror-impl", + "cc", + "libc", ] [[package]] -name = "thiserror-impl" -version = "1.0.52" +name = "tikv-jemallocator" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", + "libc", + "tikv-jemalloc-sys", ] [[package]] @@ -2958,9 +2773,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -2969,67 +2784,50 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", ] [[package]] -name = "tokio-postgres" -version = "0.7.10" +name = "tokio-rustls" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "async-trait", - "byteorder", - "bytes", - "fallible-iterator", - "futures-channel", - "futures-util", - "log", - "parking_lot", - "percent-encoding", - "phf", - "pin-project-lite", - "postgres-protocol", - "postgres-types", - "rand", - "socket2 0.5.5", + "rustls", "tokio", - "tokio-util", - "whoami", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.8" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", @@ -3039,18 +2837,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", @@ -3071,23 +2869,10 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", - "tracing-attributes", "tracing-core", ] -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] - [[package]] name = "tracing-core" version = "0.1.32" @@ -3097,28 +2882,12 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[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" @@ -3134,12 +2903,6 @@ dependencies = [ "cty", ] -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - [[package]] name = "unescape" version = "0.1.0" @@ -3148,9 +2911,9 @@ checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -3160,18 +2923,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-xid" @@ -3185,24 +2948,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -[[package]] -name = "ureq" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" -dependencies = [ - "base64", - "flate2", - "log", - "once_cell", - "rustls", - "rustls-webpki", - "serde", - "serde_json", - "url", - "webpki-roots", -] - [[package]] name = "url" version = "2.5.0" @@ -3210,15 +2955,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna", "percent-encoding", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", "serde", @@ -3226,12 +2977,12 @@ dependencies = [ [[package]] name = "validator" -version = "0.16.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" +checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" dependencies = [ - "idna 0.4.0", - "lazy_static", + "idna", + "once_cell", "regex", "serde", "serde_derive", @@ -3242,66 +2993,55 @@ dependencies = [ [[package]] name = "validator_derive" -version = "0.16.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" +checksum = "55591299b7007f551ed1eb79a684af7672c19c3193fb9e0a31936987bb2438ec" dependencies = [ - "if_chain", - "lazy_static", + "darling", + "once_cell", "proc-macro-error", "proc-macro2", "quote", - "regex", - "syn 1.0.109", - "validator_types", -] - -[[package]] -name = "validator_types" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" -dependencies = [ - "proc-macro2", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "value-bag" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" - -[[package]] -name = "vcpkg" -version = "0.2.15" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "vectors" version = "0.0.0" dependencies = [ + "arrayvec", + "base", "bincode", "bytemuck", "byteorder", + "chrono", + "csv", "detect", + "embedding", "env_logger", - "half 2.3.1", - "httpmock", + "interprocess_atomic_wait", "libc", "log", - "mockall", + "memfd", + "memmap2", "num-traits", - "openai_api_rust", + "paste", "pgrx", - "pgrx-tests", "rand", - "rustix 0.38.28", + "rustix 0.38.34", + "scopeguard", + "send_fd", "serde", "serde_json", "service", "thiserror", + "tikv-jemallocator", "toml", "validator", ] @@ -3312,26 +3052,17 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3354,9 +3085,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3364,24 +3095,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -3391,9 +3122,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3401,28 +3132,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3430,19 +3161,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[package]] -name = "whoami" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" -dependencies = [ - "wasm-bindgen", - "web-sys", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "winapi" @@ -3462,11 +3183,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3475,6 +3196,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -3490,7 +3220,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -3510,17 +3240,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "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]] @@ -3531,9 +3262,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -3543,9 +3274,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -3555,9 +3286,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +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 = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -3567,9 +3304,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3579,9 +3316,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3591,9 +3328,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3603,19 +3340,29 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.5.31" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" +checksum = "56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d" dependencies = [ "memchr", ] +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wyz" version = "0.5.1" diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index 0041c555362bf..e8b3af416ca7d 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -1,6 +1,6 @@ { lib , buildPgrxExtension -, cargo-pgrx_0_11_2 +, cargo-pgrx_0_12_0_alpha_1 , clang_16 , fetchFromGitHub , nix-update-script @@ -27,13 +27,13 @@ in # Upstream only works with a fixed version of cargo-pgrx for each release, # so we're pinning it here to avoid future incompatibility. # See https://docs.pgvecto.rs/developers/development.html#environment, step 6 - cargo-pgrx = cargo-pgrx_0_11_2; + cargo-pgrx = cargo-pgrx_0_12_0_alpha_1; rustPlatform = rustPlatform'; }) rec { inherit postgresql; pname = "pgvecto-rs"; - version = "0.2.1"; + version = "0.3.0"; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; @@ -44,17 +44,13 @@ in src = ./0001-read-clang-flags-from-environment.diff; clang = lib.getExe clang; }) - # Fix build failure on rustc 1.78 due to missing feature flag. - # Can (likely) be removed when pgvecto-rs 0.3.0 is released. - # See https://github.com/NixOS/nixpkgs/issues/320131 - ./0002-std-detect-use-upstream.diff ]; src = fetchFromGitHub { owner = "tensorchord"; repo = "pgvecto.rs"; rev = "v${version}"; - hash = "sha256-kwaGHerEVh6Oxb9jQupSapm7CsKl5CoH6jCv+zbi4FE="; + hash = "sha256-X7BY2Exv0xQNhsS/GA7GNvj9OeVDqVCd/k3lUkXtfgE="; }; # Package has git dependencies on Cargo.lock (instead of just crate.io dependencies), @@ -62,8 +58,7 @@ in cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "openai_api_rust-0.1.8" = "sha256-os5Y8KIWXJEYEcNzzT57wFPpEXdZ2Uy9W3j5+hJhhR4="; - "std_detect-0.1.5" = "sha256-Rsy8N0pTJ/3AIHjRyeOeyY7Q9Ho46ZcDmJFurCbRxiQ="; + "pgrx-0.12.0-alpha.1" = "sha256-HSQrAR9DFJsi4ZF4hLiJ1sIy+M9Ygva2+WxeUzflOLk="; }; }; @@ -86,6 +81,9 @@ in RUSTC_BOOTSTRAP = 1; }; + # This crate does not have the "pg_test" feature + usePgTestCheckFeature = false; + passthru = { updateScript = nix-update-script { }; tests = { @@ -94,11 +92,8 @@ in }; meta = with lib; { - # The pgrx 0.11.2 dependency is broken in aarch64-linux: https://github.com/pgcentralfoundation/pgrx/issues/1429 - # It is fixed in pgrx 0.11.3, but upstream is still using pgrx 0.11.2 - # Additionally, upstream (accidentally) broke support for PostgreSQL 12 and 13 on 0.2.1, but - # they are removing it in 0.3.0 either way: https://github.com/tensorchord/pgvecto.rs/issues/343 - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin || (versionOlder postgresql.version "14"); + # Upstream removed support for PostgreSQL 12 and 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343 + broken = stdenv.hostPlatform.isDarwin || (versionOlder postgresql.version "14"); description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres"; homepage = "https://github.com/tensorchord/pgvecto.rs"; license = licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index 1800b424716f9..05d22c19a8b0c 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ R postgresql ]; - preBuild = '' - export USE_PGXS=1 - ''; + + makeFlags = [ "USE_PGXS=1" ]; + installPhase = '' install -D plr${postgresql.dlSuffix} -t $out/lib/ install -D {plr--*.sql,plr.control} -t $out/share/postgresql/extension diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index af1cee81fa788..e0dbc19e353fa 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -112,7 +112,7 @@ in stdenv.mkDerivation (finalAttrs: { echo -e "include Makefile\nprint_regress_files:\n\t@echo \$(REGRESS)" > Makefile.regress REGRESS_TESTS=$(make -f Makefile.regress print_regress_files) - ${postgresql}/lib/pgxs/src/test/regress/pg_regress \ + ${lib.getDev postgresql}/lib/pgxs/src/test/regress/pg_regress \ --bindir='${postgresqlWithSelf}/bin' \ --temp-instance=regress-instance \ --dbname=contrib_regression \ diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 5b4e4543ec96d..aa62c778a3fda 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,7 +15,7 @@ protobufc, libiconv, libxslt, - docbook_xml_dtd_45, + docbook5, cunit, pcre2, nixosTests, @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "postgis"; - version = "3.4.2"; + version = "3.5.0"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - hash = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI="; + hash = "sha256-ymmKIswrKzRnrE4GO0OihBPzAE3dUFvczddMVqZH9RA="; }; buildInputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { json_c protobufc pcre2.dev - ] ++ lib.optional stdenv.isDarwin libiconv; + ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; nativeBuildInputs = [ perl pkg-config @@ -89,13 +89,13 @@ stdenv.mkDerivation rec { ln -s ${postgresql}/bin/postgres $out/bin/postgres ''; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; preCheck = '' substituteInPlace regress/run_test.pl --replace-fail "/share/contrib/postgis" "$out/share/postgresql/contrib/postgis" substituteInPlace regress/Makefile --replace-fail 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' "s,\\$\$libdir,$PWD/regress/00-regress-install$out/lib,g" \ --replace-fail '$(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql' "$PWD/regress/00-regress-install$out/share/postgresql/contrib/postgis/*.sql" - substituteInPlace doc/postgis-out.xml --replace-fail "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd" + substituteInPlace doc/postgis-out.xml --replace-fail "http://docbook.org/xml/5.0/dtd/docbook.dtd" "${docbook5}/xml/dtd/docbook/docbookx.dtd" # The test suite hardcodes it to use /tmp. export PGIS_REG_TMPDIR="$TMPDIR/pgis_reg" ''; diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index e4e8c5afdb242..565f3fdaf60dc 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -2,13 +2,9 @@ , stdenv , fetchFromGitHub , postgresql -, openssl -, zlib -, readline , flex , curl , json_c -, libxcrypt }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/sql/postgresql/ext/system_stats.nix b/pkgs/servers/sql/postgresql/ext/system_stats.nix index bc2a0973b95f3..c1700fc0380d6 100644 --- a/pkgs/servers/sql/postgresql/ext/system_stats.nix +++ b/pkgs/servers/sql/postgresql/ext/system_stats.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { pname = "system_stats"; - version = "3.0"; + version = "3.2"; buildInputs = [ postgresql ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "EnterpriseDB"; repo = "system_stats"; rev = "v${version}"; - hash = "sha256-LuX7/LOi0rl6L/kjbjq7rr2zPcGIOYB7hdZBNJ9xqak="; + hash = "sha256-/xXnui0S0ZjRw7P8kMAgttHVv8T41aOhM3pM8P0OTig="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 0e5651085ea1d..92b6ad4fea88e 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] ++ lib.optionals (!enableUnfree) [ "-DAPACHE_ONLY=ON" ] - ++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLINTER=OFF" ]; # Fix the install phase which tries to install into the pgsql extension dir, # and cannot be manually overridden. This is rather fragile but works OK. diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix index f62eae5b6a3e2..f0b9238f59ef2 100644 --- a/pkgs/servers/sql/postgresql/ext/tsja.nix +++ b/pkgs/servers/sql/postgresql/ext/tsja.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ - --replace /usr/local/pgsql ${postgresql} \ - --replace -L/usr/local/lib "" \ - --replace -I/usr/local/include "" - substituteInPlace tsja.c --replace /usr/local/lib/mecab ${mecab}/lib/mecab + --replace-fail /usr/local/pgsql ${lib.getDev postgresql} \ + --replace-fail -L/usr/local/lib "" \ + --replace-fail -I/usr/local/include "" + substituteInPlace tsja.c --replace-fail /usr/local/lib/mecab ${mecab}/lib/mecab ''; buildInputs = [ mecab postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix index 26d4cb0c15412..4a1c9b18b13b5 100644 --- a/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ + lib, + stdenv, + callPackage, + fetchFromGitHub, + postgresql, +}: stdenv.mkDerivation rec { pname = "wal2json"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "eulerto"; repo = "wal2json"; - rev = "wal2json_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-Gpc9uDKrs/dmVSFgdgHM453+TaEnhRh9t0gDbSn8FUI="; + rev = "wal2json_${builtins.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM="; }; buildInputs = [ postgresql ]; @@ -20,6 +26,13 @@ stdenv.mkDerivation rec { install -D -t $out/share/postgresql/extension sql/*.sql ''; + passthru.tests.wal2json = lib.recurseIntoAttrs ( + callPackage ../../../../../nixos/tests/postgresql-wal2json.nix { + inherit (stdenv) system; + inherit postgresql; + } + ); + meta = with lib; { description = "PostgreSQL JSON output plugin for changeset extraction"; homepage = "https://github.com/eulerto/wal2json"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 08b32befb672a..69aa8a3774439 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -3,12 +3,13 @@ let generic = # dependencies { stdenv, lib, fetchurl, fetchpatch, makeWrapper - , glibc, zlib, readline, openssl, icu, lz4, zstd, systemd, libossp_uuid + , glibc, zlib, readline, openssl, icu, lz4, zstd, systemdLibs, libossp_uuid , pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin , linux-pam + , removeReferencesTo # This is important to obtain a version of `libpq` that does not depend on systemd. - , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic + , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs && !stdenv.hostPlatform.isStatic , enableSystemd ? null , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic @@ -23,7 +24,7 @@ let # JIT , jitSupport - , nukeReferences, patchelf, llvmPackages + , nukeReferences, llvmPackages, overrideCC # PL/Python , pythonSupport ? false @@ -39,11 +40,20 @@ let lz4Enabled = atLeast "14"; zstdEnabled = atLeast "15"; + dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary; + systemdSupport' = if enableSystemd == null then systemdSupport else (lib.warn "postgresql: argument enableSystemd is deprecated, please use systemdSupport instead." enableSystemd); pname = "postgresql"; - stdenv' = if jitSupport then llvmPackages.stdenv else stdenv; + stdenv' = + if jitSupport && !stdenv.cc.isClang then + overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { + # LLVM bintools are not used by default, but are needed to make -flto work below. + bintools = llvmPackages.bintools; + }) + else + stdenv; in stdenv'.mkDerivation (finalAttrs: { inherit version; pname = pname + lib.optionalString jitSupport "-jit"; @@ -53,10 +63,31 @@ let inherit hash; }; + __structuredAttrs = true; + hardeningEnable = lib.optionals (!stdenv'.cc.isClang) [ "pie" ]; - outputs = [ "out" "lib" "doc" "man" ]; - setOutputFlags = false; # $out retains configureFlags :-/ + outputs = [ "out" "dev" "doc" "lib" "man" ]; + outputChecks.out = { + disallowedReferences = [ "dev" "doc" "man" ]; + disallowedRequisites = [ + stdenv'.cc + ] ++ ( + map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs) + ) ++ lib.optionals jitSupport [ + llvmPackages.llvm.out + ]; + }; + outputChecks.lib = { + disallowedReferences = [ "out" "dev" "doc" "man" ]; + disallowedRequisites = [ + stdenv'.cc + ] ++ ( + map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs) + ) ++ lib.optionals jitSupport [ + llvmPackages.llvm.out + ]; + }; buildInputs = [ zlib @@ -69,17 +100,18 @@ let ++ lib.optionals jitSupport [ llvmPackages.llvm ] ++ lib.optionals lz4Enabled [ lz4 ] ++ lib.optionals zstdEnabled [ zstd ] - ++ lib.optionals systemdSupport' [ systemd ] + ++ lib.optionals systemdSupport' [ systemdLibs ] ++ lib.optionals pythonSupport [ python3 ] ++ lib.optionals gssSupport [ libkrb5 ] - ++ lib.optionals stdenv'.isLinux [ linux-pam ] - ++ lib.optionals (!stdenv'.isDarwin) [ libossp_uuid ]; + ++ lib.optionals stdenv'.hostPlatform.isLinux [ linux-pam ] + ++ lib.optionals (!stdenv'.hostPlatform.isDarwin) [ libossp_uuid ]; nativeBuildInputs = [ makeWrapper pkg-config + removeReferencesTo ] - ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences patchelf ]; + ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences ]; enableParallelBuilding = true; @@ -87,70 +119,92 @@ let buildFlags = [ "world" ]; - # Makes cross-compiling work when xml2-config can't be executed on the host. - # Fixed upstream in https://github.com/postgres/postgres/commit/0bc8cebdb889368abdf224aeac8bc197fe4c9ae6 - env.NIX_CFLAGS_COMPILE = lib.optionalString (olderThan "13") "-I${libxml2.dev}/include/libxml2"; + # libpgcommon.a and libpgport.a contain all paths returned by pg_config and are linked + # into all binaries. However, almost no binaries actually use those paths. The following + # flags will remove unused sections from all shared libraries and binaries - including + # those paths. This avoids a lot of circular dependency problems with different outputs, + # and allows splitting them cleanly. + env.CFLAGS = "-fdata-sections -ffunction-sections" + + (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections") + # Makes cross-compiling work when xml2-config can't be executed on the host. + # Fixed upstream in https://github.com/postgres/postgres/commit/0bc8cebdb889368abdf224aeac8bc197fe4c9ae6 + + lib.optionalString (olderThan "13") " -I${libxml2.dev}/include/libxml2"; configureFlags = [ "--with-openssl" "--with-libxml" "--with-icu" "--sysconfdir=/etc" - "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}/share/zoneinfo" "--enable-debug" (lib.optionalString systemdSupport' "--with-systemd") - (if stdenv'.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") + (if stdenv'.hostPlatform.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ] ++ lib.optionals lz4Enabled [ "--with-lz4" ] ++ lib.optionals zstdEnabled [ "--with-zstd" ] ++ lib.optionals gssSupport [ "--with-gssapi" ] ++ lib.optionals pythonSupport [ "--with-python" ] ++ lib.optionals jitSupport [ "--with-llvm" ] - ++ lib.optionals stdenv'.isLinux [ "--with-pam" ]; + ++ lib.optionals stdenv'.hostPlatform.isLinux [ "--with-pam" ] + # This could be removed once the upstream issue is resolved: + # https://postgr.es/m/flat/427c7c25-e8e1-4fc5-a1fb-01ceff185e5b%40technowledgy.de + ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "16") [ "LDFLAGS_EX_BE=-Wl,-export_dynamic" ]; patches = [ (if atLeast "16" then ./patches/relative-to-symlinks-16+.patch else ./patches/relative-to-symlinks.patch) + (if atLeast "15" then ./patches/empty-pg-config-view-15+.patch else ./patches/empty-pg-config-view.patch) ./patches/less-is-more.patch ./patches/paths-for-split-outputs.patch - ./patches/specify_pkglibdir_at_runtime.patch ./patches/paths-with-postgresql-suffix.patch (substituteAll { src = ./patches/locale-binary-path.patch; - locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; + locale = "${if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; }) ] ++ lib.optionals stdenv'.hostPlatform.isMusl ( # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141 map fetchurl (lib.attrValues muslPatches) - ) ++ lib.optionals stdenv'.isLinux [ + ) ++ lib.optionals stdenv'.hostPlatform.isLinux [ (if atLeast "13" then ./patches/socketdir-in-run-13+.patch else ./patches/socketdir-in-run.patch) + ] ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [ + ./patches/export-dynamic-darwin-15-.patch ]; installTargets = [ "install-world" ]; postPatch = '' - # Hardcode the path to pgxs so pg_config returns the path in $out - substituteInPlace "src/common/config_info.c" --subst-var out - '' + lib.optionalString jitSupport '' - # Force lookup of jit stuff in $out instead of $lib - substituteInPlace src/backend/jit/jit.c --replace pkglib_path \"$out/lib\" - substituteInPlace src/backend/jit/llvm/llvmjit.c --replace pkglib_path \"$out/lib\" - substituteInPlace src/backend/jit/llvm/llvmjit_inline.cpp --replace pkglib_path \"$out/lib\" + substituteInPlace "src/Makefile.global.in" --subst-var out + # Hardcode the path to pgxs so pg_config returns the path in $dev + substituteInPlace "src/common/config_info.c" --subst-var dev ''; postInstall = '' - moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it - moveToOutput "lib/libpgcommon*.a" "$out" - moveToOutput "lib/libpgport*.a" "$out" - moveToOutput "lib/libecpg*" "$out" - - # Prevent a retained dependency on gcc-wrapper. - substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/ld ld + moveToOutput "bin/ecpg" "$dev" + moveToOutput "lib/pgxs" "$dev" + + # Pretend pg_config is located in $out/bin to return correct paths, but + # actually have it in -dev to avoid pulling in all other outputs. + moveToOutput "bin/pg_config" "$dev" + # To prevent a "pg_config: could not find own program executable" error, we fake + # pg_config in the default output. + cat << EOF > "$out/bin/pg_config" && chmod +x "$out/bin/pg_config" + #!${stdenv'.shell} + echo The real pg_config can be found in the -dev output. + exit 1 + EOF + wrapProgram "$dev/bin/pg_config" --argv0 "$out/bin/pg_config" + + # postgres exposes external symbols get_pkginclude_path and similar. Those + # can't be stripped away by --gc-sections/LTO, because they could theoretically + # be used by dynamically loaded modules / extensions. To avoid circular dependencies, + # references to -dev, -doc and -man are removed here. References to -lib must be kept, + # because there is a realistic use-case for extensions to locate the /lib directory to + # load other shared modules. + remove-references-to -t "$dev" -t "$doc" -t "$man" "$out/bin/postgres" if [ -z "''${dontDisableStatic:-}" ]; then # Remove static libraries in case dynamic are available. - for i in $out/lib/*.a $lib/lib/*.a; do + for i in $lib/lib/*.a; do name="$(basename "$i")" ext="${stdenv'.hostPlatform.extensions.sharedLibrary}" if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then @@ -158,47 +212,27 @@ let fi done fi + # The remaining static libraries are libpgcommon.a, libpgport.a and related. + # Those are only used when building e.g. extensions, so go to $dev. + moveToOutput "lib/*.a" "$dev" '' + lib.optionalString jitSupport '' - # Move the bitcode and libllvmjit.so library out of $lib; otherwise, every client that - # depends on libpq.so will also have libLLVM.so in its closure too, bloating it - moveToOutput "lib/bitcode" "$out" - moveToOutput "lib/llvmjit*" "$out" - - # In the case of JIT support, prevent a retained dependency on clang-wrapper - substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/clang clang - nuke-refs $out/lib/llvmjit_types.bc $(find $out/lib/bitcode -type f) - - # Stop out depending on the default output of llvm - substituteInPlace $out/lib/pgxs/src/Makefile.global \ - --replace ${llvmPackages.llvm.out}/bin "" \ - --replace '$(LLVM_BINPATH)/' "" - - # Stop out depending on the -dev output of llvm - substituteInPlace $out/lib/pgxs/src/Makefile.global \ - --replace ${llvmPackages.llvm.dev}/bin/llvm-config llvm-config \ - --replace -I${llvmPackages.llvm.dev}/include "" - - ${lib.optionalString (!stdenv'.isDarwin) '' - # Stop lib depending on the -dev output of llvm - rpath=$(patchelf --print-rpath $out/lib/llvmjit.so) - nuke-refs -e $out $out/lib/llvmjit.so - # Restore the correct rpath - patchelf $out/lib/llvmjit.so --set-rpath "$rpath" - ''} + # In the case of JIT support, prevent useless dependencies on header files + find "$out/lib" -iname '*.bc' -type f -exec nuke-refs '{}' + + + # Stop lib depending on the -dev output of llvm + remove-references-to -t ${llvmPackages.llvm.dev} "$out/lib/llvmjit${dlSuffix}" ''; - postFixup = lib.optionalString (!stdenv'.isDarwin && stdenv'.hostPlatform.libc == "glibc") + postFixup = lib.optionalString stdenv'.hostPlatform.isGnu '' # initdb needs access to "locale" command from glibc. wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin ''; - doCheck = !stdenv'.isDarwin; + doCheck = !stdenv'.hostPlatform.isDarwin; # autodetection doesn't seem to able to find this, but it's there. checkTarget = "check"; - disallowedReferences = [ stdenv'.cc ]; - passthru = let this = self.callPackage generic args; jitToggle = this.override { @@ -206,13 +240,13 @@ let }; in { + inherit dlSuffix; + psqlSchema = lib.versions.major version; withJIT = if jitSupport then this else jitToggle; withoutJIT = if jitSupport then jitToggle else this; - dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary; - pkgs = let scope = { inherit jitSupport; @@ -225,7 +259,7 @@ let in import ./ext newSelf newSuper; withPackages = postgresqlWithPackages { - inherit makeWrapper buildEnv; + inherit buildEnv; postgresql = this; } this.pkgs; @@ -265,36 +299,18 @@ let # resulting LLVM IR isn't platform-independent this doesn't give you much. # In fact, I tried to test the result in a VM-test, but as soon as JIT was used to optimize # a query, postgres would coredump with `Illegal instruction`. - broken = (jitSupport && stdenv.hostPlatform != stdenv.buildPlatform) - # Allmost all tests fail FATAL errors for v12 and v13 - || (jitSupport && stdenv.hostPlatform.isMusl && olderThan "14"); + broken = jitSupport && !stdenv.hostPlatform.canExecute stdenv.buildPlatform; }; }); - postgresqlWithPackages = { postgresql, makeWrapper, buildEnv }: pkgs: f: buildEnv { + postgresqlWithPackages = { postgresql, buildEnv }: pkgs: f: buildEnv { name = "postgresql-and-plugins-${postgresql.version}"; paths = f pkgs ++ [ postgresql - postgresql.lib postgresql.man # in case user installs this into environment ]; - nativeBuildInputs = [ makeWrapper ]; - - - # We include /bin to ensure the $out/bin directory is created, which is - # needed because we'll be removing the files from that directory in postBuild - # below. See #22653 - pathsToLink = ["/" "/bin"]; - - # Note: the duplication of executables is about 4MB size. - # So a nicer solution was patching postgresql to allow setting the - # libdir explicitly. - postBuild = '' - mkdir -p $out/bin - rm $out/bin/{pg_config,postgres,pg_ctl} - cp --target-directory=$out/bin ${postgresql}/bin/{postgres,pg_config,pg_ctl} - wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib - ''; + + pathsToLink = ["/"]; passthru.version = postgresql.version; passthru.psqlSchema = postgresql.psqlSchema; diff --git a/pkgs/servers/sql/postgresql/patches/empty-pg-config-view-15+.patch b/pkgs/servers/sql/postgresql/patches/empty-pg-config-view-15+.patch new file mode 100644 index 0000000000000..c83e6964cf454 --- /dev/null +++ b/pkgs/servers/sql/postgresql/patches/empty-pg-config-view-15+.patch @@ -0,0 +1,54 @@ +Empty the pg_config system information view. This view keeps references to +several -dev outputs, which we want to avoid to keep closure size down. + +The alternative to this patch would be to nuke references across the board, +but this will also affect the output of the pg_config utility. By emptying +the view only, we keep the pg_config binary intact. It resides in the -dev +output, so it's fine to have all those references there. + +--- +--- a/src/backend/utils/misc/pg_config.c ++++ b/src/backend/utils/misc/pg_config.c +@@ -32,20 +32,5 @@ pg_config(PG_FUNCTION_ARGS) + /* initialize our tuplestore */ + InitMaterializedSRF(fcinfo, 0); + +- configdata = get_configdata(my_exec_path, &configdata_len); +- for (i = 0; i < configdata_len; i++) +- { +- Datum values[2]; +- bool nulls[2]; +- +- memset(values, 0, sizeof(values)); +- memset(nulls, 0, sizeof(nulls)); +- +- values[0] = CStringGetTextDatum(configdata[i].name); +- values[1] = CStringGetTextDatum(configdata[i].setting); +- +- tuplestore_putvalues(rsinfo->setResult, rsinfo->setDesc, values, nulls); +- } +- + return (Datum) 0; + } +--- a/src/test/regress/expected/sysviews.out ++++ b/src/test/regress/expected/sysviews.out +@@ -29,7 +29,7 @@ select name, ident, parent, level, total_bytes >= free_bytes + (1 row) + + -- At introduction, pg_config had 23 entries; it may grow +-select count(*) > 20 as ok from pg_config; ++select count(*) = 0 as ok from pg_config; + ok + ---- + t +--- a/src/test/regress/sql/sysviews.sql ++++ b/src/test/regress/sql/sysviews.sql +@@ -18,7 +18,7 @@ select name, ident, parent, level, total_bytes >= free_bytes + from pg_backend_memory_contexts where level = 0; + + -- At introduction, pg_config had 23 entries; it may grow +-select count(*) > 20 as ok from pg_config; ++select count(*) = 0 as ok from pg_config; + + -- We expect no cursors in this test; see also portals.sql + select count(*) = 0 as ok from pg_cursors; diff --git a/pkgs/servers/sql/postgresql/patches/empty-pg-config-view.patch b/pkgs/servers/sql/postgresql/patches/empty-pg-config-view.patch new file mode 100644 index 0000000000000..98e4b81514312 --- /dev/null +++ b/pkgs/servers/sql/postgresql/patches/empty-pg-config-view.patch @@ -0,0 +1,50 @@ +Empty the pg_config system information view. This view keeps references to +several -dev outputs, which we want to avoid to keep closure size down. + +The alternative to this patch would be to nuke references across the board, +but this will also affect the output of the pg_config utility. By emptying +the view only, we keep the pg_config binary intact. It resides in the -dev +output, so it's fine to have all those references there. + +--- +--- a/src/backend/utils/misc/pg_config.c ++++ b/src/backend/utils/misc/pg_config.c +@@ -69,16 +69,6 @@ pg_config(PG_FUNCTION_ARGS) + /* initialize our tuplestore */ + tupstore = tuplestore_begin_heap(true, false, work_mem); + +- configdata = get_configdata(my_exec_path, &configdata_len); +- for (i = 0; i < configdata_len; i++) +- { +- values[0] = configdata[i].name; +- values[1] = configdata[i].setting; +- +- tuple = BuildTupleFromCStrings(attinmeta, values); +- tuplestore_puttuple(tupstore, tuple); +- } +- + /* + * no longer need the tuple descriptor reference created by + * TupleDescGetAttInMetadata() +--- a/src/test/regress/expected/sysviews.out ++++ b/src/test/regress/expected/sysviews.out +@@ -20,7 +20,7 @@ select count(*) >= 0 as ok from pg_available_extensions; + (1 row) + + -- At introduction, pg_config had 23 entries; it may grow +-select count(*) > 20 as ok from pg_config; ++select count(*) = 0 as ok from pg_config; + ok + ---- + t +--- a/src/test/regress/sql/sysviews.sql ++++ b/src/test/regress/sql/sysviews.sql +@@ -13,7 +13,7 @@ select count(*) >= 0 as ok from pg_available_extension_versions; + select count(*) >= 0 as ok from pg_available_extensions; + + -- At introduction, pg_config had 23 entries; it may grow +-select count(*) > 20 as ok from pg_config; ++select count(*) = 0 as ok from pg_config; + + -- We expect no cursors in this test; see also portals.sql + select count(*) = 0 as ok from pg_cursors; diff --git a/pkgs/servers/sql/postgresql/patches/export-dynamic-darwin-15-.patch b/pkgs/servers/sql/postgresql/patches/export-dynamic-darwin-15-.patch new file mode 100644 index 0000000000000..fa0f4be4de7f4 --- /dev/null +++ b/pkgs/servers/sql/postgresql/patches/export-dynamic-darwin-15-.patch @@ -0,0 +1,13 @@ +See https://postgr.es/m/eb249761-56e2-4e42-a2c5-b9ae18c1ca1f%40technowledgy.de +--- +--- a/src/makefiles/Makefile.darwin ++++ b/src/makefiles/Makefile.darwin +@@ -5,6 +5,8 @@ DLSUFFIX = .so + # env var name to use in place of LD_LIBRARY_PATH + ld_library_path_var = DYLD_LIBRARY_PATH + ++export_dynamic = -Wl,-export_dynamic ++ + ifdef PGXS + BE_DLLLIBS = -bundle_loader $(bindir)/postgres + else diff --git a/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch b/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch index 2134f7e81a870..46164bba25556 100644 --- a/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch +++ b/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch @@ -4,8 +4,19 @@ i++; configdata[i].name = pstrdup("PGXS"); -+ strlcpy(path, "@out@/lib", sizeof(path)); ++ strlcpy(path, "@dev@/lib", sizeof(path)); - get_pkglib_path(my_exec_path, path); strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path)); cleanup_path(path); configdata[i].setting = pstrdup(path); +--- a/src/Makefile.global.in ++++ b/src/Makefile.global.in +@@ -116,7 +116,7 @@ endif + + libdir := @libdir@ + +-pkglibdir = $(libdir) ++pkglibdir = @out@/lib + ifeq "$(findstring pgsql, $(pkglibdir))" "" + ifeq "$(findstring postgres, $(pkglibdir))" "" + override pkglibdir := $(pkglibdir)/postgresql diff --git a/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch b/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch deleted file mode 100644 index b94fc9efcbff8..0000000000000 --- a/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/port/path.c -+++ b/src/port/path.c -@@ -714,7 +714,11 @@ - void - get_lib_path(const char *my_exec_path, char *ret_path) - { -- make_relative_path(ret_path, LIBDIR, PGBINDIR, my_exec_path); -+ char const * const nix_pglibdir = getenv("NIX_PGLIBDIR"); -+ if(nix_pglibdir == NULL) -+ make_relative_path(ret_path, LIBDIR, PGBINDIR, my_exec_path); -+ else -+ make_relative_path(ret_path, nix_pglibdir, PGBINDIR, my_exec_path); - } - - /* -@@ -723,7 +727,11 @@ - void - get_pkglib_path(const char *my_exec_path, char *ret_path) - { -- make_relative_path(ret_path, PKGLIBDIR, PGBINDIR, my_exec_path); -+ char const * const nix_pglibdir = getenv("NIX_PGLIBDIR"); -+ if(nix_pglibdir == NULL) -+ make_relative_path(ret_path, PKGLIBDIR, PGBINDIR, my_exec_path); -+ else -+ make_relative_path(ret_path, nix_pglibdir, PGBINDIR, my_exec_path); - } - - /* diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index e0a6f23a46313..ed04908180eeb 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "High-performance MySQL proxy"; mainProgram = "proxysql"; homepage = "https://proxysql.com/"; diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index fef02cfb7ba6c..0db6ded31699b 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.28.0"; + version = "8.31.0"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FhoD88j+uG1AvZ4ce1hwHCFH0cxvlsljf2iv7zAiXLQ="; + sha256 = "sha256-7yuc3W298Fay5A16a74TKuDd3huhtCpbefyI+aobgqM="; }; - vendorHash = "sha256-WQSdRPU8T02HdKTivLrvdd81XMhqFms0SA0zohicsjA="; + vendorHash = "sha256-P8v0vqxOfN9JjwsdoM6JmqGujGP5V68OAUc3KB/YU+k="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; diff --git a/pkgs/servers/sql/sqld/default.nix b/pkgs/servers/sql/sqld/default.nix index db78ebafc812c..79c52798c6b84 100644 --- a/pkgs/servers/sql/sqld/default.nix +++ b/pkgs/servers/sql/sqld/default.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite zstd - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; env.ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/servers/sqlpage/default.nix index f0372b926fc86..c6055d601535d 100644 --- a/pkgs/servers/sqlpage/default.nix +++ b/pkgs/servers/sqlpage/default.nix @@ -11,8 +11,8 @@ let apexcharts = fetchurl { - url = "https://cdn.jsdelivr.net/npm/apexcharts@3.50.0/dist/apexcharts.min.js"; - hash = "sha256-pLaS+eABqnCs0TLhRUEBQVLeF7RSlW5LjsmS7eV4iKI="; + url = "https://cdn.jsdelivr.net/npm/apexcharts@3.52.0/dist/apexcharts.min.js"; + hash = "sha256-2sxp9+shRA5LMxzhgx+fpeQPIY2ZWgBdt4mp5V2Yn+E="; }; tablerCss = fetchurl { url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css"; @@ -42,18 +42,18 @@ in rustPlatform.buildRustPackage rec { pname = "sqlpage"; - version = "0.25.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "lovasoa"; repo = "SQLpage"; rev = "v${version}"; - hash = "sha256-ixxTaJ72EqGqvopcIr/7kRfFyK9p5laAmu7+jR5Tp1I="; + hash = "sha256-veqkHjIbR4qENarmXHakDDG4Rxq9mUD/io+dfwaWAqg="; }; postPatch = '' substituteInPlace sqlpage/apexcharts.js \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.50.0/dist/apexcharts.min.js */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.52.0/dist/apexcharts.min.js */' \ "$(cat ${apexcharts})" substituteInPlace sqlpage/sqlpage.css \ --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css */' \ @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { "$(cat ${tomselect})" ''; - cargoHash = "sha256-yD82/h5dgcvp8OBfAoRfkq+YsauPncaRjfGM7dRQq5E="; + cargoHash = "sha256-idX3uU1nSI2a93srlJ1HvKcwVD0C4FmkQKTEYod5qgg="; nativeBuildInputs = [ pkg-config @@ -86,7 +86,7 @@ rustPlatform.buildRustPackage rec { sqlite zstd ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 9229359d91595..998b2d9ada44d 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl - ] ++ lib.optionals stdenv.isLinux [ libcap pam systemd ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap pam systemd ]; enableParallelBuilding = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-delay-pools" "--enable-x-accelerator-vary" "--enable-htcp" - ] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) + ] ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; doCheck = true; diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index a9ca0c8f25851..cfb15d6d54f84 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs *.sh"; - buildInputs = [ libev libconfig perl pcre2 ] ++ lib.optionals stdenv.isLinux [ libcap tcp_wrappers ]; + buildInputs = [ libev libconfig perl pcre2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap tcp_wrappers ]; - makeFlags = lib.optionals stdenv.isLinux [ "USELIBCAP=1" "USELIBWRAP=1" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "USELIBCAP=1" "USELIBWRAP=1" ]; postInstall = '' # install all flavours diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index 3e29f5aa42d7c..aba331f581d31 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -10,25 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.32.1"; + version = "2.33.0"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - hash = "sha256-PkDT6FU6JSIeeKCJeeIjjqZfoo+tGzqyPyWuIiwusQY="; + hash = "sha256-WR8fzpeN6zufvakanJBSMtgTpfDRqCyaTfEzE5NqFOA="; }; - cargoHash = "sha256-ymI5O6j6NEcgIbMLEYgyUZBBkwxDWDWaVn4hqJScGxA="; + cargoHash = "sha256-AasNva4SOTSrvBTrGHX/jOPjcjt3o8KUsFL7e4uhW6M="; - patches = [ - (fetchpatch { - url = "https://github.com/static-web-server/static-web-server/pull/466.patch"; - hash = "sha256-VYSoi6swG4nEFmGKvdEaJ05mJlxaXYsjs8cQai40P4g="; - }) - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; # Some tests rely on timestamps newer than 18 Nov 1974 00:00:00 preCheck = '' diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix index 9b56cccf15282..6ced9624b7418 100644 --- a/pkgs/servers/sunshine/default.nix +++ b/pkgs/servers/sunshine/default.nix @@ -139,7 +139,7 @@ stdenv'.mkDerivation rec { miniupnpc ] ++ lib.optionals cudaSupport [ cudaPackages.cudatoolkit - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ intel-media-sdk ]; diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index a446648099441..f26b33856d118 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { maintainers = with maintainers; [ fab ]; # darwin crashes with: # src/controllers/parsingArgs.go:130:4: undefined: PrintEmbeddedFiles - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "swego"; }; } diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index d222563fa0fd7..e1b26e12cca89 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -15,7 +15,7 @@ }: let - version = "1.72.1"; + version = "1.74.1"; in buildGoModule { pname = "tailscale"; @@ -25,7 +25,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-b1o3UHotVs5/+cpMx9q8bvt6BSM2QamLDUNyBNfb58A="; + hash = "sha256-672FtDKgz7Nmoufoe4Xg/b8sA8EuKH8X+3n9PAKYjFk="; }; patches = [ @@ -37,9 +37,9 @@ buildGoModule { }) ]; - vendorHash = "sha256-M5e5dE1gGW3ly94r3SxCsBmVwbBmhVtaVDW691vxG/8="; + vendorHash = "sha256-HJEgBs2GOzXvRa95LdwySQmG4/+QwupFDBGrQT6Y2vE="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ] ++ [ installShellFiles ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ] ++ [ installShellFiles ]; CGO_ENABLED = 0; @@ -60,7 +60,7 @@ buildGoModule { postInstall = '' ln -s $out/bin/tailscaled $out/bin/tailscale - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/tailscaled \ --prefix PATH : ${lib.makeBinPath [ iproute2 iptables getent shadow ]} \ --suffix PATH : ${lib.makeBinPath [ procps ]} diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 191a8a0bc23bc..c71f91e353e8b 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.14.4"; + version = "2.14.5"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-IV5ZyVuZvr09wQ8SgcHiTBp916B2ZPQvrg9+O8H3xsk="; + sha256 = "sha256-Xb8sby56U6Tc+OlxN7yKdhGGxrkmn6VfSPBhc1/YH24="; }; installPhase = '' diff --git a/pkgs/servers/teleport/16/Cargo.lock b/pkgs/servers/teleport/16/Cargo.lock index 45249a280c203..8aa4042cfe853 100644 --- a/pkgs/servers/teleport/16/Cargo.lock +++ b/pkgs/servers/teleport/16/Cargo.lock @@ -17,6 +17,16 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + [[package]] name = "aes" version = "0.8.4" @@ -28,6 +38,29 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "aes-kw" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" +dependencies = [ + "aes", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -164,21 +197,37 @@ dependencies = [ ] [[package]] -name = "atty" -version = "0.2.14" +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "aws-lc-rs" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77" dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", ] [[package]] -name = "autocfg" -version = "1.3.0" +name = "aws-lc-sys" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "0f0e249228c6ad2d240c2dc94b714d711629d52bad946075d8e9b2f5391f0703" +dependencies = [ + "bindgen 0.69.4", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] [[package]] name = "backtrace" @@ -207,6 +256,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -233,6 +288,29 @@ dependencies = [ "syn 2.0.68", ] +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.68", + "which", +] + [[package]] name = "bit_field" version = "0.10.2" @@ -298,7 +376,7 @@ name = "boring-sys" version = "4.7.0" source = "git+https://github.com/gravitational/boring?rev=99897308abb5976ea05625b8314c24b16eebb01b#99897308abb5976ea05625b8314c24b16eebb01b" dependencies = [ - "bindgen", + "bindgen 0.68.1", "cmake", "fs_extra", "fslock", @@ -318,9 +396,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cbc" @@ -333,19 +411,19 @@ dependencies = [ [[package]] name = "cbindgen" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" +checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" dependencies = [ "clap", "heck", - "indexmap 1.9.3", + "indexmap", "log", "proc-macro2", "quote", "serde", "serde_json", - "syn 1.0.109", + "syn 2.0.68", "tempfile", "toml", ] @@ -355,6 +433,11 @@ name = "cc" version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" +dependencies = [ + "jobserver", + "libc", + "once_cell", +] [[package]] name = "cexpr" @@ -400,27 +483,30 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.25" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ - "atty", - "bitflags 1.3.2", + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" +dependencies = [ + "anstream", + "anstyle", "clap_lex", - "indexmap 1.9.3", "strsim", - "termcolor", - "textwrap", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "cmake" @@ -512,19 +598,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core", "typenum", ] [[package]] name = "crypto-mac" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ "generic-array", "subtle", ] +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -639,6 +735,12 @@ dependencies = [ "syn 2.0.68", ] +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "ecdsa" version = "0.16.9" @@ -678,6 +780,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + [[package]] name = "elliptic-curve" version = "0.13.8" @@ -699,15 +807,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - [[package]] name = "env_filter" version = "0.1.0" @@ -720,9 +819,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -952,6 +1051,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + [[package]] name = "gimli" version = "0.29.0" @@ -975,25 +1084,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hash32" version = "0.2.1" @@ -1003,12 +1093,6 @@ dependencies = [ "byteorder", ] -[[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" @@ -1036,18 +1120,15 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] -name = "hermit-abi" -version = "0.3.9" +name = "hex" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" @@ -1067,11 +1148,20 @@ dependencies = [ "digest", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1080,12 +1170,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", + "futures-util", "http", + "http-body", "pin-project-lite", ] @@ -1095,12 +1197,6 @@ version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "humantime" version = "2.1.0" @@ -1109,60 +1205,68 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.29" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http", "hyper", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", ] [[package]] -name = "idna" -version = "0.5.0" +name = "hyper-util" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] -name = "indexmap" -version = "1.9.3" +name = "idna" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "autocfg", - "hashbrown 0.12.3", + "unicode-bidi", + "unicode-normalization", ] [[package]] @@ -1172,7 +1276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", ] [[package]] @@ -1222,7 +1326,7 @@ dependencies = [ [[package]] name = "ironrdp-async" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bytes", "ironrdp-connector", @@ -1233,7 +1337,7 @@ dependencies = [ [[package]] name = "ironrdp-cliprdr" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bitflags 2.6.0", "ironrdp-pdu", @@ -1245,13 +1349,16 @@ dependencies = [ [[package]] name = "ironrdp-connector" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "ironrdp-error", "ironrdp-pdu", "ironrdp-svc", + "picky", + "picky-asn1-der 0.5.0", + "picky-asn1-x509 0.13.0", "rand_core", - "sspi 0.11.1", + "sspi", "tracing", "url", "winapi", @@ -1260,7 +1367,7 @@ dependencies = [ [[package]] name = "ironrdp-displaycontrol" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "ironrdp-dvc", "ironrdp-pdu", @@ -1271,7 +1378,7 @@ dependencies = [ [[package]] name = "ironrdp-dvc" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "ironrdp-pdu", "ironrdp-svc", @@ -1282,12 +1389,12 @@ dependencies = [ [[package]] name = "ironrdp-error" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" [[package]] name = "ironrdp-graphics" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bit_field", "bitflags 2.6.0", @@ -1304,7 +1411,7 @@ dependencies = [ [[package]] name = "ironrdp-pdu" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bit_field", "bitflags 2.6.0", @@ -1326,7 +1433,7 @@ dependencies = [ [[package]] name = "ironrdp-rdpdr" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bitflags 2.6.0", "ironrdp-error", @@ -1338,16 +1445,18 @@ dependencies = [ [[package]] name = "ironrdp-rdpsnd" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ + "bitflags 2.6.0", "ironrdp-pdu", "ironrdp-svc", + "tracing", ] [[package]] name = "ironrdp-session" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "ironrdp-connector", "ironrdp-displaycontrol", @@ -1362,7 +1471,7 @@ dependencies = [ [[package]] name = "ironrdp-svc" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bitflags 2.6.0", "ironrdp-pdu", @@ -1371,7 +1480,7 @@ dependencies = [ [[package]] name = "ironrdp-tls" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "tokio", "tokio-rustls", @@ -1381,7 +1490,7 @@ dependencies = [ [[package]] name = "ironrdp-tokio" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bytes", "ironrdp-async", @@ -1413,17 +1522,35 @@ dependencies = [ "untrusted", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1465,7 +1592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1492,9 +1619,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "md-5" @@ -1544,15 +1671,22 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + [[package]] name = "nom" version = "7.1.3" @@ -1648,16 +1782,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - [[package]] name = "object" version = "0.36.0" @@ -1683,16 +1807,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "openssl-probe" -version = "0.1.5" +name = "opaque-debug" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] -name = "os_str_bytes" -version = "6.6.1" +name = "openssl-probe" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "overload" @@ -1724,6 +1848,20 @@ dependencies = [ "sha2", ] +[[package]] +name = "p521" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" +dependencies = [ + "base16ct", + "ecdsa", + "elliptic-curve", + "primeorder", + "rand_core", + "sha2", +] + [[package]] name = "parking_lot" version = "0.11.2" @@ -1737,9 +1875,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core 0.9.10", @@ -1769,9 +1907,15 @@ dependencies = [ "libc", "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + [[package]] name = "pbkdf2" version = "0.12.2" @@ -1806,24 +1950,36 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "picky" -version = "7.0.0-rc.8" +version = "7.0.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52cccdaffd2f361b4b4eb70b4249bd71d89bb66cb84b7f76483ecd1640c543ce" +checksum = "fe9b488630f493840c2e6ef270c3619a3dc2ad0953eb978d6e4273a8337fee5e" dependencies = [ - "base64", + "aes", + "aes-gcm", + "aes-kw", + "base64 0.22.1", + "cbc", + "des", "digest", "ed25519-dalek", + "hex", + "hmac", + "http", "md-5", "num-bigint-dig", "p256", "p384", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", + "p521", + "pbkdf2", + "picky-asn1 0.9.0", + "picky-asn1-der 0.5.0", + "picky-asn1-x509 0.13.0", "rand", "rand_core", + "rc2", "rsa", "serde", + "serde_json", "sha1", "sha2", "sha3", @@ -1841,17 +1997,39 @@ dependencies = [ "oid", "serde", "serde_bytes", - "time", - "zeroize", ] [[package]] -name = "picky-asn1-der" -version = "0.4.1" +name = "picky-asn1" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "360019b238b11b8c0e88cd9db3a6677f1af122e3422d0a26a2b576f084d9be36" +dependencies = [ + "oid", + "serde", + "serde_bytes", + "time", + "zeroize", +] + +[[package]] +name = "picky-asn1-der" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5df7873a9e36d42dadb393bea5e211fe83d793c172afad5fb4ec846ec582793f" dependencies = [ - "picky-asn1", + "picky-asn1 0.8.0", + "serde", + "serde_bytes", +] + +[[package]] +name = "picky-asn1-der" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04784987e157b5a8f832ce68b3364915dc6ef4bed94a6e10e241fa1bae3db2e3" +dependencies = [ + "picky-asn1 0.9.0", "serde", "serde_bytes", ] @@ -1862,11 +2040,24 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c5f20f71a68499ff32310f418a6fad8816eac1a2859ed3f0c5c741389dd6208" dependencies = [ - "base64", + "base64 0.21.7", + "oid", + "picky-asn1 0.8.0", + "picky-asn1-der 0.4.1", + "serde", +] + +[[package]] +name = "picky-asn1-x509" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3384ff768b1c4a04532916be77935f634a4738d3b2138da98798e90352fadf4" +dependencies = [ + "base64 0.22.1", "num-bigint-dig", "oid", - "picky-asn1", - "picky-asn1-der", + "picky-asn1 0.9.0", + "picky-asn1-der 0.5.0", "serde", "widestring", "zeroize", @@ -1874,9 +2065,9 @@ dependencies = [ [[package]] name = "picky-krb" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71cf61ebe6e657a81bcac31f9d61d52c23a1fd517b0dad77b915a7d3d15d2e8" +checksum = "e2213fd3942a9d3366b3e108b6d02db2227c80937a55f79a71e1719ab075bb77" dependencies = [ "aes", "byteorder", @@ -1887,9 +2078,9 @@ dependencies = [ "num-bigint-dig", "oid", "pbkdf2", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", + "picky-asn1 0.9.0", + "picky-asn1-der 0.5.0", + "picky-asn1-x509 0.13.0", "rand", "serde", "sha1", @@ -1897,6 +2088,26 @@ dependencies = [ "uuid", ] +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -1936,6 +2147,18 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + [[package]] name = "portpicker" version = "0.1.1" @@ -1957,6 +2180,16 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.68", +] + [[package]] name = "primeorder" version = "0.13.6" @@ -2020,6 +2253,15 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rc2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62c64daa8e9438b84aaae55010a93f396f8e60e3911590fcba770d04643fc1dd" +dependencies = [ + "cipher", +] + [[package]] name = "rdp-client" version = "0.1.0" @@ -2044,15 +2286,21 @@ dependencies = [ "iso7816", "iso7816-tlv", "log", - "parking_lot 0.12.2", + "parking_lot 0.12.3", + "picky", + "picky-asn1-der 0.4.1", + "picky-asn1-x509 0.12.0", "rand", "rand_chacha", + "reqwest", "rsa", - "sspi 0.10.1", + "rustls", + "sspi", "static_init", "tempfile", "tokio", "tokio-boring", + "url", "utf16string", "uuid", ] @@ -2106,20 +2354,21 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "base64", + "base64 0.22.1", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", + "hyper-util", "ipnet", "js-sys", "log", @@ -2128,13 +2377,12 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", - "rustls-native-certs", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", "tokio-rustls", "tower-service", @@ -2142,8 +2390,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", - "winreg 0.50.0", + "windows-registry", ] [[package]] @@ -2185,6 +2432,7 @@ dependencies = [ "pkcs1", "pkcs8", "rand_core", + "sha1", "signature", "spki", "subtle", @@ -2236,44 +2484,58 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ + "aws-lc-rs", "log", + "once_cell", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" dependencies = [ "openssl-probe", "rustls-pemfile", + "rustls-pki-types", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64", + "base64 0.22.1", + "rustls-pki-types", ] +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ + "aws-lc-rs", "ring", + "rustls-pki-types", "untrusted", ] @@ -2298,16 +2560,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sec1" version = "0.7.3" @@ -2391,6 +2643,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -2515,8 +2776,9 @@ dependencies = [ [[package]] name = "sspi" -version = "0.10.1" -source = "git+https://github.com/Devolutions/sspi-rs?rev=d54bdfcafa0e10d9d78224ebacc4f2a0992a6b79#d54bdfcafa0e10d9d78224ebacc4f2a0992a6b79" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1734839082c6d33f8368b40a40d0d5cc1ed10fbde00dc8a404f64e70272ed3f6" dependencies = [ "async-dnssd", "async-recursion", @@ -2534,13 +2796,16 @@ dependencies = [ "num-traits", "oid", "picky", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", + "picky-asn1 0.9.0", + "picky-asn1-der 0.5.0", + "picky-asn1-x509 0.13.0", "picky-krb", "portpicker", "rand", "reqwest", + "rsa", + "rustls", + "rustls-native-certs", "serde", "serde_derive", "sha1", @@ -2550,53 +2815,9 @@ dependencies = [ "tracing", "url", "uuid", - "winapi", - "windows", - "windows-sys 0.48.0", - "winreg 0.51.0", - "zeroize", -] - -[[package]] -name = "sspi" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d31fab47d9290be28a8d027c8428756826f1d4fe1e5ba0f51d24f52c568e21" -dependencies = [ - "async-dnssd", - "async-recursion", - "bitflags 2.6.0", - "byteorder", - "cfg-if", - "crypto-mac", - "futures", - "hmac", - "lazy_static", - "md-5", - "md4", - "num-bigint-dig", - "num-derive", - "num-traits", - "oid", - "picky", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", - "picky-krb", - "rand", - "serde", - "serde_derive", - "sha1", - "sha2", - "time", - "tokio", - "tracing", - "url", - "uuid", - "winapi", "windows", - "windows-sys 0.48.0", - "winreg 0.51.0", + "windows-sys 0.52.0", + "winreg", "zeroize", ] @@ -2636,15 +2857,15 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.4.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -2670,9 +2891,12 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -2685,27 +2909,6 @@ dependencies = [ "syn 2.0.68", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tap" version = "1.0.1" @@ -2714,31 +2917,17 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", + "windows-sys 0.59.0", ] -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - [[package]] name = "thiserror" version = "1.0.61" @@ -2839,21 +3028,20 @@ dependencies = [ [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2869,9 +3057,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -2880,36 +3068,70 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] [[package]] -name = "tokio-util" -version = "0.7.11" +name = "toml" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", ] [[package]] -name = "toml" -version = "0.5.11" +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ + "indexmap", "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + [[package]] name = "tower-service" version = "0.3.2" @@ -3021,6 +3243,16 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + [[package]] name = "untrusted" version = "0.9.0" @@ -3055,9 +3287,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "serde", @@ -3092,19 +3324,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -3129,9 +3362,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3139,9 +3372,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -3152,25 +3385,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki-roots" -version = "0.25.4" +name = "which" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] [[package]] name = "widestring" @@ -3194,15 +3433,6 @@ 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-x86_64-pc-windows-gnu" version = "0.4.0" @@ -3211,21 +3441,77 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.51.1" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ "windows-core", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.51.1" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ - "windows-targets 0.48.5", + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -3243,7 +3529,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -3263,18 +3558,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -3285,9 +3580,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3297,9 +3592,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3309,15 +3604,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -3327,9 +3622,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3339,9 +3634,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3351,9 +3646,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3363,25 +3658,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "winreg" -version = "0.50.0" +name = "winnow" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "memchr", ] [[package]] name = "winreg" -version = "0.51.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix index 8aec5a6dfe032..1b8d89fb0fe03 100644 --- a/pkgs/servers/teleport/16/default.nix +++ b/pkgs/servers/teleport/16/default.nix @@ -1,22 +1,21 @@ { wasm-bindgen-cli, ... }@args: import ../generic.nix (args // { - version = "16.1.4"; - hash = "sha256-WgMQzS7nwIwPojcf9HTLajLd0WV+RYEbyp/aWr9XFWc="; - vendorHash = "sha256-8WN4hVueA2o2bHhhxLGPYxPX+1qky8QHGTRqhEGNh9s="; + version = "16.2.0"; + hash = "sha256-3LLoO7SNJfEfDEU7JnAhmAOIdRO+TkgiJKjT8sqzelo="; + vendorHash = "sha256-iyYfht0aB9Vv2hsaqrieFHXbDhlotKQYfLn4JFqpve8="; pnpmHash = "sha256-phDrOSFQsgA+I4PDK9LJasUBXBO8EkVtQIMx9M4v8u0="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "boring-4.7.0" = "sha256-ACzw4Bfo6OUrwvi3h21tvx5CpdQaWCEIDkslzjzy9o8="; - "ironrdp-async-0.1.0" = "sha256-nE5O/wRJ3vJqJG5zdYmpVkhx6JC6Yb92pR4EKSWSdkA="; - "sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk="; - }; + "boring-4.7.0" = "sha256-ACzw4Bfo6OUrwvi3h21tvx5CpdQaWCEIDkslzjzy9o8="; + "ironrdp-async-0.1.0" = "sha256-DOwDHavDaEda+JK9M6kbvseoXe2LxJg3MLTY/Nu+PN0="; + }; }; # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock wasm-bindgen-cli = wasm-bindgen-cli.override { - version = "0.2.92"; - hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="; - cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0="; + version = "0.2.93"; + hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="; + cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ="; }; }) diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 87719f03eb728..2fcdc7f4a655d 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -54,7 +54,7 @@ let buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; nativeBuildInputs = [ pkg-config ]; # https://github.com/NixOS/nixpkgs/issues/161570 , @@ -144,7 +144,7 @@ buildGoModule rec { ++ lib.optional withRdpClient "desktop_access_rdp"; buildInputs = [ openssl libfido2 ] - ++ lib.optionals (stdenv.isDarwin && withRdpClient) [ CoreFoundation Security AppKit ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && withRdpClient) [ CoreFoundation Security AppKit ]; nativeBuildInputs = [ makeWrapper pkg-config ]; patches = extPatches ++ [ diff --git a/pkgs/servers/tidb/default.nix b/pkgs/servers/tidb/default.nix index c5da10baaa3ce..3c251dacb7d26 100644 --- a/pkgs/servers/tidb/default.nix +++ b/pkgs/servers/tidb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tidb"; - version = "8.1.0"; + version = "8.3.0"; src = fetchFromGitHub { owner = "pingcap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i8soETbTWmFZQqKYcRoLXVIgFCQxHDvXZbJNjDmS8Jo="; + sha256 = "sha256-dlLT1vwRZ6vbfCRcMxevJQ99T2Aq4qaAVwitmcd9yJ4="; }; - vendorHash = "sha256-RNYL5tb6d8NhNiOm3x8sgo1SEc8+uMdWgYor/VL3C6s="; + vendorHash = "sha256-NZv4DrPygSNCcK0A7VTGz0wIuHSR+Tf5Dhf5JuqiQ5A="; ldflags = [ "-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${version}" diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index fbd633b43cff6..c4a01d6707f3c 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-SSAeJOOd282Mnmaj/W5sM8J64qvD9/0SvlbHUtXYYF8="; + hash = "sha256-jWoGKY+kC9VAK7jPFaGMJQkC/JeAiUjzqKhE2XjuJio="; }; vendorHash = null; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index d9759fa66fc34..db5c231b45de6 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,17 +1,17 @@ -{ lib, fetchzip, buildGoModule, nixosTests }: +{ lib, fetchzip, buildGo123Module, nixosTests }: -buildGoModule rec { +buildGo123Module rec { pname = "traefik"; - version = "3.1.2"; + version = "3.1.4"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-PHS4x9RDoc2zDPS1SaYYEeZVa4SyQpvqzPT/SDo1ygg="; + hash = "sha256-e77PCMeN6Ck6hQ3Rx7MU4EL+f/1kpA2E+gVcISoUnf4="; stripRoot = false; }; - vendorHash = "sha256-xQPDlwu/mRdyvZW0qSCA9eko9pOQAMwh2vVJWzMnyfs="; + vendorHash = "sha256-iYwA/y9AuHomyEckOyl4845lkQkeBAFDsGiZWESylqs="; subPackages = [ "cmd/traefik" ]; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 247ac6832db32..3852f139935c5 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -30,8 +30,8 @@ buildGoModule rec { }) ]; - propagatedBuildInputs = lib.optionals stdenv.isLinux [ trezor-udev-rules ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; ldflags = [ "-s" "-w" diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 1caad13bc76c7..1c7684f273a94 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, dpkg, fetchurl, zip, nixosTests }: let - generic = { version, sha256, suffix ? "", ... } @ args: + generic = { version, sha256, suffix ? "", knownVulnerabilities ? [ ], ... } @ args: stdenv.mkDerivation (args // { pname = "unifi-controller"; @@ -39,6 +39,7 @@ let license = licenses.unfree; platforms = platforms.unix; maintainers = with maintainers; [ globin patryk27 ]; + inherit knownVulnerabilities; }; }); @@ -49,11 +50,12 @@ in rec { version = "7.5.187"; suffix = "-f57f5bf7ab"; sha256 = "sha256-a5kl8gZbRnhS/p1imPl7soM0/QSFHdM0+2bNmDfc1mY="; + knownVulnerabilities = [ "CVE-2024-42025" ]; }; unifi8 = generic { - version = "8.3.32"; - suffix = "-896f48ed11"; - sha256 = "sha256-pqylClAEQtkEExIPOY1pRiymmYFvWxOOcqy+iCkWx5w="; + version = "8.4.62"; + suffix = "-i3q2j125cz"; + sha256 = "sha256-7qEk6zpihJfgxCoVa8fVSMZN87sHG5XhWpuZoBvB5QU="; }; } diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index d3cb4c7d47b2e..30091834a8567 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorHash = "sha256-wWIw0gNn5tqRq0udzPy/n2OkiIVESpSotOSn2YlBNS4="; - buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa WebKit ]; ldflags = [ "-s" "-w" "-X golift.io/version.Version=${version}" ]; diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix index c79156a8f3c2c..c8111fc648b9d 100644 --- a/pkgs/servers/ursadb/default.nix +++ b/pkgs/servers/ursadb/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ msm ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 1f874236fbd6b..7f9ecbab67d30 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -9,9 +9,9 @@ , zlib # plugins: list of strings, eg. [ "python2" "python3" ] , plugins ? [] -, pam, withPAM ? stdenv.isLinux +, pam, withPAM ? stdenv.hostPlatform.isLinux , systemd, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, libcap, withCap ? stdenv.isLinux +, libcap, withCap ? stdenv.hostPlatform.isLinux , python2, python3, ncurses , ruby, php , makeWrapper, fetchFromGitHub @@ -71,13 +71,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "uwsgi"; - version = "2.0.26"; + version = "2.0.27"; src = fetchFromGitHub { owner = "unbit"; repo = "uwsgi"; rev = finalAttrs.version; - hash = "sha256-3nmmVNNDvQ1RzaD5BQFrScHHnmUtMwjo3wodEGIJCvI="; + hash = "sha256-GOI92fwTfO/XAvNUHJMX6BtGFSVVOPWa1Jjw/UCJGi4="; }; patches = [ @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ jansson pcre libxcrypt ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ expat zlib ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ expat zlib ] ++ lib.optional withPAM pam ++ lib.optional withSystemd systemd ++ lib.optional withCap libcap diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index ddc190a2887a3..8814bd41e04b9 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -32,7 +32,7 @@ let ''; # https://github.com/varnishcache/varnish-cache/issues/1875 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-fexcess-precision=standard"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-fexcess-precision=standard"; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index c99f93625f974..f8e4be274be4b 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "24.05.2"; + version = "24.05.4"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "13yln6b5j9plkcrp1mwfvgcv67gm2ayb2l2grhw2h4ncqnvmxhwv"; + sha256 = "1aa4im2khxycv5i2ff23ss91p4kr7d2a4yhjm0k0n6av64zhz2x3"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index b5bed1867065d..423fd28c8736e 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -5,20 +5,20 @@ let "aws/aws-crt-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-crt-php-0ea1f04ec5aa9f049f97e012d1ed63b76834a31b"; + name = "aws-aws-crt-php-a63485b65b6b3367039306496d49737cf1995408"; src = fetchurl { - url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/0ea1f04ec5aa9f049f97e012d1ed63b76834a31b"; - sha256 = "1xx5yhq99z752pagij5djja4812p4s711188j8qk8wi0dl7331zm"; + url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/a63485b65b6b3367039306496d49737cf1995408"; + sha256 = "0sga71rp99dxjx524wxrn9lrjca4fd5iniphzwd9ss97w9nihq9i"; }; }; }; "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-731cd73062909594c5f7443413c4c4c40ed1c25c"; + name = "aws-aws-sdk-php-702b9955160d2dacdf2cdf4d4476fcf95eae1aaf"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/731cd73062909594c5f7443413c4c4c40ed1c25c"; - sha256 = "1bs6l34j3r1nr7750ssrannbi8x5pdwknlzhmqx84xajm9imiqcp"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/702b9955160d2dacdf2cdf4d4476fcf95eae1aaf"; + sha256 = "0yhld9v2qbdrw3bz8dwjhv60mbjyr632rqnj593h3bsxf4w3l7vj"; }; }; }; @@ -55,20 +55,20 @@ let "dasprid/enum" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dasprid-enum-6faf451159fb8ba4126b925ed2d78acfce0dc016"; + name = "dasprid-enum-8dfd07c6d2cf31c8da90c53b83c026c7696dda90"; src = fetchurl { - url = "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016"; - sha256 = "1c3c7zdmpd5j1pw9am0k3mj8n17vy6xjhsh2qa7c0azz0f21jk4j"; + url = "https://api.github.com/repos/DASPRiD/Enum/zipball/8dfd07c6d2cf31c8da90c53b83c026c7696dda90"; + sha256 = "1ainxbpfbh9fir2vihc4q614yq6rc3lvz6836nddl50wx2zpcby2"; }; }; }; "dflydev/dot-access-data" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dflydev-dot-access-data-f41715465d65213d644d3141a6a93081be5d3549"; + name = "dflydev-dot-access-data-a23a2bf4f31d3518f3ecb38660c95715dfead60f"; src = fetchurl { - url = "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549"; - sha256 = "1vgbjrq8qh06r26y5nlxfin4989r3h7dib1jifb2l3cjdn1r5bmj"; + url = "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/a23a2bf4f31d3518f3ecb38660c95715dfead60f"; + sha256 = "0j0rywsfpna100ygdk5f2ngijc8cp785szz84274mq8gdzhan06l"; }; }; }; @@ -85,10 +85,10 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-b05e48a745f722801f55408d0dbd8003b403dbbd"; + name = "doctrine-dbal-d8f68ea6cc00912e5313237130b8c8decf4d28c6"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/b05e48a745f722801f55408d0dbd8003b403dbbd"; - sha256 = "0bca75y1wadpab0ns31s3wbvvxsq108i8jfyrh4xnifl56wb8pvh"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/d8f68ea6cc00912e5313237130b8c8decf4d28c6"; + sha256 = "0ay8x80cyfnr83c3bpjkabh0hlzz7hibd8jpfr24gsrf592sz82m"; }; }; }; @@ -185,40 +185,40 @@ let "graham-campbell/result-type" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "graham-campbell-result-type-fbd48bce38f73f8a4ec8583362e732e4095e5862"; + name = "graham-campbell-result-type-3ba905c11371512af9d9bdd27d99b782216b6945"; src = fetchurl { - url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862"; - sha256 = "1mzahy4df8d45qm716crs45rp5j7k31r0jhkmbrrvqsvapnmj9ip"; + url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945"; + sha256 = "16bsycdsgcf4jz2sd277958rn9k9mzxjnby20xpmyhb7s8c2rac7"; }; }; }; "guzzlehttp/guzzle" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-guzzle-41042bc7ab002487b876a0683fc8dce04ddce104"; + name = "guzzlehttp-guzzle-d281ed313b989f213357e3be1a179f02196ac99b"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104"; - sha256 = "0awhhka285kk0apv92n0a0yfbihi2ddnx3qr1c7s97asgxfnwxsv"; + url = "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b"; + sha256 = "048hm3r04ldk2w9pqja6jmkc590h1kln3136128bn7zzdg1vmqi4"; }; }; }; "guzzlehttp/promises" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-promises-bbff78d96034045e58e13dedd6ad91b5d1253223"; + name = "guzzlehttp-promises-6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223"; - sha256 = "1p0bry118c3lichkz8lag37ndvvhbd2nf0k9kzwi8gz1bzf9d45f"; + url = "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"; + sha256 = "03l91ksymgygdwa30ry0752564nrwkbgmrmlhmmhq89v06i70lln"; }; }; }; "guzzlehttp/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-45b30f99ac27b5ca93cb4831afe16285f57b8221"; + name = "guzzlehttp-psr7-a70f5c95fb43bc83f07c9c948baa0dc1829bf201"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221"; - sha256 = "0k60pzfpxd6q1rhr9gbf53j0hm9wj5p5spkc0zfyia4b8f8pgmdm"; + url = "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201"; + sha256 = "1xp4c6v1qszbhzdgcgbd03dvxsk0s0vysr3q4rvhm134qlkbrdf2"; }; }; }; @@ -245,10 +245,10 @@ let "intervention/image" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "intervention-image-d428433aa74836ab75e8d4a5241628bebb7f4077"; + name = "intervention-image-1786ad5e1789050939d73cd195de4b8eaeeb34ed"; src = fetchurl { - url = "https://api.github.com/repos/Intervention/image/zipball/d428433aa74836ab75e8d4a5241628bebb7f4077"; - sha256 = "0qglsydy5672kl1f12pp185zw4vk30jh151bgjvyakggwiabds57"; + url = "https://api.github.com/repos/Intervention/image/zipball/1786ad5e1789050939d73cd195de4b8eaeeb34ed"; + sha256 = "1hx23frhjsisss19xzhjmrv7ymf0siqp1g50xvx27kisp7ifyv1k"; }; }; }; @@ -265,40 +265,40 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-590afea38e708022662629fbf5184351fa82cf08"; + name = "laravel-framework-be2be342d4c74db6a8d2bd18469cd6d488ab9c98"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/590afea38e708022662629fbf5184351fa82cf08"; - sha256 = "0gnp0khw8a1rydrv06pi4sssx6fyvdwvcqsgjh8rjcbcs39f1ii5"; + url = "https://api.github.com/repos/laravel/framework/zipball/be2be342d4c74db6a8d2bd18469cd6d488ab9c98"; + sha256 = "0r62pimjsqcgip725qh4zmb7icssf84larffjv2l0g4f31683h6x"; }; }; }; "laravel/prompts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-prompts-9bc4df7c699b0452c6b815e64a2d84b6d7f99400"; + name = "laravel-prompts-7b4029a84c37cb2725fc7f011586e2997040bc95"; src = fetchurl { - url = "https://api.github.com/repos/laravel/prompts/zipball/9bc4df7c699b0452c6b815e64a2d84b6d7f99400"; - sha256 = "05hf1r10l8fbxy4wy4g4sjwqvd28liq5n4gjyhsc54kj2jp5bba0"; + url = "https://api.github.com/repos/laravel/prompts/zipball/7b4029a84c37cb2725fc7f011586e2997040bc95"; + sha256 = "0fzww2cdpm5l6smas1kw47wh9j0w72z00bb8ahxyzlz0gl4k7jz8"; }; }; }; "laravel/serializable-closure" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-serializable-closure-3dbf8a8e914634c48d389c1234552666b3d43754"; + name = "laravel-serializable-closure-61b87392d986dc49ad5ef64e75b1ff5fee24ef81"; src = fetchurl { - url = "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754"; - sha256 = "1vvayh1bzbw16xj8ash4flibkgn5afwn64nfwmjdi7lcr48cw65q"; + url = "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81"; + sha256 = "02mpbd5qv27p5637yyyx8jpx6x3sgjdj1j5immlgc73j7a0vj7xl"; }; }; }; "laravel/socialite" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-socialite-c7b0193a3753a29aff8ce80aa2f511917e6ed68a"; + name = "laravel-socialite-cc02625f0bd1f95dc3688eb041cce0f1e709d029"; src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/c7b0193a3753a29aff8ce80aa2f511917e6ed68a"; - sha256 = "0aym6n2ljqwfxrm5s3h7q98xggnblhk5q4whn46wyyvclqysj2bs"; + url = "https://api.github.com/repos/laravel/socialite/zipball/cc02625f0bd1f95dc3688eb041cce0f1e709d029"; + sha256 = "1fcrk4h4gwb06x842225yk1mbja0bbrzjd7dxkhqzvccfkd3q1km"; }; }; }; @@ -315,10 +315,10 @@ let "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-91c24291965bd6d7c46c46a12ba7492f83b1cadf"; + name = "league-commonmark-b650144166dfa7703e62a22e493b853b58d874b0"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf"; - sha256 = "1i7yqcp4hdzz1k6qga96jwp9qpw7dxlfr5miw48zyym60ndk9n02"; + url = "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0"; + sha256 = "0ggjlpjdjvk9dxdav2264j7ycazsg6s5wlzmv8ihv375wi20dg5g"; }; }; }; @@ -415,10 +415,10 @@ let "monolog/monolog" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "monolog-monolog-4b18b21a5527a3d5ffdac2fd35d3ab25a9597654"; + name = "monolog-monolog-f4393b648b78a5408747de94fca38beb5f7e9ef8"; src = fetchurl { - url = "https://api.github.com/repos/Seldaek/monolog/zipball/4b18b21a5527a3d5ffdac2fd35d3ab25a9597654"; - sha256 = "1k7ggaygbcm3ls9pkwm5qmf3a1b5i1bd953jy839km0lh4gz637s"; + url = "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8"; + sha256 = "0jz5b9rss98xa4bw0y4bp3by9vpbw97scwndkjimq7kwr9n6kpjy"; }; }; }; @@ -455,20 +455,20 @@ let "nette/utils" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nette-utils-d3ad0aa3b9f934602cb3e3902ebccf10be34d218"; + name = "nette-utils-736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"; src = fetchurl { - url = "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218"; - sha256 = "11df93i9xkwkfq33hqf2x562a36sibzpc6rkbblz2r10mna6qw6q"; + url = "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"; + sha256 = "1v81fswairscrnakbrfh8mlh5i873krlgvhv6ngsb9pi281x6r2b"; }; }; }; "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-139676794dc1e9231bf7bcd123cfc0c99182cb13"; + name = "nikic-php-parser-683130c2ff8c2739f4822ff7ac5c873ec529abd1"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13"; - sha256 = "1z4bvxvxs09099i3khiydmzy8lqjvk8kdani2qipmkq9vzf9pq56"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1"; + sha256 = "1wwjddqsbq94grckdnplcg8c3423y2jw2mx97n2k7f8wlq4q1fhv"; }; }; }; @@ -535,20 +535,20 @@ let "phpoption/phpoption" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpoption-phpoption-80735db690fe4fc5c76dfa7f9b770634285fa820"; + name = "phpoption-phpoption-e3fac8b24f56113f7cb96af14958c0dd16330f54"; src = fetchurl { - url = "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820"; - sha256 = "1f9hzyjnam157lb7iw9r8f5cnjjsiqam9mnkpqmba73g1668xn9s"; + url = "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54"; + sha256 = "0rbw9mljc00rx2drrqpmwfs47s77iprxvpbff2vqw082x4y989rq"; }; }; }; "phpseclib/phpseclib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-cfa2013d0f68c062055180dd4328cc8b9d1f30b8"; + name = "phpseclib-phpseclib-621c73f7dcb310b61de34d1da4c4204e8ace6ceb"; src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8"; - sha256 = "1wgzy4fbj565czpn9xasr8lnd9ilh1x3bsalrpx5bskvqr4zspgj"; + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/621c73f7dcb310b61de34d1da4c4204e8ace6ceb"; + sha256 = "1p3asiv3cak3m6lla66bgxiwz00nwn1dd6lwnqgdpqyqh6gbln1n"; }; }; }; @@ -645,10 +645,10 @@ let "psr/log" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-log-fe5ea303b0887d5caefd3d431c3e61ad47037001"; + name = "psr-log-79dff0b268932c640297f5208d6298f71855c03e"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001"; - sha256 = "0a0rwg38vdkmal3nwsgx58z06qkfl85w2yvhbgwg45anr0b3bhmv"; + url = "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e"; + sha256 = "18vvdj61v85glmr26i1jl1x93cq2c1aq1ajpa6z4l749c62670f2"; }; }; }; @@ -665,10 +665,10 @@ let "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73"; + name = "psy-psysh-2fd717afa05341b4f8152547f142cd2f130f6818"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73"; - sha256 = "0k3fz94cafw7r8wrs5ybb15wmxiv65yqkyhj2l3m185659iym2p3"; + url = "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818"; + sha256 = "009mhfsh6vsrygdmr5b64w8mppw6j2n8ajbx856dpcwjji8fx8q7"; }; }; }; @@ -715,10 +715,10 @@ let "sabberworm/php-css-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "sabberworm-php-css-parser-4a3d572b0f8b28bb6fd016ae8bbfc445facef152"; + name = "sabberworm-php-css-parser-d2fb94a9641be84d79c7548c6d39bbebba6e9a70"; src = fetchurl { - url = "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4a3d572b0f8b28bb6fd016ae8bbfc445facef152"; - sha256 = "1gs3q8j70ccwa2s3icf936xxik8h3qi5plkpvw4ygzkb9vkcicdv"; + url = "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d2fb94a9641be84d79c7548c6d39bbebba6e9a70"; + sha256 = "0dvn86wx9h4vlw7wz7v1jq8ba654s060dg3186z2cr2q9f636dy2"; }; }; }; @@ -805,10 +805,10 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-be5854cee0e8c7b110f00d695d11debdfa1a2a91"; + name = "symfony-console-504974cbe43d05f83b201d6498c206f16fc0cdbc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91"; - sha256 = "018il5dccpnk2988sgxp26440wrx25j064gns7plnidmx7byxjpw"; + url = "https://api.github.com/repos/symfony/console/zipball/504974cbe43d05f83b201d6498c206f16fc0cdbc"; + sha256 = "004hx7047y2cknj54kfifj28rchvx7k1635y28gmaq5k5caahfd8"; }; }; }; @@ -835,10 +835,10 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc"; + name = "symfony-error-handler-231f1b2ee80f72daa1972f7340297d67439224f0"; src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc"; - sha256 = "0r29dqwxs2xmv404rfcidf83rycfm9fqv7hsqaz3jwms00y770gg"; + url = "https://api.github.com/repos/symfony/error-handler/zipball/231f1b2ee80f72daa1972f7340297d67439224f0"; + sha256 = "0bdphr8xv4d9ln3yiaajzxfvybc6kvcpsybf69kg6f2v88p14pj7"; }; }; }; @@ -865,130 +865,130 @@ let "symfony/finder" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-finder-3ef977a43883215d560a2cecb82ec8e62131471c"; + name = "symfony-finder-af29198d87112bebdd397bd7735fbd115997824c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c"; - sha256 = "1ibv2sk2bfg6hymxhs6p6g62h7ycw1w2lg1w1q78pql1nxvrp7ks"; + url = "https://api.github.com/repos/symfony/finder/zipball/af29198d87112bebdd397bd7735fbd115997824c"; + sha256 = "0wgc1rr6fg9prsmjbkcaf530h1gf1v8wnab84sfzpcrwaa4abdmv"; }; }; }; "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-27de8cc95e11db7a50b027e71caaab9024545947"; + name = "symfony-http-foundation-117f1f20a7ade7bcea28b861fb79160a21a1e37b"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947"; - sha256 = "11bf0fhb7pf5jp5kpd7nm8sil9mnnvhihj4l23gx514m81anzfi0"; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/117f1f20a7ade7bcea28b861fb79160a21a1e37b"; + sha256 = "1rgzpb9v9502d5f0zlq7h0s15i1lg63clsx1j5cw51w2y079frgn"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1"; + name = "symfony-http-kernel-147e0daf618d7575b5007055340d09aece5cf068"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1"; - sha256 = "0y2qsnymkagnds6qwgfv2lbf9i3jf0f4frs1psa35mkb64c58hkg"; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/147e0daf618d7575b5007055340d09aece5cf068"; + sha256 = "1bpv2zwsgz1ki9vzhcz5jj9c712zz6crncw2gw88n10gn2sir1cj"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-618597ab8b78ac86d1c75a9d0b35540cda074f33"; + name = "symfony-mime-7d048964877324debdcb4e0549becfa064a20d43"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/618597ab8b78ac86d1c75a9d0b35540cda074f33"; - sha256 = "1rklzg8j8s6ls770l8rqz7mb10nrifr228zmqpxdqkpfrs8j0w3z"; + url = "https://api.github.com/repos/symfony/mime/zipball/7d048964877324debdcb4e0549becfa064a20d43"; + sha256 = "0i9falma5rwi59cjylibgzj70gqj0vrkpkf9g8mxzy62ij5l61rq"; }; }; }; "symfony/polyfill-ctype" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-ctype-ef4d7e442ca910c4764bce785146269b30cb5fc4"; + name = "symfony-polyfill-ctype-0424dff1c58f028c451efff2045f5d92410bd540"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4"; - sha256 = "16wr6dp9yr4wks11d1qjyzpc343ri2nr7q7fmrnp3jhmp949rppy"; + url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540"; + sha256 = "1lcz3k1i3yndy1qkdh89n05m60hh3g1zi438l0qf92j5hy2pr32n"; }; }; }; "symfony/polyfill-intl-grapheme" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-grapheme-32a9da87d7b3245e09ac426c83d334ae9f06f80f"; + name = "symfony-polyfill-intl-grapheme-64647a7c30b2283f5d49b874d84a18fc22054b7a"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f"; - sha256 = "03wk7yxavld4jnvavy7m2d3xxn5h4938wypgwjkblgx8n7s93jiq"; + url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a"; + sha256 = "1flqdijnx2kz2i9jdaz23ambii3nx60j211hcjzdf5mzmbic4izr"; }; }; }; "symfony/polyfill-intl-idn" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-idn-a287ed7475f85bf6f61890146edbc932c0fff919"; + name = "symfony-polyfill-intl-idn-a6e83bdeb3c84391d1dfe16f42e40727ce524a5c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919"; - sha256 = "14x9hv01fn5dmpkm7480lgzhz4lqdi3w1hlkh3sjpb6ic87k0wc1"; + url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c"; + sha256 = "1y81p5kkrclbgq1v3qgf32mpgn6q1hjkw0n6328n2n81wj32japg"; }; }; }; "symfony/polyfill-intl-normalizer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-normalizer-bc45c394692b948b4d383a08d7753968bed9a83d"; + name = "symfony-polyfill-intl-normalizer-a95281b0be0d9ab48050ebd988b967875cdb9fdb"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d"; - sha256 = "1zq1kklvjl4zj2v6yjzg7rv6ibvhxfymgi2xb0m5cw9r6i63rinw"; + url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb"; + sha256 = "1bsynsi3gqcdi5asgip7srnwciwz7dflzqx1n0c9x3zmd128fs42"; }; }; }; "symfony/polyfill-mbstring" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-mbstring-9773676c8a1bb1f8d4340a62efe641cf76eda7ec"; + name = "symfony-polyfill-mbstring-fd22ab50000ef01661e2a31d850ebaa297f8e03c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec"; - sha256 = "1jpa4wwjfdkkhdpisviy1p4fhik00cldj5msipwl0izkia1d2qgf"; + url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c"; + sha256 = "145vqkfca4h0smyjnhcsvn85ij75bbp9a5s3m672nn48671a8sxk"; }; }; }; "symfony/polyfill-php72" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php72-861391a8da9a04cbad2d232ddd9e4893220d6e25"; + name = "symfony-polyfill-php72-10112722600777e02d2745716b70c5db4ca70442"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25"; - sha256 = "0b4nw7x6c7jjn9bvkpqjnpszx647lncyswpk2iz57c1xl5dqywvh"; + url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442"; + sha256 = "1l9qpprnqrjjhkwggcz0c6ll8wrfzwlqcwq13xa0j9w0q5bwafp2"; }; }; }; "symfony/polyfill-php80" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php80-87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"; + name = "symfony-polyfill-php80-77fa7995ac1b21ab60769b7323d600a991a90433"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"; - sha256 = "1pn6dzj8b3h8851w3y6mj5qrwklwky5w71v4m455553qlga5cfr7"; + url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433"; + sha256 = "03y0jzb5z1d2jdxcw1mhcbb9psp1iabmvaflwib68vzncvh6fscl"; }; }; }; "symfony/polyfill-php83" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php83-86fcae159633351e5fd145d1c47de6c528f8caff"; + name = "symfony-polyfill-php83-dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff"; - sha256 = "0n81fmn058rn7hr70qdwpsnam57pp27avs3h8xcfnq8d3hci5gr4"; + url = "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9"; + sha256 = "1sxmb6f75iclbpqwlsgi3af1xfcrxm7vcyyh0khn14nvd654ivrl"; }; }; }; "symfony/polyfill-uuid" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-uuid-3abdd21b0ceaa3000ee950097bc3cf9efc137853"; + name = "symfony-polyfill-uuid-2ba1f33797470debcda07fe9dce20a0003df18e9"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853"; - sha256 = "15g5ng1bcca4nqxjrcjabc1v679zl6xwm1wwfngvww1hvrbgd98d"; + url = "https://api.github.com/repos/symfony/polyfill-uuid/zipball/2ba1f33797470debcda07fe9dce20a0003df18e9"; + sha256 = "1hsfsap6qmlkzfi56z44wgds5igw9xj7rax2znr8y3ci4x9sbxd0"; }; }; }; @@ -1005,10 +1005,10 @@ let "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58"; + name = "symfony-routing-aad19fe10753ba842f0d653a8db819c4b3affa87"; src = fetchurl { - url = "https://api.github.com/repos/symfony/routing/zipball/8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58"; - sha256 = "1ayhdyvc503xjjaaz6vclsxbm568l73zybcbxiz6g1625cg4g8gb"; + url = "https://api.github.com/repos/symfony/routing/zipball/aad19fe10753ba842f0d653a8db819c4b3affa87"; + sha256 = "1cm2x1bffnm0parfkw3xixz8igj52pc4vv6hydkj0l2i3qrv4y0g"; }; }; }; @@ -1025,20 +1025,20 @@ let "symfony/string" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-string-a147c0f826c4a1f3afb763ab8e009e37c877a44d"; + name = "symfony-string-ccf9b30251719567bfd46494138327522b9a9446"; src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d"; - sha256 = "1fkpq4lw9rp3wccdjj8qhpl02asp1izvji53sd0gzq4z3djq0y7p"; + url = "https://api.github.com/repos/symfony/string/zipball/ccf9b30251719567bfd46494138327522b9a9446"; + sha256 = "1yfdvksfhpq74vb45d3p8rnkbr43djbcy15gyi0vsbgccr64gc1v"; }; }; }; "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-a002933b13989fc4bd0b58e04bf7eec5210e438a"; + name = "symfony-translation-94041203f8ac200ae9e7c6a18fa6137814ccecc9"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation/zipball/a002933b13989fc4bd0b58e04bf7eec5210e438a"; - sha256 = "0a6rw66b6yysafkyhgzpqq147cm38id3v1kksnzgna528d5cac87"; + url = "https://api.github.com/repos/symfony/translation/zipball/94041203f8ac200ae9e7c6a18fa6137814ccecc9"; + sha256 = "01kzjwvkq434d36c5ag9qfzi4fdb3klcbx1gsrwx6zc3wvxs50x1"; }; }; }; @@ -1065,10 +1065,10 @@ let "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-ad23ca4312395f0a8a8633c831ef4c4ee542ed25"; + name = "symfony-var-dumper-a71cc3374f5fb9759da1961d28c452373b343dd4"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/ad23ca4312395f0a8a8633c831ef4c4ee542ed25"; - sha256 = "077ppd7v37qh6rfrv76apa1hm4apaqj5iskbfwlm32cndv0bnxk1"; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/a71cc3374f5fb9759da1961d28c452373b343dd4"; + sha256 = "19nwa0qydp0g0s5fvcm7h90973c1j1q5llrg80v43qgv3wgawp36"; }; }; }; @@ -1085,10 +1085,10 @@ let "vlucas/phpdotenv" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "vlucas-phpdotenv-2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"; + name = "vlucas-phpdotenv-a59a13791077fe3d44f90e7133eb68e7d22eaff2"; src = fetchurl { - url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"; - sha256 = "0zb5gm5i6rnmm9zc4mi3wkkhpgciaa76w8jyxnw914xwq1xqzivx"; + url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2"; + sha256 = "1w7nyghdx0vw0v3rqzx0x3lafhrkgfk2fi3xiy5vf4lkbv3rdl4h"; }; }; }; diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index 55d27b196362c..b87d71867d417 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.24"; + version = "0.46.04"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = "refs/tags/${version}"; - hash = "sha256-VltrcTbX95agV9JGV2KYGeZ6iUlgzrOsjShsUpiGfes="; + hash = "sha256-V1nGVURA4nksDX0kXxfPbO/rB0nmECqpfysenpzcfZs="; }; postPatch = '' @@ -30,9 +30,11 @@ python3.pkgs.buildPythonApplication rec { apprise beautifulsoup4 brotli + babel chardet cryptography dnspython + elementpath eventlet feedgen flask diff --git a/pkgs/servers/web-apps/ethercalc/node-packages.nix b/pkgs/servers/web-apps/ethercalc/node-packages.nix index e9c5ff0e4fee6..0a4e2b7c9aba7 100644 --- a/pkgs/servers/web-apps/ethercalc/node-packages.nix +++ b/pkgs/servers/web-apps/ethercalc/node-packages.nix @@ -8,7 +8,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages-generated.nix { diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index f20658fb410e3..c018b0c505a92 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.24.2"; + version = "1.24.3"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-NlaJ+iMBUd2hhf3IidxdPHuEr+cqOTQmtfisauxqr2Q="; + hash = "sha256-JgniYjw+Fk5EaXrXVjelBYBP1JOZarAF07iToiwnkdY="; }; postPatch = '' diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index 5436555cd28a0..5f366a255a0ff 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -14,14 +14,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "3.4"; + version = "3.6"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-hiuw7XfCDy+9fzuQMaeN9+XsENeBI1RNXy8IM1HIFhI="; + sha256 = "sha256-aKt9L3ZgZ8HffcNNJaR+hAI38raWuLp2q/6+rvkl2pM="; }; propagatedBuildInputs = with py.pkgs; [ diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index e079ac81b30f3..1db614f03acb4 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -6,18 +6,18 @@ , yarn , makeBinaryWrapper , nodejs -, python311 +, python3 , nixosTests }: let - version = "1.9.9"; + version = "1.10.0"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; rev = version; - hash = "sha256-6eKTgEZ+YLoSmPQWBS95fJ+ioIxeTVlT+moqslByPPw="; + hash = "sha256-cRIpcoD9WzLYxKYpkvhRxUmeyJR5z2QyqApzWvQND+s="; }; # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles @@ -42,7 +42,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-Ga+tl4oZlum43tdfez1oWGMHZAfyePGl47S+9NRRvW8="; + outputHash = "sha256-RV9xzNVE4//tPVWVaET78ML3ah+hkZ8x6mTAxe5/pdE="; }; in stdenv.mkDerivation { @@ -51,12 +51,12 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeBinaryWrapper + (python3.withPackages (ps: with ps; [ setuptools ])) # required to build sqlite3 bindings yarn - python311 # needed for sqlite node-gyp ]; buildInputs = [ - nodejs + nodejs # for shebangs ]; dontConfigure = true; @@ -67,15 +67,8 @@ in stdenv.mkDerivation { export HOME=$(mktemp -d) yarn config set enableTelemetry 0 yarn config set cacheFolder ${offlineCache} + export npm_config_nodedir=${nodejs} # prevent node-gyp from downloading headers - # This will fail but create the sqlite3 files we can patch - yarn --immutable-cache || : - - # Ensure we don't download any node things - sed -i 's:--fallback-to-build:--build-from-source --nodedir=${nodejs}/include/node:g' node_modules/sqlite3/package.json - export CPPFLAGS="-I${nodejs}/include/node" - - # Perform the actual install yarn --immutable-cache yarn run build diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index 32d7249ffc6a6..c60ac20cea444 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.tests = { + # Test requires running Jitsi Videobridge and Jicofo which are Linux-only + passthru.tests = lib.optionalAttrs stdenv.isLinux { single-host-smoke-test = nixosTests.jitsi-meet; }; diff --git a/pkgs/servers/web-apps/kavita/default.nix b/pkgs/servers/web-apps/kavita/default.nix index 1adbbecec3bbd..0225e2a346b80 100644 --- a/pkgs/servers/web-apps/kavita/default.nix +++ b/pkgs/servers/web-apps/kavita/default.nix @@ -1,23 +1,22 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, buildDotnetModule -, buildNpmPackage -, dotnetCorePackages -, nixosTests +{ + lib, + stdenvNoCC, + fetchFromGitHub, + buildDotnetModule, + buildNpmPackage, + dotnetCorePackages, + nixosTests, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "kavita"; - version = "0.8.2"; + version = "0.8.3.2"; src = fetchFromGitHub { owner = "kareadita"; repo = "kavita"; - # commit immediately following the v${version} tag - # for correct version reporting - rev = "44c046176e54fa81e3420a1a40dcd9871e0a45f1"; - hash = "sha256-cHX6nzajFqygdFF9y4KEAMv0tdNx9xFbpOoVNo8uafs="; + rev = "v${finalAttrs.version}"; + hash = "sha256-8ZE3zlWX8DxLYUFj3AA04cIJTUWYgnNM+5FZhGmlRz8="; }; backend = buildDotnetModule { @@ -49,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; }; - frontend = buildNpmPackage { + frontend = buildNpmPackage { pname = "kavita-frontend"; inherit (finalAttrs) version src; @@ -58,7 +57,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { npmBuildScript = "prod"; npmFlags = [ "--legacy-peer-deps" ]; npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent playwright from trying to install browsers - npmDepsHash = "sha256-H53lwRr43MQWBbwc8N0GikAOkN2N0CwyiY8eGHveNFc="; + npmDepsHash = "sha256-EB4B6BHiRi6A4nhj2dR+3q1MZKcfcYUuo4ls4WMJEUI="; }; dontBuild = true; @@ -75,7 +74,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { - tests = { inherit (nixosTests) kavita; }; + tests = { + inherit (nixosTests) kavita; + }; updateScript = ./update.sh; }; @@ -85,7 +86,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { changelog = "https://github.com/kareadita/kavita/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ misterio77 nevivurn ]; + maintainers = with lib.maintainers; [ + misterio77 + nevivurn + ]; mainProgram = "kavita"; }; }) diff --git a/pkgs/servers/web-apps/kavita/nuget-deps.nix b/pkgs/servers/web-apps/kavita/nuget-deps.nix index 77fa4d46c88a5..085e615b19d2a 100644 --- a/pkgs/servers/web-apps/kavita/nuget-deps.nix +++ b/pkgs/servers/web-apps/kavita/nuget-deps.nix @@ -25,18 +25,18 @@ (fetchNuGet { pname = "Hangfire.NetCore"; version = "1.8.14"; hash = "sha256-AcBAONay/nnNrGy0Hjt1UA7rxzIeTm0rQgZO+AJpQbM="; }) (fetchNuGet { pname = "Hangfire.SqlServer"; version = "1.8.14"; hash = "sha256-OkKb2D2kKN9ESrSwFH1up9/KC4qZHblGiuLLwMWojfE="; }) (fetchNuGet { pname = "Hangfire.Storage.SQLite"; version = "0.4.2"; hash = "sha256-//40m/V+kgcDrKJ7/YfX1upOK9ZQEG/Bpbk7c5PmQuk="; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.61"; hash = "sha256-exRJTP7mHNt31CKaejKSSkKPm74ratfnpGl50AqZwlY="; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.64"; hash = "sha256-tj0yh2B2st0k4DABKA/LFh7lH3c07soEfxwH8AL7PSY="; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) - (fetchNuGet { pname = "MailKit"; version = "4.7.0"; hash = "sha256-9KcpzvO9MKAlxCh2B2XOBWbPfQ8TRo27gxuSJpB57vs="; }) + (fetchNuGet { pname = "MailKit"; version = "4.7.1.1"; hash = "sha256-g9VnuGYTPNUa6woEO/gVbxNfaidHgGtoQw2qOgYLK0o="; }) (fetchNuGet { pname = "MarkdownDeep.NET.Core"; version = "1.5.0.4"; hash = "sha256-NO//QjqAcE4yDmQARbThyp8fdFrE2U0Bed5XToOG+jI="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Abstractions"; version = "2.2.0"; hash = "sha256-0JcJYAoU+AEM0dWaXk2qnqxrVM0Ak9/ntCU1MC90R24="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "8.0.6"; hash = "sha256-rUg3keud5JjMtyncxNc2/8Sey2bMTth/AFjeketJR88="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.OpenIdConnect"; version = "8.0.6"; hash = "sha256-tTPB/xKJA9BJiwcrBhcV+kwqxyumew2RXDlicn85fgE="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "8.0.8"; hash = "sha256-HnRXaASyL3Q3tA++0C4JiIhUSTeFtEX+acybs8uiXZ8="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.OpenIdConnect"; version = "8.0.8"; hash = "sha256-7Nbhyn29No/p2/nqFc+C41J1mnU5DBYUrnVSxbod+QM="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "2.2.0"; hash = "sha256-PaMYICjQ0rprUv53Uza/jQvvWTcbPjGLMMp12utF+NY="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization.Policy"; version = "2.2.0"; hash = "sha256-onFYB+jtCbGyfZsIglReCPRdDMmwah2EDMhJN4uBP7Q="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "2.2.0"; hash = "sha256-MoieWAe7zT/0a7PAn3gMKO8YpHTbOtiGIwF/sFAmieY="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "8.0.6"; hash = "sha256-8+2aRr6mWkdzcGEpIAA9mwI+HPAxqZek8MtNS50mPJQ="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "8.0.6"; hash = "sha256-5ss60ArZhhZCml464QwlRdvRdyBWIR8cmCZfiPt05vo="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "8.0.8"; hash = "sha256-VS+6L2gvDAIS51kpAamt8FHDbiIwYBpBh2ADvKO3uRU="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "8.0.8"; hash = "sha256-nwzIcerY8JKBkkJgw2ozTmGRyXrVkP6BnMYbDYNLe24="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.2.0"; hash = "sha256-GzqYrTqCCVy41AOfmgIRY1kkqxekn5T0gFC7tUMxcxA="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.2.0"; hash = "sha256-8PnZFCkMwAeEHySmmjJOnQvOyx2199PesYHBnfka51s="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.2.0"; hash = "sha256-+ARZomTXSD1m/PR3TWwifXb67cQtoqDVWEqfoq5Tmbk="; }) @@ -45,7 +45,7 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "1.1.0"; hash = "sha256-PooDjJHsIcZkL2IOp530pJr4GLGlre2sIdboNRrAcHQ="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; hash = "sha256-1rXxGQnkNR+SiNMtDShYoQVGOZbvu4P4ZtWj5Wq4D4U="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; hash = "sha256-odvntHm669YtViNG5fJIxU4B+akA2SL8//DvYCLCNHc="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; version = "8.0.6"; hash = "sha256-8Jc28VhEkWgW0dE5riY/Ye7w6vlkIQ44dduLBx1p/s4="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; version = "8.0.8"; hash = "sha256-fgnUFp18Uop3gpfs/jLFEf/leDJoWtECVvEX5ZN9cyw="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Routing"; version = "2.2.0"; hash = "sha256-mvsF973Cm48XUB6lPBiGp7U7vkfBjB3oILdnIQUwe4o="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.2.0"; hash = "sha256-nqJjxKXkdPAY1XvQjIRNW2y855Xi+LAX1S5AncPnPDU="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR"; version = "1.1.0"; hash = "sha256-VCTxQAWRKBk640FhkGu4XUcfWXWSV8x4jEfezDoM4Jo="; }) @@ -62,14 +62,14 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; hash = "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.6"; hash = "sha256-MgUBbb0LDM1ixm8pBfBrSTVjNoGFn6NQMD36mirELmo="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.6"; hash = "sha256-T9Pz6bCGULBEYjzdUBd1KXSAnw1c4VljSkwgbTE2MmE="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.6"; hash = "sha256-RdcIA9WUJnHyAFdlpBPs5qUusKMUH9uLFGusKBWDCX8="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.6"; hash = "sha256-aTWfaOL0MfWYBbR+1Q1g+sxzmcjA4Q/OBFnVZDQqKJ8="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.6"; hash = "sha256-svQdeAv19bCM/RQwWFA6wFssrXecqazqs5ctbdZCBgQ="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.6"; hash = "sha256-l2fkzSq3Tb15Uq7a879Bihat+Y7rijDwsrs/MDiApdw="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.6"; hash = "sha256-kb+8eSHhmaxJ5OXYSFTHtKYaQ2TV+WJ5nfZMP+XXsto="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.6"; hash = "sha256-4rVgUuCdBUvQyEnadrieZ1RxgwGAfuRCj9kkWM24NKA="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.8"; hash = "sha256-5qV38l8ZeCZTE5f5+f5XFNzUCuTurqDti2qxobeYPXk="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.8"; hash = "sha256-w4NJ3K5ot/oZO5xIGcVLE7n4x/Jnmz0/VYfumnACcuc="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.8"; hash = "sha256-93QnvBG9lz9TuWx4o1yvEvWMq2k3jD7G77yI8pl8hz8="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.8"; hash = "sha256-xjqccaSQW7pJinwWPv2eLuVA2vchIJcRroYVTbywTnQ="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.8"; hash = "sha256-Bxfg9/w3/bUwsWgASf5TAeL/7ECBDpkCUytT+bKwrx0="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.8"; hash = "sha256-ZdhJ4yUuxo1NIMz/qCrDKIFvYGAHhDCNsAVy+0lm/Kk="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.8"; hash = "sha256-i9YQkY0U64ronI8zvEDhbFNJt3QQTZ470Ysnx2ZxiJ4="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.8"; hash = "sha256-TI77E3xSNZexiEbh/z5uVgG76cLZVn8KP7Dzh8sRciU="; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; hash = "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; hash = "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="; }) @@ -93,7 +93,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; hash = "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.1.6"; hash = "sha256-TKEE5GJmn1wLKuiF6Wd+Q7jpIlq9gSvlWvTVopCyoo4="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.1"; hash = "sha256-m8daXRK1Qn9y2c8SmtWu9ysLHwFJtEWiUQoAnMalw7s="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; hash = "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; hash = "sha256-pLAxP15+PncMiRrUT5bBAhWg7lC6/dfQk5TLTpZzA7k="; }) @@ -105,8 +105,8 @@ (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.2.0"; hash = "sha256-YZcyKXL6jOpyGrDbFLu46vncfUw2FuqhclMdbEPuh/U="; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "3.0.0"; hash = "sha256-iUMCRR9uHSoub48MboewTxokP5QwrC47X5t+C+JUMo4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "8.0.6"; hash = "sha256-0cquYLpXjFMdd2VQrsr54LrbQ723jbIwoLOhO04wTnM="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; version = "8.0.6"; hash = "sha256-/HmTyyTMpY5xpgjwU9GO8uTIefTaTztFagZKEqXX6iY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "8.0.8"; hash = "sha256-Gu8lyqKUANMq7oea6WQHCieCN3AFDFbRM5ClmS096Zk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; version = "8.0.8"; hash = "sha256-kh0GfO507LMSDZPNPNoMVBSfDpip2wXCewUDi6KsURg="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; hash = "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; hash = "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; }) @@ -134,14 +134,14 @@ (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.1.2"; hash = "sha256-QN2btwsc8XnOp8RxwSY4ntzpqFIrWRZg6ZZEGBZ6TQY="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.2"; hash = "sha256-Ipd8+JFpj44vqouRGO8YvxzVyjKOeFXczTeKguxdcgs="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.2"; hash = "sha256-lHzkMQIlbSwmetyGLbtuptHZP+HgG8n2aLtBDqDr1S4="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.0.2"; hash = "sha256-j37WWYrYgINKVn5eWhytGad7k2GwQPCemumJXU7cHsw="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.0.2"; hash = "sha256-siKloYOZKBRV//apM/O+A+KwhAWTZ0ZnnCI7Pq+pxMs="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.1.2"; hash = "sha256-6M7Y1u2cBVsO/dP+qrgkMLisXbZgMgyWoRs5Uq/QJ/o="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.2"; hash = "sha256-hNIbOZ6leANvh+i1I2ZXS35+yXUmhTlyomkA8PbF++w="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.0.2"; hash = "sha256-Ref5E5JXHXDAdog/Yix25fsYO7R4eCHP8L/GIJz70p8="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "7.1.2"; hash = "sha256-6OXP0vQ6bQ3Xvj3I73eqng6NqqMC4htWKuM8cchZhWI="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "7.1.2"; hash = "sha256-cAwwCti+/ycdjqNy8PrBNEeuF7u5gYtCX8vBb2qIKRs="; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.1.2"; hash = "sha256-qf8y8KCo1ysrK+jCrnR+ARHwlfMWPXLxe7a41FVg4OA="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.2"; hash = "sha256-P0lN2+Die2ftnJh43A3X3CR207vvzfCCJjlow6yweVs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.0.2"; hash = "sha256-VM5Tw4lS1XxVajmA8PB4yn8J+Abi388U//5//0aNOHo="; }) (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.1"; hash = "sha256-unFg/5EcU/XKJbob4GtQC43Ydgi5VjeBGs7hfhj4EYo="; }) (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; hash = "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA="; }) (fetchNuGet { pname = "Microsoft.NETCore.Jit"; version = "1.0.2"; hash = "sha256-T92T+bmdXfpAe73OKFTYXGJW1gTHuwcryBSgV7mwSkk="; }) @@ -158,23 +158,23 @@ (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; hash = "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="; }) - (fetchNuGet { pname = "MimeKit"; version = "4.7.0"; hash = "sha256-bdBpES930ZgPaFrXJuNkW3vRryMygwXpE5dNyW1xOS0="; }) + (fetchNuGet { pname = "MimeKit"; version = "4.7.1"; hash = "sha256-yTUqWAFU1v8jo70D09A+l8tsc+pr6IMOORD9L8EDz9o="; }) (fetchNuGet { pname = "MimeTypeMapOfficial"; version = "1.0.17"; hash = "sha256-HuQRDUDjBlAKzbnCWvxkXp7tf2bCdd/evox8964grdA="; }) (fetchNuGet { pname = "Mono.TextTemplating"; version = "2.2.1"; hash = "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY="; }) (fetchNuGet { pname = "Nager.ArticleNumber"; version = "1.0.7"; hash = "sha256-Th3BIABiOo0vsgqznr6C6WhVdGDFalso/rAfUYDI0NE="; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) (fetchNuGet { pname = "NetVips"; version = "2.4.1"; hash = "sha256-Un1ZACxSjadaUIzmUimGshXDal8tJAq1CBwrgrNiwMk="; }) - (fetchNuGet { pname = "NetVips.Native"; version = "8.15.2"; hash = "sha256-ak8dJNNOGJURiUVourVL0Qn8rTA4H5yzrKWfcUt2z0o="; }) - (fetchNuGet { pname = "NetVips.Native.linux-arm"; version = "8.15.2"; hash = "sha256-Xv+EBcwNYeUXv5Z9OHDY+8xw9haW24WQCp0t+eYWjN0="; }) - (fetchNuGet { pname = "NetVips.Native.linux-arm64"; version = "8.15.2"; hash = "sha256-PZCj5MESL+Da0pu0Lx4OpysD1m45LZVPQo3dWLsLjYc="; }) - (fetchNuGet { pname = "NetVips.Native.linux-musl-arm64"; version = "8.15.2"; hash = "sha256-A8TYMh6L9z3gDjTyyFd9WNjU0BuxOT5Ag34EW9wazJk="; }) - (fetchNuGet { pname = "NetVips.Native.linux-musl-x64"; version = "8.15.2"; hash = "sha256-2oUm+8OHyK1zHWCoIVXfPu+T/xmq5yTN4H048LrT9kc="; }) - (fetchNuGet { pname = "NetVips.Native.linux-x64"; version = "8.15.2"; hash = "sha256-vTnL2ERyu8/UwfTeCtLZR0stmVx4Qyyki/yAEE537Cc="; }) - (fetchNuGet { pname = "NetVips.Native.osx-arm64"; version = "8.15.2"; hash = "sha256-eXE7j851WlLGJWc9Kbg/eP3HxKrM8b7ujwy/r3IBUxE="; }) - (fetchNuGet { pname = "NetVips.Native.osx-x64"; version = "8.15.2"; hash = "sha256-VRS7vWj9GYHWnyE4qjc7XnxhiwsTmqx1hfnc7WO4SIA="; }) - (fetchNuGet { pname = "NetVips.Native.win-arm64"; version = "8.15.2"; hash = "sha256-zhLnFqPsf/+cA5JDT+7eFWaldM+mnMEgzS3ijSuC73k="; }) - (fetchNuGet { pname = "NetVips.Native.win-x64"; version = "8.15.2"; hash = "sha256-73NkRF3um0AEO2PMQLpFb0IvGgBihYdY7ccfBg4vHXk="; }) - (fetchNuGet { pname = "NetVips.Native.win-x86"; version = "8.15.2"; hash = "sha256-fTgnpFaq9uVx2OEOW7WuUdHHCguMeUp90KDIsNvi4iI="; }) + (fetchNuGet { pname = "NetVips.Native"; version = "8.15.3"; hash = "sha256-MW+so2f7+IwnRIHN5u8g/B4InETKLsDgSte2qq7B+bU="; }) + (fetchNuGet { pname = "NetVips.Native.linux-arm"; version = "8.15.3"; hash = "sha256-+m86lUEBWxbPT/sKBCFPorTkO0WMtRgaI0Ab+x4kUr4="; }) + (fetchNuGet { pname = "NetVips.Native.linux-arm64"; version = "8.15.3"; hash = "sha256-GSX/tcblN9LZLXXXKsTqjJYwHRsQ0ol4AuC5rmBtA44="; }) + (fetchNuGet { pname = "NetVips.Native.linux-musl-arm64"; version = "8.15.3"; hash = "sha256-pOq07bd9L3H5GdSkLSlSB/ViElUF6r87oNixWoq/WzM="; }) + (fetchNuGet { pname = "NetVips.Native.linux-musl-x64"; version = "8.15.3"; hash = "sha256-1JdsDxKwY+tk6OSCt1PhX3wXV9noZgQp27rKsQElESQ="; }) + (fetchNuGet { pname = "NetVips.Native.linux-x64"; version = "8.15.3"; hash = "sha256-TQoRwZ8CHi0+06dqEr9SLv7JOttIVGiUzc/LLRMtGGU="; }) + (fetchNuGet { pname = "NetVips.Native.osx-arm64"; version = "8.15.3"; hash = "sha256-uMSH4OOgv/6PoXVvJw44JMiqytKBcOWDrjqz3coJ3sE="; }) + (fetchNuGet { pname = "NetVips.Native.osx-x64"; version = "8.15.3"; hash = "sha256-rwQqUqgvYeNvE/S518Uw2JeL9+qaXOnhqmdVUb3ez/E="; }) + (fetchNuGet { pname = "NetVips.Native.win-arm64"; version = "8.15.3"; hash = "sha256-dlcl9vAmu5B0K6zy0WsZQ1Q3DYrgZELIXEYIDQs8m8g="; }) + (fetchNuGet { pname = "NetVips.Native.win-x64"; version = "8.15.3"; hash = "sha256-nRaI7ZaWpR5LWNYEBXMNfdij1nxQcDYTK4liz8T6we0="; }) + (fetchNuGet { pname = "NetVips.Native.win-x86"; version = "8.15.3"; hash = "sha256-34+2bMn8PXNoag39r8kCOYG/vJxcmB6/Ay6ytZTswuA="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.1"; hash = "sha256-lbR7rpS/EXgJ8TqQspuIIqAsiorrZb1oOK4HFw+QyPw="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; hash = "sha256-YhlAbGfwoxQzxb3Hef4iyV9eGdPQJJNd2GgSR0jsBJ0="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; hash = "sha256-BW7sXT2LKpP3ylsCbTTZ1f6Mg1sR4yL68aJVHaJcTnA="; }) @@ -222,22 +222,22 @@ (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) (fetchNuGet { pname = "Scrutor"; version = "3.3.0"; hash = "sha256-cYd6xuCn8cniuHWhiWMZRYZrYUjOvAz2wlEvOM5drmE="; }) - (fetchNuGet { pname = "Serilog"; version = "4.0.0"; hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="; }) - (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.1"; hash = "sha256-a07P+0co6QuLuUw09PvvpLf9gix88Nw3dACsnSRcuW4="; }) + (fetchNuGet { pname = "Serilog"; version = "4.0.1"; hash = "sha256-yenpr50Qf+nq1nrqyg3TKJqOroSyIKHke/9nfkA3wYg="; }) + (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.2"; hash = "sha256-cRZHG2bqrESOxPVxq2v+mHx+oZBzZEPksrleGVXO1p0="; }) (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "4.0.0"; hash = "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8="; }) (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "8.0.0"; hash = "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="; }) (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; hash = "sha256-KtHMMnepmEpOlHrIGlUkK6Vq1L0iBBnFGavbUtvxOBk="; }) (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "8.0.0"; hash = "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="; }) (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "2.0.0"; hash = "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="; }) - (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.1"; hash = "sha256-UqaNQPN5devzd8czUWu6D7zWJs/pUVsU5PJQRnyT4uw="; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.2"; hash = "sha256-iHRQt6vDk85/6HpMXiJluAwhkjgwEnL3IKavfDgFX0k="; }) (fetchNuGet { pname = "Serilog.Sinks.AspNetCore.SignalR"; version = "0.4.0"; hash = "sha256-KkyrLNMsoBGMJN7C8NNGhGVxFDYzfvxlX66i3NLYkmo="; }) (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "6.0.0"; hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="; }) (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "6.0.0"; hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="; }) (fetchNuGet { pname = "Serilog.Sinks.SignalR.Core"; version = "0.1.2"; hash = "sha256-7j9SK++4U7Q6f6ofPWsaH9xQii/jBK864u/kHYwxyJk="; }) (fetchNuGet { pname = "SharpCompress"; version = "0.37.2"; hash = "sha256-IP7/ssqWKT85YwLKrLGACHo0sgp7sMe603X+o485sYo="; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; hash = "sha256-zOqHVIInvJiqmx4JF+8USYvdKAGRZVUqQpdncrrjRjM="; }) - (fetchNuGet { pname = "SonarAnalyzer.CSharp"; version = "9.28.0.94264"; hash = "sha256-lG8+16cWHYNhO0MFjUHv0zQGj5mipRmUr57z3CaO1wk="; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.5"; hash = "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="; }) + (fetchNuGet { pname = "SonarAnalyzer.CSharp"; version = "9.32.0.97167"; hash = "sha256-F8f9YjBZekwIowIm6LKfjowqmCyhLUuTFQIcjEEVDPg="; }) (fetchNuGet { pname = "sqlite-net-pcl"; version = "1.8.116"; hash = "sha256-XlD0ycLkpMeFkZ9NCktC2ldYzD2NyJarSv5h6e4gekA="; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; hash = "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.0.4"; hash = "sha256-QjDI47nPUXx75rMABeSYefB6gw6xgrgTjYY6Uq/1J4U="; }) @@ -247,14 +247,14 @@ (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; hash = "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="; }) (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.0.4"; hash = "sha256-0rzyURehoQsyDxW8Yj477TJLNcItBsJVwKBeGidKmSA="; }) (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; hash = "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; hash = "sha256-kKz+NiXNfmrvrtbzsqnW1ItflNib3rymr3rf9yI5B1M="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.7.3"; hash = "sha256-pt1lBEN6Yk1QfqcgLD8Z2vE3tXUeJreQ2lRfjtMASCU="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Filters"; version = "8.0.2"; hash = "sha256-RCFdFvCzUYS850axoGaprr0heFyBFCIu9jzusXJ0YAA="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Filters.Abstractions"; version = "8.0.2"; hash = "sha256-oe6KYmrvaAKu0JpAwxpIiyxSaqfRg2VAyc/KKQX6xFI="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "5.0.0"; hash = "sha256-TnAjQpCdwSH3rm1m3ptdoOGS4/9a8OOH3srAatG2gYw="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.7.3"; hash = "sha256-aVQ9NuqiW0EFhLwz2LMa15hWTQzmzyS3huuA42rbJSM="; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "5.0.0"; hash = "sha256-JGMmhhq6OdscsGsnSM6182ZkyWiSdr0ERmNZvJV4XAM="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; hash = "sha256-ED24tUcwiOkAIMQVQeQFths296yf3lL/Z1sVizQTEHA="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.7.3"; hash = "sha256-K2Ig2cp8Cl5tLuPhSGz5ewW1W6A1JC9rfSfVSDNdLuY="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.7.3"; hash = "sha256-OLcFaBuRyBhukVE4LiJm1kkAAjZtzfhGjRFEHHbI1X4="; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; hash = "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs="; }) @@ -281,17 +281,17 @@ (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.6"; hash = "sha256-dHrc4lCnhmBU3j+bdmgyjNK2pZsbfBRL1zz38lVyQvM="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.8"; hash = "sha256-u/u0US7c0dfB8TmIdN+AI2GKrWUguuEmEKMGx7NLIKE="; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "8.0.0"; hash = "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI="; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "8.0.1"; hash = "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.6.2"; hash = "sha256-RL7l7Xfi9a7w8v1DOTxrOFLrNVUkXWoCcE2YdCN6Q+Y="; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "8.0.2"; hash = "sha256-SQA6LrcReEQIGz/flaXD7gDlAyu30XbQKEVimpZSFuU="; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.22"; hash = "sha256-UTdB/kD39zeXjUxdgQbXSxS/yyzDtc2rLre2+pLoQWk="; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.29"; hash = "sha256-91e2/Bd4ZgANw19mKkTdxAy2tv7NutyG0lQTKhMiEpo="; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) @@ -368,6 +368,7 @@ (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; hash = "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) @@ -385,9 +386,9 @@ (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.22"; hash = "sha256-900+hyDm/wCd7iD5hnPJue/In/ZcA3NlGNk9kHWLoX0="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.22"; hash = "sha256-xDe16iGy2i0SyYnlauFxZMTUx44PM+kas+jRtagDV50="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.29"; hash = "sha256-OFpu9RcDRPLYntQyesBevoG1XxyH96ukHOH0uXqO5ls="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.29"; hash = "sha256-2q1HzbyRPIm6VKYzZzZnkXBJzV8S+HBtT6Lej1pv84Y="; }) (fetchNuGet { pname = "VersOne.Epub"; version = "3.3.2"; hash = "sha256-jzkD4HDgFMevH8FRYml7UHEwMt7BWG+VpinIPlioIUo="; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.8.1"; hash = "sha256-PzTY1UeDK4t22o3GjAV1qV/zsXe/N4yOQsFu5l8Zu/A="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.9.0"; hash = "sha256-3GUZ0loDa/3WDXRuBQdghsKXE/bZrCBJ5Bopr43SuVA="; }) (fetchNuGet { pname = "ZstdSharp.Port"; version = "0.8.0"; hash = "sha256-nQkUIDqpgy7ZAtRWyMXQflYnWdPUcbIxIblOINO2O5k="; }) ] diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 8cb65bfef2bf0..416de2b21db70 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { cargoHash = pinData.serverCargoHash; buildInputs = [ postgresql ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security SystemConfiguration ]; # Using OPENSSL_NO_VENDOR is not an option on darwin # As of version 0.10.35 rust-openssl looks for openssl on darwin diff --git a/pkgs/servers/web-apps/livebook/default.nix b/pkgs/servers/web-apps/livebook/default.nix index 8e8e0b997464b..214c21381ad2f 100644 --- a/pkgs/servers/web-apps/livebook/default.nix +++ b/pkgs/servers/web-apps/livebook/default.nix @@ -1,7 +1,7 @@ { lib, beamPackages, makeWrapper, rebar3, elixir, erlang, fetchFromGitHub, nixosTests }: beamPackages.mixRelease rec { pname = "livebook"; - version = "0.13.3"; + version = "0.14.2"; inherit elixir; @@ -13,13 +13,13 @@ beamPackages.mixRelease rec { owner = "livebook-dev"; repo = "livebook"; rev = "v${version}"; - hash = "sha256-luvqH6fjovRhVQrsP00XLSQ/rjHZgUbUWmL2B5XCyKI="; + hash = "sha256-iD9FzIjm0OAnApgmMqw0bDTQH/pSC8Z2l4+3Y4y+ieQ="; }; mixFodDeps = beamPackages.fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - hash = "sha256-/U/UmNVtl7H0rdgXpibM/bYvRbio8WzVRTv4tQ7GQcY="; + hash = "sha256-knqjnySXwh7/vMkFNfDZzSjojWpWPNZyR/RIDb9hdgA="; }; postInstall = '' diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index fa66487758f88..721df17cf193d 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.78.0"; + version = "0.80.2"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-I0ngEJfHWywJSYOloJbtuKzu95yJibo7hLFgkyT2Wz8="; + hash = "sha256-kmi6H2vdzg7ftUOrzs2b5e9n1bSFHiQ0wk6Q6T/lDdk="; }; nativeBuildInputs = [ makeWrapper prefetch-yarn-deps fixup-yarn-lock ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-TKAV49VJmR/SWTd2T2vHMnYq2j9fwimzYq1CCfRXk0Q="; + hash = "sha256-Ibgn/J2OCP2F0hbPQi35uGAOfoZ2D5HD/E85oOTr6G0="; }; configurePhase = '' @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { homepage = "https://www.getoutline.com/"; changelog = "https://github.com/outline/outline/releases"; license = licenses.bsl11; - maintainers = with maintainers; [ cab404 yrd xanderio ]; + maintainers = with maintainers; [ cab404 yrd ] ++ teams.cyberus.members; platforms = platforms.linux; }; } diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/servers/web-apps/peering-manager/default.nix index a5dfa68846947..eb941b85853e6 100644 --- a/pkgs/servers/web-apps/peering-manager/default.nix +++ b/pkgs/servers/web-apps/peering-manager/default.nix @@ -19,6 +19,12 @@ python3.pkgs.buildPythonApplication rec { format = "other"; + patches = [ + # Fix compatibility with pyixapi 0.2.3 + # https://github.com/peering-manager/peering-manager/commit/ee558ff66e467412942559a8a92252e3fc009920 + ./fix-pyixapi-0.2.3-compatibility.patch + ]; + propagatedBuildInputs = with python3.pkgs; [ django djangorestframework diff --git a/pkgs/servers/web-apps/peering-manager/fix-pyixapi-0.2.3-compatibility.patch b/pkgs/servers/web-apps/peering-manager/fix-pyixapi-0.2.3-compatibility.patch new file mode 100644 index 0000000000000..c7df2eb46759a --- /dev/null +++ b/pkgs/servers/web-apps/peering-manager/fix-pyixapi-0.2.3-compatibility.patch @@ -0,0 +1,30 @@ +From ee558ff66e467412942559a8a92252e3fc009920 Mon Sep 17 00:00:00 2001 +From: Guillaume Mazoyer <guillaume@mazoyer.eu> +Date: Wed, 21 Feb 2024 23:32:32 +0100 +Subject: [PATCH] Use pyixapi 0.2.3 + +--- +diff --git a/extras/models/ixapi.py b/extras/models/ixapi.py +index 65572c971e065e3deed69465a71a54b4e1372851..637a004043e0a044c65a5e37fbb2b3bf82965436 100644 +--- a/extras/models/ixapi.py ++++ b/extras/models/ixapi.py +@@ -7,7 +7,6 @@ + from django.db import models + from django.db.models import Q + from django.urls import reverse +-from django.utils.timezone import make_aware + + from peering_manager.models import ChangeLoggedModel + +@@ -117,9 +116,9 @@ def dial(self): + if auth: + # Save tokens if they've changed + self.access_token = api.access_token.encoded +- self.access_token_expiration = make_aware(api.access_token.expires_at) ++ self.access_token_expiration = api.access_token.expires_at + self.refresh_token = api.refresh_token.encoded +- self.refresh_token_expiration = make_aware(api.refresh_token.expires_at) ++ self.refresh_token_expiration = api.refresh_token.expires_at + self.save() + + return api diff --git a/pkgs/servers/web-apps/pict-rs/0.3.nix b/pkgs/servers/web-apps/pict-rs/0.3.nix index 11f2479efdbe4..9e7ad6e3d2049 100644 --- a/pkgs/servers/web-apps/pict-rs/0.3.nix +++ b/pkgs/servers/web-apps/pict-rs/0.3.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' wrapProgram "$out/bin/pict-rs" \ diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 6033db65bf306..fddfd6fffebd6 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; postInstall = '' wrapProgram "$out/bin/pict-rs" \ @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests) pict-rs; }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Simple image hosting service"; mainProgram = "pict-rs"; homepage = "https://git.asonix.dog/asonix/pict-rs"; diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 257fb6818e263..5a5918c6f815a 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -89,7 +89,7 @@ beamPackages.mixRelease { changelog = "https://github.com/plausible/analytics/blob/${src.rev}/CHANGELOG.md"; description = " Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics"; mainProgram = "plausible"; - maintainers = with maintainers; [ xanderio ]; + maintainers = teams.cyberus.members; platforms = platforms.unix; }; } diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix index 9f64313c4de08..b44ebf088eabb 100644 --- a/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/pkgs/servers/web-apps/rss-bridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub }: +{ stdenv, lib, fetchFromGitHub, nixosTests }: stdenv.mkDerivation rec { pname = "rss-bridge"; @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { cp -R ./* $out ''; + passthru.tests = { + basic-functionality = nixosTests.rss-bridge; + }; + meta = with lib; { description = "RSS feed for websites missing it"; homepage = "https://github.com/RSS-Bridge/rss-bridge"; diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index a6740f7422902..b24910f4bb052 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -5,14 +5,14 @@ , libwbxml }: gnustep.stdenv.mkDerivation rec { pname = "sogo"; - version = "5.10.0"; + version = "5.11.0"; # always update the sope package as well, when updating sogo src = fetchFromGitHub { owner = "Alinto"; repo = pname; rev = "SOGo-${version}"; - hash = "sha256-ZmpOI1zk/TkRNFmwTXugVb9IvxYSP4LgNrApSytdI7s="; + hash = "sha256-2/0OaCAQkdnDPGOVERZs2Oz+bCpQN3MTLzp2pz0WB08="; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ]; @@ -77,7 +77,7 @@ gnustep.stdenv.mkDerivation rec { license = with licenses; [ gpl2Only lgpl21Only ]; homepage = "https://sogo.nu/"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ jceb ]; }; } diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 796e61848efb0..5816e1dd91bef 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.303"; + version = "2.5.304"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-Jpv4D+ldGPvJz+8cwNhrmC+Ii5dG0UOTC5JIWPwUzvk="; + sha256 = "sha256-w89+X3sqZPlX7EuK/g2oATHqlpx1br/Njh81vZt8zYM="; }; sourceRoot = "."; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 08a9eb2da05ac..76a0ebfdf245e 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -5,7 +5,7 @@ hash = "sha256-bIRmTqmzIRo1KdhAcJa1GxhVcTEiEaLFPzlNFbzfLcQ="; }; wordpress_6_6 = { - version = "6.6.1"; - hash = "sha256-YW6BhlP48okxLrpsJwPgynSHpbdRqyMoXaq9IBd8TlU="; + version = "6.6.2"; + hash = "sha256-JpemjLPc9IP0/OiASSVpjHRmQBs2n8Mt4nB6WcTCB9Y="; }; } diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json index db996c40e7896..720ed5504bfb8 100644 --- a/pkgs/servers/web-apps/wordpress/packages/languages.json +++ b/pkgs/servers/web-apps/wordpress/packages/languages.json @@ -1,20 +1,26 @@ { "de_DE": { "path": "de_DE", - "rev": "1528320", - "sha256": "1q1xc9mm7kkja15i8cdwmr2i42hgahfx1ks6llqigfcl2qklsxsq", + "rev": "1551261", + "sha256": "0d4kxfzvpyp9p4kl7mfhvm2pilh27rbvsd3hv3p0y8hl33r96avb", "version": "6.6" }, "fr_FR": { "path": "fr_FR", - "rev": "1531427", - "sha256": "1355shvbx130ps0zypa0ff7dnygdf8jsfn8h7y52bv32dbbhrjhy", + "rev": "1566738", + "sha256": "1x4sxs40fal6qlbj9x8f0wwbji20729l25axcxx62rd98y47llg5", "version": "6.6" }, "ro_RO": { "path": "ro_RO", - "rev": "1533818", - "sha256": "1qsyp5w43qxk1c5gjizhl4a224dcad3pz7i8p2yvl4xv0ln94sp1", + "rev": "1551215", + "sha256": "00i2grjcr7n2bqknff39ar7maz7gk7d17dqrl2p9smlhkj6m1bbp", + "version": "6.6" + }, + "ru_RU": { + "path": "ru_RU", + "rev": "1551262", + "sha256": "0d5bdq99h9g6pcs3fw7czb4w4p60cjiizxqlbzan4p1g9056mmbl", "version": "6.6" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index dbf602c015715..4698aaee912cd 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -24,10 +24,10 @@ "version": "2.21.08.31" }, "breeze": { - "path": "breeze/tags/2.1.12", - "rev": "3139514", - "sha256": "02wzrflvrlnzv456zigkh3b31l8rrjs8sc9di1dkcxyh32cw0q9b", - "version": "2.1.12" + "path": "breeze/tags/2.1.14", + "rev": "3150652", + "sha256": "1xnha9fm0wmyfr1wcwai9hhrdpxinls3b8g1s156zzvzgf7ir73p", + "version": "2.1.14" }, "co-authors-plus": { "path": "co-authors-plus/tags/3.6.1", @@ -60,16 +60,16 @@ "version": "1.4.0" }, "gutenberg": { - "path": "gutenberg/tags/19.0.0", - "rev": "3135572", - "sha256": "121whl70w6ng08jwkzahyyjxv722wk3rggwgc20fnmzgd1kk3nhh", - "version": "19.0.0" + "path": "gutenberg/tags/19.3.0", + "rev": "3157241", + "sha256": "0zgrvyg502i66r63ikfa21rpdss0xy2kc0g3xyqndhcb6cz4qmjg", + "version": "19.3.0" }, "hcaptcha-for-forms-and-more": { - "path": "hcaptcha-for-forms-and-more/tags/4.4.0", - "rev": "3129246", - "sha256": "0lza7vjml88l58g6f8y9rzbf04qgxzxdbvzxn4l54bix773ggakd", - "version": "4.4.0" + "path": "hcaptcha-for-forms-and-more/tags/4.5.0", + "rev": "3143189", + "sha256": "13fa34pk5jwm14746sk5lkfcqcaprb426alsp26mmza72il6ai7y", + "version": "4.5.0" }, "hello-dolly": { "path": "hello-dolly/tags/1.7.2", @@ -84,10 +84,10 @@ "version": "3.0.2" }, "jetpack": { - "path": "jetpack/tags/13.7", - "rev": "3131767", - "sha256": "0kxbdfb2qddppqp66vcp4a0bfysddgx06x50aax0d8mfgjammkw2", - "version": "13.7" + "path": "jetpack/tags/13.8.1", + "rev": "3149545", + "sha256": "0q1zns1i9f5r2zwgd2zdrl85pqbjz2w1rg36f6g5djyr2fk9qqss", + "version": "13.8.1" }, "jetpack-lite": { "path": "jetpack-lite/tags/3.0.3", @@ -102,16 +102,16 @@ "version": "5.4.0" }, "login-lockdown": { - "path": "login-lockdown/tags/2.10", - "rev": "3088782", - "sha256": "1zm6xfq2xmb4bqb3j272j4majywfa5zqs4ms7lwygmb3s74980bm", - "version": "2.10" + "path": "login-lockdown/tags/2.11", + "rev": "3114570", + "sha256": "11zr6k57rmbmz078ns37w81mvy15kniyr7jakajl23n3qnr0hivy", + "version": "2.11" }, "mailpoet": { - "path": "mailpoet/tags/4.51.1", - "rev": "3097471", - "sha256": "0107v98nkaqlar5igxcllrvm10ac2zrn0j5j03xwk48b933y9d7h", - "version": "4.51.1" + "path": "mailpoet/tags/5.2.2", + "rev": "3156795", + "sha256": "1lhigi3nh52qi5m3qd7xvj0sv2ny7ixzr78nn4hk0lis0iryzzxc", + "version": "5.2.2" }, "merge-minify-refresh": { "path": "merge-minify-refresh/trunk", @@ -145,8 +145,8 @@ }, "surge": { "path": "surge/tags/1.1.0", - "rev": "3030901", - "sha256": "1bg99gsxv32l62pv0n2pq0384ggk2p154pg79yxiwnab2mrrs8j2", + "rev": "3146952", + "sha256": "16p75r1qcr4m1gajgw3bmpk3pvkpmrz3sh6pvi775hgs594f4vhc", "version": "1.1.0" }, "tc-custom-javascript": { @@ -156,10 +156,10 @@ "version": "1.2.3" }, "webp-converter-for-media": { - "path": "webp-converter-for-media/tags/5.13.1", - "rev": "3130708", - "sha256": "01hzymnr1pyiq1gr1w783fz7xk4c4hak2vn2qcfhxh6jdbb2p7b7", - "version": "5.13.1" + "path": "webp-converter-for-media/tags/6.1.0", + "rev": "3151571", + "sha256": "1s32hnq9ycb0x70m6l29sx6bhlyn9kq5sygrywb8pyq686zrhvwk", + "version": "6.1.0" }, "webp-express": { "path": "webp-express/tags/0.25.9", @@ -168,10 +168,10 @@ "version": "0.25.9" }, "wordpress-seo": { - "path": "wordpress-seo/tags/23.3", - "rev": "3137992", - "sha256": "0fhyjb7ncplicn6y4xpjs0hsi5c1hzy3kdbvsixyhx95ca67wnz4", - "version": "23.3" + "path": "wordpress-seo/tags/23.5", + "rev": "3156663", + "sha256": "1fh9wlisil8g08na6i9p3p5xn95cizf6q1g0srq2cqrivh0vkhhj", + "version": "23.5" }, "worker": { "path": "worker/tags/4.9.20", @@ -186,10 +186,10 @@ "version": "2.0" }, "wp-fastest-cache": { - "path": "wp-fastest-cache/tags/1.3.0", - "rev": "3137836", - "sha256": "1zkd6smayrxp504nh5ak5d526jmhkvf95ydy03q2xvr02fn5rdrm", - "version": "1.3.0" + "path": "wp-fastest-cache/tags/1.3.1", + "rev": "3156327", + "sha256": "18dm6pmj0y2a40c1vn7v6iq90nv5549cmwp9z37dvrrgdanb68ck", + "version": "1.3.1" }, "wp-gdpr-compliance": { "path": "wp-gdpr-compliance/tags/2.0.22", @@ -210,15 +210,15 @@ "version": "4.1.1" }, "wp-statistics": { - "path": "wp-statistics/tags/14.9.4", - "rev": "3134056", - "sha256": "1bjm3n2w7cfxnqz8p8w0svwnkvm1rkw9m85z1vkksbwrdhbyk6qz", - "version": "14.9.4" + "path": "wp-statistics/tags/14.10.1", + "rev": "3150122", + "sha256": "0mh3h71bp15zimy980hi681n608is536p1r4sbna5i65lwh8qq32", + "version": "14.10.1" }, "wp-swiper": { - "path": "wp-swiper/trunk", - "rev": "3130620", - "sha256": "1kn1piv7siqzhafqw4hjsc7n98j05zany1gvpbg0h5gjk40n3anm", + "path": "wp-swiper/tags/1.1.13", + "rev": "3148131", + "sha256": "1vqhd42wb2v72ynsr38i8vzsfz2bkh7vhswpdz5miykwrqp3sr8a", "version": "1.1.13" }, "wp-user-avatars": { @@ -228,9 +228,9 @@ "version": "1.4.1" }, "wpforms-lite": { - "path": "wpforms-lite/tags/1.9.0.4", - "rev": "3140326", - "sha256": "0qix61wxsxgcrkrwwrc1chzb54bryc2j7qiv66afsixcfwcsbglc", - "version": "1.9.0.4" + "path": "wpforms-lite/tags/1.9.1.2", + "rev": "3158924", + "sha256": "00mbg73zplhdj7r8691lbfhwd6fcybk5mgps5cfhbib0iqwhmqg0", + "version": "1.9.1.2" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/themes.json b/pkgs/servers/web-apps/wordpress/packages/themes.json index de8b34eba220e..ceabf40ce95ca 100644 --- a/pkgs/servers/web-apps/wordpress/packages/themes.json +++ b/pkgs/servers/web-apps/wordpress/packages/themes.json @@ -11,6 +11,12 @@ "sha256": "0y9r1jhlbr4bxhv0a73kgkg6klgg05l6iy3shhkp130s3hlkhfg1", "version": "2.7" }, + "twentytwentyfour": { + "path": "twentytwentyfour/1.2", + "rev": "235025", + "sha256": "16d7sgpcw9hkih5ji9h5wc9pv5nw0rv0q5glv6iq8k9mbms3295w", + "version": "1.2" + }, "twentytwentyone": { "path": "twentytwentyone/2.3", "rev": "235022", diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-languages.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-languages.json index 2c6fa9785c8bd..7ae24f9e43f97 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-languages.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-languages.json @@ -1,5 +1,6 @@ { - "de_DE": "gpl2Plus" -, "fr_FR": "gpl2Plus" -, "ro_RO": "gpl2Plus" + "de_DE": "gpl2Plus", + "fr_FR": "gpl2Plus", + "ro_RO": "gpl2Plus", + "ru_RU": "gpl2Plus" } diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-themes.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-themes.json index b41c2f18f8168..662191bd705aa 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-themes.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-themes.json @@ -1,7 +1,8 @@ { - "twentynineteen": "gpl2Plus" -, "twentytwenty": "gpl2Plus" -, "twentytwentytwo": "gpl2Plus" -, "twentytwentyone": "gpl2Plus" -, "twentytwentythree": "gpl2Plus" + "twentynineteen": "gpl2Plus", + "twentytwenty": "gpl2Plus", + "twentytwentyone": "gpl2Plus", + "twentytwentytwo": "gpl2Plus", + "twentytwentythree": "gpl2Plus", + "twentytwentyfour": "gpl2Plus" } diff --git a/pkgs/servers/webdav-server-rs/default.nix b/pkgs/servers/webdav-server-rs/default.nix index ad10845976042..e7e5b6a0edb80 100644 --- a/pkgs/servers/webdav-server-rs/default.nix +++ b/pkgs/servers/webdav-server-rs/default.nix @@ -5,7 +5,7 @@ , libtirpc , pam , rpcsvc-proto -, enablePAM ? stdenv.isLinux +, enablePAM ? stdenv.hostPlatform.isLinux }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index da272e41bb975..a7c5aa884d2f3 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1038,11 +1038,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libFS = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libFS"; - version = "1.0.9"; + version = "1.0.10"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libFS-1.0.9.tar.xz"; - sha256 = "12i0zh1v5zlba617nam8sjhfqi68qqnl7z5hsz3wqhijid1pjwsr"; + url = "mirror://xorg/individual/lib/libFS-1.0.10.tar.xz"; + sha256 = "0xrv9x5v6km7ib3d5k9xr704xkhfvigh8i507mb9i706hqybvawv"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b3eb0e74dc68e..ad631e419aaea 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -11,7 +11,7 @@ }: let - inherit (stdenv) isDarwin; + inherit (stdenv.hostPlatform) isDarwin; malloc0ReturnsNullCrossFlag = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) @@ -87,7 +87,7 @@ self: super: x11BuildHook = ./imake.sh; patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch]; setupHook = ./imake-setup-hook.sh; - CFLAGS = "-DIMAKE_COMPILETIME_CPP='\"${if stdenv.isDarwin + CFLAGS = "-DIMAKE_COMPILETIME_CPP='\"${if stdenv.hostPlatform.isDarwin then "${tradcpp}/bin/cpp" else "gcc"}\"'"; @@ -164,7 +164,7 @@ self: super: # Remove useless DocBook XML files. rm -rf $out/share/doc ''; - CPP = lib.optionalString stdenv.isDarwin "clang -E -"; + CPP = lib.optionalString stdenv.hostPlatform.isDarwin "clang -E -"; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xorgproto ]; }); @@ -263,7 +263,7 @@ self: super: ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp"; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libSM ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - CPP = if stdenv.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -"; + CPP = if stdenv.hostPlatform.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -"; outputDoc = "devdoc"; outputs = [ "out" "dev" "devdoc" ]; }); @@ -794,7 +794,7 @@ self: super: ./dont-create-logdir-during-build.patch ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -926,7 +926,7 @@ self: super: "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" "--with-xkb-output=$out/share/X11/xkb/compiled" - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ "--without-dtrace" ]; @@ -935,7 +935,7 @@ self: super: xorg.libXfont2 xorg.xtrans xorg.libxcvt - ] ++ lib.optional stdenv.isDarwin [ Xplugin ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ Xplugin ]; }); lndir = super.lndir.overrideAttrs (attrs: { @@ -1083,7 +1083,7 @@ self: super: xmore = addMainProgram super.xmore { }; xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: { - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" ''; }); diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index c68ff11420897..2575b47dd2711 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -168,7 +168,7 @@ mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz mirror://xorg/individual/lib/libfontenc-1.1.8.tar.xz -mirror://xorg/individual/lib/libFS-1.0.9.tar.xz +mirror://xorg/individual/lib/libFS-1.0.10.tar.xz mirror://xorg/individual/lib/libICE-1.1.1.tar.xz mirror://xorg/individual/lib/libpciaccess-0.18.1.tar.xz mirror://xorg/individual/lib/libSM-1.2.4.tar.xz diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index ecca983c5d7de..db6d8c3259e35 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "24.1.2"; + version = "24.1.3"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - hash = "sha256-FB63bn5CKjZhwIeCxwvkCTEIR1UELARQbg2X3UY+99I="; + hash = "sha256-3NtXpmzJsSTI+TZ2BZJiisTnRKfXsxeaqGGJrX6kyxA="; }; postPatch = '' diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 359c04dd0b9a6..eb96dbd5f3557 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.39.1"; + version = "1.40.2"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-mshQdb28vSEbHeSDLrVxx3sSgpRBMeqsVljiLtwTsF0="; + hash = "sha256-gm4MQabvm8NipV6Szml6l2Dy7q3O6YsurGGg9DzahHI="; }; - npmDepsHash = "sha256-+/WLjypVYDE4b6gcxXInU9ukntPH5GZpd8T3rlqrINs="; + npmDepsHash = "sha256-FF7RCV5SDzLUZ/dY8mnPEmYmBhJNjJScQ1R2yKDSawU="; buildInputs = lib.optionals withSystemd [ systemdMinimal diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 11da0612260a2..420c923367d68 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -57,13 +57,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.36.33"; + version = "1.36.34"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - hash = "sha256-KUhFZrF7BuLB2Z3LnTcHEEZVA6iosam6YsOd8KWvx7E="; + hash = "sha256-ClO1f0Aspz04C8wgQurtHWmwzu2f4RZ/1oGjPN8HQrw="; fetchSubmodules = true; }; diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index b2167b9ef7fac..91da1f05a5288 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -7,7 +7,7 @@ , util-linux # patch for cygwin requires readline support -, interactive ? stdenv.isCygwin +, interactive ? stdenv.hostPlatform.isCygwin , readline , withDocs ? false , texinfo @@ -151,6 +151,8 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; platforms = platforms.all; + # https://github.com/NixOS/nixpkgs/issues/333338 + badPlatforms = [ lib.systems.inspect.patterns.isMinGW ]; maintainers = [ ]; mainProgram = "bash"; }; diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 9e65dcd7c2896..6408f0610ff66 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { --ignore=test/t/test_screen.py ''; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e 's/readlink -f/readlink/g' bash_completion completions/* ''; diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 65df6529242b6..ec0a791676624 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { - owner = "rsteube"; - repo = "${pname}-bin"; + owner = "carapace-sh"; + repo = "carapace-bin"; rev = "v${version}"; - hash = "sha256-PDxYRFf7nQfPb6uazwRmZOvCy3xMF5OqHDLy7hsFSBE="; + hash = "sha256-onkYihS4abrOfqOehlDy+ooL2d04w6DwOY3+B4+L3IQ="; }; - vendorHash = "sha256-GnwOyIKJ1K8+0a+VrXcohclgxnQTezu4S0C2cJO+ULU="; + vendorHash = "sha256-UFpQAlXFS1O/MqeGvUAWSQLhP03wf8JX8zz8cMyMmrc="; ldflags = [ "-s" diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 73065cb380fdf..82ba76c005b8b 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -177,7 +177,7 @@ let # tests/checks/complete.fish sed -i 's|/bin/ls|${coreutils}/bin/ls|' tests/checks/complete.fish - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Tests use pkill/pgrep which are currently not built on Darwin # See https://github.com/NixOS/nixpkgs/pull/103180 rm tests/pexpects/exit.py @@ -187,7 +187,7 @@ let # pexpect tests are flaky in general # See https://github.com/fish-shell/fish-shell/issues/8789 rm tests/pexpects/bind.py - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # pexpect tests are flaky on aarch64-linux (also x86_64-linux) # See https://github.com/fish-shell/fish-shell/issues/8789 rm tests/pexpects/exit_handlers.py @@ -208,12 +208,12 @@ let cmakeFlags = [ "-DCMAKE_INSTALL_DOCDIR=${placeholder "doc"}/share/doc/fish" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DMAC_CODESIGN_ID=OFF" ]; # Fish’s test suite needs to be able to look up process information and send signals. - sandboxProfile = lib.optionalString stdenv.isDarwin '' + sandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' (allow mach-lookup mach-task-name) (allow signal (target children)) ''; @@ -235,7 +235,7 @@ let gnused groff gettext - ] ++ lib.optional (!stdenv.isDarwin) man-db; + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) man-db; doCheck = true; @@ -278,13 +278,13 @@ let end EOF - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' for cur in $out/share/fish/functions/*.fish; do sed -e "s|/usr/bin/getent|${getent}/bin/getent|" \ -i "$cur" done - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i "s|Popen(\['manpath'|Popen(\['${man-db}/bin/manpath'|" \ "$out/share/fish/tools/create_manpage_completions.py" sed -i "s|command manpath|command ${man-db}/bin/manpath|" \ @@ -308,7 +308,7 @@ let passthru = { shellPath = "/bin/fish"; tests = { - nixos = lib.optionalAttrs stdenv.isLinux nixosTests.fish; + nixos = lib.optionalAttrs stdenv.hostPlatform.isLinux nixosTests.fish; # Test the fish_config tool by checking the generated splash page. # Since the webserver requires a port to run, it is not started. diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 36a5a59e4398e..8967e9380d0bb 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -21,11 +21,15 @@ lib.makeScope newScope (self: with self; { fifc = callPackage ./fifc.nix { }; + fish-bd = callPackage ./fish-bd.nix { }; + # Fishtape 2.x and 3.x aren't compatible, # but both versions are used in the tests of different other plugins. fishtape = callPackage ./fishtape.nix { }; fishtape_3 = callPackage ./fishtape_3.nix { }; + fish-you-should-use = callPackage ./fish-you-should-use.nix { }; + foreign-env = callPackage ./foreign-env { }; forgit = callPackage ./forgit.nix { }; @@ -50,6 +54,8 @@ lib.makeScope newScope (self: with self; { plugin-git = callPackage ./plugin-git.nix { }; + plugin-sudope = callPackage ./plugin-sudope.nix { }; + puffer = callPackage ./puffer.nix { }; pure = callPackage ./pure.nix { }; diff --git a/pkgs/shells/fish/plugins/fish-bd.nix b/pkgs/shells/fish/plugins/fish-bd.nix new file mode 100644 index 0000000000000..154fc62133897 --- /dev/null +++ b/pkgs/shells/fish/plugins/fish-bd.nix @@ -0,0 +1,26 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, + gitUpdater, +}: +buildFishPlugin rec { + pname = "fish-bd"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "0rax"; + repo = "fish-bd"; + rev = "v${version}"; + hash = "sha256-GeWjoakXa0t2TsMC/wpLEmsSVGhHFhBVK3v9eyQdzv0="; + }; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Fish plugin to quickly go back to a parent directory up in your current working directory tree"; + homepage = "https://github.com/0rax/fish-bd"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ anomalocaris ]; + }; +} diff --git a/pkgs/shells/fish/plugins/fish-you-should-use.nix b/pkgs/shells/fish/plugins/fish-you-should-use.nix new file mode 100644 index 0000000000000..96c2e07447f3a --- /dev/null +++ b/pkgs/shells/fish/plugins/fish-you-should-use.nix @@ -0,0 +1,26 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, + unstableGitUpdater, +}: +buildFishPlugin { + pname = "fish-you-should-use"; + version = "0-unstable-2022-02-13"; + + src = fetchFromGitHub { + owner = "paysonwallach"; + repo = "fish-you-should-use"; + rev = "a332823512c0b51e71516ebb8341db0528c87926"; + hash = "sha256-MmGDFTgxEFgHdX95OjH3jKsVG1hdwo6bRht+Lvvqe5Y="; + }; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Fish plugin that reminds you to use your aliases"; + homepage = "https://github.com/paysonwallach/fish-you-should-use"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ anomalocaris ]; + }; +} diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index 463e45f68bec4..014c2a0dc1fdf 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "24.06.0"; + version = "24.10.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-odxdySx3Bzxs5RMXJ4nivwltQYIaM/UrPb+A0/pnDSk="; + hash = "sha256-g1uedR9BLG0DuGdM/9xqFv6yhBHHnqjQMt1n0z9I29I="; }; postInstall = '' diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index 3a70c888c352d..1ad4764c46c58 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -31,7 +31,7 @@ buildFishPlugin rec { # Disable tests that are failing, because there is not 'rev' command rm tests/preview_file/custom_file_preview.fish '' + ( - if stdenv.isDarwin then ''script /dev/null fish -c "fishtape tests/*/*.fish"'' + if stdenv.hostPlatform.isDarwin then ''script /dev/null fish -c "fishtape tests/*/*.fish"'' else ''script -c 'fish -c "fishtape tests/*/*.fish"' '' ); diff --git a/pkgs/shells/fish/plugins/plugin-sudope.nix b/pkgs/shells/fish/plugins/plugin-sudope.nix new file mode 100644 index 0000000000000..e24f6ae150509 --- /dev/null +++ b/pkgs/shells/fish/plugins/plugin-sudope.nix @@ -0,0 +1,26 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, + unstableGitUpdater, +}: +buildFishPlugin { + pname = "plugin-sudope"; + version = "0-unstable-2021-04-11"; + + src = fetchFromGitHub { + owner = "oh-my-fish"; + repo = "plugin-sudope"; + rev = "83919a692bc1194aa322f3627c859fecace5f496"; + hash = "sha256-pD4rNuqg6TG22L9m8425CO2iqcYm8JaAEXIVa0H/v/U="; + }; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Fish plugin to quickly put 'sudo' in your command"; + homepage = "https://github.com/oh-my-fish/plugin-sudope"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ anomalocaris ]; + }; +} diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index 0440a79e760f6..a5e7f9edeb9a0 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -34,11 +34,11 @@ rustPlatform.buildRustPackage rec { ./build-script.patch ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # test assumes linux "--skip=binary::completer::tests::filename_completion" ]; diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 66d24292ce8ab..44c6c4f48c0d2 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "murex"; - version = "6.2.4000"; + version = "6.3.4225"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CgbbbFFsY6zBwS4GeZk5DuHWibRIewvQ1CnvuvTFaSU="; + sha256 = "sha256-y+7tRp4JNlefsKnMgU9d3b9pzgBJbSKGI98CzkcOjq8="; }; - vendorHash = "sha256-/qK7Zgdz48vmz+tIMZmo1M5Glr842fOCinMoLAeQasg="; + vendorHash = "sha256-NIhg8D8snCNxpb3i2JG5tLcZteYBCGN4QbOowG/vgJE="; subPackages = [ "." ]; @@ -25,4 +25,8 @@ buildGoModule rec { license = licenses.gpl2Only; maintainers = with maintainers; [ dit7ya kashw2 ]; }; + + passthru = { + shellPath = "/bin/murex"; + }; } diff --git a/pkgs/shells/nix-your-shell/default.nix b/pkgs/shells/nix-your-shell/default.nix deleted file mode 100644 index 35f63309f20f4..0000000000000 --- a/pkgs/shells/nix-your-shell/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -}: -rustPlatform.buildRustPackage rec { - pname = "nix-your-shell"; - version = "1.4.5"; - - src = fetchFromGitHub { - owner = "MercuryTechnologies"; - repo = pname; - rev = "v${version}"; - hash = "sha256-gjOvAy15y4WJ4LMmiF17nuY6aAsC1V7/zZ+nt+xDh24="; - }; - - cargoHash = "sha256-EyE/Sv8cY/e8uf4b/7M3kJhd/l+dZS62np58xICF77U="; - - meta = with lib; { - mainProgram = "nix-your-shell"; - description = "`nix` and `nix-shell` wrapper for shells other than `bash`"; - homepage = "https://github.com/MercuryTechnologies/nix-your-shell"; - license = [ licenses.mit ]; - maintainers = [ maintainers._9999years ]; - }; - - passthru.updateScript = nix-update-script { }; -} diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index a391ac6999eb4..ef0edeb6a24cd 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -21,7 +21,7 @@ }: let - version = "0.97.1"; + version = "0.98.0"; in rustPlatform.buildRustPackage { @@ -32,24 +32,24 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-hrcPWJ5OXFozfNux6iR/nEw/1z64N5BV4DD/JWhlH2U="; + hash = "sha256-0XN26onR4Tk8Ejc/UntdL+b5FPBOoBmDQM0DRommIMo="; }; - cargoHash = "sha256-iGmAgrj1oy0t8SsSuCNiUoqWXDFA2CdsPnYYYOpXofs="; + cargoHash = "sha256-43V0TnYGG2tyWRIGaohIaoN7dxnY1fle2Bp5lDiFlWg="; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] - ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; + ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ python3 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = [ openssl zstd ] - ++ lib.optionals stdenv.isDarwin [ zlib Libsystem Security ] - ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ xorg.libX11 ] - ++ lib.optionals (withDefaultFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ zlib Libsystem Security ] + ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ xorg.libX11 ] + ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isDarwin) [ AppKit nghttp2 libgit2 ]; buildNoDefaultFeatures = !withDefaultFeatures; buildFeatures = additionalFeatures [ ]; - doCheck = ! stdenv.isDarwin; # Skip checks on darwin. Failing tests since 0.96.0 + doCheck = ! stdenv.hostPlatform.isDarwin; # Skip checks on darwin. Failing tests since 0.96.0 checkPhase = '' runHook preCheck diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 529f0afd8e4a7..a4ca9df620656 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2024-07-03"; + version = "0-unstable-2024-10-03"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "d6cf03e315f029f6e270fb3949d02432f31a0a04"; - hash = "sha256-cFZ5khjSqg0C4rlkGuAPlZeJO8EOBmz9/B9SMEJFbRA="; + rev = "743ccc08ee9b46703b1afaf4d77b59bf723a6d41"; + hash = "sha256-4vGUZtDkywHIc1sgu5jU+95rQfl9B2eoGWzfH7xSMac="; }; installPhase = '' diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index f713957f27d25..7d693118ac019 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -12,10 +12,10 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-pWtQYraMJ8nXJiTQPXxu/kEg4ftQy8YAjhUj9WPEYS8="; + cargoHash = "sha256-Lcgf6+Li1STl4Sko81oBHAnX09A6F7dwYmHJiF2CZ3s="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Foundation ]; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index c2b12073b727e..06a2fb38d9269 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -12,10 +12,10 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-f7gH5Kxz8vsYQluvIl/VNklFh80kFKCZEyJvH5eD9Qk="; + cargoHash = "sha256-NLGEaIGUqgyGegzVyZloLckVGYmfMjwhzVXh327kxRA="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoBuildFlags = [ "--package nu_plugin_gstat" ]; checkPhase = '' diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index 2bb2b56168b82..981f1d208e117 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -8,22 +8,22 @@ unstableGitUpdater, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "nu-plugin-net"; - version = "0-unstable-2024-04-05"; + version = "1.7.0"; src = fetchFromGitHub { owner = "fennewald"; repo = "nu_plugin_net"; - rev = "60d315afb19c3c673409db796a4cc7a240058605"; - hash = "sha256-izIxV2rFxZ1Om6NNaofNpc5prtN/lsw8dC4DyKEQ+v8="; + rev = "refs/tags/${version}"; + hash = "sha256-GOF2CSlsjI8PAmIxj/+mR01X5XMviEM8gj7ZYTbeX7I="; }; - cargoHash = "sha256-nBxcxADyvPgGrfkW8eBq/wmB2Slq+YGJV2IlxuuCgCg="; + cargoHash = "sha256-2FjKGirjTb6ZjDmhK9ciQzVtWCF8CcYeA+YXcr1oMP4="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation IOKit ]; diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix index 88c29e0ccbda3..5865af7139fdb 100644 --- a/pkgs/shells/nushell/plugins/polars.nix +++ b/pkgs/shells/nushell/plugins/polars.nix @@ -14,12 +14,12 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_polars"; inherit (nushell) version src; - cargoHash = "sha256-agUuDPv8LJixj3cBrvhW8UdPLQHNVYpSlPGvioxZoDU="; + cargoHash = "sha256-LfD0b9ZDWA1apKR36eHx1gKFiKSGAr2tqbZKTc2rMIE="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Foundation ]; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index c3440a7295de0..55bd221c8b548 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-ygzHnrQ3zO1+lxzRUFO1+0XocGBemJKoDa4oiCjCe+0="; + cargoHash = "sha256-7E4CCs4xyNGwjk6B2CwIFf1x0o5uNQArZpyxXEKLXMI="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { openssl curl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit CoreFoundation ]; diff --git a/pkgs/shells/nushell/update.sh b/pkgs/shells/nushell/update.sh deleted file mode 100644 index 9a8015e74600f..0000000000000 --- a/pkgs/shells/nushell/update.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -#!nix-shell -p git nix-update nixpkgs-review nixfmt-rfc-style - -set -euxo pipefail - -basedir="$(git rev-parse --show-toplevel)" -cd "$basedir" - -branch="update-nushell" -nuPath="pkgs/shells/nushell" - -function staged() { - if git status --porcelain | grep -q -E "^[AM].? +$1"; then - return 0 - else - return 1 - fi -} - -function version() { - grep '\s*version = ' "$nuPath/default.nix" | cut -d'"' -f 2 | head --lines 1 -} - -git checkout -B "$branch" - -version_old=$(version) -if ! staged "$nuPath/default.nix"; then - nix-update nushell - git add "$nuPath/default.nix" -fi -version_new=$(version) - -declare -a plugins=(formats query polars gstat) -for plugin in "${plugins[@]}"; do - attr="nushellPlugins.$plugin" - pluginPath="$nuPath/plugins/$plugin.nix" - - if staged "$pluginPath"; then - echo "Skipping '$plugin' because it's alredy staged" - continue - fi - - echo "Attempting to build $attr" - - set +e - newHash=$(nix build ".#$attr" 2> \ - >(grep got | - awk -F' ' '{ print $2 }')) - set -e - - # New hash ? - if [ -n "$newHash" ]; then - # Add the new hash - sed -i "s!cargoHash = ".*";!cargoHash = \"$newHash\";!" "$pluginPath" - nixfmt "$pluginPath" - - echo "Building $plugin again with new hash $newHash" - nix build ".#$attr" - git add "$pluginPath" - echo "Plugin $plugin built sucessfully" - else - echo "No new hash for '$plugin'" - fi -done - -git commit -m "nushell: $version_old -> $version_new" - -echo "Starting nixpkgs-review" -nixpkgs-review rev "$branch" diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index c6d1237015898..a29bb9c990103 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ less makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { libuuid libunwind openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Libsystem - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lttng-ust pam ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { --set POWERSHELL_TELEMETRY_OPTOUT 1 \ --set DOTNET_CLI_TELEMETRY_OPTOUT 1 - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $out/share/powershell/libcoreclrtraceptprovider.so '' + '' diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index 6e7e256561b6f..7b606178973e4 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Restricted User Shell"; longDescription = diff --git a/pkgs/shells/yash/default.nix b/pkgs/shells/yash/default.nix index a88049ca01476..3e57b7b9a0fb2 100644 --- a/pkgs/shells/yash/default.nix +++ b/pkgs/shells/yash/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ asciidoc gettext ]; - buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ gettext ]; + buildInputs = [ ncurses ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; meta = with lib; { homepage = "https://yash.osdn.jp/index.html.en"; diff --git a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix b/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix index 9d87f3b7385f1..899cda1a5ea5f 100644 --- a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix +++ b/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "agkozak-zsh-prompt"; - version = "3.11.3"; + version = "3.11.4"; src = fetchFromGitHub { owner = "agkozak"; repo = "agkozak-zsh-prompt"; rev = "v${version}"; - sha256 = "sha256-YBqFA/DK2K1effniwjPSe5VMx9tZGbmxyJp92TiingU="; + sha256 = "sha256-FC9LIZaS6fV20qq6cJC/xQvfsM3DHXatVleH7yBgoNg="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index fe32821dd6110..7c1f0eb56cbd3 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -30,6 +30,6 @@ buildGoModule rec { # # but this package is no longer maintained. # - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index ac8d3aa9a736e..0955c9c47fa01 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { strictDeps = true; nativeBuildInputs = [ autoreconfHook perl groff texinfo pkg-config ] - ++ lib.optionals stdenv.isLinux [ util-linux yodl ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux yodl ]; buildInputs = [ ncurses pcre ]; diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 00349696bd3f3..d7b745c63c5f1 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ txt2tags ]; buildInputs = [ zsh coreutils procps ] - ++ lib.optional stdenv.isLinux inetutils; + ++ lib.optional stdenv.hostPlatform.isLinux inetutils; buildPhase = '' cd doc diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f7e3982815d38..de025a584af34 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,14 +5,14 @@ , git, nix, nixfmt-classic, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2024-08-27"; + version = "2024-10-01"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "efe21261d031b4836f64112a899706322acd26b0"; - sha256 = "sha256-ICHdwxySSzX64q+mfPKOQqOrLrc/RKiyvPioseNt4hE="; + rev = "f4423ebd09fbc7670815c3c20cc86c81b7319e5f"; + sha256 = "sha256-JlYgWssS1DT1/Jlk6fOZqyEr6ta3ky6tlDqDZbJ1A9k="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index 8639aa68056fa..b09fb37002f4f 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "4.16.0"; + version = "4.16.2"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WjeUF8yD3il9DAava/SYv7ID6iM9AbR1ppazJnypgnk="; + sha256 = "sha256-2CuGiPXZ4C/KvHho08jz0RCdUcLVBnWmT+PlL1KHAx0="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/shells/zsh/zinit/default.nix index c226b5565451d..0cdd61536bc12 100644 --- a/pkgs/shells/zsh/zinit/default.nix +++ b/pkgs/shells/zsh/zinit/default.nix @@ -24,6 +24,8 @@ stdenvNoCC.mkDerivation rec { install -m0644 zinit{,-side,-install,-autoload}.zsh "$outdir" install -m0755 share/git-process-output.zsh "$outdir" + installManPage doc/zinit.1 + # Zplugin autocompletion installShellCompletion --zsh _zinit @@ -32,6 +34,9 @@ stdenvNoCC.mkDerivation rec { # find zmodules/ -type f -exec install -m 744 "{}" "$outdir/{}" \; ''; + postInstall = '' + installManPage doc/zinit.1 + ''; #TODO:doc output meta = with lib; { diff --git a/pkgs/shells/zsh/zsh-autocomplete/default.nix b/pkgs/shells/zsh/zsh-autocomplete/default.nix index 1ecd96121972e..bd265a3868bae 100644 --- a/pkgs/shells/zsh/zsh-autocomplete/default.nix +++ b/pkgs/shells/zsh/zsh-autocomplete/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "zsh-autocomplete"; - version = "23.07.13"; + version = "24.09.04"; src = fetchFromGitHub { owner = "marlonrichert"; repo = "zsh-autocomplete"; rev = version; - sha256 = "sha256-0NW0TI//qFpUA2Hdx6NaYdQIIUpRSd0Y4NhwBbdssCs="; + sha256 = "sha256-o8IQszQ4/PLX1FlUvJpowR2Tev59N8lI20VymZ+Hp4w="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zsh-autopair/default.nix b/pkgs/shells/zsh/zsh-autopair/default.nix index e950eadbcf401..8b0cfd6ed5232 100644 --- a/pkgs/shells/zsh/zsh-autopair/default.nix +++ b/pkgs/shells/zsh/zsh-autopair/default.nix @@ -1,18 +1,20 @@ -{ stdenv, lib, fetchFromGitHub }: +{ + stdenv, + lib, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "zsh-autopair"; - version = "1.0"; + version = "1.0-unstable-2024-07-14"; src = fetchFromGitHub { owner = "hlissner"; repo = "zsh-autopair"; - rev = "v${version}"; - sha256 = "1h0vm2dgrmb8i2pvsgis3lshc5b0ad846836m62y8h3rdb3zmpy1"; + rev = "449a7c3d095bc8f3d78cf37b9549f8bb4c383f3d"; + hash = "sha256-3zvOgIi+q7+sTXrT+r/4v98qjeiEL4Wh64rxBYnwJvQ="; }; - strictDeps = true; - installPhase = '' install -D autopair.zsh $out/share/zsh/${pname}/autopair.zsh ''; @@ -21,7 +23,10 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hlissner/zsh-autopair"; description = "Plugin that auto-closes, deletes and skips over matching delimiters in zsh intelligently"; license = licenses.mit; - maintainers = with maintainers; [ _0qq ]; + maintainers = with maintainers; [ + _0qq + DataHearth + ]; platforms = platforms.all; }; } diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix index 13038e05c7092..db847297199b2 100644 --- a/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -1,32 +1,33 @@ -{ stdenv +{ stdenvNoCC , lib , bash , coreutils , findutils , fetchFromGitHub , fzf +, gawk , git , gnugrep , gnused , makeWrapper }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "zsh-forgit"; - version = "24.02.0"; + version = "24.10.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; - rev = version; - sha256 = "sha256-DoOtrnEJwSxkCZtsVek+3w9RZH7j7LTvdleBC88xyfI="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-g1uedR9BLG0DuGdM/9xqFv6yhBHHnqjQMt1n0z9I29I="; }; strictDeps = true; postPatch = '' substituteInPlace forgit.plugin.zsh \ - --replace "\$INSTALL_DIR/bin/git-forgit" "$out/bin/git-forgit" + --replace-fail "\$FORGIT_INSTALL_DIR/bin/git-forgit" "$out/bin/git-forgit" ''; dontBuild = true; @@ -38,10 +39,9 @@ stdenv.mkDerivation rec { install -D bin/git-forgit $out/bin/git-forgit install -D completions/_git-forgit $out/share/zsh/site-functions/_git-forgit - install -D completions/git-forgit.zsh $out/share/zsh/${pname}/git-forgit.zsh - install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh + install -D forgit.plugin.zsh $out/share/zsh/${finalAttrs.pname}/forgit.plugin.zsh wrapProgram $out/bin/git-forgit \ - --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf git gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf gawk git gnugrep gnused ]} runHook postInstall ''; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ deejayem ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 57c74fee233d1..4289bcaeb9918 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -261,25 +261,27 @@ rec { in overrideCC targetStdenv cc; - useMoldLinker = stdenv: let - bintools = stdenv.cc.bintools.override { - extraBuildCommands = '' - wrap ${stdenv.cc.bintools.targetPrefix}ld.mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold - wrap ${stdenv.cc.bintools.targetPrefix}ld ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold - ''; - }; - in stdenv.override (old: { - allowedRequisites = null; - cc = stdenv.cc.override { inherit bintools; }; - # gcc >12.1.0 supports '-fuse-ld=mold' - # the wrap ld above in bintools supports gcc <12.1.0 and shouldn't harm >12.1.0 - # https://github.com/rui314/mold#how-to-use - } // lib.optionalAttrs (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12")) { - mkDerivationFromStdenv = extendMkDerivationArgs old (args: { - NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -fuse-ld=mold"; - }); - }); - + useMoldLinker = stdenv: + if stdenv.targetPlatform.isDarwin + then throw "Mold can't be used to emit Mach-O (Darwin) binaries" + else let + bintools = stdenv.cc.bintools.override { + extraBuildCommands = '' + wrap ${stdenv.cc.bintools.targetPrefix}ld.mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold + wrap ${stdenv.cc.bintools.targetPrefix}ld ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold + ''; + }; + in stdenv.override (old: { + allowedRequisites = null; + cc = stdenv.cc.override { inherit bintools; }; + # gcc >12.1.0 supports '-fuse-ld=mold' + # the wrap ld above in bintools supports gcc <12.1.0 and shouldn't harm >12.1.0 + # https://github.com/rui314/mold#how-to-use + } // lib.optionalAttrs (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12")) { + mkDerivationFromStdenv = extendMkDerivationArgs old (args: { + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -fuse-ld=mold"; + }); + }); /* Modify a stdenv so that it builds binaries optimized specifically for the machine they are built on. diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 6babb40203954..13fb71c214ffc 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -41,25 +41,44 @@ in lib.init bootStages ++ [ if crossSystem.isStatic then buildPackages.stdenvAdapters.makeStatic else lib.id; + stdenvNoCC = adaptStdenv (buildPackages.stdenv.override (old: rec { + buildPlatform = localSystem; + hostPlatform = crossSystem; + targetPlatform = crossSystem; + + # Prior overrides are surely not valid as packages built with this run on + # a different platform, and so are disabled. + overrides = _: _: {}; + extraBuildInputs = [ ]; # Old ones run on wrong platform + allowedRequisites = null; + + cc = null; + hasCC = false; + + extraNativeBuildInputs = old.extraNativeBuildInputs + ++ lib.optionals + (hostPlatform.isLinux && !buildPlatform.isLinux) + [ buildPackages.patchelf ] + ++ lib.optional + (let f = p: !p.isx86 || builtins.elem p.libc [ "musl" "wasilibc" "relibc" ] || p.isiOS || p.isGenode; + in f hostPlatform && !(f buildPlatform) ) + buildPackages.updateAutotoolsGnuConfigScriptsHook + ; + })); in { inherit config; overlays = overlays ++ crossOverlays; selfBuild = false; + inherit stdenvNoCC; stdenv = let - baseStdenv = adaptStdenv (buildPackages.stdenv.override (old: rec { - buildPlatform = localSystem; - hostPlatform = crossSystem; - targetPlatform = crossSystem; - - # Prior overrides are surely not valid as packages built with this run on - # a different platform, and so are disabled. - overrides = _: _: {}; - extraBuildInputs = [ ] # Old ones run on wrong platform - ++ lib.optionals hostPlatform.isDarwin [ buildPackages.targetPackages.darwin.apple_sdk.frameworks.CoreFoundation ] - ; - allowedRequisites = null; + inherit (stdenvNoCC) hostPlatform targetPlatform; + baseStdenv = stdenvNoCC.override { + # Old ones run on wrong platform + extraBuildInputs = lib.optionals hostPlatform.isDarwin [ + buildPackages.targetPackages.darwin.apple_sdk.frameworks.CoreFoundation + ]; - hasCC = !targetPlatform.isGhcjs; + hasCC = !stdenvNoCC.targetPlatform.isGhcjs; cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang @@ -81,16 +100,7 @@ in lib.init bootStages ++ [ then buildPackages.arocc else buildPackages.gcc; - extraNativeBuildInputs = old.extraNativeBuildInputs - ++ lib.optionals - (hostPlatform.isLinux && !buildPlatform.isLinux) - [ buildPackages.patchelf ] - ++ lib.optional - (let f = p: !p.isx86 || builtins.elem p.libc [ "musl" "wasilibc" "relibc" ] || p.isiOS || p.isGenode; - in f hostPlatform && !(f buildPlatform) ) - buildPackages.updateAutotoolsGnuConfigScriptsHook - ; - })); + }; in if config ? replaceCrossStdenv then config.replaceCrossStdenv { inherit buildPackages baseStdenv; } else baseStdenv; }) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 13d53ad6e6781..588e3b03d92ba 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -15,11 +15,12 @@ overlays, crossOverlays ? [ ], # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools - bootstrapFiles ? + bootstrapFiles ? (config.replaceBootstrapFiles or lib.id) ( if localSystem.isAarch64 then import ./bootstrap-files/aarch64-apple-darwin.nix else - import ./bootstrap-files/x86_64-apple-darwin.nix, + import ./bootstrap-files/x86_64-apple-darwin.nix + ), }: assert crossSystem == localSystem; @@ -1225,6 +1226,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # libc++, and libc++abi do not need CoreFoundation. Avoid propagating the CF from prior # stages to the final stdenv via rpath by dropping it from `extraBuildInputs`. + stdenvNoCC = super.stdenvNoCC.override { extraBuildInputs = [ ]; }; stdenvNoCF = self.stdenv.override { extraBuildInputs = [ ]; }; libcxxBootstrapStdenv = self.overrideCC stdenvNoCF ( @@ -1543,6 +1545,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # Don’t link anything in this stage against CF to prevent propagating CF from prior stages to # the final stdenv, which happens because of the rpath hook. + stdenvNoCC = super.stdenvNoCC.override { extraBuildInputs = [ ]; }; stdenv = let stdenvNoCF = super.stdenv.override { extraBuildInputs = [ ]; }; @@ -2331,7 +2334,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check openpam openssl.out patch - xar + xar.lib xz.bin xz.out zlib.dev diff --git a/pkgs/stdenv/darwin/override-sdk.nix b/pkgs/stdenv/darwin/override-sdk.nix index d24c118cc6685..50ebb814522c4 100644 --- a/pkgs/stdenv/darwin/override-sdk.nix +++ b/pkgs/stdenv/darwin/override-sdk.nix @@ -66,6 +66,12 @@ let original = pkgs.darwin.apple_sdk.Libsystem; replacement = sdk.Libsystem; } + # This is different to `pkgs.darwin.apple_sdk.Libsystem` on `aarch64-darwin`. + # Isn’t that neat? I think that’s neat. Don’t do macOS SDKs like this. + { + original = pkgs.darwin.Libsystem; + replacement = sdk.Libsystem; + } # Make sure darwin.CF is mapped to the correct version for the SDK. { original = pkgs.darwin.CF; diff --git a/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix b/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix index bc43eef9efc47..2b0d620b906dc 100644 --- a/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix +++ b/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix @@ -1,13 +1,22 @@ +# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: +# $ ./refresh-tarballs.bash --targets=x86_64-unknown-freebsd +# +# Metadata: +# - nixpkgs revision: 6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2 +# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.x86_64-unknown-freebsd.build/latest +# - resolved hydra build: https://hydra.nixos.org/build/271214352 +# - instantiated derivation: /nix/store/aahbgs95ani3bd70vxb8kwrvbms0d6ii-build.drv +# - output directory: /nix/store/ikzxl9ws9yxrl8g8z2kcjwqlq5gfjbhx-build +# - build time: Sat, 31 Aug 2024 17:18:35 +0000 { + bootstrapTools = import <nix/fetchurl.nix> { + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2/bootstrap-tools.tar.xz"; + hash = "sha256-f7Fqxtpj7/0Sbs+kUgMs7oJ0JmPuh3bqD2YzOBTw2fc="; + }; unpack = import <nix/fetchurl.nix> { - url = "http://192.168.122.1:8000/result/on-server/unpack.nar.xz"; - hash = "sha256-y6quCU9JKnKBdHDcUkdkM0ypWDT2cdSiqR1WqA+8ozE="; - name = "boostrapUnpacked"; + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2/unpack.nar.xz"; + hash = "sha256-3NTRtonoc3ZqnEF3hr1mUPH/aw+04OlwVxGhZmjXlMM="; + name = "unpack"; unpack = true; }; - bootstrapTools = import <nix/fetchurl.nix> { - url = "http://192.168.122.1:8000/result/on-server/bootstrap-tools.tar.xz"; - hash = "sha256-ypIOxsB8a/RPupki0ZTjb+vuE+ibtmS8e3DazeolHj8="; - name = "bootstrapTools.tar.xz"; - }; } diff --git a/pkgs/stdenv/freebsd/bootstrap-tools-spurious.txt b/pkgs/stdenv/freebsd/bootstrap-tools-spurious.txt index 074e1f15ed5f9..b7d20c45ae433 100644 --- a/pkgs/stdenv/freebsd/bootstrap-tools-spurious.txt +++ b/pkgs/stdenv/freebsd/bootstrap-tools-spurious.txt @@ -149,7 +149,6 @@ lib/engines-3/capi.so lib/engines-3/devcrypto.so lib/engines-3/loader_attic.so lib/engines-3/padlock.so -lib/freebsd/libclang_rt.builtins-x86_64.a lib/gawk/filefuncs.so lib/gawk/fnmatch.so lib/gawk/fork.so diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 08768e0b9131f..667905f264b0d 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -485,7 +485,6 @@ in # we can import the foundational libs from boot-0 # we can import bins and libs that DON'T get imported OR LINKED into the final stdenv from boot-0 curl = prevStage.curlReal; - curlReal = super.curl; inherit (prevStage) fetchurl python3 @@ -511,7 +510,6 @@ in name = "freebsd"; overrides = prevStage: self: super: { __bootstrapArchive = bootstrapArchive; - curl = prevStage.curlReal; fetchurl = prevStage.fetchurlReal; freebsd = super.freebsd.overrideScope ( self': super': { localesPrev = prevStage.freebsd.localesReal; } diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 3068ad726658e..b2b6576c4acd7 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -42,6 +42,24 @@ let inherit (import ../../build-support/lib/cmake.nix { inherit lib stdenv; }) makeCMakeFlags; inherit (import ../../build-support/lib/meson.nix { inherit lib stdenv; }) makeMesonFlags; + /** + This function creates a derivation, and returns it in the form of a [package attribute set](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) + that refers to the derivation's outputs. + + `mkDerivation` takes many argument attributes, most of which affect the derivation environment, + but [`meta`](#chap-meta) and [`passthru`](#var-stdenv-passthru) only directly affect package attributes. + + The `mkDerivation` argument attributes can be made to refer to one another by passing a function to `mkDerivation`. + See [Fixed-point argument of `mkDerivation`](#mkderivation-recursive-attributes). + + Reference documentation see: https://nixos.org/manual/nixpkgs/stable/#sec-using-stdenv + + :::{.note} + This is used as the fundamental building block of most other functions in Nixpkgs for creating derivations. + + Most arguments are also passed through to the underlying call of [`builtins.derivation`](https://nixos.org/manual/nix/stable/language/derivations). + ::: + */ mkDerivation = fnOrAttrs: if builtins.isFunction fnOrAttrs @@ -67,26 +85,8 @@ let # ^^^^ overrideAttrs = f0: - let - f = self: super: - # Convert f0 to an overlay. Legacy is: - # overrideAttrs (super: {}) - # We want to introduce self. We follow the convention of overlays: - # overrideAttrs (self: super: {}) - # Which means the first parameter can be either self or super. - # This is surprising, but far better than the confusion that would - # arise from flipping an overlay's parameters in some cases. - let x = f0 super; - in - if builtins.isFunction x - then - # Can't reuse `x`, because `self` comes first. - # Looks inefficient, but `f0 super` was a cheap thunk. - f0 self super - else x; - in - makeDerivationExtensible - (self: let super = rattrs self; in super // (if builtins.isFunction f0 || f0?__functor then f self super else f0)); + makeDerivationExtensible + (lib.extends (lib.toExtension f0) rattrs); finalPackage = mkDerivationSimple overrideAttrs args; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 1b4f7a89d358e..3c197171e801d 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -387,12 +387,16 @@ appendToVar() { # Accumulate flags from the named variables $2+ into the indexed array $1. # # Arrays are simply concatenated, strings are split on whitespace. +# Default values can be passed via name=default. concatTo() { local -n targetref="$1"; shift - local name type - for name in "$@"; do - if type=$(declare -p "$name" 2> /dev/null); then - local -n nameref="$name" + local arg default name type + for arg in "$@"; do + IFS="=" read -r name default <<< "$arg" + local -n nameref="$name" + if [[ ! -n "${nameref[@]}" && -n "$default" ]]; then + targetref+=( "$default" ) + elif type=$(declare -p "$name" 2> /dev/null); then case "${type#* }" in -A*) echo "concatTo(): ERROR: trying to use concatTo on an associative array." >&2 @@ -1340,8 +1344,7 @@ patchPhase() { esac local -a flagsArray - : "${patchFlags:=-p1}" - concatTo flagsArray patchFlags + concatTo flagsArray patchFlags=-p1 # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.) # shellcheck disable=SC2086 $uncompress < "$i" 2>&1 | patch "${flagsArray[@]}" @@ -1493,8 +1496,7 @@ checkPhase() { SHELL="$SHELL" ) - : "${checkFlags:=VERBOSE=y}" - concatTo flagsArray makeFlags makeFlagsArray checkFlags checkFlagsArray checkTarget + concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget echoCmd 'check flags' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -1528,8 +1530,7 @@ installPhase() { SHELL="$SHELL" ) - : "${installTargets:=install}" - concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets + concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install echoCmd 'install flags' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -1612,9 +1613,8 @@ installCheckPhase() { SHELL="$SHELL" ) - : "${installCheckTarget:=installcheck}" concatTo flagsArray makeFlags makeFlagsArray \ - installCheckFlags installCheckFlagsArray installCheckTarget + installCheckFlags installCheckFlagsArray installCheckTarget=installcheck echoCmd 'installcheck flags' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -1629,8 +1629,7 @@ distPhase() { runHook preDist local flagsArray=() - : "${distTarget:=dist}" - concatTo flagsArray distFlags distFlagsArray distTarget + concatTo flagsArray distFlags distFlagsArray distTarget=dist echo 'dist flags: %q' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index c5e0498de66a4..91ea577570f2c 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -94,7 +94,7 @@ or (throw "unsupported libc for the pure Linux stdenv"); files = archLookupTable.${localSystem.system} or (if getCompatibleTools != null then getCompatibleTools else (throw "unsupported platform for the pure Linux stdenv")); - in files + in (config.replaceBootstrapFiles or lib.id) files }: assert crossSystem == localSystem; diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 6a0b11a6cc974..3de359d15b4a7 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -3,9 +3,9 @@ let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug - sanitizersWorking = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin && !stdenv.hostPlatform.isMusl && ( + sanitizersWorking = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl && ( (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "5.0.0") - || (stdenv.cc.isGNU && stdenv.isLinux) + || (stdenv.cc.isGNU && stdenv.hostPlatform.isLinux) ); staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; emulator = stdenv.hostPlatform.emulator buildPackages; @@ -57,7 +57,7 @@ in stdenv.mkDerivation { rm cxx-main{,-static,.o} ''} - ${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' + ${lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.cc.isClang) '' echo "checking whether compiler can build with CoreFoundation.framework... " >&2 mkdir -p foo/lib $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} @@ -65,7 +65,7 @@ in stdenv.mkDerivation { ''} - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' echo "checking whether compiler builds valid static C binaries... " >&2 $CC ${staticLibc} -static -o cc-static ${./cc-main.c} ${emulator} ./cc-static @@ -106,7 +106,7 @@ in stdenv.mkDerivation { echo "checking whether compiler uses NIX_LDFLAGS... " >&2 mkdir -p foo/lib $CC -shared \ - ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ -DVALUE=42 \ -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} diff --git a/pkgs/test/check-by-name/README.md b/pkgs/test/check-by-name/README.md deleted file mode 100644 index 140f5951ca335..0000000000000 --- a/pkgs/test/check-by-name/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# `pkgs/by-name` check CI scripts - -This directory contains scripts and files used and related to the CI running the `pkgs/by-name` checks in Nixpkgs. -See also the [CI GitHub Action](../../../.github/workflows/check-by-name.yml). - -## `./run-local.sh BASE_BRANCH [REPOSITORY]` - -Runs the `pkgs/by-name` check on the HEAD commit, closely matching what CI does. - -Note that this can't do exactly the same as CI, -because CI needs to rely on GitHub's server-side Git history to compute the mergeability of PRs before the check can be started. -In turn when running locally, we don't want to have to push commits to test them, -and we can also rely on the local Git history to do the mergeability check. - -Arguments: -- `BASE_BRANCH`: The base branch to use, e.g. master or release-24.05 -- `REPOSITORY`: The repository to fetch the base branch from, defaults to https://github.com/NixOS/nixpkgs.git - -## `./update-pinned-tool.sh` - -Updates the pinned [nixpkgs-check-by-name tool](https://github.com/NixOS/nixpkgs-check-by-name) in [`./pinned-version.txt`](./pinned-version.txt) to the latest [release](https://github.com/NixOS/nixpkgs-check-by-name/releases). -Each release contains a pre-built x86_64-linux version of the tool which is used by CI. - -This script currently needs to be called manually when the CI tooling needs to be updated. - -Why not just build the tooling right from the PRs Nixpkgs version? -- Because it allows CI to check all PRs, even if they would break the CI tooling. -- Because it makes the CI check very fast, since no Nix builds need to be done, even for mass rebuilds. -- Because it improves security, since we don't have to build potentially untrusted code from PRs. - The tool only needs a very minimal Nix evaluation at runtime, which can work with [readonly-mode](https://nixos.org/manual/nix/stable/command-ref/opt-common.html#opt-readonly-mode) and [restrict-eval](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-restrict-eval). - diff --git a/pkgs/test/check-by-name/run-local.sh b/pkgs/test/check-by-name/run-local.sh deleted file mode 100755 index b1b662046bf39..0000000000000 --- a/pkgs/test/check-by-name/run-local.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq - -set -o pipefail -o errexit -o nounset - -trace() { echo >&2 "$@"; } - -tmp=$(mktemp -d) -cleanup() { - # Don't exit early if anything fails to cleanup - set +o errexit - - trace -n "Cleaning up.. " - - [[ -e "$tmp/base" ]] && git worktree remove --force "$tmp/base" - [[ -e "$tmp/merged" ]] && git worktree remove --force "$tmp/merged" - - rm -rf "$tmp" - - trace "Done" -} -trap cleanup exit - - -repo=https://github.com/NixOS/nixpkgs.git - -if (( $# != 0 )); then - baseBranch=$1 - shift -else - trace "Usage: $0 BASE_BRANCH [REPOSITORY]" - trace "BASE_BRANCH: The base branch to use, e.g. master or release-23.11" - trace "REPOSITORY: The repository to fetch the base branch from, defaults to $repo" - exit 1 -fi - -if (( $# != 0 )); then - repo=$1 - shift -fi - -if [[ -n "$(git status --porcelain)" ]]; then - trace -e "\e[33mWarning: Dirty tree, uncommitted changes won't be taken into account\e[0m" -fi -headSha=$(git rev-parse HEAD) -trace -e "Using HEAD commit \e[34m$headSha\e[0m" - -trace -n "Creating Git worktree for the HEAD commit in $tmp/merged.. " -git worktree add --detach -q "$tmp/merged" HEAD -trace "Done" - -trace -n "Fetching base branch $baseBranch to compare against.. " -git fetch -q "$repo" refs/heads/"$baseBranch" -baseSha=$(git rev-parse FETCH_HEAD) -trace -e "\e[34m$baseSha\e[0m" - -trace -n "Creating Git worktree for the base branch in $tmp/base.. " -git worktree add -q "$tmp/base" "$baseSha" -trace "Done" - -trace -n "Merging base branch into the HEAD commit in $tmp/merged.. " -git -C "$tmp/merged" merge -q --no-edit "$baseSha" -trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m" - -trace -n "Reading pinned nixpkgs-check-by-name version from pinned-version.txt.. " -toolVersion=$(<"$tmp/merged/pkgs/test/check-by-name/pinned-version.txt") -trace -e "\e[34m$toolVersion\e[0m" - -trace -n "Building tool.. " -nix-build https://github.com/NixOS/nixpkgs-check-by-name/tarball/"$toolVersion" -o "$tmp/tool" -A build - -trace "Running nixpkgs-check-by-name.." -"$tmp/tool/bin/nixpkgs-check-by-name" --base "$tmp/base" "$tmp/merged" diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index bd233db4cd50f..f07e9c6220de7 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -146,6 +146,8 @@ let pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv pkgs.pkgsCross.mingwW64.stdenv + # Uses the expression that is used by the most cross-compil_ed_ GHCs + pkgs.pkgsCross.riscv64.haskell.compiler.native-bignum.ghc948 ] ++ lib.optionals (with pkgs.stdenv.buildPlatform; isx86_64 && isLinux) [ # Musl-to-glibc cross on the same architecture tends to turn up diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 29125f1d2979f..adb112fd36680 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -48,7 +48,6 @@ with pkgs; sets = lib.pipe gccTests ([ (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.stdenv.cc)) # Broken - (filterAttrs (n: _: n != "gcc49Stdenv")) (filterAttrs (n: _: n != "gccMultiStdenv")) ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # fails with things like @@ -168,7 +167,7 @@ with pkgs; makeBinaryWrapper = pkgs.makeBinaryWrapper.override { # Enable sanitizers in the tests only, to avoid the performance cost in regular usage. # The sanitizers cause errors on aarch64-darwin, see https://github.com/NixOS/nixpkgs/pull/150079#issuecomment-994132734 - sanitizers = pkgs.lib.optionals (! (pkgs.stdenv.isDarwin && pkgs.stdenv.isAarch64)) + sanitizers = pkgs.lib.optionals (! (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64)) [ "undefined" "address" ]; }; }; diff --git a/pkgs/test/dotnet/default.nix b/pkgs/test/dotnet/default.nix index 72c2f5a64def8..601cf5c15e4e8 100644 --- a/pkgs/test/dotnet/default.nix +++ b/pkgs/test/dotnet/default.nix @@ -5,4 +5,5 @@ use-dotnet-from-env = lib.recurseIntoAttrs (callPackage ./use-dotnet-from-env { }); structured-attrs = lib.recurseIntoAttrs (callPackage ./structured-attrs { }); final-attrs = lib.recurseIntoAttrs (callPackage ./final-attrs { }); + nuget-deps = lib.recurseIntoAttrs (callPackage ./nuget-deps { }); } diff --git a/pkgs/test/dotnet/nuget-deps/default.nix b/pkgs/test/dotnet/nuget-deps/default.nix new file mode 100644 index 0000000000000..bf0e1445e93eb --- /dev/null +++ b/pkgs/test/dotnet/nuget-deps/default.nix @@ -0,0 +1,44 @@ +# Tests that `nugetDeps` in buildDotnetModule can handle various types. + +{ + lib, + dotnet-sdk, + buildPackages, # buildDotnetModule + runCommand, +}: + +let + inherit (lib) + mapAttrs + ; + + inherit (buildPackages) + emptyDirectory + buildDotnetModule + ; + +in +mapAttrs + ( + name: nugetDeps: + buildDotnetModule { + name = "nuget-deps-${name}"; + unpackPhase = '' + runHook preUnpack + + mkdir test + cd test + dotnet new console -o . + ls -l + + runHook postUnpack + ''; + inherit nugetDeps; + } + ) + { + "null" = null; + "file" = ./nuget-deps.nix; + "derivation" = emptyDirectory; + "list" = [ emptyDirectory ]; + } diff --git a/pkgs/test/dotnet/nuget-deps/nuget-deps.nix b/pkgs/test/dotnet/nuget-deps/nuget-deps.nix new file mode 100644 index 0000000000000..dbfecc1b26058 --- /dev/null +++ b/pkgs/test/dotnet/nuget-deps/nuget-deps.nix @@ -0,0 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: +[ +] diff --git a/pkgs/test/install-shell-files/default.nix b/pkgs/test/install-shell-files/default.nix index aef5acc1de6bf..21894698fe1bb 100644 --- a/pkgs/test/install-shell-files/default.nix +++ b/pkgs/test/install-shell-files/default.nix @@ -1,125 +1,3 @@ -{ lib, runCommandLocal, recurseIntoAttrs, installShellFiles }: +{ installShellFiles }: -let - runTest = name: env: buildCommand: - runCommandLocal "install-shell-files--${name}" ({ - nativeBuildInputs = [ installShellFiles ]; - meta.platforms = lib.platforms.all; - } // env) buildCommand; -in - -recurseIntoAttrs { - # installManPage - - install-manpage = runTest "install-manpage" {} '' - mkdir -p doc - echo foo > doc/foo.1 - echo bar > doc/bar.2.gz - echo baz > doc/baz.3 - - installManPage doc/* - - cmp doc/foo.1 $out/share/man/man1/foo.1 - cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz - cmp doc/baz.3 $out/share/man/man3/baz.3 - ''; - install-manpage-outputs = runTest "install-manpage-outputs" { - outputs = [ "out" "man" "devman" ]; - } '' - mkdir -p doc - echo foo > doc/foo.1 - echo bar > doc/bar.3 - - installManPage doc/* - - # assert they didn't go into $out - [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]] - - # foo.1 alone went into man - cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1 - [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]] - - # bar.3 alone went into devman - cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3 - [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]] - - touch $out - ''; - - # installShellCompletion - - install-completion = runTest "install-completion" {} '' - echo foo > foo - echo bar > bar - echo baz > baz - echo qux > qux.zsh - echo quux > quux - - installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux - - cmp foo $out/share/bash-completion/completions/foo - cmp bar $out/share/bash-completion/completions/bar - cmp baz $out/share/zsh/site-functions/_baz - cmp qux.zsh $out/share/zsh/site-functions/_qux - cmp quux $out/share/fish/vendor_completions.d/quux - ''; - install-completion-output = runTest "install-completion-output" { - outputs = [ "out" "bin" ]; - } '' - echo foo > foo - - installShellCompletion --bash foo - - # assert it didn't go into $out - [[ ! -f $out/share/bash-completion/completions/foo ]] - - cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo - - touch $out - ''; - install-completion-name = runTest "install-completion-name" {} '' - echo foo > foo - echo bar > bar - echo baz > baz - - installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz - - cmp foo $out/share/bash-completion/completions/foobar.bash - cmp bar $out/share/zsh/site-functions/_foobar - cmp baz $out/share/fish/vendor_completions.d/baz - ''; - install-completion-inference = runTest "install-completion-inference" {} '' - echo foo > foo.bash - echo bar > bar.zsh - echo baz > baz.fish - - installShellCompletion foo.bash bar.zsh baz.fish - - cmp foo.bash $out/share/bash-completion/completions/foo.bash - cmp bar.zsh $out/share/zsh/site-functions/_bar - cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish - ''; - install-completion-cmd = runTest "install-completion-cmd" {} '' - echo foo > foo.bash - echo bar > bar.zsh - echo baz > baz.fish - echo qux > qux.fish - - installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish - - cmp foo.bash $out/share/bash-completion/completions/foobar.bash - cmp bar.zsh $out/share/zsh/site-functions/_foobar - cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish - cmp qux.fish $out/share/fish/vendor_completions.d/qux - ''; - install-completion-fifo = runTest "install-completion-fifo" {} '' - installShellCompletion \ - --bash --name foo.bash <(echo foo) \ - --zsh --name _foo <(echo bar) \ - --fish --name foo.fish <(echo baz) - - [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; } - [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; } - [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; } - ''; -} +installShellFiles.tests diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix index 0d699900cf6d1..29e4272fd672c 100644 --- a/pkgs/test/make-binary-wrapper/default.nix +++ b/pkgs/test/make-binary-wrapper/default.nix @@ -60,7 +60,7 @@ let "overlength-strings" "prefix" "suffix" - ] makeGoldenTest // lib.optionalAttrs (! stdenv.isDarwin) { + ] makeGoldenTest // lib.optionalAttrs (! stdenv.hostPlatform.isDarwin) { cross = pkgsCross.${if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform"}.callPackage ./cross.nix { }; }; in diff --git a/pkgs/test/release/default.nix b/pkgs/test/release/default.nix index 2ab730b5c4822..2fdc6d0dc38c5 100644 --- a/pkgs/test/release/default.nix +++ b/pkgs/test/release/default.nix @@ -13,8 +13,21 @@ pkgs.runCommand "all-attrs-eval-under-tryEval" { nativeBuildInputs = [ nix pkgs.gitMinimal - ] ++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools; + ] ++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.inotify-tools; strictDeps = true; + + src = with lib.fileset; toSource { + root = pkgs-path; + fileset = unions [ + ../../../default.nix + ../../../doc + ../../../lib + ../../../maintainers + ../../../nixos + ../../../pkgs + ../../../.version + ]; + }; } '' datadir="${nix}/share" @@ -31,15 +44,8 @@ pkgs.runCommand "all-attrs-eval-under-tryEval" { nix-store --init - cp -r ${pkgs-path}/lib lib - cp -r ${pkgs-path}/pkgs pkgs - cp -r ${pkgs-path}/default.nix default.nix - cp -r ${pkgs-path}/nixos nixos - cp -r ${pkgs-path}/maintainers maintainers - cp -r ${pkgs-path}/.version .version - cp -r ${pkgs-path}/doc doc echo "Running pkgs/top-level/release-attrpaths-superset.nix" - nix-instantiate --eval --strict --json pkgs/top-level/release-attrpaths-superset.nix -A names > /dev/null + nix-instantiate --eval --strict --json $src/pkgs/top-level/release-attrpaths-superset.nix -A names > /dev/null mkdir $out echo success > $out/${nix.version} diff --git a/pkgs/test/stdenv-inputs/default.nix b/pkgs/test/stdenv-inputs/default.nix index 6a2e441d01917..deb97b8224237 100644 --- a/pkgs/test/stdenv-inputs/default.nix +++ b/pkgs/test/stdenv-inputs/default.nix @@ -12,7 +12,7 @@ let chmod +x $out/bin/foo cp ${./foo.c} $out/include/foo.h $CC -shared \ - ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} \ -o $out/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} ''; @@ -30,7 +30,7 @@ let chmod +x $out/bin/bar cp ${./bar.c} $dev/include/bar.h $CC -shared \ - ${lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} \ -o $dev/lib/libbar${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./bar.c} ''; diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index a5b571b5a9f43..a916e9b65a344 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -109,21 +109,30 @@ let declare -A associativeArray=(["X"]="Y") [[ $(concatTo nowhere associativeArray 2>&1) =~ "trying to use" ]] || (echo "concatTo did not throw concatenating associativeArray" && false) + empty_array=() + empty_string="" + declare -a flagsArray - concatTo flagsArray string list + concatTo flagsArray string list notset=e=f empty_array=g empty_string=h declare -p flagsArray [[ "''${flagsArray[0]}" == "a" ]] || (echo "'\$flagsArray[0]' was not 'a'" && false) [[ "''${flagsArray[1]}" == "b" ]] || (echo "'\$flagsArray[1]' was not 'b'" && false) [[ "''${flagsArray[2]}" == "c" ]] || (echo "'\$flagsArray[2]' was not 'c'" && false) [[ "''${flagsArray[3]}" == "d" ]] || (echo "'\$flagsArray[3]' was not 'd'" && false) + [[ "''${flagsArray[4]}" == "e=f" ]] || (echo "'\$flagsArray[4]' was not 'e=f'" && false) + [[ "''${flagsArray[5]}" == "g" ]] || (echo "'\$flagsArray[5]' was not 'g'" && false) + [[ "''${flagsArray[6]}" == "h" ]] || (echo "'\$flagsArray[6]' was not 'h'" && false) # test concatenating to unset variable - concatTo nonExistant string list + concatTo nonExistant string list notset=e=f empty_array=g empty_string=h declare -p nonExistant [[ "''${nonExistant[0]}" == "a" ]] || (echo "'\$nonExistant[0]' was not 'a'" && false) [[ "''${nonExistant[1]}" == "b" ]] || (echo "'\$nonExistant[1]' was not 'b'" && false) [[ "''${nonExistant[2]}" == "c" ]] || (echo "'\$nonExistant[2]' was not 'c'" && false) [[ "''${nonExistant[3]}" == "d" ]] || (echo "'\$nonExistant[3]' was not 'd'" && false) + [[ "''${nonExistant[4]}" == "e=f" ]] || (echo "'\$nonExistant[4]' was not 'e=f'" && false) + [[ "''${nonExistant[5]}" == "g" ]] || (echo "'\$nonExistant[5]' was not 'g'" && false) + [[ "''${nonExistant[6]}" == "h" ]] || (echo "'\$nonExistant[6]' was not 'h'" && false) eval "$extraTest" @@ -159,7 +168,7 @@ in { # Disable on Darwin due to assumptions with __bootPackages - __attrsFailEvaluation = stdenv.isDarwin; + __attrsFailEvaluation = stdenv.hostPlatform.isDarwin; # tests for hooks in `stdenv.defaultNativeBuildInputs` hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; inherit lib; }); diff --git a/pkgs/test/stdenv/patch-shebangs.nix b/pkgs/test/stdenv/patch-shebangs.nix index db9ca2fcaafef..51edf128f7d55 100644 --- a/pkgs/test/stdenv/patch-shebangs.nix +++ b/pkgs/test/stdenv/patch-shebangs.nix @@ -87,6 +87,20 @@ let }; }; + dont-patch-builtins = stdenv.mkDerivation { + name = "dont-patch-builtins"; + strictDeps = false; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!/usr/bin/builtin" > $out/bin/test + chmod +x $out/bin/test + dontPatchShebangs= + ''; + passthru = { + assertion = "grep '^#!/usr/bin/builtin' $out/bin/test > /dev/null"; + }; + }; }; in stdenv.mkDerivation { diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index c142623233acd..f9e0bc51e3d4d 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -375,7 +375,7 @@ rec { # 'Error initialising QuantumRenderer: no suitable pipeline found' "tlcockpit" - ] ++ lib.optional stdenv.isDarwin "epspdftk"; # wish shebang is a script, not a binary! + ] ++ lib.optional stdenv.hostPlatform.isDarwin "epspdftk"; # wish shebang is a script, not a binary! # (1) binaries requiring -v shortVersion = [ "devnag" "diadia" "pmxchords" "ptex2pdf" "simpdftex" "ttf2afm" ]; diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix index c70ef9da2e3ce..cdf94928033b8 100644 --- a/pkgs/tools/X11/ffcast/default.nix +++ b/pkgs/tools/X11/ffcast/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, perl -, ffmpeg-full, imagemagick, xdpyinfo, xprop, xrectsel, xwininfo +, ffmpeg-full, gawk, imagemagick, xdpyinfo, xprop, xrectsel, xwininfo }: stdenv.mkDerivation rec { @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { postInstall = let binPath = lib.makeBinPath [ ffmpeg-full + gawk imagemagick xdpyinfo xprop @@ -30,12 +31,12 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ffcast --prefix PATH : ${binPath} ''; - meta = with lib; { + meta = { description = "Run commands on rectangular screen regions"; homepage = "https://github.com/ropery/FFcast"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.linux; mainProgram = "ffcast"; }; } diff --git a/pkgs/tools/X11/inputplug/default.nix b/pkgs/tools/X11/inputplug/default.nix index 5d756844e3754..c14ff710d4a7f 100644 --- a/pkgs/tools/X11/inputplug/default.nix +++ b/pkgs/tools/X11/inputplug/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = platforms.unix; # `daemon(3)` is deprecated on macOS and `pidfile-rs` needs updating - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ jecaro ]; mainProgram = "inputplug"; }; diff --git a/pkgs/tools/X11/kdocker/default.nix b/pkgs/tools/X11/kdocker/default.nix index e8c08e4c3832b..70b183aef58ea 100644 --- a/pkgs/tools/X11/kdocker/default.nix +++ b/pkgs/tools/X11/kdocker/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Dock any application into the system tray"; homepage = "https://github.com/user-none/KDocker"; + changelog = "https://github.com/user-none/KDocker/blob/${finalAttrs.version}/ChangeLog"; license = licenses.gpl2Only; maintainers = with maintainers; [ hexclover ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/pmenu/default.nix b/pkgs/tools/X11/pmenu/default.nix index 841f6073d56bb..5fbcff2b29115 100644 --- a/pkgs/tools/X11/pmenu/default.nix +++ b/pkgs/tools/X11/pmenu/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Pie-menu tool"; homepage = "https://github.com/phillbush/pmenu"; + changelog = "https://github.com/phillbush/pmenu/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; longDescription = '' πmenu is a pie menu utility for X. πmenu receives a menu specification in diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 9d3274195977d..5b3a1a5367c07 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -5,17 +5,9 @@ , resholve, bash, coreutils, dbus, file, gawk, glib, gnugrep, gnused, jq, nettools, procmail, procps, which, xdg-user-dirs , shared-mime-info , perl, perlPackages -, mimiSupport ? false , withXdgOpenUsePortalPatch ? true }: let - # A much better xdg-open - mimisrc = fetchFromGitHub { - owner = "march-linux"; - repo = "mimi"; - rev = "8e0070f17bcd3612ee83cb84e663e7c7fabcca3d"; - sha256 = "15gw2nyrqmdsdin8gzxihpn77grhk9l97jp7s7pr7sl4n9ya2rpj"; - }; # Required by the common desktop detection code commonDeps = [ dbus coreutils gnugrep gnused ]; @@ -268,10 +260,6 @@ stdenv.mkDerivation (self: { # explicitly provide a runtime shell so patchShebangs is consistent across build platforms buildInputs = [ bash ]; - postInstall = lib.optionalString mimiSupport '' - cp ${mimisrc}/xdg-open $out/bin/xdg-open - ''; - preFixup = lib.concatStringsSep "\n" (map (resholve.phraseSolution "xdg-utils-resholved") solutions); passthru.tests.xdg-mime = runCommand "xdg-mime-test" { @@ -305,7 +293,7 @@ stdenv.mkDerivation (self: { meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/"; description = "Set of command line tools that assist applications with a variety of desktop integration tasks"; - license = if mimiSupport then licenses.gpl2Only else licenses.mit; + license = licenses.mit; maintainers = [ ]; platforms = platforms.all; }; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 80407564a2aa7..6c7aa89e01d3b 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-uroO0PgnCkFRNYAZgdTZWgDDbBqq1ZM+dni/A2Qw9fg="; - buildInputs = [ xorg.libX11 xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ xorg.libX11 xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config patchelf python3 ]; - buildNoDefaultFeatures = !stdenv.isLinux; - buildFeatures = lib.optional (!stdenv.isLinux) "pulse"; + buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux; + buildFeatures = lib.optional (!stdenv.hostPlatform.isLinux) "pulse"; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' RPATH="$(patchelf --print-rpath $out/bin/xidlehook)" patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook ''; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 625dde8f825cc..cd37f57b369ae 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, substituteAll , pkg-config , runCommand , writeText @@ -38,6 +37,7 @@ , xdg-utils , xorg , xorgserver +, xxHash }: let @@ -70,25 +70,21 @@ let ''; in buildPythonApplication rec { pname = "xpra"; - version = "5.0.9"; + version = "6.1.2"; src = fetchFromGitHub { owner = "Xpra-org"; repo = "xpra"; rev = "v${version}"; - hash = "sha256-gwo5plCAryGC8/BKVEqyMkgB+3FM8HXG6sESomDOtNM="; + hash = "sha256-SmX0zwScyosiidBdW18vP3tV7BJfYfOmXwuRUbb+gX8="; }; patches = [ - (substituteAll { # correct hardcoded paths - src = ./fix-paths.patch; - inherit libfakeXinerama; - }) ./fix-41106.patch # https://github.com/NixOS/nixpkgs/issues/41106 ./fix-122159.patch # https://github.com/NixOS/nixpkgs/issues/122159 ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace xpra/platform/posix/features.py \ --replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" ''; @@ -137,6 +133,7 @@ in buildPythonApplication rec { pango x264 x265 + xxHash ] ++ lib.optional withNvenc nvencHeaders; propagatedBuildInputs = with python3.pkgs; ([ diff --git a/pkgs/tools/X11/xpra/fix-122159.patch b/pkgs/tools/X11/xpra/fix-122159.patch index 5fe2ce3892fd8..58efa07e790d7 100644 --- a/pkgs/tools/X11/xpra/fix-122159.patch +++ b/pkgs/tools/X11/xpra/fix-122159.patch @@ -1,16 +1,18 @@ diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py -index 58c8bf6464..36f4b3cd3d 100755 +index 7806612e05..4c7a0ec2dd 100755 --- a/xpra/scripts/main.py +++ b/xpra/scripts/main.py -@@ -389,11 +389,7 @@ def run_mode(script_file:str, cmdline, error_cb, options, args, mode:str, defaul - "seamless", "desktop", "shadow", "shadow-screen", "expand", - "upgrade", "upgrade-seamless", "upgrade-desktop", - ) and not display_is_remote and use_systemd_run(options.systemd_run): -- #make sure we run via the same interpreter, -- #inject it into the command line if we have to: +@@ -444,13 +444,7 @@ def run_mode(script_file: str, cmdline, error_cb, options, args, full_mode: str, + "seamless", "desktop", "shadow", "shadow-screen", "expand", + "upgrade", "upgrade-seamless", "upgrade-desktop", + ) and not display_is_remote and options.daemon and use_systemd_run(options.systemd_run): +- # make sure we run via the same interpreter, +- # inject it into the command line if we have to: argv = list(cmdline) -- if argv[0].find("python")<0: -- argv.insert(0, "python%i.%i" % (sys.version_info.major, sys.version_info.minor)) - return systemd_run_wrap(mode, argv, options.systemd_run_args, user=getuid()!=0) +- if argv[0].find("python") < 0: +- major, minor = sys.version_info.major, sys.version_info.minor +- python = which("python%i.%i" % (major, minor)) or which("python%i" % major) or which("python") or "python" +- argv.insert(0, python) + return systemd_run_wrap(mode, argv, options.systemd_run_args, user=getuid() != 0) configure_env(options.env) configure_logging(options, mode) diff --git a/pkgs/tools/X11/xpra/fix-41106.patch b/pkgs/tools/X11/xpra/fix-41106.patch index a1a74a01c3fe9..84061106323c6 100644 --- a/pkgs/tools/X11/xpra/fix-41106.patch +++ b/pkgs/tools/X11/xpra/fix-41106.patch @@ -1,11 +1,11 @@ -diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py -index 2e83712bb8..2dd0bf73d2 100644 ---- a/xpra/server/server_util.py -+++ b/xpra/server/server_util.py -@@ -166,6 +166,10 @@ def xpra_env_shell_script(socket_dir, env : Dict[str,str]) -> str: - return "\n".join(script) +diff --git a/xpra/server/util.py b/xpra/server/util.py +index 401a9fb959..678e2ce745 100644 +--- a/xpra/server/util.py ++++ b/xpra/server/util.py +@@ -175,6 +175,10 @@ def xpra_env_shell_script(socket_dir: str, env: dict[str, str]) -> str: - def xpra_runner_shell_script(xpra_file:str, starting_dir:str) -> str: + + def xpra_runner_shell_script(xpra_file: str, starting_dir: str) -> str: + # Nixpkgs contortion: + # xpra_file points to a shell wrapper, not to the python script. + dirname, basename = os.path.split(xpra_file) diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch deleted file mode 100644 index 43210f4f15d6f..0000000000000 --- a/pkgs/tools/X11/xpra/fix-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/xpra/x11/fakeXinerama.py b/xpra/x11/fakeXinerama.py -index a5289e0e43..527cdf90c9 100755 ---- a/xpra/x11/fakeXinerama.py -+++ b/xpra/x11/fakeXinerama.py -@@ -23,31 +23,7 @@ fakeXinerama_config_files = [ - ] - - def find_libfakeXinerama(): -- libname = "fakeXinerama" -- try: -- from ctypes.util import find_library -- flibname = find_library("fakeXinerama") -- if flibname: -- libname = flibname -- except Exception: -- pass -- if POSIX: -- for lib_dir in os.environ.get("LD_LIBRARY_PATH", "/usr/lib").split(os.pathsep): -- lib_path = os.path.join(lib_dir, libname) -- if not os.path.exists(lib_dir): -- continue -- if os.path.exists(lib_path) and os.path.isfile(lib_path): -- return lib_path -- if LINUX: -- try: -- libpath = find_lib_ldconfig("fakeXinerama") -- if libpath: -- return libpath -- except Exception as e: -- log("find_libfakeXinerama()", exc_info=True) -- log.error("Error: cannot launch ldconfig -p to locate libfakeXinerama:") -- log.estr(e) -- return find_lib("libfakeXinerama.so.1") -+ return "@libfakeXinerama@/lib/libfakeXinerama.so.1.0" - - current_xinerama_config = None - diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/tools/X11/xwallpaper/default.nix index 38a67622edb5e..3eca45ee7ca57 100644 --- a/pkgs/tools/X11/xwallpaper/default.nix +++ b/pkgs/tools/X11/xwallpaper/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "xwallpaper"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "stoeckmann"; repo = "xwallpaper"; rev = "v${version}"; - sha256 = "sha256-onxneLmXs1rYwpTzcnn+rbDboWVoEQgtGMHx/bMPRa8="; + sha256 = "sha256-smhqovPgDdSLhAwW1y/hnPjNwFcpIUocs3MKizdvZj0="; }; nativeBuildInputs = [ pkg-config autoreconfHook installShellFiles ]; diff --git a/pkgs/tools/admin/acme-sh/default.nix b/pkgs/tools/admin/acme-sh/default.nix index e7fbb962c8314..c79bcebda0863 100644 --- a/pkgs/tools/admin/acme-sh/default.nix +++ b/pkgs/tools/admin/acme-sh/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "acme.sh"; - version = "3.0.7"; + version = "3.0.9"; src = fetchFromGitHub { owner = "acmesh-official"; repo = "acme.sh"; rev = "refs/tags/${version}"; - hash = "sha256-ymj97aWWOLen7YEfG72N2nyxlwuB/Su4+pgpWUuckgc="; + hash = "sha256-GJNaY5Dxis/x5bCvOPnIvJ4VrJkjjaaOFq68JYXxDf0="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gnused openssl socat - (if stdenv.isLinux then iproute2 else unixtools.netstat) + (if stdenv.hostPlatform.isLinux then iproute2 else unixtools.netstat) ]; in '' diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix index 10f196979d70b..918a9ab7fc200 100644 --- a/pkgs/tools/admin/afterburn/default.nix +++ b/pkgs/tools/admin/afterburn/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "afterburn"; - version = "5.6.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "coreos"; repo = "afterburn"; rev = "v${version}"; - sha256 = "sha256-IAYQJviSQHKeayI0uAEbXX+vQxfAbMOqP2fH+2VPamQ="; + sha256 = "sha256-j2eQUro0Rx1axBAaZDNICRrkygb4JAyxVAER/5BXXLY="; }; - cargoHash = "sha256-BJ8WV8FcRrwPHhCY2GiOWDP72/T3K9eJIrPeoIa+9Sk="; + cargoHash = "sha256-rk/lVoPdA9Uj/MorMchVlQQB9bYmNC90NqM6w9FXLoc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/tools/admin/amazon-ec2-utils/default.nix b/pkgs/tools/admin/amazon-ec2-utils/default.nix deleted file mode 100644 index 5458572f311c8..0000000000000 --- a/pkgs/tools/admin/amazon-ec2-utils/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, bash -, python3 -, installShellFiles -, gawk -, curl -}: - -stdenv.mkDerivation rec { - pname = "amazon-ec2-utils"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "amazonlinux"; - repo = "amazon-ec2-utils"; - rev = "refs/tags/v${version}"; - hash = "sha256-plTBh2LAXkYVSxN0IZJQuPr7QxD7+OAqHl/Zl8JPCmg="; - }; - - outputs = [ "out" "man" ]; - - strictDeps = true; - - buildInputs = [ - bash - python3 - ]; - - nativeBuildInputs = [ - installShellFiles - ]; - - installPhase = '' - install -Dm755 -t $out/bin/ ebsnvme-id - install -Dm755 -t $out/bin/ ec2-metadata - install -Dm755 -t $out/bin/ ec2nvme-nsid - install -Dm755 -t $out/bin/ ec2udev-vbd - - install -Dm644 -t $out/lib/udev/rules.d/ 51-ec2-hvm-devices.rules - install -Dm644 -t $out/lib/udev/rules.d/ 51-ec2-xen-vbd-devices.rules - install -Dm644 -t $out/lib/udev/rules.d/ 53-ec2-read-ahead-kb.rules - install -Dm644 -t $out/lib/udev/rules.d/ 70-ec2-nvme-devices.rules - install -Dm644 -t $out/lib/udev/rules.d/ 60-cdrom_id.rules - - installManPage doc/*.8 - ''; - - postFixup = '' - for i in $out/etc/udev/rules.d/*.rules $out/lib/udev/rules.d/*.rules ; do - substituteInPlace "$i" \ - --replace '/usr/sbin' "$out/bin" \ - --replace '/bin/awk' '${gawk}/bin/awk' - done - - substituteInPlace "$out/bin/ec2-metadata" \ - --replace 'curl' '${curl}/bin/curl' - ''; - - doInstallCheck = true; - - # We cannot run - # ec2-metadata --help - # because it actually checks EC2 metadata even if --help is given - # so it won't work in the test sandbox. - installCheckPhase = '' - $out/bin/ebsnvme-id --help - ''; - - meta = with lib; { - changelog = "https://github.com/amazonlinux/amazon-ec2-utils/releases/tag/v${version}"; - description = "Contains a set of utilities and settings for Linux deployments in EC2"; - homepage = "https://github.com/amazonlinux/amazon-ec2-utils"; - license = licenses.mit; - maintainers = with maintainers; [ ketzacoatl thefloweringash anthonyroussel ]; - }; -} diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index 6c1ca57749060..181e5c722017f 100644 --- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecr-credential-helper"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-ecr-credential-helper"; rev = "v${version}"; - sha256 = "sha256-xhJnhh1pDANGq4CFBPAEwqtsxSYeIvhKcHEsvYRebbM="; + sha256 = "sha256-TRYBZiddnN6wCErSLKCr9JEH/Ldxg+Oh2hA63+EwRjo="; }; vendorHash = null; diff --git a/pkgs/tools/admin/ansible/later.nix b/pkgs/tools/admin/ansible/later.nix index 62230f4c1187a..dadd182d8ce2d 100644 --- a/pkgs/tools/admin/ansible/later.nix +++ b/pkgs/tools/admin/ansible/later.nix @@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec { toolz unidiff yamllint + distutils ]; nativeCheckInputs = with python3.pkgs; [ diff --git a/pkgs/tools/admin/ansible/lint.nix b/pkgs/tools/admin/ansible/lint.nix index bc6e325ea1423..0e2757d548e8f 100644 --- a/pkgs/tools/admin/ansible/lint.nix +++ b/pkgs/tools/admin/ansible/lint.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "ansible-lint"; - version = "24.7.0"; + version = "24.9.2"; format = "pyproject"; src = fetchPypi { inherit version; pname = "ansible_lint"; - hash = "sha256-yi7cfk6AzxnfSyjL9MEY92HObN1qXvnIVh5FTtevWiQ="; + hash = "sha256-fP9sWvEO+Za3xgEMvUjJFZJ2SuCY8rBUCHJomaEGan8="; }; postPatch = '' diff --git a/pkgs/tools/admin/auth0-cli/default.nix b/pkgs/tools/admin/auth0-cli/default.nix index 1328c478a7bbb..5d867b598596f 100644 --- a/pkgs/tools/admin/auth0-cli/default.nix +++ b/pkgs/tools/admin/auth0-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "auth0-cli"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-j7HT57/4rrrVkx9Zz+XuWD6UL0spdej+U5gWtFo1FSI="; + hash = "sha256-Wesnn52euV2z6nx6wSDho4R6Hu0dMKwGNvNT3MVxIg4="; }; - vendorHash = "sha256-bWAneCRsQbPRxEM/3jr1/Lov6NV67MRycOgrlj3bKF8="; + vendorHash = "sha256-v8bBxyLysuiZ0ZheDt5juxaUGzL0PYLGTF5EymHzTOI="; ldflags = [ "-s" diff --git a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix deleted file mode 100644 index c218831b7ae80..0000000000000 --- a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, python3 -, fetchPypi -, nix-update-script -, testers -, aws-encryption-sdk-cli -}: - -let - localPython = python3.override { - self = localPython; - packageOverrides = final: prev: { - urllib3 = prev.urllib3.overridePythonAttrs (prev: rec { - pyproject = true; - version = "1.26.18"; - nativeBuildInputs = with final; [ setuptools ]; - src = prev.src.override { - inherit version; - hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; - }; - }); - }; - }; -in - -localPython.pkgs.buildPythonApplication rec { - pname = "aws-encryption-sdk-cli"; - version = "4.1.0"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-OCbt0OkDVfpzUIogbsKzaPAle2L6l6N3cmZoS2hEaSM="; - }; - - build-system = with localPython.pkgs; [ - setuptools - ]; - - dependencies = with localPython.pkgs; [ - attrs - aws-encryption-sdk - base64io - urllib3 - setuptools # for pkg_resources - ]; - - doCheck = true; - - nativeCheckInputs = with localPython.pkgs; [ - mock - pytest-mock - pytest7CheckHook - ]; - - disabledTestPaths = [ - # requires networking - "test/integration" - ]; - - # Upstream did not adapt to pytest 8 yet. - pytestFlagsArray = [ "-W" "ignore::pytest.PytestRemovedIn8Warning" ]; - - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = aws-encryption-sdk-cli; - command = "aws-encryption-cli --version"; - }; - }; - - meta = with lib; { - homepage = "https://aws-encryption-sdk-cli.readthedocs.io/"; - changelog = "https://github.com/aws/aws-encryption-sdk-cli/blob/v${version}/CHANGELOG.rst"; - description = "CLI wrapper around aws-encryption-sdk-python"; - license = licenses.asl20; - mainProgram = "aws-encryption-cli"; - maintainers = with maintainers; [ anthonyroussel ]; - }; -} diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index d1c588a48a42f..e4bb9ba3ae2d8 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -15,20 +15,20 @@ let # Fix for: https://github.com/NixOS/nixpkgs/issues/272156 buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; in buildNpmPackage' rec { pname = "balena-cli"; - version = "19.0.0"; + version = "19.0.13"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-f5ZTiO0OXia7VbjQCTxMK3YPHoxCNaZraaTDiR9wEEE="; + hash = "sha256-2U+P3LsxaRpktNbDn8iNhHQVjokiWZADYVDpJsDosZU="; }; - npmDepsHash = "sha256-PG3GDOP9sI67K6SsLvzRlH3b+SQ9XRfGLtvPXTADFPM="; + npmDepsHash = "sha256-CA6qs9Gk19dEK2yCFMVVKmJSoZVLdpnf4V6P5fv2Bcc="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json @@ -38,13 +38,13 @@ in buildNpmPackage' rec { nativeBuildInputs = [ node-gyp python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/tools/admin/cdist/default.nix b/pkgs/tools/admin/cdist/default.nix index 8467605727c93..a84eeb4a1a27e 100644 --- a/pkgs/tools/admin/cdist/default.nix +++ b/pkgs/tools/admin/cdist/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonApplication , fetchFromGitea -, pythonImportsCheckHook , six , sphinxHook , sphinx-rtd-theme @@ -21,7 +20,6 @@ buildPythonApplication rec { }; nativeBuildInputs = [ - pythonImportsCheckHook six sphinxHook sphinx-rtd-theme diff --git a/pkgs/tools/admin/coldsnap/default.nix b/pkgs/tools/admin/coldsnap/default.nix index b2825ce7d5a83..23360dc7f7269 100644 --- a/pkgs/tools/admin/coldsnap/default.nix +++ b/pkgs/tools/admin/coldsnap/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-ngkoxybl52zTH4wo+sIUtU8vtzOAp+jU1RyTO2KbCgU="; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 72a80938ca840..b47be23c03ae1 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.36"; + version = "2.9.38"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-5jrVN0mFRLieKg92pWrBK89SiPr9A2Z8Rtzou4dRdOQ="; + sha256 = "sha256-xSjT+h85/ZknwTTLUhC9GWrCRN9VHMQBM6WuHX3ldq4="; }; # these tests require network access that we're not going to give them diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix index f9e90afb272a4..54de6d17e36e7 100644 --- a/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorHash = null; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ libsecret ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret ]; ldflags = [ "-s" @@ -25,7 +25,7 @@ buildGoModule rec { buildPhase = let - cmds = if stdenv.isDarwin then [ "osxkeychain" "pass" ] else [ "secretservice" "pass" ]; + cmds = if stdenv.hostPlatform.isDarwin then [ "osxkeychain" "pass" ] else [ "secretservice" "pass" ]; in '' for cmd in ${builtins.toString cmds}; do @@ -47,7 +47,7 @@ buildGoModule rec { homepage = "https://github.com/docker/docker-credential-helpers"; license = licenses.mit; maintainers = [ ]; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { mainProgram = "docker-credential-osxkeychain"; }; } diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index e7e9c7f7360b9..33df518660285 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2024-07-03"; + version = "0-unstable-2024-09-09"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "f11139d4c918802a87730bc14d094670ee4ce572"; - hash = "sha256-vkBXzIezC9DWlGpk6klUvtmq4F4D5LJWwjEllMIr8D0="; + rev = "789b8fe40e156ad0252230b13dd4ada96f3eed8b"; + hash = "sha256-M/kTV13MCcWycpJ2+jhXBTIoQuXakqO2llEL3PEjI/g="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json index 8e306436fee6f..185679e3ae368 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.json +++ b/pkgs/tools/admin/google-cloud-sdk/components.json @@ -5,7 +5,7 @@ "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f", "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8", "size": 800, - "source": "components/google-cloud-sdk-alpha-20240719191136.tar.gz", + "source": "components/google-cloud-sdk-alpha-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -15,6 +15,7 @@ "description": "Alpha version of gcloud commands.", "display_name": "gcloud Alpha Commands" }, + "gdu_only": false, "id": "alpha", "is_configuration": false, "is_hidden": false, @@ -22,8 +23,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240719191136, - "version_string": "2024.07.19" + "build_number": 20240920144119, + "version_string": "2024.09.20" } }, { @@ -38,6 +39,7 @@ "description": "Configure kubectl with OIDC credentials for Anthos clusters.", "display_name": "anthos-auth" }, + "gdu_only": false, "id": "anthos-auth", "is_configuration": false, "is_hidden": false, @@ -74,6 +76,7 @@ "description": "Configure kubectl with OIDC credentials for Anthos clusters.", "display_name": "anthos-auth (Platform Specific)" }, + "gdu_only": false, "id": "anthos-auth-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -107,6 +110,7 @@ "description": "Configure kubectl with OIDC credentials for Anthos clusters.", "display_name": "anthos-auth (Platform Specific)" }, + "gdu_only": false, "id": "anthos-auth-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -140,6 +144,7 @@ "description": "Configure kubectl with OIDC credentials for Anthos clusters.", "display_name": "anthos-auth (Platform Specific)" }, + "gdu_only": false, "id": "anthos-auth-linux-arm", "is_configuration": false, "is_hidden": true, @@ -173,6 +178,7 @@ "description": "Configure kubectl with OIDC credentials for Anthos clusters.", "display_name": "anthos-auth (Platform Specific)" }, + "gdu_only": false, "id": "anthos-auth-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -206,6 +212,7 @@ "description": "Configure kubectl with OIDC credentials for Anthos clusters.", "display_name": "anthos-auth (Platform Specific)" }, + "gdu_only": false, "id": "anthos-auth-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -239,6 +246,7 @@ "description": "The cli for Anthos infrastructure.", "display_name": "anthoscli" }, + "gdu_only": false, "id": "anthoscli", "is_configuration": false, "is_hidden": true, @@ -258,15 +266,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.2.52" + "version_string": "0.2.53" } }, { "data": { - "checksum": "b1dff49fd8a5270c26f1e86f53d802dd0f2a9523b22dd7a51d23739cc1702820", - "contents_checksum": "f8a87d4f50dd802ec2d3894b09db6ea3278bc609f3f6a280ca27d65a311b6ce3", - "size": 70632402, - "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20240712142834.tar.gz", + "checksum": "02ba5e29a9e189fca93b60abd88a313aafb7fc7cbaa569edf39f45060df104d5", + "contents_checksum": "08db596fe3b62c4b42bc84c1fe5f5ef6b7a0cf6dabc8d81630a127ecad620bfd", + "size": 70611092, + "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -276,6 +284,7 @@ "description": "The cli for Anthos infrastructure.", "display_name": "anthoscli (Platform Specific)" }, + "gdu_only": false, "id": "anthoscli-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -290,16 +299,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "ebf7083c6bbb2d84bc09c6b715d21bb06420b216ff52e91062266e9dcede1f0c", - "contents_checksum": "1335273de68c0184e0a2215e8dff6f2a601dc745baee6b00df8b296ead9bbb45", - "size": 74268845, - "source": "components/google-cloud-sdk-anthoscli-darwin-x86-20240712142834.tar.gz", + "checksum": "7d08629fc687492f832a0266c5e11b28ee51e2f6a69a58b7a94880fea48d7a54", + "contents_checksum": "be3d18f74bbc516c3f74add8fb3d319fe04568c07252b44717e5d78599a2e9ff", + "size": 74259971, + "source": "components/google-cloud-sdk-anthoscli-darwin-x86-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -309,6 +318,7 @@ "description": "The cli for Anthos infrastructure.", "display_name": "anthoscli (Platform Specific)" }, + "gdu_only": false, "id": "anthoscli-darwin-x86", "is_configuration": false, "is_hidden": true, @@ -323,16 +333,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "95cd26d9e914a9005476c95f79da7eda04bf9c7756a2e68f1e78a66c16546e3b", - "contents_checksum": "1335273de68c0184e0a2215e8dff6f2a601dc745baee6b00df8b296ead9bbb45", - "size": 74268848, - "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20240712142834.tar.gz", + "checksum": "bc4cb34c070cc2e9cea01a859aca3b2468ff78c697f6a6cd425c1b3ab4fe793e", + "contents_checksum": "be3d18f74bbc516c3f74add8fb3d319fe04568c07252b44717e5d78599a2e9ff", + "size": 74259974, + "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -342,6 +352,7 @@ "description": "The cli for Anthos infrastructure.", "display_name": "anthoscli (Platform Specific)" }, + "gdu_only": false, "id": "anthoscli-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -356,16 +367,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "298acae5cd9f3f5f95ef15b43b92b604cb17efdf0f712f39aad805f28a17c36f", - "contents_checksum": "22fb27fa7110f719b143ef1e19fac7638567a6d7d48a909be7dd1a08badaa12f", - "size": 67808715, - "source": "components/google-cloud-sdk-anthoscli-linux-arm-20240712142834.tar.gz", + "checksum": "ca197aefd6e3b8f943ffce8a36b8bcf4e9f1d77569f2f5893f09242ddbefa2cc", + "contents_checksum": "7bb06f592f4b2adc5de37c4c7fa665a8056d22e141a1e9337ec0e6a14afd1a26", + "size": 67805442, + "source": "components/google-cloud-sdk-anthoscli-linux-arm-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -375,6 +386,7 @@ "description": "The cli for Anthos infrastructure.", "display_name": "anthoscli (Platform Specific)" }, + "gdu_only": false, "id": "anthoscli-linux-arm", "is_configuration": false, "is_hidden": true, @@ -389,16 +401,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "1bb549e7745fbb6c422a66a69de83a4100548ef289415fbb80bf3424a27f0a5c", - "contents_checksum": "a5cf333202e0e3dacd64388c7604752c539f484159e83fff46026990b4b466b5", - "size": 65492449, - "source": "components/google-cloud-sdk-anthoscli-linux-x86-20240712142834.tar.gz", + "checksum": "219bbf4fc039fc02db00cdc71d3ff84bcd8558d7ec131911a166938b6db8b90c", + "contents_checksum": "de4c26da762b91f1e970e6afb26bd97f77c616f69ac92992279df1b2c3e5ae93", + "size": 65477613, + "source": "components/google-cloud-sdk-anthoscli-linux-x86-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -408,6 +420,7 @@ "description": "The cli for Anthos infrastructure.", "display_name": "anthoscli (Platform Specific)" }, + "gdu_only": false, "id": "anthoscli-linux-x86", "is_configuration": false, "is_hidden": true, @@ -422,16 +435,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "69a107eef662d4ef0930a51bca72b585e4314f7f962cb54987cc072d87ff6891", - "contents_checksum": "878c7420eb7909d6c7073182f6ec1b96ea2adc6995d4a90e2e47634dd4c629d9", - "size": 72509283, - "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20240712142834.tar.gz", + "checksum": "000bc1ace0a08fc738db3af6b8fc6b21b18ce7a08a70c6965885f8836f90b970", + "contents_checksum": "440b7e164aad403e6685b3e9dd2a1ea5419b012bc207a7f5383c7653d218656a", + "size": 72514534, + "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -441,6 +454,7 @@ "description": "The cli for Anthos infrastructure.", "display_name": "anthoscli (Platform Specific)" }, + "gdu_only": false, "id": "anthoscli-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -455,16 +469,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "7e7147b4ec408e9cd8142bd0d6eac6b89b2bc545aa8421f67eaed7e8b8a1e9f2", - "contents_checksum": "c8a284c543bc838e22ac0b9762c6e1a559db867025305f38974f818ef0c44c2f", - "size": 67415658, - "source": "components/google-cloud-sdk-anthoscli-windows-x86-20240712142834.tar.gz", + "checksum": "1b474596746104c3ce64677c4009bd6d67f50ee02c5622653fe399360bfd7016", + "contents_checksum": "c01fd4068732ef6856262c08039b2e95c2ff0280e5b9110f0ea1b6a868071298", + "size": 67406191, + "source": "components/google-cloud-sdk-anthoscli-windows-x86-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -474,6 +488,7 @@ "description": "The cli for Anthos infrastructure.", "display_name": "anthoscli (Platform Specific)" }, + "gdu_only": false, "id": "anthoscli-windows-x86", "is_configuration": false, "is_hidden": true, @@ -488,16 +503,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "f42e9bb1e16ea90787d639b08cd05a7e750b19cf9849d99aefe09d0808d2445c", - "contents_checksum": "031e4309260adf22c8cff1ad368c280186117c0906539b8180b642f9ffc0fa18", - "size": 73148423, - "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20240712142834.tar.gz", + "checksum": "77c7fbc4f81d1ddc09222243de8b017c69a05d2c6a1079d294d6b00709072329", + "contents_checksum": "86c3cea0534e1a2e7747ee09cc7ef9641b1897add71ae9537ce447e05e166f05", + "size": 73144414, + "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -507,6 +522,7 @@ "description": "The cli for Anthos infrastructure.", "display_name": "anthoscli (Platform Specific)" }, + "gdu_only": false, "id": "anthoscli-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -521,8 +537,8 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { @@ -541,6 +557,7 @@ "description": "Provides the tools to develop Go applications on App Engine.", "display_name": "App Engine Go Extensions" }, + "gdu_only": false, "id": "app-engine-go", "is_configuration": false, "is_hidden": false, @@ -580,6 +597,7 @@ "description": "Provides the tools to develop Go applications on App Engine.", "display_name": "App Engine Go Extensions (Platform Specific)" }, + "gdu_only": false, "id": "app-engine-go-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -615,6 +633,7 @@ "description": "Provides the tools to develop Go applications on App Engine.", "display_name": "App Engine Go Extensions (Platform Specific)" }, + "gdu_only": false, "id": "app-engine-go-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -650,6 +669,7 @@ "description": "Provides the tools to develop Go applications on App Engine.", "display_name": "App Engine Go Extensions (Platform Specific)" }, + "gdu_only": false, "id": "app-engine-go-linux-arm", "is_configuration": false, "is_hidden": true, @@ -685,6 +705,7 @@ "description": "Provides the tools to develop Go applications on App Engine.", "display_name": "App Engine Go Extensions (Platform Specific)" }, + "gdu_only": false, "id": "app-engine-go-linux-x86", "is_configuration": false, "is_hidden": true, @@ -720,6 +741,7 @@ "description": "Provides the tools to develop Go applications on App Engine.", "display_name": "App Engine Go Extensions (Platform Specific)" }, + "gdu_only": false, "id": "app-engine-go-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -755,6 +777,7 @@ "description": "Provides the tools to develop Go applications on App Engine.", "display_name": "App Engine Go Extensions (Platform Specific)" }, + "gdu_only": false, "id": "app-engine-go-windows-x86", "is_configuration": false, "is_hidden": true, @@ -790,6 +813,7 @@ "description": "Provides the tools to develop Go applications on App Engine.", "display_name": "App Engine Go Extensions (Platform Specific)" }, + "gdu_only": false, "id": "app-engine-go-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -822,6 +846,7 @@ "description": "Provides the gRPC Python library for App Engine.", "display_name": "gRPC Python library" }, + "gdu_only": false, "id": "app-engine-grpc", "is_configuration": false, "is_hidden": true, @@ -860,6 +885,7 @@ "description": "Provides the gRPC Python library for App Engine.", "display_name": "gRPC Python library (Platform Specific)" }, + "gdu_only": false, "id": "app-engine-grpc-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -895,6 +921,7 @@ "description": "Provides the gRPC Python library for App Engine.", "display_name": "gRPC Python library (Platform Specific)" }, + "gdu_only": false, "id": "app-engine-grpc-linux-x86", "is_configuration": false, "is_hidden": true, @@ -930,6 +957,7 @@ "description": "Provides the gRPC Python library for App Engine.", "display_name": "gRPC Python library (Platform Specific)" }, + "gdu_only": false, "id": "app-engine-grpc-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -965,6 +993,7 @@ "description": "Provides the gRPC Python library for App Engine.", "display_name": "gRPC Python library (Platform Specific)" }, + "gdu_only": false, "id": "app-engine-grpc-windows-x86", "is_configuration": false, "is_hidden": true, @@ -1000,6 +1029,7 @@ "description": "Provides the gRPC Python library for App Engine.", "display_name": "gRPC Python library (Platform Specific)" }, + "gdu_only": false, "id": "app-engine-grpc-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -1020,10 +1050,10 @@ }, { "data": { - "checksum": "55d136d6b2f08b31a70183e5b80cd5b408d200aee316e87402b50eae2251c15d", - "contents_checksum": "ee286f0c07a3b33f0193a5ba439375f221c5d42190df5f5e17333d6b60ae3f1b", - "size": 134048645, - "source": "components/google-cloud-sdk-app-engine-java-20240712142834.tar.gz", + "checksum": "956e282b412d0f80a2f11484196f6279f6e1450f423c510c2ea0f814b625cec4", + "contents_checksum": "99df1fb3e1e7dffd61f23d19906c176df4fc64204cefa186168a82707ba3f774", + "size": 134269609, + "source": "components/google-cloud-sdk-app-engine-java-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1034,6 +1064,7 @@ "description": "Provides the tools required to develop Java applications using gcloud.", "display_name": "gcloud app Java Extensions" }, + "gdu_only": false, "id": "app-engine-java", "is_configuration": false, "is_hidden": false, @@ -1041,8 +1072,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "2.0.29" + "build_number": 20240920144119, + "version_string": "2.0.30" } }, { @@ -1062,6 +1093,7 @@ "description": "Provides the tools required to develop Python and PHP applications using gcloud.", "display_name": "gcloud app Python Extensions" }, + "gdu_only": false, "id": "app-engine-python", "is_configuration": false, "is_hidden": false, @@ -1089,6 +1121,7 @@ "description": "Extra libraries for the App Engine Python Extensions.", "display_name": "gcloud app Python Extensions (Extra Libraries)" }, + "gdu_only": false, "id": "app-engine-python-extras", "is_configuration": false, "is_hidden": false, @@ -1113,6 +1146,7 @@ "description": "Provides appctl executable.", "display_name": "Appctl" }, + "gdu_only": false, "id": "appctl", "is_configuration": false, "is_hidden": false, @@ -1149,6 +1183,7 @@ "description": "Provides appctl executable.", "display_name": "Appctl (Platform Specific)" }, + "gdu_only": false, "id": "appctl-darwin-x86", "is_configuration": false, "is_hidden": true, @@ -1182,6 +1217,7 @@ "description": "Provides appctl executable.", "display_name": "Appctl (Platform Specific)" }, + "gdu_only": false, "id": "appctl-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -1215,6 +1251,7 @@ "description": "Provides appctl executable.", "display_name": "Appctl (Platform Specific)" }, + "gdu_only": false, "id": "appctl-linux-x86", "is_configuration": false, "is_hidden": true, @@ -1248,6 +1285,7 @@ "description": "Provides appctl executable.", "display_name": "Appctl (Platform Specific)" }, + "gdu_only": false, "id": "appctl-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -1281,6 +1319,7 @@ "description": "Provides appctl executable.", "display_name": "Appctl (Platform Specific)" }, + "gdu_only": false, "id": "appctl-windows-x86", "is_configuration": false, "is_hidden": true, @@ -1314,6 +1353,7 @@ "description": "Provides appctl executable.", "display_name": "Appctl (Platform Specific)" }, + "gdu_only": false, "id": "appctl-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -1337,7 +1377,7 @@ "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760", "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d", "size": 797, - "source": "components/google-cloud-sdk-beta-20240719191136.tar.gz", + "source": "components/google-cloud-sdk-beta-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1347,6 +1387,7 @@ "description": "Beta version of gcloud commands.", "display_name": "gcloud Beta Commands" }, + "gdu_only": false, "id": "beta", "is_configuration": false, "is_hidden": false, @@ -1354,8 +1395,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240719191136, - "version_string": "2024.07.19" + "build_number": 20240920144119, + "version_string": "2024.09.20" } }, { @@ -1374,6 +1415,7 @@ "description": "Provides a tool for local Cloud Bigtable emulation.", "display_name": "Cloud Bigtable Emulator" }, + "gdu_only": true, "id": "bigtable", "is_configuration": false, "is_hidden": false, @@ -1398,10 +1440,10 @@ }, { "data": { - "checksum": "61389b1bb5534dc7386d30df5ab3a1050cbe3a8c9deda0edb40a1d5985439049", - "contents_checksum": "3a7f40f835b1b713a96f5b6c404eae20c7c90d794aae8a92713fd5b59a3c778e", - "size": 7344145, - "source": "components/google-cloud-sdk-bigtable-darwin-arm-20240329151455.tar.gz", + "checksum": "398f3ca68cd59d46e5166dfd8f9f4224d73a1d4588024d06a2fc5e509eede161", + "contents_checksum": "749271d55d4110d9ce71cf9bb04bcc247b60086f9d2e3abf9ff9cb2b12788e82", + "size": 7696648, + "source": "components/google-cloud-sdk-bigtable-darwin-arm-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1412,6 +1454,7 @@ "description": "Provides a tool for local Cloud Bigtable emulation.", "display_name": "Cloud Bigtable Emulator (Platform Specific)" }, + "gdu_only": true, "id": "bigtable-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -1426,7 +1469,7 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, @@ -1446,6 +1489,7 @@ "description": "Provides a tool for local Cloud Bigtable emulation.", "display_name": "Cloud Bigtable Emulator (Platform Specific)" }, + "gdu_only": true, "id": "bigtable-darwin-x86", "is_configuration": false, "is_hidden": true, @@ -1466,10 +1510,10 @@ }, { "data": { - "checksum": "1d719de1aa61fb4837d221502e4113b2f786671e1139852275d69dc77d02e494", - "contents_checksum": "747c8a308249abd684ad2bc8bb9c3b34ed5092da0825b2887188c7f65385c81a", - "size": 7656241, - "source": "components/google-cloud-sdk-bigtable-darwin-x86_64-20240329151455.tar.gz", + "checksum": "e2dc76d943395989b50785ecee54aa261ddba5ba8d17a24c504385978271f333", + "contents_checksum": "d2e568fbf5c4af408f146fab0ffe80cc40dd634d358a47e4bf2c720942abf4c9", + "size": 8019559, + "source": "components/google-cloud-sdk-bigtable-darwin-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1480,6 +1524,7 @@ "description": "Provides a tool for local Cloud Bigtable emulation.", "display_name": "Cloud Bigtable Emulator (Platform Specific)" }, + "gdu_only": true, "id": "bigtable-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -1494,16 +1539,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, { "data": { - "checksum": "573c369501c73a684744007a9fc23ca29d8a81fa6c1dd18bed18c659ed406711", - "contents_checksum": "5abcfae3e7a061c532d3b4acbb6659d98cc4a7077e21ae4859e4d83d9c07e84f", - "size": 7210539, - "source": "components/google-cloud-sdk-bigtable-linux-arm-20240329151455.tar.gz", + "checksum": "54830749a50061c2d123d35bb0f075a6208ac71e03bd0d6dd05b10e16526d250", + "contents_checksum": "bb3932e57f44ff1a98b8a7176a5b368b2f55cd4a7c679eb32353b85685cdaac0", + "size": 7583487, + "source": "components/google-cloud-sdk-bigtable-linux-arm-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1514,6 +1559,7 @@ "description": "Provides a tool for local Cloud Bigtable emulation.", "display_name": "Cloud Bigtable Emulator (Platform Specific)" }, + "gdu_only": true, "id": "bigtable-linux-arm", "is_configuration": false, "is_hidden": true, @@ -1528,16 +1574,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, { "data": { - "checksum": "987ee97fb43e647db218c80cb9c3381477072aa494292db4d108e23f298e8926", - "contents_checksum": "da67b3b932497c895d74221dd3f670374abeda9b18ea32e225b733e69dc87cdc", - "size": 7374147, - "source": "components/google-cloud-sdk-bigtable-linux-x86-20240329151455.tar.gz", + "checksum": "ea0c309db700a32cc18c89a5fd6887e5f777277af47451f9d4df6bff7fcf0383", + "contents_checksum": "2af9f0ab5704080cc63d2779451b3b24fcd20d8cfa8a8b3d9dd6d1ac06521c97", + "size": 7763548, + "source": "components/google-cloud-sdk-bigtable-linux-x86-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1548,6 +1594,7 @@ "description": "Provides a tool for local Cloud Bigtable emulation.", "display_name": "Cloud Bigtable Emulator (Platform Specific)" }, + "gdu_only": true, "id": "bigtable-linux-x86", "is_configuration": false, "is_hidden": true, @@ -1562,16 +1609,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, { "data": { - "checksum": "a21817f2aae3ea9580a34f3f169a81baf289cbbd0a3b93455252c326654fe8b2", - "contents_checksum": "3ac22e1972afab99190324f7b9363fe9454ae845beba9eb3750d6240f40f5ee4", - "size": 7668508, - "source": "components/google-cloud-sdk-bigtable-linux-x86_64-20240329151455.tar.gz", + "checksum": "d3dfa87cd2f12cbf7358065764158ca981d6afe650de78a3077fc7e348c8f2c8", + "contents_checksum": "938cbad478a98442d3de281f957655e8fb45a0d39e2c3ace74b88551b03e52ae", + "size": 8045299, + "source": "components/google-cloud-sdk-bigtable-linux-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1582,6 +1629,7 @@ "description": "Provides a tool for local Cloud Bigtable emulation.", "display_name": "Cloud Bigtable Emulator (Platform Specific)" }, + "gdu_only": true, "id": "bigtable-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -1596,16 +1644,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, { "data": { - "checksum": "44b0bfe67b3e19db8acf4bb144f465509afe1fc25ad9c8dfee18a70c1202d3a3", - "contents_checksum": "2fdcda84a5bdb706895ffc4333597c2dbf48cf4fd52048174ece638e2d63348a", - "size": 7568622, - "source": "components/google-cloud-sdk-bigtable-windows-x86-20240329151455.tar.gz", + "checksum": "1cb1211ce675026d3e604928e409766044e287eb7e6a068e57aa24c4ee8fce50", + "contents_checksum": "14c9f33ec53c466dac584027302b9825f09f915876d91d613f769f22816e0022", + "size": 7960310, + "source": "components/google-cloud-sdk-bigtable-windows-x86-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1616,6 +1664,7 @@ "description": "Provides a tool for local Cloud Bigtable emulation.", "display_name": "Cloud Bigtable Emulator (Platform Specific)" }, + "gdu_only": true, "id": "bigtable-windows-x86", "is_configuration": false, "is_hidden": true, @@ -1630,16 +1679,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, { "data": { - "checksum": "36f5c9f98188e968cd53fe4545b3f8cb01dc2dfe2bda5c1f607ac384f358f329", - "contents_checksum": "cae59bae355fc9b8ff8fc37296d3885a9944d85b0ba84a4c2e9985380db488e6", - "size": 7841324, - "source": "components/google-cloud-sdk-bigtable-windows-x86_64-20240329151455.tar.gz", + "checksum": "09ef13cc7900d20431ab4f825c41c7ef6eb6685f7d6acef773c50b501d60cade", + "contents_checksum": "a0c28f60f50833a79c8c0b034e14921f9fa73780151df7a82eb586cece71a6ad", + "size": 8213154, + "source": "components/google-cloud-sdk-bigtable-windows-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1650,6 +1699,7 @@ "description": "Provides a tool for local Cloud Bigtable emulation.", "display_name": "Cloud Bigtable Emulator (Platform Specific)" }, + "gdu_only": true, "id": "bigtable-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -1664,16 +1714,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, { "data": { - "checksum": "64bb21d9904b8d0a8659268dcd8ad837f242dfb9a68520aa1a4961e148ebf978", - "contents_checksum": "afc3a525e40185957652ca0fc81d466d989c3af243425644d2863734acc583e5", - "size": 1808321, - "source": "components/google-cloud-sdk-bq-20240712142834.tar.gz", + "checksum": "c91813747b4cbf22e9c990f63f8b89bd46de6af218d97df44361cee0eebb3b87", + "contents_checksum": "e3475baccea8625d97cf47f22fc6a4940db9fb24c72b63e52595ffcf5d26a005", + "size": 1818208, + "source": "components/google-cloud-sdk-bq-20240816183020.tar.gz", "type": "tar" }, "dependencies": [ @@ -1685,6 +1735,7 @@ "description": "Provides the bq tool for interacting with the BigQuery service.", "display_name": "BigQuery Command Line Tool" }, + "gdu_only": false, "id": "bq", "is_configuration": false, "is_hidden": false, @@ -1692,16 +1743,16 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "2.1.7" + "build_number": 20240816183020, + "version_string": "2.1.8" } }, { "data": { - "checksum": "81d6fafb672c791a58b6d2cecbcb8a78ca1a1c7e885d359bcf3ec11ebf138ea0", - "contents_checksum": "fcd529ea7485a8621ac5d217ac7e7793cc8acabe5ba4c2c6f222b402580e5578", - "size": 2026, - "source": "components/google-cloud-sdk-bq-nix-20240106004423.tar.gz", + "checksum": "f23b0a9dd4e356357f860ac8bc3236fe4be5dd67059140d6b9f007828766fe74", + "contents_checksum": "fc38f20f30fa43f46aef337aaab843d7f747a4282bb10768321f03b6e1dd7cd0", + "size": 1914, + "source": "components/google-cloud-sdk-bq-nix-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -1712,6 +1763,7 @@ "description": "Provides the bq tool for interacting with the BigQuery service.", "display_name": "BigQuery Command Line Tool (Platform Specific)" }, + "gdu_only": false, "id": "bq-nix", "is_configuration": false, "is_hidden": true, @@ -1726,16 +1778,16 @@ }, "platform_required": false, "version": { - "build_number": 20240106004423, - "version_string": "2.0.101" + "build_number": 20240830134514, + "version_string": "2.1.8" } }, { "data": { - "checksum": "3bfb69819bbca110fa33474612db6ec6bfb20d2c2334ff41ac21b6f7179441f7", - "contents_checksum": "543b11ef740e32b7013fdecdc0ea02fa076e16972dec18155647fb3f0682d743", - "size": 4104, - "source": "components/google-cloud-sdk-bq-win-20240503145345.tar.gz", + "checksum": "b243aaa62a46e457e684066bcfd7ff777b983e0fe7555b29470a11e4dc55d669", + "contents_checksum": "76399a5b63559f930cd71c4f2f9c49ef4cefdeb998d7ef9609d7b714fb32926c", + "size": 3999, + "source": "components/google-cloud-sdk-bq-win-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -1746,6 +1798,7 @@ "description": "Provides the bq tool for interacting with the BigQuery service.", "display_name": "BigQuery Command Line Tool (Platform Specific)" }, + "gdu_only": false, "id": "bq-win", "is_configuration": false, "is_hidden": true, @@ -1757,108 +1810,8 @@ }, "platform_required": false, "version": { - "build_number": 20240503145345, - "version_string": "2.1.4" - } - }, - { - "dependencies": [ - "bundled-python-windows-x86", - "bundled-python-windows-x86_64", - "bundled-python3", - "core" - ], - "details": { - "description": "Provides stand-alone Python 2.7 install.", - "display_name": "Bundled Python 2.7" - }, - "id": "bundled-python", - "is_configuration": false, - "is_hidden": true, - "is_required": false, - "platform": { - "architectures": [ - "x86", - "x86_64" - ], - "operating_systems": [ - "WINDOWS" - ] - }, - "platform_required": false, - "version": { - "build_number": 0, - "version_string": "2.7.13" - } - }, - { - "data": { - "checksum": "8b179d2ffd01bd29d3252feb638de41662ad853f4a109143c45cfbeb221d466b", - "contents_checksum": "649ff2cbb21688bb04ccf2c6366bff8008975f7b94848fcfd0e2200dfaca442e", - "size": 12763722, - "source": "components/google-cloud-sdk-bundled-python-windows-x86-20200605144945.tar.gz", - "type": "tar" - }, - "dependencies": [ - "bundled-python", - "bundled-python3", - "core" - ], - "details": { - "description": "Provides stand-alone Python 2.7 install.", - "display_name": "Bundled Python 2.7 (Platform Specific)" - }, - "id": "bundled-python-windows-x86", - "is_configuration": false, - "is_hidden": true, - "is_required": false, - "platform": { - "architectures": [ - "x86" - ], - "operating_systems": [ - "WINDOWS" - ] - }, - "platform_required": false, - "version": { - "build_number": 20200605144945, - "version_string": "2.7.13" - } - }, - { - "data": { - "checksum": "6345eae40bebdbbce12f0ccf75161a32c040cd017d43aa697a1cf38a237a3a6f", - "contents_checksum": "29e7c3624d567ef8f63fad1f6863391b6e0577dc7f9034433ece3fc6949363bc", - "size": 13965732, - "source": "components/google-cloud-sdk-bundled-python-windows-x86_64-20200605144945.tar.gz", - "type": "tar" - }, - "dependencies": [ - "bundled-python", - "bundled-python3", - "core" - ], - "details": { - "description": "Provides stand-alone Python 2.7 install.", - "display_name": "Bundled Python 2.7 (Platform Specific)" - }, - "id": "bundled-python-windows-x86_64", - "is_configuration": false, - "is_hidden": true, - "is_required": false, - "platform": { - "architectures": [ - "x86_64" - ], - "operating_systems": [ - "WINDOWS" - ] - }, - "platform_required": false, - "version": { - "build_number": 20200605144945, - "version_string": "2.7.13" + "build_number": 20240830134514, + "version_string": "2.1.8" } }, { @@ -1871,6 +1824,7 @@ "description": "Provides stand-alone Python 3.11 install.", "display_name": "Bundled Python 3.11" }, + "gdu_only": false, "id": "bundled-python3", "is_configuration": false, "is_hidden": true, @@ -1887,7 +1841,7 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "3.11.8" + "version_string": "3.11.9" } }, { @@ -1896,9 +1850,10 @@ "core" ], "details": { - "description": "Provides stand-alone Python 3.11.8 installation for UNIX.", + "description": "Provides stand-alone Python 3.11.9 installation for UNIX.", "display_name": "Bundled Python 3.11" }, + "gdu_only": false, "id": "bundled-python3-unix", "is_configuration": false, "is_hidden": false, @@ -1914,15 +1869,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "3.11.8" + "version_string": "3.11.9" } }, { "data": { - "checksum": "fb1f862cee4cbc9231d9da6be07dc616b9d5f036c7484afced3e0792ed685915", - "contents_checksum": "39e7f47fac5b5738596d5b43c8dda500b684cfe85f14f0c7cd37f024e9b7da7c", - "size": 77646096, - "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20240712142834.tar.gz", + "checksum": "48d35279879c7bc29aafa03983ebcea20971974b8e30656dd95eef527384b5ab", + "contents_checksum": "aa88f2a24033468ef86f8f1267b8f1240b2660570367787a8dd02270071004af", + "size": 78001783, + "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1930,9 +1885,10 @@ "core" ], "details": { - "description": "Provides stand-alone Python 3.11.8 installation for UNIX.", + "description": "Provides stand-alone Python 3.11.9 installation for UNIX.", "display_name": "Bundled Python 3.11 (Platform Specific)" }, + "gdu_only": false, "id": "bundled-python3-unix-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -1947,16 +1903,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "3.11.8" + "build_number": 20240920144119, + "version_string": "3.11.9" } }, { "data": { - "checksum": "6b42a2592dc79efb45b3848f58de62866d9fba0d033a8e91aa919be047ee3cb6", - "contents_checksum": "6cce2af1b3947deeff09b5adce78ef1c6b39716ce2ef27c58b48c14408b2e3a0", - "size": 20457544, - "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20240315155000.tar.gz", + "checksum": "11577b12f66f642f20530a1d14193c32f2942701d20dc52472dae31e555c737e", + "contents_checksum": "d42ff2a914095d101dd3009ca855353baf0f9ad9737b07821bc3470c67fd9fb3", + "size": 20675117, + "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -1967,6 +1923,7 @@ "description": "Provides stand-alone Python 3.11 install.", "display_name": "Bundled Python 3.11 (Platform Specific)" }, + "gdu_only": false, "id": "bundled-python3-windows-x86", "is_configuration": false, "is_hidden": true, @@ -1981,16 +1938,16 @@ }, "platform_required": false, "version": { - "build_number": 20240315155000, - "version_string": "3.11.8" + "build_number": 20240830134514, + "version_string": "3.11.9" } }, { "data": { - "checksum": "22a2f8a7370780239ed00ef8771729318b3301e498afba74ef27f300d3b29ec1", - "contents_checksum": "9b781d6ff139270cd317f233e448c88d2b54ef3d05970b2c765540485acf1451", - "size": 22664923, - "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20240315155000.tar.gz", + "checksum": "70bf9529f62e655b4560293970920aeeb707496a1fff9b729faefc93b9f7c444", + "contents_checksum": "f1f45ca6b66efb29c16a23f8dbbe8496901faac1705a8f3b33bac5a881efe6ec", + "size": 23018167, + "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -2001,6 +1958,7 @@ "description": "Provides stand-alone Python 3.11 install.", "display_name": "Bundled Python 3.11 (Platform Specific)" }, + "gdu_only": false, "id": "bundled-python3-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -2015,8 +1973,8 @@ }, "platform_required": false, "version": { - "build_number": 20240315155000, - "version_string": "3.11.8" + "build_number": 20240830134514, + "version_string": "3.11.9" } }, { @@ -2034,6 +1992,7 @@ "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", "display_name": "Cloud Bigtable Command Line Tool" }, + "gdu_only": true, "id": "cbt", "is_configuration": false, "is_hidden": false, @@ -2053,15 +2012,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.21.0" + "version_string": "1.22.0" } }, { "data": { - "checksum": "3d1713cc5a17d36f806a7313ec68032373c6ef71179e19f383fcc0274aee88a9", - "contents_checksum": "dcf1b9502101268ce05abe93970b1f63b56beb325e2e1d9f33f4414cae4aec10", - "size": 17871065, - "source": "components/google-cloud-sdk-cbt-darwin-arm-20240624182041.tar.gz", + "checksum": "161d9918c898e422c4f36838c13e515b92208428e8c4a602d8cb1e492fcdb16e", + "contents_checksum": "69ce6ab3b44bb669e61529c82927c17af971148620814edc11162d5255c94654", + "size": 18821500, + "source": "components/google-cloud-sdk-cbt-darwin-arm-20240823153932.tar.gz", "type": "tar" }, "dependencies": [ @@ -2071,6 +2030,7 @@ "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)" }, + "gdu_only": true, "id": "cbt-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -2085,8 +2045,8 @@ }, "platform_required": false, "version": { - "build_number": 20240624182041, - "version_string": "1.21.0" + "build_number": 20240823153932, + "version_string": "1.22.0" } }, { @@ -2104,6 +2064,7 @@ "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)" }, + "gdu_only": true, "id": "cbt-darwin-x86", "is_configuration": false, "is_hidden": true, @@ -2124,10 +2085,10 @@ }, { "data": { - "checksum": "4437e990cf658b31aa184e4e5d2b06a6b0b6b08ff98bb84f7877dbc8e3c69ed7", - "contents_checksum": "51fb420da739dde8534ee1bbe419aee62520db2b8e7393ad4bbc1fc8b41defe4", - "size": 18668186, - "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20240624182041.tar.gz", + "checksum": "0da4f23648181eedb850e055c907812fefc1dfde9cce2dee471050f645171382", + "contents_checksum": "0ab6622f1c0045d078cfffc74e035f85c57cefc8f03e455a5b0aba841fe5d517", + "size": 19603578, + "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20240823153932.tar.gz", "type": "tar" }, "dependencies": [ @@ -2137,6 +2098,7 @@ "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)" }, + "gdu_only": true, "id": "cbt-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -2151,16 +2113,16 @@ }, "platform_required": false, "version": { - "build_number": 20240624182041, - "version_string": "1.21.0" + "build_number": 20240823153932, + "version_string": "1.22.0" } }, { "data": { - "checksum": "0dab71da969b9cf86f79793773e30406e2f6913774660083378235627c007b94", - "contents_checksum": "c928b188894801fa7d2367712fcbcb7c788d0650d975bbf36e60d19799a91101", - "size": 17394282, - "source": "components/google-cloud-sdk-cbt-linux-arm-20240624182041.tar.gz", + "checksum": "90720349954a12b375f2506d62754f942c788e2fcf5fce9b2e1d3329a1bede0c", + "contents_checksum": "224babcc9767c1e4bd974887dc9c961b19dca6fd888b6ad9c73bf5c1886e4d91", + "size": 18178427, + "source": "components/google-cloud-sdk-cbt-linux-arm-20240823153932.tar.gz", "type": "tar" }, "dependencies": [ @@ -2170,6 +2132,7 @@ "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)" }, + "gdu_only": true, "id": "cbt-linux-arm", "is_configuration": false, "is_hidden": true, @@ -2184,16 +2147,16 @@ }, "platform_required": false, "version": { - "build_number": 20240624182041, - "version_string": "1.21.0" + "build_number": 20240823153932, + "version_string": "1.22.0" } }, { "data": { - "checksum": "911a85bb4a86bda2d13d00ecec45a9d48ca105ad2d8f14c32dd98f7da65522ee", - "contents_checksum": "fd7dc528702f1f66086d83867737b3813ccfcc958cd841602afd7228b3231d41", - "size": 17275734, - "source": "components/google-cloud-sdk-cbt-linux-x86-20240624182041.tar.gz", + "checksum": "d246c378b7614a7ac7c47bf4d7e11c54869335b7e2d37f27a781e794d23c2824", + "contents_checksum": "4d824111595e4b11d0e2533428277cba49663a9e76b18cd6f2d5925223a7721d", + "size": 17979307, + "source": "components/google-cloud-sdk-cbt-linux-x86-20240823153932.tar.gz", "type": "tar" }, "dependencies": [ @@ -2203,6 +2166,7 @@ "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)" }, + "gdu_only": true, "id": "cbt-linux-x86", "is_configuration": false, "is_hidden": true, @@ -2217,16 +2181,16 @@ }, "platform_required": false, "version": { - "build_number": 20240624182041, - "version_string": "1.21.0" + "build_number": 20240823153932, + "version_string": "1.22.0" } }, { "data": { - "checksum": "f1395612e02e4a10c8b381d388af26dc6463ade27bdf1fb8135fff82ce1f7f7a", - "contents_checksum": "7c5b9a2019d706ba0bfbf32f030472e6bc8630cfc72f14fbdbf3904eaf2a9dee", - "size": 18570041, - "source": "components/google-cloud-sdk-cbt-linux-x86_64-20240624182041.tar.gz", + "checksum": "b05c7bd1d24a0f60663d1bfc4133096c42beb251f5cfc389ffe72aa807cee025", + "contents_checksum": "01c561c96c2eebd9924d161eccc8806b385f047da0369f6e598aca93cd5ea44c", + "size": 19333762, + "source": "components/google-cloud-sdk-cbt-linux-x86_64-20240823153932.tar.gz", "type": "tar" }, "dependencies": [ @@ -2236,6 +2200,7 @@ "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)" }, + "gdu_only": true, "id": "cbt-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -2250,16 +2215,16 @@ }, "platform_required": false, "version": { - "build_number": 20240624182041, - "version_string": "1.21.0" + "build_number": 20240823153932, + "version_string": "1.22.0" } }, { "data": { - "checksum": "53cb4fc8f903c3deb266f48a364f0591e5ba38e4e9640a18c205c4c01da95e10", - "contents_checksum": "506dfe72815e11ff50d4f4c21dbb91b3c7fd8908e0fe598888599c4d18a1a86b", - "size": 17698876, - "source": "components/google-cloud-sdk-cbt-windows-x86-20240624182041.tar.gz", + "checksum": "e85042dc647c143a66d0dcebb827a6ee13f6e00d98dc24d49b6194602d6fdd74", + "contents_checksum": "7293621c8b8c3dcf5db0f3885932ca6f8ff0af51ea2c9b594db28bd282fcddca", + "size": 18404340, + "source": "components/google-cloud-sdk-cbt-windows-x86-20240823153932.tar.gz", "type": "tar" }, "dependencies": [ @@ -2269,6 +2234,7 @@ "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)" }, + "gdu_only": true, "id": "cbt-windows-x86", "is_configuration": false, "is_hidden": true, @@ -2283,16 +2249,16 @@ }, "platform_required": false, "version": { - "build_number": 20240624182041, - "version_string": "1.21.0" + "build_number": 20240823153932, + "version_string": "1.22.0" } }, { "data": { - "checksum": "fefefe5120b24b0e685c281b8ffafb49566c117f5b1b74b6f44e0a56d35e72a9", - "contents_checksum": "ce6d3970696fcabd56d9e569030353d03d312e6e819163766a38af9aafbd825b", - "size": 18831679, - "source": "components/google-cloud-sdk-cbt-windows-x86_64-20240624182041.tar.gz", + "checksum": "3254d3680eb76946c43afe61181295864aa3f31f0e94c27c286f4221563a829b", + "contents_checksum": "a5fe7eba35090d213a194c34b610c8443778d238e6278ded7119fa350646b7a7", + "size": 19605578, + "source": "components/google-cloud-sdk-cbt-windows-x86_64-20240823153932.tar.gz", "type": "tar" }, "dependencies": [ @@ -2302,6 +2268,7 @@ "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.", "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)" }, + "gdu_only": true, "id": "cbt-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -2316,8 +2283,8 @@ }, "platform_required": false, "version": { - "build_number": 20240624182041, - "version_string": "1.21.0" + "build_number": 20240823153932, + "version_string": "1.22.0" } }, { @@ -2330,6 +2297,7 @@ "description": "Provides cloud-build-local executable. See https://github.com/GoogleCloudPlatform/cloud-build-local", "display_name": "Google Cloud Build Local Builder" }, + "gdu_only": true, "id": "cloud-build-local", "is_configuration": false, "is_hidden": true, @@ -2365,6 +2333,7 @@ "description": "Provides cloud-build-local executable. See https://github.com/GoogleCloudPlatform/cloud-build-local", "display_name": "Google Cloud Build Local Builder (Platform Specific)" }, + "gdu_only": true, "id": "cloud-build-local-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -2398,6 +2367,7 @@ "description": "Provides cloud-build-local executable. See https://github.com/GoogleCloudPlatform/cloud-build-local", "display_name": "Google Cloud Build Local Builder (Platform Specific)" }, + "gdu_only": true, "id": "cloud-build-local-linux-x86", "is_configuration": false, "is_hidden": true, @@ -2431,6 +2401,7 @@ "description": "Provides cloud-build-local executable. See https://github.com/GoogleCloudPlatform/cloud-build-local", "display_name": "Google Cloud Build Local Builder (Platform Specific)" }, + "gdu_only": true, "id": "cloud-build-local-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -2464,6 +2435,7 @@ "description": "Provides a local emulator of Cloud Datastore.", "display_name": "Cloud Datastore Emulator" }, + "gdu_only": false, "id": "cloud-datastore-emulator", "is_configuration": false, "is_hidden": false, @@ -2477,10 +2449,10 @@ }, { "data": { - "checksum": "0f7a96ab1d83ba0e4f53149c6cfc555dfd80be065a4ca966b101feb27fd2061a", - "contents_checksum": "2a20a45ed2b832217af8be6ab9155a3aa718ae60eed21acc19a93aee536884f6", - "size": 47379482, - "source": "components/google-cloud-sdk-cloud-firestore-emulator-20240524155722.tar.gz", + "checksum": "8b4dbc1cb4a0d1217f8283a3057d4ba704fcbe11ba7f2b12dc1c13edb87e2e22", + "contents_checksum": "428a9740ee97cc9b8baad30a8ad5271fe2ee46a78f42c60f91e238dd7315c289", + "size": 49222535, + "source": "components/google-cloud-sdk-cloud-firestore-emulator-20240913204132.tar.gz", "type": "tar" }, "dependencies": [ @@ -2490,6 +2462,7 @@ "description": "Provides a local emulator of Cloud Firestore.", "display_name": "Cloud Firestore Emulator" }, + "gdu_only": false, "id": "cloud-firestore-emulator", "is_configuration": false, "is_hidden": false, @@ -2497,8 +2470,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240524155722, - "version_string": "1.19.7" + "build_number": 20240913204132, + "version_string": "1.19.9" } }, { @@ -2513,6 +2486,7 @@ "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy", "display_name": "Cloud Run Proxy" }, + "gdu_only": false, "id": "cloud-run-proxy", "is_configuration": false, "is_hidden": false, @@ -2549,6 +2523,7 @@ "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy", "display_name": "Cloud Run Proxy (Platform Specific)" }, + "gdu_only": false, "id": "cloud-run-proxy-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -2582,6 +2557,7 @@ "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy", "display_name": "Cloud Run Proxy (Platform Specific)" }, + "gdu_only": false, "id": "cloud-run-proxy-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -2615,6 +2591,7 @@ "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy", "display_name": "Cloud Run Proxy (Platform Specific)" }, + "gdu_only": false, "id": "cloud-run-proxy-linux-arm", "is_configuration": false, "is_hidden": true, @@ -2648,6 +2625,7 @@ "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy", "display_name": "Cloud Run Proxy (Platform Specific)" }, + "gdu_only": false, "id": "cloud-run-proxy-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -2681,6 +2659,7 @@ "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy", "display_name": "Cloud Run Proxy (Platform Specific)" }, + "gdu_only": false, "id": "cloud-run-proxy-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -2708,6 +2687,7 @@ "description": "Provides a local emulator of Cloud Spanner.", "display_name": "Cloud Spanner Emulator" }, + "gdu_only": false, "id": "cloud-spanner-emulator", "is_configuration": false, "is_hidden": false, @@ -2723,15 +2703,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.5.19" + "version_string": "1.5.23" } }, { "data": { - "checksum": "348756460ed8945f115b3f07163f36ea220595f13b0ec6f47ee803266f0f4b3d", - "contents_checksum": "ab4a339f052251c4c217f41ea0a69332477a47baaa688f664cddbfbca67b246e", - "size": 38355144, - "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20240624182041.tar.gz", + "checksum": "ac8b8cce33466c5ddd1b73904a9982eb3fba3a138224b4e95d416f7c03af8b39", + "contents_checksum": "8b30e0ca4efc137855976e4feaf16e7a720253039c6d95b35e9a8f106cea5cd2", + "size": 38917279, + "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -2742,6 +2722,7 @@ "description": "Provides a local emulator of Cloud Spanner.", "display_name": "Cloud Spanner Emulator (Platform Specific)" }, + "gdu_only": false, "id": "cloud-spanner-emulator-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -2756,8 +2737,8 @@ }, "platform_required": false, "version": { - "build_number": 20240624182041, - "version_string": "1.5.19" + "build_number": 20240830134514, + "version_string": "1.5.23" } }, { @@ -2774,6 +2755,7 @@ "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", "display_name": "Cloud SQL Proxy v2" }, + "gdu_only": false, "id": "cloud-sql-proxy", "is_configuration": false, "is_hidden": false, @@ -2811,6 +2793,7 @@ "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", "display_name": "Cloud SQL Proxy v2 (Platform Specific)" }, + "gdu_only": false, "id": "cloud-sql-proxy-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -2844,6 +2827,7 @@ "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", "display_name": "Cloud SQL Proxy v2 (Platform Specific)" }, + "gdu_only": false, "id": "cloud-sql-proxy-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -2877,6 +2861,7 @@ "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", "display_name": "Cloud SQL Proxy v2 (Platform Specific)" }, + "gdu_only": false, "id": "cloud-sql-proxy-linux-arm", "is_configuration": false, "is_hidden": true, @@ -2910,6 +2895,7 @@ "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", "display_name": "Cloud SQL Proxy v2 (Platform Specific)" }, + "gdu_only": false, "id": "cloud-sql-proxy-linux-x86", "is_configuration": false, "is_hidden": true, @@ -2943,6 +2929,7 @@ "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", "display_name": "Cloud SQL Proxy v2 (Platform Specific)" }, + "gdu_only": false, "id": "cloud-sql-proxy-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -2976,6 +2963,7 @@ "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", "display_name": "Cloud SQL Proxy v2 (Platform Specific)" }, + "gdu_only": false, "id": "cloud-sql-proxy-windows-x86", "is_configuration": false, "is_hidden": true, @@ -3009,6 +2997,7 @@ "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", "display_name": "Cloud SQL Proxy v2 (Platform Specific)" }, + "gdu_only": false, "id": "cloud-sql-proxy-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -3041,6 +3030,7 @@ "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", "display_name": "Cloud SQL Proxy" }, + "gdu_only": true, "id": "cloud_sql_proxy", "is_configuration": false, "is_hidden": true, @@ -3078,6 +3068,7 @@ "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", "display_name": "Cloud SQL Proxy (Platform Specific)" }, + "gdu_only": true, "id": "cloud_sql_proxy-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -3111,6 +3102,7 @@ "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", "display_name": "Cloud SQL Proxy (Platform Specific)" }, + "gdu_only": true, "id": "cloud_sql_proxy-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -3144,6 +3136,7 @@ "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", "display_name": "Cloud SQL Proxy (Platform Specific)" }, + "gdu_only": true, "id": "cloud_sql_proxy-linux-arm", "is_configuration": false, "is_hidden": true, @@ -3177,6 +3170,7 @@ "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", "display_name": "Cloud SQL Proxy (Platform Specific)" }, + "gdu_only": true, "id": "cloud_sql_proxy-linux-x86", "is_configuration": false, "is_hidden": true, @@ -3210,6 +3204,7 @@ "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", "display_name": "Cloud SQL Proxy (Platform Specific)" }, + "gdu_only": true, "id": "cloud_sql_proxy-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -3243,6 +3238,7 @@ "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", "display_name": "Cloud SQL Proxy (Platform Specific)" }, + "gdu_only": true, "id": "cloud_sql_proxy-windows-x86", "is_configuration": false, "is_hidden": true, @@ -3276,6 +3272,7 @@ "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy", "display_name": "Cloud SQL Proxy (Platform Specific)" }, + "gdu_only": true, "id": "cloud_sql_proxy-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -3306,6 +3303,7 @@ "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview", "display_name": "config-connector" }, + "gdu_only": true, "id": "config-connector", "is_configuration": false, "is_hidden": false, @@ -3342,6 +3340,7 @@ "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview", "display_name": "config-connector (Platform Specific)" }, + "gdu_only": true, "id": "config-connector-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -3375,6 +3374,7 @@ "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview", "display_name": "config-connector (Platform Specific)" }, + "gdu_only": true, "id": "config-connector-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -3408,6 +3408,7 @@ "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview", "display_name": "config-connector (Platform Specific)" }, + "gdu_only": true, "id": "config-connector-linux-arm", "is_configuration": false, "is_hidden": true, @@ -3441,6 +3442,7 @@ "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview", "display_name": "config-connector (Platform Specific)" }, + "gdu_only": true, "id": "config-connector-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -3474,6 +3476,7 @@ "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview", "display_name": "config-connector (Platform Specific)" }, + "gdu_only": true, "id": "config-connector-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -3494,10 +3497,10 @@ }, { "data": { - "checksum": "ae3adb2a9e4ccfba6b0d55457ba91e349a8cbeec5d667556c1e4a21109420394", - "contents_checksum": "8e708148fcae335c224df37c7c45ff44278fa12bb0b9d42ef396c61962ee6309", - "size": 20088401, - "source": "components/google-cloud-sdk-core-20240719191136.tar.gz", + "checksum": "07eb73d0e08d63d8c2715df13dcae10561dc8062727f74c65fc698be73ed9442", + "contents_checksum": "64887e7f351f00ed95cd5a9d2be9aa72e8ceff4a8f617d626e9bc2e8c0238223", + "size": 21004306, + "source": "components/google-cloud-sdk-core-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -3511,6 +3514,7 @@ "description": "Handles all core functionality for the Google Cloud CLI.", "display_name": "Google Cloud CLI Core Libraries" }, + "gdu_only": false, "id": "core", "is_configuration": false, "is_hidden": false, @@ -3518,16 +3522,16 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240719191136, - "version_string": "2024.07.19" + "build_number": 20240920144119, + "version_string": "2024.09.20" } }, { "data": { - "checksum": "b7f76cd9c7f391d8504d31fba7c180b7c3028646c0efda8fafdb1abd13056917", - "contents_checksum": "35b7e083b5dc365a7f2ff9fac444ad23ddfae564c22296c502183ee4eb9fab00", - "size": 2410, - "source": "components/google-cloud-sdk-core-nix-20240106004423.tar.gz", + "checksum": "197ac1b099e234bdc6e470083357fb6da39359bf43cea591acbb49812650a987", + "contents_checksum": "de33f987aac09df44d040f88a497a83c34d5fe5a94af0c8245264e4fdcb95ea6", + "size": 2306, + "source": "components/google-cloud-sdk-core-nix-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -3540,6 +3544,7 @@ "description": "Handles all core functionality for the Google Cloud CLI.", "display_name": "Google Cloud CLI Core Libraries (Platform Specific)" }, + "gdu_only": false, "id": "core-nix", "is_configuration": false, "is_hidden": true, @@ -3554,8 +3559,8 @@ }, "platform_required": false, "version": { - "build_number": 20240106004423, - "version_string": "2024.01.06" + "build_number": 20240830134514, + "version_string": "2024.08.30" } }, { @@ -3576,6 +3581,7 @@ "description": "Handles all core functionality for the Google Cloud CLI.", "display_name": "Google Cloud CLI Core Libraries (Platform Specific)" }, + "gdu_only": false, "id": "core-win", "is_configuration": false, "is_hidden": true, @@ -3605,6 +3611,7 @@ "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", "display_name": "Google Container Registry's Docker credential helper" }, + "gdu_only": false, "id": "docker-credential-gcr", "is_configuration": false, "is_hidden": false, @@ -3642,6 +3649,7 @@ "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", "display_name": "Google Container Registry's Docker credential helper (Platform Specific)" }, + "gdu_only": false, "id": "docker-credential-gcr-darwin-x86", "is_configuration": false, "is_hidden": true, @@ -3675,6 +3683,7 @@ "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", "display_name": "Google Container Registry's Docker credential helper (Platform Specific)" }, + "gdu_only": false, "id": "docker-credential-gcr-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -3708,6 +3717,7 @@ "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", "display_name": "Google Container Registry's Docker credential helper (Platform Specific)" }, + "gdu_only": false, "id": "docker-credential-gcr-linux-arm", "is_configuration": false, "is_hidden": true, @@ -3741,6 +3751,7 @@ "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", "display_name": "Google Container Registry's Docker credential helper (Platform Specific)" }, + "gdu_only": false, "id": "docker-credential-gcr-linux-x86", "is_configuration": false, "is_hidden": true, @@ -3774,6 +3785,7 @@ "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", "display_name": "Google Container Registry's Docker credential helper (Platform Specific)" }, + "gdu_only": false, "id": "docker-credential-gcr-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -3807,6 +3819,7 @@ "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", "display_name": "Google Container Registry's Docker credential helper (Platform Specific)" }, + "gdu_only": false, "id": "docker-credential-gcr-windows-x86", "is_configuration": false, "is_hidden": true, @@ -3840,6 +3853,7 @@ "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr", "display_name": "Google Container Registry's Docker credential helper (Platform Specific)" }, + "gdu_only": false, "id": "docker-credential-gcr-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -3869,6 +3883,7 @@ "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.", "display_name": "enterprise-certificate-proxy" }, + "gdu_only": true, "id": "enterprise-certificate-proxy", "is_configuration": false, "is_hidden": false, @@ -3887,15 +3902,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.3.2" + "version_string": "0.3.3" } }, { "data": { - "checksum": "a3e8f5c45ac19bd3430201339c07f2f6dc21296702375c2381ecf5c8d3e88279", - "contents_checksum": "22e8de82f1f0cb7a6db65e095c15017866869cac0f1d5556c146c92b1c49acb9", - "size": 8680702, - "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-arm-20231208151900.tar.gz", + "checksum": "d08bffeb4cc07f510132c943dd3c4da5d05ad4348b1b79cc2f13ce77c1a43294", + "contents_checksum": "8369d34ed10b49fa49096488b8e9fde343efdeac8ec9662843ceac9a2c72a049", + "size": 7538571, + "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-arm-20240913204132.tar.gz", "type": "tar" }, "dependencies": [ @@ -3905,6 +3920,7 @@ "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.", "display_name": "enterprise-certificate-proxy (Platform Specific)" }, + "gdu_only": true, "id": "enterprise-certificate-proxy-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -3919,16 +3935,16 @@ }, "platform_required": false, "version": { - "build_number": 20231208151900, - "version_string": "0.3.2" + "build_number": 20240913204132, + "version_string": "0.3.3" } }, { "data": { - "checksum": "301757a2839dce01a6435ed4b0dfd05616f9a3c8aeba4624362b48f115e5b97a", - "contents_checksum": "6d407b55892613efd363344f855292ddda8fdbe81f549f318264480dc167b25a", - "size": 9536921, - "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-x86_64-20231208151900.tar.gz", + "checksum": "1f2be11ed0d87cfb5377dec7c78a8b48fd211ab1827b43f523c7ac33d6de0b61", + "contents_checksum": "27fde9fc542d86f9eb256bc92e8a511c6896e8a419cd9ec089ea2ddc900bd2bd", + "size": 8300582, + "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-x86_64-20240913204132.tar.gz", "type": "tar" }, "dependencies": [ @@ -3938,6 +3954,7 @@ "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.", "display_name": "enterprise-certificate-proxy (Platform Specific)" }, + "gdu_only": true, "id": "enterprise-certificate-proxy-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -3952,16 +3969,16 @@ }, "platform_required": false, "version": { - "build_number": 20231208151900, - "version_string": "0.3.2" + "build_number": 20240913204132, + "version_string": "0.3.3" } }, { "data": { - "checksum": "620e7f1598535dba84e52085cf12275e6e2264b281d7d43d71d4079ad0daab7e", - "contents_checksum": "1ccff0b7259285d34269926c6038535561cc6d24c0a5c40e3f1b49c7748c9808", - "size": 9012612, - "source": "components/google-cloud-sdk-enterprise-certificate-proxy-linux-x86_64-20231208151900.tar.gz", + "checksum": "755dd461d4e781fdde01f9045583b6693828b40711dd4f063943e4a9db2c0ece", + "contents_checksum": "e8c8acf997eab9a5298037798725fe486a70bd49a395d61e229e2f41c1f80036", + "size": 9024735, + "source": "components/google-cloud-sdk-enterprise-certificate-proxy-linux-x86_64-20240913204132.tar.gz", "type": "tar" }, "dependencies": [ @@ -3971,6 +3988,7 @@ "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.", "display_name": "enterprise-certificate-proxy (Platform Specific)" }, + "gdu_only": true, "id": "enterprise-certificate-proxy-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -3985,16 +4003,16 @@ }, "platform_required": false, "version": { - "build_number": 20231208151900, - "version_string": "0.3.2" + "build_number": 20240913204132, + "version_string": "0.3.3" } }, { "data": { - "checksum": "d49562e0fac17a4ac3c4e30d7c7056320a69ebc157a6c3f3e744f5731bb16f92", - "contents_checksum": "bfa2c0f4ea80fb6e3299b6fb7554565213c39ed7b01140020f8ae00c260d09e1", - "size": 6801316, - "source": "components/google-cloud-sdk-enterprise-certificate-proxy-windows-x86_64-20231208151900.tar.gz", + "checksum": "ff4456a198f652f5b4340a94091d64930b5ed3df5adbd90a0633024d2860c07a", + "contents_checksum": "16f3c53cf04b266326ce4d64d084ab395d57e3718bb42d1b21d897e0e729bdf7", + "size": 6782214, + "source": "components/google-cloud-sdk-enterprise-certificate-proxy-windows-x86_64-20240913204132.tar.gz", "type": "tar" }, "dependencies": [ @@ -4004,6 +4022,7 @@ "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.", "display_name": "enterprise-certificate-proxy (Platform Specific)" }, + "gdu_only": true, "id": "enterprise-certificate-proxy-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -4018,8 +4037,8 @@ }, "platform_required": false, "version": { - "build_number": 20231208151900, - "version_string": "0.3.2" + "build_number": 20240913204132, + "version_string": "0.3.3" } }, { @@ -4030,6 +4049,7 @@ "description": "Default set of gcloud commands.", "display_name": "Default set of gcloud commands" }, + "gdu_only": false, "id": "gcloud", "is_configuration": false, "is_hidden": true, @@ -4055,6 +4075,7 @@ "description": "Command line tool that calculates CRC32C hashes on local files.", "display_name": "Google Cloud CRC32C Hash Tool" }, + "gdu_only": false, "id": "gcloud-crc32c", "is_configuration": false, "is_hidden": false, @@ -4092,6 +4113,7 @@ "description": "Command line tool that calculates CRC32C hashes on local files.", "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-crc32c-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -4125,6 +4147,7 @@ "description": "Command line tool that calculates CRC32C hashes on local files.", "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-crc32c-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -4158,6 +4181,7 @@ "description": "Command line tool that calculates CRC32C hashes on local files.", "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-crc32c-linux-arm", "is_configuration": false, "is_hidden": true, @@ -4191,6 +4215,7 @@ "description": "Command line tool that calculates CRC32C hashes on local files.", "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-crc32c-linux-x86", "is_configuration": false, "is_hidden": true, @@ -4224,6 +4249,7 @@ "description": "Command line tool that calculates CRC32C hashes on local files.", "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-crc32c-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -4257,6 +4283,7 @@ "description": "Command line tool that calculates CRC32C hashes on local files.", "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-crc32c-windows-x86", "is_configuration": false, "is_hidden": true, @@ -4290,6 +4317,7 @@ "description": "Command line tool that calculates CRC32C hashes on local files.", "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-crc32c-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -4310,10 +4338,10 @@ }, { "data": { - "checksum": "c0c348262e6e0cf59e569551ea49f32397af64456c4b177cde10769837affdcb", - "contents_checksum": "cbe989aff03e61af3e43395fa240ddc702451d928eb10a2ccffa713b27180d12", - "size": 17417303, - "source": "components/google-cloud-sdk-gcloud-deps-20240712142834.tar.gz", + "checksum": "16131516bb7f7e9c94903abeb19dfb116973b72bb5ae24a1512d232ed7ea58b6", + "contents_checksum": "f6b086b59576ff9652483408d3d1bec083f6e3ee98a5e126b48197dda4427380", + "size": 17425755, + "source": "components/google-cloud-sdk-gcloud-deps-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -4329,6 +4357,7 @@ "description": "Set of third_party gcloud cli dependencies.", "display_name": "gcloud cli dependencies" }, + "gdu_only": false, "id": "gcloud-deps", "is_configuration": false, "is_hidden": true, @@ -4336,8 +4365,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "2024.07.12" + "build_number": 20240920144119, + "version_string": "2024.09.20" } }, { @@ -4356,6 +4385,7 @@ "description": "Set of third_party gcloud cli dependencies.", "display_name": "gcloud cli dependencies (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-deps-darwin-x86", "is_configuration": false, "is_hidden": true, @@ -4390,6 +4420,7 @@ "description": "Set of third_party gcloud cli dependencies.", "display_name": "gcloud cli dependencies (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-deps-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -4424,6 +4455,7 @@ "description": "Set of third_party gcloud cli dependencies.", "display_name": "gcloud cli dependencies (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-deps-linux-x86", "is_configuration": false, "is_hidden": true, @@ -4458,6 +4490,7 @@ "description": "Set of third_party gcloud cli dependencies.", "display_name": "gcloud cli dependencies (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-deps-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -4492,6 +4525,7 @@ "description": "Set of third_party gcloud cli dependencies.", "display_name": "gcloud cli dependencies (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-deps-windows-x86", "is_configuration": false, "is_hidden": true, @@ -4526,6 +4560,7 @@ "description": "Set of third_party gcloud cli dependencies.", "display_name": "gcloud cli dependencies (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-deps-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -4553,6 +4588,7 @@ "description": "Man pages for gcloud commands.", "display_name": "Man pages" }, + "gdu_only": false, "id": "gcloud-man-pages", "is_configuration": false, "is_hidden": true, @@ -4573,10 +4609,10 @@ }, { "data": { - "checksum": "146b28c492f0d9d9b61dddf900e283d8574780c50b371454186be6059de9090c", - "contents_checksum": "0949914541210ca57cdf03cdc92a1d46421148628fc886fbaef65e5a2e16cd0c", - "size": 7076612, - "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240719191136.tar.gz", + "checksum": "55688439aa278229175c18395d14689411c34b088360a2543071ba483cb4cb6c", + "contents_checksum": "f18edf3862382326c32e28f898871617775de59c3aa0e73383d5bad4e18cae5f", + "size": 7283267, + "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -4587,6 +4623,7 @@ "description": "Man pages for gcloud commands.", "display_name": "Man pages (Platform Specific)" }, + "gdu_only": false, "id": "gcloud-man-pages-nix", "is_configuration": false, "is_hidden": true, @@ -4601,7 +4638,7 @@ }, "platform_required": false, "version": { - "build_number": 20240719191136, + "build_number": 20240920144119, "version_string": "" } }, @@ -4619,6 +4656,7 @@ "description": "The auth plugin for Kubectl on GKE.", "display_name": "gke-gcloud-auth-plugin" }, + "gdu_only": false, "id": "gke-gcloud-auth-plugin", "is_configuration": false, "is_hidden": false, @@ -4656,6 +4694,7 @@ "description": "The auth plugin for Kubectl on GKE.", "display_name": "gke-gcloud-auth-plugin (Platform Specific)" }, + "gdu_only": false, "id": "gke-gcloud-auth-plugin-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -4689,6 +4728,7 @@ "description": "The auth plugin for Kubectl on GKE.", "display_name": "gke-gcloud-auth-plugin (Platform Specific)" }, + "gdu_only": false, "id": "gke-gcloud-auth-plugin-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -4722,6 +4762,7 @@ "description": "The auth plugin for Kubectl on GKE.", "display_name": "gke-gcloud-auth-plugin (Platform Specific)" }, + "gdu_only": false, "id": "gke-gcloud-auth-plugin-linux-arm", "is_configuration": false, "is_hidden": true, @@ -4755,6 +4796,7 @@ "description": "The auth plugin for Kubectl on GKE.", "display_name": "gke-gcloud-auth-plugin (Platform Specific)" }, + "gdu_only": false, "id": "gke-gcloud-auth-plugin-linux-x86", "is_configuration": false, "is_hidden": true, @@ -4788,6 +4830,7 @@ "description": "The auth plugin for Kubectl on GKE.", "display_name": "gke-gcloud-auth-plugin (Platform Specific)" }, + "gdu_only": false, "id": "gke-gcloud-auth-plugin-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -4821,6 +4864,7 @@ "description": "The auth plugin for Kubectl on GKE.", "display_name": "gke-gcloud-auth-plugin (Platform Specific)" }, + "gdu_only": false, "id": "gke-gcloud-auth-plugin-windows-x86", "is_configuration": false, "is_hidden": true, @@ -4854,6 +4898,7 @@ "description": "The auth plugin for Kubectl on GKE.", "display_name": "gke-gcloud-auth-plugin (Platform Specific)" }, + "gdu_only": false, "id": "gke-gcloud-auth-plugin-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -4889,6 +4934,7 @@ "description": "Provides the gsutil tool for interacting with Google Cloud Storage.", "display_name": "Cloud Storage Command Line Tool" }, + "gdu_only": true, "id": "gsutil", "is_configuration": false, "is_hidden": false, @@ -4902,10 +4948,10 @@ }, { "data": { - "checksum": "0e203c936ca846514c498e1bf3f18ecfd8f4e031eb65f1f915812fa31824d246", - "contents_checksum": "023019da3e1594d499efe2047aa7069fd138fba4022da534f245de4a9b25597c", - "size": 2042, - "source": "components/google-cloud-sdk-gsutil-nix-20240106004423.tar.gz", + "checksum": "a896e2401419d2767ad444547bc89e80d08af925b282383035de8cb75ebe6bc0", + "contents_checksum": "9fea4d1cb560bfc47fc80d4982fd886b4c283530b79fbd90bc1955003169996c", + "size": 1928, + "source": "components/google-cloud-sdk-gsutil-nix-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -4916,6 +4962,7 @@ "description": "Provides the gsutil tool for interacting with Google Cloud Storage.", "display_name": "Cloud Storage Command Line Tool (Platform Specific)" }, + "gdu_only": true, "id": "gsutil-nix", "is_configuration": false, "is_hidden": true, @@ -4930,16 +4977,16 @@ }, "platform_required": false, "version": { - "build_number": 20240106004423, - "version_string": "5.27" + "build_number": 20240830134514, + "version_string": "5.30" } }, { "data": { - "checksum": "8b63a83d67b850db7e46f468c9a5370bcdf67aa826c39e5d686c1154e378cf27", - "contents_checksum": "0f40962ad671c9f7eb0c6d0d9fe2ea0cfa406fa550764864959335988172d5e6", - "size": 4160, - "source": "components/google-cloud-sdk-gsutil-win-20240226203415.tar.gz", + "checksum": "5498449c9d5918d70aee2f40072fd493f5b5fcc2f86dccfbf71537e01b8a874b", + "contents_checksum": "5a3078a14d39ea2176019f1b6942be3ff8d0cee80501cc30f1ca5065b5069e89", + "size": 4050, + "source": "components/google-cloud-sdk-gsutil-win-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -4950,6 +4997,7 @@ "description": "Provides the gsutil tool for interacting with Google Cloud Storage.", "display_name": "Cloud Storage Command Line Tool (Platform Specific)" }, + "gdu_only": true, "id": "gsutil-win", "is_configuration": false, "is_hidden": true, @@ -4961,8 +5009,8 @@ }, "platform_required": false, "version": { - "build_number": 20240226203415, - "version_string": "5.27" + "build_number": 20240830134514, + "version_string": "5.30" } }, { @@ -4973,6 +5021,7 @@ "description": "Performs database migrations to Cloud Spanner databases.", "display_name": "Cloud Spanner Migration Tool" }, + "gdu_only": true, "id": "harbourbridge", "is_configuration": false, "is_hidden": false, @@ -5006,6 +5055,7 @@ "description": "Performs database migrations to Cloud Spanner databases.", "display_name": "Cloud Spanner Migration Tool (Platform Specific)" }, + "gdu_only": true, "id": "harbourbridge-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -5035,6 +5085,7 @@ "description": "Support tool for Cloud Service Mesh.", "display_name": "istioctl" }, + "gdu_only": true, "id": "istioctl", "is_configuration": false, "is_hidden": false, @@ -5070,6 +5121,7 @@ "description": "Support tool for Cloud Service Mesh.", "display_name": "istioctl (Platform Specific)" }, + "gdu_only": true, "id": "istioctl-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -5103,6 +5155,7 @@ "description": "Support tool for Cloud Service Mesh.", "display_name": "istioctl (Platform Specific)" }, + "gdu_only": true, "id": "istioctl-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -5136,6 +5189,7 @@ "description": "Support tool for Cloud Service Mesh.", "display_name": "istioctl (Platform Specific)" }, + "gdu_only": true, "id": "istioctl-linux-arm", "is_configuration": false, "is_hidden": true, @@ -5169,6 +5223,7 @@ "description": "Support tool for Cloud Service Mesh.", "display_name": "istioctl (Platform Specific)" }, + "gdu_only": true, "id": "istioctl-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -5198,6 +5253,7 @@ "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.", "display_name": "kpt" }, + "gdu_only": false, "id": "kpt", "is_configuration": false, "is_hidden": false, @@ -5215,15 +5271,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.0.0-beta.50" + "version_string": "1.0.0-beta.55" } }, { "data": { - "checksum": "ae0dad6460ee54cc820b57ff6f384d294c30cadf42e834dc45f2e288ad627e19", - "contents_checksum": "74e9c5f7088cbd6c7824a18eddc4721889ebcdf50bb1958dca7557f3c1646cbe", - "size": 14487151, - "source": "components/google-cloud-sdk-kpt-darwin-arm-20240510142152.tar.gz", + "checksum": "12466bd606acf151837e299eebbbe0bc85e82f63d0f8793f4f4710de729b5ece", + "contents_checksum": "6c7cd9f04e3f0ac68148649e204c91d7c8d43bc7c539ba00f1b033f02d3723f5", + "size": 15062248, + "source": "components/google-cloud-sdk-kpt-darwin-arm-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -5233,6 +5289,7 @@ "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.", "display_name": "kpt (Platform Specific)" }, + "gdu_only": false, "id": "kpt-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -5247,16 +5304,16 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.0.0-beta.50" + "build_number": 20240830134514, + "version_string": "1.0.0-beta.55" } }, { "data": { - "checksum": "e80ffcb2338f17d70bcf5e0d77b049817ad154851f8a68c5a4a112ee3f1fa3e5", - "contents_checksum": "2ccd31d47996bb1e7ad06ef860c2099a88be1b8a9deba0afbd12b9a1bce83e38", - "size": 15556773, - "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20240510142152.tar.gz", + "checksum": "bb96aec242c9e0f3d8347465e5b5d3e2ef60cec1b07033b54adc9793b67f17c2", + "contents_checksum": "8ea274e558d477e1765078ec05300460543be2284e5215297250045637008337", + "size": 16143447, + "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -5266,6 +5323,7 @@ "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.", "display_name": "kpt (Platform Specific)" }, + "gdu_only": false, "id": "kpt-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -5280,16 +5338,16 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.0.0-beta.50" + "build_number": 20240830134514, + "version_string": "1.0.0-beta.55" } }, { "data": { - "checksum": "eeb8b320e5d50954c584f84fd0b5d46549ccf7a402628362cdaca39e141bc132", - "contents_checksum": "b52727552507224193bd48871158707738f0582138f4dc6e0eb0a3f83231d61a", - "size": 13818240, - "source": "components/google-cloud-sdk-kpt-linux-arm-20240510142152.tar.gz", + "checksum": "e7229a7400d0cab563be434c79dc9a9b329782393d5bc589eeaf7707ee1a4d6e", + "contents_checksum": "9294394a5ec967b657a2a93fca6514b9d6c10046212ff0c5ddba5137aa9b6359", + "size": 14370245, + "source": "components/google-cloud-sdk-kpt-linux-arm-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -5299,6 +5357,7 @@ "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.", "display_name": "kpt (Platform Specific)" }, + "gdu_only": false, "id": "kpt-linux-arm", "is_configuration": false, "is_hidden": true, @@ -5313,16 +5372,16 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.0.0-beta.50" + "build_number": 20240830134514, + "version_string": "1.0.0-beta.55" } }, { "data": { - "checksum": "db9b4541f14732e4569bcba320a989b8e54660d53088f45b265d234175bdd8e4", - "contents_checksum": "0f56e5d3cee14e5f8e6091938a4ed755de5dd4520643f65b11c2515f94c30631", - "size": 15264863, - "source": "components/google-cloud-sdk-kpt-linux-x86_64-20240510142152.tar.gz", + "checksum": "e14a80527f5e457b7a1cea93fecc331975021540da2bbdfa41c2fff9a6a89fa9", + "contents_checksum": "32f1578bfd060d897070aa309a3c94f4afd7d48bd3b14079a1faedba7d3e78af", + "size": 15847524, + "source": "components/google-cloud-sdk-kpt-linux-x86_64-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -5332,6 +5391,7 @@ "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.", "display_name": "kpt (Platform Specific)" }, + "gdu_only": false, "id": "kpt-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -5346,16 +5406,16 @@ }, "platform_required": false, "version": { - "build_number": 20240510142152, - "version_string": "1.0.0-beta.50" + "build_number": 20240830134514, + "version_string": "1.0.0-beta.55" } }, { "data": { - "checksum": "c93afe5174d13a67852539bed4a2de80df4d9e27e9267d6d37d78ea4732fcf97", - "contents_checksum": "244cd00939229a06b9d7a79582dc2839313cf95d58bc3ecc2e410af35b3f0c30", - "size": 35803, - "source": "components/google-cloud-sdk-kubectl-20240624182041.tar.gz", + "checksum": "50be8a89de9beb056eb1cfa1dcf3be6f5d4481c9835cecd1a544892431fb18ba", + "contents_checksum": "da6c76d1c9106266d9c671daec55382f363073c50df1aa8fc4ab8359313e8df9", + "size": 36077, + "source": "components/google-cloud-sdk-kubectl-20240906153039.tar.gz", "type": "tar" }, "dependencies": [ @@ -5372,6 +5432,7 @@ "description": "Provides kubectl executables.", "display_name": "kubectl" }, + "gdu_only": true, "id": "kubectl", "is_configuration": false, "is_hidden": false, @@ -5379,16 +5440,16 @@ "platform": {}, "platform_required": true, "version": { - "build_number": 20240624182041, - "version_string": "1.27.15" + "build_number": 20240906153039, + "version_string": "1.29.8" } }, { "data": { - "checksum": "ba31d657e3125d1a71e5712ec8fa44f5ea9ee6047ac45b82f1db7a5e6ad907e7", - "contents_checksum": "f55f74a6ae18d7dfc667e2d3e2731bbf49e92cbd9e992c84c05ed8617a2ae575", - "size": 76290494, - "source": "components/google-cloud-sdk-kubectl-darwin-arm-20240624182041.tar.gz", + "checksum": "d6cef1c5037200c59575bc4d754697516ab724b2a1ffd2ae69d48b6d2815748c", + "contents_checksum": "1c5f8dc2dcd52e87029b548dca4fbefcf0b479928db492989a68de7356d1e373", + "size": 89999194, + "source": "components/google-cloud-sdk-kubectl-darwin-arm-20240906153039.tar.gz", "type": "tar" }, "dependencies": [ @@ -5399,6 +5460,7 @@ "description": "Provides kubectl executables.", "display_name": "kubectl (Platform Specific)" }, + "gdu_only": true, "id": "kubectl-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -5413,16 +5475,16 @@ }, "platform_required": true, "version": { - "build_number": 20240624182041, - "version_string": "1.27.15" + "build_number": 20240906153039, + "version_string": "1.29.8" } }, { "data": { - "checksum": "885fcd0694e94f99f23a48dfcf648c4bfd984bd5691e97986992f9c6e1532779", - "contents_checksum": "0aa804ed82d0e4667e774f7b14741d5ef499e5120e5b8f2b90252644b5ae37db", - "size": 80432565, - "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20240624182041.tar.gz", + "checksum": "8ec00d2aaa807e7f0e82d71f854eb580c9a258ab8d4f93ee9a37ee0e46a54a89", + "contents_checksum": "99c0104f597b97d7c4dd2980e26012a8dca357d2c0635fa33032130b6ab6eba2", + "size": 96458011, + "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20240906153039.tar.gz", "type": "tar" }, "dependencies": [ @@ -5433,6 +5495,7 @@ "description": "Provides kubectl executables.", "display_name": "kubectl (Platform Specific)" }, + "gdu_only": true, "id": "kubectl-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -5447,16 +5510,16 @@ }, "platform_required": true, "version": { - "build_number": 20240624182041, - "version_string": "1.27.15" + "build_number": 20240906153039, + "version_string": "1.29.8" } }, { "data": { - "checksum": "3ad4928265226167ffaa197b18270a61d27a858ad42e5f9079513689d70345ec", - "contents_checksum": "f17c7860507b5248c5face0cda8a95ab2c015b13f90a6fd6e274748887eb3c65", - "size": 73474381, - "source": "components/google-cloud-sdk-kubectl-linux-arm-20240624182041.tar.gz", + "checksum": "c7ccd999f9460f86d082a8184008dba4d0c214b6e36a54971416ad42aa2fd818", + "contents_checksum": "2069a0a95ba5f5dace729eab30cd9e5cec04471b6f11e45054149e4c707cf246", + "size": 89797670, + "source": "components/google-cloud-sdk-kubectl-linux-arm-20240906153039.tar.gz", "type": "tar" }, "dependencies": [ @@ -5467,6 +5530,7 @@ "description": "Provides kubectl executables.", "display_name": "kubectl (Platform Specific)" }, + "gdu_only": true, "id": "kubectl-linux-arm", "is_configuration": false, "is_hidden": true, @@ -5481,16 +5545,16 @@ }, "platform_required": true, "version": { - "build_number": 20240624182041, - "version_string": "1.27.15" + "build_number": 20240906153039, + "version_string": "1.29.8" } }, { "data": { - "checksum": "e3b28906976e1579dff93dc777fa348e21392d354ba3a493aec56e9a56798b91", - "contents_checksum": "6179b9854bb4e63cda81b2c236fa97650891e5c25291a5292311edcd1eab10f9", - "size": 71255708, - "source": "components/google-cloud-sdk-kubectl-linux-x86-20240624182041.tar.gz", + "checksum": "919e327769b9d64fad073cd1247361e09ef122d68668f25c13374eca8b542591", + "contents_checksum": "ff23c2f812e986e587268c16978a5cf895527d410126014c8c71a65504da6aae", + "size": 87267435, + "source": "components/google-cloud-sdk-kubectl-linux-x86-20240906153039.tar.gz", "type": "tar" }, "dependencies": [ @@ -5501,6 +5565,7 @@ "description": "Provides kubectl executables.", "display_name": "kubectl (Platform Specific)" }, + "gdu_only": true, "id": "kubectl-linux-x86", "is_configuration": false, "is_hidden": true, @@ -5515,16 +5580,16 @@ }, "platform_required": true, "version": { - "build_number": 20240624182041, - "version_string": "1.27.15" + "build_number": 20240906153039, + "version_string": "1.29.8" } }, { "data": { - "checksum": "9b98bb6004218eff092eaaf57e600c6820641ba00f2855577a61852590c7ed27", - "contents_checksum": "a3c7d039ffa798e43a3acb15670156e837d4f868e76627601f910177bcea481b", - "size": 76953404, - "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20240624182041.tar.gz", + "checksum": "acd8e6c36f56c935677e33376836d2469f59ddc546bfa235f6441818b4986719", + "contents_checksum": "02d9faf3daf528f37465d9c598ea74cc63c44b794bf8e73be21bc7976ee2add3", + "size": 94553450, + "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20240906153039.tar.gz", "type": "tar" }, "dependencies": [ @@ -5535,6 +5600,7 @@ "description": "Provides kubectl executables.", "display_name": "kubectl (Platform Specific)" }, + "gdu_only": true, "id": "kubectl-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -5549,8 +5615,8 @@ }, "platform_required": true, "version": { - "build_number": 20240624182041, - "version_string": "1.27.15" + "build_number": 20240906153039, + "version_string": "1.29.8" } }, { @@ -5565,6 +5631,7 @@ "description": "Configure kubectl with OIDC credentials for GKE clusters.", "display_name": "kubectl-oidc" }, + "gdu_only": false, "id": "kubectl-oidc", "is_configuration": false, "is_hidden": false, @@ -5601,6 +5668,7 @@ "description": "Configure kubectl with OIDC credentials for GKE clusters.", "display_name": "kubectl-oidc (Platform Specific)" }, + "gdu_only": false, "id": "kubectl-oidc-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -5634,6 +5702,7 @@ "description": "Configure kubectl with OIDC credentials for GKE clusters.", "display_name": "kubectl-oidc (Platform Specific)" }, + "gdu_only": false, "id": "kubectl-oidc-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -5667,6 +5736,7 @@ "description": "Configure kubectl with OIDC credentials for GKE clusters.", "display_name": "kubectl-oidc (Platform Specific)" }, + "gdu_only": false, "id": "kubectl-oidc-linux-arm", "is_configuration": false, "is_hidden": true, @@ -5700,6 +5770,7 @@ "description": "Configure kubectl with OIDC credentials for GKE clusters.", "display_name": "kubectl-oidc (Platform Specific)" }, + "gdu_only": false, "id": "kubectl-oidc-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -5733,6 +5804,7 @@ "description": "Configure kubectl with OIDC credentials for GKE clusters.", "display_name": "kubectl-oidc (Platform Specific)" }, + "gdu_only": false, "id": "kubectl-oidc-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -5753,10 +5825,10 @@ }, { "data": { - "checksum": "391b6fb5860780874a4b6c5c2443c047c43b99aa451347184c2c0bad1bb097b8", - "contents_checksum": "38c0ad032e37fd6ea90f5ab1eeaba408719851d3e4cf84927d039d60071c304f", - "size": 74873955, - "source": "components/google-cloud-sdk-kubectl-windows-x86-20240624182041.tar.gz", + "checksum": "c552401d07580f144bb88cf124efef640952bd0d3b999268bef4b51b60ce2a72", + "contents_checksum": "97784429e8310675e3646fcc8ee828e5acccdc6e91ab41ad8266367afc8abb2d", + "size": 91686040, + "source": "components/google-cloud-sdk-kubectl-windows-x86-20240906153039.tar.gz", "type": "tar" }, "dependencies": [ @@ -5767,6 +5839,7 @@ "description": "Provides kubectl executables.", "display_name": "kubectl (Platform Specific)" }, + "gdu_only": true, "id": "kubectl-windows-x86", "is_configuration": false, "is_hidden": true, @@ -5783,16 +5856,16 @@ }, "platform_required": true, "version": { - "build_number": 20240624182041, - "version_string": "1.27.15" + "build_number": 20240906153039, + "version_string": "1.29.8" } }, { "data": { - "checksum": "6fccb2f163c0d27639adccf8671ca76103759337f6b6954a809fef0262c6d1e2", - "contents_checksum": "86d9c6193f04f54bea5e57823e44a36a76034597560c1631b74b2a3730b257c9", - "size": 78995215, - "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20240624182041.tar.gz", + "checksum": "9f671bbf981cea2e789521bd9f1b961da83faa15cd1e8de48df71677c57c62cd", + "contents_checksum": "d621d95d0ca9c2a129921bfed462fe23673d13582d1215428c6fe3b5220899e2", + "size": 97077963, + "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20240906153039.tar.gz", "type": "tar" }, "dependencies": [ @@ -5803,6 +5876,7 @@ "description": "Provides kubectl executables.", "display_name": "kubectl (Platform Specific)" }, + "gdu_only": true, "id": "kubectl-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -5819,8 +5893,8 @@ }, "platform_required": true, "version": { - "build_number": 20240624182041, - "version_string": "1.27.15" + "build_number": 20240906153039, + "version_string": "1.29.8" } }, { @@ -5834,6 +5908,7 @@ "description": "Provides kustomize executable.", "display_name": "Kustomize" }, + "gdu_only": true, "id": "kustomize", "is_configuration": false, "is_hidden": false, @@ -5869,6 +5944,7 @@ "description": "Provides kustomize executable.", "display_name": "Kustomize (Platform Specific)" }, + "gdu_only": true, "id": "kustomize-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -5902,6 +5978,7 @@ "description": "Provides kustomize executable.", "display_name": "Kustomize (Platform Specific)" }, + "gdu_only": true, "id": "kustomize-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -5935,6 +6012,7 @@ "description": "Provides kustomize executable.", "display_name": "Kustomize (Platform Specific)" }, + "gdu_only": true, "id": "kustomize-linux-arm", "is_configuration": false, "is_hidden": true, @@ -5968,6 +6046,7 @@ "description": "Provides kustomize executable.", "display_name": "Kustomize (Platform Specific)" }, + "gdu_only": true, "id": "kustomize-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -5997,6 +6076,7 @@ "description": "Locally extract packages/versions from a container image.", "display_name": "On-Demand Scanning API extraction helper" }, + "gdu_only": false, "id": "local-extract", "is_configuration": false, "is_hidden": false, @@ -6014,15 +6094,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.5.9" + "version_string": "1.5.10" } }, { "data": { - "checksum": "da75d4bc8029de5f57c456d46850b526fb40c6b5ce5c39a5f6838a62a5d62b6d", - "contents_checksum": "244bace62dc969078d250aa556781b4a001ab9c2c07e2059b5cb9b89b6335355", - "size": 14360355, - "source": "components/google-cloud-sdk-local-extract-darwin-arm-20230811080439.tar.gz", + "checksum": "c8799272d05b6ce12c720930ef36d31d39614fd67d7cf3941ddf4a12728e403a", + "contents_checksum": "cc395271db8f50967615252a23c4e4048b6b212deef3107a426a929a871a56b0", + "size": 20826459, + "source": "components/google-cloud-sdk-local-extract-darwin-arm-20240806142304.tar.gz", "type": "tar" }, "dependencies": [ @@ -6032,6 +6112,7 @@ "description": "Locally extract packages/versions from a container image.", "display_name": "On-Demand Scanning API extraction helper (Platform Specific)" }, + "gdu_only": false, "id": "local-extract-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -6046,16 +6127,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "1.5.9" + "build_number": 20240806142304, + "version_string": "1.5.10" } }, { "data": { - "checksum": "9ca57a302a039eb4eed4154d51750d2377bf1632540e098bc8c961668f671c51", - "contents_checksum": "67b9d72612c32ef0e106f4195e2b0f9b176c8d27ba3f70f5cbad8bdb3699742b", - "size": 14810125, - "source": "components/google-cloud-sdk-local-extract-darwin-x86_64-20230811080439.tar.gz", + "checksum": "a4691be369a9934a6bb931dcac1960e29f0cd90c151e5217dc6418d1265d87ba", + "contents_checksum": "0683c4693a7a0247162b974d10a918730d0f29335b43a3f2517e3dde3903d38c", + "size": 22218924, + "source": "components/google-cloud-sdk-local-extract-darwin-x86_64-20240806142304.tar.gz", "type": "tar" }, "dependencies": [ @@ -6065,6 +6146,7 @@ "description": "Locally extract packages/versions from a container image.", "display_name": "On-Demand Scanning API extraction helper (Platform Specific)" }, + "gdu_only": false, "id": "local-extract-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -6079,16 +6161,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "1.5.9" + "build_number": 20240806142304, + "version_string": "1.5.10" } }, { "data": { - "checksum": "e56993257f15b873e140f378521b91d502b81da666cbe19e3c7462db6c890341", - "contents_checksum": "7e86ea8bb9426bf5387982bfaa08889171b2ed43eafa4784031c254d665fd6b5", - "size": 14144939, - "source": "components/google-cloud-sdk-local-extract-linux-arm-20230811080439.tar.gz", + "checksum": "6276cfd32895ac4c35f74b4de91a0db22d2e00895ee1845ea5e0aacf261d3c8e", + "contents_checksum": "e9e37b4e1c05b9ba02e5b4c753fa0d62d0ae0687476ec673d8bcf4ecacd2ff1e", + "size": 24267243, + "source": "components/google-cloud-sdk-local-extract-linux-arm-20240806142304.tar.gz", "type": "tar" }, "dependencies": [ @@ -6098,6 +6180,7 @@ "description": "Locally extract packages/versions from a container image.", "display_name": "On-Demand Scanning API extraction helper (Platform Specific)" }, + "gdu_only": false, "id": "local-extract-linux-arm", "is_configuration": false, "is_hidden": true, @@ -6112,16 +6195,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "1.5.9" + "build_number": 20240806142304, + "version_string": "1.5.10" } }, { "data": { - "checksum": "5306d5786c058f82802cd764703b5a4b017da3fab1576dcde2ba9431fe7fbdd7", - "contents_checksum": "2d0fdc7c90af3a3e2a94685041a74e5c99f0c9010954f8ea18522d868e47a0cf", - "size": 15052723, - "source": "components/google-cloud-sdk-local-extract-linux-x86_64-20230811080439.tar.gz", + "checksum": "7b24b0e38088808f36a3816002a0c64f2f324e3e52ee0a15f3dba6a5be9e2365", + "contents_checksum": "338812d02a01b26ed57d789dd8e03c406f031939fa7f99813e285340ad6bb950", + "size": 25822714, + "source": "components/google-cloud-sdk-local-extract-linux-x86_64-20240806142304.tar.gz", "type": "tar" }, "dependencies": [ @@ -6131,6 +6214,7 @@ "description": "Locally extract packages/versions from a container image.", "display_name": "On-Demand Scanning API extraction helper (Platform Specific)" }, + "gdu_only": false, "id": "local-extract-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -6145,8 +6229,8 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "1.5.9" + "build_number": 20240806142304, + "version_string": "1.5.10" } }, { @@ -6161,6 +6245,7 @@ "description": "Provides log streaming services.", "display_name": "Log Streaming" }, + "gdu_only": false, "id": "log-streaming", "is_configuration": false, "is_hidden": false, @@ -6197,6 +6282,7 @@ "description": "Provides log streaming services.", "display_name": "Log Streaming (Platform Specific)" }, + "gdu_only": false, "id": "log-streaming-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -6230,6 +6316,7 @@ "description": "Provides log streaming services.", "display_name": "Log Streaming (Platform Specific)" }, + "gdu_only": false, "id": "log-streaming-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -6263,6 +6350,7 @@ "description": "Provides log streaming services.", "display_name": "Log Streaming (Platform Specific)" }, + "gdu_only": false, "id": "log-streaming-linux-arm", "is_configuration": false, "is_hidden": true, @@ -6296,6 +6384,7 @@ "description": "Provides log streaming services.", "display_name": "Log Streaming (Platform Specific)" }, + "gdu_only": false, "id": "log-streaming-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -6329,6 +6418,7 @@ "description": "Provides log streaming services.", "display_name": "Log Streaming (Platform Specific)" }, + "gdu_only": false, "id": "log-streaming-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -6347,6 +6437,33 @@ "version_string": "0.3.0" } }, + { + "data": { + "checksum": "a90c53d83dfe10216d0aaa6ba234d028eee0fa6959ef8e0fb4c432b358b52ef3", + "contents_checksum": "c37e9989bc839d2ca0714d1c78a19832f22b57c999f4c9afcc08a52cb472e833", + "size": 401984160, + "source": "components/google-cloud-sdk-managed-flink-client-20240913204132.tar.gz", + "type": "tar" + }, + "dependencies": [ + "core" + ], + "details": { + "description": "Provides the Managed Flink Client.", + "display_name": "Managed Flink Client" + }, + "gdu_only": false, + "id": "managed-flink-client", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": {}, + "platform_required": false, + "version": { + "build_number": 20240913204132, + "version_string": "0.5.1" + } + }, { "dependencies": [ "minikube-darwin-arm", @@ -6359,6 +6476,7 @@ "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/", "display_name": "Minikube" }, + "gdu_only": false, "id": "minikube", "is_configuration": false, "is_hidden": false, @@ -6395,6 +6513,7 @@ "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/", "display_name": "Minikube (Platform Specific)" }, + "gdu_only": false, "id": "minikube-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -6428,6 +6547,7 @@ "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/", "display_name": "Minikube (Platform Specific)" }, + "gdu_only": false, "id": "minikube-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -6461,6 +6581,7 @@ "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/", "display_name": "Minikube (Platform Specific)" }, + "gdu_only": false, "id": "minikube-linux-arm", "is_configuration": false, "is_hidden": true, @@ -6494,6 +6615,7 @@ "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/", "display_name": "Minikube (Platform Specific)" }, + "gdu_only": false, "id": "minikube-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -6527,6 +6649,7 @@ "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/", "display_name": "Minikube (Platform Specific)" }, + "gdu_only": false, "id": "minikube-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -6554,6 +6677,7 @@ "description": "Provides nomos executable.", "display_name": "Nomos CLI" }, + "gdu_only": false, "id": "nomos", "is_configuration": false, "is_hidden": false, @@ -6570,15 +6694,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.18.2-rc.2" + "version_string": "1.19.0-rc.2" } }, { "data": { - "checksum": "78bfc25756970074fa09b214f9d924f9cf698fe5a0d44e2853f40e5cafb25275", - "contents_checksum": "93404e52e62716c64c088035390ded4d5ea12e3328ed319b1ca18b67ad88880e", - "size": 31591559, - "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20240628141907.tar.gz", + "checksum": "7205bfba3075a21470186c514f6c50cb23f11f103bf183ec2b1f464d368bf4a6", + "contents_checksum": "661eae8fea9a42c5349bb1f854152826ac92ee3417cf3bc93be1bd0cf73c5397", + "size": 32860717, + "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -6588,6 +6712,7 @@ "description": "Provides nomos executable.", "display_name": "Nomos CLI (Platform Specific)" }, + "gdu_only": false, "id": "nomos-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -6602,16 +6727,16 @@ }, "platform_required": false, "version": { - "build_number": 20240628141907, - "version_string": "1.18.2-rc.2" + "build_number": 20240830134514, + "version_string": "1.19.0-rc.2" } }, { "data": { - "checksum": "7fe7d46c755eb5a94df3d7c0031a0ab3b6b95124c6120be0b832c16047685db5", - "contents_checksum": "85aab3cdb4ff4c6112b285a57f69b59a3b88663e167e5de19e0d16b0b3e14123", - "size": 31771575, - "source": "components/google-cloud-sdk-nomos-linux-x86_64-20240628141907.tar.gz", + "checksum": "2cf330716594c16056ac1ec05ab35332916246049deac4a3f1ecfbc79372a5c0", + "contents_checksum": "caf842840469999dbaa20826097e49cb99f1361c8f626442f0a5c5cc049dc3d4", + "size": 32725719, + "source": "components/google-cloud-sdk-nomos-linux-x86_64-20240830134514.tar.gz", "type": "tar" }, "dependencies": [ @@ -6621,6 +6746,7 @@ "description": "Provides nomos executable.", "display_name": "Nomos CLI (Platform Specific)" }, + "gdu_only": false, "id": "nomos-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -6635,8 +6761,8 @@ }, "platform_required": false, "version": { - "build_number": 20240628141907, - "version_string": "1.18.2-rc.2" + "build_number": 20240830134514, + "version_string": "1.19.0-rc.2" } }, { @@ -6651,6 +6777,7 @@ "description": "Package a Go module zip file from Go source code.", "display_name": "Artifact Registry Go Module Package Helper" }, + "gdu_only": false, "id": "package-go-module", "is_configuration": false, "is_hidden": false, @@ -6687,6 +6814,7 @@ "description": "Package a Go module zip file from Go source code.", "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)" }, + "gdu_only": false, "id": "package-go-module-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -6720,6 +6848,7 @@ "description": "Package a Go module zip file from Go source code.", "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)" }, + "gdu_only": false, "id": "package-go-module-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -6753,6 +6882,7 @@ "description": "Package a Go module zip file from Go source code.", "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)" }, + "gdu_only": false, "id": "package-go-module-linux-arm", "is_configuration": false, "is_hidden": true, @@ -6786,6 +6916,7 @@ "description": "Package a Go module zip file from Go source code.", "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)" }, + "gdu_only": false, "id": "package-go-module-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -6819,6 +6950,7 @@ "description": "Package a Go module zip file from Go source code.", "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)" }, + "gdu_only": false, "id": "package-go-module-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -6848,6 +6980,7 @@ "description": "Kubernetes Resource Model (KRM) package management tools utilites & commands.", "display_name": "pkg" }, + "gdu_only": true, "id": "pkg", "is_configuration": false, "is_hidden": false, @@ -6868,6 +7001,7 @@ "description": "PowerShell cmdlets for the Google Cloud Platform.", "display_name": "Cloud Tools for PowerShell" }, + "gdu_only": true, "id": "powershell", "is_configuration": false, "is_hidden": true, @@ -6899,6 +7033,7 @@ "description": "PowerShell cmdlets for the Google Cloud Platform.", "display_name": "Cloud Tools for PowerShell (Platform Specific)" }, + "gdu_only": true, "id": "powershell-windows", "is_configuration": false, "is_hidden": true, @@ -6929,6 +7064,7 @@ "description": "Provides the Pub/Sub emulator.", "display_name": "Cloud Pub/Sub Emulator" }, + "gdu_only": false, "id": "pubsub-emulator", "is_configuration": false, "is_hidden": false, @@ -6953,6 +7089,7 @@ "description": "Provides skaffold executable. See https://skaffold.dev/", "display_name": "Skaffold" }, + "gdu_only": true, "id": "skaffold", "is_configuration": false, "is_hidden": false, @@ -6971,15 +7108,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "2.11.1" + "version_string": "2.13.1" } }, { "data": { - "checksum": "53c4ab91c11e5cbd68568f8599906e6e5192f3b4019e9761fddfdc45f9af7845", - "contents_checksum": "d24345e52dde87a54de371fe79441dd90afe4fe3079bebce79c4f7043f8ac506", - "size": 23881902, - "source": "components/google-cloud-sdk-skaffold-darwin-arm-20240412130805.tar.gz", + "checksum": "7a338bc422bbf435ff4fbd8a769bc35e47ae26194f3dc652ba4ee2728429b3aa", + "contents_checksum": "b61a508672f19d73c913cf3973d0bafbd7fa56a6cef5a807742ba584b57264ba", + "size": 24031362, + "source": "components/google-cloud-sdk-skaffold-darwin-arm-20240806142304.tar.gz", "type": "tar" }, "dependencies": [ @@ -6990,6 +7127,7 @@ "description": "Provides skaffold executable. See https://skaffold.dev/", "display_name": "Skaffold (Platform Specific)" }, + "gdu_only": true, "id": "skaffold-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -7004,16 +7142,16 @@ }, "platform_required": false, "version": { - "build_number": 20240412130805, - "version_string": "2.11.1" + "build_number": 20240806142304, + "version_string": "2.13.1" } }, { "data": { - "checksum": "b7dcae5f81e8a66ecf964d9a7e6c009be0be26770daa64470c344a0824a70d6c", - "contents_checksum": "a1845e050a4fc99ce6bd24c4c8e30e9c7fe0baa7ca6d89ade4a9ac945a1335fd", - "size": 26019391, - "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20240412130805.tar.gz", + "checksum": "2e12912b0b0528a9c409c5a7a811eb01a84ffccacc16e9fea55e837e73d6cf18", + "contents_checksum": "fd07e94d1480dc716155bb69e4246955269238a63402a8b949341e9de6266d4a", + "size": 26180225, + "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20240806142304.tar.gz", "type": "tar" }, "dependencies": [ @@ -7024,6 +7162,7 @@ "description": "Provides skaffold executable. See https://skaffold.dev/", "display_name": "Skaffold (Platform Specific)" }, + "gdu_only": true, "id": "skaffold-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -7038,16 +7177,16 @@ }, "platform_required": false, "version": { - "build_number": 20240412130805, - "version_string": "2.11.1" + "build_number": 20240806142304, + "version_string": "2.13.1" } }, { "data": { - "checksum": "0f285235cc2840a8e62d5e8591015c709287ebf01bd8f95b204a5b4d4b019b2a", - "contents_checksum": "061859c0ad969a5cb9a3bcd0b34760963c8c842b9902f9b22e97df4e94ff7a65", - "size": 23133354, - "source": "components/google-cloud-sdk-skaffold-linux-arm-20240412130805.tar.gz", + "checksum": "afe03c599a2c8d0767c94c13a3ff21dc142181e6def87956e9c0633a065424b2", + "contents_checksum": "6da2c1a02fc63d511f51caeac0c75559038a818fad104dd62848b50637033f50", + "size": 23278809, + "source": "components/google-cloud-sdk-skaffold-linux-arm-20240806142304.tar.gz", "type": "tar" }, "dependencies": [ @@ -7058,6 +7197,7 @@ "description": "Provides skaffold executable. See https://skaffold.dev/", "display_name": "Skaffold (Platform Specific)" }, + "gdu_only": true, "id": "skaffold-linux-arm", "is_configuration": false, "is_hidden": true, @@ -7072,16 +7212,16 @@ }, "platform_required": false, "version": { - "build_number": 20240412130805, - "version_string": "2.11.1" + "build_number": 20240806142304, + "version_string": "2.13.1" } }, { "data": { - "checksum": "3e7164c21840917c2f565998cdbd20be3972ba5cc09ddad31f01cbd0233c34f6", - "contents_checksum": "99c37298757f59403dc8b7b080419ccb62bdb23fb88f559bd31b603cb9a2b4d6", - "size": 25252692, - "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20240412130805.tar.gz", + "checksum": "700eb9d7d19b3e7a7113dfb591ede160f34f680886bcc9a0dff9e05a8a87e833", + "contents_checksum": "32f596987708c2f1a815df44988c164e7166367a793a893c15bb9b40f8e9a7fd", + "size": 25410249, + "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20240806142304.tar.gz", "type": "tar" }, "dependencies": [ @@ -7092,6 +7232,7 @@ "description": "Provides skaffold executable. See https://skaffold.dev/", "display_name": "Skaffold (Platform Specific)" }, + "gdu_only": true, "id": "skaffold-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -7106,16 +7247,16 @@ }, "platform_required": false, "version": { - "build_number": 20240412130805, - "version_string": "2.11.1" + "build_number": 20240806142304, + "version_string": "2.13.1" } }, { "data": { - "checksum": "8f864d4189e19ce50bcb52ba61802d70e4e83bb18b13ff32ded5086a7c867fe5", - "contents_checksum": "c340681db503b83f07f4ac5ea4f00c4c8db288eaaf6e19ddf6e4b52c29d13e48", - "size": 25741614, - "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20240412130805.tar.gz", + "checksum": "ae5c5bc9cb9867c6ff8b6692e24c67114635c9a0d6b79c21be7b29bf7568dc37", + "contents_checksum": "e5187da844977624d9662c4c9880f818fa464b72bdc5635b073f8ed4f21e715b", + "size": 25902993, + "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20240806142304.tar.gz", "type": "tar" }, "dependencies": [ @@ -7126,6 +7267,7 @@ "description": "Provides skaffold executable. See https://skaffold.dev/", "display_name": "Skaffold (Platform Specific)" }, + "gdu_only": true, "id": "skaffold-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -7140,8 +7282,8 @@ }, "platform_required": false, "version": { - "build_number": 20240412130805, - "version_string": "2.11.1" + "build_number": 20240806142304, + "version_string": "2.13.1" } }, { @@ -7152,6 +7294,7 @@ "description": "Performs database migrations to Cloud Spanner databases.", "display_name": "Spanner migration tool" }, + "gdu_only": true, "id": "spanner-migration-tool", "is_configuration": false, "is_hidden": false, @@ -7167,15 +7310,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "3.2.5" + "version_string": "3.4.0" } }, { "data": { - "checksum": "85b90a0016541d6aae62795404aacc7088e0b1701e9f57493bdb4f29c5210fc5", - "contents_checksum": "a5b9958d7ad96d243c7fd5d67ec93d8a4b8a62b668435c18d25b9ce4eb72e185", - "size": 24696653, - "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20240517151541.tar.gz", + "checksum": "c8a78c4159e296efc6e314c0850d114a16d3b2c96eb469ffabb88433399abbdc", + "contents_checksum": "a8df1dea184fd979baf978cc05b811f95a46e852e27163f472f26328a331ceb0", + "size": 25645658, + "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20240806142304.tar.gz", "type": "tar" }, "dependencies": [ @@ -7185,6 +7328,7 @@ "description": "Performs database migrations to Cloud Spanner databases.", "display_name": "Spanner migration tool (Platform Specific)" }, + "gdu_only": true, "id": "spanner-migration-tool-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -7199,8 +7343,8 @@ }, "platform_required": false, "version": { - "build_number": 20240517151541, - "version_string": "3.2.5" + "build_number": 20240806142304, + "version_string": "3.4.0" } }, { @@ -7211,6 +7355,7 @@ "description": "Provides Windows command line ssh tools.", "display_name": "Windows command line ssh tools" }, + "gdu_only": false, "id": "ssh-tools", "is_configuration": false, "is_hidden": true, @@ -7241,6 +7386,7 @@ "description": "Provides Windows command line ssh tools.", "display_name": "Windows command line ssh tools (Platform Specific)" }, + "gdu_only": false, "id": "ssh-tools-windows", "is_configuration": false, "is_hidden": true, @@ -7268,6 +7414,7 @@ "description": "Tools for working with Terraform data", "display_name": "Terraform Tools" }, + "gdu_only": false, "id": "terraform-tools", "is_configuration": false, "is_hidden": false, @@ -7304,6 +7451,7 @@ "description": "Tools for working with Terraform data", "display_name": "Terraform Tools (Platform Specific)" }, + "gdu_only": false, "id": "terraform-tools-darwin-arm", "is_configuration": false, "is_hidden": true, @@ -7337,6 +7485,7 @@ "description": "Tools for working with Terraform data", "display_name": "Terraform Tools (Platform Specific)" }, + "gdu_only": false, "id": "terraform-tools-darwin-x86_64", "is_configuration": false, "is_hidden": true, @@ -7370,6 +7519,7 @@ "description": "Tools for working with Terraform data", "display_name": "Terraform Tools (Platform Specific)" }, + "gdu_only": false, "id": "terraform-tools-linux-arm", "is_configuration": false, "is_hidden": true, @@ -7403,6 +7553,7 @@ "description": "Tools for working with Terraform data", "display_name": "Terraform Tools (Platform Specific)" }, + "gdu_only": false, "id": "terraform-tools-linux-x86_64", "is_configuration": false, "is_hidden": true, @@ -7436,6 +7587,7 @@ "description": "Tools for working with Terraform data", "display_name": "Terraform Tools (Platform Specific)" }, + "gdu_only": false, "id": "terraform-tools-windows-x86_64", "is_configuration": false, "is_hidden": true, @@ -7456,10 +7608,10 @@ }, { "data": { - "checksum": "ed0feffc4e67046a2d15e3f524dc4f7c7278eaf571e06e38031842b357b55879", - "contents_checksum": "67a9405c609b6bc0567cfb517d77d2e591a801d3dc482824190fc1ca4f8643cb", - "size": 57601363, - "source": "components/google-cloud-sdk-tests-20240719191136.tar.gz", + "checksum": "a4bb42ec496f935b19acf4e5e4b48260dcf428c6909cd4a2c948cfd763c0e0e6", + "contents_checksum": "8814c920e3ceee53b2dd6dc5e3d727e519273bf2a58663c11e51fb48e53fc23d", + "size": 58197479, + "source": "components/google-cloud-sdk-tests-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -7469,6 +7621,7 @@ "description": "Collection of tests used to verity Google Cloud CLI", "display_name": "Google Cloud CLI tests" }, + "gdu_only": true, "id": "tests", "is_configuration": false, "is_hidden": true, @@ -7476,8 +7629,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240719191136, - "version_string": "2024.07.19" + "build_number": 20240920144119, + "version_string": "2024.09.20" } } ], @@ -7496,11 +7649,11 @@ ], "post_processing_command": "components post-process", "release_notes_url": "RELEASE_NOTES", - "revision": 20240719191136, + "revision": 20240920144119, "schema_version": { "no_update": false, "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz", "version": 3 }, - "version": "485.0.0" + "version": "494.0.0" } diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index f63b5049e2015..c337112762b64 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -164,7 +164,7 @@ let nativeBuildInputs = [ python3 stdenv.cc.cc - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index 04713f6ae3953..428685fa4347b 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "485.0.0"; + version = "494.0.0"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-linux-x86_64.tar.gz"; - sha256 = "17y6gbn0qnmrmawijg9l3kgygd8mbg57rgf5fcx05x57m7jy07v7"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-494.0.0-linux-x86_64.tar.gz"; + sha256 = "0liyi2r1zgzjkfyjdfs5q7gjv31q2invxxh6j8bw8q2khy0varyp"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-darwin-x86_64.tar.gz"; - sha256 = "0zh6z567dm6a75xi8mz724xg7xw9n7xzp3kbaj01qmvwmri7rahi"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-494.0.0-darwin-x86_64.tar.gz"; + sha256 = "0dpy85b3c2rd3ndwaczxdm4kdjdx1hz7xwva590j2jbabrx0shqz"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-linux-arm.tar.gz"; - sha256 = "0mw80qs8qzjyjlbirqzpc9r22dv5m6i90v3p016na4w4hgc15v33"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-494.0.0-linux-arm.tar.gz"; + sha256 = "0nzb1wzcqds72s5fam9wzzq8y2bs247ihkv8lib4i2652ampxfp8"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-darwin-arm.tar.gz"; - sha256 = "1x6s521iad1mzi7af0874qh421ldyxc1dd3952ayxi2zm8misg63"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-494.0.0-darwin-arm.tar.gz"; + sha256 = "026qgsah4nhr17kh1gb2ldwi8far38ai8lq0c274vkq4h7pfxjir"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-linux-x86.tar.gz"; - sha256 = "05b9lg3gnqknx8y5smz2msr61803zib827283bsf7zmmr7bnignh"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-494.0.0-linux-x86.tar.gz"; + sha256 = "1nyx7ikarb8c08p4nshdyv0qj0rs0d1hhhpxrc96cmwp76jvhg0n"; }; }; } diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 80087bf65a5ec..2064022d80c56 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -49,8 +49,8 @@ in stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/google-cloud-sdk - if [ -d .install/platform/bundledpythonunix ]; then - rm -r .install/platform/bundledpythonunix + if [ -d platform/bundledpythonunix ]; then + rm -r platform/bundledpythonunix fi cp -R * .install $out/google-cloud-sdk/ diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix deleted file mode 100644 index b5de7a2160c0c..0000000000000 --- a/pkgs/tools/admin/granted/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ bash -, buildGoModule -, fetchFromGitHub - -, withFish ? false -, fish - -, lib -, makeWrapper -, xdg-utils -}: - -buildGoModule rec { - pname = "granted"; - version = "0.32.0"; - - src = fetchFromGitHub { - owner = "common-fate"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-CagRgAStanLD7JnH1L4zAhxD56dpgqUR31DICaklWRE="; - }; - - vendorHash = "sha256-iGYAjbWQ8w60NZeMCVydltQLuwxOI74VxLltYIJ37K8="; - - nativeBuildInputs = [ makeWrapper ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/common-fate/granted/internal/build.Version=v${version}" - "-X github.com/common-fate/granted/internal/build.Commit=${src.rev}" - "-X github.com/common-fate/granted/internal/build.Date=1970-01-01-00:00:01" - "-X github.com/common-fate/granted/internal/build.BuiltBy=Nix" - ]; - - subPackages = [ - "cmd/granted" - ]; - - postInstall = '' - ln -s $out/bin/granted $out/bin/assumego - - # Install shell script - install -Dm755 $src/scripts/assume $out/bin/assume - substituteInPlace $out/bin/assume \ - --replace /bin/bash ${bash}/bin/bash - - wrapProgram $out/bin/assume \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} - - '' + lib.optionalString withFish '' - # Install fish script - install -Dm755 $src/scripts/assume.fish $out/share/assume.fish - substituteInPlace $out/share/assume.fish \ - --replace /bin/fish ${fish}/bin/fish - ''; - - meta = with lib; { - description = "Easiest way to access your cloud"; - homepage = "https://github.com/common-fate/granted"; - changelog = "https://github.com/common-fate/granted/releases/tag/${version}"; - license = licenses.mit; - maintainers = [ maintainers.ivankovnatsky ]; - }; -} diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 704bdf84e07c7..6ffed3604c642 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -9,7 +9,7 @@ , glib , pkg-config , cyrus_sasl -, pulseaudioSupport ? stdenv.isLinux +, pulseaudioSupport ? stdenv.hostPlatform.isLinux , libpulseaudio , libgcrypt , gtk3 diff --git a/pkgs/tools/admin/ibmcloud-cli/default.nix b/pkgs/tools/admin/ibmcloud-cli/default.nix index 9df1c4da54c6e..f6254f984a0c5 100644 --- a/pkgs/tools/admin/ibmcloud-cli/default.nix +++ b/pkgs/tools/admin/ibmcloud-cli/default.nix @@ -16,18 +16,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ibmcloud-cli"; - version = "2.17.0"; + version = "2.27.0"; src = fetchurl { url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz"; sha256 = { - "x86_64-darwin" = "18f0dylgwwn9p1jmchqhq061s435n85qr2872i532whbrziwwjf3"; - "aarch64-darwin" = "1rid6rv601z4ayd3yi5srqbfn5bspypxarikvm563ygxawh1bxyi"; - "x86_64-linux" = "0ry8ix5id2zk04w9d9581g127f9jpj7bwg3x0pk3n9yfwn61g96d"; - "aarch64-linux" = "0s5jaqhyl234670q1mg89in2g5b9w3gzvnzl8qmlmgqkaxvzxj94"; - "i686-linux" = "0iw8y7iy9yx7y8v8b2wfl24f2rv9r20yj7l4sislxspfyvqv54p2"; - "powerpc64le-linux" = "19ac0na163l9h7ygbf3jwwv7zf0wagqvn6kcdh871c690i86wg9z"; - "s390x-linux" = "1zvy28jpxijzgdbr9q4rfyx6mk295mqp4nk8z299nm9ryk4q81lv"; + "x86_64-darwin" = "0af5f110e094e7bf710c86d1e35af23ebbbc9ad8a4baf2a67895354b415618f6"; + "aarch64-darwin" = "1175977597102282cf7c1fd017ec4bdbc041ce367360204852d0798846cd21e4"; + "x86_64-linux" = "3c024bcb27519c8ed916ebc0266248249c127bbe93c343807e07d707cf159bb1"; + "aarch64-linux" = "bd2a6a3c4428061f17ac8b801b27d9700bf333284294e2834c34b4237f530256"; + "i686-linux" = "40dc32b2a76541847fd55b5b587105c90956468baf14016e4628bb8a2a3d73fa"; + "powerpc64le-linux" = "e758a60d7de32f4dfc8c944edb8e45bbed41de2fcb1e12bcf6b4e2b35d09f9d5"; + "s390x-linux" = "dbee26a3c4be2dcaad28b110e309283c141d55ac923b9d0420ac62b25c8eb9c0"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 6db54ce509494..205e439c22713 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kics"; - version = "2.0.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - hash = "sha256-4WYrKWkcf7AJjogWQcNsIZiCfxf4CmhLW/GJFUWfQzw="; + hash = "sha256-UTDqsTW/niTvSTYInM5UD9f7RU3f5R4etuLvoTmNn/M="; }; - vendorHash = "sha256-N3MJhuzMJW40aMrAyuBsNciwZaNq0K4IUd+0re17AOI="; + vendorHash = "sha256-nUNpiXta+Om0Lmd9z0uaCctv2uBrPDsZ1fhHcd8sSWs="; subPackages = [ "cmd/console" ]; @@ -26,8 +26,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/Checkmarx/kics/internal/constant.SCMCommits=${version}" - "-X github.com/Checkmarx/kics/internal/constants.Version=${version}" + "-X github.com/Checkmarx/kics/v2/internal/constants.SCMCommit=${version}" + "-X github.com/Checkmarx/kics/v2/internal/constants.Version=${version}" ]; passthru.tests.version = testers.testVersion { diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 739b0c0e599a0..0af400ca4e2c2 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -7,11 +7,11 @@ }: yarn2nix-moretea.mkYarnPackage { - version = "1.1.27"; + version = "1.1.32"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.27.tgz"; - sha256 = "1m9wsny6b2lwis2ppalmc9qzn3b8pblgv1cszqbaywb835ll516g"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.32.tgz"; + sha256 = "1faf1f4rkk3164fhh3bp6h4sbkgaq1x8swdsvnhwy0fqckzkcwms"; }; patches = [ ./fix-js-include-paths.patch ]; @@ -21,7 +21,7 @@ yarn2nix-moretea.mkYarnPackage { offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; - hash = "sha256-XQTHIFMxtb4G7gkksAU/oHajdNf0McFbubumW/8Gn1w="; + hash = "sha256-e+qzA0u4OywlcHpxLnoZQc2h35M65/GKu8mYs6+1I5c="; }; # Tarball has CRLF line endings. This makes patching difficult, so let's convert them. diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index 2c67dd423f662..1ad815be53304 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "1.1.27", + "version": "1.1.32", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -38,14 +38,14 @@ ], "dependencies": { "@yetzt/nedb": "1.8.0", - "archiver": "7.0.0", - "body-parser": "1.20.2", + "archiver": "7.0.1", + "body-parser": "1.20.3", "cbor": "5.2.0", "compression": "1.7.4", "cookie-session": "2.0.0", - "express": "4.19.2", - "express-handlebars": "5.3.5", - "express-ws": "4.0.0", + "express": "4.21.0", + "express-handlebars": "7.1.3", + "express-ws": "5.0.2", "ipcheck": "0.1.0", "minimist": "1.2.8", "multiparty": "4.2.3", @@ -72,14 +72,14 @@ "jwt-simple": "*", "openid-client": "*", "passport-saml": "*", - "archiver": "7.0.0", - "body-parser": "1.20.2", + "archiver": "7.0.1", + "body-parser": "1.20.3", "cbor": "5.2.0", "compression": "1.7.4", "cookie-session": "2.0.0", - "express": "4.19.2", - "express-handlebars": "5.3.5", - "express-ws": "4.0.0", + "express": "4.21.0", + "express-handlebars": "7.1.3", + "express-ws": "5.0.2", "ipcheck": "0.1.0", "minimist": "1.2.8", "multiparty": "4.2.3", @@ -114,12 +114,12 @@ "@sendgrid/mail": "*", "jsdom": "22.1.0", "esprima": "4.0.1", - "minify-js": "0.0.4", "html-minifier": "4.0.0", "@crowdsec/express-bouncer": "0.1.0", - "archiver-zip-encrypted": "1.0.11", + "archiver-zip-encrypted": "2.0.0", "googleapis": "128.0.0", "webdav": "4.11.3", + "minio": "8.0.1", "wildleek": "2.0.0", "yubikeyotp": "0.2.0", "otplib": "10.2.3", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index 919276519650b..2a7306f602af0 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -48,409 +48,410 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.6.2" -"@aws-sdk/client-cognito-identity@3.620.1": - version "3.620.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.620.1.tgz#606b07e7a54b25104ffbbfeaa4a7b38650732f6b" - integrity sha512-AzFjmJz6FC3XvFUIFBe8v0mRT6+5l0Uv4WQz9n+b9v4jBF9QqbcFpTDTZLu0mO+tCxFVCRfMs22ekxzwhmRdnA== +"@aws-sdk/client-cognito-identity@3.658.1": + version "3.658.1" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.658.1.tgz#87f800883330c43d41426602dbe9b5149375743e" + integrity sha512-MCYLKmNy0FlNT9TvXfOxj0jh+ZQq+G9qEy/VZqu3JsQSgiFvFRdzgzcbQ9gQx7fZrDC/TPdABOTh483zI4cu9g== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/client-sso-oidc" "3.620.1" - "@aws-sdk/client-sts" "3.620.1" - "@aws-sdk/core" "3.620.1" - "@aws-sdk/credential-provider-node" "3.620.1" - "@aws-sdk/middleware-host-header" "3.620.0" - "@aws-sdk/middleware-logger" "3.609.0" - "@aws-sdk/middleware-recursion-detection" "3.620.0" - "@aws-sdk/middleware-user-agent" "3.620.0" - "@aws-sdk/region-config-resolver" "3.614.0" - "@aws-sdk/types" "3.609.0" - "@aws-sdk/util-endpoints" "3.614.0" - "@aws-sdk/util-user-agent-browser" "3.609.0" - "@aws-sdk/util-user-agent-node" "3.614.0" - "@smithy/config-resolver" "^3.0.5" - "@smithy/core" "^2.3.0" - "@smithy/fetch-http-handler" "^3.2.3" - "@smithy/hash-node" "^3.0.3" - "@smithy/invalid-dependency" "^3.0.3" - "@smithy/middleware-content-length" "^3.0.5" - "@smithy/middleware-endpoint" "^3.1.0" - "@smithy/middleware-retry" "^3.0.12" - "@smithy/middleware-serde" "^3.0.3" - "@smithy/middleware-stack" "^3.0.3" - "@smithy/node-config-provider" "^3.1.4" - "@smithy/node-http-handler" "^3.1.4" - "@smithy/protocol-http" "^4.1.0" - "@smithy/smithy-client" "^3.1.10" - "@smithy/types" "^3.3.0" - "@smithy/url-parser" "^3.0.3" + "@aws-sdk/client-sso-oidc" "3.658.1" + "@aws-sdk/client-sts" "3.658.1" + "@aws-sdk/core" "3.658.1" + "@aws-sdk/credential-provider-node" "3.658.1" + "@aws-sdk/middleware-host-header" "3.654.0" + "@aws-sdk/middleware-logger" "3.654.0" + "@aws-sdk/middleware-recursion-detection" "3.654.0" + "@aws-sdk/middleware-user-agent" "3.654.0" + "@aws-sdk/region-config-resolver" "3.654.0" + "@aws-sdk/types" "3.654.0" + "@aws-sdk/util-endpoints" "3.654.0" + "@aws-sdk/util-user-agent-browser" "3.654.0" + "@aws-sdk/util-user-agent-node" "3.654.0" + "@smithy/config-resolver" "^3.0.8" + "@smithy/core" "^2.4.6" + "@smithy/fetch-http-handler" "^3.2.8" + "@smithy/hash-node" "^3.0.6" + "@smithy/invalid-dependency" "^3.0.6" + "@smithy/middleware-content-length" "^3.0.8" + "@smithy/middleware-endpoint" "^3.1.3" + "@smithy/middleware-retry" "^3.0.21" + "@smithy/middleware-serde" "^3.0.6" + "@smithy/middleware-stack" "^3.0.6" + "@smithy/node-config-provider" "^3.1.7" + "@smithy/node-http-handler" "^3.2.3" + "@smithy/protocol-http" "^4.1.3" + "@smithy/smithy-client" "^3.3.5" + "@smithy/types" "^3.4.2" + "@smithy/url-parser" "^3.0.6" "@smithy/util-base64" "^3.0.0" "@smithy/util-body-length-browser" "^3.0.0" "@smithy/util-body-length-node" "^3.0.0" - "@smithy/util-defaults-mode-browser" "^3.0.12" - "@smithy/util-defaults-mode-node" "^3.0.12" - "@smithy/util-endpoints" "^2.0.5" - "@smithy/util-middleware" "^3.0.3" - "@smithy/util-retry" "^3.0.3" + "@smithy/util-defaults-mode-browser" "^3.0.21" + "@smithy/util-defaults-mode-node" "^3.0.21" + "@smithy/util-endpoints" "^2.1.2" + "@smithy/util-middleware" "^3.0.6" + "@smithy/util-retry" "^3.0.6" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@aws-sdk/client-sso-oidc@3.620.1": - version "3.620.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.620.1.tgz#d5e405d70edefd758e35df8d8dfb9aad5a81ccf0" - integrity sha512-gm69ttbkr7Kbg/Zzr3SczyLWkLgmK3bEZtkvbM/40ZW5ItYhDzJE48Ovs2lyA64h2YsOftDqqwcbJirAAdTgSg== +"@aws-sdk/client-sso-oidc@3.658.1": + version "3.658.1" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.658.1.tgz#67286348374146e80a0345064d101175730012ed" + integrity sha512-RGcZAI3qEA05JszPKwa0cAyp8rnS1nUvs0Sqw4hqLNQ1kD7b7V6CPjRXe7EFQqCOMvM4kGqx0+cEEVTOmBsFLw== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.620.1" - "@aws-sdk/credential-provider-node" "3.620.1" - "@aws-sdk/middleware-host-header" "3.620.0" - "@aws-sdk/middleware-logger" "3.609.0" - "@aws-sdk/middleware-recursion-detection" "3.620.0" - "@aws-sdk/middleware-user-agent" "3.620.0" - "@aws-sdk/region-config-resolver" "3.614.0" - "@aws-sdk/types" "3.609.0" - "@aws-sdk/util-endpoints" "3.614.0" - "@aws-sdk/util-user-agent-browser" "3.609.0" - "@aws-sdk/util-user-agent-node" "3.614.0" - "@smithy/config-resolver" "^3.0.5" - "@smithy/core" "^2.3.0" - "@smithy/fetch-http-handler" "^3.2.3" - "@smithy/hash-node" "^3.0.3" - "@smithy/invalid-dependency" "^3.0.3" - "@smithy/middleware-content-length" "^3.0.5" - "@smithy/middleware-endpoint" "^3.1.0" - "@smithy/middleware-retry" "^3.0.12" - "@smithy/middleware-serde" "^3.0.3" - "@smithy/middleware-stack" "^3.0.3" - "@smithy/node-config-provider" "^3.1.4" - "@smithy/node-http-handler" "^3.1.4" - "@smithy/protocol-http" "^4.1.0" - "@smithy/smithy-client" "^3.1.10" - "@smithy/types" "^3.3.0" - "@smithy/url-parser" "^3.0.3" + "@aws-sdk/core" "3.658.1" + "@aws-sdk/credential-provider-node" "3.658.1" + "@aws-sdk/middleware-host-header" "3.654.0" + "@aws-sdk/middleware-logger" "3.654.0" + "@aws-sdk/middleware-recursion-detection" "3.654.0" + "@aws-sdk/middleware-user-agent" "3.654.0" + "@aws-sdk/region-config-resolver" "3.654.0" + "@aws-sdk/types" "3.654.0" + "@aws-sdk/util-endpoints" "3.654.0" + "@aws-sdk/util-user-agent-browser" "3.654.0" + "@aws-sdk/util-user-agent-node" "3.654.0" + "@smithy/config-resolver" "^3.0.8" + "@smithy/core" "^2.4.6" + "@smithy/fetch-http-handler" "^3.2.8" + "@smithy/hash-node" "^3.0.6" + "@smithy/invalid-dependency" "^3.0.6" + "@smithy/middleware-content-length" "^3.0.8" + "@smithy/middleware-endpoint" "^3.1.3" + "@smithy/middleware-retry" "^3.0.21" + "@smithy/middleware-serde" "^3.0.6" + "@smithy/middleware-stack" "^3.0.6" + "@smithy/node-config-provider" "^3.1.7" + "@smithy/node-http-handler" "^3.2.3" + "@smithy/protocol-http" "^4.1.3" + "@smithy/smithy-client" "^3.3.5" + "@smithy/types" "^3.4.2" + "@smithy/url-parser" "^3.0.6" "@smithy/util-base64" "^3.0.0" "@smithy/util-body-length-browser" "^3.0.0" "@smithy/util-body-length-node" "^3.0.0" - "@smithy/util-defaults-mode-browser" "^3.0.12" - "@smithy/util-defaults-mode-node" "^3.0.12" - "@smithy/util-endpoints" "^2.0.5" - "@smithy/util-middleware" "^3.0.3" - "@smithy/util-retry" "^3.0.3" + "@smithy/util-defaults-mode-browser" "^3.0.21" + "@smithy/util-defaults-mode-node" "^3.0.21" + "@smithy/util-endpoints" "^2.1.2" + "@smithy/util-middleware" "^3.0.6" + "@smithy/util-retry" "^3.0.6" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.620.1": - version "3.620.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.620.1.tgz#a828155fc98f62c5c713601a28033a681694389e" - integrity sha512-4Ox0BSs+atrAhLvjNHN2uiYvSTdpMv//IS4l4XRoQG0cJKIPLs3OU3PL5H0X1NfZehz9/8FTWl5Lv81uw4j1eA== +"@aws-sdk/client-sso@3.658.1": + version "3.658.1" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.658.1.tgz#f0e660148ab2786f1028a738285742fb97f888bf" + integrity sha512-lOuaBtqPTYGn6xpXlQF4LsNDsQ8Ij2kOdnk+i69Kp6yS76TYvtUuukyLL5kx8zE1c8WbYtxj9y8VNw9/6uKl7Q== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.620.1" - "@aws-sdk/middleware-host-header" "3.620.0" - "@aws-sdk/middleware-logger" "3.609.0" - "@aws-sdk/middleware-recursion-detection" "3.620.0" - "@aws-sdk/middleware-user-agent" "3.620.0" - "@aws-sdk/region-config-resolver" "3.614.0" - "@aws-sdk/types" "3.609.0" - "@aws-sdk/util-endpoints" "3.614.0" - "@aws-sdk/util-user-agent-browser" "3.609.0" - "@aws-sdk/util-user-agent-node" "3.614.0" - "@smithy/config-resolver" "^3.0.5" - "@smithy/core" "^2.3.0" - "@smithy/fetch-http-handler" "^3.2.3" - "@smithy/hash-node" "^3.0.3" - "@smithy/invalid-dependency" "^3.0.3" - "@smithy/middleware-content-length" "^3.0.5" - "@smithy/middleware-endpoint" "^3.1.0" - "@smithy/middleware-retry" "^3.0.12" - "@smithy/middleware-serde" "^3.0.3" - "@smithy/middleware-stack" "^3.0.3" - "@smithy/node-config-provider" "^3.1.4" - "@smithy/node-http-handler" "^3.1.4" - "@smithy/protocol-http" "^4.1.0" - "@smithy/smithy-client" "^3.1.10" - "@smithy/types" "^3.3.0" - "@smithy/url-parser" "^3.0.3" + "@aws-sdk/core" "3.658.1" + "@aws-sdk/middleware-host-header" "3.654.0" + "@aws-sdk/middleware-logger" "3.654.0" + "@aws-sdk/middleware-recursion-detection" "3.654.0" + "@aws-sdk/middleware-user-agent" "3.654.0" + "@aws-sdk/region-config-resolver" "3.654.0" + "@aws-sdk/types" "3.654.0" + "@aws-sdk/util-endpoints" "3.654.0" + "@aws-sdk/util-user-agent-browser" "3.654.0" + "@aws-sdk/util-user-agent-node" "3.654.0" + "@smithy/config-resolver" "^3.0.8" + "@smithy/core" "^2.4.6" + "@smithy/fetch-http-handler" "^3.2.8" + "@smithy/hash-node" "^3.0.6" + "@smithy/invalid-dependency" "^3.0.6" + "@smithy/middleware-content-length" "^3.0.8" + "@smithy/middleware-endpoint" "^3.1.3" + "@smithy/middleware-retry" "^3.0.21" + "@smithy/middleware-serde" "^3.0.6" + "@smithy/middleware-stack" "^3.0.6" + "@smithy/node-config-provider" "^3.1.7" + "@smithy/node-http-handler" "^3.2.3" + "@smithy/protocol-http" "^4.1.3" + "@smithy/smithy-client" "^3.3.5" + "@smithy/types" "^3.4.2" + "@smithy/url-parser" "^3.0.6" "@smithy/util-base64" "^3.0.0" "@smithy/util-body-length-browser" "^3.0.0" "@smithy/util-body-length-node" "^3.0.0" - "@smithy/util-defaults-mode-browser" "^3.0.12" - "@smithy/util-defaults-mode-node" "^3.0.12" - "@smithy/util-endpoints" "^2.0.5" - "@smithy/util-middleware" "^3.0.3" - "@smithy/util-retry" "^3.0.3" + "@smithy/util-defaults-mode-browser" "^3.0.21" + "@smithy/util-defaults-mode-node" "^3.0.21" + "@smithy/util-endpoints" "^2.1.2" + "@smithy/util-middleware" "^3.0.6" + "@smithy/util-retry" "^3.0.6" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@aws-sdk/client-sts@3.620.1": - version "3.620.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.620.1.tgz#3d2e1f3b98a65ff7d6bb3d064d0a728cadf3ab52" - integrity sha512-d+ECGFDg0IsDdmfKU2O0VeMYKZcmbfBaA9HkZnZ39wu1BlXGI73xJe8cfmzbobvu+Ly+bAfHdLCpgIY+pD4D7g== +"@aws-sdk/client-sts@3.658.1": + version "3.658.1" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.658.1.tgz#5e6af00f5b87f3d79a2b848241b832af20ce42ab" + integrity sha512-yw9hc5blTnbT1V6mR7Cx9HGc9KQpcLQ1QXj8rntiJi6tIYu3aFNVEyy81JHL7NsuBSeQulJTvHO3y6r3O0sfRg== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/client-sso-oidc" "3.620.1" - "@aws-sdk/core" "3.620.1" - "@aws-sdk/credential-provider-node" "3.620.1" - "@aws-sdk/middleware-host-header" "3.620.0" - "@aws-sdk/middleware-logger" "3.609.0" - "@aws-sdk/middleware-recursion-detection" "3.620.0" - "@aws-sdk/middleware-user-agent" "3.620.0" - "@aws-sdk/region-config-resolver" "3.614.0" - "@aws-sdk/types" "3.609.0" - "@aws-sdk/util-endpoints" "3.614.0" - "@aws-sdk/util-user-agent-browser" "3.609.0" - "@aws-sdk/util-user-agent-node" "3.614.0" - "@smithy/config-resolver" "^3.0.5" - "@smithy/core" "^2.3.0" - "@smithy/fetch-http-handler" "^3.2.3" - "@smithy/hash-node" "^3.0.3" - "@smithy/invalid-dependency" "^3.0.3" - "@smithy/middleware-content-length" "^3.0.5" - "@smithy/middleware-endpoint" "^3.1.0" - "@smithy/middleware-retry" "^3.0.12" - "@smithy/middleware-serde" "^3.0.3" - "@smithy/middleware-stack" "^3.0.3" - "@smithy/node-config-provider" "^3.1.4" - "@smithy/node-http-handler" "^3.1.4" - "@smithy/protocol-http" "^4.1.0" - "@smithy/smithy-client" "^3.1.10" - "@smithy/types" "^3.3.0" - "@smithy/url-parser" "^3.0.3" + "@aws-sdk/client-sso-oidc" "3.658.1" + "@aws-sdk/core" "3.658.1" + "@aws-sdk/credential-provider-node" "3.658.1" + "@aws-sdk/middleware-host-header" "3.654.0" + "@aws-sdk/middleware-logger" "3.654.0" + "@aws-sdk/middleware-recursion-detection" "3.654.0" + "@aws-sdk/middleware-user-agent" "3.654.0" + "@aws-sdk/region-config-resolver" "3.654.0" + "@aws-sdk/types" "3.654.0" + "@aws-sdk/util-endpoints" "3.654.0" + "@aws-sdk/util-user-agent-browser" "3.654.0" + "@aws-sdk/util-user-agent-node" "3.654.0" + "@smithy/config-resolver" "^3.0.8" + "@smithy/core" "^2.4.6" + "@smithy/fetch-http-handler" "^3.2.8" + "@smithy/hash-node" "^3.0.6" + "@smithy/invalid-dependency" "^3.0.6" + "@smithy/middleware-content-length" "^3.0.8" + "@smithy/middleware-endpoint" "^3.1.3" + "@smithy/middleware-retry" "^3.0.21" + "@smithy/middleware-serde" "^3.0.6" + "@smithy/middleware-stack" "^3.0.6" + "@smithy/node-config-provider" "^3.1.7" + "@smithy/node-http-handler" "^3.2.3" + "@smithy/protocol-http" "^4.1.3" + "@smithy/smithy-client" "^3.3.5" + "@smithy/types" "^3.4.2" + "@smithy/url-parser" "^3.0.6" "@smithy/util-base64" "^3.0.0" "@smithy/util-body-length-browser" "^3.0.0" "@smithy/util-body-length-node" "^3.0.0" - "@smithy/util-defaults-mode-browser" "^3.0.12" - "@smithy/util-defaults-mode-node" "^3.0.12" - "@smithy/util-endpoints" "^2.0.5" - "@smithy/util-middleware" "^3.0.3" - "@smithy/util-retry" "^3.0.3" + "@smithy/util-defaults-mode-browser" "^3.0.21" + "@smithy/util-defaults-mode-node" "^3.0.21" + "@smithy/util-endpoints" "^2.1.2" + "@smithy/util-middleware" "^3.0.6" + "@smithy/util-retry" "^3.0.6" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@aws-sdk/core@3.620.1": - version "3.620.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.620.1.tgz#8a85653d41fb3d5b706f24559dcbde1e42449e99" - integrity sha512-6Ejce93dDlDnovl6oYtxj3I/SJMOQoFdmmtM4+4W/cgMWH+l00T5aszVxDLjjPfu3Ryt7dNhrXaYeK2Ue1ZBmg== - dependencies: - "@smithy/core" "^2.3.0" - "@smithy/node-config-provider" "^3.1.4" - "@smithy/protocol-http" "^4.1.0" - "@smithy/signature-v4" "^4.1.0" - "@smithy/smithy-client" "^3.1.10" - "@smithy/types" "^3.3.0" - "@smithy/util-middleware" "^3.0.3" - fast-xml-parser "4.2.5" +"@aws-sdk/core@3.658.1": + version "3.658.1" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.658.1.tgz#7b211f75a6048eba88ff33169047b4dc57fdc520" + integrity sha512-vJVMoMcSKXK2gBRSu9Ywwv6wQ7tXH8VL1fqB1uVxgCqBZ3IHfqNn4zvpMPWrwgO2/3wv7XFyikGQ5ypPTCw4jA== + dependencies: + "@smithy/core" "^2.4.6" + "@smithy/node-config-provider" "^3.1.7" + "@smithy/property-provider" "^3.1.6" + "@smithy/protocol-http" "^4.1.3" + "@smithy/signature-v4" "^4.1.4" + "@smithy/smithy-client" "^3.3.5" + "@smithy/types" "^3.4.2" + "@smithy/util-middleware" "^3.0.6" + fast-xml-parser "4.4.1" tslib "^2.6.2" -"@aws-sdk/credential-provider-cognito-identity@3.620.1": - version "3.620.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.620.1.tgz#cab205f8597d15d80bd8aa9defabd62a05647fe5" - integrity sha512-Xj3KhllIQXnmONLOMvUInV6MsvxUut62jeKiD2k0fJNnGvJ2c2+h2/U6eMlhyneoVeVMvEKBw1L60X9vUb/aAw== +"@aws-sdk/credential-provider-cognito-identity@3.658.1": + version "3.658.1" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.658.1.tgz#deb61eb4d9b0a1aeb5c0118fe740de90618f3323" + integrity sha512-JY4rZ4e2emL7PNHCU7F/BQV8PpQGEBZLkEoPD55RO4CitaIhlVZRpUCGLih+0Hw4MOnTUqJdfQBM+qZk6G+Now== dependencies: - "@aws-sdk/client-cognito-identity" "3.620.1" - "@aws-sdk/types" "3.609.0" - "@smithy/property-provider" "^3.1.3" - "@smithy/types" "^3.3.0" + "@aws-sdk/client-cognito-identity" "3.658.1" + "@aws-sdk/types" "3.654.0" + "@smithy/property-provider" "^3.1.6" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/credential-provider-env@3.620.1": - version "3.620.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.620.1.tgz#d4692c49a65ebc11dae3f7f8b053fee9268a953c" - integrity sha512-ExuILJ2qLW5ZO+rgkNRj0xiAipKT16Rk77buvPP8csR7kkCflT/gXTyzRe/uzIiETTxM7tr8xuO9MP/DQXqkfg== +"@aws-sdk/credential-provider-env@3.654.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.654.0.tgz#5773a9d969ede7e30059472b26c9e39b3992cc0a" + integrity sha512-kogsx3Ql81JouHS7DkheCDU9MYAvK0AokxjcshDveGmf7BbgbWCA8Fnb9wjQyNDaOXNvkZu8Z8rgkX91z324/w== dependencies: - "@aws-sdk/types" "3.609.0" - "@smithy/property-provider" "^3.1.3" - "@smithy/types" "^3.3.0" + "@aws-sdk/types" "3.654.0" + "@smithy/property-provider" "^3.1.6" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/credential-provider-http@3.620.0": - version "3.620.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.620.0.tgz#417b80a128d186e2332b6b08a4ea64a2bb61de9d" - integrity sha512-BI2BdrSKDmB/2ouB/NJR0PT0x/+5fmoF6XOE78hFBb4F5w/yynGgcJY936dF+oREfpME6ehjB2b0okGg78Scpw== - dependencies: - "@aws-sdk/types" "3.609.0" - "@smithy/fetch-http-handler" "^3.2.3" - "@smithy/node-http-handler" "^3.1.4" - "@smithy/property-provider" "^3.1.3" - "@smithy/protocol-http" "^4.1.0" - "@smithy/smithy-client" "^3.1.10" - "@smithy/types" "^3.3.0" - "@smithy/util-stream" "^3.1.2" +"@aws-sdk/credential-provider-http@3.658.1": + version "3.658.1" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.658.1.tgz#35fa80fa8440e9fd5baf061bfd18862cbcabd3bd" + integrity sha512-4ubkJjEVCZflxkZnV1JDQv8P2pburxk1LrEp55telfJRzXrnowzBKwuV2ED0QMNC448g2B3VCaffS+Ct7c4IWQ== + dependencies: + "@aws-sdk/types" "3.654.0" + "@smithy/fetch-http-handler" "^3.2.8" + "@smithy/node-http-handler" "^3.2.3" + "@smithy/property-provider" "^3.1.6" + "@smithy/protocol-http" "^4.1.3" + "@smithy/smithy-client" "^3.3.5" + "@smithy/types" "^3.4.2" + "@smithy/util-stream" "^3.1.8" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.620.1": - version "3.620.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.620.1.tgz#d302c3840b021491adb0ff5dc8fcdd6cbd46017d" - integrity sha512-m9jwigMPRlRRhoPxCQZMOwQUd6imEJbksF6tSMYNae76DIvrCi4z2Jhp6RJ9Mij8cnewUZCAmvu2FlK9+n9M7A== - dependencies: - "@aws-sdk/credential-provider-env" "3.620.1" - "@aws-sdk/credential-provider-http" "3.620.0" - "@aws-sdk/credential-provider-process" "3.620.1" - "@aws-sdk/credential-provider-sso" "3.620.1" - "@aws-sdk/credential-provider-web-identity" "3.609.0" - "@aws-sdk/types" "3.609.0" - "@smithy/credential-provider-imds" "^3.2.0" - "@smithy/property-provider" "^3.1.3" - "@smithy/shared-ini-file-loader" "^3.1.4" - "@smithy/types" "^3.3.0" +"@aws-sdk/credential-provider-ini@3.658.1": + version "3.658.1" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.658.1.tgz#a451b8fc5d057b9c8473d452f4b8bcd221cdd201" + integrity sha512-2uwOamQg5ppwfegwen1ddPu5HM3/IBSnaGlaKLFhltkdtZ0jiqTZWUtX2V+4Q+buLnT0hQvLS/frQ+7QUam+0Q== + dependencies: + "@aws-sdk/credential-provider-env" "3.654.0" + "@aws-sdk/credential-provider-http" "3.658.1" + "@aws-sdk/credential-provider-process" "3.654.0" + "@aws-sdk/credential-provider-sso" "3.658.1" + "@aws-sdk/credential-provider-web-identity" "3.654.0" + "@aws-sdk/types" "3.654.0" + "@smithy/credential-provider-imds" "^3.2.3" + "@smithy/property-provider" "^3.1.6" + "@smithy/shared-ini-file-loader" "^3.1.7" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.620.1": - version "3.620.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.620.1.tgz#e800cef9c62a85b99954eea85a24db831850c2a1" - integrity sha512-KaprIJW2azM+oTIHi7S1ayJ3oQqoFwpMBWFpZM1nvSzaPucrZIUmX2m4uVrMM4LfXsfUsgMkrme2rBI1fGAjCg== - dependencies: - "@aws-sdk/credential-provider-env" "3.620.1" - "@aws-sdk/credential-provider-http" "3.620.0" - "@aws-sdk/credential-provider-ini" "3.620.1" - "@aws-sdk/credential-provider-process" "3.620.1" - "@aws-sdk/credential-provider-sso" "3.620.1" - "@aws-sdk/credential-provider-web-identity" "3.609.0" - "@aws-sdk/types" "3.609.0" - "@smithy/credential-provider-imds" "^3.2.0" - "@smithy/property-provider" "^3.1.3" - "@smithy/shared-ini-file-loader" "^3.1.4" - "@smithy/types" "^3.3.0" +"@aws-sdk/credential-provider-node@3.658.1": + version "3.658.1" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.658.1.tgz#ad7209177f8c1c43d767e5c342960a2d19ee124e" + integrity sha512-XwxW6N+uPXPYAuyq+GfOEdfL/MZGAlCSfB5gEWtLBFmFbikhmEuqfWtI6CD60OwudCUOh6argd21BsJf8o1SJA== + dependencies: + "@aws-sdk/credential-provider-env" "3.654.0" + "@aws-sdk/credential-provider-http" "3.658.1" + "@aws-sdk/credential-provider-ini" "3.658.1" + "@aws-sdk/credential-provider-process" "3.654.0" + "@aws-sdk/credential-provider-sso" "3.658.1" + "@aws-sdk/credential-provider-web-identity" "3.654.0" + "@aws-sdk/types" "3.654.0" + "@smithy/credential-provider-imds" "^3.2.3" + "@smithy/property-provider" "^3.1.6" + "@smithy/shared-ini-file-loader" "^3.1.7" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/credential-provider-process@3.620.1": - version "3.620.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.620.1.tgz#10387cf85400420bb4bbda9cc56937dcc6d6d0ee" - integrity sha512-hWqFMidqLAkaV9G460+1at6qa9vySbjQKKc04p59OT7lZ5cO5VH5S4aI05e+m4j364MBROjjk2ugNvfNf/8ILg== +"@aws-sdk/credential-provider-process@3.654.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.654.0.tgz#2c526d0d059eddfe4176933fadbbf8bd59480642" + integrity sha512-PmQoo8sZ9Q2Ow8OMzK++Z9lI7MsRUG7sNq3E72DVA215dhtTICTDQwGlXH2AAmIp7n+G9LLRds+4wo2ehG4mkg== dependencies: - "@aws-sdk/types" "3.609.0" - "@smithy/property-provider" "^3.1.3" - "@smithy/shared-ini-file-loader" "^3.1.4" - "@smithy/types" "^3.3.0" + "@aws-sdk/types" "3.654.0" + "@smithy/property-provider" "^3.1.6" + "@smithy/shared-ini-file-loader" "^3.1.7" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.620.1": - version "3.620.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.620.1.tgz#ce1f32a09d3964f5f80161090c1ea42e3d5fafdf" - integrity sha512-cFU8e6ctdkWR8BRCnHFzs37N+ilbHf1OT2EeMjt1ZDE9FgTD5L5BTgVWDxnPmyQnEoBs1p4PyNPHkpHY5EmswQ== - dependencies: - "@aws-sdk/client-sso" "3.620.1" - "@aws-sdk/token-providers" "3.614.0" - "@aws-sdk/types" "3.609.0" - "@smithy/property-provider" "^3.1.3" - "@smithy/shared-ini-file-loader" "^3.1.4" - "@smithy/types" "^3.3.0" +"@aws-sdk/credential-provider-sso@3.658.1": + version "3.658.1" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.658.1.tgz#62db3f09f08a33b5fb4827a8a8f1a640373b39b7" + integrity sha512-YOagVEsZEk9DmgJEBg+4MBXrPcw/tYas0VQ5OVBqC5XHNbi2OBGJqgmjVPesuu393E7W0VQxtJFDS00O1ewQgA== + dependencies: + "@aws-sdk/client-sso" "3.658.1" + "@aws-sdk/token-providers" "3.654.0" + "@aws-sdk/types" "3.654.0" + "@smithy/property-provider" "^3.1.6" + "@smithy/shared-ini-file-loader" "^3.1.7" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.609.0": - version "3.609.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.609.0.tgz#d29222d6894347ee89c781ea090d388656df1d2a" - integrity sha512-U+PG8NhlYYF45zbr1km3ROtBMYqyyj/oK8NRp++UHHeuavgrP+4wJ4wQnlEaKvJBjevfo3+dlIBcaeQ7NYejWg== +"@aws-sdk/credential-provider-web-identity@3.654.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.654.0.tgz#67dc0463d20f801c8577276e2066f9151b2d5eb1" + integrity sha512-6a2g9gMtZToqSu+CusjNK5zvbLJahQ9di7buO3iXgbizXpLXU1rnawCpWxwslMpT5fLgMSKDnKDrr6wdEk7jSw== dependencies: - "@aws-sdk/types" "3.609.0" - "@smithy/property-provider" "^3.1.3" - "@smithy/types" "^3.3.0" + "@aws-sdk/types" "3.654.0" + "@smithy/property-provider" "^3.1.6" + "@smithy/types" "^3.4.2" tslib "^2.6.2" "@aws-sdk/credential-providers@^3.186.0": - version "3.620.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.620.1.tgz#a463b719b279048a516663f5f9a2967d1ac5b4b0" - integrity sha512-jclJi7bNtwYBrlzMwuTLqbYIKqLb00JSRJG7oQHXuQYbVAKkU2iRhnLpitLBfXklyEIDv/LmW+MKvq8uOhYNkQ== - dependencies: - "@aws-sdk/client-cognito-identity" "3.620.1" - "@aws-sdk/client-sso" "3.620.1" - "@aws-sdk/client-sts" "3.620.1" - "@aws-sdk/credential-provider-cognito-identity" "3.620.1" - "@aws-sdk/credential-provider-env" "3.620.1" - "@aws-sdk/credential-provider-http" "3.620.0" - "@aws-sdk/credential-provider-ini" "3.620.1" - "@aws-sdk/credential-provider-node" "3.620.1" - "@aws-sdk/credential-provider-process" "3.620.1" - "@aws-sdk/credential-provider-sso" "3.620.1" - "@aws-sdk/credential-provider-web-identity" "3.609.0" - "@aws-sdk/types" "3.609.0" - "@smithy/credential-provider-imds" "^3.2.0" - "@smithy/property-provider" "^3.1.3" - "@smithy/types" "^3.3.0" + version "3.658.1" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.658.1.tgz#fea93637acaab5a0b56b5b3fcfd036ab9f94afb7" + integrity sha512-lfXA6kZS6GHyi/67EbfrKdLoqHR6j7G35eFwaqxyNkfMhNBpAF0eZK3SYiwnzdR9+Wb/enTFawYiFbG5R+dQzA== + dependencies: + "@aws-sdk/client-cognito-identity" "3.658.1" + "@aws-sdk/client-sso" "3.658.1" + "@aws-sdk/client-sts" "3.658.1" + "@aws-sdk/credential-provider-cognito-identity" "3.658.1" + "@aws-sdk/credential-provider-env" "3.654.0" + "@aws-sdk/credential-provider-http" "3.658.1" + "@aws-sdk/credential-provider-ini" "3.658.1" + "@aws-sdk/credential-provider-node" "3.658.1" + "@aws-sdk/credential-provider-process" "3.654.0" + "@aws-sdk/credential-provider-sso" "3.658.1" + "@aws-sdk/credential-provider-web-identity" "3.654.0" + "@aws-sdk/types" "3.654.0" + "@smithy/credential-provider-imds" "^3.2.3" + "@smithy/property-provider" "^3.1.6" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/middleware-host-header@3.620.0": - version "3.620.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.620.0.tgz#b561d419a08a984ba364c193376b482ff5224d74" - integrity sha512-VMtPEZwqYrII/oUkffYsNWY9PZ9xpNJpMgmyU0rlDQ25O1c0Hk3fJmZRe6pEkAJ0omD7kLrqGl1DUjQVxpd/Rg== +"@aws-sdk/middleware-host-header@3.654.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.654.0.tgz#8b02dcc28467d5b48c32cec22fd6e10ffd2a0549" + integrity sha512-rxGgVHWKp8U2ubMv+t+vlIk7QYUaRCHaVpmUlJv0Wv6Q0KeO9a42T9FxHphjOTlCGQOLcjCreL9CF8Qhtb4mdQ== dependencies: - "@aws-sdk/types" "3.609.0" - "@smithy/protocol-http" "^4.1.0" - "@smithy/types" "^3.3.0" + "@aws-sdk/types" "3.654.0" + "@smithy/protocol-http" "^4.1.3" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/middleware-logger@3.609.0": - version "3.609.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.609.0.tgz#ed44d201f091b8bac908cbf14724c7a4d492553f" - integrity sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ== +"@aws-sdk/middleware-logger@3.654.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.654.0.tgz#510495302fb134e1ef2163205f8eaedd46ffe05f" + integrity sha512-OQYb+nWlmASyXfRb989pwkJ9EVUMP1CrKn2eyTk3usl20JZmKo2Vjis6I0tLUkMSxMhnBJJlQKyWkRpD/u1FVg== dependencies: - "@aws-sdk/types" "3.609.0" - "@smithy/types" "^3.3.0" + "@aws-sdk/types" "3.654.0" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/middleware-recursion-detection@3.620.0": - version "3.620.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.620.0.tgz#f8270dfff843fd756be971e5673f89c6a24c6513" - integrity sha512-nh91S7aGK3e/o1ck64sA/CyoFw+gAYj2BDOnoNa6ouyCrVJED96ZXWbhye/fz9SgmNUZR2g7GdVpiLpMKZoI5w== +"@aws-sdk/middleware-recursion-detection@3.654.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.654.0.tgz#4ade897efb6cbbfd72dd62a66999f28fd1552f9a" + integrity sha512-gKSomgltKVmsT8sC6W7CrADZ4GHwX9epk3GcH6QhebVO3LA9LRbkL3TwOPUXakxxOLLUTYdOZLIOtFf7iH00lg== dependencies: - "@aws-sdk/types" "3.609.0" - "@smithy/protocol-http" "^4.1.0" - "@smithy/types" "^3.3.0" + "@aws-sdk/types" "3.654.0" + "@smithy/protocol-http" "^4.1.3" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.620.0": - version "3.620.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.620.0.tgz#1fe3104f04f576a942cf0469bfbd73c38eef3d9e" - integrity sha512-bvS6etn+KsuL32ubY5D3xNof1qkenpbJXf/ugGXbg0n98DvDFQ/F+SMLxHgbnER5dsKYchNnhmtI6/FC3HFu/A== +"@aws-sdk/middleware-user-agent@3.654.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.654.0.tgz#5fa56514b97ced923fefe2653429d7b2bfb102bb" + integrity sha512-liCcqPAyRsr53cy2tYu4qeH4MMN0eh9g6k56XzI5xd4SghXH5YWh4qOYAlQ8T66ZV4nPMtD8GLtLXGzsH8moFg== dependencies: - "@aws-sdk/types" "3.609.0" - "@aws-sdk/util-endpoints" "3.614.0" - "@smithy/protocol-http" "^4.1.0" - "@smithy/types" "^3.3.0" + "@aws-sdk/types" "3.654.0" + "@aws-sdk/util-endpoints" "3.654.0" + "@smithy/protocol-http" "^4.1.3" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/region-config-resolver@3.614.0": - version "3.614.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.614.0.tgz#9cebb31a5bcfea2a41891fff7f28d0164cde179a" - integrity sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g== +"@aws-sdk/region-config-resolver@3.654.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.654.0.tgz#f98e25a6669fde3d747db23eb589732384e213ef" + integrity sha512-ydGOrXJxj3x0sJhsXyTmvJVLAE0xxuTWFJihTl67RtaO7VRNtd82I3P3bwoMMaDn5WpmV5mPo8fEUDRlBm3fPg== dependencies: - "@aws-sdk/types" "3.609.0" - "@smithy/node-config-provider" "^3.1.4" - "@smithy/types" "^3.3.0" + "@aws-sdk/types" "3.654.0" + "@smithy/node-config-provider" "^3.1.7" + "@smithy/types" "^3.4.2" "@smithy/util-config-provider" "^3.0.0" - "@smithy/util-middleware" "^3.0.3" + "@smithy/util-middleware" "^3.0.6" tslib "^2.6.2" -"@aws-sdk/token-providers@3.614.0": - version "3.614.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.614.0.tgz#88da04f6d4ce916b0b0f6e045676d04201fb47fd" - integrity sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw== +"@aws-sdk/token-providers@3.654.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.654.0.tgz#1aba36d510d471ccac43f90b59e2a354399ed069" + integrity sha512-D8GeJYmvbfWkQDtTB4owmIobSMexZel0fOoetwvgCQ/7L8VPph3Q2bn1TRRIXvH7wdt6DcDxA3tKMHPBkT3GlA== dependencies: - "@aws-sdk/types" "3.609.0" - "@smithy/property-provider" "^3.1.3" - "@smithy/shared-ini-file-loader" "^3.1.4" - "@smithy/types" "^3.3.0" + "@aws-sdk/types" "3.654.0" + "@smithy/property-provider" "^3.1.6" + "@smithy/shared-ini-file-loader" "^3.1.7" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/types@3.609.0", "@aws-sdk/types@^3.222.0": - version "3.609.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.609.0.tgz#06b39d799c9f197a7b43670243e8e78a3bf7d6a5" - integrity sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q== +"@aws-sdk/types@3.654.0", "@aws-sdk/types@^3.222.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.654.0.tgz#d368dda5e8aff9e7b6575985bb425bbbaf67aa97" + integrity sha512-VWvbED3SV+10QJIcmU/PKjsKilsTV16d1I7/on4bvD/jo1qGeMXqLDBSen3ks/tuvXZF/mFc7ZW/W2DiLVtO7A== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.4.2" tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.614.0": - version "3.614.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.614.0.tgz#6564b0ffd7dc3728221e9f9821f5aab1cc58468e" - integrity sha512-wK2cdrXHH4oz4IomV/yrGkftU9A+ITB6nFL+rxxyO78is2ifHJpFdV4aqk4LSkXYPi6CXWNru/Dqc7yiKXgJPw== +"@aws-sdk/util-endpoints@3.654.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.654.0.tgz#ae8ac05c8afe73cf1428942c3a6d0ab8765f3911" + integrity sha512-i902fcBknHs0Irgdpi62+QMvzxE+bczvILXigYrlHL4+PiEnlMVpni5L5W1qCkNZXf8AaMrSBuR1NZAGp6UOUw== dependencies: - "@aws-sdk/types" "3.609.0" - "@smithy/types" "^3.3.0" - "@smithy/util-endpoints" "^2.0.5" + "@aws-sdk/types" "3.654.0" + "@smithy/types" "^3.4.2" + "@smithy/util-endpoints" "^2.1.2" tslib "^2.6.2" "@aws-sdk/util-locate-window@^3.0.0": @@ -460,30 +461,30 @@ dependencies: tslib "^2.6.2" -"@aws-sdk/util-user-agent-browser@3.609.0": - version "3.609.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.609.0.tgz#aa15421b2e32ae8bc589dac2bd6e8969832ce588" - integrity sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA== +"@aws-sdk/util-user-agent-browser@3.654.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.654.0.tgz#caa5e5d6d502aad1fe5a436cffbabfff1ec3b92c" + integrity sha512-ykYAJqvnxLt7wfrqya28wuH3/7NdrwzfiFd7NqEVQf7dXVxL5RPEpD7DxjcyQo3DsHvvdUvGZVaQhozycn1pzA== dependencies: - "@aws-sdk/types" "3.609.0" - "@smithy/types" "^3.3.0" + "@aws-sdk/types" "3.654.0" + "@smithy/types" "^3.4.2" bowser "^2.11.0" tslib "^2.6.2" -"@aws-sdk/util-user-agent-node@3.614.0": - version "3.614.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.614.0.tgz#1e3f49a80f841a3f21647baed2adce01aac5beb5" - integrity sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA== +"@aws-sdk/util-user-agent-node@3.654.0": + version "3.654.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.654.0.tgz#d4b88fa9f3fce2fd70118d2c01abd941d30cffa7" + integrity sha512-a0ojjdBN6pqv6gB4H/QPPSfhs7mFtlVwnmKCM/QrTaFzN0U810PJ1BST3lBx5sa23I5jWHGaoFY+5q65C3clLQ== dependencies: - "@aws-sdk/types" "3.609.0" - "@smithy/node-config-provider" "^3.1.4" - "@smithy/types" "^3.3.0" + "@aws-sdk/types" "3.654.0" + "@smithy/node-config-provider" "^3.1.7" + "@smithy/types" "^3.4.2" tslib "^2.6.2" "@babel/cli@^7.16.0": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.24.8.tgz#79eaa55a69c77cafbea3e87537fd1df5a5a2edf8" - integrity sha512-isdp+G6DpRyKc+3Gqxy2rjzgF7Zj9K0mzLNnxz+E/fgeag8qT3vVulX4gY9dGO1q0y+0lUv6V3a+uhUzMzrwXg== + version "7.25.6" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.25.6.tgz#bc35561adc78ade43ac9c09a690768493ab9ed95" + integrity sha512-Z+Doemr4VtvSD2SNHTrkiFZ1LX+JI6tyRXAAOb4N9khIuPyoEPmTPJarPm8ljJV1D6bnMQjyHMWTT9NeKbQuXA== dependencies: "@jridgewell/trace-mapping" "^0.3.25" commander "^6.2.0" @@ -494,7 +495,7 @@ slash "^2.0.0" optionalDependencies: "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3" - chokidar "^3.4.0" + chokidar "^3.6.0" "@babel/code-frame@^7.24.7": version "7.24.7" @@ -505,9 +506,9 @@ picocolors "^1.0.0" "@babel/compat-data@^7.25.2": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.2.tgz#e41928bd33475305c586f6acbbb7e3ade7a6f7f5" - integrity sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ== + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb" + integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ== "@babel/core@^7.16.5": version "7.25.2" @@ -530,12 +531,12 @@ json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.25.0", "@babel/generator@^7.4.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.0.tgz#f858ddfa984350bc3d3b7f125073c9af6988f18e" - integrity sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw== +"@babel/generator@^7.25.0", "@babel/generator@^7.25.6", "@babel/generator@^7.4.0": + version "7.25.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.6.tgz#0df1ad8cb32fe4d2b01d8bf437f153d19342a87c" + integrity sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw== dependencies: - "@babel/types" "^7.25.0" + "@babel/types" "^7.25.6" "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" @@ -605,12 +606,12 @@ integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q== "@babel/helpers@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.0.tgz#e69beb7841cb93a6505531ede34f34e6a073650a" - integrity sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw== + version "7.25.6" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.6.tgz#57ee60141829ba2e102f30711ffe3afab357cc60" + integrity sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q== dependencies: "@babel/template" "^7.25.0" - "@babel/types" "^7.25.0" + "@babel/types" "^7.25.6" "@babel/highlight@^7.24.7": version "7.24.7" @@ -634,10 +635,12 @@ regenerator-runtime "^0.14.0" v8flags "^3.1.1" -"@babel/parser@^7.25.0", "@babel/parser@^7.4.3": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.0.tgz#9fdc9237504d797b6e7b8f66e78ea7f570d256ad" - integrity sha512-CzdIU9jdP0dg7HdyB+bHvDJGagUv+qtzZt5rYCWwW6tITNqV9odjp6Qu41gkG0ca5UfdDUWrKkiAnHHdGRnOrA== +"@babel/parser@^7.25.0", "@babel/parser@^7.25.6", "@babel/parser@^7.4.3": + version "7.25.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.6.tgz#85660c5ef388cbbf6e3d2a694ee97a38f18afe2f" + integrity sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q== + dependencies: + "@babel/types" "^7.25.6" "@babel/plugin-syntax-jsx@^7.24.7": version "7.24.7" @@ -678,22 +681,22 @@ "@babel/types" "^7.25.0" "@babel/traverse@^7.24.7", "@babel/traverse@^7.25.2", "@babel/traverse@^7.4.3": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.2.tgz#1a0a4aef53177bead359ccd0c89f4426c805b2ae" - integrity sha512-s4/r+a7xTnny2O6FcZzqgT6nE4/GHEdcqj4qAeglbUOh0TeglEfmNJFAd/OLoVtGd6ZhAO8GCVvCNUO5t/VJVQ== + version "7.25.6" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.6.tgz#04fad980e444f182ecf1520504941940a90fea41" + integrity sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ== dependencies: "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.25.0" - "@babel/parser" "^7.25.0" + "@babel/generator" "^7.25.6" + "@babel/parser" "^7.25.6" "@babel/template" "^7.25.0" - "@babel/types" "^7.25.2" + "@babel/types" "^7.25.6" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.4.0": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125" - integrity sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q== +"@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6", "@babel/types@^7.4.0": + version "7.25.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.6.tgz#893942ddb858f32ae7a004ec9d3a76b3463ef8e6" + integrity sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw== dependencies: "@babel/helper-string-parser" "^7.24.8" "@babel/helper-validator-identifier" "^7.24.7" @@ -730,29 +733,29 @@ kuler "^2.0.0" "@discordjs/builders@^1.3.0": - version "1.8.2" - resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.8.2.tgz#535d970331ee40f20dec9ef8079e43092f323ce9" - integrity sha512-6wvG3QaCjtMu0xnle4SoOIeFB4y6fKMN6WZfy3BMKJdQQtPLik8KGzDwBVL/+wTtcE/ZlFjgEk74GublyEVZ7g== - dependencies: - "@discordjs/formatters" "^0.4.0" - "@discordjs/util" "^1.1.0" - "@sapphire/shapeshift" "^3.9.7" - discord-api-types "0.37.83" + version "1.9.0" + resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.9.0.tgz#71fa6de91132bd1deaff2a9daea7aa5d5c9f124a" + integrity sha512-0zx8DePNVvQibh5ly5kCEei5wtPBIUbSoE9n+91Rlladz4tgtFbJ36PZMxxZrTEOQ7AHMZ/b0crT/0fCy6FTKg== + dependencies: + "@discordjs/formatters" "^0.5.0" + "@discordjs/util" "^1.1.1" + "@sapphire/shapeshift" "^4.0.0" + discord-api-types "0.37.97" fast-deep-equal "^3.1.3" ts-mixer "^6.0.4" - tslib "^2.6.2" + tslib "^2.6.3" "@discordjs/collection@^1.2.0", "@discordjs/collection@^1.5.1": version "1.5.3" resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-1.5.3.tgz#5a1250159ebfff9efa4f963cfa7e97f1b291be18" integrity sha512-SVb428OMd3WO1paV3rm6tSjM4wC+Kecaa1EUGX7vc6/fddvw/6lg90z4QtCqm21zvVe92vMMDt9+DkIvjXImQQ== -"@discordjs/formatters@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@discordjs/formatters/-/formatters-0.4.0.tgz#066a2c2163b26ac066e6f621f17445be9690c6a9" - integrity sha512-fJ06TLC1NiruF35470q3Nr1bi95BdvKFAF+T5bNfZJ4bNdqZ3VZ+Ttg6SThqTxm6qumSG3choxLBHMC69WXNXQ== +"@discordjs/formatters@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@discordjs/formatters/-/formatters-0.5.0.tgz#2d284c4271bc41984339936df1d0164e470f3b7a" + integrity sha512-98b3i+Y19RFq1Xke4NkVY46x8KjJQjldHUuEbCqMvp1F5Iq9HgnGpu91jOi/Ufazhty32eRsKnnzS8n4c+L93g== dependencies: - discord-api-types "0.37.83" + discord-api-types "0.37.97" "@discordjs/rest@^1.3.0": version "1.7.1" @@ -778,10 +781,10 @@ resolved "https://registry.yarnpkg.com/@discordjs/util/-/util-0.3.1.tgz#4e8737e1dcff7e9f5eccc3116fb44755b65b1e97" integrity sha512-HxXKYKg7vohx2/OupUN/4Sd02Ev3PBJ5q0gtjdcvXb0ErCva8jNHWfe/v5sU3UKjIB/uxOhc+TDOnhqffj9pRA== -"@discordjs/util@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@discordjs/util/-/util-1.1.0.tgz#dcffd2b61aab8eadd66bea67811bc34fc769bb2a" - integrity sha512-IndcI5hzlNZ7GS96RV3Xw1R2kaDuXEp7tRIy/KlhidpN/BQ1qh1NZt3377dMLTa44xDUNKT7hnXkA/oUAzD/lg== +"@discordjs/util@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@discordjs/util/-/util-1.1.1.tgz#bafcde0faa116c834da1258d78ec237080bbab29" + integrity sha512-eddz6UnOBEB1oITPinyrB2Pttej49M9FZQY8NxgEvc3tq6ZICZ19m70RsmzRdDHk80O9NoYN/25AqJl8vPVf/g== "@fastify/busboy@^2.0.0": version "2.1.1" @@ -930,10 +933,10 @@ resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.5.3.tgz#03cd2a2f3665068f314736bdc56eee2025352422" integrity sha512-x7zadcfJGxFka1Q3f8gCts1F0xMwCKbZweM85xECGI0hBTeIZJGGCrHgLggihBoprlQ/hBmDR5LKfIPqnmHM3w== -"@sapphire/shapeshift@^3.9.7": - version "3.9.7" - resolved "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-3.9.7.tgz#43e23243cac8a0c046bf1e73baf3dbf407d33a0c" - integrity sha512-4It2mxPSr4OGn4HSQWGmhFMsNFGfFVhWeRPCRwbH972Ek2pzfGRZtb0pJ4Ze6oIzcyh2jw7nUDa6qGlWofgd9g== +"@sapphire/shapeshift@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-4.0.0.tgz#86c1b41002ff5d0b2ad21cbc3418b06834b89040" + integrity sha512-d9dUmWVA7MMiKobL3VpLF8P2aeanRTu6ypG2OIaEv/ZHH/SUQ2iHOVyi5wAPjQ+HmnMuL0whK9ez8I/raWbtIg== dependencies: fast-deep-equal "^3.1.3" lodash "^4.17.21" @@ -983,77 +986,79 @@ resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== -"@smithy/abort-controller@^3.1.1": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-3.1.1.tgz#291210611ff6afecfc198d0ca72d5771d8461d16" - integrity sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ== +"@smithy/abort-controller@^3.1.5": + version "3.1.5" + resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-3.1.5.tgz#ca7a86a3c6b20fabe59667143f58d9e198616d14" + integrity sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/config-resolver@^3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-3.0.5.tgz#727978bba7ace754c741c259486a19d3083431fd" - integrity sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA== +"@smithy/config-resolver@^3.0.8", "@smithy/config-resolver@^3.0.9": + version "3.0.9" + resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-3.0.9.tgz#dcf4b7747ca481866f9bfac21469ebe2031a599e" + integrity sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg== dependencies: - "@smithy/node-config-provider" "^3.1.4" - "@smithy/types" "^3.3.0" + "@smithy/node-config-provider" "^3.1.8" + "@smithy/types" "^3.5.0" "@smithy/util-config-provider" "^3.0.0" - "@smithy/util-middleware" "^3.0.3" + "@smithy/util-middleware" "^3.0.7" tslib "^2.6.2" -"@smithy/core@^2.3.0": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-2.3.1.tgz#99cb8eda23009fd7df736c82072dafcf4eb4ff5d" - integrity sha512-BC7VMXx/1BCmRPCVzzn4HGWAtsrb7/0758EtwOGFJQrlSwJBEjCcDLNZLFoL/68JexYa2s+KmgL/UfmXdG6v1w== - dependencies: - "@smithy/middleware-endpoint" "^3.1.0" - "@smithy/middleware-retry" "^3.0.13" - "@smithy/middleware-serde" "^3.0.3" - "@smithy/protocol-http" "^4.1.0" - "@smithy/smithy-client" "^3.1.11" - "@smithy/types" "^3.3.0" - "@smithy/util-middleware" "^3.0.3" +"@smithy/core@^2.4.6": + version "2.4.7" + resolved "https://registry.yarnpkg.com/@smithy/core/-/core-2.4.7.tgz#c4dc9ab3ba5f4b36addf967ca5fce036ce3b767d" + integrity sha512-goqMjX+IoVEnHZjYuzu8xwoZjoteMiLXsPHuXPBkWsGwu0o9c3nTjqkUlP1Ez/V8E501aOU7CJ3INk8mQcW2gw== + dependencies: + "@smithy/middleware-endpoint" "^3.1.4" + "@smithy/middleware-retry" "^3.0.22" + "@smithy/middleware-serde" "^3.0.7" + "@smithy/protocol-http" "^4.1.4" + "@smithy/smithy-client" "^3.3.6" + "@smithy/types" "^3.5.0" + "@smithy/util-body-length-browser" "^3.0.0" + "@smithy/util-middleware" "^3.0.7" + "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@smithy/credential-provider-imds@^3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.0.tgz#0e0e7ddaff1a8633cb927aee1056c0ab506b7ecf" - integrity sha512-0SCIzgd8LYZ9EJxUjLXBmEKSZR/P/w6l7Rz/pab9culE/RWuqelAKGJvn5qUOl8BgX8Yj5HWM50A5hiB/RzsgA== +"@smithy/credential-provider-imds@^3.2.3", "@smithy/credential-provider-imds@^3.2.4": + version "3.2.4" + resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.4.tgz#e1a2bfc8a0066f673756ad8735247cf284b9735c" + integrity sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w== dependencies: - "@smithy/node-config-provider" "^3.1.4" - "@smithy/property-provider" "^3.1.3" - "@smithy/types" "^3.3.0" - "@smithy/url-parser" "^3.0.3" + "@smithy/node-config-provider" "^3.1.8" + "@smithy/property-provider" "^3.1.7" + "@smithy/types" "^3.5.0" + "@smithy/url-parser" "^3.0.7" tslib "^2.6.2" -"@smithy/fetch-http-handler@^3.2.3", "@smithy/fetch-http-handler@^3.2.4": - version "3.2.4" - resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.4.tgz#c754de7e0ff2541b73ac9ba7cc955940114b3d62" - integrity sha512-kBprh5Gs5h7ug4nBWZi1FZthdqSM+T7zMmsZxx0IBvWUn7dK3diz2SHn7Bs4dQGFDk8plDv375gzenDoNwrXjg== +"@smithy/fetch-http-handler@^3.2.8", "@smithy/fetch-http-handler@^3.2.9": + version "3.2.9" + resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz#8d5199c162a37caa37a8b6848eefa9ca58221a0b" + integrity sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A== dependencies: - "@smithy/protocol-http" "^4.1.0" - "@smithy/querystring-builder" "^3.0.3" - "@smithy/types" "^3.3.0" + "@smithy/protocol-http" "^4.1.4" + "@smithy/querystring-builder" "^3.0.7" + "@smithy/types" "^3.5.0" "@smithy/util-base64" "^3.0.0" tslib "^2.6.2" -"@smithy/hash-node@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-3.0.3.tgz#82c5cb7b0f1a29ee7319081853d2d158c07dff24" - integrity sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw== +"@smithy/hash-node@^3.0.6": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-3.0.7.tgz#03b5a382fb588b8c2bac11b4fe7300aaf1661c88" + integrity sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.5.0" "@smithy/util-buffer-from" "^3.0.0" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@smithy/invalid-dependency@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz#8d9fd70e3a94b565a4eba4ffbdc95238e1930528" - integrity sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw== +"@smithy/invalid-dependency@^3.0.6": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.7.tgz#b36f258d94498f3c72ab6020091a66fc7cc16eda" + integrity sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.5.0" tslib "^2.6.2" "@smithy/is-array-buffer@^2.2.0": @@ -1070,168 +1075,168 @@ dependencies: tslib "^2.6.2" -"@smithy/middleware-content-length@^3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.5.tgz#1680aa4fb2a1c0505756103c9a5c2916307d9035" - integrity sha512-ILEzC2eyxx6ncej3zZSwMpB5RJ0zuqH7eMptxC4KN3f+v9bqT8ohssKbhNR78k/2tWW+KS5Spw+tbPF4Ejyqvw== +"@smithy/middleware-content-length@^3.0.8": + version "3.0.9" + resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.9.tgz#fb613d1a6b8c91e828d11c0d7a0a8576dba89b8b" + integrity sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA== dependencies: - "@smithy/protocol-http" "^4.1.0" - "@smithy/types" "^3.3.0" + "@smithy/protocol-http" "^4.1.4" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/middleware-endpoint@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.0.tgz#9b8a496d87a68ec43f3f1a0139868d6765a88119" - integrity sha512-5y5aiKCEwg9TDPB4yFE7H6tYvGFf1OJHNczeY10/EFF8Ir8jZbNntQJxMWNfeQjC1mxPsaQ6mR9cvQbf+0YeMw== - dependencies: - "@smithy/middleware-serde" "^3.0.3" - "@smithy/node-config-provider" "^3.1.4" - "@smithy/shared-ini-file-loader" "^3.1.4" - "@smithy/types" "^3.3.0" - "@smithy/url-parser" "^3.0.3" - "@smithy/util-middleware" "^3.0.3" +"@smithy/middleware-endpoint@^3.1.3", "@smithy/middleware-endpoint@^3.1.4": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz#222c9fa49c8af6ebf8bea8ab220d92d9b8c90d3d" + integrity sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ== + dependencies: + "@smithy/middleware-serde" "^3.0.7" + "@smithy/node-config-provider" "^3.1.8" + "@smithy/shared-ini-file-loader" "^3.1.8" + "@smithy/types" "^3.5.0" + "@smithy/url-parser" "^3.0.7" + "@smithy/util-middleware" "^3.0.7" tslib "^2.6.2" -"@smithy/middleware-retry@^3.0.12", "@smithy/middleware-retry@^3.0.13": - version "3.0.13" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-3.0.13.tgz#3bdd662aff01f360fcbaa166500bbc575dc9d1d0" - integrity sha512-zvCLfaRYCaUmjbF2yxShGZdolSHft7NNCTA28HVN9hKcEbOH+g5irr1X9s+in8EpambclGnevZY4A3lYpvDCFw== - dependencies: - "@smithy/node-config-provider" "^3.1.4" - "@smithy/protocol-http" "^4.1.0" - "@smithy/service-error-classification" "^3.0.3" - "@smithy/smithy-client" "^3.1.11" - "@smithy/types" "^3.3.0" - "@smithy/util-middleware" "^3.0.3" - "@smithy/util-retry" "^3.0.3" +"@smithy/middleware-retry@^3.0.21", "@smithy/middleware-retry@^3.0.22": + version "3.0.22" + resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-3.0.22.tgz#578ceafd72fd655cde35c35b462a8aad26fd07e2" + integrity sha512-svEN7O2Tf7BoaBkPzX/8AE2Bv7p16d9/ulFAD1Gmn5g19iMqNk1WIkMxAY7SpB9/tVtUwKx0NaIsBRl88gumZA== + dependencies: + "@smithy/node-config-provider" "^3.1.8" + "@smithy/protocol-http" "^4.1.4" + "@smithy/service-error-classification" "^3.0.7" + "@smithy/smithy-client" "^3.3.6" + "@smithy/types" "^3.5.0" + "@smithy/util-middleware" "^3.0.7" + "@smithy/util-retry" "^3.0.7" tslib "^2.6.2" uuid "^9.0.1" -"@smithy/middleware-serde@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz#74d974460f74d99f38c861e6862984543a880a66" - integrity sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA== +"@smithy/middleware-serde@^3.0.6", "@smithy/middleware-serde@^3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz#03f0dda75edffc4cc90ea422349cbfb82368efa7" + integrity sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/middleware-stack@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz#91845c7e61e6f137fa912b623b6def719a4f6ce7" - integrity sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA== +"@smithy/middleware-stack@^3.0.6", "@smithy/middleware-stack@^3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz#813fa7b47895ce0d085eac89c056d21b1e46e771" + integrity sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/node-config-provider@^3.1.4": - version "3.1.4" - resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-3.1.4.tgz#05647bed666aa8036a1ad72323c1942e5d421be1" - integrity sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ== +"@smithy/node-config-provider@^3.1.7", "@smithy/node-config-provider@^3.1.8": + version "3.1.8" + resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz#2c1092040b4062eae0f7c9e121cc00ac6a77efee" + integrity sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q== dependencies: - "@smithy/property-provider" "^3.1.3" - "@smithy/shared-ini-file-loader" "^3.1.4" - "@smithy/types" "^3.3.0" + "@smithy/property-provider" "^3.1.7" + "@smithy/shared-ini-file-loader" "^3.1.8" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/node-http-handler@^3.1.4": - version "3.1.4" - resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-3.1.4.tgz#be4195e45639e690d522cd5f11513ea822ff9d5f" - integrity sha512-+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg== +"@smithy/node-http-handler@^3.2.3", "@smithy/node-http-handler@^3.2.4": + version "3.2.4" + resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz#3c57c40d082c3bacac1e49955bd1240e8ccc40b2" + integrity sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ== dependencies: - "@smithy/abort-controller" "^3.1.1" - "@smithy/protocol-http" "^4.1.0" - "@smithy/querystring-builder" "^3.0.3" - "@smithy/types" "^3.3.0" + "@smithy/abort-controller" "^3.1.5" + "@smithy/protocol-http" "^4.1.4" + "@smithy/querystring-builder" "^3.0.7" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/property-provider@^3.1.3": - version "3.1.3" - resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-3.1.3.tgz#afd57ea82a3f6c79fbda95e3cb85c0ee0a79f39a" - integrity sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g== +"@smithy/property-provider@^3.1.6", "@smithy/property-provider@^3.1.7": + version "3.1.7" + resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-3.1.7.tgz#8a304a4b9110a067a93c784e4c11e175f82da379" + integrity sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/protocol-http@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-4.1.0.tgz#23519d8f45bf4f33960ea5415847bc2b620a010b" - integrity sha512-dPVoHYQ2wcHooGXg3LQisa1hH0e4y0pAddPMeeUPipI1tEOqL6A4N0/G7abeq+K8wrwSgjk4C0wnD1XZpJm5aA== +"@smithy/protocol-http@^4.1.3", "@smithy/protocol-http@^4.1.4": + version "4.1.4" + resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-4.1.4.tgz#6940d652b1825bda2422163ec9baab552669a338" + integrity sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/querystring-builder@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz#6b0e566f885bb84938d077c69e8f8555f686af13" - integrity sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw== +"@smithy/querystring-builder@^3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz#8c443c65f4249ff1637088db1166d18411d41555" + integrity sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.5.0" "@smithy/util-uri-escape" "^3.0.0" tslib "^2.6.2" -"@smithy/querystring-parser@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz#272a6b83f88dfcbbec8283d72a6bde850cc00091" - integrity sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ== +"@smithy/querystring-parser@^3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz#936206d1e6da9d862384dae730b4bad042d6a948" + integrity sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/service-error-classification@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz#73484255060a094aa9372f6cd972dcaf97e3ce80" - integrity sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ== +"@smithy/service-error-classification@^3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz#5bab4ad802d30bd3fa52b8134f6c171582358226" + integrity sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.5.0" -"@smithy/shared-ini-file-loader@^3.1.4": - version "3.1.4" - resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.4.tgz#7dceaf5a5307a2ee347ace8aba17312a1a3ede15" - integrity sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ== +"@smithy/shared-ini-file-loader@^3.1.7", "@smithy/shared-ini-file-loader@^3.1.8": + version "3.1.8" + resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz#7a0bf5f20cfe8e0c4a36d8dcab8194d0d2ee958e" + integrity sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/signature-v4@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-4.1.0.tgz#251ff43dc1f4ad66776122732fea9e56efc56443" - integrity sha512-aRryp2XNZeRcOtuJoxjydO6QTaVhxx/vjaR+gx7ZjaFgrgPRyZ3HCTbfwqYj6ZWEBHkCSUfcaymKPURaByukag== +"@smithy/signature-v4@^4.1.4": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-4.2.0.tgz#291f5a0e756cc251377e1e8af2a1f494e6173029" + integrity sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ== dependencies: "@smithy/is-array-buffer" "^3.0.0" - "@smithy/protocol-http" "^4.1.0" - "@smithy/types" "^3.3.0" + "@smithy/protocol-http" "^4.1.4" + "@smithy/types" "^3.5.0" "@smithy/util-hex-encoding" "^3.0.0" - "@smithy/util-middleware" "^3.0.3" + "@smithy/util-middleware" "^3.0.7" "@smithy/util-uri-escape" "^3.0.0" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@smithy/smithy-client@^3.1.10", "@smithy/smithy-client@^3.1.11": - version "3.1.11" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-3.1.11.tgz#f12a7a0acaa7db3ead488ddf12ef4681daec11a7" - integrity sha512-l0BpyYkciNyMaS+PnFFz4aO5sBcXvGLoJd7mX9xrMBIm2nIQBVvYgp2ZpPDMzwjKCavsXu06iuCm0F6ZJZc6yQ== - dependencies: - "@smithy/middleware-endpoint" "^3.1.0" - "@smithy/middleware-stack" "^3.0.3" - "@smithy/protocol-http" "^4.1.0" - "@smithy/types" "^3.3.0" - "@smithy/util-stream" "^3.1.3" +"@smithy/smithy-client@^3.3.5", "@smithy/smithy-client@^3.3.6": + version "3.3.6" + resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-3.3.6.tgz#882fcc4b5db35c284c7a7c6116b27be324c41202" + integrity sha512-qdH+mvDHgq1ss6mocyIl2/VjlWXew7pGwZQydwYJczEc22HZyX3k8yVPV9aZsbYbssHPvMDRA5rfBDrjQUbIIw== + dependencies: + "@smithy/middleware-endpoint" "^3.1.4" + "@smithy/middleware-stack" "^3.0.7" + "@smithy/protocol-http" "^4.1.4" + "@smithy/types" "^3.5.0" + "@smithy/util-stream" "^3.1.9" tslib "^2.6.2" -"@smithy/types@^3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@smithy/types/-/types-3.3.0.tgz#fae037c733d09bc758946a01a3de0ef6e210b16b" - integrity sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA== +"@smithy/types@^3.4.2", "@smithy/types@^3.5.0": + version "3.5.0" + resolved "https://registry.yarnpkg.com/@smithy/types/-/types-3.5.0.tgz#9589e154c50d9c5d00feb7d818112ef8fc285d6e" + integrity sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q== dependencies: tslib "^2.6.2" -"@smithy/url-parser@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-3.0.3.tgz#e8a060d9810b24b1870385fc2b02485b8a6c5955" - integrity sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A== +"@smithy/url-parser@^3.0.6", "@smithy/url-parser@^3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-3.0.7.tgz#9d7d7e4e38514bf75ade6e8a30d2300f3db17d1b" + integrity sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA== dependencies: - "@smithy/querystring-parser" "^3.0.3" - "@smithy/types" "^3.3.0" + "@smithy/querystring-parser" "^3.0.7" + "@smithy/types" "^3.5.0" tslib "^2.6.2" "@smithy/util-base64@^3.0.0": @@ -1280,37 +1285,37 @@ dependencies: tslib "^2.6.2" -"@smithy/util-defaults-mode-browser@^3.0.12": - version "3.0.13" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.13.tgz#f574bbb89d60f5dcc443f106087d317b370634d0" - integrity sha512-ZIRSUsnnMRStOP6OKtW+gCSiVFkwnfQF2xtf32QKAbHR6ACjhbAybDvry+3L5qQYdh3H6+7yD/AiUE45n8mTTw== +"@smithy/util-defaults-mode-browser@^3.0.21": + version "3.0.22" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.22.tgz#e9141ed58109d572337a621d96131526aaf4f42f" + integrity sha512-WKzUxNsOun5ETwEOrvooXeI1mZ8tjDTOcN4oruELWHhEYDgQYWwxZupURVyovcv+h5DyQT/DzK5nm4ZoR/Tw5Q== dependencies: - "@smithy/property-provider" "^3.1.3" - "@smithy/smithy-client" "^3.1.11" - "@smithy/types" "^3.3.0" + "@smithy/property-provider" "^3.1.7" + "@smithy/smithy-client" "^3.3.6" + "@smithy/types" "^3.5.0" bowser "^2.11.0" tslib "^2.6.2" -"@smithy/util-defaults-mode-node@^3.0.12": - version "3.0.13" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.13.tgz#cdd3a08bb5af4d17c2b0a951af9936ce7f3bae93" - integrity sha512-voUa8TFJGfD+U12tlNNLCDlXibt9vRdNzRX45Onk/WxZe7TS+hTOZouEZRa7oARGicdgeXvt1A0W45qLGYdy+g== - dependencies: - "@smithy/config-resolver" "^3.0.5" - "@smithy/credential-provider-imds" "^3.2.0" - "@smithy/node-config-provider" "^3.1.4" - "@smithy/property-provider" "^3.1.3" - "@smithy/smithy-client" "^3.1.11" - "@smithy/types" "^3.3.0" +"@smithy/util-defaults-mode-node@^3.0.21": + version "3.0.22" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.22.tgz#fc51f37aaa5ec03edec0da890a1ca1e3e3cdc70b" + integrity sha512-hUsciOmAq8fsGwqg4+pJfNRmrhfqMH4Y9UeGcgeUl88kPAoYANFATJqCND+O4nUvwp5TzsYwGpqpcBKyA8LUUg== + dependencies: + "@smithy/config-resolver" "^3.0.9" + "@smithy/credential-provider-imds" "^3.2.4" + "@smithy/node-config-provider" "^3.1.8" + "@smithy/property-provider" "^3.1.7" + "@smithy/smithy-client" "^3.3.6" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/util-endpoints@^2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-2.0.5.tgz#e3a7a4d1c41250bfd2b2d890d591273a7d8934be" - integrity sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg== +"@smithy/util-endpoints@^2.1.2": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-2.1.3.tgz#7498151e9dc714bdd0c6339314dd2350fa4d250a" + integrity sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw== dependencies: - "@smithy/node-config-provider" "^3.1.4" - "@smithy/types" "^3.3.0" + "@smithy/node-config-provider" "^3.1.8" + "@smithy/types" "^3.5.0" tslib "^2.6.2" "@smithy/util-hex-encoding@^3.0.0": @@ -1320,31 +1325,31 @@ dependencies: tslib "^2.6.2" -"@smithy/util-middleware@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-3.0.3.tgz#07bf9602682f5a6c55bc2f0384303f85fc68c87e" - integrity sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw== +"@smithy/util-middleware@^3.0.6", "@smithy/util-middleware@^3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-3.0.7.tgz#770d09749b6d170a1641384a2e961487447446fa" + integrity sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA== dependencies: - "@smithy/types" "^3.3.0" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/util-retry@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-3.0.3.tgz#9b2ac0dbb1c81f69812a8affa4d772bebfc0e049" - integrity sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w== +"@smithy/util-retry@^3.0.6", "@smithy/util-retry@^3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-3.0.7.tgz#694e0667574ffe9772f620b35d3c7286aced35e9" + integrity sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug== dependencies: - "@smithy/service-error-classification" "^3.0.3" - "@smithy/types" "^3.3.0" + "@smithy/service-error-classification" "^3.0.7" + "@smithy/types" "^3.5.0" tslib "^2.6.2" -"@smithy/util-stream@^3.1.2", "@smithy/util-stream@^3.1.3": - version "3.1.3" - resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-3.1.3.tgz#699ee2397cc1d474e46d2034039d5263812dca64" - integrity sha512-FIv/bRhIlAxC0U7xM1BCnF2aDRPq0UaelqBHkM2lsCp26mcBbgI0tCVTv+jGdsQLUmAMybua/bjDsSu8RQHbmw== +"@smithy/util-stream@^3.1.8", "@smithy/util-stream@^3.1.9": + version "3.1.9" + resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-3.1.9.tgz#d39656eae27696bdc5a3ec7c2f6b89c32dccd1ca" + integrity sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ== dependencies: - "@smithy/fetch-http-handler" "^3.2.4" - "@smithy/node-http-handler" "^3.1.4" - "@smithy/types" "^3.3.0" + "@smithy/fetch-http-handler" "^3.2.9" + "@smithy/node-http-handler" "^3.2.4" + "@smithy/types" "^3.5.0" "@smithy/util-base64" "^3.0.0" "@smithy/util-buffer-from" "^3.0.0" "@smithy/util-hex-encoding" "^3.0.0" @@ -1402,11 +1407,11 @@ "@types/node" "*" "@types/node@*": - version "22.0.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.0.0.tgz#04862a2a71e62264426083abe1e27e87cac05a30" - integrity sha512-VT7KSYudcPOzP5Q0wfbowyNLaVR8QWUdw+088uFWwfvpY6uCWaXpqV6ieLAu9WBcnTa7H4Z5RLK8I5t2FuOcqw== + version "22.7.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.4.tgz#e35d6f48dca3255ce44256ddc05dee1c23353fcc" + integrity sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg== dependencies: - undici-types "~6.11.1" + undici-types "~6.19.2" "@types/node@^14.14.14": version "14.18.63" @@ -1891,6 +1896,11 @@ mkdirp "^1.0.4" underscore "^1.13.1" +"@zxing/text-encoding@0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b" + integrity sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA== + abab@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" @@ -1947,18 +1957,6 @@ acme-client@4.2.5: debug "^4.1.1" node-forge "^1.3.0" -acorn-jsx@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" - integrity sha512-AU7pnZkguthwBjKgCg6998ByQNIMjbuDQZ8bb78QAFZwPfmKia8AIzgY/gWgqCjnht8JLdXmB4YxA0KaV60ncQ== - dependencies: - acorn "^3.0.4" - -acorn@^3.0.4, acorn@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" - integrity sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw== - aedes-packet@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/aedes-packet/-/aedes-packet-1.0.0.tgz#2eea46f97c925b0a1f4d03f4f1fe5ef887b100f1" @@ -2039,35 +2037,6 @@ ajv@^6.12.3: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -align-text@^0.1.1, align-text@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" - integrity sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg== - dependencies: - kind-of "^3.0.2" - longest "^1.0.1" - repeat-string "^1.5.2" - -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - integrity sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg== - -ansi-escape-sequences@^2.2.1, ansi-escape-sequences@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/ansi-escape-sequences/-/ansi-escape-sequences-2.2.2.tgz#174c78d6f8b7de75f8957ae81c7f72210c701635" - integrity sha512-8UeLcAdY7X4ZUBiuWoxqHfPGIUwJ5Vz7ujKdMUWbR0DwiBziHJbEMYzTvt7OQNtFb2NHxSxa3COicuPNgvE0XQ== - dependencies: - array-back "^1.0.2" - collect-all "~0.2.1" - -ansi-escape-sequences@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-escape-sequences/-/ansi-escape-sequences-3.0.0.tgz#1c18394b6af9b76ff9a63509fa497669fd2ce53e" - integrity sha512-nOj2mwGB2lJzx9YDqaiI77vYh4SWcOCTday6kdtx6ojUk1s1HqSiK604UIq8jlBVC0UBsX7Bph3SfOf9QsJerA== - dependencies: - array-back "^1.0.3" - ansi-escapes@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" @@ -2089,9 +2058,9 @@ ansi-regex@^5.0.1: integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== + version "6.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654" + integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA== ansi-styles@^2.2.1: version "2.2.1" @@ -2105,7 +2074,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -ansi-styles@^4.0.0, ansi-styles@^4.1.0: +ansi-styles@^4.0.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== @@ -2117,14 +2086,6 @@ ansi-styles@^6.1.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA== - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" - anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" @@ -2133,18 +2094,6 @@ anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -app-usage-stats@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/app-usage-stats/-/app-usage-stats-0.4.1.tgz#97eb9b89b5678fa2ddc9793b1298628cc218429f" - integrity sha512-elJOSZaWLWycmmQ5R6QvbKe0s3drumsU8JOJNvE4e/Pvjg52g65AAlKsCr65Kd1hAfr0I2E+AWgPlJQ/LZCDEw== - dependencies: - array-back "^1.0.4" - core-js "^2.4.1" - feature-detect-es6 "^1.3.1" - home-path "^1.0.3" - test-value "^2.1.0" - usage-stats "^0.8.2" - append-transform@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab" @@ -2157,39 +2106,7 @@ append-transform@^1.0.0: resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== -archiver-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2" - integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw== - dependencies: - glob "^7.1.4" - graceful-fs "^4.2.0" - lazystream "^1.0.0" - lodash.defaults "^4.2.0" - lodash.difference "^4.5.0" - lodash.flatten "^4.4.0" - lodash.isplainobject "^4.0.6" - lodash.union "^4.6.0" - normalize-path "^3.0.0" - readable-stream "^2.0.0" - -archiver-utils@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-3.0.4.tgz#a0d201f1cf8fce7af3b5a05aea0a337329e96ec7" - integrity sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw== - dependencies: - glob "^7.2.3" - graceful-fs "^4.2.0" - lazystream "^1.0.0" - lodash.defaults "^4.2.0" - lodash.difference "^4.5.0" - lodash.flatten "^4.4.0" - lodash.isplainobject "^4.0.6" - lodash.union "^4.6.0" - normalize-path "^3.0.0" - readable-stream "^3.6.0" - -archiver-utils@^5.0.0: +archiver-utils@^5.0.0, archiver-utils@^5.0.1, archiver-utils@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-5.0.2.tgz#63bc719d951803efc72cf961a56ef810760dd14d" integrity sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA== @@ -2202,44 +2119,31 @@ archiver-utils@^5.0.0: normalize-path "^3.0.0" readable-stream "^4.0.0" -archiver-zip-encrypted@1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-1.0.11.tgz#43a7b9ebba56c6689132b58e556df13e6ddd5878" - integrity sha512-uXQzXSrZKW7TZ1g4BhfJFt1KjlKqY4SnCgDS6QhQKJoAriPXPKqhFQbvaIirWcR0pi5h3UF5Ktau7FVnS3AsGw== +archiver-zip-encrypted@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-2.0.0.tgz#1f13604005419fc288e0b49cbf4996be08c7f551" + integrity sha512-QJPkMPb3fHwUnXpZlzbwvvzgzr4bKK84Kc+O8+oRtsEzLqK+iwJXygJ+mHouE0LWEtR0BNs6Oys/48hyRB5xOw== dependencies: aes-js "^3.1.2" - archiver "^5.3.0" - archiver-utils "^2.1.0" - buffer-crc32 "^0.2.13" - compress-commons "^4.1.1" - crc32-stream "^4.0.2" - zip-stream "^4.1.0" - -archiver@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-7.0.0.tgz#06802fffa0c00afe4628119d2752cc7b70e1e6e6" - integrity sha512-R9HM9egs8FfktSqUqyjlKmvF4U+CWNqm/2tlROV+lOFg79MLdT67ae1l3hU47pGy8twSXxHoiefMCh43w0BriQ== - dependencies: - archiver-utils "^5.0.0" - async "^3.2.4" + archiver "^7.0.0" + archiver-utils "^5.0.1" buffer-crc32 "^1.0.0" - readable-stream "^4.0.0" - readdir-glob "^1.1.2" - tar-stream "^3.0.0" + compress-commons "^6.0.0" + crc32-stream "^6.0.0" zip-stream "^6.0.0" -archiver@^5.3.0: - version "5.3.2" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.2.tgz#99991d5957e53bd0303a392979276ac4ddccf3b0" - integrity sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw== +archiver@7.0.1, archiver@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-7.0.1.tgz#c9d91c350362040b8927379c7aa69c0655122f61" + integrity sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ== dependencies: - archiver-utils "^2.1.0" + archiver-utils "^5.0.2" async "^3.2.4" - buffer-crc32 "^0.2.1" - readable-stream "^3.6.0" + buffer-crc32 "^1.0.0" + readable-stream "^4.0.0" readdir-glob "^1.1.2" - tar-stream "^2.2.0" - zip-stream "^4.1.0" + tar-stream "^3.0.0" + zip-stream "^6.0.1" archy@^1.0.0: version "1.0.0" @@ -2269,35 +2173,6 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - integrity sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA== - dependencies: - arr-flatten "^1.0.1" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA== - -arr-flatten@^1.0.1, arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== - -array-back@^1.0.2, array-back@^1.0.3, array-back@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/array-back/-/array-back-1.0.4.tgz#644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b" - integrity sha512-1WxbZvrmyhkNoeYcizokbmh5oiOCIfyvGtcqbK3Ls1v1fKcquzxnQSceOx6tzq7jmai2kFLWIpGND2cLhH6TPw== - dependencies: - typical "^2.6.0" - array-buffer-byte-length@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" @@ -2306,56 +2181,11 @@ array-buffer-byte-length@^1.0.1: call-bind "^1.0.5" is-array-buffer "^3.0.4" -array-each@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" - integrity sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA== - array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== -array-slice@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" - integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w== - -array-tools@^1.0.6, array-tools@^1.1.0, array-tools@^1.1.4, array-tools@^1.8.4: - version "1.8.6" - resolved "https://registry.yarnpkg.com/array-tools/-/array-tools-1.8.6.tgz#145771f7f9c94e98cc5ea4196a99b8323aee18ae" - integrity sha512-x7nT/yV2Mv6whp1BQw2BL2+8bRCu1Wb8sB+F0uNa/ZiP4WjpA6i9JKGtlDlWj2ggo49bPQMM/Du/wMururI/Bg== - dependencies: - object-tools "^1.6.1" - typical "^2.1" - -array-tools@^2: - version "2.0.9" - resolved "https://registry.yarnpkg.com/array-tools/-/array-tools-2.0.9.tgz#5a511de7a41be0eec9ffdcd4912d0af9f0caca35" - integrity sha512-R2neDbbXhrU0EaXIDG48RNS9fqdjMkaqZK37d37LaCvxZ4JaQ6ELNbxlQB2FVdQcj7ZlZCi97iZtz0UET6xPrA== - dependencies: - ansi-escape-sequences "^2.2.2" - array-back "^1.0.2" - collect-json "^1.0.7" - filter-where "^1.0.1" - object-get "^2.0.0" - reduce-extract "^1.0.0" - reduce-flatten "^1.0.0" - reduce-unique "^1.0.0" - reduce-without "^1.0.0" - sort-array "^1.0.0" - test-value "^1.0.1" - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - integrity sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg== - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== - array.prototype.reduce@^1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz#6aadc2f995af29cb887eb866d981dc85ab6f7dc7" @@ -2383,11 +2213,6 @@ arraybuffer.prototype.slice@^1.0.3: is-array-buffer "^3.0.4" is-shared-array-buffer "^1.0.2" -asap@~2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== - asn1.js@^5.3.0: version "5.4.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" @@ -2420,21 +2245,6 @@ assert-plus@^0.1.5: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160" integrity sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw== -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== - -async-each@^1.0.0: - version "1.0.6" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.6.tgz#52f1d9403818c179b7561e11a5d1b77eb2160e77" - integrity sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg== - -async-limiter@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" - integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== - async-mutex@^0.3.0: version "0.3.2" resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.3.2.tgz#1485eda5bda1b0ec7c8df1ac2e815757ad1831df" @@ -2442,17 +2252,10 @@ async-mutex@^0.3.0: dependencies: tslib "^2.3.1" -async@^2.0.1: - version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" - integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== - dependencies: - lodash "^4.17.14" - -async@^3.2.0, async@^3.2.3, async@^3.2.4, async@~3.2.0: - version "3.2.5" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" - integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== +async@^3.2.0, async@^3.2.3, async@^3.2.4: + version "3.2.6" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" + integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== async@~0.9.0: version "0.9.2" @@ -2464,11 +2267,6 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -atob@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - available-typed-arrays@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" @@ -2487,9 +2285,9 @@ aws-sign@~0.3.0: integrity sha512-pEMJAknifcXqXqYVXzGPIu8mJvxtJxIdpVpAs8HNS+paT+9srRUDMQn+3hULS7WbLmttcmvgMvnDcFujqXJyPw== aws4@^1.12.0, aws4@^1.8.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.0.tgz#d9b802e9bb9c248d7be5f7f5ef178dc3684e9dcc" - integrity sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g== + version "1.13.2" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef" + integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw== axios@0.26.1, axios@^0.26.1: version "0.26.1" @@ -2514,186 +2312,18 @@ axios@^0.27.2: form-data "^4.0.0" axios@^1.6.8: - version "1.7.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" - integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== + version "1.7.7" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f" + integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" proxy-from-env "^1.1.0" b4a@^1.6.4: - version "1.6.6" - resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.6.tgz#a4cc349a3851987c3c4ac2d7785c18744f6da9ba" - integrity sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg== - -babel-cli@^6.16.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" - integrity sha512-wau+BDtQfuSBGQ9PzzFL3REvR9Sxnd4LKwtcHAiPjhugA7K/80vpHXafj+O5bAqJOuSefjOx5ZJnNSR2J1Qw6Q== - dependencies: - babel-core "^6.26.0" - babel-polyfill "^6.26.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - commander "^2.11.0" - convert-source-map "^1.5.0" - fs-readdir-recursive "^1.0.0" - glob "^7.1.2" - lodash "^4.17.4" - output-file-sync "^1.1.2" - path-is-absolute "^1.0.1" - slash "^1.0.0" - source-map "^0.5.6" - v8flags "^2.1.1" - optionalDependencies: - chokidar "^1.6.1" - -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g== - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-core@^6.26.0: - version "6.26.3" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" - integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.1" - debug "^2.6.9" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.8" - slash "^1.0.0" - source-map "^0.5.7" - -babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - -babel-helper-call-delegate@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - integrity sha512-RL8n2NiEj+kKztlrVJM9JT1cXzzAdvWFh76xh/H1I4nKwunzE4INBXn8ieCZ+wh4zWszZk7NBS1s/8HR5jDkzQ== - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-define-map@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - integrity sha512-bHkmjcC9lM1kmZcVpA5t2om2nzT/xiZpo6TJq7UlZ3wqKfzia4veeXbIhKvJXAMzhhEBd3cR1IElL5AenWEUpA== - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - integrity sha512-Oo6+e2iX+o9eVvJ9Y5eKL5iryeRdsIkwRYheCuhYdVHsdEQysbc2z2QkqCLIYnNxkT5Ss3ggrHdXiDI7Dhrn4Q== - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - integrity sha512-WfgKFX6swFB1jS2vo+DwivRN4NB8XUdM3ij0Y1gnC21y1tdBoe6xjVnd7NSI6alv+gZXCtJqvrTeMW3fR/c0ng== - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-hoist-variables@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - integrity sha512-zAYl3tqerLItvG5cKYw7f1SpvIxS9zi7ohyGHaI9cgDUjAT6YcY9jIEH5CstetP5wHIVSceXwNS7Z5BpJg+rOw== - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-optimise-call-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - integrity sha512-Op9IhEaxhbRT8MDXx2iNuMgciu2V8lDvYCNQbDGjdBNCjaMvyLf4wl4A3b8IgndCyQF8TwfgsQ8T3VD8aX1/pA== - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-regex@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" - integrity sha512-VlPiWmqmGJp0x0oK27Out1D+71nVVCTSdlbhIVoaBAj2lUgrNjBCRR9+llO4lTSb2O4r7PJg+RobRkhBrf6ofg== - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-replace-supers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - integrity sha512-sLI+u7sXJh6+ToqDr57Bv973kCepItDhMou0xCP2YPVmR1jkHSCY+p1no8xErbV1Siz5QE8qKT1WIwybSWlqjw== - dependencies: - babel-helper-optimise-call-expression "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - integrity sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ== - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - integrity sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-check-es2015-constants@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - integrity sha512-B1M5KBP29248dViEo1owyY32lk1ZSH2DaNNrXLGt8lyjjHm7pBqAdQ7VKUPR6EEDO323+OvT3MQXbCin8ooWdA== - dependencies: - babel-runtime "^6.22.0" + version "1.6.7" + resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.7.tgz#a99587d4ebbfbd5a6e3b21bdb5d5fa385767abe4" + integrity sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg== babel-plugin-jsx-pragmatic@^1.0.2: version "1.0.2" @@ -2707,264 +2337,7 @@ babel-plugin-syntax-jsx@^6.0.0: resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" integrity sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw== -babel-plugin-transform-es2015-arrow-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - integrity sha512-PCqwwzODXW7JMrzu+yZIaYbPQSKjDTAsNNlK2l5Gg9g4rz2VzLnZsStvp/3c46GfXpwkyufb3NCyG9+50FF1Vg== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - integrity sha512-2+ujAT2UMBzYFm7tidUsYh+ZoIutxJ3pN9IYrF1/H6dCKtECfhmB8UkHVpyxDwkj0CYbQG35ykoz925TUnBc3A== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoping@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - integrity sha512-YiN6sFAQ5lML8JjCmr7uerS5Yc/EMbgg9G8ZNmk2E3nYX4ckHR01wrkeeMijEf5WHNK5TW0Sl0Uu3pv3EdOJWw== - dependencies: - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-plugin-transform-es2015-classes@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - integrity sha512-5Dy7ZbRinGrNtmWpquZKZ3EGY8sDgIVB4CU8Om8q8tnMLrD/m94cKglVcHps0BCTdZ0TJeeAWOq2TK9MIY6cag== - dependencies: - babel-helper-define-map "^6.24.1" - babel-helper-function-name "^6.24.1" - babel-helper-optimise-call-expression "^6.24.1" - babel-helper-replace-supers "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-computed-properties@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - integrity sha512-C/uAv4ktFP/Hmh01gMTvYvICrKze0XVX9f2PdIXuriCSvUmV9j+u+BB9f5fJK3+878yMK6dkdcq+Ymr9mrcLzw== - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-destructuring@^6.22.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - integrity sha512-aNv/GDAW0j/f4Uy1OEPZn1mqD+Nfy9viFGBfQ5bZyT35YqOiqx7/tXdyfZkJ1sC21NyEsBdfDY6PYmLHF4r5iA== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-duplicate-keys@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" - integrity sha512-ossocTuPOssfxO2h+Z3/Ea1Vo1wWx31Uqy9vIiJusOP4TbF7tPs9U0sJ9pX9OJPf4lXRGj5+6Gkl/HHKiAP5ug== - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-for-of@^6.22.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - integrity sha512-DLuRwoygCoXx+YfxHLkVx5/NpeSbVwfoTeBykpJK7JhYWlL/O8hgAK/reforUnZDlxasOrVPPJVI/guE3dCwkw== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - integrity sha512-iFp5KIcorf11iBqu/y/a7DK3MN5di3pNCzto61FqCNnUX4qeBwcV1SLqe10oXNnCaxBUImX3SckX2/o1nsrTcg== - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - integrity sha512-tjFl0cwMPpDYyoqYA9li1/7mGFit39XiNX5DKC/uCNjBctMxyL1/PT/l4rSlbvBG1pOKI88STRdUsWXB3/Q9hQ== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-modules-amd@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" - integrity sha512-LnIIdGWIKdw7zwckqx+eGjcS8/cl8D74A3BpJbGjKTFFNJSMrjN4bIh22HY1AlkUbeLG6X6OZj56BDvWD+OeFA== - dependencies: - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.26.2" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" - integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q== - dependencies: - babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-types "^6.26.0" - -babel-plugin-transform-es2015-modules-systemjs@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" - integrity sha512-ONFIPsq8y4bls5PPsAWYXH/21Hqv64TBxdje0FvU3MhIV6QM2j5YS7KvAzg/nTIVLot2D2fmFQrFWCbgHlFEjg== - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-umd@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" - integrity sha512-LpVbiT9CLsuAIp3IG0tfbVo81QIhn6pE8xBJ7XSeCtFlMltuar5VuBV6y6Q45tpui9QWcy5i0vLQfCfrnF7Kiw== - dependencies: - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-object-super@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - integrity sha512-8G5hpZMecb53vpD3mjs64NhI1au24TAmokQ4B+TBFBjN9cVoGoOvotdrMMRmHvVZUEvqGUPWL514woru1ChZMA== - dependencies: - babel-helper-replace-supers "^6.24.1" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-parameters@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - integrity sha512-8HxlW+BB5HqniD+nLkQ4xSAVq3bR/pcYW9IigY+2y0dI+Y7INFeTbfAQr+63T3E4UDsZGjyb+l9txUnABWxlOQ== - dependencies: - babel-helper-call-delegate "^6.24.1" - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-shorthand-properties@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - integrity sha512-mDdocSfUVm1/7Jw/FIRNw9vPrBQNePy6wZJlR8HAUBLybNp1w/6lr6zZ2pjMShee65t/ybR5pT8ulkLzD1xwiw== - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-spread@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - integrity sha512-3Ghhi26r4l3d0Js933E5+IhHwk0A1yiutj9gwvzmFbVV0sPMYk2lekhOufHBswX7NCoSeF4Xrl3sCIuSIa+zOg== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-sticky-regex@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" - integrity sha512-CYP359ADryTo3pCsH0oxRo/0yn6UsEZLqYohHmvLQdfS9xkf+MbCzE3/Kolw9OYIY4ZMilH25z/5CbQbwDD+lQ== - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-template-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - integrity sha512-x8b9W0ngnKzDMHimVtTfn5ryimars1ByTqsfBDwAqLibmuuQY6pgBQi5z1ErIsUOWBdw1bW9FSz5RZUojM4apg== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-typeof-symbol@^6.22.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" - integrity sha512-fz6J2Sf4gYN6gWgRZaoFXmq93X+Li/8vf+fb0sGDVtdeWvxC9y5/bTD7bvfWMEq6zetGEHpWjtzRGSugt5kNqw== - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-unicode-regex@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" - integrity sha512-v61Dbbihf5XxnYjtBN04B/JBvsScY37R1cZT5r9permN1cp+b70DY3Ib3fIkgn1DI9U3tGgBJZVD8p/mE/4JbQ== - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - regexpu-core "^2.0.0" - -babel-plugin-transform-regenerator@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" - integrity sha512-LS+dBkUGlNR15/5WHKe/8Neawx663qttS6AGqoOUhICc9d1KciBvtrQSuc0PI+CxQ2Q/S1aKuJ+u64GtLdcEZg== - dependencies: - regenerator-transform "^0.10.0" - -babel-plugin-transform-strict-mode@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - integrity sha512-j3KtSpjyLSJxNoCDrhwiJad8kw0gJ9REGj8/CqL0HeRyLnvUNYV9zcqluL6QJSXh3nfsLEmSLvwRfGzrgR96Pw== - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-polyfill@^6.13.0, babel-polyfill@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" - integrity sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ== - dependencies: - babel-runtime "^6.26.0" - core-js "^2.5.0" - regenerator-runtime "^0.10.5" - -babel-preset-es2015@^6.16.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939" - integrity sha512-XfwUqG1Ry6R43m4Wfob+vHbIVBIqTg/TJY4Snku1iIzeH7mUnwHA8Vagmv+ZQbPwhS8HgsdQvy28Py3k5zpoFQ== - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.24.1" - babel-plugin-transform-es2015-classes "^6.24.1" - babel-plugin-transform-es2015-computed-properties "^6.24.1" - babel-plugin-transform-es2015-destructuring "^6.22.0" - babel-plugin-transform-es2015-duplicate-keys "^6.24.1" - babel-plugin-transform-es2015-for-of "^6.22.0" - babel-plugin-transform-es2015-function-name "^6.24.1" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-plugin-transform-es2015-modules-systemjs "^6.24.1" - babel-plugin-transform-es2015-modules-umd "^6.24.1" - babel-plugin-transform-es2015-object-super "^6.24.1" - babel-plugin-transform-es2015-parameters "^6.24.1" - babel-plugin-transform-es2015-shorthand-properties "^6.24.1" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.24.1" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.22.0" - babel-plugin-transform-es2015-unicode-regex "^6.24.1" - babel-plugin-transform-regenerator "^6.24.1" - -babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - integrity sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A== - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.6.1: +babel-runtime@^6.6.1: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== @@ -2972,47 +2345,6 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runti core-js "^2.4.0" regenerator-runtime "^0.11.0" -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - integrity sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg== - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - integrity sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA== - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - integrity sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g== - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== - backo2@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" @@ -3031,9 +2363,9 @@ balanced-match@^1.0.0: integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== bare-events@^2.2.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.4.2.tgz#3140cca7a0e11d49b3edc5041ab560659fd8e1f8" - integrity sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q== + version "2.5.0" + resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.5.0.tgz#305b511e262ffd8b9d5616b056464f8e1b3329cc" + integrity sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A== base-64@^0.1.0: version "0.1.0" @@ -3055,19 +2387,6 @@ base64url@3.x.x: resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d" integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A== -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" @@ -3090,11 +2409,6 @@ bignumber.js@^9.0.0, bignumber.js@^9.0.1: resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c" integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug== -binary-extensions@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" - integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== - binary-extensions@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" @@ -3105,7 +2419,7 @@ binary-search@1.3.6: resolved "https://registry.yarnpkg.com/binary-search/-/binary-search-1.3.6.tgz#e32426016a0c5092f0f3598836a1c7da3560565c" integrity sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA== -bindings@^1.1.1, bindings@^1.5.0: +bindings@^1.1.1: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== @@ -3120,7 +2434,7 @@ bl@^2.2.1: readable-stream "^2.3.5" safe-buffer "^5.1.1" -bl@^4.0.2, bl@^4.0.3: +bl@^4.0.2: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== @@ -3129,6 +2443,13 @@ bl@^4.0.2, bl@^4.0.3: inherits "^2.0.4" readable-stream "^3.4.0" +block-stream2@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/block-stream2/-/block-stream2-2.1.0.tgz#ac0c5ef4298b3857796e05be8ebed72196fa054b" + integrity sha512-suhjmLI57Ewpmq00qaygS8UgEq2ly2PCItenIyhMqVjo4t4pGzqMvfgJuX8iWTeSDdfSSqS6j38fL4ToNL7Pfg== + dependencies: + readable-stream "^3.4.0" + bluebird@^2.6.2: version "2.11.0" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" @@ -3139,20 +2460,15 @@ bluebird@^3.3.5, bluebird@^3.5.0: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -bluebird@~3.4.6: - version "3.4.7" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" - integrity sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA== - bn.js@^4.0.0: version "4.12.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -body-parser@1.20.2: - version "1.20.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" - integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== +body-parser@1.20.3: + version "1.20.3" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6" + integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g== dependencies: bytes "3.1.2" content-type "~1.0.5" @@ -3162,7 +2478,7 @@ body-parser@1.20.2: http-errors "2.0.0" iconv-lite "0.4.24" on-finished "2.4.1" - qs "6.11.0" + qs "6.13.0" raw-body "2.5.2" type-is "~1.6.18" unpipe "1.0.0" @@ -3179,7 +2495,7 @@ bowser@^2.11.0: resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f" integrity sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA== -brace-expansion@^1.0.0, brace-expansion@^1.1.7: +brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== @@ -3194,32 +2510,7 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - integrity sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw== - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -braces@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -braces@^3.0.3, braces@~3.0.2: +braces@~3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== @@ -3233,14 +2524,19 @@ brotli@^1.3.3: dependencies: base64-js "^1.1.2" +browser-or-node@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/browser-or-node/-/browser-or-node-2.1.1.tgz#738790b3a86a8fc020193fa581273fbe65eaea0f" + integrity sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg== + browserslist@^4.23.1: - version "4.23.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.2.tgz#244fe803641f1c19c28c48c4b6ec9736eb3d32ed" - integrity sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA== + version "4.24.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.0.tgz#a1325fe4bc80b64fda169629fc01b3d6cecd38d4" + integrity sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A== dependencies: - caniuse-lite "^1.0.30001640" - electron-to-chromium "^1.4.820" - node-releases "^2.0.14" + caniuse-lite "^1.0.30001663" + electron-to-chromium "^1.5.28" + node-releases "^2.0.18" update-browserslist-db "^1.1.0" bson@^1.1.4: @@ -3255,16 +2551,16 @@ bson@^4.7.0: dependencies: buffer "^5.6.0" -buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, 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-crc32@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-1.0.0.tgz#a10993b9055081d55304bd9feb4a072de179f405" integrity sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w== +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-constant-time@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" @@ -3360,32 +2656,6 @@ cacache@^15.2.0: tar "^6.0.2" unique-filename "^1.1.1" -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -cache-point@~0.3.3: - version "0.3.4" - resolved "https://registry.yarnpkg.com/cache-point/-/cache-point-0.3.4.tgz#152db502c6bb23b5aa3f663e230d5de8ec4e4f3f" - integrity sha512-xY7ZTpb6twvkNvsz9ucBaySYmA/NG+lw7qWagtdphqczVqesDzrjaqpEEWEjmMtdtt3f5g4odW9m69Bro8BV4A== - dependencies: - array-back "^1.0.3" - core-js "^2.4.1" - feature-detect-es6 "^1.3.1" - fs-then-native "^1.0.2" - mkdirp "~0.5.1" - caching-transform@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-3.0.2.tgz#601d46b91eca87687a281e71cef99791b0efca70" @@ -3415,11 +2685,6 @@ camel-case@^3.0.0: no-case "^2.2.0" upper-case "^1.1.1" -camelcase@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" - integrity sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g== - camelcase@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" @@ -3430,23 +2695,16 @@ camelcase@^5.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-lite@^1.0.30001640: - version "1.0.30001644" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001644.tgz#bcd4212a7a03bdedba1ea850b8a72bfe4bec2395" - integrity sha512-YGvlOZB4QhZuiis+ETS0VXR+MExbFf4fZYYeMTEE0aTQd/RdIjkTyZjLrbYVKnHzppDvnOhritRVv+i7Go6mHw== +caniuse-lite@^1.0.30001663: + version "1.0.30001664" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz#d588d75c9682d3301956b05a3749652a80677df4" + integrity sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g== caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== -catharsis@~0.8.8: - version "0.8.11" - resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.8.11.tgz#d0eb3d2b82b7da7a3ce2efb1a7b00becc6643468" - integrity sha512-a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g== - dependencies: - lodash "^4.17.14" - cbor@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/cbor/-/cbor-5.2.0.tgz#4cca67783ccd6de7b50ab4ed62636712f287a67c" @@ -3455,15 +2713,7 @@ cbor@5.2.0: bignumber.js "^9.0.1" nofilter "^1.0.4" -center-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" - integrity sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ== - dependencies: - align-text "^0.1.3" - lazy-cache "^1.0.3" - -chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.0.0, chalk@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== @@ -3483,36 +2733,12 @@ chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@~4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - charenc@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA== -chokidar@^1.6.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - integrity sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg== - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -chokidar@^3.4.0: +chokidar@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== @@ -3540,16 +2766,6 @@ cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - clean-css@^4.2.1: version "4.2.4" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178" @@ -3562,16 +2778,6 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cli-commands@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/cli-commands/-/cli-commands-0.1.0.tgz#c57cacc406bbcf9ee21646607161ed432ef5a05a" - integrity sha512-q7sQb4fp+8T7OLlHf0iJoCUFqvgURR/QEj0WmFZVqJZsfEo4jJ0ozSNuCHTDn5Z92WnjCfQlsi2jBjbOMkkNjA== - dependencies: - ansi-escape-sequences "^3.0.0" - command-line-args "^3.0.1" - command-line-commands "^1.0.4" - command-line-usage "^3.0.5" - cli-cursor@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" @@ -3584,15 +2790,6 @@ cli-width@^2.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== -cliui@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" - integrity sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA== - dependencies: - center-align "^0.1.1" - right-align "^0.1.1" - wordwrap "0.0.2" - cliui@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" @@ -3625,40 +2822,6 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== -collect-all@^1.0.2, collect-all@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/collect-all/-/collect-all-1.0.4.tgz#50cd7119ac24b8e12a661f0f8c3aa0ea7222ddfc" - integrity sha512-RKZhRwJtJEP5FWul+gkSMEnaK6H3AGPTTWOiRimCcs+rc/OmQE3Yhy1Q7A7KsdkG3ZXVdZq68Y6ONSdvkeEcKA== - dependencies: - stream-connect "^1.0.2" - stream-via "^1.0.4" - -collect-all@~0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/collect-all/-/collect-all-0.2.1.tgz#7225fb4585c22d4ffac886f0abaf5abc563a1a6a" - integrity sha512-DJM6+T8WAUEDVPxvbousmxRvtGW5+Q7JazRYmELEzn+BLGlRrqQ1ENKIpfiUjveCupWgUQd4iTvrMfDo0HiVKw== - dependencies: - stream-connect "^1.0.1" - stream-via "~0.1.0" - typical "^2.3.0" - -collect-json@^1.0.1, collect-json@^1.0.7, collect-json@^1.0.8: - version "1.0.9" - resolved "https://registry.yarnpkg.com/collect-json/-/collect-json-1.0.9.tgz#eb9906ef3160899e46e8482fac13a5e591dae9ae" - integrity sha512-5sGzu8rjhY4uzm4FJOVsNtcAhNiyEsZ70Lz3xv+7mXuLfU41QikE0es3nn2N0knqEKg+r4K7TMFHFmR8OFGpFA== - dependencies: - collect-all "^1.0.4" - stream-connect "^1.0.2" - stream-via "^1.0.4" - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw== - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - color-convert@^1.9.0, color-convert@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -3704,11 +2867,6 @@ color@^3.1.3: color-convert "^1.9.3" color-string "^1.6.0" -colors@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" - integrity sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w== - colorspace@1.1.x: version "1.1.4" resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243" @@ -3717,22 +2875,6 @@ colorspace@1.1.x: color "^3.1.3" text-hex "1.0.x" -column-layout@^2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/column-layout/-/column-layout-2.1.4.tgz#ed2857092ccf8338026fe538379d9672d70b3641" - integrity sha512-u0d19HeRqHrs8nK+dBK5yzJ1fcMKXZmhXeKOVZfjbU2PJDMavQn256E262Z1qOD5Esg32dq17cM2pYUnO1WVTw== - dependencies: - ansi-escape-sequences "^2.2.2" - array-back "^1.0.3" - collect-json "^1.0.8" - command-line-args "^2.1.6" - core-js "^2.4.0" - deep-extend "~0.4.1" - feature-detect-es6 "^1.2.0" - object-tools "^2.0.6" - typical "^2.4.2" - wordwrapjs "^1.2.0" - combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -3747,80 +2889,7 @@ combined-stream@~0.0.4: dependencies: delayed-stream "0.0.5" -command-line-args@^2.1.4, command-line-args@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-2.1.6.tgz#f197d6eaff34c9085577484b2864375b294f5697" - integrity sha512-qo+q+AcV8vRQCVDCoh3gNbUiVI86ywoKkIUJeNCNZBCw1qv111Dp0F3nZ2PR/92HrGsgsABuAAi7Fe/z/cj8YQ== - dependencies: - array-back "^1.0.2" - command-line-usage "^2" - core-js "^2.0.1" - feature-detect-es6 "^1.2.0" - find-replace "^1" - typical "^2.3.0" - -command-line-args@^3.0.0, command-line-args@^3.0.1: - version "3.0.5" - resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-3.0.5.tgz#5bd4ad45e7983e5c1344918e40280ee2693c5ac0" - integrity sha512-M29kjOI24VF4HqatnqVyDqyeq3SYYZbq6LWv/AdVZ5LvrcqVNSN2XeYPrBxcO19T8YkGmyCqTUqYR07DFjVhyg== - dependencies: - array-back "^1.0.4" - feature-detect-es6 "^1.3.1" - find-replace "^1.0.2" - typical "^2.6.0" - -command-line-commands@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/command-line-commands/-/command-line-commands-1.0.4.tgz#034f9b167b5188afbdcf6b2efbb150fc8442c32b" - integrity sha512-l/z6Avh5umBu6grouQAQbvPU87NH4ud1WBMV+P4n+LRQj2MiCfaVXLCo8Klcd9xwOgungPbnpNVuZ6+AX9W+0g== - dependencies: - array-back "^1.0.3" - feature-detect-es6 "^1.3.1" - -command-line-tool@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/command-line-tool/-/command-line-tool-0.1.0.tgz#91a11ba48ac63a4a687554367980f7c6423c149d" - integrity sha512-iYnWHIP8pJ4+b5Zv4SWTt+YQeMndbFBA0sj3bH24bbahCrXpZnVFVP5CvcClyYqIPF6RVaDoeqAWdX0GhWG3ZQ== - dependencies: - ansi-escape-sequences "^2.2.1" - array-back "^1.0.2" - -command-line-tool@~0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/command-line-tool/-/command-line-tool-0.5.2.tgz#f87d6977f56bbdd2d5dfcf946345dd2cd9c6a53a" - integrity sha512-TiZWqiRiyG4M6ZwbxKiCnBMDrD+rMNLeV2rf3rjmRH6O1yKvVmRpXlVxprABqks0nI/NU5F5JOCC14XQBFddlw== - dependencies: - ansi-escape-sequences "^2.2.2" - array-back "^1.0.3" - command-line-args "^3.0.0" - command-line-usage "^3.0.3" - feature-detect-es6 "^1.3.0" - typical "^2.4.2" - -command-line-usage@^2: - version "2.0.5" - resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-2.0.5.tgz#f80c35ca5e8624841923ea3be3b9bfbf4f7be27b" - integrity sha512-xxUZrDySMWQknZRlCKXbuSCR8PUQXLbypmXPv8a1ZaxIGE5SSynjXNZzig8VTcTcXuvIVf9y563nucsRAYnCKA== - dependencies: - ansi-escape-sequences "^2.2.2" - array-back "^1.0.3" - column-layout "^2.1.1" - feature-detect-es6 "^1.2.0" - typical "^2.4.2" - wordwrapjs "^1.2.0" - -command-line-usage@^3.0.3, command-line-usage@^3.0.5: - version "3.0.8" - resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-3.0.8.tgz#b6a20978c1b383477f5c11a529428b880bfe0f4d" - integrity sha512-KMWPF8wNWa+wzffE9247hlDB1c9DMMxhwIFzwRn7oNv5CU7auuJ3zKWv756F/9qqlEucC5jI8/3S8qdGKdVelw== - dependencies: - ansi-escape-sequences "^3.0.0" - array-back "^1.0.3" - feature-detect-es6 "^1.3.1" - table-layout "^0.3.0" - typical "^2.6.0" - -commander@^2.11.0, commander@^2.19.0: +commander@^2.19.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -3830,32 +2899,12 @@ commander@^6.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== -common-sequence@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/common-sequence/-/common-sequence-1.0.2.tgz#30e07f3f8f6f7f9b3dee854f20b2d39eee086de8" - integrity sha512-z3ln8PqfoBRwY1X0B1W0NEvfuo3+lZdvVjYaxusK84FPGkBy+ZqfbMhgdGOLr1v1dv13z5KYOtbL/yupL4I8Yw== - commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== -component-emitter@^1.2.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17" - integrity sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ== - -compress-commons@^4.1.1, compress-commons@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.2.tgz#6542e59cb63e1f46a8b21b0e06f9a32e4c8b06df" - integrity sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg== - dependencies: - buffer-crc32 "^0.2.13" - crc32-stream "^4.0.2" - normalize-path "^3.0.0" - readable-stream "^3.6.0" - -compress-commons@^6.0.2: +compress-commons@^6.0.0, compress-commons@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-6.0.2.tgz#26d31251a66b9d6ba23a84064ecd3a6a71d2609e" integrity sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg== @@ -3891,15 +2940,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -config-master@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/config-master/-/config-master-2.0.4.tgz#e749505c5d3f946f2fad3c76dfe71fca689751dc" - integrity sha512-PfeMGMq4TTliwwGkf41u4Dhvk6I5ZzaxdTGYm9NbVqTZcHr20d8VydihyHcCpE/9ZTcN6FdT9vo0FW5rKZZOLw== - dependencies: - babel-polyfill "^6.13.0" - feature-detect-es6 "^1.3.1" - walk-back "^2.0.1" - connect-flash@*: version "0.1.1" resolved "https://registry.yarnpkg.com/connect-flash/-/connect-flash-0.1.1.tgz#d8630f26d95a7f851f9956b1e8cc6732f3b6aa30" @@ -3922,7 +2962,7 @@ content-type@~1.0.4, content-type@~1.0.5: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== -convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0: +convert-source-map@^1.6.0: version "1.9.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== @@ -3965,20 +3005,15 @@ cookies@0.8.0: depd "~2.0.0" keygrip "~1.1.0" -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== - -core-js@^2.0.1, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: +core-js@^2.4.0: version "2.6.12" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.30.2: - version "3.37.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.1.tgz#d21751ddb756518ac5a00e4d66499df981a62db9" - integrity sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw== + version "3.38.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.38.1.tgz#aa375b79a286a670388a1a363363d53677c0383e" + integrity sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw== core-util-is@1.0.2: version "1.0.2" @@ -4014,14 +3049,6 @@ crc-32@^1.2.0: resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff" integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ== -crc32-stream@^4.0.2: - version "4.0.3" - resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.3.tgz#85dd677eb78fa7cad1ba17cc506a597d41fc6f33" - integrity sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw== - dependencies: - crc-32 "^1.2.0" - readable-stream "^3.4.0" - crc32-stream@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-6.0.0.tgz#8529a3868f8b27abb915f6c3617c0fadedbf9430" @@ -4145,31 +3172,12 @@ data-view-byte-offset@^1.0.0: es-errors "^1.3.0" is-data-view "^1.0.1" -dateformat@~4.6.2: - version "4.6.3" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" - integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== - dayjs@^1.11.9: - version "1.11.12" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.12.tgz#5245226cc7f40a15bf52e0b99fd2a04669ccac1d" - integrity sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg== - -ddata@~0.1.25: - version "0.1.28" - resolved "https://registry.yarnpkg.com/ddata/-/ddata-0.1.28.tgz#53138fafa3f01749ea2451d12b6b6dd9df1d5b1f" - integrity sha512-iHuP9mQjLqQZDSUOqmT/omWBWohJfmBnQj+RzGxHDJlzOIA6HhSjMZFAnIsQ3s+Qx5CzYA3Vq7rAQzDSMCq8Dw== - dependencies: - array-back "^1.0.3" - core-js "^2.4.1" - handlebars "^3.0.3" - marked "~0.3.6" - object-get "^2.1.0" - reduce-flatten "^1.0.1" - string-tools "^1.0.0" - test-value "^2.0.0" - -debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: + version "1.11.13" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c" + integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg== + +debug@2.6.9, debug@^2.2.0: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -4184,13 +3192,13 @@ debug@3.2.7: ms "^2.1.1" debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: - version "4.3.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b" - integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg== + version "4.3.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" + integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== dependencies: - ms "2.1.2" + ms "^2.1.3" -decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.2.0: +decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== @@ -4200,16 +3208,11 @@ decimal.js@^10.4.3: resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== -decode-uri-component@^0.2.0: +decode-uri-component@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== -deep-extend@~0.4.1: - version "0.4.2" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" - integrity sha512-cQ0iXSEKi3JRNhjUsLWvQ+MVPxLVqpwCd0cFsWbJxlCim2TlCo1JvN5WaPdPvSpUdEnkJ/X+mPGcq5RJ68EK8g== - deepmerge@^4.2.2: version "4.3.1" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" @@ -4222,11 +3225,6 @@ default-require-extensions@^2.0.0: dependencies: strip-bom "^3.0.0" -defer-promise@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/defer-promise/-/defer-promise-1.0.2.tgz#b79521c59cadadaed2d305385d30f8b05cbf9196" - integrity sha512-5a0iWJvnon50nLLqHPW83pX45BLb4MmlSa1sIg05NBhZoK5EZGz1s8qoZ3888dVGGOT0Ni01NdETuAgdJUZknA== - define-data-property@^1.0.1, define-data-property@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" @@ -4245,28 +3243,6 @@ define-properties@^1.2.0, define-properties@^1.2.1: has-property-descriptors "^1.0.0" object-keys "^1.1.1" -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA== - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA== - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - delayed-stream@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz#d4b1f43a93e8296dfe02694f4680bc37a313c73f" @@ -4307,41 +3283,20 @@ destroy@1.2.0: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== -detect-file@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" - integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q== - -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - integrity sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A== - dependencies: - repeating "^2.0.0" - detect-libc@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700" integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw== -dir_cache@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/dir_cache/-/dir_cache-1.0.3.tgz#89b8ca92efdcdf552ef2e14d24c38114f9df554b" - integrity sha512-puPfw1d42uwG8tCbdTD+qklZtA2RWet5cIIkrCQJjUoCwqPw/ZkPuq2e7Fr928zM2tLosijYhDjbzyhL2pVMMA== - dependencies: - async "^2.0.1" - minify-js "0.0.2" - utils-igor "^1.0.4" - -discord-api-types@0.37.83: - version "0.37.83" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.83.tgz#a22a799729ceded8176ea747157837ddf4708b1f" - integrity sha512-urGGYeWtWNYMKnYlZnOnDHm8fVRffQs3U0SpE8RHeiuLKb/u92APS8HoQnPTFbnXmY1vVnXjXO4dOxcAn3J+DA== +discord-api-types@0.37.97: + version "0.37.97" + resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.97.tgz#d658573f726ad179261d538dbad4e7e8eca48d11" + integrity sha512-No1BXPcVkyVD4ZVmbNgDKaBoqgeQ+FJpzZ8wqHkfmBnTZig1FcH3iPPersiK1TUIAzgClh2IvOuVUYfcWLQAOA== discord-api-types@^0.37.12, discord-api-types@^0.37.41: - version "0.37.93" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.93.tgz#fd2d34738ec2984cc5f904fe245dccf1cc35ffcd" - integrity sha512-M5jn0x3bcXk8EI2c6F6V6LeOWq10B/cJf+YJSyqNmg7z4bdXK+Z7g9zGJwHS0h9Bfgs0nun2LQISFOzwck7G9A== + version "0.37.101" + resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.101.tgz#1512a26e35b700b9dfb903a5747741a097f9c8bb" + integrity sha512-2wizd94t7G3A8U5Phr3AiuL4gSvhqistDwWnlk1VLTit8BI1jWUncFqFQNdPbHqS3661+Nx/iEyIwtVjPuBP3w== discord.js@14.6.0: version "14.6.0" @@ -4361,28 +3316,6 @@ discord.js@14.6.0: undici "^5.11.0" ws "^8.9.0" -dmd@^1.4.1: - version "1.4.2" - resolved "https://registry.yarnpkg.com/dmd/-/dmd-1.4.2.tgz#b1304b98a5700a6bfe5dcf91be657c981700a4bc" - integrity sha512-rOPXEDiT6+dqVvDX6RX1rO4F6nU9a7HHdpXB1qIDL3tKEX52LwWNhGmIUJ8d2V1pX/5bIaFDaJunQt/m/zc0ig== - dependencies: - array-back "^1.0.3" - command-line-tool "~0.5.0" - common-sequence "^1.0.2" - ddata "~0.1.25" - file-set "^1.0.0" - handlebars-array "^0.2.0" - handlebars-comparison "^2.0.0" - handlebars-json "^1.0.0" - handlebars-regexp "^1.0.0" - handlebars-string "^2.0.1" - object-tools "^2.0.6" - reduce-unique "^1.0.0" - reduce-without "^1.0.1" - stream-handlebars "~0.1.6" - string-tools "^1.0.0" - walk-back "^2.0.1" - dom-serializer@^1.0.1: version "1.4.1" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" @@ -4450,10 +3383,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.4.820: - version "1.5.3" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.3.tgz#032bbb8661c0449656fd896e805c8f7150229a0f" - integrity sha512-QNdYSS5i8D9axWp/6XIezRObRHqaav/ur9z1VzCDUCH1XIFOr9WQk5xmgunhsTpjjgDy3oLxO/WMOVZlpUQrlA== +electron-to-chromium@^1.5.28: + version "1.5.30" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.30.tgz#5b264b489cfe0c3dd71097c164d795444834e7c7" + integrity sha512-sXI35EBN4lYxzc/pIGorlymYNzDBOqkSlVRe6MkgBsW/hW1tpC/HDJ2fjG7XnjakzfLEuvdmux0Mjs6jHq4UOA== emoji-regex@^7.0.1: version "7.0.3" @@ -4480,6 +3413,11 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== +encodeurl@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58" + integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg== + encoding@^0.1.12: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" @@ -4647,17 +3585,17 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3: d "^1.0.2" ext "^1.7.0" -escalade@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" - integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== +escalade@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== escape-html@^1.0.3, escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5, escape-string-regexp@~1.0.5: +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== @@ -4672,24 +3610,11 @@ esniff@^2.0.1: event-emitter "^0.3.5" type "^2.7.2" -espree@~3.1.7: - version "3.1.7" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.1.7.tgz#fd5deec76a97a5120a9cd3a7cb1177a0923b11d2" - integrity sha512-VF3ZpqctFaefWt4R+7jMidx4BUMbd9rxaUoM1gumrgDWcKByFT2YSV73vT6rvdCNw4ZoOAR2z7bamCg4VN9m0A== - dependencies: - acorn "^3.3.0" - acorn-jsx "^3.0.0" - esprima@4.0.1, esprima@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" @@ -4708,10 +3633,10 @@ event-target-shim@^5.0.0: resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== -eventemitter2@~0.4.13: - version "0.4.14" - resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab" - integrity sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ== +eventemitter3@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" + integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== events@^3.0.0, events@^3.3.0: version "3.3.0" @@ -4723,92 +3648,53 @@ exit-hook@^1.0.0: resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" integrity sha512-MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg== -exit@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== - -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - integrity sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA== - dependencies: - is-posix-bracket "^0.1.0" - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA== - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - integrity sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA== - dependencies: - fill-range "^2.1.0" - -expand-tilde@^2.0.0, expand-tilde@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" - integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw== - dependencies: - homedir-polyfill "^1.0.1" - -express-handlebars@5.3.5: - version "5.3.5" - resolved "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-5.3.5.tgz#a04a1e670aa97d5b3a8080de8336f79228593540" - integrity sha512-r9pzDc94ZNJ7FVvtsxLfPybmN0eFAUnR61oimNPRpD0D7nkLcezrkpZzoXS5TI75wYHRbflPLTU39B62pwB4DA== +express-handlebars@7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-7.1.3.tgz#48de4fff6617af9574a6d63031f34fe95e255dd2" + integrity sha512-O0W4n14iQ8+iFIDdiMh9HRI2nbVQJ/h1qndlD1TXWxxcfbKjKoqJh+ti2tROkyx4C4VQrt0y3bANBQ5auQAiew== dependencies: - glob "^7.2.0" - graceful-fs "^4.2.8" - handlebars "^4.7.7" + glob "^10.4.2" + graceful-fs "^4.2.11" + handlebars "^4.7.8" -express-ws@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/express-ws/-/express-ws-4.0.0.tgz#dabd8dc974516418902a41fe6e30ed949b4d36c4" - integrity sha512-KEyUw8AwRET2iFjFsI1EJQrJ/fHeGiJtgpYgEWG3yDv4l/To/m3a2GaYfeGyB3lsWdvbesjF5XCMx+SVBgAAYw== +express-ws@5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/express-ws/-/express-ws-5.0.2.tgz#5b02d41b937d05199c6c266d7cc931c823bda8eb" + integrity sha512-0uvmuk61O9HXgLhGl3QhNSEtRsQevtmbL94/eILaliEADZBHZOQUAiHFrGPrgsjikohyrmSG5g+sCfASTt0lkQ== dependencies: - ws "^5.2.0" + ws "^7.4.6" -express@4.19.2: - version "4.19.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" - integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== +express@4.21.0: + version "4.21.0" + resolved "https://registry.yarnpkg.com/express/-/express-4.21.0.tgz#d57cb706d49623d4ac27833f1cbc466b668eb915" + integrity sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.2" + body-parser "1.20.3" content-disposition "0.5.4" content-type "~1.0.4" cookie "0.6.0" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "1.2.0" + finalhandler "1.3.1" fresh "0.5.2" http-errors "2.0.0" - merge-descriptors "1.0.1" + merge-descriptors "1.0.3" methods "~1.1.2" on-finished "2.4.1" parseurl "~1.3.3" - path-to-regexp "0.1.7" + path-to-regexp "0.1.10" proxy-addr "~2.0.7" - qs "6.11.0" + qs "6.13.0" range-parser "~1.2.1" safe-buffer "5.2.1" - send "0.18.0" - serve-static "1.15.0" + send "0.19.0" + serve-static "1.16.2" setprototypeof "1.2.0" statuses "2.0.1" type-is "~1.6.18" @@ -4822,47 +3708,11 @@ ext@^1.7.0: dependencies: type "^2.7.2" -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug== - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q== - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - extend@^3.0.2, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - integrity sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg== - dependencies: - is-extglob "^1.0.0" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -4888,20 +3738,20 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-xml-parser@4.2.5: - version "4.2.5" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz#a6747a09296a6cb34f2ae634019bf1738f3b421f" - integrity sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g== - dependencies: - strnum "^1.0.5" - -fast-xml-parser@^4.2.4: +fast-xml-parser@4.4.1: version "4.4.1" resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz#86dbf3f18edf8739326447bcaac31b4ae7f6514f" integrity sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw== dependencies: strnum "^1.0.5" +fast-xml-parser@^4.2.2, fast-xml-parser@^4.2.4: + version "4.5.0" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz#2882b7d01a6825dfdf909638f2de0256351def37" + integrity sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg== + dependencies: + strnum "^1.0.5" + fastfall@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/fastfall/-/fastfall-1.5.1.tgz#3fee03331a49d1d39b3cdf7a5e9cd66f475e7b94" @@ -4932,13 +3782,6 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" -feature-detect-es6@^1.2.0, feature-detect-es6@^1.3.0, feature-detect-es6@^1.3.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/feature-detect-es6/-/feature-detect-es6-1.5.0.tgz#a69bb7662c65f64f89f07eac5a461b649a1e0a00" - integrity sha512-DzWPIGzTnfp3/KK1d/YPfmgLqeDju9F2DQYBL35VusgSApcA7XGqVtXfR4ETOOFEzdFJ3J7zh0Gkk011TiA4uQ== - dependencies: - array-back "^1.0.4" - fecha@^4.2.0: version "4.2.3" resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" @@ -4952,22 +3795,6 @@ figures@^1.3.5: escape-string-regexp "^1.0.5" object-assign "^4.1.0" -file-set@^1.0.0, file-set@^1.0.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/file-set/-/file-set-1.1.2.tgz#08f700bb2c129d0e6bff90157b6556ce7c01e4f9" - integrity sha512-xDXI09w+l+mXxWDym7dQXy3PLdo7DygHlAtRnQ6XIMa0iY/qX6+1J75jjwCArCd48yCiMx2+fRn50BTFd45+jQ== - dependencies: - array-back "^1.0.3" - glob "^7.1.0" - -file-set@~0.2.1: - version "0.2.8" - resolved "https://registry.yarnpkg.com/file-set/-/file-set-0.2.8.tgz#73a6571e9cbe51ac5926c88bd567d111f836f178" - integrity sha512-t9NO6FHYX8459WTtKzEuGGP/c6BqmeSdtCUhzoBw64Ctq/2x22e9wPjKJDPpGiQt6vRWpu6Mgs+ZneAI1vqg8Q== - dependencies: - array-tools "^2" - glob "^4" - file-type@^18.3.0: version "18.7.0" resolved "https://registry.yarnpkg.com/file-type/-/file-type-18.7.0.tgz#cddb16f184d6b94106cfc4bb56978726b25cb2a2" @@ -4982,32 +3809,6 @@ file-uri-to-path@1.0.0: resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - integrity sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ== - -fill-range@^2.1.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" - integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q== - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^3.0.0" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ== - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - fill-range@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" @@ -5015,20 +3816,18 @@ fill-range@^7.1.1: dependencies: to-regex-range "^5.0.1" -filter-where@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/filter-where/-/filter-where-1.0.1.tgz#1b042569edce36bc1c4e9f73740d2c4e2feef77d" - integrity sha512-WR5ZwPkYow93louUCfSeTmn8Q7M/X9uMY6LUqTBr1DgohVd7cYZ+B9MHTsQJ9FHKpvkz32LBppTNXPC/Z/pRHA== - dependencies: - test-value "^1.0.1" +filter-obj@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" + integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ== -finalhandler@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" - integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== +finalhandler@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019" + integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ== dependencies: debug "2.6.9" - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" on-finished "2.4.1" parseurl "~1.3.3" @@ -5044,14 +3843,6 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: make-dir "^2.0.0" pkg-dir "^3.0.0" -find-replace@^1, find-replace@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-1.0.3.tgz#b88e7364d2d9c959559f388c66670d6130441fa0" - integrity sha512-KrUnjzDCD9426YnCP56zGYy/eieTnhtK6Vn++j+JJzmlsWWwEkDnsyVF575spT6HJ6Ow9tlbT3TQTDsa+O4UWA== - dependencies: - array-back "^1.0.4" - test-value "^2.1.0" - find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -5067,51 +3858,15 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" -findup-sync@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0" - integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ== - dependencies: - detect-file "^1.0.0" - is-glob "^4.0.0" - micromatch "^4.0.2" - resolve-dir "^1.0.1" - -findup-sync@~5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-5.0.0.tgz#54380ad965a7edca00cc8f63113559aadc541bd2" - integrity sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ== - dependencies: - detect-file "^1.0.0" - is-glob "^4.0.3" - micromatch "^4.0.4" - resolve-dir "^1.0.1" - -fined@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" - integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== - dependencies: - expand-tilde "^2.0.2" - is-plain-object "^2.0.3" - object.defaults "^1.1.0" - object.pick "^1.2.0" - parse-filepath "^1.0.1" - -flagged-respawn@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" - integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== - fn.name@1.x.x: version "1.1.0" resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== follow-redirects@^1.14.0, follow-redirects@^1.14.8, follow-redirects@^1.14.9, follow-redirects@^1.15.6: - version "1.15.6" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" - integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== + version "1.15.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" + integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== for-each@^0.3.3: version "0.3.3" @@ -5120,25 +3875,6 @@ for-each@^0.3.3: dependencies: is-callable "^1.1.3" -for-in@^1.0.1, for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ== - -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - integrity sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw== - dependencies: - for-in "^1.0.1" - -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" - integrity sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg== - dependencies: - for-in "^1.0.1" - foreground-child@^1.5.6: version "1.5.6" resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9" @@ -5148,9 +3884,9 @@ foreground-child@^1.5.6: signal-exit "^3.0.0" foreground-child@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.2.1.tgz#767004ccf3a5b30df39bed90718bab43fe0a59f7" - integrity sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA== + version "3.3.0" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77" + integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg== dependencies: cross-spawn "^7.0.0" signal-exit "^4.0.1" @@ -5197,13 +3933,6 @@ forwarded@0.2.0: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA== - dependencies: - map-cache "^0.2.2" - fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" @@ -5217,11 +3946,6 @@ from2@^2.1.0, from2@^2.3.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -5229,31 +3953,16 @@ fs-minipass@^2.0.0: dependencies: minipass "^3.0.0" -fs-readdir-recursive@^1.0.0, fs-readdir-recursive@^1.1.0: +fs-readdir-recursive@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA== -fs-then-native@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/fs-then-native/-/fs-then-native-1.0.2.tgz#ac8d3807c9f1bbd1279607fb228e0ab649bb41fe" - integrity sha512-Rbz2Jggj4AHs56esXBzCAmDTthzCisuKOTFulwwu2jztQh07q86FhIwHytQCK6HfkKES2+u1YZU1fyCajPuWKg== - dependencies: - feature-detect-es6 "^1.3.1" - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -fsevents@^1.0.0: - version "1.2.13" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" - integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== - dependencies: - bindings "^1.5.0" - nan "^2.12.1" - fsevents@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" @@ -5309,15 +4018,15 @@ gauge@^4.0.3: wide-align "^1.1.5" gaxios@^6.0.0, gaxios@^6.0.3, gaxios@^6.1.1: - version "6.7.0" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.7.0.tgz#37b7c5961cb67d8d4b0ae8110dcd83cc6791eb6d" - integrity sha512-DSrkyMTfAnAm4ks9Go20QGOcXEyW/NmZhvTYBU2rb4afBB393WIMQPWPEDMl/k8xqiNN9HYq2zao3oWXsdl2Tg== + version "6.7.1" + resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.7.1.tgz#ebd9f7093ede3ba502685e73390248bb5b7f71fb" + integrity sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ== dependencies: extend "^3.0.2" https-proxy-agent "^7.0.1" is-stream "^2.0.0" node-fetch "^2.6.9" - uuid "^10.0.0" + uuid "^9.0.1" gcp-metadata@^6.1.0: version "6.1.0" @@ -5369,16 +4078,6 @@ get-symbol-description@^1.0.2: es-errors "^1.3.0" get-intrinsic "^1.2.4" -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== - -getobject@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.0.2.tgz#25ec87a50370f6dcc3c6ba7ef43c4c16215c4c89" - integrity sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg== - getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -5386,21 +4085,6 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - integrity sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA== - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - integrity sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w== - dependencies: - is-glob "^2.0.0" - glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" @@ -5408,7 +4092,7 @@ glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob@^10.0.0: +glob@^10.0.0, glob@^10.4.2: version "10.4.5" resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== @@ -5420,17 +4104,7 @@ glob@^10.0.0: package-json-from-dist "^1.0.0" path-scurry "^1.11.1" -glob@^4: - version "4.5.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f" - integrity sha512-I0rTWUKSZKxPSIAIaqhSXTM/DiII6wame+rEC3cFA5Lqmr9YmdL7z6Hj9+bdWtTvoY1Su4/OiMLmb37Y7JzvJQ== - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "^2.0.1" - once "^1.3.0" - -glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0, glob@^7.2.3: +glob@^7.1.3, glob@^7.1.4, glob@^7.2.0: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -5442,48 +4116,11 @@ glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0, glob@^7.2.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@~7.1.6: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -global-modules@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" - integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== - dependencies: - global-prefix "^1.0.1" - is-windows "^1.0.1" - resolve-dir "^1.0.0" - -global-prefix@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" - integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg== - dependencies: - expand-tilde "^2.0.2" - homedir-polyfill "^1.0.1" - ini "^1.3.4" - is-windows "^1.0.1" - which "^1.2.14" - globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== - globalthis@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236" @@ -5493,9 +4130,9 @@ globalthis@^1.0.3: gopd "^1.0.1" google-auth-library@^9.0.0, google-auth-library@^9.7.0: - version "9.12.0" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.12.0.tgz#ca1c27644de2f5e24deb188875b501a656aa286d" - integrity sha512-5pWjpxJMNJ5UTuhK7QPD5KFPsbosWkX4ajMDeZwXllTtwwqeiIzPWbHIddkLBkkn0mUPboTmukT5rd30Ec9igQ== + version "9.14.1" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.14.1.tgz#4c6f535f474b01847ea1a60ef1d56dbd6a0aad2f" + integrity sha512-Rj+PMjoNFGFTmtItH7gHfbHpGVSb3vmnGK3nwNBqxQF9NoBpttSZI/rc0WiM63ma2uGDQtYEkMHkK9U6937NiA== dependencies: base64-js "^1.3.0" ecdsa-sig-formatter "^1.0.11" @@ -5536,84 +4173,11 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.6, graceful-fs@^4.2.8: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.6: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== -grunt-cli@~1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.4.3.tgz#22c9f1a3d2780bf9b0d206e832e40f8f499175ff" - integrity sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ== - dependencies: - grunt-known-options "~2.0.0" - interpret "~1.1.0" - liftup "~3.0.1" - nopt "~4.0.1" - v8flags "~3.2.0" - -grunt-jsdoc-to-markdown@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/grunt-jsdoc-to-markdown/-/grunt-jsdoc-to-markdown-1.2.1.tgz#d253ac69b61c9575364a44d7db0513ab52f8dac9" - integrity sha512-0tNzrfUpAY4ipU+TzNAys3TdV8hWbt7wai29myOl58Voy1NTWTa63BAUIxfVhbhrZZGYEtHLyqIUJEKIXeCgvA== - dependencies: - jsdoc-to-markdown "^1.3.3" - -grunt-known-options@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-2.0.0.tgz#cac641e897f9a0a680b8c9839803d35f3325103c" - integrity sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA== - -grunt-legacy-log-utils@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz#49a8c7dc74051476dcc116c32faf9db8646856ef" - integrity sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw== - dependencies: - chalk "~4.1.0" - lodash "~4.17.19" - -grunt-legacy-log@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz#1c6eaf92371ea415af31ea84ce50d434ef6d39c4" - integrity sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA== - dependencies: - colors "~1.1.2" - grunt-legacy-log-utils "~2.1.0" - hooker "~0.2.3" - lodash "~4.17.19" - -grunt-legacy-util@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz#0f929d13a2faf9988c9917c82bff609e2d9ba255" - integrity sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w== - dependencies: - async "~3.2.0" - exit "~0.1.2" - getobject "~1.0.0" - hooker "~0.2.3" - lodash "~4.17.21" - underscore.string "~3.3.5" - which "~2.0.2" - -grunt@^1.0.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.6.1.tgz#0b4dd1524f26676dcf45d8f636b8d9061a8ede16" - integrity sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA== - dependencies: - dateformat "~4.6.2" - eventemitter2 "~0.4.13" - exit "~0.1.2" - findup-sync "~5.0.0" - glob "~7.1.6" - grunt-cli "~1.4.3" - grunt-known-options "~2.0.0" - grunt-legacy-log "~3.0.0" - grunt-legacy-util "~2.0.1" - iconv-lite "~0.6.3" - js-yaml "~3.14.0" - minimatch "~3.0.4" - nopt "~3.0.6" - gtoken@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-7.1.0.tgz#d61b4ebd10132222817f7222b1e6064bd463fc26" @@ -5622,49 +4186,7 @@ gtoken@^7.0.0: gaxios "^6.0.0" jws "^4.0.0" -handlebars-array@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/handlebars-array/-/handlebars-array-0.2.1.tgz#dd58395a5261d661988e8d77520ebbfaadc6bd24" - integrity sha512-qQnsau0d45rzRn5Mm76/JepLDrJkKeJUAn4gf45WIQFl+9+oqA/XtCOHmc705SffS7gYMeGX3gDz/NulL56ptA== - dependencies: - array-tools "^1.1.4" - -handlebars-comparison@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handlebars-comparison/-/handlebars-comparison-2.0.1.tgz#b17b95d2c298578e4aead38f5fac46e8f6005855" - integrity sha512-fDBg5FVtj//20jGubGMIJDn68S4cVMl/ZrbZadpG2l8K9T/ITXWdLvidabLkOs2ePhcufuE5zKhf0saUKEExQQ== - dependencies: - array-tools "^1.1.0" - -handlebars-json@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/handlebars-json/-/handlebars-json-1.0.1.tgz#2ef87bb782551cd645bb4691b824e9653ec02504" - integrity sha512-zkqeRv2x0Lc5+pADCB98edilRPjtkz6cYM/ogUK6ZaVbZUbkDhGcXE20gXVW5N7g3m5r5R4nHig9VHcDIIQORQ== - -handlebars-regexp@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/handlebars-regexp/-/handlebars-regexp-1.0.1.tgz#5f47f067260e9ba8e52f1a280917f70de39f11e4" - integrity sha512-htocyMnBYuJZFr6FYMSnwvbkwQWmJO35MT2AQlJEdEP2u5WH2H7rnauNczRcVG4i8YSVhxKxojMUs5X3h3hFIg== - -handlebars-string@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/handlebars-string/-/handlebars-string-2.0.2.tgz#b9f92208a979cfcf51ff4a90defa183dc62942ca" - integrity sha512-Ug7VPR7UbBty+SDCWgaPw2l+ipE39uYpSzdFLz/XdZUQMzOXsSe76xQgKYhm9Rb/bLw24454kFZo+rQEhG0QIw== - dependencies: - array-tools "^1.0.6" - string-tools "^0.1.4" - -handlebars@^3.0.0, handlebars@^3.0.3: - version "3.0.8" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-3.0.8.tgz#4e6ce3650fe6c53c151d106dcff1c5a7ca79e164" - integrity sha512-frzSzoxbJZSB719r+lM3UFKrnHIY6VPY/j47+GNOHVnBHxO+r+Y/iDjozAbj1SztmmMpr2CcZY6rLeN5mqX8zA== - dependencies: - optimist "^0.6.1" - source-map "^0.1.40" - optionalDependencies: - uglify-js "^2.6" - -handlebars@^4.7.7: +handlebars@^4.7.8: version "4.7.8" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.8.tgz#41c42c18b1be2365439188c77c6afae71c0cd9e9" integrity sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ== @@ -5706,11 +4228,6 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" @@ -5740,37 +4257,6 @@ has-unicode@^2.0.1: resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q== - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw== - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ== - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ== - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - hash-base@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" @@ -5821,19 +4307,6 @@ hoek@0.9.x: resolved "https://registry.yarnpkg.com/hoek/-/hoek-0.9.1.tgz#3d322462badf07716ea7eb85baf88079cddce505" integrity sha512-ZZ6eGyzGjyMTmpSPYVECXy9uNfqBR7x5CavhUaLOeD6W0vWK1mp/b7O3f86XE0Mtfo9rZ6Bh3fnuw9Xr8MF9zA== -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - integrity sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - -home-path@^1.0.3, home-path@^1.0.5: - version "1.0.7" - resolved "https://registry.yarnpkg.com/home-path/-/home-path-1.0.7.tgz#cf77d7339ff3ddc3347a23c52612b1f5e7e56313" - integrity sha512-tM1pVa+u3ZqQwIkXcWfhUlY3HWS3TsnKsfi2OHHvnhkX52s9etyktPyy1rQotkr0euWimChDq+QkQuDe8ngUlQ== - homedir-polyfill@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" @@ -5841,11 +4314,6 @@ homedir-polyfill@^1.0.1: dependencies: parse-passwd "^1.0.0" -hooker@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/hooker/-/hooker-0.2.3.tgz#b834f723cc4a242aa65963459df6d984c5d3d959" - integrity sha512-t+UerCsQviSymAInD01Pw+Dn/usmz1sRO+3Zk1+lx8eg+WKpD2ulcwWqHHL0+aseRBr+3+vIhiG1K1JTwaIcTA== - hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -6013,7 +4481,7 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3, iconv-lite@~0.6.3: +iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== @@ -6065,11 +4533,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@^1.3.4: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - input@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/input/-/input-1.0.1.tgz#26bfb5315959c403e9317175cf8f9894e97e5742" @@ -6108,18 +4571,6 @@ internal-slot@^1.0.7: hasown "^2.0.0" side-channel "^1.0.4" -interpret@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" - integrity sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA== - -invariant@^2.2.2: - version "2.2.4" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" - integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== - dependencies: - loose-envify "^1.0.0" - invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" @@ -6146,25 +4597,23 @@ ipaddr.js@1.9.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== +ipaddr.js@^2.0.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8" + integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA== + ipcheck@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/ipcheck/-/ipcheck-0.1.0.tgz#a6f942228910010f1688117b7a774b39c5222f81" integrity sha512-NwhrmROU0iXKa+U1quGuQ+ag+K/1Bb5V/yh5Q4SylSu/LGymPZcWB7p4u7JgJH0qOR6cTLDO5VZlRbhoeekNzQ== -is-absolute@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" - integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== - dependencies: - is-relative "^1.0.0" - is-windows "^1.0.1" - -is-accessor-descriptor@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz#3223b10628354644b86260db29b3e693f5ceedd4" - integrity sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA== +is-arguments@^1.0.4: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== dependencies: - hasown "^2.0.0" + call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-array-buffer@^3.0.4: version "3.0.4" @@ -6191,13 +4640,6 @@ is-bigint@^1.0.1: dependencies: has-bigints "^1.0.1" -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - integrity sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q== - dependencies: - binary-extensions "^1.0.0" - is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -6213,7 +4655,7 @@ is-boolean-object@^1.1.0: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-buffer@^1.1.5, is-buffer@~1.1.6: +is-buffer@~1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== @@ -6224,19 +4666,12 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== is-core-module@^2.13.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea" - integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA== + version "2.15.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" + integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== dependencies: hasown "^2.0.2" -is-data-descriptor@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz#2109164426166d32ea38c405c1e0945d9e6a4eeb" - integrity sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw== - dependencies: - hasown "^2.0.0" - is-data-view@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f" @@ -6251,61 +4686,11 @@ is-date-object@^1.0.1: dependencies: has-tostringtag "^1.0.0" -is-descriptor@^0.1.0: - version "0.1.7" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.7.tgz#2727eb61fd789dcd5bdf0ed4569f551d2fe3be33" - integrity sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg== - dependencies: - is-accessor-descriptor "^1.0.1" - is-data-descriptor "^1.0.1" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.3.tgz#92d27cb3cd311c4977a4db47df457234a13cb306" - integrity sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw== - dependencies: - is-accessor-descriptor "^1.0.1" - is-data-descriptor "^1.0.1" - -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - integrity sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg== - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - integrity sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA== - dependencies: - is-primitive "^2.0.0" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw== - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - integrity sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww== - is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== -is-finite@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" - integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== - is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" @@ -6323,14 +4708,14 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - integrity sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg== +is-generator-function@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" + integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== dependencies: - is-extglob "^1.0.0" + has-tostringtag "^1.0.0" -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: +is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -6354,52 +4739,23 @@ is-number-object@^1.0.4: dependencies: has-tostringtag "^1.0.0" -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg== - dependencies: - kind-of "^3.0.2" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg== - dependencies: - kind-of "^3.0.2" - -is-number@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" - integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== - is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-plain-object@^2.0.3, is-plain-object@^2.0.4: +is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== dependencies: isobject "^3.0.1" -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - integrity sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ== - is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - integrity sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q== - is-property@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" @@ -6413,13 +4769,6 @@ is-regex@^1.1.4: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-relative@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" - integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== - dependencies: - is-unc-path "^1.0.0" - is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" @@ -6451,7 +4800,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.13: +is-typed-array@^1.1.13, is-typed-array@^1.1.3: version "1.1.13" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== @@ -6463,13 +4812,6 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== -is-unc-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" - integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== - dependencies: - unc-path-regex "^0.1.2" - is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" @@ -6482,34 +4824,22 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-windows@^1.0.1, is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - isarray@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA== - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: +isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== @@ -6599,22 +4929,17 @@ joi@^17.9.2: "@sideway/formula" "^3.0.1" "@sideway/pinpoint" "^2.0.0" -jose@^4.15.5: +jose@^4.15.9: version "4.15.9" resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.9.tgz#9b68eda29e9a0614c042fa29387196c7dd800100" integrity sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA== -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: +js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg== - -js-yaml@^3.13.1, js-yaml@~3.14.0: +js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -6622,11 +4947,6 @@ js-yaml@^3.13.1, js-yaml@~3.14.0: argparse "^1.0.7" esprima "^4.0.0" -js2xmlparser@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-1.0.0.tgz#5a170f2e8d6476ce45405e04823242513782fe30" - integrity sha512-k5U3WB58ZbkCqSyrBrNmGtNU87YudbNGTyJNFlVenzzoaKeRXEpQ3E5pYOIidRgQCzxvWIJQK56W7eYkCQqYQA== - jsbn@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" @@ -6637,83 +4957,6 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== -jsdoc-75lb@^3.5.6: - version "3.6.0" - resolved "https://registry.yarnpkg.com/jsdoc-75lb/-/jsdoc-75lb-3.6.0.tgz#a807119528b4009ccbcab49b7522f63fec6cd0bd" - integrity sha512-m/2YaKZdw2LA0FiC36TJnVtKNGNrPIA1emLLSNwzz8ng5KpgZVV1aPnl/TnqkiVgY0xjREK25IYM9MNGPaBcnA== - dependencies: - bluebird "~3.4.6" - catharsis "~0.8.8" - escape-string-regexp "~1.0.5" - espree "~3.1.7" - js2xmlparser "~1.0.0" - klaw "~1.3.0" - marked "~0.3.6" - mkdirp "~0.5.1" - requizzle "~0.2.1" - strip-json-comments "~2.0.1" - taffydb "2.6.2" - underscore "~1.8.3" - -jsdoc-api@^1.0.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/jsdoc-api/-/jsdoc-api-1.2.4.tgz#5012235927bfad1e27bc88d07b0ddddb2d3a8a59" - integrity sha512-cJ8NKrSgAeon6bTY4caWvzBGyAD7UXui4DfbLqrp3YB8hoQXspr5ObZ2sIKA4vexSIhBu4t5X21FQ3fDPHT8uA== - dependencies: - array-back "^1.0.3" - cache-point "~0.3.3" - collect-all "^1.0.2" - core-js "^2.4.1" - feature-detect-es6 "^1.3.1" - file-set "^1.0.1" - jsdoc-75lb "^3.5.6" - object-to-spawn-args "^1.1.0" - promise.prototype.finally "^1.0.1" - temp-path "^1.0.0" - then-fs "^2.0.0" - walk-back "^2.0.1" - -jsdoc-parse@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/jsdoc-parse/-/jsdoc-parse-1.2.7.tgz#54b7481b3cd6bcb7c173dc4fa69ee92735ea2525" - integrity sha512-DZyc2k7ooiKrhD8JO+aC4Kif7oPaff7/zeOcysQ/OzpvFdkmM98xIcS3brjDmUXXk7iqXm1Zxfo0VTr1dB05oA== - dependencies: - ansi-escape-sequences "^2.2.1" - array-tools "^2" - collect-json "^1.0.1" - command-line-args "^2.1.4" - command-line-tool "^0.1.0" - core-js "^2.0.1" - feature-detect-es6 "^1.2.0" - file-set "~0.2.1" - jsdoc-api "^1.0.0" - object-tools "^2" - stream-connect "^1.0.1" - test-value "^1.0.1" - -jsdoc-to-markdown@^1.3.3: - version "1.3.9" - resolved "https://registry.yarnpkg.com/jsdoc-to-markdown/-/jsdoc-to-markdown-1.3.9.tgz#774c0ece0ebd0bcc3261b2c9a2aa8d1399a61472" - integrity sha512-cZLtIzmhdkuNi/9Gz8RGQF4eHwS5YHqAopt720Zk18oWI+JXPqhpuXk74KhrzptTq7KI/OyS0zY+L31W4aTHWA== - dependencies: - ansi-escape-sequences "^3.0.0" - command-line-args "^3.0.1" - command-line-usage "^3.0.5" - config-master "^2.0.4" - dmd "^1.4.1" - jsdoc-parse "^1.2.7" - jsdoc2md-stats "^1.0.3" - object-tools "^2.0.6" - stream-connect "^1.0.2" - -jsdoc2md-stats@^1.0.3: - version "1.0.6" - resolved "https://registry.yarnpkg.com/jsdoc2md-stats/-/jsdoc2md-stats-1.0.6.tgz#dc0e002aebbd0fbae5123534f92732afbc651fbf" - integrity sha512-FOGWtVa/VwyNQ1C8t2T3YdFXhd0BZte0jsKk8a282XtOSK6Hyb6zIwlVOG3FLWkMia8l9Vg608hJyK0gD6F1/g== - dependencies: - app-usage-stats "^0.4.0" - feature-detect-es6 "^1.3.1" - jsdom@22.1.0: version "22.1.0" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8" @@ -6743,21 +4986,11 @@ jsdom@22.1.0: ws "^8.13.0" xml-name-validator "^4.0.0" -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA== - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== - json-bigint@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1" @@ -6785,11 +5018,6 @@ json-stringify-safe@~5.0.0, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== -json5@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw== - json5@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" @@ -6877,32 +5105,11 @@ keygrip@~1.1.0: dependencies: tsscmp "1.0.6" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw== - dependencies: - is-buffer "^1.1.5" - -kind-of@^6.0.0, kind-of@^6.0.2: +kind-of@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klaw@~1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" - integrity sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw== - optionalDependencies: - graceful-fs "^4.1.9" - koa-compose@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877" @@ -6918,11 +5125,6 @@ layerr@^0.1.2: resolved "https://registry.yarnpkg.com/layerr/-/layerr-0.1.2.tgz#16c8e7fb042d3595ab15492bdad088f31d7afd15" integrity sha512-ob5kTd9H3S4GOG2nVXyQhOu9O8nBgP555XxWPkJI0tR0JeRilfyTp8WtPdIJHLXBmHMSdEq5+KMxiYABeScsIQ== -lazy-cache@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" - integrity sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ== - lazystream@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638" @@ -6975,20 +5177,6 @@ lie@3.1.1: dependencies: immediate "~3.0.5" -liftup@~3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/liftup/-/liftup-3.0.1.tgz#1cb81aff0f368464ed3a5f1a7286372d6b1a60ce" - integrity sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw== - dependencies: - extend "^3.0.2" - findup-sync "^4.0.0" - fined "^1.2.0" - flagged-respawn "^1.0.1" - is-plain-object "^2.0.4" - object.map "^1.0.1" - rechoir "^0.7.0" - resolve "^1.19.0" - load-json-file@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" @@ -7037,21 +5225,6 @@ lodash.assign@^4.1.0, lodash.assign@^4.2.0: resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" integrity sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw== -lodash.defaults@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" - integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ== - -lodash.difference@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" - integrity sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA== - -lodash.flatten@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g== - lodash.flattendeep@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" @@ -7092,22 +5265,12 @@ lodash.once@^4.0.0: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg== -lodash.pick@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" - integrity sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q== - lodash.snakecase@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw== -lodash.union@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" - integrity sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw== - -lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.19, lodash@~4.17.21: +lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.6.1: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -7129,18 +5292,6 @@ long@^5.2.1: resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1" integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q== -longest@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" - integrity sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg== - -loose-envify@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== - dependencies: - js-tokens "^3.0.0 || ^4.0.0" - lossless-json@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/lossless-json/-/lossless-json-2.0.1.tgz#03f2deb5c1a828feac19d88c16e93d6388971d52" @@ -7237,25 +5388,6 @@ make-fetch-happen@^9.1.0: socks-proxy-agent "^6.0.0" ssri "^8.0.0" -make-iterator@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" - integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== - dependencies: - kind-of "^6.0.2" - -map-cache@^0.2.0, map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg== - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w== - dependencies: - object-visit "^1.0.0" - mariadb@3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.2.2.tgz#320a991c708c737e5ddeefa1852ddf925f2dcd8c" @@ -7267,16 +5399,6 @@ mariadb@3.2.2: iconv-lite "^0.6.3" lru-cache "^10.0.1" -marked@~0.3.6: - version "0.3.19" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790" - integrity sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg== - -math-random@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" - integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== - md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" @@ -7305,10 +5427,10 @@ memory-pager@^1.0.2: resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5" integrity sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg== -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== +merge-descriptors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5" + integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ== merge-source-map@^1.1.0: version "1.1.0" @@ -7322,52 +5444,6 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== -micromatch@^2.1.5: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - integrity sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA== - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -micromatch@^3.1.10: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - -micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.7" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" - integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== - dependencies: - braces "^3.0.3" - picomatch "^2.3.1" - mime-db@1.52.0: version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" @@ -7400,40 +5476,11 @@ mime@~1.2.11, mime@~1.2.9: resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10" integrity sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw== -minify-js@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/minify-js/-/minify-js-0.0.2.tgz#833ba28645a1cfa942536bc6de4f0294d482f639" - integrity sha512-3FZu98ARQYJ4S+7Qj+hMfznf98hSVSa5YMJRYhJ5UtqF1dh+oZwQE50a63hdIstyyEdx+33V4OWrgZOynHvsEw== - dependencies: - async "^2.0.1" - babel-cli "^6.16.0" - babel-preset-es2015 "^6.16.0" - dir_cache "^1.0.1" - grunt "^1.0.1" - grunt-jsdoc-to-markdown "^1.2.1" - utils-igor "^2.0.0" - -minify-js@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/minify-js/-/minify-js-0.0.4.tgz#e960cb61083f37af856944c512d0fca546d28dda" - integrity sha512-K7siyCl7QDUJhpyKWOCJmNQcghoPnk7BSbusljtOD9LwgqeQ/zVYe8qHKsYEBcyD44IdnhrgGkBiNRzsdh80/w== - dependencies: - async "^2.0.1" - dir_cache "^1.0.1" - utils-igor "^2.0.0" - minimalistic-assert@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -minimatch@^2.0.1: - version "2.0.10" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" - integrity sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA== - dependencies: - brace-expansion "^1.0.0" - minimatch@^3.0.4, minimatch@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -7455,13 +5502,6 @@ minimatch@^9.0.4: dependencies: brace-expansion "^2.0.1" -minimatch@~3.0.4: - version "3.0.8" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1" - integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q== - dependencies: - brace-expansion "^1.1.7" - minimist@1.2.8, minimist@^1.2.5, minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" @@ -7472,6 +5512,26 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw== +minio@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/minio/-/minio-8.0.1.tgz#9cc553cd7e3ab2498eee32401f02915bc09edcab" + integrity sha512-FzDO6yGnqLtm8sp3mXafWtiRUOslJSSg/aI0v9YbN5vjw5KLoODKAROCyi766NIvTSxcfHBrbhCSGk1A+MOzDg== + dependencies: + async "^3.2.4" + block-stream2 "^2.1.0" + browser-or-node "^2.1.1" + buffer-crc32 "^1.0.0" + eventemitter3 "^5.0.1" + fast-xml-parser "^4.2.2" + ipaddr.js "^2.0.1" + lodash "^4.17.21" + mime-types "^2.1.35" + query-string "^7.1.3" + stream-json "^1.8.0" + through2 "^4.0.2" + web-encoding "^1.1.5" + xml2js "^0.5.0" + minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" @@ -7536,20 +5596,7 @@ minizlib@^2.0.0, minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -mkdirp2@^1.0.3: - version "1.0.5" - resolved "https://registry.yarnpkg.com/mkdirp2/-/mkdirp2-1.0.5.tgz#68bbe61defefafce4b48948608ec0bac942512c2" - integrity sha512-xOE9xbICroUDmG1ye2h4bZ8WBie9EGmACaco8K8cx6RlkJJrxGIqjGqztAI+NMhexXBcdGbSEzI6N3EJPevxZw== - -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: +mkdirp@^0.5.0: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -7637,12 +5684,7 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@2.1.3, ms@^2.0.0, ms@^2.1.1: +ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -7687,7 +5729,7 @@ named-placeholders@^1.1.3: dependencies: lru-cache "^7.14.1" -nan@^2.12.1, nan@^2.13.2, nan@^2.18.0, nan@^2.19.0: +nan@^2.13.2, nan@^2.18.0, nan@^2.19.0: version "2.20.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.20.0.tgz#08c5ea813dd54ed16e5bd6505bf42af4f7838ca3" integrity sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw== @@ -7697,23 +5739,6 @@ nanoid@^2.1.0: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - negotiator@0.6.3, negotiator@^0.6.2: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" @@ -7777,9 +5802,9 @@ node-forge@1.3.1, node-forge@^1.3.0: integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== node-gyp-build@^4.3.0: - version "4.8.1" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5" - integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw== + version "4.8.2" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.2.tgz#4f802b71c1ab2ca16af830e6c1ea7dd1ad9496fa" + integrity sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw== node-gyp@8.x: version "8.4.1" @@ -7811,7 +5836,7 @@ node-pushover@1.0.0: dependencies: httpreq "*" -node-releases@^2.0.14: +node-releases@^2.0.18: version "2.0.18" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== @@ -7872,21 +5897,6 @@ nopt@^5.0.0: dependencies: abbrev "1" -nopt@~3.0.6: - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - integrity sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg== - dependencies: - abbrev "1" - -nopt@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" - integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== - dependencies: - abbrev "1" - osenv "^0.1.4" - normalize-package-data@^2.3.2: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -7897,13 +5907,6 @@ normalize-package-data@^2.3.2: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-path@^2.0.0, normalize-path@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w== - dependencies: - remove-trailing-separator "^1.0.1" - normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" @@ -7935,9 +5938,9 @@ number-is-nan@^1.0.0: integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== nwsapi@^2.2.4: - version "2.2.12" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.12.tgz#fb6af5c0ec35b27b4581eb3bbad34ec9e5c696f8" - integrity sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w== + version "2.2.13" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.13.tgz#e56b4e98960e7a040e5474536587e599c4ff4655" + integrity sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ== nyc@^14.1.1: version "14.1.1" @@ -7995,20 +5998,6 @@ object-assign@^4.1.0, object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ== - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-get@^2.0.0, object-get@^2.0.2, object-get@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/object-get/-/object-get-2.1.1.tgz#1dad63baf6d94df184d1c58756cc9be55b174dac" - integrity sha512-7n4IpLMzGGcLEMiQKsNR7vCe+N5E9LORFrtNUVy4sO3dj9a3HedZCxEL2T7QuLhcHN1NBuBsMOKaOsAYI9IIvg== - object-hash@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" @@ -8024,37 +6013,6 @@ object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object-to-spawn-args@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-to-spawn-args/-/object-to-spawn-args-1.1.1.tgz#77da8827f073d011c9e1b173f895781470246785" - integrity sha512-d6xH8b+QdNj+cdndsL3rVCzwW9PqSSXQBDVj0d8fyaCqMimUEz+sW+Jtxp77bxaSs7C5w7XOH844FG7p2A0cFw== - -object-tools@^1.2.1, object-tools@^1.6.1: - version "1.6.7" - resolved "https://registry.yarnpkg.com/object-tools/-/object-tools-1.6.7.tgz#52d400fc875250993dbbb3ba298d7c79bb0698d0" - integrity sha512-At5Cw0arQlH/+bXCONl2GXDHuPrWgKsR55aWXjvTM+5gyeHOTYJhMc9q5Vex5uFOpgnA6sG0QSZzsQsSXyCL1Q== - dependencies: - array-tools "^1.8.4" - typical "^2.2" - -object-tools@^2, object-tools@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/object-tools/-/object-tools-2.0.6.tgz#f3fe1c350cda4a6f5d99d9646dc4892a02476ddd" - integrity sha512-Su3j153hgK9Dgd07FTi6y6DJmJtyWxyuoWvl5VZLI6HVL9VQ81ShfT9c2l/eNIZY85axAi0t1AqFjCAATGab0g== - dependencies: - array-back "^1.0.2" - collect-json "^1.0.7" - object-get "^2.0.2" - test-value "^1.1.0" - typical "^2.4.2" - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA== - dependencies: - isobject "^3.0.0" - object.assign@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" @@ -8065,16 +6023,6 @@ object.assign@^4.1.5: has-symbols "^1.0.3" object-keys "^1.1.1" -object.defaults@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" - integrity sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA== - dependencies: - array-each "^1.0.1" - array-slice "^1.0.0" - for-own "^1.0.0" - isobject "^3.0.0" - object.getownpropertydescriptors@^2.0.3: version "2.1.8" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz#2f1fe0606ec1a7658154ccd4f728504f69667923" @@ -8088,29 +6036,6 @@ object.getownpropertydescriptors@^2.0.3: gopd "^1.0.1" safe-array-concat "^1.1.2" -object.map@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" - integrity sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w== - dependencies: - for-own "^1.0.0" - make-iterator "^1.0.0" - -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - integrity sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA== - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -object.pick@^1.2.0, object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== - dependencies: - isobject "^3.0.1" - oidc-token-hash@^5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz#9a229f0a1ce9d4fc89bcaee5478c97a889e7b7b6" @@ -8148,11 +6073,11 @@ onetime@^1.0.0: integrity sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A== openid-client@*: - version "5.6.5" - resolved "https://registry.yarnpkg.com/openid-client/-/openid-client-5.6.5.tgz#c149ad07b9c399476dc347097e297bbe288b8b00" - integrity sha512-5P4qO9nGJzB5PI0LFlhj4Dzg3m4odt0qsJTfyEtZyOlkgpILwEioOhVVJOrS1iVH494S4Ee5OCjjg6Bf5WOj3w== + version "5.7.0" + resolved "https://registry.yarnpkg.com/openid-client/-/openid-client-5.7.0.tgz#61dbea7251f561e82342278063ce37c5c05347f2" + integrity sha512-4GCCGZt1i2kTHpwvaC/sCpTpQqDnBzDzuJcJMbH+y1Q5qI8U8RBvoSh28svarXszZHR5BAMXbJPX1PGPRE3VOA== dependencies: - jose "^4.15.5" + jose "^4.15.9" lru-cache "^6.0.0" object-hash "^2.2.0" oidc-token-hash "^5.0.3" @@ -8164,7 +6089,7 @@ opentype.js@^0.7.3: dependencies: tiny-inflate "^1.0.2" -optimist@^0.6.1, optimist@~0.6.0: +optimist@~0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" integrity sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g== @@ -8179,7 +6104,7 @@ optional-require@^1.1.8: dependencies: require-at "^1.0.6" -os-homedir@^1.0.0, os-homedir@^1.0.1: +os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ== @@ -8191,19 +6116,6 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== - -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - otplib@10.2.3: version "10.2.3" resolved "https://registry.yarnpkg.com/otplib/-/otplib-10.2.3.tgz#5a371da0c2b36a4a92d2bdac7bf4446dd7ccafc8" @@ -8211,15 +6123,6 @@ otplib@10.2.3: dependencies: thirty-two "1.0.2" -output-file-sync@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76" - integrity sha512-uQLlclru4xpCi+tfs80l3QF24KL81X57ELNMy7W/dox+JTtxUf1bLyQ8968fFCmSqqbokjW0kn+WBIlO+rSkNg== - dependencies: - graceful-fs "^4.1.4" - mkdirp "^0.5.1" - object-assign "^4.1.0" - p-limit@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -8257,9 +6160,9 @@ package-hash@^3.0.0: release-zalgo "^1.0.0" package-json-from-dist@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00" - integrity sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw== + version "1.0.1" + resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505" + integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw== packet-reader@1.0.0: version "1.0.0" @@ -8278,25 +6181,6 @@ param-case@^2.1.1: dependencies: no-case "^2.2.0" -parse-filepath@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" - integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q== - dependencies: - is-absolute "^1.0.0" - map-cache "^0.2.0" - path-root "^0.1.1" - -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - integrity sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA== - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - parse-json@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" @@ -8339,11 +6223,6 @@ parsimmon@1.18.1: resolved "https://registry.yarnpkg.com/parsimmon/-/parsimmon-1.18.1.tgz#d8dd9c28745647d02fc6566f217690897eed7709" integrity sha512-u7p959wLfGAhJpSDJVYXoyMCXWYwHia78HhRBWqk7AIbxdmlrfdp5wX0l3xv/iTSH5HvhN9K7o26hwwpgS5Nmw== -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== - passport-azure-oauth2@*: version "0.1.0" resolved "https://registry.yarnpkg.com/passport-azure-oauth2/-/passport-azure-oauth2-0.1.0.tgz#b391ebdf3aabb9529aa2b6c461d5a1677dd4c362" @@ -8445,7 +6324,7 @@ path-exists@^3.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ== -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: +path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== @@ -8465,18 +6344,6 @@ path-posix@^1.0.0: resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f" integrity sha512-1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA== -path-root-regex@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" - integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ== - -path-root@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" - integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg== - dependencies: - path-root-regex "^0.1.0" - path-scurry@^1.11.1: version "1.11.1" resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2" @@ -8485,10 +6352,10 @@ path-scurry@^1.11.1: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== +path-to-regexp@0.1.10: + version "0.1.10" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" + integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== path-type@^1.0.0: version "1.1.0" @@ -8512,9 +6379,9 @@ pause@0.0.1: integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg== peek-readable@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.1.3.tgz#08993b35dd87502ae5e6028498663abed2dcc009" - integrity sha512-kCsc9HwH5RgVA3H3VqkWFyGQwsxUxLdiSX1d5nqAm7hnMFjNFX1VhBLmJoUY0hZNc8gmDNgBkLjfhiWPsziXWA== + version "5.2.0" + resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.2.0.tgz#7458f18126217c154938c32a185f5d05f3df3710" + integrity sha512-U94a+eXHzct7vAd19GH3UQ2dH4Satbng0MyYTMaQatL0pvYYL5CTPR25HBhKtecl+4bfu1/i3vC6k0hydO5Vcw== pend@~1.2.0: version "1.2.0" @@ -8531,25 +6398,25 @@ pg-cloudflare@^1.1.1: resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz#e6d5833015b170e23ae819e8c5d7eaedb472ca98" integrity sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q== -pg-connection-string@^2.4.0, pg-connection-string@^2.5.0, pg-connection-string@^2.6.4: - version "2.6.4" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.6.4.tgz#f543862adfa49fa4e14bc8a8892d2a84d754246d" - integrity sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA== +pg-connection-string@^2.4.0, pg-connection-string@^2.5.0, pg-connection-string@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.7.0.tgz#f1d3489e427c62ece022dba98d5262efcb168b37" + integrity sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA== pg-int8@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== -pg-pool@^3.4.1, pg-pool@^3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.6.2.tgz#3a592370b8ae3f02a7c8130d245bc02fa2c5f3f2" - integrity sha512-Htjbg8BlwXqSBQ9V8Vjtc+vzf/6fVUuak/3/XXKA9oxZprwW3IMDQTGHP+KDmVL7rtd+R1QjbnCFPuTHm3G4hg== +pg-pool@^3.4.1, pg-pool@^3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.7.0.tgz#d4d3c7ad640f8c6a2245adc369bafde4ebb8cbec" + integrity sha512-ZOBQForurqh4zZWjrgSwwAtzJ7QiRX0ovFkZr2klsen3Nm0aoh33Ls0fzfv3imeH/nw/O27cjdz5kzYJfeGp/g== -pg-protocol@^1.5.0, pg-protocol@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.6.1.tgz#21333e6d83b01faaebfe7a33a7ad6bfd9ed38cb3" - integrity sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg== +pg-protocol@^1.5.0, pg-protocol@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.7.0.tgz#ec037c87c20515372692edac8b63cf4405448a93" + integrity sha512-hTK/mE36i8fDDhgDFjy6xNOG+LCorxLG3WO17tku+ij6sVHXh1jQUJ8hYAnRhNla4QVD2H8er/FOjc/+EgC6yQ== pg-types@^2.1.0: version "2.2.0" @@ -8576,13 +6443,13 @@ pg@8.7.1: pgpass "1.x" pg@^8.4.0: - version "8.12.0" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.12.0.tgz#9341724db571022490b657908f65aee8db91df79" - integrity sha512-A+LHUSnwnxrnL/tZ+OLfqR1SxLN3c/pgDztZ47Rpbsd4jUytsTtwQo/TLPRzPJMp/1pbhYVhH9cuSZLAajNfjQ== + version "8.13.0" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.13.0.tgz#e3d245342eb0158112553fcc1890a60720ae2a3d" + integrity sha512-34wkUTh3SxTClfoHB3pQ7bIMvw9dpFU1audQQeZG837fmHfHpr14n/AELVDoOYVDW2h5RDWU78tFjkD+erSBsw== dependencies: - pg-connection-string "^2.6.4" - pg-pool "^3.6.2" - pg-protocol "^1.6.1" + pg-connection-string "^2.7.0" + pg-pool "^3.7.0" + pg-protocol "^1.7.0" pg-types "^2.1.0" pgpass "1.x" optionalDependencies: @@ -8605,12 +6472,12 @@ pgtools@0.3.2: pg-connection-string "^2.4.0" yargs "^5.0.0" -picocolors@^1.0.0, picocolors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" - integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== +picocolors@^1.0.0, picocolors@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59" + integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: +picomatch@^2.0.4, picomatch@^2.2.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -8674,11 +6541,6 @@ plivo@4.58.0: xml2js "^0.5.0" xmlbuilder "^9.0.1" -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== - possible-typed-array-names@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" @@ -8707,9 +6569,9 @@ postgres-interval@^1.1.0: xtend "^4.0.0" postman-request@^2.88.1-postman.33: - version "2.88.1-postman.36" - resolved "https://registry.yarnpkg.com/postman-request/-/postman-request-2.88.1-postman.36.tgz#0e2c8c086059733c893ad4fe1fa72b1e3963b05d" - integrity sha512-frYz62rp/C9Ip+l0KrOuPuFfv9UhkczCUK6sITc+0AZ1z/8Lcr7brs8AQ38VjxBFmaEyL/ITjy6u0uHyFLV5RQ== + version "2.88.1-postman.40" + resolved "https://registry.yarnpkg.com/postman-request/-/postman-request-2.88.1-postman.40.tgz#bc4b7a4d75d481f84b857e833f46e4c6484ab607" + integrity sha512-uE4AiIqhjtHKp4pj9ei7fkdfNXEX9IqDBlK1plGAQne6y79UUlrTdtYLhwXoO0AMOvqyl9Ar+BU6Eo6P/MPgfg== dependencies: "@postman/form-data" "~3.1.1" "@postman/tough-cookie" "~4.1.3-postman.1" @@ -8739,16 +6601,6 @@ precond@0.2: resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" integrity sha512-QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ== -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - integrity sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ== - -private@^0.1.6, private@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" - integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== - process-nextick-args@^2.0.1, process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -8772,18 +6624,6 @@ promise-retry@^2.0.1: err-code "^2.0.2" retry "^0.12.0" -promise.prototype.finally@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-1.0.1.tgz#91182f91c92486995740fa05e0da942ac986befa" - integrity sha512-8/BYzHIaMau3J4PfcBIC1YKh3emPEO+/7e1qY5SD5mtmSFGKnoM3Ow4wVlf1ffKveCcaXwp6KcXhsKzWt6mN4w== - -"promise@>=3.2 <8": - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== - dependencies: - asap "~2.0.3" - proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" @@ -8808,9 +6648,9 @@ psl@^1.1.28, psl@^1.1.33: integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + version "3.0.2" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8" + integrity sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw== dependencies: end-of-stream "^1.1.0" once "^1.3.1" @@ -8825,17 +6665,10 @@ qlobber@^3.0.2, qlobber@^3.1.0: resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-3.1.0.tgz#b8c8e067496de17bdbf3cd843cf53ece09c8d211" integrity sha512-B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug== -qs@6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - -qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: - version "6.12.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.3.tgz#e43ce03c8521b9c7fd7f1f13e514e5ca37727754" - integrity sha512-AWJm14H1vVaO/iNZ4/hO+HyaTehuy9nRqVdkTqlJt0HWvBiBIEXFmb4C0DGeYo3Xes9rrEW+TxHsaigCbN5ICQ== +qs@6.13.0, qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: + version "6.13.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" + integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== dependencies: side-channel "^1.0.6" @@ -8849,6 +6682,16 @@ qs@~6.5.2, qs@~6.5.3: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== +query-string@^7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.3.tgz#a1cf90e994abb113a325804a972d98276fe02328" + integrity sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg== + dependencies: + decode-uri-component "^0.2.2" + filter-obj "^1.1.0" + split-on-first "^1.0.0" + strict-uri-encode "^2.0.0" + querystring@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" @@ -8876,15 +6719,6 @@ random-bytes@~1.0.0: resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b" integrity sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ== -randomatic@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" - integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw== - dependencies: - is-number "^4.0.0" - kind-of "^6.0.0" - math-random "^1.0.1" - randombytes@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -8941,7 +6775,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@^3.6.2: +"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -8950,7 +6784,7 @@ read-pkg@^3.0.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.3.5: +readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.3.5: version "2.3.8" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== @@ -8963,7 +6797,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^4.0.0: +readable-stream@^4.0.0, readable-stream@^4.5.2: version "4.5.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.5.2.tgz#9e7fc4c45099baeed934bff6eb97ba6cf2729e09" integrity sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g== @@ -8988,15 +6822,6 @@ readdir-glob@^1.1.2: dependencies: minimatch "^5.1.0" -readdirp@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" - integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== - dependencies: - graceful-fs "^4.1.11" - micromatch "^3.1.10" - readable-stream "^2.0.2" - readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" @@ -9018,47 +6843,6 @@ real-cancellable-promise@^1.1.1: resolved "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.2.0.tgz#f365e78b29c6a2303584f2c308959b415401056a" integrity sha512-FYhmx1FVSgoPRjneoTjh+EKZcNb8ijl/dyatTzase5eujYhVrLNDOiIY6AgQq7GU1kOoLgEd9jLVbhFg8k8dOQ== -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== - dependencies: - resolve "^1.9.0" - -reduce-extract@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/reduce-extract/-/reduce-extract-1.0.0.tgz#67f2385beda65061b5f5f4312662e8b080ca1525" - integrity sha512-QF8vjWx3wnRSL5uFMyCjDeDc5EBMiryoT9tz94VvgjKfzecHAVnqmXAwQDcr7X4JmLc2cjkjFGCVzhMqDjgR9g== - dependencies: - test-value "^1.0.1" - -reduce-flatten@^1.0.0, reduce-flatten@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-1.0.1.tgz#258c78efd153ddf93cb561237f61184f3696e327" - integrity sha512-j5WfFJfc9CoXv/WbwVLHq74i/hdTUpy+iNC534LxczMRP67vJeK3V9JOdnL0N1cIRbn9mYhE2yVjvvKXDxvNXQ== - -reduce-unique@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/reduce-unique/-/reduce-unique-1.0.0.tgz#7e586bcf87a4e32b6d7abd8277fad6cdec9f4803" - integrity sha512-WQ6qRDbx7NL4CdW6AFjnyX9i0k6FxGiUaGJ5xAEZ8ZLjwisxi3wcKWYzKmULj8s1N8G1KYcREyg0P4PVo2rI/A== - -reduce-without@^1.0.0, reduce-without@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/reduce-without/-/reduce-without-1.0.1.tgz#68ad0ead11855c9a37d4e8256c15bbf87972fc8c" - integrity sha512-zQv5y/cf85sxvdrKPlfcRzlDn/OqKFThNimYmsS3flmkioKvkUGn2Qg9cJVoQiEvdxFGLE0MQER/9fZ9sUqdxg== - dependencies: - test-value "^2.0.0" - -regenerate@^1.2.1: - version "1.4.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" - integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== - -regenerator-runtime@^0.10.5: - version "0.10.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" - integrity sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w== - regenerator-runtime@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" @@ -9069,30 +6853,6 @@ regenerator-runtime@^0.14.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== -regenerator-transform@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" - integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q== - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== - dependencies: - is-equal-shallow "^0.1.3" - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - regexp.prototype.flags@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" @@ -9103,27 +6863,6 @@ regexp.prototype.flags@^1.5.2: es-errors "^1.3.0" set-function-name "^2.0.1" -regexpu-core@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - integrity sha512-tJ9+S4oKjxY8IZ9jmjnp/mtytu1u3iyIQAfmI51IKWH6bFf7XR1ybtaO6j7INhZKXOTYADk7V5qxaqLkmNxiZQ== - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - integrity sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g== - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - integrity sha512-jlQ9gYLfk2p3V5Ag5fYhA7fv7OHzd1KUH0PRP46xc3TgwjwgROIW572AfYg/X9kaNq/LJnu6oJcFRXlIrGoTRw== - dependencies: - jsesc "~0.5.0" - relateurl@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" @@ -9136,39 +6875,6 @@ release-zalgo@^1.0.0: dependencies: es6-error "^4.0.1" -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw== - -repeat-element@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" - integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== - -repeat-string@^1.5.2, repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A== - dependencies: - is-finite "^1.0.0" - -req-then@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/req-then/-/req-then-0.5.1.tgz#31c6e0b56f4ddd2acd6de0ba1bcea77b6079dfdf" - integrity sha512-ald8dmP4zgF87wWs1n+/TppCd9LB6zZfAWSqF/RFCQ/ImDoH6ro77vmfOLhwkgH2uB8mcn4fNbwL9DEbpKCwJA== - dependencies: - array-back "^1.0.3" - defer-promise "^1.0.0" - feature-detect-es6 "^1.3.1" - lodash.pick "^4.4.0" - typical "^2.6.0" - request@*: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" @@ -9238,32 +6944,12 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== -requizzle@~0.2.1: - version "0.2.4" - resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c" - integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw== - dependencies: - lodash "^4.17.21" - -resolve-dir@^1.0.0, resolve-dir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" - integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg== - dependencies: - expand-tilde "^2.0.0" - global-modules "^1.0.0" - resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== - -resolve@^1.10.0, resolve@^1.19.0, resolve@^1.9.0: +resolve@^1.10.0: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -9280,11 +6966,6 @@ restore-cursor@^1.0.1: exit-hook "^1.0.0" onetime "^1.0.0" -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== - retimer@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/retimer/-/retimer-2.0.0.tgz#e8bd68c5e5a8ec2f49ccb5c636db84c04063bbca" @@ -9300,13 +6981,6 @@ reusify@^1.0.0, reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -right-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" - integrity sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg== - dependencies: - align-text "^0.1.1" - rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" @@ -9382,17 +7056,10 @@ safe-regex-test@^1.0.3: es-errors "^1.3.0" is-regex "^1.1.4" -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg== - dependencies: - ret "~0.1.10" - safe-stable-stringify@^2.3.1: - version "2.4.3" - resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" - integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g== + version "2.5.0" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz#4ca2f8e385f2831c432a719b108a3bf7af42a1dd" + integrity sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA== "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" @@ -9469,10 +7136,10 @@ semver@^7.3.5, semver@^7.5.4: resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== -send@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" - integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== +send@0.19.0: + version "0.19.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8" + integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw== dependencies: debug "2.6.9" depd "2.0.0" @@ -9493,15 +7160,15 @@ seq-queue@^0.0.5: resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q== -serve-static@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" - integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== +serve-static@1.16.2: + version "1.16.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296" + integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw== dependencies: - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.18.0" + send "0.19.0" set-blocking@^2.0.0: version "2.0.0" @@ -9530,16 +7197,6 @@ set-function-name@^2.0.1: functions-have-names "^1.2.3" has-property-descriptors "^1.0.2" -set-value@^2.0.0, set-value@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" - integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -9606,11 +7263,6 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - integrity sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg== - slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" @@ -9626,36 +7278,6 @@ smart-buffer@^4.2.0: resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - sntp@0.2.x: version "0.2.4" resolved "https://registry.yarnpkg.com/sntp/-/sntp-0.2.4.tgz#fb885f18b0f3aad189f824862536bceeec750900" @@ -9680,33 +7302,6 @@ socks@^2.6.2, socks@^2.7.1: ip-address "^9.0.5" smart-buffer "^4.2.0" -sort-array@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sort-array/-/sort-array-1.1.2.tgz#b88986053c0170a7f9de63f18a49ec79c24c3e64" - integrity sha512-5eLpySAUYxyidyJM6CW/+QP8ymqFr0ZDrO4TmCwxpqPmQRZFMqfZq6L/O7c9jdtjDNJZlKwSR4vzR4sVggjRKw== - dependencies: - array-back "^1.0.4" - object-get "^2.1.0" - typical "^2.6.0" - -source-map-resolve@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" - integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== - dependencies: - source-map "^0.5.6" - source-map-support@^0.5.16: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" @@ -9715,23 +7310,6 @@ source-map-support@^0.5.16: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-url@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" - integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== - -source-map@^0.1.40: - version "0.1.43" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" - integrity sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ== - dependencies: - amdefine ">=0.0.4" - -source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== - source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" @@ -9778,16 +7356,14 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.18" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz#22aa922dcf2f2885a6494a261f2d8b75345d0326" - integrity sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ== + version "3.0.20" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz#e44ed19ed318dd1e5888f93325cee800f0f51b89" + integrity sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw== -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== - dependencies: - extend-shallow "^3.0.0" +split-on-first@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f" + integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw== split2@^4.1.0: version "4.2.0" @@ -9799,7 +7375,7 @@ sprintf-js@1.1.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== -sprintf-js@^1.1.1, sprintf-js@^1.1.3: +sprintf-js@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== @@ -9863,14 +7439,6 @@ stack-trace@0.0.x: resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g== - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - statuses@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" @@ -9886,20 +7454,17 @@ store2@^2.13.0: resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.3.tgz#24077d7ba110711864e4f691d2af941ec533deb5" integrity sha512-4QcZ+yx7nzEFiV4BMLnr/pRa5HYzNITX2ri0Zh6sT9EyQHbBHacC6YigllUPU9X3D0f/22QCgfokpKs52YRrUg== -stream-connect@^1.0.1, stream-connect@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/stream-connect/-/stream-connect-1.0.2.tgz#18bc81f2edb35b8b5d9a8009200a985314428a97" - integrity sha512-68Kl+79cE0RGKemKkhxTSg8+6AGrqBt+cbZAXevg2iJ6Y3zX4JhA/sZeGzLpxW9cXhmqAcE7KnJCisUmIUfnFQ== - dependencies: - array-back "^1.0.2" +stream-chain@^2.2.5: + version "2.2.5" + resolved "https://registry.yarnpkg.com/stream-chain/-/stream-chain-2.2.5.tgz#b30967e8f14ee033c5b9a19bbe8a2cba90ba0d09" + integrity sha512-1TJmBx6aSWqZ4tx7aTpBDXK0/e2hhcNSTV8+CbFJtDjbb+I1mZ8lHit0Grw9GRT+6JbIrrDd8esncgBi8aBXGA== -stream-handlebars@~0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/stream-handlebars/-/stream-handlebars-0.1.6.tgz#7305b5064203da171608c478acf642a149892a2f" - integrity sha512-i3N3nKsOHucX9NOcj/1pK3Oh+O6uG/9MOCajfVdTlx7l+XuUbl1Zk8KGK4pDBlWswlUGkLAK79QhBQzsXKA6MA== +stream-json@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-1.8.0.tgz#53f486b2e3b4496c506131f8d7260ba42def151c" + integrity sha512-HZfXngYHUAr1exT4fxlbc1IOce1RYxp2ldeaf97LYCOPSoOqY/1Psp7iGvpb+6JIOgkra9zDYnPX01hGAHzEPw== dependencies: - handlebars "^3.0.0" - object-tools "^1.2.1" + stream-chain "^2.2.5" stream-length@^1.0.2: version "1.0.2" @@ -9908,20 +7473,10 @@ stream-length@^1.0.2: dependencies: bluebird "^2.6.2" -stream-via@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/stream-via/-/stream-via-1.0.4.tgz#8dccbb0ac909328eb8bc8e2a4bd3934afdaf606c" - integrity sha512-DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ== - -stream-via@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/stream-via/-/stream-via-0.1.1.tgz#0cee5df9c959fb1d3f4eda4819f289d5f9205afc" - integrity sha512-1U7icavM/2dRDSevxnJRZfKBWrnhmtdCh0zQTThwYchL2YWjbwZb2PEngEj9HKjgyJ2oDipz6TLud/AU6BAIzQ== - streamx@^2.15.0: - version "2.18.0" - resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.18.0.tgz#5bc1a51eb412a667ebfdcd4e6cf6a6fc65721ac7" - integrity sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ== + version "2.20.1" + resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.20.1.tgz#471c4f8b860f7b696feb83d5b125caab2fdbb93c" + integrity sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA== dependencies: fast-fifo "^1.3.2" queue-tick "^1.0.1" @@ -9929,15 +7484,10 @@ streamx@^2.15.0: optionalDependencies: bare-events "^2.2.0" -string-tools@^0.1.4: - version "0.1.8" - resolved "https://registry.yarnpkg.com/string-tools/-/string-tools-0.1.8.tgz#70884e86a26ee5103a078bef67033d558d36e337" - integrity sha512-OHaYAjvTq1WPOF4+mAYZy03UpCzhQ5h/fZ/mO+HHJDXMa5jNBB696NBQJ5EX6NQMiX5E971RN8JPZJ1qFxyrQQ== - -string-tools@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/string-tools/-/string-tools-1.0.0.tgz#c69a9d5788858997da66f1d923ba7113ea466b5a" - integrity sha512-wN3ILcVQFIf7skV2S9/6tSgK+11RAGDVt8luHaEN/RGOOHQAyBblnfEIVS1qeF+91LlTkp1lqMoglibfWnkIkg== +strict-uri-encode@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" + integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ== "string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" @@ -10073,11 +7623,6 @@ strip-bom@^3.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== - strnum@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db" @@ -10110,13 +7655,6 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" @@ -10139,34 +7677,6 @@ syslog@0.1.1-1: resolved "https://registry.yarnpkg.com/syslog/-/syslog-0.1.1-1.tgz#f69f74b0baf8a25c725af97977a18eb11927a5e1" integrity sha512-7fn4sikkTRrc4kZk/i/ItCktnPD2qG+nKmgTVcuLr2VrY2V9adNhw9fN02HL6rTthwu2Og9Icr1GxZlaLp39Lg== -table-layout@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-0.3.0.tgz#6ee20dc483db371b3e5c87f704ed2f7c799d2c9a" - integrity sha512-9ktef9AEZwAjG7f58oKbe2fEbJzEgRaEbfr8Vci/CitCDszCLKZutLcGFswuwcH6X7mpC11x9W8UW7FyJ/uRbA== - dependencies: - array-back "^1.0.3" - core-js "^2.4.1" - deep-extend "~0.4.1" - feature-detect-es6 "^1.3.1" - typical "^2.6.0" - wordwrapjs "^2.0.0-0" - -taffydb@2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/taffydb/-/taffydb-2.6.2.tgz#7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268" - integrity sha512-y3JaeRSplks6NYQuCOj3ZFMO3j60rTwbuKCvZxsAraGYH2epusatvZ0baZYA01WsGqJBq/Dl6vOrMUJqyMj8kA== - -tar-stream@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" - integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - tar-stream@^3.0.0: version "3.1.7" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.7.tgz#24b3fb5eabada19fe7338ed6d26e5f7c482e792b" @@ -10222,11 +7732,6 @@ telnyx@1.25.5: tweetnacl "^1.0.1" uuid "^3.3.2" -temp-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/temp-path/-/temp-path-1.0.0.tgz#24b1543973ab442896d9ad367dd9cbdbfafe918b" - integrity sha512-TvmyH7kC6ZVTYkqCODjJIbgvu0FKiwQpZ4D1aknE7xpcDf/qEOB8KZEK5ef2pfbVoiBhNWs3yx4y+ESMtNYmlg== - test-exclude@^5.2.3: version "5.2.3" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0" @@ -10237,26 +7742,10 @@ test-exclude@^5.2.3: read-pkg-up "^4.0.0" require-main-filename "^2.0.0" -test-value@^1.0.1, test-value@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/test-value/-/test-value-1.1.0.tgz#a09136f72ec043d27c893707c2b159bfad7de93f" - integrity sha512-wrsbRo7qP+2Je8x8DsK8ovCGyxe3sYfQwOraIY/09A2gFXU9DYKiTF14W4ki/01AEh56kMzAmlj9CaHGDDUBJA== - dependencies: - array-back "^1.0.2" - typical "^2.4.2" - -test-value@^2.0.0, test-value@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/test-value/-/test-value-2.1.0.tgz#11da6ff670f3471a73b625ca4f3fdcf7bb748291" - integrity sha512-+1epbAxtKeXttkGFMTX9H42oqzOTufR1ceCF+GYA5aOmvaPq9wd4PUS8329fn2RRLGNeUkgRLnVpycjx8DsO2w== - dependencies: - array-back "^1.0.3" - typical "^2.6.0" - text-decoder@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.1.1.tgz#5df9c224cebac4a7977720b9f083f9efa1aefde8" - integrity sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.0.tgz#85f19d4d5088e0b45cd841bdfaeac458dbffeefc" + integrity sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg== dependencies: b4a "^1.6.4" @@ -10265,13 +7754,6 @@ text-hex@1.0.x: resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== -then-fs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz#72f792dd9d31705a91ae19ebfcf8b3f968c81da2" - integrity sha512-5ffcBcU+vFUCYDNi/o507IqjqrTkuGsLVZ1Fp50hwgZRY7ufVFa9jFfTy5uZ2QnSKacKigWKeaXkOqLa4DsjLw== - dependencies: - promise ">=3.2 <8" - thirty-two@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/thirty-two/-/thirty-two-1.0.2.tgz#4ca2fffc02a51290d2744b9e3f557693ca6b627a" @@ -10285,6 +7767,13 @@ through2@^3.0.1: inherits "^2.0.4" readable-stream "2 || 3" +through2@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" + integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw== + dependencies: + readable-stream "3" + through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -10300,11 +7789,6 @@ tiny-inflate@^1.0.2: resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4" integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw== -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - integrity sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og== - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" @@ -10315,21 +7799,6 @@ to-mongodb-core@^2.0.0: resolved "https://registry.yarnpkg.com/to-mongodb-core/-/to-mongodb-core-2.0.0.tgz#3596ec7613ac9ad3b98a89dcb9aefba569cd27eb" integrity sha512-vfXXcGYFP8+0L5IPOtUzzVIvPE/G3GN0TKa/PRBlzPqYyhm+UxhPmvv634EQgO4Ot8dHbBFihOslMJQclY8Z9A== -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg== - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg== - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -10337,16 +7806,6 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - toidentifier@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" @@ -10397,11 +7856,6 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw== - triple-beam@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984" @@ -10417,10 +7871,10 @@ ts-mixer@^6.0.4: resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.4.tgz#1da39ceabc09d947a82140d9f09db0f84919ca28" integrity sha512-ufKpbmrugz5Aou4wcr5Wc1UUFWOLhq+Fm6qa6P0w0K5Qw2yhaUoiWszhCVuNQyNwrlGiscHOmqYoAox1PtvgjA== -tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0" - integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== +tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.2, tslib@^2.6.3: + version "2.7.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01" + integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA== tsscmp@1.0.6: version "1.0.6" @@ -10532,35 +7986,15 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typical@^2.1, typical@^2.2, typical@^2.3.0, typical@^2.4.2, typical@^2.5.0, typical@^2.6.0, typical@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.1.tgz#5c080e5d661cbbe38259d2e70a3c7253e873881d" - integrity sha512-ofhi8kjIje6npGozTip9Fr8iecmYfEbS06i0JnIg+rh51KakryWF4+jX8lLKZVhy6N+ID45WYSFCxPOdTWCzNg== - ua-parser-js@1.0.37: version "1.0.37" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.37.tgz#b5dc7b163a5c1f0c510b08446aed4da92c46373f" integrity sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ== -uglify-js@^2.6: - version "2.8.29" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" - integrity sha512-qLq/4y2pjcU3vhlhseXGGJ7VbFO4pBANu0kwl8VCa9KEI0V8VfZIx2Fy3w01iSTA/pGwKZSmu/+I4etLNDdt5w== - dependencies: - source-map "~0.5.1" - yargs "~3.10.0" - optionalDependencies: - uglify-to-browserify "~1.0.0" - uglify-js@^3.1.4, uglify-js@^3.5.1: - version "3.19.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.1.tgz#2d5df6a0872c43da43187968308d7741d44b8056" - integrity sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A== - -uglify-to-browserify@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" - integrity sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q== + version "3.19.3" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.3.tgz#82315e9bbc6f2b25888858acd1fff8441035b77f" + integrity sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ== uid-safe@2.1.5: version "2.1.5" @@ -10584,33 +8018,15 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" -unc-path-regex@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== - -underscore.string@~3.3.5: - version "3.3.6" - resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz#ad8cf23d7423cb3b53b898476117588f4e2f9159" - integrity sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ== - dependencies: - sprintf-js "^1.1.1" - util-deprecate "^1.0.2" - underscore@^1.13.1: version "1.13.7" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.7.tgz#970e33963af9a7dda228f17ebe8399e5fbe63a10" integrity sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g== -underscore@~1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" - integrity sha512-5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg== - -undici-types@~6.11.1: - version "6.11.1" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.11.1.tgz#432ea6e8efd54a48569705a699e62d8f4981b197" - integrity sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ== +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== undici@^5.11.0, undici@^5.22.0: version "5.28.4" @@ -10624,16 +8040,6 @@ unidecode@^0.1.8: resolved "https://registry.yarnpkg.com/unidecode/-/unidecode-0.1.8.tgz#efbb301538bc45246a9ac8c559d72f015305053e" integrity sha512-SdoZNxCWpN2tXTCrGkPF/0rL2HEq+i2gwRG1ReBvx8/0yTzC3enHfugOf8A9JBShVwwrRIkLX0YcDUGbzjbVCA== -union-value@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" - integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^2.0.1" - unique-filename@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" @@ -10658,21 +8064,13 @@ unpipe@1.0.0, unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ== - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - update-browserslist-db@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e" - integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ== + version "1.1.1" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5" + integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== dependencies: - escalade "^3.1.2" - picocolors "^1.0.1" + escalade "^3.2.0" + picocolors "^1.1.0" upper-case@^1.1.1: version "1.1.3" @@ -10691,11 +8089,6 @@ uri-parser@^1.0.0: resolved "https://registry.yarnpkg.com/uri-parser/-/uri-parser-1.0.1.tgz#3307ebb50f279c11198ad09214bdaf24e29735b2" integrity sha512-TRjjM2M83RD9jIIYttNj7ghUQTKSov+WXZbQIMM8DxY1R1QdJEGWNKKMYCxyeOw1p9re2nQ85usM6dPTVtox1g== -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg== - url-join@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" @@ -10719,31 +8112,6 @@ urlsafe-base64@~1.0.0: resolved "https://registry.yarnpkg.com/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz#23f89069a6c62f46cf3a1d3b00169cefb90be0c6" integrity sha512-RtuPeMy7c1UrHwproMZN9gN6kiZ0SvJwRaEzwZY0j9MypEkFqyBaKv176jvlPtg58Zh36bOkS0NFABXMHvvGCA== -usage-stats@^0.8.2: - version "0.8.6" - resolved "https://registry.yarnpkg.com/usage-stats/-/usage-stats-0.8.6.tgz#ec92559f648845c2021cbf5b4adea17af7513830" - integrity sha512-QS1r7a1h5g1jo6KulvVGV+eQM+Jfj87AjJBfr1iaIJYz+N7+Qh7ezaVFCulwBGd8T1EidRiSYphG17gra2y0kg== - dependencies: - array-back "^1.0.4" - cli-commands "0.1.0" - core-js "^2.4.1" - feature-detect-es6 "^1.3.1" - home-path "^1.0.5" - mkdirp2 "^1.0.3" - req-then "0.5.1" - typical "^2.6.1" - uuid "^3.0.1" - -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== - -user-home@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" - integrity sha512-aggiKfEEubv3UwRNqTzLInZpAOmKzwdHqEBmW/hBA/mt99eg+b4VrX6i+IRLxU8+WJYfa33rGwRseg4eElUgsQ== - utf-8-validate@^5.0.2, utf-8-validate@^5.0.5: version "5.0.10" resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.10.tgz#d7d10ea39318171ca982718b6b96a8d2442571a2" @@ -10756,34 +8124,28 @@ utf8@^2.1.2: resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96" integrity sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg== -util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: +util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -utils-igor@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/utils-igor/-/utils-igor-1.0.4.tgz#59197669fd1e51a05ddbd3febb4789498cc42f03" - integrity sha512-qaUVjldlTA3BxqFy2kjm+BORr9Syc63EgDBCQKIpiLZapg76eBOoXme16MRdmaspmVxvoN4lmI/VXw7j+NaTzg== - -utils-igor@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/utils-igor/-/utils-igor-2.0.5.tgz#51fae3fd0a754be33f7f4a05a6a4905f229e3d80" - integrity sha512-1Nqhu0MFGAYb3KbpDPb4TrNKFlUR8nE5gRM5o/Dj5WlokuhKPQIcVxCKHBs+usUNf/IhPguIe7ChIN1vEG+45A== +util@^0.12.3: + version "0.12.5" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" + integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== dependencies: - minify-js "0.0.2" + 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" utils-merge@1.0.1, utils-merge@1.x.x, utils-merge@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== -uuid@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294" - integrity sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ== - -uuid@^3.0.1, uuid@^3.3.2: +uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== @@ -10798,14 +8160,7 @@ uuid@^9.0.0, uuid@^9.0.1: resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== -v8flags@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" - integrity sha512-SKfhk/LlaXzvtowJabLZwD4K6SGRYeoxA7KJeISlUMAB/NT4CBkZjMq3WceX2Ckm4llwqYVo8TICgsDYCBU2tA== - dependencies: - user-home "^1.1.1" - -v8flags@^3.1.1, v8flags@~3.2.0: +v8flags@^3.1.1: version "3.2.0" resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== @@ -10857,16 +8212,20 @@ w3c-xmlserializer@^4.0.0: dependencies: xml-name-validator "^4.0.0" -walk-back@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/walk-back/-/walk-back-2.0.1.tgz#554e2a9d874fac47a8cb006bf44c2f0c4998a0a4" - integrity sha512-Nb6GvBR8UWX1D+Le+xUq0+Q1kFmRBIWVrfLnQAOmcpEzA9oAxwJ9gIr36t9TWYfzvWRvuMtjHiVsJYEkXWaTAQ== - weak-daemon@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/weak-daemon/-/weak-daemon-1.0.3.tgz#d922b7c0dfb8f6bf027c463ea875584d2b085f19" integrity sha512-9OLYp5qQSxpnTIyuA1zJ7at3DV2DSBcbdXduC/3QFPeYjF30Lh1nfBrG+VLf4QUvZPz2lXFPu08oIRzWQfucVQ== +web-encoding@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.1.5.tgz#fc810cf7667364a6335c939913f5051d3e0c4864" + integrity sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA== + dependencies: + util "^0.12.3" + optionalDependencies: + "@zxing/text-encoding" "0.9.0" + web-push@3.6.6: version "3.6.6" resolved "https://registry.yarnpkg.com/web-push/-/web-push-3.6.6.tgz#592facb26116187136b0d543768ef85675791ac8" @@ -10981,7 +8340,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== -which-typed-array@^1.1.14, which-typed-array@^1.1.15: +which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.2: version "1.1.15" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d" integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA== @@ -10992,14 +8351,14 @@ which-typed-array@^1.1.14, which-typed-array@^1.1.15: gopd "^1.0.1" has-tostringtag "^1.0.2" -which@^1.2.14, which@^1.2.9, which@^1.3.0: +which@^1.2.9, which@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== dependencies: isexe "^2.0.0" -which@^2.0.1, which@^2.0.2, which@~2.0.2: +which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== @@ -11020,29 +8379,24 @@ wildleek@2.0.0: dependencies: binary-search "1.3.6" -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" - integrity sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg== - window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" integrity sha512-UD7d8HFA2+PZsbKyaOCEy8gMh1oDtHgJh1LfgjQ4zVXmYjAT/kvz3PueITKuqDiIXQe7yzpPnxX3lNc+AhQMyw== winston-transport@^4.7.0: - version "4.7.1" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.1.tgz#52ff1bcfe452ad89991a0aaff9c3b18e7f392569" - integrity sha512-wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA== + version "4.8.0" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.8.0.tgz#a15080deaeb80338455ac52c863418c74fcf38ea" + integrity sha512-qxSTKswC6llEMZKgCQdaWgDuMJQnhuvF5f2Nk3SNXc4byfQ+voo2mX1Px9dkNOuR8p0KAjfPG29PuYUSIb+vSA== dependencies: logform "^2.6.1" - readable-stream "^3.6.2" + readable-stream "^4.5.2" triple-beam "^1.3.0" winston@^3.3.3: - version "3.13.1" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.13.1.tgz#53ddadb9c2332eb12cff8306413b3480dc82b6c3" - integrity sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw== + version "3.14.2" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.14.2.tgz#94ce5fd26d374f563c969d12f0cd9c641065adab" + integrity sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg== dependencies: "@colors/colors" "^1.6.0" "@dabh/diagnostics" "^2.0.2" @@ -11056,11 +8410,6 @@ winston@^3.3.3: triple-beam "^1.3.0" winston-transport "^4.7.0" -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" - integrity sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q== - wordwrap@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" @@ -11071,24 +8420,6 @@ wordwrap@~0.0.2: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" integrity sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw== -wordwrapjs@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-1.2.1.tgz#754a5ea0664cfbff50540dc32d67bda3289fc34b" - integrity sha512-oHt3LHdyJ2xke7aFYuXXB4QBvfORPZAfwdOW5bKQhCNj2Fa+I/WBz81yle19Cs7gZvaBxoYKOuPW/mFe4X09lg== - dependencies: - array-back "^1.0.3" - typical "^2.5.0" - -wordwrapjs@^2.0.0-0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-2.0.0.tgz#ab55f695e6118da93858fdd70c053d1c5e01ac20" - integrity sha512-XNzRwovxCFgLxqmumTWdVAIjtvMKAfjzdB/uWgILQiOPwIFNTq9xk5ZKPvcaVX9MCZueoSV2aGtSbM3irVap3w== - dependencies: - array-back "^1.0.3" - feature-detect-es6 "^1.3.1" - reduce-flatten "^1.0.1" - typical "^2.6.0" - "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -11152,14 +8483,7 @@ ws@8.17.1: resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== -ws@^5.2.0: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.4.tgz#c7bea9f1cfb5f410de50e70e82662e562113f9a7" - integrity sha512-fFCejsuC8f9kOSu9FYaOw8CdO68O3h5v0lg4p74o8JqWpwTf9tniOD+nOB78aWoVSS6WptVUmDrp/KPsMVBWFQ== - dependencies: - async-limiter "~1.0.0" - -ws@^7.0.0: +ws@^7.0.0, ws@^7.4.6: version "7.5.10" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9" integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ== @@ -11341,16 +8665,6 @@ yargs@^5.0.0: y18n "^3.2.1" yargs-parser "^3.2.0" -yargs@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" - integrity sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A== - dependencies: - camelcase "^1.0.2" - cliui "^2.1.0" - decamelize "^1.0.0" - window-size "0.1.0" - yauzl@2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" @@ -11366,16 +8680,7 @@ yubikeyotp@0.2.0: dependencies: request "*" -zip-stream@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.1.tgz#1337fe974dbaffd2fa9a1ba09662a66932bd7135" - integrity sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ== - dependencies: - archiver-utils "^3.0.4" - compress-commons "^4.1.2" - readable-stream "^3.6.0" - -zip-stream@^6.0.0: +zip-stream@^6.0.0, zip-stream@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-6.0.1.tgz#e141b930ed60ccaf5d7fa9c8260e0d1748a2bbfb" integrity sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA== diff --git a/pkgs/tools/admin/netbox2netshot/default.nix b/pkgs/tools/admin/netbox2netshot/default.nix index 82f2825bcdea7..0b5e1ed737934 100644 --- a/pkgs/tools/admin/netbox2netshot/default.nix +++ b/pkgs/tools/admin/netbox2netshot/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index 78685e067859a..79e77cc86badb 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "8.4"; - versionMinor = "2"; + versionMajor = "8.13"; + versionMinor = "1"; versionBuild_x86_64 = "1"; versionBuild_i686 = "1"; in @@ -14,12 +14,12 @@ in if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "sha256-r4yRmnMd6uNay7CqmyqYj9F6huoqD8eBby+oDNk1T34="; + sha256 = "sha256-8rxlxdtGU8avpvYJr+bpnsy5v91sqtlij/MCGWrcanY="; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "sha256-TvEU1hDvPXQbF7fMI89I2bhap1Y0oetUoFl3yR5eTGg="; + sha256 = "sha256-Ekyxc4wODjqWhp0aINhaPGLy9lh6Rt9AmxIt1ulE8Go="; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; @@ -56,10 +56,10 @@ in mkdir $out/share/applications cp share/applnk/player/xdg/*.desktop $out/share/applications/ - cp share/applnk/client/xdg-mime/*.desktop $out/share/applications/ + cp share/applnk/runner/xdg-mime/*.desktop $out/share/applications/ mkdir -p $out/share/mime/packages - cp share/applnk/client/xdg-mime/*.xml $out/share/mime/packages/ + cp share/applnk/runner/xdg-mime/*.xml $out/share/mime/packages/ for i in $out/share/applications/*.desktop; do substituteInPlace "$i" --replace /usr/NX/bin $out/bin diff --git a/pkgs/tools/admin/okta-aws-cli/default.nix b/pkgs/tools/admin/okta-aws-cli/default.nix index 872c214abf359..35ddc879dbe37 100644 --- a/pkgs/tools/admin/okta-aws-cli/default.nix +++ b/pkgs/tools/admin/okta-aws-cli/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "okta-aws-cli"; - version = "2.3.0"; + version = "2.3.1"; subPackages = [ "cmd/okta-aws-cli" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "okta"; repo = "okta-aws-cli"; rev = "v${version}"; - sha256 = "sha256-+8+3VzMWBb6WQAX7788OWTYj1/E2ps6H7UtB5rO2fSY="; + sha256 = "sha256-dts2aTd90bsuTkXB6AxFN6IziOQXTG1XLT0XSAC1Avc="; }; vendorHash = "sha256-2VTq8lzGYBKH410/mflloAphWTwFie3mdmz2kLkfuQ0="; diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 4325040dd6839..4047c572fb804 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -16,14 +16,14 @@ let pname = "pgadmin"; - version = "8.11"; - yarnHash = "sha256-2N1UsGrR9rTIP50kn+gB+iGz9D/Dj0K5Y/10A5wPKTY="; + version = "8.12"; + yarnHash = "sha256-C5CI8oP9vEana3OEs1yAsSSTvO2uLEuCU1nHhC7LerY="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-6v7/jFkWooUHztL+x6falD04XyDYa1beoY/yEpfbX4U="; + hash = "sha256-OIFHaU+Ty0xJn42iqYhse8dfFJZpx8AV/10RNxp1Y4o="; }; # keep the scope, as it is used throughout the derivation and tests @@ -39,7 +39,7 @@ let # skip tests on macOS which fail due to an error in keyring, see https://github.com/NixOS/nixpkgs/issues/281214 skippedTests = builtins.concatStringsSep "," ( [ "browser.tests.test_kerberos_with_mocking" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "browser.server_groups.servers.tests.test_all_server_get" "browser.server_groups.servers.tests.test_check_connect" "browser.server_groups.servers.tests.test_check_ssh_mock_connect" diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index a99edae3567e5..a4203d6f37633 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -23,26 +23,26 @@ "@babel/highlight" "^7.24.7" picocolors "^1.0.0" -"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.24.8", "@babel/compat-data@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.0.tgz#6b226a5da3a686db3c30519750e071dce292ad95" - integrity sha512-P4fwKI2mjEb3ZU5cnMJzvRsRKGBUcs8jvxIoRmr6ufAY9Xk2Bz7JubRTTivkw55c7WQJfTECeqYVa+HZ0FzREg== +"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.2", "@babel/compat-data@^7.25.4": + version "7.25.4" + resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb" + integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ== "@babel/core@^7.10.2", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.21.3", "@babel/core@^7.23.9": - version "7.24.9" - resolved "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz#dc07c9d307162c97fa9484ea997ade65841c7c82" - integrity sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg== + version "7.25.2" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77" + integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.24.9" - "@babel/helper-compilation-targets" "^7.24.8" - "@babel/helper-module-transforms" "^7.24.9" - "@babel/helpers" "^7.24.8" - "@babel/parser" "^7.24.8" - "@babel/template" "^7.24.7" - "@babel/traverse" "^7.24.8" - "@babel/types" "^7.24.9" + "@babel/generator" "^7.25.0" + "@babel/helper-compilation-targets" "^7.25.2" + "@babel/helper-module-transforms" "^7.25.2" + "@babel/helpers" "^7.25.0" + "@babel/parser" "^7.25.0" + "@babel/template" "^7.25.0" + "@babel/traverse" "^7.25.2" + "@babel/types" "^7.25.2" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -65,17 +65,17 @@ dependencies: eslint-rule-composer "^0.3.0" -"@babel/generator@^7.24.9", "@babel/generator@^7.25.0", "@babel/generator@^7.7.2": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz#f858ddfa984350bc3d3b7f125073c9af6988f18e" - integrity sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw== +"@babel/generator@^7.25.0", "@babel/generator@^7.25.6", "@babel/generator@^7.7.2": + version "7.25.6" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz#0df1ad8cb32fe4d2b01d8bf437f153d19342a87c" + integrity sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw== dependencies: - "@babel/types" "^7.25.0" + "@babel/types" "^7.25.6" "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.22.5", "@babel/helper-annotate-as-pure@^7.24.7": +"@babel/helper-annotate-as-pure@^7.24.7": version "7.24.7" resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab" integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg== @@ -90,40 +90,40 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7", "@babel/helper-compilation-targets@^7.24.8": - version "7.24.8" - resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz#b607c3161cd9d1744977d4f97139572fe778c271" - integrity sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw== +"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7", "@babel/helper-compilation-targets@^7.24.8", "@babel/helper-compilation-targets@^7.25.2": + version "7.25.2" + resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c" + integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw== dependencies: - "@babel/compat-data" "^7.24.8" + "@babel/compat-data" "^7.25.2" "@babel/helper-validator-option" "^7.24.8" browserslist "^4.23.1" lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.7", "@babel/helper-create-class-features-plugin@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.0.tgz#a109bf9c3d58dfed83aaf42e85633c89f43a6253" - integrity sha512-GYM6BxeQsETc9mnct+nIIpf63SAyzvyYN7UB/IlTyd+MBg06afFGp0mIeUqGyWgS2mxad6vqbMrHVlaL3m70sQ== +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.7", "@babel/helper-create-class-features-plugin@^7.25.0", "@babel/helper-create-class-features-plugin@^7.25.4": + version "7.25.4" + resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz#57eaf1af38be4224a9d9dd01ddde05b741f50e14" + integrity sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ== dependencies: "@babel/helper-annotate-as-pure" "^7.24.7" "@babel/helper-member-expression-to-functions" "^7.24.8" "@babel/helper-optimise-call-expression" "^7.24.7" "@babel/helper-replace-supers" "^7.25.0" "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" - "@babel/traverse" "^7.25.0" + "@babel/traverse" "^7.25.4" semver "^6.3.1" -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.24.7", "@babel/helper-create-regexp-features-plugin@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.0.tgz#17afe5d23b3a833a90f0fab9c2ae69fea192de5c" - integrity sha512-q0T+dknZS+L5LDazIP+02gEZITG5unzvb6yIjcmj5i0eFrs5ToBV2m2JGH4EsE/gtP8ygEGLGApBgRIZkTm7zg== +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.24.7", "@babel/helper-create-regexp-features-plugin@^7.25.0", "@babel/helper-create-regexp-features-plugin@^7.25.2": + version "7.25.2" + resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz#24c75974ed74183797ffd5f134169316cd1808d9" + integrity sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g== dependencies: "@babel/helper-annotate-as-pure" "^7.24.7" regexpu-core "^5.3.1" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.6.1", "@babel/helper-define-polyfill-provider@^0.6.2": +"@babel/helper-define-polyfill-provider@^0.6.2": version "0.6.2" resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d" integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ== @@ -142,7 +142,7 @@ "@babel/traverse" "^7.24.8" "@babel/types" "^7.24.8" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.7": +"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.24.7": version "7.24.7" resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== @@ -150,15 +150,15 @@ "@babel/traverse" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/helper-module-transforms@^7.24.7", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.24.9", "@babel/helper-module-transforms@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.0.tgz#3ffc23c473a2769a7e40d3274495bd559fdd2ecc" - integrity sha512-bIkOa2ZJYn7FHnepzr5iX9Kmz8FjIz4UKzJ9zhX3dnYuVW0xul9RuR3skBfoLu+FPTQw90EHW9rJsSZhyLQ3fQ== +"@babel/helper-module-transforms@^7.24.7", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.25.0", "@babel/helper-module-transforms@^7.25.2": + version "7.25.2" + resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6" + integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ== dependencies: "@babel/helper-module-imports" "^7.24.7" "@babel/helper-simple-access" "^7.24.7" "@babel/helper-validator-identifier" "^7.24.7" - "@babel/traverse" "^7.25.0" + "@babel/traverse" "^7.25.2" "@babel/helper-optimise-call-expression@^7.24.7": version "7.24.7" @@ -230,13 +230,13 @@ "@babel/traverse" "^7.25.0" "@babel/types" "^7.25.0" -"@babel/helpers@^7.24.8": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz#e69beb7841cb93a6505531ede34f34e6a073650a" - integrity sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw== +"@babel/helpers@^7.25.0": + version "7.25.6" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz#57ee60141829ba2e102f30711ffe3afab357cc60" + integrity sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q== dependencies: "@babel/template" "^7.25.0" - "@babel/types" "^7.25.0" + "@babel/types" "^7.25.6" "@babel/highlight@^7.24.7": version "7.24.7" @@ -248,18 +248,20 @@ js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.8", "@babel/parser@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.25.0.tgz#9fdc9237504d797b6e7b8f66e78ea7f570d256ad" - integrity sha512-CzdIU9jdP0dg7HdyB+bHvDJGagUv+qtzZt5rYCWwW6tITNqV9odjp6Qu41gkG0ca5UfdDUWrKkiAnHHdGRnOrA== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.25.0", "@babel/parser@^7.25.6": + version "7.25.6" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz#85660c5ef388cbbf6e3d2a694ee97a38f18afe2f" + integrity sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q== + dependencies: + "@babel/types" "^7.25.6" -"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.0.tgz#328275f22d809b962978d998c6eba22a233ac8aa" - integrity sha512-dG0aApncVQwAUJa8tP1VHTnmU67BeIQvKafd3raEx315H54FfkZSz3B/TT+33ZQAjatGJA79gZqTtqL5QZUKXw== +"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.3": + version "7.25.3" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz#dca427b45a6c0f5c095a1c639dfe2476a3daba7f" + integrity sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA== dependencies: "@babel/helper-plugin-utils" "^7.24.8" - "@babel/traverse" "^7.25.0" + "@babel/traverse" "^7.25.3" "@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.0": version "7.25.0" @@ -330,7 +332,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3": +"@babel/plugin-syntax-class-properties@^7.12.13": version "7.12.13" resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== @@ -359,20 +361,20 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-import-assertions@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz#2a0b406b5871a20a841240586b1300ce2088a778" - integrity sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg== + version "7.25.6" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz#bb918905c58711b86f9710d74a3744b6c56573b5" + integrity sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" "@babel/plugin-syntax-import-attributes@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz#b4f9ea95a79e6912480c4b626739f86a076624ca" - integrity sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A== + version "7.25.6" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz#6d4c78f042db0e82fd6436cd65fec5dc78ad2bde" + integrity sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" -"@babel/plugin-syntax-import-meta@^7.10.4", "@babel/plugin-syntax-import-meta@^7.8.3": +"@babel/plugin-syntax-import-meta@^7.10.4": version "7.10.4" resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== @@ -386,14 +388,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.16.0", "@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.24.7", "@babel/plugin-syntax-jsx@^7.7.2": +"@babel/plugin-syntax-jsx@^7.16.0", "@babel/plugin-syntax-jsx@^7.24.7", "@babel/plugin-syntax-jsx@^7.7.2": version "7.24.7" resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d" integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ== dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": +"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": version "7.10.4" resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== @@ -407,7 +409,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3": +"@babel/plugin-syntax-numeric-separator@^7.10.4": version "7.10.4" resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== @@ -442,7 +444,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3": +"@babel/plugin-syntax-top-level-await@^7.14.5": version "7.14.5" resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== @@ -450,11 +452,11 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.24.7", "@babel/plugin-syntax-typescript@^7.7.2": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz#58d458271b4d3b6bb27ee6ac9525acbb259bad1c" - integrity sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA== + version "7.25.4" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz#04db9ce5a9043d9c635e75ae7969a2cd50ca97ff" + integrity sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" "@babel/plugin-syntax-unicode-sets-regex@^7.18.6": version "7.18.6" @@ -471,15 +473,15 @@ dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-async-generator-functions@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz#b785cf35d73437f6276b1e30439a57a50747bddf" - integrity sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q== +"@babel/plugin-transform-async-generator-functions@^7.25.4": + version "7.25.4" + resolved "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz#2afd4e639e2d055776c9f091b6c0c180ed8cf083" + integrity sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg== dependencies: "@babel/helper-plugin-utils" "^7.24.8" "@babel/helper-remap-async-to-generator" "^7.25.0" "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/traverse" "^7.25.0" + "@babel/traverse" "^7.25.4" "@babel/plugin-transform-async-to-generator@^7.24.7": version "7.24.7" @@ -504,13 +506,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.24.8" -"@babel/plugin-transform-class-properties@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz#256879467b57b0b68c7ddfc5b76584f398cd6834" - integrity sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w== +"@babel/plugin-transform-class-properties@^7.25.4": + version "7.25.4" + resolved "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz#bae7dbfcdcc2e8667355cd1fb5eda298f05189fd" + integrity sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g== dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-class-features-plugin" "^7.25.4" + "@babel/helper-plugin-utils" "^7.24.8" "@babel/plugin-transform-class-static-block@^7.24.7": version "7.24.7" @@ -521,16 +523,16 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-transform-classes@^7.25.0": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.0.tgz#63122366527d88e0ef61b612554fe3f8c793991e" - integrity sha512-xyi6qjr/fYU304fiRwFbekzkqVJZ6A7hOjWZd+89FVcBqPV3S9Wuozz82xdpLspckeaafntbzglaW4pqpzvtSw== +"@babel/plugin-transform-classes@^7.25.4": + version "7.25.4" + resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz#d29dbb6a72d79f359952ad0b66d88518d65ef89a" + integrity sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg== dependencies: "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-compilation-targets" "^7.24.8" + "@babel/helper-compilation-targets" "^7.25.2" "@babel/helper-plugin-utils" "^7.24.8" "@babel/helper-replace-supers" "^7.25.0" - "@babel/traverse" "^7.25.0" + "@babel/traverse" "^7.25.4" globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.24.7": @@ -603,7 +605,7 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" -"@babel/plugin-transform-function-name@^7.25.0": +"@babel/plugin-transform-function-name@^7.25.1": version "7.25.1" resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz#b85e773097526c1a4fc4ba27322748643f26fc37" integrity sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA== @@ -620,12 +622,12 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-transform-literals@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz#36b505c1e655151a9d7607799a9988fc5467d06c" - integrity sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ== +"@babel/plugin-transform-literals@^7.25.2": + version "7.25.2" + resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz#deb1ad14fc5490b9a65ed830e025bca849d8b5f3" + integrity sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" "@babel/plugin-transform-logical-assignment-operators@^7.24.7": version "7.24.7" @@ -750,13 +752,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-private-methods@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz#e6318746b2ae70a59d023d5cc1344a2ba7a75f5e" - integrity sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ== +"@babel/plugin-transform-private-methods@^7.25.4": + version "7.25.4" + resolved "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz#9bbefbe3649f470d681997e0b64a4b254d877242" + integrity sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-class-features-plugin" "^7.25.4" + "@babel/helper-plugin-utils" "^7.24.8" "@babel/plugin-transform-private-property-in-object@^7.24.7": version "7.24.7" @@ -797,15 +799,15 @@ "@babel/plugin-transform-react-jsx" "^7.24.7" "@babel/plugin-transform-react-jsx@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.7.tgz#17cd06b75a9f0e2bd076503400e7c4b99beedac4" - integrity sha512-+Dj06GDZEFRYvclU6k4bme55GKBEWUmByM/eoKuqg4zTNQHiApWRhQph5fxQB2wAEFvRzL1tOEj1RJ19wJrhoA== + version "7.25.2" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.2.tgz#e37e8ebfa77e9f0b16ba07fadcb6adb47412227a" + integrity sha512-KQsqEAVBpU82NM/B/N9j9WOdphom1SZH3R+2V7INrQUH+V9EBFwZsEJl8eBIVeQE62FxJCc70jzEZwqU7RcVqA== dependencies: "@babel/helper-annotate-as-pure" "^7.24.7" "@babel/helper-module-imports" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" "@babel/plugin-syntax-jsx" "^7.24.7" - "@babel/types" "^7.24.7" + "@babel/types" "^7.25.2" "@babel/plugin-transform-react-pure-annotations@^7.24.7": version "7.24.7" @@ -831,14 +833,14 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-transform-runtime@^7.22.15": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz#00a5bfaf8c43cf5c8703a8a6e82b59d9c58f38ca" - integrity sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw== + version "7.25.4" + resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.4.tgz#96e4ad7bfbbe0b4a7b7e6f2a533ca326cf204963" + integrity sha512-8hsyG+KUYGY0coX6KUCDancA0Vw225KJ2HJO0yCNr1vq5r+lJTleDaJf0K7iOhjw4SWhu03TMBzYTJ9krmzULQ== dependencies: "@babel/helper-module-imports" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" babel-plugin-polyfill-corejs2 "^0.4.10" - babel-plugin-polyfill-corejs3 "^0.10.1" + babel-plugin-polyfill-corejs3 "^0.10.6" babel-plugin-polyfill-regenerator "^0.6.1" semver "^6.3.1" @@ -879,9 +881,9 @@ "@babel/helper-plugin-utils" "^7.24.8" "@babel/plugin-transform-typescript@^7.24.7": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.0.tgz#56f47fb87b86a97caa9c7770920a1967d40ac86e" - integrity sha512-LZicxFzHIw+Sa3pzgMgSz6gdpsdkfiMObHUzhSIrwKF0+/rP/nuR49u79pSS+zIFJ1FeGeqQD2Dq4QGFbOVvSw== + version "7.25.2" + resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.2.tgz#237c5d10de6d493be31637c6b9fa30b6c5461add" + integrity sha512-lBwRvjSmqiMYe/pS0+1gggjJleUJi7NzjvQ1Fkqtt69hBa/0t1YuW/MLQMAPixfwaQOHUXsd6jeU3Z+vdGv3+A== dependencies: "@babel/helper-annotate-as-pure" "^7.24.7" "@babel/helper-create-class-features-plugin" "^7.25.0" @@ -912,24 +914,24 @@ "@babel/helper-create-regexp-features-plugin" "^7.24.7" "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-sets-regex@^7.24.7": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz#d40705d67523803a576e29c63cef6e516b858ed9" - integrity sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg== +"@babel/plugin-transform-unicode-sets-regex@^7.25.4": + version "7.25.4" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz#be664c2a0697ffacd3423595d5edef6049e8946c" + integrity sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-regexp-features-plugin" "^7.25.2" + "@babel/helper-plugin-utils" "^7.24.8" "@babel/preset-env@^7.10.2", "@babel/preset-env@^7.20.2": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.0.tgz#3fe92e470311e91478129efda101816c680f0479" - integrity sha512-vYAA8PrCOeZfG4D87hmw1KJ1BPubghXP1e2MacRFwECGNKL76dkA38JEwYllbvQCpf/kLxsTtir0b8MtxKoVCw== + version "7.25.4" + resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz#be23043d43a34a2721cd0f676c7ba6f1481f6af6" + integrity sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw== dependencies: - "@babel/compat-data" "^7.25.0" - "@babel/helper-compilation-targets" "^7.24.8" + "@babel/compat-data" "^7.25.4" + "@babel/helper-compilation-targets" "^7.25.2" "@babel/helper-plugin-utils" "^7.24.8" "@babel/helper-validator-option" "^7.24.8" - "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.0" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.3" "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.0" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.0" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7" @@ -954,13 +956,13 @@ "@babel/plugin-syntax-top-level-await" "^7.14.5" "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" "@babel/plugin-transform-arrow-functions" "^7.24.7" - "@babel/plugin-transform-async-generator-functions" "^7.25.0" + "@babel/plugin-transform-async-generator-functions" "^7.25.4" "@babel/plugin-transform-async-to-generator" "^7.24.7" "@babel/plugin-transform-block-scoped-functions" "^7.24.7" "@babel/plugin-transform-block-scoping" "^7.25.0" - "@babel/plugin-transform-class-properties" "^7.24.7" + "@babel/plugin-transform-class-properties" "^7.25.4" "@babel/plugin-transform-class-static-block" "^7.24.7" - "@babel/plugin-transform-classes" "^7.25.0" + "@babel/plugin-transform-classes" "^7.25.4" "@babel/plugin-transform-computed-properties" "^7.24.7" "@babel/plugin-transform-destructuring" "^7.24.8" "@babel/plugin-transform-dotall-regex" "^7.24.7" @@ -970,9 +972,9 @@ "@babel/plugin-transform-exponentiation-operator" "^7.24.7" "@babel/plugin-transform-export-namespace-from" "^7.24.7" "@babel/plugin-transform-for-of" "^7.24.7" - "@babel/plugin-transform-function-name" "^7.25.0" + "@babel/plugin-transform-function-name" "^7.25.1" "@babel/plugin-transform-json-strings" "^7.24.7" - "@babel/plugin-transform-literals" "^7.24.7" + "@babel/plugin-transform-literals" "^7.25.2" "@babel/plugin-transform-logical-assignment-operators" "^7.24.7" "@babel/plugin-transform-member-expression-literals" "^7.24.7" "@babel/plugin-transform-modules-amd" "^7.24.7" @@ -988,7 +990,7 @@ "@babel/plugin-transform-optional-catch-binding" "^7.24.7" "@babel/plugin-transform-optional-chaining" "^7.24.8" "@babel/plugin-transform-parameters" "^7.24.7" - "@babel/plugin-transform-private-methods" "^7.24.7" + "@babel/plugin-transform-private-methods" "^7.25.4" "@babel/plugin-transform-private-property-in-object" "^7.24.7" "@babel/plugin-transform-property-literals" "^7.24.7" "@babel/plugin-transform-regenerator" "^7.24.7" @@ -1001,10 +1003,10 @@ "@babel/plugin-transform-unicode-escapes" "^7.24.7" "@babel/plugin-transform-unicode-property-regex" "^7.24.7" "@babel/plugin-transform-unicode-regex" "^7.24.7" - "@babel/plugin-transform-unicode-sets-regex" "^7.24.7" + "@babel/plugin-transform-unicode-sets-regex" "^7.25.4" "@babel/preset-modules" "0.1.6-no-external-plugins" babel-plugin-polyfill-corejs2 "^0.4.10" - babel-plugin-polyfill-corejs3 "^0.10.4" + babel-plugin-polyfill-corejs3 "^0.10.6" babel-plugin-polyfill-regenerator "^0.6.1" core-js-compat "^3.37.1" semver "^6.3.1" @@ -1046,10 +1048,10 @@ resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.6", "@babel/runtime@^7.24.8", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz#3af9a91c1b739c569d5d80cc917280919c544ecb" - integrity sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw== +"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.9", "@babel/runtime@^7.25.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": + version "7.25.6" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz#9afc3289f7184d8d7f98b099884c26317b9264d2" + integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ== dependencies: regenerator-runtime "^0.14.0" @@ -1062,23 +1064,23 @@ "@babel/parser" "^7.25.0" "@babel/types" "^7.25.0" -"@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8", "@babel/traverse@^7.25.0", "@babel/traverse@^7.25.1", "@babel/traverse@^7.4.5": - version "7.25.1" - resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.1.tgz#64dbc31effc5f3fa3cf10d19df0e6310214743f5" - integrity sha512-LrHHoWq08ZpmmFqBAzN+hUdWwy5zt7FGa/hVwMcOqW6OVtwqaoD5utfuGYU87JYxdZgLUvktAsn37j/sYR9siA== +"@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8", "@babel/traverse@^7.25.0", "@babel/traverse@^7.25.1", "@babel/traverse@^7.25.2", "@babel/traverse@^7.25.3", "@babel/traverse@^7.25.4": + version "7.25.6" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz#04fad980e444f182ecf1520504941940a90fea41" + integrity sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ== dependencies: "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.25.0" - "@babel/parser" "^7.25.0" + "@babel/generator" "^7.25.6" + "@babel/parser" "^7.25.6" "@babel/template" "^7.25.0" - "@babel/types" "^7.25.0" + "@babel/types" "^7.25.6" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.24.9", "@babel/types@^7.25.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.8.3": - version "7.25.0" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.25.0.tgz#e6e3656c581f28da8452ed4f69e38008ec0ba41b" - integrity sha512-LcnxQSsd9aXOIgmmSpvZ/1yo46ra2ESYyqLcryaBZOghxy5qqOBjvCWP5JfkI8yl9rlxRgdLTTMCQQRcN2hdCg== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.25.6" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz#893942ddb858f32ae7a004ec9d3a76b3463ef8e6" + integrity sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw== dependencies: "@babel/helper-string-parser" "^7.24.8" "@babel/helper-validator-identifier" "^7.24.7" @@ -1090,9 +1092,9 @@ integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== "@codemirror/autocomplete@^6.0.0": - version "6.17.0" - resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.17.0.tgz#24ff5fc37fd91f6439df6f4ff9c8e910cde1b053" - integrity sha512-fdfj6e6ZxZf8yrkMHUSJJir7OJkHkZKaOZGzLWIYp2PZ3jd+d+UjG8zVPqJF6d3bKxkhvXTPan/UZ1t7Bqm0gA== + version "6.18.0" + resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.0.tgz#5f39b05daca04c95e990b70024144df47b2aa635" + integrity sha512-5DbOvBbY4qW5l57cjDsmmpDh3/TeK1vXfTHa+BUMrRzdWdcxKZ4U4V7vQaTtOpApNU4kLS4FQ6cINtLg245LXA== dependencies: "@codemirror/language" "^6.0.0" "@codemirror/state" "^6.0.0" @@ -1118,9 +1120,9 @@ "@lezer/json" "^1.0.0" "@codemirror/lang-sql@^6.6.5": - version "6.7.0" - resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.7.0.tgz#a87fb9b458ae0ad1d8647c0234accca0ef11bb78" - integrity sha512-KMXp6rtyPYz6RaElvkh/77ClEAoQoHRPZo0zutRRialeFs/B/X8YaUJBCnAV2zqyeJPLZ4hgo48mG8TKoNXfZA== + version "6.7.1" + resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.7.1.tgz#314211eb79fbba96b4dd0d24fa954be9803368ab" + integrity sha512-flQa7zemrLKk0TIrOJnpeyH/b29BcVybtsTeZMgAo40O6kGbrnUSCgwI3TF5iJY3O9VXJKKCA+i0CBVvDfr88w== dependencies: "@codemirror/autocomplete" "^6.0.0" "@codemirror/language" "^6.0.0" @@ -1165,9 +1167,9 @@ integrity sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A== "@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0": - version "6.29.1" - resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.29.1.tgz#9c6c6f8a15e12df1b7e9d136dcbf4ff90b81ef71" - integrity sha512-7r+DlO/QFwPqKp73uq5mmrS4TuLPUVotbNOKYzN3OLP5ScrOVXcm4g13/48b6ZXGhdmzMinzFYqH0vo+qihIkQ== + version "6.33.0" + resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.33.0.tgz#51e270410fc3af92a6e38798e80ebf8add7dc3ec" + integrity sha512-AroaR3BvnjRW8fiZBalAaK+ZzB5usGgI014YKElYZvQdNH5ZIidHlO+cyf/2rWzyBFRkvG6VhiXeAEbC53P2YQ== dependencies: "@codemirror/state" "^6.4.0" style-mod "^4.1.0" @@ -1223,45 +1225,40 @@ resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz#ff9221b9f58b4dfe61e619a7788734bd63f6898b" integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g== -"@emotion/is-prop-valid@^1.1.0", "@emotion/is-prop-valid@^1.3.0": +"@emotion/is-prop-valid@^1.3.0": version "1.3.0" resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.3.0.tgz#bd84ba972195e8a2d42462387581560ef780e4e2" integrity sha512-SHetuSLvJDzuNbOdtPVbq6yMMMlLoW5Q94uDqJZqy50gcmAjxFkVqmzqSGEFq9gT2iMuIeKV1PXVWmvUhuZLlQ== dependencies: "@emotion/memoize" "^0.9.0" -"@emotion/memoize@^0.7.5": - version "0.7.5" - resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50" - integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== - "@emotion/memoize@^0.9.0": version "0.9.0" resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz#745969d649977776b43fc7648c556aaa462b4102" integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ== "@emotion/react@^11.11.1", "@emotion/react@^11.11.3", "@emotion/react@^11.8.1": - version "11.13.0" - resolved "https://registry.npmjs.org/@emotion/react/-/react-11.13.0.tgz#a9ebf827b98220255e5760dac89fa2d38ca7b43d" - integrity sha512-WkL+bw1REC2VNV1goQyfxjx1GYJkcc23CRQkXX+vZNLINyfI7o+uUn/rTGPt/xJ3bJHd5GcljgnxHf4wRw5VWQ== + version "11.13.3" + resolved "https://registry.npmjs.org/@emotion/react/-/react-11.13.3.tgz#a69d0de2a23f5b48e0acf210416638010e4bd2e4" + integrity sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg== dependencies: "@babel/runtime" "^7.18.3" "@emotion/babel-plugin" "^11.12.0" "@emotion/cache" "^11.13.0" - "@emotion/serialize" "^1.3.0" + "@emotion/serialize" "^1.3.1" "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0" "@emotion/utils" "^1.4.0" "@emotion/weak-memoize" "^0.4.0" hoist-non-react-statics "^3.3.1" -"@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0": - version "1.3.0" - resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.0.tgz#e07cadfc967a4e7816e0c3ffaff4c6ce05cb598d" - integrity sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA== +"@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0", "@emotion/serialize@^1.3.1": + version "1.3.1" + resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.1.tgz#490b660178f43d2de8e92b278b51079d726c05c3" + integrity sha512-dEPNKzBPU+vFPGa+z3axPRn8XVDetYORmDC0wAiej+TNcOZE70ZMJa0X7JdeoM6q/nWTMZeLpN/fTnD9o8MQBA== dependencies: "@emotion/hash" "^0.9.2" "@emotion/memoize" "^0.9.0" - "@emotion/unitless" "^0.9.0" + "@emotion/unitless" "^0.10.0" "@emotion/utils" "^1.4.0" csstype "^3.0.2" @@ -1282,20 +1279,10 @@ "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0" "@emotion/utils" "^1.4.0" -"@emotion/stylis@^0.8.4": - version "0.8.5" - resolved "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" - integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== - -"@emotion/unitless@^0.7.4": - version "0.7.5" - resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" - integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== - -"@emotion/unitless@^0.9.0": - version "0.9.0" - resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.9.0.tgz#8e5548f072bd67b8271877e51c0f95c76a66cbe2" - integrity sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ== +"@emotion/unitless@^0.10.0": + version "0.10.0" + resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz#2af2f7c7e5150f497bdabd848ce7b218a27cf745" + integrity sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg== "@emotion/use-insertion-effect-with-fallbacks@^1.1.0": version "1.1.0" @@ -1324,10 +1311,10 @@ resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae" integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A== -"@eslint/config-array@^0.17.1": - version "0.17.1" - resolved "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz#d9b8b8b6b946f47388f32bedfd3adf29ca8f8910" - integrity sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA== +"@eslint/config-array@^0.18.0": + version "0.18.0" + resolved "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz#37d8fe656e0d5e3dbaea7758ea56540867fd074d" + integrity sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw== dependencies: "@eslint/object-schema" "^2.1.4" debug "^4.3.1" @@ -1348,10 +1335,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@9.8.0": - version "9.8.0" - resolved "https://registry.npmjs.org/@eslint/js/-/js-9.8.0.tgz#ae9bc14bb839713c5056f5018bcefa955556d3a4" - integrity sha512-MfluB7EUfxXtv3i/++oh89uzAr4PDI4nn201hsp+qaXqsjAWzinlZEHEfPgAX4doIlKvPG/i0A9dpKxOLII8yA== +"@eslint/js@9.9.1": + version "9.9.1" + resolved "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz#4a97e85e982099d6c7ee8410aacb55adaa576f06" + integrity sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ== "@eslint/object-schema@^2.1.4": version "2.1.4" @@ -1359,19 +1346,19 @@ integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ== "@floating-ui/core@^1.6.0": - version "1.6.5" - resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.5.tgz#102335cac0d22035b04d70ca5ff092d2d1a26f2b" - integrity sha512-8GrTWmoFhm5BsMZOTHeGD2/0FLKLQQHvO/ZmQga4tKempYRLz8aqJGqXVuQgisnMObq2YZ2SgkwctN1LOOxcqA== + version "1.6.7" + resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.7.tgz#7602367795a390ff0662efd1c7ae8ca74e75fb12" + integrity sha512-yDzVT/Lm101nQ5TCVeK65LtdN7Tj4Qpr9RTXJ2vPFLqtLxwOrpoxAHAJI8J3yYWUc40J0BDBheaitK5SJmno2g== dependencies: - "@floating-ui/utils" "^0.2.5" + "@floating-ui/utils" "^0.2.7" "@floating-ui/dom@^1.0.0", "@floating-ui/dom@^1.0.1": - version "1.6.8" - resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.8.tgz#45e20532b6d8a061b356a4fb336022cf2609754d" - integrity sha512-kx62rP19VZ767Q653wsP1XZCGIirkE09E0QUGNYTM/ttbbQHqcGPdSfWFxUyyNLc/W6aoJRBajOSXhP6GXjC0Q== + version "1.6.10" + resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.10.tgz#b74c32f34a50336c86dcf1f1c845cf3a39e26d6f" + integrity sha512-fskgCFv8J8OamCmyun8MfjB1Olfn+uZKjOKZ0vhYF3gRmEUXcGOjxWL8bBr7i4kIuPZ2KD2S3EUIOxnjC8kl2A== dependencies: "@floating-ui/core" "^1.6.0" - "@floating-ui/utils" "^0.2.5" + "@floating-ui/utils" "^0.2.7" "@floating-ui/react-dom@^2.0.8": version "2.1.1" @@ -1380,10 +1367,10 @@ dependencies: "@floating-ui/dom" "^1.0.0" -"@floating-ui/utils@^0.2.5": - version "0.2.5" - resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.5.tgz#105c37d9d9620ce69b7f692a20c821bf1ad2cbf9" - integrity sha512-sTcG+QZ6fdEUObICavU+aB3Mp8HY4n14wYHdxK4fXjPmv3PXZZeY5RaguJmGyeH/CJQhX3fqKUtS4qc1LoHwhQ== +"@floating-ui/utils@^0.2.7": + version "0.2.7" + resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.7.tgz#d0ece53ce99ab5a8e37ebdfe5e32452a2bfc073e" + integrity sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA== "@fortawesome/fontawesome-free@latest": version "6.6.0" @@ -1671,9 +1658,9 @@ integrity sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ== "@lezer/highlight@^1.0.0": - version "1.2.0" - resolved "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz#e5898c3644208b4b589084089dceeea2966f7780" - integrity sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA== + version "1.2.1" + resolved "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz#596fa8f9aeb58a608be0a563e960c373cbf23f8b" + integrity sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA== dependencies: "@lezer/common" "^1.0.0" @@ -1706,28 +1693,15 @@ clsx "^2.1.0" prop-types "^15.8.1" -"@mui/base@^5.0.0-beta.40": - version "5.0.0-dev.20240529-082515-213b5e33ab" - resolved "https://registry.npmjs.org/@mui/base/-/base-5.0.0-dev.20240529-082515-213b5e33ab.tgz#e9a916677dab38ffc92c3171f7d96bf300790531" - integrity sha512-3ic6fc6BHstgM+MGqJEVx3zt9g5THxVXm3VVFUfdeplPqAWWgW2QoKfZDLT10s+pi+MAkpgEBP0kgRidf81Rsw== - dependencies: - "@babel/runtime" "^7.24.6" - "@floating-ui/react-dom" "^2.0.8" - "@mui/types" "^7.2.14-dev.20240529-082515-213b5e33ab" - "@mui/utils" "^6.0.0-dev.20240529-082515-213b5e33ab" - "@popperjs/core" "^2.11.8" - clsx "^2.1.1" - prop-types "^15.8.1" - -"@mui/core-downloads-tracker@^5.16.5": - version "5.16.5" - resolved "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.5.tgz#396c7e133a0705c8d04c8ef36edad7ad94cb4981" - integrity sha512-ziFn1oPm6VjvHQcdGcAO+fXvOQEgieIj0BuSqcltFU+JXIxjPdVYNTdn2HU7/Ak5Gabk6k2u7+9PV7oZ6JT5sA== +"@mui/core-downloads-tracker@^5.16.7": + version "5.16.7" + resolved "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.7.tgz#182a325a520f7ebd75de051fceabfc0314cfd004" + integrity sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ== "@mui/icons-material@^5.16.6": - version "5.16.6" - resolved "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.16.6.tgz#7067ddba693bec22f77592cb9cd516e2f1c1fd6e" - integrity sha512-ceNGjoXheH9wbIFa1JHmSc9QVjJUvh18KvHrR4/FkJCSi9HXJ+9ee1kUhCOEFfuxNF8UB6WWVrIUOUgRd70t0A== + version "5.16.7" + resolved "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.16.7.tgz#e27f901af792065efc9f3d75d74a66af7529a10a" + integrity sha512-UrGwDJCXEszbDI7yV047BYU5A28eGJ79keTCP4cc74WyncuVrnurlmIRxaHL8YK+LI1Kzq+/JM52IAkNnv4u+Q== dependencies: "@babel/runtime" "^7.23.9" @@ -1745,15 +1719,15 @@ prop-types "^15.8.1" "@mui/material@^5.15.10": - version "5.16.5" - resolved "https://registry.npmjs.org/@mui/material/-/material-5.16.5.tgz#7989b088073f88c2d19501cc947899d811556089" - integrity sha512-eQrjjg4JeczXvh/+8yvJkxWIiKNHVptB/AqpsKfZBWp5mUD5U3VsjODMuUl1K2BSq0omV3CiO/mQmWSSMKSmaA== + version "5.16.7" + resolved "https://registry.npmjs.org/@mui/material/-/material-5.16.7.tgz#6e814e2eefdaf065a769cecf549c3569e107a50b" + integrity sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg== dependencies: "@babel/runtime" "^7.23.9" - "@mui/core-downloads-tracker" "^5.16.5" - "@mui/system" "^5.16.5" + "@mui/core-downloads-tracker" "^5.16.7" + "@mui/system" "^5.16.7" "@mui/types" "^7.2.15" - "@mui/utils" "^5.16.5" + "@mui/utils" "^5.16.6" "@popperjs/core" "^2.11.8" "@types/react-transition-group" "^4.4.10" clsx "^2.1.0" @@ -1762,48 +1736,48 @@ react-is "^18.3.1" react-transition-group "^4.4.5" -"@mui/private-theming@^5.16.5": - version "5.16.5" - resolved "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.16.5.tgz#b90afcfa76ea50778453c633656ff59cb1b5494d" - integrity sha512-CSLg0YkpDqg0aXOxtjo3oTMd3XWMxvNb5d0v4AYVqwOltU8q6GvnZjhWyCLjGSCrcgfwm6/VDjaKLPlR14wxIA== +"@mui/private-theming@^5.16.6": + version "5.16.6" + resolved "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.16.6.tgz#547671e7ae3f86b68d1289a0b90af04dfcc1c8c9" + integrity sha512-rAk+Rh8Clg7Cd7shZhyt2HGTTE5wYKNSJ5sspf28Fqm/PZ69Er9o6KX25g03/FG2dfpg5GCwZh/xOojiTfm3hw== dependencies: "@babel/runtime" "^7.23.9" - "@mui/utils" "^5.16.5" + "@mui/utils" "^5.16.6" prop-types "^15.8.1" -"@mui/styled-engine@^5.16.4": - version "5.16.4" - resolved "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.16.4.tgz#a7a8c9079c307bab91ccd65ed5dd1496ddf2a3ab" - integrity sha512-0+mnkf+UiAmTVB8PZFqOhqf729Yh0Cxq29/5cA3VAyDVTRIUUQ8FXQhiAhUIbijFmM72rY80ahFPXIm4WDbzcA== +"@mui/styled-engine@^5.16.6": + version "5.16.6" + resolved "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.16.6.tgz#60110c106dd482dfdb7e2aa94fd6490a0a3f8852" + integrity sha512-zaThmS67ZmtHSWToTiHslbI8jwrmITcN93LQaR2lKArbvS7Z3iLkwRoiikNWutx9MBs8Q6okKvbZq1RQYB3v7g== dependencies: "@babel/runtime" "^7.23.9" "@emotion/cache" "^11.11.0" csstype "^3.1.3" prop-types "^15.8.1" -"@mui/system@^5.16.5": - version "5.16.5" - resolved "https://registry.npmjs.org/@mui/system/-/system-5.16.5.tgz#a90239e1467f7fce960167939dde9f44f6869484" - integrity sha512-uzIUGdrWddUx1HPxW4+B2o4vpgKyRxGe/8BxbfXVDPNPHX75c782TseoCnR/VyfnZJfqX87GcxDmnZEE1c031g== +"@mui/system@^5.16.5", "@mui/system@^5.16.7": + version "5.16.7" + resolved "https://registry.npmjs.org/@mui/system/-/system-5.16.7.tgz#4583ca5bf3b38942e02c15a1e622ba869ac51393" + integrity sha512-Jncvs/r/d/itkxh7O7opOunTqbbSSzMTHzZkNLM+FjAOg+cYAZHrPDlYe1ZGKUYORwwb2XexlWnpZp0kZ4AHuA== dependencies: "@babel/runtime" "^7.23.9" - "@mui/private-theming" "^5.16.5" - "@mui/styled-engine" "^5.16.4" + "@mui/private-theming" "^5.16.6" + "@mui/styled-engine" "^5.16.6" "@mui/types" "^7.2.15" - "@mui/utils" "^5.16.5" + "@mui/utils" "^5.16.6" clsx "^2.1.0" csstype "^3.1.3" prop-types "^15.8.1" -"@mui/types@^7.2.14", "@mui/types@^7.2.14-dev.20240529-082515-213b5e33ab", "@mui/types@^7.2.15": - version "7.2.15" - resolved "https://registry.npmjs.org/@mui/types/-/types-7.2.15.tgz#dadd232fe9a70be0d526630675dff3b110f30b53" - integrity sha512-nbo7yPhtKJkdf9kcVOF8JZHPZTmqXjJ/tI0bdWgHg5tp9AnIN4Y7f7wm9T+0SyGYJk76+GYZ8Q5XaTYAsUHN0Q== +"@mui/types@^7.2.14", "@mui/types@^7.2.15": + version "7.2.16" + resolved "https://registry.npmjs.org/@mui/types/-/types-7.2.16.tgz#66710c691b51cd4fca95322100cd74ec230cfe30" + integrity sha512-qI8TV3M7ShITEEc8Ih15A2vLzZGLhD+/UPNwck/hcls2gwg7dyRjNGXcQYHKLB5Q7PuTRfrTkAoPa2VV1s67Ag== -"@mui/utils@^5.15.14", "@mui/utils@^5.16.5": - version "5.16.5" - resolved "https://registry.npmjs.org/@mui/utils/-/utils-5.16.5.tgz#3a16877a80166a7f8b58c893d08e0993040fc49e" - integrity sha512-CwhcA9y44XwK7k2joL3Y29mRUnoBt+gOZZdGyw7YihbEwEErJYBtDwbZwVgH68zAljGe/b+Kd5bzfl63Gi3R2A== +"@mui/utils@^5.15.14", "@mui/utils@^5.16.5", "@mui/utils@^5.16.6": + version "5.16.6" + resolved "https://registry.npmjs.org/@mui/utils/-/utils-5.16.6.tgz#905875bbc58d3dcc24531c3314a6807aba22a711" + integrity sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA== dependencies: "@babel/runtime" "^7.23.9" "@mui/types" "^7.2.15" @@ -1812,26 +1786,14 @@ prop-types "^15.8.1" react-is "^18.3.1" -"@mui/utils@^6.0.0-dev.20240529-082515-213b5e33ab": - version "6.0.0-dev.20240529-082515-213b5e33ab" - resolved "https://registry.npmjs.org/@mui/utils/-/utils-6.0.0-dev.20240529-082515-213b5e33ab.tgz#085d02079d9f12baa25f620d314ec2aed4b43ab7" - integrity sha512-jyNcB0drDhYcoq5MHNTiEc63GfVE1GZK+CVUd8tlLzk5q631RPYJ5jONSOszLiUOXBmI8Uu1SBJUwrG3j2YG2A== - dependencies: - "@babel/runtime" "^7.24.6" - "@types/prop-types" "^15.7.12" - prop-types "^15.8.1" - react-is "^18.2.0" - "@mui/x-date-pickers@^7.7.1": - version "7.11.1" - resolved "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.11.1.tgz#a06fa850aadedbe0be2c0eaa972fe4c1d938d618" - integrity sha512-CflouzTNSv0YeOA8iiYpJMtqGlwGC8LI9EE9egDGhatR9Mn5geRDTXsm0rRG/4pMOfaRxyJc6Yzr/axBhEXM7w== + version "7.15.0" + resolved "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.15.0.tgz#a2e0979dda5d38fd34e5be76064b8331ef228894" + integrity sha512-YQEQICNxUEFYp/I/yP58cqihA8yhXaXSNZ1/N0JANu2IlCwoJ4Jzi+S0s4RN7RghpiDyoSMFijROBC5HfpTjiw== dependencies: - "@babel/runtime" "^7.24.8" - "@mui/base" "^5.0.0-beta.40" - "@mui/system" "^5.16.5" - "@mui/utils" "^5.16.5" - "@types/react-transition-group" "^4.4.10" + "@babel/runtime" "^7.25.4" + "@mui/utils" "^5.16.6" + "@types/react-transition-group" "^4.4.11" clsx "^2.1.1" prop-types "^15.8.1" react-transition-group "^4.4.5" @@ -2190,28 +2152,28 @@ "@tanstack/query-core" "5.36.1" "@tanstack/react-table@^8.16.0": - version "8.19.3" - resolved "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.19.3.tgz#be1d9ee991ac06b7d4d17cc5c66469ac157bfd8a" - integrity sha512-MtgPZc4y+cCRtU16y1vh1myuyZ2OdkWgMEBzyjYsoMWMicKZGZvcDnub3Zwb6XF2pj9iRMvm1SO1n57lS0vXLw== + version "8.20.5" + resolved "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.20.5.tgz#19987d101e1ea25ef5406dce4352cab3932449d8" + integrity sha512-WEHopKw3znbUZ61s9i0+i9g8drmDo6asTWbrQh8Us63DAk/M0FkmIqERew6P71HI75ksZ2Pxyuf4vvKh9rAkiA== dependencies: - "@tanstack/table-core" "8.19.3" + "@tanstack/table-core" "8.20.5" "@tanstack/react-virtual@^3.8.4": - version "3.8.4" - resolved "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.8.4.tgz#7f5d8a71f525976c98be46fecd3dbee2d90b5dac" - integrity sha512-Dq0VQr3QlTS2qL35g360QaJWBt7tCn/0xw4uZ0dHXPLO1Ak4Z4nVX4vuj1Npg1b/jqNMDToRtR5OIxM2NXRBWg== + version "3.10.6" + resolved "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.10.6.tgz#f90f97d50a8d83dcd3c3a2d425aadbb55d4837db" + integrity sha512-xaSy6uUxB92O8mngHZ6CvbhGuqxQ5lIZWCBy+FjhrbHmOwc6BnOnKkYm2FsB1/BpKw/+FVctlMbEtI+F6I1aJg== dependencies: - "@tanstack/virtual-core" "3.8.4" + "@tanstack/virtual-core" "3.10.6" -"@tanstack/table-core@8.19.3": - version "8.19.3" - resolved "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.19.3.tgz#669e3eca2179ee3456fc068fed8683df01607c43" - integrity sha512-IqREj9ADoml9zCAouIG/5kCGoyIxPFdqdyoxis9FisXFi5vT+iYfEfLosq4xkU/iDbMcEuAj+X8dWRLvKYDNoQ== +"@tanstack/table-core@8.20.5": + version "8.20.5" + resolved "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.20.5.tgz#3974f0b090bed11243d4107283824167a395cf1d" + integrity sha512-P9dF7XbibHph2PFRz8gfBKEXEY/HJPOhym8CHmjF8y3q5mWpKx9xtZapXQUWCgkqvsK0R46Azuz+VaxD4Xl+Tg== -"@tanstack/virtual-core@3.8.4": - version "3.8.4" - resolved "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.8.4.tgz#0ff84b6a0e4b394335cf7ccf759c36b58cbd02eb" - integrity sha512-iO5Ujgw3O1yIxWDe9FgUPNkGjyT657b1WNX52u+Wv1DyBFEpdCdGkuVaky0M3hHFqNWjAmHWTn4wgj9rTr7ZQg== +"@tanstack/virtual-core@3.10.6": + version "3.10.6" + resolved "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.10.6.tgz#babe3989b2344a5f12fc64129f9bbed5d3402999" + integrity sha512-1giLc4dzgEKLMx5pgKjL6HlG5fjZMgCjzlKAlpr7yoUtetVPELgER1NtephAI910nMwfPTHNyWKSFmJdHkz2Cw== "@testing-library/dom@10.2.0": version "10.2.0" @@ -2228,12 +2190,11 @@ pretty-format "^27.0.2" "@testing-library/jest-dom@^6.4.6": - version "6.4.8" - resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.8.tgz#9c435742b20c6183d4e7034f2b329d562c079daa" - integrity sha512-JD0G+Zc38f5MBHA4NgxQMR5XtO5Jx9g86jqturNTt2WUfRmLDIY7iKkWHDCCTiDuFMre6nxAD5wHw9W5kI4rGw== + version "6.5.0" + resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.5.0.tgz#50484da3f80fb222a853479f618a9ce5c47bfe54" + integrity sha512-xGGHpBXYSHUUr6XsKBfs85TWlYKpTc37cSBBVrXcib2MkHLboWlkClhWF37JKlDb9KEq3dHs+f2xR7XJEWGBxA== dependencies: "@adobe/css-tools" "^4.4.0" - "@babel/runtime" "^7.9.2" aria-query "^5.0.0" chalk "^3.0.0" css.escape "^1.5.1" @@ -2313,23 +2274,7 @@ dependencies: classnames "*" -"@types/eslint-scope@^3.7.3": - version "3.7.7" - resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" - integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "9.6.0" - resolved "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.0.tgz#51d4fe4d0316da9e9f2c80884f2c20ed5fb022ff" - integrity sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*", "@types/estree@^1.0.5": +"@types/estree@^1.0.5": version "1.0.5" resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== @@ -2377,7 +2322,7 @@ "@types/tough-cookie" "*" parse5 "^7.0.0" -"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.15" resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== @@ -2395,11 +2340,11 @@ integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== "@types/node@*": - version "22.0.0" - resolved "https://registry.npmjs.org/@types/node/-/node-22.0.0.tgz#04862a2a71e62264426083abe1e27e87cac05a30" - integrity sha512-VT7KSYudcPOzP5Q0wfbowyNLaVR8QWUdw+088uFWwfvpY6uCWaXpqV6ieLAu9WBcnTa7H4Z5RLK8I5t2FuOcqw== + version "22.5.1" + resolved "https://registry.npmjs.org/@types/node/-/node-22.5.1.tgz#de01dce265f6b99ed32b295962045d10b5b99560" + integrity sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw== dependencies: - undici-types "~6.11.1" + undici-types "~6.19.2" "@types/normalize-package-data@^2.4.0": version "2.4.4" @@ -2423,17 +2368,17 @@ dependencies: "@types/react" "*" -"@types/react-transition-group@^4.4.0", "@types/react-transition-group@^4.4.10": - version "4.4.10" - resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz#6ee71127bdab1f18f11ad8fb3322c6da27c327ac" - integrity sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q== +"@types/react-transition-group@^4.4.0", "@types/react-transition-group@^4.4.10", "@types/react-transition-group@^4.4.11": + version "4.4.11" + resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.11.tgz#d963253a611d757de01ebb241143b1017d5d63d5" + integrity sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA== dependencies: "@types/react" "*" "@types/react@*", "@types/react@^18.0.2": - version "18.3.3" - resolved "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f" - integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw== + version "18.3.4" + resolved "https://registry.npmjs.org/@types/react/-/react-18.3.4.tgz#dfdd534a1d081307144c00e325c06e00312c93a3" + integrity sha512-J7W30FTdfCxDDjmfRM+/JqLHBIyl7xUIp9kwK637FGmY7+mkSFSe6L4jpZzhj5QMfLssSDP4/i75AKkrdC7/Jw== dependencies: "@types/prop-types" "*" csstype "^3.0.2" @@ -2445,11 +2390,6 @@ dependencies: "@types/node" "*" -"@types/semver@^7.3.12": - version "7.5.8" - resolved "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" - integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ== - "@types/stack-utils@^2.0.0": version "2.0.3" resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8" @@ -2466,139 +2406,91 @@ integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ== "@types/yargs@^17.0.8": - version "17.0.32" - resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229" - integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog== + version "17.0.33" + resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d" + integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA== dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@7.17.0": - version "7.17.0" - resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.17.0.tgz#c8ed1af1ad2928ede5cdd207f7e3090499e1f77b" - integrity sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A== +"@typescript-eslint/eslint-plugin@8.3.0": + version "8.3.0" + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.3.0.tgz#726627fad16d41d20539637efee8c2329fe6be32" + integrity sha512-FLAIn63G5KH+adZosDYiutqkOkYEx0nvcwNNfJAf+c7Ae/H35qWwTYvPZUKFj5AS+WfHG/WJJfWnDnyNUlp8UA== dependencies: "@eslint-community/regexpp" "^4.10.0" - "@typescript-eslint/scope-manager" "7.17.0" - "@typescript-eslint/type-utils" "7.17.0" - "@typescript-eslint/utils" "7.17.0" - "@typescript-eslint/visitor-keys" "7.17.0" + "@typescript-eslint/scope-manager" "8.3.0" + "@typescript-eslint/type-utils" "8.3.0" + "@typescript-eslint/utils" "8.3.0" + "@typescript-eslint/visitor-keys" "8.3.0" graphemer "^1.4.0" ignore "^5.3.1" natural-compare "^1.4.0" ts-api-utils "^1.3.0" -"@typescript-eslint/parser@7.17.0": - version "7.17.0" - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.17.0.tgz#be8e32c159190cd40a305a2121220eadea5a88e7" - integrity sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A== +"@typescript-eslint/parser@8.3.0": + version "8.3.0" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.3.0.tgz#3c72c32bc909cb91ce3569e7d11d729ad84deafa" + integrity sha512-h53RhVyLu6AtpUzVCYLPhZGL5jzTD9fZL+SYf/+hYOx2bDkyQXztXSc4tbvKYHzfMXExMLiL9CWqJmVz6+78IQ== dependencies: - "@typescript-eslint/scope-manager" "7.17.0" - "@typescript-eslint/types" "7.17.0" - "@typescript-eslint/typescript-estree" "7.17.0" - "@typescript-eslint/visitor-keys" "7.17.0" + "@typescript-eslint/scope-manager" "8.3.0" + "@typescript-eslint/types" "8.3.0" + "@typescript-eslint/typescript-estree" "8.3.0" + "@typescript-eslint/visitor-keys" "8.3.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.62.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c" - integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w== - dependencies: - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/visitor-keys" "5.62.0" - -"@typescript-eslint/scope-manager@7.17.0": - version "7.17.0" - resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.17.0.tgz#e072d0f914662a7bfd6c058165e3c2b35ea26b9d" - integrity sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA== +"@typescript-eslint/scope-manager@8.3.0": + version "8.3.0" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.3.0.tgz#834301d2e70baf924c26818b911bdc40086f7468" + integrity sha512-mz2X8WcN2nVu5Hodku+IR8GgCOl4C0G/Z1ruaWN4dgec64kDBabuXyPAr+/RgJtumv8EEkqIzf3X2U5DUKB2eg== dependencies: - "@typescript-eslint/types" "7.17.0" - "@typescript-eslint/visitor-keys" "7.17.0" + "@typescript-eslint/types" "8.3.0" + "@typescript-eslint/visitor-keys" "8.3.0" -"@typescript-eslint/type-utils@7.17.0": - version "7.17.0" - resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.17.0.tgz#c5da78feb134c9c9978cbe89e2b1a589ed22091a" - integrity sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA== +"@typescript-eslint/type-utils@8.3.0": + version "8.3.0" + resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.3.0.tgz#c1ae6af8c21a27254321016b052af67ddb44a9ac" + integrity sha512-wrV6qh//nLbfXZQoj32EXKmwHf4b7L+xXLrP3FZ0GOUU72gSvLjeWUl5J5Ue5IwRxIV1TfF73j/eaBapxx99Lg== dependencies: - "@typescript-eslint/typescript-estree" "7.17.0" - "@typescript-eslint/utils" "7.17.0" + "@typescript-eslint/typescript-estree" "8.3.0" + "@typescript-eslint/utils" "8.3.0" debug "^4.3.4" ts-api-utils "^1.3.0" -"@typescript-eslint/types@5.62.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f" - integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== - -"@typescript-eslint/types@7.17.0": - version "7.17.0" - resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.17.0.tgz#7ce8185bdf06bc3494e73d143dbf3293111b9cff" - integrity sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A== - -"@typescript-eslint/typescript-estree@5.62.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b" - integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA== - dependencies: - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/visitor-keys" "5.62.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - semver "^7.3.7" - tsutils "^3.21.0" +"@typescript-eslint/types@8.3.0": + version "8.3.0" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.3.0.tgz#378e62447c2d7028236e55a81d3391026600563b" + integrity sha512-y6sSEeK+facMaAyixM36dQ5NVXTnKWunfD1Ft4xraYqxP0lC0POJmIaL/mw72CUMqjY9qfyVfXafMeaUj0noWw== -"@typescript-eslint/typescript-estree@7.17.0": - version "7.17.0" - resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.17.0.tgz#dcab3fea4c07482329dd6107d3c6480e228e4130" - integrity sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw== +"@typescript-eslint/typescript-estree@8.3.0": + version "8.3.0" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.3.0.tgz#3e3d38af101ba61a8568f034733b72bfc9f176b9" + integrity sha512-Mq7FTHl0R36EmWlCJWojIC1qn/ZWo2YiWYc1XVtasJ7FIgjo0MVv9rZWXEE7IK2CGrtwe1dVOxWwqXUdNgfRCA== dependencies: - "@typescript-eslint/types" "7.17.0" - "@typescript-eslint/visitor-keys" "7.17.0" + "@typescript-eslint/types" "8.3.0" + "@typescript-eslint/visitor-keys" "8.3.0" debug "^4.3.4" - globby "^11.1.0" + fast-glob "^3.3.2" is-glob "^4.0.3" minimatch "^9.0.4" semver "^7.6.0" ts-api-utils "^1.3.0" -"@typescript-eslint/utils@7.17.0": - version "7.17.0" - resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.17.0.tgz#815cd85b9001845d41b699b0ce4f92d6dfb84902" - integrity sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw== +"@typescript-eslint/utils@8.3.0", "@typescript-eslint/utils@^6.0.0 || ^7.0.0 || ^8.0.0": + version "8.3.0" + resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.3.0.tgz#b10972319deac5959c7a7075d0cf2b5e1de7ec08" + integrity sha512-F77WwqxIi/qGkIGOGXNBLV7nykwfjLsdauRB/DOFPdv6LTF3BHHkBpq81/b5iMPSF055oO2BiivDJV4ChvNtXA== dependencies: "@eslint-community/eslint-utils" "^4.4.0" - "@typescript-eslint/scope-manager" "7.17.0" - "@typescript-eslint/types" "7.17.0" - "@typescript-eslint/typescript-estree" "7.17.0" + "@typescript-eslint/scope-manager" "8.3.0" + "@typescript-eslint/types" "8.3.0" + "@typescript-eslint/typescript-estree" "8.3.0" -"@typescript-eslint/utils@^5.10.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86" - integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ== +"@typescript-eslint/visitor-keys@8.3.0": + version "8.3.0" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.3.0.tgz#320d747d107af1eef1eb43fbc4ccdbddda13068b" + integrity sha512-RmZwrTbQ9QveF15m/Cl28n0LXD6ea2CjkhH5rQ55ewz3H24w+AMCJHPVYaZ8/0HoG8Z3cLLFFycRXxeO2tz9FA== dependencies: - "@eslint-community/eslint-utils" "^4.2.0" - "@types/json-schema" "^7.0.9" - "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/typescript-estree" "5.62.0" - eslint-scope "^5.1.1" - semver "^7.3.7" - -"@typescript-eslint/visitor-keys@5.62.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e" - integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw== - dependencies: - "@typescript-eslint/types" "5.62.0" - eslint-visitor-keys "^3.3.0" - -"@typescript-eslint/visitor-keys@7.17.0": - version "7.17.0" - resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.17.0.tgz#680465c734be30969e564b4647f38d6cdf49bfb0" - integrity sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A== - dependencies: - "@typescript-eslint/types" "7.17.0" + "@typescript-eslint/types" "8.3.0" eslint-visitor-keys "^3.4.3" "@vusion/webfonts-generator@^0.8.0": @@ -2812,9 +2704,9 @@ abbrev@^2.0.0: integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== ace-builds@^1.31.1: - version "1.35.4" - resolved "https://registry.npmjs.org/ace-builds/-/ace-builds-1.35.4.tgz#f41d7ef57c3a7d424cd7e3300bef0cbef905c84f" - integrity sha512-r0KQclhZ/uk5a4zOqRYQkJuQuu4vFMiA6VTj54Tk4nI1TUR3iEMMppZkWbNoWEgWwv4ciDloObb9Rf4V55Qgjw== + version "1.36.1" + resolved "https://registry.npmjs.org/ace-builds/-/ace-builds-1.36.1.tgz#f44e29293173b4e66e46a2827c75efe5fd36f734" + integrity sha512-/Rngkz+KgR7GFF16zO3itstku3wezjp4PTqrev3QvGfEix+Ilzsgp6X/VFSaprH9Cqd36rwT8c6eXwMKVgc+Kg== acorn-globals@^7.0.0: version "7.0.1" @@ -3054,11 +2946,6 @@ array-buffer-byte-length@^1.0.1: get-intrinsic "^1.2.4" is-string "^1.0.7" -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - array-union@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975" @@ -3175,9 +3062,9 @@ async@^2.1.4: lodash "^4.17.14" async@^3.2.3: - version "3.2.5" - resolved "https://registry.npmjs.org/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" - integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== + version "3.2.6" + resolved "https://registry.npmjs.org/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" + integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== asynckit@^0.4.0: version "0.4.0" @@ -3190,15 +3077,15 @@ attr-accept@^2.2.2: integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg== autoprefixer@^10.2.4: - version "10.4.19" - resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz#ad25a856e82ee9d7898c59583c1afeb3fa65f89f" - integrity sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew== + version "10.4.20" + resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz#5caec14d43976ef42e32dcb4bd62878e96be5b3b" + integrity sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g== dependencies: - browserslist "^4.23.0" - caniuse-lite "^1.0.30001599" + browserslist "^4.23.3" + caniuse-lite "^1.0.30001646" fraction.js "^4.3.7" normalize-range "^0.1.2" - picocolors "^1.0.0" + picocolors "^1.0.1" postcss-value-parser "^4.2.0" available-typed-arrays@^1.0.7: @@ -3217,9 +3104,9 @@ axios-mock-adapter@^1.17.0: is-buffer "^2.0.5" axios@^1.7.4: - version "1.7.4" - resolved "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2" - integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw== + version "1.7.5" + resolved "https://registry.npmjs.org/axios/-/axios-1.7.5.tgz#21eed340eb5daf47d29b6e002424b3e88c8c54b1" + integrity sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -3285,13 +3172,13 @@ babel-plugin-polyfill-corejs2@^0.4.10: "@babel/helper-define-polyfill-provider" "^0.6.2" semver "^6.3.1" -"babel-plugin-polyfill-corejs3@^0.10.1", "babel-plugin-polyfill-corejs3@^0.10.4": - version "0.10.4" - resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz#789ac82405ad664c20476d0233b485281deb9c77" - integrity sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg== +babel-plugin-polyfill-corejs3@^0.10.6: + version "0.10.6" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz#2deda57caef50f59c525aeb4964d3b2f867710c7" + integrity sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA== dependencies: - "@babel/helper-define-polyfill-provider" "^0.6.1" - core-js-compat "^3.36.1" + "@babel/helper-define-polyfill-provider" "^0.6.2" + core-js-compat "^3.38.0" babel-plugin-polyfill-regenerator@^0.6.1: version "0.6.2" @@ -3300,34 +3187,26 @@ babel-plugin-polyfill-regenerator@^0.6.1: dependencies: "@babel/helper-define-polyfill-provider" "^0.6.2" -"babel-plugin-styled-components@>= 1.12.0": - version "2.1.4" - resolved "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz#9a1f37c7f32ef927b4b008b529feb4a2c82b1092" - integrity sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-module-imports" "^7.22.5" - "@babel/plugin-syntax-jsx" "^7.22.5" - lodash "^4.17.21" - picomatch "^2.3.1" - babel-preset-current-node-syntax@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" - integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== + version "1.1.0" + resolved "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz#9a929eafece419612ef4ae4f60b1862ebad8ef30" + integrity sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw== dependencies: "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-bigint" "^7.8.3" - "@babel/plugin-syntax-class-properties" "^7.8.3" - "@babel/plugin-syntax-import-meta" "^7.8.3" + "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-syntax-import-attributes" "^7.24.7" + "@babel/plugin-syntax-import-meta" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-top-level-await" "^7.8.3" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-syntax-top-level-await" "^7.14.5" babel-preset-jest@^29.6.3: version "29.6.3" @@ -3620,14 +3499,14 @@ browserify@^17.0.0: vm-browserify "^1.0.0" xtend "^4.0.0" -"browserslist@^4.0.0", "browserslist@^4.21.10", "browserslist@^4.21.4", "browserslist@^4.23.0", "browserslist@^4.23.1": - version "4.23.2" - resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz#244fe803641f1c19c28c48c4b6ec9736eb3d32ed" - integrity sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA== +"browserslist@^4.0.0", "browserslist@^4.21.10", "browserslist@^4.21.4", "browserslist@^4.23.0", "browserslist@^4.23.1", "browserslist@^4.23.3": + version "4.23.3" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800" + integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA== dependencies: - caniuse-lite "^1.0.30001640" - electron-to-chromium "^1.4.820" - node-releases "^2.0.14" + caniuse-lite "^1.0.30001646" + electron-to-chromium "^1.5.4" + node-releases "^2.0.18" update-browserslist-db "^1.1.0" bser@2.1.1: @@ -3802,11 +3681,6 @@ camelcase@^5.3.1: resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -camelize@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3" - integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ== - caniuse-api@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" @@ -3817,10 +3691,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -"caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001599", "caniuse-lite@^1.0.30001640": - version "1.0.30001643" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz#9c004caef315de9452ab970c3da71085f8241dbd" - integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg== +"caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001646": + version "1.0.30001653" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz#b8af452f8f33b1c77f122780a4aecebea0caca56" + integrity sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw== "caw@^2.0.0", "caw@^2.0.1": version "2.0.1" @@ -3898,9 +3772,9 @@ ci-info@^3.2.0: safe-buffer "^5.0.1" cjs-module-lexer@^1.0.0: - version "1.3.1" - resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz#c485341ae8fd999ca4ee5af2d7a1c9ae01e0099c" - integrity sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q== + version "1.4.0" + resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.0.tgz#677de7ed7efff67cc40c9bf1897fea79d41b5215" + integrity sha512-N1NGmowPlGBLsOZLPvm48StN04V4YvQRL0i6b7ctrVY3epjP/ct7hFLOItz6pDIvRjwpfPxi52a2UWV2ziir8g== "classnames@*", "classnames@2.x", "classnames@^2.2.1", "classnames@^2.2.5", "classnames@^2.2.6", "classnames@^2.5.1": version "2.5.1" @@ -4131,12 +4005,12 @@ copy-webpack-plugin@^12.0.2: schema-utils "^4.2.0" serialize-javascript "^6.0.2" -"core-js-compat@^3.36.1", "core-js-compat@^3.37.1": - version "3.37.1" - resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz#c844310c7852f4bdf49b8d339730b97e17ff09ee" - integrity sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg== +"core-js-compat@^3.37.1", "core-js-compat@^3.38.0": + version "3.38.1" + resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz#2bc7a298746ca5a7bcb9c164bcb120f2ebc09a09" + integrity sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw== dependencies: - browserslist "^4.23.0" + browserslist "^4.23.3" core-js@3.37.0: version "3.37.0" @@ -4281,11 +4155,6 @@ crypto-browserify@^3.0.0: randombytes "^2.0.0" randomfill "^1.0.3" -css-color-keywords@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" - integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg== - css-declaration-sorter@^6.3.1: version "6.4.1" resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz#28beac7c20bad7f1775be3a7129d7eae409a3a71" @@ -4296,10 +4165,10 @@ css-declaration-sorter@^7.2.0: resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz#6dec1c9523bc4a643e088aab8f09e67a54961024" integrity sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow== -css-loader@^6.7.2: - version "6.11.0" - resolved "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz#33bae3bf6363d0a7c2cf9031c96c744ff54d85ba" - integrity sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g== +css-loader@^7.1.2: + version "7.1.2" + resolved "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz#64671541c6efe06b0e22e750503106bdd86880f8" + integrity sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA== dependencies: icss-utils "^5.1.0" postcss "^8.4.33" @@ -4344,15 +4213,6 @@ css-select@^5.1.0: domutils "^3.0.1" nth-check "^2.0.1" -css-to-react-native@^3.0.0: - version "3.2.0" - resolved "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz#cdd8099f71024e149e4f6fe17a7d46ecd55f1e32" - integrity sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ== - dependencies: - camelize "^1.0.0" - css-color-keywords "^1.0.0" - postcss-value-parser "^4.0.2" - "css-tree@^1.1.2", "css-tree@^1.1.3": version "1.1.3" resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" @@ -4996,15 +4856,15 @@ ejs@~3.1.8: dependencies: jake "^10.8.5" -electron-to-chromium@^1.4.820: - version "1.5.2" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz#6126ad229ce45e781ec54ca40db0504787f23d19" - integrity sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ== +electron-to-chromium@^1.5.4: + version "1.5.13" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6" + integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q== "elliptic@^6.5.3", "elliptic@^6.5.5": - version "6.5.6" - resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.5.6.tgz#ee5f7c3a00b98a2144ac84d67d01f04d438fa53e" - integrity sha512-mpzdtpeCLuS3BmE3pO3Cpp5bbjlOPY2Q0PgoF+Od1XZrHLYI28Xe3ossCmYCQt11FQKEYd9+PF8jymTvtWJSHQ== + version "6.5.7" + resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b" + integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q== dependencies: bn.js "^4.11.9" brorand "^1.1.0" @@ -5064,7 +4924,7 @@ engine.io-parser@~5.2.1: resolved "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz#00dc5b97b1f233a23c9398d0209504cf5f94d92f" integrity sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q== -enhanced-resolve@^5.17.0: +enhanced-resolve@^5.17.1: version "5.17.1" resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== @@ -5255,12 +5115,12 @@ escodegen@^2.0.0: esutils "^2.0.2" source-map "~0.6.1" -eslint-plugin-jest@^27.4.0: - version "27.9.0" - resolved "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.9.0.tgz#7c98a33605e1d8b8442ace092b60e9919730000b" - integrity sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug== +eslint-plugin-jest@^28.8.0: + version "28.8.0" + resolved "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.0.tgz#54f597b5a3295ad04ec946baa245ad02b9b2bca0" + integrity sha512-Tubj1hooFxCl52G4qQu0edzV/+EZzPUeN8p2NnW5uu4fbDs+Yo7+qDVDc4/oG3FbCqEBmu/OC3LSsyiU22oghw== dependencies: - "@typescript-eslint/utils" "^5.10.0" + "@typescript-eslint/utils" "^6.0.0 || ^7.0.0 || ^8.0.0" eslint-plugin-react-hooks@^4.3.0: version "4.6.2" @@ -5296,7 +5156,7 @@ eslint-rule-composer@^0.3.0: resolved "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9" integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg== -"eslint-scope@5.1.1", "eslint-scope@^5.1.1": +eslint-scope@5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -5327,16 +5187,16 @@ eslint-visitor-keys@^4.0.0: resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb" integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw== -eslint@^9.8.0: - version "9.8.0" - resolved "https://registry.npmjs.org/eslint/-/eslint-9.8.0.tgz#a4f4a090c8ea2d10864d89a6603e02ce9f649f0f" - integrity sha512-K8qnZ/QJzT2dLKdZJVX6W4XOwBzutMYmt0lqUS+JdXgd+HTYFlonFgkJ8s44d/zMPPCnOOk0kMWCApCPhiOy9A== +eslint@^9.9.0: + version "9.9.1" + resolved "https://registry.npmjs.org/eslint/-/eslint-9.9.1.tgz#147ac9305d56696fb84cf5bdecafd6517ddc77ec" + integrity sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.11.0" - "@eslint/config-array" "^0.17.1" + "@eslint/config-array" "^0.18.0" "@eslint/eslintrc" "^3.1.0" - "@eslint/js" "9.8.0" + "@eslint/js" "9.9.1" "@humanwhocodes/module-importer" "^1.0.1" "@humanwhocodes/retry" "^0.3.0" "@nodelib/fs.walk" "^1.2.8" @@ -5551,7 +5411,7 @@ ext-name@^5.0.0: resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -"fast-glob@^3.2.7", "fast-glob@^3.2.9", "fast-glob@^3.3.2": +"fast-glob@^3.2.7", "fast-glob@^3.3.2": version "3.3.2" resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== @@ -5764,9 +5624,9 @@ for-each@^0.3.3: is-callable "^1.1.3" foreground-child@^3.1.0: - version "3.2.1" - resolved "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz#767004ccf3a5b30df39bed90718bab43fe0a59f7" - integrity sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA== + version "3.3.0" + resolved "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77" + integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg== dependencies: cross-spawn "^7.0.0" signal-exit "^4.0.1" @@ -5829,7 +5689,7 @@ function-bind@^1.1.2: resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== -"function.prototype.name@^1.1.5", "function.prototype.name@^1.1.6": +function.prototype.name@^1.1.6: version "1.1.6" resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== @@ -6005,9 +5865,9 @@ globals@^14.0.0: integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ== globals@^15.8.0: - version "15.8.0" - resolved "https://registry.npmjs.org/globals/-/globals-15.8.0.tgz#e64bb47b619dd8cbf32b3c1a0a61714e33cbbb41" - integrity sha512-VZAJ4cewHTExBWDHR6yptdIBlx9YSSZuwojj9Nt5mBRXQzrKakDsVKQ1J63sklLvzAJm0X5+RpO4i3Y2hcOnFw== + version "15.9.0" + resolved "https://registry.npmjs.org/globals/-/globals-15.9.0.tgz#e9de01771091ffbc37db5714dab484f9f69ff399" + integrity sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA== globalthis@^1.0.3: version "1.0.4" @@ -6017,18 +5877,6 @@ globalthis@^1.0.3: define-properties "^1.2.1" gopd "^1.0.1" -globby@^11.1.0: - version "11.1.0" - resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" - integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.2.9" - ignore "^5.2.0" - merge2 "^1.4.1" - slash "^3.0.0" - "globby@^12.0.0", "globby@^12.0.2": version "12.2.0" resolved "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz#2ab8046b4fba4ff6eede835b29f678f90e3d3c22" @@ -6260,7 +6108,7 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -"hoist-non-react-statics@^3.0.0", "hoist-non-react-statics@^3.3.1", "hoist-non-react-statics@^3.3.2": +"hoist-non-react-statics@^3.3.1", "hoist-non-react-statics@^3.3.2": version "3.3.2" resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -6279,10 +6127,10 @@ hotkeys-js@^3.13.3: resolved "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.13.7.tgz#0188d8e2fca16a3f1d66541b48de0bb9df613726" integrity sha512-ygFIdTqqwG4fFP7kkiYlvayZppeIQX2aPpirsngkv1xM1lP0piDY5QEh68nQnIKvz64hfocxhBaD/uK3sSK1yQ== -html-dom-parser@5.0.9: - version "5.0.9" - resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-5.0.9.tgz#8c600e3407340c9a148cc8b3bf9bc390948cd9c1" - integrity sha512-QGeoFYwgQ582EDvrBx0+ejIz76/LuQcwwkmSR4ueKncjl2yWbciA45Kfz/LrHvWR3CgtKnxKFkr4Mpq2Sh1QNg== +html-dom-parser@5.0.10: + version "5.0.10" + resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-5.0.10.tgz#bf46b05c50f35c2fcadfc8e91566c54d3caf9bd7" + integrity sha512-GwArYL3V3V8yU/mLKoFF7HlLBv80BZ2Ey1BzfVNRpAci0cEKhFHI/Qh8o8oyt3qlAMLlK250wsxLdYX4viedvg== dependencies: domhandler "5.0.3" htmlparser2 "9.1.0" @@ -6300,14 +6148,14 @@ html-encoding-sniffer@^3.0.0: integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== html-react-parser@^5.0.6: - version "5.1.12" - resolved "https://registry.npmjs.org/html-react-parser/-/html-react-parser-5.1.12.tgz#6c537b5371be8ba4b81b8d0ede17d1bc3924efd8" - integrity sha512-OPv8fsIvxxv/+pLj9mYvyNu8PE5dPMowTRdd5VHpcoZpXlstp8eYCxQ5rzqAE5Tb75rhdiWUXnPltfb62zCVjg== + version "5.1.15" + resolved "https://registry.npmjs.org/html-react-parser/-/html-react-parser-5.1.15.tgz#f3121f31434ba5a84d06c8849e2e6fe0f64eed20" + integrity sha512-LRwSTseAZtdtzYbBaN0a+pJ48x4qmwPzQC5tvwAp9IvuNf7afxtTHLpCPYCsVjRKRUqhXvfjTaKJJrhctxkHJA== dependencies: domhandler "5.0.3" - html-dom-parser "5.0.9" + html-dom-parser "5.0.10" react-property "2.0.2" - style-to-js "1.1.12" + style-to-js "1.1.13" html-to-image@^1.11.11: version "1.11.11" @@ -6412,9 +6260,9 @@ humanize-ms@^1.2.1: integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== "ignore@^5.1.9", "ignore@^5.2.0", "ignore@^5.2.4", "ignore@^5.3.1": - version "5.3.1" - resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" - integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== + version "5.3.2" + resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" + integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== image-minimizer-webpack-plugin@^4.0.2: version "4.1.0" @@ -6654,9 +6502,9 @@ is-buffer@^2.0.5: integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== "is-core-module@^2.13.0", "is-core-module@^2.5.0": - version "2.15.0" - resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea" - integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA== + version "2.15.1" + resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" + integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== dependencies: hasown "^2.0.2" @@ -8040,9 +7888,9 @@ microbuffer@^1.0.0: integrity sha512-O/SUXauVN4x6RaEJFqSPcXNtLFL+QzJHKZlyDVYFwcDDRVca3Fa/37QXXC+4zAGGa4YhHrHxKXuuHvLDIQECtA== micromatch@^4.0.4: - version "4.0.7" - resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" - integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== + version "4.0.8" + resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" + integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== dependencies: braces "^3.0.3" picomatch "^2.3.1" @@ -8093,9 +7941,9 @@ mimic-response@^1.0.0: integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== mini-css-extract-plugin@^2.7.6: - version "2.9.0" - resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz#c73a1327ccf466f69026ac22a8e8fd707b78a235" - integrity sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA== + version "2.9.1" + resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.1.tgz#4d184f12ce90582e983ccef0f6f9db637b4be758" + integrity sha512-+Vyi+GCCOHnrJ2VPS+6aPoXN2k2jgUzDRhTFLjjTBn23qyXJXkjUWQgTL+mXpF5/A8ixLdCc6kWsoeOjKGejKQ== dependencies: schema-utils "^4.0.0" tapable "^2.2.1" @@ -8401,7 +8249,7 @@ node-int64@^0.4.0: resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== -node-releases@^2.0.14: +node-releases@^2.0.18: version "2.0.18" resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== @@ -9379,9 +9227,9 @@ postcss-reduce-transforms@^6.0.2: postcss-value-parser "^4.2.0" "postcss-selector-parser@^6.0.11", "postcss-selector-parser@^6.0.16", "postcss-selector-parser@^6.0.2", "postcss-selector-parser@^6.0.4", "postcss-selector-parser@^6.0.5", "postcss-selector-parser@^6.0.9": - version "6.1.1" - resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz#5be94b277b8955904476a2400260002ce6c56e38" - integrity sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg== + version "6.1.2" + resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de" + integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -9416,15 +9264,15 @@ postcss-unique-selectors@^6.0.4: dependencies: postcss-selector-parser "^6.0.16" -"postcss-value-parser@^4.0.2", "postcss-value-parser@^4.1.0", "postcss-value-parser@^4.2.0": +"postcss-value-parser@^4.1.0", "postcss-value-parser@^4.2.0": version "4.2.0" resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== "postcss@^8.4.24", "postcss@^8.4.31", "postcss@^8.4.33": - version "8.4.40" - resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz#eb81f2a4dd7668ed869a6db25999e02e9ad909d8" - integrity sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q== + version "8.4.41" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681" + integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ== dependencies: nanoid "^3.3.7" picocolors "^1.0.1" @@ -9574,9 +9422,9 @@ q@^1.1.2: integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== qs@^6.12.3: - version "6.12.3" - resolved "https://registry.npmjs.org/qs/-/qs-6.12.3.tgz#e43ce03c8521b9c7fd7f1f13e514e5ca37727754" - integrity sha512-AWJm14H1vVaO/iNZ4/hO+HyaTehuy9nRqVdkTqlJt0HWvBiBIEXFmb4C0DGeYo3Xes9rrEW+TxHsaigCbN5ICQ== + version "6.13.0" + resolved "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" + integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== dependencies: side-channel "^1.0.6" @@ -9909,10 +9757,10 @@ react-resize-detector@^11.0.1: dependencies: lodash "^4.17.21" -react-rnd@^10.3.5: - version "10.4.11" - resolved "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.11.tgz#d1c3086de4ab163e01b49f8feae5a14b3d58e3f7" - integrity sha512-XTfNGNcS0ad2vo3to7qNTB0BkFML9k1csIUI0Nlj44M6Uuh7yP/2h8WXiXcV3v3bxxVJck1C9K6FS1LrLH0E0Q== +react-rnd@^10.4.12: + version "10.4.12" + resolved "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.12.tgz#f3e0ae736e467c614f46f531f5f62e27aa14f352" + integrity sha512-EZ0ddi+R9JQVqk6jtPzvy11z5kjdw3aZbtiRmA9KP09UNx3LZT8WFrWO3QXbH7dHo1DKO3Rh8usCCwaJgu6Ahg== dependencies: re-resizable "6.9.17" react-draggable "4.4.6" @@ -10356,7 +10204,7 @@ semver-truncate@^1.1.2: resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -"semver@^7.3.4", "semver@^7.3.5", "semver@^7.3.7", "semver@^7.5.3", "semver@^7.5.4", "semver@^7.6.0": +"semver@^7.3.4", "semver@^7.3.5", "semver@^7.5.3", "semver@^7.5.4", "semver@^7.6.0": version "7.6.3" resolved "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== @@ -10665,9 +10513,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.18" - resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz#22aa922dcf2f2885a6494a261f2d8b75345d0326" - integrity sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ== + version "3.0.20" + resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz#e44ed19ed318dd1e5888f93325cee800f0f51b89" + integrity sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw== split.js@^1.5.10: version "1.6.5" @@ -10684,10 +10532,10 @@ sprintf-js@~1.0.2: resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== -sql-formatter@^15.1.2: - version "15.3.2" - resolved "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.3.2.tgz#696fb84c3ce6d368b0d16248a605aa0e7a41751e" - integrity sha512-pNxSMf5DtwhpZ8gUcOGCGZIWtCcyAUx9oLgAtlO4ag7DvlfnETL0BGqXaISc84pNrXvTWmt8Wal1FWKxdTsL3Q== +sql-formatter@^15.4.0: + version "15.4.1" + resolved "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.4.1.tgz#2e9078dbf30a0b76eb690865166cdc6617e6e7fd" + integrity sha512-lw/G/emIJ+tVspOtOFzfD2YFFMN3MFPxGnbWl1DlJLB+fsX7X7zMqSRM1SLSn2YuaRJ0lTe7AMknHDqmIW1Y8w== dependencies: argparse "^2.0.1" get-stdin "=8.0.0" @@ -10947,10 +10795,10 @@ style-loader@^3.3.2: resolved "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz#ca238a1ad4786520f7515a8539d5a63691d7bf67" integrity sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw== -style-to-js@1.1.12: - version "1.1.12" - resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.12.tgz#112dd054231e71643514013a4475d4649bb2b581" - integrity sha512-tv+/FkgNYHI2fvCoBMsqPHh5xovwiw+C3X0Gfnss/Syau0Nr3IqGOJ9XiOYXoPnToHVbllKFf5qCNFJGwFg5mg== +style-to-js@1.1.13: + version "1.1.13" + resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.13.tgz#8d17f2560a9cc9515b94834aaeb2305887d7ced5" + integrity sha512-+43kvxwjrW9n5gFR40Rv98A0/Mcjew7Lt+p5Nnw1KGR9SZf/ZaKqmMwl9Enj9EnYNcJ5VzuCjejC5KZzvH2lOA== dependencies: style-to-object "1.0.6" @@ -10961,22 +10809,6 @@ style-to-object@1.0.6: dependencies: inline-style-parser "0.2.3" -styled-components@^5.2.1: - version "5.3.11" - resolved "https://registry.npmjs.org/styled-components/-/styled-components-5.3.11.tgz#9fda7bf1108e39bf3f3e612fcc18170dedcd57a8" - integrity sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@babel/traverse" "^7.4.5" - "@emotion/is-prop-valid" "^1.1.0" - "@emotion/stylis" "^0.8.4" - "@emotion/unitless" "^0.7.4" - babel-plugin-styled-components ">= 1.12.0" - css-to-react-native "^3.0.0" - hoist-non-react-statics "^3.0.0" - shallowequal "^1.1.0" - supports-color "^5.5.0" - stylehacks@^5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9" @@ -10998,10 +10830,10 @@ stylis@4.2.0: resolved "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51" integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw== -stylis@^4.0.7: - version "4.3.2" - resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz#8f76b70777dd53eb669c6f58c997bf0a9972e444" - integrity sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg== +stylis@^4.3.4: + version "4.3.4" + resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.4.tgz#ca5c6c4a35c4784e4e93a2a24dc4e9fa075250a4" + integrity sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now== subarg@^1.0.0: version "1.0.0" @@ -11010,7 +10842,7 @@ subarg@^1.0.0: dependencies: minimist "^1.1.0" -"supports-color@^5.3.0", "supports-color@^5.5.0": +supports-color@^5.3.0: version "5.5.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -11176,9 +11008,9 @@ tempfile@^2.0.0: terser "^5.26.0" terser@^5.26.0: - version "5.31.3" - resolved "https://registry.npmjs.org/terser/-/terser-5.31.3.tgz#b24b7beb46062f4653f049eea4f0cd165d0f0c38" - integrity sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA== + version "5.31.6" + resolved "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz#c63858a0f0703988d0266a82fcbf2d7ba76422b1" + integrity sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -11298,22 +11130,10 @@ tslib@2.6.2: resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== -tslib@^1.8.1: - version "1.14.1" - resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - "tslib@^2.0.3", "tslib@^2.4.0": - version "2.6.3" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0" - integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== - -tsutils@^3.21.0: - version "3.21.0" - resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" - integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== - dependencies: - tslib "^1.8.1" + version "2.7.0" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01" + integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA== ttf2eot@^3.0.0: version "3.1.0" @@ -11423,14 +11243,14 @@ typedarray@^0.0.6: resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript-eslint@^7.15.0: - version "7.17.0" - resolved "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-7.17.0.tgz#cc5eddafd38b3c1fe8a52826469d5c78700b7aa7" - integrity sha512-spQxsQvPguduCUfyUvLItvKqK3l8KJ/kqs5Pb/URtzQ5AC53Z6us32St37rpmlt2uESG23lOFpV4UErrmy4dZQ== +typescript-eslint@^8.3.0: + version "8.3.0" + resolved "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.3.0.tgz#f4d9c5ba71f6bead03ec41ecb2bece1de511e49f" + integrity sha512-EvWjwWLwwKDIJuBjk2I6UkV8KEQcwZ0VM10nR1rIunRDIP67QJTZAHBXTX0HW/oI1H10YESF8yWie8fRQxjvFA== dependencies: - "@typescript-eslint/eslint-plugin" "7.17.0" - "@typescript-eslint/parser" "7.17.0" - "@typescript-eslint/utils" "7.17.0" + "@typescript-eslint/eslint-plugin" "8.3.0" + "@typescript-eslint/parser" "8.3.0" + "@typescript-eslint/utils" "8.3.0" typescript@^5.4.5: version "5.5.4" @@ -11438,9 +11258,9 @@ typescript@^5.4.5: integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q== uglify-js@^3.1.4: - version "3.19.1" - resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.1.tgz#2d5df6a0872c43da43187968308d7741d44b8056" - integrity sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A== + version "3.19.3" + resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz#82315e9bbc6f2b25888858acd1fff8441035b77f" + integrity sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ== umd@^3.0.0: version "3.0.3" @@ -11486,10 +11306,10 @@ underscore@^1.9.1: resolved "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz#970e33963af9a7dda228f17ebe8399e5fbe63a10" integrity sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g== -undici-types@~6.11.1: - version "6.11.1" - resolved "https://registry.npmjs.org/undici-types/-/undici-types-6.11.1.tgz#432ea6e8efd54a48569705a699e62d8f4981b197" - integrity sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ== +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" @@ -11631,12 +11451,7 @@ use-isomorphic-layout-effect@^1.1.2: resolved "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb" integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA== -use-sync-external-store@1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" - integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== - -use-sync-external-store@^1.2.0: +"use-sync-external-store@1.2.2", "use-sync-external-store@^1.2.0": version "1.2.2" resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9" integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw== @@ -11732,9 +11547,9 @@ walker@^1.0.8: makeerror "1.0.12" watchpack@^2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz#29308f2cac150fa8e4c92f90e0ec954a9fed7fff" - integrity sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg== + version "2.4.2" + resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da" + integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw== dependencies: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" @@ -11813,11 +11628,10 @@ webpack-sources@^3.2.3: integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== webpack@^5.88.2: - version "5.93.0" - resolved "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5" - integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA== + version "5.94.0" + resolved "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" + integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== dependencies: - "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" "@webassemblyjs/ast" "^1.12.1" "@webassemblyjs/wasm-edit" "^1.12.1" @@ -11826,7 +11640,7 @@ webpack@^5.88.2: acorn-import-attributes "^1.9.5" browserslist "^4.21.10" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.17.0" + enhanced-resolve "^5.17.1" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" @@ -11874,12 +11688,12 @@ which-boxed-primitive@^1.0.2: is-symbol "^1.0.3" which-builtin-type@^1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz#b1b8443707cc58b6e9bf98d32110ff0c2cbd029b" - integrity sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw== + version "1.1.4" + resolved "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz#592796260602fc3514a1b5ee7fa29319b72380c3" + integrity sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w== dependencies: - function.prototype.name "^1.1.5" - has-tostringtag "^1.0.0" + function.prototype.name "^1.1.6" + has-tostringtag "^1.0.2" is-async-function "^2.0.0" is-date-object "^1.0.5" is-finalizationregistry "^1.0.2" @@ -11888,10 +11702,10 @@ which-builtin-type@^1.1.3: is-weakref "^1.0.2" isarray "^2.0.5" which-boxed-primitive "^1.0.2" - which-collection "^1.0.1" - which-typed-array "^1.1.9" + which-collection "^1.0.2" + which-typed-array "^1.1.15" -which-collection@^1.0.1: +which-collection@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0" integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw== @@ -11901,7 +11715,7 @@ which-collection@^1.0.1: is-weakmap "^2.0.2" is-weakset "^2.0.3" -"which-typed-array@^1.1.14", "which-typed-array@^1.1.15", "which-typed-array@^1.1.2", "which-typed-array@^1.1.9": +"which-typed-array@^1.1.14", "which-typed-array@^1.1.15", "which-typed-array@^1.1.2": version "1.1.15" resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d" integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA== @@ -12103,12 +11917,12 @@ yocto-queue@^1.0.0: resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz#fef65ce3ac9f8a32ceac5a634f74e17e5b232110" integrity sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g== -zustand@^4.4.1: - version "4.5.4" - resolved "https://registry.npmjs.org/zustand/-/zustand-4.5.4.tgz#63abdd81edfb190bc61e0bbae045cc4d52158a05" - integrity sha512-/BPMyLKJPtFEvVL0E9E9BTUM63MNyhPGlvxk1XjrfWTUlV+BR8jufjsovHzrtR6YNcBEcL7cMHovL1n9xHawEg== +zustand@^4.5.4: + version "4.5.5" + resolved "https://registry.npmjs.org/zustand/-/zustand-4.5.5.tgz#f8c713041543715ec81a2adda0610e1dc82d4ad1" + integrity sha512-+0PALYNJNgK6hldkgDq2vLrw5f6g/jCInz52n9RTpropGgeAf/ioFUCdtsjCqu4gNhW9D01rUQBROoRjdzyn2Q== dependencies: - use-sync-external-store "1.2.0" + use-sync-external-store "1.2.2" "react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#4e10a5a327ff58198ac83c7b0c62549b20b78ae5": version "7.0.0-beta.44" diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index d4071186f9888..4e574e407e2e1 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EifER0wt2Nw7WrlVwc49tZHH/av4OkzTPYSzl9mVJI8="; nativeBuildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; postInstall = '' for shell in bash fish zsh; do @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion procs.{bash,fish} --zsh _procs ''; - buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv Libsystem ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv Libsystem ]; meta = with lib; { description = "Modern replacement for ps written in Rust"; diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 1362ca3e2ef8c..d5d95289d0c31 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,160 +1,160 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.130.0"; + version = "3.134.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.130.0-linux-x64.tar.gz"; - sha256 = "1rnm2p7c52xzlf527ywpywbss1j43xl7mb0dxyyal5wh3vx5251d"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.134.1-linux-x64.tar.gz"; + sha256 = "04f9pdfq4s0zyvmm84jkj4rrhvinjfcl7ndnwqxi343wk6mr55m1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-amd64.tar.gz"; - sha256 = "1dd5s4d07qlcikcc7m4yh41085diciq25md4g2m1n6wfy629sllv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.24.1-linux-amd64.tar.gz"; + sha256 = "0anmskvjprhs34zpvcwgmw73bha4lhp7606s7q306pjpqpp3d14w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-linux-amd64.tar.gz"; - sha256 = "0ra89zi6ka0d9szgd0i4vlzw5wzvg9da5pi1ns3bf7kwv0mrxdmc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.1-linux-amd64.tar.gz"; + sha256 = "0xhscn5nblmy3z4jnb3wrmg60cf68kx046vr2nicdvflf5bampf0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.0-linux-amd64.tar.gz"; - sha256 = "1mmsff6xmxhrd6ymbwzw2mirks3fczcdaw7hcn8nqx3n1vp62xsb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.1-linux-amd64.tar.gz"; + sha256 = "1pq2xl59ady3id356gxp08ml7jdlzk4hm0rlq6dk9cn7v9nvj973"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.7.1-linux-amd64.tar.gz"; - sha256 = "0pzl2d40lpr90vlr36nmsczdic91j74fm4x3517sdyzkhyb2zrmq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.0.1-linux-amd64.tar.gz"; + sha256 = "1p5h4ir4kj232789mwaycs04h1d2i4jmb5xpf74c7x5vjb5c7riw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.1-linux-amd64.tar.gz"; - sha256 = "0zmq1i31b7kyasw5za652j5kmfr7fqwzcjkgvpxz0yhkm33k2rcg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-linux-amd64.tar.gz"; + sha256 = "0qfkbwbkgh828hxgr64z8mkf6hbpqzwdfc2q6b1r718g647cm7nb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.50.1-linux-amd64.tar.gz"; - sha256 = "1v2imk3w74ayglys7pqs881wp01sbp749d4zaxa60kbxmjwx80nc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.52.0-linux-amd64.tar.gz"; + sha256 = "17ghj412xh4d80ih2lbl43xlaj97ia89jfkj2z6mxv1k5b4mmsc6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-amd64.tar.gz"; - sha256 = "0yzv3xyijma1sxvilf1bgqcc3d0hdcx6pfpzw2s0fix7pi25qszn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.4-linux-amd64.tar.gz"; + sha256 = "10ci5gj7abcp8rw6nkx1d3gj1f21j67h5g73ly5p3k83ki4ay3wm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-linux-amd64.tar.gz"; - sha256 = "02v61pqpsxj652937rm7fwdr0612cq157g8wxkah27cxyyyf6qzq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-linux-amd64.tar.gz"; + sha256 = "1m7pif65wv083zvfxdyc3bpq7dyv4whpqi9k9p8d9gb7zn93piz8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-linux-amd64.tar.gz"; - sha256 = "1l7qibcbak0zmrzfrldqrhkfdvmankb8yflv6ak17y8434dfcrfa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.0.0-linux-amd64.tar.gz"; + sha256 = "0rz7ksgn1z152kcsjlqapapv4ywy48vmqi31bnbgfkg9w4z92v75"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-linux-amd64.tar.gz"; - sha256 = "1lc2p0x5ar0vhp0klmp6ilfl1aa8zilg4jgkiqsycsqqaj4f0hk7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.39.1-linux-amd64.tar.gz"; + sha256 = "0p7xjp0skzl5fambbalgqdkkfgp1blki5pip1qfkaz2m8wcxxydh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-linux-amd64.tar.gz"; sha256 = "1b5iyp0rld41mpin4w297p6q17kb3ya9sv5rsfg9iqwpbsz5c0vf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.1-linux-amd64.tar.gz"; - sha256 = "14pmkyxlmqy7fpj305kp3khjs6r7zg12s0v9f1gl3gml9zfq5nhy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.33.2-linux-amd64.tar.gz"; + sha256 = "1h6wm96anv30ri0v1ffk556swh2zswgcrrsfdl3ggqmrgfv8qnfs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.0-linux-amd64.tar.gz"; - sha256 = "0v5cj9gf63s79crbzs0a32wr8w450z2pzlm3m4njgxnklw3l57r3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.32.0-linux-amd64.tar.gz"; + sha256 = "1kn7082ni26di624jpsnm99rhshg22x756795qlkl81frpmn40i1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-linux-amd64.tar.gz"; - sha256 = "1yszi5baiix59c0pbhs74s323v4my08dfcjsj3scdy98az65n5hm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.6-linux-amd64.tar.gz"; + sha256 = "1kf2nx4hdaq116581jkqq2dz2xc57jbmyhrr6n8wwk0xlk3csabd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.10.0-linux-amd64.tar.gz"; - sha256 = "1jxklrzfkig8b1snhr1jz341pqhp6q17bnhm3q3zvg0ql69sl7p8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.1-linux-amd64.tar.gz"; + sha256 = "0k4phk9p7w58lnl65d21r6182gw1pawz8zj21dycbsbyx68vbqfc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-linux-amd64.tar.gz"; - sha256 = "1knjxddn118zzcmn3srgq5a7qfxd49zdqg9ki4w6gg5qnpisdk0s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.3.1-linux-amd64.tar.gz"; + sha256 = "06wb029baly1rlyyyqlcanvwl1zji5vsid0zp2fl8jz48mp5dvyx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-linux-amd64.tar.gz"; - sha256 = "17mfi8q10dvajh6dwahd05yral1mc5x5m2khy77mrmbxq4ivi219"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-linux-amd64.tar.gz"; + sha256 = "1qn8x8k4gn5qr9h5r5a1pj2x9fvpn3ass9g4xdqcdfrvi8x1xn3v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.0-linux-amd64.tar.gz"; - sha256 = "10cyc1zxl70wfyq9j15804wh1sn95jr248p5n0vmlikfq9j1qwrw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.1-linux-amd64.tar.gz"; + sha256 = "0p2nfj8zzsqnyrwmn9w7xisr859mjx0fh6gkp7bf618k49f0wpsj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-linux-amd64.tar.gz"; - sha256 = "0biyj03nhbmq0fnlkx3v4w43cwk095sa80di1mhbszgz13zj4409"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.4-linux-amd64.tar.gz"; + sha256 = "0fyqax485v7p0wiwrlvw0dp1zhkhymga2va7hx8k1mx3gc3xj1md"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-linux-amd64.tar.gz"; - sha256 = "1zvspswy3lmjpwpw35xxpkssv28sapwcv52lxiam57vcr9rbyi5g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-linux-amd64.tar.gz"; + sha256 = "1c19ylgpigrcflaklyk5dd0qg2b5zpn0gn5nm9brxy5za2k60n3f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.25.0-linux-amd64.tar.gz"; - sha256 = "1hvknh3xsvnk19ihavi3b6pp33172bc60s1k0p11mr5v608xcgbi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.2-linux-amd64.tar.gz"; + sha256 = "0nfa610bh7nsbvjplkq6hm78srzrbm9xby9x38z8qxxvdncp9dqx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-linux-amd64.tar.gz"; - sha256 = "0jl1nnvnj647rk001gakwdc09a58jc6i9g3x7mp5b6ywg46gjvqy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-linux-amd64.tar.gz"; + sha256 = "0nchp2xi6kbrkym16688dszihln68hnj5v1ilw027d40swj4xdv5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.5-linux-amd64.tar.gz"; - sha256 = "1vl57mjz23krcp7801q5v2vb64daxpyqpas57y8hxvi5np7qnpk4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.6-linux-amd64.tar.gz"; + sha256 = "0p9lcq04nml7rcpd7kpciqcw2y1fb5igmq6k71mghz080y3d3s3y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.3-linux-amd64.tar.gz"; sha256 = "192m4j80xqhyn8ramp3sdczcagia6xvfv99wq5ffz6yh7vyv0l2g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-amd64.tar.gz"; - sha256 = "13s88q8ibd2sb0ly4z4mbj785jv0hclvh0prccsvkq8zbyg91vv1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.0-linux-amd64.tar.gz"; + sha256 = "1qrf7v0v2qzn3df1dh2v99kvszjj38c4ms8msv57pd0ksbkyy03x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.3-linux-amd64.tar.gz"; - sha256 = "0byfb2zjymwmgd52wfk1xhp1llw6b4hniwa4faf66fmpr2i157nd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.6-linux-amd64.tar.gz"; + sha256 = "126fwbm2zbq55c7jsb4xqgdq1r8v9giaqx2isj05vrb4pgljbwz4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-linux-amd64.tar.gz"; - sha256 = "1h2kql44fjq6vv2a3pvvnx78sil6jgwm792qmrvh7gqrad0dd050"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.59.0-linux-amd64.tar.gz"; + sha256 = "1v317rlj7gmcdb74zlnmz668qn4d1ivl7dx81gw0lmqba73i1pdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.89.0-linux-amd64.tar.gz"; - sha256 = "00vz0m84bpzqj0r50n0h5w896vhapf275rs8xd5kmmwfnaijgj4r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.94.0-linux-amd64.tar.gz"; + sha256 = "12livvv61dcj8ylkrff2mggc55hh7pc60raqzpx3bslr6x5h8ln9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.2-linux-amd64.tar.gz"; - sha256 = "0h9hb51h5fjsnf3lcyik77sb1mw070h7p4drnm6f8rjkg5jy1q7i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.4-linux-amd64.tar.gz"; + sha256 = "02l5xxzsdjwxacrylviavlr7myspz46b3wvyar24vdqjm572ccjw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-linux-amd64.tar.gz"; - sha256 = "03y02rcy2xarvb4v33wxqf2qcy71amc9f6j6h406c8w8dnlaa9c3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.1-linux-amd64.tar.gz"; + sha256 = "1i1g4sacapzq2mr9nivydjyagk03g6k42khsrm2mzziw91mwmjbm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-linux-amd64.tar.gz"; - sha256 = "0rx05a9mdlv9yfsf6pi0ccdv7zfp7kgrj5zhfjagbk8x04cnygrz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.7-linux-amd64.tar.gz"; + sha256 = "0yyarc6nnsy8mr5yvz1gfyhhcnhpd4mmqpzai8zrfs12hsl429s2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-linux-amd64.tar.gz"; sha256 = "0dmx29ldms7mwhi4ka9qnz53qkis29diyz4g06hbnkc6j1bdc7jn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.1-linux-amd64.tar.gz"; - sha256 = "11g44ngbz4yar22flz6l1qxsjrjh1ks0fihln0g2b2da9n24v251"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.2-linux-amd64.tar.gz"; + sha256 = "07izmvi0z326vbjc7nnq8q4imxz3ljdaanmbxk8imdhg6ikfbfxd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.3-linux-amd64.tar.gz"; - sha256 = "1vz95rml45mbmrma6iaga9gfnnfixkyxkjsrp28l0nz9bqvknkkl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.2-linux-amd64.tar.gz"; + sha256 = "1dknp93vk8am0ghhpsa9pjymd6vkysnq3lfkcwzdq3i7n52lf36c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-linux-amd64.tar.gz"; - sha256 = "1ng6z1bl5z362p4sc9mn1skrz40d05csbch7dpd2cqhi0n5kkkf8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.4-linux-amd64.tar.gz"; + sha256 = "0qz3vzgc9g4lwb7c0sdm075lcwjahqz6indnnma3ljbvpq3r92bq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; @@ -163,156 +163,156 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.130.0-darwin-x64.tar.gz"; - sha256 = "1lm3xk68fpa420bj10jhp1nim5mnd263pqprchaz1racc0f2pq72"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.134.1-darwin-x64.tar.gz"; + sha256 = "0ndnvksjh8apnhsmwjjhipmkrpv05l1xh8sbddnf806bv05x1w49"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-amd64.tar.gz"; - sha256 = "0338m5b1c2lffg6xx6zv1dnawwyq3vqvgfmm43c2pklrwwka89v6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.24.1-darwin-amd64.tar.gz"; + sha256 = "0ifcyrs1biz66m72gnyd1z1va1z88wyjjbcqi5ag5v1vakwsqblp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-darwin-amd64.tar.gz"; - sha256 = "1d1famsg3pg69300vl5rifjbcvf5linajgwn5hi3wiwrszk2fcg7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.1-darwin-amd64.tar.gz"; + sha256 = "0w86imx8sv53r74bgi5fjjdr6dj30jf0sdl17jxakch8z09yrnai"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.0-darwin-amd64.tar.gz"; - sha256 = "0w8bhizga9fwvrl06yn1lp1vjwbscm65pr9md63vx0cabq9niz8g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.1-darwin-amd64.tar.gz"; + sha256 = "10xngdq0rcmpfl4mfkarvf14fiba43pb7fkdcs13mijqym4gay90"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.7.1-darwin-amd64.tar.gz"; - sha256 = "1fks67b7dc2qmxjiyai9sg8iryw27yn1ixs5kwjhk1ra077x52h0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.0.1-darwin-amd64.tar.gz"; + sha256 = "1wjgw6gk3kk4cpwm2lbp2pkss9qydqbh8i4p5mbbj228sj8aqr32"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.1-darwin-amd64.tar.gz"; - sha256 = "02crpv9wdx4dim14lz1n8wqp9yzf8im8sfj85ynydjd8nv076a6s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-darwin-amd64.tar.gz"; + sha256 = "1hqcr1yhlc8m99w8z0i3mr3wnvnldkbwni4v5s1r11blpzqrwa0p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.50.1-darwin-amd64.tar.gz"; - sha256 = "0x0slash3mmawjsjf9c33m85w27g1991a003k0zmns633n53ycwp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.52.0-darwin-amd64.tar.gz"; + sha256 = "1m52yb52cgz10vww4cfwqs6db2jy4i9zmfc1b1pq64bnlr1y8a5j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-amd64.tar.gz"; - sha256 = "16vkx1cnfzwyzsk7f9f794p6mg1ny8g5qxiy0825gd0prf8dzdm5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.4-darwin-amd64.tar.gz"; + sha256 = "13sii3q13rm56rp1bgpfc4w852h5zncx0cbs9j9hpb2ihayp28kf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "1xranra0rkcnvahna4jrb091jy23sgk9ib92dbzl2gw26yj6x9gx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "0zib88z73ha81isxajkwjbigl2f51dj1d7zwvk2ic9qwvrimvb2m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-darwin-amd64.tar.gz"; - sha256 = "02czk2wwf03sswlqj4hrj83i2i53h4nclqrb3nlgzjgaal82ijv9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.0.0-darwin-amd64.tar.gz"; + sha256 = "19sp73a7kfa89y37zf31m6by6qi8jh7zbrvv3b49nrhs38yxy02z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-darwin-amd64.tar.gz"; - sha256 = "0iw3gf7kwpi5lckngns2ra1vyd4n05r756s18b01zbcppw8fq2mw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.39.1-darwin-amd64.tar.gz"; + sha256 = "1ncrn3vl65g42rnx9li8xa6mn05jzzs10k6nf6va79padcpxghpc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-darwin-amd64.tar.gz"; sha256 = "1bgq98jiaqhvgbywvydpkif154k6rlzk0sqn55bj0ng9f04vz2ka"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.1-darwin-amd64.tar.gz"; - sha256 = "1ps5439lxrm1jx4hancdnxks21d0yrkzj3g6y9i20z0pw1ssjpzp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.33.2-darwin-amd64.tar.gz"; + sha256 = "0r8a8wfqrc9yx880lp23hx21g7ndkzhdw736k8lszl24ax4fwmk6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.0-darwin-amd64.tar.gz"; - sha256 = "049l8287a9rmrr2ypywycnc36g8jhkx37swqkklw1qp1az4cl2k8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.32.0-darwin-amd64.tar.gz"; + sha256 = "0irvmlj7xl5ydf01f1k3b6aiankj4pf0aq1mq0qkvsnr3lg7fbfz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-darwin-amd64.tar.gz"; - sha256 = "0w01z3kq1fm8nn48m3vx08ivsdqv991r8g22jd0gs2d70rqx2xms"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.6-darwin-amd64.tar.gz"; + sha256 = "109lm7b1q6m0j4fkckph6nz33xl2sv7vz1z2vzzvm70aallzw5ds"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.10.0-darwin-amd64.tar.gz"; - sha256 = "18l2ppzkypfrghmj2y2jypp0wkry5myp5vmlr3ckfwbsd81z4w3g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.1-darwin-amd64.tar.gz"; + sha256 = "0wf6vwa9dj7k18p3rmfmxw07vag5jqf5d9fdb467ijnvha463lan"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-darwin-amd64.tar.gz"; - sha256 = "1gf871rl8kzxmfmmcnm6rzjx03gcv0w208jd80v8b5ic9k0wrxq9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.3.1-darwin-amd64.tar.gz"; + sha256 = "1nqpqgqy5anmzmwkpvys14prxc7fw5gz9cljpacd3mvpjjj2hqy6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-darwin-amd64.tar.gz"; - sha256 = "03bi0qigh3rxw1cd2lyp8gp865vrxif1w85nc46sjprsxk8a1dv4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-darwin-amd64.tar.gz"; + sha256 = "162y9zyjwqzhh9ahph8vn9zmca8xc123hrybmhlhn6srj5sqjldh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.0-darwin-amd64.tar.gz"; - sha256 = "0dnfmprrhlqr5bapw7a09yd1c0npnsdmfy5v2aahm5pjmmj0labc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.1-darwin-amd64.tar.gz"; + sha256 = "0ig0l2jfl5n6afsxni9yh8dy3m5rnafckhgfcpk054iw1kfz5qbm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-darwin-amd64.tar.gz"; - sha256 = "0pw9qawf3wrndzrz0i93al09rygr23b6gg53njq3az74gw4vjaw3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.4-darwin-amd64.tar.gz"; + sha256 = "0i5shs8mc7rynwvix4dcs8ks94jkj6ir2kwhzkb8g3l3gjf6kk7n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-darwin-amd64.tar.gz"; - sha256 = "170fh5nyjxc3ayk0yfpv0ypck65rmdgy8p4p90v2i7mq7b6fs53z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-darwin-amd64.tar.gz"; + sha256 = "0hjmvd26a0fpsbzkyhafmj92jjr26lz1yr93gn2idhnzn9vg2d95"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.25.0-darwin-amd64.tar.gz"; - sha256 = "14qd7r56q668w6qdb86cav2b56hc4vkg3sk7gc8av6zcg3wy7d8f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.2-darwin-amd64.tar.gz"; + sha256 = "05r75h6gq9l6kdk2zs7d2yb5rysklrdyj6f112g8mm6zp0sy3vc3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-darwin-amd64.tar.gz"; - sha256 = "1v5kblswsaqcj8d7i15nqqsrmcdv4kgg9l7v23s1ggipk4bwjzjg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-darwin-amd64.tar.gz"; + sha256 = "0w956b6hlacsnpi30frnxj5a389znj1bkryagv2mcmc0ci8zpy0m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.5-darwin-amd64.tar.gz"; - sha256 = "1a7gd4vbkvbmk2870xc2dgkq6dd4bvcmdcrkny51m2bcns94b2xl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.6-darwin-amd64.tar.gz"; + sha256 = "0d4n0gg9qc5f4vpid3za3mzp8yd8saz8akjlli992cql278w10jl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.3-darwin-amd64.tar.gz"; sha256 = "1x5msm5ssslfpss1gvi56hmjc17hfnkvzmk5c1lhzzk1w94l30vj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-amd64.tar.gz"; - sha256 = "09bdp7khxcmary0jiis921hdrakdz1ywzmz9byn4hfx0r6iajbpl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.0-darwin-amd64.tar.gz"; + sha256 = "0kv59rg37bvffgpc2mabi0p3rj6w7ihgzsxlplls1hx9x955kip8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.3-darwin-amd64.tar.gz"; - sha256 = "0xfqi33x1crkvqdl3iqq1i7vky2s3v36fyb1adrn6067mbd7dgxj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.6-darwin-amd64.tar.gz"; + sha256 = "1i9ybfvd7k4v5klip2wxm1yh2whxpp39i789zxp0g3wk61c16mxq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-darwin-amd64.tar.gz"; - sha256 = "01g19rm8272n6yzm7a1dyj2xr6f6xvgi0d962aw66sjhq4jc0s1h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.59.0-darwin-amd64.tar.gz"; + sha256 = "0azl4v8lrj62855lzjf9js7hgvirwsy9821vabwdfmd9pzl3x5bn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.89.0-darwin-amd64.tar.gz"; - sha256 = "07sgpj1aa6sfnsglfgh92hg5ai7mx9s6vhls2xsxxmqi0kyklx7c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.94.0-darwin-amd64.tar.gz"; + sha256 = "07xcvfp02q3l0snf1cdx1a6r2jbqfa0c5nv9pwmq8vk9fsnjdh54"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.2-darwin-amd64.tar.gz"; - sha256 = "0di85gf7rjg7z1rckqp6ff5jsrc1ng1sihwkpgiv2w9wxhxrh333"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.4-darwin-amd64.tar.gz"; + sha256 = "1yyyrkqy492ny1g7r588lwlj2v59ry0l0gbr3pwa465a3achx06s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-darwin-amd64.tar.gz"; - sha256 = "0sr9a8zgfvhyr9993pmfddiw92c2m6v5wiafpd0p5hfzf99n5l8c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.1-darwin-amd64.tar.gz"; + sha256 = "19wla9irh7c9lfzfh97i15nz0p5m4fvr8cgzaz4q5rh39s6991kw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-darwin-amd64.tar.gz"; - sha256 = "0zqc8iwzgg5aw03sbgcmpi3s0dffya7c8qx2ncxjvq1hcdhzsyj7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.7-darwin-amd64.tar.gz"; + sha256 = "1yqmlpb9xmbagzbm9xqzskppkprvpq1ff64kl1y3mn85iizqwkgl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-darwin-amd64.tar.gz"; sha256 = "00l1ybf0a2bjkvd10db9ilyxq0zpv55r3wdy7s9dklq2bagmqzjz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.1-darwin-amd64.tar.gz"; - sha256 = "1g164xrj9nkdjw9pw08y24vzhg25f8h5702rfjsk0s2z011g86p7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.2-darwin-amd64.tar.gz"; + sha256 = "1ps4dywj60k5y8cri6g2vgrssaipmm9z8hp3mi9qnifr9vbwgd30"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.3-darwin-amd64.tar.gz"; - sha256 = "1i2sb6nrglx1ixpg4l34zvblvs2sjzxsfzwb19d0v81lvadii1ck"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.2-darwin-amd64.tar.gz"; + sha256 = "0gnv7qqirx2h8090pk3b50i801aivwrb767aj45zvqprkw1cb7ni"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-darwin-amd64.tar.gz"; - sha256 = "0cxp9vabn3b5b50j46qx1m246k2w7f3cknkh8x308sbfg9lkgv98"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.4-darwin-amd64.tar.gz"; + sha256 = "0h1ay2zpq8yll6w1myk3pjg2vvkhscsiqsjh1gwq2vp3xvd3m9j8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; @@ -321,156 +321,156 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.130.0-linux-arm64.tar.gz"; - sha256 = "05zhw333cmk5hqfk6q28ny9qc5jqyi5nxqfrhl1bd7vhnflnc7df"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.134.1-linux-arm64.tar.gz"; + sha256 = "0365c5gy6kwpn9620mcfjp7ffza3b9d0mzgkx36par0gsf107kcn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-arm64.tar.gz"; - sha256 = "1hzxmw420rzlka6wvr9b7gljyxdngbff4bcpdsaj6672isl2zy5v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.24.1-linux-arm64.tar.gz"; + sha256 = "0q3q6d7is28vhgmvq8gwmq8151alazhp5rd1q9pn6j3sqa478mnc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-linux-arm64.tar.gz"; - sha256 = "0zpcz79ca84lhccg2ivr442hr2gfmx7826rmw0ppnyi5cna1wvkr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.1-linux-arm64.tar.gz"; + sha256 = "1cd1gkfn8sfdpzlax1hx3kqq65nyiyjl8rbkillr82ldz46rqbgr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.0-linux-arm64.tar.gz"; - sha256 = "1s5240phmjcn2p4li5b45ngf3vh4fkdb3qj3357bys9pwxiv1hlj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.1-linux-arm64.tar.gz"; + sha256 = "0xsyvl8x6qi21g71ys2d71fnhkmy8yxix12fvb21kk03b412rhcf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.7.1-linux-arm64.tar.gz"; - sha256 = "01wmhkar9a8m8p16plz0cnb8m9fqb1kp1sjx2j655mmgg9y1v4rw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.0.1-linux-arm64.tar.gz"; + sha256 = "09k0iv55vdzgmgxwi8h4aipc9l6y15mc2zbhj8rh7p5f86574gmc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.1-linux-arm64.tar.gz"; - sha256 = "19f2602l99ilvmfzp8vv1crq6i7zc0fjm83mm0wid8dbgqv0fsf5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-linux-arm64.tar.gz"; + sha256 = "0h7ngd0zblvgf22m563p7f2y3kpqlvn5kqvb6psz3ixa8k4klmz7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.50.1-linux-arm64.tar.gz"; - sha256 = "0wch7d6zh7lsxpdc0aynqi5rj0bf41xv3dlbi3sj0p3ld24b5vgs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.52.0-linux-arm64.tar.gz"; + sha256 = "07qkkic0p6na4phg69sd3n919x4s5y35i0j15r93fww5r5y25ic2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-arm64.tar.gz"; - sha256 = "0p16833m7igpz7b6p05clcf6qk5jj10iqrdm8wkdj7zv9q1v60hk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.4-linux-arm64.tar.gz"; + sha256 = "0ry0jqhisgg5cqyl3051fd32zm0dnpjhkbnyizfkb01m1clh185q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-linux-arm64.tar.gz"; - sha256 = "03rvhz2zbjdldlp3c1335cbp2b8c3y3p88czwsfy6dsd9hry8fsa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-linux-arm64.tar.gz"; + sha256 = "08hd9b9vbbcx15bpb7vlrsjkw9ak7sjarqlxv4sx1fzys682nwra"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-linux-arm64.tar.gz"; - sha256 = "0ciadynvqc0pkmy9w7zj65zbc7w6rbsnz5b6iaszlyqp9rzwahg2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.0.0-linux-arm64.tar.gz"; + sha256 = "0wkyy8zm38sh4mybyix4ncwn1qbv03szgc4iqw17qfc4xmi867bz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-linux-arm64.tar.gz"; - sha256 = "1wmi0zwrsvphk82h7wqn0jvlsk685nl3xf48crara716xkhlr6cp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.39.1-linux-arm64.tar.gz"; + sha256 = "1gcz8kpswkby3myhrgpf67gkir6k8wj91g22val601hjjji6szzj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-linux-arm64.tar.gz"; sha256 = "0j53qafafq8s4rxds8anrsyylyjx6gd3jhrz16zqs4hcxwiimcfp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.1-linux-arm64.tar.gz"; - sha256 = "0b9mvqzd9zyz11ih3f1vlm96ijf0ij91y15qgsljplyi67kjsn2a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.33.2-linux-arm64.tar.gz"; + sha256 = "0g9cx04jhv7knjhpvgmc5ynf4khkg3v6w2gqhpyd0kvg4m7acxk0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.0-linux-arm64.tar.gz"; - sha256 = "10am0w1q60whmrzrm3hmyxgmg4i1b6m45syy3qhvr8xx0af3p9wi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.32.0-linux-arm64.tar.gz"; + sha256 = "0gj68p1rxxp8bqz7s03dpxiw4mwnbm5v6zlnsmm395wxd98fin9l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-linux-arm64.tar.gz"; - sha256 = "0x2nwvi1b13sj8n32ab7vw56ksa6n4bix11zz1b5cz4l0l9v00wf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.6-linux-arm64.tar.gz"; + sha256 = "02p2mky012wizmbn1xzaq6ca3bqj7nslydn7shyhygr4lx72zffm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.10.0-linux-arm64.tar.gz"; - sha256 = "0fx4rh8s8fdxllnk9i8yhwg8winh48ggw45px7jjxwnpd8g537fa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.1-linux-arm64.tar.gz"; + sha256 = "0gafajkj6zskxghjsbskyqlnyy70y7z22vkihn00h7lh0i71q97g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-linux-arm64.tar.gz"; - sha256 = "0rcj1lc5d65m36q712a4ic87443cpb5fvk04wqcnmicybgrfyhnl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.3.1-linux-arm64.tar.gz"; + sha256 = "0d91iasxrq525x2v7kk2lr0dhlh6564sfz7jihh82isxslfp4qry"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-linux-arm64.tar.gz"; - sha256 = "1n8ndwfb1ckarjd2wqgyyx7xxklxwglrvw473c4w8vpr2dmsrsyb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-linux-arm64.tar.gz"; + sha256 = "14jsk2s02idmfi8m832l62gx34g466zvw78z3g9pabnn4igr9ixz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.0-linux-arm64.tar.gz"; - sha256 = "06fs1jvyrqb7jbgc0b6vaqvbfc1s63py0llr46kvk6ynlb8m1apm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.1-linux-arm64.tar.gz"; + sha256 = "03x6lb7dbwjz6a79f13br8mxl7wk2n6p7qafm4plmy9wdfxi0pz2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-linux-arm64.tar.gz"; - sha256 = "1m18aypypjsyr18igj2kmzh1dw86hxph32agk7k0zjfj921anqmx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.4-linux-arm64.tar.gz"; + sha256 = "1ipnjv4nczfshndn0agayllgsavlhykq7ivvs6pq6mawaxz855mr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-linux-arm64.tar.gz"; - sha256 = "07kv3nqbfdah4i82pb8q83swr726q0bkx8wr6wwy168nff6zs98l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-linux-arm64.tar.gz"; + sha256 = "04vxicmfwi72irkl5rp3jvj4qpxxz49z5fhgnfirhj5kksb6cggz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.25.0-linux-arm64.tar.gz"; - sha256 = "05zy4chm6fs7h7szi23k8bi4ki4x0nai3zhfkxjpcm6b63dvvwgl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.2-linux-arm64.tar.gz"; + sha256 = "1gvn3ycbcddr17pyncdwi01y8cihxrdq83nfwhf1g1z7gmzsyhia"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-linux-arm64.tar.gz"; - sha256 = "11a8sm8z9zih5i4kcw5mvh18qc3x4rzln1nyhgknymymyqc4wqyp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-linux-arm64.tar.gz"; + sha256 = "1x3ayikdv1sdm72bmxhg55r4xbwmpjjhim30ajqid9fhq2c7zl1j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.5-linux-arm64.tar.gz"; - sha256 = "0krvvhm842lkxa14xfpkk2b1namgxnk3y6n5lcvhsnswga10r2xq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.6-linux-arm64.tar.gz"; + sha256 = "0g7fqm5z6msf7c0qh60f137qq7i1s103b64lbvjn06qms2xkd6x3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.3-linux-arm64.tar.gz"; sha256 = "0xyypg6rf1q9mb4brsplhaj4aj3fsrwsqli45662syhd7skmzwrm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-arm64.tar.gz"; - sha256 = "1gmcqk0ddfa5zfmhqv32vl1x5shmr80pik8da2g96y3mvfjbicpp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.0-linux-arm64.tar.gz"; + sha256 = "1k8qylpilv579gdzv6m463v7i419npn2jca1w6lrjk234vlvz0c1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.3-linux-arm64.tar.gz"; - sha256 = "064x91jvbqj142rkyphvwwds71i347nifv5akak35lf0ha4v57hw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.6-linux-arm64.tar.gz"; + sha256 = "0gpsb70pc7whkz94fiqj1fs5fg8kp9bcscra6jr7hcs3i1xk0zav"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-linux-arm64.tar.gz"; - sha256 = "0ainz86d5bcslk4yyyw6qsqnjhw2myirlkb22l0ldfpg85j4gbnm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.59.0-linux-arm64.tar.gz"; + sha256 = "033jmnkp92bid7jiwy1jzn6l18qg5lncmsrpjdnwwxlqb2mr7ml6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.89.0-linux-arm64.tar.gz"; - sha256 = "1libjf55fr78zb3c7krkp2azvnrxznml4chss7lhmgjl6fhbla4y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.94.0-linux-arm64.tar.gz"; + sha256 = "04f0ndwchrznq0a9vw7jvll46a69mkk2p9snlqlqsl29n89awdfm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.2-linux-arm64.tar.gz"; - sha256 = "19mrlxyl63m9c7albhszd9ikklm29k8s465cp0bzkrwawy6nn3yy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.4-linux-arm64.tar.gz"; + sha256 = "0lsbqgi5v4wpd0h9d73x9fx2xyrllvm1gfam3ks17pf2w1lkdd15"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-linux-arm64.tar.gz"; - sha256 = "08f5yqxf0vgidcmwrzq8scdbd2h4wdz226l87h8rxpzssj56lpls"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.1-linux-arm64.tar.gz"; + sha256 = "1v9bw8zxlzg6zsqncbl0kl4xqph41940s61lp1fnsksa9jylbs3d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-linux-arm64.tar.gz"; - sha256 = "1868473rk41dhl2gxabg6bin8m9c1lzs52wmcbpjrn91wb8pyz7v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.7-linux-arm64.tar.gz"; + sha256 = "05h9m466k0kqrdc6s83jyif9f9ihmpxd4fpk3z07y2lpk1qzzsz1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-linux-arm64.tar.gz"; sha256 = "16j5vimwjksnjwfmgf8nkmja5g8pqi9hsw0mr8xndl61hsrawirn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.1-linux-arm64.tar.gz"; - sha256 = "0jkjbsdmsc50jwv9rr40s0hlhwyhljwz95s5ll28xmmk413jkpfr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.2-linux-arm64.tar.gz"; + sha256 = "11rcd6whkn8d21h1y37h15ih4wpdjmbyp2kf8x4150wq8s7cxgrc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.3-linux-arm64.tar.gz"; - sha256 = "19ca2rcf3xmjsrii846lvgkhclgqk5mckwm6agvmfyl8qzlaqxyc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.2-linux-arm64.tar.gz"; + sha256 = "03kbh0807pmwkiz558sw704gv2grba51vdjy3i8wpn6viani9n7r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-linux-arm64.tar.gz"; - sha256 = "1hfyy6fm2vr10qrbawr3c7jb4fd1k3a0y55iff4f2dkpm23gsg9s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.4-linux-arm64.tar.gz"; + sha256 = "0nj8k7x0kbsqd5mc83wsb3q0b0v91zsakpr49h6p7cjjwkcxmchi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; @@ -479,156 +479,156 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.130.0-darwin-arm64.tar.gz"; - sha256 = "11afqpra94wcpj86ndk92m24s8z71bn4iwki82zmhwdc1im61h9w"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.134.1-darwin-arm64.tar.gz"; + sha256 = "14grilay8a4l0qg3shqx7r85r4q7az9qmz4vh2ylfmbw5hfk3kkp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-arm64.tar.gz"; - sha256 = "1jms955rhkw8babbbdkniic3qqc1g7jsddp322c5di2x4863qs2x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.24.1-darwin-arm64.tar.gz"; + sha256 = "1gn54pa6vvgdgf2r7spv1fnwlji58j4z680r5p4c2cq70z30nx7r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-darwin-arm64.tar.gz"; - sha256 = "12954vrf9fjjynrzgj8qm34bl258v4fdvvzyi0m8wp92rsp4icjq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.1-darwin-arm64.tar.gz"; + sha256 = "1ynl9my3hv04b10sqsjd97hg2mr1p05f8p6ibqh278x40r4arv76"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.0-darwin-arm64.tar.gz"; - sha256 = "042k66xnzgljy0kbjcrg71a61kgfy6cyh3x6b3llsmih17036fy4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.1-darwin-arm64.tar.gz"; + sha256 = "108qc3nm58sp43b39xzg1nz6vglpcyyjvqxy489pj42grk0w1lw4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.7.1-darwin-arm64.tar.gz"; - sha256 = "1y3ama1495zmnx3nyb0c8f9h59z9kcjkwm90wcxggvxl6bjgx9ld"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.0.1-darwin-arm64.tar.gz"; + sha256 = "0i4hncg6hq6gj00h54zwjn4gz5yi5c9nykva68p4gjsiwjsyf8pz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.1-darwin-arm64.tar.gz"; - sha256 = "151720nbxn6rrbvm1zawxc5xmlfadqgck2cmjgmj6z6qgd8zm6dv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-darwin-arm64.tar.gz"; + sha256 = "1d6gpymsa5qjn03510pz61g774qh53v914hg2dm5kqrjzgb1mnvh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.50.1-darwin-arm64.tar.gz"; - sha256 = "1rvx92x8d5qgwp5bvn03j2s424bd4yhhsivl1nbd5sd7wgzmfp3x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.52.0-darwin-arm64.tar.gz"; + sha256 = "13d33lvlhka2900acq7aksqnyvcyfhcb9cazj4dllrs71kj1smx3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-arm64.tar.gz"; - sha256 = "13r7yzgj4lbsvsw9y1fxc5n6dhral0763ny8mahxhj3cl6mmxvi7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.4-darwin-arm64.tar.gz"; + sha256 = "1zbvcfplwrbxr0jmwrl8sqz31q5j05x5ss6v2j04zzjb3qmj0b94"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-darwin-arm64.tar.gz"; - sha256 = "04wibkfpq76qhyy8kf0y89qkssapwgmkv56bspdxpydlnnwvn714"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-darwin-arm64.tar.gz"; + sha256 = "1f9zy9rl8vmnc40p6cvcz3d5wrf52y5a798ljp87kmjmra0mglg3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-darwin-arm64.tar.gz"; - sha256 = "1vs8xhy7iqfadfi2397jwfnz099pqyz5js4g4mx7kw1v47bsbvdq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.0.0-darwin-arm64.tar.gz"; + sha256 = "0fyzahxqgzmb9v0qvikdak38qhwsbzmv1mrrvd8s611a2f2xw2zp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-darwin-arm64.tar.gz"; - sha256 = "08hhsjw93g5fyivlykmrzg4sghrranprzl17p1wn8rfiwfvk3d1x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.39.1-darwin-arm64.tar.gz"; + sha256 = "053gd0y0qwpsimkiik817bgjvyml6ms1qf1zxvvr4xpavf8dfzar"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-darwin-arm64.tar.gz"; sha256 = "17f53cknsyqm5r9glxmwc396y8bbl1khvg9px5ixr43gfgq4vm91"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.1-darwin-arm64.tar.gz"; - sha256 = "0jwsaxfgsqk9hf35ciz1pr3f1n3s8i7k20yr0rry9hv1a73bpavi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.33.2-darwin-arm64.tar.gz"; + sha256 = "1zh0xjsi5f4p9nfbxrxi6f1gpnprlg1miwa9hxjxkclsq83fql5j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.0-darwin-arm64.tar.gz"; - sha256 = "1r9pnxwv0dp7ahw1gk7c89j9wqcfp0rpam3qwxq4x3xc5x1b8cg9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.32.0-darwin-arm64.tar.gz"; + sha256 = "1vgx0myp2h42isqiq5aa1vca37y8cyx55sai9s8i4i6i8cjqqx72"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-darwin-arm64.tar.gz"; - sha256 = "1zzb1v9fq6x23pc7ar1hna7hqnaqghss0rfx4viyhhah8659k3va"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.6-darwin-arm64.tar.gz"; + sha256 = "10yx8pvg18537b7x689015y1xcm22zd2wn3hkirl236drk7rnapp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.10.0-darwin-arm64.tar.gz"; - sha256 = "00d6j85lmfk8alvbijvjnzg9jrc1a1rsg2cxs8szdzw81an25pk5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.1-darwin-arm64.tar.gz"; + sha256 = "1pm7vggaqsb8yrpk2swzpn6bm9jsqddf7cmx26sw0vd73shhmkd0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-darwin-arm64.tar.gz"; - sha256 = "1i8cwbq01fdrlsx2r14q6f06ysq9gyb8c5ak377aihj8p3rkz224"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.3.1-darwin-arm64.tar.gz"; + sha256 = "0iby3wl30pmaisn15wkdqaxzdmiqywnfvl7pz8c0k549dajyfq32"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-darwin-arm64.tar.gz"; - sha256 = "1dfvzb6lh4ayxlg7m0mm7gb0j80nz5npyxrx41z9fy1x82i24130"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-darwin-arm64.tar.gz"; + sha256 = "0jmdqpajx5c1nnc01qwyjp8gil71wp3k2ddj7ac2vh4m75341ki9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.0-darwin-arm64.tar.gz"; - sha256 = "0c4503nv94hdlza617zl7wqnfks661f4r9ddgw93728diqy38p0v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.4.1-darwin-arm64.tar.gz"; + sha256 = "1n7ip7zr69bz1fh92pvbspf8n1phhwgdcfb4yrasgc2skp4q9fa9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-darwin-arm64.tar.gz"; - sha256 = "19nr55glr64lvxf233c2z8j5g13b7r2zxqwsri9vgj3kg52rjsbi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.4-darwin-arm64.tar.gz"; + sha256 = "1nm9hc8lnc0l7mrqbry5prvdr66zcqhgzz4a4b6ipviir5r49lj4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-darwin-arm64.tar.gz"; - sha256 = "1rh428pj6yzqy40l9gcjaacfcxy5snsy642gavwr9raw3yxdh4br"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-darwin-arm64.tar.gz"; + sha256 = "1gndidz869h2i6ig47a42nvqvzhsj8zzq9qlmb9z87gn2hxqfg69"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.25.0-darwin-arm64.tar.gz"; - sha256 = "06rbc5b87xpcb2w61d82sf5ir8ra9qqphj5kknh6j2s5wj10pwvb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.2-darwin-arm64.tar.gz"; + sha256 = "1d0qkdncw30cw8dczcymj6a7wlkyskq7hdcd3i6fk7qmkw2y273q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-darwin-arm64.tar.gz"; - sha256 = "02mnm525kaxsd0mabpv7j92pj15sv972ikc9dr0vr5sd4dqmjj2k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-darwin-arm64.tar.gz"; + sha256 = "04vsl43f00p0cdhjwlh816asyxlfn32x28q0vwnv0zm60nphwj34"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.5-darwin-arm64.tar.gz"; - sha256 = "0girslx186bif03hxkpsgs21g88sy2r1py05b2kqb67izcbh996v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.6-darwin-arm64.tar.gz"; + sha256 = "1260v26z9fyqc8jxxmxq14ph1c9jplv47gmnm7naw59giiqpd6fa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.3-darwin-arm64.tar.gz"; sha256 = "0l48njd1dw2fmr0sgpws5c6178wcv8h1rzvyj6x6djin3va8nwsg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-arm64.tar.gz"; - sha256 = "1p1r5mn75mgshs9k9yjnzxism4b4nlyp84vz2l48bdgcbqzn1jin"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.0-darwin-arm64.tar.gz"; + sha256 = "1jmfrlilb4par17awwr4aklkr9dnckpr2c88p8x1i641zbfrniw7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.3-darwin-arm64.tar.gz"; - sha256 = "15l2609g7z2xxsblakwq3d3lyg32swb4lmfsrn7m0cwa2a2s2v1x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.6-darwin-arm64.tar.gz"; + sha256 = "002igkcsrwqxwhjsvkddmvdyhgc60ng3f9yf9s2q7lccjd4kd3sw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-darwin-arm64.tar.gz"; - sha256 = "09z5hdwn282xcxi4a2xsigcscnxykidm3a57r1s92jyxcvp9y2k8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.59.0-darwin-arm64.tar.gz"; + sha256 = "1iidb02qq295xhwy48ya07xxdhhfb28ddppxvl88xxk03mfc03f4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.89.0-darwin-arm64.tar.gz"; - sha256 = "1103zs11ih71lq4nj0s2x3v35dj90zy4d0ka27h4lazf28qvmda5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.94.0-darwin-arm64.tar.gz"; + sha256 = "1vhlfgsfd3h79w992r9i2pqxfra93q386wcg73x0xhbx4xsrfqf6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.2-darwin-arm64.tar.gz"; - sha256 = "1jrccj0fkzqb88spl2v97sc2d7nwmkbi0f093f999av504qg0gg4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.4-darwin-arm64.tar.gz"; + sha256 = "0hfak60820z50xhw3kfdvm0shcwxi7y9xxp6iid5r1gk2a0vhaxk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-darwin-arm64.tar.gz"; - sha256 = "0d7jyzf66hxg13zkg9c4g63328vazlp9g7z9djqx44zmpxm6yh2b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.1-darwin-arm64.tar.gz"; + sha256 = "0zwv4v9kv9s3kfqhzvdfr9qjn5mw1yaswa2zjandr45pfyz50abg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-darwin-arm64.tar.gz"; - sha256 = "1az0h9xq7py2cn9qwnhndacla8bfayznv2zbghqqy5wnc3rwbdr7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.7-darwin-arm64.tar.gz"; + sha256 = "1b4i7n7hm43jlc4fi7706bxcmijfgfc2bk0d1y941li7sb87g4am"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-darwin-arm64.tar.gz"; sha256 = "15djjgjf117hswmg8pg53xp8ck8wp2lls6vnfj6ppdx5c6mpj0gh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.1-darwin-arm64.tar.gz"; - sha256 = "114cbaxhr067nf6rhxqnxhqzfwbq6sak6wmxjq5d25xxx0k0392j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.2-darwin-arm64.tar.gz"; + sha256 = "103jidsyp9px082yg00cf57jps1iz96cjy7p9a5hrwvjf17m75mz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.3-darwin-arm64.tar.gz"; - sha256 = "1pmppj5k7ix02bvv21wsh619qcxrhc54iszk9wh651s20j3m0vhn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.2-darwin-arm64.tar.gz"; + sha256 = "0b4jl4sn0ymwb304czlp7rqw1dkmhjqf6fn2b4n3sk4l9frgzbyn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-darwin-arm64.tar.gz"; - sha256 = "160cif97xqh3va114kqwsz6666rspwwhk965c1k0ab4kxdhiwjdm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.4-darwin-arm64.tar.gz"; + sha256 = "0wr64m509ayhbh7877zj3i3dmry4bf1625cfzq7f35qip3yczarx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi-bin/default.nix b/pkgs/tools/admin/pulumi-bin/default.nix index 25351db6fd3f1..ec61e5aef2d0e 100644 --- a/pkgs/tools/admin/pulumi-bin/default.nix +++ b/pkgs/tools/admin/pulumi-bin/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { installPhase = '' install -D -t $out/bin/ * - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" '' + '' installShellCompletion --cmd pulumi \ @@ -23,7 +23,7 @@ in stdenv.mkDerivation { --zsh <($out/bin/pulumi completion zsh) ''; - nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook makeWrapper ]; buildInputs = [ stdenv.cc.cc.libgcc or null ]; meta = with lib; { diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 4aacc6d869011..e79000e70217d 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -74,7 +74,7 @@ buildGoModule rec { rm codegen/{docs,dotnet,go,nodejs,python,schema}/*_test.go rm -R codegen/{dotnet,go,nodejs,python}/gen_program_test - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export PULUMI_HOME=$(mktemp -d) ''; @@ -131,7 +131,8 @@ buildGoModule rec { '' mkdir -p $out/bin makeWrapper ${pulumi}/bin/pulumi $out/bin/pulumi \ - --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib + --suffix PATH : ${lib.makeBinPath (f pulumiPackages)} \ + --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" ''; }; diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index eeb8e724745cd..8a5241aa8acaa 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-RoHQXlfdVJVumgr/Ruph0O79vSf162fwj8R+MrRnmXY="; + hash = "sha256-NxrhZmRbkQNj2K4b6Em4cAdssJRdwEKbdGy8EThN4JY="; }; - vendorHash = "sha256-z7O0IAXGCXV63WjaRG+7c7q/rlqkV12XWNLhsduvk6s="; + vendorHash = "sha256-GKW89qzyuvwCUvN0i+LgU36Vtr5XuvgXIxwnMlGSTFg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 3b9ffe581afd6..3939c25b67bf7 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.32.1"; + version = "2.34.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-+zSUgwh3CKyvBzRY4NevkoSINfvMNOfw8rvs48O0yJw="; + sha256 = "sha256-Ynhom4WX1ME6/uI0HQ83S1DgLYN1HjUxKk5CUL/Fgzk="; }; - vendorHash = "sha256-iEPBTM+hVAGs0TF30onHR0lWAALQbsA164OTkYuOdwc="; + vendorHash = "sha256-FHvppbAAKW2Nf5GKhMWoMuOgqAp6deOSE61hg7dASqo="; ldflags = [ "-w" @@ -27,19 +27,19 @@ buildGoModule rec { # Some tests require access to scaleway's API, failing when sandboxed preCheck = '' - substituteInPlace internal/core/bootstrap_test.go \ - --replace "TestInterruptError" "SkipInterruptError" + substituteInPlace core/bootstrap_test.go \ + --replace-warn "TestInterruptError" "SkipInterruptError" substituteInPlace internal/e2e/errors_test.go \ - --replace "TestStandardErrors" "SkipStandardErrors" + --replace-warn "TestStandardErrors" "SkipStandardErrors" substituteInPlace internal/e2e/human_test.go \ - --replace "TestTestCommand" "SkipTestCommand" \ - --replace "TestHumanCreate" "SkipHumanCreate" \ - --replace "TestHumanList" "SkipHumanList" \ - --replace "TestHumanUpdate" "SkipHumanUpdate" \ - --replace "TestHumanGet" "SkipHumanGet" \ - --replace "TestHumanDelete" "SkipHumanDelete" + --replace-warn "TestTestCommand" "SkipTestCommand" \ + --replace-warn "TestHumanCreate" "SkipHumanCreate" \ + --replace-warn "TestHumanList" "SkipHumanList" \ + --replace-warn "TestHumanUpdate" "SkipHumanUpdate" \ + --replace-warn "TestHumanGet" "SkipHumanGet" \ + --replace-warn "TestHumanDelete" "SkipHumanDelete" substituteInPlace internal/e2e/sdk_errors_test.go \ - --replace "TestSdkStandardErrors" "SkipSdkStandardErrors" + --replace-warn "TestSdkStandardErrors" "SkipSdkStandardErrors" ''; doInstallCheck = true; diff --git a/pkgs/tools/admin/scalr-cli/default.nix b/pkgs/tools/admin/scalr-cli/default.nix index 6dacaba03e764..4672e5e0bb574 100644 --- a/pkgs/tools/admin/scalr-cli/default.nix +++ b/pkgs/tools/admin/scalr-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "scalr-cli"; - version = "0.15.5"; + version = "0.16.0"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${version}"; - hash = "sha256-RXfUlpwlDNAZRJTbbE+n8mReVyrWxUsWkOGaaALz0Q4="; + hash = "sha256-9osB3bsc8IvH1ishG9uiIUnAwC1yZd0rFhiZdzYucI8="; }; vendorHash = "sha256-0p4f+KKD04IFAUQG8F3b+2sx9suYemt3wbgSNNOOIlk="; diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 7cb7cf78ddb84..18988edc8f644 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.21.3"; + version = "1.21.7"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-iCr7RJ3dF0DetuIyfGshU4/VRNEhYxFOQlugl2oTZPM="; + hash = "sha256-3UZD5zBSCFwq4lhiH8MAxFX4vtyGYh3h3Em+7w8id1k="; }; vendorHash = "sha256-TuxYJ3u4/5PJYRoRgom+M1au9XerZ+vj9X3jUWTPM58="; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index c19e7b3b4f3a0..c54ce8bfe1425 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -23,23 +23,21 @@ }: stdenv.mkDerivation rec { - version = "1.13.1"; + version = "1.14.0"; pname = "tigervnc"; src = fetchFromGitHub { owner = "TigerVNC"; repo = "tigervnc"; rev = "v${version}"; - sha256 = "sha256-YSkgkk87bbHg7lJGoPBs7bfjvd1hvUeOZulFHYpXvvo="; + sha256 = "sha256-TgVV/4MRsQHYKpDf9L5eHMLVpdwvNy1KPDIe7xMlQ9o="; }; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in fontPath= substituteInPlace vncviewer/vncviewer.cxx \ --replace '"/usr/bin/ssh' '"${openssh}/bin/ssh' - - cp unix/xserver21.1.1.patch unix/xserver211.patch source_top="$(pwd)" '' + '' # On Mac, do not build a .dmg, instead copy the .app to the source dir @@ -59,14 +57,14 @@ stdenv.mkDerivation rec { "-Wno-error=array-bounds" ]; - postBuild = lib.optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.hostPlatform.isLinux '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast" export CXXFLAGS="$CXXFLAGS -fpermissive" # Build Xvnc tar xf ${xorg.xorgserver.src} cp -R xorg*/* unix/xserver pushd unix/xserver - version=$(echo ${xorg.xorgserver.name} | sed 's/.*-\([0-9]\+\).\([0-9]\+\).*/\1\2/g') + version=$(echo ${xorg.xorgserver.name} | sed 's/.*-\([0-9]\+\).[0-9]\+.*/\1/g') patch -p1 < "$source_top/unix/xserver$version.patch" autoreconf -vfi ./configure $configureFlags --disable-devel-docs --disable-docs \ @@ -86,11 +84,11 @@ stdenv.mkDerivation rec { --with-xkb-output=$out/share/X11/xkb/compiled make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../.. -j$NIX_BUILD_CORES popd - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' make dmg ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' pushd unix/xserver/hw/vnc make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../../../.. install popd @@ -98,7 +96,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/vncserver \ --prefix PATH : ${lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) } - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv 'TigerVNC Viewer ${version}.app' $out/Applications/ rm $out/bin/vncviewer @@ -113,7 +111,7 @@ stdenv.mkDerivation rec { libjpeg_turbo pixman gawk - ] ++ lib.optionals stdenv.isLinux (with xorg; [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux (with xorg; [ nettle pam perl @@ -131,13 +129,15 @@ stdenv.mkDerivation rec { libXfont2 libpciaccess libGLU + libXrandr + libXdamage ] ++ xorg.xorgserver.buildInputs ); nativeBuildInputs = [ cmake gettext - ] ++ lib.optionals stdenv.isLinux (with xorg; [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux (with xorg; [ fontutil libtool makeWrapper @@ -145,7 +145,7 @@ stdenv.mkDerivation rec { zlib ] ++ xorg.xorgserver.nativeBuildInputs); - propagatedBuildInputs = lib.optional stdenv.isLinux xorg.xorgserver.propagatedBuildInputs; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux xorg.xorgserver.propagatedBuildInputs; passthru.tests.tigervnc = nixosTests.tigervnc; diff --git a/pkgs/tools/admin/trinsic-cli/default.nix b/pkgs/tools/admin/trinsic-cli/default.nix index 547d3020620a0..afa431ecd76fd 100644 --- a/pkgs/tools/admin/trinsic-cli/default.nix +++ b/pkgs/tools/admin/trinsic-cli/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoVendorDir = "vendor"; doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Trinsic CLI"; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 1447b497784a4..7643e4a712928 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,26 +11,26 @@ buildGoModule rec { pname = "trivy"; - version = "0.54.1"; + version = "0.56.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-lzLwIa+JCqQQSpA0AFyikpODb6u9oSaEqGGx0ckL+V8="; + hash = "sha256-gVRmSWcWTO1HZ6K2N1sSZchSq2xMc60W+ImHU0xEnA0="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-TSnwCulL4aI/SgL+WKoLwAnmKrUAfXgl+EV/HFt4j1U="; + vendorHash = "sha256-+WkOGy/Z4BuDlwpfisWqhjJlshPXTxjRy2pmmHxU6B8="; subPackages = [ "cmd/trivy" ]; ldflags = [ "-s" "-w" - "-X=github.com/aquasecurity/trivy/pkg/version.ver=v${version}" + "-X=github.com/aquasecurity/trivy/pkg/version/app.ver=${version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -58,13 +58,13 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = trivy; command = "trivy --version"; - version = "Version: v${version}"; + version = "Version: ${version}"; }; meta = with lib; { + description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI"; homepage = "https://github.com/aquasecurity/trivy"; changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}"; - description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI"; longDescription = '' Trivy is a simple and comprehensive vulnerability scanner for containers and other artifacts. A software vulnerability is a glitch, flaw, or diff --git a/pkgs/tools/admin/uacme/default.nix b/pkgs/tools/admin/uacme/default.nix index 6bf1d55e4375d..659ca720856b9 100644 --- a/pkgs/tools/admin/uacme/default.nix +++ b/pkgs/tools/admin/uacme/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ malte-v ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 3e8a2e6285780..8a0b1365ee2de 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -4,7 +4,7 @@ # Only used for Linux's x86/x86_64 , uasm -, useUasm ? (stdenv.isLinux && stdenv.hostPlatform.isx86) +, useUasm ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86) # RAR code is under non-free unRAR license # see the meta.license section below for more details @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { --replace windres.exe ${stdenv.cc.targetPrefix}windres ''; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-deprecated-copy-dtor" ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ "-Wno-conversion" @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { # We need at minimum 10.13 here because of utimensat, however since # we need a bump anyway, let's set the same minimum version as the one in # aarch64-darwin so we don't need additional changes for it - ++ lib.optionals stdenv.isDarwin [ "MACOSX_DEPLOYMENT_TARGET=10.16" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "MACOSX_DEPLOYMENT_TARGET=10.16" ] # it's the compression code with the restriction, see DOC/License.txt ++ lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ] ++ lib.optionals (stdenv.hostPlatform.isMinGW) [ "IS_MINGW=1" "MSYSTEM=1" ]; @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { # and CPP/7zip/Compress/Rar* are unfree with the unRAR license restriction # the unRAR compression code is disabled by default lib.optionals enableUnfree [ unfree ]; - maintainers = with lib.maintainers; [ anna328p eclairevoyant jk peterhoeg ]; + maintainers = with lib.maintainers; [ anna328p jk peterhoeg ]; platforms = with lib.platforms; unix ++ windows; mainProgram = "7zz"; }; diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix index 057efacdbe765..24a1d01b64da6 100644 --- a/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation { ''; # A few tests fail on aarch64-linux - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); meta = with lib; { description = "Tool to extract files from visual novel archives"; @@ -93,6 +93,6 @@ stdenv.mkDerivation { mainProgram = "arc_unpacker"; # unit test failures - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/tools/archivers/arj/default.nix b/pkgs/tools/archivers/arj/default.nix index 6f365e226e209..5ec946788d927 100644 --- a/pkgs/tools/archivers/arj/default.nix +++ b/pkgs/tools/archivers/arj/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace environ.c \ --replace " #include <sys/statfs.h>" " #include <sys/mount.h>" ''; diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 04c0300944eb4..ba178fb3eb7e3 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - preConfigure = lib.optionalString stdenv.isCygwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isCygwin '' sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,' ''; diff --git a/pkgs/tools/archivers/gbl/default.nix b/pkgs/tools/archivers/gbl/default.nix index f025a0c578c10..6bbc31a6b1c62 100644 --- a/pkgs/tools/archivers/gbl/default.nix +++ b/pkgs/tools/archivers/gbl/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-CeGLSseKUe2XudRqZm5Y7o7ZLDtDBg/MFunOGqxFZGM="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; passthru.tests.version = testers.testVersion { package = gbl; }; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 723c6b75ca9f6..f9b5415b4f8e4 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; # avoid retaining reference to CF during stdenv bootstrap - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "gt_cv_func_CFPreferencesCopyAppValue=no" "gt_cv_func_CFLocaleCopyCurrent=no" "gt_cv_func_CFLocaleCopyPreferredLanguages=no" @@ -27,26 +27,26 @@ stdenv.mkDerivation rec { # gnutar tries to call into gettext between `fork` and `exec`, # which is not safe on darwin. # see http://article.gmane.org/gmane.os.macosx.fink.devel/21882 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/system.c --replace '_(' 'N_(' ''; outputs = [ "out" "info" ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook - ++ lib.optional (!stdenv.isDarwin) updateAutotoolsGnuConfigScriptsHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook + ++ lib.optional (!stdenv.hostPlatform.isDarwin) updateAutotoolsGnuConfigScriptsHook; # Add libintl on Darwin specifically as it fails to link (or skip) # NLS on it's own: # "_libintl_textdomain", referenced from: # _main in tar.o # ld: symbol(s) not found for architecture x86_64 - buildInputs = lib.optional aclSupport acl ++ lib.optional stdenv.isDarwin libintl; + buildInputs = lib.optional aclSupport acl ++ lib.optional stdenv.hostPlatform.isDarwin libintl; # May have some issues with root compilation because the bootstrap tool # cannot be used as a login shell for now. - FORCE_UNSAFE_CONFIGURE = lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1"; + FORCE_UNSAFE_CONFIGURE = lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.isSunOS) "1"; - preConfigure = if stdenv.isCygwin then '' + preConfigure = if stdenv.hostPlatform.isCygwin then '' sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,' '' else null; diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 1219c48ab7d29..e2e3ddcdc3e73 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ xz boost ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # Python is reported as missing during the build, however # including Python does not change the output. diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 3ced84bed025f..e77904e120d60 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = '' buildFlags=all3 - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' cp makefile.macosx_llvm_64bits makefile.machine ''; diff --git a/pkgs/tools/archivers/pax/default.nix b/pkgs/tools/archivers/pax/default.nix index feacf73fe87b2..42668a4d1d684 100644 --- a/pkgs/tools/archivers/pax/default.nix +++ b/pkgs/tools/archivers/pax/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1p18nxijh323f4i1s2pg7pcr0557xljl5avv8ll5s9nfr34r5j0w"; }; - buildInputs = lib.optional stdenv.isDarwin utmp + buildInputs = lib.optional stdenv.hostPlatform.isDarwin utmp ++ lib.optional stdenv.hostPlatform.isMusl musl-fts; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts"; diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index cd78e11e80bb3..fe378514adea5 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -41,10 +41,10 @@ stdenv.mkDerivation { dontBuild = true; - buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; nativeBuildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 44a5d4d1192de..96090b88f6b22 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; postPatch = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' substituteInPlace "./XADMaster.xcodeproj/project.pbxproj" \ --replace "libstdc++.6.dylib" "libc++.1.dylib" '' else '' @@ -43,21 +43,21 @@ stdenv.mkDerivation rec { ''; buildInputs = [ bzip2 icu openssl wavpack zlib ] ++ - lib.optionals stdenv.isLinux [ gnustep.base ] ++ - lib.optionals stdenv.isDarwin [ Foundation AppKit ]; + lib.optionals stdenv.hostPlatform.isLinux [ gnustep.base ] ++ + lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; nativeBuildInputs = [ installShellFiles ] ++ - lib.optionals stdenv.isLinux [ gnustep.make ] ++ - lib.optionals stdenv.isDarwin [ xcbuildHook ]; + lib.optionals stdenv.hostPlatform.isLinux [ gnustep.make ] ++ + lib.optionals stdenv.hostPlatform.isDarwin [ xcbuildHook ]; - xcbuildFlags = lib.optionals stdenv.isDarwin [ + xcbuildFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-target unar" "-target lsar" "-configuration Release" "MACOSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; - makefile = lib.optionalString (!stdenv.isDarwin) "Makefile.linux"; + makefile = lib.optionalString (!stdenv.hostPlatform.isDarwin) "Makefile.linux"; enableParallelBuilding = true; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin ${lib.optionalString stdenv.isDarwin "Products/Release/"}{lsar,unar} + install -Dm555 -t $out/bin ${lib.optionalString stdenv.hostPlatform.isDarwin "Products/Release/"}{lsar,unar} for f in lsar unar; do installManPage ./Extra/$f.? installShellCompletion --bash --name $f ./Extra/$f.bash_completion diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index ae9a129c766f6..2b353598a328e 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ] # `lchmod` is not available on Linux, so we remove it to fix "not supported" errors (when the zip file contains symlinks). # Alpine (musl) and Debian (glibc) also add this flag. - ++ lib.optionals stdenv.isLinux [ "LOCAL_UNZIP=-DNO_LCHMOD" ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ "LOCAL_UNZIP=-DNO_LCHMOD" ]; preConfigure = '' sed -i -e 's@CF="-O3 -Wall -I. -DASM_CRC $(LOC)"@CF="-O3 -Wall -I. -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(LOC)"@' unix/Makefile diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 6aa2c95fa1407..18013b39015e9 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "wimlib"; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ ntfs3g ] ++ lib.optionals (!stdenv.isDarwin) [ fuse3 ]; + buildInputs = [ ntfs3g ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ fuse3 ]; src = fetchurl { url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz"; @@ -22,20 +22,20 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preBuild = lib.optionalString (!stdenv.isDarwin) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace programs/mkwinpeimg.in \ --replace '/usr/lib/syslinux' "${syslinux}/share/syslinux" ''; postInstall = let - path = lib.makeBinPath ([ cabextract mtools ntfs3g ] ++ lib.optionals (!stdenv.isDarwin) [ cdrkit syslinux fuse3 ]); + path = lib.makeBinPath ([ cabextract mtools ntfs3g ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ cdrkit syslinux fuse3 ]); in '' for prog in $out/bin/*; do wrapProgram $prog --prefix PATH : $out/bin:${path} done ''; - doCheck = (!stdenv.isDarwin); + doCheck = (!stdenv.hostPlatform.isDarwin); preCheck = '' patchShebangs tests diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index c41a6010ef6f4..a1604f707846f 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; homepage = "https://github.com/ib/xarchiver"; maintainers = [ lib.maintainers.domenkozar ]; diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index a192b38785049..2c225489a3462 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; makefile = "unix/Makefile"; - buildFlags = if stdenv.isCygwin then [ "cygwin" ] else [ "generic" ]; + buildFlags = if stdenv.hostPlatform.isCygwin then [ "cygwin" ] else [ "generic" ]; installFlags = [ "prefix=${placeholder "out"}" "INSTALL=cp" @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { ./buffer-overflow-on-utf8-rh-bug-2165653.patch # Fixes forward declaration errors with timezone.c ./fix-time.h-not-included.patch - ] ++ lib.optionals (enableNLS && !stdenv.isCygwin) [ ./natspec-gentoo.patch.bz2 ]; + ] ++ lib.optionals (enableNLS && !stdenv.hostPlatform.isCygwin) [ ./natspec-gentoo.patch.bz2 ]; buildInputs = lib.optional enableNLS libnatspec - ++ lib.optional stdenv.isCygwin libiconv; + ++ lib.optional stdenv.hostPlatform.isCygwin libiconv; meta = with lib; { description = "Compressor/archiver for creating and modifying zipfiles"; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 6a03b825e902d..791c4fd14f3a0 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl /* for pod2man */ ]; CPPFLAGS = [ "-Dunix" ] ++ - lib.optional (!stdenv.isi686 && !stdenv.isx86_64) "-DNOJIT"; + lib.optional (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isx86_64) "-DNOJIT"; CXXFLAGS = [ "-O3" "-DNDEBUG" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix index ebb58191a3cad..2b9ee3bc5d03f 100644 --- a/pkgs/tools/audio/beets/builtin-plugins.nix +++ b/pkgs/tools/audio/beets/builtin-plugins.nix @@ -128,6 +128,11 @@ testPaths = [ ]; }; autobpm = { + propagatedBuildInputs = with python3Packages; [ + librosa + # An optional dependency of librosa, needed for beets' autobpm + resampy + ]; testPaths = [ ]; }; listenbrainz = { diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index caa160cf1764f..85244c0e0b897 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,8 +1,6 @@ { lib , callPackage , fetchFromGitHub -, fetchPypi -, fetchpatch , python3Packages }: /* diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix index 4b661d896ad68..440c476309a66 100644 --- a/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "beets-alternatives"; - version = "0.11.1"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { repo = "beets-alternatives"; owner = "geigerzaehler"; - rev = "v${version}"; - sha256 = "sha256-ORmF7YOQD4LvKiYo4Rzz+mzppOEvLics58aOK/IKcHc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-i67Bzdh84TuVwcgwo5SgHFp1W04KF3VA6cbrFz82je0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/audio/dl-librescore/default.nix b/pkgs/tools/audio/dl-librescore/default.nix index 78a2b80a0cc78..147ef1094ef28 100644 --- a/pkgs/tools/audio/dl-librescore/default.nix +++ b/pkgs/tools/audio/dl-librescore/default.nix @@ -30,7 +30,7 @@ buildNpmPackage rec { nativeBuildInputs = [ python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index 0ad07bae9fd93..b1daf3aa13e6a 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -19,13 +19,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "0-unstable-2024-06-03"; + version = "0-unstable-2024-09-16"; src = fetchFromGitHub { owner = "kaldi-asr"; repo = "kaldi"; - rev = "67548a31c45f93d8b25ee553c5969d6a6d5d9408"; - sha256 = "sha256-yCyBha7i2rxYjEDRYdg8QI7raCEkOPT0Tc8dzSamsmc="; + rev = "d9ab0465aa2849ff645c027110c48899d5ec6ca8"; + sha256 = "sha256-usrHtVGkp++mU9rWI3u3vXJ8aAycujw9+5VQd0X0idY="; }; cmakeFlags = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openblas icu - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate ]; diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix index 1da562085158a..1dada2fcfc3f5 100644 --- a/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/tools/audio/mpd-notification/default.nix b/pkgs/tools/audio/mpd-notification/default.nix index d4ee520ad6dc0..277a9fcf65a20 100644 --- a/pkgs/tools/audio/mpd-notification/default.nix +++ b/pkgs/tools/audio/mpd-notification/default.nix @@ -8,6 +8,7 @@ , libnotify , libmpdclient , discount +, systemd }: stdenv.mkDerivation rec { @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { ffmpeg libmpdclient discount + systemd ]; installPhase = '' diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index c2e93d592f4c1..3ced3d5d1382e 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ lovek323 manveru ]; - broken = stdenv.isDarwin; # fails due to old nokogiri https://github.com/sparklemotion/nokogiri/discussions/3152#discussioncomment-8806607 + broken = stdenv.hostPlatform.isDarwin; # fails due to old nokogiri https://github.com/sparklemotion/nokogiri/discussions/3152#discussioncomment-8806607 }; } # TODO: autoreconfHook this diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/tools/audio/mpris-scrobbler/default.nix index 859cc9dd6df97..4628ad4910d10 100644 --- a/pkgs/tools/audio/mpris-scrobbler/default.nix +++ b/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/signon.c \ --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace meson.build \ --replace "-Werror=format-truncation=0" "" \ --replace "-Wno-stringop-overflow" "" @@ -56,10 +56,10 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString ([ # Needed with GCC 12 "-Wno-error=address" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-sometimes-uninitialized" "-Wno-tautological-pointer-compare" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-Wno-array-bounds" "-Wno-free-nonheap-object" "-Wno-stringop-truncation" diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index c74919dbcb0ed..931bcb32743b3 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -50,7 +50,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreML @@ -70,7 +70,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { --replace '${cudaOldStr}' '${cudaNewStr}' ''; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { WHISPER_COREML = "1"; WHISPER_COREML_ALLOW_FALLBACK = "1"; WHISPER_METAL_EMBED_LIBRARY = "1"; diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 8740c273eef33..e65f9a20989b5 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; mesonFlags = [ - "-Dbash-completions=true" + (lib.mesonBool "bash-completions" true) + (lib.mesonBool "zsh-completions" true) (lib.mesonBool "gtk-doc" withDocs) ]; diff --git a/pkgs/tools/audio/shaq/default.nix b/pkgs/tools/audio/shaq/default.nix index f7270a73557b0..d615a95219cb5 100644 --- a/pkgs/tools/audio/shaq/default.nix +++ b/pkgs/tools/audio/shaq/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { shazamio ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { dev = [ build shaq diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index ab5cdd8ca3999..e7ced0c1e9d45 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "4.2.7"; + version = "4.2.8"; pyproject = true; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "refs/tags/v${version}"; - hash = "sha256-AZpTxfnUyOLcPJQJyk77eqw1EbN3s7/8QQMxcxyJVKE="; + hash = "sha256-1NPYMyiYWWpiGlr80IcILcC1nI8zkmf7+aA+mqwSAU0="; }; build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/tools/backup/awsbck/default.nix index 8e00b8787c4a3..756d7aa1261fb 100644 --- a/pkgs/tools/backup/awsbck/default.nix +++ b/pkgs/tools/backup/awsbck/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-dMXaIFc0e6PMYiQrokQoUc1xAVCccE92WzM2fl7tOBQ="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; # tests run in CI on the source repo doCheck = false; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index f8ec672710f5b..d21336813008c 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; # libtool.m4 only matches macOS 10.* - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' substituteInPlace configure \ --replace "10.*)" "*)" ''; @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { IOKit ] # acl relies on attr, which I can't get to build on darwin - ++ lib.optional (!stdenv.isDarwin) acl; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) acl; configureFlags = [ "--with-sqlite3=${sqlite.dev}" - "--with-postgresql=${postgresql}" + "--with-postgresql=${lib.getDev postgresql}" "--with-logdir=/var/log/bacula" "--with-working-dir=/var/lib/bacula" "--mandir=\${out}/share/man" diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index ab43dfbef0ce6..e0c148108362a 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -58,14 +58,14 @@ python.pkgs.buildPythonApplication rec { xxHash zstd openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ acl ]; dependencies = with python.pkgs; [ msgpack packaging - (if stdenv.isLinux then pyfuse3 else llfuse) + (if stdenv.hostPlatform.isLinux then pyfuse3 else llfuse) ]; makeWrapperArgs = [ diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 18318dc8e584b..8a55cef2b9d2c 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -4,7 +4,6 @@ coreutils, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, fetchPypi, - fetchpatch, installShellFiles, lib, python3Packages, @@ -15,14 +14,14 @@ }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.8.13"; + version = "1.8.14"; src = fetchPypi { inherit pname version; - hash = "sha256-4Z5imxNjfvd4fkpFsggSO9XueN5Yzcz4RCl+BqmddCM="; + hash = "sha256-WYs7wiwZ1TvTdeUpWv7FbREXWfdGcYRarP4FXFOfp0Y="; }; - nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ passthru.optional-dependencies.apprise; + nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ optional-dependencies.apprise; # - test_borgmatic_version_matches_news_version # The file NEWS not available on the pypi source, and this test is useless @@ -42,7 +41,7 @@ python3Packages.buildPythonApplication rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { apprise = [ python3Packages.apprise ]; }; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 4684631efe9af..dad8fefced89f 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # 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 zlib uthash ] - ++ lib.optional (!stdenv.isDarwin) acl; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) acl; configureFlags = [ "--localstatedir=/var" ]; diff --git a/pkgs/tools/backup/conserve/default.nix b/pkgs/tools/backup/conserve/default.nix index a3f4dc3f734c2..12250ee2b6fd9 100644 --- a/pkgs/tools/backup/conserve/default.nix +++ b/pkgs/tools/backup/conserve/default.nix @@ -5,16 +5,23 @@ rustPlatform.buildRustPackage rec { pname = "conserve"; - version = "23.11.0"; + version = "24.8.0"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "conserve"; rev = "v${version}"; - hash = "sha256-Ck2+3etwfZiDMZHzI2hIBuUKn7L0ZTGEe9yJjXjoRIM="; + hash = "sha256-rdZTx0wFFtWt3EcpvWHY6m+8TEHEj53vhVpdRp5wbos="; }; - cargoHash = "sha256-tMj1icGNTFpouts1TE6BIiABexV3vmOW9r5Y/7ynUMM="; + cargoHash = "sha256-IP9x3n5RdI+TKOhMBWEfw9P2CROcC0SmEsmMVaXjiDE="; + + checkFlags = [ + # expected to panic if unix user has no secondary group, + # which is the case in the nix sandbox + "--skip=test_fixtures::test::arbitrary_secondary_group_is_found" + "--skip=chgrp_reported_as_changed" + ]; meta = with lib; { description = "Robust portable backup tool in Rust"; diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 56a5a9313911e..d3424c4ac0c86 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -48,10 +48,10 @@ stdenv.mkDerivation rec { xz zlib zstd - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ attr e2fsprogs - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ]; diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix deleted file mode 100644 index 2cb003d2d080f..0000000000000 --- a/pkgs/tools/backup/duplicati/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchzip, mono, sqlite, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "duplicati"; - version = "2.0.7.1"; - channel = "beta"; - build_date = "2023-05-25"; - - src = fetchzip { - url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; - hash = "sha256-isPmRC6N+gEZgvJ0bgeFf5kOQJsicZOsGnT+CAGgg+U="; - stripRoot = false; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/{bin,share/${pname}-${version}} - cp -r * $out/share/${pname}-${version} - makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \ - --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - sqlite ]} - makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \ - --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - sqlite ]} - ''; - - meta = with lib; { - description = "Free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers"; - homepage = "https://www.duplicati.com/"; - license = licenses.lgpl21; - maintainers = with maintainers; [ nyanloutre ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 71d63a622d4d8..9411c2e13ea70 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -39,7 +39,7 @@ let self = python3.pkgs.buildPythonApplication rec { # don't try to use gtar on darwin/bsd substituteInPlace testing/functional/test_restart.py \ --replace-fail 'tarcmd = "gtar"' 'tarcmd = "tar"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # tests try to access these files in the sandbox, but can't deal with EPERM substituteInPlace testing/unit/test_globmatch.py \ --replace-fail /var/log /test/log @@ -50,7 +50,7 @@ let self = python3.pkgs.buildPythonApplication rec { --replace-fail '"/tmp/' 'os.environ.get("TMPDIR")+"/' ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # uses /tmp/ "testing/unit/test_cli_main.py::CommandlineTest::test_intermixed_args" ]; @@ -91,16 +91,15 @@ let self = python3.pkgs.buildPythonApplication rec { gnutar # Add 'tar' to PATH. librsync # Add 'rdiff' to PATH. par2cmdline # Add 'par2' to PATH. - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux # Add 'setsid' to PATH. - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ] ++ (with python3.pkgs; [ lockfile mock pexpect - pytest - pytest-runner + pytestCheckHook fasteners ]); @@ -112,7 +111,7 @@ let self = python3.pkgs.buildPythonApplication rec { gnupg ncftp rsync - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]); in '' makeWrapperArgsBak=("''${makeWrapperArgs[@]}") diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix index 061c8b2ad6de3..d178185229fda 100644 --- a/pkgs/tools/backup/httrack/qt.nix +++ b/pkgs/tools/backup/httrack/qt.nix @@ -29,7 +29,7 @@ mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Easy-to-use offline browser / website mirroring utility - QT frontend"; mainProgram = "httraqt"; homepage = "http://www.httrack.com"; diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix deleted file mode 100644 index 6fd32a2ceb44a..0000000000000 --- a/pkgs/tools/backup/luckybackup/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ mkDerivation, lib, fetchurl -, pkg-config, libtool, qmake -, rsync, ssh -}: - -mkDerivation rec { - pname = "luckybackup"; - version = "0.5.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/luckybackup/${version}/source/${pname}-${version}.tar.gz"; - sha256 = "0nwjsk1j33pm8882jbj8h6nxn6n5ab9dxqpqkay65pfbhcjay0g8"; - }; - - buildInputs = [ rsync ssh ]; - - nativeBuildInputs = [ pkg-config libtool qmake ]; - - prePatch = '' - for File in luckybackup.pro menu/luckybackup-pkexec \ - menu/luckybackup-su.desktop menu/luckybackup.desktop \ - menu/net.luckybackup.su.policy src/functions.cpp \ - src/global.cpp src/scheduleDialog.cpp; do - substituteInPlace $File --replace "/usr" "$out" - done - ''; - - meta = with lib; { - description = "Powerful, fast and reliable backup & sync tool"; - longDescription = '' - luckyBackup is an application for data back-up and synchronization - powered by the rsync tool. - - It is simple to use, fast (transfers over only changes made and not - all data), safe (keeps your data safe by checking all declared directories - before proceeding in any data manipulation), reliable and fully - customizable. - ''; - homepage = "https://luckybackup.sourceforge.net/"; - license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index b95ada9574ed6..307ca6251ca47 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -21,9 +21,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-FeD0+s79orFDUVsb205W0pdXgDI+p1UrH3GIfKwUqDQ="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security SystemConfiguration ]; checkFlags = [ "--skip=tests::cli" ]; diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index af62fede4071e..fdda197f18c59 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ openssl libsodium xz ] - ++ (lib.optional stdenv.isDarwin Security); + ++ (lib.optional stdenv.hostPlatform.isDarwin Security); meta = with lib; { description = "Data deduplication with compression and public key encryption"; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index bf797a16cbfd1..33050e805f9ab 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -27,6 +27,7 @@ pypkgs.buildPythonApplication rec { homepage = "https://rdiff-backup.net"; license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; + mainProgram = "rdiff-backup"; platforms = platforms.all; }; } diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 5f802f4879036..11498abb458aa 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-fd67ZehmgHHd+R/V4hJCREWoY3lFKSTfvbLRgJ0PSAM="; + hash = "sha256-/kgZgHmIxZkkmLyR246CcU+8wAekuK8SruY5GBLxJXI="; }; patches = [ diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 1583048f961c7..116804ecf4da1 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "s3ql"; - version = "5.2.1"; + version = "5.2.2"; pyproject = true; src = fetchFromGitHub { owner = "s3ql"; repo = "s3ql"; rev = "refs/tags/s3ql-${version}"; - hash = "sha256-85J0ymGe9V6f95Ycdq84dY+UiybhPdFXZzuIBb1nD5c="; + hash = "sha256-D+fUl9UpJ7vxoVzB6MlrgnyAqEYbUkc+0w6iepYuZnk="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index ad7fc761d8439..83d205bb9b50b 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap ''; - buildInputs = [ openssl zlib ] ++ lib.optional stdenv.isLinux e2fsprogs - ++ lib.optional stdenv.isDarwin bzip2; + buildInputs = [ openssl zlib ] ++ lib.optional stdenv.hostPlatform.isLinux e2fsprogs + ++ lib.optional stdenv.hostPlatform.isDarwin bzip2; meta = { description = "Online backups for the truly paranoid"; diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix deleted file mode 100644 index f1dda5da28093..0000000000000 --- a/pkgs/tools/backup/wal-e/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages, lzop, postgresql, pv }: - -python3Packages.buildPythonApplication rec { - pname = "wal-e"; - version = "1.1.1"; - - namePrefix = ""; - - src = fetchFromGitHub { - owner = "wal-e"; - repo = "wal-e"; - rev = "v${version}"; - hash = "sha256-I6suHkAYzDtlNFNPH4SziY93Ryp+NTHkCBuojDvv+U4="; - }; - - # needs tox - doCheck = false; - - propagatedBuildInputs = (with python3Packages; [ - boto - gevent - google-cloud-storage - ]) ++ [ - postgresql - lzop - pv - ]; - - meta = { - description = "Postgres WAL-shipping disaster recovery and replication toolkit"; - mainProgram = "wal-e"; - homepage = "https://github.com/wal-e/wal-e"; - maintainers = [ ]; - license = lib.licenses.bsd3; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index e4e7124477ae8..a31406dd5f499 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,68 +1,65 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchurl, perl, autoreconfHook }: let # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/cpanfile - # pinned versions are listed at https://github.com/oetiker/znapzend/blob/master/thirdparty/cpanfile-5.30.snapshot - Mojolicious' = perlPackages.buildPerlPackage rec { - pname = "Mojolicious"; - version = "8.73"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/${pname}-${version}.tar.gz"; - sha256 = "118y2264f89bbp5ly2dh36xjq25jk85s2ssxa3y4gsgsk6sjzzk1"; - }; - }; - MojoIOLoopForkCall' = perlPackages.buildPerlModule rec { - pname = "Mojo-IOLoop-ForkCall"; - version = "0.20"; + # pinned versions are listed at https://github.com/oetiker/znapzend/blob/v0.23.1/thirdparty/cpanfile-5.38.snapshot + + MojoLogClearable = perl.pkgs.buildPerlModule rec { + pname = "Mojo-Log-Clearable"; + version = "1.001"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JB/JBERGER/${pname}-${version}.tar.gz"; - sha256 = "19pih5x0ayxs2m8j29qwdpi6ky3w4ghv6vrmax3ix9r59hj6569b"; + url = "mirror://cpan/authors/id/D/DB/DBOOK/${pname}-${version}.tar.gz"; + hash = "sha256-guBqKdWemc4mC/xp77Wd7qeV2iRqY4wrQ5NRsHtsCnI="; }; - propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious' ]; + buildInputs = with perl.pkgs; [ ModuleBuildTiny ]; + propagatedBuildInputs = with perl.pkgs; [ Mojolicious RoleTiny ClassMethodModifiers ]; }; perl' = perl.withPackages (p: - [ MojoIOLoopForkCall' - p.TAPParserSourceHandlerpgTAP + with p; [ + ClassMethodModifiers + ExtUtilsConfig + ExtUtilsHelpers + ExtUtilsInstallPaths + ModuleBuildTiny + MojoLogClearable + Mojolicious + RoleTiny ]); - - version = "0.21.0"; - sha256 = "1lg46rf2ahlclan29zx8ag5k4fjp28sc9l02z76f0pvdlj4qnihl"; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "znapzend"; - inherit version; + version = "0.23.2"; src = fetchFromGitHub { owner = "oetiker"; repo = "znapzend"; - rev = "v${version}"; - inherit sha256; + # Sometimes there's a branch with the same name as the tag, + # confusing fetchFromGitHub. Working around this by prefixing + # with `refs/tags/`. + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-UvaYzzV+5mZAAwSSMzq4fjCu/mzjeSyQdwQRTZGNktM="; }; - buildInputs = [ wget perl' ]; + outputs = [ "out" "man" ]; - nativeBuildInputs = [ autoconf automake autoreconfHook ]; + buildInputs = [ perl' ]; + nativeBuildInputs = [ autoreconfHook ]; - preConfigure = '' + postPatch = '' sed -i 's/^SUBDIRS =.*$/SUBDIRS = lib/' Makefile.am - - grep -v thirdparty/Makefile configure.ac > configure.ac.tmp - mv configure.ac.tmp configure.ac - - autoconf ''; - preBuild = '' - aclocal - automake + doInstallCheck = true; + installCheckPhase = '' + $out/bin/znapzend --version ''; meta = with lib; { description = "High performance open source ZFS backup with mbuffer and ssh support"; homepage = "https://www.znapzend.org"; license = licenses.gpl3; - maintainers = with maintainers; [ otwieracz ]; + maintainers = with maintainers; [ otwieracz ma27 ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 4b4786ac9a0d9..4bc7736e06edc 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , bluez-tools -, gnome +, gnome-bluetooth_1_0 , gobject-introspection , libnotify , pavucontrol @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez-tools - gnome.gnome-bluetooth_1_0 + gnome-bluetooth_1_0 libnotify python3Packages.python util-linux diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 572a73be3c881..effde184d1f84 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,7 +1,7 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 , obex_data_server, xdg-utils, dnsmasq, dhcpcd, iproute2 , adwaita-icon-theme, librsvg, wrapGAppsHook3, gobject-introspection -, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: +, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio }: let pythonPackages = python3Packages; diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix deleted file mode 100644 index 9c4cda573e589..0000000000000 --- a/pkgs/tools/bootloaders/refind/default.nix +++ /dev/null @@ -1,154 +0,0 @@ -{ lib -, stdenv -, fetchurl -, gnu-efi -, nixosTests -, efibootmgr -, openssl -, withSbsigntool ? false # currently, cross compiling sbsigntool is broken, so default to false -, sbsigntool -, makeWrapper -}: - -let - archids = { - x86_64-linux = { hostarch = "x86_64"; efiPlatform = "x64"; }; - i686-linux = rec { hostarch = "ia32"; efiPlatform = hostarch; }; - aarch64-linux = { hostarch = "aarch64"; efiPlatform = "aa64"; }; - }; - - inherit - (archids.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}")) - hostarch efiPlatform; -in - -stdenv.mkDerivation rec { - pname = "refind"; - version = "0.14.2"; - - src = fetchurl { - url = "mirror://sourceforge/project/refind/${version}/refind-src-${version}.tar.gz"; - hash = "sha256-99k86A2na4bFZygeoiW2qHkHzob/dyM8k1elIsEVyPA="; - }; - - patches = [ - # Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds. - ./0001-toolchain.patch - # Avoid leaking the build timestamp - # https://sourceforge.net/p/refind/code/merge-requests/53/ - ./0002-preserve-dates.patch - ]; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ gnu-efi ]; - - hardeningDisable = [ "stackprotector" ]; - - makeFlags = - [ "prefix=" - "EFIINC=${gnu-efi}/include/efi" - "EFILIB=${gnu-efi}/lib" - "GNUEFILIB=${gnu-efi}/lib" - "EFICRT0=${gnu-efi}/lib" - "HOSTARCH=${hostarch}" - "ARCH=${hostarch}" - ] ++ lib.optional stdenv.isAarch64 [ - # aarch64 is special for GNU-EFI, see BUILDING.txt - "GNUEFI_ARM64_TARGET_SUPPORT=y" - ]; - - buildFlags = [ "gnuefi" "fs_gnuefi" ]; - - installPhase = '' - runHook preInstall - - install -d $out/bin/ - install -d $out/share/refind/drivers_${efiPlatform}/ - install -d $out/share/refind/tools_${efiPlatform}/ - install -d $out/share/refind/docs/html/ - install -d $out/share/refind/docs/Styles/ - install -d $out/share/refind/fonts/ - install -d $out/share/refind/icons/ - install -d $out/share/refind/images/ - install -d $out/share/refind/keys/ - - # refind uefi app - install -D -m0644 refind/refind_${efiPlatform}.efi $out/share/refind/refind_${efiPlatform}.efi - - # uefi drivers - install -D -m0644 drivers_${efiPlatform}/*.efi $out/share/refind/drivers_${efiPlatform}/ - - # uefi apps - install -D -m0644 gptsync/gptsync_${efiPlatform}.efi $out/share/refind/tools_${efiPlatform}/gptsync_${efiPlatform}.efi - - # helper scripts - install -D -m0755 refind-install $out/bin/refind-install - install -D -m0755 mkrlconf $out/bin/refind-mkrlconf - install -D -m0755 mvrefind $out/bin/refind-mvrefind - install -D -m0755 fonts/mkfont.sh $out/bin/refind-mkfont - - # sample config files - install -D -m0644 refind.conf-sample $out/share/refind/refind.conf-sample - - # docs - install -D -m0644 docs/refind/* $out/share/refind/docs/html/ - install -D -m0644 docs/Styles/* $out/share/refind/docs/Styles/ - install -D -m0644 README.txt $out/share/refind/docs/README.txt - install -D -m0644 NEWS.txt $out/share/refind/docs/NEWS.txt - install -D -m0644 BUILDING.txt $out/share/refind/docs/BUILDING.txt - install -D -m0644 CREDITS.txt $out/share/refind/docs/CREDITS.txt - - # fonts - install -D -m0644 fonts/* $out/share/refind/fonts/ - rm -f $out/share/refind/fonts/mkfont.sh - - # icons - install -D -m0644 icons/*.png $out/share/refind/icons/ - - # images - install -D -m0644 images/*.{png,bmp} $out/share/refind/images/ - - # keys - install -D -m0644 keys/* $out/share/refind/keys/ - - # Fix variable definition of 'RefindDir' which is used to locate ressource files. - sed -i "s,\bRefindDir=\"\$This.*,RefindDir=$out/share/refind,g" $out/bin/refind-install - - runHook postInstall - ''; - - postInstall = '' - wrapProgram $out/bin/refind-install \ - --prefix PATH : ${lib.makeBinPath ( [ efibootmgr openssl ] ++ lib.optional withSbsigntool sbsigntool )} - wrapProgram $out/bin/refind-mvrefind \ - --prefix PATH : ${lib.makeBinPath [ efibootmgr ]} - ''; - - passthru.tests = { - uefiCdrom = nixosTests.boot.uefiCdrom; - }; - - meta = with lib; { - description = "Graphical {,U}EFI boot manager"; - longDescription = '' - rEFInd is a graphical boot manager for EFI- and UEFI-based - computers, such as all Intel-based Macs and recent (most 2011 - and later) PCs. rEFInd presents a boot menu showing all the EFI - boot loaders on the EFI-accessible partitions, and optionally - BIOS-bootable partitions on Macs. EFI-compatible OSes, including - Linux, provide boot loaders that rEFInd can detect and - launch. rEFInd can launch Linux EFI boot loaders such as ELILO, - GRUB Legacy, GRUB 2, and 3.3.0 and later kernels with EFI stub - support. EFI filesystem drivers for ext2/3/4fs, ReiserFS, HFS+, - and ISO-9660 enable rEFInd to read boot loaders from these - filesystems, too. rEFInd's ability to detect boot loaders at - runtime makes it very easy to use, particularly when paired with - Linux kernels that provide EFI stub support. - ''; - homepage = "http://refind.sourceforge.net/"; - maintainers = with maintainers; [ AndersonTorres chewblacka ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - license = licenses.gpl3Plus; - }; - -} diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix index 5371e8d526b8d..dc5c6fc4ad30b 100644 --- a/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -1,11 +1,11 @@ -{ lib, symlinkJoin, brasero-original, cdrtools, libdvdcss, makeWrapper }: +{ lib, symlinkJoin, brasero-unwrapped, cdrtools, libdvdcss, makeWrapper }: let binPath = lib.makeBinPath [ cdrtools ]; in symlinkJoin { - name = "brasero-${brasero-original.version}"; + name = "brasero-${brasero-unwrapped.version}"; - paths = [ brasero-original ]; + paths = [ brasero-unwrapped ]; nativeBuildInputs = [ makeWrapper ]; postBuild = '' @@ -14,5 +14,5 @@ in symlinkJoin { --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libdvdcss ]}/libdvdcss.so ''; - inherit (brasero-original) meta; + inherit (brasero-unwrapped) meta; } diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 84cad2a5d96d6..b4e93adce8644 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { libvorbis libmad libao - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices IOKit ]; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index ae4a06bb57f2b..7fd51d5d254f5 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib bzip2 perl ] ++ - lib.optionals stdenv.isLinux [ libcap ] ++ - lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon IOKit iconv ]); + lib.optionals stdenv.hostPlatform.isLinux [ libcap ] ++ + lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon IOKit iconv ]); hardeningDisable = [ "format" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isMusl [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244 patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace libusal/scsi-mac-iokit.c \ --replace "IOKit/scsi-commands/SCSITaskLib.h" "IOKit/scsi/SCSITaskLib.h" substituteInPlace genisoimage/sha256.c \ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --replace "#define HAVE_RCMD 1" "#undef HAVE_RCMD" ''; - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in */CMakeFiles/*.dir/link.txt ; do substituteInPlace "$f" \ --replace "-lrt" "-framework IOKit" diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix index 1a3e58df2cc88..d264a0f8bdb34 100644 --- a/pkgs/tools/cd-dvd/cdrtools/default.nix +++ b/pkgs/tools/cd-dvd/cdrtools/default.nix @@ -10,16 +10,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ m4 ]; - buildInputs = if stdenv.isDarwin then [ Carbon IOKit ] else [ acl libcap ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ Carbon IOKit ] else [ acl libcap ]; postPatch = '' sed "/\.mk3/d" -i libschily/Targets.man substituteInPlace man/Makefile --replace "man4" "" substituteInPlace RULES/rules.prg --replace "/bin/" "" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + ln -sv i386-darwin-clang64.rul RULES/arm64-darwin-cc.rul ln -sv i386-darwin-clang64.rul RULES/arm64-darwin-clang.rul ln -sv i386-darwin-clang64.rul RULES/arm64-darwin-clang64.rul + ln -sv i586-linux-cc.rul RULES/riscv64-linux-cc.rul ''; dontConfigure = true; diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix index a6b75e14bef79..5b0287efed81c 100644 --- a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix +++ b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 ]; buildInputs = [ cdrtools ] - ++ lib.optionals stdenv.isDarwin [ IOKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; makeFlags = [ "prefix=${placeholder "out"}" @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "CXX=${stdenv.cc.targetPrefix}c++" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ # error: invalid suffix on literal; C++11 requires a space between literal and identifier "-Wno-reserved-user-defined-literal" # error: non-constant-expression cannot be narrowed from type 'size_t' (aka 'unsigned long') to 'IOByteCount' (aka 'unsigned int') in initializer list diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index a3d61f615b9d6..8175b3a1da8aa 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux ++ platforms.darwin; homepage = "https://github.com/amadvance/advancecomp"; - + changelog = "https://github.com/amadvance/advancecomp/blob/v${version}/HISTORY"; }; } diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index 92ddefdb86622..889f64b52d8b9 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-arch-native" - ] ++ lib.optionals stdenv.isDarwin [ "--disable-link-time-optimization" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-link-time-optimization" ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/tools/compression/flips/default.nix index d697a10fad62d..29edcf254e07a 100644 --- a/pkgs/tools/compression/flips/default.nix +++ b/pkgs/tools/compression/flips/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "Patcher for IPS and BPS files"; homepage = "https://github.com/Alcaro/Flips"; license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ aleksana ]; platforms = platforms.linux; mainProgram = "flips"; }; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 05539050861f3..8b10fa1c98d48 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -2,7 +2,6 @@ , fetchurl , makeWrapper , updateAutotoolsGnuConfigScriptsHook -, xz , runtimeShellPackage }: diff --git a/pkgs/tools/compression/imagelol/default.nix b/pkgs/tools/compression/imagelol/default.nix index 89515e31b4d2b..9d5cc34b38275 100644 --- a/pkgs/tools/compression/imagelol/default.nix +++ b/pkgs/tools/compression/imagelol/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { cp ./ImageLOL $out/bin ''; - cmakeFlags = [ (lib.cmakeFeature "CMAKE_C_FLAGS" "-std=gnu90") ] ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DPNG_ARM_NEON=off"; + cmakeFlags = [ (lib.cmakeFeature "CMAKE_C_FLAGS" "-std=gnu90") ] ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-DPNG_ARM_NEON=off"; meta = with lib; { homepage = "https://github.com/MCredstoner2004/ImageLOL"; diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index f485bab4a7496..eab035f062041 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Mb324ojtLV0S10KhL7Vjf3DhSOtCy1pFMTzvLkTnpXM="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Building the ASM/x86 directory creates an empty archive, # which fails on darwin, so remove it # https://github.com/ckolivas/lrzip/issues/193 diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix index 44555cd6ddbc5..aa5692d14c519 100644 --- a/pkgs/tools/compression/pbzx/default.nix +++ b/pkgs/tools/compression/pbzx/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0bwd7wmnhpz1n5p39mh6asfyccj4cm06hwigslcwbb3pdwmvxc90"; }; + patches = [ ./stdin.patch ]; buildInputs = [ xz xar ]; buildPhase = '' ${stdenv.cc.targetPrefix}cc pbzx.c -llzma -lxar -o pbzx diff --git a/pkgs/tools/compression/pbzx/stdin.patch b/pkgs/tools/compression/pbzx/stdin.patch new file mode 100644 index 0000000000000..f4fa23474387b --- /dev/null +++ b/pkgs/tools/compression/pbzx/stdin.patch @@ -0,0 +1,53 @@ +C standard defines `stdin` as a macro so we can’t use it as an +identifier. See also +https://lists.llvm.org/pipermail/llvm-commits/Week-of-Mon-20130506/173524.html + +--- a/pbzx.c ++++ b/pbzx.c +@@ -34,7 +34,7 @@ + + /* Structure to hold the command-line options. */ + struct options { +- bool stdin; /* True if data should be read from stdin. */ ++ bool usestdin; /* True if data should be read from stdin. */ + bool noxar; /* The input data is not a XAR archive but the pbzx Payload. */ + bool help; /* Print usage with details and exit. */ + bool version; /* Print version and exit. */ +@@ -74,7 +74,7 @@ + /* Skip arguments that are not flags. */ + if (argv[i][0] != '-') continue; + /* Match available arguments. */ +- if (strcmp(argv[i], "-") == 0) opts->stdin = true; ++ if (strcmp(argv[i], "-") == 0) opts->usestdin = true; + else if (strcmp(argv[i], "-n") == 0) opts->noxar = true; + else if (strcmp(argv[i], "-h") == 0) opts->help = true; + else if (strcmp(argv[i], "-v") == 0) opts->version = true; +@@ -204,9 +204,9 @@ + parse_args(&argc, argv, &opts); + if (opts.version) version(); + if (opts.help) usage(NULL); +- if (!opts.stdin && argc < 2) ++ if (!opts.usestdin && argc < 2) + usage("missing filename argument"); +- else if ((!opts.stdin && argc > 2) || (opts.stdin && argc > 1)) ++ else if ((!opts.usestdin && argc > 2) || (opts.usestdin && argc > 1)) + usage("unhandled positional argument(s)"); + + char const* filename = NULL; +@@ -216,7 +216,7 @@ + struct stream stream; + stream_init(&stream); + bool success = false; +- if (opts.stdin) { ++ if (opts.usestdin) { + stream.type = STREAM_FP; + stream.fp = stdin; + success = true; +@@ -291,6 +291,6 @@ + } + free(zbuf); + lzma_end(&zs); +- if (!opts.stdin) stream_close(&stream); ++ if (!opts.usestdin) stream_close(&stream); + return 0; + } diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 106b14b81b64f..a6eaab1a6ef23 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ zlib ] ++ lib.optional stdenv.isLinux util-linux; + buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isLinux util-linux; makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkTarget = "tests"; installPhase = '' runHook preInstall diff --git a/pkgs/tools/compression/xar/0001-Add-useless-descriptions-to-AC_DEFINE.patch b/pkgs/tools/compression/xar/0001-Add-useless-descriptions-to-AC_DEFINE.patch deleted file mode 100644 index a605d2db1708e..0000000000000 --- a/pkgs/tools/compression/xar/0001-Add-useless-descriptions-to-AC_DEFINE.patch +++ /dev/null @@ -1,95 +0,0 @@ -From a14be07c0aae3bf6f732d1ca5f625ba375702121 Mon Sep 17 00:00:00 2001 -From: Andrew Childs <andrew.childs@bibo.com.ph> -Date: Sun, 15 Nov 2020 19:12:33 +0900 -Subject: [PATCH 1/2] Add useless descriptions to AC_DEFINE - -Removes autoheader warnings. ---- - configure.ac | 42 +++++++++++++++++++++--------------------- - 1 file changed, 21 insertions(+), 21 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 812b5ff..358ab89 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -210,48 +210,48 @@ AC_CHECK_MEMBERS([struct stat.st_flags]) - - AC_CHECK_SIZEOF(uid_t) - if test $ac_cv_sizeof_uid_t = "4"; then --AC_DEFINE(UID_STRING, RId32) --AC_DEFINE(UID_CAST, (uint32_t)) -+AC_DEFINE([UID_STRING], RId32, [UID_STRING]) -+AC_DEFINE([UID_CAST], (uint32_t), [UID_CAST]) - elif test $ac_cv_sizeof_uid_t = "8"; then --AC_DEFINE(UID_STRING, PRId64) --AC_DEFINE(UID_CAST, (uint64_t)) -+AC_DEFINE([UID_STRING], PRId64, [UID_STRING]) -+AC_DEFINE([UID_CAST], (uint64_t), [UID_CAST]) - else - AC_ERROR(can not detect the size of your system's uid_t type) - fi - - AC_CHECK_SIZEOF(gid_t) - if test $ac_cv_sizeof_gid_t = "4"; then --AC_DEFINE(GID_STRING, PRId32) --AC_DEFINE(GID_CAST, (uint32_t)) -+AC_DEFINE([GID_STRING], PRId32, [GID_STRING]) -+AC_DEFINE([GID_CAST], (uint32_t), [GID_CAST]) - elif test $ac_cv_sizeof_gid_t = "8"; then --AC_DEFINE(GID_STRING, PRId64) --AC_DEFINE(GID_CAST, (uint64_t)) -+AC_DEFINE([GID_STRING], PRId64, [GID_STRING]) -+AC_DEFINE([GID_CAST], (uint64_t), [GID_CAST]) - else - AC_ERROR(can not detect the size of your system's gid_t type) - fi - - AC_CHECK_SIZEOF(ino_t) - if test $ac_cv_sizeof_ino_t = "4"; then --AC_DEFINE(INO_STRING, PRId32) --AC_DEFINE(INO_HEXSTRING, PRIx32) --AC_DEFINE(INO_CAST, (uint32_t)) -+AC_DEFINE([INO_STRING], PRId32, [INO_STRING]) -+AC_DEFINE([INO_HEXSTRING], PRIx32, [INO_HEXSTRING]) -+AC_DEFINE([INO_CAST], (uint32_t), [INO_CAST]) - elif test $ac_cv_sizeof_ino_t = "8"; then --AC_DEFINE(INO_STRING, PRId64) --AC_DEFINE(INO_HEXSTRING, PRIx64) --AC_DEFINE(INO_CAST, (uint64_t)) -+AC_DEFINE([INO_STRING], PRId64, [INO_STRING]) -+AC_DEFINE([INO_HEXSTRING], PRIx64, [INO_HEXSTRING]) -+AC_DEFINE([INO_CAST], (uint64_t), [INO_CAST]) - else - AC_ERROR(can not detect the size of your system's ino_t type) - fi - - AC_CHECK_SIZEOF(dev_t) - if test $ac_cv_sizeof_dev_t = "4"; then --AC_DEFINE(DEV_STRING, PRId32) --AC_DEFINE(DEV_HEXSTRING, PRIx32) --AC_DEFINE(DEV_CAST, (uint32_t)) -+AC_DEFINE([DEV_STRING], PRId32, [DEV_STRING]) -+AC_DEFINE([DEV_HEXSTRING], PRIx32, [DEV_HEXSTRING]) -+AC_DEFINE([DEV_CAST], (uint32_t), [DEV_CAST]) - elif test $ac_cv_sizeof_dev_t = "8"; then --AC_DEFINE(DEV_STRING, PRId64) --AC_DEFINE(DEV_HEXSTRING, PRIx64) --AC_DEFINE(DEV_CAST, (uint64_t)) -+AC_DEFINE([DEV_STRING], PRId64, [DEV_STRING]) -+AC_DEFINE([DEV_HEXSTRING], PRIx64, [DEV_HEXSTRING]) -+AC_DEFINE([DEV_CAST], (uint64_t), [DEV_CAST]) - else - AC_ERROR(can not detect the size of your system's dev_t type) - fi -@@ -261,7 +261,7 @@ AC_CHECK_LIB(acl, acl_get_file) - dnl Check for paths - AC_PREFIX_DEFAULT(/usr/local) - --AC_CHECK_FUNC([asprintf], AC_DEFINE([HAVE_ASPRINTF])) -+AC_CHECK_FUNC([asprintf], AC_DEFINE([HAVE_ASPRINTF], [], [HAVE_ASPRINTF])) - - dnl - dnl Configure libxml2. --- -2.28.0 - diff --git a/pkgs/tools/compression/xar/0002-Use-pkg-config-for-libxml2.patch b/pkgs/tools/compression/xar/0002-Use-pkg-config-for-libxml2.patch deleted file mode 100644 index d71ad4b753c17..0000000000000 --- a/pkgs/tools/compression/xar/0002-Use-pkg-config-for-libxml2.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 276833851657c85651c053ee16b8e1a8dc768a50 Mon Sep 17 00:00:00 2001 -From: Andrew Childs <andrew.childs@bibo.com.ph> -Date: Sun, 15 Nov 2020 19:12:56 +0900 -Subject: [PATCH 2/2] Use pkg-config for libxml2 - ---- - configure.ac | 66 +++++++++------------------------------------------- - 1 file changed, 11 insertions(+), 55 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 358ab89..984a694 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -268,61 +268,17 @@ dnl Configure libxml2. - dnl - LIBXML2_VERSION_MIN=2.6.11 - --have_libxml2="1" -- --AC_ARG_WITH([xml2-config], [ --with-xml2-config libxml2 config program], --if test "x${with_xml2_config}" = "xno" ; then -- XML2_CONFIG= --else -- XML2_CONFIG="${with_xml2_config}" --fi --, -- XML2_CONFIG= --) --if test "x${XML2_CONFIG}" != "x" ; then -- if test ! -x "${XML2_CONFIG}" ; then -- AC_MSG_ERROR([Unusable or missing xml2-config: ${XML2_CONFIG}]) -- fi --else -- AC_PATH_PROG([XML2_CONFIG], [xml2-config], , [${PATH}]) -- if test "x${XML2_CONFIG}" = "x" ; then -- AC_MSG_ERROR([Cannot configure without xml2-config]) -- fi --fi -- --dnl Make sure the version of libxml2 found is sufficient. --AC_MSG_CHECKING([for libxml >= ${LIBXML2_VERSION_MIN}]) --LIBXML2_FOUND=`2>&1 ${XML2_CONFIG} --version` --LIBXML2_MAJOR=`echo ${LIBXML2_FOUND} | tr . " " | awk '{print $1}'` --LIBXML2_MINOR=`echo ${LIBXML2_FOUND} | tr . " " | awk '{print $2}' | tr a-z " " |awk '{print $1}'` --LIBXML2_BRANCH=`echo ${LIBXML2_FOUND} | tr . " " | awk '{print $3}' | tr a-z " " |awk '{print $1}'` --if test "x${LIBXML2_BRANCH}" = "x" ; then -- LIBXML2_BRANCH=0 --fi --LIBXML2_MAJOR_MIN=`echo ${LIBXML2_VERSION_MIN} | tr . " " | awk '{print $1}'` --LIBXML2_MINOR_MIN=`echo ${LIBXML2_VERSION_MIN} | tr . " " | awk '{print $2}'` --LIBXML2_BRANCH_MIN=`echo ${LIBXML2_VERSION_MIN} | tr . " " | awk '{print $3}'` --if test ${LIBXML2_MAJOR} -gt ${LIBXML2_MAJOR_MIN} \ -- -o ${LIBXML2_MAJOR} -eq ${LIBXML2_MAJOR_MIN} \ -- -a ${LIBXML2_MINOR} -gt ${LIBXML2_MINOR_MIN} \ -- -o ${LIBXML2_MAJOR} -eq ${LIBXML2_MAJOR_MIN} \ -- -a ${LIBXML2_MINOR} -eq ${LIBXML2_MINOR_MIN} \ -- -a ${LIBXML2_BRANCH} -ge $LIBXML2_BRANCH_MIN ; then -- AC_MSG_RESULT([${LIBXML2_MAJOR}.${LIBXML2_MINOR}.${LIBXML2_BRANCH}]) -- have_libxml2="1" -- CPPFLAGS="${CPPFLAGS} `${XML2_CONFIG} --cflags`" -- LIBS="${LIBS} `${XML2_CONFIG} --libs`" --else -- AC_MSG_RESULT([no]) -- have_libxml2="0" --fi --if test "x${have_libxml2}" = "x1" ; then -- dnl Final sanity check, to make sure that xmlwriter is present. -- AC_CHECK_HEADER([libxml/xmlwriter.h], , [have_libxml2="0"]) --fi --if test "x${have_libxml2}" = "x0" ; then -- AC_MSG_ERROR([Cannot build without libxml2]) --fi -+PKG_PROG_PKG_CONFIG -+ -+PKG_CHECK_MODULES(LIBXML2_PKGCONFIG, [libxml-2.0 >= ${LIBXML2_VERSION_MIN}], -+ [ -+ have_libxml2=1 -+ CPPFLAGS="${CPPFLAGS} ${LIBXML2_PKGCONFIG_CFLAGS}" -+ LIBS="${LIBS} ${LIBXML2_PKGCONFIG_LIBS}" -+ ], -+ [ -+ have_libxml2=0 -+ ]) - - dnl - dnl Configure libcrypto (part of OpenSSL). --- -2.28.0 - diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix deleted file mode 100644 index 9c03c41054be9..0000000000000 --- a/pkgs/tools/compression/xar/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, xz, openssl, zlib, bzip2, fts, autoreconfHook }: - -stdenv.mkDerivation rec { - version = "1.6.1"; - pname = "xar"; - - src = fetchurl { - url = "https://github.com/downloads/mackyle/xar/${pname}-${version}.tar.gz"; - sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libxml2 xz openssl zlib bzip2 fts ]; - - patches = [ - ./0001-Add-useless-descriptions-to-AC_DEFINE.patch - ./0002-Use-pkg-config-for-libxml2.patch - ]; - - postPatch = '' - substituteInPlace configure.ac \ - --replace 'OpenSSL_add_all_ciphers' 'OPENSSL_init_crypto' \ - --replace 'openssl/evp.h' 'openssl/crypto.h' - ''; - - configureFlags = lib.optional (fts != null) "LDFLAGS=-lfts"; - - meta = { - homepage = "https://mackyle.github.io/xar/"; - description = "Extensible Archiver"; - - longDescription = - '' The XAR project aims to provide an easily extensible archive format. - Important design decisions include an easily extensible XML table of - contents for random access to archived files, storing the toc at the - beginning of the archive to allow for efficient handling of streamed - archives, the ability to handle files of arbitrarily large sizes, the - ability to choose independent encodings for individual files in the - archive, the ability to store checksums for individual files in both - compressed and uncompressed form, and the ability to query the table - of content's rich meta-data. - ''; - - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ copumpkin ]; - platforms = lib.platforms.all; - mainProgram = "xar"; - }; -} diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index ba5fb90c1360e..f9d3a3d074c90 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = lib.optional stdenv.hostPlatform.isUnix bash; patches = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { substituteInPlace build/cmake/tests/CMakeLists.txt \ --replace 'libzstd_static' 'libzstd_shared' sed -i \ - "1aexport ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/build_/lib" \ + "1aexport ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/build_/lib" \ tests/playTests.sh ''; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString buildContrib ( '' cp contrib/pzstd/pzstd $bin/bin/pzstd - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change @rpath/libzstd.1.dylib $out/lib/libzstd.1.dylib $bin/bin/pzstd '' ); diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index af4e20ac55ee2..c56a4b189e152 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # # $ tar xf "$(nix-build -A aefs.src)" # $ grep -R FUSE_USE_VERSION - configureFlags = lib.optional stdenv.isDarwin "CPPFLAGS=-DFUSE_USE_VERSION=26"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "CPPFLAGS=-DFUSE_USE_VERSION=26"; nativeBuildInputs = [ autoreconfHook git ]; @@ -37,6 +37,6 @@ stdenv.mkDerivation { maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index b5fe1a4e85eae..78d60b90b3955 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake readline pkg-config wrapQtAppsHook ]; buildInputs = [ fuse qtbase qttools ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/*.app $out/Applications ''; diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix index 5881d361c5495..88b2c5d3e6240 100644 --- a/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "/usr/local/lib/libosxfuse.dylib" "fuse" ''; @@ -20,14 +20,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ - (if stdenv.isDarwin then fuse else fuse3) + (if stdenv.hostPlatform.isDarwin then fuse else fuse3) bzip2 zlib - ] ++ lib.optional stdenv.isLinux attr; + ] ++ lib.optional stdenv.hostPlatform.isLinux attr; - cmakeFlags = lib.optional stdenv.isDarwin "-DUSE_FUSE3=OFF"; + cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DUSE_FUSE3=OFF"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DUSE_FUSE2"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DUSE_FUSE2"; postFixup = '' ln -s $out/bin/apfs-fuse $out/bin/mount.fuse.apfs-fuse diff --git a/pkgs/tools/filesystems/bees/bees-service-wrapper b/pkgs/tools/filesystems/bees/bees-service-wrapper index 67c95e8f80315..ad72c1d95e9d5 100755 --- a/pkgs/tools/filesystems/bees/bees-service-wrapper +++ b/pkgs/tools/filesystems/bees/bees-service-wrapper @@ -1,7 +1,3 @@ -#!@bash@/bin/bash -PATH=@bash@/bin:@coreutils@/bin:@utillinux@/bin:@btrfsProgs@/bin:$PATH -beesd_bin=@bees@/lib/bees/bees -# PLEASE KEEP NIX-ISMS ABOVE THIS LINE TO EASE UPSTREAM MERGE #!/usr/bin/env bash shopt -s extglob diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index 1dbb62ccb1b23..a014f449079c4 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -1,82 +1,76 @@ { lib -, stdenv -, runCommand , fetchFromGitHub -, bash +, makeWrapper +, nixosTests + +, stdenv +# Build inputs , btrfs-progs -, coreutils -, python3Packages , util-linux -, nixosTests +, python3Packages +# bees-service-wrapper +, bash +, coreutils }: -let - - bees = stdenv.mkDerivation rec { - pname = "bees"; - version = "0.10"; - - src = fetchFromGitHub { - owner = "Zygo"; - repo = "bees"; - rev = "v${version}"; - hash = "sha256-f3P3BEd8uO6QOZ1/2hBzdcuOSggYvHxW3g9pGftKO8g="; - }; +stdenv.mkDerivation rec { + pname = "bees"; + version = "0.10"; - buildInputs = [ - btrfs-progs # for btrfs/ioctl.h - util-linux # for uuid.h - ]; + src = fetchFromGitHub { + owner = "Zygo"; + repo = "bees"; + rev = "v${version}"; + hash = "sha256-f3P3BEd8uO6QOZ1/2hBzdcuOSggYvHxW3g9pGftKO8g="; + }; - nativeBuildInputs = [ - python3Packages.markdown # documentation build - ]; + buildInputs = [ + btrfs-progs # for btrfs/ioctl.h + util-linux # for uuid.h + ]; - preBuild = '' - git() { if [[ $1 = describe ]]; then echo ${version}; else command git "$@"; fi; } - export -f git - ''; + nativeBuildInputs = [ + makeWrapper + python3Packages.markdown # documentation build + ]; - postBuild = '' - unset -f git - ''; + preBuild = '' + git() { if [[ $1 = describe ]]; then echo ${version}; else command git "$@"; fi; } + export -f git + ''; - buildFlags = [ - "ETC_PREFIX=/var/run/bees/configs" - ]; + postBuild = '' + unset -f git + ''; - makeFlags = [ - "SHELL=bash" - "PREFIX=$(out)" - "ETC_PREFIX=$(out)/etc" - "BEES_VERSION=${version}" - "SYSTEMD_SYSTEM_UNIT_DIR=$(out)/etc/systemd/system" - ]; + postInstall = '' + makeWrapper ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper \ + --prefix PATH : ${lib.makeBinPath [ bash coreutils util-linux btrfs-progs ]} \ + --set beesd_bin "$out"/lib/bees/bees + ''; - meta = with lib; { - homepage = "https://github.com/Zygo/bees"; - description = "Block-oriented BTRFS deduplication service"; - longDescription = "Best-Effort Extent-Same: bees finds not just identical files, but also identical extents within files that differ"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ chaduffy ]; - }; - }; + buildFlags = [ + "ETC_PREFIX=/var/run/bees/configs" + ]; -in + makeFlags = [ + "SHELL=bash" + "PREFIX=$(out)" + "ETC_PREFIX=$(out)/etc" + "BEES_VERSION=${version}" + "SYSTEMD_SYSTEM_UNIT_DIR=$(out)/etc/systemd/system" + ]; -(runCommand "bees-service" - { - inherit bash bees coreutils; - utillinux = util-linux; # needs to be a valid shell variable name - btrfsProgs = btrfs-progs; # needs to be a valid shell variable name - } '' - mkdir -p -- "$out/bin" - substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper - chmod +x "$out"/bin/bees-service-wrapper - ln -s ${bees}/bin/beesd "$out"/bin/beesd -'').overrideAttrs { passthru.tests = { smoke-test = nixosTests.bees; }; + + meta = with lib; { + homepage = "https://github.com/Zygo/bees"; + description = "Block-oriented BTRFS deduplication service"; + longDescription = "Best-Effort Extent-Same: bees finds not just identical files, but also identical extents within files that differ"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ chaduffy ]; + }; } diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index a8013bd8600b6..f086e9416ad6e 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = if stdenv.isDarwin then [ fuse ] else [ fuse3 ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ fuse ] else [ fuse3 ]; - configureFlags = lib.optional stdenv.isDarwin "--disable-macos-fs-link"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--disable-macos-fs-link"; postFixup = '' ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 04106ee68b314..b12966541c997 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { buildFlags = [ "static" "CC=${stdenv.cc.targetPrefix}cc" - ] ++ lib.optional stdenv.isDarwin "CFLAGS=-D_BSD_SOURCE"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "CFLAGS=-D_BSD_SOURCE"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 07d34c2af19cc..6bbd9cae1f43a 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.10.1"; + version = "6.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-JWhGlrxbXQfJjxnUv3pItTq5SHDKTEaKaK89+eLIo14="; + hash = "sha256-/5rpFSEwOpDYfhxL4jDwEh85xE3b5Swq6uJjxv7PoJk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index e4f0bae9b27b9..e5beaf3841dfc 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -382,7 +382,7 @@ in rec { utf8proc zlib zstd - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ keyutils libcap_ng liburing @@ -457,7 +457,7 @@ in rec { "-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF" # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}'' - ] ++ lib.optional stdenv.isLinux "-DWITH_SYSTEM_LIBURING=ON"; + ] ++ lib.optional stdenv.hostPlatform.isLinux "-DWITH_SYSTEM_LIBURING=ON"; preBuild = # The legacy-option-headers target is not correctly empbedded in the build graph. diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix index 8583cce73daef..4da68dfb751bb 100644 --- a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix +++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ] @@ -107,7 +107,7 @@ buildPythonPackage rec { # save compute time by not running benchmarks "tests/bench" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # aarch64-darwin forbids W+X memory, but this tests depends on it: # * https://cffi.readthedocs.io/en/latest/using.html#callbacks "tests/hazmat/backends/test_openssl_memleak.py" diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 588dcb320aa5b..52444e56cb05c 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; # ++ lib.optional doCheck "-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"; # macFUSE needs to be installed for the test to succeed on Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 7b3760ba5aa2e..06a86a74b523d 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse curl glib zlib ]; - CFLAGS = lib.optionalString stdenv.isDarwin "-D__off_t=off_t"; + CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D__off_t=off_t"; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix the build on macOS with macFUSE installed. Needs autoreconfHook for # this change to effect substituteInPlace configure.ac --replace \ diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index eda54d341f9a7..0305e65146404 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; # configure.ac:75: error: required file './config.rpath' not found # https://github.com/dosfstools/dosfstools/blob/master/autogen.sh diff --git a/pkgs/tools/filesystems/dupe-krill/Cargo.lock b/pkgs/tools/filesystems/dupe-krill/Cargo.lock deleted file mode 100644 index 98c3d7157a1a6..0000000000000 --- a/pkgs/tools/filesystems/dupe-krill/Cargo.lock +++ /dev/null @@ -1,339 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "blake3" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", - "digest", -] - -[[package]] -name = "block-buffer" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -dependencies = [ - "generic-array", -] - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[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 = "ctrlc" -version = "3.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173" -dependencies = [ - "nix", - "winapi", -] - -[[package]] -name = "digest" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "dupe-krill" -version = "1.4.8" -dependencies = [ - "blake3", - "ctrlc", - "getopts", - "serde", - "serde_derive", - "serde_json", - "smallvec", - "tempdir", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "itoa" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "libc" -version = "0.2.135" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" - -[[package]] -name = "nix" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "libc", -] - -[[package]] -name = "proc-macro2" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "serde" -version = "1.0.145" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" - -[[package]] -name = "serde_derive" -version = "1.0.145" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand", - "remove_dir_all", -] - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/tools/filesystems/dupe-krill/default.nix b/pkgs/tools/filesystems/dupe-krill/default.nix index 7c2594a8adef7..be0b3cc5ff37f 100644 --- a/pkgs/tools/filesystems/dupe-krill/default.nix +++ b/pkgs/tools/filesystems/dupe-krill/default.nix @@ -8,13 +8,10 @@ rustPlatform.buildRustPackage rec { owner = "kornelski"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ceeKG45OQLxiYcwq2Kumbpd+lkyY+W/og1/6Zdpd3zo="; - postFetch = '' - cp ${./Cargo.lock} $out/Cargo.lock - ''; + hash = "sha256-ze9OQHNtujzn2rY24bmFUkz5AYsjoMrwqm4jyQoF53Y="; }; - cargoHash = "sha256-jEMvvFOcFij4lT/5Y5xARaVURT/evV9u1Vkqtm4al+g="; + cargoHash = "sha256-9/TSmw0XEnEURgrT6Oy3nqnNkmXUHLr0InlKyg4m9sQ="; meta = with lib; { description = "Fast file deduplicator"; diff --git a/pkgs/tools/filesystems/dwarfs/default.nix b/pkgs/tools/filesystems/dwarfs/default.nix index 719ccd1e23d21..50c2121997dae 100644 --- a/pkgs/tools/filesystems/dwarfs/default.nix +++ b/pkgs/tools/filesystems/dwarfs/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, stdenv, - substituteAll, bison, boost, cmake, diff --git a/pkgs/tools/filesystems/dysk/default.nix b/pkgs/tools/filesystems/dysk/default.nix index de64684efa02d..5d447e4eccbc6 100644 --- a/pkgs/tools/filesystems/dysk/default.nix +++ b/pkgs/tools/filesystems/dysk/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "dysk"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "Canop"; repo = "dysk"; rev = "v${version}"; - hash = "sha256-EXP9uI98NXP1VRlhEaMTkJsAYVT9DpMFwquAVMoyjxU="; + hash = "sha256-PGl2pUeLPznut/ETJdaQlin9thDBPvqBE30cgXwV+KM="; }; - cargoHash = "sha256-N51M9uEMfcoNyR8r76bd0PW2jSQTpU/0V+cEl82gFqk="; + cargoHash = "sha256-ppOAQ6Y9GJNLwGbbg1qfQ7ArVKiYxt26oEEWMOjbu0w="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index b8443e8ac8800..4d0849b896d09 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo -, withFuse ? stdenv.isLinux, fuse3 +, withFuse ? stdenv.hostPlatform.isLinux, fuse3 , shared ? !stdenv.hostPlatform.isStatic , e2fsprogs, runCommand }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; configureFlags = - if stdenv.isLinux then [ + if stdenv.hostPlatform.isLinux then [ # It seems that the e2fsprogs is one of the few packages that cannot be # build with shared and static libs. (if shared then "--enable-elf-shlibs" else "--disable-elf-shlibs") diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index 3946523ccb10d..93e6fd18f9844 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -10,7 +10,7 @@ xz, zlib, libselinux, - fuseSupport ? stdenv.isLinux, + fuseSupport ? stdenv.hostPlatform.isLinux, selinuxSupport ? false, lzmaSupport ? false, }: diff --git a/pkgs/tools/filesystems/exfatprogs/default.nix b/pkgs/tools/filesystems/exfatprogs/default.nix index 3fdfa10907a98..66505d82b7ecd 100644 --- a/pkgs/tools/filesystems/exfatprogs/default.nix +++ b/pkgs/tools/filesystems/exfatprogs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exfatprogs"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-SrkRPDyASXpUAKapwcfaJSlUJBcVNtYZltdPzuhpvYM="; + sha256 = "sha256-EqSzveqLb0Ms7D5Pczoh0BuKD1sILzAbJMnDLacokl4="; }; nativeBuildInputs = [ pkg-config autoreconfHook file ]; diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index ebdedd5b4aa34..04430fc23ee41 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { done ''; - buildInputs = lib.optionals stdenv.isLinux [ systemd parted ] - ++ lib.optionals stdenv.isDarwin [ argp-standalone ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd parted ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone ]; buildFlags = [ "all" # f3read, f3write ] - ++ lib.optional stdenv.isLinux "extra"; # f3brew, f3fix, f3probe + ++ lib.optional stdenv.hostPlatform.isLinux "extra"; # f3brew, f3fix, f3probe installFlags = [ "PREFIX=${placeholder "out"}" @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" ] - ++ lib.optional stdenv.isLinux "install-extra"; + ++ lib.optional stdenv.hostPlatform.isLinux "install-extra"; postInstall = '' install -Dm555 -t $out/bin f3write.h2w log-f3wr diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix index 8bc7a899cd3ba..e2e1eccae216b 100644 --- a/pkgs/tools/filesystems/file-rename/default.nix +++ b/pkgs/tools/filesystems/file-rename/default.nix @@ -20,7 +20,7 @@ perlPackages.buildPerlPackage { --replace "#!${perl}/bin/perl" "#!${perl}/bin/perl -I $out/${perl.libPrefix}" ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Perl extension for renaming multiple files"; diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 962685c2d537e..34f9da67ae649 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -11,7 +11,7 @@ , nixosTests }: let - generic = { version, sha256, cargoHash, cargoPatches ? [], eol ? false, broken ? false }: rustPlatform.buildRustPackage { + generic = { version, hash, cargoHash, cargoPatches ? [], eol ? false, broken ? false }: rustPlatform.buildRustPackage { pname = "garage"; inherit version; @@ -20,7 +20,7 @@ let owner = "Deuxfleurs"; repo = "garage"; rev = "v${version}"; - inherit sha256; + inherit hash; }; postPatch = '' @@ -35,7 +35,7 @@ let buildInputs = [ openssl - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; checkInputs = [ cacert @@ -96,33 +96,32 @@ rec { garage_0_8_7 = generic { version = "0.8.7"; - sha256 = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc="; + hash = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc="; cargoHash = "sha256-1cGlJP/RRgxt3GGMN1c+7Y5lLHJyvHEnpLsR35R5FfI="; cargoPatches = [ ./update-time-0.8.patch ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; - garage_0_8 = garage_0_8_7; - garage_0_9_4 = generic { version = "0.9.4"; - sha256 = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk="; + hash = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk="; cargoHash = "sha256-1Hrip4R5dr31czOcFMGW4ZvVfVwvdd7LkwukwNpS3o4="; cargoPatches = [ ./update-time.patch ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; - garage_1_0_0 = generic { - version = "1.0.0"; - sha256 = "sha256-5W5cXylFCrDup+HOOUVPWBJUSphOp8szgtpvRIv82b8="; - cargoHash = "sha256-zol9P01bwlvl1Wap4EekgVpC45izNCt2uKs7x+EEA/E="; - cargoPatches = [ ./update-time.patch ]; - broken = stdenv.isDarwin; + garage_1_0_1 = generic { + version = "1.0.1"; + hash = "sha256-f6N2asycN04I6U5XQ5LEAqYu/v5jYZiFCxZ8YQ32XyM="; + cargoHash = "sha256-jpc/vaygC5WNSkVA3P01mCRk9Nx/CUumE893tHWoe34="; + broken = stdenv.hostPlatform.isDarwin; }; + garage_0_8 = garage_0_8_7; + garage_0_9 = garage_0_9_4; - garage_1_x = garage_1_0_0; + garage_1_x = garage_1_0_1; garage = garage_1_x; } diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index 8de22d3efcdf8..3e6ae58049bda 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://git.pengutronix.de/cgit/genimage"; description = "Generate filesystem images from directory trees"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 4a1341dce7b0b..26655053574e5 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { homepage = "https://github.com/hanwen/go-mtpfs"; license = licenses.bsd3; maintainers = [ ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "go-mtpfs"; }; } diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/tools/filesystems/goofys/default.nix index c8840e0fd3bc8..06039d529d56b 100644 --- a/pkgs/tools/filesystems/goofys/default.nix +++ b/pkgs/tools/filesystems/goofys/default.nix @@ -30,7 +30,7 @@ buildGoModule { description = "High-performance, POSIX-ish Amazon S3 file system written in Go"; license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.adisbladis ]; - broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 + 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/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index 33edc0e4a05ba..c2e09220a9572 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -27,15 +27,13 @@ "-DCPACK_GENERATOR=TGZ" "-DCMAKE_CXX_FLAGS=-I${lib.getDev libcxx}/include/c++/v1" "-DPAM_LIBRARY=${pam}/lib/libpam.so" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DIRODS_HOME_DIRECTORY=${placeholder "out"}" + "-DCMAKE_INSTALL_SBINDIR=${placeholder "out"}/sbin" ]; postPatch = '' patchShebangs ./packaging ./scripts - export cmakeFlags="$cmakeFlags - -DCMAKE_INSTALL_PREFIX=$out - -DIRODS_HOME_DIRECTORY=$out - -DCMAKE_INSTALL_SBINDIR=$out/sbin - " ''; meta = with lib; { diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 5db0ed453eaba..beddb6959ba49 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -32,6 +32,12 @@ rec { # fix build with recent llvm versions env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations"; + cmakeFlags = common.cmakeFlags or [ ] ++ [ + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib" + "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib" + "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib" + ]; + postPatch = common.postPatch + '' patchShebangs ./test substituteInPlace plugins/database/CMakeLists.txt --replace-fail "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp" @@ -39,11 +45,6 @@ rec { do substituteInPlace $file --replace-quiet "CATCH2}/include" "CATCH2}/include/catch2" done - export cmakeFlags="$cmakeFlags - -DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,$out/lib - -DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,$out/lib - -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,$out/lib - " substituteInPlace server/auth/CMakeLists.txt --replace-fail SETUID "" ''; diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 2bca01f54527c..9b50d87d99205 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "juicefs"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - hash = "sha256-qPdrcWCD8BYwRwnynNhcti7eUskgHP1kAS6KiS0LHsc="; + hash = "sha256-qTJU5o0wjHu3M8zMwMm6/QTAqD2JvCg9XnxfW77MCoI="; }; - vendorHash = "sha256-tKbn/dFnYTc0fYwYUrrpdN1hzx047yQSFdTG94CifhM="; + vendorHash = "sha256-y5ao4C24Py8NmZLZlpoz3C7TvUe5vsI74QdzQ7LAh6o="; excludedPackages = [ "sdk/java/libjfs" ]; diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 4f5524d6734c2..ae0c653f0a176 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -1,42 +1,50 @@ -{ lib, stdenv -, fetchFromGitHub -, python3 -, fuse -, pkg-config -, libpcap -, zlib -, nixosTests +{ + lib, + stdenv, + fetchFromGitHub, + python3, + fuse, + pkg-config, + libpcap, + zlib, + nixosTests, }: stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.118"; + version = "4.56.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Sm32VwKlE0V5HZj+VXr66gYKS+fcU1+UVQELiZ64DpU="; + sha256 = "sha256-/ZvOwPE8SIwAbGITggzYwGuU1nAFIv0zF1IYu6FHGN8="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ fuse libpcap zlib python3 ]; + buildInputs = [ + fuse + libpcap + zlib + python3 + ]; strictDeps = true; - buildFlags = lib.optionals stdenv.isDarwin [ "CPPFLAGS=-UHAVE_STRUCT_STAT_ST_BIRTHTIME" ]; + buildFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + "CPPFLAGS=-UHAVE_STRUCT_STAT_ST_BIRTHTIME" + ]; # Fix the build on macOS with macFUSE installed - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace \ "/usr/local/lib/pkgconfig" "/nonexistent" ''; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.h --replace \ "#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1" \ "#undef HAVE_STRUCT_STAT_ST_BIRTHTIME" @@ -48,13 +56,18 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.tests = { inherit (nixosTests) moosefs; }; + passthru.tests = { + inherit (nixosTests) moosefs; + }; - meta = with lib; { + meta = { homepage = "https://moosefs.com"; description = "Open Source, Petabyte, Fault-Tolerant, Highly Performing, Scalable Network Distributed File System"; - platforms = platforms.unix; - license = licenses.gpl2Only; - maintainers = [ maintainers.mfossen ]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ + mfossen + markuskowa + ]; }; } diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 80ce88836e348..3214694e52904 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { downloadPage = "https://git.infradead.org/mtd-utils.git"; license = licenses.gpl2Plus; homepage = "http://www.linux-mtd.infradead.org/"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ skeuchel ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index ef5eafc405081..d243d6cb71ef5 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.44"; + version = "4.0.45"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - hash = "sha256-N9xN8CJTPD1LLsHHiXPCfH6LWFN0wtRqtkxqPbMe3bg="; + hash = "sha256-CwCKlr0O/g5UL6Q4PUaa9mvEqTOUmQsQNzCoFgpn1hg="; }; - patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; + patches = lib.optional stdenv.hostPlatform.isDarwin ./UNUSED-darwin.patch; # fails to find X on darwin - configureFlags = lib.optional stdenv.isDarwin "--without-x"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--without-x"; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; doCheck = true; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index d84f9cc9b9b13..a0ca5e5a82aa0 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.gpl3; maintainers = [ maintainers.qknight ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mtpfs.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mtpfs.x86_64-darwin mainProgram = "mtpfs"; }; } diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 56d6bdc7fba2e..5a9426cee486c 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ] - ++ lib.optionals stdenv.isDarwin [ macfuse-stubs DiskArbitration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ macfuse-stubs DiskArbitration ]; # Note: libgcrypt is listed here non-optionally because its m4 macros are # being used in ntfs-3g's configure.ac. @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "--enable-extras" "--with-mount-helper=${mount}/bin/mount" "--with-umount-helper=${mount}/bin/umount" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-modprobe-helper=${kmod}/bin/modprobe" ]; diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix deleted file mode 100644 index f8d66683fccbf..0000000000000 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchurl -, xz -, lzo -, zlib -, zstd -, lz4 -, lz4Support ? false -}: - -let - patch = fetchFromGitHub - { - # NOTE: This uses my personal fork for now, until - # https://github.com/devttys0/sasquatch/pull/40 is merged. - # I, cole-h, will keep this fork available until that happens. - owner = "cole-h"; - repo = "sasquatch"; - rev = "6edc54705454c6410469a9cb5bc58e412779731a"; - sha256 = "x+PuPYGD4Pd0fcJtlLWByGy/nggsmZkxwSXxJfPvUgo="; - } + "/patches/patch0.txt"; -in -stdenv.mkDerivation rec { - pname = "sasquatch"; - version = "4.4"; - - src = fetchurl { - url = "mirror://sourceforge/squashfs/squashfs${version}.tar.gz"; - sha256 = "qYGz8/IFS1ouZYhRo8BqJGCtBKmopkXgr+Bjpj/bsH4="; - }; - - buildInputs = [ - xz - lzo - zlib - zstd - ] - ++ lib.optionals lz4Support [ lz4 ]; - - patches = [ patch ]; - patchFlags = [ "-p0" ]; - - postPatch = '' - # Drop blanket -Werror to avoid build failure on fresh toolchains - # like gcc-11. - substituteInPlace squashfs-tools/Makefile --replace ' -Werror' ' ' - cd squashfs-tools - ''; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: unsquashfs_xattr.o:/build/squashfs4.4/squashfs-tools/error.h:34: multiple definition of - # `verbose'; unsquashfs.o:/build/squashfs4.4/squashfs-tools/error.h:34: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - installFlags = [ "INSTALL_DIR=\${out}/bin" ]; - - makeFlags = [ - "XZ_SUPPORT=1" - "CC=${stdenv.cc.targetPrefix}cc" - "CXX=${stdenv.cc.targetPrefix}c++" - "AR=${stdenv.cc.targetPrefix}ar" - ] - ++ lib.optional lz4Support "LZ4_SUPPORT=1"; - - meta = with lib; { - homepage = "https://github.com/devttys0/sasquatch"; - description = "Set of patches to the standard unsquashfs utility (part of squashfs-tools) that attempts to add support for as many hacked-up vendor-specific SquashFS implementations as possible"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.pamplemousse ]; - platforms = platforms.linux; - mainProgram = "sasquatch"; - }; -} diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 83353394e0090..dfad444a3b716 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -20,17 +20,15 @@ stdenv.mkDerivation rec { VERSION = version; - doCheck = !(stdenv.isDarwin && stdenv.isx86_64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); nativeBuildInputs = [ autoreconfHook makeWrapper ]; - buildInputs = [ ]; - # SMART is only supported on Linux and requires the smartmontools package - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/snapraid \ --prefix PATH : ${lib.makeBinPath [ smartmontools ]} ''; diff --git a/pkgs/tools/filesystems/ssdfs-utils/default.nix b/pkgs/tools/filesystems/ssdfs-utils/default.nix index 8a80d362c902b..1f5127ae5ac49 100644 --- a/pkgs/tools/filesystems/ssdfs-utils/default.nix +++ b/pkgs/tools/filesystems/ssdfs-utils/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.40"; + version = "4.45"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "5f121f793e344cbbe98764b0a5758511da8c3d23"; - hash = "sha256-VSHs8BBp+n7jbr9KtTXykpUZbTfc999eYA5wtFsmMdY="; + rev = "f78ebf2a19eb338ae6858aa4f28133b117507df7"; + hash = "sha256-RKVcXZakYDd7Vfd1w0pNs9/oMRzvzRr8VabpUBRcKc8="; }; strictDeps = true; diff --git a/pkgs/tools/filesystems/sshfs-fuse/common.nix b/pkgs/tools/filesystems/sshfs-fuse/common.nix index 932c7693dc88f..3654c77cc4b86 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/common.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/common.nix @@ -8,7 +8,7 @@ }: let - fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; + fuse = if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse3; in stdenv.mkDerivation rec { pname = "sshfs-fuse"; inherit version; @@ -33,12 +33,12 @@ in stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/sbin ln -sf $out/bin/sshfs $out/sbin/mount.sshfs - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapProgram $out/bin/sshfs --prefix PATH : "${openssh}/bin" ''; # doCheck = true; - checkPhase = lib.optionalString (!stdenv.isDarwin) '' + checkPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The tests need fusermount: mkdir bin cp ${fuse}/bin/fusermount3 bin/fusermount diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 2f11bb0047adf..bc836ac3abada 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, callPackage, fetchpatch }: let mkSSHFS = args: callPackage (import ./common.nix args) { }; -in if stdenv.isDarwin then +in if stdenv.hostPlatform.isDarwin then mkSSHFS { version = "2.10"; # macFUSE isn't yet compatible with libfuse 3.x sha256 = "1dmw4kx6vyawcywiv8drrajnam0m29mxfswcp4209qafzx3mjlp1"; diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 0c837e14cc448..d6f532643d00f 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit pname version src; + inherit src; hash = "sha256-1KzOKo5Q1uBqO3aCBYUJJxla4873AzrwoFPaNpKKFJU="; }; diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index 8aa66de8da3fd..2f0e32799d800 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # # $ tar xf "$(nix-build -A svnfs.src)" # $ grep -R FUSE_USE_VERSION - configureFlags = lib.optionals stdenv.isDarwin [ "CFLAGS=-DFUSE_USE_VERSION=25" ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CFLAGS=-DFUSE_USE_VERSION=25" ]; # why is this required? preConfigure='' diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index 30ab2663a6459..a4173de6cb227 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.12.6"; + version = "0.12.7"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-bgYF1CY5LVZz9dVFjLSMqb8k+kU6AuGRgPbCZ8uI3KA="; + sha256 = "sha256-ObNBeHmQ4VqnZdUbKxLxuXeRw2jVPQxroO2HK4Wp8tg="; }; sourceRoot = "${src.name}/cmd/tar2ext4"; diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index 4dc9ca9de6e6f..2518cfb24ba30 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./prevent-kill-on-shutdown.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace '/usr/local/include/osxfuse/fuse' '${fuse}/include/fuse' ''; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # # This must be done in preConfigure because the build process removes # helper from the source directory during the build. - preConfigure = lib.optionalString (!stdenv.isDarwin) '' + preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p $out/sbin cp -a mount.unionfs $out/sbin/mount.unionfs-fuse substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse}/sbin/mount.fuse @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "FUSE UnionFS implementation"; homepage = "https://github.com/rpodgorny/unionfs-fuse"; license = licenses.bsd3; diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index 3f8897c091bc8..9c1b68cc63072 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [fuse glib neon]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix the build on macOS with macFUSE installed. Needs autoreconfHook to # take effect. substituteInPlace configure.ac --replace \ diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 5020a7facf430..a95309053ad05 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://xfs.org/"; + homepage = "https://xfs.wiki.kernel.org"; description = "SGI XFS utilities"; license = with licenses; [ gpl2Only lgpl21 gpl3Plus ]; # see https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/debian/copyright platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index ad3c44faf6165..6e7a19ad8ee87 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }: let - p = if stdenv.is64bit then { + p = if stdenv.hostPlatform.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; sha256 = "sha256-HH/pLZmDr6m/B3e6MHafDGnNWR83oR2y1ijVMR/LOF0="; diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index 7416d4f717ab9..5ed670a77de6f 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -92,7 +92,7 @@ in rustPlatform.buildRustPackage rec { homepage = "https://github.com/casperstorm/ajour"; changelog = "https://github.com/casperstorm/ajour/blob/master/CHANGELOG.md"; license = licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ hexa ]; }; } diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix index e4d773684343e..6ea5f168a8f4b 100644 --- a/pkgs/tools/games/pokefinder/default.nix +++ b/pkgs/tools/games/pokefinder/default.nix @@ -42,10 +42,10 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' mkdir -p $out/Applications cp -R Source/PokeFinder.app $out/Applications - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -D Source/PokeFinder $out/bin/PokeFinder mkdir -p $out/share/pixmaps convert "$src/Source/Form/Images/pokefinder.ico[-1]" $out/share/pixmaps/pokefinder.png @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = [ cmake wrapQtAppsHook python3 ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems imagemagick ]; + nativeBuildInputs = [ cmake wrapQtAppsHook python3 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems imagemagick ]; desktopItems = [ (makeDesktopItem { @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ qtbase qttools ] - ++ lib.optionals stdenv.isLinux [ qtwayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/tools/games/ps3-disc-dumper/default.nix b/pkgs/tools/games/ps3-disc-dumper/default.nix index 18918345b2b2c..ad875b1987433 100644 --- a/pkgs/tools/games/ps3-disc-dumper/default.nix +++ b/pkgs/tools/games/ps3-disc-dumper/default.nix @@ -21,6 +21,12 @@ buildDotnetModule rec { projectFile = "UI.Console/UI.Console.csproj"; nugetDeps = ./deps.nix; + preConfigureNuGet = '' + # This should really be in the upstream nuget.config + dotnet nuget add source https://api.nuget.org/v3/index.json \ + -n nuget.org --configfile nuget.config + ''; + runtimeDeps = [ zlib openssl diff --git a/pkgs/tools/games/scarab/default.nix b/pkgs/tools/games/scarab/default.nix index 11ec9e7cdd027..617f8f0e87b27 100644 --- a/pkgs/tools/games/scarab/default.nix +++ b/pkgs/tools/games/scarab/default.nix @@ -1,17 +1,14 @@ -{ lib -, buildDotnetModule -, fetchFromGitHub -, glibc -, zlib -, libX11 -, libICE -, libSM -, fontconfig -, gtk3 -, copyDesktopItems -, icoutils -, wrapGAppsHook3 -, makeDesktopItem +{ + lib, + buildDotnetModule, + fetchFromGitHub, + glibc, + zlib, + gtk3, + copyDesktopItems, + icoutils, + wrapGAppsHook3, + makeDesktopItem, }: buildDotnetModule rec { @@ -26,16 +23,19 @@ buildDotnetModule rec { }; nugetDeps = ./deps.nix; - projectFile = "Scarab.sln"; + projectFile = "Scarab/Scarab.csproj"; + testProjectFile = "Scarab.Tests/Scarab.Tests.csproj"; executables = [ "Scarab" ]; + preConfigureNuGet = '' + # This should really be in the upstream nuget.config + dotnet nuget add source https://api.nuget.org/v3/index.json \ + -n nuget.org --configfile NuGet.Config + ''; + runtimeDeps = [ glibc zlib - libX11 - libICE - libSM - fontconfig gtk3 ]; @@ -49,6 +49,8 @@ buildDotnetModule rec { wrapGAppsHook3 ]; + doCheck = true; + postFixup = '' # Icons for the desktop file icotool -x $src/Scarab/Assets/omegamaggotprime.ico @@ -60,26 +62,28 @@ buildDotnetModule rec { done ''; - desktopItems = [(makeDesktopItem { - desktopName = "Scarab"; - name = "scarab"; - exec = "Scarab"; - icon = "scarab"; - comment = meta.description; - type = "Application"; - categories = [ "Game" ]; - })]; + desktopItems = [ + (makeDesktopItem { + desktopName = "Scarab"; + name = "scarab"; + exec = "Scarab"; + icon = "scarab"; + comment = meta.description; + type = "Application"; + categories = [ "Game" ]; + }) + ]; passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "Hollow Knight mod installer and manager"; homepage = "https://github.com/fifty-six/Scarab"; downloadPage = "https://github.com/fifty-six/Scarab/releases"; changelog = "https://github.com/fifty-six/Scarab/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ huantian ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ huantian ]; mainProgram = "Scarab"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/games/steam-rom-manager/default.nix b/pkgs/tools/games/steam-rom-manager/default.nix index 21dfeee297f0b..9b74ee1398475 100644 --- a/pkgs/tools/games/steam-rom-manager/default.nix +++ b/pkgs/tools/games/steam-rom-manager/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { name = "steam-rom-manager"; - version = "2.5.17"; + version = "2.5.22"; src = fetchurl { url = "https://github.com/SteamGridDB/steam-rom-manager/releases/download/v${version}/Steam-ROM-Manager-${version}.AppImage"; - sha256 = "sha256-2b9gL9gkQdTf+EBgjb+KFRJZjqNW/xeDusDJM1AO2U4="; + sha256 = "sha256-XC4earHVsDioQRJIrAFl5a+UFHjS7U5zt2PqfDxEg9s="; }; extraInstallCommands = let diff --git a/pkgs/tools/games/ukmm/default.nix b/pkgs/tools/games/ukmm/default.nix index 98709602dcdea..9a640b004bf85 100644 --- a/pkgs/tools/games/ukmm/default.nix +++ b/pkgs/tools/games/ukmm/default.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; mainProgram = "ukmm"; }; } diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/tools/graphics/adriconf/default.nix index 8684c730b1a4e..fae7c99b8a81b 100644 --- a/pkgs/tools/graphics/adriconf/default.nix +++ b/pkgs/tools/graphics/adriconf/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.freedesktop.org/mesa/adriconf/"; + changelog = "https://gitlab.freedesktop.org/mesa/adriconf/-/releases/v${version}"; description = "GUI tool used to configure open source graphics drivers"; license = licenses.gpl3Plus; maintainers = with maintainers; [ muscaln ]; diff --git a/pkgs/tools/graphics/amber/default.nix b/pkgs/tools/graphics/amber/default.nix index 9c9a43a49be40..12ff88d1340e8 100644 --- a/pkgs/tools/graphics/amber/default.nix +++ b/pkgs/tools/graphics/amber/default.nix @@ -4,17 +4,20 @@ , pkg-config , cctools , makeWrapper +, mesa , python3 +, runCommand , vulkan-headers , vulkan-loader , vulkan-validation-layers }: let + # From https://github.com/google/amber/blob/main/DEPS glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "81cc10a498b25a90147cccd6e8939493c1e9e20e"; - hash = "sha256-jTOxZ1nU7kvtdWjPzyIp/5ZeKw3JtYyqhlFeIE7CyX8="; + rev = "e8dd0b6903b34f1879520b444634c75ea2deedf5"; + hash = "sha256-B6jVCeoFjd2H6+7tIses+Kj8DgHS6E2dkVzQAIzDHEc="; }; lodepng = fetchFromGitHub { @@ -27,34 +30,34 @@ let shaderc = fetchFromGitHub { owner = "google"; repo = "shaderc"; - rev = "e72186b66bb90ed06aaf15cbdc9a053581a0616b"; - hash = "sha256-hd1IGsWksgAfB8Mq5yZOzSyNGxXsCJxb350pD/Gcskk="; + rev = "f59f0d11b80fd622383199c867137ededf89d43b"; + hash = "sha256-kHz8Io5GZDWv1FjPyBWRpnKhGygKhSU4L9zl/AKXZlU="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "d13b52222c39a7e9a401b44646f0ca3a640fbd47"; - hash = "sha256-bjiWGSmpEbydXtCLP8fRZfPBvdCzBoJxKXTx3BroQbg="; + rev = "5e3ad389ee56fca27c9705d093ae5387ce404df4"; + hash = "sha256-gjF5mVTXqU/GZzr2S6oKGChgvqqHcQSrEq/ePP2yJys="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "d87f61605b3647fbceae9aaa922fce0031afdc63"; - hash = "sha256-lB2i6wjehIFDOQdIPUvCy3zzcnJSsR5vNawPhGmb0es="; + rev = "9241a58a8028c49510bc174b6c970e3c2b4b8e51"; + hash = "sha256-0qHUpwNDJI2jV4h68QaTNPIwTPxwTt0iAUnMXqFCiJE="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "amber"; - version = "unstable-2023-09-02"; + version = "unstable-2024-08-21"; src = fetchFromGitHub { owner = "google"; - repo = pname; - rev = "8e90b2d2f532bcd4a80069e3f37a9698209a21bc"; - hash = "sha256-LuNCND/NXoNbbTWv7RYQUkq2QXL1qXR27uHwFIz0DXg="; + repo = "amber"; + rev = "66399a35927606a435bf7a59756e87e6cb5a0013"; + hash = "sha256-PCO64zI/vzp4HyGz5WpeYpCBeaWjTvz1punWsTz1yiM="; }; buildInputs = [ @@ -67,7 +70,7 @@ stdenv.mkDerivation rec { makeWrapper pkg-config python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; @@ -92,10 +95,53 @@ stdenv.mkDerivation rec { --suffix VK_LAYER_PATH : ${vulkan-validation-layers}/share/vulkan/explicit_layer.d ''; + passthru.tests.lavapipe = runCommand "vulkan-cts-tests-lavapipe" { + nativeBuildInputs = [ finalAttrs.finalPackage mesa.llvmpipeHook ]; + } '' + cat > test.amber <<EOF + #!amber + # Simple amber compute shader. + + SHADER compute kComputeShader GLSL + #version 450 + + layout(binding = 3) buffer block { + uvec2 values[]; + }; + + void main() { + values[gl_WorkGroupID.x + gl_WorkGroupID.y * gl_NumWorkGroups.x] = + gl_WorkGroupID.xy; + } + END # shader + + BUFFER kComputeBuffer DATA_TYPE vec2<int32> SIZE 524288 FILL 0 + + PIPELINE compute kComputePipeline + ATTACH kComputeShader + BIND BUFFER kComputeBuffer AS storage DESCRIPTOR_SET 0 BINDING 3 + END # pipeline + + RUN kComputePipeline 256 256 1 + + # Four corners + EXPECT kComputeBuffer IDX 0 EQ 0 0 + EXPECT kComputeBuffer IDX 2040 EQ 255 0 + EXPECT kComputeBuffer IDX 522240 EQ 0 255 + EXPECT kComputeBuffer IDX 524280 EQ 255 255 + + # Center + EXPECT kComputeBuffer IDX 263168 EQ 128 128 + EOF + + amber test.amber + touch $out + ''; + meta = with lib; { description = "Multi-API shader test framework"; homepage = "https://github.com/google/amber"; license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; }; -} +}) diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index a67fdc1d3978f..31758877c4698 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.asl20; maintainers = with maintainers; [ dasisdormax ]; - broken = !stdenv.is64bit; + broken = !stdenv.hostPlatform.is64bit; }; } diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 55fce30cd9903..ba0dd70254b3b 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { boehmgc ncurses readline gsl libsigsegv zlib perl curl qtbase qtsvg boost (python3.withPackages (ps: with ps; [ cson numpy pyqt5 ])) - ] ++ lib.optionals stdenv.isLinux [ libtirpc ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ]; propagatedBuildInputs = [ glm - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libglut libGLU libGL - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]); @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { # do not use bundled libgc.so configureFlags = [ "--enable-gc=system" ] # TODO add open_memstream to enable XDR/V3D on Darwin (requires memstream or >=10.13 Apple SDK) - ++ lib.optional stdenv.isDarwin "--enable-xdr=no"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-xdr=no"; env.NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc"; diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 9eb368b83af60..6199a87925d34 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = lib.optional stdenv.isDarwin "ac_cv_func_calloc_0_nonnull=yes"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "ac_cv_func_calloc_0_nonnull=yes"; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 35657cf8fc539..9e35c1bfdc863 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; - nativeBuildInputs = lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; buildInputs = [ libjpeg lcms2 gettext ]; # Jasper is disabled because the library is abandoned and has many diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix index f03f38742e196..4c5883d568048 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libdmtx imagemagick ] - ++ lib.optional stdenv.isDarwin Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; meta = { description = "Data matrix command-line utilities"; diff --git a/pkgs/tools/graphics/dnglab/default.nix b/pkgs/tools/graphics/dnglab/default.nix index 6354c4f495fec..3d9ffbeba2ef0 100644 --- a/pkgs/tools/graphics/dnglab/default.nix +++ b/pkgs/tools/graphics/dnglab/default.nix @@ -4,16 +4,20 @@ }: rustPlatform.buildRustPackage rec { pname = "dnglab"; - version = "0.5.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "dnglab"; - repo = pname; + repo = "dnglab"; rev = "v${version}"; - sha256 = "sha256-jkOkkcMFK1RLY8Hn/bMMuMZtyGwnwGdm0os8QKhcWqo="; + # darwin/linux hash mismatch + postFetch = '' + rm -rf "$out"/rawler/data/testdata/cameras/Canon/{"EOS REBEL T7i","EOS Rebel T7i"} + ''; + hash = "sha256-k0tKNtVDzE5vVi/953aEQihh+5BsVneqauTr9WRFFrY="; }; - cargoHash = "sha256-qwhOJxFYRJC51dKB1pi/WVJs7H955jM6KmKbxsAScDI="; + cargoHash = "sha256-6qJFNfgWh3i1CpuM/QdLksVAFz4XIV8uT5oz5BZ3U30="; postInstall = '' rm $out/bin/benchmark $out/bin/identify diff --git a/pkgs/tools/graphics/esshader/default.nix b/pkgs/tools/graphics/esshader/default.nix index 38bd4d1b7f0ad..b425ce5721ce0 100644 --- a/pkgs/tools/graphics/esshader/default.nix +++ b/pkgs/tools/graphics/esshader/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ astro ]; platforms = lib.platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "esshader"; }; } diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 971722ea9f3f9..5bd736911c739 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -23,5 +23,9 @@ stdenv.mkDerivation rec { license = lib.licenses.free; maintainers = [ ]; platforms = with lib.platforms; unix; + knownVulnerabilities = [ + "CVE-2023-50671" + "CVE-2024-42851" + ]; }; } diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 6503a2887ab2f..423d8d8d92f3e 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -30,7 +30,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; buildInputs = [ gnuplot perl ] ++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]); @@ -45,7 +45,7 @@ perlPackages.buildPerlPackage rec { # Tests require gnuplot 4.6.4 and are completely skipped with gnuplot 5. doCheck = false; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/feedgnuplot '' + '' wrapProgram $out/bin/feedgnuplot \ diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 97e566b561d22..c43059c03af55 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -17,7 +17,7 @@ assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); let - withX = libX11 != null && !aquaterm && !stdenv.isDarwin; + withX = libX11 != null && !aquaterm && !stdenv.hostPlatform.isDarwin; in (if withQt then mkDerivation else stdenv.mkDerivation) rec { pname = "gnuplot"; @@ -38,7 +38,7 @@ in ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ lib.optionals withQt [ qtbase qtsvg ] ++ lib.optional withWxGTK wxGTK32 - ++ lib.optional (withWxGTK && stdenv.isDarwin) Cocoa; + ++ lib.optional (withWxGTK && stdenv.hostPlatform.isDarwin) Cocoa; postPatch = '' # lrelease is in qttools, not in qtbase. @@ -51,7 +51,7 @@ in (if aquaterm then "--with-aquaterm" else "--without-aquaterm") ] ++ lib.optional withCaca "--with-caca"; - CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11"; + CXXFLAGS = lib.optionalString (stdenv.hostPlatform.isDarwin && withQt) "-std=c++11"; # we'll wrap things ourselves dontWrapGApps = true; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 5cb3c24bc150f..e27c35fd72c74 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { pango bash ] ++ optionals withXorg (with xorg; [ libXrender libXaw libXpm ]) - ++ optionals stdenv.isDarwin [ ApplicationServices Foundation ]; + ++ optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ]; hardeningDisable = [ "fortify" ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - CPPFLAGS = optionalString (withXorg && stdenv.isDarwin) + CPPFLAGS = optionalString (withXorg && stdenv.hostPlatform.isDarwin) "-I${cairo.dev}/include/cairo"; doCheck = false; # fails with "Graphviz test suite requires ksh93" which is not in nixpkgs diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix deleted file mode 100644 index 0d2a5eb4ac7eb..0000000000000 --- a/pkgs/tools/graphics/grim/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromSourcehut -, pixman -, libpng -, libjpeg -, meson -, ninja -, pkg-config -, scdoc -, wayland -, wayland-protocols -, wayland-scanner -}: - -stdenv.mkDerivation rec { - pname = "grim"; - version = "1.4.1"; - - src = fetchFromSourcehut { - owner = "~emersion"; - repo = pname; - rev = "v${version}"; - hash = "sha256-5csJqRLNqhyeXR4dEQtnPUSwuZ8oY+BIt6AVICkm1+o="; - }; - - mesonFlags = [ - "-Dwerror=false" - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - scdoc - wayland-scanner - ]; - - buildInputs = [ - pixman - libpng - libjpeg - wayland - wayland-protocols - ]; - - meta = with lib; { - description = "Grab images from a Wayland compositor"; - homepage = "https://github.com/emersion/grim"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ eclairevoyant ]; - mainProgram = "grim"; - }; -} diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 0e22fe72c5941..8c50ffdce62ec 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin # upgrades to a newer SDK. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_IPHONE=0"; postPatch = '' patchShebangs extresso/extresso diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index 27fcca3cacbfb..980f729e9725d 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake git ]; - buildInputs = lib.optionals stdenv.isLinux [ glibc.static ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ glibc.static ]; meta = with lib; { homepage = "https://github.com/dropbox/lepton"; diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix index 02cb25d251da7..3ac1ede77eac9 100644 --- a/pkgs/tools/graphics/mesa-demos/default.nix +++ b/pkgs/tools/graphics/mesa-demos/default.nix @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Degl=${if stdenv.isDarwin then "disabled" else "auto"}" - (lib.mesonEnable "libdrm" (stdenv.isLinux)) + "-Degl=${if stdenv.hostPlatform.isDarwin then "disabled" else "auto"}" + (lib.mesonEnable "libdrm" (stdenv.hostPlatform.isLinux)) (lib.mesonEnable "osmesa" false) (lib.mesonEnable "wayland" (lib.meta.availableOn stdenv.hostPlatform wayland)) ]; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 8ad43c0326c00..8426fbcc2032c 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.7.0"; + version = "11.7.1"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4925"; - sha256 = "Y6o/9nq9ICqlKCDh59eiT38CZ+cfB1ezb8arF0uBYsk="; + rev = "4932"; + sha256 = "bmPqUPOlkQ0vKim+t8ct2ErFU4uWw6L5foODGWrrExs="; }; nativeBuildInputs = [ @@ -87,7 +87,7 @@ stdenv.mkDerivation { # Fix path to rgb.txt echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk echo "NETPBMLIBTYPE = dylib" >> config.mk echo "NETPBMLIBSUFFIX = dylib" >> config.mk diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 3d9d89af0c96d..4022c363ef64b 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch"; sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj"; }) - ] ++ (lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch); + ] ++ (lib.optional stdenv.hostPlatform.isAarch64 ./no-sse-on-arm.patch); buildInputs = [ qtbase qttools libGLU ]; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index e127e2a3aa3c5..d0715d8f1aa3e 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-LZ3YIosDpjDYVACWQsr/0XhgX4fyo8CyZG58WfLSzCs="; - doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin; meta = { homepage = "https://github.com/shssoichiro/oxipng"; diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 7d595c5e4ce1c..b164799e9cc29 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { buildInputs = [ openexr zlib imagemagick6 fftwFloat fftw gsl libexif perl qtbase netpbm - ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ + ] ++ (if stdenv.hostPlatform.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ libGLU libGL libglut diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index 41724043930c7..03d25acd29863 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -14,7 +14,7 @@ let }; platform = platforms."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - download = if stdenv.isDarwin + download = if stdenv.hostPlatform.isDarwin then { extension = "macos.zip"; hash = "sha256-MnL6lH7q/BrACG4fFJNfnvoh0JClVeaJIlX+XIj2aG4="; } else { extension = "linux.tar.gz"; hash = "sha256-rDi7pvDeKQM96GZTjDr6ZDQTGbaVu+OI77xf2egw6Sg="; }; in @@ -27,15 +27,15 @@ stdenv.mkDerivation rec { url = "http://static.jonof.id.au/dl/kenutils/pngout-${version}-${download.extension}"; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ unzip ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; # pngout is code-signed on Darwin, so don’t alter the binary to avoid breaking the signature. - dontFixup = stdenv.isDarwin; + dontFixup = stdenv.hostPlatform.isDarwin; installPhase = '' mkdir -p $out/bin cp ${platform.folder}/pngout $out/bin - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/${platform.ld-linux} $out/bin/pngout ''; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 810c2365b2c31..c9e8512b7755f 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ libiconv ApplicationServices ]); diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index b2d1e795155a3..43144ce037b0e 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/dlbeer/quirc/commit/257c6c94d99960819ecabf72199e5822f60a3bc5.patch?full_index=1"; hash = "sha256-WLQK7vy34VmgJzppTnRjAcZoSGWVaXQSaGq9An8W0rw="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable building of linux-only demos on darwin systems ./0001-Don-t-build-demos.patch ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # don't install static library rm $out/lib/libquirc.a - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Set absolute install name to avoid the need for DYLD_LIBRARY_PATH dylib=$out/lib/libquirc.${finalAttrs.version}.dylib ${stdenv.cc.targetPrefix}install_name_tool -id "$dylib" "$dylib" diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix index 59c2753011d31..450e36e6d3ee8 100644 --- a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix +++ b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { cp -r ${models}/models $out/share ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/realesrgan-ncnn-vulkan --add-needed libvulkan.so ''; diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 469236e5b1db8..ab505c4e38630 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-7JnNgTLpRo39EjYWchnfjGRfNgEwy5x4tUUzWT/d8h0="; + hash = "sha256-XjWkzTdsnQZfBjf61dgGt/a7973ZljJG1rnCk0iGk6Y="; }; - cargoHash = "sha256-ok+Bqtc6YJoCRFis8JRmtKs1Jag04Ged2J4p4trI2ls="; + cargoHash = "sha256-HmMAYtL0qoUrtLRKrYx6VZsc0bVRS+DhIFweLbz9l+w="; cargoBuildFlags = [ "--package=resvg" diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix deleted file mode 100644 index a8db32128a5e4..0000000000000 --- a/pkgs/tools/graphics/sng/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, libpng, netpbm }: - -stdenv.mkDerivation rec { - pname = "sng"; - version = "1.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/sng/sng-${version}.tar.gz"; - sha256 = "06a6ydvx9xb3vxvrzdrg3hq0rjwwj9ibr7fyyxjxq6qx1j3mb70i"; - }; - - buildInputs = [ libpng ]; - - configureFlags = [ - "--with-rgbtxt=${netpbm.out}/share/netpbm/misc/rgb.txt" - ]; - - meta = with lib; { - description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form"; - homepage = "https://sng.sourceforge.net/"; - license = licenses.zlib; - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.unix; - mainProgram = "sng"; - }; -} diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index aec81ac9c4063..ee211e6c03182 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-UEXKzx1NXCInOnI96Z1hfrpyoWdb3BOGEKstX1gVzIo="; + hash = "sha256-h5My9PbPq1l03xpXQQFolNy7G1RhExtTH6qPg7vVF/8="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/tools/graphics/svg2pdf/default.nix index 62a3438b9bf6d..3e60fbf4377f9 100644 --- a/pkgs/tools/graphics/svg2pdf/default.nix +++ b/pkgs/tools/graphics/svg2pdf/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svg2pdf"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "typst"; repo = "svg2pdf"; rev = "v${version}"; - hash = "sha256-gSXztee8tly8nNhcC4QcloOAgVpenWszg12w3thzKJ8="; + hash = "sha256-9v4A0mZjknc6a933b3ifPJo3xyem17Vpp0Wu0sUS0DM="; }; - cargoHash = "sha256-PaAhTSfw+enirVg9WHBpI+GjMwHA02/SiKkRa1A6QXc="; + cargoHash = "sha256-oCyvssTtUr8FR0XaFx2syxE8+zWXOGrf8kvQiBCyq18="; cargoBuildFlags = [ "-p=svg2pdf-cli" diff --git a/pkgs/tools/graphics/texture-synthesis/default.nix b/pkgs/tools/graphics/texture-synthesis/default.nix index 7122450587a71..cd7d437c4d416 100644 --- a/pkgs/tools/graphics/texture-synthesis/default.nix +++ b/pkgs/tools/graphics/texture-synthesis/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { }; # tests fail for unknown reasons on aarch64-darwin - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); meta = with lib; { description = "Example-based texture synthesis written in Rust"; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index fde14fe0c53d3..c8f41167f8656 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -42,15 +42,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.15.2"; + version = "8.15.3"; - outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; + outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "devdoc" ]; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-jp6RPceFzzWgFBzcfvggniAkhXaAGszT/sy4H6aCtGc="; + hash = "sha256-VQtHHitEpxv63wC41TtRWLLCKHDAK7fbrS+cByeWxT0="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ninja docbook-xsl-nons gobject-introspection - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk-doc ]; @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { cgif libarchive libhwy - ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Foundation ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ]; # Required by .pc file propagatedBuildInputs = [ @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dpdfium=disabled" "-Dnifti=disabled" ] - ++ lib.optional (!stdenv.isDarwin) "-Dgtk_doc=true" + ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-Dgtk_doc=true" ++ lib.optional (imagemagick == null) "-Dmagick=disabled" ; diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index 2305e7c1bab5d..8b5dff5f5e33c 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.41"; + version = "3.43"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-CAPteS1zjS6a+/6ZFUZD1WA7dcK8yM4qodVF8PGpTfY="; + hash = "sha256-GwE/E8GgVIeZtCefLNvacDUxI2C+Uf8zgpOQ1NpiSmM="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ pedrohlc ]; changelog = "https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/${version}"; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 6f5961de851d1..b428672fe9fec 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "vulkan-sdk-${version}"; - hash = "sha256-ClmCYJD9GRtM0XgbZqbW1OY1ukP8+FifneaXUjvNGQ4="; + hash = "sha256-Cz4C8HoyP768H9ZI7Ys9oX3/qEEhz6vfkdKXoVfodT0="; }; nativeBuildInputs = [ cmake pkg-config jq ]; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index afe23265572df..bef94286ac80f 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-kRioHGrk6zsBIsnvusq6usAQqxQmCMmGk+O3ckkGEG4="; + hash = "sha256-APJRiO5xNHml3k9goFQKwmxb3BXDN7tmvcs/oNCVU58="; }; nativeBuildInputs = [ cmake python3 jq which pkg-config libsForQt5.qt5.wrapQtAppsHook ]; diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 19d1597b72d07..c21ece529459e 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-IAlqFCenv5e70XyLSYh2fE84JZQFJwg+YKTGaK7ShKA="; + hash = "sha256-8xuE4OTwtH8ckCKDU7oo0WI7/R4Ox53+j+F+ZuKysKI="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { vulkan-headers vulkan-loader vulkan-volk - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libffi libX11 libXau @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { wayland wayland-protocols wayland-scanner - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moltenvk moltenvk.dev AppKit @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "-DGLSLANG_INSTALL_DIR=${glslang}" # Hide dev warnings that are useless for packaging "-Wno-dev" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DMOLTENVK_REPO_ROOT=${moltenvk}/share/vulkan/icd.d" # Don’t build the cube demo because it requires `ibtool`, which is not available in nixpkgs. "-DBUILD_CUBE=OFF" diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index dd2c15c8fda45..cf150a59c8dbc 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { buildInputs = [ opencv4 ] ++ lib.optional cudaSupport cudatoolkit - ++ lib.optional stdenv.isDarwin OpenCL - ++ lib.optionals stdenv.isLinux [ ocl-icd opencl-headers ]; + ++ lib.optional stdenv.hostPlatform.isDarwin OpenCL + ++ lib.optionals stdenv.hostPlatform.isLinux [ ocl-icd opencl-headers ]; nativeBuildInputs = [ cmake makeWrapper ]; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib" ''; diff --git a/pkgs/tools/graphics/wgpu-utils/default.nix b/pkgs/tools/graphics/wgpu-utils/default.nix index 236cf3f7a7fa3..51d4c018e4591 100644 --- a/pkgs/tools/graphics/wgpu-utils/default.nix +++ b/pkgs/tools/graphics/wgpu-utils/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optional stdenv.isDarwin QuartzCore; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin QuartzCore; # Tests fail, as the Nix sandbox doesn't provide an appropriate adapter (e.g. Vulkan). doCheck = false; diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 36c220557cdc2..980081b3dde7a 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -39,13 +39,7 @@ let ''; }; - linuxAttrs = rec { - version = "0.12.6.1-3"; - src = fetchurl { - url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox_${version}.bookworm_amd64.deb"; - hash = "sha256-mLoNFXtQ028jvQ3t9MCqKMewxQ/NzcVKpba7uoGjlB0="; - }; - + _linuxAttrs = { nativeBuildInputs = [ dpkg autoPatchelfHook ]; buildInputs = [ @@ -79,6 +73,22 @@ let runHook postInstall ''; }; + + linuxAttrs.aarch64-linux = rec { + version = "0.12.6.1-3"; + src = fetchurl { + url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox_${version}.bookworm_arm64.deb"; + hash = "sha256-tmBhV7J8E+BE0Ku+ZwMB+I3k4Xgq/KT5wGpYF/PgOpw="; + }; + } // _linuxAttrs; + + linuxAttrs.x86_64-linux = rec { + version = "0.12.6.1-3"; + src = fetchurl { + url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox_${version}.bookworm_amd64.deb"; + hash = "sha256-mLoNFXtQ028jvQ3t9MCqKMewxQ/NzcVKpba7uoGjlB0="; + }; + } // _linuxAttrs; in stdenv.mkDerivation ({ pname = "wkhtmltopdf"; @@ -105,9 +115,9 @@ stdenv.mkDerivation ({ ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ nbr kalbasit ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; }; } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) darwinAttrs -// lib.optionalAttrs (stdenv.hostPlatform.isLinux) linuxAttrs +// lib.optionalAttrs (stdenv.hostPlatform.isLinux) linuxAttrs.${stdenv.system} ) diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/tools/graphics/xcur2png/default.nix index 5d5396aea273f..6419752cac8a8 100644 --- a/pkgs/tools/graphics/xcur2png/default.nix +++ b/pkgs/tools/graphics/xcur2png/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libpng, xorg }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + pkg-config, + libpng, + xorg, +}: stdenv.mkDerivation rec { pname = "xcur2png"; @@ -11,6 +19,17 @@ stdenv.mkDerivation rec { sha256 = "0858wn2p14bxpv9lvaz2bz1rk6zk0g8zgxf8iy595m8fqv4q2fya"; }; + patches = [ + # https://github.com/eworm-de/xcur2png/pull/3 + ./malloc.diff + + # fix byte overflows due to off-by-one error + (fetchpatch { + url = "https://github.com/eworm-de/xcur2png/commit/aa035462d950fab35d322cb87fd2f0d702251e82.patch"; + hash = "sha256-hlmJ/bcDSl1ADs0jp+JrAgAaMzielUSRVPad+plnSZg="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/graphics/xcur2png/malloc.diff b/pkgs/tools/graphics/xcur2png/malloc.diff new file mode 100644 index 0000000000000..88f4e8e17ba90 --- /dev/null +++ b/pkgs/tools/graphics/xcur2png/malloc.diff @@ -0,0 +1,33 @@ +--- a/xcur2png.c ++++ b/xcur2png.c +@@ -16,7 +16,10 @@ + /* Todo: atoi error handling */ + /* help is -h in manual */ + ++#if HAVE_CONFIG_H + #include <config.h> ++#endif ++#undef malloc + + #define _ATFILE_SOURCE + #include <stdio.h> +@@ -34,6 +37,19 @@ + #include <png.h> + #include <X11/Xcursor/Xcursor.h> + ++ ++void *malloc (); ++ ++/* Allocate an N-byte block of memory from the heap. ++ If N is zero, allocate a 1-byte block. */ ++ ++void* rpl_malloc (size_t n) ++{ ++ if (n == 0) ++ n = 1; ++ return malloc (n); ++} ++ + #define PNG_SETJMP_NOT_SUPPORTED 1 + + #define PROGRESS_SHARPS 50 /* total number of progress sharps */ diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index c3429069d2037..951e6b26bf115 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -16,7 +16,7 @@ , docbook_xsl , autoreconfHook , dbus -, enableVideo ? stdenv.isLinux +, enableVideo ? stdenv.hostPlatform.isLinux # The implementation is buggy and produces an error like # Name Error (Connection ":1.4380" is not allowed to own the service "org.linuxtv.Zbar" due to security policies in the configuration file) # for every scanned code. @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagickBig libintl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Foundation ] ++ lib.optionals enableDbus [ @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { python3 ]; - checkInputs = lib.optionals stdenv.isDarwin [ + checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone ]; @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { doCheck = true; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS="$NIX_LDFLAGS -largp" ''; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix index 4219275fab4f7..b6a9253148c48 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Vietnamese input method engine support for Fcitx"; homepage = "https://github.com/fcitx/fcitx5-bamboo"; license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix index 6254073c8f35c..ae43cd73e510c 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix @@ -9,7 +9,7 @@ , fcitx5-qt , libskk , qtbase -, skk-dicts +, skkDictionaries , enableQt ? false }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ (lib.cmakeBool "ENABLE_QT" enableQt) (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6")) - "-DSKK_DEFAULT_PATH=${skk-dicts}/share/SKK-JISYO.L" + "-DSKK_DEFAULT_PATH=${skkDictionaries.l}/share/skk/SKK-JISYO.L" ]; dontWrapQtApps = true; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix index fc5bd3d33be3a..db57869f8538b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , vala, intltool, pkg-config -, libkkc, ibus, skk-dicts +, libkkc, ibus, skkDictionaries , gtk3 }: @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { vala intltool pkg-config ]; - buildInputs = [ libkkc ibus skk-dicts gtk3 ]; + buildInputs = [ libkkc ibus gtk3 ]; postInstall = '' - ln -s ${skk-dicts}/share $out/share/skk + ln -s ${skkDictionaries.l}/share/skk $out/share/skk ''; meta = with lib; { diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 195b92191cd49..1f54a01527b48 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.31"; + version = "1.4.32"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-o0qW+7NM+DHD8plXGP4J/PbhOgykdc1n5n2P3gi7pbU="; + sha256 = "sha256-wNpbjnP44eDjKygG+0VhUj8fhiRXGwfdV33H39o7asc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix deleted file mode 100644 index 4c19fd9abc017..0000000000000 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib -, buildBazelPackage -, fetchFromGitHub -, qt6 -, pkg-config -, bazel -, ibus -, unzip -, xdg-utils -}: -let - zip-codes = fetchFromGitHub { - owner = "musjj"; - repo = "jp-zip-codes"; - rev = "119c888a38032a92e139c52cd26f45bb495c4d54"; - hash = "sha256-uyAL2TcFJsYZACFDAxIQ4LE40Hi4PVrQRnJl5O5+RmU="; - }; -in -buildBazelPackage rec { - pname = "ibus-mozc"; - version = "2.29.5374.102"; - - src = fetchFromGitHub { - owner = "google"; - repo = "mozc"; - rev = version; - hash = "sha256-AcIN5sWPBe4JotAUYv1fytgQw+mJzdFhKuVPLR48soA="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ qt6.wrapQtAppsHook pkg-config unzip ]; - - buildInputs = [ ibus qt6.qtbase ]; - - dontAddBazelOpts = true; - removeRulesCC = false; - - inherit bazel; - - fetchAttrs = { - sha256 = "sha256-ToBLVJpAQErL/P1bfWJca2FjhDW5XTrwuJQLquwlrhA="; - - # remove references of buildInputs and zip code files - preInstall = '' - rm -rv $bazelOut/external/{ibus,qt_linux,zip_code_*} - ''; - }; - - bazelFlags = [ "--config" "oss_linux" "--compilation_mode" "opt" ]; - - bazelTargets = [ "package" ]; - - postPatch = '' - substituteInPlace src/config.bzl \ - --replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" \ - --replace-fail "/usr" "$out" - substituteInPlace src/WORKSPACE.bazel \ - --replace-fail "https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip" "file://${zip-codes}/ken_all.zip" \ - --replace-fail "https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip" "file://${zip-codes}/jigyosyo.zip" - ''; - - preConfigure = '' - cd src - ''; - - buildAttrs.installPhase = '' - runHook preInstall - - unzip bazel-bin/unix/mozc.zip -x "tmp/*" -d / - - # create a desktop file for gnome-control-center - # copied from ubuntu - mkdir -p $out/share/applications - cp ${./ibus-setup-mozc-jp.desktop} $out/share/applications/ibus-setup-mozc-jp.desktop - substituteInPlace $out/share/applications/ibus-setup-mozc-jp.desktop \ - --replace-fail "@mozc@" "$out" - - runHook postInstall - ''; - - passthru = { - inherit zip-codes; - }; - - meta = with lib; { - isIbusEngine = true; - description = "Japanese input method from Google"; - mainProgram = "mozc_emacs_helper"; - homepage = "https://github.com/google/mozc"; - license = licenses.free; - platforms = platforms.linux; - maintainers = with maintainers; [ gebner ericsagnes pineapplehunter ]; - }; -} diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index c997c20c8d260..833892b79926d 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.17"; + version = "1.3.18"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-7//axHjQ1LgLpeWR4MTI8efLURm4Umj4JV3G33Y0m0g="; + hash = "sha256-4ZM5WZPh6Y5M50KDS+86j00v4pWTRdcdVYh4DcEYXAA="; }; nativeBuildInputs = [ pkg-config python3 ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index db93a966b798b..db914687f3166 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.17.6"; + version = "1.17.8"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-rbtyixsDMIQAP2TLqp1KbcCUMc7cKvGQR27puJmbLno="; + sha256 = "sha256-bPHwpTrDCLil6xNBr7lKAMP71koFlZvPc2vpDuwzZzM="; }; postPatch = '' diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 883ed6a2b5a34..f761ffbce26f2 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.25.11"; + version = "2.25.16"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-of8FcuYeLIEQgPmEQt1UqcMT6Bd2l5sCDj0Cia0JbmM="; + hash = "sha256-DewkWiPWPcF/8GDdqKMf99UxSXOeZhGsAywYJZAxxKA="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix index c90eb780e7d64..8431baa1526b8 100644 --- a/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/pkgs/tools/inputmethods/input-remapper/default.nix @@ -117,18 +117,21 @@ in ]; postInstall = '' - sed -r "s#RUN\+\=\"/bin/input-remapper-control#RUN\+\=\"$out/bin/input-remapper-control#g" -i data/99-input-remapper.rules - sed -r "s#ExecStart\=/usr/bin/input-remapper-service#ExecStart\=$out/bin/input-remapper-service#g" -i data/input-remapper.service + substituteInPlace data/99-input-remapper.rules \ + --replace-fail 'RUN+="/bin/input-remapper-control' "RUN+=\"$out/bin/input-remapper-control" + substituteInPlace data/input-remapper.service \ + --replace-fail 'ExecStart=/usr/bin/input-remapper-service' "ExecStart=$out/bin/input-remapper-service" + substituteInPlace data/input-remapper-*.desktop \ + --replace-fail 'Icon=/usr/share/input-remapper/input-remapper.svg' 'Icon=input-remapper.svg' - chmod +x data/*.desktop - - install -D -t $out/share/applications/ data/*.desktop - install -D -t $out/share/polkit-1/actions/ data/input-remapper.policy - install -D data/99-input-remapper.rules $out/etc/udev/rules.d/99-input-remapper.rules - install -D data/input-remapper.service $out/lib/systemd/system/input-remapper.service - install -D data/input-remapper.policy $out/share/polkit-1/actions/input-remapper.policy - install -D data/inputremapper.Control.conf $out/etc/dbus-1/system.d/inputremapper.Control.conf - install -D -t $out/usr/share/input-remapper/ data/* + 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/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 + install -m644 -D data/inputremapper.Control.conf $out/etc/dbus-1/system.d/inputremapper.Control.conf + install -m644 -D data/input-remapper.svg $out/share/icons/hicolor/scalable/apps/input-remapper.svg + install -m644 -D -t $out/usr/share/input-remapper/ data/* # Only install input-remapper prefixed binaries, we don't care about deprecated key-mapper ones install -m755 -D -t $out/bin/ bin/input-remapper* diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index c4476317fe151..16472a5512ddd 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Minimal composable infrastructure on top of libudev and libevdev"; homepage = "https://gitlab.com/interception/linux/tools"; + changelog = "https://gitlab.com/interception/linux/tools/-/tags/v${version}"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.vyp ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix index d74cc15254990..7395c807389a1 100644 --- a/pkgs/tools/inputmethods/keyd/default.nix +++ b/pkgs/tools/inputmethods/keyd/default.nix @@ -8,13 +8,13 @@ }: let - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "rvaiya"; repo = "keyd"; rev = "v" + version; - hash = "sha256-NhZnFIdK0yHgFR+rJm4cW+uEhuQkOpCSLwlXNQy6jas="; + hash = "sha256-pylfQjTnXiSzKPRJh9Jli1hhin/MIGIkZxLKxqlReVo="; }; pypkgs = python3.pkgs; @@ -26,7 +26,7 @@ let postPatch = '' substituteInPlace scripts/${pname} \ - --replace /bin/sh ${runtimeShell} + --replace-fail /bin/sh ${runtimeShell} ''; propagatedBuildInputs = with pypkgs; [ xlib ]; @@ -47,10 +47,10 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace Makefile \ - --replace /usr "" + --replace-fail /usr/local "" - substituteInPlace keyd.service \ - --replace /usr/bin $out/bin + substituteInPlace keyd.service.in \ + --replace-fail @PREFIX@ $out ''; installFlags = [ "DESTDIR=${placeholder "out"}" ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Key remapping daemon for Linux"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ alfarel ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/keymapper/default.nix b/pkgs/tools/inputmethods/keymapper/default.nix index 4394d708cc109..8f643d71812c3 100644 --- a/pkgs/tools/inputmethods/keymapper/default.nix +++ b/pkgs/tools/inputmethods/keymapper/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "4.6.0"; + version = "4.8.2"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; rev = finalAttrs.version; - hash = "sha256-xHnCRn7fGo46T5rs9BtvEAEdxCY08zDTUipbbl6OUlU="; + hash = "sha256-4LYGsqHD3msJNgkaInJyH7o+jebeQoh/rUAsvIsqkdM="; }; # all the following must be in nativeBuildInputs diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index 248538752d685..aba2d2f66c672 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { description = "Easy Hangul XIM"; mainProgram = "nabi"; homepage = "https://github.com/choehwanjin/nabi"; + changelog = "https://github.com/libhangul/nabi/blob/nabi-${version}/NEWS"; license = licenses.gpl2Plus; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index 88c6db4842efd..59e448c46170c 100644 --- a/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.4.6"; + version = "1.4.8"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LytZBVubsGajx4hFYwP3MwHkAW7LlIr77aVLpeHwWxU="; + sha256 = "sha256-C/qaLEYvIbl0XINsumAFLnsQgy+EDjoX446BJnuE6eQ="; }; buildInputs = [ libXi libXrandr libXt libXtst ]; tags = [ "portal,x11" ]; - vendorHash = "sha256-vL6kSm0yPEn5TNpB6E+2+Xjm/ANNUxgA8XEWz9n7kHI="; + vendorHash = "sha256-bt5KUgNDgWX7CVHvX5c0uYqoxGRDbGbae52+mpnBEZU="; meta = with lib; { description = "Control mouse and keyboard from the web browser of a smartphone"; diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index 7b224cb7d2855..9b2dd3c182dd0 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,77 +1,202 @@ -{ lib, stdenv, fetchurl, iconv, skktools }: +{ lib +, stdenvNoCC +, fetchFromGitHub +, nix-update-script +, nkf +, skktools +, useUtf8 ? false +}: let - # kana to kanji - small = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.S"; - sha256 = "11cjrc8m99hj4xpl2nvzxanlswpapi92vmgk9d6yimdz0jidb6cq"; - }; - medium = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.M"; - sha256 = "0pwjp9qjmn9sq6zc0k6632l7dc2dbjn45585ibckvvl9iwfqqxdp"; - }; - large = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.L"; - sha256 = "0ps0a7sbkryd6hxvphq14i7g5wci4gvr0vraac8ia2ww67a2xbyc"; - }; + suffix = lib.optionalString useUtf8 ".utf8"; - # english to japanese - edict = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.edict"; - sha256 = "1vrwnq0vvjn61nijbln6wfinqg93802d2a8d4ad82n692v83b1li"; - }; - # misc - assoc = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.assoc"; - sha256 = "1smcbyv6srrhnpl7ic9nqds9nz3g2dgqngmhzkrdlwmvcpvakp1v"; - }; -in + mkDictNameValue = + { name + , description + , license # it's written in the beginning of each file + , files ? [ "SKK-JISYO.${name}" ] + }: { + name = lib.toLower (builtins.replaceStrings [ "." ] [ "_" ] name); + value = stdenvNoCC.mkDerivation { + pname = "skk-jisyo-" + lib.toLower name; + version = "0-unstable-2024-08-28"; -stdenv.mkDerivation { - pname = "skk-dicts-unstable"; - version = "2020-03-24"; - srcs = [ small medium large edict assoc ]; - nativeBuildInputs = [ iconv skktools ]; + src = fetchFromGitHub { + owner = "skk-dev"; + repo = "dict"; + rev = "4eb91a3bbfef70bde940668ec60f3beae291e971"; + sha256 = "sha256-sWz85Q6Bu2WoKsckSp5SlcuPUQN2mcq+BHMqNXQ/aho="; + }; - strictDeps = true; + nativeBuildInputs = lib.optionals useUtf8 [ nkf ]; - dontUnpack = true; + strictDeps = true; - installPhase = '' - function dictname() { - src=$1 - name=$(basename $src) # remove dir name - dict=$(echo $name | cut -b34-) # remove sha256 prefix - echo $dict - } - mkdir -p $out/share + buildPhase = '' + runHook preBuild + '' + lib.concatMapStrings + (file: '' + nkf -w ${file} \ + | LC_ALL=C sed 's/coding: [^ ]\{1,\}/coding: utf-8/' \ + > ${file + suffix} + '') + (lib.optionals useUtf8 (map lib.escapeShellArg files)) + '' + runHook postBuild + ''; - for src in $srcs; do - dst=$out/share/$(dictname $src) - echo ";;; -*- coding: utf-8 -*-" > $dst # libskk requires this on the first line - iconv -f EUC-JP -t UTF-8 $src | skkdic-expr2 >> $dst - done + installPhase = '' + runHook preInstall + '' + lib.concatMapStrings + (file: '' + install -Dm644 \ + ${lib.escapeShellArg file} \ + $out/share/skk/${lib.escapeShellArg (baseNameOf file)} + '') + (map (file: file + suffix) files) + '' + runHook postInstall + ''; - # combine .L .edict and .assoc for convenience - dst=$out/share/SKK-JISYO.combined - echo ";;; -*- coding: utf-8 -*-" > $dst - skkdic-expr2 \ - $out/share/$(dictname ${large}) + \ - $out/share/$(dictname ${edict}) + \ - $out/share/$(dictname ${assoc}) >> $dst - ''; + doInstallCheck = true; + installCheckPhase = '' + emptydict=': 0 candidates$' + ${skktools}/bin/skkdic-count /dev/null | grep "$emptydict" + ${skktools}/bin/skkdic-count $out/share/skk/* | grep -v "$emptydict" + ''; - enableParallelBuilding = true; + passthru.updateScript = nix-update-script { + extraArgs = ["--version" "branch"]; + }; - meta = with lib; { - description = "Collection of standard SKK dictionaries"; - longDescription = '' - This package provides a collection of standard kana-to-kanji - dictionaries for the SKK Japanese input method. + meta = with lib; { + inherit description license; + longDescription = '' + This package provides a kana-to-kanji conversion dictionary for the + SKK Japanese input method. + ''; + homepage = "https://github.com/skk-dev/dict"; + maintainers = with maintainers; [ yuriaisaka midchildan ]; + platforms = platforms.all; + }; + }; + }; +in +lib.listToAttrs (map mkDictNameValue [ + { + name = "L"; + description = "The standard SKK dictionary"; + license = lib.licenses.gpl2Plus; + } + { + name = "S"; + description = "Small SKK dictionary"; + license = lib.licenses.gpl2Plus; + } + { + name = "M"; + description = "Medium sized SKK dictionary"; + license = lib.licenses.gpl2Plus; + } + { + name = "ML"; + description = "Medium to large sized SKK dictionary"; + license = lib.licenses.gpl2Plus; + } + { + name = "jinmei"; + description = "SKK dictionary for names"; + license = lib.licenses.gpl2Plus; + } + { + name = "fullname"; + description = "SKK dictionary for celebrities"; + license = lib.licenses.gpl2Plus; + } + { + name = "geo"; + description = "SKK dictionary for locations"; + license = lib.licenses.gpl2Plus; + } + { + name = "propernoun"; + description = "SKK dictionary for proper nouns"; + license = lib.licenses.gpl2Plus; + } + { + name = "station"; + description = "SKK dictionary for stations"; + license = lib.licenses.gpl2Plus; + } + { + name = "law"; + description = "SKK dictionary for legal terms"; + license = lib.licenses.gpl2Plus; + } + { + name = "okinawa"; + description = "SKK dictionary for the Okinawan language"; + license = lib.licenses.publicDomain; + } + { + name = "china_taiwan"; + description = "SKK dictionary for Chinese & Taiwanese locations"; + license = lib.licenses.gpl2Plus; + } + { + name = "assoc"; + description = "SKK dictionary for abbreviated input"; + license = lib.licenses.gpl2Plus; + } + { + name = "edict"; + description = "SKK dictionary for English to Japanese translation"; + license = lib.licenses.cc-by-sa-30; + } + { + name = "zipcode"; + description = "SKK dictionary for Japanese zipcodes"; + files = [ "zipcode/SKK-JISYO.zipcode" "zipcode/SKK-JISYO.office.zipcode" ]; + license = lib.licenses.publicDomain; + } + { + name = "JIS2"; + description = "SKK dictionary for JIS level 2 kanjis"; + license = lib.licenses.gpl2Plus; + } + { + name = "JIS3_4"; + description = "SKK dictionary for JIS level 3 and 4 kanjis"; + license = lib.licenses.gpl2Plus; + } + { + name = "JIS2004"; + description = '' + A complementary SKK dictionary for JIS3_4 with JIS X 0213:2004 additions" ''; - homepage = "https://github.com/skk-dev/dict"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ yuriaisaka ]; - platforms = platforms.all; - }; -} + license = lib.licenses.gpl2Plus; + } + { + name = "itaiji"; + description = "SKK dictionary for variant kanjis"; + license = lib.licenses.publicDomain; + } + { + name = "itaiji.JIS3_4"; + description = "SKK dictionary for JIS level 3 and 4 variant kanjis"; + license = lib.licenses.gpl2Plus; + } + { + name = "mazegaki"; + description = "SKK dictionary for mazegaki"; + license = lib.licenses.gpl2Plus; + } + { + name = "emoji"; + description = "SKK dictionary for emojis"; + license = lib.licenses.unicode-dfs-2016; + } + { + name = "pinyin"; + description = "SKK dictionary for pinyin to simplified Chinese input"; + license = lib.licenses.gpl1Plus; + } +]) diff --git a/pkgs/tools/llm/gorilla-cli/default.nix b/pkgs/tools/llm/gorilla-cli/default.nix index 276793c2c8bc9..b3e5a0fde509b 100644 --- a/pkgs/tools/llm/gorilla-cli/default.nix +++ b/pkgs/tools/llm/gorilla-cli/default.nix @@ -32,6 +32,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "LLMs for your CLI"; homepage = "https://github.com/gorilla-llm/gorilla-cli"; + changelog = "https://github.com/gorilla-llm/gorilla-cli/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; mainProgram = "gorilla"; diff --git a/pkgs/tools/llm/heygpt/default.nix b/pkgs/tools/llm/heygpt/default.nix index f65dc392a2be1..71ad738b8b921 100644 --- a/pkgs/tools/llm/heygpt/default.nix +++ b/pkgs/tools/llm/heygpt/default.nix @@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Simple command-line interface for ChatGPT API"; homepage = "https://github.com/fuyufjh/heygpt"; + changelog = "https://github.com/fuyufjh/heygpt/releases/tag/v${version}"; license = licenses.mit; mainProgram = "heygpt"; maintainers = with maintainers; [aldoborrero]; diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index 011f186bbbe20..eef5fe0df344d 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { "cp ${writeText "config.def.h" conf} config.def.h"; installFlags = [ "install-completion" ]; - CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; patches = [ # https://github.com/martanne/abduco/pull/22 diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 67739f5751694..2517724c8c392 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-4uGS0LReq5dI7+Wel7ZWzFXx+utZWi93q4TUSw7AhNI="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-liconv"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; preBuild = '' substituteInPlace src/Makefile --replace "CC=gcc" "CC?=gcc" diff --git a/pkgs/tools/misc/aichat/default.nix b/pkgs/tools/misc/aichat/default.nix index 6aed087809871..5a0335d15be6d 100644 --- a/pkgs/tools/misc/aichat/default.nix +++ b/pkgs/tools/misc/aichat/default.nix @@ -9,23 +9,23 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; rev = "v${version}"; - hash = "sha256-khi5B8nYNK7otWZEs5koCzQaYGZwmGxP3zrMYIt3Ds4="; + hash = "sha256-gUn1NnEbiZbg7zBer1KX8smBCpcL0fQ+TkEoH8kdPws="; }; - cargoHash = "sha256-IHGl+Lxa9ZKlyXp59mv72QIvC3hkXPFOUKPVYbN50W4="; + cargoHash = "sha256-xbWcH8kkDe3+IEeHqxd8QW1h5oPDJfAkfNzJp8MWLR8="; nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security diff --git a/pkgs/tools/misc/aoc-cli/default.nix b/pkgs/tools/misc/aoc-cli/default.nix index 4fec5647e04d7..693f87389e1ba 100644 --- a/pkgs/tools/misc/aoc-cli/default.nix +++ b/pkgs/tools/misc/aoc-cli/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; cargoHash = "sha256-EluP4N3UBQeEKVdHTs4O0THXji+nAyE52nGKsxA3AA4="; diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index 0849977658682..8e31710ff324a 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index e933edf3642b6..7afbce58c1066 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { autoPatchelfHook ]; - sourceRoot = if stdenv.isDarwin then "." else null; + sourceRoot = if stdenv.hostPlatform.isDarwin then "." else null; installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then diff --git a/pkgs/tools/misc/asciinema-agg/default.nix b/pkgs/tools/misc/asciinema-agg/default.nix index 238a5c8af0736..e7f7334de3e03 100644 --- a/pkgs/tools/misc/asciinema-agg/default.nix +++ b/pkgs/tools/misc/asciinema-agg/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 08d130513cd9e..f84c93eb3faad 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { description = "Terminal session recorder and the best companion of asciinema.org"; homepage = "https://asciinema.org/"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; mainProgram = "asciinema"; }; diff --git a/pkgs/tools/misc/backdown/default.nix b/pkgs/tools/misc/backdown/default.nix index f75388ea8677d..78ad5be3f31ea 100644 --- a/pkgs/tools/misc/backdown/default.nix +++ b/pkgs/tools/misc/backdown/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "backdown"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "Canop"; repo = "backdown"; rev = "v${version}"; - hash = "sha256-w9EdDSGqmHRLXwx5qFo0BngKATKtQsieMt6dPgfOrQ0="; + hash = "sha256-3+XmMRZz3SHF1sL+/CUvu4uQ2scE4ACpcC0r4nWhdkM="; }; - cargoHash = "sha256-BOwhXq/xVuk3KylL3KeIkiIG3SXVASFiYkUgKJhMzuU="; + cargoHash = "sha256-+SxXOpSBuVVdX2HmJ4vF45uf5bvRtPdwaXUb9kq+lK0="; meta = with lib; { description = "File deduplicator"; diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index 20bdb11d01799..7e1eea61d0a93 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { # Assertion error "test_help_output" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # FsOperationFailed "test_get_file_mode" ]; diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index 1c3a805367f29..0891499b22611 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -55,7 +55,7 @@ let # Run the library tests as they don't have external dependencies doCheck = true; - nativeCheckInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); + nativeCheckInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]); checkPhase = '' runHook preCheck # test list repeats suites. Unique them @@ -112,7 +112,7 @@ let dontBuild = true; # we've already built doCheck = true; - nativeCheckInputs = [ bat bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); + nativeCheckInputs = [ bat bash fish zsh ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]); checkPhase = '' runHook preCheck bash ./test.sh --compiled --suite ${name} @@ -144,7 +144,7 @@ in { batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta); batgrep = script "batgrep" [ less coreutils ripgrep ]; - batman = script "batman" (lib.optionals stdenv.isLinux [ util-linux ]); + batman = script "batman" (lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]); batpipe = script "batpipe" [ less ]; batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr); prettybat = script "prettybat" ([] diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index ea5360549b203..c6dd28777b4d2 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-bgKK7x6Kaz5azvCYWEp7tocI81z+dAEbNBwR/qXktcM="; }; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace lib/Makefile.dynamic \ --replace '-Wl,-soname,$(SONAME)' "" ''; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH=`pwd`/lib ''; diff --git a/pkgs/tools/misc/blacken-docs/default.nix b/pkgs/tools/misc/blacken-docs/default.nix deleted file mode 100644 index 434f684b78d29..0000000000000 --- a/pkgs/tools/misc/blacken-docs/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ black -, fetchFromGitHub -, lib -, python3 -}: -python3.pkgs.buildPythonApplication rec { - pname = "blacken-docs"; - version = "1.15.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "adamchainz"; - repo = "blacken-docs"; - rev = version; - hash = "sha256-3FGuFOAHCcybPwujWlh58NWtuF5CebaKTgBWgCGpSL8="; - }; - - nativeBuildInputs = [ - python3.pkgs.setuptools - ]; - - propagatedBuildInputs = [ - black - ]; - - nativeCheckInputs = [ - black - python3.pkgs.pytestCheckHook - ]; - - meta = with lib; { - homepage = "https://github.com/adamchainz/blacken-docs"; - changelog = "https://github.com/adamchainz/blacken-docs/blob/${src.rev}/CHANGELOG.rst"; - description = "Run Black on Python code blocks in documentation files"; - license = licenses.mit; - maintainers = with maintainers; [ l0b0 ]; - mainProgram = "blacken-docs"; - }; -} diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix deleted file mode 100644 index 2f36c452fcb15..0000000000000 --- a/pkgs/tools/misc/bmap-tools/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages }: - -python3Packages.buildPythonApplication rec { - pname = "bmap-tools"; - version = "3.6"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "bmap-tools"; - rev = "v${version}"; - sha256 = "01xzrv5nvd2nvj91lz4x9s91y9825j9pj96z0ap6yvy3w2dgvkkl"; - }; - - propagatedBuildInputs = with python3Packages; [ six ]; - - # tests fail only on hydra. - doCheck = false; - - meta = with lib; { - description = "bmap-related tools"; - homepage = "https://github.com/intel/bmap-tools"; - license = licenses.gpl2Only; - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.linux; - mainProgram = "bmaptool"; - }; -} diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index 237eb7476da56..a123a3380f1be 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ ncurses libconfuse ] ++ lib.optional stdenv.isLinux libnl; + buildInputs = [ ncurses libconfuse ] ++ lib.optional stdenv.hostPlatform.isLinux libnl; preConfigure = '' # Must be an absolute path diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix index b2596746f7df9..845ccf532b8eb 100644 --- a/pkgs/tools/misc/boxxy/default.nix +++ b/pkgs/tools/misc/boxxy/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ dit7ya figsoda ]; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "boxxy"; }; } diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index f2de104c58254..745f39b4363a7 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, python3, bluez , tcl, acl, kmod, coreutils, shadow, util-linux -, alsaSupport ? stdenv.isLinux, alsa-lib +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 03854f99770f0..17c28c8f3bdd3 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -13,22 +13,22 @@ , xorg , zlib , buildPackages -, withClipboard ? !stdenv.isDarwin -, withTrash ? !stdenv.isDarwin +, withClipboard ? !stdenv.hostPlatform.isDarwin +, withTrash ? !stdenv.hostPlatform.isDarwin }: rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.43.0"; + version = "1.44.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-x6PDewUCcy8uf0unG8FiePrP1FKbgvjx/NhkodYva00="; + hash = "sha256-0YZma3+Qk2P8lvVS7+Uma0YayuHxtK8lFTZXjTmPIuY="; }; - cargoHash = "sha256-6SeOd4yNLFqkm47ELqmqaLl0BZS1+gVKHjphdcFdtoY="; + cargoHash = "sha256-QsUHJpSdI0Vz8hbK0Nqn3gxEpCkMGcj1R1CCgLIyEtE="; nativeBuildInputs = [ installShellFiles @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation libiconv Security diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 6c4c85559957a..d4d963cd06bee 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.3.8"; + version = "3.3.9"; # release including submodule src = fetchurl { url = "https://github.com/calamares/calamares/releases/download/v${version}/calamares-${version}.tar.gz"; - sha256 = "sha256-CUNbBOflzuFhdyIwaNinQCw8a4EmrxP/Unr3d0LEM2M="; + sha256 = "sha256-2PcPpoLKcy9EjHAz5mxdT3RxYQMfdPRneOIHKM7/a0U="; }; # On major changes, or when otherwise required, you *must* : diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 3a6270d196021..a6a376abd9302 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.14.2"; + version = "1.14.4"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-BK2QTlcns+e3LL3NgcVYk4an+j/x0btpKAuBZ+QIN+Q="; + sha256 = "sha256-jrLlhpPWsc1aOEH36W6MbikAj1nAX8CinHKG+iRk+18="; }; nativeBuildInputs = [ autoconf @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib imagemagick ] - ++ lib.optional stdenv.isDarwin Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; patches = [ ./xmlcatalog_patch.patch ]; diff --git a/pkgs/tools/misc/checkpwn/default.nix b/pkgs/tools/misc/checkpwn/default.nix index 994fecc6c4db1..e89e6b8800971 100644 --- a/pkgs/tools/misc/checkpwn/default.nix +++ b/pkgs/tools/misc/checkpwn/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-G+QWnGf+Zp94EHVnYM3Q/iEhEQMU2O/c4i5ya/dY7K4="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index ca0f6705b9fe4..6c077b227274f 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -1,6 +1,6 @@ { lib, wrapQtAppsHook, fetchFromGitHub, substituteAll, udev, stdenv , pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu, gnused -, withPulseaudio ? stdenv.isLinux, libpulseaudio, quazip +, withPulseaudio ? stdenv.hostPlatform.isLinux, libpulseaudio, quazip }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/clipboard-jh/default.nix b/pkgs/tools/misc/clipboard-jh/default.nix index 78ba8e6c3ba7f..9b0369e8fad27 100644 --- a/pkgs/tools/misc/clipboard-jh/default.nix +++ b/pkgs/tools/misc/clipboard-jh/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { wayland-scanner ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libffi wayland-protocols wayland xorg.libX11 alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { "-DINSTALL_PREFIX=${placeholder "out"}" ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/cb --add-rpath $out/lib ''; diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index 32ef248ca854c..294746ae9a360 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -1,26 +1,46 @@ -{ lib, stdenv, fetchurl, makeWrapper -, gawk, gnused, util-linux, file -, wget, python3, qemu-utils -, e2fsprogs, cdrkit -, gptfdisk }: - +{ lib +, stdenv +, fetchFromGitHub +, gitUpdater +, makeWrapper +, gawk +, gnused +, util-linux +, file +, wget +, python3 +, qemu-utils +, e2fsprogs +, cdrkit +, gptfdisk +}: let # according to https://packages.debian.org/sid/cloud-image-utils + https://packages.debian.org/sid/admin/cloud-guest-utils guestDeps = [ - e2fsprogs gptfdisk gawk gnused util-linux + e2fsprogs + gptfdisk + gawk + gnused + util-linux ]; binDeps = guestDeps ++ [ - wget file qemu-utils cdrkit + wget + file + qemu-utils + cdrkit ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { # NOTICE: if you bump this, make sure to run # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops # growpart is needed in initrd in nixos/system/boot/grow-partition.nix pname = "cloud-utils"; - version = "0.32"; - src = fetchurl { - url = "https://launchpad.net/cloud-utils/trunk/${version}/+download/cloud-utils-${version}.tar.gz"; - sha256 = "0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk"; + version = "0.33"; + src = fetchFromGitHub { + owner = "canonical"; + repo = "cloud-utils"; + rev = "refs/tags/${version}"; + hash = "sha256-YqfkmYclPZu6Mc2bFYxtiuH7uvfa3V4YlD0aHuKn1hw="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python3 ]; @@ -29,7 +49,7 @@ in stdenv.mkDerivation rec { # $guest output contains all executables needed for cloud-init and $out the rest + $guest # This is similar to debian's package split into cloud-image-utils and cloud-guest-utils # The reason is to reduce the closure size - outputs = [ "out" "guest"]; + outputs = [ "out" "guest" ]; postFixup = '' moveToOutput bin/ec2metadata $guest @@ -48,7 +68,11 @@ in stdenv.mkDerivation rec { dontBuild = true; + passthru.updateScript = gitUpdater { }; + meta = with lib; { + description = "Useful set of utilities for interacting with a cloud"; + homepage = "https://github.com/canonical/cloud-utils"; platforms = platforms.unix; license = licenses.gpl3; }; diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix index eba78d6c2263a..08ea681eedb8b 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { homepage = "https://github.com/dim-an/cod/"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "cod"; }; } diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index db58ede25abff..2bc64b425e5ff 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5/UgEzkJw9XDgtS1jKyWh5ijTp3L+UQLuE5CXcyIgTs="; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; meta = with lib; { description = "High performance code minimap render"; diff --git a/pkgs/tools/misc/coinlive/default.nix b/pkgs/tools/misc/coinlive/default.nix index 2db008551c8bd..564f19f85b979 100644 --- a/pkgs/tools/misc/coinlive/default.nix +++ b/pkgs/tools/misc/coinlive/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/tools/misc/convbin/default.nix index 96164902dc2c5..7d61c684f9cba 100644 --- a/pkgs/tools/misc/convbin/default.nix +++ b/pkgs/tools/misc/convbin/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-zCRM62xwaPaN8+cg+CeaqK/9hKpZmSBBeUOQqAvQGYw="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace "-flto" "" ''; diff --git a/pkgs/tools/misc/convimg/default.nix b/pkgs/tools/misc/convimg/default.nix index e10c2102fec51..561a425dfae9f 100644 --- a/pkgs/tools/misc/convimg/default.nix +++ b/pkgs/tools/misc/convimg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "convimg"; - version = "9.3"; + version = "9.4"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - hash = "sha256-xnfMHlbQ7XG/mvnWoGkRHhxIK2u7kWJTVnLxd9c5oNU="; + hash = "sha256-5insJ391Usef8GF3Yh74PEqE534zitQg9udFRPcz69g="; fetchSubmodules = true; }; diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 69be5edc3f640..82c0acd63f121 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,47 +1,83 @@ -{ lib, stdenv, fetchgit, pkg-config, zlib, pciutils, openssl, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }: +{ + lib, + stdenv, + fetchgit, + pkg-config, + zlib, + pciutils, + openssl, + coreutils, + acpica-tools, + makeWrapper, + gnugrep, + gnused, + file, + buildEnv, +}: let - version = "24.05"; + version = "24.08"; commonMeta = { description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; - license = with lib.licenses; [ gpl2Only gpl2Plus ]; - maintainers = with lib.maintainers; [ felixsinger jmbaur ]; + license = with lib.licenses; [ + gpl2Only + gpl2Plus + ]; + maintainers = with lib.maintainers; [ + felixsinger + jmbaur + ]; platforms = lib.platforms.linux; }; - generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation ({ - inherit pname version; + generic = + { + pname, + path ? "util/${pname}", + ... + }@args: + stdenv.mkDerivation ( + { + inherit pname version; - src = fetchgit { - url = "https://review.coreboot.org/coreboot"; - rev = version; - hash = "sha256-Fq3tZje6QoMskxqWd61OstgI9Sj25yijf8S3LiTJuYc="; - }; + src = fetchgit { + url = "https://review.coreboot.org/coreboot"; + rev = version; + hash = "sha256-BwuoBuWKHTnSwV8ubm5NqcddgxP5OMXuTl3zmwwKEsg="; + }; - enableParallelBuilding = true; + enableParallelBuilding = true; - postPatch = '' - substituteInPlace 3rdparty/vboot/Makefile --replace 'ar qc ' '$$AR qc ' - cd ${path} - patchShebangs . - ''; + postPatch = '' + substituteInPlace 3rdparty/vboot/Makefile --replace 'ar qc ' '$$AR qc ' + cd ${path} + patchShebangs . + ''; - makeFlags = [ - "INSTALL=install" - "PREFIX=${placeholder "out"}" - ]; + makeFlags = [ + "INSTALL=install" + "PREFIX=${placeholder "out"}" + ]; - meta = commonMeta // args.meta; - } // (removeAttrs args [ "meta" ])); + meta = commonMeta // args.meta; + } + // (removeAttrs args [ "meta" ]) + ); utils = { msrtool = generic { pname = "msrtool"; meta.description = "Dump chipset-specific MSR registers"; - meta.platforms = [ "x86_64-linux" "i686-linux" ]; - buildInputs = [ pciutils zlib ]; + meta.platforms = [ + "x86_64-linux" + "i686-linux" + ]; + buildInputs = [ + pciutils + zlib + ]; preConfigure = "export INSTALL=install"; }; cbmem = generic { @@ -55,8 +91,14 @@ let intelmetool = generic { pname = "intelmetool"; meta.description = "Dump interesting things about Management Engine"; - meta.platforms = [ "x86_64-linux" "i686-linux" ]; - buildInputs = [ pciutils zlib ]; + meta.platforms = [ + "x86_64-linux" + "i686-linux" + ]; + buildInputs = [ + pciutils + zlib + ]; }; cbfstool = generic { pname = "cbfstool"; @@ -70,20 +112,35 @@ let superiotool = generic { pname = "superiotool"; meta.description = "User-space utility to detect Super I/O of a mainboard and provide detailed information about the register contents of the Super I/O"; - meta.platforms = [ "x86_64-linux" "i686-linux" ]; - buildInputs = [ pciutils zlib ]; + meta.platforms = [ + "x86_64-linux" + "i686-linux" + ]; + buildInputs = [ + pciutils + zlib + ]; }; ectool = generic { pname = "ectool"; meta.description = "Dump the RAM of a laptop's Embedded/Environmental Controller (EC)"; - meta.platforms = [ "x86_64-linux" "i686-linux" ]; + meta.platforms = [ + "x86_64-linux" + "i686-linux" + ]; preInstall = "mkdir -p $out/sbin"; }; inteltool = generic { pname = "inteltool"; meta.description = "Provides information about Intel CPU/chipset hardware configuration (register contents, MSRs, etc)"; - meta.platforms = [ "x86_64-linux" "i686-linux" ]; - buildInputs = [ pciutils zlib ]; + meta.platforms = [ + "x86_64-linux" + "i686-linux" + ]; + buildInputs = [ + pciutils + zlib + ]; }; amdfwtool = generic { pname = "amdfwtool"; @@ -113,19 +170,30 @@ let ''; postFixup = '' wrapProgram $out/bin/acpidump-all \ - --set PATH ${lib.makeBinPath [ coreutils acpica-tools gnugrep gnused file ]} + --set PATH ${ + lib.makeBinPath [ + coreutils + acpica-tools + gnugrep + gnused + file + ] + } ''; }; }; in -utils // { - coreboot-utils = (buildEnv { - name = "coreboot-utils-${version}"; - paths = lib.filter (lib.meta.availableOn stdenv.hostPlatform) (lib.attrValues utils); - postBuild = "rm -rf $out/sbin"; - }) // { - inherit version; - meta = commonMeta; - }; +utils +// { + coreboot-utils = + (buildEnv { + name = "coreboot-utils-${version}"; + paths = lib.filter (lib.meta.availableOn stdenv.hostPlatform) (lib.attrValues utils); + postBuild = "rm -rf $out/sbin"; + }) + // { + inherit version; + meta = commonMeta; + }; } diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index d9fbd4459f04f..5bbc3b9581ee8 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c '' - ])) + (optionalString stdenv.isAarch64 '' + ])) + (optionalString stdenv.hostPlatform.isAarch64 '' # Sometimes fails: https://github.com/NixOS/nixpkgs/pull/143097#issuecomment-954462584 sed '2i echo Skipping cut huge range test && exit 77' -i ./tests/cut/cut-huge-range.sh ''); @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { ++ optional withPrefix "--program-prefix=g" # the shipped configure script doesn't enable nls, but using autoreconfHook # does so which breaks the build - ++ optional stdenv.isDarwin "--disable-nls" + ++ optional stdenv.hostPlatform.isDarwin "--disable-nls" ++ optionals (isCross && stdenv.hostPlatform.libc == "glibc") [ # TODO(19b98110126fde7cbb1127af7e3fe1568eacad3d): Needed for fstatfs() I # don't know why it is not properly detected cross building with glibc. @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = (!isCross) && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") - && !stdenv.isAarch32; + && !stdenv.hostPlatform.isAarch32; # Prevents attempts of running 'help2man' on cross-built binaries. PERL = if isCross then "missing" else null; diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix index e36bd288b2ae1..9ed7ef6295e6b 100644 --- a/pkgs/tools/misc/cutecom/default.nix +++ b/pkgs/tools/misc/cutecom/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtserialport ]; nativeBuildInputs = [ cmake wrapQtAppsHook ]; - postInstall = if stdenv.isDarwin then '' + postInstall = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications '' else '' cd .. diff --git a/pkgs/tools/misc/cyclonedx-python/default.nix b/pkgs/tools/misc/cyclonedx-python/default.nix index b3439723aaff8..fe37119359519 100644 --- a/pkgs/tools/misc/cyclonedx-python/default.nix +++ b/pkgs/tools/misc/cyclonedx-python/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "cyclonedx-python"; - version = "4.5.0"; + version = "4.6.0"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+XeMRREDX1+v+qOeYiHh7uhadfueYYOxspLY3q1NL6s="; + hash = "sha256-EcCxw3SppuGUgN7AIU9NhpRw7dLDhTHHT5emGOgkDFU="; }; build-system = with python3Packages; [ poetry-core ]; @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/CycloneDX/cyclonedx-python"; changelog = "https://github.com/CycloneDX/cyclonedx-python/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ xanderio ]; + maintainers = lib.teams.cyberus.members; mainProgram = "cyclonedx-py"; }; } diff --git a/pkgs/tools/misc/daktilo/default.nix b/pkgs/tools/misc/daktilo/default.nix index e557862b67138..3d9b4161e2991 100644 --- a/pkgs/tools/misc/daktilo/default.nix +++ b/pkgs/tools/misc/daktilo/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { xorg.libX11 xorg.libXi xorg.libXtst - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/datefmt/default.nix b/pkgs/tools/misc/datefmt/default.nix index 36fdf9fcfebbc..1c1efd792a203 100644 --- a/pkgs/tools/misc/datefmt/default.nix +++ b/pkgs/tools/misc/datefmt/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, datefmt, testers }: +{ lib, stdenv, fetchurl, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "datefmt"; version = "0.2.2"; src = fetchurl { - url = "https://cdn.jb55.com/tarballs/datefmt/datefmt-${version}.tar.gz"; + url = "https://cdn.jb55.com/tarballs/datefmt/datefmt-${finalAttrs.version}.tar.gz"; sha256 = "sha256-HgW/vOGVEmAbm8k3oIwIa+cogq7qmX7MfTmHqxv9lhY="; }; makeFlags = [ "PREFIX=$(out)" ]; - passthru.tests.version = testers.testVersion { package = datefmt; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { homepage = "https://jb55.com/datefmt"; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jb55 ]; mainProgram = "datefmt"; }; -} +}) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 446af91077541..c22dfdb148655 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -40,14 +40,14 @@ let binPath = lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.136"; + version = "1.0.137"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; - repo = pname; + repo = "debootstrap"; rev = "refs/tags/${version}"; - hash = "sha256-hUXOUIUSANXS1a65AA30jZ3J444Xb2klu3m8x0QJfns="; + hash = "sha256-l4vdojsrHAJsa8RwZezH3uI6pWJHK/PBs+YZCtnpXnQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/dialogbox/default.nix b/pkgs/tools/misc/dialogbox/default.nix index 7012f9d69ad58..e6849fa843100 100644 --- a/pkgs/tools/misc/dialogbox/default.nix +++ b/pkgs/tools/misc/dialogbox/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/martynets/dialogbox/"; description = "Qt-based scriptable engine providing GUI dialog boxes"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix index 362673a5ca824..94efc1af33db3 100644 --- a/pkgs/tools/misc/didyoumean/default.nix +++ b/pkgs/tools/misc/didyoumean/default.nix @@ -25,14 +25,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 293893dddd567..596de8dc1a889 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -102,11 +102,11 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "276"; + version = "278"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-Tfl8WZRcarcf59fhUclM6NF6NWO7SgzdLrWEBhk88+Y="; + hash = "sha256-42yZ/PkyiL/epqdGLZiteh3rvDiHBhGL04VDysKRLKA="; }; outputs = [ @@ -245,7 +245,7 @@ python.pkgs.buildPythonApplication rec { # 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.isLinux [ oggvideotools ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ oggvideotools ] # This doesn't work on aarch64-darwin ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ gnumeric ] ) @@ -272,7 +272,7 @@ python.pkgs.buildPythonApplication rec { # Fails because it fails to determine llvm version "test_item3_deflate_llvm_bitcode" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable flaky tests on Darwin "test_non_unicode_filename" "test_listing" @@ -288,7 +288,7 @@ python.pkgs.buildPythonApplication rec { "test_libmix_differences" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/comparators/test_git.py" "tests/comparators/test_java.py" "tests/comparators/test_uimage.py" diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index 1a73a4d84faf1..344faf84f60bd 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "dijo"; version = "0.2.7"; - buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin CoreServices; + buildInputs = [ ncurses ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; src = fetchFromGitHub { owner = "NerdyPepper"; repo = "dijo"; diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix index d9738b398b04f..fa9d7f00a83b7 100644 --- a/pkgs/tools/misc/diskonaut/default.nix +++ b/pkgs/tools/misc/diskonaut/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-S/ne3iTEnlA3AqcPg3geLzV4bYVuYPjMCITSVJFnWYI="; # 1 passed; 44 failed https://hydra.nixos.org/build/148943783/nixlog/1 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Terminal disk space navigator"; diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index fd37b2b9c99b7..683da47d6af69 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-SKd2CU0F2iR4bSHntu2VKvZyjjf2XJeXJG6XS/fIBMU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoHash = "sha256-qNXv6Z9sKl7rol78UTOSRFML/JCGfOJMGOdt49KHD50="; diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index d226c2fc8f00b..a42e57ebc5aec 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { homepage = "https://github.com/skanehira/docui"; license = licenses.mit; maintainers = with maintainers; [ aethelz ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "docui"; }; } diff --git a/pkgs/tools/misc/dtool/default.nix b/pkgs/tools/misc/dtool/default.nix index 8b4349dbb59ac..0e62d91cdbc95 100644 --- a/pkgs/tools/misc/dtool/default.nix +++ b/pkgs/tools/misc/dtool/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-o5Xvc0tnoUgfp5k7EqVuEH9Zyo3C+A+mVqPhMtZCYKw="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; # FIXME: remove patch when upstream version of rustc-serialize is updated diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 130a21d0709a0..aed4b2d53c887 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-bqWYXcry+mCUNgYS+7+MWfiV+u+3oZZg1o3Q6Mac+vE="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 56fe697528abc..8ef860f32e050 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , tokyocabinet, ncurses , cairo ? null, pango ? null -, enableCairo ? stdenv.isLinux +, enableCairo ? stdenv.hostPlatform.isLinux }: assert enableCairo -> cairo != null && pango != null; diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix index aedac2d61f986..f4e36f271bab4 100644 --- a/pkgs/tools/misc/dvtm/dvtm.nix +++ b/pkgs/tools/misc/dvtm/dvtm.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { inherit pname version src patches; - CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; postPatch = lib.optionalString (customConfig != null) '' cp ${builtins.toFile "config.h" customConfig} ./config.h diff --git a/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix b/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix index 8b0c96316c974..0843962703fe5 100644 --- a/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix +++ b/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix @@ -37,9 +37,12 @@ stdenvNoCC.mkDerivation { ''; postFixup = '' - substituteInPlace $out/bin/colorscript \ - --replace "/opt/shell-color-scripts/colorscripts" \ - "$out/share/shell-color-scripts/colorscripts" + substituteInPlace \ + $out/bin/colorscript \ + $out/share/fish/vendor_completions.d/colorscript.fish \ + $out/share/zsh/site-functions/_colorscript \ + --replace-fail "/opt/shell-color-scripts/colorscripts" \ + "$out/share/shell-color-scripts/colorscripts" ''; meta = { diff --git a/pkgs/tools/misc/ea/default.nix b/pkgs/tools/misc/ea/default.nix index d45f3b431dcd8..7ea3b5c11ca85 100644 --- a/pkgs/tools/misc/ea/default.nix +++ b/pkgs/tools/misc/ea/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/tools/misc/easeprobe/default.nix b/pkgs/tools/misc/easeprobe/default.nix index 314149003a15c..3691d73b0b34f 100644 --- a/pkgs/tools/misc/easeprobe/default.nix +++ b/pkgs/tools/misc/easeprobe/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "easeprobe"; - version = "2.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "megaease"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vdbzDwFpCYVgH9T8e62+1hnMyWsWrT7e6WPaAlBc2H0="; + sha256 = "sha256-XPbRtW3UIc6N1D1LKDYxgTHGVmiGDnam+r5Eg4uBa7w="; }; - vendorHash = "sha256-ZB6q8XvDVSF5/kx2Avq0PYBkYqSoMD6YHhuXRrotFgk="; + vendorHash = "sha256-2iQJiRKt4/mBwwkjhohA1LeOfRart8WQT1bOIFuHbtA="; subPackages = [ "cmd/easeprobe" ]; diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index 24c4266424a72..fbee1797992d4 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ]; src = fetchgit { - url = "git://linuxtv.org/edid-decode.git"; + url = "https://git.linuxtv.org/edid-decode.git"; rev = "3d635499e4aca3319f0796ba787213c981c5a770"; hash = "sha256-bqzO39YM/3h9p37xaGJAw9xERgWOD+4yqO/XQiq/QqM="; }; @@ -25,6 +25,8 @@ stdenv.mkDerivation { export mandir=/share/man ''; + enableParallelBuilding = true; + passthru.updateScript = unstableGitUpdater { }; meta = with lib; { diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix index fc7f01226972b..e3855fc76f2f8 100644 --- a/pkgs/tools/misc/edid-generator/default.nix +++ b/pkgs/tools/misc/edid-generator/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ flokli nazarewk ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/edid-generator.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/edid-generator.x86_64-darwin }; } diff --git a/pkgs/tools/misc/edk2-uefi-shell/default.nix b/pkgs/tools/misc/edk2-uefi-shell/default.nix index 0ec0104726454..723833ab45cf4 100644 --- a/pkgs/tools/misc/edk2-uefi-shell/default.nix +++ b/pkgs/tools/misc/edk2-uefi-shell/default.nix @@ -38,6 +38,6 @@ edk2.mkDerivation "ShellPkg/ShellPkg.dsc" (finalAttrs: { description = "UEFI Shell from Tianocore EFI development kit"; homepage = "https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg"; maintainers = with lib.maintainers; [ LunNova mjoerg ]; - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/tools/misc/eludris/default.nix b/pkgs/tools/misc/eludris/default.nix index e0762d179ec08..756324c1a8b23 100644 --- a/pkgs/tools/misc/eludris/default.nix +++ b/pkgs/tools/misc/eludris/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p eludris" ]; cargoTestFlags = [ "-p eludris" ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/pkgs/tools/misc/enjarify/default.nix b/pkgs/tools/misc/enjarify/default.nix index 4e4f21430132e..37daac6c06b30 100644 --- a/pkgs/tools/misc/enjarify/default.nix +++ b/pkgs/tools/misc/enjarify/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { chmod +x $out/bin/enjarify ''; - buildInputs = [ ]; - meta = with lib; { description = "Tool for translating Dalvik bytecode to equivalent Java bytecode"; homepage = "https://github.com/google/enjarify/"; diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix index 984dd60082e39..22a0075363994 100644 --- a/pkgs/tools/misc/envchain/default.nix +++ b/pkgs/tools/misc/envchain/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsecret readline ] - ++ lib.optionals stdenv.isDarwin [ libedit ncurses Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libedit ncurses Security ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 487cac6becda0..b661d9866e85c 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -21,14 +21,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.8.1"; + version = "2024.9.2"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wjvbnqlhg4AHJLQvjWysDXBjECc1sV5ilx1jk8IzILw="; + hash = "sha256-i1lrolOrKwa9muXhoknLYATEfLSrVA63VrM3247hVMw="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 67eaacddaf6f4..1a61e8ae351f7 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -1,30 +1,34 @@ { lib , fetchFromGitHub -, python3 +, python3Packages , softhsm }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "esptool"; - version = "4.7.0"; - - format = "setuptools"; + version = "4.8.1"; + pyproject = true; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; - rev = "v${version}"; - hash = "sha256-yrEwCg0e+8jZorL6jcqeuKUCFoV0oP9HVFh1n/ezjPg="; + rev = "refs/tags/v${version}"; + hash = "sha256-cNEg2a3j7Vql06GwVaE9y86UtMkNsUdJYM00OEUra2w="; }; postPatch = '' patchShebangs ci substituteInPlace test/test_espsecure_hsm.py \ - --replace "/usr/lib/softhsm" "${lib.getLib softhsm}/lib/softhsm" + --replace-fail "/usr/lib/softhsm" "${lib.getLib softhsm}/lib/softhsm" ''; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + argcomplete bitstring cryptography ecdsa @@ -32,14 +36,17 @@ python3.pkgs.buildPythonApplication rec { pyserial reedsolo pyyaml - python-pkcs11 ]; - nativeCheckInputs = with python3.pkgs; [ + optional-dependencies = with python3Packages; { + hsm = [ python-pkcs11 ]; + }; + + nativeCheckInputs = with python3Packages; [ pyelftools pytestCheckHook softhsm - ]; + ] ++ lib.flatten (lib.attrValues optional-dependencies); # tests mentioned in `.github/workflows/test_esptool.yml` checkPhase = '' @@ -60,6 +67,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { + changelog = "https://github.com/espressif/esptool/blob/${src.rev}/CHANGELOG.md"; description = "ESP8266 and ESP32 serial bootloader utility"; homepage = "https://github.com/espressif/esptool"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 102120a8604e4..ffbfb3a64141a 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -42,7 +42,7 @@ tcl.mkTclDerivation rec { postInstall = '' tclWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ tcl ]}) - ${lib.optionalString stdenv.isDarwin "tclWrapperArgs+=(--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version})"} + ${lib.optionalString stdenv.hostPlatform.isDarwin "tclWrapperArgs+=(--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version})"} ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index deb97aced8ef0..f7a70b966acf6 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-mEgFfg8I+JJuUEvj+sia2aL3BVg3HteQorZ2EOiLo64="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit ]; # device::test_physical_device_name test fails on Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkFlags = [ # ofborg sometimes fails with "Resource temporarily unavailable" diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix index 8dff1eec4928b..bf010cfa798e3 100644 --- a/pkgs/tools/misc/fclones/gui.nix +++ b/pkgs/tools/misc/fclones/gui.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { gdk-pixbuf gtk4 libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.IOKit ]; diff --git a/pkgs/tools/misc/fcp/default.nix b/pkgs/tools/misc/fcp/default.nix index 814d764a7999f..9d3a7c4074fee 100644 --- a/pkgs/tools/misc/fcp/default.nix +++ b/pkgs/tools/misc/fcp/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ expect ]; # character_device fails with "File name too long" on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postPatch = '' patchShebangs tests/*.exp diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index 28dd0a88bac03..4eac639897618 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -1,21 +1,22 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3, stdenv }: python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.1.6"; + version = "7.1.12"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "refs/tags/v${version}"; - hash = "sha256-lnBiGBoG5ykKSP+F4NOqJKnvxaLU9oiV3KfbVnjgkgQ="; + hash = "sha256-DWex4pZV9ZVR1bqYcOpTe74ZQCQCQQxjWrv0QgtRY40="; }; propagatedBuildInputs = with python3.pkgs; [ defusedxml python-dateutil requests + xxhash ]; installPhase = '' @@ -26,6 +27,14 @@ python3.pkgs.buildPythonApplication rec { runHook postInstall ''; + checkPhase = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + runHook preCheck + + $out/bin/fedifetcher --help>/dev/null + + runHook postCheck + ''; + meta = with lib; { description = "Tool for Mastodon that automatically fetches missing replies and posts from other fediverse instances"; longDescription = '' @@ -34,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { own Mastodon instance. ''; homepage = "https://blog.thms.uk/fedifetcher"; + changelog = "https://github.com/nanos/FediFetcher/releases/tag/v${version}"; license = licenses.mit; maintainers = teams.c3d2.members; mainProgram = "fedifetcher"; diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 46639ea92bbb0..aa1fda03a4558 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -18,19 +18,19 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "printfn"; repo = "fend"; rev = "v${version}"; - hash = "sha256-lfn9RKN2TiHEroDaKJTeQ7wLU2tjoUTyD5Ar5QTNOlY="; + hash = "sha256-ktCfIFSGXOqHfqFkXt2ZO8jZFGTRd8wTxukGLZD1PTU="; }; - cargoHash = "sha256-zmqkGmN0fEYW+6U6cUQK27/OSV4JZW1EQiRswvBnA3M="; + cargoHash = "sha256-R5p7f+eEMDs0rs+45XNJC4znrJ9BrPBv5+dvMgoHFdA="; nativeBuildInputs = [ pandoc installShellFiles pkg-config copyDesktopItems ]; - buildInputs = [ pkg-config openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ pkg-config openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postBuild = '' patchShebangs --build ./documentation/build.sh diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 91fcaf4ac4497..c24650d4ffbc9 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -2,13 +2,13 @@ , installShellFiles , Security, AppKit -, x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD +, x11Support ? stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isBSD , xclip ? null, xsel ? null , preferXsel ? false # if true and xsel is non-null, use it instead of xclip }: let - usesX11 = stdenv.isLinux || stdenv.isBSD; + usesX11 = stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isBSD; in assert (x11Support && usesX11) -> xclip != null || xsel != null; @@ -58,9 +58,9 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = - if stdenv.isDarwin then [ Security AppKit ] + if stdenv.hostPlatform.isDarwin then [ Security AppKit ] else [ openssl ]; preBuild = lib.optionalString (x11Support && usesX11) ( diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix deleted file mode 100644 index bb0898a5d37f8..0000000000000 --- a/pkgs/tools/misc/fileschanged/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, gamin }: - -stdenv.mkDerivation rec { - pname = "fileschanged"; - version = "0.6.9"; - - src = fetchurl { - url = "mirror://savannah/fileschanged/fileschanged-${version}.tar.gz"; - sha256 = "0ajc9h023vzpnlqqjli4wbvs0q36nr5p9msc3wzbic8rk687qcxc"; - }; - - buildInputs = [ gamin ]; - - patches = [./unused-variables.debian.patch]; - - doCheck = true; - - meta = { - homepage = "https://www.nongnu.org/fileschanged/"; - description = "Command-line utility that reports when files have been altered"; - license = lib.licenses.gpl3Plus; - - longDescription = '' - This utility is a client to FAM (File Alteration Monitor) servers - like FAM or Gamin. You give it some filenames on the command line - and then it monitors those files for changes. When it discovers - that a file has been altered, it displays the filename on the - standard-output or executes a given command. - ''; - - platforms = lib.platforms.linux; - mainProgram = "fileschanged"; - }; -} diff --git a/pkgs/tools/misc/fileschanged/unused-variables.debian.patch b/pkgs/tools/misc/fileschanged/unused-variables.debian.patch deleted file mode 100644 index 73d307f9413d3..0000000000000 --- a/pkgs/tools/misc/fileschanged/unused-variables.debian.patch +++ /dev/null @@ -1,48 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 07_unused_variables.dpatch by Colin Watson <cjwatson@ubuntu.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: GCC 4.6 warns about unused variables, and fileschanged builds with -## DP: -Werror, so deal with unused variable warnings. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fileschanged-0.6.5~/src/monitor.c fileschanged-0.6.5/src/monitor.c ---- fileschanged-0.6.5~/src/monitor.c 2006-04-19 20:42:29.000000000 +0100 -+++ fileschanged-0.6.5/src/monitor.c 2011-09-14 01:17:23.000000000 +0100 -@@ -84,6 +84,7 @@ - retval = FAMMonitorDirectory (c, node->filename, &node->request, - (void *) node); - //printf ("FAMMonitorDirectory returns %d (reqnum %d)\n", retval, node->request.reqnum); -+ (void) retval; - } - else if (S_ISREG (node->statbuf.st_mode)) - { -@@ -91,6 +92,7 @@ - retval = FAMMonitorFile (c, node->filename, &node->request, - (void *) node); - //printf ("FAMMonitorFile returns %d (reqnum %d)\n", retval, node->request.reqnum); -+ (void) retval; - } - monitor_handle_events (c, list, 0, 30); - } - -diff -r -U3 fileschanged-0.6.9-orig/src/main.c fileschanged-0.6.9/src/main.c ---- fileschanged-0.6.9-orig/src/main.c 2012-04-13 01:31:59.160601022 +0400 -+++ fileschanged-0.6.9/src/main.c 2012-04-13 01:32:47.549599643 +0400 -@@ -126,6 +126,7 @@ - { - retval = process_file (filelist, filelist_len, arguments.args[i]); - } -+ (void) retval; - return 0; - } - -@@ -168,6 +169,7 @@ - - if (fileptr != stdin) - fclose (fileptr); -+ (void) retval; - return 0; - } - int - diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 41432415a2c63..239aa98b04e04 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var/cache" ]; - CFLAGS = lib.optionals stdenv.isDarwin [ + CFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ # TODO: Revisit upstream issue https://savannah.gnu.org/bugs/?59972 # https://github.com/Homebrew/homebrew-core/pull/69761#issuecomment-770268478 "-D__nonnull\\(params\\)=" diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 190841582a4f3..744876ffb62e9 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ libftdi1 libusb1 ] - ++ lib.optionals (!stdenv.isDarwin) [ pciutils ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pciutils ] ++ lib.optional jlinkSupport libjaylink; postPatch = '' @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "libinstall" ] ++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes" - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=no" ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=no" ]; postInstall = '' install -Dm644 util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules diff --git a/pkgs/tools/misc/flitter/default.nix b/pkgs/tools/misc/flitter/default.nix index 6b092b35be8ca..cf399ba9ebb9e 100644 --- a/pkgs/tools/misc/flitter/default.nix +++ b/pkgs/tools/misc/flitter/default.nix @@ -1,55 +1,32 @@ { lib -, ocamlPackages +, stdenv +, rustPlatform , fetchFromGitHub -, makeWrapper -, python3 +, pkg-config +, xorg }: -ocamlPackages.buildDunePackage { +rustPlatform.buildRustPackage rec { pname = "flitter"; - # request to tag releases: https://github.com/alexozer/flitter/issues/34 - version = "unstable-2020-10-05"; - - duneVersion = "3"; + version = "1.1.1"; src = fetchFromGitHub { owner = "alexozer"; repo = "flitter"; - rev = "666c5483bc93efa6d01e0b7a927461269f8e14de"; - sha256 = "1k3m7bjq5yrrq7vhnbdykni65dsqhq6knnv9wvwq3svb3n07z4w3"; + rev = "v${version}"; + sha256 = "sha256-8e13kSQEjzzf+j4uTrocVioZjJ6lAz+80dLfWwjPb9o="; }; - # compatibility with core >= 0.15 - patches = [ ./flitter.patch ]; - - # https://github.com/alexozer/flitter/issues/28 - postPatch = '' - for f in src/*.ml; do - substituteInPlace "$f" \ - --replace 'Unix.gettimeofday' 'Caml_unix.gettimeofday' \ - --replace 'Core_kernel' 'Core' \ - --replace 'sexp_option' 'option[@sexp.option]' \ - --replace 'sexp_list' 'list[@sexp.list]' - done - ''; + cargoHash = "sha256-NpUSWoOUhSgbzeCkXEgn4P387bada6fv/M8aZYe8CoU="; nativeBuildInputs = [ - makeWrapper + pkg-config ]; - buildInputs = with ocamlPackages; [ - core_unix - lwt_ppx - sexp_pretty - color - notty + buildInputs = [ + xorg.libX11 ]; - postInstall = '' - wrapProgram $out/bin/flitter \ - --prefix PATH : "${python3.withPackages (pp: [ pp.pynput ])}/bin" - ''; - meta = with lib; { description = "Livesplit-inspired speedrunning split timer for Linux/macOS terminal"; license = licenses.mit; @@ -57,5 +34,6 @@ ocamlPackages.buildDunePackage { homepage = "https://github.com/alexozer/flitter"; platforms = platforms.unix; mainProgram = "flitter"; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/misc/flitter/flitter.patch b/pkgs/tools/misc/flitter/flitter.patch deleted file mode 100644 index 04cd40dc74e58..0000000000000 --- a/pkgs/tools/misc/flitter/flitter.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/big.ml b/src/big.ml -index 7cd327f..f84bc10 100644 ---- a/src/big.ml -+++ b/src/big.ml -@@ -11,7 +11,7 @@ let big_font_map = - ] in - - let uchar_of_char = -- let open Caml.Uchar in -+ let open Stdlib.Uchar in - function - | '[' -> of_int 0x258C - | ']' -> of_int 0x2590 -@@ -48,4 +48,4 @@ let image_of_string attr str = - List.map (String.to_list str) ~f:(fun ch -> - List.map (Map.find_exn big_font_map ch) ~f:(I.uchars attr) - |> I.vcat -- ) |> I.hcat -\ No newline at end of file -+ ) |> I.hcat -diff --git a/src/display.ml b/src/display.ml -index bd6f7e4..44d7f6d 100644 ---- a/src/display.ml -+++ b/src/display.ml -@@ -41,7 +41,7 @@ let splits_header timer width = - let joined = I.hcat cell_padded in - let padded = left_pad width joined in - -- let br = I.uchar Colors.label (Caml.Uchar.of_int 0x2500) width 1 in -+ let br = I.uchar Colors.label (Stdlib.Uchar.of_int 0x2500) width 1 in - I.(padded <-> br) - - type time_status = Ahead_gain | Ahead_loss | Behind_gain | Behind_loss | Gold -diff --git a/src/dune b/src/dune -index a50b09a..2b00ee2 100644 ---- a/src/dune -+++ b/src/dune -@@ -1,7 +1,7 @@ - (library - (name flitter) - (wrapped false) -- (libraries core lwt.unix notty notty.unix re color sexp_pretty) -+ (libraries core core_kernel.caml_unix lwt.unix notty notty.unix re color sexp_pretty) - (preprocess (pps lwt_ppx ppx_sexp_conv)) - ) - diff --git a/pkgs/tools/misc/flowgger/default.nix b/pkgs/tools/misc/flowgger/default.nix index 6783e9dc80cf3..1cff8298ca9be 100644 --- a/pkgs/tools/misc/flowgger/default.nix +++ b/pkgs/tools/misc/flowgger/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin CoreServices; + ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; checkFlags = [ # test failed diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index 9435d0487b764..fe6ab396d139d 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "152prqad9jszjmm4wwqrq83zk13ypsz09n02nrk1gg0fcxfm7fr2"; }; - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace /System/Library/Frameworks/CoreServices.framework/CoreServices "-framework CoreServices" ''; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index fe626a417ab39..495a3dad8330d 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-msse2 -mfpmath=sse"; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withSpiro [ libspiro ] ++ lib.optionals withGUI [ gtk3 cairo pango ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; cmakeFlags = [ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ] ++ lib.optional (!withSpiro) "-DENABLE_LIBSPIRO=OFF" diff --git a/pkgs/tools/misc/freshfetch/default.nix b/pkgs/tools/misc/freshfetch/default.nix index 40119d9f0b3df..ccbaa1f1bfa8c 100644 --- a/pkgs/tools/misc/freshfetch/default.nix +++ b/pkgs/tools/misc/freshfetch/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { # freshfetch depends on rust nightly features RUSTC_BOOTSTRAP = 1; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreFoundation DiskArbitration diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/tools/misc/fsearch/default.nix index 43902b5d99ca6..453e200ea6091 100644 --- a/pkgs/tools/misc/fsearch/default.nix +++ b/pkgs/tools/misc/fsearch/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ artturin ]; platforms = platforms.unix; mainProgram = "fsearch"; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/fsearch.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/fsearch.x86_64-darwin }; } diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index feeb9f3a3d21a..95c5b4af05207 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-eqzqIyQHHklxo3aojCvY06TUPSqChoz6yZ2zzpgRNqs="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; postInstall = '' installManPage docs/fselect.1 diff --git a/pkgs/tools/misc/fw/default.nix b/pkgs/tools/misc/fw/default.nix index 5483bc872d4a0..7855747c59996 100644 --- a/pkgs/tools/misc/fw/default.nix +++ b/pkgs/tools/misc/fw/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 904aca2052141..7740cbb32f568 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.10.2"; + version = "1.11.0"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "sha256-SuagtYfLD8yXFpLHNl1J0m5/iapYU+Si6tJl0paStTY="; + sha256 = "sha256-XdWEvIM+gNQVmNPwtcka+lZwmNIWpxAIMGBjY0b9QNM="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libsodium xz zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { xdelta ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Configurable embedded Linux firmware update creator and runner"; diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix index 3079a620df454..5f173a945af3d 100644 --- a/pkgs/tools/misc/gaphor/default.nix +++ b/pkgs/tools/misc/gaphor/default.nix @@ -51,13 +51,15 @@ buildPythonApplication rec { tinycss2 ]; - desktopItems = makeDesktopItem { - name = pname; - exec = "gaphor"; - icon = "gaphor"; - comment = meta.description; - desktopName = "Gaphor"; - }; + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "gaphor"; + icon = "gaphor"; + comment = meta.description; + desktopName = "Gaphor"; + }) + ]; # Disable automatic wrapGAppsHook3 to prevent double wrapping dontWrapGApps = true; diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix deleted file mode 100644 index ad8364d41ce49..0000000000000 --- a/pkgs/tools/misc/gavin-bc/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitea -, editline -, readline -, historyType ? "internal" -, predefinedBuildType ? "BSD" -}: - -assert lib.elem historyType [ "editline" "readline" "internal" ]; -assert lib.elem predefinedBuildType [ "BSD" "GNU" "GDH" "DBG" "" ]; -stdenv.mkDerivation (finalAttrs: { - pname = "gavin-bc"; - version = "6.5.0"; - - src = fetchFromGitea { - domain = "git.gavinhoward.com"; - owner = "gavin"; - repo = "bc"; - rev = finalAttrs.version; - hash = "sha256-V0L5OmpcI0Zu5JvESjuhp4wEs5Bu/CvjF6B5WllTEqo="; - }; - - buildInputs = - (lib.optional (historyType == "editline") editline) - ++ (lib.optional (historyType == "readline") readline); - - configureFlags = [ - "--disable-nls" - ] - ++ (lib.optional (predefinedBuildType != "") "--predefined-build-type=${predefinedBuildType}") - ++ (lib.optional (historyType == "editline") "--enable-editline") - ++ (lib.optional (historyType == "readline") "--enable-readline") - ++ (lib.optional (historyType == "internal") "--enable-internal-history"); - - meta = { - homepage = "https://git.gavinhoward.com/gavin/bc"; - description = "Gavin Howard's BC calculator implementation"; - changelog = "https://git.gavinhoward.com/gavin/bc/raw/tag/${finalAttrs.version}/NEWS.md"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.AndersonTorres ]; - platforms = lib.platforms.unix; - broken = stdenv.isDarwin; - }; -}) -# TODO: cover most of configure settings diff --git a/pkgs/tools/misc/geekbench/6.nix b/pkgs/tools/misc/geekbench/6.nix index 2aca571e2cf99..2f1d2d0b6be19 100644 --- a/pkgs/tools/misc/geekbench/6.nix +++ b/pkgs/tools/misc/geekbench/6.nix @@ -21,7 +21,7 @@ let hash = "sha256-fbf01qa9wx3k9j8AEqv38fAM3F9tZOcnpH/wa/9rawQ="; }; }; - geekbench_avx2 = lib.optionalString stdenv.isx86_64 "geekbench_avx2"; + geekbench_avx2 = lib.optionalString stdenv.hostPlatform.isx86_64 "geekbench_avx2"; in stdenv.mkDerivation { inherit version; diff --git a/pkgs/tools/misc/getoptions/default.nix b/pkgs/tools/misc/getoptions/default.nix index cf5a21c6d4ffa..d3dcde29dcd66 100644 --- a/pkgs/tools/misc/getoptions/default.nix +++ b/pkgs/tools/misc/getoptions/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "getoptions"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "ko1nksm"; repo = "getoptions"; rev = "v${version}"; - hash = "sha256-HHxImHMT5862ysI+1QGkzaA21YsrUUUOH2LwAkVBPf0="; + hash = "sha256-hapOGPibqt2Mm6k73v63gHxrX+lifZ8xcwzj8vWbtgo="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation rec { doCheck = true; nativeCheckInputs = [ shellspec ksh mksh yash zsh ] - ++ lib.lists.optional (!stdenvNoCC.isDarwin) busybox-sandbox-shell; + ++ lib.lists.optional (!stdenvNoCC.hostPlatform.isDarwin) busybox-sandbox-shell; # Disable checks against yash, since shellspec seems to be broken for yash>=2.54 # (see: https://github.com/NixOS/nixpkgs/pull/218264#pullrequestreview-1434402054) preCheck = '' sed -i '/shellspec -s posh/d' Makefile sed -i '/shellspec -s yash/d' Makefile - '' + lib.strings.optionalString stdenvNoCC.isDarwin '' + '' + lib.strings.optionalString stdenvNoCC.hostPlatform.isDarwin '' sed -i "/shellspec -s 'busybox ash'/d" Makefile ''; diff --git a/pkgs/tools/misc/gh-cal/default.nix b/pkgs/tools/misc/gh-cal/default.nix index e14acf372a790..2e4d05b1c2746 100644 --- a/pkgs/tools/misc/gh-cal/default.nix +++ b/pkgs/tools/misc/gh-cal/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "GitHub contributions calender terminal viewer"; diff --git a/pkgs/tools/misc/ghostie/default.nix b/pkgs/tools/misc/ghostie/default.nix index 0a4e1cb695e0d..e6a47a5577380 100644 --- a/pkgs/tools/misc/ghostie/default.nix +++ b/pkgs/tools/misc/ghostie/default.nix @@ -33,14 +33,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; # 4 out of 5 tests are notification tests which do not work in nix builds doCheck = false; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME=$(mktemp -d) ''; @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/attriaayush/ghostie/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; - broken = stdenv.isx86_64 && stdenv.isDarwin; + broken = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin; mainProgram = "ghostie"; }; } diff --git a/pkgs/tools/misc/gigalixir/default.nix b/pkgs/tools/misc/gigalixir/default.nix index 101b5f6a93468..8628fdfcffb30 100644 --- a/pkgs/tools/misc/gigalixir/default.nix +++ b/pkgs/tools/misc/gigalixir/default.nix @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Gigalixir Command-Line Interface"; homepage = "https://github.com/gigalixir/gigalixir-cli"; license = licenses.mit; diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/tools/misc/github-backup/default.nix index f555ca74d6112..6958bf579b5ad 100644 --- a/pkgs/tools/misc/github-backup/default.nix +++ b/pkgs/tools/misc/github-backup/default.nix @@ -1,21 +1,23 @@ { lib -, python3 -, fetchPypi +, python3Packages +, fetchFromGitHub , git , git-lfs }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "github-backup"; - version = "0.45.2"; + version = "0.46.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-wn2JRMLfqhhTREeYM+mcs68xlkRWKMlxKXToa83pu2g="; + src = fetchFromGitHub { + owner = "josegonzalez"; + repo = "python-github-backup"; + rev = "refs/tags/${version}"; + hash = "sha256-kSxkD8vWBvaT7C0sS9rs3CEP2yeWsAJ0kjPlrGezoLU="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/tools/misc/gitrs/default.nix b/pkgs/tools/misc/gitrs/default.nix index f6a49fe850cef..99139437b4a7c 100644 --- a/pkgs/tools/misc/gitrs/default.nix +++ b/pkgs/tools/misc/gitrs/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl.dev ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/tools/misc/glasgow/default.nix b/pkgs/tools/misc/glasgow/default.nix index bc841b7fcf8e2..39d936527dfa1 100644 --- a/pkgs/tools/misc/glasgow/default.nix +++ b/pkgs/tools/misc/glasgow/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "glasgow"; - version = "0-unstable-2024-07-13"; + version = "0-unstable-2024-09-10"; # from `pdm show` realVersion = let tag = builtins.elemAt (lib.splitString "-" version) 0; @@ -22,8 +22,8 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "c8fa37e7c84efb296a06c58b2949f676a1e149cc"; - sha256 = "sha256-rOgd5y9KQf4cpBT31RHlrVwHsiqdofRihtFbeC69DY4="; + rev = "f2c0ecbe0d47d96f940e77f9def209e9c57d3962"; + sha256 = "sha256-aNzNh/YkWjnHiO+QWbJu2Y3kL/53kDvVn/8Ncz2kpFI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/go-ios/default.nix b/pkgs/tools/misc/go-ios/default.nix index 0cf946ae43e57..f26665835bce3 100644 --- a/pkgs/tools/misc/go-ios/default.nix +++ b/pkgs/tools/misc/go-ios/default.nix @@ -2,27 +2,34 @@ , buildGoModule , fetchFromGitHub , nix-update-script +, pkg-config +, libusb1 }: buildGoModule rec { pname = "go-ios"; - version = "1.0.121"; + version = "1.0.143"; src = fetchFromGitHub { owner = "danielpaulus"; repo = "go-ios"; rev = "v${version}"; - sha256 = "sha256-zWaEtfxrJYaROQ05nBQvM5fiIRSG+hCecU+BVnpIuck="; + sha256 = "sha256-6RiKyhV5y6lOrhfZezSB2m/l17T3bHYaYRhsMf04wT8="; }; - vendorHash = "sha256-0Wi9FCTaOD+kzO5cRjpqbXHqx5UAKSGu+hc9bpj+PWo="; + proxyVendor = true; + vendorHash = "sha256-GfVHAOlN2tL21ILQYPw/IaYQZccxitjHGQ09unfHcKg="; excludedPackages = [ "restapi" ]; - checkFlags = [ - "-tags=fast" + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libusb1 ]; postInstall = '' @@ -30,6 +37,16 @@ buildGoModule rec { mv $out/bin/go-ios $out/bin/ios ''; + # skips all the integration tests (requires iOS device) (`-tags=fast`) + # as well as tests that requires networking + checkFlags = let + skippedTests = [ + "TestWorksWithoutProxy" + "TestUsesProxy" + ]; + in [ "-tags=fast" ] + ++ [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 9fd40e7fc334d..b9433f23bb2c1 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -23,10 +23,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ - ncurses - openssl - ] ++ lib.optionals withGeolocation [ libmaxminddb ] ++ lib.optionals stdenv.isDarwin [ gettext ]; + buildInputs = + [ + ncurses + openssl + ] + ++ lib.optionals withGeolocation [ libmaxminddb ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; configureFlags = [ "--enable-utf8" diff --git a/pkgs/tools/misc/goose/default.nix b/pkgs/tools/misc/goose/default.nix index c2c91f0574ac7..058408ca9f2c3 100644 --- a/pkgs/tools/misc/goose/default.nix +++ b/pkgs/tools/misc/goose/default.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "goose"; - version = "3.21.1"; + version = "3.22.1"; src = fetchFromGitHub { owner = "pressly"; repo = pname; rev = "v${version}"; - hash = "sha256-Klmgw5dYt2/JYc0nuqIZwos3/onlRwsfzTOJ/Yi2pMw="; + hash = "sha256-rXh50Yv8UXJc+E32Fgg6Iy2K6x5+IM7dmxsvwFuCQ9U="; }; proxyVendor = true; - vendorHash = "sha256-V875bGtp6Aki64TM3x0n1aERc5sVPIDZ3rNPF9D/osk="; + vendorHash = "sha256-xb3yBiV+XyOlMp42c+eCj27DpvJalP5qhEoKG1X2kG8="; # skipping: end-to-end tests require a docker daemon postPatch = '' @@ -40,7 +40,7 @@ buildGoModule rec { "-skip=TestClickUpDown|TestClickHouseFirstThree|TestLockModeAdvisorySession|TestDialectStore|TestGoMigrationStats|TestPostgresSessionLocker" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Database migration tool which supports SQL migrations and Go functions"; diff --git a/pkgs/tools/misc/gotify-desktop/default.nix b/pkgs/tools/misc/gotify-desktop/default.nix index d1b67d927cf75..e184c38d5eb7c 100644 --- a/pkgs/tools/misc/gotify-desktop/default.nix +++ b/pkgs/tools/misc/gotify-desktop/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/desbma/gotify-desktop"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bryanasdev000 genofire ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "gotify-desktop"; }; } diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index 2697c6b3febee..f3263303f96d8 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ZRE1vKgi0/UtSe2bdN0BLdtDfAauTfwcqOcl3y63fAA="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/tools/misc/grit/default.nix b/pkgs/tools/misc/grit/default.nix index ca68506faab7f..d9cffca07f0cf 100644 --- a/pkgs/tools/misc/grit/default.nix +++ b/pkgs/tools/misc/grit/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-iMMkjJ5dnlr0oSCifBQPWkInQBCp1bh23s+BcKzDNCg="; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Multitree-based personal task manager"; homepage = "https://github.com/climech/grit"; license = licenses.mit; diff --git a/pkgs/tools/misc/grizzly/default.nix b/pkgs/tools/misc/grizzly/default.nix index 469fea27fa648..a994aead4176e 100644 --- a/pkgs/tools/misc/grizzly/default.nix +++ b/pkgs/tools/misc/grizzly/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "grizzly"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-f60zAE94jdJaGjn+SoO1qs3SgWRpK9pdbirRrsKKBJQ="; + hash = "sha256-cHPF+WHiUU0Cd30mEe+vMbkoG2mh2jMwlKhd851woH0="; }; vendorHash = "sha256-lioFmaFzqaxN1wnYJaoHA54to1xGZjaLGaqAFIfTaTs="; diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 8b78c29defe7c..b18298e37b66e 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, nasm }: let arch = - if stdenv.isi686 then "i386" - else if stdenv.isx86_64 then "x86_64" + if stdenv.hostPlatform.isi686 then "i386" + else if stdenv.hostPlatform.isx86_64 then "x86_64" else throw "Unknown architecture"; in stdenv.mkDerivation { pname = "grub4dos"; diff --git a/pkgs/tools/misc/gummy/default.nix b/pkgs/tools/misc/gummy/default.nix index 8e75d2ab1a6eb..628d5e9e7d16c 100644 --- a/pkgs/tools/misc/gummy/default.nix +++ b/pkgs/tools/misc/gummy/default.nix @@ -1,9 +1,7 @@ { lib , stdenv , fetchFromGitea -, substituteAll , testers -, gummy , cmake , libX11 , libXext @@ -18,7 +16,7 @@ , spdlog }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gummy"; version = "0.6.0"; @@ -26,7 +24,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "fusco"; repo = "gummy"; - rev = version; + rev = finalAttrs.version; hash = "sha256-kATieFf+dEpcYgSEPoETacP7R+u2dOrg7rOhIkNQ1uE="; }; @@ -66,7 +64,7 @@ stdenv.mkDerivation rec { ln -s $out/libexec/gummyd $out/bin/gummyd ''; - passthru.tests.version = testers.testVersion { package = gummy; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { homepage = "https://codeberg.org/fusco/gummy"; @@ -78,4 +76,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = [ ]; }; -} +}) diff --git a/pkgs/tools/misc/halp/default.nix b/pkgs/tools/misc/halp/default.nix index e036336eb10ce..2a8b869861cde 100644 --- a/pkgs/tools/misc/halp/default.nix +++ b/pkgs/tools/misc/halp/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ]; # tests are failing on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkFlags = [ # requires internet access diff --git a/pkgs/tools/misc/handlr/default.nix b/pkgs/tools/misc/handlr/default.nix index b2245eafe534e..612331138572f 100644 --- a/pkgs/tools/misc/handlr/default.nix +++ b/pkgs/tools/misc/handlr/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-30fSOzWq1CoIabPWGWndi/SaCN/ckxjlbtzuwV8rk6M="; nativeBuildInputs = [ installShellFiles shared-mime-info ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; preCheck = '' export HOME=$TEMPDIR diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 2636cb71717bb..6553c1c70d658 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -5,7 +5,7 @@ , fixDarwinDylibNames , cmake , libjpeg -, uselibtirpc ? stdenv.isLinux +, uselibtirpc ? stdenv.hostPlatform.isLinux , libtirpc , zlib , szipSupport ? false @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ] ++ lib.optional fortranSupport gfortran; @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { doCheck = true; - excludedTests = lib.optionals stdenv.isDarwin [ + excludedTests = lib.optionals stdenv.hostPlatform.isDarwin [ "MFHDF_TEST-hdftest" "MFHDF_TEST-hdftest-shared" "HDP-dumpsds-18" diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 226143c44be63..80f7c151bf952 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DHDF5_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake" "-DBUILD_STATIC_LIBS=${lib.boolToString enableStatic}" - ] ++ lib.optional stdenv.isDarwin "-DHDF5_BUILD_WITH_INSTALL_NAME=ON" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "-DHDF5_BUILD_WITH_INSTALL_NAME=ON" ++ lib.optional cppSupport "-DHDF5_BUILD_CPP_LIB=ON" ++ lib.optional fortranSupport "-DHDF5_BUILD_FORTRAN=ON" ++ lib.optional szipSupport "-DHDF5_ENABLE_SZIP_SUPPORT=ON" @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ++ lib.optionals threadsafe [ "-DDHDF5_ENABLE_THREADSAFE:BOOL=ON" "-DHDF5_BUILD_HL_LIB=OFF" ] # broken in nixpkgs since around 1.14.3 -> 1.14.4.3 # https://github.com/HDFGroup/hdf5/issues/4208#issuecomment-2098698567 - ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) "-DHDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16=OFF" + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "-DHDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16=OFF" ; postInstall = '' diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index bbc6f512be7d4..83597d45004e4 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildPhase = let - arch = if stdenv.isx86_64 then "x86_64" else "aarch64"; + arch = if stdenv.hostPlatform.isx86_64 then "x86_64" else "aarch64"; in '' runHook preBuild @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/bin $out/lib cp -a build/dist/HDFView/bin/HDFView $out/bin/ cp -a build/dist/HDFView/lib/app $out/lib/ @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/applications $out/share/icons/hicolor/32x32/apps cp src/HDFView.png $out/share/icons/hicolor/32x32/apps/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -a build/dist/HDFView.app $out/Applications/ '' + '' diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index ce56a4f4057b1..d750bdb131c6b 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -27,11 +27,11 @@ mkDerivation rec { preConfigure = '' # Give ownership of the Galaxy S USB device to the logged in user. substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" "" ''; - installPhase = lib.optionalString (stdenv.isDarwin && enableGUI) '' + installPhase = lib.optionalString (stdenv.hostPlatform.isDarwin && enableGUI) '' mkdir -p $out/Applications mv bin/heimdall-frontend.app $out/Applications/heimdall-frontend.app wrapQtApp $out/Applications/heimdall-frontend.app/Contents/MacOS/heimdall-frontend @@ -44,7 +44,7 @@ mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "Cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; license = licenses.mit; diff --git a/pkgs/tools/misc/hidrd/default.nix b/pkgs/tools/misc/hidrd/default.nix index 5ce3e969f2764..d3a8a40124330 100644 --- a/pkgs/tools/misc/hidrd/default.nix +++ b/pkgs/tools/misc/hidrd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; maintainers = with maintainers; [ pacien ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/hidrd.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/hidrd.x86_64-darwin mainProgram = "hidrd-convert"; }; } diff --git a/pkgs/tools/misc/hiksink/default.nix b/pkgs/tools/misc/hiksink/default.nix index def3f4776949d..77e74e8116f70 100644 --- a/pkgs/tools/misc/hiksink/default.nix +++ b/pkgs/tools/misc/hiksink/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/hoard/default.nix b/pkgs/tools/misc/hoard/default.nix index 4bdf7b7127b87..1972c9c793862 100644 --- a/pkgs/tools/misc/hoard/default.nix +++ b/pkgs/tools/misc/hoard/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/tools/misc/hpcg/default.nix deleted file mode 100644 index 3ae5e7e1404a2..0000000000000 --- a/pkgs/tools/misc/hpcg/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, mpi } : - -stdenv.mkDerivation rec { - pname = "hpcg"; - version = "3.1"; - - src = fetchurl { - url = "http://www.hpcg-benchmark.org/downloads/hpcg-${version}.tar.gz"; - sha256 = "197lw2nwmzsmfsbvgvi8z7kj69n374kgfzzp8pkmk7mp2vkk991k"; - }; - - dontConfigure = true; - - enableParallelBuilding = true; - - buildInputs = [ mpi ]; - - makeFlags = [ "arch=Linux_MPI" ]; - - installPhase = '' - mkdir -p $out/bin $out/share/hpcg - - cp bin/xhpcg $out/bin - cp bin/hpcg.dat $out/share/hpcg - ''; - - meta = with lib; { - description = "HPC conjugate gradient benchmark"; - homepage = "https://www.hpcg-benchmark.org"; - platforms = platforms.linux; - license = licenses.bsd3; - maintainers = [ maintainers.markuskowa ]; - mainProgram = "xhpcg"; - }; -} - diff --git a/pkgs/tools/misc/hsd/default.nix b/pkgs/tools/misc/hsd/default.nix index 44100e15283c2..d1f41a72a1c28 100644 --- a/pkgs/tools/misc/hsd/default.nix +++ b/pkgs/tools/misc/hsd/default.nix @@ -22,7 +22,7 @@ buildNpmPackage rec { nativeBuildInputs = [ python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 16de5fa76f3d2..e4922824d7299 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-E2y/hQNcpW6b/ZJBlsp+2RDH2OgpX4kbn36aBHA5X6U="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' installManPage doc/hyperfine.1 diff --git a/pkgs/tools/misc/iay/default.nix b/pkgs/tools/misc/iay/default.nix index 1ef3d332e75d2..5973ed258b591 100644 --- a/pkgs/tools/misc/iay/default.nix +++ b/pkgs/tools/misc/iay/default.nix @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation Security ]; - NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ "-framework" "AppKit" ]; + NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-framework" "AppKit" ]; meta = with lib; { description = "Minimalistic, blazing-fast, and extendable prompt for bash and zsh"; diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index cbdf1b7610499..d065800b458fc 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -16,15 +16,15 @@ stdenv.mkDerivation rec { ./bootstrap --force --gnulib-srcdir=${gnulib} --skip-po --bootstrap-sync --no-git ''; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ emacs - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; nativeBuildInputs = [ gnulib autoconf bison automake gettext gperf texinfo perl rsync ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; patches = [ ./nix-mapping.patch ]; diff --git a/pkgs/tools/misc/immich-cli/default.nix b/pkgs/tools/misc/immich-cli/default.nix deleted file mode 100644 index 8cf8212f8a83c..0000000000000 --- a/pkgs/tools/misc/immich-cli/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, testers -}: - -let - version = "2.2.15"; - src = fetchFromGitHub { - owner = "immich-app"; - repo = "immich"; - # Using a fixed commit until upstream has release tags for cli. - rev = "f7bfde6a3286d4b454c2f05ccf354914f8eccac6"; - hash = "sha256-O014Y2HwhfPqKKFFGtNDJBzCaR6ugI4azw6/kfzKET0="; - }; - meta' = { - description = "CLI utilities for Immich to help upload images and videos"; - homepage = "https://github.com/immich-app/immich"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ felschr pineapplehunter ]; - mainProgram = "immich"; - }; - - open-api-typescript-sdk = buildNpmPackage { - pname = "immich-cli-openapi-typescript-sdk"; - inherit src version; - - npmDepsHash = "sha256-rIN88xw8kdLfhFbT4OReTwzWqNlD4QVAAuvfMyda+V8="; - - postPatch = '' - cd open-api/typescript-sdk - ''; - meta = { - # using inherit for `builtin.unsafeGetAttrPos` to work correctly - inherit (meta') - description - homepage - license - maintainers; - }; - }; - - immich-cli = buildNpmPackage { - pname = "immich-cli"; - inherit src version; - - npmDepsHash = "sha256-r/kCE6FmhbnMVv2Z76hH/1O1YEYSq9VY5kB0xlqWzaM="; - - postPatch = '' - ln -sv ${open-api-typescript-sdk}/lib/node_modules/@immich/sdk/{build,node_modules} open-api/typescript-sdk - cd cli - ''; - - passthru = { - inherit open-api-typescript-sdk; - tests.version = testers.testVersion { package = immich-cli; }; - }; - - meta = { - # using inherit for `builtin.unsafeGetAttrPos` to work correctly - inherit (meta') - description - homepage - license - maintainers - mainProgram; - }; - }; -in -immich-cli diff --git a/pkgs/tools/misc/inav-blackbox-tools/default.nix b/pkgs/tools/misc/inav-blackbox-tools/default.nix index 43524f6a3fe2a..228035108a816 100644 --- a/pkgs/tools/misc/inav-blackbox-tools/default.nix +++ b/pkgs/tools/misc/inav-blackbox-tools/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ expipiplus1 ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/inav-blackbox-tools.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/inav-blackbox-tools.x86_64-darwin }; } diff --git a/pkgs/tools/misc/instaloader/default.nix b/pkgs/tools/misc/instaloader/default.nix index c5565090c9606..2ab8395eca85e 100644 --- a/pkgs/tools/misc/instaloader/default.nix +++ b/pkgs/tools/misc/instaloader/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "instaloader"; - version = "4.13"; + version = "4.13.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "instaloader"; repo = "instaloader"; rev = "refs/tags/v${version}"; - sha256 = "sha256-nZNoxJnp8dBbgXWYLfzasTa9SsR03xA1mpl9NKppodE="; + sha256 = "sha256-eu2Hp3uomtPuMNjJGprcqK5HApKEjtXU9IQ5yT55cic="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix index a2c31aae9fe99..09db8648c218f 100644 --- a/pkgs/tools/misc/interactsh/default.nix +++ b/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "1.1.9"; + version = "1.2.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IpKsKfu2mVLyrR0wnbraV/0aaX7uRleGbl3q4bv90Eg="; + hash = "sha256-0AyFmT0vYYJ5/gTQI2F+fPsM0oBs4CigNCXS3+ECoRo="; }; - vendorHash = "sha256-xUMEmeoE3Th37kgz5LJg3F27RlKBoIhRf0VfRzkgV2A="; + vendorHash = "sha256-SYs04LgWy6Fd9SUAxs4tB+VK2CK3gqb7fDYkp16i67Q="; modRoot = "."; subPackages = [ diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index a120084087236..b4b7d7807cb4f 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "intermodal"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - hash = "sha256-hKMO7ZicXSYESXWKmDC2ILD996KoYDXS5HJExyXMdX4="; + hash = "sha256-N3TumAwHcHDuVyY4t6FPNOO28D7xX5jheCTodfn71/Q="; }; - cargoHash = "sha256-7vtUMG6mxAHKnbouyTsaUf1myJssxYoqAIOjc6m86Fo="; + cargoHash = "sha256-k34psGOs6G+B/msmLSDHLNxnjO1yyE4OY6aQU8bt+is="; # include_hidden test tries to use `chflags` on darwin - checkFlags = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/iotools/default.nix b/pkgs/tools/misc/iotools/default.nix deleted file mode 100644 index 17330d9c19cb7..0000000000000 --- a/pkgs/tools/misc/iotools/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, lib, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "iotools"; - version = "unstable-2017-12-11"; - - src = fetchFromGitHub { - owner = "adurbin"; - repo = pname; - rev = "18949fdc4dedb1da3f51ee83a582b112fb9f2c71"; - sha256 = "0vymnah44d5bzsjhfmxkcrlrikkp0db22k7a1s8bknz7glk9fldn"; - }; - - makeFlags = [ "DEBUG=0" "STATIC=0" ]; - - installPhase = '' - install -Dm755 iotools -t $out/bin - ''; - - meta = with lib; { - description = "Set of simple command line tools which allow access to - hardware device registers"; - longDescription = '' - Provides a set of simple command line tools which allow access to - hardware device registers. Supported register interfaces include PCI, - IO, memory mapped IO, SMBus, CPUID, and MSR. Also included are some - utilities which allow for simple arithmetic, logical, and other - operations. - ''; - homepage = "https://github.com/adurbin/iotools"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ felixsinger ]; - platforms = [ "x86_64-linux" "i686-linux" ]; - mainProgram = "iotools"; - }; -} diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix deleted file mode 100644 index dce23ff8f9af3..0000000000000 --- a/pkgs/tools/misc/ipxe/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, unstableGitUpdater, buildPackages -, gnu-efi, mtools, openssl, perl, xorriso, xz -, syslinux ? null -, embedScript ? null -, additionalTargets ? {} -, additionalOptions ? [] -}: - -let - targets = additionalTargets // lib.optionalAttrs stdenv.isx86_64 { - "bin-x86_64-efi/ipxe.efi" = null; - "bin-x86_64-efi/ipxe.efirom" = null; - "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb"; - "bin-x86_64-efi/snp.efi" = null; - } // lib.optionalAttrs stdenv.hostPlatform.isx86 { - "bin/ipxe.dsk" = null; - "bin/ipxe.usb" = null; - "bin/ipxe.iso" = null; - "bin/ipxe.lkrn" = null; - "bin/undionly.kpxe" = null; - } // lib.optionalAttrs stdenv.isAarch32 { - "bin-arm32-efi/ipxe.efi" = null; - "bin-arm32-efi/ipxe.efirom" = null; - "bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb"; - "bin-arm32-efi/snp.efi" = null; - } // lib.optionalAttrs stdenv.isAarch64 { - "bin-arm64-efi/ipxe.efi" = null; - "bin-arm64-efi/ipxe.efirom" = null; - "bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb"; - "bin-arm64-efi/snp.efi" = null; - }; -in - -stdenv.mkDerivation rec { - pname = "ipxe"; - version = "1.21.1-unstable-2024-08-15"; - - nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - strictDeps = true; - - src = fetchFromGitHub { - owner = "ipxe"; - repo = "ipxe"; - rev = "950f6b5861d8d6b247b37e4e1401d26d8f908ee8"; - hash = "sha256-Zf2ZblKUyKPo0YdzQFeCEAnYkvWDsmuTS9htvSybpXo="; - }; - - postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' - substituteInPlace src/util/genfsimg --replace " syslinux " " true " - ''; # calling syslinux on a FAT image isn't going to work - - # not possible due to assembler code - hardeningDisable = [ "pic" "stackprotector" ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - makeFlags = - [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. - "CROSS=${stdenv.cc.targetPrefix}" - ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; - - - enabledOptions = [ - "PING_CMD" - "IMAGE_TRUST_CMD" - "DOWNLOAD_PROTO_HTTP" - "DOWNLOAD_PROTO_HTTPS" - ] ++ additionalOptions; - - configurePhase = '' - runHook preConfigure - for opt in ${lib.escapeShellArgs enabledOptions}; do echo "#define $opt" >> src/config/general.h; done - substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo - '' + lib.optionalString stdenv.hostPlatform.isx86 '' - substituteInPlace src/util/genfsimg --replace /usr/lib/syslinux ${syslinux}/share/syslinux - '' + '' - runHook postConfigure - ''; - - preBuild = "cd src"; - - buildFlags = lib.attrNames targets; - - installPhase = '' - runHook preInstall - - mkdir -p $out - ${lib.concatStringsSep "\n" (lib.mapAttrsToList (from: to: - if to == null - then "cp -v ${from} $out" - else "cp -v ${from} $out/${to}") targets)} - - # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending - # let's provide it as a symlink to be compatible in this case. - ln -s undionly.kpxe $out/undionly.kpxe.0 - - runHook postInstall - ''; - - enableParallelBuilding = true; - - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - - meta = with lib; - { description = "Network boot firmware"; - homepage = "https://ipxe.org/"; - license = licenses.gpl2Only; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 9c69888469907..6a4b5c3c393ca 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "ENABLE_DEDUPE=1" "STATIC_DEDUPE_H=1" ] diff --git a/pkgs/tools/misc/jsonwatch/default.nix b/pkgs/tools/misc/jsonwatch/default.nix index 451089dc185e5..c40e91c87c325 100644 --- a/pkgs/tools/misc/jsonwatch/default.nix +++ b/pkgs/tools/misc/jsonwatch/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Gjb7v3kz11iOml3Ykxhy43KNxzaprgMbb5DpPNChLTc="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ fab ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "jsonwatch"; }; } diff --git a/pkgs/tools/misc/kalker/default.nix b/pkgs/tools/misc/kalker/default.nix index 452ac6abc26d5..2d142da60bc2a 100644 --- a/pkgs/tools/misc/kalker/default.nix +++ b/pkgs/tools/misc/kalker/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "kalker"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "PaddiM8"; repo = pname; rev = "v${version}"; - hash = "sha256-Ri0Os+/AqGWgf/2V5D7xvelOC3JTOMjNzjq56mhA3G4="; + hash = "sha256-fFeHL+Q1Y0J3rOgbFA952rjae/OQgHTznDI0Kya1KMQ="; }; - cargoHash = "sha256-0+NYbVMIUarLppBZu6mtyGd+2fvkjEUq0TX7urBq3XI="; + cargoHash = "sha256-hgtSDPQRrqhQALqzVW8z9xXqIv+v5/Sbs6McrUCKiaU="; buildInputs = [ gmp mpfr libmpc ]; diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix deleted file mode 100644 index 15310fb9350a8..0000000000000 --- a/pkgs/tools/misc/kargo/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, fetchurl, python3Packages }: - -with python3Packages; - -buildPythonApplication rec { - version = "0.4.8"; - pname = "kargo"; - - src = fetchurl { - url = "mirror://pypi/k/kargo/${pname}-${version}.tar.gz"; - sha256 = "1iq3vrmglag9gpsir03yz7556m0bz99nwb2mf594378cqzbr6db3"; - }; - - propagatedBuildInputs = [ - ansible-core - boto - cffi - cryptography - libcloud - markupsafe - netaddr - pyasn1 - requests - setuptools - ]; - - checkPhase = '' - HOME=$TMPDIR $out/bin/kargo -v - ''; - - meta = with lib; { - homepage = "https://github.com/kubespray/kargo-cli"; - description = "Tool helps to deploy a kubernetes cluster with Ansible"; - platforms = platforms.all; - license = licenses.gpl3; - maintainers = [ ]; - mainProgram = "kargo"; - }; -} diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index 5448fa942763a..f4f1410ec5126 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5jhEcwOdzLqzxQsEBqo4d5ecsg/vhiKuVjGYIwFzihE="; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; meta = with lib; { description = "Visualize a log file with sparklines"; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 20ea8beaaa838..cd1f8d0c48618 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl' ] - ++ lib.optional (!stdenv.isDarwin) bsd-finger + ++ lib.optional (!stdenv.hostPlatform.isDarwin) bsd-finger ++ lib.optional withAbook abook ++ lib.optional withGnupg gnupg ++ lib.optional withGoobook goobook diff --git a/pkgs/tools/misc/leanify/default.nix b/pkgs/tools/misc/leanify/default.nix index f0006ff7f183e..81f6205986df2 100644 --- a/pkgs/tools/misc/leanify/default.nix +++ b/pkgs/tools/misc/leanify/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { hash = "sha256-fLazKCQnOT3bN3Kz25Q80RLk54EU5U6HCf6kPLcXn9c="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace-fail "-flto" "" \ --replace-fail "lib/LZMA/Alloc.o" "lib/LZMA/CpuArch.o lib/LZMA/Alloc.o" \ --replace-quiet "-Werror" "" ''; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; doCheck = true; diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index b2c310bc5f40e..8fd4689aaeac6 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { "mdcat" "pandoc" "docx2txt" "libreoffice" "pptx2md" "mdcat" "xlscat" "odt2txt" "wvText" "antiword" "catdoc" "broken_catppt" "sxw2txt" "groff" "mandoc" "unrtf" "dvi2tty" "pod2text" "perldoc" "h5dump" "ncdump" "matdump" "djvutxt" "openssl" "gpg" "plistutil" "plutil" "id3v2" "csvlook" "jq" "zlib-flate" "lessfilter" - ] ++ lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) [ + ] ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [ # resholve only identifies this on darwin/bsd # call site is guarded by || so it's safe to leave dynamic "locale" diff --git a/pkgs/tools/misc/license-generator/default.nix b/pkgs/tools/misc/license-generator/default.nix deleted file mode 100644 index 01aa8e554fb0b..0000000000000 --- a/pkgs/tools/misc/license-generator/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, fetchCrate, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "license-generator"; - version = "1.1.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-OIut6eE8cm7eBeHwuCUqSMDH48ZiJpF4vFaQ6wVLnfg="; - }; - - cargoHash = "sha256-tv3Qx4JP2Lbl+k686mX7acabh7nyP1E9w7cQUnjh+pE="; - - meta = with lib; { - description = "Command-line tool for generating license files"; - homepage = "https://github.com/azu/license-generator"; - license = licenses.mit; - maintainers = with maintainers; [ loicreynier ]; - mainProgram = "license-generator"; - }; -} diff --git a/pkgs/tools/misc/lighthouse-steamvr/Cargo.lock b/pkgs/tools/misc/lighthouse-steamvr/Cargo.lock deleted file mode 100644 index daaa1802698fa..0000000000000 --- a/pkgs/tools/misc/lighthouse-steamvr/Cargo.lock +++ /dev/null @@ -1,1212 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "anstream" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "async-trait" -version = "0.1.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "bluez-async" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce7d4413c940e8e3cb6afc122d3f4a07096aca259d286781128683fc9f39d9b" -dependencies = [ - "async-trait", - "bitflags 2.4.0", - "bluez-generated", - "dbus", - "dbus-tokio", - "futures", - "itertools", - "log", - "serde", - "serde-xml-rs", - "thiserror", - "tokio", - "uuid", -] - -[[package]] -name = "bluez-generated" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1c659dbc82f0b8ca75606c91a371e763589b7f6acf36858eeed0c705afe367" -dependencies = [ - "dbus", -] - -[[package]] -name = "btleplug" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ad24f1a9171b691da81fd0a0ae6859ef471979a4d68372515bafc2f4586df1" -dependencies = [ - "async-trait", - "bitflags 1.3.2", - "bluez-async", - "cocoa", - "dashmap", - "dbus", - "futures", - "jni", - "jni-utils", - "libc", - "log", - "objc", - "once_cell", - "serde", - "serde_bytes", - "static_assertions", - "thiserror", - "tokio", - "tokio-stream", - "uuid", - "windows", -] - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap-verbosity-flag" -version = "2.1.1" -source = "git+https://github.com/ShayBoxs-Forks/clap-verbosity-flag.git#5807fd33f935a71ade25e2e6d5aa1b8727c8e63f" -dependencies = [ - "clap", - "tracing", -] - -[[package]] -name = "clap_builder" -version = "4.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "core-graphics" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "futures-channel", - "futures-util", - "libc", - "libdbus-sys", - "winapi", -] - -[[package]] -name = "dbus-tokio" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "007688d459bc677131c063a3a77fb899526e17b7980f390b69644bdbc41fad13" -dependencies = [ - "dbus", - "libc", - "tokio", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jni-utils" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "259e9f2c3ead61de911f147000660511f07ab00adeed1d84f5ac4d0386e7a6c4" -dependencies = [ - "dashmap", - "futures", - "jni", - "log", - "once_cell", - "static_assertions", - "uuid", -] - -[[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.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libdbus-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "lighthouse" -version = "1.1.1" -dependencies = [ - "btleplug", - "clap", - "clap-verbosity-flag", - "serde", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", - "uuid", -] - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[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.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "wasi", - "windows-sys", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "object" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "proc-macro2" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[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.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-xml-rs" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" -dependencies = [ - "log", - "serde", - "thiserror", - "xml-rs", -] - -[[package]] -name = "serde_bytes" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "socket2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "2.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "thiserror" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tokio" -version = "1.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "nu-ansi-term", - "sharded-slab", - "smallvec", - "thread_local", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" -dependencies = [ - "serde", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -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 = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "xml-rs" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix index 4ddd33ff18722..90590d01cfdce 100644 --- a/pkgs/tools/misc/lighthouse-steamvr/default.nix +++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -1,37 +1,38 @@ -{ stdenv, fetchFromGitHub, lib, rustPlatform, pkg-config, dbus }: +{ + stdenv, + fetchFromGitHub, + lib, + rustPlatform, + pkg-config, + dbus, + AppKit, +}: rustPlatform.buildRustPackage rec { pname = "Lighthouse"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ShayBox"; repo = pname; rev = version; - sha256 = "0g0cs54j1vmcig5nc8sqgx30nfn2zjs40pvv30j5g9cyyszbzwkw"; + hash = "sha256-uJ8U4knNKAliHjxP0JnV1lSCEsB6OHyYSbb5aWboYV4="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "clap-verbosity-flag-2.1.1" = "1213bsb0bpvv6621j9zicjsqy05sv21gh6inrvszqwcmj6fxxc7j"; - }; - }; - - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; + cargoHash = "sha256-XVPrtZNLdF9mKSl56kBepkpXRQBJsu9KlZRhb6BeG/E="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus ]; + buildInputs = [ dbus ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { - broken = stdenv.isDarwin; description = "VR Lighthouse power state management"; homepage = "https://github.com/ShayBox/Lighthouse"; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 bddvlpr ]; + maintainers = with maintainers; [ + expipiplus1 + bddvlpr + ]; mainProgram = "lighthouse"; }; } diff --git a/pkgs/tools/misc/livedl/default.nix b/pkgs/tools/misc/livedl/default.nix index 6db5006959339..9a3b4c3fd1f68 100644 --- a/pkgs/tools/misc/livedl/default.nix +++ b/pkgs/tools/misc/livedl/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ wakira ]; platforms = platforms.linux ++ platforms.darwin; - broken = stdenv.isDarwin; # build fails with go > 1.17 + broken = stdenv.hostPlatform.isDarwin; # build fails with go > 1.17 mainProgram = "livedl"; }; } diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 001efe6563b81..6ba07b3d874e4 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -38,7 +38,7 @@ in (rustPlatform.buildRustPackage rec { RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix { }; nativeBuildInputs = [ rustPackages.rustfmt ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; # copy the docs to the $man and $doc outputs postInstall = '' diff --git a/pkgs/tools/misc/lorri/runtime.nix b/pkgs/tools/misc/lorri/runtime.nix index 96b14b26e82c7..7e6883be0644d 100644 --- a/pkgs/tools/misc/lorri/runtime.nix +++ b/pkgs/tools/misc/lorri/runtime.nix @@ -2,7 +2,6 @@ # Plumbing tools: closureInfo , runCommand -, writeText , buildEnv , # Actual dependencies to propagate: bash diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 036d500f6b65f..4427366bbedf8 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -8,22 +8,22 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "6.1.8"; + version = "6.2.1"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - hash = "sha256-MntHq5nphfjbO0Rx7v6WjsnabSMH5Ke3aR9/embG/rk="; + hash = "sha256-v1EaC4VBOvZFL2GoKlTDBMjSe8+4bxaLFvy2V7e7RW4="; }; - cargoHash = "sha256-w8WIpT8rUe7olB5kdpDyrId6D698AhcqzsfpOlutaHQ="; + cargoHash = "sha256-k17x7BEaBWo4Ka2HIjHd4DrO/tolKR/+s7Mm5ZzJk/Y="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.DisplayServices ]; diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix index 178e78bee6ffa..b8fbc37ae81e0 100644 --- a/pkgs/tools/misc/markdown-anki-decks/default.nix +++ b/pkgs/tools/misc/markdown-anki-decks/default.nix @@ -24,13 +24,14 @@ python3.pkgs.buildPythonApplication rec { dependencies = with python3.pkgs; [ beautifulsoup4 + colorama genanki markdown python-frontmatter typer ]; - # No tests available on Pypi and there is only a failing version assertion test in the repo. + # No tests available on PyPI and there is only a failing version assertion test in the repo. doCheck = false; pythonImportsCheck = [ @@ -42,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/lukesmurray/markdown-anki-decks"; changelog = "https://github.com/lukesmurray/markdown-anki-decks/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ totoroot ]; platforms = platforms.unix; mainProgram = "mdankideck"; }; diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/pkgs/tools/misc/marlin-calc/default.nix index dc8ff42210099..ec8e90631b54b 100644 --- a/pkgs/tools/misc/marlin-calc/default.nix +++ b/pkgs/tools/misc/marlin-calc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { license = licenses.gpl3; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/marlin-calc.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/marlin-calc.x86_64-darwin mainProgram = "marlin-calc"; }; } diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 66707a492f0e8..28cd8d7ba9954 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mbuffer"; - version = "20240707"; + version = "20240929"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "sha256-fzkm6S+qgblqMkIPgCiLVfGFBIDyoDLBbtYbUyZ8rgk="; + sha256 = "sha256-77bG3j4kWdI5h3TN1E7Apua4jEEy7eQ9PV4vbBjZpqc="; }; buildInputs = [ diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 72b74039f7806..d7dc5606a647a 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.efi = "${finalAttrs.finalPackage}/memtest.efi"; preBuild = '' - cd ${if stdenv.isi686 then "build32" else "build64"} + cd ${if stdenv.hostPlatform.isi686 then "build32" else "build64"} ''; installPhase = '' diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 50043a132b140..89653c26d6a03 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-+fKvHrApDXm94LItXv+xSDIE5zD7rTY5IeNSuzQglpg="; }; - buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ libiconv IOKit ]; + buildInputs = [ ncurses ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv IOKit ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index ce5d706e1e320..7822fd6d8d206 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -9,22 +9,22 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.27.1-unstable-2024-08-08"; + version = "0.28.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; - rev = "cb495906b11c9638eb7a2707d12810482ac6e3f6"; - hash = "sha256-NNORLa1Vct2Iwn/Cp3w1U3KGTXoSwar4QI+dNe+Po54="; + rev = "v${version}"; + hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U="; }; - cargoHash = "sha256-syBvuCeEHzahEwvLY3f/N02GJRHPi4JDCRYNLd7CqoU="; + cargoHash = "sha256-/BBue4YfpFk/tId2GV9sstEdgNuy3QnieINGnx45ydU="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix index 2549f2a0a7ded..ace598e053b7f 100644 --- a/pkgs/tools/misc/mise/default.nix +++ b/pkgs/tools/misc/mise/default.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2024.8.13"; + version = "2024.9.0"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-XarSfCjEwL1ps2Kwla0lLybpfjNUcIuvTD0kb5YiKgU="; + hash = "sha256-q515JEpws1UnZm1b8zgGxPvudH846XV+Ct4qKN2mNMQ="; # registry is not needed for compilation nor for tests. # contains files with the same name but different case, which cause problems with hash on darwin @@ -32,10 +32,10 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-F+CGCk1U+I0htfWw1ZTl02lBhzSxk19hM7VjTWM8T10="; + cargoHash = "sha256-jGqaGbue+AEK0YjhHMlm84XBgA20p8Um03TjctjXVz0="; nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; postPatch = '' patchShebangs --build \ diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 74f449969a661..3fb3f7390fe6c 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; makeFlags = [ "USE_PTHREADS=1" "USE_OPENSSL=1" "USE_LONG_OPTIONS=1" ] - ++ lib.optional stdenv.isi686 "USE_LARGE_FILES=1" - ++ lib.optional stdenv.isLinux "CFLAGS=-lgcc_s"; + ++ lib.optional stdenv.hostPlatform.isi686 "USE_LARGE_FILES=1" + ++ lib.optional stdenv.hostPlatform.isLinux "CFLAGS=-lgcc_s"; installFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index 534e5f22cc2b3..e681d1fd88797 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, gengetopt, m4, gnupg -, git, perl, autoconf, automake, help2man, boehmgc }: +, git, perl, autoconf, automake, help2man }: stdenv.mkDerivation rec { pname = "mmv"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "rrthomas"; repo = "mmv"; rev = "v${version}"; - hash = "sha256-hYSTENSmkJP5rAemDyTzbzMKFrWYcMpsJDRWq43etTM="; + hash = "sha256-uiRKdkBLr3ZSovIqso/F85cfoSrymZpyzGa63wp5XnY="; fetchSubmodules = true; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ gengetopt m4 git gnupg perl autoconf automake help2man pkg-config ]; - buildInputs = [ boehmgc ]; + enableParallelBuilding = true; env = lib.optionalAttrs stdenv.cc.isClang { diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 1de0cf22d60f0..ee5505215f20c 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "moar"; - version = "1.26.0"; + version = "1.27.2"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-Gc2JhahxiaIpDRPpuUEjd+lOE6zk1RevhD4NechxXxA="; + hash = "sha256-ZWAQrf4Y/Qse02T5Yt7byGXZheH1y7RvBsPP2xiF5Kw="; }; - vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; + vendorHash = "sha256-Orgh0X/HPfaKvliUvTllhk72LkQ/O3Eh9N/38Cj4Rew="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 694e9ac93ee18..e557a05f30627 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper perl libxml2 libxslt docbook-xsl docbook_xml_dtd_44 ]; buildInputs = [ (perl.withPackages (p: [ p.IPCRun p.TimeDate p.TimeDuration ])) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index e7baa6641ccfb..c4e7ad591eb69 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { curl boost libgcrypt - ] ++ lib.optional stdenv.isLinux systemd; + ] ++ lib.optional stdenv.hostPlatform.isLinux systemd; meta = with lib; { description = "MPD client which submits info about tracks being played to a scrobbler"; diff --git a/pkgs/tools/misc/mpy-utils/default.nix b/pkgs/tools/misc/mpy-utils/default.nix index 0ee7701b730bf..342b6875c2043 100644 --- a/pkgs/tools/misc/mpy-utils/default.nix +++ b/pkgs/tools/misc/mpy-utils/default.nix @@ -16,6 +16,6 @@ buildPythonApplication rec { homepage = "https://github.com/nickzoic/mpy-utils"; license = licenses.mit; maintainers = with maintainers; [ aciceri ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/misc/mynewt-newtmgr/default.nix b/pkgs/tools/misc/mynewt-newtmgr/default.nix index 1ad1bb7ac1bb5..d78c6304a1e36 100644 --- a/pkgs/tools/misc/mynewt-newtmgr/default.nix +++ b/pkgs/tools/misc/mynewt-newtmgr/default.nix @@ -34,6 +34,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ bezmuth ]; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/misc/nanoemoji/default.nix b/pkgs/tools/misc/nanoemoji/default.nix deleted file mode 100644 index 88b1cad122343..0000000000000 --- a/pkgs/tools/misc/nanoemoji/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -, resvg -, pngquant -}: -python3.pkgs.buildPythonApplication rec { - pname = "nanoemoji"; - version = "0.15.1"; - - src = fetchFromGitHub { - owner = "googlefonts"; - repo = pname; - rev = "v${version}"; - hash = "sha256-P/lT0PnjTdYzyttICzszu4OL5kj+X8GHZ8doL3tpXQM="; - }; - patches = [ - # this is necessary because the tests clear PATH/PYTHONPATH otherwise - ./test-pythonpath.patch - # minor difference in the test output, most likely due to different dependency versions - ./fix-test.patch - ]; - - nativeBuildInputs = with python3.pkgs; [ - setuptools-scm - - pngquant - resvg - ]; - - # these two packages are just prebuilt wheels containing the respective binaries - pythonRemoveDeps = [ "pngquant-cli" "resvg-cli" ]; - - propagatedBuildInputs = with python3.pkgs; [ - absl-py - fonttools - lxml - ninja - picosvg - pillow - regex - toml - tomlkit - ufo2ft - ufolib2 - zopfli - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - - ninja - picosvg - ]; - - makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ pngquant resvg ]}" - ]; - - preCheck = '' - # make sure the built binaries (nanoemoji/maximum_color) can be found by the test - export PATH="$out/bin:$PATH" - ''; - - meta = with lib; { - description = "Wee tool to build color fonts"; - homepage = "https://github.com/googlefonts/nanoemoji"; - license = licenses.asl20; - maintainers = with maintainers; [ _999eagle ]; - }; -} diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index 44beea57fbb31..b8fa6abfbadaa 100644 --- a/pkgs/tools/misc/nbench/default.nix +++ b/pkgs/tools/misc/nbench/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace nbench1.h --replace '"NNET.DAT"' "\"$out/NNET.DAT\"" substituteInPlace sysspec.h --replace "malloc.h" "stdlib.h" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace "-static" "" ''; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 5209522d2529b..abde0b0d79e16 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -5,7 +5,7 @@ , zig , installShellFiles , testers -, pie ? stdenv.isDarwin +, pie ? stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index d035fe3120910..fc8a641bfad94 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/dylanaraps/neofetch"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ alibabzo konimex ]; + maintainers = with maintainers; [ konimex ]; mainProgram = "neofetch"; }; } diff --git a/pkgs/tools/misc/netbootxyz-efi/default.nix b/pkgs/tools/misc/netbootxyz-efi/default.nix index f09a86fd76a30..7137f22e89987 100644 --- a/pkgs/tools/misc/netbootxyz-efi/default.nix +++ b/pkgs/tools/misc/netbootxyz-efi/default.nix @@ -4,12 +4,12 @@ let pname = "netboot.xyz-efi"; - version = "2.0.75"; + version = "2.0.82"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/netbootxyz/netboot.xyz/releases/download/${version}/netboot.xyz.efi"; - sha256 = "sha256-VaTUwX3S5Bj5eUZAspXNaVm8Y51hURL3xBb1tRdj6Zw="; + sha256 = "sha256-cO8MCkroQ0s/j8wnwwIWfnxEvChLeOZw+gD4wrYBAog="; meta = with lib; { homepage = "https://netboot.xyz/"; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index 3401f74de9373..1c33f4ff73d3e 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin Cocoa; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Cocoa; ldflags = [ "-s" diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index 54e232eafd9c2..d28688c63399a 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -3,12 +3,12 @@ , python39 , fetchFromGitHub , fetchpatch -, withXmpp ? !stdenv.isDarwin +, withXmpp ? !stdenv.hostPlatform.isDarwin , withMatrix ? true , withSlack ? true , withEmoji ? true , withPid ? true -, withDbus ? stdenv.isLinux +, withDbus ? stdenv.hostPlatform.isLinux }: let diff --git a/pkgs/tools/misc/nurl/default.nix b/pkgs/tools/misc/nurl/default.nix index e0af2ff638dd1..752427cdb0e94 100644 --- a/pkgs/tools/misc/nurl/default.nix +++ b/pkgs/tools/misc/nurl/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix index 80900bf30ae8e..364b825292f24 100644 --- a/pkgs/tools/misc/nvimpager/default.nix +++ b/pkgs/tools/misc/nvimpager/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # filter out one test that fails in the sandbox of nix or with neovim v0.10 # or on macOS preCheck = '' - checkFlagsArray+=('BUSTED=busted --output TAP --exclude-tags=${"nix,v10" + lib.optionalString stdenv.isDarwin ",mac"}') + checkFlagsArray+=('BUSTED=busted --output TAP --exclude-tags=${"nix,v10" + lib.optionalString stdenv.hostPlatform.isDarwin ",mac"}') ''; meta = with lib; { diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix index f254e77ebdea2..1218cb1f7b0f3 100644 --- a/pkgs/tools/misc/octofetch/default.nix +++ b/pkgs/tools/misc/octofetch/default.nix @@ -22,8 +22,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { homepage = "https://github.com/azur1s/octofetch"; diff --git a/pkgs/tools/misc/oggvideotools/default.nix b/pkgs/tools/misc/oggvideotools/default.nix index 13c13f086a290..004fb3579253e 100644 --- a/pkgs/tools/misc/oggvideotools/default.nix +++ b/pkgs/tools/misc/oggvideotools/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { # Compilation error on Darwin: # error: invalid argument '--std=c++0x' not allowed with 'C' # make[2]: *** [src/libresample/CMakeFiles/resample.dir/build.make:76: src/libresample/CMakeFiles/resample.dir/filterkit.c.o] Error 1 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 2436b68da4342..2beca6a815012 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake installShellFiles pkg-config ]; buildInputs = [ zstd ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation libresolv Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation libresolv Security ]; nativeCheckInputs = [ git diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 648126154d376..a2a0b255d0084 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.104.0"; + version = "0.109.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-M0aNobj5h2NcliNDI2TjyV6xcd8m0MK6Cv9bf2d0d9g="; + hash = "sha256-ROAapCGIRD5kdA3k1LjSxdfICLRgBcQORe6wW1bszNI="; }; - # proxy vendor to avoid hash missmatches between linux and macOS + # proxy vendor to avoid hash mismatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-VTV6xgGWHc+H7eX1q2bYIS+YQxTvErf6+d8PNucUPkw="; + vendorHash = "sha256-4MRXwp428d9oJPHrgOaGCaIFpRAIOpL/AYc/fLPAVBk="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; @@ -30,7 +30,7 @@ buildGoModule rec { CGO_ENABLED = 0; # journalctl is required in-$PATH for the journald receiver tests. - nativeCheckInputs = lib.optionals stdenv.isLinux [ systemdMinimal ]; + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemdMinimal ]; # We don't inject the package into propagatedBuildInputs unless # asked to avoid hard-requiring a large package. For the journald diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index f372d705491f0..f437590936e27 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -9,17 +9,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.103.0"; + version = "0.109.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-xmsxr1A0/kyWXLNVZglZy8K7ieZT1GS4lGqsSrUkttI="; + hash = "sha256-ShVUBohSnIoeq2aTWJ9IMXKt0CeRv3CZjlqpYHR9DhY="; }; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-1NDGfzg/60VJNrWkMtGS2t3Cv1CXSguR1qLp4mqF1UM="; + vendorHash = "sha256-rXC4lm2ZvO3k6h1ZiYB+FskhW0c2uJyPLZg6n125MZE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/ostree-rs-ext/default.nix b/pkgs/tools/misc/ostree-rs-ext/default.nix index d7b09b65f7ae1..ece63fe6768a6 100644 --- a/pkgs/tools/misc/ostree-rs-ext/default.nix +++ b/pkgs/tools/misc/ostree-rs-ext/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ostree - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index cab9aba3d90c3..7b9d9ac51e129 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -2,7 +2,6 @@ , lib , fetchurl , fetchpatch -, substituteAll , pkg-config , gtk-doc , gobject-introspection @@ -34,7 +33,6 @@ , libxslt , docbook-xsl-nons , docbook_xml_dtd_42 -, openssl , python3 }: diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/tools/misc/otel-cli/default.nix index 09c2481782443..b0c4e38c4c524 100644 --- a/pkgs/tools/misc/otel-cli/default.nix +++ b/pkgs/tools/misc/otel-cli/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { preCheck = '' ln -s $GOPATH/bin/otel-cli . - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace main_test.go \ --replace-fail 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${lib.makeBinPath [ getent coreutils ]}`' ''; diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index aa0d86253d77a..d45c800464ab7 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./move-makefiles.patch ]; - buildFlags = lib.optionals stdenv.isAarch64 [ "config=release_arm" ]; + buildFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "config=release_arm" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/owofetch/default.nix b/pkgs/tools/misc/owofetch/default.nix index 22bbc4ba72fb7..20d9cc160d7a7 100644 --- a/pkgs/tools/misc/owofetch/default.nix +++ b/pkgs/tools/misc/owofetch/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rfN4QERs1H1G7ZZim//78vlxbYfU4Cx7SYYUz/QLKeU="; - buildInputs = lib.optionals stdenvNoCC.isDarwin [ + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ Foundation DiskArbitration ]; diff --git a/pkgs/tools/misc/pandoc-include/default.nix b/pkgs/tools/misc/pandoc-include/default.nix index 0105b69648774..a0ee1da6c8110 100644 --- a/pkgs/tools/misc/pandoc-include/default.nix +++ b/pkgs/tools/misc/pandoc-include/default.nix @@ -10,17 +10,17 @@ buildPythonApplication rec { pname = "pandoc-include"; - version = "1.3.3"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "DCsunset"; repo = "pandoc-include"; rev = "refs/tags/v${version}"; - hash = "sha256-8eTK7jTwxgSjlxEzjFlL5mzt4tBolmS6fSRnbXDWYJc="; + hash = "sha256-rhA+mPjwMoWwX0VIoSZ3aRmlgUy88eGyjSuM3BhyAAQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index c107b32c7e1e4..94ff8e10bb7ee 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenvNoCC, fetchurl, makeWrapper, jre } : +{ + lib, + stdenvNoCC, + fetchurl, + makeWrapper, + jre, +}: stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.5.0"; + version = "5.5.2"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-dBWWKSNlmTWX7egOoWpp+kn5KYIMrIfHBA6SMIhWj+M="; + hash = "sha256-ff7O3pW8/2CDXrd6CU+ygFeyNoGNCeTHIH7cdm+k8TE="; }; nativeBuildInputs = [ makeWrapper ]; @@ -32,7 +38,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://www.giss.nasa.gov/tools/panoply"; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; - license = licenses.unfree; # Package does not state a license + license = licenses.unfree; # Package does not state a license mainProgram = "panoply"; }; } diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index 4b9a9bdf04c12..2ccabe6280983 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -1,19 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "pazi"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "euank"; repo = pname; rev = "v${version}"; - sha256 = "0z8x70mwg0mvz6iap92gil37d4kpg5dizlyfx3zk7984ynycgap8"; + sha256 = "sha256-PDgk6VQ/J9vkFJ0N+BH9LqHOXRYM+a+WhRz8QeLZGiM="; }; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + nativeBuildInputs = [ installShellFiles ]; - cargoHash = "sha256-TJbwLbmexu/PLhKPJl7DttZz/WbEJNJerQimUMqlVcU="; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + cargoHash = "sha256-7ChHYcyzRPFkZ+zh9lBOHcOizDvJf2cp9ULoI7Ofmqk="; + + postInstall = '' + installManPage packaging/man/pazi.1 + ''; meta = with lib; { description = "Autojump \"zap to directory\" helper"; diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/tools/misc/pdf-parser/default.nix index 593960c4d2cf8..b083ebd3e4ed4 100644 --- a/pkgs/tools/misc/pdf-parser/default.nix +++ b/pkgs/tools/misc/pdf-parser/default.nix @@ -1,15 +1,32 @@ -{ lib, python3Packages, fetchzip }: +{ + lib, + python3Packages, + fetchzip, + writeScript, +}: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "pdf-parser"; - version = "0.7.4"; + version = "0.7.9"; + pyproject = false; src = fetchzip { - url = "https://didierstevens.com/files/software/pdf-parser_V0_7_4.zip"; - sha256 = "1j39yww2yl4cav8xgd4zfl5jchbbkvffnrynkamkzvz9dd5np2mh"; + url = "https://didierstevens.com/files/software/pdf-parser_V${ + lib.replaceStrings [ "." ] [ "_" ] version + }.zip"; + hash = "sha256-1mFThtTe1LKkM/MML44RgskGv3FZborNVBsTqSKanks="; }; - format = "other"; + postPatch = '' + # quote regular expressions correctly + substituteInPlace pdf-parser.py \ + --replace-fail \ + "re.sub('" \ + "re.sub(r'" \ + --replace-fail \ + "re.match('" \ + "re.match(r'" + ''; installPhase = '' install -Dm555 pdf-parser.py $out/bin/pdf-parser.py @@ -17,19 +34,31 @@ python3Packages.buildPythonApplication { preFixup = '' substituteInPlace $out/bin/pdf-parser.py \ - --replace '/usr/bin/python' '${python3Packages.python}/bin/python' + --replace-fail '/usr/bin/python' '${python3Packages.python}/bin/python' + ''; + + passthru.updateScript = writeScript "update-pdf-parser" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl pcre2 + + set -eu -o pipefail + + version="$(curl -s https://blog.didierstevens.com/programs/pdf-tools/ | + pcre2grep -O '$1.$2.$3' '\bpdf-parser_V(\d+)_(\d+)_(\d+)\.zip\b.*')" + + update-source-version "$UPDATE_NIX_ATTR_PATH" "$version" ''; - meta = with lib; { + meta = { description = "Parse a PDF document"; longDescription = '' This tool will parse a PDF document to identify the fundamental elements used in the analyzed file. It will not render a PDF document. ''; homepage = "https://blog.didierstevens.com/programs/pdf-tools/"; - license = licenses.publicDomain; - maintainers = [ maintainers.lightdiscord ]; - platforms = platforms.all; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.lightdiscord ]; + platforms = lib.platforms.all; mainProgram = "pdf-parser.py"; }; } diff --git a/pkgs/tools/misc/pfetch-rs/default.nix b/pkgs/tools/misc/pfetch-rs/default.nix index 0a2e3c9ec38dd..f86b71f72c7bd 100644 --- a/pkgs/tools/misc/pfetch-rs/default.nix +++ b/pkgs/tools/misc/pfetch-rs/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-/gYL32kUA4gKTGogMrOghQ3XYFjw3GsDhzynUC/OyXY="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.DisplayServices ]; diff --git a/pkgs/tools/misc/pgbadger/default.nix b/pkgs/tools/misc/pgbadger/default.nix index 27c532e8144cd..d25b4db9068fc 100644 --- a/pkgs/tools/misc/pgbadger/default.nix +++ b/pkgs/tools/misc/pgbadger/default.nix @@ -32,7 +32,7 @@ buildPerlPackage rec { # pgbadger has too many `-Idir` flags on its shebang line on Darwin, # causing the build to fail when trying to generate the documentation. # Rewrite the -I flags in `use lib` form. - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang ./pgbadger ''; @@ -46,7 +46,7 @@ buildPerlPackage rec { TextCSV_XS ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; nativeCheckInputs = [ bzip2 diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index ef2afbd44d03c..7ad930221ccc8 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.31.2"; + version = "2.32.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-8aoljsX2BSwnApDDPSPjuU2BgAY1vf+JrrYlfo6jJqY="; + sha256 = "sha256-UZ+JvjENTxVJ9DQ/04v3rSCo22bW3s9KaKSGOwnr2IQ="; }; - vendorHash = "sha256-2KGYEcKRX1G2L38ECkjDOBSSO9+pAxF3t5NN3ggvSac="; + vendorHash = "sha256-+ej8+YXTWGAk/3cBoaCJtOQ6Fk0g5lwMrNmuMjApT6o="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix deleted file mode 100644 index d8422e3679fd2..0000000000000 --- a/pkgs/tools/misc/picocom/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, installShellFiles -, lrzsz -, IOKit -}: - -stdenv.mkDerivation rec { - pname = "picocom"; - # last tagged release is 3.1 but 3.2 is still considered a release - version = "3.2a"; - - # upstream is quiet as the original author is no longer active since March 2018 - src = fetchFromGitHub { - owner = "npat-efault"; - repo = "picocom"; - rev = "1acf1ddabaf3576b4023c4f6f09c5a3e4b086fb8"; - sha256 = "sha256-cs2bxqZfTbnY5d+VJ257C5hssaFvYup3tBKz68ROnAo="; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace '.picocom_history' '.cache/picocom_history' - - substituteInPlace picocom.c \ - --replace '"rz -vv -E"' '"${lrzsz}/bin/rz -vv -E"' \ - --replace '"sz -vv"' '"${lrzsz}/bin/sz -vv"' - ''; - - enableParallelBuilding = true; - - nativeBuildInputs = [ installShellFiles ]; - - buildInputs = lib.optional stdenv.isDarwin IOKit; - - installPhase = '' - install -Dm555 -t $out/bin picocom - installManPage picocom.1 - installShellCompletion --bash bash_completion/picocom - ''; - - meta = with lib; { - description = "Minimal dumb-terminal emulation program"; - homepage = "https://github.com/npat-efault/picocom/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - mainProgram = "picocom"; - }; -} diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix index 68519f2eb6432..0309832787a40 100644 --- a/pkgs/tools/misc/piston-cli/default.nix +++ b/pkgs/tools/misc/piston-cli/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Piston api tool"; homepage = "https://github.com/Shivansh-007/piston-cli"; license = licenses.mit; diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix deleted file mode 100644 index 7a840caec143d..0000000000000 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, nixosTests }: - -let - version = "1.2024.6"; -in -stdenv.mkDerivation rec { - pname = "plantuml-server"; - inherit version; - src = fetchurl { - url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-5+2Qut9c/UrwfiJXMm2Ix+ABCDCM65L1jpJdamjZ4k4="; - }; - - dontUnpack = true; - installPhase = '' - mkdir -p "$out/webapps" - cp "$src" "$out/webapps/plantuml.war" - ''; - - passthru.tests = { - inherit (nixosTests) plantuml-server; - }; - - meta = with lib; { - description = "Web application to generate UML diagrams on-the-fly"; - homepage = "https://plantuml.com/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ truh ]; - }; -} diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix deleted file mode 100644 index 83476bd995735..0000000000000 --- a/pkgs/tools/misc/plantuml/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenvNoCC -, fetchurl -, makeBinaryWrapper -, jre -, graphviz -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "plantuml"; - version = "1.2024.5"; - - src = fetchurl { - url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar"; - hash = "sha256-YayIedHIIpecVF7BZSvBTp66Eb7He+l+1RCir5KuL28="; - }; - - nativeBuildInputs = [ - makeBinaryWrapper - ]; - - buildCommand = '' - install -Dm644 $src $out/lib/plantuml.jar - - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/plantuml \ - --argv0 plantuml \ - --set GRAPHVIZ_DOT ${graphviz}/bin/dot \ - --add-flags "-jar $out/lib/plantuml.jar" - ''; - - doInstallCheck = true; - postCheckInstall = '' - $out/bin/plantuml -help - $out/bin/plantuml -testdot - ''; - - meta = { - description = "Draw UML diagrams using a simple and human readable text description"; - homepage = "https://plantuml.com/"; - # "plantuml -license" says GPLv3 or later - license = lib.licenses.gpl3Plus; - mainProgram = "plantuml"; - maintainers = with lib.maintainers; [ bjornfor Mogria ]; - platforms = lib.platforms.unix; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - }; -}) diff --git a/pkgs/tools/misc/plantuml/plantuml-c4.nix b/pkgs/tools/misc/plantuml/plantuml-c4.nix deleted file mode 100644 index 77cfa82e894fc..0000000000000 --- a/pkgs/tools/misc/plantuml/plantuml-c4.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib, stdenv, makeWrapper, fetchzip, runCommand, plantuml, plantuml-c4, jre }: - -# The C4-PlantUML docs say that it suffices to run plantuml with the -# -DRELATIVE_INCLUDE="..." arg to make plantuml find the C4 templates -# when included like "!include C4_Container.puml". -# Unfortunately, this is not sufficient in practise, when the path is not ".". -# What helps is setting -Dplantuml.include.path="..." *before* the jar -# parameter. -# The -DRELATIVE_INCLUDE param then *still* needs to be set (*after* the jar -# argument), because the C4 template vars check for existence of this variable -# and if it is not set, reference paths in the internet. - -let - c4-lib = fetchzip { - url = "https://github.com/plantuml-stdlib/C4-PlantUML/archive/refs/tags/v2.8.0.zip"; - hash = "sha256-pGtTFg7HcAFYPrjd+CAaxS4C6Cqaj94aq45v3NpiAxM="; - }; - - sprites = fetchzip { - url = "https://github.com/tupadr3/plantuml-icon-font-sprites/archive/fa3f885dbd45c9cd0cdf6c0e5e4fb51ec8b76582.zip"; - hash = "sha256-lt9+NNMIaZSkKNsGyHoqXUCTlKmZFGfNYYGjer6X0Xc="; - }; - - # In order to pre-fix the plantuml.jar parameter with the argument - # -Dplantuml.include.path=..., we post-fix the java command using a wrapper. - # This way the plantuml derivation can remain unchanged. - plantumlWithExtraPath = - let - plantumlIncludePath = lib.concatStringsSep ":" [ c4-lib sprites ]; - includeFlag = "-Dplantuml.include.path=${lib.escapeShellArg plantumlIncludePath}"; - postFixedJre = - runCommand "jre-postfixed" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin - - makeWrapper ${jre}/bin/java $out/bin/java \ - --add-flags ${lib.escapeShellArg includeFlag} - ''; - in - plantuml.override { jre = postFixedJre; }; -in - -stdenv.mkDerivation rec { - pname = "plantuml-c4"; - version = "2.8.0"; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/bin - - makeWrapper ${plantumlWithExtraPath}/bin/plantuml $out/bin/plantuml \ - --add-flags "-DRELATIVE_INCLUDE=\"${c4-lib}\"" - - $out/bin/plantuml -help - ''; - - passthru.tests.example-c4-diagram = - runCommand "c4-plantuml-sample.png" { nativeBuildInputs = [ plantuml-c4 ]; } '' - sed 's/https:.*\///' "${c4-lib}/samples/C4_Context Diagram Sample - enterprise.puml" > sample.puml - plantuml sample.puml -o $out - - sed 's/!include ..\//!include /' ${sprites}/examples/complex-example.puml > sprites.puml - plantuml sprites.puml -o $out - ''; - - meta = with lib; { - description = "PlantUML bundled with C4-Plantuml and plantuml sprites library"; - mainProgram = "plantuml"; - homepage = "https://github.com/plantuml-stdlib/C4-PlantUML"; - license = licenses.mit; - maintainers = with maintainers; [ tfc ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/misc/pokeget-rs/default.nix b/pkgs/tools/misc/pokeget-rs/default.nix index a2ad6f0df19db..08f84c9a78c9b 100644 --- a/pkgs/tools/misc/pokeget-rs/default.nix +++ b/pkgs/tools/misc/pokeget-rs/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "pokeget-rs"; - version = "1.5.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "talwat"; repo = "pokeget-rs"; rev = version; - hash = "sha256-pP6iIgpY3wI2Yhtu9NXAyB5tQgKqC9yzbC0IwalzhiI="; + hash = "sha256-0dss+ZJ1hhQGpWySWhyF+T1T+G3BlnKfSosgCJa8MPE="; fetchSubmodules = true; }; - cargoHash = "sha256-DBbcfq2ON05BXGRgtZ4Sze8rAz4Eu23pOk1AEYScVbg="; + cargoHash = "sha256-VYF2uhgxUFH/VAy/ttQOULRFFiPRf0D+0WfGlQyYDGc="; meta = with lib; { description = "Better rust version of pokeget"; diff --git a/pkgs/tools/misc/poop/default.nix b/pkgs/tools/misc/poop/default.nix index d3b444d9472f9..9b42801c5ebde 100644 --- a/pkgs/tools/misc/poop/default.nix +++ b/pkgs/tools/misc/poop/default.nix @@ -1,39 +1,23 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, zig_0_11 +{ + lib, + stdenv, + fetchFromGitHub, + zig, }: stdenv.mkDerivation rec { pname = "poop"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "andrewrk"; repo = "poop"; rev = version; - hash = "sha256-ekZpulQ1NpEOCG9KU2I4O0NL8mD+CC7bKF0tZbl7vHo="; + hash = "sha256-zrqR/TTELhsBIX42PysFsHPRs8Lx/zHcmi+VMDw1SdQ="; }; - # fix compilation with zig 0.11 - patches = [ - # https://github.com/andrewrk/poop/pull/41 - (fetchpatch { - name = "update-to-zig-0-11-0.patch"; - url = "https://github.com/andrewrk/poop/commit/15c794d9dea91570485104cda26346f2ae5c9365.patch"; - hash = "sha256-iv3IuYIDPzs98wiTXcO0igngaRRdQnASvzA4bYET54c="; - }) - # https://github.com/andrewrk/poop/pull/36 - (fetchpatch { - name = "update-zig-to-latest-0-11-0-dev-3883-7166407d8.patch"; - url = "https://github.com/andrewrk/poop/commit/b1ca37c0cf637e9bbbf24cd243bafaedf02fa8c7.patch"; - hash = "sha256-/j2zqi0Q2Pl7ZL+4GflwD/MnqcKScT/1SdYJAQ3o4bU="; - }) - ]; - nativeBuildInputs = [ - zig_0_11.hook + zig.hook ]; meta = with lib; { diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 53077c58848ae..77506e95ba0aa 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-NAhLTrTshCm1QKGaOdD/YaqD6c3oYZwVBst8fvTlScQ="; nativeBuildInputs = [ pkg-config file perl cmake curl ]; - buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; COMPLETION_OUT = "out"; postInstall = '' diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 0afa9180a47d5..4901663d0d023 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -81,7 +81,7 @@ buildPythonApplication rec { "--forked" ]; - preCheck = lib.optionalString (!(stdenv.isLinux && stdenv.isAarch64)) '' + preCheck = lib.optionalString (!(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64)) '' # Disable outline atomics for rust tests on aarch64-linux. export RUSTFLAGS="-Ctarget-feature=-outline-atomics" '' + '' diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix index 7a344e9b0c437..5ad26ab739e78 100644 --- a/pkgs/tools/misc/qflipper/default.nix +++ b/pkgs/tools/misc/qflipper/default.nix @@ -62,7 +62,7 @@ mkDerivation { qtquickcontrols qtquickcontrols2 qtgraphicaleffects - ] ++ lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ qtwayland ]; @@ -83,7 +83,7 @@ mkDerivation { postInstall = '' mkdir -p $out/bin - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' cp qFlipper.app/Contents/MacOS/qFlipper $out/bin ''} cp qFlipper-cli $out/bin @@ -95,7 +95,7 @@ mkDerivation { passthru.updateScript = nix-update-script { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Cross-platform desktop tool to manage your flipper device"; homepage = "https://flipperzero.one/"; license = licenses.gpl3Only; diff --git a/pkgs/tools/misc/qrscan/default.nix b/pkgs/tools/misc/qrscan/default.nix index 1ad4c526e7528..479c6102818ab 100644 --- a/pkgs/tools/misc/qrscan/default.nix +++ b/pkgs/tools/misc/qrscan/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "qrscan"; homepage = "https://github.com/sayanarijit/qrscan"; license = licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = [ maintainers.sayanarijit ]; }; } diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/tools/misc/rates/default.nix index d121453bd7d96..c774721eeecce 100644 --- a/pkgs/tools/misc/rates/default.nix +++ b/pkgs/tools/misc/rates/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5EcTeMfa1GNp1q60qSgEi/I3298hXUD1Vc1K55XGW4I="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "CLI tool that brings currency exchange rates right into your terminal"; diff --git a/pkgs/tools/misc/remote-exec/default.nix b/pkgs/tools/misc/remote-exec/default.nix index edf581b183ce9..e9edaacd6a27f 100644 --- a/pkgs/tools/misc/remote-exec/default.nix +++ b/pkgs/tools/misc/remote-exec/default.nix @@ -56,7 +56,7 @@ buildPythonApplication rec { pytest-cov-stub ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # `watchdog` dependency does not correctly detect fsevents on darwin. # this only affects `remote --stream-changes` "test/test_file_changes.py" diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index e3ce23eca0a38..e09b7c60f9718 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./install-exec.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/apply.c \ --replace "command = \"mv\"" "command = \"${coreutils}/bin/mv\"" \ --replace "command = \"cp\"" "command = \"${coreutils}/bin/cp\"" @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ readline ]; - preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' export ac_cv_func_lstat64=no ''; diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/tools/misc/ripdrag/default.nix index 3eb1e59bd09ee..9521ac120bcfd 100644 --- a/pkgs/tools/misc/ripdrag/default.nix +++ b/pkgs/tools/misc/ripdrag/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.4.9"; + version = "0.4.10"; src = fetchFromGitHub { owner = "nik012003"; repo = "ripdrag"; rev = "v${version}"; - hash = "sha256-fsCIyaGCLwf1T8xyVCTjg51TXS8v0l9dBHRB8wdyN5g="; + hash = "sha256-aK/1f56sHspohbYO0z2Hf1NDJsN8Dbf1NoL/QadbVSY="; }; - cargoHash = "sha256-ZzD+WkmvZX4YXtOwWHw/7t9N/xgKWrMfCThcYFyHG/g="; + cargoHash = "sha256-9POXKvbt1Xr1wKYHhfLb14puKorLIlT1ckzEVd6eWa0="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index f1c2d6a58971e..68baa3318871e 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=implicit-function-declaration"; meta = with lib; { description = "Readline wrapper for console programs"; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 08a0a0c5e1460..829987d6094ef 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -17,7 +17,7 @@ , wrapGAppsHook3 , withGui ? false }: -assert withGui -> !stdenv.isDarwin; +assert withGui -> !stdenv.hostPlatform.isDarwin; stdenv.mkDerivation rec { pname = "rmlint"; diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index 75ea2c24ecb86..e430a3063e2c5 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patchFlags = [ "-p0" ]; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { url = "https://raw.githubusercontent.com/macports/macports-ports/18fd229516a46e7272003acbe555735b2a902db7/gis/routino/files/patch-Makefile_conf.diff"; sha256 = "1b7hpa4sizansnwwxq1c031nxwdwh71pg08jl9z9apiab8pjsn53"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.conf \ --subst-var-by PREFIX $out ''; diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix deleted file mode 100644 index 2a68d92b9c134..0000000000000 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, wrapQtAppsHook -, cmake -, pkg-config -, util-linux -, curl -, libarchive -, qtbase -, qtdeclarative -, qtsvg -, qttools -, qtquickcontrols2 -, qtgraphicaleffects -, xz -, testers -, nix-update-script -, enableTelemetry ? false -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rpi-imager"; - version = "1.8.5"; - - src = fetchFromGitHub { - owner = "raspberrypi"; - repo = "rpi-imager"; - rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-JrotKMyAgQO3Y5RsFAar9N5/wDpWiBcy8RfvBWDiJMs="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - util-linux - wrapQtAppsHook - ]; - - # Disable telemetry and update check. - cmakeFlags = lib.optionals (!enableTelemetry) [ - "-DENABLE_CHECK_VERSION=OFF" - "-DENABLE_TELEMETRY=OFF" - ]; - - buildInputs = [ - curl - libarchive - qtbase - qtdeclarative - qtsvg - qttools - qtquickcontrols2 - qtgraphicaleffects - xz - ]; - - sourceRoot = "${finalAttrs.src.name}/src"; - - /* By default, the builder checks for JSON support in lsblk by running "lsblk --json", - but that throws an error, as /sys/dev doesn't exist in the sandbox. - This patch removes the check. */ - patches = [ ./lsblkCheckFix.patch ]; - - passthru = { - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "QT_QPA_PLATFORM=offscreen rpi-imager --version"; - }; - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Raspberry Pi Imaging Utility"; - homepage = "https://github.com/raspberrypi/rpi-imager/"; - changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${finalAttrs.version}"; - license = licenses.asl20; - mainProgram = "rpi-imager"; - maintainers = with maintainers; [ ymarkus anthonyroussel ]; - platforms = platforms.all; - # does not build on darwin - broken = stdenv.isDarwin; - }; -}) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 22fd1e1ae40d2..87bd920db1c71 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2024.7"; + version = "2024.8"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/rpm-ostree/releases/download/v${version}/rpm-ostree-${version}.tar.xz"; - hash = "sha256-Ehh6304Uhhom7aAvSDS2UYKyyJKr4XQF70CX7Pk3yAg="; + hash = "sha256-6aCGP3SJ0DegmhiQkiqBr733C5vuDGTjLMaxNtai3G0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/rtz/Cargo.lock b/pkgs/tools/misc/rtz/Cargo.lock index a84b6ab4315f4..3211e669bf955 100644 --- a/pkgs/tools/misc/rtz/Cargo.lock +++ b/pkgs/tools/misc/rtz/Cargo.lock @@ -524,9 +524,9 @@ dependencies = [ [[package]] name = "cities-json" -version = "0.4.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4720186a8069da0585af9ec1e2f9e815d7d1bbe47dc817b8597e31a609f898f" +checksum = "b182994ec23e201f9bd45d2e4f6756dc176f9fc12aa957842bf01348725d1e66" dependencies = [ "lazy_static", "rand 0.8.5", @@ -2470,7 +2470,7 @@ dependencies = [ [[package]] name = "rtz" -version = "0.7.0" +version = "0.7.1" dependencies = [ "anyhow", "async-trait", @@ -3568,9 +3568,16 @@ dependencies = [ "serde_json", "url", "utoipa", + "utoipa-swagger-ui-vendored", "zip 1.1.4", ] +[[package]] +name = "utoipa-swagger-ui-vendored" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20d6689d3a5693eec4d21f6b9d7c54f37468b856da8e98a7bb316f7b32df6e3" + [[package]] name = "uuid" version = "1.4.1" diff --git a/pkgs/tools/misc/rtz/default.nix b/pkgs/tools/misc/rtz/default.nix index ab44dc7d25bf0..a5f55342a13a2 100644 --- a/pkgs/tools/misc/rtz/default.nix +++ b/pkgs/tools/misc/rtz/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "rtz"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "twitchax"; repo = "rtz"; rev = "v${version}"; - hash = "sha256-Wfb3FEZHjWYUtRI4Qn3QNunIXuzW1AIEZkIvtVrjBPs="; + hash = "sha256-V7N9NFIc/WWxLaahkjdS47Qj8sc3HRdKSkrBqi1ngA8="; }; cargoLock = { @@ -28,11 +28,6 @@ rustPlatform.buildRustPackage rec { }; }; - swagger-ui = fetchurl { - url = "https://github.com/juhaku/utoipa/raw/master/utoipa-swagger-ui-vendored/res/v5.17.12.zip"; - hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I="; - }; - nativeBuildInputs = [ pkg-config ]; @@ -41,23 +36,13 @@ rustPlatform.buildRustPackage rec { bzip2 openssl zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; buildFeatures = [ "web" ]; - # ${swagger-ui} is read-only and the copy made by the build script - # is as well. Remove it so that checks can copy it again. - preCheck = '' - find target -name $(basename ${swagger-ui}) -delete - ''; - - env = { - # use local data file instead of requiring network access - SWAGGER_UI_DOWNLOAD_URL = "file://${swagger-ui}"; - }; - meta = with lib; { description = "Tool to easily work with timezone lookups via a binary, a library, or a server"; homepage = "https://github.com/twitchax/rtz"; diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix index 26b582e5e9448..df79acf5f1c57 100644 --- a/pkgs/tools/misc/rust-motd/default.nix +++ b/pkgs/tools/misc/rust-motd/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/rustypaste-cli/default.nix b/pkgs/tools/misc/rustypaste-cli/default.nix index 8f87e508a7be0..a596683537390 100644 --- a/pkgs/tools/misc/rustypaste-cli/default.nix +++ b/pkgs/tools/misc/rustypaste-cli/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-UaOUEuh7NNIhXOKqHEfVRv1hXld7qmdPdazATalXvQU="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/sacad/default.nix b/pkgs/tools/misc/sacad/default.nix index d8666ebd495f6..5868962781b7e 100644 --- a/pkgs/tools/misc/sacad/default.nix +++ b/pkgs/tools/misc/sacad/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "sacad"; - version = "2.7.5"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - hash = "sha256-ZJPcxKc0G8V7x9nyzKXaXpfNpMB3/qRoX0d4lfBZTFY="; + hash = "sha256-/NyRnQSqDZv+LJ1bPO35T9icQ2PN9Oa+nSmrLkQimnQ="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/sagoin/default.nix b/pkgs/tools/misc/sagoin/default.nix index 08967f9427e4e..7764781dc01bd 100644 --- a/pkgs/tools/misc/sagoin/default.nix +++ b/pkgs/tools/misc/sagoin/default.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "sagoin"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - hash = "sha256-/WNUDlJxxUGAtykX44A9EqMdBNwVKsGkPnq9pATmLEQ="; + hash = "sha256-zXYjR9ZFNX2guUSeMN/G77oBIlW3AowFWA4gwID2jQs="; }; - cargoHash = "sha256-YGQZR5n71srD/8QrBUOoEe72nPm0cwgk5zrzoXy2Hx0="; + cargoHash = "sha256-NMv48gv3RUIjBRD2XuOhmS32d+MjZ/tP/ZhpRuyulgE="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/tools/misc/scdl/default.nix b/pkgs/tools/misc/scdl/default.nix index ec05d225967ff..94e1d5c537406 100644 --- a/pkgs/tools/misc/scdl/default.nix +++ b/pkgs/tools/misc/scdl/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "scdl"; - version = "2.11.4"; + version = "2.12.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-2hw9nVKShRAY6K0xXhVuce/dAu4w/BE2cKKKndzPJ3s="; + hash = "sha256-8BMO5/XJdAkz/E1ZDXavJudNSOiZdYLcZVMk1S8g9nU="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 29f7fe5ea846b..e952fa6f253c5 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libxcrypt - ] ++ lib.optional stdenv.isLinux pam - ++ lib.optional stdenv.isDarwin utmp; + ] ++ lib.optional stdenv.hostPlatform.isLinux pam + ++ lib.optional stdenv.hostPlatform.isDarwin utmp; doCheck = true; diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index e3ad0e5c51c80..c4eb669875d62 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -7,11 +7,11 @@ let path = lib.makeBinPath ([ coreutils gawk gnused findutils gnugrep ncurses bc pciutils - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ procps xdpyinfo xprop - ] ++ lib.optionals stdenv.isDarwin (with darwin; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin; [ adv_cmds DarwinTools system_cmds diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix index 3217b8f20d52a..818f84ed37dff 100644 --- a/pkgs/tools/misc/sfeed/default.nix +++ b/pkgs/tools/misc/sfeed/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { makeFlags = [ "RANLIB:=$(RANLIB)" "SFEED_CURSES_LDFLAGS:=-lncurses" ] # use macOS's strlcat() and strlcpy() instead of vendored ones - ++ lib.optional stdenv.isDarwin "COMPATOBJ:="; + ++ lib.optional stdenv.hostPlatform.isDarwin "COMPATOBJ:="; installFlags = [ "PREFIX=$(out)" ]; # otherwise does not find SIGWINCH - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; meta = with lib; { homepage = "https://codemadness.org/sfeed-simple-feed-parser.html"; diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index 34597142522c0..3c18662db5e78 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' installManPage man/man1/shadowenv.1 diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix index a11692f5d935d..3d5e2e84a5661 100644 --- a/pkgs/tools/misc/sheldon/default.nix +++ b/pkgs/tools/misc/sheldon/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+yTX1wUfVVjsM42X0QliL+0xbzTPheADZibPh/5Czh8="; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security curl ]; nativeBuildInputs = [ installShellFiles pkg-config ]; # Needs network connection @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rossmacarthur/sheldon"; license = with licenses; [ mit ]; maintainers = with maintainers; [ seqizz ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "sheldon"; }; } diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix index dcc95b24ef48f..1b3fd5c5806d5 100644 --- a/pkgs/tools/misc/shelldap/default.nix +++ b/pkgs/tools/misc/shelldap/default.nix @@ -28,7 +28,7 @@ perlPackages.buildPerlPackage rec { YAMLSyck ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; prePatch = '' touch Makefile.PL @@ -40,7 +40,7 @@ perlPackages.buildPerlPackage rec { runHook postInstall ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/shelldap ''; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index bb51fd8899bd7..4e09f021cc5f7 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { ''; # https://github.com/lotabout/skim/issues/440 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = with lib; { description = "Command-line fuzzy finder written in Rust"; diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix index 71ebdcad69ee8..b6cb04558341d 100644 --- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "sqlite3-to-mysql"; - version = "2.3.0"; + version = "2.3.1"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.8"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "techouse"; repo = "sqlite3-to-mysql"; rev = "refs/tags/v${version}"; - hash = "sha256-XmjPGY8+WiuWkfWvzHsLbgopV0qBtqC2jjMeBU/XtFw="; + hash = "sha256-13NLtP9gDd9hrwY09+7CuM4Rl+Hce82TETdfwBC/5HI="; }; build-system = with python3Packages; [ diff --git a/pkgs/tools/misc/sshx/default.nix b/pkgs/tools/misc/sshx/default.nix index 9ae65dcaee1ce..0929703288e00 100644 --- a/pkgs/tools/misc/sshx/default.nix +++ b/pkgs/tools/misc/sshx/default.nix @@ -8,13 +8,13 @@ , buildNpmPackage }: let - version = "unstable-2023-11-23"; + version = "0.2.4"; src = fetchFromGitHub { owner = "ekzhang"; repo = "sshx"; - rev = "2677f7e1fa3b369132cc7f27f6028a04b92ba5cf"; - hash = "sha256-9fo8hNUzJr4gse0J2tw7j+alqE82+y8McADzTkxryWk="; + rev = "refs/tags/v${version}"; + hash = "sha256-RIQRX4sXlMl73Opi6hK2WD/erdAMNrm40IasHasikuw="; }; mkSshxPackage = { pname, cargoHash, ... }@args: @@ -26,14 +26,17 @@ let cargoHash; nativeBuildInputs = [ protobuf ]; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; cargoBuildFlags = [ "--package" pname ]; + cargoTestFlags = cargoBuildFlags; meta = { description = "Fast, collaborative live terminal sharing over the web"; homepage = "https://github.com/ekzhang/sshx"; + changelog = "https://github.com/ekzhang/sshx/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pinpox kranzes ]; mainProgram = pname; @@ -43,17 +46,17 @@ in { sshx = mkSshxPackage { pname = "sshx"; - cargoHash = "sha256-dA5Aen/qANW8si75pj/RsBknvOo3KDyU5UISAmmcfRE="; + cargoHash = "sha256-PMSKhlHSjXKh/Jxvl2z+c1zDDyuVPzQapvdCdcuaFYc="; }; sshx-server = mkSshxPackage rec { pname = "sshx-server"; - cargoHash = "sha256-1GRWCMXsOzqvORgtwfuywV4wLyX3r4nURhM3Dl5V9Ss="; + cargoHash = "sha256-ySsTjNoI/nuz2qtZ4M2Fd9zy239+E61hUCq1r/ahgsA="; postPatch = '' substituteInPlace crates/sshx-server/src/web.rs \ - --replace 'ServeDir::new("build")' 'ServeDir::new("${passthru.web.outPath}")' \ - --replace 'ServeFile::new("build/spa.html")' 'ServeFile::new("${passthru.web.outPath}/spa.html")' + --replace-fail 'ServeDir::new("build")' 'ServeDir::new("${passthru.web.outPath}")' \ + --replace-fail 'ServeFile::new("build/spa.html")' 'ServeFile::new("${passthru.web.outPath}/spa.html")' ''; passthru.web = buildNpmPackage { @@ -65,7 +68,7 @@ in postPatch = '' substituteInPlace vite.config.ts \ - --replace 'execSync("git rev-parse --short HEAD").toString().trim()' '"${src.rev}"' + --replace-fail 'execSync("git rev-parse --short HEAD").toString().trim()' '"${src.rev}"' ''; npmDepsHash = "sha256-bKePCxo6+n0EG+4tbbMimPedJ0Hu1O8yZsgspmhobOs="; diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index bb84b843a9ea8..e8d96eb4249b6 100644 --- a/pkgs/tools/misc/star-history/default.nix +++ b/pkgs/tools/misc/star-history/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/tools/misc/starry/default.nix b/pkgs/tools/misc/starry/default.nix index a59fb3127f17b..cb6535baf3acc 100644 --- a/pkgs/tools/misc/starry/default.nix +++ b/pkgs/tools/misc/starry/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 37d38016b8829..587d07eaf5bd7 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security Foundation Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security Foundation Cocoa ]; - NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ]; + NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-framework" "AppKit" ]; # tries to access HOME only in aarch64-darwin environment when building mac-notification-sys - preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' export HOME=$TMPDIR ''; diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix index 773aa5cc33198..33c09ba83e820 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "steampipe-plugin-aws"; - version = "0.145.0"; + version = "0.147.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe-plugin-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-Nh+GlnAA3dwRD0EFhUXqPXJtwUMmLzUtwFSJcaECpbc="; + hash = "sha256-62jGLJGc6tip6Azl5EF1vefJ6IC1+9yMB3oBKjAXWV0="; }; - vendorHash = "sha256-h0+ffKSyEU7lSqbL+LwqRZp563AlAGpzMbtg3qdOjrk="; + vendorHash = "sha256-4MwISeCx/YbJSeQ5OJFIZf1SnK9aD2Eat6xKI7ZtYLk="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix index 641a0c045827e..d09191633c4a5 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "steampipe-plugin-github"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe-plugin-github"; rev = "refs/tags/v${version}"; - hash = "sha256-Kr9JXVLd0E7IG5dq9liS5uQNAX535urETwZytKRaZIA="; + hash = "sha256-XscJqrtnvA4poCcUspPIsYIrfI22o/PLeNPBl8WSl/E="; }; - vendorHash = "sha256-UivLueePtstJtAWbl7li8FzZ41Q2kF9FYzVYdQ4172g="; + vendorHash = "sha256-EVcPpFzRd9EmyuPqZBQjSNEB4BEbU8Km6Y/f+ulfK5s="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix index 688454c8ded16..4977372ee4ee4 100644 --- a/pkgs/tools/misc/synth/default.nix +++ b/pkgs/tools/misc/synth/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-i2Pp9sfTBth3DtrQ99Vw+KLnGECrkqtlRNAKiwSWf48="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Security ]; diff --git a/pkgs/tools/misc/szyszka/default.nix b/pkgs/tools/misc/szyszka/default.nix index 980b37a910df2..8bd133e6dae01 100644 --- a/pkgs/tools/misc/szyszka/default.nix +++ b/pkgs/tools/misc/szyszka/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { atk gdk-pixbuf gtk4 - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Foundation ]); diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index 6298d84c41fd6..7d3721acb3c40 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-56gy9AH3i4OSvExMuR3n/2hF5pJgbn5JJpxZLXKfu2w="; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; # many tests are failing doCheck = false; @@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = [ ]; mainProgram = "tab"; - broken = (stdenv.isDarwin && stdenv.isAarch64); # Added 2023-11-13 + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # Added 2023-11-13 }; } diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index 9ca82d8f1bec6..428c235e394d5 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "tealdeer"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "dbrgn"; repo = "tealdeer"; rev = "v${version}"; - sha256 = "sha256-zQzYukhruVUVP1v76/5522ag7wjN9QoE9BtfMNYQ7UY="; + hash = "sha256-7Wavhl5irQU9OV7+dslrIQEAcsaqJZ/jWmxaCyTBsEs="; }; - cargoHash = "sha256-VeJsCWU7sJy88uvGGjpuGRzsAgBRvzOYU1FwpImpiLk="; + cargoHash = "sha256-WCbpwvCXm54/Cv+TscaqseWzTUd8V1DxmS30fUZZTwI="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ installShellFiles ]; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Very fast implementation of tldr in Rust"; homepage = "https://github.com/dbrgn/tealdeer"; - maintainers = with maintainers; [ davidak newam ]; + maintainers = with maintainers; [ davidak newam mfrw ]; license = with licenses; [ asl20 mit ]; mainProgram = "tldr"; }; diff --git a/pkgs/tools/misc/tere/default.nix b/pkgs/tools/misc/tere/default.nix index 61afcbca9a19e..905c197cc732c 100644 --- a/pkgs/tools/misc/tere/default.nix +++ b/pkgs/tools/misc/tere/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage { pname = "tere"; - version = "1.5.1-unstable-2024-04-01"; + version = "1.6.0"; src = fetchFromGitHub { owner = "mgunyho"; repo = "tere"; - rev = "659422ecb2810f91446a71e52b82524d4f1755d8"; - sha256 = "sha256-CH8gcfkjSAknG6kKHp0aODcrjEJjzHbgeVaE/PK1zRA="; + rev = "5adf1176e8c12c073ad244cac7773a7808ed2021"; + sha256 = "sha256-oY4oeSttM8LLXLirYq/B7Nzajkg4Pw26uig5gZxqU3s="; }; - cargoHash = "sha256-GtGWuvYdxP3dgGekoXYaM+lnZJBgJX1UIWe0EH+/52M="; + cargoHash = "sha256-UWZWm6wDiQqUNcWV1nDUWXVhWgqoVUCDWz09cRkiPKg="; nativeBuildInputs = [ # ncurses provides the tput command needed for integration tests @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage { ncurses ]; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # Unexplained fail # https://github.com/NixOS/nixpkgs/pull/298527#issuecomment-2053758845 "--skip=first_run_prompt_accept" diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 26f84e383c48f..ce6e0c7ae8f0a 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ memstreamHook ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ]; buildInputs = [ libjack2 ncurses - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio libobjc ]; @@ -43,12 +43,12 @@ stdenv.mkDerivation rec { "--enable-ncurses" "lib_cv_va_copy=yes" "lib_cv___va_copy=yes" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "lib_cv_va_val_copy=yes" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-audio=darwin,jack" "lib_cv_va_val_copy=no" "timidity_cv_ccoption_rdynamic=yes" @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { tar --strip-components=1 -xf $instruments -C $out/share/timidity/ ''; # This fixup step is unnecessary and fails on Darwin - dontRewriteSymlinks = stdenv.isDarwin; + dontRewriteSymlinks = stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://sourceforge.net/projects/timidity/"; diff --git a/pkgs/tools/misc/tmux-sessionizer/default.nix b/pkgs/tools/misc/tmux-sessionizer/default.nix index b6a3682ec7574..d8749c4115c85 100644 --- a/pkgs/tools/misc/tmux-sessionizer/default.nix +++ b/pkgs/tools/misc/tmux-sessionizer/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage { OPENSSL_NO_VENDOR = 1; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Fastest way to manage projects as tmux sessions"; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index af381a0622598..e1b7d4dd6371f 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -10,7 +10,7 @@ , runCommand , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , withUtf8proc ? true, utf8proc # gets Unicode updates faster than glibc -, withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter +, withUtempter ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl, libutempter , withSixel ? true }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "tmux"; - version = "3.4"; + version = "3.5"; outputs = [ "out" "man" ]; @@ -35,33 +35,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "tmux"; repo = "tmux"; rev = finalAttrs.version; - hash = "sha256-RX3RZ0Mcyda7C7im1r4QgUxTnp95nfpGgQ2HRxr0s64="; + hash = "sha256-8CRZj7UyBhuB5QO27Y+tHG62S/eGxPOHWrwvh1aBqq0="; }; - patches = [ - (fetchpatch { - url = "https://github.com/tmux/tmux/commit/2d1afa0e62a24aa7c53ce4fb6f1e35e29d01a904.diff"; - hash = "sha256-mDt5wy570qrUc0clGa3GhZFTKgL0sfnQcWJEJBKAbKs="; - }) - # this patch is designed for android but FreeBSD exhibits the same error for the same reason - (fetchpatch { - url = "https://github.com/tmux/tmux/commit/4f5a944ae3e8f7a230054b6c0b26f423fa738e71.patch"; - hash = "sha256-HlUeU5ZicPe7Ya8A1HpunxfVOE2BF6jOHq3ZqTuU5RE="; - }) - # https://github.com/tmux/tmux/issues/3983 - # fix tmux crashing when neovim is used in a ssh session - (fetchpatch { - url = "https://github.com/tmux/tmux/commit/aa17f0e0c1c8b3f1d6fc8617613c74f07de66fae.patch"; - hash = "sha256-jhWGnC9tsGqTTA5tU+i4G3wlwZ7HGz4P0UHl17dVRU4="; - }) - # https://github.com/tmux/tmux/issues/3905 - # fix tmux hanging on shutdown - (fetchpatch { - url = "https://github.com/tmux/tmux/commit/3823fa2c577d440649a84af660e4d3b0c095d248.patch"; - hash = "sha256-FZDy/ZgVdwUAam8g5SfGBSnMhp2nlHHfrO9eJNIhVPo="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook @@ -88,13 +64,13 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' mkdir -p $out/share/bash-completion/completions cp -v ${bashCompletion}/completions/tmux $out/share/bash-completion/completions/tmux - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/nix-support echo "${finalAttrs.passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages ''; passthru = { - terminfo = runCommand "tmux-terminfo" { nativeBuildInputs = [ ncurses ]; } (if stdenv.isDarwin then '' + terminfo = runCommand "tmux-terminfo" { nativeBuildInputs = [ ncurses ]; } (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/share/terminfo/74 cp -v ${ncurses}/share/terminfo/74/tmux $out/share/terminfo/74 # macOS ships an old version (5.7) of ncurses which does not include tmux-256color so we need to provide it from our ncurses. diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index f5fdbc698f86e..dfb77094fbfc0 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "3.1.2"; - source.sha256 = "t96v3RwBfezB644RVbTmO8i/xh1F23WQC8PBxc/msjg="; + version = "3.3.1"; + source.sha256 = "sha256-xixLYzDIvX3D+vbe9SccST37TnyZx/YjePLPjagHsOU="; erubis = buildRubyGem rec { inherit ruby; @@ -23,8 +23,8 @@ buildRubyGem rec { inherit ruby; name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "thor"; - version = "1.3.0"; - source.sha256 = "sha256-Gtx/nls2VaaMcTk/7ovQrQiNFO6Og6C3NybyPLs8p8M="; + version = "1.3.2"; + source.sha256 = "sha256-7vApO54kFYzK16s4Oug1NLetTtmcCflvGmsDZVCrvto="; }; xdg = buildRubyGem rec { diff --git a/pkgs/tools/misc/toastify/default.nix b/pkgs/tools/misc/toastify/default.nix index b244aec493ace..6fde17977ebe1 100644 --- a/pkgs/tools/misc/toastify/default.nix +++ b/pkgs/tools/misc/toastify/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Ps2pRLpPxw+OS1ungQtVQ8beoKpc8pjzQEndMNni08k="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME=$(mktemp -d) ''; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 38e1f0d95c1a2..70402b22df7f3 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -25,13 +25,13 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-framework" "AppKit" ]); diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 4ef5279ef4763..99167c87fa849 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ]; buildInputs = [ libxcrypt - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ optionals (enableStatic && stdenv.cc.libc ? static) [ stdenv.cc.libc @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { make ${if enableMinimal then "allnoconfig" else - if stdenv.isFreeBSD then + if stdenv.hostPlatform.isFreeBSD then "freebsd_defconfig" else - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "macos_defconfig" else "defconfig" diff --git a/pkgs/tools/misc/trackma/default.nix b/pkgs/tools/misc/trackma/default.nix index 6ecf2723f00b2..4ae9306f28fb6 100644 --- a/pkgs/tools/misc/trackma/default.nix +++ b/pkgs/tools/misc/trackma/default.nix @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals withQT [ pyqt5 ] ++ lib.optionals withGTK [ pycairo pygobject3 ] ++ lib.optionals withCurses [ urwid ] - ++ lib.optionals stdenv.isLinux [ pydbus pyinotify ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ pydbus pyinotify ] ++ lib.optionals (withGTK || withQT) [ pillow ]); dontWrapQtApps = true; diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix index 2224adec80446..9f0cfb4d51b42 100644 --- a/pkgs/tools/misc/trillian/default.nix +++ b/pkgs/tools/misc/trillian/default.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "trillian"; - version = "1.6.0"; - vendorHash = "sha256-tLhq6ILiKzFM1lIK0DbiIKsn1NWEI168BMaf/MOAtEo="; + version = "1.6.1"; + vendorHash = "sha256-TOzIb8QmvoKlVwoVeYKLcyWgb/sQT4oYuIodtSZoufs="; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YHwT+ddVRyHkmXkw2vROL4PS948pOMj9UwOtHorbTAQ="; + sha256 = "sha256-dbRu+VjUxYZB1aWUZ2w/5+zKs5RcxWDqmYD9vmIGqG0="; }; subPackages = [ diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index 0abb0c668be09..f5d70cd2071f3 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/xorg62/tty-clock"; license = licenses.bsd3; description = "Digital clock in ncurses"; diff --git a/pkgs/tools/misc/twm/default.nix b/pkgs/tools/misc/twm/default.nix deleted file mode 100644 index 7de3ed1b3b274..0000000000000 --- a/pkgs/tools/misc/twm/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, fetchFromGitHub -, stdenv -, rustPlatform -, openssl -, pkg-config -, Security -, nix-update-script -, installShellFiles -}: - -rustPlatform.buildRustPackage rec { - pname = "twm"; - version = "0.10.2"; - - src = fetchFromGitHub { - owner = "vinnymeller"; - repo = "twm"; - rev = "refs/tags/v${version}"; - hash = "sha256-qOOEeaxae7nYbvNzl3BEZkdjO69lgtGrrLS5Q7akN9U="; - }; - - cargoHash = "sha256-gJ5go9V8c97pQZICUD1ksLJhOyJXyVXAWssH3fhrRVQ="; - - nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd twm \ - --bash <($out/bin/twm --print-bash-completion) \ - --zsh <($out/bin/twm --print-zsh-completion) \ - --fish <($out/bin/twm --print-fish-completion) - - $out/bin/twm --print-man > twm.1 - installManPage twm.1 - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Customizable workspace manager for tmux"; - homepage = "https://github.com/vinnymeller/twm"; - changelog = "https://github.com/vinnymeller/twm/releases/tag/${src.rev}"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vinnymeller ]; - mainProgram = "twm"; - }; -} diff --git a/pkgs/tools/misc/ugs/default.nix b/pkgs/tools/misc/ugs/default.nix index 2dc31d0831f2c..caf738f0f2b45 100644 --- a/pkgs/tools/misc/ugs/default.nix +++ b/pkgs/tools/misc/ugs/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "ugs"; - version = "2.1.8"; + version = "2.1.9"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; - hash = "sha256-2rGxo8Yu0i93CXmnkKJwjez3vXzaO69/ztwjXxgWtyo="; + hash = "sha256-cZlBIafz+SZHP5xY6PupoCrbCng9lx9mbixBWiV6ufQ="; }; dontUnpack = true; diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix index 4ee7ea3a00e13..c4ea65eebd97e 100644 --- a/pkgs/tools/misc/uhubctl/default.nix +++ b/pkgs/tools/misc/uhubctl/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "uhubctl"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "mvp"; repo = "uhubctl"; rev = "v${version}"; - sha256 = "sha256-Rt9hTT0Tn8v+J1XqZm8iXTTY4nKow2qjRPNmNCiWNoY="; + sha256 = "sha256-mpeDePHLsa4sGe2+8X9KQ8AYn7wtybDnaZzxnf4oETQ="; }; buildInputs = [ libusb1 ]; diff --git a/pkgs/tools/misc/undocker/default.nix b/pkgs/tools/misc/undocker/default.nix index fb52e019ffbc9..0cc9deb74df38 100644 --- a/pkgs/tools/misc/undocker/default.nix +++ b/pkgs/tools/misc/undocker/default.nix @@ -4,8 +4,8 @@ , gnumake }: let - version = "1.2.2"; - hash = "sha256-kBqNopcHpldU5oD6zoVjPjP84t12QFcbWBSNNgwImKg="; + version = "1.2.3"; + hash = "sha256-hyP85pYtXxucAliilUt9Y2qnrfPeSjeGsYEFJndJWyA="; src = fetchFromGitea { domain = "git.jakstys.lt"; owner = "motiejus"; diff --git a/pkgs/tools/misc/usbimager/default.nix b/pkgs/tools/misc/usbimager/default.nix index 2d339fabc3f7f..11a9162af2f23 100644 --- a/pkgs/tools/misc/usbimager/default.nix +++ b/pkgs/tools/misc/usbimager/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, pkg-config, wrapGAppsHook3 , withLibui ? true, gtk3 -, withUdisks ? stdenv.isLinux, udisks, glib +, withUdisks ? stdenv.hostPlatform.isLinux, udisks, glib , libX11 }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { # feel free add them if you have a machine to test platforms = with platforms; linux; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; mainProgram = "usbimager"; }; } diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 0336923647521..a71567b59038f 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ]; makeFlags = [ "CARGO=${cargo}/bin/cargo" diff --git a/pkgs/tools/misc/uwufetch/default.nix b/pkgs/tools/misc/uwufetch/default.nix index 4dba7dac8038e..ce5e378b9ac7d 100644 --- a/pkgs/tools/misc/uwufetch/default.nix +++ b/pkgs/tools/misc/uwufetch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # fix command_path for package manager (nix-store) substituteInPlace fetch.c \ --replace "/usr/bin" "/run/current-system/sw/bin" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace "local/bin" "bin" \ --replace "local/lib" "lib" \ diff --git a/pkgs/tools/misc/uwuify/default.nix b/pkgs/tools/misc/uwuify/default.nix index 4a3411d05a386..a7380bc8b1f76 100644 --- a/pkgs/tools/misc/uwuify/default.nix +++ b/pkgs/tools/misc/uwuify/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-1BoB7K/dWy3AbogvHIDLrdPD7K54EISvn4RVU5RLTi4="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { description = "Fast text uwuifier"; diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index ab15a5622e153..d7a5d84312100 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -33,6 +33,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "adler32" version = "1.2.0" @@ -208,9 +214,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" @@ -311,7 +317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c6368f9ae5c6ec403ca910327ae0c9437b0a85255b6950c90d497e6177f6e5e" dependencies = [ "proc-macro-hack", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -348,13 +354,14 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.14" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" +checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d" dependencies = [ "anstyle", - "bstr 1.9.1", + "bstr 1.10.0", "doc-comment", + "libc", "predicates", "predicates-core", "predicates-tree", @@ -374,9 +381,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "brotli", "flate2", @@ -384,8 +391,8 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", - "zstd 0.13.0", - "zstd-safe 7.0.0", + "zstd 0.13.2", + "zstd-safe 7.2.1", ] [[package]] @@ -452,12 +459,12 @@ dependencies = [ "async-stream", "async-trait", "base64 0.22.1", - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "fnv", "futures-util", "http 1.1.0", - "indexmap 2.2.6", + "indexmap 2.5.0", "mime", "multer", "num-traits", @@ -482,9 +489,9 @@ dependencies = [ "darling 0.20.8", "proc-macro-crate 3.1.0", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "strum 0.26.2", - "syn 2.0.72", + "syn 2.0.75", "thiserror", ] @@ -506,8 +513,8 @@ version = "7.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69117c43c01d81a69890a9f5dd6235f2f027ca8d1ec62d6d3c5e01ca0edb4f2b" dependencies = [ - "bytes 1.6.1", - "indexmap 2.2.6", + "bytes 1.7.1", + "indexmap 2.5.0", "serde", "serde_json", ] @@ -592,7 +599,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbc1f1a75fd07f0f517322d103211f12d757658e91676def9a2e688774656c60" dependencies = [ "base64 0.21.7", - "bytes 1.6.1", + "bytes 1.7.1", "futures 0.3.30", "http 0.2.9", "memchr", @@ -666,8 +673,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -706,8 +713,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -718,13 +725,13 @@ checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -748,6 +755,8 @@ dependencies = [ "aws-credential-types", "aws-http", "aws-runtime", + "aws-sdk-sso", + "aws-sdk-ssooidc", "aws-sdk-sts", "aws-smithy-async", "aws-smithy-http", @@ -756,20 +765,23 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.6.1", + "bytes 1.7.1", "fastrand 2.0.1", + "hex", "http 0.2.9", "hyper 0.14.28", + "ring", "time", "tokio", "tracing 0.1.40", + "zeroize", ] [[package]] name = "aws-credential-types" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" +checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -786,7 +798,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.6.1", + "bytes 1.7.1", "http 0.2.9", "http-body 0.4.5", "pin-project-lite", @@ -854,7 +866,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.6.1", + "bytes 1.7.1", "fastrand 2.0.1", "http 0.2.9", "regex", @@ -877,7 +889,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.6.1", + "bytes 1.7.1", "http 0.2.9", "regex", "tracing 0.1.40", @@ -899,7 +911,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.6.1", + "bytes 1.7.1", "http 0.2.9", "regex", "tracing 0.1.40", @@ -921,7 +933,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.6.1", + "bytes 1.7.1", "http 0.2.9", "regex", "tracing 0.1.40", @@ -947,7 +959,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.6.1", + "bytes 1.7.1", "http 0.2.9", "http-body 0.4.5", "once_cell", @@ -973,7 +985,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.6.1", + "bytes 1.7.1", "fastrand 2.0.1", "http 0.2.9", "regex", @@ -1019,7 +1031,51 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.6.1", + "bytes 1.7.1", + "http 0.2.9", + "regex", + "tracing 0.1.40", +] + +[[package]] +name = "aws-sdk-sso" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0619ab97a5ca8982e7de073cdc66f93e5f6a1b05afc09e696bec1cb3607cd4df" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes 1.7.1", + "http 0.2.9", + "regex", + "tracing 0.1.40", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04b9f5474cc0f35d829510b2ec8c21e352309b46bf9633c5a81fb9321e9b1c7" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes 1.7.1", "http 0.2.9", "regex", "tracing 0.1.40", @@ -1059,7 +1115,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.6.1", + "bytes 1.7.1", "form_urlencoded", "hex", "hmac", @@ -1091,7 +1147,7 @@ checksum = "c5a373ec01aede3dd066ec018c1bc4e8f5dd11b2c11c59c8eef1a5c68101f397" dependencies = [ "aws-smithy-http", "aws-smithy-types", - "bytes 1.6.1", + "bytes 1.7.1", "crc32c", "crc32fast", "hex", @@ -1111,20 +1167,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" dependencies = [ "aws-smithy-types", - "bytes 1.6.1", + "bytes 1.7.1", "crc32fast", ] [[package]] name = "aws-smithy-http" -version = "0.60.9" +version = "0.60.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e" +checksum = "01dbcb6e2588fd64cfb6d7529661b06466419e4c54ed1c62d6510d2d0350a728" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.6.1", + "bytes 1.7.1", "bytes-utils", "futures-core", "http 0.2.9", @@ -1157,15 +1213,15 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.6.2" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce87155eba55e11768b8c1afa607f3e864ae82f03caf63258b37455b0ad02537" +checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.6.1", + "bytes 1.7.1", "fastrand 2.0.1", "h2 0.3.26", "http 0.2.9", @@ -1184,13 +1240,13 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30819352ed0a04ecf6a2f3477e344d2d1ba33d43e0f09ad9047c12e0d923616f" +checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "bytes 1.6.1", + "bytes 1.7.1", "http 0.2.9", "http 1.1.0", "pin-project-lite", @@ -1201,12 +1257,12 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.0" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe321a6b21f5d8eabd0ade9c55d3d0335f3c3157fc2b3e87f05f34b539e4df5" +checksum = "273dcdfd762fae3e1650b8024624e7cd50e484e37abdab73a7a706188ad34543" dependencies = [ "base64-simd", - "bytes 1.6.1", + "bytes 1.7.1", "bytes-utils", "http 0.2.9", "http 1.1.0", @@ -1254,7 +1310,7 @@ dependencies = [ "async-trait", "axum-core", "bitflags 1.3.2", - "bytes 1.6.1", + "bytes 1.7.1", "futures-util", "http 0.2.9", "http-body 0.4.5", @@ -1281,7 +1337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.6.1", + "bytes 1.7.1", "futures-util", "http 0.2.9", "http-body 0.4.5", @@ -1299,7 +1355,7 @@ checksum = "4ccd63c07d1fbfb3d4543d7ea800941bf5a30db1911b9b9e4db3b2c4210a434f" dependencies = [ "async-trait", "base64 0.21.7", - "bytes 1.6.1", + "bytes 1.7.1", "dyn-clone", "futures 0.3.30", "getrandom 0.2.15", @@ -1348,7 +1404,7 @@ dependencies = [ "RustyXML", "async-trait", "azure_core", - "bytes 1.6.1", + "bytes 1.7.1", "futures 0.3.30", "hmac", "log", @@ -1370,7 +1426,7 @@ dependencies = [ "RustyXML", "azure_core", "azure_storage", - "bytes 1.6.1", + "bytes 1.7.1", "futures 0.3.30", "log", "serde", @@ -1414,7 +1470,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.1", "object", "rustc-demangle", ] @@ -1510,8 +1566,8 @@ version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" dependencies = [ - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -1577,7 +1633,7 @@ checksum = "0aed08d3adb6ebe0eff737115056652670ae290f177759aac19c30456135f94c" dependencies = [ "base64 0.22.1", "bollard-stubs", - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "futures-core", "futures-util", @@ -1640,8 +1696,8 @@ dependencies = [ "once_cell", "proc-macro-crate 2.0.0", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", "syn_derive", ] @@ -1700,9 +1756,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "regex-automata 0.4.4", @@ -1733,7 +1789,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -1761,9 +1817,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.6.1" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" dependencies = [ "serde", ] @@ -1774,7 +1830,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "either", ] @@ -1897,9 +1953,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1907,7 +1963,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -2003,9 +2059,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.10" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6b81fb3c84f5563d509c59b5a48d935f689e993afa90fe39047f05adef9142" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -2013,9 +2069,9 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb9b20c0dd58e4c2e991c8d203bbeb76c11304d1011659686b5b644bc29aa478" +checksum = "63d19864d6b68464c59f7162c9914a0b569ddc2926b4a2d71afe62a9738eff53" dependencies = [ "clap", "log", @@ -2023,9 +2079,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.10" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca6706fd5224857d9ac5eb9355f6683563cc0541c7cd9d014043b57cbec78ac" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -2036,23 +2092,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.9" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa2032320fd6f50d22af510d204b2994eef49600dfbd0e771a166213844e4cd" +checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck 0.5.0", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -2084,7 +2140,7 @@ name = "codecs" version = "0.1.0" dependencies = [ "apache-avro", - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "csv-core", "derivative", @@ -2094,7 +2150,7 @@ dependencies = [ "influxdb-line-protocol", "memchr", "once_cell", - "ordered-float 4.2.1", + "ordered-float 4.2.2", "prost 0.12.6", "prost-reflect", "regex", @@ -2163,7 +2219,7 @@ version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "futures-core", "memchr", "pin-project-lite", @@ -2241,7 +2297,7 @@ dependencies = [ "futures-core", "prost 0.12.6", "prost-types 0.12.6", - "tonic 0.11.0", + "tonic", "tracing-core 0.1.32", ] @@ -2264,7 +2320,7 @@ dependencies = [ "thread_local", "tokio", "tokio-stream", - "tonic 0.11.0", + "tonic", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", @@ -2557,6 +2613,21 @@ dependencies = [ "cipher", ] +[[package]] +name = "curl-sys" +version = "0.4.74+curl-8.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "windows-sys 0.52.0", +] + [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -2580,8 +2651,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -2613,7 +2684,7 @@ dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "strsim 0.10.0", "syn 1.0.109", ] @@ -2627,9 +2698,9 @@ dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "strsim 0.10.0", - "syn 2.0.72", + "syn 2.0.75", ] [[package]] @@ -2639,7 +2710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -2650,8 +2721,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -2701,9 +2772,9 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "databend-client" -version = "0.19.5" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc64f96aeac28470097189078b972a2dcbb398a019069ad0d2503843544bb55" +checksum = "22a2fc159e8f2059610799425725cd4c3d3e27e472892107693c1fd80ba47e61" dependencies = [ "async-trait", "log", @@ -2778,7 +2849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -2789,8 +2860,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling 0.20.8", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.75", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core", + "syn 2.0.75", ] [[package]] @@ -2801,7 +2903,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "rustc_version 0.4.0", "syn 1.0.109", ] @@ -2920,7 +3022,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eefe29e8dd614abbee51a1616654cab123c4c56850ab83f5b7f1e1f9977bf7c" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "futures-util", "moka", "octseq", @@ -2946,9 +3048,9 @@ dependencies = [ [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" @@ -3076,7 +3178,7 @@ checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.1", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -3088,8 +3190,8 @@ checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -3100,8 +3202,8 @@ checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -3120,8 +3222,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -3152,9 +3254,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06676b12debf7bba6903559720abca942d3a66b8acb88815fd2c7c6537e9ade1" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -3318,8 +3420,8 @@ checksum = "a481586acf778f1b1455424c343f71124b048ffa5f4fc3f8f6ae9dc432dcb3c7" name = "file-source" version = "0.1.0" dependencies = [ - "bstr 1.9.1", - "bytes 1.6.1", + "bstr 1.10.0", + "bytes 1.7.1", "chrono", "crc", "criterion", @@ -3327,7 +3429,7 @@ dependencies = [ "flate2", "futures 0.3.30", "glob", - "indexmap 2.2.6", + "indexmap 2.5.0", "libc", "quickcheck", "scan_fmt", @@ -3375,12 +3477,12 @@ checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -3540,8 +3642,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -3721,7 +3823,7 @@ dependencies = [ "heck 0.4.1", "lazy_static", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "serde", "serde_json", "syn 1.0.109", @@ -3741,23 +3843,24 @@ dependencies = [ [[package]] name = "greptime-proto" version = "0.1.0" -source = "git+https://github.com/GreptimeTeam/greptime-proto.git?tag=v0.4.1#4306ab645ee55b3f7f2ad3fb7acc5820f967c1aa" +source = "git+https://github.com/GreptimeTeam/greptime-proto.git?tag=v0.7.0#4bc0d17577dbea47396a064c1ccf229a4c9539fa" dependencies = [ "prost 0.12.6", "serde", "serde_json", "strum 0.25.0", "strum_macros 0.25.3", - "tonic 0.10.2", - "tonic-build 0.10.2", + "tonic", + "tonic-build 0.11.0", ] [[package]] -name = "greptimedb-client" +name = "greptimedb-ingester" version = "0.1.0" -source = "git+https://github.com/GreptimeTeam/greptimedb-ingester-rust.git?rev=d21dbcff680139ed2065b62100bac3123da7c789#d21dbcff680139ed2065b62100bac3123da7c789" +source = "git+https://github.com/GreptimeTeam/greptimedb-ingester-rust?rev=2e6b0c5eb6a5e7549c3100e4d356b07d15cce66d#2e6b0c5eb6a5e7549c3100e4d356b07d15cce66d" dependencies = [ "dashmap 5.5.3", + "derive_builder", "enum_dispatch", "futures 0.3.30", "futures-util", @@ -3768,7 +3871,7 @@ dependencies = [ "snafu 0.7.5", "tokio", "tokio-stream", - "tonic 0.10.2", + "tonic", "tonic-build 0.9.2", "tower", ] @@ -3800,13 +3903,13 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "fnv", "futures-core", "futures-sink", "futures-util", "http 0.2.9", - "indexmap 2.2.6", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -3815,17 +3918,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", - "bytes 1.6.1", + "bytes 1.7.1", "fnv", "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.2.6", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -3893,7 +3996,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ "base64 0.21.7", - "bytes 1.6.1", + "bytes 1.7.1", "headers-core", "http 0.2.9", "httpdate", @@ -3925,7 +4028,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "heim" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#4925b53083587ccd695c4149836cc42e0e5e76fb" dependencies = [ "heim-common", "heim-cpu", @@ -3939,7 +4042,7 @@ dependencies = [ [[package]] name = "heim-common" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#4925b53083587ccd695c4149836cc42e0e5e76fb" dependencies = [ "cfg-if", "core-foundation", @@ -3957,7 +4060,7 @@ dependencies = [ [[package]] name = "heim-cpu" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#4925b53083587ccd695c4149836cc42e0e5e76fb" dependencies = [ "cfg-if", "futures 0.3.30", @@ -3975,7 +4078,7 @@ dependencies = [ [[package]] name = "heim-disk" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#4925b53083587ccd695c4149836cc42e0e5e76fb" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -3991,7 +4094,7 @@ dependencies = [ [[package]] name = "heim-host" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#4925b53083587ccd695c4149836cc42e0e5e76fb" dependencies = [ "cfg-if", "heim-common", @@ -4008,7 +4111,7 @@ dependencies = [ [[package]] name = "heim-memory" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#4925b53083587ccd695c4149836cc42e0e5e76fb" dependencies = [ "cfg-if", "heim-common", @@ -4022,7 +4125,7 @@ dependencies = [ [[package]] name = "heim-net" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#4925b53083587ccd695c4149836cc42e0e5e76fb" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -4038,7 +4141,7 @@ dependencies = [ [[package]] name = "heim-runtime" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#4925b53083587ccd695c4149836cc42e0e5e76fb" dependencies = [ "futures 0.3.30", "futures-timer", @@ -4137,7 +4240,7 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "fnv", "itoa", ] @@ -4148,7 +4251,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "fnv", "itoa", ] @@ -4159,7 +4262,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "http 0.2.9", "pin-project-lite", ] @@ -4170,7 +4273,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "http 1.1.0", ] @@ -4180,7 +4283,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "futures-util", "http 1.1.0", "http-body 1.0.0", @@ -4247,7 +4350,7 @@ version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "futures-channel", "futures-core", "futures-util", @@ -4271,10 +4374,10 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "futures-channel", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.0", "httparse", @@ -4325,7 +4428,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "futures 0.3.30", "headers", "http 0.2.9", @@ -4389,7 +4492,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "hyper 0.14.28", "native-tls", "tokio", @@ -4402,7 +4505,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "futures-channel", "futures-util", "http 1.1.0", @@ -4514,9 +4617,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -4561,7 +4664,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22fa7ee6be451ea0b1912b962c91c8380835e97cf1584a77e18264e908448dcb" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "log", "nom", "smallvec", @@ -4789,7 +4892,7 @@ dependencies = [ name = "k8s-e2e-tests" version = "0.1.0" dependencies = [ - "env_logger 0.11.4", + "env_logger 0.11.5", "futures 0.3.30", "indoc", "k8s-openapi 0.16.0", @@ -4809,7 +4912,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ "base64 0.13.1", - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "serde", "serde-value", @@ -4823,7 +4926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd990069640f9db34b3b0f7a1afc62a05ffaa3be9b66aa3c313f58346df7f788" dependencies = [ "base64 0.21.7", - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "http 0.2.9", "percent-encoding", @@ -4901,7 +5004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "544339f1665488243f79080441cacb09c997746fd763342303e66eebb9d3ba13" dependencies = [ "base64 0.20.0", - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "dirs-next", "either", @@ -4983,7 +5086,7 @@ dependencies = [ "ena", "is-terminal", "itertools 0.10.5", - "lalrpop-util", + "lalrpop-util 0.20.0", "petgraph", "regex", "regex-syntax 0.7.5", @@ -4999,11 +5102,20 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" +[[package]] +name = "lalrpop-util" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "108dc8f5dabad92c65a03523055577d847f5dcc00f3e7d3a68bc4d48e01d8fe1" +dependencies = [ + "regex-automata 0.4.4", +] + [[package]] name = "lapin" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09373d2aa72b8026c24606543d395ba0b688152beb42537d8c10eca92e8c9925" +checksum = "209b09a06f4bd4952a0fd0594f90d53cf4496b062f59acc838a2823e1bb7d95c" dependencies = [ "amq-protocol", "async-global-executor-trait", @@ -5032,9 +5144,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libflate" @@ -5148,7 +5260,7 @@ checksum = "879777f0cc6f3646a044de60e4ab98c75617e3f9580f7a2032e6ad7ea0cd3054" name = "loki-logproto" version = "0.1.0" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "prost 0.12.6", "prost-build 0.12.6", @@ -5158,9 +5270,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ "hashbrown 0.14.5", ] @@ -5354,7 +5466,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb791d015f8947acf5a7f62bd28d00f289bb7ea98cfbe3ffec1d061eee12df12" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "itoa", "lockfree-object-pool", "metrics", @@ -5375,10 +5487,10 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.14.5", - "indexmap 2.2.6", + "indexmap 2.5.0", "metrics", "num_cpus", - "ordered-float 4.2.1", + "ordered-float 4.2.2", "quanta", "radix_trie", "sketches-ddsketch", @@ -5415,6 +5527,15 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.8.11" @@ -5445,7 +5566,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d111deb18a9c9bd33e1541309f4742523bfab01d276bfa9a27519f6de9c11dc7" dependencies = [ - "bstr 1.9.1", + "bstr 1.10.0", "mlua-sys", "mlua_derive", "num-traits", @@ -5476,9 +5597,9 @@ dependencies = [ "once_cell", "proc-macro-error", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "regex", - "syn 2.0.72", + "syn 2.0.75", ] [[package]] @@ -5564,7 +5685,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a15d522be0a9c3e46fd2632e272d178f56387bdb5c9fbb3a36c649062e9b5219" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "encoding_rs", "futures-util", "http 1.1.0", @@ -5602,25 +5723,27 @@ dependencies = [ [[package]] name = "ndarray" -version = "0.15.6" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" +checksum = "882ed72dce9365842bf196bdeedf5055305f11fc8c03dee7bb0194a6cad34841" dependencies = [ "matrixmultiply", "num-complex", "num-integer", "num-traits", + "portable-atomic", + "portable-atomic-util", "rawpointer", ] [[package]] name = "ndarray-stats" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af5a8477ac96877b5bd1fd67e0c28736c12943aba24eda92b127e036b0c8f400" +checksum = "17ebbe97acce52d06aebed4cd4a87c0941f4b2519b59b82b4feb5bd0ce003dfd" dependencies = [ - "indexmap 1.9.3", - "itertools 0.10.5", + "indexmap 2.5.0", + "itertools 0.13.0", "ndarray", "noisy_float", "num-integer", @@ -5704,9 +5827,9 @@ dependencies = [ [[package]] name = "nkeys" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d3669c39cc155872799f8b4f8cfec40fb85e2e099466a1ca110f70652ec0b51" +checksum = "2de02c883c178998da8d0c9816a88ef7ef5c58314dd1585c97a4a5679f3ab337" dependencies = [ "data-encoding", "ed25519", @@ -5929,11 +6052,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ - "num_enum_derive 0.7.2", + "num_enum_derive 0.7.3", ] [[package]] @@ -5944,7 +6067,7 @@ checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -5956,20 +6079,20 @@ checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -6031,7 +6154,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ed2eaec452d98ccc1c615dd843fd039d9445f2fb4da114ee7e6af5fcb68be98" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "serde", "smallvec", ] @@ -6095,7 +6218,7 @@ dependencies = [ "async-trait", "backon", "base64 0.21.7", - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "flagset", "futures 0.3.30", @@ -6167,8 +6290,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -6179,9 +6302,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.1+3.3.1" +version = "300.3.2+3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" +checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" dependencies = [ "cc", ] @@ -6203,14 +6326,14 @@ dependencies = [ name = "opentelemetry-proto" version = "0.1.0" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "hex", - "ordered-float 4.2.1", + "ordered-float 4.2.2", "prost 0.12.6", "prost-build 0.12.6", - "tonic 0.10.2", - "tonic-build 0.10.2", + "tonic", + "tonic-build 0.11.0", "vector-core", "vector-lookup", "vrl", @@ -6233,9 +6356,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" +checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6" dependencies = [ "num-traits", ] @@ -6449,8 +6572,8 @@ dependencies = [ "pest", "pest_meta", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -6471,7 +6594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap 2.5.0", ] [[package]] @@ -6537,8 +6660,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -6684,6 +6807,15 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +[[package]] +name = "portable-atomic-util" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcdd8420072e66d54a407b3316991fe946ce3ab1083a7f575b2463866624704d" +dependencies = [ + "portable-atomic", +] + [[package]] name = "portpicker" version = "1.0.0" @@ -6712,7 +6844,7 @@ checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23" dependencies = [ "base64 0.22.1", "byteorder", - "bytes 1.6.1", + "bytes 1.7.1", "fallible-iterator", "hmac", "md-5", @@ -6728,7 +6860,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02048d9e032fb3cc3413bbf7b83a15d84a5d419778e2628751896d856498eee9" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "fallible-iterator", "postgres-protocol", @@ -6808,7 +6940,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2 1.0.86", - "syn 2.0.72", + "syn 2.0.75", ] [[package]] @@ -6870,7 +7002,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", "version_check", ] @@ -6882,7 +7014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "version_check", ] @@ -6920,9 +7052,9 @@ dependencies = [ name = "prometheus-parser" version = "0.1.0" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "nom", - "num_enum 0.7.2", + "num_enum 0.7.3", "prost 0.12.6", "prost-build 0.12.6", "prost-types 0.12.6", @@ -6957,7 +7089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -6967,7 +7099,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "prost-derive 0.11.9", ] @@ -6977,17 +7109,27 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "prost-derive 0.12.6", ] +[[package]] +name = "prost" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +dependencies = [ + "bytes 1.7.1", + "prost-derive 0.13.1", +] + [[package]] name = "prost-build" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "heck 0.4.1", "itertools 0.10.5", "lazy_static", @@ -7009,7 +7151,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "heck 0.5.0", "itertools 0.12.1", "log", @@ -7020,7 +7162,7 @@ dependencies = [ "prost 0.12.6", "prost-types 0.12.6", "regex", - "syn 2.0.72", + "syn 2.0.75", "tempfile", ] @@ -7033,7 +7175,7 @@ dependencies = [ "anyhow", "itertools 0.10.5", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -7046,20 +7188,33 @@ dependencies = [ "anyhow", "itertools 0.12.1", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] -name = "prost-reflect" +name = "prost-derive" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5eec97d5d34bdd17ad2db2219aabf46b054c6c41bd5529767c9ce55be5898f" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.75", +] + +[[package]] +name = "prost-reflect" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55a6a9143ae25c25fa7b6a48d6cc08b10785372060009c25140a4e7c340e95af" dependencies = [ "base64 0.22.1", "once_cell", - "prost 0.12.6", - "prost-types 0.12.6", + "prost 0.13.1", + "prost-types 0.13.1", "serde", "serde-value", ] @@ -7082,6 +7237,15 @@ dependencies = [ "prost 0.12.6", ] +[[package]] +name = "prost-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" +dependencies = [ + "prost 0.13.1", +] + [[package]] name = "psl" version = "2.1.22" @@ -7113,7 +7277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -7135,7 +7299,7 @@ checksum = "d7f3541ff84e39da334979ac4bf171e0f277f4f782603aeae65bf5795dc7275a" dependencies = [ "async-trait", "bit-vec", - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "crc", "data-url", @@ -7221,7 +7385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -7236,9 +7400,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2 1.0.86", ] @@ -7442,6 +7606,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55e0d2f9ba6253f6ec72385e453294f8618e9e15c2c6aba2a5c01ccf9622d615" dependencies = [ "cmake", + "curl-sys", "libc", "libz-sys", "num_enum 0.5.11", @@ -7470,7 +7635,7 @@ checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd" dependencies = [ "arc-swap", "async-trait", - "bytes 1.6.1", + "bytes 1.7.1", "combine 4.6.6", "futures 0.3.30", "futures-util", @@ -7526,9 +7691,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -7602,7 +7767,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" dependencies = [ "base64 0.21.7", - "bytes 1.6.1", + "bytes 1.7.1", "encoding_rs", "futures-core", "futures-util", @@ -7648,7 +7813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "base64 0.22.1", - "bytes 1.6.1", + "bytes 1.7.1", "futures-core", "futures-util", "http 1.1.0", @@ -7721,13 +7886,13 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", - "bytes 1.6.1", + "bytes 1.7.1", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -7739,12 +7904,12 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -7826,9 +7991,9 @@ dependencies = [ [[package]] name = "rstest" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" +checksum = "7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936" dependencies = [ "futures 0.3.30", "futures-timer", @@ -7838,19 +8003,19 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" +checksum = "c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42" dependencies = [ "cfg-if", "glob", "proc-macro-crate 3.1.0", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "regex", "relative-path", "rustc_version 0.4.0", - "syn 2.0.72", + "syn 2.0.75", "unicode-ident", ] @@ -7860,7 +8025,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1568e15fab2d546f940ed3a21f48bbbd1c494c90c99c4481339364a497f94a9" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "flume 0.11.0", "futures-util", "log", @@ -7880,7 +8045,7 @@ checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" dependencies = [ "arrayvec", "borsh", - "bytes 1.6.1", + "bytes 1.7.1", "num-traits", "rand 0.8.5", "rkyv", @@ -8245,9 +8410,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] @@ -8293,13 +8458,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -8309,18 +8474,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "itoa", + "memchr", "ryu", "serde", ] @@ -8371,15 +8537,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -8416,7 +8582,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -8432,7 +8598,7 @@ checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -8444,8 +8610,8 @@ checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ "darling 0.20.8", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -8466,7 +8632,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "itoa", "ryu", "serde", @@ -8711,7 +8877,7 @@ checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ "heck 0.4.1", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -8723,8 +8889,8 @@ checksum = "080c44971436b1af15d6f61ddd8b543995cf63ab8e677d46b00cc06f4ef267a0" dependencies = [ "heck 0.4.1", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -8793,8 +8959,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" dependencies = [ - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -8888,9 +9054,9 @@ checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "rustversion", - "syn 2.0.72", + "syn 2.0.75", ] [[package]] @@ -8901,9 +9067,9 @@ checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ "heck 0.5.0", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "rustversion", - "syn 2.0.72", + "syn 2.0.75", ] [[package]] @@ -8940,18 +9106,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.72" +version = "2.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "unicode-ident", ] @@ -8963,8 +9129,8 @@ checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" dependencies = [ "proc-macro-error", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -9054,14 +9220,15 @@ checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand 2.0.1", + "once_cell", "rustix 0.38.31", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -9128,8 +9295,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -9232,12 +9399,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.1" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", - "bytes 1.6.1", + "bytes 1.7.1", "libc", "mio 1.0.1", "parking_lot", @@ -9277,8 +9444,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -9311,7 +9478,7 @@ checksum = "03adcf0147e203b6032c0b2d30be1415ba03bc348901f3ff1cc0df6a733e60c3" dependencies = [ "async-trait", "byteorder", - "bytes 1.6.1", + "bytes 1.7.1", "fallible-iterator", "futures-channel", "futures-util", @@ -9380,7 +9547,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" dependencies = [ "async-stream", - "bytes 1.6.1", + "bytes 1.7.1", "futures-core", "tokio", "tokio-stream", @@ -9413,36 +9580,35 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" -source = "git+https://github.com/vectordotdev/tokio?branch=tokio-util-0.7.8-framed-read-continue-on-error#3747655f8f0443e13fe20da3f613ea65c23347c2" +version = "0.7.11" +source = "git+https://github.com/vectordotdev/tokio?branch=tokio-util-0.7.11-framed-read-continue-on-error#156dcaacdfa53f530a39eb91b1ceb731a9908986" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "futures-core", "futures-io", "futures-sink", "pin-project-lite", "slab", "tokio", - "tracing 0.1.40", ] [[package]] name = "toml" -version = "0.8.15" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.16", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -9453,7 +9619,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "toml_datetime", "winnow 0.5.18", ] @@ -9464,7 +9630,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "toml_datetime", "winnow 0.5.18", ] @@ -9475,54 +9641,22 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "toml_datetime", "winnow 0.5.18", ] [[package]] name = "toml_edit" -version = "0.22.16" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", -] - -[[package]] -name = "tonic" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.21.7", - "bytes 1.6.1", - "flate2", - "h2 0.3.26", - "http 0.2.9", - "http-body 0.4.5", - "hyper 0.14.28", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.12.6", - "rustls 0.21.11", - "rustls-native-certs 0.6.3", - "rustls-pemfile 1.0.3", - "tokio", - "tokio-rustls 0.24.1", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing 0.1.40", + "winnow 0.6.18", ] [[package]] @@ -9535,7 +9669,8 @@ dependencies = [ "async-trait", "axum", "base64 0.21.7", - "bytes 1.6.1", + "bytes 1.7.1", + "flate2", "h2 0.3.26", "http 0.2.9", "http-body 0.4.5", @@ -9544,12 +9679,17 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.12.6", + "rustls-native-certs 0.7.0", + "rustls-pemfile 2.1.0", + "rustls-pki-types", "tokio", + "tokio-rustls 0.25.0", "tokio-stream", "tower", "tower-layer", "tower-service", "tracing 0.1.40", + "zstd 0.12.4", ] [[package]] @@ -9561,21 +9701,21 @@ dependencies = [ "prettyplease 0.1.25", "proc-macro2 1.0.86", "prost-build 0.11.9", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] [[package]] name = "tonic-build" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" +checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" dependencies = [ "prettyplease 0.2.15", "proc-macro2 1.0.86", "prost-build 0.12.6", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -9607,7 +9747,7 @@ dependencies = [ "async-compression", "base64 0.21.7", "bitflags 2.4.1", - "bytes 1.6.1", + "bytes 1.7.1", "futures-core", "futures-util", "http 0.2.9", @@ -9677,8 +9817,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -9868,7 +10008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", - "bytes 1.6.1", + "bytes 1.7.1", "data-encoding", "http 0.2.9", "httparse", @@ -9887,7 +10027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", - "bytes 1.6.1", + "bytes 1.7.1", "data-encoding", "http 1.1.0", "httparse", @@ -9916,7 +10056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -9936,8 +10076,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -9948,9 +10088,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typetag" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "661d18414ec032a49ece2d56eee03636e43c4e8d577047ab334c0ba892e29aaf" +checksum = "52ba3b6e86ffe0054b2c44f2d86407388b933b16cb0a70eea3929420db1d9bbe" dependencies = [ "erased-serde", "inventory", @@ -9961,13 +10101,13 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" +checksum = "70b20a22c42c8f1cd23ce5e34f165d4d37038f5b663ad20fb6adbdf029172483" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -10185,7 +10325,7 @@ dependencies = [ "dunce", "glob", "hex", - "indexmap 2.2.6", + "indexmap 2.5.0", "indicatif", "itertools 0.13.0", "log", @@ -10205,7 +10345,7 @@ dependencies = [ [[package]] name = "vector" -version = "0.40.1" +version = "0.41.1" dependencies = [ "apache-avro", "approx", @@ -10245,7 +10385,7 @@ dependencies = [ "base64 0.22.1", "bloomy", "bollard", - "bytes 1.6.1", + "bytes 1.7.1", "bytesize", "chrono", "chrono-tz", @@ -10271,9 +10411,9 @@ dependencies = [ "glob", "goauth", "governor", - "greptimedb-client", + "greptimedb-ingester", "grok", - "h2 0.4.5", + "h2 0.4.6", "hash_hasher", "hashbrown 0.14.5", "headers", @@ -10287,7 +10427,7 @@ dependencies = [ "hyper 0.14.28", "hyper-openssl", "hyper-proxy", - "indexmap 2.2.6", + "indexmap 2.5.0", "indoc", "infer 0.16.0", "inventory", @@ -10308,7 +10448,7 @@ dependencies = [ "mlua", "mongodb", "nix 0.26.2", - "nkeys 0.4.2", + "nkeys 0.4.3", "nom", "notify", "num-format", @@ -10318,7 +10458,7 @@ dependencies = [ "openssl", "openssl-probe", "openssl-src", - "ordered-float 4.2.1", + "ordered-float 4.2.2", "paste", "percent-encoding", "pin-project", @@ -10372,8 +10512,8 @@ dependencies = [ "tokio-tungstenite 0.20.1", "tokio-util", "toml", - "tonic 0.10.2", - "tonic-build 0.10.2", + "tonic", + "tonic-build 0.11.0", "tower", "tower-http", "tower-test", @@ -10392,7 +10532,7 @@ dependencies = [ "warp", "windows-service", "wiremock", - "zstd 0.13.0", + "zstd 0.13.2", ] [[package]] @@ -10423,7 +10563,7 @@ dependencies = [ "async-stream", "async-trait", "bytecheck", - "bytes 1.6.1", + "bytes 1.7.1", "clap", "crc32fast", "criterion", @@ -10466,16 +10606,16 @@ name = "vector-common" version = "0.1.0" dependencies = [ "async-stream", - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "chrono-tz", "crossbeam-utils", "derivative", "futures 0.3.30", - "indexmap 2.2.6", + "indexmap 2.5.0", "metrics", "nom", - "ordered-float 4.2.1", + "ordered-float 4.2.2", "paste", "pin-project", "quickcheck", @@ -10503,7 +10643,7 @@ dependencies = [ "chrono-tz", "encoding_rs", "http 0.2.9", - "indexmap 2.2.6", + "indexmap 2.5.0", "inventory", "no-proxy", "num-traits", @@ -10528,10 +10668,10 @@ dependencies = [ "darling 0.20.8", "once_cell", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "serde", "serde_json", - "syn 2.0.72", + "syn 2.0.75", "tracing 0.1.40", ] @@ -10541,10 +10681,10 @@ version = "0.1.0" dependencies = [ "darling 0.20.8", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "serde", "serde_derive_internals", - "syn 2.0.72", + "syn 2.0.75", "vector-config", "vector-config-common", ] @@ -10557,12 +10697,13 @@ dependencies = [ "async-trait", "base64 0.22.1", "bitmask-enum", - "bytes 1.6.1", + "bytes 1.7.1", "chrono", "chrono-tz", "criterion", "crossbeam-utils", "db-key", + "derivative", "dyn-clone", "enrichment", "enumflags2", @@ -10573,7 +10714,7 @@ dependencies = [ "headers", "http 0.2.9", "hyper-proxy", - "indexmap 2.2.6", + "indexmap 2.5.0", "ipnet", "metrics", "metrics-tracing-context", @@ -10585,7 +10726,7 @@ dependencies = [ "noisy_float", "once_cell", "openssl", - "ordered-float 4.2.1", + "ordered-float 4.2.2", "parking_lot", "pin-project", "proptest", @@ -10615,13 +10756,14 @@ dependencies = [ "tokio-test", "tokio-util", "toml", - "tonic 0.10.2", + "tonic", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", "typetag", "url", "urlencoding", + "uuid", "vector-buffers", "vector-common", "vector-config", @@ -10686,9 +10828,12 @@ dependencies = [ name = "vector-tap" version = "0.1.0" dependencies = [ + "async-graphql", "chrono", "colored", + "futures 0.3.30", "futures-util", + "glob", "portpicker", "serde_json", "serde_yaml 0.9.34+deprecated", @@ -10698,7 +10843,11 @@ dependencies = [ "tokio-tungstenite 0.20.1", "tracing 0.1.40", "url", + "uuid", "vector-api-client", + "vector-buffers", + "vector-common", + "vector-core", ] [[package]] @@ -10766,9 +10915,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84451e6a979d54175932cfe49f36f31ab7a483f3feb3cfa65ee584b91ef2f858" +checksum = "78418b391bfef6a37127f5d7283a46b2a23e19b676640841fcf334e40740d919" dependencies = [ "aes", "ansi_term", @@ -10776,7 +10925,7 @@ dependencies = [ "base16", "base62", "base64 0.22.1", - "bytes 1.6.1", + "bytes 1.7.1", "cbc", "cfb-mode", "cfg-if", @@ -10788,6 +10937,7 @@ dependencies = [ "clap", "codespan-reporting", "community-id", + "convert_case 0.6.0", "crypto_secretbox", "csv", "ctr", @@ -10804,18 +10954,19 @@ dependencies = [ "hostname 0.4.0", "iana-time-zone", "idna 0.5.0", - "indexmap 2.2.6", + "indexmap 2.5.0", "indoc", + "influxdb-line-protocol", "itertools 0.13.0", "lalrpop", - "lalrpop-util", + "lalrpop-util 0.21.0", "md-5", "mlua", "nom", "ofb", "once_cell", "onig", - "ordered-float 4.2.1", + "ordered-float 4.2.2", "paste", "peeking_take_while", "percent-encoding", @@ -10823,7 +10974,7 @@ dependencies = [ "pest_derive", "prettydiff", "prettytable-rs", - "prost 0.12.6", + "prost 0.13.1", "prost-reflect", "psl", "psl-types", @@ -10855,7 +11006,7 @@ dependencies = [ "uuid", "webbrowser", "woothee", - "zstd 0.13.0", + "zstd 0.13.2", ] [[package]] @@ -10881,7 +11032,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", ] [[package]] @@ -10924,7 +11075,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" dependencies = [ - "bytes 1.6.1", + "bytes 1.7.1", "futures-channel", "futures-util", "headers", @@ -10966,26 +11117,27 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", "wasm-bindgen-shared", ] @@ -11003,32 +11155,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ - "quote 1.0.36", + "quote 1.0.37", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" @@ -11171,7 +11323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -11180,7 +11332,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -11218,7 +11370,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -11253,17 +11414,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -11280,9 +11442,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -11298,9 +11460,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -11316,9 +11478,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -11334,9 +11502,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -11352,9 +11520,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -11370,9 +11538,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -11388,9 +11556,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -11403,9 +11571,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -11504,8 +11672,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.72", + "quote 1.0.37", + "syn 2.0.75", ] [[package]] @@ -11525,11 +11693,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ - "zstd-safe 7.0.0", + "zstd-safe 7.2.1", ] [[package]] @@ -11544,18 +11712,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.0.0" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 9acb418e75088..e93603d044d15 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -1,42 +1,54 @@ -{ stdenv -, lib -, fetchFromGitHub -, rustPlatform -, pkg-config -, openssl -, protobuf -, rdkafka -, oniguruma -, zstd -, rust-jemalloc-sys -, rust-jemalloc-sys-unprefixed -, Security -, libiconv -, coreutils -, CoreServices -, SystemConfiguration -, tzdata -, cmake -, perl -, git +{ + stdenv, + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + protobuf, + rdkafka, + oniguruma, + zstd, + rust-jemalloc-sys, + rust-jemalloc-sys-unprefixed, + Security, + libiconv, + coreutils, + CoreServices, + SystemConfiguration, + tzdata, + cmake, + perl, + git, # nix has a problem with the `?` in the feature list # enabling kafka will produce a vector with no features at all -, enableKafka ? false + enableKafka ? false, # TODO investigate adding various "vendor-*" # "disk-buffer" is using leveldb TODO: investigate how useful # it would be, perhaps only for massive scale? -, features ? ([ "api" "api-client" "enrichment-tables" "sinks" "sources" "sources-dnstap" "transforms" "component-validation-runner" ] + features ? ( + [ + "api" + "api-client" + "enrichment-tables" + "sinks" + "sources" + "sources-dnstap" + "transforms" + "component-validation-runner" + ] # the second feature flag is passed to the rdkafka dependency # building on linux fails without this feature flag (both x86_64 and AArch64) ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ] - ++ lib.optional stdenv.hostPlatform.isUnix "unix") -, nixosTests -, nix-update-script + ++ lib.optional stdenv.hostPlatform.isUnix "unix" + ), + nixosTests, + nix-update-script, }: let pname = "vector"; - version = "0.40.1"; + version = "0.41.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -45,27 +57,54 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-1vFDFdO9E5mUAUfEdg9Ec5ptq2Kp7HpqNz5+9CMn30U="; + hash = "sha256-E6AVjxwXMDonqsAMcCpaZBEPCi9bVXUygG4PUOLh+ck="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "greptime-proto-0.1.0" = "sha256-Q8xr6qN6SAGGK0W96WuNRdQ5/8iNlruqzhXD6xq3Ua8="; - "greptimedb-client-0.1.0" = "sha256-evL8Q2Ikct9s0r4DWTgSP/8g4XTishuJHmwRoCfQFbU="; - "heim-0.1.0-rc.1" = "sha256-TFgLR5zb/oqceVOH4mIOvFFY/HMOLSo8VI5Eh9KP60E="; + "greptime-proto-0.1.0" = "sha256-QT3PZnHJoVghuRCGoZIH6L8jnX7Wn9eSuQqHIyrUY4E="; + "greptimedb-ingester-0.1.0" = "sha256-1M9yWXDZ6U9JTVyXQg9ZcSSGJp7GXtaCfQHdtjhw6FY="; + "heim-0.1.0-rc.1" = "sha256-pMraYKr6srTQqEzoBx9gGHHlJ7nMKwj50ftimQAkfL0="; "nix-0.26.2" = "sha256-uquYvRT56lhupkrESpxwKEimRFhmYvri10n3dj0f2yg="; "ntapi-0.3.7" = "sha256-G6ZCsa3GWiI/FeGKiK9TWkmTxen7nwpXvm5FtjNtjWU="; - "tokio-util-0.7.8" = "sha256-HCvtfohOoa1ZjD4s7QLDbIV4fe/MVBKtgM1QQX7gGKQ="; + "tokio-util-0.7.11" = "sha256-oV9fSPjLMY1KbcbDP2WTVjF/N0qlQBPDIYHOp3aNCTY="; "tracing-0.2.0" = "sha256-YAxeEofFA43PX2hafh3RY+C81a2v6n1fGzYz2FycC3M="; }; }; - nativeBuildInputs = [ pkg-config cmake perl git rustPlatform.bindgenHook ]; + nativeBuildInputs = [ + pkg-config + cmake + perl + git + rustPlatform.bindgenHook + ]; buildInputs = - [ oniguruma openssl protobuf rdkafka zstd ] - ++ lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] - ++ lib.optionals stdenv.isDarwin [ rust-jemalloc-sys Security libiconv coreutils CoreServices SystemConfiguration ]; + [ + oniguruma + openssl + protobuf + rdkafka + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + rust-jemalloc-sys + Security + libiconv + coreutils + CoreServices + SystemConfiguration + ]; + + # Rust 1.80.0 introduced the unexepcted_cfgs lint, which requires crates to allowlist custom cfg options that they inspect. + # Upstream is working on fixing this in https://github.com/vectordotdev/vector/pull/20949, but silencing the lint lets us build again until then. + # TODO remove when upgrading Vector + RUSTFLAGS = "--allow unexpected_cfgs"; + + # Without this, we get SIGSEGV failure + RUST_MIN_STACK = 33554432; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; @@ -75,7 +114,7 @@ rustPlatform.buildRustPackage { TZDIR = "${tzdata}/share/zoneinfo"; # needed to dynamically link rdkafka - CARGO_FEATURE_DYNAMIC_LINKING=1; + CARGO_FEATURE_DYNAMIC_LINKING = 1; CARGO_PROFILE_RELEASE_LTO = "fat"; CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; @@ -115,12 +154,14 @@ rustPlatform.buildRustPackage { # transforms-geoip is patched out of Cargo.toml for now - unless explicitly asked for. postPatch = '' substituteInPlace ./src/dns.rs \ - --replace "#[tokio::test]" "" + --replace-fail "#[tokio::test]" "" ''; passthru = { inherit features; - tests = { inherit (nixosTests) vector; }; + tests = { + inherit (nixosTests) vector; + }; updateScript = nix-update-script { }; }; @@ -128,7 +169,10 @@ rustPlatform.buildRustPackage { description = "High-performance observability data pipeline"; homepage = "https://github.com/vectordotdev/vector"; license = licenses.mpl20; - maintainers = with maintainers; [ thoughtpolice happysalada ]; + maintainers = with maintainers; [ + thoughtpolice + happysalada + ]; platforms = with platforms; all; mainProgram = "vector"; }; diff --git a/pkgs/tools/misc/viddy/default.nix b/pkgs/tools/misc/viddy/default.nix deleted file mode 100644 index cb9f1d68e9c9f..0000000000000 --- a/pkgs/tools/misc/viddy/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage rec { - pname = "viddy"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "sachaos"; - repo = "viddy"; - rev = "v${version}"; - hash = "sha256-Rb4IBguyRLiwUR9dDKOagWSUjov0OzxiiuSg7epjCv0="; - }; - - cargoHash = "sha256-Lr/sl0IcoVGb22y5BQrGIUVx8Ny+bQg1MqUBRPqF1nk="; - - # requires nightly features - env.RUSTC_BOOTSTRAP = 1; - - env.VERGEN_BUILD_DATE = "2024-08-26"; # managed via the update script - env.VERGEN_GIT_DESCRIBE = "Nixpkgs"; - - passthru.updateScript.command = [ ./update.sh ]; - - meta = with lib; { - description = "Modern watch command, time machine and pager etc."; - changelog = "https://github.com/sachaos/viddy/releases"; - homepage = "https://github.com/sachaos/viddy"; - license = licenses.mit; - maintainers = with maintainers; [ - j-hui - phanirithvij - ]; - mainProgram = "viddy"; - }; -} diff --git a/pkgs/tools/misc/vimv-rs/default.nix b/pkgs/tools/misc/vimv-rs/default.nix index 2b419e5403c0c..780af1846ff15 100644 --- a/pkgs/tools/misc/vimv-rs/default.nix +++ b/pkgs/tools/misc/vimv-rs/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rYQxIttuGBGEkYkFtSBl8ce1I/Akm6FxeITJcaIeP6M="; - buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; meta = with lib; { description = "Command line utility for batch-renaming files"; diff --git a/pkgs/tools/misc/vrc-get/default.nix b/pkgs/tools/misc/vrc-get/default.nix index dac2f34dbacae..a458e6c309537 100644 --- a/pkgs/tools/misc/vrc-get/default.nix +++ b/pkgs/tools/misc/vrc-get/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; cargoHash = "sha256-WFGY5osZIEYeHQchvuE3ddeqh2wzfZNV+SGqW08zYDI="; diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 90b8b31c263cb..cddabd79db23f 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vtm"; - version = "0.9.99.07"; + version = "0.9.99.13"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${finalAttrs.version}"; - hash = "sha256-RKCh3lQuYD9Cpjq9R0Sle7QYinw7+E4/agGxQZvN8v4="; + hash = "sha256-IXxbEwwwqqy5zepdJULlIsrz2csnpGXQhBzbc5AW7II="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/wagyu/default.nix b/pkgs/tools/misc/wagyu/default.nix index 0eb71743f064a..6200ee77d6132 100644 --- a/pkgs/tools/misc/wagyu/default.nix +++ b/pkgs/tools/misc/wagyu/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-vseTtok0E0ddg9ALQ1ql3NPPxirfyMPHOSWsM2qu2jU="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Rust library for generating cryptocurrency wallets"; diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix deleted file mode 100644 index 8edcd7bef01fd..0000000000000 --- a/pkgs/tools/misc/wakapi/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "wakapi"; - version = "2.11.2"; - - src = fetchFromGitHub { - owner = "muety"; - repo = pname; - rev = version; - sha256 = "sha256-lBjYtb64blFUH/iW/SmC4A7nX9asokvsNKu6QVYgmZ8="; - }; - - vendorHash = "sha256-Kt7RzAGZeLFhwvq+V6AK88rivqkoTE1Zep7NMh3BXXQ="; - - # Not a go module required by the project, contains development utilities - excludedPackages = [ "scripts" ]; - - # Fix up reported version - postPatch = ''echo ${version} > version.txt''; - - ldflags = [ - "-s" - "-w" - ]; - - meta = with lib; { - homepage = "https://wakapi.dev/"; - changelog = "https://github.com/muety/wakapi/releases/tag/${version}"; - description = "Minimalist self-hosted WakaTime-compatible backend for coding statistics"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ t4ccer ]; - mainProgram = "wakapi"; - }; -} diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index 36e4337a7abb6..ebfa6875a6f61 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,21 +5,23 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.216.0"; + version = "1.217.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-HgeiZo/wXLKYwTQv/gcKHNz3p9jfp/8OYSrum3TPI2Q="; + hash = "sha256-nxfYoR0ba0As00WbahSVFNItSlleMmITqs8eJabjD/U="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-KS/mg3OZHCyb6IKmbED18xPCblYk0euzdqz7fJl0plI="; + cargoHash = "sha256-mBSRJYSE3HmeWhnW4nFF8uFnUJaZ6wdqsq+GnL6SZWc="; cargoBuildFlags = [ "--package" "wasm-tools" ]; - cargoTestFlags = [ "--all" ]; + cargoTestFlags = [ "--all" ] ++ + # Due to https://github.com/bytecodealliance/wasm-tools/issues/1820 + [ "--" "--test-threads=1" ]; meta = with lib; { description = "Low level tooling for WebAssembly in Rust"; diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index cd7381243cc47..0d04a21219bc5 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -15,9 +15,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Cocoa AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa AppKit ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; checkFlags = [ "--skip=help" "--skip=help_short" ]; diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 786062cfffb9f..fd8841b96bd00 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; buildFeatures = [ "ssl" ]; diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/tools/misc/wlc/default.nix index 46683480de3cb..29eda8696d12f 100644 --- a/pkgs/tools/misc/wlc/default.nix +++ b/pkgs/tools/misc/wlc/default.nix @@ -7,11 +7,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "wlc"; - version = "1.14"; + version = "1.15"; src = fetchPypi { inherit pname version; - hash = "sha256-QMF41B6a2jMSdhjeFoRQq+K1YJAEz96msHLzX6wVqSc="; + hash = "sha256-0T8cMq5Mrv/Ygo6BfYho3sjFuu8dYZyUMtJc5gabuG4="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index e23f161f90245..265f7f9c35ce1 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -16,10 +16,11 @@ in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/wootility \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index 3a7bd5d395a63..8a4ccaed896c1 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.cc.isClang [ (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14") ]; # Linking gobject explicitly fixes missing symbols (such as missing `_g_object_unref`) on Darwin. - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" $(pkg-config gobject-2.0 --libs)" ''; diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 093e7152bbcf9..a94f9681a05cd 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { lib.optional (gccCross != null) gccCross; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; license = lib.licenses.gpl3; homepage = "http://www.linux-mtd.infradead.org/"; diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/tools/misc/xcp/default.nix index 68c29e3ce1ef0..c95be8d922b9d 100644 --- a/pkgs/tools/misc/xcp/default.nix +++ b/pkgs/tools/misc/xcp/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "xcp"; - version = "0.21.2"; + version = "0.21.3"; src = fetchFromGitHub { owner = "tarka"; repo = pname; rev = "v${version}"; - hash = "sha256-dcNnj8j6eItDoP2K33nBPC8kvB9DuHc4/LxsoKF9H/g="; + hash = "sha256-psxA4YgrO1zg1hVL93opxxQ4VgjdmLP7KI2nkhEYmaE="; }; # no such file or directory errors doCheck = false; - cargoHash = "sha256-CT3vo5ctgB6kVOGPjMI/tLCvdWvXEFdOWip5nH9fxfo="; + cargoHash = "sha256-o29DesCKOtl4aQysFOVZUm2BghkFbxBOQi02KrUJRGM="; meta = with lib; { description = "Extended cp(1)"; diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix deleted file mode 100644 index f5581bd354c12..0000000000000 --- a/pkgs/tools/misc/xprite-editor/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, rustPlatform -, gtk3 -, AppKit -, pkg-config -, python3 -}: - -rustPlatform.buildRustPackage rec { - pname = "xprite-editor-unstable"; - version = "2019-09-22"; - - src = fetchFromGitHub { - owner = "rickyhan"; - repo = "xprite-editor"; - rev = "7f899dff982642927024540e4bafd74e4ea5e52a"; - sha256 = "1k6k8y8gg1vdmyjz27q689q9rliw0rrnzwlpjcd4vlc6swaq9ahx"; - fetchSubmodules = true; - # Rename unicode file name which leads to different checksums on HFS+ - # vs. other filesystems because of unicode normalization. - postFetch = '' - mv $out/config/palettes/Sweet\ Guaran*.hex $out/config/palettes/Sweet\ Guarana.hex - ''; - }; - - buildInputs = lib.optionals stdenv.isLinux [ gtk3 ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; - - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config python3 ]; - - cargoHash = "sha256-k53nSYBIJJHPivz6IvF5t0eZVkTvj1ZT3RyHdoy5MXw="; - - cargoBuildFlags = [ "--bin" "xprite-native" ]; - - meta = with lib; { - # error[E0034]: multiple applicable items in scope - # multiple `clamp` found - # https://github.com/NixOS/nixpkgs/issues/146949 - broken = true; - homepage = "https://github.com/rickyhan/xprite-editor"; - description = "Pixel art editor"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/tools/misc/xxv/default.nix b/pkgs/tools/misc/xxv/default.nix index 3973f8d096ac9..eaa27e34d9d33 100644 --- a/pkgs/tools/misc/xxv/default.nix +++ b/pkgs/tools/misc/xxv/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-S8IKBXREJ+0z4Qz9i3RH52btg1Mpk6GjKIJf4ivdt14="; buildInputs = lib.optionals useNcurses [ ncurses ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]) ; # I'm picking pancurses for Windows simply because that's the example given in Cursive's diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/tools/misc/ytarchive/default.nix index fd26b0f5d28cc..9f16680759a2b 100644 --- a/pkgs/tools/misc/ytarchive/default.nix +++ b/pkgs/tools/misc/ytarchive/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ytarchive"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Kethsar"; repo = "ytarchive"; rev = "v${version}"; - hash = "sha256-mQgpwuTIEHeDv/PzBHpK1sraxFj8Ef3y8vN5bLw5E94="; + hash = "sha256-Y1frd7iJJuNFvLL/C1Y+RrqYC/1LF7P3J9rkPAThp9c="; }; - vendorHash = "sha256-sjwQ/zEYJRkeWUDB7TzV8z+kET8lVRnQkXYbZbcUeHY="; + vendorHash = "sha256-hVAiWJKdDQB+6UlARFdjVATCMiGrEK2US62KAxCquvU="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 6243a2e4668c4..5523b6468969a 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec { postPatch = '' substituteInPlace "ykman/pcsc/__init__.py" \ - --replace 'pkill' '${if stdenv.isLinux then procps else "/usr"}/bin/pkill' + --replace 'pkill' '${if stdenv.hostPlatform.isLinux then procps else "/usr"}/bin/pkill' ''; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 347221ceedf8e..6493c7244c3b0 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -34,7 +34,7 @@ mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://developers.yubico.com/yubikey-personalization-gui"; description = "QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 105d35349eb9b..e069d0c8d87fd 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv DiskArbitration Foundation diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 5383e8d5376f3..5c1ba44d156dc 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,25 +10,25 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.9.4"; + version = "0.9.6"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "refs/tags/v${version}"; - hash = "sha256-Yp7uLoFEDkb0TztcDCeAkt+EHQRt56ncPqkBtd/zzzI="; + hash = "sha256-3XC5K4OlituoFMPN9yJkYi+tkH6M0KK5jVAGdr/GLd0="; }; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; postPatch = lib.optionalString withFzf '' substituteInPlace src/util.rs \ --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoHash = "sha256-t6GVoMBCD0s36GhtqJu9Z2bwwq5P+beEObG+gSC+QUw="; + cargoHash = "sha256-ZRsnoLysNzDIi9hDOqwAzbxcyFQgn2Wv3gRNAjV5HfE="; postInstall = '' installManPage man/man*/* diff --git a/pkgs/tools/networking/6tunnel/default.nix b/pkgs/tools/networking/6tunnel/default.nix index 2f0e0320548b8..b26853ee4ea16 100644 --- a/pkgs/tools/networking/6tunnel/default.nix +++ b/pkgs/tools/networking/6tunnel/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "Tunnelling for application that don't speak IPv6"; mainProgram = "6tunnel"; homepage = "https://github.com/wojtekka/6tunnel"; + changelog = "https://github.com/wojtekka/6tunnel/blob/${version}/ChangeLog"; license = licenses.gpl2Only; maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 9ab10f736f3ba..35d59d11feeb2 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-x8cfLn8b9h6+rpAVXZHdaVTzkzlDSfyGWveDX9usIPE="; + hash = "sha256-1fYJ0G75sbg97HiN6HNWwlG82jqENqVTC/sXgH+oXWA="; }; - cargoHash = "sha256-eGA3oTDk3tGzYDeGJwe6+Tpum+ue534qXv79SotDy/o="; + cargoHash = "sha256-COZmd5sqaewK0La78/1J9bGJdsPNyeT18wV2qr/b6cM="; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 6bfd3136dc984..b1ee701257391 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -34,7 +34,7 @@ , useGcrypt ? false , enableAirolib ? true , enableRegex ? true -, useAirpcap ? stdenv.isCygwin +, useAirpcap ? stdenv.hostPlatform.isCygwin }: let airpcap-sdk = fetchzip { @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { hash = "sha256-niQDwiqi5GtBW5HIn0endnqPb/MqllcjsjXw4pTyFKY="; }; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace lib/osdep/linux.c --replace-warn /usr/local/bin ${lib.escapeShellArg (lib.makeBinPath [ wirelesstools ])} @@ -72,15 +72,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; buildInputs = lib.singleton (if useGcrypt then libgcrypt else openssl) - ++ lib.optionals stdenv.isLinux [ libpcap zlib libnl iw ethtool pciutils ] - ++ lib.optional (stdenv.isCygwin && stdenv.isClang) libiconv + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpcap zlib libnl iw ethtool pciutils ] + ++ lib.optional (stdenv.hostPlatform.isCygwin && stdenv.hostPlatform.isClang) libiconv ++ lib.optional enableAirolib sqlite ++ lib.optional enableRegex pcre2 ++ lib.optional useAirpcap airpcap-sdk; nativeCheckInputs = [ cmocka expect ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram "$out/bin/airmon-ng" --prefix PATH : ${lib.escapeShellArg (lib.makeBinPath [ ethtool iw @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { ''; installCheckTarget = "integration"; - nativeInstallCheckInputs = [ cmocka expect ] ++ lib.optionals stdenv.isLinux [ tcpdump hostapd wpa_supplicant screen ]; + nativeInstallCheckInputs = [ cmocka expect ] ++ lib.optionals stdenv.hostPlatform.isLinux [ tcpdump hostapd wpa_supplicant screen ]; meta = { description = "WiFi security auditing tools suite"; diff --git a/pkgs/tools/networking/anevicon/default.nix b/pkgs/tools/networking/anevicon/default.nix index 9611275805007..c84f0e75d3d64 100644 --- a/pkgs/tools/networking/anevicon/default.nix +++ b/pkgs/tools/networking/anevicon/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Id/vjne73w+bDVA8wT7fV1DMXeGtYbSAdwl07UfYJbw="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; cargoPatches = [ # Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1 @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ]; # Tries to send large UDP packets that Darwin rejects. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "UDP-based load generator"; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 97eb911baef11..e3c4210857e3c 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; buildInputs = [ gnutls c-ares libxml2 sqlite zlib libssh2 ] ++ - lib.optional stdenv.isDarwin Security; + lib.optional stdenv.hostPlatform.isDarwin Security; outputs = [ "bin" "dev" "out" "doc" "man" ]; @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://aria2.github.io"; + changelog = "https://github.com/aria2/aria2/releases/tag/release-${version}"; description = "Lightweight, multi-protocol, multi-source, command-line download utility"; mainProgram = "aria2c"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 9d13a323357be..43ed2dc16c8af 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - nativeCheckInputs = lib.optionals stdenv.isDarwin [ ps ]; + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isDarwin [ ps ]; postInstall = '' wrapProgram "$out/bin/assh" \ diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index 64d13a7b14eaf..1155b2b876bb0 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.2-alpha"; env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0"; - LANG = if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"; + LANG = if stdenv.hostPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8"; nativeBuildInputs = [ ronn mount ]; src = fetchgit { diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 550266b9da992..0c5a6d20a694b 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postPatch = '' ln --force -s ${./Cargo.lock} Cargo.lock diff --git a/pkgs/tools/networking/bitmask-vpn/build_release.patch b/pkgs/tools/networking/bitmask-vpn/build_release.patch new file mode 100644 index 0000000000000..ecb53f39e2e35 --- /dev/null +++ b/pkgs/tools/networking/bitmask-vpn/build_release.patch @@ -0,0 +1,17 @@ +diff --git a/bitmask.pro b/bitmask.pro +index f377bb4..3c71a71 100644 +--- a/bitmask.pro ++++ b/bitmask.pro +@@ -4,9 +4,9 @@ QT += quickcontrols2 svg + CONFIG += qt staticlib + CONFIG += c++17 strict_c++ + CONFIG += qtquickcompiler +-CONFIG+=force_debug_info +-CONFIG+=debug_and_release +-#CONFIG+=release ++#CONFIG+=force_debug_info ++#CONFIG+=debug_and_release ++CONFIG+=release + windows:CONFIG -= console + unix:DEBUG:CONFIG += debug + lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5") \ No newline at end of file diff --git a/pkgs/tools/networking/bitmask-vpn/default.nix b/pkgs/tools/networking/bitmask-vpn/default.nix index 60988da176a26..8a21a3b2f3eb5 100644 --- a/pkgs/tools/networking/bitmask-vpn/default.nix +++ b/pkgs/tools/networking/bitmask-vpn/default.nix @@ -1,7 +1,7 @@ { lib , stdenv +, substituteAll , fetchFromGitLab -, mkDerivation , buildGoModule , wrapQtAppsHook , python3Packages @@ -13,32 +13,29 @@ , iproute2 , iptables , procps -, qmltermwidget , qtbase , qtdeclarative -, qtgraphicaleffects -, qtinstaller -, qtquickcontrols -, qtquickcontrols2 +, qtsvg , qttools +, qtwayland , CoreFoundation , Security , provider ? "riseup" }: let - version = "0.21.11"; + version = "0.24.8"; src = fetchFromGitLab { domain = "0xacab.org"; owner = "leap"; repo = "bitmask-vpn"; - rev = version; - sha256 = "sha256-mhmKG6Exxh64oeeeLezJYWEw61iIHLasHjLomd2L8P4="; + rev = "8b3ac473f64b6de0262fbf945ff25af8029134f1"; + sha256 = "sha256-nYMfO091w6H7LyY1+aYubFppg4/3GiZZm4e+0m9Gb3k="; }; # bitmask-root is only used on GNU/Linux # and may one day be replaced by pkg/helper - bitmask-root = mkDerivation { + bitmask-root = stdenv.mkDerivation { inherit src version; sourceRoot = "${src.name}/helpers"; pname = "bitmask-root"; @@ -70,6 +67,18 @@ buildGoModule rec { pname = "${provider}-vpn"; vendorHash = null; + patches = [ + # This patch fixes the paths in the build script generated by qmake + # to use the correct paths for qmlcachegen and lrelease + (substituteAll { + src = ./fix_paths.patch; + inherit qtbase qtdeclarative qttools; + }) + + # Don't build the debug version + ./build_release.patch + ]; + postPatch = '' substituteInPlace pkg/pickle/helpers.go \ --replace /usr/share $out/share @@ -77,17 +86,17 @@ buildGoModule rec { # Using $PROVIDER is not working, # thus replacing directly into the vendor.conf substituteInPlace providers/vendor.conf \ - --replace "provider = riseup" "provider = ${provider}" + --replace "provider = bitmask" "provider = ${provider}" substituteInPlace branding/templates/debian/app.desktop-template \ --replace "Icon=icon" "Icon=${pname}" patchShebangs gui/build.sh wrapPythonProgramsIn branding/scripts - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace pkg/helper/linux.go \ --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn - substituteInPlace pkg/vpn/launcher_linux.go \ + substituteInPlace pkg/launcher/launcher_linux.go \ --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn \ --replace /usr/sbin/bitmask-root ${bitmask-root}/bin/bitmask-root \ --replace /usr/bin/lxpolkit /run/wrappers/bin/polkit-agent-helper-1 \ @@ -98,21 +107,20 @@ buildGoModule rec { cmake pkg-config python3Packages.wrapPython - qmake - qtquickcontrols2 - qttools which wrapQtAppsHook - ] ++ lib.optional (!stdenv.isLinux) qtinstaller; + qmake + qttools + qtsvg + ]; buildInputs = [ qtbase - qmltermwidget qtdeclarative - qtgraphicaleffects - qtquickcontrols - qtquickcontrols2 - ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + qtsvg + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; + # FIXME: building on Darwin currently fails # due to missing debug symbols for Qt, # this should be fixable once darwin.apple_sdk >= 10.13 @@ -123,13 +131,12 @@ buildGoModule rec { buildPhase = '' runHook preBuild - make gen_providers_json - make generate - # Remove timestamps in comments - sed -i -e '/^\/\//d' pkg/config/version/version.go + # TODO: this is a hack that copies the qrc file that should by built by qmlcachegen + # qmlcachegen is in qtdeclarative/libexec, but qmake is in qtbase/bin + # but qmake searches for qmlcachegen in qtbase/libexec which leads to the error + mkdir -p build/qt + cp ${./gui_gui_qmlcache.qrc} build/qt/gui_gui_qmlcache.qrc - # Not using -j$NIX_BUILD_CORES because the Makefile's rules - # are not thread-safe: lib/libgoshim.h is used before being built. make build runHook postBuild @@ -142,7 +149,7 @@ buildGoModule rec { (cd branding/templates/debian && ${python3Packages.python}/bin/python3 generate.py) install -m 444 -D branding/templates/debian/app.desktop $out/share/applications/${pname}.desktop install -m 444 -D providers/${provider}/assets/icon.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -m 444 -D -t $out/share/polkit-1/actions ${bitmask-root}/share/polkit-1/actions/se.leap.bitmask.policy ''; diff --git a/pkgs/tools/networking/bitmask-vpn/fix_paths.patch b/pkgs/tools/networking/bitmask-vpn/fix_paths.patch new file mode 100644 index 0000000000000..afc444952fbb2 --- /dev/null +++ b/pkgs/tools/networking/bitmask-vpn/fix_paths.patch @@ -0,0 +1,13 @@ +diff --git a/gui/build.sh b/gui/build.sh +index a858a81..ac43f52 100755 +--- a/gui/build.sh ++++ b/gui/build.sh +@@ -94,6 +94,8 @@ function buildQmake { + mkdir -p $QTBUILD + $QMAKE -early QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX -o "$QTBUILD/Makefile" CONFIG+=release VENDOR_PATH="${VENDOR_PATH}" $PROJECT + #CONFIG=+force_debug_info CONFIG+=debug CONFIG+=debug_and_release ++ sed -i 's|@qtbase@/libexec/qmlcachegen|@qtdeclarative@/libexec/qmlcachegen|g' $QTBUILD/Makefile ++ sed -i 's|@qtbase@/bin/lrelease|@qttools@/bin/lrelease|g' $QTBUILD/Makefile + } + + function renameOutput { \ No newline at end of file diff --git a/pkgs/tools/networking/bitmask-vpn/gui_gui_qmlcache.qrc b/pkgs/tools/networking/bitmask-vpn/gui_gui_qmlcache.qrc new file mode 100644 index 0000000000000..dd68f646d1fc2 --- /dev/null +++ b/pkgs/tools/networking/bitmask-vpn/gui_gui_qmlcache.qrc @@ -0,0 +1,107 @@ +<?xml version="1.0"?> +<RCC> + <qresource prefix="/"> + <file alias="main.qml">../../gui/main.qml</file> + <file alias="qtquickcontrols2.conf">../../gui/qtquickcontrols2.conf</file> + <file alias="themes/themes.js">../../gui/themes/themes.js</file> + <file alias="themes/theme-riseup.js">../../gui/themes/theme-riseup.js</file> + <file alias="themes/Riseup.qml">../../gui/themes/Riseup.qml</file> + <file alias="themes/theme-calyx.js">../../gui/themes/theme-calyx.js</file> + <file alias="themes/Calyx.qml">../../gui/themes/Calyx.qml</file> + <file alias="themes/Bitmask.qml">../../gui/themes/Bitmask.qml</file> + <file alias="themes/ThemeObject.qml">../../gui/themes/ThemeObject.qml</file> + <file alias="components/MainView.qml">../../gui/components/MainView.qml</file> + <file alias="components/ThemedPage.qml">../../gui/components/ThemedPage.qml</file> + <file alias="components/Splash.qml">../../gui/components/Splash.qml</file> + <file alias="components/FadeBehavior.qml">../../gui/components/FadeBehavior.qml</file> + <file alias="components/Home.qml">../../gui/components/Home.qml</file> + <file alias="components/Header.qml">../../gui/components/Header.qml</file> + <file alias="components/Footer.qml">../../gui/components/Footer.qml</file> + <file alias="components/About.qml">../../gui/components/About.qml</file> + <file alias="components/MaterialRadioButton.qml">../../gui/components/MaterialRadioButton.qml</file> + <file alias="components/MaterialRadioIndicator.qml">../../gui/components/MaterialRadioIndicator.qml</file> + <file alias="components/WrappedRadioButton.qml">../../gui/components/WrappedRadioButton.qml</file> + <file alias="components/MaterialCheckBox.qml">../../gui/components/MaterialCheckBox.qml</file> + <file alias="components/StatusBox.qml">../../gui/components/StatusBox.qml</file> + <file alias="components/Systray.qml">../../gui/components/Systray.qml</file> + <file alias="components/Help.qml">../../gui/components/Help.qml</file> + <file alias="components/Locations.qml">../../gui/components/Locations.qml</file> + <file alias="components/SignalIcon.qml">../../gui/components/SignalIcon.qml</file> + <file alias="components/Preferences.qml">../../gui/components/Preferences.qml</file> + <file alias="components/BoldLabel.qml">../../gui/components/BoldLabel.qml</file> + <file alias="components/LightLabel.qml">../../gui/components/LightLabel.qml</file> + <file alias="components/VPNButtonBase.qml">../../gui/components/VPNButtonBase.qml</file> + <file alias="components/VPNMouseArea.qml">../../gui/components/VPNMouseArea.qml</file> + <file alias="components/VerticalSpacer.qml">../../gui/components/VerticalSpacer.qml</file> + <file alias="components/Icon.qml">../../gui/components/Icon.qml</file> + <file alias="components/VPNState.qml">../../gui/components/VPNState.qml</file> + <file alias="components/InitErrors.qml">../../gui/components/InitErrors.qml</file> + <file alias="components/ErrorBox.qml">../../gui/components/ErrorBox.qml</file> + <file alias="components/MotdBox.qml">../../gui/components/MotdBox.qml</file> + <file alias="resources/icon-noshield.svg">../../gui/resources/icon-noshield.svg</file> + <file alias="resources/location.svg">../../gui/resources/location.svg</file> + <file alias="resources/settings.svg">../../gui/resources/settings.svg</file> + <file alias="resources/power.svg">../../gui/resources/power.svg</file> + <file alias="resources/language.svg">../../gui/resources/language.svg</file> + <file alias="resources/lightning.svg">../../gui/resources/lightning.svg</file> + <file alias="resources/close.svg">../../gui/resources/close.svg</file> + <file alias="resources/donate.svg">../../gui/resources/donate.svg</file> + <file alias="resources/tools.svg">../../gui/resources/tools.svg</file> + <file alias="resources/help.svg">../../gui/resources/help.svg</file> + <file alias="resources/about.svg">../../gui/resources/about.svg</file> + <file alias="resources/bridge.svg">../../gui/resources/bridge.svg</file> + <file alias="resources/gear-fill.svg">../../gui/resources/gear-fill.svg</file> + <file alias="resources/reception-0.svg">../../gui/resources/reception-0.svg</file> + <file alias="resources/reception-2.svg">../../gui/resources/reception-2.svg</file> + <file alias="resources/reception-4.svg">../../gui/resources/reception-4.svg</file> + <file alias="resources/reception-0@24.svg">../../gui/resources/reception-0@24.svg</file> + <file alias="resources/reception-4@24.svg">../../gui/resources/reception-4@24.svg</file> + <file alias="resources/arrow-left.svg">../../gui/resources/arrow-left.svg</file> + <file alias="resources/globe.svg">../../gui/resources/globe.svg</file> + <file alias="resources/spy.gif">../../gui/resources/spy.gif</file> + <file alias="resources/quit.svg">../../gui/resources/quit.svg</file> + <file alias="resources/alert.svg">../../gui/resources/alert.svg</file> + <file alias="resources/angle-right.svg">../../gui/resources/angle-right.svg</file> + <file alias="resources/snowflake.svg">../../gui/resources/snowflake.svg</file> + <file alias="resources/button_green.png">../../gui/resources/button_green.png</file> + <file alias="resources/button_yellow.png">../../gui/resources/button_yellow.png</file> + <file alias="resources/button_red.png">../../gui/resources/button_red.png</file> + <file alias="resources/ravens.svg">../../gui/resources/ravens.svg</file> + <file alias="resources/ravens.gif">../../gui/resources/ravens.gif</file> + <file alias="resources/riseup-icon.svg">../../gui/resources/riseup-icon.svg</file> + <file alias="resources/riseup_connected_bg.png">../../gui/resources/riseup_connected_bg.png</file> + <file alias="resources/riseup_connecting_bg.png">../../gui/resources/riseup_connecting_bg.png</file> + <file alias="resources/riseup_disconnected_bg.png">../../gui/resources/riseup_disconnected_bg.png</file> + <file alias="resources/riseup_green_shield.svg">../../gui/resources/riseup_green_shield.svg</file> + <file alias="resources/calyx/calyx-shield-green.png">../../gui/resources/calyx/calyx-shield-green.png</file> + <file alias="resources/calyx/calyx-hand.png">../../gui/resources/calyx/calyx-hand.png</file> + <file alias="resources/calyx/calyx-red-shield.png">../../gui/resources/calyx/calyx-red-shield.png</file> + <file alias="resources/calyx/calyx-yellow-shield.png">../../gui/resources/calyx/calyx-yellow-shield.png</file> + <file alias="resources/bitmask/splash_logo.png">../../gui/resources/bitmask/splash_logo.png</file> + <file alias="resources/bitmask/state_connected.png">../../gui/resources/bitmask/state_connected.png</file> + <file alias="resources/bitmask/state_connecting.png">../../gui/resources/bitmask/state_connecting.png</file> + <file alias="resources/bitmask/state_disconnected.png">../../gui/resources/bitmask/state_disconnected.png</file> + <file alias="resources/bitmask/bitmask_connected_bg.png">../../gui/resources/bitmask/bitmask_connected_bg.png</file> + <file alias="resources/bitmask/bitmask_connecting_bg.png">../../gui/resources/bitmask/bitmask_connecting_bg.png</file> + <file alias="resources/bitmask/bitmask_disconnected_bg.png">../../gui/resources/bitmask/bitmask_disconnected_bg.png</file> + <file alias="poppins-regular.ttf">../../gui/resources/fonts/Poppins-Regular.ttf</file> + <file alias="poppins-bold.ttf">../../gui/resources/fonts/Poppins-Bold.ttf</file> + <file alias="monserrat-bold.ttf">../../gui/resources/fonts/Montserrat-SemiBold.ttf</file> + <file alias="roboto.ttf">../../gui/resources/fonts/Roboto-Regular.ttf</file> + <file alias="roboto-bold.ttf">../../gui/resources/fonts/Roboto-Bold.ttf</file> + <file alias="assets/icon/png/black/vpn_off.png">../../gui/assets/icon/png/black/vpn_off.png</file> + <file alias="assets/icon/png/black/vpn_on.png">../../gui/assets/icon/png/black/vpn_on.png</file> + <file alias="assets/icon/png/black/vpn_wait_0.png">../../gui/assets/icon/png/black/vpn_wait_0.png</file> + <file alias="assets/icon/png/black/vpn_wait_1.png">../../gui/assets/icon/png/black/vpn_wait_1.png</file> + <file alias="assets/icon/png/black/vpn_wait_2.png">../../gui/assets/icon/png/black/vpn_wait_2.png</file> + <file alias="assets/icon/png/black/vpn_wait_3.png">../../gui/assets/icon/png/black/vpn_wait_3.png</file> + <file alias="assets/icon/png/white/vpn_off.png">../../gui/assets/icon/png/white/vpn_off.png</file> + <file alias="assets/icon/png/white/vpn_on.png">../../gui/assets/icon/png/white/vpn_on.png</file> + <file alias="assets/icon/png/white/vpn_wait_0.png">../../gui/assets/icon/png/white/vpn_wait_0.png</file> + <file alias="assets/icon/png/white/vpn_wait_1.png">../../gui/assets/icon/png/white/vpn_wait_1.png</file> + <file alias="assets/icon/png/white/vpn_wait_2.png">../../gui/assets/icon/png/white/vpn_wait_2.png</file> + <file alias="assets/icon/png/white/vpn_wait_3.png">../../gui/assets/icon/png/white/vpn_wait_3.png</file> + <file alias="assets/img/bird.jpg">../../gui/assets/img/bird.jpg</file> + <file alias="providers.json">../../gui/providers/providers.json</file> + </qresource> +</RCC> diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix index 30a0463ace08c..d182fd22b5e12 100644 --- a/pkgs/tools/networking/bore-cli/default.nix +++ b/pkgs/tools/networking/bore-cli/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-PZDie/lBextHu8EV/butg2pJZFfizeOEdD21I3XFoHk="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index 9af98878b8545..4d67cb4c94d7c 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" pname ]; # error[E0793]: reference to packed field is unaligned - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # FIXME can’t test --all-targets and --doc in a single invocation cargoTestFlags = [ "--all-targets" "--workspace" ]; checkFeatures = [ "std" ]; nativeBuildInputs = [ installShellFiles ] - ++ lib.optional stdenv.isDarwin rustPlatform.bindgenHook; + ++ lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Libsystem SystemConfiguration ]; @@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec { license = licenses.isc; maintainers = [ ]; mainProgram = "bore"; - broken = stdenv.isDarwin; # bindgen fails on: "in6_addr_union_(...)" is not a valid Ident + broken = stdenv.hostPlatform.isDarwin; # bindgen fails on: "in6_addr_union_(...)" is not a valid Ident }; } diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index e2a6a7a3b6e03..30bb243454f8d 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-WFKlfuZGVU5KA57ZYjsIrIwE4B5TeaU5IKt9BNEnWyY="; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; # Testing this project requires sudo, Docker and network access, etc. doCheck = false; diff --git a/pkgs/tools/networking/cbftp/default.nix b/pkgs/tools/networking/cbftp/default.nix deleted file mode 100644 index 5709acb02ddb4..0000000000000 --- a/pkgs/tools/networking/cbftp/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses -, openssl -}: - -stdenv.mkDerivation rec { - pname = "cbftp"; - version = "1173"; - - src = fetchurl { - url = "https://cbftp.eu/${pname}-r${version}.tar.gz"; - hash = "sha256-DE6fnLzWsx6Skz2LRJAaijjIqrYFB8/HPp45P5CcEc8="; - }; - - buildInputs = [ - ncurses - openssl - ]; - - dontConfigure = true; - - makeFlags = lib.optional stdenv.isDarwin "OPTFLAGS=-O0"; - - installPhase = '' - runHook preInstall - - install -D bin/* -t $out/bin/ - install -D API README -t $out/share/doc/${pname}/ - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://cbftp.eu/"; - description = " An advanced multi-purpose FTP/FXP client"; - longDescription = '' - Cbftp is an advanced multi-purpose FTP/FXP client that focuses on - efficient large-scale data spreading, while also supporting most regular - FTP/FXP use cases in a modern way. It runs in a terminal and provides a - semi-graphical user interface through ncurses. - ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/tools/networking/cfspeedtest/default.nix b/pkgs/tools/networking/cfspeedtest/default.nix index 61bdad229863a..f89e8e677c530 100644 --- a/pkgs/tools/networking/cfspeedtest/default.nix +++ b/pkgs/tools/networking/cfspeedtest/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "Unofficial CLI for speed.cloudflare.com"; homepage = "https://github.com/code-inflation/cfspeedtest"; license = with licenses; [ mit ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ colemickens ]; mainProgram = "cfspeedtest"; }; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 4b8b8e8b97086..b18cc56422858 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnutls libedit nspr nss readline texinfo ] - ++ lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libseccomp pps-tools ]; configureFlags = [ "--enable-ntp-signd" "--sbindir=$(out)/bin" "--chronyrundir=/run/chrony" - ] ++ lib.optional stdenv.isLinux "--enable-scfilter"; + ] ++ lib.optional stdenv.hostPlatform.isLinux "--enable-scfilter"; patches = [ # Cleanup the installation script diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 85705a27231f1..c60e853a7d215 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { pkg-config ] ++ # for flock - lib.optional stdenv.isLinux util-linux; + lib.optional stdenv.hostPlatform.isLinux util-linux; buildInputs = [ libuv @@ -70,6 +70,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/tools/networking/cloudflare-warp/default.nix index 0f6207a53e755..49dc5786ab0a0 100644 --- a/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/pkgs/tools/networking/cloudflare-warp/default.nix @@ -10,11 +10,13 @@ , makeDesktopItem , makeWrapper , nftables +, nss +, openssl_3_2 }: stdenv.mkDerivation rec { pname = "cloudflare-warp"; - version = "2024.4.133"; + version = "2024.6.497"; suffix = { aarch64-linux = "arm64"; @@ -22,10 +24,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://pkg.cloudflareclient.com/pool/jammy/main/c/cloudflare-warp/cloudflare-warp_${version}-1_${suffix}.deb"; + url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-qua+aL4+yvpTBGCVUS1rzJX1KZ3DeaW9Bce9lYWvWOM="; - x86_64-linux = "sha256-xZhyYDMjcv8SLfYwclvWBqPDETbeaxiA6jFCg3Nv5gc="; + aarch64-linux = "sha256-j0D1VcPCJpp0yoK6GjuKKwTVNEqKgr9+6X1AfBbsXAg="; + x86_64-linux = "sha256-y+1TQ/QzzjkorSscB2+QBYR81IowKWcgSoUm1Nz9Gts="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -40,6 +42,8 @@ stdenv.mkDerivation rec { dbus gtk3 libpcap + openssl_3_2 + nss stdenv.cc.cc.lib ]; diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index b2a4193ff0497..8750967107efe 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ which ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace "xlc_r gcc" "xlc_r gcc $CC" substitute Makefile Makefile.$CC --replace "CC=gcc" "CC=$CC" ''; diff --git a/pkgs/tools/networking/cocom/default.nix b/pkgs/tools/networking/cocom/default.nix index 7281583b17c11..ad6ab959e6e2f 100644 --- a/pkgs/tools/networking/cocom/default.nix +++ b/pkgs/tools/networking/cocom/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-y5/xOP5YzqsqBxG9c4r9ORyaEf5Ed6D10NFCaKQPchI="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # Tests require network access doCheck = false; diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix deleted file mode 100644 index b0b639c8d7187..0000000000000 --- a/pkgs/tools/networking/containerlab/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -buildGoModule rec { - pname = "containerlab"; - version = "0.56.0"; - - src = fetchFromGitHub { - owner = "srl-labs"; - repo = "containerlab"; - rev = "v${version}"; - hash = "sha256-7jQvfEplGIwTtIAOBc6R5OfcxPQuEbBnzBoAI9mE+7E="; - }; - - nativeBuildInputs = [ installShellFiles ]; - - vendorHash = "sha256-SPxpi9jG3Xtit9JOAv0xWd89qWJZXeIjMwoNTkVeDgk="; - - ldflags = [ - "-s" - "-w" - "-X" "github.com/srl-labs/containerlab/cmd.version=${version}" - "-X" "github.com/srl-labs/containerlab/cmd.commit=${src.rev}" - "-X" "github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z" - ]; - - postInstall = '' - local INSTALL="$out/bin/containerlab" - installShellCompletion --cmd containerlab \ - --bash <($out/bin/containerlab completion bash) \ - --fish <($out/bin/containerlab completion fish) \ - --zsh <($out/bin/containerlab completion zsh) - ''; - - meta = with lib; { - description = "Container-based networking lab"; - homepage = "https://containerlab.dev/"; - changelog = "https://github.com/srl-labs/containerlab/releases/tag/${src.rev}"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ aaronjheng ]; - mainProgram = "containerlab"; - }; -} diff --git a/pkgs/tools/networking/croc/test-local-relay.nix b/pkgs/tools/networking/croc/test-local-relay.nix index 90d335885e7fc..f0a66fcaba82b 100644 --- a/pkgs/tools/networking/croc/test-local-relay.nix +++ b/pkgs/tools/networking/croc/test-local-relay.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { meta = { timeout = 300; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/networking/curl-impersonate/chrome/default.nix b/pkgs/tools/networking/curl-impersonate/chrome/default.nix new file mode 100644 index 0000000000000..ac85af4de0811 --- /dev/null +++ b/pkgs/tools/networking/curl-impersonate/chrome/default.nix @@ -0,0 +1,206 @@ +{ + lib, + stdenv, + fetchFromGitHub, + callPackage, + buildGoModule, + installShellFiles, + buildPackages, + zlib, + zstd, + sqlite, + cmake, + python3, + ninja, + perl, + autoconf, + automake, + libtool, + cctools, + cacert, + unzip, + go, + p11-kit, +}: +stdenv.mkDerivation rec { + pname = "curl-impersonate-chrome"; + version = "0.8.0"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "yifeikong"; + repo = "curl-impersonate"; + rev = "v${version}"; + hash = "sha256-m6zeQUL+yBh3ixS+crbJWHX5TLa61A/3oqMz5UVELso="; + }; + + patches = [ ./disable-building-docs.patch ]; + + # Disable blanket -Werror to fix build on `gcc-13` related to minor + # warnings on `boringssl`. + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + + strictDeps = true; + + depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + buildPackages.stdenv.cc + ]; + + nativeBuildInputs = + lib.optionals stdenv.hostPlatform.isDarwin [ + # Must come first so that it shadows the 'libtool' command but leaves 'libtoolize' + cctools + ] + ++ [ + installShellFiles + cmake + python3 + python3.pythonOnBuildForHost.pkgs.gyp + ninja + perl + autoconf + automake + libtool + unzip + go + ]; + + buildInputs = [ + zlib + zstd + sqlite + ]; + + configureFlags = [ + "--with-ca-bundle=${ + if stdenv.hostPlatform.isDarwin then "/etc/ssl/cert.pem" else "/etc/ssl/certs/ca-certificates.crt" + }" + "--with-ca-path=${cacert}/etc/ssl/certs" + ]; + + buildFlags = [ "chrome-build" ]; + checkTarget = "chrome-checkbuild"; + installTargets = [ "chrome-install" ]; + + doCheck = true; + + dontUseCmakeConfigure = true; + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + dontUseNinjaCheck = true; + + postUnpack = + lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} source/${name}") ( + lib.filterAttrs (n: v: v ? outPath) passthru.deps + ) + ) + + '' + + curltar=$(realpath -s source/curl-*.tar.gz) + + pushd "$(mktemp -d)" + + tar -xf "$curltar" + + pushd curl-curl-*/ + patchShebangs scripts + popd + + rm "$curltar" + tar -czf "$curltar" . + + popd + ''; + + preConfigure = '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH=$TMPDIR/go + export GOPROXY=file://${passthru.boringssl-go-modules} + export GOSUMDB=off + + # Need to get value of $out for this flag + configureFlagsArray+=("--with-libnssckbi=$out/lib") + ''; + + postInstall = + '' + # Remove vestigial *-config script + rm $out/bin/curl-impersonate-chrome-config + + # Patch all shebangs of installed scripts + patchShebangs $out/bin + + # Install headers + make -C curl-*/include install + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # Build and install completions for each curl binary + + # Patch in correct binary name and alias it to all scripts + perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-chrome --shell zsh >$TMPDIR/curl-impersonate-chrome.zsh + substituteInPlace $TMPDIR/curl-impersonate-chrome.zsh \ + --replace-fail \ + '#compdef curl' \ + "#compdef curl-impersonate-chrome$(find $out/bin -name 'curl_*' -printf ' %f=curl-impersonate-chrome')" + + perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-chrome --shell fish >$TMPDIR/curl-impersonate-chrome.fish + substituteInPlace $TMPDIR/curl-impersonate-chrome.fish \ + --replace-fail \ + '--command curl' \ + "--command curl-impersonate-chrome$(find $out/bin -name 'curl_*' -printf ' --command %f')" + + # Install zsh and fish completions + installShellCompletion $TMPDIR/curl-impersonate-chrome.{zsh,fish} + ''; + + preFixup = + let + libext = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + # If libnssckbi.so is needed, link libnssckbi.so without needing nss in closure + if grep -F nssckbi $out/lib/libcurl-impersonate-*${libext} &>/dev/null; then + ln -s ${p11-kit}/lib/pkcs11/p11-kit-trust${libext} $out/lib/libnssckbi${libext} + ${lib.optionalString stdenv.hostPlatform.isElf '' + patchelf --add-needed libnssckbi${libext} $out/lib/libcurl-impersonate-*${libext} + ''} + fi + ''; + + disallowedReferences = [ go ]; + + passthru = { + deps = callPackage ./deps.nix { }; + + updateScript = ./update.sh; + + boringssl-go-modules = + (buildGoModule { + inherit (passthru.deps."boringssl.zip") name; + + src = passthru.deps."boringssl.zip"; + vendorHash = "sha256-oKlwh+Oup3lVgqgq42vY3iLg62VboF9N565yK2W0XxI="; + + nativeBuildInputs = [ unzip ]; + + proxyVendor = true; + }).goModules; + }; + + meta = { + description = "Special build of curl that can impersonate Chrome & Firefox"; + homepage = "https://github.com/yifeikong/curl-impersonate"; + license = with lib.licenses; [ + curl + mit + ]; + maintainers = with lib.maintainers; [ ggg ]; + platforms = lib.platforms.unix; + mainProgram = "curl-impersonate-chrome"; + }; +} diff --git a/pkgs/tools/networking/curl-impersonate/chrome/deps.nix b/pkgs/tools/networking/curl-impersonate/chrome/deps.nix new file mode 100644 index 0000000000000..24669769556a3 --- /dev/null +++ b/pkgs/tools/networking/curl-impersonate/chrome/deps.nix @@ -0,0 +1,24 @@ +# Generated by update.sh +{ fetchurl }: + +{ + "curl-8_7_1.tar.gz" = fetchurl { + url = "https://github.com/curl/curl/archive/curl-8_7_1.tar.gz"; + hash = "sha256-DkbIVvUXYCw0e7X+W3MXT47nmLyH8alyNclXYfdfzCg="; + }; + + "brotli-1.1.0.tar.gz" = fetchurl { + url = "https://github.com/google/brotli/archive/refs/tags/v1.1.0.tar.gz"; + hash = "sha256-5yCmyilCi4A/StFlNxdx9TmPq6OX7fZ3iDehhZnqE/8="; + }; + + "boringssl.zip" = fetchurl { + url = "https://github.com/google/boringssl/archive/d24a38200fef19150eef00cad35b138936c08767.zip"; + hash = "sha256-tzAAwL70VAyUEOZZ86ql+RgXsw4DZhkvW5l0d1eVVHU="; + }; + + "nghttp2-1.63.0.tar.bz2" = fetchurl { + url = "https://github.com/nghttp2/nghttp2/releases/download/v1.63.0/nghttp2-1.63.0.tar.bz2"; + hash = "sha256-YHsXRVTSKoKLxTLR1zT+D3KbXV7SB/LxLpamLoPynFU="; + }; +} diff --git a/pkgs/tools/networking/curl-impersonate/chrome/disable-building-docs.patch b/pkgs/tools/networking/curl-impersonate/chrome/disable-building-docs.patch new file mode 100644 index 0000000000000..ba7a8990ec1a9 --- /dev/null +++ b/pkgs/tools/networking/curl-impersonate/chrome/disable-building-docs.patch @@ -0,0 +1,20 @@ +From 5366ca35b3d20ef962ccf54399cc44f523d803be Mon Sep 17 00:00:00 2001 +From: GGG <gggkiller2@gmail.com> +Date: Mon, 5 Aug 2024 04:19:29 -0300 +Subject: [PATCH] Disable building docs +--- + Makefile.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.in b/Makefile.in +index 41d7324..b1f5ec6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -249,6 +249,7 @@ $(CURL_VERSION)/.chrome: $(chrome_libs) $(CURL_VERSION).tar.gz $(CURL_VERSION)/. + # (for cross compilation), then pass it on to curl. + { \ + config_flags="--prefix=@prefix@"; \ ++ config_flags="$$config_flags --disable-manual"; \ + config_flags="$$config_flags --with-nghttp2=$(nghttp2_install_dir)"; \ + config_flags="$$config_flags --with-brotli=$(brotli_install_dir)"; \ + config_flags="$$config_flags --with-openssl=$(boringssl_install_dir)"; \ diff --git a/pkgs/tools/networking/curl-impersonate/chrome/update.sh b/pkgs/tools/networking/curl-impersonate/chrome/update.sh new file mode 100755 index 0000000000000..afda6e3fbf531 --- /dev/null +++ b/pkgs/tools/networking/curl-impersonate/chrome/update.sh @@ -0,0 +1,88 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p git nix jq coreutils gnugrep gnused curl common-updater-scripts +# shellcheck shell=bash +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" + +stripwhitespace() { + sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' +} + +narhash() { + nix --extra-experimental-features nix-command store prefetch-file --json "$1" | jq -r .hash +} + +nixeval() { + nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r . +} + +vendorhash() { + (nix --extra-experimental-features nix-command build --no-link -f "$nixpkgs" --no-link "$1" 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true +} + +findpath() { + path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" + outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" + + if [ -n "$outpath" ]; then + path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" + fi + + echo "$path" +} + +getvar() { + echo "$2" | grep -F "$1" | sed -e 's/:=/:/g' | cut -d: -f2- | stripwhitespace +} + +attr="${UPDATE_NIX_ATTR_PATH:-curl-impersonate-chrome}" +version="$(curl -sSL "https://api.github.com/repos/yifeikong/curl-impersonate/releases/latest" | jq -r .tag_name | sed -e 's/^v//')" + +pkgpath="$(findpath "$attr")" + +updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)" + +if [ "$updated" -eq 0 ]; then + echo 'update.sh: Package version not updated, nothing to do.' + exit 0 +fi + +vars="$(curl -sSL "https://github.com/yifeikong/curl-impersonate/raw/v$version/Makefile.in" | grep '^ *[^ ]*_\(VERSION\|URL\|COMMIT\) *:=')" + +# TODO: Fix hash for curl. +cat >"$(dirname "$pkgpath")"/deps.nix <<EOF +# Generated by update.sh +{ fetchurl }: + +{ + "$(getvar CURL_VERSION "$vars").tar.gz" = fetchurl { + url = "https://github.com/curl/curl/archive/$(getvar CURL_VERSION "$vars").tar.gz"; + hash = "$(narhash "https://github.com/curl/curl/archive/$(getvar CURL_VERSION "$vars").tar.gz")"; + }; + + "brotli-$(getvar BROTLI_VERSION "$vars").tar.gz" = fetchurl { + url = "https://github.com/google/brotli/archive/refs/tags/v$(getvar BROTLI_VERSION "$vars").tar.gz"; + hash = "$(narhash "https://github.com/google/brotli/archive/refs/tags/v$(getvar BROTLI_VERSION "$vars").tar.gz")"; + }; + + "boringssl.zip" = fetchurl { + url = "https://github.com/google/boringssl/archive/$(getvar BORING_SSL_COMMIT "$vars").zip"; + hash = "$(narhash "https://github.com/google/boringssl/archive/$(getvar BORING_SSL_COMMIT "$vars").zip")"; + }; + + "$(getvar NGHTTP2_VERSION "$vars").tar.bz2" = fetchurl { + url = "$(getvar NGHTTP2_URL "$vars")"; + hash = "$(narhash "$(getvar NGHTTP2_URL "$vars")")"; + }; +} +EOF + +curhash="$(nixeval "$attr.boringssl-go-modules.outputHash")" +newhash="$(vendorhash "$attr.boringssl-go-modules")" + +if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then + sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" +else + echo 'update.sh: New vendorHash same as old vendorHash, nothing to do.' +fi diff --git a/pkgs/tools/networking/curl-impersonate/default.nix b/pkgs/tools/networking/curl-impersonate/default.nix index 4b23e55028bea..f784036b2d6f1 100644 --- a/pkgs/tools/networking/curl-impersonate/default.nix +++ b/pkgs/tools/networking/curl-impersonate/default.nix @@ -1,185 +1,8 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, callPackage -, buildGoModule -, installShellFiles -, symlinkJoin -, buildPackages -, zlib -, sqlite -, cmake -, python3 -, ninja -, perl -, autoconf -, automake -, libtool -, cctools -, cacert -, unzip -, go -, p11-kit -, nixosTests +{ + symlinkJoin, + callPackage, + nixosTests, }: - -let - makeCurlImpersonate = { name, target }: stdenv.mkDerivation rec { - pname = "curl-impersonate-${name}"; - version = "0.6.1"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "lwthiker"; - repo = "curl-impersonate"; - rev = "v${version}"; - hash = "sha256-ExmEhjJC8FPzx08RuKOhRxKgJ4Dh+ElEl+OUHzRCzZc="; - }; - - patches = [ - # Fix shebangs and commands in the NSS build scripts - # (can't just patchShebangs or substituteInPlace since makefile unpacks it) - ./curl-impersonate-0.6.1-fix-command-paths.patch - - # SOCKS5 heap buffer overflow - https://curl.se/docs/CVE-2023-38545.html - (fetchpatch { - name = "curl-impersonate-patch-cve-2023-38545.patch"; - url = "https://github.com/lwthiker/curl-impersonate/commit/e7b90a0d9c61b6954aca27d346750240e8b6644e.diff"; - hash = "sha256-jFrz4Q+MJGfNmwwzHhThado4c9hTd/+b/bfRsr3FW5k="; - }) - ]; - - # Disable blanket -Werror to fix build on `gcc-13` related to minor - # warnings on `boringssl`. - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - strictDeps = true; - - depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - buildPackages.stdenv.cc - ]; - - nativeBuildInputs = lib.optionals stdenv.isDarwin [ - # Must come first so that it shadows the 'libtool' command but leaves 'libtoolize' - cctools - ] ++ [ - installShellFiles - cmake - python3 - python3.pythonOnBuildForHost.pkgs.gyp - ninja - perl - autoconf - automake - libtool - unzip - go - ]; - - buildInputs = [ - zlib - sqlite - ]; - - configureFlags = [ - "--with-ca-bundle=${if stdenv.isDarwin then "/etc/ssl/cert.pem" else "/etc/ssl/certs/ca-certificates.crt"}" - "--with-ca-path=${cacert}/etc/ssl/certs" - ]; - - buildFlags = [ "${target}-build" ]; - checkTarget = "${target}-checkbuild"; - installTargets = [ "${target}-install" ]; - - doCheck = true; - - dontUseCmakeConfigure = true; - dontUseNinjaBuild = true; - dontUseNinjaInstall = true; - dontUseNinjaCheck = true; - - postUnpack = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} source/${name}") (lib.filterAttrs (n: v: v ? outPath) passthru.deps)); - - preConfigure = '' - export GOCACHE=$TMPDIR/go-cache - export GOPATH=$TMPDIR/go - export GOPROXY=file://${passthru.boringssl-go-modules} - export GOSUMDB=off - - # Need to get value of $out for this flag - configureFlagsArray+=("--with-libnssckbi=$out/lib") - ''; - - postInstall = '' - # Remove vestigial *-config script - rm $out/bin/curl-impersonate-${name}-config - - # Patch all shebangs of installed scripts - patchShebangs $out/bin - - # Install headers - make -C curl-*/include install - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - # Build and install completions for each curl binary - - # Patch in correct binary name and alias it to all scripts - perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-${name} --shell zsh >$TMPDIR/curl-impersonate-${name}.zsh - substituteInPlace $TMPDIR/curl-impersonate-${name}.zsh \ - --replace-fail \ - '#compdef curl' \ - "#compdef curl-impersonate-${name}$(find $out/bin -name 'curl_*' -printf ' %f=curl-impersonate-${name}')" - - perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-${name} --shell fish >$TMPDIR/curl-impersonate-${name}.fish - substituteInPlace $TMPDIR/curl-impersonate-${name}.fish \ - --replace-fail \ - '--command curl' \ - "--command curl-impersonate-${name}$(find $out/bin -name 'curl_*' -printf ' --command %f')" - - # Install zsh and fish completions - installShellCompletion $TMPDIR/curl-impersonate-${name}.{zsh,fish} - ''; - - preFixup = let - libext = stdenv.hostPlatform.extensions.sharedLibrary; - in '' - # If libnssckbi.so is needed, link libnssckbi.so without needing nss in closure - if grep -F nssckbi $out/lib/libcurl-impersonate-*${libext} &>/dev/null; then - ln -s ${p11-kit}/lib/pkcs11/p11-kit-trust${libext} $out/lib/libnssckbi${libext} - ${lib.optionalString stdenv.hostPlatform.isElf '' - patchelf --add-needed libnssckbi${libext} $out/lib/libcurl-impersonate-*${libext} - ''} - fi - ''; - - disallowedReferences = [ go ]; - - passthru = { - deps = callPackage ./deps.nix {}; - - boringssl-go-modules = (buildGoModule { - inherit (passthru.deps."boringssl.zip") name; - - src = passthru.deps."boringssl.zip"; - vendorHash = "sha256-SNUsBiKOGWmkRdTVABVrlbLAVMfu0Q9IgDe+kFC5vXs="; - - nativeBuildInputs = [ unzip ]; - - proxyVendor = true; - }).goModules; - }; - - meta = with lib; { - description = "Special build of curl that can impersonate Chrome & Firefox"; - homepage = "https://github.com/lwthiker/curl-impersonate"; - license = with licenses; [ curl mit ]; - maintainers = with maintainers; [ deliciouslytyped ]; - platforms = platforms.unix; - mainProgram = "curl-impersonate-${name}"; - }; - }; -in - symlinkJoin rec { pname = "curl-impersonate"; inherit (passthru.curl-impersonate-chrome) version meta; @@ -192,13 +15,11 @@ symlinkJoin rec { ]; passthru = { - curl-impersonate-ff = makeCurlImpersonate { name = "ff"; target = "firefox"; }; - curl-impersonate-chrome = makeCurlImpersonate { name = "chrome"; target = "chrome"; }; - - updateScript = ./update.sh; + curl-impersonate-ff = callPackage ./firefox {}; + curl-impersonate-chrome = callPackage ./chrome {}; inherit (passthru.curl-impersonate-chrome) src; - tests = { inherit (nixosTests) curl-impersonate; }; + tests = {inherit (nixosTests) curl-impersonate;}; }; } diff --git a/pkgs/tools/networking/curl-impersonate/deps.nix b/pkgs/tools/networking/curl-impersonate/deps.nix deleted file mode 100644 index 1b04659f07413..0000000000000 --- a/pkgs/tools/networking/curl-impersonate/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by update.sh -{ fetchurl }: - -{ - "curl-8.1.1.tar.xz" = fetchurl { - url = "https://curl.se/download/curl-8.1.1.tar.xz"; - hash = "sha256-CKlI4GGSlkVZfB73GU4HswiyIIT/A/p0ALRl5sBRSeU="; - }; - - "brotli-1.0.9.tar.gz" = fetchurl { - url = "https://github.com/google/brotli/archive/refs/tags/v1.0.9.tar.gz"; - hash = "sha256-+ejYHQQFumbRgVKa9CozVPg4yTkJX/mZMNpqqc32/kY="; - }; - - "nss-3.92.tar.gz" = fetchurl { - url = "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_92_RTM/src/nss-3.92-with-nspr-4.35.tar.gz"; - hash = "sha256-IcF2v/+27IQLX5hcf48BRoL0ovtVsGkkc0Fy1cBIbcU="; - }; - - "boringssl.zip" = fetchurl { - url = "https://github.com/google/boringssl/archive/1b7fdbd9101dedc3e0aa3fcf4ff74eacddb34ecc.zip"; - hash = "sha256-daVVQvpxkuEL/8/+QtLOJkdO+ECYZE3P4qJmDjV1GM0="; - }; - - "nghttp2-1.56.0.tar.bz2" = fetchurl { - url = "https://github.com/nghttp2/nghttp2/releases/download/v1.56.0/nghttp2-1.56.0.tar.bz2"; - hash = "sha256-L13Nv1d6LfUTokZGRUhMw10uTQczZT1jGTrlHbQd70E="; - }; -} diff --git a/pkgs/tools/networking/curl-impersonate/curl-impersonate-0.6.1-fix-command-paths.patch b/pkgs/tools/networking/curl-impersonate/firefox/curl-impersonate-0.6.1-fix-command-paths.patch similarity index 100% rename from pkgs/tools/networking/curl-impersonate/curl-impersonate-0.6.1-fix-command-paths.patch rename to pkgs/tools/networking/curl-impersonate/firefox/curl-impersonate-0.6.1-fix-command-paths.patch diff --git a/pkgs/tools/networking/curl-impersonate/firefox/default.nix b/pkgs/tools/networking/curl-impersonate/firefox/default.nix new file mode 100644 index 0000000000000..73b4458ec8db8 --- /dev/null +++ b/pkgs/tools/networking/curl-impersonate/firefox/default.nix @@ -0,0 +1,198 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + callPackage, + buildGoModule, + installShellFiles, + buildPackages, + zlib, + sqlite, + cmake, + python3, + ninja, + perl, + autoconf, + automake, + libtool, + cctools, + cacert, + unzip, + go, + p11-kit, +}: +stdenv.mkDerivation rec { + pname = "curl-impersonate-ff"; + version = "0.6.1"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "lwthiker"; + repo = "curl-impersonate"; + rev = "v${version}"; + hash = "sha256-ExmEhjJC8FPzx08RuKOhRxKgJ4Dh+ElEl+OUHzRCzZc="; + }; + + patches = [ + # Fix shebangs and commands in the NSS build scripts + # (can't just patchShebangs or substituteInPlace since makefile unpacks it) + ./curl-impersonate-0.6.1-fix-command-paths.patch + + # SOCKS5 heap buffer overflow - https://curl.se/docs/CVE-2023-38545.html + (fetchpatch { + name = "curl-impersonate-patch-cve-2023-38545.patch"; + url = "https://github.com/lwthiker/curl-impersonate/commit/e7b90a0d9c61b6954aca27d346750240e8b6644e.diff"; + hash = "sha256-jFrz4Q+MJGfNmwwzHhThado4c9hTd/+b/bfRsr3FW5k="; + }) + ]; + + # Disable blanket -Werror to fix build on `gcc-13` related to minor + # warnings on `boringssl`. + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + + strictDeps = true; + + depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + buildPackages.stdenv.cc + ]; + + nativeBuildInputs = + lib.optionals stdenv.hostPlatform.isDarwin [ + # Must come first so that it shadows the 'libtool' command but leaves 'libtoolize' + cctools + ] + ++ [ + installShellFiles + cmake + python3 + python3.pythonOnBuildForHost.pkgs.gyp + ninja + perl + autoconf + automake + libtool + unzip + go + ]; + + buildInputs = [ + zlib + sqlite + ]; + + configureFlags = [ + "--with-ca-bundle=${ + if stdenv.hostPlatform.isDarwin then "/etc/ssl/cert.pem" else "/etc/ssl/certs/ca-certificates.crt" + }" + "--with-ca-path=${cacert}/etc/ssl/certs" + ]; + + buildFlags = [ "firefox-build" ]; + checkTarget = "firefox-checkbuild"; + installTargets = [ "firefox-install" ]; + + doCheck = true; + + dontUseCmakeConfigure = true; + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + dontUseNinjaCheck = true; + + postUnpack = lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} source/${name}") ( + lib.filterAttrs (n: v: v ? outPath) passthru.deps + ) + ); + + preConfigure = '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH=$TMPDIR/go + export GOPROXY=file://${passthru.boringssl-go-modules} + export GOSUMDB=off + + # Need to get value of $out for this flag + configureFlagsArray+=("--with-libnssckbi=$out/lib") + ''; + + postInstall = + '' + # Remove vestigial *-config script + rm $out/bin/curl-impersonate-ff-config + + # Patch all shebangs of installed scripts + patchShebangs $out/bin + + # Install headers + make -C curl-*/include install + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # Build and install completions for each curl binary + + # Patch in correct binary name and alias it to all scripts + perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-ff --shell zsh >$TMPDIR/curl-impersonate-ff.zsh + substituteInPlace $TMPDIR/curl-impersonate-ff.zsh \ + --replace-fail \ + '#compdef curl' \ + "#compdef curl-impersonate-ff$(find $out/bin -name 'curl_*' -printf ' %f=curl-impersonate-ff')" + + perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-ff --shell fish >$TMPDIR/curl-impersonate-ff.fish + substituteInPlace $TMPDIR/curl-impersonate-ff.fish \ + --replace-fail \ + '--command curl' \ + "--command curl-impersonate-ff$(find $out/bin -name 'curl_*' -printf ' --command %f')" + + # Install zsh and fish completions + installShellCompletion $TMPDIR/curl-impersonate-ff.{zsh,fish} + ''; + + preFixup = + let + libext = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + # If libnssckbi.so is needed, link libnssckbi.so without needing nss in closure + if grep -F nssckbi $out/lib/libcurl-impersonate-*${libext} &>/dev/null; then + ln -s ${p11-kit}/lib/pkcs11/p11-kit-trust${libext} $out/lib/libnssckbi${libext} + ${lib.optionalString stdenv.hostPlatform.isElf '' + patchelf --add-needed libnssckbi${libext} $out/lib/libcurl-impersonate-*${libext} + ''} + fi + ''; + + disallowedReferences = [ go ]; + + passthru = { + deps = callPackage ./deps.nix { }; + + updateScript = ./update.sh; + + boringssl-go-modules = + (buildGoModule { + inherit (passthru.deps."boringssl.zip") name; + + src = passthru.deps."boringssl.zip"; + vendorHash = "sha256-SNUsBiKOGWmkRdTVABVrlbLAVMfu0Q9IgDe+kFC5vXs="; + + nativeBuildInputs = [ unzip ]; + + proxyVendor = true; + }).goModules; + }; + + meta = with lib; { + description = "Special build of curl that can impersonate Chrome & Firefox"; + homepage = "https://github.com/lwthiker/curl-impersonate"; + license = with licenses; [ + curl + mit + ]; + maintainers = with maintainers; [ deliciouslytyped ]; + platforms = platforms.unix; + mainProgram = "curl-impersonate-ff"; + }; +} diff --git a/pkgs/tools/networking/curl-impersonate/firefox/deps.nix b/pkgs/tools/networking/curl-impersonate/firefox/deps.nix new file mode 100644 index 0000000000000..b8a70b935302e --- /dev/null +++ b/pkgs/tools/networking/curl-impersonate/firefox/deps.nix @@ -0,0 +1,28 @@ +# Generated by update.sh +{ fetchurl }: +{ + "curl-8.1.1.tar.xz" = fetchurl { + url = "https://curl.se/download/curl-8.1.1.tar.xz"; + hash = "sha256-CKlI4GGSlkVZfB73GU4HswiyIIT/A/p0ALRl5sBRSeU="; + }; + + "brotli-1.0.9.tar.gz" = fetchurl { + url = "https://github.com/google/brotli/archive/refs/tags/v1.0.9.tar.gz"; + hash = "sha256-+ejYHQQFumbRgVKa9CozVPg4yTkJX/mZMNpqqc32/kY="; + }; + + "nss-3.92.tar.gz" = fetchurl { + url = "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_92_RTM/src/nss-3.92-with-nspr-4.35.tar.gz"; + hash = "sha256-IcF2v/+27IQLX5hcf48BRoL0ovtVsGkkc0Fy1cBIbcU="; + }; + + "boringssl.zip" = fetchurl { + url = "https://github.com/google/boringssl/archive/1b7fdbd9101dedc3e0aa3fcf4ff74eacddb34ecc.zip"; + hash = "sha256-daVVQvpxkuEL/8/+QtLOJkdO+ECYZE3P4qJmDjV1GM0="; + }; + + "nghttp2-1.56.0.tar.bz2" = fetchurl { + url = "https://github.com/nghttp2/nghttp2/releases/download/v1.56.0/nghttp2-1.56.0.tar.bz2"; + hash = "sha256-L13Nv1d6LfUTokZGRUhMw10uTQczZT1jGTrlHbQd70E="; + }; +} diff --git a/pkgs/tools/networking/curl-impersonate/firefox/update.sh b/pkgs/tools/networking/curl-impersonate/firefox/update.sh new file mode 100644 index 0000000000000..76dd6099d4175 --- /dev/null +++ b/pkgs/tools/networking/curl-impersonate/firefox/update.sh @@ -0,0 +1,92 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p git nix jq coreutils gnugrep gnused curl common-updater-scripts +# shellcheck shell=bash +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" + +stripwhitespace() { + sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' +} + +narhash() { + nix --extra-experimental-features nix-command store prefetch-file --json "$1" | jq -r .hash +} + +nixeval() { + nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r . +} + +vendorhash() { + (nix --extra-experimental-features nix-command build --no-link -f "$nixpkgs" --no-link "$1" 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true +} + +findpath() { + path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" + outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" + + if [ -n "$outpath" ]; then + path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" + fi + + echo "$path" +} + +getvar() { + echo "$2" | grep -F "$1" | sed -e 's/:=/:/g' | cut -d: -f2- | stripwhitespace +} + +attr="${UPDATE_NIX_ATTR_PATH:-curl-impersonate}" +version="$(curl -sSL "https://api.github.com/repos/lwthiker/curl-impersonate/releases/latest" | jq -r .tag_name | sed -e 's/^v//')" + +pkgpath="$(findpath "$attr")" + +updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)" + +if [ "$updated" -eq 0 ]; then + echo 'update.sh: Package version not updated, nothing to do.' + exit 0 +fi + +vars="$(curl -sSL "https://github.com/lwthiker/curl-impersonate/raw/v$version/Makefile.in" | grep '^ *[^ ]*_\(VERSION\|URL\|COMMIT\) *:=')" + +cat >"$(dirname "$pkgpath")"/deps.nix <<EOF +# Generated by update.sh +{ fetchurl }: + +{ + "$(getvar CURL_VERSION "$vars").tar.xz" = fetchurl { + url = "https://curl.se/download/$(getvar CURL_VERSION "$vars").tar.xz"; + hash = "$(narhash "https://curl.se/download/$(getvar CURL_VERSION "$vars").tar.xz")"; + }; + + "brotli-$(getvar BROTLI_VERSION "$vars").tar.gz" = fetchurl { + url = "https://github.com/google/brotli/archive/refs/tags/v$(getvar BROTLI_VERSION "$vars").tar.gz"; + hash = "$(narhash "https://github.com/google/brotli/archive/refs/tags/v$(getvar BROTLI_VERSION "$vars").tar.gz")"; + }; + + "$(getvar NSS_VERSION "$vars").tar.gz" = fetchurl { + url = "$(getvar NSS_URL "$vars")"; + hash = "$(narhash "$(getvar NSS_URL "$vars")")"; + }; + + "boringssl.zip" = fetchurl { + url = "https://github.com/google/boringssl/archive/$(getvar BORING_SSL_COMMIT "$vars").zip"; + hash = "$(narhash "https://github.com/google/boringssl/archive/$(getvar BORING_SSL_COMMIT "$vars").zip")"; + }; + + "$(getvar NGHTTP2_VERSION "$vars").tar.bz2" = fetchurl { + url = "$(getvar NGHTTP2_URL "$vars")"; + hash = "$(narhash "$(getvar NGHTTP2_URL "$vars")")"; + }; +} +EOF + +curhash="$(nixeval "$attr.curl-impersonate-chrome.boringssl-go-modules.outputHash")" +newhash="$(vendorhash "$attr.curl-impersonate-chrome.boringssl-go-modules")" + +if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then + sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" +else + echo 'update.sh: New vendorHash same as old vendorHash, nothing to do.' +fi diff --git a/pkgs/tools/networking/curl-impersonate/update.sh b/pkgs/tools/networking/curl-impersonate/update.sh deleted file mode 100755 index 3930c0768478a..0000000000000 --- a/pkgs/tools/networking/curl-impersonate/update.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p git nix jq coreutils gnugrep gnused curl common-updater-scripts -set -euo pipefail - -nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" - -stripwhitespace() { - sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -} - -narhash() { - nix --extra-experimental-features nix-command store prefetch-file --json "$1" | jq -r .hash -} - -nixeval() { - nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r . -} - -vendorhash() { - (nix --extra-experimental-features nix-command build --no-link -f "$nixpkgs" --no-link "$1" 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true -} - -findpath() { - path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" - outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" - - if [ -n "$outpath" ]; then - path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" - fi - - echo "$path" -} - -getvar() { - echo "$2" | grep -F "$1" | sed -e 's/:=/:/g' | cut -d: -f2- | stripwhitespace -} - -attr="${UPDATE_NIX_ATTR_PATH:-curl-impersonate}" -version="$(curl -sSL "https://api.github.com/repos/lwthiker/curl-impersonate/releases/latest" | jq -r .tag_name | sed -e 's/^v//')" - -pkgpath="$(findpath "$attr")" - -updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)" - -if [ "$updated" -eq 0 ]; then - echo 'update.sh: Package version not updated, nothing to do.' - exit 0 -fi - -vars="$(curl -sSL "https://github.com/lwthiker/curl-impersonate/raw/v$version/Makefile.in" | grep '^ *[^ ]*_\(VERSION\|URL\|COMMIT\) *:=')" - -cat >"$(dirname "$pkgpath")"/deps.nix <<EOF -# Generated by update.sh -{ fetchurl }: - -{ - "$(getvar CURL_VERSION "$vars").tar.xz" = fetchurl { - url = "https://curl.se/download/$(getvar CURL_VERSION "$vars").tar.xz"; - hash = "$(narhash "https://curl.se/download/$(getvar CURL_VERSION "$vars").tar.xz")"; - }; - - "brotli-$(getvar BROTLI_VERSION "$vars").tar.gz" = fetchurl { - url = "https://github.com/google/brotli/archive/refs/tags/v$(getvar BROTLI_VERSION "$vars").tar.gz"; - hash = "$(narhash "https://github.com/google/brotli/archive/refs/tags/v$(getvar BROTLI_VERSION "$vars").tar.gz")"; - }; - - "$(getvar NSS_VERSION "$vars").tar.gz" = fetchurl { - url = "$(getvar NSS_URL "$vars")"; - hash = "$(narhash "$(getvar NSS_URL "$vars")")"; - }; - - "boringssl.zip" = fetchurl { - url = "https://github.com/google/boringssl/archive/$(getvar BORING_SSL_COMMIT "$vars").zip"; - hash = "$(narhash "https://github.com/google/boringssl/archive/$(getvar BORING_SSL_COMMIT "$vars").zip")"; - }; - - "$(getvar NGHTTP2_VERSION "$vars").tar.bz2" = fetchurl { - url = "$(getvar NGHTTP2_URL "$vars")"; - hash = "$(narhash "$(getvar NGHTTP2_URL "$vars")")"; - }; -} -EOF - -curhash="$(nixeval "$attr.curl-impersonate-chrome.boringssl-go-modules.outputHash")" -newhash="$(vendorhash "$attr.curl-impersonate-chrome.boringssl-go-modules")" - -if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then - sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" -else - echo 'update.sh: New vendorHash same as old vendorHash, nothing to do.' -fi diff --git a/pkgs/tools/networking/curl/CVE-2024-8096.patch b/pkgs/tools/networking/curl/CVE-2024-8096.patch new file mode 100644 index 0000000000000..0f780f08c3263 --- /dev/null +++ b/pkgs/tools/networking/curl/CVE-2024-8096.patch @@ -0,0 +1,200 @@ +From aeb1a281cab13c7ba791cb104e556b20e713941f Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Tue, 20 Aug 2024 16:14:39 +0200 +Subject: [PATCH] gtls: fix OCSP stapling management + +Reported-by: Hiroki Kurosawa +Closes #14642 +--- + lib/vtls/gtls.c | 146 ++++++++++++++++++++++++------------------------ + 1 file changed, 73 insertions(+), 73 deletions(-) + +diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c +index 03d6fcc038aac3..c7589d9d39bc81 100644 +--- a/lib/vtls/gtls.c ++++ b/lib/vtls/gtls.c +@@ -850,6 +850,13 @@ static CURLcode gtls_client_init(struct Curl_cfilter *cf, + init_flags |= GNUTLS_NO_TICKETS; + #endif + ++#if defined(GNUTLS_NO_STATUS_REQUEST) ++ if(!config->verifystatus) ++ /* Disable the "status_request" TLS extension, enabled by default since ++ GnuTLS 3.8.0. */ ++ init_flags |= GNUTLS_NO_STATUS_REQUEST; ++#endif ++ + rc = gnutls_init(>ls->session, init_flags); + if(rc != GNUTLS_E_SUCCESS) { + failf(data, "gnutls_init() failed: %d", rc); +@@ -1321,104 +1328,97 @@ Curl_gtls_verifyserver(struct Curl_easy *data, + infof(data, " server certificate verification SKIPPED"); + + if(config->verifystatus) { +- if(gnutls_ocsp_status_request_is_checked(session, 0) == 0) { +- gnutls_datum_t status_request; +- gnutls_ocsp_resp_t ocsp_resp; ++ gnutls_datum_t status_request; ++ gnutls_ocsp_resp_t ocsp_resp; ++ gnutls_ocsp_cert_status_t status; ++ gnutls_x509_crl_reason_t reason; + +- gnutls_ocsp_cert_status_t status; +- gnutls_x509_crl_reason_t reason; ++ rc = gnutls_ocsp_status_request_get(session, &status_request); + +- rc = gnutls_ocsp_status_request_get(session, &status_request); ++ if(rc == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { ++ failf(data, "No OCSP response received"); ++ return CURLE_SSL_INVALIDCERTSTATUS; ++ } + +- infof(data, " server certificate status verification FAILED"); ++ if(rc < 0) { ++ failf(data, "Invalid OCSP response received"); ++ return CURLE_SSL_INVALIDCERTSTATUS; ++ } + +- if(rc == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { +- failf(data, "No OCSP response received"); +- return CURLE_SSL_INVALIDCERTSTATUS; +- } ++ gnutls_ocsp_resp_init(&ocsp_resp); + +- if(rc < 0) { +- failf(data, "Invalid OCSP response received"); +- return CURLE_SSL_INVALIDCERTSTATUS; +- } ++ rc = gnutls_ocsp_resp_import(ocsp_resp, &status_request); ++ if(rc < 0) { ++ failf(data, "Invalid OCSP response received"); ++ return CURLE_SSL_INVALIDCERTSTATUS; ++ } + +- gnutls_ocsp_resp_init(&ocsp_resp); ++ (void)gnutls_ocsp_resp_get_single(ocsp_resp, 0, NULL, NULL, NULL, NULL, ++ &status, NULL, NULL, NULL, &reason); + +- rc = gnutls_ocsp_resp_import(ocsp_resp, &status_request); +- if(rc < 0) { +- failf(data, "Invalid OCSP response received"); +- return CURLE_SSL_INVALIDCERTSTATUS; +- } ++ switch(status) { ++ case GNUTLS_OCSP_CERT_GOOD: ++ break; + +- (void)gnutls_ocsp_resp_get_single(ocsp_resp, 0, NULL, NULL, NULL, NULL, +- &status, NULL, NULL, NULL, &reason); ++ case GNUTLS_OCSP_CERT_REVOKED: { ++ const char *crl_reason; + +- switch(status) { +- case GNUTLS_OCSP_CERT_GOOD: ++ switch(reason) { ++ default: ++ case GNUTLS_X509_CRLREASON_UNSPECIFIED: ++ crl_reason = "unspecified reason"; + break; + +- case GNUTLS_OCSP_CERT_REVOKED: { +- const char *crl_reason; +- +- switch(reason) { +- default: +- case GNUTLS_X509_CRLREASON_UNSPECIFIED: +- crl_reason = "unspecified reason"; +- break; +- +- case GNUTLS_X509_CRLREASON_KEYCOMPROMISE: +- crl_reason = "private key compromised"; +- break; +- +- case GNUTLS_X509_CRLREASON_CACOMPROMISE: +- crl_reason = "CA compromised"; +- break; +- +- case GNUTLS_X509_CRLREASON_AFFILIATIONCHANGED: +- crl_reason = "affiliation has changed"; +- break; ++ case GNUTLS_X509_CRLREASON_KEYCOMPROMISE: ++ crl_reason = "private key compromised"; ++ break; + +- case GNUTLS_X509_CRLREASON_SUPERSEDED: +- crl_reason = "certificate superseded"; +- break; ++ case GNUTLS_X509_CRLREASON_CACOMPROMISE: ++ crl_reason = "CA compromised"; ++ break; + +- case GNUTLS_X509_CRLREASON_CESSATIONOFOPERATION: +- crl_reason = "operation has ceased"; +- break; ++ case GNUTLS_X509_CRLREASON_AFFILIATIONCHANGED: ++ crl_reason = "affiliation has changed"; ++ break; + +- case GNUTLS_X509_CRLREASON_CERTIFICATEHOLD: +- crl_reason = "certificate is on hold"; +- break; ++ case GNUTLS_X509_CRLREASON_SUPERSEDED: ++ crl_reason = "certificate superseded"; ++ break; + +- case GNUTLS_X509_CRLREASON_REMOVEFROMCRL: +- crl_reason = "will be removed from delta CRL"; +- break; ++ case GNUTLS_X509_CRLREASON_CESSATIONOFOPERATION: ++ crl_reason = "operation has ceased"; ++ break; + +- case GNUTLS_X509_CRLREASON_PRIVILEGEWITHDRAWN: +- crl_reason = "privilege withdrawn"; +- break; ++ case GNUTLS_X509_CRLREASON_CERTIFICATEHOLD: ++ crl_reason = "certificate is on hold"; ++ break; + +- case GNUTLS_X509_CRLREASON_AACOMPROMISE: +- crl_reason = "AA compromised"; +- break; +- } ++ case GNUTLS_X509_CRLREASON_REMOVEFROMCRL: ++ crl_reason = "will be removed from delta CRL"; ++ break; + +- failf(data, "Server certificate was revoked: %s", crl_reason); ++ case GNUTLS_X509_CRLREASON_PRIVILEGEWITHDRAWN: ++ crl_reason = "privilege withdrawn"; + break; +- } + +- default: +- case GNUTLS_OCSP_CERT_UNKNOWN: +- failf(data, "Server certificate status is unknown"); ++ case GNUTLS_X509_CRLREASON_AACOMPROMISE: ++ crl_reason = "AA compromised"; + break; + } + +- gnutls_ocsp_resp_deinit(ocsp_resp); ++ failf(data, "Server certificate was revoked: %s", crl_reason); ++ break; ++ } + +- return CURLE_SSL_INVALIDCERTSTATUS; ++ default: ++ case GNUTLS_OCSP_CERT_UNKNOWN: ++ failf(data, "Server certificate status is unknown"); ++ break; + } +- else +- infof(data, " server certificate status verification OK"); ++ ++ gnutls_ocsp_resp_deinit(ocsp_resp); ++ if(status != GNUTLS_OCSP_CERT_GOOD) ++ return CURLE_SSL_INVALIDCERTSTATUS; + } + else + infof(data, " server certificate status verification SKIPPED"); diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 9bc63abdd659d..567ddcbf7d02e 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -21,7 +21,7 @@ , opensslSupport ? zlibSupport, openssl , pslSupport ? false, libpsl , rtmpSupport ? false, rtmpdump -, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 +, scpSupport ? zlibSupport && !stdenv.hostPlatform.isSunOS && !stdenv.hostPlatform.isCygwin, libssh2 , wolfsslSupport ? false, wolfssl , rustlsSupport ? false, rustls-ffi , zlibSupport ? true, zlib @@ -63,6 +63,9 @@ stdenv.mkDerivation (finalAttrs: { # fixes https://github.com/curl/curl/issues/14344 # https://github.com/curl/curl/pull/14390 ./fix-sigpipe-leak.patch + ] ++ lib.optionals gnutlsSupport [ + # https://curl.se/docs/CVE-2024-8096.html + ./CVE-2024-8096.patch ]; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion @@ -73,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ''; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; enableParallelBuilding = true; @@ -102,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { lib.optional rustlsSupport rustls-ffi ++ lib.optional zlibSupport zlib ++ lib.optional zstdSupport zstd ++ - lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices SystemConfiguration @@ -120,6 +123,7 @@ stdenv.mkDerivation (finalAttrs: { ''; configureFlags = [ + "--enable-versioned-symbols" # Build without manual "--disable-manual" (lib.enableFeature c-aresSupport "ares") @@ -148,16 +152,16 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback to nss-cacert from the default profile. # Without this curl might detect /etc/ssl/cert.pem at build time on macOS, causing curl to ignore NIX_SSL_CERT_FILE. "--without-ca-bundle" "--without-ca-path" ] ++ lib.optionals (!gnutlsSupport && !opensslSupport && !wolfsslSupport && !rustlsSupport) [ "--without-ssl" - ] ++ lib.optionals (rustlsSupport && !stdenv.isDarwin) [ + ] ++ lib.optionals (rustlsSupport && !stdenv.hostPlatform.isDarwin) [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" - ] ++ lib.optionals (gnutlsSupport && !stdenv.isDarwin) [ + ] ++ lib.optionals (gnutlsSupport && !stdenv.hostPlatform.isDarwin) [ "--with-ca-path=/etc/ssl/certs" ]; @@ -170,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; preCheck = '' patchShebangs tests/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # bad interaction with sandbox if enabled? rm tests/data/test1453 rm tests/data/test1086 @@ -211,7 +215,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; } // lib.optionalAttrs (stdenv.hostPlatform.system != "x86_64-darwin") { static = pkgsStatic.curl; - } // lib.optionalAttrs (!stdenv.isDarwin) { + } // lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; }; }; }; diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index 330c02dea26b9..de31e4dff23e5 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -4,20 +4,21 @@ fetchFromGitHub, buildGoModule, nixosTests, + gitUpdater, }: buildGoModule rec { pname = "dae"; - version = "0.7.1"; + version = "0.7.4"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; rev = "v${version}"; - hash = "sha256-A82JwjZTzYvRc0PY2FekRUwLszdCEHv6wcLYHvqwiWU="; + hash = "sha256-bJ/a/SCNCutQDbmxPp36SYY7qhji2XRv6awp7buZVc0="; fetchSubmodules = true; }; - vendorHash = "sha256-PCGv1DcOOP2LE5wGmnuB2t3aJP8nqJ/ChafVxeJnRIg="; + vendorHash = "sha256-CVQTBJDwu7AYz6q0MnFPMINRShcnS1JOGqH+Ro4lIRo="; proxyVendor = true; @@ -51,6 +52,10 @@ buildGoModule rec { inherit (nixosTests) dae; }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "Linux high-performance transparent proxy solution based on eBPF"; homepage = "https://github.com/daeuniverse/dae"; @@ -58,6 +63,7 @@ buildGoModule rec { maintainers = with maintainers; [ oluceps pokon548 + luochen1990 ]; platforms = platforms.linux; mainProgram = "dae"; diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index d3ae2cd02c272..209b4e9d7a158 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { boost curl ] - ++ lib.optional stdenv.isDarwin Security - ++ lib.optional (!stdenv.isDarwin) libuuid + ++ lib.optional stdenv.hostPlatform.isDarwin Security + ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid ++ lib.optional (enableThirdPartyCopy) gsoap; # using the url below since the github release page states diff --git a/pkgs/tools/networking/dcap/default.nix b/pkgs/tools/networking/dcap/default.nix index 4045748fc4476..de3a484f5dee9 100644 --- a/pkgs/tools/networking/dcap/default.nix +++ b/pkgs/tools/networking/dcap/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "dCache access protocol client library"; homepage = "https://github.com/dCache/dcap"; changelog = "https://github.com/dCache/dcap/blob/master/ChangeLog"; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 0b1d157af5d31..e9c89657f803e 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,7 +1,7 @@ { lib , stdenv , cmake -, buildGo121Module +, buildGoModule , makeWrapper , fetchFromGitHub , pythonPackages @@ -37,7 +37,7 @@ let cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"]; }; -in buildGo121Module rec { +in buildGoModule rec { pname = "datadog-agent"; inherit src version; @@ -120,6 +120,6 @@ in buildGo121Module rec { license = licenses.bsd3; maintainers = with maintainers; [ thoughtpolice domenkozar ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 6221034dc2857..d07cc72bed7e4 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev - ] ++ lib.optionals stdenv.isFreeBSD [ + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ freebsd.libcapsicum freebsd.libcasper ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ]; # Check that the udev plugin got built. - postInstall = lib.optionalString (udev != null && stdenv.isLinux) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; + postInstall = lib.optionalString (udev != null && stdenv.hostPlatform.isLinux) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; passthru = { inherit enablePrivSep; diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix deleted file mode 100644 index d632934b0db09..0000000000000 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libsodium, libevent, nixosTests }: - -stdenv.mkDerivation rec { - pname = "dnscrypt-wrapper"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "Cofyc"; - repo = "dnscrypt-wrapper"; - rev = "v${version}"; - sha256 = "055vxpcfg80b1456p6p0p236pwykknph9x3c9psg8ya3i8qqywkl"; - }; - - enableParallelBuilding = true; - - # causes `dnscrypt-wrapper --gen-provider-keypair` to crash - hardeningDisable = [ "fortify3" ]; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ libsodium libevent ]; - - passthru.tests = { - inherit (nixosTests) dnscrypt-wrapper; - }; - - meta = with lib; { - description = "Tool for adding dnscrypt support to any name resolver"; - homepage = "https://dnscrypt.info/"; - license = licenses.isc; - maintainers = with maintainers; [ joachifm ]; - platforms = platforms.linux; - mainProgram = "dnscrypt-wrapper"; - }; -} diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 5c6d90b00a980..99744769fff66 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, nettle , libidn, libnetfilter_conntrack, nftables, buildPackages -, dbusSupport ? stdenv.isLinux +, dbusSupport ? stdenv.hostPlatform.isLinux , dbus , nixosTests }: @@ -11,7 +11,7 @@ let "-DHAVE_DNSSEC" ] ++ lib.optionals dbusSupport [ "-DHAVE_DBUS" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_CONNTRACK" "-DHAVE_NFTSET" ]); @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - postBuild = lib.optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.hostPlatform.isLinux '' make -C contrib/lease-tools ''; @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { # module can create it in Nix-land? postInstall = '' install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install -Dm644 contrib/MacOSX-launchd/uk.org.thekelleys.dnsmasq.plist \ $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist substituteInPlace $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist \ --replace "/usr/local/sbin" "$out/bin" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm755 contrib/lease-tools/dhcp_lease_time $out/bin/dhcp_lease_time install -Dm755 contrib/lease-tools/dhcp_release $out/bin/dhcp_release install -Dm755 contrib/lease-tools/dhcp_release6 $out/bin/dhcp_release6 @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle libidn ] ++ lib.optionals dbusSupport [ dbus ] - ++ lib.optionals stdenv.isLinux [ libnetfilter_conntrack nftables ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libnetfilter_conntrack nftables ]; passthru.tests = { prometheus-exporter = nixosTests.prometheus-exporters.dnsmasq; diff --git a/pkgs/tools/networking/dnsmonster/default.nix b/pkgs/tools/networking/dnsmonster/default.nix index e4a5d097f04ad..0b32a8c90869c 100644 --- a/pkgs/tools/networking/dnsmonster/default.nix +++ b/pkgs/tools/networking/dnsmonster/default.nix @@ -34,7 +34,7 @@ buildGoModule rec { changelog = "https://github.com/mosajjal/dnsmonster/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "dnsmonster"; }; } diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 1a6da91d0eb11..d4c94330590da 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.72.3"; + version = "0.73.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-UJ97/oMkP01eojNfiim0ttszigyOReHEHEcMh/JvU7M="; + hash = "sha256-Xxi23Cwm389fsDcYa3qJ9GhDZVXwh/LiWPfiYMuG5Js="; }; - vendorHash = "sha256-zVmoIC7LZfElEgvSq7CkOi1wOCA8ot+8JfW5wTCKwc8="; + vendorHash = "sha256-tyEp0vY8hWE8jTvkxKuqQJcgeey+c50pxREpmlZWE24="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 30017b2b76203..8d1134cff46fb 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { install -Dm755 -t $man/share/man/man8 dnstracer.8 ''; - buildInputs = [] ++ lib.optionals stdenv.isDarwin [ libresolv ]; + buildInputs = [] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libresolv ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lresolv"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lresolv"; meta = with lib; { description = "Determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data"; diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index e368e10715e62..397e87f23a10e 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -28,9 +28,9 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ installShellFiles just pandoc ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 005d24ac323ff..3afaff496ad90 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-96eUCg0mzgUFLOKxpwRfzj1jH2Z+aDohBTztvRVWln0="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; OPENSSL_DIR="${lib.getDev openssl}"; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index d2639bdf53521..9705315f8dd06 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "easyrsa"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - hash = "sha256-hjebDE7Ts93vtoOTquFbfTWdInhI7HXc4pRxIsvNLtg="; + hash = "sha256-/c2Redb6whfM2D8hHBrcSaQ3YsBESLjeoKFb5a2lFbQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/edgedb/Cargo.lock b/pkgs/tools/networking/edgedb/Cargo.lock index 8c565f21d45b7..16d6440458918 100644 --- a/pkgs/tools/networking/edgedb/Cargo.lock +++ b/pkgs/tools/networking/edgedb/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "adler32" version = "1.2.0" @@ -36,28 +42,13 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "ansi-escapes" version = "0.1.1" @@ -66,47 +57,48 @@ checksum = "7e3c0daaaae24df5995734b689627f8fa02101bc5bbc768be3055b66a010d7af" [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -114,44 +106,45 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "append-only-vec" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb8f874ecf419dd8165d0279746de966cb8966636d028845e3bd65d519812a" +checksum = "74d9f7083455f1a474276ccd32374958d2cb591024aac45101c7623b10271347" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "assert_cmd" -version = "2.0.13" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467" +checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d" dependencies = [ "anstyle", "bstr", "doc-comment", - "predicates 3.1.0", + "libc", + "predicates 3.1.2", "predicates-core", "predicates-tree", "wait-timeout", @@ -170,28 +163,26 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.0.0", - "event-listener-strategy 0.5.0", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.2.0", + "fastrand 2.1.1", + "futures-lite 2.3.0", "slab", ] @@ -201,12 +192,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.2.0", + "async-channel 2.3.1", "async-executor", - "async-io 2.3.1", - "async-lock 3.3.0", + "async-io 2.3.4", + "async-lock 3.4.0", "blocking", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "once_cell", ] @@ -232,21 +223,21 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.1" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ - "async-lock 3.3.0", + "async-lock 3.4.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "parking", - "polling 3.4.0", - "rustix 0.38.31", + "polling 3.7.3", + "rustix 0.38.35", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -269,12 +260,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] @@ -306,19 +297,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", ] [[package]] @@ -340,21 +331,21 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -371,6 +362,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" +[[package]] +name = "base32" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "022dfe9eb35f19ebbcb51e0b40a5ab759f46ad60cadf7297e0bd085afb50e076" + [[package]] name = "base64" version = "0.21.7" @@ -389,22 +386,15 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "basic-toml" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2db21524cad41c5591204d22d75e1970a2d1f71060214ca931dc7d5afe2c14e5" -dependencies = [ - "serde", -] - [[package]] name = "bigdecimal" -version = "0.3.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" +checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" dependencies = [ - "num-bigint 0.4.4", + "autocfg", + "libm", + "num-bigint", "num-integer", "num-traits", "serde", @@ -418,9 +408,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -442,20 +432,20 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] @@ -469,25 +459,22 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel 2.2.0", - "async-lock 3.3.0", + "async-channel 2.3.1", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] name = "bstr" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "regex-automata", @@ -496,9 +483,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -508,9 +495,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "bzip2" @@ -535,12 +522,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -555,16 +543,19 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ - "android-tzdata", - "iana-time-zone", "num-traits", - "windows-targets 0.52.0", ] [[package]] @@ -591,9 +582,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.0" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -601,14 +592,14 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.0" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", - "clap_lex 0.7.0", - "strsim 0.11.0", + "clap_lex 0.7.2", + "strsim 0.11.1", "terminal_size 0.3.0", ] @@ -623,23 +614,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.0" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "299353be8209bd133b049bf1c63582d184a8b39fd9c04f15fe65f50f88bdfe6c" +checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" dependencies = [ - "clap 4.5.0", + "clap 4.5.16", ] [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", ] [[package]] @@ -663,9 +654,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clicolors-control" @@ -691,30 +682,30 @@ dependencies = [ [[package]] name = "color-print" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a858372ff14bab9b1b30ea504f2a4bc534582aee3e42ba2d41d2a7baba63d5d" +checksum = "1ee543c60ff3888934877a5671f45494dd27ed4ba25c6670b9a7576b7ed7a8c0" dependencies = [ "color-print-proc-macro", ] [[package]] name = "color-print-proc-macro" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e37866456a721d0a404439a1adae37a31be4e0055590d053dfe6981e05003f" +checksum = "77ff1a80c5f3cb1ca7c06ffdd71b6a6dd6d8f896c42141fbd43f50ed28dcdb93" dependencies = [ "nom", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.76", ] [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "colorful" @@ -724,9 +715,9 @@ checksum = "97af0562545a7d7f3d9222fcf909963bec36dcb502afaacab98c6ffac8da47ce" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -750,9 +741,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -778,9 +769,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "coolor" @@ -803,15 +794,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -824,9 +815,9 @@ checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff" [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -846,9 +837,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -883,9 +874,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" @@ -896,8 +887,8 @@ dependencies = [ "bitflags 1.3.2", "crossterm_winapi", "libc", - "mio", - "parking_lot 0.12.1", + "mio 0.8.11", + "parking_lot 0.12.3", "signal-hook", "signal-hook-mio", "winapi", @@ -924,12 +915,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.2" +version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.27.1", - "windows-sys 0.52.0", + "nix 0.29.0", + "windows-sys 0.59.0", ] [[package]] @@ -1028,9 +1019,9 @@ dependencies = [ [[package]] name = "dissimilar" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" +checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d" [[package]] name = "doc-comment" @@ -1040,13 +1031,13 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "edgedb-cli" -version = "5.2.3" +version = "5.3.0" dependencies = [ "ansi-escapes", "anyhow", @@ -1054,7 +1045,7 @@ dependencies = [ "assert_cmd", "async-listen", "backtrace", - "base32", + "base32 0.4.0", "base64 0.21.7", "bigdecimal", "bitflags 1.3.2", @@ -1063,8 +1054,8 @@ dependencies = [ "blake3", "bytes", "chrono", - "clap 4.5.0", - "clap_complete 4.5.0", + "clap 4.5.16", + "clap_complete 4.5.24", "clicolors-control", "codespan-reporting", "color-print", @@ -1104,7 +1095,7 @@ dependencies = [ "nix 0.26.4", "nom", "notify", - "num-bigint 0.4.4", + "num-bigint", "once_cell", "open", "openssl", @@ -1122,7 +1113,7 @@ dependencies = [ "rexpect", "ring", "rpassword", - "rustls 0.22.2", + "rustls 0.23.12", "rustyline", "scram", "semver", @@ -1150,7 +1141,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "toml", + "toml 0.5.11", "tracing", "unicode-segmentation", "unicode-width", @@ -1162,7 +1153,7 @@ dependencies = [ "which", "whoami", "winapi", - "winreg 0.10.1", + "winreg", "wslapi", "zip", "zstd 0.12.4", @@ -1172,9 +1163,9 @@ dependencies = [ name = "edgedb-cli-derive" version = "0.4.0" dependencies = [ - "clap 4.5.0", + "clap 4.5.16", "clap_generate", - "heck", + "heck 0.4.1", "indexmap 2.0.0-pre", "proc-macro-error", "proc-macro2", @@ -1186,49 +1177,49 @@ dependencies = [ [[package]] name = "edgedb-derive" -version = "0.5.1" -source = "git+https://github.com/edgedb/edgedb-rust/#783438e6322acc6a4960e61ad2f46b0c8c9517cd" +version = "0.5.2" +source = "git+https://github.com/edgedb/edgedb-rust/#9025de8e629584d91aa91135ab7d81712aa66534" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", "trybuild", ] [[package]] name = "edgedb-errors" -version = "0.4.1" -source = "git+https://github.com/edgedb/edgedb-rust/#783438e6322acc6a4960e61ad2f46b0c8c9517cd" +version = "0.4.2" +source = "git+https://github.com/edgedb/edgedb-rust/#9025de8e629584d91aa91135ab7d81712aa66534" dependencies = [ "bytes", ] [[package]] name = "edgedb-protocol" -version = "0.6.0" -source = "git+https://github.com/edgedb/edgedb-rust/#783438e6322acc6a4960e61ad2f46b0c8c9517cd" +version = "0.6.1" +source = "git+https://github.com/edgedb/edgedb-rust/#9025de8e629584d91aa91135ab7d81712aa66534" dependencies = [ "bigdecimal", - "bitflags 2.4.2", + "bitflags 2.6.0", "bytes", "chrono", "edgedb-errors", - "num-bigint 0.4.4", + "num-bigint", "num-traits", - "snafu 0.8.2", + "snafu 0.8.4", "uuid", ] [[package]] name = "edgedb-tokio" -version = "0.5.0" -source = "git+https://github.com/edgedb/edgedb-rust/#783438e6322acc6a4960e61ad2f46b0c8c9517cd" +version = "0.5.1" +source = "git+https://github.com/edgedb/edgedb-rust/#9025de8e629584d91aa91135ab7d81712aa66534" dependencies = [ "anyhow", "arc-swap", "async-trait", "base16ct", - "base64 0.21.7", + "base64 0.22.1", "bytes", "crc16", "dirs 5.0.1", @@ -1238,17 +1229,18 @@ dependencies = [ "log", "once_cell", "rand", - "rustls 0.22.2", + "rustls 0.23.12", "rustls-native-certs", "rustls-pemfile", "rustls-webpki", - "scram", + "scram-2", "serde", "serde_json", "sha1", - "tls-api", - "tls-api-not-tls", - "tls-api-rustls", + "socket2 0.5.7", + "tls-api-2", + "tls-api-not-tls-2", + "tls-api-rustls-2", "tokio", "tokio-stream", "url", @@ -1258,28 +1250,28 @@ dependencies = [ [[package]] name = "edgeql-parser" version = "0.1.0" -source = "git+https://github.com/edgedb/edgedb#b53f17c1b16577a1f08fd5afa5be1333e9cf719a" +source = "git+https://github.com/edgedb/edgedb#9d6f484ea8a14a7d1f10c7a334c765fa34924337" dependencies = [ "append-only-vec", - "base32", + "base32 0.5.1", "bigdecimal", "bumpalo", - "indexmap 1.9.3", + "indexmap 2.5.0", "memchr", - "num-bigint 0.3.3", + "num-bigint", "phf", "serde_json", "sha2", - "snafu 0.7.5", + "snafu 0.8.4", "thiserror", "unicode-width", ] [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -1295,9 +1287,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1310,9 +1302,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -1333,9 +1325,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -1352,9 +1344,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1368,20 +1360,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.0.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72557800024fabbaa2449dd4bf24e37b93702d457a4d4f2b0dd1f0f039f20c1" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1390,21 +1371,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.0.0", + "event-listener 5.3.1", "pin-project-lite", ] @@ -1419,9 +1390,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fd-lock" @@ -1440,30 +1411,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix 0.38.31", + "rustix 0.38.35", "windows-sys 0.48.0", ] [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1483,7 +1454,7 @@ checksum = "2cd66269887534af4b0c3e3337404591daa8dc8b9b2b3db71f9523beb4bafb41" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", ] [[package]] @@ -1611,11 +1582,11 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -1630,7 +1601,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", ] [[package]] @@ -1685,9 +1656,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1698,9 +1669,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1722,17 +1693,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.11", - "indexmap 2.2.3", + "http 0.2.12", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -1741,9 +1712,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -1751,7 +1722,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.2.3", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -1772,9 +1743,9 @@ checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "headers" @@ -1785,7 +1756,7 @@ dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http 0.2.11", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -1797,7 +1768,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http 0.2.11", + "http 0.2.12", ] [[package]] @@ -1806,6 +1777,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1817,9 +1794,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -1850,9 +1833,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1877,7 +1860,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] @@ -1906,9 +1889,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1934,22 +1917,22 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2 0.3.24", - "http 0.2.11", + "h2 0.3.26", + "http 0.2.12", "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -1965,7 +1948,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -1986,7 +1969,7 @@ dependencies = [ "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.7", + "rustls 0.23.12", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -2011,9 +1994,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -2022,36 +2005,13 @@ dependencies = [ "http-body 1.0.1", "hyper 1.4.1", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tower", "tower-service", "tracing", ] -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - [[package]] name = "idna" version = "0.5.0" @@ -2094,12 +2054,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -2146,9 +2106,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", "js-sys", @@ -2162,7 +2122,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.6", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -2175,15 +2135,21 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.3.6", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.10.5" @@ -2195,24 +2161,24 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2248,15 +2214,15 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libflate" @@ -2278,15 +2244,21 @@ dependencies = [ "rle-decode-fast", ] +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", ] [[package]] @@ -2297,15 +2269,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2313,18 +2285,18 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "value-bag", ] [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -2343,9 +2315,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -2374,18 +2346,27 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -2393,13 +2374,24 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -2439,7 +2431,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "libc", ] @@ -2450,9 +2442,21 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.1.1", + "libc", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.2.1", "libc", ] @@ -2485,34 +2489,22 @@ dependencies = [ "inotify", "kqueue", "libc", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.45.0", ] [[package]] name = "num-bigint" -version = "0.3.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", "serde", ] -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-conv" version = "0.1.0" @@ -2530,23 +2522,13 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.6", - "libc", -] - [[package]] name = "number_prefix" version = "0.4.0" @@ -2555,9 +2537,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.2" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -2580,11 +2562,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.63" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -2601,7 +2583,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", ] [[package]] @@ -2612,18 +2594,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -2693,12 +2675,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -2717,15 +2699,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -2759,11 +2741,11 @@ dependencies = [ [[package]] name = "pem" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "serde", ] @@ -2803,7 +2785,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", ] [[package]] @@ -2817,29 +2799,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2849,12 +2831,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.1.1", "futures-io", ] @@ -2882,23 +2864,24 @@ dependencies = [ [[package]] name = "polling" -version = "3.4.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.31", + "rustix 0.38.35", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "powerfmt" @@ -2908,9 +2891,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "predicates" @@ -2928,9 +2914,9 @@ dependencies = [ [[package]] name = "predicates" -version = "3.1.0" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" dependencies = [ "anstyle", "difflib", @@ -2939,15 +2925,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" [[package]] name = "predicates-tree" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" dependencies = [ "predicates-core", "termtree", @@ -3008,18 +2994,18 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3088,11 +3074,20 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -3101,9 +3096,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -3113,9 +3108,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -3124,9 +3119,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "renamore" @@ -3140,16 +3135,16 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "base64 0.22.1", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "http-body-util", @@ -3178,14 +3173,14 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.52.0", + "windows-registry", ] [[package]] name = "reqwest-middleware" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39346a33ddfe6be00cbc17a34ce996818b97b230b87229f10114693becca1268" +checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04" dependencies = [ "anyhow", "async-trait", @@ -3198,13 +3193,12 @@ dependencies = [ [[package]] name = "reqwest-retry" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2a94ba69ceb30c42079a137e2793d6d0f62e581a24c06cd4e9bb32e973c7da" +checksum = "a83df1aaec00176d0fabb65dea13f832d2a446ca99107afc17c5d2d4981221d0" dependencies = [ "anyhow", "async-trait", - "chrono", "futures", "getrandom", "http 1.1.0", @@ -3241,16 +3235,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", - "untrusted 0.9.0", - "windows-sys 0.48.0", + "untrusted", + "windows-sys 0.52.0", ] [[package]] @@ -3273,9 +3268,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" @@ -3293,22 +3288,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", @@ -3320,11 +3315,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.7" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebbbdb961df0ad3f2652da8f3fdc4b36122f568f968f45ad3316f26c025c677b" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "once_cell", + "ring", "rustls-pki-types", "rustls-webpki", "subtle", @@ -3333,9 +3329,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3346,36 +3342,36 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.0" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.3.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048a63e5b3ac996d78d402940b5fa47973d2d080c6c6fffa1d0f19c4445310b7" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustyline" @@ -3401,9 +3397,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3445,13 +3441,24 @@ dependencies = [ "ring", ] +[[package]] +name = "scram-2" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d746fe0e755a1825a7ae6504e40de96f6b5001b45e32b05441fc1cfbf5ff7359" +dependencies = [ + "base64 0.22.1", + "rand", + "ring", +] + [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3460,9 +3467,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3470,41 +3477,42 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.198" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ - "indexmap 2.2.3", + "indexmap 2.5.0", "itoa", + "memchr", "ryu", "serde", ] @@ -3520,14 +3528,23 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ "itoa", "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + [[package]] name = "serde_str" version = "1.0.0" @@ -3590,6 +3607,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "shutdown_hooks" version = "0.1.0" @@ -3608,20 +3631,20 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio", + "mio 0.8.11", "signal-hook", ] [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3643,9 +3666,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smawk" @@ -3666,11 +3689,11 @@ dependencies = [ [[package]] name = "snafu" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" +checksum = "2b835cb902660db3415a672d862905e791e54d306c6e8189168c7f3d9ae1c79d" dependencies = [ - "snafu-derive 0.8.2", + "snafu-derive 0.8.4", ] [[package]] @@ -3679,7 +3702,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -3687,14 +3710,14 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b19911debfb8c2fb1107bc6cb2d61868aaf53a988449213959bb1b5b1ed95f" +checksum = "38d1e02fca405f6280643174a50c942219f0bbf4dbf7d480f1dd864d6f211ae5" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", ] [[package]] @@ -3709,12 +3732,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3731,15 +3754,15 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -3754,9 +3777,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -3768,23 +3791,26 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -3798,9 +3824,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -3809,14 +3835,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "rustix 0.38.31", - "windows-sys 0.52.0", + "fastrand 2.1.1", + "once_cell", + "rustix 0.38.35", + "windows-sys 0.59.0", ] [[package]] @@ -3869,7 +3896,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.31", + "rustix 0.38.35", "windows-sys 0.48.0", ] @@ -3902,9 +3929,10 @@ dependencies = [ ] [[package]] -name = "test-cert-gen" -version = "0.10.0-pre" -source = "git+https://github.com/elprans/rust-tls-api.git?branch=rustls-22#b73652c53e1cbdc676f4f1cd3645cab00be514e5" +name = "test-cert-gen-2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "141c41673c7512c91e84722827642573498846aaa3c0709b870582535299ac5b" dependencies = [ "once_cell", "pem", @@ -3928,9 +3956,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", "terminal_size 0.2.6", @@ -3940,29 +3968,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", ] [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "num-conv", @@ -3979,9 +4007,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -3993,9 +4021,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "tls-api" -version = "0.10.0-pre" -source = "git+https://github.com/elprans/rust-tls-api.git?branch=rustls-22#b73652c53e1cbdc676f4f1cd3645cab00be514e5" +name = "tls-api-2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "294abb022a256babb2c95ba2f71f39d0a1491e1f72ea5229deb573842ca2abc7" dependencies = [ "anyhow", "pem", @@ -4005,75 +4034,76 @@ dependencies = [ ] [[package]] -name = "tls-api-not-tls" -version = "0.10.0-pre" -source = "git+https://github.com/elprans/rust-tls-api.git?branch=rustls-22#b73652c53e1cbdc676f4f1cd3645cab00be514e5" +name = "tls-api-not-tls-2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5022679634f4df74a0eebca9f17b851d08a74d5e7183f3522770dd1416af707" dependencies = [ "anyhow", "thiserror", - "tls-api", - "tls-api-test", + "tls-api-2", + "tls-api-test-2", "tokio", ] [[package]] -name = "tls-api-rustls" -version = "0.10.0-pre" -source = "git+https://github.com/elprans/rust-tls-api.git?branch=rustls-22#b73652c53e1cbdc676f4f1cd3645cab00be514e5" +name = "tls-api-rustls-2" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acb91e1438413f83f63652934fb5413a6c2132db4a9e14bdca6fa8d2dda8f1b3" dependencies = [ "anyhow", - "rustls 0.22.2", - "rustls-webpki", + "rustls 0.23.12", "thiserror", - "tls-api", - "tls-api-test", + "tls-api-2", + "tls-api-test-2", "tokio", + "webpki", "webpki-roots", ] [[package]] -name = "tls-api-test" -version = "0.10.0-pre" -source = "git+https://github.com/elprans/rust-tls-api.git?branch=rustls-22#b73652c53e1cbdc676f4f1cd3645cab00be514e5" +name = "tls-api-test-2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58d491693b54014df34a52e25519be0f38cd97fe9fc8f2a6c541becab45f808b" dependencies = [ "anyhow", - "env_logger 0.11.3", + "env_logger 0.11.5", "log", "pem", - "rustls-webpki", - "test-cert-gen", - "tls-api", + "test-cert-gen-2", + "tls-api-2", "tokio", - "untrusted 0.6.2", + "webpki", ] [[package]] name = "tokio" -version = "1.36.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.7", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", ] [[package]] @@ -4092,7 +4122,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] @@ -4103,16 +4133,16 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.7", + "rustls 0.23.12", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -4121,16 +4151,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4142,6 +4171,40 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap 2.5.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" @@ -4159,15 +4222,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4189,7 +4252,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", ] [[package]] @@ -4209,17 +4272,16 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trybuild" -version = "1.0.89" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9d3ba662913483d6722303f619e75ea10b7855b0f8e0d72799cf8621bb488f" +checksum = "207aa50d36c4be8d8c6ea829478be44a372c6a77669937bb39c698e52f1491e8" dependencies = [ - "basic-toml", "glob", - "once_cell", "serde", "serde_derive", "serde_json", "termcolor", + "toml 0.8.19", ] [[package]] @@ -4257,9 +4319,9 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -4272,15 +4334,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "untrusted" -version = "0.6.2" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "untrusted" @@ -4290,9 +4346,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4308,15 +4364,15 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "rand", @@ -4325,9 +4381,9 @@ dependencies = [ [[package]] name = "value-bag" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126e423afe2dd9ac52142e7e9d5ce4135d7e13776c529d27fd6bc49f19e3280b" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "vcpkg" @@ -4337,9 +4393,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wait-timeout" @@ -4352,15 +4408,15 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4384,8 +4440,8 @@ dependencies = [ "futures-channel", "futures-util", "headers", - "http 0.2.11", - "hyper 0.14.28", + "http 0.2.12", + "hyper 0.14.30", "log", "mime", "mime_guess", @@ -4409,36 +4465,43 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4448,9 +4511,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4458,22 +4521,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-timer" @@ -4514,19 +4577,29 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -4540,16 +4613,17 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.31", + "rustix 0.38.35", ] [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.4.1", + "wasite", "web-sys", ] @@ -4571,11 +4645,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -4585,12 +4659,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-core" -version = "0.52.0" +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-targets 0.52.0", + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -4632,7 +4727,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4667,17 +4771,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4694,9 +4799,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4712,9 +4817,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4730,9 +4835,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4748,9 +4859,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4766,9 +4877,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4784,9 +4895,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4802,27 +4913,26 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "winreg" -version = "0.10.1" +name = "winnow" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ - "winapi", + "memchr", ] [[package]] name = "winreg" -version = "0.52.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "winapi", ] [[package]] @@ -4852,8 +4962,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.13", - "rustix 0.38.31", + "linux-raw-sys 0.4.14", + "rustix 0.38.35", ] [[package]] @@ -4862,11 +4972,32 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zip" @@ -4928,9 +5059,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/tools/networking/edgedb/default.nix index af6e3d68f03f3..2308a1266b269 100644 --- a/pkgs/tools/networking/edgedb/default.nix +++ b/pkgs/tools/networking/edgedb/default.nix @@ -7,11 +7,11 @@ makeBinaryWrapper, pkg-config, curl, + openssl, Security, CoreServices, libiconv, xz, - perl, substituteAll, # for passthru.tests: edgedb, @@ -19,27 +19,26 @@ }: rustPlatform.buildRustPackage rec { pname = "edgedb"; - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; - rev = "v${version}"; - hash = "sha256-WlXX1ACSZZNV0VBCoZjC1wLDF0qjIdjNJ4rQu6fBGfM="; + rev = "refs/tags/v${version}"; + hash = "sha256-oG3KxORNppQDa84CXjSxM9Z9GDLby+irUbEncyjoJU4="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "edgedb-derive-0.5.1" = "sha256-ATldvarkp/W5bz55qoMtfTMcueWklyKnrJUHvLKlWh0="; - "edgeql-parser-0.1.0" = "sha256-KPi2M2UEN+p3V/fcmKtb3K9XTLC4vJ5H+yG8ZfD7RBs="; + "edgedb-derive-0.5.2" = "sha256-9vmaMOoZ5VmbJ0/eN0XdE5hrID/BK4IkLnIwucgRr2w="; + "edgeql-parser-0.1.0" = "sha256-WUNiUgfuzbr+zNYgJivalUK5kPSvkVcgp4Zq3pmoa/w="; "indexmap-2.0.0-pre" = "sha256-QMOmoUHE1F/sp+NeDpgRGqqacWLHWG02YgZc5vAdXZY="; - "rexpect-0.5.0" = "sha256-vstAL/fJWWx7WbmRxNItKpzvgGF3SvJDs5isq9ym/OA="; "rustyline-8.0.0" = "sha256-CrICwQbHPzS4QdVIEHxt2euX+g+0pFYe84NfMp1daEc="; + "rexpect-0.5.0" = "sha256-vstAL/fJWWx7WbmRxNItKpzvgGF3SvJDs5isq9ym/OA="; "serde_str-1.0.0" = "sha256-CMBh5lxdQb2085y0jc/DrV6B8iiXvVO2aoZH/lFFjak="; "scram-0.7.0" = "sha256-QTPxyXBpMXCDkRRJEMYly1GKp90khrwwuMI1eHc2H+Y="; - "test-cert-gen-0.10.0-pre" = "sha256-Hyk4/iw6/SgEI70vPCNNbE9+nQ0pOAM158hncyUbvp8="; "test-utils-0.1.0" = "sha256-FoF/U89Q9E2Dlmpoh+cfDcScmhcsSNut+rE7BECJSJI="; "warp-0.3.6" = "sha256-knDt2aw/PJ0iabhKg+okwwnEzCY+vQVhE7HKCTM6QbE="; }; @@ -48,12 +47,16 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeBinaryWrapper pkg-config - perl ]; buildInputs = - [ curl ] - ++ lib.optionals stdenv.isDarwin [ + [ + curl + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security libiconv @@ -70,6 +73,10 @@ rustPlatform.buildRustPackage rec { }) ]; + env = { + OPENSSL_NO_VENDOR = true; + }; + doCheck = false; passthru.tests.version = testers.testVersion { diff --git a/pkgs/tools/networking/fast-ssh/default.nix b/pkgs/tools/networking/fast-ssh/default.nix index 59f61d9af7101..e0b8d8775c109 100644 --- a/pkgs/tools/networking/fast-ssh/default.nix +++ b/pkgs/tools/networking/fast-ssh/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-CJ3Xx5jaTD01Ai7YAY4vB7RB5lU1BIXq7530B6+KeX4="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "TUI tool to use the SSH config for connections"; diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index 20f8adf71cf8d..cafcf4bdaf506 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libsodium libuecc openssl - ] ++ lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libmnl ]; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index e04699ff7458c..7fed4c99daae2 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index 2d23839a3b719..ade3fe16e45ad 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "TLS proxy with mutual authentication support for securing non-TLS backend applications"; homepage = "https://github.com/ghostunnel/ghostunnel#readme"; changelog = "https://github.com/ghostunnel/ghostunnel/releases/tag/v${version}"; diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix deleted file mode 100644 index 5b00de2fda85f..0000000000000 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, fetchurl -, cmake, qtwebsockets, qtwebengine, qtkeychain, wrapQtAppsHook, openconnect -}: - -stdenv.mkDerivation rec { - pname = "globalprotect-openconnect"; - version = "1.4.9"; - - src = fetchurl { - url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz"; - hash = "sha256-vhvVKESLbqHx3XumxbIWOXIreDkW3yONDMXMHxhjsvk="; - }; - - nativeBuildInputs = [ cmake wrapQtAppsHook ]; - - buildInputs = [ openconnect qtwebsockets qtwebengine qtkeychain ]; - - patchPhase = '' - substituteInPlace GPService/gpservice.h \ - --replace /usr/local/bin/openconnect ${openconnect}/bin/openconnect; - substituteInPlace GPService/CMakeLists.txt \ - --replace /etc/gpservice $out/etc/gpservice; - ''; - - meta = with lib; { - description = "GlobalProtect VPN client (GUI) for Linux based on OpenConnect that supports SAML auth mode"; - homepage = "https://github.com/yuezk/GlobalProtect-openconnect"; - license = licenses.gpl3Only; - maintainers = [ maintainers.jerith666 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index e4a7bcdc423c2..4585e420b4379 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "3.29.0"; + version = "3.30.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-mTg3eN5ZmzQxItPq8ghPpFafr6zF+nliofGEKShnH88="; + sha256 = "sha256-UB3LYXRr6GnqVCRwAxnwqBCkOtor3mC4k73kPesZs0g="; }; - vendorHash = "sha256-wrgRQwisOHAhvRbvGXMW5VWkQuEifCwCo3usuxLie4A="; + vendorHash = "sha256-FYLH1Ej8Bm0+tS5Ikj1CPF+1t5opmzee8iHRZSW94Yk="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/tools/networking/godspeed/default.nix b/pkgs/tools/networking/godspeed/default.nix index 64441c1674dd2..2d0e4e32dea27 100644 --- a/pkgs/tools/networking/godspeed/default.nix +++ b/pkgs/tools/networking/godspeed/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Manager for reverse shells"; homepage = "https://github.com/redcode-labs/GodSpeed"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/networking/gp-saml-gui/default.nix b/pkgs/tools/networking/gp-saml-gui/default.nix index 105d5f6c68bab..f28306880f629 100644 --- a/pkgs/tools/networking/gp-saml-gui/default.nix +++ b/pkgs/tools/networking/gp-saml-gui/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "sha256-4MFHad1cuCWawy2hrqdXOgud0pXpYiV9J3Jwqyg4Udk="; }; - buildInputs = lib.optional stdenv.isLinux glib-networking; + buildInputs = lib.optional stdenv.hostPlatform.isLinux glib-networking; nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection glib-networking ]; @@ -29,7 +29,7 @@ buildPythonPackage rec { requests pygobject3 openconnect - ] ++ lib.optional stdenv.isLinux webkitgtk; + ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index fb8857afff72a..5079ce509bb97 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -21,11 +21,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-pQ95sS2dGVzZUOyuUpJPamW7RLiUTGu9KgpWLg4wn/w="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = lib.optionals stdenv.isLinux [ iputils ]; + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ iputils ]; postInstall = '' installManPage gping.1 diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index 24e22436b20dd..d7a01b92dc453 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl numactl ]; cmakeFlags = [ "-DgRPC_BUILD_TESTS=ON" ]; makeFlags = [ "grpc_cli" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-error=format-security"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=format-security"; installPhase = '' runHook preInstall diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/tools/networking/gvproxy/default.nix index 621c931c3e240..742c24659db68 100644 --- a/pkgs/tools/networking/gvproxy/default.nix +++ b/pkgs/tools/networking/gvproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - hash = "sha256-ovNYPYLC01xt7uiaXkFsLHiywAhQVa0tELk/AA8dxqs="; + hash = "sha256-A2nG3Or5EhUSjTIpV05rWVcLJpGHtAWP5/n07KjM/E8="; }; vendorHash = null; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 6a01f2f8ba888..2e2a6c96ddf1f 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -28,11 +28,11 @@ let sslPkg = sslPkgs.${sslLibrary}; in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-Oac8GHoLANJgLLP/ylLRtZ2Q8JAyc0/owD6y4pp9Gd8="; + hash = "sha256-rjgiHoWuugOKcl7771v+XnZnG6eVnl63TDn9B55dAC4"; }; buildInputs = [ sslPkg zlib libxcrypt ] @@ -42,9 +42,9 @@ in stdenv.mkDerivation (finalAttrs: { # TODO: make it work on bsd as well makeFlags = [ "PREFIX=${placeholder "out"}" - ("TARGET=" + (if stdenv.isSunOS then "solaris" - else if stdenv.isLinux then "linux-glibc" - else if stdenv.isDarwin then "osx" + ("TARGET=" + (if stdenv.hostPlatform.isSunOS then "solaris" + else if stdenv.hostPlatform.isLinux then "linux-glibc" + else if stdenv.hostPlatform.isDarwin then "osx" else "generic")) ]; @@ -66,7 +66,7 @@ in stdenv.mkDerivation (finalAttrs: { "LUA_LIB_NAME=lua" "LUA_LIB=${lua5_4}/lib" "LUA_INC=${lua5_4}/include" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "USE_SYSTEMD=yes" "USE_GETADDRINFO=1" ] ++ lib.optionals withPrometheusExporter [ diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index 528bf11e7d94d..10bd63d489271 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile.in --replace "gcc" "$CC" substituteInPlace version.c --replace "RELEASE_DATE" "\"$version\"" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' sed -i -e 's|#include <net/bpf.h>|#include <pcap/bpf.h>|' \ libpcap_stuff.c script.c '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index 60934216a2ef2..0f906b4586a0c 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.3.7"; + version = "2.0.0"; pname = "htpdate"; src = fetchFromGitHub { owner = "twekkel"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XdqQQw87gvWvdx150fQhnCio478PNCQBMw/g/l/T1ZA="; + sha256 = "sha256-X7r95Uc4oGB0eVum5D7pC4tebZIyyz73g6Q/D0cjuFM="; }; makeFlags = [ diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index e83570f62f043..cb0e51632784a 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ronn ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix index 25c7dbb60ec4f..f37f33a23f4bd 100644 --- a/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/pkgs/tools/networking/ifstat-legacy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01zmv6vk5kh5xmd563xws8a1qnxjb6b6kv59yzz9r3rrghxhd6c5"; }; - buildInputs = lib.optional stdenv.isLinux net-snmp; + buildInputs = lib.optional stdenv.hostPlatform.isLinux net-snmp; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index c40a8ee51238b..fdda3245b8b1e 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; + LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-lgcc_s"; preConfigure = '' cp ${automake}/share/automake*/config.{sub,guess} config diff --git a/pkgs/tools/networking/ifwifi/default.nix b/pkgs/tools/networking/ifwifi/default.nix index e62266c2dc6b2..645000dffc73d 100644 --- a/pkgs/tools/networking/ifwifi/default.nix +++ b/pkgs/tools/networking/ifwifi/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-TL7ZsRbpRdYymJHuoCUCqe/U3Vacb9mtKFh85IOl+PA="; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' wrapProgram "$out/bin/ifwifi" \ @@ -22,8 +22,8 @@ rustPlatform.buildRustPackage rec { # `ifwifi` runtime dep [ networkmanager ] # `wifiscanner` crate's runtime deps - ++ (lib.optional stdenv.isLinux iw) - # ++ (lib.optional stdenv.isDarwin airport) # airport isn't packaged + ++ (lib.optional stdenv.hostPlatform.isLinux iw) + # ++ (lib.optional stdenv.hostPlatform.isDarwin airport) # airport isn't packaged )}" ''; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 5bbe7e4f8d40e..6aedb474c612f 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ help2man perl /* for `whois' */ ]; buildInputs = [ ncurses /* for `talk' */ libxcrypt ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # This is a temporary workaround for missing headers in the 10.12 SDK to avoid a mass rebuild. # A commit to revert this change will be included in the fix PR targeting staging. NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "--disable-rsh" "--disable-rlogin" "--disable-rexec" - ] ++ lib.optional stdenv.isDarwin "--disable-servers"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-servers"; doCheck = true; diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index 0e6480f58dbed..4627ef34367c2 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ]; @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { installManPage doc/innernet.8.gz installShellCompletion doc/innernet.completions.{bash,fish,zsh} installShellCompletion doc/innernet-server.completions.{bash,fish,zsh} - '' + (lib.optionalString stdenv.isLinux '' + '' + (lib.optionalString stdenv.hostPlatform.isLinux '' find . -regex '.*\.\(target\|service\)' | xargs install -Dt $out/lib/systemd/system find $out/lib/systemd/system -type f | xargs sed -i "s|/usr/bin/innernet|$out/bin/innernet|" ''); diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 8952c4004fd30..a73184265f56c 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-hEBMqEMbWV6GxHPY8j2LsQKBAAHxX+r2EO/9OzGHiKo="; }; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ lksctp-tools ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lksctp-tools ]; configureFlags = [ "--with-openssl=${openssl.dev}" ]; outputs = [ diff --git a/pkgs/tools/networking/isync/0001-Increase-imap_vprintf-buffer-size.patch b/pkgs/tools/networking/isync/0001-Increase-imap_vprintf-buffer-size.patch deleted file mode 100644 index 8fefb2d6f73a4..0000000000000 --- a/pkgs/tools/networking/isync/0001-Increase-imap_vprintf-buffer-size.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e8a3a20aed135272a9ec0103f4055411c075f043 Mon Sep 17 00:00:00 2001 -From: Michal Sojka <michal.sojka@cvut.cz> -Date: Mon, 7 Nov 2022 00:07:22 +0100 -Subject: [PATCH] Increase imap_vprintf buffer size - -This fixes "Fatal: buffer too small. Please report a bug." error. See -https://sourceforge.net/p/isync/mailman/isync-devel/thread/87fsevvebj.fsf%40steelpick.2x.cz/#msg37731590 -for related discussion. - -When using mbsync with XOAUTH2 authentication (needed for Office365 -mailboxes), the access token used for the LOGIN command may not fit -into the currently used buffer of 1000 characters. In my case, I need -the buffer to be at least 2000 characters long. To make this more -future-proof, I increase the buffer size to 4000 characters. ---- - src/drv_imap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/drv_imap.c b/src/drv_imap.c -index c5a7aed..7847192 100644 ---- a/src/drv_imap.c -+++ b/src/drv_imap.c -@@ -528,7 +528,7 @@ imap_vprintf( const char *fmt, va_list ap ) - uint totlen = 0; - const char *segs[MAX_SEGS]; - uint segls[MAX_SEGS]; -- char buf[1000]; -+ char buf[4000]; - - d = buf; - ed = d + sizeof(buf); --- -2.38.1 - diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index edf20a6e77c09..280be724a8aa6 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -6,27 +6,23 @@ , withCyrusSaslXoauth2 ? false, cyrus-sasl-xoauth2, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "isync"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { - url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw"; + url = "mirror://sourceforge/isync/isync-${finalAttrs.version}.tar.gz"; + hash = "sha256-oMgeEJOHvyedoWFFMQM5nneUav7PXFH5QTxedzVX940="; }; - patches = [ - # Fixes "Fatal: buffer too small" error - ./0001-Increase-imap_vprintf-buffer-size.patch - # Fix #202595: SSL error "Socket error: ... unexpected eof while reading" - # Source: https://sourceforge.net/p/isync/isync/ci/b6c36624f04cd388873785c0631df3f2f9ac4bf0/ - ./work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch - ]; + # Fixes "Fatal: buffer too small" error + # see https://sourceforge.net/p/isync/mailman/isync-devel/thread/87fsevvebj.fsf%40steelpick.2x.cz/ + env.NIX_CFLAGS_COMPILE = "-DQPRINTF_BUFF=4000"; nativeBuildInputs = [ pkg-config perl ] ++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ]; buildInputs = [ openssl db cyrus_sasl zlib ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = lib.optionalString withCyrusSaslXoauth2 '' wrapProgram "$out/bin/mbsync" \ @@ -48,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ primeos ]; mainProgram = "mbsync"; }; -} +}) diff --git a/pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch b/pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch deleted file mode 100644 index 9177085ecad77..0000000000000 --- a/pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch +++ /dev/null @@ -1,76 +0,0 @@ -From b6c36624f04cd388873785c0631df3f2f9ac4bf0 Mon Sep 17 00:00:00 2001 -From: Oswald Buddenhagen <ossi@users.sf.net> -Date: Mon, 6 Jun 2022 11:55:37 +0200 -Subject: [PATCH] work around "unexpected EOF" error messages at end of SSL - connections - -gmail apparently doesn't send a close notification (SSL_shutdown()) -before closing the TCP socket. ---- - src/drv_imap.c | 7 +++++-- - src/socket.c | 9 +++++++++ - src/socket.h | 1 + - 3 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/drv_imap.c b/src/drv_imap.c -index fb8d165..6286045 100644 ---- a/src/drv_imap.c -+++ b/src/drv_imap.c -@@ -1620,6 +1620,7 @@ imap_socket_read( void *aux ) - error( "IMAP error: unexpected BYE response: %s\n", cmd ); - /* We just wait for the server to close the connection now. */ - ctx->expectEOF = 1; -+ socket_expect_eof( &ctx->conn ); - } else { - /* We still need to wait for the LOGOUT's tagged OK. */ - } -@@ -1882,10 +1883,12 @@ static void - imap_cleanup_p2( imap_store_t *ctx, - imap_cmd_t *cmd ATTR_UNUSED, int response ) - { -- if (response == RESP_NO) -+ if (response == RESP_NO) { - imap_cancel_store( &ctx->gen ); -- else if (response == RESP_OK) -+ } else if (response == RESP_OK) { - ctx->expectEOF = 1; -+ socket_expect_eof( &ctx->conn ); -+ } - } - - /******************* imap_open_store *******************/ -diff --git a/src/socket.c b/src/socket.c -index ac3c847..892cece 100644 ---- a/src/socket.c -+++ b/src/socket.c -@@ -810,6 +810,15 @@ socket_expect_activity( conn_t *conn, int expect ) - conf_wakeup( &conn->fd_timeout, expect ? conn->conf->timeout : -1 ); - } - -+void -+socket_expect_eof( conn_t *sock ) -+{ -+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF // implies HAVE_LIBSSL -+ if (sock->ssl) -+ SSL_set_options( sock->ssl, SSL_OP_IGNORE_UNEXPECTED_EOF ); -+#endif -+} -+ - int - socket_read( conn_t *conn, char *buf, uint len ) - { -diff --git a/src/socket.h b/src/socket.h -index 5b1edd0..af679aa 100644 ---- a/src/socket.h -+++ b/src/socket.h -@@ -142,6 +142,7 @@ void socket_start_tls(conn_t *conn, void (*cb)( int ok, void *aux ) ); - void socket_start_deflate( conn_t *conn ); - void socket_close( conn_t *sock ); - void socket_expect_activity( conn_t *sock, int expect ); -+void socket_expect_eof( conn_t *sock ); - int socket_read( conn_t *sock, char *buf, uint len ); /* never waits */ - char *socket_read_line( conn_t *sock ); /* don't free return value; never waits */ - typedef enum { KeepOwn = 0, GiveOwn } ownership_t; --- -2.38.0 - diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index b384043cc23ec..50959152d7101 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { # Work around error from <stdio.h> on aarch64-darwin: # error: 'TARGET_OS_IPHONE' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] # TODO: this should probably be fixed at a lower level than this? - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-undef-prefix"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-undef-prefix"; meta = { description = "Client for the WHOIS protocol allowing you to query the owner of a domain name"; diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix index f424afdfec062..2803606be6ac5 100644 --- a/pkgs/tools/networking/kapp/default.nix +++ b/pkgs/tools/networking/kapp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kapp"; - version = "0.63.2"; + version = "0.63.3"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "kapp"; rev = "v${version}"; - hash = "sha256-YmaIGC/4+yhb9D9QNqT3EW6RHbsbSebbImuJZdRhvJ0="; + hash = "sha256-mOXjPdeDJKBEW7Jr0yMFpZ4WBciJBh0s2AEMtog6CIw="; }; vendorHash = null; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index a4831b6ef0ef6..ac068c39591bd 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--with-openssl=${lib.getDev openssl}" ] - ++ lib.optional withPostgres "--with-pgsql=${postgresql}/bin/pg_config" + ++ lib.optional withPostgres "--with-pgsql=${lib.getDev postgresql}/bin/pg_config" ++ lib.optional withMysql "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config"; postConfigure = '' diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index a3bf468f21e73..482347a5ab985 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ openssl readline zlib libidn2 gmp libiconv libunistring gettext ]; - hardeningDisable = lib.optional stdenv.isDarwin "format"; + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "format"; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Required to build with clang 16 or `configure` will fail to detect several standard functions. NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; }; diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 7dac682407bd0..c56cea33abf51 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { libcap_ng libxcrypt curl nspr nss ldns # needed to patch shebangs python3 bash - ] ++ lib.optional stdenv.isLinux libselinux; + ] ++ lib.optional stdenv.hostPlatform.isLinux libselinux; prePatch = '' # Replace wget with curl to save a dependency diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index dad2af76964fd..c5577a7bdccdb 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -41,6 +41,8 @@ python3.pkgs.buildPythonApplication rec { "TestLoginUrl" "test_timeit2" # flakey, and depends sleep being precise to the milisecond "test_internet" # uses network, fails on Darwin (not sure why it doesn't fail on linux) + "test_markdown" # uses sys.version_info for conditional testing + "test_itms_services" # uses sys.version_info for conditional testing ]; disabledTestPaths = [ diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index d6a7648c445ba..46501ca746ef2 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -36,6 +36,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Hosted VPN service that lets you securely extend LAN-like networks to distributed teams"; homepage = "https://secure.logmein.com/products/hamachi/"; + changelog = "https://support.logmeininc.com/central/help/whats-new-in-hamachi"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix index bc6f1d3a1f39a..0ecd2a0033c91 100644 --- a/pkgs/tools/networking/lychee/default.nix +++ b/pkgs/tools/networking/lychee/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; checkFlags = [ # Network errors for all of these tests diff --git a/pkgs/tools/networking/magic-wormhole-rs/default.nix b/pkgs/tools/networking/magic-wormhole-rs/default.nix index fc0ceebc714e6..6cc7af7e17757 100644 --- a/pkgs/tools/networking/magic-wormhole-rs/default.nix +++ b/pkgs/tools/networking/magic-wormhole-rs/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-x6aEas3vmdI24nOys+Y+vuwY7k5cYRAj9oOH73zyV+A="; buildInputs = [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security AppKit ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 919b4dda863aa..c9979a0fee5fa 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { readline sasl libxcrypt - ] ++ lib.optionals stdenv.isLinux [ nettools ] + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nettools ] ++ lib.optionals pythonSupport [ python3 ] ++ lib.optionals guileSupport [ guile_2_2 ]; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!guileSupport) "--without-guile"; nativeCheckInputs = [ dejagnu mkpasswd ]; - doCheck = !stdenv.isDarwin; # ERROR: All 46 tests were run, 46 failed unexpectedly. + doCheck = !stdenv.hostPlatform.isDarwin; # ERROR: All 46 tests were run, 46 failed unexpectedly. doInstallCheck = false; # fails preCheck = '' diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index 9b0aa5cb899b8..54819dd13827b 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -22,6 +22,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Small command line application for keeping your project hostnames in sync with /etc/hosts"; homepage = "https://github.com/mpscholten/maphosts"; + changelog = "https://github.com/mpscholten/maphosts/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ mpscholten nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/maubot/default.nix b/pkgs/tools/networking/maubot/default.nix index b66940d923901..f2cdf39b5e579 100644 --- a/pkgs/tools/networking/maubot/default.nix +++ b/pkgs/tools/networking/maubot/default.nix @@ -5,20 +5,13 @@ , runCommand , python3 , encryptionSupport ? true +, sqliteSupport ? true }: let python = python3.override { self = python; packageOverrides = final: prev: { - # aiosqlite>=0.16,<0.19 - aiosqlite = prev.aiosqlite.overridePythonAttrs (old: rec { - version = "0.18.0"; - src = old.src.override { - rev = "refs/tags/v${version}"; - hash = "sha256-yPGSKqjOz1EY5/V0oKz2EiZ90q2O4TINoXdxHuB7Gqk="; - }; - }); # 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) @@ -43,29 +36,27 @@ let maubot = python.pkgs.buildPythonPackage rec { pname = "maubot"; - version = "0.4.2"; - disabled = python.pythonOlder "3.9"; + version = "0.5.0"; + disabled = python.pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-svdg7KpCy/+T9Hu+FbsgLNU8nVuIn0flPg7qyn7I+30="; + hash = "sha256-PkeZ7C4Srs2I10g7X1XD/HclumUwWTYj2F3J2CxN4Hs="; }; patches = [ # add entry point - https://github.com/maubot/maubot/pull/146 (fetchpatch { - url = "https://github.com/maubot/maubot/commit/283f0a3ed5dfae13062b6f0fd153fbdc477f4381.patch"; - sha256 = "0yn5357z346qzy5v5g124mgiah1xsi9yyfq42zg028c8paiw8s8x"; + url = "https://github.com/maubot/maubot/commit/ef6e23eccb530187dd3447b6aac2047d4a32fb83.patch"; + hash = "sha256-d5fu47F93aXZmk6MiSsxTE8pHjMKNL0FUdU+ynUqY2o="; }) ]; propagatedBuildInputs = with python.pkgs; [ - setuptools # requirements.txt - mautrix + (mautrix.override { withOlm = encryptionSupport; }) aiohttp yarl - sqlalchemy asyncpg aiosqlite commonmark @@ -77,12 +68,22 @@ let colorama questionary jinja2 + setuptools ] # optional-requirements.txt ++ lib.optionals encryptionSupport [ python-olm pycryptodome unpaddedbase64 + ] + ++ lib.optionals sqliteSupport [ + sqlalchemy + ]; + + # used for plugin tests + propagatedNativeBuildInputs = with python.pkgs; [ + pytest + pytest-asyncio ]; postInstall = '' diff --git a/pkgs/tools/networking/maubot/plugins/generated.json b/pkgs/tools/networking/maubot/plugins/generated.json index 7051bf3e5b508..abd5e3d517654 100644 --- a/pkgs/tools/networking/maubot/plugins/generated.json +++ b/pkgs/tools/networking/maubot/plugins/generated.json @@ -1,35 +1,4 @@ { - "activity-tracker": { - "attrs": { - "meta": { - "changelog": "https://github.com/williamkray/maubot-kickbot/releases", - "description": "A plugin that minimally tracks user activity within a space. Useful for kicking inactive users from a private community.", - "downloadPage": "https://github.com/williamkray/maubot-kickbot/releases", - "homepage": "https://github.com/williamkray/maubot-kickbot" - } - }, - "github": { - "hash": "sha256-TLaGpLrTR4TLR0TjY3v9FFST8JxEP4swJ7kzt0fDwJI=", - "owner": "williamkray", - "repo": "maubot-kickbot", - "rev": "a4c31c7a1492585f2155705be8cab7e3f73f6b69" - }, - "manifest": { - "database": true, - "database_type": "asyncpg", - "extra_files": [ - "base-config.yaml" - ], - "id": "org.jobmachine.kickbot", - "license": "MIT", - "main_class": "KickBot", - "maubot": "0.1.0", - "modules": [ - "kickbot" - ], - "version": "0.0.10" - } - }, "alertbot": { "attrs": { "meta": { @@ -116,17 +85,17 @@ "attrs": { "meta": { "changelog": "https://github.com/coffeebank/coffee-maubot/releases", - "description": "An anime/manga bot for Matrix. Search anime, manga (manhwa/manhua), and light novels from Anilist. See series info, status, and episodes/chapters.", + "description": "An anime/manga bot for Matrix. Search anime, manga (manhwa/manhua), and light novels. See series info, status, episodes/chapters, and tags. Search Anilist, MangaDex, and Batoto.", "downloadPage": "https://github.com/coffeebank/coffee-maubot/releases", "homepage": "https://github.com/coffeebank/coffee-maubot/tree/master/animemanga" }, "postPatch": "cd animemanga" }, "github": { - "hash": "sha256-k+M/Wk4nyXUZBJxmxQr64dPp3rK7i1oQeLFtncle3dI=", + "hash": "sha256-dKSXBwkIVFnoTcjXQXPf8xdzP44VZR8Bq3KQhsBpABA=", "owner": "coffeebank", "repo": "coffee-maubot", - "rev": "b25112508d65f7560910e67d3074dd60f4048821" + "rev": "f2329cf643a80fc7200fd225ba697fea639f2e99" }, "manifest": { "database": false, @@ -140,7 +109,7 @@ "modules": [ "animemanga" ], - "version": "0.1.1.216" + "version": "0.2.0.66" } }, "antithread": { @@ -201,36 +170,36 @@ "version": "1.0.0" } }, - "bard": { + "awareness-bot": { "attrs": { "meta": { - "changelog": "https://github.com/ser/maubot-bard/releases", - "description": "Allow your maubot instance to return queries from Google(TM) Bard(TM) pseudoAI", - "downloadPage": "https://github.com/ser/maubot-bard/releases", - "homepage": "https://github.com/ser/maubot-bard/", - "license": "MIT" + "changelog": "https://github.com/besendorf/awareness-bot/releases", + "description": "maubot plugin that helps moderate a matrix room by muting users that use foul language", + "downloadPage": "https://github.com/besendorf/awareness-bot/releases", + "homepage": "https://github.com/besendorf/awareness-bot", + "license": "AGPL-3.0-only" } }, "github": { - "hash": "sha256-E8pz71wfH+SmFNzBcPUrnqK0xs7wlyB6SaRXH/PDqKw=", - "owner": "ser", - "repo": "maubot-bard", - "rev": "4ff3ce8d86ed19c973dee89228779fed74811341" + "hash": "sha256-ZXmsDQSr07M46BLRmSnKw1KkBwCQt7Ki6dPx9oxunwE=", + "owner": "besendorf", + "repo": "awareness-bot", + "rev": "a7d77491c371e189f8fac7f8c2ff31ac48c32e08" }, "manifest": { "config": true, - "dependencies": [ - "bardapi" - ], + "database": true, + "database_type": "asyncpg", "extra_files": [ "base-config.yaml" ], - "id": "sergevictor.eu.maubot.bard", - "main_class": "BardPlugin", + "id": "org.besendorf.awarenessbot", + "main_class": "Awareness", + "maubot": "0.1.0", "modules": [ - "bard" + "awarenessbot" ], - "version": "0.99.100" + "version": "1.0.0" } }, "characterai": { @@ -279,10 +248,10 @@ } }, "github": { - "hash": "sha256-XOhjSrgbVUwMO6/v/Znoc5l/k2n6Zi42Ydhv9/vyX7E=", + "hash": "sha256-ZloRMHaYl1rt2vurLo7pugQRg9gIT4X2LCmxOqACb2c=", "owner": "williamkray", "repo": "maubot-chatgpt", - "rev": "d313920165f8fca7a04314a73bb1dca30c67d9f5" + "rev": "101ea08743ed7bd251c3c0de7386d322e650af26" }, "manifest": { "config": true, @@ -296,7 +265,7 @@ "modules": [ "gpt" ], - "version": "0.0.10" + "version": "0.0.11" } }, "choose": { @@ -310,10 +279,10 @@ "postPatch": "cd choose" }, "github": { - "hash": "sha256-k+M/Wk4nyXUZBJxmxQr64dPp3rK7i1oQeLFtncle3dI=", + "hash": "sha256-dKSXBwkIVFnoTcjXQXPf8xdzP44VZR8Bq3KQhsBpABA=", "owner": "coffeebank", "repo": "coffee-maubot", - "rev": "b25112508d65f7560910e67d3074dd60f4048821" + "rev": "f2329cf643a80fc7200fd225ba697fea639f2e99" }, "manifest": { "database": false, @@ -358,35 +327,35 @@ "version": "1.0.0" } }, - "create-room": { + "communitybot": { "attrs": { "meta": { - "changelog": "https://github.com/williamkray/maubot-createroom/releases", - "description": "A plugin that creates new rooms and automatically sets them to be part of a private Matrix Space.", - "downloadPage": "https://github.com/williamkray/maubot-createroom/releases", - "homepage": "https://github.com/williamkray/maubot-createroom" + "changelog": "https://github.com/williamkray/maubot-communitybot/releases", + "description": "helps admins manage a matrix space, with user management, room creation\ntools, and much more! replaces activity-tracker, createroom, and welcome\nplugins.\n", + "downloadPage": "https://github.com/williamkray/maubot-communitybot/releases", + "homepage": "https://github.com/williamkray/maubot-communitybot" } }, "github": { - "hash": "sha256-x1eoUX8u1IR/hLgS8YcpSoTByl+m3GoTW3fnFMDs1XA=", + "hash": "sha256-wO63G2mdpz2FWjatVY5R+L7Chki087Ev7oMfpgyOnxM=", "owner": "williamkray", - "repo": "maubot-createroom", - "rev": "4eecdcffa6c06276287c2a3d4e65905a72ad18ad" + "repo": "maubot-communitybot", + "rev": "v0.1.7" }, "manifest": { - "config": true, - "database": false, + "database": true, + "database_type": "asyncpg", "extra_files": [ "base-config.yaml" ], - "id": "org.jobmachine.createspaceroom", + "id": "org.jobmachine.communitybot", "license": "MIT", - "main_class": "CreateSpaceRoom", + "main_class": "CommunityBot", "maubot": "0.1.0", "modules": [ - "createspaceroom" + "community" ], - "version": "0.1.2" + "version": "0.1.7" } }, "dice": { @@ -533,6 +502,36 @@ "version": "3.0.0" } }, + "gemini": { + "attrs": { + "meta": { + "changelog": "https://github.com/shanks219/maubot-gemini-bot/releases", + "description": "A simple gemini-pro chatbot.", + "downloadPage": "https://github.com/shanks219/maubot-gemini-bot/releases", + "homepage": "https://github.com/shanks219/maubot-gemini-bot/" + } + }, + "github": { + "hash": "sha256-mPKPksfgK1eyCiqqxC3/mPKEwVXjVAMYz8PHf78l7wk=", + "owner": "shanks219", + "repo": "maubot-gemini-bot", + "rev": "v0.1.0" + }, + "manifest": { + "config": true, + "extra_files": [ + "base-config.yaml" + ], + "id": "com.shanks.matrix.bot.gemini", + "license": "MIT", + "main_class": "GeminiBot", + "maubot": "0.1.0", + "modules": [ + "geminibot" + ], + "version": "1.0.0" + } + }, "gifme": { "attrs": { "meta": { @@ -543,10 +542,10 @@ } }, "github": { - "hash": "sha256-5MHLtm3qktUyvWyuwQEUQWL8fxszZ6h/hHClLLr0Uvs=", + "hash": "sha256-VtZp4c3bbKCgbqQoJRnkle7Qn1zSGhgSPFAIlijQDOs=", "owner": "williamkray", "repo": "maubot-gifme", - "rev": "6dbbb9ebce903887b62f95b04f4640779762e57a" + "rev": "a896a07fba53c90455431e79904f79d949c91f92" }, "manifest": { "database": true, @@ -715,10 +714,10 @@ } }, "github": { - "hash": "sha256-twvVeMD2nRwpazc21inbdr6mUjMXJ4T6v5ieNrwB+O4=", + "hash": "sha256-UWJGvLs/zrg3pNtZjc2PLNZfmiWl7QWGesyjojljXeQ=", "owner": "ser", "repo": "maubot-hateheif", - "rev": "52cf166960ac3fb71d291e13d5f3621caa9d7af1" + "rev": "64b36a2447c6bb3bedc25e8afd85abde60c3d755" }, "manifest": { "config": true, @@ -838,10 +837,10 @@ "postPatch": "cd jadict" }, "github": { - "hash": "sha256-k+M/Wk4nyXUZBJxmxQr64dPp3rK7i1oQeLFtncle3dI=", + "hash": "sha256-dKSXBwkIVFnoTcjXQXPf8xdzP44VZR8Bq3KQhsBpABA=", "owner": "coffeebank", "repo": "coffee-maubot", - "rev": "b25112508d65f7560910e67d3074dd60f4048821" + "rev": "f2329cf643a80fc7200fd225ba697fea639f2e99" }, "manifest": { "database": false, @@ -855,7 +854,7 @@ "modules": [ "jadict" ], - "version": "0.1.0.10" + "version": "0.1.1.12" } }, "join": { @@ -868,10 +867,10 @@ } }, "github": { - "hash": "sha256-aqpL+KO5p0hre7RCUZrM270Ah+cR4cQxZn7LTXLT79k=", + "hash": "sha256-6bggnk3196M0eCkfYTJWLhiIwIVTtluffQzc58yIYzw=", "owner": "williamkray", "repo": "maubot-join", - "rev": "1b57758dfe3a2191588bb903ea546328146e69d8" + "rev": "v0.3.1" }, "manifest": { "database": false, @@ -885,7 +884,7 @@ "modules": [ "join" ], - "version": "0.3.0" + "version": "0.3.1" } }, "karma": { @@ -919,6 +918,44 @@ "version": "1.0.1" } }, + "kodict": { + "attrs": { + "meta": { + "changelog": "https://github.com/coffeebank/coffee-maubot/releases", + "description": "A Korean dictionary Matrix bot for searching and translating Korean vocabulary (Hangul/Hangeul, Hanja). Searches National Institute of Korean Language's Korean-English Learners' Dictionary (\ud55c\uad6d\uc5b4\uae30\ucd08\uc0ac\uc804).", + "downloadPage": "https://github.com/coffeebank/coffee-maubot/releases", + "homepage": "https://github.com/coffeebank/coffee-maubot/tree/master/kodict" + }, + "postPatch": "cd kodict" + }, + "github": { + "hash": "sha256-dKSXBwkIVFnoTcjXQXPf8xdzP44VZR8Bq3KQhsBpABA=", + "owner": "coffeebank", + "repo": "coffee-maubot", + "rev": "f2329cf643a80fc7200fd225ba697fea639f2e99" + }, + "manifest": { + "database": false, + "dependencies": [ + "cssselect", + "kodict-core", + "korean-romanizer", + "krdict.py@git+https://github.com/coffeebank/krdict.py", + "lxml" + ], + "extra_files": [ + "base-config.yaml" + ], + "id": "coffee.maubot.kodict", + "license": "AGPL-3.0-or-later", + "main_class": "KodictBot", + "maubot": "0.1.0", + "modules": [ + "kodict" + ], + "version": "0.1.0.366" + } + }, "ldap-ad-inviterbot": { "attrs": { "meta": { @@ -954,6 +991,68 @@ "version": "0.1.6" } }, + "ldap-inviter": { + "attrs": { + "meta": { + "changelog": "https://github.com/davidmehren/maubot-ldap-inviter/releases", + "description": "A maubot plugin to invite users to Matrix rooms according to LDAP groups", + "downloadPage": "https://github.com/davidmehren/maubot-ldap-inviter/releases", + "homepage": "https://github.com/davidmehren/maubot-ldap-inviter" + } + }, + "github": { + "hash": "sha256-eLbAFGQ/WGXvL8N4B1MW9Q4mY5axXl8PEdIEYtmiyb0=", + "owner": "davidmehren", + "repo": "maubot-ldap-inviter", + "rev": "ece581ba397df0030f65eeccbe141b7fc3fcfb19" + }, + "manifest": { + "config": true, + "extra_files": [ + "base-config.yaml" + ], + "id": "de.herrmehren.ldap-inviter", + "license": "MIT", + "main_class": "LDAPInviterBot", + "maubot": "0.1.0", + "modules": [ + "inviter" + ], + "version": "0.0.1" + } + }, + "llm": { + "attrs": { + "meta": { + "changelog": "https://github.com/brokensandals/maubot-llm/releases", + "description": "Allows chatting with LLMs running on OpenAI-compatible servers (including local instances like LM Studio). Can use different backends, models, and system prompts per room.", + "downloadPage": "https://github.com/brokensandals/maubot-llm/releases", + "homepage": "https://github.com/brokensandals/maubot-llm" + } + }, + "github": { + "hash": "sha256-b/zFfgZPaODyyfk8ZgU+fihgqbsuxspGQj+oDmG3Nqc=", + "owner": "brokensandals", + "repo": "maubot-llm", + "rev": "fc527836acf57cad90020d2dc0127a44ae7f73bd" + }, + "manifest": { + "config": true, + "database": true, + "database_type": "asyncpg", + "extra_files": [ + "base-config.yaml" + ], + "id": "net.brokensandals.llm", + "license": "MIT", + "main_class": "LlmBot", + "maubot": "0.1.0", + "modules": [ + "maubot_llm" + ], + "version": "1.0.0" + } + }, "local-stt": { "attrs": { "meta": { @@ -1020,6 +1119,40 @@ "version": "1.0.0" } }, + "matrix-to-discourse": { + "attrs": { + "meta": { + "changelog": "https://github.com/gitayam/matrix-to-discourse/releases", + "description": "A plugin create Discourse forum post from messages in Matrix or Bridged rooms and perform advanced forum searches directly from Matrix or Bridged rooms. Perfect for community building and engagement.", + "downloadPage": "https://github.com/gitayam/matrix-to-discourse/releases", + "homepage": "https://github.com/gitayam/matrix-to-discourse" + } + }, + "github": { + "hash": "sha256-QIFgCQL9O/SVemXfxlXzPcPQ/qx68IU7ntArCk946iA=", + "owner": "gitayam", + "repo": "matrix-to-discourse", + "rev": "v0.1.0.1" + }, + "manifest": { + "dependencies": [ + "aiohttp", + "maubot", + "mautrix", + "openai", + "pyyaml", + "requests" + ], + "id": "com.irregularchat.matrix_to_discourse", + "license": "GPL-3.0", + "main_class": "MatrixToDiscourseBot", + "maubot": "0.1.0", + "modules": [ + "bot" + ], + "version": "0.1.0.0" + } + }, "media": { "attrs": { "meta": { @@ -1056,10 +1189,10 @@ } }, "github": { - "hash": "sha256-qtGGCaATIzJMRhLWzFN0kSa6P/tlckCkxatKEfXyi0E=", + "hash": "sha256-dSsCmDAKfr1HyxiOUb+ogB86FRzuRYJIZ4/vk+PP8r8=", "owner": "edwardsdean", "repo": "maubot_metric_bot", - "rev": "0.0.4" + "rev": "0.0.5" }, "manifest": { "database": false, @@ -1070,7 +1203,7 @@ "modules": [ "metric" ], - "version": "0.0.4" + "version": "0.0.5" } }, "ntfy": { @@ -1116,24 +1249,24 @@ } }, "github": { - "hash": "sha256-+aDQF/hW66M25zsvIsjNt7K2l32rV1g3fPrb45XdHVU=", + "hash": "sha256-vw2MT4pwmUUWolgzkq0nZ/YaAlKUANrN0NPXXFf7B1k=", "owner": "tcpipuk", "repo": "maubot-openai-translate", - "rev": "v0.3.0" + "rev": "v0.3.1" }, "manifest": { "config": true, "extra_files": [ "base-config.yaml" ], - "id": "xyz.maubot.openaitranslate", + "id": "uk.tcpip.openaitranslate", "license": "AGPL-3.0-or-later", "main_class": "OpenAITranslate", "maubot": "0.1.0", "modules": [ "openaitranslate" ], - "version": "0.3.0" + "version": "0.3.1" } }, "ovgumensabot": { @@ -1259,6 +1392,36 @@ "version": "3.0.1" } }, + "pretix-inviter": { + "attrs": { + "meta": { + "changelog": "https://github.com/fedora-infra/maubot-pretix-invite/blob/v0.3.2/CHANGELOG.md", + "description": "A maubot plugin for inviting event participants from the pretix ticketing platform into a matrix room", + "downloadPage": "https://github.com/fedora-infra/maubot-pretix-invite/releases", + "homepage": "https://github.com/fedora-infra/maubot-pretix-invite" + } + }, + "github": { + "hash": "sha256-KgWGvZ7QHcH0/u6+kodW8MAXtco4MM5MpbKscW903nQ=", + "owner": "fedora-infra", + "repo": "maubot-pretix-invite", + "rev": "v0.3.2" + }, + "manifest": { + "config": true, + "extra_files": [ + "base-config.yaml" + ], + "id": "org.fedoraproject.maubot.events", + "license": "MIT", + "main_class": "EventManagement", + "modules": [ + "event_helper" + ], + "version": "0.3.2", + "webapp": true + } + }, "random-quote": { "attrs": { "meta": { @@ -1331,10 +1494,10 @@ } }, "github": { - "hash": "sha256-GfroQ7iaBfN8WClORrkYccPHq8FsKupZtYKJvHGZg1o=", + "hash": "sha256-IKuOJFBfSC4sKSKoD+MuvuLBrsAMhs/PC1qYb5nP5jk=", "owner": "ajkessel", "repo": "reacjibot", - "rev": "v0.7.4" + "rev": "v2.7.14" }, "manifest": { "extra_files": [ @@ -1347,7 +1510,7 @@ "modules": [ "reacjibot" ], - "version": "0.7.4" + "version": "2.7.14" } }, "reactbot": { @@ -1590,10 +1753,10 @@ "postPatch": "cd send-custom-html" }, "github": { - "hash": "sha256-k+M/Wk4nyXUZBJxmxQr64dPp3rK7i1oQeLFtncle3dI=", + "hash": "sha256-dKSXBwkIVFnoTcjXQXPf8xdzP44VZR8Bq3KQhsBpABA=", "owner": "coffeebank", "repo": "coffee-maubot", - "rev": "b25112508d65f7560910e67d3074dd60f4048821" + "rev": "f2329cf643a80fc7200fd225ba697fea639f2e99" }, "manifest": { "database": false, @@ -1607,7 +1770,7 @@ "modules": [ "sendcustomhtml" ], - "version": "0.1.0.6" + "version": "0.2.0.256" } }, "social-media-download": { @@ -1620,10 +1783,10 @@ } }, "github": { - "hash": "sha256-RMyQzGz2Z4m9FN0Nt5E6Tj0yZarysygCtvEZDfG143M=", + "hash": "sha256-naHY6f034uGnPIHidI7WXjcf2h/t0IYaPkO5QfKkXMs=", "owner": "ggogel", "repo": "SocialMediaDownloadMaubot", - "rev": "1.2.0" + "rev": "1.4.2" }, "manifest": { "config": true, @@ -1639,7 +1802,7 @@ "instaloader", "socialmediadownload" ], - "version": "1.2.0" + "version": "1.4.2" } }, "songwhip": { @@ -1799,17 +1962,17 @@ "attrs": { "meta": { "changelog": "https://github.com/coffeebank/coffee-maubot/releases", - "description": "Get the time in specific cities. Check timezones. !timein New York (Python 3.9+) (Python <3.9 requires pytz, fuzzywuzzy)", + "description": "Get the time in specific cities. Check timezones. !timein America/New_York (Python 3.9+)", "downloadPage": "https://github.com/coffeebank/coffee-maubot/releases", "homepage": "https://github.com/coffeebank/coffee-maubot/tree/master/timein" }, "postPatch": "cd timein" }, "github": { - "hash": "sha256-k+M/Wk4nyXUZBJxmxQr64dPp3rK7i1oQeLFtncle3dI=", + "hash": "sha256-dKSXBwkIVFnoTcjXQXPf8xdzP44VZR8Bq3KQhsBpABA=", "owner": "coffeebank", "repo": "coffee-maubot", - "rev": "b25112508d65f7560910e67d3074dd60f4048821" + "rev": "f2329cf643a80fc7200fd225ba697fea639f2e99" }, "manifest": { "database": false, @@ -1892,10 +2055,10 @@ } }, "github": { - "hash": "sha256-8ZAH9Kn0EQYY9gLx48gF+aEsFOdlZlrbUIvLMP0uwi4=", + "hash": "sha256-Gm90IsokLEhbWGksHgjSQNBY/WOpccqfKJTmwD2cvBE=", "owner": "yoxcu", "repo": "maubot-token", - "rev": "v1.1.0" + "rev": "v1.1.1" }, "manifest": { "config": true, @@ -1911,7 +2074,7 @@ "modules": [ "tokenbot" ], - "version": "1.1.0" + "version": "1.1.1" } }, "translate": { @@ -1953,16 +2116,17 @@ } }, "github": { - "hash": "sha256-WlrFt+uj6E7Ecg+3KW6fjrMXSUP5YFA5ZyitvBON3pA=", + "hash": "sha256-CMEwzkvHnBpFUg7HssAF7ga221XCQlU/dScMy7JhmuQ=", "owner": "jeffcasavant", "repo": "MaubotTrumpTweet", - "rev": "v1.1.2" + "rev": "v1.1.3" }, "isPoetry": true, "manifest": { "database": false, "dependencies": [ - "Pillow>=9.0.1, <10.0.0" + "Pillow>=9.3.0, <10.0.0", + "asyncpg>=0.26.0" ], "extra_files": [ "res/font/Roboto-Black.ttf", @@ -2021,7 +2185,7 @@ "modules": [ "trumptweet" ], - "version": "1.1.2" + "version": "1.1.3" } }, "twilio": { @@ -2128,10 +2292,10 @@ "postPatch": "cd urlpreview" }, "github": { - "hash": "sha256-k+M/Wk4nyXUZBJxmxQr64dPp3rK7i1oQeLFtncle3dI=", + "hash": "sha256-dKSXBwkIVFnoTcjXQXPf8xdzP44VZR8Bq3KQhsBpABA=", "owner": "coffeebank", "repo": "coffee-maubot", - "rev": "b25112508d65f7560910e67d3074dd60f4048821" + "rev": "f2329cf643a80fc7200fd225ba697fea639f2e99" }, "manifest": { "database": false, @@ -2187,10 +2351,10 @@ } }, "github": { - "hash": "sha256-GGbd7PvW2P0u1h7Cp1GMuEg3uQ0osZBWWHzSW524aBc=", + "hash": "sha256-1UCQxUldc9nE9wh4OUsHcQay5TuPLkY8ppcTAb/10EQ=", "owner": "jkhsjdhjs", "repo": "maubot-webhook", - "rev": "v0.2.0" + "rev": "v0.4.0" }, "manifest": { "config": true, @@ -2207,40 +2371,10 @@ "modules": [ "plugin" ], - "version": "0.2.0", + "version": "0.4.0", "webapp": true } }, - "welcome": { - "attrs": { - "meta": { - "changelog": "https://github.com/williamkray/maubot-welcome/releases", - "description": "A plugin that greets new people with a configurable message when they join a room.", - "downloadPage": "https://github.com/williamkray/maubot-welcome/releases", - "homepage": "https://github.com/williamkray/maubot-welcome" - } - }, - "github": { - "hash": "sha256-8BIDj/kHys/Pw1n1lLtxjYOstI/UG5UAlxD+3rpKj0Q=", - "owner": "williamkray", - "repo": "maubot-welcome", - "rev": "a6d3e6cbea87056a1d4694f5379c9ae9d9cdf1c5" - }, - "manifest": { - "database": false, - "extra_files": [ - "base-config.yaml" - ], - "id": "org.jobmachine.welcome", - "license": "MIT", - "main_class": "Greeter", - "maubot": "0.1.0", - "modules": [ - "welcome" - ], - "version": "0.0.4" - } - }, "wolframalpha": { "attrs": { "meta": { diff --git a/pkgs/tools/networking/maubot/plugins/generated.nix b/pkgs/tools/networking/maubot/plugins/generated.nix index 241151eb6ca0e..1ac34284ab54f 100644 --- a/pkgs/tools/networking/maubot/plugins/generated.nix +++ b/pkgs/tools/networking/maubot/plugins/generated.nix @@ -19,7 +19,7 @@ let resolveDeps = deps: map (name: let - packageName = builtins.head (builtins.match "([^~=<>]*).*" name); + packageName = builtins.head (builtins.match "([^~=<>@]*).*" name); lower = lib.toLower packageName; dash = builtins.replaceStrings ["_"] ["-"] packageName; lowerDash = builtins.replaceStrings ["_"] ["-"] lower; diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix deleted file mode 100644 index 2fbd7e88466b9..0000000000000 --- a/pkgs/tools/networking/megatools/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchgit -, asciidoc -, docbook_xml_dtd_45 -, docbook2x -, libxml2 -, meson -, ninja -, pkg-config -, curl -, glib -, fuse -}: - -stdenv.mkDerivation rec { - pname = "megatools"; - version = "1.11.0"; - - src = fetchgit { - url = "https://megous.com/git/megatools"; - rev = version; - sha256 = "sha256-Q9hMJBQBenufubbmeAw8Q8w+Oo+UcZLWathKNDwTv3s="; - }; - - nativeBuildInputs = [ - asciidoc - docbook_xml_dtd_45 - docbook2x - libxml2 - meson - ninja - pkg-config - ]; - - buildInputs = [ - curl - glib - ] ++ lib.optionals stdenv.isLinux [ fuse ]; - - enableParallelBuilding = true; - strictDeps = true; - - meta = with lib; { - description = "Command line client for Mega.co.nz"; - homepage = "https://megatools.megous.com/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 93c05481c1a88..4b804d0c58d22 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2024-08-26T10-49-58Z"; + version = "2024-09-16T17-43-14Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-csaG54iwH0q8CHB0FFD0sY063uQ2WSlXDePo6yr5QbI="; + sha256 = "sha256-j9NEeTUP/pkEhywhNasQQzTwUBcUwq+KVEGGB1hzVw0="; }; - vendorHash = "sha256-wjMn9Xi4wd7fa1ay3mLRGl/USWCVtk/J9KiGpfcsRM4="; + vendorHash = "sha256-KNnYxE3kt/eemnhsRf29SZX0Q+ECzdMFVgcmd7uCsyY="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 6942e682a8139..378bab7451663 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { (lib.cmakeBool "UPNPC_BUILD_STATIC" stdenv.hostPlatform.isStatic) ]; - doCheck = !stdenv.isFreeBSD; + doCheck = !stdenv.hostPlatform.isFreeBSD; postInstall = '' mv $out/bin/upnpc-* $out/bin/upnpc diff --git a/pkgs/tools/networking/mole/default.nix b/pkgs/tools/networking/mole/default.nix index e5585be469fcd..dca72a66b1f80 100644 --- a/pkgs/tools/networking/mole/default.nix +++ b/pkgs/tools/networking/mole/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { homepage = "https://github.com/davrodpin/mole"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; # build fails with go > 1.17 + broken = stdenv.hostPlatform.isDarwin; # build fails with go > 1.17 mainProgram = "mole"; }; } diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 92894e5ddf3d9..230122a2574bc 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, zlib, protobuf, ncurses, pkg-config , makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion, fetchpatch -, withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }: +, withUtempter ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl, libutempter }: stdenv.mkDerivation rec { pname = "mosh"; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { especially over Wi-Fi, cellular, and long-distance links. ''; license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ skeuchel ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix deleted file mode 100644 index 0e3d43d191e6c..0000000000000 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ - buildGoModule, - cargo, - cmake, - fetchFromGitHub, - fetchpatch, - go, - lib, - libcap, - libgcrypt, - libgpg-error, - libsecret, - pkg-config, - polkit, - python3, - qt5compat, - qtbase, - qtnetworkauth, - qtsvg, - qttools, - qtwayland, - qtwebsockets, - rustPlatform, - rustc, - stdenv, - wireguard-tools, - wrapQtAppsHook, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "mozillavpn"; - version = "2.23.1"; - src = fetchFromGitHub { - owner = "mozilla-mobile"; - repo = "mozilla-vpn-client"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-NQM1ZII9owD9ek/Leo6WRfvNybZ5pUjDgvQGXQBrD+0="; - }; - patches = [ - # Update cargo deps for "time" - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/31d5799a30fc02067ad31d86b6ef63294bb3c3b8.patch"; - hash = "sha256-ECrIcfhhSuvbqQ/ExPdFkQ6b9Q767lhUKmwPdDz7yxI="; - }) - ]; - - netfilterGoModules = - (buildGoModule { - inherit (finalAttrs) - pname - version - src - patches - ; - modRoot = "linux/netfilter"; - vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; - }).goModules; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) src patches; - hash = "sha256-JIe6FQL0xm6FYYGoIwwnOxq21sC1y8xPsr8tYPF0Mzo="; - }; - - buildInputs = [ - libcap - libgcrypt - libgpg-error - libsecret - qt5compat - qtbase - qtnetworkauth - qtsvg - qtwayland - qtwebsockets - ]; - nativeBuildInputs = [ - cargo - cmake - go - pkg-config - python3 - python3.pkgs.glean-parser - python3.pkgs.pyyaml - python3.pkgs.setuptools - qttools - rustPlatform.cargoSetupHook - rustc - wrapQtAppsHook - ]; - - postPatch = '' - substituteInPlace src/cmake/linux.cmake \ - --replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \ - --replace '/usr/share/dbus-1' "$out/share/dbus-1" \ - --replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" - - substituteInPlace extension/CMakeLists.txt \ - --replace '/etc' "$out/etc" - - ln -s '${finalAttrs.netfilterGoModules}' linux/netfilter/vendor - ''; - - cmakeFlags = [ - "-DQT_LCONVERT_EXECUTABLE=${qttools.dev}/bin/lconvert" - "-DQT_LUPDATE_EXECUTABLE=${qttools.dev}/bin/lupdate" - "-DQT_LRELEASE_EXECUTABLE=${qttools.dev}/bin/lrelease" - ]; - dontFixCmake = true; - - qtWrapperArgs = [ - "--prefix" - "PATH" - ":" - (lib.makeBinPath [ wireguard-tools ]) - ]; - - meta = { - description = "Client for the Mozilla VPN service"; - mainProgram = "mozillavpn"; - homepage = "https://vpn.mozilla.org/"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ andersk ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index 40c6d3ec7827b..800ea3c48f14e 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2i8C1XgfI3MXnwXZzY6n8tIcw45G9h3vZqRlFaVoLH0="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; diff --git a/pkgs/tools/networking/mqttmultimeter/default.nix b/pkgs/tools/networking/mqttmultimeter/default.nix index 1c2c290bef787..1374dbc119dd8 100644 --- a/pkgs/tools/networking/mqttmultimeter/default.nix +++ b/pkgs/tools/networking/mqttmultimeter/default.nix @@ -4,8 +4,6 @@ , dotnet-runtime_8 , buildDotnetModule , fetchFromGitHub -, fontconfig -, xorg , libglvnd , makeDesktopItem , copyDesktopItems @@ -34,7 +32,7 @@ buildDotnetModule rec { copyDesktopItems ]; - buildInputs = [ stdenv.cc.cc.lib fontconfig ]; + buildInputs = [ stdenv.cc.cc.lib ]; postInstall = '' rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*} @@ -42,22 +40,21 @@ buildDotnetModule rec { runtimeDeps = [ libglvnd - xorg.libSM - xorg.libICE - xorg.libX11 ]; - desktopItems = makeDesktopItem { - name = meta.mainProgram; - exec = meta.mainProgram; - icon = meta.mainProgram; - desktopName = meta.mainProgram; - genericName = meta.description; - comment = meta.description; - type = "Application"; - categories = [ "Network" ]; - startupNotify = true; - }; + desktopItems = [ + (makeDesktopItem { + name = meta.mainProgram; + exec = meta.mainProgram; + icon = meta.mainProgram; + desktopName = meta.mainProgram; + genericName = meta.description; + comment = meta.description; + type = "Application"; + categories = [ "Network" ]; + startupNotify = true; + }) + ]; meta = with lib; { mainProgram = builtins.head executables; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index d36dcef4f0804..42b79f978fdfc 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses jansson ] ++ lib.optional withGtk gtk3 - ++ lib.optional stdenv.isLinux libcap; + ++ lib.optional stdenv.hostPlatform.isLinux libcap; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix index ea431c3eea985..66344f42f35ce 100644 --- a/pkgs/tools/networking/mubeng/default.nix +++ b/pkgs/tools/networking/mubeng/default.nix @@ -5,28 +5,28 @@ buildGoModule rec { pname = "mubeng"; - version = "0.14.2"; + version = "0.18.0"; src = fetchFromGitHub { owner = "kitabisa"; - repo = pname; - rev = "v${version}"; - hash = "sha256-MdTgYhHjgDFplh+wcb9QTwzwMZSmF2kqMmu1x8WmOyQ="; + repo = "mubeng"; + rev = "refs/tags/v${version}"; + hash = "sha256-V+0XPuMM2Jg2LEpWzxRNLZ44YRoEnf/Fvbj51p9hwL4="; }; - vendorHash = "sha256-kOLeaEKtpI3l0qLphRTnm27Ms63ID4LJ6VkUHJzGAcc="; + vendorHash = "sha256-TZDQCvcwsCa08bBBb8Zs8W0OFDYb+ZWN85+VCelFgyc="; ldflags = [ "-s" "-w" - "-X ktbs.dev/mubeng/common.Version=${version}" + "-X=ktbs.dev/mubeng/common.Version=${version}" ]; meta = with lib; { description = "Proxy checker and IP rotator"; homepage = "https://github.com/kitabisa/mubeng"; changelog = "https://github.com/kitabisa/mubeng/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "mubeng"; }; diff --git a/pkgs/tools/networking/muffet/default.nix b/pkgs/tools/networking/muffet/default.nix index 070c7fabc1a6d..35cbdfa6bc719 100644 --- a/pkgs/tools/networking/muffet/default.nix +++ b/pkgs/tools/networking/muffet/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "muffet"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; rev = "v${version}"; - hash = "sha256-v4qyVaeqSSG9cmkSGeweZIVv3Dgk/mHHvUpA0Cbio3c="; + hash = "sha256-+g8DXvNWs7tqgxeZl7FWudbZRRx9N4/Cb6jQkuxnI98="; }; - vendorHash = "sha256-UJsncAKtjgF0dn7xAJQdKD8YEIwtFcpYJVWG9b66KRU="; + vendorHash = "sha256-JMQgDG0MQuDJBrcz7uf872bXkz4BM+bC1v/GhkuxeYU="; meta = with lib; { description = "Website link checker which scrapes and inspects all pages in a website recursively"; diff --git a/pkgs/tools/networking/narrowlink/default.nix b/pkgs/tools/networking/narrowlink/default.nix index 142d6a680b704..531b0e7f60c9e 100644 --- a/pkgs/tools/networking/narrowlink/default.nix +++ b/pkgs/tools/networking/narrowlink/default.nix @@ -1,8 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, pkg-config -, openssl , stdenv , darwin }: @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 68bcc62655588..e2924665bd318 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gnutls - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libnl linuxHeaders ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru.tests = { test = nixosTests.nbd; diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index c31e6333b6846..883d2e48afe39 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # gpshare.o:(.bss+0x0): first defined here env.NIX_CFLAGS_COMPILE = toString ([ "-fcommon" ] # these are required for the configure script to work with clang - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-implicit-int" "-Wno-implicit-function-declaration" ]); diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index e5a3837657b17..5619c5b5c37bf 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ] - ++ lib.optional stdenv.isLinux systemd; + ++ lib.optional stdenv.hostPlatform.isLinux systemd; meta = with lib; { description = "Brand new release of the Djbdns"; diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix deleted file mode 100644 index 1cbc6d403a9d6..0000000000000 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, boost -, fetchFromGitHub -, libpcap -, ndn-cxx -, openssl -, pkg-config -, sphinx -, wafHook -}: - -stdenv.mkDerivation rec { - pname = "ndn-tools"; - version = "22.12"; - - src = fetchFromGitHub { - owner = "named-data"; - repo = pname; - rev = "ndn-tools-${version}"; - sha256 = "sha256-28sPgo2nq5AhIzZmvDz38echGPzKDzNm2J6iIao4yL8="; - }; - - # Hacky workaround for new pcap-config. - postPatch = '' - patch -p1 <<EOF - --- a/tools/dump/wscript - +++ b/tools/dump/wscript - @@ -5 +5 @@ - - conf.check_cfg(package='libpcap', uselib_store='PCAP', - + conf.check_cfg(package="", uselib_store='PCAP', - EOF - ''; - - nativeBuildInputs = [ pkg-config sphinx wafHook ]; - buildInputs = [ libpcap ndn-cxx openssl ]; - - wafConfigureFlags = [ - "--boost-includes=${boost.dev}/include" - "--boost-libs=${boost.out}/lib" - "--with-tests" - ]; - - doCheck = false; # some tests fail because of the sandbox environment - checkPhase = '' - runHook preCheck - build/unit-tests - runHook postCheck - ''; - - meta = with lib; { - homepage = "https://named-data.net/"; - description = "Named Data Networking (NDN) Essential Tools"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ bertof ]; - }; -} diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 0f6c0cc8b7542..9c3bf44946663 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nebula"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+RferzOPlx7UuqpckQBY/RDO9gptknhuan+Es0Vf/yM="; + hash = "sha256-Y8BTbvdSJ+xlxHuy0TzQEGiymJzAqlHe3PiXAlUddPs="; }; - vendorHash = "sha256-4BnFvA0dxsEK7ictDUZ6nol6PtM54kk9dwKPTQbRUR0="; + vendorHash = "sha256-oXhq+s5gDKPVClZpOzYi7BaYwcDqbCLBEO5BNGy9LJA="; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index c4bce67ff89d2..31214a2295a7e 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,26 +31,26 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.28.9"; + version = "0.30.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; rev = "v${version}"; - hash = "sha256-SM288I+N645vzGmLO5hfDeFDqSJOe11+0VZVPneagHw="; + hash = "sha256-YtKGiF45fNoiYQFTE3NReUaosRGDJOyjfqtc+tBKopI="; }; - vendorHash = "sha256-UlxylKiszgB2XQ4bZI23/YY/RsFCE7OlHT3DBsRhvCk="; + vendorHash = "sha256-t6kqEmL2lKKYlqxaQ1OsAvB3BSmmyfogghGoE9jw+AI="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; - buildInputs = lib.optionals (stdenv.isLinux && ui) [ + buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && ui) [ gtk3 libayatana-appindicator libX11 libXcursor libXxf86vm - ] ++ lib.optionals (stdenv.isDarwin && ui) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && ui) [ Cocoa IOKit Kernel @@ -88,7 +88,7 @@ buildGoModule rec { --fish <($out/bin/${binary} completion fish) \ --zsh <($out/bin/${binary} completion zsh) '') - modules) + lib.optionalString (stdenv.isLinux && ui) '' + modules) + lib.optionalString (stdenv.hostPlatform.isLinux && ui) '' mkdir -p $out/share/pixmaps cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png @@ -110,7 +110,7 @@ buildGoModule rec { changelog = "https://github.com/netbirdio/netbird/releases/tag/v${version}"; description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls"; license = licenses.bsd3; - maintainers = with maintainers; [ misuzu vrifox ]; + maintainers = with maintainers; [ vrifox saturn745 ]; mainProgram = "netbird"; }; } diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 3f561716ede67..ec82ec16915ff 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "nc"; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix index 5939c752dbde7..c9b359cb3a2e4 100644 --- a/pkgs/tools/networking/netmask/default.nix +++ b/pkgs/tools/networking/netmask/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tlby/netmask"; description = "IP address formatting tool"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.jensbin ]; mainProgram = "netmask"; }; diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 8f18bfd3cdaac..fbc7ec0857b58 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -60,11 +60,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.48.8"; + version = "1.48.10"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - hash = "sha256-YgDqyPHT/mo+ofLEFYs8lbO5+R50zXBOl7CwUbWlSHg="; + hash = "sha256-XcGI/f/PLSPInTSx5jGaayAgPhLq7CSzADe36orIxhM="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix index 8e39737532d2a..c0e0a9d348206 100644 --- a/pkgs/tools/networking/nexttrace/default.nix +++ b/pkgs/tools/networking/nexttrace/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-Hws8bq2NVBBS3ngzCT5mPNThHDOK5waX4TxK4zlsNC0="; + sha256 = "sha256-LUIKVMI8ljPzAmrq3jYQ+ZDCGs2p+7EO8ECp1A1osUk="; }; - vendorHash = "sha256-DHGPWHOEobBqb2QpUh7WAEViOQKQ8+8PDLPBi812H+k="; + vendorHash = "sha256-1zjXy6x/IzBY7MrtAtynmoneEpjAnYv/H5IsMZtRQAo="; doCheck = false; # Tests require a network connection. diff --git a/pkgs/tools/networking/notemap/default.nix b/pkgs/tools/networking/notemap/default.nix index 726b24469ab5c..0611665d6618a 100644 --- a/pkgs/tools/networking/notemap/default.nix +++ b/pkgs/tools/networking/notemap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libressl - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ]; diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 134c6f657547e..04f5648dd317e 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -5,7 +5,6 @@ curl, expat, fetchFromGitHub, - fetchpatch, git, json_c, libcap, diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 1ba389e38c02b..2321455b8bbb2 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" "--with-yielding-select=yes" - ] ++ lib.optional stdenv.isLinux "--enable-linuxcaps"; + ] ++ lib.optional stdenv.hostPlatform.isLinux "--enable-linuxcaps"; buildInputs = [ openssl perl ] - ++ lib.optionals stdenv.isLinux [ pps-tools libcap ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pps-tools libcap ]; hardeningEnable = [ "pie" ]; diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix index ffc4aad9e6cdb..9cbd1e9f56ffe 100644 --- a/pkgs/tools/networking/oapi-codegen/default.nix +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "2.3.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Gcl0i3K2ncrxMSLHCPWBleRGdVIVkUo7vcp+tDNpkOw="; + hash = "sha256-21VhHSyfF+NHkXlr2svjwBNZmfS1O448POBP9XUQxak="; } ; - vendorHash = "sha256-urPMLEaisgndbHmS1sGQ07c+VRBdxIz0wseLoSLVWQo="; + vendorHash = "sha256-bp5sFZNJFQonwfF1RjCnOMKZQkofHuqG0bXdG5Hf3jU="; # Tests use network doCheck = false; diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index a6d8affd4dc51..30b774b8f72f2 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -13,7 +13,7 @@ let pname = "ockam"; - version = "0.132.0"; + version = "0.134.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -22,13 +22,13 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - hash = "sha256-ynlXQoOTvfSWCL1BqvIjJYYUDGmjDa0HaN3L8I6p/7Q="; + hash = "sha256-6HZI0Gsxn3GmklHl9zJ6yY73FlqcLiyMAqJg8BBmzqg="; }; - cargoHash = "sha256-yOSCkOIprQoAGxPi1jsHPmQ9bVaudSNw13jL4jTNehY="; + cargoHash = "sha256-VZt7tDewvz7eGpAKzD8pYOnH/3BtH6cULp6uX7CPxX8="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] - ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Security ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/tools/networking/octodns/default.nix b/pkgs/tools/networking/octodns/default.nix index f298e7f4f75e4..42c8acf5618ec 100644 --- a/pkgs/tools/networking/octodns/default.nix +++ b/pkgs/tools/networking/octodns/default.nix @@ -1,22 +1,23 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools -, pytestCheckHook -, dnspython -, fqdn -, idna -, natsort -, python-dateutil -, pyyaml -, python -, runCommand +{ + lib, + buildPythonPackage, + dnspython, + fetchFromGitHub, + fqdn, + idna, + natsort, + pytestCheckHook, + python-dateutil, + python3, + pythonOlder, + pyyaml, + runCommand, + setuptools, }: buildPythonPackage rec { pname = "octodns"; - version = "1.4.0"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,15 +25,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "octodns"; repo = "octodns"; - rev = "v${version}"; - hash = "sha256-l4JGodbUmFxHFeEaxgClEozHcbyYP0F2yj5gDqV88IA="; + rev = "refs/tags/v${version}"; + hash = "sha256-5EKa5G1rX/BRMMpGd861qTaACa2tBgNrKX52uJPV+N8="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ dnspython fqdn idna @@ -47,18 +48,21 @@ buildPythonPackage rec { pythonImportsCheck = [ "octodns" ]; - passthru.withProviders = ps: let - pyEnv = python.withPackages ps; - in runCommand "octodns-with-providers" { } '' - mkdir -p $out/bin - ln -st $out/bin ${pyEnv}/bin/octodns-* - ''; + passthru.withProviders = + ps: + let + pyEnv = python3.withPackages ps; + in + runCommand "octodns-with-providers" { } '' + mkdir -p $out/bin + ln -st $out/bin ${pyEnv}/bin/octodns-* + ''; meta = with lib; { description = "Tools for managing DNS across multiple providers"; homepage = "https://github.com/octodns/octodns"; changelog = "https://github.com/octodns/octodns/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.anthonyroussel ]; }; } diff --git a/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/pkgs/tools/networking/octodns/providers/powerdns/default.nix index d1c39b628da1e..8278e6ea85371 100644 --- a/pkgs/tools/networking/octodns/providers/powerdns/default.nix +++ b/pkgs/tools/networking/octodns/providers/powerdns/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "octodns-powerdns"; - version = "0.0.5"; + version = "0.0.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,15 +19,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "octodns"; repo = "octodns-powerdns"; - rev = "v${version}"; - hash = "sha256-jt0+JnpCgvsoqMcC9mANX7uq2WPTiI2JQjwQi7LGWj0="; + rev = "refs/tags/v${version}"; + hash = "sha256-wa/SHyTfj+iHnTq8t+3yzyGn+YULOdI88Aii16qPwPM="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ octodns requests ]; diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index 71bc431354551..efd8fe7534ac9 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ks7n/x3RhjQbITL2hxiFkjxpZ5tcYMUyyfR/T7Kq/uU="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/networking/onetun/default.nix b/pkgs/tools/networking/onetun/default.nix index 4bc18cee4662e..61f2ce7f3f45e 100644 --- a/pkgs/tools/networking/onetun/default.nix +++ b/pkgs/tools/networking/onetun/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-TRfr4riMzR/MbsV2RiQNlPoPLhHK5EScNBCeyyamfgE="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index f89c284a2c763..995637e61d1d8 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation (finalAttrs: { - version = "7.7.0"; + version = "7.8.0"; pname = "openapi-generator-cli"; jarfilename = "openapi-generator-cli-${finalAttrs.version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://maven/org/openapitools/openapi-generator-cli/${finalAttrs.version}/${finalAttrs.jarfilename}"; - sha256 = "sha256-OnVydsMdJJpPBqFGUbH/Hxpc9G4RCnCtzEpqKDT4VWE="; + sha256 = "sha256-0Yec9C2jH4z2HPaHmLjvJBivDGvZOlwYcOH/VD+7k2U="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix index 0dccb0e92fff2..82040f64a8977 100644 --- a/pkgs/tools/networking/openconnect/common.nix +++ b/pkgs/tools/networking/openconnect/common.nix @@ -16,7 +16,7 @@ , pcsclite , vpnc-scripts , PCSC -, useDefaultExternalBrowser ? stdenv.isLinux && stdenv.buildPlatform == stdenv.hostPlatform # xdg-utils doesn't cross-compile +, useDefaultExternalBrowser ? stdenv.hostPlatform.isLinux && stdenv.buildPlatform == stdenv.hostPlatform # xdg-utils doesn't cross-compile , xdg-utils , autoreconfHook }: @@ -34,8 +34,8 @@ stdenv.mkDerivation { ]; buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ] - ++ lib.optional stdenv.isDarwin PCSC - ++ lib.optionals stdenv.isLinux [ p11-kit pcsclite ] + ++ lib.optional stdenv.hostPlatform.isDarwin PCSC + ++ lib.optionals stdenv.hostPlatform.isLinux [ p11-kit pcsclite ] ++ lib.optional useDefaultExternalBrowser xdg-utils; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 91ec26c96a612..5d416e01601f1 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -7,7 +7,7 @@ , ppp , systemd , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, withPpp ? stdenv.isLinux +, withPpp ? stdenv.hostPlatform.isLinux }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 496ea270c81e3..c1cf38dfa87e5 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" ++ lib.optional withFIDO "--with-security-key-builtin=yes" ++ lib.optional withKerberos (assert krb5 != null; "--with-kerberos5=${lib.getDev krb5}") - ++ lib.optional stdenv.isDarwin "--disable-libutil" + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-libutil" ++ lib.optional (!linkOpenssl) "--without-openssl" ++ lib.optional withLdns "--with-ldns" ++ extraConfigureFlags; @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; enableParallelChecking = false; - nativeCheckInputs = [ openssl ] ++ lib.optional (!stdenv.isDarwin) hostname; + nativeCheckInputs = [ openssl ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) hostname; preCheck = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # construct a dummy HOME export HOME=$(realpath ../dummy-home) @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { # integration tests hard to get working on darwin with its shaky # sandbox # t-exec tests fail on musl - checkTarget = lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "t-exec" + checkTarget = lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) "t-exec" # other tests are less demanding of the environment ++ [ "unit" "file-tests" "interop-tests" ]; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index d4035df7ce7a2..c7fa7a222f83e 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ lz4 lzo openssl ] - ++ optionals stdenv.isLinux [ libcap_ng libnl pam ] + ++ optionals stdenv.hostPlatform.isLinux [ libcap_ng libnl pam ] ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper; configureFlags = optional useSystemd "--enable-systemd" ++ optional pkcs11Support "--enable-pkcs11" - ++ optional stdenv.isDarwin "--disable-plugin-auth-pam"; + ++ optional stdenv.hostPlatform.isDarwin "--disable-plugin-auth-pam"; # We used to vendor the update-systemd-resolved script inside libexec, # but a separate package was made, that uses libexec/openvpn. Copy it diff --git a/pkgs/tools/networking/openvpn3/default.nix b/pkgs/tools/networking/openvpn3/default.nix index 5ab94c798f4f1..9473277d291fd 100644 --- a/pkgs/tools/networking/openvpn3/default.nix +++ b/pkgs/tools/networking/openvpn3/default.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { description = "OpenVPN 3 Linux client"; license = licenses.agpl3Plus; homepage = "https://github.com/OpenVPN/openvpn3-linux/"; - maintainers = with maintainers; [ shamilton kfears ]; + maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index d5446fedb5503..608ce21c99976 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = platforms.unix; # Undefined symbols for architecture arm64: "_FSFindFolder" - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix index 26001c37e982d..4a09295b79bf5 100644 --- a/pkgs/tools/networking/pdnsd/default.nix +++ b/pkgs/tools/networking/pdnsd/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = # fix build with linux headers >= 5.13 - lib.optional stdenv.isLinux + lib.optional stdenv.hostPlatform.isLinux (fetchpatch { name = "fix-build-linux-headers-gte-5.13.patch"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-dns/pdnsd/files/pdnsd-1.2.9a-linux-5.13_build_fix.patch?id=7ce35657f269c3b7016e8940ad36e59cf06e12a4"; diff --git a/pkgs/tools/networking/phantomsocks/default.nix b/pkgs/tools/networking/phantomsocks/default.nix index bb8aad8740df8..1a720efb9381b 100644 --- a/pkgs/tools/networking/phantomsocks/default.nix +++ b/pkgs/tools/networking/phantomsocks/default.nix @@ -4,8 +4,8 @@ , stdenv , libpcap # Cann't be build with both pcap and rawsocket tags -, withPcap ? (!stdenv.isLinux && !withRawsocket) -, withRawsocket ? (stdenv.isLinux && !withPcap) +, withPcap ? (!stdenv.hostPlatform.isLinux && !withRawsocket) +, withRawsocket ? (stdenv.hostPlatform.isLinux && !withPcap) }: buildGoModule rec { diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index f4bb164939019..ac84016c4abc7 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lintl"; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix index 542339b05dbbf..3cd43ec9a873c 100644 --- a/pkgs/tools/networking/pmacct/default.nix +++ b/pkgs/tools/networking/pmacct/default.nix @@ -14,17 +14,16 @@ , withMysql ? true, libmysqlclient, zlib, numactl , gnutlsSupport ? false, gnutls , testers -, pmacct }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.7.9"; pname = "pmacct"; src = fetchFromGitHub { owner = "pmacct"; repo = "pmacct"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-3gV6GUhTQnH09NRIJQI0xBn05Bgo3AJsE2cSxNPXITo="; }; @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optional gnutlsSupport "--enable-gnutls"; passthru.tests = { - version = testers.testVersion { package = pmacct; command = "pmacct -V"; }; + version = testers.testVersion { package = finalAttrs.finalPackage; command = "pmacct -V"; }; }; meta = with lib; { @@ -70,4 +69,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix index 3b8b80ffe3cc0..5359195631588 100644 --- a/pkgs/tools/networking/pritunl-client/default.nix +++ b/pkgs/tools/networking/pritunl-client/default.nix @@ -16,12 +16,12 @@ , openvpn , electron }: let - version = "1.3.3785.81"; + version = "1.3.4026.10"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-0tlWX9vHiFHewiisI8lwsQdHyEhntu+x415hfbymhIo="; + sha256 = "sha256-3P2MEQy9RE2dY7aRCGQl+kmVIaRZp6VvrcHQUzhiAEY="; }; cli = buildGoModule { @@ -29,7 +29,7 @@ inherit version src; modRoot = "cli"; - vendorHash = "sha256-1sAJbEZHagG6hnZBkb6EbQpSdNmTyTWfKpbektXSWYU="; + vendorHash = "sha256-wwPgyIo14zpA+oCJH0CQ4+7zyP+Itxbd6S0P7t01wBw="; postInstall = '' mv $out/bin/cli $out/bin/pritunl-client @@ -41,14 +41,14 @@ inherit version src; modRoot = "service"; - vendorHash = "sha256-QvuEQX1+sJOGB1AJNhnM3pVPxGmizDu8EN1yRspXjhU="; + vendorHash = "sha256-uy8+R4l3e4YAWMxWWbVHhkwxvbOsY5PF7fs1dVyMIAg="; nativeBuildInputs = [ makeWrapper ]; postPatch = '' sed -Ei service/profile/scripts.go \ -e 's|#!\s*(/usr)?/bin/(env )?bash\b|#! ${runtimeShell}|g' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' sed -Ei service/profile/scripts.go \ -e 's|(/usr)?/s?bin/busctl\b|busctl|g' \ -e 's|(/usr)?/s?bin/resolvectl\b|resolvectl|g' \ @@ -57,7 +57,7 @@ postInstall = '' mv $out/bin/service $out/bin/pritunl-client-service - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/lib/systemd/system/ cp $src/resources_linux/pritunl-client.service $out/lib/systemd/system/ substituteInPlace $out/lib/systemd/system/pritunl-client.service \ @@ -70,7 +70,7 @@ which gnused gnugrep - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openresolv systemd iproute2 @@ -83,7 +83,7 @@ --prefix PATH : ${lib.makeBinPath hookScriptsDeps} \ --add-flags "--setenv PATH \$PATH" ''; - in lib.optionalString stdenv.isLinux '' + in lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/pritunl-client-service \ --prefix PATH : "${lib.makeBinPath ([ openvpn-wrapped ])}" ''; @@ -113,7 +113,7 @@ in stdenv.mkDerivation { makeWrapper ${electron}/bin/electron $out/bin/pritunl-client-electron \ --add-flags $out/lib/pritunl_client_electron - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/lib/systemd/system/ ln -s ${service}/lib/systemd/system/pritunl-client.service $out/lib/systemd/system/ diff --git a/pkgs/tools/networking/pritunl-ssh/default.nix b/pkgs/tools/networking/pritunl-ssh/default.nix index 06cfc4d1a4ceb..75440cc5e06cb 100644 --- a/pkgs/tools/networking/pritunl-ssh/default.nix +++ b/pkgs/tools/networking/pritunl-ssh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pritunl-ssh"; - version = "1.0.2435.24"; + version = "1.0.3231.6"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-zero-client"; rev = version; - sha256 = "sha256-ElnBNVrC4tQLYXhz2d+NMqKdUVx/hgnW3xJ0USKEfVI="; + sha256 = "sha256-kccc8ZDh3S/Ko/MaBd5u0UxMNIbg5dhvRuecJuE3D6c="; }; buildInputs = [ python3 ]; diff --git a/pkgs/tools/networking/qcal/default.nix b/pkgs/tools/networking/qcal/default.nix index 12543a42dacb3..9900f38faa05e 100644 --- a/pkgs/tools/networking/qcal/default.nix +++ b/pkgs/tools/networking/qcal/default.nix @@ -29,6 +29,7 @@ buildGoModule rec { meta = with lib; { description = "CLI calendar application for CalDAV servers written in Go"; homepage = "https://git.sr.ht/~psic4t/qcal"; + changelog = "https://git.sr.ht/~psic4t/qcal/refs/${version}"; license = licenses.gpl3; mainProgram = "qcal"; maintainers = with maintainers; [ antonmosich ]; diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix deleted file mode 100644 index c9b463d252989..0000000000000 --- a/pkgs/tools/networking/qrcp/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -buildGoModule rec { - pname = "qrcp"; - version = "0.11.2"; - - src = fetchFromGitHub { - owner = "claudiodangelis"; - repo = "qrcp"; - rev = version; - hash = "sha256-BuZn+7gTjsHTUDu33JXTrntb5LUzcq3ZsmgFg+6ivZg="; - }; - - vendorHash = "sha256-lqGPPyoSO12MyeYIuYcqDVHukj7oR3zmHgsS6SxY3yo="; - - subPackages = [ "." ]; - - nativeBuildInputs = [ - installShellFiles - ]; - - postInstall = '' - installShellCompletion --cmd qrcp \ - --bash <($out/bin/qrcp completion bash) \ - --fish <($out/bin/qrcp completion fish) \ - --zsh <($out/bin/qrcp completion zsh) - ''; - - meta = with lib; { - homepage = "https://claudiodangelis.com/qrcp/"; - description = "Transfer files over wifi by scanning a QR code from your terminal"; - longDescription = '' - qrcp binds a web server to the address of your Wi-Fi network - interface on a random port and creates a handler for it. The default - handler serves the content and exits the program when the transfer is - complete. - ''; - license = licenses.mit; - maintainers = with maintainers; [ fgaz ]; - mainProgram = "qrcp"; - }; -} diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index 2c28e3665698a..2dcb9b21b623a 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { passthru.tests.quicktun = nixosTests.quicktun; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Very simple, yet secure VPN software"; homepage = "http://wiki.ucis.nl/QuickTun"; maintainers = with maintainers; [ h7x4 ]; diff --git a/pkgs/tools/networking/rabtap/default.nix b/pkgs/tools/networking/rabtap/default.nix index fc2d07504e7e7..05f552ea16e66 100644 --- a/pkgs/tools/networking/rabtap/default.nix +++ b/pkgs/tools/networking/rabtap/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rabtap"; - version = "1.39.3"; + version = "1.43"; src = fetchFromGitHub { owner = "jandelgado"; repo = "rabtap"; rev = "v${version}"; - sha256 = "sha256-5SX6Ma8AMpm642vCGUR1HI6fkKBui16sf7Fm0IpPK6M="; + sha256 = "sha256-OUpDk6nfVbz/KP7vZeZV2JfbCzh/KcuxG015/uxYuEI="; }; - vendorHash = "sha256-wZOkQjSPMZW3+ohZb+MlBWNU3WTL4/lqggAOJLrYFHc="; + vendorHash = "sha256-V7AkqmEbwuW2Ni9b00Zd22ugk9ScGWf5wauHcQwG7b0="; meta = with lib; { description = "RabbitMQ wire tap and swiss army knife"; diff --git a/pkgs/tools/networking/restish/default.nix b/pkgs/tools/networking/restish/default.nix index f8a1cfd466eaa..a1fd639b72c1c 100644 --- a/pkgs/tools/networking/restish/default.nix +++ b/pkgs/tools/networking/restish/default.nix @@ -21,10 +21,10 @@ buildGoModule rec { vendorHash = "sha256-qeArar0WnMACUnKBlC+PcFeJPzofwbK440A4M/rQ04U="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Kernel - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 xorg.libXcursor xorg.libXi diff --git a/pkgs/tools/networking/rewrk/default.nix b/pkgs/tools/networking/rewrk/default.nix index a76d666117732..c4f4755f4b5be 100644 --- a/pkgs/tools/networking/rewrk/default.nix +++ b/pkgs/tools/networking/rewrk/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/networking/rustcat/default.nix b/pkgs/tools/networking/rustcat/default.nix index 9848dbdd17b12..dba12bf58ac46 100644 --- a/pkgs/tools/networking/rustcat/default.nix +++ b/pkgs/tools/networking/rustcat/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Port listener and reverse shell"; diff --git a/pkgs/tools/networking/s3rs/default.nix b/pkgs/tools/networking/s3rs/default.nix index ec4725e9f2d0c..ad343c00ca600 100644 --- a/pkgs/tools/networking/s3rs/default.nix +++ b/pkgs/tools/networking/s3rs/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "S3 cli client with multi configs with diffent provider"; diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index 158cac0a734bd..80349b1704841 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { version = "1.3.8rc1"; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; src = fetchFromGitHub { owner = "sleinen"; diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 7a82ea8ac5244..18c7ca632d0b1 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,21 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.20.3"; + version = "1.21.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - hash = "sha256-TVD6yI/I6R2sZGdyE0JsbuN9u5e23MRQCsKpi85JEGM="; + hash = "sha256-B4RufyxqcKd5FJulKRV+33sos+cYrL2/QPmKEYw3aTU="; }; - cargoHash = "sha256-4OXue0KsGxc0EOLRTdr9uTA5t1dl09YJKvavezJ/mxM="; + cargoHash = "sha256-2uYLrYFuzvaOZxw2hN4DcrEbwW5rnXxqKoI2q6yZaGU="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ]; buildFeatures = [ "trust-dns" diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 6a1ce2f4a028a..b26b21146175d 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hash = "sha256-MJ1Ym/yBm28V0uXoWRs8DG9pNiT1Bg7qwGek2ad1fek="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isLinux [ + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux [ "-lgcc_s" ]; diff --git a/pkgs/tools/networking/simple-dlna-browser/default.nix b/pkgs/tools/networking/simple-dlna-browser/default.nix index ae6ccc4a4aaa0..1ae74f90761ce 100644 --- a/pkgs/tools/networking/simple-dlna-browser/default.nix +++ b/pkgs/tools/networking/simple-dlna-browser/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/javier-lopez/learn/blob/master/sh/tools/simple-dlna-browser"; license = lib.licenses.fair; - maintainers = with lib.maintainers; [ loveisgrief ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index d654b75e4990e..8d034c1d118cb 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.9.4"; + version = "1.9.6"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-+BQWmb09kCAjJioutD9xOWxQoZtBrTJFp0yAun/nDCc="; + hash = "sha256-A9FfATNCS3UaW6YLORIApsgj0VK2jPyg+Ha2gcq6Keo="; }; - vendorHash = "sha256-LCA59LijHLpM1bo4/yuFGrnk0g9DSXEZwmBUspGylV8="; + vendorHash = "sha256-/lp+3mPkGMABpvnxqpuC/7NiKrmcEWYQ80Wb7Ng1eBI="; tags = [ "with_quic" diff --git a/pkgs/tools/networking/slowlorust/default.nix b/pkgs/tools/networking/slowlorust/default.nix index c48257130b2d6..d5e924d10272b 100644 --- a/pkgs/tools/networking/slowlorust/default.nix +++ b/pkgs/tools/networking/slowlorust/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Wu1mm+yJw2SddddxC5NfnMWLr+dplnRxH3AJ1/mTAKM="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 2cb9f3b62a929..0c0b009cc7a86 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snabb"; - version = "2024.06"; + version = "2024.08"; src = fetchFromGitHub { owner = "snabbco"; repo = "snabb"; rev = "v${version}"; - sha256 = "sha256-iCW0oEbLLqRKaxqxhSDsmRnI5YTi4HYcg+IWRAbt9WI="; + sha256 = "sha256-2ULkzNeyEkXFdd8BUEcY5wZswh8Z4s4ONqSQbeWK2Qs="; }; installPhase = '' diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 138f8f7489a1a..ce8b5f32ecc0a 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "socat"; - version = "1.8.0.0"; + version = "1.8.0.1"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2"; - hash = "sha256-4d5oPdIu4OOmxrv/Jpq+GKsMnX62UCBPElFVuQBfrKc="; + hash = "sha256-aig1Zdt8+GKSxvcFBMWKuwPimIit7tWmxfNFfoA8G4E="; }; postPatch = '' diff --git a/pkgs/tools/networking/sockperf/default.nix b/pkgs/tools/networking/sockperf/default.nix index ed071322f2f88..6181138a7b6df 100644 --- a/pkgs/tools/networking/sockperf/default.nix +++ b/pkgs/tools/networking/sockperf/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Network Benchmarking Utility"; homepage = "https://github.com/Mellanox/sockperf"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/tools/networking/speedtest-go/default.nix index e81dfe4fa8e63..316752d3b1fef 100644 --- a/pkgs/tools/networking/speedtest-go/default.nix +++ b/pkgs/tools/networking/speedtest-go/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "speedtest-go"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ggctB1zZ3YFArWhKCvXho8mVcDe0R3Br3uq2zU6sEYc="; + hash = "sha256-SFdUl06lCf+ObPZanEwvD2rSzPM0ia2J/XSuel5XGqg="; }; vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; diff --git a/pkgs/tools/networking/speedtest-rs/default.nix b/pkgs/tools/networking/speedtest-rs/default.nix index b70aaa95aa5bf..322d735e645ad 100644 --- a/pkgs/tools/networking/speedtest-rs/default.nix +++ b/pkgs/tools/networking/speedtest-rs/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-0YPCBzidE1+LgIYk457eSoerLvQuuZs9cTd7uUt1Lr8="; # Fail for unclear reasons (only on darwin) - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=speedtest::tests::test_get_configuration" "--skip=speedtest::tests::test_get_server_list_with_config" ]; diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index bf969ae5d1f51..c022aad782380 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://www.caida.org/projects/spoofer"; description = "Assess and report on deployment of source address validation"; diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index a8d6a33ac3d17..d54d4d79017ab 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.bsd3; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; mainProgram = "srelay"; }; } diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 8aaebd710e102..9972af91f1f95 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { buildInputs = [ curl gmp python3 ldns unbound openssl pcsclite ] ++ lib.optionals enableTNC [ trousers sqlite libxml2 ] - ++ lib.optionals stdenv.isLinux [ systemd.dev pam iptables ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]) + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd.dev pam iptables ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]) ++ lib.optionals enableNetworkManager [ networkmanager glib ]; patches = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ./updown-path.patch ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' # glibc-2.26 reorganized internal includes sed '1i#include <stdint.h>' -i src/libstrongswan/utils/utils/memory.h @@ -60,14 +60,14 @@ stdenv.mkDerivation rec { "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" "--enable-chapoly" "--enable-curl" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-farp" "--enable-dhcp" "--enable-systemd" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--enable-xauth-pam" "--enable-forecast" "--enable-connmark" "--enable-af-alg" ] - ++ lib.optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") "--enable-padlock" ++ lib.optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { "--enable-nm" "--with-nm-ca-dir=/etc/ssl/certs" ] # Taken from: https://wiki.strongswan.org/projects/strongswan/wiki/MacOSX - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-systemd" "--disable-xauth-pam" "--disable-kernel-netlink" diff --git a/pkgs/tools/networking/suckit/default.nix b/pkgs/tools/networking/suckit/default.nix index c62ad29e0113f..07c91a9081c28 100644 --- a/pkgs/tools/networking/suckit/default.nix +++ b/pkgs/tools/networking/suckit/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; # requires internet access checkFlags = [ diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix index fdff493abd909..1d5fbf4c341cf 100644 --- a/pkgs/tools/networking/termscp/default.nix +++ b/pkgs/tools/networking/termscp/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { dbus openssl samba - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-framework" "AppKit" ]); diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 1399750f47323..647bc18e27b24 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.92"; + version = "1.0.93"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Axx9D4BIg68R9bDDNyIGw8n91Jg1YJ/zN1rE6aeMZcs="; + hash = "sha256-0Yfah8VxmbBe1J1OMhG6kyHlGBBAed8F9uStjMs6S2E="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-Wno-error=maybe-uninitialized" ]; - hardeningDisable = lib.optionals stdenv.isAarch64 [ + hardeningDisable = lib.optionals stdenv.hostPlatform.isAarch64 [ # error: 'read' writing 1 byte into a region of size 0 overflows the destination "fortify3" ]; diff --git a/pkgs/tools/networking/toxvpn/bootstrap.json b/pkgs/tools/networking/toxvpn/bootstrap.json new file mode 100644 index 0000000000000..bb983c64ffd69 --- /dev/null +++ b/pkgs/tools/networking/toxvpn/bootstrap.json @@ -0,0 +1 @@ +{"last_scan":1724191272,"last_refresh":1724191153,"nodes":[{"ipv4":"144.217.167.73","ipv6":"-","port":33445,"tcp_ports":[33445,3389],"public_key":"7E5668E0EE09E19F320AD47902419331FFEE147BB3606769CFBE921A2A2FD34C","maintainer":"velusip","location":"CA","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"Jera","last_ping":1724191272},{"ipv4":"tox.abilinski.com","ipv6":"-","port":33445,"tcp_ports":[33445],"public_key":"10C00EB250C3233E343E2AEBA07115A5C28920E9C8D29492F6D00B29049EDC7E","maintainer":"AnthonyBilinski","location":"CA","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"Running https://github.com/toktok/c-toxcore v0.2.13. qTox best Tox! Contact: AC18841E56CCDEE16E93E10E6AB2765BE54277D67F1372921B5B418A6B330D3D3FAFA60B0931","last_ping":1724191272},{"ipv4":"tox.kurnevsky.net","ipv6":"tox.kurnevsky.net","port":33445,"tcp_ports":[],"public_key":"82EF82BA33445A1F91A7DB27189ECFC0C013E06E3DA71F588ED692BED625EC23","maintainer":"kurnevsky","location":"NL","status_udp":true,"status_tcp":false,"version":"3000002000","motd":"Hi from tox-rs!","last_ping":1724191272},{"ipv4":"205.185.115.131","ipv6":"-","port":53,"tcp_ports":[53,443,33445,3389],"public_key":"3091C6BEB2A993F1C6300C16549FABA67098FF3D62C6D253828B531470B53D68","maintainer":"GDR!","location":"US","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"https://gdr.name/tuntox/","last_ping":1724191272},{"ipv4":"tox2.abilinski.com","ipv6":"tox2.abilinski.com","port":33445,"tcp_ports":[33445],"public_key":"7A6098B590BDC73F9723FC59F82B3F9085A64D1B213AAF8E610FD351930D052D","maintainer":"AnthonyBilinski","location":"US","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"Running https://github.com/toktok/c-toxcore v0.2.13. qTox best Tox! Contact: AC18841E56CCDEE16E93E10E6AB2765BE54277D67F1372921B5B418A6B330D3D3FAFA60B0931","last_ping":1724191272},{"ipv4":"tox1.mf-net.eu","ipv6":"tox1.mf-net.eu","port":33445,"tcp_ports":[33445,3389],"public_key":"B3E5FA80DC8EBD1149AD2AB35ED8B85BD546DEDE261CA593234C619249419506","maintainer":"2mf","location":"DE","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"tox-bootstrapd","last_ping":1724191274},{"ipv4":"tox4.plastiras.org","ipv6":"-","port":33445,"tcp_ports":[3389,443,33445],"public_key":"836D1DA2BE12FE0E669334E437BE3FB02806F1528C2B2782113E0910C7711409","maintainer":"Tha_14","location":"MD","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"Add me on Tox: F0AA7C8C55552E8593B2B77AC6FCA598A40D1F5F52A26C2322690A4BF1DFCB0DD8AEDD2822FF","last_ping":1724191272},{"ipv4":"188.225.9.167","ipv6":"209:dead:ded:4991:49f3:b6c0:9869:3019","port":33445,"tcp_ports":[33445,3389],"public_key":"1911341A83E02503AB1FD6561BD64AF3A9D6C3F12B5FBB656976B2E678644A67","maintainer":"Nikat","location":"RU","status_udp":true,"status_tcp":true,"version":"1000002013","motd":"First yggdrasil tox bootstrapd!!!\nYou can read about it here: https://yggdrasil-network.github.io/","last_ping":1724191273},{"ipv4":"3.0.24.15","ipv6":"-","port":33445,"tcp_ports":[33445],"public_key":"E20ABCF38CDBFFD7D04B29C956B33F7B27A3BB7AF0618101617B036E4AEA402D","maintainer":"Hardy","location":"SG","status_udp":true,"status_tcp":true,"version":"1000002013","motd":"tox-bootstrapd","last_ping":1724191274},{"ipv4":"tox3.plastiras.org","ipv6":"tox3.plastiras.org","port":33445,"tcp_ports":[33445],"public_key":"4B031C96673B6FF123269FF18F2847E1909A8A04642BBECD0189AC8AEEADAF64","maintainer":"Tha_14","location":"DE","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"Add me on Tox: F0AA7C8C55552E8593B2B77AC6FCA598A40D1F5F52A26C2322690A4BF1DFCB0DD8AEDD2822FF","last_ping":1724191274},{"ipv4":"104.225.141.59","ipv6":"-","port":43334,"tcp_ports":[33445,3389],"public_key":"933BA20B2E258B4C0D475B6DECE90C7E827FE83EFA9655414E7841251B19A72C","maintainer":"Gabe","location":"US","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"True peace is in Jesus Matt 11:28-30 Tox ID: CD9E37503A5B2DFB41947B9A0E4B921381340B49FC318FEB07250789C715DA3470885905869F matt2446.us","last_ping":1724191274},{"ipv4":"139.162.110.188","ipv6":"2400:8902::f03c:93ff:fe69:bf77","port":33445,"tcp_ports":[33445,3389,443],"public_key":"F76A11284547163889DDC89A7738CF271797BF5E5E220643E97AD3C7E7903D55","maintainer":"ToxTom","location":"CA","status_udp":true,"status_tcp":true,"version":"1000002013","motd":"ToxTom","last_ping":1724191272},{"ipv4":"tox2.mf-net.eu","ipv6":"tox2.mf-net.eu","port":33445,"tcp_ports":[3389,33445],"public_key":"70EA214FDE161E7432530605213F18F7427DC773E276B3E317A07531F548545F","maintainer":"2mf","location":"DE","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"tox-bootstrapd","last_ping":1724191274},{"ipv4":"172.105.109.31","ipv6":"2600:3c04::f03c:92ff:fe30:5df","port":33445,"tcp_ports":[33445],"public_key":"D46E97CF995DC1820B92B7D899E152A217D36ABE22730FEA4B6BF1BFC06C617C","maintainer":"amr","location":"CA","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"FrozenDev Node: tox-bootstrapd Add me on tox: A625D9E9EAAA7B40C399F50BA8B255836EE5A09B6DD0C54CF0E190E24544DC39237D6389FAED","last_ping":1724191274},{"ipv4":"91.146.66.26","ipv6":"-","port":33445,"tcp_ports":[],"public_key":"B5E7DAC610DBDE55F359C7F8690B294C8E4FCEC4385DE9525DBFA5523EAD9D53","maintainer":"Toxdaemon","location":"EE","status_udp":true,"status_tcp":false,"version":"1000002013","motd":"tox-bootstrapd 91.146.66.26","last_ping":1724191272},{"ipv4":"tox2.plastiras.org","ipv6":"tox2.plastiras.org","port":33445,"tcp_ports":[33445,3389],"public_key":"B6626D386BE7E3ACA107B46F48A5C4D522D29281750D44A0CBA6A2721E79C951","maintainer":"Tha_14","location":"DE","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"Add me on Tox: F0AA7C8C55552E8593B2B77AC6FCA598A40D1F5F52A26C2322690A4BF1DFCB0DD8AEDD2822FF","last_ping":1724191272},{"ipv4":"172.104.215.182","ipv6":"2600:3c03::f03c:93ff:fe7f:6096","port":33445,"tcp_ports":[33445,3389,443],"public_key":"DA2BD927E01CD05EBCC2574EBE5BEBB10FF59AE0B2105A7D1E2B40E49BB20239","maintainer":"zero-one","location":"US","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"tox-bootstrapd","last_ping":1724191272},{"ipv4":"tox.initramfs.io","ipv6":"tox.initramfs.io","port":33445,"tcp_ports":[3389,33445],"public_key":"3F0A45A268367C1BEA652F258C85F4A66DA76BCAA667A49E770BCC4917AB6A25","maintainer":"initramfs","location":"TW","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"initramfs' tox bootstrap node","last_ping":1724191272},{"ipv4":"tox.plastiras.org","ipv6":"tox.plastiras.org","port":33445,"tcp_ports":[443,33445],"public_key":"8E8B63299B3D520FB377FE5100E65E3322F7AE5B20A0ACED2981769FC5B43725","maintainer":"Tha_14","location":"LU","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"Add me on Tox: F0AA7C8C55552E8593B2B77AC6FCA598A40D1F5F52A26C2322690A4BF1DFCB0DD8AEDD2822FF","last_ping":1724191272},{"ipv4":"188.214.122.30","ipv6":"-","port":33445,"tcp_ports":[3389,33445],"public_key":"2A9F7A620581D5D1B09B004624559211C5ED3D1D712E8066ACDB0896A7335705","maintainer":"turambar","location":"EG","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"tox-bootstrapd","last_ping":1724191272},{"ipv4":"62.183.96.32","ipv6":"-","port":33445,"tcp_ports":[33445],"public_key":"52BD37D53357701CB9C69ABA81E7741C5F14105523C89153A770D73F434AC473","maintainer":"Alexsandr","location":"RU","status_udp":true,"status_tcp":true,"version":"1000002018","motd":"New Adugeya tox boostrap node","last_ping":1724191272},{"ipv4":"141.11.229.155","ipv6":"-","port":33445,"tcp_ports":[3389,33445],"public_key":"1FD96DF8DCAC4A95C117B460F23EB740C8FBA60DE89BE7B45136790B8E3D4B63","maintainer":"lzk","location":"US","status_udp":true,"status_tcp":true,"version":"1000002013","motd":"tox-bootstrapd","last_ping":1724191272},{"ipv4":"43.198.227.166","ipv6":"-","port":33445,"tcp_ports":[33445,3389],"public_key":"AD13AB0D434BCE6C83FE2649237183964AE3341D0AFB3BE1694B18505E4E135E","maintainer":"Hardy","location":"CN","status_udp":true,"status_tcp":true,"version":"1000002013","motd":"tox-bootstrapd","last_ping":1724191272},{"ipv4":"95.181.230.108","ipv6":"2a03:c980:db:5d::","port":33445,"tcp_ports":[33445],"public_key":"B5FFECB4E4C26409EBB88DB35793E7B39BFA3BA12AC04C096950CB842E3E130A","maintainer":"wdwp","location":"RU","status_udp":true,"status_tcp":true,"version":"1000002019","motd":"tox-bootstrapd","last_ping":1724191274},{"ipv4":"5.19.249.240","ipv6":"-","port":38296,"tcp_ports":[3389,38296],"public_key":"DA98A4C0CD7473A133E115FEA2EBDAEEA2EF4F79FD69325FC070DA4DE4BA3238","maintainer":"Toxdaemon","location":"RU","status_udp":false,"status_tcp":true,"version":"","motd":"","last_ping":1724191272},{"ipv4":"198.199.98.108","ipv6":"2604:a880:1:20::32f:1001","port":33445,"tcp_ports":[],"public_key":"BEF0CFB37AF874BD17B9A8F9FE64C75521DB95A37D33C5BDB00E9CF58659C04F","maintainer":"Cody","location":"US","status_udp":false,"status_tcp":false,"version":"1000002015","motd":"Cody's Tox node!","last_ping":1692090783},{"ipv4":"46.101.197.175","ipv6":"2a03:b0c0:3:d0::ac:5001","port":33445,"tcp_ports":[],"public_key":"CD133B521159541FB1D326DE9850F5E56A6C724B5B8E5EB5CD8D950408E95707","maintainer":"kotelnik","location":"DE","status_udp":false,"status_tcp":false,"version":"1000002018","motd":"Power to Ukraine!","last_ping":1716531423},{"ipv4":"tox01.ky0uraku.xyz","ipv6":"tox01.ky0uraku.xyz","port":33445,"tcp_ports":[],"public_key":"FD04EB03ABC5FC5266A93D37B4D6D6171C9931176DC68736629552D8EF0DE174","maintainer":"ky0uraku","location":"NL","status_udp":false,"status_tcp":false,"version":"1000002013","motd":"ky0uraku tox01 node","last_ping":1691512685},{"ipv4":"122.116.39.151","ipv6":"2001:b011:8:2f22:1957:7f9d:e31f:96dd","port":33445,"tcp_ports":[],"public_key":"5716530A10D362867C8E87EE1CD5362A233BAFBBA4CF47FA73B7CAD368BD5E6E","maintainer":"miaoski","location":"TW","status_udp":false,"status_tcp":false,"version":"1000002018","motd":"tox-bootstrapd","last_ping":1681799519},{"ipv4":"173.232.195.131","ipv6":"-","port":33445,"tcp_ports":[],"public_key":"3F7D1765E54FADEE08DEDDFECCF8ACF38C52580D4DCA77B30CC3E478F2C50A34","maintainer":"DEADBEEF","location":"PL","status_udp":false,"status_tcp":false,"version":"1000002018","motd":"Maintained by DEADBEEF; ID: AFF6CAA16FFEDE7F458A08D2B19D5DABA6E39A3B26319CC516178DEFBC652154EE393B6C2008","last_ping":1692574743},{"ipv4":"NONE","ipv6":"2607:f130:0:f8::4c85:a645","port":33445,"tcp_ports":[],"public_key":"8AFE1FC6426E5B77AB80318ED64F5F76341695B9FB47AB8AC9537BF5EE9E9D29","maintainer":"Busindre","location":"US","status_udp":false,"status_tcp":false,"version":"","motd":"","last_ping":1718916783},{"ipv4":"198.98.49.206","ipv6":"2605:6400:10:caa:1:be:a:7001","port":33445,"tcp_ports":[],"public_key":"28DB44A3CEEE69146469855DFFE5F54DA567F5D65E03EFB1D38BBAEFF2553255","maintainer":"Cüber","location":"US","status_udp":false,"status_tcp":false,"version":"1000002013","motd":"Tox","last_ping":1685639465},{"ipv4":"tox02.ky0uraku.xyz","ipv6":"tox02.ky0uraku.xyz","port":33445,"tcp_ports":[],"public_key":"D3D6D7C0C7009FC75406B0A49E475996C8C4F8BCE1E6FC5967DE427F8F600527","maintainer":"ky0uraku","location":"FR","status_udp":false,"status_tcp":false,"version":"1000002016","motd":"ky0uraku tox02 node","last_ping":1713682503},{"ipv4":"kusoneko.moe","ipv6":"kusoneko.moe","port":33445,"tcp_ports":[],"public_key":"BE7ED53CD924813507BA711FD40386062E6DC6F790EFA122C78F7CDEEE4B6D1B","maintainer":"Kusoneko","location":"CA","status_udp":false,"status_tcp":false,"version":"1000002018","motd":"Managed by kusoneko (ID:D8E4A5E926A4E7A85FA40F8CA55D47554F043D3C5CDB457187726F19CE20E52C0D7C3FCE9466)","last_ping":1711445823},{"ipv4":"NONE","ipv6":"200:832f:2e56:91a6:678e:aaaf:80bf:4a8a","port":33445,"tcp_ports":[],"public_key":"444361B1717AD5E10D9C03EA1C714A846C9D3B16A875186D0034DC516A49F013","maintainer":"Dima(Yggdrasil)","location":"RU","status_udp":false,"status_tcp":false,"version":"","motd":"","last_ping":0},{"ipv4":"193.168.141.224","ipv6":"-","port":33445,"tcp_ports":[],"public_key":"8E82CF0D7CC42B63748C01DD61EAA490BC35DBDB177942D423DC96D40762C01D","maintainer":"DEADBEEF","location":"RO","status_udp":false,"status_tcp":false,"version":"1000002018","motd":"Maintained by DEADBEEF; ID: AFF6CAA16FFEDE7F458A08D2B19D5DABA6E39A3B26319CC516178DEFBC652154EE393B6C2008","last_ping":1689605883},{"ipv4":"194.36.190.71","ipv6":"-","port":33445,"tcp_ports":[],"public_key":"99E8460035E45C0A6B6DC2C02B14440F7F876518E9D054D028209B5669827645","maintainer":"UR1229SWL","location":"NL","status_udp":false,"status_tcp":false,"version":"3000002000","motd":"Welcome to https://rx-tx.info and t.me/rx_tx_info","last_ping":1722501794}]} diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index 555960da39800..1053dd0154a62 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -12,29 +12,32 @@ stdenv.mkDerivation { pname = "toxvpn"; - version = "unstable-2019-09-09"; + version = "unstable-2024-08-21"; src = fetchFromGitHub { owner = "cleverca22"; repo = "toxvpn"; - rev = "45083dec172ce167f7ed84d571ec2822ebe4d51a"; - sha256 = "193crarrx6q0zd2p6dn67pzv8kngwi440zm1y54njgcz0v3fpxmb"; + rev = "c727451eb871b43855b825ff93dc48fa0d3320b6"; + sha256 = "sha256-UncU0cpoyy9Z0TCChGmaHpyhW9ctz32gU7n3hgpOEwU="; }; buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ] - ++ lib.optionals stdenv.isLinux [ libcap systemd ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap systemd ]; nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optionals stdenv.isLinux [ "-DSYSTEMD=1" ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DSYSTEMD=1" ]; - postInstall = "$out/bin/toxvpn -h"; + postInstall = "cp ${./bootstrap.json} $out/share/toxvpn/"; + + installCheckPhase = "$out/bin/toxvpn -h"; + doInstallCheck = true; meta = with lib; { description = "Powerful tool that allows one to make tunneled point to point connections over Tox"; homepage = "https://github.com/cleverca22/toxvpn"; license = licenses.gpl3; - maintainers = with maintainers; [ cleverca22 obadz toonn ]; + maintainers = with maintainers; [ cleverca22 craigem obadz toonn ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/transmission-rss/default.nix b/pkgs/tools/networking/transmission-rss/default.nix index 3d6d80ef474ed..859b8acb5b10d 100644 --- a/pkgs/tools/networking/transmission-rss/default.nix +++ b/pkgs/tools/networking/transmission-rss/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [pkg-config]; buildInputs = [openssl] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); diff --git a/pkgs/tools/networking/trurl/default.nix b/pkgs/tools/networking/trurl/default.nix index eb05a666b42eb..1e4bd4404f9c1 100644 --- a/pkgs/tools/networking/trurl/default.nix +++ b/pkgs/tools/networking/trurl/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "trurl"; - version = "0.14"; + version = "0.16"; src = fetchFromGitHub { owner = "curl"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-BzsDvEsUntVwTPY/+kIKOhznDIabfioT2y4cofD+eTg="; + hash = "sha256-Og7+FVCBWohVd58GVxFN3KChcG0Kts1MokiOQXZ1OTc="; }; outputs = [ "out" "dev" "man" ]; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/tuic/default.nix b/pkgs/tools/networking/tuic/default.nix index fc1270e01ae8c..a2a0bfc2f0ffe 100644 --- a/pkgs/tools/networking/tuic/default.nix +++ b/pkgs/tools/networking/tuic/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec{ hash = "sha256-VoNr91vDqBlt9asT/dwCeYk13UNiDexNNiKwD5DSn8k="; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix index 4505568083941..7f3129705950f 100644 --- a/pkgs/tools/networking/tunnelto/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Expose your local web server to the internet with a public URL"; diff --git a/pkgs/tools/networking/tuntox/default.nix b/pkgs/tools/networking/tuntox/default.nix index e59a615e26275..07fa3e3160928 100644 --- a/pkgs/tools/networking/tuntox/default.nix +++ b/pkgs/tools/networking/tuntox/default.nix @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace gitversion.h --replace '7d45afdf7d00a95a8c3687175e2b1669fa1f7745' '365d2e5cbc0e3655fb64c204db0515f5f4cdf5a4' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Makefile --replace ' -static ' ' ' substituteInPlace Makefile --replace 'CC=gcc' ' ' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.mac --replace '.git/HEAD .git/index' ' ' substituteInPlace Makefile.mac --replace '/usr/local/lib/libtoxcore.a' '${libtoxcore}/lib/libtoxcore.a' substituteInPlace Makefile.mac --replace '/usr/local/lib/libsodium.a' '${libsodium}/lib/libsodium.dylib' @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' make - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' make -f Makefile.mac tuntox ''; diff --git a/pkgs/tools/networking/tunwg/default.nix b/pkgs/tools/networking/tunwg/default.nix index 1b36709baa489..ab43b9e5a419b 100644 --- a/pkgs/tools/networking/tunwg/default.nix +++ b/pkgs/tools/networking/tunwg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tunwg"; - version = "24.01.15+9f04d73"; + version = "24.09.18+760ee81"; src = fetchFromGitHub { owner = "ntnj"; repo = "tunwg"; rev = "v${version}"; - hash = "sha256-M7iMl80uxw0hKg4sK8Tv6U5+nMOK8eTfb9SGn+U2+8E="; + hash = "sha256-+vgl7saHp1Co35nkxQ+IhqYr6GdGd0JIFEFrezQd5Yo="; }; - vendorHash = "sha256-VlH41hOWC5QBCYZxiKCUZRmw2vHRbbPyzToRMU6kDO8="; + vendorHash = "sha256-5BJFAnsmx6lbGQTx/6dIdcsETsllCr6C3wPbB2Gvj5Y="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix deleted file mode 100644 index 085ee4f76d0a9..0000000000000 --- a/pkgs/tools/networking/ubridge/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, libpcap -, testers -, ubridge -}: - -stdenv.mkDerivation rec { - pname = "ubridge"; - version = "0.9.18"; - - src = fetchFromGitHub { - owner = "GNS3"; - repo = "ubridge"; - rev = "v${version}"; - sha256 = "0jg66jhhpv4c9340fsdp64hf9h253i8r81fknxa0gq241ripp3jn"; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace "/usr/local/bin" "$out/bin" \ - --replace "setcap" "#setcap" - ''; - - buildInputs = [ libpcap ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - install -Dm755 ubridge $out/bin/ubridge - - runHook postInstall - ''; - - passthru = { - tests.version = testers.testVersion { - package = ubridge; - command = "ubridge -v"; - }; - }; - - meta = with lib; { - description = "Bridge for UDP tunnels, Ethernet, TAP, and VMnet interfaces"; - longDescription = '' - uBridge is a simple application to create user-land bridges between - various technologies. Currently bridging between UDP tunnels, Ethernet - and TAP interfaces is supported. Packet capture is also supported. - ''; - inherit (src.meta) homepage; - changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}"; - license = licenses.gpl3Plus; - mainProgram = "ubridge"; - maintainers = with maintainers; [ primeos ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index a39f0d4660fb4..a359e7677ac2a 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "RANLIB=${stdenv.cc.targetPrefix}ranlib" - (if stdenv.isDarwin + (if stdenv.hostPlatform.isDarwin then "osx" else "lnp") # Linux with PAM modules; - ] ++ lib.optional stdenv.isx86_64 "EXTRACFLAGS=-fPIC"; # -fPIC is required to compile php with imap on x86_64 systems + ] ++ lib.optional stdenv.hostPlatform.isx86_64 "EXTRACFLAGS=-fPIC"; # -fPIC is required to compile php with imap on x86_64 systems hardeningDisable = [ "format" ]; buildInputs = [ openssl - (if stdenv.isDarwin then libkrb5 else pam) # Matches the make target. + (if stdenv.hostPlatform.isDarwin then libkrb5 else pam) # Matches the make target. ]; patches = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { makeFlagsArray+=("ARRC=${stdenv.cc.targetPrefix}ar rc") ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${openssl.dev}/include/openssl"; installPhase = '' diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 9e6961b7e5264..b9cb17c1ab950 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.16.1"; + version = "5.19.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-bgDTraLufl6txl9TMPstuPs4IgN1pLIBlpl2VlvuN0o="; + hash = "sha256-07VhbxrSG911GD+AT9/d5fSUm3SBl/tbvYKCOtIzpVQ="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-FDmwZoBN2/8jPMs7xkQiI9hFt9cgaQPHC31ueYq3n9k="; + vendorHash = "sha256-3OCV4QH4HHJtienFy6w1bdOo6yKL5eGdT/B7SPSnLvg="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/networking/v2raya/default.nix b/pkgs/tools/networking/v2raya/default.nix index 800bf07d754a1..243b36cb3d828 100644 --- a/pkgs/tools/networking/v2raya/default.nix +++ b/pkgs/tools/networking/v2raya/default.nix @@ -1,68 +1,66 @@ -{ lib -, fetchFromGitHub -, mkYarnPackage -, buildGoModule -, makeWrapper -, v2ray -, v2ray-geoip -, v2ray-domain-list-community -, symlinkJoin -, fetchYarnDeps +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + fetchYarnDeps, + symlinkJoin, + + yarnConfigHook, + yarnBuildHook, + nodejs, + + makeWrapper, + v2ray, + v2ray-geoip, + v2ray-domain-list-community, }: let pname = "v2raya"; - version = "2.2.5.6"; + version = "2.2.5.8"; src = fetchFromGitHub { owner = "v2rayA"; repo = "v2rayA"; - rev = "v${version}"; - hash = "sha256-tXVyroQ2yXwLe+OulvVQYgfd9EcC87S0L8d7w5gLnMI="; + rev = "refs/tags/v${version}"; + hash = "sha256-yFN7mG5qS7BAuCSvSSZFFiyytd7XZ4kJvctc8cU72Oc="; postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock"; }; - guiSrc = "${src}/gui"; - web = mkYarnPackage { - inherit pname version; + web = stdenv.mkDerivation { + inherit pname version src; - src = guiSrc; - packageJSON = ./package.json; + sourceRoot = "${src.name}/gui"; offlineCache = fetchYarnDeps { - yarnLock = "${guiSrc}/yarn.lock"; - sha256 = "sha256-AZIYkW2u1l9IaDpR9xiKNpc0sGAarLKwHf5kGnzdpKw="; + yarnLock = "${src}/gui/yarn.lock"; + hash = "sha256-AZIYkW2u1l9IaDpR9xiKNpc0sGAarLKwHf5kGnzdpKw="; }; - buildPhase = '' - runHook preBuild - OUTPUT_DIR=$out yarn --offline build - runHook postBuild - ''; + env.OUTPUT_DIR = placeholder "out"; - configurePhase = '' - runHook preConfigure - cp -r $node_modules node_modules - chmod +w node_modules - runHook postConfigure - ''; - - distPhase = "true"; - - dontInstall = true; - dontFixup = true; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; }; assetsDir = symlinkJoin { name = "assets"; - paths = [ v2ray-geoip v2ray-domain-list-community ]; + paths = [ + v2ray-geoip + v2ray-domain-list-community + ]; }; in buildGoModule { - inherit pname version; + inherit pname version src; - src = "${src}/service"; - vendorHash = "sha256-8MSNTKeN0N2/yaHnXsKmxzw9vRy+E5q60IpwLycqC2I="; + sourceRoot = "${src.name}/service"; + + vendorHash = "sha256-Oa7YmxcZr5scbhNeqGxJOkryL2uHQQ3RkLGWJaIXq3s="; ldflags = [ "-s" @@ -73,15 +71,16 @@ buildGoModule { subPackages = [ "." ]; nativeBuildInputs = [ makeWrapper ]; + preBuild = '' cp -a ${web} server/router/web ''; postInstall = '' - install -Dm 444 ${src}/install/universal/v2raya.desktop -t $out/share/applications - install -Dm 444 ${src}/install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps + install -Dm 444 ../install/universal/v2raya.desktop -t $out/share/applications + install -Dm 444 ../install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps substituteInPlace $out/share/applications/v2raya.desktop \ - --replace 'Icon=/usr/share/icons/hicolor/512x512/apps/v2raya.png' 'Icon=v2raya' + --replace-fail 'Icon=/usr/share/icons/hicolor/512x512/apps/v2raya.png' 'Icon=v2raya' wrapProgram $out/bin/v2rayA \ --prefix PATH ":" "${lib.makeBinPath [ v2ray ]}" \ diff --git a/pkgs/tools/networking/v2raya/package.json b/pkgs/tools/networking/v2raya/package.json deleted file mode 100644 index a4b16d15821c6..0000000000000 --- a/pkgs/tools/networking/v2raya/package.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "name": "v2raya", - "version": "0.1.0", - "private": true, - "license": "GPL-3.0", - "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint" - }, - "resolutions": { - "@achrinza/node-ipc": "^10", - "@achrinza/event-pubsub": "^5" - }, - "dependencies": { - "@achrinza/node-ipc": "^10.1.10", - "@mdi/font": "^5.8.55", - "@nuintun/qrcode": "^3.3.0", - "@vue/babel-preset-app": "^4.2.2", - "axios": "^0.21.1", - "buefy": "^0.9.22", - "clipboard": "^2.0.4", - "dayjs": "^1.10.6", - "js-base64": "^2.5.1", - "nanoid": "^3.1.23", - "normalize.css": "^8.0.1", - "pace-js": "^1.2.4", - "qrcode": "^1.4.2", - "register-service-worker": "^1.6.2", - "vue": "^2.7.14", - "vue-i18n": "^8.15.3", - "vue-router": "^3.0.6", - "vue-virtual-scroller": "^1.0.10", - "vuex": "^3.0.1", - "webpack-iconfont-plugin-nodejs": "^1.0.16" - }, - "devDependencies": { - "@babel/core": "^7.12.16", - "@babel/eslint-parser": "^7.12.16", - "@vue/cli-plugin-babel": "~5.0.8", - "@vue/cli-plugin-eslint": "~5.0.8", - "@vue/cli-plugin-router": "~5.0.8", - "@vue/cli-plugin-vuex": "~5.0.8", - "@vue/cli-service": "~5.0.8", - "@vue/eslint-config-prettier": "^5.0.0", - "compression-webpack-plugin": "^10.0.0", - "css-loader": "^5.2.0", - "eslint": "^7.32.0", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-vue": "^8.0.3", - "highlight.js": "^11.4.0", - "prettier": "^2.4.1", - "sass": "^1.19.0", - "sass-loader": "^8.0.0", - "terser-webpack-plugin": "^5.3.6", - "urijs": "^1.19.11" - } -} diff --git a/pkgs/tools/networking/vegeta/default.nix b/pkgs/tools/networking/vegeta/default.nix index a7b71272e9a20..17f0dcc37e55a 100644 --- a/pkgs/tools/networking/vegeta/default.nix +++ b/pkgs/tools/networking/vegeta/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "vegeta"; - version = "12.11.1"; - rev = "6fbe391628eeeae1adf39522a55078797e6e7f2e"; + version = "12.12.0"; + rev = "03ca49e9b419c106db29d687827c4c823d8b8ece"; src = fetchFromGitHub { owner = "tsenart"; repo = "vegeta"; rev = "v${version}"; - sha256 = "sha256-09DowdlbCsBQsAuAqC2QyUYvZHz7QmttO8Q6KHQCqLo="; + hash = "sha256-nTtQ/BB5rU+0k4dPRCmukCRNI0iFTjHIJiSTN0cNR+Q="; }; - vendorHash = "sha256-5MvcZLg+NDDsqlpVV2FhTiEhXUJHq7eaP7Pba3iIipo="; + vendorHash = "sha256-0Ho1HYckFHaWEE6Ti3fIL/t0hBj5MnKOd4fOZx+LYiE="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix index ad78af648d21d..e06a03b8edce6 100644 --- a/pkgs/tools/networking/veilid/default.nix +++ b/pkgs/tools/networking/veilid/default.nix @@ -9,6 +9,7 @@ , cmake , testers , veilid +, gitUpdater }: rustPlatform.buildRustPackage rec { @@ -38,7 +39,7 @@ rustPlatform.buildRustPackage rec { protobuf ]; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Security ]; cargoBuildFlags = [ "--workspace" @@ -54,9 +55,12 @@ rustPlatform.buildRustPackage rec { moveToOutput "lib" "$lib" ''; - passthru.tests = { - veilid-version = testers.testVersion { - package = veilid; + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + veilid-version = testers.testVersion { + package = veilid; + }; }; }; diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/tools/networking/vpn-slice/default.nix index ce8b04c35fc79..6ca66d44e61d7 100644 --- a/pkgs/tools/networking/vpn-slice/default.nix +++ b/pkgs/tools/networking/vpn-slice/default.nix @@ -20,10 +20,10 @@ buildPythonApplication rec { sha256 = "sha256-T6VULLNRLWO4OcAsuTmhty6H4EhinyxQSg0dfv2DUJs="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace vpn_slice/mac.py \ --replace "'/sbin/route'" "'${unixtools.route}/bin/route'" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace vpn_slice/linux.py \ --replace "'/sbin/ip'" "'${iproute2}/bin/ip'" \ --replace "'/sbin/iptables'" "'${iptables}/bin/iptables'" diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/tools/networking/vpnc-scripts/default.nix index e0319ed4bf14b..9a757c73cf55e 100644 --- a/pkgs/tools/networking/vpnc-scripts/default.nix +++ b/pkgs/tools/networking/vpnc-scripts/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation { preFixup = '' substituteInPlace $out/bin/vpnc-script \ --replace "which" "type -P" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/bin/vpnc-script \ --replace "/sbin/resolvconf" "${openresolv}/bin/resolvconf" \ --replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl" '' + '' wrapProgram $out/bin/vpnc-script \ - --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv iproute2 ])}" + --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openresolv iproute2 ])}" ''; meta = with lib; { diff --git a/pkgs/tools/networking/wakeonlan/default.nix b/pkgs/tools/networking/wakeonlan/default.nix index 4a9f0936f9408..f3f222d5ad641 100644 --- a/pkgs/tools/networking/wakeonlan/default.nix +++ b/pkgs/tools/networking/wakeonlan/default.nix @@ -13,7 +13,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; nativeCheckInputs = [ perlPackages.TestPerlCritic perlPackages.TestPod perlPackages.TestPodCoverage ]; # Linting and formatting checks are of no interest for us. @@ -24,7 +24,7 @@ perlPackages.buildPerlPackage rec { installPhase = '' install -Dt $out/bin wakeonlan installManPage blib/man1/wakeonlan.1 - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/wakeonlan ''; diff --git a/pkgs/tools/networking/webwormhole/default.nix b/pkgs/tools/networking/webwormhole/default.nix index 6752c862fb24c..7e1fe8cbfb27d 100644 --- a/pkgs/tools/networking/webwormhole/default.nix +++ b/pkgs/tools/networking/webwormhole/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "webwormhole"; - version = "unstable-2023-02-25"; + version = "0-unstable-2023-11-15"; src = fetchFromGitHub { owner = "saljam"; repo = pname; - rev = "25b68f4f4c1aaa0c6c1949b60bd4ef52ec972ebb"; - hash = "sha256-JFmfwHBa/lNGTOIIgnMFc4VMlsXtjX9v9Tn2XpdVMfA="; + rev = "6ceee76274ee881e828bd48c5cc15c758b9ad77c"; + hash = "sha256-C9r6wFhP5BkIClgTQol7LyMUHXOzyrX9Pn91VqBaqFQ="; }; vendorHash = "sha256-+7ctAm2wnjmfMd6CHXlcAUwiUMS7cH4koDAvlEUAXEg="; diff --git a/pkgs/tools/networking/wg-netmanager/default.nix b/pkgs/tools/networking/wg-netmanager/default.nix index b4a34ba22a488..a2c16fae073b8 100644 --- a/pkgs/tools/networking/wg-netmanager/default.nix +++ b/pkgs/tools/networking/wg-netmanager/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-cOxkWMFPVmi+/BQWIvExzX5LDyC7C8kaTf5dGwfXj+s="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # Test 01 tries to create a wireguard interface, which requires sudo. doCheck = true; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 0fbdd80332be3..0bfdf8affc7bd 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -31,15 +31,16 @@ stdenv.mkDerivation rec { buildInputs = [ libidn2 zlib pcre libuuid ] ++ lib.optional withOpenssl openssl ++ lib.optional withLibpsl libpsl - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices perlPackages.perl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices perlPackages.perl ]; configureFlags = [ (lib.withFeatureAs withOpenssl "ssl" "openssl") - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html "--without-included-regex" ]; + __darwinAllowLocalNetworking = true; doCheck = true; preCheck = '' patchShebangs tests fuzz @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { do sed -i "$i" -e's/localhost/127.0.0.1/g' done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # depending on the underlying filesystem, some tests # creating exotic file names fail for f in tests/Test-ftp-iri.px \ @@ -66,7 +67,7 @@ stdenv.mkDerivation rec { checkInputs = [ perlPackages.HTTPDaemon python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ perlPackages.IOSocketSSL ]; diff --git a/pkgs/tools/networking/wget2/default.nix b/pkgs/tools/networking/wget2/default.nix index 85512aec06b9e..7445b425f034a 100644 --- a/pkgs/tools/networking/wget2/default.nix +++ b/pkgs/tools/networking/wget2/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { zstd ] ++ lib.optionals sslSupport [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index ebac01f063cd6..855f620b44060 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { postFixup = '' substituteInPlace $out/lib/systemd/system/wg-quick@.service \ --replace /usr/bin $out/bin - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' for f in $out/bin/*; do # Which firewall and resolvconf implementations to use should be determined by the # environment, we provide the "default" ones as fallback. @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ procps iproute2 ]} \ --suffix PATH : ${lib.makeBinPath [ iptables openresolv ]} done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/bin/*; do wrapProgram $f \ --prefix PATH : ${lib.makeBinPath [ wireguard-go ]} diff --git a/pkgs/tools/networking/wireguard-vanity-address/default.nix b/pkgs/tools/networking/wireguard-vanity-address/default.nix index cc7ebc557faf5..969e9187db5be 100644 --- a/pkgs/tools/networking/wireguard-vanity-address/default.nix +++ b/pkgs/tools/networking/wireguard-vanity-address/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-SjzcVIQ9HwhP6Y/uCwXGSdZgrYcUQ9kE/Bow8pyOKNo="; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoHash = "sha256-0bkyopkssqH0vfaWkFC3dV2o7Q3EuDEOM8JvRB9ekLU="; diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix index 6d2988705129f..9bc8401efa661 100644 --- a/pkgs/tools/networking/wrk2/default.nix +++ b/pkgs/tools/networking/wrk2/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thoughtpolice ]; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; mainProgram = "wrk2"; }; } diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index 5df8e7903b2b0..2ab8be19c44ff 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = lib.optionals withNativeTls - (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.SystemConfiguration ] else [ openssl ]); + (if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.SystemConfiguration ] else [ openssl ]); # Get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index 8b196b5f31337..765423b644d7f 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "xray"; - version = "1.8.16"; + version = "1.8.24"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - hash = "sha256-IHa+7eZkDDK8ZH+WUMoD0F9eiDvD9yYtFrTswBA00O0="; + hash = "sha256-gteiRkdCuRTBkzljQgxo6oMvr1t2aUgeBIXQikwYtdE="; }; - vendorHash = "sha256-nMVMbZPIn/mBHgPqH026t1dgi6t/RT+jhT/KseRO1fE="; + vendorHash = "sha256-GyzZI0NaOm2GBqrqzXYpv1ml12iBvHMyu2y7A3UwdPY="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index 1ceb6380aaa1b..60da8d7e6e211 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -78,11 +78,11 @@ stdenv.mkDerivation (finalAttrs: { scitokens-cpp zlib ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # https://github.com/xrootd/xrootd/blob/5b5a1f6957def2816b77ec773c7e1bfb3f1cfc5b/cmake/XRootDFindLibs.cmake#L58 fuse ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd voms ] @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs genversion.sh substituteInPlace cmake/XRootDConfig.cmake.in \ --replace-fail "@PACKAGE_CMAKE_INSTALL_" "@CMAKE_INSTALL_FULL_" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i cmake/XRootDOSDefs.cmake -e '/set( MacOSX TRUE )/ainclude( GNUInstallDirs )' ''; @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { + '' moveToOutput "bin/xrootd-config" "$dev" moveToOutput "bin/.xrootd-config-wrapped" "$dev" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p "$out/lib/systemd/system" install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket ''; @@ -127,12 +127,12 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableTestRunner [ "-DFORCE_ENABLED=TRUE" "-DENABLE_DAVIX=TRUE" - "-DENABLE_FUSE=${if (!stdenv.isDarwin) then "TRUE" else "FALSE"}" # not supported + "-DENABLE_FUSE=${if (!stdenv.hostPlatform.isDarwin) then "TRUE" else "FALSE"}" # not supported "-DENABLE_MACAROONS=OFF" "-DENABLE_PYTHON=FALSE" # built separately "-DENABLE_SCITOKENS=TRUE" "-DENABLE_TESTS=TRUE" - "-DENABLE_VOMS=${if stdenv.isLinux then "TRUE" else "FALSE"}" + "-DENABLE_VOMS=${if stdenv.hostPlatform.isLinux then "TRUE" else "FALSE"}" ]; postFixup = lib.optionalString (externalEtc != null) '' diff --git a/pkgs/tools/networking/xrootd/fetchxrd.nix b/pkgs/tools/networking/xrootd/fetchxrd.nix index 21d7a2a0386dd..6d1a0958d27cc 100644 --- a/pkgs/tools/networking/xrootd/fetchxrd.nix +++ b/pkgs/tools/networking/xrootd/fetchxrd.nix @@ -1,6 +1,5 @@ { lib , runCommandLocal -, buildPlatform , xrootd }: diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 05948633d0cf9..4a1cc9aaea382 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -14,14 +14,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-8fEmiRKFOrF9v66OEfUGLUYK+DfZMkAXrCKu2DoGbLA="; - aarch64-linux = "sha256-p+YbWpyLfIgFdNvakQQFfi+P/9lhfVMM+Y0XynRJ/rY="; - armv7l-linux = "sha256-mMjtbAjylSjS+89T0qQoI4H/p316cqh+5fbgarFbv90="; + x86_64-linux = "sha256-EzMkl/XTtieAj/pg1L4BLTEuWNnQ5m18WYu/sqRZx/I="; + aarch64-linux = "sha256-D5FpJBRzvbsgrQmopJQpJZTIm9TroaGB6fkYX2UAaHM="; + armv7l-linux = "sha256-PQl/ZQxxkzQ4iTUPBO9tbCsswOnEQuupdzxul0/vKG4="; }.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "zrok"; - version = "0.4.34"; + version = "0.4.39"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; diff --git a/pkgs/tools/nix/fh/default.nix b/pkgs/tools/nix/fh/default.nix index ec1354e407e16..bc02bac41d585 100644 --- a/pkgs/tools/nix/fh/default.nix +++ b/pkgs/tools/nix/fh/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fh"; - version = "0.1.16"; + version = "0.1.17"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "fh"; rev = "v${version}"; - hash = "sha256-HC/PNdBOm4mR2p6qI2P+aS+lFabKWSiPhiBSJUsmcv4="; + hash = "sha256-+Q7mZ2uzMjShKWVvYLz9qH8g0w8oP93lNlJiYxFFoAI="; }; - cargoHash = "sha256-pWPFiDRF9avZSSUtxDaTfl9ZVUEcnO/CY0VWByaGimo="; + cargoHash = "sha256-DJOj9EJswnPIm66u585k4ZWSi6Su/naQ+myQuLiGLFE="; nativeBuildInputs = [ installShellFiles @@ -29,13 +29,13 @@ rustPlatform.buildRustPackage rec { checkInputs = [ cacert ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration gcc.cc.lib ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_COMPILE = "-I${lib.getDev libcxx}/include/c++/v1"; }; diff --git a/pkgs/tools/nix/gridlock/default.nix b/pkgs/tools/nix/gridlock/default.nix index e49750eba5ca5..ddfa9ee9831f0 100644 --- a/pkgs/tools/nix/gridlock/default.nix +++ b/pkgs/tools/nix/gridlock/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index 73c336afe045c..7b29f9c43c9a4 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { path = lib.makeBinPath ([ coreutils findutils gnugrep - ] ++ (lib.optionals stdenv.isDarwin [ darwin.DarwinTools ])); - is_darwin = if stdenv.isDarwin then "yes" else "no"; + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ])); + is_darwin = if stdenv.hostPlatform.isDarwin then "yes" else "no"; sandboxtest = ./sandbox.nix; relaxedsandboxtest = ./relaxedsandbox.nix; diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index 2784ac2518f1f..9be2431d59585 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/pkgs/tools/nix/nix-init/default.nix @@ -52,9 +52,9 @@ rustPlatform.buildRustPackage rec { openssl zlib zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/pkgs/tools/nix/nix-melt/0001-fix-build-for-rust-1.80.patch b/pkgs/tools/nix/nix-melt/0001-fix-build-for-rust-1.80.patch deleted file mode 100644 index cfea37c75f740..0000000000000 --- a/pkgs/tools/nix/nix-melt/0001-fix-build-for-rust-1.80.patch +++ /dev/null @@ -1,256 +0,0 @@ -From b85cef7cd9a3d7367c41b7deca8264652e88014a Mon Sep 17 00:00:00 2001 -From: Bryan Lai <bryanlais@gmail.com> -Date: Fri, 16 Aug 2024 20:14:28 +0800 -Subject: [PATCH] deps: bump `time`, fix build for rust 1.80 - -With: cargo update time --recursive - -Note that `cargo update` without the `--recursive` flag would be -executed "conservatively". Basically, `cargo update time` will try -its best to _not_ bump the dependencies of `time`. This restricts -the amount that `time` itself can be updated. - -To really get the latest version, one has to add a `--recursive` flag. -Only by doing this can we ensure that time is updated to the latest -semver compatible version. In our case, - -- without `--recursive`, time only gets updated to 0.3.26 -- with `--recursive`, time gets updated to the latest 0.3.36, - with a couple of other dependencies updated ---- - Cargo.lock | 84 +++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 55 insertions(+), 29 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 5bd0f35..a7c7cf8 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -200,7 +200,7 @@ dependencies = [ - "heck", - "proc-macro2", - "quote", -- "syn 2.0.15", -+ "syn 2.0.74", - ] - - [[package]] -@@ -317,7 +317,7 @@ dependencies = [ - "proc-macro2", - "quote", - "scratch", -- "syn 2.0.15", -+ "syn 2.0.74", - ] - - [[package]] -@@ -334,7 +334,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.15", -+ "syn 2.0.74", - ] - - [[package]] -@@ -372,6 +372,16 @@ dependencies = [ - "syn 1.0.109", - ] - -+[[package]] -+name = "deranged" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", -+ "serde", -+] -+ - [[package]] - name = "errno" - version = "0.3.1" -@@ -511,9 +521,9 @@ dependencies = [ - - [[package]] - name = "itoa" --version = "1.0.6" -+version = "1.0.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" -+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - - [[package]] - name = "js-sys" -@@ -532,9 +542,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "libc" --version = "0.2.142" -+version = "0.2.156" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" -+checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" - - [[package]] - name = "link-cplusplus" -@@ -618,6 +628,12 @@ dependencies = [ - "time", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-integer" - version = "0.1.45" -@@ -639,9 +655,9 @@ dependencies = [ - - [[package]] - name = "num_threads" --version = "0.1.6" -+version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" - dependencies = [ - "libc", - ] -@@ -722,20 +738,26 @@ version = "0.2.9" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -+[[package]] -+name = "powerfmt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -+ - [[package]] - name = "proc-macro2" --version = "1.0.56" -+version = "1.0.86" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" - dependencies = [ - "unicode-ident", - ] - - [[package]] - name = "quote" --version = "1.0.26" -+version = "1.0.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" - dependencies = [ - "proc-macro2", - ] -@@ -837,22 +859,22 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - - [[package]] - name = "serde" --version = "1.0.160" -+version = "1.0.208" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" -+checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.160" -+version = "1.0.208" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" -+checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.15", -+ "syn 2.0.74", - ] - - [[package]] -@@ -981,9 +1003,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.15" -+version = "2.0.74" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" -+checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" - dependencies = [ - "proc-macro2", - "quote", -@@ -1026,7 +1048,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.15", -+ "syn 2.0.74", - ] - - [[package]] -@@ -1041,13 +1063,16 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.20" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ -+ "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -1055,16 +1080,17 @@ dependencies = [ - - [[package]] - name = "time-core" --version = "0.1.0" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.8" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - -@@ -1121,9 +1147,9 @@ dependencies = [ - - [[package]] - name = "unicode-ident" --version = "1.0.8" -+version = "1.0.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" -+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - - [[package]] - name = "unicode-segmentation" --- -2.45.2 - diff --git a/pkgs/tools/nix/nix-melt/default.nix b/pkgs/tools/nix/nix-melt/default.nix index 239a3a1564624..e39ae415d0385 100644 --- a/pkgs/tools/nix/nix-melt/default.nix +++ b/pkgs/tools/nix/nix-melt/default.nix @@ -6,20 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-melt"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-melt"; rev = "v${version}"; - hash = "sha256-5V9sPbBb9t4B6yiLrYF+hx6YokGDH6+UsVQBhgqxMbY="; + hash = "sha256-jx7g9GOFAjOlJyNsGOUTLh2qWII9u0prOoBEvNPmdj8="; }; - cargoPatches = [ - ./0001-fix-build-for-rust-1.80.patch - ]; - - cargoHash = "sha256-oEZTBb9dwnZvByULtgCm17KbWc9hjURLB0KDkqRRCr0="; + cargoHash = "sha256-CVMQPnSwGErZnf5/iAcVy37VlJjZdO/BkO3C/rlpl/w="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/nix/nixci/default.nix b/pkgs/tools/nix/nixci/default.nix index 304c5ff8ce6ab..5075705a2c888 100644 --- a/pkgs/tools/nix/nixci/default.nix +++ b/pkgs/tools/nix/nixci/default.nix @@ -2,7 +2,6 @@ , rustPlatform , fetchCrate , fetchFromGitHub -, libiconv , openssl , pkg-config , Security @@ -26,9 +25,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles nix ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Security SystemConfiguration diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index da046f8afcea8..70b49237f1613 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-9gBrFudzn75rzx7bTPgr+zzUpX2cLHOmE12xFtoH1eA="; + sha256 = "sha256-0tMGTKcuvyDE5281nGCvZKYJKIEAU01G6vV8Fnt/1ZQ="; }; - cargoHash = "sha256-/f67AhaNLHS/3veAzNZwYujMMM/Vmq/U4MHNHvfRoBE="; + cargoHash = "sha256-5KV2VDsPmSgrdZIqCuQ5gjgCVs/Ki6uG6GTwjmtKLlQ="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; meta = with lib; { description = "Generate documentation for Nix functions"; diff --git a/pkgs/tools/nix/nixos-install-tools/default.nix b/pkgs/tools/nix/nixos-install-tools/default.nix index 6e98df7890a5a..cef57884ab6f4 100644 --- a/pkgs/tools/nix/nixos-install-tools/default.nix +++ b/pkgs/tools/nix/nixos-install-tools/default.nix @@ -6,6 +6,8 @@ # TODO: replace indirect self-reference by proper self-reference # https://github.com/NixOS/nixpkgs/pull/119942 nixos-install-tools, + nixos-install, + nixos-enter, runCommand, nixosTests, binlore, @@ -18,9 +20,8 @@ in name = "nixos-install-tools-${version}"; paths = lib.attrValues { # See nixos/modules/installer/tools/tools.nix - inherit (config.system.build) - nixos-install nixos-generate-config nixos-enter; - + inherit (config.system.build) nixos-generate-config; + inherit nixos-install nixos-enter; inherit (config.system.build.manual) nixos-configuration-reference-manpage; }; diff --git a/pkgs/tools/nix/nixos-option/src/nixos-option.cc b/pkgs/tools/nix/nixos-option/src/nixos-option.cc index eab727bc1db5a..658b836d491a8 100644 --- a/pkgs/tools/nix/nixos-option/src/nixos-option.cc +++ b/pkgs/tools/nix/nixos-option/src/nixos-option.cc @@ -465,7 +465,7 @@ void printValue(Context & ctx, Out & out, std::variant<Value, std::exception_ptr v.print(ctx.state.symbols, out.ostream); } } catch (ThrownError & e) { - if (e.msg() == "The option `" + path + "' is used but not defined.") { + if (e.msg() == "The option `" + path + "' was accessed but has no value defined. Try setting the option.") { // 93% of errors are this, and just letting this message through would be // misleading. These values may or may not actually be "used" in the // config. The thing throwing the error message assumes that if anything diff --git a/pkgs/tools/nix/npins/default.nix b/pkgs/tools/nix/npins/default.nix index 7ea75baab1002..37f48f5470624 100644 --- a/pkgs/tools/nix/npins/default.nix +++ b/pkgs/tools/nix/npins/default.nix @@ -21,7 +21,7 @@ in rustPlatform.buildRustPackage rec { cargoHash = "sha256-YwMypBl+P1ygf4zUbkZlq4zPrOzf+lPOz2FLg2/xI3k="; - buildInputs = lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); + buildInputs = lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); nativeBuildInputs = [ makeWrapper ]; # (Almost) all tests require internet diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix index 9cc48659d419a..079459f2a2d0b 100644 --- a/pkgs/tools/nix/statix/default.nix +++ b/pkgs/tools/nix/statix/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional withJson "json"; # tests are failing on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Lints and suggestions for the nix programming language"; diff --git a/pkgs/tools/package-management/akku/akku.nix b/pkgs/tools/package-management/akku/akku.nix index 40d5b8e156336..3b205776d0d3a 100644 --- a/pkgs/tools/package-management/akku/akku.nix +++ b/pkgs/tools/package-management/akku/akku.nix @@ -1,26 +1,20 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, guile, curl, substituteAll }: +{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, git, guile, curl }: stdenv.mkDerivation rec { pname = "akku"; - version = "1.1.0"; + version = "1.1.0-unstable-2024-03-03"; src = fetchFromGitLab { owner = "akkuscm"; repo = "akku"; - rev = "v${version}"; - sha256 = "1pi18aamg1fd6f9ynfl7zx92052xzf0zwmhi2pwcwjs1kbah19f5"; + rev = "cb996572fe0dbe74a42d2abeafadffaea2bf8ae3"; + sha256 = "sha256-6xqASnFxzz0yE5oJnh15SOB74PVrVkMVwS3PwKAmgks="; }; - patches = [ - # substitute libcurl path - (substituteAll { - src = ./hardcode-libcurl.patch; - libcurl = "${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary}"; - }) - ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ guile ]; + # akku calls curl commands + buildInputs = [ guile curl git ]; # Use a dummy package index to boostrap Akku preBuild = '' diff --git a/pkgs/tools/package-management/akku/akkuDerivation.nix b/pkgs/tools/package-management/akku/akkuDerivation.nix index 1c34518ad5c9b..5b4609c3abaa6 100644 --- a/pkgs/tools/package-management/akku/akkuDerivation.nix +++ b/pkgs/tools/package-management/akku/akkuDerivation.nix @@ -18,8 +18,7 @@ stdenv.mkDerivation ({ # only install the project rm -f Akku.lock Akku.manifest - # build, filter out guile warnings - akku install 2>&1 | grep -v "\(guile-user\)" - | cat + akku install # make sure akku metadata is present during testing and onwards echo $PWD $CHEZSCHEMELIBDIRS \ diff --git a/pkgs/tools/package-management/akku/hardcode-libcurl.patch b/pkgs/tools/package-management/akku/hardcode-libcurl.patch deleted file mode 100644 index 7c5b8b50c320a..0000000000000 --- a/pkgs/tools/package-management/akku/hardcode-libcurl.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- old/private/http.scm -+++ new/private/http.scm -@@ -101,14 +101,7 @@ - ;; shouldn't, but it's an old issue. - (log/error "Could not load libcurl. Please install the curl development(!) package.") - (exit 1))) -- (case (os-name) -- ((darwin) (set! libcurl (open-shared-object "libcurl.dylib"))) -- ((msys) (set! libcurl (open-shared-object "msys-curl-4"))) -- (else -- (guard (exn -- (else -- (set! libcurl (open-shared-object "libcurl.so.3")))) -- (set! libcurl (open-shared-object "libcurl.so.4")))))) -+ (set! libcurl (open-shared-object "@libcurl@"))) - (letrec () - (define %curl_global_init (foreign-procedure libcurl int curl_global_init (long))) - (call %curl_global_init #b11))) diff --git a/pkgs/tools/package-management/akku/overrides.nix b/pkgs/tools/package-management/akku/overrides.nix index 4b72545d91a42..ecc11d945377b 100644 --- a/pkgs/tools/package-management/akku/overrides.nix +++ b/pkgs/tools/package-management/akku/overrides.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, akku, curl, git, substituteAll }: +{ stdenv, lib, akku, curl, git }: let joinOverrides = overrides: pkg: old: @@ -11,8 +11,8 @@ let # debugging showLibs = pkg: old: { preCheck = "echo $CHEZSCHEMELIBDIRS"; }; runTests = pkg: old: { doCheck = true; }; - brokenOnAarch64 = _: lib.addMetaAttrs { broken = stdenv.isAarch64; }; - brokenOnx86_64Darwin = lib.addMetaAttrs { broken = stdenv.isDarwin && stdenv.isx86_64; }; + brokenOnAarch64 = _: lib.addMetaAttrs { broken = stdenv.hostPlatform.isAarch64; }; + brokenOnx86_64Darwin = lib.addMetaAttrs { broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; in { chez-srfi = joinOverrides [ @@ -39,11 +39,14 @@ in }; akku = joinOverrides [ + # uses chez (addToBuildInputs [ curl git ]) (pkg: old: { - # hardcode-libcurl - patches = akku.patches; + # bump akku to 1.1.0-unstable-2024-03-03 + src = akku.src; }) + # not a tar archive + (pkg: old: removeAttrs old [ "unpackPhase" ]) ]; # circular dependency on wak-trc-testing !? diff --git a/pkgs/tools/package-management/ciel/default.nix b/pkgs/tools/package-management/ciel/default.nix index ed1103b869b93..cb13848695570 100644 --- a/pkgs/tools/package-management/ciel/default.nix +++ b/pkgs/tools/package-management/ciel/default.nix @@ -2,7 +2,6 @@ , bash , dbus , fetchFromGitHub -, fetchpatch , installShellFiles , libgit2 , libssh2 diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index 3db0be269b8ec..2f86a714d506c 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - hash = "sha256-PW9OS/ccRxigP0ikk1XR4QhQX4j9+ALQz0FMKXF3yRA="; + hash = "sha256-XXe0SSdH2JZLx0o+vHDtdlDRtVn7nouIngipbXhmhiQ="; }; - cargoHash = "sha256-lNz4E+dcJ6ACkNraM4DUR4yFbkWgAZ4ngbAML8JYVtE="; + cargoHash = "sha256-poQDzC5DLkwLMwt5ieZCSyrQIKkuYq6hu6cj7lcDb4c="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 48d1b79651121..92b880d1428fd 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -61,12 +61,12 @@ stdenv.mkDerivation rec { (if enableNginxWebApplication then "--with-nginx" else "--without-nginx") (if enableXinetdService then "--with-xinetd" else "--without-xinetd") (if enableS6RCService then "--with-s6-rc" else "--without-s6-rc") - (if stdenv.isDarwin then "--with-launchd" else "--without-launchd") + (if stdenv.hostPlatform.isDarwin then "--with-launchd" else "--without-launchd") "--with-job-template=${jobTemplate}" ] ++ lib.optional enableLegacy "--enable-legacy"; buildInputs = [ getopt netcat ] - ++ lib.optional stdenv.isLinux systemd + ++ lib.optional stdenv.hostPlatform.isLinux systemd ++ lib.optional enableEjabberdDump ejabberd ++ lib.optional enableMySQLDatabase mariadb.out ++ lib.optional enablePostgreSQLDatabase postgresql diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index b0cbba31bfceb..3d9398e5a58f7 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.2.5.0"; + version = "5.2.6.2"; outputs = [ "out" @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-zH+TDtVMEsgKZR0EA+G8SB1PZyiTfhnG7n6lupeoWyI="; + hash = "sha256-V/8vVKgQphWiCfdIlBMPHaJiOSIYUIEeYdt9Rm+8rCY="; }; nativeBuildInputs = diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index db095e59c4891..6b9c1f3c2edb8 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -13,7 +13,7 @@ , autoreconfHook , pkg-config , diffutils -, glibc ? !stdenv.isDarwin +, glibc ? !stdenv.hostPlatform.isDarwin , darwin }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "--with-admindir=/var/lib/dpkg" "PERL_LIBDIR=$(out)/${perl.libPrefix}" "TAR=${gnutar}/bin/tar" - ] ++ lib.optional stdenv.isDarwin "--disable-linker-optimisations"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-linker-optimisations"; enableParallelBuilding = true; @@ -67,13 +67,13 @@ stdenv.mkDerivation rec { --replace '"rm"' \"${coreutils}/bin/rm\" \ --replace '"cat"' \"${coreutils}/bin/cat\" \ --replace '"diff"' \"${diffutils}/bin/diff\" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace src/main/help.c \ --replace '"ldconfig"' \"${glibc.bin}/bin/ldconfig\" ''; buildInputs = [ perl zlib bzip2 xz zstd libmd ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; nativeBuildInputs = [ makeWrapper perl autoreconfHook pkg-config ]; postInstall = diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 4d263e3e1d89b..3e5a34404ec75 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.18.1"; pname = "librepo"; outputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "sha256-u9dE1TqqZp/cHIgqnRDgOT4gU7XNLnSnmAFJxLKnDSQ="; + sha256 = "sha256-b5f6zfQu5GQ9bZPnWgmLZLH0YFFLQu7bHwMQUt4Q4Q8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index fce59cff11732..dd1580bc43365 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -65,7 +65,7 @@ assert (hash == null) -> (src != null); enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, enableStatic ? stdenv.hostPlatform.isStatic, - withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), + withAWS ? !enableStatic && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), aws-sdk-cpp, # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, @@ -124,7 +124,7 @@ stdenv.mkDerivation { mdbook-linkcheck doxygen ] - ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ]; buildInputs = [ @@ -145,8 +145,8 @@ stdenv.mkDerivation { lix-doc ] ++ lib.optionals (!isLegacyParser) [ pegtl ] - ++ lib.optionals stdenv.isDarwin [ Security ] - ++ lib.optionals (stdenv.isx86_64) [ libcpuid ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ] + ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ libcpuid ] ++ lib.optionals withLibseccomp [ libseccomp ] ++ lib.optionals withAWS [ aws-sdk-cpp ]; @@ -166,7 +166,7 @@ stdenv.mkDerivation { mkdir -p $out/lib cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib rm -f $out/lib/*.a - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' chmod u+w $out/lib/*.so.* patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} @@ -194,14 +194,14 @@ stdenv.mkDerivation { (lib.mesonBool "enable-tests" true) (lib.mesonBool "enable-docs" enableDocumentation) (lib.mesonEnable "internal-api-docs" enableDocumentation) - (lib.mesonBool "enable-embedded-sandbox-shell" (stdenv.isLinux && stdenv.hostPlatform.isStatic)) + (lib.mesonBool "enable-embedded-sandbox-shell" (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic)) (lib.mesonEnable "seccomp-sandboxing" withLibseccomp) (lib.mesonOption "store-dir" storeDir) (lib.mesonOption "state-dir" stateDir) (lib.mesonOption "sysconfdir" confDir) ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") ]; @@ -219,7 +219,7 @@ stdenv.mkDerivation { mkdir -p $out/nix-support echo "file binary-dist $out/bin/nix" >> $out/nix-support/hydra-build-products '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' for lib in liblixutil.dylib liblixexpr.dylib; do install_name_tool \ -change "${lib.getLib boost}/lib/libboost_context.dylib" \ @@ -272,8 +272,8 @@ stdenv.mkDerivation { # fortify breaks the build with lto and musl for some reason ++ lib.optional stdenv.hostPlatform.isMusl "fortify"; - # hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; - separateDebugInfo = stdenv.isLinux && !enableStatic; + # hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; + separateDebugInfo = stdenv.hostPlatform.isLinux && !enableStatic; enableParallelBuilding = true; # Used by (1) test which has dynamic port assignment. diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 789a486554364..7f5fda624695c 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { # CGO_ENABLED=0 required for mac - "error: 'TARGET_OS_MAC' is not defined, evaluates to 0" # https://github.com/shirou/gopsutil/issues/976 - CGO_ENABLED = if stdenv.isLinux then 1 else 0; + CGO_ENABLED = if stdenv.hostPlatform.isLinux then 1 else 0; meta = with lib; { homepage = "https://mynewt.apache.org/"; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index e33d091d93456..621cd3327058a 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.39.0"; + version = "2.40.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-0afwPA4OIIBYxXwkdm36JmVXDJ+gqESOPjEp5Tkxxa8="; + hash = "sha256-hBA15pHCYgBKTeHBVBZkhPqoMnDkd13wx9afygTDPWk="; }; - vendorHash = "sha256-LJM9F9NTAMvDwsaRvjnZyjKSI0AjZvVM4srOYuGLA7w="; + vendorHash = "sha256-d4MuoKc7LF5KCXhLxIwuqS2Xu7ClLhyJZH4/+/LYm3w="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index 53b05bccf3498..f594b0648bfae 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -6,7 +6,7 @@ , nix , pkg-config # Whether to build the nix-doc plugin for Nix -, withPlugin ? true +, withPlugin ? false # no longer needed for nix 2.24 }: let @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { # Due to a Rust bug, setting -C relro-level to anything including "off" on # macOS will cause link errors - env = lib.optionalAttrs (withPlugin && stdenv.isLinux) { + env = lib.optionalAttrs (withPlugin && stdenv.hostPlatform.isLinux) { RUSTFLAGS = "-C relro-level=partial"; }; diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 8b2463ccce4c1..69289b8955b75 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { boost nix nlohmann_json - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index b4b8b0832094c..433ad82d4d2f8 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl curl sqlite ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' substituteInPlace command-not-found.sh \ diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index 018fe9ffb89fb..f8e181e9fa210 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -2,15 +2,17 @@ , stdenv , fetchFromGitHub , bzip2 -, nix -, perl +, nixVersions , makeWrapper , nixosTests +, fetchpatch }: let - rev = "e4675e38ab54942e351c7686e40fabec822120b9"; - sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr"; + rev = "77ffa33d83d2c7c6551c5e420e938e92d72fec24"; + sha256 = "sha256-MJRdVO2pt7wjOu5Hk0eVeNbk5bK5+Uo/Gh9XfO4OlMY="; + nix = nixVersions.nix_2_24; + inherit (nix.perl-bindings) perl; in stdenv.mkDerivation { @@ -23,6 +25,14 @@ stdenv.mkDerivation { inherit rev sha256; }; + patches = [ + # Part of https://github.com/edolstra/nix-serve/pull/61 + (fetchpatch { + url = "https://github.com/edolstra/nix-serve/commit/9e434fff4486afeb3cc3f631f6dc56492b204704.patch"; + sha256 = "sha256-TxQ6q6UApTKsYIMdr/RyrkKSA3k47stV63bTbxchNTU="; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; @@ -35,6 +45,9 @@ stdenv.mkDerivation { --add-flags $out/libexec/nix-serve/nix-serve.psgi ''; + /** The nix package that nix-serve got its nix perl bindings from. */ + passthru.nix = nix; + passthru.tests = { nix-serve = nixosTests.nix-serve; nix-serve-ssh = nixosTests.nix-serve-ssh; diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index 91c1f9b268078..1d0c6f42f517f 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; # needed for nix-prefetch-url postInstall = '' diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index 13b158db81e02..9b21c1514046f 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "nix-update-source"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { + hash = "sha256-+49Yb+rZ3CzFnwEpwj5xrcMUVBiYOJtCk9YeZ15IM/U="; owner = "timbertson"; repo = "nix-update-source"; rev = "version-${version}"; - sha256 = "157wvv9vnaszzwbj68jpdc0imcm1hdab3z760bx2axbsgfpqqilz"; }; propagatedBuildInputs = [ nix-prefetch-scripts ]; @@ -34,20 +34,25 @@ python3Packages.buildPythonApplication rec { overrideSrc = drv: lib.overrideDerivation drv (orig: { inherit src; }); }; - updateScript = '' - #!${runtimeShell} - set -e - echo - cd ${toString ./.} - ${pkgs.nix-update-source}/bin/nix-update-source \ - --prompt version \ - --replace-attr version \ - --set owner timbertson \ - --set repo nix-update-source \ - --set type fetchFromGitHub \ - --set rev 'version-{version}' \ - --modify-nix default.nix - ''; + + updateScript = [ + runtimeShell + "-c" + '' + set -e + echo + cd ${toString ./.} + ${pkgs.nix-update-source}/bin/nix-update-source \ + --prompt version \ + --replace-attr version \ + --set owner timbertson \ + --set repo nix-update-source \ + --set type fetchFromGitHub \ + --set rev 'version-{version}' \ + --nix-literal rev 'version-''${version}'\ + --modify-nix default.nix + '' + ]; }; meta = { diff --git a/pkgs/tools/package-management/nix/README.md b/pkgs/tools/package-management/nix/README.md new file mode 100644 index 0000000000000..0105b504e9b0e --- /dev/null +++ b/pkgs/tools/package-management/nix/README.md @@ -0,0 +1,35 @@ +# Steps for Testing New Releases + +## Patch Releases or Updating `nixVersions.{latest,git}` + +Branch to merge into: **master** or **release-$nixos-version** + +Build the affected Nix packages and run their tests on the following platforms: **x86_64-linux**, **aarch64-linux**, **x86_64-darwin**, and **aarch64-darwin**. +If you lack the necessary hardware for these platforms, you may need to ask others for assistance with the builds. +Alternatively, you can request access to the Nix community builder for all platforms [here](https://github.com/NixOS/aarch64-build-box) and [here](https://nix-community.org/community-builder/). + +To build all dependent packages, use: + +``` +nix-review pr <your-pull-request> +``` + +And to build all important NixOS tests, run: + +``` +# Replace $version with the actual Nix version +nix-build nixVersions.nix_$version.tests +``` + +Be sure to also update the `nix-fallback-paths` whenever you do a patch release for `nixVersions.stable` + +``` +# Replace $version with the actual Nix version +curl https://releases.nixos.org/nix/nix-$version/fallback-paths.nix > nixos/modules/installer/tools/nix-fallback-paths.nix +``` + +## Major Version Bumps + +If you're updating `nixVersions.stable`, follow all the steps mentioned above, but use the **staging** branch for your pull request (or **staging-next** after coordinating with the people in matrix `#staging:nixos.org`) +This is necessary because, at the end of the staging-next cycle, the NixOS tests are built through the [staging-next-small](https://hydra.nixos.org/jobset/nixos/staging-next-small) jobset. +Especially nixos installer test are important to look at here. diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 205cda250e217..c26cb410399de 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -76,7 +76,7 @@ in , xz , enableDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , enableStatic ? stdenv.hostPlatform.isStatic -, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp +, withAWS ? !enableStatic && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), aws-sdk-cpp , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp , confDir @@ -85,7 +85,9 @@ in # passthru tests , pkgsi686Linux +, pkgsStatic , runCommand +, pkgs }: let self = stdenv.mkDerivation { pname = "nix"; @@ -99,7 +101,7 @@ self = stdenv.mkDerivation { [ "out" "dev" ] ++ lib.optionals enableDocumentation [ "man" "doc" ]; - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; hardeningDisable = [ "shadowstack" @@ -124,7 +126,7 @@ self = stdenv.mkDerivation { mdbook ] ++ lib.optionals (atLeast213 && enableDocumentation) [ mdbook-linkcheck - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ]; @@ -145,9 +147,9 @@ self = stdenv.mkDerivation { libgit2 ] ++ lib.optionals (atLeast224 || lib.versionAtLeast version "pre20240626") [ toml11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security - ] ++ lib.optionals (stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ libcpuid ] ++ lib.optionals atLeast214 [ rapidcheck @@ -175,7 +177,7 @@ self = stdenv.mkDerivation { mkdir -p $out/lib cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib rm -f $out/lib/*.a - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' chmod u+w $out/lib/*.so.* patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} @@ -204,9 +206,9 @@ self = stdenv.mkDerivation { "--enable-gc" ] ++ lib.optionals (!enableDocumentation) [ "--disable-doc-gen" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox" - ] ++ lib.optionals (atLeast210 && stdenv.isLinux && stdenv.hostPlatform.isStatic) [ + ] ++ lib.optionals (atLeast210 && stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [ "--enable-embedded-sandbox-shell" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system) [ "--with-system=${stdenv.hostPlatform.nix.system}" @@ -232,23 +234,26 @@ self = stdenv.mkDerivation { installCheckTarget = if atLeast210 then "installcheck" else null; # socket path becomes too long otherwise - preInstallCheck = lib.optionalString stdenv.isDarwin '' + preInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export TMPDIR=$NIX_BUILD_TOP '' # Prevent crashes in libcurl due to invoking Objective-C `+initialize` methods after `fork`. # See http://sealiesoftware.com/blog/archive/2017/6/5/Objective-C_and_fork_in_macOS_1013.html. - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES '' # See https://github.com/NixOS/nix/issues/5687 - + lib.optionalString (atLeast25 && stdenv.isDarwin) '' + + lib.optionalString (atLeast25 && stdenv.hostPlatform.isDarwin) '' echo "exit 99" > tests/gc-non-blocking.sh + '' # TODO: investigate why this broken + + lib.optionalString (atLeast25 && stdenv.hostPlatform.system == "aarch64-linux") '' + echo "exit 0" > tests/functional/flakes/show.sh '' + '' # nixStatic otherwise does not find its man pages in tests. export MANPATH=$man/share/man:$MANPATH ''; - separateDebugInfo = stdenv.isLinux && (atLeast24 -> !enableStatic); + separateDebugInfo = stdenv.hostPlatform.isLinux && (atLeast24 -> !enableStatic); enableParallelBuilding = true; @@ -258,12 +263,6 @@ self = stdenv.mkDerivation { perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; inherit Security; }); tests = { - nixi686 = pkgsi686Linux.nixVersions.${self_attribute_name}; - # Basic smoke test that needs to pass when upgrading nix. - # Note that this test does only test the nixVersions.stable attribute. - misc = nixosTests.nix-misc.default; - upgrade = nixosTests.nix-upgrade; - srcVersion = runCommand "nix-src-version" { inherit version; } '' @@ -278,6 +277,22 @@ self = stdenv.mkDerivation { fi touch $out ''; + + /** Intended to test `lib`, but also a good smoke test for Nix */ + nixpkgs-lib = import ../../../../lib/tests/test-with-nix.nix { + inherit lib pkgs; + nix = self; + }; + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { + nixStatic = pkgsStatic.nixVersions.${self_attribute_name}; + + # Basic smoke tests that needs to pass when upgrading nix. + # Note that this test does only test the nixVersions.stable attribute. + misc = nixosTests.nix-misc.default; + upgrade = nixosTests.nix-upgrade; + simpleUefiSystemdBoot = nixosTests.installer.simpleUefiSystemdBoot; + } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { + nixi686 = pkgsi686Linux.nixVersions.${self_attribute_name}; }; }; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5f1cd3f48eda0..21184359031ca 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -3,12 +3,14 @@ , stdenv , aws-sdk-cpp , boehmgc +, libgit2 , callPackage , fetchFromGitHub , fetchpatch , fetchpatch2 , runCommand , overrideSDK +, buildPackages , Security , storeDir ? "/nix/store" @@ -66,7 +68,7 @@ let rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp # TestRandomURLMultiThreaded fails rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp - '' + lib.optionalString aws-sdk-cpp.stdenv.isi686 '' + '' + lib.optionalString aws-sdk-cpp.stdenv.hostPlatform.isi686 '' # EPSILON is exceeded rm aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp ''; @@ -85,6 +87,27 @@ let requiredSystemFeatures = [ ]; }; + libgit2-thin-packfile = libgit2.overrideAttrs (args: { + nativeBuildInputs = args.nativeBuildInputs or [] + # gitMinimal does not build on Windows. See packbuilder patch. + ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ + # Needed for `git apply`; see `prePatch` + buildPackages.gitMinimal + ]; + # Only `git apply` can handle git binary patches + prePatch = args.prePatch or "" + + lib.optionalString (!stdenv.hostPlatform.isWindows) '' + patch() { + git apply + } + ''; + # taken from https://github.com/NixOS/nix/tree/master/packaging/patches + patches = (args.patches or []) ++ [ + ./patches/libgit2-mempack-thin-packfile.patch + ] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ + ./patches/libgit2-packbuilder-callback-interruptible.patch + ]; + }); common = args: callPackage @@ -93,6 +116,7 @@ let inherit Security storeDir stateDir confDir; boehmgc = boehmgc-nix; aws-sdk-cpp = if lib.versionAtLeast args.version "2.12pre" then aws-sdk-cpp-nix else aws-sdk-cpp-old-nix; + libgit2 = if lib.versionAtLeast args.version "2.25.0" then libgit2-thin-packfile else libgit2; }; # https://github.com/NixOS/nix/pull/7585 @@ -115,7 +139,9 @@ let runCommand "test-nix-fallback-paths-version-equals-nix-stable" { paths = lib.concatStringsSep "\n" (builtins.attrValues (import ../../../../nixos/modules/installer/tools/nix-fallback-paths.nix)); } '' - if [[ "" != $(grep -v 'nix-${pkg.version}$' <<< "$paths") ]]; then + # NOTE: name may contain cross compilation details between the pname + # and version this is permitted thanks to ([^-]*-)* + if [[ "" != $(grep -vE 'nix-([^-]*-)*${lib.strings.replaceStrings ["."] ["\\."] pkg.version}$' <<< "$paths") ]]; then echo "nix-fallback-paths not up to date with nixVersions.stable (nix-${pkg.version})" echo "The following paths are not up to date:" grep -v 'nix-${pkg.version}$' <<< "$paths" @@ -149,8 +175,8 @@ in lib.makeExtensible (self: ({ }; nix_2_18 = common { - version = "2.18.5"; - hash = "sha256-xEcYQuJz6DjdYfS6GxIYcn8U+3Hgopne3CvqrNoGguQ="; + version = "2.18.8"; + hash = "sha256-0rHRifdjzzxMh/im8pRx6XoY62irDTDUes+Pn0CR65I="; self_attribute_name = "nix_2_18"; }; @@ -185,10 +211,10 @@ in lib.makeExtensible (self: ({ }; nix_2_24 = (common { - version = "2.24.4"; - hash = "sha256-oYu/9u8ht34JOTV+G/l3CCFJokPiUA2D8CiLZFX61PA="; + version = "2.24.8"; + hash = "sha256-YPJA0stZucs13Y2DQr3JIL6JfakP//LDbYXNhic/rKk="; self_attribute_name = "nix_2_24"; - }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + }).override (lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { # Fix the following error with the default x86_64-darwin SDK: # # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer @@ -201,15 +227,15 @@ in lib.makeExtensible (self: ({ git = (common rec { version = "2.25.0"; - suffix = "pre20240807_${lib.substring 0 8 src.rev}"; + suffix = "pre20240920_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "cfe66dbec325d5dcb601b642bd9c149ae1353147"; - hash = "sha256-1hqjl4br3MRK1pkzDrhBSxKUhdfQ/P4b5KbLfGua64g="; + rev = "ca3fc1693b309ab6b8b0c09408a08d0055bf0363"; + hash = "sha256-Hp7dkx7zfB9a4l5QusXUob0b1T2qdZ23LFo5dcp3xrU="; }; self_attribute_name = "git"; - }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + }).override (lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { # Fix the following error with the default x86_64-darwin SDK: # # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer @@ -239,6 +265,7 @@ in lib.makeExtensible (self: ({ else nix; + # Read ./README.md before bumping a major release stable = addFallbackPathsCheck self.nix_2_18; } // lib.optionalAttrs config.allowAliases ( lib.listToAttrs (map ( diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix index f80ce5698a2e1..50e342e96cad5 100644 --- a/pkgs/tools/package-management/nix/nix-perl.nix +++ b/pkgs/tools/package-management/nix/nix-perl.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation (finalAttrs: { nix perl xz - ] ++ lib.optional (stdenv.isDarwin) Security; + ] ++ lib.optional (stdenv.hostPlatform.isDarwin) Security; # Not cross-safe since Nix checks for curl/perl via # NEED_PROG/find_program, but both seem to be needed at runtime @@ -65,7 +65,7 @@ in stdenv.mkDerivation (finalAttrs: { ]); # `perlPackages.Test2Harness` is marked broken for Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ perl.pkgs.Test2Harness @@ -87,4 +87,6 @@ in stdenv.mkDerivation (finalAttrs: { ]; preConfigure = "export NIX_STATE_DIR=$TMPDIR"; + + passthru = { inherit perl; }; }) diff --git a/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch b/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch new file mode 100644 index 0000000000000..fb74b1683136b --- /dev/null +++ b/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch @@ -0,0 +1,282 @@ +commit 9bacade4a3ef4b6b26e2c02f549eef0e9eb9eaa2 +Author: Robert Hensing <robert@roberthensing.nl> +Date: Sun Aug 18 20:20:36 2024 +0200 + + Add unoptimized git_mempack_write_thin_pack + +diff --git a/include/git2/sys/mempack.h b/include/git2/sys/mempack.h +index 17da590a3..3688bdd50 100644 +--- a/include/git2/sys/mempack.h ++++ b/include/git2/sys/mempack.h +@@ -44,6 +44,29 @@ GIT_BEGIN_DECL + */ + GIT_EXTERN(int) git_mempack_new(git_odb_backend **out); + ++/** ++ * Write a thin packfile with the objects in the memory store. ++ * ++ * A thin packfile is a packfile that does not contain its transitive closure of ++ * references. This is useful for efficiently distributing additions to a ++ * repository over the network, but also finds use in the efficient bulk ++ * addition of objects to a repository, locally. ++ * ++ * This operation performs the (shallow) insert operations into the ++ * `git_packbuilder`, but does not write the packfile to disk; ++ * see `git_packbuilder_write_buf`. ++ * ++ * It also does not reset the memory store; see `git_mempack_reset`. ++ * ++ * @note This function may or may not write trees and blobs that are not ++ * referenced by commits. Currently everything is written, but this ++ * behavior may change in the future as the packer is optimized. ++ * ++ * @param backend The mempack backend ++ * @param pb The packbuilder to use to write the packfile ++ */ ++GIT_EXTERN(int) git_mempack_write_thin_pack(git_odb_backend *backend, git_packbuilder *pb); ++ + /** + * Dump all the queued in-memory writes to a packfile. + * +diff --git a/src/libgit2/odb_mempack.c b/src/libgit2/odb_mempack.c +index 6f27f45f8..0b61e2b66 100644 +--- a/src/libgit2/odb_mempack.c ++++ b/src/libgit2/odb_mempack.c +@@ -132,6 +132,35 @@ cleanup: + return err; + } + ++int git_mempack_write_thin_pack(git_odb_backend *backend, git_packbuilder *pb) ++{ ++ struct memory_packer_db *db = (struct memory_packer_db *)backend; ++ const git_oid *oid; ++ size_t iter = 0; ++ int err = -1; ++ ++ /* TODO: Implement the recency heuristics. ++ For this it probably makes sense to only write what's referenced ++ through commits, an option I've carved out for you in the docs. ++ wrt heuristics: ask your favorite LLM to translate https://git-scm.com/docs/pack-heuristics/en ++ to actual normal reference documentation. */ ++ while (true) { ++ err = git_oidmap_iterate(NULL, db->objects, &iter, &oid); ++ if (err == GIT_ITEROVER) { ++ err = 0; ++ break; ++ } ++ if (err != 0) ++ return err; ++ ++ err = git_packbuilder_insert(pb, oid, NULL); ++ if (err != 0) ++ return err; ++ } ++ ++ return 0; ++} ++ + int git_mempack_dump( + git_buf *pack, + git_repository *repo, +diff --git a/tests/libgit2/mempack/thinpack.c b/tests/libgit2/mempack/thinpack.c +new file mode 100644 +index 000000000..604a4dda2 +--- /dev/null ++++ b/tests/libgit2/mempack/thinpack.c +@@ -0,0 +1,196 @@ ++#include "clar_libgit2.h" ++#include "git2/indexer.h" ++#include "git2/odb_backend.h" ++#include "git2/tree.h" ++#include "git2/types.h" ++#include "git2/sys/mempack.h" ++#include "git2/sys/odb_backend.h" ++#include "util.h" ++ ++static git_repository *_repo; ++static git_odb_backend * _mempack_backend; ++ ++void test_mempack_thinpack__initialize(void) ++{ ++ git_odb *odb; ++ ++ _repo = cl_git_sandbox_init_new("mempack_thinpack_repo"); ++ ++ cl_git_pass(git_mempack_new(&_mempack_backend)); ++ cl_git_pass(git_repository_odb(&odb, _repo)); ++ cl_git_pass(git_odb_add_backend(odb, _mempack_backend, 999)); ++ git_odb_free(odb); ++} ++ ++void _mempack_thinpack__cleanup(void) ++{ ++ cl_git_sandbox_cleanup(); ++} ++ ++/* ++ Generating a packfile for an unchanged repo works and produces an empty packfile. ++ Even if we allow this scenario to be detected, it shouldn't misbehave if the ++ application is unaware of it. ++*/ ++void test_mempack_thinpack__empty(void) ++{ ++ git_packbuilder *pb; ++ int version; ++ int n; ++ git_buf buf = GIT_BUF_INIT; ++ ++ git_packbuilder_new(&pb, _repo); ++ ++ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); ++ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); ++ cl_assert_in_range(12, buf.size, 1024 /* empty packfile is >0 bytes, but certainly not that big */); ++ cl_assert(buf.ptr[0] == 'P'); ++ cl_assert(buf.ptr[1] == 'A'); ++ cl_assert(buf.ptr[2] == 'C'); ++ cl_assert(buf.ptr[3] == 'K'); ++ version = (buf.ptr[4] << 24) | (buf.ptr[5] << 16) | (buf.ptr[6] << 8) | buf.ptr[7]; ++ /* Subject to change. https://git-scm.com/docs/pack-format: Git currently accepts version number 2 or 3 but generates version 2 only.*/ ++ cl_assert_equal_i(2, version); ++ n = (buf.ptr[8] << 24) | (buf.ptr[9] << 16) | (buf.ptr[10] << 8) | buf.ptr[11]; ++ cl_assert_equal_i(0, n); ++ git_buf_dispose(&buf); ++ ++ git_packbuilder_free(pb); ++} ++ ++#define LIT_LEN(x) x, sizeof(x) - 1 ++ ++/* ++ Check that git_mempack_write_thin_pack produces a thin packfile. ++*/ ++void test_mempack_thinpack__thin(void) ++{ ++ /* Outline: ++ - Create tree 1 ++ - Flush to packfile A ++ - Create tree 2 ++ - Flush to packfile B ++ ++ Tree 2 has a new blob and a reference to a blob from tree 1. ++ ++ Expectation: ++ - Packfile B is thin and does not contain the objects from packfile A ++ */ ++ ++ ++ git_oid oid_blob_1; ++ git_oid oid_blob_2; ++ git_oid oid_blob_3; ++ git_oid oid_tree_1; ++ git_oid oid_tree_2; ++ git_treebuilder *tb; ++ ++ git_packbuilder *pb; ++ git_buf buf = GIT_BUF_INIT; ++ git_indexer *indexer; ++ git_indexer_progress stats; ++ char pack_dir_path[1024]; ++ ++ char sbuf[1024]; ++ const char * repo_path; ++ const char * pack_name_1; ++ const char * pack_name_2; ++ git_str pack_path_1 = GIT_STR_INIT; ++ git_str pack_path_2 = GIT_STR_INIT; ++ git_odb_backend * pack_odb_backend_1; ++ git_odb_backend * pack_odb_backend_2; ++ ++ ++ cl_assert_in_range(0, snprintf(pack_dir_path, sizeof(pack_dir_path), "%s/objects/pack", git_repository_path(_repo)), sizeof(pack_dir_path)); ++ ++ /* Create tree 1 */ ++ ++ cl_git_pass(git_blob_create_from_buffer(&oid_blob_1, _repo, LIT_LEN("thinpack blob 1"))); ++ cl_git_pass(git_blob_create_from_buffer(&oid_blob_2, _repo, LIT_LEN("thinpack blob 2"))); ++ ++ ++ cl_git_pass(git_treebuilder_new(&tb, _repo, NULL)); ++ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob1", &oid_blob_1, GIT_FILEMODE_BLOB)); ++ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob2", &oid_blob_2, GIT_FILEMODE_BLOB)); ++ cl_git_pass(git_treebuilder_write(&oid_tree_1, tb)); ++ ++ /* Flush */ ++ ++ cl_git_pass(git_packbuilder_new(&pb, _repo)); ++ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); ++ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); ++ cl_git_pass(git_indexer_new(&indexer, pack_dir_path, 0, NULL, NULL)); ++ cl_git_pass(git_indexer_append(indexer, buf.ptr, buf.size, &stats)); ++ cl_git_pass(git_indexer_commit(indexer, &stats)); ++ pack_name_1 = strdup(git_indexer_name(indexer)); ++ cl_assert(pack_name_1); ++ git_buf_dispose(&buf); ++ git_mempack_reset(_mempack_backend); ++ git_indexer_free(indexer); ++ git_packbuilder_free(pb); ++ ++ /* Create tree 2 */ ++ ++ cl_git_pass(git_treebuilder_clear(tb)); ++ /* blob 1 won't be used, but we add it anyway to test that just "declaring" an object doesn't ++ necessarily cause its inclusion in the next thin packfile. It must only be included if new. */ ++ cl_git_pass(git_blob_create_from_buffer(&oid_blob_1, _repo, LIT_LEN("thinpack blob 1"))); ++ cl_git_pass(git_blob_create_from_buffer(&oid_blob_3, _repo, LIT_LEN("thinpack blob 3"))); ++ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob1", &oid_blob_1, GIT_FILEMODE_BLOB)); ++ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob3", &oid_blob_3, GIT_FILEMODE_BLOB)); ++ cl_git_pass(git_treebuilder_write(&oid_tree_2, tb)); ++ ++ /* Flush */ ++ ++ cl_git_pass(git_packbuilder_new(&pb, _repo)); ++ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); ++ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); ++ cl_git_pass(git_indexer_new(&indexer, pack_dir_path, 0, NULL, NULL)); ++ cl_git_pass(git_indexer_append(indexer, buf.ptr, buf.size, &stats)); ++ cl_git_pass(git_indexer_commit(indexer, &stats)); ++ pack_name_2 = strdup(git_indexer_name(indexer)); ++ cl_assert(pack_name_2); ++ git_buf_dispose(&buf); ++ git_mempack_reset(_mempack_backend); ++ git_indexer_free(indexer); ++ git_packbuilder_free(pb); ++ git_treebuilder_free(tb); ++ ++ /* Assertions */ ++ ++ assert(pack_name_1); ++ assert(pack_name_2); ++ ++ repo_path = git_repository_path(_repo); ++ ++ snprintf(sbuf, sizeof(sbuf), "objects/pack/pack-%s.pack", pack_name_1); ++ git_str_joinpath(&pack_path_1, repo_path, sbuf); ++ snprintf(sbuf, sizeof(sbuf), "objects/pack/pack-%s.pack", pack_name_2); ++ git_str_joinpath(&pack_path_2, repo_path, sbuf); ++ ++ /* If they're the same, something definitely went wrong. */ ++ cl_assert(strcmp(pack_name_1, pack_name_2) != 0); ++ ++ cl_git_pass(git_odb_backend_one_pack(&pack_odb_backend_1, pack_path_1.ptr)); ++ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_1)); ++ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_2)); ++ cl_assert(!pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_3)); ++ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_tree_1)); ++ cl_assert(!pack_odb_backend_1->exists(pack_odb_backend_1, &oid_tree_2)); ++ ++ cl_git_pass(git_odb_backend_one_pack(&pack_odb_backend_2, pack_path_2.ptr)); ++ /* blob 1 is already in the packfile 1, so packfile 2 must not include it, in order to be _thin_. */ ++ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_1)); ++ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_2)); ++ cl_assert(pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_3)); ++ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_tree_1)); ++ cl_assert(pack_odb_backend_2->exists(pack_odb_backend_2, &oid_tree_2)); ++ ++ pack_odb_backend_1->free(pack_odb_backend_1); ++ pack_odb_backend_2->free(pack_odb_backend_2); ++ free((void *)pack_name_1); ++ free((void *)pack_name_2); ++ git_str_dispose(&pack_path_1); ++ git_str_dispose(&pack_path_2); ++ ++} diff --git a/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch b/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch new file mode 100644 index 0000000000000..c67822ff755eb --- /dev/null +++ b/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch @@ -0,0 +1,930 @@ +commit e9823c5da4fa977c46bcb97167fbdd0d70adb5ff +Author: Robert Hensing <robert@roberthensing.nl> +Date: Mon Aug 26 20:07:04 2024 +0200 + + Make packbuilder interruptible using progress callback + + Forward errors from packbuilder->progress_cb + + This allows the callback to terminate long-running operations when + the application is interrupted. + +diff --git a/include/git2/pack.h b/include/git2/pack.h +index 0f6bd2ab9..bee72a6c0 100644 +--- a/include/git2/pack.h ++++ b/include/git2/pack.h +@@ -247,6 +247,9 @@ typedef int GIT_CALLBACK(git_packbuilder_progress)( + * @param progress_cb Function to call with progress information during + * pack building. Be aware that this is called inline with pack building + * operations, so performance may be affected. ++ * When progress_cb returns an error, the pack building process will be ++ * aborted and the error will be returned from the invoked function. ++ * `pb` must then be freed. + * @param progress_cb_payload Payload for progress callback. + * @return 0 or an error code + */ +diff --git a/src/libgit2/pack-objects.c b/src/libgit2/pack-objects.c +index b2d80cba9..7c331c2d5 100644 +--- a/src/libgit2/pack-objects.c ++++ b/src/libgit2/pack-objects.c +@@ -932,6 +932,9 @@ static int report_delta_progress( + { + int ret; + ++ if (pb->failure) ++ return pb->failure; ++ + if (pb->progress_cb) { + uint64_t current_time = git_time_monotonic(); + uint64_t elapsed = current_time - pb->last_progress_report_time; +@@ -943,8 +946,10 @@ static int report_delta_progress( + GIT_PACKBUILDER_DELTAFICATION, + count, pb->nr_objects, pb->progress_cb_payload); + +- if (ret) ++ if (ret) { ++ pb->failure = ret; + return git_error_set_after_callback(ret); ++ } + } + } + +@@ -976,7 +981,10 @@ static int find_deltas(git_packbuilder *pb, git_pobject **list, + } + + pb->nr_deltified += 1; +- report_delta_progress(pb, pb->nr_deltified, false); ++ if ((error = report_delta_progress(pb, pb->nr_deltified, false)) < 0) { ++ GIT_ASSERT(git_packbuilder__progress_unlock(pb) == 0); ++ goto on_error; ++ } + + po = *list++; + (*list_size)--; +@@ -1124,6 +1132,10 @@ struct thread_params { + size_t depth; + size_t working; + size_t data_ready; ++ ++ /* A pb->progress_cb can stop the packing process by returning an error. ++ When that happens, all threads observe the error and stop voluntarily. */ ++ bool stopped; + }; + + static void *threaded_find_deltas(void *arg) +@@ -1133,7 +1145,12 @@ static void *threaded_find_deltas(void *arg) + while (me->remaining) { + if (find_deltas(me->pb, me->list, &me->remaining, + me->window, me->depth) < 0) { +- ; /* TODO */ ++ me->stopped = true; ++ GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_lock(me->pb) == 0, NULL); ++ me->working = false; ++ git_cond_signal(&me->pb->progress_cond); ++ GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_unlock(me->pb) == 0, NULL); ++ return NULL; + } + + GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_lock(me->pb) == 0, NULL); +@@ -1175,8 +1192,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + pb->nr_threads = git__online_cpus(); + + if (pb->nr_threads <= 1) { +- find_deltas(pb, list, &list_size, window, depth); +- return 0; ++ return find_deltas(pb, list, &list_size, window, depth); + } + + p = git__mallocarray(pb->nr_threads, sizeof(*p)); +@@ -1195,6 +1211,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + p[i].depth = depth; + p[i].working = 1; + p[i].data_ready = 0; ++ p[i].stopped = 0; + + /* try to split chunks on "path" boundaries */ + while (sub_size && sub_size < list_size && +@@ -1262,7 +1279,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + (!victim || victim->remaining < p[i].remaining)) + victim = &p[i]; + +- if (victim) { ++ if (victim && !target->stopped) { + sub_size = victim->remaining / 2; + list = victim->list + victim->list_size - sub_size; + while (sub_size && list[0]->hash && +@@ -1286,7 +1303,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + } + target->list_size = sub_size; + target->remaining = sub_size; +- target->working = 1; ++ target->working = 1; /* even when target->stopped, so that we don't process this thread again */ + GIT_ASSERT(git_packbuilder__progress_unlock(pb) == 0); + + if (git_mutex_lock(&target->mutex)) { +@@ -1299,7 +1316,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + git_cond_signal(&target->cond); + git_mutex_unlock(&target->mutex); + +- if (!sub_size) { ++ if (target->stopped || !sub_size) { + git_thread_join(&target->thread, NULL); + git_cond_free(&target->cond); + git_mutex_free(&target->mutex); +@@ -1308,7 +1325,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + } + + git__free(p); +- return 0; ++ return pb->failure; + } + + #else +@@ -1319,6 +1336,7 @@ int git_packbuilder__prepare(git_packbuilder *pb) + { + git_pobject **delta_list; + size_t i, n = 0; ++ int error; + + if (pb->nr_objects == 0 || pb->done) + return 0; /* nothing to do */ +@@ -1327,8 +1345,10 @@ int git_packbuilder__prepare(git_packbuilder *pb) + * Although we do not report progress during deltafication, we + * at least report that we are in the deltafication stage + */ +- if (pb->progress_cb) +- pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload); ++ if (pb->progress_cb) { ++ if ((error = pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload)) < 0) ++ return git_error_set_after_callback(error); ++ } + + delta_list = git__mallocarray(pb->nr_objects, sizeof(*delta_list)); + GIT_ERROR_CHECK_ALLOC(delta_list); +@@ -1345,31 +1365,33 @@ int git_packbuilder__prepare(git_packbuilder *pb) + + if (n > 1) { + git__tsort((void **)delta_list, n, type_size_sort); +- if (ll_find_deltas(pb, delta_list, n, ++ if ((error = ll_find_deltas(pb, delta_list, n, + GIT_PACK_WINDOW + 1, +- GIT_PACK_DEPTH) < 0) { ++ GIT_PACK_DEPTH)) < 0) { + git__free(delta_list); +- return -1; ++ return error; + } + } + +- report_delta_progress(pb, pb->nr_objects, true); ++ error = report_delta_progress(pb, pb->nr_objects, true); + + pb->done = true; + git__free(delta_list); +- return 0; ++ return error; + } + +-#define PREPARE_PACK if (git_packbuilder__prepare(pb) < 0) { return -1; } ++#define PREPARE_PACK error = git_packbuilder__prepare(pb); if (error < 0) { return error; } + + int git_packbuilder_foreach(git_packbuilder *pb, int (*cb)(void *buf, size_t size, void *payload), void *payload) + { ++ int error; + PREPARE_PACK; + return write_pack(pb, cb, payload); + } + + int git_packbuilder__write_buf(git_str *buf, git_packbuilder *pb) + { ++ int error; + PREPARE_PACK; + + return write_pack(pb, &write_pack_buf, buf); +diff --git a/src/libgit2/pack-objects.h b/src/libgit2/pack-objects.h +index bbc8b9430..380a28ebe 100644 +--- a/src/libgit2/pack-objects.h ++++ b/src/libgit2/pack-objects.h +@@ -100,6 +100,10 @@ struct git_packbuilder { + uint64_t last_progress_report_time; + + bool done; ++ ++ /* A non-zero error code in failure causes all threads to shut themselves ++ down. Some functions will return this error code. */ ++ volatile int failure; + }; + + int git_packbuilder__write_buf(git_str *buf, git_packbuilder *pb); +diff --git a/tests/libgit2/pack/cancel.c b/tests/libgit2/pack/cancel.c +new file mode 100644 +index 000000000..a0aa9716a +--- /dev/null ++++ b/tests/libgit2/pack/cancel.c +@@ -0,0 +1,240 @@ ++#include "clar_libgit2.h" ++#include "futils.h" ++#include "pack.h" ++#include "hash.h" ++#include "iterator.h" ++#include "vector.h" ++#include "posix.h" ++#include "hash.h" ++#include "pack-objects.h" ++ ++static git_repository *_repo; ++static git_revwalk *_revwalker; ++static git_packbuilder *_packbuilder; ++static git_indexer *_indexer; ++static git_vector _commits; ++static int _commits_is_initialized; ++static git_indexer_progress _stats; ++ ++extern bool git_disable_pack_keep_file_checks; ++ ++static void pack_packbuilder_init(const char *sandbox) { ++ _repo = cl_git_sandbox_init(sandbox); ++ /* cl_git_pass(p_chdir(sandbox)); */ ++ cl_git_pass(git_revwalk_new(&_revwalker, _repo)); ++ cl_git_pass(git_packbuilder_new(&_packbuilder, _repo)); ++ cl_git_pass(git_vector_init(&_commits, 0, NULL)); ++ _commits_is_initialized = 1; ++ memset(&_stats, 0, sizeof(_stats)); ++ p_fsync__cnt = 0; ++} ++ ++void test_pack_cancel__initialize(void) ++{ ++ pack_packbuilder_init("small.git"); ++} ++ ++void test_pack_cancel__cleanup(void) ++{ ++ git_oid *o; ++ unsigned int i; ++ ++ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_FSYNC_GITDIR, 0)); ++ cl_git_pass(git_libgit2_opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, false)); ++ ++ if (_commits_is_initialized) { ++ _commits_is_initialized = 0; ++ git_vector_foreach(&_commits, i, o) { ++ git__free(o); ++ } ++ git_vector_free(&_commits); ++ } ++ ++ git_packbuilder_free(_packbuilder); ++ _packbuilder = NULL; ++ ++ git_revwalk_free(_revwalker); ++ _revwalker = NULL; ++ ++ git_indexer_free(_indexer); ++ _indexer = NULL; ++ ++ /* cl_git_pass(p_chdir("..")); */ ++ cl_git_sandbox_cleanup(); ++ _repo = NULL; ++} ++ ++static int seed_packbuilder(void) ++{ ++ int error; ++ git_oid oid, *o; ++ unsigned int i; ++ ++ git_revwalk_sorting(_revwalker, GIT_SORT_TIME); ++ cl_git_pass(git_revwalk_push_ref(_revwalker, "HEAD")); ++ ++ while (git_revwalk_next(&oid, _revwalker) == 0) { ++ o = git__malloc(sizeof(git_oid)); ++ cl_assert(o != NULL); ++ git_oid_cpy(o, &oid); ++ cl_git_pass(git_vector_insert(&_commits, o)); ++ } ++ ++ git_vector_foreach(&_commits, i, o) { ++ if((error = git_packbuilder_insert(_packbuilder, o, NULL)) < 0) ++ return error; ++ } ++ ++ git_vector_foreach(&_commits, i, o) { ++ git_object *obj; ++ cl_git_pass(git_object_lookup(&obj, _repo, o, GIT_OBJECT_COMMIT)); ++ error = git_packbuilder_insert_tree(_packbuilder, ++ git_commit_tree_id((git_commit *)obj)); ++ git_object_free(obj); ++ if (error < 0) ++ return error; ++ } ++ ++ return 0; ++} ++ ++static int fail_stage; ++ ++static int packbuilder_cancel_after_n_calls_cb(int stage, uint32_t current, uint32_t total, void *payload) ++{ ++ ++ /* Force the callback to run again on the next opportunity regardless ++ of how fast we're running. */ ++ _packbuilder->last_progress_report_time = 0; ++ ++ if (stage == fail_stage) { ++ int *calls = (int *)payload; ++ int n = *calls; ++ /* Always decrement, including past zero. This way the error is only ++ triggered once, making sure it is picked up immediately. */ ++ --*calls; ++ if (n == 0) ++ return GIT_EUSER; ++ } ++ ++ return 0; ++} ++ ++static void test_cancel(int n) ++{ ++ ++ int calls_remaining = n; ++ int err; ++ git_buf buf = GIT_BUF_INIT; ++ ++ /* Switch to a small repository, so that `packbuilder_cancel_after_n_calls_cb` ++ can hack the time to call the callback on every opportunity. */ ++ ++ cl_git_pass(git_packbuilder_set_callbacks(_packbuilder, &packbuilder_cancel_after_n_calls_cb, &calls_remaining)); ++ err = seed_packbuilder(); ++ if (!err) ++ err = git_packbuilder_write_buf(&buf, _packbuilder); ++ ++ cl_assert_equal_i(GIT_EUSER, err); ++} ++void test_pack_cancel__cancel_after_add_0(void) ++{ ++ fail_stage = GIT_PACKBUILDER_ADDING_OBJECTS; ++ test_cancel(0); ++} ++ ++void test_pack_cancel__cancel_after_add_1(void) ++{ ++ cl_skip(); ++ fail_stage = GIT_PACKBUILDER_ADDING_OBJECTS; ++ test_cancel(1); ++} ++ ++void test_pack_cancel__cancel_after_delta_0(void) ++{ ++ fail_stage = GIT_PACKBUILDER_DELTAFICATION; ++ test_cancel(0); ++} ++ ++void test_pack_cancel__cancel_after_delta_1(void) ++{ ++ fail_stage = GIT_PACKBUILDER_DELTAFICATION; ++ test_cancel(1); ++} ++ ++void test_pack_cancel__cancel_after_delta_0_threaded(void) ++{ ++#ifdef GIT_THREADS ++ git_packbuilder_set_threads(_packbuilder, 8); ++ fail_stage = GIT_PACKBUILDER_DELTAFICATION; ++ test_cancel(0); ++#else ++ cl_skip(); ++#endif ++} ++ ++void test_pack_cancel__cancel_after_delta_1_threaded(void) ++{ ++#ifdef GIT_THREADS ++ git_packbuilder_set_threads(_packbuilder, 8); ++ fail_stage = GIT_PACKBUILDER_DELTAFICATION; ++ test_cancel(1); ++#else ++ cl_skip(); ++#endif ++} ++ ++static int foreach_cb(void *buf, size_t len, void *payload) ++{ ++ git_indexer *idx = (git_indexer *) payload; ++ cl_git_pass(git_indexer_append(idx, buf, len, &_stats)); ++ return 0; ++} ++ ++void test_pack_cancel__foreach(void) ++{ ++ git_indexer *idx; ++ ++ seed_packbuilder(); ++ ++#ifdef GIT_EXPERIMENTAL_SHA256 ++ cl_git_pass(git_indexer_new(&idx, ".", GIT_OID_SHA1, NULL)); ++#else ++ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL)); ++#endif ++ ++ cl_git_pass(git_packbuilder_foreach(_packbuilder, foreach_cb, idx)); ++ cl_git_pass(git_indexer_commit(idx, &_stats)); ++ git_indexer_free(idx); ++} ++ ++static int foreach_cancel_cb(void *buf, size_t len, void *payload) ++{ ++ git_indexer *idx = (git_indexer *)payload; ++ cl_git_pass(git_indexer_append(idx, buf, len, &_stats)); ++ return (_stats.total_objects > 2) ? -1111 : 0; ++} ++ ++void test_pack_cancel__foreach_with_cancel(void) ++{ ++ git_indexer *idx; ++ ++ seed_packbuilder(); ++ ++#ifdef GIT_EXPERIMENTAL_SHA256 ++ cl_git_pass(git_indexer_new(&idx, ".", GIT_OID_SHA1, NULL)); ++#else ++ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL)); ++#endif ++ ++ cl_git_fail_with( ++ git_packbuilder_foreach(_packbuilder, foreach_cancel_cb, idx), -1111); ++ git_indexer_free(idx); ++} ++ ++void test_pack_cancel__keep_file_check(void) ++{ ++ assert(!git_disable_pack_keep_file_checks); ++ cl_git_pass(git_libgit2_opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, true)); ++ assert(git_disable_pack_keep_file_checks); ++} +diff --git a/tests/resources/small.git/HEAD b/tests/resources/small.git/HEAD +new file mode 100644 +index 0000000000000000000000000000000000000000..cb089cd89a7d7686d284d8761201649346b5aa1c +GIT binary patch +literal 23 +ecmXR)O|w!cN=+-)&qz&7Db~+TEG|hc;sO9;xClW2 + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/config b/tests/resources/small.git/config +new file mode 100644 +index 0000000000000000000000000000000000000000..07d359d07cf1ed0c0074fdad71ffff5942f0adfa +GIT binary patch +literal 66 +zcmaz}&M!)h<>D+#Eyyp<EXgmbOv^9IO)M!(Eh^5;&r`5fFyP`$%gjm5%}+@M@=A(I +MQ@J>k5{uv*03B5png9R* + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/description b/tests/resources/small.git/description +new file mode 100644 +index 0000000000000000000000000000000000000000..498b267a8c7812490d6479839c5577eaaec79d62 +GIT binary patch +literal 73 +zcmWH|%S+5nO;IRHEyyp<EXgmbv{pz>$t+PQ$;d2LNXyJgRZve!Elw`VEGWs$&r??@ +Q$yWgB0LrH#Y0~2Y0PnOK(EtDd + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/applypatch-msg.sample b/tests/resources/small.git/hooks/applypatch-msg.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..dcbf8167fa503f96ff6a39c68409007eadc9b1f3 +GIT binary patch +literal 535 +zcmY+AX;Q;542A#a6e8^~FyI8r&I~hf2QJ{GO6(?HuvEG*+#R{4EI%zhfA8r{j%sh$ +zHE~E-UtQd8{bq4@*S%jq3@bmxwQDXGv#o!N`o3AHMw3xD)hy0#>&E&zzl%vRffo<B +z)-H|+CWHZ~O*S%cfYx9;02_ohIA<Bg(1SxF-6OCb&_lBkf{t<AM9r;%E(Hf#h{|a@ +z9>mqo=v6>_2NRa#TwDdYvTVQyueO*15Nlo%=#DXgC0bhF3vTa`LQGaO9;jeD$OP?~ +za$G4Q{z+Q_{5V?5h;a-noM$P{<>Q~j4o7u%#P6^o^16{y*jU=-K8GYD_dUtdj4FSx +zSC0C!DvAnv%S!4d<Yg@O<;m`;oSw)=Fz+hrL<mY{rBr8j4pi^88FX3}jKrYUP)>gk +XB^)11aoGMJPCqWs%IS0YSv(eBT&%T6 + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/commit-msg.sample b/tests/resources/small.git/hooks/commit-msg.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..f3780f92349638ebe32f6baf24c7c3027675d7c9 +GIT binary patch +literal 953 +zcmaJ<TW`}a6n<`g#Ya}rZCaYOzy?UGG&Tf#VG`?}7@eHtB=MTqneFUS%75oLS;atz +zm&iUo=ey->y@-{3h^^Cx;#d0zEA@DDc$nY4ez&|=%jTg@_HU*ub=!!y$xW09TSjlj +z(`I@QCsM`!9&80$I98wsQ8yK#)Orb<8re8FjkKh630D$QUDwi~(gkX=RunYm$rDjk +zlp%RUSnzA#6yjdG5?T?2DcYKp+v_lts0ljn&bh3J0bD5@N@1UKZ190O6ZeWr-BuZ^ +zWRebCX%(%=Xoj#(xYk1Cjtr!=tyBesf@m6}8zY6Ijbz9i9ziI_jG9Mv<Cz(ymp*>R +zDH*e>^ga9IR?2wrSrAVm;eButj4<aWB@zzNl|1Wp@4;}1O?MUF>Y>7(E2?b~jsu>& +zRKCJ7bp#19sqYh627wD%D9R$8=Ml$TNlumDypl~$jBu*G>5fIR^FB0h0Ex&TGZNr> +zL5hs1_K>taRb!|ThN9ns7^@4MXKP+6aGI_UK)T-M#rcP$;kN(Vcf#P)+5GzWa{l@J +z>-E{`$1iiNVYxq27}<DnwLRXQUG0o_hw&da-s5T#H=`Y9D_8=eTZ?cpWatp#a1vs@ +z2BjrO)z@aTuI#g#`)oJcnhM7oYLT@~CHX@CNXv4>j;uo%;)r3kJI2xCFF~Ux;$Q%) +wjbk6JlDCM`jU&P+UVOvg`|iYl<7~9k>HHB4I;pdlQ=I-^$DrHaN$@lH1?P!0U;qFB + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/fsmonitor-watchman.sample b/tests/resources/small.git/hooks/fsmonitor-watchman.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..41184ebc318c159f51cd1ebe2290559805df89d8 +GIT binary patch +literal 4777 +zcmbtYYi}F368$Xwipg4lq(BeHMvzvH-4;n7DGJBPqq#tw3aed8+IU5-m)yvL>;Cqh +z8FFRGj$`9CA8ao<GaSz2oMCnz4Rv-gw9b@j_$0GQT1?XYi|;S??Y`Z6`Z;}C6#27N +z8ShS>J?j^$%==FV``-=rhLcPW`McSytRm~mEO7_&_cAVZrf1fFy*ha@8oe%*-aBYE +zcjzZg>LOkgxuUr-XJnHyD;zmPnRaSc#!k_P*d_BttRdc+J6G7za5#+<HG#rlmbrN~ +z8DwU-3}VABEwM=0VLP@^Dy6ERR5_J6cmg|GEh*M1EliqCGwe^ZT-iZ$2Yc`4!I#WZ +z5nGGhn7*jeW=2ydsmfAmm#=8AD<<;TI+#z{Q)kW;yE!%GB6f~7EtEMLdM47Qaz*8= +zIObA(VVj-VG{Ax|66d*hi`+bRG>^Y1nkc2Oowk`ya47uUR3Feu?B<phm31&PQB<lt +zb{W(W4wf#Bab%|Q_tKPS?3^o=5)Z8^Vh(#slNI}pO(f^|{U0GZhLnycSaNd&h?CaC +z0XklU6^<ky6rES9T=na$M8P<_)aKMAMo+UDewAu4wF{#&6diFshiudixAoh|&0<BJ +zR>(w;S{(VYzxh}q-=#zP@uxSx{wbyPUMFU;K(06)$o{07&3yI?q{GqMcQ1c_^M<0< +zF4acAV)Il-V(rCTC1(;bsZ*}bl8dmejAk~yb`B}!^0;g^(o9kGUfZfDOvyp@x4OQt +zSgWh6T|3eq;9MFs8-#z+FDM1h(IjRUP|``PxupgJ7CUHOH90gbgl^2~97`?_X{P)) +zB*$r1cDlF-%azKND}?Gv`2K8-9v5e`gQoft=j?T<&a13c^!wY_$D`5z-X1g?ty&6- +zQN50{8?bUk9AI->^W@~~nkOghHIC2YN+<JiT_ob7ttND1oh`HH28Y+OV~HedG&uB` +zy}rA*r_xT#bR`Q7-*)3t*(!Hf?jKzyxk=8hdi3L^d<p<uU9q_<4k&xEr4@YWv_vsW +zp(#32bYtA5u|s#1+}h`0kwpz4kUD&+>AXkLQG_2-{Pq3%{`3KUMeG$iIn%%^6*NYb +zn|_BdV#C)n4565Vcc<EWC-nglECZGy!j9I4&;hUCzr(?6TftH=0^@!mI^E@y5HZw8 +ztH&kaSNyg=O6riqR^MPOX6oD__Jz@K;*icS)?m$!p{S$n;*EwlO<L!d7;utu(W9D! +zaF!B~xV^2i?wH0s?Lw%Q)(`aPkajs1XojlPv@Y-d5#YFg#KG+!r7A(dJLnkiJMs`p +zV|_=d!upN{TsxH1?sZNdzxeHsmtzTV`1{pykJ_~+^*>X;uT8&z3vSi!HXGbUj2B!R +zdz~&#<?<tHJql=W&((YpzS06y-Z6Cn^H!*9qH?pOrD~(GV=JJ~z{tpLnGK|xp&C1` +zsbn7O86xjF<~G*S1l*;;Bh%6><Up=oKy99?62P^?M&22U6QFRBXLb&u%=Ur<74wRy +zMRG!f{AvZ>fk#L-&k$fLwo$4?>12g@AXOKFekuo#6EHB%gmpD?1eyh%N8s{2wGoTu +z*@6cEZ^ZW!FAF_|JL`NkV7k}0ow|-2jHwbgH0;c@Dq*o?@&c*HnGdyx6^su8Qk%2{ +z*ye(dxO*6-&>qn1+zw}tc6;=sOX{4WB=VqjTS^))y1jlX2Q;=e!qMmFA5lC$#;BxC +z=Y%tRpWxb+_uQAvAw7Q{HGV#R$xb&udLCzZ+HN?kTyB};1EJ8UlQ5!>5eGW@)RX0n +zkjj>EF!3=0Gl^8dzv$B^NMGRxJoqN4A`xq-@wCbrx*u2NmIJ1<fUDQ=*^)h6`vzco +z3F+ro$F!F6pc<B;<;isobIgbVGKUBByoQ4#CO({S7g?<Dh0^!7uJ3gxS=6F;+^gQc +zeKi4`4`Fm3p|BU2v{M|-u!#QGCXiM=k=%np0<ZOPQqEjP_nneyOdgEuG9IH&YYPtp +zKB_dvcYCcyhyT#<uhUEL$o~!TUz;cb&|`uSM{Dkv%&W2lcpYL&kv)tUvVv?&>xZ%H +zh;{|4T3(!E9sY#Ni(wUJYs1MmIc9bl)(4Nl3_wD_BWB>i<1S(LX7m*{Q7PU$muMS* +zM!%0EZx-Vw=Zey;erC?SNxF;pY@^A%-krqzfLV2meBp1vWdyArFYn`DD19T)Hw(?n +z)}{NP(Lk(o*?gl#B@pP7^*r|=;PIDT4|F#{2Hzh-AL0Rv$6uT;<CP7qxbYms@WU7} +z%}TsHJ!V_56ZFF{BfI=8jTBxMEATG376pS6a;u1@c?{~sL<N52`U6fuLkz4P@Mb^b +z2`Q48y&!C0&A+WRCJAdmo3u2#?eI=si9Vm47$|`m**x<wKkM=QR&g?C63@P5X@xP8 +zi5QG2b-Fdz%S0%1{kKvL%^RTdpK|SU^VJ7JCmKdwp1`;HRoGM7ef^k_s_}2An=cql +za|{IaxQWpdq<ae&x3BOJq+M5QNIk#C{Nv@u>n|WzE4=slK?on@(fZeGhRgQCu56qB +z{+n81Az96qnQjMY*-*r-KV*7;Z#4Q<xfjbcBx_6JAN-HP@bq+eI%HhAB9&vLyOap{ +bw<Ywj(b#kdcCk7dCBY;|DBNpPjIa1F6*dXN + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/post-update.sample b/tests/resources/small.git/hooks/post-update.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..9f95e41a39cf974958277c8881ac6cce405ebb20 +GIT binary patch +literal 246 +zcmXZVO?HDY3<Ti4Poaiwjq^yGw9DKf7mz^&Ly=V5q$H=W^Rt|p_r9s#9Ea7VERo!9 +zyT9>uJRJJV$M^KdldiMhj?ImK6~FvwJ*L5a){QoM=L5TYHkGO1$UrO3`a>{?Opw|b +zG(#59NQ#jFL9v~vgOVkM@^^(^A}onOE))yWEwhIlk&{ZyseZ^O0b=w8&O=BK{k<5B +k^Q-B@eG}LeHrquz%(SVEp_N)VhYZikCW__82JXfD17`J9Qvd(} + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/pre-applypatch.sample b/tests/resources/small.git/hooks/pre-applypatch.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..625837e25f91421b8809a097f4a3103dd387ef31 +GIT binary patch +literal 481 +zcmY+ATTa6;5Jms9iouO45IBJXEg&Jm9@v1LPHMM_ZR|;#6tQ<EeSrA%_2`_rGr1_8 +z?aM?yVtIc%-@9SGSk&8x=grP-Lf`7!^=$7xgL=|ysZ}!av6zL~ywui}<2##V6L@!k +zy=p^)V7%Wzs-g`9<Y9}^)&uN}BCrXR_T3@Z2$gSJON2`X=mAs+%@7n-2I}ZrP|TFA +zvJJGDl3HPLP<@!Q!}zXQvey#qEE#a#$vs97i4=A0stF@YQ)k_ZajaoS^dVYBc&37_ +zVI(L=X<V335r9~7T<;|HfKF+yM}}LB9d96V)Si;sj(;9Rh$#P>h$71hSXq*MxP;V& +zj0cY7SCL=x4`a46sF)C>94Gk%=3q$W2s;j6iHtB2$R0%gix4oK@&T~=ALd_o*CKxt +I-`Pv{1Bpzc>;M1& + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/pre-commit.sample b/tests/resources/small.git/hooks/pre-commit.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..10b39b2e26981b8f87ea424e735ef87359066dbb +GIT binary patch +literal 1706 +zcmZuxU2ohr5PY_N#pZ0-F<{-<Zkx1j&cMNSQ3FN`GzR*R1O+9oPV`BnOj7q@1pV!u +zrF0Hl^i33(yR)-1d-!H%&2|=|^E~_R{N1zNJ-&Zmt-t?iwXv&i+ZN}Km(TX8Q$H4u +zd7(m`|1iDmF5k@xV`p;C4zojASmLc}yN0QDZbhN=ri&CEt=XGuN1IwjGJ#a#`t-kG +zDqY)}7+Ft|;YKwLYbtg$S(-TBO=x3cP1cd}%f4kB!<6Wu-dCwz-)KDMEuM^_Hh*UC +zC`1)|)T<(U6b`+yOH!6p*Ll}@qastwA*dyjsgOf5C=?LTprfORG6O{5L%@S0wyHpj +zu|_A-=NWnYYR5m7kvm6|&T~GzoJ_OKR3sgFUgw?ifho^NQhvK#{6g0=&Fh)%n}#m0 +zk1sNmwb_AMDq};OOGw5|;OyX#?yQMMH6yAk(x$3tjFjHE?c$E2XC_xXav8tnIeIG? +zYMI|~MLEVGkuT*>v&v-X^RA+u>k}E$4d&uD7=g_fA8+pNNV=4s0|iD3p<=DTXClTS +zXV23tJ;ECmN@M0j@zUAKEYW@3bv!SeYZ8ZH`YQNTApFVNc;F|9r5p4TqGs=>8E?6y +zi|gY{iM#PG1nL?UE9YCnWTk72kgZPG*Usqw!~Qd3c?~@w2?%eg@~)+VlSs6N5Yf2^ +zz;ow<fjf3n`imj7u5lnzt||q9QFM(H@<3EJCK|l5P!$yDfn~U-(5Vu7s+GqxNKyeI +zP=-Oa(KH&gK`NhUa`cLj3B8%qL};DR7dk!`A^h&3-hFB6p($5Ufy^tGir)3et}qK4 +zpkPKYWzC+?=&gw-L6S)S=<lfq)%uLUAa%~81Jf9hk)w~U!DItnoSy`m^}#38M}K-o +z!PqisQkV!&z4E*V01ro~qlVK^0BI`pLk6D+)f~*y!hCvwHq8zY9BGh<2s$@b^A<8G +zRaqk}&qZyyv&|0QDFPA%h4TgF&vdlc|JUq*=>F#K#r^&KMq1A`oqVGFpD&-!Pv|Rc +zO3KSqA@h9nSc%bm`0)Amk6*J}@14J*1-219l%%7D!Pl}UK>|lVi0Dfgu2jN3WC!uL +z0ej??b2iSehVgdnWHmZV4kUo*QL#aiIp}U=9x)IXk}JJ7VQ;CI9Rtn5e0VcjbY<bp +zv{}WlG6L;H!EzFKdY>cVt+`x5D+svCGD<sXw4|)E|JX43I1_3P(sI4{wj87bPSrNG +w!SIr>;Z5hm*<gY+X;)Ryx4=nzaab9m`bwE*^s(%u*E3HbUuOR@+&s_z1=MCi2LJ#7 + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/pre-merge-commit.sample b/tests/resources/small.git/hooks/pre-merge-commit.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..d8e8ad4bcf8337f23c78a98537ecab4831301202 +GIT binary patch +literal 473 +zcmaJ-O;f@!5WV+TJd4B0whSt$H%Dh2t`2u6q1!glCNbGU;n%yxdNsG~zR#WA6xIwy +zWEZHoU#u?nykD=Y<HPgeWDkDm^kTof*l(|%^gh!nHrZpo^vhMDjV;E1GD~K7wV*+D +zz9lry9T0cHcm_KhDVXYvQ==FrLTT4u=bEr{U1yl7%thf%wJnv<XQZ`ZbQEezaWdS% +zI;c?h9a)Y!ux<WK8rQd_aA^?61hv_Pf<t7*z1USuL40FxYz<|hybsO?qnN}aMpcuf +z6phFw1%Xx=wUk(m>E$jSEQZ%SQ(}oLgslTvrKK@9Qf#b!hajVFnp9@oIix;NcI9Wk +xjnh0ya!AWet{I7YpD;y6HXyzI*lfSvH=o6*7mJZPkuaYpm>vzZ`wyGEBtOQPo|pgt + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/pre-push.sample b/tests/resources/small.git/hooks/pre-push.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..02cbd80c287f959fe33975bb66c56293e3f5b396 +GIT binary patch +literal 1431 +zcmaJ>U60!~5PUX&#a1@z9B{IIZkjLT0t5kq9#8~D(I5{+8&J~9;#ndUk~-ZT`r|uG +z$#K$$J{TsK<m~Lsu9iP+t-0TZ=sa(K+C6);54X>s*LP1}9!GoZ@4I4myMMG_di|of +z%?llx{O8TS-#^<H#%^V=)RNv>;(OioEmPy%kwWQBA1OMzV{hsQ8XFzS1k!~YQoLa5 +zhtP1fA$q6VmMbbAC_9)4I628k*O5J$NR19uHe4QYDK<==I~SQk)Nu%xQ~<Hy8U>KH +z53w=!ke(FGb_PpnZfd*+hnXDTn;2*`u^~;?+5C~cn?bRka7NR%06%e6O91{MAgN6J +zmlO8{Biw4&wr&&(z4p3eln`E}XR9m9bNYZ7Ibrg(4yZIXrfgD7N*AFD7L3YSM#j}% +zo__rOS5fr;@8UM<6cl+cv_$YB$PQ&9dv($eM*))g!_cu!QcSh-mqE9i#QDZT)=o#` +z?8!RtE?w6p?GkGZ-6yt_p~5~4ecu|Sf^)6096%h*q-eNiEA1;Xwg)p~Q&iGSG7-IQ +z9aII&`ps$WOojFA`*bjG<mBv1n0hcYZWN0~(X01-hx(ExqWqaXgSk*@-GMp|K_3!5 +z9|O21N3%~izh(4fbp9wzd+!b&7cVwSP5H00)m5ej-(s=Pl#(90UOhn@OA9u+D{i@r +za4*CP0I#<d-)-#xq5q-iY5nIef2s5OuQjcA>kFk|E@sHHuD}W^d`7YJ3YE^zrQnqR +zGoq?;YGKe)93o|_=^f%3U1KYZGPOXRRxK7w`UUbMMa3<86OmVH!EKP$8RCrn9mWX+ +zC?9yF!fRVLmud3hF<}x;;sR}f(*r}6Gap3fR6zLHR~kbMgD{98N`L+r&?3p~*0+FX +zcAL%j=(SO}xTJUTvA`&Lf`2mv4koPG9&|<CA~EHbWHMoFPwT(&U=7t0`RoFZPO9Kq +zwwe$i=T|AXY#hD$aZlNMH`wZ%gwilGJ(zeYpOn*F3cy0XKXio^Sj#WXx=PWV`WGaA +B&~*R+ + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/pre-rebase.sample b/tests/resources/small.git/hooks/pre-rebase.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..193ee3f127387f469894675f0d621b5bb9c275da +GIT binary patch +literal 5006 +zcmb7IX>;2+68$XxiXKL@ma;l5d2^5Ba_rPh_DHI-u1#&_upttZXp;no03$20|NFiM +zK#D#xQ>!Z3JkX8T-LDVm!B5j7y_{;JDmmTTef+K1oIiPzeEr+Ai*<2PUgnG4^ZB>p +z_fkAvoR1emuf~ri^K$-px=4#D-v<wZ2Xv&$O_eTJh6d4)=DWL(NBs9G{k<+yMMw0T +z$VH*-+LM)}u&m^`l8~1nt(3Z;R8v(KbY5#i3z+~8h0D}Xvq&3J8BMWDizPNpaeb~9 +zBN9bSkthfXzskapf%Zt{*e#}{QaNiaAVZ4{$;;I6<vKNhO@%7P-(;l-x=pPoExHC! +zB(hA#cDdD?s4P=!)=-K{<kHAWKetl-8I8wwO<ihJNs-$dEvr;&S_@6E=mNSJ5;mg# +zyb)MbqKH<one{qrV;ZQ6WL}yLtyi*ekNLf|uC6M!)Cmq7*l?g0d6`MlE49|}>Y9w& +z`bCv#<YfTKtb`!}CyNYd;|(C?vRVQmWOfR9X?FZ#=f$No)^#4>2zVn=YnJyeNey(Y +zRh`9vtLw~A+5zsjp|W0Nsa|29Rm!B>OoG5a+vi;ari8O>KkU!KAWg_fa3btK2x*_@ +z0bEc7J;Ubghm}n9bOi(Sv_B66nQ7U)J7f0fO}<cB8i8vG{r39s_>8Wuf*uorcIgEG +zOHc|-V6+HlRhOP}?Cn?@5iwSl43abmBA^2lyL$+cpabCGVES+v^j^FO_}?FIp<qP? +z#_?*YMHIkyZxJxS;h@A)WDJ0bN&+F-#_lFjAf^g_Pb#5YXqYe|dZUpa^zI)VOBXQQ +zAMhT>%En%Ll?Z*7*}TwrZyg5OSZ9rY-`aU~Mc-jjv{Ll)FLMgtB4ujktfQ`Xhqrka +zT=P!A;9w^;Z?PqpLwOLu=cj3L>TdUKw2;DMu)`oVkj}<z_EjO_2uWYuvKG==%Zu?h +zJiMVR^c30RbpW}<+z;jjoNC}YI4f6QC7d-08*4mCB1>#bcDx4tYg=j%D`+i{W~fVM +zVmZ>W9VMyin9c-0KzI_;iZ-g|OyzuG`Yq%(%dvl;ifnVr0;jWE&S`z|rQu=!yHBBO +zx`OJ;oOQ(KKM<$(bC38o>pD0%|HA(E0TRw7qj$fJ_pRN+7Nm>dS<q{AcOz#-;d7_2 +zL$z(_nhH{vOzT(}>C(gLg{(`t+5Z=?o+}wXU4tHy+&%F&aRhFebeEhR2R5|<c6J); +zEY(q5F5<n*XP0|=PtPBn$B)V~d$Os-?&8UlaVe_|jdkzoWNsTP-_uyq4$R6o<h`&@ +z{loXa{^#TF=NJBYu9qB?hs}x=It_O}ZjX(_wy9@X(lmkRpNi0{8T{O_b_j*JC^_SM +zz3G?1$KCNWF-|`Jbx2cQ-y5LW?Z2eikngTZmsx5C(@({8<l)Ue+gIp##Mosfa~iZN +zZ|NLN9uE6Xaqpwk+@D+f?$tg2JRCY`pwZwbR9OvEn*zYm`ffKIzl4{r{ZgjfpbuX) +z_r0=0y3)T-j$gljPyEJO*6Y<pj7G72aLoqaTpc=#u)*xJcVUm0;k(n;r)^DQNa6Oj +zWvlHEGg~lz`Q_8`yQ9<BZ;ylE1Z}bD<8}<uB9Y5lRB=;JUD0h?_)4H&EhJjvwzJx? +zr<o_vk&75j_5^d$8Z$_Oc1=R-I_DlNZ2@~81oV*J6%o3RuiCz}^VEW>$#Ycbp^w@t +zTl%=f1t=w+WpJzF<|CE@?SCNAz)%9?w33lQ8vrHJqPfH9@}qs*QXOG71W=ylx;wOB +zcx!Bj^)Yy6WX$a^vBkBJ5Cob<oubBW+a#9bX{0bkMTX_2sIrs`HMk@$q{dK5h2-g} +z({`~#gm#G?c#>qlaDx_B0c<3b+8)f84LCrt;e;qxc+7>VbwVK{skNv!wvBiTa^9Iu +zkwP;VK)jH$WJ{`MRwAA9fal!y0dtV;FWg8PTkWU>CwnqD>1ZX2B@;$DlX%C5MI+}{ +z9xQVnffR*~v2KAUj*hCd<gRCjR7~6Q(vF%VT7j97iv3j4Z0p%mU`7t061~l7b$!#t +z3*Pveii}aQ?QD9aiX>gul~`bk#mk`o>zk9)<2Uc8?hUZAEvd!`9em)~$Z)zev>w^8 +zyAgCP_$&Y)7HSQ84`xG}OeTavaEswwF|8Xpi5iZzZa@hCiv(J-%bfFC&)HLlO+Rhw +zG6g?9eL5&A!SuJnQ6}LxG%tU+@vZ`i+!+Rz6iYvsTdhnPo7lW{m-}{hya@viX4)XZ +zngaw+j;gloB#|UwI@8sOmQpc`h+bicQJnQIB5eifIMQNgD2+oai33m!34~xU|0Azj +zhu$8z+T5^;Pxx@d{N)pzOJLSa^e;aDf$W%N5XcOf!mGC9l9j$Ev2h6N+6ZQC+CJzl +zaM7?S!SrFLS2DASjj(h6y1WN3N?|bmqmyzm!&nLoE|`rKBOc_yDF$a#FsUn!IQf(t +zdC&Us(kQz*7mv<H12p@UD8XaLXdK{>H^j*^MC@>wTDb}g%~sx*ng#>{@lR=XG-Z5_ +z#<9*Oh0joMzt;nS)ObAp)347`D=}r-;nV!TbIq&xrGRGsF6fZg+!VkfUei@_&l-M& +zPqQ+Dw)RV}+)I8RuqAxa`Pv8e&!_gXS=e2-un>=Ktn}-;%lLZxaVn?Q>yZCb2R3Wk +z77zr%;Rq&h|2ncqyKYmFI0148JVY7Q$V5p=dWj<MQ<8r+@QLq+UROk&%quICq^O2C +zp(17882jXI)_GaqzAY4AjoB_nh8k*r1mJ>+Qqpu%i|xp2<qF`Tw6&3`h654ceBjZ7 +z4>C=WaOb2Wudn^h0EcD%$p9YVU1fnoRV9`(cy(vv6K>FXS!2jY>1GnU--7)4usH&K +zao*&P^@9~YmUe|ZdLW@C>H;!*<TIU}-!Tw#3oqZA*99}b3&uHiGO<{I6!pMnAiQdS +P!fA@Yk4s_DjDP<F98V`a + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/pre-receive.sample b/tests/resources/small.git/hooks/pre-receive.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..32b597f8c32399017c3d7d51134d1f6490ad9575 +GIT binary patch +literal 601 +zcmZ`#+iu%141Kn~f>Vt3>Nw4M*;=?j(TBD#O@XCv0|MEhA;z}kTFRv@`tPHhp=&Yh +zg%Zhg4i7o_k{a5i&f5;tZ==%}^Sn4aD_6%qs<o-wO_Prn;}`SPs_*$C$(7T|$#C3` +zPt%-C8gelZ1GqAP8`ZQmg0{8-S9H{R@D>_XAuJt&EumdH4Yu`UjT<s+s_~uXh}qA8 +zg|_HG)%7Pdc&$7*uR0HF@)~vmFjqyD?XZwCbLen^h5t)sm9<90Oa!@Y%8!~rF8G?W +zkzmCF8kMtuuelMHIAlqqnm?72LeGM1J4`w(kX9&%LQn}ForlDLjBoCyvxmo@x3kH^ +z^loxLyPiDWPo-cBMnsg2M6}kuPGHEGBqVkC{D&9Kt%xFAsTw4QC1$_=fwBl=3dI+e +zaSxI}JS}=Z(Ec80eF`!Zq3mqapXI|UN!a)t;@4hcu%Eq2xcoW}%!><-+XHTuHss+b +YOmM2;hq8Egm*4=7_P9T{21QBYH*F=mfB*mh + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/prepare-commit-msg.sample b/tests/resources/small.git/hooks/prepare-commit-msg.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..b1970da1b6d3f42f00069fd17c325de72cda812e +GIT binary patch +literal 1702 +zcmb_cTW{Mo6n>t6#i?x6xmZ$SFLf{QfG*3r0L?Pg?px55l8$UTGO3bO;spKi{V3XX +z))weX0X>M9bNMcZ-6yG%>(n}JI2|25dr<ew@wmMG{l(3lx~bQz>}WZBP@ih?JX^+@ +zu#5O48P>yRX(m<b*PU*sORp92TCD1dX`%HE+1$w5k<(Ngu7zQ83#MGJR?<<W=d@yL +z#heqwo{FmCg0g#x<~R+PBD#}q(MBn;V$x;%UrJPP3*l%XtlvTWChI2SfJ$9e`YvSj +zRSOQ?NUgSMLI`3vL48YBHzwzVXoe7v0ef|0YHgV$N@?N(-R)rPqRDrK$n(%+OF$`P +zWdjC5N~`#RjV9}aYwQ4_yF5O-$h2`>fDIhYP)doc1&TADZa@ZGpusJ$6G+e$ZMcmC +zoOosDQPS}l{H?YPsq(4;0SGkATa9eeqAaDcj<jNAU+LTSmM1jo(ti~T0B7acJnnTX +zTarYy;Husdxal0!S<ba8=uu&a*SNYtr7|d7$g-q3_JHER2*oBsVW~i~XXdMx%LW~0 +zT*960LF<qZ6K&FZ;vGmtyywBU3^Q>q8n2wALbFwU@2i@FAaRV!=uw-nwx1gKn2SvY +z>Ff>;2sg!+Hxfkwv1lsiii=p6WenF=5)6LZc<a$zDCD$GRuwvG4Fr+B#h?#9gTbio +zk#MdxC@WY%zSGN#i}Ts_#q`bf-{)`7CcWeB*7WlIyHjioJJWw&A5VItPUq3^9!r}S +zbykelFV-VFvcr>QaZ=aS_}+-4Y&?!@HWh|<^gJ21!|T@+%On#w6azxPHV}XsRbe*w +zR_TZ2XEsQa1lPK~biYqg@0-RW@5J1@=<87cFzEUABdCoFH2CZo?}l(Z*!OFqUxo>K +z_d`l#4d9|H6;VPT{X?^{VJ>oL|D7K{BJwwqB>`YcPoGk+9hbvHnoQ{EM|kPgD_`wk +zKm4#2xu;-y`RAm!=L_BnLvJ8$AZm8@?)v<%vwvsw8AF2x6!mTT;c72A_~U9nIq0ST +zv)N0!I!^1p=g8-RQfx5)E_Mb_4I2vtQpI30XZ&t<!9D6nI|;V7YR3)l6=S~QhuwLQ +g$e&^kTY-M99*<-Iw@(78*M5W!4}U}|8YyMx3->-9h5!Hn + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/push-to-checkout.sample b/tests/resources/small.git/hooks/push-to-checkout.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..a80611e18896f212c390d845e49a3f6d5693b41d +GIT binary patch +literal 2840 +zcmai0U31$u5PXh)#YOS7cE^-rw@uolNhe9&aUS|HtvhX>G$45tVUYj>fRdF?|9kfU +zNR~aG=E)WbEbeyq7JTw}ZuHIE2kUtL<<n;$&G!2F^Je|kx2ug=4L5!H^!ogx`7o$& +z%Il(3zAe6<oe$^F=A|}s`8}CDp*M#3M)gC-)LOeDUpYMl3YNy9R)I-T)pE7sy09aj +zJ7%&5PnSB-F#2{jc><WLR{I2izuK%VHc+{hRfXe<^_q)8RjcE(6WX+F2)iAtDtI{x +ztAHVBq)eSp_E^xcV^i_5KLIHA$g{zEjh?rsacu+(Eyvve2~Kmw%;n3g(kWB56j~Js +z<yE5tYUsAR&PY0wgRvM8x!zgLX8SI!eVY&}YZ|>AoeCNptd-NM1aZLhESzC;I`+Ns +zfmNNjdAp^W8#Q*}l>CT7RB9F5(BbI8ly2l~+E};JW|>&d1)=epZ-8vm8ppkbEVn#R +zt30a5A-c(YQR8eM5%;|UAnO>rt!&@x@G@yp+92%w-}%(5P_+P&Wf_zb$f-Qrl5(7z +z2ah(bkE;!DK(&aAMuQ%1TS>ai?wSXCOCSj=_}8x4IbCx^$}9q)<W{Y<9o<WqZo^oV +z3bR;Qa%VT-M~kU@2n{=+=)C!MD`12;@<F*EtPfV3K#g^1%&ggH?4{m<R$WEKcUI4% +zl6{ik6Bo46pmNjdXg5@?hn;SjG$}rr3Gy#-BGgVD$8oD)OcK(oqca)L_kk)UBZ_&6 +z*ourb#Yc8l3J+uSda_Y$GY--5Zp3QK9w^?P%E0xb57?fY+Q#+KU4)+R>whwv)SBt| +zg#MX4;;Oau`m=MI9(^&zPbueY@~>3*ixX%mvR5m_1&nAg@ZKvY1E$O}&EtLiG;mhV +z1xhMIm~fGjmf_#{62f`y;09?I7M1W2tWQvz<}i9lR>OpQyUJi45_&*pQus&EkwY<> +zI|ZAx=*3i9a-)g)hXkvO7>UJ5MNgL(Z+-wpXVcgbSgpmFmbf1~DPA(OVGI&FNLeIE +zNH!_aiH$vsif$_j7=T2{cS(!DOI`~bn@)vSd-0d7xL=DF;UNP|tW}4i<qWTSNCe|y +zg9kV&L9g;FhC@tvsVu#V-brqShHy2qZpA!gg{ZTY>h>DvHtu9tY_pbJ6x(6E*hxgC +zzNDao%qlr-IE%YGbS4hF!n!on7#W3$bX-_hbZAaws^nHu#)Dx=WzdbJ>AKzAy@T$x +zSWE^x9+|TEHVEPyaPYa0DOChp?AeHSBBDbZNokQpAY{lE!7geZI=jV)G^2@<iI(N4 +zJLJjy@Y<VI$yq;3bVpJICW3D?YDMDl4Oe5pDf{d`i1_3Qx%4uX`$dOz<9e}jm2B-u +z8-?%!7XuiNF2O&MAdl-iw{drG+$F^zT2Z7WRV#c6;IRZEf>l)&91Zb1+`T+oq9wWF +zRV~kGTGce0O~p^6mj{kT5kL(pv>r;Lvd7VDX*P>A^Th`$3cWO<svk?_?FeP@458*2 +zA1PqUOdd%VP5&4~ocLK16{1GLll64c=mU81RMFstpnMoLuI7hNIE4N)U%h*#<Fz{C +z9#>0<l7lRrls|W(8=W1O80P~6+U7<4BqC}N4-4GR3w#{O7YmH?JxwJfru2d?e){$5 +z@5R+`7Z;1)FW;OkE-(HPisCS;5F4O^Q>L81p4Ysdo3ZP1(SrR-peEdTo;-@bkB((G +zPHYQXUL!@Q$e(OQ;R9r%@Afz+50I7>*^^c&&|E*r-jN)LH=pM4AqMwWxSv|nqjddE +Z4{_hwv8!W(<d3>T<BC%y-6O5i(|^OS%`gA} + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/sendemail-validate.sample b/tests/resources/small.git/hooks/sendemail-validate.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..effa6f54f2a5c1f0cebe258bf4805904be4b4852 +GIT binary patch +literal 2365 +zcmb_dU2oe)5PUX&#g-Nv2{5JDX_MA~3%Iq?8g*kpRgpYZIFU=~BI=I5J6e{T{`bz^ +zk+$48h#x9Ika!=nv$M0y{clD}-j1x(hDWbnzP?l2k8j?TH{brS+Nf21yPm)Nczma> +zYw`X3V>TCdnSD1ru8&`j=2DIPbCT@SnIgUw>$+lEYP}+x8(BMYnr=iT3*ndq)xzaV +z>I+qjv}vC#8_9M+b1p#uNS0M0)q<p>8!3p_LRQ0MA3M`!2foxzRUjbFY@}O~(ki=S +zqscnq8cU*dY)D$$cqE}n)V0yIk>CNKHCrndOtSP*HbOb;nbwAHSb;R+gs^?^Dve%) +zoW}t(*D}$>O3ab0TS^-;J|u&sb-PkZzo#kn*#xYt(;<xzKW(YtQZ$u23?yV#kyh1~ +z@+Idh;EG5jXx8@%<;Y_W8SA=|T;MPQ)TB!!<QcbU)YR4)79eeeg4|vp-8jm%Dl3^I +zRS7+i3>FGuwzSb^g&RDiGcOz9TB;Hu`nJh)$W=C=XCSm2AY=$w3G3P-V#Oo+N*;#2 +z4ijJ-pBZ=;T(RTgp_HYrD!uW-dTMfkuqY5jwOy)~gM;#=P^i{!l7`pXTS^s(&^{RU +zydaw}OpS#^D1cXM8?FW+fh`t7D(g;yr6|}fdaNtZBx3hlK~IpkTu3!Qq%R+zAo#<L +zU&m+XIFB0>t}Bs8^3$vHD+-TGT@`F>H1Cc#WAVW;&$S6%fE2d6@kLS0g&ihIM{}0z +z8#XhD>b>3{(BH|Px7}&lJ4%y1v<t$W+!F|W@<gaU4;MqSHKR(wdML<XnCv;zaPrSi +zxVCvek26-bf#Q!H+uAgy_{e_1UZCq>(CihZJx@8MPoGdl*BJGD;usf*iS7%;{Joe; +zNFuBa>*~o&qETDPo~u&~$FxE1xb^x&(CbE`Y3GfsibL2rl+L;>P6j&Y3U>K$mkp*6 +zd`Q{<^+^&;GskGjwD-%!boR&i-TC<Uvy02w+l$Nb?B}aL-%ZDpluqd=K_@}z*fyuV +zzAs1Hf?3v$k!X7GTc8Q=r`WJ_Uu=>A9UOR|@=GYb5x#<f&WSMH%mCJU<#=7=qFdL6 +zG?Wz&6z&J<@I(B>+dhd7fkaVIR^pol`Mv+rUbmZ43dVL6^S7g3{NsPiG$iy$5EDB% +z6KIgnb$H(n&t3e4E6d4V7w^B?JS}JkG)PM6+X3Co`SQs($O*AA+MG~{S7RJ=cy-l& +z>~%3y`tjfx2>uOu<lDGWewcb=oL@}B@B6FCZ?oxSJWldrm%UfOduahk%C0H>tB_^s +ziwG=e=ch|FQ0IkN91US7rhdQkXhwwt$gU0WEVDjo=IPb+?6PC=s8}J*ua(Ms))`UL +fi$|vMHn?H<rred|1&u#kOoJ`%vx)-*g-ZSfgGvdP + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/update.sample b/tests/resources/small.git/hooks/update.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..c3430f6fe27e572a1cebdb2f2bec70add0642a60 +GIT binary patch +literal 3707 +zcmb_fU2oeq6n(aS#jRq*br9K3y0z;^QgkUc^kKlTrB6js&@yE)mPu8l<0$L?`wmIT +zrsXba))@gJi@e|G+<SfSXe`CeSQ}OG@sr8ZTUlQ{dzM}Q@O-hBi}GeUom`#X%FiYH +zX?m4Rna-0RN2lfK)A3ZuvHcz$L<jUn62D=~vfz{}wIH2VqBLX_O$(JSXeF7H$}q!c +zWY}C&R;eX%X?P{%d;|>_tSE3ettp-hLlsZCxaLX8(nU;bVRB;Ce6@s#eu2|WvLz>- +zvy(&>Gyfp@+BtKnpqWkKi^+v{4jn_pNw_zeuxE<mRXKx8G3;9pl+45&4~hHW!G@wo +za7?X(0B}HbX*ExkDmas*xzV)FxygC8AL?2Z1x-0QJqS@qn8sD7r{bm30@<%eL_gOw +z;~85O$Xw2AS}Qp)5ViRUe3|ir8;&&I<B7Y6^!kkNyYXF4EY(b8_5DsTYn_&?wkdEz +z0y$tADo<&}nGs5kg2-J=0KlEGPb(%<An(pXY{K`qIZCuwiT|2{8JD&5o_~`o6<;dD +zi@J#zCE4={8j%<uy|iutvHu1QKo5Tno-BAF2FwD%%O#UDDum=w!;!PNe-cOFNX4)5 +zd>TifiGO|)w}OANj2n2D^K=o3j6P6uOL70#cbA{uzWXDlk1wr9GV1X(2W{RuTvjXV +zCmd<W?kH^?PXjkbF`XZtwu1B+%4@ZvHIwGpJ*8@8`MWAhq^B|Hj1lzj3R8bVuMpNb +zz4Gzk!3T3bY;WEGIww&kq9BYW6EP*q$K|EB-@TH(Fjtz*`HMTO?i+3E;5tdSah&xZ +z+t!x4K7)dpy5wiJhlJz~8qF|r8a&-SV7^I3C@_q=P`yt@_x_F-;PQR)fzP<zNN>8u +zH%V`94=q3)Dk)PHNrnFC(T1)Om6f{Usj;u1R->&XoCYVK2V3ZlgZuF?N}1+33<P7e +z<0yVF?Qoa{l#7q(3&jv=Ab)gpM8A7`p%3InNzSxy)ZER2U0C#9zKpnLY0I?>OER*x +z*9Z=L=zI8CN>A_^jYjt0F$psO$sL=38q5q|SG)qCN6{^>RFh5E&l5GZ$pEahnF&d+ +z5c>64t}uJPkf~_!VUj#&N%nC-gUMj%=@B=!V>&}xtj2%@-mOm#rQUSJ3(ccmc+fza +znZ#uxF>N?QN5UrIEd!5RgHEf<eGg}P45aAs(Xs6u!XW9r1I*E6XJ^1movX@xYLuPz +z|7xBN4z@b}#x>W#;(nKYF+D<*rdshJ$X-z2OZ2X;)nn@KSVdVhaA?}@3;6gZxb4<W +z`9sa`0lR_azMX|=t_(FvG@%w2);9P}SG0u&K1(*oX3};~=<<!N*F$UTSxD{V&6mgL +ztw9Ntc2eOF@c!OJytNC4T^#)Ien7-`dI{6s#co~0f^E3J<0Ty)l3xq2u@Y8DXTK>v +zozoWSr{{+!h}zGpumG3H`=AvWpm^9kW;J$Jp^Xl*?8ckr`fqN%c|Z;VC0|cM4vSrk +zH_O8Yvh85nvJp^;``wo8=z0f`FWg?`>gO#y1hjX1{}rTlg9rwIKia8eyGexA3GnuR +z`Rg~XZoW;0pA)vI8=p5!+6sIn#C^FCvR>ffv39h6SCNi9v);%WD;WZ`of_MgwyRWy +z-yY%n*Y>X8<Sf+RyB|Sr2YG@1w~%U$o`(5EDkJ|3$u=eMZA&_wxEsy<Xxh2k^tP?4 +RGx&ZHQs^8zuIpu!=pQhfp8Eg* + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/info/exclude b/tests/resources/small.git/info/exclude +new file mode 100644 +index 0000000000000000000000000000000000000000..a5196d1be8fb59edf8062bef36d3a602e0812139 +GIT binary patch +literal 240 +zcmXYqK?=e!6h!x)VxWtv*mf_t5?px$aS_{}Hj?C*<cHXeXE&AZhT*-L3ZoI&*l1%Z +zqG?zr3TvQGZ__}H4(u*%p*rI=cU!%ya5ugfGATh66$IJHgu1Gs0-<N;$V+SsdE)?u +zIq;i$f#WE4f$_MWicZjMEob9LWKMR#iwZq54~QgST^6=i%u0lUkJu-_J**QBMq}ZG +Wth_)NDbl|`oQr&HAFQ5h`0jqAIZ*BZ + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/objects/88/f9a6eaa2cf008b9bc92847178621f21fa99f3e b/tests/resources/small.git/objects/88/f9a6eaa2cf008b9bc92847178621f21fa99f3e +new file mode 100644 +index 0000000000000000000000000000000000000000..7d80b8d78e0dc55669d831a6638f48ec9fed0982 +GIT binary patch +literal 50 +zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bx$Vkn}$!Ay}rnY6F$m-Kg*KD_+;Lx#g4|^&N +I02NaX#p`nv=Kufz + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/objects/af/5626b4a114abcb82d63db7c8082c3c4756e51b b/tests/resources/small.git/objects/af/5626b4a114abcb82d63db7c8082c3c4756e51b +new file mode 100644 +index 0000000000000000000000000000000000000000..822bc151862ec3763cf2d3fa2372b93bbd3a4b65 +GIT binary patch +literal 30 +mcmb<m^geacKghr&@q@?NlP9kSYMj?U<r(;diNWtH+YSKNt_|)0 + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/objects/c6/97d4f7a6eac8d7b131673c340bd3cc5bac14d4 b/tests/resources/small.git/objects/c6/97d4f7a6eac8d7b131673c340bd3cc5bac14d4 +new file mode 100644 +index 0000000000000000000000000000000000000000..5adfa88cc6b00bb19f2031b8ab61f6d07f9ccdb8 +GIT binary patch +literal 130 +zcmV-|0Db>>0i}&W3IZ_@1U=^!a~EV1casc=c+{&un1qQN*i9hD|0|m(2n|iwp*q%W +z%N;b$hu%cM`$TMo*~EnC1BFP&Pfj~;jZVKXQ96s_PhV<-XAROi+@-v8dBLUa`!;GB +k^i<X>XlEv8$>R)1G>9th&t3j;s7J{?^9n<zzF|~BaA?ar-~a#s + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/refs/heads/master b/tests/resources/small.git/refs/heads/master +new file mode 100644 +index 0000000000000000000000000000000000000000..4eb36d22298f060fd324155ab854d9d6486fc498 +GIT binary patch +literal 41 +ucmV~$!4Uu;2m`Rc)5uXl$AMP&AHjriQg~T$i(A>|7U^`%mXoWC24Q^m!3%@{ + +literal 0 +HcmV?d00001 + diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 3d119f6b846ad..895b4300ac459 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -1,23 +1,24 @@ -{ lib -, python3 -, fetchFromGitHub +{ + lib, + python3Packages, + fetchFromGitHub, -, installShellFiles -, bubblewrap -, nix-output-monitor -, cacert -, git -, nix + installShellFiles, + bubblewrap, + nix-output-monitor, + cacert, + git, + nix, -, withAutocomplete ? true -, withSandboxSupport ? false -, withNom ? false + withAutocomplete ? true, + withSandboxSupport ? false, + withNom ? false, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "nixpkgs-review"; version = "2.10.5"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "Mic92"; @@ -26,20 +27,28 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-dRTKE8gkV298ZmMokyy3Ufer/Lp1GQYdEhIBoLhloEQ="; }; - nativeBuildInputs = [ - installShellFiles - python3.pkgs.setuptools - ] ++ lib.optionals withAutocomplete [ - python3.pkgs.argcomplete + build-system = [ + python3Packages.setuptools ]; - propagatedBuildInputs = [ python3.pkgs.argcomplete ]; + dependencies = lib.optionals withAutocomplete [ + python3Packages.argcomplete + ]; + + nativeBuildInputs = + [ + installShellFiles + ] + ++ lib.optionals withAutocomplete [ + python3Packages.argcomplete + ]; makeWrapperArgs = let - binPath = [ nix git ] - ++ lib.optional withSandboxSupport bubblewrap - ++ lib.optional withNom nix-output-monitor; + binPath = [ + nix + git + ] ++ lib.optional withSandboxSupport bubblewrap ++ lib.optional withNom nix-output-monitor; in [ "--prefix PATH : ${lib.makeBinPath binPath}" @@ -65,6 +74,9 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/Mic92/nixpkgs-review"; license = licenses.mit; mainProgram = "nixpkgs-review"; - maintainers = with maintainers; [ figsoda mic92 ]; + maintainers = with maintainers; [ + figsoda + mic92 + ]; }; } diff --git a/pkgs/tools/package-management/nvd/default.nix b/pkgs/tools/package-management/nvd/default.nix index 8f33b4a5fbfa5..22fba65b72976 100644 --- a/pkgs/tools/package-management/nvd/default.nix +++ b/pkgs/tools/package-management/nvd/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitLab +{ fetchFromSourcehut , installShellFiles , lib , python3 @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nvd"; - version = "0.2.3"; + version = "0.2.4"; - src = fetchFromGitLab { - owner = "khumba"; + src = fetchFromSourcehut { + owner = "~khumba"; repo = "nvd"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-TmaXsyJLRkmIN9D77jOXd8fLj7kYPCBLg0AHIImAtgA="; + rev = "v${finalAttrs.version}"; + hash = "sha256-3Fb6MDz4z41at3XpjLVng8NBwUJn/N7QBgU6Cbh0w98="; }; buildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Nix/NixOS package version diff tool"; - homepage = "https://gitlab.com/khumba/nvd"; + homepage = "https://khumba.net/projects/nvd"; license = lib.licenses.asl20; mainProgram = "nvd"; maintainers = with lib.maintainers; [ khumba ]; diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 234a6265144ba..fe2cf57d19cf8 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.18.1"; + version = "2.19.1"; pyproject = true; disabled = python3.pkgs.pythonOlder "3.8"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "pdm-project"; repo = "pdm"; rev = "refs/tags/${version}"; - hash = "sha256-pCBwt55tu9bEVVHfdPsJ5vaJXVXEZ2+4ft9LathwBt0="; + hash = "sha256-V2ZcXgRtL8zkCx5/d+L+3o0QQHVrPpFyjvjsc2auWDI="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index 92a2270e2d75f..76890f4bd515f 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ m4 pkg-config tcl ]; buildInputs = [ bzip2 elfutils libarchive openssl xz zlib ] - ++ lib.optional stdenv.isLinux libbsd; + ++ lib.optional stdenv.hostPlatform.isLinux libbsd; enableParallelBuilding = true; diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-poeblix.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-poeblix.nix index 6e8cad3ef9530..df32b8e797b9f 100644 --- a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-poeblix.nix +++ b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-poeblix.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pythonImportsCheck = ["poeblix"]; meta = with lib; { - changelog = "https://github.com/spoorn/poeblix/releases/tag/${src.rev}"; + changelog = "https://github.com/spoorn/poeblix/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; description = "Poetry Plugin that adds various features that extend the poetry command such as building wheel files with locked dependencies, and validations of wheel/docker containers"; license = licenses.mit; homepage = "https://github.com/spoorn/poeblix"; diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix index 71f1653dbdee9..4a520f2018838 100644 --- a/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { tomlkit trove-classifiers virtualenv - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xattr ] ++ lib.optionals (pythonOlder "3.11") [ tomli @@ -102,18 +102,18 @@ buildPythonPackage rec { httpretty pytest-mock pytest-xdist - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.ps ]; preCheck = ('' export HOME=$TMPDIR - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; ''); - postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + postCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' unset no_proxy ''; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 468a1ca75b3fb..13b7158e79697 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -1,29 +1,31 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, setuptools-scm -, setuptools -, vdf -, pillow -, substituteAll -, writeShellScript -, steam-run -, winetricks -, yad -, pytestCheckHook -, nix-update-script -, extraCompatPaths ? "" +{ + lib, + buildPythonApplication, + fetchFromGitHub, + substituteAll, + writeShellScript, + steam-run, + fetchpatch2, + setuptools-scm, + setuptools, + vdf, + pillow, + winetricks, + yad, + pytestCheckHook, + nix-update-script, + extraCompatPaths ? "", }: buildPythonApplication rec { pname = "protontricks"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "Matoking"; - repo = pname; - rev = version; - sha256 = "sha256-a40IAFrzQ0mogMoXKb+Lp0fPc1glYophqtftigk3nAc="; + repo = "protontricks"; + rev = "refs/tags/${version}"; + hash = "sha256-dCb8mcwXoxD4abJjLEwk5tGp65XkvepmOX+Kc9Dl7fQ="; }; patches = [ @@ -35,6 +37,19 @@ buildPythonApplication rec { exec ${lib.getExe steam-run} bash "$@" ''; }) + + # Revert vendored vdf since our vdf includes `appinfo.vdf` v29 support + (fetchpatch2 { + url = "https://github.com/Matoking/protontricks/commit/4198b7ea82369a91e3084d6e185f9b370f78eaec.patch"; + revert = true; + hash = "sha256-1U/LiAliKtk3ygbIBsmoavXN0RSykiiegtml+bO8CnI="; + }) + + # Fix test_run_no_args test + (fetchpatch2 { + url = "https://github.com/Matoking/protontricks/commit/ff2381ad379a612e73f0d4604f1c9c3a012b3355.patch"; + hash = "sha256-aiafLbiqS6TBBiQpfTYPVqhQs2OXYg/4yCtbuTv6Ug8="; + }) ]; nativeBuildInputs = [ setuptools-scm ]; @@ -45,14 +60,18 @@ buildPythonApplication rec { pillow ]; - makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ - winetricks - yad - ]}" - # Steam Runtime does not work outside of steam-run, so don't use it - "--set STEAM_RUNTIME 0" - ] ++ lib.optional (extraCompatPaths != "") "--set STEAM_EXTRA_COMPAT_TOOLS_PATHS ${extraCompatPaths}"; + makeWrapperArgs = + [ + "--prefix PATH : ${ + lib.makeBinPath [ + winetricks + yad + ] + }" + # Steam Runtime does not work outside of steam-run, so don't use it + "--set STEAM_RUNTIME 0" + ] + ++ lib.optional (extraCompatPaths != "") "--set STEAM_EXTRA_COMPAT_TOOLS_PATHS ${extraCompatPaths}"; nativeCheckInputs = [ pytestCheckHook ]; @@ -71,6 +90,9 @@ buildPythonApplication rec { homepage = "https://github.com/Matoking/protontricks"; license = licenses.gpl3Only; maintainers = with maintainers; [ kira-bruneau ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; }; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index ac9c498a9c89f..ae4352ca01094 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config pandoc ]; buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp - ++ lib.optional stdenv.isLinux libcap; + ++ lib.optional stdenv.hostPlatform.isLinux libcap; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ] @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { "--enable-zstd" "--localstatedir=/var" "--sharedstatedir=/com" - ] ++ lib.optional stdenv.isLinux "--with-cap"; + ] ++ lib.optional stdenv.hostPlatform.isLinux "--with-cap"; postPatch = '' substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index 74a0c39cb2d7a..8bf7ae9480003 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ pcsclite libusb1 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/tools/security/adreaper/default.nix b/pkgs/tools/security/adreaper/default.nix index 873760250618f..bf5bb470f3ec0 100644 --- a/pkgs/tools/security/adreaper/default.nix +++ b/pkgs/tools/security/adreaper/default.nix @@ -17,13 +17,14 @@ buildGoModule rec { vendorHash = "sha256-lU39kj/uz0l7Rodsu6+UMv2o579eu1KUbutUNZni7bM="; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mv $out/bin/ADReaper $out/bin/$pname ''; meta = with lib; { description = "Enumeration tool for Windows Active Directories"; homepage = "https://github.com/AidenPearce369/ADReaper"; + changelog = "https://github.com/AidenPearce369/ADReaper/releases/tag/ADReaperv${version}"; # Upstream doesn't have a license yet # https://github.com/AidenPearce369/ADReaper/issues/2 license = with licenses; [ unfree ]; diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index a9e973f8d00da..c6ca1a21ef60c 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -200,6 +200,7 @@ let and improvements from the community ''; homepage = "https://aflplus.plus"; + changelog = "https://aflplus.plus/docs/changelog"; license = lib.licenses.asl20; platforms = [ "x86_64-linux" diff --git a/pkgs/tools/security/age-plugin-ledger/default.nix b/pkgs/tools/security/age-plugin-ledger/default.nix index 516edc55db392..c20429968f4e4 100644 --- a/pkgs/tools/security/age-plugin-ledger/default.nix +++ b/pkgs/tools/security/age-plugin-ledger/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libusb1 openssl - ] ++ lib.optional stdenv.isDarwin AppKit; + ] ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; nativeCheckInputs = [ rage diff --git a/pkgs/tools/security/age-plugin-yubikey/default.nix b/pkgs/tools/security/age-plugin-yubikey/default.nix index e69d4dc789fbe..9022442f62a86 100644 --- a/pkgs/tools/security/age-plugin-yubikey/default.nix +++ b/pkgs/tools/security/age-plugin-yubikey/default.nix @@ -30,8 +30,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optional stdenv.isLinux pcsclite - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isLinux pcsclite + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Foundation PCSC diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index a2b5d31c85388..6abfd72864f20 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://aide.github.io/"; + changelog = "https://github.com/aide/aide/blob/v${version}/ChangeLog"; description = "File and directory integrity checker"; mainProgram = "aide"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix index 5cb96596564ce..a02c0a7236cf6 100644 --- a/pkgs/tools/security/amber/default.nix +++ b/pkgs/tools/security/amber/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Joy+SO1zR78Eh5eK2bxyT0l3hCuLX/J3u/UvN+++6vg="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Manage secret values in-repo via public key cryptography"; diff --git a/pkgs/tools/security/amoco/default.nix b/pkgs/tools/security/amoco/default.nix index d3c687bcc8eef..ff9fcc7efe63a 100644 --- a/pkgs/tools/security/amoco/default.nix +++ b/pkgs/tools/security/amoco/default.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { traitlets ]; - passthru.optional-dependencies = { + optional-dependencies = { app = with python3.pkgs; [ # ccrawl ipython diff --git a/pkgs/tools/security/ares-rs/default.nix b/pkgs/tools/security/ares-rs/default.nix index 433cdaa5792af..b23f13de05ef6 100644 --- a/pkgs/tools/security/ares-rs/default.nix +++ b/pkgs/tools/security/ares-rs/default.nix @@ -1,25 +1,26 @@ -{ lib -, rustPlatform -, fetchFromGitHub +{ + lib, + rustPlatform, + fetchFromGitHub, }: rustPlatform.buildRustPackage rec { pname = "ares-rs"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "bee-san"; repo = "ares"; - rev = "refs/tags/${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-F+uBGRL1G8kiNZUCsiPbISBfId5BPwShenusqkcsHug="; }; - cargoHash = "sha256-7zDq66oWT+j6t9LEBUoeby8MQ1Ihhvk3KLwWPQAThyc="; + cargoHash = "sha256-c50HCwWwW4Fyg6hC1JqBfKtwq6kgReSOIBYXvwm04yA="; meta = with lib; { description = "Automated decoding of encrypted text without knowing the key or ciphers used"; homepage = "https://github.com/bee-san/ares"; - changelog = "https://github.com/bee-san/Ares/releases/tag${version}"; + changelog = "https://github.com/bee-san/Ares/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "ares"; diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix deleted file mode 100644 index 392744dd5d5f7..0000000000000 --- a/pkgs/tools/security/arti/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitLab -, pkg-config -, sqlite -, openssl -, CoreServices -}: - -rustPlatform.buildRustPackage rec { - pname = "arti"; - version = "1.2.6"; - - src = fetchFromGitLab { - domain = "gitlab.torproject.org"; - group = "tpo"; - owner = "core"; - repo = "arti"; - rev = "arti-v${version}"; - hash = "sha256-3/wXxcKjbvlXUjvGgMidORVgeo2c5IuPgjLnY2Nj9oU="; - }; - - cargoHash = "sha256-UeMZlBSbeH/dn5j9vxNkZQ3vkNOxIyPLUOcZe2ZllTM="; - - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; - - buildInputs = [ sqlite ] - ++ lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; - - cargoBuildFlags = [ "--package" "arti" ]; - - cargoTestFlags = [ "--package" "arti" ]; - - meta = with lib; { - description = "Implementation of Tor in Rust"; - mainProgram = "arti"; - homepage = "https://arti.torproject.org/"; - changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/tools/security/authoscope/default.nix b/pkgs/tools/security/authoscope/default.nix index b44f8bec2f7f0..e30a00ff5be19 100644 --- a/pkgs/tools/security/authoscope/default.nix +++ b/pkgs/tools/security/authoscope/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { libcap zlib openssl - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' installManPage docs/${pname}.1 diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 9570229940edd..657a2923d2f96 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.26"; + version = "0.6.27"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-c7JhUDnANW4QihsfCioYiCe19JfqhTYP+pZgUSV6lHQ="; + hash = "sha256-8WLuz3+pn6BMnhZGUfRYj0IwOm6xuqd6zj+J2XbCPy4="; }; vendorHash = "sha256-xCNuFO+J0NXq8CPZXB0R2RmLLH27Vh/GMrBKk+mGk04="; diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index db11044479515..5594bc106bebb 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libusb1 ] - ++ lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libnfnetlink libnetfilter_queue ]; meta = with lib; { description = "Man in the middle tool"; diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix index 7546f4262697f..65b682a0fcf89 100644 --- a/pkgs/tools/security/bitwarden-directory-connector/default.nix +++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix @@ -13,14 +13,14 @@ let common = { name, npmBuildScript, installPhase }: buildNpmPackage rec { pname = name; - version = "2024.3.2"; + version = "2024.9.0"; nodejs = nodejs_18; src = fetchFromGitHub { owner = "bitwarden"; repo = "directory-connector"; rev = "v${version}"; - hash = "sha256-CB5HrT+p63zANg1SEoynk6hPPW5DcC9Qfo2+QDy2iwc="; + hash = "sha256-Vop5Y1prdjA5SOQsA1HNBr3IBhe9Ya8d8M6CsS9xohg="; }; postPatch = '' @@ -32,7 +32,7 @@ let --replace-fail "AppImage" "dir" ''; - npmDepsHash = "sha256-6WYNaF6z8OwWmi/Mv091LsuTUEUhWd8cDD11QKE8A5U="; + npmDepsHash = "sha256-8rmZSl5K2l97QHaNtcfW202TtcEa3HIjEjO/AkaZkdQ="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/tools/security/boofuzz/default.nix b/pkgs/tools/security/boofuzz/default.nix index 5c2418cad6655..b254b9d3d191f 100644 --- a/pkgs/tools/security/boofuzz/default.nix +++ b/pkgs/tools/security/boofuzz/default.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { "TestNoResponseFailure" "TestProcessMonitor" "TestSocketConnection" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_time_repeater" ]; diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index 463501a05eb06..4c58039e899ad 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { sha256 = "sha256-UZzOPRRiCUIG7uSSp9AEPMDN/+4cgyK47RhrI8oUx8U="; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0="; diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index 94e2cc0cf8a59..3ba3ee4c2c2d2 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "buttercup-desktop"; - version = "2.28.0"; + version = "2.28.1"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-A1HoJ9MdBPQ9HNkMPOBKe2SEFMqQ0nxBLd6bhUyRMD8="; + sha256 = "sha256-iCuvs+FisYPvCmPVg1dhYMX+Lw3WmrMSRytdy6TLrxg="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/tools/security/bws/Cargo.lock b/pkgs/tools/security/bws/Cargo.lock index ca4305f8d0738..9bfdbe70c5806 100644 --- a/pkgs/tools/security/bws/Cargo.lock +++ b/pkgs/tools/security/bws/Cargo.lock @@ -17,22 +17,29 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", "cpufeatures", + "zeroize", ] [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -43,6 +50,23 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +[[package]] +name = "android_log-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" + +[[package]] +name = "android_logger" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826" +dependencies = [ + "android_log-sys", + "env_filter", + "log", +] + [[package]] name = "android_system_properties" version = "0.1.5" @@ -52,58 +76,65 @@ dependencies = [ "libc", ] +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + [[package]] name = "ansi_colours" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1558bd2075d341b9ca698ec8eb6fcc55a746b1fc4255585aad5b141d918a80" +checksum = "14eec43e0298190790f41679fe69ef7a829d2a2ddd78c8c00339e84710e435fe" dependencies = [ "rgb", ] [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -111,26 +142,27 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "argon2" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" dependencies = [ "base64ct", "blake2", "cpufeatures", "password-hash", + "zeroize", ] [[package]] @@ -145,9 +177,9 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.12.2" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a0fc7dcf8bd4ead96b1d36b41df47c14beedf7b0301fc543d8f2384e66a2ec0" +checksum = "19fe8d6cb13c4714962c072ea496f3392015f0989b1a2847bb4b2d9effd71d83" dependencies = [ "askama_parser", "basic-toml", @@ -156,7 +188,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] @@ -167,9 +199,9 @@ checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" [[package]] name = "askama_parser" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c268a96e01a4c47c8c5c2472aaa570707e006a875ea63e819f75474ceedaf7b4" +checksum = "acb1161c6b64d1c3d83108213c2a2533a342ac225aabd0bda218278c2ddb00c0" dependencies = [ "nom", ] @@ -184,22 +216,11 @@ dependencies = [ "serde_json", ] -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - [[package]] name = "async-compat" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68a707c1feb095d8c07f8a65b9f506b117d30af431cab89374357de7c11461b" +checksum = "7bab94bde396a3f7b4962e396fdad640e241ed797d4d8d77fc8c237d14c58fc0" dependencies = [ "futures-core", "futures-io", @@ -208,60 +229,55 @@ dependencies = [ "tokio", ] -[[package]] -name = "async-lock" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" -dependencies = [ - "event-listener 4.0.0", - "event-listener-strategy", - "pin-project-lite", -] - [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.77", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] [[package]] -name = "base64" -version = "0.13.1" +name = "base16ct" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.21.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -271,9 +287,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "basic-toml" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f2139706359229bfa8f19142ac1155b4b80beafb7a60471ac5dd109d4a19778" +checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" dependencies = [ "serde", ] @@ -294,7 +310,7 @@ dependencies = [ "flate2", "globset", "home", - "nu-ansi-term 0.49.0", + "nu-ansi-term", "once_cell", "path_abs", "plist", @@ -315,6 +331,21 @@ dependencies = [ "serde", ] +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" @@ -323,71 +354,49 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitwarden" -version = "0.4.0" +version = "1.0.0" dependencies = [ - "aes", - "argon2", - "base64 0.21.5", "bitwarden-api-api", "bitwarden-api-identity", - "cbc", - "chrono", - "data-encoding", - "getrandom 0.2.11", - "hkdf", - "hmac", - "lazy_static", - "log", - "num-bigint", - "num-traits", - "pbkdf2", - "rand 0.8.5", - "rand_chacha 0.3.1", - "reqwest", - "rsa", - "schemars", - "serde", - "serde_json", - "serde_qs 0.12.0", - "serde_repr", - "sha1", - "sha2", - "subtle", + "bitwarden-core", + "bitwarden-crypto", + "bitwarden-exporters", + "bitwarden-generators", + "bitwarden-send", + "bitwarden-sm", + "bitwarden-vault", "thiserror", - "tokio", - "uniffi", "uuid", - "wiremock", ] [[package]] name = "bitwarden-api-api" -version = "0.2.3" +version = "1.0.0" dependencies = [ "reqwest", "serde", - "serde_derive", "serde_json", "serde_repr", + "serde_with", "url", "uuid", ] [[package]] name = "bitwarden-api-identity" -version = "0.2.3" +version = "1.0.0" dependencies = [ "reqwest", "serde", - "serde_derive", "serde_json", "serde_repr", + "serde_with", "url", "uuid", ] @@ -403,7 +412,7 @@ dependencies = [ [[package]] name = "bitwarden-cli" -version = "0.1.0" +version = "1.0.0" dependencies = [ "clap", "color-eyre", @@ -411,6 +420,131 @@ dependencies = [ "supports-color", ] +[[package]] +name = "bitwarden-core" +version = "1.0.0" +dependencies = [ + "base64", + "bitwarden-api-api", + "bitwarden-api-identity", + "bitwarden-crypto", + "chrono", + "getrandom", + "hmac", + "log", + "rand", + "rand_chacha", + "reqwest", + "rustls-platform-verifier", + "schemars", + "serde", + "serde_json", + "serde_qs", + "serde_repr", + "sha1", + "sha2", + "thiserror", + "tokio", + "uniffi", + "uuid", + "validator", + "wiremock", + "zeroize", + "zxcvbn", +] + +[[package]] +name = "bitwarden-crypto" +version = "1.0.0" +dependencies = [ + "aes", + "argon2", + "base64", + "cbc", + "criterion", + "generic-array", + "hkdf", + "hmac", + "num-bigint", + "num-traits", + "pbkdf2", + "rand", + "rand_chacha", + "rayon", + "rsa", + "schemars", + "serde", + "serde_json", + "sha1", + "sha2", + "subtle", + "thiserror", + "uniffi", + "uuid", + "zeroize", +] + +[[package]] +name = "bitwarden-exporters" +version = "1.0.0" +dependencies = [ + "base64", + "bitwarden-core", + "bitwarden-crypto", + "bitwarden-vault", + "chrono", + "csv", + "schemars", + "serde", + "serde_json", + "thiserror", + "uniffi", + "uuid", +] + +[[package]] +name = "bitwarden-fido" +version = "1.0.0" +dependencies = [ + "async-trait", + "base64", + "bitwarden-core", + "bitwarden-crypto", + "bitwarden-vault", + "chrono", + "coset", + "itertools 0.13.0", + "log", + "p256", + "passkey", + "passkey-client", + "reqwest", + "schemars", + "serde", + "serde_json", + "thiserror", + "uniffi", + "uuid", +] + +[[package]] +name = "bitwarden-generators" +version = "1.0.0" +dependencies = [ + "bitwarden-core", + "bitwarden-crypto", + "rand", + "rand_chacha", + "reqwest", + "schemars", + "serde", + "serde_json", + "thiserror", + "tokio", + "uniffi", + "wiremock", +] + [[package]] name = "bitwarden-json" version = "0.3.0" @@ -424,7 +558,7 @@ dependencies = [ [[package]] name = "bitwarden-napi" -version = "0.3.1" +version = "1.0.0" dependencies = [ "bitwarden-json", "env_logger", @@ -440,30 +574,104 @@ version = "0.1.0" dependencies = [ "bitwarden-json", "pyo3", - "pyo3-asyncio", "pyo3-build-config", "pyo3-log", "tokio", ] +[[package]] +name = "bitwarden-send" +version = "1.0.0" +dependencies = [ + "base64", + "bitwarden-api-api", + "bitwarden-core", + "bitwarden-crypto", + "chrono", + "schemars", + "serde", + "serde_repr", + "thiserror", + "uniffi", + "uuid", + "zeroize", +] + +[[package]] +name = "bitwarden-sm" +version = "1.0.0" +dependencies = [ + "bitwarden-api-api", + "bitwarden-core", + "bitwarden-crypto", + "chrono", + "schemars", + "serde", + "serde_json", + "thiserror", + "tokio", + "uuid", + "validator", +] + [[package]] name = "bitwarden-uniffi" version = "0.1.0" dependencies = [ - "async-lock", + "android_logger", + "async-trait", "bitwarden", + "bitwarden-core", + "bitwarden-crypto", + "bitwarden-exporters", + "bitwarden-fido", + "bitwarden-generators", + "bitwarden-send", + "bitwarden-vault", "chrono", "env_logger", - "openssl", + "jni", + "libloading", + "log", + "oslog", + "rustls-platform-verifier", + "schemars", + "thiserror", + "uniffi", + "uuid", +] + +[[package]] +name = "bitwarden-vault" +version = "1.0.0" +dependencies = [ + "base64", + "bitwarden-api-api", + "bitwarden-core", + "bitwarden-crypto", + "chrono", + "hmac", + "rand", + "reqwest", "schemars", + "serde", + "serde_json", + "serde_repr", + "sha1", + "sha2", + "thiserror", + "tokio", "uniffi", + "uuid", ] [[package]] name = "bitwarden-wasm" version = "0.1.0" dependencies = [ + "argon2", "bitwarden-json", + "chrono", "console_error_panic_hook", "console_log", "js-sys", @@ -503,9 +711,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -513,9 +721,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bw" @@ -523,6 +731,7 @@ version = "0.0.2" dependencies = [ "bitwarden", "bitwarden-cli", + "bitwarden-crypto", "clap", "color-eyre", "env_logger", @@ -534,19 +743,21 @@ dependencies = [ [[package]] name = "bws" -version = "0.4.0" +version = "1.0.0" dependencies = [ "bat", "bitwarden", + "bitwarden-cli", "chrono", "clap", "clap_complete", + "clap_mangen", "color-eyre", "comfy-table", "directories", "env_logger", + "itertools 0.13.0", "log", - "openssl", "regex", "serde", "serde_json", @@ -555,15 +766,16 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "toml 0.8.8", + "toml 0.8.19", "uuid", + "which", ] [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -573,9 +785,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytesize" @@ -585,18 +797,18 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "camino" -version = "1.1.6" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -615,6 +827,12 @@ dependencies = [ "thiserror", ] +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + [[package]] name = "cbc" version = "0.1.2" @@ -626,13 +844,19 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ - "libc", + "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cfg-if" version = "1.0.0" @@ -641,9 +865,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -651,7 +875,34 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", ] [[package]] @@ -662,13 +913,14 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", + "zeroize", ] [[package]] name = "clap" -version = "4.4.11" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -676,9 +928,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -688,30 +940,40 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.4" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" +checksum = "8937760c3f4c60871870b8c3ee5f9b30771f792a7045c48bcbba999d7d6b3b8e" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "clap_mangen" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "f17415fd4dfbea46e3274fcd8d368284519b358654772afb700dc2e8d2b24eeb" +dependencies = [ + "clap", + "roff", +] [[package]] name = "clircle" @@ -727,9 +989,9 @@ dependencies = [ [[package]] name = "color-eyre" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" dependencies = [ "backtrace", "color-spantrace", @@ -754,42 +1016,43 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] -name = "comfy-table" -version = "7.1.0" +name = "combine" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ - "crossterm 0.27.0", - "strum", - "strum_macros", - "unicode-width", + "bytes", + "memchr", ] [[package]] -name = "concurrent-queue" -version = "2.4.0" +name = "comfy-table" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ - "crossbeam-utils", + "crossterm 0.27.0", + "strum 0.26.3", + "strum_macros 0.26.4", + "unicode-width", ] [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -849,37 +1112,99 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "coset" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "f4c8cc80f631f8307b887faca24dcc3abc427cd0367f6eb6188f6e8f5b7ad8fb" +dependencies = [ + "ciborium", + "ciborium-io", +] [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] -name = "crossbeam-utils" -version = "0.8.17" +name = "criterion" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ - "cfg-if", + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", ] +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + [[package]] name = "crossterm" version = "0.25.0" @@ -889,7 +1214,7 @@ dependencies = [ "bitflags 1.3.2", "crossterm_winapi", "libc", - "mio", + "mio 0.8.11", "parking_lot", "signal-hook", "signal-hook-mio", @@ -902,7 +1227,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "crossterm_winapi", "libc", "parking_lot", @@ -918,6 +1243,24 @@ dependencies = [ "winapi", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -928,46 +1271,114 @@ dependencies = [ "typenum", ] +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + [[package]] name = "ctor" -version = "0.2.6" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn 2.0.77", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.77", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ + "darling_core", "quote", - "syn 2.0.41", + "syn 2.0.77", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "deadpool" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e" +checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" dependencies = [ "async-trait", "deadpool-runtime", "num_cpus", - "retain_mut", "tokio", ] [[package]] name = "deadpool-runtime" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -976,11 +1387,43 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", + "serde", +] + +[[package]] +name = "derive_builder" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" +dependencies = [ + "derive_builder_core", + "syn 2.0.77", ] [[package]] @@ -1018,15 +1461,52 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "elliptic-curve" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "base64ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "serde_json", + "serdect", + "subtle", + "zeroize", +] [[package]] name = "encode_unicode" @@ -1036,24 +1516,34 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + [[package]] name = "env_logger" -version = "0.10.1" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -1064,74 +1554,59 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] [[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "4.0.0" +name = "eyre" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", + "indenter", + "once_cell", ] [[package]] -name = "event-listener-strategy" -version = "0.4.0" +name = "fancy-regex" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" dependencies = [ - "event-listener 4.0.0", - "pin-project-lite", + "bit-set", + "regex-automata", + "regex-syntax", ] [[package]] -name = "eyre" -version = "0.6.11" +name = "fastrand" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" -dependencies = [ - "indenter", - "once_cell", -] +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] -name = "fastrand" -version = "1.9.0" +name = "ff" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "instant", + "rand_core", + "subtle", ] -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1140,21 +1615,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1175,9 +1635,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1190,9 +1650,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1200,15 +1660,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1217,59 +1677,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-lite" -version = "1.13.0" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" - -[[package]] -name = "futures-timer" -version = "3.0.2" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1284,49 +1723,44 @@ dependencies = [ ] [[package]] -name = "generator" -version = "0.7.5" +name = "fuzzy-matcher" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows", + "thread_local", ] [[package]] -name = "generic-array" -version = "0.14.7" +name = "fxhash" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" dependencies = [ - "typenum", - "version_check", + "byteorder", ] [[package]] -name = "getrandom" -version = "0.1.16" +name = "generic-array" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "typenum", + "version_check", + "zeroize", ] [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -1344,47 +1778,68 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata", + "regex-syntax", ] [[package]] name = "goblin" -version = "0.6.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68" +checksum = "1b363a30c165f666402fe6a3024d3bec7ebc898f96a4a23bd1c99f8dbf3f4f47" dependencies = [ "log", "plain", "scroll", ] +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + [[package]] name = "h2" -version = "0.3.22" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", "tracing", ] +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -1393,9 +1848,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -1403,11 +1858,29 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" @@ -1438,9 +1911,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1449,41 +1922,32 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", - "pin-project-lite", ] [[package]] -name = "http-types" -version = "2.12.0" +name = "http-body-util" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ - "anyhow", - "async-channel", - "base64 0.13.1", - "futures-lite", + "bytes", + "futures-util", "http", - "infer", + "http-body", "pin-project-lite", - "rand 0.7.3", - "serde", - "serde_json", - "serde_qs 0.8.5", - "serde_urlencoded", - "url", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1499,13 +1963,12 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", "http", @@ -1514,31 +1977,53 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] -name = "hyper-tls" -version = "0.5.0" +name = "hyper-rustls" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", "hyper", - "native-tls", + "pin-project-lite", + "socket2", "tokio", - "tokio-native-tls", + "tower", + "tower-service", + "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1557,6 +2042,12 @@ dependencies = [ "cc", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.5.0" @@ -1586,25 +2077,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", + "serde", ] [[package]] name = "indoc" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" - -[[package]] -name = "infer" -version = "0.2.3" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "inout" @@ -1618,99 +2104,126 @@ dependencies = [ [[package]] name = "inquire" -version = "0.6.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c33e7c1ddeb15c9abcbfef6029d8e29f69b52b6d6c891031b88ed91b5065803b" +checksum = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "crossterm 0.25.0", "dyn-clone", - "lazy_static", + "fuzzy-matcher", + "fxhash", "newline-converter", - "thiserror", + "once_cell", "unicode-segmentation", "unicode-width", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.48.0", + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", ] [[package]] name = "is_ci" -version = "1.1.1" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" -version = "0.12.0" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ "spin", ] [[package]] name = "libc" -version = "0.2.151" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.6", ] [[package]] @@ -1721,35 +2234,25 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "libc", - "redox_syscall", -] - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", ] [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1757,46 +2260,35 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] -name = "loom" -version = "0.5.6" +name = "memchr" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "pin-utils", - "scoped-tls", - "tracing", - "tracing-subscriber", -] +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] -name = "matchers" -version = "0.1.0" +name = "memoffset" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "regex-automata 0.1.10", + "autocfg", ] [[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +name = "memory-testing" +version = "0.1.0" dependencies = [ - "autocfg", + "bitwarden-crypto", + "comfy-table", + "hex", + "serde", + "serde_json", + "zeroize", ] [[package]] @@ -1807,14 +2299,24 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", ] +[[package]] +name = "minicov" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169" +dependencies = [ + "cc", + "walkdir", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1823,32 +2325,53 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "napi" -version = "2.14.1" +version = "2.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1133249c46e92da921bafc8aba4912bf84d6c475f7625183772ed2d0844dc3a7" +checksum = "53575dfa17f208dd1ce3a2da2da4659aae393b256a472f2738a8586a6c4107fd" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "ctor", "napi-derive", "napi-sys", @@ -1858,29 +2381,29 @@ dependencies = [ [[package]] name = "napi-build" -version = "2.1.0" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b4532cf86bfef556348ac65e561e3123879f0e7566cca6d43a6ff5326f13df" +checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a" [[package]] name = "napi-derive" -version = "2.14.4" +version = "2.16.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b5af262f1d8e660742eb722abc7113a5b3c3de4144d0ef23ede2518672ceff1" +checksum = "17435f7a00bfdab20b0c27d9c56f58f6499e418252253081bfff448099da31d1" dependencies = [ "cfg-if", "convert_case", "napi-derive-backend", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] name = "napi-derive-backend" -version = "1.0.57" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea236321b521d6926213a2021e407b0562e28a257c037a45919e414d2cdb4f8" +checksum = "967c485e00f0bf3b1bdbe510a38a4606919cf1d34d9a37ad41f25a81aa077abe" dependencies = [ "convert_case", "once_cell", @@ -1888,41 +2411,23 @@ dependencies = [ "quote", "regex", "semver", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] name = "napi-sys" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" +checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3" dependencies = [ "libloading", ] -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "newline-converter" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f71d09d5c87634207f894c6b31b6a2b2c64ea3bdcf71bd5599fdbbe1600c00f" +checksum = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f" dependencies = [ "unicode-segmentation", ] @@ -1937,16 +2442,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - [[package]] name = "nu-ansi-term" version = "0.49.0" @@ -1958,11 +2453,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -1979,26 +2473,31 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.8.5", + "rand", "smallvec", "zeroize", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2007,9 +2506,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -2021,15 +2520,15 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -2040,15 +2539,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "oneshot" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6640c6bda7731b1fdbab747981a0f896dd1fedaf9f4a53fa237a04a84431f4" -dependencies = [ - "loom", -] - [[package]] name = "onig" version = "6.4.0" @@ -2072,30 +2562,10 @@ dependencies = [ ] [[package]] -name = "openssl" -version = "0.10.61" +name = "oorandom" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.41", -] +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "openssl-probe" @@ -2103,28 +2573,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "300.2.1+3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.97" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -2132,10 +2580,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "overload" -version = "0.1.1" +name = "oslog" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +checksum = "80d2043d1f61d77cb2f4b1f7b7b2295f40507f5f8e9d1c8bf10a1ca5f97a3969" +dependencies = [ + "cc", + "dashmap", + "log", +] [[package]] name = "owo-colors" @@ -2144,16 +2597,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] -name = "parking" -version = "2.2.0" +name = "p256" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2161,15 +2620,79 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "passkey" +version = "0.2.0" +source = "git+https://github.com/bitwarden/passkey-rs?rev=ff757604cd7b4e8f321ed1616fef7e40e21ac5df#ff757604cd7b4e8f321ed1616fef7e40e21ac5df" +dependencies = [ + "passkey-authenticator", + "passkey-client", + "passkey-transports", + "passkey-types", +] + +[[package]] +name = "passkey-authenticator" +version = "0.2.0" +source = "git+https://github.com/bitwarden/passkey-rs?rev=ff757604cd7b4e8f321ed1616fef7e40e21ac5df#ff757604cd7b4e8f321ed1616fef7e40e21ac5df" +dependencies = [ + "async-trait", + "coset", + "log", + "p256", + "passkey-types", + "rand", +] + +[[package]] +name = "passkey-client" +version = "0.2.0" +source = "git+https://github.com/bitwarden/passkey-rs?rev=ff757604cd7b4e8f321ed1616fef7e40e21ac5df#ff757604cd7b4e8f321ed1616fef7e40e21ac5df" +dependencies = [ + "ciborium", + "coset", + "idna", + "nom", + "passkey-authenticator", + "passkey-types", + "public-suffix", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "passkey-transports" +version = "0.1.0" +source = "git+https://github.com/bitwarden/passkey-rs?rev=ff757604cd7b4e8f321ed1616fef7e40e21ac5df#ff757604cd7b4e8f321ed1616fef7e40e21ac5df" + +[[package]] +name = "passkey-types" +version = "0.2.1" +source = "git+https://github.com/bitwarden/passkey-rs?rev=ff757604cd7b4e8f321ed1616fef7e40e21ac5df#ff757604cd7b4e8f321ed1616fef7e40e21ac5df" +dependencies = [ + "bitflags 2.6.0", + "ciborium", + "coset", + "data-encoding", + "getrandom", + "indexmap 2.5.0", + "rand", + "serde", + "serde_json", + "sha2", + "strum 0.25.0", ] [[package]] @@ -2179,15 +2702,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "path_abs" @@ -2222,11 +2745,31 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2257,9 +2800,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plain" @@ -2269,18 +2812,51 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "plist" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.5", - "indexmap 2.1.0", - "line-wrap", + "base64", + "indexmap 2.5.0", "quick-xml", "serde", "time", ] +[[package]] +name = "plotters" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-svg" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "portable-atomic" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" + [[package]] name = "powerfmt" version = "0.2.0" @@ -2289,66 +2865,83 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] +[[package]] +name = "public-suffix" +version = "0.1.1" +source = "git+https://github.com/bitwarden/passkey-rs?rev=ff757604cd7b4e8f321ed1616fef7e40e21ac5df#ff757604cd7b4e8f321ed1616fef7e40e21ac5df" + [[package]] name = "pyo3" -version = "0.20.0" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" +checksum = "15ee168e30649f7f234c3d49ef5a7a6cbf5134289bc46c29ff3155fa3221c225" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", - "parking_lot", + "once_cell", + "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", "unindent", ] -[[package]] -name = "pyo3-asyncio" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea6b68e93db3622f3bb3bf363246cf948ed5375afe7abff98ccbdd50b184995" -dependencies = [ - "futures", - "once_cell", - "pin-project-lite", - "pyo3", - "pyo3-asyncio-macros", - "tokio", -] - -[[package]] -name = "pyo3-asyncio-macros" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c467178e1da6252c95c29ecf898b133f742e9181dca5def15dc24e19d45a39" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "pyo3-build-config" -version = "0.20.0" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" +checksum = "e61cef80755fe9e46bb8a0b8f20752ca7676dcc07a5277d8b7768c6172e529b3" dependencies = [ "once_cell", "target-lexicon", @@ -2356,9 +2949,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.0" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" +checksum = "67ce096073ec5405f5ee2b8b31f03a68e02aa10d5d4f565eca04acc41931fa1c" dependencies = [ "libc", "pyo3-build-config", @@ -2366,9 +2959,9 @@ dependencies = [ [[package]] name = "pyo3-log" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd" +checksum = "3ac84e6eec1159bc2a575c9ae6723baa6ee9d45873e9bebad1e3ad7e8d28a443" dependencies = [ "arc-swap", "log", @@ -2377,57 +2970,93 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.0" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" +checksum = "2440c6d12bc8f3ae39f1e775266fa5122fd0c8891ce7520fa6048e683ad3de28" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] name = "pyo3-macros-backend" -version = "0.20.0" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" +checksum = "1be962f0e06da8f8465729ea2cb71a416d2257dff56cbe40a70d3e62a93ae5d1" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", + "pyo3-build-config", "quote", - "syn 2.0.41", + "syn 2.0.77", +] + +[[package]] +name = "quick-xml" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +dependencies = [ + "memchr", +] + +[[package]] +name = "quinn" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2", + "thiserror", + "tokio", + "tracing", ] [[package]] -name = "quick-xml" -version = "0.31.0" +name = "quinn-proto" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ - "memchr", + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", ] [[package]] -name = "quote" -version = "1.0.33" +name = "quinn-udp" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ - "proc-macro2", + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.59.0", ] [[package]] -name = "rand" -version = "0.7.3" +name = "quote" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", + "proc-macro2", ] [[package]] @@ -2437,18 +3066,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -2458,160 +3077,170 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", + "rand_core", ] [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.1.16", + "getrandom", ] [[package]] -name = "rand_core" -version = "0.6.4" +name = "rayon" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ - "getrandom 0.2.11", + "either", + "rayon-core", ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "rayon-core" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "rand_core 0.5.1", + "crossbeam-deque", + "crossbeam-utils", ] [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom 0.2.11", + "getrandom", "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "base64 0.21.5", + "base64", "bytes", - "encoding_rs", "futures-core", "futures-util", "h2", "http", "http-body", + "http-body-util", "hyper", - "hyper-tls", + "hyper-rustls", + "hyper-util", "ipnet", "js-sys", "log", "mime", "mime_guess", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", + "quinn", + "rustls", + "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "system-configuration", + "sync_wrapper", "tokio", - "tokio-native-tls", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "windows-registry", ] [[package]] -name = "retain_mut" -version = "0.1.9" +name = "rfc6979" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "roff" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" + [[package]] name = "rsa" version = "0.9.6" @@ -2625,7 +3254,7 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8", - "rand_core 0.6.4", + "rand_core", "signature", "spki", "subtle", @@ -2634,17 +3263,23 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -2652,22 +3287,97 @@ dependencies = [ ] [[package]] -name = "rustversion" -version = "1.0.14" +name = "rustls" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] [[package]] -name = "ryu" -version = "1.0.16" +name = "rustls-native-certs" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64", + "rustls-pki-types", +] [[package]] -name = "safemem" -version = "0.3.3" +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-roots", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2680,18 +3390,18 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] name = "schemars" -version = "0.8.16" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "chrono", "dyn-clone", @@ -2704,14 +3414,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.16" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -2728,22 +3438,22 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scroll" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" +checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" dependencies = [ "scroll_derive", ] [[package]] name = "scroll_derive" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" +checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] @@ -2754,29 +3464,45 @@ dependencies = [ "bitwarden", "bitwarden-json", "bitwarden-uniffi", - "itertools", + "itertools 0.13.0", "schemars", "serde_json", ] +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "serdect", + "subtle", + "zeroize", +] + [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", + "num-bigint", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -2784,71 +3510,62 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ + "indexmap 2.5.0", "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - -[[package]] -name = "serde_qs" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" +checksum = "cd34f36fe4c5ba9654417139a9b3a20d2e1de6012ee678ad14d240c22c78d8d6" dependencies = [ "percent-encoding", "serde", @@ -2857,20 +3574,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2887,19 +3604,59 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +dependencies = [ + "base64", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.5.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "serde_yaml" -version = "0.9.27" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.5.0", "itoa", "ryu", "serde", "unsafe-libyaml", ] +[[package]] +name = "serdect" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177" +dependencies = [ + "base16ct", + "serde", +] + [[package]] name = "sha1" version = "0.10.6" @@ -2931,6 +3688,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook" version = "0.3.17" @@ -2943,20 +3706,20 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio", + "mio 0.8.11", "signal-hook", ] [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -2968,7 +3731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -2988,9 +3751,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smawk" @@ -3000,29 +3763,19 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spki" @@ -3048,15 +3801,24 @@ checksum = "8207e78455ffdf55661170876f88daf85356e4edd54e0a3dbc79586ca1e50cbe" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros 0.25.3", +] + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" [[package]] name = "strum_macros" @@ -3064,26 +3826,38 @@ version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ - "heck", + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.77", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "supports-color" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" +checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77" dependencies = [ - "is-terminal", "is_ci", ] @@ -3094,15 +3868,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", - "quote", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.41" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -3110,109 +3883,87 @@ dependencies = [ ] [[package]] -name = "syntect" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" -dependencies = [ - "bincode", - "bitflags 1.3.2", - "flate2", - "fnv", - "once_cell", - "onig", - "regex-syntax 0.7.5", - "serde", - "serde_json", - "thiserror", - "walkdir", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" +name = "sync_wrapper" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", + "futures-core", ] [[package]] -name = "system-configuration-sys" -version = "0.5.0" +name = "syntect" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" dependencies = [ - "core-foundation-sys", - "libc", + "bincode", + "bitflags 1.3.2", + "flate2", + "fnv", + "once_cell", + "onig", + "regex-syntax", + "serde", + "serde_derive", + "serde_json", + "thiserror", + "walkdir", ] [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall", + "fastrand", + "once_cell", "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "termcolor" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" -dependencies = [ - "winapi-util", + "windows-sys 0.59.0", ] [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", - "unicode-linebreak", - "unicode-width", ] [[package]] name = "thiserror" -version = "1.0.51" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.51" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -3220,12 +3971,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -3240,18 +3992,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -3264,54 +4027,53 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "pin-project-lite", - "socket2 0.5.5", + "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] -name = "tokio-native-tls" -version = "0.3.1" +name = "tokio-rustls" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "native-tls", + "rustls", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -3325,9 +4087,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -3337,31 +4099,52 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", "winnow", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -3370,21 +4153,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "pin-project-lite", - "tracing-attributes", "tracing-core", ] -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.41", -] - [[package]] name = "tracing-core" version = "0.1.32" @@ -3405,33 +4176,15 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-subscriber" version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "matchers", - "nu-ansi-term 0.46.0", - "once_cell", - "regex", "sharded-slab", - "smallvec", "thread_local", - "tracing", "tracing-core", - "tracing-log", ] [[package]] @@ -3457,50 +4210,46 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +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-linebreak" -version = "0.1.5" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "uniffi" -version = "0.25.2" -source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2db87def739fe4183947f8419d572d1849a4a09355eba4e988a2105cfd0ac6a7" dependencies = [ "anyhow", "camino", + "cargo_metadata", "clap", "uniffi_bindgen", "uniffi_build", @@ -3517,32 +4266,32 @@ dependencies = [ [[package]] name = "uniffi_bindgen" -version = "0.25.2" -source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a112599c9556d1581e4a3d72019a74c2c3e122cc27f4af12577a429c4d5e614" dependencies = [ "anyhow", "askama", "camino", "cargo_metadata", - "clap", "fs-err", "glob", "goblin", - "heck", + "heck 0.5.0", "once_cell", "paste", "serde", "textwrap", "toml 0.5.11", "uniffi_meta", - "uniffi_testing", "uniffi_udl", ] [[package]] name = "uniffi_build" -version = "0.25.2" -source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b12684401d2a8508ca9c72a95bbc45906417e42fc80942abaf033bbf01aa33" dependencies = [ "anyhow", "camino", @@ -3551,17 +4300,19 @@ dependencies = [ [[package]] name = "uniffi_checksum_derive" -version = "0.25.2" -source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a22dbe67c1c957ac6e7611bdf605a6218aa86b0eebeb8be58b70ae85ad7d73dc" dependencies = [ "quote", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] name = "uniffi_core" -version = "0.25.2" -source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a0c35aaad30e3a9e6d4fe34e358d64dbc92ee09045b48591b05fc9f12e0905b" dependencies = [ "anyhow", "async-compat", @@ -3569,15 +4320,15 @@ dependencies = [ "camino", "log", "once_cell", - "oneshot", "paste", "static_assertions", ] [[package]] name = "uniffi_macros" -version = "0.25.2" -source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db66474c5c61b0f7afc3b4995fecf9b72b340daa5ca0ef3da7778d75eb5482ea" dependencies = [ "bincode", "camino", @@ -3586,16 +4337,16 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.41", + "syn 2.0.77", "toml 0.5.11", - "uniffi_build", "uniffi_meta", ] [[package]] name = "uniffi_meta" -version = "0.25.2" -source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d898893f102e0e39b8bcb7e3d2188f4156ba280db32db9e8af1f122d057e9526" dependencies = [ "anyhow", "bytes", @@ -3605,8 +4356,9 @@ dependencies = [ [[package]] name = "uniffi_testing" -version = "0.25.2" -source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6aa4f0cf9d12172d84fc00a35a6c1f3522b526daad05ae739f709f6941b9b6" dependencies = [ "anyhow", "camino", @@ -3617,8 +4369,9 @@ dependencies = [ [[package]] name = "uniffi_udl" -version = "0.25.2" -source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b044e9c519e0bb51e516ab6f6d8f4f4dcf900ce30d5ad07c03f924e2824f28e" dependencies = [ "anyhow", "textwrap", @@ -3635,66 +4388,90 @@ checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "untrusted" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde", ] [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.6.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ + "getrandom", "serde", ] [[package]] -name = "valuable" -version = "0.1.0" +name = "validator" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" +dependencies = [ + "idna", + "once_cell", + "regex", + "serde", + "serde_derive", + "serde_json", + "url", + "validator_derive", +] [[package]] -name = "vcpkg" -version = "0.2.15" +name = "validator_derive" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +checksum = "df0bcf92720c40105ac4b2dda2a4ea3aa717d4d6a862cc217da653a4bd5c6b10" +dependencies = [ + "darling", + "once_cell", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.77", +] [[package]] -name = "version_check" -version = "0.9.4" +name = "valuable" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] -name = "waker-fn" -version = "1.1.1" +name = "version_check" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3709,12 +4486,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -3723,11 +4494,12 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "serde", "serde_json", "wasm-bindgen-macro", @@ -3735,24 +4507,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -3762,9 +4534,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3772,31 +4544,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-bindgen-test" -version = "0.3.39" +version = "0.3.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf9242c0d27999b831eae4767b2a146feb0b27d332d553e605864acd2afd403" +checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9" dependencies = [ "console_error_panic_hook", "js-sys", + "minicov", "scoped-tls", "wasm-bindgen", "wasm-bindgen-futures", @@ -3805,33 +4578,55 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.39" +version = "0.3.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89" +checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.77", ] [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", ] +[[package]] +name = "webpki-roots" +version = "0.26.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "weedle2" -version = "4.0.0" -source = "git+https://github.com/mozilla/uniffi-rs?rev=23711c8151bbb794369aa1f9d383db386792dff9#23711c8151bbb794369aa1f9d383db386792dff9" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "998d2c24ec099a87daf9467808859f9d82b61f1d9c9701251aea037f514eae0e" dependencies = [ "nom", ] +[[package]] +name = "which" +version = "6.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" +dependencies = [ + "either", + "home", + "rustix", + "winsafe", +] + [[package]] name = "winapi" version = "0.3.9" @@ -3850,11 +4645,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -3864,30 +4659,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] -name = "windows-core" -version = "0.51.1" +name = "windows-registry" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ - "windows-targets 0.48.5", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] -name = "windows-sys" -version = "0.45.0" +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-targets 0.42.2", + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -3905,22 +4712,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] -name = "windows-targets" -version = "0.42.2" +name = "windows-sys" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.52.6", ] [[package]] @@ -3940,25 +4741,20 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -3967,15 +4763,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3985,15 +4775,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4003,15 +4787,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "windows_i686_msvc" -version = "0.42.2" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4021,15 +4805,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4039,15 +4817,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4057,15 +4829,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4075,53 +4841,104 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.28" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] [[package]] -name = "winreg" -version = "0.50.0" +name = "winsafe" +version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" [[package]] name = "wiremock" -version = "0.5.22" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9" +checksum = "7fff469918e7ca034884c7fd8f93fe27bacb7fcb599fd879df6c7b429a29b646" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.21.5", + "base64", "deadpool", "futures", - "futures-timer", - "http-types", + "http", + "http-body-util", "hyper", + "hyper-util", "log", "once_cell", "regex", "serde", "serde_json", "tokio", + "url", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "serde", + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "zxcvbn" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ad76e35b00ad53688d6b90c431cabe3cbf51f7a4a154739e04b63004ab1c736c" +dependencies = [ + "chrono", + "derive_builder", + "fancy-regex", + "itertools 0.13.0", + "lazy_static", + "regex", + "time", + "wasm-bindgen", + "web-sys", +] diff --git a/pkgs/tools/security/bws/default.nix b/pkgs/tools/security/bws/default.nix index 4621bb1da5d01..b1a0a0b1eac5d 100644 --- a/pkgs/tools/security/bws/default.nix +++ b/pkgs/tools/security/bws/default.nix @@ -13,36 +13,36 @@ rustPlatform.buildRustPackage rec { pname = "bws"; - version = "0.4.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "sdk"; rev = "bws-v${version}"; - hash = "sha256-oCAyUTVAUfXBEb2K7vkYBOzcwqCsm2wxEKsYLZcfm6w="; + hash = "sha256-acS4yKppvIBiwBMoa5Ero4G9mUf8OLG/TbrZOolAwuc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "uniffi-0.25.2" = "sha256-YckrtociJV3VKGs5DJ0a1r1Cvq06S/mtr9iL1kLmAi8="; + "passkey-0.2.0" = "sha256-dCQUu4lWqdQ6EiNLPRVHL1dLVty4r8//ZQzV8XCBhmY="; }; }; nativeBuildInputs = [ installShellFiles pkg-config - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ perl ]; buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/tools/security/cameradar/default.nix b/pkgs/tools/security/cameradar/default.nix index 2182fe3b0b7b3..dae3565813c68 100644 --- a/pkgs/tools/security/cameradar/default.nix +++ b/pkgs/tools/security/cameradar/default.nix @@ -35,6 +35,7 @@ buildGoModule rec { meta = with lib; { description = "RTSP stream access tool"; homepage = "https://github.com/Ullaakut/cameradar"; + changelog = "https://github.com/Ullaakut/cameradar/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; # Upstream issue, doesn't build with latest curl, see diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix deleted file mode 100644 index 12f65546e92e5..0000000000000 --- a/pkgs/tools/security/ccid/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, stdenv -, fetchurl -, flex -, pcsclite -, pkg-config -, libusb1 -, perl -, zlib -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "ccid"; - version = "1.5.5"; - - src = fetchurl { - url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - hash = "sha256-GUcI91/jadRd18Feiz6Kfbi0nPxVV1dMoqLnbvEsoMo="; - }; - - postPatch = '' - patchShebangs . - substituteInPlace src/Makefile.in --replace /bin/echo echo - ''; - - configureFlags = [ - "--enable-twinserial" - "--enable-serialconfdir=${placeholder "out"}/etc/reader.conf.d" - "--enable-ccidtwindir=${placeholder "out"}/pcsc/drivers/serial" - "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers" - ]; - - # error: call to undeclared function 'InterruptRead'; - # ISO C99 and later do not support implicit function declarations - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - nativeBuildInputs = [ - flex - pkg-config - perl - ]; - - buildInputs = [ - pcsclite - libusb1 - zlib - ]; - - postInstall = '' - install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules - substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \ - --replace "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd" - ''; - - # The resulting shared object ends up outside of the default paths which are - # usually getting stripped. - stripDebugList = ["pcsc"]; - - passthru.updateScript = gitUpdater { - url = "https://salsa.debian.org/rousseau/CCID.git"; - }; - - meta = with lib; { - description = "PC/SC driver for USB CCID smart card readers"; - homepage = "https://ccid.apdu.fr/"; - license = licenses.lgpl21Plus; - maintainers = [ maintainers.anthonyroussel ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/security/cdk-go/default.nix b/pkgs/tools/security/cdk-go/default.nix index 93c0c1aa49646..0282bf20f79bd 100644 --- a/pkgs/tools/security/cdk-go/default.nix +++ b/pkgs/tools/security/cdk-go/default.nix @@ -27,6 +27,6 @@ buildGoModule rec { license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; mainProgram = "cdk"; - broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 + 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/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix index c494598c10d2b..6ea34ed4a8346 100644 --- a/pkgs/tools/security/cdxgen/default.nix +++ b/pkgs/tools/security/cdxgen/default.nix @@ -1,23 +1,24 @@ -{ fetchFromGitHub -, lib -, makeWrapper -, nodejs -, node-gyp -, pnpm_9 -, python3 -, stdenv -, xcbuild +{ + fetchFromGitHub, + lib, + makeWrapper, + nodejs, + node-gyp, + pnpm_9, + python3, + stdenv, + xcbuild, }: stdenv.mkDerivation (finalAttrs: { pname = "cdxgen"; - version = "10.8.1"; + version = "10.9.6"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cdxgen"; rev = "v${finalAttrs.version}"; - hash = "sha256-PFvSHuIaHaGfKI5s7DOW1adSKpnURaQtk5lAO9lr1OM="; + hash = "sha256-WgY0soHwedYbQNDvDIqtaxMSzVcaOVV2/22wOXU2nbA="; }; nativeBuildInputs = [ @@ -26,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { node-gyp # required for sqlite3 bindings pnpm_9.configHook python3 # required for sqlite3 bindings - ] ++ lib.optional stdenv.isDarwin [ xcbuild ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ xcbuild ]; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-IO7hn5xHdlQ+uyH8RWc7ZnnthXydCnMSde22YYMWOoc="; + hash = "sha256-IgmTYmCmZ65Da5zL6Tx7P4bt2o+YhX0UvU0DEONmr7w="; }; buildPhase = '' @@ -56,12 +57,14 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { description = "Creates CycloneDX Software Bill-of-Materials (SBOM) for your projects from source and container images"; mainProgram = "cdxgen"; homepage = "https://github.com/CycloneDX/cdxgen"; license = licenses.asl20; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ + dit7ya + quincepie + ]; }; }) diff --git a/pkgs/tools/security/certdump/default.nix b/pkgs/tools/security/certdump/default.nix index 8615fda62b49b..409650ac938bf 100644 --- a/pkgs/tools/security/certdump/default.nix +++ b/pkgs/tools/security/certdump/default.nix @@ -41,6 +41,6 @@ buildDotnetModule rec { license = licenses.asl20; maintainers = [ maintainers.baloo ]; # net5 has no osx-arm64 target available - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/tools/security/certinfo/default.nix b/pkgs/tools/security/certinfo/default.nix index f40b2a1eff01f..f8ec56585c4f1 100644 --- a/pkgs/tools/security/certinfo/default.nix +++ b/pkgs/tools/security/certinfo/default.nix @@ -1,22 +1,22 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, libX11, darwin }: +{ stdenv, lib, buildGo123Module, fetchFromGitHub, libX11, darwin }: -buildGoModule rec { +buildGo123Module rec { pname = "certinfo"; - version = "1.0.23"; + version = "1.0.24"; src = fetchFromGitHub { owner = "pete911"; repo = "certinfo"; rev = "v${version}"; - sha256 = "sha256-el7qL2d8z50S+0vyy8zH1W1uNix9PXmDGS5y8P9fIVA="; + sha256 = "sha256-BI5gYWKGMU0wLvnArG41bLWj+9ipe/GARKRX0fwz4ag="; }; # clipboard functionality not working on Darwin - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ libX11 ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; vendorHash = null; diff --git a/pkgs/tools/security/chainsaw/default.nix b/pkgs/tools/security/chainsaw/default.nix index b529956a96556..5789f488985c6 100644 --- a/pkgs/tools/security/chainsaw/default.nix +++ b/pkgs/tools/security/chainsaw/default.nix @@ -19,7 +19,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1w3DYP69aOphoqbsZIF9aX56Lftg2niKClmImLTa5DE="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + ]; ldflags = [ "-w" diff --git a/pkgs/tools/security/cherrybomb/default.nix b/pkgs/tools/security/cherrybomb/default.nix index 139ac5aea1ad5..38783319e7c72 100644 --- a/pkgs/tools/security/cherrybomb/default.nix +++ b/pkgs/tools/security/cherrybomb/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-pj4+rG8XbrxVuNgnTVUTPmgrPBRSnoBnqFhOO/JGGWI="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 304b10ca8abbe..73c1ade5bd637 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { pname = "chipsec"; version = "1.10.6"; - disabled = !stdenv.isLinux; + disabled = !stdenv.hostPlatform.isLinux; src = fetchFromGitHub { owner = "chipsec"; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 54aab020e7ee0..87471065098a3 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - hash = "sha256-1nqymeXKBdrT2imaXqc9YCCTcqW+zX8TuaM8KQM4pOY="; + hash = "sha256-oxjngKw5prPWxGlxOC+W7d6Xzki442HrgOY0Fe1Batg="; }; patches = [ @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config rustc rust-bindgen rustfmt cargo python3 ]; buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre2 libmspack json_c check - ] ++ lib.optional stdenv.isLinux systemd - ++ lib.optional stdenv.isDarwin Foundation; + ] ++ lib.optional stdenv.hostPlatform.isLinux systemd + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; cmakeFlags = [ "-DSYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd" diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index 7e889725d6c55..23e5590b8d057 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.18.0"; + version = "11.19.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "refs/tags/v${version}"; - hash = "sha256-B9Pa17Fyw+t6EjDay2A0SuXkzCGX+LldF+X0qF7xHo4="; + hash = "sha256-PeEnQSpwasgAnm6sHzNcqYOcRRH2DYAvcd0lwda5zdk="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-5wq5Hkw7BcfT2EgSJvTVYN0EVfCzqBAJHOVOtFKNj30="; + vendorHash = "sha256-mS+79EvNCQJeE90WZDLvj2akMWtarVAolAralZHsZuU="; ldflags = [ "-w" diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 098bd180b5a3c..fdbbb33d50a66 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.19.0"; + version = "11.24.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-37i7lbkw70DpwCUvZtv6548l6csx3ozG+1gPTKhJQFg="; + hash = "sha256-CI47eP1e1oXm2WQY89tU3g7DdSwG7UQT46DqOCY7uq0="; }; proxyVendor = true; - vendorHash = "sha256-8+qS6fR/5oYHP1QhoHfByQ7AayYPYVg4xEtF3617aJM="; + vendorHash = "sha256-x1rYRUiYqgi22r7CkOlgHHVImVvQ4sLggLV+hfkeW30="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 24092e58423e3..e8ffe7b2e4108 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -13,22 +13,22 @@ }: buildGoModule rec { pname = "cosign"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-wTtHdPrGTzDSqkgKMROs772y3mc0X2jMguDZOAL6Ypw="; + hash = "sha256-+UZ1o9rkbk/RnyU2Vzzs7uIm+texl5kGa+qt88x4zuk="; }; buildInputs = - lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) - ++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ]; + lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite) + ++ lib.optionals (stdenv.hostPlatform.isDarwin && pivKeySupport) [ PCSC ]; nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorHash = "sha256-7HaDsLZsO7QIFiUBE4kH1av97EE+zwphPRusFfpMxUc="; + vendorHash = "sha256-E1QHLh2gg5RZ7+tl7eJNR2FmtfVI6rwI6qLD7tio18c="; subPackages = [ "cmd/cosign" diff --git a/pkgs/tools/security/crowdsec/default.nix b/pkgs/tools/security/crowdsec/default.nix index d53fbce808008..567caef0558e2 100644 --- a/pkgs/tools/security/crowdsec/default.nix +++ b/pkgs/tools/security/crowdsec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3GpSpADtCNvekR7gjbIlqzog7PMog6Sra5tpcnUf/gk="; + hash = "sha256-JN2siYUUFPSz+SyQwkX6DZ9k82SGHEQ1QHBEIfEV4EM="; }; - vendorHash = "sha256-kkQYKiOSmFHjhOrYV40YRZX9w6rUue0NSKfw+Bqxb9s="; + vendorHash = "sha256-fl5LkRz69QOq4aPyAhMFxw1FWozLzofDBUGvRptuyZY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 38d3aa2a86ba9..084e9d9b1c356 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -7,18 +7,18 @@ maven.buildMavenPackage rec { pname = "cryptomator"; - version = "1.13.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - hash = "sha256-aKj8/yQzNWWV2m+sF2Or59OyPMiBqPeXEHn88w2VUkU="; + hash = "sha256-so8RINjFLF9H4K9f/60Ym/v/VpcVfxJ/c+JDOAPFgZU="; }; mvnJdk = jdk; mvnParameters = "-Dmaven.test.skip=true -Plinux"; - mvnHash = "sha256-bZGTYkxRXgjGoxAdVkgiZZgVSghKz3Mq9pCBdivMNPQ="; + mvnHash = "sha256-aB7wgnJAYvCizC0/gG/amcId/WVVWmZndItm398nDfQ="; preBuild = '' VERSION=${version} diff --git a/pkgs/tools/security/cyclonedx-gomod/default.nix b/pkgs/tools/security/cyclonedx-gomod/default.nix index 2a27f7b6a35b9..a8f75da90f54a 100644 --- a/pkgs/tools/security/cyclonedx-gomod/default.nix +++ b/pkgs/tools/security/cyclonedx-gomod/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cyclonedx-gomod"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-gomod"; rev = "refs/tags/v${version}"; - hash = "sha256-RM8ZH1mO+72ptoU7YKXlCZAyDhYZ7MFXyDYrqBQwsDI="; + hash = "sha256-s5kzyQPf29RZPnPtgFf4IVHnOtVZOtGSQqy1BNVVykQ="; }; - vendorHash = "sha256-1ibMneSOYs5C6Ul8m/rVXVFBJHZrH1D5eWRwVVJ6a+A="; + vendorHash = "sha256-Sz2NCznyD0tMuho9kr+U35I8bS/WK276nPdt83k1zfU="; ldflags = [ "-w" diff --git a/pkgs/tools/security/dalfox/default.nix b/pkgs/tools/security/dalfox/default.nix index b41ca04f7798d..b12b23a29b1de 100644 --- a/pkgs/tools/security/dalfox/default.nix +++ b/pkgs/tools/security/dalfox/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dalfox"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "hahwul"; repo = "dalfox"; rev = "refs/tags/v${version}"; - hash = "sha256-sKW6UYSPgXkZbLiOeYru/XpG/Cpvvhwos6Z5J/WxjXo="; + hash = "sha256-tg8TXPeGINGDBR3HOWYRXrg7ioBFhX1V7N1wRzHI0/c="; }; - vendorHash = "sha256-0eNaH82iCmxaie+nA9qxEWb8Uq6LaEQoU9wRFJ+GFv0="; + vendorHash = "sha256-SXNkMaUZ2jYoSmlmss4lFwpgxvqRF0D27KpANJveaq4="; ldflags = [ "-w" diff --git a/pkgs/tools/security/dieharder/default.nix b/pkgs/tools/security/dieharder/default.nix index 2cc5f719aa1da..c7804f0c5f4df 100644 --- a/pkgs/tools/security/dieharder/default.nix +++ b/pkgs/tools/security/dieharder/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, gsl -, dieharder, testers }: +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dieharder"; version = "3.31.1"; src = fetchurl { - url = "http://webhome.phy.duke.edu/~rgb/General/dieharder/dieharder-${version}.tgz"; + url = "http://webhome.phy.duke.edu/~rgb/General/dieharder/dieharder-${finalAttrs.version}.tgz"; hash = "sha256-bP8P+DlMVTVJrHQzNZzPyVX7JnlCYDFGIN+l5M1Lcn8="; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ gsl ]; passthru = { - tests.version = testers.testVersion { package = dieharder; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = with lib; { @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ zhaofengli ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/tools/security/donkey/default.nix b/pkgs/tools/security/donkey/default.nix index f56811cc273f9..e481744ee7d57 100644 --- a/pkgs/tools/security/donkey/default.nix +++ b/pkgs/tools/security/donkey/default.nix @@ -4,20 +4,19 @@ , coreutils , lib , testers -, donkey }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "donkey"; version = "1.2.0"; src = fetchFromGitLab { owner = "donkey"; repo = "donkey"; - rev = "tags/release/${version}"; + rev = "tags/release/${finalAttrs.version}"; hash = "sha256-2xgb9l0Eko39HJVROAWEIP3qLg5t/5h/rm2MoXoKnJI="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; buildInputs = [ libmd ]; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { export INSTALL_DATA="${coreutils}/bin/install -m 444" ''; - passthru.tests.version = testers.testVersion { package = donkey; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { description = "Alternative for S/KEY's 'key' command"; @@ -51,4 +50,4 @@ The name "Donkey" is an acronym of "Don't Key". maintainers = with maintainers; [ raboof ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/tools/security/echidna/default.nix b/pkgs/tools/security/echidna/default.nix index a8e812219ba5c..f3bfb9fbffeec 100644 --- a/pkgs/tools/security/echidna/default.nix +++ b/pkgs/tools/security/echidna/default.nix @@ -110,7 +110,7 @@ mkDerivation ( mainProgram = "echidna-test"; } - // lib.optionalAttrs (stdenv.isDarwin && stdenv.isAarch64) { + // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { # https://github.com/NixOS/nixpkgs/pull/304352 postInstall = with haskellPackages; '' diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 8a5f7a44118b1..68c8aab57a425 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-08-29"; + version = "2024-10-02"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-QZO7wJiqVVt9vpocC2X4Vrj8s02kh/E3j96JKbYoJJo="; + hash = "sha256-uNFBMZ6pk/xT6OZMb8EKax141lc+uumQl3xbihFMYAI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index f4e361332e96e..64975a04c9f4b 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/security/firefox_decrypt/default.nix b/pkgs/tools/security/firefox_decrypt/default.nix index 2799a990975a4..52dc4a9bd71f6 100644 --- a/pkgs/tools/security/firefox_decrypt/default.nix +++ b/pkgs/tools/security/firefox_decrypt/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { makeWrapperArgs = [ "--prefix" - (if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH") + (if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH") ":" (lib.makeLibraryPath [ nss ]) ]; diff --git a/pkgs/tools/security/freeze/default.nix b/pkgs/tools/security/freeze/default.nix index 28ef21657009c..e828ed79bf4c3 100644 --- a/pkgs/tools/security/freeze/default.nix +++ b/pkgs/tools/security/freeze/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { "-w" ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mv $out/bin/Freeze $out/bin/freeze ''; diff --git a/pkgs/tools/security/frida-tools/default.nix b/pkgs/tools/security/frida-tools/default.nix index 9a3bdee5dae2e..36abd4ad5c68f 100644 --- a/pkgs/tools/security/frida-tools/default.nix +++ b/pkgs/tools/security/frida-tools/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "frida-tools"; - version = "12.3.0"; + version = "12.5.0"; src = fetchPypi { inherit pname version; - hash = "sha256-jtxn0a43kv9bLcY1CM3k0kf5K30Ne/FT10ohptWNwEU="; + hash = "sha256-vlqBN0E+bpfx+TLliZ3hgCaeOEdMRP/rmAfkmjOTqyA="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index 494486021c67d..9f3207dbc6ce7 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-JoJ7kYL5EJOI6TwMh0arMXXnj/Y93szrvlFsv0FJn3w="; + hash = "sha256-eRf504i9kYQua/p0SNlDGNeXa9ztoyz6M8nukhRyzIY="; # 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; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-Xv+wiG3MRAE49Wu+FoHBIXz8B2mnqzzcDCchgYjZC/o="; + vendorHash = "sha256-VTJhQrsqwGHq8211N3pUf4fmU4H90gRWYJTdEufNGg4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/tools/security/gallia/default.nix index d9dfc13c07deb..1788e2784cc68 100644 --- a/pkgs/tools/security/gallia/default.nix +++ b/pkgs/tools/security/gallia/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gallia"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "Fraunhofer-AISEC"; repo = "gallia"; rev = "refs/tags/v${version}"; - hash = "sha256-x1sTvb+Z/AttYJVBEfXMx2/Ps34ZbqdLeGN8qHkFXsQ="; + hash = "sha256-izMTTZrp4aizq5jS51BNtq3lv9Kr+xI7scZfYKXA/oY="; }; pythonRelaxDeps = [ "aiofiles" ]; diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix index 0c326c2dac663..f1e9a197680bf 100644 --- a/pkgs/tools/security/genpass/default.nix +++ b/pkgs/tools/security/genpass/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ls3tzZ+gtZQlObmbtwJDq6N/f5nY+Ps7RL5R/fR5Vgg="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation libiconv Security ]; meta = with lib; { description = "Simple yet robust commandline random password generator"; diff --git a/pkgs/tools/security/gfshare/default.nix b/pkgs/tools/security/gfshare/default.nix index e0da2fdaf35b5..caf04cee0d5c0 100644 --- a/pkgs/tools/security/gfshare/default.nix +++ b/pkgs/tools/security/gfshare/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.rraval ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gfshare.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gfshare.x86_64-darwin }; } diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix index 1b874921cce78..61c5daf41a239 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/tools/security/ggshield/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.29.0"; + version = "1.32.0"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; rev = "refs/tags/v${version}"; - hash = "sha256-x37FRSjhqV7LxD8VFSmVjg/FPlxsa4NEX6y7OEAniF4="; + hash = "sha256-yqR5kgXhR4YUih46RuSlOmD2CgdN40QpUho6WTha60U="; }; pythonRelaxDeps = true; @@ -70,6 +70,7 @@ python3.pkgs.buildPythonApplication rec { "test_check_git_dir" "test_does_not_fail_if_cache" # Encoding issues + "test_create_files_from_paths" "test_file_decode_content" "test_file_is_longer_than_does_not_read_utf8_file" "test_file_is_longer_using_8bit_codec" diff --git a/pkgs/tools/security/ghauri/default.nix b/pkgs/tools/security/ghauri/default.nix index 9021b41029667..4141690085e7e 100644 --- a/pkgs/tools/security/ghauri/default.nix +++ b/pkgs/tools/security/ghauri/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ghauri"; - version = "1.3.7"; + version = "1.3.8"; pyproject = true; src = fetchFromGitHub { owner = "r0oth3x49"; repo = "ghauri"; rev = "refs/tags/${version}"; - hash = "sha256-uGRhp77HmLmWMJFyhJoEjwdIR84Wcwv554g9Hi6yW4c="; + hash = "sha256-GEUuQMtp8XO32uOIILWiMfngPXx/3vCKk+YbA0E13rg="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index e85b58cd57eb4..b9a756dd597ce 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -20,7 +20,7 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "11.1.2"; + version = "11.2"; releaseName = "NIX"; distroPrefix = "ghidra_${version}_${releaseName}"; @@ -28,7 +28,7 @@ let owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-FL1nLaq8A9PI+RzqZg5+O+4+ZsH16MG3cf7OIKimDqw="; + hash = "sha256-iO6g3t8JNdc/wAC+JG+6Y7aZCq7T9zYQC3KKZcr+wzc="; # 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; @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { python3 python3Packages.pip ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild desktopToDarwinBundle ]; @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' export JAVA_TOOL_OPTIONS="-Duser.home=$NIX_BUILD_TOP/home" - gradle -I gradle/support/fetchDependencies.gradle init + gradle -I gradle/support/fetchDependencies.gradle ''; gradleBuildTask = "buildGhidra"; @@ -196,6 +196,6 @@ stdenv.mkDerivation (finalAttrs: { roblabla vringar ]; - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 55f224da511b8..8f39076b4eecb 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper icoutils - ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib diff --git a/pkgs/tools/security/ghidra/deps.json b/pkgs/tools/security/ghidra/deps.json index 8e45b569a9166..e4b3795d929e9 100644 --- a/pkgs/tools/security/ghidra/deps.json +++ b/pkgs/tools/security/ghidra/deps.json @@ -10,9 +10,6 @@ "27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/wheel-0.37.1-py2.py3-none-any": { "whl": "sha256-S9zX2EATgIYSbNCSVNxhlftPxvAcBQodcjbyYw2x0io=" }, - "2d/e0/f877c91e036fcaed2a827f80d6cbdf1d26cffc3333c9ebda31c55c45f050/Pybag-2.2.10-py3-none-any": { - "whl": "sha256-gc8eM91mfdIX3FahIzJnluZ5m4Vp8sbvt4wWN1yvmys=" - }, "50/8f/518a37381e55a8857a638afa86143efa5508434613541402d20611a1b322/comtypes-1.4.1-py3-none-any": { "whl": "sha256-ogig48ocClNic12g/2YYIoAdzocxK4lNfXUq3QEKIbA=" }, @@ -28,6 +25,9 @@ "c7/42/be1c7bbdd83e1bfb160c94b9cafd8e25efc7400346cf7ccdbdb452c467fa/setuptools-68.0.0-py3-none-any": { "whl": "sha256-EeUsZ0FaOB0Q1rRiztnPuXBmF58OhxOZ4AbEqxAfyF8=" }, + "ce/78/91db67e7fe1546dc8b02c38591b7732980373d2d252372f7358054031dd4/Pybag-2.2.12-py3-none-any": { + "whl": "sha256-7aXubE6HOQKYG39SW0KgJCi4fHNo3yxb3+He0OaIQSY=" + }, "d0/dd/b28df50316ca193dd1275a4c47115a720796d9e1501c1888c4bfa5dc2260/capstone-5.0.1-py3-none-win_amd64": { "whl": "sha256-G/pcgeaIDK9BoxlGzW0tBpwEi8wi7fEhJUtQGgSN5nU=" } @@ -38,37 +38,37 @@ } }, "https://github.com": { - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2012_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2012_x64": { "fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2012_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2012_x86": { "fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2015_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2015_x64": { "fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2015_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2015_x86": { "fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2017_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2017_x64": { "fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2017_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2017_x86": { "fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2019_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2019_x64": { "fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2019_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2019_x86": { "fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vsOlder_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vsOlder_x64": { "fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vsOlder_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vsOlder_x86": { "fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/lib/java-sarif-2.1-modified": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/lib/java-sarif-2.1-modified": { "jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE=" }, "pxb1988/dex2jar/releases/download/v2.1/dex2jar-2.1": { @@ -742,8 +742,8 @@ "pydev/files/pydev/PyDev%206.3.1/PyDev%206.3.1": { "zip": "sha256-TYH+nYr+dmW46iCETT9RB/RGdCknxZlz6t5PKYCbBpk=" }, - "yajsw/files/yajsw/yajsw-stable-13.09/yajsw-stable-13.09": { - "zip": "sha256-Ta5zKlNYRq5d+rdT6CpNX5OtmgWgZeIXK7l3ShsVRTo=" + "yajsw/files/yajsw/yajsw-stable-13.12/yajsw-stable-13.12": { + "zip": "sha256-xvxZgV04ANFOyXeSaor9P2BqDr100s/WBgFndGbt6qI=" } }, "https://storage.googleapis.com": { diff --git a/pkgs/tools/security/ghidra/extensions.nix b/pkgs/tools/security/ghidra/extensions.nix index cae5b38c0e92b..60070a316a0f9 100644 --- a/pkgs/tools/security/ghidra/extensions.nix +++ b/pkgs/tools/security/ghidra/extensions.nix @@ -11,6 +11,8 @@ lib.makeScope newScope (self: { buildGhidraScripts ; + findcrypt = self.callPackage ./extensions/findcrypt { }; + ghidraninja-ghidra-scripts = self.callPackage ./extensions/ghidraninja-ghidra-scripts { }; ghidra-delinker-extension = self.callPackage ./extensions/ghidra-delinker-extension { diff --git a/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix b/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix new file mode 100644 index 0000000000000..f1f852064ff08 --- /dev/null +++ b/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + buildGhidraExtension, +}: +let + version = "3.0.2"; +in +buildGhidraExtension { + pname = "findcrypt"; + inherit version; + + src = fetchFromGitHub { + owner = "antoniovazquezblanco"; + repo = "GhidraFindcrypt"; + rev = "v${version}"; + hash = "sha256-SNmhn/X+POp6dRaB9etZ8GvpKf/5+mPg3E0HUQTthIY="; + }; + + meta = { + description = "Ghidra analysis plugin to locate cryptographic constants"; + homepage = "https://github.com/antoniovazquezblanco/GhidraFindcrypt"; + downloadPage = "https://github.com/antoniovazquezblanco/GhidraFindcrypt/releases/tag/v${version}"; + changelog = "https://github.com/antoniovazquezblanco/GhidraFindcrypt/releases/tag/v${version}"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.BonusPlay ]; + }; +} diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix index 4bddcd4d18a7d..0a8cc83523549 100644 --- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix +++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, }: let - version = "0.4.0"; + version = "0.5.0"; self = ghidra.buildGhidraExtension { pname = "ghidra-delinker-extension"; inherit version; @@ -13,8 +13,8 @@ let src = fetchFromGitHub { owner = "boricj"; repo = "ghidra-delinker-extension"; - rev = "04338fd028bf8b5449ff3f5373635111140bbeda"; - hash = "sha256-tfO92dnpfY13ZbvL36WzV/pC3xH/fbQDICNAF8D4fCI="; + rev = "v${version}"; + hash = "sha256-y0afqqIsWN33b/zGsxJYn8O+R5IP4eD300CgzMymEA0="; }; postPatch = '' diff --git a/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix b/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix index 74aa7ca90b11e..f31e89c9f4efb 100644 --- a/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix +++ b/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix @@ -5,13 +5,13 @@ }: buildGhidraExtension rec { pname = "lightkeeper"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "WorksButNotTested"; repo = "lightkeeper"; rev = version; - hash = "sha256-S8yNn56A2CvrIBsq0RoBx0qOjrYDZSv1IVTxGmlL4Js="; + hash = "sha256-Emyo4GBrR725jDxRsStC6/4F9mYnRo3S3QY0GeB/BvI="; }; preConfigure = '' cd lightkeeper diff --git a/pkgs/tools/security/ghidra/extensions/ret-sync/default.nix b/pkgs/tools/security/ghidra/extensions/ret-sync/default.nix index e2ab50c119c11..e7791eb90b2b7 100644 --- a/pkgs/tools/security/ghidra/extensions/ret-sync/default.nix +++ b/pkgs/tools/security/ghidra/extensions/ret-sync/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, buildGhidraExtension, ghidra, }: @@ -14,7 +15,16 @@ buildGhidraExtension { rev = "0617c75746ddde7fe2bdbbf880175af8ad27553e"; hash = "sha256-+G5ccdHnFL0sHpueuIYwLRU9FhzN658CYqQCHCBwxV4="; }; - + patches = [ + # This patch is needed to get the extension compiling with Ghidra 11.2. + # Once it's fixed upstream, the src can be updated and this can be removed. + (fetchpatch { + # https://github.com/bootleg/ret-sync/pull/126 + name = "ghidra-11.2-fix.patch"; + url = "https://github.com/bootleg/ret-sync/commit/d81d953c24b4369b499e90ba64c1c9f78513a008.patch"; + hash = "sha256-t/voPcBfsZtfdYnskgBAPfqMTBw1LRTT0aXyyb5qtr8="; + }) + ]; preConfigure = '' cd ext_ghidra ''; diff --git a/pkgs/tools/security/gitjacker/default.nix b/pkgs/tools/security/gitjacker/default.nix index 5303e169e8dd7..83e8b91f8b28e 100644 --- a/pkgs/tools/security/gitjacker/default.nix +++ b/pkgs/tools/security/gitjacker/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { nativeCheckInputs = [ git ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export PATH=$TMPDIR/usr/bin:$PATH diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 4a866efca13f0..e72aa156f8009 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.18.4"; + version = "8.20.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; rev = "refs/tags/v${version}"; - hash = "sha256-tAomF5Ym+D/VMYXrsPlUnh3M94Xdx6I8WoU1jMouZag="; + hash = "sha256-9cMjGLRe3jTcP6WCjZPi3E92pVv2MXcAX7ca4LreKOQ="; }; - vendorHash = "sha256-DgCtWRo5KNuFCdhGJvzoH2v8n7mIxNk8eHyZFPUPo24="; + vendorHash = "sha256-4bGpTMmQmsJQ2RNIehYe0xAwwGOh2l6FGsKdciEVLAc="; ldflags = [ "-s" diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 5181f78e8a2e7..e0fdf3361f9bd 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -4,7 +4,7 @@ , adns, bzip2, gnutls, libusb1, openldap, readline, sqlite, zlib , enableMinimal ? false , withPcsc ? !enableMinimal, pcsclite -, guiSupport ? stdenv.isDarwin, pinentry +, guiSupport ? stdenv.hostPlatform.isDarwin, pinentry , nixosTests }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in - '' + lib.optionalString (stdenv.isLinux && withPcsc) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && withPcsc) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { "GPGRT_CONFIG=${lib.getDev libgpg-error}/bin/gpgrt-config" ] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentry.binaryPath or "bin/pinentry"}" - ++ lib.optional stdenv.isDarwin "--disable-ccid-driver"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-ccid-driver"; postInstall = if enableMinimal then '' diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index ef1b2e1db5189..b55417b60af3a 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -4,8 +4,8 @@ , adns, bzip2, gnutls, libusb1, openldap, readline, sqlite, zlib , enableMinimal ? false , withPcsc ? !enableMinimal, pcsclite -, guiSupport ? stdenv.isDarwin, pinentry -, withTpm2Tss ? !stdenv.isDarwin && !enableMinimal, tpm2-tss +, guiSupport ? stdenv.hostPlatform.isDarwin, pinentry +, withTpm2Tss ? !stdenv.hostPlatform.isDarwin && !enableMinimal, tpm2-tss , nixosTests }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 - '' + lib.optionalString (stdenv.isLinux && withPcsc) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && withPcsc) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentry.binaryPath or "bin/pinentry"}" ++ lib.optional withTpm2Tss "--with-tss=intel" - ++ lib.optional stdenv.isDarwin "--disable-ccid-driver"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-ccid-driver"; postInstall = if enableMinimal then '' @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { frontend applications and libraries are available. Version 2 of GnuPG also provides support for S/MIME. ''; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz sgo ]; platforms = platforms.all; mainProgram = "gpg"; }; diff --git a/pkgs/tools/security/go365/default.nix b/pkgs/tools/security/go365/default.nix index 381df6d74629f..12fad051584d2 100644 --- a/pkgs/tools/security/go365/default.nix +++ b/pkgs/tools/security/go365/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorHash = "sha256-Io+69kIW4DV2EkA73pjaTcTRbDSYBf61R7F+141Jojs="; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mv $out/bin/Go365 $out/bin/$pname ''; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index fc16820d1c97b..68b794214f6ee 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { git gnupg xclip - ] ++ lib.optional stdenv.isLinux wl-clipboard + ] ++ lib.optional stdenv.hostPlatform.isLinux wl-clipboard ); postInstall = '' diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index 9508db01c87f8..1c9abd08c80a2 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -14,7 +14,7 @@ buildGoModule rec { owner = "gopasspw"; repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-+CE8cKBEBKK3OeIDq5SUlk23Y5C40fewu6tGMF0mT1c="; + hash = "sha256-DbfmjgIUqgWVYyPqkcaeE5JKzqElNbrGnx62Fd8v7Hg="; }; vendorHash = "sha256-Aahu0afi6bPnvz/NSZznbp0y9vMJWDj1Bq7tWGRmm7g="; diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 28305ceb4e8ee..6cbe088d6871f 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.19"; + version = "0.5.5"; src = fetchFromGitHub { owner = "wallarm"; repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-ax2HPhdaqawpFe2AZg3SVsEJLG7gEgL7632iRADpaa8="; + hash = "sha256-stGjxv9cgYxxclQpyytN6dhFm2G1Gxbf9MdyKw6gEC4="; }; - vendorHash = null; + vendorHash = "sha256-mPqCphweDF9RQibdjTaXXfXdO8NENHVMdIPxrJEw2g4="; # Some tests require networking as of v0.4.0 doCheck = false; @@ -28,11 +28,6 @@ buildGoModule rec { "-X=github.com/wallarm/gotestwaf/internal/version.Version=v${version}" ]; - postFixup = '' - # Rename binary - mv $out/bin/cmd $out/bin/${pname} - ''; - passthru.tests.version = testers.testVersion { command = "gotestwaf --version"; package = gotestwaf; @@ -41,10 +36,10 @@ buildGoModule rec { meta = with lib; { description = "Tool for API and OWASP attack simulation"; - mainProgram = "gotestwaf"; homepage = "https://github.com/wallarm/gotestwaf"; changelog = "https://github.com/wallarm/gotestwaf/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "gotestwaf"; }; } diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index eaaf5ca1793a5..7c9ea77888959 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "auth"; - version = "2.155.6"; + version = "2.161.0"; src = fetchFromGitHub { owner = "supabase"; repo = "auth"; rev = "v${version}"; - hash = "sha256-dldCFDiKGQU/XqtzkvzTdwtI8rDjFaaYJw9elYmDglM="; + hash = "sha256-+tWCA1FGmvqivYI/wqaVY0zJKwqUqpZfotuHhHmuDwc="; }; - vendorHash = "sha256-ttdrHBA6Dybv+oNljIJpOlA2CZPwTIi9fI32w5Khp9Y="; + vendorHash = "sha256-nmvZKkSfOflsrcos3cCZHrq4DVF23TQG9kST0AcjN7E="; ldflags = [ "-s" diff --git a/pkgs/tools/security/gowitness/default.nix b/pkgs/tools/security/gowitness/default.nix index ab31281bbd283..57a82168bdb9b 100644 --- a/pkgs/tools/security/gowitness/default.nix +++ b/pkgs/tools/security/gowitness/default.nix @@ -1,20 +1,21 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "gowitness"; - version = "2.5.1"; + version = "3.0.4"; src = fetchFromGitHub { owner = "sensepost"; repo = "gowitness"; rev = "refs/tags/${version}"; - hash = "sha256-37OorjzxDu27FNAz4LTtQdFjt0tL9jSb9tGZhlq797Q="; + hash = "sha256-ygnYqX8il0nDvF5+jd52CypmHH8iiLMlOZWdoTsR0ig="; }; - vendorHash = "sha256-Exw5NfR3nDYH+hWMPOKuVIRyrVkOJyP7Kwe4jzQwnsI="; + vendorHash = "sha256-2hG+93LzJ+kUVCOXFGk83Asvn7zLWq2BSqrq+eOJhQ0="; ldflags = [ "-s" @@ -23,10 +24,10 @@ buildGoModule rec { meta = with lib; { description = "Web screenshot utility"; - mainProgram = "gowitness"; homepage = "https://github.com/sensepost/gowitness"; changelog = "https://github.com/sensepost/gowitness/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "gowitness"; }; } diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index ba07ffb9e67f1..5c4dd4620eaf3 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals x11Support [ libxcb libxkbcommon - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Foundation libiconv diff --git a/pkgs/tools/security/grap/default.nix b/pkgs/tools/security/grap/default.nix index 4d8f347e048ac..7f8d931fbb6a4 100644 --- a/pkgs/tools/security/grap/default.nix +++ b/pkgs/tools/security/grap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, libseccomp, flex, swig4, bison, cmake, python3 }: +{ lib, stdenv, fetchFromGitHub, boost, libseccomp, flex, swig, bison, cmake, python3 }: stdenv.mkDerivation rec { pname = "grap"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmake flex python3 - swig4 + swig ]; buildInputs = [ diff --git a/pkgs/tools/security/graphw00f/default.nix b/pkgs/tools/security/graphw00f/default.nix index da0bd6b2a3ad2..bb5b3a36d56da 100644 --- a/pkgs/tools/security/graphw00f/default.nix +++ b/pkgs/tools/security/graphw00f/default.nix @@ -1,23 +1,22 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "graphw00f"; - version = "1.1.17"; + version = "1.1.18"; format = "other"; src = fetchFromGitHub { owner = "dolevf"; - repo = pname; + repo = "graphw00f"; rev = "refs/tags/${version}"; - hash = "sha256-VeTFwn4PANGoW2Cb/IJ1KJb4YkjjDpaU7DLv0YwRwDU="; + hash = "sha256-gM6I3TLCuVKO1dTHl2jrXtmLOv29pTqrV18nGW5TYFY="; }; - propagatedBuildInputs = with python3.pkgs; [ - requests - ]; + dependencies = with python3.pkgs; [ requests ]; installPhase = '' runHook preInstall @@ -28,11 +27,12 @@ python3.pkgs.buildPythonApplication rec { runHook postInstall ''; + meta = with lib; { description = "GraphQL Server Engine Fingerprinting utility"; - mainProgram = "graphw00f"; homepage = "https://github.com/dolevf/graphw00f"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; + mainProgram = "graphw00f"; }; } diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index dc3a5390da3c7..55201b3d84835 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { homepage = "https://hashcat.net/hashcat/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ felixalbrigtsen kierdavis zimbatm ]; + maintainers = with maintainers; [ felixalbrigtsen zimbatm ]; }; } diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index 76123a7c893fb..7792165d25879 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -6,7 +6,7 @@ }: let makefile = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then "makefile.mac" else "makefile"; in diff --git a/pkgs/tools/security/jadx/deps.json b/pkgs/tools/security/jadx/deps.json index be81d7a4acee7..f91f061ccc9a4 100644 --- a/pkgs/tools/security/jadx/deps.json +++ b/pkgs/tools/security/jadx/deps.json @@ -248,13 +248,13 @@ "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" }, - "org/gradle/kotlin#gradle-kotlin-dsl-plugins/4.3.1": { - "jar": "sha256-j8X5xgrEWoeaQXdoEbWf0s5cWtXkJW8S18i+rFCkHcg=", - "module": "sha256-k+eJyXjl4QG8QXfLsnmFQSvMtpNtsA7MQeYoG4QD/F4=", - "pom": "sha256-Fr3gZfWofPRP3FD5xbYNMS9xOgwbyq4AixJItHhojAo=" + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/4.5.0": { + "jar": "sha256-Ga92VnnptJN0uyg6xE81O4EJrZz+ZmjO1tmmZFVA4vo=", + "module": "sha256-G2X3c4EI7gxE5qUNjMJUpPHFpzmAtuh7D14uxMt6qDY=", + "pom": "sha256-D4Du3/O101e+rs5h8enK1Le/b4EVrWRIfYp2x/GwDBw=" }, - "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/4.3.1": { - "pom": "sha256-Oispc8Afy2j0kx8ZbNeLAzctoWrBYmqOPWMYVkNqlOc=" + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/4.5.0": { + "pom": "sha256-WPAIDJzwTgVq1U0Ok91KI0KGXnihMR6TVAVk90wgDjc=" }, "org/jdom#jdom2/2.0.6.1": { "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", @@ -268,120 +268,113 @@ "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" }, - "org/jetbrains/kotlin#kotlin-android-extensions/1.9.22": { - "jar": "sha256-Hl6IFkKpnduPbRPmmVoIwZK8OEGHOWZj2ER8CB2H4k8=", - "pom": "sha256-lEt8+zPgpvtoRVkEjwKMuWMmyTKiRdXLAhQ7zSwDEVk=" - }, "org/jetbrains/kotlin#kotlin-android-extensions/1.9.23": { "jar": "sha256-Yf12SPkx/06b2/9JvwmHcFdj+7qce7ALJkgRo20RGsE=", "pom": "sha256-0+vFk7FzrT4tHiVgtpwzFKRpDI2jJ0ch6DqWrtwWEaA=" }, - "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/1.9.22": { - "jar": "sha256-KmHdIZ/tvlMYo7HiPA9zm0XtG1sksLZzdRm3hF6Alfg=", - "pom": "sha256-nbJr6D8/Y8Uf972pHjpqQNTDTaAj5ilsAQW7SqZvzJI=" + "org/jetbrains/kotlin#kotlin-android-extensions/1.9.24": { + "jar": "sha256-4z5UUlSR0ZgdRODKmnxTIWh91QRDPsVJZhqb5UYKEW4=", + "pom": "sha256-6QmjYHLn/lbQULgKdXEDwdP4dz+2wb0GcrxKr7hRCEs=" }, - "org/jetbrains/kotlin#kotlin-assignment/1.9.22": { - "module": "sha256-bxIe+E4ozzMG/eTDHVXC2D14RPJLDnslZfh7Apn7sx0=", - "pom": "sha256-9kQYoM3bm9hQ96/CasjyPon7ptlgSNqnNZVWJ5AgbwA=" + "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/1.9.24": { + "jar": "sha256-AoVjJSRkxIYBkX8rbFTRuOQhzcfya/L5zzCIlcgSSgY=", + "pom": "sha256-Hzfc9EhcI3qtLk70O40RQJleMTKduiTJ9qa3uEBrg9Q=" }, - "org/jetbrains/kotlin#kotlin-assignment/1.9.22/gradle82": { - "jar": "sha256-SbgHX6DiGLoRuhim9yUE38XwOZQovs8Ta9yHHceBgMU=" + "org/jetbrains/kotlin#kotlin-assignment/1.9.24": { + "module": "sha256-qa+tevGbZXAv892pBdPJt/mem9rqadY1+s2f3mi7VQU=", + "pom": "sha256-U5l+9NCcNhmm32TaPftTdngenYSMck+DLIDPCoCjLA8=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.22": { - "jar": "sha256-3UnLfij08zgvUlDPsFyGT9XwqW0yZbspPHezCtzJP/Y=", - "pom": "sha256-DFZLu4fcXs32Q005buob886Xar8IgYCN0Wb6SbBGSfs=" + "org/jetbrains/kotlin#kotlin-assignment/1.9.24/gradle82": { + "jar": "sha256-897/fRYVZp9m+jeTnLZJBOex+LBgNReZDH8IEs40oNs=" }, "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.23": { "jar": "sha256-gvhH4lRXtGSDfv7x2oUC7JJTLedAbnkgUWbODs9PxSE=", "pom": "sha256-CWkjtiXJfGZzZ5ZsxM6Sv5TE6f98U8sdOEhgEax1DVg=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.22": { - "jar": "sha256-K/6t7lmrGYjDNtvW5l2ZH3Zq4d2Gg/Km3tX6oCefDKA=", - "pom": "sha256-s9o0u29ClqzzoPRDRm8FBsbJnaXNliTW4LdFsiKHhOs=" + "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.24": { + "jar": "sha256-ZUX99qL/t4jN3O3KymMiOdx+XmHD90SCNzXjse2cG1Q=", + "pom": "sha256-efIYZmDsHYeQhu4jEEeY2M1PthcsJ5xeVuAsqeVbxHU=" }, "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.23": { "jar": "sha256-zJQGSXS/nr9ZlF4xIXzy0WoM66rySH6wdI/By9F4eUM=", "pom": "sha256-WLI81NgtWqkWpcnMmbMhjuxVaWBoova3C+3fbDaR/RU=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.22": { - "jar": "sha256-c+x1u5nr/6iySiSjuFPz9mCWvEapNRrw2sk967acFes=", - "pom": "sha256-pO6KZ8HW8lODjAAnKAvLgFCsDc3MrZdIlhOKaaAX6wE=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.24": { + "jar": "sha256-5x/xnmsUGrhakyj9AQlBUxowJUMCa9QkTJWtwgjVAfY=", + "pom": "sha256-1w0fiFkkQ/R1eVFUVqTWwxBRztoK0RRGkjrK/kwMldE=" }, "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.23": { "jar": "sha256-yFlaPhcRx0U8f5YKrxKhcNtL2j1vy6Sf/I4yy/0ADKE=", "pom": "sha256-KebjEpGbdf6aOHjflRHPQhDcJuWTQcsu4iSDt7Tgcv4=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/1.9.22": { - "jar": "sha256-XXPhgVsRZ+Sv4gjwCyp1wIC8WoEHhsqtuOFHh1k6k7k=", - "pom": "sha256-YsRKZZ2lXbb7El4pKbmNUEow4fSvgU4I5JIUJqpST4o=" + "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.24": { + "jar": "sha256-g4Q5dMH/0NNmbTxkk0Hb/TB32eFAZlVKakR7laMB3S0=", + "pom": "sha256-wb508udfB+SamqaJA+DctogA0iRkBBi0hHfuQsvDWQQ=" }, "org/jetbrains/kotlin#kotlin-daemon-client/1.9.23": { "jar": "sha256-5jFUJUkZ/XBv6ZN8SNuTfqkGimMfht5lWlFLwWIPmI0=", "pom": "sha256-X70GastuQIU5gCdsaDUWmSj2Zqt8RlEsJvJMnQMIF9M=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.22": { - "jar": "sha256-kqV4ExcUR9U0Rh+hP+N9yM07f4bYPpsfe7GwvjBUH4s=", - "pom": "sha256-9uo9z2v7Og0GmER8SKa88I2Oqs+D/JX+nUGBpeXjwrE=" + "org/jetbrains/kotlin#kotlin-daemon-client/1.9.24": { + "jar": "sha256-WIqveo7Y55uL8+qLknj/Enii1ZKFpF4Jjxz8v7Dc080=", + "pom": "sha256-tv4ne9GuP/zAzriOxmZZmHpc0TeaiXaDEvXe3x8uH+U=" }, "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.23": { "jar": "sha256-bztmG5gmetJOL4+3rV0Gvn0u1hpdBcJn9OTKp433g9k=", "pom": "sha256-WFRgOL5Go4NmOFPRMd12xPsnQ4MLqXt0sno1zxAtPQI=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/1.9.22": { - "jar": "sha256-lnaDy5jZkQFFYH+/W0VilbQ/Cq+Tsbunv2mS5zHLJOw=", - "pom": "sha256-Y7por+B4/3D3CPnpecaTxFv+iQQfeWQbC4H2tKEm7rs=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.24": { + "jar": "sha256-F3vIsqQHbcznh4rQ2P0HFjrzF44/qQ7mPU9zO7R7/ck=", + "pom": "sha256-T7V/xqxyCVGzIkd0s7sqVFSelj0vTf3GhB6Ex77WKrE=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/1.9.23": { "jar": "sha256-HaitBgpbw4KwTxVycdPNrWgwcUovTfSvfEAIjUuSIWQ=", "pom": "sha256-69aRc06Qr9Wj6PoqkTrw+Q6YL4a6IYWhcDIqGwiQpgU=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.22": { - "jar": "sha256-7P9nVGBlxg4JX7k7P4i5uS7R7cN+P+u8b57TVCL6QSs=", - "module": "sha256-H0SJxTBPmlEqVof/zAqvCTCvydcgUdOpBfrAcANi+3s=", - "pom": "sha256-ZAFewaGutVCqGCjCQuIoODDFD2g2TkCDH+FYj9wEEfU=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.22/gradle82": { - "jar": "sha256-7P9nVGBlxg4JX7k7P4i5uS7R7cN+P+u8b57TVCL6QSs=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/1.9.24": { + "jar": "sha256-syBxajMCclSau65oGoD14P5YBLo5TQ8kW1s3f6JWNVk=", + "pom": "sha256-fHb3hHzJ5bWOGoJbbqAZV7QoHpHmzXBcFmy+afvDtYs=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.23": { "jar": "sha256-WTzAhC1fwJe5XgpgK/+Mekifc3Q7hzywuO7JL86KQVs=", "module": "sha256-zmi7IanW8gt7DnKf4y+aVHu2SyXjEPD14vcMUJ1n7cQ=", "pom": "sha256-WMjnhsjGUvTpgqQlh5FZTL4L+JKiaGCVTKa1Ue7mN+8=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/1.9.22": { - "jar": "sha256-9dgu5hlmotmK364Z8k1hcwIsFUBIls3yNjQANe5owPU=", - "pom": "sha256-huMsqCkn2ogKHPNDpA7MIJgHXm/XInOzTVDfpUTzRjs=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.24": { + "jar": "sha256-LV53JHoKf1klIL64gx6OPrl0m/OIhfgv+9Y8f/BRPhI=", + "module": "sha256-kB+s0LsPLdJ9XzvJDkQvJ3OrEuHOcgnT78HlhWNsfWQ=", + "pom": "sha256-r9FlfZ0Vx2BxZ1InnZEdG73PjfTPXZYEUGHjCunBMX4=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.24/gradle82": { + "jar": "sha256-LV53JHoKf1klIL64gx6OPrl0m/OIhfgv+9Y8f/BRPhI=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/1.9.23": { "jar": "sha256-i7/a0U08PFCzK/a/4PHHAnvlQoXEba95gnz5O1y0PX8=", "pom": "sha256-x0cp9NYFkAEhZptBEO1FuvVeB1q1O2OmQrkLOv95NCI=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/1.9.22": { - "jar": "sha256-jRr4djLZUUjxIqn6CuKQPBnub6t9AeAX924NLJoCLCA=", - "module": "sha256-z+LCbjMPaAMsAD+lJMAx5aYPzo2Jn/8uQjFBKL60QCs=", - "pom": "sha256-3BSjKHVDun5QRs1OCVAtJ4hMqYfshwb1+xid54luOsw=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/1.9.24": { + "jar": "sha256-hR4BJ+5ixRDpf4UB6Q/V6yTQ15bHCcv5SvM5R0Fre/4=", + "pom": "sha256-3gafD+sze0Nbc/GdKaISONBW5oegumvivczlmvqSa7Y=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/1.9.23": { "jar": "sha256-jRr4djLZUUjxIqn6CuKQPBnub6t9AeAX924NLJoCLCA=", "module": "sha256-G+uiuitRE94FM+UV4X9W1TZOm1QiX/MftNj+yfcV2Cw=", "pom": "sha256-KemtQ1rc9Q/ljTiQ65lePyuNdQEZqaEsIfwwo2DNCOA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.9.22": { - "jar": "sha256-UQj61b4UmCXs46ABA8PCHPGv6VS7ZLhweJVyk511OMs=", - "module": "sha256-L/MBPfK6epteiwBOhIF1DI0PqVOtAHoZbYXSY2cdvq4=", - "pom": "sha256-gfUmlHml2X7oeSpITIMr495DgggSZxlhUAHKyI5C9qg=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/1.9.24": { + "jar": "sha256-jRr4djLZUUjxIqn6CuKQPBnub6t9AeAX924NLJoCLCA=", + "module": "sha256-4Jx9wdImjqtl5EGtLjgWDzGHsNjAv5zxrUyF+nUjm6Q=", + "pom": "sha256-aTnfzQ6JgI3AA25alaOPcb+EKF53bpEFIdVWJnp8sMc=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.9.23": { "jar": "sha256-Pljfrl5D/Ig2X1LfOjRCCMAQDJdacqlKLEoJ9mHTIxc=", "module": "sha256-Evmlol5YCDEXnl2jBJoBMRi9B2zeCkUuZo8qsWCaz70=", "pom": "sha256-sh8qITWUXCtLatLIi+Dnl1WH9HVgiTnn23sG2CfQNXg=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.22": { - "module": "sha256-pPRqwMq9jVzbaJ0tN9GdWFhPcIv59k/+TpgKL/dTS7U=", - "pom": "sha256-A3750tSupA9JKdglE1g+STwOBRVuDaix1/Ujurhobyc=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.22/gradle82": { - "jar": "sha256-1OcY3V8wxrqTLZPM/FswFendPkQUOgUrh3Ao8frlQtw=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.9.24": { + "jar": "sha256-VbEQENUcmcMXybbvXpVJrUhXEhjN5hvYRIGMti0aPxk=", + "module": "sha256-cQXlShB2dqp9KAzFqUl0QX4qO1cD1w3WH8yr6wccSug=", + "pom": "sha256-rquP4uqM+lwumZi1/nU4MaeYfCx4Q6U1MjYqB/pvABg=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.23": { "module": "sha256-YL2BUHBNWByO6tTBlAh26LAor+ixS0lAEMUJIEclRKc=", @@ -390,96 +383,103 @@ "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.23/gradle82": { "jar": "sha256-vMdKB8ad0RyUsmCx7ophiWlinMrqwubqCnedo8P37D8=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/1.9.22": { - "module": "sha256-Qj401h0iCxoN3BgUCGqM6rTa2ed5ArDOjLRyG789xu0=", - "pom": "sha256-da2/XHjOJHwiuvNijQs/8c9+19N9YB66cwTXerdb3Z8=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.24": { + "module": "sha256-txNZQoRrVH+xtZaGQXBGPC81+hW1qtkzX60P/YamE3s=", + "pom": "sha256-ilwTAHAhV//cHyV1hDZZbsVsM3Z8GqLouOskamWs9SM=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.24/gradle82": { + "jar": "sha256-6K7ZqBLmU2zu+z7VaPE0ZPoF8ka/0TaTONZDyDKUAks=" }, "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/1.9.23": { "module": "sha256-1yNF4lW/IKOperXQEIa2CMXX0M8/Z3inHoXKy61BQlo=", "pom": "sha256-2Ive7tm5RMrHGM3PKUD4FdgiXuzNIb7KB93QgfDSQow=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.9.22": { - "jar": "sha256-jC9lQpwYLi5KLgnLkQ5iuW227tKFWUuPga+CO35ZROI=", - "pom": "sha256-EMrJcNMAo0icM/CzBBVv8DLZWVm+WqrDuIAoKtWGIv4=" + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/1.9.24": { + "module": "sha256-BEh8cNHIzCkBwDdNgarX+k/Rp5NeJa200LH69WkKzNs=", + "pom": "sha256-wqVTvkQFNLjTMOV69hNjc1WLXgIPppzPsDsuWDx1nAA=" }, "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.9.23": { "jar": "sha256-XfEWTbHDRdhtChqkFJCeNnr7l4L+P7yvDir3qL9iuDk=", "pom": "sha256-sSWp19ccGThHr5KiJxxlUbPSl1VFSxyF03SySudVwz4=" }, - "org/jetbrains/kotlin#kotlin-native-utils/1.9.22": { - "jar": "sha256-eGwSfdVTXbLDmuWXzQsMrZ6RS4PiNvHbAlEjXMnGUqw=", - "pom": "sha256-EcUUwF7qOuno4Wq0l5bxEd9DxzSCMeNfr0xCjMT3Q+o=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.9.24": { + "jar": "sha256-U791bL22Uj3LTA16syrLZBR5bBz0nOQxvkC3DMV9tUk=", + "pom": "sha256-6pO4z4DdKXdKf7GEeclxH7uWPqhqwjq2FOepQAUsZ34=" }, "org/jetbrains/kotlin#kotlin-native-utils/1.9.23": { "jar": "sha256-X9AUhb1z5he+VWv/SZL/ASquufDZwAhPN8tdiKO8rYQ=", "pom": "sha256-eCaL6luL9QqV7nYxKuNjzAvWqt1d9HQwrBNaIG7467Y=" }, - "org/jetbrains/kotlin#kotlin-project-model/1.9.22": { - "jar": "sha256-zBHVwLGQnFsKCP0l7w51T/0r9Wyu9mX7eFEiI15UKhg=", - "pom": "sha256-659KFngb/ADM7IAw++XuIo5vKydxxQwmezIY/rAGW0A=" + "org/jetbrains/kotlin#kotlin-native-utils/1.9.24": { + "jar": "sha256-I1WvMJo7FgeymmF02Fe05umxs2EH1sHvu8PMSbpDRQw=", + "pom": "sha256-uvA25RxRge8Q8wVRXRnfawKWsLcIS0g9I4oImN630i0=" }, "org/jetbrains/kotlin#kotlin-project-model/1.9.23": { "jar": "sha256-j8s85RKrtFLX1DHbssMS1cRQXRdiSTtRsQavwUfZk2c=", "pom": "sha256-nvSy89nZ9Zqwwr9+uO92MgUUmTjg540qIxxHiSHHl0U=" }, + "org/jetbrains/kotlin#kotlin-project-model/1.9.24": { + "jar": "sha256-Nri/x5EqvuVIWSxcI5keVRQODS17OhqTTdPOj6Q0+N0=", + "pom": "sha256-sF4O4QAsGO3t626JrwfjvheFB9sT2hutbs52vmDz7es=" + }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" }, - "org/jetbrains/kotlin#kotlin-reflect/1.9.22": { - "jar": "sha256-d/MRyhOEgR1Rn9o4n8sSaL2qBY1gUEbg7edsA7DfPpc=", - "pom": "sha256-xxLjWN97kxi2j1RjlxsIhnODf8DKQoXRw4LIEC7da18=" + "org/jetbrains/kotlin#kotlin-reflect/1.9.24": { + "jar": "sha256-plFmRFu4XvgWzeEnJ5/gAX0rfMQ5s7lyOQ4bc21k6Uw=", + "pom": "sha256-CghcMAUb1tSrdlrVoMUXnEE7NfdBjyiDFy+9m6GrzMk=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/1.9.22": { - "jar": "sha256-jqUUoRQABsxXoHMVsVoTaI7W/qFwfzrJjpzoCVu2z38=", - "pom": "sha256-MM9L0JPCbn/Ryt/F1Qop5q60WXUSeia84rEJUfJPgqo=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/1.9.24": { + "jar": "sha256-mbinMB9ylR2d5sJW1cBSMowL/zndEm7/tQ/nhkq3CWM=", + "pom": "sha256-XBTVgzip+Vu/dZ2qibp0lC3PoawzFI68tPALrA9kHjg=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver/1.9.22": { - "module": "sha256-7rpm+YBjiXkSCkm5/aW4YeEHLWCQIzi1NyYH8kljDC0=", - "pom": "sha256-AD+clOG/rX8ZDm70F+kTOhCjH3hRMBPlkHS2DzZZLCY=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver/1.9.24": { + "module": "sha256-8qBhnZRfeYWlBM1xxwH9/Kwu97M8otTDxGyuJl5CTzQ=", + "pom": "sha256-fqbN1ffpu5RtdIKwn+vDBmLNmXDG0CbYhA3Nqwy+PY8=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver/1.9.22/gradle82": { - "jar": "sha256-cvvN3L25ZaQ9uWfLKjGaXXp3NttQrCA8lrmatVc5wkE=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver/1.9.24/gradle82": { + "jar": "sha256-RYZmqqT/D73L7l77+enlM2cf6/4UKaxsqNEypmuo8wo=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/1.9.22": { - "jar": "sha256-uAZwV59/ktRz2NWDTwsST3dVxFmP6UskQYOwKDSDRXQ=", - "pom": "sha256-/ra0ns9pEG1MEoXnH5ob2noSfO9oMC4+n9yCmKTjR5U=" - }, - "org/jetbrains/kotlin#kotlin-scripting-common/1.9.22": { - "jar": "sha256-+lAMvwNJQ++BJvPT3GWvCf+Z3//kTFCZtPwu1b8vXcc=", - "pom": "sha256-ROURI7DCfm/ZM/wma00Nrw8GhKYq7Z/mhC6Noz8qKz8=" + "org/jetbrains/kotlin#kotlin-script-runtime/1.9.24": { + "jar": "sha256-MUx9MI/nUGVDZbrGFEeAYTyRac89nh2vurkc+AvcNXw=", + "pom": "sha256-mGDF58qg5AlxmVCQEtoD01GX/teewKkKUOKPjeh1QE0=" }, "org/jetbrains/kotlin#kotlin-scripting-common/1.9.23": { "jar": "sha256-ii5Wfz2/Nz5hwBrNeIRjHshThGWrjul4rGMpb4zJr0Y=", "pom": "sha256-/CiXW5TcQMDZD9EXXiKxtka60sY368+fT2qy1Oe8XdU=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.22": { - "jar": "sha256-Ij/shIMCNEmc1MeiPqHJLroSfEGzXZux1LYdJBVa6zU=", - "pom": "sha256-wWCPP7yyqfdSPq0zWZwurc5MgSFhqeBmufSwBa97Qxw=" + "org/jetbrains/kotlin#kotlin-scripting-common/1.9.24": { + "jar": "sha256-KqeY6XgokBDYByTdGdn+GQtSQkFIEQT89RjAO8OdTks=", + "pom": "sha256-S9rpUqslCWFRsfqERCooGupzwW0dTNVdigLDccqJusQ=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.23": { "jar": "sha256-e4A5/wt3nVVs7QCSMDWr0TNPDl8qiHlhgtArpF+SbSA=", "pom": "sha256-7Y6//r5Ume1iSG+oGBJ7td1QHXTEq5XFfnwB7z+NuWg=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.22": { - "jar": "sha256-OJkYFqKH/3YkHxp35/ERZIHU6To9tjJZplfd4g5tD2U=", - "pom": "sha256-gmccM6lXsuKoINZqaSwvzmPjvwR/HLJeb7A5HF3c8uc=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.24": { + "jar": "sha256-02gR+1yZeXaEH/PQqxnGt96RkomeQIK6Hz/7oH6UBfQ=", + "pom": "sha256-FUgOkd8v/sfFfOHgpfFBBltFIrbbyJsv2yk9xsVwwMU=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.23": { "jar": "sha256-kOU90S9i3NgjQ8EsDLMUrc/wy8OYjtsRjR5miZYOnWM=", "pom": "sha256-923kmO12xGroZlZnmAf3J2EiPD+hChExgyAGpKs5Xe0=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.22": { - "jar": "sha256-jRJ9dvz6BRfDbB6g4ijs4D1aRoJkKgH2R5prvccxKik=", - "pom": "sha256-cBJS6huo/4f8M0dqYePVxtnS3aQbqpiZTdaYDuE/vG0=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.24": { + "jar": "sha256-i/2A2RNqKjJhALC3O/saG7NX7d+uDYEiDkYSa4im7no=", + "pom": "sha256-Sg6yUXF8Sih6ZBfp/QRBZ4xJatxnAdhasPFi8W0s+4c=" }, "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.23": { "jar": "sha256-0/yn7JUf94Jvl6dZifjcr/YM+eHna73CIO33eDdqbmQ=", "pom": "sha256-4u8r+y628hp7croS7cWaFQx/IXbCssVP4uhg7oAjDYc=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.22": { - "module": "sha256-+Tyemr+NUtjo/Y6FGqgC7OxVEyFhxK7ufTzZJL95QkY=", - "pom": "sha256-10k21oh1ZK63EOhCmLVCB/U+m88jpSrSv6IsIIZ3V2c=" + "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.24": { + "jar": "sha256-G9aQBgqUhDl3N0pFds2J10nk7srx+3pYA2/rOuVRxKw=", + "pom": "sha256-kkM+M+MLpFvMS/hKxUsX0p8Dlkp2BwYW1sZS3WxhySU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.24": { + "module": "sha256-6Y6oxE+zaCDQG7iwAxaOI6IhtAHLQyVtcjo/C3fWFsI=", + "pom": "sha256-XZfiDNWGLoR6aYF1uTno3Fxr11vtmZ1vPU6ghIESFsA=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" @@ -495,35 +495,35 @@ "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" }, - "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": { - "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=", - "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=", - "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM=" - }, - "org/jetbrains/kotlin#kotlin-tooling-core/1.9.22": { - "jar": "sha256-iTjrl+NjINqj5vsqYP0qBbIy/0pVcXPFAZ8EW4gy2fQ=", - "pom": "sha256-FPx/NcY15fzRvqU3q0+kQxLoQyUtUzNRnjaxJeoImyE=" + "org/jetbrains/kotlin#kotlin-stdlib/1.9.24": { + "jar": "sha256-hYuQJpbanPWFq52Y/8HCcSJpgoNU3+kQfjcRsISjZGg=", + "module": "sha256-8uKmVztbUmXEEtXFgfv46gDGKxC5yS1WdMnpfy8zNbM=", + "pom": "sha256-uc6tTCIt7pDHT28BPTFqnlD4EaApMxPDNRrssvfM7V8=" }, "org/jetbrains/kotlin#kotlin-tooling-core/1.9.23": { "jar": "sha256-iTjrl+NjINqj5vsqYP0qBbIy/0pVcXPFAZ8EW4gy2fQ=", "pom": "sha256-fiA0VIj7v1uf6ZeHNgvT7HRKb+qRppm9EbVhwygbB9g=" }, - "org/jetbrains/kotlin#kotlin-util-io/1.9.22": { - "jar": "sha256-9telhJGjeLCDrRvq1IikheEdFgsx52wYwa1SDx0o9Gs=", - "pom": "sha256-ZP1qINbsBAE7ttdWJ/ZYC7c2QdlIkJ1cFmTi53MQbe4=" + "org/jetbrains/kotlin#kotlin-tooling-core/1.9.24": { + "jar": "sha256-iTjrl+NjINqj5vsqYP0qBbIy/0pVcXPFAZ8EW4gy2fQ=", + "pom": "sha256-dbytE+kWgPzwEsjuGqGqxxn1m2IbOUyj/DLGJf+YclY=" }, "org/jetbrains/kotlin#kotlin-util-io/1.9.23": { "jar": "sha256-em3OQOeKy+Zvx9Z463Qch3hFo8/Rx2xNK7+OyEXS2Sk=", "pom": "sha256-rNHyN4Ce4nWpwJ5EAt1FOdBN7DaMCQbsecP4A6vwZ8g=" }, - "org/jetbrains/kotlin#kotlin-util-klib/1.9.22": { - "jar": "sha256-pnnuL1EPOrkmkYGN5etbCQLobYjJdnTn20TcTyJSxfk=", - "pom": "sha256-Dep9//Cit0CIrJlwQ8vCQINdK/9Zs5/MiwysbqPrNpc=" + "org/jetbrains/kotlin#kotlin-util-io/1.9.24": { + "jar": "sha256-u0z0H/UG5Q+bLDQiBkmIFupO3f6ImYqQtotDlLT6xfo=", + "pom": "sha256-82VnN3kyTzMtOTkMeAd1h4BNEeznKv5K7uMlOtZTPFE=" }, "org/jetbrains/kotlin#kotlin-util-klib/1.9.23": { "jar": "sha256-5AGLa4+8keTQo3q4HAUKgTloaAdRCM2FCCuSXHnTvG0=", "pom": "sha256-+z5FhH1dIS5MK120RFGQPJ4fDjL2mH4fWbnMEcTDiYo=" }, + "org/jetbrains/kotlin#kotlin-util-klib/1.9.24": { + "jar": "sha256-4NqKfwZIV8BIOmVyfRYtPtV84m1+R3ix8ADg0MDck3E=", + "pom": "sha256-krQjr9XnKbsRT3G1ip4DhF3+K9pWJFTrvbg8nYOyMHE=" + }, "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": { "jar": "sha256-eNbMcTX4TWkv83Uvz9H6G74JQNffcGUuTx6u7Ax4r7s=", "module": "sha256-yIXdAoEHbFhDgm3jF+PLzcPYhZ2+71OuHPrNG5xg+W4=", @@ -1182,8 +1182,8 @@ "org/eclipse/jdt/ecj/maven-metadata": { "xml": { "groupId": "org.eclipse.jdt", - "lastUpdated": "20240611021539", - "release": "3.38.0" + "lastUpdated": "20240910031942", + "release": "3.39.0" } }, "org/eclipse/sisu#org.eclipse.sisu.inject/0.3.5": { diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 2dc57e8c0713f..988864cbf7dc2 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd jwt \ diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index ae16b3f00c9ad..04c6923af041f 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -23,18 +23,18 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-LcnvCWGVdBxhDgQDoGHXRppGeEpfjOv/F0dZMN2bOF8="; nativeBuildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isLinux [ python3 ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration AppKit ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration AppKit ]; preCheck = '' export HOME=$TMPDIR ''; checkFlags = [ "--skip=kbs2::config::tests::test_find_config_dir" ] - ++ lib.optionals stdenv.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ]; postInstall = '' mkdir -p $out/share/kbs2 diff --git a/pkgs/tools/security/keepwn/default.nix b/pkgs/tools/security/keepwn/default.nix index 9c878f37fd0c8..8306cbe441ea8 100644 --- a/pkgs/tools/security/keepwn/default.nix +++ b/pkgs/tools/security/keepwn/default.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { termcolor ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mv $out/bin/KeePwn $out/bin/$pname ''; diff --git a/pkgs/tools/security/kepler/default.nix b/pkgs/tools/security/kepler/default.nix index e4d2fc914cf94..35e601dac163c 100644 --- a/pkgs/tools/security/kepler/default.nix +++ b/pkgs/tools/security/kepler/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { openssl postgresql zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 0b575daa629b6..103066261a194 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "keybase"; - version = "6.3.1"; + version = "6.4.0"; modRoot = "go"; subPackages = [ "kbnm" "keybase" ]; @@ -16,7 +16,7 @@ buildGoModule rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - hash = "sha256-kmKqVtHS0DaVa0of+QEUc2aEhWP1dNmzb/L01zaIoe8="; + hash = "sha256-hRqxA2gPL1UKbz9DwgfZfjE6e5pB7zenZqK+k1i8F2g="; }; vendorHash = "sha256-KHahkGzkXr6xp0XY9MyEeeiHnmphaNYi9dPBQ476+us="; @@ -28,7 +28,7 @@ buildGoModule rec { }) ]; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; tags = [ "production" ]; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/security/keyscope/default.nix b/pkgs/tools/security/keyscope/default.nix index ae5bd80e2964f..b2bd09d1f44a5 100644 --- a/pkgs/tools/security/keyscope/default.nix +++ b/pkgs/tools/security/keyscope/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration Foundation IOKit diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 5a3b0a75862f4..f7e636f8facc2 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeWrapper $out/share/kpcli.pl $out/bin/kpcli --set PERL5LIB \ "${with perlPackages; makePerlPath ([ CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser - ] ++ lib.optional stdenv.isDarwin MacPasteboard)}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin MacPasteboard)}" ''; diff --git a/pkgs/tools/security/kubeclarity/default.nix b/pkgs/tools/security/kubeclarity/default.nix index 585b4d35cd692..25a6582695e78 100644 --- a/pkgs/tools/security/kubeclarity/default.nix +++ b/pkgs/tools/security/kubeclarity/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs lvm2 ]; diff --git a/pkgs/tools/security/kubernetes-polaris/default.nix b/pkgs/tools/security/kubernetes-polaris/default.nix index 737c901e570b4..ecda1966fcad4 100644 --- a/pkgs/tools/security/kubernetes-polaris/default.nix +++ b/pkgs/tools/security/kubernetes-polaris/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, packr, ... }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kubernetes-polaris"; - version = "8.5.5"; + version = "9.4.1"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-DKfCXtFrZgmR0jiXwCD1iuwx/8aNEjwZ/fCQNeRhSu4="; + sha256 = "sha256-CVc/ZMF/3HBDPjny81Pj26eSnBuTRjXgkso34kZSex4="; }; - vendorHash = "sha256-ZWetW+Xar4BXXlR0iG+O/NRqYk41x+PPVCGis2W2Nkk="; + vendorHash = "sha256-X0GPKR6l1v5312hOmelrcqp4KT3LwsGkvKoqUfEM0uU="; nativeBuildInputs = [ installShellFiles ]; @@ -22,10 +22,6 @@ buildGoModule rec { "-X main.Commit=${version}" ]; - preBuild = '' - ${packr}/bin/packr2 -v --ignore-imports - ''; - postInstall = '' installShellCompletion --cmd polaris \ --bash <($out/bin/polaris completion bash) \ diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 2b58b365a28d7..25f004d990748 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.16"; + version = "3.0.17"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; rev = "refs/tags/v${version}"; - hash = "sha256-bCL9M4bqdmK7CHF/GDAaVuIaAekkiLAMy1xxwq/nGUE="; + hash = "sha256-xErgJPtf89Zmjn2lyRSuVmHT692xzupxWuBsu547+E0="; fetchSubmodules = true; }; diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 0a85f14862703..c9061348d4ba8 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -1,38 +1,35 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.59"; + version = "1.0.69"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-vAuhzrBPbJCaQMuivpLzVTAR5F1ththTq9hij8ZI4aM="; + hash = "sha256-nXDeAi+nf6JTYjSyOUV65ZuqcGlODHvfnwnQl9H7NFE="; }; pythonRelaxDeps = [ "cryptography" ]; - build-system = with python3.pkgs; [ - pdm-backend - ]; + build-system = with python3.pkgs; [ pdm-backend ]; - nativeBuildInputs = with python3.pkgs; [ - cython - ]; + nativeBuildInputs = with python3.pkgs; [ cython ]; dependencies = with python3.pkgs; [ commandparse cryptography dnspython gssapi - ldap3 + ldap3-bleeding-edge oscrypto pycryptodome pycryptodomex @@ -44,9 +41,7 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "ldeep" - ]; + pythonImportsCheck = [ "ldeep" ]; meta = with lib; { description = "In-depth LDAP enumeration utility"; diff --git a/pkgs/tools/security/lethe/default.nix b/pkgs/tools/security/lethe/default.nix index ff9b297d5361d..21875006f4fcb 100644 --- a/pkgs/tools/security/lethe/default.nix +++ b/pkgs/tools/security/lethe/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-SFNNpbHZdDJvH95f+VWyVKnQp3OJwQmCOqHtLAhhkOk="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Tool to wipe drives in a secure way"; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 5211f42b96efd..45db3985d555d 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcsclite libusb-compat-0_1 ] - ++ lib.optional stdenv.isDarwin IOKit; + ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; preBuild = '' makeFlagsArray=(usbdropdir="$out/pcsc/drivers"); diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index 06fc4e5c6d924..83dc2bff29daa 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libmodsecurity"; - version = "3.0.12"; + version = "3.0.13"; src = fetchFromGitHub { owner = "owasp-modsecurity"; repo = "ModSecurity"; rev = "v${version}"; - hash = "sha256-WIFAg9LvKAC8e3gpcIxtNHT53AIfPtUTyrv30woxP4M="; + hash = "sha256-+z31t007NLCAFG/Lsj5j/AbBDPkI2wjbH5yM5vipH04="; fetchSubmodules = true; }; diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/tools/security/maigret/default.nix index cdbf6df4dd0f4..0936e0d980624 100644 --- a/pkgs/tools/security/maigret/default.nix +++ b/pkgs/tools/security/maigret/default.nix @@ -92,7 +92,7 @@ python3.pkgs.buildPythonApplication rec { "test_pdf_report" "test_self_check_db_negative_enabled" "test_self_check_db_positive_enable" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # AsyncioProgressbarExecutor is slower on darwin than it should be, # Upstream issue: https://github.com/soxoj/maigret/issues/679 "test_asyncio_progressbar_executor" diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index a6aa990c1d82c..9606fe0f1156e 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix broken install command substituteInPlace Makefile --replace "-pm755" "-pDm755" ''; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 5cb6092615da5..ec04be5973f83 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.24" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.27" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 6eddefe9becd1..e5e0268827a30 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 1d1fe1ccc7a339d4800cf20b8301d1ff1f56cd9b - ref: refs/tags/6.4.24 + revision: 86efc784b8598197cfb817ad4e4d0eb75fd59063 + ref: refs/tags/6.4.27 specs: - metasploit-framework (6.4.24) + metasploit-framework (6.4.28) aarch64 abbrev actionpack (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index a8a01e639cc1d..9d54eaa45a91e 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.24"; + version = "6.4.27"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-320yeezX3GV8sNi84JbU8qeKcj+uuiaqXQkYYh1jmh0="; + hash = "sha256-zett+ZUIqjzm4STt3f9oqyz32ViKTwbiZf8Ey72Bztg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 26b9050c60cb2..1aa06c8e20326 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -724,12 +724,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "1d1fe1ccc7a339d4800cf20b8301d1ff1f56cd9b"; - sha256 = "07csccfn4609bnm2dfmf7xr8m9zjsjbf1g6qn1y6bp6pxiwk4vfz"; + rev = "86efc784b8598197cfb817ad4e4d0eb75fd59063"; + sha256 = "1n6fh6ywn17zcpi0ckwab3czfb5bd3zxvv94w7k3rah8jpwnvsyd"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.24"; + version = "6.4.28"; }; metasploit-model = { groups = ["default"]; diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix index 53b0e38a0dca4..318284a4318fd 100644 --- a/pkgs/tools/security/mkp224o/default.nix +++ b/pkgs/tools/security/mkp224o/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { { suffix = "donna"; configureFlags = ["--enable-donna"]; } ] ++ lib.optionals stdenv.hostPlatform.isx86 [ { suffix = "donna-sse2"; configureFlags = ["--enable-donna-sse2"]; } - ] ++ lib.optionals (!stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ { suffix = "amd64-51-30k"; configureFlags = ["--enable-amd64-51-30k"]; } { suffix = "amd64-64-24k"; configureFlags = ["--enable-amd64-64-24k"]; } ]; diff --git a/pkgs/tools/security/monsoon/default.nix b/pkgs/tools/security/monsoon/default.nix index e17081487db27..78bf95ac6c8bb 100644 --- a/pkgs/tools/security/monsoon/default.nix +++ b/pkgs/tools/security/monsoon/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorHash = "sha256-gdoOBW5MD94RiKINVtTDvBQRZaJ9tlgu0eh7MxuMezg="; # Tests fails on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Fast HTTP enumerator"; diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix index 4ee765bdbdd1b..5900c72bcff32 100644 --- a/pkgs/tools/security/mpw/default.nix +++ b/pkgs/tools/security/mpw/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { # Some tests are expected to fail on ARM64 # See: https://gitlab.com/spectre.app/cli/-/issues/27#note_962950844 (mpw is a predecessor to spectre-cli and this issue is relevant to mpw as well) - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); checkPhase = '' runHook preCheck diff --git a/pkgs/tools/security/nbtscanner/default.nix b/pkgs/tools/security/nbtscanner/default.nix index b70f554f33fda..ec6d9a1d661bb 100644 --- a/pkgs/tools/security/nbtscanner/default.nix +++ b/pkgs/tools/security/nbtscanner/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ./Cargo.lock.patch ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "NetBIOS scanner written in Rust"; diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/tools/security/netexec/default.nix index 33447f98516e5..06163309b11b1 100644 --- a/pkgs/tools/security/netexec/default.nix +++ b/pkgs/tools/security/netexec/default.nix @@ -101,6 +101,6 @@ python.pkgs.buildPythonApplication rec { # FIXME: failing fixupPhase: # $ Rewriting #!/nix/store/<hash>-python3-3.11.7/bin/python3.11 to #!/nix/store/<hash>-python3-3.11.7 # $ /nix/store/<hash>-wrap-python-hook/nix-support/setup-hook: line 65: 47758 Killed: 9 sed -i "$f" -e "1 s^#!/nix/store/<hash>-python3-3.11.7^#!/nix/store/<hash>-python3-3.11.7^" - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix index c675bcc9824fc..28d9c74e5dc28 100644 --- a/pkgs/tools/security/nitrokey-app2/default.nix +++ b/pkgs/tools/security/nitrokey-app2/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { wrapQtAppsHook ]; - buildInputs = [ qtbase ] ++ lib.optionals stdenv.isLinux [ + buildInputs = [ qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; diff --git a/pkgs/tools/security/notation/default.nix b/pkgs/tools/security/notation/default.nix deleted file mode 100644 index 3afd7bd27f2ff..0000000000000 --- a/pkgs/tools/security/notation/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, notation }: - -buildGoModule rec { - pname = "notation"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "notaryproject"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Pi4Ddlx8G4dRDz79yTiPBf6gf0wsvoE9CuyeVGrHst0="; - }; - - vendorHash = "sha256-REJPSBLXzIPAmxwzckufTqJvZCWUUkJLBmHTx2nv9QM="; - - nativeBuildInputs = [ - installShellFiles - ]; - - # This is a Go sub-module and cannot be built directly (e2e tests). - excludedPackages = [ "./test" ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/notaryproject/notation/internal/version.Version=${version}" - "-X github.com/notaryproject/notation/internal/version.BuildMetadata=" - ]; - - postInstall = '' - installShellCompletion --cmd notation \ - --bash <($out/bin/notation completion bash) \ - --fish <($out/bin/notation completion fish) \ - --zsh <($out/bin/notation completion zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = notation; - command = "notation version"; - }; - - meta = with lib; { - description = "CLI tool to sign and verify OCI artifacts and container images"; - homepage = "https://notaryproject.dev/"; - license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; - mainProgram = "notation"; - }; -} diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index d0bd1280349c3..083d605e58646 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -6,16 +6,17 @@ buildGoModule rec { pname = "nuclei"; - version = "3.3.1"; + version = "3.3.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-pUctan5p3jxrj2/98nzibZQAL2EK8R5jnD/hjVgxSzQ="; + hash = "sha256-wY7OninwYrFuP681Xffsv25XnOw8xWp3QAvrpTibnvk="; }; - vendorHash = "sha256-sJkkgh7F5Hgj9K6m7OTQbamkcS3uS78jK9HdLYeypIU="; + vendorHash = "sha256-V/L6trRaCfV1qLKw1MsRWIh+RwAcoafvSW8zgA41maQ="; + proxyVendor = true; # hash mismatch between Linux and Darwin subPackages = [ "cmd/nuclei/" ]; diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 1e5b418c3f460..aa42558604696 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -3,7 +3,7 @@ let # TODO: Switch to OpenPAM once https://gitlab.com/oath-toolkit/oath-toolkit/-/issues/26 is addressed upstream securityDependency = - if stdenv.isDarwin then xmlsec + if stdenv.hostPlatform.isDarwin then xmlsec else pam; in stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ securityDependency ]; - configureFlags = lib.optionals stdenv.isDarwin [ "--disable-pam" ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-pam" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 048631e2b774d..e5979a0f7084e 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , gobject-introspection , intltool , python3 @@ -10,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "onioncircuits"; - version = "0.7"; + version = "0.8.1"; src = fetchFromGitLab { domain = "gitlab.tails.boum.org"; owner = "tails"; repo = "onioncircuits"; rev = version; - sha256 = "sha256-O4tSbKBTmve4u8bXVg128RLyuxvTbU224JV8tQ+aDAQ="; + sha256 = "sha256-5VGOuvngZvUFQ+bubdt4YV3/IflOhBB1i+oEQaV4kr0="; }; nativeBuildInputs = [ @@ -32,15 +31,6 @@ python3.pkgs.buildPythonApplication rec { stem ]; - patches = [ - # Fix https://gitlab.tails.boum.org/tails/onioncircuits/-/merge_requests/4 - (fetchpatch { - name = "fix-setuptool-package-discovery.patch"; - url = "https://gitlab.tails.boum.org/tails/onioncircuits/-/commit/4c620c77f36f540fa27041fcbdeaf05c9f57826c.patch"; - sha256 = "sha256-WXqyDa2meRMMHkHLO5Xl7x43KUGtlsai+eOVzUGUPpo="; - }) - ]; - postInstall = '' mkdir -p $out/etc/apparmor.d @@ -48,7 +38,6 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://tails.boum.org"; description = "GTK application to display Tor circuits and streams"; mainProgram = "onioncircuits"; diff --git a/pkgs/tools/security/onlykey/onlykey.nix b/pkgs/tools/security/onlykey/onlykey.nix index b154efb747120..b10d8718b7be0 100644 --- a/pkgs/tools/security/onlykey/onlykey.nix +++ b/pkgs/tools/security/onlykey/onlykey.nix @@ -8,7 +8,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index b767261b4e0a8..412053af2b4b3 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -2,7 +2,7 @@ , libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 , Carbon, PCSC, buildPackages -, withApplePCSC ? stdenv.isDarwin +, withApplePCSC ? stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { zlib readline openssl libassuan libXt libxslt libiconv docbook_xml_dtd_412 ] - ++ lib.optional stdenv.isDarwin Carbon + ++ lib.optional stdenv.hostPlatform.isDarwin Carbon ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); env.NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index dc21cdf6501b5..35835d0dcc59b 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-RaTDhA9aowSCUFgH2JwkrV1TjYQW3P8o1Xd3e977AkM="; + hash = "sha256-hK8hvD59X+JzeBtYqwlfNBy2XX7slzMKoIHxL8DmRGc="; }; - vendorHash = "sha256-mSBgnG7WJqrB/CAYi9wGtB7PL4/whsCv7WA3Im2/PZg="; + vendorHash = "sha256-IVtdZCwjGrGr0DuyPCkt5DJQhD8mN7bEFI41e0a3s8s="; subPackages = [ "cmd/osv-scanner" diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 748ec2ccf3bf7..fb8ef894bb181 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -3,7 +3,7 @@ , which, openssh, procps, qrencode, makeWrapper, pass , xclip ? null, xdotool ? null, dmenu ? null -, x11Support ? !stdenv.isDarwin , dmenuSupport ? (x11Support || waylandSupport) +, x11Support ? !stdenv.hostPlatform.isDarwin , dmenuSupport ? (x11Support || waylandSupport) , waylandSupport ? false, wl-clipboard ? null , ydotool ? null, dmenu-wayland ? null @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { patches = [ ./set-correct-program-name-for-sleep.patch ./extension-dir.patch - ] ++ lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; + ] ++ lib.optional stdenv.hostPlatform.isDarwin ./no-darwin-getopt.patch; nativeBuildInputs = [ makeWrapper ]; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { openssh procps qrencode - ] ++ lib.optional stdenv.isDarwin openssl + ] ++ lib.optional stdenv.hostPlatform.isDarwin openssl ++ lib.optional x11Support xclip ++ lib.optional waylandSupport wl-clipboard ++ lib.optionals (waylandSupport && dmenuSupport) [ ydotool dmenu-wayland ] @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \ -e '/which gpg/ d' \ tests/setup.sh - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # 'pass edit' uses hdid, which is not available from the sandbox. rm -f tests/t0200-edit-tests.sh rm -f tests/t0010-generate-tests.sh diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix index d3f196a20563c..4aa96fe409098 100644 --- a/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/pkgs/tools/security/pass/extensions/audit/default.nix @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { ]; # Tests freeze on darwin with: pass-audit-1.1 (checkPhase): EOFError - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ python3.pkgs.green pass diff --git a/pkgs/tools/security/passage/default.nix b/pkgs/tools/security/passage/default.nix index 1d6bdfa225aab..5cd5b481c4132 100644 --- a/pkgs/tools/security/passage/default.nix +++ b/pkgs/tools/security/passage/default.nix @@ -18,15 +18,15 @@ , tree ? null }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "passage"; - version = "unstable-2022-05-01"; + version = "1.7.4a2"; src = fetchFromGitHub { owner = "FiloSottile"; repo = "passage"; - rev = "1262d308f09db9b243513a428ab4b8fb1c30d31d"; - sha256 = "1val8wl9kzlxj4i1rrh2iiyf97w9akffvr0idvbkdb09hfzz4lz8"; + rev = "${finalAttrs.version}"; + hash = "sha256-tGHJFzDc2K117r5EMFdKsfw/+EpdZ0qzaExt+RGI4qo="; }; patches = [ @@ -77,4 +77,4 @@ stdenv.mkDerivation { passwords. ''; }; -} +}) diff --git a/pkgs/tools/security/pcsc-tools/default.nix b/pkgs/tools/security/pcsc-tools/default.nix index c696fad309a3e..39efa566553db 100644 --- a/pkgs/tools/security/pcsc-tools/default.nix +++ b/pkgs/tools/security/pcsc-tools/default.nix @@ -8,7 +8,7 @@ , pkg-config , wrapGAppsHook3 , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd -, dbusSupport ? stdenv.isLinux, dbus +, dbusSupport ? stdenv.hostPlatform.isLinux, dbus , pcsclite , PCSC , wget @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { dbus ] ++ [ perlPackages.perl pcsclite - ] ++ lib.optional stdenv.isDarwin PCSC + ] ++ lib.optional stdenv.hostPlatform.isDarwin PCSC ++ lib.optional systemdSupport systemd; nativeBuildInputs = [ diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index eedec6b239fd3..955611a465c12 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -12,7 +12,7 @@ , polkit , systemdLibs , udev -, dbusSupport ? stdenv.isLinux +, dbusSupport ? stdenv.hostPlatform.isLinux , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs , udevSupport ? dbusSupport , libusb1 @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ python3 ] ++ lib.optionals systemdSupport [ systemdLibs ] ++ lib.optionals (!systemdSupport && udevSupport) [ udev ] - ++ lib.optionals stdenv.isDarwin [ Foundation IOKit ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation IOKit ] ++ lib.optionals dbusSupport [ dbus ] ++ lib.optionals polkitSupport [ polkit ] ++ lib.optionals (!udevSupport) [ libusb1 ]; diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index aa9687ba3a412..4fedf054a3873 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -36,6 +36,6 @@ python3Packages.buildPythonApplication { license = lib.licenses.gpl2Only; platforms = lib.platforms.gnu ++ lib.platforms.linux; - maintainers = with lib.maintainers; [ kierdavis ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index 94d9d76b92889..265f8e2cc753c 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -26,13 +26,13 @@ assert withBlueshark -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation (finalAttrs: { pname = "proxmark3"; - version = "4.18589"; + version = "4.18994"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${finalAttrs.version}"; - hash = "sha256-e/FoyaHU/uH2yovEqtkrCXwHMlF94Acxl2lUA422Pig="; + hash = "sha256-LeVQnidlCGFwtgJZdGlIFEYgf3M3BtfxoBKsxSFEo2w="; }; patches = [ diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index bd53ff0184145..a42cca82b67c0 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "24.8.1"; + version = "24.9.1"; pyproject = true; src = fetchFromGitHub { owner = "quark-engine"; repo = "quark-engine"; rev = "refs/tags/v${version}"; - hash = "sha256-oeVjUbw6RKSZLFBuPy1goraiqtwjeuq1hy81ibpcuus="; + hash = "sha256-DmiqsYEdCh9hG5aa41UymW8IDkba4fuCrtM10A0X2Gg="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/tools/security/quill/default.nix b/pkgs/tools/security/quill/default.nix index 71ffc7af5c15f..3aa2e6525b624 100644 --- a/pkgs/tools/security/quill/default.nix +++ b/pkgs/tools/security/quill/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ]; meta = with lib; { homepage = "https://github.com/dfinity/quill"; diff --git a/pkgs/tools/security/rblake2sum/default.nix b/pkgs/tools/security/rblake2sum/default.nix index 9052ffb68a96d..92b4f574749a3 100644 --- a/pkgs/tools/security/rblake2sum/default.nix +++ b/pkgs/tools/security/rblake2sum/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-egwL3z7uB4AcRwPT0uPrenyh4FSxhbZKMdkPhRztMbs="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Recursive blake2 digest (hash) of a file-system path"; diff --git a/pkgs/tools/security/rblake3sum/default.nix b/pkgs/tools/security/rblake3sum/default.nix index 62f290cdf3208..af04b2014403d 100644 --- a/pkgs/tools/security/rblake3sum/default.nix +++ b/pkgs/tools/security/rblake3sum/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-SE/Zg/UEV/vhB/VDcn8Y70OUIoxbJBh6H2QgFMkWPc4="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Recursive blake3 digest (hash) of a file-system path"; diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index c04ed415fb9e8..597b4c0adad19 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -36,15 +36,15 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles - ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = [ bash ] # for git-credential-rbw - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security darwin.apple_sdk_11_0.frameworks.AppKit ]; - preConfigure = lib.optionalString stdenv.isLinux '' + preConfigure = lib.optionalString stdenv.hostPlatform.isLinux '' export OPENSSL_INCLUDE_DIR="${openssl.dev}/include" export OPENSSL_LIB_DIR="${lib.getLib openssl}/lib" ''; diff --git a/pkgs/tools/security/ripasso/Cargo.lock b/pkgs/tools/security/ripasso/Cargo.lock deleted file mode 100644 index 659e66c0f9d01..0000000000000 --- a/pkgs/tools/security/ripasso/Cargo.lock +++ /dev/null @@ -1,3989 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom 0.2.8", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - -[[package]] -name = "atk" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" -dependencies = [ - "atk-sys", - "bitflags", - "glib", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base32" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" - -[[package]] -name = "bindgen" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static 1.4.0", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn", -] - -[[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 = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -dependencies = [ - "generic-array", -] - -[[package]] -name = "buffered-reader" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0dd286184b392a1ce6b3deecd073f0330df194bf935b87f852147d50d0d2d18" -dependencies = [ - "bzip2", - "flate2", - "lazy_static 1.4.0", - "libc", -] - -[[package]] -name = "build-rs" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00b8763668c99f8d9101b8a0dd82106f58265464531a79b2cef0d9a30c17dd2" - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "bytecount" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "cairo-rs" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" -dependencies = [ - "bitflags", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "capnp" -version = "0.13.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458fe65c8ae2c09ebe6658d3b98a1dd672efda0d7ad73ebd69c4a351abd96ef6" - -[[package]] -name = "capnp-futures" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc7bd6f6a6240f4f0a39b89c731916b15eefa26d31f90dffc1d232b7981d09a3" -dependencies = [ - "capnp", - "futures", -] - -[[package]] -name = "capnp-rpc" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37998522d42bbe4a1d266f418b1a053b679a338e904e55afd5ff22333df0e09e" -dependencies = [ - "capnp", - "capnp-futures", - "futures", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom 7.1.3", -] - -[[package]] -name = "cfg-expr" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time 0.1.45", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "clang-sys" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "bitflags", - "textwrap", - "unicode-width", -] - -[[package]] -name = "cli-clipboard" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04087c1d4a2aa259784a563932aee09cbb0869d490775e051096174b070f3e3d" -dependencies = [ - "clipboard-win 4.5.0", - "objc", - "objc-foundation", - "objc_id", - "wl-clipboard-rs", - "x11-clipboard 0.7.0", -] - -[[package]] -name = "clipboard" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a904646c0340239dcf7c51677b33928bf24fdf424b79a57909c0109075b2e7" -dependencies = [ - "clipboard-win 2.2.0", - "objc", - "objc-foundation", - "objc_id", - "x11-clipboard 0.3.3", -] - -[[package]] -name = "clipboard-win" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b" -dependencies = [ - "winapi", -] - -[[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 = "cmake" -version = "0.1.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" -dependencies = [ - "cc", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "config" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" -dependencies = [ - "lazy_static 1.4.0", - "nom 5.1.2", - "serde", - "toml", -] - -[[package]] -name = "constant_time_eq" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" - -[[package]] -name = "conv" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" -dependencies = [ - "custom_derive", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" -dependencies = [ - "atty", - "cast", - "clap", - "criterion-plot", - "csv", - "itertools", - "lazy_static 1.4.0", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_cbor", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset 0.8.0", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossterm" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" -dependencies = [ - "bitflags", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" -dependencies = [ - "winapi", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "cstr-argument" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bd9c8e659a473bce955ae5c35b116af38af11a7acb0b480e01f3ed348aeb40" -dependencies = [ - "cfg-if", - "memchr", -] - -[[package]] -name = "csv" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af91f40b7355f82b0a891f50e70399475945bb0b0da4f1700ce60761c9d3e359" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "cursive" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839" -dependencies = [ - "ahash", - "cfg-if", - "crossbeam-channel", - "crossterm", - "cursive_core", - "lazy_static 1.4.0", - "libc", - "log", - "signal-hook", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "cursive_core" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d" -dependencies = [ - "ahash", - "crossbeam-channel", - "enum-map", - "enumset", - "lazy_static 1.4.0", - "log", - "num", - "owning_ref", - "time 0.3.20", - "toml", - "unicode-segmentation", - "unicode-width", - "xi-unicode", -] - -[[package]] -name = "custom_derive" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" - -[[package]] -name = "cxx" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "darling" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[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", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "displaydoc" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "dyn-clone" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "ena" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e5d13ca2353ab7d0230988629def93914a8c4015f621f9b13ed2955614731d" -dependencies = [ - "log", -] - -[[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-map" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c25992259941eb7e57b936157961b217a4fc8597829ddef0596d6c3cd86e1a" -dependencies = [ - "enum-map-derive", -] - -[[package]] -name = "enum-map-derive" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4da76b3b6116d758c7ba93f7ec6a35d2e2cf24feda76c6e38a375f4d5c59f2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "enumset" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19be8061a06ab6f3a6cf21106c873578bf01bd42ad15e0311a9c76161cb1c753" -dependencies = [ - "enumset_derive", -] - -[[package]] -name = "enumset_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e7b551eba279bf0fa88b83a46330168c1560a52a94f5126f892f0b364ab3e0" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "field-offset" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" -dependencies = [ - "memoffset 0.6.5", - "rustc_version", -] - -[[package]] -name = "filetime" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "windows-sys 0.45.0", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "futures" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" - -[[package]] -name = "futures-executor" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" - -[[package]] -name = "futures-macro" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" - -[[package]] -name = "futures-task" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" - -[[package]] -name = "futures-util" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gdk" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" -dependencies = [ - "bitflags", - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gettext" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ebb594e753d5997e4be036e5a8cf048ab9414352870fb45c779557bbc9ba971" -dependencies = [ - "byteorder", - "encoding", -] - -[[package]] -name = "gio" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-io", - "gio-sys", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - -[[package]] -name = "git2" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "glib" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" -dependencies = [ - "anyhow", - "heck", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "glib-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gobject-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gpg-error" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89aaeddbfb92313378c58e98abadaaa34082b3855f1d455576eeeda08bd592c" -dependencies = [ - "libgpg-error-sys", -] - -[[package]] -name = "gpgme" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57539732fbe58eacdb984734b72b470ed0bca3ab7a49813271878567025ac44f" -dependencies = [ - "bitflags", - "cfg-if", - "conv", - "cstr-argument", - "gpg-error", - "gpgme-sys", - "libc", - "memoffset 0.7.1", - "once_cell", - "smallvec", - "static_assertions", -] - -[[package]] -name = "gpgme-sys" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509223d659c06e4a26229437d6ac917723f02d31917c86c6ecd50e8369741cf7" -dependencies = [ - "build-rs", - "libc", - "libgpg-error-sys", - "system-deps", - "winreg", -] - -[[package]] -name = "gtk" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" -dependencies = [ - "atk", - "bitflags", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk3-macros" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "h2" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util 0.7.7", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.6", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "hyper" -version = "0.14.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "ipnet" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lalrpop" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823" -dependencies = [ - "ascii-canvas", - "atty", - "bit-set", - "diff", - "ena", - "itertools", - "lalrpop-util", - "petgraph", - "pico-args", - "regex", - "regex-syntax", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", -] - -[[package]] -name = "lalrpop-util" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4" -dependencies = [ - "regex", -] - -[[package]] -name = "lazy_static" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if", - "ryu", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "libgit2-sys" -version = "0.14.2+1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libgpg-error-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c97079310f39c835d3bd73578379d040f779614bb331c7ffbb6630fee6420290" -dependencies = [ - "build-rs", - "system-deps", - "winreg", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libssh2-sys" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static 1.4.0", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "man" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf5fa795187a80147b1ac10aaedcf5ffd3bbeb1838bda61801a1c9ad700a1c9" -dependencies = [ - "roff", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memsec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa0916b001582d253822171bd23f4a0229d32b9507fae236f5da8cad515ba7c" - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[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.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static 1.4.0", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "nettle" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d193a809310369c5d16e45bc0a88cb27935edd5d3375bcfc2371b167694035" -dependencies = [ - "getrandom 0.2.8", - "libc", - "nettle-sys", - "thiserror", -] - -[[package]] -name = "nettle-sys" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5df7cd7e8d5d2997055f31318d1ec648c84886e662bbef7b4a60e3cbc899522b" -dependencies = [ - "bindgen", - "cc", - "libc", - "pkg-config", - "tempfile", - "vcpkg", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "lexical-core", - "memchr", - "version_check", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" -dependencies = [ - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "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.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "openssl" -version = "0.10.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "os_pipe" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "owning_ref" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "pango" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" -dependencies = [ - "bitflags", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.45.0", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pest" -version = "2.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[package]] -name = "petgraph" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pico-args" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "plotters" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" - -[[package]] -name = "plotters-svg" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "qml" -version = "0.0.9" -source = "git+https://github.com/White-Oak/qml-rust#3316f54e29331ac951b5cf083179bb71add002e2" -dependencies = [ - "cmake", - "lazy_static 0.2.11", - "libc", - "pkg-config", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.8", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "reqwest" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" -dependencies = [ - "base64 0.21.0", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "ripasso" -version = "0.6.4" -dependencies = [ - "anyhow", - "base64 0.21.0", - "chrono", - "config", - "criterion", - "flate2", - "git2", - "glob", - "gpgme", - "hex", - "hmac", - "rand 0.8.5", - "reqwest", - "sequoia-ipc", - "sequoia-openpgp", - "sha1", - "sha2", - "tar", - "tempfile", - "toml", - "totp-rs", - "whoami", -] - -[[package]] -name = "ripasso-cursive" -version = "0.6.4" -dependencies = [ - "chrono", - "cli-clipboard", - "clipboard", - "config", - "cursive", - "gettext", - "glob", - "hex", - "lazy_static 1.4.0", - "locale_config", - "man", - "ripasso", - "tempfile", - "term_size", - "toml", - "unic-langid", - "wl-clipboard-rs", -] - -[[package]] -name = "ripasso-gtk" -version = "0.6.4" -dependencies = [ - "clipboard", - "gdk", - "glib", - "gtk", - "lazy_static 1.4.0", - "ripasso", -] - -[[package]] -name = "ripasso-qt" -version = "0.6.4" -dependencies = [ - "clipboard", - "qml", - "ripasso", -] - -[[package]] -name = "roff" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33e4fb37ba46888052c763e4ec2acfedd8f00f62897b630cadb6298b833675e" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.36.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustversion" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5e082f6ea090deaf0e6dd04b68360fd5cddb152af6ce8927c9d25db299f98c" - -[[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] -name = "sequoia-ipc" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d77ed9e61ea15856bc379246be754c149d40920983a2ca87a8fced24cc9328" -dependencies = [ - "anyhow", - "buffered-reader", - "capnp-rpc", - "ctor", - "dirs", - "fs2", - "futures", - "lalrpop", - "lalrpop-util", - "lazy_static 1.4.0", - "libc", - "memsec", - "rand 0.8.5", - "sequoia-openpgp", - "socket2", - "tempfile", - "thiserror", - "tokio", - "tokio-util 0.6.10", - "winapi", -] - -[[package]] -name = "sequoia-openpgp" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70af2f594bf5261eb87be5060db1e40d6445686d2bb3ec41c014cf53701130a2" -dependencies = [ - "anyhow", - "base64 0.13.1", - "buffered-reader", - "bzip2", - "chrono", - "dyn-clone", - "flate2", - "getrandom 0.2.8", - "idna", - "lalrpop", - "lalrpop-util", - "lazy_static 1.4.0", - "libc", - "memsec", - "nettle", - "rand 0.7.3", - "regex", - "regex-syntax", - "sha1collisiondetection", - "thiserror", - "xxhash-rust", -] - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" - -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.6", -] - -[[package]] -name = "sha1collisiondetection" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66558a774ef5044cb4a834db5f5c7f95e139d2341d7f502fe6034afa7082461" -dependencies = [ - "digest 0.9.0", - "generic-array", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.6", -] - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "string_cache" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d69e88b23f23030bf4d0e9ca7b07434f70e1c1f4d3ca7e93ce958b373654d9f" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared", - "precomputed-hash", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tempfile" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.42.0", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -dependencies = [ - "itoa", - "libc", - "num_threads", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -dependencies = [ - "time-core", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinystr" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" -dependencies = [ - "displaydoc", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "pin-project-lite", - "socket2", - "windows-sys 0.45.0", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" - -[[package]] -name = "toml_edit" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "totp-rs" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942a8cf27d3bf8ac090ed75d3887cead18da1c6f3b0d4502edbf639ebbd37057" -dependencies = [ - "base32", - "constant_time_eq", - "hmac", - "sha1", - "sha2", - "url", - "urlencoding", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tree_magic_mini" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91adfd0607cacf6e4babdb870e9bec4037c1c4b151cfd279ccefc5e0c7feaa6d" -dependencies = [ - "bytecount", - "fnv", - "lazy_static 1.4.0", - "nom 7.1.3", - "once_cell", - "petgraph", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - -[[package]] -name = "unic-langid" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" -dependencies = [ - "unic-langid-impl", -] - -[[package]] -name = "unic-langid-impl" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" -dependencies = [ - "tinystr", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" - -[[package]] -name = "unicode-ident" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775c11906edafc97bc378816b94585fbd9a054eabaf86fdd0ced94af449efab7" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "urlencoding" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-compare" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags", - "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", - "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 = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "whoami" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45dbc71f0cdca27dc261a9bd37ddec174e4a0af2b900b890f378460f745426e3" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - -[[package]] -name = "winnow" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[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.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89bd49c06c9eb5d98e6ba6536cf64ac9f7ee3a009b2f53996d405b3944f6bcea" -dependencies = [ - "xcb", -] - -[[package]] -name = "x11-clipboard" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0827f86aa910c4e73329a4f619deabe88ebb4b042370bf023c2d5d8b4eb54695" -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 = "xattr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -dependencies = [ - "libc", -] - -[[package]] -name = "xcb" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e917a3f24142e9ff8be2414e36c649d47d6cc2ba81f16201cdef96e533e02de" -dependencies = [ - "libc", - "log", -] - -[[package]] -name = "xi-unicode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" - -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" - -[[package]] -name = "xxhash-rust" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70" diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index ac4f176950df3..fe216b91ff916 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -16,31 +16,22 @@ }: rustPlatform.buildRustPackage rec { - version = "0.6.4"; + version = "0.7.0"; pname = "ripasso-cursive"; src = fetchFromGitHub { owner = "cortex"; repo = "ripasso"; rev = "release-${version}"; - hash = "sha256-9wBaFq2KVfLTd1j8ZPoUlmZJDW2UhvGBAaCGX+qg92s="; + hash = "sha256-j98X/+UTea4lCtFfMpClnfcKlvxm4DpOujLc0xc3VUY="; }; + cargoHash = "sha256-dP8H4OOgtQEBEJxpbaR3KnXFtgBdX4r+dCpBJjBK1MM="; + patches = [ ./fix-tests.patch ]; - cargoPatches = [ - ./fix-build.patch - ]; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "qml-0.0.9" = "sha256-ILqvUaH7nSu2JtEs8ox7KroOzYnU5ai44k1HE4Bz5gg="; - }; - }; - cargoBuildFlags = [ "-p ripasso-cursive" ]; nativeBuildInputs = [ @@ -58,7 +49,7 @@ rustPlatform.buildRustPackage rec { gpgme xorg.libxcb nettle - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Security ]; diff --git a/pkgs/tools/security/ripasso/fix-build.patch b/pkgs/tools/security/ripasso/fix-build.patch deleted file mode 100644 index eeaebd58dae68..0000000000000 --- a/pkgs/tools/security/ripasso/fix-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 8464bf70..659e66c0 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2702,7 +2702,7 @@ dependencies = [ - - [[package]] - name = "ripasso" --version = "0.6.3" -+version = "0.6.4" - dependencies = [ - "anyhow", - "base64 0.21.0", -@@ -2730,7 +2730,7 @@ dependencies = [ - - [[package]] - name = "ripasso-cursive" --version = "0.6.3" -+version = "0.6.4" - dependencies = [ - "chrono", - "cli-clipboard", -@@ -2753,7 +2753,7 @@ dependencies = [ - - [[package]] - name = "ripasso-gtk" --version = "0.6.3" -+version = "0.6.4" - dependencies = [ - "clipboard", - "gdk", -@@ -2765,7 +2765,7 @@ dependencies = [ - - [[package]] - name = "ripasso-qt" --version = "0.6.3" -+version = "0.6.4" - dependencies = [ - "clipboard", - "qml", diff --git a/pkgs/tools/security/rucredstash/default.nix b/pkgs/tools/security/rucredstash/default.nix index 972695ad565e1..43166eb0bf8ec 100644 --- a/pkgs/tools/security/rucredstash/default.nix +++ b/pkgs/tools/security/rucredstash/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-TYobVjjzrK3gprZcYyY98EvdASkq4urB+WiLlbJbwmk="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index fc3ab5b2e013b..6af9b974ac090 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { patchShebangs fixtures/.rustscan_scripts/* ''; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeCheckInputs = [ perl diff --git a/pkgs/tools/security/s5/default.nix b/pkgs/tools/security/s5/default.nix index 007e61c2fd523..85aca4e60dc6f 100644 --- a/pkgs/tools/security/s5/default.nix +++ b/pkgs/tools/security/s5/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "s5"; - version = "0.1.13"; + version = "0.1.15"; src = fetchFromGitHub { owner = "mvisonneau"; repo = pname; rev = "v${version}"; - hash = "sha256-asX61mGgXKlSvVGcGrfVGLiZersjbaVql1eKf+b9JmU="; + hash = "sha256-QQMnzDRWdW0awwNx2vqtzrOW9Ua7EmJ9YFznQoK33J0="; }; - vendorHash = "sha256-8nuhRoFnN2oiJdo7bXxHqaHTkZH9Hh2Q2cYnMkEt4kI="; + vendorHash = "sha256-axcZ4XzgsPVU9at/g3WS8Hv92P2hmZRb+tUfw+h9iH0="; subPackages = [ "cmd/${pname}" ]; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 72d1580134b4d..1afba85be34ef 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, AppKit }: +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + AppKit, +}: buildGoModule rec { pname = "saml2aws"; @@ -13,19 +20,29 @@ buildGoModule rec { vendorHash = "sha256-gtl8T8wXnpLgDZc6qSgFKpA+XbcLNHf20ieBkyNdE+s="; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; - subPackages = [ "." "cmd/saml2aws" ]; + subPackages = [ + "." + "cmd/saml2aws" + ]; ldflags = [ "-X main.Version=${version}" ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd saml2aws \ + --bash <($out/bin/saml2aws --completion-script-bash) \ + --zsh <($out/bin/saml2aws --completion-script-zsh) + ''; + meta = with lib; { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; mainProgram = "saml2aws"; - homepage = "https://github.com/Versent/saml2aws"; - license = licenses.mit; + homepage = "https://github.com/Versent/saml2aws"; + license = licenses.mit; maintainers = [ lib.maintainers.pmyjavec ]; }; } diff --git a/pkgs/tools/security/schleuder/default.nix b/pkgs/tools/security/schleuder/default.nix index cce88366a372b..8429cb0ea0d01 100644 --- a/pkgs/tools/security/schleuder/default.nix +++ b/pkgs/tools/security/schleuder/default.nix @@ -24,7 +24,7 @@ bundlerApp { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Schleuder is an encrypting mailing list manager with remailing-capabilities"; longDescription = '' Schleuder is a group's email-gateway: subscribers can exchange diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix index 75b6657fe7e25..de2f9b9b07dc7 100644 --- a/pkgs/tools/security/scorecard/default.nix +++ b/pkgs/tools/security/scorecard/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "scorecard"; - version = "4.13.1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "ossf"; repo = pname; rev = "v${version}"; - hash = "sha256-xf6HyiZlkU9ifgXr+/O8UeElqwF8c1h/9IRWDVHx2+g="; + hash = "sha256-9DuADuEIoZNwkvdKyqus2zNfIK31Jc3+bPW3/z8fvlc="; # populate values otherwise taken care of by goreleaser, # unfortunately these require us to use git. By doing # this in postFetch we can delete .git afterwards and @@ -28,7 +28,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-ohZcz7fn/YAglLI3YOi0J4FWkCJa2/nsM7T03+BOWkw="; + vendorHash = "sha256-apOVAlGjaYSrW4qtUdDNgqwWxnVlBLhrefWEUvN4lzE="; nativeBuildInputs = [ installShellFiles ]; @@ -59,8 +59,7 @@ buildGoModule rec { ''; checkFlags = [ - # https://github.com/ossf/scorecard/pull/4134 - "-skip TestRunScorecard/empty_commits_repos_should_return_repo_details_but_no_checks" + "-skip TestCollectDockerfilePinning/Non-pinned_dockerfile|TestMixedPinning" ]; postInstall = '' diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index d1deaa0ec41d9..d199ee37725ea 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - nativeCheckInputs = lib.optionals stdenv.isLinux [ util-linux ]; + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]; meta = with lib; { description = "Encryption utility"; diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index 193a5433b598f..e7710b7d151eb 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "secp256k1"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; rev = "refs/tags/v${version}"; - sha256 = "sha256-XcxBzOJngrm1szs48bBS6pcH2yaLfLKPUtyQ51eItaw="; + sha256 = "sha256-IYvvBob8e82EiPLX9yA8fd+KWrMri1rI5csp81rAdrg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix index 96d15250e1637..81091848a93cc 100644 --- a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix +++ b/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { nettle openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/tools/security/sheesy-cli/default.nix b/pkgs/tools/security/sheesy-cli/default.nix index 9df5da79e8a6c..a2dda4493852d 100644 --- a/pkgs/tools/security/sheesy-cli/default.nix +++ b/pkgs/tools/security/sheesy-cli/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ libgpg-error gpgme gettext installShellFiles ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; buildFeatures = [ "vault" "extract" "completions" "substitute" "process" ]; diff --git a/pkgs/tools/security/smbmap/default.nix b/pkgs/tools/security/smbmap/default.nix index 1e91764db6091..e0175d3e9ec0a 100644 --- a/pkgs/tools/security/smbmap/default.nix +++ b/pkgs/tools/security/smbmap/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "smbmap"; - version = "1.10.4"; + version = "1.10.5"; pyproject = true; src = fetchFromGitHub { owner = "ShawnDEvans"; repo = "smbmap"; rev = "refs/tags/v${version}"; - hash = "sha256-CU0pio+R8JI/vQi13mOmiEeWC+r4EuLwWOQYLnm4Oao="; + hash = "sha256-xeQ3o0Pt4eDeMnSJKdEJfHhA0oPiD7tmX9TQAb3b9I8="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/tools/security/snowcrash/default.nix b/pkgs/tools/security/snowcrash/default.nix index 69d310afb9f9d..b787b0da59b71 100644 --- a/pkgs/tools/security/snowcrash/default.nix +++ b/pkgs/tools/security/snowcrash/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { subPackages = [ "." ]; - postFixup = lib.optionals (!stdenv.isDarwin) '' + postFixup = lib.optionals (!stdenv.hostPlatform.isDarwin) '' mv $out/bin/SNOWCRASH $out/bin/${pname} ''; diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index e4c428b90b9aa..d755e131d8f00 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = - lib.optionals stdenv.isDarwin [ libobjc Security ]; + lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Security ]; buildInputs = [ botan2 sqlite ]; diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix index a241e8780101b..387bf00e37bfe 100644 --- a/pkgs/tools/security/solo2-cli/default.nix +++ b/pkgs/tools/security/solo2-cli/default.nix @@ -28,8 +28,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ pcsclite udev ] - ++ lib.optionals stdenv.isDarwin [ PCSC IOKit CoreFoundation AppKit ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ PCSC IOKit CoreFoundation AppKit ]; postInstall = '' install -D 70-solo2.rules $out/lib/udev/rules.d/70-solo2.rules diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 3ca39e21c2bc0..4e892c13af3f2 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sops"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "getsops"; repo = pname; rev = "v${version}"; - hash = "sha256-Q1e3iRIne9/bCLxKdhzP3vt3oxuHJAuG273HdeHZ3so="; + hash = "sha256-j16hSTi7fwlMu8hwHqCR0lW22VSf0swIVTF81iUYl2k="; }; - vendorHash = "sha256-3vzKQZTg38/UGVJ/M1jLALCgor7wztsLKVuMqY3adtI="; + vendorHash = "sha256-40YESkLSKL/zFBI7ccz0ilrl9ATr74YpvRNrOpzJDew="; subPackages = [ "cmd/sops" ]; diff --git a/pkgs/tools/security/spectre-cli/default.nix b/pkgs/tools/security/spectre-cli/default.nix index 923046cdad4ae..ba63b823e7399 100644 --- a/pkgs/tools/security/spectre-cli/default.nix +++ b/pkgs/tools/security/spectre-cli/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # Some tests are expected to fail on ARM64 # See: https://gitlab.com/spectre.app/cli/-/issues/27#note_962950844 - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); checkPhase = '' mv ../spectre-cli-tests ../spectre_tests.xml ./ diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index 68b8afdf67125..b3ec01ebdbbf8 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* ''; diff --git a/pkgs/tools/security/ssh-mitm/default.nix b/pkgs/tools/security/ssh-mitm/default.nix index 6694a9edaae24..4c59595ec9360 100644 --- a/pkgs/tools/security/ssh-mitm/default.nix +++ b/pkgs/tools/security/ssh-mitm/default.nix @@ -63,7 +63,7 @@ buildPythonApplication rec { setuptools sshpubkeys wrapt - ] ++ lib.optionals stdenv.isDarwin [ setuptools ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ setuptools ]; # fix for darwin users nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix index 4cf19ea2dafe9..b65ba77ff2c1d 100644 --- a/pkgs/tools/security/ssh-to-age/default.nix +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-wGtNaejzAOgOuYDEKz6xMCaoaHsiDuQZj0KKpcejphE="; + sha256 = "sha256-cEEFz/iVhvfo8CffC9wkIRnF26xL+roaqKsLmUgfUiA="; }; - vendorHash = "sha256-w/REcFeH58DTQwgotxSBVR4y7aQ9rBDX2U0A4vJno7s="; + vendorHash = "sha256-FH+etKil0oiiB5tvDYS2nu1HG4yZTWZuRhtYnbq4Os4="; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 2090c4d396bd5..e52453e8006d5 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { installManPage docs/_build/man/* wrapProgram $out/bin/sshuttle \ - --prefix PATH : "${lib.makeBinPath ([ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ])}" \ + --prefix PATH : "${lib.makeBinPath ([ coreutils openssh procps ] ++ lib.optionals stdenv.hostPlatform.isLinux [ iptables nettools ])}" \ ''; meta = with lib; { diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index ab699f8f02b77..6c12b20a613f5 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "refs/tags/${version}"; - hash = "sha256-we55Oo9sIZ1FQn94xejlCKwlZBDMrQs/1f++blXTTUM="; + hash = "sha256-K0OJvb9jym7P6ehtV5M/edq4ZKwacn8D5IC4PyttqZY="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 549cfa6a52244..f37c05f93fbb0 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -32,8 +32,8 @@ buildGoModule rec { nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; buildInputs = - lib.optionals (hsmSupport && stdenv.isLinux) [ pcsclite ] - ++ lib.optionals (hsmSupport && stdenv.isDarwin) [ PCSC ]; + lib.optionals (hsmSupport && stdenv.hostPlatform.isLinux) [ pcsclite ] + ++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ PCSC ]; postPatch = '' substituteInPlace systemd/step-ca.service --replace "/bin/kill" "${coreutils}/bin/kill" diff --git a/pkgs/tools/security/step-kms-plugin/default.nix b/pkgs/tools/security/step-kms-plugin/default.nix index a64f86a31d1ee..ba35b7c110875 100644 --- a/pkgs/tools/security/step-kms-plugin/default.nix +++ b/pkgs/tools/security/step-kms-plugin/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.11.3"; + version = "0.11.5"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-Gl/5AExN2/MEoR2HKpw7mDfuc/1Wj0UGSdXPzHl2JdU="; + hash = "sha256-MxGhG8ehXT7ftXfoVHMSpyIr25tWj5Yq50nZZW/q5sQ="; }; - vendorHash = "sha256-O6orQYrupJdJbx23TXCP0qWyvn6Hv2iDeRYvIgLp1NM="; + vendorHash = "sha256-5TWofXHtiBhfsSg3UgSju+7EO+t9bUktsd/WUAH5R5U="; proxyVendor = true; @@ -48,6 +48,6 @@ buildGoModule rec { maintainers = with maintainers; [ qbit ]; mainProgram = "step-kms-plugin"; # can't find pcsclite header files - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index b39c43a8e1b69..6b1bdb4c03ab1 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -41,14 +41,14 @@ stdenv.mkDerivation (finalAttrs: { openssl libtasn1 glib json-glib gnutls - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse libseccomp ]; configureFlags = [ "--localstatedir=/var" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-cuse" ]; diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 8b00431b6cbe7..1d34fdd4e7109 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl libpcap ] - ++ lib.optionals stdenv.isLinux [ libcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ]; enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "http://tcpcrypt.org/"; description = "Fast TCP encryption"; platforms = platforms.all; diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 381e13530beea..416e3cf1fdf5a 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.19.2"; + version = "1.19.9"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3CmbxLWRz6fvnk3ieNq65ph/zN91/8q1y9rYcnWf0II="; + hash = "sha256-4XIhmUUOSROwEPSB+DcMOfG5+q/pmWkVUwKGrWVcNtM="; }; - vendorHash = "sha256-Hk7dkhb1GiCY9CkKZ1dMQc+s97VRUli7WAoneJVNK08="; + vendorHash = "sha256-yQien8v7Ru+JWLou9QfyKZAR2ENMHO2aF2vzuWyQcjY="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 6d366fd3e80b4..412691d2b9403 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql +{ stdenv, lib, fetchFromGitHub, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql, samba , withGUI ? false, makeWrapper, pkg-config, gtk2 }: stdenv.mkDerivation rec { @@ -16,19 +16,20 @@ stdenv.mkDerivation rec { makeDirs = output: subDir: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) buildInputs); in '' substituteInPlace configure \ - --replace '$LIBDIRS' "${makeDirs "lib" "lib"}" \ - --replace '$INCDIRS' "${makeDirs "dev" "include"}" \ - --replace "/usr/include/math.h" "${lib.getDev stdenv.cc.libc}/include/math.h" \ - --replace "libcurses.so" "libncurses.so" \ - --replace "-lcurses" "-lncurses" + --replace-fail '$LIBDIRS' "${makeDirs "lib" "lib"}" \ + --replace-fail '$INCDIRS' "${makeDirs "dev" "include"}" \ + --replace-fail "/usr/include/math.h" "${lib.getDev stdenv.cc.libc}/include/math.h" \ + --replace-fail "libcurses.so" "libncurses.so" \ + --replace-fail "-lcurses" "-lncurses" ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-undef-prefix"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-undef-prefix"; nativeBuildInputs = lib.optionals withGUI [ pkg-config makeWrapper ]; buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysqlclient postgresql + samba ] ++ lib.optional withGUI gtk2; enableParallelBuilding = true; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 30eb8360fe391..164526a8e1332 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevent openssl zlib xz zstd scrypt ] ++ - lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; + lib.optionals stdenv.hostPlatform.isLinux [ libseccomp systemd libcap ]; patches = [ ./disable-monotonic-timer-tests.patch ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ] ++ # sandbox is broken on aarch64-linux https://gitlab.torproject.org/tpo/core/tor/-/issues/40599 - lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "--disable-seccomp" ] + lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ "--disable-seccomp" ] ; NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s"; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { # disable tests on linux aarch32 # https://gitlab.torproject.org/tpo/core/tor/-/issues/40912 - doCheck = !(stdenv.isLinux && stdenv.isAarch32); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch32); postInstall = '' mkdir -p $geoip/share/tor diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 0ad36688bd6b9..8b09bfc3bf9b6 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { sed -i \ -e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \ src/bin/torsocks.in - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' sed -i \ -e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \ src/bin/torsocks.in diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index d45a45a880a6e..124115e637c3c 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.81.10"; + version = "3.82.6"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-U2HKrOk6+QO3QhDTDXpx3eWIsikfkuFTOQWcqbtj1qE="; + hash = "sha256-zJVP7uXmGvpI8pyhNiK70iMy+RW+UwenDpXBe98VbMo="; }; - vendorHash = "sha256-9AY0Dzn29GbWveb5HGWpKHkW9LCglPUzlX9wyQmj+FM="; + vendorHash = "sha256-69APqkjBNs6FUCeHm6lF8QqAuu76pLdam2LJJrx3WXg="; proxyVendor = true; diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index 0d0d1070bbd7f..6ffb4d48253f3 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.37.3"; + version = "0.37.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-RCvqoikROFpFvza24PGocdxFaOI6hZLSy3Jnag7Oz4s="; + sha256 = "sha256-ezF8cV3JPE/GObpTc4wPw/YcQrOKNi2bsRs3svLWpV8="; }; - vendorHash = "sha256-iKfNAQRsVUjhUmDH/HevnDnocQm4k9jEfW40+AncojM="; + vendorHash = "sha256-jwxKFgUhBilX/HxwjtHwLzmyUFrM8snM6Sq1CdY7oOY="; proxyVendor = true; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix deleted file mode 100644 index 8e259dc20cba2..0000000000000 --- a/pkgs/tools/security/vault/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests -, makeWrapper -, gawk -, glibc -}: - -buildGoModule rec { - pname = "vault"; - version = "1.17.3"; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "vault"; - rev = "v${version}"; - hash = "sha256-N5nJBMRaHzK7aMPSeLVmnItf3CuGeblDMsGLDEz8HZc="; - }; - - vendorHash = "sha256-yy6bk86o/Q8KgggVJd8VCErG1txNbGsEuozyDa6IrCA="; - - proxyVendor = true; - - subPackages = [ "." ]; - - nativeBuildInputs = [ installShellFiles makeWrapper ]; - - tags = [ "vault" ]; - - ldflags = [ - "-s" "-w" - "-X github.com/hashicorp/vault/sdk/version.GitCommit=${src.rev}" - "-X github.com/hashicorp/vault/sdk/version.Version=${version}" - "-X github.com/hashicorp/vault/sdk/version.VersionPrerelease=" - ]; - - postInstall = '' - echo "complete -C $out/bin/vault vault" > vault.bash - installShellCompletion vault.bash - '' + lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/vault \ - --prefix PATH ${lib.makeBinPath [ gawk glibc ]} - ''; - - passthru.tests = { inherit (nixosTests) vault vault-postgresql vault-dev vault-agent; }; - - meta = with lib; { - homepage = "https://www.vaultproject.io/"; - description = "Tool for managing secrets"; - changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md"; - license = licenses.bsl11; - mainProgram = "vault"; - maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri Chili-Man techknowlogick ]; - }; -} diff --git a/pkgs/tools/security/vault/update-bin.sh b/pkgs/tools/security/vault/update-bin.sh deleted file mode 100755 index 25f41e2aad127..0000000000000 --- a/pkgs/tools/security/vault/update-bin.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused gawk nix-prefetch - -set -euo pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/vault-bin.nix" -if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find vault-bin in $ROOT" - exit 1 -fi - -fetch_arch() { - VER="$1"; ARCH="$2" - URL="https://releases.hashicorp.com/vault/${VER}/vault_${VER}_${ARCH}.zip" - nix-prefetch "{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - pname = \"vault-bin\"; version = \"${VER}\"; - src = fetchzip { url = \"$URL\"; }; -} -" -} - -replace_sha() { - sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" -} - -# https://releases.hashicorp.com/vault/1.9.4/vault_1.9.4_linux_arm64.zip -VAULT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/hashicorp/vault/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') - -VAULT_LINUX_X86_SHA256=$(fetch_arch "$VAULT_VER" "linux_386") -VAULT_LINUX_X64_SHA256=$(fetch_arch "$VAULT_VER" "linux_amd64") -VAULT_DARWIN_X64_SHA256=$(fetch_arch "$VAULT_VER" "darwin_amd64") -VAULT_LINUX_AARCH64_SHA256=$(fetch_arch "$VAULT_VER" "linux_arm64") -VAULT_DARWIN_AARCH64_SHA256=$(fetch_arch "$VAULT_VER" "darwin_arm64") - -sed -i "s/version = \".*\"/version = \"$VAULT_VER\"/" "$NIX_DRV" - -replace_sha "i686-linux" "$VAULT_LINUX_X86_SHA256" -replace_sha "x86_64-linux" "$VAULT_LINUX_X64_SHA256" -replace_sha "x86_64-darwin" "$VAULT_DARWIN_X64_SHA256" -replace_sha "aarch64-linux" "$VAULT_LINUX_AARCH64_SHA256" -replace_sha "aarch64-darwin" "$VAULT_DARWIN_AARCH64_SHA256" diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix deleted file mode 100644 index dbdd8d49f76b0..0000000000000 --- a/pkgs/tools/security/vault/vault-bin.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchzip }: - -stdenv.mkDerivation rec { - pname = "vault-bin"; - version = "1.16.2"; - - src = - let - inherit (stdenv.hostPlatform) system; - selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); - suffix = selectSystem { - x86_64-linux = "linux_amd64"; - aarch64-linux = "linux_arm64"; - i686-linux = "linux_386"; - x86_64-darwin = "darwin_amd64"; - aarch64-darwin = "darwin_arm64"; - }; - sha256 = selectSystem { - x86_64-linux = "sha256-fVDHXVI4f/1d6NTgHcURDXAjCkSEwKD3+bhRyvIgfjw="; - aarch64-linux = "sha256-tfRqnroz9W7V3gCataJbm2t97OJUkVe2VyWXPqbeJaw="; - i686-linux = "sha256-l2aYuyxYAOnAOBwtkEkrpqRNWYL7qsaYJ3vMiknhFow="; - x86_64-darwin = "sha256-xX/syRtkJJjmSO36Apq+i/s4kOMMop3De276358hb0c="; - aarch64-darwin = "sha256-I1FpMRsssil0LQe5LBjpX5b7uTATRJOBzbJeLnKCd74="; - }; - in - fetchzip { - url = "https://releases.hashicorp.com/vault/${version}/vault_${version}_${suffix}.zip"; - inherit sha256; - }; - - dontConfigure = true; - dontBuild = true; - dontStrip = stdenv.isDarwin; - - installPhase = '' - runHook preInstall - install -D vault $out/bin/vault - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/vault --help - $out/bin/vault version - runHook postInstallCheck - ''; - - dontPatchELF = true; - dontPatchShebangs = true; - - passthru.updateScript = ./update-bin.sh; - - meta = with lib; { - description = "Tool for managing secrets, this binary includes the UI"; - homepage = "https://www.vaultproject.io"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.bsl11; - maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick mkaito ]; - mainProgram = "vault"; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; - }; -} diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 137f9e6c95643..f28bc52fdbc73 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security CoreServices SystemConfiguration ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security CoreServices SystemConfiguration ] ++ lib.optional (dbBackend == "mysql") libmysqlclient ++ lib.optional (dbBackend == "postgresql") postgresql; diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index a20ce16cec5c0..c4d881373fa2a 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -3,18 +3,20 @@ , fetchFromGitHub , git , nixosTests -, python311 +, python3 , vaultwarden }: let - version = "2024.6.2b"; + version = "2024.6.2c"; + + suffix = lib.head (lib.match "[0-9.]*([a-z]*)" version); bw_web_builds = fetchFromGitHub { owner = "dani-garcia"; repo = "bw_web_builds"; rev = "v${version}"; - hash = "sha256-Gcn/TOXdhMqGq4NTCPQTTEvN5rOQS3LImPUYBsv8de8="; + hash = "sha256-Gd8yQx9j6ieUvaM6IPSELNRy83y0cBkBwLYMqk8OIjU="; }; in buildNpmPackage rec { @@ -24,7 +26,7 @@ in buildNpmPackage rec { src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; - rev = "web-v${lib.removeSuffix "b" version}"; + rev = "web-v${lib.removeSuffix suffix version}"; hash = "sha256-HMQ0oQ04WkLlUgsYt6ZpcziDq05mnSA0+VnJCpteceg="; }; @@ -37,8 +39,7 @@ in buildNpmPackage rec { ''; nativeBuildInputs = [ - # signalr through gyp wants to import distutils - python311 + (python3.withPackages (ps: [ ps.setuptools ])) ]; makeCacheWritable = true; diff --git a/pkgs/tools/security/wpscan/default.nix b/pkgs/tools/security/wpscan/default.nix index 4b3757ae7673a..0d3d312cea43f 100644 --- a/pkgs/tools/security/wpscan/default.nix +++ b/pkgs/tools/security/wpscan/default.nix @@ -21,6 +21,7 @@ bundlerApp { meta = with lib; { description = "Black box WordPress vulnerability scanner"; homepage = "https://wpscan.org/"; + changelog = "https://github.com/wpscanteam/wpscan/releases"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ nyanloutre manveru ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/xcat/default.nix b/pkgs/tools/security/xcat/default.nix index bb5fc62831e7e..54219f1e1ac4e 100644 --- a/pkgs/tools/security/xcat/default.nix +++ b/pkgs/tools/security/xcat/default.nix @@ -45,6 +45,7 @@ python3.pkgs.buildPythonApplication rec { and directories. ''; homepage = "https://github.com/orf/xcat"; + changelog = "https://github.com/orf/xcat/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/yubihsm-shell/default.nix b/pkgs/tools/security/yubihsm-shell/default.nix index 8567798ea82cc..90af2f22068a3 100644 --- a/pkgs/tools/security/yubihsm-shell/default.nix +++ b/pkgs/tools/security/yubihsm-shell/default.nix @@ -47,18 +47,18 @@ stdenv.mkDerivation rec { libedit curl openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite.dev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.PCSC libiconv ]; - preBuild = lib.optionalString stdenv.isLinux '' + preBuild = lib.optionalString stdenv.hostPlatform.isLinux '' NIX_CFLAGS_COMPILE="$(pkg-config --cflags libpcsclite) $NIX_CFLAGS_COMPILE" ''; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DDISABLE_LTO=ON" ]; diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index f43e83e575e79..f2e290ade6db8 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -12,12 +12,12 @@ buildGoModule rec { }; buildInputs = - lib.optional stdenv.isLinux (lib.getDev pcsclite) - ++ lib.optional stdenv.isDarwin (darwin.apple_sdk.frameworks.PCSC); + lib.optional stdenv.hostPlatform.isLinux (lib.getDev pcsclite) + ++ lib.optional stdenv.hostPlatform.isDarwin (darwin.apple_sdk.frameworks.PCSC); - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send ''; @@ -29,7 +29,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/lib/systemd/user substitute contrib/systemd/user/yubikey-agent.service $out/lib/systemd/user/yubikey-agent.service \ --replace 'ExecStart=yubikey-agent' "ExecStart=$out/bin/yubikey-agent" diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/tools/security/yubikey-touch-detector/default.nix index 3662c609139da..84309e8161e27 100644 --- a/pkgs/tools/security/yubikey-touch-detector/default.nix +++ b/pkgs/tools/security/yubikey-touch-detector/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { description = "Tool to detect when your YubiKey is waiting for a touch"; homepage = "https://github.com/maximbaz/yubikey-touch-detector"; maintainers = with maintainers; [ sumnerevans ]; - license = with licenses; [ bsd2 isc ]; + license = licenses.isc; platforms = platforms.linux; mainProgram = "yubikey-touch-detector"; }; diff --git a/pkgs/tools/security/zlint/default.nix b/pkgs/tools/security/zlint/default.nix index c6b4bdf04e55b..c23cfa528da30 100644 --- a/pkgs/tools/security/zlint/default.nix +++ b/pkgs/tools/security/zlint/default.nix @@ -48,7 +48,7 @@ buildGoModule rec { requirements (e.g. CA/Browser Forum Baseline Requirements). ''; homepage = "https://github.com/zmap/zlint"; - changelog = "https://github.com/zmap/zlint/releases/tag/${src.rev}"; + changelog = "https://github.com/zmap/zlint/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ baloo ]; }; diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/tools/security/zmap/default.nix index 1749c9ef6d7f9..b7a9986434ebc 100644 --- a/pkgs/tools/security/zmap/default.nix +++ b/pkgs/tools/security/zmap/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Fast single packet network scanner designed for Internet-wide network surveys"; maintainers = with maintainers; [ ma27 ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix deleted file mode 100644 index 1076209b21366..0000000000000 --- a/pkgs/tools/system/acpica-tools/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, bison -, flex -}: - -stdenv.mkDerivation rec { - pname = "acpica-tools"; - version = "20240322"; - - src = fetchFromGitHub { - owner = "acpica"; - repo = "acpica"; - rev = "refs/tags/G${version}"; - hash = "sha256-k5rDaRKYPwdP4SmEXlrqsA2NLZDlqXBclz1Lwmufa2M="; - }; - - nativeBuildInputs = [ bison flex ]; - - buildFlags = [ - "acpibin" - "acpidump" - "acpiexamples" - "acpiexec" - "acpihelp" - "acpisrc" - "acpixtract" - "iasl" - ]; - - env.NIX_CFLAGS_COMPILE = toString ([ - "-O3" - ]); - - enableParallelBuilding = true; - - # i686 builds fail with hardening enabled (due to -Wformat-overflow). Disable - # -Werror altogether to make this derivation less fragile to toolchain - # updates. - NOWERROR = "TRUE"; - - # We can handle stripping ourselves. - # Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected. - INSTALLFLAGS = lib.optionals (!stdenv.isDarwin) "-m 555"; - - installFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - homepage = "https://www.acpica.org/"; - description = "ACPICA Tools"; - license = with licenses; [ iasl gpl2Only bsd3 ]; - maintainers = with maintainers; [ tadfisher ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix index 1dd26e5b3c1b0..caa030b8c65f3 100644 --- a/pkgs/tools/system/amtterm/default.nix +++ b/pkgs/tools/system/amtterm/default.nix @@ -1,27 +1,29 @@ -{ fetchurl, lib, stdenv, makeWrapper, perl, perlPackages }: +{ fetchFromGitHub, lib, stdenv, makeWrapper, openssl, perl, perlPackages, pkg-config }: stdenv.mkDerivation (finalAttrs: { pname = "amtterm"; - version = "1.7-1"; + version = "1.7-1-unstable-2023-10-27"; - buildInputs = with perlPackages; [ perl SOAPLite ]; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = (with perlPackages; [ perl SOAPLite ]) ++ [ openssl ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; - src = fetchurl { - url = "https://www.kraxel.org/cgit/amtterm/snapshot/amtterm-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-WrYWAXLW74hb/DfSiPyiFIGAUfDQFdNEPx+XevZYcyk="; + src = fetchFromGitHub { + owner = "kraxel"; + repo = "amtterm"; + rev = "ed5da502cbb150982ad982211ad9475414b8689a"; + hash = "sha256-JwS2agmJJ6VcGLkNbkFRb5bzKV8el1DMDjalmLnOdE8="; }; - makeFlags = [ "prefix=$(out)" "STRIP=" ]; + makeFlags = [ "prefix=$(out)" "STRIP=" "USE_OPENSSL=1" ]; postInstall = "wrapProgram $out/bin/amttool --prefix PERL5LIB : $PERL5LIB"; - meta = with lib; - { description = "Intel AMT® SoL client + tools"; - homepage = "https://www.kraxel.org/cgit/amtterm/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; + meta = { + description = "Intel AMT® SoL client + tools"; + homepage = "https://www.kraxel.org/cgit/amtterm/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + }; }) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 7021d1ff63fe9..cd9aea8104e50 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.30"; + version = "2.0.34"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7Qczara48SIuoKhfaQLFzkYYylvJlb6dV7pUEXucCWY="; + sha256 = "sha256-NWVc+rPlW3GFHTADKEHjzDAHiicKd4HlJSD4MR2mqGQ="; }; - cargoHash = "sha256-m/IEFVlOCE8aiMqPQ/f/b/tVxRjJBlOO4V9uoLiOJ0o="; + cargoHash = "sha256-6QPgBP8K4HvivlVxWzIX8y37ltHEScUzmf5Js8gMN34="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 2b714b56def59..e950cd957ea12 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "3.1.3"; + version = "4.0.2"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - hash = "sha256-/thPPueNrYzbxxZYAqlxZ2GEsceCzd+LkI84S8AS1mo="; + hash = "sha256-WIJyCpnlD6/c7PG+ZPmUT8qfPelRY9Od1Dk9Ro1y1yY="; }; - buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl liburing ]; + buildInputs = [ oniguruma ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap acl liburing ]; + configureFlags = [ "--enable-release" ]; makeFlags = [ "PREFIX=$(out)" ]; - buildFlags = [ "release" ]; # "release" enables compiler optimizations meta = with lib; { description = "Breadth-first version of the UNIX find command"; diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index d38b018128fad..0f67b4111aa63 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - hash = "sha256-kjSyIgLTObTOKMG5dk49XmWPXZpCWbLdpkmAsJcFliA="; + hash = "sha256-A5hOBxj8tKlkHd8zDHfDoU6fIu8gDpt3/usbiDk0/G0="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { autoAddDriverRunpath ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreFoundation darwin.apple_sdk_11_0.frameworks.IOKit ]; diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index 50e72498bf640..465bba682b0e0 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-1jZP4SnLIHh3vQJLBp+j/eQ1c8XBGFR2hjYxflhpWAU="; }; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ ocl-icd opencl-headers - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenCL ]; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index bbcc9f704bc48..b75cdb19de163 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ libtool - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ] ++ plugins.buildInputs; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 9ca18b06203df..7202ec795e8b2 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -51,10 +51,10 @@ let plugins = { amqp.buildInputs = [ yajl - ] ++ lib.optionals stdenv.isLinux [ rabbitmq-c ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ rabbitmq-c ]; apache.buildInputs = [ curl ]; ascent.buildInputs = [ curl libxml2 ]; - battery.buildInputs = lib.optionals stdenv.isDarwin [ + battery.buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; bind.buildInputs = [ curl libxml2 ]; @@ -63,30 +63,30 @@ let curl_json.buildInputs = [ curl yajl ]; curl_xml.buildInputs = [ curl libxml2 ]; dbi.buildInputs = [ libdbi ]; - disk.buildInputs = lib.optionals stdenv.isLinux [ + disk.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; dns.buildInputs = [ libpcap ]; ipmi.buildInputs = [ openipmi ]; iptables.buildInputs = [ libpcap - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ iptables libmnl ]; java.buildInputs = [ jdk libgcrypt libxml2 ]; log_logstash.buildInputs = [ yajl ]; lua.buildInputs = [ lua ]; memcachec.buildInputs = [ libmemcached cyrus_sasl ]; - modbus.buildInputs = lib.optionals stdenv.isLinux [ libmodbus ]; + modbus.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libmodbus ]; mqtt.buildInputs = [ mosquitto ]; mysql.buildInputs = lib.optionals (libmysqlclient != null) [ libmysqlclient ]; netlink.buildInputs = [ libpcap - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libmnl ]; network.buildInputs = [ libgcrypt ]; @@ -104,15 +104,15 @@ let redis.buildInputs = [ hiredis ]; rrdcached.buildInputs = [ rrdtool libxml2 ]; rrdtool.buildInputs = [ rrdtool libxml2 ]; - sensors.buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ]; - sigrok.buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ]; - smart.buildInputs = lib.optionals stdenv.isLinux [ libatasmart udev ]; - snmp.buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; - snmp_agent.buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; + sensors.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ lm_sensors ]; + sigrok.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsigrok udev ]; + smart.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libatasmart udev ]; + snmp.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ net-snmp ]; + snmp_agent.buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ net-snmp ]; varnish.buildInputs = [ curl varnish ]; virt.buildInputs = [ libvirt libxml2 yajl - ] ++ lib.optionals stdenv.isLinux [ lvm2 udev ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lvm2 udev ]; write_http.buildInputs = [ curl yajl ]; write_kafka.buildInputs = [ yajl rdkafka ]; write_log.buildInputs = [ yajl ]; diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix index 57ea989021b87..01439e6aa49bb 100644 --- a/pkgs/tools/system/dcfldd/default.nix +++ b/pkgs/tools/system/dcfldd/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "1y6mwsvm75f5jzxsjjk0yhf8xnpmz6y8qvcxfandavx59lc3l57m"; }; - buildInputs = [ ]; - meta = with lib; { description = "Enhanced version of GNU dd"; diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index c386536e1f17d..518d54898d9b3 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-j1qSMPNCtAxClqYqWkRNQmtxkitYi7g/9KtQ5XqcX3w="; }; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals stdenv.hostPlatform.isLinux [ ./einval.patch # patches needed for musl libc, borrowed from alpine packaging. @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ autoreconfHook po4a ]; - buildInputs = lib.optional (!stdenv.isDarwin) libcap; + buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) libcap; postUnpack = '' sed -i \ diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index d73d8dda7a775..11c1c1d945de7 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ python3 zlib ] - ++ lib.optional (!stdenv.isDarwin) libaio; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) libaio; # ./configure does not support autoconf-style --build=/--host=. # We use $CC instead. diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index a1a09826c5374..bdf846e029d3d 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # ld: api.o:(.bss+0xbdba0): multiple definition of `wildcard'; main.o:(.bss+0xbd760): first defined here env.NIX_CFLAGS_COMPILE = "-fcommon"; - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "mac" ]; + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "mac" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index dfb1179a08972..4ba04921484f0 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { installManPage gdu.1 ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkFlags = [ # https://github.com/dundee/gdu/issues/371 diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 5305b127a1c51..b2279e0f13d22 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 2718be70c71f1..798d1b223e5c3 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs gdisk_test.sh - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile.mac --replace \ "-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6" substituteInPlace Makefile.mac --replace \ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "/usr/local/Cellar/ncurses/6.2/lib/libncurses.dylib" "${ncurses.out}/lib/libncurses.dylib" ''; - buildPhase = lib.optionalString stdenv.isDarwin "make -f Makefile.mac"; + buildPhase = lib.optionalString stdenv.hostPlatform.isDarwin "make -f Makefile.mac"; buildInputs = [ libuuid popt icu ncurses ]; installPhase = '' diff --git a/pkgs/tools/system/gptman/default.nix b/pkgs/tools/system/gptman/default.nix index cd9fd43615639..484ab05a85f2f 100644 --- a/pkgs/tools/system/gptman/default.nix +++ b/pkgs/tools/system/gptman/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-P+qez0oVsHBiaBYban2o8MRvF8ElLf5zb+p+tYunWWA="; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; buildFeatures = [ "cli" ]; diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 55e9b5e9365cb..c0a689c4c6212 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -3,11 +3,11 @@ , IOKit , libcap , libnl -, sensorsSupport ? stdenv.isLinux, lm_sensors +, sensorsSupport ? stdenv.hostPlatform.isLinux, lm_sensors , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: -assert systemdSupport -> stdenv.isLinux; +assert systemdSupport -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = "htop"; @@ -21,18 +21,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ] - ++ lib.optional stdenv.isLinux pkg-config + ++ lib.optional stdenv.hostPlatform.isLinux pkg-config ; buildInputs = [ ncurses ] - ++ lib.optional stdenv.isDarwin IOKit - ++ lib.optionals stdenv.isLinux [ libcap libnl ] + ++ lib.optional stdenv.hostPlatform.isDarwin IOKit + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libnl ] ++ lib.optional sensorsSupport lm_sensors ++ lib.optional systemdSupport systemd ; configureFlags = [ "--enable-unicode" "--sysconfdir=/etc" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-affinity" "--enable-capabilities" "--enable-delayacct" diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 7fe1ca2f85faa..bd0dba9a024f2 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.58"; + version = "3.5.59"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - hash = "sha256-mwfLCZfjAtKNfp9Cc8hkLAOKo6VfKD3l+IDiXDP2LV8="; + hash = "sha256-O0fn+s3RIIriVw6sMB2nSKAGtVF0Tz6Ns4Jb9OpcbgY="; }; strictDeps = true; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar - ant -f build.xml -Dbits=${if stdenv.isi686 then "32" else "64"} + ant -f build.xml -Dbits=${if stdenv.hostPlatform.isi686 then "32" else "64"} runHook postBuild ''; diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index 682158af76ca7..b55d5227b0d19 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { ''; }; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; buildFeatures = lib.optional withCmd "cmd"; @@ -62,6 +62,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ bmanuel linj ]; platforms = platforms.unix; mainProgram = "kanata"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/system/lact/default.nix b/pkgs/tools/system/lact/default.nix index c8b00995dc5b0..ed6a4db40ffa2 100644 --- a/pkgs/tools/system/lact/default.nix +++ b/pkgs/tools/system/lact/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "lact"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "ilya-zlobintsev"; repo = "LACT"; rev = "v${version}"; - hash = "sha256-ehJYUZ4Bdttqzs3/SSvhJRzPO7CPbeP8ormXQ7NUzXI="; + hash = "sha256-iz6Pl+A7Y/Ljot3QH2GaopgtfuYLpTLSq6uSprQ2EEU="; }; - cargoHash = "sha256-jG1DfFwpmSSVMu3zKpxg25uTrELcD43bkGbcZI2NOzk="; + cargoHash = "sha256-uoMkz+0Jr07GpMRUKuJvrTTSAGdhLf35q/8but1fwIk="; nativeBuildInputs = [ blueprint-compiler diff --git a/pkgs/tools/system/mediawriter/default.nix b/pkgs/tools/system/mediawriter/default.nix index e2ff1f610782b..cc6cf69f56835 100644 --- a/pkgs/tools/system/mediawriter/default.nix +++ b/pkgs/tools/system/mediawriter/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "mediawriter"; - version = "5.1.2"; + version = "5.1.3"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "MediaWriter"; rev = "refs/tags/${version}"; - hash = "sha256-KyABM3XIHvd9kT7aayYivGw6kjLf55Gpkk041BQ4yw0="; + hash = "sha256-w32Ps+GrbMq4Wot6vWyZS03Tv2rfTDnFLS7VwrcJLcc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/tools/system/mlc/default.nix index 409738e4a353a..524db47d8e3d1 100644 --- a/pkgs/tools/system/mlc/default.nix +++ b/pkgs/tools/system/mlc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://downloadmirror.intel.com/736634/mlc_v${version}.tgz"; - sha256 = "3vNI/CQwyY4KMFest1wkVYecsxigjXyGIUIKai979W4="; + sha256 = "EDa5V56qCPQxgCu4eddYiWDrk7vkYS0jisnG004L+jQ="; }; sourceRoot = "Linux"; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 214fed86329fc..b8746229d81e8 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,36 +1,71 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper -, CoreFoundation, IOKit, libossp_uuid -, nixosTests -, bash, curl, jemalloc, json_c, libuv, zlib, libyaml, libelf, libbpf -, libcap, libuuid, lm_sensors, protobuf -, go, buildGoModule, ninja -, withCups ? false, cups -, withDBengine ? true, lz4 -, withIpmi ? (!stdenv.isDarwin), freeipmi -, withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct -, withCloud ? false -, withCloudUi ? false -, withConnPubSub ? false, google-cloud-cpp, grpc -, withConnPrometheus ? false, snappy -, withSsl ? true, openssl -, withSystemdJournal ? (!stdenv.isDarwin), systemd -, withDebug ? false -, withEbpf ? false -, withNetworkViewer ? (!stdenv.isDarwin) +{ + lib, + stdenv, + fetchFromGitHub, + bash, + buildGoModule, + cmake, + cups, + curl, + darwin, + freeipmi, + go, + google-cloud-cpp, + grpc, + jemalloc, + json_c, + libbpf, + libcap, + libelf, + libmnl, + libnetfilter_acct, + libossp_uuid, + libuuid, + libuv, + libyaml, + lm_sensors, + lz4, + makeWrapper, + ninja, + nixosTests, + openssl, + overrideSDK, + pkg-config, + protobuf, + snappy, + systemd, + withCloud ? false, + withCloudUi ? false, + withConnPrometheus ? false, + withConnPubSub ? false, + withCups ? false, + withDBengine ? true, + withDebug ? false, + withEbpf ? false, + withIpmi ? (stdenv.hostPlatform.isLinux), + withNetfilter ? (stdenv.hostPlatform.isLinux), + withNetworkViewer ? (stdenv.hostPlatform.isLinux), + withSsl ? true, + withSystemdJournal ? (stdenv.hostPlatform.isLinux), + zlib, }: - -stdenv.mkDerivation rec { - version = "1.46.1"; +let + stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { + version = "1.47.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; - rev = "v${version}"; - hash = if withCloudUi - then "sha256-tFjczhJ7bIEUDZx3MxYBu4tGkJhoQn5V79D4sLV2o8U=" + rev = "v${finalAttrs.version}"; + hash = + if withCloudUi then + "sha256-/iXmIjWpZ0s/LELZM7rYYQ9cjLNdfdisyOvDyLddSY4=" # we delete the v2 GUI after fetching - else "sha256-uW3jRiJjFIFSfmmavM3KVF985F8nMKa+lQAgNBZvKyE="; + else + "sha256-pAqxxsWYgqbmF6wFBfTCYYc3x/Ufyz2Xs4bwB1ToHjo="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty @@ -43,19 +78,53 @@ stdenv.mkDerivation rec { strictDeps = true; - nativeBuildInputs = [ cmake pkg-config makeWrapper go ninja ] - ++ lib.optionals withCups [ cups.dev ]; + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + go + ninja + ] ++ lib.optionals withCups [ cups.dev ]; # bash is only used to rewrite shebangs - buildInputs = [ bash curl jemalloc json_c libuv zlib libyaml ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] - ++ lib.optionals (!stdenv.isDarwin) [ libcap libuuid ] + buildInputs = + [ + bash + curl + jemalloc + json_c + libuv + zlib + libyaml + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreFoundation + IOKit + libossp_uuid + ] + ) + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ + libcap + libuuid + lm_sensors + ] ++ lib.optionals withCups [ cups ] ++ lib.optionals withDBengine [ lz4 ] ++ lib.optionals withIpmi [ freeipmi ] - ++ lib.optionals withNetfilter [ libmnl libnetfilter_acct ] - ++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ] + ++ lib.optionals withNetfilter [ + libmnl + libnetfilter_acct + ] + ++ lib.optionals withConnPubSub [ + google-cloud-cpp + grpc + ] ++ lib.optionals withConnPrometheus [ snappy ] - ++ lib.optionals withEbpf [ libelf libbpf ] + ++ lib.optionals withEbpf [ + libelf + libbpf + ] ++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ] ++ lib.optionals withSystemdJournal [ systemd ] ++ lib.optionals withSsl [ openssl ]; @@ -69,7 +138,7 @@ stdenv.mkDerivation rec { ./dashboard-v2-removal.patch ]; - # Guard against unused buld-time development inputs in closure. Without + # Guard against unused build-time development inputs in closure. Without # the ./skip-CONFIGURE_COMMAND.patch patch the closure retains inputs up # to bootstrap tools: # https://github.com/NixOS/nixpkgs/pull/175719 @@ -79,66 +148,67 @@ stdenv.mkDerivation rec { donStrip = withDebug; env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; - postInstall = '' - # Relocate one folder above. - mv $out/usr/* $out/ - '' + lib.optionalString (!stdenv.isDarwin) '' - # rename this plugin so netdata will look for setuid wrapper - mv $out/libexec/netdata/plugins.d/apps.plugin \ - $out/libexec/netdata/plugins.d/apps.plugin.org - mv $out/libexec/netdata/plugins.d/cgroup-network \ - $out/libexec/netdata/plugins.d/cgroup-network.org - mv $out/libexec/netdata/plugins.d/perf.plugin \ - $out/libexec/netdata/plugins.d/perf.plugin.org - mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ - $out/libexec/netdata/plugins.d/slabinfo.plugin.org - mv $out/libexec/netdata/plugins.d/debugfs.plugin \ - $out/libexec/netdata/plugins.d/debugfs.plugin.org - mv $out/libexec/netdata/plugins.d/logs-management.plugin \ - $out/libexec/netdata/plugins.d/logs-management.plugin.org - ${lib.optionalString withSystemdJournal '' - mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ - $out/libexec/netdata/plugins.d/systemd-journal.plugin.org - ''} - ${lib.optionalString withIpmi '' - mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ - $out/libexec/netdata/plugins.d/freeipmi.plugin.org - ''} - ${lib.optionalString withNetworkViewer '' - mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ - $out/libexec/netdata/plugins.d/network-viewer.plugin.org - ''} - ${lib.optionalString (!withCloudUi) '' - rm -rf $out/share/netdata/web/index.html - cp $out/share/netdata/web/v1/index.html $out/share/netdata/web/index.html - ''} - ''; + postInstall = + '' + # Relocate one folder above. + mv $out/usr/* $out/ + '' + + lib.optionalString (stdenv.hostPlatform.isLinux) '' + # rename this plugin so netdata will look for setuid wrapper + mv $out/libexec/netdata/plugins.d/apps.plugin \ + $out/libexec/netdata/plugins.d/apps.plugin.org + mv $out/libexec/netdata/plugins.d/cgroup-network \ + $out/libexec/netdata/plugins.d/cgroup-network.org + mv $out/libexec/netdata/plugins.d/perf.plugin \ + $out/libexec/netdata/plugins.d/perf.plugin.org + mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ + $out/libexec/netdata/plugins.d/slabinfo.plugin.org + mv $out/libexec/netdata/plugins.d/debugfs.plugin \ + $out/libexec/netdata/plugins.d/debugfs.plugin.org + ${lib.optionalString withSystemdJournal '' + mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ + $out/libexec/netdata/plugins.d/systemd-journal.plugin.org + ''} + ${lib.optionalString withIpmi '' + mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ + $out/libexec/netdata/plugins.d/freeipmi.plugin.org + ''} + ${lib.optionalString withNetworkViewer '' + mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ + $out/libexec/netdata/plugins.d/network-viewer.plugin.org + ''} + ${lib.optionalString (!withCloudUi) '' + rm -rf $out/share/netdata/web/index.html + cp $out/share/netdata/web/v1/index.html $out/share/netdata/web/index.html + ''} + ''; - preConfigure = lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace src/collectors/python.d.plugin/python_modules/third_party/lm_sensors.py \ - --replace-fail 'ctypes.util.find_library("sensors")' '"${lm_sensors.out}/lib/libsensors${stdenv.hostPlatform.extensions.sharedLibrary}"' - '' + '' + preConfigure = '' export GOCACHE=$TMPDIR/go-cache export GOPATH=$TMPDIR/go - export GOPROXY=file://${passthru.netdata-go-modules} export GOSUMDB=off + substituteInPlace packaging/cmake/Modules/NetdataGoTools.cmake \ + --replace-fail \ + 'GOPROXY=https://proxy.golang.org' \ + 'GOPROXY=file://${finalAttrs.passthru.netdata-go-modules}' + # Prevent the path to be caught into the Nix store path. substituteInPlace CMakeLists.txt \ - --replace-fail 'set(CACHE_DIR "''${CMAKE_INSTALL_PREFIX}/var/cache/netdata")' 'set(CACHE_DIR "/var/cache/netdata")' \ - --replace-fail 'set(CONFIG_DIR "''${CMAKE_INSTALL_PREFIX}/etc/netdata")' 'set(CONFIG_DIR "/etc/netdata")' \ - --replace-fail 'set(LIBCONFIG_DIR "''${CMAKE_INSTALL_PREFIX}/usr/lib/netdata/conf.d")' 'set(LIBCONFIG_DIR "${placeholder "out"}/share/netdata/conf.d")' \ - --replace-fail 'set(LOG_DIR "''${CMAKE_INSTALL_PREFIX}/var/log/netdata")' 'set(LOG_DIR "/var/log/netdata")' \ - --replace-fail 'set(PLUGINS_DIR "''${CMAKE_INSTALL_PREFIX}/usr/libexec/netdata/plugins.d")' 'set(PLUGINS_DIR "${placeholder "out"}/libexec/netdata/plugins.d")' \ - --replace-fail 'set(VARLIB_DIR "''${CMAKE_INSTALL_PREFIX}/var/lib/netdata")' 'set(VARLIB_DIR "/var/lib/netdata")' \ - --replace-fail 'set(pkglibexecdir_POST "''${CMAKE_INSTALL_PREFIX}/usr/libexec/netdata")' 'set(pkglibexecdir_POST "${placeholder "out"}/libexec/netdata")' \ - --replace-fail 'set(localstatedir_POST "''${CMAKE_INSTALL_PREFIX}/var")' 'set(localstatedir_POST "/var")' \ - --replace-fail 'set(sbindir_POST "''${CMAKE_INSTALL_PREFIX}/usr/sbin")' 'set(sbindir_POST "${placeholder "out"}/bin")' \ - --replace-fail 'set(configdir_POST "''${CMAKE_INSTALL_PREFIX}/etc/netdata")' 'set(configdir_POST "/etc/netdata")' \ - --replace-fail 'set(libconfigdir_POST "''${CMAKE_INSTALL_PREFIX}/usr/lib/netdata/conf.d")' 'set(libconfigdir_POST "${placeholder "out"}/share/netdata/conf.d")' \ - --replace-fail 'set(cachedir_POST "''${CMAKE_INSTALL_PREFIX}/var/cache/netdata")' 'set(libconfigdir_POST "/var/cache/netdata")' \ - --replace-fail 'set(registrydir_POST "''${CMAKE_INSTALL_PREFIX}/var/lib/netdata/registry")' 'set(registrydir_POST "/var/lib/netdata/registry")' \ - --replace-fail 'set(varlibdir_POST "''${CMAKE_INSTALL_PREFIX}/var/lib/netdata")' 'set(varlibdir_POST "/var/lib/netdata")' + --replace-fail 'set(CACHE_DIR "''${NETDATA_RUNTIME_PREFIX}/var/cache/netdata")' 'set(CACHE_DIR "/var/cache/netdata")' \ + --replace-fail 'set(CONFIG_DIR "''${NETDATA_RUNTIME_PREFIX}/etc/netdata")' 'set(CONFIG_DIR "/etc/netdata")' \ + --replace-fail 'set(LIBCONFIG_DIR "''${NETDATA_RUNTIME_PREFIX}/usr/lib/netdata/conf.d")' 'set(LIBCONFIG_DIR "${placeholder "out"}/share/netdata/conf.d")' \ + --replace-fail 'set(LOG_DIR "''${NETDATA_RUNTIME_PREFIX}/var/log/netdata")' 'set(LOG_DIR "/var/log/netdata")' \ + --replace-fail 'set(PLUGINS_DIR "''${NETDATA_RUNTIME_PREFIX}/usr/libexec/netdata/plugins.d")' 'set(PLUGINS_DIR "${placeholder "out"}/libexec/netdata/plugins.d")' \ + --replace-fail 'set(VARLIB_DIR "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata")' 'set(VARLIB_DIR "/var/lib/netdata")' \ + --replace-fail 'set(pkglibexecdir_POST "''${NETDATA_RUNTIME_PREFIX}/usr/libexec/netdata")' 'set(pkglibexecdir_POST "${placeholder "out"}/libexec/netdata")' \ + --replace-fail 'set(localstatedir_POST "''${NETDATA_RUNTIME_PREFIX}/var")' 'set(localstatedir_POST "/var")' \ + --replace-fail 'set(sbindir_POST "''${NETDATA_RUNTIME_PREFIX}/''${BINDIR}")' 'set(sbindir_POST "${placeholder "out"}/bin")' \ + --replace-fail 'set(configdir_POST "''${NETDATA_RUNTIME_PREFIX}/etc/netdata")' 'set(configdir_POST "/etc/netdata")' \ + --replace-fail 'set(libconfigdir_POST "''${NETDATA_RUNTIME_PREFIX}/usr/lib/netdata/conf.d")' 'set(libconfigdir_POST "${placeholder "out"}/share/netdata/conf.d")' \ + --replace-fail 'set(cachedir_POST "''${NETDATA_RUNTIME_PREFIX}/var/cache/netdata")' 'set(libconfigdir_POST "/var/cache/netdata")' \ + --replace-fail 'set(registrydir_POST "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata/registry")' 'set(registrydir_POST "/var/lib/netdata/registry")' \ + --replace-fail 'set(varlibdir_POST "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata")' 'set(varlibdir_POST "/var/lib/netdata")' ''; cmakeFlags = [ @@ -175,37 +245,41 @@ stdenv.mkDerivation rec { enableParallelBuild = true; passthru = rec { - netdata-go-modules = (buildGoModule { - pname = "netdata-go-plugins"; - inherit version src; + netdata-go-modules = + (buildGoModule { + pname = "netdata-go-plugins"; + inherit (finalAttrs) version src; - sourceRoot = "${src.name}/src/go/collectors/go.d.plugin"; + sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d"; - vendorHash = "sha256-fK6pboXgJom77iakb+CJvNuweQjLIrpS7suWRNY/KM4="; - doCheck = false; - proxyVendor = true; + vendorHash = "sha256-NZ1tg+lvXNgypqmjjb5f7dHH6DIA9VOa4PMM4eq11n0="; + doCheck = false; + proxyVendor = true; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" + ]; - passthru.tests = tests; - meta = meta // { - description = "Netdata orchestrator for data collection modules written in Go"; - mainProgram = "godplugin"; - license = lib.licenses.gpl3Only; - }; - }).goModules; + passthru.tests = tests; + meta = finalAttrs.meta // { + description = "Netdata orchestrator for data collection modules written in Go"; + mainProgram = "godplugin"; + license = lib.licenses.gpl3Only; + }; + }).goModules; inherit withIpmi withNetworkViewer; tests.netdata = nixosTests.netdata; }; meta = with lib; { - broken = stdenv.isDarwin || stdenv.buildPlatform != stdenv.hostPlatform || withEbpf; + broken = stdenv.buildPlatform != stdenv.hostPlatform || withEbpf; description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; changelog = "https://github.com/netdata/netdata/releases/tag/v${version}"; - license = [ licenses.gpl3Plus ] - ++ lib.optionals (withCloudUi) [ licenses.ncul1 ]; + license = [ licenses.gpl3Plus ] ++ lib.optionals (withCloudUi) [ licenses.ncul1 ]; platforms = platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/tools/system/netdata/ndsudo-fix-path.patch b/pkgs/tools/system/netdata/ndsudo-fix-path.patch index 04087e54a00ab..0ec9a63231f0c 100644 --- a/pkgs/tools/system/netdata/ndsudo-fix-path.patch +++ b/pkgs/tools/system/netdata/ndsudo-fix-path.patch @@ -2,7 +2,7 @@ # https://github.com/netdata/netdata/security/advisories/GHSA-pmhq-4cxq-wj93 diff --git a/src/collectors/plugins.d/ndsudo.c b/src/collectors/plugins.d/ndsudo.c -index 8b4d76f46..68fa52d38 100644 +index d53ca9f28..b42a121bf 100644 --- a/src/collectors/plugins.d/ndsudo.c +++ b/src/collectors/plugins.d/ndsudo.c @@ -357,9 +357,6 @@ int main(int argc, char *argv[]) { @@ -12,5 +12,6 @@ index 8b4d76f46..68fa52d38 100644 - char new_path[] = "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"; - putenv(new_path); - - bool found = false; - char filename[FILENAME_MAX]; \ No newline at end of file + setuid(0); + setgid(0); + setegid(0); diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix index 4930484accb58..deefe7056929c 100644 --- a/pkgs/tools/system/nsc/default.nix +++ b/pkgs/tools/system/nsc/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.8.7"; + version = "2.9.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-uJR4AdXGSL3vKUABpBBteND7EUocKz+mLRqt5XPdREk="; + hash = "sha256-pzUjcezzZ3Fo9b7nuPV08ZSxrk7cBufQL6Dbfvmjkg4="; }; ldflags = [ @@ -23,32 +23,34 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; - vendorHash = "sha256-+XSG5vDEGUYlORF9a15QnE2pueU8GN+UF7w7EtRArG8="; + vendorHash = "sha256-tZTrjIax3zofrRuSJQO7VA7rlTXN/GT1KTcsLpvB+2Q="; nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd nsc \ --bash <($out/bin/nsc completion bash) \ --fish <($out/bin/nsc completion fish) \ --zsh <($out/bin/nsc completion zsh) ''; - preCheck = '' - # Tests attempt to write to the home directory. + preInstall = '' + # asc attempt to write to the home directory. export HOME=$(mktemp -d) ''; + preCheck = preInstall; + # Tests currently fail on darwin because of a test in nsc which # expects command output to contain a specific path. However # the test strips table formatting from the command output in a naive way # that removes all the table characters, including '-'. # The nix build directory looks something like: - # /private/tmp/nix-build-nsc-2.8.7.drv-0/nsc_test2000598938/keys + # /private/tmp/nix-build-nsc-2.9.0.drv-0/nsc_test2000598938/keys # Then the `-` are removed from the path unintentionally and the test fails. # This should be fixed upstream to avoid mangling the path when # removing the table decorations from the command output. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Tool for creating NATS account and user access configurations"; diff --git a/pkgs/tools/system/openseachest/default.nix b/pkgs/tools/system/openseachest/default.nix index d729f0a3e797d..d71a32103e020 100644 --- a/pkgs/tools/system/openseachest/default.nix +++ b/pkgs/tools/system/openseachest/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "openseachest"; - version = "23.12"; + version = "24.08.1"; src = fetchFromGitHub { owner = "Seagate"; repo = "openSeaChest"; rev = "v${version}"; - hash = "sha256-2snxruIC/93+yI7g/9cCXcms8FaoXnoyWq9py8GTwrs="; + hash = "sha256-1vfWX6uTQcM6K6wu9Ygu2xZV4nXm6VnwNHmQ2ceh62s="; fetchSubmodules = true; }; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 56e1912324523..6d1e778da376c 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ ed ]; - buildInputs = [ perl which ] ++ (if !stdenv.isDarwin then [ + buildInputs = [ perl which ] ++ (if !stdenv.hostPlatform.isDarwin then [ fontconfig freetype # fontsrv uses these libX11 libXext libXt xorgproto ] else [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { CC9='$(command -v $CC)' CFLAGS='$NIX_CFLAGS_COMPILE' LDFLAGS='$(for f in $NIX_LDFLAGS; do echo "-Wl,$f"; done | xargs echo)' - ${lib.optionalString (!stdenv.isDarwin) "X11='${libXt.dev}/include'"} + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "X11='${libXt.dev}/include'"} EOF # make '9' available in the path so there's some way to find out $PLAN9 diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix deleted file mode 100644 index 3d0fa0d62ac27..0000000000000 --- a/pkgs/tools/system/psensor/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, lm_sensors -, libgtop -, libatasmart -, gtk3 -, libnotify -, udisks2 -, libXNVCtrl -, wrapGAppsHook3 -, libappindicator -}: - -stdenv.mkDerivation rec { - pname = "psensor"; - - version = "1.2.1"; - - src = fetchurl { - url = "https://wpitchoune.net/psensor/files/psensor-${version}.tar.gz"; - sha256 = "1ark901va79gfq5p8h8dqypjgm3f8crmj37520q3slwz2rfphkq8"; - }; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - - buildInputs = [ - lm_sensors - libgtop - libatasmart - gtk3 - libnotify - udisks2 - libappindicator - ]; - - preConfigure = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXNVCtrl}/include -Wno-error" - NIX_LDFLAGS="$NIX_LDFLAGS -L${libXNVCtrl}/lib" - ''; - - meta = with lib; { - description = "Graphical hardware monitoring application for Linux"; - homepage = "https://wpitchoune.net/psensor/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ ]; - mainProgram = "psensor"; - }; -} diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index c19f7a54f0dd1..0287a3d3a5fb7 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-Wno-error=format"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-Wno-error=format"; buildPhase = "sh -e make.sh"; diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 2553c07cd6b5c..10333d0f60353 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; buildInputs = lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++ - lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; + lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp; postPatch = '' sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # Both of these are originally hard-coded to gcc echo ${stdenv.cc.targetPrefix}cc > conf-cc - echo ${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.isDarwin "-Xlinker -x "}> conf-ld + echo ${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.hostPlatform.isDarwin "-Xlinker -x "}> conf-ld ''; installPhase = '' diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 15bedadccef05..c153b3033f86d 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonPackage rec { description = "Stress-Terminal UI monitoring tool"; license = licenses.gpl2Plus; maintainers = [ ]; - broken = stdenv.isDarwin; # https://github.com/amanusk/s-tui/issues/49 + broken = stdenv.hostPlatform.isDarwin; # https://github.com/amanusk/s-tui/issues/49 mainProgram = "s-tui"; }; } diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 55ec05d2a9a77..b8c594dde4701 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,13 +1,15 @@ -{ lib -, stdenv -, fetchurl -, autoreconfHook -, enableMail ? false -, gnused -, hostname -, mailutils -, IOKit -, ApplicationServices +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + enableMail ? false, + gnused, + hostname, + mailutils, + systemdLibs, + IOKit, + ApplicationServices, }: let @@ -18,7 +20,13 @@ let sha256 = "sha256-0dtLev4JjeHsS259+qOgg19rz4yjkeX4D3ooUgS4RTI="; name = "smartmontools-drivedb.h"; }; - scriptPath = lib.makeBinPath ([ gnused hostname ] ++ lib.optionals enableMail [ mailutils ]); + scriptPath = lib.makeBinPath ( + [ + gnused + hostname + ] + ++ lib.optionals enableMail [ mailutils ] + ); in stdenv.mkDerivation rec { @@ -45,7 +53,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ]; + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ systemdLibs ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + IOKit + ApplicationServices + ]; enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 371db31c21a17..c189606cd0071 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.18.02"; + version = "0.18.04"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-iyAW/vqo+V39kVygLRESI4D9yrTsC3DETrl3dmiGBdM="; + hash = "sha256-h7VBd3KFpDiIj84tWqXFIaDYzRkM8EaolOfdnycmHIA="; }; postPatch = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # install phase without checking the dependencies. This will prevent # triggering the rebuild. Why this only happens on i686 remains a # mystery, though. :-( - enableParallelBuilding = (!stdenv.isi686); + enableParallelBuilding = (!stdenv.hostPlatform.isi686); meta = with lib; { description = "Stress test a computer system"; diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index e4d24802a54f3..8761576d19b00 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -7,8 +7,8 @@ , libjpeg , zlib , libewf -, enableNtfs ? !stdenv.isDarwin, ntfs3g ? null -, enableExtFs ? !stdenv.isDarwin, e2fsprogs ? null +, enableNtfs ? !stdenv.hostPlatform.isDarwin, ntfs3g ? null +, enableExtFs ? !stdenv.hostPlatform.isDarwin, e2fsprogs ? null , enableQt ? false, qtbase ? null, qttools ? null, qwt ? null }: diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 069723b7bdb30..fbd0f08d110a5 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -4,14 +4,14 @@ let # These settings are found in the Makefile, but there seems to be no # way to select one or the other setting other than editing the file # manually, so we have to duplicate the know how here. - systemFlags = lib.optionalString stdenv.isDarwin '' + systemFlags = lib.optionalString stdenv.hostPlatform.isDarwin '' CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp" LDFLAGS= - '' + lib.optionalString stdenv.isCygwin '' + '' + lib.optionalString stdenv.hostPlatform.isCygwin '' CFLAGS="-O2 -Wall -fomit-frame-pointer" LDFLAGS=-s TREE_DEST=tree.exe - '' + lib.optionalString (stdenv.isFreeBSD || stdenv.isOpenBSD) '' + '' + lib.optionalString (stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isOpenBSD) '' CFLAGS="-O2 -Wall -fomit-frame-pointer" LDFLAGS=-s ''; # use linux flags by default diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 4af272ccb49dc..ffb530600bd39 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -7,7 +7,7 @@ , makeWrapper }: -assert nvidiaSupport -> stdenv.isLinux; +assert nvidiaSupport -> stdenv.hostPlatform.isLinux; rustPlatform.buildRustPackage rec { pname = "zenith"; @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ rustPlatform.bindgenHook ] ++ lib.optional nvidiaSupport makeWrapper; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; buildFeatures = lib.optional nvidiaSupport "nvidia"; diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix index 37021481d105c..152fef3acc976 100644 --- a/pkgs/tools/system/zx/default.nix +++ b/pkgs/tools/system/zx/default.nix @@ -3,20 +3,24 @@ buildNpmPackage, fetchFromGitHub, nix-update-script, + versionCheckHook, }: buildNpmPackage rec { pname = "zx"; - version = "8.1.5"; + version = "8.1.8"; src = fetchFromGitHub { owner = "google"; repo = "zx"; rev = version; - hash = "sha256-CeFUALi5MXQqd/LwSsyi6sBTFJpZGfCCMuD7Moyk9hM="; + hash = "sha256-d/U37QWC6e41P9GuohpWjP0MNZCzHbxFMBBASpIKpQk="; }; - npmDepsHash = "sha256-yhy2bTXeBYxGaLYb2by+7Y5DfKJ04hroYiOIvwcBojY="; + npmDepsHash = "sha256-2v8pGIB5W2jgjsJPKBjymAv2rzq9judVdYZexohAclo="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 2344602a276c1..9a545a7f3f31b 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code. ''; homepage = "https://github.com/theZiz/aha"; + changelog = "https://github.com/theZiz/aha/blob/${version}/CHANGELOG"; license = with licenses; [ lgpl2Plus mpl11 ]; maintainers = with maintainers; [ pSub ]; platforms = platforms.all; diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 0b81281fad1ad..ce8243770b04a 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-nBSgP30Izskq9RbhVIyqWzZgG5ZWHVdiukldw+Q0rco="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; meta = with lib; { description = "Code search-and-replace tool"; diff --git a/pkgs/tools/text/autocorrect/Cargo.lock b/pkgs/tools/text/autocorrect/Cargo.lock index 5e272adb048d7..07a2ac13a9322 100644 --- a/pkgs/tools/text/autocorrect/Cargo.lock +++ b/pkgs/tools/text/autocorrect/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -34,61 +34,84 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", ] +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.67", +] + +[[package]] +name = "auto_impl" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.67", +] + [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "autocorrect" -version = "2.9.0" +version = "2.11.1" dependencies = [ "autocorrect-derive 0.3.0", "criterion", @@ -109,9 +132,9 @@ dependencies = [ [[package]] name = "autocorrect" -version = "2.9.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b426e7dbc9997d772eeb5436cbb85e95136fdf7835a8f05085b811e5482ebd49" +checksum = "9b34aec492eb0959a3ba75da869455ce2a91eb0f310b44018add14d7b72845ad" dependencies = [ "autocorrect-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "diff", @@ -129,12 +152,12 @@ dependencies = [ [[package]] name = "autocorrect-cli" -version = "2.9.0" +version = "2.11.1" dependencies = [ - "autocorrect 2.9.0", + "autocorrect 2.11.1", + "autocorrect-lsp", "clap", "ignore", - "lazy_static", "log", "num_cpus", "owo-colors", @@ -143,7 +166,6 @@ dependencies = [ "sudo", "threadpool", "tokio", - "walkdir", ] [[package]] @@ -166,17 +188,26 @@ dependencies = [ [[package]] name = "autocorrect-java" -version = "2.9.0" +version = "2.11.1" dependencies = [ - "autocorrect 2.9.0", + "autocorrect 2.11.1", "jni", ] +[[package]] +name = "autocorrect-lsp" +version = "2.9.4" +dependencies = [ + "autocorrect 2.11.1", + "tokio", + "tower-lsp", +] + [[package]] name = "autocorrect-node" -version = "2.9.0" +version = "2.11.1" dependencies = [ - "autocorrect 2.9.0", + "autocorrect 2.11.1", "autocorrect-cli", "napi", "napi-build", @@ -185,35 +216,34 @@ dependencies = [ [[package]] name = "autocorrect-py" -version = "2.9.0" +version = "2.11.1" dependencies = [ - "autocorrect 2.9.0", + "autocorrect 2.11.1", "pyo3", ] [[package]] name = "autocorrect-rb" -version = "2.9.0" +version = "2.11.1" dependencies = [ - "autocorrect 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "autocorrect 2.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "magnus", ] [[package]] name = "autocorrect-wasm" -version = "2.9.0" +version = "2.11.1" dependencies = [ - "autocorrect 2.9.0", - "serde", + "autocorrect 2.11.1", "serde_json", "wasm-bindgen", ] [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -226,28 +256,28 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bindgen" -version = "0.69.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.40", + "syn 2.0.67", ] [[package]] @@ -258,9 +288,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block-buffer" @@ -273,9 +303,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "serde", @@ -283,15 +313,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cast" @@ -301,12 +331,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" [[package]] name = "cesu8" @@ -331,9 +358,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -342,15 +369,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -358,20 +385,20 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading", ] [[package]] name = "clap" -version = "4.4.11" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -379,9 +406,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -391,33 +418,33 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.67", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -425,14 +452,14 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -462,18 +489,18 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -490,7 +517,7 @@ dependencies = [ "clap", "criterion-plot", "is-terminal", - "itertools", + "itertools 0.10.5", "num-traits", "once_cell", "oorandom", @@ -511,41 +538,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" @@ -559,12 +584,25 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.40", + "syn 2.0.67", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] @@ -585,9 +623,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encode_unicode" @@ -597,9 +635,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -612,9 +650,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -622,9 +660,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "filetime" @@ -634,15 +672,15 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "windows-sys 0.52.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -663,47 +701,76 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", + "futures-sink", ] [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.67", +] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ + "futures-channel", "futures-core", "futures-io", + "futures-macro", + "futures-sink", "futures-task", "memchr", "pin-project-lite", @@ -723,9 +790,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -734,9 +801,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -759,9 +826,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -778,33 +845,37 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -824,9 +895,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -836,9 +907,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -851,7 +922,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -884,9 +955,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ "crossbeam-deque", "globset", @@ -900,9 +971,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -934,15 +1005,21 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", - "windows-sys 0.48.0", + "libc", + "windows-sys 0.52.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -952,11 +1029,20 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -980,18 +1066,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -1001,41 +1087,31 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.5", ] [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1043,37 +1119,51 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lsp-types" +version = "0.94.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" +dependencies = [ + "bitflags 1.3.2", + "serde", + "serde_json", + "serde_repr", + "url", +] [[package]] name = "magnus" -version = "0.4.4" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc87660cd7daa49fddbfd524c836de54d5c927d520cd163f43700c5087c57d6c" +checksum = "b1597ef40aa8c36be098249e82c9a20cf7199278ac1c1a1a995eeead6a184479" dependencies = [ "magnus-macros", "rb-sys", "rb-sys-env", + "seq-macro", ] [[package]] name = "magnus-macros" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206cb23bfeea05180c97522ef6a3e52a4eb17b0ed2f30ee3ca9c4f994d2378ae" +checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.67", ] [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1084,15 +1174,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "mime" version = "0.3.17" @@ -1107,18 +1188,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -1127,11 +1208,11 @@ dependencies = [ [[package]] name = "napi" -version = "2.14.1" +version = "2.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1133249c46e92da921bafc8aba4912bf84d6c475f7625183772ed2d0844dc3a7" +checksum = "dfc300228808a0e6aea5a58115c82889240bcf8dab16fc25ad675b33e454b368" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "ctor", "napi-derive", "napi-sys", @@ -1141,29 +1222,29 @@ dependencies = [ [[package]] name = "napi-build" -version = "2.1.0" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b4532cf86bfef556348ac65e561e3123879f0e7566cca6d43a6ff5326f13df" +checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a" [[package]] name = "napi-derive" -version = "2.14.3" +version = "2.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0c0743f6a3f29c20851b8377f01d485a837e2bfa57dd56d519ab7ed98ae2af" +checksum = "e0e034ddf6155192cf83f267ede763fe6c164dfa9971585436b16173718d94c4" dependencies = [ "cfg-if", "convert_case", "napi-derive-backend", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.67", ] [[package]] name = "napi-derive-backend" -version = "1.0.56" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4869e4d80615fdab57dffe38c36a5bc62fae37352a00a35ee7aca1cea41b1bb3" +checksum = "bff2c00437f3b3266391eb5e6aa25d0029187daf5caf05b8e3271468fb5ae73e" dependencies = [ "convert_case", "once_cell", @@ -1171,16 +1252,16 @@ dependencies = [ "quote", "regex", "semver", - "syn 1.0.109", + "syn 2.0.67", ] [[package]] name = "napi-sys" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" +checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3" dependencies = [ - "libloading 0.8.1", + "libloading", ] [[package]] @@ -1195,9 +1276,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1220,9 +1301,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -1247,9 +1328,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1257,23 +1338,17 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "percent-encoding" version = "2.3.1" @@ -1282,9 +1357,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -1293,9 +1368,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -1303,33 +1378,53 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.67", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", "sha2", ] +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.67", +] + [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1339,9 +1434,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "plotters" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" dependencies = [ "num-traits", "plotters-backend", @@ -1352,15 +1447,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" [[package]] name = "plotters-svg" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" dependencies = [ "plotters-backend", ] @@ -1377,9 +1472,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1393,7 +1488,7 @@ dependencies = [ "cfg-if", "indoc", "libc", - "memoffset 0.6.5", + "memoffset", "parking_lot", "pyo3-build-config", "pyo3-ffi", @@ -1455,18 +1550,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -1474,9 +1569,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -1484,18 +1579,18 @@ dependencies = [ [[package]] name = "rb-sys" -version = "0.9.83" +version = "0.9.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5b8d560b60790a3e60e56e73a8c7be88ac14e6af39fc82b5eca72c71753840" +checksum = "47d30bcad206b51f2f66121190ca678dce1fdf3a2eae0ac5d838d1818b19bdf5" dependencies = [ "rb-sys-build", ] [[package]] name = "rb-sys-build" -version = "0.9.83" +version = "0.9.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d2bfd00002007d7e9ad93d0397437933040caf452d260c26dbef5fd95ae1a6" +checksum = "3cbd92f281615f3c2dcb9dcb0f0576624752afbf9a7f99173b37c4b55b62dd8a" dependencies = [ "bindgen", "lazy_static", @@ -1503,7 +1598,7 @@ dependencies = [ "quote", "regex", "shell-words", - "syn 2.0.40", + "syn 2.0.67", ] [[package]] @@ -1521,11 +1616,20 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "regex" -version = "1.10.2" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -1535,9 +1639,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -1546,15 +1650,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64", "bytes", @@ -1578,6 +1682,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-rustls", @@ -1592,23 +1697,24 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -1618,11 +1724,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -1631,9 +1737,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", @@ -1662,9 +1768,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -1713,35 +1819,41 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "seq-macro" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.67", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -1750,13 +1862,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.67", ] [[package]] @@ -1773,9 +1885,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.27" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ "indexmap", "itoa", @@ -1803,9 +1915,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "slab" @@ -1818,28 +1930,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1850,9 +1952,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "sudo" @@ -1877,15 +1979,21 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.40" +version = "2.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e" +checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "system-configuration" version = "0.5.1" @@ -1909,9 +2017,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -1920,41 +2028,40 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.67", ] [[package]] @@ -1993,9 +2100,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -2003,20 +2110,20 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.67", ] [[package]] @@ -2031,18 +2138,71 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-lsp" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508" +dependencies = [ + "async-trait", + "auto_impl", + "bytes", + "dashmap", + "futures", + "httparse", + "lsp-types", + "memchr", + "serde", + "serde_json", + "tokio", + "tokio-util", + "tower", + "tower-lsp-macros", "tracing", ] +[[package]] +name = "tower-lsp-macros" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.67", +] + [[package]] name = "tower-service" version = "0.3.2" @@ -2056,9 +2216,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "pin-project-lite", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.67", +] + [[package]] name = "tracing-core" version = "0.1.32" @@ -2088,9 +2260,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -2100,18 +2272,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unindent" @@ -2121,9 +2293,9 @@ checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -2133,20 +2305,21 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "version_check" @@ -2156,9 +2329,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -2181,9 +2354,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "serde", @@ -2193,24 +2366,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.67", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -2220,9 +2393,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2230,28 +2403,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.67", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -2259,48 +2432,17 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[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" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", -] - -[[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.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", + "windows-sys 0.52.0", ] [[package]] @@ -2318,22 +2460,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.52.5", ] [[package]] @@ -2353,25 +2480,20 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "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.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -2380,15 +2502,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2398,15 +2514,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2416,15 +2526,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" [[package]] -name = "windows_i686_msvc" -version = "0.42.2" +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2434,15 +2544,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -2452,15 +2556,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -2470,15 +2568,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -2488,9 +2580,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winreg" @@ -2504,9 +2596,9 @@ dependencies = [ [[package]] name = "xattr" -version = "1.1.2" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d367426ae76bdfce3d8eaea6e94422afd6def7d46f9c89e2980309115b3c2c41" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys", diff --git a/pkgs/tools/text/autocorrect/default.nix b/pkgs/tools/text/autocorrect/default.nix index 60e5608274eb0..c752c9cf11c1c 100644 --- a/pkgs/tools/text/autocorrect/default.nix +++ b/pkgs/tools/text/autocorrect/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "autocorrect"; - version = "2.9.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "huacnlee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NCDJoKOH4ZaXtGXZ7bgOXrjgrY8Edui+EOOI8/yfW08="; + sha256 = "sha256-iBwF8rMm4MbHwJSDmENDgGJKCl05psStxsi6BIliZP0="; }; cargoLock = { @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cp ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; cargoBuildFlags = [ "-p" "autocorrect-cli" ]; cargoTestFlags = [ "-p" "autocorrect-cli" ]; diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/tools/text/boxes/default.nix index 68e5b9c7ddca0..d7ef551548053 100644 --- a/pkgs/tools/text/boxes/default.nix +++ b/pkgs/tools/text/boxes/default.nix @@ -2,13 +2,13 @@ gccStdenv.mkDerivation rec { pname = "boxes"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "ascii-boxes"; repo = "boxes"; rev = "v${version}"; - hash = "sha256-/gc/5vDflmEwOtQbtLwRcchyr22rLQcWqs5GrwRxY70="; + hash = "sha256-dvhb5KWBQt7g4n0ZTQMcJQljIfavV3g8i+P3PWB6Gwk="; }; # Building instructions: diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix index 509953e8059b1..ca2ad027c2cf6 100644 --- a/pkgs/tools/text/chars/default.nix +++ b/pkgs/tools/text/chars/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-wqyExG4haco6jg1zpbouz3xMR7sjiVIAC16PnDU2tc8="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Commandline tool to display information about unicode characters"; diff --git a/pkgs/tools/text/clima/default.nix b/pkgs/tools/text/clima/default.nix index 65483e1152699..f7e6ee15d7f83 100644 --- a/pkgs/tools/text/clima/default.nix +++ b/pkgs/tools/text/clima/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jKY+Ta6lqMBUlqSViKk3W0CiO8oU+ucmleKDYRA54HQ="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/tools/text/cmigemo/default.nix index 20cee369e73f2..74f5a5100d279 100644 --- a/pkgs/tools/text/cmigemo/default.nix +++ b/pkgs/tools/text/cmigemo/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , iconv, nkf, perl, which -, skk-dicts +, skkDictionaries }: stdenv.mkDerivation { @@ -17,16 +17,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ iconv nkf perl which ]; postUnpack = '' - cp ${skk-dicts}/share/SKK-JISYO.L source/dict/ + cp ${skkDictionaries.l}/share/skk/SKK-JISYO.L source/dict/ ''; patches = [ ./no-http-tool-check.patch ]; makeFlags = [ "INSTALL=install" ]; - buildFlags = [ (if stdenv.isDarwin then "osx-all" else "gcc-all") ]; + buildFlags = [ (if stdenv.hostPlatform.isDarwin then "osx-all" else "gcc-all") ]; - installTargets = [ (if stdenv.isDarwin then "osx-install" else "gcc-install") ]; + installTargets = [ (if stdenv.hostPlatform.isDarwin then "osx-install" else "gcc-install") ]; meta = with lib; { description = "Tool that supports Japanese incremental search with Romaji"; diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index 78f583e3f73dc..8e84a1de14bce 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-dhcTpff4h37MHNbLoYUZiolSclSGcFrMJ3kKLCZAVAw="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Colourise your checksum output"; diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index 5359e811553d4..14f33ae0c518f 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -7,18 +7,17 @@ , installShellFiles , jre , makeWrapper -, crowdin-cli , testers , unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crowdin-cli"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - hash = "sha256-EpRGEn+cteFt4tn70bycIrIIjk+ZUO2n5SK14Hc2Qq0="; + url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip"; + hash = "sha256-158zbgYw4FP/vQVsSs9tt9VcisBWpRn/D4ORiM24PYY="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.tests.version = testers.testVersion { package = crowdin-cli; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { mainProgram = "crowdin"; @@ -48,4 +47,4 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ DamienCassou ]; }; -} +}) diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index 8e0f8f7a8d6dc..4b36b32fe0a20 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo123Module , fetchFromGitHub , installShellFiles , git @@ -7,18 +7,18 @@ , d2 }: -buildGoModule rec { +buildGo123Module rec { pname = "d2"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SAejVwqTa/yV1pAIltAkX25KxITfkbzP9SGcLQdPUCg="; + hash = "sha256-HD59q4GFrkjLvQQdYGA7ISwXJztweRxoV5AWbHinTx8="; }; - vendorHash = "sha256-aoc8KSznkWJpn0Ye7FUOH5sNQ4fslIGJhIaQdGrwcqQ="; + vendorHash = "sha256-HcWyhQFRI+dvOhUrVaL9U5PvL/CDBpaOYPXSkYzIYf4="; excludedPackages = [ "./e2etests" ]; @@ -48,7 +48,9 @@ buildGoModule rec { meta = with lib; { description = "Modern diagram scripting language that turns text to diagrams"; + mainProgram = "d2"; homepage = "https://d2lang.com"; + changelog = "https://github.com/terrastruct/d2/releases/tag/v${version}"; license = licenses.mpl20; maintainers = with maintainers; [ dit7ya kashw2 ]; }; diff --git a/pkgs/tools/text/dcs/default.nix b/pkgs/tools/text/dcs/default.nix index 0f438e4ff571b..458a76cf59133 100644 --- a/pkgs/tools/text/dcs/default.nix +++ b/pkgs/tools/text/dcs/default.nix @@ -41,7 +41,7 @@ buildGoModule { homepage = "https://github.com/Debian/dcs"; license = licenses.bsd3; maintainers = [ ]; - broken = stdenv.isAarch64 - || stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dcs.x86_64-darwin + broken = stdenv.hostPlatform.isAarch64 + || stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dcs.x86_64-darwin }; } diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index 9abc2fac51506..fbdf221d1206c 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-RmQu55OnKfeuDGcJrfjhMKnxDatdowkvh3Kh4N8I8Sg="; - buildInputs = (lib.optional stdenv.isDarwin Security); + buildInputs = (lib.optional stdenv.hostPlatform.isDarwin Security); preCheck = '' export DIFFR_TESTS_BINARY_PATH=$releaseDir/diffr diff --git a/pkgs/tools/text/diffsitter/default.nix b/pkgs/tools/text/diffsitter/default.nix index 94d7172d71be2..6089af84b44ba 100644 --- a/pkgs/tools/text/diffsitter/default.nix +++ b/pkgs/tools/text/diffsitter/default.nix @@ -4,6 +4,8 @@ , makeWrapper , rustPlatform , tree-sitter +, gitUpdater +, versionCheckHook }: let @@ -53,6 +55,11 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + postInstall = '' # completions are not yet implemented # so we can safely remove this without installing the completions @@ -71,6 +78,8 @@ rustPlatform.buildRustPackage rec { # tests::diff_hunks_snapshot::_short_python_py_true_expects # tests::diff_hunks_snapshot::_short_rust_rs_true_expects + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + meta = with lib; { homepage = "https://github.com/afnanenayet/diffsitter"; description = "Tree-sitter based AST difftool to get meaningful semantic diffs"; diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index e71b5941ea93e..d2219955d3dce 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id "$out/lib/libmarkdown.dylib" "$out/lib/libmarkdown.dylib" for exe in $out/bin/*; do install_name_tool -change libmarkdown.dylib "$out/lib/libmarkdown.dylib" "$exe" diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index ffdd96058139d..6a1ce2c059c23 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "fanficfare"; - version = "4.37.0"; + version = "4.38.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Wh/eWseR+SSVYUqNG6krYCgS1gipSJGTJ+fi6uZNCO8="; + hash = "sha256-E18svvnr9Wc1t8nU2akO2C055BwHb2GCKu4CT0tRhjA="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix index e7b2f3b107c97..f8cc3055e9051 100644 --- a/pkgs/tools/text/fastmod/default.nix +++ b/pkgs/tools/text/fastmod/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sFrABp4oYhel+GONFsTbunq+4We2DicvF9A3FT/ZArc="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; meta = with lib; { description = "Utility that makes sweeping changes to large, shared code bases"; diff --git a/pkgs/tools/text/fst/default.nix b/pkgs/tools/text/fst/default.nix index 1f1b2950e160d..c43a781cf6e14 100644 --- a/pkgs/tools/text/fst/default.nix +++ b/pkgs/tools/text/fst/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-yTbEaw+BbjVks3j7/b75kGoUjVftLaVYvYIdI/bbfdk="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 941e102cb3b03..103f9e16eb669 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -7,16 +7,16 @@ , autoreconfHook # no-pma fix /* Test suite broke on: - stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1 - || stdenv.isDarwin # XXX: `locale' segfaults - || stdenv.isSunOS # XXX: `_backsmalls1' fails, locale stuff? - || stdenv.isFreeBSD + stdenv.hostPlatform.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1 + || stdenv.hostPlatform.isDarwin # XXX: `locale' segfaults + || stdenv.hostPlatform.isSunOS # XXX: `_backsmalls1' fails, locale stuff? + || stdenv.hostPlatform.isFreeBSD */ -, doCheck ? (interactive && stdenv.isLinux), glibcLocales ? null +, doCheck ? (interactive && stdenv.hostPlatform.isLinux), glibcLocales ? null , locale ? null }: -assert (doCheck && stdenv.isLinux) -> glibcLocales != null; +assert (doCheck && stdenv.hostPlatform.isLinux) -> glibcLocales != null; stdenv.mkDerivation rec { pname = "gawk" + lib.optionalString interactive "-interactive"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { autoreconfHook ] ++ lib.optionals interactive [ removeReferencesTo - ] ++ lib.optionals (doCheck && stdenv.isLinux) [ + ] ++ lib.optionals (doCheck && stdenv.hostPlatform.isLinux) [ glibcLocales ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { readline ] ++ lib.optionals withSigsegv [ libsigsegv - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ locale ]; diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix index 86bf2beaa91d6..eaf7799a4860e 100644 --- a/pkgs/tools/text/gawk/gawkextlib.nix +++ b/pkgs/tools/text/gawk/gawkextlib.nix @@ -109,14 +109,14 @@ let #! No such device # mdb_env_open(env, /dev/null) #! Operation not supported by device - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; }; mbs = buildExtension { inherit gawkextlib; name = "mbs"; extraBuildInputs = [ glibcLocales ]; #! "spät": length: 5, mbs_length: 6, wcswidth: 4 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; }; mpfr = buildExtension { inherit gawkextlib; diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index 7a6562aab1430..04aac6b0b8710 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "0hf1c2m8n88frmxmyn0ndr8129p7iky49nq565sw1asaydm5z6pb"; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace glogg.pro \ --replace "boost_program_options-mt" "boost_program_options" ''; @@ -21,7 +21,7 @@ mkDerivation rec { qmakeFlags = [ "VERSION=${version}" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/glogg.app $out/Applications/glogg.app rm -fr $out/{bin,share} diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 7298fe881bea1..bbb876703f2b7 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation { outputs = [ "out" "info" ]; # the man pages are rather small nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - buildInputs = [ pcre2 libiconv runtimeShellPackage ]; + buildInputs = [ pcre2 libiconv ] ++ lib.optional (!stdenv.hostPlatform.isWindows) runtimeShellPackage; # cygwin: FAIL: multibyte-white-space # freebsd: FAIL mb-non-UTF8-performance # x86_64-darwin: fails 'stack-overflow' tests on Rosetta 2 emulator - doCheck = !stdenv.isCygwin && !stdenv.isFreeBSD && !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64; + doCheck = !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isFreeBSD && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64; # On macOS, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. diff --git a/pkgs/tools/text/gnupatch/Abort_when_cleaning_up_fails.patch b/pkgs/tools/text/gnupatch/Abort_when_cleaning_up_fails.patch new file mode 100644 index 0000000000000..ab3baf80f8c17 --- /dev/null +++ b/pkgs/tools/text/gnupatch/Abort_when_cleaning_up_fails.patch @@ -0,0 +1,51 @@ +From b7b028a77bd855f6f56b17c8837fc1cca77b469d Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agruen@gnu.org> +Date: Fri, 28 Jun 2019 00:30:25 +0200 +Subject: Abort when cleaning up fails + +When a fatal error triggers during cleanup, another attempt will be made to +clean up, which will likely lead to the same fatal error. So instead, bail out +when that happens. +src/patch.c (cleanup): Bail out when called recursively. +(main): There is no need to call output_files() before cleanup() as cleanup() +already does that. +--- + src/patch.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/patch.c b/src/patch.c +index 4616a48..02fd982 100644 +--- a/src/patch.c ++++ b/src/patch.c +@@ -685,7 +685,6 @@ main (int argc, char **argv) + } + if (outstate.ofp && (ferror (outstate.ofp) || fclose (outstate.ofp) != 0)) + write_fatal (); +- output_files (NULL); + cleanup (); + delete_files (); + if (somefailed) +@@ -1991,7 +1990,6 @@ void + fatal_exit (int sig) + { + cleanup (); +- + if (sig) + exit_with_signal (sig); + +@@ -2011,6 +2009,12 @@ remove_if_needed (char const *name, bool *needs_removal) + static void + cleanup (void) + { ++ static bool already_cleaning_up; ++ ++ if (already_cleaning_up) ++ return; ++ already_cleaning_up = true; ++ + remove_if_needed (TMPINNAME, &TMPINNAME_needs_removal); + remove_if_needed (TMPOUTNAME, &TMPOUTNAME_needs_removal); + remove_if_needed (TMPPATNAME, &TMPPATNAME_needs_removal); +-- +cgit v1.1 + diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index c19e087ea5478..19d8652396c91 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=b5a91a01e5d0897facdd0f49d64b76b0f02b43e1 ./Allow_input_files_to_be_missing_for_ed-style_patches.patch + # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=b7b028a77bd855f6f56b17c8837fc1cca77b469d + ./Abort_when_cleaning_up_fails.patch + # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=123eaff0d5d1aebe128295959435b9ca5909c26d ./CVE-2018-1000156.patch diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index 70c9fb8d55315..dcd541d0bb76b 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goawk"; - version = "1.27.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "benhoyt"; repo = "goawk"; rev = "v${version}"; - hash = "sha256-KB9N345xkgsPfI4DQYFag7qSdFv/JSU18YG8IPFrcQA="; + hash = "sha256-3i8czhGFk8XqYaenKTmsvXt2kRSss++rS6amLxfM2DE="; }; vendorHash = null; diff --git a/pkgs/tools/text/hcledit/default.nix b/pkgs/tools/text/hcledit/default.nix index 882561b983873..2328840648c13 100644 --- a/pkgs/tools/text/hcledit/default.nix +++ b/pkgs/tools/text/hcledit/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hcledit"; - version = "0.2.14"; + version = "0.2.15"; src = fetchFromGitHub { owner = "minamijoyo"; repo = pname; rev = "v${version}"; - hash = "sha256-7Yay4a55AIzhJHkUh3lCNjklPOZm9VwrmAAyLIW6XJ0="; + hash = "sha256-EJSV7CsxnRCsVcqsJcImqeELdeg6Mnf7N6S9TlMbTaE="; }; vendorHash = "sha256-G6jmdosQHBA+n7MgVAlzdSTqPYb5d+k4b4EzAI384FQ="; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index a2f91efc9494e..868de0fb679e8 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -15,7 +15,7 @@ let enableParallelBuilding = true; nativeBuildInputs = [ pkg-config swig perl ] - ++ lib.optional stdenv.isDarwin gcc; + ++ lib.optional stdenv.hostPlatform.isDarwin gcc; buildInputs = [ getopt lua boost libxcrypt ]; @@ -35,15 +35,15 @@ let # This has to happen _before_ the main build because it does a # `make clean' for some reason. - preBuild = lib.optionalString (!stdenv.isDarwin) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' make -C extras/swig $makeFlags perl ''; - postCheck = lib.optionalString (!stdenv.isDarwin) '' + postCheck = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' perl -Iextras/swig extras/swig/testmod.pl ''; - preInstall = lib.optionalString (!stdenv.isDarwin) '' + preInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p $out/${perl.libPrefix} install -m644 extras/swig/highlight.{so,pm} $out/${perl.libPrefix} make -C extras/swig clean # Clean up intermediate files. @@ -59,5 +59,5 @@ let }; in - if stdenv.isDarwin then self + if stdenv.hostPlatform.isDarwin then self else perl.pkgs.toPerlModule self diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index 247ee8e814df7..afa4bb1140379 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; meta = { description = "Convert HTML to plain text"; diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix index 3cbcac20966a2..e41f9bbfceb29 100644 --- a/pkgs/tools/text/hyx/default.nix +++ b/pkgs/tools/text/hyx/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-dufx3zsabeet7Rp0d60MIuNqisIQd6UgE7WDZYNHl3E="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace "-Wl,-z,relro,-z,now -fpic -pie" "" ''; diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index db947ca2cc38e..a4c4a134c4b65 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/pkgs/tools/text/igrep/default.nix @@ -9,18 +9,18 @@ rustPlatform.buildRustPackage rec { pname = "igrep"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "konradsz"; repo = "igrep"; rev = "v${version}"; - hash = "sha256-L5mHuglU0CvTi02pbR8xfezBoH8L/DS+7jgvYvb4yro="; + hash = "sha256-ZZhzBGLpzd9+rok+S/ypKpWXVzXaA1CnviC7LfgP/CU="; }; - cargoHash = "sha256-k63tu5Ffus4z0yd8vQ79q4+tokWAXD05Pvv9JByfnDg="; + cargoHash = "sha256-raSz/+u7P04qHmvdfYoWKOKtNtaFlgmT8Nw0ImhCMkU="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; passthru.tests = { version = testers.testVersion { package = igrep; command = "ig --version"; }; diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index 3dea94d0912b7..844f35612ff44 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postPatch = '' cat >> local.h <<EOF - ${lib.optionalString (!stdenv.isDarwin) "#define USG"} + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "#define USG"} #define TERMLIB "-lncurses" #define LANGUAGES "{american,MASTERDICTS=american.med,HASHFILES=americanmed.hash}" #define MASTERHASH "americanmed.hash" diff --git a/pkgs/tools/text/jen/default.nix b/pkgs/tools/text/jen/default.nix index cfd8298c37258..decc88434dd82 100644 --- a/pkgs/tools/text/jen/default.nix +++ b/pkgs/tools/text/jen/default.nix @@ -1,22 +1,32 @@ -{ lib -, rustPlatform -, fetchCrate -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchCrate, + fetchpatch, + stdenv, + darwin, }: rustPlatform.buildRustPackage rec { pname = "jen"; - version = "1.6.0"; + version = "1.7.0"; src = fetchCrate { inherit pname version; - hash = "sha256-fpv/IzU23yAz1cumTbdQP6wHJX2U4acNxq8Zrx+YQVs="; + hash = "sha256-nouAHEo5JJtZ0pV8ig/iJ3eB8uPz3yMVIYP6RrNVlSA="; }; - cargoHash = "sha256-LKiPG7k5UgaESP1ShsIWNMnm9resbRje746txOBo+Qs="; + cargoPatches = [ + (fetchpatch { + name = "fix-rust-1.80-build.patch"; + url = "https://github.com/whitfin/jen/commit/a6b5239593cecfd803a111ff317afa88c94c3640.patch"; + hash = "sha256-ikfmEj6Xm0nT9dxpx6xdm/mQbw0b3gh2PT6Zo69Zg0E="; + }) + ]; + + cargoHash = "sha256-Y81YqrzJSar0BxhQb7Vm/cZ9E6krlyZesXPY+j37IHA="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/text/jotdown/default.nix b/pkgs/tools/text/jotdown/default.nix index e3c38dc2b2fec..e0469e25bf888 100644 --- a/pkgs/tools/text/jotdown/default.nix +++ b/pkgs/tools/text/jotdown/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jotdown"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hellux"; repo = "jotdown"; rev = version; - hash = "sha256-lJnHdywxKf3CWgSB91MqQreyUhKArpT2lqQqSIpgnUY="; + hash = "sha256-67foqp8i5JqvtKeq8gibFhd59V8Nf8wkaINe2gd5Huk="; }; - cargoHash = "sha256-ESwo1J5OCJbmlZoTOPaeNIqRCTMAJtgkhrR0bcRqQwk="; + cargoHash = "sha256-ckcjd8ZiJxfKEkpfGvTSKv3ReWn3lIK+/fBnj/kk2F0="; meta = with lib; { description = "Minimal Djot CLI"; diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index 382b2f319c142..5dff6f6f48afa 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; meta = with lib; { description = "Japanese morphological analyser using a recurrent neural network language model (RNNLM)"; diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/tools/text/kakasi/default.nix index fa509f1b4a728..9e0cc95bff4ff 100644 --- a/pkgs/tools/text/kakasi/default.nix +++ b/pkgs/tools/text/kakasi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "kakasi"; version = "2.3.6"; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { description = "Kanji Kana Simple Inverter"; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index f322a6f7d7c34..0b1e13a424e81 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Wno-dev" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s "$out/Applications/KDE/kdiff3.app/Contents/MacOS" "$out/bin" ''; diff --git a/pkgs/tools/text/languagetool-rust/default.nix b/pkgs/tools/text/languagetool-rust/default.nix index 1772f9d1e3058..15b0ccb466110 100644 --- a/pkgs/tools/text/languagetool-rust/default.nix +++ b/pkgs/tools/text/languagetool-rust/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "full" ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; checkFlags = [ # requires network access diff --git a/pkgs/tools/text/markdownlint-cli/default.nix b/pkgs/tools/text/markdownlint-cli/default.nix index 12b19d3a71655..c0371f1866750 100644 --- a/pkgs/tools/text/markdownlint-cli/default.nix +++ b/pkgs/tools/text/markdownlint-cli/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "markdownlint-cli"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "igorshubovych"; repo = "markdownlint-cli"; rev = "v${version}"; - hash = "sha256-qRbfOxMCm5pUAi0KHookOOnKaTShBUkTkrqZX4QGezk="; + hash = "sha256-bT/6bRzpXa86e6T0bJSUm624dbRAux4qgmCc+lOtl3c="; }; - npmDepsHash = "sha256-UwyjaEKYA81J0DR2yFqYVp4e7l3Jol/R8hgaijNpBaU="; + npmDepsHash = "sha256-g2+kieF+cq8olfQ5rElNNvp5NYJcg+eTNWnMxSXqlKk="; dontNpmBuild = true; diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index 1a781053811f3..da29d25dcb332 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-CG4WvAFDqtRUjF4kJ29363F6jWRChIXgT5i6ozwV4pw="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Preprocessor for mdbook to add Material Design admonishments"; diff --git a/pkgs/tools/text/mdbook-emojicodes/default.nix b/pkgs/tools/text/mdbook-emojicodes/default.nix index d57ba39b803cd..fbdd19fb72b04 100644 --- a/pkgs/tools/text/mdbook-emojicodes/default.nix +++ b/pkgs/tools/text/mdbook-emojicodes/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-SkvAtV613+ARk79dB2zRKoLjPgdzoEKQa3JrRw9qBkA="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/pkgs/tools/text/mdbook-epub/default.nix b/pkgs/tools/text/mdbook-epub/default.nix index 48dbe92ca6ce3..d9418f67b1451 100644 --- a/pkgs/tools/text/mdbook-epub/default.nix +++ b/pkgs/tools/text/mdbook-epub/default.nix @@ -28,7 +28,7 @@ in rustPlatform.buildRustPackage { buildInputs = [ bzip2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-footnote/default.nix b/pkgs/tools/text/mdbook-footnote/default.nix index 1b3ad02e5c7f6..791cb07d02bec 100644 --- a/pkgs/tools/text/mdbook-footnote/default.nix +++ b/pkgs/tools/text/mdbook-footnote/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Ig+uVCO5oHIkkvFsKiBiUFzjUgH/Pydn4MVJHb2wKGc="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Preprocessor for mdbook to support the inclusion of automatically numbered footnotes"; diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix index 19719ac504d72..9328cba50f6c2 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-cMCNZ8Ezp7bFx4EnuZCXhqoaE0yN3iK9KnCYBYGPHKc="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; nativeCheckInputs = [ graphviz ]; diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index b6c2a1ec1d304..0c2c53825b7ef 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-U8uDcNkEyz7zAqCTthY5SVGshsJRKRaoBLOpBpQ9sho="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time"; diff --git a/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix b/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix index e69c8185e3c3a..8404f414a4aa9 100644 --- a/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix +++ b/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/text/mdbook-linkcheck/default.nix b/pkgs/tools/text/mdbook-linkcheck/default.nix index 7129cdd0442c0..7ff872a9d0dec 100644 --- a/pkgs/tools/text/mdbook-linkcheck/default.nix +++ b/pkgs/tools/text/mdbook-linkcheck/default.nix @@ -14,9 +14,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AwixlCL5ZcLgj9wYeBvkSy2U6J8alXf488l8DMn73w4="; - buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ Security ] else [ openssl ]; - nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [ pkg-config ]; + nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix index 52211b2737108..b4e837a2082a2 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-mermaid"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Qyt5N6Fito++5lpjDXlzupmguue9kc409IpaDkIRgxw="; + hash = "sha256-elDKxtGMLka9Ss5CNnzw32ndxTUliNUgPXp7e4KUmBo="; }; - cargoHash = "sha256-ji38ZNOZ+SDL7+9dvaRIA38EsqMqYWpSmZntexJqcMU="; + cargoHash = "sha256-BnbllOsidqDEfKs0pd6AzFjzo51PKm9uFSwmOGTW3ug="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-pdf/default.nix b/pkgs/tools/text/mdbook-pdf/default.nix index 8bed07bd33b82..ab889398ceffc 100644 --- a/pkgs/tools/text/mdbook-pdf/default.nix +++ b/pkgs/tools/text/mdbook-pdf/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-plantuml/default.nix b/pkgs/tools/text/mdbook-plantuml/default.nix index e5ee827d816eb..e3665aa2f43f6 100644 --- a/pkgs/tools/text/mdbook-plantuml/default.nix +++ b/pkgs/tools/text/mdbook-plantuml/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "mdBook preprocessor to render PlantUML diagrams to png images in the book output directory"; diff --git a/pkgs/tools/text/mdbook-toc/default.nix b/pkgs/tools/text/mdbook-toc/default.nix index a9c3855964b58..2555e03c124c4 100644 --- a/pkgs/tools/text/mdbook-toc/default.nix +++ b/pkgs/tools/text/mdbook-toc/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-95W0gERjwL9r0+DOgxQu+sjSFSThWeShLAqlDQiGxFw="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Preprocessor for mdbook to add inline Table of Contents support"; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 89348e1ea6b11..7a4c40f929464 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "2.3.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "swsnr"; repo = "mdcat"; rev = "mdcat-${version}"; - hash = "sha256-Geq4I4QjWg2dBfGw0j68gG5butWFLXynLC5c9AQTfPs="; + hash = "sha256-Y0tWhqRGrjex/yKWmRu4+hSRM9/vchsYyx26x/HBuRw="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-G+vTW3hYNjZN3V5svltbKEeeUEolAVVbTOaAKVHEcUI="; + cargoHash = "sha256-f2YmrmRlQTCBTzG7DWJVldP/lOhl2iCnhnOLHx1QJDc="; nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. diff --git a/pkgs/tools/text/paperoni/Cargo.lock b/pkgs/tools/text/paperoni/Cargo.lock deleted file mode 100644 index e08a993ea54a6..0000000000000 --- a/pkgs/tools/text/paperoni/Cargo.lock +++ /dev/null @@ -1,3014 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aes" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" -dependencies = [ - "aes-soft", - "aesni", - "cipher", -] - -[[package]] -name = "aes-gcm" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "aes-soft" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" -dependencies = [ - "cipher", - "opaque-debug", -] - -[[package]] -name = "aesni" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" -dependencies = [ - "cipher", - "opaque-debug", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "async-channel" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-global-executor" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite", - "log 0.4.17", - "parking", - "polling", - "rustix", - "slab", - "socket2", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log 0.4.17", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-task" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "atomic-waker" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "log 0.4.17", -] - -[[package]] -name = "bumpalo" -version = "3.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time 0.1.45", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "cipher" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" -dependencies = [ - "generic-array", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", - "yaml-rust", -] - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi", -] - -[[package]] -name = "comfy-table" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c93d79ba722818d1a6aedfbe2cf4889330c856d0c6772951efbbf3dd283c070a" -dependencies = [ - "crossterm", - "strum", - "strum_macros", -] - -[[package]] -name = "concurrent-queue" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "console" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "windows-sys 0.42.0", -] - -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cookie" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -dependencies = [ - "aes-gcm", - "base64", - "hkdf", - "hmac", - "percent-encoding", - "rand 0.8.5", - "sha2", - "time 0.2.27", - "version_check", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" -dependencies = [ - "libc", -] - -[[package]] -name = "cpuid-bool" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossterm" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d" -dependencies = [ - "bitflags", - "crossterm_winapi", - "libc", - "mio", - "parking_lot 0.11.2", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507" -dependencies = [ - "winapi", -] - -[[package]] -name = "crypto-mac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "cssparser" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ctr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" -dependencies = [ - "cipher", -] - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.61+curl-8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79" -dependencies = [ - "cc", - "libc", - "libnghttp2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - -[[package]] -name = "darling" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d13202debe11181040ae9063d739fa32cfcaaebe2275fe387703460ae2365b30" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.109", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "directories" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "dtoa-short" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" -dependencies = [ - "dtoa", -] - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "epub-builder" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8b1b5059c4b990da60cb6fee785e49ea09d1ed8249d91e2dddfd92b74b7cbc" -dependencies = [ - "chrono", - "error-chain", - "html-escape", - "lazy_static", - "mustache", - "regex", - "tempdir", - "uuid", - "zip", -] - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "backtrace", - "version_check", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "flexi_logger" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081e9563bb9600593f0f5d38c24f0e3dc550cd301b4872b986e20f1874104791" -dependencies = [ - "atty", - "chrono", - "glob", - "lazy_static", - "log 0.4.17", - "regex", - "thiserror", - "yansi", -] - -[[package]] -name = "flume" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bebadab126f8120d410b677ed95eee4ba6eb7c6dd8e34a5ec88a08050e26132" -dependencies = [ - "futures-core", - "futures-sink", - "spinning_top", -] - -[[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.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "ghash" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gimli" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hkdf" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" -dependencies = [ - "digest", - "hmac", -] - -[[package]] -name = "hmac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" -dependencies = [ - "crypto-mac", - "digest", -] - -[[package]] -name = "html-escape" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" -dependencies = [ - "utf8-width", -] - -[[package]] -name = "html5ever" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" -dependencies = [ - "log 0.4.17", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes 1.4.0", - "fnv", - "itoa 1.0.6", -] - -[[package]] -name = "http-client" -version = "6.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1947510dc91e2bf586ea5ffb412caad7673264e14bb39fb9078da114a94ce1a5" -dependencies = [ - "async-std", - "async-trait", - "cfg-if", - "http-types", - "isahc", - "log 0.4.17", -] - -[[package]] -name = "http-types" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" -dependencies = [ - "anyhow", - "async-channel", - "async-std", - "base64", - "cookie", - "futures-lite", - "infer", - "pin-project-lite", - "rand 0.7.3", - "serde", - "serde_json", - "serde_qs", - "serde_urlencoded", - "url", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indicatif" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" -dependencies = [ - "console", - "lazy_static", - "number_prefix", - "regex", -] - -[[package]] -name = "infer" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "isahc" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2948a0ce43e2c2ef11d7edf6816508998d99e13badd1150be0914205df9388a" -dependencies = [ - "bytes 0.5.6", - "crossbeam-utils", - "curl", - "curl-sys", - "flume", - "futures-lite", - "http", - "log 0.4.17", - "once_cell", - "slab", - "sluice", - "tracing", - "tracing-futures", - "url", - "waker-fn", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "js-sys" -version = "0.3.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kuchiki" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" -dependencies = [ - "cssparser", - "html5ever", - "matches", - "selectors", -] - -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log 0.4.17", -] - -[[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.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" - -[[package]] -name = "libnghttp2-sys" -version = "0.1.7+1.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "libz-sys" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.17", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", - "value-bag", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "markup5ever" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" -dependencies = [ - "log 0.4.17", - "phf", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log 0.4.17", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "mustache" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51956ef1c5d20a1384524d91e616fb44dfc7d8f249bf696d49c97dd3289ecab5" -dependencies = [ - "log 0.3.9", - "serde", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[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.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "paperoni" -version = "0.6.1-alpha1" -dependencies = [ - "async-std", - "base64", - "chrono", - "clap", - "colored", - "comfy-table", - "derive_builder", - "directories", - "epub-builder", - "flexi_logger", - "futures", - "html5ever", - "indicatif", - "itertools", - "kuchiki", - "lazy_static", - "log 0.4.17", - "md5", - "regex", - "surf", - "thiserror", - "url", -] - -[[package]] -name = "parking" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.45.0", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_macros", - "phf_shared 0.8.0", - "proc-macro-hack", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "concurrent-queue", - "libc", - "log 0.4.17", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polyval" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" -dependencies = [ - "cpuid-bool", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.9", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.9", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.17", -] - -[[package]] -name = "rustix" -version = "0.37.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags", - "cssparser", - "derive_more", - "fxhash", - "log 0.4.17", - "matches", - "phf", - "phf_codegen", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "itoa 1.0.6", - "ryu", - "serde", -] - -[[package]] -name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.6", - "ryu", - "serde", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer", - "cfg-if", - "cpufeatures", - "digest", - "opaque-debug", -] - -[[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "sluice" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -dependencies = [ - "async-channel", - "futures-core", - "futures-io", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spinning_top" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9eb1a2f4c41445a3a0ff9abc5221c5fcd28e1f13cd7c0397706f9ac938ddb0" -dependencies = [ - "lock_api", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot 0.12.1", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" - -[[package]] -name = "strum_macros" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "surf" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718b1ae6b50351982dedff021db0def601677f2120938b070eadb10ba4038dd7" -dependencies = [ - "async-std", - "async-trait", - "cfg-if", - "encoding_rs", - "futures-util", - "getrandom 0.2.9", - "http-client", - "http-types", - "log 0.4.17", - "mime_guess", - "once_cell", - "pin-project-lite", - "serde", - "serde_json", - "web-sys", -] - -[[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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn 1.0.109", -] - -[[package]] -name = "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 = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "log 0.4.17", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8-width" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.9", -] - -[[package]] -name = "value-bag" -version = "1.0.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" -dependencies = [ - "bumpalo", - "log 0.4.17", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.15", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" - -[[package]] -name = "web-sys" -version = "0.3.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "yaml-rust" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zip" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" -dependencies = [ - "byteorder", - "crc32fast", - "thiserror", - "time 0.1.45", -] diff --git a/pkgs/tools/text/paperoni/default.nix b/pkgs/tools/text/paperoni/default.nix deleted file mode 100644 index 5378598da7dff..0000000000000 --- a/pkgs/tools/text/paperoni/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, curl -, stdenv -, pkg-config -, zlib -, openssl -}: - -rustPlatform.buildRustPackage rec { - pname = "paperoni"; - version = "0.6.1-alpha1"; - - src = fetchFromGitHub { - owner = "hipstermojo"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-vTylnDtoPpiRtk/vew1hLq3g8pepWRVqBEBnvSif4Zw="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - }; - - nativeBuildInputs = [ - curl - ] ++ lib.optionals stdenv.isLinux [ - pkg-config - ]; - - buildInputs = [ - curl - zlib - ] ++ lib.optionals stdenv.isLinux [ - openssl - ]; - - # update Cargo.lock to work with openssl 3 - postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock - ''; - - meta = with lib; { - description = "Article extractor in Rust"; - mainProgram = "paperoni"; - homepage = "https://github.com/hipstermojo/paperoni"; - changelog = "https://github.com/hipstermojo/paperoni/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/tools/text/papertrail/Gemfile.lock b/pkgs/tools/text/papertrail/Gemfile.lock index 37cd23eab6f5b..5c3d3f0aa3c53 100644 --- a/pkgs/tools/text/papertrail/Gemfile.lock +++ b/pkgs/tools/text/papertrail/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: ansi (1.5.0) chronic (0.10.2) - papertrail (0.10.1) + papertrail (0.11.2) ansi (~> 1.5) chronic (~> 0.10) @@ -14,4 +14,4 @@ DEPENDENCIES papertrail BUNDLED WITH - 2.1.4 + 2.5.16 diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index 5e2b080f9852c..a01bc3fb889cb 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }: +{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript, testers, papertrail }: let papertrail-env = bundlerEnv { @@ -21,6 +21,8 @@ in stdenv.mkDerivation { passthru.updateScript = bundlerUpdateScript "papertrail"; + passthru.tests.version = testers.testVersion { package = papertrail; }; + meta = with lib; { description = "Command-line client for Papertrail log management service"; mainProgram = "papertrail"; diff --git a/pkgs/tools/text/papertrail/gemset.nix b/pkgs/tools/text/papertrail/gemset.nix index dcdfcdf7ea58a..abfbed17a987f 100644 --- a/pkgs/tools/text/papertrail/gemset.nix +++ b/pkgs/tools/text/papertrail/gemset.nix @@ -1,5 +1,7 @@ { ansi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "14ims9zfal4gs2wpx2m5rd8zsrl2k794d359shkrsgg3fhr2a22l"; @@ -8,6 +10,8 @@ version = "1.5.0"; }; chronic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; @@ -16,11 +20,14 @@ version = "0.10.2"; }; papertrail = { + dependencies = ["ansi" "chronic"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vb7bh7qh5hr4v3w711bl0yrr3rlhz5c3h3qx3fq31dr5y4100v7"; + sha256 = "170zhgahrgpwj4cb9xj8104yqcf9gva8qk5vqpmw3g8rq29jxshy"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.2"; }; } diff --git a/pkgs/tools/text/pinyin-tool/default.nix b/pkgs/tools/text/pinyin-tool/default.nix index b2427e4f5f4b1..e287c2a5cc799 100644 --- a/pkgs/tools/text/pinyin-tool/default.nix +++ b/pkgs/tools/text/pinyin-tool/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jeRKtKv8Lg/ritl42dMbEQpXaNlCIaHTrw0xtPQitMc="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Simple command line tool for converting Chinese characters to space-separate pinyin words"; diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 6133bc409ddca..101a08422c18c 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ dasj19 ]; # configure: error: GTK+ build of wxWidgets is required - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index 904eb2c5363fa..a7ca553c1c198 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -18,6 +18,6 @@ buildPythonApplication rec { mainProgram = "proselint"; homepage = "http://proselint.com"; license = licenses.bsd3; - maintainers = with maintainers; [ alibabzo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/rare-regex/default.nix b/pkgs/tools/text/rare-regex/default.nix index b565ed8aded26..1c9bece2ffee8 100644 --- a/pkgs/tools/text/rare-regex/default.nix +++ b/pkgs/tools/text/rare-regex/default.nix @@ -2,7 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub -, withPcre2 ? stdenv.isLinux +, withPcre2 ? stdenv.hostPlatform.isLinux , pcre2 , testers , rare-regex diff --git a/pkgs/tools/text/reveal-md/default.nix b/pkgs/tools/text/reveal-md/default.nix index 5f6bf17eb4598..e16e29ec37e89 100644 --- a/pkgs/tools/text/reveal-md/default.nix +++ b/pkgs/tools/text/reveal-md/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "reveal-md"; - version = "6.1.2"; + version = "6.1.3"; src = fetchFromGitHub { owner = "webpro"; repo = "reveal-md"; rev = version; - hash = "sha256-MPNxQpof36XHg3Zl7fHkyCXnoDOcRvMiMiPH29GEWqE="; + hash = "sha256-m2aCC+ATymqKLn+aGEV8yzXASJJX4CI1YcPwt25T8k4="; }; - npmDepsHash = "sha256-535tauun6ysPDC096ttPpvJZ+RSZ75aY8mVKj8mnMJI="; + npmDepsHash = "sha256-QREJaF3aEHJA41fYTsJLlJU1l9bcVPS0BUkIzZIqZAA="; env = { PUPPETEER_SKIP_DOWNLOAD = true; diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix index aadb6f26354bb..6d8c4cd28c0ba 100644 --- a/pkgs/tools/text/riffdiff/default.nix +++ b/pkgs/tools/text/riffdiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "3.2.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-CMH+6/YGepl6SJLytfDEu7NLvPA/HHY/sDm2LTi0R8w="; + hash = "sha256-V+YR0j0Dpmsc2psXb/sb/Rp4Eu8/uuBAkmYTPOfkC+g="; }; - cargoHash = "sha256-w3oDpJMsfV9mIWI44YgOsNZH2vahSRCSJnYpFWBx/eU="; + cargoHash = "sha256-/xUMfORiZVj5RmDweLCDdD6MkgzCIsTdiYpyO3CDT+M="; meta = with lib; { description = "Diff filter highlighting which line parts have changed"; diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index daed3da28e740..d65c399d5ce8f 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -40,7 +40,7 @@ in rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ makeWrapper poppler_utils ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeCheckInputs = path; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 35e56b7fb3a49..e3270f359f1b9 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -14,21 +14,21 @@ let rg = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/rg"; in rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "14.1.0"; + version = "14.1.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - hash = "sha256-CBU1GzgWMPTVsgaPMy39VRcENw5iWRUrRpjyuGiZpPI="; + hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg="; }; - cargoHash = "sha256-8FxN5MhYduMkzym7Xx4dnVbWaBKv9pgbXMIRGiRRQew="; + cargoHash = "sha256-b+iA8iTYWlczBpNq9eyHrWG8LMU4WPBzaU6pQRht+yE="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional withPCRE2 pkg-config; buildInputs = lib.optional withPCRE2 pcre2 - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; buildFeatures = lib.optional withPCRE2 "pcre2"; diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/tools/text/rosie/default.nix index 0a87425a16a7a..5cad6650d2ce1 100644 --- a/pkgs/tools/text/rosie/default.nix +++ b/pkgs/tools/text/rosie/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { sed -iE '/ld.so.conf.d/d' Makefile ''; - preInstall = lib.optionalString stdenv.isDarwin '' + preInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath $out/lib build/bin/rosie install_name_tool -id $out/lib/librosie.dylib build/lib/librosie.dylib ''; diff --git a/pkgs/tools/text/runiq/Cargo.lock b/pkgs/tools/text/runiq/Cargo.lock new file mode 100644 index 0000000000000..5a406d80ed558 --- /dev/null +++ b/pkgs/tools/text/runiq/Cargo.lock @@ -0,0 +1,1685 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "autocfg" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +dependencies = [ + "autocfg 1.3.0", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bson" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a88e82b9106923b5c4d6edfca9e7db958d4e98a478ec115022e81b9b38e2c8" +dependencies = [ + "ahash", + "base64", + "bitvec", + "hex", + "indexmap", + "js-sys", + "once_cell", + "rand 0.8.5", + "serde", + "serde_bytes", + "serde_json", + "time", + "uuid", +] + +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytelines" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1297656b3c221f5251560da47ce530d981345d3dabe822067c18ecb36e67aacb" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytesize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" + +[[package]] +name = "cc" +version = "1.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "windows-targets", +] + +[[package]] +name = "chrono-tz" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "clap" +version = "4.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.75", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "cli-table" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b53f9241f288a7b12c56565f04aaeaeeab6b8923d42d99255d4ca428b4d97f89" +dependencies = [ + "cli-table-derive", + "csv", + "termcolor", + "unicode-width", +] + +[[package]] +name = "cli-table-derive" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e83a93253aaae7c74eb7428ce4faa6e219ba94886908048888701819f82fb94" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "deunicode" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" + +[[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 = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "fake" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5932b40ab216d69bca7d228fa0bf754c44b70ed97fcc70fdc1b66d6214f51" +dependencies = [ + "rand 0.6.5", +] + +[[package]] +name = "format_num" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14ac05eb8d2eb4ed1eeff847911deae077b0b53332465de9d6a26b0ea9961bc8" +dependencies = [ + "regex", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[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 = "globwalk" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" +dependencies = [ + "bitflags 2.6.0", + "ignore", + "walkdir", +] + +[[package]] +name = "growable-bloom-filter" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c669fa03050eb3445343f215d62fc1ab831e8098bc9a55f26e9724faff11075c" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "xxhash-rust", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "humansize" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" +dependencies = [ + "libm", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "identity-hash" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfdd7caa900436d8f13b2346fe10257e0c05c1f1f9e351f4f5d57c03bd5f45da" + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jen" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6dbf07da3aeb1810d042d6b06d3fa1f940d9c540e50eaf50266d3e57c8f4049" +dependencies = [ + "bson", + "clap", + "failure", + "fake", + "nanoid", + "rand 0.8.5", + "serde", + "serde_json", + "tera", + "uuid", +] + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "nanoid" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" +dependencies = [ + "rand 0.8.5", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg 1.3.0", +] + +[[package]] +name = "object" +version = "0.36.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "parse-zoneinfo" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" +dependencies = [ + "regex", +] + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.75", +] + +[[package]] +name = "pest_meta" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand 0.8.5", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +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 = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ + "autocfg 0.1.8", + "libc", + "rand_chacha 0.1.1", + "rand_core 0.4.2", + "rand_hc", + "rand_isaac", + "rand_jitter", + "rand_os", + "rand_pcg", + "rand_xorshift", + "winapi", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.3.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ + "libc", + "rand_core 0.4.2", + "winapi", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "runiq" +version = "2.0.0" +dependencies = [ + "bytelines", + "bytesize", + "clap", + "cli-table", + "format_num", + "growable-bloom-filter", + "identity-hash", + "jen", + "strum", + "strum_macros", + "xxhash-rust", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "serde" +version = "1.0.208" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.208" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.75", +] + +[[package]] +name = "serde_json" +version = "1.0.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +dependencies = [ + "indexmap", + "itoa", + "memchr", + "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 = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slug" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882a80f72ee45de3cc9a5afeb2da0331d58df69e4e7d8eeb5d3c7784ae67e724" +dependencies = [ + "deunicode", + "wasm-bindgen", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.75", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tera" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9d851b45e865f178319da0abdbfe6acbc4328759ff18dafc3a41c16b4cd2ee" +dependencies = [ + "chrono", + "chrono-tz", + "globwalk", + "humansize", + "lazy_static", + "percent-encoding", + "pest", + "pest_derive", + "rand 0.8.5", + "regex", + "serde", + "serde_json", + "slug", + "unic-segment", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.75", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "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 = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-segment" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23" +dependencies = [ + "unic-ucd-segment", +] + +[[package]] +name = "unic-ucd-segment" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.75", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.75", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.75", +] diff --git a/pkgs/tools/text/runiq/default.nix b/pkgs/tools/text/runiq/default.nix index 0226677981094..bcc7952d74b03 100644 --- a/pkgs/tools/text/runiq/default.nix +++ b/pkgs/tools/text/runiq/default.nix @@ -1,17 +1,23 @@ -{ lib, rustPlatform, fetchCrate, stdenv, darwin }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "runiq"; - version = "2.0.0"; + version = "2.0.0-unstable-2024-08-19"; - src = fetchCrate { - inherit pname version; - hash = "sha256-qcgPuJOpK2fCsHAgzoIKF7upb9B3ySIZkpu9xf4JnCc="; + src = fetchFromGitHub { + owner = "whitfin"; + repo = "runiq"; + rev = "a642926f6ec09d4faeebebb563d4aed89e0d36fb"; + hash = "sha256-DWP0kbTjXlyUI/+bHgom9/XJ2XW/BJEU4xvIisPVug0="; }; - cargoHash = "sha256-WSMV0GNKNckN9uSPN647iDloGkNtaKcrZbeyglUappc="; + cargoLock.lockFile = ./Cargo.lock; - buildInputs = lib.optionals stdenv.isDarwin [ + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index 4453f7317db6e..be4d46facc23c 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EyLompGEin12q6SC1M1D0QsE42HVEq5O/E99qi54cGo="; - buildInputs = (lib.optional stdenv.isDarwin Security); + buildInputs = (lib.optional stdenv.hostPlatform.isDarwin Security); meta = with lib; { description = "Find and replace text in source files"; diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index e5bde420000d9..d1c7e36a65935 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' installManPage gen/sd.1 diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index a3915a2d664ff..2dc71926f2104 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sed -i -e 's/name="idm.*"//g' $out/share/doc/OpenSP/releasenotes.html ''; - preConfigure = lib.optionalString stdenv.isCygwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isCygwin '' autoreconf -fi ''; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { # Clang 16 fails to build due to inappropriate definitions in the `config.h` generated by the # existing configure scripts. Regenerate them to make sure they detect its features correctly. ++ lib.optional stdenv.cc.isClang autoreconfHook - ++ lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; + ++ lib.optionals stdenv.hostPlatform.isCygwin [ autoconf automake libtool ]; doCheck = false; # fails diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 568b49371f69d..c5e5986d6b98e 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here # TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377 env.NIX_CFLAGS_COMPILE = "-fcommon"; - NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-lgcc_s"; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcre zlib xz ]; diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 07ed74f91c738..715b9d8ce91de 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchurl, boost, updateAutotoolsGnuConfigScriptsHook }: +{ lib, stdenv, fetchpatch, fetchurl, boost, updateAutotoolsGnuConfigScriptsHook, llvmPackages }: stdenv.mkDerivation rec { pname = "source-highlight"; @@ -46,7 +46,10 @@ stdenv.mkDerivation rec { # necessary to build on FreeBSD native pending inclusion of # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0 nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - buildInputs = [ boost ]; + buildInputs = [ boost ] + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) (llvmPackages.compiler-rt.override { + doFakeLibgcc = true; + }); configureFlags = [ "--with-boost=${boost.out}" @@ -71,4 +74,7 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ SuperSandro2000 ]; }; +} // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) { + # Force linking to "libgcc" so tests pass + NIX_CFLAGS_COMPILE = "-lgcc"; } diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index 431b046471a44..f812bc9c6be4f 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ python3 ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkTarget = "test"; diff --git a/pkgs/tools/text/teip/default.nix b/pkgs/tools/text/teip/default.nix index 90a41a8cf38d4..ab140f2a578c3 100644 --- a/pkgs/tools/text/teip/default.nix +++ b/pkgs/tools/text/teip/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { # tests are locale sensitive preCheck = '' - export LANG=${if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"} + export LANG=${if stdenv.hostPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8"} ''; postInstall = '' diff --git a/pkgs/tools/text/termbook/default.nix b/pkgs/tools/text/termbook/default.nix index 437016e25ec23..7172de5e41d7f 100644 --- a/pkgs/tools/text/termbook/default.nix +++ b/pkgs/tools/text/termbook/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/text/uwc/default.nix b/pkgs/tools/text/uwc/default.nix index 42777accb8265..db6868f161d13 100644 --- a/pkgs/tools/text/uwc/default.nix +++ b/pkgs/tools/text/uwc/default.nix @@ -1,24 +1,24 @@ -{ rustPlatform, lib, fetchFromGitLab }: +{ rustPlatform, lib, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "uwc"; - version = "1.0.5"; + version = "1.0.7"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "dead10ck"; - repo = pname; - rev = "v${version}"; - hash = "sha256-x2mijB1GkxdraFroG1+PiBzWKPjsaAeoDt0HFL2v93I="; + repo = "uwc"; + rev = "refs/tags/v${version}"; + hash = "sha256-Qv8vMjCMhpVxkJyH1uTsFXu2waO8oaLPuoBETaWOUqI="; }; - cargoHash = "sha256-0IvOaQaXfdEz5tlXh5gTbnZG9QZSWDVHGOqYq8aWOIc="; + cargoHash = "sha256-20brxqYAvgBxbOQ7KOFviXxmFrSHDXNV/0lcks7x3a8="; - doCheck = true; + doCheck = false; meta = with lib; { description = "Like wc, but unicode-aware, and with per-line mode"; mainProgram = "uwc"; - homepage = "https://gitlab.com/dead10ck/uwc"; + homepage = "https://github.com/dead10ck/uwc"; license = licenses.mit; maintainers = with maintainers; [ ShamrockLee ]; }; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix deleted file mode 100644 index fa256b04aca49..0000000000000 --- a/pkgs/tools/text/vale/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, makeBinaryWrapper -, runCommand -, symlinkJoin -, vale -, valeStyles -}: - -buildGoModule rec { - pname = "vale"; - version = "3.7.1"; - - subPackages = [ "cmd/vale" ]; - - src = fetchFromGitHub { - owner = "errata-ai"; - repo = "vale"; - rev = "v${version}"; - hash = "sha256-jb+ap+XQMrSqstgexycpgO+M2YyENDeSmMQXrV2FiM4="; - }; - - vendorHash = "sha256-0AeG0/ALU/mkXxVKzqGhxXLqq2XYmnF/ZRaZkJ5eQxU="; - - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - - # Tests require network access - doCheck = false; - - passthru.withStyles = selector: symlinkJoin { - name = "vale-with-styles-${vale.version}"; - paths = [ vale ] ++ selector valeStyles; - nativeBuildInputs = [ makeBinaryWrapper ]; - postBuild = '' - wrapProgram "$out/bin/vale" \ - --set VALE_STYLES_PATH "$out/share/vale/styles/" - ''; - meta = { - inherit (vale.meta) mainProgram; - }; - }; - - meta = with lib; { - description = "Syntax-aware linter for prose built with speed and extensibility in mind"; - longDescription = '' - Vale in Nixpkgs offers the helper `.withStyles` allow you to install it - predefined styles: - - vale.withStyles (s: [ s.alex s.google ]) - ''; - homepage = "https://vale.sh/"; - changelog = "https://github.com/errata-ai/vale/releases/tag/v${version}"; - mainProgram = "vale"; - license = licenses.mit; - maintainers = [ maintainers.pbsds ]; - }; -} diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index e355e58d2eccc..a367c61d5bc8e 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip copyDesktopItems ]; buildInputs = [ jre ]; - desktopItems = lib.optional (!stdenv.isDarwin) (makeDesktopItem { + desktopItems = lib.optional (!stdenv.hostPlatform.isDarwin) (makeDesktopItem { name = "basex"; exec = "basexgui %f"; icon = "${./basex.svg}"; # icon copied from Ubuntu basex package diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index b779a6c962ca4..62b6a83d3f326 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-y9f9eBMhSBx6L3cZyZ4VkNSB7yJ55khCskUp6t4HBq4="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Fast CSV toolkit written in Rust"; diff --git a/pkgs/tools/text/zet/default.nix b/pkgs/tools/text/zet/default.nix index af04b5fdc2035..c94380047d1ac 100644 --- a/pkgs/tools/text/zet/default.nix +++ b/pkgs/tools/text/zet/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch2 }: rustPlatform.buildRustPackage rec { @@ -14,6 +15,15 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IjM+jSb+kdML0zZGuz9+9wrFzQCujn/bg9/vaTzMtUs="; }; + patches = [ + # fix unused_qualifications lint with rust 1.78+ + # https://github.com/yarrow/zet/commit/b6a0c67f6ac76fb7bf8234951678b77fbac12d76 + (fetchpatch2 { + url = "https://github.com/yarrow/zet/commit/b6a0c67f6ac76fb7bf8234951678b77fbac12d76.patch?full_index=1"; + hash = "sha256-HojhKM7UJh5xpD9a18Wh0hiiUDOE+jK0BKGYozYjMBc="; + }) + ]; + cargoHash = "sha256-kHIOsSR7ZxBzp4dtm2hbi8ddtlQ86x5EASk5HFmnhFo="; # tests fail with `--release` diff --git a/pkgs/tools/text/zoekt/default.nix b/pkgs/tools/text/zoekt/default.nix deleted file mode 100644 index 293ad7a0954cd..0000000000000 --- a/pkgs/tools/text/zoekt/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, git -}: -buildGoModule { - pname = "zoekt"; - version = "unstable-2022-11-09"; - - src = fetchFromGitHub { - owner = "sourcegraph"; - repo = "zoekt"; - rev = "c4b18d3b44da94b3e7c9c94467d68c029666bb86"; - hash = "sha256-QtwOiBxBeFkhRfH3R2fP72b05Hc4+zt9njqCNVcprZ4="; - }; - - vendorHash = "sha256-DiAqFJ8E5V0/eHztm92WVrf1XGPXmmOaVXaWHfQMn2k="; - - nativeCheckInputs = [ - git - ]; - - preCheck = '' - export HOME=`mktemp -d` - git config --global --replace-all protocol.file.allow always - ''; - - meta = { - description = "Fast trigram based code search"; - homepage = "https://github.com/sourcegraph/zoekt"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ AndersonTorres ]; - mainProgram = "zoekt"; - }; -} diff --git a/pkgs/tools/typesetting/biber-ms/default.nix b/pkgs/tools/typesetting/biber-ms/default.nix index 27821bbd8adac..38452d7f9638d 100644 --- a/pkgs/tools/typesetting/biber-ms/default.nix +++ b/pkgs/tools/typesetting/biber-ms/default.nix @@ -33,7 +33,7 @@ perlPackages.buildPerlModule { TextCSV_XS TextRoman URI UnicodeLineBreak XMLLibXML XMLLibXMLSimple XMLLibXSLT XMLWriter autovivification ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; preConfigure = '' cp '${multiscriptBltxml}' t/tdata/multiscript.bltxml @@ -41,7 +41,7 @@ perlPackages.buildPerlModule { postInstall = '' mv "$out"/bin/biber{,-ms} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang "$out"/bin/biber-ms ''; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index f14096900ed9c..1e5a4ec21666d 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -20,9 +20,9 @@ perlPackages.buildPerlModule { TestDifferences PerlIOutf8_strict ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/biber ''; diff --git a/pkgs/tools/typesetting/bibtex-tidy/default.nix b/pkgs/tools/typesetting/bibtex-tidy/default.nix index 2c1167fc21cdc..862c82c9d5c90 100644 --- a/pkgs/tools/typesetting/bibtex-tidy/default.nix +++ b/pkgs/tools/typesetting/bibtex-tidy/default.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "bibtex-tidy"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "FlamingTempura"; repo = "bibtex-tidy"; - rev = "9658d907d990fd80d25ab37d9aee120451bf5d19"; - hash = "sha256-4TrEabxIVB0Vu/E1ClKwk7lXcnPgoVh3RjLYsPwH2yQ="; + rev = "v${version}"; + hash = "sha256-sMgy29deEfc3DFSC0Z4JZCeNAFpBKNYj+mJnFI1pSY4="; }; - npmDepsHash = "sha256-VzzHGmW7Rb6dEdBxd84GXKSPasqfTkn+5rNw9C2lt8k="; + npmDepsHash = "sha256-FKde5/ZZcS5g0fUaDjhRlKGLiS8kk1PvkZw9PUmvAAE="; env = { PUPPETEER_SKIP_DOWNLOAD = true; diff --git a/pkgs/tools/typesetting/coq2html/default.nix b/pkgs/tools/typesetting/coq2html/default.nix index 69b3bc0ff2396..049a48089aea6 100644 --- a/pkgs/tools/typesetting/coq2html/default.nix +++ b/pkgs/tools/typesetting/coq2html/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "coq2html"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "xavierleroy"; repo = "coq2html"; rev = "v${version}"; - hash = "sha256-2J9uETDt+P+t4E9KhTIypA4MQpTCCxYmR6FYF30RqKk="; + hash = "sha256-dBXYeRwBhBWXJfdULLzfgZU+WD6WC6R8wV2eS1zAkq8="; }; nativeBuildInputs = [ ocaml ]; diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index f47c9dac0f10b..4dfb307689b43 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib cups libpng libjpeg ] - ++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation SystemConfiguration ]; # do not generate universal binary on Darwin # because it is not supported by Nix's clang diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock b/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock index c975e23f323c2..50c1f5ffddba0 100644 --- a/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock +++ b/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock @@ -1,9 +1,15 @@ GEM remote: https://rubygems.org/ specs: - kramdown (1.17.0) - kramdown-asciidoc (1.0.1) - kramdown (~> 1.17.0) + kramdown (2.4.0) + rexml + kramdown-asciidoc (2.1.0) + kramdown (~> 2.4.0) + kramdown-parser-gfm (~> 1.1.0) + rexml (~> 3.2.0) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + rexml (3.2.6) PLATFORMS ruby @@ -12,4 +18,4 @@ DEPENDENCIES kramdown-asciidoc BUNDLED WITH - 2.1.4 + 2.4.22 diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix b/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix index 0ade973304d19..e750dd6655ac8 100644 --- a/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix +++ b/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix @@ -1,23 +1,45 @@ { kramdown = { + dependencies = ["rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; type = "gem"; }; - version = "1.17.0"; + version = "2.4.0"; }; kramdown-asciidoc = { + dependencies = ["kramdown" "kramdown-parser-gfm" "rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j7qbpq6zhgcf9ykhz5r1wlr3r8fls6hvhdisxzz4v35rni5kwp9"; + type = "gem"; + }; + version = "2.1.0"; + }; + kramdown-parser-gfm = { dependencies = ["kramdown"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nr4hss1byhchwkqy2w0dgc7s83n0s5xm0pjms2cmckc4sbrryxi"; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; + type = "gem"; + }; + version = "1.1.0"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "1.0.1"; + version = "3.2.6"; }; } diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 189ba55838b66..e898d73269641 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook +, fetchpatch , enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic # for passthru.tests @@ -16,10 +17,44 @@ stdenv.mkDerivation rec { hash = "sha512-EpAWTz7Zy+2qqJGgzLrt0tK7WEZ+hHbdyqzAmMiaqc6uNXscR88git6/UbTjvB9Yanvetvw9huSuyhcORCEIug=="; }; + patches = [ + # Improve UTF-8 handling on macOS by not treating bytes >=0x80, which tend to be + # UTF-8 continuation bytes, as control characters. + # + # This leaves control characters U+0080 through U+009F in the output + # (incorrectly) but doesn't mangle other UTF-8 characters, so it's a net + # win. + # + # See: https://github.com/kristapsdz/lowdown/pull/140 + (fetchpatch { + url = "https://github.com/kristapsdz/lowdown/commit/5a02866dd682363a8e4f6b344c223cfe8b597da9.diff"; + hash = "sha256-7tGhZJQQySeBv4h6A4r69BBbQkPRX/3JTw/80A8YXjQ="; + }) + (fetchpatch { + url = "https://github.com/kristapsdz/lowdown/commit/c033a6886e4d6efb948782fbc389fe5f673acf36.diff"; + hash = "sha256-7DvKFerAMoPifuTn7rOX4ru888HfBkpspH1opIbzj08="; + }) + + # Don't output a newline after .SH + # + # This fixes `makewhatis` output on macOS and (as a result) `man` + # completions for `fish` on macOS. + # + # See: https://github.com/kristapsdz/lowdown/pull/138 + (fetchpatch { + url = "https://github.com/kristapsdz/lowdown/commit/e05929a09a697de3d2eb14d0f0a087a6fae22e11.diff"; + hash = "sha256-P03W+hFeBKwfJB+DhGCPq0DtiOiLLc+0ZvWrWqXFvVU="; + }) + (fetchpatch { + url = "https://github.com/kristapsdz/lowdown/commit/9906f8ceac586c54eb39ae78105fd84653a89c33.diff"; + hash = "sha256-nBnAgTb8RDe/QpUhow3lyeR7UIVJX2o4lmP78e2fw/E="; + }) + ]; + nativeBuildInputs = [ which dieHook ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; - preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' echo 'HAVE_SANDBOX_INIT=0' > configure.local ''; @@ -50,13 +85,13 @@ stdenv.mkDerivation rec { in # Check that soVersion is up to date even if we are not on darwin - lib.optionalString (enableShared && !stdenv.isDarwin) '' + lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) '' test -f $lib/lib/liblowdown.so.${soVersion} || \ die "postInstall: expected $lib/lib/liblowdown.so.${soVersion} is missing" '' # Fix lib extension so that fixDarwinDylibNames detects it, see # <https://github.com/kristapsdz/lowdown/issues/87#issuecomment-1532243650>. - + lib.optionalString (enableShared && stdenv.isDarwin) '' + + lib.optionalString (enableShared && stdenv.hostPlatform.isDarwin) '' darwinDylib="$lib/lib/liblowdown.${soVersion}.dylib" mv "$lib/lib/liblowdown.so.${soVersion}" "$darwinDylib" diff --git a/pkgs/tools/typesetting/pulldown-cmark/default.nix b/pkgs/tools/typesetting/pulldown-cmark/default.nix index 6b38bf5d4a8d7..be71ffd8bd752 100644 --- a/pkgs/tools/typesetting/pulldown-cmark/default.nix +++ b/pkgs/tools/typesetting/pulldown-cmark/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "pulldown-cmark"; - version = "0.12.0"; + version = "0.12.1"; src = fetchCrate { inherit pname version; - hash = "sha256-LBaWfcTA5qxhrEUG0FeusGZBgvRjuQS0/1pqeKQQWbk="; + hash = "sha256-PfkmzmK98Mzay6P48NTEJhtpuoCiTb3JqUIYObcS41k="; }; - cargoHash = "sha256-UPv7F/itmISaUikR6jdAj3FvTF56VqwdMvD3L3WruA4="; + cargoHash = "sha256-BhlKFisM1ho7xcwBnjtODQdacE/B9UoqYXj3dIAeTXE="; meta = { description = "Pull parser for CommonMark written in Rust"; diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index b6a77b55f6851..49dbc74422e7a 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -70,13 +70,13 @@ stdenv.mkDerivation (finalAttrs: { fontconfig libiconv ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.AppKit ; passthru = { # So it will be easier to inspect this environment, in comparison to others inherit luaEnv; # Copied from Makefile.am - tests.test = lib.optionalAttrs (!(stdenv.isDarwin && stdenv.isAarch64)) ( + tests.test = lib.optionalAttrs (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) ( runCommand "sile-test" { nativeBuildInputs = [ poppler_utils sile ]; @@ -90,11 +90,11 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs build-aux/*.sh - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m ''; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit"; FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in "$out"/bin/*; do if isELF "$f"; then patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix deleted file mode 100644 index 9602ff7d167ec..0000000000000 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fig2dev -, gettext -, ghostscript -, guile -, guile-lib -, guile-reader -, imagemagick -, makeWrapper -, pkg-config -, enableEmacs ? false, emacs -, enableLout ? stdenv.isLinux, lout -, enablePloticus ? stdenv.isLinux, ploticus -, enableTex ? true, texliveSmall -}: - -let - inherit (lib) optional; -in stdenv.mkDerivation (finalAttrs: { - pname = "skribilo"; - version = "0.10.0"; - - src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/skribilo/skribilo-${finalAttrs.version}.tar.gz"; - hash = "sha256-jP9I7hds7f1QMmSaNJpGlSvqUOwGcg+CnBzMopIS9Q4="; - }; - - nativeBuildInputs = [ - makeWrapper - pkg-config - ]; - - buildInputs = [ - fig2dev - gettext - ghostscript - guile - guile-lib - guile-reader - imagemagick - ] - ++ optional enableEmacs emacs - ++ optional enableLout lout - ++ optional enablePloticus ploticus - ++ optional enableTex texliveSmall; - - postInstall = '' - wrapProgram $out/bin/skribilo \ - --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \ - --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" - ''; - - meta = { - homepage = "https://www.nongnu.org/skribilo/"; - description = "Ultimate Document Programming Framework"; - longDescription = '' - Skribilo is a free document production tool that takes a structured - document representation as its input and renders that document in a - variety of output formats: HTML and Info for on-line browsing, and Lout - and LaTeX for high-quality hard copies. - - The input document can use Skribilo's markup language to provide - information about the document's structure, which is similar to HTML or - LaTeX and does not require expertise. Alternatively, it can use a simpler, - "markup-less" format that borrows from Emacs' outline mode and from other - conventions used in emails, Usenet and text. - ''; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 0cc8b18de92a2..815cc01f8be69 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -45,12 +45,12 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "external-harfbuzz" ]; buildInputs = [ icu fontconfig harfbuzz openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); postInstall = '' # Makes it possible to automatically use the V2 CLI API ln -s $out/bin/tectonic $out/bin/nextonic - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace dist/appimage/tectonic.desktop \ --replace Exec=tectonic Exec=$out/bin/tectonic install -D dist/appimage/tectonic.desktop -t $out/share/applications/ diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index 4cff637d7706e..a6c46c6c7df59 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = "https://nllgg.nl/Ted/"; license = licenses.gpl2Only; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ obadz ]; }; } diff --git a/pkgs/tools/typesetting/tex/blahtexml/default.nix b/pkgs/tools/typesetting/tex/blahtexml/default.nix index 9d88ac3b0be60..8f4b1980d3132 100644 --- a/pkgs/tools/typesetting/tex/blahtexml/default.nix +++ b/pkgs/tools/typesetting/tex/blahtexml/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; nativeBuildInputs = [ texliveFull ]; # scheme-full needed for ucs package - buildInputs = [ xercesc ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ xercesc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildFlags = [ "doc" ] ++ - (if stdenv.isDarwin + (if stdenv.hostPlatform.isDarwin then [ "blahtex-mac" "blahtexml-mac" ] else [ "blahtex-linux" "blahtexml-linux" ]); diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/pkgs/tools/typesetting/tex/pplatex/default.nix index 367daa9450fc3..7bd1e4d0eb1ea 100644 --- a/pkgs/tools/typesetting/tex/pplatex/default.nix +++ b/pkgs/tools/typesetting/tex/pplatex/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "pplatex"; homepage = "https://github.com/stefanhepp/pplatex"; license = licenses.gpl3Plus; - maintainers = [ maintainers.srgom maintainers.doronbehar ]; + maintainers = [ maintainers.doronbehar ]; platforms = platforms.unix; }; }) diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 6000a13ec6212..02471c8631846 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # fixes "error: conflicting types for 'calloc'", etc. - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 57d texk/kpathsea/c-std.h ''; - preConfigure = if stdenv.isCygwin then '' + preConfigure = if stdenv.hostPlatform.isCygwin then '' find ./ -name "config.guess" -exec rm {} \; -exec ln -s ${automake}/share/automake-*/config.guess {} \; '' else null; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "--without-oxdvik" "--without-texinfo" "--without-texi2html" "--with-system-zlib" "--with-system-pnglib" "--with-system-ncurses" ] # couldn't get gsftopk working on darwin - ++ lib.optional stdenv.isDarwin "--without-gsftopk"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--without-gsftopk"; postUnpack = '' mkdir -p $out/share/texmf diff --git a/pkgs/tools/typesetting/tex/texpresso/default.nix b/pkgs/tools/typesetting/tex/texpresso/default.nix index 8653782da71c4..73c111bd22b04 100644 --- a/pkgs/tools/typesetting/tex/texpresso/default.nix +++ b/pkgs/tools/typesetting/tex/texpresso/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { buildFlags = [ "texpresso" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=implicit-function-declaration" ]); diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 3433bde6e11ab..24c11d8695d66 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; installPhase = '' runHook preInstall diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index 12764ad92778e..5059cfa0c8382 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_ARCHITECTURES=" ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; # Patch binaries to use our dylib - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' find $out/bin -maxdepth 1 -executable -type f -exec install_name_tool -change @rpath/libap4.dylib $out/lib/libap4.dylib {} \; ''; diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index acb59fd21bdbe..8c5942d85210e 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ] ++ lib.optional gnutlsSupport "CRYPTO=GNUTLS" ++ lib.optional opensslSupport "CRYPTO=OPENSSL" - ++ lib.optional stdenv.isDarwin "SYS=darwin" + ++ lib.optional stdenv.hostPlatform.isDarwin "SYS=darwin" ++ lib.optional stdenv.cc.isClang "CC=clang"; propagatedBuildInputs = [ zlib ] diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 4ffa2892195cf..e9d2c4b571fe7 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "svt-av1"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${finalAttrs.version}"; - hash = "sha256-jrfnUcDTbrf3wWs0D57ueeLmndhpOQChM7gBB14MzcQ="; + hash = "sha256-LkTcy+CiuhlRnQsjNMA0hTVRVx7pbYs1ujMWjLrhvEU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 9e8fea8b53a61..e7e28c09a2d8b 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxslt freetype libpng libxml2 ]; # fatal error: 'libxml/xpath.h' file not found - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libxml2.dev}/include/libxml2"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${libxml2.dev}/include/libxml2"; meta = { description = "Xml2swf and swf2xml processor with import functionalities"; diff --git a/pkgs/tools/video/tsduck/default.nix b/pkgs/tools/video/tsduck/default.nix index 2e91b2dc8575d..0da53e2e96ea9 100644 --- a/pkgs/tools/video/tsduck/default.nix +++ b/pkgs/tools/video/tsduck/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ siriobalmelli ]; platforms = platforms.all; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/video/yaydl/default.nix b/pkgs/tools/video/yaydl/default.nix index e54d37b157077..83463e22c481b 100644 --- a/pkgs/tools/video/yaydl/default.nix +++ b/pkgs/tools/video/yaydl/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' wrapProgram $out/bin/yaydl \ diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix deleted file mode 100644 index 04dda18e6b788..0000000000000 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib, python3, fetchFromGitHub, glibcLocales, git }: - -let - changeVersion = overrideFunc: version: hash: overrideFunc (oldAttrs: rec { - inherit version; - src = oldAttrs.src.override { - inherit version hash; - }; - }); - - localPython = python3.override { - self = localPython; - packageOverrides = self: super: { - cement = - changeVersion super.cement.overridePythonAttrs "2.10.14" - "sha256-NC4n21SmYW3RiS7QuzWXoifO4z3C2FVgQm3xf8qQcFg="; - }; - }; - -in - -localPython.pkgs.buildPythonApplication rec { - pname = "awsebcli"; - version = "3.20.10"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "aws"; - repo = "aws-elastic-beanstalk-cli"; - rev = "refs/tags/${version}"; - hash = "sha256-4JZx0iTMyrPHbuS3zlhpiWnenAQO5eSBJbPHUizLhYo="; - }; - - postPatch = '' - # https://github.com/aws/aws-elastic-beanstalk-cli/pull/469 - substituteInPlace setup.py --replace "scripts=['bin/eb']," "" - ''; - - nativeBuildInputs = with localPython.pkgs; [ - ]; - - buildInputs = [ - glibcLocales - ]; - - propagatedBuildInputs = with localPython.pkgs; [ - blessed - botocore - cement - colorama - pathspec - pyyaml - future - requests - semantic-version - setuptools - tabulate - termcolor - websocket-client - ]; - - pythonRelaxDeps = [ - "botocore" - "colorama" - "pathspec" - "PyYAML" - "six" - "termcolor" - ]; - - nativeCheckInputs = with localPython.pkgs; [ - pytestCheckHook - pytest-socket - mock - git - ]; - - pytestFlagsArray = [ - "tests/unit" - ]; - - disabledTests = [ - # Needs docker installed to run. - "test_local_run" - "test_local_run__with_arguments" - - # Needs access to the user's ~/.ssh directory. - "test_generate_and_upload_keypair__exit_code_0" - "test_generate_and_upload_keypair__exit_code_1" - "test_generate_and_upload_keypair__exit_code_is_other_than_1_and_0" - "test_generate_and_upload_keypair__ssh_keygen_not_present" - ]; - - meta = with lib; { - homepage = "https://aws.amazon.com/elasticbeanstalk/"; - description = "Command line interface for Elastic Beanstalk"; - changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${version}/CHANGES.rst"; - maintainers = with maintainers; [ eqyiel kirillrdy ]; - license = licenses.asl20; - mainProgram = "eb"; - }; -} diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index 5ccf8070c3c9b..b2927b7c50000 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,24 +1,33 @@ { lib -, pkg-config , buildGoModule -, fetchFromGitHub -, makeWrapper +, callPackage +, cdrkit , coreutils +, debootstrap +, fetchFromGitHub , gnupg , gnutar -, squashfsTools -, debootstrap -, callPackage +, hivex +, makeWrapper , nixosTests +, pkg-config +, squashfsTools +, stdenv +, wimlib }: let bins = [ coreutils + debootstrap gnupg gnutar squashfsTools - debootstrap + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + # repack-windows deps + cdrkit + hivex + wimlib ]; in buildGoModule rec { diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index 8e6d7b06d1702..0eaa1bb04a37a 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ec2-ami-tools"; - version = "1.5.7"; + version = "1.5.19"; nativeBuildInputs = [ makeWrapper unzip ]; src = fetchurl { url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip"; - sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias"; + sha256 = "sha256-vdpElL6n1V3/+ZVFndRwWpU/M2W7xp8DQwx5a1zB3X8="; }; # Amazon EC2 requires that disk images are writable. If they're diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index c980a45bbef2d..a745a2e39d56b 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -4,7 +4,6 @@ , bash , bashInteractive , util-linux -, boto , setuptools , distro }: @@ -21,7 +20,7 @@ buildPythonPackage rec { }; buildInputs = [ bash ]; - propagatedBuildInputs = [ boto setuptools distro ]; + propagatedBuildInputs = [ setuptools distro ]; postPatch = '' for file in $(find google_compute_engine -type f); do diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index c7144003c4295..ce06c33e8ba82 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.42.0"; + version = "0.43.0"; subPackages = [ "govc" ]; @@ -10,10 +10,10 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-Sr3cJHnNeEPpYcAl+DmVL6lG0FKFhNHOVejRWBE3yUM="; + sha256 = "sha256-TLkSDi8s8zqUED76Bfznm3VLwUi0+tmUjbddqHlwiUQ="; }; - vendorHash = "sha256-W4Q4jCbW5lruXEhgKg7ZiPCHGxuYwYqi8Qm2JMyJaFE="; + vendorHash = "sha256-C8NeTGPqzFe3UYB90sEui67e5wUsH/15rwkwahNTLHM="; ldflags = [ "-s" diff --git a/pkgs/tools/virtualization/jumppad/default.nix b/pkgs/tools/virtualization/jumppad/default.nix index 35598459e1277..ee521f6b5260b 100644 --- a/pkgs/tools/virtualization/jumppad/default.nix +++ b/pkgs/tools/virtualization/jumppad/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "jumppad"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = version; - hash = "sha256-JGc24CzSoEvm1+2NLWvWfAvWlRwxNnddemlQfz3YpQM="; + hash = "sha256-f9V3dws4zvjh3H61FWNv9r/G9EplWR0aA2af2EdjhBs="; }; - vendorHash = "sha256-dqCnk1g8ksznC79En4C29oB1gmZcZMkxd70Lz62Adgc="; + vendorHash = "sha256-S4SyuidH8sxJbuG7yHgSP/iHcuP1h5EHaW8X6gG4GNw="; subPackages = [ "." ]; diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/tools/virtualization/kubevirt/default.nix index 56d2b4276ae5a..efe4a7ffb0181 100644 --- a/pkgs/tools/virtualization/kubevirt/default.nix +++ b/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "1.2.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - hash = "sha256-W31B803XTdJ7ExeIwsTAac7RyAX7TZI3UKLURkotjBI="; + hash = "sha256-t6lIHuMvo8iqYkZ1mYVU6fgOP3Q6sqWaTcFLTqAIm5c="; }; vendorHash = null; diff --git a/pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch b/pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch new file mode 100644 index 0000000000000..30a107be5dd06 --- /dev/null +++ b/pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch @@ -0,0 +1,116 @@ +From eb36791f873dd645b1cbfa693b9c246943647190 Mon Sep 17 00:00:00 2001 +From: Moritz Sanft <58110325+msanft@users.noreply.github.com> +Date: Tue, 3 Sep 2024 08:57:26 +0200 +Subject: [PATCH 1/3] Use wrapped binaries instead of Python interpreter + +Rather than calling ukify and mkosi with sys.executable, which doesn't use the Python wrappers for PATH and PYTHONPATH, we call the wrapped binaries directly. + +Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> +--- + mkosi/__init__.py | 19 ++++--------------- + mkosi/run.py | 8 ++++---- + 2 files changed, 8 insertions(+), 19 deletions(-) + +diff --git a/mkosi/__init__.py b/mkosi/__init__.py +index cc8482c4..ba44ad31 100644 +--- a/mkosi/__init__.py ++++ b/mkosi/__init__.py +@@ -2059,16 +2059,7 @@ def join_initrds(initrds: Sequence[Path], output: Path) -> Path: + + + def python_binary(config: Config, *, binary: Optional[PathString]) -> PathString: +- tools = ( +- not binary or +- not (path := config.find_binary(binary)) or +- not any(path.is_relative_to(d) for d in config.extra_search_paths) +- ) +- +- # If there's no tools tree, prefer the interpreter from MKOSI_INTERPRETER. If there is a tools +- # tree, just use the default python3 interpreter. +- exe = Path(sys.executable) +- return "python3" if (tools and config.tools_tree) or not exe.is_relative_to("/usr") else exe ++ return "@PYTHON_PEFILE@" + + + def extract_pe_section(context: Context, binary: Path, section: str, output: Path) -> Path: +@@ -2135,11 +2126,10 @@ def build_uki( + if not (arch := context.config.architecture.to_efi()): + die(f"Architecture {context.config.architecture} does not support UEFI") + +- if not (ukify := context.config.find_binary("ukify", "/usr/lib/systemd/ukify")): ++ if not (ukify := context.config.find_binary("ukify", "@UKIFY@")): + die("Could not find ukify") + + cmd: list[PathString] = [ +- python_binary(context.config, binary=ukify), + ukify, + *(["--cmdline", f"@{context.workspace / 'cmdline'}"] if cmdline else []), + "--os-release", f"@{context.root / 'usr/lib/os-release'}", +@@ -2213,7 +2203,6 @@ def build_uki( + # new .ucode section support? + if ( + systemd_tool_version( +- python_binary(context.config, binary=ukify), + ukify, + sandbox=context.sandbox, + ) >= "256" and +@@ -2303,7 +2292,7 @@ def want_uki(context: Context) -> bool: + context.config.unified_kernel_images == ConfigFeature.enabled or ( + context.config.unified_kernel_images == ConfigFeature.auto and + systemd_stub_binary(context).exists() and +- context.config.find_binary("ukify", "/usr/lib/systemd/ukify") is not None ++ context.config.find_binary("ukify", "@UKIFY@") is not None + ) + ) + +@@ -2914,7 +2903,7 @@ def check_ukify( + reason: str, + hint: Optional[str] = None, + ) -> None: +- ukify = check_tool(config, "ukify", "/usr/lib/systemd/ukify", reason=reason, hint=hint) ++ ukify = check_tool(config, "ukify", "@UKIFY@", reason=reason, hint=hint) + + v = systemd_tool_version(python_binary(config, binary=ukify), ukify, sandbox=config.sandbox) + if v < version: +diff --git a/mkosi/run.py b/mkosi/run.py +index fd3bc98e..de47349a 100644 +--- a/mkosi/run.py ++++ b/mkosi/run.py +@@ -450,7 +450,7 @@ def sandbox_cmd( + ) -> Iterator[list[PathString]]: + cmdline: list[PathString] = [ + *setup, +- sys.executable, "-SI", mkosi.sandbox.__file__, ++ @MKOSI_SANDBOX@, + "--proc", "/proc", + # We mounted a subdirectory of TMPDIR to /var/tmp so we unset TMPDIR so that /tmp or /var/tmp are used instead. + "--unsetenv", "TMPDIR", +@@ -563,7 +563,7 @@ def apivfs_options(*, root: Path = Path("/buildroot")) -> list[PathString]: + def apivfs_script_cmd(*, tools: bool, options: Sequence[PathString] = ()) -> list[PathString]: + exe = Path(sys.executable) + return [ +- "python3" if tools or not exe.is_relative_to("/usr") else exe, "-SI", "/sandbox.py", ++ @MKOSI_SANDBOX@, + "--bind", "/", "/", + "--same-dir", + "--bind", "/var/tmp", "/buildroot/var/tmp", +@@ -597,7 +597,7 @@ def chroot_cmd( + options: Sequence[PathString] = (), + ) -> Iterator[list[PathString]]: + cmdline: list[PathString] = [ +- sys.executable, "-SI", mkosi.sandbox.__file__, ++ @MKOSI_SANDBOX@, + "--bind", root, "/", + # We mounted a subdirectory of TMPDIR to /var/tmp so we unset TMPDIR so that /tmp or /var/tmp are used instead. + "--unsetenv", "TMPDIR", +@@ -619,7 +619,7 @@ def chroot_cmd( + def chroot_script_cmd(*, tools: bool, network: bool = False, work: bool = False) -> list[PathString]: + exe = Path(sys.executable) + return [ +- "python3" if tools or not exe.is_relative_to("/usr") else exe, "-SI", "/sandbox.py", ++ @MKOSI_SANDBOX@, + "--bind", "/buildroot", "/", + "--bind", "/var/tmp", "/var/tmp", + *apivfs_options(root=Path("/")), +-- +2.45.2 diff --git a/pkgs/tools/virtualization/mkosi/0002-Fix-library-resolving.patch b/pkgs/tools/virtualization/mkosi/0002-Fix-library-resolving.patch new file mode 100644 index 0000000000000..8f4f3110d7ea2 --- /dev/null +++ b/pkgs/tools/virtualization/mkosi/0002-Fix-library-resolving.patch @@ -0,0 +1,36 @@ +From a1e6ccfeaf8ef10361280b9ecad958e9d556005b Mon Sep 17 00:00:00 2001 +From: Moritz Sanft <58110325+msanft@users.noreply.github.com> +Date: Tue, 3 Sep 2024 09:00:34 +0200 +Subject: [PATCH 2/3] Fix library resolving + +As ctypes doesn't do lookups in the Nix store for libraries, we supply the exact paths. + +Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> +--- + mkosi/sandbox/__init__.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkosi/sandbox/__init__.py b/mkosi/sandbox/__init__.py +index 7db340c5..3d0a0e56 100644 +--- a/mkosi/sandbox/__init__.py ++++ b/mkosi/sandbox/__init__.py +@@ -78,7 +78,7 @@ class cap_user_data_t(ctypes.Structure): + ] + + +-libc = ctypes.CDLL(None, use_errno=True) ++libc = ctypes.CDLL("@LIBC@", use_errno=True) + + libc.syscall.restype = ctypes.c_long + libc.unshare.argtypes = (ctypes.c_int,) +@@ -175,7 +175,7 @@ def seccomp_suppress_chown() -> None: + Unfortunately, non-root users can only create files owned by their own uid. To still allow non-root users to build + images, if requested we install a seccomp filter that makes calls to chown() and friends a noop. + """ +- libseccomp = ctypes.CDLL("libseccomp.so.2") ++ libseccomp = ctypes.CDLL("@LIBSECCOMP@") + if libseccomp is None: + raise FileNotFoundError("libseccomp.so.2") + +-- +2.45.2 diff --git a/pkgs/tools/virtualization/mkosi/0003-Fix-QEMU-firmware-path.patch b/pkgs/tools/virtualization/mkosi/0003-Fix-QEMU-firmware-path.patch new file mode 100644 index 0000000000000..028a581a9b7de --- /dev/null +++ b/pkgs/tools/virtualization/mkosi/0003-Fix-QEMU-firmware-path.patch @@ -0,0 +1,25 @@ +From e834d51aa2542b141ceafdd42285ded6a9997c90 Mon Sep 17 00:00:00 2001 +From: Moritz Sanft <58110325+msanft@users.noreply.github.com> +Date: Tue, 3 Sep 2024 09:09:19 +0200 +Subject: [PATCH 3/3] Fix QEMU firmware path + +Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> +--- + mkosi/qemu.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkosi/qemu.py b/mkosi/qemu.py +index b98bec65..886598aa 100644 +--- a/mkosi/qemu.py ++++ b/mkosi/qemu.py +@@ -182,7 +182,7 @@ def find_ovmf_firmware(config: Config, qemu: Path, firmware: QemuFirmware) -> Op + + tools = Path("/") if any(qemu.is_relative_to(d) for d in config.extra_search_paths) else config.tools() + +- desc = list((tools / "usr/share/qemu/firmware").glob("*")) ++ desc = list((tools / "@QEMU_FIRMWARE@").glob("*")) + if tools == Path("/"): + desc += list((tools / "etc/qemu/firmware").glob("*")) + +-- +2.45.2 diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix index 4514280f7757a..2f5dea5481fb7 100644 --- a/pkgs/tools/virtualization/mkosi/default.nix +++ b/pkgs/tools/virtualization/mkosi/default.nix @@ -1,29 +1,31 @@ -{ lib -, fetchFromGitHub -, stdenv -, python3 -, bubblewrap -, systemd -, pandoc -, kmod -, gnutar -, util-linux -, cpio -, bash -, coreutils -, btrfs-progs +{ + lib, + fetchFromGitHub, + stdenv, + python3, + systemd, + pandoc, + kmod, + gnutar, + util-linux, + cpio, + bash, + coreutils, + btrfs-progs, + libseccomp, + replaceVars, # Python packages -, setuptools -, setuptools-scm -, wheel -, buildPythonApplication -, pytestCheckHook -, pefile + setuptools, + setuptools-scm, + wheel, + buildPythonApplication, + pytestCheckHook, + pefile, # Optional dependencies -, withQemu ? false -, qemu + withQemu ? false, + qemu, }: let # For systemd features used by mkosi, see @@ -38,34 +40,51 @@ let withKernelInstall = true; }; - python3pefile = python3.withPackages (ps: with ps; [ - pefile - ]); + python3pefile = python3.withPackages ( + ps: with ps; [ + pefile + ] + ); in buildPythonApplication rec { pname = "mkosi"; - version = "22"; + version = "24.3-unstable-2024-08-28"; format = "pyproject"; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "systemd"; repo = "mkosi"; - rev = "v${version}"; - hash = "sha256-Zom1GlyhqgpTKfjcBOUEJMlubSn+TQsk97js1/UfDHY="; + rev = "8c2f828701a1bdb3dc9b80d6f2ab979f0430a6b8"; + hash = "sha256-rO/4ki2nAJQN2slmYuHKESGBBDMXC/ikGf6dMDcKFr4="; }; - # Fix ctypes finding library - # https://github.com/NixOS/nixpkgs/issues/7307 - postPatch = lib.optionalString stdenv.isLinux '' - substituteInPlace mkosi/user.py \ - --replace-fail 'ctypes.util.find_library("c")' "'${stdenv.cc.libc}/lib/libc.so.6'" - substituteInPlace mkosi/__init__.py \ - --replace-fail '/usr/lib/systemd/ukify' "${systemdForMkosi}/lib/systemd/ukify" - '' + lib.optionalString withQemu '' - substituteInPlace mkosi/qemu.py \ - --replace-fail "usr/share/qemu/firmware" "${qemu}/share/qemu/firmware" + patches = + [ + (replaceVars ./0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch { + UKIFY = "${systemdForMkosi}/lib/systemd/ukify"; + PYTHON_PEFILE = "${python3pefile}/bin/python3.12"; + MKOSI_SANDBOX = "~MKOSI_SANDBOX~"; # to satisfy replaceVars, will be replaced in postPatch + }) + (replaceVars ./0002-Fix-library-resolving.patch { + LIBC = "${stdenv.cc.libc}/lib/libc.so.6"; + LIBSECCOMP = "${libseccomp.lib}/lib/libseccomp.so.2"; + }) + ] + ++ lib.optional withQemu ( + replaceVars ./0003-Fix-QEMU-firmware-path.patch { + QEMU_FIRMWARE = "${qemu}/share/qemu/firmware"; + } + ); + + postPatch = '' + # As we need the $out reference, we can't use `replaceVars` here. + substituteInPlace mkosi/run.py \ + --replace-fail '~MKOSI_SANDBOX~' "\"$out/bin/mkosi-sandbox\"" ''; nativeBuildInputs = [ @@ -75,19 +94,20 @@ buildPythonApplication rec { wheel ]; - propagatedBuildInputs = [ - bash - btrfs-progs - bubblewrap - coreutils - cpio - gnutar - kmod - systemdForMkosi - util-linux - ] ++ lib.optional withQemu [ - qemu - ]; + propagatedBuildInputs = + [ + bash + btrfs-progs + coreutils + cpio + gnutar + kmod + systemdForMkosi + util-linux + ] + ++ lib.optional withQemu [ + qemu + ]; postBuild = '' ./tools/make-man-page.sh @@ -97,27 +117,21 @@ buildPythonApplication rec { pytestCheckHook ]; - pythonImportsCheck = [ - "mkosi" - ]; - postInstall = '' mkdir -p $out/share/man/man1 mv mkosi/resources/mkosi.1 $out/share/man/man1/ ''; - makeWrapperArgs = [ - "--set MKOSI_INTERPRETER ${python3pefile}/bin/python3" - "--prefix PYTHONPATH : \"$PYTHONPATH\"" - ]; - meta = with lib; { description = "Build legacy-free OS images"; homepage = "https://github.com/systemd/mkosi"; changelog = "https://github.com/systemd/mkosi/releases/tag/v${version}"; license = licenses.lgpl21Only; mainProgram = "mkosi"; - maintainers = with maintainers; [ malt3 katexochen ]; + maintainers = with maintainers; [ + malt3 + msanft + ]; platforms = platforms.linux; # `mkosi qemu` boot fails in the uefi shell, image isn't found. broken = withQemu; diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix index 46e1614385bf9..6df3491c085dc 100644 --- a/pkgs/tools/virtualization/ovftool/default.nix +++ b/pkgs/tools/virtualization/ovftool/default.nix @@ -65,15 +65,15 @@ stdenv.mkDerivation { libxcrypt-legacy xercesc zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glibc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Libsystem libxml2 ]; nativeBuildInputs = [ unzip makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; postUnpack = '' # The linux package wraps ovftool.bin with ovftool. Wrapping @@ -103,7 +103,7 @@ stdenv.mkDerivation { # Darwin dylibs are under `lib` in the zip. install -m 755 -d "$out/lib" install -m 644 -t "$out/lib" \ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' libcrypto.so.1.0.2 \ libcurl.so.4 \ libgoogleurl.so.59 \ @@ -112,7 +112,7 @@ stdenv.mkDerivation { libvim-types.so \ libvmacore.so \ libvmomi.so - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' lib/libcrypto.1.0.2.dylib \ lib/libcurl.4.dylib \ lib/libgoogleurl.59.0.30.45.2.dylib \ @@ -151,17 +151,17 @@ stdenv.mkDerivation { # Install final executable install -m 755 -d "$out/bin" makeWrapper "$out/libexec/ovftool" "$out/bin/ovftool" \ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' --prefix LD_LIBRARY_PATH : "$out/lib" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' --prefix DYLD_LIBRARY_PATH : "$out/lib" '' + '' runHook postInstall ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' addAutoPatchelfSearchPath "$out/lib" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' change_args=() # Change relative @loader_path dylibs to absolute paths. @@ -208,7 +208,7 @@ stdenv.mkDerivation { ''; # These paths are need for install check tests - propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' (allow file-read* (subpath "/usr/share/locale")) (allow file-read* (subpath "/var/db/timezone")) (allow file-read* (subpath "/System/Library/TextEncodings")) @@ -216,7 +216,7 @@ stdenv.mkDerivation { doInstallCheck = true; - postInstallCheck = lib.optionalString stdenv.isDarwin '' + postInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME=$TMPDIR # Construct a dummy /etc/passwd file - ovftool attempts to determine the # user's "real" home using this diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 9a00c7d163dca..d3f7dd2af9221 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rootlesskit"; - version = "2.1.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - hash = "sha256-SWLXY7SsoeJFr2RLOtVSnt5Knx44+9hNIy50NzN602k="; + hash = "sha256-5aQwXNtGAZuVwOpX700VVFTxM/kxOT6c1NtpJR4s1xQ="; }; - vendorHash = "sha256-74El20C7kE0lLAng9wQL7MnfcJLtPR2cAk00CuO4NlY="; + vendorHash = "sha256-Wj3wthDMNkuWVWFIqRsVUeJfoUvjyyu2gCvFBjh8mGw="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index 8f0afedfd9cb1..25ae2fe9ee33b 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -17,6 +17,11 @@ python3Packages.buildPythonApplication rec { hash = "sha256-P49fkLvdCm/Eco+nD3SGM04PRQatBzq9CHlayueQetk="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'pytest-runner'," "" + ''; + # crun patchelf proot runc fakechroot # are download statistically linked during runtime buildInputs = [ @@ -28,7 +33,6 @@ python3Packages.buildPythonApplication rec { ]; nativeCheckInputs = with python3Packages; [ - pytest-runner pytestCheckHook ]; diff --git a/pkgs/tools/wayland/gtklock/playerctl-module.nix b/pkgs/tools/wayland/gtklock/playerctl-module.nix index 5bc5237d75e8d..ac3c31ca0a03b 100644 --- a/pkgs/tools/wayland/gtklock/playerctl-module.nix +++ b/pkgs/tools/wayland/gtklock/playerctl-module.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "Gtklock module adding power controls to the lockscreen"; - homepage = "https://github.com/jovanlanik/gtklock-powerbar-module"; + description = "Gtklock module adding media player controls to the lockscreen"; + homepage = "https://github.com/jovanlanik/gtklock-playerctl-module"; license = licenses.gpl3Only; maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; diff --git a/pkgs/tools/wayland/oguri/default.nix b/pkgs/tools/wayland/oguri/default.nix deleted file mode 100644 index 9156e6df39b00..0000000000000 --- a/pkgs/tools/wayland/oguri/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, meson -, ninja -, cairo -, gdk-pixbuf -, wayland -, wayland-protocols -, wayland-scanner -}: - -stdenv.mkDerivation rec { - pname = "oguri"; - version = "unstable-2020-12-19"; - - src = fetchFromGitHub { - owner = "vilhalmer"; - repo = pname; - rev = "6937fee10a9b0ef3ad8f94f606c0e0d9e7dec564"; - sha256 = "sXNvpI/YPDPd2cXQAfRO4ut21gSCXxbo1DpaZmHJDYQ="; - }; - - strictDeps = true; - nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ]; - buildInputs = [ - cairo - gdk-pixbuf - wayland - wayland-protocols - ]; - - meta = with lib; { - homepage = "https://github.com/vilhalmer/oguri/"; - description = "Very nice animated wallpaper daemon for Wayland compositors"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - inherit (wayland.meta) platforms; - broken = stdenv.isDarwin; # this should be enfoced by wayland platforms in the future - }; -} diff --git a/pkgs/tools/wayland/wlr-which-key/default.nix b/pkgs/tools/wayland/wlr-which-key/default.nix index 3eaa2822c1901..4bb349e3c3013 100644 --- a/pkgs/tools/wayland/wlr-which-key/default.nix +++ b/pkgs/tools/wayland/wlr-which-key/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "wlr-which-key"; - version = "0.1.3"; + version = "1.0.1"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "wlr-which-key"; rev = "v${version}"; - hash = "sha256-DedmLWjK0a6AoGaKGRKfsmK/NIAFV2EYY8MgfiEj4+o="; + hash = "sha256-+LOu1iJ4ciqJMemNKV0cNpAxn857izu9j8pu+3Z0msk="; }; - cargoHash = "sha256-ZGaQX5raMSCwt88xhctwCxGWa9HZtcNqTKM35Z8QvAc="; + cargoHash = "sha256-4aVBaKwvGSpePw64UwrqHhDYcSvM8zADrXAK5SBEfm0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix index d57755244a10f..e670c5fce4de8 100644 --- a/pkgs/tools/wayland/wob/default.nix +++ b/pkgs/tools/wayland/wob/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ cmocka inih wayland wayland-protocols ] - ++ lib.optional stdenv.isLinux libseccomp; + ++ lib.optional stdenv.hostPlatform.isLinux libseccomp; - mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; + mesonFlags = lib.optional stdenv.hostPlatform.isLinux "-Dseccomp=enabled"; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/wayland/xwaylandvideobridge/default.nix b/pkgs/tools/wayland/xwaylandvideobridge/default.nix index 5614ef40d5374..f87e678bdba98 100644 --- a/pkgs/tools/wayland/xwaylandvideobridge/default.nix +++ b/pkgs/tools/wayland/xwaylandvideobridge/default.nix @@ -5,10 +5,14 @@ , extra-cmake-modules , pkg-config , qtbase -, qtquickcontrols2 -, qtx11extras -, kdelibs4support +, qtdeclarative +, qtx11extras ? null # qt5 only +, kcoreaddons +, ki18n +, knotifications , kpipewire +, kstatusnotifieritem ? null # qt6 only +, kwindowsystem , wrapQtAppsHook }: @@ -30,12 +34,18 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtbase - qtquickcontrols2 + qtdeclarative qtx11extras - kdelibs4support + kcoreaddons + ki18n + knotifications kpipewire + kstatusnotifieritem + kwindowsystem ]; + cmakeFlags = ["-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}"]; + meta = { description = "Utility to allow streaming Wayland windows to X applications"; homepage = "https://invent.kde.org/system/xwaylandvideobridge"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 65ac0671b2494..972743705c9fe 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -55,7 +55,7 @@ let aliases; in -mapAliases ({ +mapAliases { # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs. forceSystem = system: _: (import self.path { localSystem = { inherit system; }; }); @@ -112,6 +112,7 @@ mapAliases ({ ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21 + ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 @@ -137,8 +138,10 @@ mapAliases ({ atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06 auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 + aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14 authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19 avldrums-lv2 = x42-avldrums; # Added 2020-03-29 + avrlibcCross = avrlibc; # Added 2024-09-06 awesome-4-0 = awesome; # Added 2022-05-05 aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11 aws-google-auth = throw "aws-google-auth has been removed as the upstream project was unmaintained"; # Added 2024-07-31 @@ -169,8 +172,10 @@ mapAliases ({ lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" (blender.withPackages (_: args.packages)).overrideAttrs (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30 + bless = throw "'bless' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'imhex' or 'ghex' instead"; # Added 2024-09-15 blockbench-electron = blockbench; # Added 2024-03-16 bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 + bmap-tools = bmaptool; # Added 2024-08-05 bookletimposer = throw "bookletimposer has been removed from nixpkgs; upstream unmaintained and broke with pypdf3"; # Added 2024-01-01 boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08 @@ -185,6 +190,7 @@ mapAliases ({ bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = bpftools; # Added 2021-05-03 bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 + brasero-original = lib.warn "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29 bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29 @@ -210,6 +216,7 @@ mapAliases ({ ### C ### + calligra = kdePackages.calligra; # Added 2024-09-27 callPackage_i686 = pkgsi686Linux.callPackage; cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28 cask = emacs.pkgs.cask; # Added 2022-11-12 @@ -223,10 +230,12 @@ mapAliases ({ cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09 certmgr-selfsigned = certmgr; # Added 2023-11-30 + challenger = taler-challenger; # Added 2024-09-04 chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22 chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 + chiaki4deck = chiaki-ng; # Added 2024-08-04 chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 ChowCentaur = chow-centaur; # Added 2024-06-12 @@ -239,6 +248,9 @@ mapAliases ({ citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 + cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 @@ -246,14 +258,15 @@ mapAliases ({ CoinMP = coinmp; # Added 2024-06-12 collada-dom = opencollada; # added 2024-02-21 composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 - cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12 coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01 cosmic-tasks = tasks; # Added 2024-07-04 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 + crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 clash = throw "'clash' has been removed, upstream gone. Consider using 'mihomo' instead."; # added 2023-11-10 + clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = claws-mail; # Added 2021-07-10 clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09 @@ -330,6 +343,7 @@ mapAliases ({ dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dnnl = oneDNN; # Added 2020-04-22 + dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29 docker-distribution = distribution; # Added 2023-12-26 docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27 @@ -357,6 +371,7 @@ mapAliases ({ ### E ### EBTKS = ebtks; # Added 2024-01-21 + eask = eask-cli; # Added 2024-09-05 ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08 ec2_api_tools = ec2-api-tools; # Added 2021-10-08 ec2-utils = amazon-ec2-utils; # Added 2022-02-01 @@ -402,6 +417,7 @@ mapAliases ({ elixir_ls = elixir-ls; # Added 2023-03-20 # Emacs + emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20 emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = emacs28.pkgs; # Added 2021-10-04 emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 @@ -441,6 +457,9 @@ mapAliases ({ ### F ### + fahcontrol = throw "fahcontrol has been removed because the download is no longer available"; # added 2024-09-24 + fahviewer = throw "fahviewer has been removed because the download is no longer available"; # added 2024-09-24 + fam = throw "'fam' (aliased to 'gamin') has been removed as it is unmaintained upstream"; # Added 2024-04-19 fancypp = throw "'fancypp' was removed because it and its dependants are unmaintained"; # Added 2024-02-14 faustStk = faustPhysicalModeling; # Added 2023-05-16 fastnlo = fastnlo-toolkit; # Added 2021-04-24 @@ -453,6 +472,7 @@ mapAliases ({ ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use another version"; # Added 2024-07-12 ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12 FIL-plugins = fil-plugins; # Added 2024-06-12 + fileschanged = throw "'fileschanged' has been removed as it is unmaintained upstream"; # Added 2024-04-19 findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; @@ -460,6 +480,7 @@ mapAliases ({ firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 fitnesstrax = throw "fitnesstrax was removed from nixpkgs because it disappeared upstream and no longer compiles"; # added 2023-07-04 + fit-trackee = fittrackee; # added 2024-09-03 flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 flintqs = throw "FlintQS has been removed due to lack of maintenance and security issues; use SageMath or FLINT instead"; # Added 2024-03-21 @@ -478,7 +499,7 @@ mapAliases ({ francis = kdePackages.francis; # added 2024-07-13 fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17 - fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. + fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. futuresql = libsForQt5.futuresql; # added 2023-11-11 fx_cast_bridge = fx-cast-bridge; # added 2023-07-26 @@ -496,15 +517,31 @@ mapAliases ({ g4music = gapless; # Added 2024-07-26 g4py = python3Packages.geant4; # Added 2020-06-06 + gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19 garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 garmin-plugin = throw "garmin-plugin has been removed, as it is unmaintained upstream and no longer works with modern browsers."; # Added 2024-01-12 garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 + gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10 + gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 + gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 + gcc6 = throw "gcc6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + gcc6Stdenv = throw "gcc6Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21 + gcj = gcj6; # Added 2024-09-13 + gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11 + gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15 geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 + gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 + gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 + gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14 + gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 + gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14 + gnome-latex = throw "'gnome-latex' has been superseded by 'enter-tex'"; # Added 2024-09-18 + gnu-cobol = gnucobol; # Added 2024-09-17 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; @@ -525,6 +562,8 @@ mapAliases ({ glew-egl = lib.warn "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11 glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26 glfw-wayland = glfw; # Added 2024-04-19 + glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08 + globalprotect-openconnect = throw "'globalprotect-openconnect' has been renamed to/replaced by 'gpauth' and 'gpclient'"; # Added 2024-09-21 glxinfo = mesa-demos; # Added 2024-07-04 gmailieer = lieer; # Added 2020-04-19 gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02 @@ -546,8 +585,11 @@ mapAliases ({ gnatcoll-xref = gnatPackages.gnatcoll-xref; # Added 2024-02-25 gnatcoll-db2ada = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25 gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25 + gnome-dictionary = throw "'gnome-dictionary' has been removed as it has been archived upstream. Consider using 'wordbook' instead"; # Added 2024-09-14 gnome-firmware-updater = gnome-firmware; # added 2022-04-14 + gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 + gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14 gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 gnome-resources = resources; # added 2023-12-10 gnome_user_docs = throw "'gnome_user_docs' has been renamed to/replaced by 'gnome-user-docs'"; # Converted to throw 2023-09-10 @@ -596,10 +638,11 @@ mapAliases ({ gocode = throw "'gocode' has been removed as the upstream project was archived. 'gopls' is suggested as replacement"; # Added 2023-12-26 govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26 gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 + gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15 gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25; gpt4all-chat = throw "gpt4all-chat has been renamed to gpt4all"; # Added 2024-02-27 - + gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 @@ -624,6 +667,7 @@ mapAliases ({ grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 gtkcord4 = dissent; # Added 2024-03-10 + gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gtkpod = throw "'gtkpod' was removed due to one of its dependencies, 'anjuta' being unmaintained"; # Added 2024-01-16 guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09 guile-disarchive = disarchive; # Added 2023-10-27 @@ -686,6 +730,8 @@ mapAliases ({ ipfs-migrator = kubo-migrator; # Added 2022-09-27 iproute = iproute2; # moved from top-level 2021-03-14 irrlichtmt = throw "irrlichtmt has been removed because it was moved into the Minetest repo"; # Added 2024-08-12 + isl_0_11 = throw "isl_0_11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + isl_0_14 = throw "isl_0_14 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 iso-flags-png-320x420 = lib.warn "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17 ### J ### @@ -718,6 +764,7 @@ mapAliases ({ kube3d = k3d; # Added 2022-0705 kafkacat = kcat; # Added 2021-10-07 kak-lsp = kakoune-lsp; # Added 2024-04-01 + kargo = throw "kargo was removed as it is deprecated upstream and depends on the removed boto package"; # Added 2024-09-22 kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 @@ -745,6 +792,7 @@ mapAliases ({ ### L ### + l3afpad = throw "'l3afpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-09-14 larynx = piper-tts; # Added 2023-05-09 LASzip = laszip; # Added 2024-06-12 LASzip2 = laszip_2; # Added 2024-06-12 @@ -765,7 +813,7 @@ mapAliases ({ libbpf_1 = libbpf; # Added 2022-12-06 libbson = mongoc; # Added 2024-03-11 libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10 - libclc = llvmPackages_latest.libclc; # Added 2023-10-28 + libclc = llvmPackages_18.libclc; # Added 2023-10-28 libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08 libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23 libgme = game-music-emu; # Added 2022-07-20 @@ -778,6 +826,7 @@ mapAliases ({ liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 libmongo-client = throw "'libmongo-client' has been removed, upstream gone"; # Added 2023-06-22 liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 + libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libquotient = libsForQt5.libquotient; # Added 2023-11-11 librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10 @@ -819,16 +868,10 @@ mapAliases ({ linux-rt_6_1 = linuxKernel.kernels.linux_rt_6_1; linuxPackages_4_14 = linuxKernel.packages.linux_4_14; linuxPackages_4_19 = linuxKernel.packages.linux_4_19; - linuxPackages_4_9 = linuxKernel.packages.linux_4_9; + linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; linuxPackages_5_15 = linuxKernel.packages.linux_5_15; - linuxPackages_5_18 = linuxKernel.packages.linux_5_18; - linuxPackages_5_19 = linuxKernel.packages.linux_5_19; - linuxPackages_5_4 = linuxKernel.packages.linux_5_4; - linuxPackages_6_0 = linuxKernel.packages.linux_6_0; linuxPackages_6_1 = linuxKernel.packages.linux_6_1; - linuxPackages_6_2 = linuxKernel.packages.linux_6_2; - linuxPackages_6_3 = linuxKernel.packages.linux_6_3; linuxPackages_6_4 = linuxKernel.packages.linux_6_4; linuxPackages_6_5 = linuxKernel.packages.linux_6_5; linuxPackages_6_6 = linuxKernel.packages.linux_6_6; @@ -836,6 +879,7 @@ mapAliases ({ linuxPackages_6_8 = linuxKernel.packages.linux_6_8; linuxPackages_6_9 = linuxKernel.packages.linux_6_9; linuxPackages_6_10 = linuxKernel.packages.linux_6_10; + linuxPackages_6_11 = linuxKernel.packages.linux_6_11; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; @@ -848,16 +892,10 @@ mapAliases ({ linuxPackages_rt_6_1 = linuxKernel.packages.linux_rt_6_1; linux_4_14 = linuxKernel.kernels.linux_4_14; linux_4_19 = linuxKernel.kernels.linux_4_19; - linux_4_9 = linuxKernel.kernels.linux_4_9; + linux_5_4 = linuxKernel.kernels.linux_5_4; linux_5_10 = linuxKernel.kernels.linux_5_10; linux_5_15 = linuxKernel.kernels.linux_5_15; - linux_5_18 = linuxKernel.kernels.linux_5_18; - linux_5_19 = linuxKernel.kernels.linux_5_19; - linux_5_4 = linuxKernel.kernels.linux_5_4; - linux_6_0 = linuxKernel.kernels.linux_6_0; linux_6_1 = linuxKernel.kernels.linux_6_1; - linux_6_2 = linuxKernel.kernels.linux_6_2; - linux_6_3 = linuxKernel.kernels.linux_6_3; linux_6_4 = linuxKernel.kernels.linux_6_4; linux_6_5 = linuxKernel.kernels.linux_6_5; linux_6_6 = linuxKernel.kernels.linux_6_6; @@ -865,6 +903,7 @@ mapAliases ({ linux_6_8 = linuxKernel.kernels.linux_6_8; linux_6_9 = linuxKernel.kernels.linux_6_9; linux_6_10 = linuxKernel.kernels.linux_6_10; + linux_6_11 = linuxKernel.kernels.linux_6_11; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; @@ -939,6 +978,7 @@ mapAliases ({ mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21 mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 + mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 @@ -957,11 +997,16 @@ mapAliases ({ maui-shell = throw "maui-shell has been removed from nixpkgs, it was broken"; # Added 2024-07-15 mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 mcomix3 = mcomix; # Added 2022-06-05 + mdt = md-tui; # Added 2024-09-03 meme = meme-image-generator; # Added 2021-04-21 mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 + mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; + microcodeAmd = microcode-amd; # Added 2024-09-08 + microcodeIntel = microcode-intel; # Added 2024-09-08 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 MIDIVisualizer = midivisualizer; # Added 2024-06-12 migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08 + mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01 minishift = throw "'minishift' has been removed as it was discontinued upstream. Use 'crc' to setup a microshift cluster instead"; # Added 2023-12-30 miopen = throw "'miopen' has been replaced with 'rocmPackages.miopen'"; # Added 2023-10-08 miopengemm = throw "'miopengemm' has been replaced with 'rocmPackages_5.miopengemm'"; # Added 2023-10-08 @@ -995,10 +1040,12 @@ mapAliases ({ moz-phab = mozphab; # Added 2022-08-09 mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 + mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 mpdevil = plattenalbum; # Added 2024-05-22 mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 + msp430NewlibCross = msp430Newlib; # Added 2024-09-06 mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10 mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22 murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10 @@ -1031,6 +1078,8 @@ mapAliases ({ nagiosPluginsOfficial = monitoring-plugins; neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10 neoload = throw "'neoload' has been removed as it is broken and unmaintained"; # Added 2024-03-02 + newlibCross = newlib; # Added 2024-09-06 + newlib-nanoCross = newlib-nano; # Added 2024-09-06 nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 nix-direnv-flakes = nix-direnv; nix-ld-rs = nix-ld; # Added 2024-08-17 @@ -1103,6 +1152,7 @@ mapAliases ({ openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10 opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18 opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12 + opencomposite-helper = throw "opencomposite-helper has been removed from nixpkgs as it causes issues with some applications. See https://wiki.nixos.org/wiki/VR#OpenComposite for the recommended setup"; # Added 2024-09-07 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 @@ -1125,6 +1175,7 @@ mapAliases ({ openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01 openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01 openjpeg_2 = openjpeg; # Added 2021-01-25 + openlens = throw "Lens Closed its source code, package obsolete/stale - consider lens as replacement"; # Added 2024-09-04 openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29 openmpt123 = libopenmpt; # Added 2021-09-05 openssl_3_0 = openssl_3; # Added 2022-06-27 @@ -1132,20 +1183,24 @@ mapAliases ({ optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12 orchis = orchis-theme; # Added 2021-06-09 oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15 + onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20 onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24 oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 + OSCAR = oscar; # Added 2024-06-12 osxfuse = macfuse-stubs; # Added 2021-03-20 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09 + oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23 ### P ### PageEdit = pageedit; # Added 2024-01-21 p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20 packet-cli = metal-cli; # Added 2021-10-25 + paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 packet = throw "packet has been removed as it is no longer working and unmaintained"; # Added 2024-03-29 palemoon = throw "palemoon has been dropped due to python2 being EOL and marked insecure. Use 'palemoon-bin' instead"; # Added 2023-05-18 pam_usb = throw "'pam_usb' has been removed: abandoned by upstream since 2015."; # Added 2023-10-30 @@ -1202,6 +1257,7 @@ mapAliases ({ pgtap = postgresqlPackages.pgtap; plv8 = postgresqlPackages.plv8; postgis = postgresqlPackages.postgis; + texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10 timescaledb = postgresqlPackages.timescaledb; tsearch_extras = postgresqlPackages.tsearch_extras; @@ -1238,6 +1294,7 @@ mapAliases ({ processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10 + prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01 prometheus-openvpn-exporter = throw "'prometheus-openvpn-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-12-23 prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10 prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 @@ -1249,6 +1306,7 @@ mapAliases ({ protonup = protonup-ng; # Added 2022-11-06 proxmark3-rrg = proxmark3; # Added 2023-07-25 proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 + psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 pyls-black = throw "pyls-black has been removed from nixpkgs. Use python-lsp-black instead."; # Added 2023-01-09 pyls-mypy = throw "pyls-mypy has been removed from nixpkgs. Use pylsp-mypy instead."; # Added 2023-01-09 pygmentex = throw "'pygmentex' has been renamed to/replaced by 'texlive.bin.pygmentex'"; # Converted to throw 2023-09-10 @@ -1263,6 +1321,7 @@ mapAliases ({ ### Q ### + qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30 qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25 qflipper = qFlipper; # Added 2022-02-11 @@ -1302,6 +1361,7 @@ mapAliases ({ redocly-cli = redocly; # Added 2024-04-14 redpanda = redpanda-client; # Added 2023-10-14 redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10 + relibc = throw "relibc has been removed due to lack of maintenance"; # Added 2024-09-02 replay-sorcery = throw "replay-sorcery has been removed as it is unmaintained upstream. Consider using gpu-screen-recorder or obs-studio instead."; # Added 2024-07-13 restinio_0_6 = throw "restinio_0_6 has been removed from nixpkgs as it's not needed by downstream packages"; # Added 2024-07-04 restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 @@ -1362,6 +1422,7 @@ mapAliases ({ ### S ### + SDL_classic = SDL1; # Added 2024-09-03 s2n = s2n-tls; # Added 2021-03-03 sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06 sane-backends-git = sane-backends; # Added 2021-02-19 @@ -1392,6 +1453,7 @@ mapAliases ({ shipyard = jumppad; # Added 2023-06-06 signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 simplenote = throw "'simplenote' has been removed because it is no longer maintained and insecure"; # Added 2023-10-09 + skk-dicts = throw "'skk-dicts' has been split into multiple packages under 'skkDictionaries'"; # Added 2023-11-08 sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21 SkypeExport = skypeexport; # Added 2024-06-12 slack-dark = slack; # Added 2020-03-27 @@ -1446,6 +1508,7 @@ mapAliases ({ spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = spring-boot-cli; # added 2020-04-24 squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 + srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 ssb = throw "'ssb' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 @@ -1454,12 +1517,18 @@ mapAliases ({ StormLib = stormlib; # Added 2024-01-21 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22 + swiProlog = lib.warn "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07 + swiPrologWithGui = lib.warn "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07 swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23 swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23 + swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-09-12 + swig4 = swig; # Added 2024-09-12 + swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12 swtpm-tpm2 = swtpm; # Added 2021-02-26 Sylk = sylk; # Added 2024-06-12 symbiyosys = sby; # Added 2024-08-18 + sync = taler-sync; # Added 2024-09-04 syncthing-cli = syncthing; # Added 2021-04-06 syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 @@ -1493,9 +1562,10 @@ mapAliases ({ invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 timescale-prometheus = promscale; # Added 2020-09-29 tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 - tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 + tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tkcvs = tkrev; # Added 2022-03-07 + toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22 tokodon = plasma5Packages.tokodon; tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07 @@ -1527,6 +1597,8 @@ mapAliases ({ uberwriter = apostrophe; # Added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 ubuntu_font_family = ubuntu-classic; # Added 2024-02-19 + uclibc = uclibc-ng; # Added 2022-06-16 + uclibcCross = uclibc-ng; # Added 2022-06-16 ue4 = throw "ue4 has been removed, because the package was broken for years"; # Added 2023-11-22 uefi-firmware-parser = throw "The uefi-firmware-parser package was dropped since it was unmaintained."; # Added 2024-06-21 uhd3_5 = throw "uhd3_5 has been removed, because it was no longer needed"; # Added 2023-10-07 @@ -1556,6 +1628,7 @@ mapAliases ({ ### V ### v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10 + validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21 vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05 @@ -1569,6 +1642,7 @@ mapAliases ({ vikunja-frontend = throw "'vikunja-frontend' has been replaced by 'vikunja'"; # Added 2024-02-19 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 + vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14 vinegar = throw "'vinegar' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 @@ -1586,6 +1660,7 @@ mapAliases ({ ### W ### wakatime = wakatime-cli; # 2024-05-30 + wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22 waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 wayfireApplications-unwrapped = throw '' 'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire' @@ -1632,9 +1707,11 @@ mapAliases ({ xmlada = gnatPackages.xmlada; # Added 2024-02-25 xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15 xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 + xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = xvfb-run; # Added 2021-05-07 + xwaylandvideobridge = libsForQt5.xwaylandvideobridge; # Added 2024-09-27 ### Y ### @@ -1677,12 +1754,12 @@ mapAliases ({ inherit (stdenv.hostPlatform) system; # Added 2021-10-22 inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09 - freebsdCross = freebsd; # Added 2024-06-18 - netbsdCross = netbsd; # Added 2024-06-18 - openbsdCross = openbsd; # Added 2024-06-18 + freebsdCross = freebsd; # Added 2024-09-06 + netbsdCross = netbsd; # Added 2024-09-06 + openbsdCross = openbsd; # Added 2024-09-06 # LLVM packages for (integration) testing that should not be used inside Nixpkgs: - llvmPackages_latest = llvmPackages_18; + llvmPackages_latest = llvmPackages_19; /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: @@ -1755,4 +1832,4 @@ mapAliases ({ purple-facebook ; -}) +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b005d902b0968..f3525c586c1ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31,19 +31,6 @@ with pkgs; # it's just the plain stdenv. stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv); - stdenvNoCC = stdenv.override ( - { cc = null; hasCC = false; } - - // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && (stdenv.hostPlatform != stdenv.buildPlatform)) { - # TODO: This is a hack to use stdenvNoCC to produce a CF when cross - # compiling. It's not very sound. The cross stdenv has: - # extraBuildInputs = [ targetPackages.darwin.apple_sdks.frameworks.CoreFoundation ] - # and uses stdenvNoCC. In order to make this not infinitely recursive, we - # need to exclude this extraBuildInput. - extraBuildInputs = []; - } - ); - mkStdenvNoLibs = stdenv: let bintools = stdenv.cc.bintools.override { libc = null; @@ -61,7 +48,7 @@ with pkgs; }; stdenvNoLibs = - if stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform && (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.useLLVM or false) + if stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform then # We cannot touch binutils or cc themselves, because that will cause # infinite recursion. So instead, we just choose a libc based on the @@ -74,7 +61,17 @@ with pkgs; # thing to to create an earlier thing (leading to infinite recursion) and # we also would still respect the stage arguments choices for these # things. - overrideCC stdenv buildPackages.llvmPackages.clangNoCompilerRt + (if stdenvNoCC.hostPlatform.isDarwin || stdenvNoCC.hostPlatform.useLLVM or false + then overrideCC stdenvNoCC buildPackages.llvmPackages.clangNoCompilerRt + else gccCrossLibcStdenv) + else mkStdenvNoLibs stdenv; + + stdenvNoLibc = + if stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform + then + (if stdenvNoCC.hostPlatform.isDarwin || stdenvNoCC.hostPlatform.useLLVM or false + then overrideCC stdenvNoCC buildPackages.llvmPackages.clangNoLibc + else gccCrossLibcStdenv) else mkStdenvNoLibs stdenv; gccStdenvNoLibs = mkStdenvNoLibs gccStdenv; @@ -142,7 +139,7 @@ with pkgs; unstableGitUpdater = callPackage ../common-updater/unstable-updater.nix { }; - nix-update-script = callPackage ../common-updater/nix-update.nix { }; + inherit (nix-update) nix-update-script; ### Push NixOS tests inside the fixed point @@ -195,8 +192,6 @@ with pkgs; }; } ../build-support/setup-hooks/auto-patchelf.sh; - tomato-c = callPackage ../applications/misc/tomato-c { }; - appflowy = callPackage ../applications/office/appflowy { }; appimageTools = callPackage ../build-support/appimage { }; @@ -232,8 +227,6 @@ with pkgs; quickgui = callPackage ../applications/virtualization/quickgui { }; - adcli = callPackage ../os-specific/linux/adcli { }; - alda = callPackage ../development/interpreters/alda { }; align = callPackage ../tools/text/align { }; @@ -246,8 +239,6 @@ with pkgs; anders = callPackage ../applications/science/logic/anders { }; - ankisyncd = callPackage ../servers/ankisyncd { }; - ariang = callPackage ../servers/ariang { }; ani-cli = callPackage ../applications/video/ani-cli { }; @@ -280,8 +271,6 @@ with pkgs; atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { }; - _0x = callPackage ../tools/misc/0x { }; - automatic-timezoned = callPackage ../tools/system/automatic-timezoned { }; cve = with python3Packages; toPythonApplication cvelib; @@ -304,10 +293,6 @@ with pkgs; ares-rs = callPackage ../tools/security/ares-rs { }; - arti = callPackage ../tools/security/arti { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - asn1c = callPackage ../development/compilers/asn1c { }; authz0 = callPackage ../tools/security/authz0 { }; @@ -318,8 +303,6 @@ with pkgs; atomic-swap = callPackage ../applications/blockchains/atomic-swap { }; - avro-tools = callPackage ../development/tools/avro-tools { }; - bacnet-stack = callPackage ../tools/networking/bacnet-stack { }; bada-bib = callPackage ../applications/science/misc/bada-bib { }; @@ -372,8 +355,6 @@ with pkgs; cbfmt = callPackage ../development/tools/cbfmt { }; - cfn-nag = callPackage ../development/tools/cfn-nag { }; - circumflex = callPackage ../applications/networking/circumflex { }; citron = callPackage ../tools/misc/citron { }; @@ -434,8 +415,6 @@ with pkgs; }; cereal = cereal_1_3_0; - cereal_1_3_0 = callPackage ../development/libraries/cereal/1.3.0.nix { }; - cereal_1_3_2 = callPackage ../development/libraries/cereal/1.3.2.nix { }; cdecrypt = callPackage ../development/tools/cdecrypt { }; @@ -523,8 +502,6 @@ with pkgs; conserver = callPackage ../tools/misc/conserver { }; - containerlab = callPackage ../tools/networking/containerlab { }; - coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); confetty = callPackage ../applications/misc/confetty { }; @@ -557,6 +534,10 @@ with pkgs; dcgm = callPackage ../os-specific/linux/dcgm { }; + deck = callPackage ../by-name/de/deck/package.nix { + buildGoModule = buildGo123Module; + }; + dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { }; dhallPackageToNix = callPackage ../build-support/dhall/package-to-nix.nix { }; @@ -663,8 +644,6 @@ with pkgs; gobble = callPackage ../tools/X11/gobble { }; - goda = callPackage ../development/tools/goda { }; - gokrazy = callPackage ../development/misc/gokrazy { }; gojq = callPackage ../development/tools/gojq { }; @@ -752,7 +731,7 @@ with pkgs; sea-orm-cli = callPackage ../development/tools/sea-orm-cli { }; vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; fmt = fmt_10; }; @@ -880,12 +859,8 @@ with pkgs; dotnet-runtime = dotnetCorePackages.runtime_6_0; dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0; - buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { }; - mkNugetSource = callPackage ../build-support/dotnet/make-nuget-source { }; - mkNugetDeps = (newScope dotnetCorePackages) ../build-support/dotnet/make-nuget-deps { }; - - buildDotnetGlobalTool = callPackage ../build-support/dotnet/build-dotnet-global-tool { }; + inherit (dotnetCorePackages) buildDotnetModule buildDotnetGlobalTool mkNugetSource mkNugetDeps; fsautocomplete = callPackage ../development/tools/fsautocomplete { }; @@ -931,9 +906,7 @@ with pkgs; fet-sh = callPackage ../tools/misc/fet-sh { }; - fetchbower = callPackage ../build-support/fetchbower { - inherit (nodePackages) bower2nix; - }; + fetchbower = callPackage ../build-support/fetchbower { }; fetchbzr = callPackage ../build-support/fetchbzr { }; @@ -973,6 +946,7 @@ with pkgs; prefetch-yarn-deps yarnConfigHook yarnBuildHook + yarnInstallHook fetchYarnDeps; find-cursor = callPackage ../tools/X11/find-cursor { }; @@ -1136,7 +1110,7 @@ with pkgs; # So turn gssSupport off there, and on Windows. # On other platforms, keep the previous value. gssSupport = - if stdenv.isDarwin || stdenv.hostPlatform.isWindows + if stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWindows then false else old.gssSupport or true; # `? true` is the default libkrb5 = buildPackages.krb5.override { @@ -1157,9 +1131,7 @@ with pkgs; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; - fetchipfs = import ../build-support/fetchipfs { - inherit curl stdenv; - }; + fetchipfs = callPackage ../build-support/fetchipfs { }; fetchit = callPackage ../applications/networking/cluster/fetchit { }; @@ -1204,8 +1176,6 @@ with pkgs; inherit url; }; - installShellFiles = callPackage ../build-support/install-shell-files { }; - lazydocker = callPackage ../tools/misc/lazydocker { }; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } @@ -1311,7 +1281,6 @@ with pkgs; singularity-tools = callPackage ../build-support/singularity-tools { }; - stacktile = callPackage ../tools/wayland/stacktile { }; sirula = callPackage ../tools/wayland/sirula { }; @@ -1327,10 +1296,21 @@ with pkgs; substituteAllFiles = callPackage ../build-support/substitute-files/substitute-all-files.nix { }; - replaceDependency = callPackage ../build-support/replace-dependency.nix { }; + replaceDependencies = callPackage ../build-support/replace-dependencies.nix { }; + + replaceDependency = { drv, oldDependency, newDependency, verbose ? true }: replaceDependencies { + inherit drv verbose; + replacements = [{ + inherit oldDependency newDependency; + }]; + # When newDependency depends on drv, instead of causing infinite recursion, keep it as is. + cutoffPackages = [ newDependency ]; + }; replaceVars = callPackage ../build-support/replace-vars { }; + replaceDirectDependencies = callPackage ../build-support/replace-direct-dependencies.nix { }; + nukeReferences = callPackage ../build-support/nuke-references { inherit (darwin) signingUtils; }; @@ -1362,7 +1342,7 @@ with pkgs; desktopToDarwinBundle = makeSetupHook { name = "desktop-to-darwin-bundle-hook"; - propagatedBuildInputs = [ writeDarwinBundle librsvg imagemagick python3Packages.icnsutil ]; + propagatedBuildInputs = [ writeDarwinBundle librsvg imagemagick (onlyBin python3Packages.icnsutil) ]; } ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; keepBuildTree = makeSetupHook { @@ -1484,14 +1464,10 @@ with pkgs; alsaequal = callPackage ../tools/audio/alsaequal { }; - acpica-tools = callPackage ../tools/system/acpica-tools { }; - amdgpu_top = callPackage ../tools/system/amdgpu_top { }; acquire = with python3Packages; toPythonApplication acquire; - act = callPackage ../development/tools/misc/act { }; - actdiag = with python3.pkgs; toPythonApplication actdiag; actkbd = callPackage ../tools/system/actkbd { }; @@ -1635,8 +1611,6 @@ with pkgs; inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { })) akku akkuPackages; - albert = qt6Packages.callPackage ../applications/misc/albert { }; - alice-lg = callPackage ../servers/alice-lg{ }; alice-tools = callPackage ../tools/games/alice-tools { @@ -1701,8 +1675,6 @@ with pkgs; crypto-tracker = callPackage ../tools/misc/crypto-tracker { }; - ejs = callPackage ../development/tools/ejs { }; - ejson2env = callPackage ../tools/admin/ejson2env { }; davinci-resolve = callPackage ../applications/video/davinci-resolve { }; @@ -1741,8 +1713,6 @@ with pkgs; wlroots = wlroots_0_17; }; - gay = callPackage ../tools/misc/gay { }; - elkhound = callPackage ../development/tools/elkhound { }; ethq = callPackage ../os-specific/linux/ethq { }; @@ -1761,10 +1731,6 @@ with pkgs; gen6dns = callPackage ../tools/networking/gen6dns { }; - gen-license = callPackage ../development/tools/gen-license { - inherit (darwin.apple_sdk.frameworks) Security; - }; - github-copilot-cli = callPackage ../tools/misc/github-copilot-cli { }; # This is to workaround gfal2-python broken against Python 3.12 or later. @@ -1829,8 +1795,6 @@ with pkgs; hyperpotamus = callPackage ../tools/misc/hyperpotamus { }; - immich-cli = callPackage ../tools/misc/immich-cli { }; - inherit (callPackages ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service; jobber = callPackage ../tools/system/jobber { }; @@ -1859,8 +1823,6 @@ with pkgs; license-cli = callPackage ../tools/misc/license-cli { }; - license-generator = callPackage ../tools/misc/license-generator { }; - linux-router = callPackage ../tools/networking/linux-router { }; linux-router-without-wifi = linux-router.override { useWifiDependencies = false; }; @@ -1956,8 +1918,6 @@ with pkgs; sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { }; - basu = callPackage ../development/libraries/basu { }; - sdlookup = callPackage ../tools/security/sdlookup { }; sdkmanager = with python3Packages; toPythonApplication sdkmanager; @@ -2063,7 +2023,8 @@ with pkgs; vrrtest = callPackage ../tools/video/vrrtest { }; - winbox = callPackage ../tools/admin/winbox { + winbox = winbox3; + winbox3 = callPackage ../tools/admin/winbox { wine = wineWowPackages.stable; }; @@ -2122,7 +2083,7 @@ with pkgs; guiSupport = true; sendEmailSupport = true; withSsh = true; - withLibsecret = !stdenv.isDarwin; + withLibsecret = !stdenv.hostPlatform.isDarwin; }; # Git with SVN support, but without GUI. @@ -2149,7 +2110,7 @@ with pkgs; bitbucket-server-cli = callPackage ../applications/version-management/bitbucket-server-cli { }; - bump2version = python3Packages.callPackage ../applications/version-management/bump2version { }; + bump2version = with python3Packages; toPythonApplication bump2version; cgit = callPackage ../applications/version-management/cgit { }; @@ -2171,14 +2132,14 @@ with pkgs; delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta { }; + debase = callPackage ../by-name/de/debase/package.nix { + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + }; + diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { }; forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; - gex = callPackage ../applications/version-management/gex { - inherit (darwin.apple_sdk.frameworks) Security; - }; - gfold = callPackage ../applications/version-management/gfold { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -2218,15 +2179,7 @@ with pkgs; humanfriendly; }; - git-annex-remote-googledrive = callPackage ../applications/version-management/git-annex-remote-googledrive { - inherit (python3Packages) - buildPythonApplication - annexremote - drivelib - gitpython - tenacity - humanfriendly; - }; + git-annex-remote-googledrive = python3Packages.callPackage ../applications/version-management/git-annex-remote-googledrive { }; git-annex-remote-rclone = callPackage ../applications/version-management/git-annex-remote-rclone { }; @@ -2341,7 +2294,7 @@ with pkgs; git-radar = callPackage ../applications/version-management/git-radar { }; git-recent = callPackage ../applications/version-management/git-recent { - util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux; + util-linux = if stdenv.hostPlatform.isLinux then util-linuxMinimal else util-linux; }; git-relevant-history = callPackage ../applications/version-management/git-relevant-history { }; @@ -2449,8 +2402,6 @@ with pkgs; gut = callPackage ../applications/version-management/gut { }; - hred = callPackage ../development/tools/hred { }; - hub = callPackage ../applications/version-management/hub { }; hut = callPackage ../applications/version-management/hut { }; @@ -2571,25 +2522,17 @@ with pkgs; darcnes = callPackage ../applications/emulators/darcnes { }; - desmume = callPackage ../applications/emulators/desmume { }; - - dgen-sdl = callPackage ../applications/emulators/dgen-sdl { }; - dlx = callPackage ../applications/emulators/dlx { }; dosbox = callPackage ../applications/emulators/dosbox { inherit (darwin.apple_sdk.frameworks ) OpenGL; - SDL = if stdenv.isDarwin then SDL else SDL_compat; + SDL = if stdenv.hostPlatform.isDarwin then SDL else SDL_compat; }; dosbox-x = darwin.apple_sdk_11_0.callPackage ../applications/emulators/dosbox-x { inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa; }; - dynamips = callPackage ../applications/emulators/dynamips { }; - - emu2 = callPackage ../applications/emulators/emu2 { }; - fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; @@ -2620,8 +2563,6 @@ with pkgs; gopsuinfo = callPackage ../tools/system/gopsuinfo { }; - gxemul = callPackage ../applications/emulators/gxemul { }; - hatari = callPackage ../applications/emulators/hatari { }; hostapd-mana = callPackage ../tools/networking/hostapd-mana { }; @@ -2656,8 +2597,6 @@ with pkgs; oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; - openmsx = callPackage ../applications/emulators/openmsx { }; - packwiz = callPackage ../tools/games/minecraft/packwiz { }; pcem = callPackage ../applications/emulators/pcem { }; @@ -2705,14 +2644,10 @@ with pkgs; withWayland = true; }; - rpcemu = callPackage ../applications/emulators/rpcemu { }; - ruffle = callPackage ../applications/emulators/ruffle { }; sameboy = callPackage ../applications/emulators/sameboy { }; - simh = callPackage ../applications/emulators/simh { }; - simplenes = callPackage ../applications/emulators/simplenes { }; snes9x-gtk = snes9x.override { @@ -2725,8 +2660,6 @@ with pkgs; tilem = callPackage ../applications/emulators/tilem { }; - tiny8086 = callPackage ../applications/emulators/tiny8086 { }; - uae = callPackage ../applications/emulators/uae { }; vbam = callPackage ../applications/emulators/vbam { }; @@ -2751,7 +2684,7 @@ with pkgs; ### APPLICATIONS/EMULATORS/DOLPHIN-EMU dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; }; @@ -2857,8 +2790,6 @@ with pkgs; sfm = callPackage ../applications/file-managers/sfm { }; - shfm = callPackage ../applications/file-managers/shfm { }; - spaceFM = callPackage ../applications/file-managers/spacefm { }; vifm = callPackage ../applications/file-managers/vifm { }; @@ -2891,7 +2822,7 @@ with pkgs; contour = qt6.callPackage ../applications/terminal-emulators/contour { inherit (darwin.apple_sdk_11_0.libs) utmp; inherit (darwin) sigtool; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; catch2 = catch2_3; fmt = fmt_9; }; @@ -2911,7 +2842,7 @@ with pkgs; iterm2 = callPackage ../applications/terminal-emulators/iterm2 { }; kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { - harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; + harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; }; inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) Cocoa @@ -2934,8 +2865,6 @@ with pkgs; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; - rxvt = callPackage ../applications/terminal-emulators/rxvt { }; - rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; rxvt-unicode-emoji = rxvt-unicode.override { @@ -2950,8 +2879,6 @@ with pkgs; emojiSupport = true; }; - sakura = callPackage ../applications/terminal-emulators/sakura { }; - st = callPackage ../applications/terminal-emulators/st { conf = config.st.conf or null; patches = config.st.patches or []; @@ -3033,8 +2960,6 @@ with pkgs; alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { }; - amazon-ec2-utils = callPackage ../tools/admin/amazon-ec2-utils { }; - amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { @@ -3049,15 +2974,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - amberol = callPackage ../applications/audio/amberol { }; - inherit (callPackages ../development/tools/ammonite {}) ammonite_2_12 ammonite_2_13; ammonite = ammonite_2_13; - amp = callPackage ../applications/editors/amp { }; - ams = callPackage ../applications/audio/ams { }; amtterm = callPackage ../tools/system/amtterm { }; @@ -3214,7 +3135,9 @@ with pkgs; authenticator = callPackage ../applications/misc/authenticator { }; - authelia = callPackage ../servers/authelia { pnpm = pnpm_9; }; + authelia = callPackage ../servers/authelia { + buildGoModule = buildGo123Module; + }; authentik-outposts = recurseIntoAttrs (callPackages ../by-name/au/authentik/outposts.nix { }); @@ -3226,21 +3149,12 @@ with pkgs; aliyun-cli = callPackage ../tools/admin/aliyun-cli { }; - aws-encryption-sdk-cli = callPackage ../tools/admin/aws-encryption-sdk-cli { }; - aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator { }; awscli = callPackage ../tools/admin/awscli { }; - awscli2 = callPackage ../by-name/aw/awscli2/package.nix { - # change when https://github.com/aws/aws-cli/issues/8342 resolved - python3 = python311; - }; - okta-aws-cli = callPackage ../tools/admin/okta-aws-cli { }; - awsebcli = callPackage ../tools/virtualization/awsebcli { }; - awslimitchecker = callPackage ../tools/admin/awslimitchecker { }; awslogs = callPackage ../tools/admin/awslogs { }; @@ -3263,8 +3177,6 @@ with pkgs; iamy = callPackage ../tools/admin/iamy { }; - iam-policy-json-to-terraform = callPackage ../tools/misc/iam-policy-json-to-terraform { }; - azeret-mono = callPackage ../data/fonts/azeret-mono { }; azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; @@ -3389,7 +3301,9 @@ with pkgs; base16384 = callPackage ../tools/text/base16384 { }; - bashate = python3Packages.callPackage ../development/tools/bashate { }; + bashate = python3Packages.callPackage ../development/tools/bashate { + python3Packages = python311Packages; + }; bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; @@ -3417,8 +3331,6 @@ with pkgs; blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; - bmap-tools = callPackage ../tools/misc/bmap-tools { }; - bolliedelayxt-lv2 = callPackage ../applications/audio/bolliedelayxt.lv2 { }; bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; @@ -3521,8 +3433,6 @@ with pkgs; cpuid = callPackage ../os-specific/linux/cpuid { }; - msr = callPackage ../os-specific/linux/msr { }; - ctre = callPackage ../development/libraries/ctre { }; ctrtool = callPackage ../tools/archivers/ctrtool { }; @@ -3545,7 +3455,9 @@ with pkgs; cyclone-scheme = callPackage ../development/interpreters/cyclone { }; - cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { }; + cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { + buildGoModule = buildGo123Module; + }; cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { }; @@ -3599,7 +3511,7 @@ with pkgs; ecdsautils = callPackage ../tools/security/ecdsautils { }; - echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage (../tools/security/echidna) { }); + echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/security/echidna { }); sedutil = callPackage ../tools/security/sedutil { }; @@ -3673,6 +3585,10 @@ with pkgs; gams = callPackage ../tools/misc/gams (config.gams or {}); + gancioPlugins = recurseIntoAttrs ( + callPackage ../by-name/ga/gancio/plugins.nix { inherit (gancio) nodejs; } + ); + gem = callPackage ../applications/audio/pd-plugins/gem { }; github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; @@ -3809,8 +3725,8 @@ with pkgs; lesspass-cli = callPackage ../tools/security/lesspass-cli { }; livebook = callPackage ../servers/web-apps/livebook { - elixir = elixir_1_16; - beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_16; }); + elixir = elixir_1_17; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; }); }; lsix = callPackage ../tools/graphics/lsix { }; @@ -4025,7 +3941,9 @@ with pkgs; atftp = callPackage ../tools/networking/atftp { }; - atlas = callPackage ../development/tools/database/atlas { }; + atlas = callPackage ../by-name/at/atlas/package.nix { + buildGoModule = buildGo123Module; + }; authoscope = callPackage ../tools/security/authoscope { inherit (darwin.apple_sdk.frameworks) Security; @@ -4039,11 +3957,11 @@ with pkgs; autorandr = callPackage ../tools/misc/autorandr { }; - avahi = callPackage ../development/libraries/avahi (config.avahi or {}); + avahi = callPackage ../development/libraries/avahi { }; - avahi-compat = callPackage ../development/libraries/avahi ((config.avahi or {}) // { + avahi-compat = callPackage ../development/libraries/avahi { withLibdnssdCompat = true; - }); + }; avro-c = callPackage ../development/libraries/avro-c { }; @@ -4107,8 +4025,6 @@ with pkgs; bc = callPackage ../tools/misc/bc { }; - gavin-bc = callPackage ../tools/misc/gavin-bc { }; - bdf2psf = callPackage ../tools/misc/bdf2psf { }; bdf2sfd = callPackage ../tools/misc/bdf2sfd { }; @@ -4198,8 +4114,6 @@ with pkgs; bfetch = callPackage ../tools/misc/bfetch { }; - bless = callPackage ../applications/editors/bless { }; - blink = darwin.apple_sdk_11_0.callPackage ../applications/emulators/blink { }; blink1-tool = callPackage ../tools/misc/blink1-tool { }; @@ -4242,10 +4156,9 @@ with pkgs; boxfs = callPackage ../tools/filesystems/boxfs { }; - bozohttpd = callPackage ../servers/http/bozohttpd { }; - bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; }; + bozohttpd-minimal = bozohttpd.override { minimal = true; }; - brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); + brasero-unwrapped = callPackage ../tools/cd-dvd/brasero { }; brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; @@ -4283,8 +4196,6 @@ with pkgs; buildtorrent = callPackage ../tools/misc/buildtorrent { }; - bundletool = callPackage ../development/tools/bundletool { }; - bwm_ng = callPackage ../tools/networking/bwm-ng { }; bwbasic = callPackage ../development/interpreters/bwbasic { }; @@ -4317,8 +4228,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - cue2pops = callPackage ../tools/cd-dvd/cue2pops { }; - cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables (haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix); @@ -4397,8 +4306,6 @@ with pkgs; croc = callPackage ../tools/networking/croc { }; - cbftp = callPackage ../tools/networking/cbftp { }; - cedille = callPackage ../applications/science/logic/cedille { inherit (haskellPackages) alex happy Agda ghcWithPackages; }; @@ -4479,6 +4386,10 @@ with pkgs; cz-cli = callPackage ../applications/version-management/cz-cli { }; + czkawka-full = czkawka.wrapper.override { + extraPackages = [ ffmpeg ]; + }; + comma = callPackage ../tools/package-management/comma { }; commitizen = with python3Packages; toPythonApplication commitizen; @@ -4533,8 +4444,6 @@ with pkgs; kanshi = callPackage ../tools/wayland/kanshi { }; - oguri = callPackage ../tools/wayland/oguri { }; - shikane = callPackage ../tools/wayland/shikane { }; shotman = callPackage ../tools/wayland/shotman { }; @@ -4543,8 +4452,6 @@ with pkgs; wlroots = wlroots_0_17; }; - swaykbdd = callPackage ../tools/wayland/swaykbdd { }; - swayr = callPackage ../tools/wayland/swayr { }; swayrbar = callPackage ../tools/wayland/swayrbar { }; @@ -4571,8 +4478,6 @@ with pkgs; wdt = callPackage ../applications/networking/sync/wdt { }; - wlay = callPackage ../tools/wayland/wlay { }; - wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; wl-clipboard-x11 = callPackage ../tools/wayland/wl-clipboard-x11 { }; @@ -4737,8 +4642,6 @@ with pkgs; dduper = callPackage ../tools/filesystems/dduper { }; - deck = callPackage ../applications/networking/deck { }; - dedup = callPackage ../tools/backup/dedup { }; deheader = callPackage ../development/tools/misc/deheader { }; @@ -5037,8 +4940,6 @@ with pkgs; fdroidcl = pkgs.callPackage ../development/mobile/fdroidcl { }; - fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { }; - fedimint = callPackage ../by-name/fe/fedimint/package.nix { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -5049,8 +4950,6 @@ with pkgs; filebench = callPackage ../tools/misc/filebench { }; - filebot = callPackage ../applications/video/filebot { }; - fileshare = callPackage ../servers/fileshare { }; fileshelter = callPackage ../servers/web-apps/fileshelter { }; @@ -5115,24 +5014,8 @@ with pkgs; mftrace = callPackage ../tools/typesetting/tex/mftrace { }; - # Keep the old PGF since some documents don't render properly with - # the new one. - pgf1 = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-1.x.nix { }; - - pgf2 = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-2.x.nix { }; - - pgf3 = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-3.x.nix { }; - pgf = pgf2; - pgf-pie = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-pie.nix { }; - - pgf-umlcd = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-umlcd.nix { }; - - pgf-umlsd = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix { }; - - pgfplots = callPackage ../tools/typesetting/tex/pgf-tikz/pgfplots.nix { }; - pplatex = callPackage ../tools/typesetting/tex/pplatex { }; tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; @@ -5158,8 +5041,6 @@ with pkgs; futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark; - tllist = callPackage ../development/libraries/tllist { }; - fcft = callPackage ../development/libraries/fcft { }; fuzzel = callPackage ../applications/misc/fuzzel { }; @@ -5285,24 +5166,18 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - gpu-burn = callPackage ../applications/misc/gpu-burn { - # gpu-burn doesn't build on gcc11. CUDA 11.3 is the last version to use - # pre-gcc11, in particular gcc9. - stdenv = gcc9Stdenv; - }; - - gpu-viewer = callPackage ../applications/misc/gpu-viewer { }; - greg = callPackage ../applications/audio/greg { pythonPackages = python3Packages; }; - grim = callPackage ../tools/graphics/grim { }; - grit = callPackage ../tools/misc/grit { }; grobi = callPackage ../tools/X11/grobi { }; + grype = callPackage ../by-name/gr/grype/package.nix { + buildGoModule = buildGo123Module; + }; + gscan2pdf = callPackage ../applications/graphics/gscan2pdf { # needs this fork of libtiff, because original libtiff # stopped packaging required tools with version 4.6 @@ -5329,10 +5204,6 @@ with pkgs; hebcal = callPackage ../tools/misc/hebcal { }; - hebbot = callPackage ../servers/matrix-hebbot { - inherit (darwin.apple_sdk.frameworks) Security; - }; - hexio = callPackage ../development/tools/hexio { }; hexyl = callPackage ../tools/misc/hexyl { }; @@ -5367,7 +5238,7 @@ with pkgs; cairo = cairo.override { xcbSupport = true; }; }; hyprland = callPackage ../by-name/hy/hyprland/package.nix { - libliftoff = libliftoff_0_4; + stdenv = gcc14Stdenv; }; hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { }; @@ -5414,8 +5285,6 @@ with pkgs; iotas = callPackage ../applications/office/iotas { }; - iotools = callPackage ../tools/misc/iotools { }; - jellycli = callPackage ../applications/audio/jellycli { }; jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { }; @@ -5439,7 +5308,7 @@ with pkgs; joystickwake = callPackage ../tools/games/joystickwake { }; juce = callPackage ../development/misc/juce { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; jumppad = callPackage ../tools/virtualization/jumppad { }; @@ -5490,8 +5359,6 @@ with pkgs; krapslog = callPackage ../tools/misc/krapslog { }; - krelay = callPackage ../applications/networking/cluster/krelay { }; - krill = callPackage ../servers/krill { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5525,8 +5392,6 @@ with pkgs; python = python3; }; - libnbd = callPackage ../development/libraries/libnbd { }; - libndtypes = callPackage ../development/libraries/libndtypes { }; libnss-mysql = callPackage ../os-specific/linux/libnss-mysql { }; @@ -5539,8 +5404,6 @@ with pkgs; libxnd = callPackage ../development/libraries/libxnd { }; - libz = callPackage ../development/libraries/libz { }; - libzbc = callPackage ../os-specific/linux/libzbc { }; libzbd = callPackage ../os-specific/linux/libzbd { }; @@ -5569,11 +5432,6 @@ with pkgs; loccount = callPackage ../development/tools/misc/loccount { }; - logseq = callPackage ../by-name/lo/logseq/package.nix { - # electron version from: https://github.com/logseq/logseq/blob/0.10.9/package.json#L116 - electron = electron_27; - }; - long-shebang = callPackage ../misc/long-shebang { }; lssecret = callPackage ../misc/lssecret {}; @@ -5631,8 +5489,6 @@ with pkgs; maxcso = callPackage ../tools/archivers/maxcso { }; - measureme = callPackage ../development/tools/rust/measureme { }; - medusa = callPackage ../tools/security/medusa { }; megasync = libsForQt5.callPackage ../applications/misc/megasync { @@ -6035,8 +5891,6 @@ with pkgs; spacevim = callPackage ../applications/editors/spacevim { }; - srvc = callPackage ../applications/version-management/srvc { }; - ssmsh = callPackage ../tools/admin/ssmsh { }; stacs = callPackage ../tools/security/stacs { }; @@ -6324,8 +6178,6 @@ with pkgs; byzanz = callPackage ../applications/video/byzanz { }; - algolia-cli = callPackage ../development/tools/algolia-cli { }; - anydesk = callPackage ../applications/networking/remote/anydesk { }; anystyle-cli = callPackage ../tools/misc/anystyle-cli { }; @@ -6366,8 +6218,6 @@ with pkgs; ccd2iso = callPackage ../tools/cd-dvd/ccd2iso { }; - ccid = callPackage ../tools/security/ccid { }; - ccrypt = callPackage ../tools/security/ccrypt { }; ccze = callPackage ../tools/misc/ccze { }; @@ -6387,7 +6237,7 @@ with pkgs; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; cdrtools = callPackage ../tools/cd-dvd/cdrtools { - stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_14.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; @@ -6424,8 +6274,6 @@ with pkgs; cglm = callPackage ../development/libraries/cglm { }; - cgreen = callPackage ../development/libraries/cgreen { }; - chain-bench = callPackage ../tools/security/chain-bench { }; chainsaw = callPackage ../tools/security/chainsaw { }; @@ -6471,8 +6319,6 @@ with pkgs; circus = with python310Packages; toPythonApplication circus; - cirrus-cli = callPackage ../development/tools/continuous-integration/cirrus-cli { }; - cirrusgo = callPackage ../tools/security/cirrusgo { }; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) @@ -6629,6 +6475,7 @@ with pkgs; netbird = callPackage ../tools/networking/netbird { inherit (darwin.apple_sdk_11_0.frameworks) Cocoa IOKit Kernel UserNotifications WebKit; + buildGoModule = buildGo123Module; }; netbird-ui = netbird.override { @@ -6640,7 +6487,7 @@ with pkgs; netplan = callPackage ../tools/admin/netplan { }; skktools = callPackage ../tools/inputmethods/skk/skktools { }; - skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; + skkDictionaries = callPackages ../tools/inputmethods/skk/skk-dicts { }; libkkc-data = callPackage ../data/misc/libkkc-data { }; @@ -6665,7 +6512,18 @@ with pkgs; m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; - mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { }; + inherit mozc; + + mozc-ut = mozc.override { dictionaries = [ + mozcdic-ut-alt-cannadic + mozcdic-ut-edict2 + mozcdic-ut-jawiki + mozcdic-ut-neologd + mozcdic-ut-personal-names + mozcdic-ut-place-names + mozcdic-ut-skk-jisyo + mozcdic-ut-sudachidict + ]; }; openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { withIbusSupport = true; }; @@ -6718,7 +6576,7 @@ with pkgs; bbin = callPackage ../development/tools/bbin { }; - blacken-docs = callPackage ../tools/misc/blacken-docs { }; + blacken-docs = with python3Packages; toPythonApplication blacken-docs; bore = callPackage ../tools/networking/bore { inherit (darwin) Libsystem; @@ -6729,8 +6587,6 @@ with pkgs; biodiff = callPackage ../development/tools/biodiff { }; - biome = callPackage ../development/tools/biome { }; - biosdevname = callPackage ../tools/networking/biosdevname { }; bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { }; @@ -6783,7 +6639,7 @@ with pkgs; ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; clamav = callPackage ../tools/security/clamav { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }; @@ -6793,16 +6649,6 @@ with pkgs; clolcat = callPackage ../tools/misc/clolcat { }; - cloog = callPackage ../development/libraries/cloog { - isl = isl_0_14; - }; - - cloog_0_18_0 = callPackage ../development/libraries/cloog/0.18.0.nix { - isl = isl_0_11; - }; - - cloogppl = callPackage ../development/libraries/cloog-ppl { }; - cloud-utils = callPackage ../tools/misc/cloud-utils { }; cloudlist = callPackage ../tools/security/cloudlist { }; @@ -7012,8 +6858,6 @@ with pkgs; deer = callPackage ../shells/zsh/zsh-deer { }; - deno = callPackage ../development/web/deno { }; - deqp-runner = callPackage ../tools/graphics/deqp-runner { }; detox = callPackage ../tools/misc/detox { }; @@ -7059,16 +6903,12 @@ with pkgs; dfrs = callPackage ../tools/system/dfrs { }; - dev86 = callPackage ../development/compilers/dev86 { }; - diskrsync = callPackage ../tools/backup/diskrsync { }; djbdns = callPackage ../tools/networking/djbdns { }; dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { }; - dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; - dnscontrol = callPackage ../applications/networking/dnscontrol { }; dnsenum = callPackage ../tools/security/dnsenum { }; @@ -7155,7 +6995,7 @@ with pkgs; dmd = callPackage ../by-name/dm/dmd/package.nix ({ inherit (darwin.apple_sdk.frameworks) Foundation; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { # https://github.com/NixOS/nixpkgs/pull/206907#issuecomment-1527034123 stdenv = gcc11Stdenv; }); @@ -7208,8 +7048,6 @@ with pkgs; driftctl = callPackage ../applications/networking/cluster/driftctl { }; - eks-node-viewer = callPackage ../applications/networking/cluster/eks-node-viewer { }; - drill = callPackage ../tools/networking/drill { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7260,8 +7098,6 @@ with pkgs; duplicacy = callPackage ../tools/backup/duplicacy { }; - duplicati = callPackage ../tools/backup/duplicati { }; - duplicity = callPackage ../tools/backup/duplicity { }; duply = callPackage ../tools/backup/duply { }; @@ -7308,8 +7144,6 @@ with pkgs; editres = callPackage ../tools/graphics/editres { }; - edit = callPackage ../applications/editors/edit { }; - edk2-uefi-shell = callPackage ../tools/misc/edk2-uefi-shell { }; edl = callPackage ../development/embedded/edl { }; @@ -7318,8 +7152,6 @@ with pkgs; eff = callPackage ../development/interpreters/eff { }; - eflite = callPackage ../applications/audio/eflite { }; - eid-mw = callPackage ../tools/security/eid-mw { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -7334,10 +7166,6 @@ with pkgs; evtx = callPackage ../tools/security/evtx { }; - luckybackup = libsForQt5.callPackage ../tools/backup/luckybackup { - ssh = openssh; - }; - kics = callPackage ../tools/admin/kics { }; kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; @@ -7346,12 +7174,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { }; - mcrcon = callPackage ../tools/networking/mcrcon { }; - mozillavpn = qt6Packages.callPackage ../tools/networking/mozillavpn { }; - mozwire = callPackage ../tools/networking/mozwire { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -7437,8 +7261,6 @@ with pkgs; wakeonlan = callPackage ../tools/networking/wakeonlan { }; - wallutils = callPackage ../tools/graphics/wallutils { }; - wayback = callPackage ../tools/misc/wayback { }; worker-build = callPackage ../development/tools/worker-build { @@ -7475,10 +7297,6 @@ with pkgs; zeekscript = callPackage ../tools/security/zeekscript { }; - zoekt = callPackage ../tools/text/zoekt { - buildGoModule = buildGo121Module; - }; - zonemaster-cli = perlPackages.ZonemasterCLI; zotero-translation-server = callPackage ../tools/misc/zotero-translation-server { }; @@ -7735,8 +7553,6 @@ with pkgs; filegive = callPackage ../tools/networking/filegive { }; - fileschanged = callPackage ../tools/misc/fileschanged { }; - filet = callPackage ../applications/misc/filet { }; findex = callPackage ../applications/misc/findex { }; @@ -7749,9 +7565,9 @@ with pkgs; fingerprintx = callPackage ../tools/security/fingerprintx { }; - bsd-fingerd = bsd-finger.override({ + bsd-fingerd = bsd-finger.override { buildProduct = "daemon"; - }); + }; iprange = callPackage ../applications/networking/firehol/iprange.nix { }; @@ -7912,8 +7728,6 @@ with pkgs; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; - ftgl = callPackage ../development/libraries/ftgl { }; - ftop = callPackage ../os-specific/linux/ftop { }; ftxui = callPackage ../development/libraries/ftxui { }; @@ -7968,12 +7782,6 @@ with pkgs; uniscribe = callPackage ../tools/text/uniscribe { }; - calcoo = callPackage ../applications/misc/calcoo { }; - - galculator = callPackage ../applications/misc/galculator { - gtk = gtk3; - }; - fornalder = callPackage ../applications/version-management/fornalder { }; galen = callPackage ../development/tools/galen { }; @@ -7992,7 +7800,7 @@ with pkgs; garage garage_0_8 garage_0_9 garage_0_8_7 garage_0_9_4 - garage_1_0_0 garage_1_x; + garage_1_0_1 garage_1_x; garmintools = callPackage ../development/libraries/garmintools { }; @@ -8061,7 +7869,9 @@ with pkgs; ggobi = callPackage ../tools/graphics/ggobi { }; - ggshield = callPackage ../tools/security/ggshield { }; + ggshield = callPackage ../tools/security/ggshield { + python3 = python311; + }; ghost = callPackage ../tools/security/ghost { }; @@ -8112,8 +7922,6 @@ with pkgs; git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; - gitea-actions-runner = callPackage ../development/tools/continuous-integration/gitea-actions-runner { }; - gokart = callPackage ../development/tools/gokart { }; gl2ps = callPackage ../development/libraries/gl2ps { }; @@ -8151,6 +7959,8 @@ with pkgs; gnome-solanum = callPackage ../applications/misc/gnome-solanum { }; + gnome-panel-with-modules = callPackage ../by-name/gn/gnome-panel/wrapper.nix { }; + gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; gnome-photos = callPackage ../applications/graphics/gnome-photos { }; @@ -8175,8 +7985,6 @@ with pkgs; gnu-cim = callPackage ../development/compilers/gnu-cim { }; - gnu-cobol = callPackage ../development/compilers/gnu-cobol { }; - gnuclad = callPackage ../applications/graphics/gnuclad { }; gnufdisk = callPackage ../tools/system/fdisk { @@ -8194,12 +8002,12 @@ with pkgs; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg22 = callPackage ../tools/security/gnupg/22.nix { - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; + pinentry = if stdenv.hostPlatform.isDarwin then pinentry_mac else pinentry-gtk2; libgcrypt = libgcrypt_1_8; }; gnupg24 = callPackage ../tools/security/gnupg/24.nix { - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; + pinentry = if stdenv.hostPlatform.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg = gnupg24; @@ -8347,8 +8155,6 @@ with pkgs; gradience = callPackage ../applications/misc/gradience { }; - grafx2 = callPackage ../applications/graphics/grafx2 { }; - grails = callPackage ../development/web/grails { jdk = null; }; graylog-5_1 = callPackage ../tools/misc/graylog/5.1.nix { }; @@ -8452,8 +8258,6 @@ with pkgs; sbsigntool = callPackage ../tools/security/sbsigntool { }; - sonic-server = callPackage ../servers/search/sonic-server { }; - gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; gsmlib = callPackage ../development/libraries/gsmlib @@ -8481,8 +8285,6 @@ with pkgs; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; - gtkperf = callPackage ../development/tools/misc/gtkperf { }; - gtkradiant = callPackage ../applications/misc/gtkradiant { }; gtk-frdp = callPackage ../development/libraries/gtk-frdp { }; @@ -8512,7 +8314,7 @@ with pkgs; gvproxy = callPackage ../tools/networking/gvproxy { }; gyroflow = qt6Packages.callPackage ../applications/video/gyroflow { - ffmpeg = ffmpeg_6; + ffmpeg = ffmpeg_7; }; gzip = callPackage ../tools/compression/gzip { }; @@ -8598,7 +8400,7 @@ with pkgs; haste-server = callPackage ../servers/haste-server { }; hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; half = callPackage ../development/libraries/half { }; @@ -8702,9 +8504,9 @@ with pkgs; hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; - highlight = callPackage ../tools/text/highlight ({ + highlight = callPackage ../tools/text/highlight { lua = lua5; - }); + }; hockeypuck = callPackage ../servers/hockeypuck/server.nix { }; @@ -8983,8 +8785,6 @@ with pkgs; ipv6calc = callPackage ../tools/networking/ipv6calc { }; - ipxe = callPackage ../tools/misc/ipxe { }; - irker = callPackage ../servers/irker { }; iroh = callPackage ../applications/networking/iroh { }; @@ -8992,8 +8792,6 @@ with pkgs; ised = callPackage ../tools/misc/ised { }; isl = isl_0_20; - isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { }; - isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { }; isl_0_17 = callPackage ../development/libraries/isl/0.17.1.nix { }; isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { }; isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { }; @@ -9067,8 +8865,6 @@ with pkgs; jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - jira-cli-go = callPackage ../development/tools/jira-cli-go { }; - jirafeau = callPackage ../servers/web-apps/jirafeau { }; jitterentropy = callPackage ../development/libraries/jitterentropy { }; @@ -9096,7 +8892,7 @@ with pkgs; go-jira = callPackage ../applications/misc/go-jira { }; jogl = callPackage ../by-name/jo/jogl/package.nix { - stdenv = if stdenv.isDarwin && stdenv.isx86_64 then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv "11.0" else stdenv; }; john = callPackage ../tools/security/john { }; @@ -9165,12 +8961,8 @@ with pkgs; jumpapp = callPackage ../tools/X11/jumpapp { }; - jove = callPackage ../applications/editors/jove { }; - jugglinglab = callPackage ../tools/misc/jugglinglab { }; - jupp = callPackage ../applications/editors/jupp { }; - jupyter = callPackage ../applications/editors/jupyter { }; jupyter-all = jupyter.override { @@ -9191,8 +8983,6 @@ with pkgs; k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; - kargo = callPackage ../tools/misc/kargo { }; - kazam = callPackage ../applications/video/kazam { }; kalibrate-rtl = callPackage ../applications/radio/kalibrate-rtl { }; @@ -9390,7 +9180,7 @@ with pkgs; libcryptui = callPackage ../development/libraries/libcryptui { autoreconfHook = buildPackages.autoreconfHook269; - gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; + gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; }; libshumate = callPackage ../development/libraries/libshumate { }; @@ -9674,7 +9464,7 @@ with pkgs; pythonPackages = python3Packages; }; - nanoemoji = python3Packages.callPackage ../tools/misc/nanoemoji { }; + nanoemoji = with python3Packages; toPythonApplication nanoemoji; nagelfar = callPackage ../development/tools/nagelfar { }; @@ -9699,11 +9489,10 @@ with pkgs; nerdctl = callPackage ../applications/networking/cluster/nerdctl { }; netdata = callPackage ../tools/system/netdata { - inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; protobuf = protobuf_21; }; netdataCloud = netdata.override { - withCloud = !stdenv.isDarwin; + withCloud = true; withCloudUi = true; }; @@ -9835,8 +9624,6 @@ with pkgs; leafpad = callPackage ../applications/editors/leafpad { }; - l3afpad = callPackage ../applications/editors/l3afpad { }; - leanblueprint = with python3Packages; toPythonApplication leanblueprint; leanify = callPackage ../tools/misc/leanify { }; @@ -10166,7 +9953,7 @@ with pkgs; bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { }; mailpit = callPackage ../servers/mail/mailpit { - libtool = if stdenv.isDarwin then cctools else libtool; + libtool = if stdenv.hostPlatform.isDarwin then cctools else libtool; }; mailsend = callPackage ../tools/networking/mailsend { }; @@ -10250,8 +10037,6 @@ with pkgs; megacli = callPackage ../tools/misc/megacli { }; - megatools = callPackage ../tools/networking/megatools { }; - memo = callPackage ../applications/misc/memo { }; mencal = callPackage ../applications/misc/mencal { } ; @@ -10272,8 +10057,6 @@ with pkgs; midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; - mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; - mimeo = callPackage ../tools/misc/mimeo { }; mimetic = callPackage ../development/libraries/mimetic { }; @@ -10596,14 +10379,10 @@ with pkgs; nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; - newsboat = callPackage ../applications/networking/feedreaders/newsboat { - inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; - grocy = callPackage ../servers/grocy { }; inherit (callPackages ../servers/nextcloud {}) - nextcloud28 nextcloud29; + nextcloud28 nextcloud29 nextcloud30; nextcloud28Packages = callPackage ../servers/nextcloud/packages { apps = lib.importJSON ../servers/nextcloud/packages/28.json; @@ -10611,9 +10390,12 @@ with pkgs; nextcloud29Packages = callPackage ../servers/nextcloud/packages { apps = lib.importJSON ../servers/nextcloud/packages/29.json; }; + nextcloud30Packages = callPackage ../servers/nextcloud/packages { + apps = lib.importJSON ../servers/nextcloud/packages/30.json; + }; - nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; + nextcloud-client = qt6Packages.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; @@ -10775,14 +10557,12 @@ with pkgs; noisetorch = callPackage ../applications/audio/noisetorch { }; - notation = callPackage ../tools/security/notation { }; + notation = callPackage ../by-name/no/notation/package.nix { + buildGoModule = buildGo123Module; + }; notify-osd = callPackage ../applications/misc/notify-osd { }; - notes = qt6Packages.callPackage ../applications/office/notes { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - notes-up = callPackage ../applications/office/notes-up { }; notify-osd-customizable = callPackage ../applications/misc/notify-osd-customizable { }; @@ -11160,8 +10940,6 @@ with pkgs; ovftool = callPackage ../tools/virtualization/ovftool { }; - overcommit = callPackage ../development/tools/overcommit { }; - overmind = callPackage ../applications/misc/overmind { }; oxker = callPackage ../applications/misc/oxker { }; @@ -11206,7 +10984,7 @@ with pkgs; page = callPackage ../tools/misc/page { }; pageedit = libsForQt5.callPackage ../applications/office/PageEdit { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; pagefind = libsForQt5.callPackage ../applications/misc/pagefind { }; @@ -11233,8 +11011,6 @@ with pkgs; paperless-ngx = callPackage ../applications/office/paperless-ngx { }; - paperoni = callPackage ../tools/text/paperoni { }; - paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; papeer = callPackage ../tools/text/papeer { }; @@ -11481,19 +11257,13 @@ with pkgs; pk2cmd = callPackage ../tools/misc/pk2cmd { }; - plantuml = callPackage ../tools/misc/plantuml { }; - - plantuml-c4 = callPackage ../tools/misc/plantuml/plantuml-c4.nix { }; - - plantuml-server = callPackage ../tools/misc/plantuml-server { }; - plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port { inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit Metal QuartzCore; inherit (darwin) DarwinTools; }; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); - platformio = if stdenv.isLinux then platformioPackages.platformio-chrootenv else platformioPackages.platformio-core; + platformio = if stdenv.hostPlatform.isLinux then platformioPackages.platformio-chrootenv else platformioPackages.platformio-core; platformio-core = platformioPackages.platformio-core; platinum-searcher = callPackage ../tools/text/platinum-searcher { }; @@ -11502,8 +11272,8 @@ with pkgs; playwright = with python3Packages; toPythonApplication playwright; - playwright-driver = callPackage ../development/web/playwright/driver.nix { }; - playwright-test = callPackage ../development/web/playwright-test/wrapped.nix { }; + playwright-driver = (callPackage ../development/web/playwright/driver.nix { }).playwright-core; + playwright-test = (callPackage ../development/web/playwright/driver.nix { }).playwright-test; please = callPackage ../tools/security/please { }; @@ -11527,8 +11297,8 @@ with pkgs; tautulli = python3Packages.callPackage ../servers/tautulli { }; pleroma = callPackage ../servers/pleroma { - elixir = elixir_1_14; - beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; }); + elixir = elixir_1_17; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; }); }; plfit = callPackage ../tools/misc/plfit { @@ -11625,8 +11395,6 @@ with pkgs; stdenv = gcc12Stdenv; }; - power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { }; - ppl = callPackage ../development/libraries/ppl { }; pplite = callPackage ../development/libraries/pplite { }; @@ -11672,7 +11440,7 @@ with pkgs; proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; proxychains = callPackage ../tools/networking/proxychains { }; @@ -11729,10 +11497,6 @@ with pkgs; psudohash = callPackage ../tools/security/psudohash { }; - psensor = callPackage ../tools/system/psensor { - libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; - }; - pubs = callPackage ../tools/misc/pubs { }; pulldown-cmark = callPackage ../tools/typesetting/pulldown-cmark { }; @@ -11765,8 +11529,6 @@ with pkgs; pypass = with python3Packages; toPythonApplication pypass; - teapot = callPackage ../applications/office/teapot { }; - ticktick = callPackage ../applications/office/ticktick { }; pyditz = callPackage ../applications/misc/pyditz { @@ -11806,7 +11568,7 @@ with pkgs; ripdrag = callPackage ../tools/misc/ripdrag { }; - riseup-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn { + riseup-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn { provider = "riseup"; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -11883,15 +11645,13 @@ with pkgs; qovery-cli = callPackage ../tools/admin/qovery-cli { }; qownnotes = qt6Packages.callPackage ../applications/office/qownnotes { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; qpdf = callPackage ../development/libraries/qpdf { }; qprint = callPackage ../tools/text/qprint { }; - qrcp = callPackage ../tools/networking/qrcp { }; - qrscan = callPackage ../tools/misc/qrscan { }; qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; @@ -11902,8 +11662,6 @@ with pkgs; quickfix = callPackage ../development/libraries/quickfix { }; - quickjs = callPackage ../development/interpreters/quickjs { }; - quickserve = callPackage ../tools/networking/quickserve { }; quictls = callPackage ../development/libraries/quictls { }; @@ -11918,7 +11676,7 @@ with pkgs; raider = callPackage ../applications/misc/raider { }; - quota = if stdenv.isLinux then linuxquota else unixtools.quota; + quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota; qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; @@ -12047,8 +11805,6 @@ with pkgs; readability-cli = callPackage ../tools/text/readability-cli { }; - recutils = callPackage ../tools/misc/recutils { }; - recoll = libsForQt5.callPackage ../applications/search/recoll { }; recoll-nox = recoll.override { withGui = false; }; @@ -12069,8 +11825,6 @@ with pkgs; renameutils = callPackage ../tools/misc/renameutils { }; - renderdoc = libsForQt5.callPackage ../development/tools/renderdoc { }; - repgrep = callPackage ../tools/text/repgrep { }; replace = callPackage ../tools/text/replace { }; @@ -12171,8 +11925,6 @@ with pkgs; roc-toolkit = callPackage ../development/libraries/audio/roc-toolkit { }; - rockbox-utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; - rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; rosenpass = callPackage ../tools/networking/rosenpass { }; @@ -12185,8 +11937,6 @@ with pkgs; rpPPPoE = callPackage ../tools/networking/rp-pppoe { }; - rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { }; - rpiboot = callPackage ../development/misc/rpiboot { }; rpm = callPackage ../tools/package-management/rpm { @@ -12238,8 +11988,6 @@ with pkgs; runzip = callPackage ../tools/archivers/runzip { }; - unzoo = callPackage ../tools/archivers/unzoo { }; - ruplacer = callPackage ../tools/text/ruplacer { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12342,8 +12090,6 @@ with pkgs; sanctity = callPackage ../tools/misc/sanctity { }; - sasquatch = callPackage ../tools/filesystems/sasquatch { }; - sasview = libsForQt5.callPackage ../applications/science/misc/sasview { }; sbs = callPackage ../tools/X11/sbs { }; @@ -12581,8 +12327,6 @@ with pkgs; sipcalc = callPackage ../tools/networking/sipcalc { }; - skribilo = callPackage ../tools/typesetting/skribilo { }; - skytemple = callPackage ../applications/misc/skytemple { }; sleuthkit = callPackage ../tools/system/sleuthkit { }; @@ -12642,15 +12386,13 @@ with pkgs; snapcast = darwin.apple_sdk_11_0.callPackage ../applications/audio/snapcast { inherit (darwin.apple_sdk_11_0.frameworks) IOKit AudioToolbox; - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux; }; snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { }; snet = callPackage ../tools/networking/snet { }; - sng = callPackage ../tools/graphics/sng { }; - snmpcheck = callPackage ../tools/networking/snmpcheck { }; snobol4 = callPackage ../development/interpreters/snobol4 { }; @@ -12658,7 +12400,7 @@ with pkgs; snort = callPackage ../applications/networking/ids/snort { }; soapui = callPackage ../applications/networking/soapui { - jdk = if stdenv.isDarwin + jdk = if stdenv.hostPlatform.isDarwin then (jdk11.override { enableJavaFX = true; }) else jdk11; }; @@ -13073,8 +12815,6 @@ with pkgs; teip = callPackage ../tools/text/teip { }; - telegraf = callPackage ../servers/monitoring/telegraf { }; - inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; }) teleport_14 teleport_15 teleport_16 teleport; @@ -13102,11 +12842,11 @@ with pkgs; tewisay = callPackage ../tools/misc/tewisay { }; texmacs = libsForQt5.callPackage ../applications/editors/texmacs { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; extraFonts = true; }; - texmaker = libsForQt5.callPackage ../applications/editors/texmaker { }; + texmaker = qt6Packages.callPackage ../applications/editors/texmaker { }; texstudio = qt6Packages.callPackage ../applications/editors/texstudio { }; @@ -13148,8 +12888,6 @@ with pkgs; threema-desktop = callPackage ../applications/networking/instant-messengers/threema-desktop { }; - thumbdrives = callPackage ../applications/system/thumbdrives { }; - tidy-viewer = callPackage ../tools/text/tidy-viewer { }; tiled = libsForQt5.callPackage ../applications/editors/tiled { }; @@ -13324,8 +13062,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; }; - trunk-io = callPackage ../development/tools/trunk-io { }; - trunk-ng = callPackage ../by-name/tr/trunk-ng/package.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; @@ -13418,10 +13154,6 @@ with pkgs; ttylog = callPackage ../tools/misc/ttylog { }; - twm = callPackage ../tools/misc/twm { - inherit (darwin.apple_sdk.frameworks) Security; - }; - ipbt = callPackage ../tools/misc/ipbt { }; tuckr = callPackage ../applications/misc/tuckr { }; @@ -13452,8 +13184,6 @@ with pkgs; tvm = callPackage ../development/compilers/tvm { }; - oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; - ttfb = callPackage ../development/tools/ttfb { }; twilight = callPackage ../tools/graphics/twilight { @@ -13482,8 +13212,6 @@ with pkgs; typesense = callPackage ../servers/search/typesense { }; - typos = callPackage ../development/tools/typos { }; - tz = callPackage ../tools/misc/tz { }; u9fs = callPackage ../servers/u9fs { }; @@ -13498,8 +13226,6 @@ with pkgs; ubpm = libsForQt5.callPackage ../applications/misc/ubpm { }; - ubridge = callPackage ../tools/networking/ubridge { }; - ubertooth = callPackage ../applications/radio/ubertooth { }; ucarp = callPackage ../servers/ucarp { }; @@ -13625,8 +13351,6 @@ with pkgs; vampire = callPackage ../applications/science/logic/vampire { }; - variety = callPackage ../applications/misc/variety { }; - vdmfec = callPackage ../applications/backup/vdmfec { }; vk-bootstrap = callPackage ../development/libraries/vk-bootstrap { }; @@ -13745,8 +13469,6 @@ with pkgs; inherit (openconnectPackages) openconnect openconnect_openssl; - globalprotect-openconnect = libsForQt5.callPackage ../tools/networking/globalprotect-openconnect { }; - ding-libs = callPackage ../tools/misc/ding-libs { }; sssd = callPackage ../os-specific/linux/sssd { @@ -13768,16 +13490,12 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; - wakapi = callPackage ../tools/misc/wakapi { }; - wambo = callPackage ../development/tools/wambo { }; weather = callPackage ../applications/misc/weather { }; wego = callPackage ../applications/misc/wego { }; - wal_e = callPackage ../tools/backup/wal-e { }; - wander = callPackage ../tools/admin/wander { }; watchexec = callPackage ../tools/misc/watchexec { @@ -13800,15 +13518,10 @@ with pkgs; wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen-1.11.1"; wast-refmt = nodePackages."@webassemblyjs/wast-refmt-1.11.1"; - wasm-bindgen-cli = callPackage ../development/tools/wasm-bindgen-cli { - inherit (darwin.apple_sdk.frameworks) Security; - nodejs = nodejs_latest; - }; - wasm-tools = callPackage ../tools/misc/wasm-tools { }; wasmedge = callPackage ../development/tools/wasmedge { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else llvmPackages.stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else llvmPackages.stdenv; inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }; @@ -13834,8 +13547,6 @@ with pkgs; whois = callPackage ../tools/networking/whois { }; - wifish = callPackage ../tools/networking/wifish { }; - wimboot = callPackage ../tools/misc/wimboot { }; wire = callPackage ../development/tools/wire { }; @@ -13912,8 +13623,6 @@ with pkgs; htmltest = callPackage ../development/tools/htmltest { }; - rcm = callPackage ../tools/misc/rcm { }; - td = callPackage ../tools/misc/td { }; tdfgo = callPackage ../tools/misc/tdfgo { }; @@ -13958,8 +13667,6 @@ with pkgs; libjpeg_turbo = libjpeg_turbo.override { enableJava = true; }; }; - udunits = callPackage ../development/libraries/udunits { }; - ufmt = with python3Packages; toPythonApplication ufmt; uftp = callPackage ../servers/uftp { }; @@ -14006,8 +13713,6 @@ with pkgs; vul = callPackage ../applications/misc/vul { }; - xar = callPackage ../tools/compression/xar { }; - xarchive = callPackage ../tools/archivers/xarchive { }; xarchiver = callPackage ../tools/archivers/xarchiver { }; @@ -14083,8 +13788,6 @@ with pkgs; upwork = callPackage ../applications/misc/upwork { }; - urjtag = callPackage ../tools/misc/urjtag { }; - urlhunter = callPackage ../tools/security/urlhunter { }; urlwatch = callPackage ../tools/networking/urlwatch { }; @@ -14103,10 +13806,6 @@ with pkgs; hitch = callPackage ../servers/hitch { }; - veracrypt = callPackage ../applications/misc/veracrypt { - wxGTK = wxGTK32; - }; - veryfasttree = callPackage ../applications/science/biology/veryfasttree { }; viceroy = callPackage ../development/tools/viceroy { @@ -14291,10 +13990,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - xprite-editor = callPackage ../tools/misc/xprite-editor { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; - xq-xml = callPackage ../tools/text/xml/xq { }; xsecurelock = callPackage ../tools/X11/xsecurelock { }; @@ -14426,8 +14121,6 @@ with pkgs; zpool-auto-expand-partitions = callPackage ../tools/filesystems/zpool-auto-expand-partitions { }; - zile = callPackage ../applications/editors/zile { }; - zinnia = callPackage ../tools/inputmethods/zinnia { }; tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { }; @@ -14442,7 +14135,7 @@ with pkgs; zip = callPackage ../tools/archivers/zip { }; zincsearch = callPackage ../servers/search/zincsearch { - buildGoModule = buildGo121Module; + buildGoModule = buildGo122Module; }; zkfuse = callPackage ../tools/filesystems/zkfuse { }; @@ -14552,8 +14245,6 @@ with pkgs; agdsn-zsh-config = callPackage ../shells/zsh/agdsn-zsh-config { }; - nix-your-shell = callPackage ../shells/nix-your-shell { }; - bash = lowPrio (callPackage ../shells/bash/5.nix { }); # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed bashInteractive = callPackage ../shells/bash/5.nix { @@ -14578,7 +14269,9 @@ with pkgs; undistract-me = callPackage ../shells/bash/undistract-me { }; - carapace = callPackage ../shells/carapace { }; + carapace = callPackage ../shells/carapace { + buildGoModule = buildGo123Module; + }; dash = callPackage ../shells/dash { }; @@ -14683,14 +14376,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - as31 = callPackage ../development/compilers/as31 { }; - - asl = callPackage ../development/compilers/asl { }; - aspectj = callPackage ../development/compilers/aspectj { }; - atasm = callPackage ../development/compilers/atasm { }; - ats = callPackage ../development/compilers/ats { }; ats2 = callPackage ../development/compilers/ats2 { }; @@ -14746,8 +14433,6 @@ with pkgs; chicken egg2nix; - cc65 = callPackage ../development/compilers/cc65 { }; - cdb = callPackage ../development/tools/database/cdb { stdenv = gccStdenv; }; @@ -14797,7 +14482,7 @@ with pkgs; #Use this instead of stdenv to build with clang clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv; clang-sierraHack-stdenv = overrideCC stdenv buildPackages.clang-sierraHack; - libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; + libcxxStdenv = if stdenv.hostPlatform.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; clean = callPackage ../development/compilers/clean { }; @@ -14886,7 +14571,7 @@ with pkgs; apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { }; fasm = pkgsi686Linux.callPackage ../development/compilers/fasm { - inherit (stdenv) isx86_64; + inherit (stdenv.hostPlatform) isx86_64; }; fasm-bin = callPackage ../development/compilers/fasm/bin.nix { }; @@ -14967,8 +14652,6 @@ with pkgs; extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc; }; - gcc49Stdenv = overrideCC gccStdenv buildPackages.gcc49; - gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6; gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7; gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8; gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9; @@ -15028,11 +14711,6 @@ with pkgs; gccCrossLibcStdenv = overrideCC stdenvNoCC buildPackages.gccWithoutTargetLibc; - crossLibcStdenv = - if stdenv.hostPlatform.useLLVM or false || stdenv.hostPlatform.isDarwin - then overrideCC stdenv buildPackages.llvmPackages.clangNoLibc - else gccCrossLibcStdenv; - # The GCC used to build libc for the target platform. Normal gccs will be # built with, and use, that cross-compiled libc. gccWithoutTargetLibc = assert stdenv.targetPlatform != stdenv.hostPlatform; let @@ -15046,7 +14724,7 @@ with pkgs; reproducibleBuild = true; profiledCompiler = false; - isl = if !stdenv.isDarwin then isl_0_20 else null; + isl = if !stdenv.hostPlatform.isDarwin then isl_0_20 else null; withoutTargetLibc = true; langCC = false; @@ -15067,7 +14745,7 @@ with pkgs; }; inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; }) - gcc48 gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14; + gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14; gcc_latest = gcc14; @@ -15081,18 +14759,6 @@ with pkgs; enableLTO = false; }; - gcj = gcj6; - gcj6 = wrapCC (gcc6.cc.override { - name = "gcj"; - langJava = true; - langFortran = false; - langCC = false; - langC = false; - profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext pkg-config perl; - inherit (gnome2) libart_lgpl; - }); - gnat = gnat12; # When changing this, update also gnatPackages gnat11 = wrapCC (gcc11.cc.override { @@ -15203,8 +14869,6 @@ with pkgs; gprbuild gnatprove; - gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; - gccgo = wrapCC (gcc.cc.override { name = "gccgo"; langCC = true; #required for go. @@ -15454,8 +15118,6 @@ with pkgs; intel-graphics-compiler = callPackage ../development/compilers/intel-graphics-compiler { }; - intercal = callPackage ../development/compilers/intercal { }; - irony-server = callPackage ../development/tools/irony-server { # The repository of irony to use -- must match the version of the employed emacs # package. Wishing we could merge it into one irony package, to avoid this issue, @@ -15668,18 +15330,12 @@ with pkgs; libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; + # Please remove all this logic when bumping to LLVM 19 and make this + # a simple alias. llvmPackages = let # This returns the minimum supported version for the platform. The # assumption is that or any later version is good. - choose = platform: - /**/ if platform.isDarwin then 16 - else if platform.isFreeBSD then 18 - else if platform.isOpenBSD then 18 - else if platform.isAndroid then 12 - else if platform.isLinux then 18 - else if platform.isWasm then 16 - # For unknown systems, assume the latest version is required. - else 18; + choose = platform: if platform.isDarwin then 16 else 18; # We take the "max of the mins". Why? Since those are lower bounds of the # supported version set, this is like intersecting those sets and then # taking the min bound of that. @@ -15687,12 +15343,12 @@ with pkgs; stdenv.targetPlatform)); in pkgs.${"llvmPackages_${minSupported}"}; - llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ + llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_12.tools; targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries; targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm; - })); + }); inherit (rec { llvmPackagesSet = recurseIntoAttrs (callPackages ../development/compilers/llvm { }); @@ -15740,8 +15396,6 @@ with pkgs; manticore = callPackage ../development/compilers/manticore { }; - marst = callPackage ../development/compilers/marst { }; - mercury = callPackage ../development/compilers/mercury { jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -15886,8 +15540,6 @@ with pkgs; passerine = callPackage ../development/compilers/passerine { }; - pforth = callPackage ../development/compilers/pforth { }; - picat = callPackage ../development/compilers/picat { }; ponyc = callPackage ../development/compilers/ponyc { @@ -15941,13 +15593,20 @@ with pkgs; makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { }; - buildRustCrate = callPackage ../build-support/rust/build-rust-crate ({ } // lib.optionalAttrs (stdenv.hostPlatform.libc == null) { - stdenv = stdenvNoCC; # Some build targets without libc will fail to evaluate with a normal stdenv. - }); + buildRustCrate = + let + # Returns a true if the builder's rustc was built with support for the target. + targetAlreadyIncluded = lib.elem stdenv.hostPlatform.rust.rustcTarget + (lib.splitString "," (lib.removePrefix "--target=" ( + lib.elemAt (lib.filter (f: lib.hasPrefix "--target=" f) pkgsBuildBuild.rustc.unwrapped.configureFlags) 0 + ))); + in + callPackage ../build-support/rust/build-rust-crate ({ } // lib.optionalAttrs (stdenv.hostPlatform.libc == null) { + stdenv = stdenvNoCC; # Some build targets without libc will fail to evaluate with a normal stdenv. + } // lib.optionalAttrs targetAlreadyIncluded { inherit (pkgsBuildBuild) rustc cargo; } # Optimization. + ); buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; - cargo2junit = callPackage ../development/tools/rust/cargo2junit { }; - cargo-web = callPackage ../development/tools/rust/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -15977,7 +15636,7 @@ with pkgs; }; cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed { rustPlatform = makeRustPlatform { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit rustc cargo; }; }; @@ -16013,6 +15672,7 @@ with pkgs; cargo-pgrx_0_10_2 cargo-pgrx_0_11_2 cargo-pgrx_0_11_3 + cargo-pgrx_0_12_0_alpha_1 ; cargo-pgrx = cargo-pgrx_0_11_2; @@ -16111,7 +15771,6 @@ with pkgs; cargo-ui = callPackage ../development/tools/rust/cargo-ui { }; cargo-unused-features = callPackage ../development/tools/rust/cargo-unused-features { }; - cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { }; cargo-mobile2 = callPackage ../development/tools/rust/cargo-mobile2 { }; cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { }; @@ -16268,10 +15927,10 @@ with pkgs; swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { }); inherit (swiftPackages) swift swiftpm sourcekit-lsp swift-format swiftpm2nix; - swiProlog = callPackage ../development/compilers/swi-prolog { + swi-prolog = callPackage ../development/compilers/swi-prolog { inherit (darwin.apple_sdk.frameworks) Security; }; - swiPrologWithGui = swiProlog.override { withGui = true; }; + swi-prolog-gui = swi-prolog.override { withGui = true; }; tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { }; tbb_2021_5 = callPackage ../development/libraries/tbb/2021_5.nix { } ; @@ -16559,6 +16218,12 @@ with pkgs; wxSupport = false; systemdSupport = false; }; + beam_nodocs = callPackage ./beam-packages.nix { + beam = beam_nodocs; + wxSupport = false; + systemdSupport = false; + ex_docSupport = false; + }; inherit (beam.interpreters) erlang erlang_27 erlang_26 erlang_25 erlang_24 @@ -16610,8 +16275,6 @@ with pkgs; ivy = callPackage ../development/interpreters/ivy { }; - j = callPackage ../development/interpreters/j { }; - jacinda = haskell.lib.compose.justStaticExecutables haskellPackages.jacinda; janet = callPackage ../development/interpreters/janet { }; @@ -16639,8 +16302,6 @@ with pkgs; lambda-lisp = callPackage ../development/interpreters/lambda-lisp { }; lambda-lisp-blc = lambda-lisp; - lolcode = callPackage ../development/interpreters/lolcode { }; - love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; love_11 = callPackage ../development/interpreters/love/11.nix { }; love = love_11; @@ -16650,7 +16311,11 @@ with pkgs; zuo = callPackage ../development/interpreters/zuo { }; ### LUA interpreters - emilua = callPackage ../development/interpreters/emilua { }; + emiluaPlugins = recurseIntoAttrs + (callPackage ./emilua-plugins.nix {} + (callPackage ../development/interpreters/emilua { })); + + inherit (emiluaPlugins) emilua; luaInterpreters = callPackage ./../development/interpreters/lua-5 { }; inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0 luajit_openresty; @@ -16672,7 +16337,7 @@ with pkgs; luarocks-nix = luaPackages.luarocks-nix; luarocks-packages-updater = callPackage ../by-name/lu/luarocks-packages-updater/package.nix { - pluginupdate = ../../maintainers/scripts/pluginupdate.py; + pluginupdate = ../../maintainers/scripts/pluginupdate-py; }; luau = callPackage ../development/interpreters/luau { }; @@ -16916,8 +16581,6 @@ with pkgs; pw-volume = callPackage ../tools/audio/pw-volume { }; - pyradio = callPackage ../applications/audio/pyradio { }; - racket = callPackage ../development/interpreters/racket { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; @@ -17057,25 +16720,20 @@ with pkgs; eltclsh = callPackage ../development/tools/eltclsh { }; - waagent = callPackage ../applications/networking/cluster/waagent { }; - wasm = ocamlPackages.wasm; wasm3 = callPackage ../development/interpreters/wasm3 { }; yaegi = callPackage ../development/interpreters/yaegi { }; - yex-lang = callPackage ../development/interpreters/yex-lang { }; - ### DEVELOPMENT / MISC inherit (callPackages ../development/misc/h3 { }) h3_3 h3_4; h3 = h3_3; - avrlibc = callPackage ../development/misc/avr/libc { }; - avrlibcCross = callPackage ../development/misc/avr/libc { - stdenv = crossLibcStdenv; + avrlibc = callPackage ../development/misc/avr/libc { + stdenv = stdenvNoLibc; }; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; @@ -17092,8 +16750,6 @@ with pkgs; gimme-aws-creds = callPackage ../tools/admin/gimme-aws-creds { }; - gimoji = callPackage ../applications/misc/gimoji { }; - guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; # Needed for autogen @@ -17105,39 +16761,11 @@ with pkgs; guile = guile_3_0; - guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; - - guile-commonmark = callPackage ../development/guile-modules/guile-commonmark { }; - - guile-config = callPackage ../development/guile-modules/guile-config { }; - - guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; - - guile-gcrypt = callPackage ../development/guile-modules/guile-gcrypt { }; - - guile-git = callPackage ../development/guile-modules/guile-git { }; - - guile-gnutls = callPackage ../development/guile-modules/guile-gnutls { }; - - guile-json = callPackage ../development/guile-modules/guile-json { }; - - guile-lib = callPackage ../development/guile-modules/guile-lib { }; - - guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { }; - - guile-opengl = callPackage ../development/guile-modules/guile-opengl { }; - - guile-reader = callPackage ../development/guile-modules/guile-reader { }; - guile-sdl = callPackage ../by-name/gu/guile-sdl/package.nix { guile = guile_2_2; }; - guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { }; - - guile-ssh = callPackage ../development/guile-modules/guile-ssh { }; - - guile-xcb = callPackage ../development/guile-modules/guile-xcb { + guile-xcb = callPackage ../by-name/gu/guile-xcb/package.nix { guile = guile_2_2; }; @@ -17147,10 +16775,7 @@ with pkgs; msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { }; - msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { }; - msp430NewlibCross = callPackage ../development/misc/msp430/newlib.nix { - newlib = newlibCross; - }; + msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { }; mspds = callPackage ../development/misc/msp430/mspds { }; mspds-bin = callPackage ../development/misc/msp430/mspds/binary.nix { }; @@ -17195,8 +16820,6 @@ with pkgs; actiona = libsForQt5.callPackage ../applications/misc/actiona { }; - actionlint = callPackage ../development/tools/analysis/actionlint { }; - adreaper = callPackage ../tools/security/adreaper { }; aeron = callPackage ../servers/aeron { }; @@ -17365,8 +16988,6 @@ with pkgs; kt = callPackage ../tools/misc/kt { }; - argbash = callPackage ../development/tools/misc/argbash { }; - arpa2cm = callPackage ../development/tools/build-managers/arpa2cm { }; arpa2common = callPackage ../development/libraries/arpa2common { }; @@ -17392,12 +17013,15 @@ with pkgs; electron_28-bin electron_29-bin electron_30-bin - electron_31-bin; + electron_31-bin + electron_32-bin + ; inherit (callPackages ../development/tools/electron/chromedriver { }) electron-chromedriver_29 electron-chromedriver_30 - electron-chromedriver_31; + electron-chromedriver_31 + electron-chromedriver_32; electron_24 = electron_24-bin; electron_27 = electron_27-bin; @@ -17405,9 +17029,10 @@ with pkgs; electron_29 = electron_29-bin; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin; - electron = electron_31; - electron-bin = electron_31-bin; - electron-chromedriver = electron-chromedriver_31; + electron_32 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_32 then electron-source.electron_32 else electron_32-bin; + electron = electron_32; + electron-bin = electron_32-bin; + electron-chromedriver = electron-chromedriver_32; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -17419,8 +17044,6 @@ with pkgs; autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { }; autoconf271 = callPackage ../development/tools/misc/autoconf/2.71.nix { }; - acr = callPackage ../development/tools/misc/acr { }; - autocutsel = callPackage ../tools/X11/autocutsel{ }; automake = automake116x; @@ -17459,7 +17082,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; runJdk = jdk11_headless; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else if stdenv.cc.isClang then llvmPackages.stdenv else if stdenv.cc.isGNU then gcc12Stdenv else stdenv; @@ -17471,7 +17094,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation IOKit; buildJdk = jdk17_headless; runJdk = jdk17_headless; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; bazel_self = bazel_7; @@ -17595,8 +17218,6 @@ with pkgs; blackmagic = callPackage ../development/embedded/blackmagic { }; - bloaty = callPackage ../development/tools/bloaty { }; - bloomrpc = callPackage ../development/web/bloomrpc { }; bloop = callPackage ../development/tools/build-managers/bloop { }; @@ -17607,7 +17228,9 @@ with pkgs; bob = callPackage ../development/tools/build-managers/bob { }; - buck = callPackage ../development/tools/build-managers/buck { }; + buck = callPackage ../development/tools/build-managers/buck { + python3 = python311; + }; buck2 = callPackage ../development/tools/build-managers/buck2 { }; @@ -17652,8 +17275,6 @@ with pkgs; bpm-tools = callPackage ../tools/audio/bpm-tools { }; - byacc = callPackage ../development/tools/parsing/byacc { }; - cadre = callPackage ../development/tools/cadre { }; carto = callPackage ../development/tools/carto { }; @@ -17795,8 +17416,6 @@ with pkgs; cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; - cobra-cli = callPackage ../development/tools/cobra-cli { }; - cmake-language-server = python3Packages.callPackage ../development/tools/misc/cmake-language-server { inherit cmake cmake-format; }; @@ -17849,7 +17468,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security; }; - devbox = callPackage ../development/tools/devbox { }; + devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo123Module; }; libcxx = llvmPackages.libcxx; @@ -17920,7 +17539,7 @@ with pkgs; wrapCC (distcc.links extraConfig)) { }; distccStdenv = lowPrio (overrideCC stdenv buildPackages.distccWrapper); - distccMasquerade = if stdenv.isDarwin + distccMasquerade = if stdenv.hostPlatform.isDarwin then null else callPackage ../development/tools/misc/distcc/masq.nix { gccRaw = gcc.cc; @@ -18002,27 +17621,19 @@ with pkgs; evmdis = callPackage ../development/tools/analysis/evmdis { }; - eweb = callPackage ../development/tools/literate-programming/eweb { }; - explain = callPackage ../development/tools/explain { }; ezno = callPackage ../development/tools/misc/ezno { }; func = callPackage ../applications/networking/cluster/func { }; - funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - license_finder = callPackage ../development/tools/license_finder { }; license-scanner = callPackage ../development/tools/license-scanner { }; - md-tangle = callPackage ../development/tools/literate-programming/md-tangle { }; - # NOTE: Override and set useIcon = false to use Awk instead of Icon. noweb = callPackage ../development/tools/literate-programming/noweb { }; - nuweb = callPackage ../development/tools/literate-programming/nuweb { }; - eztrace = callPackage ../development/tools/profiling/EZTrace { }; faas-cli = callPackage ../development/tools/faas-cli { }; @@ -18124,8 +17735,6 @@ with pkgs; gnome-inform7 = callPackage ../applications/editors/gnome-inform7 { }; - gnome-latex = callPackage ../applications/editors/gnome-latex { }; - gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { }; gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer { }; @@ -18178,8 +17787,6 @@ with pkgs; gradle_8 = wrapGradle gradle_8-unwrapped; gradle = wrapGradle gradle-unwrapped; - grcov = callPackage ../development/tools/misc/grcov { }; - gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { }; @@ -18202,9 +17809,8 @@ with pkgs; guff = callPackage ../tools/graphics/guff { }; - guile-hall = callPackage ../development/tools/guile/guile-hall { }; - - gwrap = callPackage ../development/tools/guile/g-wrap { + gwrap = g-wrap; + g-wrap = callPackage ../by-name/g-/g-wrap/package.nix { guile = guile_2_2; }; @@ -18275,10 +17881,6 @@ with pkgs; jake = callPackage ../development/tools/jake { }; - inherit (callPackage ../development/tools/build-managers/jam { }) - jam - ftjam; - javacc = callPackage ../development/tools/parsing/javacc { # Upstream doesn't support anything newer than Java 8. # https://github.com/javacc/javacc/blob/c708628423b71ce8bc3b70143fa5b6a2b7362b3a/README.md#building-javacc-from-source @@ -18382,8 +17984,6 @@ with pkgs; lcov = callPackage ../development/tools/analysis/lcov { }; - leiningen = callPackage ../development/tools/build-managers/leiningen { }; - lemon = callPackage ../development/tools/parsing/lemon { }; lenmus = callPackage ../applications/misc/lenmus { }; @@ -18429,8 +18029,6 @@ with pkgs; lttv = callPackage ../development/tools/misc/lttv { }; - luaformatter = callPackage ../development/tools/luaformatter { }; - lurk = callPackage ../development/tools/lurk { }; maizzle = callPackage ../development/tools/maizzle { }; @@ -18488,7 +18086,7 @@ with pkgs; modd = callPackage ../development/tools/modd { }; mold = callPackage ../by-name/mo/mold/package.nix { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; tbb = tbb_2021_11; }; @@ -18551,8 +18149,6 @@ with pkgs; nrf5-sdk = callPackage ../development/libraries/nrf5-sdk { }; - nrfutil = callPackage ../development/tools/misc/nrfutil { }; - obelisk = callPackage ../development/tools/ocaml/obelisk { menhir = ocamlPackages.menhir; }; obuild = callPackage ../development/tools/ocaml/obuild { }; @@ -18740,8 +18336,6 @@ with pkgs; redisinsight = callPackage ../development/tools/redisinsight { }; - redo = callPackage ../development/tools/build-managers/redo { }; - redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { }; redo-c = callPackage ../development/tools/build-managers/redo-c { }; @@ -18753,7 +18347,9 @@ with pkgs; regex-cli = callPackage ../development/tools/misc/regex-cli { }; - reno = callPackage ../development/tools/reno { }; + reno = callPackage ../development/tools/reno { + python3Packages = python311Packages; + }; re2c = callPackage ../development/tools/parsing/re2c { }; @@ -18794,9 +18390,6 @@ with pkgs; rufo = callPackage ../development/tools/rufo { }; - samurai = callPackage ../development/tools/build-managers/samurai { }; - - muon = callPackage ../development/tools/build-managers/muon { }; muonStandalone = muon.override { embedSamurai = true; buildDocs = false; @@ -18873,8 +18466,6 @@ with pkgs; shellharden = callPackage ../development/tools/shellharden { }; - schemaspy = callPackage ../development/tools/database/schemaspy { }; - scenebuilder = callPackage ../development/tools/scenebuilder { }; scenic-view = callPackage ../development/tools/scenic-view { }; @@ -18895,16 +18486,12 @@ with pkgs; sloc = nodePackages.sloc; - smatch = callPackage ../development/tools/analysis/smatch { }; - smc = callPackage ../tools/misc/smc { }; snakemake = callPackage ../applications/science/misc/snakemake { }; snore = callPackage ../tools/misc/snore { }; - snyk = callPackage ../development/tools/analysis/snyk { }; - snzip = callPackage ../tools/archivers/snzip { }; snowman = qt5.callPackage ../development/tools/analysis/snowman { }; @@ -18977,8 +18564,6 @@ with pkgs; strace-analyzer = callPackage ../development/tools/misc/strace-analyzer { }; - stylelint = callPackage ../development/tools/analysis/stylelint { }; - stylua = callPackage ../development/tools/stylua { }; summon = callPackage ../development/tools/summon { }; @@ -18997,15 +18582,10 @@ with pkgs; systemfd = callPackage ../development/tools/systemfd { }; - swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; - swig4 = callPackage ../development/tools/misc/swig/4.nix { }; - swig = swig3; - swigWithJava = swig; - c2ffi = callPackage ../development/tools/misc/c2ffi { }; c0 = callPackage ../development/compilers/c0 { - stdenv = if stdenv.isDarwin then gccStdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv; }; c3c = callPackage ../development/compilers/c3c { }; @@ -19054,7 +18634,6 @@ with pkgs; texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { }; inherit (texinfoPackages) texinfo413 - texinfo5 # needed for gcc48 texinfo6_5 # needed for allegro texinfo6_7 # needed for gpm, iksemel and fwknop texinfo6 @@ -19086,8 +18665,6 @@ with pkgs; todoist-electron = callPackage ../applications/misc/todoist-electron { }; - toil = callPackage ../applications/science/misc/toil { }; - travis = callPackage ../development/tools/misc/travis { }; tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) { @@ -19124,8 +18701,6 @@ with pkgs; uncrustify = callPackage ../development/tools/misc/uncrustify { }; - universal-ctags = callPackage ../development/tools/misc/universal-ctags { }; - unused = callPackage ../development/tools/misc/unused { }; vagrant = callPackage ../development/tools/vagrant { }; @@ -19151,7 +18726,9 @@ with pkgs; valgrind = callPackage ../development/tools/analysis/valgrind { inherit (buildPackages.darwin) xnu bootstrap_cmds; }; - valgrind-light = res.valgrind.override { gdb = null; }; + valgrind-light = (res.valgrind.override { gdb = null; }).overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { description = "${oldAttrs.meta.description} (without GDB)"; }; + }); qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind { }; @@ -19187,8 +18764,8 @@ with pkgs; webdis = callPackage ../development/tools/database/webdis { }; - xmake = callPackage ../development/tools/build-managers/xmake { - lua = lua5_4; + xmake = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/xmake { + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices; }; xc3sprog = callPackage ../development/embedded/xc3sprog { }; @@ -19247,8 +18824,6 @@ with pkgs; ytt = callPackage ../development/tools/ytt { }; - zydis = callPackage ../development/libraries/zydis { }; - grabserial = callPackage ../development/tools/grabserial { }; mypy = with python3Packages; toPythonApplication mypy; @@ -19269,25 +18844,25 @@ with pkgs; abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. - stdenv = if stdenv.isDarwin && stdenv.isx86_64 + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix { # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. - stdenv = if stdenv.isDarwin && stdenv.isx86_64 + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix { # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. - stdenv = if stdenv.isDarwin && stdenv.isx86_64 + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; abseil-cpp_202407 = callPackage ../development/libraries/abseil-cpp/202407.nix { # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. - stdenv = if stdenv.isDarwin && stdenv.isx86_64 + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; @@ -19301,8 +18876,6 @@ with pkgs; acsccid = callPackage ../tools/security/acsccid { }; - activemq = callPackage ../development/libraries/apache-activemq { }; - adns = callPackage ../development/libraries/adns { }; adslib = callPackage ../development/libraries/adslib { }; @@ -19439,8 +19012,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; - ayatana-ido = callPackage ../development/libraries/ayatana-ido { }; - ayatana-webmail = callPackage ../applications/networking/mailreaders/ayatana-webmail { }; azmq = callPackage ../development/libraries/azmq { }; @@ -19484,7 +19055,7 @@ with pkgs; # TODO(@Ericson2314): Build bionic libc from source bionic = if stdenv.hostPlatform.useAndroidPrebuilt - then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVer}".libraries + then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVersion}".libraries else callPackage ../os-specific/linux/bionic-prebuilt { }; boolstuff = callPackage ../development/libraries/boolstuff { }; @@ -19507,13 +19078,10 @@ with pkgs; bosh-cli = callPackage ../applications/networking/cluster/bosh-cli { }; - botan2 = callPackage ../development/libraries/botan/2.0.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; - - botan3 = callPackage ../development/libraries/botan/3.0.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + inherit (callPackages ../development/libraries/botan { }) + botan2 + botan3 + ; box2d = callPackage ../development/libraries/box2d { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL; @@ -19558,7 +19126,7 @@ with pkgs; niv = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.niv); - ormolu = haskellPackages.ormolu.bin; + ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu); capnproto = callPackage ../development/libraries/capnproto { }; @@ -19573,12 +19141,6 @@ with pkgs; cudaPackages = cudaPackages_11; }; - ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; - - ndn-tools = callPackage ../tools/networking/ndn-tools { }; - - nfd = callPackage ../servers/nfd { }; - cddlib = callPackage ../development/libraries/cddlib { }; cdk-go = callPackage ../tools/security/cdk-go { }; @@ -19741,7 +19303,7 @@ with pkgs; ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { ssl_implementation = mbedtls_2; - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; uri = callPackage ../development/libraries/uri { }; @@ -19760,8 +19322,6 @@ with pkgs; croaring = callPackage ../development/libraries/croaring { }; - crocoddyl = callPackage ../development/libraries/crocoddyl { }; - crossguid = callPackage ../development/libraries/crossguid { }; cryptopp = callPackage ../development/libraries/crypto++ { }; @@ -19876,7 +19436,7 @@ with pkgs; eccodes = callPackage ../development/libraries/eccodes { pythonPackages = python3Packages; - stdenv = if stdenv.isDarwin then gccStdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv; }; eclib = callPackage ../development/libraries/eclib { }; @@ -19897,8 +19457,6 @@ with pkgs; vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { }; - vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { }; - vmmlib = callPackage ../development/libraries/vmmlib { inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; }; @@ -19931,10 +19489,6 @@ with pkgs; libesmtp = callPackage ../development/libraries/libesmtp { }; - liberasurecode = callPackage ../applications/misc/liberasurecode { }; - - example-robot-data = callPackage ../development/libraries/example-robot-data { }; - exiv2 = callPackage ../development/libraries/exiv2 { }; expat = callPackage ../development/libraries/expat { }; @@ -20129,9 +19683,6 @@ with pkgs; game-music-emu = callPackage ../development/libraries/audio/game-music-emu { }; - gamin = callPackage ../development/libraries/gamin { }; - fam = gamin; # added 2018-04-25 - ganv = callPackage ../development/libraries/ganv { }; garble = callPackage ../development/tools/garble { }; @@ -20234,7 +19785,7 @@ with pkgs; ghcid = haskellPackages.ghcid.bin; gr-framework = callPackage ../by-name/gr/gr-framework/package.nix { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; graphia = qt6Packages.callPackage ../applications/science/misc/graphia { }; @@ -20266,10 +19817,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AGL OpenGL; }; glfw = glfw3; - glfw-wayland-minecraft = callPackage ../development/libraries/glfw/3.x-wayland-minecraft.nix {}; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; - glfw3 = callPackage ../development/libraries/glfw/3.x.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; + + glfw3-minecraft = callPackage ../by-name/gl/glfw3/package.nix { + withMinecraftPatch = true; }; glibc = callPackage ../development/libraries/glibc { @@ -20298,14 +19849,14 @@ with pkgs; }; muslCross = musl.override { - stdenv = crossLibcStdenv; + stdenv = stdenvNoLibc; }; # These are used when buiding compiler-rt / libgcc, prior to building libc. preLibcCrossHeaders = let inherit (stdenv.targetPlatform) libc; in if stdenv.targetPlatform.isMinGW then targetPackages.windows.mingw_w64_headers or windows.mingw_w64_headers - else if libc == "nblibc" then targetPackages.netbsdCross.headers or netbsdCross.headers + else if libc == "nblibc" then targetPackages.netbsd.headers or netbsd.headers else if libc == "libSystem" && stdenv.targetPlatform.isAarch64 then targetPackages.darwin.LibsystemCross or darwin.LibsystemCross else null; @@ -20316,13 +19867,13 @@ with pkgs; /**/ if name == null then null else if name == "glibc" then targetPackages.glibcCross or glibcCross else if name == "bionic" then targetPackages.bionic or bionic - else if name == "uclibc" then targetPackages.uclibcCross or uclibcCross - else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross - else if name == "newlib" && stdenv.targetPlatform.isMsp430 then targetPackages.msp430NewlibCross or msp430NewlibCross + else if name == "uclibc" then targetPackages.uclibc or uclibc + else if name == "avrlibc" then targetPackages.avrlibc or avrlibc + else if name == "newlib" && stdenv.targetPlatform.isMsp430 then targetPackages.msp430Newlib or msp430Newlib else if name == "newlib" && stdenv.targetPlatform.isVc4 then targetPackages.vc4-newlib or vc4-newlib else if name == "newlib" && stdenv.targetPlatform.isOr1k then targetPackages.or1k-newlib or or1k-newlib - else if name == "newlib" then targetPackages.newlibCross or newlibCross - else if name == "newlib-nano" then targetPackages.newlib-nanoCross or newlib-nanoCross + else if name == "newlib" then targetPackages.newlib or newlib + else if name == "newlib-nano" then targetPackages.newlib-nano or newlib-nano else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if name == "ucrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 @@ -20337,7 +19888,10 @@ with pkgs; else if name == "relibc" then targetPackages.relibc or relibc else throw "Unknown libc ${name}"; - libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; + libcCross = + if stdenv.targetPlatform == stdenv.buildPlatform + then null + else libcCrossChooser stdenv.targetPlatform.libc; threadsCross = lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)) { @@ -20348,11 +19902,9 @@ with pkgs; }; wasilibc = callPackage ../development/libraries/wasilibc { - stdenv = crossLibcStdenv; + stdenv = stdenvNoLibc; }; - relibc = callPackage ../development/libraries/relibc { }; - # Only supported on Linux and only on glibc glibcLocales = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu @@ -20446,7 +19998,7 @@ with pkgs; grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; grpc = darwin.apple_sdk_11_0.callPackage ../development/libraries/grpc { - stdenv = if stdenv.isDarwin && stdenv.isx86_64 + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK darwin.apple_sdk_11_0.stdenv { darwinMinVersion = "10.13"; } else stdenv; }; @@ -20488,8 +20040,6 @@ with pkgs; pgweb = callPackage ../development/tools/database/pgweb { }; - granted = callPackage ../tools/admin/granted { }; - grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; gsasl = callPackage ../development/libraries/gsasl { }; @@ -20554,7 +20104,7 @@ with pkgs; }; pango = callPackage ../development/libraries/pango { - harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; + harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; }; }; pangolin = callPackage ../development/libraries/pangolin { @@ -20683,15 +20233,13 @@ with pkgs; }; harfbuzzFull = harfbuzz.override { - withCoreText = stdenv.isDarwin; + withCoreText = stdenv.hostPlatform.isDarwin; withGraphite2 = true; withIcu = true; }; hawknl = callPackage ../development/libraries/hawknl { }; - hax11 = callPackage ../development/libraries/hax11 { }; - haxor-news = callPackage ../applications/misc/haxor-news { }; hdt = callPackage ../misc/hdt { }; @@ -20720,8 +20268,6 @@ with pkgs; hound = callPackage ../development/tools/misc/hound { }; - hpp-fcl = callPackage ../development/libraries/hpp-fcl { }; - hpx = callPackage ../development/libraries/hpx { boost = boost179; asio = asio.override { boost = boost179; }; @@ -20796,7 +20342,7 @@ with pkgs; ilmbase = callPackage ../development/libraries/ilmbase { }; imgui = callPackage ../development/libraries/imgui { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; imtui = callPackage ../development/libraries/imtui { }; @@ -20811,8 +20357,8 @@ with pkgs; imlib2Full = imlib2.override { # Compilation error on Darwin with librsvg. For more information see: # https://github.com/NixOS/nixpkgs/pull/166452#issuecomment-1090725613 - svgSupport = !stdenv.isDarwin; - heifSupport = !stdenv.isDarwin; + svgSupport = !stdenv.hostPlatform.isDarwin; + heifSupport = !stdenv.hostPlatform.isDarwin; webpSupport = true; jxlSupport = true; psSupport = true; @@ -20856,7 +20402,7 @@ with pkgs; ip2location-c = callPackage ../development/libraries/ip2location-c { }; - irrlicht = if !stdenv.isDarwin then + irrlicht = if !stdenv.hostPlatform.isDarwin then callPackage ../development/libraries/irrlicht { } else callPackage ../development/libraries/irrlicht/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL IOKit; @@ -20951,7 +20497,7 @@ with pkgs; libjodycode = callPackage ../development/libraries/libjodycode { # missing aligned_alloc() - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; libb64 = callPackage ../development/libraries/libb64 { }; @@ -20968,7 +20514,7 @@ with pkgs; }; keybinder3 = callPackage ../development/libraries/keybinder3 { - gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; + gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; automake = automake111x; }; @@ -21075,7 +20621,10 @@ with pkgs; libantlr3c = callPackage ../development/libraries/libantlr3c { }; - libaom = callPackage ../development/libraries/libaom { }; + libaom = callPackage ../development/libraries/libaom { + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116737 + stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv; + }; libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; }; libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; @@ -21085,8 +20634,6 @@ with pkgs; libargs = callPackage ../development/libraries/libargs { }; - libarchive = callPackage ../development/libraries/libarchive { }; - libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { }; libaribcaption = callPackage ../by-name/li/libaribcaption/package.nix { @@ -21099,8 +20646,6 @@ with pkgs; libass = callPackage ../development/libraries/libass { }; - libast = callPackage ../development/libraries/libast { }; - libassuan = callPackage ../development/libraries/libassuan { }; libasyncns = callPackage ../development/libraries/libasyncns { }; @@ -21129,8 +20674,7 @@ with pkgs; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx; - - libbde = callPackage ../development/libraries/libbde { }; + libbassmix = (callPackage ../development/libraries/audio/libbass { }).bassmix; libbdplus = callPackage ../development/libraries/libbdplus { }; @@ -21144,10 +20688,6 @@ with pkgs; libbs2b = callPackage ../development/libraries/audio/libbs2b { }; - libbytesize = callPackage ../development/libraries/libbytesize { }; - - libcaca = callPackage ../development/libraries/libcaca { }; - libcacard = callPackage ../development/libraries/libcacard { }; libcamera-qcam = callPackage ../by-name/li/libcamera/package.nix { withQcam = true; }; @@ -21252,8 +20792,6 @@ with pkgs; libcue = callPackage ../development/libraries/libcue { }; - libcutl = callPackage ../development/libraries/libcutl { }; - libcxxrt = callPackage ../development/libraries/libcxxrt { stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildPackages.llvmPackages.tools.clangNoLibcxx @@ -21519,7 +21057,7 @@ with pkgs; libfabric = callPackage ../development/libraries/libfabric { }; libfive = libsForQt5.callPackage ../development/libraries/libfive { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; }; @@ -21631,8 +21169,6 @@ with pkgs; libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; libindicator = callPackage ../development/libraries/libindicator { }; - libayatana-indicator = callPackage ../development/libraries/libayatana-indicator { }; - libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { }; libiodbc = callPackage ../development/libraries/libiodbc { @@ -21880,8 +21416,6 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - libmatroska = callPackage ../development/libraries/libmatroska { }; - libmd = callPackage ../development/libraries/libmd { }; libmemcached = callPackage ../development/libraries/libmemcached { }; @@ -22036,7 +21570,6 @@ with pkgs; libpfm = callPackage ../development/libraries/libpfm { }; libpqxx = callPackage ../development/libraries/libpqxx { }; - libpqxx_6 = callPackage ../development/libraries/libpqxx/6.nix { }; inherit (callPackages ../development/libraries/prometheus-client-c { stdenv = gccStdenv; # Required for darwin @@ -22121,8 +21654,6 @@ with pkgs; libspatialaudio = callPackage ../development/libraries/libspatialaudio { }; - libspatialindex = callPackage ../development/libraries/libspatialindex { }; - libspatialite = callPackage ../development/libraries/libspatialite { }; libstatgrab = callPackage ../development/libraries/libstatgrab { @@ -22135,8 +21666,6 @@ with pkgs; libtasn1 = callPackage ../development/libraries/libtasn1 { }; - libtcod = callPackage ../development/libraries/libtcod { }; - libthai = callPackage ../development/libraries/libthai { }; libthreadar = callPackage ../development/libraries/libthreadar { }; @@ -22170,8 +21699,6 @@ with pkgs; libtpms = callPackage ../tools/security/libtpms { }; - libtap = callPackage ../development/libraries/libtap { }; - libtsm = callPackage ../development/libraries/libtsm { }; libsv = callPackage ../development/libraries/libsv { }; @@ -22227,8 +21754,6 @@ with pkgs; liburcu = callPackage ../development/libraries/liburcu { }; - libjaylink = callPackage ../development/libraries/libjaylink { }; - libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix { }; libusb1 = callPackage ../development/libraries/libusb1 { @@ -22252,8 +21777,8 @@ with pkgs; }; libunwind = - if stdenv.isDarwin then darwin.libunwind - else if stdenv.hostPlatform.system == "riscv32-linux" then llvmPackages_14.libunwind + if stdenv.hostPlatform.isDarwin then darwin.libunwind + else if stdenv.hostPlatform.system == "riscv32-linux" then llvmPackages.libunwind else callPackage ../development/libraries/libunwind { }; libuv = darwin.apple_sdk_11_0.callPackage ../development/libraries/libuv { }; @@ -22283,8 +21808,6 @@ with pkgs; libversion = callPackage ../development/libraries/libversion { }; - libverto = callPackage ../development/libraries/libverto { }; - libvgm = callPackage ../development/libraries/libvgm { inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; @@ -22301,7 +21824,10 @@ with pkgs; libvisual = callPackage ../development/libraries/libvisual { }; - libvmaf = callPackage ../development/libraries/libvmaf { }; + libvmaf = callPackage ../development/libraries/libvmaf { + # See libaom + stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv; + }; libvncserver = callPackage ../development/libraries/libvncserver { inherit (darwin.apple_sdk.frameworks) Carbon; @@ -22410,8 +21936,6 @@ with pkgs; yas = callPackage ../development/libraries/yas { }; - libcyaml = callPackage ../development/libraries/libcyaml { }; - rang = callPackage ../development/libraries/rang { }; libykclient = callPackage ../development/libraries/libykclient { }; @@ -22510,8 +22034,6 @@ with pkgs; mdctags = callPackage ../development/tools/misc/mdctags { }; - mdds = callPackage ../development/libraries/mdds { }; - mediastreamer = libsForQt5.callPackage ../development/libraries/mediastreamer { }; mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { }; @@ -22604,7 +22126,7 @@ with pkgs; else freeglut; - mesa = if stdenv.isDarwin + mesa = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/darwin.nix { inherit (darwin.apple_sdk_11_0.libs) Xplugin; } @@ -22651,7 +22173,7 @@ with pkgs; minizip-ng = callPackage ../development/libraries/minizip-ng { }; mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; mkvtoolnix-cli = mkvtoolnix.override { @@ -22718,8 +22240,6 @@ with pkgs; mueval = callPackage ../development/tools/haskell/mueval { }; - mujoco = callPackage ../applications/science/robotics/mujoco { }; - muparserx = callPackage ../development/libraries/muparserx { }; mutest = callPackage ../development/libraries/mutest { }; @@ -22738,8 +22258,6 @@ with pkgs; nanodbc = callPackage ../development/libraries/nanodbc { }; - nanoflann = callPackage ../development/libraries/nanoflann { }; - nanomsg = callPackage ../development/libraries/nanomsg { }; nanosvg = callPackage ../development/libraries/nanosvg { }; @@ -22760,8 +22278,6 @@ with pkgs; notify-sharp = callPackage ../development/libraries/notify-sharp { }; - notcurses = callPackage ../development/libraries/notcurses { }; - ncurses5 = ncurses.override { abiVersion = "5"; }; @@ -22927,6 +22443,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; pythonPackages = python3Packages; + # TODO(@connorbaker): OpenCV 4.9 only supports up to CUDA 12.3. + cudaPackages = cudaPackages_12_3; + # TODO: LTO does not work. + # https://github.com/NixOS/nixpkgs/issues/343123 + enableLto = false; }; opencv4WithoutCuda = opencv4.override { @@ -22972,14 +22493,19 @@ with pkgs; openstackclient = with python311Packages; toPythonApplication python-openstackclient; openstackclient-full = openstackclient.overridePythonAttrs (oldAttrs: { - dependencies = oldAttrs.dependencies ++ oldAttrs.passthru.optional-dependencies.cli-plugins; + dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.cli-plugins; }); barbicanclient = with python311Packages; toPythonApplication python-barbicanclient; glanceclient = with python311Packages; toPythonApplication python-glanceclient; heatclient = with python311Packages; toPythonApplication python-heatclient; ironicclient = with python311Packages; toPythonApplication python-ironicclient; + magnumclient = with python311Packages; toPythonApplication python-magnumclient; manilaclient = with python311Packages; toPythonApplication python-manilaclient; + mistralclient = with python311Packages; toPythonApplication python-mistralclient; swiftclient = with python311Packages; toPythonApplication python-swiftclient; + troveclient = with python311Packages; toPythonApplication python-troveclient; + watcherclient = with python311Packages; toPythonApplication python-watcherclient; + zunclient = with python311Packages; toPythonApplication python-zunclient; openvdb = callPackage ../development/libraries/openvdb { }; @@ -23047,8 +22573,6 @@ with pkgs; p11-kit = callPackage ../development/libraries/p11-kit { }; - paperkey = callPackage ../tools/security/paperkey { }; - parsero = callPackage ../tools/security/parsero { }; pcaudiolib = callPackage ../development/libraries/pcaudiolib { }; @@ -23056,7 +22580,7 @@ with pkgs; pcg_c = callPackage ../development/libraries/pcg-c { }; pcl = libsForQt5.callPackage ../development/libraries/pcl { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL; }; @@ -23087,8 +22611,6 @@ with pkgs; pingvin-share = callPackage ../servers/pingvin-share { }; - pinocchio = callPackage ../development/libraries/pinocchio { }; - pipelight = callPackage ../tools/misc/pipelight { stdenv = stdenv_32bit; wine-staging = pkgsi686Linux.wine-staging; @@ -23245,7 +22767,7 @@ with pkgs; darwin; inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base; inherit config; - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }); libsForQt5 = (recurseIntoAttrs (import ./qt5-packages.nix { @@ -23262,7 +22784,7 @@ with pkgs; qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix { inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); quark-engine = callPackage ../tools/security/quark-engine { }; @@ -23474,19 +22996,7 @@ with pkgs; scope-lite = callPackage ../development/libraries/scope-lite { }; - SDL_classic = callPackage ../development/libraries/SDL ({ - inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT; - } // lib.optionalAttrs stdenv.hostPlatform.isAndroid { - # libGLU doesn’t work with Android’s SDL - libGLU = null; - }); - - SDL_compat = callPackage ../development/libraries/SDL_compat { - inherit (darwin.apple_sdk.frameworks) Cocoa; - inherit (darwin) autoSignDarwinBinariesHook; - }; - - SDL = SDL_classic; + SDL = SDL1; SDL2 = callPackage ../development/libraries/SDL2 { inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; @@ -23516,6 +23026,8 @@ with pkgs; serf = callPackage ../development/libraries/serf { }; + sev-snp-measure = with python3Packages; toPythonApplication sev-snp-measure; + sfsexp = callPackage ../development/libraries/sfsexp { }; shhmsg = callPackage ../development/libraries/shhmsg { }; @@ -23587,8 +23099,6 @@ with pkgs; shaq = callPackage ../tools/audio/shaq { }; - slang = callPackage ../development/libraries/slang { }; - slibGuile = callPackage ../development/libraries/slib { scheme = guile; }; @@ -23753,8 +23263,6 @@ with pkgs; stb = callPackage ../development/libraries/stb { }; - steghide = callPackage ../tools/graphics/steghide { }; - stegsolve = callPackage ../tools/graphics/stegsolve { }; stxxl = callPackage ../development/libraries/stxxl { }; @@ -23819,8 +23327,6 @@ with pkgs; svxlink = libsForQt5.callPackage ../applications/radio/svxlink { }; - biblesync = callPackage ../development/libraries/biblesync { }; - szip = callPackage ../development/libraries/szip { }; t1lib = callPackage ../development/libraries/t1lib { }; @@ -23930,12 +23436,6 @@ with pkgs; kyotocabinet = callPackage ../development/libraries/kyotocabinet { }; - tomlc99 = callPackage ../development/libraries/tomlc99 { }; - - tomlcpp = callPackage ../development/libraries/tomlcpp { }; - - toml11 = callPackage ../development/libraries/toml11 { }; - tomlplusplus = callPackage ../development/libraries/tomlplusplus { }; tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { }; @@ -23950,12 +23450,8 @@ with pkgs; tremor = callPackage ../development/libraries/tremor { }; - triehash = callPackage ../tools/misc/triehash { }; - trillian = callPackage ../tools/misc/trillian { }; - twolame = callPackage ../development/libraries/twolame { }; - udns = callPackage ../development/libraries/udns { }; uid_wrapper = callPackage ../development/libraries/uid_wrapper { }; @@ -23993,7 +23489,7 @@ with pkgs; ucommon = callPackage ../development/libraries/ucommon { }; v8 = callPackage ../development/libraries/v8 { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; @@ -24002,9 +23498,7 @@ with pkgs; libva-vdpau-driver = callPackage ../development/libraries/libva-vdpau-driver { }; - vale = callPackage ../tools/text/vale { }; - - valeStyles = recurseIntoAttrs (callPackages ../tools/text/vale/styles.nix { }); + valeStyles = recurseIntoAttrs (callPackages ../by-name/va/vale/styles.nix { }); valhalla = callPackage ../development/libraries/valhalla { boost = boost.override { enablePython = true; python = python3; }; @@ -24329,10 +23823,6 @@ with pkgs; zix = callPackage ../development/libraries/audio/zix { }; - zziplib = callPackage ../development/libraries/zziplib { }; - - glpng = callPackage ../development/libraries/glpng { }; - gsignond = callPackage ../development/libraries/gsignond { plugins = []; }; @@ -24435,17 +23925,6 @@ with pkgs; buildGoModule = buildGo122Module; buildGoPackage = buildGo122Package; - # requires a newer Apple SDK - go_1_21 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.21.nix { - inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; - }; - buildGo121Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix { - go = buildPackages.go_1_21; - }; - buildGo121Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix { - go = buildPackages.go_1_21; - }; - # requires a newer Apple SDK go_1_22 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.22.nix { inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; @@ -24567,12 +24046,17 @@ with pkgs; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_7 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.7"; }; + sbcl_2_4_8 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.8"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl_2_4_9 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.9"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_7; + sbcl = sbcl_2_4_9; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -24702,8 +24186,6 @@ with pkgs; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; - asouldocs = callPackage ../servers/asouldocs { }; - atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { }; atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { }; atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { }; @@ -24819,7 +24301,7 @@ with pkgs; directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { # https://github.com/NixOS/nixpkgs/issues/216294 - stdenv = if stdenv.cc.isGNU && stdenv.isi686 then gcc11Stdenv else stdenv; + stdenv = if stdenv.cc.isGNU && stdenv.hostPlatform.isi686 then gcc11Stdenv else stdenv; }; dkimproxy = callPackage ../servers/mail/dkimproxy { }; @@ -24843,7 +24325,7 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { }; - envoy = callPackage ../servers/http/envoy { + envoy = callPackage ../by-name/en/envoy/package.nix { jdk = openjdk11_headless; gn = gn1924; }; @@ -24931,8 +24413,6 @@ with pkgs; go-cqhttp = callPackage ../servers/go-cqhttp { }; - gofish = callPackage ../servers/gopher/gofish { }; - grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; @@ -25126,7 +24606,6 @@ with pkgs; mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; @@ -25136,6 +24615,25 @@ with pkgs; meteor = callPackage ../servers/meteor { }; + micro-full = micro.wrapper.override { + extraPackages = [ + wl-clipboard + xclip + ]; + }; + + micro-with-wl-clipboard = micro.wrapper.override { + extraPackages = [ + wl-clipboard + ]; + }; + + micro-with-xclip = micro.wrapper.override { + extraPackages = [ + xclip + ]; + }; + micronaut = callPackage ../development/tools/micronaut { }; minio = callPackage ../servers/minio { }; @@ -25311,7 +24809,6 @@ with pkgs; pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; - pomerium = callPackage ../servers/http/pomerium { }; pomerium-cli = callPackage ../tools/security/pomerium-cli { }; postgrey = callPackage ../servers/mail/postgrey { }; @@ -25379,7 +24876,7 @@ with pkgs; mariadb_105 mariadb_106 mariadb_1011 - mariadb_110 + mariadb_114 ; mariadb = mariadb_1011; mariadb-embedded = mariadb.override { withEmbedded = true; }; @@ -25396,7 +24893,20 @@ with pkgs; sasl = cyrus_sasl; boost = boost178.override { enableShared = false; }; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - stdenv = if stdenv.isDarwin then + stdenv = if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk_11_0.stdenv.override (old: { + hostPlatform = old.hostPlatform // { darwinMinVersion = "10.14"; }; + buildPlatform = old.buildPlatform // { darwinMinVersion = "10.14"; }; + targetPlatform = old.targetPlatform // { darwinMinVersion = "10.14"; }; + }) else + if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + }; + + mongodb-7_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/7.0.nix { + sasl = cyrus_sasl; + boost = boost179.override { enableShared = false; }; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv.override (old: { hostPlatform = old.hostPlatform // { darwinMinVersion = "10.14"; }; buildPlatform = old.buildPlatform // { darwinMinVersion = "10.14"; }; @@ -25432,7 +24942,9 @@ with pkgs; azuredatastudio = callPackage ../applications/misc/azuredatastudio { }; - miniflux = callPackage ../servers/miniflux { }; + miniflux = callPackage ../by-name/mi/miniflux/package.nix { + buildGoModule = buildGo123Module; + }; inherit (callPackage ../servers/mir { }) mir @@ -25489,8 +25001,6 @@ with pkgs; oidentd = callPackage ../servers/identd/oidentd { }; - softether = callPackage ../servers/softether { }; - qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; rust-hypervisor-firmware = callPackage ../applications/virtualization/rust-hypervisor-firmware { }; @@ -25504,7 +25014,7 @@ with pkgs; httpSupport = true; tpmSupport = true; tlsSupport = true; - msVarsTemplate = stdenv.isx86_64 || stdenv.isAarch64; + msVarsTemplate = stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64; }; ops = callPackage ../applications/virtualization/ops { }; @@ -25612,7 +25122,6 @@ with pkgs; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { }; - prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { } ; prometheus-pgbouncer-exporter = callPackage ../servers/monitoring/prometheus/pgbouncer-exporter.nix { }; prometheus-php-fpm-exporter = callPackage ../servers/monitoring/prometheus/php-fpm-exporter.nix { }; prometheus-pihole-exporter = callPackage ../servers/monitoring/prometheus/pihole-exporter.nix { }; @@ -25772,7 +25281,7 @@ with pkgs; check-wmiplus = callPackage ../servers/monitoring/plugins/wmiplus { }; shishi = callPackage ../servers/shishi { - pam = if stdenv.isLinux then pam else null; + pam = if stdenv.hostPlatform.isLinux then pam else null; # see also openssl, which has/had this same trick }; @@ -25819,14 +25328,14 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { }; + tailscale = callPackage ../servers/tailscale { + buildGoModule = buildGo123Module; + }; tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; tailspin = callPackage ../tools/misc/tailspin { }; - thanos = callPackage ../servers/monitoring/thanos { }; - trafficserver = callPackage ../servers/http/trafficserver { }; inherit (callPackages ../servers/http/tomcat { }) @@ -25858,8 +25367,6 @@ with pkgs; matomo_5 matomo-beta; - axis2 = callPackage ../servers/http/tomcat/axis2 { }; - inherit (callPackages ../servers/unifi { }) unifi7 unifi8; @@ -25928,8 +25435,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa; inherit (darwin.apple_sdk.libs) Xplugin; inherit (buildPackages.darwin) bootstrap_cmds; - udev = if stdenv.isLinux then udev else null; - libdrm = if stdenv.isLinux then libdrm else null; + udev = if stdenv.hostPlatform.isLinux then udev else null; + libdrm = if stdenv.hostPlatform.isLinux then libdrm else null; }; generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix { }; @@ -25945,8 +25452,6 @@ with pkgs; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; - xwaylandvideobridge = libsForQt5.callPackage ../tools/wayland/xwaylandvideobridge { }; - yaws = callPackage ../servers/http/yaws { }; zabbixFor = version: rec { @@ -25974,16 +25479,10 @@ with pkgs; ### SERVERS / GEOSPATIAL - fit-trackee = callPackage ../servers/geospatial/fit-trackee { }; - - mapproxy = callPackage ../servers/geospatial/mapproxy { }; - martin = callPackage ../servers/geospatial/martin { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - mbtileserver = callPackage ../servers/geospatial/mbtileserver { }; - pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { }; pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; @@ -26032,12 +25531,6 @@ with pkgs; mlxbf-bootimages = callPackage ../misc/mlxbf-bootimages { }; - microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { }; - - microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; - - iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { }; - inherit (callPackages ../os-specific/linux/apparmor { }) libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure; @@ -26046,8 +25539,6 @@ with pkgs; atop = callPackage ../os-specific/linux/atop { }; - audit = callPackage ../os-specific/linux/audit { }; - ath9k-htc-blobless-firmware = callPackage ../os-specific/linux/firmware/ath9k { }; ath9k-htc-blobless-firmware-unstable = callPackage ../os-specific/linux/firmware/ath9k { enableUnstable = true; }; @@ -26192,7 +25683,6 @@ with pkgs; evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { }; - fscryptctl = callPackage ../os-specific/linux/fscryptctl { }; # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; @@ -26214,7 +25704,7 @@ with pkgs; libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; - libuuid = if stdenv.isLinux + libuuid = if stdenv.hostPlatform.isLinux then util-linuxMinimal else null; @@ -26260,7 +25750,7 @@ with pkgs; util-linux = util-linuxMinimal; }); fuse = fuse2; - fuse2 = lowPrio (if stdenv.isDarwin then macfuse-stubs else fusePackages.fuse_2); + fuse2 = lowPrio (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fusePackages.fuse_2); fuse3 = fusePackages.fuse_3; fuse-common = hiPrio fusePackages.fuse_3.common; @@ -26518,8 +26008,6 @@ with pkgs; # hardened kernels linuxPackages_hardened = linuxKernel.packages.linux_hardened; linux_hardened = linuxPackages_hardened.kernel; - linuxPackages_4_19_hardened = linuxKernel.packages.linux_4_19_hardened; - linux_4_19_hardened = linuxPackages_4_19_hardened.kernel; linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened; linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; @@ -26704,7 +26192,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Foundation; }); - nettools = if stdenv.isLinux + nettools = if stdenv.hostPlatform.isLinux then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; @@ -26746,8 +26234,8 @@ with pkgs; ginkgo = callPackage ../development/tools/ginkgo { }; - gdlv = darwin.apple_sdk_11_0.callPackage ../development/tools/gdlv { - inherit (darwin.apple_sdk_11_0.frameworks) Foundation CoreGraphics Metal AppKit; + gdlv = callPackage ../by-name/gd/gdlv/package.nix { + inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics Foundation Metal; }; go-bindata = callPackage ../development/tools/go-bindata { }; @@ -26804,8 +26292,6 @@ with pkgs; gotestfmt = callPackage ../development/tools/gotestfmt { }; - gotools = callPackage ../development/tools/gotools { }; - gotop = callPackage ../tools/system/gotop { inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -26830,8 +26316,6 @@ with pkgs; gotests = callPackage ../development/tools/gotests { }; - gotestsum = callPackage ../development/tools/gotestsum { }; - gqlgenc = callPackage ../development/tools/gqlgenc { }; impl = callPackage ../development/tools/impl { }; @@ -26868,7 +26352,7 @@ with pkgs; pagemon = callPackage ../os-specific/linux/pagemon { }; - pam = if stdenv.isLinux then linux-pam else openpam; + pam = if stdenv.hostPlatform.isLinux then linux-pam else openpam; # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader ) @@ -26940,11 +26424,9 @@ with pkgs; dnsdist = callPackage ../servers/dns/dnsdist { }; - powertop = callPackage ../os-specific/linux/powertop { }; - pps-tools = callPackage ../os-specific/linux/pps-tools { }; - procps = if stdenv.isLinux + procps = if stdenv.hostPlatform.isLinux then callPackage ../os-specific/linux/procps-ng { } else unixtools.procps; @@ -26961,11 +26443,10 @@ with pkgs; # See `xenPackages` source for explanations. # Building with `xen` instead of `xen-slim` is possible, but makes no sense. - qemu_xen = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-slim; }); - qemu_xen_4_19 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_19-slim; }); - qemu_xen_4_18 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_18-slim; }); - qemu_xen_4_17 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_17-slim; }); - qemu_xen_4_16 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_16-slim; }); + qemu_xen_4_19 = lowPrio (qemu.override { hostCpuTargets = [ "i386-softmmu" ]; xenSupport = true; xen = xenPackages.xen_4_19-slim; }); + qemu_xen_4_18 = lowPrio (qemu.override { hostCpuTargets = [ "i386-softmmu" ]; xenSupport = true; xen = xenPackages.xen_4_18-slim; }); + qemu_xen_4_17 = lowPrio (qemu.override { hostCpuTargets = [ "i386-softmmu" ]; xenSupport = true; xen = xenPackages.xen_4_17-slim; }); + qemu_xen = qemu_xen_4_19; qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); @@ -27035,7 +26516,7 @@ with pkgs; sdparm = callPackage ../os-specific/linux/sdparm { }; sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; setools = callPackage ../os-specific/linux/setools { }; @@ -27219,6 +26700,7 @@ with pkgs; ubootOlimexA64Teres1 ubootOrangePi3 ubootOrangePi5 + ubootOrangePi5Plus ubootOrangePiPc ubootOrangePiZeroPlus2H5 ubootOrangePiZero @@ -27259,14 +26741,6 @@ with pkgs; buildBarebox bareboxTools; - uclibc-ng-cross = uclibc-ng.override { - stdenv = crossLibcStdenv; - }; - - # Aliases - uclibc = uclibc-ng; - uclibcCross = uclibc-ng-cross; - eudev = callPackage ../by-name/eu/eudev/package.nix { util-linux = util-linuxMinimal; }; @@ -27506,7 +26980,9 @@ with pkgs; clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; - cnspec = callPackage ../tools/security/cnspec { }; + cnspec = callPackage ../tools/security/cnspec { + buildGoModule = buildGo123Module; + }; cnstrokeorder = callPackage ../data/fonts/cnstrokeorder { }; @@ -27520,8 +26996,6 @@ with pkgs; comic-mono = callPackage ../data/fonts/comic-mono { }; - comic-neue = callPackage ../data/fonts/comic-neue { }; - comic-relief = callPackage ../data/fonts/comic-relief { }; comixcursors = callPackage ../data/icons/comixcursors { }; @@ -28019,9 +27493,7 @@ with pkgs; mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { }; - mojave-gtk-theme = callPackage ../data/themes/mojave { - inherit (gnome) gnome-shell; - }; + mojave-gtk-theme = callPackage ../data/themes/mojave { }; moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; @@ -28108,8 +27580,6 @@ with pkgs; numix-sx-gtk-theme = callPackage ../data/themes/numix-sx { }; - office-code-pro = callPackage ../data/fonts/office-code-pro { }; - _0xproto = callPackage ../data/fonts/0xproto { }; oldstandard = callPackage ../data/fonts/oldstandard { }; @@ -28533,9 +28003,7 @@ with pkgs; vimix-cursor-theme = callPackage ../data/icons/vimix-cursor-theme { }; - vimix-gtk-themes = callPackage ../data/themes/vimix { - inherit (gnome) gnome-shell; - }; + vimix-gtk-themes = callPackage ../data/themes/vimix { }; vimix-icon-theme = callPackage ../data/icons/vimix-icon-theme { }; @@ -28551,9 +28019,7 @@ with pkgs; whitesur-cursors = callPackage ../data/icons/whitesur-cursors { }; - whitesur-gtk-theme = callPackage ../data/themes/whitesur { - inherit (gnome) gnome-shell; - }; + whitesur-gtk-theme = callPackage ../data/themes/whitesur { }; whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { }; @@ -28611,7 +28077,7 @@ with pkgs; dcw-gmt = callPackage ../applications/gis/gmt/dcw.nix { }; grass = callPackage ../applications/gis/grass { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { }; @@ -28913,10 +28379,6 @@ with pkgs; armcord = callPackage ../applications/networking/instant-messengers/armcord { }; - aumix = callPackage ../applications/audio/aumix { - gtkGUI = false; - }; - autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { }; @@ -28936,7 +28398,7 @@ with pkgs; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; - backintime-qt = libsForQt5.callPackage ../applications/networking/sync/backintime/qt.nix { }; + backintime-qt = qt6.callPackage ../applications/networking/sync/backintime/qt.nix { }; backintime = backintime-qt; @@ -28968,8 +28430,6 @@ with pkgs; bfcal = libsForQt5.callPackage ../applications/misc/bfcal { }; - bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; - bino3d = qt6Packages.callPackage ../applications/video/bino3d { }; bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; @@ -29122,8 +28582,6 @@ with pkgs; calicoctl confd-calico; - calligra = libsForQt5.callPackage ../applications/office/calligra { }; - perkeep = callPackage ../applications/misc/perkeep { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; @@ -29175,10 +28633,6 @@ with pkgs; chatty = callPackage ../applications/networking/instant-messengers/chatty { }; - chirp = callPackage ../applications/radio/chirp { - python3 = python311; - }; - browsh = callPackage ../applications/networking/browsers/browsh { }; brotab = callPackage ../tools/misc/brotab { @@ -29230,8 +28684,6 @@ with pkgs; clp = callPackage ../applications/science/math/clp { }; - cmatrix = callPackage ../applications/misc/cmatrix { }; - pokemon-colorscripts-mac = callPackage ../applications/misc/pokemon-colorscripts-mac { }; cmctl = callPackage ../applications/networking/cluster/cmctl { }; @@ -29347,8 +28799,6 @@ with pkgs; cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; - dablin = callPackage ../applications/radio/dablin { }; - daktilo = callPackage ../tools/misc/daktilo { }; darcs = haskell.lib.compose.disableCabalFlag "library" @@ -29356,10 +28806,10 @@ with pkgs; darkman = callPackage ../applications/misc/darkman { }; - darktable = callPackage ../applications/graphics/darktable { + darktable = callPackage ../by-name/da/darktable/package.nix { lua = lua5_4; pugixml = pugixml.override { shared = true; }; - stdenv = if stdenv.isDarwin && stdenv.isx86_64 then overrideSDK llvmPackages_18.stdenv { darwinMinVersion = "10.14"; darwinSdkVersion = "11.0"; } else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK llvmPackages_18.stdenv { darwinMinVersion = "10.14"; darwinSdkVersion = "11.0"; } else stdenv; }; das_watchdog = callPackage ../tools/system/das_watchdog { }; @@ -29524,8 +28974,6 @@ with pkgs; dvd-slideshow = callPackage ../applications/video/dvd-slideshow { }; - dvdstyler = callPackage ../applications/video/dvdstyler { }; - dyff = callPackage ../development/tools/dyff { }; dwl = callPackage ../by-name/dw/dwl/package.nix { @@ -29570,14 +29018,8 @@ with pkgs; ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; - edlin = callPackage ../applications/editors/edlin { }; - oed = callPackage ../applications/editors/oed { }; - ekho = callPackage ../applications/audio/ekho { - inherit (darwin.apple_sdk.frameworks) AudioUnit; - }; - electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; electrum = libsForQt5.callPackage ../applications/misc/electrum { }; @@ -29594,19 +29036,21 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - elvis = callPackage ../applications/editors/elvis { }; - - em = callPackage ../applications/editors/em { }; - inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) emacs28 - emacs28-gtk2 emacs28-gtk3 emacs28-nox + emacs29 emacs29-gtk3 emacs29-nox emacs29-pgtk + + emacs30 + emacs30-gtk3 + emacs30-nox + emacs30-pgtk + emacs28-macport emacs29-macport ; @@ -29726,13 +29170,11 @@ with pkgs; keepassxc = libsForQt5.callPackage ../applications/misc/keepassxc { inherit (darwin.apple_sdk_11_0.frameworks) LocalAuthentication; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; keepass-diff = callPackage ../applications/misc/keepass-diff { }; - keeweb = callPackage ../applications/misc/keeweb { }; - evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; }; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; @@ -29839,8 +29281,6 @@ with pkgs; foliate = callPackage ../applications/office/foliate { }; - fondo = callPackage ../applications/graphics/fondo { }; - font-manager = callPackage ../by-name/fo/font-manager/package.nix { libsoup = libsoup_3; webkitgtk = webkitgtk_6_0; @@ -29943,7 +29383,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python311; volk = volk_2; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv; }); }; @@ -30005,10 +29445,6 @@ with pkgs; gpa = callPackage ../applications/misc/gpa { }; - gpicview = callPackage ../applications/graphics/gpicview { - gtk2 = gtk2-x11; - }; - gpx = callPackage ../applications/misc/gpx { }; gqrx = qt6Packages.callPackage ../applications/radio/gqrx { }; @@ -30061,7 +29497,7 @@ with pkgs; wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark { inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices SystemConfiguration; - libpcap = libpcap.override { withBluez = stdenv.isLinux; }; + libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; }; }; wireshark-qt = wireshark; @@ -30070,7 +29506,7 @@ with pkgs; tshark = wireshark-cli; wireshark-cli = wireshark.override { withQt = false; - libpcap = libpcap.override { withBluez = stdenv.isLinux; }; + libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; }; }; sngrep = callPackage ../applications/networking/sniffers/sngrep { }; @@ -30194,10 +29630,6 @@ with pkgs; floorp = wrapFirefox floorp-unwrapped { }; - fluxbox = callPackage ../applications/window-managers/fluxbox { }; - - hackedbox = callPackage ../applications/window-managers/hackedbox { }; - fomp = callPackage ../applications/audio/fomp { }; formatter = callPackage ../applications/misc/formatter { }; @@ -30226,23 +29658,6 @@ with pkgs; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - freenet = callPackage ../applications/networking/p2p/freenet { - gradle = gradle_7; - jdk = jdk17_headless; - # Reduce closure size - jre = pkgs.jre17_minimal.override { - modules = [ - "java.base" - "java.logging" - "java.naming" - "java.sql" - "java.desktop" - "java.management" - ]; - jdk = jdk17_headless; - }; - }; - freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; freepv = callPackage ../applications/graphics/freepv { }; @@ -30261,7 +29676,7 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; }; freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; }; }) @@ -30279,8 +29694,6 @@ with pkgs; vcal = callPackage ../applications/misc/vcal { }; - gcolor2 = callPackage ../applications/graphics/gcolor2 { }; - gcolor3 = callPackage ../applications/graphics/gcolor3 { }; get_iplayer = callPackage ../applications/misc/get_iplayer { }; @@ -30307,8 +29720,6 @@ with pkgs; gmrun = callPackage ../applications/misc/gmrun { }; - gnucash = callPackage ../applications/office/gnucash { }; - goffice = callPackage ../development/libraries/goffice { }; gtkterm = callPackage ../tools/misc/gtkterm { }; @@ -30351,9 +29762,9 @@ with pkgs; lemonade = callPackage ../applications/misc/lemonade { }; librespot = callPackage ../applications/audio/librespot { - withALSA = stdenv.isLinux; - withPulseAudio = config.pulseaudio or stdenv.isLinux; - withPortAudio = stdenv.isDarwin; + withALSA = stdenv.hostPlatform.isLinux; + withPulseAudio = config.pulseaudio or stdenv.hostPlatform.isLinux; + withPortAudio = stdenv.hostPlatform.isDarwin; }; limesctl = callPackage ../applications/misc/limesctl { }; @@ -30420,14 +29831,10 @@ with pkgs; glowing-bear = callPackage ../applications/networking/irc/glowing-bear { }; - gmtk = callPackage ../development/libraries/gmtk { }; - gmu = callPackage ../applications/audio/gmu { }; gnaural = callPackage ../applications/audio/gnaural { }; - gnome_mplayer = callPackage ../applications/video/gnome-mplayer { }; - gnumeric = callPackage ../applications/office/gnumeric { }; gnunet = callPackage ../applications/networking/p2p/gnunet { }; @@ -30459,8 +29866,6 @@ with pkgs; q4wine = libsForQt5.callPackage ../applications/misc/q4wine { }; - qrcodegen = callPackage ../development/libraries/qrcodegen { }; - qrencode = callPackage ../development/libraries/qrencode { inherit (darwin) libobjc; }; @@ -30469,12 +29874,6 @@ with pkgs; gigedit = callPackage ../applications/audio/gigedit { }; - gqview = callPackage ../applications/graphics/gqview { }; - - gmpc = callPackage ../applications/audio/gmpc { }; - - gmtp = callPackage ../applications/misc/gmtp { }; - gnomecast = callPackage ../applications/video/gnomecast { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { }; @@ -30605,10 +30004,6 @@ with pkgs; hmm = callPackage ../applications/misc/hmm { }; - homebank = callPackage ../applications/office/homebank { - gtk = gtk3; - }; - hollywood = callPackage ../applications/misc/hollywood { inherit (python3Packages) pygments; }; @@ -30627,8 +30022,6 @@ with pkgs; hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack; - hpcg = callPackage ../tools/misc/hpcg { }; - hpl = callPackage ../tools/misc/hpl { }; hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { }; @@ -30663,9 +30056,7 @@ with pkgs; hydroxide = callPackage ../applications/networking/hydroxide { }; - hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { - protobuf = protobuf_21; - }; + hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; @@ -30685,8 +30076,6 @@ with pkgs; levant = callPackage ../applications/networking/cluster/levant { }; - lwm = callPackage ../applications/window-managers/lwm { }; - marker = callPackage ../applications/editors/marker { }; matcha-rss-digest = callPackage ../applications/misc/matcha-rss-digest { }; @@ -30760,8 +30149,6 @@ with pkgs; sleep-on-lan = callPackage ../tools/networking/sleep-on-lan { }; - slweb = callPackage ../applications/misc/slweb { }; - sonixd = callPackage ../applications/audio/sonixd { }; sonobus = callPackage ../applications/audio/sonobus { }; @@ -30796,8 +30183,6 @@ with pkgs; remontoire = callPackage ../applications/misc/remontoire { }; - rootbar = callPackage ../applications/misc/rootbar { }; - waycorner = callPackage ../applications/misc/waycorner { }; wayshot = callPackage ../tools/misc/wayshot { }; @@ -30805,7 +30190,7 @@ with pkgs; waylevel = callPackage ../tools/misc/waylevel { }; i3 = callPackage ../applications/window-managers/i3 { - xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; + xcb-util-cursor = if stdenv.hostPlatform.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; i3-auto-layout = callPackage ../applications/window-managers/i3/auto-layout.nix { }; @@ -31039,8 +30424,6 @@ with pkgs; fish-irssi = callPackage ../applications/networking/irc/irssi/fish { }; - kirc = callPackage ../applications/networking/irc/kirc { }; - ir.lv2 = callPackage ../applications/audio/ir.lv2 { }; istioctl = callPackage ../applications/networking/cluster/istioctl { }; @@ -31105,8 +30488,6 @@ with pkgs; jitsi = callPackage ../applications/networking/instant-messengers/jitsi { }; - joe = callPackage ../applications/editors/joe { }; - johnny = callPackage ../applications/misc/johnny { }; js8call = qt5.callPackage ../applications/radio/js8call { }; @@ -31115,12 +30496,13 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - inherit (callPackage ../applications/networking/cluster/k3s { - buildGoModule = buildGo121Module; - go = go_1_21; - }) k3s_1_28 k3s_1_29; - inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_30; - k3s = k3s_1_30; + inherit (callPackage ../applications/networking/cluster/k3s { }) + k3s_1_28 + k3s_1_29 + k3s_1_30 + k3s_1_31 + ; + k3s = k3s_1_31; k3sup = callPackage ../applications/networking/cluster/k3sup { }; @@ -31212,7 +30594,7 @@ with pkgs; kondo = callPackage ../applications/misc/kondo { }; kotatogram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { - stdenv = if stdenv.isDarwin + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; @@ -31272,8 +30654,6 @@ with pkgs; kubeconform = callPackage ../applications/networking/cluster/kubeconform { }; - kubecolor = callPackage ../applications/networking/cluster/kubecolor { }; - kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; kuttl = callPackage ../applications/networking/cluster/kuttl { }; @@ -31284,26 +30664,16 @@ with pkgs; kubectl-explore = callPackage ../applications/networking/cluster/kubectl-explore { }; - kubectl-gadget = callPackage ../applications/networking/cluster/kubectl-gadget { }; - - kubectl-images = callPackage ../applications/networking/cluster/kubectl-images { }; - kubectl-klock = callPackage ../applications/networking/cluster/kubectl-klock { }; - kubectl-ktop = callPackage ../applications/networking/cluster/kubectl-ktop { }; - kubectl-node-shell = callPackage ../applications/networking/cluster/kubectl-node-shell { }; - kubectl-tree = callPackage ../applications/networking/cluster/kubectl-tree { }; - kubectl-view-allocations = callPackage ../applications/networking/cluster/kubectl-view-allocations { inherit (darwin.apple_sdk.frameworks) Security; }; kubelogin = callPackage ../applications/networking/cluster/kubelogin { }; - kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { }; - kubevpn = callPackage ../applications/networking/cluster/kubevpn { }; k8sgpt = callPackage ../applications/networking/cluster/k8sgpt { }; @@ -31400,7 +30770,7 @@ with pkgs; ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; ladybird = callPackage ../applications/networking/browsers/ladybird { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation OpenGL; }; @@ -31426,8 +30796,6 @@ with pkgs; lens = callPackage ../applications/networking/cluster/lens { }; - openlens = callPackage ../applications/networking/cluster/openlens { }; - leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; libkiwix = callPackage ../applications/misc/kiwix/lib.nix { }; @@ -31504,8 +30872,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; }; - libvmi = callPackage ../development/libraries/libvmi { }; - libutp = callPackage ../applications/networking/p2p/libutp { }; libutp_3_4 = callPackage ../applications/networking/p2p/libutp/3.4.nix { }; @@ -31532,7 +30898,9 @@ with pkgs; lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { }; - lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr { }; + lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; liblinphone = callPackage ../development/libraries/liblinphone { }; @@ -31568,11 +30936,6 @@ with pkgs; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; - handbrake = callPackage ../applications/video/handbrake { - inherit (darwin.apple_sdk.frameworks) AudioToolbox Foundation VideoToolbox; - inherit (darwin) libobjc; - }; - handlr = callPackage ../tools/misc/handlr { }; jftui = callPackage ../applications/video/jftui { }; @@ -31679,8 +31042,6 @@ with pkgs; mbrola-voices = callPackage ../applications/audio/mbrola/voices.nix { }; - mcpp = callPackage ../development/compilers/mcpp { }; - mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; mdzk = callPackage ../applications/misc/mdzk { @@ -31727,8 +31088,6 @@ with pkgs; mercurialFull = mercurial.override { fullBuild = true; }; - merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; - mepo = callPackage ../applications/misc/mepo { }; meshcentral = callPackage ../tools/admin/meshcentral { }; @@ -31739,10 +31098,6 @@ with pkgs; metersLv2 = callPackage ../applications/audio/meters_lv2 { }; - mhwaveedit = callPackage ../applications/audio/mhwaveedit { - autoreconfHook = buildPackages.autoreconfHook269; - }; - michabo = libsForQt5.callPackage ../applications/misc/michabo { }; mid2key = callPackage ../applications/audio/mid2key { }; @@ -31776,8 +31131,6 @@ with pkgs; mimic = callPackage ../applications/audio/mimic { }; - mission-center = callPackage ../applications/misc/mission-center { }; - meh = callPackage ../applications/graphics/meh { }; mixxx = libsForQt5.callPackage ../applications/audio/mixxx { }; @@ -31899,8 +31252,6 @@ with pkgs; mp3gain = callPackage ../applications/audio/mp3gain { }; - mp3info = callPackage ../applications/audio/mp3info { }; - mp3splt = callPackage ../applications/audio/mp3splt { }; mp3val = callPackage ../applications/audio/mp3val { }; @@ -31923,10 +31274,6 @@ with pkgs; clerk = callPackage ../applications/audio/clerk { }; - jujutsu = callPackage ../applications/version-management/jujutsu { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - nbstripout = callPackage ../applications/version-management/nbstripout { }; ncmpc = callPackage ../applications/audio/ncmpc { }; @@ -32009,7 +31356,7 @@ with pkgs; } // (config.mplayer or {})); mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv { - stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then swiftPackages.stdenv else stdenv; inherit lua; }; @@ -32032,8 +31379,6 @@ with pkgs; mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { }; - multimarkdown = callPackage ../tools/typesetting/multimarkdown { }; - multimon-ng = callPackage ../applications/radio/multimon-ng { }; murmur = (callPackages ../applications/networking/mumble { @@ -32058,9 +31403,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - musescore = libsForQt5.callPackage ../applications/audio/musescore { }; - - music-player = callPackage ../applications/audio/music-player { }; + musescore = qt6.callPackage ../applications/audio/musescore { }; mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; @@ -32140,9 +31483,7 @@ with pkgs; open-policy-agent = callPackage ../development/tools/open-policy-agent { }; - openmm = callPackage ../development/libraries/science/chemistry/openmm { - swig = swig4; - }; + openmm = callPackage ../development/libraries/science/chemistry/openmm { }; openshift = callPackage ../applications/networking/cluster/openshift { }; @@ -32211,11 +31552,9 @@ with pkgs; i3Support = true; }; - yambar = callPackage ../applications/misc/yambar { }; - yambar-hyprland-wses = callPackage ../applications/misc/yambar-hyprland-wses { }; - polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; + polyphone = qt6.callPackage ../applications/audio/polyphone { }; psi-notify = callPackage ../applications/misc/psi-notify { }; @@ -32268,20 +31607,12 @@ with pkgs; typora = callPackage ../applications/editors/typora { }; - taxi = callPackage ../applications/networking/ftp/taxi { }; - taxi-cli = with python3Packages; toPythonApplication taxi; tcping-go = callPackage ../applications/networking/tcping-go { }; - librep = callPackage ../development/libraries/librep { }; - - rep-gtk = callPackage ../development/libraries/rep-gtk { }; - reproc = callPackage ../development/libraries/reproc { }; - sawfish = callPackage ../applications/window-managers/sawfish { }; - sc68 = callPackage ../applications/audio/sc68 { }; sidplayfp = callPackage ../applications/audio/sidplayfp { }; @@ -32369,10 +31700,10 @@ with pkgs; ncspot = callPackage ../applications/audio/ncspot { inherit (darwin.apple_sdk.frameworks) Cocoa; - withALSA = stdenv.isLinux; - withPulseAudio = config.pulseaudio or stdenv.isLinux; - withPortAudio = stdenv.isDarwin; - withMPRIS = stdenv.isLinux; + withALSA = stdenv.hostPlatform.isLinux; + withPulseAudio = config.pulseaudio or stdenv.hostPlatform.isLinux; + withPortAudio = stdenv.hostPlatform.isDarwin; + withMPRIS = stdenv.hostPlatform.isLinux; }; ncview = callPackage ../tools/X11/ncview { } ; @@ -32383,10 +31714,6 @@ with pkgs; ngt = callPackage ../development/libraries/ngt { }; - nchat = callPackage ../applications/networking/instant-messengers/nchat { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; - }; - nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { }; notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; @@ -32399,8 +31726,6 @@ with pkgs; notmuch-mailmover = callPackage ../applications/networking/mailreaders/notmuch/notmuch-mailmover.nix { }; - notejot = callPackage ../applications/misc/notejot { }; - notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; @@ -32681,7 +32006,7 @@ with pkgs; phantomsocks = callPackage ../tools/networking/phantomsocks { }; photoqt = callPackage ../by-name/ph/photoqt/package.nix { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; @@ -32702,10 +32027,6 @@ with pkgs; picard = callPackage ../applications/audio/picard { }; - picocom = callPackage ../tools/misc/picocom { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - picoloop = callPackage ../applications/audio/picoloop { }; picosnitch = callPackage ../tools/networking/picosnitch { }; @@ -32752,8 +32073,6 @@ with pkgs; plugin-torture = callPackage ../applications/audio/plugin-torture { }; - poke = callPackage ../applications/editors/poke { }; - pokefinder = qt6Packages.callPackage ../tools/games/pokefinder { }; pokemonsay = callPackage ../tools/misc/pokemonsay { }; @@ -32850,9 +32169,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; qbittorrent-nox = qbittorrent.override { guiSupport = false; }; - qbittorrent-qt5 = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; qcad = libsForQt5.callPackage ../applications/misc/qcad { }; @@ -32865,9 +32181,17 @@ with pkgs; eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { }; qemu = callPackage ../applications/virtualization/qemu { - inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor vmnet; + inherit (darwin.apple_sdk_12_3.frameworks) CoreServices Cocoa Hypervisor Kernel vmnet; inherit (darwin.stubs) rez setfile; inherit (darwin) sigtool; + stdenv = + if stdenv.hostPlatform.isDarwin then + overrideSDK stdenv { + darwinSdkVersion = "12.3"; + darwinMinVersion = "12.0"; + } + else + stdenv; }; qemu-python-utils = python3Packages.toPythonApplication ( @@ -32890,8 +32214,6 @@ with pkgs; wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; - qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; - qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { }; @@ -32945,7 +32267,7 @@ with pkgs; quantomatic = callPackage ../applications/science/physics/quantomatic { }; quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; quasselClient = quassel.override { @@ -33095,7 +32417,7 @@ with pkgs; ries = callPackage ../applications/science/math/ries { }; - ripcord = if stdenv.isLinux then + ripcord = if stdenv.hostPlatform.isLinux then qt5.callPackage ../applications/networking/instant-messengers/ripcord { } else callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { }; @@ -33108,11 +32430,7 @@ with pkgs; rke = callPackage ../applications/networking/cluster/rke { }; - inherit (callPackage ../applications/networking/cluster/rke2 { - buildGoModule = buildGo121Module; - go = go_1_21; - }) rke2_stable; - inherit (callPackage ../applications/networking/cluster/rke2 { }) rke2_latest rke2_testing; + inherit (callPackage ../applications/networking/cluster/rke2 { }) rke2_stable rke2_latest rke2_testing; rke2 = rke2_stable; rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { }; @@ -33181,10 +32499,6 @@ with pkgs; uade = callPackage ../applications/audio/uade { }; - udevil = callPackage ../applications/misc/udevil { }; - - udiskie = callPackage ../applications/misc/udiskie { }; - sacc = callPackage ../applications/networking/gopher/sacc { }; savvycan = libsForQt5.callPackage ../applications/networking/sniffers/savvycan {}; @@ -33208,8 +32522,6 @@ with pkgs; seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; - seahub = callPackage ../applications/networking/seahub { }; - seatd = callPackage ../applications/misc/seatd { }; secrets-extractor = callPackage ../tools/security/secrets-extractor { }; @@ -33359,8 +32671,6 @@ with pkgs; maestral-gui = qt6Packages.callPackage ../applications/networking/maestral-qt { }; - maestro = callPackage ../development/mobile/maestro { }; - myfitnesspal = with python3Packages; toPythonApplication myfitnesspal; lemurs = callPackage ../applications/display-managers/lemurs { }; @@ -33412,7 +32722,7 @@ with pkgs; # Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory # on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds # with --cores 32 on clang). - stdenv = if stdenv.isDarwin then overrideSDK llvmPackages.stdenv "11.0" else llvmPackages.stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK llvmPackages.stdenv "11.0" else llvmPackages.stdenv; }; super-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; @@ -33582,8 +32892,6 @@ with pkgs; syncthing-discovery syncthing-relay; - stc-cli = callPackage ../applications/networking/stc-cli { }; - syncthingtray = kdePackages.callPackage ../applications/misc/syncthingtray { # renamed in KF5 -> KF6 plasma-framework = kdePackages.libplasma; @@ -33597,7 +32905,7 @@ with pkgs; }; synergy = libsForQt5.callPackage ../applications/misc/synergy { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver UserNotifications; }; @@ -33643,8 +32951,6 @@ with pkgs; taskell = haskell.lib.compose.justStaticExecutables haskellPackages.taskell; - tap-plugins = callPackage ../applications/audio/tap-plugins { }; - taskjuggler = callPackage ../applications/misc/taskjuggler { }; tabula-java = callPackage ../applications/misc/tabula-java { }; @@ -33664,7 +32970,7 @@ with pkgs; taskopen = callPackage ../applications/misc/taskopen { }; telegram-desktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { - stdenv = if stdenv.isDarwin + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; @@ -33713,8 +33019,6 @@ with pkgs; texturepacker = qt6.callPackage ../applications/graphics/texturepacker { }; - tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; - termtosvg = callPackage ../tools/misc/termtosvg { }; tessen = callPackage ../tools/security/tessen { }; @@ -33739,8 +33043,6 @@ with pkgs; thokr = callPackage ../applications/misc/thokr { }; - thonny = callPackage ../applications/editors/thonny { }; - betterbird-unwrapped = callPackage ../applications/networking/mailreaders/betterbird { }; betterbird = wrapThunderbird betterbird-unwrapped { desktopName = "Betterbird"; @@ -33964,8 +33266,6 @@ with pkgs; tests-stdenv-gcc-stageCompare = callPackage ../test/stdenv/gcc-stageCompare.nix { }; - lavalauncher = callPackage ../applications/misc/lavalauncher { }; - t-rec = callPackage ../misc/t-rec { inherit (darwin.apple_sdk.frameworks) Foundation; }; @@ -33987,7 +33287,7 @@ with pkgs; ueberzug = with python3Packages; toPythonApplication ueberzug; ueberzugpp = callPackage ../by-name/ue/ueberzugpp/package.nix { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; uefi-run = callPackage ../tools/virtualization/uefi-run { }; @@ -34126,8 +33426,6 @@ with pkgs; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; - viw = callPackage ../applications/editors/viw { }; - virter = callPackage ../applications/virtualization/virter { }; virt-viewer = callPackage ../applications/virtualization/virt-viewer { }; @@ -34189,8 +33487,6 @@ with pkgs; vivictpp = callPackage ../applications/video/vivictpp { }; - vpcs = callPackage ../applications/virtualization/vpcs { }; - primusLib = callPackage ../tools/X11/primus/lib.nix { nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; }; @@ -34388,7 +33684,6 @@ with pkgs; westonLite = weston.override { demoSupport = false; - hdrSupport = false; jpegSupport = false; lcmsSupport = false; pangoSupport = false; @@ -34402,7 +33697,7 @@ with pkgs; }; chatterino2 = callPackage ../applications/networking/instant-messengers/chatterino2 { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; weston = callPackage ../applications/window-managers/weston { }; @@ -34483,9 +33778,6 @@ with pkgs; wxGTK = wxGTK32; }; - xa = callPackage ../development/compilers/xa/xa.nix { }; - dxa = callPackage ../development/compilers/xa/dxa.nix { }; - x11basic = callPackage ../development/compilers/x11basic { autoconf = buildPackages.autoconf269; }; @@ -34603,15 +33895,11 @@ with pkgs; xkbmon = callPackage ../applications/misc/xkbmon { }; win-spice = callPackage ../applications/virtualization/driver/win-spice { }; - win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { }; xfig = callPackage ../applications/graphics/xfig { }; xfractint = callPackage ../applications/graphics/xfractint { }; - xine-ui = callPackage ../applications/video/xine/ui.nix { }; - xine-lib = callPackage ../applications/video/xine/lib.nix { }; - xlsxgrep = callPackage ../applications/search/xlsxgrep { }; xmind = callPackage ../applications/misc/xmind { }; @@ -34622,8 +33910,6 @@ with pkgs; inherit (gnome2) libglade GConf; }; - xiphos = callPackage ../applications/misc/xiphos { }; - xournal = callPackage ../applications/graphics/xournal { inherit (gnome2) libgnomecanvas; }; @@ -34633,7 +33919,7 @@ with pkgs; }; xpdf = libsForQt5.callPackage ../applications/misc/xpdf { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; xplugd = callPackage ../tools/X11/xplugd { }; @@ -34844,8 +34130,6 @@ with pkgs; zita-njbridge = callPackage ../applications/audio/zita-njbridge { }; - zoom-us = callPackage ../applications/networking/instant-messengers/zoom-us { }; - zotero = callPackage ../applications/office/zotero { }; zotero_7 = pkgs.zotero-beta; @@ -34887,7 +34171,7 @@ with pkgs; balanceofsatoshis = callPackage ../tools/misc/balanceofsatoshis { }; bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; withGui = true; inherit (darwin) autoSignDarwinBinariesHook; }; @@ -35016,7 +34300,7 @@ with pkgs; lndmanage = callPackage ../applications/blockchains/lndmanage { }; monero-cli = callPackage ../applications/blockchains/monero-cli { - inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; + inherit (darwin.apple_sdk.frameworks) CoreData IOKit; }; haven-cli = callPackage ../applications/blockchains/haven-cli { @@ -35137,8 +34421,6 @@ with pkgs; ### GAMES - _1oom = callPackage ../games/1oom { }; - _2048-cli = _2048-cli-terminal; _2048-cli-curses = callPackage ../games/2048-cli { ui = "curses"; }; _2048-cli-terminal = callPackage ../games/2048-cli { ui = "terminal"; }; @@ -35149,8 +34431,6 @@ with pkgs; _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; - ace-of-penguins = callPackage ../games/ace-of-penguins { }; - among-sus = callPackage ../games/among-sus { }; antsimulator = callPackage ../games/antsimulator { }; @@ -35184,8 +34464,6 @@ with pkgs; gamepad-tool = callPackage ../games/gamepad-tool { }; - gnome-hexgl = callPackage ../games/gnome-hexgl { }; - gotypist = callPackage ../games/gotypist { }; heroic-unwrapped = callPackage ../games/heroic { @@ -35204,7 +34482,7 @@ with pkgs; keeperrl = callPackage ../games/keeperrl { }; shipwright = callPackage ../games/shipwright { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; wipeout-rewrite = callPackage ../games/wipeout-rewrite { @@ -35229,8 +34507,6 @@ with pkgs; eternity = callPackage ../games/doom-ports/eternity-engine { }; - gzdoom = callPackage ../games/doom-ports/gzdoom { }; - odamex = callPackage ../games/doom-ports/odamex { }; prboom-plus = callPackage ../games/doom-ports/prboom-plus { }; @@ -35403,16 +34679,12 @@ with pkgs; braincurses = callPackage ../games/braincurses { }; - brogue = callPackage ../games/brogue { }; - - brogue-ce = callPackage ../games/brogue-ce { }; - brutalmaze = callPackage ../games/brutalmaze { }; bsdgames = callPackage ../games/bsdgames { }; bugdom = callPackage ../games/bugdom { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL; }; @@ -35438,9 +34710,7 @@ with pkgs; chiaki = libsForQt5.callPackage ../games/chiaki { }; - chiaki4deck = qt6Packages.callPackage ../games/chiaki4deck { }; - - chromium-bsu = callPackage ../games/chromium-bsu { }; + chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { }; clonehero = callPackage ../games/clonehero { }; @@ -35857,7 +35127,7 @@ with pkgs; mudlet = libsForQt5.callPackage ../games/mudlet { lua = lua5_1; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) AppKit; }; @@ -36090,8 +35360,6 @@ with pkgs; openjdk = openjdk8; }; - sauerbraten = callPackage ../games/sauerbraten { }; - scid = callPackage ../games/scid { }; scid-vs-pc = callPackage ../games/scid-vs-pc { }; @@ -36177,6 +35445,8 @@ with pkgs; steam-run = steam.run; + steam-run-free = steamPackages.steam-fhsenv-without-steam.run; + steam-tui = callPackage ../games/steam-tui { }; steamcmd = steamPackages.steamcmd; @@ -36186,7 +35456,8 @@ with pkgs; steamback = python311.pkgs.callPackage ../tools/games/steamback { }; protontricks = python3Packages.callPackage ../tools/package-management/protontricks { - inherit winetricks steam-run yad; + steam-run = steam-run-free; + inherit winetricks yad; }; protonup-ng = with python3Packages; toPythonApplication protonup-ng; @@ -36438,8 +35709,6 @@ with pkgs; zeroad = zeroadPackages.zeroad; - _0verkill = callPackage ../games/0verkill { }; - _7kaa = callPackage ../games/7kaa { }; hhexen = callPackage ../games/hhexen { }; @@ -36511,13 +35780,14 @@ with pkgs; gnome-extensions-cli = python3Packages.callPackage ../desktops/gnome/misc/gnome-extensions-cli { }; - gnome-text-editor = callPackage ../desktops/gnome/apps/gnome-text-editor { }; - - gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; + gnome-bluetooth_1_0 = callPackage ../by-name/gn/gnome-bluetooth/1.0 { }; gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { }; - gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; + gnome-session-ctl = callPackage ../by-name/gn/gnome-session/ctl.nix { }; + + # Using 43 to match Mutter used in Pantheon + gnome-settings-daemon43 = callPackage ../by-name/gn/gnome-settings-daemon/43 { }; gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { }); @@ -36547,6 +35817,9 @@ with pkgs; mate = recurseIntoAttrs (callPackage ../desktops/mate { }); + # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided + mutter43 = callPackage ../by-name/mu/mutter/43 { }; + pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { }); wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { }; @@ -36587,10 +35860,6 @@ with pkgs; avogadro2 = libsForQt5.callPackage ../applications/science/chemistry/avogadro2 { }; - chemtool = callPackage ../applications/science/chemistry/chemtool { }; - - cp2k = callPackage ../applications/science/chemistry/cp2k { }; - d-seams = callPackage ../applications/science/chemistry/d-seams { }; ergoscf = callPackage ../applications/science/chemistry/ergoscf { }; @@ -36640,8 +35909,6 @@ with pkgs; ### SCIENCE/GEOMETRY - antiprism = callPackage ../applications/science/geometry/antiprism { }; - gama = callPackage ../applications/science/geometry/gama { }; tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+ @@ -36934,8 +36201,6 @@ with pkgs; ### SCIENCE/MATH - _4ti2 = callPackage ../applications/science/math/4ti2 { }; - almonds = callPackage ../applications/science/math/almonds { }; adolc = callPackage ../applications/science/math/adolc { }; @@ -37064,8 +36329,6 @@ with pkgs; cudaSupport = true; }; - mathmod = libsForQt5.callPackage ../applications/science/math/mathmod { }; - metis = callPackage ../development/libraries/science/math/metis { }; nauty = callPackage ../applications/science/math/nauty { }; @@ -37074,7 +36337,7 @@ with pkgs; or-tools = callPackage ../development/libraries/science/math/or-tools { inherit (darwin) DarwinTools; - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; protobuf = protobuf_23; # or-tools builds with -std=c++20, so abseil-cpp must @@ -37145,16 +36408,6 @@ with pkgs; dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { }; - lammps = callPackage ../applications/science/molecular-dynamics/lammps { - fftw = fftw; - }; - - lammps-mpi = lowPrio (lammps.override { - extraBuildInputs = [ - mpi - ]; - }); - gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { singlePrec = true; fftw = fftwSinglePrec; @@ -37223,8 +36476,6 @@ with pkgs; shtns = callPackage ../applications/science/physics/shtns { }; - validphys2 = with python3Packages; toPythonApplication validphys2; - xfitter = callPackage ../applications/science/physics/xfitter { }; xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; @@ -37629,8 +36880,6 @@ with pkgs; caffeine-ng = callPackage ../tools/X11/caffeine-ng { }; - dap = callPackage ../applications/science/math/dap { }; - ecm = callPackage ../applications/science/math/ecm { }; eukleides = callPackage ../applications/science/math/eukleides { }; @@ -37736,9 +36985,6 @@ with pkgs; faiss = callPackage ../development/libraries/science/math/faiss { pythonPackages = python3Packages; - # faiss wants the "-doxygen" option - # available only since swig4 - swig = swig4; }; faissWithCuda = faiss.override { @@ -38053,12 +37299,8 @@ with pkgs; electricsheep = callPackage ../misc/screensavers/electricsheep { }; - aaphoto = callPackage ../tools/graphics/aaphoto { }; - aapt = callPackage ../development/tools/aapt { }; - flam3 = callPackage ../tools/graphics/flam3 { }; - glee = callPackage ../tools/graphics/glee { }; faust = res.faust2; @@ -38094,8 +37336,6 @@ with pkgs; flockit = callPackage ../tools/backup/flockit { }; fahclient = callPackage ../applications/science/misc/foldingathome/client.nix { }; - fahcontrol = callPackage ../applications/science/misc/foldingathome/control.nix { }; - fahviewer = callPackage ../applications/science/misc/foldingathome/viewer.nix { }; fbmark = callPackage ../tools/misc/fbmark { }; @@ -38135,13 +37375,17 @@ with pkgs; gobuster = callPackage ../tools/security/gobuster { }; - gotestwaf = callPackage ../tools/security/gotestwaf { }; + gotestwaf = callPackage ../tools/security/gotestwaf { + buildGoModule = buildGo123Module; + }; gotrue = callPackage ../tools/security/gotrue { }; gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix { }; - gowitness = callPackage ../tools/security/gowitness { }; + gowitness = callPackage ../tools/security/gowitness { + buildGoModule = buildGo123Module; + }; guetzli = callPackage ../applications/graphics/guetzli { }; @@ -38165,8 +37409,6 @@ with pkgs; helmsman = callPackage ../applications/networking/cluster/helmsman { }; - velero = callPackage ../applications/networking/cluster/velero { }; - hplip = callPackage ../misc/drivers/hplip { }; hplipWithPlugin = hplip.override { withPlugin = true; }; @@ -38270,10 +37512,10 @@ with pkgs; # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_26 kops_1_27 kops_1_28 kops_1_29 + kops_1_30 ; kops = kops_1_29; @@ -38364,7 +37606,7 @@ with pkgs; # Not recommended; too fragile nixops_unstable_full; - # Useful with ofborg, e.g. commit prefix `nixops_unstablePlugins.nixops-aws: ...` to trigger automatically. + # Useful with ofborg, e.g. commit prefix `nixops_unstablePlugins.nixops-digitalocean: ...` to trigger automatically. nixops_unstablePlugins = recurseIntoAttrs nixops_unstable_minimal.availablePlugins; /* @@ -38446,7 +37688,7 @@ with pkgs; /* A NixOS/home-manager/arion/... module that sets the `pkgs` module argument. */ - pkgsModule = { lib, options, ... }: { + pkgsModule = { options, ... }: { config = if options?nixpkgs.pkgs then { # legacy / nixpkgs.nix style @@ -38574,8 +37816,6 @@ with pkgs; nvd = callPackage ../tools/package-management/nvd { }; - solfege = python3Packages.callPackage ../misc/solfege { }; - disnix = callPackage ../tools/package-management/disnix { }; dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { @@ -38640,8 +37880,6 @@ with pkgs; opkg-utils = callPackage ../tools/package-management/opkg-utils { }; - OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; - pgmanage = callPackage ../applications/misc/pgmanage { }; pgadmin4 = callPackage ../tools/admin/pgadmin { }; @@ -38671,7 +37909,7 @@ with pkgs; pwntools = with python3Packages; toPythonApplication pwntools; putty = callPackage ../applications/networking/remote/putty { - gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; + gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; }; qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { }; @@ -38743,8 +37981,6 @@ with pkgs; runitor = callPackage ../tools/system/runitor { }; - refind = callPackage ../tools/bootloaders/refind { }; - refmt = callPackage ../development/tools/refmt { }; spectra = callPackage ../development/libraries/spectra { }; @@ -38855,8 +38091,6 @@ with pkgs; sct = callPackage ../tools/X11/sct { }; - seafile-server = callPackage ../servers/seafile-server { }; - seafile-shared = callPackage ../misc/seafile-shared { }; ser2net = callPackage ../servers/ser2net { }; @@ -38908,10 +38142,6 @@ with pkgs; jx = callPackage ../applications/networking/cluster/jx { }; - prow = callPackage ../applications/networking/cluster/prow { }; - - pv-migrate = callPackage ../applications/networking/cluster/pv-migrate { }; - tagref = callPackage ../tools/misc/tagref { }; tcat = callPackage ../tools/misc/tcat { }; @@ -39018,14 +38248,10 @@ with pkgs; valent = callPackage ../applications/misc/valent { }; - vault = callPackage ../tools/security/vault { }; - vault-medusa = callPackage ../tools/security/vault-medusa { }; vault-ssh-plus = callPackage ../tools/security/vault-ssh-plus { }; - vault-bin = callPackage ../tools/security/vault/vault-bin.nix { }; - vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv; vazir-code-font = callPackage ../data/fonts/vazir-code-font { }; @@ -39045,17 +38271,13 @@ with pkgs; vhs = callPackage ../applications/misc/vhs { }; - viddy = callPackage ../tools/misc/viddy { }; - viennarna = callPackage ../applications/science/molecular-dynamics/viennarna { }; viewnior = callPackage ../applications/graphics/viewnior { }; vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix { }; - vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { - luaPackages = lua51Packages; - }); + vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { }); vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { }; vimb = wrapFirefox vimb-unwrapped { }; @@ -39101,8 +38323,6 @@ with pkgs; llvmPackages = llvmPackages_12; }; - yabasic = callPackage ../development/interpreters/yabasic { }; - wasm-pack = callPackage ../development/tools/wasm-pack { }; wasynth = callPackage ../development/tools/wasynth { }; @@ -39130,7 +38350,7 @@ with pkgs; winePackagesFor = wineBuild: lib.makeExtensible (self: with self; { callPackage = newScope self; stdenv = - if pkgs.stdenv.isDarwin then + if pkgs.stdenv.hostPlatform.isDarwin then # Match upstream, which builds with the latest SDK and a 10.7 deployment target. overrideSDK pkgs.stdenv { darwinMinVersion = "10.7"; @@ -39165,8 +38385,6 @@ with pkgs; wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { }; - with-shell = callPackage ../applications/misc/with-shell { }; - wmutils-core = callPackage ../tools/X11/wmutils-core { }; wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { }; @@ -39309,8 +38527,6 @@ with pkgs; zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; - zxing-cpp = callPackage ../development/libraries/zxing-cpp { }; - bullet = callPackage ../development/libraries/bullet { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; @@ -39431,10 +38647,6 @@ with pkgs; houdini = callPackage ../applications/misc/houdini { }; - openfst = callPackage ../development/libraries/openfst { }; - - opengrm-ngram = callPackage ../development/libraries/opengrm-ngram { }; - openring = callPackage ../applications/misc/openring { }; openrisk = callPackage ../tools/security/openrisk { }; @@ -39537,18 +38749,14 @@ with pkgs; new-session-manager = callPackage ../applications/audio/new-session-manager { }; - newlib = callPackage ../development/misc/newlib { }; - newlibCross = callPackage ../development/misc/newlib { - stdenv = crossLibcStdenv; + newlib = callPackage ../development/misc/newlib { + stdenv = stdenvNoLibc; }; newlib-nano = callPackage ../development/misc/newlib { + stdenv = stdenvNoLibc; nanoizeNewlib = true; }; - newlib-nanoCross = callPackage ../development/misc/newlib { - nanoizeNewlib = true; - stdenv = crossLibcStdenv; - }; omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { }; @@ -39562,8 +38770,6 @@ with pkgs; bemenu = callPackage ../applications/misc/bemenu { }; - _9menu = callPackage ../applications/misc/9menu { }; - dapper = callPackage ../development/tools/dapper { }; k3d = callPackage ../applications/networking/cluster/k3d { }; @@ -39592,8 +38798,6 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - yor = callPackage ../applications/networking/cluster/yor { }; - wifi-password = callPackage ../os-specific/darwin/wifi-password { }; qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen { }; @@ -39672,8 +38876,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - ldid-procursus = callPackage ../development/tools/ldid-procursus { }; - xcolor = callPackage ../tools/graphics/xcolor { }; xcfun = callPackage ../development/libraries/science/chemistry/xcfun { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 45900c8b06e2a..6da5b2218d5e2 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,9 +1,11 @@ { lib , beam +, beam_nodocs , callPackage , wxGTK32 , buildPackages , stdenv +, ex_docSupport ? true , wxSupport ? true , systemd , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd @@ -30,9 +32,8 @@ in wxGTK = wxGTK32; parallelBuild = true; autoconf = buildPackages.autoconf269; - exdocSupport = true; - exdoc = self.packages.erlang_26.ex_doc; - inherit wxSupport systemdSupport; + inherit (beam_nodocs.packages.erlang_27) ex_doc; + inherit ex_docSupport wxSupport systemdSupport; }; erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix { diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 67a9a60dbaeaa..a4e1116a16dd0 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -134,6 +134,34 @@ let feature = "build packages with CUDA support by default"; }; + replaceBootstrapFiles = mkMassRebuild { + type = types.functionTo (types.attrsOf types.package); + default = lib.id; + defaultText = literalExpression "lib.id"; + description = '' + Use the bootstrap files returned instead of the default bootstrap + files. + The default bootstrap files are passed as an argument. + ''; + example = literalExpression '' + prevFiles: + let + replacements = { + "sha256-YQlr088HPoVWBU2jpPhpIMyOyoEDZYDw1y60SGGbUM0=" = import <nix/fetchurl.nix> { + url = "(custom glibc linux x86_64 bootstrap-tools.tar.xz)"; + hash = "(...)"; + }; + "sha256-QrTEnQTBM1Y/qV9odq8irZkQSD9uOMbs2Q5NgCvKCNQ=" = import <nix/fetchurl.nix> { + url = "(custom glibc linux x86_64 busybox)"; + hash = "(...)"; + executable = true; + }; + }; + in + builtins.mapAttrs (name: prev: replacements.''${prev.outputHash} or prev) prevFiles + ''; + }; + rocmSupport = mkMassRebuild { type = types.bool; default = false; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 5a862d26d68b2..792a26d97313c 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip +{ lib, stdenv, fetchurl, fetchzip , callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 , ocamlPackages_4_10, ocamlPackages_4_12, ocamlPackages_4_14 , fetchpatch, makeWrapper, coq2html @@ -11,7 +11,7 @@ let coqPackages = self // { __attrsFailEvaluation = true; recurseForDerivations = false; }; metaFetch = import ../build-support/coq/meta-fetch/default.nix - {inherit lib stdenv fetchzip; }; + {inherit lib stdenv fetchzip fetchurl; }; mkCoqDerivation = lib.makeOverridable (callPackage ../build-support/coq {}); contribs = recurseIntoAttrs @@ -60,6 +60,7 @@ let corn = callPackage ../development/coq-modules/corn {}; deriving = callPackage ../development/coq-modules/deriving {}; dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; + ElmExtraction = callPackage ../development/coq-modules/ElmExtraction {}; equations = callPackage ../development/coq-modules/equations { }; extructures = callPackage ../development/coq-modules/extructures { }; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; @@ -114,6 +115,7 @@ let metacoq-safechecker = self.metacoq.safechecker; metacoq-erasure = self.metacoq.erasure; metalib = callPackage ../development/coq-modules/metalib { }; + mtac2 = callPackage ../development/coq-modules/mtac2 {}; multinomials = callPackage ../development/coq-modules/multinomials {}; odd-order = callPackage ../development/coq-modules/odd-order { }; paco = callPackage ../development/coq-modules/paco {}; @@ -137,6 +139,7 @@ let tlc = callPackage ../development/coq-modules/tlc {}; topology = callPackage ../development/coq-modules/topology {}; trakt = callPackage ../development/coq-modules/trakt {}; + unicoq = callPackage ../development/coq-modules/unicoq {}; vcfloat = callPackage ../development/coq-modules/vcfloat (lib.optionalAttrs (lib.versions.range "8.16" "8.18" self.coq.version) { interval = self.interval.override { version = "4.9.0"; }; @@ -232,6 +235,6 @@ in rec { coqPackages_8_19 = mkCoqPackages coq_8_19; coqPackages_8_20 = mkCoqPackages coq_8_20; - coqPackages = recurseIntoAttrs coqPackages_8_19; + coqPackages = recurseIntoAttrs coqPackages_8_20; coq = coqPackages.coq; } diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 639fa70446bee..a8146d374c822 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -33,7 +33,9 @@ let attrsets customisation fixedPoints + lists strings + trivial versions ; # Backbone @@ -81,6 +83,45 @@ let nccl = final.callPackage ../development/cuda-modules/nccl { }; nccl-tests = final.callPackage ../development/cuda-modules/nccl-tests { }; + tests = + let + bools = [ + true + false + ]; + configs = { + openCVFirst = bools; + useOpenCVDefaultCuda = bools; + useTorchDefaultCuda = bools; + }; + builder = + { + openCVFirst, + useOpenCVDefaultCuda, + useTorchDefaultCuda, + }@config: + { + name = strings.concatStringsSep "-" ( + [ + "test" + (if openCVFirst then "opencv" else "torch") + ] + ++ lists.optionals (if openCVFirst then useOpenCVDefaultCuda else useTorchDefaultCuda) [ + "with-default-cuda" + ] + ++ [ + "then" + (if openCVFirst then "torch" else "opencv") + ] + ++ lists.optionals (if openCVFirst then useTorchDefaultCuda else useOpenCVDefaultCuda) [ + "with-default-cuda" + ] + ); + value = final.callPackage ../development/cuda-modules/tests/opencv-and-torch config; + }; + in + attrsets.listToAttrs (attrsets.mapCartesianProduct builder configs); + writeGpuTestPython = final.callPackage ../development/cuda-modules/write-gpu-test-python.nix { }; }); @@ -123,4 +164,10 @@ let fixedPoints.extends composedExtension passthruFunction ); in -cudaPackages +# We want to warn users about the upcoming deprecation of old CUDA +# versions, without breaking Nixpkgs CI with evaluation warnings. This +# gross hack ensures that the warning only triggers if aliases are +# enabled, which is true by default, but not for ofborg. +lib.warnIf (cudaPackages.cudaOlder "12.0" && config.allowAliases) + "CUDA versions older than 12.0 will be removed in Nixpkgs 25.05; see the 24.11 release notes for more information" + cudaPackages diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 9de9f56674d31..f0bdad863e901 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -197,7 +197,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { xcode_12 xcode_12_0_1 xcode_12_1 xcode_12_2 xcode_12_3 xcode_12_4 xcode_12_5 xcode_12_5_1 xcode_13 xcode_13_1 xcode_13_2 xcode_13_3 xcode_13_3_1 xcode_13_4 xcode_13_4_1 xcode_14 xcode_14_1 - xcode_15 xcode_15_1 + xcode_15 xcode_15_1 xcode_15_2 xcode_15_3 xcode_15_4 xcode; CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 837155a55407e..968bf2a2800ac 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -34,12 +34,12 @@ let }; mkNongnuDevelPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix { - inherit (pkgs) buildPackages; + inherit (pkgs) pkgs buildPackages; inherit lib; }; mkNongnuPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/nongnu-packages.nix { - inherit (pkgs) buildPackages; + inherit (pkgs) pkgs buildPackages; inherit lib; }; diff --git a/pkgs/top-level/emilua-plugins.nix b/pkgs/top-level/emilua-plugins.nix new file mode 100644 index 0000000000000..ff1d2c7f645fe --- /dev/null +++ b/pkgs/top-level/emilua-plugins.nix @@ -0,0 +1,23 @@ +{ + lib, + newScope, + pkgs, + config, +}: + +emilua: +(lib.makeScope newScope (self: { + inherit emilua; + beast = self.callPackage ../development/emilua-plugins/beast { }; + bech32 = self.callPackage ../development/emilua-plugins/bech32 { }; + botan = self.callPackage ../development/emilua-plugins/botan { + inherit (pkgs) botan3; + }; + qt5 = self.callPackage ../development/emilua-plugins/qt5 { }; + qt6 = self.callPackage ../development/emilua-plugins/qt6 { }; + secp256k1 = self.callPackage ../development/emilua-plugins/secp256k1 { + inherit (pkgs) secp256k1; + }; + tdlib = self.callPackage ../development/emilua-plugins/tdlib { }; + this-thread = self.callPackage ../development/emilua-plugins/this-thread { }; +})) diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index f4d2fd06a90cd..af4f2fa7f1cd5 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -67,8 +67,8 @@ rec { set -x emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 xmllint.o \ ./.libs/'' - + pkgs.lib.optionalString pkgs.stdenv.isDarwin "libxml2.dylib " - + pkgs.lib.optionalString (!pkgs.stdenv.isDarwin) "libxml2.a " + + pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin "libxml2.dylib " + + pkgs.lib.optionalString (!pkgs.stdenv.hostPlatform.isDarwin) "libxml2.a " + '' `pkg-config zlib --cflags` `pkg-config zlib --libs` -o ./xmllint.test.js \ --embed-file ./test/xmlid/id_err1.xml @@ -175,7 +175,7 @@ rec { echo "================= /testing zlib using node =================" ''; - postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' + postPatch = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ --replace '/usr/bin/libtool' 'ar' \ --replace 'AR="libtool"' 'AR="ar"' \ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6193d9d217ae9..7db5618ec3140 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ buildPackages, pkgsBuildTarget, pkgs, newScope, stdenv }: +{ buildPackages, pkgsBuildBuild, pkgsBuildTarget, pkgs, newScope, stdenv }: let # These are attributes in compiler that support integer-simple. @@ -52,7 +52,18 @@ in { package-list = callPackage ../development/haskell-modules/package-list.nix {}; - compiler = { + # Always get boot compilers from `pkgsBuildBuild`. The boot (stage0) compiler + # is used to build another compiler (stage1) that'll be used to build the + # final compiler (stage2) (except when building a cross-compiler). This means + # that stage1's host platform is the same as stage0: build. Consequently, + # stage0 needs to be build->build. + # + # Note that we use bb.haskell.packages.*. haskell.packages.*.ghc is similar to + # stdenv: The ghc comes from the previous package set, i.e. this predicate holds: + # `name: pkgs: pkgs.haskell.packages.${name}.ghc == pkgs.buildPackages.haskell.compiler.${name}.ghc`. + # This isn't problematic since pkgsBuildBuild.buildPackages is also build->build, + # just something to keep in mind. + compiler = let bb = pkgsBuildBuild.haskell; in { ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { # Should be llvmPackages_6 which has been removed from nixpkgs llvmPackages = null; @@ -73,11 +84,11 @@ in { ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix { bootPkgs = # the oldest ghc with aarch64-darwin support is 8.10.5 - if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then # to my (@a-m-joseph) knowledge there are no newer official binaries for this platform - packages.ghc865Binary + bb.packages.ghc865Binary else - packages.ghc8107Binary; + bb.packages.ghc8107Binary; inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until @@ -91,10 +102,10 @@ in { ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix { bootPkgs = # the oldest ghc with aarch64-darwin support is 8.10.5 - if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc810 + if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc810 else - packages.ghc8107Binary; + bb.packages.ghc8107Binary; inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 python3 = buildPackages.python311; # so that we don't have two of them inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr; @@ -104,10 +115,10 @@ in { ghc90 = compiler.ghc902; ghc925 = callPackage ../development/compilers/ghc/9.2.5.nix { bootPkgs = - if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc810 + if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc810 else - packages.ghc8107Binary; + bb.packages.ghc8107Binary; inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until @@ -119,10 +130,10 @@ in { }; ghc926 = callPackage ../development/compilers/ghc/9.2.6.nix { bootPkgs = - if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc810 + if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc810 else - packages.ghc8107Binary; + bb.packages.ghc8107Binary; inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until @@ -134,10 +145,10 @@ in { }; ghc927 = callPackage ../development/compilers/ghc/9.2.7.nix { bootPkgs = - if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc810 + if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc810 else - packages.ghc8107Binary; + bb.packages.ghc8107Binary; inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until @@ -149,10 +160,10 @@ in { }; ghc928 = callPackage ../development/compilers/ghc/9.2.8.nix { bootPkgs = - if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc810 + if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc810 else - packages.ghc8107Binary; + bb.packages.ghc8107Binary; inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until @@ -170,14 +181,14 @@ in { # Use 8.10 as a workaround where possible to keep bootstrap path short. # On ARM text won't build with GHC 8.10.* - if stdenv.hostPlatform.isAarch then + if stdenv.buildPlatform.isAarch then # TODO(@sternenseemann): package bindist - packages.ghc902 + bb.packages.ghc902 # No suitable bindists for powerpc64le - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc902 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc902 else - packages.ghc8107Binary; + bb.packages.ghc8107Binary; inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until @@ -195,14 +206,14 @@ in { # Use 8.10 as a workaround where possible to keep bootstrap path short. # On ARM text won't build with GHC 8.10.* - if stdenv.hostPlatform.isAarch then + if stdenv.buildPlatform.isAarch then # TODO(@sternenseemann): package bindist - packages.ghc902 + bb.packages.ghc902 # No suitable bindists for powerpc64le - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc902 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc902 else - packages.ghc8107Binary; + bb.packages.ghc8107Binary; inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until @@ -220,14 +231,14 @@ in { # Use 8.10 as a workaround where possible to keep bootstrap path short. # On ARM text won't build with GHC 8.10.* - if stdenv.hostPlatform.isAarch then + if stdenv.buildPlatform.isAarch then # TODO(@sternenseemann): package bindist - packages.ghc902 + bb.packages.ghc902 # No suitable bindists for powerpc64le - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc902 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc902 else - packages.ghc8107Binary; + bb.packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -244,14 +255,14 @@ in { # Use 8.10 as a workaround where possible to keep bootstrap path short. # On ARM text won't build with GHC 8.10.* - if stdenv.hostPlatform.isAarch then + if stdenv.buildPlatform.isAarch then # TODO(@sternenseemann): package bindist - packages.ghc902 + bb.packages.ghc902 # No suitable bindists for powerpc64le - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc902 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc902 else - packages.ghc8107Binary; + bb.packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -265,12 +276,12 @@ in { ghc963 = callPackage ../development/compilers/ghc/9.6.3.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc928 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc928 + if stdenv.buildPlatform.isAarch32 then + bb.packages.ghc928 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc928 else - packages.ghc924Binary; + bb.packages.ghc924Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -283,12 +294,12 @@ in { ghc964 = callPackage ../development/compilers/ghc/9.6.4.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc928 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc928 + if stdenv.buildPlatform.isAarch32 then + bb.packages.ghc928 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc928 else - packages.ghc924Binary; + bb.packages.ghc924Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -301,12 +312,12 @@ in { ghc965 = callPackage ../development/compilers/ghc/9.6.5.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc928 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc928 + if stdenv.buildPlatform.isAarch32 then + bb.packages.ghc928 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc928 else - packages.ghc924Binary; + bb.packages.ghc924Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -319,12 +330,12 @@ in { ghc966 = callPackage ../development/compilers/ghc/9.6.6.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc928 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc928 + if stdenv.buildPlatform.isAarch32 then + bb.packages.ghc928 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc928 else - packages.ghc924Binary; + bb.packages.ghc924Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -338,12 +349,12 @@ in { ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc963 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc963 + if stdenv.buildPlatform.isAarch32 then + bb.packages.ghc963 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc963 else - packages.ghc963Binary; + bb.packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -356,12 +367,12 @@ in { ghc982 = callPackage ../development/compilers/ghc/9.8.2.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc963 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc963 + if stdenv.buildPlatform.isAarch32 then + bb.packages.ghc963 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc963 else - packages.ghc963Binary; + bb.packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -375,19 +386,19 @@ in { ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc963 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc963 - else if stdenv.hostPlatform.isDarwin then + if stdenv.buildPlatform.isAarch32 then + bb.packages.ghc963 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc963 + else if stdenv.buildPlatform.isDarwin then # it seems like the GHC 9.6.* bindists are built with a different # toolchain than we are using (which I'm guessing from the fact # that 9.6.4 bindists pass linker flags our ld doesn't support). # With both 9.6.3 and 9.6.4 binary it is impossible to link against # the clock package (probably a hsc2hs problem). - packages.ghc963 + bb.packages.ghc963 else - packages.ghc963Binary; + bb.packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -401,12 +412,12 @@ in { ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc963 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc963 + if stdenv.buildPlatform.isAarch32 then + bb.packages.ghc963 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc963 else - packages.ghc963Binary; + bb.packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -419,7 +430,7 @@ in { ghcjs = compiler.ghcjs810; ghcjs810 = callPackage ../development/compilers/ghcjs/8.10 { - bootPkgs = packages.ghc810; + bootPkgs = bb.packages.ghc810; ghcjsSrcJson = ../development/compilers/ghcjs/8.10/git.json; stage0 = ../development/compilers/ghcjs/8.10/stage0.nix; }; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 82022f25613b2..5b72824f1d7fe 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -13,7 +13,7 @@ in { compiler = let mkOpenjdk = path-linux: path-darwin: args: - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then mkOpenjdkLinuxOnly path-linux args else let openjdk = callPackage path-darwin {}; @@ -21,7 +21,7 @@ in { mkOpenjdkLinuxOnly = path-linux: args: let openjdk = callPackage path-linux (args); - in assert stdenv.isLinux; openjdk // { + in assert stdenv.hostPlatform.isLinux; openjdk // { headless = openjdk.override { headless = true; }; }; @@ -71,13 +71,13 @@ in { }; temurin-bin = recurseIntoAttrs (callPackage ( - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then ../development/compilers/temurin-bin/jdk-linux.nix else ../development/compilers/temurin-bin/jdk-darwin.nix ) {}); semeru-bin = recurseIntoAttrs (callPackage ( - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then ../development/compilers/semeru-bin/jdk-linux.nix else ../development/compilers/semeru-bin/jdk-darwin.nix ) {}); diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d5bd0f19bac23..3c00a5693a58b 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -26,6 +26,10 @@ let linux = kernel; }; + markBroken = drv: drv.overrideAttrs ({ meta ? {}, ... }: { + meta = meta // { broken = true; }; + }); + # Hardened Linux hardenedKernelFor = kernel': overrides: let @@ -97,15 +101,6 @@ in { rpiVersion = 4; }; - linux_4_19 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "4.19"; - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_5_4 = callPackage ../os-specific/linux/kernel/mainline.nix { branch = "5.4"; kernelPatches = [ @@ -194,6 +189,14 @@ in { ]; }; + linux_6_11 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.11"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { # A special branch that tracks the kernel under the release process @@ -260,27 +263,18 @@ in { linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; - linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }; - linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { + linux_5_4_hardened = markBroken (hardenedKernelFor kernels.linux_5_4 { stdenv = gcc10Stdenv; buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }; + }); linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { }; } // lib.optionalAttrs config.allowAliases { - linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; - linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream"; - linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream"; - linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream"; - linux_6_3 = throw "linux 6.3 was removed because it has reached its end of life upstream"; + linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; linux_6_4 = throw "linux 6.4 was removed because it has reached its end of life upstream"; linux_6_5 = throw "linux 6.5 was removed because it has reached its end of life upstream"; linux_6_7 = throw "linux 6.7 was removed because it has reached its end of life upstream"; @@ -289,9 +283,10 @@ in { linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; - linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; - linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; + linux_4_14_hardened = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; + linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; + linux_6_4_hardened = throw "linux 6.4 was removed because it has reached its end of life upstream"; + linux_6_5_hardened = throw "linux 6.5 was removed because it has reached its end of life upstream"; linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream"; linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream"; linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream"; @@ -389,8 +384,6 @@ in { ena = callPackage ../os-specific/linux/ena {}; - kvdo = callPackage ../os-specific/linux/kvdo {}; - lenovo-legion-module = callPackage ../os-specific/linux/lenovo-legion { }; linux-gpib = callPackage ../applications/science/electronics/linux-gpib/kernel.nix { }; @@ -540,6 +533,8 @@ in { trelay = callPackage ../os-specific/linux/trelay { }; + universal-pidff = callPackage ../os-specific/linux/universal-pidff { }; + usbip = callPackage ../os-specific/linux/usbip { }; v86d = callPackage ../os-specific/linux/v86d { }; @@ -605,6 +600,8 @@ in { drbd = callPackage ../os-specific/linux/drbd/driver.nix { }; + nullfs = callPackage ../os-specific/linux/nullfs { }; + } // lib.optionalAttrs config.allowAliases { ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 @@ -613,27 +610,23 @@ in { vm-tools = self.mm-tools; xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18"; amdgpu-pro = throw "amdgpu-pro was removed due to lack of maintenance"; # Added 2024-06-16 + kvdo = throw "kvdo was removed, because it was added to mainline in kernel version 6.9"; # Added 2024-07-08 }); hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides); vanillaPackages = { # recurse to build modules for the kernels - linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10); + linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11); } // lib.optionalAttrs config.allowAliases { - linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 - linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 - linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01 - linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20 - linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26 - linux_6_3 = throw "linux 6.3 was removed because it reached its end of life upstream"; # Added 2023-07-22 + linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21 linux_6_4 = throw "linux 6.4 was removed because it reached its end of life upstream"; # Added 2023-10-02 linux_6_5 = throw "linux 6.5 was removed because it reached its end of life upstream"; # Added 2024-02-28 linux_6_7 = throw "linux 6.7 was removed because it reached its end of life upstream"; # Added 2024-04-04 @@ -664,7 +657,6 @@ in { linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened); - linux_4_19_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_19_hardened); linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened); linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened); linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); @@ -682,9 +674,10 @@ in { linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre); __recurseIntoDerivationForReleaseJobs = true; } // lib.optionalAttrs config.allowAliases { - linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; - linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; + linux_4_14_hardened = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; + linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; + linux_6_4_hardened = throw "linux 6.4 was removed because it has reached its end of life upstream"; + linux_6_5_hardened = throw "linux 6.5 was removed because it has reached its end of life upstream"; linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream"; linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream"; linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream"; @@ -694,7 +687,7 @@ in { packageAliases = { linux_default = packages.linux_6_6; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_10; + linux_latest = packages.linux_6_11; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_15; linux_rt_latest = packages.linux_rt_6_6; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 3eafa2fa782fe..6f62f2dee8ec0 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -76,8 +76,8 @@ rec { # The makefile tries to link to `-llua<luaversion>` LUA_LIBS = "-llua"; - buildInputs = lib.optionals stdenv.isLinux [linux-pam] - ++ lib.optionals stdenv.isDarwin [openpam]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [linux-pam] + ++ lib.optionals stdenv.hostPlatform.isDarwin [openpam]; installPhase = '' runHook preInstall @@ -163,7 +163,7 @@ rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Lightweight UNIX I/O and POSIX binding for Lua"; homepage = "https://www.gitano.org.uk/luxio/"; license = licenses.mit; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c487541fa2e85..31a17e4c260a6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -56,6 +56,10 @@ let atdgen-runtime = callPackage ../development/ocaml-modules/atdgen/runtime.nix { }; + augeas = callPackage ../development/ocaml-modules/augeas { + inherit (pkgs) augeas; + }; + awa = callPackage ../development/ocaml-modules/awa { }; awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { }; @@ -444,6 +448,8 @@ let eio_main = callPackage ../development/ocaml-modules/eio/main.nix { }; eio_posix = callPackage ../development/ocaml-modules/eio/posix.nix { }; + eio-ssl = callPackage ../development/ocaml-modules/eio-ssl { }; + either = callPackage ../development/ocaml-modules/either { }; elina = callPackage ../development/ocaml-modules/elina { }; @@ -658,6 +664,8 @@ let h2 = callPackage ../development/ocaml-modules/h2 { }; + h2-eio = callPackage ../development/ocaml-modules/h2/eio.nix { }; + hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { }; hacl-star = callPackage ../development/ocaml-modules/hacl-star { }; @@ -689,6 +697,14 @@ let httpaf-lwt-unix = callPackage ../development/ocaml-modules/httpaf/lwt-unix.nix { }; + httpun = callPackage ../development/ocaml-modules/httpun { }; + + httpun-eio = callPackage ../development/ocaml-modules/httpun/eio.nix { }; + + httpun-types = callPackage ../development/ocaml-modules/httpun/types.nix { }; + + httpun-ws = callPackage ../development/ocaml-modules/httpun-ws { }; + hxd = callPackage ../development/ocaml-modules/hxd { }; ### I ### @@ -1177,6 +1193,8 @@ let mirage-vnetif = callPackage ../development/ocaml-modules/mirage-vnetif { }; + mlbdd = callPackage ../development/ocaml-modules/mlbdd { }; + mldoc = callPackage ../development/ocaml-modules/mldoc { }; mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; @@ -1784,6 +1802,8 @@ let terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; + terml = callPackage ../development/ocaml-modules/terml { }; + tezos-base58 = callPackage ../development/ocaml-modules/tezos-base58 { }; tezt = callPackage ../development/ocaml-modules/tezt { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 22f907f80b92f..6d2fb6f0484c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -100,9 +100,9 @@ with self; { outputs = [ "out" "man" ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileNext ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/ack ''; @@ -341,7 +341,7 @@ with self; { meta = { description = "Gumbo parser library"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.AlienLibGumbo.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.AlienLibGumbo.x86_64-darwin }; }; @@ -680,7 +680,7 @@ with self; { # Fails because /etc/protocols is not available in sandbox and make # getprotobyname('tcp') in ApacheTest fail. - doCheck = !stdenv.isLinux; + doCheck = !stdenv.hostPlatform.isLinux; meta = { description = "Perl Authentication and Authorization via cookies"; @@ -841,7 +841,7 @@ with self; { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz"; hash = "sha256-lj5jxuGocl/y9iTpCGOWrhUNtR3QozfDeB0JqZSvBaU="; }; - # Use TLS endpoints for downloads and metadata by default + # CVE-2024-45321: Use TLS endpoints for downloads and metadata preConfigure = '' substituteInPlace bin/cpanm \ --replace-fail http://www.cpan.org https://www.cpan.org \ @@ -868,8 +868,8 @@ with self; { }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ CPAN02PackagesSearch CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstall ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy Modulecpmfile ModuleCPANfile ParsePMFile ParallelPipes locallib ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/cpm ''; meta = { @@ -905,8 +905,8 @@ with self; { }; buildInputs = [ ObjectPad ]; propagatedBuildInputs = [ AppPackager FileLoadLines FileHomeDir IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] - ++ lib.optionals (!stdenv.isDarwin) [ Wx ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ Wx ]; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; # Delete tests that fail when version env var is set, see # https://github.com/ChordPro/chordpro/issues/293 @@ -914,7 +914,7 @@ with self; { rm t/320_subst.t t/321_subst.t t/322_subst.t ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/chordpro rm $out/bin/wxchordpro # Wx not supported on darwin ''; @@ -1047,16 +1047,16 @@ with self; { ArchiveLibarchive = buildPerlPackage { pname = "Archive-Libarchive"; - version = "0.08"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Archive-Libarchive-0.08.tar.gz"; - hash = "sha256-6ONC1U/T1uXn4xYP4IjBOgpQM8/76JSBodJHHUNyAFk="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Archive-Libarchive-0.09.tar.gz"; + hash = "sha256-avdG7P9/GjUwzmtaWNCtR0MaaZjUWduw8VYqEiPn3v8="; }; patches = [ ../development/perl-modules/ArchiveLibarchive-set-findlib-path.patch ]; postPatch = '' - substituteInPlace lib/Archive/Libarchive/Lib.pm --replace "@@libarchive@@" "${pkgs.libarchive.lib}/lib" + substituteInPlace lib/Archive/Libarchive/Lib.pm --replace-fail "@@libarchive@@" "${lib.getLib pkgs.libarchive}/lib" ''; - buildInputs = [ FFIC Filechdir PathTiny SubIdentify TermTable Test2Suite Test2ToolsMemoryCycle TestArchiveLibarchive TestScript ]; + buildInputs = [ FFIC Filechdir PathTiny SubIdentify Test2ToolsMemoryCycle TestArchiveLibarchive TestScript ]; propagatedBuildInputs = [ FFICStat FFICheckLib FFIPlatypus FFIPlatypusTypeEnum FFIPlatypusTypePtrObject RefUtil ]; meta = { homepage = "https://metacpan.org/pod/Archive::Libarchive"; @@ -1334,7 +1334,7 @@ with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz"; hash = "sha256-9DqTuwK0H3Mn2S+eljtpUF9nNQpS6PUHlvmK/E+z8Xc="; }; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' propagatedBuildInputs = [ DataInteger DigestCRC ScalarString ]; meta = { description = "DEC VMS password hashing"; @@ -1647,7 +1647,7 @@ with self; { ''; buildInputs =[ ExtUtilsMakeMaker ]; propagatedBuildInputs = [ pkgs.zbar PerlMagick ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Perl interface to the ZBar Barcode Reader"; homepage = "https://metacpan.org/pod/Barcode::ZBar"; @@ -2490,7 +2490,7 @@ with self; { }; propagatedBuildInputs = [ perlldap CatalystPluginAuthentication ClassAccessor ]; buildInputs = [ TestMockObject TestException NetLDAPServerTest ]; - doCheck = !stdenv.isDarwin; # t/02-realms_api.t and t/50.auth.case.sensitivity.t + doCheck = !stdenv.hostPlatform.isDarwin; # t/02-realms_api.t and t/50.auth.case.sensitivity.t meta = { description = "Authenticate Users against LDAP Directories"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -3968,7 +3968,7 @@ with self; { # Mac OS error -4960 (coreFoundationUnknownErr): The unknown error at lib/Clipboard/MacPasteboard.pm line 3. # Mac-Pasteboard-0.009.readme: 'NOTE that Mac OS X appears to restrict pasteboard access to processes that are logged in interactively. # Ssh sessions and cron jobs can not create the requisite pasteboard handles, giving coreFoundationUnknownErr (-4960)' - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Copy and paste with any OS"; homepage = "https://metacpan.org/release/Clipboard"; @@ -4197,7 +4197,7 @@ with self; { EOF ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Low-Level Interface to zlib or zlib-ng compression library"; @@ -4762,9 +4762,9 @@ with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111017.tar.gz"; hash = "sha256-8gQpO+JqyEGsyHBEoYjbD1kegIgTFseiiK7A7s4wYVU="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileHomeDir LWPProtocolHttps ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/minicpan ''; @@ -5100,7 +5100,7 @@ with self; { hash = "sha256-PMcSbVhBEHI3qb4txcf7wWfPPEtM40Z4qESLhQdXAUw="; }; propagatedBuildInputs = [ ClassMix ]; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "Eksblowfish block cipher"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -5129,9 +5129,9 @@ with self; { url = "mirror://cpan/authors/id/B/BA/BARTB/Crypt-HSXKPasswd-v3.6.tar.gz"; hash = "sha256-lZ3MX58BG/ALha0i31ZrerK/XqHTYrDeD7WuKfvEWLM="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ Clone DateTime FileHomeDir FileShare FileShareDir GetoptLong JSON ListMoreUtils MathRound Readonly TextUnidecode TypeTiny ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/hsxkpasswd ''; @@ -5356,7 +5356,7 @@ with self; { hash = "sha256-k+vfqu/P6atoPwEhyF8kR12Bl/C87EYBghnkERQ03eM="; }; propagatedBuildInputs = [ DigestSHA1 ]; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "Emulate MySQL PASSWORD() function"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -5478,8 +5478,8 @@ with self; { buildInputs = [ TestException ]; propagatedBuildInputs = [ AltCryptRSABigInt CryptCAST5_PP CryptDES_EDE3 CryptDSA CryptIDEA CryptRIPEMD160 CryptRijndael CryptTwofish FileHomeDir LWP ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/pgplet ''; doCheck = false; /* test fails with 'No random source available!' */ @@ -5703,7 +5703,7 @@ with self; { url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.13.tar.gz"; hash = "sha256-xBnjCM3IKvHCXWuNB7L/JjR6Yit6Y+wghWq+jbQFH4I="; }; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; buildInputs = [ TestDiagINC ]; meta = { description = "XS based CSS minifier"; @@ -6058,7 +6058,7 @@ with self; { homepage = "https://github.com/msgpack/msgpack-perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataMessagePack.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataMessagePack.x86_64-darwin }; }; @@ -6332,12 +6332,12 @@ with self; { hash = "sha256-tVypHHafgTN8xrCrIMMmg4eOWyZj8cwljFEamZpd/dM="; }; buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Selection of utilities for data and data types"; homepage = "https://github.com/gfx/Perl-Data-Util"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataUtil.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataUtil.x86_64-darwin }; }; @@ -6488,7 +6488,7 @@ with self; { patchPhase = '' sed -i "s#/bin/date#${pkgs.coreutils}/bin/date#" lib/Date/Manip/TZ.pm ''; - doCheck = !stdenv.isi686; # build freezes during tests on i686 + doCheck = !stdenv.hostPlatform.isi686; # build freezes during tests on i686 buildInputs = [ TestInter ]; meta = { description = "Date manipulation routines"; @@ -7222,7 +7222,7 @@ with self; { buildInputs = [ pkgs.oracle-instantclient TestNoWarnings ]; propagatedBuildInputs = [ DBI ]; - postBuild = lib.optionalString stdenv.isDarwin '' + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "${pkgs.oracle-instantclient.lib}/lib" blib/arch/auto/DBD/Oracle/Oracle.bundle ''; meta = { @@ -7275,7 +7275,7 @@ with self; { meta = { description = "DBI driver for Sybase datasources"; license = with lib.licenses; [ artistic1 gpl1Only ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DBDsybase.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DBDsybase.x86_64-darwin }; }; @@ -7637,7 +7637,7 @@ with self; { hash = "sha256-z/jSTllF45RN6/ITmVprFVuR5YE0aRVrE9Ws819qXZ8="; }; propagatedBuildInputs = [ HashStoredIterator JSONXS PadWalker ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Perl side of the Perl debugger for IntelliJ IDEA and other JetBrains IDEs"; license = with lib.licenses; [ mit ]; @@ -7735,8 +7735,8 @@ with self; { }; propagatedBuildInputs = [ FileWhich JSONMaybeXS ]; buildInputs = [ CaptureTiny TestDifferences ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/* ''; meta = { @@ -8050,8 +8050,8 @@ with self; { }; buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner SoftwareLicense TermEncoding TermUI YAMLTiny ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/dzil ''; doCheck = false; @@ -8630,11 +8630,11 @@ with self; { }; buildInputs = [ CaptureTiny ]; propagatedBuildInputs = [ EmailAbstract EmailAddressXS EmailSimple ModuleRuntime Moo MooXTypesMooseLike SubExporter Throwable TryTiny ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; postPatch = '' patchShebangs --build util ''; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang util/sendmail ''; meta = { @@ -8813,7 +8813,7 @@ with self; { url = "mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz"; hash = "sha256-F2+gJ3H1QqTvsdvCpMko6PQ5G/QHhHO9YEDY8RrbDsE="; }; - preCheck = if stdenv.isCygwin then '' + preCheck = if stdenv.hostPlatform.isCygwin then '' sed -i"" -e "s@plan tests => 13@plan tests => 10@" t/env.t sed -i"" -e "s@ok(env(\"\\\x@#ok(env(\"\\\x@" t/env.t sed -i"" -e "s@ok(\$ENV{\"\\\x@#ok(\$ENV{\"\\\x@" t/env.t @@ -9180,7 +9180,7 @@ with self; { url = "mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.26.tar.gz"; hash = "sha256-yLNiuGAXKkB2rO4AQ49SuGRk8sUAcCz891J4Ef+aaD4="; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; propagatedBuildInputs = [ CaptureTiny ]; buildInputs = [ ModuleBuild ]; @@ -9517,10 +9517,10 @@ with self; { FFIPlatypus = buildPerlPackage { pname = "FFI-Platypus"; - version = "2.08"; + version = "2.09"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-2.08.tar.gz"; - hash = "sha256-EbOrEU7ZY1YxzYWzjSKXhuFEv5Sjr5rAnD17s0M2uSQ="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-2.09.tar.gz"; + hash = "sha256-nTEjEiieeHNbRcMRt6wWqejaCT93m/aUaccK+sTdW2M="; }; buildInputs = [ AlienFFI Test2Suite ]; propagatedBuildInputs = [ CaptureTiny FFICheckLib ]; @@ -9915,7 +9915,7 @@ with self; { }; propagatedBuildInputs = [ FileWhich ]; preCheck = "export HOME=$TMPDIR"; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Find your home and other directories on any platform"; homepage = "https://metacpan.org/release/File-HomeDir"; @@ -9945,7 +9945,7 @@ with self; { hash = "sha256-oC+/KFQGqKTZOZKE8DLy1VxWl1FUwuFnS9EJg3uAluw="; }; buildInputs = [ ExtUtilsCChecker ]; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Modify attributes of symlinks without dereferencing them"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -9969,7 +9969,7 @@ with self; { description = "Determine MIME types of data or files using libmagic"; homepage = "https://metacpan.org/release/File::LibMagic"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.FileLibMagic.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.FileLibMagic.x86_64-darwin }; }; @@ -10431,10 +10431,10 @@ with self; { FinanceQuote = buildPerlPackage rec { pname = "Finance-Quote"; - version = "1.62"; + version = "1.63"; src = fetchurl { url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz"; - hash = "sha256-DTEzsL89d5WCxWaFDVd/K76OGsvRFJeDHNQ9jzFgZII="; + hash = "sha256-Y0dqDIJ60aHf7KjePopkKiToeMH0p6neb1FNaoV3so0="; }; buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ]; propagatedBuildInputs = [ DateManip DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies HTTPCookieJar JSON IOCompress IOString LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ]; @@ -10584,7 +10584,7 @@ with self; { }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ Future XSParseKeyword XSParseSublike ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Deferred subroutine syntax for futures"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -10816,8 +10816,8 @@ with self; { url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.004001.tar.gz"; hash = "sha256-WroBPI3hOZD1iRoOKjnJcHTQcnvjZTIMLGrxnTbF3aw="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/git-autofixup ''; meta = { @@ -10909,7 +10909,7 @@ with self; { postCheck = '' rm -r $out/lib ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Dynamically create Perl language bindings"; homepage = "https://gtk2-perl.sourceforge.net"; @@ -11201,7 +11201,7 @@ with self; { ]; buildInputs = [ pkgs.gtk2 ]; # https://rt.cpan.org/Public/Bug/Display.html?id=130742 - # doCheck = !stdenv.isDarwin; + # doCheck = !stdenv.hostPlatform.isDarwin; doCheck = false; propagatedBuildInputs = [ Pango ]; meta = { @@ -11222,7 +11222,7 @@ with self; { meta = { description = "(DEPRECATED) Perl interface to the EggTrayIcon library"; license = with lib.licenses; [ gpl2Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2TrayIcon.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2TrayIcon.x86_64-darwin }; }; @@ -11273,7 +11273,7 @@ with self; { meta = { description = "(DEPRECATED) Use single instance applications"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2Unique.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2Unique.x86_64-darwin }; }; @@ -11285,7 +11285,7 @@ with self; { hash = "sha256-cNxL8qp0mBx54V/SmNmY4FqS66SBHxrVyfH03jdzesw="; }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Currently failing on macOS rm t/overrides.t rm t/signals.t @@ -11372,14 +11372,14 @@ with self; { }; buildInputs = [ BotTrainingMegaHAL BotTrainingStarCraft DataSection FileSlurp PodSection TestException TestExpect TestOutput TestScript TestScriptRun ]; propagatedBuildInputs = [ ClassLoad DBDSQLite DataDump DirSelf FileCountLines GetoptLongDescriptive IOInteractive IPCSystemSimple ListMoreUtils Moose MooseXGetopt MooseXStrictConstructor MooseXTypes RegexpCommon TermSk namespaceclean ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; patches = [ ../development/perl-modules/Hailo-fix-test-gld.patch ]; postPatch = '' patchShebangs bin ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/hailo ''; meta = { @@ -11518,12 +11518,12 @@ with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Hash-SharedMem-0.005.tar.gz"; hash = "sha256-Mkd2gIYC973EStqpN4lTZUVAKakm+mEfMhyb9rlAu14="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-mno-outline-atomics"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-mno-outline-atomics"; buildInputs = [ ScalarString ]; meta = { description = "Efficient shared mutable hash"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HashSharedMem.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HashSharedMem.x86_64-darwin }; }; @@ -11535,7 +11535,7 @@ with self; { hash = "sha256-ucvE3NgjPo0dfxSB3beaSl+dtxgMs+8CtLy+4F5l6gw="; }; buildInputs = [ Test2Suite ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Functions for accessing a hashes internal iterator"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -11619,12 +11619,12 @@ with self; { hash = "sha256-Wl7viWUA0epsJKkIXs++mkOr7mjPxmwD+InSostoml0="; }; buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Extremely fast HTML escaping"; homepage = "https://github.com/tokuhirom/HTML-Escape"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTMLEscape.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTMLEscape.x86_64-darwin }; }; @@ -12136,6 +12136,7 @@ with self; { }; buildInputs = [ ModuleBuildTiny TestNeeds ]; propagatedBuildInputs = [ HTTPMessage ]; + __darwinAllowLocalNetworking = true; meta = { description = "Simple http server class"; homepage = "https://github.com/libwww-perl/HTTP-Daemon"; @@ -12215,8 +12216,8 @@ with self; { description = "XS extension for processing HTTP headers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; broken = - stdenv.isi686 # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080) - || stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTTPHeaderParserXS.x86_64-darwin + stdenv.hostPlatform.isi686 # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080) + || stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTTPHeaderParserXS.x86_64-darwin }; }; @@ -12467,7 +12468,7 @@ with self; { description = "Perl interface to libpng"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "pnginspect"; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.ImagePNGLibpng.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.ImagePNGLibpng.x86_64-darwin }; }; @@ -12651,8 +12652,8 @@ with self; { }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/treescan ''; meta = { @@ -12744,7 +12745,7 @@ with self; { }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; # Same as CompressRawZlib - doCheck = false && !stdenv.isDarwin; + doCheck = false && !stdenv.hostPlatform.isDarwin; meta = { description = "IO Interface to compressed data files/buffers"; homepage = "https://github.com/pmqs/IO-Compress"; @@ -12803,7 +12804,7 @@ with self; { url = "mirror://cpan/authors/id/L/LD/LDS/IO-Interface-1.09.tar.gz"; hash = "sha256-5j6BxS6x4OYOwtmD9VUtJJPhFxeZJclnV/I8S9n6cTo="; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ pkgs.ld-is-cc-hook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.ld-is-cc-hook ]; meta = { description = "Access and modify network interface card configuration"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -13066,7 +13067,7 @@ with self; { hash = "sha256-pfGoMCC8W13WwbVw9Ix1RuCo9/rBCgaHQLA5Ja2eFOg="; }; patches = [ ../development/perl-modules/IO-Tty-fix-makefile.patch ]; - doCheck = !stdenv.isDarwin; # openpty fails in the sandbox + doCheck = !stdenv.hostPlatform.isDarwin; # openpty fails in the sandbox meta = { description = "Low-level allocate a pseudo-Tty, import constants"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -13273,7 +13274,7 @@ with self; { available to the Perl program as if they had been written in Perl. ''; license = with lib.licenses; [ artistic2 ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.InlineJava.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.InlineJava.x86_64-darwin }; }; @@ -13298,7 +13299,7 @@ with self; { hash = "sha256-XZsDT1jwtv9bZGR708WpzgWypw7e4zn7wxc67nR8wFA="; }; buildInputs = [ TestDiagINC ]; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "XS based JavaScript minifier"; homepage = "https://metacpan.org/release/JavaScript-Minifier-XS"; @@ -13533,12 +13534,12 @@ with self; { }; outputs = [ "out" "tex" ]; propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageMagick ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; - nativeBuildInputs = [ pkgs.makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ pkgs.makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; makeMakerFlags = [ "TEXMF=\${tex}" "NOMKTEXLSR" ]; # shebangs need to be patched before executables are copied to $out preBuild = '' patchShebangs bin/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for file in bin/*; do shortenPerlShebang "$file" done @@ -14001,7 +14002,7 @@ with self; { }; buildInputs = [ TestException ]; propagatedBuildInputs = [ SubExporter ]; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Linux specific special filehandles"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -14661,7 +14662,7 @@ with self; { postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Makefile.PL --replace 'if has_module' 'if 0; #' ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ HTTPDaemon TestFatal TestNeeds TestRequiresInternet ]; meta = { description = "World-Wide Web library for Perl"; @@ -15332,7 +15333,7 @@ with self; { description = "Manipulate 128 bits integers in Perl"; homepage = "https://metacpan.org/release/Math-Int128"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.is32bit; # compiler doesn't support a 128-bit integer type + broken = stdenv.hostPlatform.is32bit; # compiler doesn't support a 128-bit integer type }; }; @@ -15569,7 +15570,7 @@ with self; { description = "Fast XS implementation of MaxMind DB reader"; homepage = "https://metacpan.org/release/MaxMind-DB-Reader-XS"; license = with lib.licenses; [ artistic2 ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBReaderXS.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBReaderXS.x86_64-darwin }; }; @@ -15587,7 +15588,7 @@ with self; { description = "Create MaxMind DB database files"; homepage = "https://metacpan.org/release/MaxMind-DB-Writer"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBWriter.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBWriter.x86_64-darwin }; }; @@ -16953,7 +16954,7 @@ with self; { }; buildInputs = [ ModuleInstall ]; propagatedBuildInputs = [ AlgorithmLCSS CHI DataSerializer DevelStackTrace Mojolicious Readonly StringTruncate ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Caching, Non-blocking I/O HTTP, Local file and WebSocket user agent"; homepage = "https://github.com/nicomen/mojo-useragent-cached"; @@ -18113,8 +18114,8 @@ with self; { }; buildInputs = [ ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; perlPreHook = "export LD=$CC"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-fno-stack-protector"; - hardeningDisable = lib.optional stdenv.isi686 "stackprotector"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-fno-stack-protector"; + hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "stackprotector"; meta = { description = "Moose minus the antlers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -18457,7 +18458,7 @@ with self; { }; buildInputs = [ HTTPCookies Test2Suite TestMetricsAny ]; propagatedBuildInputs = [ Future HTTPMessage IOAsync MetricsAny StructDumb URI ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # network tests fail on Darwin/sandbox, so disable these rm -f t/20local-connect.t t/22local-connect-pipeline.t t/23local-connect-redir.t rm -f t/90rt75615.t t/90rt75616.t t/90rt93232.t @@ -18510,7 +18511,7 @@ with self; { hash = "sha256-DayDQtPHii/syr1GZxRd1a3U+4zRjRVtKXoead/hFgA="; }; propagatedBuildInputs = [ IOAsync ProtocolWebSocket URI ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # network tests fail on Darwin/sandbox, so disable these rm -f t/02server.t t/03cross.t ''; @@ -18723,7 +18724,7 @@ with self; { meta = { description = "OOP Interface to FreeDB Server(s)"; license = with lib.licenses; [ artistic1 ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.NetFreeDB.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.NetFreeDB.x86_64-darwin }; }; @@ -18769,7 +18770,7 @@ with self; { buildInputs = [ TestNoWarnings ]; perlPreHook = "export LD=$CC"; meta = { - description = "Internationalizing Domain Names in Applications (UTS #46)"; + description = "Internationalizing Domain Names in Applications (UTS #46)"; homepage = "https://metacpan.org/release/Net-IDN-Encode"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19502,7 +19503,7 @@ with self; { hash = "sha256-z4jSquGKKHHX1/MPi6bU7lv5U+IP3KileME8dB0W0a0="; }; buildInputs = [ Test2Suite TestFatal TestRefcount ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; propagatedBuildInputs = [ XSParseKeyword XSParseSublike ]; meta = { description = "Simple syntax for lexical field-based objects"; @@ -19689,7 +19690,7 @@ with self; { # https://github.com/NixOS/nixpkgs/pull/104889#issuecomment-737144513 preCheck = '' rm t/35_log.t - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' rm t/30_connect.t rm t/45_class.t ''; @@ -19861,7 +19862,7 @@ with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz"; hash = "sha256-OY7BXNiZ/Ni+89ueoXSL9jHxX2wyviA+R1tn31EKWRQ="; }; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Argument type classification"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -20378,9 +20379,9 @@ with self; { hash = "sha256-5c2V3j5DvOcHdRdidLqkBfMm/IdA3wBUu4FpdcyNNJs="; }; buildInputs = [ TestDeep ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ BKeywords ConfigTiny ExceptionClass FileWhich ListSomeUtils ModulePluggable PPI PPIxQuoteLike PPIxRegexp PPIxUtilities PPIxUtils PerlTidy PodSpell Readonly StringFormat ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/perlcritic ''; meta = { @@ -20884,8 +20885,8 @@ with self; { hash = "sha256-RVW1J5nBZBXDy/5eMB6gLKDrvDQhTH/lLx19ykUwLik="; }; propagatedBuildInputs = [ Future FutureQueue IOAsync PPI PPR PathTiny PerlCritic PerlTidy PodMarkdown URI ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/pls ''; meta = { @@ -21814,8 +21815,8 @@ with self; { url = "mirror://cpan/authors/id/S/SY/SYP/App-rainbarf-1.4.tar.gz"; hash = "sha256-TxOa01+q8t4GI9wLsd2J+lpDHlSL/sh97hlM8OJcyX0="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/rainbarf ''; meta = { @@ -22889,8 +22890,8 @@ with self; { patchShebangs script ''; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/bin/*; do shortenPerlShebang $file done @@ -22940,7 +22941,7 @@ with self; { }; buildInputs = [ LWP TestSharedFork TestTCP ]; propagatedBuildInputs = [ ParallelPrefork Plack ServerStarter ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Simple, high-performance PSGI/Plack HTTP server"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -22955,9 +22956,9 @@ with self; { hash = "sha256-b/q5FfMj9gCJ4+v4Urm5cH1pFyZt+K/XNw+sBL/f7k4="; }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack NetServerSSPrefork IOSocketINET6 ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/starman ''; @@ -23317,7 +23318,7 @@ with self; { url = "mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz"; hash = "sha256-5gY2UDjOINZG0lXIBe/90y+GR18Y1DynVFWwDk2G3TU="; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Quote strings for passing through the shell"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23625,7 +23626,7 @@ with self; { hash = "sha256-oSfa52RcGpVwzZopcMbcST1SL/BzGKNKOeQJCY9pESU="; }; propagatedBuildInputs = [ LexicalSealRequireHints ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Detect undeclared subroutines in compilation"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23667,7 +23668,7 @@ with self; { url = "mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.14.tar.gz"; hash = "sha256-9PVui70GxP5K4G2xIYbeyt+6wep3XqGMbAKJSB0V7AU="; }; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Lib/Safe/Hole.pm"; homepage = "https://github.com/toddr/Safe-Hole"; @@ -23787,7 +23788,7 @@ with self; { }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ XSParseKeyword ]; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "Try/catch/finally syntax for perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23842,8 +23843,8 @@ with self; { hash = "sha256-nCypGyi6bZDEXqdb7wlGGzk9cFzmYkWGP1slBpXDfHw="; }) ]; - buildInputs = lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; - doCheck = !stdenv.isAarch64; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; + doCheck = !stdenv.hostPlatform.isAarch64; meta = { description = "Perl extension for getting CPU information. Currently only number of CPU's supported"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23886,7 +23887,7 @@ with self; { url = "mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.23.tar.gz"; hash = "sha256-xO9sk0VTQDH8u+Ktw0f8cZTUevyUXnpE+sfpVjCV01M="; }; - doCheck = !stdenv.isAarch64; # it hangs on Aarch64 + doCheck = !stdenv.hostPlatform.isAarch64; # it hangs on Aarch64 meta = { description = "Perl extension for Consistent Signal Handling"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23932,12 +23933,12 @@ with self; { }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Libvirt Perl API"; homepage = "https://libvirt.org"; license = with lib.licenses; [ gpl2Plus artistic1 ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.SysVirt.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.SysVirt.x86_64-darwin }; }; @@ -23948,7 +23949,7 @@ with self; { url = "mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.36.tar.gz"; hash = "sha256-B75RUy4GPqxu2OWBUFRw7ryB1VBkQa8tzzK8Dr7pjGc="; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Stream TAP from pgTAP test scripts"; homepage = "https://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP"; @@ -24043,9 +24044,9 @@ with self; { pkgs.tcl pkgs.tix pkgs.tk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; - makeMakerFlags = lib.optionals stdenv.isLinux + makeMakerFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--tclsh=${pkgs.tcl}/bin/tclsh" "--nousestubs" ]; meta = { description = "Tcl extension module for Perl"; @@ -24073,7 +24074,7 @@ with self; { mkdir -p $out/lib/perl5/site_perl mv $out/lib/perl5/Tcl $out/lib/perl5/site_perl/ mv $out/lib/perl5/auto $out/lib/perl5/site_perl/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mv $out/lib/perl5/darwin-thread-multi-2level $out/lib/perl5/site_perl/ ''; meta = { @@ -24189,7 +24190,7 @@ with self; { url = "mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-3.101.tar.gz"; hash = "sha256-0qMt1sIeSzfGqT34CHyp6IDPrmE6Pl766jB7C9yu21g="; }; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; propagatedBuildInputs = [ AppConfig ]; buildInputs = [ CGI TestLeakTrace ]; meta = { @@ -24523,7 +24524,7 @@ with self; { description = "New and improved test harness with better Test2 integration"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "yath"; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Test2Harness.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Test2Harness.x86_64-darwin }; }; @@ -25329,7 +25330,7 @@ with self; { meta = { description = "Assert that code does not cause growth in memory usage"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TestMemoryGrowth.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TestMemoryGrowth.x86_64-darwin }; }; @@ -25823,7 +25824,7 @@ with self; { }; buildInputs = [ TestRun TestTrap ]; propagatedBuildInputs = [ MooseXGetopt UNIVERSALrequire YAMLLibYAML ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Analyze tests from the command line using Test::Run"; homepage = "http://web-cpan.berlios.de/modules/Test-Run"; @@ -26380,7 +26381,7 @@ with self; { # libbtparse.so: cannot open shared object file patches = [ ../development/perl-modules/TextBibTeX-use-lib.patch ]; perlPreHook = "export LD=$CC"; - perlPostHook = lib.optionalString stdenv.isDarwin '' + perlPostHook = lib.optionalString stdenv.hostPlatform.isDarwin '' oldPath="$(pwd)/btparse/src/libbtparse.dylib" newPath="$out/lib/libbtparse.dylib" @@ -26572,7 +26573,7 @@ with self; { meta = { description = "Perl interface to iconv() codeset conversion function"; license = with lib.licenses; [ artistic1 gpl1Plus ]; # taken from el6 - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextIconv.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextIconv.x86_64-darwin }; }; @@ -26688,7 +26689,7 @@ with self; { hash = "sha256-U6cw/29IgrmavYVW8mqRH1gvZ1tZ8OFnJe0ey8CE7lA="; }; buildInputs = [ Filepushd ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Hoedown for Perl5"; homepage = "https://github.com/tokuhirom/Text-Markdown-Hoedown"; @@ -27036,7 +27037,7 @@ with self; { meta = { description = "Remove accents from a string"; license = with lib.licenses; [ gpl2Only ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextUnaccent.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextUnaccent.x86_64-darwin }; }; @@ -27131,7 +27132,7 @@ with self; { url = "mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz"; hash = "sha256-S9KaF/DCx5LRLBAFs8J28qsPrjnACFmuF0HXlBhGpIg="; }; - buildInputs = lib.optionals (!stdenv.isDarwin) [ pkgs.glibcLocales ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkgs.glibcLocales ]; propagatedBuildInputs = [ TextCharWidth ]; preConfigure = '' substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.unixtools.locale}/bin/locale' @@ -27709,7 +27710,7 @@ with self; { url = "mirror://cpan/authors/id/A/AR/ARODLAND/Unicode-CaseFold-1.01.tar.gz"; hash = "sha256-QYohKAj50Li7MwrJBQltLdNkl2dT1McVNNq5g2pjGU0="; }; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Unicode case-folding for case-insensitive lookups"; homepage = "https://metacpan.org/release/Unicode-CaseFold"; @@ -27987,7 +27988,7 @@ with self; { url = "mirror://cpan/authors/id/C/CV/CVLIBRARY/UUID4-Tiny-0.003.tar.gz"; hash = "sha256-4S9sgrg1dcORd3O0HA+1HPeDx8bPcuDJkWks4u8Hg2I="; }; - postPatch = lib.optionalString (stdenv.isAarch64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isAarch64) '' # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/asm-generic/unistd.h # printf SYS_getrandom | gcc -include sys/syscall.h -E - substituteInPlace lib/UUID4/Tiny.pm \ @@ -28187,7 +28188,7 @@ with self; { meta = { description = "Use WWW::Mechanize with CGI applications"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.WWWMechanizeCGI.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.WWWMechanizeCGI.x86_64-darwin }; }; @@ -28448,9 +28449,9 @@ with self; { url = "mirror://cpan/authors/id/S/SI/SIXTEASE/XML-Entities-1.0002.tar.gz"; hash = "sha256-wyqk8wlXPXZIqy5Bb2K2sgZS8q2c/T7sgv1REB/nMQ0="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ LWP ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/download-entities.pl ''; meta = { @@ -28523,12 +28524,12 @@ with self; { url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-Filter-Sort-1.01.tar.gz"; hash = "sha256-UQWF85pJFszV+o1UXpYXnJHq9vx8l6QBp1aOhBFi+l8="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ XMLSAX XMLSAXWriter ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/xmlsort ''; meta = { @@ -28580,7 +28581,7 @@ with self; { }; SKIP_SAX_INSTALL = 1; buildInputs = [ AlienBuild AlienLibxml2 ] - ++ lib.optionals stdenv.isDarwin (with pkgs; [ libiconv zlib ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with pkgs; [ libiconv zlib ]); patches = [ # https://github.com/shlomif/perl-XML-LibXML/pull/87 ../development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch @@ -28658,7 +28659,7 @@ with self; { patches = [ ../development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch ]; postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Expat/Makefile.PL --replace 'use English;' '#' - '' + lib.optionalString stdenv.isCygwin '' + '' + lib.optionalString stdenv.hostPlatform.isCygwin '' sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm ''; makeMakerFlags = [ "EXPATLIBPATH=${pkgs.expat.out}/lib" "EXPATINCPATH=${pkgs.expat.dev}/include" ]; @@ -28958,7 +28959,7 @@ with self; { hash = "sha256-JQDEeGnPXKjGHdI8Z7rav2a48e+14nkgdlfBzmk+IR4="; }; buildInputs = [ ExtUtilsCChecker Test2Suite ]; - perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "XS functions to assist in parsing keyword syntax"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -28974,7 +28975,7 @@ with self; { hash = "sha256-Wn0myqMroqQQUZwMJLHYCznvMgdRN224vbef2u/pms0="; }; buildInputs = [ Test2Suite ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing sub-like syntax"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -29036,7 +29037,7 @@ with self; { url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.34.tar.gz"; hash = "sha256-zJFWzK69p5jr/i8xthnoBld/hg7RcEJi8X/608bjQVk="; }; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Fast, lightweight YAML loader and dumper"; homepage = "https://github.com/toddr/YAML-Syck"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c4c985ed6dc7f..0e4fc0b6ecaef 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -160,7 +160,7 @@ in { checkPhase = '' runHook preCheck - NO_INTERACTION=yes SKIP_PERF_SENSITIVE=yes make test + NO_INTERACTION=yes SKIP_PERF_SENSITIVE=yes SKIP_ONLINE_TESTS=yes make test runHook postCheck ''; @@ -253,7 +253,7 @@ in { datadog_trace = callPackage ../development/php-packages/datadog_trace { buildPecl = buildPecl.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; inherit (pkgs) darwin; }; @@ -392,7 +392,7 @@ in { "--enable-dom" ]; # Add a PHP lower version bound constraint to avoid applying the patch on older PHP versions. - patches = lib.optionals ((lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.14" && lib.versionAtLeast php.version "8.2.7") || (lib.versions.majorMinor php.version == "8.1")) [ + patches = lib.optionals (lib.versions.majorMinor php.version == "8.1") [ # Fix tests with libxml 2.12 # Part of 8.3.1RC1+, 8.2.14RC1+ (fetchpatch { @@ -410,18 +410,6 @@ in { url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) - ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [ - # Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+ - (fetchpatch { - url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1"; - hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; - }) - ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [ - (fetchpatch { - url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1"; - hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k="; - excludes = [ "NEWS" ]; - }) ]; } { @@ -463,7 +451,7 @@ in { name = "iconv"; buildInputs = [ libiconv ]; configureFlags = [ "--with-iconv" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; } { name = "imap"; @@ -484,7 +472,7 @@ in { "LDAP_DIR=${openldap.dev}" "LDAP_INCDIR=${openldap.dev}/include" "LDAP_LIBDIR=${openldap.out}/lib" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-ldap-sasl=${cyrus_sasl.dev}" ]; doCheck = false; @@ -528,11 +516,11 @@ in { name = "opcache"; buildInputs = [ pcre2 ] ++ lib.optional - (!stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind) + (!stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind) valgrind.dev; configureFlags = lib.optional php.ztsSupport "--disable-opcache-jit"; zendExtension = true; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Tests are flaky on darwin rm ext/opcache/tests/blacklist.phpt rm ext/opcache/tests/bug66338.phpt @@ -567,7 +555,7 @@ in { internalDeps = [ php.extensions.pdo ]; configureFlags = [ "--with-pdo-dblib=${freetds}" ]; # Doesn't seem to work on darwin. - enable = (!stdenv.isDarwin); + enable = (!stdenv.hostPlatform.isDarwin); doCheck = false; } { @@ -586,7 +574,7 @@ in { { name = "pdo_pgsql"; internalDeps = [ php.extensions.pdo ]; - configureFlags = [ "--with-pdo-pgsql=${postgresql}" ]; + configureFlags = [ "--with-pdo-pgsql=${lib.getDev postgresql}" ]; doCheck = false; } { @@ -599,7 +587,7 @@ in { { name = "pgsql"; buildInputs = [ pcre2 ]; - configureFlags = [ "--with-pgsql=${postgresql}" ]; + configureFlags = [ "--with-pgsql=${lib.getDev postgresql}" ]; doCheck = false; } { name = "posix"; doCheck = false; } @@ -652,18 +640,6 @@ in { url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) - ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [ - # Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+ - (fetchpatch { - url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1"; - hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; - }) - ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [ - (fetchpatch { - url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1"; - hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k="; - excludes = [ "NEWS" ]; - }) ]; } { @@ -671,7 +647,7 @@ in { buildInputs = [ net-snmp openssl ]; configureFlags = [ "--with-snmp" ]; # net-snmp doesn't build on darwin. - enable = (!stdenv.isDarwin); + enable = (!stdenv.hostPlatform.isDarwin); doCheck = false; } { @@ -680,7 +656,10 @@ in { configureFlags = [ "--enable-soap" ]; - doCheck = stdenv.isDarwin; # TODO: a couple tests still fail on *-linux + # Some tests are causing issues in the Darwin sandbox with issues + # such as + # Unknown: php_network_getaddresses: getaddrinfo for localhost failed: nodename nor servname provided + doCheck = !stdenv.hostPlatform.isDarwin; internalDeps = [ php.extensions.session ]; patches = lib.optionals (lib.versions.majorMinor php.version == "8.1") [ # Fix tests with libxml2 2.12 @@ -699,18 +678,6 @@ in { url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) - ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [ - # Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+ - (fetchpatch { - url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1"; - hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; - }) - ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [ - (fetchpatch { - url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1"; - hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k="; - excludes = [ "NEWS" ]; - }) ]; } { @@ -725,7 +692,7 @@ in { # The `sqlite3_bind_bug68849.phpt` test is currently broken for i686 Linux systems since sqlite 3.43, cf.: # - https://github.com/php/php-src/issues/12076 # - https://www.sqlite.org/forum/forumpost/abbb95376ec6cd5f - patches = lib.optionals (stdenv.isi686 && stdenv.isLinux) [ + patches = lib.optionals (stdenv.hostPlatform.isi686 && stdenv.hostPlatform.isLinux) [ ../development/interpreters/php/skip-sqlite3_bind_bug68849.phpt.patch ]; } @@ -761,18 +728,6 @@ in { url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) - ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [ - # Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+ - (fetchpatch { - url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1"; - hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; - }) - ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [ - (fetchpatch { - url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1"; - hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k="; - excludes = [ "NEWS" ]; - }) ]; } { @@ -808,18 +763,6 @@ in { url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) - ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [ - # Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+ - (fetchpatch { - url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1"; - hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; - }) - ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [ - (fetchpatch { - url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1"; - hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k="; - excludes = [ "NEWS" ]; - }) ]; } { diff --git a/pkgs/top-level/pkg-config/tests.nix b/pkgs/top-level/pkg-config/tests.nix index 786e2ecc534b8..dbf766a0cf267 100644 --- a/pkgs/top-level/pkg-config/tests.nix +++ b/pkgs/top-level/pkg-config/tests.nix @@ -1,6 +1,6 @@ # cd nixpkgs # nix-build -A tests.pkg-config -{ lib, stdenv, ... }: +{ lib, config, stdenv, ... }: let # defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform @@ -10,7 +10,7 @@ let allPkgs = import ../default.nix { system = stdenv.hostPlatform.system; localSystem = stdenv.buildPlatform.system; - config = { + config = config // { allowUnsupportedSystem = true; }; overlays = []; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index bcaa0b0023deb..1d977c4bd5200 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -60,6 +60,7 @@ mapAliases ({ asyncio-mqtt = throw "asyncio-mqtt has been replaced by aiomqtt, which is not API compatible."; # added 2024-07-07 asyncio-nats-client = nats-py; # added 2022-02-08 atsim_potentials = atsim-potentials; # added 2023-10-08 + inherit (super.pkgs) autotrash; # added 2024-09-23 awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 Babel = babel; # added 2022-05-06 backports_csv = throw "backports_csv has been removed, since we no longer need to backport to python2"; # added 2023-07-28 @@ -73,8 +74,10 @@ mapAliases ({ bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 bip_utils = bip-utils; # 2023-10-08 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 + blessings = throw "blessings has been removed in favor of blessed, as it was unmaintained"; # added 2024-08-20 BlinkStick = blinkstick; # added 2023-02-19 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 + boto = throw "boto was removed as it is deprecated upstream, had not been updated since 2018, and failed to build; please use boto3 and botocore"; # Added 2024-09-22 bsblan = python-bsblan; # added 2022-11-04 btchip = btchip-python; # added 2023-03-03 buildbot = throw "use pkgs.buildbot instead"; # added 2022-04-07 @@ -98,6 +101,7 @@ mapAliases ({ chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 class-registry = phx-class-registry; # added 2021-10-05 + cirq-ft = throw "cirq-ft is not longer provieded by cirq upstream"; # added 2024-08-31 cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20 clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 @@ -218,6 +222,7 @@ mapAliases ({ fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04 garminconnect-ha = garminconnect; # added 2022-02-05 + gcs-oauth2-boto-plugin = throw "gcs-oauth2-boto-plugin was removed as it depends on the removed boto package"; # Added 2024-09-22 gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute name: `pkgs.gdtoolkit`"; # added 2023-02-15 GeoIP = geoip; # added 2023-02-19 gigalixir = throw "gigalixir has been promoted to a top-level attribute name: `pkgs.gigalixir`"; # Added 2022-10-02 @@ -277,11 +282,13 @@ mapAliases ({ jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28 jupyter_client = jupyter-client; # added 2021-10-15 jupyter_console = jupyter-console; # added 2023-07-31 + jupyter-contrib-nbextensions = throw "jupyter-contrib-nbextensions has been removed, as it does not work with Jupyter Notebook 7"; # added 2024-09-22 jupyter_core = jupyter-core; # added 2023-01-05 jupyter_server = jupyter-server; # added 2023-01-05 jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18 jupyterlab_launcher = throw "jupyterlab_launcher has been removed as it's abandoned for over 5 years and broken"; # added 2023-11-11 jupyterlab_server = jupyterlab-server; # added 2023-11-12 + kafka-python = kafka-python-ng; # added 2024-07-19 Kajiki = kajiki; # added 2023-02-19 keepkey_agent = keepkey-agent; # added 2024-01-06 Keras = keras; # added 2021-11-25 @@ -317,6 +324,7 @@ mapAliases ({ mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29 mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29 manticore = throw "manticore has been removed because its dependency wasm no longer builds and is unmaintained"; # added 2023-05-20 + mapbox = throw "mapbox has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04 marshmallow-enum = throw "marshmallow-enum has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10 markerlib = throw "markerlib has been removed because it's abandoned since 2013"; # added 2023-05-19 memory_profiler = memory-profiler; # added 2023-10-09 @@ -330,7 +338,15 @@ mapAliases ({ mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01 multi_key_dict = multi-key-dict; # added 2023-11-05 mutmut = throw "mutmut has been promoted to a top-level attribute name: `pkgs.mutmut`"; # added 2022-10-02 + n3fit = throw "n3fit has been removed since it relies on a dependency that was removed"; # added 2024-08-24 nbmerge = throw "nbmerge has moved to pkgs.nbmerge"; # added 2024-07-05 + mypy-boto3-alexaforbusiness = throw "mypy-boto3-alexaforbusiness was removed because it is unmaintained"; # added 2024-09-04 + mypy-boto3-backupstorage = throw "mypy-boto3-backupstorage was removed because it is unmaintained"; # added 2024-09-04 + mypy-boto3-gamesparks = throw "mypy-boto3-gamesparks was removed because it is unmaintained"; # added 2024-09-04 + mypy-boto3-honeycode = throw "mypy-boto3-honeycode was removed because it is unmaintained"; # added 2024-09-04 + mypy-boto3-iot-roborunner = throw "mypy-boto3-iot-roborunner was removed because it is unmaintained"; # added 2024-09-04 + mypy-boto3-macie = throw "mypy-boto3-macie was removed because it is unmaintained"; # added 2024-09-04 + mypy-boto3-mobile = throw "mypy-boto3-mobile was removed because it is unmaintained"; # added 2024-09-04 net2grid = gridnet; # add 2022-04-22 nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08 ninja-python = ninja; # add 2022-08-03 @@ -459,8 +475,11 @@ mapAliases ({ pyruckus = throw "pyruckus has been removed, it was deprecrated in favor of aioruckus."; # added 2023-09-07 py_scrypt = py-scrypt; # added 2024-01-07 pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20 + pysimplegui = throw "pysimplegui update to v5 broke the package, it now needs a license key to decrypt the source code"; # added 2024-09-16 pysmart-smartx = pysmart; # added 2021-10-22 pySmartDL = pysmartdl; # added 2023-10-11 + pysmi-lextudio = pysmi; # added 2024-07-18 + pysnmp-lextudio = pysnmp; # added 2024-07-18 pysparse = throw "pysparse has been abandoned upstream."; # added 2023-02-28 pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 PyStemmer = pystemmer; # added 2023-02-19 @@ -471,6 +490,7 @@ mapAliases ({ pytest-pep8 = pytestpep8; # added 2021-01-04 pytest-pep257 = throw "pytest-pep257 was removed, as the pep257 package was migrated into pycodestyle"; # added 2022-04-12 pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09 + pytest-runner = throw "pytest-runner has been removed as it uses deprecated features of setuptools and is deprecated by upstream"; # added 2024-09-15 pytest-sanic = throw "pytest-sanic has been removed because it is unmaintained and broken"; # added 2023-06-22 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 @@ -498,13 +518,16 @@ mapAliases ({ pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30 pytwitchapi = twitchapi; # added 2022-03-07 pyuavcan = throw "pyuavcan has been renamed to pycyphal and the old package deprecated, use pycyphal instead"; # added 2024-02-09 + pyunifiprotect = throw "pyunifiprotect has disappeared from GitHub and PyPI, use uiprotect instead"; # added 2024-09-17 pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28 pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19 + pyvicare = pyvicare-neo; # added 2024-08-31 PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19 pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01 pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05 pyzufall = throw "pyzufall was removed, because it is no longer maintained"; # added 2024-05-14 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + qds-sdk = throw "qds-sdk was removed as it is unmaintained upstream and depends on the removed boto package"; # Added 2024-09-22 qds_sdk = qds-sdk; # added 2023-10-21 Quandl = quandl; # added 2023-02-19 querystring_parser = querystring-parser; # added 2024-01-07 @@ -521,6 +544,7 @@ mapAliases ({ recursivePthLoader = recursive-pth-loader; # added 2024-01-07 rednose = throw "rednose is no longer maintained (since February 2018)"; # added 2023-08-06 repeated_test = repeated-test; # added 2022-11-15 + reportengine = throw "reportengine has been removed, since it is unmaintained and broken"; # added 2024-08-21 repoze_lru = repoze-lru; # added 2023-11-11 repoze_sphinx_autointerface = repoze-sphinx-autointerface; # added 2023-11-11 repoze_who = repoze-who; # added 2023-11-11 @@ -534,6 +558,7 @@ mapAliases ({ rig = throw "rig has been removed because it was pinned to python 2.7 and 3.5, failed to build and is otherwise unmaintained"; # added 2022-11-28 rl-coach = "rl-coach was removed because the project is discontinued and was archived by upstream"; # added 2023-05-03 roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 + ronin = throw "ronin has been removed because it was unmaintained since 2018"; # added 2024-08-21 ROPGadget = ropgadget; # added 2021-07-06 rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 ruamel_base = ruamel-base; # added 2021-11-01 @@ -546,6 +571,7 @@ mapAliases ({ sapi-python-client = kbcstorage; # added 2022-04-20 scikitimage = scikit-image; # added 2023-05-14 scikitlearn = scikit-learn; # added 2021-07-21 + scikit-optimize = throw "scikit-optimize has been removed because it is abandoned"; # added 2024-09-30 scikits-samplerate = throw "scikits-samplerate has been removed, it was unsed and unmaintained since 2015"; # added 2024-05-23 selectors2 = throw "selectors2 has been removed: archived by upstream."; # added 2024-07-27 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 @@ -626,6 +652,7 @@ mapAliases ({ urwid-mitmproxy-mitmproxy = throw "urwid-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-07-26 uuid = throw "uuid is a Python standard module"; # added 2024-04-18 validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07 + validphys2 = throw "validphys2 has been removed, since it had a broken dependency that was removed"; # added 2023-07-07 vega_datasets = vega-datasets; # added 2023-11-04 ViennaRNA = viennarna; # added 2023-08-23 virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36dcac04277e6..796b68fc8a0f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -207,6 +207,8 @@ self: super: with self; { aiodocker = callPackage ../development/python-modules/aiodocker { }; + aiodukeenergy = callPackage ../development/python-modules/aiodukeenergy { }; + aioeafm = callPackage ../development/python-modules/aioeafm { }; aioeagle = callPackage ../development/python-modules/aioeagle { }; @@ -239,6 +241,8 @@ self: super: with self; { aioharmony = callPackage ../development/python-modules/aioharmony { }; + aiohasupervisor = callPackage ../development/python-modules/aiohasupervisor { }; + aiohomekit = callPackage ../development/python-modules/aiohomekit { }; aiohttp = callPackage ../development/python-modules/aiohttp { }; @@ -269,6 +273,8 @@ self: super: with self; { aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; + aiohttp-sse-client2 = callPackage ../development/python-modules/aiohttp-sse-client2 { }; + aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; aiohttp-wsgi = callPackage ../development/python-modules/aiohttp-wsgi { }; @@ -441,6 +447,8 @@ self: super: with self; { aiostream = callPackage ../development/python-modules/aiostream { }; + aiostreammagic = callPackage ../development/python-modules/aiostreammagic { }; + aioswitcher = callPackage ../development/python-modules/aioswitcher { }; aiosyncthing = callPackage ../development/python-modules/aiosyncthing { }; @@ -515,6 +523,11 @@ self: super: with self; { algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; + aligator = toPythonModule (pkgs.aligator.override { + python3Packages = self; + pythonSupport = true; + }); + alive-progress = callPackage ../development/python-modules/alive-progress { }; aliyun-python-sdk-cdn = callPackage ../development/python-modules/aliyun-python-sdk-cdn { }; @@ -673,6 +686,8 @@ self: super: with self; { apcaccess = callPackage ../development/python-modules/apcaccess { }; + apeye-core = callPackage ../development/python-modules/apeye-core { }; + apipkg = callPackage ../development/python-modules/apipkg { }; apischema = callPackage ../development/python-modules/apischema { }; @@ -889,6 +904,8 @@ self: super: with self; { asyncarve = callPackage ../development/python-modules/asyncarve { }; + async-cache = callPackage ../development/python-modules/async-cache { }; + async-dns = callPackage ../development/python-modules/async-dns { }; async-generator = callPackage ../development/python-modules/async-generator { }; @@ -1035,8 +1052,6 @@ self: super: with self; { autoslot = callPackage ../development/python-modules/autoslot { }; - autotrash = callPackage ../development/python-modules/autotrash { }; - avahi = toPythonModule (pkgs.avahi.override { inherit python; withPython = true; @@ -1094,6 +1109,8 @@ self: super: with self; { awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { }; + awsiotsdk = callPackage ../development/python-modules/awsiotsdk { }; + awsipranges = callPackage ../development/python-modules/awsipranges { }; awslambdaric = callPackage ../development/python-modules/awslambdaric { }; @@ -1106,6 +1123,8 @@ self: super: with self; { axisregistry = callPackage ../development/python-modules/axisregistry { }; + ayla-iot-unofficial = callPackage ../development/python-modules/ayla-iot-unofficial { }; + azure-appconfiguration = callPackage ../development/python-modules/azure-appconfiguration { }; azure-applicationinsights = callPackage ../development/python-modules/azure-applicationinsights { }; @@ -1485,6 +1504,8 @@ self: super: with self; { bbox = callPackage ../development/python-modules/bbox { }; + bcc = toPythonModule (pkgs.bcc.override { python3Packages = self; }); + bc-detect-secrets = callPackage ../development/python-modules/bc-detect-secrets { }; bc-jsonpath-ng = callPackage ../development/python-modules/bc-jsonpath-ng { }; @@ -1648,10 +1669,16 @@ self: super: with self; { black = callPackage ../development/python-modules/black { }; + blacken-docs = callPackage ../development/python-modules/blacken-docs { }; + blackjax = callPackage ../development/python-modules/blackjax { }; black-macchiato = callPackage ../development/python-modules/black-macchiato { }; + blackrenderer = callPackage ../development/python-modules/blackrenderer { }; + + blake3 = callPackage ../development/python-modules/blake3 { }; + bleach = callPackage ../development/python-modules/bleach { }; bleach-allowlist = callPackage ../development/python-modules/bleach-allowlist { }; @@ -1668,8 +1695,6 @@ self: super: with self; { blessed = callPackage ../development/python-modules/blessed { }; - blessings = callPackage ../development/python-modules/blessings { }; - blinker = callPackage ../development/python-modules/blinker { }; blinkpy = callPackage ../development/python-modules/blinkpy { }; @@ -1769,8 +1794,6 @@ self: super: with self; { boto3-stubs = callPackage ../development/python-modules/boto3-stubs { }; - boto = callPackage ../development/python-modules/boto { }; - botocore = callPackage ../development/python-modules/botocore { }; botocore-stubs = callPackage ../development/python-modules/botocore-stubs { }; @@ -1891,6 +1914,10 @@ self: super: with self; { buildcatrust = callPackage ../development/python-modules/buildcatrust { }; + bump2version = callPackage ../development/python-modules/bump2version { }; + + bumpfontversion = callPackage ../development/python-modules/bumpfontversion { }; + bumps = callPackage ../development/python-modules/bumps { }; bunch = callPackage ../development/python-modules/bunch { }; @@ -2029,7 +2056,7 @@ self: super: with self; { cattrs = callPackage ../development/python-modules/cattrs { }; - cbeams = callPackage ../misc/cbeams { }; + causal-conv1d = callPackage ../development/python-modules/causal-conv1d { }; cbor2 = callPackage ../development/python-modules/cbor2 { }; @@ -2071,6 +2098,8 @@ self: super: with self; { commitizen = callPackage ../development/python-modules/commitizen { }; + consolekit = callPackage ../development/python-modules/consolekit { }; + connect-box = callPackage ../development/python-modules/connect-box { }; connection-pool = callPackage ../development/python-modules/connection-pool { }; @@ -2219,8 +2248,6 @@ self: super: with self; { cirq-core = callPackage ../development/python-modules/cirq-core { }; - cirq-ft = callPackage ../development/python-modules/cirq-ft { }; - cirq-ionq = callPackage ../development/python-modules/cirq-ionq { }; cirq-google = callPackage ../development/python-modules/cirq-google { }; @@ -2259,6 +2286,8 @@ self: super: with self; { cleanlab = callPackage ../development/python-modules/cleanlab { }; + cleanvision = callPackage ../development/python-modules/cleanvision { }; + cleo = callPackage ../development/python-modules/cleo { }; clevercsv = callPackage ../development/python-modules/clevercsv { }; @@ -2363,6 +2392,8 @@ self: super: with self; { cloup = callPackage ../development/python-modules/cloup { }; + cltk = callPackage ../development/python-modules/cltk { }; + clustershell = callPackage ../development/python-modules/clustershell { }; cma = callPackage ../development/python-modules/cma { }; @@ -2415,6 +2446,8 @@ self: super: with self; { colander = callPackage ../development/python-modules/colander { }; + colbert-ai = callPackage ../development/python-modules/colbert-ai { }; + collections-extended = callPackage ../development/python-modules/collections-extended { }; collidoscope = callPackage ../development/python-modules/collidoscope { }; @@ -2503,6 +2536,8 @@ self: super: with self; { confuse = callPackage ../development/python-modules/confuse { }; + confusable-homoglyphs = callPackage ../development/python-modules/confusable-homoglyphs { }; + confight = callPackage ../development/python-modules/confight { }; connexion = callPackage ../development/python-modules/connexion { }; @@ -2698,6 +2733,8 @@ self: super: with self; { ctranslate2-cpp = pkgs.ctranslate2; }; + ctypesgen = callPackage ../development/python-modules/ctypesgen { }; + cu2qu = callPackage ../development/python-modules/cu2qu { }; customtkinter = callPackage ../development/python-modules/customtkinter { }; @@ -2753,6 +2790,8 @@ self: super: with self; { cxxheaderparser = callPackage ../development/python-modules/cxxheaderparser { }; + cybox = callPackage ../development/python-modules/cybox { }; + cycler = callPackage ../development/python-modules/cycler { }; cyclonedx-python-lib = callPackage ../development/python-modules/cyclonedx-python-lib { }; @@ -3067,6 +3106,8 @@ self: super: with self; { deprecation = callPackage ../development/python-modules/deprecation { }; + deprecation-alias = callPackage ../development/python-modules/deprecation-alias { }; + derpconf = callPackage ../development/python-modules/derpconf { }; desktop-entry-lib = callPackage ../development/python-modules/desktop-entry-lib { }; @@ -3117,6 +3158,8 @@ self: super: with self; { diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + diffenator2 = callPackage ../development/python-modules/diffenator2 { }; + diffimg = callPackage ../development/python-modules/diffimg { }; diffsync = callPackage ../development/python-modules/diffsync { }; @@ -3217,6 +3260,8 @@ self: super: with self; { dissononce = callPackage ../development/python-modules/dissononce { }; + dist-meta = callPackage ../development/python-modules/dist-meta { }; + distlib = callPackage ../development/python-modules/distlib { }; distorm3 = callPackage ../development/python-modules/distorm3 { }; @@ -3471,6 +3516,8 @@ self: super: with self; { django-reversion = callPackage ../development/python-modules/django-reversion { }; + djangosaml2 = callPackage ../development/python-modules/djangosaml2 { }; + django-sekizai = callPackage ../development/python-modules/django-sekizai { }; django-sesame = callPackage ../development/python-modules/django-sesame { }; @@ -3627,6 +3674,10 @@ self: super: with self; { dokuwiki = callPackage ../development/python-modules/dokuwiki { }; + dom-toml = callPackage ../development/python-modules/dom-toml { }; + + domdf-python-tools = callPackage ../development/python-modules/domdf-python-tools { }; + domeneshop = callPackage ../development/python-modules/domeneshop { }; dominate = callPackage ../development/python-modules/dominate { }; @@ -4340,6 +4391,8 @@ self: super: with self; { fiblary3-fork = callPackage ../development/python-modules/fiblary3-fork { }; + fickling = callPackage ../development/python-modules/fickling { }; + fido2 = callPackage ../development/python-modules/fido2 { }; fields = callPackage ../development/python-modules/fields { }; @@ -4832,8 +4885,6 @@ self: super: with self; { gcovr = callPackage ../development/python-modules/gcovr { }; - gcs-oauth2-boto-plugin = callPackage ../development/python-modules/gcs-oauth2-boto-plugin { }; - gcsa = callPackage ../development/python-modules/gcsa { }; gcsfs = callPackage ../development/python-modules/gcsfs { }; @@ -4941,6 +4992,12 @@ self: super: with self; { georss-wa-dfes-client = callPackage ../development/python-modules/georss-wa-dfes-client { }; + gepetto-gui = toPythonModule (gepetto-viewer.withPlugins [ gepetto-viewer-corba ]); + + gepetto-viewer-corba = toPythonModule (pkgs.gepetto-viewer-corba.override { python3Packages = self; }); + + gepetto-viewer = toPythonModule (pkgs.gepetto-viewer.override { python3Packages = self; }); + gerbonara = callPackage ../development/python-modules/gerbonara { }; getjump = callPackage ../development/python-modules/getjump { }; @@ -4971,6 +5028,8 @@ self: super: with self; { gfsubsets = callPackage ../development/python-modules/gfsubsets { }; + gftools = callPackage ../development/python-modules/gftools { }; + gguf = callPackage ../development/python-modules/gguf { }; ghapi = callPackage ../development/python-modules/ghapi { }; @@ -5057,6 +5116,8 @@ self: super: with self; { enablePython = true; }); + gmqtt = callPackage ../development/python-modules/gmqtt { }; + gntp = callPackage ../development/python-modules/gntp { }; gnureadline = callPackage ../development/python-modules/gnureadline { }; @@ -5209,6 +5270,8 @@ self: super: with self; { google-nest-sdm = callPackage ../development/python-modules/google-nest-sdm { }; + google-photos-library-api = callPackage ../development/python-modules/google-photos-library-api { }; + googlemaps = callPackage ../development/python-modules/googlemaps { }; google-pasta = callPackage ../development/python-modules/google-pasta { }; @@ -5334,8 +5397,12 @@ self: super: with self; { greatfet = callPackage ../development/python-modules/greatfet { }; + great-tables = callPackage ../development/python-modules/great-tables { }; + greeclimate = callPackage ../development/python-modules/greeclimate { }; + greek-accentuation = callPackage ../development/python-modules/greek-accentuation { }; + green = callPackage ../development/python-modules/green { }; greeneye-monitor = callPackage ../development/python-modules/greeneye-monitor { }; @@ -5499,8 +5566,16 @@ self: super: with self; { hankel = callPackage ../development/python-modules/hankel { }; + handy-archives = callPackage ../development/python-modules/handy-archives { }; + hap-python = callPackage ../development/python-modules/hap-python { }; + harlequin-bigquery = callPackage ../development/python-modules/harlequin-bigquery { }; + + harlequin-postgres = callPackage ../development/python-modules/harlequin-postgres { }; + + hass-client = callPackage ../development/python-modules/hass-client { }; + hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; hass-splunk = callPackage ../development/python-modules/hass-splunk { }; @@ -5579,6 +5654,8 @@ self: super: with self; { hfst = callPackage ../development/python-modules/hfst { }; + hf-transfer = callPackage ../development/python-modules/hf-transfer { }; + hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { }; hg-evolve = callPackage ../development/python-modules/hg-evolve { }; @@ -6008,6 +6085,8 @@ self: super: with self; { inequality = callPackage ../development/python-modules/inequality { }; + inference-gym = callPackage ../development/python-modules/inference-gym { }; + infinity = callPackage ../development/python-modules/infinity { }; inflect = callPackage ../development/python-modules/inflect { }; @@ -6202,6 +6281,12 @@ self: super: with self; { itanium-demangler = callPackage ../development/python-modules/itanium-demangler { }; + itk = toPythonModule (pkgs.itk.override { + inherit python numpy; + enablePython = true; + }); + + item-synchronizer = callPackage ../development/python-modules/item-synchronizer { }; itemadapter = callPackage ../development/python-modules/itemadapter { }; @@ -6497,8 +6582,6 @@ self: super: with self; { jupyter-contrib-core = callPackage ../development/python-modules/jupyter-contrib-core { }; - jupyter-contrib-nbextensions = callPackage ../development/python-modules/jupyter-contrib-nbextensions { }; - jupyter-console = callPackage ../development/python-modules/jupyter-console { }; jupyter-core = callPackage ../development/python-modules/jupyter-core { }; @@ -6586,8 +6669,6 @@ self: super: with self; { kaa-metadata = callPackage ../development/python-modules/kaa-metadata { }; - kafka-python = callPackage ../development/python-modules/kafka-python { }; - kafka-python-ng = callPackage ../development/python-modules/kafka-python-ng { }; kaggle = callPackage ../development/python-modules/kaggle { }; @@ -6598,6 +6679,8 @@ self: super: with self; { kaldi-active-grammar = callPackage ../development/python-modules/kaldi-active-grammar { }; + kaleido = callPackage ../development/python-modules/kaleido { }; + kanidm = callPackage ../development/python-modules/kanidm { }; kaptan = callPackage ../development/python-modules/kaptan { }; @@ -6778,6 +6861,8 @@ self: super: with self; { langchain-mongodb = callPackage ../development/python-modules/langchain-mongodb { }; + langchain-ollama = callPackage ../development/python-modules/langchain-ollama { }; + langchain-openai = callPackage ../development/python-modules/langchain-openai { }; langchain-standard-tests = callPackage ../development/python-modules/langchain-standard-tests { }; @@ -6829,6 +6914,8 @@ self: super: with self; { latexify-py = callPackage ../development/python-modules/latexify-py { }; + latexrestricted = callPackage ../development/python-modules/latexrestricted { }; + launchpadlib = callPackage ../development/python-modules/launchpadlib { }; laundrify-aio = callPackage ../development/python-modules/laundrify-aio { }; @@ -6857,12 +6944,16 @@ self: super: with self; { lcgit = callPackage ../development/python-modules/lcgit { }; + lcn-frontend = callPackage ../development/python-modules/lcn-frontend { }; + lcov-cobertura = callPackage ../development/python-modules/lcov-cobertura { }; ld2410-ble = callPackage ../development/python-modules/ld2410-ble { }; ldap3 = callPackage ../development/python-modules/ldap3 { }; + ldap3-bleeding-edge = callPackage ../development/python-modules/ldap3-bleeding-edge { }; + ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { }; ldappool = callPackage ../development/python-modules/ldappool { }; @@ -6902,6 +6993,8 @@ self: super: with self; { igraph-c = pkgs.igraph; }; + lektricowifi = callPackage ../development/python-modules/lektricowifi { }; + leveldb = callPackage ../development/python-modules/leveldb { }; levenshtein = callPackage ../development/python-modules/levenshtein { }; @@ -7057,6 +7150,10 @@ self: super: with self; { libsavitar = callPackage ../development/python-modules/libsavitar { }; + libsbml = toPythonModule (pkgs.libsbml.override { + withPython = true; + inherit (self) python; + }); libsixel = callPackage ../development/python-modules/libsixel { inherit (pkgs) libsixel; @@ -7151,6 +7248,8 @@ self: super: with self; { linear-operator = callPackage ../development/python-modules/linear-operator { }; + lineax = callPackage ../development/python-modules/lineax { }; + linecache2 = callPackage ../development/python-modules/linecache2 { }; lineedit = callPackage ../development/python-modules/lineedit { }; @@ -7352,6 +7451,8 @@ self: super: with self; { lomond = callPackage ../development/python-modules/lomond { }; + loompy = callPackage ../development/python-modules/loompy { }; + loopy = callPackage ../development/python-modules/loopy { }; looseversion = callPackage ../development/python-modules/looseversion { }; @@ -7432,8 +7533,12 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; }; + macholib = callPackage ../development/python-modules/macholib { }; + macropy = callPackage ../development/python-modules/macropy { }; + maec = callPackage ../development/python-modules/maec { }; + maestral = callPackage ../development/python-modules/maestral { }; magic = callPackage ../development/python-modules/magic { }; @@ -7482,6 +7587,8 @@ self: super: with self; { malduck = callPackage ../development/python-modules/malduck { }; + mamba-ssm = callPackage ../development/python-modules/mamba-ssm { }; + managesieve = callPackage ../development/python-modules/managesieve { }; mando = callPackage ../development/python-modules/mando { }; @@ -7512,8 +7619,6 @@ self: super: with self; { manuf = callPackage ../development/python-modules/manuf { }; - mapbox = callPackage ../development/python-modules/mapbox { }; - mapbox-earcut = callPackage ../development/python-modules/mapbox-earcut { }; mapclassify = callPackage ../development/python-modules/mapclassify { }; @@ -7579,7 +7684,7 @@ self: super: with self; { matlink-gpapi = callPackage ../development/python-modules/matlink-gpapi { }; matplotlib = callPackage ../development/python-modules/matplotlib { - stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; ghostscript = pkgs.ghostscript_headless; }; @@ -7645,6 +7750,7 @@ self: super: with self; { mdformat-footnote = callPackage ../development/python-modules/mdformat-footnote { }; mdformat-frontmatter = callPackage ../development/python-modules/mdformat-frontmatter { }; mdformat-gfm = callPackage ../development/python-modules/mdformat-gfm { }; + mdformat-gfm-alerts = callPackage ../development/python-modules/mdformat-gfm-alerts { }; mdformat-mkdocs = callPackage ../development/python-modules/mdformat-mkdocs { }; mdformat-nix-alejandra = callPackage ../development/python-modules/mdformat-nix-alejandra { }; mdformat-simple-breaks = callPackage ../development/python-modules/mdformat-simple-breaks { }; @@ -7754,6 +7860,8 @@ self: super: with self; { meteofrance-api = callPackage ../development/python-modules/meteofrance-api { }; + meteoswiss-async = callPackage ../development/python-modules/meteoswiss-async { }; + methodtools = callPackage ../development/python-modules/methodtools { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; @@ -7861,6 +7969,8 @@ self: super: with self; { mitogen = callPackage ../development/python-modules/mitogen { }; + mixbox = callPackage ../development/python-modules/mixbox { }; + mixins = callPackage ../development/python-modules/mixins { }; mixpanel = callPackage ../development/python-modules/mixpanel { }; @@ -7914,6 +8024,8 @@ self: super: with self; { mkl-service = callPackage ../development/python-modules/mkl-service { }; + mktestdocs = callPackage ../development/python-modules/mktestdocs { }; + ml-collections = callPackage ../development/python-modules/ml-collections { }; ml-dtypes = callPackage ../development/python-modules/ml-dtypes { }; @@ -8122,6 +8234,8 @@ self: super: with self; { msldap = callPackage ../development/python-modules/msldap { }; + msmart-ng = callPackage ../development/python-modules/msmart-ng { }; + msoffcrypto-tool = callPackage ../development/python-modules/msoffcrypto-tool { }; msprime = callPackage ../development/python-modules/msprime { }; @@ -8221,717 +8335,354 @@ self: super: with self; { mypy-boto3-builder = callPackage ../development/python-modules/mypy-boto3-builder { }; inherit (callPackage ../development/python-modules/mypy-boto3 { }) - mypy-boto3-accessanalyzer - mypy-boto3-account - mypy-boto3-acm - mypy-boto3-acm-pca - - mypy-boto3-alexaforbusiness - mypy-boto3-amp - mypy-boto3-amplify - mypy-boto3-amplifybackend - mypy-boto3-amplifyuibuilder - mypy-boto3-apigateway - mypy-boto3-apigatewaymanagementapi - mypy-boto3-apigatewayv2 - mypy-boto3-appconfig - mypy-boto3-appconfigdata - mypy-boto3-appfabric - mypy-boto3-appflow - mypy-boto3-appintegrations - mypy-boto3-application-autoscaling - mypy-boto3-application-insights - mypy-boto3-applicationcostprofiler - mypy-boto3-appmesh - mypy-boto3-apprunner - mypy-boto3-appstream - mypy-boto3-appsync - mypy-boto3-arc-zonal-shift - mypy-boto3-athena - mypy-boto3-auditmanager - mypy-boto3-autoscaling - mypy-boto3-autoscaling-plans - mypy-boto3-backup - mypy-boto3-backup-gateway - - mypy-boto3-backupstorage - mypy-boto3-batch - mypy-boto3-billingconductor - mypy-boto3-braket - mypy-boto3-budgets - mypy-boto3-ce - mypy-boto3-chime - mypy-boto3-chime-sdk-identity - mypy-boto3-chime-sdk-media-pipelines - mypy-boto3-chime-sdk-meetings - mypy-boto3-chime-sdk-messaging - mypy-boto3-chime-sdk-voice - mypy-boto3-cleanrooms - mypy-boto3-cloud9 - mypy-boto3-cloudcontrol - mypy-boto3-clouddirectory - mypy-boto3-cloudformation - mypy-boto3-cloudfront - mypy-boto3-cloudhsm - mypy-boto3-cloudhsmv2 - mypy-boto3-cloudsearch - mypy-boto3-cloudsearchdomain - mypy-boto3-cloudtrail - mypy-boto3-cloudtrail-data - mypy-boto3-cloudwatch - mypy-boto3-codeartifact - mypy-boto3-codebuild - mypy-boto3-codecatalyst - mypy-boto3-codecommit - mypy-boto3-codedeploy - mypy-boto3-codeguru-reviewer - mypy-boto3-codeguru-security - mypy-boto3-codeguruprofiler - mypy-boto3-codepipeline - mypy-boto3-codestar - mypy-boto3-codestar-connections - mypy-boto3-codestar-notifications - mypy-boto3-cognito-identity - mypy-boto3-cognito-idp - mypy-boto3-cognito-sync - mypy-boto3-comprehend - mypy-boto3-comprehendmedical - mypy-boto3-compute-optimizer - mypy-boto3-config - mypy-boto3-connect - mypy-boto3-connect-contact-lens - mypy-boto3-connectcampaigns - mypy-boto3-connectcases - mypy-boto3-connectparticipant - mypy-boto3-controltower - mypy-boto3-cur - mypy-boto3-customer-profiles - mypy-boto3-databrew - mypy-boto3-dataexchange - mypy-boto3-datapipeline - mypy-boto3-datasync - mypy-boto3-dax - mypy-boto3-detective - mypy-boto3-devicefarm - mypy-boto3-devops-guru - mypy-boto3-directconnect - mypy-boto3-discovery - mypy-boto3-dlm - mypy-boto3-dms - mypy-boto3-docdb - mypy-boto3-docdb-elastic - mypy-boto3-drs - mypy-boto3-ds - mypy-boto3-dynamodb - mypy-boto3-dynamodbstreams - mypy-boto3-ebs - mypy-boto3-ec2 - mypy-boto3-ec2-instance-connect - mypy-boto3-ecr - mypy-boto3-ecr-public - mypy-boto3-ecs - mypy-boto3-efs - mypy-boto3-eks - mypy-boto3-elastic-inference - mypy-boto3-elasticache - mypy-boto3-elasticbeanstalk - mypy-boto3-elastictranscoder - mypy-boto3-elb - mypy-boto3-elbv2 - mypy-boto3-emr - mypy-boto3-emr-containers - mypy-boto3-emr-serverless - mypy-boto3-entityresolution - mypy-boto3-es - mypy-boto3-events - mypy-boto3-evidently - mypy-boto3-finspace - mypy-boto3-finspace-data - mypy-boto3-firehose - mypy-boto3-fis - mypy-boto3-fms - mypy-boto3-forecast - mypy-boto3-forecastquery - mypy-boto3-frauddetector - mypy-boto3-fsx - mypy-boto3-gamelift - - mypy-boto3-gamesparks - mypy-boto3-glacier - mypy-boto3-globalaccelerator - mypy-boto3-glue - mypy-boto3-grafana - mypy-boto3-greengrass - mypy-boto3-greengrassv2 - mypy-boto3-groundstation - mypy-boto3-guardduty - mypy-boto3-health - mypy-boto3-healthlake - - mypy-boto3-honeycode - mypy-boto3-iam - mypy-boto3-identitystore - mypy-boto3-imagebuilder - mypy-boto3-importexport - mypy-boto3-inspector - mypy-boto3-inspector2 - mypy-boto3-internetmonitor - mypy-boto3-iot - mypy-boto3-iot-data - mypy-boto3-iot-jobs-data - - mypy-boto3-iot-roborunner - mypy-boto3-iot1click-devices - mypy-boto3-iot1click-projects - mypy-boto3-iotanalytics - mypy-boto3-iotdeviceadvisor - mypy-boto3-iotevents - mypy-boto3-iotevents-data - mypy-boto3-iotfleethub - mypy-boto3-iotfleetwise - mypy-boto3-iotsecuretunneling - mypy-boto3-iotsitewise - mypy-boto3-iotthingsgraph - mypy-boto3-iottwinmaker - mypy-boto3-iotwireless - mypy-boto3-ivs - mypy-boto3-ivs-realtime - mypy-boto3-ivschat - mypy-boto3-kafka - mypy-boto3-kafkaconnect - mypy-boto3-kendra - mypy-boto3-kendra-ranking - mypy-boto3-keyspaces - mypy-boto3-kinesis - mypy-boto3-kinesis-video-archived-media - mypy-boto3-kinesis-video-media - mypy-boto3-kinesis-video-signaling - mypy-boto3-kinesis-video-webrtc-storage - mypy-boto3-kinesisanalytics - mypy-boto3-kinesisanalyticsv2 - mypy-boto3-kinesisvideo - mypy-boto3-kms - mypy-boto3-lakeformation - mypy-boto3-lambda - mypy-boto3-lex-models - mypy-boto3-lex-runtime - mypy-boto3-lexv2-models - mypy-boto3-lexv2-runtime - mypy-boto3-license-manager - mypy-boto3-license-manager-linux-subscriptions - mypy-boto3-license-manager-user-subscriptions - mypy-boto3-lightsail - mypy-boto3-location - mypy-boto3-logs - mypy-boto3-lookoutequipment - mypy-boto3-lookoutmetrics - mypy-boto3-lookoutvision - mypy-boto3-m2 - mypy-boto3-machinelearning - - mypy-boto3-macie - mypy-boto3-macie2 - mypy-boto3-managedblockchain - mypy-boto3-managedblockchain-query - mypy-boto3-marketplace-catalog - mypy-boto3-marketplace-entitlement - mypy-boto3-marketplacecommerceanalytics - mypy-boto3-mediaconnect - mypy-boto3-mediaconvert - mypy-boto3-medialive - mypy-boto3-mediapackage - mypy-boto3-mediapackage-vod - mypy-boto3-mediapackagev2 - mypy-boto3-mediastore - mypy-boto3-mediastore-data - mypy-boto3-mediatailor - mypy-boto3-medical-imaging - mypy-boto3-memorydb - mypy-boto3-meteringmarketplace - mypy-boto3-mgh - mypy-boto3-mgn - mypy-boto3-migration-hub-refactor-spaces - mypy-boto3-migrationhub-config - mypy-boto3-migrationhuborchestrator - mypy-boto3-migrationhubstrategy - - mypy-boto3-mobile - mypy-boto3-mq - mypy-boto3-mturk - mypy-boto3-mwaa - mypy-boto3-neptune - mypy-boto3-neptunedata - mypy-boto3-network-firewall - mypy-boto3-networkmanager - mypy-boto3-nimble - mypy-boto3-oam - mypy-boto3-omics - mypy-boto3-opensearch - mypy-boto3-opensearchserverless - mypy-boto3-opsworks - mypy-boto3-opsworkscm - mypy-boto3-organizations - mypy-boto3-osis - mypy-boto3-outposts - mypy-boto3-panorama - mypy-boto3-payment-cryptography - mypy-boto3-payment-cryptography-data - mypy-boto3-pca-connector-ad - mypy-boto3-personalize - mypy-boto3-personalize-events - mypy-boto3-personalize-runtime - mypy-boto3-pi - mypy-boto3-pinpoint - mypy-boto3-pinpoint-email - mypy-boto3-pinpoint-sms-voice - mypy-boto3-pinpoint-sms-voice-v2 - mypy-boto3-pipes - mypy-boto3-polly - mypy-boto3-pricing - mypy-boto3-privatenetworks - mypy-boto3-proton - mypy-boto3-qldb - mypy-boto3-qldb-session - mypy-boto3-quicksight - mypy-boto3-ram - mypy-boto3-rbin - mypy-boto3-rds - mypy-boto3-rds-data - mypy-boto3-redshift - mypy-boto3-redshift-data - mypy-boto3-redshift-serverless - mypy-boto3-rekognition - mypy-boto3-resiliencehub - mypy-boto3-resource-explorer-2 - mypy-boto3-resource-groups - mypy-boto3-resourcegroupstaggingapi - mypy-boto3-robomaker - mypy-boto3-rolesanywhere - mypy-boto3-route53 - mypy-boto3-route53-recovery-cluster - mypy-boto3-route53-recovery-control-config - mypy-boto3-route53-recovery-readiness - mypy-boto3-route53domains - mypy-boto3-route53resolver - mypy-boto3-rum - mypy-boto3-s3 - mypy-boto3-s3control - mypy-boto3-s3outposts - mypy-boto3-sagemaker - mypy-boto3-sagemaker-a2i-runtime - mypy-boto3-sagemaker-edge - mypy-boto3-sagemaker-featurestore-runtime - mypy-boto3-sagemaker-geospatial - mypy-boto3-sagemaker-metrics - mypy-boto3-sagemaker-runtime - mypy-boto3-savingsplans - mypy-boto3-scheduler - mypy-boto3-schemas - mypy-boto3-sdb - mypy-boto3-secretsmanager - mypy-boto3-securityhub - mypy-boto3-securitylake - mypy-boto3-serverlessrepo - mypy-boto3-service-quotas - mypy-boto3-servicecatalog - mypy-boto3-servicecatalog-appregistry - mypy-boto3-servicediscovery - mypy-boto3-ses - mypy-boto3-sesv2 - mypy-boto3-shield - mypy-boto3-signer - mypy-boto3-simspaceweaver - mypy-boto3-sms - mypy-boto3-sms-voice - mypy-boto3-snow-device-management - mypy-boto3-snowball - mypy-boto3-sns - mypy-boto3-sqs - mypy-boto3-ssm - mypy-boto3-ssm-contacts - mypy-boto3-ssm-incidents - mypy-boto3-ssm-sap - mypy-boto3-sso - mypy-boto3-sso-admin - mypy-boto3-sso-oidc - mypy-boto3-stepfunctions - mypy-boto3-storagegateway - mypy-boto3-sts - mypy-boto3-support - mypy-boto3-support-app - mypy-boto3-swf - mypy-boto3-synthetics - mypy-boto3-textract - mypy-boto3-timestream-query - mypy-boto3-timestream-write - mypy-boto3-tnb - mypy-boto3-transcribe - mypy-boto3-transfer - mypy-boto3-translate - mypy-boto3-verifiedpermissions - mypy-boto3-voice-id - mypy-boto3-vpc-lattice - mypy-boto3-waf - mypy-boto3-waf-regional - mypy-boto3-wafv2 - mypy-boto3-wellarchitected - mypy-boto3-wisdom - mypy-boto3-workdocs - mypy-boto3-worklink - mypy-boto3-workmail - mypy-boto3-workmailmessageflow - mypy-boto3-workspaces - mypy-boto3-workspaces-web - mypy-boto3-xray - ; mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; @@ -8950,8 +8701,6 @@ self: super: with self; { myuplink = callPackage ../development/python-modules/myuplink { }; - n3fit = callPackage ../development/python-modules/n3fit { }; - nad-receiver = callPackage ../development/python-modules/nad-receiver { }; nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; @@ -8974,6 +8723,8 @@ self: super: with self; { nanobind = callPackage ../development/python-modules/nanobind { }; + nanoemoji = callPackage ../development/python-modules/nanoemoji { }; + nanoid = callPackage ../development/python-modules/nanoid { }; nanoleaf = callPackage ../development/python-modules/nanoleaf { }; @@ -9166,6 +8917,8 @@ self: super: with self; { nibe = callPackage ../development/python-modules/nibe { }; + nice-go = callPackage ../development/python-modules/nice-go { }; + nidaqmx = callPackage ../development/python-modules/nidaqmx { }; nikola = callPackage ../development/python-modules/nikola { }; @@ -9282,6 +9035,8 @@ self: super: with self; { inherit (pkgs) notmuch; }; + notobuilder = callPackage ../development/python-modules/notobuilder { }; + nototools = callPackage ../development/python-modules/nototools { }; notus-scanner = callPackage ../development/python-modules/notus-scanner { }; @@ -9362,6 +9117,8 @@ self: super: with self; { python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; + python-qt = toPythonModule (pkgs.python-qt.override { python3 = self.python; }); + python-secp256k1-cardano = callPackage ../development/python-modules/python-secp256k1-cardano { }; python-tds = callPackage ../development/python-modules/python-tds { }; @@ -9384,6 +9141,8 @@ self: super: with self; { py-machineid = callPackage ../development/python-modules/py-machineid { }; + py-ocsf-models = callPackage ../development/python-modules/py-ocsf-models { }; + py-opensonic = callPackage ../development/python-modules/py-opensonic { }; py-radix-sr = callPackage ../development/python-modules/py-radix-sr { }; @@ -9475,6 +9234,10 @@ self: super: with self; { omnilogic = callPackage ../development/python-modules/omnilogic { }; + omniorb = toPythonModule (pkgs.omniorb.override { python3 = self.python; }); + + omniorbpy = callPackage ../development/python-modules/omniorbpy { }; + omorfi = callPackage ../development/python-modules/omorfi { }; omrdatasettools = callPackage ../development/python-modules/omrdatasettools { }; @@ -9669,6 +9432,8 @@ self: super: with self; { optax = callPackage ../development/python-modules/optax { }; + optimistix = callPackage ../development/python-modules/optimistix { }; + optimum = callPackage ../development/python-modules/optimum { }; optree = callPackage ../development/python-modules/optree { }; @@ -9711,6 +9476,10 @@ self: super: with self; { orvibo = callPackage ../development/python-modules/orvibo { }; + oryx = callPackage ../development/python-modules/oryx { }; + + os-client-config = callPackage ../development/python-modules/os-client-config { }; + os-service-types = callPackage ../development/python-modules/os-service-types { }; osc = callPackage ../development/python-modules/osc { }; @@ -9719,6 +9488,8 @@ self: super: with self; { osc-lib = callPackage ../development/python-modules/osc-lib { }; + osc-placement = callPackage ../development/python-modules/osc-placement { }; + osc-sdk-python = callPackage ../development/python-modules/osc-sdk-python { }; oschmod = callPackage ../development/python-modules/oschmod { }; @@ -9757,6 +9528,8 @@ self: super: with self; { ospd = callPackage ../development/python-modules/ospd { }; + osprofiler = callPackage ../development/python-modules/osprofiler { }; + osqp = callPackage ../development/python-modules/osqp { }; oss2 = callPackage ../development/python-modules/oss2 { }; @@ -9789,6 +9562,8 @@ self: super: with self; { packaging = callPackage ../development/python-modules/packaging { }; + packaging-legacy = callPackage ../development/python-modules/packaging-legacy { }; + packbits = callPackage ../development/python-modules/packbits { }; packet-python = callPackage ../development/python-modules/packet-python { }; @@ -9803,6 +9578,8 @@ self: super: with self; { paho-mqtt_2 = callPackage ../development/python-modules/paho-mqtt/default.nix { }; paho-mqtt = paho-mqtt_1; + paintcompiler = callPackage ../development/python-modules/paintcompiler { }; + palace = callPackage ../development/python-modules/palace { }; palettable = callPackage ../development/python-modules/palettable { }; @@ -9819,6 +9596,8 @@ self: super: with self; { panasonic-viera = callPackage ../development/python-modules/panasonic-viera { }; + pandantic = callPackage ../development/python-modules/pandantic { }; + pandas = callPackage ../development/python-modules/pandas { inherit (pkgs.darwin) adv_cmds; }; @@ -9854,6 +9633,8 @@ self: super: with self; { para = callPackage ../development/python-modules/para { }; + paragraphs = callPackage ../development/python-modules/paragraphs { }; + param = callPackage ../development/python-modules/param { }; parameter-expansion-patched = callPackage ../development/python-modules/parameter-expansion-patched { }; @@ -10135,6 +9916,8 @@ self: super: with self; { openapi-core = callPackage ../development/python-modules/openapi-core { }; + opentype-feature-freezer = callPackage ../development/python-modules/opentype-feature-freezer { }; + openusd = callPackage ../development/python-modules/openusd { alembic = pkgs.alembic; }; @@ -10183,6 +9966,8 @@ self: super: with self; { pyproject-hooks = callPackage ../development/python-modules/pyproject-hooks { }; + pyproject-parser = callPackage ../development/python-modules/pyproject-parser { }; + pypsrp = callPackage ../development/python-modules/pypsrp { }; phpserialize = callPackage ../development/python-modules/phpserialize { }; @@ -10333,6 +10118,8 @@ self: super: with self; { proxsuite = toPythonModule (pkgs.proxsuite.override { pythonSupport = true; python3Packages = self; }); + proxsuite-nlp = toPythonModule (pkgs.proxsuite-nlp.override { pythonSupport = true; python3Packages = self; }); + proxy-tools = callPackage ../development/python-modules/proxy-tools { }; proxy-db = callPackage ../development/python-modules/proxy-db { }; @@ -10415,6 +10202,8 @@ self: super: with self; { pyisemail = callPackage ../development/python-modules/pyisemail { }; + pyiskra = callPackage ../development/python-modules/pyiskra { }; + pyisy = callPackage ../development/python-modules/pyisy { }; pyixapi = callPackage ../development/python-modules/pyixapi { }; @@ -10441,6 +10230,8 @@ self: super: with self; { pynotifier = callPackage ../development/python-modules/pynotifier { }; + pynslookup = callPackage ../development/python-modules/pynslookup { }; + pynuki = callPackage ../development/python-modules/pynuki { }; pynut2 = callPackage ../development/python-modules/pynut2 { }; @@ -10507,6 +10298,8 @@ self: super: with self; { pystac = callPackage ../development/python-modules/pystac { }; + pystac-client = callPackage ../development/python-modules/pystac-client { }; + pysubs2 = callPackage ../development/python-modules/pysubs2 { }; pysuez = callPackage ../development/python-modules/pysuez { }; @@ -10523,6 +10316,8 @@ self: super: with self; { pywebcopy = callPackage ../development/python-modules/pywebcopy { }; + python-calamine = callPackage ../development/python-modules/python-calamine { }; + python-can = callPackage ../development/python-modules/python-can { }; python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; @@ -10583,6 +10378,8 @@ self: super: with self; { python-motionmount = callPackage ../development/python-modules/python-motionmount { }; + python-octaviaclient = callPackage ../development/python-modules/python-octaviaclient { }; + python-otbr-api = callPackage ../development/python-modules/python-otbr-api { }; python-openems = callPackage ../development/python-modules/python-openems { }; @@ -10604,6 +10401,8 @@ self: super: with self; { python-tado = callPackage ../development/python-modules/python-tado { }; + python-troveclient = callPackage ../development/python-modules/python-troveclient { }; + python-idzip = callPackage ../development/python-modules/python-idzip { }; pythonfinder = callPackage ../development/python-modules/pythonfinder { }; @@ -10907,12 +10706,16 @@ self: super: with self; { proton-vpn-killswitch-network-manager = callPackage ../development/python-modules/proton-vpn-killswitch-network-manager { }; + proton-vpn-killswitch-network-manager-wireguard = callPackage ../development/python-modules/proton-vpn-killswitch-network-manager-wireguard { }; + proton-vpn-logger = callPackage ../development/python-modules/proton-vpn-logger { }; proton-vpn-network-manager = callPackage ../development/python-modules/proton-vpn-network-manager { }; proton-vpn-network-manager-openvpn = callPackage ../development/python-modules/proton-vpn-network-manager-openvpn { }; + proton-vpn-network-manager-wireguard = callPackage ../development/python-modules/proton-vpn-network-manager-wireguard { }; + proton-vpn-session = callPackage ../development/python-modules/proton-vpn-session { }; protonup-ng = callPackage ../development/python-modules/protonup-ng { }; @@ -10936,7 +10739,7 @@ self: super: with self; { psd-tools = callPackage ../development/python-modules/psd-tools { }; psutil = callPackage ../development/python-modules/psutil { - stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; + stdenv = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; @@ -10945,6 +10748,8 @@ self: super: with self; { psychrolib = callPackage ../development/python-modules/psychrolib { }; psycopg = callPackage ../development/python-modules/psycopg { }; + psycopg-pool = psycopg.pool; + psycopg-c = psycopg.c; psycopg2 = callPackage ../development/python-modules/psycopg2 { }; @@ -12385,8 +12190,6 @@ self: super: with self; { pysim = callPackage ../development/python-modules/pysim { }; - pysimplegui = callPackage ../development/python-modules/pysimplegui { }; - pysingleton = callPackage ../development/python-modules/pysingleton { }; pyslim = callPackage ../development/python-modules/pyslim { }; @@ -12415,18 +12218,16 @@ self: super: with self; { pysmi = callPackage ../development/python-modules/pysmi { }; - pysmi-lextudio = callPackage ../development/python-modules/pysmi-lextudio { }; - pysml = callPackage ../development/python-modules/pysml { }; + pysmlight = callPackage ../development/python-modules/pysmlight { }; + pysmt = callPackage ../development/python-modules/pysmt { }; pysnmp = callPackage ../development/python-modules/pysnmp { }; pysnmpcrypto = callPackage ../development/python-modules/pysnmpcrypto { }; - pysnmp-lextudio = callPackage ../development/python-modules/pysnmp-lextudio { }; - pysnmp-pyasn1 = callPackage ../development/python-modules/pysnmp-pyasn1 { }; pysnmp-pysmi = callPackage ../development/python-modules/pysnmp-pysmi { }; @@ -12457,6 +12258,8 @@ self: super: with self; { pyspcwebgw = callPackage ../development/python-modules/pyspcwebgw { }; + pyspeex-noise = callPackage ../development/python-modules/pyspeex-noise { }; + pyspellchecker = callPackage ../development/python-modules/pyspellchecker { }; pyspf = callPackage ../development/python-modules/pyspf { }; @@ -12752,8 +12555,6 @@ self: super: with self; { pytest-responses = callPackage ../development/python-modules/pytest-responses { }; - pytest-runner = callPackage ../development/python-modules/pytest-runner { }; - pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; pytest-services = callPackage ../development/python-modules/pytest-services { }; @@ -12824,6 +12625,8 @@ self: super: with self; { python3-openid = callPackage ../development/python-modules/python3-openid { }; + python-aodhclient = callPackage ../development/python-modules/python-aodhclient { }; + python-apt = callPackage ../development/python-modules/python-apt { }; python-arango = callPackage ../development/python-modules/python-arango { }; @@ -12977,6 +12780,8 @@ self: super: with self; { python-magic = callPackage ../development/python-modules/python-magic { }; + python-magnumclient = callPackage ../development/python-modules/python-magnumclient { }; + python-manilaclient = callPackage ../development/python-modules/python-manilaclient { }; python-mapnik = callPackage ../development/python-modules/python-mapnik rec { @@ -13001,6 +12806,8 @@ self: super: with self; { python-mimeparse = callPackage ../development/python-modules/python-mimeparse { }; + python-mistralclient = callPackage ../development/python-modules/python-mistralclient { }; + python-mnist = callPackage ../development/python-modules/python-mnist { }; python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; @@ -13011,6 +12818,8 @@ self: super: with self; { python-mystrom = callPackage ../development/python-modules/python-mystrom { }; + python-neutronclient = callPackage ../development/python-modules/python-neutronclient { }; + python-nest = callPackage ../development/python-modules/python-nest { }; pythonnet = callPackage ../development/python-modules/pythonnet { }; @@ -13138,6 +12947,8 @@ self: super: with self; { python-vlc = callPackage ../development/python-modules/python-vlc { }; + python-watcherclient = callPackage ../development/python-modules/python-watcherclient { }; + python-whois = callPackage ../development/python-modules/python-whois { }; python-wifi = callPackage ../development/python-modules/python-wifi { }; @@ -13148,8 +12959,12 @@ self: super: with self; { python-xz = callPackage ../development/python-modules/python-xz { }; + python-zaqarclient = callPackage ../development/python-modules/python-zaqarclient { }; + python-zbar = callPackage ../development/python-modules/python-zbar { }; + python-zunclient = callPackage ../development/python-modules/python-zunclient { }; + pythran = callPackage ../development/python-modules/pythran { inherit (pkgs.llvmPackages) openmp; }; @@ -13232,8 +13047,6 @@ self: super: with self; { pyunifi = callPackage ../development/python-modules/pyunifi { }; - pyunifiprotect = callPackage ../development/python-modules/pyunifiprotect { }; - pyupdate = callPackage ../development/python-modules/pyupdate { }; pyupgrade = callPackage ../development/python-modules/pyupgrade { }; @@ -13262,7 +13075,7 @@ self: super: with self; { pyvex = callPackage ../development/python-modules/pyvex { }; - pyvicare = callPackage ../development/python-modules/pyvicare { }; + pyvicare-neo = callPackage ../development/python-modules/pyvicare-neo { }; pyvirtualdisplay = callPackage ../development/python-modules/pyvirtualdisplay { }; @@ -13366,6 +13179,8 @@ self: super: with self; { pyyardian = callPackage ../development/python-modules/pyyardian { }; + pyytlounge = callPackage ../development/python-modules/pyytlounge { }; + pyzabbix = callPackage ../development/python-modules/pyzabbix { }; pyzerproc = callPackage ../development/python-modules/pyzerproc { }; @@ -13388,6 +13203,8 @@ self: super: with self; { qcs-api-client = callPackage ../development/python-modules/qcs-api-client { }; + qcs-api-client-common = callPackage ../development/python-modules/qcs-api-client-common { }; + qcs-sdk-python = callPackage ../development/python-modules/qcs-sdk-python { }; qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; @@ -13396,8 +13213,6 @@ self: super: with self; { qdrant-client = callPackage ../development/python-modules/qdrant-client { }; - qds-sdk = callPackage ../development/python-modules/qds-sdk { }; - qgrid = callPackage ../development/python-modules/qgrid { }; qemu = callPackage ../development/python-modules/qemu { @@ -13662,6 +13477,8 @@ self: super: with self; { reflex = callPackage ../development/python-modules/reflex { }; + reflex-chakra = callPackage ../development/python-modules/reflex-chakra { }; + reflex-hosting-cli = callPackage ../development/python-modules/reflex-hosting-cli { }; reflink = callPackage ../development/python-modules/reflink { }; @@ -13712,8 +13529,6 @@ self: super: with self; { repocheck = callPackage ../development/python-modules/repocheck { }; - reportengine = callPackage ../development/python-modules/reportengine { }; - reportlab = callPackage ../development/python-modules/reportlab { }; reportlab-qrcode = callPackage ../development/python-modules/reportlab-qrcode { }; @@ -13958,8 +13773,6 @@ self: super: with self; { roonapi = callPackage ../development/python-modules/roonapi { }; - ronin = callPackage ../development/python-modules/ronin { }; - rope = callPackage ../development/python-modules/rope { }; ropgadget = callPackage ../development/python-modules/ropgadget { }; @@ -14004,8 +13817,6 @@ self: super: with self; { rpyc = callPackage ../development/python-modules/rpyc { }; - rpyc4 = callPackage ../development/python-modules/rpyc4 { }; - rq = callPackage ../development/python-modules/rq { redis-server = pkgs.redis; }; @@ -14104,6 +13915,10 @@ self: super: with self; { sagemaker = callPackage ../development/python-modules/sagemaker { }; + sagemaker-core = callPackage ../development/python-modules/sagemaker-core { }; + + salib = callPackage ../development/python-modules/salib { }; + salmon-mail = callPackage ../development/python-modules/salmon-mail { }; sane = callPackage ../development/python-modules/sane { @@ -14194,8 +14009,6 @@ self: super: with self; { scikit-misc = callPackage ../development/python-modules/scikit-misc { }; - scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; - scikit-posthocs = callPackage ../development/python-modules/scikit-posthocs { }; scikit-rf = callPackage ../development/python-modules/scikit-rf { }; @@ -14434,6 +14247,8 @@ self: super: with self; { shippai = callPackage ../development/python-modules/shippai { }; + shippinglabel = callPackage ../development/python-modules/shippinglabel { }; + shiv = callPackage ../development/python-modules/shiv { }; shodan = callPackage ../development/python-modules/shodan { }; @@ -14474,6 +14289,8 @@ self: super: with self; { simber = callPackage ../development/python-modules/simber { }; + simple-parsing = callPackage ../development/python-modules/simple-parsing { }; + simple-term-menu = callPackage ../development/python-modules/simple-term-menu { }; simpleaudio = callPackage ../development/python-modules/simpleaudio { }; @@ -14491,7 +14308,7 @@ self: super: with self; { simplehound = callPackage ../development/python-modules/simplehound { }; simpleitk = callPackage ../development/python-modules/simpleitk { - inherit (pkgs) simpleitk; + inherit (pkgs) itk simpleitk; }; simplejson = callPackage ../development/python-modules/simplejson { }; @@ -14550,6 +14367,11 @@ self: super: with self; { sipyco = callPackage ../development/python-modules/sipyco { }; + sirius = toPythonModule (pkgs.sirius.override { + enablePython = true; + pythonPackages = self; + }); + sismic = callPackage ../development/python-modules/sismic { }; sisyphus-control = callPackage ../development/python-modules/sisyphus-control { }; @@ -14680,6 +14502,8 @@ self: super: with self; { snakemake-interface-storage-plugins = callPackage ../development/python-modules/snakemake-interface-storage-plugins { }; + snakemake-storage-plugin-fs = callPackage ../development/python-modules/snakemake-storage-plugin-fs { }; + snakemake-storage-plugin-s3 = callPackage ../development/python-modules/snakemake-storage-plugin-s3 { }; snakemake-storage-plugin-xrootd = callPackage ../development/python-modules/snakemake-storage-plugin-xrootd { }; @@ -15048,6 +14872,8 @@ self: super: with self; { sqlbag = callPackage ../development/python-modules/sqlbag { }; + sqlfmt = callPackage ../development/python-modules/sqlfmt { }; + sqlglot = callPackage ../development/python-modules/sqlglot { }; sqlite-anyio = callPackage ../development/python-modules/sqlite-anyio { }; @@ -15178,6 +15004,8 @@ self: super: with self; { stix2-patterns = callPackage ../development/python-modules/stix2-patterns { }; + stix2-validator = callPackage ../development/python-modules/stix2-validator { }; + stm32loader = callPackage ../development/python-modules/stm32loader { }; stone = callPackage ../development/python-modules/stone { }; @@ -15361,6 +15189,8 @@ self: super: with self; { syslog-rfc5424-formatter = callPackage ../development/python-modules/syslog-rfc5424-formatter { }; + sysrsync = callPackage ../development/python-modules/sysrsync { }; + systembridge = callPackage ../development/python-modules/systembridge { }; systembridgeconnector = callPackage ../development/python-modules/systembridgeconnector { }; @@ -15428,6 +15258,8 @@ self: super: with self; { taxi = callPackage ../development/python-modules/taxi { }; + taxii2-client = callPackage ../development/python-modules/taxii2-client { }; + tbats = callPackage ../development/python-modules/tbats { }; tblib = callPackage ../development/python-modules/tblib { }; @@ -15497,7 +15329,7 @@ self: super: with self; { tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { inherit (pkgs.config) cudaSupport; # https://www.tensorflow.org/install/source#gpu - cudaPackages = pkgs.cudaPackages_11; + cudaPackages = pkgs.cudaPackages_12; }; tensorflow-build = let @@ -15637,8 +15469,14 @@ self: super: with self; { textual-dev = callPackage ../development/python-modules/textual-dev { }; + textual-fastdatatable = callPackage ../development/python-modules/textual-fastdatatable { }; + + textual-slider = callPackage ../development/python-modules/textual-slider { }; + textual-universal-directorytree = callPackage ../development/python-modules/textual-universal-directorytree { }; + textual-textarea = callPackage ../development/python-modules/textual-textarea { }; + testbook = callPackage ../development/python-modules/testbook { }; testing-common-database = callPackage ../development/python-modules/testing-common-database { }; @@ -15699,6 +15537,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreFoundation CoreGraphics CoreVideo; }; + thinqconnect = callPackage ../development/python-modules/thinqconnect { }; + thorlabspm100 = callPackage ../development/python-modules/thorlabspm100 { }; threadloop = callPackage ../development/python-modules/threadloop { }; @@ -15862,6 +15702,8 @@ self: super: with self; { torch-audiomentations = callPackage ../development/python-modules/torch-audiomentations { }; + torch-geometric = callPackage ../development/python-modules/torch-geometric { }; + torch-pitch-shift = callPackage ../development/python-modules/torch-pitch-shift { }; torch-bin = callPackage ../development/python-modules/torch/bin.nix { @@ -16022,6 +15864,8 @@ self: super: with self; { treeo = callPackage ../development/python-modules/treeo { }; + treescope = callPackage ../development/python-modules/treescope { }; + treex = callPackage ../development/python-modules/treex { }; treq = callPackage ../development/python-modules/treq { }; @@ -16076,8 +15920,15 @@ self: super: with self; { trytond = callPackage ../development/python-modules/trytond { }; + ts1-signatures = callPackage ../development/python-modules/ts1-signatures { }; + tsfresh = callPackage ../development/python-modules/tsfresh { }; + tsid = toPythonModule (pkgs.tsid.override { + pythonSupport = true; + python3Packages = self; + }); + tskit = callPackage ../development/python-modules/tskit { }; ttach = callPackage ../development/python-modules/ttach { }; @@ -17030,6 +16881,8 @@ self: super: with self; { ufolint = callPackage ../development/python-modules/ufolint { }; + ufomerge = callPackage ../development/python-modules/ufomerge { }; + ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; @@ -17078,6 +16931,8 @@ self: super: with self; { unicodedata2 = callPackage ../development/python-modules/unicodedata2 { }; + unicodeit = callPackage ../development/python-modules/unicodeit { }; + unicode-rbnf = callPackage ../development/python-modules/unicode-rbnf { }; unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; @@ -17102,6 +16957,8 @@ self: super: with self; { unifi = callPackage ../development/python-modules/unifi { }; + unifi-ap = callPackage ../development/python-modules/unifi-ap { }; + unifi-discovery = callPackage ../development/python-modules/unifi-discovery { }; unify = callPackage ../development/python-modules/unify { }; @@ -17242,8 +17099,6 @@ self: super: with self; { validobj = callPackage ../development/python-modules/validobj { }; - validphys2 = callPackage ../development/python-modules/validphys2 { }; - vallox-websocket-api = callPackage ../development/python-modules/vallox-websocket-api { }; vapoursynth = callPackage ../development/python-modules/vapoursynth { @@ -17399,6 +17254,8 @@ self: super: with self; { enablePython = true; }); + vttlib = callPackage ../development/python-modules/vttlib { }; + vulcan-api = callPackage ../development/python-modules/vulcan-api { }; vultr = callPackage ../development/python-modules/vultr { }; @@ -17560,6 +17417,8 @@ self: super: with self; { weconnect-mqtt = callPackage ../development/python-modules/weconnect-mqtt { }; + weheat = callPackage ../development/python-modules/weheat { }; + werkzeug = callPackage ../development/python-modules/werkzeug { }; west = callPackage ../development/python-modules/west { }; @@ -17582,6 +17441,10 @@ self: super: with self; { whenever = callPackage ../development/python-modules/whenever { }; + whey = callPackage ../development/python-modules/whey { }; + + whey-pth = callPackage ../development/python-modules/whey-pth { }; + whichcraft = callPackage ../development/python-modules/whichcraft { }; whirlpool-sixth-sense = callPackage ../development/python-modules/whirlpool-sixth-sense { }; @@ -17731,6 +17594,10 @@ self: super: with self; { inherit (pkgs) graphviz; }; + xen = toPythonModule (pkgs.xen-slim.override { + python3Packages = self; + }); + xformers = callPackage ../development/python-modules/xformers { }; xgboost = callPackage ../development/python-modules/xgboost { @@ -18011,6 +17878,8 @@ self: super: with self; { zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + zigpy-zboss = callPackage ../development/python-modules/zigpy-zboss { }; + zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; zigpy-znp = callPackage ../development/python-modules/zigpy-znp { }; @@ -18081,6 +17950,8 @@ self: super: with self; { inherit (pkgs) zopfli; }; + zpp = callPackage ../development/python-modules/zpp { }; + zstandard = callPackage ../development/python-modules/zstandard { }; zstd = callPackage ../development/python-modules/zstd { @@ -18089,6 +17960,8 @@ self: super: with self; { zulip = callPackage ../development/python-modules/zulip { }; + zulip-emoji-mapping = callPackage ../development/python-modules/zulip-emoji-mapping { }; + zwave-me-ws = callPackage ../development/python-modules/zwave-me-ws { }; zwave-js-server-python = callPackage ../development/python-modules/zwave-js-server-python { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 2e746d5c7d5db..d5d6c87f9b472 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -40,7 +40,6 @@ makeScopeWithSplicing' { attrs = { inherit libsForQt5; inherit (pkgs) config lib fetchurl; - gconf = pkgs.gnome2.GConf; inherit (pkgs) gsettings-desktop-schemas; }; in (lib.makeOverridable mkPlasma5 attrs); @@ -155,7 +154,7 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP liblastfm = callPackage ../development/libraries/liblastfm { }; libopenshot = callPackage ../development/libraries/libopenshot { - stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; + stdenv = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; python3 = pkgs.python311; }; @@ -206,7 +205,7 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; qca = callPackage ../development/libraries/qca { - stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; + stdenv = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; inherit (libsForQt5) qtbase; }; qca-qt5 = self.qca; @@ -238,7 +237,7 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP qtinstaller = callPackage ../development/libraries/qtinstaller { }; qtkeychain = callPackage ../development/libraries/qtkeychain { - stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; + stdenv = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -288,6 +287,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP xp-pen-g430-driver = callPackage ../os-specific/linux/xp-pen-drivers/g430 { }; + xwaylandvideobridge = callPackage ../tools/wayland/xwaylandvideobridge { }; + yuview = callPackage ../applications/video/yuview { }; }) // lib.optionalAttrs pkgs.config.allowAliases { # Remove completely before 24.11 diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index f63e2245b59b4..ebf433e667ee5 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -114,6 +114,7 @@ makeScopeWithSplicing' { wayqt = callPackage ../development/libraries/wayqt { }; + xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { }; } // lib.optionalAttrs pkgs.config.allowAliases { # Remove completely before 24.11 overrideScope' = builtins.throw "qt6Packages now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"."; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 4977efe4a4586..79d9c35e62c45 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -327,7 +327,6 @@ let lambdabot lhs2tex madlang - mailctl matterhorn mkjson mueval @@ -345,6 +344,7 @@ let nixfmt-rfc-style nota nvfetcher + oama ormolu # pakcs broken by set-extra on 2024-03-15 pandoc @@ -393,19 +393,7 @@ let }; # GHCs linked to musl. - pkgsMusl.haskell.compiler = lib.recursiveUpdate - (packagePlatforms pkgs.pkgsMusl.haskell.compiler) - { - # remove musl ghc865Binary since it is known to be broken and - # causes an evaluation error on darwin. - ghc865Binary = {}; - - ghcjs = {}; - ghcjs810 = {}; - }; - - # Get some cache going for MUSL-enabled GHC. - pkgsMusl.haskellPackages = + pkgsMusl = removePlatforms [ # pkgsMusl is compiled natively with musl. It is not @@ -419,11 +407,26 @@ let "aarch64-darwin" ] { - inherit (packagePlatforms pkgs.pkgsMusl.haskellPackages) - hello - lens - random - ; + haskell.compiler = lib.recursiveUpdate + (packagePlatforms pkgs.pkgsMusl.haskell.compiler) + { + # remove musl ghc865Binary since it is known to be broken and + # causes an evaluation error on darwin. + ghc865Binary = {}; + + ghcjs = {}; + ghcjs810 = {}; + }; + + # Get some cache going for MUSL-enabled GHC. + haskellPackages = + { + inherit (packagePlatforms pkgs.pkgsMusl.haskellPackages) + hello + lens + random + ; + }; }; # Test some statically linked packages to catch regressions @@ -472,37 +475,65 @@ let }; }; - pkgsCross.ghcjs = - removePlatforms - [ - # Hydra output size of 3GB is exceeded - "aarch64-linux" - ] - { - haskellPackages = { - inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages) - ghc - hello - microlens - ; + pkgsCross = { + ghcjs = + removePlatforms + [ + # Hydra output size of 3GB is exceeded + "aarch64-linux" + ] + { + haskellPackages = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages) + ghc + hello + microlens + ; + }; + + haskell.packages.ghc98 = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghc98) + ghc + hello + microlens + ; + }; + + haskell.packages.ghcHEAD = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghcHEAD) + ghc + hello + microlens + ; + }; }; - haskell.packages.ghc98 = { - inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghc98) - ghc - hello - microlens + riscv64 = { + # Cross compilation of GHC + haskell.compiler = { + inherit (packagePlatforms pkgs.pkgsCross.riscv64.haskell.compiler) + # Our oldest GHC which still uses its own expression. 8.10.7 can + # theoretically be used to chain bootstrap all GHCs on riscv64 + # which doesn't have official bindists. + ghc8107 + # Latest GHC we are able to cross-compile. + ghc948 ; - }; + }; + }; - haskell.packages.ghcHEAD = { - inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghcHEAD) - ghc - hello - microlens + aarch64-multiplatform = { + # Cross compilation of GHC + haskell.compiler = { + inherit (packagePlatforms pkgs.pkgsCross.aarch64-multiplatform.haskell.compiler) + # Uses a separate expression and LLVM backend for aarch64. + ghc8107 + # Latest GHC we are able to cross-compile. Uses NCG backend. + ghc948 ; - }; }; + }; + }; }) (versionedCompilerJobs { # Packages which should be checked on more than the @@ -544,11 +575,8 @@ let compilerNames.ghc8107 # Support ceased as of 2.5.0.0 compilerNames.ghc902 - # No support yet (2024-05-12) - compilerNames.ghc9101 ] released; hoogle = lib.subtractLists [ - compilerNames.ghc9101 ] released; hlint = lib.subtractLists [ compilerNames.ghc902 diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 956f194ffd56c..265ab242d86d2 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -49,6 +49,10 @@ in , # The standard environment to use for building packages. stdenv +, # `stdenv` without a C compiler. Passing in this helps avoid infinite + # recursions, and may eventually replace passing in the full stdenv. + stdenvNoCC ? stdenv.override { cc = null; hasCC = false; } + , # This is used because stdenv replacement and the stdenvCross do benefit from # the overridden configuration provided by the user, as opposed to the normal # bootstrapping stdenvs. @@ -141,7 +145,7 @@ let pkgs = self.pkgsHostTarget; targetPackages = self.pkgsTargetTarget; - inherit stdenv; + inherit stdenv stdenvNoCC; }; splice = self: super: import ./splice.nix lib self (adjacentPackages != null); @@ -308,7 +312,7 @@ let crossSystem = { isStatic = true; parsed = - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then makeMuslParsedPlatform stdenv.hostPlatform.parsed else stdenv.hostPlatform.parsed; gcc = lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { abi = "elfv2"; } // diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index 959d87d5864d5..93bb34bba20d3 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -224,9 +224,9 @@ let darwin = pkgs.darwin.basic_cmds; }; xxd = { - linux = pkgs.vim.xxd; - darwin = pkgs.vim.xxd; - freebsd = pkgs.vim.xxd; + linux = pkgs.tinyxxd; + darwin = pkgs.tinyxxd; + freebsd = pkgs.tinyxxd; }; }; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 18596f21014eb..c31ae27c6fcfd 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -9,35 +9,35 @@ rec { base = minimal.override { gettextSupport = true; - fontconfigSupport = stdenv.isLinux; - alsaSupport = stdenv.isLinux; + fontconfigSupport = stdenv.hostPlatform.isLinux; + alsaSupport = stdenv.hostPlatform.isLinux; openglSupport = true; vulkanSupport = true; tlsSupport = true; cupsSupport = true; - dbusSupport = stdenv.isLinux; - cairoSupport = stdenv.isLinux; + dbusSupport = stdenv.hostPlatform.isLinux; + cairoSupport = stdenv.hostPlatform.isLinux; cursesSupport = true; - saneSupport = stdenv.isLinux; - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; - udevSupport = stdenv.isLinux; - xineramaSupport = stdenv.isLinux; + saneSupport = stdenv.hostPlatform.isLinux; + pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux; + udevSupport = stdenv.hostPlatform.isLinux; + xineramaSupport = stdenv.hostPlatform.isLinux; sdlSupport = true; mingwSupport = true; usbSupport = true; - waylandSupport = stdenv.isLinux; - x11Support = stdenv.isLinux; + waylandSupport = stdenv.hostPlatform.isLinux; + x11Support = stdenv.hostPlatform.isLinux; }; full = base.override { - gtkSupport = stdenv.isLinux; + gtkSupport = stdenv.hostPlatform.isLinux; gstreamerSupport = true; openclSupport = true; odbcSupport = true; - netapiSupport = stdenv.isLinux; - vaSupport = stdenv.isLinux; + netapiSupport = stdenv.hostPlatform.isLinux; + vaSupport = stdenv.hostPlatform.isLinux; pcapSupport = true; - v4lSupport = stdenv.isLinux; + v4lSupport = stdenv.hostPlatform.isLinux; gphoto2Support = true; krb5Support = true; embedInstallers = true;